From c8418c7d4bcbf9e8b3668480f3d593eccb5e771e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=96=87=E8=89=B3?= Date: Tue, 24 Feb 2026 17:53:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81=E5=AD=97?= =?UTF-8?q?=E7=AC=A6=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deliverables/script/pom.xml | 2 +- .../Selenium/src/test/java/FetchPageToDB.java | 38 +- .../Selenium/src/test/java/FetchPageUtil.java | 12 +- .../Selenium/src/test/java/JQueryUtils.java | 8 +- .../Selenium/src/test/java/SaveToWebpage.java | 2 +- projects/chafangtong-dal/pom.xml | 4 +- .../dal/mongo/model/FpkApplyCount.java | 2 +- .../dal/mongo/model/FpkDownload.java | 8 +- .../dal/mongo/model/FpkFeedback.java | 2 +- .../chafangtong/dal/mongo/model/FpkMenu.java | 10 +- .../chafangtong/dal/mongo/model/FpkRole.java | 8 +- .../chafangtong/dal/mongo/model/FpkUsers.java | 14 +- .../ChafangtongContextLoaderListener.java | 2 +- .../controllers/AroundController.java | 40 +- .../controllers/AutocompleteController.java | 4 +- .../controllers/BaseController.java | 12 +- .../controllers/ConsumController.java | 10 +- .../controllers/FeedbackController.java | 2 +- .../controllers/GeneralController.java | 104 +- .../controllers/LocalController.java | 10 +- .../controllers/NodistrictController.java | 30 +- .../controllers/NofoundController.java | 6 +- .../controllers/NoshopController.java | 62 +- .../controllers/PeopleController.java | 54 +- .../controllers/PredictController.java | 8 +- .../controllers/PriceController.java | 20 +- .../controllers/RentController.java | 2 +- .../controllers/ReportController.java | 126 +- .../controllers/ReportViewController.java | 8 +- .../controllers/SampleController.java | 6 +- .../controllers/SearchController.java | 4 +- .../controllers/ShapeController.java | 16 +- .../controllers/UserController.java | 20 +- .../chafangtong/filters/AccessLogFilter.java | 4 +- .../chafangtong/filters/AnalyticsBean.java | 44 +- .../chafangtong/filters/AnalyticsFilter.java | 14 +- .../filters/SpiderValidateFilter.java | 24 +- .../AuthenticationInterceptor.java | 6 +- .../fangjia/chafangtong/model/BaseModel.java | 2 +- .../chafangtong/model/ConsumModel.java | 2 +- .../com/fangjia/chafangtong/model/Models.java | 6 +- .../chafangtong/model/NoResultModel.java | 2 +- .../chafangtong/model/NodistrictModel.java | 12 +- .../chafangtong/model/NoshopModel.java | 24 +- .../chafangtong/model/ReportModel.java | 22 +- .../model/RestfulModelAndView.java | 2 +- .../chafangtong/servlet/ChartImgServlet.java | 10 +- .../chafangtong/servlet/ReportServlet.java | 10 +- .../fangjia/chafangtong/util/DesUtils.java | 48 +- .../chafangtong/util/DistrictScoreUtil.java | 266 +- .../chafangtong/util/ShopScoreUtil.java | 368 +- .../com/fangjia/chafangtong/util/Test.java | 10 +- .../ChafangtongContextLoaderListener.java | 2 +- .../controllers/AroundController.java | 40 +- .../controllers/AutocompleteController.java | 4 +- .../controllers/BaseController.java | 12 +- .../controllers/ConsumController.java | 10 +- .../controllers/DataCenterController.java | 70 +- .../controllers/FeedbackController.java | 2 +- .../controllers/GeneralController.java | 106 +- .../controllers/LocalController.java | 10 +- .../controllers/NodistrictController.java | 30 +- .../controllers/NofoundController.java | 6 +- .../controllers/NoshopController.java | 62 +- .../controllers/PeopleController.java | 54 +- .../controllers/PredictController.java | 8 +- .../controllers/PriceController.java | 20 +- .../controllers/RentController.java | 2 +- .../controllers/ReportController.java | 126 +- .../controllers/ReportViewController.java | 8 +- .../controllers/SampleController.java | 6 +- .../controllers/SearchController.java | 4 +- .../controllers/ShapeController.java | 16 +- .../controllers/UserController.java | 16 +- .../chafangtong/directive/JsonDirective.java | 2 +- .../chafangtong/filters/AccessLogFilter.java | 4 +- .../chafangtong/filters/AnalyticsBean.java | 44 +- .../chafangtong/filters/AnalyticsFilter.java | 14 +- .../filters/SpiderValidateFilter.java | 24 +- .../AuthenticationInterceptor.java | 6 +- .../fangjia/chafangtong/model/BaseModel.java | 2 +- .../chafangtong/model/ConsumModel.java | 2 +- .../com/fangjia/chafangtong/model/Models.java | 6 +- .../chafangtong/model/NoResultModel.java | 2 +- .../chafangtong/model/NodistrictModel.java | 12 +- .../chafangtong/model/NoshopModel.java | 24 +- .../chafangtong/model/ReportModel.java | 22 +- .../model/RestfulModelAndView.java | 2 +- .../chafangtong/servlet/ChartImgServlet.java | 10 +- .../chafangtong/servlet/ReportServlet.java | 10 +- .../chafangtong/util/DistrictScoreUtil.java | 266 +- .../chafangtong/util/ShopScoreUtil.java | 368 +- .../com/fangjia/chafangtong/util/Test.java | 10 +- .../auto/controllers/AutoController.java | 8 +- .../controllers/AutocompleteController.java | 6 +- .../auto/model/RestfulModelAndView.java | 2 +- .../auto/service/AutocompleteService.java | 6 +- .../AddressModel/AveragerConfigModel.java | 30 +- .../bkoff/controllers/AdController.java | 70 +- .../controllers/AddressAnalyController.java | 14 +- .../bkoff/controllers/AddressController.java | 54 +- .../controllers/AddressMatchController.java | 102 +- .../controllers/AdvertisementController.java | 66 +- .../AdvertisementOperationController.java | 30 +- .../controllers/AnalyResultController.java | 32 +- .../controllers/ApiCountLogController.java | 2 +- .../controllers/ApiMonitorController.java | 8 +- .../controllers/ApiTestApplyController.java | 28 +- .../bkoff/controllers/ApiTestController.java | 32 +- .../bkoff/controllers/ApiTradeController.java | 20 +- .../bkoff/controllers/ApiUserController.java | 194 +- .../controllers/ArtemisLogController.java | 8 +- .../controllers/AuditHouseController.java | 16 +- .../bkoff/controllers/AutoController.java | 22 +- .../AverageStatisticsController.java | 420 +- .../controllers/AveragerConfigController.java | 2 +- .../controllers/AvgPriceUpdateController.java | 206 +- .../bkoff/controllers/BeansController.java | 14 +- .../controllers/BuildingRatioController.java | 14 +- .../bkoff/controllers/BusinessController.java | 24 +- .../controllers/BusinessLoanController.java | 2 +- .../bkoff/controllers/CarLoanController.java | 2 +- .../bkoff/controllers/CityController.java | 298 +- .../controllers/ClickPageController.java | 16 +- .../controllers/ComparePriceController.java | 20 +- .../ConsumerAddressController.java | 88 +- .../ConsumptionLoanController.java | 2 +- .../CopyrightConfigController.java | 16 +- .../controllers/CrawlTemplateController.java | 2 +- .../CustomerConsultController.java | 16 +- .../controllers/CustomqueryController.java | 22 +- .../bkoff/controllers/DataController.java | 512 +- .../bkoff/controllers/DataDealController.java | 34 +- .../controllers/DatastoreStatController.java | 8 +- .../DevelopmentZoneController.java | 48 +- .../controllers/DictionaryController.java | 22 +- .../bkoff/controllers/DikuaiController.java | 12 +- .../controllers/District2Controller.java | 42 +- .../bkoff/controllers/DistrictController.java | 390 +- .../controllers/DistrictCoverController.java | 2 +- .../DistrictHouseStatController.java | 2 +- .../DistrictHouseTypeController.java | 4 +- .../controllers/DistrictRentController.java | 20 +- .../controllers/DistrictTmpController.java | 350 +- .../controllers/ElevateWordController.java | 8 +- .../controllers/EntityClassController.java | 2 +- .../bkoff/controllers/EvaluateController.java | 14 +- .../EvaluationAuditController.java | 54 +- .../EvaluationConditionController.java | 2 +- .../controllers/EvaluationController.java | 34 +- .../EvaluationPurposeAnalysisController.java | 8 +- .../controllers/FjBusinessLoanController.java | 2 +- .../controllers/FjCarLoanController.java | 2 +- .../FjConsumptionLoanController.java | 2 +- .../controllers/FjHouseLoanController.java | 2 +- .../controllers/FjLoanerInfoController.java | 22 +- .../controllers/FjtArtificialController.java | 26 +- .../bkoff/controllers/FjtController.java | 22 +- .../bkoff/controllers/FjtMenuController.java | 2 +- .../bkoff/controllers/FpkMenuController.java | 2 +- .../bkoff/controllers/FpkPriceController.java | 4 +- .../bkoff/controllers/FpkUsersController.java | 14 +- .../controllers/FriendLinkController.java | 16 +- .../bkoff/controllers/HouseController.java | 14 +- .../controllers/HouseLoanController.java | 2 +- .../controllers/HouseLoudongController.java | 38 +- .../controllers/HouseMonitorController.java | 20 +- .../controllers/HouseQualityController.java | 10 +- .../controllers/HousesReportController.java | 8 +- .../controllers/ImageManagerController.java | 8 +- .../controllers/ImportExcelController.java | 14 +- .../controllers/IndexStatsController.java | 2 +- .../controllers/InputUserInfoController.java | 32 +- .../bkoff/controllers/InquiryController.java | 84 +- .../bkoff/controllers/K8sController.java | 6 +- .../controllers/LandPriceController.java | 28 +- .../controllers/LandPriceIndexController.java | 4 +- .../controllers/LatlngPolygonController.java | 8 +- .../controllers/LoanAgreementController.java | 92 +- .../LoanBurialPointController.java | 4 +- .../controllers/LoanKnowledgeController.java | 2 +- .../controllers/LoanLeadsController.java | 34 +- .../controllers/LoanProductController.java | 20 +- .../bkoff/controllers/LoanPushController.java | 16 +- .../controllers/LoanWithHoldController.java | 138 +- .../bkoff/controllers/LoginController.java | 12 +- .../controllers/LosePropertyController.java | 18 +- .../bkoff/controllers/LoudongController.java | 22 +- .../controllers/Manage400Controller.java | 8 +- .../bkoff/controllers/MatchController.java | 8 +- .../controllers/MechanismController.java | 16 +- .../controllers/MessengerController.java | 6 +- .../bkoff/controllers/MetroController.java | 12 +- .../controllers/MetroLineController.java | 12 +- .../MobileBlackListController.java | 8 +- .../controllers/MortgageInfoController.java | 40 +- .../controllers/NetworkPriceController.java | 22 +- .../controllers/NewResourceController.java | 4 +- .../bkoff/controllers/News2Controller.java | 2 +- .../bkoff/controllers/NewsController.java | 72 +- .../NoExistDistrictController.java | 4 +- .../controllers/OpenResourceController.java | 26 +- .../controllers/OpenUriLogController.java | 22 +- .../controllers/OperationLogController.java | 158 +- .../controllers/PaphValuationController.java | 22 +- .../controllers/ParseTradeDataController.java | 6 +- .../bkoff/controllers/PictureController.java | 4 +- .../controllers/PpcDetailController.java | 20 +- .../controllers/PriceSurveyController.java | 8 +- .../bkoff/controllers/ReasonController.java | 38 +- .../RegTimeAndEvaTimeController.java | 18 +- .../controllers/RegionHouseController.java | 10 +- .../controllers/RegionRentController.java | 18 +- .../controllers/RegionblockController.java | 54 +- .../controllers/RegisterInfoController.java | 18 +- .../controllers/RentHouseController.java | 14 +- .../RentPriceUpdateController.java | 206 +- .../bkoff/controllers/ResourceController.java | 12 +- .../bkoff/controllers/RobotController.java | 2 +- .../bkoff/controllers/RoleController.java | 12 +- .../controllers/SaleLeadsController.java | 2 +- .../SearchWordsAnalyticsController.java | 8 +- .../bkoff/controllers/SeawaterController.java | 20 +- .../bkoff/controllers/SpiderController.java | 12 +- .../controllers/SqMetreRentController.java | 6 +- .../StatisticReportController.java | 66 +- .../controllers/TaoBaoAuctionController.java | 4 +- .../controllers/ToolClickStatController.java | 6 +- .../bkoff/controllers/TownshipController.java | 8 +- .../bkoff/controllers/UserController.java | 12 +- .../bkoff/controllers/UsersController.java | 46 +- .../VillageIdentifyController.java | 32 +- .../controllers/WebAverageController.java | 26 +- .../bkoff/controllers/XcxUsersController.java | 8 +- .../bkoff/controllers/YugudanController.java | 30 +- .../controllers/fjtEvaluationController.java | 114 +- .../bkoff/interceptor/AuthInterceptor.java | 4 +- .../interceptor/FileUploadInterceptor.java | 2 +- .../com/fangjia/bkoff/model/AdSpaceModel.java | 24 +- .../bkoff/model/AdvertisementModel.java | 24 +- .../model/AdvertisementOperationModel.java | 28 +- .../fangjia/bkoff/model/AgentMasterModel.java | 6 +- .../com/fangjia/bkoff/model/AgreementVo.java | 2 +- .../fangjia/bkoff/model/ApiCountLogModel.java | 4 +- .../model/ApiInvokeStatisticalModel.java | 4 +- .../fangjia/bkoff/model/ApiTestApplyInfo.java | 18 +- .../com/fangjia/bkoff/model/ApiUserModel.java | 12 +- .../bkoff/model/ArtificialValuationModel.java | 2 +- .../fangjia/bkoff/model/BackLinkModel.java | 2 +- .../fangjia/bkoff/model/BkoffUsersModel.java | 2 +- .../fangjia/bkoff/model/BusinessModel.java | 32 +- .../fangjia/bkoff/model/CalcCommandModel.java | 10 +- .../bkoff/model/ConsumerAddressModel.java | 6 +- .../bkoff/model/CopyrightConfigModel.java | 6 +- .../fangjia/bkoff/model/CrowdsourceModel.java | 2 +- .../com/fangjia/bkoff/model/DataModel.java | 4 +- .../com/fangjia/bkoff/model/DiKuaiModel.java | 22 +- .../fangjia/bkoff/model/DistrictModel.java | 12 +- .../fangjia/bkoff/model/ElevateWordModel.java | 12 +- .../fangjia/bkoff/model/EvaluateModel.java | 10 +- .../bkoff/model/EvaluationConditionModel.java | 6 +- .../bkoff/model/EvaluationExportModel.java | 12 +- .../model/EvaluationPurposeAnalysisModel.java | 12 +- .../bkoff/model/ExtractDistrictModel.java | 6 +- .../bkoff/model/FjLoanOfficerModel.java | 2 +- .../fangjia/bkoff/model/FjtAnalyModel.java | 4 +- .../bkoff/model/FjtEvaluationModel.java | 4 +- .../com/fangjia/bkoff/model/FjtModel.java | 6 +- .../fangjia/bkoff/model/FpkDownloadModel.java | 4 +- .../fangjia/bkoff/model/FpkFeedbackModel.java | 2 +- .../com/fangjia/bkoff/model/FpkMenuModel.java | 10 +- .../com/fangjia/bkoff/model/FpkRoleModel.java | 8 +- .../fangjia/bkoff/model/FpkUsersModel.java | 14 +- .../fangjia/bkoff/model/FriendLinkModel.java | 2 +- .../bkoff/model/HouseLoudongModel.java | 16 +- .../bkoff/model/ImageManagerModel.java | 10 +- .../com/fangjia/bkoff/model/InquiryModel.java | 2 +- .../bkoff/model/LandPriceIndexModel.java | 2 +- .../bkoff/model/LoanAgreementModel.java | 4 +- .../fangjia/bkoff/model/LoanAgreementVo.java | 34 +- .../bkoff/model/LoanBurialPointModel.java | 14 +- .../fangjia/bkoff/model/LoanLeadsModel.java | 14 +- .../fangjia/bkoff/model/LoanOfficerModel.java | 2 +- .../fangjia/bkoff/model/LoanProductModel.java | 50 +- .../fangjia/bkoff/model/LoanPushModel.java | 32 +- .../fangjia/bkoff/model/LoanWithHoldVo.java | 40 +- .../bkoff/model/LosePropertyModel.java | 2 +- .../com/fangjia/bkoff/model/LoudongModel.java | 10 +- .../com/fangjia/bkoff/model/MatchModel.java | 2 +- .../fangjia/bkoff/model/MechanismModel.java | 8 +- .../com/fangjia/bkoff/model/MetroModel.java | 16 +- .../java/com/fangjia/bkoff/model/Models.java | 6 +- .../bkoff/model/MortgageInfoModel.java | 4 +- .../com/fangjia/bkoff/model/NewsModel.java | 10 +- .../bkoff/model/NoLineDistrictModel.java | 2 +- .../fangjia/bkoff/model/OpenUriLogModel.java | 6 +- .../model/PropertyRegisterInfoModel.java | 48 +- .../bkoff/model/RegTimeAndEvaTimeModel.java | 4 +- .../fangjia/bkoff/model/RegionBlockModel.java | 2 +- .../fangjia/bkoff/model/RegionHouseModel.java | 2 +- .../fangjia/bkoff/model/ResourceModel.java | 2 +- .../com/fangjia/bkoff/model/RoleModel.java | 2 +- .../fangjia/bkoff/model/ServerAreaModel.java | 10 +- .../com/fangjia/bkoff/model/SpiderModel.java | 2 +- .../bkoff/model/ToolClickStatModel.java | 4 +- .../fangjia/bkoff/model/TownshipModel.java | 4 +- .../bkoff/model/VillageIdentifyModel.java | 24 +- .../bkoff/model/XcxEvaluationModel.java | 2 +- .../com/fangjia/bkoff/model/XcxLoanModel.java | 2 +- .../fangjia/bkoff/model/XcxStoryModel.java | 2 +- .../fangjia/bkoff/model/XcxUsersModel.java | 2 +- .../com/fangjia/bkoff/model/YugudanModel.java | 66 +- .../com/fangjia/bkoff/util/AddressLatlng.java | 2 +- .../com/fangjia/bkoff/util/AddressParser.java | 2 +- .../bkoff/util/BaseAvgImportServlet.java | 78 +- .../com/fangjia/bkoff/util/CityDirective.java | 130 +- .../util/DownloadRecordImportServlet.java | 40 +- .../com/fangjia/bkoff/util/ExcelUtils.java | 8 +- .../com/fangjia/bkoff/util/ExcelZipUtil.java | 4 +- .../com/fangjia/bkoff/util/ExportExcel.java | 40 +- .../fangjia/bkoff/util/FileUploadServlet.java | 16 +- .../bkoff/util/GetLatAndLngByBaidu.java | 6 +- .../fangjia/bkoff/util/HssfCellStyleUtil.java | 26 +- .../bkoff/util/ImportExcelServlet.java | 30 +- .../com/fangjia/bkoff/util/ImportServlet.java | 34 +- .../fangjia/bkoff/util/LoanImportServlet.java | 98 +- .../com/fangjia/bkoff/util/MyHttpServer.java | 14 +- .../fangjia/bkoff/util/SaleImportServlet.java | 88 +- .../fangjia/bkoff/util/SelectDirective.java | 6 +- .../com/fangjia/core/BaseConfiguration.java | 10 +- .../com/fangjia/core/util/AnalyticsUtil.java | 12 +- .../com/fangjia/core/util/AsyncThread.java | 2 +- .../java/com/fangjia/core/util/BeanUtils.java | 6 +- .../java/com/fangjia/core/util/BigNumber.java | 80 +- .../fangjia/core/util/CurrencyConverter.java | 52 +- .../java/com/fangjia/core/util/DataUtil.java | 236 +- .../java/com/fangjia/core/util/DateUtil.java | 110 +- .../java/com/fangjia/core/util/GeoUtils.java | 18 +- .../java/com/fangjia/core/util/PageBean.java | 16 +- .../com/fangjia/core/util/RandomUtil.java | 4 +- .../com/fangjia/core/util/SecurityUtil.java | 18 +- .../com/fangjia/core/util/SerializeUtil.java | 4 +- projects/fangjia-core/pom.xml | 4 +- .../com/fangjia/core/BaseConfiguration.java | 10 +- .../main/java/com/fangjia/core/BlockData.java | 6 +- .../java/com/fangjia/core/Configuration.java | 12 +- .../com/fangjia/core/CpcHouseTypeEnum.java | 2 +- .../com/fangjia/core/DistrictKindEnum.java | 8 +- .../java/com/fangjia/core/ProvinceData.java | 88 +- .../java/com/fangjia/core/RegionData.java | 22 +- .../java/com/fangjia/core/ServerAreaEnum.java | 166 +- .../fangjia/core/cache/MemCachedManager.java | 4 +- .../controllers/MemcachedController.java | 2 +- .../com/fangjia/core/rest/ReponseData.java | 4 +- .../core/seabridformat/DirectionType.java | 2 +- .../core/seabridformat/FitmentType.java | 4 +- .../seabridformat/SeabirdFormatUtils.java | 146 +- .../com/fangjia/core/util/AddressLatlng.java | 2 +- .../com/fangjia/core/util/AddressParser.java | 164 +- .../core/util/AddressParserConfiguration.java | 10218 +++++------ .../fangjia/core/util/AddressParserUtils.java | 384 +- .../com/fangjia/core/util/AnalyTitleUtil.java | 192 +- .../com/fangjia/core/util/AnalyticsUtil.java | 12 +- .../com/fangjia/core/util/AsyncThread.java | 2 +- .../java/com/fangjia/core/util/AvmUrls.java | 4 +- .../com/fangjia/core/util/BaiDuApiUtils.java | 40 +- .../java/com/fangjia/core/util/BeanUtils.java | 6 +- .../com/fangjia/core/util/BloomFilter.java | 6 +- .../com/fangjia/core/util/CNNMFilter.java | 64 +- .../com/fangjia/core/util/CacheUtils.java | 62 +- .../java/com/fangjia/core/util/Cluster.java | 26 +- .../com/fangjia/core/util/CodeDictionary.java | 34 +- .../com/fangjia/core/util/CoordPoint.java | 4 +- .../core/util/CoordinateConversion.java | 22 +- .../core/util/CosineSimilarAlgorithm.java | 40 +- .../fangjia/core/util/CurrencyConverter.java | 52 +- .../com/fangjia/core/util/DataCluster.java | 76 +- .../java/com/fangjia/core/util/DataUtil.java | 300 +- .../java/com/fangjia/core/util/DateUtil.java | 150 +- .../com/fangjia/core/util/DictAccessUtil.java | 26 +- .../core/util/DingDingMessageUtil.java | 4 +- .../fangjia/core/util/DistrictCodeUtils.java | 1352 +- .../java/com/fangjia/core/util/ExcelUtil.java | 16 +- .../com/fangjia/core/util/ExecuteCounter.java | 6 +- .../com/fangjia/core/util/FSHConstant.java | 82 +- .../java/com/fangjia/core/util/Footprint.java | 4 +- .../java/com/fangjia/core/util/GeoUtils.java | 40 +- .../com/fangjia/core/util/HouseValidator.java | 66 +- .../com/fangjia/core/util/HttpRequest.java | 30 +- .../com/fangjia/core/util/JXMConvertUtil.java | 14 +- .../java/com/fangjia/core/util/JsonUtils.java | 8 +- .../java/com/fangjia/core/util/MD5Util.java | 8 +- .../java/com/fangjia/core/util/MathUtils.java | 80 +- .../com/fangjia/core/util/Mongo3Utils.java | 12 +- .../com/fangjia/core/util/NumberText.java | 54 +- .../fangjia/core/util/Numeric2Chinese.java | 22 +- .../com/fangjia/core/util/PDSConstant.java | 80 +- .../java/com/fangjia/core/util/PageBean.java | 16 +- .../java/com/fangjia/core/util/PriceData.java | 2 +- .../com/fangjia/core/util/RandomUtil.java | 4 +- .../com/fangjia/core/util/SeaweedUtils.java | 22 +- .../com/fangjia/core/util/SecurityUtil.java | 18 +- .../com/fangjia/core/util/SourceNameUtil.java | 14864 ++++++++-------- .../com/fangjia/core/util/StringUtil.java | 112 +- .../java/com/fangjia/core/util/SvgUtils.java | 66 +- .../com/fangjia/core/util/SystemUtils.java | 22 +- .../java/com/fangjia/core/util/WordUtil.java | 66 +- .../com/fangjia/core/util/XCXConstant.java | 4 +- .../xml/converter/XStreamDateConverter.java | 2 +- .../java/com/fangjia/bkoff/BkoffConfig.java | 2 +- .../src/main/java/com/fangjia/bkoff/Test.java | 28 +- .../controllers/AddressInfoController.java | 4 +- .../controllers/AddressScriptController.java | 36 +- .../bkoff/controllers/AnalyController.java | 242 +- .../bkoff/controllers/ApiController.java | 22 +- .../controllers/AvgPriceAnalyController.java | 84 +- .../controllers/BkoffRoleController.java | 30 +- .../controllers/BkoffUserController.java | 48 +- .../bkoff/controllers/CalcController.java | 10 +- .../bkoff/controllers/DistrictController.java | 10 +- .../bkoff/controllers/DynamicController.java | 18 +- .../bkoff/controllers/ExperianController.java | 18 +- .../controllers/FileReportController.java | 132 +- .../controllers/FoundDistrictController.java | 30 +- .../controllers/HouseAnalyController.java | 24 +- .../controllers/LogAnalysisController.java | 2 +- .../bkoff/controllers/MapController.java | 1188 +- .../controllers/ModeAnalyController.java | 8 +- .../controllers/TestReportController.java | 76 +- .../bkoff/controllers/UserController.java | 24 +- .../bkoff/controllers/WebsiteController.java | 42 +- .../bkoff/customlabel/AuthorityDirective.java | 12 +- .../fangjia/bkoff/filter/AnalyticsFilter.java | 2 +- .../fangjia/bkoff/filter/SecurityFilter.java | 22 +- .../listeners/ContextLoaderListener.java | 4 +- .../fangjia/bkoff/model/AnalyListModel.java | 10 +- .../com/fangjia/bkoff/model/AnalyModel.java | 4 +- .../com/fangjia/bkoff/model/BaseModel.java | 2 +- .../com/fangjia/bkoff/model/ChatConfig.java | 2 +- .../fangjia/bkoff/model/DistrictModel.java | 12 +- .../com/fangjia/bkoff/model/DynamicModel.java | 4 +- .../fangjia/bkoff/model/FileReportModel.java | 40 +- .../com/fangjia/bkoff/model/RankingModel.java | 10 +- .../fangjia/bkoff/model/RiseRateModel.java | 16 +- .../com/fangjia/bkoff/model/RoleModel.java | 4 +- .../fangjia/bkoff/model/TestReportModel.java | 20 +- .../com/fangjia/bkoff/model/UserModel.java | 10 +- .../com/fangjia/bkoff/model/VerifyModel.java | 2 +- .../bkoff/service/AnalyzerInterface.java | 2 +- .../address/AddressAnalyzeService.java | 2 +- .../address/AddressAnalyzeServiceImpl.java | 46 +- .../service/address/AddressScriptService.java | 20 +- .../address/AddressScriptServiceImpl.java | 8 +- .../address/AuthorityGroupService.java | 4 +- .../service/address/AuthorityService.java | 6 +- .../address/DistrictStatisticsService.java | 10 +- .../DistrictStatisticsServiceImpl.java | 14 +- .../address/FileDatasTotalityService.java | 72 +- .../address/FileDetailDataService.java | 10 +- .../bkoff/service/address/RoleService.java | 18 +- .../bkoff/service/address/UserService.java | 38 +- .../service/address/UserServiceImpl.java | 6 +- .../analy/AnjukeDistrictDetailAnalyImpl.java | 70 +- .../analy/DaikanDistrictDetailAnalyImpl.java | 54 +- .../analy/FocusDistrictDetailAnalyImpl.java | 58 +- .../analy/Home365DistrictDetailAnalyImpl.java | 58 +- .../HomeLinkDistrictDetailAnalyImpl.java | 112 +- .../analy/JiwuDistrictDetailAnalyImpl.java | 56 +- .../analy/LoupanDistrictDetailAnalyImpl.java | 88 +- .../analy/SinaDistrictDetailAnalyImpl.java | 76 +- .../analy/SoufunDistrictDetailAnalyImpl.java | 158 +- .../analy/TaofangDistrictDetailAnalyImpl.java | 18 +- .../bkoff/service/bo/FileDatasTotalityBo.java | 14 +- .../bkoff/service/bo/PriceAnalyBo.java | 10 +- .../com/fangjia/bkoff/service/bo/SeedsBo.java | 8 +- .../fangjia/bkoff/service/bo/WebsiteBo.java | 2 +- .../fangjia/bkoff/util/AddressAnalyUtils.java | 4 +- .../com/fangjia/bkoff/util/AddressPOI.java | 746 +- .../com/fangjia/bkoff/util/BaiDuApiUtils.java | 24 +- .../com/fangjia/bkoff/util/BeanUtils.java | 2 +- .../java/com/fangjia/bkoff/util/DesUtils.java | 48 +- .../com/fangjia/bkoff/util/FieldUtils.java | 54 +- .../com/fangjia/bkoff/util/InfoTestUtil.java | 112 +- .../java/com/fangjia/bkoff/util/InfoUtil.java | 86 +- .../com/fangjia/bkoff/util/NewInfoUtil.java | 48 +- .../com/fangjia/bkoff/util/OpenApiClient.java | 40 +- .../com/fangjia/bkoff/util/RegionData.java | 8 +- .../fangjia/bkoff/util/SessionContent.java | 4 +- .../com/fangjia/bkoff/util/TemplateUtils.java | 68 +- .../bkoff/util/UploadHandleServlet.java | 40 +- .../fangjia/address/model/AddressScript.java | 16 +- .../com/fangjia/address/model/Authority.java | 6 +- .../fangjia/address/model/AuthorityGroup.java | 6 +- .../address/model/DistrictStatistics.java | 2 +- .../java/com/fangjia/address/model/Role.java | 8 +- .../java/com/fangjia/address/model/User.java | 14 +- .../fangjia/coredata/dao/CategoryEnum.java | 18 +- .../mongo/dao/AliasUpdateOperationDao.java | 4 +- .../coredata/mongo/dao/AnalyTaskDao.java | 4 +- .../coredata/mongo/dao/DataTypeDao.java | 50 +- .../coredata/mongo/model/AnalyRoad.java | 2 +- .../coredata/mongo/model/AnalySite.java | 26 +- .../mongo/model/CalcDistrictStat.java | 20 +- .../fangjia/coredata/mongo/model/Command.java | 6 +- .../coredata/mongo/model/DistrictAlias.java | 2 +- .../mongo/model/DistrictHousetype.java | 14 +- .../coredata/mongo/model/FieldRule.java | 6 +- .../mongo/model/FileDatasTotality.java | 14 +- .../coredata/mongo/model/FileDetailData.java | 92 +- .../fangjia/coredata/mongo/model/House.java | 8 +- .../fangjia/coredata/mongo/model/Seeds.java | 8 +- .../coredata/mongo/model/Snapshot.java | 10 +- .../coredata/mongo/model/VerifyField.java | 4 +- .../coredata/mongo/model/VerifyRule.java | 26 +- .../fangjia/coredata/mongo/model/Webpage.java | 16 +- .../coredata/mongo/model/WebpageAnalyLog.java | 20 +- .../fangjia/coredata/mongo/model/Website.java | 16 +- .../coredata/mongo/model/WorkFlow.java | 6 +- .../com/fangjia/datastore/model/District.java | 32 +- .../com/fangjia/datastore/model/Seabird.java | 2 +- .../com/fangjia/datastore/model/Seawater.java | 22 +- .../com/fangjia/datastore/model/Seaweed.java | 22 +- .../mongo/dao/AverageStatisticsDao.java | 10 +- .../mongo/dao/BusinessRegionStatDao.java | 2 +- .../fangjia/mongo/dao/DistrictStatDao.java | 26 +- .../mongo/dao/DistrictStatRentDao.java | 2 +- .../fangjia/mongo/dao/GuidingPriceDao.java | 4 +- .../com/fangjia/mongo/dao/RegionBlockDao.java | 8 +- .../com/fangjia/mongo/dao/RegionStatDao.java | 4 +- .../com/fangjia/mongo/dao/RentStatDao.java | 2 +- .../com/fangjia/mongo/dao/ServerAreaDao.java | 4 +- .../mongo/model/AverageStatistics.java | 8 +- .../fangjia/mongo/model/AveragerConfig.java | 40 +- .../com/fangjia/mongo/model/CalcCommand.java | 44 +- .../com/fangjia/mongo/model/CalcConfig.java | 14 +- .../com/fangjia/mongo/model/DealPrice.java | 12 +- .../fangjia/mongo/model/DistrictStatRent.java | 34 +- .../com/fangjia/mongo/model/DynamicLog.java | 30 +- .../com/fangjia/mongo/model/NetworkPrice.java | 28 +- .../com/fangjia/mongo/model/RegionBlock.java | 2 +- .../com/fangjia/mongo/model/RegionStat.java | 4 +- .../fangjia/mongo/model/RegionStatRent.java | 16 +- .../com/fangjia/mongo/model/ServerArea.java | 8 +- .../com/fangjia/mongo/model/SqmetreRent.java | 24 +- .../persistence/AbstractJpaCompatibleDao.java | 26 +- .../fangjia/mongo/persistence/EntityDao.java | 18 +- .../fangjia/coredata/modeana/ModeAnalyze.java | 20 +- .../coredata/price/ConsumerStarter.java | 4 +- .../com/fangjia/coredata/price/Coredata.java | 72 +- .../coredata/price/RentHouseCoredata.java | 32 +- .../price/RentShopOfficeCoredata.java | 8 +- .../price/RetryDistrictRentOperator.java | 2 +- .../coredata/price/SellHouseCoredata.java | 18 +- .../price/SellShopOfficeCoredata.java | 6 +- .../coredata/price/SquareRentCoredata.java | 10 +- .../java/com/fangjia/coredata/price/Test.java | 4 +- .../calc/RentHouseAverageCalculator.java | 82 +- .../calc/RentShopOfficeAverageCalculator.java | 2 +- .../calc/SellHouseAverageCalculator.java | 4 +- .../calc/SellShopOfficeAverageCalculator.java | 6 +- .../coredata/price/conf/CoredataConfig.java | 2 +- .../coredata/price/core/Calculator.java | 10 +- .../fangjia/coredata/price/core/Cluster.java | 14 +- .../coredata/price/core/DataManager.java | 32 +- .../fangjia/coredata/price/core/Operator.java | 8 +- .../fangjia/coredata/price/core/Provider.java | 14 +- .../fangjia/coredata/price/core/Result.java | 28 +- .../coredata/price/core/SqRentResult.java | 30 +- .../price/opt/RentHouseResultOperator.java | 62 +- .../opt/RentShopOfficeResultOperator.java | 42 +- .../price/opt/SellHouseResultOperator.java | 34 +- .../opt/SellShopOfficeResultOperator.java | 76 +- .../price/provider/AbstractProvider.java | 8 +- .../price/provider/RentHouseDataProvider.java | 16 +- .../price/provider/SellHouseDataProvider.java | 4 +- .../provider/SellShopOfficeDataProvider.java | 4 +- .../com/fangjia/coredata/price/tree/Data.java | 10 +- .../coredata/price/tree/DataHolder.java | 12 +- .../coredata/price/util/AsyncThread.java | 2 +- .../coredata/price/util/DataCluster.java | 76 +- .../coredata/price/util/DataCluster2.java | 76 +- .../coredata/price/util/ServiceUtils.java | 2 +- .../coredata/price/ztest/DataCluster3.java | 72 +- .../ztest/DistrictCommandMessageSender.java | 2 +- .../coredata/price/ztest/LineCoefficient.java | 10 +- .../fangjia/coredata/price/ztest/Node.java | 16 +- .../price/ztest/OutlierNodeDetect.java | 14 +- .../fangjia/coredata/util/AddressParser.java | 162 +- .../util/AddressParserConfiguration.java | 10218 +++++------ .../fangjia/coredata/util/AddressUtils.java | 4 +- .../coredata/util/BaiduAddressParser.java | 20 +- .../coredata/util/CollectionUtils.java | 8 +- .../fangjia/coredata/util/InfoAnalyUtil.java | 98 +- .../com/fangjia/coredata/util/JQueryUtil.java | 4 +- .../fangjia/coredata/util/MatcherResult.java | 14 +- .../fangjia/coredata/util/RegexMatcher.java | 44 +- .../fangjia/coredata/util/SellInfoUtil.java | 70 +- .../fangjia/coredata/verify/FieldProcess.java | 56 +- .../coredata/verify/FieldValidator.java | 18 +- .../fangjia/coredata/webdata/Analyzer.java | 102 +- .../coredata/webdata/AnalyzerConfig.java | 2 +- .../coredata/webdata/DistrictDiscoverer.java | 24 +- .../coredata/webdata/WebpageAnalyzer.java | 170 +- .../fangjia/coredata/webdata/e/AnaMode.java | 6 +- .../webpage/DynamicWebpageAnalyzer.java | 62 +- .../coredata/webpage/PageCollector.java | 18 +- .../coredata/webpage/PageExecutor.java | 12 +- projects/fangjia-coresite/pom.xml | 4 +- .../coresite/CheckLoginInterceptor.java | 6 +- .../CoresiteContextLoaderListener.java | 6 +- .../com/fangjia/coresite/FangjiaConfig.java | 16 +- .../com/fangjia/coresite/FangjiaRudder.java | 34 +- .../fangjia/coresite/FangjiaUrlMapper.java | 16 +- .../coresite/controllers/AboutController.java | 2 +- .../coresite/controllers/AdController.java | 114 +- .../controllers/AddressAnalyController.java | 124 +- .../AddressEvaluationController.java | 20 +- .../controllers/AdvisoryMoreController.java | 30 +- .../controllers/AgreementController.java | 150 +- .../controllers/ApartmentController.java | 122 +- .../coresite/controllers/ApiController.java | 92 +- .../controllers/ApplyApiController.java | 92 +- .../controllers/AutoCompleteController.java | 30 +- .../controllers/BrokerController.java | 2 +- .../controllers/CompanyController.java | 10 +- .../controllers/ContactController.java | 52 +- .../coresite/controllers/Controller.java | 66 +- .../controllers/CpcClickController.java | 10 +- .../controllers/DaikuanController.java | 70 +- .../controllers/DiaoyudaoController.java | 8 +- .../controllers/DistrictController.java | 130 +- .../controllers/DistrictReportController.java | 360 +- .../controllers/ElevateWordController.java | 38 +- .../controllers/EvaluationController.java | 612 +- .../EvaluationPriceController.java | 34 +- .../EvaluationPurposeAnalysisController.java | 4 +- .../EvaluationReportController.java | 144 +- .../EvaluationSearchController.java | 18 +- .../controllers/FangjiaController.java | 156 +- .../controllers/FirstTitleController.java | 6 +- .../controllers/FjtLoginController.java | 8 +- .../controllers/FlashChartController.java | 26 +- .../controllers/GetImageController.java | 2 +- .../coresite/controllers/GjsController.java | 4 +- .../controllers/GoogleChartController.java | 4 +- .../coresite/controllers/HelpController.java | 8 +- .../coresite/controllers/HouseController.java | 80 +- .../controllers/HouseReportController.java | 62 +- .../controllers/IndustryController.java | 26 +- .../controllers/InformationController.java | 92 +- .../controllers/InputErrorController.java | 2 +- .../LoanBurialPointController.java | 34 +- .../controllers/LoanLeadsController.java | 200 +- .../coresite/controllers/LoginController.java | 6 +- .../controllers/LogoutController.java | 2 +- .../coresite/controllers/MallController.java | 8 +- .../coresite/controllers/MapController.java | 138 +- .../controllers/MobileController.java | 2 +- .../controllers/NewDistrictController.java | 98 +- .../coresite/controllers/NewsController.java | 66 +- .../controllers/PersonalcenterController.java | 132 +- .../controllers/PriceSubscribeController.java | 6 +- .../controllers/ProductController.java | 6 +- .../controllers/RechargeController.java | 202 +- .../controllers/RecommendController.java | 32 +- .../controllers/RentHouseController.java | 64 +- .../RentHouseReportController.java | 42 +- .../RentHouseSearchController.java | 140 +- .../controllers/ReportController.java | 4 +- .../controllers/ReportDetailController.java | 116 +- .../controllers/ResourceController.java | 20 +- .../controllers/SaleLeadsController.java | 112 +- .../controllers/SchoolController.java | 20 +- .../SellHouseReportController.java | 28 +- .../SellHouseSearchController.java | 142 +- .../controllers/SitemapController.java | 226 +- .../controllers/SnapDataController.java | 28 +- .../controllers/SolutionController.java | 56 +- .../coresite/controllers/TaskController.java | 10 +- .../coresite/controllers/TermsController.java | 8 +- .../coresite/controllers/TrendController.java | 72 +- .../coresite/controllers/UserController.java | 106 +- .../controllers/UserFeelingController.java | 20 +- .../coresite/controllers/WapController.java | 8 +- .../controllers/WithHoldController.java | 10 +- .../controllers/WordMapController.java | 4 +- .../YinLianEvaluationController.java | 62 +- .../controllers/user/DingyueController.java | 4 +- .../controllers/user/UserController.java | 72 +- .../coresite/filters/AccessLogFilter.java | 6 +- .../coresite/filters/AnalyticsBean.java | 44 +- .../coresite/filters/AnalyticsFilter.java | 30 +- .../coresite/filters/AntiSpiderFilter.java | 8 +- .../filters/SpiderValidateFilter.java | 24 +- .../fangjia/coresite/filters/XSSFilter.java | 10 +- .../coresite/filters/XssFilterWrapper.java | 22 +- .../filters/spider/UserBehaviorSnapshoot.java | 4 +- .../com/fangjia/coresite/http/CharSet.java | 4 +- .../coresite/http/HttpFormParameter.java | 4 +- .../fangjia/coresite/http/HttpSendModel.java | 24 +- .../coresite/http/SimpleHttpClient.java | 14 +- .../coresite/http/SimpleHttpResponse.java | 4 +- .../coresite/model/AdviceLeadsModel.java | 12 +- .../coresite/model/AgreementModel.java | 50 +- .../coresite/model/ApartmentModel.java | 64 +- .../com/fangjia/coresite/model/ApiModel.java | 54 +- .../coresite/model/ApplyLoanModel.java | 20 +- .../com/fangjia/coresite/model/BaseModel.java | 10 +- .../fangjia/coresite/model/BeansModel.java | 10 +- .../model/ConditionAndFactorModel.java | 4 +- .../fangjia/coresite/model/DaikuanModel.java | 2 +- .../fangjia/coresite/model/DistrictModel.java | 24 +- .../coresite/model/DistrictReportModel.java | 244 +- .../coresite/model/ElevateWordModel.java | 6 +- .../model/EvaluationChannelModel.java | 10 +- .../coresite/model/EvaluationJsonModel.java | 24 +- .../coresite/model/EvaluationModel.java | 136 +- .../coresite/model/EvaluationPriceModel.java | 8 +- .../model/EvaluationPurposeAnalysisModel.java | 10 +- .../coresite/model/EvaluationResultModel.java | 64 +- .../fangjia/coresite/model/FangjiaModel.java | 22 +- .../coresite/model/FriendLinkModel.java | 8 +- .../com/fangjia/coresite/model/Gakey.java | 10 +- .../com/fangjia/coresite/model/HelpModel.java | 2 +- .../fangjia/coresite/model/HouseModel.java | 32 +- .../coresite/model/HouseReportModel.java | 40 +- .../coresite/model/ImageManagerModel.java | 6 +- .../coresite/model/InformationModel.java | 10 +- .../coresite/model/InputUserInfoModel.java | 14 +- .../coresite/model/LoanBurialPointModel.java | 12 +- .../coresite/model/LoanLeadsModel.java | 40 +- .../com/fangjia/coresite/model/MapModel.java | 24 +- .../com/fangjia/coresite/model/Models.java | 6 +- .../coresite/model/NewDistrictModel.java | 8 +- .../com/fangjia/coresite/model/NewsModel.java | 14 +- .../coresite/model/OfcConfigModel.java | 6 +- .../fangjia/coresite/model/PaymentModel.java | 46 +- .../coresite/model/PersonalcenterModel.java | 12 +- .../coresite/model/RechargeHistoryModel.java | 6 +- .../coresite/model/RentHouseModel.java | 32 +- .../coresite/model/ReportDetailModel.java | 110 +- .../fangjia/coresite/model/ResourceModel.java | 8 +- .../coresite/model/RestfulModelAndView.java | 2 +- .../fangjia/coresite/model/SchoolModel.java | 14 +- .../fangjia/coresite/model/SiteMapModel.java | 2 +- .../coresite/model/SuzhouHistoryModel.java | 6 +- .../model/SuzhouMobileEvalResultModel.java | 54 +- .../model/SuzhouMobileReportModel.java | 18 +- .../coresite/model/SuzhouReportModel.java | 12 +- .../fangjia/coresite/model/TrendModel.java | 6 +- .../com/fangjia/coresite/model/UserModel.java | 2 +- .../fangjia/coresite/model/UsersModel.java | 4 +- .../coresite/model/WithHoldInfoModel.java | 2 +- .../model/YinLianEvaluationModel.java | 6 +- .../model/address/AddressAnalyJsonModel.java | 26 +- .../model/address/AddressAnalyModel.java | 22 +- .../model/address/AddressAnalyPriceInfo.java | 4 +- .../model/address/DistrictFloatInfo.java | 4 +- .../model/address/DistrictTotalPriceInfo.java | 8 +- .../model/address/DistrictTypeCountInfo.java | 10 +- .../model/address/PriceSectionInfo.java | 8 +- .../coresite/model/address/RegionInfo.java | 8 +- .../coresite/model/api/ApiDetailVo.java | 2 +- .../coresite/model/api/ApiJsonModel.java | 2 +- .../coresite/model/api/ApiTestApplyModel.java | 16 +- .../coresite/model/api/ApiVisitRecord.java | 8 +- .../coresite/model/api/EvaluationVo.java | 8 +- .../recharge/ApiPurchaseRecordModel.java | 8 +- .../model/recharge/RechargeModel.java | 18 +- .../fangjia/coresite/model/report/Fonts.java | 2 +- .../coresite/model/report/PdfBlock.java | 2 +- .../fangjia/coresite/model/report/Report.java | 14 +- .../coresite/model/report/ReportCreator.java | 144 +- .../coresite/model/report/ReportModel.java | 2 +- .../model/report/ReportModelAndView.java | 2 +- .../fangjia/coresite/model/sitemap/Url.java | 4 +- .../coresite/model/suzhouApplyLoanModel.java | 38 +- .../coresite/model/suzhouEvalResultModel.java | 70 +- .../coresite/model/user/BindMobileModel.java | 4 +- .../coresite/model/user/FangjiaUserModel.java | 18 +- .../fangjia/coresite/model/user/Message.java | 36 +- .../model/user/SendCodeJsonModel.java | 6 +- .../coresite/model/user/SendCodeModel.java | 8 +- .../coresite/model/user/UserLoginModel.java | 6 +- .../coresite/model/user/UserRegJsonModel.java | 4 +- .../coresite/model/user/UserRegModel.java | 14 +- .../coresite/servlet/ChartImgServlet.java | 56 +- .../coresite/servlet/Report2Servlet.java | 12 +- .../coresite/servlet/Report3Servlet.java | 12 +- .../coresite/servlet/ReportServlet.java | 18 +- .../coresite/servlet/ReportSplitServlet.java | 4 +- .../fangjia/coresite/servlet/SafeCode.java | 30 +- .../fangjia/coresite/servlet/SvgServlet.java | 18 +- .../servlet/UploadEvaluationServlet.java | 18 +- .../coresite/servlet/UploadHandleServlet.java | 40 +- .../com/fangjia/coresite/util/CommonUtil.java | 22 +- .../com/fangjia/coresite/util/DesUtils.java | 48 +- .../fangjia/coresite/util/FlashMapUtil.java | 92 +- .../com/fangjia/coresite/util/HttpUtil.java | 18 +- .../fangjia/coresite/util/InsidePolygon.java | 10 +- .../fangjia/coresite/util/JXMConvertUtil.java | 14 +- .../com/fangjia/coresite/util/LoginUtil.java | 2 +- .../com/fangjia/coresite/util/MapToXml.java | 6 +- .../com/fangjia/coresite/util/Polygon.java | 14 +- .../com/fangjia/coresite/util/RSAUtils.java | 114 +- .../coresite/util/RegionDirective.java | 6 +- .../fangjia/coresite/util/RsaCodingUtil.java | 96 +- .../com/fangjia/coresite/util/RsaConst.java | 6 +- .../fangjia/coresite/util/RsaReadUtil.java | 30 +- .../com/fangjia/coresite/util/SimRandom.java | 26 +- .../fangjia/coresite/util/SogouConverter.java | 34 +- .../fangjia/coresite/util/SourceUtils.java | 4 +- projects/fangjia-dal/pom.xml | 4 +- .../com/fangjia/dal/AbstractEntityDao.java | 20 +- .../fangjia/dal/AbstractJpaCompatibleDao.java | 28 +- .../com/fangjia/dal/AbstractMongoDao.java | 28 +- .../java/com/fangjia/dal/AbstractSqlDao.java | 4 +- .../com/fangjia/dal/DatastoreDaoImpl.java | 2 +- .../main/java/com/fangjia/dal/EntityDao.java | 68 +- .../main/java/com/fangjia/dal/MongoDao.java | 16 +- .../java/com/fangjia/dal/MongoDaoImpl.java | 16 +- .../main/java/com/fangjia/dal/QueryParam.java | 4 +- .../java/com/fangjia/dal/SeaweedDaoImpl.java | 2 +- .../com/fangjia/dal/common/CategoryEnum.java | 2 +- .../com/fangjia/dal/common/DistrictKey.java | 4 +- .../com/fangjia/dal/common/RegionKey.java | 2 +- .../com/fangjia/dal/common/SchoolKey.java | 4 +- .../fangjia/dal/common/ServerAreaData.java | 28 +- .../dal/common/ServerAreaDataImpl.java | 4 +- .../java/com/fangjia/dal/common/XcxKey.java | 2 +- .../dal/datastore/model/AddressRepo.java | 4 +- .../fangjia/dal/datastore/model/House.java | 8 +- .../dal/datastore/model/Information.java | 10 +- .../com/fangjia/dal/datastore/model/News.java | 8 +- .../dal/datastore/model/OfficeHouseRent.java | 4 +- .../dal/datastore/model/OfficeHouseSell.java | 8 +- .../dal/datastore/model/RentHouse.java | 12 +- .../dal/datastore/model/ShopHouseRent.java | 4 +- .../dal/datastore/model/ShopHouseSell.java | 8 +- .../address/model/AMapAddressPOIResult.java | 4 +- .../fangjia/dal/mongo/cpc/dao/CpcStatDao.java | 10 +- .../dal/mongo/cpc/dao/CpcStatDaoImpl.java | 6 +- .../dao/AdministrativeDivisionDaoImpl.java | 2 +- .../dal/mongo/dao/AliasFangDaoImpl.java | 2 +- .../dal/mongo/dao/ApiUserCfgDaoImpl.java | 2 +- .../dal/mongo/dao/BizRegionStatDao.java | 4 +- .../dal/mongo/dao/CpcClickDetailLogDao.java | 18 +- .../dal/mongo/dao/DistrictCodeDaoImpl.java | 2 +- .../dal/mongo/dao/DistrictUpdateTaskDao.java | 8 +- .../mongo/dao/DistrictUpdateTaskDaoImpl.java | 8 +- .../dal/mongo/dao/PaphEvaluateDaoImpl.java | 2 +- .../dal/mongo/dao/RegionMigrateDao.java | 2 +- .../dal/mongo/dao/RegionMigrateDaoImpl.java | 2 +- .../fangjia/dal/mongo/dao/RegionStatDao.java | 2 +- .../dao/SearchWordsAnalyticsDaoImpl.java | 2 +- .../fangjia/dal/mongo/dao/UserClickDao.java | 2 +- .../fangjia/dal/mongo/dao/UserFeelingDao.java | 2 +- .../fangjia/dal/mongo/dao/UserHouseDao.java | 14 +- .../mongo/dao/bkoff/ApiMonitorTaskDao.java | 2 +- .../dao/bkoff/ApiMonitorTaskDaoImpl.java | 2 +- .../dal/mongo/dao/bkoff/BkoffUsersDao.java | 2 +- .../mongo/fangjia/enums/AdLocationEnum.java | 4 +- .../dal/mongo/fangjia/enums/AdSourceEnum.java | 16 +- .../dal/mongo/fangjia/enums/AdTypeEnum.java | 4 +- .../mongo/fangjia/enums/ChannelTypeEnum.java | 2 +- .../fangjia/enums/CustomerSituationEnum.java | 10 +- .../mongo/fangjia/enums/IntentTypeEnum.java | 16 +- .../fangjia/enums/LoanBurialPointEnum.java | 36 +- .../enums/LoanProductPositionEnum.java | 4 +- .../mongo/fangjia/enums/LoanPurposeEnum.java | 4 +- .../dal/mongo/fangjia/enums/LoanTypeEnum.java | 4 +- .../enums/NewResourceRecommendEnum.java | 78 +- .../fangjia/enums/NewsResourceTypeEnum.java | 10 +- .../mongo/fangjia/enums/ReportTypeEnum.java | 4 +- .../mongo/fangjia/enums/SalesLeadEnum.java | 66 +- .../fangjia/enums/SupplierFeedbackEnum.java | 30 +- .../dal/mongo/fangjia/model/AdviceLeads.java | 22 +- .../mongo/fangjia/model/CopyrightConfig.java | 14 +- .../model/EvaluationPurposeAnalysis.java | 38 +- .../dal/mongo/fangjia/model/FangJiaUser.java | 26 +- .../dal/mongo/fangjia/model/ImageManager.java | 12 +- .../mongo/fangjia/model/LoanBurialPoint.java | 28 +- .../dal/mongo/fangjia/model/LoanLeads.java | 76 +- .../dal/mongo/fangjia/model/LoanProduct.java | 46 +- .../mongo/fangjia/model/LoanProductTag.java | 10 +- .../dal/mongo/fangjia/model/LoanPush.java | 40 +- .../dal/mongo/fangjia/model/LoanPushLog.java | 12 +- .../dal/mongo/fangjia/model/MatchRule.java | 14 +- .../dal/mongo/fangjia/model/Mechanism.java | 12 +- .../dal/mongo/fangjia/model/NewsResource.java | 26 +- .../dal/mongo/fangjia/model/PaiMai.java | 82 +- .../dal/mongo/fangjia/model/SaleLeads.java | 48 +- .../dal/mongo/fangjia/model/ServerArea.java | 10 +- .../dal/mongo/fangjia/model/UrlFilter.java | 2 +- .../fangjia/model/YinLianEvaluation.java | 14 +- .../mongo/fangjia/model/YinLianUserInfo.java | 8 +- .../dal/mongo/mobile/model/DistrictMSG.java | 14 +- .../mongo/mobile/model/DistrictMSGReply.java | 12 +- .../dal/mongo/mobile/model/Favorite.java | 18 +- .../dal/mongo/mobile/model/SearchKeyword.java | 12 +- .../fangjia/dal/mongo/mobile/model/User.java | 14 +- .../mongo/mobile/model/UserCallRecord.java | 12 +- .../dal/mongo/mobile/model/UserComplaint.java | 22 +- .../dal/mongo/mobile/model/UserFeedback.java | 14 +- .../mongo/mobile/model/UserGeolocation.java | 14 +- .../dal/mongo/mobile/model/UserHistory.java | 16 +- .../dal/mongo/mobile/model/UserSign.java | 12 +- .../com/fangjia/dal/mongo/model/AdSpace.java | 26 +- .../fangjia/dal/mongo/model/AddressCheck.java | 22 +- .../fangjia/dal/mongo/model/AddressInfo.java | 4 +- .../fangjia/dal/mongo/model/AddressMatch.java | 2 +- .../dal/mongo/model/AddressMatchLog.java | 16 +- .../fangjia/dal/mongo/model/AddressTask.java | 2 +- .../dal/mongo/model/AgencyTradeRank.java | 12 +- .../fangjia/dal/mongo/model/AgentCompany.java | 16 +- .../fangjia/dal/mongo/model/AgentMaster.java | 8 +- .../fangjia/dal/mongo/model/Agreement.java | 32 +- .../fangjia/dal/mongo/model/AliasFang.java | 2 +- .../com/fangjia/dal/mongo/model/AmapPoi.java | 2 +- .../fangjia/dal/mongo/model/ApiBuyApply.java | 6 +- .../fangjia/dal/mongo/model/ApiCountLog.java | 4 +- .../fangjia/dal/mongo/model/ApiDetail.java | 10 +- .../dal/mongo/model/ApiInvokeStatistical.java | 16 +- .../com/fangjia/dal/mongo/model/ApiParam.java | 10 +- .../fangjia/dal/mongo/model/ApiUserCfg.java | 4 +- .../dal/mongo/model/AverageAnalysis.java | 2 +- .../dal/mongo/model/AverageStatistics.java | 38 +- .../fangjia/dal/mongo/model/AvgSearch.java | 32 +- .../dal/mongo/model/BaiduPlacePoi.java | 20 +- .../fangjia/dal/mongo/model/BasicScore.java | 40 +- .../dal/mongo/model/BatchEvaluateLog.java | 2 +- .../dal/mongo/model/BatchEvaluateTask.java | 10 +- .../fangjia/dal/mongo/model/BeansTask.java | 2 +- .../dal/mongo/model/BeansTaskSubmit.java | 12 +- .../dal/mongo/model/BizRegionStat.java | 2 +- .../com/fangjia/dal/mongo/model/BizShop.java | 30 +- .../fangjia/dal/mongo/model/BsEvaluation.java | 2 +- .../fangjia/dal/mongo/model/BusStation.java | 6 +- .../fangjia/dal/mongo/model/BusinessShop.java | 42 +- .../dal/mongo/model/CalcDistrictStat.java | 18 +- .../com/fangjia/dal/mongo/model/CityHot.java | 10 +- .../fangjia/dal/mongo/model/CityNewPrice.java | 14 +- .../dal/mongo/model/CityPriceInterval.java | 20 +- .../fangjia/dal/mongo/model/CitySellStat.java | 12 +- .../mongo/model/CollateralEvaluationInfo.java | 46 +- .../com/fangjia/dal/mongo/model/CommData.java | 14 +- .../dal/mongo/model/CompanyScoreRank.java | 2 +- .../dal/mongo/model/CompareDataStat.java | 18 +- .../dal/mongo/model/ConsumerAddress.java | 14 +- .../dal/mongo/model/CpcSiteWhiteList.java | 2 +- .../dal/mongo/model/CpdbApplication.java | 2 +- .../dal/mongo/model/CustomerConsult.java | 8 +- .../dal/mongo/model/CzbankSampleLog.java | 4 +- .../fangjia/dal/mongo/model/DaikuanFail.java | 2 +- .../fangjia/dal/mongo/model/Developer.java | 14 +- .../dal/mongo/model/DevelopmentZone.java | 6 +- .../fangjia/dal/mongo/model/Diaoyudao.java | 2 +- .../dal/mongo/model/DingMeetingRobot.java | 2 +- .../dal/mongo/model/DistrictAnalyData.java | 26 +- .../mongo/model/DistrictAttentionRank.java | 2 +- .../fangjia/dal/mongo/model/DistrictCode.java | 4 +- .../dal/mongo/model/DistrictFacilitys.java | 10 +- .../fangjia/dal/mongo/model/DistrictHot.java | 26 +- .../dal/mongo/model/DistrictHouse.java | 2 +- .../model/DistrictHouseResourceStat.java | 16 +- .../dal/mongo/model/DistrictNearby.java | 2 +- .../dal/mongo/model/DistrictNewPrice.java | 52 +- .../dal/mongo/model/DistrictPriceLevel.java | 14 +- .../dal/mongo/model/DistrictRelation.java | 2 +- .../dal/mongo/model/DistrictSellStat.java | 18 +- .../fangjia/dal/mongo/model/DistrictStat.java | 26 +- .../dal/mongo/model/DistrictStatRent.java | 2 +- .../dal/mongo/model/DistrictTradeAnalyse.java | 70 +- .../dal/mongo/model/DistrictTradeCount.java | 4 +- .../dal/mongo/model/DistrictUpdateTask.java | 2 +- .../fangjia/dal/mongo/model/ElevateWord.java | 12 +- .../dal/mongo/model/EntityClassObj.java | 2 +- .../dal/mongo/model/EvaluateApplication.java | 2 +- .../dal/mongo/model/EvaluateCompany.java | 4 +- .../dal/mongo/model/EvaluateMaster.java | 24 +- .../fangjia/dal/mongo/model/Evaluation.java | 114 +- .../dal/mongo/model/EvaluationCondition.java | 10 +- .../dal/mongo/model/EvaluationFactor.java | 10 +- .../dal/mongo/model/EvaluationHistory.java | 94 +- .../dal/mongo/model/EvaluationPrice.java | 34 +- .../dal/mongo/model/EvaluationReport.java | 18 +- .../dal/mongo/model/FSHAlgorithmRule.java | 60 +- .../dal/mongo/model/FTCustomerRed.java | 2 +- .../fangjia/dal/mongo/model/FTLoanRed.java | 2 +- .../dal/mongo/model/FangjiaCommonLog.java | 2 +- .../mongo/model/FangjiaOfficialAreaMap.java | 2 +- .../com/fangjia/dal/mongo/model/Feedback.java | 2 +- .../fangjia/dal/mongo/model/FieldRole.java | 2 +- .../dal/mongo/model/FjtUserGoldFreeze.java | 6 +- .../fangjia/dal/mongo/model/FriendLink.java | 14 +- .../com/fangjia/dal/mongo/model/Guzhi.java | 4 +- .../fangjia/dal/mongo/model/HouseData.java | 2 +- .../fangjia/dal/mongo/model/HouseLoudong.java | 64 +- .../fangjia/dal/mongo/model/HousePrice.java | 8 +- .../dal/mongo/model/HouseProperty.java | 34 +- .../dal/mongo/model/HouseQuoteLevel.java | 2 +- .../fangjia/dal/mongo/model/HouseStat.java | 2 +- .../fangjia/dal/mongo/model/HouseSummary.java | 2 +- .../dal/mongo/model/HouseTradeHistory.java | 2 +- .../fangjia/dal/mongo/model/IndexScore.java | 2 +- .../dal/mongo/model/InputUserInfo.java | 20 +- .../fangjia/dal/mongo/model/LandPrice.java | 2 +- .../dal/mongo/model/LandPriceIndex.java | 2 +- .../dal/mongo/model/LatlngPolygon.java | 12 +- .../dal/mongo/model/LoanAgreement.java | 24 +- .../fangjia/dal/mongo/model/LoanWithHold.java | 30 +- .../dal/mongo/model/LoanWithHoldLog.java | 26 +- .../dal/mongo/model/ManagementCompany.java | 10 +- .../fangjia/dal/mongo/model/MappingUrl.java | 2 +- .../fangjia/dal/mongo/model/Messenger.java | 4 +- .../com/fangjia/dal/mongo/model/Metro.java | 2 +- .../fangjia/dal/mongo/model/MetroLine.java | 2 +- .../fangjia/dal/mongo/model/MortgageInfo.java | 26 +- .../fangjia/dal/mongo/model/NetworkPrice.java | 28 +- .../dal/mongo/model/NetworkPriceTask.java | 2 +- .../com/fangjia/dal/mongo/model/NewsInfo.java | 4 +- .../dal/mongo/model/NoHouseDistrict.java | 10 +- .../dal/mongo/model/NoLatlngDistrict.java | 4 +- .../fangjia/dal/mongo/model/OpenUriLog.java | 18 +- .../fangjia/dal/mongo/model/OperationLog.java | 2 +- .../fangjia/dal/mongo/model/PaphEvaluate.java | 8 +- .../com/fangjia/dal/mongo/model/PdsRatio.java | 16 +- .../fangjia/dal/mongo/model/PriceJiucuo.java | 8 +- .../fangjia/dal/mongo/model/PricePredict.java | 2 +- .../dal/mongo/model/PricePredictFactor.java | 2 +- .../dal/mongo/model/PriceSubscribe.java | 2 +- .../dal/mongo/model/PropertyRegisterInfo.java | 52 +- .../dal/mongo/model/PropertyStatsIndex.java | 2 +- .../fangjia/dal/mongo/model/Recommend.java | 2 +- .../dal/mongo/model/RegTimeAndEvaTime.java | 4 +- .../fangjia/dal/mongo/model/RegionBlock.java | 4 +- .../dal/mongo/model/RegionMigrate.java | 2 +- .../dal/mongo/model/RegionSellStat.java | 14 +- .../fangjia/dal/mongo/model/RegionStat.java | 4 +- .../dal/mongo/model/RegionStatRank.java | 6 +- .../dal/mongo/model/RegionStatTrend.java | 10 +- .../dal/mongo/model/RegionTradeStat.java | 10 +- .../fangjia/dal/mongo/model/ReportSplit.java | 18 +- .../fangjia/dal/mongo/model/ReportTaste.java | 18 +- .../dal/mongo/model/SchoolRelateDistrict.java | 2 +- .../dal/mongo/model/SearchWordsAnalytics.java | 2 +- .../dal/mongo/model/SixSellMountLevel.java | 4 +- .../com/fangjia/dal/mongo/model/SmsCode.java | 2 +- .../com/fangjia/dal/mongo/model/SnapData.java | 12 +- .../fangjia/dal/mongo/model/StatsIndex.java | 2 +- .../com/fangjia/dal/mongo/model/Task.java | 60 +- .../fangjia/dal/mongo/model/TaskResult.java | 22 +- .../com/fangjia/dal/mongo/model/Township.java | 4 +- .../fangjia/dal/mongo/model/UnRelation.java | 2 +- .../fangjia/dal/mongo/model/UserClick.java | 10 +- .../fangjia/dal/mongo/model/UserFeeling.java | 14 +- .../fangjia/dal/mongo/model/UserHouse.java | 2 +- .../dal/mongo/model/VillageIdentify.java | 24 +- .../dal/mongo/model/WeixinTaskUser.java | 2 +- .../fangjia/dal/mongo/model/YdDealPrice.java | 12 +- .../fangjia/dal/mongo/model/bkoff/AdLog.java | 18 +- .../dal/mongo/model/bkoff/Advertisement.java | 38 +- .../dal/mongo/model/bkoff/ApiMonitorTask.java | 2 +- .../mongo/model/bkoff/ApiSearchKeyword.java | 4 +- .../dal/mongo/model/bkoff/AuctionRecord.java | 2 +- .../dal/mongo/model/bkoff/AveragerConfig.java | 38 +- .../model/bkoff/AveragerQualityReport.java | 16 +- .../dal/mongo/model/bkoff/BidRecord.java | 42 +- .../dal/mongo/model/bkoff/BkoffUsers.java | 8 +- .../dal/mongo/model/bkoff/CalcCommand.java | 50 +- .../dal/mongo/model/bkoff/CalcConfig.java | 10 +- .../dal/mongo/model/bkoff/CityInfo.java | 42 +- .../dal/mongo/model/bkoff/DealCountStat.java | 36 +- .../dal/mongo/model/bkoff/DealPrice.java | 14 +- .../dal/mongo/model/bkoff/DealPriceStat.java | 2 +- .../dal/mongo/model/bkoff/DealSample.java | 2 +- .../fangjia/dal/mongo/model/bkoff/DiKuai.java | 78 +- .../dal/mongo/model/bkoff/DistrictInfo.java | 20 +- .../dal/mongo/model/bkoff/GuidingPrice.java | 38 +- .../dal/mongo/model/bkoff/HouseAuction.java | 2 +- .../dal/mongo/model/bkoff/HouseCountStat.java | 12 +- .../dal/mongo/model/bkoff/HouseLoudong.java | 34 +- .../dal/mongo/model/bkoff/InquiryUsers.java | 4 +- .../dal/mongo/model/bkoff/Loudong.java | 70 +- .../dal/mongo/model/bkoff/NewHouse.java | 4 +- .../dal/mongo/model/bkoff/OfficeInfo.java | 10 +- .../dal/mongo/model/bkoff/RegionInfo.java | 18 +- .../model/bkoff/SampleQualityReport.java | 10 +- .../dal/mongo/model/bkoff/TestHouse.java | 6 +- .../dal/mongo/model/bkoff/UserAgentStat.java | 2 +- .../dal/mongo/model/bkoff/WeixinMsg.java | 16 +- .../dal/mongo/model/bkoff/WeixinReply.java | 6 +- .../mongo/model/bkoff/WeixinUserLocation.java | 4 +- .../mongo/model/bkoff/XcxActivityInfo.java | 18 +- .../dal/mongo/model/bkoff/XcxEvaluation.java | 2 +- .../dal/mongo/model/bkoff/XcxLoanInfo.java | 4 +- .../dal/mongo/model/bkoff/XcxUserInfo.java | 6 +- .../dal/mongo/model/loan/FjBaseLoan.java | 74 +- .../dal/mongo/model/loan/FjBusinessLoan.java | 2 +- .../dal/mongo/model/loan/FjCarLoan.java | 2 +- .../mongo/model/loan/FjConsumptionLoan.java | 2 +- .../dal/mongo/model/loan/FjHouseLoan.java | 6 +- .../dal/mongo/model/loan/FjLoanAgency.java | 2 +- .../dal/mongo/model/loan/FjLoanRate.java | 8 +- .../dal/mongo/model/loan/FjLoanUser.java | 4 +- .../mongo/open/model/ApiJsonViewConfig.java | 6 +- .../mongo/open/model/ApiUserAuthority.java | 6 +- .../mongo/open/model/CommunityBasePrice.java | 2 +- .../dal/mongo/open/model/CommunityPoi.java | 4 +- .../dal/mongo/open/model/EvaluateRatio.java | 2 +- .../fangjia/dal/mongo/open/model/OffSet.java | 2 +- .../dal/mongo/open/model/OpenResource.java | 2 +- .../fangjia/dal/mongo/open/model/PoiAmap.java | 2 +- .../dal/mongo/open/model/RegionPotential.java | 2 +- .../dal/mongo/pds/model/AlgorithmRule.java | 60 +- .../dal/mongo/pds/model/ApiCallLimit.java | 4 +- .../mongo/pds/model/ApiCallLimitDetail.java | 14 +- .../dal/mongo/pds/model/Authority.java | 6 +- .../dal/mongo/pds/model/AuthorityGroup.java | 6 +- .../dal/mongo/pds/model/BankLoanRate.java | 8 +- .../fangjia/dal/mongo/pds/model/Borrower.java | 102 +- .../dal/mongo/pds/model/BorrowerInfo.java | 36 +- .../mongo/pds/model/BorrowerInfoMonitor.java | 14 +- .../fangjia/dal/mongo/pds/model/CollRate.java | 4 +- .../pds/model/CollateralEvaluationInfo.java | 150 +- .../mongo/pds/model/DistrictHouseNumber.java | 14 +- .../mongo/pds/model/DistrictRoomNumber.java | 14 +- .../fangjia/dal/mongo/pds/model/EamUser.java | 2 +- .../fangjia/dal/mongo/pds/model/Employee.java | 20 +- .../dal/mongo/pds/model/Enterprise.java | 62 +- .../dal/mongo/pds/model/EquipmentInfo.java | 10 +- .../mongo/pds/model/EvaluationBeforeLoan.java | 142 +- .../dal/mongo/pds/model/FileDataDetail.java | 30 +- .../mongo/pds/model/FileDataDetailBatch.java | 40 +- .../dal/mongo/pds/model/FileDataTotality.java | 14 +- .../pds/model/FileDataTotalityBatch.java | 14 +- .../dal/mongo/pds/model/HourseTypeStat.java | 26 +- .../dal/mongo/pds/model/HouseInfo.java | 56 +- .../dal/mongo/pds/model/HouseInfoMonitor.java | 32 +- .../dal/mongo/pds/model/HouseLevelInfo.java | 26 +- .../dal/mongo/pds/model/LoanApply.java | 14 +- .../fangjia/dal/mongo/pds/model/LoanRate.java | 10 +- .../dal/mongo/pds/model/ManualInquiry.java | 44 +- .../dal/mongo/pds/model/MortgageDetail.java | 18 +- .../mongo/pds/model/NeedCollateralRate.java | 6 +- .../model/OnceCollateralEvaluationInfo.java | 40 +- .../dal/mongo/pds/model/PdsAlgorithmRule.java | 60 +- .../dal/mongo/pds/model/PdsNotice.java | 16 +- .../dal/mongo/pds/model/PdsNoticeVo.java | 12 +- .../dal/mongo/pds/model/PdsRiskMap.java | 36 +- .../dal/mongo/pds/model/PeopleInquiry.java | 18 +- .../pds/model/ReportAuthorizationCode.java | 32 +- .../dal/mongo/pds/model/ReportCheck.java | 44 +- .../dal/mongo/pds/model/ReportInput.java | 88 +- .../mongo/pds/model/ReportPreAuthCheck.java | 40 +- .../mongo/pds/model/ReportRequestApiLogs.java | 20 +- .../dal/mongo/pds/model/ReportResult.java | 388 +- .../dal/mongo/pds/model/RiskControl.java | 26 +- .../mongo/pds/model/RiskControlDetail.java | 46 +- .../fangjia/dal/mongo/pds/model/RiskWarn.java | 12 +- .../com/fangjia/dal/mongo/pds/model/Role.java | 10 +- .../dal/mongo/pds/model/SmartInput.java | 38 +- .../mongo/pds/model/UploadDataTotality.java | 2 +- .../dal/mongo/pds/model/UsageRate.java | 4 +- .../com/fangjia/dal/mongo/pds/model/User.java | 38 +- .../reda/dao/BrokerDisplayAnalysisDao.java | 4 +- .../dal/mongo/reda/dao/CacheKeyDaoImpl.java | 2 +- .../mongo/reda/dao/HouseAnalysisDaoImpl.java | 2 +- .../mongo/reda/dao/ZjtBrokerCompanyDao.java | 4 +- .../dal/mongo/reda/dao/ZjtBrokerDao.java | 2 +- .../mongo/reda/dao/ZjtDeleteHouseLogDao.java | 4 +- .../dal/mongo/reda/model/BatchAnalysis.java | 2 +- .../reda/model/CompanyDisplayAnalysis.java | 16 +- .../dal/mongo/reda/model/HouseAnalysis.java | 2 +- .../dal/mongo/reda/model/RedaBroker.java | 4 +- .../dal/mongo/reda/model/RedaGroup.java | 4 +- .../dal/mongo/reda/model/RedaHomeData.java | 2 +- .../dal/mongo/reda/model/ZjtBroker.java | 2 +- .../mongo/reda/model/ZjtBrokerCompany.java | 2 +- .../mongo/reda/model/ZjtCompanyNameAlias.java | 2 +- .../mongo/reda/model/ZjtDeleteHouseLog.java | 2 +- .../dal/mongo/reda/model/ZjtSettings.java | 2 +- .../mongo/tool/model/GainDataDetailLog.java | 14 +- .../mongo/tool/model/OpenResourceCount.java | 2 +- .../dal/mongo/tool/model/OpenUriLog.java | 12 +- .../dal/mongo/tool/model/ToolClickDetail.java | 18 +- .../mongo/tool/model/ToolClickDetailLog.java | 18 +- .../com/fangjia/dal/reda/common/Role.java | 16 +- .../dal/seawater/dao/SeawaterDaoImpl.java | 40 +- .../fangjia/dal/seawater/model/Seawater.java | 16 +- .../fangjia/dal/seaweed/dao/DistrictDao.java | 2 +- .../dal/seaweed/dao/DistrictDaoImpl.java | 2 +- .../fangjia/dal/seaweed/model/District.java | 178 +- .../com/fangjia/dal/seaweed/model/Shop.java | 68 +- .../dal/sql/cpc/dao/CpcFeeSettingDao.java | 8 +- .../sql/cpc/dao/CpcRegionPublicityDao.java | 52 +- .../dal/sql/cpc/dao/CpcSettingsDao.java | 10 +- .../dal/sql/cpc/model/CpcFeeSetting.java | 4 +- .../dal/sql/cpc/model/CpcRegionPublicity.java | 2 +- .../dal/sql/cpc/model/CpcUserAccount.java | 6 +- .../fangjia/dal/sql/cpc/model/CpcUsers.java | 4 +- .../fangjia/dal/sql/model/ApiTestApply.java | 18 +- .../com/fangjia/dal/sql/model/ApiUser.java | 20 +- .../fangjia/dal/sql/model/ApiUserAccount.java | 20 +- .../com/fangjia/dal/sql/model/Comments.java | 4 +- .../java/com/fangjia/dal/sql/model/EFang.java | 4 +- .../fangjia/dal/sql/model/EvaluationTask.java | 6 +- .../fangjia/dal/sql/model/FjtEvaluation.java | 50 +- .../com/fangjia/dal/sql/model/FjtUsers.java | 8 +- .../com/fangjia/dal/sql/model/IdMobile.java | 18 +- .../fangjia/dal/sql/model/InquiryPrice.java | 2 +- .../fangjia/dal/sql/model/KeywordsBaidu.java | 2 +- .../com/fangjia/dal/sql/model/Payment.java | 2 +- .../com/fangjia/dal/sql/model/RedaUser.java | 4 +- .../dal/sql/model/ReportFileAttach.java | 2 +- .../fangjia/dal/sql/model/TransactionLog.java | 12 +- .../java/com/fangjia/dal/sql/model/User.java | 2 +- .../com/fangjia/dal/sql/model/UserTrades.java | 8 +- .../java/com/fangjia/dal/sql/model/Users.java | 6 +- .../fangjia/dal/sql/model/UsersDetail.java | 4 +- .../bkoff/controllers/SeaweedController.java | 4 +- .../controllers/SpidersLogController.java | 2 +- .../datastore/driver/DSCollection.java | 72 +- .../fangjia/datastore/driver/DSCursor.java | 6 +- .../com/fangjia/datastore/MongoDbTest.java | 8 +- .../java/com/fangjia/datastore/DataStore.java | 2 +- .../com/fangjia/datastore/DataStoreImpl.java | 56 +- .../java/com/fangjia/datastore/FileStore.java | 26 +- .../com/fangjia/datastore/FileStoreImpl.java | 30 +- .../com/fangjia/datastore/config/Field.java | 4 +- .../datastore/handler/MessageHandler.java | 2 +- .../handler/QueryMessageHandler.java | 6 +- .../java/com/fangjia/datastore/solr/Core.java | 52 +- .../datastore/solr/SolrQueryBuilder.java | 8 +- .../datastore/solr/SolrServerImpl.java | 2 +- .../knowbase/servlet/DeveloperServlet.java | 32 +- .../knowbase/servlet/MatchServlet.java | 60 +- .../knowbase/servlet/ParseKeywordServlet.java | 2 +- .../knowbase/servlet/ParseSchoolServlet.java | 4 +- .../knowbase/servlet/ParseServlet.java | 46 +- .../com/fangjia/knowbase/utils/ToolUtils.java | 2 +- projects/fangjia-loan-dal/pom.xml | 4 +- .../loan/dal/mongo/model/BaseLoan.java | 74 +- .../loan/dal/mongo/model/BusinessLoan.java | 2 +- .../fangjia/loan/dal/mongo/model/CarLoan.java | 2 +- .../loan/dal/mongo/model/ConsumptionLoan.java | 2 +- .../loan/dal/mongo/model/Feedback2.java | 2 +- .../loan/dal/mongo/model/HouseLoan.java | 6 +- .../loan/dal/mongo/model/LoanAgency.java | 2 +- .../loan/dal/mongo/model/LoanAssessStep1.java | 20 +- .../loan/dal/mongo/model/LoanAssessStep2.java | 12 +- .../loan/dal/mongo/model/LoanKnowledge.java | 2 +- .../loan/dal/mongo/model/LoanRate.java | 8 +- .../loan/dal/mongo/model/LoanUser.java | 4 +- projects/fangjia-loan-service/pom.xml | 4 +- .../loan/service/LoanOfficerServiceImpl.java | 10 +- .../com/fangjia/loan/service/LoanService.java | 32 +- .../fangjia/loan/service/LoanServiceImpl.java | 14 +- .../fangjia/loan/service/bo/HouseLoanBo.java | 2 +- .../com/fangjia/loan/service/bo/LoanBo.java | 14 +- .../loan/service/bo/LoanerInfoItem.java | 20 +- .../loan/service/model/HouseLoanForm.java | 2 +- .../fangjia/loan/service/model/LoanForm.java | 4 +- .../service/mongo/Feedback2ServiceImpl.java | 8 +- .../fangjia/loan/CheckLoginInterceptor.java | 6 +- .../java/com/fangjia/loan/FangjiaConfig.java | 14 +- .../loan/controllers/AssessController.java | 14 +- .../controllers/BusinessLoanController.java | 22 +- .../loan/controllers/CarLoanController.java | 22 +- .../ConsumptionLoanController.java | 24 +- .../loan/controllers/HouseLoanController.java | 22 +- .../loan/controllers/LoanLeadsController.java | 108 +- .../controllers/LoanerInfoController.java | 42 +- .../loan/controllers/user/AgController.java | 2 +- .../fangjia/loan/filters/AccessLogFilter.java | 4 +- .../fangjia/loan/filters/AnalyticsBean.java | 44 +- .../fangjia/loan/filters/AnalyticsFilter.java | 14 +- .../loan/filters/SpiderValidateFilter.java | 24 +- .../fangjia/loan/model/ApplyLoanModel.java | 30 +- .../com/fangjia/loan/model/AssessModel.java | 28 +- .../com/fangjia/loan/model/BaseModel.java | 8 +- .../fangjia/loan/model/BusinessLoanModel.java | 12 +- .../com/fangjia/loan/model/CarLoanModel.java | 8 +- .../loan/model/ConsumptionLoanModel.java | 8 +- .../java/com/fangjia/loan/model/Gakey.java | 6 +- .../fangjia/loan/model/LoanLeadsModel.java | 54 +- .../java/com/fangjia/loan/model/Message.java | 36 +- .../fangjia/loan/model/UserRegJsonModel.java | 4 +- .../java/com/fangjia/loan/util/LoginUtil.java | 2 +- .../com/fangjia/loan/util/SourceUtils.java | 4 +- projects/fangjia-open/pom.xml | 4 +- .../java/com/fangjia/open/APIConstant.java | 102 +- .../java/com/fangjia/open/FangjiaApiUtil.java | 42 +- .../main/java/com/fangjia/open/HttpCode.java | 2 +- .../com/fangjia/open/HttpStatusCodeEnum.java | 14 +- .../java/com/fangjia/open/OpenConfig.java | 10 +- .../com/fangjia/open/OpenHttpCodeEnum.java | 30 +- .../java/com/fangjia/open/OpenUrlMapper.java | 16 +- .../open/controllers/AaController.java | 24 +- .../open/controllers/AddrSvcController.java | 352 +- .../open/controllers/AddrepoController.java | 2 +- .../open/controllers/AddressController.java | 694 +- .../open/controllers/AmpController.java | 2 +- .../open/controllers/ApiUserController.java | 4 +- .../open/controllers/AuctionController.java | 20 +- .../open/controllers/AvgPriceController.java | 26 +- .../open/controllers/BlockController.java | 8 +- .../controllers/BusinessEstateController.java | 32 +- .../open/controllers/ChartController.java | 80 +- .../open/controllers/CityController.java | 96 +- .../open/controllers/CmbController.java | 6 +- .../controllers/CommercialController.java | 60 +- .../CommunityRatingController.java | 32 +- .../ComprehensiveQueryController.java | 248 +- .../ConsumptionGradeController.java | 12 +- .../fangjia/open/controllers/Controller.java | 52 +- .../controllers/CrowdsourceController.java | 40 +- .../open/controllers/CzbankController.java | 46 +- .../open/controllers/DealPriceController.java | 102 +- .../controllers/DingMessageController.java | 4 +- .../open/controllers/DistrictController.java | 174 +- .../controllers/DistrictMSGController.java | 58 +- .../controllers/EvaluationController.java | 148 +- .../controllers/FangjiaApiController.java | 30 +- .../open/controllers/FilesController.java | 10 +- .../open/controllers/FormatterController.java | 12 +- .../open/controllers/FshController.java | 470 +- .../open/controllers/GdBankController.java | 50 +- .../open/controllers/GuzhiController.java | 14 +- .../open/controllers/HouseController.java | 348 +- .../open/controllers/HouseImgController.java | 8 +- .../controllers/HousePropertyController.java | 34 +- .../open/controllers/JnBankController.java | 10 +- .../open/controllers/LoanController.java | 20 +- .../open/controllers/MapController.java | 42 +- .../open/controllers/MeishubaoController.java | 6 +- .../MobileUserCollectionController.java | 22 +- .../controllers/MobileUserStatController.java | 38 +- .../open/controllers/NearbyController.java | 2 +- .../controllers/NewDistrictController.java | 22 +- .../open/controllers/OfficeController.java | 206 +- .../controllers/OfficeSellController.java | 144 +- .../open/controllers/OurxnController.java | 2 +- .../open/controllers/PaphController.java | 66 +- .../open/controllers/PdsController.java | 810 +- .../open/controllers/PdsEverController.java | 120 +- .../controllers/PdsTotalScoreController.java | 416 +- .../PdsTotalScoreEverController.java | 32 +- .../open/controllers/PoiController.java | 42 +- .../open/controllers/PriceController.java | 4 +- .../open/controllers/PropertyController.java | 1256 +- .../open/controllers/ProvinceController.java | 2 +- .../open/controllers/QhzxController.java | 16 +- .../open/controllers/QinLinController.java | 22 +- .../controllers/QuotationsController.java | 44 +- .../open/controllers/RegionController.java | 56 +- .../open/controllers/RentController.java | 74 +- .../open/controllers/RentHouseController.java | 100 +- .../open/controllers/ResidenceController.java | 18 +- .../open/controllers/SellHouseController.java | 66 +- .../controllers/ShopAddressController.java | 4 +- .../open/controllers/ShopController.java | 142 +- .../open/controllers/ShopSellController.java | 142 +- .../open/controllers/SinaLoginController.java | 4 +- .../open/controllers/SmsController.java | 6 +- .../open/controllers/SouController.java | 26 +- .../controllers/SqmetreRentController.java | 76 +- .../controllers/StatsIndexController.java | 96 +- .../open/controllers/TaskController.java | 34 +- .../open/controllers/TestController.java | 4 +- .../controllers/TransactionController.java | 260 +- .../open/controllers/TriggerController.java | 10 +- .../open/controllers/UsersController.java | 22 +- .../open/controllers/WebankController.java | 10 +- .../open/controllers/WeixinController.java | 762 +- .../controllers/WeixinTaskController.java | 42 +- .../open/controllers/WithHoldController.java | 10 +- .../controllers/ZimoOfficeController.java | 4 +- .../open/controllers/ZyFshController.java | 340 +- .../open/controllers/requestController.java | 2 +- .../controllers/weixin/CcbRentController.java | 92 +- .../weixin/DistrictController.java | 18 +- .../weixin/DistrictTrendController.java | 50 +- .../controllers/weixin/ReportController.java | 12 +- .../controllers/weixin/UserController.java | 78 +- .../weixin/WeiXinEvaluationController.java | 286 +- .../controllers/xcx/WeiXinxcxController.java | 2 +- .../controllers/xcx/XcxInfoController.java | 52 +- .../java/com/fangjia/open/dto/AroundDto.java | 10 +- .../com/fangjia/open/dto/BusinessCaseDto.java | 24 +- .../java/com/fangjia/open/dto/CcbRentDto.java | 26 +- .../java/com/fangjia/open/dto/CityDto.java | 20 +- .../com/fangjia/open/dto/CityNewPriceDto.java | 10 +- .../com/fangjia/open/dto/CityStatDto.java | 6 +- .../open/dto/CollateralEvaluationInfoDto.java | 104 +- .../java/com/fangjia/open/dto/CzInfoDto.java | 38 +- .../fangjia/open/dto/DistrictAnalysisDto.java | 26 +- .../fangjia/open/dto/DistrictBaseInfoDto.java | 6 +- .../fangjia/open/dto/DistrictChartDto.java | 6 +- .../open/dto/DistrictConditionDto.java | 6 +- .../fangjia/open/dto/DistrictDetailDto.java | 74 +- .../com/fangjia/open/dto/DistrictDto.java | 52 +- .../com/fangjia/open/dto/DistrictInfoDto.java | 16 +- .../com/fangjia/open/dto/DistrictStatDto.java | 30 +- .../fangjia/open/dto/DistrictTopPriceDto.java | 10 +- .../com/fangjia/open/dto/DistrictsDto.java | 6 +- .../open/dto/DistrictsPropertiesDto.java | 12 +- .../com/fangjia/open/dto/DtoConverter.java | 18 +- .../open/dto/EvaluationBeforeLoanDto.java | 16 +- .../fangjia/open/dto/FilterConditionDto.java | 12 +- .../open/dto/HouseAuctionDetailDto.java | 6 +- .../com/fangjia/open/dto/HouseAuctionDto.java | 6 +- .../com/fangjia/open/dto/HouseCaseDto.java | 32 +- .../fangjia/open/dto/HouseConditionDto.java | 8 +- .../open/dto/HouseDealPriceDetailDto.java | 6 +- .../fangjia/open/dto/HouseDealPriceDto.java | 6 +- .../java/com/fangjia/open/dto/HouseDto.java | 36 +- .../fangjia/open/dto/HouseEvaluateNumDto.java | 6 +- .../open/dto/HouseValueInformationDto.java | 8 +- .../java/com/fangjia/open/dto/HousesDto.java | 6 +- .../fangjia/open/dto/JnBankPropertyDto.java | 58 +- .../java/com/fangjia/open/dto/MallsDto.java | 6 +- .../com/fangjia/open/dto/NewDistrictDto.java | 38 +- .../java/com/fangjia/open/dto/PdsRoomDto.java | 2 +- .../com/fangjia/open/dto/PropertyDto.java | 2 +- .../fangjia/open/dto/RangeConditionDto.java | 6 +- .../open/dto/RegionBlockConditionDto.java | 10 +- .../fangjia/open/dto/RegionSellStatDto.java | 16 +- .../com/fangjia/open/dto/RegionStatDto.java | 16 +- .../com/fangjia/open/dto/RentHouseDto.java | 36 +- .../java/com/fangjia/open/dto/RoomDto.java | 2 +- .../open/dto/SearchKeywordResultDto.java | 4 +- .../java/com/fangjia/open/dto/StationDto.java | 6 +- .../com/fangjia/open/dto/TransactionDto.java | 90 +- .../com/fangjia/open/dto/UniversalDto.java | 4 +- .../fangjia/open/dto/ValueConditionDto.java | 6 +- .../fangjia/open/dto/ZimoOfficeListDto.java | 2 +- .../DistrictIdentifyDto.java | 2 +- .../addressGovernance/MatchedBuildingDto.java | 22 +- .../StructureAndCompleteDto.java | 42 +- .../dto/addressGovernance/StructureDto.java | 32 +- .../FangjiaOpenExceptionHandler.java | 8 +- .../fangjia/open/filters/AnalyticsFilter.java | 6 +- .../ApiVisitCountInterceptor.java | 16 +- .../open/interceptors/AuditInterceptor.java | 16 +- .../AuthenticationInterceptor.java | 74 +- .../interceptors/FileUploadInterceptor.java | 2 +- .../interceptors/JsonViewInterceptor.java | 2 +- .../interceptors/ParametersInterceptor.java | 8 +- .../com/fangjia/open/interceptors/Role.java | 6 +- .../interceptors/ValidatorInterceptor.java | 8 +- .../open/listeners/ContextLoaderListener.java | 8 +- .../fangjia/open/model/AddesssMatchModel.java | 2 +- .../com/fangjia/open/model/AddressModel.java | 20 +- .../com/fangjia/open/model/ApiUserModel.java | 14 +- .../open/model/AroundAverageModel.java | 4 +- .../open/model/AvgPriceGuidePriceModel.java | 4 +- .../com/fangjia/open/model/BaseModel.java | 2 +- .../open/model/BatchEvaluateModel.java | 2 +- .../open/model/CityPriceIntervalModel.java | 4 +- .../model/CollateralEvaluationInfoModel.java | 14 +- .../fangjia/open/model/CommercialModel.java | 18 +- .../model/CommunitySummaryRequestDto.java | 16 +- .../fangjia/open/model/CzbankSampleModel.java | 50 +- .../open/model/DistrictAvgPriceModel.java | 10 +- .../open/model/DistrictFacilitysModel.java | 12 +- .../open/model/DistrictInfoApiModel.java | 10 +- .../open/model/DistrictNewPriceModel.java | 18 +- .../open/model/DistrictQueryModel.java | 6 +- .../open/model/DistrictSearchModel.java | 4 +- .../fangjia/open/model/DistrictToolModel.java | 10 +- .../open/model/EvaluationBatchDto.java | 16 +- .../fangjia/open/model/EvaluationModel.java | 94 +- .../com/fangjia/open/model/FavoriteModel.java | 16 +- .../com/fangjia/open/model/FilesModel.java | 2 +- .../open/model/FinancialPictureModel.java | 4 +- .../com/fangjia/open/model/FloorsModel.java | 2 +- .../fangjia/open/model/GujiaToolModel.java | 14 +- .../fangjia/open/model/GuzhiApplyModel.java | 24 +- .../fangjia/open/model/GuzhiCheckModel.java | 4 +- .../com/fangjia/open/model/GuzhiGetModel.java | 2 +- .../open/model/HouseChangeInfoModel.java | 22 +- .../open/model/HouseClickLogModel.java | 6 +- .../open/model/HouseInfomationModel.java | 92 +- .../com/fangjia/open/model/HouseModel.java | 68 +- .../fangjia/open/model/HousePublishModel.java | 40 +- .../fangjia/open/model/HouseSearchModel.java | 2 +- .../fangjia/open/model/HouseToolModel.java | 8 +- .../com/fangjia/open/model/LoanModel.java | 6 +- .../open/model/MobileUserStatModel.java | 8 +- .../com/fangjia/open/model/OldHouseModel.java | 2 +- .../fangjia/open/model/PaphEvaluateModel.java | 4 +- .../open/model/PropertyDetailModel.java | 2 +- .../open/model/PropertyEvaluationModel.java | 102 +- .../open/model/PropertySearchModel.java | 10 +- .../fangjia/open/model/RentHouseModel.java | 36 +- .../com/fangjia/open/model/RentModel.java | 12 +- .../fangjia/open/model/ReportApplyModel.java | 28 +- .../open/model/RestfulModelAndView.java | 2 +- .../open/model/RetryCalcPriceModel.java | 10 +- .../com/fangjia/open/model/SearchModel.java | 12 +- .../com/fangjia/open/model/SmsSendModel.java | 4 +- .../fangjia/open/model/ToolClickLogModel.java | 2 +- .../fangjia/open/model/TransactionModel.java | 68 +- .../com/fangjia/open/model/TrendApiModel.java | 8 +- .../com/fangjia/open/model/TrendModel.java | 16 +- .../open/model/UesrComplaintModel.java | 20 +- .../open/model/UserCallRecordModel.java | 10 +- .../fangjia/open/model/UserFeedbackModel.java | 12 +- .../open/model/UserGeolocationModel.java | 12 +- .../fangjia/open/model/UserHistoryModel.java | 14 +- .../open/model/WebankEvaluateModel.java | 6 +- .../com/fangjia/open/model/WeixinModel.java | 8 +- .../fangjia/open/model/WeixinTaskModel.java | 44 +- .../fangjia/open/model/WithHoldInfoModel.java | 2 +- .../open/model/weixin/DistrictModel.java | 28 +- .../model/weixin/DistrictRentTrendModel.java | 2 +- .../open/model/weixin/DistrictTrendModel.java | 2 +- .../open/model/weixin/EvaluationModel.java | 8 +- .../fangjia/open/model/weixin/Message.java | 36 +- .../model/weixin/PropertyEvaluationModel.java | 26 +- .../open/model/weixin/SendCodeJsonModel.java | 6 +- .../open/model/weixin/SendCodeModel.java | 8 +- .../fangjia/open/model/weixin/UserModel.java | 8 +- .../com/fangjia/open/servlet/SafeCode.java | 30 +- .../controllers/DistrictToolController.java | 8 +- .../tool/controllers/GujiaToolController.java | 20 +- .../tool/controllers/HouseToolController.java | 14 +- .../open/tool/controllers/ToolController.java | 10 +- .../com/fangjia/open/util/BHBankUtils.java | 78 +- .../com/fangjia/open/util/CommonDtoUtils.java | 2 +- .../com/fangjia/open/util/CommonUtils.java | 4 +- .../open/util/DateCalculationUtils.java | 14 +- .../open/util/EvaluationFactorUtil.java | 216 +- .../com/fangjia/open/util/FangJiaTongUrl.java | 12 +- .../com/fangjia/open/util/InsidePolygon.java | 16 +- .../com/fangjia/open/util/InsidePolygon2.java | 24 +- .../open/util/LatitudeAndLongitudeUtil.java | 16 +- .../fangjia/open/util/LineChartsUtils.java | 18 +- .../java/com/fangjia/open/util/MallUtils.java | 4 +- .../com/fangjia/open/util/OpenApiClient.java | 2 +- .../open/validation/CityValidator.java | 2 +- .../validation/DataPublishValidation.java | 74 +- .../fangjia/open/validation/FirstGroup.java | 4 +- .../com/fangjia/open/validation/InList.java | 2 +- .../com/fangjia/open/validation/IsCity.java | 4 +- .../validation/ListValidatorForString.java | 2 +- .../RentHousePublishValidation.java | 4 +- .../fangjia/open/validation/SecondGroup.java | 4 +- .../SellHousePublishValidation.java | 4 +- .../open/validation/ValidationSequence.java | 2 +- .../java/com/fangjia/open/views/RestView.java | 4 +- .../com/fangjia/open/ws/CzbankService.java | 2 +- .../fangjia/open/ws/CzbankServiceImpl.java | 48 +- .../open/ws/interceptor/AuthInterceptor.java | 16 +- .../open/ws/model/ResponseBuilder.java | 2 +- .../open/ws/query/CollateralSampleQuery.java | 52 +- .../open/ws/query/EvaluationQuery.java | 58 +- .../fangjia/open/ws/query/SampleQuery.java | 50 +- .../ws/query/ShopCollateralSampleQuery.java | 12 +- .../com/fangjia/pds/common/CityFactory.java | 42 +- .../pds/common/EmployeeRoleConfig.java | 28 +- .../java/com/fangjia/pds/common/PdsAPIs.java | 58 +- .../com/fangjia/pds/common/PdsConstants.java | 84 +- .../pds/common/PdsPersonInfoUtils.java | 136 +- .../pds/controllers/AddressController.java | 8 +- .../controllers/AlgorithmRuleController.java | 4 +- .../pds/controllers/AutoController.java | 26 +- .../controllers/BkoffCollInfoController.java | 32 +- .../controllers/BkoffEmployeeController.java | 4 +- .../BkoffEnterpriseController.java | 64 +- .../BkoffManualInquiryController.java | 66 +- .../BkoffPeopleInquiryController.java | 14 +- .../pds/controllers/BkoffRoleController.java | 40 +- .../pds/controllers/BkoffUserController.java | 34 +- .../pds/controllers/CollRateController.java | 8 +- .../CustomerClassifyController.java | 40 +- .../CustomerClassifyDataBatchController.java | 6 +- .../CustomerClassifyDataController.java | 6 +- .../pds/controllers/DataImportController.java | 8 +- .../pds/controllers/DemoController.java | 2 +- .../pds/controllers/EnterpriseController.java | 50 +- .../EvaluationBatchController.java | 42 +- .../EvaluationBeforeLoanController.java | 98 +- .../EvaluationGeneralController.java | 152 +- .../EvaluationHistoryController.java | 26 +- .../fangjia/pds/controllers/HkController.java | 36 +- .../pds/controllers/HomeController.java | 6 +- .../pds/controllers/LoanManageController.java | 4 +- .../pds/controllers/ManagerController.java | 26 +- .../controllers/ManualInquiryController.java | 8 +- .../pds/controllers/MobileController.java | 6 +- .../pds/controllers/MortgagesController.java | 6 +- .../pds/controllers/NoticeController.java | 2 +- .../pds/controllers/PdsRiskMapController.java | 52 +- .../pds/controllers/PreassessController.java | 124 +- .../controllers/PrevaluationController.java | 48 +- .../pds/controllers/ReportController.java | 444 +- .../controllers/ReportResultController.java | 34 +- .../controllers/RiskcontrolController.java | 106 +- .../pds/controllers/RoleController.java | 24 +- .../pds/controllers/UserController.java | 118 +- .../pds/controllers/ZichanController.java | 48 +- .../pds/customlabel/AuthorityDirective.java | 12 +- .../fangjia/pds/enums/ApiCallLimitEnum.java | 18 +- .../fangjia/pds/filters/AnalyticsFilter.java | 4 +- .../fangjia/pds/filters/SecurityFilter.java | 40 +- .../AuthenticationInterceptor.java | 2 +- .../pds/interceptors/BatchInterceptor.java | 2 +- .../interceptors/ParametersInterceptor.java | 6 +- .../pds/model/ApiCountLimitDetailModel.java | 12 +- .../com/fangjia/pds/model/BaseAjaxModel.java | 2 +- .../java/com/fangjia/pds/model/BaseModel.java | 6 +- .../com/fangjia/pds/model/BorrowerModel.java | 26 +- .../pds/model/CertifiCateImgModel.java | 2 +- .../fangjia/pds/model/ClassifyMapModel.java | 18 +- .../model/CollateralEvaluationInfoModel.java | 12 +- .../model/CustomerClassifyDataBatchModel.java | 2 +- .../pds/model/CustomerClassifyDataModel.java | 2 +- .../pds/model/CustomerClassifyModel.java | 26 +- .../java/com/fangjia/pds/model/DemoModel.java | 14 +- .../java/com/fangjia/pds/model/EamModel.java | 2 +- .../fangjia/pds/model/EnterpriseModel.java | 56 +- .../pds/model/EnterpriseShowModel.java | 6 +- .../fangjia/pds/model/EquipmentInfoModel.java | 2 +- .../pds/model/EvaluationBatchModel.java | 48 +- .../pds/model/EvaluationBeforeLoanModel.java | 14 +- .../fangjia/pds/model/HkEvaluateModel.java | 2 +- .../com/fangjia/pds/model/HouseInfoModel.java | 38 +- .../fangjia/pds/model/LoadMapDataModel.java | 2 +- .../com/fangjia/pds/model/LoanRateModel.java | 2 +- .../fangjia/pds/model/ManualInquiryModel.java | 58 +- .../java/com/fangjia/pds/model/Message.java | 52 +- .../com/fangjia/pds/model/MortgagesModel.java | 36 +- .../com/fangjia/pds/model/NoticeModel.java | 10 +- .../fangjia/pds/model/PeopleInquiryModel.java | 8 +- .../com/fangjia/pds/model/PreassessModel.java | 2 +- .../fangjia/pds/model/PrevaluationModel.java | 38 +- .../com/fangjia/pds/model/ReportModel.java | 104 +- .../fangjia/pds/model/ReportResultModel.java | 4 +- .../com/fangjia/pds/model/ResetPassModel.java | 10 +- .../model/RiskControlDetailDistrictGroup.java | 2 +- .../pds/model/RiskControlDetailListModel.java | 36 +- .../pds/model/RiskControlDetailModel.java | 30 +- .../fangjia/pds/model/RiskControlModel.java | 46 +- .../com/fangjia/pds/model/RiskMapModel.java | 32 +- .../com/fangjia/pds/model/RiskWarnModel.java | 4 +- .../java/com/fangjia/pds/model/RoleModel.java | 8 +- .../com/fangjia/pds/model/SendCodeModel.java | 8 +- .../pds/model/SiteDistrictAvgPriceInfo.java | 2 +- .../fangjia/pds/model/UpdatePassModel.java | 8 +- .../java/com/fangjia/pds/model/UserInfo.java | 2 +- .../com/fangjia/pds/model/UserLoginModel.java | 8 +- .../java/com/fangjia/pds/model/UserModel.java | 34 +- .../com/fangjia/pds/servlet/SafeCode.java | 30 +- .../java/com/fangjia/pds/servlet/Test.java | 12 +- .../pds/servlet/UploadDataBatchServlet.java | 18 +- .../pds/servlet/UploadDataServlet.java | 18 +- .../pds/servlet/UploadFileServlet.java | 84 +- .../java/com/fangjia/pds/util/CommonUtil.java | 154 +- .../java/com/fangjia/pds/util/DesUtils.java | 48 +- .../com/fangjia/pds/util/DownloadPdf.java | 12 +- .../java/com/fangjia/pds/util/HtmlToPdf.java | 20 +- .../java/com/fangjia/pds/util/IpUtil.java | 66 +- .../java/com/fangjia/pds/util/MD5Utils.java | 12 +- .../fangjia/pds/util/PdsSessionContent.java | 6 +- .../com/fangjia/analysis/CoredataConfig.java | 2 +- .../analysis/bean/FangjiaCalcEnum.java | 26 +- .../com/fangjia/analysis/core/Calculator.java | 6 +- .../com/fangjia/analysis/core/Operator.java | 4 +- .../java/com/fangjia/analysis/core/Point.java | 6 +- .../com/fangjia/analysis/core/Provider.java | 4 +- .../com/fangjia/analysis/core/Result.java | 8 +- .../analysis/rent/CalcCommandConsumer.java | 6 +- .../rent/office/OfficeRentProvider.java | 4 +- .../analysis/sell/CalcCommandConsumer.java | 30 +- .../sell/CalcCommandConsumerTest.java | 30 +- .../sell/CalcCommandQueueProvider.java | 4 +- .../analysis/sell/TransferDataConsumer.java | 2 +- .../analysis/sell/TrendMonitorConsumer.java | 66 +- .../sell/city/CitySellCalculator.java | 8 +- .../analysis/sell/city/CitySellOperator.java | 20 +- .../analysis/sell/city/CitySellPoint.java | 2 +- .../analysis/sell/city/CitySellProvider.java | 10 +- .../analysis/sell/city/CitySellResult.java | 10 +- .../analysis/sell/district/Constants.java | 54 +- .../district/DistrictAveragerDerivation.java | 12 +- .../sell/district/DistrictDealProvider.java | 2 +- .../DistrictSellAroundCalculator.java | 2 +- .../sell/district/DistrictSellCalculator.java | 334 +- .../sell/district/DistrictSellOperator.java | 48 +- .../sell/district/DistrictSellPoint.java | 10 +- .../sell/district/DistrictSellProvider.java | 48 +- .../sell/district/DistrictSellResult.java | 48 +- .../fangjia/analysis/sell/district/Test.java | 6 +- .../service/AbstractConfigProvider.java | 4 +- .../analysis/service/CalcCommandService.java | 4 +- .../service/DistrictSellConfigProvider.java | 42 +- .../analysis/service/DistrictService.java | 20 +- .../analysis/service/RegionStatService.java | 6 +- .../analysis/service/ServerAreaService.java | 2 +- .../java/com/fangjia/analysis/test/Test.java | 28 +- .../java/com/fangjia/analysis/test/Test1.java | 38 +- .../fangjia/analysis/util/AsyncThread.java | 2 +- .../fangjia/analysis/util/AveragerUtil.java | 4 +- .../com/fangjia/analysis/util/Cluster.java | 26 +- .../fangjia/analysis/util/DataCluster.java | 76 +- .../com/fangjia/analysis/util/ExcelUtils.java | 8 +- .../fangjia/analysis/util/NumberUtils.java | 2 +- .../controllers/AvgPriceUpdateController.java | 6 +- .../bkoff/controllers/CommandController.java | 2 +- .../fangjia/bkoff/controllers/Controller.java | 2 +- .../bkoff/controllers/TaskController.java | 4 +- .../fangjia/bkoff/model/AveragerModel.java | 2 +- .../com/fangjia/bkoff/model/BaseModel.java | 2 +- .../com/fangjia/bkoff/model/BasicModel.java | 6 +- .../com/fangjia/bkoff/model/CommandModel.java | 2 +- .../com/fangjia/dal/common/QueryParam.java | 2 +- .../fangjia/dal/common/ServerAreaData.java | 28 +- .../com/fangjia/dal/common/TemplateUtils.java | 68 +- .../com/fangjia/service/bo/AvgUpdateBo.java | 12 +- .../servlet/CalcCommandConsumerServlet.java | 4 +- projects/fangjia-script/pom.xml | 4 +- .../com/fangjia/script/BaseBatch.groovy | 54 +- .../fangjia/script/ExportDistrictData.groovy | 12 +- .../com/fangjia/script/FccsNewHouse.groovy | 14 +- .../groovy/com/fangjia/script/FccsSell.groovy | 14 +- .../com/fangjia/script/He/Enlight.groovy | 60 +- .../com/fangjia/script/HeExtends.groovy | 4 +- .../groovy/com/fangjia/script/HeTests.groovy | 54 +- .../com/fangjia/script/IntroTest.groovy | 2 +- .../com/fangjia/script/LatitudeTest.groovy | 2 +- .../com/fangjia/script/LoudongOnce.groovy | 2 +- .../com/fangjia/script/OnceTestThird.groovy | 1452 +- .../groovy/com/fangjia/script/Polygon.groovy | 14 +- .../com/fangjia/script/PoseidonOnce.groovy | 40 +- .../com/fangjia/script/SaveToWebpage.groovy | 14 +- .../script/SellDataAddSighterBatch.groovy | 8 +- .../com/fangjia/script/TransferTest.groovy | 6 +- .../com/fangjia/script/UpdateData.groovy | 22 +- .../groovy/com/fangjia/script/Watcher.groovy | 4 +- .../fangjia/script/addrepo/AddMapData.groovy | 2 +- .../addrepo/AddressParserService.groovy | 20 +- .../script/addrepo/BaiduAPIService.groovy | 4 +- .../com/fangjia/script/addrepo/Bianmen.groovy | 14 +- .../script/addrepo/CnTokenizer2.groovy | 4 +- .../fangjia/script/addrepo/ExcelParser.groovy | 8 +- .../ExportBaiDuMapCrawlarResult.groovy | 8 +- .../script/addrepo/InvokeHttpRequest.groovy | 6 +- .../com/fangjia/script/addrepo/Publish.groovy | 4 +- .../com/fangjia/script/addrepo/Test.groovy | 6 +- .../com/fangjia/script/addrepo/Yongjia.groovy | 176 +- .../fangjia/script/addrepo/Yongjia2.groovy | 34 +- .../script/address/AddressAnalysisJob.groovy | 26 +- .../script/address/AddressAnalyzer.groovy | 28 +- .../address/AddressStandardization.groovy | 18 +- .../address/AddressToBaiduLngLat.groovy | 762 +- .../script/address/AnShouDataTest.groovy | 240 +- .../address/BulkAddressAnalyBatch.groovy | 6 +- .../address/BulkEvaluationForTest.groovy | 2 +- .../script/address/BulkEvaluationTask.groovy | 24 +- .../address/DuplicateRemovalHandler.groovy | 10 +- .../script/address/JinDongDataTest.groovy | 200 +- .../script/address/OfficeLivePrecent.groovy | 8 +- .../script/address/RegionRemoveHandler.groovy | 4 +- .../address/ShengShiQuRemoveHandler.groovy | 6368 +++---- .../script/address/ShopAddressBatch.groovy | 14 +- .../script/address/SymbolRemoveHandler.groovy | 6 +- .../com/fangjia/script/address/Test.groovy | 20 +- .../script/address/YongjiaDataTest.groovy | 18 +- .../script/agent/HouseLoudongAna.groovy | 6 +- .../script/agent/SortDistrictPics.groovy | 438 +- .../script/ana/AnalyDistrictLog.groovy | 86 +- .../script/ana/AnalyDistrictLogTest.groovy | 70 +- .../fangjia/script/ana/AutoAddDistrict.groovy | 12 +- .../script/ana/AutoAddSouFangDistrict.groovy | 82 +- .../fangjia/script/ana/AutoDistrict.groovy | 6 +- .../script/ana/CityAnaDataBatch.groovy | 10 +- .../ana/CityAndRegionAverageConsume.groovy | 6 +- ...ickHouseDistrictStatMarkupCalcBatch.groovy | 10 +- .../ana/CountOfflineCityHouseAmount.groovy | 6 +- .../fangjia/script/ana/CoverPrecent.groovy | 38 +- .../ana/DatabaseStatWatcherBatch.groovy | 2 +- .../script/ana/DistrictAroundDataAnaly.groovy | 12 +- .../script/ana/DistrictBackupReset.groovy | 14 +- .../script/ana/DistrictFinishDateCover.groovy | 28 +- .../ana/DistrictPriceRatingBatch.groovy | 8 +- .../ana/DistrictStatMarkupCalcBatch.groovy | 14 +- .../script/ana/DistrictStatRankBatch.groovy | 8 +- .../script/ana/EstateTypeChange.groovy | 30 +- .../script/ana/FindStageDistrictBatch.groovy | 10 +- .../script/ana/ManualOperationDataStat.groovy | 22 +- .../script/ana/MongoAccessLogAnalyzer.groovy | 10 +- .../com/fangjia/script/ana/PriceStat.groovy | 34 +- .../script/ana/RegionAnaDataBatch.groovy | 2 +- .../fangjia/script/ana/RegionRepair.groovy | 2 +- .../script/ana/SeaweedFieldStat.groovy | 82 +- .../com/fangjia/script/ana/SeedsScore.groovy | 6 +- .../script/ana/SmsUsageMonitorBatch.groovy | 14 +- .../script/ana/SplitWebsiteTable.groovy | 40 +- .../groovy/com/fangjia/script/ana/Test.groovy | 36 +- .../fangjia/script/ana/UpdateCityLevel.groovy | 2 +- .../script/ana/UserAgentAnalysisBatch.groovy | 2 +- .../script/ana/WeBankHouseAnalyBatch.groovy | 2 +- .../script/analy/AnalyCommonUtils.groovy | 36 +- .../analy/BkoffActionSelectAnaly.groovy | 4 +- .../analy/DistrictFeatureAnalyBatch.groovy | 8 +- .../script/analy/EvaluationAnaly.groovy | 4 +- .../FangJiaIndexPageDataAnalyBatch.groovy | 4 +- .../script/analy/NewKerEsfCrawlTask.groovy | 60 +- .../script/analy/NewKerXfCrawlTask.groovy | 74 +- .../com/fangjia/script/analy/Test.groovy | 8 +- .../fangjia/script/analy/Test_Weilei.groovy | 8 +- .../script/analy/WebAnalyLogBatch.groovy | 68 +- .../script/analy/XingyeDataBatch.groovy | 60 +- .../script/analy/XingyeDataPrice.groovy | 24 +- .../script/anshuo/DistrictExportBatch.groovy | 236 +- .../anshuo/HouseLoudongExportBatch.groovy | 26 +- .../api/ApiUserDeadTimeMonitorBatch.groovy | 8 +- .../api/OpenApiUseStatMonitorBatch.groovy | 10 +- .../auto/AddDistrictLouDongCount.groovy | 10 +- .../script/auto/AutoAddApiCountBatch.groovy | 10 +- .../com/fangjia/script/auto/AutoBackup.groovy | 4 +- .../fangjia/script/auto/AutoDataBatch.groovy | 2 +- .../script/auto/CityInfoEmailSender.groovy | 6 +- .../script/auto/DistrictAutoFindBatch.groovy | 6 +- .../script/auto/ParseTaskMonitor.groovy | 6 +- .../com/fangjia/script/auto/Test.groovy | 10 +- .../auto/UtmGifKeywordDetailBatch.groovy | 14 +- .../AveragerQualityReportBatch.groovy | 14 +- .../script/averager/AvgpriceExporter.groovy | 46 +- .../averager/FenQiAveragerProcess.groovy | 50 +- .../FenqiDistrictAnalyzerBatch.groovy | 8 +- .../averager/HouseChangingMonitorBatch.groovy | 14 +- .../InsertMonitorCalcCommandBatch.groovy | 90 +- ...rtMonitorSquareRentCalcCommandBatch.groovy | 60 +- .../InsertMonitorTestCalcCommandBatch.groovy | 58 +- .../averager/LianjiaAvgPriceCrawler.groovy | 86 +- .../averager/SampleQualityReportBatch.groovy | 12 +- .../SellAveragerCalcConfigBatch.groovy | 14 +- .../script/averager/Test_weilei.groovy | 8 +- .../averager/WebAveragerAnalyzerBatch.groovy | 170 +- .../averager/WebAveragerDiffBatch.groovy | 8 +- .../script/avgprice/AddAvgPriceRunTask.groovy | 6 +- .../avgprice/AddRentPriceRunTask.groovy | 2 +- .../avgprice/AveragePriceStatistics.groovy | 158 +- .../avgprice/AveragerWorstExporter.groovy | 48 +- .../avgprice/AvgPriceCoverageExport.groovy | 8 +- .../script/avgprice/AvgPriceStatTest.groovy | 20 +- .../script/avgprice/DataMigration.groovy | 6 +- .../avgprice/DistrictRentStatistics.groovy | 26 +- .../script/avgprice/ExportAvgPrice.groovy | 66 +- .../avgprice/ExportNearestAvgPrice.groovy | 62 +- .../HistoricalAverageRevaluationTask.groovy | 22 +- .../MonthlyDistrictStatCalcBatch.groovy | 6 +- .../MonthlyRegionStatCalcBatch.groovy | 4 +- .../script/avgprice/NewHouseAvgPrice.groovy | 26 +- .../NoSampleAverageRevaluationTask.groovy | 42 +- .../script/avgprice/OfficeSeaweedSynch.groovy | 14 +- .../avgprice/PredictFuturePriceBatch.groovy | 102 +- .../RecalculationOfRegionalPricesTask.groovy | 212 +- .../script/avgprice/ShopSeaweedSynch.groovy | 14 +- .../ThirdpartyAverageDiffComputeBatch.groovy | 54 +- .../script/avgprice/WebAverageLabor.groovy | 14 +- .../WebOfficeAvgPriceStatistics.groovy | 138 +- .../avgprice/WebShopAvgPriceStatistics.groovy | 110 +- .../script/backup/HouseToEsBatch.groovy | 16 +- .../backup/HouseToStorehouseBatch.groovy | 16 +- .../script/backup/MysqlHouseToMongodb.groovy | 8 +- .../script/backup/ShopPriceBackup.groovy | 2 +- .../backup/StorehouseCorrectorBatch.groovy | 2 +- .../fangjia/script/backup/TmpBatch2.groovy | 2 +- .../script/baidu/AnjukeHouseProcessor.groovy | 24 +- .../script/baidu/BaiduPOIFetchBatch.groovy | 34 +- .../script/baidu/BrokerProcessor.groovy | 52 +- .../fangjia/script/baidu/CityLatlngBox.groovy | 30 +- .../script/baidu/CommonProcessor.groovy | 242 +- .../script/baidu/FangHouseProcessor.groovy | 2 +- .../baidu/HousePicsEncryptProcessor.groovy | 8 +- .../com/fangjia/script/baidu/MainCase.groovy | 80 +- .../fangjia/script/baidu/NuomiApiUtils.groovy | 6 +- .../script/baidu/NuomiHousePushBatch.groovy | 22 +- .../script/baidu/UpdateAreaItemNew.groovy | 20 +- .../fangjia/script/bhapitest/BhApiTest.groovy | 20 +- .../fangjia/script/build/FangjiaBuild.groovy | 12 +- .../script/build/FangjiatongBuild.groovy | 2 +- .../script/businessshop/ClassifyShops.groovy | 8 +- .../businessshop/DianpingCrawlShop.groovy | 56 +- .../script/ccbevaluation/AddShDealData.groovy | 10 +- .../script/ccbevaluation/AddSzDealData.groovy | 16 +- .../ccbevaluation/AddThirdPartyPrice.groovy | 6 +- .../ccbevaluation/AddThirdPriceSample.groovy | 28 +- .../BatchAddPersonGuiPrice.groovy | 8 +- .../ccbevaluation/BigdataBuildingBatch.groovy | 6 +- .../BigdataCommbuildtypeBatch.groovy | 12 +- .../BigdataCommunityBatch.groovy | 42 +- .../ccbevaluation/BigdataDealBatch.groovy | 116 +- .../ccbevaluation/BigdataDistrictBatch.groovy | 18 +- .../ccbevaluation/BigdataForsaleBatch.groovy | 120 +- .../ccbevaluation/BigdataPoiBatch.groovy | 74 +- .../ccbevaluation/BigdataSynchPrice.groovy | 8 +- .../ccbevaluation/CcbCommonUtils.groovy | 76 +- .../ccbevaluation/CcbFtpTestUtils.groovy | 20 +- .../script/ccbevaluation/CcbFtpUtils.groovy | 20 +- .../script/ccbevaluation/CityBatch.groovy | 20 +- .../DealAndThirdPriceDataProcess.groovy | 66 +- .../ccbevaluation/DistrictDelete.groovy | 48 +- .../DistrictGuidePriceBatch.groovy | 6 +- .../ccbevaluation/EvaluateRateBatch.groovy | 28 +- .../ExportOracleAllDataTest.groovy | 192 +- .../ccbevaluation/ExportOracleData.groovy | 186 +- .../ccbevaluation/ExportOracleDataTest.groovy | 206 +- .../ExportOracleEvaluationData.groovy | 68 +- .../ccbevaluation/FjwPricePkCcbPrice.groovy | 128 +- .../ccbevaluation/GuiDingPriceBatch.groovy | 30 +- .../script/ccbevaluation/LoadGuide.groovy | 38 +- .../ccbevaluation/LocationUpdate.groovy | 8 +- .../OracleDistrict2Mongo85.groovy | 6 +- .../OracleDistrictBasePrice2Mongo85.groovy | 6 +- .../ccbevaluation/PgsqlCommUtils.groovy | 2 +- .../ccbevaluation/StagingDistrictBatch.groovy | 12 +- .../fangjia/script/ccbevaluation/Test.groovy | 204 +- .../script/ccbevaluation/TestExport.groovy | 2 +- .../script/ccbevaluation/TestRepeat.groovy | 4 +- .../ccbevaluation/ThirdPartyPriceBatch.groovy | 122 +- .../script/ccbevaluation/TradeStatLog.groovy | 96 +- .../script/ccbevaluation/UpdateData.groovy | 6 +- .../ccbevaluation/UpdateHouseRegion.groovy | 34 +- .../ccbevaluation/data/AddressCut.groovy | 32 +- .../ccbevaluation/data/CcbDataStat.groovy | 8 +- .../data/CcbDistNameMatch.groovy | 14 +- .../ccbevaluation/data/CcbDistrictToDB.groovy | 126 +- .../ccbevaluation/data/CcbRegionCode.groovy | 2 +- .../ccbevaluation/data/DistrictMarge.groovy | 44 +- .../ccbevaluation/data/ExcelDataTest.groovy | 96 +- .../ccbevaluation/data/MapAddressMatch.groovy | 10 +- .../data/MatchDealPriceRegion.groovy | 2 +- .../ccbevaluation/data/MatchMapData.groovy | 96 +- .../ccbevaluation/data/OracleHouse.groovy | 4 +- .../script/ccbevaluation/data/TestData.groovy | 8 +- .../data/TradeDistrictToDB.groovy | 18 +- .../pgsql/ExportAllPgData.groovy | 30 +- .../pgsql/ExportPgsqlBaseEvaluation.groovy | 26 +- .../pgsql/ExportPgsqlEvaluationResult.groovy | 10 +- .../pgsql/ExportPgsqlRonghe.groovy | 14 +- .../ronghe/BigdataCitypriceBatch.groovy | 60 +- .../ronghe/BigdataCommunityGJRHBatch.groovy | 52 +- .../ronghe/CcbRHDealFileCreateBatch.groovy | 4 +- .../ronghe/ExportDistrictRongHe.groovy | 218 +- .../ronghe/ExportDistrictRongHeTest.groovy | 90 +- .../ccbevaluation/ronghe/NoFenCity.groovy | 76 +- .../ccbevaluation/ronghe/SSHHelper.groovy | 6 +- .../ccbevaluation/ronghe/SSHHelperTest.groovy | 6 +- .../centanet/CentanetHouseImportBatch.groovy | 20 +- .../CentanetHouseScoreCalculator.groovy | 4 +- .../centanet/HousePublishService.groovy | 164 +- .../script/centanet/sax/AgentHandler.groovy | 10 +- .../centanet/sax/HouseImportHandler.groovy | 52 +- .../script/centanet/sax/RegionHandler.groovy | 10 +- .../script/centanet/sax/ScoreHandler.groovy | 4 +- .../chongqing/BlankEvaluationBatch.groovy | 16 +- .../script/chongqing/BlankMatch.groovy | 20 +- .../script/chongqing/CzMatchDistrict.groovy | 12 +- .../com/fangjia/script/chongqing/Des3.groovy | 30 +- .../fangjia/script/chongqing/Des3Test.groovy | 46 +- .../script/chongqing/FieldAddValue.groovy | 4 +- .../script/chongqing/FumingTest.groovy | 16 +- .../fangjia/script/chongqing/GZIPUtils.groovy | 8 +- .../script/chongqing/HailanTest.groovy | 94 +- .../chongqing/MatchEvaluateRegionTest.groovy | 72 +- .../script/chongqing/MatchEvaluateTest.groovy | 64 +- .../script/chongqing/MeituanStat.groovy | 32 +- .../script/chongqing/MingShenPocStat.groovy | 26 +- .../script/chongqing/MingShenPocTest.groovy | 46 +- .../script/chongqing/PocSampleTest.groovy | 26 +- .../fangjia/script/chongqing/PocStat.groovy | 184 +- .../fangjia/script/chongqing/PocTest.groovy | 172 +- .../script/chongqing/RuiFenPocTest.groovy | 10 +- .../script/chongqing/ThreeDESUtils.groovy | 40 +- .../SeawaterMongo2Clickhouse.groovy | 10 +- .../cn8684/BusData8684FetchBatch.groovy | 642 +- .../script/cnAnalyzer/CnDictionary.groovy | 16 +- .../script/cnAnalyzer/CnTokenizer.groovy | 24 +- .../script/cnAnalyzer/KeywordEnum.groovy | 32 +- .../script/cnAnalyzer/NumberHandler.groovy | 62 +- .../script/cnAnalyzer/PatternTokenizer.groovy | 82 +- .../fangjia/script/cnAnalyzer/TownProc.groovy | 12 +- .../script/commData/CommMapData.groovy | 110 +- .../script/commData/CommonDatautils.groovy | 314 +- .../fangjia/script/commData/DataStat.groovy | 48 +- .../script/commData/DeleteWebpage.groovy | 2 +- .../script/commData/MaiDangLaoData.groovy | 8 +- .../script/common/DataHandleUtils.groovy | 34 +- .../script/common/OtherPriceUtils.groovy | 12 +- .../script/common/ServerAreaData.groovy | 4 +- .../script/companyCrawl/AiqichaCrawl.groovy | 20 +- .../script/companyCrawl/GsxtCrawl.groovy | 88 +- .../script/coredata/model/VerifyField.groovy | 4 +- .../script/coredata/model/VerifyRule.groovy | 26 +- .../coredata/util/CollectionUtils.groovy | 8 +- .../script/coredata/util/LackStages.groovy | 16 +- .../script/coredata/util/NumToChinese.groovy | 38 +- .../coredata/verify/FieldValidator.groovy | 16 +- .../script/cover/DistrictCoverInfo.groovy | 4 +- .../cover/DistrictDataCoverBatch.groovy | 60 +- .../cover/DistrictFieldCoverBatch.groovy | 22 +- .../script/cover/LoudongDataCoverBatch.groovy | 44 +- .../script/cpc/CpcClickStatBatch.groovy | 68 +- .../script/cpc/CpcConsumerBatch.groovy | 10 +- .../script/cpc/CpcHouseRefBatch.groovy | 16 +- .../script/cpc/CpcHouseSortBatch.groovy | 52 +- .../fangjia/script/cpc/MenuFieldParser.groovy | 28 +- .../script/cpc/UpdateCpcClickStatBatch.groovy | 26 +- .../com/fangjia/script/crawl/AnjukeUrl.groovy | 12 +- .../script/crawl/AutoAddSeedsBatch.groovy | 250 +- .../crawl/CrawlCommandConsumerBatch.groovy | 18 +- .../crawl/CrawlCommandGeneratorBatch.groovy | 2 +- .../CrawlCommandGeneratorBatchRent.groovy | 2 +- .../crawl/CrawlCommandMonitorBatch.groovy | 38 +- ...FewerHouseDistrictCrawlCommandBatch.groovy | 14 +- .../fangjia/script/crawl/JQueryUtils.groovy | 8 +- .../script/crawl/LandIndexCrawl.groovy | 12 +- .../crawl/ManagementCompanyCrawler.groovy | 20 +- .../script/crawl/RentDataSighterBatch.groovy | 50 +- .../script/crawl/SchoolLocation.groovy | 22 +- .../script/crawl/SellDataSighterBatch.groovy | 72 +- .../script/crawl/SendSpecifySpider.groovy | 6 +- .../script/crawl/daily/20181129.groovy | 50 +- .../script/crawl/daily/20190520.groovy | 6 +- .../script/crawl/updateSeekParams.groovy | 6 +- .../script/crawlstore/BabelaCrawlStore.groovy | 10 +- .../script/crawlstore/BaseCrawlStore.groovy | 2 +- .../crawlstore/ConsumeInfoCrawlStore.groovy | 68 +- .../script/crawlstore/CostaCrawlStore.groovy | 6 +- .../crawlstore/DianpingShopCrawlStore.groovy | 52 +- .../crawlstore/DominosCrawlStore.groovy | 8 +- .../crawlstore/MrpizzaCrawlStore.groovy | 10 +- .../crawlstore/PapajohnsCrawlStore.groovy | 10 +- .../crawlstore/PizzamarzanoCrawlStore.groovy | 46 +- .../crawlstore/SaizeriyaCrawlStore.groovy | 26 +- .../crawlstore/StarbucksCrawlStore.groovy | 14 +- .../script/dailyCount/ApiDailyCount.groovy | 64 +- .../dataAna/AnalyOtherSiteNameUrlBath.groovy | 18 +- .../script/dataAna/CityInfoAnaBatch.groovy | 170 +- .../script/dataAna/CityInfoExtendBatch.groovy | 10 +- .../dataAna/DistrictInfoAnaBatch.groovy | 20 +- .../script/dataAna/DistrictMarge.groovy | 18 +- .../dataAna/DistrictNameMapMatch.groovy | 24 +- .../DistrictNetworkPriceTaskBatch.groovy | 2 +- .../script/dataAna/ExportNotInSeaweed.groovy | 38 +- .../dataAna/FangguguAddressProcess.groovy | 14 +- .../script/dataAna/HouseFieldCoverage.groovy | 20 +- .../script/dataAna/KeKouKeLeData.groovy | 46 +- .../script/dataAna/LianjiaAnalyBatch.groovy | 34 +- .../dataAna/LianjiaAndFjwPriceTest.groovy | 54 +- .../dataAna/LianjiaAvgpriceAnalyBatch.groovy | 4 +- .../NetWorkDistrictConnectionBatch1.groovy | 38 +- .../script/dataAna/OfficeInfoAnaBatch.groovy | 14 +- .../dataAna/OtherNetworkDistictStat.groovy | 12 +- .../script/dataAna/RegionInfoAnaBatch.groovy | 16 +- .../dataAna/SiteNameDistrictAlignment.groovy | 38 +- .../com/fangjia/script/dataAna/Test.groovy | 20 +- .../dataAna/YugujiaGaoDeMapMatch.groovy | 24 +- .../dataAna/YungujiaDistrictProcess.groovy | 28 +- .../dataExport/AddressClassifyBatch.groovy | 44 +- .../AllHistoryCityPriceExport.groovy | 108 +- .../script/dataExport/AnalyShop.groovy | 34 +- .../script/dataExport/CZDataExportPool.groovy | 766 +- .../script/dataExport/CZLSHDataExport.groovy | 772 +- .../dataExport/CityFieldCoverInfo.groovy | 6 +- .../dataExport/CityStatDataExpot.groovy | 14 +- .../script/dataExport/DistrictExport.groovy | 110 +- .../script/dataExport/DistrictExport2.groovy | 202 +- .../script/dataExport/DistrictExport3.groovy | 126 +- .../script/dataExport/DistrictExport5.groovy | 100 +- .../script/dataExport/DistrictExport6.groovy | 20 +- .../dataExport/DistrictExportToAli.groovy | 126 +- .../dataExport/DistrictExportToAliTmp.groovy | 298 +- .../DistrictExportToAliTmpBak.groovy | 268 +- .../DistrictHouseTypeAvgPriceExport.groovy | 52 +- .../dataExport/DistrictStatExport.groovy | 14 +- .../dataExport/DistrictStatRentExport.groovy | 18 +- .../script/dataExport/ExperCityStat.groovy | 48 +- .../script/dataExport/ExportNoLation.groovy | 4 +- .../script/dataExport/ExportToOffline.groovy | 6 +- .../fangjia/script/dataExport/FjtData.groovy | 34 +- .../script/dataExport/FjtDownLoad.groovy | 22 +- .../script/dataExport/HanFenExport.groovy | 240 +- .../HangZhouDistrictStatExport.groovy | 40 +- .../script/dataExport/HouseExport.groovy | 12 +- .../script/dataExport/ImportCZExcel.groovy | 58 +- .../script/dataExport/ImportDatastore.groovy | 2 +- .../dataExport/KeKouKeLeDataExport.groovy | 98 +- .../dataExport/NoPriceDistrictStat.groovy | 22 +- .../script/dataExport/OfficeExport.groovy | 302 +- .../dataExport/OtherNetWorkPriceExport.groovy | 8 +- .../dataExport/ReadAndWriteExcel.groovy | 128 +- .../dataExport/RepeatDistrictExport.groovy | 22 +- .../SellHouseStatisticsBatch.groovy | 8 +- .../script/dataExport/ShengWangStat.groovy | 86 +- .../dataExport/ShopAndOfficeStatExport.groovy | 4 +- .../fangjia/script/dataExport/ShopData.groovy | 100 +- .../dataExport/SqmetreRentExport.groovy | 48 +- .../com/fangjia/script/dataExport/Test.groovy | 6 +- .../script/dataExport/TianzhouBlank.groovy | 50 +- .../script/dataExport/ZLJKDataExport.groovy | 158 +- .../script/dataImport/ApiUsersToMongo.groovy | 6 +- .../dataImport/CorrectDistrictCat.groovy | 18 +- .../script/dataImport/DatastorePipe.groovy | 2 +- .../DealPriceImportProducedDb.groovy | 4 +- .../DistrictLocationToSeaBird.groovy | 16 +- .../dataImport/DistrictStatToSeaBird.groovy | 4 +- .../EvaluationToHouseLoudong.groovy | 6 +- .../dataImport/EvaluationToSeaBird.groovy | 168 +- .../dataImport/HouseCPCDetailToMongo.groovy | 4 +- .../script/dataImport/HouseImport.groovy | 102 +- .../dataImport/HousePriceToMongo.groovy | 2 +- .../script/dataImport/IdMapSearch.groovy | 4 +- .../ImportCpcHouseByCityAndSitename.groovy | 114 +- .../script/dataImport/MatchedTypeEnum.groovy | 16 +- .../script/dataImport/NewsToSeabird.groovy | 36 +- ...onBlockDataImportFromKnowbaseByCity.groovy | 2 +- .../RegionBlockLocationDataImport.groovy | 24 +- .../RegionBlockLocationToSeabird.groovy | 2 +- .../dataImport/RegionStatToSeaBird.groovy | 6 +- .../ZjtDeleteHouseLogIdToMongo.groovy | 2 +- .../script/datastore/DeadDataCleanner.groovy | 40 +- .../datastore/DistrictFieldNumberic.groovy | 46 +- .../datastore/FieldValidatorUtils.groovy | 84 +- .../datastore/SeaweedFiedValidator.groovy | 252 +- .../script/datastore/ShopFieldNumberic.groovy | 36 +- .../script/datastore/UpdateOpenDate.groovy | 4 +- .../script/datastore/UpdateSeaweedCat.groovy | 12 +- .../script/datastore/VillaSplit.groovy | 10 +- .../script/datastore/datastore_Test.groovy | 6 +- .../BaseDealPriceCrawlerBatch.groovy | 2 +- .../script/dealPrice/CCBdealPrice.groovy | 276 +- .../dealPrice/CentanetDealPriceCrawler.groovy | 18 +- .../DanxiaDealPriceCrawlerBatch.groovy | 16 +- .../fangjia/script/dealPrice/DealPrice.groovy | 26 +- .../dealPrice/DealPriceMathBatch.groovy | 118 +- .../dealPrice/DealPriceStatBatch.groovy | 20 +- .../script/dealPrice/DealPriceUtils.groovy | 122 +- .../DistrictTradeHouseStatBatch.groovy | 12 +- .../FangDealPriceCrawlerBatch.groovy | 4 +- .../script/dealPrice/FangTianXiaBatch.groovy | 16 +- .../FangtooTransactionPriceImportBatch.groovy | 26 +- .../script/dealPrice/GouFangWebBatch.groovy | 52 +- .../GuodaDealPriceCrawlerBatch.groovy | 32 +- .../IwjwTransactionPriceImportBatch.groovy | 36 +- .../JJshunDealPriceCrawlerBatch.groovy | 4 +- .../dealPrice/LejuDealPriceCrawler.groovy | 24 +- .../LianjiaDealPriceCrawlerBatch.groovy | 4 +- .../LianjiaDealPriceLoginCrawler.groovy | 28 +- .../MaiTianDealPriceCrawlerBatch.groovy | 4 +- .../MytophomeDealPriceCrawlerBatch.groovy | 4 +- .../PinganfangDealPriceCrawlerBatch.groovy | 4 +- .../dealPrice/ResDealPriceCrawlerBatch.groovy | 40 +- .../script/dealPrice/ShKuFangBatch.groovy | 48 +- .../script/dealPrice/ShaoXinFangBatch.groovy | 14 +- .../dealPrice/SynchDealPriceToEs.groovy | 18 +- .../script/dealPrice/TaiWuWebBatch.groovy | 12 +- .../TransactionPriceImportBatch.groovy | 262 +- .../TuboshiDealPriceCrawlerBatch.groovy | 60 +- .../WoIwJDealPriceCrawlerBatch.groovy | 32 +- .../dealPrice/WuKongZhaoFangBatch.groovy | 22 +- .../dealPrice/ZafDealPriceCrawlerBatch.groovy | 4 +- .../dealPrice/ZhuGeZhaoFangBatch.groovy | 22 +- .../parse/BasicDealPriceJobParser.groovy | 18 +- .../parse/BasicFetchJobParser.groovy | 4 +- .../dealPrice/parse/DealPriceResolver.groovy | 2 +- .../parse/DealPriceUnitUniteBatch.groovy | 26 +- .../FangDealPriceListPageResolver.groovy | 2 +- .../JJshunDealPriceListPageResolver.groovy | 2 +- .../LianjiaDealPriceListPageResolver.groovy | 2 +- ...iaShangHaiDealPriceListPageResolver.groovy | 2 +- .../MaiTianDealPriceListPageResolver.groovy | 2 +- .../MytophomeDealPriceListPageResolver.groovy | 2 +- .../parse/PingAnDealPriceResolver.groovy | 6 +- .../script/dealPrice/parse/Resolver.groovy | 2 +- .../parse/ZafDealPriceResolver.groovy | 2 +- .../CalculateKeliuliangDianping.groovy | 2 +- .../script/dianping/CrawlDianpingShop.groovy | 42 +- .../script/dianxing/DianXingDataAnaly.groovy | 158 +- .../com/fangjia/script/dianxing/Test.groovy | 24 +- .../com/fangjia/script/dic/FindDict.groovy | 2 +- .../script/dic/FindDistrictDict.groovy | 4 +- .../script/dingyue/DingyueBatch.groovy | 128 +- .../script/dingyue/FreemarkerRender.groovy | 8 +- .../district/AddressStandardBatch.groovy | 14 +- .../district/BankUniversityMatchBatch.groovy | 502 +- .../fangjia/script/district/Distance.groovy | 6 +- .../script/district/DistinctOffice.groovy | 44 +- .../district/DistrictAddressFomarter.groovy | 16 +- .../DistrictAroundFacilitiesBatch.groovy | 44 +- .../DistrictArroundMapBaiduPOI.groovy | 16 +- .../district/DistrictArroundMapabcPOI.groovy | 16 +- .../district/DistrictAutoProcessBatch.groovy | 48 +- .../DistrictClickRankStatBatch.groovy | 16 +- .../DistrictClickStatisticsBatch.groovy | 2 +- .../district/DistrictCountStatBath.groovy | 2 +- .../DistrictDealSellRentRankBatch.groovy | 68 +- .../district/DistrictFacilities2Batch.groovy | 30 +- .../DistrictFacilitiesProcessMainBatch.groovy | 10 +- .../district/DistrictFieldWashBatch.groovy | 148 +- .../DistrictHouseAreaStatBatch.groovy | 4 +- .../script/district/DistrictHouseBatch.groovy | 16 +- .../script/district/DistrictKey.groovy | 2 +- .../DistrictMetroDistanceBatch.groovy | 2 +- .../script/district/DistrictPOIBatch.groovy | 2 +- .../script/district/DistrictPeriod.groovy | 36 +- .../script/district/DistrictPic.groovy | 6 +- .../district/DistrictRatioMatchBatch.groovy | 94 +- .../DistrictSmallPicsFilterBatch.groovy | 18 +- .../district/DistrictSmallPicsTest.groovy | 8 +- .../district/DistrictTagArbiterBatch.groovy | 10 +- .../script/district/DistrictTagBatch.groovy | 58 +- .../script/district/HospitalMatchBatch.groovy | 42 +- .../script/district/ImportOffice.groovy | 106 +- .../script/district/MasterNameInAlias.groovy | 6 +- .../district/NewDistrictStatBatch.groovy | 2 +- .../district/SeaweedGeoSysConvertBatch.groovy | 2 +- .../district/SeaweedStandardBatch.groovy | 74 +- .../script/district/SeaweedUpdateTask.groovy | 64 +- .../fangjia/script/district/Similarity.groovy | 26 +- .../com/fangjia/script/district/Test.groovy | 6 +- .../com/fangjia/script/district/Test2.groovy | 6 +- .../script/district/TrafficMatchBatch.groovy | 8 +- .../script/district/crawl/FzFdc.groovy | 22 +- .../district/crawl/MoveCrawlData.groovy | 2 +- .../crawl/SoufunDistrictDetailAnalyzer.groovy | 86 +- .../script/district/removeDistrict.groovy | 2 +- .../script/evaluation/AddLoudongInfo.groovy | 32 +- .../evaluation/AddressEvaluationBatch.groovy | 60 +- .../evaluation/BatchEvaluateBatch.groovy | 10 +- .../script/evaluation/EvaluationBatch.groovy | 166 +- .../evaluation/EvaluationCountBatch.groovy | 4 +- .../script/evaluation/EvaluationDemo.groovy | 64 +- .../evaluation/EvaluationExportBatch.groovy | 24 +- .../evaluation/EvaluationFieldProcent.groovy | 52 +- .../HouseLoudongAnalyseBatch.groovy | 18 +- .../evaluation/LoudongAnalyticsBatch.groovy | 2 +- .../evaluation/LoudongRowFlagBath.groovy | 30 +- .../script/exprian/ExprianDataProcess.groovy | 834 +- .../fangjia/script/exprian/ExprianUtil.groovy | 26 +- .../exprian/LngLatConvertorBatch.groovy | 12 +- .../script/exprian/ProcessExcelData.groovy | 6 +- .../fangjia/script/fangjia/ImportCtiy.groovy | 188 +- .../fangjia/MonitorConsumerBatch.groovy | 6 +- .../com/fangjia/script/fangjia/Test.groovy | 4 +- .../fangjia/house/EveryDayAddHouseStat.groovy | 6 +- .../house/HouseFilterReasonStatBatch.groovy | 4 +- .../fangjiatong/AbcEvaluationRowsBatch.groovy | 2 +- .../script/fangjiatong/AccessLogBatch.groovy | 12 +- .../script/fangjiatong/AddFjtCity.groovy | 10 +- .../script/fangjiatong/AnalyTask.groovy | 8 +- .../script/fangjiatong/DownPdfCheck.groovy | 38 +- .../EvaluationTaskAllocation.groovy | 34 +- .../fangjiatong/FjtAnalyCrawlerIp.groovy | 22 +- .../script/fangjiatong/FjtGuoQiUser.groovy | 2 +- .../script/fangjiatong/FjtHouseGlod.groovy | 2 +- .../fangjiatong/FjtLogAnalyBatch.groovy | 8 +- .../script/fangjiatong/FjtLogTest.groovy | 4 +- .../fangjiatong/FjtResponseTimeAnaly.groovy | 24 +- .../fangjiatong/FjtUserBrowserAnaly.groovy | 8 +- .../FjtUserClickLogAnalyBatch.groovy | 24 +- .../script/fangjiatong/SimilarUserStat.groovy | 90 +- .../script/fangjiatong/TimeoutBatch.groovy | 14 +- .../UnfreezeFjtUserGoldBatch.groovy | 4 +- .../UserSubmitDistrictTaskBatch.groovy | 6 +- .../com/fangjia/script/fangrui/Area.groovy | 2 +- .../com/fangjia/script/fangrui/Area10.groovy | 6 +- .../fangjia/script/fangrui/CountByCity.groovy | 6 +- .../script/fangrui/CountByRegion.groovy | 4 +- .../script/fangrui/DeleteSeawater.groovy | 2 +- .../script/fangrui/DistrictAvgPrice.groovy | 4 +- .../script/fangrui/LngLatEachWeek.groovy | 14 +- .../com/fangjia/script/fangrui/Util.groovy | 18 +- .../fangrui/email/MailAuthenticator.groovy | 6 +- .../script/fangrui/email/MailInfo.groovy | 28 +- .../script/fangrui/email/MailSender.groovy | 88 +- .../script/fangrui/email/SentEmail.groovy | 6 +- .../fangrui/noTimer/CityCoverRate.groovy | 6 +- .../script/fangrui/noTimer/DongGuan.groovy | 2 +- .../script/fangrui/noTimer/FA65.groovy | 12 +- .../fangrui/noTimer/FA65loudongCount.groovy | 16 +- .../script/fangrui/noTimer/FangGuanJu.groovy | 10 +- .../fangrui/noTimer/SimpleDistrict.groovy | 10 +- .../noTimer/UpdateCityAndRegion.groovy | 2 +- .../script/fangrui/noTimer/YunGuJia.groovy | 16 +- .../script/fangrui/noTimer/YunGuJia2.groovy | 46 +- .../script/fangrui/noTimer/YunGuJia3.groovy | 62 +- .../script/fangrui/noTimer/YunGuJia4.groovy | 30 +- .../script/fangrui/noTimer/YunGuJia9.groovy | 50 +- .../script/fangrui/spider/WeiPing.groovy | 8 +- .../script/fangrui/spider/Xuxiaoyu.groovy | 12 +- .../script/fpk/DistrictInfoAnaly.groovy | 4 +- .../com/fangjia/script/fsh/BrokerInfo.groovy | 10 +- .../script/fsh/CityHouseCountStatBatch.groovy | 6 +- .../script/fsh/CityPriceIndexBatch.groovy | 2 +- .../script/fsh/DayHouseStatBatch.groovy | 16 +- .../script/fsh/DistrictAreaBatch.groovy | 24 +- .../fsh/DistrictArroundPoiCountBatch.groovy | 26 +- .../fsh/DistrictBuildAndHouseNumBatch.groovy | 46 +- .../script/fsh/DistrictKLineDataBatch.groovy | 2 +- .../fsh/DistrictNewPriceSyncBatch.groovy | 40 +- .../com/fangjia/script/fsh/DistrictTag.groovy | 6 +- .../script/fsh/DistrictTagBatch.groovy | 48 +- .../fangjia/script/fsh/FshAroundQuote.groovy | 16 +- .../fangjia/script/fsh/FshAroundSell.groovy | 18 +- .../script/fsh/SendFSHRentNoticeBatch.groovy | 10 +- .../script/fuzhou/AmapAddressUpdate.groovy | 88 +- .../fuzhou/DistrictInfoExportBatch.groovy | 84 +- .../fuzhou/DistrictPriceExportBatch.groovy | 54 +- .../fuzhou/DistrictSellStatBatch.groovy | 52 +- .../script/fuzhou/FzDataResultStat.groovy | 50 +- .../script/fuzhou/FzDistrictMatch.groovy | 30 +- .../fangjia/script/fuzhou/FzFtpUtils.groovy | 18 +- .../com/fangjia/script/fuzhou/GongShu.groovy | 104 +- .../script/fuzhou/HouseExportBatch.groovy | 72 +- .../com/fangjia/script/fuzhou/Sha1Util.groovy | 8 +- .../com/fangjia/script/fuzhou/Test.groovy | 54 +- .../com/fangjia/script/fuzhou/Test1.groovy | 48 +- .../fuzhou/ThirdPriceExportBatch.groovy | 22 +- .../fangjia/script/fuzhou/ThirdTest.groovy | 56 +- .../script/fuzhou/TradeExportBatch.groovy | 10 +- .../geluke/DetailDataToMcdonalds.groovy | 118 +- .../script/geluke/GlkCityPriceLevel.groovy | 78 +- .../script/geluke/MapabcService.groovy | 814 +- .../fangjia/script/geluke/ServerArea.groovy | 2 +- .../fangjia/script/gj/AddAvgpriceBatch.groovy | 52 +- .../fangjia/script/gj/AddDataFromExcel.groovy | 52 +- .../com/fangjia/script/gj/AddDataTest.groovy | 16 +- .../fangjia/script/gj/AddDistrictBatch.groovy | 36 +- .../fangjia/script/gj/AddDistrictCq.groovy | 14 +- .../fangjia/script/gj/AddDistrictTemp.groovy | 10 +- .../fangjia/script/gj/AddEsHouseField.groovy | 22 +- .../script/gj/AddThirdPriceDistrict.groovy | 240 +- .../gj/AddZhugeFangDistrictSeedsBatch.groovy | 14 +- .../script/gj/AddressMatchLocation.groovy | 10 +- .../com/fangjia/script/gj/AliasProcess.groovy | 78 +- .../com/fangjia/script/gj/ApiTest.groovy | 18 +- .../fangjia/script/gj/BaiduMapCrawl.groovy | 18 +- .../script/gj/BaiduMapSearchTest.groovy | 28 +- .../script/gj/BaiduMapSearchTest1.groovy | 4 +- .../com/fangjia/script/gj/CcbDistrict.groovy | 22 +- .../fangjia/script/gj/CityDistrictStat.groovy | 10 +- .../script/gj/CityRegionFieldStat.groovy | 86 +- .../fangjia/script/gj/CitySellStatTest.groovy | 6 +- .../fangjia/script/gj/ConsumptionData.groovy | 4 +- .../fangjia/script/gj/CrawlDataMatch.groovy | 102 +- .../com/fangjia/script/gj/CreateWord.groovy | 38 +- .../com/fangjia/script/gj/CutWordUtils.groovy | 40 +- .../com/fangjia/script/gj/CzBankStat.groovy | 6 +- .../com/fangjia/script/gj/DataExport.groovy | 28 +- .../fangjia/script/gj/DealPriceProcess.groovy | 38 +- .../gj/DistrictCityRegionProcess.groovy | 8 +- .../fangjia/script/gj/DistrictDelete.groovy | 32 +- .../script/gj/DistrictDetailBatch.groovy | 20 +- .../com/fangjia/script/gj/DistrictFind.groovy | 8 +- .../fangjia/script/gj/DistrictMatch.groovy | 6 +- .../fangjia/script/gj/DistrictSearch.groovy | 202 +- .../com/fangjia/script/gj/DistrictStat.groovy | 104 +- .../script/gj/DistrictUpdateBatch.groovy | 26 +- .../script/gj/DistrictUpdateCrawl.groovy | 44 +- .../fangjia/script/gj/EsHousePriceStat.groovy | 4 +- .../com/fangjia/script/gj/EsHouseStat.groovy | 152 +- .../fangjia/script/gj/EsSearchUtils.groovy | 4 +- .../com/fangjia/script/gj/EsUtils.groovy | 2 +- .../script/gj/ExMatchDistrictFromExcel.groovy | 2 +- .../fangjia/script/gj/ExcelCheckDist.groovy | 6 +- .../fangjia/script/gj/ExportAllInfo.groovy | 46 +- .../fangjia/script/gj/ExportCityPrice.groovy | 2 +- .../com/fangjia/script/gj/FZDataExport.groovy | 48 +- .../script/gj/FZHouseEvaluation.groovy | 26 +- .../script/gj/FangjiatongUserStat.groovy | 6 +- .../fangjia/script/gj/FileSearchTest.groovy | 12 +- .../com/fangjia/script/gj/FiledStrand.groovy | 242 +- .../script/gj/FillDistrictFieldValue.groovy | 16 +- .../script/gj/FjtBatchEvaluation.groovy | 30 +- .../fangjia/script/gj/GaoDeMapCrawl.groovy | 54 +- .../script/gj/GaoDeMapCrawlOffice.groovy | 18 +- .../com/fangjia/script/gj/GreenBuild.groovy | 6 +- .../com/fangjia/script/gj/GuiyanBlank.groovy | 6 +- .../com/fangjia/script/gj/HLCTExport.groovy | 4 +- .../script/gj/HouseLouDongMatchBatch.groovy | 8 +- .../fangjia/script/gj/LandDetailCrawl.groovy | 86 +- .../script/gj/LianjiaPriceCrawler.groovy | 50 +- .../fangjia/script/gj/LocationSearch.groovy | 8 +- .../script/gj/LocationSearchDistrict.groovy | 26 +- .../com/fangjia/script/gj/LogStat.groovy | 16 +- .../com/fangjia/script/gj/MargerExcel.groovy | 44 +- .../fangjia/script/gj/MatchFromMongo.groovy | 12 +- .../com/fangjia/script/gj/MeituanTest.groovy | 4 +- .../script/gj/NoHouseDistrictStatBatch.groovy | 8 +- .../com/fangjia/script/gj/OpenApiStat.groovy | 26 +- .../com/fangjia/script/gj/OpenApiStat1.groovy | 14 +- .../com/fangjia/script/gj/OpenApiUtils.groovy | 98 +- .../fangjia/script/gj/OpenUserBatch.groovy | 16 +- .../script/gj/PingAnAddressLevalTest.groovy | 10 +- .../script/gj/PingAnPuHuiDataExport.groovy | 4 +- .../com/fangjia/script/gj/PoiLocation.groovy | 14 +- .../com/fangjia/script/gj/PriceLevel.groovy | 8 +- .../fangjia/script/gj/ProxyHttpUtils.groovy | 20 +- .../com/fangjia/script/gj/QQMapCrawl.groovy | 26 +- .../com/fangjia/script/gj/QinLingStat.groovy | 84 +- .../com/fangjia/script/gj/QinLingStat1.groovy | 84 +- .../fangjia/script/gj/QxjrDataExport.groovy | 40 +- .../script/gj/RegionBlockSetting.groovy | 2 +- .../com/fangjia/script/gj/RegionUpdate.groovy | 10 +- .../com/fangjia/script/gj/RoomStat.groovy | 2 +- .../fangjia/script/gj/RoundPoiFilter.groovy | 32 +- .../fangjia/script/gj/RunLocationInfo.groovy | 6 +- .../script/gj/SearchDistrictAddress.groovy | 34 +- .../script/gj/ShLongShangHangLocation.groovy | 10 +- .../com/fangjia/script/gj/SqmetreStat.groovy | 10 +- .../script/gj/StatCityRegionCount.groovy | 6 +- .../script/gj/SynchDistrictStatBatch.groovy | 10 +- .../com/fangjia/script/gj/SynchSeaweed.groovy | 2 +- .../com/fangjia/script/gj/SzCarData.groovy | 196 +- .../fangjia/script/gj/TempSynchData.groovy | 2 +- .../groovy/com/fangjia/script/gj/Test.groovy | 22 +- .../groovy/com/fangjia/script/gj/Test2.groovy | 2 +- .../com/fangjia/script/gj/TestData.groovy | 2 +- .../com/fangjia/script/gj/TestEmail.groovy | 14 +- .../com/fangjia/script/gj/TestEs.groovy | 4 +- .../fangjia/script/gj/TestExcelStat.groovy | 12 +- .../com/fangjia/script/gj/TestFjtLog.groovy | 4 +- .../com/fangjia/script/gj/TestGaodeMat.groovy | 44 +- .../com/fangjia/script/gj/TestLevel.groovy | 8 +- .../com/fangjia/script/gj/TestStat.groovy | 2 +- .../fangjia/script/gj/TradeDataMatch.groovy | 8 +- .../com/fangjia/script/gj/TradeMatch.groovy | 12 +- .../script/gj/UpdateStatWeekend.groovy | 6 +- .../gj/VagueAddressLocationBatch.groovy | 78 +- .../fangjia/script/gj/WuXiAddressTest.groovy | 22 +- .../script/gj/XinChaoHouseCount.groovy | 10 +- .../fangjia/script/gj/YinLianMeiShi.groovy | 62 +- .../com/fangjia/script/gj/YinLianTest.groovy | 2 +- .../fangjia/script/gj/YouDaDataParser.groovy | 106 +- .../script/gj/ZheShangPriceLevel.groovy | 10 +- .../com/fangjia/script/gj/ZheShengBank.groovy | 32 +- .../gj/ZhugezhaofangHouseCountCrawal.groovy | 34 +- .../fangjia/script/gj/abc/SuzouPocTest.groovy | 54 +- .../script/gj/address/AddressParser.groovy | 6 +- .../gj/apiLog/ApiTimeOutAnalyBatch.groovy | 2 +- .../gj/apiLog/ApiUserCountAnalyBatch.groovy | 8 +- .../script/gj/ccb/CcbCityPriceStat.groovy | 6 +- .../fangjia/script/gj/ccb/CcbCodeUtils.groovy | 174 +- .../fangjia/script/gj/ccb/CcbXykData.groovy | 2 +- .../gj/ccb/DistrictSchoolDataExport.groovy | 54 +- .../fangjia/script/gj/ccb/FileUtils.groovy | 22 +- .../fangjia/script/gj/ccb/HouseExport.groovy | 174 +- .../script/gj/chongqin/PocTest2023.groovy | 38 +- .../script/gj/chongqingblank/DataMatch.groovy | 60 +- .../chongqingblank/DistrictSelectHouse.groovy | 14 +- .../gj/chongqingblank/EvaluationPrice.groovy | 4 +- .../gj/chongqingblank/TestMatchResult.groovy | 170 +- .../script/gj/chongqingblank/TestPrice.groovy | 4 +- .../script/gj/city/CityStatExport.groovy | 34 +- .../script/gj/commStat/CityStat.groovy | 56 +- .../script/gj/commStat/DataStatTest.groovy | 58 +- .../gj/coresite/AddUrlToBaiduSpider.groovy | 26 +- .../script/gj/crawl/AnjukeAbuyunCrawl.groovy | 2 +- .../script/gj/crawl/AnjukeAppCrawl.groovy | 64 +- .../script/gj/crawl/AnjukeDetailCrawl.groovy | 78 +- .../script/gj/crawl/AnjukeDistSearch.groovy | 12 +- .../gj/crawl/AnjukeDistrictMatch.groovy | 112 +- .../script/gj/crawl/AnjukeHouseCrawl.groovy | 24 +- .../script/gj/crawl/AnjukeSendMq.groovy | 2 +- .../fangjia/script/gj/crawl/AnjukeToDB.groovy | 86 +- .../script/gj/crawl/DataCrawlUtils.groovy | 82 +- .../script/gj/crawl/OfficeProcess.groovy | 122 +- .../script/gj/crawl/SzGovHouseCrawl.groovy | 216 +- .../script/gj/crawl/ZhugeFangDistCrawl.groovy | 16 +- .../gj/data/AddDistrictFieldValue.groovy | 38 +- .../gj/data/BestDistrictPriceExport.groovy | 14 +- .../script/gj/data/ExportDistrictInfo.groovy | 6 +- .../fangjia/script/gj/data/FieldStat.groovy | 36 +- .../script/gj/data/RegionExport.groovy | 2 +- .../script/gj/data/RegionPriceExport.groovy | 12 +- .../script/gj/data/TempMatchDistrict.groovy | 16 +- .../fangjia/script/gj/data/XiamenStat.groovy | 156 +- .../script/gj/data/ZhengzhouBlankStat.groovy | 52 +- .../gj/data_handle/AddCityRegionPrice.groovy | 30 +- .../gj/data_handle/AddDevShapeData.groovy | 56 +- .../script/gj/data_handle/AddDistAddr.groovy | 44 +- .../gj/data_handle/AddDistrictAddress.groovy | 50 +- .../data_handle/AddDistrictShapeBatch.groovy | 38 +- .../gj/data_handle/AddrAlaisProcess.groovy | 38 +- .../data_handle/AutoAddDistrictBatch.groovy | 130 +- .../gj/data_handle/AutoAddOfficeBatch.groovy | 98 +- .../gj/data_handle/BaiduBaikeTown.groovy | 16 +- .../data_handle/BusinessQuarterProcess.groovy | 12 +- .../data_handle/CommunityShapeProcess.groovy | 6 +- .../script/gj/data_handle/DevProcess.groovy | 244 +- .../script/gj/data_handle/DevQlCheck.groovy | 16 +- .../gj/data_handle/DevUpdateTestBatch.groovy | 46 +- .../data_handle/DistrictAliasProcess.groovy | 10 +- .../gj/data_handle/DistrictLoopInfo.groovy | 26 +- .../gj/data_handle/DistrictRepeatBatch.groovy | 48 +- .../gj/data_handle/GXDdistrictMatch.groovy | 114 +- .../script/gj/data_handle/MinglujiData.groovy | 96 +- .../gj/data_handle/NewGaoDePoiBatch.groovy | 46 +- .../script/gj/data_handle/NewPoiData.groovy | 30 +- .../script/gj/data_handle/PoiLocation.groovy | 64 +- .../gj/data_handle/PoiNineSplitBatch.groovy | 6 +- .../gj/data_handle/RegionStandardBatch.groovy | 80 +- .../gj/data_handle/RegionUpdateBatch.groovy | 2 +- ...SynchAdministrativeMappingDataBatch.groovy | 14 +- .../gj/data_handle/SynchDevDataBatch.groovy | 14 +- .../gj/data_handle/TempExportData.groovy | 24 +- .../fangjia/script/gj/data_handle/Test.groovy | 8 +- .../data_handle/ThardParthAnalyBatch.groovy | 18 +- .../data_handle/ThirdPriceMappingBatch.groovy | 22 +- .../gj/data_handle/TownCenterBatch.groovy | 16 +- .../gj/data_handle/TownMiddleProcess.groovy | 384 +- .../gj/data_handle/TownStandardBatch.groovy | 116 +- .../gj/data_handle/TownshipPrcoess.groovy | 10 +- .../data_handle/TownshipStrandUpdate.groovy | 128 +- .../gj/data_handle/TradeDatasDistBatch.groovy | 6 +- .../gj/data_handle/VillaHouseBatch.groovy | 30 +- .../script/gj/district/AddAlias.groovy | 8 +- .../district/AddDistrictElevatorBatch.groovy | 12 +- .../fangjia/script/gj/district/ApiTest.groovy | 58 +- .../fangjia/script/gj/district/CcbData.groovy | 34 +- .../script/gj/district/CreateDicBatch.groovy | 12 +- .../script/gj/district/DataProcess.groovy | 106 +- .../gj/district/DistrictFieldAddBatch.groovy | 100 +- .../gj/district/DistrictFiledStat.groovy | 8 +- .../gj/district/DistrictLocationGeo.groovy | 14 +- .../script/gj/district/DistrictProcess.groovy | 50 +- .../DistrictStatRentCleanBatch.groovy | 2 +- .../script/gj/district/ExportData.groovy | 78 +- .../gj/district/FangjiaClientUtils.groovy | 12 +- .../script/gj/district/FlagProcess.groovy | 150 +- .../script/gj/district/JindDongGeoTest.groovy | 8 +- .../gj/district/MapDistrictProcess.groovy | 74 +- .../script/gj/district/MapMatchProcess.groovy | 6 +- .../script/gj/district/NameProcess.groovy | 112 +- .../script/gj/district/NlpProcess.groovy | 56 +- .../gj/district/OfficeFieldAddBatch.groovy | 24 +- .../gj/district/OfficeFieldCleanBatch.groovy | 92 +- .../script/gj/district/PricePkTest.groovy | 6 +- .../script/gj/district/RemoveDistrict.groovy | 12 +- .../script/gj/district/SameDistName.groovy | 20 +- .../district/SeaweedDataMatchProcess.groovy | 14 +- .../gj/district/SourceDistDataMatch.groovy | 40 +- .../fangjia/script/gj/district/Test.groovy | 2 +- .../gj/district/UpdateDistrictField.groovy | 28 +- .../script/gj/district/ZsNoExistsToDB.groovy | 50 +- .../script/gj/district/ZsPersonProcess.groovy | 276 +- .../gj/districtwash/AddDetailDistrict.groovy | 18 +- .../districtwash/AddThirdDistrictField.groovy | 44 +- .../DistrictAddressSameProcess.groovy | 20 +- .../gj/districtwash/DistrictDeleteWash.groovy | 4 +- .../DistrictFieldValidator.groovy | 18 +- .../gj/districtwash/DistrictRegionWash.groovy | 8 +- .../gj/districtwash/DistrictTypeCheck.groovy | 20 +- .../gj/districtwash/DistrictTypeUpdate.groovy | 20 +- .../gj/districtwash/DistrictWash.groovy | 60 +- .../gj/dongguanbank/DongGuanBankTest.groovy | 26 +- .../script/gj/es/EsHouseMatchDistrict.groovy | 2 +- .../script/gj/es/EsMonthHouseStat.groovy | 36 +- .../fangjia/script/gj/es/ExportHouse.groovy | 6 +- .../gj/es/FangjiaCorestieLogAnaly.groovy | 6 +- .../fangjia/script/gj/es/HouseAnaly.groovy | 26 +- .../fangjia/script/gj/es/OfficeStat.groovy | 26 +- .../FjwBigdataCommbuildtypeBatch.groovy | 8 +- .../FjwBigdataCommunityBatch.groovy | 26 +- .../FjwBigdataDealBatch.groovy | 96 +- .../FjwBigdataForsaleBatch.groovy | 146 +- .../FjwGuiDingPriceBatch.groovy | 18 +- .../fjwPriceBaseData/FjwPgsqlCommUtils.groovy | 4 +- .../FjwThirdPartyPriceBatch.groovy | 86 +- .../guangfa/GuangfaBlankSelectDistrict.groovy | 38 +- .../gj/hongxing/HongXingMonthBatch.groovy | 32 +- .../script/gj/hongxing/TestEvaluation.groovy | 98 +- .../script/gj/house/ExportArroundHouse.groovy | 22 +- .../script/gj/house/RemoveHouse.groovy | 4 +- .../gj/images/AddDistImagesBatch.groovy | 20 +- .../script/gj/level/DistrictIndexBatch.groovy | 34 +- .../script/gj/level/DsElasticUtils.groovy | 6 +- .../gj/location/DistrictLocationBatch.groovy | 6 +- .../gj/location/DistrictLocationUpdate.groovy | 18 +- .../gj/location/DistrictMapMatch.groovy | 8 +- .../gj/location/GaoDeMapSearchTest.groovy | 44 +- .../script/gj/location/GaodeCityRange.groovy | 10 +- .../script/gj/location/PointUtil.groovy | 26 +- .../location/RegionLocationUpdateBatch.groovy | 96 +- .../script/gj/location/RegionPoint.groovy | 62 +- .../script/gj/meishubao/MsbPocTest.groovy | 22 +- .../fangjia/script/gj/meituan/AddField.groovy | 2 +- .../script/gj/meituan/MatchTest.groovy | 38 +- .../gj/paimai/BeiKeCrawlByChrome.groovy | 140 +- .../script/gj/paimai/Caa123Crawl.groovy | 48 +- .../script/gj/paimai/ChromeDriverPool.groovy | 16 +- .../script/gj/paimai/DataFormatUtils.groovy | 12 +- .../fangjia/script/gj/paimai/DataUtil.groovy | 92 +- .../script/gj/paimai/ExportPaimai.groovy | 126 +- .../script/gj/paimai/GaoDeUtils.groovy | 12 +- .../fangjia/script/gj/paimai/IcbcCrawl.groovy | 74 +- .../script/gj/paimai/JdPaimaiCrawl.groovy | 76 +- .../gj/paimai/LianjiaCrawlByChrome.groovy | 134 +- .../script/gj/paimai/PaimaiDataSend.groovy | 94 +- .../script/gj/paimai/PaimaiDataUtil.groovy | 54 +- .../script/gj/paimai/PaimaiTest.groovy | 230 +- .../script/gj/paimai/RmfysszcCrawl.groovy | 94 +- .../script/gj/paimai/TaobaoPaimaiCrawl.groovy | 76 +- .../gj/paimai/TaobaoPaimaiCrawl2.groovy | 76 +- .../fangjia/script/gj/paimai/Worker.groovy | 4 +- .../fangjia/script/gj/poc/AddPriceTest.groovy | 62 +- .../fangjia/script/gj/poc/RentPrice.groovy | 6 +- .../script/gj/price/EvaluationBatch.groovy | 20 +- .../script/gj/price/FzMatchTest.groovy | 8 +- .../script/gj/region/MapAreaUpdate.groovy | 10 +- .../gj/region/StandardOtherWebRegion.groovy | 6 +- .../script/gj/test/AddressStandard.groovy | 58 +- .../script/gj/test/AnjukeCrawlToDB.groovy | 48 +- .../script/gj/test/ChongQingBlankTest.groovy | 18 +- .../gj/test/CompanyAddressCompare.groovy | 18 +- .../gj/test/CrawlDistrictIdSelect.groovy | 12 +- .../script/gj/test/DongGuangApiTest.groovy | 24 +- .../script/gj/test/ExportToDealPrice.groovy | 2 +- .../script/gj/test/FZloationUpdate.groovy | 22 +- .../fangjia/script/gj/test/FzBlankTest.groovy | 42 +- .../gj/test/JiangShuBlankDataStat.groovy | 28 +- .../script/gj/test/JingDongTest.groovy | 10 +- .../script/gj/test/MatchDistrict.groovy | 14 +- .../script/gj/test/MingShengStat.groovy | 66 +- .../script/gj/test/NonghangDataExport.groovy | 2 +- .../com/fangjia/script/gj/test/PoiTest.groovy | 12 +- .../fangjia/script/gj/test/RegionCode.groovy | 6 +- .../com/fangjia/script/gj/test/Test.groovy | 36 +- .../script/gj/test/TestArroundPrice.groovy | 12 +- .../script/gj/test/TestSendSchoolData.groovy | 14 +- .../script/gj/township/StreetProcess.groovy | 10 +- .../com/fangjia/script/gj/updateEs.groovy | 6 +- .../script/gj/village/GuangDaVillage.groovy | 24 +- .../script/gj/village/GuangdaTest.groovy | 94 +- .../script/gj/village/KunlunVillage.groovy | 26 +- .../script/gj/village/NanjiangVillage.groovy | 24 +- .../script/gj/village/QiliangTest.groovy | 36 +- .../fangjia/script/gj/village/ShBank.groovy | 24 +- .../script/gj/village/ShBankVillage.groovy | 24 +- .../script/gj/village/XiamenVillage.groovy | 24 +- .../gj/village/ailiyun/AnliyunApiUtils.groovy | 22 +- .../script/gj/village/ailiyun/Config.groovy | 4 +- .../gj/village/ailiyun/SignatureUtils.groovy | 26 +- .../script/gj/village/ailiyun/UrlUtil.groovy | 4 +- .../gj/village/communityLocation.groovy | 48 +- .../script/gj/village/govLocation.groovy | 10 +- .../script/gj/village/saveCommunity.groovy | 2 +- .../com/fangjia/script/gj/village/test.groovy | 34 +- .../script/gj/xiamen/CryptoSm4Util.groovy | 32 +- .../script/gj/xiamen/ElasticUtils89.groovy | 40 +- .../gj/xiamen/GaoDePoiDataProcess.groovy | 178 +- .../gj/xiamen/NetworkDistanceBatch.groovy | 8 +- .../gj/xiamen/PoiAndSeaweedExportCSV.groovy | 4 +- .../fangjia/script/gj/xiamen/PoiWash.groovy | 52 +- .../gj/xiamen/PostCodeSynchBatch.groovy | 4 +- .../gj/xiamen/RelatedTaiWanBatch.groovy | 22 +- .../script/gj/xiamen/SeaweedDataSynch.groovy | 66 +- .../gj/xiamen/SuggestionDataSynch.groovy | 32 +- .../gj/xiamen/XiaMenVillageBatch.groovy | 24 +- .../script/gj/xiamen/XmBankFtpUtils.groovy | 20 +- .../gj/xiamen/XmBankVillageFtpUtils.groovy | 44 +- .../gj/zhongshu/DistrictArrountOffice.groovy | 10 +- .../grade/ConsumptionRatingBatch.groovy | 134 +- .../script/grade/EstateRatingBatch.groovy | 24 +- .../script/house/AnsuoHouseSeachBatch.groovy | 92 +- .../fangjia/script/house/DelHouseStat.groovy | 2 +- .../script/house/DelSeabirdHouse.groovy | 2 +- .../house/DistrictRentHouseStatBatch.groovy | 4 +- .../house/DistrictSellHouseStatBatch.groovy | 10 +- .../script/house/DuplicateHouseRemover.groovy | 4 +- .../script/house/FixedPointCrawl.groovy | 76 +- .../fangjia/script/house/HoseBasePrice.groovy | 76 +- .../com/fangjia/script/house/HouseStat.groovy | 16 +- .../fangjia/script/house/LongRentBatch.groovy | 16 +- .../script/house/SensitiveWordHouse.groovy | 4 +- .../script/house/ShopOfficeHouse.groovy | 8 +- .../com/fangjia/script/house/Test.groovy | 2 +- .../script/house/TestDataExport.groovy | 64 +- .../AnalysisRelatedDistrictBatch.groovy | 44 +- .../houseloudong/CleanRepeatDistrict.groovy | 8 +- .../houseloudong/CleanRepeatDistrict1.groovy | 104 +- .../houseloudong/CleanRepeatDistrict2.groovy | 62 +- .../houseloudong/CorrectDistrictCity.groovy | 50 +- .../CrawlAnjukeHouseholdCount.groovy | 154 +- .../houseloudong/CrawlBaiduAddress.groovy | 6 +- .../houseloudong/CrawlBaiduMapDistrict.groovy | 38 +- .../houseloudong/CrawlDistrictArea.groovy | 18 +- .../CrawlHouseLoudongHelper.groovy | 36 +- .../houseloudong/CrawlHouseNumCoord.groovy | 14 +- .../houseloudong/CrawlLejuHouseLoudong.groovy | 90 +- .../houseloudong/CrawlMoliHouseLoudong.groovy | 30 +- .../CrawlMyLivingHouseholdCount.groovy | 14 +- .../CrawlQingdaoFDHouseLoudong.groovy | 8 +- .../CrawlSoufunDistrictCoord.groovy | 20 +- .../CrawlSoufunHouseLoudong.groovy | 260 +- .../houseloudong/DeveloperNameProc.groovy | 38 +- .../houseloudong/DistrictRelationUtils.groovy | 56 +- .../houseloudong/EstateCompanyRank.groovy | 2 +- .../houseloudong/ExportSeabirdCat.groovy | 234 +- .../houseloudong/GenerateHouseLoudong.groovy | 416 +- .../houseloudong/ParseDistrictFromCGB.groovy | 54 +- .../houseloudong/ParseDistrictFromEsf.groovy | 28 +- .../houseloudong/ParseDistrictRoomType.groovy | 38 +- .../houseloudong/ParseStreetCommunity.groovy | 48 +- .../houseloudong/ProcessBaiduDistrict.groovy | 6 +- .../ProcessBaiduDistrictAddr.groovy | 18 +- .../houseloudong/RepeatDistrictFinder.groovy | 74 +- .../script/hubingliang/AddSomeDateToDB.groovy | 48 +- .../hubingliang/AddressAnalyPlatBatch.groovy | 80 +- .../AddressAnalyPlatSellCountBatch.groovy | 12 +- .../AddressFindLouHouseInfo.groovy | 210 +- .../script/hubingliang/AddressPlatTest.groovy | 20 +- .../hubingliang/AnalySaleDataBatch.groovy | 22 +- .../hubingliang/ApiInvokeStatistics.groovy | 10 +- .../hubingliang/ApiInvokeStatistics1.groovy | 6 +- .../ArtimesDataExceptionRemind.groovy | 14 +- .../script/hubingliang/AvgPriceLevel.groovy | 2 +- .../hubingliang/BeijingDataToDataDept.groovy | 6 +- .../hubingliang/DaoChuBiaoZhunXiaoQu.groovy | 14 +- .../DaoChuBiaoZhunXiaoQuBatch.groovy | 22 +- .../DaoChuBiaoZhunXiaoQuBatch1.groovy | 18 +- .../DaoChuBiaoZhunXiaoQuBatch2.groovy | 18 +- .../DaoChuBiaoZhunXiaoQuBatch3.groovy | 22 +- .../DaoChuBiaoZhunXiaoQuBatch4.groovy | 42 +- .../hubingliang/DataBkoffDataToSeaweed.groovy | 30 +- .../hubingliang/ExportBiaoZhunDis.groovy | 20 +- ...FJTevaluationAutoToMortgageInfoBase.groovy | 20 +- .../FJTevaluationToMortgageInfoBase.groovy | 18 +- .../FangJiaWangDataStatistics.groovy | 26 +- .../hubingliang/FangYuanJunGongZiDuan.groovy | 10 +- .../script/hubingliang/FindUpdatReason.groovy | 4 +- .../hubingliang/GaodePOIFetchBatch.groovy | 198 +- .../GetDistrictAddressFromMapApi.groovy | 150 +- .../hubingliang/HangZhouFuZhuSaleData.groovy | 16 +- .../com/fangjia/script/hubingliang/Hu.groovy | 2 +- .../script/hubingliang/HuExportData.groovy | 10 +- .../hubingliang/HuShuTianCongBatch.groovy | 38 +- .../fangjia/script/hubingliang/HuTest.groovy | 30 +- .../script/hubingliang/HuanXianUpdate.groovy | 14 +- ...iduateEvaAndRegisterTimeStatistical.groovy | 10 +- .../script/hubingliang/MeiYouZhangFu.groovy | 20 +- .../script/hubingliang/MortgageType.groovy | 4 +- .../script/hubingliang/NoNomalDis.groovy | 10 +- .../script/hubingliang/OwnUtils.groovy | 12 +- .../script/hubingliang/PDSDataTest.groovy | 44 +- .../script/hubingliang/PdsDataToTest.groovy | 72 +- .../hubingliang/PdsHouseScoreCityLevel.groovy | 84 +- .../hubingliang/PdsPingFenMoXing.groovy | 32 +- .../hubingliang/PdsUseStatisticBatch.groovy | 74 +- .../script/hubingliang/PdsUtils.groovy | 2 +- .../hubingliang/PersonToCityBatch.groovy | 46 +- .../hubingliang/SaleDataToChengCheng.groovy | 4 +- .../hubingliang/ShangHaiTongJiJuShuJu.groovy | 24 +- .../script/hubingliang/ShuJuBao4Batch.groovy | 164 +- .../script/hubingliang/ShuJuBaoBatch.groovy | 76 +- .../hubingliang/ShuJuBaoCommunalBatch.groovy | 262 +- .../StatisticsNewSaleAndOldSale.groovy | 16 +- .../hubingliang/UpdateDistrictAddress.groovy | 88 +- .../UpdatePreciseDistrictAddress.groovy | 158 +- .../WuHuShuXiaoQuFangYuanLiang.groovy | 16 +- .../XiaoQuMingZhongNongHaoEnd.groovy | 18 +- .../script/hubingliang/XinFengCurrent.groovy | 16 +- .../script/hubingliang/XinFengPingGu.groovy | 4 +- .../hubingliang/XinFengPingGu2Batch.groovy | 20 +- .../hubingliang/XinFengPingGuBatch.groovy | 58 +- .../script/hubingliang/XinFengRuKu.groovy | 106 +- .../script/hubingliang/XinFengRuKuCopy.groovy | 60 +- .../hubingliang/XinFengRuKuCurrent.groovy | 76 +- .../hubingliang/XinFengRuKuStatic.groovy | 76 +- .../hubingliang/XinFengRuKuToLine.groovy | 10 +- .../script/hubingliang/ZiDuanTianCong.groovy | 86 +- ...dressAnalyPlatHouseAndBuildingBatch.groovy | 30 +- .../app/AroundHospitalBatch.groovy | 18 +- .../hubingliang/app/AroundSchoolBatch.groovy | 18 +- .../business/ExportBusinessUserData.groovy | 8 +- .../business/FjtStatisticDDBatch.groovy | 42 +- .../business/FshStatisticDDBatch.groovy | 30 +- .../business/PdsStatisticDDBatch.groovy | 32 +- .../business/UserOverDueDDStatistic.groovy | 50 +- .../dataissue/CreatTestData.groovy | 2 +- .../hubingliang/dataissue/DataCityInfo.groovy | 8 +- .../dataissue/DataRegionInfo.groovy | 38 +- .../hubingliang/dataissue/ExportAlias.groovy | 6 +- .../hubingliang/dataissue/ExportData.groovy | 18 +- .../dataissue/ExportXinFengDis.groovy | 2 +- .../dataissue/FuQuanFangHaoHnadle.groovy | 2 +- .../dataissue/HandleLogAnalyBatch.groovy | 4 +- .../dataissue/HuaLunWangLuo.groovy | 18 +- .../hubingliang/dataissue/NoNomalDis.groovy | 20 +- .../dataissue/PuTianFangHaoHnadle.groovy | 6 +- .../dataissue/QuanZhouFangHaoHnadle.groovy | 22 +- .../dataissue/SeaWaterDateUse.groovy | 12 +- .../dataissue/UpdateCityAndRegion.groovy | 2 +- .../hubingliang/fsh/DistrictActivity.groovy | 68 +- .../script/hubingliang/fsh/InserData.groovy | 6 +- .../pds/AroundDistrictLevel.groovy | 14 +- .../pds/AvgPriceChangeLevel.groovy | 20 +- .../hubingliang/pds/AvgPriceLevelBatch.groovy | 6 +- .../hubingliang/pds/DaiQianGuZhiBatch.groovy | 34 +- .../hubingliang/pds/DealHouseLevel.groovy | 12 +- .../hubingliang/pds/DealHouseUtils.groovy | 24 +- .../hubingliang/pds/FangYuanLevel.groovy | 12 +- .../hubingliang/pds/HuExportData.groovy | 12 +- .../hubingliang/pds/KeHuFenLeiBatch.groovy | 28 +- .../hubingliang/pds/KeHuPingJiBatch.groovy | 34 +- .../script/hubingliang/pds/LevelUtil.groovy | 4 +- .../hubingliang/pds/PdsDataExport.groovy | 10 +- .../spider/AnalySaleDataBatch.groovy | 40 +- .../spider/BeiJingFaYuanBatch.groovy | 6 +- .../spider/BeiJingFaYuanWangBatch.groovy | 52 +- ...ErShouMaiTianZaiXianCatchAnalyBatch.groovy | 68 +- .../CopyOfQFangWangCatchAnalyBatch.groovy | 56 +- ...ErShouMaiTianZaiXianCatchAnalyBatch.groovy | 56 +- .../ErShouShaoXingECatchAnalyBatch.groovy | 54 +- .../spider/ExportHouseHoldProblenBatch.groovy | 8 +- .../spider/FangWangAnalySaleDataBatch.groovy | 18 +- .../spider/HanYuPingYingUtils.groovy | 302 +- .../hubingliang/spider/HttpUtils.groovy | 10 +- .../spider/HuZhouZheBeiPaiMaiBatch.groovy | 10 +- .../hubingliang/spider/NewSale163Batch.groovy | 40 +- .../spider/NewSale163CatchAnalyBatch.groovy | 44 +- .../spider/NewSale163RuKuBatch.groovy | 12 +- .../NewSaleSouHuJiaoDianAnalyBatch.groovy | 30 +- .../spider/NewSaleSouHuJiaoDianBatch.groovy | 26 +- .../NewSaleSouHuJiaoDianRuKuBatch.groovy | 12 +- .../spider/QFangWangCatchAnalyBatch.groovy | 66 +- .../QinDaoChanQuanJiaoYiSuoBatch.groovy | 26 +- .../spider/QinDaoPaiMaiZhongXinBatch.groovy | 10 +- .../spider/QinDaoYiHenPaiMaiBatch.groovy | 106 +- .../spider/ShangHaiDataToDept.groovy | 4 +- .../spider/ShaoXinERuKuToLine.groovy | 10 +- .../spider/ShuJuBaoCommunalBatch.groovy | 172 +- .../SouHuJiaoDianAnalySaleDataBatch.groovy | 20 +- .../spider/SpideDateDataDept.groovy | 18 +- .../spider/XinFengPingGuBatch.groovy | 64 +- .../spider/XinFengPingGuBatchCopy.groovy | 30 +- .../spider/XinFengPingGuZiDongBatch.groovy | 26 +- .../spider/ZhangJiaGangCatchAnalyBatch.groovy | 56 +- .../spider/ZhongGouShiFaPaiMaiBatch.groovy | 54 +- .../updateDistrictAddressFromBaiApi.groovy | 154 +- .../index/AutocompleteDataUpdaterBatch.groovy | 10 +- .../fangjia/script/index/DataStatBatch.groovy | 20 +- .../DeleteForMobileBlackListBatch.groovy | 2 +- .../index/FangjiaHouseBackupBatch.groovy | 4 +- .../script/index/HouseRemoveBatch.groovy | 4 +- .../index/ReIndexShopOfficeBatch.groovy | 2 +- .../RemoveOverdueSeabirdHouseBatch.groovy | 2 +- .../index/SeabirdDataControlBatch.groovy | 2 +- .../script/index/SeaweedReIndexBatch.groovy | 4 +- .../jiangnanblank/CZBlankDataExport.groovy | 788 +- .../script/jiangnanblank/CZDataBatch.groovy | 80 +- .../DayUpdateDistRefreshBatch.groovy | 6 +- .../script/jiangnanblank/FzDataUtils.groovy | 160 +- .../JiangNanBlankBaseInfoDataBatch.groovy | 32 +- .../JiangNanBlankHousesDataBatch.groovy | 30 +- .../fangjia/script/jiangnanblank/SFTP.groovy | 60 +- .../script/jiangshu/JsBlankTest.groovy | 2 +- .../jms/CityHouseNumMonitorBatch.groovy | 24 +- .../script/jms/CpcHouseSortConsumer.groovy | 16 +- .../jms/CpcHouseSortConsumerTest.groovy | 8 +- .../fangjia/script/jms/EmailConsumer.groovy | 32 +- .../script/jms/EmppReceiverListener.groovy | 52 +- .../script/jms/SMSIngoingListener.groovy | 14 +- .../script/jms/SMSOutgoingListener.groovy | 88 +- .../script/jms/SmsOutgoingConsumer.groovy | 72 +- .../script/jms/aliyun/AliyunSmsClient.groovy | 34 +- .../script/jms/yimei/SingletonClient.groovy | 122 +- .../script/jms/yimei/TestSDKClient.groovy | 176 +- .../DistrictArroundPoiExportBatch.groovy | 58 +- .../jusfoun/DistrictStatExportBatch.groovy | 32 +- .../DistrictStatRentExportBatch.groovy | 32 +- .../jusfoun/HousingOverviewExportBatch.groovy | 124 +- .../HousingTransactionExportBatch.groovy | 74 +- ...usingTransactionShanghaiExportBatch.groovy | 40 +- .../script/jusfoun/JusfounCommon.groovy | 36 +- .../jusfoun/LandDistrictExportBatch.groovy | 20 +- .../script/jusfoun/LandExportBatch.groovy | 52 +- .../fangjia/script/jusfoun/LocalStart.groovy | 2 +- .../jusfoun/LocalStartMultiThread.groovy | 2 +- .../PropertyOverviewExportBatch.groovy | 106 +- .../jusfoun/RegionRentExportBatch.groovy | 20 +- .../jusfoun/RegionStatExportBatch.groovy | 20 +- .../jusfoun/RentHouseExportBatch.groovy | 56 +- .../script/jusfoun/StatTableCount.groovy | 4 +- .../script/linxsh/CompareOthers.groovy | 26 +- .../script/linxsh/CountCoverage.groovy | 10 +- .../linxsh/ExtractEvaluationData.groovy | 4 +- .../script/linxsh/FormatLoudong.groovy | 6 +- .../script/linxsh/FormatLoudongName.groovy | 8 +- .../script/linxsh/HandleFangguanju.groovy | 2 +- .../script/linxsh/HandleGuguAddress.groovy | 36 +- .../script/linxsh/HandleGuguData.groovy | 106 +- .../script/linxsh/ImportHouseData2.groovy | 64 +- .../fangjia/script/linxsh/ShanghaiWuye.groovy | 14 +- .../com/fangjia/script/linxsh/Test.groovy | 6 +- .../com/fangjia/script/linxsh/Test2.groovy | 4 +- .../com/fangjia/script/linxsh/Yungujia.groovy | 4 +- .../script/linxsh/count/Complete.groovy | 68 +- .../fangjia/script/linxsh/count/Count.groovy | 172 +- .../script/linxsh/count/FetchDemo.groovy | 178 +- .../script/linxsh/count/FetchDemo2.groovy | 58 +- .../linxsh/dealprice/ConvertType.groovy | 2 +- .../dealprice/CountDealPriceBatch.groovy | 6 +- .../linxsh/dealprice/ImportBuyData.groovy | 6 +- .../linxsh/dealprice/ImportSearchData.groovy | 56 +- .../script/linxsh/dealprice/ShaoxingE.groovy | 20 +- .../script/linxsh/district/DiffAddress.groovy | 6 +- .../district/ExportDuplicateData.groovy | 70 +- .../district/ImportYungujiaToDistrict.groovy | 16 +- .../district/RemoveDuplicateData.groovy | 10 +- .../linxsh/district/UpdateAddress.groovy | 18 +- .../linxsh/export/DelLoudongDistrict.groovy | 8 +- .../export/ExportEvaluationToLoudong.groovy | 6 +- .../fangjia/script/linxsh/export/Test.groovy | 4 +- .../script/linxsh/formatloudong/Fuzhou.groovy | 38 +- .../linxsh/formatloudong/HandleAddress.groovy | 4 +- .../linxsh/formatloudong/HandleBuyData.groovy | 4 +- .../formatloudong/HandleGuguAddress.groovy | 48 +- .../linxsh/formatloudong/HandleName.groovy | 10 +- .../ImportDealDataToHouseLoudong.groovy | 4 +- .../formatloudong/ImportNonghang.groovy | 18 +- .../ImportNonghangToHouseloudong.groovy | 14 +- .../fangjia/script/linxsh/land/Chengdu.groovy | 10 +- .../fangjia/script/linxsh/land/Xiamen.groovy | 42 +- .../script/linxsh/land/chongqing.groovy | 28 +- .../loudong/extract/CompleteRegion.groovy | 2 +- .../extract/ExtractHouseAndRoomDatas.groovy | 42 +- .../loudong/extract/ExtractRoomData.groovy | 20 +- .../loudong/extract/FormatAddress.groovy | 2 +- .../extract/HandleDataFromLoudong.groovy | 6 +- .../loudong/extract/Nonghangfugu.groovy | 56 +- .../script/linxsh/loudong/extract/Temp.groovy | 18 +- .../linxsh/loudong/extract/allDatas.groovy | 28 +- .../extract/date20170217/NanjingHouse.groovy | 32 +- .../extract/date20170222/Jianhang.groovy | 16 +- .../extract/date20170228/FangLiBang.groovy | 36 +- .../date20170228/NanjingYinhang.groovy | 12 +- .../extract/date20170309/Anshuo.groovy | 8 +- .../ExportHouseloudongToLoudong.groovy | 10 +- .../extract/date20170314/Anshuo.groovy | 10 +- .../extract/date20170314/Jingdian.groovy | 8 +- .../extract/date20170322/Cities71.groovy | 6 +- .../extract/date20170322/Shaoxingfc.groovy | 20 +- .../extract/date20170324/Chenzhou.groovy | 18 +- .../extract/date20170418/LianjiaImage.groovy | 6 +- .../date20170418/YungujiaCompare.groovy | 26 +- .../date20170419/LianjiaHousehold.groovy | 4 +- .../extract/date20170419/Yungujia.groovy | 10 +- .../date20170424/YungujiaCompare.groovy | 12 +- .../extract/date20170425/AnjukeLoudong.groovy | 12 +- .../extract/date20170425/HandleShWy.groovy | 8 +- .../extract/date20170425/ShPaifang.groovy | 12 +- .../date20170519/CleanHouseLoudongUnit.groovy | 8 +- .../date20170519/CleanLoudongUnit.groovy | 10 +- .../date20170602/FormatHouseloudong.groovy | 4 +- .../extract/date20170605/CompleteAddr.groovy | 4 +- .../extract/date20170606/ExportDemo.groovy | 10 +- .../extract/date20170607/CompleteLoop.groovy | 8 +- .../date20170608/ExportHouseOffice3.groovy | 28 +- .../CompleteFromYungujiaWylx.groovy | 12 +- .../date20170613/FindDuplicateRegion.groovy | 10 +- .../date20170616/ExtractYfsdDistrict.groovy | 10 +- .../ExportYungujiaAvgPrice.groovy | 12 +- .../linxsh/loudong/extract/zhuhai.groovy | 6 +- .../linxsh/meishi/ExtractFromDealPrice.groovy | 4 +- .../script/linxsh/meishi/FormatRegion.groovy | 2 +- .../script/linxsh/meishi/HandleData.groovy | 40 +- .../linxsh/meishi/Save2HouseLoudong.groovy | 2 +- .../script/linxsh/telecom/FilterData.groovy | 24 +- .../script/linxsh/telecom/ImportData.groovy | 36 +- .../linxsh/util/AddressFormatUtil.groovy | 2 +- .../script/linxsh/util/AddressUtil.groovy | 146 +- .../script/linxsh/util/CommonUtil.groovy | 36 +- .../script/linxsh/util/LoudongUtil.groovy | 194 +- .../fangjia/script/linxsh/util/MapUtil.groovy | 76 +- .../script/linxsh/util/NewLoudongUtil.groovy | 180 +- .../linxsh/util/entity/HouseLoudong.groovy | 6 +- .../linxsh/util/handler/AddressHandler.groovy | 2 +- .../linxsh/util/handler/BaseHandler.groovy | 8 +- .../util/handler/CityAndRegionHandler.groovy | 12 +- .../util/handler/DistrictNameHandler.groovy | 40 +- .../linxsh/util/handler/FloorHandler.groovy | 2 +- .../util/handler/HouseNumberHandler.groovy | 42 +- .../util/handler/RoomNumberHandler.groovy | 4 +- .../linxsh/util/handler/UnitHandler.groovy | 22 +- .../script/lixue/DB/AddressDiff.groovy | 18 +- .../script/lixue/DB/AvgPriceStatistic.groovy | 2 +- .../script/lixue/DB/BeijingCount.groovy | 4 +- .../script/lixue/DB/ChangZhouhouse.groovy | 16 +- .../com/fangjia/script/lixue/DB/City.groovy | 34 +- .../fangjia/script/lixue/DB/Constrct.groovy | 4 +- .../com/fangjia/script/lixue/DB/DaoChu.groovy | 50 +- .../fangjia/script/lixue/DB/EndTime.groovy | 6 +- .../script/lixue/DB/FangguguExport.groovy | 10 +- .../com/fangjia/script/lixue/DB/Guifan.groovy | 30 +- .../script/lixue/DB/HouseNumClear.groovy | 4 +- .../fangjia/script/lixue/DB/JiangSuBai.groovy | 4 +- .../fangjia/script/lixue/DB/Location.groovy | 2 +- .../script/lixue/DB/LongYanJiexi.groovy | 12 +- .../script/lixue/DB/LoudongUtil1.groovy | 194 +- .../fangjia/script/lixue/DB/NameExport.groovy | 4 +- .../com/fangjia/script/lixue/DB/PaiMai.groovy | 20 +- .../fangjia/script/lixue/DB/QuanZhou.groovy | 2 +- .../script/lixue/DB/RegionExport.groovy | 2 +- .../fangjia/script/lixue/DB/RegionStat.groovy | 4 +- .../com/fangjia/script/lixue/DB/Road.groovy | 2 +- .../com/fangjia/script/lixue/DB/RuKu.groovy | 8 +- .../script/lixue/DB/SanMingJiexi.groovy | 40 +- .../script/lixue/DB/SeabirdStatExport.groovy | 26 +- .../script/lixue/DB/StatisticRoomNum.groovy | 8 +- .../fangjia/script/lixue/DB/Statues.groovy | 6 +- .../script/lixue/DB/StatusChange.groovy | 4 +- .../fangjia/script/lixue/DB/True_num.groovy | 4 +- .../fangjia/script/lixue/DB/VirTest.groovy | 6 +- .../script/lixue/DB/XiaMenjiexi.groovy | 4 +- .../fangjia/script/lixue/DB/XiamenRuku.groovy | 12 +- .../script/lixue/DB/ZhangjiagangRuku.groovy | 8 +- .../script/lixue/DB/ZhongYanJiexi.groovy | 8 +- .../script/lixue/dataexport/AddressCom.groovy | 12 +- .../lixue/dataexport/AddressComExport.groovy | 8 +- .../lixue/dataexport/DealPrictCount.groovy | 4 +- .../lixue/dataexport/DeveloperExport.groovy | 12 +- .../lixue/dataexport/DistrictAvg.groovy | 8 +- .../dataexport/ErrorAddressExport.groovy | 16 +- .../lixue/dataexport/EstateInName.groovy | 28 +- .../lixue/dataexport/FangguguExport.groovy | 8 +- .../lixue/dataexport/FangguguMapRegion.groovy | 16 +- .../script/lixue/dataexport/MapRegion.groovy | 8 +- .../lixue/dataexport/RegionRentExport.groovy | 2 +- .../lixue/dataexport/SampleMatchHouse.groovy | 8 +- .../SampleMatchHouseOptimize.groovy | 10 +- .../lixue/dataexport/YunGujiaSplit.groovy | 2 +- .../lixue/dataexport/YungujiaExport.groovy | 14 +- .../lixue/dataimport/DealPriceImport.groovy | 2 +- .../lixue/dataimport/FangguguImport.groovy | 88 +- .../dataimport/FangguguOtherImport.groovy | 2 +- .../lixue/dataimport/InCreaseYungujia.groovy | 4 +- .../lixue/dataimport/YouFangImport.groovy | 26 +- .../dataimport/YunGujiaFanghaoImport.groovy | 30 +- .../lixue/dataimport/YunGujiaImport.groovy | 30 +- .../dataimport/YungujiaMatchImport.groovy | 14 +- .../dataimport/ZheShangBankImport.groovy | 14 +- .../lixue/dataupdate/AddressUpdate.groovy | 14 +- .../dataupdate/DistrictBuildTypeUpdate.groovy | 16 +- .../dataupdate/DistrictEnddateUpdate.groovy | 12 +- .../lixue/dataupdate/FangGuanjuUpdate.groovy | 24 +- .../script/lixue/dataupdate/NameAlias.groovy | 22 +- .../script/lixue/dataupdate/NameUpdate.groovy | 16 +- .../lixue/dataupdate/RegionUpdate.groovy | 14 +- .../lixue/dataupdate/StatusUpdate.groovy | 4 +- .../lixue/dataupdate/XiamenUpdate.groovy | 6 +- .../lixue/dataupdate/YungujiaJudge.groovy | 2 +- .../lixue/fangjiatong/UpdateDownload.groovy | 22 +- .../lixue/fangjiatong/UpdateDownload1.groovy | 18 +- .../lixue/fangjiatong/UpdateDownload2.groovy | 18 +- .../lixue/fangjiatong/UpdateDownload3.groovy | 18 +- .../lixue/fangjiatong/UpdateDownload4.groovy | 18 +- .../lixue/fangjiatong/UpdateDownload5.groovy | 18 +- .../script/lixue/match/DistrictMatch.groovy | 20 +- .../script/lixue/match/FangguguMatch.groovy | 40 +- .../script/lixue/match/FggYgjMatch.groovy | 18 +- .../script/lixue/match/MatchSid.groovy | 4 +- .../lixue/match/QuanZhouMatchSid.groovy | 4 +- .../script/lixue/match/YunGujia.groovy | 36 +- .../lixue/match/YunGujiaMatchSid.groovy | 24 +- .../script/lixue/seabird/SeaWaterCom.groovy | 4 +- .../fangjia/script/lixue/spider/Anshan.groovy | 40 +- .../script/lixue/spider/AvgLianjia.groovy | 6 +- .../script/lixue/spider/LianjiaJiexi.groovy | 14 +- .../script/lixue/spider/LongYan.groovy | 8 +- .../fangjia/script/lixue/spider/MuBan.groovy | 6 +- .../script/lixue/spider/ShanXia.groovy | 38 +- .../fangjia/script/lixue/spider/Test.groovy | 8 +- .../script/lixue/spider/Zangzhou.groovy | 4 +- .../script/lixue/spider/Zhongyuan.groovy | 4 +- .../script/lixue/util/DateFormat.groovy | 28 +- .../script/lixue/util/HouseLoudong.groovy | 44 +- .../script/lixue/util/ToDealPrice.groovy | 10 +- .../script/lixue/util/ToHouseLoudong.groovy | 2 +- .../lixue/zheshangBank/ZhongYuanBank.groovy | 54 +- .../script/lixue/zheshangBank/test.groovy | 2 +- .../loanLeadToCRM/CityProvinceMap.groovy | 2 +- .../script/loanLeadToCRM/LoanLeadSync.groovy | 302 +- .../script/loanLeadToCRM/MatchRuleMap.groovy | 36 +- .../AnalyticsApiLogPerformanceBatch.groovy | 18 +- .../script/log/CommonLogAnaBatch.groovy | 262 +- .../script/log/DaikuanLogAnaBatch.groovy | 52 +- .../log/DistrictAttentionLogBatch.groovy | 8 +- .../DistrictAttentionLogCaculateBatch.groovy | 50 +- .../log/DynamicLogByCityAndSiteBatch.groovy | 46 +- .../script/log/ElasticLogAnaBatch.groovy | 12 +- .../log/MongoDBLogDisMonitorBatch.groovy | 4 +- .../script/log/MongoDBLogMonitorBatch.groovy | 4 +- .../script/log/ReadAnalyDynamicLog.groovy | 22 +- .../script/log/ReadBackoffLogBatch.groovy | 12 +- .../log/ReadBkoffArtemisLogBatch.groovy | 8 +- .../script/log/ReadBkoffSafeLogBatch.groovy | 32 +- .../log/SpidersLogAnalyticsBatch.groovy | 4 +- .../com/fangjia/script/log/Test_weilei.groovy | 4 +- .../looplineinfo/AddLoopLineInfo.groovy | 50 +- .../script/looplineinfo/InPolygon.groovy | 68 +- .../script/looplineinfo/InsidePolygon.groovy | 16 +- .../涓婃捣缁熻灞�闇�瑕佸瓧娈垫暟鎹甠淇敼.groovy | 24 +- .../script/loudong/CqfdcChromeCrawl.groovy | 42 +- .../fangjia/script/loudong/CqfdcMatch.groovy | 78 +- .../loudong/HouseBookChromeCrawl.groovy | 42 +- .../script/loudong/HouseBookCrawl.groovy | 6 +- .../script/loudong/HouseLoudongCaluate.groovy | 22 +- .../fangjia/script/loudong/ImageTest.groovy | 58 +- .../script/loudong/LoudongStep1.groovy | 6 +- .../script/loudong/LoudongStep2.groovy | 2 +- .../script/loudong/LoudongStep3.groovy | 8 +- .../script/majintao/GaodePOI2Baidu.groovy | 78 +- .../JSBankTest/JSBankAliAddress.groovy | 6 +- .../JSBankTest/JSBankDevelopmentZOne.groovy | 18 +- .../JSBankTest/JSBankSheNongTest.groovy | 14 +- .../script/majintao/Seewater2seebird.groovy | 4 +- .../script/majintao/sdklog/getAllCity.groovy | 8 +- .../majintao/test/AliAddressTest.groovy | 10 +- .../test/AliAddressTestChecked.groovy | 8 +- .../script/majintao/test/FiveLevelTest.groovy | 2 +- .../script/majintao/test/SheNongTest.groovy | 6 +- .../script/majintao/test/SheNongTest2.groovy | 20 +- .../majintao/test/SheNongTestChecked.groovy | 6 +- .../majintao/test/nanjingBankTest.groovy | 4 +- .../fangjia/script/majintao/test/test.groovy | 8 +- .../script/mapabc/BusDataImporter.groovy | 2 +- .../mapabc/DistrictAddressPOIBatch.groovy | 774 +- .../HouseinfoMarsoftExportData.groovy | 4 +- .../HousepriceinfoMarsoftExportData.groovy | 2 +- .../marsoftdata/MarsoftExportData.groovy | 88 +- .../script/marsoftdata/MarsoftExporter.groovy | 4 +- .../script/newDistrict/MapabcService.groovy | 824 +- .../newDistrict/NewDistrictPrice.groovy | 16 +- .../newDistrict/SoufunRunNewDistrict.groovy | 146 +- .../newDistrict/SpiderNewDistrict.groovy | 10 +- .../script/openApi/ExportOpenLog.groovy | 30 +- .../openApi/OpenApiLogAnalyBatch.groovy | 30 +- .../script/otherhouse/HouseExport.groovy | 54 +- .../com/fangjia/script/otherhouse/Util.groovy | 18 +- .../script/pageClick/PageClickBatch.groovy | 14 +- .../pageClick/PageClickCountBatch.groovy | 36 +- .../script/pds/AgencyCityLevelBatch.groovy | 16 +- .../script/pds/CPDBAvgGrowthRateBatch.groovy | 4 +- .../CopyOfPdsHouseScoreCityLevelBatch.groovy | 46 +- .../script/pds/HouseLoudongAnaBatch.groovy | 14 +- .../script/pds/HouseQuoteLevelBatch.groovy | 32 +- .../script/pds/PdsFoodAvgPriceBatch.groovy | 14 +- .../pds/PdsHouseScoreCityLevelBatch.groovy | 10 +- .../script/pds/PriceIncreaesLevelBatch.groovy | 20 +- .../script/pds/RiskControlBatch.groovy | 132 +- .../fangjia/script/pds/RiskControlData.groovy | 134 +- .../script/pds/RiskControlMapBatch.groovy | 118 +- .../script/pds/TrafficCityLevelBatch.groovy | 34 +- .../fangjia/script/pds/util/LoanUtil.groovy | 80 +- .../fangjia/script/pics/AddShopPics.groovy | 8 +- .../script/pics/BackupDistrictPics.groovy | 6 +- .../script/pics/DownloadDistrictPics.groovy | 6 +- .../script/pics/RemoveUselessPicsBatch.groovy | 42 +- .../script/pics/RestoreDistrictPics.groovy | 2 +- .../script/pics/SortDistrictPics.groovy | 42 +- .../fangjia/script/pics/UpdatePicsUrl.groovy | 2 +- .../script/ppc/PPCFetchDetailBatch.groovy | 4 +- .../script/predict/PricePredictBatch.groovy | 60 +- .../price/DistrictHouseWarmingBatch.groovy | 4 +- .../price/DistrictPriceCompareBatch.groovy | 8 +- .../AnjukeAgentMasterPublisher.groovy | 16 +- .../AnjukeOfficeRentPublisher.groovy | 14 +- .../AnjukeOfficeSellPublisher.groovy | 14 +- .../publisher/AnjukeRentPublisher.groovy | 34 +- .../publisher/AnjukeSellPublisher.groovy | 60 +- .../publisher/AnjukeShopRentPublisher.groovy | 6 +- .../publisher/AnjukeShopSellPublisher.groovy | 8 +- .../publisher/BaiduRentPublisher.groovy | 56 +- .../publisher/BaiduSellPublisher.groovy | 64 +- .../publisher/BaiduShopRentPublisher.groovy | 48 +- .../publisher/BaiduShopSellPublisher.groovy | 46 +- .../BaixingOfficeRentPublisher.groovy | 20 +- .../BaixingOfficeSellPublisher.groovy | 24 +- .../publisher/BaixingRentPublisher.groovy | 48 +- .../publisher/BaixingSellPublisher.groovy | 46 +- .../publisher/BaixingShopRentPublisher.groovy | 14 +- .../publisher/BaixingShopSellPublisher.groovy | 14 +- .../ChineseofficeOfficeRentPublisher.groovy | 16 +- .../ChineseofficeOfficeSellPublisher.groovy | 10 +- .../CityHouseOfficeRentPublisher.groovy | 4 +- .../CityHouseOfficeSellPublisher.groovy | 4 +- .../publisher/CityHouseRentPublisher.groovy | 24 +- .../CityHouseShopRentPublisher.groovy | 4 +- .../CityHouseShopSellPublisher.groovy | 4 +- .../publisher/CzfcwShopSellPublisher.groovy | 20 +- .../DaikanOfficeRentPublisher.groovy | 20 +- .../DaikanOfficeSellPublisher.groovy | 20 +- .../publisher/DaikanRentPublisher.groovy | 46 +- .../publisher/DaikanSellPublisher.groovy | 46 +- .../publisher/DatastorePublisher.groovy | 22 +- .../publisher/DatastorePublisher2.groovy | 20 +- .../publisher/DistrictWebpagePublisher.groovy | 2 +- .../FangziOfficeRentPublisher.groovy | 22 +- .../FangziOfficeSellPublisher.groovy | 16 +- .../publisher/Fcw515ShopSellPublisher.groovy | 18 +- .../publisher/FocusSellPublisher.groovy | 50 +- .../publisher/GanjiOfficeRentPublisher.groovy | 14 +- .../publisher/GanjiOfficeSellPublisher.groovy | 12 +- .../publisher/GanjiRentPublisher.groovy | 56 +- .../publisher/GanjiSellPublisher.groovy | 52 +- .../publisher/GanjiShopRentPublisher.groovy | 22 +- .../publisher/GanjiShopSellPublisher.groovy | 28 +- .../publisher/GoufangRentPublisher.groovy | 68 +- .../publisher/HaofangRentPublisher.groovy | 46 +- .../publisher/HaofangSellPublisher.groovy | 46 +- .../publisher/HaofangShopRentPublisher.groovy | 28 +- .../publisher/HaofangShopSellPublisher.groovy | 28 +- .../publisher/HaopooShopRentPublisher.groovy | 14 +- .../publisher/HaopooShopSellPublisher.groovy | 24 +- .../publisher/HomelinkSellPublisher.groovy | 78 +- .../House365OfficeSellPublisher.groovy | 6 +- .../publisher/JintiOfficeRentPublisher.groovy | 14 +- .../publisher/JintiOfficeSellPublisher.groovy | 12 +- .../publisher/JintiRentPublisher.groovy | 32 +- .../publisher/JintiShopSellPublisher.groovy | 10 +- .../script/publisher/JiwuSellPublisher.groovy | 20 +- .../publisher/KoofangSellPublisher.groovy | 48 +- .../publisher/LoupanRentPublisher.groovy | 50 +- .../publisher/LoupanSellPublisher.groovy | 64 +- .../publisher/Net58OfficeRentPublisher.groovy | 30 +- .../publisher/Net58OfficeSellPublisher.groovy | 12 +- .../publisher/Net58RentPublisher.groovy | 62 +- .../publisher/Net58SellPublisher.groovy | 42 +- .../publisher/Net58ShopRentPublisher.groovy | 28 +- .../publisher/Net58ShopSellPublisher.groovy | 14 +- .../publisher/NetBaixingRentPublisher.groovy | 8 +- .../OfficeseOfficeRentPublisher.groovy | 46 +- .../script/publisher/PublisherStarter.groovy | 130 +- .../publisher/Qd8OfficeRentPublisher.groovy | 30 +- .../publisher/Qd8OfficeSellPublisher.groovy | 12 +- .../publisher/RentDatastorePublisher.groovy | 26 +- .../publisher/RentPublisherStarter.groovy | 34 +- .../script/publisher/SellDataFilter.groovy | 4 +- .../publisher/SellDatastorePublisher.groovy | 24 +- .../publisher/SellPublisherStarter.groovy | 40 +- .../ShopAndOfficeDatastorePublisher.groovy | 26 +- .../ShopAndOfficePublisherStarter.groovy | 88 +- .../publisher/SinaOfficeRentPublisher.groovy | 22 +- .../publisher/SinaOfficeSellPublisher.groovy | 16 +- .../script/publisher/SinaSellPublisher.groovy | 84 +- .../publisher/SoufunDistrictPublisher.groovy | 4 +- .../SoufunOfSmallCitySellPublisher.groovy | 94 +- .../SoufunOfficeRentPublisher.groovy | 14 +- .../SoufunOfficeSellPublisher.groovy | 16 +- .../publisher/SoufunRentPublisher.groovy | 34 +- .../publisher/SoufunSellPublisher.groovy | 70 +- .../SoufunShopOfficePublisher.groovy | 36 +- .../publisher/SoufunShopRentPublisher.groovy | 28 +- .../publisher/SoufunShopSellPublisher.groovy | 32 +- .../publisher/TaofwRentPublisher.groovy | 28 +- .../publisher/TaofwSellPublisher.groovy | 58 +- .../publisher/WoaiwojiaRentPublisher.groovy | 38 +- .../publisher/WoaiwojiaSellPublisher.groovy | 38 +- .../WoyaozupuShopSellPublisher.groovy | 38 +- .../publisher/Yes515RentPublisher.groovy | 38 +- .../publisher/Yes515SellPublisher.groovy | 42 +- .../ZufangOfficeRentPublisher.groovy | 42 +- .../publisher/ZufangRentPublisher.groovy | 74 +- .../publisher/ZufangShopRentPublisher.groovy | 50 +- .../publisher/filter/SellDataFilter2.groovy | 2 +- .../script/rate/HouseAreaRateStat.groovy | 18 +- .../script/reda/AnalyticsUtmGifLog.groovy | 70 +- .../script/reda/ArchiveBrokerDisplay.groovy | 26 +- .../script/reda/ArchiveCompanyDisplay.groovy | 26 +- .../reda/ArchiveSearchResultOrder.groovy | 16 +- .../fangjia/script/reda/BatchHelper.groovy | 50 +- .../com/fangjia/script/reda/BrokerSms.groovy | 20 +- .../reda/BrokerWeekMonthAnalysis.groovy | 84 +- .../BrokerWeekMonthAnalysisProcesser.groovy | 20 +- .../script/reda/CleanRubbishData.groovy | 10 +- .../reda/CleanRubbishDataProcesser.groovy | 64 +- .../reda/CompanyBrokerHourAnalysis.groovy | 92 +- .../CompanyBrokerHourAnalysisProcesser.groovy | 238 +- .../script/reda/CompanyDayAnalysis.groovy | 48 +- .../reda/CompanyDayAnalysisProcesser.groovy | 44 +- .../script/reda/CompanyRangeAnalysis.groovy | 80 +- .../reda/CompanyRangeAnalysisProcesser.groovy | 30 +- .../CompanyWeekMonthPeriodAnalysis.groovy | 62 +- ...anyWeekMonthPeriodAnalysisProcesser.groovy | 82 +- .../script/reda/CreateTestDataBatch.groovy | 54 +- .../script/reda/DistrictDataStat.groovy | 18 +- .../script/reda/HomeBrokerDisplayBatch.groovy | 22 +- .../reda/OnLineDataImportOffLine.groovy | 4 +- .../groovy/com/fangjia/script/reda/Sms.groovy | 8 +- .../reda/TransactionDataAnalysis.groovy | 54 +- .../script/reda/TransactionDataImport.groovy | 118 +- .../moniter/PostMaintenanceMoniter.groovy | 36 +- .../reda/moniter/RedaBackupCleaner.groovy | 8 +- .../script/region/CityRelatedUpdate.groovy | 4 +- .../script/region/DistrictRegionUpdate.groovy | 14 +- .../script/region/RegionRelatedUpdate.groovy | 22 +- .../fangjia/script/region/RegionStrand.groovy | 20 +- .../fangjia/script/region/RegionUpdate.groovy | 6 +- .../com/fangjia/script/rent/Cluster.groovy | 14 +- .../rent/DistrictHouseTypeAnalyzeBatch.groovy | 24 +- .../script/rent/DistrictRentFPKBatch.groovy | 10 +- .../script/rent/DistrictRentStat.groovy | 20 +- .../script/rent/ExportDistrictRentData.groovy | 30 +- .../script/rent/ExportHouseType.groovy | 18 +- .../rent/HistroyRentEstateTypeBatch.groovy | 22 +- .../rent/NoHouseDistrictRentBatch.groovy | 16 +- .../fangjia/script/rent/RegionRentStat.groovy | 12 +- .../fangjia/script/rent/RentCoverage.groovy | 10 +- .../fangjia/script/rent/RentDataMove.groovy | 6 +- .../script/rent/RetryDistrictRentBatch.groovy | 22 +- .../script/rent/UpdateRentRegion.groovy | 2 +- .../fangjia/script/report/CityHotBatch.groovy | 20 +- .../script/report/DistrictAgentBatch.groovy | 30 +- .../report/DistrictAttentionRankBatch.groovy | 16 +- .../script/report/DistrictHotBatch.groovy | 22 +- .../com/fangjia/script/report/Yuce.groovy | 20 +- .../common/SampleSpiderUtility.groovy | 2 +- .../community/CommunitySpider_Anjuke.groovy | 6 +- .../community/CommunitySpider_FCCS.groovy | 16 +- .../community/CommunitySpider_LeJu.groovy | 20 +- .../script/school/SchoolHouseBatch.groovy | 10 +- .../searchanalysis/SearchWordsAnalysis.groovy | 2 +- .../script/seeds/AnjukeEsfGennerator.groovy | 2 +- .../seeds/AnjukeNewHouseGennerator.groovy | 4 +- .../script/seeds/AnjukeOfficeGenerator.groovy | 2 +- .../script/seeds/AnjukeShopGenerator.groovy | 2 +- ...tanetTransactionPriceSeedsGenerator.groovy | 2 +- .../FangDealPriceListSeedGenerator.groovy | 2 +- .../seeds/FangDealPriceSeedGenerator.groovy | 2 +- .../script/seeds/FangOfficeGenerator.groovy | 2 +- .../script/seeds/FangShopGenerator.groovy | 2 +- .../FangTransationPriceSeedsGenerator.groovy | 2 +- .../script/seeds/FangtooGenerator.groovy | 4 +- .../script/seeds/GanJiEsfGennerator.groovy | 2 +- ...elinkTransactionPriceSeedsGenerator.groovy | 2 +- .../script/seeds/JiajiashunGennerator.groovy | 4 +- .../LianjiaDealPriceListSeedGenerator.groovy | 4 +- .../MaiTianDealPriceSeedGenerator.groovy | 6 +- ...phomeTransactionPriceSeedsGenerator.groovy | 4 +- .../script/seeds/PinganfangGenerator.groovy | 4 +- .../fangjia/script/seeds/SeedGenerator.groovy | 14 +- .../seeds/SeedGeneratorBaseBatch.groovy | 12 +- .../script/seeds/SinaEsfGenerator.groovy | 2 +- .../script/seeds/SinaNewHouseGenerator.groovy | 2 +- .../SinaTransactionPriceSeedsGenerator.groovy | 2 +- .../script/seeds/SoufangEsfGenerator.groovy | 2 +- .../seeds/SoufangNewHouseGenerator.groovy | 2 +- .../WoAiWoJiaDealPriceSeedGenerator.groovy | 4 +- .../seeds/ZafDealPriceSeedGenerator.groovy | 4 +- .../ZafTransactionPriceSeedsGenerator.groovy | 2 +- .../SensitiveWordAnalyzer.groovy | 30 +- .../com/fangjia/script/shibb/Test.groovy | 4 +- .../script/shibb/api/ExportAPIUserData.groovy | 6 +- .../shibb/avgprice/ReadAvgPriceExcel.groovy | 6 +- .../script/shibb/baidu/BaiduApiDataGet.groovy | 8 +- .../script/shibb/baidu/BaiduUrlDataGet.groovy | 12 +- .../shibb/baidu/DealBaiduDataByPerson.groovy | 18 +- .../shibb/baidu/DealBaiduDistrictData.groovy | 76 +- .../shibb/baidu/DealBaiduOfficeData.groovy | 38 +- .../shibb/baidu/ExportCompareDataTag.groovy | 34 +- .../script/shibb/baidu/SaveBaiduData.groovy | 16 +- .../shibb/bkoff/DeleteSiteErrorData.groovy | 54 +- .../script/shibb/bkoff/ExportCityData.groovy | 64 +- .../script/shibb/bkoff/ExportCityInfo.groovy | 20 +- .../shibb/bkoff/ExportSeaweedData.groovy | 24 +- .../shibb/bkoff/ModifySeaweedData.groovy | 14 +- .../TestDistrictAttentionCaculate.groovy | 8 +- .../bkoff/TestDistrictAttentionLog.groovy | 2 +- .../shibb/bkoff/TestReadAnalyLog.groovy | 22 +- .../shibb/bkoff/TestReadArtemisLog.groovy | 8 +- .../shibb/bkoff/TestReadBackoffLog.groovy | 4 +- .../script/shibb/bus/BusDataGet.groovy | 34 +- .../script/shibb/bus/BusDataRead.groovy | 28 +- .../script/shibb/common/DataBaseUtil.groovy | 58 +- .../script/shibb/common/GetUrlUtil.groovy | 2 +- .../compare/RunBaiduAndSiteResult.groovy | 44 +- .../datadeal/CaculateSeawaterDate.groovy | 10 +- .../datadeal/ExportSeawaterDataCompare.groovy | 84 +- .../script/shop/BusinessAnalyzerBatch.groovy | 14 +- .../com/fangjia/script/sitemap/Group.groovy | 8 +- .../script/sitemap/GroupSpliter.groovy | 16 +- .../script/sitemap/KeyWordFilterRunner.groovy | 16 +- .../script/sitemap/KeywordFilter.groovy | 4 +- .../fangjia/script/solr/IndexNameEnum.groovy | 2 +- .../statistic/DatastoreStatBatch.groovy | 18 +- .../statistic/DatastoreWatchDogBatch.groovy | 2 +- ...DealPriceCoverageRateStatisticBatch.groovy | 34 +- .../GenerateRankStatisticBatch.groovy | 26 +- .../GenerateRankStatisticBatchGscore.groovy | 12 +- .../HouseCoverageRateStatisticBatch.groovy | 32 +- .../sync/AnalysisOpenUriLogSyncBatch.groovy | 8 +- .../script/sync/BulkSeawaterSyncBatch.groovy | 6 +- .../sync/CommunityHouseSampleBatch.groovy | 66 +- .../fangjia/script/sync/CopyOpenUriLog.groovy | 2 +- .../DistrictStatClickhouseSyncBatch.groovy | 2 +- .../script/sync/EvaluationSyncBatch.groovy | 4 +- .../script/sync/HouseLoudongSyncBatch.groovy | 6 +- .../sync/RentToSellRatioSyncBatch.groovy | 4 +- .../sync/Seawater2SeabirdSyncBatch.groovy | 2 +- .../script/sync/SeawaterShardSyncBatch.groovy | 2 +- .../script/sync/SeawaterSyncBatch.groovy | 10 +- .../script/sync/SeaweedSyncBatch.groovy | 10 +- .../script/sync/SeaweedToEsSyncBatch.groovy | 4 +- .../script/sync/WeBankCacheSyncBatch.groovy | 2 +- .../sync/YouDaDistrictStatSyncBatch.groovy | 4 +- .../com/fangjia/script/sync/youda.groovy | 8 +- .../groovy/com/fangjia/script/temp/RR.groovy | 2 +- .../com/fangjia/script/temp/Read.groovy | 2 +- .../com/fangjia/script/temp/Test.groovy | 6 +- .../com/fangjia/script/temp/Test1.groovy | 2 +- .../com/fangjia/script/temp/package-info.java | 4 +- .../shenjian/DealPriceDetailExport.groovy | 52 +- .../script/temp/shenjian/PPE15Export.groovy | 48 +- .../temp/shenjian/PPE15ExportTest.groovy | 42 +- .../script/temp/shenjian/RentExport.groovy | 26 +- .../temp/shenjian/SeawaterMonitor.groovy | 66 +- .../temp/shenjian/SnapshotMonitor.groovy | 12 +- .../fangjia/script/temp/shenjian/Temp.groovy | 2 +- .../temp/shenjian/TotalTestExport.groovy | 40 +- .../shenjian/ValueRateCityInfoExport.groovy | 42 +- .../address/ExportStandardResult.groovy | 10 +- .../shenjian/address/FillAgriculture.groovy | 30 +- .../address/FillNullTownshipAndComm.groovy | 8 +- .../FillTownshipAndCommunityFromExcel.groovy | 28 +- .../shenjian/address/GetAddressDetail.groovy | 8 +- .../temp/shenjian/address/StandardTest.groovy | 8 +- .../batch/RemoveOldIndexOfEs86Batch.groovy | 10 +- .../business/BusinessDianpingAddr.groovy | 6 +- .../business/BusinessDianpingExport.groovy | 28 +- .../business/BusinessDianpingModify.groovy | 26 +- .../temp/shenjian/company/AddCompany.groovy | 4 +- .../shenjian/company/DevelopCompany.groovy | 2 +- .../shenjian/company/PropertyCompany.groovy | 4 +- .../temp/shenjian/cqrcb/AllExport.groovy | 12 +- .../temp/shenjian/cqrcb/AroundExport.groovy | 24 +- .../cqrcb/AroundExportByNewWay.groovy | 34 +- .../shenjian/cqrcb/AroundFormatExport.groovy | 48 +- .../cqrcb/CheckLatLngByDistrict.groovy | 10 +- .../temp/shenjian/cqrcb/DealUnMatched.groovy | 26 +- .../temp/shenjian/cqrcb/ImportSchool.groovy | 8 +- .../shenjian/cqrcb/MarkUnNeedExport.groovy | 4 +- .../shenjian/cqrcb/MoveArroundTemp.groovy | 8 +- .../script/temp/shenjian/cqrcb/POIRule.groovy | 44 +- .../script/temp/shenjian/cqrcb/SavePoi.groovy | 6 +- .../temp/shenjian/cqrcb/SeaweedExport.groovy | 22 +- .../temp/shenjian/crawl/58/City58.groovy | 360 +- .../temp/shenjian/crawl/58/Comm58.groovy | 8 +- .../shenjian/crawl/58/Count58Seaweed.groovy | 6 +- .../crawl/58/District58DetailCrawl.groovy | 12 +- .../temp/shenjian/crawl/58/Seed58.groovy | 4 +- .../temp/shenjian/crawl/CommFang.groovy | 6 +- .../script/temp/shenjian/crawl/CommKe.groovy | 6 +- .../script/temp/shenjian/crawl/SeedBak.groovy | 4 +- .../anjuke/AnjukeDistrictDetailCrawl.groovy | 12 +- .../temp/shenjian/crawl/fang/CityFang.groovy | 10 +- .../temp/shenjian/crawl/ke/CityKe.groovy | 4 +- .../shenjian/crawl/ke/CountTradeKe.groovy | 14 +- .../shenjian/didata/MatchFromExcel.groovy | 4 +- .../shenjian/dingding/DingTalkUtils.groovy | 4 +- .../shenjian/dingding/ProjectExport.groovy | 22 +- .../temp/shenjian/dingding/ScoreExport.groovy | 30 +- .../temp/shenjian/dingding/TaskExport.groovy | 18 +- .../temp/shenjian/dto/SearchAddressDTO.groovy | 2 +- .../shenjian/es/CopyDataForAnnPricePre.groovy | 32 +- .../shenjian/es/SyncDistrictPriceStat.groovy | 14 +- .../shenjian/es/SyncDistrictPriceStat2.groovy | 22 +- .../fill/CalcCubageAndVirescence.groovy | 20 +- .../oracle/ExportExceptionPrice.groovy | 8 +- .../temp/shenjian/poi/BusinessLatLng.groovy | 10 +- .../temp/shenjian/poi/CommitteeGeoHash.groovy | 4 +- .../temp/shenjian/poi/CommitteeLatLng.groovy | 40 +- .../shenjian/poi/CounterCheckGaoDe.groovy | 4 +- .../temp/shenjian/poi/FillLngLat.groovy | 2 +- .../temp/shenjian/poi/GetCodeFromExcel.groovy | 8 +- .../shenjian/poi/GetCommitteeFromExcel.groovy | 6 +- .../shenjian/poi/GetLngLatFromExcel.groovy | 2 +- .../script/temp/shenjian/poi/GetPoi.groovy | 6 +- .../shenjian/poi/GetPoiFromCommunity.groovy | 6 +- .../temp/shenjian/poi/GetPoiFromExcel.groovy | 6 +- .../shenjian/poi/GetTownshipFromExcel.groovy | 12 +- .../shenjian/poi/ReGeoFromCommunity.groovy | 4 +- .../temp/shenjian/poi/SchoolLatLng.groovy | 12 +- .../poi/SeaweedAroundCommittee.groovy | 10 +- .../temp/shenjian/poi/SeaweedAroundPoi.groovy | 74 +- .../poi/SeaweedAroundPoiFromExcel.groovy | 34 +- .../poi/SeaweedAroundPoiSingal.groovy | 16 +- .../temp/shenjian/poi/SeaweedPoiDetail.groovy | 22 +- .../shenjian/poi/SeaweedSchoolLatLng.groovy | 60 +- .../temp/shenjian/poi/StatisticsPoi.groovy | 20 +- .../poi/YinlianLngLatAndAround.groovy | 16 +- .../temp/shenjian/poi/entity/MyId.groovy | 2 +- .../temp/shenjian/qianhai/QianhaiTest.groovy | 14 +- .../temp/shenjian/school/DistanceDeal.groovy | 22 +- .../shenjian/school/FillMidSchoolInfo.groovy | 34 +- .../FillMidSchoolWithPrimarySchool.groovy | 20 +- .../temp/shenjian/school/Standard.groovy | 14 +- .../shenjian/seaweed/BuildStructure.groovy | 62 +- .../temp/shenjian/seaweed/BuildType.groovy | 56 +- .../temp/shenjian/seaweed/BuildYear.groovy | 28 +- .../temp/shenjian/seaweed/CollectTest.groovy | 20 +- .../temp/shenjian/seaweed/Company.groovy | 56 +- .../temp/shenjian/seaweed/CountSeaweed.groovy | 20 +- .../script/temp/shenjian/seaweed/Fee.groovy | 46 +- .../temp/shenjian/seaweed/HousePurpose.groovy | 38 +- .../temp/shenjian/seaweed/HouseType.groovy | 38 +- .../temp/shenjian/seaweed/Position.groovy | 38 +- .../temp/shenjian/seaweed/Seaweed.groovy | 84 +- .../seaweed/SeaweedAliasExport.groovy | 20 +- .../seaweed/SeaweedGeoHashExport.groovy | 12 +- .../shenjian/seaweed/SeaweedSchool.groovy | 22 +- .../temp/shenjian/util/BaiDuUtils.groovy | 6 +- .../temp/shenjian/util/CommonDtoUtils.groovy | 2 +- .../temp/shenjian/util/DistrictUtils.groovy | 2 +- .../script/temp/shenjian/util/EsUtils.groovy | 30 +- .../temp/shenjian/util/ExcelUtils.groovy | 10 +- .../temp/shenjian/util/GaoDeUtils.groovy | 112 +- .../temp/shenjian/util/MessageUtils.groovy | 2 +- .../temp/shenjian/util/SeaweedUtils.groovy | 36 +- .../fangjia/script/test/CollectData.groovy | 8 +- .../script/test/RegionalismCodeStat.groovy | 12 +- .../script/test/SampleEvaluationTest.groovy | 174 +- .../SupplementaryStreetInformation.groovy | 2 +- .../script/testData/DistrictAliasTest.groovy | 86 +- .../script/testData/TestDataToEsri.groovy | 60 +- .../thirdPriceCrawl/AnalysisPageBatch.groovy | 422 +- .../script/thirdPriceCrawl/CharsUtils.groovy | 6 +- .../thirdPriceCrawl/CityHouseCrawl3.groovy | 24 +- .../thirdPriceCrawl/CityhouseCrawl.groovy | 34 +- .../thirdPriceCrawl/CrawalDBUtil.groovy | 4 +- .../script/thirdPriceCrawl/CrawalUtil.groovy | 22 +- .../thirdPriceCrawl/DataStandardBatch.groovy | 246 +- .../script/thirdPriceCrawl/DataStat.groovy | 30 +- .../thirdPriceCrawl/DeleteRepeatTest.groovy | 24 +- .../script/thirdPriceCrawl/Esf58Crawl.groovy | 326 +- .../thirdPriceCrawl/FangduoduoCrawl.groovy | 6 +- .../thirdPriceCrawl/FangtooCrawl.groovy | 26 +- .../thirdPriceCrawl/LianjiaCrawl.groovy | 20 +- .../thirdPriceCrawl/MaitianCrawl.groovy | 32 +- .../thirdPriceCrawl/MultiThreadRun.groovy | 28 +- .../NoPriceStandardBatch.groovy | 110 +- .../Qfang/AddMetadataBatchQfang.groovy | 68 +- .../Qfang/AddSeedBatchQfang.groovy | 52 +- .../Qfang/UpdateMetadataBatchQfang.groovy | 4 +- .../Qfang/UpdateMetadataBatchQfangXin.groovy | 4 +- .../script/thirdPriceCrawl/SofangCrawl.groovy | 36 +- .../thirdPriceCrawl/SofangNewCrawl.groovy | 80 +- .../thirdPriceCrawl/SynchDistrictPrice.groovy | 28 +- .../TestCrawlTotalCount.groovy | 2 +- .../thirdPriceCrawl/TestDistrict.groovy | 8 +- .../script/thirdPriceCrawl/Test_Weilei.groovy | 12 +- .../ThirdDataToGatherBatch.groovy | 32 +- .../ThirdPartPriceDataRepeatBatchUtils.groovy | 60 +- .../thirdPriceCrawl/ThirdPartyUtil.groovy | 2 +- .../UpdateMetadataBatch.groovy | 38 +- .../UpdateMetadataBatchUtil.groovy | 164 +- .../script/thirdPriceCrawl/Utils.groovy | 12 +- .../thirdPriceCrawl/WoAiWoJiaCrawl2.groovy | 8 +- .../thirdPriceCrawl/YungujiaCrawl.groovy | 36 +- .../thirdPriceCrawl/ZhugeFangCrawl2.groovy | 680 +- .../thirdPriceCrawl/ZhugefangCrawl.groovy | 672 +- .../thirdPriceCrawl/ZhugefangCrawl3.groovy | 22 +- .../thirdPriceCrawl/ZhugefangCrawl4.groovy | 22 +- .../ZhugefangTradeCrawl.groovy | 20 +- .../thirdPriceCrawl/anjuke/AnJuKeCrawl.groovy | 240 +- .../thirdPriceCrawl/beike/BeiKeCrawl.groovy | 270 +- .../thirdPriceCrawl/c21/C21Spider.groovy | 54 +- .../AddMetadataBatchFangduoduo.groovy | 76 +- .../fangduoduo/AddSeedBatchFangduoduo.groovy | 40 +- .../UpdateMetadataBatchFangduoduo.groovy | 4 +- .../fanggugu/FangGuGuCrawl.groovy | 1188 +- .../fanggugu/FangGuGuCrawl_.groovy | 638 +- .../fanggugu/FangGuGuDistrictCrawl.groovy | 18 +- .../fangtan/AddMetadataBatchFangtan.groovy | 68 +- .../fangtan/AddSeedBatchFangtan.groovy | 50 +- .../fangtan/UpdateMetadataBatchFangtan.groovy | 4 +- .../ganji/AddMetadataBatchGanji.groovy | 130 +- .../ganji/AddSeedBatchGanji.groovy | 44 +- .../ganji/UpdateMetadataBatchGanji.groovy | 4 +- .../image/SofangImageCrawl.groovy | 12 +- .../leyoujia/AddMetadataBatchLeyoujia.groovy | 70 +- .../leyoujia/AddSeedBatchLeyoujia.groovy | 66 +- .../UpdateMetadataBatchLeyoujia.groovy | 4 +- .../UpdateMetadataBatchLeyoujiaXin.groovy | 4 +- .../other/AddFangSchoolRegion.groovy | 8 +- .../other/GushuwangCrawl.groovy | 64 +- .../sofang/AddMetadataBatchSofang.groovy | 82 +- .../sofang/AddSeedBatchSofang.groovy | 58 +- .../sofang/UpdateMetadataBatchSofang.groovy | 4 +- .../trade/LianJiaTradeCrawl.groovy | 30 +- .../tuboshi/AddMetadataBatchTuboshi.groovy | 84 +- .../tuboshi/AddSeedBatchTuboshi.groovy | 124 +- .../tuboshi/TuboshiCrawl.groovy | 90 +- .../tuboshi/UpdateMetadataBatchTuboshi.groovy | 4 +- .../woaiwojia/WoAiWoJiaSpider.groovy | 44 +- .../AddMetadataBatchZhongyuan.groovy | 126 +- .../zhongyuan/AddSeedBatchZhongyuan.groovy | 142 +- .../zhongyuan/UpdateMetadataBatchZY.groovy | 4 +- .../zhongyuan/UpdateMetadataBatchZYNew.groovy | 4 +- .../zhongyuan/ZhongyuanCrawl.groovy | 4 +- .../com/fangjia/script/tmp/Issue651.groovy | 12 +- .../com/fangjia/script/tmp/Issue652.groovy | 44 +- .../com/fangjia/script/tmp/Issue811.groovy | 38 +- .../script/tool/GenerateToolClickData.groovy | 20 +- .../script/tool/ToolClickStatBatch.groovy | 16 +- .../fangjia/script/trade/AddressAlias.groovy | 12 +- .../script/trade/AddressAliasDistinct.groovy | 18 +- .../script/trade/AgencyDistrictRank.groovy | 26 +- .../fangjia/script/trade/AgencyRank.groovy | 40 +- .../script/trade/AgingCopyDistrict.groovy | 26 +- .../fangjia/script/trade/AgingDelete.groovy | 6 +- .../script/trade/AnshuoDistrictInfo.groovy | 42 +- .../script/trade/AnshuoDistrictInfoSql.groovy | 10 +- .../script/trade/AnshuoIndexStats.groovy | 2 +- .../fangjia/script/trade/AnshuoRelate.groovy | 10 +- .../script/trade/AnshuoRelateSql.groovy | 8 +- .../fangjia/script/trade/AutoDistrict.groovy | 22 +- .../script/trade/CatchFixedHouse.groovy | 90 +- .../script/trade/CatchLandPrice.groovy | 52 +- .../script/trade/CopyDistrictNearby.groovy | 8 +- .../fangjia/script/trade/DistinctAging.groovy | 10 +- .../trade/DistinctAgingCopyDistrict.groovy | 12 +- .../trade/DistrictFacilitiesUpdater.groovy | 46 +- .../script/trade/DistrictHouseUpdate.groovy | 14 +- .../trade/DistrictTradeCountRank.groovy | 22 +- .../trade/DrawDistrictEstateType.groovy | 22 +- .../fangjia/script/trade/ExportShop.groovy | 220 +- .../fangjia/script/trade/ExportShop1.groovy | 214 +- .../fangjia/script/trade/ExportShop2.groovy | 220 +- .../script/trade/ExportTradeData.groovy | 110 +- .../script/trade/GaoDistrictSpide.groovy | 8 +- .../script/trade/HouseSourceCountBatch.groovy | 40 +- .../script/trade/HouseSourceEmailBatch.groovy | 20 +- .../trade/HouseTradeHistoryBatch.groovy | 12 +- .../script/trade/HttpCatchBaidu.groovy | 80 +- .../fangjia/script/trade/HttpHouseDeal.groovy | 12 +- .../script/trade/HttpMetroUpdate.groovy | 10 +- .../script/trade/ImportAutoDistrict.groovy | 18 +- .../script/trade/ImportIndexStats.groovy | 76 +- .../script/trade/ImportShopIndexStats.groovy | 10 +- .../script/trade/MappingUrlAnaly.groovy | 24 +- .../script/trade/MappingUrlCatch.groovy | 40 +- .../OfficeAvgPriUrlMapAnalyzeBatch.groovy | 28 +- .../script/trade/OpenUriUserIdCount.groovy | 14 +- .../script/trade/OpenUriUserIdCountDay.groovy | 30 +- .../trade/RegionBlockHousePriceRank.groovy | 24 +- .../script/trade/RegionBlockTradePrice.groovy | 44 +- .../script/trade/RentMappingUrlCatch.groovy | 28 +- .../trade/RentOfficeMappingUrlCatch.groovy | 28 +- .../trade/RentOfficeMappingUrlCatch1.groovy | 30 +- .../script/trade/SeaweedbirdBatch.groovy | 14 +- .../trade/ShopAvgPriUrlMapAnalyzeBatch.groovy | 22 +- .../trade/SoufangAttentionAddSeeds.groovy | 6 +- .../trade/SoufangAttentionUrlCatch.groovy | 8 +- .../script/trade/TradeDealPriceStat.groovy | 8 +- .../trade/TradeDetailFloorBatchUpdate.groovy | 184 +- .../trade/TradeDistrictStatBatch.groovy | 74 +- .../script/trade/TradeFieldDetail.groovy | 90 +- .../trade/TradePricePkDistrictPrice.groovy | 28 +- .../script/trade/UpdateDataToDB63.groovy | 740 +- .../script/trade2/AgencyDistrictRank.groovy | 20 +- .../trade2/HouseTradeHistoryBatch.groovy | 14 +- .../trade2/HouseTradeHistoryBatch2.groovy | 16 +- .../script/trade2/Trade2ExportToMongo.groovy | 84 +- .../fangjia/script/trade3/AnjukeCatch.groovy | 26 +- .../fangjia/script/trade3/GanjiCatch.groovy | 10 +- .../fangjia/script/trade3/SinaCatch.groovy | 24 +- .../fangjia/script/trade3/SoufangCatch.groovy | 10 +- .../script/trade3/SoufangNewCatch.groovy | 24 +- .../script/usahouse/AddressMatch.groovy | 4 +- .../script/usahouse/EsSelectUtils.groovy | 2 +- .../fangjia/script/usahouse/HomesData.groovy | 100 +- .../script/usahouse/HougardenCrawl.groovy | 124 +- .../script/usahouse/ImportPriceData.groovy | 2 +- .../usahouse/NewZealandWaiJuCrawl.groovy | 222 +- .../script/usahouse/QvParserBatch.groovy | 96 +- .../fangjia/script/usahouse/TestParse.groovy | 194 +- .../com/fangjia/script/util/ABuYunUtil.groovy | 298 +- .../script/util/ArtemisAdminUtils.groovy | 2 +- .../fangjia/script/util/AsyncThread.groovy | 2 +- .../fangjia/script/util/BaiduMapUtils.groovy | 14 +- .../com/fangjia/script/util/CityData.groovy | 52 +- .../com/fangjia/script/util/CityMap.groovy | 32 +- .../fangjia/script/util/CityMapLoader.groovy | 12 +- .../script/util/ClickHouseJDBCUtil.groovy | 2 +- .../fangjia/script/util/CommonUtils.groovy | 82 +- .../script/util/ConvertAgentShortName.groovy | 150 +- .../script/util/CosineSimilarAlgorithm.groovy | 74 +- .../com/fangjia/script/util/CsvUtils.groovy | 6 +- .../com/fangjia/script/util/DBHelper.groovy | 6 +- .../com/fangjia/script/util/DESUtil.groovy | 26 +- .../com/fangjia/script/util/DataUtil.groovy | 134 +- .../com/fangjia/script/util/DateUtils.groovy | 150 +- .../com/fangjia/script/util/DbUtils.groovy | 46 +- .../fangjia/script/util/DistrictKey.groovy | 2 +- .../fangjia/script/util/ElasticUtils.groovy | 10 +- .../fangjia/script/util/ExcelParser.groovy | 6 +- .../com/fangjia/script/util/ExcelRow.groovy | 2 +- .../com/fangjia/script/util/ExcelUtils.groovy | 162 +- .../fangjia/script/util/FangjiaApiUtil.groovy | 18 +- .../com/fangjia/script/util/GZIPUtils.groovy | 20 +- .../com/fangjia/script/util/GeoHelper.groovy | 20 +- .../com/fangjia/script/util/GeoUtils.groovy | 2 +- .../com/fangjia/script/util/HouseUtils.groovy | 32 +- .../com/fangjia/script/util/HttpClient.groovy | 36 +- .../com/fangjia/script/util/HttpHelper.groovy | 42 +- .../com/fangjia/script/util/HttpUt.groovy | 32 +- .../script/util/JFreeChartUtils.groovy | 54 +- .../fangjia/script/util/JacksonUtil.groovy | 4 +- .../groovy/com/fangjia/script/util/Jms.groovy | 22 +- .../com/fangjia/script/util/LatLon.groovy | 16 +- .../util/LatitudeAndLongitudeUtil.groovy | 16 +- .../fangjia/script/util/MapToMongoDb.groovy | 2 +- .../com/fangjia/script/util/MapabcUtil.groovy | 12 +- .../fangjia/script/util/MongoPoolUtils.groovy | 30 +- .../com/fangjia/script/util/MongoUtils.groovy | 10 +- .../fangjia/script/util/OpenApiClient.groovy | 132 +- .../com/fangjia/script/util/ParamsUtil.groovy | 26 +- .../script/util/PhoneNormalizer.groovy | 18 +- .../fangjia/script/util/PinYinService.groovy | 6 +- .../script/util/PoiSearchResult.groovy | 14 +- .../com/fangjia/script/util/PoiUtils.groovy | 24 +- .../fangjia/script/util/ProvinceData.groovy | 154 +- .../fangjia/script/util/RefreshHouse.groovy | 8 +- .../fangjia/script/util/RequestUtil.groovy | 4 +- .../script/util/SSLURLConnection.groovy | 4 +- .../com/fangjia/script/util/Seaweed.groovy | 14 +- .../fangjia/script/util/SeaweedUtils.groovy | 56 +- .../fangjia/script/util/ServerAreaMap.groovy | 2 +- .../script/util/UrlSiteNameMapping.groovy | 2 +- .../script/util/ZjtAnalysisUtil.groovy | 164 +- .../script/vipsite/AvgPriceSync.groovy | 6 +- .../RemoveInvalidEsfHouseSample.groovy | 2 +- .../webCrawl/AllFieldDataInSeaweed.groovy | 66 +- .../script/webCrawl/AllfangWebpageData.groovy | 16 +- .../AnjukeEsfSeedGenerator.groovy | 2 +- .../AnjukeNewSeedGenerator.groovy | 2 +- .../AvgPriUrlMapAnalyze.groovy | 30 +- .../AvgPriUrlMapAnalyzeBatch.groovy | 68 +- .../AvgPriUrlMappingPercent.groovy | 18 +- .../GanjiEsfSeedGenerator.groovy | 2 +- .../OfficeAvgPriUrlMapAnalyzeBatch.groovy | 28 +- .../ShopAvgPriUrlMapAnalyzeBatch.groovy | 22 +- .../SinaEsfSeedGenerator.groovy | 2 +- .../SinaNewSeedGenerator.groovy | 412 +- .../SoufunEsfSeedGenerator.groovy | 8 +- .../SoufunNewSeedGenerator.groovy | 2 +- .../fangjia/script/webCrawl/AvgCounts.groovy | 2 +- .../script/webCrawl/BaixingCitysGrab.groovy | 2 +- .../fangjia/script/webCrawl/BffdcCrawl.groovy | 6 +- .../script/webCrawl/BjjsGovWebpageData.groovy | 6 +- .../webCrawl/ChineseOfficeWebpageData.groovy | 6 +- .../script/webCrawl/CnnbfdcWebpageData.groovy | 6 +- .../fangjia/script/webCrawl/CrawlHaofz.groovy | 6 +- .../script/webCrawl/DaikanWebpageData.groovy | 12 +- .../script/webCrawl/ExportDataToExcels.groovy | 4 +- .../script/webCrawl/ExportDataToHtml.groovy | 2 +- .../script/webCrawl/ExportDataToPdf.groovy | 16 +- .../script/webCrawl/ExportDataToTxt.groovy | 4 +- .../webCrawl/ExportHouseFieldToExcels.groovy | 2 +- .../script/webCrawl/FcjgovCrawl.groovy | 10 +- .../FileDataTimeOutDeleteBatch.groovy | 2 +- .../script/webCrawl/FzhouseCrawl.groovy | 8 +- .../fangjia/script/webCrawl/H0591Crawl.groovy | 6 +- .../script/webCrawl/HiaoWebpageData.groovy | 6 +- .../script/webCrawl/Home77Crawl.groovy | 6 +- .../webCrawl/InvalidDataInSeaweed.groovy | 78 +- .../fangjia/script/webCrawl/JifcwCrawl.groovy | 6 +- .../script/webCrawl/JiwuCitysGrab.groovy | 2 +- .../script/webCrawl/JxdcwWebpageData.groovy | 6 +- .../fangjia/script/webCrawl/JyfgCrawl.groovy | 2 +- .../script/webCrawl/LahoGovWebpageData.groovy | 6 +- .../script/webCrawl/LonghooWebpageData.groovy | 6 +- .../fangjia/script/webCrawl/LzfcCrawl.groovy | 6 +- .../script/webCrawl/MaomingFangguanju.groovy | 6 +- .../webCrawl/NoRuleDataInSeaweed.groovy | 78 +- .../fangjia/script/webCrawl/PostData.groovy | 6 +- .../fangjia/script/webCrawl/PostData1.groovy | 16 +- .../fangjia/script/webCrawl/PostData2.groovy | 6 +- .../script/webCrawl/PriceOfLandGrab.groovy | 2 +- .../webCrawl/QQOfficeWebpageData.groovy | 60 +- .../script/webCrawl/QQShopWebpageData.groovy | 60 +- .../script/webCrawl/QQWebpageData.groovy | 42 +- .../script/webCrawl/QQWebpageDataSell.groovy | 26 +- .../fangjia/script/webCrawl/QfcjCrawl.groovy | 12 +- .../webCrawl/QingdaonewsWebpageData.groovy | 6 +- .../script/webCrawl/RemovalDuplicate.groovy | 66 +- .../webCrawl/ShopOfficeFangCitysGrab.groovy | 762 +- .../webCrawl/ShxhouseWebpageData.groovy | 6 +- .../script/webCrawl/SoufangCityIsExist.groovy | 1290 +- .../webCrawl/SoufunEsfSeedGenerator.groovy | 4 +- .../script/webCrawl/SxolWebpageData.groovy | 6 +- .../webCrawl/SzhomeErshouWebpageData.groovy | 6 +- .../script/webCrawl/SzhomeWebpageData.groovy | 6 +- .../fangjia/script/webCrawl/SzplCrawl.groovy | 6 +- .../fangjia/script/webCrawl/TaofwCrawl.groovy | 8 +- .../com/fangjia/script/webCrawl/Test.groovy | 18 +- .../fangjia/script/webCrawl/TjfdcCrawl.groovy | 6 +- .../script/webCrawl/TjfdcWebpageData.groovy | 2 +- .../script/webCrawl/TsfcxxWebpageData.groovy | 2 +- .../script/webCrawl/UpdataToDB56.groovy | 18 +- .../webCrawl/Update170DataToSeawater.groovy | 2 +- .../webCrawl/Update170DataToSeawater2.groovy | 2 +- .../webCrawl/Update170DataToSeawater3.groovy | 2 +- .../webCrawl/Update170DataToSeawater4.groovy | 2 +- .../fangjia/script/webCrawl/UpdateData.groovy | 72 +- .../script/webCrawl/UpdateDataToDB170.groovy | 2 +- .../script/webCrawl/UpdateDataToDB37.groovy | 8 +- .../script/webCrawl/UpdateDataToDB38.groovy | 78 +- .../webCrawl/UpdateDataToDB38Seabird.groovy | 2 +- .../script/webCrawl/UpdateDataToDB43.groovy | 2 +- .../script/webCrawl/UpdateDataToDB51.groovy | 198 +- .../script/webCrawl/UpdateDataToDB60.groovy | 10 +- .../webCrawl/UpdateDataToDB61Seabird.groovy | 2 +- .../script/webCrawl/UpdateDataToDB63.groovy | 740 +- ...ataToDB63_anjuke_haofang_haopu_yipu.groovy | 1346 +- ...eDataToDB63_net58_hamji_jiwu_loupan.groovy | 6094 +++---- ...taToDB63_taofw_yes515_baixing_jinti.groovy | 2594 +-- .../script/webCrawl/UpdateDataToDB65.groovy | 474 +- .../script/webCrawl/UpdatePicsToDB51.groovy | 76 +- .../webCrawl/WhfcjGovWebpageData.groovy | 8 +- .../script/webCrawl/WzfgGrabWebRoot.groovy | 8 +- .../webCrawl/WzhhouseWebpageData.groovy | 8 +- .../script/webCrawl/XjfangwuCrawl.groovy | 6 +- .../webCrawl/YanchengGovWebpageData.groovy | 8 +- .../fangjia/script/webCrawl/Yc38Crawl.groovy | 6 +- .../script/webCrawl/YyfdcwCrawl.groovy | 6 +- .../script/webCrawl/YzfdcNewHouse.groovy | 6 +- .../webCrawl/YzfdcSellWebpageData.groovy | 6 +- .../weilei/CommunityAnjukeSpider.groovy | 4 +- .../script/weilei/CommunityBaseSpider.groovy | 20 +- .../weilei/CommunityCityhouseSpider.groovy | 8 +- .../script/weilei/Daily/20181123.groovy | 8 +- .../script/weilei/Daily/20190111.groovy | 8 +- .../script/weilei/Daily/20190115.groovy | 10 +- .../script/weilei/Daily/20190121.groovy | 8 +- .../script/weilei/Daily/20190213.groovy | 12 +- .../script/weilei/Daily/20190215.groovy | 2 +- .../script/weilei/Daily/20190318.groovy | 2 +- .../script/weilei/Daily/20190514.groovy | 4 +- .../fangjia/script/weilei/Day20190103.groovy | 2 +- .../com/fangjia/script/weilei/P000103.groovy | 10 +- .../com/fangjia/script/weilei/Test.groovy | 8 +- .../script/weilei/artemis/metadata.groovy | 2 +- .../script/weilei/spider/Abuyun.groovy | 12 +- .../script/weilei/spider/SpiderTest.groovy | 14 +- .../zheshang/AddressGaodeMapHelper.groovy | 2 +- .../SeeweedNameStandardization.groovy | 44 +- .../weilei/zheshang/TestGaodeHelper.groovy | 2 +- .../script/weilei/zheshang/Test_weilei.groovy | 38 +- .../zheshang/Test_weilei_20181010.groovy | 6 +- .../weilei/zheshang/ZSBankAddressClean.groovy | 44 +- .../wenyan/AddressAvailabilityJudge.groovy | 26 +- .../script/wenyan/AddressMatchAnaly.groovy | 6 +- .../script/wenyan/AnshuoIndexStats.groovy | 8 +- .../script/wenyan/ApiSearchAnalysis.groovy | 10 +- .../wenyan/AveragePriceStatistics.groovy | 150 +- .../script/wenyan/AvgPriceAnalyze.groovy | 10 +- .../fangjia/script/wenyan/BaseBatch.groovy | 34 +- .../script/wenyan/CityAvgPriceExport.groovy | 4 +- .../script/wenyan/CleanDBCPDuplication.groovy | 8 +- .../wenyan/CleanDbcpAliasDuplication.groovy | 4 +- .../script/wenyan/CompareDataDoor.groovy | 2 +- .../wenyan/CompareDataProcessBatch.groovy | 32 +- .../wenyan/ComparisonDataStatistics.groovy | 42 +- .../script/wenyan/DealDataGradeBatch.groovy | 20 +- .../script/wenyan/DealPriceExport.groovy | 18 +- .../script/wenyan/DistrictFindBatch.groovy | 34 +- .../script/wenyan/DistrictHouseExport.groovy | 12 +- .../script/wenyan/DistrictMonthlyCalc.groovy | 2 +- .../wenyan/DistrictRegionTransfer.groovy | 8 +- .../wenyan/EvaluationSourceAnalyze.groovy | 4 +- .../wenyan/ExcelFileDataStatistics.groovy | 8 +- .../script/wenyan/ExcelRegionTransfer.groovy | 4 +- .../ExperianAddressStandardization.groovy | 108 +- .../wenyan/ExperianEvaluationTest.groovy | 24 +- .../FindInCpdbNotInAddrepoDistrict.groovy | 4 +- .../FindMainDistrictForCompareData.groovy | 18 +- .../wenyan/FindSimilarityDistrict.groovy | 8 +- .../script/wenyan/FindStageDistrict.groovy | 10 +- .../fangjia/script/wenyan/GeoFinder.groovy | 6 +- .../script/wenyan/HouseBlankStatistics.groovy | 2 +- .../fangjia/script/wenyan/HouseExport.groovy | 18 +- .../script/wenyan/HouseExtractDistrict.groovy | 12 +- .../script/wenyan/InvalidReFind.groovy | 22 +- .../wenyan/JianHangEvaluationTest.groovy | 20 +- .../com/fangjia/script/wenyan/JuWeiHui.groovy | 2 +- .../script/wenyan/NanJingEvaluate.groovy | 26 +- .../fangjia/script/wenyan/NanJingMerge.groovy | 12 +- .../script/wenyan/NingBoBankGujia.groovy | 44 +- .../com/fangjia/script/wenyan/OpenLog.groovy | 12 +- .../script/wenyan/PostCodeParse.groovy | 26 +- .../wenyan/PreprocessAliasRelation.groovy | 20 +- .../script/wenyan/PufaLingshouGujia.groovy | 36 +- .../script/wenyan/RegionTransfer.groovy | 8 +- .../wenyan/SameAddressDistrictFinder.groovy | 8 +- .../wenyan/SaveAddrepoAliasToCPDB.groovy | 20 +- .../script/wenyan/SchoolProcess.groovy | 418 +- .../fangjia/script/wenyan/ScriptFour.groovy | 6 +- .../fangjia/script/wenyan/ScriptOne.groovy | 2 +- .../fangjia/script/wenyan/ScriptThree.groovy | 118 +- .../fangjia/script/wenyan/ScriptTwo.groovy | 84 +- .../script/wenyan/SeawaterHouseInfoAdd.groovy | 6 +- .../script/wenyan/ShenWanAddress.groovy | 26 +- .../script/wenyan/ShenWanAddress2.groovy | 24 +- .../fangjia/script/wenyan/ShopsExtract.groovy | 8 +- .../fangjia/script/wenyan/SoufangSeed.groovy | 8 +- .../fangjia/script/wenyan/SpiderTest.groovy | 4 +- .../script/wenyan/StageHouseFounder.groovy | 18 +- .../com/fangjia/script/wenyan/Test2.groovy | 32 +- .../com/fangjia/script/wenyan/Test3.groovy | 2 +- .../com/fangjia/script/wenyan/Test4.groovy | 2 +- .../com/fangjia/script/wenyan/Test6.groovy | 10 +- .../fangjia/script/wenyan/TongCheng.groovy | 26 +- .../com/fangjia/script/wenyan/Watcher.groovy | 2 +- .../com/fangjia/script/wenyan/WeiXin.groovy | 2 +- .../address/AddressMatchLogBatch.groovy | 34 +- .../script/wenyan/address/BaiDuAddress.groovy | 22 +- .../address/BaiduSourceToAddrepo.groovy | 54 +- .../wenyan/address/CalcStreetNumber.groovy | 22 +- .../wenyan/address/CzBankFormat01.groovy | 26 +- .../wenyan/address/CzBankFormat02.groovy | 32 +- .../wenyan/address/GaoDePoiCrawlBatch.groovy | 6 +- .../script/wenyan/address/GetTownByAPI.groovy | 8 +- .../script/wenyan/address/PdsHelper.groovy | 20 +- .../fangjia/script/wenyan/address/Psd.groovy | 6 +- .../address/SeaweedAddressFormatBatch.groovy | 52 +- .../fangjia/script/wenyan/address/Test.groovy | 2 +- .../script/wenyan/address/Test1.groovy | 8 +- .../UpdateDistrictCoordUseBaiDuApi.groovy | 28 +- .../UpdateDistrictCoordUseGaodeApi.groovy | 28 +- .../address/UpdateMapDataToAddrepo.groovy | 4 +- .../wenyan/address/璐甸槼閾惰鎴夸骇鏁版嵁.groovy | 26 +- .../auto/AddrepoDistrictImportToCPDB.groovy | 12 +- .../auto/AddrepoDistrictProcessor.groovy | 122 +- .../wenyan/auto/AnalysisExcelOffice.groovy | 16 +- .../script/wenyan/auto/AutoUnitedBatch.groovy | 38 +- .../wenyan/auto/CompareDataAnalyzer.groovy | 18 +- .../auto/DeletedDistrictRecoverBatch.groovy | 6 +- .../wenyan/auto/DistrictAutoProcessor.groovy | 134 +- .../wenyan/auto/DistrictEstateAnalyzer.groovy | 10 +- .../wenyan/auto/DistrictFieldCoverage.groovy | 54 +- .../wenyan/auto/DistrictInfoAutoFill.groovy | 92 +- .../auto/ErrorRegionDistrictProcessor.groovy | 36 +- .../auto/FangHaoDistirctProcessor.groovy | 34 +- .../wenyan/auto/FetchRealAliasBatch.groovy | 2 +- .../auto/FillHouseholdCountWithLianJia.groovy | 10 +- .../wenyan/auto/FillWithFinishDate.groovy | 8 +- .../script/wenyan/auto/FillWithStage.groovy | 22 +- .../script/wenyan/auto/FillWithStage01.groovy | 12 +- .../wenyan/auto/FindNoMasterDistrict.groovy | 18 +- .../auto/GaoDeAddrepoDistrictProcessor.groovy | 104 +- .../auto/GarbageDistrictDetectBatch.groovy | 84 +- .../wenyan/auto/HousePropertyAutoFill.groovy | 2 +- .../wenyan/auto/KeywordSearchUtils.groovy | 168 +- .../LianjiaCheckingRecordParseBatch.groovy | 14 +- .../MultiThreadDistrictAutoProcessor.groovy | 292 +- ...readDistrictAutoProcessorWithoutMap.groovy | 210 +- .../script/wenyan/auto/ReCalcAvgPrice.groovy | 4 +- .../wenyan/auto/SaveMapPoiToSeaweed.groovy | 26 +- .../wenyan/auto/StandardSeaweedField.groovy | 2 +- .../fangjia/script/wenyan/auto/Temp.groovy | 2 +- .../fangjia/script/wenyan/auto/Test.groovy | 8 +- .../fangjia/script/wenyan/auto/Test3.groovy | 4 +- .../fangjia/script/wenyan/auto/Test4.groovy | 10 +- .../wenyan/auto/WasteSeaweedBatch.groovy | 96 +- .../wenyan/avgPrice/RegionStatRemover.groovy | 6 +- .../avgPrice/SendAvgPriceReFitCommand.groovy | 12 +- .../avgPrice/SendAvgPriceRecalcCommand.groovy | 14 +- .../script/wenyan/avgPrice/Test.groovy | 12 +- .../script/wenyan/avgPrice/Test4.groovy | 10 +- .../fangjia/script/wenyan/czbank/Tes.groovy | 2 +- .../fangjia/script/wenyan/czbank/Test.groovy | 20 +- .../wenyan/czbank/鍚堝悓绫讳汉宸ュ鐞�.groovy | 24 +- .../wenyan/czbank/鍚堝悓绫荤爜鍊煎~鍏�.groovy | 10 +- .../script/wenyan/czbank/鍚堝悓绫昏В鏋�.groovy | 28 +- .../script/wenyan/czbank/鍦板潃浼颁环.groovy | 6 +- .../script/wenyan/czbank/鎶煎搧绫�.groovy | 38 +- .../wenyan/czbank/鎶煎搧绫讳环鏍奸噸璺�.groovy | 14 +- .../wenyan/czbank/鎶煎搧绫诲湴鍧�閲嶈窇.groovy | 8 +- .../wenyan/czbank/鎶煎搧绫绘妧鏈噸璺�.groovy | 18 +- .../wenyan/czbank/鎶煎搧绫荤爜鍊煎~鍏�.groovy | 40 +- .../dealPrice/specific/HuHeHaoTe.groovy | 6 +- .../SxhouseDealPriceCrawlBatch.groovy | 6 +- .../WoAiWoJiaDealPriceCrawlBatch.groovy | 8 +- .../wenyan/evaluate/BingJianKeJi.groovy | 16 +- .../wenyan/evaluate/BingJianKeJi2017.groovy | 18 +- .../evaluate/ExperianAddress0321.groovy | 34 +- .../ExperianAddressStandardization.groovy | 106 +- ...erianAddressStandardization20170209.groovy | 54 +- ...erianAddressStandardization20170727.groovy | 62 +- .../wenyan/evaluate/FormatLoudong.groovy | 2 +- .../wenyan/evaluate/PuFaEvaluate.groovy | 8 +- .../script/wenyan/evaluate/TaiZhouBank.groovy | 10 +- .../script/wenyan/evaluate/Test.groovy | 16 +- .../script/wenyan/evaluate/Test2.groovy | 6 +- .../script/wenyan/evaluate/Test3.groovy | 12 +- .../script/wenyan/evaluate/Test4.groovy | 26 +- .../script/wenyan/evaluate/XiTai.groovy | 6 +- .../script/wenyan/evaluate/XiaoPingGuo.groovy | 4 +- .../script/wenyan/evaluate/YuXin.groovy | 18 +- .../xingye/AnalyzeBuildingNumber.groovy | 4 +- .../evaluate/xingye/EvaluateDistrict.groovy | 4 +- .../evaluate/xingye/EvaluateShop.groovy | 16 +- .../wenyan/evaluate/xingye/FillCity.groovy | 40 +- .../evaluate/xingye/FillMaxFloor.groovy | 10 +- .../evaluate/xingye/MatchDistrict.groovy | 2 +- .../wenyan/evaluate/xingye/MatchShop.groovy | 4 +- .../wenyan/evaluate/xingye/RoomNumber.groovy | 14 +- .../evaluate/xingye/SaveDistrictToDb.groovy | 6 +- .../script/wenyan/evaluate/涓及鑱旀暟鎹�.groovy | 12 +- .../wenyan/evaluate/浜笢娴嬭瘯鏁版嵁01.groovy | 28 +- .../wenyan/evaluate/浜笢娴嬭瘯鏁版嵁02.groovy | 24 +- .../script/wenyan/evaluate/鍓嶆捣寰佷俊.groovy | 4 +- .../wenyan/evaluate/鍓嶆捣寰佷俊娴嬭瘯鏁版嵁.groovy | 2 +- .../wenyan/evaluate/鍗椾含閾惰鎴夸骇娴嬭瘯.groovy | 16 +- .../wenyan/evaluate/瀹濆北寰呰瘎浼版娂鍝佸鍑�.groovy | 6 +- .../script/wenyan/evaluate/鎴锋暟澶勭悊.groovy | 4 +- .../wenyan/evaluate/鎶垫娂鐗╄瘎浼癬1027.groovy | 8 +- .../wenyan/evaluate/鑴夌瓥绉戞妧鏁版嵁娴嬭瘯.groovy | 22 +- .../script/wenyan/evaluate/楣忓厓寰佷俊.groovy | 54 +- .../com/fangjia/script/wenyan/guojun.groovy | 2 +- .../LianJiaHouseClosingTimeMonitor.groovy | 4 +- .../script/wenyan/pois/GaodePoiCleaner.groovy | 2 +- .../script/wenyan/rent/RentStat.groovy | 8 +- .../seawater/FormatSeawaterDirection.groovy | 2 +- .../seawater/FormatSeawaterFitment.groovy | 2 +- .../seawater/StatsSeawaterDirection.groovy | 4 +- .../seawater/StatsSeawaterFitment.groovy | 4 +- .../wenyan/seawater/UpdateSeawater.groovy | 6 +- .../seawater/UpdateSeawaterDirection.groovy | 8 +- .../seawater/UpdateSeawaterFitment.groovy | 8 +- .../wenyan/taobao/BidRecordsParseBatch.groovy | 48 +- .../fangjia/script/wenyan/taobao/Seeds.groovy | 648 +- .../TaoBaoRecordsLookerUpdateBatch.groovy | 14 +- .../com/fangjia/script/wenyan/temp/Abc.groovy | 6 +- .../com/fangjia/script/wenyan/temp/Api.groovy | 58 +- .../script/wenyan/temp/AvgCommand.groovy | 12 +- .../fangjia/script/wenyan/temp/Bcc0622.groovy | 18 +- .../script/wenyan/temp/CalcTravelTime.groovy | 2 +- .../fangjia/script/wenyan/temp/CcbBank.groovy | 50 +- .../script/wenyan/temp/CcbBank2.groovy | 4 +- .../script/wenyan/temp/ChangZhouBank.groovy | 2 +- .../script/wenyan/temp/ChangZou.groovy | 6 +- .../script/wenyan/temp/CityFinder.groovy | 12 +- .../script/wenyan/temp/CityHousePrice.groovy | 4 +- .../script/wenyan/temp/ClickHouseDemo.groovy | 2 +- .../fangjia/script/wenyan/temp/CzBank.groovy | 10 +- .../wenyan/temp/CzBankAddressAnaly.groovy | 4 +- .../wenyan/temp/CzBankAddressFormat.groovy | 2 +- .../wenyan/temp/CzBankAddressPriceRate.groovy | 2 +- .../script/wenyan/temp/DealPrice.groovy | 16 +- .../wenyan/temp/DistrictCodeProcess.groovy | 4 +- .../script/wenyan/temp/DistrictFinder.groovy | 30 +- .../wenyan/temp/DistrictStatCleaner.groovy | 12 +- .../temp/DistrictStatRepeatRemover.groovy | 10 +- .../script/wenyan/temp/DongGuanBank.groovy | 8 +- .../script/wenyan/temp/EsTester.groovy | 20 +- .../script/wenyan/temp/FangHaoUpdater.groovy | 2 +- .../script/wenyan/temp/FangShengHuo.groovy | 2 +- .../fangjia/script/wenyan/temp/GuiHua.groovy | 4 +- .../script/wenyan/temp/HuaLunWangLuo.groovy | 4 +- .../script/wenyan/temp/Issues2765.groovy | 8 +- .../script/wenyan/temp/Issues2772.groovy | 8 +- .../fangjia/script/wenyan/temp/Kunshan.groovy | 16 +- .../fangjia/script/wenyan/temp/LouDong.groovy | 8 +- .../script/wenyan/temp/LouPanPingJi.groovy | 18 +- .../script/wenyan/temp/NanJingBank.groovy | 4 +- .../fangjia/script/wenyan/temp/PingAn.groovy | 16 +- .../fangjia/script/wenyan/temp/Price.groovy | 12 +- .../fangjia/script/wenyan/temp/QinLin.groovy | 10 +- .../fangjia/script/wenyan/temp/SanSha.groovy | 6 +- .../fangjia/script/wenyan/temp/Seaweed.groovy | 66 +- .../wenyan/temp/ShenZhenDealPrice.groovy | 14 +- .../wenyan/temp/SiChuanJingCheng.groovy | 10 +- .../fangjia/script/wenyan/temp/Sinosig.groovy | 36 +- .../fangjia/script/wenyan/temp/Test.groovy | 66 +- .../fangjia/script/wenyan/temp/Test1.groovy | 52 +- .../fangjia/script/wenyan/temp/Test10.groovy | 32 +- .../fangjia/script/wenyan/temp/Test11.groovy | 76 +- .../script/wenyan/temp/Test1121.groovy | 64 +- .../script/wenyan/temp/Test1122.groovy | 94 +- .../fangjia/script/wenyan/temp/Test14.groovy | 10 +- .../fangjia/script/wenyan/temp/Test15.groovy | 174 +- .../fangjia/script/wenyan/temp/Test16.groovy | 14 +- .../fangjia/script/wenyan/temp/Test2.groovy | 34 +- .../fangjia/script/wenyan/temp/Test20.groovy | 12 +- .../fangjia/script/wenyan/temp/Test22.groovy | 34 +- .../fangjia/script/wenyan/temp/Test23.groovy | 12 +- .../fangjia/script/wenyan/temp/Test24.groovy | 50 +- .../fangjia/script/wenyan/temp/Test3.groovy | 6 +- .../fangjia/script/wenyan/temp/Test5.groovy | 42 +- .../fangjia/script/wenyan/temp/Test6.groovy | 6 +- .../fangjia/script/wenyan/temp/Test7.groovy | 64 +- .../fangjia/script/wenyan/temp/Test8.groovy | 8 +- .../fangjia/script/wenyan/temp/Test9.groovy | 16 +- .../script/wenyan/temp/TestBatch.groovy | 6 +- .../fangjia/script/wenyan/temp/Trend.groovy | 6 +- .../script/wenyan/temp/UnionPayTest.groovy | 4 +- .../script/wenyan/temp/WordRegion.groovy | 6 +- .../script/wenyan/temp/XinChaos.groovy | 10 +- .../script/wenyan/temp/XinChaos1.groovy | 12 +- .../fangjia/script/wenyan/temp/XingYe.groovy | 10 +- .../fangjia/script/wenyan/temp/XingYe2.groovy | 16 +- .../fangjia/script/wenyan/temp/ZhuoXin.groovy | 8 +- .../fangjia/script/wenyan/temp/esri.groovy | 6 +- .../script/wenyan/temp/hospital.groovy | 8 +- .../script/wenyan/temp/hospital2.groovy | 10 +- .../fangjia/script/wenyan/temp/meituan.groovy | 10 +- .../script/wenyan/temp/shunfeng.groovy | 12 +- .../fangjia/script/wenyan/temp/shunhe.groovy | 22 +- .../script/wenyan/temp/xiaoqugeo.groovy | 4 +- .../script/wenyan/temp/yinlianxinxi.groovy | 16 +- .../fangjia/script/wenyan/temp/yongjia.groovy | 2 +- .../script/wenyan/temp/yongjia1.groovy | 2 +- .../script/wenyan/temp/yongjia2.groovy | 8 +- .../script/wenyan/temp/yongjia3.groovy | 8 +- .../fangjia/script/wenyan/test/Test1.groovy | 4 +- .../script/wenyan/xiamen/BankBounds.groovy | 2 +- .../com/fangjia/script/xh/CuoWuXiaoQu.groovy | 18 +- .../script/xh/DeleteInvalidEstate.groovy | 26 +- .../xh/DeleteInvalidPropertyLife.groovy | 16 +- .../script/xh/ExportHouseOffice.groovy | 30 +- .../script/xh/ExportHouseOffice2.groovy | 36 +- .../script/xh/ExportHouseOffice3.groovy | 28 +- .../script/xh/ExportHouseOffice4.groovy | 24 +- .../script/xh/ExportHouseOffice5.groovy | 26 +- .../script/xh/ExportInvalidEstate.groovy | 18 +- .../fangjia/script/xh/InsertSeaweed.groovy | 48 +- .../fangjia/script/xh/InsidePolygon.groovy | 10 +- .../fangjia/script/xh/LoudongEqualsOne.groovy | 6 +- .../fangjia/script/xh/MatchDistrictNo.groovy | 2 +- .../fangjia/script/xh/MonitorAvgPrice.groovy | 6 +- .../groovy/com/fangjia/script/xh/Test2.groovy | 18 +- .../com/fangjia/script/xh/TestEstate.groovy | 62 +- .../com/fangjia/script/xh/Test_1.groovy | 2 +- .../com/fangjia/script/xh/Test_2.groovy | 56 +- .../com/fangjia/script/xh/Test_3.groovy | 12 +- .../com/fangjia/script/xh/Test_4.groovy | 4 +- .../com/fangjia/script/xh/Test_5.groovy | 2 +- .../com/fangjia/script/xh/Test_6.groovy | 2 +- .../com/fangjia/script/xh/Test_7.groovy | 56 +- .../script/xh/analy_road/Delete65Data.groovy | 6 +- .../xh/analy_road/Delete65Estate.groovy | 6 +- .../xh/analy_road/ExportAnalyRoad.groovy | 12 +- .../xh/analy_road/ExportAnalyRoad2.groovy | 12 +- .../script/xh/analy_road/Insert154Data.groovy | 20 +- .../script/xh/analy_road/Update154Data.groovy | 10 +- .../script/xh/district/formatSeaweed.groovy | 30 +- .../xh/district/insertCityPriceLevel.groovy | 4 +- .../script/xh/district/yungujiaSeaweed.groovy | 22 +- .../xh/district_analy_data/avgPrice.groovy | 10 +- .../script/xh/fangjiatong/Test_2.groovy | 2 +- .../xh/fangjiatong/updateDownload.groovy | 12 +- .../xh/fangjiatong/updateDownload00.groovy | 14 +- .../xh/fangjiatong/updateDownload01.groovy | 10 +- .../xh/fangjiatong/updateDownload02.groovy | 14 +- .../xh/fangjiatong/updateDownload03.groovy | 14 +- .../xh/fangjiatong/updateDownload1.groovy | 10 +- .../xh/fangjiatong/updateDownload2.groovy | 12 +- .../xh/fangjiatong/updateDownload3.groovy | 14 +- .../xh/fangjiatong/updateDownload4.groovy | 16 +- .../xh/fangjiatong/updateDownload5.groovy | 10 +- .../updateDownloadReconcile2.groovy | 10 +- .../updateDownloadReconcile3.groovy | 8 +- .../updateDownloadReconcile4.groovy | 10 +- .../xh/house_loudong/ClearRegion.groovy | 8 +- .../house_loudong/InsertHouseLouDong.groovy | 2 +- .../LoudongEqualsOneCount2.groovy | 8 +- .../xh/house_loudong/MatchAddress.groovy | 12 +- .../xh/house_loudong/MatchDistrictNo2.groovy | 12 +- .../script/xh/house_loudong/Test2.groovy | 8 +- .../script/xh/house_loudong/TestClear.groovy | 26 +- .../distinct_unit_house_room_num.groovy | 20 +- .../updateHouseLoudongStatus.groovy | 12 +- .../fangjia/script/xh/matchDistrivtNo.groovy | 12 +- .../com/fangjia/script/xh/searchLog.groovy | 2 +- .../com/fangjia/script/xh/seaweed.groovy | 22 +- .../com/fangjia/script/xh/seaweed2.groovy | 6 +- .../script/xh/updateSeaseedEstatetype.groovy | 46 +- .../script/xh/updateSeaseedEstatetype2.groovy | 54 +- .../xh/涓婃捣缁熻灞�闇�瑕佸瓧娈垫暟鎹甠淇敼.groovy | 18 +- .../script/xh/澶╂触闂灏忓尯鐗╀笟璐规竻闄�.groovy | 4 +- .../fangjia/script/xingyebank/CityUtil.groovy | 8 +- .../com/fangjia/script/xingyebank/Data.groovy | 70 +- .../script/xingyebank/MatchHouseType.groovy | 68 +- .../script/xingyebank/MatchNames.groovy | 32 +- .../script/xingyebank/MergeData.groovy | 92 +- .../script/xingyebank/ProcessData.groovy | 30 +- .../script/xingyebank/ProcessData2.groovy | 26 +- .../com/fangjia/script/xingyebank/Test.groovy | 54 +- .../fangjia/script/xingyebank/Test2.groovy | 14 +- .../xingyebank/XingYeBankDataMatch.groovy | 86 +- .../process/AddressAliasProcess.groovy | 14 +- .../process/DataStandardProcess.groovy | 128 +- .../yinjihaun/AddrepoBoundsFormat.groovy | 6 +- .../yinjihaun/AddressBatchProcessData.groovy | 4 +- .../yinjihaun/AddressSearchBaiDuMapApi.groovy | 6 +- .../yinjihaun/AllCityDisDataProcess.groovy | 170 +- .../fangjia/script/yinjihaun/Avgprice.groovy | 6 +- .../yinjihaun/BaiduMapApiDataProcess.groovy | 16 +- .../script/yinjihaun/BusMapProcess.groovy | 76 +- .../script/yinjihaun/ChangZhouShop.groovy | 56 +- .../script/yinjihaun/CoreDataDisExport.groovy | 8 +- .../yinjihaun/CoreDataDisSaveSeaweed.groovy | 42 +- .../script/yinjihaun/DealPriceExport.groovy | 12 +- .../script/yinjihaun/DealPriceStat.groovy | 10 +- .../script/yinjihaun/DiJiaProcess.groovy | 76 +- .../fangjia/script/yinjihaun/DisCount.groovy | 48 +- .../script/yinjihaun/DisMatchByQianHai.groovy | 30 +- .../yinjihaun/DistrictCreateTimeUpdate.groovy | 2 +- .../yinjihaun/DistrictMasterDataUpdate.groovy | 2 +- .../yinjihaun/ExportUserInfoToSales.groovy | 8 +- .../yinjihaun/FangPinKaDataProcess.groovy | 140 +- .../yinjihaun/GaoDeMapApiDataProcess.groovy | 100 +- .../script/yinjihaun/HeiFeiGetDis.groovy | 42 +- .../yinjihaun/HourseResoucesExport.groovy | 22 +- .../script/yinjihaun/JianZaoNianDai.groovy | 32 +- .../script/yinjihaun/MatchDbNotExists.groovy | 60 +- .../fangjia/script/yinjihaun/NameCheck.groovy | 34 +- .../fangjia/script/yinjihaun/PingAnApi.groovy | 40 +- .../yinjihaun/ProxyIpDataProcess.groovy | 10 +- .../yinjihaun/QQMapApiDataProcess.groovy | 22 +- .../script/yinjihaun/RedisDataTest.groovy | 10 +- .../SeaweedAddressAliasFormat.groovy | 20 +- .../script/yinjihaun/SendEvalCount.groovy | 10 +- .../com/fangjia/script/yinjihaun/Shell.java | 18 +- .../script/yinjihaun/ShenWanByAddrepo.groovy | 8 +- .../script/yinjihaun/ShenWanByQQMap.groovy | 10 +- .../yinjihaun/ShenWanDataProcess.groovy | 68 +- .../yinjihaun/ShenWanDataProcess2.groovy | 64 +- .../fangjia/script/yinjihaun/TempStat.groovy | 80 +- .../script/yinjihaun/TestFangJiaGrab.groovy | 8 +- .../yinjihaun/UserImageDataExport.groovy | 8 +- .../AMapDataDetailSpiderByAddressMatch.groovy | 4 +- .../amap/AMapDataMatchProcess.groovy | 22 +- .../amap/AMapDataSpiderByAddressMatch.groovy | 28 +- .../amap/AMapDataSpiderByAggrate.groovy | 8 +- .../amap/AMapDataSpiderByLouDongCount.groovy | 16 +- .../yinjihaun/amap/CityBoundsFlag.groovy | 6 +- .../yinjihaun/amap/DistrictCheckUtils.groovy | 94 +- .../yinjihaun/amap/DistrictJoinSaveDB.groovy | 106 +- .../amap/FangChanZhongJieProcess.groovy | 106 +- .../yinjihaun/amap/GaoDeApiUtils.groovy | 32 +- .../yinjihaun/amap/GaoDeMapApiData.groovy | 84 +- .../yinjihaun/amap/GaoDeMapGeyPoiInfo.groovy | 6 +- .../amap/GaoDePoiSave154Process.groovy | 20 +- .../amap/MapApiDataSaveAddrepo.groovy | 30 +- .../amap/XiAnDistrictRegionMatch.groovy | 28 +- .../script/yinjihaun/api/AnShuoApiStat.groovy | 38 +- .../yinjihaun/asppost/GetPageClient.groovy | 24 +- .../yinjihaun/asppost/GetPageParam.groovy | 26 +- .../yinjihaun/asppost/GetPageUtils.groovy | 20 +- .../ApiCallCountAndTimeMonitorBatch.groovy | 40 +- .../batch/ApiProductFieldStatBatch.groovy | 212 +- .../batch/OpenApiNginxLogMonitorBatch.groovy | 46 +- .../batch/UpdateDistrictCodeBatch.groovy | 24 +- .../yinjihaun/dijia/ChangChunDiJia.groovy | 24 +- .../script/yinjihaun/dijia/DiJiaEntity.groovy | 26 +- .../script/yinjihaun/dijia/HeFeiDiJia.groovy | 14 +- .../script/yinjihaun/dikuai/DiKuai.groovy | 80 +- .../dikuai/DiKuaiDataFormatProcess.groovy | 68 +- .../yinjihaun/dikuai/FnagTianXiaDiKuai.groovy | 70 +- .../yinjihaun/dikuai/TuLiuWangDiKuai.groovy | 60 +- .../yinjihaun/dikuai/ZhongFangDiKuai.groovy | 4 +- .../district/BuChongJunGongDate.groovy | 12 +- .../district/DistrictCodeProcess.groovy | 30 +- .../district/DistrictCodeTemp.groovy | 10 +- .../district/DistrictFieldAddProcess.groovy | 56 +- .../district/DistrictIndexTest.groovy | 4 +- .../district/DistrictSaveToSeaweed.groovy | 30 +- .../yinjihaun/district/PdsDataProcess.groovy | 44 +- .../district/WuJiaoChangDataExport.groovy | 66 +- .../script/yinjihaun/eval/EvalSiteStat.groovy | 4 +- .../yinjihaun/eval/ExportEvalData.groovy | 6 +- .../script/yinjihaun/eval/MatchResult.groovy | 6 +- .../TransactionEvaluationDataContrast.groovy | 76 +- .../exprian/ExprianDataProcess.groovy | 8 +- .../yinjihaun/exprian/ExprianGetDis.groovy | 60 +- .../exprian/ExprianStatistics.groovy | 4 +- .../script/yinjihaun/fanggugu/FangGuGu.groovy | 24 +- .../FangGuGuChengJiaoAndGuaPai.groovy | 12 +- .../fanggugu/FangGuGuDistrict.groovy | 38 +- .../fanggugu/FangGuGuDistrictInfo.groovy | 2 +- .../yinjihaun/fanggugu/FangGuGuPrice.groovy | 12 +- .../yinjihaun/fanggugu/FangGuGuPrice2.groovy | 10 +- .../fanggugu/FangGuGuPriceSaveToDB.groovy | 2 +- .../fanghao/ExportFangHaoData.groovy | 10 +- .../yinjihaun/fanghao/FangHaoFormat.groovy | 8 +- .../yinjihaun/fanghao/FangHaoProcess.groovy | 16 +- .../lng/DistrictLocationProcess.groovy | 14 +- .../lng/ExportDistrictLocation.groovy | 10 +- .../lng/ExportMapNotMatchLocation.groovy | 42 +- .../yinjihaun/lng/GeocoderProcess.groovy | 8 +- .../lng/UpdateDistrictLocation.groovy | 164 +- .../yinjihaun/loudong/FangLiBangData.groovy | 32 +- .../loudong/LouDongExtractDistrict.groovy | 118 +- .../loudong/NanJingBankDataTemp.groovy | 28 +- .../yinjihaun/office/OfficeProcess.groovy | 208 +- .../yinjihaun/office/OfficeSaveDb.groovy | 44 +- .../office/OfficeUpdateBorder.groovy | 22 +- .../office/ShangHaiOfficeExport.groovy | 8 +- .../yinjihaun/poi/HongQiaoTianJie.groovy | 44 +- .../script/yinjihaun/price/AddressTest.groovy | 16 +- .../yinjihaun/price/DistrictRateStat.groovy | 82 +- .../yinjihaun/price/SaveDistrict.groovy | 28 +- .../yinjihaun/price/XiangYuJinFuPrice.groovy | 90 +- .../yinjihaun/qqmap/TengXunApiUtils.groovy | 10 +- .../script/yinjihaun/sc/HnzzCrawl.groovy | 6 +- .../yinjihaun/shop/BusinessShopExtact.groovy | 26 +- .../yinjihaun/shujubao/ShuJuBaoProcess.groovy | 6 +- .../yinjihaun/spider/Hb114Spider.groovy | 14 +- .../yinjihaun/spider/SFTaoBaoSpider.groovy | 644 +- .../yinjihaun/spider/W51zhupaiSiider.groovy | 102 +- .../yinjihaun/spider/WoAiWoJiaSpider.groovy | 44 +- .../script/yinjihaun/stat/DisMatch.groovy | 6 +- .../script/yinjihaun/stat/FangGuGuStat.groovy | 22 +- .../script/yinjihaun/stat/FuGaiLvStat.groovy | 42 +- .../yinjihaun/stat/JiangSuCityStat.groovy | 4 +- .../script/yinjihaun/stat/WeiZhongBank.groovy | 58 +- .../script/yinjihaun/stat/YFSDStat.groovy | 20 +- .../yinjihaun/stat/YunGuJiaDataFormat.groovy | 6 +- .../stat/YunGuaJiaJoinYFSDStat.groovy | 34 +- .../yinjihaun/tjfdc/TjFdcDataGrab.groovy | 10 +- .../yinjihaun/util/DingDingMessageUtil.groovy | 10 +- .../util/DistrictCollectionUtils.groovy | 2 +- .../script/yinjihaun/util/HttpClient.groovy | 32 +- .../script/yinjihaun/util/QQKeyPool.groovy | 8 +- .../script/zhongjietong/ZJTBrokerBatch.groovy | 2 +- .../ZJTHouseToHouseCpcDetailBatch.groovy | 18 +- .../service/EasyTestDataService.groovy | 12 +- .../service/RedaDataService.groovy | 36 +- .../service/ZjtCompanyImportService.groovy | 10 +- .../service/ZjtDistrictImportService.groovy | 58 +- .../service/ZjtUserAccountService.groovy | 4 +- .../zhuge/AddressPurificationTestApp.groovy | 8 +- .../zhuge/CityRentSearchGetHouseList.groovy | 94 +- .../com/fangjia/script/zhuge/Fuzhou.groovy | 2 +- .../com/fangjia/script/zhuge/QHZXTest.groovy | 2 +- .../com/fangjia/script/zhuge/TTest01.groovy | 16 +- .../com/fangjia/script/zhuge/Test.groovy | 4 +- .../script/zhuge/ZhuGeBasicInfo.groovy | 654 +- .../fangjia/script/zimocity/AnaPrice.groovy | 2 +- .../zimocity/ExportOffcieListings.groovy | 6 +- .../script/zimocity/ExportOffice.groovy | 54 +- .../script/zimocity/ExportOfficePrice.groovy | 6 +- .../ApiDailyCountOfficialAccount.groovy | 64 +- .../zongzhimin/LoanleadsToCrmNew.groovy | 88 +- .../zongzhimin/LoanleadsToCrmNew_bak.groovy | 56 +- .../script/zongzhimin/WSFangDiChan.groovy | 24 +- .../zongzhimin/WSFangDiChanSelled.groovy | 70 +- .../script/zsbank/BasicInfoDataSynch.groovy | 24 +- .../script/zsbank/DistrictLevelBatch.groovy | 10 +- .../fangjia/script/zsbank/ZheShangBank.groovy | 14 +- .../fangjia/script/statistics/ApiUtil.java | 44 +- projects/fangjia-service/pom.xml | 4 +- .../address/AddressAnalyseResultKeyEnum.java | 30 +- .../service/address/AddressParser.java | 26 +- .../service/address/AddressParserImpl.java | 432 +- .../address/AddressParserPatterns.java | 18 +- .../service/address/AddressParserService.java | 20 +- .../address/AddressParserServiceImpl.java | 100 +- .../service/address/AddressParserUtil.java | 104 +- .../fangjia/service/address/ClassUtil.java | 84 +- .../analy/AddressAnalyticsResultService.java | 26 +- .../analy/AddressRegionCountService.java | 4 +- .../format/AbstractAddressFormatter.java | 6 +- .../address/format/AddressFormatter.java | 6 +- .../format/AddressFormatterFactory.java | 168 +- .../mode/AbstractAddressModeParser.java | 8 +- .../fangjia/service/address/mode/Address.java | 24 +- .../address/mode/AddressMatchMetaData.java | 30 +- .../address/mode/AddressModeParser.java | 12 +- .../address/mode/AddressModeParserChain.java | 4 +- .../address/mode/AddressParserGoal.java | 2 +- .../address/mode/AddressScoreResult.java | 2 +- .../service/address/mode/BlockParser.java | 2 +- .../service/address/mode/BuildingType.java | 2 +- .../service/address/mode/CityData.java | 52 +- .../service/address/mode/CityParser.java | 12 +- .../service/address/mode/CityStatus.java | 6 +- .../service/address/mode/DetailParser.java | 12 +- .../service/address/mode/FragmentWeight.java | 2 +- .../service/address/mode/MatchParams.java | 28 +- .../service/address/mode/MatchResult.java | 8 +- .../service/address/mode/MatchText.java | 14 +- .../address/mode/MetaDataCacheKey.java | 2 +- .../service/address/mode/MetaDataType.java | 2 +- .../service/address/mode/PreciseLevel.java | 6 +- .../service/address/mode/PropertyType.java | 2 +- .../service/address/mode/ProvinceData.java | 88 +- .../service/address/mode/RegionParser.java | 4 +- .../service/address/mode/RoadParser.java | 4 +- .../service/address/mode/Township.java | 2 +- .../address/picker/AbstractAddressPicker.java | 44 +- .../service/address/picker/AddressPicker.java | 12 +- .../address/picker/AddressPickerChain.java | 2 +- .../service/address/picker/DetailPicker.java | 8 +- .../service/address/picker/NamePicker.java | 8 +- .../service/address/picker/RoadPicker.java | 2 +- .../fangjia/service/address/picker/Test.java | 14 +- .../processor/AbstractAddressProcessor.java | 52 +- .../processor/AddressDistrictProcessors.java | 14 +- .../processor/AddressFormatProcessor.java | 2 +- .../address/processor/AddressProcessors.java | 34 +- .../processor/BuildingNumberProcessor.java | 136 +- .../address/processor/CityProcessor.java | 72 +- .../address/processor/DirectionProcessor.java | 12 +- .../address/processor/DistrictProcessor.java | 22 +- .../address/processor/FloorProcessor.java | 12 +- .../address/processor/FormatProcessor.java | 8 +- .../address/processor/GeoProcessor.java | 10 +- .../address/processor/KeywordProcessor.java | 24 +- .../address/processor/LoopLineProcessor.java | 6 +- .../address/processor/NumericProcessor.java | 2 +- .../address/processor/OffsetProcessor.java | 4 +- .../address/processor/PreNoiseProcessor.java | 14 +- .../processor/ProvinceAdjustProcessor.java | 2 +- .../address/processor/ProvinceProcessor.java | 14 +- .../ProximalCharactersProcessor.java | 84 +- .../processor/RoomNumberProcessor.java | 20 +- .../processor/SpecifyRregularProcessor.java | 24 +- .../processor/StageAndPartitionProcessor.java | 2 +- .../address/processor/StreetProcessor.java | 42 +- .../address/processor/TooltipProcessor.java | 8 +- .../address/processor/TownshipProcessor.java | 8 +- .../processor/VillageNameProcessor.java | 2 +- .../service/api/AbstractHttpApiService.java | 2 +- .../service/api/AddressMatchProxyService.java | 34 +- .../api/AddressMatchProxyServiceImpl.java | 138 +- .../service/api/AliyunServiceImpl.java | 12 +- .../fangjia/service/api/AmapPoiService.java | 24 +- .../service/api/AmapPoiServiceImpl.java | 28 +- .../com/fangjia/service/api/ApiService.java | 30 +- .../fangjia/service/api/ApiServiceImpl.java | 12 +- .../service/api/ApiUserCfgService.java | 2 +- .../service/api/ApiUserCfgServiceImpl.java | 6 +- .../service/api/AutoCompleteService.java | 28 +- .../service/api/AutoCompleteServiceImpl.java | 2 +- .../fangjia/service/api/BaiduApiService.java | 26 +- .../service/api/BaiduApiServiceImpl.java | 4 +- .../CategoryChannelCorrespondenceEnum.java | 78 +- .../com/fangjia/service/api/CategoryEnum.java | 16 +- .../fangjia/service/api/KnowbaseService.java | 66 +- .../service/api/KnowbaseServiceImpl.java | 110 +- .../com/fangjia/service/api/MallService.java | 4 +- .../fangjia/service/api/MallServiceImpl.java | 26 +- .../service/auto/AutoOperatorService.java | 12 +- .../com/fangjia/service/auto/AutoService.java | 22 +- .../AliasUpdateOperationServiceImpl.java | 4 +- .../bkoff/ApiMonitorTaskServiceImpl.java | 2 +- .../fangjia/service/bkoff/DikuaiService.java | 24 +- .../bkoff/LosePropertyServiceImpl.java | 4 +- .../service/bkoff/TaoBaoAuctionService.java | 6 +- .../com/fangjia/service/bo/AdSpaceBo.java | 24 +- .../fangjia/service/bo/AddressCheckTruth.java | 6 +- .../com/fangjia/service/bo/AddressSplit.java | 4 +- .../com/fangjia/service/bo/AddressTaskBo.java | 2 +- .../com/fangjia/service/bo/AgentMasterBo.java | 4 +- .../service/bo/AroundConsumeGradeBo.java | 16 +- .../com/fangjia/service/bo/AvgUpdateBo.java | 12 +- .../fangjia/service/bo/BusinessShopBo.java | 42 +- .../bo/CheckMatchDistrictCorrectParam.java | 20 +- .../fangjia/service/bo/CitySellStatBo.java | 4 +- .../fangjia/service/bo/CityStatInfoBo.java | 8 +- .../com/fangjia/service/bo/Collateral.java | 4 +- .../service/bo/CommunityRatingBasicBo.java | 26 +- .../service/bo/CommunityRatingForeignBo.java | 20 +- .../service/bo/CommunityRatingMajorBo.java | 86 +- .../service/bo/ConsumptionGradeBo.java | 16 +- .../com/fangjia/service/bo/DistrictAvgBo.java | 2 +- .../bo/DistrictBusinessStatRentBo.java | 4 +- .../com/fangjia/service/bo/DistrictInfo.java | 2 +- .../fangjia/service/bo/DistrictStatBo.java | 10 +- .../service/bo/DistrictStatInfoBo.java | 16 +- .../com/fangjia/service/bo/DistrictTagBo.java | 4 +- .../com/fangjia/service/bo/EvaluationBo.java | 6 +- .../service/bo/EvaluationDetailBo.java | 2 +- .../com/fangjia/service/bo/FjHouseLoanBo.java | 2 +- .../java/com/fangjia/service/bo/FjLoanBo.java | 14 +- .../fangjia/service/bo/FjLoanerInfoItem.java | 22 +- .../java/com/fangjia/service/bo/HouseBo.java | 24 +- .../java/com/fangjia/service/bo/LoginBo.java | 8 +- .../java/com/fangjia/service/bo/MallBo.java | 2 +- .../fangjia/service/bo/ManualInquiryBo.java | 38 +- .../fangjia/service/bo/MatchAddressScore.java | 6 +- .../service/bo/MatchDistrictResult.java | 14 +- .../service/bo/MatchDistrictResultBo.java | 10 +- .../java/com/fangjia/service/bo/NewsBo.java | 8 +- .../bo/OnceCollateralEvaluationInfoBo.java | 4 +- .../com/fangjia/service/bo/RegionBlockBo.java | 6 +- .../fangjia/service/bo/RegionSellStatBo.java | 4 +- .../com/fangjia/service/bo/RegionStatBo.java | 4 +- .../com/fangjia/service/bo/RentHouseBo.java | 18 +- .../com/fangjia/service/bo/SampleWrapper.java | 2 +- .../com/fangjia/service/bo/ServerAreaBo.java | 4 +- .../com/fangjia/service/bo/UserTradesBo.java | 8 +- .../service/bo/map/MapAmapDistrict.java | 562 +- .../service/bo/map/MapRestApiPoiBo_Poi.java | 10 +- .../service/bo/map/MapServicePoiInfo_POI.java | 14 +- .../service/chart/ChartTransformer.java | 2 +- .../service/chart/GoogleImageChartUtils.java | 18 +- .../fangjia/service/chart/OfcChartUtils.java | 62 +- .../fangjia/service/chart/bean/ChartLine.java | 14 +- .../service/chart/bean/ChartStyleConfig.java | 18 +- .../dataprovider/LineChartDataProvider.java | 6 +- .../dataprovider/PieChartDataProvider.java | 2 +- .../CityGoogleImageChartDataProvider.java | 8 +- .../DistrictGoogleImageChartDataProvider.java | 10 +- ...valuationGoogleImageChartDataProvider.java | 4 +- .../GoogleImageChartDataProvider.java | 12 +- .../RegionGoogleImageChartDataProvider.java | 8 +- .../ofc/BlockOfcDataProvider.java | 14 +- .../dataprovider/ofc/CityOfcDataProvider.java | 4 +- .../ofc/DistrictHouseInfoDataProvider.java | 6 +- .../ofc/DistrictOfcDataProvider.java | 4 +- .../ofc/EvaluationOfcDataProvider.java | 16 +- .../ofc/GujiaTrendDataProvider.java | 16 +- .../ofc/RegionOfcDataProvider.java | 12 +- .../chart/generator/ChartGenerator.java | 4 +- .../generator/GoogleImageChartGenerator.java | 4 +- .../chart/generator/OfcLineGenerator.java | 2 +- .../bean/GoogleImageChartLine.java | 28 +- .../bean/GoogleImageChartStyleConfig.java | 12 +- .../jfreechart/JFreeChartImageService.java | 66 +- .../JFreeChartImageServiceImpl.java | 758 +- .../service/chart/ofc/bean/OfcLine.java | 8 +- .../chart/ofc/bean/OfcStyleConfig.java | 6 +- .../fangjia/service/chart2/ChartUtils.java | 4 +- .../RegionChartDataProvider.java | 2 +- .../cnAnalyzer/CnAddressTokenizer.java | 8 +- .../service/cnAnalyzer/CnDictionary.java | 18 +- .../service/cnAnalyzer/CnTokenizer.java | 22 +- .../service/cnAnalyzer/KeywordEnum.java | 40 +- .../service/cnAnalyzer/NumberHandler.java | 64 +- .../service/cnAnalyzer/PatternTokenizer.java | 94 +- .../service/common/BatchAnalysisEnum.java | 8 +- .../fangjia/service/common/CookieName.java | 32 +- .../fangjia/service/common/NewsTypeEnum.java | 26 +- .../fangjia/service/common/SellSimilar.java | 24 +- .../java/com/fangjia/service/cpc/CpcBo.java | 8 +- .../com/fangjia/service/cpc/CpcHouseBo.java | 6 +- .../com/fangjia/service/cpc/CpcService.java | 64 +- .../fangjia/service/cpc/CpcServiceImpl.java | 102 +- .../fangjia/service/cpc/ZjtBrokerService.java | 10 +- .../datastore/AgencyMountLevelService.java | 2 +- .../service/datastore/AiShopService.java | 8 +- .../service/datastore/AiShopServiceImpl.java | 110 +- .../datastore/BusinessEstateServiceImpl.java | 4 +- .../datastore/CPDBPriceLevelService.java | 6 +- .../datastore/CitySellStatService.java | 14 +- .../datastore/CitySellStatServiceImpl.java | 2 +- .../datastore/CzbankSampleService.java | 10 +- .../datastore/CzbankSampleServiceImpl.java | 178 +- .../DistrictCityScoreLevelService.java | 2 +- .../datastore/DistrictCommentService.java | 12 +- .../service/datastore/DistrictDto.java | 34 +- .../datastore/DistrictDynamicsService.java | 10 +- .../datastore/DistrictSellStatService.java | 26 +- .../service/datastore/DistrictService.java | 146 +- .../datastore/DistrictServiceImpl.java | 110 +- .../datastore/DistrictUpdateTaskService.java | 20 +- .../service/datastore/DuanzuHouseService.java | 2 +- .../service/datastore/EvaluationDto.java | 2 +- .../datastore/EvaluationPriceService.java | 6 +- .../datastore/EvaluationPriceServiceImpl.java | 2 +- .../EvaluationReportServiceImpl.java | 4 +- .../service/datastore/EvaluationService.java | 52 +- .../datastore/EvaluationServiceImpl.java | 236 +- .../datastore/FSHAlgorithmRuleService.java | 18 +- .../FSHAlgorithmRuleServiceImpl.java | 2 +- .../datastore/FieldFilterServiceImpl.java | 20 +- .../datastore/HousePropertyServiceImpl.java | 4 +- .../service/datastore/HouseService.java | 162 +- .../service/datastore/HouseServiceImpl.java | 172 +- .../datastore/MicroBlogServiceImpl.java | 2 +- .../service/datastore/OfficeHouseService.java | 2 +- .../datastore/OfficeRentHouseService.java | 2 +- .../service/datastore/OfficeService.java | 12 +- .../service/datastore/OfficeServiceImpl.java | 194 +- .../fangjia/service/datastore/PicService.java | 14 +- .../service/datastore/PicServiceImpl.java | 24 +- .../service/datastore/RegionStatService.java | 74 +- .../datastore/RegionStatServiceImpl.java | 36 +- .../service/datastore/RentHouseService.java | 44 +- .../datastore/RentHouseServiceImpl.java | 56 +- .../datastore/ReportDistrictInfoService.java | 24 +- .../ReportDistrictInfoServiceImpl.java | 154 +- .../service/datastore/SchoolService.java | 16 +- .../service/datastore/SchoolServiceImpl.java | 16 +- .../service/datastore/ShopHouseService.java | 2 +- .../datastore/ShopRentHouseService.java | 2 +- .../service/datastore/ShopService.java | 2 +- .../datastore/SixSellMountLevelService.java | 2 +- .../service/datastore/bean/AroundBean.java | 10 +- .../bean/CollateralSampleQueryBean.java | 60 +- .../datastore/bean/DistrictQueryBean.java | 36 +- .../datastore/bean/DuanzuHouseQueryBean.java | 6 +- .../bean/EvaluationBeforeLoanBean.java | 14 +- .../datastore/bean/EvaluationQueryBean.java | 18 +- .../datastore/bean/FriendLinkQueryBean.java | 4 +- .../service/datastore/bean/HousePicEnum.java | 4 +- .../datastore/bean/HousePriceQueryBean.java | 6 +- .../datastore/bean/HouseQueryBean.java | 52 +- .../service/datastore/bean/MapQueryBean.java | 22 +- .../datastore/bean/RentHouseQueryBean.java | 74 +- .../bean/ReportDistrictInfoBean.java | 48 +- .../bean/ShopCollateralSampleQueryBean.java | 60 +- .../com/fangjia/service/dbip/IPEntry.java | 2 +- .../com/fangjia/service/dbip/IPSeeker.java | 180 +- .../java/com/fangjia/service/dbip/Utils.java | 40 +- .../service/district/BrokerService.java | 8 +- .../district/BusinessStatRentService.java | 4 +- .../district/BusinessStatRentServiceImpl.java | 12 +- .../district/DistrictStatRentService.java | 22 +- .../district/DistrictStatRentServiceImpl.java | 34 +- .../service/district/DistrictStatService.java | 130 +- .../district/DistrictStatServiceImpl.java | 206 +- .../service/district/HousePriceService.java | 12 +- .../district/HousePriceServiceImpl.java | 6 +- .../service/district/HouseReportService.java | 18 +- .../district/HouseReportServiceImpl.java | 24 +- .../district/OfficeStatServiceImpl.java | 12 +- .../service/district/RealHouseService.java | 6 +- .../district/RealHouseServiceImpl.java | 4 +- .../district/RegionStatRentService.java | 2 +- .../district/RegionStatRentServiceImpl.java | 2 +- .../service/district/ShopStatService.java | 6 +- .../service/district/ShopStatServiceImpl.java | 46 +- .../service/district/TradeDetailService.java | 6 +- .../service/domain/BrandDomainGenerator.java | 2 +- .../service/domain/DomainGenerator.java | 2 +- .../service/domain/FangjiaDomainHandler.java | 16 +- .../com/fangjia/service/dto/UniversalDto.java | 4 +- .../service/efang/EFangServiceImpl.java | 54 +- .../fangjia/service/efang/PaymentService.java | 32 +- .../service/efang/PaymentServiceImpl.java | 2 +- .../efang/payment/util/AlipayConfig.java | 68 +- .../efang/payment/util/AlipayFunction.java | 48 +- .../efang/payment/util/AlipayNotify.java | 32 +- .../efang/payment/util/AlipayService.java | 158 +- .../service/efang/payment/util/CheckURL.java | 6 +- .../efang/payment/util/Md5Encrypt.java | 12 +- .../service/efang/payment/util/UtilDate.java | 20 +- .../service/elevate/ElevateWordService.java | 36 +- .../elevate/ElevateWordServiceImpl.java | 16 +- .../fangjia/service/fangjia/AdLogService.java | 22 +- .../service/fangjia/AdLogServiceImpl.java | 10 +- .../service/fangjia/AdvertisementService.java | 16 +- .../fangjia/AdvertisementServiceImpl.java | 12 +- .../service/fangjia/AdviceLeadsService.java | 2 +- .../service/fangjia/ApartmenetService.java | 40 +- .../fangjia/ApartmenetServiceImpl.java | 138 +- .../EvaluationPurposeAnalysisService.java | 10 +- .../EvaluationPurposeAnalysisServiceImpl.java | 32 +- .../service/fangjia/FangJiaUserService.java | 36 +- .../fangjia/FangJiaUserServiceImpl.java | 22 +- .../fangjia/ImageManagerServiceImpl.java | 2 +- .../service/fangjia/LoanAgreementService.java | 2 +- .../fangjia/LoanAgreementServiceImpl.java | 12 +- .../fangjia/LoanBurialPointService.java | 12 +- .../fangjia/LoanBurialPointServiceImpl.java | 16 +- .../service/fangjia/LoanLeadsService.java | 8 +- .../service/fangjia/LoanLeadsServiceImpl.java | 66 +- .../service/fangjia/LoanProductService.java | 6 +- .../fangjia/LoanProductServiceImpl.java | 6 +- .../service/fangjia/LoanPushServiceImpl.java | 60 +- .../fangjia/LoanWithHoldServiceImpl.java | 2 +- .../service/fangjia/NewsResourceService.java | 14 +- .../service/fangjia/SaleLeadsService.java | 2 +- .../service/fangjia/SaleLeadsServiceImpl.java | 52 +- .../service/fangjia/UrlFilterService.java | 2 +- .../fangjia/YinLianEvaluationService.java | 4 +- .../fangjia/YinLianUserInfoService.java | 8 +- .../fangjia/service/form/FjHouseLoanForm.java | 2 +- .../com/fangjia/service/form/FjLoanForm.java | 4 +- .../service/fsh/CityNewPriceService.java | 6 +- .../service/fsh/CityPriceIntervalService.java | 4 +- .../service/fsh/DistrictNewPriceService.java | 66 +- .../fsh/DistrictNewPriceServiceImpl.java | 48 +- .../index/AddrepoTriggerServiceImpl.java | 2 +- .../service/index/AutoTriggerServiceImpl.java | 4 +- .../service/index/BoostQueryPolicy.java | 4 +- .../com/fangjia/service/index/DataFilter.java | 10 +- .../index/DiaryTriggerServiceImpl.java | 2 +- .../DistrictCommentTriggerServiceImpl.java | 6 +- .../DistrictDynamicsTriggerServiceImpl.java | 6 +- .../index/DistrictTriggerServiceImpl.java | 32 +- .../index/HouseDataScoreCalculator.java | 42 +- .../service/index/IndexHelperService.java | 52 +- .../service/index/IndexHelperServiceImpl.java | 24 +- .../index/NewDistrictDataScoreCalculator.java | 12 +- .../index/NewDistrictTriggerServiceImpl.java | 2 +- .../index/OfficeRentTriggerServiceImpl.java | 2 +- .../index/OfficeTriggerServiceImpl.java | 8 +- .../service/index/PotentialIndexService.java | 2 +- .../com/fangjia/service/index/ReasonEnum.java | 44 +- .../fangjia/service/index/RentDataFilter.java | 18 +- .../index/RentDataScoreCalculator.java | 44 +- .../service/index/RentTriggerServiceImpl.java | 32 +- .../index/SchoolTriggerServiceImpl.java | 10 +- .../service/index/ScoreCalculator.java | 50 +- .../index/ScoreCalculatorInputData.java | 16 +- .../index/ScoreCalculatorOutputData.java | 8 +- .../fangjia/service/index/SellDataFilter.java | 10 +- .../index/SellDataScoreCalculator.java | 54 +- .../service/index/SellTriggerServiceImpl.java | 38 +- .../index/ShopRentTriggerServiceImpl.java | 2 +- .../service/index/ShopTriggerServiceImpl.java | 4 +- .../fangjia/service/index/TriggerService.java | 4 +- .../query/AbstractBoostQueryPolicy2.java | 2 +- .../BoostQueryDistrictNewPolicyImpl.java | 4 +- .../query/BoostQueryMicroBlogPolicyImpl.java | 2 +- .../index/query/BoostQueryNewsPolicyImpl.java | 2 +- .../information/InformationService.java | 2 +- .../information/InformationServiceImpl.java | 2 +- .../service/map/AMapAddressServiceImpl.java | 84 +- .../map/AbstractMapAddressService.java | 144 +- .../AmapRestApiAddressMatchServiceImpl.java | 54 +- .../service/map/QQMapAddressServiceImpl.java | 14 +- .../java/com/fangjia/service/menu/Group.java | 2 +- .../java/com/fangjia/service/menu/Item.java | 6 +- .../fangjia/service/menu/MenuGenerator.java | 46 +- .../com/fangjia/service/mode/ModeEnum.java | 8 +- .../com/fangjia/service/mode/ModeService.java | 8 +- .../mongo/addrepo/AddressRepoService.java | 8 +- .../mongo/addrepo/AddressRepoServiceImpl.java | 116 +- .../service/mongo/addrepo/GeoUtils.java | 36 +- .../mongo/bkoff/AnalyResultService.java | 18 +- .../mongo/bkoff/AnalyResultServiceImpl.java | 26 +- .../mongo/bkoff/AveragerConfigService.java | 12 +- .../bkoff/AveragerConfigServiceImpl.java | 4 +- .../mongo/bkoff/BackLinkServiceImpl.java | 14 +- .../mongo/bkoff/BkoffUsersService.java | 4 +- .../mongo/bkoff/BkoffUsersServiceImpl.java | 6 +- .../mongo/bkoff/ComparePriceServiceImpl.java | 2 +- .../service/mongo/bkoff/DataService.java | 2 +- .../service/mongo/bkoff/DataServiceImpl.java | 6 +- .../bkoff/DistrictPicDelServiceImpl.java | 6 +- .../mongo/bkoff/DistrictRelationService.java | 40 +- .../bkoff/DistrictRelationServiceImpl.java | 60 +- .../bkoff/ExtractDistrictServiceImpl.java | 2 +- .../mongo/bkoff/HouseAuctionService.java | 6 +- .../mongo/bkoff/HouseLoudongService.java | 34 +- .../bkoff/HouseSourceCountServiceImpl.java | 2 +- .../mongo/bkoff/LoudongServiceImpl.java | 46 +- .../mongo/bkoff/MobileBlackListService.java | 6 +- .../service/mongo/fangjia/AdSpaceService.java | 18 +- .../mongo/fangjia/AdSpaceServiceImpl.java | 2 +- .../fangjia/AddressMatchLogServiceImpl.java | 16 +- .../fangjia/AddressMatchServiceImpl.java | 12 +- .../AdministrativeDivisionService.java | 2 +- .../mongo/fangjia/AgentShopService.java | 10 +- .../mongo/fangjia/ApiDetailService.java | 16 +- .../fangjia/AverageAnalyServiceImpl.java | 10 +- .../mongo/fangjia/BatchEvaluateService.java | 4 +- .../service/mongo/fangjia/BizShopService.java | 2 +- .../mongo/fangjia/BizShopServiceImpl.java | 4 +- .../mongo/fangjia/BusStationServiceImpl.java | 20 +- .../fangjia/CommunityRatingServiceImpl.java | 12 +- .../mongo/fangjia/CopyrightConfigService.java | 10 +- .../fangjia/CpcClickDetailLogService.java | 2 +- .../fangjia/CpcClickDetailLogServiceImpl.java | 4 +- .../mongo/fangjia/CustomqueryServiceImpl.java | 4 +- .../mongo/fangjia/CzbankSampleLogService.java | 2 +- .../mongo/fangjia/DealPriceService.java | 24 +- .../mongo/fangjia/DealSampleServiceImpl.java | 2 +- .../mongo/fangjia/DevelopmentZoneService.java | 10 +- .../fangjia/DevelopmentZoneServiceImpl.java | 14 +- .../DistrictBusinessStatRentService.java | 2 +- .../DistrictBusinessStatRentServiceImpl.java | 24 +- .../fangjia/DistrictCodeServiceImpl.java | 2 +- .../mongo/fangjia/DistrictHouseService.java | 8 +- .../mongo/fangjia/DistrictNearbyService.java | 8 +- .../fangjia/DistrictNearbyServiceImpl.java | 8 +- .../DistrictRentCoverageServiceImpl.java | 2 +- .../fangjia/DistrictStatRankService.java | 4 +- .../fangjia/DistrictStatRankServiceImpl.java | 20 +- .../mongo/fangjia/DistrictTagService.java | 4 +- .../mongo/fangjia/DistrictTagServiceImpl.java | 20 +- .../fangjia/DistrictTradeAnalyseService.java | 12 +- .../DistrictTradeAnalyseServiceImpl.java | 8 +- .../fangjia/EvaluateMasterServiceImpl.java | 12 +- .../fangjia/EvaluationConditionService.java | 2 +- .../fangjia/EvaluationExportServiceImpl.java | 4 +- .../fangjia/EvaluationFactorService.java | 8 +- .../fangjia/EvaluationFactorServiceImpl.java | 78 +- .../mongo/fangjia/FileServiceImpl.java | 8 +- .../fangjia/FjLoanOfficerServiceImpl.java | 10 +- .../service/mongo/fangjia/FjLoanService.java | 32 +- .../mongo/fangjia/FjLoanServiceImpl.java | 14 +- .../fangjia/FjtUserGoldFreezeService.java | 6 +- .../fangjia/FjtUserGoldFreezeServiceImpl.java | 10 +- .../fangjia/FriendLinkPlacementEnum.java | 16 +- .../mongo/fangjia/FriendLinkService.java | 14 +- .../mongo/fangjia/FriendLinkTypeEnum.java | 6 +- .../service/mongo/fangjia/GuzhiService.java | 2 +- .../mongo/fangjia/IpAddressServiceImpl.java | 126 +- .../mongo/fangjia/KeyValueService.java | 6 +- .../mongo/fangjia/KeyValueServiceImpl.java | 2 +- .../mongo/fangjia/LatlngPolygonService.java | 14 +- .../mongo/fangjia/MetroDistanceService.java | 20 +- .../fangjia/MetroDistanceServiceImpl.java | 4 +- .../mongo/fangjia/MetroLineService.java | 4 +- .../service/mongo/fangjia/MetroService.java | 20 +- .../mongo/fangjia/MetroServiceImpl.java | 10 +- .../fangjia/MortgageInfoServiceImpl.java | 2 +- .../mongo/fangjia/NetworkPriceService.java | 4 +- .../mongo/fangjia/NewsDynamicService.java | 2 +- .../fangjia/PaphEvaluateServiceImpl.java | 2 +- .../mongo/fangjia/PriceSubscribeService.java | 4 +- .../mongo/fangjia/ReasonServiceImpl.java | 10 +- .../mongo/fangjia/RecommendService.java | 4 +- .../mongo/fangjia/RegionBlockService.java | 42 +- .../mongo/fangjia/RegionBlockServiceImpl.java | 32 +- .../mongo/fangjia/RegionSellStatService.java | 6 +- .../mongo/fangjia/ReportSplitServiceImpl.java | 4 +- .../mongo/fangjia/SameQuoteSellService.java | 4 +- .../mongo/fangjia/SeawaterService.java | 2 +- .../mongo/fangjia/ServerAreaService.java | 38 +- .../mongo/fangjia/ServerAreaServiceImpl.java | 8 +- .../mongo/fangjia/Setting400Service.java | 2 +- .../service/mongo/fangjia/SmsCodeService.java | 4 +- .../mongo/fangjia/SmsCodeServiceImpl.java | 10 +- .../mongo/fangjia/SnapDataService.java | 62 +- .../mongo/fangjia/SnapDataServiceImpl.java | 20 +- .../mongo/fangjia/StatsIndexServiceImpl.java | 8 +- .../service/mongo/fangjia/TaskService.java | 10 +- .../mongo/fangjia/TaskServiceImpl.java | 30 +- .../mongo/fangjia/TownshipService.java | 6 +- .../mongo/fangjia/TownshipServiceImpl.java | 6 +- .../mongo/fangjia/UserClickService.java | 10 +- .../mongo/fangjia/UserClickServiceImpl.java | 8 +- .../mongo/fangjia/UserFeelingService.java | 12 +- .../mongo/fangjia/UserFeelingServiceImpl.java | 16 +- .../fangjia/VillageIdentifyServiceImpl.java | 6 +- .../mongo/fangjia/WeixinTaskUserService.java | 6 +- .../mongo/fangjia/WeixinUserService.java | 6 +- .../mongo/fangjia/WeixinUserServiceImpl.java | 2 +- .../mongo/fangjia/XcxActivityInfoService.java | 18 +- .../fangjia/XcxActivityInfoServiceImpl.java | 10 +- .../mongo/fangjia/XcxEvaluationService.java | 10 +- .../mongo/fangjia/XcxLoanInfoService.java | 8 +- .../mongo/fangjia/XcxUserInfoService.java | 22 +- .../mongo/fangjia/XcxUserInfoServiceImpl.java | 8 +- .../service/mongo/fs/FilesService.java | 8 +- .../mongo/mobile/DistrictMSGService.java | 42 +- .../mongo/mobile/DistrictMSGServiceImpl.java | 48 +- .../service/mongo/mobile/FavoriteService.java | 10 +- .../mongo/mobile/FavoriteServiceImpl.java | 4 +- .../mongo/mobile/SearchKeywordService.java | 4 +- .../mobile/SearchKeywordServiceImpl.java | 4 +- .../mongo/mobile/UserCallRecordService.java | 2 +- .../mongo/mobile/UserComplaintService.java | 4 +- .../mobile/UserComplaintServiceImpl.java | 4 +- .../mongo/mobile/UserFeedbackService.java | 4 +- .../mongo/mobile/UserFeedbackServiceImpl.java | 4 +- .../mongo/mobile/UserGeolocationService.java | 4 +- .../mobile/UserGeolocationServiceImpl.java | 4 +- .../mongo/mobile/UserHistoryService.java | 4 +- .../mongo/mobile/UserHistoryServiceImpl.java | 4 +- .../service/news/NewsPublishServiceImpl.java | 18 +- .../com/fangjia/service/news/NewsService.java | 56 +- .../fangjia/service/news/NewsServiceImpl.java | 6 +- .../com/fangjia/service/ofc/bean/Graph.java | 2 +- .../fangjia/service/ofc/model/BgImage.java | 2 +- .../com/fangjia/service/ofc/model/YData.java | 14 +- .../service/ofc/model/elements/LineChart.java | 8 +- .../AdministrativeMappingServiceImpl.java | 112 +- .../service/open/AliasFangService.java | 2 +- .../service/open/ApiUserAuthorityService.java | 38 +- .../com/fangjia/service/open/ApiUserBo.java | 4 +- .../service/open/ApiVisitCountService.java | 14 +- .../open/ApiVisitCountServiceImpl.java | 4 +- .../com/fangjia/service/open/AuthorityBo.java | 2 +- .../service/open/AverageConsumeService.java | 4 +- .../open/AverageConsumeServiceImpl.java | 2 +- .../open/DistrictAnalyDataService.java | 26 +- .../open/DistrictAnalyDataServiceImpl.java | 2 +- .../com/fangjia/service/open/DistrictBo.java | 4 +- .../service/open/EvaluateFactorService.java | 4 +- .../open/EvaluateFactorServiceImpl.java | 4 +- .../open/FangjiaOfficialAreaService.java | 10 +- .../open/FangjiaOfficialAreaServiceImpl.java | 2 +- .../com/fangjia/service/open/LevelInfoBo.java | 14 +- .../com/fangjia/service/open/MapCategory.java | 2 +- .../service/open/MapSearchService.java | 4 +- .../service/open/MapSearchServiceImpl.java | 30 +- .../service/open/OpenRentHouseService.java | 18 +- .../open/OpenRentHouseServiceImpl.java | 6 +- .../open/OpenResourceCountService.java | 2 +- .../service/open/OpenSellHouseService.java | 18 +- .../open/OpenSellHouseServiceImpl.java | 6 +- .../service/open/OpenUriLogService.java | 10 +- .../service/open/OpenUriLogServiceImpl.java | 2 +- .../service/open/RegionPotentialService.java | 4 +- .../com/fangjia/service/open/StatAnalyBo.java | 6 +- .../service/open/ToolClickDetailLogBo.java | 4 +- .../service/open/WeChatAuthService.java | 8 +- .../service/open/WeChatAuthServiceImpl.java | 16 +- .../service/open/WebankServiceImpl.java | 6 +- .../pds/AddressAssetAnalyBatchService.java | 2 +- .../AddressAssetAnalyBatchServiceImpl.java | 2 +- .../pds/AddressAssetAnalyServiceImpl.java | 6 +- .../service/pds/AlgorithmRuleService.java | 16 +- .../pds/ApiCallLimitDetailService.java | 8 +- .../pds/ApiCallLimitDetailServiceImpl.java | 4 +- .../service/pds/ApiCallLimitService.java | 14 +- .../service/pds/ApiCallLimitServiceImpl.java | 4 +- .../fangjia/service/pds/AssetAutoService.java | 4 +- .../service/pds/AssetAutoServiceImpl.java | 12 +- .../com/fangjia/service/pds/AssetService.java | 6 +- .../service/pds/BankLoanRateService.java | 4 +- .../pds/BorrowerInfoMonitorService.java | 2 +- .../fangjia/service/pds/BorrowerService.java | 4 +- .../fangjia/service/pds/CollRateService.java | 12 +- .../pds/CollateralEvaluationInfoService.java | 4 +- .../pds/DistrictHouseNumberService.java | 6 +- .../pds/DistrictRoomNumberService.java | 4 +- .../com/fangjia/service/pds/EamService.java | 8 +- .../fangjia/service/pds/EamServiceImpl.java | 2 +- .../service/pds/EnterpriseService.java | 34 +- .../service/pds/EnterpriseServiceImpl.java | 4 +- .../service/pds/EquipmentInfoService.java | 6 +- .../pds/EvaluationBeforeLoanService.java | 2 +- .../pds/EvaluationBeforeLoanServiceImpl.java | 10 +- .../service/pds/EvaluationGeneralService.java | 2 +- .../pds/EvaluationGeneralServiceImpl.java | 8 +- .../pds/FileDataDetailBatchService.java | 16 +- .../pds/FileDataDetailBatchServiceImpl.java | 6 +- .../service/pds/FileDataDetailService.java | 16 +- .../pds/FileDataDetailServiceImpl.java | 6 +- .../pds/FileDataTotalityBatchService.java | 18 +- .../pds/FileDataTotalityBatchServiceImpl.java | 2 +- .../service/pds/FileDataTotalityService.java | 18 +- .../pds/FileDataTotalityServiceImpl.java | 2 +- .../service/pds/HourseTypeStatService.java | 4 +- .../service/pds/HouseInfoMonitorService.java | 2 +- .../fangjia/service/pds/HouseInfoService.java | 6 +- .../service/pds/HouseInfoServiceImpl.java | 2 +- .../service/pds/HouseLevelInfoService.java | 4 +- .../service/pds/ManualInquiryService.java | 6 +- .../service/pds/ManualInquiryServiceImpl.java | 4 +- .../pds/MortgageDetailServiceImpl.java | 2 +- .../pds/NeedCollateralRateService.java | 2 +- .../OnceCollateralEvaluationInfoService.java | 18 +- ...ceCollateralEvaluationInfoServiceImpl.java | 2 +- .../service/pds/PdsAlgorithmRuleService.java | 16 +- .../service/pds/PdsApiProxyService.java | 26 +- .../service/pds/PdsAuthorityGroupService.java | 4 +- .../service/pds/PdsAuthorityService.java | 6 +- .../service/pds/PdsLoanRateService.java | 12 +- .../fangjia/service/pds/PdsRoleService.java | 24 +- .../fangjia/service/pds/PdsUserService.java | 46 +- .../service/pds/PdsUserServiceImpl.java | 4 +- .../service/pds/PeopleInquiryService.java | 8 +- .../pds/PicUploadAndDownloadService.java | 2 +- .../pds/PicUploadAndDownloadServiceImpl.java | 2 +- .../pds/ReportAuthorizationCodeService.java | 10 +- .../service/pds/ReportBatchService.java | 4 +- .../service/pds/ReportBatchServiceImpl.java | 34 +- .../service/pds/ReportCheckServiceImpl.java | 2 +- .../service/pds/ReportInputService.java | 24 +- .../service/pds/ReportInputServiceImpl.java | 2178 +-- .../service/pds/ReportNumberService.java | 8 +- .../service/pds/ReportNumberServiceImpl.java | 2 +- .../service/pds/ReportResultService.java | 16 +- .../service/pds/RiskControlDetailService.java | 6 +- .../pds/RiskControlDetailServiceImpl.java | 36 +- .../service/pds/RiskControlService.java | 2 +- .../fangjia/service/pds/RiskWarnService.java | 2 +- .../service/pds/SuanhuaApiService.java | 6 +- .../service/pds/SuanhuaApiServiceImpl.java | 12 +- .../service/pds/TalkingDataApiService.java | 46 +- .../pds/TalkingDataApiServiceImpl.java | 60 +- .../fangjia/service/pds/UsageRateService.java | 6 +- .../fangjia/service/pds/WescrApiService.java | 32 +- .../service/pds/WescrApiServiceImpl.java | 74 +- .../pds/address/AddressGradeServiceImpl.java | 12 +- .../com/fangjia/service/pds/api/Card.java | 6 +- .../fangjia/service/pds/api/CreditCard.java | 4 +- .../fangjia/service/pds/api/DebitCard.java | 6 +- .../service/pds/api/FinancialPicture.java | 10 +- .../fangjia/service/pds/api/LeakBlack.java | 2 +- .../com/fangjia/service/pds/api/Loan.java | 6 +- .../service/pds/api/TalkingDataApiUtils.java | 12 +- .../pds/api/liantong/LianTongApiTest.java | 8 +- .../pds/api/liantong/LianTongApiUtils.java | 26 +- .../pds/api/suanhua/SuanHuaApiTest.java | 14 +- .../pds/api/suanhua/SuanHuaApiUtils.java | 34 +- .../pds/api/yinlian/HttpRequestUtil.java | 4 +- .../service/pds/api/yinlian/RSAUtil.java | 162 +- .../service/pds/api/yinlian/SM3Util.java | 18 +- .../pds/api/yinlian/SSLContextFactory.java | 2 +- .../api/yinlian/SSLProtocolSocketFactory.java | 2 +- .../pds/api/yinlian/TrustAnyTrustManager.java | 2 +- .../service/pds/api/yinlian/YLCommonUtil.java | 7080 ++++---- .../pds/api/yinlian/YinLianApiTest.java | 42 +- .../pds/api/yinlian/YinLianApiUtils.java | 72 +- .../pds/api/yizhangtong/DataSecurityUtil.java | 12 +- .../pds/api/yizhangtong/HttpRequestUtil.java | 14 +- .../api/yizhangtong/SSLContextFactory.java | 2 +- .../yizhangtong/SSLProtocolSocketFactory.java | 2 +- .../api/yizhangtong/TrustAnyTrustManager.java | 2 +- .../pds/api/yizhangtong/YZTCommonUtil.java | 640 +- .../api/yizhangtong/YiZhangTongApiTest.java | 64 +- .../api/yizhangtong/YiZhangTongApiUtils.java | 106 +- .../pds/enums/LianTongApiCallLimitEnum.java | 18 +- .../pds/enums/RequestApiLimitEnum.java | 18 +- .../pds/enums/SuanhuaApiCallLimitEnum.java | 10 +- .../enums/YiZhangTongApiCallLimitEnum.java | 36 +- ...YiZhangTongApiValidateRtCodeLimitEnum.java | 12 +- .../pds/enums/YinLianApiCallLimitEnum.java | 16 +- .../pds/enums/YinLianApiIdsTypeLimitEnum.java | 18 +- .../pds/enums/YinLianApiPreAuthLimitEnum.java | 8 +- .../YinLianApiValidateRtCodeLimitEnum.java | 20 +- .../fangjia/service/ppc/PpcMapService.java | 26 +- .../service/query/FileDataDetailQuery.java | 10 +- .../service/seo/KeywordsBaiduService.java | 20 +- .../fangjia/service/sms/EmppSmsService.java | 2 +- .../com/fangjia/service/sms/SmsService.java | 20 +- .../service/sothis/util/TemplateUtils.java | 76 +- .../service/sql/ApiProductService.java | 4 +- .../service/sql/ApiPurchaseRecordService.java | 4 +- .../sql/ApiUserAccountServiceImpl.java | 2 +- .../fangjia/service/sql/ApiUserService.java | 10 +- .../service/sql/ApiUserServiceImpl.java | 6 +- .../service/sql/EvaluationRateService.java | 28 +- .../sql/EvaluationRateServiceImpl.java | 516 +- .../service/sql/FjtEvaluationService.java | 2 +- .../service/sql/FjtEvaluationServiceImpl.java | 2 +- .../fangjia/service/sql/FjtUsersService.java | 6 +- .../service/sql/FjtUsersServiceImpl.java | 2 +- .../fangjia/service/sql/IdMobileService.java | 4 +- .../service/sql/IdMobileServiceImpl.java | 4 +- .../service/sql/PurchaseRecordService.java | 10 +- .../service/sql/TransactionLogService.java | 4 +- .../com/fangjia/service/sql/UserService.java | 22 +- .../service/sql/UserTradesServiceImpl.java | 2 +- .../fangjia/service/stage/package-info.java | 4 +- .../fangjia/service/tool/OpenLogService.java | 2 +- .../service/tool/ToolClickDetailService.java | 4 +- .../service/trend/TrendViewFactory.java | 4 +- .../service/user/UsersInfoService.java | 90 +- .../service/user/UsersInfoServiceImpl.java | 8 +- .../service/util/ABYun/ABuYunUtil.java | 240 +- .../service/util/ABYun/SSLURLConnection.java | 2 +- .../com/fangjia/service/util/AmapUtil.java | 86 +- .../com/fangjia/service/util/AsyncThread.java | 2 +- .../fangjia/service/util/AveragerUtil.java | 2 +- .../com/fangjia/service/util/CharTree.java | 38 +- .../com/fangjia/service/util/CheckUtils.java | 20 +- .../com/fangjia/service/util/ChineseUtil.java | 10 +- .../com/fangjia/service/util/CommonUtil.java | 30 +- .../com/fangjia/service/util/CommonUtils.java | 2 +- .../com/fangjia/service/util/CookieUtils.java | 2 +- .../fangjia/service/util/DataConvertUtil.java | 12 +- .../com/fangjia/service/util/DesUtils.java | 48 +- .../service/util/DistrictScoreUtil.java | 266 +- .../service/util/EvaluateParamMap.java | 102 +- .../fangjia/service/util/EvaluationUtil.java | 44 +- .../fangjia/service/util/FangjiaApiUtil.java | 6 +- .../com/fangjia/service/util/GeoUtils.java | 10 +- .../com/fangjia/service/util/KeyWordLink.java | 70 +- .../com/fangjia/service/util/LoanUtil.java | 76 +- .../com/fangjia/service/util/PdsAPIs.java | 78 +- .../fangjia/service/util/PdsConstants.java | 84 +- .../fangjia/service/util/PhoneNormalizer.java | 26 +- .../fangjia/service/util/ReflectClass3.java | 6 +- .../service/util/ValueConvertUtil.java | 26 +- .../fangjia/service/web/AddressService.java | 58 +- .../service/web/AddressServiceImpl.java | 1568 +- .../service/web/FangjiaHighlighter.java | 10 +- .../service/web/FangjiaInternalLinksUtil.java | 8 +- .../com/fangjia/service/web/MenuService.java | 44 +- .../fangjia/service/web/MenuServiceImpl.java | 26 +- .../fangjia/service/web/ParameterParser.java | 8 +- .../service/web/YdDealPriceService.java | 16 +- .../service/weixin/PostImageMessage.java | 2 +- .../fangjia/service/weixin/PostMessage.java | 2 +- .../service/weixin/PostNewsMessage.java | 2 +- .../service/weixin/PostTextMessage.java | 2 +- .../service/weixin/ReceivedEventMessage.java | 2 +- .../weixin/ReceivedLocationMessage.java | 10 +- .../service/weixin/ReceivedMessage.java | 10 +- .../weixin/ReceivedSubscribeMessage.java | 2 +- .../service/weixin/ReceivedTextMessage.java | 2 +- .../service/weixin/TextImageMessage.java | 2 +- .../service/weixin/WeixinHttpsSetvice.java | 4 +- .../service/weixin/WeixinUserUtils.java | 32 +- .../fangjia/service/weixin/WeixinUtils.java | 10 +- .../stage/controllers/ContactController.java | 6 +- .../fangjia/stage/controllers/Controller.java | 56 +- .../stage/util/CosineSimilarAlgorithm.java | 40 +- .../main/java/com/fangjia/stc/FileDao.java | 8 +- .../java/com/fangjia/stc/FileDownloader.java | 2 +- .../java/com/fangjia/stc/GetFileServlet.java | 34 +- .../com/fangjia/stc/GetFileServlet_BAK.java | 16 +- .../com/fangjia/stc2/GetFileServlet2.java | 28 +- .../java/com/fangjia/stc2/GridFsServlet.java | 16 +- .../dal/mongo/model/BusinessCircle.java | 2 +- .../geluke/dal/mongo/model/GlkFeedback.java | 2 +- .../geluke/dal/mongo/model/ServerArea.java | 8 +- .../geluke/dal/mongo/model/ShopInfoStat.java | 4 +- .../geluke/service/OpenSearchServiceImpl.java | 2 +- .../com/fangjia/geluke/FangjiaConfig.java | 16 +- .../geluke/controllers/CompanyController.java | 4 +- .../controllers/DistrictChartController.java | 2 +- .../geluke/controllers/HelpController.java | 6 +- .../geluke/controllers/MapController.java | 202 +- .../geluke/controllers/UserController.java | 4 +- .../geluke/filters/AccessLogFilter.java | 4 +- .../fangjia/geluke/filters/AnalyticsBean.java | 44 +- .../geluke/filters/AnalyticsFilter.java | 14 +- .../geluke/filters/SpiderValidateFilter.java | 24 +- .../com/fangjia/geluke/model/BaseModel.java | 2 +- .../fangjia/geluke/model/DistrictModel.java | 2 +- .../geluke/servlet/RandomCodeServlet.java | 4 +- .../com/fangjia/geluke/test/GeoHelper.java | 8 +- .../java/com/fangjia/geluke/test/JWD.java | 30 +- .../java/com/fangjia/geluke/test/LatLon.java | 16 +- .../com/fangjia/geluke/util/CityUtils.java | 18 +- .../fangjia/geluke/util/InsidePolygon.java | 10 +- .../java/org/sothis/core/beans/Autowire.java | 10 +- .../main/java/org/sothis/core/beans/Bean.java | 6 +- .../org/sothis/core/beans/BeanFactory.java | 24 +- .../java/org/sothis/core/beans/Scope.java | 8 +- .../java/org/sothis/core/util/ClassUtils.java | 8 +- .../org/sothis/core/util/CollectionUtils.java | 8 +- .../java/org/sothis/core/util/GZIPUtils.java | 16 +- .../java/org/sothis/core/util/MapUtils.java | 4 +- .../core/util/PropertiesConfiguration.java | 4 +- .../java/org/sothis/core/util/UrlUtils.java | 16 +- .../org/sothis/core/util/ClassUtilsTest.java | 4 +- .../org/sothis/core/util/MapUtilsTest.java | 8 +- .../java/org/sothis/core/util/PagerTest.java | 8 +- .../util/PropertiesConfigurationTest.java | 14 +- .../org/sothis/core/util/UrlUtilsTest.java | 24 +- .../main/java/org/sothis/web/mvc/Action.java | 16 +- .../java/org/sothis/web/mvc/ActionBase.java | 4 +- .../org/sothis/web/mvc/ActionContext.java | 60 +- .../org/sothis/web/mvc/ActionInvocation.java | 12 +- .../java/org/sothis/web/mvc/ActionMapper.java | 20 +- .../java/org/sothis/web/mvc/Controller.java | 32 +- .../org/sothis/web/mvc/DefaultAction.java | 2 +- .../web/mvc/DefaultActionInvocation.java | 2 +- .../sothis/web/mvc/DefaultActionMapper.java | 2 +- .../org/sothis/web/mvc/DefaultController.java | 2 +- .../web/mvc/DefaultModelAndViewResolver.java | 2 +- .../java/org/sothis/web/mvc/EmptyAction.java | 2 +- .../org/sothis/web/mvc/EmptyController.java | 2 +- .../main/java/org/sothis/web/mvc/Flash.java | 6 +- .../java/org/sothis/web/mvc/Interceptor.java | 10 +- .../java/org/sothis/web/mvc/ModelAndView.java | 16 +- .../sothis/web/mvc/ModelAndViewResolver.java | 14 +- .../sothis/web/mvc/ModelAndViewSupport.java | 16 +- .../sothis/web/mvc/ResolvedModelAndView.java | 2 +- .../sothis/web/mvc/ServletBeanFactory.java | 10 +- .../main/java/org/sothis/web/mvc/View.java | 6 +- .../org/sothis/web/mvc/annotation/Ignore.java | 8 +- .../org/sothis/web/mvc/annotation/Param.java | 6 +- .../interceptors/FileUploadInterceptor.java | 2 +- .../interceptors/ParametersInterceptor.java | 4 +- .../web/mvc/rewrite2/UrlRewriteParser2.java | 4 +- .../urlrewrite/AbstractUrlRewriteMapper.java | 14 +- .../sothis/web/mvc/urlrewrite/RewriteTo.java | 4 +- .../sothis/web/mvc/urlrewrite/UrlRewrite.java | 32 +- .../WrappedHttpServletResponse.java | 2 +- .../org/sothis/web/mvc/util/MvcUtils.java | 4 +- .../mvc/views/freemarker/JsonDirective.java | 2 +- .../org/sothis/web/mvc/views/xml/Student.java | 2 +- .../views/xml/converter/XmlConverterImpl.java | 2 +- .../web/mvc/DefaultActionMapperTest.java | 10 +- .../org/sothis/web/mvc/DefaultActionTest.java | 2 +- .../sothis/web/mvc/DefaultControllerTest.java | 10 +- .../mvc/DefaultModelAndViewResolverTest.java | 4 +- .../org/sothis/web/mvc/EmptyActionTest.java | 4 +- .../sothis/web/mvc/EmptyControllerTest.java | 10 +- .../ParametersInterceptorTest.java | 30 +- .../interceptors/PrepareInterceptorTest.java | 22 +- .../web/mvc/rewrite2/UrlRewrite2Test.java | 112 +- .../web/mvc/urlrewrite/RewriteToTest.java | 4 +- .../WrappedHttpServletRequestTest.java | 10 +- .../WrappedHttpServletResponseTest.java | 10 +- .../org/sothis/web/mvc/util/MvcUtilsTest.java | 20 +- .../controllers/SeawaterController.java | 2 +- .../fangjia/weixin/filters/AnalyticsBean.java | 44 +- .../weixin/filters/AnalyticsFilter.java | 2 +- .../com/fangjia/weixin/util/CookieName.java | 24 +- 5195 files changed, 121754 insertions(+), 121754 deletions(-) diff --git a/deliverables/script/pom.xml b/deliverables/script/pom.xml index ada5f00bf..dd64b628e 100644 --- a/deliverables/script/pom.xml +++ b/deliverables/script/pom.xml @@ -7,7 +7,7 @@ 0.0.1-SNAPSHOT script - GBK + UTF-8 script diff --git a/projects/Selenium/src/test/java/FetchPageToDB.java b/projects/Selenium/src/test/java/FetchPageToDB.java index b25a871a0..1ff6affa0 100644 --- a/projects/Selenium/src/test/java/FetchPageToDB.java +++ b/projects/Selenium/src/test/java/FetchPageToDB.java @@ -24,18 +24,18 @@ public class FetchPageToDB { private StringBuffer verificationErrors = new StringBuffer(); private Set URLset = new HashSet(); - private String baseUrl = "http://bol.szhome.com/";//基础url - private String firstEndUrl = "/search.aspx";//用基础url拼接成进入页面第一个URl - private String detailStartUrl = "";//把它作为前置Url拼接A标记的href, - static final String CITY = "深圳";//城市 - static final String SITE_NAME = "深圳房地产信息网";//网站名称 - static final String PAGE_NAME = "详细信息";//页面类型 + private String baseUrl = "http://bol.szhome.com/";//鍩虹url + private String firstEndUrl = "/search.aspx";//鐢ㄥ熀纭�url鎷兼帴鎴愯繘鍏ラ〉闈㈢涓�涓猆Rl + private String detailStartUrl = "";//鎶婂畠浣滀负鍓嶇疆Url鎷兼帴A鏍囪鐨刪ref锛� + static final String CITY = "娣卞湷";//鍩庡競 + static final String SITE_NAME = "娣卞湷鎴垮湴浜т俊鎭綉";//缃戠珯鍚嶇О + static final String PAGE_NAME = "璇︾粏淇℃伅";//椤甸潰绫诲瀷 static final String CATEGORY = "district"; - static final String charset = "utf-8";//编码格式utf-8 - static final String nextPageStr = ">";//下一页按钮的文本内容一般为:“下一页”or">" - static final int BreakPointpageCount = 1; //断点位置页数(即为开始页) - static final int pageCount = 200; //分页总数 - static final String selectAeleStr = ".imgdiv a";//每页内容中选择到详细页面url标记 + static final String charset = "utf-8";//缂栫爜鏍煎紡utf-8 + static final String nextPageStr = ">";//涓嬩竴椤垫寜閽殑鏂囨湰鍐呭涓�鑸负锛氣�滀笅涓�椤碘�漮r">" + static final int BreakPointpageCount = 1; //鏂偣浣嶇疆椤垫暟锛堝嵆涓哄紑濮嬮〉锛� + static final int pageCount = 200; //鍒嗛〉鎬绘暟 + static final String selectAeleStr = ".imgdiv a";//姣忛〉鍐呭涓�夋嫨鍒拌缁嗛〉闈rl鏍囪 @Before public void setUp() throws Exception { @@ -50,25 +50,25 @@ public class FetchPageToDB { driver.get(baseUrl + firstEndUrl); - dryRun(driver,BreakPointpageCount);//空跑到断点页面 - fetchDetail(driver);//获取第一个页面的内容 + dryRun(driver,BreakPointpageCount);//绌鸿窇鍒版柇鐐归〉闈� + fetchDetail(driver);//鑾峰彇绗竴涓〉闈㈢殑鍐呭 - System.out.printf("处理完成第%d页\r\n",BreakPointpageCount); + System.out.printf("澶勭悊瀹屾垚绗�%d椤礬r\n",BreakPointpageCount); - for(int i=BreakPointpageCount+1;i<=pageCount;i++) { //循环分页处理页面内容 + for(int i=BreakPointpageCount+1;i<=pageCount;i++) { //寰幆鍒嗛〉澶勭悊椤甸潰鍐呭 Thread.sleep(500); WebDriverWait webDriverWait = new WebDriverWait(driver, 10); webDriverWait.until(ExpectedConditions.presenceOfElementLocated(By.linkText(nextPageStr))).click(); fetchDetail(driver); - System.out.printf("处理完成第%d页\r\n",i); + System.out.printf("澶勭悊瀹屾垚绗�%d椤礬r\n",i); } } /** - * 空跑到上一个发生错误的页面 + * 绌鸿窇鍒颁笂涓�涓彂鐢熼敊璇殑椤甸潰 * @param driver * @param BreakPointpageCount * @throws InterruptedException @@ -87,7 +87,7 @@ public class FetchPageToDB { } /** - * 获取页面详细内容保存到数据库 + * 鑾峰彇椤甸潰璇︾粏鍐呭淇濆瓨鍒版暟鎹簱 * @param driver */ public void fetchDetail(WebDriver driver){ @@ -101,7 +101,7 @@ public class FetchPageToDB { } String detailContent = InvokeHttpRequest.get(detailUrl, charset,null); URLset.add(detailUrl); - SaveToWebpage.DataSaveToWebpage(CITY, SITE_NAME, PAGE_NAME, CATEGORY, detailUrl, detailContent);//保存数据 + SaveToWebpage.DataSaveToWebpage(CITY, SITE_NAME, PAGE_NAME, CATEGORY, detailUrl, detailContent);//淇濆瓨鏁版嵁 } } @After diff --git a/projects/Selenium/src/test/java/FetchPageUtil.java b/projects/Selenium/src/test/java/FetchPageUtil.java index d6cead1b4..da823ce6e 100644 --- a/projects/Selenium/src/test/java/FetchPageUtil.java +++ b/projects/Selenium/src/test/java/FetchPageUtil.java @@ -22,7 +22,7 @@ public class FetchPageUtil { /** - * 打印传入页面渲染后的源码 + * 鎵撳嵃浼犲叆椤甸潰娓叉煋鍚庣殑婧愮爜 * @param url * @throws InterruptedException */ @@ -33,7 +33,7 @@ public class FetchPageUtil { driver.quit(); } /** - * 打印页面源码和选择器匹配后的结果 + * 鎵撳嵃椤甸潰婧愮爜鍜岄�夋嫨鍣ㄥ尮閰嶅悗鐨勭粨鏋� * @param url * @param selectStr * @throws InterruptedException @@ -46,7 +46,7 @@ public class FetchPageUtil { driver.quit(); } /** - * 测试分页是否正常运行 + * 娴嬭瘯鍒嗛〉鏄惁姝e父杩愯 * @param url * @param nextStr * @throws InterruptedException @@ -75,8 +75,8 @@ public class FetchPageUtil { } @Test public void runMain() throws InterruptedException{ - //printPageSource("http://bol.szhome.com/search.aspx");//第一步,查看分页的渲染后源码 - printselects("http://bol.szhome.com/search.aspx",".imgdiv a");//根据源码写出选择器String - //TestNext("http://bol.szhome.com/search.aspx",">");//测试分页 + //printPageSource("http://bol.szhome.com/search.aspx");//绗竴姝ワ紝鏌ョ湅鍒嗛〉鐨勬覆鏌撳悗婧愮爜 + printselects("http://bol.szhome.com/search.aspx",".imgdiv a");//鏍规嵁婧愮爜鍐欏嚭閫夋嫨鍣⊿tring + //TestNext("http://bol.szhome.com/search.aspx",">");//娴嬭瘯鍒嗛〉 } } diff --git a/projects/Selenium/src/test/java/JQueryUtils.java b/projects/Selenium/src/test/java/JQueryUtils.java index f7d9091fd..63a5c8317 100644 --- a/projects/Selenium/src/test/java/JQueryUtils.java +++ b/projects/Selenium/src/test/java/JQueryUtils.java @@ -46,7 +46,7 @@ public class JQueryUtils { try{ if(repeatTimes>0){ Thread.sleep(1000); - System.out.println( "准备尝试第"+(repeatTimes+1)+"次请求:$url"); + System.out.println( "鍑嗗灏濊瘯绗�"+(repeatTimes+1)+"娆¤姹�:$url"); } doc = Jsoup.parse(new URL(url), 5*1000); if(doc != null){ @@ -58,7 +58,7 @@ public class JQueryUtils { } if(doc==null){ - System.out.println("检测到不可访问链接:$url"); + System.out.println("妫�娴嬪埌涓嶅彲璁块棶閾炬帴:$url"); } return doc; } @@ -69,7 +69,7 @@ public class JQueryUtils { try{ if(repeatTimes>0){ Thread.sleep(1000); - System.out.println("准备尝试第"+(repeatTimes+1)+"次请求:$url"); + System.out.println("鍑嗗灏濊瘯绗�"+(repeatTimes+1)+"娆¤姹�:$url"); } URL _url = new URL(url); input = _url.openStream(); @@ -92,7 +92,7 @@ public class JQueryUtils { } if(doc==null){ - System.out.println("检测到不可访问链接:$url"); + System.out.println("妫�娴嬪埌涓嶅彲璁块棶閾炬帴:$url"); } return doc; } diff --git a/projects/Selenium/src/test/java/SaveToWebpage.java b/projects/Selenium/src/test/java/SaveToWebpage.java index 8a370dea3..c7e79c19f 100644 --- a/projects/Selenium/src/test/java/SaveToWebpage.java +++ b/projects/Selenium/src/test/java/SaveToWebpage.java @@ -70,7 +70,7 @@ public class SaveToWebpage { } /** - * 压缩 + * 鍘嬬缉 * * @param content * @return diff --git a/projects/chafangtong-dal/pom.xml b/projects/chafangtong-dal/pom.xml index afed2c105..67a90e17a 100644 --- a/projects/chafangtong-dal/pom.xml +++ b/projects/chafangtong-dal/pom.xml @@ -7,7 +7,7 @@ 0.0.1-SNAPSHOT chafangtong-dal - GBK + UTF-8 chafangtong-dal @@ -19,7 +19,7 @@ 1.6 1.6 - GBK + UTF-8 diff --git a/projects/chafangtong-dal/src/main/java/com/fangjia/chafangtong/dal/mongo/model/FpkApplyCount.java b/projects/chafangtong-dal/src/main/java/com/fangjia/chafangtong/dal/mongo/model/FpkApplyCount.java index 596b70edd..9217c3cc8 100644 --- a/projects/chafangtong-dal/src/main/java/com/fangjia/chafangtong/dal/mongo/model/FpkApplyCount.java +++ b/projects/chafangtong-dal/src/main/java/com/fangjia/chafangtong/dal/mongo/model/FpkApplyCount.java @@ -10,7 +10,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 房评卡用户反馈表 + * 鎴胯瘎鍗$敤鎴峰弽棣堣〃 * */ @Entity diff --git a/projects/chafangtong-dal/src/main/java/com/fangjia/chafangtong/dal/mongo/model/FpkDownload.java b/projects/chafangtong-dal/src/main/java/com/fangjia/chafangtong/dal/mongo/model/FpkDownload.java index ba403c2b2..b1cd97784 100644 --- a/projects/chafangtong-dal/src/main/java/com/fangjia/chafangtong/dal/mongo/model/FpkDownload.java +++ b/projects/chafangtong-dal/src/main/java/com/fangjia/chafangtong/dal/mongo/model/FpkDownload.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 房评卡报告下载记录表 + * 鎴胯瘎鍗℃姤鍛婁笅杞借褰曡〃 * */ @Entity @@ -25,9 +25,9 @@ public class FpkDownload implements MongoEntity { private String city; private String region; private String districtName; - private int actionType;//1:住宅 2:商铺 - private int valid; //0:有效 1:无效 - // TODO 按需求加字段 如:报告的一些信息 + private int actionType;//1:浣忓畢 2锛氬晢閾� + private int valid; //0锛氭湁鏁� 1锛氭棤鏁� + // TODO 鎸夐渶姹傚姞瀛楁 濡傦細鎶ュ憡鐨勪竴浜涗俊鎭� private Date downloadDate; private String userName; private String roleName; diff --git a/projects/chafangtong-dal/src/main/java/com/fangjia/chafangtong/dal/mongo/model/FpkFeedback.java b/projects/chafangtong-dal/src/main/java/com/fangjia/chafangtong/dal/mongo/model/FpkFeedback.java index 6b04a11fa..9a2e9c21c 100644 --- a/projects/chafangtong-dal/src/main/java/com/fangjia/chafangtong/dal/mongo/model/FpkFeedback.java +++ b/projects/chafangtong-dal/src/main/java/com/fangjia/chafangtong/dal/mongo/model/FpkFeedback.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 房评卡用户反馈表 + * 鎴胯瘎鍗$敤鎴峰弽棣堣〃 * */ @Entity diff --git a/projects/chafangtong-dal/src/main/java/com/fangjia/chafangtong/dal/mongo/model/FpkMenu.java b/projects/chafangtong-dal/src/main/java/com/fangjia/chafangtong/dal/mongo/model/FpkMenu.java index 694925e40..b47b4b112 100644 --- a/projects/chafangtong-dal/src/main/java/com/fangjia/chafangtong/dal/mongo/model/FpkMenu.java +++ b/projects/chafangtong-dal/src/main/java/com/fangjia/chafangtong/dal/mongo/model/FpkMenu.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 房评卡菜单表 + * 鎴胯瘎鍗¤彍鍗曡〃 * */ @Entity @@ -20,10 +20,10 @@ public class FpkMenu implements MongoEntity { private static final long serialVersionUID = -6309545731097038246L; private String id; - private String name; // 名称 - private String type; // 类型 目前分住宅、商铺 - private String uri; // 访问地址 如:/local/shop - private int sn; // 序号 从小到大排序 + private String name; // 鍚嶇О + private String type; // 绫诲瀷 鐩墠鍒嗕綇瀹呫�佸晢閾� + private String uri; // 璁块棶鍦板潃 濡傦細/local/shop + private int sn; // 搴忓彿 浠庡皬鍒板ぇ鎺掑簭 private Date creationDate; private Date modificationDate; diff --git a/projects/chafangtong-dal/src/main/java/com/fangjia/chafangtong/dal/mongo/model/FpkRole.java b/projects/chafangtong-dal/src/main/java/com/fangjia/chafangtong/dal/mongo/model/FpkRole.java index 685e9d664..21204cc49 100644 --- a/projects/chafangtong-dal/src/main/java/com/fangjia/chafangtong/dal/mongo/model/FpkRole.java +++ b/projects/chafangtong-dal/src/main/java/com/fangjia/chafangtong/dal/mongo/model/FpkRole.java @@ -12,7 +12,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 角色 + * 瑙掕壊 * */ @Entity @@ -21,9 +21,9 @@ public class FpkRole implements MongoEntity { private static final long serialVersionUID = 6346725824282407782L; private String id; - private String name; // 名称 - private String desc; // 描述 - private List menuStrs; // 权限菜单 有序 + private String name; // 鍚嶇О + private String desc; // 鎻忚堪 + private List menuStrs; // 鏉冮檺鑿滃崟 鏈夊簭 private Date creationDate; private Date modificationDate; diff --git a/projects/chafangtong-dal/src/main/java/com/fangjia/chafangtong/dal/mongo/model/FpkUsers.java b/projects/chafangtong-dal/src/main/java/com/fangjia/chafangtong/dal/mongo/model/FpkUsers.java index 3b42b3f88..3299e59a1 100644 --- a/projects/chafangtong-dal/src/main/java/com/fangjia/chafangtong/dal/mongo/model/FpkUsers.java +++ b/projects/chafangtong-dal/src/main/java/com/fangjia/chafangtong/dal/mongo/model/FpkUsers.java @@ -12,7 +12,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 房评卡用户表 + * 鎴胯瘎鍗$敤鎴疯〃 * */ @Entity @@ -26,10 +26,10 @@ public class FpkUsers implements MongoEntity { private String name; private String password; private boolean enabled; - private String role; // 用户类型 - private Date creationDate; // 创建日期 - private Date modificationDate; // 修改日期 - private Date expiryDate; // 有效期(截至日期) + private String role; // 鐢ㄦ埛绫诲瀷 + private Date creationDate; // 鍒涘缓鏃ユ湡 + private Date modificationDate; // 淇敼鏃ユ湡 + private Date expiryDate; // 鏈夋晥鏈燂紙鎴嚦鏃ユ湡锛� private int fangpingApplyAdd; private int fangpingApplyCount; private int fangpingDownloadCount; @@ -37,8 +37,8 @@ public class FpkUsers implements MongoEntity { private int shopApplyCount; private int shopDownloadCount; private String company; - private List propertySupportCitys; // 住宅开通城市 - private List shopSupportCitys; //商铺开通城市 + private List propertySupportCitys; // 浣忓畢寮�閫氬煄甯� + private List shopSupportCitys; //鍟嗛摵寮�閫氬煄甯� private String email; private String defaultCity; diff --git a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/ChafangtongContextLoaderListener.java b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/ChafangtongContextLoaderListener.java index 0daa1db19..4255162ee 100644 --- a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/ChafangtongContextLoaderListener.java +++ b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/ChafangtongContextLoaderListener.java @@ -32,7 +32,7 @@ public class ChafangtongContextLoaderListener extends ContextLoaderListener { } super.contextInitialized(event); - // 预热 + // 棰勭儹 if (LOGGER.isInfoEnabled()) { LOGGER.info("warm up keyword links..."); } diff --git a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/AroundController.java b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/AroundController.java index d10585db8..659a50633 100644 --- a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/AroundController.java +++ b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/AroundController.java @@ -30,7 +30,7 @@ import com.fangjia.dal.seaweed.model.District; import com.fangjia.service.mongo.fangjia.BusStationService; /** - * 环境指数 + * 鐜鎸囨暟 * @author yk * */ @@ -54,13 +54,13 @@ public class AroundController extends BaseController { double lng = district.getLng2()/10000000000d; double radius = getRadius(); Map> stationMap = busStationService.getNearByStations(city, lat, lng, radius); - model.setMetroStations(stationMap.get("地铁")); - model.setBusStations(stationMap.get("公交")); + model.setMetroStations(stationMap.get("鍦伴搧")); + model.setBusStations(stationMap.get("鍏氦")); - String[] ks = new String[] { "医院", "学校", "写字楼", "银行", "ATM", "超市", "停车场", "公园", "机场", "网吧" }; + String[] ks = new String[] { "鍖婚櫌", "瀛︽牎", "鍐欏瓧妤�", "閾惰", "ATM", "瓒呭競", "鍋滆溅鍦�", "鍏洯", "鏈哄満", "缃戝惂" }; - //厌恶设施 - String[] keys = new String[]{"发电厂","变电站","垃圾焚烧厂","化工厂"}; + //鍘屾伓璁炬柦 + String[] keys = new String[]{"鍙戠數鍘�","鍙樼數绔�","鍨冨溇鐒氱儳鍘�","鍖栧伐鍘�"}; Map countMap = new HashMap(ks.length); for (int i = 0; i < ks.length; i++) { @@ -71,24 +71,24 @@ public class AroundController extends BaseController { JSONObject json = baiduApiService.searchNearby(keys[i], lat, lng, 1000, model.getBaiduMapKey()); countMap.put(keys[i], getTotal(json)); } - countMap.put("地铁站", null == model.getMetroStations() ? null : model.getMetroStations().size()); - countMap.put("公交点", null == model.getBusStations() ? null : model.getBusStations().size()); + countMap.put("鍦伴搧绔�", null == model.getMetroStations() ? null : model.getMetroStations().size()); + countMap.put("鍏氦鐐�", null == model.getBusStations() ? null : model.getBusStations().size()); - // 虹桥机场 121.352578,31.200062 - // 浦东机场 121.807085,31.160702 + // 铏规ˉ鏈哄満 121.352578,31.200062 + // 娴︿笢鏈哄満 121.807085,31.160702 double dis = GeoUtils.calculateDistance(lng, lat, 121.352578, 31.200062); if (dis <= radius) { - model.setAirPort("虹桥机场"); + model.setAirPort("铏规ˉ鏈哄満"); model.setAirPortLat(31.200062); model.setAirPortLng(121.352578); - countMap.put("机场", 1); + countMap.put("鏈哄満", 1); } else { dis = GeoUtils.calculateDistance(lng, lat, 121.807085, 31.160702); if (dis <= radius) { - model.setAirPort("浦东机场"); + model.setAirPort("娴︿笢鏈哄満"); model.setAirPortLat(31.160702); model.setAirPortLng(121.807085); - countMap.put("机场", 1); + countMap.put("鏈哄満", 1); } } @@ -120,22 +120,22 @@ public class AroundController extends BaseController { double lng = mall.getLng2()/10000000000d; double radius = getRadius(); Map> stationMap = busStationService.getNearByStations(city, lat, lng, radius); - model.setMetroStations(stationMap.get("地铁")); - model.setBusStations(stationMap.get("公交")); + model.setMetroStations(stationMap.get("鍦伴搧")); + model.setBusStations(stationMap.get("鍏氦")); - String[] ks = new String[] { "医院", "公园", "学校", "体育馆" }; + String[] ks = new String[] { "鍖婚櫌", "鍏洯", "瀛︽牎", "浣撹偛棣�" }; Map countMap = new HashMap(ks.length); for (int i = 0; i < ks.length; i++) { JSONObject json = baiduApiService.searchNearby(ks[i], lat, lng, radius, model.getBaiduMapKey()); countMap.put(ks[i], getTotal(json)); } - countMap.put("地铁站", null == model.getMetroStations() ? null : model.getMetroStations().size()); - countMap.put("公交点", null == model.getBusStations() ? null : model.getBusStations().size()); + countMap.put("鍦伴搧绔�", null == model.getMetroStations() ? null : model.getMetroStations().size()); + countMap.put("鍏氦鐐�", null == model.getBusStations() ? null : model.getBusStations().size()); double score1 = ShopScoreUtil.aroundScore1(countMap); model.setScore1(score1); - ks = new String[] { "银行", "商场", "大型超市", "餐饮" }; + ks = new String[] { "閾惰", "鍟嗗満", "澶у瀷瓒呭競", "椁愰ギ" }; countMap = new HashMap(ks.length); for (int i = 0; i < ks.length; i++) { JSONObject json = baiduApiService.searchNearby(ks[i], lat, lng, radius, model.getBaiduMapKey()); diff --git a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/AutocompleteController.java b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/AutocompleteController.java index 0ef933fc8..f29098afa 100644 --- a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/AutocompleteController.java +++ b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/AutocompleteController.java @@ -123,7 +123,7 @@ public class AutocompleteController { //nameQuery.add(new TermQuery(new Term("address", keyword)), Occur.SHOULD); //nameQuery.add(new TermQuery(new Term("addr_alias_std", keyword)), Occur.SHOULD); nameQuery.add(new TermQuery(new Term("keyword", keyword)), Occur.SHOULD); - //nameQuery.add(new TermQuery(new Term("keyword_cjk", keyword)), Occur.SHOULD);//这个重要,因seaweed不支持模糊搜索,当输入"中远两"需用此进行搜索 + //nameQuery.add(new TermQuery(new Term("keyword_cjk", keyword)), Occur.SHOULD);//杩欎釜閲嶈锛屽洜seaweed涓嶆敮鎸佹ā绯婃悳绱紝褰撹緭鍏�"涓繙涓�"闇�鐢ㄦ杩涜鎼滅储 srQuery1.add(nameQuery, Occur.SHOULD); params.add(new QueryParam("$sr", new SrQuery(srQuery1))); List districts = districtService.findAllByParams(params, 0, limit, new String[] { "region", "name","address", "addrAlias" }); @@ -138,7 +138,7 @@ public class AutocompleteController { bo.setRegion(district.getRegion()); ret.add(bo); } - //对自动完成出来的结果按长短排序 + //瀵硅嚜鍔ㄥ畬鎴愬嚭鏉ョ殑缁撴灉鎸夐暱鐭帓搴� if(ret.size() > 0){ Collections.sort(ret, new Comparator() { public int compare(AutoCompleteBo o1, AutoCompleteBo o2) { diff --git a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/BaseController.java b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/BaseController.java index a2301ae88..b6cac40a2 100644 --- a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/BaseController.java +++ b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/BaseController.java @@ -104,16 +104,16 @@ public abstract class BaseController { } /** - * 根据cookie或者用户输入关键字,填充经纬度、mall信息到cookie和model + * 鏍规嵁cookie鎴栬�呯敤鎴疯緭鍏ュ叧閿瓧锛屽~鍏呯粡绾害銆乵all淇℃伅鍒癱ookie鍜宮odel */ protected void fillShop2CookieModel(ChafangtongModel model) { - // TODO 不用每次都去seaweed查询mall,可根据是否是新提交表单、存下的mallid来查,优化性能 + // TODO 涓嶇敤姣忔閮藉幓seaweed鏌ヨmall锛屽彲鏍规嵁鏄惁鏄柊鎻愪氦琛ㄥ崟銆佸瓨涓嬬殑mallid鏉ユ煡锛屼紭鍖栨�ц兘 HttpServletResponse response = ActionContext.getContext().getResponse(); String keyword = model.getQ(); if (StringUtils.isNotBlank(keyword)) { Shop mall = null; - // open地址匹配 + // open鍦板潃鍖归厤 Map resMap = addressService.parse(model.getCityName(), keyword, "shop", false); if (MapUtils.isNotEmpty(resMap)) { if (resMap.containsKey("status") && (Integer) resMap.get("status") == 0 && resMap.containsKey("precise") @@ -124,14 +124,14 @@ public abstract class BaseController { } if ("general".equals(model.getControllerName())) { - // 记录用户搜索词open匹配结果 + // 璁板綍鐢ㄦ埛鎼滅储璇峯pen鍖归厤缁撴灉 HttpServletRequest request = ActionContext.getContext().getRequest(); AddressMatchLog addressMatchLog = new AddressMatchLog(); addressMatchLog.setCity(model.getCityName()); addressMatchLog.setInput(model.getQ()); addressMatchLog.setIp(AnalyticsUtil.getIpAddress(request)); addressMatchLog.setUid(cookieContext.getCookieValue(request, "fpk_uid")); - addressMatchLog.setSource("房评卡"); + addressMatchLog.setSource("鎴胯瘎鍗�"); addressMatchLog.setUserName(cookieContext.getCookieValue(request, "fpk_name")); addressMatchLog.setCreationDate(new Date()); addressMatchLog.setModificationDate(new Date()); @@ -203,7 +203,7 @@ public abstract class BaseController { } protected void fillDistrict2CookieModel(ChafangtongModel model) { - // TODO 不用每次都去seaweed查询district,可根据是否是新提交表单、存下的districtid来查,优化性能 + // TODO 涓嶇敤姣忔閮藉幓seaweed鏌ヨdistrict锛屽彲鏍规嵁鏄惁鏄柊鎻愪氦琛ㄥ崟銆佸瓨涓嬬殑districtid鏉ユ煡锛屼紭鍖栨�ц兘 HttpServletResponse response = ActionContext.getContext().getResponse(); String keyword = model.getQ(); if (StringUtils.isNotBlank(keyword)) { diff --git a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/ConsumController.java b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/ConsumController.java index 053b172fe..977bd31be 100644 --- a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/ConsumController.java +++ b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/ConsumController.java @@ -31,7 +31,7 @@ import com.fangjia.dal.seaweed.model.District; import com.fangjia.service.mongo.fangjia.BizShopService; /** - * 消费指数 + * 娑堣垂鎸囨暟 * @author yk * */ @@ -54,7 +54,7 @@ public class ConsumController extends BaseController { double lat = district.getLat2()/10000000000d; double lng = district.getLng2()/10000000000d; double radius = getRadius(); - model.setAvgConsumption(bizShopService.findAroundAvgConsumption(lat, lng, radius, "美食")); + model.setAvgConsumption(bizShopService.findAroundAvgConsumption(lat, lng, radius, "缇庨")); double cityConsumMin = model.getCityConsumMin()!=null?model.getCityConsumMin():15; double cityConsumMax = model.getCityConsumMax()!=null?model.getCityConsumMax():150; @@ -62,7 +62,7 @@ public class ConsumController extends BaseController { model.setHigher((model.getAvgConsumption() - cityConsumMin) * 100.0 / (cityConsumMax - cityConsumMin)); } - String[] ks = new String[] { "KTV", "电影院", "健身中心", "商场", "美容院", "星级酒店","大型超市", "高尔夫球场", "私立学校", "整形", "咖啡厅", "洗浴" }; + String[] ks = new String[] { "KTV", "鐢靛奖闄�", "鍋ヨ韩涓績", "鍟嗗満", "缇庡闄�", "鏄熺骇閰掑簵","澶у瀷瓒呭競", "楂樺皵澶悆鍦�", "绉佺珛瀛︽牎", "鏁村舰", "鍜栧暋鍘�", "娲楁荡" }; Map result = baiduApiService.searchNearBy(Arrays.asList(ks), lat, lng, 1000, model.getBaiduMapKey()); Map countMap = new HashMap(ks.length); for (String k : ks) { @@ -87,13 +87,13 @@ public class ConsumController extends BaseController { // model.setAroundSell(aroundMarkers); // } double radius = getRadius(); - model.setAvgConsumption(bizShopService.findAroundAvgConsumption(lat, lng, radius, "餐厅")); + model.setAvgConsumption(bizShopService.findAroundAvgConsumption(lat, lng, radius, "椁愬巺")); double cityConsumMin = model.getCityConsumMin(); double cityConsumMax = model.getCityConsumMax(); if (null != model.getAvgConsumption()) { model.setHigher((model.getAvgConsumption() - cityConsumMin) * 100.0 / (cityConsumMax - cityConsumMin)); } - String[] ks = new String[] { "KTV", "电影院", "健身中心", "商场", "美容院", "星级酒店", "大型超市", "高尔夫球场", "私立学校", "整形", "咖啡厅", "洗浴" }; + String[] ks = new String[] { "KTV", "鐢靛奖闄�", "鍋ヨ韩涓績", "鍟嗗満", "缇庡闄�", "鏄熺骇閰掑簵", "澶у瀷瓒呭競", "楂樺皵澶悆鍦�", "绉佺珛瀛︽牎", "鏁村舰", "鍜栧暋鍘�", "娲楁荡" }; Map result = baiduApiService.searchNearBy(Arrays.asList(ks), lat, lng, 1000, model.getBaiduMapKey()); Map countMap = new HashMap(ks.length); for (String k : ks) { diff --git a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/FeedbackController.java b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/FeedbackController.java index 59d992c2a..840fec409 100644 --- a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/FeedbackController.java +++ b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/FeedbackController.java @@ -13,7 +13,7 @@ import java.util.HashMap; import java.util.Map; /** - * 意见反馈 + * 鎰忚鍙嶉 * Created by wenyan on 2015/11/24. */ public class FeedbackController { diff --git a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/GeneralController.java b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/GeneralController.java index d06ecc3cb..88d593d76 100644 --- a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/GeneralController.java +++ b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/GeneralController.java @@ -54,7 +54,7 @@ import com.fangjia.service.mongo.fangjia.DistrictHotService; import com.fangjia.service.mongo.fangjia.PricePredictService; /** - * 首页 + * 棣栭〉 * * @author yk * @@ -92,7 +92,7 @@ public class GeneralController extends BaseController { } model.setDistrict(district); - /* 坐标 */ + /* 鍧愭爣 */ double lat = district.getLat2()/10000000000d; double lng = district.getLng2()/10000000000d; double radius = getRadius(); @@ -100,16 +100,16 @@ public class GeneralController extends BaseController { String city = district.getCity(); String region = district.getRegion(); - // 房价指数 + // 鎴夸环鎸囨暟 RegionStat cityStat = regionStatService.findByCity(model.getCityName()); DistrictStatBo statBo = districtStatService.findYearPeriodStatBo(districtKey); model.setStatBo(statBo); DistrictStat stat = statBo.getDefaultDistrictStat(); String estateType = district.getEstateType2(); - if(!estateType.contains("别墅")){ - estateType = "小区"; + if(!estateType.contains("鍒")){ + estateType = "灏忓尯"; }else{ - estateType = "别墅"; + estateType = "鍒"; } List rentList = new ArrayList(); Map districtStatRents = districtStatRentService.findByDistrictStatRent(districtKey, estateType); @@ -134,13 +134,13 @@ public class GeneralController extends BaseController { model.setPriceScore(DistrictScoreUtil.priceScore2(null == stat ? null: stat.getAvgPrice(), pricelist.get(0), pricelist.get(1), rentList)); - // 潜力指数 + // 娼滃姏鎸囨暟 int avgPrice = 0; - String buildType = "小区"; + String buildType = "灏忓尯"; if (null == statBo.getDistrictStat() && null != statBo.getVillaDistrictStat()) { avgPrice = statBo.getVillaDistrictStat().getAvgPrice(); - buildType = "别墅"; + buildType = "鍒"; } else if (null != statBo.getDistrictStat()) { avgPrice = statBo.getDistrictStat().getAvgPrice(); } @@ -166,54 +166,54 @@ public class GeneralController extends BaseController { } model.setRankScore(DistrictScoreUtil.rankScore2(houseCountRatio, dealPriceCountRatio)); - // 消费指数 - Double avgConsumption = bizShopService.findAroundAvgConsumption(lat,lng, 1000, "美食"); - String[] allKw = new String[]{"KTV", "电影院", "健身中心", "商场", "美容院", "星级酒店","大型超市", "高尔夫球场", "私立学校", "整形", "咖啡厅", "洗浴","医院", - "学校", "写字楼", "银行", "ATM", "超市", "停车场", "公园","机场", "网吧", "发电厂", "变电站", "垃圾焚烧厂", "化工厂"}; + // 娑堣垂鎸囨暟 + Double avgConsumption = bizShopService.findAroundAvgConsumption(lat,lng, 1000, "缇庨"); + String[] allKw = new String[]{"KTV", "鐢靛奖闄�", "鍋ヨ韩涓績", "鍟嗗満", "缇庡闄�", "鏄熺骇閰掑簵","澶у瀷瓒呭競", "楂樺皵澶悆鍦�", "绉佺珛瀛︽牎", "鏁村舰", "鍜栧暋鍘�", "娲楁荡","鍖婚櫌", + "瀛︽牎", "鍐欏瓧妤�", "閾惰", "ATM", "瓒呭競", "鍋滆溅鍦�", "鍏洯","鏈哄満", "缃戝惂", "鍙戠數鍘�", "鍙樼數绔�", "鍨冨溇鐒氱儳鍘�", "鍖栧伐鍘�"}; Map searchResult = baiduApiService.searchNearBy(Arrays.asList(allKw), lat, lng, 1000, model.getBaiduMapKey()); - String[] ks = new String[] { "KTV", "电影院", "健身中心", "商场", "美容院", "星级酒店","大型超市", "高尔夫球场", "私立学校", "整形", "咖啡厅", "洗浴" }; + String[] ks = new String[] { "KTV", "鐢靛奖闄�", "鍋ヨ韩涓績", "鍟嗗満", "缇庡闄�", "鏄熺骇閰掑簵","澶у瀷瓒呭競", "楂樺皵澶悆鍦�", "绉佺珛瀛︽牎", "鏁村舰", "鍜栧暋鍘�", "娲楁荡" }; Map countMap = new HashMap(ks.length); for (int i = 0; i < ks.length; i++) { countMap.put(ks[i], getTotal(searchResult.get(ks[i]))); } model.setConsumScore(DistrictScoreUtil.consumScore(avgConsumption,countMap)); - // 环境指数 - ks = new String[] { "医院", "学校", "写字楼", "银行", "ATM", "超市", "停车场", "公园","机场", "网吧" }; - // 厌恶设施 - String[] keys = new String[] { "发电厂", "变电站", "垃圾焚烧厂", "化工厂" }; + // 鐜鎸囨暟 + ks = new String[] { "鍖婚櫌", "瀛︽牎", "鍐欏瓧妤�", "閾惰", "ATM", "瓒呭競", "鍋滆溅鍦�", "鍏洯","鏈哄満", "缃戝惂" }; + // 鍘屾伓璁炬柦 + String[] keys = new String[] { "鍙戠數鍘�", "鍙樼數绔�", "鍨冨溇鐒氱儳鍘�", "鍖栧伐鍘�" }; countMap = new HashMap(ks.length); for (int i = 0; i < ks.length; i++) { countMap.put(ks[i], getTotal(searchResult.get(ks[i]))); } - // 添加厌恶设施 + // 娣诲姞鍘屾伓璁炬柦 for (int i = 0; i < keys.length; i++) { countMap.put(keys[i], getTotal(searchResult.get(ks[i]))); } Map> stationMap = busStationService .getNearByStations(city, lat, lng, 1000); - countMap.put("地铁站", null == stationMap.get("地铁") ? null : stationMap - .get("地铁").size()); - countMap.put("公交点", null == stationMap.get("公交") ? null : stationMap - .get("公交").size()); + countMap.put("鍦伴搧绔�", null == stationMap.get("鍦伴搧") ? null : stationMap + .get("鍦伴搧").size()); + countMap.put("鍏氦鐐�", null == stationMap.get("鍏氦") ? null : stationMap + .get("鍏氦").size()); model.setAroundScore(DistrictScoreUtil.aroundScore(countMap)); - // 虹桥机场 121.352578,31.200062 - // 浦东机场 121.807085,31.160702 + // 铏规ˉ鏈哄満 121.352578,31.200062 + // 娴︿笢鏈哄満 121.807085,31.160702 double dis = GeoUtils .calculateDistance(lng, lat, 121.352578, 31.200062); if (dis <= radius) { - countMap.put("机场", 1); + countMap.put("鏈哄満", 1); } else { dis = GeoUtils.calculateDistance(lng, lat, 121.807085, 31.160702); if (dis <= radius) { - countMap.put("机场", 1); + countMap.put("鏈哄満", 1); } } - // 楼盘指数 + // 妤肩洏鎸囨暟 model.setDetailScore(DistrictScoreUtil.detailScore(district,seaweedNumbericDao.findDistrict(city, region,district.getName()))); double totalScore = 0d; @@ -509,12 +509,12 @@ public class GeneralController extends BaseController { double radius = getRadius(); List metros = null; List buses = null; - // 综合得分 + // 缁煎悎寰楀垎 SeaweedNumberic numberic = seaweedNumbericDao.findShop(mall.getCity(), mall.getRegion(), mall.getName()); model.setDetailScore(ShopScoreUtil.detailScore(mall, numberic)); - // 房价 + // 鎴夸环 BizRegionStat cityStat = bizRegionStatService.findCitySellPrice(mall.getCity(), weekend); DistrictStatBo statBo = shopStatService.findAllShopStat( @@ -524,22 +524,22 @@ public class GeneralController extends BaseController { null == cityStat ? null : cityStat.getAvgPrice())); model.setStatBo(statBo); - // 租金 + // 绉熼噾 BizRegionStat cityStatRent = bizRegionStatService.findCityRentPrice(mall.getCity(), weekend); DistrictBusinessStatRentBo statRentBo = districtBusinessStatRentService .findMallStatBo(new DistrictKey(mall.getCity(), mall.getRegion(), mall.getName()), weekend); model.setRentScore(ShopScoreUtil.rentScore(statRentBo,null == cityStatRent ? null : cityStatRent.getAvgPrice(), mall.getPaymentPattern())); - // 地段 + // 鍦版 Map> stationMap = busStationService .getNearByStations(mall.getCity(), lat, lng, radius); - metros = stationMap.get("地铁"); - buses = stationMap.get("公交"); + metros = stationMap.get("鍦伴搧"); + buses = stationMap.get("鍏氦"); model.setLocalScore(ShopScoreUtil.localScore(mall.getLoopLineInfo(), null == metros ? 0 : metros.size(), null == buses ? 0 : buses.size())); - // 人口 + // 浜哄彛 int cityAvgPrice = cityPriceLevelService.findCityPriceLevel(city); cityAvgPrice = cityAvgPrice == 0 ? 7000 : cityAvgPrice; @@ -547,7 +547,7 @@ public class GeneralController extends BaseController { lng, radius); int totalHouseCount = getTotalHouseCount(districts, cityAvgPrice); - // 居民人口密度 + // 灞呮皯浜哄彛瀵嗗害 double circleArea = Math.PI * Math.pow(radius / 1000.0, 2); double density = totalHouseCount * 2.49 / circleArea; double peopleScore1 = ShopScoreUtil.peopleScore1(density); @@ -556,38 +556,38 @@ public class GeneralController extends BaseController { radius); int totalOfficeCount = getTotalOfficeCount(offices); - // 办公人口 + // 鍔炲叕浜哄彛 density = totalOfficeCount / circleArea; double peopleScore2 = ShopScoreUtil.peopleScore2(density); model.setPeopleScore(peopleScore1 > peopleScore2 ? peopleScore1 : peopleScore2); - String[] allKs = new String[]{"KTV", "电影院", "健身中心", "商场", "美容院", "星级酒店","大型超市", "高尔夫球场", "私立学校", "整形", "咖啡厅", "洗浴", - "医院", "公园", "学校", "体育馆","银行", "商场", "大型超市", "餐饮" + String[] allKs = new String[]{"KTV", "鐢靛奖闄�", "鍋ヨ韩涓績", "鍟嗗満", "缇庡闄�", "鏄熺骇閰掑簵","澶у瀷瓒呭競", "楂樺皵澶悆鍦�", "绉佺珛瀛︽牎", "鏁村舰", "鍜栧暋鍘�", "娲楁荡", + "鍖婚櫌", "鍏洯", "瀛︽牎", "浣撹偛棣�","閾惰", "鍟嗗満", "澶у瀷瓒呭競", "椁愰ギ" }; Map searchResult = baiduApiService.searchNearBy(Arrays.asList(allKs), lat, lng, radius, model.getBaiduMapKey()); - // 消费 - String[] ks = new String[] { "KTV", "电影院", "健身中心", "商场", "美容院", "星级酒店","大型超市", "高尔夫球场", "私立学校", "整形", "咖啡厅", "洗浴" }; + // 娑堣垂 + String[] ks = new String[] { "KTV", "鐢靛奖闄�", "鍋ヨ韩涓績", "鍟嗗満", "缇庡闄�", "鏄熺骇閰掑簵","澶у瀷瓒呭競", "楂樺皵澶悆鍦�", "绉佺珛瀛︽牎", "鏁村舰", "鍜栧暋鍘�", "娲楁荡" }; Map countMap = new HashMap(ks.length); for (String k : ks){ countMap.put(k, getTotal(searchResult.get(k))); } - Double avgConsumption = bizShopService.findAroundAvgConsumption(lat,lng, radius, "餐厅"); + Double avgConsumption = bizShopService.findAroundAvgConsumption(lat,lng, radius, "椁愬巺"); model.setConsumScore(ShopScoreUtil.consumScore(avgConsumption, countMap)); - // 环境 - ks = new String[] { "医院", "公园", "学校", "体育馆" }; + // 鐜 + ks = new String[] { "鍖婚櫌", "鍏洯", "瀛︽牎", "浣撹偛棣�" }; countMap = new HashMap(ks.length); for (String k : ks){ countMap.put(k, getTotal(searchResult.get(k))); } - countMap.put("地铁站", null == metros ? null : metros.size()); - countMap.put("公交点", null == buses ? null : buses.size()); + countMap.put("鍦伴搧绔�", null == metros ? null : metros.size()); + countMap.put("鍏氦鐐�", null == buses ? null : buses.size()); double aroundScore1 = ShopScoreUtil.aroundScore1(countMap); - ks = new String[] { "银行", "商场", "大型超市", "餐饮" }; + ks = new String[] { "閾惰", "鍟嗗満", "澶у瀷瓒呭競", "椁愰ギ" }; countMap = new HashMap(ks.length); for (String k : ks){ countMap.put(k, getTotal(searchResult.get(k))); @@ -750,7 +750,7 @@ public class GeneralController extends BaseController { district.setAvgPrice(avgPrice); district.setKind(commData.getKind()); - if (district.getName().endsWith("村")) { + if (district.getName().endsWith("鏉�")) { oldHouseCount += count; } else { @@ -769,7 +769,7 @@ public class GeneralController extends BaseController { } return oldHouseCount + hightLevelDistrictHouseCount - + commonDistrictHouseCount;// 总户数 + + commonDistrictHouseCount;// 鎬绘埛鏁� } return 0; } @@ -846,13 +846,13 @@ public class GeneralController extends BaseController { } if (StringUtils.isNotBlank(office.getBedKind())) { - if (office.getBedKind().equals("甲级")) { + if (office.getBedKind().equals("鐢茬骇")) { bestLevelCount = bestLevelCount + office.getHouseholdCount(); - } else if (office.getBedKind().equals("乙级")) { + } else if (office.getBedKind().equals("涔欑骇")) { betterLevelCount = betterLevelCount + office.getHouseholdCount(); - } else if (office.getBedKind().equals("丙级")) { + } else if (office.getBedKind().equals("涓欑骇")) { goodLevelCount = goodLevelCount + office.getHouseholdCount(); } else { diff --git a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/LocalController.java b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/LocalController.java index 6f67812ea..e2b283ea7 100644 --- a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/LocalController.java +++ b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/LocalController.java @@ -41,12 +41,12 @@ public class LocalController extends BaseController { double lng = mall.getLng2()/10000000000.0; double radius = getRadius(); Map> stationMap = busStationService.getNearByStations(model.getCityName(), lat, lng, radius); - model.setMetroStations(stationMap.get("地铁")); - model.setBusStations(stationMap.get("公交")); - if("上海".equals(model.getCityName())){ - // 虹桥机场 121.352578,31.200062 + model.setMetroStations(stationMap.get("鍦伴搧")); + model.setBusStations(stationMap.get("鍏氦")); + if("涓婃捣".equals(model.getCityName())){ + // 铏规ˉ鏈哄満 121.352578,31.200062 model.setDisHongqiaoAirport(GeoUtils.calculateDistance(lng, lat, 121.352578, 31.200062)); - // 虹桥火车站 121.32795,31.1991 + // 铏规ˉ鐏溅绔� 121.32795,31.1991 model.setDisHongqiaoStation(GeoUtils.calculateDistance(lng, lat, 121.32795, 31.1991)); } model.setTabScore(ShopScoreUtil.localScore(mall.getLoopLineInfo(), null == model.getMetroStations() ? 0 : model diff --git a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/NodistrictController.java b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/NodistrictController.java index bc7524862..7fb3eddca 100644 --- a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/NodistrictController.java +++ b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/NodistrictController.java @@ -42,7 +42,7 @@ public class NodistrictController extends BaseController { final double lng = model.getLng(); final double radius = getRadius(); - // 周边没小区,直接返回 + // 鍛ㄨ竟娌″皬鍖猴紝鐩存帴杩斿洖 List districts = districtService.findDistrict(lat, lng, radius, model.getCityName()); if (CollectionUtils.isEmpty(districts)) { return model; @@ -54,7 +54,7 @@ public class NodistrictController extends BaseController { model.setCityPrice(cityStat.getAvgPrice()); } - // 按距离排序,由近到远 + // 鎸夎窛绂绘帓搴忥紝鐢辫繎鍒拌繙 Collections.sort(districts, new Comparator() { public int compare(District o1, District o2) { double dis1 = GeoUtils.calculateDistance(lng, lat, o1.getLng2() / 10000000000.0, o1.getLat2() / 10000000000.0); @@ -102,11 +102,11 @@ public class NodistrictController extends BaseController { model.setPriceNearest(priceNearest); - // 范围内均价 + // 鑼冨洿鍐呭潎浠� if (priceCount > 0 && stats.size() > 0) { model.setAreaPrice(priceCount / stats.size()); Map priceMap = districtStatService.getCityDistriceMinAndMaxPrice(model.getCityName()); - //设置价格 + //璁剧疆浠锋牸 model.setCityDistrictMinSellPrice(priceMap.get("cityDistrictMinSellPrice")); model.setCityDistrictMaxSellPrice(priceMap.get("cityDistrictMaxSellPrice")); @@ -124,7 +124,7 @@ public class NodistrictController extends BaseController { } } - // 由低到高排序 + // 鐢变綆鍒伴珮鎺掑簭 Collections.sort(stats, new Comparator() { public int compare(DistrictStat o1, DistrictStat o2) { return o1.getAvgPrice() - o2.getAvgPrice(); @@ -139,7 +139,7 @@ public class NodistrictController extends BaseController { } model.setPriceBtm5(priceBtm5); - // 由高到低排序 + // 鐢遍珮鍒颁綆鎺掑簭 Collections.reverse(stats); List priceTop5 = new ArrayList(5); for (DistrictStat s : stats) { @@ -158,13 +158,13 @@ public class NodistrictController extends BaseController { final double lng = model.getLng(); final double radius = getRadius(); - // 周边没小区,直接返回 + // 鍛ㄨ竟娌″皬鍖猴紝鐩存帴杩斿洖 List districts = districtService.findDistrict(lat, lng, radius, model.getCityName()); if (CollectionUtils.isEmpty(districts)) { return model; } - // 按距离排序,由近到远 + // 鎸夎窛绂绘帓搴忥紝鐢辫繎鍒拌繙 Collections.sort(districts, new Comparator() { public int compare(District o1, District o2) { double dis1 = GeoUtils.calculateDistance(lng, lat, o1.getLng2() / 10000000000.0, o1.getLat2() / 10000000000.0); @@ -325,7 +325,7 @@ public class NodistrictController extends BaseController { double lng = model.getLng(); double radius = getRadius(); - model.setAvgConsumption(bizShopService.findAroundAvgConsumption(lat, lng, radius, "餐厅")); + model.setAvgConsumption(bizShopService.findAroundAvgConsumption(lat, lng, radius, "椁愬巺")); double cityConsumMin = model.getCityConsumMin(); double cityConsumMax = model.getCityConsumMax(); @@ -342,20 +342,20 @@ public class NodistrictController extends BaseController { double lng = model.getLng(); double radius = getRadius(); Map> stationMap = busStationService.getNearByStations(city, lat, lng, radius); - model.setMetroStations(stationMap.get("地铁")); - model.setBusStations(stationMap.get("公交")); + model.setMetroStations(stationMap.get("鍦伴搧")); + model.setBusStations(stationMap.get("鍏氦")); - // 虹桥机场 121.352578,31.200062 - // 浦东机场 121.807085,31.160702 + // 铏规ˉ鏈哄満 121.352578,31.200062 + // 娴︿笢鏈哄満 121.807085,31.160702 double dis = GeoUtils.calculateDistance(lng, lat, 121.352578, 31.200062); if (dis <= radius) { - model.setAirPort("虹桥机场"); + model.setAirPort("铏规ˉ鏈哄満"); model.setAirPortLat(31.200062); model.setAirPortLng(121.352578); } else { dis = GeoUtils.calculateDistance(lng, lat, 121.807085, 31.160702); if (dis <= radius) { - model.setAirPort("浦东机场"); + model.setAirPort("娴︿笢鏈哄満"); model.setAirPortLat(31.160702); model.setAirPortLng(121.807085); } diff --git a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/NofoundController.java b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/NofoundController.java index 4dc451e6b..2f058f6ce 100644 --- a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/NofoundController.java +++ b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/NofoundController.java @@ -32,7 +32,7 @@ public class NofoundController extends BaseController { return model.redirect("/general/district?q=" + URLEncoder.encode(model.getQ(), "UTF-8")+"&cityName="+URLEncoder.encode(model.getCityName(), "UTF-8")); } - // 查询半径内小区 + // 鏌ヨ鍗婂緞鍐呭皬鍖� final double lat = model.getLat(); final double lng = model.getLng(); final double radius = getRadius(); @@ -50,7 +50,7 @@ public class NofoundController extends BaseController { return model; } - // 按距离排序,由近到远 + // 鎸夎窛绂绘帓搴忥紝鐢辫繎鍒拌繙 Collections.sort(tmpDistricts, new Comparator() { public int compare(District o1, District o2) { double dis1 = GeoUtils.calculateDistance(lng, lat, o1.getLng2() / 10000000000.0, o1.getLat2() / 10000000000.0); @@ -106,7 +106,7 @@ public class NofoundController extends BaseController { final double lat = model.getLat(); final double lng = model.getLng(); List shops = shopService.searchNearby(lat, lng, getRadius()); - // 按距离排序,由近到远 + // 鎸夎窛绂绘帓搴忥紝鐢辫繎鍒拌繙 Collections.sort(shops, new Comparator() { public int compare(Shop o1, Shop o2) { double dis1 = GeoUtils.calculateDistance(lng, lat, o1.getLng2() / 10000000000.0, o1.getLat2() / 10000000000.0); diff --git a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/NoshopController.java b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/NoshopController.java index c4bd68ccd..ad7f090d7 100644 --- a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/NoshopController.java +++ b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/NoshopController.java @@ -49,7 +49,7 @@ public class NoshopController extends BaseController { final double lng = model.getLng(); final double radius = getRadius(); - // 周边没商铺,直接返回 + // 鍛ㄨ竟娌″晢閾猴紝鐩存帴杩斿洖 List shops = shopService.searchNearby(lat, lng, radius); if (CollectionUtils.isEmpty(shops)) { return model; @@ -61,7 +61,7 @@ public class NoshopController extends BaseController { model.setCityPrice(cityStat.getAvgPrice()); } - // 按距离排序,由近到远 + // 鎸夎窛绂绘帓搴忥紝鐢辫繎鍒拌繙 Collections.sort(shops, new Comparator() { public int compare(Shop o1, Shop o2) { double dis1 = GeoUtils.calculateDistance(lng, lat, o1.getLng2() / 10000000000.0, o1.getLat2() / 10000000000.0); @@ -102,7 +102,7 @@ public class NoshopController extends BaseController { model.setPriceNearest(priceNearest); - // 范围内均价 + // 鑼冨洿鍐呭潎浠� if (priceCount > 0 && stats.size() > 0) { model.setAreaPrice(priceCount / stats.size()); @@ -120,7 +120,7 @@ public class NoshopController extends BaseController { } } - // 由低到高排序 + // 鐢变綆鍒伴珮鎺掑簭 Collections.sort(stats, new Comparator() { public int compare(DistrictStat o1, DistrictStat o2) { return o1.getAvgPrice() - o2.getAvgPrice(); @@ -135,7 +135,7 @@ public class NoshopController extends BaseController { } model.setPriceBtm5(priceBtm5); - // 由高到低排序 + // 鐢遍珮鍒颁綆鎺掑簭 Collections.reverse(stats); List priceTop5 = new ArrayList(5); for (DistrictStat s : stats) { @@ -154,7 +154,7 @@ public class NoshopController extends BaseController { final double lng = model.getLng(); final double radius = getRadius(); - // 周边没商铺,直接返回 + // 鍛ㄨ竟娌″晢閾猴紝鐩存帴杩斿洖 List shops = shopService.searchNearby(lat, lng, radius); if (CollectionUtils.isEmpty(shops)) { return model; @@ -166,7 +166,7 @@ public class NoshopController extends BaseController { model.setCityRentPrice(cityStat.getAvgPrice()); } - // 按距离排序,由近到远 + // 鎸夎窛绂绘帓搴忥紝鐢辫繎鍒拌繙 Collections.sort(shops, new Comparator() { public int compare(Shop o1, Shop o2) { double dis1 = GeoUtils.calculateDistance(lng, lat, o1.getLng2() / 10000000000.0, o1.getLat2() / 10000000000.0); @@ -201,7 +201,7 @@ public class NoshopController extends BaseController { model.setRentNearest(priceNearest); - // 范围内均价 + // 鑼冨洿鍐呭潎浠� if (priceCount > 0 && stats.size() > 0) { model.setAreaRentPrice(priceCount / stats.size()); @@ -219,7 +219,7 @@ public class NoshopController extends BaseController { } } - // 由低到高排序 + // 鐢变綆鍒伴珮鎺掑簭 Collections.sort(stats, new Comparator() { public int compare(DistrictBusinessStatRent o1, DistrictBusinessStatRent o2) { return o1.getAvgPrice() - o2.getAvgPrice(); @@ -234,7 +234,7 @@ public class NoshopController extends BaseController { } model.setRentBtm5(priceBtm5); - // 由高到低排序 + // 鐢遍珮鍒颁綆鎺掑簭 Collections.reverse(stats); List priceTop5 = new ArrayList(5); for (DistrictBusinessStatRent s : stats) { @@ -254,16 +254,16 @@ public class NoshopController extends BaseController { final double radius = getRadius(); Map> stationMap = busStationService.getNearByStations(model.getCityName(), lat, lng, radius); - model.setMetroStations(stationMap.get("地铁")); - model.setBusStations(stationMap.get("公交")); + model.setMetroStations(stationMap.get("鍦伴搧")); + model.setBusStations(stationMap.get("鍏氦")); - // 虹桥机场 121.352578,31.200062 + // 铏规ˉ鏈哄満 121.352578,31.200062 model.setDisHongqiaoAirport(GeoUtils.calculateDistance(lng, lat, 121.352578, 31.200062)); - // 虹桥火车站 121.32795,31.1991 + // 铏规ˉ鐏溅绔� 121.32795,31.1991 model.setDisHongqiaoStation(GeoUtils.calculateDistance(lng, lat, 121.32795, 31.1991)); - // 周边没商铺,直接返回 + // 鍛ㄨ竟娌″晢閾猴紝鐩存帴杩斿洖 List shops = shopService.searchNearby(lat, lng, radius); if (CollectionUtils.isNotEmpty(shops)) { int priceCount = 0; @@ -278,7 +278,7 @@ public class NoshopController extends BaseController { } } - // 范围内均价 + // 鑼冨洿鍐呭潎浠� if (priceCount > 0 && count > 0) { model.setAreaPrice(priceCount / count); } @@ -380,7 +380,7 @@ public class NoshopController extends BaseController { double lat = model.getLat(); double lng = model.getLng(); double radius = getRadius(); - model.setAvgConsumption(bizShopService.findAroundAvgConsumption(lat, lng, radius, "餐厅")); + model.setAvgConsumption(bizShopService.findAroundAvgConsumption(lat, lng, radius, "椁愬巺")); double cityConsumMin = model.getCityConsumMin(); double cityConsumMax = model.getCityConsumMax(); @@ -397,8 +397,8 @@ public class NoshopController extends BaseController { double lng = model.getLng(); double radius = getRadius(); Map> stationMap = busStationService.getNearByStations(city, lat, lng, radius); - model.setMetroStations(stationMap.get("地铁")); - model.setBusStations(stationMap.get("公交")); + model.setMetroStations(stationMap.get("鍦伴搧")); + model.setBusStations(stationMap.get("鍏氦")); return model; } @@ -617,7 +617,7 @@ public class NoshopController extends BaseController { district.setAvgPrice(avgPrice); district.setKind(commData.getKind()); - if (district.getName().endsWith("村")) { + if (district.getName().endsWith("鏉�")) { oldHouseCount += count; oldDistrictCount++; @@ -636,15 +636,15 @@ public class NoshopController extends BaseController { } } - model.setTotalHouseCount(oldHouseCount + hightLevelDistrictHouseCount + commonDistrictHouseCount);// 总户数 - model.setCommonDistrictHouseCount(commonDistrictHouseCount);// 高级商品房户数 - model.setHightDistrictHouseCount(hightLevelDistrictHouseCount);// 普通户数 - model.setTotalDistrictCount(oldDistrictCount + commonDistrictCount + hightLevelDistrictCount);// 总小区数 - model.setCommonDistrictCount(commonDistrictCount);// 高级小区数 - model.setHightDistrictCount(hightLevelDistrictCount);// 普通小区数 + model.setTotalHouseCount(oldHouseCount + hightLevelDistrictHouseCount + commonDistrictHouseCount);// 鎬绘埛鏁� + model.setCommonDistrictHouseCount(commonDistrictHouseCount);// 楂樼骇鍟嗗搧鎴挎埛鏁� + model.setHightDistrictHouseCount(hightLevelDistrictHouseCount);// 鏅�氭埛鏁� + model.setTotalDistrictCount(oldDistrictCount + commonDistrictCount + hightLevelDistrictCount);// 鎬诲皬鍖烘暟 + model.setCommonDistrictCount(commonDistrictCount);// 楂樼骇灏忓尯鏁� + model.setHightDistrictCount(hightLevelDistrictCount);// 鏅�氬皬鍖烘暟 - model.setOldHouseCount(oldHouseCount);// 老工房 户数 - model.setOldDistrictCount(oldDistrictCount);// 老工户 小区数 + model.setOldHouseCount(oldHouseCount);// 鑰佸伐鎴� 鎴锋暟 + model.setOldDistrictCount(oldDistrictCount);// 鑰佸伐鎴� 灏忓尯鏁� } return model; @@ -691,11 +691,11 @@ public class NoshopController extends BaseController { } if (StringUtils.isNotBlank(office.getBedKind())) { - if (office.getBedKind().equals("甲级")) { + if (office.getBedKind().equals("鐢茬骇")) { bestLevelCount = bestLevelCount + office.getHouseholdCount(); - } else if (office.getBedKind().equals("乙级")) { + } else if (office.getBedKind().equals("涔欑骇")) { betterLevelCount = betterLevelCount + office.getHouseholdCount(); - } else if (office.getBedKind().equals("丙级")) { + } else if (office.getBedKind().equals("涓欑骇")) { goodLevelCount = goodLevelCount + office.getHouseholdCount(); } else { otherLevelCount = otherLevelCount + office.getHouseholdCount(); diff --git a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/PeopleController.java b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/PeopleController.java index 3ae108c91..6f38ea0f0 100644 --- a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/PeopleController.java +++ b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/PeopleController.java @@ -78,13 +78,13 @@ public class PeopleController extends BaseController { JSONArray officesObj = JSONArray.fromObject(offices); model.setOffices(officesObj.toString()); - // 居民人口密度 + // 灞呮皯浜哄彛瀵嗗害 double circleArea = Math.PI * Math.pow(radius / 1000.0, 2); int totalHouseCount = model.getTotalHouseCount(); double density = totalHouseCount * 2.49 / circleArea; double score1 = ShopScoreUtil.populationScore(density); data.put("populationScore",score1); - // 办公人口 + // 鍔炲叕浜哄彛 int totalCountOffice = model.getTotalCountOffice(); density = totalCountOffice / circleArea; double score2 = ShopScoreUtil.officePopulationScore(density); @@ -124,26 +124,26 @@ public class PeopleController extends BaseController { JSONArray officesObj = JSONArray.fromObject(offices); model.setOffices(officesObj.toString()); - // 居民人口密度 + // 灞呮皯浜哄彛瀵嗗害 /*double circleArea = Math.PI * Math.pow(radius / 1000.0, 2); int totalHouseCount = model.getTotalHouseCount(); double density = totalHouseCount * 2.49 / circleArea; double score1 = ShopScoreUtil.peopleScore1(density); model.setScore1(score1); - // 办公人口 + // 鍔炲叕浜哄彛 int totalCountOffice = model.getTotalCountOffice(); density = totalCountOffice / circleArea; double score2 = ShopScoreUtil.peopleScore2(density); model.setScore2(score2);*/ - //圆形面积 + //鍦嗗舰闈㈢Н double circleArea = Math.PI * Math.pow(radius / 1000.0, 2); - //设置居民人口密度得分 + //璁剧疆灞呮皯浜哄彛瀵嗗害寰楀垎 double peopleDensityScore = setPeopleDensityScore(model, radius, circleArea); - //设置办公人口得分 + //璁剧疆鍔炲叕浜哄彛寰楀垎 double officeDensityScore = setOfficeDensityScore(model, circleArea); model.setTabScore(peopleDensityScore > officeDensityScore ? peopleDensityScore : officeDensityScore); @@ -182,7 +182,7 @@ public class PeopleController extends BaseController { } /** - * 设置办公人口得分 + * 璁剧疆鍔炲叕浜哄彛寰楀垎 * @author yinjihuan * @date 2016-03-04 * @param model @@ -190,18 +190,18 @@ public class PeopleController extends BaseController { * @return */ private double setOfficeDensityScore(PeopleModel model, double circleArea) { - //办公人数总数 + //鍔炲叕浜烘暟鎬绘暟 int totalCountOffice = model.getTotalCountOffice(); - //办公人口密度=(圆形区域内办公人数总数/圆形面积) + //鍔炲叕浜哄彛瀵嗗害=(鍦嗗舰鍖哄煙鍐呭姙鍏汉鏁版�绘暟/鍦嗗舰闈㈢Н) double density = totalCountOffice / circleArea; - //办公人口密度得分 + //鍔炲叕浜哄彛瀵嗗害寰楀垎 double officeDensityScore = ShopScoreUtil.calcOfficeDensityScore(density); model.setScore2(officeDensityScore); return officeDensityScore; } /** - * 设置居民人口密度得分 + * 璁剧疆灞呮皯浜哄彛瀵嗗害寰楀垎 * @author yinjihuan * @date 2016-03-04 * @param model @@ -209,11 +209,11 @@ public class PeopleController extends BaseController { * @return */ private double setPeopleDensityScore(PeopleModel model, double radius, double circleArea) { - // 圆形区域内总户数 + // 鍦嗗舰鍖哄煙鍐呮�绘埛鏁� int totalHouseCount = model.getTotalHouseCount(); - //居民人口密度(居民人口密度 = 圆形区域内总户数*2.49/圆形面积) + //灞呮皯浜哄彛瀵嗗害(灞呮皯浜哄彛瀵嗗害 = 鍦嗗舰鍖哄煙鍐呮�绘埛鏁�*2.49/鍦嗗舰闈㈢Н) double density = totalHouseCount * 2.49 / circleArea; - //人口密度得分 + //浜哄彛瀵嗗害寰楀垎 double peopleDensityScore = ShopScoreUtil.calcPeopleDensityScore(density); model.setScore1(peopleDensityScore); return peopleDensityScore; @@ -319,7 +319,7 @@ public class PeopleController extends BaseController { district.setAvgPrice(avgPrice); district.setKind(commData.getKind()); - if (district.getName().endsWith("村")) { + if (district.getName().endsWith("鏉�")) { oldHouseCount += count; oldDistrictCount++; @@ -338,15 +338,15 @@ public class PeopleController extends BaseController { } } - model.setTotalHouseCount(oldHouseCount + hightLevelDistrictHouseCount + commonDistrictHouseCount);// 总户数 - model.setCommonDistrictHouseCount(commonDistrictHouseCount);// 高级商品房户数 - model.setHightDistrictHouseCount(hightLevelDistrictHouseCount);// 普通户数 - model.setTotalDistrictCount(oldDistrictCount + commonDistrictCount + hightLevelDistrictCount);// 总小区数 - model.setCommonDistrictCount(commonDistrictCount);// 高级小区数 - model.setHightDistrictCount(hightLevelDistrictCount);// 普通小区数 + model.setTotalHouseCount(oldHouseCount + hightLevelDistrictHouseCount + commonDistrictHouseCount);// 鎬绘埛鏁� + model.setCommonDistrictHouseCount(commonDistrictHouseCount);// 楂樼骇鍟嗗搧鎴挎埛鏁� + model.setHightDistrictHouseCount(hightLevelDistrictHouseCount);// 鏅�氭埛鏁� + model.setTotalDistrictCount(oldDistrictCount + commonDistrictCount + hightLevelDistrictCount);// 鎬诲皬鍖烘暟 + model.setCommonDistrictCount(commonDistrictCount);// 楂樼骇灏忓尯鏁� + model.setHightDistrictCount(hightLevelDistrictCount);// 鏅�氬皬鍖烘暟 - model.setOldHouseCount(oldHouseCount);// 老工房 户数 - model.setOldDistrictCount(oldDistrictCount);// 老工户 小区数 + model.setOldHouseCount(oldHouseCount);// 鑰佸伐鎴� 鎴锋暟 + model.setOldDistrictCount(oldDistrictCount);// 鑰佸伐鎴� 灏忓尯鏁� } return model; @@ -393,11 +393,11 @@ public class PeopleController extends BaseController { } if (StringUtils.isNotBlank(office.getBedKind())) { - if (office.getBedKind().equals("甲级")) { + if (office.getBedKind().equals("鐢茬骇")) { bestLevelCount = bestLevelCount + office.getHouseholdCount(); - } else if (office.getBedKind().equals("乙级")) { + } else if (office.getBedKind().equals("涔欑骇")) { betterLevelCount = betterLevelCount + office.getHouseholdCount(); - } else if (office.getBedKind().equals("丙级")) { + } else if (office.getBedKind().equals("涓欑骇")) { goodLevelCount = goodLevelCount + office.getHouseholdCount(); } else { otherLevelCount = otherLevelCount + office.getHouseholdCount(); diff --git a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/PredictController.java b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/PredictController.java index dc1fd2680..f234b4ec6 100644 --- a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/PredictController.java +++ b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/PredictController.java @@ -43,10 +43,10 @@ public class PredictController extends BaseController{ model.setStatBo(statBo); int avgPrice = 0; - String buildType = "小区"; + String buildType = "灏忓尯"; if (null == statBo.getDistrictStat() && null != statBo.getVillaDistrictStat()) { avgPrice = statBo.getVillaDistrictStat().getAvgPrice(); - buildType = "别墅"; + buildType = "鍒"; } else if (null != statBo.getDistrictStat()) { avgPrice = statBo.getDistrictStat().getAvgPrice(); } @@ -81,7 +81,7 @@ public class PredictController extends BaseController{ } private void addDistrictStat(List seriesOptions, DistrictKey districtKey, int weeks) { - List list = Arrays.asList(StringUtils.split(districtService.findDistrictKind(districtKey), ",,")); + List list = Arrays.asList(StringUtils.split(districtService.findDistrictKind(districtKey), ",锛�")); List districtStatBoList = districtStatService.findAllDistrictStatByKind(districtKey, new Date(), weeks, list); JSONArray districtJa = new JSONArray(); @@ -130,7 +130,7 @@ public class PredictController extends BaseController{ if (villaJa.length() > 0) { JSONObject jo2 = new JSONObject(); - jo2.put("name", districtKey.getName() + "(别墅)"); + jo2.put("name", districtKey.getName() + "(鍒)"); jo2.put("data", villaJa.toString()); jo2.put("yAxis", 0); seriesOptions.add(jo2); diff --git a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/PriceController.java b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/PriceController.java index 8918349e8..97e959362 100644 --- a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/PriceController.java +++ b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/PriceController.java @@ -35,7 +35,7 @@ import java.net.URLEncoder; import java.util.*; /** - * 价格指数 + * 浠锋牸鎸囨暟 * @author yk * */ @@ -51,15 +51,15 @@ public class PriceController extends BaseController { final static ChafangtongCookieContext cookieContext = ChafangtongCookieContext.getInstance(); public Object districtAction(PriceModel model) throws UnsupportedEncodingException { /** - * 将"全市相对最低"指标数字变更成上海小区均价升序,前0到3%的均价的中位数。 - * "全市相对最高"指标数字变更成上海小区均价升序,前97%到100%的均价的中位数 - * 2016-07-05 yinjihuan修改 + * 灏�"鍏ㄥ競鐩稿鏈�浣�"鎸囨爣鏁板瓧鍙樻洿鎴愪笂娴峰皬鍖哄潎浠峰崌搴忥紝鍓�0鍒�3%鐨勫潎浠风殑涓綅鏁般�� + * "鍏ㄥ競鐩稿鏈�楂�"鎸囨爣鏁板瓧鍙樻洿鎴愪笂娴峰皬鍖哄潎浠峰崌搴忥紝鍓�97%鍒�100%鐨勫潎浠风殑涓綅鏁� + * 2016-07-05 yinjihuan淇敼 */ Map priceMap = districtStatService.getCityDistriceMinAndMaxPrice(model.getCityName()); if (null == priceMap) { return model.redirect("/noResult/district?q=" + URLEncoder.encode(model.getDistrictName(), "UTF-8") + "&cityName=" +URLEncoder.encode(model.getCityName(), "UTF-8")); } - //设置价格 + //璁剧疆浠锋牸 model.setCityDistrictMinSellPrice(priceMap.get("cityDistrictMinSellPrice")); model.setCityDistrictMaxSellPrice(priceMap.get("cityDistrictMaxSellPrice")); @@ -108,17 +108,17 @@ public class PriceController extends BaseController { if(StringUtils.isNotBlank(district.getRegion())){ params.add(new QueryParam("region", district.getRegion())); } - Date lastMonthEndDate = DateUtil.getLastEndMonthDate(new Date());// 检索上上月的数据 + Date lastMonthEndDate = DateUtil.getLastEndMonthDate(new Date());// 妫�绱笂涓婃湀鐨勬暟鎹� params.add(new QueryParam("endMonthDate", lastMonthEndDate)); List regionStatRentList=regionStatRentDao.findAllByParams(params); model.setRegionStatRents(regionStatRentList); model.setRentStatBos(rentBos); String estateType = district.getEstateType2(); - if(!estateType.contains("别墅")){ - estateType = "小区"; + if(!estateType.contains("鍒")){ + estateType = "灏忓尯"; }else{ - estateType = "别墅"; + estateType = "鍒"; } List rentList = new ArrayList(); Map districtStatRents = districtStatRentService.findByDistrictStatRent(districtKey, estateType); @@ -211,7 +211,7 @@ public class PriceController extends BaseController { } List seriesOptions = new ArrayList(); - String title = name + "均价走势"; + String title = name + "鍧囦环璧板娍"; DistrictKey districtKey = new DistrictKey(city, region, name); addDistrictStat(seriesOptions, districtKey, weeks); diff --git a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/RentController.java b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/RentController.java index daeb0ae53..a502e2f0c 100644 --- a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/RentController.java +++ b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/RentController.java @@ -114,7 +114,7 @@ public class RentController extends BaseController { } List seriesOptions = new ArrayList(); - String title = name + "租金走势"; + String title = name + "绉熼噾璧板娍"; DistrictKey districtKey = new DistrictKey(city, region, name); addDistrictStat(seriesOptions, districtKey, weeks); diff --git a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/ReportController.java b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/ReportController.java index 85d31ec16..5f96499ed 100644 --- a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/ReportController.java +++ b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/ReportController.java @@ -124,7 +124,7 @@ public class ReportController extends BaseController { model.setShowPdfLink(true); } - // 综合指数 + // 缁煎悎鎸囨暟 SeaweedNumberic numberic = seaweedNumbericDao.findShop(shop.getCity(), shop.getRegion(), shop.getName()); model.setDetailScore(ShopScoreUtil.detailScore(shop, numberic)); model.setDetailScore1(ShopScoreUtil.detailScore1(shop.getEstateType(), null == numberic ? null : numberic.getBuildArea())); @@ -132,7 +132,7 @@ public class ReportController extends BaseController { model.setDetailScore3(ShopScoreUtil.detailScore3(shop.getCarSiteCount())); model.setDetailScore4(ShopScoreUtil.detailScore4(null == numberic ? null : numberic.getFinishBuildYear())); - // 房价指数 + // 鎴夸环鎸囨暟 Date weekend = DateUtil.getFirstDayOfWeek(new Date()); BizRegionStat cityStat = bizRegionStatService.findCitySellPrice(city, weekend); if (null != cityStat) { @@ -170,7 +170,7 @@ public class ReportController extends BaseController { model.setSellTradeUrl(model.getCityUrl() + "/cImg/" + SecurityUtil.encode(urlBuilder.toString()) + (isRefreshCache ? "?__refresh_cache=1" : "")); - // 租金指数 + // 绉熼噾鎸囨暟 DistrictBusinessStatRentBo retnStatBo = districtBusinessStatRentService.findMallStatBo(new DistrictKey(shop.getCity(), shop.getRegion(), shop.getName()), weekend); model.setRentStatBo(retnStatBo); @@ -203,15 +203,15 @@ public class ReportController extends BaseController { model.setRentTradeUrl(model.getCityUrl() + "/cImg/" + SecurityUtil.encode(urlBuilder.toString()) + (isRefreshCache ? "?__refresh_cache=1" : "")); - // 地段指数 + // 鍦版鎸囨暟 Map> stationMap = busStationService.getNearByStations(city, lat, lng, radius); - model.setMetroStations(stationMap.get("地铁")); - model.setBusStations(stationMap.get("公交")); + model.setMetroStations(stationMap.get("鍦伴搧")); + model.setBusStations(stationMap.get("鍏氦")); - // 虹桥机场 121.352578,31.200062 + // 铏规ˉ鏈哄満 121.352578,31.200062 model.setDisHongqiaoAirport(GeoUtils.calculateDistance(lng, lat, 121.352578, 31.200062)); - // 虹桥火车站 121.32795,31.1991 + // 铏规ˉ鐏溅绔� 121.32795,31.1991 model.setDisHongqiaoStation(GeoUtils.calculateDistance(lng, lat, 121.32795, 31.1991)); model.setLocalScore(ShopScoreUtil.localScore(shop.getLoopLineInfo(), null == model.getMetroStations() ? 0 : model @@ -263,7 +263,7 @@ public class ReportController extends BaseController { model.setPieColors(Arrays.asList(new String[]{"#5491c7" ,"#f0776e" ,"#66bd7d" ,"#f5a549" ,"#c075eb"})); model.setPieMarkers(jFreeChartImageService.getAroundBizTypePieMarkers(lat, lng, radius)); - // 人口指数 + // 浜哄彛鎸囨暟 int cityAvgPrice = cityPriceLevelService.findCityPriceLevel(city); cityAvgPrice = cityAvgPrice == 0 ? 7000 : cityAvgPrice; model.setCityAvgPrice(cityAvgPrice); @@ -274,14 +274,14 @@ public class ReportController extends BaseController { List offices = findDistricts(city, "office", lat, lng, radius); offices = getOfficeCommDataInfo(offices, model); - // 居民人口密度 + // 灞呮皯浜哄彛瀵嗗害 double circleArea = Math.PI * Math.pow(radius / 1000.0, 2); int totalHouseCount = model.getTotalHouseCount(); double density = totalHouseCount * 2.49 / circleArea; double peopleScore1 = ShopScoreUtil.peopleScore1(density); model.setPeopleScore1(peopleScore1); - // 办公人口 + // 鍔炲叕浜哄彛 int totalCountOffice = model.getTotalCountOffice(); density = totalCountOffice / circleArea; double peopleScore2 = ShopScoreUtil.peopleScore2(density); @@ -289,17 +289,17 @@ public class ReportController extends BaseController { model.setPeopleScore(peopleScore1 > peopleScore2 ? peopleScore1 : peopleScore2); - // 消费指数 - model.setAvgConsumption(bizShopService.findAroundAvgConsumption(lat, lng, radius, "餐厅")); + // 娑堣垂鎸囨暟 + model.setAvgConsumption(bizShopService.findAroundAvgConsumption(lat, lng, radius, "椁愬巺")); double cityConsumMin = model.getCityConsumMin(); double cityConsumMax = model.getCityConsumMax(); if (null != model.getAvgConsumption()) { model.setHigher((model.getAvgConsumption() - cityConsumMin) * 100.0 / (cityConsumMax - cityConsumMin)); } - List allKw = Arrays.asList(new String[]{ "KTV", "电影院", "健身中心", "商场", "美容院", "星级酒店", "大型超市", - "高尔夫球场", "私立学校", "整形", "咖啡厅", "洗浴","医院", "公园", "学校", "体育馆","银行", "商场", "大型超市", "餐饮"}); + List allKw = Arrays.asList(new String[]{ "KTV", "鐢靛奖闄�", "鍋ヨ韩涓績", "鍟嗗満", "缇庡闄�", "鏄熺骇閰掑簵", "澶у瀷瓒呭競", + "楂樺皵澶悆鍦�", "绉佺珛瀛︽牎", "鏁村舰", "鍜栧暋鍘�", "娲楁荡","鍖婚櫌", "鍏洯", "瀛︽牎", "浣撹偛棣�","閾惰", "鍟嗗満", "澶у瀷瓒呭競", "椁愰ギ"}); Map baiduKwResult = baiduApiService.searchNearBy(allKw, lat, lng, radius, model.getBaiduMapKey()); - String[] ks = new String[] { "KTV", "电影院", "健身中心", "商场", "美容院", "星级酒店", "大型超市", "高尔夫球场", "私立学校", "整形", "咖啡厅", "洗浴" }; + String[] ks = new String[] { "KTV", "鐢靛奖闄�", "鍋ヨ韩涓績", "鍟嗗満", "缇庡闄�", "鏄熺骇閰掑簵", "澶у瀷瓒呭競", "楂樺皵澶悆鍦�", "绉佺珛瀛︽牎", "鏁村舰", "鍜栧暋鍘�", "娲楁荡" }; Map countMap = new HashMap(ks.length); for (int i = 0; i < ks.length; i++) { Integer c = getTotal(baiduKwResult.get(ks[i])); @@ -310,8 +310,8 @@ public class ReportController extends BaseController { model.setConsumCountMap(countMap); model.setConsumScore(ShopScoreUtil.consumScore(model.getAvgConsumption(), countMap)); - // 环境指数 - ks = new String[] { "医院", "公园", "学校", "体育馆" }; + // 鐜鎸囨暟 + ks = new String[] { "鍖婚櫌", "鍏洯", "瀛︽牎", "浣撹偛棣�" }; Map aroundCountMap = new HashMap(); countMap = new HashMap(ks.length); for (int i = 0; i < ks.length; i++) { @@ -320,14 +320,14 @@ public class ReportController extends BaseController { countMap.put(ks[i], c); } } - countMap.put("地铁站", null == model.getMetroStations() ? null : model.getMetroStations().size()); - countMap.put("公交点", null == model.getBusStations() ? null : model.getBusStations().size()); + countMap.put("鍦伴搧绔�", null == model.getMetroStations() ? null : model.getMetroStations().size()); + countMap.put("鍏氦鐐�", null == model.getBusStations() ? null : model.getBusStations().size()); aroundCountMap.putAll(countMap); double aroundScore1 = ShopScoreUtil.aroundScore1(countMap); model.setAroundScore1(aroundScore1); - ks = new String[] { "银行", "商场", "大型超市", "餐饮" }; + ks = new String[] { "閾惰", "鍟嗗満", "澶у瀷瓒呭競", "椁愰ギ" }; countMap = new HashMap(ks.length); for (int i = 0; i < ks.length; i++) { Integer c = getTotal(baiduKwResult.get(ks[i])); @@ -438,7 +438,7 @@ public class ReportController extends BaseController { model.setShowPdfLink(true); } - // 楼盘指数 + // 妤肩洏鎸囨暟 SeaweedNumberic numberic = seaweedNumbericDao.findDistrict(city, region, district.getName()); model.setDetailScore(DistrictScoreUtil.detailScore(district, numberic)); @@ -451,9 +451,9 @@ public class ReportController extends BaseController { model.setDetailScore4(DistrictScoreUtil.detailScore4(nullNumberic ? null : numberic.getCubagePercent())); model.setDetailScore5(DistrictScoreUtil.detailScore5(district.getBuildType(), nullNumberic ? null : numberic.getCarSiteCount())); - // 房价指数 + // 鎴夸环鎸囨暟 RegionStat cityStat = regionStatService.findByCity(city); -// Integer cityLeave = 0;//最高房价和最低房价的差值 +// Integer cityLeave = 0;//鏈�楂樻埧浠峰拰鏈�浣庢埧浠风殑宸�� if (null != cityStat) { model.setCityPrice(cityStat.getAvgPrice()); // Integer citySellMin = model.getCityDistrictMinSellPrice(); @@ -478,7 +478,7 @@ public class ReportController extends BaseController { if(StringUtils.isNotBlank(district.getRegion())){ params.add(new QueryParam("region", district.getRegion())); } - Date lastMonthEndDate = DateUtil.getLastEndMonthDate(new Date());// 检索上上月的数据 + Date lastMonthEndDate = DateUtil.getLastEndMonthDate(new Date());// 妫�绱笂涓婃湀鐨勬暟鎹� params.add(new QueryParam("endMonthDate", lastMonthEndDate)); List regionStatRentList=regionStatRentDao.findAllByParams(params); model.setRegionStatRents(regionStatRentList); @@ -487,10 +487,10 @@ public class ReportController extends BaseController { rentBo = districtStatRentService.findByDistrictStatRent(districtKey,2); List rentList = new ArrayList(); String estateType = district.getEstateType2(); - if(!estateType.contains("别墅")){ - estateType = "小区"; + if(!estateType.contains("鍒")){ + estateType = "灏忓尯"; }else{ - estateType = "别墅"; + estateType = "鍒"; } Map districtStatRents = districtStatRentService.findByDistrictStatRent(districtKey, estateType); @@ -520,7 +520,7 @@ public class ReportController extends BaseController { if (null != stat) { Map priceMap = districtStatService.getCityDistriceMinAndMaxPrice(model.getCityName()); - //设置价格 + //璁剧疆浠锋牸 model.setCityDistrictMinSellPrice(priceMap.get("cityDistrictMinSellPrice")); model.setCityDistrictMaxSellPrice(priceMap.get("cityDistrictMaxSellPrice")); @@ -538,11 +538,11 @@ public class ReportController extends BaseController { } } - // 潜力指数 - String buildType = "小区"; + // 娼滃姏鎸囨暟 + String buildType = "灏忓尯"; if (null == statBo.getDistrictStat() && null != statBo.getVillaDistrictStat()) { avgPrice = statBo.getVillaDistrictStat().getAvgPrice(); - buildType = "别墅"; + buildType = "鍒"; } else if (null != statBo.getDistrictStat()) { avgPrice = statBo.getDistrictStat().getAvgPrice(); } @@ -569,9 +569,9 @@ public class ReportController extends BaseController { model.setSellTradeUrl(model.getCityUrl() + "/cImg/" + SecurityUtil.encode(urlBuilder.toString()) + (isRefreshCache ? "?__refresh_cache=1" : "")); - // 稀缺指数 + // 绋�缂烘寚鏁� model.setRegionOrg(regionBlockService.getOrgName(city, region, "region")); - model.setBlockOrg(block + "板块"); + model.setBlockOrg(block + "鏉垮潡"); model.setRegionDistrictCount(districtService.findRegionDistrictCount(city, region)); //model.setBlockDistrictCount(districtService.findBlockDistrictCount(city, region, block)); model.setCityDistrictCount(districtService.findCityDistrictCount(city)); @@ -612,8 +612,8 @@ public class ReportController extends BaseController { model.setMaxDealPriceCount(districtAnalyDataService.findMaxDealCountByCity(city)); model.setMaxSellCount(districtAnalyDataService.findMaxSellCountByCity(city)); model.setDistrictAnalyData(districtAnalyData); - // 消费指数 - model.setAvgConsumption(bizShopService.findAroundAvgConsumption(lat, lng, radius, "餐厅")); + // 娑堣垂鎸囨暟 + model.setAvgConsumption(bizShopService.findAroundAvgConsumption(lat, lng, radius, "椁愬巺")); double cityConsumMin = model.getCityConsumMin(); double cityConsumMax = model.getCityConsumMax(); @@ -621,11 +621,11 @@ public class ReportController extends BaseController { model.setHigher((model.getAvgConsumption() - cityConsumMin) * 100.0 / (cityConsumMax - cityConsumMin)); } List allKs = Arrays.asList(new String[]{ - "KTV", "电影院", "健身中心", "商场", "美容院", "星级酒店", "大型超市", "高尔夫球场", "私立学校", "整形", "咖啡厅", "洗浴", - "医院", "学校", "写字楼", "银行", "ATM", "超市", "停车场", "公园", "网吧", "医院", "学校", "写字楼", "银行", "ATM", "超市", "停车场", "公园", "网吧" + "KTV", "鐢靛奖闄�", "鍋ヨ韩涓績", "鍟嗗満", "缇庡闄�", "鏄熺骇閰掑簵", "澶у瀷瓒呭競", "楂樺皵澶悆鍦�", "绉佺珛瀛︽牎", "鏁村舰", "鍜栧暋鍘�", "娲楁荡", + "鍖婚櫌", "瀛︽牎", "鍐欏瓧妤�", "閾惰", "ATM", "瓒呭競", "鍋滆溅鍦�", "鍏洯", "缃戝惂", "鍖婚櫌", "瀛︽牎", "鍐欏瓧妤�", "閾惰", "ATM", "瓒呭競", "鍋滆溅鍦�", "鍏洯", "缃戝惂" }); Map kwResult = baiduApiService.searchNearBy(allKs, lat, lng, radius, model.getBaiduMapKey()); - String[] ks = new String[] { "KTV", "电影院", "健身中心", "商场", "美容院", "星级酒店", "大型超市", "高尔夫球场", "私立学校", "整形", "咖啡厅", "洗浴" , "银行"}; + String[] ks = new String[] { "KTV", "鐢靛奖闄�", "鍋ヨ韩涓績", "鍟嗗満", "缇庡闄�", "鏄熺骇閰掑簵", "澶у瀷瓒呭競", "楂樺皵澶悆鍦�", "绉佺珛瀛︽牎", "鏁村舰", "鍜栧暋鍘�", "娲楁荡" , "閾惰"}; Map countMap = new HashMap(ks.length); for (int i = 0; i < ks.length; i++) { countMap.put(ks[i], getTotal(kwResult.get(ks[i]))); @@ -633,34 +633,34 @@ public class ReportController extends BaseController { model.setConsumCountMap(countMap); model.setConsumScore(DistrictScoreUtil.consumScore(model.getAvgConsumption(), countMap)); - // 环境指数 + // 鐜鎸囨暟 Map> stationMap = busStationService.getNearByStations(city, lat, lng, radius); - model.setMetroStations(stationMap.get("地铁")); - model.setBusStations(stationMap.get("公交")); + model.setMetroStations(stationMap.get("鍦伴搧")); + model.setBusStations(stationMap.get("鍏氦")); - ks = new String[] { "医院", "学校", "写字楼", "银行", "ATM", "超市", "停车场", "公园", "网吧"}; - //厌恶设施 - String[] keys = new String[]{"发电厂","变电站","垃圾焚烧厂","化工厂"}; + ks = new String[] { "鍖婚櫌", "瀛︽牎", "鍐欏瓧妤�", "閾惰", "ATM", "瓒呭競", "鍋滆溅鍦�", "鍏洯", "缃戝惂"}; + //鍘屾伓璁炬柦 + String[] keys = new String[]{"鍙戠數鍘�","鍙樼數绔�","鍨冨溇鐒氱儳鍘�","鍖栧伐鍘�"}; countMap = new HashMap(ks.length); for (int i = 0; i < ks.length; i++) { countMap.put(ks[i], getTotal(kwResult.get(ks[i]))); } - //添加厌恶设施 + //娣诲姞鍘屾伓璁炬柦 for (int i = 0; i < keys.length; i++) { countMap.put(ks[i], getTotal(kwResult.get(ks[i]))); } - countMap.put("地铁站", null == model.getMetroStations() ? null : model.getMetroStations().size()); - countMap.put("公交点", null == model.getBusStations() ? null : model.getBusStations().size()); + countMap.put("鍦伴搧绔�", null == model.getMetroStations() ? null : model.getMetroStations().size()); + countMap.put("鍏氦鐐�", null == model.getBusStations() ? null : model.getBusStations().size()); - // 虹桥机场 121.352578,31.200062 - // 浦东机场 121.807085,31.160702 + // 铏规ˉ鏈哄満 121.352578,31.200062 + // 娴︿笢鏈哄満 121.807085,31.160702 double dis = GeoUtils.calculateDistance(lng, lat, 121.352578, 31.200062); if (dis <= radius) { - countMap.put("机场", 1); + countMap.put("鏈哄満", 1); } else { dis = GeoUtils.calculateDistance(lng, lat, 121.807085, 31.160702); if (dis <= radius) { - countMap.put("机场", 1); + countMap.put("鏈哄満", 1); } } @@ -760,7 +760,7 @@ public class ReportController extends BaseController { district.setAvgPrice(avgPrice); district.setKind(commData.getKind()); - if (district.getName().endsWith("村")) { + if (district.getName().endsWith("鏉�")) { oldHouseCount += count; } else { if (avgPrice >= model.getCityAvgPrice()) { @@ -772,10 +772,10 @@ public class ReportController extends BaseController { } } } - model.setTotalHouseCount(oldHouseCount + hightLevelDistrictHouseCount + commonDistrictHouseCount);// 总户数 - model.setCommonDistrictHouseCount(commonDistrictHouseCount);// 高级商品房户数 - model.setHightDistrictHouseCount(hightLevelDistrictHouseCount);// 普通户数 - model.setOldHouseCount(oldHouseCount);// 老工房 户数 + model.setTotalHouseCount(oldHouseCount + hightLevelDistrictHouseCount + commonDistrictHouseCount);// 鎬绘埛鏁� + model.setCommonDistrictHouseCount(commonDistrictHouseCount);// 楂樼骇鍟嗗搧鎴挎埛鏁� + model.setHightDistrictHouseCount(hightLevelDistrictHouseCount);// 鏅�氭埛鏁� + model.setOldHouseCount(oldHouseCount);// 鑰佸伐鎴� 鎴锋暟 } return model; } @@ -820,11 +820,11 @@ public class ReportController extends BaseController { } if (StringUtils.isNotBlank(office.getBedKind())) { - if (office.getBedKind().equals("甲级")) { + if (office.getBedKind().equals("鐢茬骇")) { bestLevelCount = bestLevelCount + office.getHouseholdCount(); - } else if (office.getBedKind().equals("乙级")) { + } else if (office.getBedKind().equals("涔欑骇")) { betterLevelCount = betterLevelCount + office.getHouseholdCount(); - } else if (office.getBedKind().equals("丙级")) { + } else if (office.getBedKind().equals("涓欑骇")) { goodLevelCount = goodLevelCount + office.getHouseholdCount(); } else { otherLevelCount = otherLevelCount + office.getHouseholdCount(); @@ -872,7 +872,7 @@ public class ReportController extends BaseController { return model; } - //获取报告编号 + //鑾峰彇鎶ュ憡缂栧彿 public String getNumber(){ String number = ""; while(StringUtil.isBlank(number)){ @@ -914,7 +914,7 @@ public class ReportController extends BaseController { DistrictStatBo districtStatBo = districtStatService.findDistrictStat(new DistrictKey(district.getCity(), district .getRegion(), district.getName())); DistrictStat districtStat = null; - if (StringUtils.contains(evaluation.getBuildType(), "别墅")) { + if (StringUtils.contains(evaluation.getBuildType(), "鍒")) { districtStat = districtStatBo.getVillaDistrictStat(); } else { districtStat = districtStatBo.getDistrictStat(); @@ -959,7 +959,7 @@ public class ReportController extends BaseController { DistrictStatBo districtStatBo = districtStatService.findDistrictStat(new DistrictKey(district.getCity(), district .getRegion(), district.getName())); DistrictStat districtStat = null; - if (StringUtils.contains(district.getEstateType2(), "别墅")) { + if (StringUtils.contains(district.getEstateType2(), "鍒")) { districtStat = districtStatBo.getVillaDistrictStat(); } else { districtStat = districtStatBo.getDistrictStat(); diff --git a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/ReportViewController.java b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/ReportViewController.java index a119b0f82..825da1dcf 100644 --- a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/ReportViewController.java +++ b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/ReportViewController.java @@ -33,7 +33,7 @@ import java.util.List; import java.util.Random; /** - *估价报告查看 + *浼颁环鎶ュ憡鏌ョ湅 *@author wenyan */ public class ReportViewController extends BaseController { @@ -47,7 +47,7 @@ public class ReportViewController extends BaseController { String serialNumber; - // 根据id查找商铺 + // 鏍规嵁id鏌ユ壘鍟嗛摵 Shop shop = null; if (StringUtils.isNotBlank(model.getId()) && ObjectId.isValid(model.getId())) { shop = shopService.findById(model.getId()); @@ -240,7 +240,7 @@ public class ReportViewController extends BaseController { DistrictStatBo districtStatBo = districtStatService.findDistrictStat(new DistrictKey(district.getCity(), district .getRegion(), district.getName())); DistrictStat districtStat = null; - if (StringUtils.contains(district.getEstateType2(), "别墅")) { + if (StringUtils.contains(district.getEstateType2(), "鍒")) { districtStat = districtStatBo.getVillaDistrictStat(); } else { districtStat = districtStatBo.getDistrictStat(); @@ -258,7 +258,7 @@ public class ReportViewController extends BaseController { return avgPrice; } - //获取报告编号 + //鑾峰彇鎶ュ憡缂栧彿 public String getNumber(){ String number = ""; while(StringUtil.isBlank(number)){ diff --git a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/SampleController.java b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/SampleController.java index f599399e3..60f3ae080 100644 --- a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/SampleController.java +++ b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/SampleController.java @@ -27,7 +27,7 @@ import com.fangjia.service.bo.DistrictStatBo; import com.fangjia.service.district.ShopStatService; /** - * 报告样例 + * 鎶ュ憡鏍蜂緥 * Created by wenyan on 2015/11/27. */ public class SampleController extends BaseController{ @@ -41,7 +41,7 @@ public class SampleController extends BaseController{ DistrictKey districtKey = new DistrictKey(model.getCityName(), model.getRegion(), model.getDistrictName()); District district = districtService.findDistrict(districtKey,"district"); model.setDistrict(district); - /* 获取下载份数,菜单控制by tom */ + /* 鑾峰彇涓嬭浇浠芥暟锛岃彍鍗曟帶鍒禸y tom */ String uid = cookieContext.getCookieValue(request, "fpk_uid"); if (StringUtils.isNotBlank(uid)) { FpkUsers fpkUser = fpkUsersService.findById(SecurityUtil @@ -61,7 +61,7 @@ public class SampleController extends BaseController{ DistrictKey districtKey = new DistrictKey(model.getCityName(), model.getRegion(), model.getDistrictName()); District district = districtService.findDistrict(districtKey,"shop"); model.setDistrict(district); - /* 获取下载份数,菜单控制by tom */ + /* 鑾峰彇涓嬭浇浠芥暟锛岃彍鍗曟帶鍒禸y tom */ String uid = cookieContext.getCookieValue(request, "fpk_uid"); if (StringUtils.isNotBlank(uid)) { FpkUsers fpkUser = fpkUsersService.findById(SecurityUtil diff --git a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/SearchController.java b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/SearchController.java index 3a132efe7..74de393a9 100644 --- a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/SearchController.java +++ b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/SearchController.java @@ -136,7 +136,7 @@ public class SearchController { //nameQuery.add(new TermQuery(new Term("address", keyword)), Occur.SHOULD); //nameQuery.add(new TermQuery(new Term("addr_alias_std", keyword)), Occur.SHOULD); nameQuery.add(new TermQuery(new Term("keyword", keyword)), Occur.SHOULD); - //nameQuery.add(new TermQuery(new Term("keyword_cjk", keyword)), Occur.SHOULD);//这个重要,因seaweed不支持模糊搜索,当输入"中远两"需用此进行搜索 + //nameQuery.add(new TermQuery(new Term("keyword_cjk", keyword)), Occur.SHOULD);//杩欎釜閲嶈锛屽洜seaweed涓嶆敮鎸佹ā绯婃悳绱紝褰撹緭鍏�"涓繙涓�"闇�鐢ㄦ杩涜鎼滅储 srQuery1.add(nameQuery, Occur.SHOULD); params.add(new QueryParam("$sr", new SrQuery(srQuery1))); List districts = districtService.findAllByParams(params, 0, limit, new String[] { "region", "name","address", "addrAlias" }); @@ -151,7 +151,7 @@ public class SearchController { bo.setRegion(district.getRegion()); ret.add(bo); } - //对自动完成出来的结果按长短排序 + //瀵硅嚜鍔ㄥ畬鎴愬嚭鏉ョ殑缁撴灉鎸夐暱鐭帓搴� if(ret.size() > 0){ Collections.sort(ret, new Comparator() { public int compare(AutoCompleteBo o1, AutoCompleteBo o2) { diff --git a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/ShapeController.java b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/ShapeController.java index dd249b7c9..74df5e9fd 100644 --- a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/ShapeController.java +++ b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/ShapeController.java @@ -35,11 +35,11 @@ public class ShapeController { g2d.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON); g2d.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_QUALITY); - g2d.setColor(new Color(178,178,178));//改变扇形颜色 + g2d.setColor(new Color(178,178,178));//鏀瑰彉鎵囧舰棰滆壊 g2d.fillArc(0,0,400,400,90,360); - g2d.setColor(new Color(0,115,230));//改变扇形颜色 + g2d.setColor(new Color(0,115,230));//鏀瑰彉鎵囧舰棰滆壊 g2d.fillArc(0,0,400,400,90,rim); - g2d.setColor(new Color(229,229,229));//改变扇形颜色 + g2d.setColor(new Color(229,229,229));//鏀瑰彉鎵囧舰棰滆壊 g2d.fillArc(50,50,300,300,90,360); g2d.setColor(new Color(0,115,230)); Map attributes = new HashMap(); @@ -61,7 +61,7 @@ public class ShapeController { unitStart = 200 + 25; }else if("0".equals(scoreStr)){ scoreStr ="-"; - g2d.setFont(new Font("微软雅黑", Font.BOLD, 12*a).deriveFont(attributes)); + g2d.setFont(new Font("寰蒋闆呴粦", Font.BOLD, 12*a).deriveFont(attributes)); g2d.drawString(scoreStr, 200 - w + 10, 230); unitStart = 175; }else{ @@ -70,11 +70,11 @@ public class ShapeController { } if("0".equals(scoreStr)){ - g2d.setFont(new Font("微软雅黑", Font.BOLD, 12*a).deriveFont(attributes)); - g2d.drawString("分", unitStart, 200); + g2d.setFont(new Font("寰蒋闆呴粦", Font.BOLD, 12*a).deriveFont(attributes)); + g2d.drawString("鍒�", unitStart, 200); }else{ - g2d.setFont(new Font("微软雅黑", Font.BOLD, 12*a).deriveFont(attributes)); - g2d.drawString("分", unitStart, 252); + g2d.setFont(new Font("寰蒋闆呴粦", Font.BOLD, 12*a).deriveFont(attributes)); + g2d.drawString("鍒�", unitStart, 252); } g2d.dispose(); cache.put(model.getScore(), image); diff --git a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/UserController.java b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/UserController.java index 0c6f8f694..1b7bcc65f 100644 --- a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/UserController.java +++ b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/controllers/UserController.java @@ -37,33 +37,33 @@ public class UserController { mav.setModel(data); String password = model.getPassword(); if (StringUtils.isBlank(model.getUserName())) { - data.put("userNameMsg","用户名不能为空"); + data.put("userNameMsg","鐢ㄦ埛鍚嶄笉鑳戒负绌�"); return mav; } if (StringUtils.isBlank(model.getPassword())) { - data.put("passwordMsg","密码不能为空"); + data.put("passwordMsg","瀵嗙爜涓嶈兘涓虹┖"); return mav; } FpkUsers user = fpkUsersDao.findByName(model.getUserName()); if (null == user) { - data.put("userNameMsg","用户名不存在"); + data.put("userNameMsg","鐢ㄦ埛鍚嶄笉瀛樺湪"); return mav; } if (!user.getPassword().equals(DigestUtils.md5Hex(password))) { - data.put("passwordMsg","密码错误"); + data.put("passwordMsg","瀵嗙爜閿欒"); return mav; } if(!user.isEnabled()){ - data.put("userNameMsg","账户被禁用,请联系我们!"); + data.put("userNameMsg","璐︽埛琚鐢紝璇疯仈绯绘垜浠�!"); return mav; } if(user.getExpiryDate() != null && user.getExpiryDate().before(new Date())){ - data.put("userNameMsg","您的账户已过期!"); + data.put("userNameMsg","鎮ㄧ殑璐︽埛宸茶繃鏈�!"); return mav; } @@ -86,7 +86,7 @@ public class UserController { } } if(city == null || location == null){ - data.put("userNameMsg","权限不足!"); + data.put("userNameMsg","鏉冮檺涓嶈冻!"); }else{ if(StringUtils.isNotBlank(model.getForm())){ location = URLDecoder.decode(model.getForm(),"UTF-8"); @@ -122,7 +122,7 @@ public class UserController { mav.setModel(data); FpkUsers users = model.getUser(); if(!users.getPassword().equals(DigestUtils.md5Hex(model.getPasswordOld()))){ - data.put("passwordOldMsg","原密码错误"); + data.put("passwordOldMsg","鍘熷瘑鐮侀敊璇�"); return mav; } Map map = new HashMap(); @@ -151,7 +151,7 @@ public class UserController { } /** - * 链接请求直接登录(新需求) + * 閾炬帴璇锋眰鐩存帴鐧诲綍锛堟柊闇�姹傦級 * @param model * @param req * @param response @@ -191,7 +191,7 @@ public class UserController { } try { - return model.redirect("/noResult/district?cityName="+URLEncoder.encode("上海", "utf-8")); + return model.redirect("/noResult/district?cityName="+URLEncoder.encode("涓婃捣", "utf-8")); } catch (UnsupportedEncodingException e) { e.printStackTrace(); } diff --git a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/filters/AccessLogFilter.java b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/filters/AccessLogFilter.java index d4c29449d..ac28849da 100644 --- a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/filters/AccessLogFilter.java +++ b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/filters/AccessLogFilter.java @@ -73,7 +73,7 @@ public class AccessLogFilter implements Filter { LOGGER.error("error process request: request_url=" + analyticsBean.requestUrl + ", referer=" + analyticsBean.refererUrl, rootCause); } - // 记录运行超过1秒的请求到日志中 + // 璁板綍杩愯瓒呰繃1绉掔殑璇锋眰鍒版棩蹇椾腑 final long time = System.currentTimeMillis() - start; final String actionUri = (String) request.getAttribute(ActionContext.ACTION_URI); if (time > 1000 || (!ChafangtongConfig.getConfig().isProductionEnvironment() && executeCounter.getTotalCount() > 0)) { @@ -94,7 +94,7 @@ public class AccessLogFilter implements Filter { private void writeAccessLog(AnalyticsBean analyticsBean, long duration, String actionUri, int statusCode, String method) { StringBuilder logStr = new StringBuilder(); - // 不要改变顺序 + // 涓嶈鏀瑰彉椤哄簭 logStr.append(DATE_FORMAT.format(analyticsBean.startTime));// 1 logStr.append(SPLIT).append(StringUtils.defaultString(analyticsBean.connectionIp));// 2 logStr.append(SPLIT).append(StringUtils.defaultString(analyticsBean.ip));// 3 diff --git a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/filters/AnalyticsBean.java b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/filters/AnalyticsBean.java index 569c14d66..ef5cb7814 100644 --- a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/filters/AnalyticsBean.java +++ b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/filters/AnalyticsBean.java @@ -105,7 +105,7 @@ public class AnalyticsBean { } /** - * 获得连接客户端的IP(部署环境下一般都设有nginx等http服务器) + * 鑾峰緱杩炴帴瀹㈡埛绔殑IP锛堥儴缃茬幆澧冧笅涓�鑸兘璁炬湁nginx绛塰ttp鏈嶅姟鍣級 * * @param request * @return @@ -123,7 +123,7 @@ public class AnalyticsBean { String citySpell = getCitySpell(request.getRequestURL().toString()); ServerArea city = ServerAreaData.getServerAreaByNameOrSpellDefaultNull(citySpell); if (null != city) { - // 保存至cookie + // 淇濆瓨鑷砪ookie Cookie cityCookie = cookieContext.createCookie(CookieName.COOKIE_CITY, citySpell); cityCookie.setMaxAge(Integer.MAX_VALUE); response.addCookie(cityCookie); @@ -137,7 +137,7 @@ public class AnalyticsBean { } private String createUID(HttpServletRequest request, HttpServletResponse response) { - // 设置UUID + // 璁剧疆UUID String uuid = new ObjectId().toString(); Cookie uuidCookie = cookieContext.createCookie(CookieName.UID, uuid); uuidCookie.setMaxAge(Integer.MAX_VALUE); @@ -152,7 +152,7 @@ public class AnalyticsBean { } private String createSID(HttpServletRequest request, HttpServletResponse response) { - // 设置session id + // 璁剧疆session id String sid = new ObjectId().toString(); Cookie uuidCookie = cookieContext.createCookie(CookieName.SID, sid); uuidCookie.setMaxAge(-1); @@ -165,7 +165,7 @@ public class AnalyticsBean { } /** - * 请求url,不包括query string + * 璇锋眰url锛屼笉鍖呮嫭query string * * @return */ @@ -174,7 +174,7 @@ public class AnalyticsBean { } /** - * 请求url后的请求参数,如果参数不为空则包括问号在内 + * 璇锋眰url鍚庣殑璇锋眰鍙傛暟锛屽鏋滃弬鏁颁笉涓虹┖鍒欏寘鎷棶鍙峰湪鍐� * * @return */ @@ -183,7 +183,7 @@ public class AnalyticsBean { } /** - * 请求uri + * 璇锋眰uri * * @return */ @@ -192,7 +192,7 @@ public class AnalyticsBean { } /** - * 来源url + * 鏉ユ簮url * * @return */ @@ -201,7 +201,7 @@ public class AnalyticsBean { } /** - * 完整的请求url,包括query string + * 瀹屾暣鐨勮姹倁rl锛屽寘鎷琿uery string * * @return */ @@ -210,7 +210,7 @@ public class AnalyticsBean { } /** - * 是否刷新缓存 + * 鏄惁鍒锋柊缂撳瓨 * * @return */ @@ -219,7 +219,7 @@ public class AnalyticsBean { } /** - * 当前城市,可能为null + * 褰撳墠鍩庡競锛屽彲鑳戒负null * * @return */ @@ -228,7 +228,7 @@ public class AnalyticsBean { } /** - * 当前城市,不会为null + * 褰撳墠鍩庡競锛屼笉浼氫负null * * @return */ @@ -237,7 +237,7 @@ public class AnalyticsBean { } /** - * cookie中的uid,如果没有则生成新的uid + * cookie涓殑uid锛屽鏋滄病鏈夊垯鐢熸垚鏂扮殑uid * * @return */ @@ -246,7 +246,7 @@ public class AnalyticsBean { } /** - * 全局的请求id + * 鍏ㄥ眬鐨勮姹俰d * * @return */ @@ -255,7 +255,7 @@ public class AnalyticsBean { } /** - * cookie中的会话id,如果没有则生成新的sid + * cookie涓殑浼氳瘽id锛屽鏋滄病鏈夊垯鐢熸垚鏂扮殑sid * * @return */ @@ -264,7 +264,7 @@ public class AnalyticsBean { } /** - * 是否为ajax请求 + * 鏄惁涓篴jax璇锋眰 * * @return */ @@ -273,7 +273,7 @@ public class AnalyticsBean { } /** - * 访问者的真实ip + * 璁块棶鑰呯殑鐪熷疄ip * * @return */ @@ -282,7 +282,7 @@ public class AnalyticsBean { } /** - * 访问者标识,可能为null + * 璁块棶鑰呮爣璇嗭紝鍙兘涓簄ull * * @return */ @@ -291,7 +291,7 @@ public class AnalyticsBean { } /** - * 连接ip + * 杩炴帴ip * * @return */ @@ -300,7 +300,7 @@ public class AnalyticsBean { } /** - * cookie中的uid,如果没有则为空字符串 + * cookie涓殑uid锛屽鏋滄病鏈夊垯涓虹┖瀛楃涓� * * @return */ @@ -309,7 +309,7 @@ public class AnalyticsBean { } /** - * cookie中的会话id,如果没有则为空字符串 + * cookie涓殑浼氳瘽id锛屽鏋滄病鏈夊垯涓虹┖瀛楃涓� * * @return */ @@ -318,7 +318,7 @@ public class AnalyticsBean { } /** - * 请求开始时间 + * 璇锋眰寮�濮嬫椂闂� * * @return */ diff --git a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/filters/AnalyticsFilter.java b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/filters/AnalyticsFilter.java index 5c66cf335..bd68b2875 100644 --- a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/filters/AnalyticsFilter.java +++ b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/filters/AnalyticsFilter.java @@ -59,12 +59,12 @@ public class AnalyticsFilter implements Filter { ServletException { final AnalyticsBean analyticsBean = AnalyticsBean.get(request, response); - // 点击日志 + // 鐐瑰嚮鏃ュ織 if (analyticsBean.requestUrl.indexOf("/__utm.gif") > -1) { processUtmGifLog(request, response, analyticsBean); return; } - // 判断URL是否合法,不合法则重定向 + // 鍒ゆ柇URL鏄惁鍚堟硶锛屼笉鍚堟硶鍒欓噸瀹氬悜 String redirectUrl = checkUrlFormat(analyticsBean); if (null != redirectUrl) { if (analyticsBean.isSpider()) { @@ -84,7 +84,7 @@ public class AnalyticsFilter implements Filter { threadLocalData.put(ThreadLocalKey.DisableCache, "1"); } - // 切换城市 + // 鍒囨崲鍩庡競 FangjiaServerAreaContextHolder.setServerArea(analyticsBean.city); threadLocalData.put(ThreadLocalKey.FromSpider, analyticsBean.isSpider()); chain.doFilter(request, response); @@ -105,7 +105,7 @@ public class AnalyticsFilter implements Filter { responseOutputStream.close(); String userAgent = analyticsBean.userAgent; if (userAgent != null && (userAgent.indexOf("Googlebot-Image") >= 0 || userAgent.indexOf("Baidu") >= 0)) { - // 过滤爬虫的访问 + // 杩囨护鐖櫕鐨勮闂� return; } jmsTemplate.send(utmgifDestination, new MessageCreator() { @@ -138,7 +138,7 @@ public class AnalyticsFilter implements Filter { } /** - * 判断URL是否合法,合法则返回null,否则返回重定向URL + * 鍒ゆ柇URL鏄惁鍚堟硶锛屽悎娉曞垯杩斿洖null锛屽惁鍒欒繑鍥為噸瀹氬悜URL * * @param requestUrl * @param requestUri @@ -148,7 +148,7 @@ public class AnalyticsFilter implements Filter { private String checkUrlFormat(AnalyticsBean analyticsBean) { ChafangtongConfig fangjiaConfig = ChafangtongConfig.getConfig(); String hostName = StringUtils.substringBetween(analyticsBean.requestUrl, "http://", "/"); - // 如果hostName中有端口号,则把端口号去掉 + // 濡傛灉hostName涓湁绔彛鍙凤紝鍒欐妸绔彛鍙峰幓鎺� int index = hostName.indexOf(":"); if (index > 0) { hostName = hostName.substring(0, index); @@ -168,7 +168,7 @@ public class AnalyticsFilter implements Filter { return fangjiaConfig.getCityDomainName(city) + analyticsBean.requestUri + analyticsBean.queryString; } if (city != null) { - // 找到对应的城市,或者是一个有效的二级域名 + // 鎵惧埌瀵瑰簲鐨勫煄甯傦紝鎴栬�呮槸涓�涓湁鏁堢殑浜岀骇鍩熷悕 return null; } if (prefixSplit[0].equalsIgnoreCase("www")) { diff --git a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/filters/SpiderValidateFilter.java b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/filters/SpiderValidateFilter.java index 43f4c109e..b04138ddb 100644 --- a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/filters/SpiderValidateFilter.java +++ b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/filters/SpiderValidateFilter.java @@ -53,7 +53,7 @@ public class SpiderValidateFilter implements Filter { private void checkReload() { if (this.reloading.compareAndSet(false, true)) { try { - // 5分钟reload一次 + // 5鍒嗛挓reload涓�娆� if (System.currentTimeMillis() - lastReloadTimestamp < 300000) { return; } @@ -87,13 +87,13 @@ public class SpiderValidateFilter implements Filter { if (isValidUserAgent(ua)) { for (String spiderName : spiderDomains.keySet()) { if (!ua.contains(spiderName)) { - // 未声明自己为spider则跳过 + // 鏈0鏄庤嚜宸变负spider鍒欒烦杩� continue; } if (null == ip) { spider = new Spider(spiderName, ip, ua); spider.setFake(true); - // 对ip为null的蜘蛛暂时不入数据库 + // 瀵筰p涓簄ull鐨勮湗铔涙殏鏃朵笉鍏ユ暟鎹簱 } else { spider = spiders.get(ip); if (null == spider) { @@ -106,7 +106,7 @@ public class SpiderValidateFilter implements Filter { } else { spider = new Spider("unkown", ip, ua); spider.setFake(true); - // 对userAgent为null的蜘蛛暂时不入数据库 + // 瀵箄serAgent涓簄ull鐨勮湗铔涙殏鏃朵笉鍏ユ暟鎹簱 } } if (spider != null && spider.isFake()) { @@ -145,7 +145,7 @@ public class SpiderValidateFilter implements Filter { private void validateSpider(Spider spider) { if (null == spider.getId()) { - // 新发现的蜘蛛 + // 鏂板彂鐜扮殑铚樿洓 checkSpider(spider); spiderService.upsertByIp(spider); spiders.put(spider.getIp(), spider); @@ -153,23 +153,23 @@ public class SpiderValidateFilter implements Filter { LOGGER.info("find new spider: " + spider); } } else if (spider.isVerified()) { - // 已人工验证的蜘蛛 + // 宸蹭汉宸ラ獙璇佺殑铚樿洓 spiders.put(spider.getIp(), spider); } else if (spider.isFake()) { - // 已发现的假蜘蛛 + // 宸插彂鐜扮殑鍋囪湗铔� Date yestoday = DateUtils.addDays(new Date(), -1); if (spider.getModificationDate().before(yestoday)) { - // 删除超过1天的假蜘蛛信息 + // 鍒犻櫎瓒呰繃1澶╃殑鍋囪湗铔涗俊鎭� spiderService.deleteByIp(spider.getIp()); spiders.remove(spider.getIp()); } else { spiders.put(spider.getIp(), spider); } } else { - // 已发现的真蜘蛛 + // 宸插彂鐜扮殑鐪熻湗铔� Date lastWeek = DateUtils.addDays(new Date(), -7); if (spider.getModificationDate().before(lastWeek)) { - // 重新验证超过7天的真蜘蛛 + // 閲嶆柊楠岃瘉瓒呰繃7澶╃殑鐪熻湗铔� checkSpider(spider); if (spider.isFake()) { spiderService.deleteByIp(spider.getIp()); @@ -191,10 +191,10 @@ public class SpiderValidateFilter implements Filter { String host = nslookup(spider.getIp()); if (null != host) { spider.setHost(host); - // 不是相同域的为假蜘蛛 + // 涓嶆槸鐩稿悓鍩熺殑涓哄亣铚樿洓 spider.setFake(!isSameDomain(host, spiderDomains.get(spider.getName()))); } else { - // 反向解析失败,则默认为真蜘蛛 + // 鍙嶅悜瑙f瀽澶辫触锛屽垯榛樿涓虹湡铚樿洓 spider.setHost(spider.getIp()); spider.setFake(false); } diff --git a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/interceptors/AuthenticationInterceptor.java b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/interceptors/AuthenticationInterceptor.java index 9c7f59302..521fd32ae 100644 --- a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/interceptors/AuthenticationInterceptor.java +++ b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/interceptors/AuthenticationInterceptor.java @@ -31,7 +31,7 @@ import java.net.URLEncoder; import java.util.*; /** - * 查房通权限拦截器 + * 鏌ユ埧閫氭潈闄愭嫤鎴櫒 * Created by wenyan on 2015/11/12. */ public class AuthenticationInterceptor implements Interceptor { @@ -75,11 +75,11 @@ public class AuthenticationInterceptor implements Interceptor { isPassed = false; } if(isPassed && city == null){ - LOGGER.info("无法访问" + request.getRequestURI() + "请用cityName 指定访问资源所在的城市"); + LOGGER.info("鏃犳硶璁块棶" + request.getRequestURI() + "璇风敤cityName 鎸囧畾璁块棶璧勬簮鎵�鍦ㄧ殑鍩庡競"); error = "noAuth"; } if(isPassed && !isAccessible(user, city, request)){ - LOGGER.info("无法访问" + request.getRequestURI() + "!!!请到菜单管理添加菜单"); + LOGGER.info("鏃犳硶璁块棶" + request.getRequestURI() + "!!!璇峰埌鑿滃崟绠$悊娣诲姞鑿滃崟"); isPassed = false; error = "noAuth"; } diff --git a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/model/BaseModel.java b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/model/BaseModel.java index 428aecc02..330320a84 100644 --- a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/model/BaseModel.java +++ b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/model/BaseModel.java @@ -235,7 +235,7 @@ public class BaseModel extends ModelAndViewSupport { } /** - * 如果queryString不为空则在前面加上问号"?",否则不加 + * 濡傛灉queryString涓嶄负绌哄垯鍦ㄥ墠闈㈠姞涓婇棶鍙�"?"锛屽惁鍒欎笉鍔� * * @return */ diff --git a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/model/ConsumModel.java b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/model/ConsumModel.java index d8c342e86..768353d38 100644 --- a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/model/ConsumModel.java +++ b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/model/ConsumModel.java @@ -5,7 +5,7 @@ import com.fangjia.service.bo.DistrictStatBo; public class ConsumModel extends ChafangtongModel { private static final long serialVersionUID = 6142958920656840695L; - private Double avgConsumption; // 周边餐饮人均消费 + private Double avgConsumption; // 鍛ㄨ竟椁愰ギ浜哄潎娑堣垂 private DistrictStatBo statBo; private Double higher; diff --git a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/model/Models.java b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/model/Models.java index 8fdb2ea0d..d9a93608b 100644 --- a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/model/Models.java +++ b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/model/Models.java @@ -3,17 +3,17 @@ package com.fangjia.chafangtong.model; public final class Models { /** - * 404错误面页的model + * 404閿欒闈㈤〉鐨刴odel */ public static final BaseModel NOT_FOUNT = createModel(404, "/error"); /** - * 一般错误面页的model + * 涓�鑸敊璇潰椤电殑model */ public static final BaseModel ERROR = createModel(500, "/error"); /** - * 500错误面页的model + * 500閿欒闈㈤〉鐨刴odel */ public static final BaseModel FORBIDDEN = createModel(400, "/forbidden"); diff --git a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/model/NoResultModel.java b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/model/NoResultModel.java index 3e6062be4..ea6ca730a 100644 --- a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/model/NoResultModel.java +++ b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/model/NoResultModel.java @@ -13,7 +13,7 @@ public class NoResultModel extends ChafangtongModel { private double maxLng; double centerLat; double centerLng; - String type; // r: 矩形搜索(最大最小经纬度),c:圆形搜索(中心点、半径) + String type; // r: 鐭╁舰鎼滅储锛堟渶澶ф渶灏忕粡绾害锛夛紝c锛氬渾褰㈡悳绱紙涓績鐐广�佸崐寰勶級 List> result; public List getInsideShops() { diff --git a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/model/NodistrictModel.java b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/model/NodistrictModel.java index a75893b01..c59925a2c 100644 --- a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/model/NodistrictModel.java +++ b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/model/NodistrictModel.java @@ -11,15 +11,15 @@ import com.fangjia.service.bo.DistrictStatRentBo; public class NodistrictModel extends ChafangtongModel { private static final long serialVersionUID = -2866501361955105846L; - // 房价 + // 鎴夸环 Integer areaPrice; Integer cityPrice; Double priceLeft; - List priceNearest; // 最近的3个商铺价格 - List priceTop5; // 最高的5个 - List priceBtm5; // 最低的5个 + List priceNearest; // 鏈�杩戠殑3涓晢閾轰环鏍� + List priceTop5; // 鏈�楂樼殑5涓� + List priceBtm5; // 鏈�浣庣殑5涓� - // 租金 + // 绉熼噾 Integer areaRent1; Integer areaRent2; Integer areaRent3; @@ -30,7 +30,7 @@ public class NodistrictModel extends ChafangtongModel { DistrictStatRent[] rentRank3; DistrictStatRent[] rentRank4; - Double avgConsumption; // 周边餐饮人均消费 + Double avgConsumption; // 鍛ㄨ竟椁愰ギ浜哄潎娑堣垂 Double higher; List metroStations; diff --git a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/model/NoshopModel.java b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/model/NoshopModel.java index 9be73970b..f17a10f07 100644 --- a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/model/NoshopModel.java +++ b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/model/NoshopModel.java @@ -11,30 +11,30 @@ import com.fangjia.service.bo.DistrictStatBo; public class NoshopModel extends ChafangtongModel { private static final long serialVersionUID = -170439161907268598L; - // 房价 + // 鎴夸环 Integer areaPrice; Integer cityPrice; Double priceLeft; - List priceNearest; // 最近的3个商铺价格 - List priceTop5; // 最高的5个 - List priceBtm5; // 最低的5个 + List priceNearest; // 鏈�杩戠殑3涓晢閾轰环鏍� + List priceTop5; // 鏈�楂樼殑5涓� + List priceBtm5; // 鏈�浣庣殑5涓� - // 租金 + // 绉熼噾 Integer areaRentPrice; Integer cityRentPrice; Double rentLeft; - List rentNearest; // 最近的3个商铺价格 - List rentTop5; // 最高的5个 - List rentBtm5; // 最低的5个 + List rentNearest; // 鏈�杩戠殑3涓晢閾轰环鏍� + List rentTop5; // 鏈�楂樼殑5涓� + List rentBtm5; // 鏈�浣庣殑5涓� - // 地段 + // 鍦版 List metroStations; List busStations; double disHongqiaoAirport; double disHongqiaoStation; Map typePercentMap; - // 人口 + // 浜哄彛 int cityAvgPrice; String districts; String offices; @@ -55,8 +55,8 @@ public class NoshopModel extends ChafangtongModel { Double left1; Double left2; - // 消费 - Double avgConsumption; // 周边餐饮人均消费 + // 娑堣垂 + Double avgConsumption; // 鍛ㄨ竟椁愰ギ浜哄潎娑堣垂 Double higher; private final String[] PIE_COLOR_RGBS = new String[] { "#C6DBF7", "#F5EEBD", "#DEE7C6", "#FFD7BD", "#D6C3E7", "#C3E1E7", diff --git a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/model/ReportModel.java b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/model/ReportModel.java index b8a479d16..299cff0b2 100644 --- a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/model/ReportModel.java +++ b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/model/ReportModel.java @@ -29,7 +29,7 @@ public class ReportModel extends ChafangtongModel { List pieColors; List pieMarkers; - // 综合指数 + // 缁煎悎鎸囨暟 double detailScore; double detailScore1; double detailScore2; @@ -39,7 +39,7 @@ public class ReportModel extends ChafangtongModel { double shopArea; List aroundTypes; - // 房价指数 + // 鎴夸环鎸囨暟 double priceScore; Integer cityPrice; DistrictStatBo statBo; @@ -48,21 +48,21 @@ public class ReportModel extends ChafangtongModel { List regionStatRents; List rentStatBos; - // 租金指数 + // 绉熼噾鎸囨暟 double rentScore; DistrictBusinessStatRentBo rentStatBo; String regionPayment; Double rentLeft; String rentTradeUrl; - // 地段指数 + // 鍦版鎸囨暟 double localScore; double localScore1; double localScore2; Integer regionPrice; String aroundPieUrl; - // 人口指数 + // 浜哄彛鎸囨暟 double peopleScore; double peopleScore1; double peopleScore2; @@ -79,26 +79,26 @@ public class ReportModel extends ChafangtongModel { Double left1; Double left2; - // 消费指数 + // 娑堣垂鎸囨暟 double consumScore; - Double avgConsumption; // 周边餐饮人均消费 + Double avgConsumption; // 鍛ㄨ竟椁愰ギ浜哄潎娑堣垂 Double higher; Map consumCountMap; - // 环境指数 + // 鐜鎸囨暟 double aroundScore; double aroundScore1; double aroundScore2; Map aroundCountMap; - // 潜力指数 + // 娼滃姏鎸囨暟 double predictScore; Integer predictPrice; Double predictMarkup; Integer districtMinPrice; Integer districtMaxPrice; - // 稀缺指数 + // 绋�缂烘寚鏁� double rankScore; DistrictHot districtHot; DistrictAttentionRank districtAttention; @@ -113,7 +113,7 @@ public class ReportModel extends ChafangtongModel { double totalScore; private FpkDownload fpkDownload; - //报告编号 + //鎶ュ憡缂栧彿 private String serialNum; private Integer totalPrice; diff --git a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/model/RestfulModelAndView.java b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/model/RestfulModelAndView.java index 82fc23d44..4df1852dc 100644 --- a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/model/RestfulModelAndView.java +++ b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/model/RestfulModelAndView.java @@ -3,7 +3,7 @@ package com.fangjia.chafangtong.model; import org.sothis.web.mvc.ModelAndViewSupport; /** - * 用于restAPI的ModelAndView + * 鐢ㄤ簬restAPI鐨凪odelAndView * * @author velna * diff --git a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/servlet/ChartImgServlet.java b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/servlet/ChartImgServlet.java index 85f4f8a68..678ffc864 100644 --- a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/servlet/ChartImgServlet.java +++ b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/servlet/ChartImgServlet.java @@ -49,7 +49,7 @@ public class ChartImgServlet extends HttpServlet { @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - request.setCharacterEncoding("UTF-8");// 注意编码 + request.setCharacterEncoding("UTF-8");// 娉ㄦ剰缂栫爜 String reqUrl = request.getRequestURI(); String i = reqUrl.substring(reqUrl.indexOf("/cImg/") + 6, reqUrl.length()); @@ -107,7 +107,7 @@ public class ChartImgServlet extends HttpServlet { } /** - * 处理均价类走势图 + * 澶勭悊鍧囦环绫昏蛋鍔垮浘 * * @throws IOException */ @@ -170,7 +170,7 @@ public class ChartImgServlet extends HttpServlet { } /** - * 处理租金类走势图 + * 澶勭悊绉熼噾绫昏蛋鍔垮浘 * * @throws IOException */ @@ -233,7 +233,7 @@ public class ChartImgServlet extends HttpServlet { } /** - * 周边行业饼图 + * 鍛ㄨ竟琛屼笟楗煎浘 * * @throws IOException */ @@ -305,7 +305,7 @@ public class ChartImgServlet extends HttpServlet { } /** - * 卖家关注度排行柱状图 + * 鍗栧鍏虫敞搴︽帓琛屾煴鐘跺浘 * * @throws IOException */ diff --git a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/servlet/ReportServlet.java b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/servlet/ReportServlet.java index ce10e91ba..c3d1b2cc8 100644 --- a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/servlet/ReportServlet.java +++ b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/servlet/ReportServlet.java @@ -56,7 +56,7 @@ public class ReportServlet extends HttpServlet { System.setProperty("javax.xml.transform.TransformerFactory", "com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl"); - // 字体文件 + // 瀛椾綋鏂囦欢 ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); FONT_PATHS.add(classLoader.getResource("districtreport/SIMSUN.TTC").toString()); FONT_PATHS.add(classLoader.getResource("districtreport/SIMHEI.TTF").toString()); @@ -106,11 +106,11 @@ public class ReportServlet extends HttpServlet { PdfCopy copy = new PdfCopy(document, resp.getOutputStream()); document.open(); document.newPage(); -// // 封面 +// // 灏侀潰 // PdfReader reader = new PdfReader(FRONTCOVER_DATA); // PdfImportedPage coverPage = copy.getImportedPage(reader, 1); // copy.addPage(coverPage); -// // 目录 +// // 鐩綍 // reader = new PdfReader(DIRECTORY_DATA); // PdfImportedPage directoryPage = copy.getImportedPage(reader, 1); // copy.addPage(directoryPage); @@ -129,7 +129,7 @@ public class ReportServlet extends HttpServlet { } /** - * 根据页面URL获取内容 + * 鏍规嵁椤甸潰URL鑾峰彇鍐呭 */ private byte[] getPageData(String pagePath,HttpServletRequest request) { long start = System.currentTimeMillis(); @@ -151,7 +151,7 @@ public class ReportServlet extends HttpServlet { html = html.replaceAll(" ", " "); renderer.setDocumentFromString(html); - // 解决中文支持问题 + // 瑙e喅涓枃鏀寔闂 ITextFontResolver fontResolver = renderer.getFontResolver(); for (String path : FONT_PATHS) { fontResolver.addFont(path, BaseFont.IDENTITY_H, BaseFont.NOT_EMBEDDED); diff --git a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/util/DesUtils.java b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/util/DesUtils.java index eedf3c8e8..2c102d65b 100644 --- a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/util/DesUtils.java +++ b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/util/DesUtils.java @@ -19,9 +19,9 @@ public class DesUtils { private final static String DES = "DES"; /** - * Description 根据键值进行加密 + * Description 鏍规嵁閿�艰繘琛屽姞瀵� * @param data - * @param key 加密键byte数组 + * @param key 鍔犲瘑閿産yte鏁扮粍 * @return * @throws Exception */ @@ -32,9 +32,9 @@ public class DesUtils { } /** - * Description 根据键值进行解密 + * Description 鏍规嵁閿�艰繘琛岃В瀵� * @param data - * @param key 加密键byte数组 + * @param key 鍔犲瘑閿産yte鏁扮粍 * @return * @throws IOException * @throws Exception @@ -50,27 +50,27 @@ public class DesUtils { } /** - * Description 根据键值进行加密 + * Description 鏍规嵁閿�艰繘琛屽姞瀵� * @param data - * @param key 加密键byte数组 + * @param key 鍔犲瘑閿産yte鏁扮粍 * @return * @throws Exception */ private static byte[] encrypt(byte[] data, byte[] key) throws Exception { - // 生成一个可信任的随机数源 + // 鐢熸垚涓�涓彲淇′换鐨勯殢鏈烘暟婧� SecureRandom sr = new SecureRandom(); - // 从原始密钥数据创建DESKeySpec对象 + // 浠庡師濮嬪瘑閽ユ暟鎹垱寤篋ESKeySpec瀵硅薄 DESKeySpec dks = new DESKeySpec(key); - // 创建一个密钥工厂,然后用它把DESKeySpec转换成SecretKey对象 + // 鍒涘缓涓�涓瘑閽ュ伐鍘傦紝鐒跺悗鐢ㄥ畠鎶奃ESKeySpec杞崲鎴怱ecretKey瀵硅薄 SecretKeyFactory keyFactory = SecretKeyFactory.getInstance(DES); SecretKey securekey = keyFactory.generateSecret(dks); - // Cipher对象实际完成加密操作 + // Cipher瀵硅薄瀹為檯瀹屾垚鍔犲瘑鎿嶄綔 Cipher cipher = Cipher.getInstance(DES); - // 用密钥初始化Cipher对象 + // 鐢ㄥ瘑閽ュ垵濮嬪寲Cipher瀵硅薄 cipher.init(Cipher.ENCRYPT_MODE, securekey, sr); return cipher.doFinal(data); @@ -78,27 +78,27 @@ public class DesUtils { /** - * Description 根据键值进行解密 + * Description 鏍规嵁閿�艰繘琛岃В瀵� * @param data - * @param key 加密键byte数组 + * @param key 鍔犲瘑閿産yte鏁扮粍 * @return * @throws Exception */ private static byte[] decrypt(byte[] data, byte[] key) throws Exception { - // 生成一个可信任的随机数源 + // 鐢熸垚涓�涓彲淇′换鐨勯殢鏈烘暟婧� SecureRandom sr = new SecureRandom(); - // 从原始密钥数据创建DESKeySpec对象 + // 浠庡師濮嬪瘑閽ユ暟鎹垱寤篋ESKeySpec瀵硅薄 DESKeySpec dks = new DESKeySpec(key); - // 创建一个密钥工厂,然后用它把DESKeySpec转换成SecretKey对象 + // 鍒涘缓涓�涓瘑閽ュ伐鍘傦紝鐒跺悗鐢ㄥ畠鎶奃ESKeySpec杞崲鎴怱ecretKey瀵硅薄 SecretKeyFactory keyFactory = SecretKeyFactory.getInstance(DES); SecretKey securekey = keyFactory.generateSecret(dks); - // Cipher对象实际完成解密操作 + // Cipher瀵硅薄瀹為檯瀹屾垚瑙e瘑鎿嶄綔 Cipher cipher = Cipher.getInstance(DES); - // 用密钥初始化Cipher对象 + // 鐢ㄥ瘑閽ュ垵濮嬪寲Cipher瀵硅薄 cipher.init(Cipher.DECRYPT_MODE, securekey, sr); return cipher.doFinal(data); @@ -106,7 +106,7 @@ public class DesUtils { /** - * Description 获取字符串MD5值 + * Description 鑾峰彇瀛楃涓睲D5鍊� * @param sourceStr */ private static String MD5(String sourceStr) { @@ -137,12 +137,12 @@ public class DesUtils { public static void main(String[] args) throws Exception { String data = "18616348076_1234561"; - String key = "fangjia_pds_goojia"; //秘钥 + String key = "fangjia_pds_goojia"; //绉橀挜 String encode = encrypt(data, key); - System.err.println("加密:"+encode); - System.err.println("加密encode:"+URLEncoder.encode(encode, "utf-8")); - System.err.println("加密decode:"+URLDecoder.decode(URLEncoder.encode(encode, "utf-8"), "utf-8")); + System.err.println("鍔犲瘑锛�"+encode); + System.err.println("鍔犲瘑encode锛�"+URLEncoder.encode(encode, "utf-8")); + System.err.println("鍔犲瘑decode锛�"+URLDecoder.decode(URLEncoder.encode(encode, "utf-8"), "utf-8")); String dcode = decrypt(encode, key); - System.err.println("解密:"+dcode); + System.err.println("瑙e瘑锛�"+dcode); } } diff --git a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/util/DistrictScoreUtil.java b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/util/DistrictScoreUtil.java index 3194159f3..5c8efd060 100644 --- a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/util/DistrictScoreUtil.java +++ b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/util/DistrictScoreUtil.java @@ -14,68 +14,68 @@ import com.fangjia.service.bo.DistrictStatRentBo; public class DistrictScoreUtil { /** - * 城市平均租金(确认) + * 鍩庡競骞冲潎绉熼噾(纭) */ private final static int CITY_AVG_RENT_PRICE = 5847; /** - * 市均餐饮人均消费(确认) + * 甯傚潎椁愰ギ浜哄潎娑堣垂(纭) */ private final static int CITY_AVG_CONSUMPTION = 50; /** - * 上月房源平均发布量(确认) + * 涓婃湀鎴挎簮骞冲潎鍙戝竷閲�(纭) * modify by shibb 2015-6-18 */ // private final static int LAST_MONTH_HOUSES_AVG = 200; private final static int LAST_MONTH_HOUSES_AVG = 65; /** - * 半年房源平均发布量(确认) + * 鍗婂勾鎴挎簮骞冲潎鍙戝竷閲�(纭) */ private final static int HALF_YEAR_HOUSES_AVG = 1000; /** - * 市均容积率(确认) + * 甯傚潎瀹圭Н鐜�(纭) */ private final static double CITY_AVG_CUBAGE_PERCENT = 2.0; /** - * 市均绿化率(确认) + * 甯傚潎缁垮寲鐜�(纭) */ private final static double CITY_AVG_VIRESCENCE_PERCENT = 40; /** - * 城市户均占地面积(确认) + * 鍩庡競鎴峰潎鍗犲湴闈㈢Н(纭) */ private final static double CITY_AVG_HOUSEHOLD_ALLAREA = 50; /** - * 城市户均建筑面积(确认) + * 鍩庡競鎴峰潎寤虹瓚闈㈢Н(纭) */ private final static double CITY_AVG_HOUSEHOLD_BUILDAREA = 100; /** - * 市均停车位(确认) + * 甯傚潎鍋滆溅浣�(纭) */ private final static double CITY_AVG_CAR_SITE = 300; /** - * 市均物业费(确认) + * 甯傚潎鐗╀笟璐�(纭) */ private final static double CITY_AVG_ESTATE_CHARGE = 1.59; /** - * 稀缺度指数中关注度所占比重 + * 绋�缂哄害鎸囨暟涓叧娉ㄥ害鎵�鍗犳瘮閲� */ private final static int ATTENTION_RATIO = 7; /** - * 稀缺度指数中挂牌量所占比重 + * 绋�缂哄害鎸囨暟涓寕鐗岄噺鎵�鍗犳瘮閲� */ private final static int HOT_RATIO = 3; /** - * 房价指数 + * 鎴夸环鎸囨暟 * modify by shibb 2015-6-19 */ public static double priceScore(Integer districtPrice, Integer cityPrice, Integer leave, List rentBos) { @@ -184,11 +184,11 @@ public class DistrictScoreUtil { } /** - * 新的计算房价指数的方法 + * 鏂扮殑璁$畻鎴夸环鎸囨暟鐨勬柟娉� * - * @param districtAvgPrice 小区均价 + * @param districtAvgPrice 灏忓尯鍧囦环 * @param cityAvgPrice - * @param mPrice 方差 + * @param mPrice 鏂瑰樊 * @param rentBos * @return */ @@ -254,32 +254,32 @@ public class DistrictScoreUtil { int s = (int) score; switch (s) { case 1: - return "属于城市中房价较低的住宅"; + return "灞炰簬鍩庡競涓埧浠疯緝浣庣殑浣忓畢"; case 2: - return "属于城市中房价较低的住宅"; + return "灞炰簬鍩庡競涓埧浠疯緝浣庣殑浣忓畢"; case 3: - return "属于城市中房价较低的住宅"; + return "灞炰簬鍩庡競涓埧浠疯緝浣庣殑浣忓畢"; case 4: - return "属于接近城市均价的住宅"; + return "灞炰簬鎺ヨ繎鍩庡競鍧囦环鐨勪綇瀹�"; case 5: - return "属于接近城市均价的住宅"; + return "灞炰簬鎺ヨ繎鍩庡競鍧囦环鐨勪綇瀹�"; case 6: - return "属于略高于城市均价的住宅"; + return "灞炰簬鐣ラ珮浜庡煄甯傚潎浠风殑浣忓畢"; case 7: - return "属于城市中房价较高的住宅"; + return "灞炰簬鍩庡競涓埧浠疯緝楂樼殑浣忓畢"; case 8: - return "属于城市中房价较高的住宅"; + return "灞炰簬鍩庡競涓埧浠疯緝楂樼殑浣忓畢"; case 9: - return "属于城市中房价非常高的住宅"; + return "灞炰簬鍩庡競涓埧浠烽潪甯搁珮鐨勪綇瀹�"; case 10: - return "属于城市中房价非常高的住宅"; + return "灞炰簬鍩庡競涓埧浠烽潪甯搁珮鐨勪綇瀹�"; default: return ""; } } /** - * 消费指数 + * 娑堣垂鎸囨暟 * modify by shibb 2015-6-18 */ public static double consumScore(Double avgConsumption, Map countMap) { @@ -317,12 +317,12 @@ public class DistrictScoreUtil { } } - if (null != countMap.get("商场")) { + if (null != countMap.get("鍟嗗満")) { ret += 0.2; -// if (countMap.get("商场") >= 5) { +// if (countMap.get("鍟嗗満") >= 5) { // ret += 0.3; // } - if (countMap.get("商场") >= 8) { + if (countMap.get("鍟嗗満") >= 8) { ret += 0.3; } } @@ -335,48 +335,48 @@ public class DistrictScoreUtil { ret += 0.1; } } - if (null != countMap.get("电影院")) { + if (null != countMap.get("鐢靛奖闄�")) { ret += 0.1; } - if (null != countMap.get("健身中心")) { + if (null != countMap.get("鍋ヨ韩涓績")) { ret += 0.2; } - if (null != countMap.get("美容院")) { + if (null != countMap.get("缇庡闄�")) { ret += 0.1; -// if (countMap.get("美容院") >= 5) { +// if (countMap.get("缇庡闄�") >= 5) { // ret += 0.2; // } - if (countMap.get("美容院") >= 20) { + if (countMap.get("缇庡闄�") >= 20) { ret += 0.1; } } - if (null != countMap.get("大型超市")) { + if (null != countMap.get("澶у瀷瓒呭競")) { ret += 0.2; } - if (null != countMap.get("高尔夫球场")) { + if (null != countMap.get("楂樺皵澶悆鍦�")) { ret += 0.5; } - if (null != countMap.get("私立学校")) { + if (null != countMap.get("绉佺珛瀛︽牎")) { ret += 0.2; - if (countMap.get("私立学校") >= 5) { + if (countMap.get("绉佺珛瀛︽牎") >= 5) { ret += 0.3; } } - if (null != countMap.get("整形")) { + if (null != countMap.get("鏁村舰")) { ret += 0.2; - if (countMap.get("整形") >= 3) { + if (countMap.get("鏁村舰") >= 3) { ret += 0.3; } } - if (null != countMap.get("洗浴")) { + if (null != countMap.get("娲楁荡")) { ret += 0.1; } - if (null != countMap.get("私立医院")) { + if (null != countMap.get("绉佺珛鍖婚櫌")) { ret += 0.2; } - if (null != countMap.get("星级酒店")) { + if (null != countMap.get("鏄熺骇閰掑簵")) { ret += 0.2; -// if (countMap.get("星级酒店") >= 5) { +// if (countMap.get("鏄熺骇閰掑簵") >= 5) { // ret += 0.2; // } } @@ -388,44 +388,44 @@ public class DistrictScoreUtil { int s = (int) score; switch (s) { case 1: - return "周边消费水平非常低,生活成
本低廉"; + return "鍛ㄨ竟娑堣垂姘村钩闈炲父浣庯紝鐢熸椿鎴�
鏈綆寤�"; case 2: - return "周边消费水平非常低,生活成
本低廉"; + return "鍛ㄨ竟娑堣垂姘村钩闈炲父浣庯紝鐢熸椿鎴�
鏈綆寤�"; case 3: - return "周边消费水平较低,生活成
本较低"; + return "鍛ㄨ竟娑堣垂姘村钩杈冧綆锛岀敓娲绘垚
鏈緝浣�"; case 4: - return "周边消费水平较低,生活成
本较低"; + return "鍛ㄨ竟娑堣垂姘村钩杈冧綆锛岀敓娲绘垚
鏈緝浣�"; case 5: - return "周边消费水平一般"; + return "鍛ㄨ竟娑堣垂姘村钩涓�鑸�"; case 6: - return "周边消费水平一般"; + return "鍛ㄨ竟娑堣垂姘村钩涓�鑸�"; case 7: - return "周边消费水平较高,生活成
本较高"; + return "鍛ㄨ竟娑堣垂姘村钩杈冮珮锛岀敓娲绘垚
鏈緝楂�"; case 8: - return "周边消费水平较高,生活成
本较高"; + return "鍛ㄨ竟娑堣垂姘村钩杈冮珮锛岀敓娲绘垚
鏈緝楂�"; case 9: - return "周边消费水平非常高,生活成
本昂贵"; + return "鍛ㄨ竟娑堣垂姘村钩闈炲父楂橈紝鐢熸椿鎴�
鏈槀璐�"; case 10: - return "周边消费水平非常高,生活成
本昂贵"; + return "鍛ㄨ竟娑堣垂姘村钩闈炲父楂橈紝鐢熸椿鎴�
鏈槀璐�"; default: return ""; } } /** - * 环境指数计算 + * 鐜鎸囨暟璁$畻 * modify by shibb 2015-6-18 */ public static double aroundScore(Map countMap) { double ret = 0d; - int schoolCount = null == countMap.get("学校") ? 0 : countMap.get("学校"); - int hospitalCount = null == countMap.get("医院") ? 0 : countMap.get("医院"); - int bankCount = null == countMap.get("银行") ? 0 : countMap.get("银行"); + int schoolCount = null == countMap.get("瀛︽牎") ? 0 : countMap.get("瀛︽牎"); + int hospitalCount = null == countMap.get("鍖婚櫌") ? 0 : countMap.get("鍖婚櫌"); + int bankCount = null == countMap.get("閾惰") ? 0 : countMap.get("閾惰"); - if (null != countMap.get("公交点")) { - int busCount = countMap.get("公交点"); - if (null == countMap.get("地铁站") || countMap.get("地铁站") == 0) { + if (null != countMap.get("鍏氦鐐�")) { + int busCount = countMap.get("鍏氦鐐�"); + if (null == countMap.get("鍦伴搧绔�") || countMap.get("鍦伴搧绔�") == 0) { if (busCount <= 3) { ret += 1; } else if (busCount <= 8) { @@ -438,7 +438,7 @@ public class DistrictScoreUtil { ret += 5; } } else { - int metroCount = countMap.get("地铁站"); + int metroCount = countMap.get("鍦伴搧绔�"); if (metroCount < 1) { if (busCount <= 3) { ret += 1; @@ -490,27 +490,27 @@ public class DistrictScoreUtil { } } - if (null != countMap.get("写字楼") && countMap.get("写字楼") >= 5) { + if (null != countMap.get("鍐欏瓧妤�") && countMap.get("鍐欏瓧妤�") >= 5) { ret += 0.5; } - if (null != countMap.get("停车场")) { + if (null != countMap.get("鍋滆溅鍦�")) { ret += 0.5; } -// if (null != countMap.get("超市") && countMap.get("超市") >= 5) { +// if (null != countMap.get("瓒呭競") && countMap.get("瓒呭競") >= 5) { // ret += 0.5; // } - if (null != countMap.get("超市") && countMap.get("超市") >= 15) { + if (null != countMap.get("瓒呭競") && countMap.get("瓒呭競") >= 15) { ret += 0.5; } -// if (null != countMap.get("公园") && countMap.get("公园") >= 5) { +// if (null != countMap.get("鍏洯") && countMap.get("鍏洯") >= 5) { // ret += 0.5; // } - if (null != countMap.get("公园")) { + if (null != countMap.get("鍏洯")) { ret += 0.5; } //add by shibb - if (null != countMap.get("发电站") || null != countMap.get("变电站") || null != countMap.get("垃圾焚烧厂") || null != countMap.get("化工厂")) { + if (null != countMap.get("鍙戠數绔�") || null != countMap.get("鍙樼數绔�") || null != countMap.get("鍨冨溇鐒氱儳鍘�") || null != countMap.get("鍖栧伐鍘�")) { ret -= 1; } @@ -521,32 +521,32 @@ public class DistrictScoreUtil { int s = (int) score; switch (s) { case 1: - return "周边公共配套非常差,生活很不便"; + return "鍛ㄨ竟鍏叡閰嶅闈炲父宸紝鐢熸椿寰堜笉渚�"; case 2: - return "周边公共配套非常差,生活很不便"; + return "鍛ㄨ竟鍏叡閰嶅闈炲父宸紝鐢熸椿寰堜笉渚�"; case 3: - return "周边公共配套较差,生活较为不便"; + return "鍛ㄨ竟鍏叡閰嶅杈冨樊锛岀敓娲昏緝涓轰笉渚�"; case 4: - return "周边公共配套较差,生活较为不便"; + return "鍛ㄨ竟鍏叡閰嶅杈冨樊锛岀敓娲昏緝涓轰笉渚�"; case 5: - return "周边公共配套一般,生活便利
指数一般"; + return "鍛ㄨ竟鍏叡閰嶅涓�鑸紝鐢熸椿渚垮埄
鎸囨暟涓�鑸�"; case 6: - return "周边公共配套一般,生活便利
指数一般"; + return "鍛ㄨ竟鍏叡閰嶅涓�鑸紝鐢熸椿渚垮埄
鎸囨暟涓�鑸�"; case 7: - return "周边公共配套较成熟,生活便利"; + return "鍛ㄨ竟鍏叡閰嶅杈冩垚鐔燂紝鐢熸椿渚垮埄"; case 8: - return "周边公共配套较成熟,生活便利"; + return "鍛ㄨ竟鍏叡閰嶅杈冩垚鐔燂紝鐢熸椿渚垮埄"; case 9: - return "周边公共配套非常成熟,生活
很便利"; + return "鍛ㄨ竟鍏叡閰嶅闈炲父鎴愮啛锛岀敓娲�
寰堜究鍒�"; case 10: - return "周边公共配套非常成熟,生活
很便利"; + return "鍛ㄨ竟鍏叡閰嶅闈炲父鎴愮啛锛岀敓娲�
寰堜究鍒�"; default: return ""; } } /** - * 小区综合指数 + * 灏忓尯缁煎悎鎸囨暟 */ public static double detailScore(District district, SeaweedNumberic numberic) { double ret = 0d; @@ -556,11 +556,11 @@ public class DistrictScoreUtil { year = numberic.getFinishBuildYear(); } - // 类型 - if (StringUtils.endsWith(district.getName(), "洋房")) { + // 绫诲瀷 + if (StringUtils.endsWith(district.getName(), "娲嬫埧")) { ret += 9; } else { - if (StringUtils.contains(district.getEstateType2(), "别墅")) { + if (StringUtils.contains(district.getEstateType2(), "鍒")) { if (year >= 1920 && year <= 1949) { ret += 9; } else { @@ -577,7 +577,7 @@ public class DistrictScoreUtil { } } - // 户均占地面积 + // 鎴峰潎鍗犲湴闈㈢Н if (null != numberic && null != numberic.getHouseholdCount() && null != numberic.getAllArea() && numberic.getHouseholdCount() > 0 && numberic.getAllArea() > 0) { double d = numberic.getAllArea() * 1.0 / numberic.getHouseholdCount(); @@ -589,7 +589,7 @@ public class DistrictScoreUtil { } } - // 户均建筑面积 + // 鎴峰潎寤虹瓚闈㈢Н if (null != numberic && null != numberic.getHouseholdCount() && null != numberic.getBuildArea() && numberic.getHouseholdCount() > 0 && numberic.getBuildArea() > 0) { double d = numberic.getBuildArea() * 1.0 / numberic.getHouseholdCount(); @@ -602,7 +602,7 @@ public class DistrictScoreUtil { } } - // 绿化率 + // 缁垮寲鐜� if (null != numberic && null != numberic.getVirescencePercent()) { double d = numberic.getVirescencePercent(); if (d > CITY_AVG_VIRESCENCE_PERCENT && ((d - CITY_AVG_VIRESCENCE_PERCENT) / CITY_AVG_VIRESCENCE_PERCENT > 0.2)) { @@ -612,7 +612,7 @@ public class DistrictScoreUtil { } } - // 容积率 + // 瀹圭Н鐜� if (null != numberic && null != numberic.getCubagePercent()) { double d = numberic.getCubagePercent(); if (d > CITY_AVG_CUBAGE_PERCENT && ((d - CITY_AVG_CUBAGE_PERCENT) / CITY_AVG_CUBAGE_PERCENT > 0.2)) { @@ -622,7 +622,7 @@ public class DistrictScoreUtil { } } - // 停车位 + // 鍋滆溅浣� if (null != numberic && null != numberic.getCarSiteCount()) { double d = numberic.getCarSiteCount(); if (d > CITY_AVG_CAR_SITE && ((d - CITY_AVG_CAR_SITE) / CITY_AVG_CAR_SITE > 0.2)) { @@ -639,7 +639,7 @@ public class DistrictScoreUtil { ret += 0.5; } - // 物业费 + // 鐗╀笟璐� if (null != numberic && null != numberic.getEstateCharge()) { double d = numberic.getEstateCharge(); if (d > CITY_AVG_ESTATE_CHARGE && ((d - CITY_AVG_ESTATE_CHARGE) * 1.0 / CITY_AVG_ESTATE_CHARGE > 0.2)) { @@ -656,32 +656,32 @@ public class DistrictScoreUtil { int s = (int) score; switch (s) { case 1: - return "属于城市的普通住宅"; + return "灞炰簬鍩庡競鐨勬櫘閫氫綇瀹�"; case 2: - return "属于城市的普通住宅"; + return "灞炰簬鍩庡競鐨勬櫘閫氫綇瀹�"; case 3: - return "属于城市的普通住宅"; + return "灞炰簬鍩庡競鐨勬櫘閫氫綇瀹�"; case 4: - return "属于城市的普通住宅"; + return "灞炰簬鍩庡競鐨勬櫘閫氫綇瀹�"; case 5: - return "属于城市的普通住宅"; + return "灞炰簬鍩庡競鐨勬櫘閫氫綇瀹�"; case 6: - return "属于城市的普通住宅"; + return "灞炰簬鍩庡競鐨勬櫘閫氫綇瀹�"; case 7: - return "属于城市的优质住宅"; + return "灞炰簬鍩庡競鐨勪紭璐ㄤ綇瀹�"; case 8: - return "属于城市的优质住宅"; + return "灞炰簬鍩庡競鐨勪紭璐ㄤ綇瀹�"; case 9: - return "属于城市的高端住宅"; + return "灞炰簬鍩庡競鐨勯珮绔綇瀹�"; case 10: - return "属于城市的高端住宅"; + return "灞炰簬鍩庡競鐨勯珮绔綇瀹�"; default: return ""; } } /** - * 户均占地面积 + * 鎴峰潎鍗犲湴闈㈢Н */ public static double detailScore1(Integer householdCount, Integer allArea) { if (null == householdCount || null == allArea || householdCount <= 0 || allArea <= 0) { @@ -705,7 +705,7 @@ public class DistrictScoreUtil { } /** - * 户均建筑面积 + * 鎴峰潎寤虹瓚闈㈢Н */ public static double detailScore2(Integer householdCount, Integer buildArea) { if (null == householdCount || null == buildArea || householdCount <= 0 || buildArea <= 0) { @@ -729,7 +729,7 @@ public class DistrictScoreUtil { } /** - * 绿化率 + * 缁垮寲鐜� */ public static double detailScore3(Double virescencePercent) { if (null == virescencePercent) { @@ -752,7 +752,7 @@ public class DistrictScoreUtil { } /** - * 容积率 + * 瀹圭Н鐜� */ public static double detailScore4(Double cubagePercent) { if (null == cubagePercent) { @@ -777,13 +777,13 @@ public class DistrictScoreUtil { } /** - * 停车位 + * 鍋滆溅浣� */ public static double detailScore5(String buildType, Integer carSiteCount) { if (StringUtils.isNotBlank(buildType)) { buildType = buildType.replaceAll(",", ""); - if ("独栋".equals(buildType) || "双拼".equals(buildType) || "联排".equals(buildType) || "叠加".equals(buildType) - || "花园洋房".equals(buildType) || "老洋房".equals(buildType) || "四合院".equals(buildType)) { + if ("鐙爧".equals(buildType) || "鍙屾嫾".equals(buildType) || "鑱旀帓".equals(buildType) || "鍙犲姞".equals(buildType) + || "鑺卞洯娲嬫埧".equals(buildType) || "鑰佹磱鎴�".equals(buildType) || "鍥涘悎闄�".equals(buildType)) { return 9d; } } @@ -810,8 +810,8 @@ public class DistrictScoreUtil { } /** - * 潜力指数 - * 稀缺指数 + * 娼滃姏鎸囨暟 + * 绋�缂烘寚鏁� * modify by shibb */ public static double rankScore(int regionClickRank, int regionDistrictCount, int lastMonthHouses, int halfYearHouse) { @@ -897,7 +897,7 @@ public class DistrictScoreUtil { // ret -= 1; // } - //regionDistrictCount小区平均关注度 + //regionDistrictCount灏忓尯骞冲潎鍏虫敞搴� if (regionClickRank > regionDistrictCount) { double d = (regionClickRank - regionDistrictCount) * 1.0 / regionDistrictCount; if (d > 0.3) { @@ -914,8 +914,8 @@ public class DistrictScoreUtil { } /** - * 潜力指数 - * 稀缺指数 + * 娼滃姏鎸囨暟 + * 绋�缂烘寚鏁� * add by shibb */ public static double rankScore2(double hotRatio, double attentionRatio) { @@ -927,27 +927,27 @@ public class DistrictScoreUtil { int s = (int) score; switch (s) { case 0: - return "市场上有大量挂牌房源"; + return "甯傚満涓婃湁澶ч噺鎸傜墝鎴挎簮"; case 1: - return "市场上有大量挂牌房源"; + return "甯傚満涓婃湁澶ч噺鎸傜墝鎴挎簮"; case 2: - return "市场上有大量挂牌房源"; + return "甯傚満涓婃湁澶ч噺鎸傜墝鎴挎簮"; case 3: - return "挂牌房源量较充足"; + return "鎸傜墝鎴挎簮閲忚緝鍏呰冻"; case 4: - return "挂牌房源量较充足"; + return "鎸傜墝鎴挎簮閲忚緝鍏呰冻"; case 5: - return "挂牌房源量一般"; + return "鎸傜墝鎴挎簮閲忎竴鑸�"; case 6: - return "挂牌房源量一般"; + return "鎸傜墝鎴挎簮閲忎竴鑸�"; case 7: - return "市场上房源较稀缺"; + return "甯傚満涓婃埧婧愯緝绋�缂�"; case 8: - return "市场上房源较稀缺"; + return "甯傚満涓婃埧婧愯緝绋�缂�"; case 9: - return "市场上房源非常稀缺"; + return "甯傚満涓婃埧婧愰潪甯哥█缂�"; case 10: - return "市场上房源非常稀缺"; + return "甯傚満涓婃埧婧愰潪甯哥█缂�"; default: return ""; } @@ -997,23 +997,23 @@ public class DistrictScoreUtil { case 1: return ""; case 2: - return "房价跌幅明显,预计升值能力较弱"; + return "鎴夸环璺屽箙鏄庢樉锛岄璁″崌鍊艰兘鍔涜緝寮�"; case 3: - return "房价跌幅较明显,预计升值能力较弱"; + return "鎴夸环璺屽箙杈冩槑鏄撅紝棰勮鍗囧�艰兘鍔涜緝寮�"; case 4: - return "房价走势较为平稳,预计未来
波动不大"; + return "鎴夸环璧板娍杈冧负骞崇ǔ锛岄璁℃湭鏉�
娉㈠姩涓嶅ぇ"; case 5: - return "房价走势平稳,预计未来波动不大"; + return "鎴夸环璧板娍骞崇ǔ锛岄璁℃湭鏉ユ尝鍔ㄤ笉澶�"; case 6: - return "房价走势较为平稳,预计未来
波动不大"; + return "鎴夸环璧板娍杈冧负骞崇ǔ锛岄璁℃湭鏉�
娉㈠姩涓嶅ぇ"; case 7: - return "房价涨幅明显,未来走势理想"; + return "鎴夸环娑ㄥ箙鏄庢樉锛屾湭鏉ヨ蛋鍔跨悊鎯�"; case 8: - return "房价涨幅明显,未来走势理想"; + return "鎴夸环娑ㄥ箙鏄庢樉锛屾湭鏉ヨ蛋鍔跨悊鎯�"; case 9: - return "房价涨幅较高,未来走势乐观"; + return "鎴夸环娑ㄥ箙杈冮珮锛屾湭鏉ヨ蛋鍔夸箰瑙�"; case 10: - return "房价涨幅较高,未来走势乐观"; + return "鎴夸环娑ㄥ箙杈冮珮锛屾湭鏉ヨ蛋鍔夸箰瑙�"; default: return ""; } @@ -1024,7 +1024,7 @@ public class DistrictScoreUtil { if (StringUtils.isBlank(date)) { return 0; } - Pattern p = Pattern.compile("(\\d{4})[-|年|.]?(\\d{1,2})?[-|月|.]?(\\d{1,2})?日?"); + Pattern p = Pattern.compile("(\\d{4})[-|骞磡.]?(\\d{1,2})?[-|鏈坾.]?(\\d{1,2})?鏃�?"); Matcher m = p.matcher(date); Integer year = 0; if (m.find()) { diff --git a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/util/ShopScoreUtil.java b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/util/ShopScoreUtil.java index bb338cf9b..14043f057 100644 --- a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/util/ShopScoreUtil.java +++ b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/util/ShopScoreUtil.java @@ -12,52 +12,52 @@ import com.fangjia.service.bo.DistrictStatBo; public class ShopScoreUtil { /** - * 市均停车位(确认) + * 甯傚潎鍋滆溅浣�(纭) */ private final static int CITY_AVG_CAR_SITE_COUNT = 683; /** - * 市均餐饮人均消费(确认) + * 甯傚潎椁愰ギ浜哄潎娑堣垂(纭) */ private final static int CITY_AVG_CONSUMPTION = 50; /** - * 市均商场建筑规模(面积)(确认) + * 甯傚潎鍟嗗満寤虹瓚瑙勬ā锛堥潰绉級(纭) */ private final static int CITY_AVG_MALL_AREA = 119250; /** - * 市均居民人口密度(确认) + * 甯傚潎灞呮皯浜哄彛瀵嗗害(纭) */ //private final static double CITY_AVG_HOUSE_DENSITY = 3030; private final static double CITY_AVG_HOUSE_DENSITY = 3631; /** - * 市均办公人口密度(确认) + * 甯傚潎鍔炲叕浜哄彛瀵嗗害(纭) */ //private final static double CITY_AVG_OFFICE_DENSITY = 3030; private final static double CITY_AVG_OFFICE_DENSITY = 3631; /** - * 市均商场竣工年份(确认) + * 甯傚潎鍟嗗満绔e伐骞翠唤(纭) */ private final static int CITY_AVG_FINISH_YAER = 2007; /** - * 市均商场物业费(确认) + * 甯傚潎鍟嗗満鐗╀笟璐�(纭) */ private final static double CITY_AVG_ESTATE_CHARGE = 3.57; /** - * 地段指数 + * 鍦版鎸囨暟 */ public static double localScore(String loopLineInfo, int metros, int buses) { double ret = 0d; - if ("内环以内".equals(loopLineInfo)) { + if ("鍐呯幆浠ュ唴".equals(loopLineInfo)) { ret += 8; - } else if ("中内之间".equals(loopLineInfo) || "中内环间".equals(loopLineInfo)) { + } else if ("涓唴涔嬮棿".equals(loopLineInfo) || "涓唴鐜棿".equals(loopLineInfo)) { ret += 6; - } else if ("中外之间".equals(loopLineInfo) || "中外环间".equals(loopLineInfo)) { + } else if ("涓涔嬮棿".equals(loopLineInfo) || "涓鐜棿".equals(loopLineInfo)) { ret += 5; - } else if ("外环以外".equals(loopLineInfo)) { + } else if ("澶栫幆浠ュ".equals(loopLineInfo)) { ret += 4; } else { ret += 3; @@ -69,8 +69,8 @@ public class ShopScoreUtil { ret += 0.5; } - // TODO 板块 - // TODO A类+1,B类+0.5 + // TODO 鏉垮潡 + // TODO A绫�+1锛孊绫�+0.5 return ret > 10 ? 10 : ret; } @@ -79,32 +79,32 @@ public class ShopScoreUtil { int s = (int) score; switch (s) { case 1: - return "位于城市中偏远的地段"; + return "浣嶄簬鍩庡競涓亸杩滅殑鍦版"; case 2: - return "位于城市中偏远的地段"; + return "浣嶄簬鍩庡競涓亸杩滅殑鍦版"; case 3: - return "位于城市中较偏远的地段"; + return "浣嶄簬鍩庡競涓緝鍋忚繙鐨勫湴娈�"; case 4: - return "位于城市中较偏远的地段"; + return "浣嶄簬鍩庡競涓緝鍋忚繙鐨勫湴娈�"; case 5: - return "位于城市中普通地段"; + return "浣嶄簬鍩庡競涓櫘閫氬湴娈�"; case 6: - return "位于城市中普通地段"; + return "浣嶄簬鍩庡競涓櫘閫氬湴娈�"; case 7: - return "位于城市中较好的地段"; + return "浣嶄簬鍩庡競涓緝濂界殑鍦版"; case 8: - return "位于城市中较好的地段"; + return "浣嶄簬鍩庡競涓緝濂界殑鍦版"; case 9: - return "位于城市中黄金地段"; + return "浣嶄簬鍩庡競涓粍閲戝湴娈�"; case 10: - return "位于城市中黄金地段"; + return "浣嶄簬鍩庡競涓粍閲戝湴娈�"; default: return ""; } } /** - * 地段指数--公共交通 + * 鍦版鎸囨暟--鍏叡浜ら�� */ public static double localScore1(int metroCount, int busCount) { if (metroCount > 2) { @@ -137,7 +137,7 @@ public class ShopScoreUtil { } /** - * 地段指数--周边业态 + * 鍦版鎸囨暟--鍛ㄨ竟涓氭�� */ public static double localScore2(Map typeCountMap) { double ret = 0d; @@ -160,7 +160,7 @@ public class ShopScoreUtil { } /** - * 消费指数 + * 娑堣垂鎸囨暟 */ public static double consumScore(Double avgConsumption, Map countMap) { double ret = 0d; @@ -197,9 +197,9 @@ public class ShopScoreUtil { } } - if (null != countMap.get("商场")) { + if (null != countMap.get("鍟嗗満")) { ret += 0.2; - if (countMap.get("商场") >= 5) { + if (countMap.get("鍟嗗満") >= 5) { ret += 0.3; } } @@ -209,45 +209,45 @@ public class ShopScoreUtil { ret += 0.2; } } - if (null != countMap.get("电影院")) { + if (null != countMap.get("鐢靛奖闄�")) { ret += 0.1; } - if (null != countMap.get("健身中心")) { + if (null != countMap.get("鍋ヨ韩涓績")) { ret += 0.2; } - if (null != countMap.get("美容院")) { + if (null != countMap.get("缇庡闄�")) { ret += 0.1; - if (countMap.get("美容院") >= 5) { + if (countMap.get("缇庡闄�") >= 5) { ret += 0.2; } } - if (null != countMap.get("大型超市")) { + if (null != countMap.get("澶у瀷瓒呭競")) { ret += 0.2; } - if (null != countMap.get("高尔夫球场")) { + if (null != countMap.get("楂樺皵澶悆鍦�")) { ret += 0.5; } - if (null != countMap.get("私立学校")) { + if (null != countMap.get("绉佺珛瀛︽牎")) { ret += 0.2; - if (countMap.get("私立学校") >= 5) { + if (countMap.get("绉佺珛瀛︽牎") >= 5) { ret += 0.3; } } - if (null != countMap.get("整形")) { + if (null != countMap.get("鏁村舰")) { ret += 0.2; - if (countMap.get("整形") >= 5) { + if (countMap.get("鏁村舰") >= 5) { ret += 0.1; } } - if (null != countMap.get("洗浴")) { + if (null != countMap.get("娲楁荡")) { ret += 0.1; } - if (null != countMap.get("私立医院")) { + if (null != countMap.get("绉佺珛鍖婚櫌")) { ret += 0.2; } - if (null != countMap.get("星级酒店")) { + if (null != countMap.get("鏄熺骇閰掑簵")) { ret += 0.2; - if (countMap.get("星级酒店") >= 5) { + if (countMap.get("鏄熺骇閰掑簵") >= 5) { ret += 0.2; } } @@ -259,32 +259,32 @@ public class ShopScoreUtil { int s = (int) score; switch (s) { case 1: - return "周边人群消费能力弱"; + return "鍛ㄨ竟浜虹兢娑堣垂鑳藉姏寮�"; case 2: - return "周边人群消费能力弱"; + return "鍛ㄨ竟浜虹兢娑堣垂鑳藉姏寮�"; case 3: - return "周边人群消费能力较弱"; + return "鍛ㄨ竟浜虹兢娑堣垂鑳藉姏杈冨急"; case 4: - return "周边人群消费能力较弱"; + return "鍛ㄨ竟浜虹兢娑堣垂鑳藉姏杈冨急"; case 5: - return "周边人群消费能力一般"; + return "鍛ㄨ竟浜虹兢娑堣垂鑳藉姏涓�鑸�"; case 6: - return "周边人群消费能力一般"; + return "鍛ㄨ竟浜虹兢娑堣垂鑳藉姏涓�鑸�"; case 7: - return "周边人群具有一定的消费能力"; + return "鍛ㄨ竟浜虹兢鍏锋湁涓�瀹氱殑娑堣垂鑳藉姏"; case 8: - return "周边人群具有一定的消费能力"; + return "鍛ㄨ竟浜虹兢鍏锋湁涓�瀹氱殑娑堣垂鑳藉姏"; case 9: - return "周边人群具有很强的消费能力"; + return "鍛ㄨ竟浜虹兢鍏锋湁寰堝己鐨勬秷璐硅兘鍔�"; case 10: - return "周边人群具有很强的消费能力"; + return "鍛ㄨ竟浜虹兢鍏锋湁寰堝己鐨勬秷璐硅兘鍔�"; default: return ""; } } /** - * 房价指数 + * 鎴夸环鎸囨暟 */ public static double priceScore(DistrictStatBo statBo, Integer cityPrice) { double ret = 0d; @@ -350,32 +350,32 @@ public class ShopScoreUtil { int s = (int) score; switch (s) { case 1: - return "属于城市中价位较低的商铺"; + return "灞炰簬鍩庡競涓环浣嶈緝浣庣殑鍟嗛摵"; case 2: - return "属于城市中价位较低的商铺"; + return "灞炰簬鍩庡競涓环浣嶈緝浣庣殑鍟嗛摵"; case 3: - return "属于城市中价位较低的商铺"; + return "灞炰簬鍩庡競涓环浣嶈緝浣庣殑鍟嗛摵"; case 4: - return "属于略低于城市均价的商铺"; + return "灞炰簬鐣ヤ綆浜庡煄甯傚潎浠风殑鍟嗛摵"; case 5: - return "属于接近城市均价的商铺"; + return "灞炰簬鎺ヨ繎鍩庡競鍧囦环鐨勫晢閾�"; case 6: - return "属于略高于城市均价的商铺"; + return "灞炰簬鐣ラ珮浜庡煄甯傚潎浠风殑鍟嗛摵"; case 7: - return "属于城市中价位较高的商铺"; + return "灞炰簬鍩庡競涓环浣嶈緝楂樼殑鍟嗛摵"; case 8: - return "属于城市中价位较高的商铺"; + return "灞炰簬鍩庡競涓环浣嶈緝楂樼殑鍟嗛摵"; case 9: - return "属于城市中价位非常高的商铺"; + return "灞炰簬鍩庡競涓环浣嶉潪甯搁珮鐨勫晢閾�"; case 10: - return "属于城市中价位非常高的商铺"; + return "灞炰簬鍩庡競涓环浣嶉潪甯搁珮鐨勫晢閾�"; default: return ""; } } /** - * 租金指数 + * 绉熼噾鎸囨暟 */ public static double rentScore(DistrictBusinessStatRentBo statBo, Integer cityPrice, String paymentPattern) { double ret = 0d; @@ -422,7 +422,7 @@ public class ShopScoreUtil { } } - if ("押三付三".equals(paymentPattern) || "付三押三".equals(paymentPattern)) { + if ("鎶间笁浠樹笁".equals(paymentPattern) || "浠樹笁鎶间笁".equals(paymentPattern)) { ret += 0.5; } } @@ -434,63 +434,63 @@ public class ShopScoreUtil { int s = (int) score; switch (s) { case 1: - return "属于城市中租金便宜的商铺"; + return "灞炰簬鍩庡競涓閲戜究瀹滅殑鍟嗛摵"; case 2: - return "属于城市中租金便宜的商铺"; + return "灞炰簬鍩庡競涓閲戜究瀹滅殑鍟嗛摵"; case 3: - return "属于城市中租金较便宜的商铺"; + return "灞炰簬鍩庡競涓閲戣緝渚垮疁鐨勫晢閾�"; case 4: - return "属于略低于城市租金均价的商铺"; + return "灞炰簬鐣ヤ綆浜庡煄甯傜閲戝潎浠风殑鍟嗛摵"; case 5: - return "属于接近城市租金均价的商铺"; + return "灞炰簬鎺ヨ繎鍩庡競绉熼噾鍧囦环鐨勫晢閾�"; case 6: - return "属于略高于城市租金均价的商铺"; + return "灞炰簬鐣ラ珮浜庡煄甯傜閲戝潎浠风殑鍟嗛摵"; case 7: - return "属于城市中租金较高的商铺"; + return "灞炰簬鍩庡競涓閲戣緝楂樼殑鍟嗛摵"; case 8: - return "属于城市中租金较高的商铺"; + return "灞炰簬鍩庡競涓閲戣緝楂樼殑鍟嗛摵"; case 9: - return "属于城市中租金昂贵的商铺"; + return "灞炰簬鍩庡競涓閲戞槀璐电殑鍟嗛摵"; case 10: - return "属于城市中租金昂贵的商铺"; + return "灞炰簬鍩庡競涓閲戞槀璐电殑鍟嗛摵"; default: return ""; } } /** - * 商铺综合指数 + * 鍟嗛摵缁煎悎鎸囨暟 */ public static double detailScore(District mall, SeaweedNumberic numberic) { double ret = 0d; - // 商铺类型 + // 鍟嗛摵绫诲瀷 String estateType = mall.getEstateCharge(); - if (StringUtils.contains(estateType, "购物中心")) { + if (StringUtils.contains(estateType, "璐墿涓績")) { ret += 8; - } else if (StringUtils.contains(estateType, "写字楼商铺")) { + } else if (StringUtils.contains(estateType, "鍐欏瓧妤煎晢閾�")) { ret += 7; - } else if ("专项商铺".equals(estateType)) { + } else if ("涓撻」鍟嗛摵".equals(estateType)) { ret += 6; } else { ret += 5; } - // 商圈 + // 鍟嗗湀 String businessQuarter = mall.getBusinessQuarter(); - // TODO A类+1,B类+0.5 + // TODO A绫�+1锛孊绫�+0.5 if (StringUtils.isNotBlank(businessQuarter)) { ret += 0.5; } - // 板块 + // 鏉垮潡 String block = ""; - // TODO A类+1,B类+0.5 + // TODO A绫�+1锛孊绫�+0.5 if (StringUtils.isNotBlank(block)) { ret += 0.5; } - // 建筑规模 + // 寤虹瓚瑙勬ā if (null != numberic && null != numberic.getBuildArea()) { int area = numberic.getBuildArea(); if (area > CITY_AVG_MALL_AREA && ((area - CITY_AVG_MALL_AREA) * 1.0 / CITY_AVG_MALL_AREA > 0.2)) { @@ -500,10 +500,10 @@ public class ShopScoreUtil { } } - // 装修状况 - // TODO 目前没有装修字段 + // 瑁呬慨鐘跺喌 + // TODO 鐩墠娌℃湁瑁呬慨瀛楁 - // 停车位 + // 鍋滆溅浣� if (null != mall.getCarSiteCount()) { double t = (mall.getCarSiteCount() - CITY_AVG_CAR_SITE_COUNT) * 1.0 / CITY_AVG_CAR_SITE_COUNT; if (t > 0.2) { @@ -513,7 +513,7 @@ public class ShopScoreUtil { } } - // 楼龄 + // 妤奸緞 if (null != numberic && null != numberic.getFinishBuildYear()) { int year = numberic.getFinishBuildYear(); if (year > CITY_AVG_FINISH_YAER && ((year - CITY_AVG_FINISH_YAER) * 1.0 / CITY_AVG_FINISH_YAER > 0.2)) { @@ -530,7 +530,7 @@ public class ShopScoreUtil { ret += 0.5; } - // 物业费 + // 鐗╀笟璐� if (null != numberic && null != numberic.getEstateCharge()) { double c = numberic.getEstateCharge(); if (c > CITY_AVG_ESTATE_CHARGE && ((c - CITY_AVG_ESTATE_CHARGE) * 1.0 / CITY_AVG_ESTATE_CHARGE > 0.2)) { @@ -547,35 +547,35 @@ public class ShopScoreUtil { int s = (int) score; switch (s) { case 1: - return "属于城市的普通商铺"; + return "灞炰簬鍩庡競鐨勬櫘閫氬晢閾�"; case 2: - return "属于城市的普通商铺"; + return "灞炰簬鍩庡競鐨勬櫘閫氬晢閾�"; case 3: - return "属于城市的普通商铺"; + return "灞炰簬鍩庡競鐨勬櫘閫氬晢閾�"; case 4: - return "属于城市的普通商铺"; + return "灞炰簬鍩庡競鐨勬櫘閫氬晢閾�"; case 5: - return "属于城市的普通商铺"; + return "灞炰簬鍩庡競鐨勬櫘閫氬晢閾�"; case 6: - return "属于城市的普通商铺"; + return "灞炰簬鍩庡競鐨勬櫘閫氬晢閾�"; case 7: - return "属于城市的优质商铺"; + return "灞炰簬鍩庡競鐨勪紭璐ㄥ晢閾�"; case 8: - return "属于城市的优质商铺"; + return "灞炰簬鍩庡競鐨勪紭璐ㄥ晢閾�"; case 9: - return "属于城市的高端商铺"; + return "灞炰簬鍩庡競鐨勯珮绔晢閾�"; case 10: - return "属于城市的高端商铺"; + return "灞炰簬鍩庡競鐨勯珮绔晢閾�"; default: return ""; } } /** - * 商铺综合指数--建筑规模 + * 鍟嗛摵缁煎悎鎸囨暟--寤虹瓚瑙勬ā */ public static double detailScore1(String estateType, Integer buildArea) { - if (StringUtils.contains(estateType, "购物中心")) { + if (StringUtils.contains(estateType, "璐墿涓績")) { if (null == buildArea) { return 5d; } @@ -593,9 +593,9 @@ public class ShopScoreUtil { } else { return 5d; } - } else if (StringUtils.contains(estateType, "写字楼商铺")) { + } else if (StringUtils.contains(estateType, "鍐欏瓧妤煎晢閾�")) { return 6d; - } else if ("专项商铺".equals(estateType)) { + } else if ("涓撻」鍟嗛摵".equals(estateType)) { return 7d; } else { return 5d; @@ -603,15 +603,15 @@ public class ShopScoreUtil { } /** - * 商铺综合指数--装修 + * 鍟嗛摵缁煎悎鎸囨暟--瑁呬慨 */ public static double detailScore2(String estateType, String buildArea) { - // TODO 目前没有装修字段 + // TODO 鐩墠娌℃湁瑁呬慨瀛楁 return 5d; } /** - * 商铺综合指数--停车位 + * 鍟嗛摵缁煎悎鎸囨暟--鍋滆溅浣� */ public static double detailScore3(Integer carSiteCount) { if (null == carSiteCount) { @@ -637,7 +637,7 @@ public class ShopScoreUtil { } /** - * 商铺综合指数--楼龄 + * 鍟嗛摵缁煎悎鎸囨暟--妤奸緞 */ public static double detailScore4(Integer year) { if (null == year) { @@ -666,44 +666,44 @@ public class ShopScoreUtil { } /** - * 环境指数--公共聚客点 + * 鐜鎸囨暟--鍏叡鑱氬鐐� */ public static double aroundScore1(Map countMap) { double ret = 0d; - if (null != countMap.get("医院")) { + if (null != countMap.get("鍖婚櫌")) { ret += 1; - if (countMap.get("医院") >= 3) { + if (countMap.get("鍖婚櫌") >= 3) { ret += 0.5; } } - if (null != countMap.get("地铁站")) { + if (null != countMap.get("鍦伴搧绔�")) { ret += 1; - if (countMap.get("地铁站") >= 3) { + if (countMap.get("鍦伴搧绔�") >= 3) { ret += 0.5; } } - if (null != countMap.get("公交点")) { + if (null != countMap.get("鍏氦鐐�")) { ret += 1; - if (countMap.get("公交点") >= 3) { + if (countMap.get("鍏氦鐐�") >= 3) { ret += 0.5; } } - if (null != countMap.get("公园")) { + if (null != countMap.get("鍏洯")) { ret += 1; - if (countMap.get("公园") >= 2) { + if (countMap.get("鍏洯") >= 2) { ret += 0.5; } } - if (null != countMap.get("学校")) { + if (null != countMap.get("瀛︽牎")) { ret += 1; - if (countMap.get("学校") >= 3) { + if (countMap.get("瀛︽牎") >= 3) { ret += 0.5; } } - if (null != countMap.get("体育馆")) { + if (null != countMap.get("浣撹偛棣�")) { ret += 1; - if (countMap.get("体育馆") >= 2) { + if (countMap.get("浣撹偛棣�") >= 2) { ret += 0.5; } } @@ -712,32 +712,32 @@ public class ShopScoreUtil { } /** - * 环境指数--商业聚客点 + * 鐜鎸囨暟--鍟嗕笟鑱氬鐐� */ public static double aroundScore2(Map countMap) { double ret = 0d; - if (null != countMap.get("银行")) { + if (null != countMap.get("閾惰")) { ret += 1; - if (countMap.get("银行") >= 3) { + if (countMap.get("閾惰") >= 3) { ret += 0.5; } } - if (null != countMap.get("商场")) { + if (null != countMap.get("鍟嗗満")) { ret += 1; - if (countMap.get("商场") >= 3) { + if (countMap.get("鍟嗗満") >= 3) { ret += 0.5; } } - if (null != countMap.get("大型超市")) { + if (null != countMap.get("澶у瀷瓒呭競")) { ret += 1; - if (countMap.get("大型超市") >= 3) { + if (countMap.get("澶у瀷瓒呭競") >= 3) { ret += 0.5; } } - if (null != countMap.get("餐饮")) { + if (null != countMap.get("椁愰ギ")) { ret += 1; - if (countMap.get("餐饮") >= 10) { + if (countMap.get("椁愰ギ") >= 10) { ret += 0.5; } } @@ -749,32 +749,32 @@ public class ShopScoreUtil { int s = (int) score; switch (s) { case 1: - return "周边公共或商业配套非常差,客源稀少"; + return "鍛ㄨ竟鍏叡鎴栧晢涓氶厤濂楅潪甯稿樊锛屽婧愮█灏�"; case 2: - return "周边公共或商业配套非常差,客源稀少"; + return "鍛ㄨ竟鍏叡鎴栧晢涓氶厤濂楅潪甯稿樊锛屽婧愮█灏�"; case 3: - return "周边公共或商业配套较差,客源较少"; + return "鍛ㄨ竟鍏叡鎴栧晢涓氶厤濂楄緝宸紝瀹㈡簮杈冨皯"; case 4: - return "周边公共或商业配套较差,客源较少"; + return "鍛ㄨ竟鍏叡鎴栧晢涓氶厤濂楄緝宸紝瀹㈡簮杈冨皯"; case 5: - return "周边公共或商业配套一般,客源一般"; + return "鍛ㄨ竟鍏叡鎴栧晢涓氶厤濂椾竴鑸紝瀹㈡簮涓�鑸�"; case 6: - return "周边公共或商业配套一般,客源一般"; + return "鍛ㄨ竟鍏叡鎴栧晢涓氶厤濂椾竴鑸紝瀹㈡簮涓�鑸�"; case 7: - return "周边公共或商业配套较成熟,客源较丰富"; + return "鍛ㄨ竟鍏叡鎴栧晢涓氶厤濂楄緝鎴愮啛锛屽婧愯緝涓板瘜"; case 8: - return "周边公共或商业配套较成熟,客源较丰富"; + return "鍛ㄨ竟鍏叡鎴栧晢涓氶厤濂楄緝鎴愮啛锛屽婧愯緝涓板瘜"; case 9: - return "周边公共或商业配套非常成熟,客源丰富"; + return "鍛ㄨ竟鍏叡鎴栧晢涓氶厤濂楅潪甯告垚鐔燂紝瀹㈡簮涓板瘜"; case 10: - return "周边公共或商业配套非常成熟,客源丰富"; + return "鍛ㄨ竟鍏叡鎴栧晢涓氶厤濂楅潪甯告垚鐔燂紝瀹㈡簮涓板瘜"; default: return ""; } } /** - * 人口指数--居民人口 + * 浜哄彛鎸囨暟--灞呮皯浜哄彛 */ @Deprecated public static double peopleScore1(double density) { @@ -810,56 +810,56 @@ public class ShopScoreUtil { } /** - * 计算居民人口密度得分 + * 璁$畻灞呮皯浜哄彛瀵嗗害寰楀垎 * @author yinjihuan * @date 2016-03-04 - * @param density 居民人口密度 - * @return 居民人口密度得分 + * @param density 灞呮皯浜哄彛瀵嗗害 + * @return 灞呮皯浜哄彛瀵嗗害寰楀垎 */ public static double calcPeopleDensityScore(double density) { - /*居民人口密度得分规则如下: - 10 10*市均人口密度 < 居民人口密度 - 9 9*市均人口密度 < 居民人口密度 <= 10*市均人口密度 - 8 8*市均人口密度 < 居民人口密度 <= 9*市均人口密度 - 7 7*市均人口密度 < 居民人口密度 <= 8*市均人口密度 - 6 6*市均人口密度 < 居民人口密度 <= 7*市均人口密度 - 5 4*市均人口密度 < 居民人口密度 <= 6*市均人口密度 - 4 2*市均人口密度 < 居民人口密度 <= 4*市均人口密度 - 3 1*市均人口密度 < 居民人口密度 <= 2*市均人口密度 - 2 0.5*市均人口密度 < 居民人口密度 <= 1*市均人口密度 - 1 居民人口密度 <= 0.5*市均人口密度 */ + /*灞呮皯浜哄彛瀵嗗害寰楀垎瑙勫垯濡備笅锛� + 10 10*甯傚潎浜哄彛瀵嗗害 < 灞呮皯浜哄彛瀵嗗害 + 9 9*甯傚潎浜哄彛瀵嗗害 < 灞呮皯浜哄彛瀵嗗害 <= 10*甯傚潎浜哄彛瀵嗗害 + 8 8*甯傚潎浜哄彛瀵嗗害 < 灞呮皯浜哄彛瀵嗗害 <= 9*甯傚潎浜哄彛瀵嗗害 + 7 7*甯傚潎浜哄彛瀵嗗害 < 灞呮皯浜哄彛瀵嗗害 <= 8*甯傚潎浜哄彛瀵嗗害 + 6 6*甯傚潎浜哄彛瀵嗗害 < 灞呮皯浜哄彛瀵嗗害 <= 7*甯傚潎浜哄彛瀵嗗害 + 5 4*甯傚潎浜哄彛瀵嗗害 < 灞呮皯浜哄彛瀵嗗害 <= 6*甯傚潎浜哄彛瀵嗗害 + 4 2*甯傚潎浜哄彛瀵嗗害 < 灞呮皯浜哄彛瀵嗗害 <= 4*甯傚潎浜哄彛瀵嗗害 + 3 1*甯傚潎浜哄彛瀵嗗害 < 灞呮皯浜哄彛瀵嗗害 <= 2*甯傚潎浜哄彛瀵嗗害 + 2 0.5*甯傚潎浜哄彛瀵嗗害 < 灞呮皯浜哄彛瀵嗗害 <= 1*甯傚潎浜哄彛瀵嗗害 + 1 灞呮皯浜哄彛瀵嗗害 <= 0.5*甯傚潎浜哄彛瀵嗗害 */ return doCalcDensityScore(density, CITY_AVG_HOUSE_DENSITY); } /** - * 计算办公人口密度得分 + * 璁$畻鍔炲叕浜哄彛瀵嗗害寰楀垎 * @author yinjihuan * @date 2016-03-04 - * @param density 办公人口密度 - * @return 居民人口密度得分 + * @param density 鍔炲叕浜哄彛瀵嗗害 + * @return 灞呮皯浜哄彛瀵嗗害寰楀垎 */ public static double calcOfficeDensityScore(double density) { - /*办公人口密度计算规则如下: - 10 10*市均办公人口密度 < 办公人口密度 - 9 9*市均办公人口密度 < 办公人口密度 <= 10*市均办公人口密度 - 8 8*市均办公人口密度 < 办公人口密度 <= 9*市均办公人口密度 - 7 7*市均办公人口密度 < 办公人口密度 <= 8*市均办公人口密度 - 6 6*市均办公人口密度 < 办公人口密度 <= 7*市均办公人口密度 - 5 4*市均办公人口密度 < 办公人口密度 <= 6*市均办公人口密度 - 4 2*市均办公人口密度 < 办公人口密度 <= 4*市均办公人口密度 - 3 1*市均办公人口密度 < 办公人口密度 <= 2*市均办公人口密度 - 2 0.5*市均办公人口密度 < 办公人口密度 <= 1*市均办公人口密度 - 1 办公人口密度 <= 0.5*市均办公人口密度 */ + /*鍔炲叕浜哄彛瀵嗗害璁$畻瑙勫垯濡備笅锛� + 10 10*甯傚潎鍔炲叕浜哄彛瀵嗗害 < 鍔炲叕浜哄彛瀵嗗害 + 9 9*甯傚潎鍔炲叕浜哄彛瀵嗗害 < 鍔炲叕浜哄彛瀵嗗害 <= 10*甯傚潎鍔炲叕浜哄彛瀵嗗害 + 8 8*甯傚潎鍔炲叕浜哄彛瀵嗗害 < 鍔炲叕浜哄彛瀵嗗害 <= 9*甯傚潎鍔炲叕浜哄彛瀵嗗害 + 7 7*甯傚潎鍔炲叕浜哄彛瀵嗗害 < 鍔炲叕浜哄彛瀵嗗害 <= 8*甯傚潎鍔炲叕浜哄彛瀵嗗害 + 6 6*甯傚潎鍔炲叕浜哄彛瀵嗗害 < 鍔炲叕浜哄彛瀵嗗害 <= 7*甯傚潎鍔炲叕浜哄彛瀵嗗害 + 5 4*甯傚潎鍔炲叕浜哄彛瀵嗗害 < 鍔炲叕浜哄彛瀵嗗害 <= 6*甯傚潎鍔炲叕浜哄彛瀵嗗害 + 4 2*甯傚潎鍔炲叕浜哄彛瀵嗗害 < 鍔炲叕浜哄彛瀵嗗害 <= 4*甯傚潎鍔炲叕浜哄彛瀵嗗害 + 3 1*甯傚潎鍔炲叕浜哄彛瀵嗗害 < 鍔炲叕浜哄彛瀵嗗害 <= 2*甯傚潎鍔炲叕浜哄彛瀵嗗害 + 2 0.5*甯傚潎鍔炲叕浜哄彛瀵嗗害 < 鍔炲叕浜哄彛瀵嗗害 <= 1*甯傚潎鍔炲叕浜哄彛瀵嗗害 + 1 鍔炲叕浜哄彛瀵嗗害 <= 0.5*甯傚潎鍔炲叕浜哄彛瀵嗗害 */ return doCalcDensityScore(density, CITY_AVG_OFFICE_DENSITY); } /** - * 计算密度得分 - * @param density 密度 - * @param cityAvgDensity 市平均密度 + * 璁$畻瀵嗗害寰楀垎 + * @param density 瀵嗗害 + * @param cityAvgDensity 甯傚钩鍧囧瘑搴� * @return */ private static double doCalcDensityScore(double density, double cityAvgDensity) { @@ -917,7 +917,7 @@ public class ShopScoreUtil { } /** - * 人口指数--办公人口 + * 浜哄彛鎸囨暟--鍔炲叕浜哄彛 */ @Deprecated public static double peopleScore2(double density) { @@ -991,25 +991,25 @@ public class ShopScoreUtil { int s = (int) score; switch (s) { case 1: - return "人流量稀少"; + return "浜烘祦閲忕█灏�"; case 2: - return "人流量稀少"; + return "浜烘祦閲忕█灏�"; case 3: - return "人流量较少"; + return "浜烘祦閲忚緝灏�"; case 4: - return "人流量较少"; + return "浜烘祦閲忚緝灏�"; case 5: - return "人流量一般"; + return "浜烘祦閲忎竴鑸�"; case 6: - return "人流量一般"; + return "浜烘祦閲忎竴鑸�"; case 7: - return "人流量较大"; + return "浜烘祦閲忚緝澶�"; case 8: - return "人流量较大"; + return "浜烘祦閲忚緝澶�"; case 9: - return "人流量庞大"; + return "浜烘祦閲忓簽澶�"; case 10: - return "人流量庞大"; + return "浜烘祦閲忓簽澶�"; default: return ""; } diff --git a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/util/Test.java b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/util/Test.java index ef3280621..2aa45e728 100644 --- a/projects/chafangtong/src/main/java/com/fangjia/chafangtong/util/Test.java +++ b/projects/chafangtong/src/main/java/com/fangjia/chafangtong/util/Test.java @@ -21,17 +21,17 @@ public class Test { g2d.dispose(); g2d = image.createGraphics(); g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); - g2d.setColor(new Color(178,178,178));//改变扇形颜色 + g2d.setColor(new Color(178,178,178));//鏀瑰彉鎵囧舰棰滆壊 g2d.fillArc(0,0,400,400,90,360); - g2d.setColor(new Color(0,115,230));//改变扇形颜色 + g2d.setColor(new Color(0,115,230));//鏀瑰彉鎵囧舰棰滆壊 g2d.fillArc(0,0,400,400,90,180); - g2d.setColor(new Color(229,229,229));//改变扇形颜色 + g2d.setColor(new Color(229,229,229));//鏀瑰彉鎵囧舰棰滆壊 g2d.fillArc(40,40,320,320,90,360); g2d.setColor(new Color(0,115,230)); - g2d.setFont(new Font("宋体",Font.BOLD,120)); - g2d.drawString("4分",126,250); + g2d.setFont(new Font("瀹嬩綋",Font.BOLD,120)); + g2d.drawString("4鍒�",126,250); g2d.dispose(); ImageIO.write(image, "png", new File("D:/test.png")); } diff --git a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/ChafangtongContextLoaderListener.java b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/ChafangtongContextLoaderListener.java index 93e143c7d..d22c733c6 100644 --- a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/ChafangtongContextLoaderListener.java +++ b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/ChafangtongContextLoaderListener.java @@ -30,7 +30,7 @@ public class ChafangtongContextLoaderListener extends ContextLoaderListener { } super.contextInitialized(event); - // 预热 + // 棰勭儹 if (LOGGER.isInfoEnabled()) { LOGGER.info("warm up keyword links..."); } diff --git a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/AroundController.java b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/AroundController.java index d10585db8..659a50633 100644 --- a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/AroundController.java +++ b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/AroundController.java @@ -30,7 +30,7 @@ import com.fangjia.dal.seaweed.model.District; import com.fangjia.service.mongo.fangjia.BusStationService; /** - * 环境指数 + * 鐜鎸囨暟 * @author yk * */ @@ -54,13 +54,13 @@ public class AroundController extends BaseController { double lng = district.getLng2()/10000000000d; double radius = getRadius(); Map> stationMap = busStationService.getNearByStations(city, lat, lng, radius); - model.setMetroStations(stationMap.get("地铁")); - model.setBusStations(stationMap.get("公交")); + model.setMetroStations(stationMap.get("鍦伴搧")); + model.setBusStations(stationMap.get("鍏氦")); - String[] ks = new String[] { "医院", "学校", "写字楼", "银行", "ATM", "超市", "停车场", "公园", "机场", "网吧" }; + String[] ks = new String[] { "鍖婚櫌", "瀛︽牎", "鍐欏瓧妤�", "閾惰", "ATM", "瓒呭競", "鍋滆溅鍦�", "鍏洯", "鏈哄満", "缃戝惂" }; - //厌恶设施 - String[] keys = new String[]{"发电厂","变电站","垃圾焚烧厂","化工厂"}; + //鍘屾伓璁炬柦 + String[] keys = new String[]{"鍙戠數鍘�","鍙樼數绔�","鍨冨溇鐒氱儳鍘�","鍖栧伐鍘�"}; Map countMap = new HashMap(ks.length); for (int i = 0; i < ks.length; i++) { @@ -71,24 +71,24 @@ public class AroundController extends BaseController { JSONObject json = baiduApiService.searchNearby(keys[i], lat, lng, 1000, model.getBaiduMapKey()); countMap.put(keys[i], getTotal(json)); } - countMap.put("地铁站", null == model.getMetroStations() ? null : model.getMetroStations().size()); - countMap.put("公交点", null == model.getBusStations() ? null : model.getBusStations().size()); + countMap.put("鍦伴搧绔�", null == model.getMetroStations() ? null : model.getMetroStations().size()); + countMap.put("鍏氦鐐�", null == model.getBusStations() ? null : model.getBusStations().size()); - // 虹桥机场 121.352578,31.200062 - // 浦东机场 121.807085,31.160702 + // 铏规ˉ鏈哄満 121.352578,31.200062 + // 娴︿笢鏈哄満 121.807085,31.160702 double dis = GeoUtils.calculateDistance(lng, lat, 121.352578, 31.200062); if (dis <= radius) { - model.setAirPort("虹桥机场"); + model.setAirPort("铏规ˉ鏈哄満"); model.setAirPortLat(31.200062); model.setAirPortLng(121.352578); - countMap.put("机场", 1); + countMap.put("鏈哄満", 1); } else { dis = GeoUtils.calculateDistance(lng, lat, 121.807085, 31.160702); if (dis <= radius) { - model.setAirPort("浦东机场"); + model.setAirPort("娴︿笢鏈哄満"); model.setAirPortLat(31.160702); model.setAirPortLng(121.807085); - countMap.put("机场", 1); + countMap.put("鏈哄満", 1); } } @@ -120,22 +120,22 @@ public class AroundController extends BaseController { double lng = mall.getLng2()/10000000000d; double radius = getRadius(); Map> stationMap = busStationService.getNearByStations(city, lat, lng, radius); - model.setMetroStations(stationMap.get("地铁")); - model.setBusStations(stationMap.get("公交")); + model.setMetroStations(stationMap.get("鍦伴搧")); + model.setBusStations(stationMap.get("鍏氦")); - String[] ks = new String[] { "医院", "公园", "学校", "体育馆" }; + String[] ks = new String[] { "鍖婚櫌", "鍏洯", "瀛︽牎", "浣撹偛棣�" }; Map countMap = new HashMap(ks.length); for (int i = 0; i < ks.length; i++) { JSONObject json = baiduApiService.searchNearby(ks[i], lat, lng, radius, model.getBaiduMapKey()); countMap.put(ks[i], getTotal(json)); } - countMap.put("地铁站", null == model.getMetroStations() ? null : model.getMetroStations().size()); - countMap.put("公交点", null == model.getBusStations() ? null : model.getBusStations().size()); + countMap.put("鍦伴搧绔�", null == model.getMetroStations() ? null : model.getMetroStations().size()); + countMap.put("鍏氦鐐�", null == model.getBusStations() ? null : model.getBusStations().size()); double score1 = ShopScoreUtil.aroundScore1(countMap); model.setScore1(score1); - ks = new String[] { "银行", "商场", "大型超市", "餐饮" }; + ks = new String[] { "閾惰", "鍟嗗満", "澶у瀷瓒呭競", "椁愰ギ" }; countMap = new HashMap(ks.length); for (int i = 0; i < ks.length; i++) { JSONObject json = baiduApiService.searchNearby(ks[i], lat, lng, radius, model.getBaiduMapKey()); diff --git a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/AutocompleteController.java b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/AutocompleteController.java index 0ef933fc8..f29098afa 100644 --- a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/AutocompleteController.java +++ b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/AutocompleteController.java @@ -123,7 +123,7 @@ public class AutocompleteController { //nameQuery.add(new TermQuery(new Term("address", keyword)), Occur.SHOULD); //nameQuery.add(new TermQuery(new Term("addr_alias_std", keyword)), Occur.SHOULD); nameQuery.add(new TermQuery(new Term("keyword", keyword)), Occur.SHOULD); - //nameQuery.add(new TermQuery(new Term("keyword_cjk", keyword)), Occur.SHOULD);//这个重要,因seaweed不支持模糊搜索,当输入"中远两"需用此进行搜索 + //nameQuery.add(new TermQuery(new Term("keyword_cjk", keyword)), Occur.SHOULD);//杩欎釜閲嶈锛屽洜seaweed涓嶆敮鎸佹ā绯婃悳绱紝褰撹緭鍏�"涓繙涓�"闇�鐢ㄦ杩涜鎼滅储 srQuery1.add(nameQuery, Occur.SHOULD); params.add(new QueryParam("$sr", new SrQuery(srQuery1))); List districts = districtService.findAllByParams(params, 0, limit, new String[] { "region", "name","address", "addrAlias" }); @@ -138,7 +138,7 @@ public class AutocompleteController { bo.setRegion(district.getRegion()); ret.add(bo); } - //对自动完成出来的结果按长短排序 + //瀵硅嚜鍔ㄥ畬鎴愬嚭鏉ョ殑缁撴灉鎸夐暱鐭帓搴� if(ret.size() > 0){ Collections.sort(ret, new Comparator() { public int compare(AutoCompleteBo o1, AutoCompleteBo o2) { diff --git a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/BaseController.java b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/BaseController.java index 05ae31425..6055ebf12 100644 --- a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/BaseController.java +++ b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/BaseController.java @@ -104,16 +104,16 @@ public abstract class BaseController { } /** - * 根据cookie或者用户输入关键字,填充经纬度、mall信息到cookie和model + * 鏍规嵁cookie鎴栬�呯敤鎴疯緭鍏ュ叧閿瓧锛屽~鍏呯粡绾害銆乵all淇℃伅鍒癱ookie鍜宮odel */ protected void fillShop2CookieModel(ChafangtongModel model) { - // TODO 不用每次都去seaweed查询mall,可根据是否是新提交表单、存下的mallid来查,优化性能 + // TODO 涓嶇敤姣忔閮藉幓seaweed鏌ヨmall锛屽彲鏍规嵁鏄惁鏄柊鎻愪氦琛ㄥ崟銆佸瓨涓嬬殑mallid鏉ユ煡锛屼紭鍖栨�ц兘 HttpServletResponse response = ActionContext.getContext().getResponse(); String keyword = model.getQ(); if (StringUtils.isNotBlank(keyword)) { Shop mall = null; - // open地址匹配 + // open鍦板潃鍖归厤 Map resMap = addressService.parse(model.getCityName(), keyword, "shop", false); if (MapUtils.isNotEmpty(resMap)) { if (resMap.containsKey("status") && (Integer) resMap.get("status") == 0 && resMap.containsKey("precise") @@ -124,14 +124,14 @@ public abstract class BaseController { } if ("general".equals(model.getControllerName())) { - // 记录用户搜索词open匹配结果 + // 璁板綍鐢ㄦ埛鎼滅储璇峯pen鍖归厤缁撴灉 HttpServletRequest request = ActionContext.getContext().getRequest(); AddressMatchLog addressMatchLog = new AddressMatchLog(); addressMatchLog.setCity(model.getCityName()); addressMatchLog.setInput(model.getQ()); addressMatchLog.setIp(AnalyticsUtil.getIpAddress(request)); addressMatchLog.setUid(cookieContext.getCookieValue(request, "fpk_uid")); - addressMatchLog.setSource("房评卡"); + addressMatchLog.setSource("鎴胯瘎鍗�"); addressMatchLog.setUserName(cookieContext.getCookieValue(request, "fpk_name")); addressMatchLog.setCreationDate(new Date()); addressMatchLog.setModificationDate(new Date()); @@ -203,7 +203,7 @@ public abstract class BaseController { } protected void fillDistrict2CookieModel(ChafangtongModel model) { - // TODO 不用每次都去seaweed查询district,可根据是否是新提交表单、存下的districtid来查,优化性能 + // TODO 涓嶇敤姣忔閮藉幓seaweed鏌ヨdistrict锛屽彲鏍规嵁鏄惁鏄柊鎻愪氦琛ㄥ崟銆佸瓨涓嬬殑districtid鏉ユ煡锛屼紭鍖栨�ц兘 HttpServletResponse response = ActionContext.getContext().getResponse(); String keyword = model.getQ(); if (StringUtils.isNotBlank(keyword)) { diff --git a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/ConsumController.java b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/ConsumController.java index 053b172fe..977bd31be 100644 --- a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/ConsumController.java +++ b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/ConsumController.java @@ -31,7 +31,7 @@ import com.fangjia.dal.seaweed.model.District; import com.fangjia.service.mongo.fangjia.BizShopService; /** - * 消费指数 + * 娑堣垂鎸囨暟 * @author yk * */ @@ -54,7 +54,7 @@ public class ConsumController extends BaseController { double lat = district.getLat2()/10000000000d; double lng = district.getLng2()/10000000000d; double radius = getRadius(); - model.setAvgConsumption(bizShopService.findAroundAvgConsumption(lat, lng, radius, "美食")); + model.setAvgConsumption(bizShopService.findAroundAvgConsumption(lat, lng, radius, "缇庨")); double cityConsumMin = model.getCityConsumMin()!=null?model.getCityConsumMin():15; double cityConsumMax = model.getCityConsumMax()!=null?model.getCityConsumMax():150; @@ -62,7 +62,7 @@ public class ConsumController extends BaseController { model.setHigher((model.getAvgConsumption() - cityConsumMin) * 100.0 / (cityConsumMax - cityConsumMin)); } - String[] ks = new String[] { "KTV", "电影院", "健身中心", "商场", "美容院", "星级酒店","大型超市", "高尔夫球场", "私立学校", "整形", "咖啡厅", "洗浴" }; + String[] ks = new String[] { "KTV", "鐢靛奖闄�", "鍋ヨ韩涓績", "鍟嗗満", "缇庡闄�", "鏄熺骇閰掑簵","澶у瀷瓒呭競", "楂樺皵澶悆鍦�", "绉佺珛瀛︽牎", "鏁村舰", "鍜栧暋鍘�", "娲楁荡" }; Map result = baiduApiService.searchNearBy(Arrays.asList(ks), lat, lng, 1000, model.getBaiduMapKey()); Map countMap = new HashMap(ks.length); for (String k : ks) { @@ -87,13 +87,13 @@ public class ConsumController extends BaseController { // model.setAroundSell(aroundMarkers); // } double radius = getRadius(); - model.setAvgConsumption(bizShopService.findAroundAvgConsumption(lat, lng, radius, "餐厅")); + model.setAvgConsumption(bizShopService.findAroundAvgConsumption(lat, lng, radius, "椁愬巺")); double cityConsumMin = model.getCityConsumMin(); double cityConsumMax = model.getCityConsumMax(); if (null != model.getAvgConsumption()) { model.setHigher((model.getAvgConsumption() - cityConsumMin) * 100.0 / (cityConsumMax - cityConsumMin)); } - String[] ks = new String[] { "KTV", "电影院", "健身中心", "商场", "美容院", "星级酒店", "大型超市", "高尔夫球场", "私立学校", "整形", "咖啡厅", "洗浴" }; + String[] ks = new String[] { "KTV", "鐢靛奖闄�", "鍋ヨ韩涓績", "鍟嗗満", "缇庡闄�", "鏄熺骇閰掑簵", "澶у瀷瓒呭競", "楂樺皵澶悆鍦�", "绉佺珛瀛︽牎", "鏁村舰", "鍜栧暋鍘�", "娲楁荡" }; Map result = baiduApiService.searchNearBy(Arrays.asList(ks), lat, lng, 1000, model.getBaiduMapKey()); Map countMap = new HashMap(ks.length); for (String k : ks) { diff --git a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/DataCenterController.java b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/DataCenterController.java index dc6d5e564..8166d923d 100644 --- a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/DataCenterController.java +++ b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/DataCenterController.java @@ -35,7 +35,7 @@ import javax.swing.plaf.synth.Region; import java.util.*; /** - * 数据中心展示Controller + * 鏁版嵁涓績灞曠ずController * * @author wenyan */ @@ -48,39 +48,39 @@ public class DataCenterController { private DistrictService districtService; private HouseService houseService; private RegionStatTrendService regionStatTrendService; - private static final List OPEN_CITY_LIST = Arrays.asList("上海", "北京"); + private static final List OPEN_CITY_LIST = Arrays.asList("涓婃捣", "鍖椾含"); private Map PROVINCE_CITY = new HashMap(){{ - put("北京","北京"); - put("天津","天津"); - put("上海","上海"); - put("重庆","重庆"); - put("河北","石家庄"); - put("山西","太原"); - put("内蒙古","呼和浩特"); - put("辽宁","沈阳"); - put("吉林","长春"); - put("黑龙江","哈尔滨"); - put("江苏","南京"); - put("浙江","杭州"); - put("安徽","合肥"); - put("福建","福州"); - put("江西","南昌"); - put("山东","济南"); - put("河南","郑州"); - put("湖北","武汉"); - put("湖南","长沙"); - put("广东","广州"); - put("广西","南宁"); - put("海南","海口"); - put("四川","成都"); - put("贵州","贵阳"); - put("云南","昆明"); - put("西藏","拉萨"); - put("陕西","西安"); - put("甘肃","兰州"); - put("青海","西宁"); - put("宁夏","银川"); - put("新疆","乌鲁木齐"); + put("鍖椾含","鍖椾含"); + put("澶╂触","澶╂触"); + put("涓婃捣","涓婃捣"); + put("閲嶅簡","閲嶅簡"); + put("娌冲寳","鐭冲搴�"); + put("灞辫タ","澶師"); + put("鍐呰挋鍙�","鍛煎拰娴╃壒"); + put("杈藉畞","娌堥槼"); + put("鍚夋灄","闀挎槬"); + put("榛戦緳姹�","鍝堝皵婊�"); + put("姹熻嫃","鍗椾含"); + put("娴欐睙","鏉窞"); + put("瀹夊窘","鍚堣偉"); + put("绂忓缓","绂忓窞"); + put("姹熻タ","鍗楁槍"); + put("灞变笢","娴庡崡"); + put("娌冲崡","閮戝窞"); + put("婀栧寳","姝︽眽"); + put("婀栧崡","闀挎矙"); + put("骞夸笢","骞垮窞"); + put("骞胯タ","鍗楀畞"); + put("娴峰崡","娴峰彛"); + put("鍥涘窛","鎴愰兘"); + put("璐靛窞","璐甸槼"); + put("浜戝崡","鏄嗘槑"); + put("瑗胯棌","鎷夎惃"); + put("闄曡タ","瑗垮畨"); + put("鐢樿們","鍏板窞"); + put("闈掓捣","瑗垮畞"); + put("瀹佸","閾跺窛"); + put("鏂扮枂","涔岄瞾鏈ㄩ綈"); }}; public DataCenterModel summaryAction(DataCenterModel model) { @@ -215,7 +215,7 @@ public class DataCenterController { public Object findCityAvgPriceAction(@Param(name = "province") String province) { JsonModel model = new JsonModel(); Map result = new HashMap(); - if(RegionData.getAllCity().contains(province) && !"吉林".equals(province)){ + if(RegionData.getAllCity().contains(province) && !"鍚夋灄".equals(province)){ result.put("type", "city"); result.put("cityStat", regionStatService.findRegionStat(province, null)); List stats = new ArrayList(RegionData.getAllRegions(province).size()); @@ -260,7 +260,7 @@ public class DataCenterController { private List getAllCityPrice() { List citys = serverAreaService.findAllSupportGujia(); - citys.add("拉萨"); + citys.add("鎷夎惃"); List cityStats = regionStatService.findRegionStatByCityName(citys); return cityStats; } diff --git a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/FeedbackController.java b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/FeedbackController.java index 59d992c2a..840fec409 100644 --- a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/FeedbackController.java +++ b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/FeedbackController.java @@ -13,7 +13,7 @@ import java.util.HashMap; import java.util.Map; /** - * 意见反馈 + * 鎰忚鍙嶉 * Created by wenyan on 2015/11/24. */ public class FeedbackController { diff --git a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/GeneralController.java b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/GeneralController.java index 31f6c3d3d..8230c1e45 100644 --- a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/GeneralController.java +++ b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/GeneralController.java @@ -53,7 +53,7 @@ import com.fangjia.service.mongo.fangjia.DistrictHotService; import com.fangjia.service.mongo.fangjia.PricePredictService; /** - * 首页 + * 棣栭〉 * * @author yk * @@ -91,7 +91,7 @@ public class GeneralController extends BaseController { } model.setDistrict(district); - /* 坐标 */ + /* 鍧愭爣 */ double lat = district.getLat2()/10000000000d; double lng = district.getLng2()/10000000000d; double radius = getRadius(); @@ -99,16 +99,16 @@ public class GeneralController extends BaseController { String city = district.getCity(); String region = district.getRegion(); - // 房价指数 + // 鎴夸环鎸囨暟 RegionStat cityStat = regionStatService.findByCity(model.getCityName()); DistrictStatBo statBo = districtStatService.findYearPeriodStatBo(districtKey); model.setStatBo(statBo); DistrictStat stat = statBo.getDefaultDistrictStat(); String estateType = district.getEstateType2(); - if(!estateType.contains("别墅")){ - estateType = "小区"; + if(!estateType.contains("鍒")){ + estateType = "灏忓尯"; }else{ - estateType = "别墅"; + estateType = "鍒"; } List rentList = new ArrayList(); Map districtStatRents = districtStatRentService.findByDistrictStatRent(districtKey, estateType); @@ -133,13 +133,13 @@ public class GeneralController extends BaseController { model.setPriceScore(DistrictScoreUtil.priceScore2(null == stat ? null: stat.getAvgPrice(), pricelist.get(0), pricelist.get(1), rentList)); - // 潜力指数 + // 娼滃姏鎸囨暟 int avgPrice = 0; - String buildType = "小区"; + String buildType = "灏忓尯"; if (null == statBo.getDistrictStat() && null != statBo.getVillaDistrictStat()) { avgPrice = statBo.getVillaDistrictStat().getAvgPrice(); - buildType = "别墅"; + buildType = "鍒"; } else if (null != statBo.getDistrictStat()) { avgPrice = statBo.getDistrictStat().getAvgPrice(); } @@ -166,56 +166,56 @@ public class GeneralController extends BaseController { model.setRankScore(DistrictScoreUtil.rankScore2(houseCountRatio, dealPriceCountRatio)); long t = System.currentTimeMillis(); - // 消费指数 - Double avgConsumption = bizShopService.findAroundAvgConsumption(lat,lng, 1000, "美食"); - String[] allKw = new String[]{"KTV", "电影院", "健身中心", "商场", "美容院", "星级酒店","大型超市", "高尔夫球场", "私立学校", "整形", "咖啡厅", "洗浴","医院", - "学校", "写字楼", "银行", "ATM", "超市", "停车场", "公园","机场", "网吧", "发电厂", "变电站", "垃圾焚烧厂", "化工厂"}; + // 娑堣垂鎸囨暟 + Double avgConsumption = bizShopService.findAroundAvgConsumption(lat,lng, 1000, "缇庨"); + String[] allKw = new String[]{"KTV", "鐢靛奖闄�", "鍋ヨ韩涓績", "鍟嗗満", "缇庡闄�", "鏄熺骇閰掑簵","澶у瀷瓒呭競", "楂樺皵澶悆鍦�", "绉佺珛瀛︽牎", "鏁村舰", "鍜栧暋鍘�", "娲楁荡","鍖婚櫌", + "瀛︽牎", "鍐欏瓧妤�", "閾惰", "ATM", "瓒呭競", "鍋滆溅鍦�", "鍏洯","鏈哄満", "缃戝惂", "鍙戠數鍘�", "鍙樼數绔�", "鍨冨溇鐒氱儳鍘�", "鍖栧伐鍘�"}; Map searchResult = baiduApiService.searchNearBy(Arrays.asList(allKw), lat, lng, 1000, model.getBaiduMapKey()); - String[] ks = new String[] { "KTV", "电影院", "健身中心", "商场", "美容院", "星级酒店","大型超市", "高尔夫球场", "私立学校", "整形", "咖啡厅", "洗浴" }; + String[] ks = new String[] { "KTV", "鐢靛奖闄�", "鍋ヨ韩涓績", "鍟嗗満", "缇庡闄�", "鏄熺骇閰掑簵","澶у瀷瓒呭競", "楂樺皵澶悆鍦�", "绉佺珛瀛︽牎", "鏁村舰", "鍜栧暋鍘�", "娲楁荡" }; Map countMap = new HashMap(ks.length); for (int i = 0; i < ks.length; i++) { countMap.put(ks[i], getTotal(searchResult.get(ks[i]))); } model.setConsumScore(DistrictScoreUtil.consumScore(avgConsumption,countMap)); - // 环境指数 - ks = new String[] { "医院", "学校", "写字楼", "银行", "ATM", "超市", "停车场", "公园","机场", "网吧" }; - // 厌恶设施 - String[] keys = new String[] { "发电厂", "变电站", "垃圾焚烧厂", "化工厂" }; + // 鐜鎸囨暟 + ks = new String[] { "鍖婚櫌", "瀛︽牎", "鍐欏瓧妤�", "閾惰", "ATM", "瓒呭競", "鍋滆溅鍦�", "鍏洯","鏈哄満", "缃戝惂" }; + // 鍘屾伓璁炬柦 + String[] keys = new String[] { "鍙戠數鍘�", "鍙樼數绔�", "鍨冨溇鐒氱儳鍘�", "鍖栧伐鍘�" }; countMap = new HashMap(ks.length); for (int i = 0; i < ks.length; i++) { countMap.put(ks[i], getTotal(searchResult.get(ks[i]))); } - // 添加厌恶设施 + // 娣诲姞鍘屾伓璁炬柦 for (int i = 0; i < keys.length; i++) { countMap.put(keys[i], getTotal(searchResult.get(ks[i]))); } - System.out.println("API耗时:" + (System.currentTimeMillis() -t)); + System.out.println("API鑰楁椂:" + (System.currentTimeMillis() -t)); Map> stationMap = busStationService .getNearByStations(city, lat, lng, 1000); - countMap.put("地铁站", null == stationMap.get("地铁") ? null : stationMap - .get("地铁").size()); - countMap.put("公交点", null == stationMap.get("公交") ? null : stationMap - .get("公交").size()); + countMap.put("鍦伴搧绔�", null == stationMap.get("鍦伴搧") ? null : stationMap + .get("鍦伴搧").size()); + countMap.put("鍏氦鐐�", null == stationMap.get("鍏氦") ? null : stationMap + .get("鍏氦").size()); model.setAroundScore(DistrictScoreUtil.aroundScore(countMap)); - // 虹桥机场 121.352578,31.200062 - // 浦东机场 121.807085,31.160702 + // 铏规ˉ鏈哄満 121.352578,31.200062 + // 娴︿笢鏈哄満 121.807085,31.160702 double dis = GeoUtils .calculateDistance(lng, lat, 121.352578, 31.200062); if (dis <= radius) { - countMap.put("机场", 1); + countMap.put("鏈哄満", 1); } else { dis = GeoUtils.calculateDistance(lng, lat, 121.807085, 31.160702); if (dis <= radius) { - countMap.put("机场", 1); + countMap.put("鏈哄満", 1); } } - // 楼盘指数 + // 妤肩洏鎸囨暟 model.setDetailScore(DistrictScoreUtil.detailScore(district,seaweedNumbericDao.findDistrict(city, region,district.getName()))); double totalScore = 0d; @@ -511,12 +511,12 @@ public class GeneralController extends BaseController { double radius = getRadius(); List metros = null; List buses = null; - // 综合得分 + // 缁煎悎寰楀垎 SeaweedNumberic numberic = seaweedNumbericDao.findShop(mall.getCity(), mall.getRegion(), mall.getName()); model.setDetailScore(ShopScoreUtil.detailScore(mall, numberic)); - // 房价 + // 鎴夸环 BizRegionStat cityStat = bizRegionStatService.findCitySellPrice(mall.getCity(), weekend); DistrictStatBo statBo = shopStatService.findAllShopStat( @@ -526,22 +526,22 @@ public class GeneralController extends BaseController { null == cityStat ? null : cityStat.getAvgPrice())); model.setStatBo(statBo); - // 租金 + // 绉熼噾 BizRegionStat cityStatRent = bizRegionStatService.findCityRentPrice(mall.getCity(), weekend); DistrictBusinessStatRentBo statRentBo = districtBusinessStatRentService .findMallStatBo(new DistrictKey(mall.getCity(), mall.getRegion(), mall.getName()), weekend); model.setRentScore(ShopScoreUtil.rentScore(statRentBo,null == cityStatRent ? null : cityStatRent.getAvgPrice(), mall.getPaymentPattern())); - // 地段 + // 鍦版 Map> stationMap = busStationService .getNearByStations(mall.getCity(), lat, lng, radius); - metros = stationMap.get("地铁"); - buses = stationMap.get("公交"); + metros = stationMap.get("鍦伴搧"); + buses = stationMap.get("鍏氦"); model.setLocalScore(ShopScoreUtil.localScore(mall.getLoopLineInfo(), null == metros ? 0 : metros.size(), null == buses ? 0 : buses.size())); - // 人口 + // 浜哄彛 int cityAvgPrice = cityPriceLevelService.findCityPriceLevel(city); cityAvgPrice = cityAvgPrice == 0 ? 7000 : cityAvgPrice; @@ -549,7 +549,7 @@ public class GeneralController extends BaseController { lng, radius); int totalHouseCount = getTotalHouseCount(districts, cityAvgPrice); - // 居民人口密度 + // 灞呮皯浜哄彛瀵嗗害 double circleArea = Math.PI * Math.pow(radius / 1000.0, 2); double density = totalHouseCount * 2.49 / circleArea; double peopleScore1 = ShopScoreUtil.peopleScore1(density); @@ -558,38 +558,38 @@ public class GeneralController extends BaseController { radius); int totalOfficeCount = getTotalOfficeCount(offices); - // 办公人口 + // 鍔炲叕浜哄彛 density = totalOfficeCount / circleArea; double peopleScore2 = ShopScoreUtil.peopleScore2(density); model.setPeopleScore(peopleScore1 > peopleScore2 ? peopleScore1 : peopleScore2); - String[] allKs = new String[]{"KTV", "电影院", "健身中心", "商场", "美容院", "星级酒店","大型超市", "高尔夫球场", "私立学校", "整形", "咖啡厅", "洗浴", - "医院", "公园", "学校", "体育馆","银行", "商场", "大型超市", "餐饮" + String[] allKs = new String[]{"KTV", "鐢靛奖闄�", "鍋ヨ韩涓績", "鍟嗗満", "缇庡闄�", "鏄熺骇閰掑簵","澶у瀷瓒呭競", "楂樺皵澶悆鍦�", "绉佺珛瀛︽牎", "鏁村舰", "鍜栧暋鍘�", "娲楁荡", + "鍖婚櫌", "鍏洯", "瀛︽牎", "浣撹偛棣�","閾惰", "鍟嗗満", "澶у瀷瓒呭競", "椁愰ギ" }; Map searchResult = baiduApiService.searchNearBy(Arrays.asList(allKs), lat, lng, radius, model.getBaiduMapKey()); - // 消费 - String[] ks = new String[] { "KTV", "电影院", "健身中心", "商场", "美容院", "星级酒店","大型超市", "高尔夫球场", "私立学校", "整形", "咖啡厅", "洗浴" }; + // 娑堣垂 + String[] ks = new String[] { "KTV", "鐢靛奖闄�", "鍋ヨ韩涓績", "鍟嗗満", "缇庡闄�", "鏄熺骇閰掑簵","澶у瀷瓒呭競", "楂樺皵澶悆鍦�", "绉佺珛瀛︽牎", "鏁村舰", "鍜栧暋鍘�", "娲楁荡" }; Map countMap = new HashMap(ks.length); for (String k : ks){ countMap.put(k, getTotal(searchResult.get(k))); } - Double avgConsumption = bizShopService.findAroundAvgConsumption(lat,lng, radius, "餐厅"); + Double avgConsumption = bizShopService.findAroundAvgConsumption(lat,lng, radius, "椁愬巺"); model.setConsumScore(ShopScoreUtil.consumScore(avgConsumption, countMap)); - // 环境 - ks = new String[] { "医院", "公园", "学校", "体育馆" }; + // 鐜 + ks = new String[] { "鍖婚櫌", "鍏洯", "瀛︽牎", "浣撹偛棣�" }; countMap = new HashMap(ks.length); for (String k : ks){ countMap.put(k, getTotal(searchResult.get(k))); } - countMap.put("地铁站", null == metros ? null : metros.size()); - countMap.put("公交点", null == buses ? null : buses.size()); + countMap.put("鍦伴搧绔�", null == metros ? null : metros.size()); + countMap.put("鍏氦鐐�", null == buses ? null : buses.size()); double aroundScore1 = ShopScoreUtil.aroundScore1(countMap); - ks = new String[] { "银行", "商场", "大型超市", "餐饮" }; + ks = new String[] { "閾惰", "鍟嗗満", "澶у瀷瓒呭競", "椁愰ギ" }; countMap = new HashMap(ks.length); for (String k : ks){ countMap.put(k, getTotal(searchResult.get(k))); @@ -752,7 +752,7 @@ public class GeneralController extends BaseController { district.setAvgPrice(avgPrice); district.setKind(commData.getKind()); - if (district.getName().endsWith("村")) { + if (district.getName().endsWith("鏉�")) { oldHouseCount += count; } else { @@ -771,7 +771,7 @@ public class GeneralController extends BaseController { } return oldHouseCount + hightLevelDistrictHouseCount - + commonDistrictHouseCount;// 总户数 + + commonDistrictHouseCount;// 鎬绘埛鏁� } return 0; } @@ -848,13 +848,13 @@ public class GeneralController extends BaseController { } if (StringUtils.isNotBlank(office.getBedKind())) { - if (office.getBedKind().equals("甲级")) { + if (office.getBedKind().equals("鐢茬骇")) { bestLevelCount = bestLevelCount + office.getHouseholdCount(); - } else if (office.getBedKind().equals("乙级")) { + } else if (office.getBedKind().equals("涔欑骇")) { betterLevelCount = betterLevelCount + office.getHouseholdCount(); - } else if (office.getBedKind().equals("丙级")) { + } else if (office.getBedKind().equals("涓欑骇")) { goodLevelCount = goodLevelCount + office.getHouseholdCount(); } else { diff --git a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/LocalController.java b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/LocalController.java index 6f67812ea..e2b283ea7 100644 --- a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/LocalController.java +++ b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/LocalController.java @@ -41,12 +41,12 @@ public class LocalController extends BaseController { double lng = mall.getLng2()/10000000000.0; double radius = getRadius(); Map> stationMap = busStationService.getNearByStations(model.getCityName(), lat, lng, radius); - model.setMetroStations(stationMap.get("地铁")); - model.setBusStations(stationMap.get("公交")); - if("上海".equals(model.getCityName())){ - // 虹桥机场 121.352578,31.200062 + model.setMetroStations(stationMap.get("鍦伴搧")); + model.setBusStations(stationMap.get("鍏氦")); + if("涓婃捣".equals(model.getCityName())){ + // 铏规ˉ鏈哄満 121.352578,31.200062 model.setDisHongqiaoAirport(GeoUtils.calculateDistance(lng, lat, 121.352578, 31.200062)); - // 虹桥火车站 121.32795,31.1991 + // 铏规ˉ鐏溅绔� 121.32795,31.1991 model.setDisHongqiaoStation(GeoUtils.calculateDistance(lng, lat, 121.32795, 31.1991)); } model.setTabScore(ShopScoreUtil.localScore(mall.getLoopLineInfo(), null == model.getMetroStations() ? 0 : model diff --git a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/NodistrictController.java b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/NodistrictController.java index bc7524862..7fb3eddca 100644 --- a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/NodistrictController.java +++ b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/NodistrictController.java @@ -42,7 +42,7 @@ public class NodistrictController extends BaseController { final double lng = model.getLng(); final double radius = getRadius(); - // 周边没小区,直接返回 + // 鍛ㄨ竟娌″皬鍖猴紝鐩存帴杩斿洖 List districts = districtService.findDistrict(lat, lng, radius, model.getCityName()); if (CollectionUtils.isEmpty(districts)) { return model; @@ -54,7 +54,7 @@ public class NodistrictController extends BaseController { model.setCityPrice(cityStat.getAvgPrice()); } - // 按距离排序,由近到远 + // 鎸夎窛绂绘帓搴忥紝鐢辫繎鍒拌繙 Collections.sort(districts, new Comparator() { public int compare(District o1, District o2) { double dis1 = GeoUtils.calculateDistance(lng, lat, o1.getLng2() / 10000000000.0, o1.getLat2() / 10000000000.0); @@ -102,11 +102,11 @@ public class NodistrictController extends BaseController { model.setPriceNearest(priceNearest); - // 范围内均价 + // 鑼冨洿鍐呭潎浠� if (priceCount > 0 && stats.size() > 0) { model.setAreaPrice(priceCount / stats.size()); Map priceMap = districtStatService.getCityDistriceMinAndMaxPrice(model.getCityName()); - //设置价格 + //璁剧疆浠锋牸 model.setCityDistrictMinSellPrice(priceMap.get("cityDistrictMinSellPrice")); model.setCityDistrictMaxSellPrice(priceMap.get("cityDistrictMaxSellPrice")); @@ -124,7 +124,7 @@ public class NodistrictController extends BaseController { } } - // 由低到高排序 + // 鐢变綆鍒伴珮鎺掑簭 Collections.sort(stats, new Comparator() { public int compare(DistrictStat o1, DistrictStat o2) { return o1.getAvgPrice() - o2.getAvgPrice(); @@ -139,7 +139,7 @@ public class NodistrictController extends BaseController { } model.setPriceBtm5(priceBtm5); - // 由高到低排序 + // 鐢遍珮鍒颁綆鎺掑簭 Collections.reverse(stats); List priceTop5 = new ArrayList(5); for (DistrictStat s : stats) { @@ -158,13 +158,13 @@ public class NodistrictController extends BaseController { final double lng = model.getLng(); final double radius = getRadius(); - // 周边没小区,直接返回 + // 鍛ㄨ竟娌″皬鍖猴紝鐩存帴杩斿洖 List districts = districtService.findDistrict(lat, lng, radius, model.getCityName()); if (CollectionUtils.isEmpty(districts)) { return model; } - // 按距离排序,由近到远 + // 鎸夎窛绂绘帓搴忥紝鐢辫繎鍒拌繙 Collections.sort(districts, new Comparator() { public int compare(District o1, District o2) { double dis1 = GeoUtils.calculateDistance(lng, lat, o1.getLng2() / 10000000000.0, o1.getLat2() / 10000000000.0); @@ -325,7 +325,7 @@ public class NodistrictController extends BaseController { double lng = model.getLng(); double radius = getRadius(); - model.setAvgConsumption(bizShopService.findAroundAvgConsumption(lat, lng, radius, "餐厅")); + model.setAvgConsumption(bizShopService.findAroundAvgConsumption(lat, lng, radius, "椁愬巺")); double cityConsumMin = model.getCityConsumMin(); double cityConsumMax = model.getCityConsumMax(); @@ -342,20 +342,20 @@ public class NodistrictController extends BaseController { double lng = model.getLng(); double radius = getRadius(); Map> stationMap = busStationService.getNearByStations(city, lat, lng, radius); - model.setMetroStations(stationMap.get("地铁")); - model.setBusStations(stationMap.get("公交")); + model.setMetroStations(stationMap.get("鍦伴搧")); + model.setBusStations(stationMap.get("鍏氦")); - // 虹桥机场 121.352578,31.200062 - // 浦东机场 121.807085,31.160702 + // 铏规ˉ鏈哄満 121.352578,31.200062 + // 娴︿笢鏈哄満 121.807085,31.160702 double dis = GeoUtils.calculateDistance(lng, lat, 121.352578, 31.200062); if (dis <= radius) { - model.setAirPort("虹桥机场"); + model.setAirPort("铏规ˉ鏈哄満"); model.setAirPortLat(31.200062); model.setAirPortLng(121.352578); } else { dis = GeoUtils.calculateDistance(lng, lat, 121.807085, 31.160702); if (dis <= radius) { - model.setAirPort("浦东机场"); + model.setAirPort("娴︿笢鏈哄満"); model.setAirPortLat(31.160702); model.setAirPortLng(121.807085); } diff --git a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/NofoundController.java b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/NofoundController.java index 4dc451e6b..2f058f6ce 100644 --- a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/NofoundController.java +++ b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/NofoundController.java @@ -32,7 +32,7 @@ public class NofoundController extends BaseController { return model.redirect("/general/district?q=" + URLEncoder.encode(model.getQ(), "UTF-8")+"&cityName="+URLEncoder.encode(model.getCityName(), "UTF-8")); } - // 查询半径内小区 + // 鏌ヨ鍗婂緞鍐呭皬鍖� final double lat = model.getLat(); final double lng = model.getLng(); final double radius = getRadius(); @@ -50,7 +50,7 @@ public class NofoundController extends BaseController { return model; } - // 按距离排序,由近到远 + // 鎸夎窛绂绘帓搴忥紝鐢辫繎鍒拌繙 Collections.sort(tmpDistricts, new Comparator() { public int compare(District o1, District o2) { double dis1 = GeoUtils.calculateDistance(lng, lat, o1.getLng2() / 10000000000.0, o1.getLat2() / 10000000000.0); @@ -106,7 +106,7 @@ public class NofoundController extends BaseController { final double lat = model.getLat(); final double lng = model.getLng(); List shops = shopService.searchNearby(lat, lng, getRadius()); - // 按距离排序,由近到远 + // 鎸夎窛绂绘帓搴忥紝鐢辫繎鍒拌繙 Collections.sort(shops, new Comparator() { public int compare(Shop o1, Shop o2) { double dis1 = GeoUtils.calculateDistance(lng, lat, o1.getLng2() / 10000000000.0, o1.getLat2() / 10000000000.0); diff --git a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/NoshopController.java b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/NoshopController.java index c4bd68ccd..ad7f090d7 100644 --- a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/NoshopController.java +++ b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/NoshopController.java @@ -49,7 +49,7 @@ public class NoshopController extends BaseController { final double lng = model.getLng(); final double radius = getRadius(); - // 周边没商铺,直接返回 + // 鍛ㄨ竟娌″晢閾猴紝鐩存帴杩斿洖 List shops = shopService.searchNearby(lat, lng, radius); if (CollectionUtils.isEmpty(shops)) { return model; @@ -61,7 +61,7 @@ public class NoshopController extends BaseController { model.setCityPrice(cityStat.getAvgPrice()); } - // 按距离排序,由近到远 + // 鎸夎窛绂绘帓搴忥紝鐢辫繎鍒拌繙 Collections.sort(shops, new Comparator() { public int compare(Shop o1, Shop o2) { double dis1 = GeoUtils.calculateDistance(lng, lat, o1.getLng2() / 10000000000.0, o1.getLat2() / 10000000000.0); @@ -102,7 +102,7 @@ public class NoshopController extends BaseController { model.setPriceNearest(priceNearest); - // 范围内均价 + // 鑼冨洿鍐呭潎浠� if (priceCount > 0 && stats.size() > 0) { model.setAreaPrice(priceCount / stats.size()); @@ -120,7 +120,7 @@ public class NoshopController extends BaseController { } } - // 由低到高排序 + // 鐢变綆鍒伴珮鎺掑簭 Collections.sort(stats, new Comparator() { public int compare(DistrictStat o1, DistrictStat o2) { return o1.getAvgPrice() - o2.getAvgPrice(); @@ -135,7 +135,7 @@ public class NoshopController extends BaseController { } model.setPriceBtm5(priceBtm5); - // 由高到低排序 + // 鐢遍珮鍒颁綆鎺掑簭 Collections.reverse(stats); List priceTop5 = new ArrayList(5); for (DistrictStat s : stats) { @@ -154,7 +154,7 @@ public class NoshopController extends BaseController { final double lng = model.getLng(); final double radius = getRadius(); - // 周边没商铺,直接返回 + // 鍛ㄨ竟娌″晢閾猴紝鐩存帴杩斿洖 List shops = shopService.searchNearby(lat, lng, radius); if (CollectionUtils.isEmpty(shops)) { return model; @@ -166,7 +166,7 @@ public class NoshopController extends BaseController { model.setCityRentPrice(cityStat.getAvgPrice()); } - // 按距离排序,由近到远 + // 鎸夎窛绂绘帓搴忥紝鐢辫繎鍒拌繙 Collections.sort(shops, new Comparator() { public int compare(Shop o1, Shop o2) { double dis1 = GeoUtils.calculateDistance(lng, lat, o1.getLng2() / 10000000000.0, o1.getLat2() / 10000000000.0); @@ -201,7 +201,7 @@ public class NoshopController extends BaseController { model.setRentNearest(priceNearest); - // 范围内均价 + // 鑼冨洿鍐呭潎浠� if (priceCount > 0 && stats.size() > 0) { model.setAreaRentPrice(priceCount / stats.size()); @@ -219,7 +219,7 @@ public class NoshopController extends BaseController { } } - // 由低到高排序 + // 鐢变綆鍒伴珮鎺掑簭 Collections.sort(stats, new Comparator() { public int compare(DistrictBusinessStatRent o1, DistrictBusinessStatRent o2) { return o1.getAvgPrice() - o2.getAvgPrice(); @@ -234,7 +234,7 @@ public class NoshopController extends BaseController { } model.setRentBtm5(priceBtm5); - // 由高到低排序 + // 鐢遍珮鍒颁綆鎺掑簭 Collections.reverse(stats); List priceTop5 = new ArrayList(5); for (DistrictBusinessStatRent s : stats) { @@ -254,16 +254,16 @@ public class NoshopController extends BaseController { final double radius = getRadius(); Map> stationMap = busStationService.getNearByStations(model.getCityName(), lat, lng, radius); - model.setMetroStations(stationMap.get("地铁")); - model.setBusStations(stationMap.get("公交")); + model.setMetroStations(stationMap.get("鍦伴搧")); + model.setBusStations(stationMap.get("鍏氦")); - // 虹桥机场 121.352578,31.200062 + // 铏规ˉ鏈哄満 121.352578,31.200062 model.setDisHongqiaoAirport(GeoUtils.calculateDistance(lng, lat, 121.352578, 31.200062)); - // 虹桥火车站 121.32795,31.1991 + // 铏规ˉ鐏溅绔� 121.32795,31.1991 model.setDisHongqiaoStation(GeoUtils.calculateDistance(lng, lat, 121.32795, 31.1991)); - // 周边没商铺,直接返回 + // 鍛ㄨ竟娌″晢閾猴紝鐩存帴杩斿洖 List shops = shopService.searchNearby(lat, lng, radius); if (CollectionUtils.isNotEmpty(shops)) { int priceCount = 0; @@ -278,7 +278,7 @@ public class NoshopController extends BaseController { } } - // 范围内均价 + // 鑼冨洿鍐呭潎浠� if (priceCount > 0 && count > 0) { model.setAreaPrice(priceCount / count); } @@ -380,7 +380,7 @@ public class NoshopController extends BaseController { double lat = model.getLat(); double lng = model.getLng(); double radius = getRadius(); - model.setAvgConsumption(bizShopService.findAroundAvgConsumption(lat, lng, radius, "餐厅")); + model.setAvgConsumption(bizShopService.findAroundAvgConsumption(lat, lng, radius, "椁愬巺")); double cityConsumMin = model.getCityConsumMin(); double cityConsumMax = model.getCityConsumMax(); @@ -397,8 +397,8 @@ public class NoshopController extends BaseController { double lng = model.getLng(); double radius = getRadius(); Map> stationMap = busStationService.getNearByStations(city, lat, lng, radius); - model.setMetroStations(stationMap.get("地铁")); - model.setBusStations(stationMap.get("公交")); + model.setMetroStations(stationMap.get("鍦伴搧")); + model.setBusStations(stationMap.get("鍏氦")); return model; } @@ -617,7 +617,7 @@ public class NoshopController extends BaseController { district.setAvgPrice(avgPrice); district.setKind(commData.getKind()); - if (district.getName().endsWith("村")) { + if (district.getName().endsWith("鏉�")) { oldHouseCount += count; oldDistrictCount++; @@ -636,15 +636,15 @@ public class NoshopController extends BaseController { } } - model.setTotalHouseCount(oldHouseCount + hightLevelDistrictHouseCount + commonDistrictHouseCount);// 总户数 - model.setCommonDistrictHouseCount(commonDistrictHouseCount);// 高级商品房户数 - model.setHightDistrictHouseCount(hightLevelDistrictHouseCount);// 普通户数 - model.setTotalDistrictCount(oldDistrictCount + commonDistrictCount + hightLevelDistrictCount);// 总小区数 - model.setCommonDistrictCount(commonDistrictCount);// 高级小区数 - model.setHightDistrictCount(hightLevelDistrictCount);// 普通小区数 + model.setTotalHouseCount(oldHouseCount + hightLevelDistrictHouseCount + commonDistrictHouseCount);// 鎬绘埛鏁� + model.setCommonDistrictHouseCount(commonDistrictHouseCount);// 楂樼骇鍟嗗搧鎴挎埛鏁� + model.setHightDistrictHouseCount(hightLevelDistrictHouseCount);// 鏅�氭埛鏁� + model.setTotalDistrictCount(oldDistrictCount + commonDistrictCount + hightLevelDistrictCount);// 鎬诲皬鍖烘暟 + model.setCommonDistrictCount(commonDistrictCount);// 楂樼骇灏忓尯鏁� + model.setHightDistrictCount(hightLevelDistrictCount);// 鏅�氬皬鍖烘暟 - model.setOldHouseCount(oldHouseCount);// 老工房 户数 - model.setOldDistrictCount(oldDistrictCount);// 老工户 小区数 + model.setOldHouseCount(oldHouseCount);// 鑰佸伐鎴� 鎴锋暟 + model.setOldDistrictCount(oldDistrictCount);// 鑰佸伐鎴� 灏忓尯鏁� } return model; @@ -691,11 +691,11 @@ public class NoshopController extends BaseController { } if (StringUtils.isNotBlank(office.getBedKind())) { - if (office.getBedKind().equals("甲级")) { + if (office.getBedKind().equals("鐢茬骇")) { bestLevelCount = bestLevelCount + office.getHouseholdCount(); - } else if (office.getBedKind().equals("乙级")) { + } else if (office.getBedKind().equals("涔欑骇")) { betterLevelCount = betterLevelCount + office.getHouseholdCount(); - } else if (office.getBedKind().equals("丙级")) { + } else if (office.getBedKind().equals("涓欑骇")) { goodLevelCount = goodLevelCount + office.getHouseholdCount(); } else { otherLevelCount = otherLevelCount + office.getHouseholdCount(); diff --git a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/PeopleController.java b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/PeopleController.java index 3ae108c91..6f38ea0f0 100644 --- a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/PeopleController.java +++ b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/PeopleController.java @@ -78,13 +78,13 @@ public class PeopleController extends BaseController { JSONArray officesObj = JSONArray.fromObject(offices); model.setOffices(officesObj.toString()); - // 居民人口密度 + // 灞呮皯浜哄彛瀵嗗害 double circleArea = Math.PI * Math.pow(radius / 1000.0, 2); int totalHouseCount = model.getTotalHouseCount(); double density = totalHouseCount * 2.49 / circleArea; double score1 = ShopScoreUtil.populationScore(density); data.put("populationScore",score1); - // 办公人口 + // 鍔炲叕浜哄彛 int totalCountOffice = model.getTotalCountOffice(); density = totalCountOffice / circleArea; double score2 = ShopScoreUtil.officePopulationScore(density); @@ -124,26 +124,26 @@ public class PeopleController extends BaseController { JSONArray officesObj = JSONArray.fromObject(offices); model.setOffices(officesObj.toString()); - // 居民人口密度 + // 灞呮皯浜哄彛瀵嗗害 /*double circleArea = Math.PI * Math.pow(radius / 1000.0, 2); int totalHouseCount = model.getTotalHouseCount(); double density = totalHouseCount * 2.49 / circleArea; double score1 = ShopScoreUtil.peopleScore1(density); model.setScore1(score1); - // 办公人口 + // 鍔炲叕浜哄彛 int totalCountOffice = model.getTotalCountOffice(); density = totalCountOffice / circleArea; double score2 = ShopScoreUtil.peopleScore2(density); model.setScore2(score2);*/ - //圆形面积 + //鍦嗗舰闈㈢Н double circleArea = Math.PI * Math.pow(radius / 1000.0, 2); - //设置居民人口密度得分 + //璁剧疆灞呮皯浜哄彛瀵嗗害寰楀垎 double peopleDensityScore = setPeopleDensityScore(model, radius, circleArea); - //设置办公人口得分 + //璁剧疆鍔炲叕浜哄彛寰楀垎 double officeDensityScore = setOfficeDensityScore(model, circleArea); model.setTabScore(peopleDensityScore > officeDensityScore ? peopleDensityScore : officeDensityScore); @@ -182,7 +182,7 @@ public class PeopleController extends BaseController { } /** - * 设置办公人口得分 + * 璁剧疆鍔炲叕浜哄彛寰楀垎 * @author yinjihuan * @date 2016-03-04 * @param model @@ -190,18 +190,18 @@ public class PeopleController extends BaseController { * @return */ private double setOfficeDensityScore(PeopleModel model, double circleArea) { - //办公人数总数 + //鍔炲叕浜烘暟鎬绘暟 int totalCountOffice = model.getTotalCountOffice(); - //办公人口密度=(圆形区域内办公人数总数/圆形面积) + //鍔炲叕浜哄彛瀵嗗害=(鍦嗗舰鍖哄煙鍐呭姙鍏汉鏁版�绘暟/鍦嗗舰闈㈢Н) double density = totalCountOffice / circleArea; - //办公人口密度得分 + //鍔炲叕浜哄彛瀵嗗害寰楀垎 double officeDensityScore = ShopScoreUtil.calcOfficeDensityScore(density); model.setScore2(officeDensityScore); return officeDensityScore; } /** - * 设置居民人口密度得分 + * 璁剧疆灞呮皯浜哄彛瀵嗗害寰楀垎 * @author yinjihuan * @date 2016-03-04 * @param model @@ -209,11 +209,11 @@ public class PeopleController extends BaseController { * @return */ private double setPeopleDensityScore(PeopleModel model, double radius, double circleArea) { - // 圆形区域内总户数 + // 鍦嗗舰鍖哄煙鍐呮�绘埛鏁� int totalHouseCount = model.getTotalHouseCount(); - //居民人口密度(居民人口密度 = 圆形区域内总户数*2.49/圆形面积) + //灞呮皯浜哄彛瀵嗗害(灞呮皯浜哄彛瀵嗗害 = 鍦嗗舰鍖哄煙鍐呮�绘埛鏁�*2.49/鍦嗗舰闈㈢Н) double density = totalHouseCount * 2.49 / circleArea; - //人口密度得分 + //浜哄彛瀵嗗害寰楀垎 double peopleDensityScore = ShopScoreUtil.calcPeopleDensityScore(density); model.setScore1(peopleDensityScore); return peopleDensityScore; @@ -319,7 +319,7 @@ public class PeopleController extends BaseController { district.setAvgPrice(avgPrice); district.setKind(commData.getKind()); - if (district.getName().endsWith("村")) { + if (district.getName().endsWith("鏉�")) { oldHouseCount += count; oldDistrictCount++; @@ -338,15 +338,15 @@ public class PeopleController extends BaseController { } } - model.setTotalHouseCount(oldHouseCount + hightLevelDistrictHouseCount + commonDistrictHouseCount);// 总户数 - model.setCommonDistrictHouseCount(commonDistrictHouseCount);// 高级商品房户数 - model.setHightDistrictHouseCount(hightLevelDistrictHouseCount);// 普通户数 - model.setTotalDistrictCount(oldDistrictCount + commonDistrictCount + hightLevelDistrictCount);// 总小区数 - model.setCommonDistrictCount(commonDistrictCount);// 高级小区数 - model.setHightDistrictCount(hightLevelDistrictCount);// 普通小区数 + model.setTotalHouseCount(oldHouseCount + hightLevelDistrictHouseCount + commonDistrictHouseCount);// 鎬绘埛鏁� + model.setCommonDistrictHouseCount(commonDistrictHouseCount);// 楂樼骇鍟嗗搧鎴挎埛鏁� + model.setHightDistrictHouseCount(hightLevelDistrictHouseCount);// 鏅�氭埛鏁� + model.setTotalDistrictCount(oldDistrictCount + commonDistrictCount + hightLevelDistrictCount);// 鎬诲皬鍖烘暟 + model.setCommonDistrictCount(commonDistrictCount);// 楂樼骇灏忓尯鏁� + model.setHightDistrictCount(hightLevelDistrictCount);// 鏅�氬皬鍖烘暟 - model.setOldHouseCount(oldHouseCount);// 老工房 户数 - model.setOldDistrictCount(oldDistrictCount);// 老工户 小区数 + model.setOldHouseCount(oldHouseCount);// 鑰佸伐鎴� 鎴锋暟 + model.setOldDistrictCount(oldDistrictCount);// 鑰佸伐鎴� 灏忓尯鏁� } return model; @@ -393,11 +393,11 @@ public class PeopleController extends BaseController { } if (StringUtils.isNotBlank(office.getBedKind())) { - if (office.getBedKind().equals("甲级")) { + if (office.getBedKind().equals("鐢茬骇")) { bestLevelCount = bestLevelCount + office.getHouseholdCount(); - } else if (office.getBedKind().equals("乙级")) { + } else if (office.getBedKind().equals("涔欑骇")) { betterLevelCount = betterLevelCount + office.getHouseholdCount(); - } else if (office.getBedKind().equals("丙级")) { + } else if (office.getBedKind().equals("涓欑骇")) { goodLevelCount = goodLevelCount + office.getHouseholdCount(); } else { otherLevelCount = otherLevelCount + office.getHouseholdCount(); diff --git a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/PredictController.java b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/PredictController.java index dc1fd2680..f234b4ec6 100644 --- a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/PredictController.java +++ b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/PredictController.java @@ -43,10 +43,10 @@ public class PredictController extends BaseController{ model.setStatBo(statBo); int avgPrice = 0; - String buildType = "小区"; + String buildType = "灏忓尯"; if (null == statBo.getDistrictStat() && null != statBo.getVillaDistrictStat()) { avgPrice = statBo.getVillaDistrictStat().getAvgPrice(); - buildType = "别墅"; + buildType = "鍒"; } else if (null != statBo.getDistrictStat()) { avgPrice = statBo.getDistrictStat().getAvgPrice(); } @@ -81,7 +81,7 @@ public class PredictController extends BaseController{ } private void addDistrictStat(List seriesOptions, DistrictKey districtKey, int weeks) { - List list = Arrays.asList(StringUtils.split(districtService.findDistrictKind(districtKey), ",,")); + List list = Arrays.asList(StringUtils.split(districtService.findDistrictKind(districtKey), ",锛�")); List districtStatBoList = districtStatService.findAllDistrictStatByKind(districtKey, new Date(), weeks, list); JSONArray districtJa = new JSONArray(); @@ -130,7 +130,7 @@ public class PredictController extends BaseController{ if (villaJa.length() > 0) { JSONObject jo2 = new JSONObject(); - jo2.put("name", districtKey.getName() + "(别墅)"); + jo2.put("name", districtKey.getName() + "(鍒)"); jo2.put("data", villaJa.toString()); jo2.put("yAxis", 0); seriesOptions.add(jo2); diff --git a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/PriceController.java b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/PriceController.java index 8918349e8..97e959362 100644 --- a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/PriceController.java +++ b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/PriceController.java @@ -35,7 +35,7 @@ import java.net.URLEncoder; import java.util.*; /** - * 价格指数 + * 浠锋牸鎸囨暟 * @author yk * */ @@ -51,15 +51,15 @@ public class PriceController extends BaseController { final static ChafangtongCookieContext cookieContext = ChafangtongCookieContext.getInstance(); public Object districtAction(PriceModel model) throws UnsupportedEncodingException { /** - * 将"全市相对最低"指标数字变更成上海小区均价升序,前0到3%的均价的中位数。 - * "全市相对最高"指标数字变更成上海小区均价升序,前97%到100%的均价的中位数 - * 2016-07-05 yinjihuan修改 + * 灏�"鍏ㄥ競鐩稿鏈�浣�"鎸囨爣鏁板瓧鍙樻洿鎴愪笂娴峰皬鍖哄潎浠峰崌搴忥紝鍓�0鍒�3%鐨勫潎浠风殑涓綅鏁般�� + * "鍏ㄥ競鐩稿鏈�楂�"鎸囨爣鏁板瓧鍙樻洿鎴愪笂娴峰皬鍖哄潎浠峰崌搴忥紝鍓�97%鍒�100%鐨勫潎浠风殑涓綅鏁� + * 2016-07-05 yinjihuan淇敼 */ Map priceMap = districtStatService.getCityDistriceMinAndMaxPrice(model.getCityName()); if (null == priceMap) { return model.redirect("/noResult/district?q=" + URLEncoder.encode(model.getDistrictName(), "UTF-8") + "&cityName=" +URLEncoder.encode(model.getCityName(), "UTF-8")); } - //设置价格 + //璁剧疆浠锋牸 model.setCityDistrictMinSellPrice(priceMap.get("cityDistrictMinSellPrice")); model.setCityDistrictMaxSellPrice(priceMap.get("cityDistrictMaxSellPrice")); @@ -108,17 +108,17 @@ public class PriceController extends BaseController { if(StringUtils.isNotBlank(district.getRegion())){ params.add(new QueryParam("region", district.getRegion())); } - Date lastMonthEndDate = DateUtil.getLastEndMonthDate(new Date());// 检索上上月的数据 + Date lastMonthEndDate = DateUtil.getLastEndMonthDate(new Date());// 妫�绱笂涓婃湀鐨勬暟鎹� params.add(new QueryParam("endMonthDate", lastMonthEndDate)); List regionStatRentList=regionStatRentDao.findAllByParams(params); model.setRegionStatRents(regionStatRentList); model.setRentStatBos(rentBos); String estateType = district.getEstateType2(); - if(!estateType.contains("别墅")){ - estateType = "小区"; + if(!estateType.contains("鍒")){ + estateType = "灏忓尯"; }else{ - estateType = "别墅"; + estateType = "鍒"; } List rentList = new ArrayList(); Map districtStatRents = districtStatRentService.findByDistrictStatRent(districtKey, estateType); @@ -211,7 +211,7 @@ public class PriceController extends BaseController { } List seriesOptions = new ArrayList(); - String title = name + "均价走势"; + String title = name + "鍧囦环璧板娍"; DistrictKey districtKey = new DistrictKey(city, region, name); addDistrictStat(seriesOptions, districtKey, weeks); diff --git a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/RentController.java b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/RentController.java index daeb0ae53..a502e2f0c 100644 --- a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/RentController.java +++ b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/RentController.java @@ -114,7 +114,7 @@ public class RentController extends BaseController { } List seriesOptions = new ArrayList(); - String title = name + "租金走势"; + String title = name + "绉熼噾璧板娍"; DistrictKey districtKey = new DistrictKey(city, region, name); addDistrictStat(seriesOptions, districtKey, weeks); diff --git a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/ReportController.java b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/ReportController.java index 0ee9be5e4..fd969fddf 100644 --- a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/ReportController.java +++ b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/ReportController.java @@ -124,7 +124,7 @@ public class ReportController extends BaseController { model.setShowPdfLink(true); } - // 综合指数 + // 缁煎悎鎸囨暟 SeaweedNumberic numberic = seaweedNumbericDao.findShop(shop.getCity(), shop.getRegion(), shop.getName()); model.setDetailScore(ShopScoreUtil.detailScore(shop, numberic)); model.setDetailScore1(ShopScoreUtil.detailScore1(shop.getEstateType(), null == numberic ? null : numberic.getBuildArea())); @@ -132,7 +132,7 @@ public class ReportController extends BaseController { model.setDetailScore3(ShopScoreUtil.detailScore3(shop.getCarSiteCount())); model.setDetailScore4(ShopScoreUtil.detailScore4(null == numberic ? null : numberic.getFinishBuildYear())); - // 房价指数 + // 鎴夸环鎸囨暟 Date weekend = DateUtil.getFirstDayOfWeek(new Date()); BizRegionStat cityStat = bizRegionStatService.findCitySellPrice(city, weekend); if (null != cityStat) { @@ -170,7 +170,7 @@ public class ReportController extends BaseController { model.setSellTradeUrl(model.getCityUrl() + "/cImg/" + SecurityUtil.encode(urlBuilder.toString()) + (isRefreshCache ? "?__refresh_cache=1" : "")); - // 租金指数 + // 绉熼噾鎸囨暟 DistrictBusinessStatRentBo retnStatBo = districtBusinessStatRentService.findMallStatBo(new DistrictKey(shop.getCity(), shop.getRegion(), shop.getName()), weekend); model.setRentStatBo(retnStatBo); @@ -203,15 +203,15 @@ public class ReportController extends BaseController { model.setRentTradeUrl(model.getCityUrl() + "/cImg/" + SecurityUtil.encode(urlBuilder.toString()) + (isRefreshCache ? "?__refresh_cache=1" : "")); - // 地段指数 + // 鍦版鎸囨暟 Map> stationMap = busStationService.getNearByStations(city, lat, lng, radius); - model.setMetroStations(stationMap.get("地铁")); - model.setBusStations(stationMap.get("公交")); + model.setMetroStations(stationMap.get("鍦伴搧")); + model.setBusStations(stationMap.get("鍏氦")); - // 虹桥机场 121.352578,31.200062 + // 铏规ˉ鏈哄満 121.352578,31.200062 model.setDisHongqiaoAirport(GeoUtils.calculateDistance(lng, lat, 121.352578, 31.200062)); - // 虹桥火车站 121.32795,31.1991 + // 铏规ˉ鐏溅绔� 121.32795,31.1991 model.setDisHongqiaoStation(GeoUtils.calculateDistance(lng, lat, 121.32795, 31.1991)); model.setLocalScore(ShopScoreUtil.localScore(shop.getLoopLineInfo(), null == model.getMetroStations() ? 0 : model @@ -263,7 +263,7 @@ public class ReportController extends BaseController { model.setPieColors(Arrays.asList(new String[]{"#5491c7" ,"#f0776e" ,"#66bd7d" ,"#f5a549" ,"#c075eb"})); model.setPieMarkers(jFreeChartImageService.getAroundBizTypePieMarkers(lat, lng, radius)); - // 人口指数 + // 浜哄彛鎸囨暟 int cityAvgPrice = cityPriceLevelService.findCityPriceLevel(city); cityAvgPrice = cityAvgPrice == 0 ? 7000 : cityAvgPrice; model.setCityAvgPrice(cityAvgPrice); @@ -274,14 +274,14 @@ public class ReportController extends BaseController { List offices = findDistricts(city, "office", lat, lng, radius); offices = getOfficeCommDataInfo(offices, model); - // 居民人口密度 + // 灞呮皯浜哄彛瀵嗗害 double circleArea = Math.PI * Math.pow(radius / 1000.0, 2); int totalHouseCount = model.getTotalHouseCount(); double density = totalHouseCount * 2.49 / circleArea; double peopleScore1 = ShopScoreUtil.peopleScore1(density); model.setPeopleScore1(peopleScore1); - // 办公人口 + // 鍔炲叕浜哄彛 int totalCountOffice = model.getTotalCountOffice(); density = totalCountOffice / circleArea; double peopleScore2 = ShopScoreUtil.peopleScore2(density); @@ -289,17 +289,17 @@ public class ReportController extends BaseController { model.setPeopleScore(peopleScore1 > peopleScore2 ? peopleScore1 : peopleScore2); - // 消费指数 - model.setAvgConsumption(bizShopService.findAroundAvgConsumption(lat, lng, radius, "餐厅")); + // 娑堣垂鎸囨暟 + model.setAvgConsumption(bizShopService.findAroundAvgConsumption(lat, lng, radius, "椁愬巺")); double cityConsumMin = model.getCityConsumMin(); double cityConsumMax = model.getCityConsumMax(); if (null != model.getAvgConsumption()) { model.setHigher((model.getAvgConsumption() - cityConsumMin) * 100.0 / (cityConsumMax - cityConsumMin)); } - List allKw = Arrays.asList(new String[]{ "KTV", "电影院", "健身中心", "商场", "美容院", "星级酒店", "大型超市", - "高尔夫球场", "私立学校", "整形", "咖啡厅", "洗浴","医院", "公园", "学校", "体育馆","银行", "商场", "大型超市", "餐饮"}); + List allKw = Arrays.asList(new String[]{ "KTV", "鐢靛奖闄�", "鍋ヨ韩涓績", "鍟嗗満", "缇庡闄�", "鏄熺骇閰掑簵", "澶у瀷瓒呭競", + "楂樺皵澶悆鍦�", "绉佺珛瀛︽牎", "鏁村舰", "鍜栧暋鍘�", "娲楁荡","鍖婚櫌", "鍏洯", "瀛︽牎", "浣撹偛棣�","閾惰", "鍟嗗満", "澶у瀷瓒呭競", "椁愰ギ"}); Map baiduKwResult = baiduApiService.searchNearBy(allKw, lat, lng, radius, model.getBaiduMapKey()); - String[] ks = new String[] { "KTV", "电影院", "健身中心", "商场", "美容院", "星级酒店", "大型超市", "高尔夫球场", "私立学校", "整形", "咖啡厅", "洗浴" }; + String[] ks = new String[] { "KTV", "鐢靛奖闄�", "鍋ヨ韩涓績", "鍟嗗満", "缇庡闄�", "鏄熺骇閰掑簵", "澶у瀷瓒呭競", "楂樺皵澶悆鍦�", "绉佺珛瀛︽牎", "鏁村舰", "鍜栧暋鍘�", "娲楁荡" }; Map countMap = new HashMap(ks.length); for (int i = 0; i < ks.length; i++) { Integer c = getTotal(baiduKwResult.get(ks[i])); @@ -310,8 +310,8 @@ public class ReportController extends BaseController { model.setConsumCountMap(countMap); model.setConsumScore(ShopScoreUtil.consumScore(model.getAvgConsumption(), countMap)); - // 环境指数 - ks = new String[] { "医院", "公园", "学校", "体育馆" }; + // 鐜鎸囨暟 + ks = new String[] { "鍖婚櫌", "鍏洯", "瀛︽牎", "浣撹偛棣�" }; Map aroundCountMap = new HashMap(); countMap = new HashMap(ks.length); for (int i = 0; i < ks.length; i++) { @@ -320,14 +320,14 @@ public class ReportController extends BaseController { countMap.put(ks[i], c); } } - countMap.put("地铁站", null == model.getMetroStations() ? null : model.getMetroStations().size()); - countMap.put("公交点", null == model.getBusStations() ? null : model.getBusStations().size()); + countMap.put("鍦伴搧绔�", null == model.getMetroStations() ? null : model.getMetroStations().size()); + countMap.put("鍏氦鐐�", null == model.getBusStations() ? null : model.getBusStations().size()); aroundCountMap.putAll(countMap); double aroundScore1 = ShopScoreUtil.aroundScore1(countMap); model.setAroundScore1(aroundScore1); - ks = new String[] { "银行", "商场", "大型超市", "餐饮" }; + ks = new String[] { "閾惰", "鍟嗗満", "澶у瀷瓒呭競", "椁愰ギ" }; countMap = new HashMap(ks.length); for (int i = 0; i < ks.length; i++) { Integer c = getTotal(baiduKwResult.get(ks[i])); @@ -441,7 +441,7 @@ public class ReportController extends BaseController { model.setShowPdfLink(true); } - // 楼盘指数 + // 妤肩洏鎸囨暟 SeaweedNumberic numberic = seaweedNumbericDao.findDistrict(city, region, district.getName()); model.setDetailScore(DistrictScoreUtil.detailScore(district, numberic)); @@ -454,9 +454,9 @@ public class ReportController extends BaseController { model.setDetailScore4(DistrictScoreUtil.detailScore4(nullNumberic ? null : numberic.getCubagePercent())); model.setDetailScore5(DistrictScoreUtil.detailScore5(district.getBuildType(), nullNumberic ? null : numberic.getCarSiteCount())); - // 房价指数 + // 鎴夸环鎸囨暟 RegionStat cityStat = regionStatService.findByCity(city); -// Integer cityLeave = 0;//最高房价和最低房价的差值 +// Integer cityLeave = 0;//鏈�楂樻埧浠峰拰鏈�浣庢埧浠风殑宸�� if (null != cityStat) { model.setCityPrice(cityStat.getAvgPrice()); // Integer citySellMin = model.getCityDistrictMinSellPrice(); @@ -481,7 +481,7 @@ public class ReportController extends BaseController { if(StringUtils.isNotBlank(district.getRegion())){ params.add(new QueryParam("region", district.getRegion())); } - Date lastMonthEndDate = DateUtil.getLastEndMonthDate(new Date());// 检索上上月的数据 + Date lastMonthEndDate = DateUtil.getLastEndMonthDate(new Date());// 妫�绱笂涓婃湀鐨勬暟鎹� params.add(new QueryParam("endMonthDate", lastMonthEndDate)); List regionStatRentList=regionStatRentDao.findAllByParams(params); model.setRegionStatRents(regionStatRentList); @@ -490,10 +490,10 @@ public class ReportController extends BaseController { rentBo = districtStatRentService.findByDistrictStatRent(districtKey,2); List rentList = new ArrayList(); String estateType = district.getEstateType2(); - if(!estateType.contains("别墅")){ - estateType = "小区"; + if(!estateType.contains("鍒")){ + estateType = "灏忓尯"; }else{ - estateType = "别墅"; + estateType = "鍒"; } Map districtStatRents = districtStatRentService.findByDistrictStatRent(districtKey, estateType); @@ -523,7 +523,7 @@ public class ReportController extends BaseController { if (null != stat) { Map priceMap = districtStatService.getCityDistriceMinAndMaxPrice(model.getCityName()); - //设置价格 + //璁剧疆浠锋牸 model.setCityDistrictMinSellPrice(priceMap.get("cityDistrictMinSellPrice")); model.setCityDistrictMaxSellPrice(priceMap.get("cityDistrictMaxSellPrice")); @@ -541,11 +541,11 @@ public class ReportController extends BaseController { } } - // 潜力指数 - String buildType = "小区"; + // 娼滃姏鎸囨暟 + String buildType = "灏忓尯"; if (null == statBo.getDistrictStat() && null != statBo.getVillaDistrictStat()) { avgPrice = statBo.getVillaDistrictStat().getAvgPrice(); - buildType = "别墅"; + buildType = "鍒"; } else if (null != statBo.getDistrictStat()) { avgPrice = statBo.getDistrictStat().getAvgPrice(); } @@ -572,9 +572,9 @@ public class ReportController extends BaseController { model.setSellTradeUrl(model.getCityUrl() + "/cImg/" + SecurityUtil.encode(urlBuilder.toString()) + (isRefreshCache ? "?__refresh_cache=1" : "")); - // 稀缺指数 + // 绋�缂烘寚鏁� model.setRegionOrg(regionBlockService.getOrgName(city, region, "region")); - model.setBlockOrg(block + "板块"); + model.setBlockOrg(block + "鏉垮潡"); model.setRegionDistrictCount(districtService.findRegionDistrictCount(city, region)); //model.setBlockDistrictCount(districtService.findBlockDistrictCount(city, region, block)); model.setCityDistrictCount(districtService.findCityDistrictCount(city)); @@ -615,8 +615,8 @@ public class ReportController extends BaseController { model.setMaxDealPriceCount(districtAnalyDataService.findMaxDealCountByCity(city)); model.setMaxSellCount(districtAnalyDataService.findMaxSellCountByCity(city)); model.setDistrictAnalyData(districtAnalyData); - // 消费指数 - model.setAvgConsumption(bizShopService.findAroundAvgConsumption(lat, lng, radius, "餐厅")); + // 娑堣垂鎸囨暟 + model.setAvgConsumption(bizShopService.findAroundAvgConsumption(lat, lng, radius, "椁愬巺")); double cityConsumMin = model.getCityConsumMin(); double cityConsumMax = model.getCityConsumMax(); @@ -624,11 +624,11 @@ public class ReportController extends BaseController { model.setHigher((model.getAvgConsumption() - cityConsumMin) * 100.0 / (cityConsumMax - cityConsumMin)); } List allKs = Arrays.asList(new String[]{ - "KTV", "电影院", "健身中心", "商场", "美容院", "星级酒店", "大型超市", "高尔夫球场", "私立学校", "整形", "咖啡厅", "洗浴", - "医院", "学校", "写字楼", "银行", "ATM", "超市", "停车场", "公园", "网吧", "医院", "学校", "写字楼", "银行", "ATM", "超市", "停车场", "公园", "网吧" + "KTV", "鐢靛奖闄�", "鍋ヨ韩涓績", "鍟嗗満", "缇庡闄�", "鏄熺骇閰掑簵", "澶у瀷瓒呭競", "楂樺皵澶悆鍦�", "绉佺珛瀛︽牎", "鏁村舰", "鍜栧暋鍘�", "娲楁荡", + "鍖婚櫌", "瀛︽牎", "鍐欏瓧妤�", "閾惰", "ATM", "瓒呭競", "鍋滆溅鍦�", "鍏洯", "缃戝惂", "鍖婚櫌", "瀛︽牎", "鍐欏瓧妤�", "閾惰", "ATM", "瓒呭競", "鍋滆溅鍦�", "鍏洯", "缃戝惂" }); Map kwResult = baiduApiService.searchNearBy(allKs, lat, lng, radius, model.getBaiduMapKey()); - String[] ks = new String[] { "KTV", "电影院", "健身中心", "商场", "美容院", "星级酒店", "大型超市", "高尔夫球场", "私立学校", "整形", "咖啡厅", "洗浴" }; + String[] ks = new String[] { "KTV", "鐢靛奖闄�", "鍋ヨ韩涓績", "鍟嗗満", "缇庡闄�", "鏄熺骇閰掑簵", "澶у瀷瓒呭競", "楂樺皵澶悆鍦�", "绉佺珛瀛︽牎", "鏁村舰", "鍜栧暋鍘�", "娲楁荡" }; Map countMap = new HashMap(ks.length); for (int i = 0; i < ks.length; i++) { countMap.put(ks[i], getTotal(kwResult.get(ks[i]))); @@ -636,34 +636,34 @@ public class ReportController extends BaseController { model.setConsumCountMap(countMap); model.setConsumScore(DistrictScoreUtil.consumScore(model.getAvgConsumption(), countMap)); - // 环境指数 + // 鐜鎸囨暟 Map> stationMap = busStationService.getNearByStations(city, lat, lng, radius); - model.setMetroStations(stationMap.get("地铁")); - model.setBusStations(stationMap.get("公交")); + model.setMetroStations(stationMap.get("鍦伴搧")); + model.setBusStations(stationMap.get("鍏氦")); - ks = new String[] { "医院", "学校", "写字楼", "银行", "ATM", "超市", "停车场", "公园", "网吧" }; - //厌恶设施 - String[] keys = new String[]{"发电厂","变电站","垃圾焚烧厂","化工厂"}; + ks = new String[] { "鍖婚櫌", "瀛︽牎", "鍐欏瓧妤�", "閾惰", "ATM", "瓒呭競", "鍋滆溅鍦�", "鍏洯", "缃戝惂" }; + //鍘屾伓璁炬柦 + String[] keys = new String[]{"鍙戠數鍘�","鍙樼數绔�","鍨冨溇鐒氱儳鍘�","鍖栧伐鍘�"}; countMap = new HashMap(ks.length); for (int i = 0; i < ks.length; i++) { countMap.put(ks[i], getTotal(kwResult.get(ks[i]))); } - //添加厌恶设施 + //娣诲姞鍘屾伓璁炬柦 for (int i = 0; i < keys.length; i++) { countMap.put(ks[i], getTotal(kwResult.get(ks[i]))); } - countMap.put("地铁站", null == model.getMetroStations() ? null : model.getMetroStations().size()); - countMap.put("公交点", null == model.getBusStations() ? null : model.getBusStations().size()); + countMap.put("鍦伴搧绔�", null == model.getMetroStations() ? null : model.getMetroStations().size()); + countMap.put("鍏氦鐐�", null == model.getBusStations() ? null : model.getBusStations().size()); - // 虹桥机场 121.352578,31.200062 - // 浦东机场 121.807085,31.160702 + // 铏规ˉ鏈哄満 121.352578,31.200062 + // 娴︿笢鏈哄満 121.807085,31.160702 double dis = GeoUtils.calculateDistance(lng, lat, 121.352578, 31.200062); if (dis <= radius) { - countMap.put("机场", 1); + countMap.put("鏈哄満", 1); } else { dis = GeoUtils.calculateDistance(lng, lat, 121.807085, 31.160702); if (dis <= radius) { - countMap.put("机场", 1); + countMap.put("鏈哄満", 1); } } @@ -763,7 +763,7 @@ public class ReportController extends BaseController { district.setAvgPrice(avgPrice); district.setKind(commData.getKind()); - if (district.getName().endsWith("村")) { + if (district.getName().endsWith("鏉�")) { oldHouseCount += count; } else { if (avgPrice >= model.getCityAvgPrice()) { @@ -775,10 +775,10 @@ public class ReportController extends BaseController { } } } - model.setTotalHouseCount(oldHouseCount + hightLevelDistrictHouseCount + commonDistrictHouseCount);// 总户数 - model.setCommonDistrictHouseCount(commonDistrictHouseCount);// 高级商品房户数 - model.setHightDistrictHouseCount(hightLevelDistrictHouseCount);// 普通户数 - model.setOldHouseCount(oldHouseCount);// 老工房 户数 + model.setTotalHouseCount(oldHouseCount + hightLevelDistrictHouseCount + commonDistrictHouseCount);// 鎬绘埛鏁� + model.setCommonDistrictHouseCount(commonDistrictHouseCount);// 楂樼骇鍟嗗搧鎴挎埛鏁� + model.setHightDistrictHouseCount(hightLevelDistrictHouseCount);// 鏅�氭埛鏁� + model.setOldHouseCount(oldHouseCount);// 鑰佸伐鎴� 鎴锋暟 } return model; } @@ -823,11 +823,11 @@ public class ReportController extends BaseController { } if (StringUtils.isNotBlank(office.getBedKind())) { - if (office.getBedKind().equals("甲级")) { + if (office.getBedKind().equals("鐢茬骇")) { bestLevelCount = bestLevelCount + office.getHouseholdCount(); - } else if (office.getBedKind().equals("乙级")) { + } else if (office.getBedKind().equals("涔欑骇")) { betterLevelCount = betterLevelCount + office.getHouseholdCount(); - } else if (office.getBedKind().equals("丙级")) { + } else if (office.getBedKind().equals("涓欑骇")) { goodLevelCount = goodLevelCount + office.getHouseholdCount(); } else { otherLevelCount = otherLevelCount + office.getHouseholdCount(); @@ -875,7 +875,7 @@ public class ReportController extends BaseController { return model; } - //获取报告编号 + //鑾峰彇鎶ュ憡缂栧彿 public String getNumber(){ String number = ""; while(StringUtil.isBlank(number)){ @@ -917,7 +917,7 @@ public class ReportController extends BaseController { DistrictStatBo districtStatBo = districtStatService.findDistrictStat(new DistrictKey(district.getCity(), district .getRegion(), district.getName())); DistrictStat districtStat = null; - if (StringUtils.contains(evaluation.getBuildType(), "别墅")) { + if (StringUtils.contains(evaluation.getBuildType(), "鍒")) { districtStat = districtStatBo.getVillaDistrictStat(); } else { districtStat = districtStatBo.getDistrictStat(); @@ -962,7 +962,7 @@ public class ReportController extends BaseController { DistrictStatBo districtStatBo = districtStatService.findDistrictStat(new DistrictKey(district.getCity(), district .getRegion(), district.getName())); DistrictStat districtStat = null; - if (StringUtils.contains(district.getEstateType2(), "别墅")) { + if (StringUtils.contains(district.getEstateType2(), "鍒")) { districtStat = districtStatBo.getVillaDistrictStat(); } else { districtStat = districtStatBo.getDistrictStat(); diff --git a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/ReportViewController.java b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/ReportViewController.java index c94a7b4e8..0ab755947 100644 --- a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/ReportViewController.java +++ b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/ReportViewController.java @@ -33,7 +33,7 @@ import java.util.List; import java.util.Random; /** - *估价报告查看 + *浼颁环鎶ュ憡鏌ョ湅 *@author wenyan */ public class ReportViewController extends BaseController { @@ -47,7 +47,7 @@ public class ReportViewController extends BaseController { String serialNumber; - // 根据id查找商铺 + // 鏍规嵁id鏌ユ壘鍟嗛摵 Shop shop = null; if (ObjectId.isValid(model.getId())) { shop = shopService.findById(model.getId()); @@ -236,7 +236,7 @@ public class ReportViewController extends BaseController { DistrictStatBo districtStatBo = districtStatService.findDistrictStat(new DistrictKey(district.getCity(), district .getRegion(), district.getName())); DistrictStat districtStat = null; - if (StringUtils.contains(district.getEstateType2(), "别墅")) { + if (StringUtils.contains(district.getEstateType2(), "鍒")) { districtStat = districtStatBo.getVillaDistrictStat(); } else { districtStat = districtStatBo.getDistrictStat(); @@ -254,7 +254,7 @@ public class ReportViewController extends BaseController { return avgPrice; } - //获取报告编号 + //鑾峰彇鎶ュ憡缂栧彿 public String getNumber(){ String number = ""; while(StringUtil.isBlank(number)){ diff --git a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/SampleController.java b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/SampleController.java index f599399e3..60f3ae080 100644 --- a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/SampleController.java +++ b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/SampleController.java @@ -27,7 +27,7 @@ import com.fangjia.service.bo.DistrictStatBo; import com.fangjia.service.district.ShopStatService; /** - * 报告样例 + * 鎶ュ憡鏍蜂緥 * Created by wenyan on 2015/11/27. */ public class SampleController extends BaseController{ @@ -41,7 +41,7 @@ public class SampleController extends BaseController{ DistrictKey districtKey = new DistrictKey(model.getCityName(), model.getRegion(), model.getDistrictName()); District district = districtService.findDistrict(districtKey,"district"); model.setDistrict(district); - /* 获取下载份数,菜单控制by tom */ + /* 鑾峰彇涓嬭浇浠芥暟锛岃彍鍗曟帶鍒禸y tom */ String uid = cookieContext.getCookieValue(request, "fpk_uid"); if (StringUtils.isNotBlank(uid)) { FpkUsers fpkUser = fpkUsersService.findById(SecurityUtil @@ -61,7 +61,7 @@ public class SampleController extends BaseController{ DistrictKey districtKey = new DistrictKey(model.getCityName(), model.getRegion(), model.getDistrictName()); District district = districtService.findDistrict(districtKey,"shop"); model.setDistrict(district); - /* 获取下载份数,菜单控制by tom */ + /* 鑾峰彇涓嬭浇浠芥暟锛岃彍鍗曟帶鍒禸y tom */ String uid = cookieContext.getCookieValue(request, "fpk_uid"); if (StringUtils.isNotBlank(uid)) { FpkUsers fpkUser = fpkUsersService.findById(SecurityUtil diff --git a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/SearchController.java b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/SearchController.java index 3a132efe7..74de393a9 100644 --- a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/SearchController.java +++ b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/SearchController.java @@ -136,7 +136,7 @@ public class SearchController { //nameQuery.add(new TermQuery(new Term("address", keyword)), Occur.SHOULD); //nameQuery.add(new TermQuery(new Term("addr_alias_std", keyword)), Occur.SHOULD); nameQuery.add(new TermQuery(new Term("keyword", keyword)), Occur.SHOULD); - //nameQuery.add(new TermQuery(new Term("keyword_cjk", keyword)), Occur.SHOULD);//这个重要,因seaweed不支持模糊搜索,当输入"中远两"需用此进行搜索 + //nameQuery.add(new TermQuery(new Term("keyword_cjk", keyword)), Occur.SHOULD);//杩欎釜閲嶈锛屽洜seaweed涓嶆敮鎸佹ā绯婃悳绱紝褰撹緭鍏�"涓繙涓�"闇�鐢ㄦ杩涜鎼滅储 srQuery1.add(nameQuery, Occur.SHOULD); params.add(new QueryParam("$sr", new SrQuery(srQuery1))); List districts = districtService.findAllByParams(params, 0, limit, new String[] { "region", "name","address", "addrAlias" }); @@ -151,7 +151,7 @@ public class SearchController { bo.setRegion(district.getRegion()); ret.add(bo); } - //对自动完成出来的结果按长短排序 + //瀵硅嚜鍔ㄥ畬鎴愬嚭鏉ョ殑缁撴灉鎸夐暱鐭帓搴� if(ret.size() > 0){ Collections.sort(ret, new Comparator() { public int compare(AutoCompleteBo o1, AutoCompleteBo o2) { diff --git a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/ShapeController.java b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/ShapeController.java index dd249b7c9..74df5e9fd 100644 --- a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/ShapeController.java +++ b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/ShapeController.java @@ -35,11 +35,11 @@ public class ShapeController { g2d.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON); g2d.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_QUALITY); - g2d.setColor(new Color(178,178,178));//改变扇形颜色 + g2d.setColor(new Color(178,178,178));//鏀瑰彉鎵囧舰棰滆壊 g2d.fillArc(0,0,400,400,90,360); - g2d.setColor(new Color(0,115,230));//改变扇形颜色 + g2d.setColor(new Color(0,115,230));//鏀瑰彉鎵囧舰棰滆壊 g2d.fillArc(0,0,400,400,90,rim); - g2d.setColor(new Color(229,229,229));//改变扇形颜色 + g2d.setColor(new Color(229,229,229));//鏀瑰彉鎵囧舰棰滆壊 g2d.fillArc(50,50,300,300,90,360); g2d.setColor(new Color(0,115,230)); Map attributes = new HashMap(); @@ -61,7 +61,7 @@ public class ShapeController { unitStart = 200 + 25; }else if("0".equals(scoreStr)){ scoreStr ="-"; - g2d.setFont(new Font("微软雅黑", Font.BOLD, 12*a).deriveFont(attributes)); + g2d.setFont(new Font("寰蒋闆呴粦", Font.BOLD, 12*a).deriveFont(attributes)); g2d.drawString(scoreStr, 200 - w + 10, 230); unitStart = 175; }else{ @@ -70,11 +70,11 @@ public class ShapeController { } if("0".equals(scoreStr)){ - g2d.setFont(new Font("微软雅黑", Font.BOLD, 12*a).deriveFont(attributes)); - g2d.drawString("分", unitStart, 200); + g2d.setFont(new Font("寰蒋闆呴粦", Font.BOLD, 12*a).deriveFont(attributes)); + g2d.drawString("鍒�", unitStart, 200); }else{ - g2d.setFont(new Font("微软雅黑", Font.BOLD, 12*a).deriveFont(attributes)); - g2d.drawString("分", unitStart, 252); + g2d.setFont(new Font("寰蒋闆呴粦", Font.BOLD, 12*a).deriveFont(attributes)); + g2d.drawString("鍒�", unitStart, 252); } g2d.dispose(); cache.put(model.getScore(), image); diff --git a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/UserController.java b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/UserController.java index d6d1693d6..18aad7e99 100644 --- a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/UserController.java +++ b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/controllers/UserController.java @@ -33,33 +33,33 @@ public class UserController { mav.setModel(data); String password = model.getPassword(); if (StringUtils.isBlank(model.getUserName())) { - data.put("userNameMsg","用户名不能为空"); + data.put("userNameMsg","鐢ㄦ埛鍚嶄笉鑳戒负绌�"); return mav; } if (StringUtils.isBlank(model.getPassword())) { - data.put("passwordMsg","密码不能为空"); + data.put("passwordMsg","瀵嗙爜涓嶈兘涓虹┖"); return mav; } FpkUsers user = fpkUsersDao.findByName(model.getUserName()); if (null == user) { - data.put("userNameMsg","用户名不存在"); + data.put("userNameMsg","鐢ㄦ埛鍚嶄笉瀛樺湪"); return mav; } if (!user.getPassword().equals(DigestUtils.md5Hex(password))) { - data.put("passwordMsg","密码错误"); + data.put("passwordMsg","瀵嗙爜閿欒"); return mav; } if(!user.isEnabled()){ - data.put("userNameMsg","账户被禁用,请联系我们!"); + data.put("userNameMsg","璐︽埛琚鐢紝璇疯仈绯绘垜浠�!"); return mav; } if(user.getExpiryDate() != null && user.getExpiryDate().before(new Date())){ - data.put("userNameMsg","您的账户已过期!"); + data.put("userNameMsg","鎮ㄧ殑璐︽埛宸茶繃鏈�!"); return mav; } @@ -82,7 +82,7 @@ public class UserController { } } if(city == null || location == null){ - data.put("userNameMsg","权限不足!"); + data.put("userNameMsg","鏉冮檺涓嶈冻!"); }else{ if(StringUtils.isNotBlank(model.getForm())){ location = URLDecoder.decode(model.getForm(),"UTF-8"); @@ -118,7 +118,7 @@ public class UserController { mav.setModel(data); FpkUsers users = model.getUser(); if(!users.getPassword().equals(DigestUtils.md5Hex(model.getPasswordOld()))){ - data.put("passwordOldMsg","原密码错误"); + data.put("passwordOldMsg","鍘熷瘑鐮侀敊璇�"); return mav; } Map map = new HashMap(); diff --git a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/directive/JsonDirective.java b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/directive/JsonDirective.java index e7a429cd5..61603becc 100644 --- a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/directive/JsonDirective.java +++ b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/directive/JsonDirective.java @@ -12,7 +12,7 @@ import java.io.IOException; import java.util.Map; /** - * 该标签主要用于把Java对象转成JavaScript对象输出 + * 璇ユ爣绛句富瑕佺敤浜庢妸Java瀵硅薄杞垚JavaScript瀵硅薄杈撳嚭 */ public class JsonDirective implements TemplateDirectiveModel { diff --git a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/filters/AccessLogFilter.java b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/filters/AccessLogFilter.java index d4c29449d..ac28849da 100644 --- a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/filters/AccessLogFilter.java +++ b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/filters/AccessLogFilter.java @@ -73,7 +73,7 @@ public class AccessLogFilter implements Filter { LOGGER.error("error process request: request_url=" + analyticsBean.requestUrl + ", referer=" + analyticsBean.refererUrl, rootCause); } - // 记录运行超过1秒的请求到日志中 + // 璁板綍杩愯瓒呰繃1绉掔殑璇锋眰鍒版棩蹇椾腑 final long time = System.currentTimeMillis() - start; final String actionUri = (String) request.getAttribute(ActionContext.ACTION_URI); if (time > 1000 || (!ChafangtongConfig.getConfig().isProductionEnvironment() && executeCounter.getTotalCount() > 0)) { @@ -94,7 +94,7 @@ public class AccessLogFilter implements Filter { private void writeAccessLog(AnalyticsBean analyticsBean, long duration, String actionUri, int statusCode, String method) { StringBuilder logStr = new StringBuilder(); - // 不要改变顺序 + // 涓嶈鏀瑰彉椤哄簭 logStr.append(DATE_FORMAT.format(analyticsBean.startTime));// 1 logStr.append(SPLIT).append(StringUtils.defaultString(analyticsBean.connectionIp));// 2 logStr.append(SPLIT).append(StringUtils.defaultString(analyticsBean.ip));// 3 diff --git a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/filters/AnalyticsBean.java b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/filters/AnalyticsBean.java index 569c14d66..ef5cb7814 100644 --- a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/filters/AnalyticsBean.java +++ b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/filters/AnalyticsBean.java @@ -105,7 +105,7 @@ public class AnalyticsBean { } /** - * 获得连接客户端的IP(部署环境下一般都设有nginx等http服务器) + * 鑾峰緱杩炴帴瀹㈡埛绔殑IP锛堥儴缃茬幆澧冧笅涓�鑸兘璁炬湁nginx绛塰ttp鏈嶅姟鍣級 * * @param request * @return @@ -123,7 +123,7 @@ public class AnalyticsBean { String citySpell = getCitySpell(request.getRequestURL().toString()); ServerArea city = ServerAreaData.getServerAreaByNameOrSpellDefaultNull(citySpell); if (null != city) { - // 保存至cookie + // 淇濆瓨鑷砪ookie Cookie cityCookie = cookieContext.createCookie(CookieName.COOKIE_CITY, citySpell); cityCookie.setMaxAge(Integer.MAX_VALUE); response.addCookie(cityCookie); @@ -137,7 +137,7 @@ public class AnalyticsBean { } private String createUID(HttpServletRequest request, HttpServletResponse response) { - // 设置UUID + // 璁剧疆UUID String uuid = new ObjectId().toString(); Cookie uuidCookie = cookieContext.createCookie(CookieName.UID, uuid); uuidCookie.setMaxAge(Integer.MAX_VALUE); @@ -152,7 +152,7 @@ public class AnalyticsBean { } private String createSID(HttpServletRequest request, HttpServletResponse response) { - // 设置session id + // 璁剧疆session id String sid = new ObjectId().toString(); Cookie uuidCookie = cookieContext.createCookie(CookieName.SID, sid); uuidCookie.setMaxAge(-1); @@ -165,7 +165,7 @@ public class AnalyticsBean { } /** - * 请求url,不包括query string + * 璇锋眰url锛屼笉鍖呮嫭query string * * @return */ @@ -174,7 +174,7 @@ public class AnalyticsBean { } /** - * 请求url后的请求参数,如果参数不为空则包括问号在内 + * 璇锋眰url鍚庣殑璇锋眰鍙傛暟锛屽鏋滃弬鏁颁笉涓虹┖鍒欏寘鎷棶鍙峰湪鍐� * * @return */ @@ -183,7 +183,7 @@ public class AnalyticsBean { } /** - * 请求uri + * 璇锋眰uri * * @return */ @@ -192,7 +192,7 @@ public class AnalyticsBean { } /** - * 来源url + * 鏉ユ簮url * * @return */ @@ -201,7 +201,7 @@ public class AnalyticsBean { } /** - * 完整的请求url,包括query string + * 瀹屾暣鐨勮姹倁rl锛屽寘鎷琿uery string * * @return */ @@ -210,7 +210,7 @@ public class AnalyticsBean { } /** - * 是否刷新缓存 + * 鏄惁鍒锋柊缂撳瓨 * * @return */ @@ -219,7 +219,7 @@ public class AnalyticsBean { } /** - * 当前城市,可能为null + * 褰撳墠鍩庡競锛屽彲鑳戒负null * * @return */ @@ -228,7 +228,7 @@ public class AnalyticsBean { } /** - * 当前城市,不会为null + * 褰撳墠鍩庡競锛屼笉浼氫负null * * @return */ @@ -237,7 +237,7 @@ public class AnalyticsBean { } /** - * cookie中的uid,如果没有则生成新的uid + * cookie涓殑uid锛屽鏋滄病鏈夊垯鐢熸垚鏂扮殑uid * * @return */ @@ -246,7 +246,7 @@ public class AnalyticsBean { } /** - * 全局的请求id + * 鍏ㄥ眬鐨勮姹俰d * * @return */ @@ -255,7 +255,7 @@ public class AnalyticsBean { } /** - * cookie中的会话id,如果没有则生成新的sid + * cookie涓殑浼氳瘽id锛屽鏋滄病鏈夊垯鐢熸垚鏂扮殑sid * * @return */ @@ -264,7 +264,7 @@ public class AnalyticsBean { } /** - * 是否为ajax请求 + * 鏄惁涓篴jax璇锋眰 * * @return */ @@ -273,7 +273,7 @@ public class AnalyticsBean { } /** - * 访问者的真实ip + * 璁块棶鑰呯殑鐪熷疄ip * * @return */ @@ -282,7 +282,7 @@ public class AnalyticsBean { } /** - * 访问者标识,可能为null + * 璁块棶鑰呮爣璇嗭紝鍙兘涓簄ull * * @return */ @@ -291,7 +291,7 @@ public class AnalyticsBean { } /** - * 连接ip + * 杩炴帴ip * * @return */ @@ -300,7 +300,7 @@ public class AnalyticsBean { } /** - * cookie中的uid,如果没有则为空字符串 + * cookie涓殑uid锛屽鏋滄病鏈夊垯涓虹┖瀛楃涓� * * @return */ @@ -309,7 +309,7 @@ public class AnalyticsBean { } /** - * cookie中的会话id,如果没有则为空字符串 + * cookie涓殑浼氳瘽id锛屽鏋滄病鏈夊垯涓虹┖瀛楃涓� * * @return */ @@ -318,7 +318,7 @@ public class AnalyticsBean { } /** - * 请求开始时间 + * 璇锋眰寮�濮嬫椂闂� * * @return */ diff --git a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/filters/AnalyticsFilter.java b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/filters/AnalyticsFilter.java index 3868affe9..856141239 100644 --- a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/filters/AnalyticsFilter.java +++ b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/filters/AnalyticsFilter.java @@ -59,12 +59,12 @@ public class AnalyticsFilter implements Filter { ServletException { final AnalyticsBean analyticsBean = AnalyticsBean.get(request, response); - // 点击日志 + // 鐐瑰嚮鏃ュ織 if (analyticsBean.requestUrl.indexOf("/__utm.gif") > -1) { processUtmGifLog(request, response, analyticsBean); return; } -// // 判断URL是否合法,不合法则重定向 +// // 鍒ゆ柇URL鏄惁鍚堟硶锛屼笉鍚堟硶鍒欓噸瀹氬悜 // String redirectUrl = checkUrlFormat(analyticsBean); // if (null != redirectUrl) { // if (analyticsBean.isSpider()) { @@ -84,7 +84,7 @@ public class AnalyticsFilter implements Filter { threadLocalData.put(ThreadLocalKey.DisableCache, "1"); } // -// // 切换城市 +// // 鍒囨崲鍩庡競 // FangjiaServerAreaContextHolder.setServerArea(analyticsBean.city); // threadLocalData.put(ThreadLocalKey.FromSpider, analyticsBean.isSpider()); chain.doFilter(request, response); @@ -105,7 +105,7 @@ public class AnalyticsFilter implements Filter { responseOutputStream.close(); String userAgent = analyticsBean.userAgent; if (userAgent != null && (userAgent.indexOf("Googlebot-Image") >= 0 || userAgent.indexOf("Baidu") >= 0)) { - // 过滤爬虫的访问 + // 杩囨护鐖櫕鐨勮闂� return; } jmsTemplate.send(utmgifDestination, new MessageCreator() { @@ -138,7 +138,7 @@ public class AnalyticsFilter implements Filter { } /** - * 判断URL是否合法,合法则返回null,否则返回重定向URL + * 鍒ゆ柇URL鏄惁鍚堟硶锛屽悎娉曞垯杩斿洖null锛屽惁鍒欒繑鍥為噸瀹氬悜URL * * @param requestUrl * @param requestUri @@ -148,7 +148,7 @@ public class AnalyticsFilter implements Filter { private String checkUrlFormat(AnalyticsBean analyticsBean) { ChafangtongConfig fangjiaConfig = ChafangtongConfig.getConfig(); String hostName = StringUtils.substringBetween(analyticsBean.requestUrl, "http://", "/"); - // 如果hostName中有端口号,则把端口号去掉 + // 濡傛灉hostName涓湁绔彛鍙凤紝鍒欐妸绔彛鍙峰幓鎺� int index = hostName.indexOf(":"); if (index > 0) { hostName = hostName.substring(0, index); @@ -168,7 +168,7 @@ public class AnalyticsFilter implements Filter { return fangjiaConfig.getCityDomainName(city) + analyticsBean.requestUri + analyticsBean.queryString; } if (city != null) { - // 找到对应的城市,或者是一个有效的二级域名 + // 鎵惧埌瀵瑰簲鐨勫煄甯傦紝鎴栬�呮槸涓�涓湁鏁堢殑浜岀骇鍩熷悕 return null; } if (prefixSplit[0].equalsIgnoreCase("www")) { diff --git a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/filters/SpiderValidateFilter.java b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/filters/SpiderValidateFilter.java index 43f4c109e..b04138ddb 100644 --- a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/filters/SpiderValidateFilter.java +++ b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/filters/SpiderValidateFilter.java @@ -53,7 +53,7 @@ public class SpiderValidateFilter implements Filter { private void checkReload() { if (this.reloading.compareAndSet(false, true)) { try { - // 5分钟reload一次 + // 5鍒嗛挓reload涓�娆� if (System.currentTimeMillis() - lastReloadTimestamp < 300000) { return; } @@ -87,13 +87,13 @@ public class SpiderValidateFilter implements Filter { if (isValidUserAgent(ua)) { for (String spiderName : spiderDomains.keySet()) { if (!ua.contains(spiderName)) { - // 未声明自己为spider则跳过 + // 鏈0鏄庤嚜宸变负spider鍒欒烦杩� continue; } if (null == ip) { spider = new Spider(spiderName, ip, ua); spider.setFake(true); - // 对ip为null的蜘蛛暂时不入数据库 + // 瀵筰p涓簄ull鐨勮湗铔涙殏鏃朵笉鍏ユ暟鎹簱 } else { spider = spiders.get(ip); if (null == spider) { @@ -106,7 +106,7 @@ public class SpiderValidateFilter implements Filter { } else { spider = new Spider("unkown", ip, ua); spider.setFake(true); - // 对userAgent为null的蜘蛛暂时不入数据库 + // 瀵箄serAgent涓簄ull鐨勮湗铔涙殏鏃朵笉鍏ユ暟鎹簱 } } if (spider != null && spider.isFake()) { @@ -145,7 +145,7 @@ public class SpiderValidateFilter implements Filter { private void validateSpider(Spider spider) { if (null == spider.getId()) { - // 新发现的蜘蛛 + // 鏂板彂鐜扮殑铚樿洓 checkSpider(spider); spiderService.upsertByIp(spider); spiders.put(spider.getIp(), spider); @@ -153,23 +153,23 @@ public class SpiderValidateFilter implements Filter { LOGGER.info("find new spider: " + spider); } } else if (spider.isVerified()) { - // 已人工验证的蜘蛛 + // 宸蹭汉宸ラ獙璇佺殑铚樿洓 spiders.put(spider.getIp(), spider); } else if (spider.isFake()) { - // 已发现的假蜘蛛 + // 宸插彂鐜扮殑鍋囪湗铔� Date yestoday = DateUtils.addDays(new Date(), -1); if (spider.getModificationDate().before(yestoday)) { - // 删除超过1天的假蜘蛛信息 + // 鍒犻櫎瓒呰繃1澶╃殑鍋囪湗铔涗俊鎭� spiderService.deleteByIp(spider.getIp()); spiders.remove(spider.getIp()); } else { spiders.put(spider.getIp(), spider); } } else { - // 已发现的真蜘蛛 + // 宸插彂鐜扮殑鐪熻湗铔� Date lastWeek = DateUtils.addDays(new Date(), -7); if (spider.getModificationDate().before(lastWeek)) { - // 重新验证超过7天的真蜘蛛 + // 閲嶆柊楠岃瘉瓒呰繃7澶╃殑鐪熻湗铔� checkSpider(spider); if (spider.isFake()) { spiderService.deleteByIp(spider.getIp()); @@ -191,10 +191,10 @@ public class SpiderValidateFilter implements Filter { String host = nslookup(spider.getIp()); if (null != host) { spider.setHost(host); - // 不是相同域的为假蜘蛛 + // 涓嶆槸鐩稿悓鍩熺殑涓哄亣铚樿洓 spider.setFake(!isSameDomain(host, spiderDomains.get(spider.getName()))); } else { - // 反向解析失败,则默认为真蜘蛛 + // 鍙嶅悜瑙f瀽澶辫触锛屽垯榛樿涓虹湡铚樿洓 spider.setHost(spider.getIp()); spider.setFake(false); } diff --git a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/interceptors/AuthenticationInterceptor.java b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/interceptors/AuthenticationInterceptor.java index c2017508a..e0032bd24 100644 --- a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/interceptors/AuthenticationInterceptor.java +++ b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/interceptors/AuthenticationInterceptor.java @@ -31,7 +31,7 @@ import java.net.URLEncoder; import java.util.*; /** - * 查房通权限拦截器 + * 鏌ユ埧閫氭潈闄愭嫤鎴櫒 * Created by wenyan on 2015/11/12. */ public class AuthenticationInterceptor implements Interceptor { @@ -75,11 +75,11 @@ public class AuthenticationInterceptor implements Interceptor { isPassed = false; } if(isPassed && city == null){ - LOGGER.info("无法访问" + request.getRequestURI() + "请用cityName 指定访问资源所在的城市"); + LOGGER.info("鏃犳硶璁块棶" + request.getRequestURI() + "璇风敤cityName 鎸囧畾璁块棶璧勬簮鎵�鍦ㄧ殑鍩庡競"); error = "noAuth"; } if(isPassed && !isAccessible(user, city, request)){ - LOGGER.info("无法访问" + request.getRequestURI() + "!!!请到菜单管理添加菜单"); + LOGGER.info("鏃犳硶璁块棶" + request.getRequestURI() + "!!!璇峰埌鑿滃崟绠$悊娣诲姞鑿滃崟"); isPassed = false; error = "noAuth"; } diff --git a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/model/BaseModel.java b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/model/BaseModel.java index e721510da..ab26947de 100644 --- a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/model/BaseModel.java +++ b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/model/BaseModel.java @@ -235,7 +235,7 @@ public class BaseModel extends ModelAndViewSupport { } /** - * 如果queryString不为空则在前面加上问号"?",否则不加 + * 濡傛灉queryString涓嶄负绌哄垯鍦ㄥ墠闈㈠姞涓婇棶鍙�"?"锛屽惁鍒欎笉鍔� * * @return */ diff --git a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/model/ConsumModel.java b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/model/ConsumModel.java index d8c342e86..768353d38 100644 --- a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/model/ConsumModel.java +++ b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/model/ConsumModel.java @@ -5,7 +5,7 @@ import com.fangjia.service.bo.DistrictStatBo; public class ConsumModel extends ChafangtongModel { private static final long serialVersionUID = 6142958920656840695L; - private Double avgConsumption; // 周边餐饮人均消费 + private Double avgConsumption; // 鍛ㄨ竟椁愰ギ浜哄潎娑堣垂 private DistrictStatBo statBo; private Double higher; diff --git a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/model/Models.java b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/model/Models.java index 8fdb2ea0d..d9a93608b 100644 --- a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/model/Models.java +++ b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/model/Models.java @@ -3,17 +3,17 @@ package com.fangjia.chafangtong.model; public final class Models { /** - * 404错误面页的model + * 404閿欒闈㈤〉鐨刴odel */ public static final BaseModel NOT_FOUNT = createModel(404, "/error"); /** - * 一般错误面页的model + * 涓�鑸敊璇潰椤电殑model */ public static final BaseModel ERROR = createModel(500, "/error"); /** - * 500错误面页的model + * 500閿欒闈㈤〉鐨刴odel */ public static final BaseModel FORBIDDEN = createModel(400, "/forbidden"); diff --git a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/model/NoResultModel.java b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/model/NoResultModel.java index 3e6062be4..ea6ca730a 100644 --- a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/model/NoResultModel.java +++ b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/model/NoResultModel.java @@ -13,7 +13,7 @@ public class NoResultModel extends ChafangtongModel { private double maxLng; double centerLat; double centerLng; - String type; // r: 矩形搜索(最大最小经纬度),c:圆形搜索(中心点、半径) + String type; // r: 鐭╁舰鎼滅储锛堟渶澶ф渶灏忕粡绾害锛夛紝c锛氬渾褰㈡悳绱紙涓績鐐广�佸崐寰勶級 List> result; public List getInsideShops() { diff --git a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/model/NodistrictModel.java b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/model/NodistrictModel.java index a75893b01..c59925a2c 100644 --- a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/model/NodistrictModel.java +++ b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/model/NodistrictModel.java @@ -11,15 +11,15 @@ import com.fangjia.service.bo.DistrictStatRentBo; public class NodistrictModel extends ChafangtongModel { private static final long serialVersionUID = -2866501361955105846L; - // 房价 + // 鎴夸环 Integer areaPrice; Integer cityPrice; Double priceLeft; - List priceNearest; // 最近的3个商铺价格 - List priceTop5; // 最高的5个 - List priceBtm5; // 最低的5个 + List priceNearest; // 鏈�杩戠殑3涓晢閾轰环鏍� + List priceTop5; // 鏈�楂樼殑5涓� + List priceBtm5; // 鏈�浣庣殑5涓� - // 租金 + // 绉熼噾 Integer areaRent1; Integer areaRent2; Integer areaRent3; @@ -30,7 +30,7 @@ public class NodistrictModel extends ChafangtongModel { DistrictStatRent[] rentRank3; DistrictStatRent[] rentRank4; - Double avgConsumption; // 周边餐饮人均消费 + Double avgConsumption; // 鍛ㄨ竟椁愰ギ浜哄潎娑堣垂 Double higher; List metroStations; diff --git a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/model/NoshopModel.java b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/model/NoshopModel.java index 9be73970b..f17a10f07 100644 --- a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/model/NoshopModel.java +++ b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/model/NoshopModel.java @@ -11,30 +11,30 @@ import com.fangjia.service.bo.DistrictStatBo; public class NoshopModel extends ChafangtongModel { private static final long serialVersionUID = -170439161907268598L; - // 房价 + // 鎴夸环 Integer areaPrice; Integer cityPrice; Double priceLeft; - List priceNearest; // 最近的3个商铺价格 - List priceTop5; // 最高的5个 - List priceBtm5; // 最低的5个 + List priceNearest; // 鏈�杩戠殑3涓晢閾轰环鏍� + List priceTop5; // 鏈�楂樼殑5涓� + List priceBtm5; // 鏈�浣庣殑5涓� - // 租金 + // 绉熼噾 Integer areaRentPrice; Integer cityRentPrice; Double rentLeft; - List rentNearest; // 最近的3个商铺价格 - List rentTop5; // 最高的5个 - List rentBtm5; // 最低的5个 + List rentNearest; // 鏈�杩戠殑3涓晢閾轰环鏍� + List rentTop5; // 鏈�楂樼殑5涓� + List rentBtm5; // 鏈�浣庣殑5涓� - // 地段 + // 鍦版 List metroStations; List busStations; double disHongqiaoAirport; double disHongqiaoStation; Map typePercentMap; - // 人口 + // 浜哄彛 int cityAvgPrice; String districts; String offices; @@ -55,8 +55,8 @@ public class NoshopModel extends ChafangtongModel { Double left1; Double left2; - // 消费 - Double avgConsumption; // 周边餐饮人均消费 + // 娑堣垂 + Double avgConsumption; // 鍛ㄨ竟椁愰ギ浜哄潎娑堣垂 Double higher; private final String[] PIE_COLOR_RGBS = new String[] { "#C6DBF7", "#F5EEBD", "#DEE7C6", "#FFD7BD", "#D6C3E7", "#C3E1E7", diff --git a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/model/ReportModel.java b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/model/ReportModel.java index b8a479d16..299cff0b2 100644 --- a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/model/ReportModel.java +++ b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/model/ReportModel.java @@ -29,7 +29,7 @@ public class ReportModel extends ChafangtongModel { List pieColors; List pieMarkers; - // 综合指数 + // 缁煎悎鎸囨暟 double detailScore; double detailScore1; double detailScore2; @@ -39,7 +39,7 @@ public class ReportModel extends ChafangtongModel { double shopArea; List aroundTypes; - // 房价指数 + // 鎴夸环鎸囨暟 double priceScore; Integer cityPrice; DistrictStatBo statBo; @@ -48,21 +48,21 @@ public class ReportModel extends ChafangtongModel { List regionStatRents; List rentStatBos; - // 租金指数 + // 绉熼噾鎸囨暟 double rentScore; DistrictBusinessStatRentBo rentStatBo; String regionPayment; Double rentLeft; String rentTradeUrl; - // 地段指数 + // 鍦版鎸囨暟 double localScore; double localScore1; double localScore2; Integer regionPrice; String aroundPieUrl; - // 人口指数 + // 浜哄彛鎸囨暟 double peopleScore; double peopleScore1; double peopleScore2; @@ -79,26 +79,26 @@ public class ReportModel extends ChafangtongModel { Double left1; Double left2; - // 消费指数 + // 娑堣垂鎸囨暟 double consumScore; - Double avgConsumption; // 周边餐饮人均消费 + Double avgConsumption; // 鍛ㄨ竟椁愰ギ浜哄潎娑堣垂 Double higher; Map consumCountMap; - // 环境指数 + // 鐜鎸囨暟 double aroundScore; double aroundScore1; double aroundScore2; Map aroundCountMap; - // 潜力指数 + // 娼滃姏鎸囨暟 double predictScore; Integer predictPrice; Double predictMarkup; Integer districtMinPrice; Integer districtMaxPrice; - // 稀缺指数 + // 绋�缂烘寚鏁� double rankScore; DistrictHot districtHot; DistrictAttentionRank districtAttention; @@ -113,7 +113,7 @@ public class ReportModel extends ChafangtongModel { double totalScore; private FpkDownload fpkDownload; - //报告编号 + //鎶ュ憡缂栧彿 private String serialNum; private Integer totalPrice; diff --git a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/model/RestfulModelAndView.java b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/model/RestfulModelAndView.java index 82fc23d44..4df1852dc 100644 --- a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/model/RestfulModelAndView.java +++ b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/model/RestfulModelAndView.java @@ -3,7 +3,7 @@ package com.fangjia.chafangtong.model; import org.sothis.web.mvc.ModelAndViewSupport; /** - * 用于restAPI的ModelAndView + * 鐢ㄤ簬restAPI鐨凪odelAndView * * @author velna * diff --git a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/servlet/ChartImgServlet.java b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/servlet/ChartImgServlet.java index 85f4f8a68..678ffc864 100644 --- a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/servlet/ChartImgServlet.java +++ b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/servlet/ChartImgServlet.java @@ -49,7 +49,7 @@ public class ChartImgServlet extends HttpServlet { @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - request.setCharacterEncoding("UTF-8");// 注意编码 + request.setCharacterEncoding("UTF-8");// 娉ㄦ剰缂栫爜 String reqUrl = request.getRequestURI(); String i = reqUrl.substring(reqUrl.indexOf("/cImg/") + 6, reqUrl.length()); @@ -107,7 +107,7 @@ public class ChartImgServlet extends HttpServlet { } /** - * 处理均价类走势图 + * 澶勭悊鍧囦环绫昏蛋鍔垮浘 * * @throws IOException */ @@ -170,7 +170,7 @@ public class ChartImgServlet extends HttpServlet { } /** - * 处理租金类走势图 + * 澶勭悊绉熼噾绫昏蛋鍔垮浘 * * @throws IOException */ @@ -233,7 +233,7 @@ public class ChartImgServlet extends HttpServlet { } /** - * 周边行业饼图 + * 鍛ㄨ竟琛屼笟楗煎浘 * * @throws IOException */ @@ -305,7 +305,7 @@ public class ChartImgServlet extends HttpServlet { } /** - * 卖家关注度排行柱状图 + * 鍗栧鍏虫敞搴︽帓琛屾煴鐘跺浘 * * @throws IOException */ diff --git a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/servlet/ReportServlet.java b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/servlet/ReportServlet.java index ce10e91ba..c3d1b2cc8 100644 --- a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/servlet/ReportServlet.java +++ b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/servlet/ReportServlet.java @@ -56,7 +56,7 @@ public class ReportServlet extends HttpServlet { System.setProperty("javax.xml.transform.TransformerFactory", "com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl"); - // 字体文件 + // 瀛椾綋鏂囦欢 ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); FONT_PATHS.add(classLoader.getResource("districtreport/SIMSUN.TTC").toString()); FONT_PATHS.add(classLoader.getResource("districtreport/SIMHEI.TTF").toString()); @@ -106,11 +106,11 @@ public class ReportServlet extends HttpServlet { PdfCopy copy = new PdfCopy(document, resp.getOutputStream()); document.open(); document.newPage(); -// // 封面 +// // 灏侀潰 // PdfReader reader = new PdfReader(FRONTCOVER_DATA); // PdfImportedPage coverPage = copy.getImportedPage(reader, 1); // copy.addPage(coverPage); -// // 目录 +// // 鐩綍 // reader = new PdfReader(DIRECTORY_DATA); // PdfImportedPage directoryPage = copy.getImportedPage(reader, 1); // copy.addPage(directoryPage); @@ -129,7 +129,7 @@ public class ReportServlet extends HttpServlet { } /** - * 根据页面URL获取内容 + * 鏍规嵁椤甸潰URL鑾峰彇鍐呭 */ private byte[] getPageData(String pagePath,HttpServletRequest request) { long start = System.currentTimeMillis(); @@ -151,7 +151,7 @@ public class ReportServlet extends HttpServlet { html = html.replaceAll(" ", " "); renderer.setDocumentFromString(html); - // 解决中文支持问题 + // 瑙e喅涓枃鏀寔闂 ITextFontResolver fontResolver = renderer.getFontResolver(); for (String path : FONT_PATHS) { fontResolver.addFont(path, BaseFont.IDENTITY_H, BaseFont.NOT_EMBEDDED); diff --git a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/util/DistrictScoreUtil.java b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/util/DistrictScoreUtil.java index 3194159f3..5c8efd060 100644 --- a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/util/DistrictScoreUtil.java +++ b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/util/DistrictScoreUtil.java @@ -14,68 +14,68 @@ import com.fangjia.service.bo.DistrictStatRentBo; public class DistrictScoreUtil { /** - * 城市平均租金(确认) + * 鍩庡競骞冲潎绉熼噾(纭) */ private final static int CITY_AVG_RENT_PRICE = 5847; /** - * 市均餐饮人均消费(确认) + * 甯傚潎椁愰ギ浜哄潎娑堣垂(纭) */ private final static int CITY_AVG_CONSUMPTION = 50; /** - * 上月房源平均发布量(确认) + * 涓婃湀鎴挎簮骞冲潎鍙戝竷閲�(纭) * modify by shibb 2015-6-18 */ // private final static int LAST_MONTH_HOUSES_AVG = 200; private final static int LAST_MONTH_HOUSES_AVG = 65; /** - * 半年房源平均发布量(确认) + * 鍗婂勾鎴挎簮骞冲潎鍙戝竷閲�(纭) */ private final static int HALF_YEAR_HOUSES_AVG = 1000; /** - * 市均容积率(确认) + * 甯傚潎瀹圭Н鐜�(纭) */ private final static double CITY_AVG_CUBAGE_PERCENT = 2.0; /** - * 市均绿化率(确认) + * 甯傚潎缁垮寲鐜�(纭) */ private final static double CITY_AVG_VIRESCENCE_PERCENT = 40; /** - * 城市户均占地面积(确认) + * 鍩庡競鎴峰潎鍗犲湴闈㈢Н(纭) */ private final static double CITY_AVG_HOUSEHOLD_ALLAREA = 50; /** - * 城市户均建筑面积(确认) + * 鍩庡競鎴峰潎寤虹瓚闈㈢Н(纭) */ private final static double CITY_AVG_HOUSEHOLD_BUILDAREA = 100; /** - * 市均停车位(确认) + * 甯傚潎鍋滆溅浣�(纭) */ private final static double CITY_AVG_CAR_SITE = 300; /** - * 市均物业费(确认) + * 甯傚潎鐗╀笟璐�(纭) */ private final static double CITY_AVG_ESTATE_CHARGE = 1.59; /** - * 稀缺度指数中关注度所占比重 + * 绋�缂哄害鎸囨暟涓叧娉ㄥ害鎵�鍗犳瘮閲� */ private final static int ATTENTION_RATIO = 7; /** - * 稀缺度指数中挂牌量所占比重 + * 绋�缂哄害鎸囨暟涓寕鐗岄噺鎵�鍗犳瘮閲� */ private final static int HOT_RATIO = 3; /** - * 房价指数 + * 鎴夸环鎸囨暟 * modify by shibb 2015-6-19 */ public static double priceScore(Integer districtPrice, Integer cityPrice, Integer leave, List rentBos) { @@ -184,11 +184,11 @@ public class DistrictScoreUtil { } /** - * 新的计算房价指数的方法 + * 鏂扮殑璁$畻鎴夸环鎸囨暟鐨勬柟娉� * - * @param districtAvgPrice 小区均价 + * @param districtAvgPrice 灏忓尯鍧囦环 * @param cityAvgPrice - * @param mPrice 方差 + * @param mPrice 鏂瑰樊 * @param rentBos * @return */ @@ -254,32 +254,32 @@ public class DistrictScoreUtil { int s = (int) score; switch (s) { case 1: - return "属于城市中房价较低的住宅"; + return "灞炰簬鍩庡競涓埧浠疯緝浣庣殑浣忓畢"; case 2: - return "属于城市中房价较低的住宅"; + return "灞炰簬鍩庡競涓埧浠疯緝浣庣殑浣忓畢"; case 3: - return "属于城市中房价较低的住宅"; + return "灞炰簬鍩庡競涓埧浠疯緝浣庣殑浣忓畢"; case 4: - return "属于接近城市均价的住宅"; + return "灞炰簬鎺ヨ繎鍩庡競鍧囦环鐨勪綇瀹�"; case 5: - return "属于接近城市均价的住宅"; + return "灞炰簬鎺ヨ繎鍩庡競鍧囦环鐨勪綇瀹�"; case 6: - return "属于略高于城市均价的住宅"; + return "灞炰簬鐣ラ珮浜庡煄甯傚潎浠风殑浣忓畢"; case 7: - return "属于城市中房价较高的住宅"; + return "灞炰簬鍩庡競涓埧浠疯緝楂樼殑浣忓畢"; case 8: - return "属于城市中房价较高的住宅"; + return "灞炰簬鍩庡競涓埧浠疯緝楂樼殑浣忓畢"; case 9: - return "属于城市中房价非常高的住宅"; + return "灞炰簬鍩庡競涓埧浠烽潪甯搁珮鐨勪綇瀹�"; case 10: - return "属于城市中房价非常高的住宅"; + return "灞炰簬鍩庡競涓埧浠烽潪甯搁珮鐨勪綇瀹�"; default: return ""; } } /** - * 消费指数 + * 娑堣垂鎸囨暟 * modify by shibb 2015-6-18 */ public static double consumScore(Double avgConsumption, Map countMap) { @@ -317,12 +317,12 @@ public class DistrictScoreUtil { } } - if (null != countMap.get("商场")) { + if (null != countMap.get("鍟嗗満")) { ret += 0.2; -// if (countMap.get("商场") >= 5) { +// if (countMap.get("鍟嗗満") >= 5) { // ret += 0.3; // } - if (countMap.get("商场") >= 8) { + if (countMap.get("鍟嗗満") >= 8) { ret += 0.3; } } @@ -335,48 +335,48 @@ public class DistrictScoreUtil { ret += 0.1; } } - if (null != countMap.get("电影院")) { + if (null != countMap.get("鐢靛奖闄�")) { ret += 0.1; } - if (null != countMap.get("健身中心")) { + if (null != countMap.get("鍋ヨ韩涓績")) { ret += 0.2; } - if (null != countMap.get("美容院")) { + if (null != countMap.get("缇庡闄�")) { ret += 0.1; -// if (countMap.get("美容院") >= 5) { +// if (countMap.get("缇庡闄�") >= 5) { // ret += 0.2; // } - if (countMap.get("美容院") >= 20) { + if (countMap.get("缇庡闄�") >= 20) { ret += 0.1; } } - if (null != countMap.get("大型超市")) { + if (null != countMap.get("澶у瀷瓒呭競")) { ret += 0.2; } - if (null != countMap.get("高尔夫球场")) { + if (null != countMap.get("楂樺皵澶悆鍦�")) { ret += 0.5; } - if (null != countMap.get("私立学校")) { + if (null != countMap.get("绉佺珛瀛︽牎")) { ret += 0.2; - if (countMap.get("私立学校") >= 5) { + if (countMap.get("绉佺珛瀛︽牎") >= 5) { ret += 0.3; } } - if (null != countMap.get("整形")) { + if (null != countMap.get("鏁村舰")) { ret += 0.2; - if (countMap.get("整形") >= 3) { + if (countMap.get("鏁村舰") >= 3) { ret += 0.3; } } - if (null != countMap.get("洗浴")) { + if (null != countMap.get("娲楁荡")) { ret += 0.1; } - if (null != countMap.get("私立医院")) { + if (null != countMap.get("绉佺珛鍖婚櫌")) { ret += 0.2; } - if (null != countMap.get("星级酒店")) { + if (null != countMap.get("鏄熺骇閰掑簵")) { ret += 0.2; -// if (countMap.get("星级酒店") >= 5) { +// if (countMap.get("鏄熺骇閰掑簵") >= 5) { // ret += 0.2; // } } @@ -388,44 +388,44 @@ public class DistrictScoreUtil { int s = (int) score; switch (s) { case 1: - return "周边消费水平非常低,生活成
本低廉"; + return "鍛ㄨ竟娑堣垂姘村钩闈炲父浣庯紝鐢熸椿鎴�
鏈綆寤�"; case 2: - return "周边消费水平非常低,生活成
本低廉"; + return "鍛ㄨ竟娑堣垂姘村钩闈炲父浣庯紝鐢熸椿鎴�
鏈綆寤�"; case 3: - return "周边消费水平较低,生活成
本较低"; + return "鍛ㄨ竟娑堣垂姘村钩杈冧綆锛岀敓娲绘垚
鏈緝浣�"; case 4: - return "周边消费水平较低,生活成
本较低"; + return "鍛ㄨ竟娑堣垂姘村钩杈冧綆锛岀敓娲绘垚
鏈緝浣�"; case 5: - return "周边消费水平一般"; + return "鍛ㄨ竟娑堣垂姘村钩涓�鑸�"; case 6: - return "周边消费水平一般"; + return "鍛ㄨ竟娑堣垂姘村钩涓�鑸�"; case 7: - return "周边消费水平较高,生活成
本较高"; + return "鍛ㄨ竟娑堣垂姘村钩杈冮珮锛岀敓娲绘垚
鏈緝楂�"; case 8: - return "周边消费水平较高,生活成
本较高"; + return "鍛ㄨ竟娑堣垂姘村钩杈冮珮锛岀敓娲绘垚
鏈緝楂�"; case 9: - return "周边消费水平非常高,生活成
本昂贵"; + return "鍛ㄨ竟娑堣垂姘村钩闈炲父楂橈紝鐢熸椿鎴�
鏈槀璐�"; case 10: - return "周边消费水平非常高,生活成
本昂贵"; + return "鍛ㄨ竟娑堣垂姘村钩闈炲父楂橈紝鐢熸椿鎴�
鏈槀璐�"; default: return ""; } } /** - * 环境指数计算 + * 鐜鎸囨暟璁$畻 * modify by shibb 2015-6-18 */ public static double aroundScore(Map countMap) { double ret = 0d; - int schoolCount = null == countMap.get("学校") ? 0 : countMap.get("学校"); - int hospitalCount = null == countMap.get("医院") ? 0 : countMap.get("医院"); - int bankCount = null == countMap.get("银行") ? 0 : countMap.get("银行"); + int schoolCount = null == countMap.get("瀛︽牎") ? 0 : countMap.get("瀛︽牎"); + int hospitalCount = null == countMap.get("鍖婚櫌") ? 0 : countMap.get("鍖婚櫌"); + int bankCount = null == countMap.get("閾惰") ? 0 : countMap.get("閾惰"); - if (null != countMap.get("公交点")) { - int busCount = countMap.get("公交点"); - if (null == countMap.get("地铁站") || countMap.get("地铁站") == 0) { + if (null != countMap.get("鍏氦鐐�")) { + int busCount = countMap.get("鍏氦鐐�"); + if (null == countMap.get("鍦伴搧绔�") || countMap.get("鍦伴搧绔�") == 0) { if (busCount <= 3) { ret += 1; } else if (busCount <= 8) { @@ -438,7 +438,7 @@ public class DistrictScoreUtil { ret += 5; } } else { - int metroCount = countMap.get("地铁站"); + int metroCount = countMap.get("鍦伴搧绔�"); if (metroCount < 1) { if (busCount <= 3) { ret += 1; @@ -490,27 +490,27 @@ public class DistrictScoreUtil { } } - if (null != countMap.get("写字楼") && countMap.get("写字楼") >= 5) { + if (null != countMap.get("鍐欏瓧妤�") && countMap.get("鍐欏瓧妤�") >= 5) { ret += 0.5; } - if (null != countMap.get("停车场")) { + if (null != countMap.get("鍋滆溅鍦�")) { ret += 0.5; } -// if (null != countMap.get("超市") && countMap.get("超市") >= 5) { +// if (null != countMap.get("瓒呭競") && countMap.get("瓒呭競") >= 5) { // ret += 0.5; // } - if (null != countMap.get("超市") && countMap.get("超市") >= 15) { + if (null != countMap.get("瓒呭競") && countMap.get("瓒呭競") >= 15) { ret += 0.5; } -// if (null != countMap.get("公园") && countMap.get("公园") >= 5) { +// if (null != countMap.get("鍏洯") && countMap.get("鍏洯") >= 5) { // ret += 0.5; // } - if (null != countMap.get("公园")) { + if (null != countMap.get("鍏洯")) { ret += 0.5; } //add by shibb - if (null != countMap.get("发电站") || null != countMap.get("变电站") || null != countMap.get("垃圾焚烧厂") || null != countMap.get("化工厂")) { + if (null != countMap.get("鍙戠數绔�") || null != countMap.get("鍙樼數绔�") || null != countMap.get("鍨冨溇鐒氱儳鍘�") || null != countMap.get("鍖栧伐鍘�")) { ret -= 1; } @@ -521,32 +521,32 @@ public class DistrictScoreUtil { int s = (int) score; switch (s) { case 1: - return "周边公共配套非常差,生活很不便"; + return "鍛ㄨ竟鍏叡閰嶅闈炲父宸紝鐢熸椿寰堜笉渚�"; case 2: - return "周边公共配套非常差,生活很不便"; + return "鍛ㄨ竟鍏叡閰嶅闈炲父宸紝鐢熸椿寰堜笉渚�"; case 3: - return "周边公共配套较差,生活较为不便"; + return "鍛ㄨ竟鍏叡閰嶅杈冨樊锛岀敓娲昏緝涓轰笉渚�"; case 4: - return "周边公共配套较差,生活较为不便"; + return "鍛ㄨ竟鍏叡閰嶅杈冨樊锛岀敓娲昏緝涓轰笉渚�"; case 5: - return "周边公共配套一般,生活便利
指数一般"; + return "鍛ㄨ竟鍏叡閰嶅涓�鑸紝鐢熸椿渚垮埄
鎸囨暟涓�鑸�"; case 6: - return "周边公共配套一般,生活便利
指数一般"; + return "鍛ㄨ竟鍏叡閰嶅涓�鑸紝鐢熸椿渚垮埄
鎸囨暟涓�鑸�"; case 7: - return "周边公共配套较成熟,生活便利"; + return "鍛ㄨ竟鍏叡閰嶅杈冩垚鐔燂紝鐢熸椿渚垮埄"; case 8: - return "周边公共配套较成熟,生活便利"; + return "鍛ㄨ竟鍏叡閰嶅杈冩垚鐔燂紝鐢熸椿渚垮埄"; case 9: - return "周边公共配套非常成熟,生活
很便利"; + return "鍛ㄨ竟鍏叡閰嶅闈炲父鎴愮啛锛岀敓娲�
寰堜究鍒�"; case 10: - return "周边公共配套非常成熟,生活
很便利"; + return "鍛ㄨ竟鍏叡閰嶅闈炲父鎴愮啛锛岀敓娲�
寰堜究鍒�"; default: return ""; } } /** - * 小区综合指数 + * 灏忓尯缁煎悎鎸囨暟 */ public static double detailScore(District district, SeaweedNumberic numberic) { double ret = 0d; @@ -556,11 +556,11 @@ public class DistrictScoreUtil { year = numberic.getFinishBuildYear(); } - // 类型 - if (StringUtils.endsWith(district.getName(), "洋房")) { + // 绫诲瀷 + if (StringUtils.endsWith(district.getName(), "娲嬫埧")) { ret += 9; } else { - if (StringUtils.contains(district.getEstateType2(), "别墅")) { + if (StringUtils.contains(district.getEstateType2(), "鍒")) { if (year >= 1920 && year <= 1949) { ret += 9; } else { @@ -577,7 +577,7 @@ public class DistrictScoreUtil { } } - // 户均占地面积 + // 鎴峰潎鍗犲湴闈㈢Н if (null != numberic && null != numberic.getHouseholdCount() && null != numberic.getAllArea() && numberic.getHouseholdCount() > 0 && numberic.getAllArea() > 0) { double d = numberic.getAllArea() * 1.0 / numberic.getHouseholdCount(); @@ -589,7 +589,7 @@ public class DistrictScoreUtil { } } - // 户均建筑面积 + // 鎴峰潎寤虹瓚闈㈢Н if (null != numberic && null != numberic.getHouseholdCount() && null != numberic.getBuildArea() && numberic.getHouseholdCount() > 0 && numberic.getBuildArea() > 0) { double d = numberic.getBuildArea() * 1.0 / numberic.getHouseholdCount(); @@ -602,7 +602,7 @@ public class DistrictScoreUtil { } } - // 绿化率 + // 缁垮寲鐜� if (null != numberic && null != numberic.getVirescencePercent()) { double d = numberic.getVirescencePercent(); if (d > CITY_AVG_VIRESCENCE_PERCENT && ((d - CITY_AVG_VIRESCENCE_PERCENT) / CITY_AVG_VIRESCENCE_PERCENT > 0.2)) { @@ -612,7 +612,7 @@ public class DistrictScoreUtil { } } - // 容积率 + // 瀹圭Н鐜� if (null != numberic && null != numberic.getCubagePercent()) { double d = numberic.getCubagePercent(); if (d > CITY_AVG_CUBAGE_PERCENT && ((d - CITY_AVG_CUBAGE_PERCENT) / CITY_AVG_CUBAGE_PERCENT > 0.2)) { @@ -622,7 +622,7 @@ public class DistrictScoreUtil { } } - // 停车位 + // 鍋滆溅浣� if (null != numberic && null != numberic.getCarSiteCount()) { double d = numberic.getCarSiteCount(); if (d > CITY_AVG_CAR_SITE && ((d - CITY_AVG_CAR_SITE) / CITY_AVG_CAR_SITE > 0.2)) { @@ -639,7 +639,7 @@ public class DistrictScoreUtil { ret += 0.5; } - // 物业费 + // 鐗╀笟璐� if (null != numberic && null != numberic.getEstateCharge()) { double d = numberic.getEstateCharge(); if (d > CITY_AVG_ESTATE_CHARGE && ((d - CITY_AVG_ESTATE_CHARGE) * 1.0 / CITY_AVG_ESTATE_CHARGE > 0.2)) { @@ -656,32 +656,32 @@ public class DistrictScoreUtil { int s = (int) score; switch (s) { case 1: - return "属于城市的普通住宅"; + return "灞炰簬鍩庡競鐨勬櫘閫氫綇瀹�"; case 2: - return "属于城市的普通住宅"; + return "灞炰簬鍩庡競鐨勬櫘閫氫綇瀹�"; case 3: - return "属于城市的普通住宅"; + return "灞炰簬鍩庡競鐨勬櫘閫氫綇瀹�"; case 4: - return "属于城市的普通住宅"; + return "灞炰簬鍩庡競鐨勬櫘閫氫綇瀹�"; case 5: - return "属于城市的普通住宅"; + return "灞炰簬鍩庡競鐨勬櫘閫氫綇瀹�"; case 6: - return "属于城市的普通住宅"; + return "灞炰簬鍩庡競鐨勬櫘閫氫綇瀹�"; case 7: - return "属于城市的优质住宅"; + return "灞炰簬鍩庡競鐨勪紭璐ㄤ綇瀹�"; case 8: - return "属于城市的优质住宅"; + return "灞炰簬鍩庡競鐨勪紭璐ㄤ綇瀹�"; case 9: - return "属于城市的高端住宅"; + return "灞炰簬鍩庡競鐨勯珮绔綇瀹�"; case 10: - return "属于城市的高端住宅"; + return "灞炰簬鍩庡競鐨勯珮绔綇瀹�"; default: return ""; } } /** - * 户均占地面积 + * 鎴峰潎鍗犲湴闈㈢Н */ public static double detailScore1(Integer householdCount, Integer allArea) { if (null == householdCount || null == allArea || householdCount <= 0 || allArea <= 0) { @@ -705,7 +705,7 @@ public class DistrictScoreUtil { } /** - * 户均建筑面积 + * 鎴峰潎寤虹瓚闈㈢Н */ public static double detailScore2(Integer householdCount, Integer buildArea) { if (null == householdCount || null == buildArea || householdCount <= 0 || buildArea <= 0) { @@ -729,7 +729,7 @@ public class DistrictScoreUtil { } /** - * 绿化率 + * 缁垮寲鐜� */ public static double detailScore3(Double virescencePercent) { if (null == virescencePercent) { @@ -752,7 +752,7 @@ public class DistrictScoreUtil { } /** - * 容积率 + * 瀹圭Н鐜� */ public static double detailScore4(Double cubagePercent) { if (null == cubagePercent) { @@ -777,13 +777,13 @@ public class DistrictScoreUtil { } /** - * 停车位 + * 鍋滆溅浣� */ public static double detailScore5(String buildType, Integer carSiteCount) { if (StringUtils.isNotBlank(buildType)) { buildType = buildType.replaceAll(",", ""); - if ("独栋".equals(buildType) || "双拼".equals(buildType) || "联排".equals(buildType) || "叠加".equals(buildType) - || "花园洋房".equals(buildType) || "老洋房".equals(buildType) || "四合院".equals(buildType)) { + if ("鐙爧".equals(buildType) || "鍙屾嫾".equals(buildType) || "鑱旀帓".equals(buildType) || "鍙犲姞".equals(buildType) + || "鑺卞洯娲嬫埧".equals(buildType) || "鑰佹磱鎴�".equals(buildType) || "鍥涘悎闄�".equals(buildType)) { return 9d; } } @@ -810,8 +810,8 @@ public class DistrictScoreUtil { } /** - * 潜力指数 - * 稀缺指数 + * 娼滃姏鎸囨暟 + * 绋�缂烘寚鏁� * modify by shibb */ public static double rankScore(int regionClickRank, int regionDistrictCount, int lastMonthHouses, int halfYearHouse) { @@ -897,7 +897,7 @@ public class DistrictScoreUtil { // ret -= 1; // } - //regionDistrictCount小区平均关注度 + //regionDistrictCount灏忓尯骞冲潎鍏虫敞搴� if (regionClickRank > regionDistrictCount) { double d = (regionClickRank - regionDistrictCount) * 1.0 / regionDistrictCount; if (d > 0.3) { @@ -914,8 +914,8 @@ public class DistrictScoreUtil { } /** - * 潜力指数 - * 稀缺指数 + * 娼滃姏鎸囨暟 + * 绋�缂烘寚鏁� * add by shibb */ public static double rankScore2(double hotRatio, double attentionRatio) { @@ -927,27 +927,27 @@ public class DistrictScoreUtil { int s = (int) score; switch (s) { case 0: - return "市场上有大量挂牌房源"; + return "甯傚満涓婃湁澶ч噺鎸傜墝鎴挎簮"; case 1: - return "市场上有大量挂牌房源"; + return "甯傚満涓婃湁澶ч噺鎸傜墝鎴挎簮"; case 2: - return "市场上有大量挂牌房源"; + return "甯傚満涓婃湁澶ч噺鎸傜墝鎴挎簮"; case 3: - return "挂牌房源量较充足"; + return "鎸傜墝鎴挎簮閲忚緝鍏呰冻"; case 4: - return "挂牌房源量较充足"; + return "鎸傜墝鎴挎簮閲忚緝鍏呰冻"; case 5: - return "挂牌房源量一般"; + return "鎸傜墝鎴挎簮閲忎竴鑸�"; case 6: - return "挂牌房源量一般"; + return "鎸傜墝鎴挎簮閲忎竴鑸�"; case 7: - return "市场上房源较稀缺"; + return "甯傚満涓婃埧婧愯緝绋�缂�"; case 8: - return "市场上房源较稀缺"; + return "甯傚満涓婃埧婧愯緝绋�缂�"; case 9: - return "市场上房源非常稀缺"; + return "甯傚満涓婃埧婧愰潪甯哥█缂�"; case 10: - return "市场上房源非常稀缺"; + return "甯傚満涓婃埧婧愰潪甯哥█缂�"; default: return ""; } @@ -997,23 +997,23 @@ public class DistrictScoreUtil { case 1: return ""; case 2: - return "房价跌幅明显,预计升值能力较弱"; + return "鎴夸环璺屽箙鏄庢樉锛岄璁″崌鍊艰兘鍔涜緝寮�"; case 3: - return "房价跌幅较明显,预计升值能力较弱"; + return "鎴夸环璺屽箙杈冩槑鏄撅紝棰勮鍗囧�艰兘鍔涜緝寮�"; case 4: - return "房价走势较为平稳,预计未来
波动不大"; + return "鎴夸环璧板娍杈冧负骞崇ǔ锛岄璁℃湭鏉�
娉㈠姩涓嶅ぇ"; case 5: - return "房价走势平稳,预计未来波动不大"; + return "鎴夸环璧板娍骞崇ǔ锛岄璁℃湭鏉ユ尝鍔ㄤ笉澶�"; case 6: - return "房价走势较为平稳,预计未来
波动不大"; + return "鎴夸环璧板娍杈冧负骞崇ǔ锛岄璁℃湭鏉�
娉㈠姩涓嶅ぇ"; case 7: - return "房价涨幅明显,未来走势理想"; + return "鎴夸环娑ㄥ箙鏄庢樉锛屾湭鏉ヨ蛋鍔跨悊鎯�"; case 8: - return "房价涨幅明显,未来走势理想"; + return "鎴夸环娑ㄥ箙鏄庢樉锛屾湭鏉ヨ蛋鍔跨悊鎯�"; case 9: - return "房价涨幅较高,未来走势乐观"; + return "鎴夸环娑ㄥ箙杈冮珮锛屾湭鏉ヨ蛋鍔夸箰瑙�"; case 10: - return "房价涨幅较高,未来走势乐观"; + return "鎴夸环娑ㄥ箙杈冮珮锛屾湭鏉ヨ蛋鍔夸箰瑙�"; default: return ""; } @@ -1024,7 +1024,7 @@ public class DistrictScoreUtil { if (StringUtils.isBlank(date)) { return 0; } - Pattern p = Pattern.compile("(\\d{4})[-|年|.]?(\\d{1,2})?[-|月|.]?(\\d{1,2})?日?"); + Pattern p = Pattern.compile("(\\d{4})[-|骞磡.]?(\\d{1,2})?[-|鏈坾.]?(\\d{1,2})?鏃�?"); Matcher m = p.matcher(date); Integer year = 0; if (m.find()) { diff --git a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/util/ShopScoreUtil.java b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/util/ShopScoreUtil.java index bb338cf9b..14043f057 100644 --- a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/util/ShopScoreUtil.java +++ b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/util/ShopScoreUtil.java @@ -12,52 +12,52 @@ import com.fangjia.service.bo.DistrictStatBo; public class ShopScoreUtil { /** - * 市均停车位(确认) + * 甯傚潎鍋滆溅浣�(纭) */ private final static int CITY_AVG_CAR_SITE_COUNT = 683; /** - * 市均餐饮人均消费(确认) + * 甯傚潎椁愰ギ浜哄潎娑堣垂(纭) */ private final static int CITY_AVG_CONSUMPTION = 50; /** - * 市均商场建筑规模(面积)(确认) + * 甯傚潎鍟嗗満寤虹瓚瑙勬ā锛堥潰绉級(纭) */ private final static int CITY_AVG_MALL_AREA = 119250; /** - * 市均居民人口密度(确认) + * 甯傚潎灞呮皯浜哄彛瀵嗗害(纭) */ //private final static double CITY_AVG_HOUSE_DENSITY = 3030; private final static double CITY_AVG_HOUSE_DENSITY = 3631; /** - * 市均办公人口密度(确认) + * 甯傚潎鍔炲叕浜哄彛瀵嗗害(纭) */ //private final static double CITY_AVG_OFFICE_DENSITY = 3030; private final static double CITY_AVG_OFFICE_DENSITY = 3631; /** - * 市均商场竣工年份(确认) + * 甯傚潎鍟嗗満绔e伐骞翠唤(纭) */ private final static int CITY_AVG_FINISH_YAER = 2007; /** - * 市均商场物业费(确认) + * 甯傚潎鍟嗗満鐗╀笟璐�(纭) */ private final static double CITY_AVG_ESTATE_CHARGE = 3.57; /** - * 地段指数 + * 鍦版鎸囨暟 */ public static double localScore(String loopLineInfo, int metros, int buses) { double ret = 0d; - if ("内环以内".equals(loopLineInfo)) { + if ("鍐呯幆浠ュ唴".equals(loopLineInfo)) { ret += 8; - } else if ("中内之间".equals(loopLineInfo) || "中内环间".equals(loopLineInfo)) { + } else if ("涓唴涔嬮棿".equals(loopLineInfo) || "涓唴鐜棿".equals(loopLineInfo)) { ret += 6; - } else if ("中外之间".equals(loopLineInfo) || "中外环间".equals(loopLineInfo)) { + } else if ("涓涔嬮棿".equals(loopLineInfo) || "涓鐜棿".equals(loopLineInfo)) { ret += 5; - } else if ("外环以外".equals(loopLineInfo)) { + } else if ("澶栫幆浠ュ".equals(loopLineInfo)) { ret += 4; } else { ret += 3; @@ -69,8 +69,8 @@ public class ShopScoreUtil { ret += 0.5; } - // TODO 板块 - // TODO A类+1,B类+0.5 + // TODO 鏉垮潡 + // TODO A绫�+1锛孊绫�+0.5 return ret > 10 ? 10 : ret; } @@ -79,32 +79,32 @@ public class ShopScoreUtil { int s = (int) score; switch (s) { case 1: - return "位于城市中偏远的地段"; + return "浣嶄簬鍩庡競涓亸杩滅殑鍦版"; case 2: - return "位于城市中偏远的地段"; + return "浣嶄簬鍩庡競涓亸杩滅殑鍦版"; case 3: - return "位于城市中较偏远的地段"; + return "浣嶄簬鍩庡競涓緝鍋忚繙鐨勫湴娈�"; case 4: - return "位于城市中较偏远的地段"; + return "浣嶄簬鍩庡競涓緝鍋忚繙鐨勫湴娈�"; case 5: - return "位于城市中普通地段"; + return "浣嶄簬鍩庡競涓櫘閫氬湴娈�"; case 6: - return "位于城市中普通地段"; + return "浣嶄簬鍩庡競涓櫘閫氬湴娈�"; case 7: - return "位于城市中较好的地段"; + return "浣嶄簬鍩庡競涓緝濂界殑鍦版"; case 8: - return "位于城市中较好的地段"; + return "浣嶄簬鍩庡競涓緝濂界殑鍦版"; case 9: - return "位于城市中黄金地段"; + return "浣嶄簬鍩庡競涓粍閲戝湴娈�"; case 10: - return "位于城市中黄金地段"; + return "浣嶄簬鍩庡競涓粍閲戝湴娈�"; default: return ""; } } /** - * 地段指数--公共交通 + * 鍦版鎸囨暟--鍏叡浜ら�� */ public static double localScore1(int metroCount, int busCount) { if (metroCount > 2) { @@ -137,7 +137,7 @@ public class ShopScoreUtil { } /** - * 地段指数--周边业态 + * 鍦版鎸囨暟--鍛ㄨ竟涓氭�� */ public static double localScore2(Map typeCountMap) { double ret = 0d; @@ -160,7 +160,7 @@ public class ShopScoreUtil { } /** - * 消费指数 + * 娑堣垂鎸囨暟 */ public static double consumScore(Double avgConsumption, Map countMap) { double ret = 0d; @@ -197,9 +197,9 @@ public class ShopScoreUtil { } } - if (null != countMap.get("商场")) { + if (null != countMap.get("鍟嗗満")) { ret += 0.2; - if (countMap.get("商场") >= 5) { + if (countMap.get("鍟嗗満") >= 5) { ret += 0.3; } } @@ -209,45 +209,45 @@ public class ShopScoreUtil { ret += 0.2; } } - if (null != countMap.get("电影院")) { + if (null != countMap.get("鐢靛奖闄�")) { ret += 0.1; } - if (null != countMap.get("健身中心")) { + if (null != countMap.get("鍋ヨ韩涓績")) { ret += 0.2; } - if (null != countMap.get("美容院")) { + if (null != countMap.get("缇庡闄�")) { ret += 0.1; - if (countMap.get("美容院") >= 5) { + if (countMap.get("缇庡闄�") >= 5) { ret += 0.2; } } - if (null != countMap.get("大型超市")) { + if (null != countMap.get("澶у瀷瓒呭競")) { ret += 0.2; } - if (null != countMap.get("高尔夫球场")) { + if (null != countMap.get("楂樺皵澶悆鍦�")) { ret += 0.5; } - if (null != countMap.get("私立学校")) { + if (null != countMap.get("绉佺珛瀛︽牎")) { ret += 0.2; - if (countMap.get("私立学校") >= 5) { + if (countMap.get("绉佺珛瀛︽牎") >= 5) { ret += 0.3; } } - if (null != countMap.get("整形")) { + if (null != countMap.get("鏁村舰")) { ret += 0.2; - if (countMap.get("整形") >= 5) { + if (countMap.get("鏁村舰") >= 5) { ret += 0.1; } } - if (null != countMap.get("洗浴")) { + if (null != countMap.get("娲楁荡")) { ret += 0.1; } - if (null != countMap.get("私立医院")) { + if (null != countMap.get("绉佺珛鍖婚櫌")) { ret += 0.2; } - if (null != countMap.get("星级酒店")) { + if (null != countMap.get("鏄熺骇閰掑簵")) { ret += 0.2; - if (countMap.get("星级酒店") >= 5) { + if (countMap.get("鏄熺骇閰掑簵") >= 5) { ret += 0.2; } } @@ -259,32 +259,32 @@ public class ShopScoreUtil { int s = (int) score; switch (s) { case 1: - return "周边人群消费能力弱"; + return "鍛ㄨ竟浜虹兢娑堣垂鑳藉姏寮�"; case 2: - return "周边人群消费能力弱"; + return "鍛ㄨ竟浜虹兢娑堣垂鑳藉姏寮�"; case 3: - return "周边人群消费能力较弱"; + return "鍛ㄨ竟浜虹兢娑堣垂鑳藉姏杈冨急"; case 4: - return "周边人群消费能力较弱"; + return "鍛ㄨ竟浜虹兢娑堣垂鑳藉姏杈冨急"; case 5: - return "周边人群消费能力一般"; + return "鍛ㄨ竟浜虹兢娑堣垂鑳藉姏涓�鑸�"; case 6: - return "周边人群消费能力一般"; + return "鍛ㄨ竟浜虹兢娑堣垂鑳藉姏涓�鑸�"; case 7: - return "周边人群具有一定的消费能力"; + return "鍛ㄨ竟浜虹兢鍏锋湁涓�瀹氱殑娑堣垂鑳藉姏"; case 8: - return "周边人群具有一定的消费能力"; + return "鍛ㄨ竟浜虹兢鍏锋湁涓�瀹氱殑娑堣垂鑳藉姏"; case 9: - return "周边人群具有很强的消费能力"; + return "鍛ㄨ竟浜虹兢鍏锋湁寰堝己鐨勬秷璐硅兘鍔�"; case 10: - return "周边人群具有很强的消费能力"; + return "鍛ㄨ竟浜虹兢鍏锋湁寰堝己鐨勬秷璐硅兘鍔�"; default: return ""; } } /** - * 房价指数 + * 鎴夸环鎸囨暟 */ public static double priceScore(DistrictStatBo statBo, Integer cityPrice) { double ret = 0d; @@ -350,32 +350,32 @@ public class ShopScoreUtil { int s = (int) score; switch (s) { case 1: - return "属于城市中价位较低的商铺"; + return "灞炰簬鍩庡競涓环浣嶈緝浣庣殑鍟嗛摵"; case 2: - return "属于城市中价位较低的商铺"; + return "灞炰簬鍩庡競涓环浣嶈緝浣庣殑鍟嗛摵"; case 3: - return "属于城市中价位较低的商铺"; + return "灞炰簬鍩庡競涓环浣嶈緝浣庣殑鍟嗛摵"; case 4: - return "属于略低于城市均价的商铺"; + return "灞炰簬鐣ヤ綆浜庡煄甯傚潎浠风殑鍟嗛摵"; case 5: - return "属于接近城市均价的商铺"; + return "灞炰簬鎺ヨ繎鍩庡競鍧囦环鐨勫晢閾�"; case 6: - return "属于略高于城市均价的商铺"; + return "灞炰簬鐣ラ珮浜庡煄甯傚潎浠风殑鍟嗛摵"; case 7: - return "属于城市中价位较高的商铺"; + return "灞炰簬鍩庡競涓环浣嶈緝楂樼殑鍟嗛摵"; case 8: - return "属于城市中价位较高的商铺"; + return "灞炰簬鍩庡競涓环浣嶈緝楂樼殑鍟嗛摵"; case 9: - return "属于城市中价位非常高的商铺"; + return "灞炰簬鍩庡競涓环浣嶉潪甯搁珮鐨勫晢閾�"; case 10: - return "属于城市中价位非常高的商铺"; + return "灞炰簬鍩庡競涓环浣嶉潪甯搁珮鐨勫晢閾�"; default: return ""; } } /** - * 租金指数 + * 绉熼噾鎸囨暟 */ public static double rentScore(DistrictBusinessStatRentBo statBo, Integer cityPrice, String paymentPattern) { double ret = 0d; @@ -422,7 +422,7 @@ public class ShopScoreUtil { } } - if ("押三付三".equals(paymentPattern) || "付三押三".equals(paymentPattern)) { + if ("鎶间笁浠樹笁".equals(paymentPattern) || "浠樹笁鎶间笁".equals(paymentPattern)) { ret += 0.5; } } @@ -434,63 +434,63 @@ public class ShopScoreUtil { int s = (int) score; switch (s) { case 1: - return "属于城市中租金便宜的商铺"; + return "灞炰簬鍩庡競涓閲戜究瀹滅殑鍟嗛摵"; case 2: - return "属于城市中租金便宜的商铺"; + return "灞炰簬鍩庡競涓閲戜究瀹滅殑鍟嗛摵"; case 3: - return "属于城市中租金较便宜的商铺"; + return "灞炰簬鍩庡競涓閲戣緝渚垮疁鐨勫晢閾�"; case 4: - return "属于略低于城市租金均价的商铺"; + return "灞炰簬鐣ヤ綆浜庡煄甯傜閲戝潎浠风殑鍟嗛摵"; case 5: - return "属于接近城市租金均价的商铺"; + return "灞炰簬鎺ヨ繎鍩庡競绉熼噾鍧囦环鐨勫晢閾�"; case 6: - return "属于略高于城市租金均价的商铺"; + return "灞炰簬鐣ラ珮浜庡煄甯傜閲戝潎浠风殑鍟嗛摵"; case 7: - return "属于城市中租金较高的商铺"; + return "灞炰簬鍩庡競涓閲戣緝楂樼殑鍟嗛摵"; case 8: - return "属于城市中租金较高的商铺"; + return "灞炰簬鍩庡競涓閲戣緝楂樼殑鍟嗛摵"; case 9: - return "属于城市中租金昂贵的商铺"; + return "灞炰簬鍩庡競涓閲戞槀璐电殑鍟嗛摵"; case 10: - return "属于城市中租金昂贵的商铺"; + return "灞炰簬鍩庡競涓閲戞槀璐电殑鍟嗛摵"; default: return ""; } } /** - * 商铺综合指数 + * 鍟嗛摵缁煎悎鎸囨暟 */ public static double detailScore(District mall, SeaweedNumberic numberic) { double ret = 0d; - // 商铺类型 + // 鍟嗛摵绫诲瀷 String estateType = mall.getEstateCharge(); - if (StringUtils.contains(estateType, "购物中心")) { + if (StringUtils.contains(estateType, "璐墿涓績")) { ret += 8; - } else if (StringUtils.contains(estateType, "写字楼商铺")) { + } else if (StringUtils.contains(estateType, "鍐欏瓧妤煎晢閾�")) { ret += 7; - } else if ("专项商铺".equals(estateType)) { + } else if ("涓撻」鍟嗛摵".equals(estateType)) { ret += 6; } else { ret += 5; } - // 商圈 + // 鍟嗗湀 String businessQuarter = mall.getBusinessQuarter(); - // TODO A类+1,B类+0.5 + // TODO A绫�+1锛孊绫�+0.5 if (StringUtils.isNotBlank(businessQuarter)) { ret += 0.5; } - // 板块 + // 鏉垮潡 String block = ""; - // TODO A类+1,B类+0.5 + // TODO A绫�+1锛孊绫�+0.5 if (StringUtils.isNotBlank(block)) { ret += 0.5; } - // 建筑规模 + // 寤虹瓚瑙勬ā if (null != numberic && null != numberic.getBuildArea()) { int area = numberic.getBuildArea(); if (area > CITY_AVG_MALL_AREA && ((area - CITY_AVG_MALL_AREA) * 1.0 / CITY_AVG_MALL_AREA > 0.2)) { @@ -500,10 +500,10 @@ public class ShopScoreUtil { } } - // 装修状况 - // TODO 目前没有装修字段 + // 瑁呬慨鐘跺喌 + // TODO 鐩墠娌℃湁瑁呬慨瀛楁 - // 停车位 + // 鍋滆溅浣� if (null != mall.getCarSiteCount()) { double t = (mall.getCarSiteCount() - CITY_AVG_CAR_SITE_COUNT) * 1.0 / CITY_AVG_CAR_SITE_COUNT; if (t > 0.2) { @@ -513,7 +513,7 @@ public class ShopScoreUtil { } } - // 楼龄 + // 妤奸緞 if (null != numberic && null != numberic.getFinishBuildYear()) { int year = numberic.getFinishBuildYear(); if (year > CITY_AVG_FINISH_YAER && ((year - CITY_AVG_FINISH_YAER) * 1.0 / CITY_AVG_FINISH_YAER > 0.2)) { @@ -530,7 +530,7 @@ public class ShopScoreUtil { ret += 0.5; } - // 物业费 + // 鐗╀笟璐� if (null != numberic && null != numberic.getEstateCharge()) { double c = numberic.getEstateCharge(); if (c > CITY_AVG_ESTATE_CHARGE && ((c - CITY_AVG_ESTATE_CHARGE) * 1.0 / CITY_AVG_ESTATE_CHARGE > 0.2)) { @@ -547,35 +547,35 @@ public class ShopScoreUtil { int s = (int) score; switch (s) { case 1: - return "属于城市的普通商铺"; + return "灞炰簬鍩庡競鐨勬櫘閫氬晢閾�"; case 2: - return "属于城市的普通商铺"; + return "灞炰簬鍩庡競鐨勬櫘閫氬晢閾�"; case 3: - return "属于城市的普通商铺"; + return "灞炰簬鍩庡競鐨勬櫘閫氬晢閾�"; case 4: - return "属于城市的普通商铺"; + return "灞炰簬鍩庡競鐨勬櫘閫氬晢閾�"; case 5: - return "属于城市的普通商铺"; + return "灞炰簬鍩庡競鐨勬櫘閫氬晢閾�"; case 6: - return "属于城市的普通商铺"; + return "灞炰簬鍩庡競鐨勬櫘閫氬晢閾�"; case 7: - return "属于城市的优质商铺"; + return "灞炰簬鍩庡競鐨勪紭璐ㄥ晢閾�"; case 8: - return "属于城市的优质商铺"; + return "灞炰簬鍩庡競鐨勪紭璐ㄥ晢閾�"; case 9: - return "属于城市的高端商铺"; + return "灞炰簬鍩庡競鐨勯珮绔晢閾�"; case 10: - return "属于城市的高端商铺"; + return "灞炰簬鍩庡競鐨勯珮绔晢閾�"; default: return ""; } } /** - * 商铺综合指数--建筑规模 + * 鍟嗛摵缁煎悎鎸囨暟--寤虹瓚瑙勬ā */ public static double detailScore1(String estateType, Integer buildArea) { - if (StringUtils.contains(estateType, "购物中心")) { + if (StringUtils.contains(estateType, "璐墿涓績")) { if (null == buildArea) { return 5d; } @@ -593,9 +593,9 @@ public class ShopScoreUtil { } else { return 5d; } - } else if (StringUtils.contains(estateType, "写字楼商铺")) { + } else if (StringUtils.contains(estateType, "鍐欏瓧妤煎晢閾�")) { return 6d; - } else if ("专项商铺".equals(estateType)) { + } else if ("涓撻」鍟嗛摵".equals(estateType)) { return 7d; } else { return 5d; @@ -603,15 +603,15 @@ public class ShopScoreUtil { } /** - * 商铺综合指数--装修 + * 鍟嗛摵缁煎悎鎸囨暟--瑁呬慨 */ public static double detailScore2(String estateType, String buildArea) { - // TODO 目前没有装修字段 + // TODO 鐩墠娌℃湁瑁呬慨瀛楁 return 5d; } /** - * 商铺综合指数--停车位 + * 鍟嗛摵缁煎悎鎸囨暟--鍋滆溅浣� */ public static double detailScore3(Integer carSiteCount) { if (null == carSiteCount) { @@ -637,7 +637,7 @@ public class ShopScoreUtil { } /** - * 商铺综合指数--楼龄 + * 鍟嗛摵缁煎悎鎸囨暟--妤奸緞 */ public static double detailScore4(Integer year) { if (null == year) { @@ -666,44 +666,44 @@ public class ShopScoreUtil { } /** - * 环境指数--公共聚客点 + * 鐜鎸囨暟--鍏叡鑱氬鐐� */ public static double aroundScore1(Map countMap) { double ret = 0d; - if (null != countMap.get("医院")) { + if (null != countMap.get("鍖婚櫌")) { ret += 1; - if (countMap.get("医院") >= 3) { + if (countMap.get("鍖婚櫌") >= 3) { ret += 0.5; } } - if (null != countMap.get("地铁站")) { + if (null != countMap.get("鍦伴搧绔�")) { ret += 1; - if (countMap.get("地铁站") >= 3) { + if (countMap.get("鍦伴搧绔�") >= 3) { ret += 0.5; } } - if (null != countMap.get("公交点")) { + if (null != countMap.get("鍏氦鐐�")) { ret += 1; - if (countMap.get("公交点") >= 3) { + if (countMap.get("鍏氦鐐�") >= 3) { ret += 0.5; } } - if (null != countMap.get("公园")) { + if (null != countMap.get("鍏洯")) { ret += 1; - if (countMap.get("公园") >= 2) { + if (countMap.get("鍏洯") >= 2) { ret += 0.5; } } - if (null != countMap.get("学校")) { + if (null != countMap.get("瀛︽牎")) { ret += 1; - if (countMap.get("学校") >= 3) { + if (countMap.get("瀛︽牎") >= 3) { ret += 0.5; } } - if (null != countMap.get("体育馆")) { + if (null != countMap.get("浣撹偛棣�")) { ret += 1; - if (countMap.get("体育馆") >= 2) { + if (countMap.get("浣撹偛棣�") >= 2) { ret += 0.5; } } @@ -712,32 +712,32 @@ public class ShopScoreUtil { } /** - * 环境指数--商业聚客点 + * 鐜鎸囨暟--鍟嗕笟鑱氬鐐� */ public static double aroundScore2(Map countMap) { double ret = 0d; - if (null != countMap.get("银行")) { + if (null != countMap.get("閾惰")) { ret += 1; - if (countMap.get("银行") >= 3) { + if (countMap.get("閾惰") >= 3) { ret += 0.5; } } - if (null != countMap.get("商场")) { + if (null != countMap.get("鍟嗗満")) { ret += 1; - if (countMap.get("商场") >= 3) { + if (countMap.get("鍟嗗満") >= 3) { ret += 0.5; } } - if (null != countMap.get("大型超市")) { + if (null != countMap.get("澶у瀷瓒呭競")) { ret += 1; - if (countMap.get("大型超市") >= 3) { + if (countMap.get("澶у瀷瓒呭競") >= 3) { ret += 0.5; } } - if (null != countMap.get("餐饮")) { + if (null != countMap.get("椁愰ギ")) { ret += 1; - if (countMap.get("餐饮") >= 10) { + if (countMap.get("椁愰ギ") >= 10) { ret += 0.5; } } @@ -749,32 +749,32 @@ public class ShopScoreUtil { int s = (int) score; switch (s) { case 1: - return "周边公共或商业配套非常差,客源稀少"; + return "鍛ㄨ竟鍏叡鎴栧晢涓氶厤濂楅潪甯稿樊锛屽婧愮█灏�"; case 2: - return "周边公共或商业配套非常差,客源稀少"; + return "鍛ㄨ竟鍏叡鎴栧晢涓氶厤濂楅潪甯稿樊锛屽婧愮█灏�"; case 3: - return "周边公共或商业配套较差,客源较少"; + return "鍛ㄨ竟鍏叡鎴栧晢涓氶厤濂楄緝宸紝瀹㈡簮杈冨皯"; case 4: - return "周边公共或商业配套较差,客源较少"; + return "鍛ㄨ竟鍏叡鎴栧晢涓氶厤濂楄緝宸紝瀹㈡簮杈冨皯"; case 5: - return "周边公共或商业配套一般,客源一般"; + return "鍛ㄨ竟鍏叡鎴栧晢涓氶厤濂椾竴鑸紝瀹㈡簮涓�鑸�"; case 6: - return "周边公共或商业配套一般,客源一般"; + return "鍛ㄨ竟鍏叡鎴栧晢涓氶厤濂椾竴鑸紝瀹㈡簮涓�鑸�"; case 7: - return "周边公共或商业配套较成熟,客源较丰富"; + return "鍛ㄨ竟鍏叡鎴栧晢涓氶厤濂楄緝鎴愮啛锛屽婧愯緝涓板瘜"; case 8: - return "周边公共或商业配套较成熟,客源较丰富"; + return "鍛ㄨ竟鍏叡鎴栧晢涓氶厤濂楄緝鎴愮啛锛屽婧愯緝涓板瘜"; case 9: - return "周边公共或商业配套非常成熟,客源丰富"; + return "鍛ㄨ竟鍏叡鎴栧晢涓氶厤濂楅潪甯告垚鐔燂紝瀹㈡簮涓板瘜"; case 10: - return "周边公共或商业配套非常成熟,客源丰富"; + return "鍛ㄨ竟鍏叡鎴栧晢涓氶厤濂楅潪甯告垚鐔燂紝瀹㈡簮涓板瘜"; default: return ""; } } /** - * 人口指数--居民人口 + * 浜哄彛鎸囨暟--灞呮皯浜哄彛 */ @Deprecated public static double peopleScore1(double density) { @@ -810,56 +810,56 @@ public class ShopScoreUtil { } /** - * 计算居民人口密度得分 + * 璁$畻灞呮皯浜哄彛瀵嗗害寰楀垎 * @author yinjihuan * @date 2016-03-04 - * @param density 居民人口密度 - * @return 居民人口密度得分 + * @param density 灞呮皯浜哄彛瀵嗗害 + * @return 灞呮皯浜哄彛瀵嗗害寰楀垎 */ public static double calcPeopleDensityScore(double density) { - /*居民人口密度得分规则如下: - 10 10*市均人口密度 < 居民人口密度 - 9 9*市均人口密度 < 居民人口密度 <= 10*市均人口密度 - 8 8*市均人口密度 < 居民人口密度 <= 9*市均人口密度 - 7 7*市均人口密度 < 居民人口密度 <= 8*市均人口密度 - 6 6*市均人口密度 < 居民人口密度 <= 7*市均人口密度 - 5 4*市均人口密度 < 居民人口密度 <= 6*市均人口密度 - 4 2*市均人口密度 < 居民人口密度 <= 4*市均人口密度 - 3 1*市均人口密度 < 居民人口密度 <= 2*市均人口密度 - 2 0.5*市均人口密度 < 居民人口密度 <= 1*市均人口密度 - 1 居民人口密度 <= 0.5*市均人口密度 */ + /*灞呮皯浜哄彛瀵嗗害寰楀垎瑙勫垯濡備笅锛� + 10 10*甯傚潎浜哄彛瀵嗗害 < 灞呮皯浜哄彛瀵嗗害 + 9 9*甯傚潎浜哄彛瀵嗗害 < 灞呮皯浜哄彛瀵嗗害 <= 10*甯傚潎浜哄彛瀵嗗害 + 8 8*甯傚潎浜哄彛瀵嗗害 < 灞呮皯浜哄彛瀵嗗害 <= 9*甯傚潎浜哄彛瀵嗗害 + 7 7*甯傚潎浜哄彛瀵嗗害 < 灞呮皯浜哄彛瀵嗗害 <= 8*甯傚潎浜哄彛瀵嗗害 + 6 6*甯傚潎浜哄彛瀵嗗害 < 灞呮皯浜哄彛瀵嗗害 <= 7*甯傚潎浜哄彛瀵嗗害 + 5 4*甯傚潎浜哄彛瀵嗗害 < 灞呮皯浜哄彛瀵嗗害 <= 6*甯傚潎浜哄彛瀵嗗害 + 4 2*甯傚潎浜哄彛瀵嗗害 < 灞呮皯浜哄彛瀵嗗害 <= 4*甯傚潎浜哄彛瀵嗗害 + 3 1*甯傚潎浜哄彛瀵嗗害 < 灞呮皯浜哄彛瀵嗗害 <= 2*甯傚潎浜哄彛瀵嗗害 + 2 0.5*甯傚潎浜哄彛瀵嗗害 < 灞呮皯浜哄彛瀵嗗害 <= 1*甯傚潎浜哄彛瀵嗗害 + 1 灞呮皯浜哄彛瀵嗗害 <= 0.5*甯傚潎浜哄彛瀵嗗害 */ return doCalcDensityScore(density, CITY_AVG_HOUSE_DENSITY); } /** - * 计算办公人口密度得分 + * 璁$畻鍔炲叕浜哄彛瀵嗗害寰楀垎 * @author yinjihuan * @date 2016-03-04 - * @param density 办公人口密度 - * @return 居民人口密度得分 + * @param density 鍔炲叕浜哄彛瀵嗗害 + * @return 灞呮皯浜哄彛瀵嗗害寰楀垎 */ public static double calcOfficeDensityScore(double density) { - /*办公人口密度计算规则如下: - 10 10*市均办公人口密度 < 办公人口密度 - 9 9*市均办公人口密度 < 办公人口密度 <= 10*市均办公人口密度 - 8 8*市均办公人口密度 < 办公人口密度 <= 9*市均办公人口密度 - 7 7*市均办公人口密度 < 办公人口密度 <= 8*市均办公人口密度 - 6 6*市均办公人口密度 < 办公人口密度 <= 7*市均办公人口密度 - 5 4*市均办公人口密度 < 办公人口密度 <= 6*市均办公人口密度 - 4 2*市均办公人口密度 < 办公人口密度 <= 4*市均办公人口密度 - 3 1*市均办公人口密度 < 办公人口密度 <= 2*市均办公人口密度 - 2 0.5*市均办公人口密度 < 办公人口密度 <= 1*市均办公人口密度 - 1 办公人口密度 <= 0.5*市均办公人口密度 */ + /*鍔炲叕浜哄彛瀵嗗害璁$畻瑙勫垯濡備笅锛� + 10 10*甯傚潎鍔炲叕浜哄彛瀵嗗害 < 鍔炲叕浜哄彛瀵嗗害 + 9 9*甯傚潎鍔炲叕浜哄彛瀵嗗害 < 鍔炲叕浜哄彛瀵嗗害 <= 10*甯傚潎鍔炲叕浜哄彛瀵嗗害 + 8 8*甯傚潎鍔炲叕浜哄彛瀵嗗害 < 鍔炲叕浜哄彛瀵嗗害 <= 9*甯傚潎鍔炲叕浜哄彛瀵嗗害 + 7 7*甯傚潎鍔炲叕浜哄彛瀵嗗害 < 鍔炲叕浜哄彛瀵嗗害 <= 8*甯傚潎鍔炲叕浜哄彛瀵嗗害 + 6 6*甯傚潎鍔炲叕浜哄彛瀵嗗害 < 鍔炲叕浜哄彛瀵嗗害 <= 7*甯傚潎鍔炲叕浜哄彛瀵嗗害 + 5 4*甯傚潎鍔炲叕浜哄彛瀵嗗害 < 鍔炲叕浜哄彛瀵嗗害 <= 6*甯傚潎鍔炲叕浜哄彛瀵嗗害 + 4 2*甯傚潎鍔炲叕浜哄彛瀵嗗害 < 鍔炲叕浜哄彛瀵嗗害 <= 4*甯傚潎鍔炲叕浜哄彛瀵嗗害 + 3 1*甯傚潎鍔炲叕浜哄彛瀵嗗害 < 鍔炲叕浜哄彛瀵嗗害 <= 2*甯傚潎鍔炲叕浜哄彛瀵嗗害 + 2 0.5*甯傚潎鍔炲叕浜哄彛瀵嗗害 < 鍔炲叕浜哄彛瀵嗗害 <= 1*甯傚潎鍔炲叕浜哄彛瀵嗗害 + 1 鍔炲叕浜哄彛瀵嗗害 <= 0.5*甯傚潎鍔炲叕浜哄彛瀵嗗害 */ return doCalcDensityScore(density, CITY_AVG_OFFICE_DENSITY); } /** - * 计算密度得分 - * @param density 密度 - * @param cityAvgDensity 市平均密度 + * 璁$畻瀵嗗害寰楀垎 + * @param density 瀵嗗害 + * @param cityAvgDensity 甯傚钩鍧囧瘑搴� * @return */ private static double doCalcDensityScore(double density, double cityAvgDensity) { @@ -917,7 +917,7 @@ public class ShopScoreUtil { } /** - * 人口指数--办公人口 + * 浜哄彛鎸囨暟--鍔炲叕浜哄彛 */ @Deprecated public static double peopleScore2(double density) { @@ -991,25 +991,25 @@ public class ShopScoreUtil { int s = (int) score; switch (s) { case 1: - return "人流量稀少"; + return "浜烘祦閲忕█灏�"; case 2: - return "人流量稀少"; + return "浜烘祦閲忕█灏�"; case 3: - return "人流量较少"; + return "浜烘祦閲忚緝灏�"; case 4: - return "人流量较少"; + return "浜烘祦閲忚緝灏�"; case 5: - return "人流量一般"; + return "浜烘祦閲忎竴鑸�"; case 6: - return "人流量一般"; + return "浜烘祦閲忎竴鑸�"; case 7: - return "人流量较大"; + return "浜烘祦閲忚緝澶�"; case 8: - return "人流量较大"; + return "浜烘祦閲忚緝澶�"; case 9: - return "人流量庞大"; + return "浜烘祦閲忓簽澶�"; case 10: - return "人流量庞大"; + return "浜烘祦閲忓簽澶�"; default: return ""; } diff --git a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/util/Test.java b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/util/Test.java index ef3280621..2aa45e728 100644 --- a/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/util/Test.java +++ b/projects/chafangtong2/src/main/java/com/fangjia/chafangtong/util/Test.java @@ -21,17 +21,17 @@ public class Test { g2d.dispose(); g2d = image.createGraphics(); g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); - g2d.setColor(new Color(178,178,178));//改变扇形颜色 + g2d.setColor(new Color(178,178,178));//鏀瑰彉鎵囧舰棰滆壊 g2d.fillArc(0,0,400,400,90,360); - g2d.setColor(new Color(0,115,230));//改变扇形颜色 + g2d.setColor(new Color(0,115,230));//鏀瑰彉鎵囧舰棰滆壊 g2d.fillArc(0,0,400,400,90,180); - g2d.setColor(new Color(229,229,229));//改变扇形颜色 + g2d.setColor(new Color(229,229,229));//鏀瑰彉鎵囧舰棰滆壊 g2d.fillArc(40,40,320,320,90,360); g2d.setColor(new Color(0,115,230)); - g2d.setFont(new Font("宋体",Font.BOLD,120)); - g2d.drawString("4分",126,250); + g2d.setFont(new Font("瀹嬩綋",Font.BOLD,120)); + g2d.drawString("4鍒�",126,250); g2d.dispose(); ImageIO.write(image, "png", new File("D:/test.png")); } diff --git a/projects/fangjia-auto/src/main/java/com/fangjia/auto/controllers/AutoController.java b/projects/fangjia-auto/src/main/java/com/fangjia/auto/controllers/AutoController.java index d8f8fabc5..5fce22501 100644 --- a/projects/fangjia-auto/src/main/java/com/fangjia/auto/controllers/AutoController.java +++ b/projects/fangjia-auto/src/main/java/com/fangjia/auto/controllers/AutoController.java @@ -14,7 +14,7 @@ import com.fangjia.auto.service.AutocompleteService; import com.fangjia.core.util.DataUtil; /** - * 自动完成接口 + * 鑷姩瀹屾垚鎺ュ彛 * * @author dxy * @deprecated instead of {@link AutocompleteController} @@ -22,7 +22,7 @@ import com.fangjia.core.util.DataUtil; */ public class AutoController { /** - * 自动完成 + * 鑷姩瀹屾垚 * * @deprecated * @param model @@ -40,7 +40,7 @@ public class AutoController { DataUtil.escapeSolr(model.getQ()), (model.getLimit() > 100 || model.getLimit() <= 0 ? 10 : model.getLimit())); /** - * 该方法以及过期,这个地方仅仅是为了兼容老版本 + * 璇ユ柟娉曚互鍙婅繃鏈燂紝杩欎釜鍦版柟浠呬粎鏄负浜嗗吋瀹硅�佺増鏈� */ List> suggestList = new ArrayList>(); for (Map obj : list) { @@ -63,7 +63,7 @@ public class AutoController { } /** - * 输入纠错 + * 杈撳叆绾犻敊 * * @deprecated * @param model diff --git a/projects/fangjia-auto/src/main/java/com/fangjia/auto/controllers/AutocompleteController.java b/projects/fangjia-auto/src/main/java/com/fangjia/auto/controllers/AutocompleteController.java index 6861f040f..f264d00a0 100644 --- a/projects/fangjia-auto/src/main/java/com/fangjia/auto/controllers/AutocompleteController.java +++ b/projects/fangjia-auto/src/main/java/com/fangjia/auto/controllers/AutocompleteController.java @@ -9,7 +9,7 @@ import com.fangjia.auto.service.AutocompleteService; import com.fangjia.core.util.DataUtil; /** - * 新自动完成接口 + * 鏂拌嚜鍔ㄥ畬鎴愭帴鍙� * * @author dxy * @@ -17,7 +17,7 @@ import com.fangjia.core.util.DataUtil; public class AutocompleteController { /** - * 自动完成 + * 鑷姩瀹屾垚 * * @param model * @return @@ -34,7 +34,7 @@ public class AutocompleteController { } /** - * 输入纠错 + * 杈撳叆绾犻敊 * * @param model * @return diff --git a/projects/fangjia-auto/src/main/java/com/fangjia/auto/model/RestfulModelAndView.java b/projects/fangjia-auto/src/main/java/com/fangjia/auto/model/RestfulModelAndView.java index 9d4316784..fc45ed6c4 100644 --- a/projects/fangjia-auto/src/main/java/com/fangjia/auto/model/RestfulModelAndView.java +++ b/projects/fangjia-auto/src/main/java/com/fangjia/auto/model/RestfulModelAndView.java @@ -3,7 +3,7 @@ package com.fangjia.auto.model; import org.sothis.web.mvc.ModelAndViewSupport; /** - * 用于restAPI的ModelAndView + * 鐢ㄤ簬restAPI鐨凪odelAndView * * @author velna * diff --git a/projects/fangjia-auto/src/main/java/com/fangjia/auto/service/AutocompleteService.java b/projects/fangjia-auto/src/main/java/com/fangjia/auto/service/AutocompleteService.java index b0a092189..54c65112a 100644 --- a/projects/fangjia-auto/src/main/java/com/fangjia/auto/service/AutocompleteService.java +++ b/projects/fangjia-auto/src/main/java/com/fangjia/auto/service/AutocompleteService.java @@ -79,13 +79,13 @@ public class AutocompleteService { } /** - * 自动完成 + * 鑷姩瀹屾垚 * * @param cat * @param city * @param keyword * @param limit - * @param isDupl 默认不重复 + * @param isDupl 榛樿涓嶉噸澶� * @return */ @SuppressWarnings("unchecked") @@ -168,7 +168,7 @@ public class AutocompleteService { } /** - * 输入纠错 + * 杈撳叆绾犻敊 * * @param cat * @param type diff --git a/projects/fangjia-bkoff/src/main/java/AddressModel/AveragerConfigModel.java b/projects/fangjia-bkoff/src/main/java/AddressModel/AveragerConfigModel.java index 6e462bda7..78ee18476 100644 --- a/projects/fangjia-bkoff/src/main/java/AddressModel/AveragerConfigModel.java +++ b/projects/fangjia-bkoff/src/main/java/AddressModel/AveragerConfigModel.java @@ -16,23 +16,23 @@ public class AveragerConfigModel extends BaseModel { private String display; private String region; private String name; - private Integer status; // 0-正常 1-禁用 - private Integer sampleFetchCount; // 样本获取数量 - private Integer sampleMaxValue; // 样本允许最大值 - private Integer sampleMinValue; // 样本允许最小值 - private Integer ownTypeLimit; // 自身样本计算的最低要求 - private Integer sampleQueueStart; // 样本队列取值区间最小值 - private Integer sampleQueueEnd; // 样本队列取值区间最大值 + private Integer status; // 0-姝e父 1-绂佺敤 + private Integer sampleFetchCount; // 鏍锋湰鑾峰彇鏁伴噺 + private Integer sampleMaxValue; // 鏍锋湰鍏佽鏈�澶у�� + private Integer sampleMinValue; // 鏍锋湰鍏佽鏈�灏忓�� + private Integer ownTypeLimit; // 鑷韩鏍锋湰璁$畻鐨勬渶浣庤姹� + private Integer sampleQueueStart; // 鏍锋湰闃熷垪鍙栧�煎尯闂存渶灏忓�� + private Integer sampleQueueEnd; // 鏍锋湰闃熷垪鍙栧�煎尯闂存渶澶у�� - private Integer aroundRadius; // 周边最大半径 - private Integer aroundLimit; // 周边小区最大数量限制 - private Integer valueCluType; //类簇的用值类型 0-默认 1-中位数 2-最大值 3-最小值 + private Integer aroundRadius; // 鍛ㄨ竟鏈�澶у崐寰� + private Integer aroundLimit; // 鍛ㄨ竟灏忓尯鏈�澶ф暟閲忛檺鍒� + private Integer valueCluType; //绫荤皣鐨勭敤鍊肩被鍨� 0-榛樿 1-涓綅鏁� 2-鏈�澶у�� 3-鏈�灏忓�� - private Integer aroundDiffMinPercent; //样本与周边对比的最小相差比例 - private Integer aroundDiffMaxPercent; //样本与周边对比的最大相差比例 - private Integer guidingPriceExpirationDay; //指导价过期天数 - private Integer uncomforableSampleDay; //样本换算需要间隔时间 - private Integer masterIntervenePercent; //主小区影响从小区可信度衰减比例 + private Integer aroundDiffMinPercent; //鏍锋湰涓庡懆杈瑰姣旂殑鏈�灏忕浉宸瘮渚� + private Integer aroundDiffMaxPercent; //鏍锋湰涓庡懆杈瑰姣旂殑鏈�澶х浉宸瘮渚� + private Integer guidingPriceExpirationDay; //鎸囧浠疯繃鏈熷ぉ鏁� + private Integer uncomforableSampleDay; //鏍锋湰鎹㈢畻闇�瑕侀棿闅旀椂闂� + private Integer masterIntervenePercent; //涓诲皬鍖哄奖鍝嶄粠灏忓尯鍙俊搴﹁“鍑忔瘮渚� private Integer time; private String site; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/AdController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/AdController.java index c9d05ec26..b17b5c4c0 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/AdController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/AdController.java @@ -58,12 +58,12 @@ public class AdController { } else { adSpace.setCity("all"); } - if (StringUtils.isNotBlank(model.getPageId()) && model.getPageId().equals("全国首页")) { + if (StringUtils.isNotBlank(model.getPageId()) && model.getPageId().equals("鍏ㄥ浗棣栭〉")) { adSpace.setCity("all"); } adSpaceService.saveOrUpdate(adSpace); BeanUtils.copyProperties(adSpace, model); - model.flash().setAttribute("message", StringUtils.isBlank(model.getId()) ? "添加成功" : "修改成功"); + model.flash().setAttribute("message", StringUtils.isBlank(model.getId()) ? "娣诲姞鎴愬姛" : "淇敼鎴愬姛"); return model.redirect("show?id=" + adSpace.getId()); } else if (StringUtils.isNotBlank(model.getId())) { AdSpace adSpace = adSpaceService.findAdSpaceById(model.getId()); @@ -108,38 +108,38 @@ public class AdController { } try { - // 发邮件给用户 + // 鍙戦偖浠剁粰鐢ㄦ埛 Mail mail = new Mail(); mail.setReceiver(new MailUser(cpdbApp.getEmail())); - mail.setSubject("房价网—中国不动产大数据库CPDB演示"); + mail.setSubject("鎴夸环缃戔�斾腑鍥戒笉鍔ㄤ骇澶ф暟鎹簱CPDB婕旂ず"); StringBuffer emailMsg = new StringBuffer(); - emailMsg.append("尊敬的用户:

") - .append("  感谢您申请房价网的房价数据测试平台免费试用账号!

") - .append("  您现在可以在48小时内免费体验房价数据测试平台的所有功能了!

") - .append("  登陆链接:房价数据测试平台
") - .append("  用户名:") + emailMsg.append("灏婃暚鐨勭敤鎴凤細

") + .append("  鎰熻阿鎮ㄧ敵璇锋埧浠风綉鐨�鎴夸环鏁版嵁娴嬭瘯骞冲彴鍏嶈垂璇曠敤璐﹀彿锛�

") + .append("  鎮ㄧ幇鍦ㄥ彲浠ュ湪48灏忔椂鍐呭厤璐逛綋楠�鎴夸环鏁版嵁娴嬭瘯骞冲彴鐨勬墍鏈夊姛鑳戒簡!

") + .append("  鐧婚檰閾炬帴锛�鎴夸环鏁版嵁娴嬭瘯骞冲彴
") + .append("  鐢ㄦ埛鍚嶏細") .append(cpdbApp.getEmail()) .append("
") - .append("  密码:") + .append("  瀵嗙爜锛�") .append(fjtuser.getPassword()) .append("

") - .append("  由于该账号为限时使用,所以请尽快开始使用。

") - .append("  房价数据测试平台是凭借中国不动产大数据库CPDB的基础上,整合优势力量,推出的测试平台。

") - .append("  CPDB大数据库包括") - .append("  
  • 住宅物业的实时挂牌价格、成交参考、房源、楼盘详情、照片、地图
  • ") - .append("  
  • 商业地产的均价、详情、消费分析、竞争对手情报
  • ") - .append("  
  • 城市行情、历史数据等

") - .append("  CPDB(China Property Data Base)是由房价网通过10年积累和国际领先的专利技术(OLKD),打造的精确到每一户房产微观数据的“中国不动产大数据库”。
") - .append("  CPDB的数据覆盖全国100个城市、15万楼盘,拥有5000万套房产的个性化微观数据,革命性的实现了“一户一信息”,是目前中国最大、最专业、最实时的不动产微观数据库。

") - .append("  关于中国不动产大数据库CPDB的更多相关内容,您可以通过附件中的PPT演示文稿更全面的了解。

") - .append("  您可以将此封邮件转发给其他用到不动产大数据库的伙伴,比如银行、电商平台、贷款公司、评估机构、房地产营销机构、软件公司、金融类网站等等,相信给会他们带来极大帮助。

") - .append("  如有任何疑问,欢迎您致电客服电话:021-6239 2522。

").append("  谢谢您。

") - .append("  祝您生活愉快,工作顺利。"); + .append("  鐢变簬璇ヨ处鍙蜂负闄愭椂浣跨敤锛屾墍浠ヨ灏藉揩寮�濮嬩娇鐢ㄣ��

") + .append("  鎴夸环鏁版嵁娴嬭瘯骞冲彴鏄嚟鍊�涓浗涓嶅姩浜уぇ鏁版嵁搴揅PDB鐨勫熀纭�涓婏紝鏁村悎浼樺娍鍔涢噺锛屾帹鍑虹殑娴嬭瘯骞冲彴銆�

") + .append("  CPDB澶ф暟鎹簱鍖呮嫭") + .append("  
  • 浣忓畢鐗╀笟鐨勫疄鏃舵寕鐗屼环鏍笺�佹垚浜ゅ弬鑰冦�佹埧婧愩�佹ゼ鐩樿鎯呫�佺収鐗囥�佸湴鍥�
  • ") + .append("  
  • 鍟嗕笟鍦颁骇鐨勫潎浠枫�佽鎯呫�佹秷璐瑰垎鏋愩�佺珵浜夊鎵嬫儏鎶�
  • ") + .append("  
  • 鍩庡競琛屾儏銆佸巻鍙叉暟鎹瓑

") + .append("  CPDB锛圕hina Property Data Base锛夋槸鐢辨埧浠风綉閫氳繃10骞寸Н绱�鍜屽浗闄呴鍏堢殑涓撳埄鎶�鏈�锛圤LKD锛夛紝鎵撻�犵殑绮剧‘鍒版瘡涓�鎴锋埧浜у井瑙傛暟鎹殑鈥滀腑鍥戒笉鍔ㄤ骇澶ф暟鎹簱鈥濄��
") + .append("  CPDB鐨勬暟鎹鐩栧叏鍥�100涓�鍩庡競銆�15涓�妤肩洏锛屾嫢鏈�5000涓囧鎴夸骇鐨勪釜鎬у寲寰鏁版嵁锛岄潻鍛芥�х殑瀹炵幇浜嗏��涓�鎴蜂竴淇℃伅鈥濓紝鏄洰鍓嶄腑鍥芥渶澶с�佹渶涓撲笟銆佹渶瀹炴椂鐨勪笉鍔ㄤ骇寰鏁版嵁搴撱��

") + .append("  鍏充簬涓浗涓嶅姩浜уぇ鏁版嵁搴揅PDB鐨勬洿澶氱浉鍏冲唴瀹癸紝鎮ㄥ彲浠ラ�氳繃闄勪欢涓殑PPT婕旂ず鏂囩ǹ鏇村叏闈㈢殑浜嗚В銆�

") + .append("  鎮ㄥ彲浠ュ皢姝ゅ皝閭欢杞彂缁欏叾浠栫敤鍒颁笉鍔ㄤ骇澶ф暟鎹簱鐨勪紮浼达紝姣斿閾惰銆佺數鍟嗗钩鍙般�佽捶娆惧叕鍙搞�佽瘎浼版満鏋勩�佹埧鍦颁骇钀ラ攢鏈烘瀯銆佽蒋浠跺叕鍙搞�侀噾铻嶇被缃戠珯绛夌瓑锛岀浉淇$粰浼氫粬浠甫鏉ユ瀬澶у府鍔┿��

") + .append("  濡傛湁浠讳綍鐤戦棶锛屾杩庢偍鑷寸數瀹㈡湇鐢佃瘽锛�021-6239 2522銆�

").append("  璋㈣阿鎮ㄣ��

") + .append("  绁濇偍鐢熸椿鎰夊揩锛屽伐浣滈『鍒┿��"); mail.setContent(emailMsg.toString()); mail.setImportant(true); mail.setAttachment(true); - mail.setAttachmentDes("CPDB大数据库示例"); - mail.setAttachmentName("CPDB大数据库示例.pptx"); + mail.setAttachmentDes("CPDB澶ф暟鎹簱绀轰緥"); + mail.setAttachmentName("CPDB澶ф暟鎹簱绀轰緥.pptx"); mail.setAttachmentUrl("http://static.fangjia.com/res/static_logo/CPDB.pptx"); emailService.sendHtmlMailWithFile(mail); @@ -179,17 +179,17 @@ public class AdController { private Map getPositionMap() { Map positionMap = new ListOrderedMap(); - positionMap.put("header;right;top", "头部右上"); - positionMap.put("header;center;middle", "头部居中"); - positionMap.put("body;right;top", "体部右上"); - positionMap.put("body;right;middle", "体部右中"); - positionMap.put("body;right;down", "体部右下"); - positionMap.put("body;center;top", "体部中上"); - positionMap.put("body;center;middle", "体部居中"); - positionMap.put("body;center;down", "体部中下"); - positionMap.put("footer;center;middle", "底部居中"); - positionMap.put("side;left;middle", "对联左中"); - positionMap.put("side;right;middle", "对联右中"); + positionMap.put("header;right;top", "澶撮儴鍙充笂"); + positionMap.put("header;center;middle", "澶撮儴灞呬腑"); + positionMap.put("body;right;top", "浣撻儴鍙充笂"); + positionMap.put("body;right;middle", "浣撻儴鍙充腑"); + positionMap.put("body;right;down", "浣撻儴鍙充笅"); + positionMap.put("body;center;top", "浣撻儴涓笂"); + positionMap.put("body;center;middle", "浣撻儴灞呬腑"); + positionMap.put("body;center;down", "浣撻儴涓笅"); + positionMap.put("footer;center;middle", "搴曢儴灞呬腑"); + positionMap.put("side;left;middle", "瀵硅仈宸︿腑"); + positionMap.put("side;right;middle", "瀵硅仈鍙充腑"); return positionMap; } diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/AddressAnalyController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/AddressAnalyController.java index b4672db16..ddf80cb2a 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/AddressAnalyController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/AddressAnalyController.java @@ -110,9 +110,9 @@ public class AddressAnalyController { OutputStream os = null; BufferedOutputStream fos = null; - if(model.getType().equals("风控")){ + if(model.getType().equals("椋庢帶")){ - titles = new String[]{"城市","地址", "面积", "贷款余额", "房价总价","区域","近12月涨幅","CLTV值","物业类型"}; + titles = new String[]{"鍩庡競","鍦板潃", "闈㈢Н", "璐锋浣欓", "鎴夸环鎬讳环","鍖哄煙","杩�12鏈堟定骞�","CLTV鍊�","鐗╀笟绫诲瀷"}; for (AddressDetail detail : addressDetails) { AddressAnalyticsResult analy = resultMap.get(detail.getNumber()); if(analy == null){ @@ -128,9 +128,9 @@ public class AddressAnalyController { } } - }else if(model.getType().equals("营销")){ + }else if(model.getType().equals("钀ラ攢")){ - titles = new String[]{"城市","地址", "面积", "贷款余额", "房价总价","区域","近12月涨幅","物业类型"}; + titles = new String[]{"鍩庡競","鍦板潃", "闈㈢Н", "璐锋浣欓", "鎴夸环鎬讳环","鍖哄煙","杩�12鏈堟定骞�","鐗╀笟绫诲瀷"}; for (AddressDetail detail : addressDetails) { AddressAnalyticsResult analy = resultMap.get(detail.getNumber()); if(analy == null){ @@ -148,14 +148,14 @@ public class AddressAnalyController { try { HttpServletResponse response = ActionContext.getContext().getResponse(); response.setCharacterEncoding("UTF-8"); - //response.reset();// 清空输出流 + //response.reset();// 娓呯┖杈撳嚭娴� response.setContentType("application/x-download;charset=UTF-8"); fileName = new String(fileName.getBytes("GBK"),"ISO-8859-1"); - if(fileName.length()>150){//解决IE 6.0 bug + if(fileName.length()>150){//瑙e喅IE 6.0 bug fileName = new String(fileName.getBytes("GBK"),"ISO-8859-1"); } response.setHeader( "Content-Disposition", "attachment;filename=" + fileName); - os = response.getOutputStream();// 取得输出流 + os = response.getOutputStream();// 鍙栧緱杈撳嚭娴� wb.write(os); os.flush(); } catch (Exception e) { diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/AddressController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/AddressController.java index 660e50a4a..bc5fcfd2a 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/AddressController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/AddressController.java @@ -69,7 +69,7 @@ public class AddressController { model.setSearchFlag(1); } if(model.getSource() == null){ - model.setSource("房价通"); + model.setSource("鎴夸环閫�"); } pager.setTotalRows((int) addressMatchLogService.findAddressMathLogCount(model.getCityDisplay(), model.getSource(), model.getStatus(), model.getSearchFlag(), model.getCompany(),model.getEmail(),model.getStartDate(),model.getEndDate())); List logs= addressMatchLogService.findAddressMathLog(model.getCityDisplay(), model.getSource(), model.getStatus(), model.getSearchFlag(),model.getCompany(), model.getEmail(),model.getStartDate(),model.getEndDate(), pager.getStartRow(), pager.getPageSize()); @@ -80,9 +80,9 @@ public class AddressController { if(StringUtils.isBlank(log.getUserName())){ continue; } - if("房价通".equals(log.getSource())&&!fjtEmails.contains(log.getUserName())){ + if("鎴夸环閫�".equals(log.getSource())&&!fjtEmails.contains(log.getUserName())){ fjtEmails.add(log.getUserName()); - }else if("房评卡".equals(log.getSource()) && !fpkUserNames.contains(log.getUserName())){ + }else if("鎴胯瘎鍗�".equals(log.getSource()) && !fpkUserNames.contains(log.getUserName())){ fpkUserNames.add(log.getUserName()); }else if("API".equals(log.getSource()) && !apiUserNames.contains(log.getUserName())){ apiUserNames.add(log.getUserName()); @@ -98,7 +98,7 @@ public class AddressController { } Map idToCompanyName = usersDetailService.findCompanyNameByIds(new ArrayList(idToEmail.keySet())); for(AddressMatchLog log:logs){ - if("房价通".equals(log.getSource())){ + if("鎴夸环閫�".equals(log.getSource())){ Long id = emailToId.get(log.getUserName()); if(id != null){ log.setCompanyName(idToCompanyName.get(id)); @@ -109,7 +109,7 @@ public class AddressController { if(fpkUserNames.size() > 0){ Map userNameToCompanyName = fpkUsersService.findCompanyNameByUserNames(fpkUserNames); for(AddressMatchLog log:logs){ - if("房评卡".equals(log.getSource())){ + if("鎴胯瘎鍗�".equals(log.getSource())){ log.setCompanyName(userNameToCompanyName.get(log.getUserName())); } } @@ -129,11 +129,11 @@ public class AddressController { public Object loadCompanyAction(AddressModel addressModel){ JsonModel jsonModel = new JsonModel(); Map data = new HashMap(); - if("房价通".equals(addressModel.getSource())){ + if("鎴夸环閫�".equals(addressModel.getSource())){ data.put("companyList",usersDetailService.findAllCompanyName(addressModel.getKeyword())); }else if("API".equals(addressModel.getSource())){ data.put("companyList",apiUserService.findAllCompanyName(addressModel.getKeyword())); - }else if("房评卡".equals(addressModel.getSource())){ + }else if("鎴胯瘎鍗�".equals(addressModel.getSource())){ data.put("companyList",fpkUsersService.findAllCompanyName(addressModel.getKeyword())); } @@ -166,11 +166,11 @@ public class AddressController { params.add(new QueryParam("city", model.getCityDisplay())); params.add(new QueryParam("name", model.getArtificialMatch())); String cat = ""; - if(model.getArtificialMatchStatus().equals("住宅")){ + if(model.getArtificialMatchStatus().equals("浣忓畢")){ cat = "district"; - }else if(model.getArtificialMatchStatus().equals("商铺")){ + }else if(model.getArtificialMatchStatus().equals("鍟嗛摵")){ cat = "shop"; - }else if(model.getArtificialMatchStatus().equals("写字楼")){ + }else if(model.getArtificialMatchStatus().equals("鍐欏瓧妤�")){ cat = "office"; } params.add(new QueryParam("category", cat)); @@ -197,9 +197,9 @@ public class AddressController { if(ailas.contains(model.getAlias())){ if(way == 1){ - errMap.put("msg", "【"+model.getArtificialMatch() + "】在名称别名中已存在!"); + errMap.put("msg", "銆�"+model.getArtificialMatch() + "銆戝湪鍚嶇О鍒悕涓凡瀛樺湪锛�"); }else{ - errMap.put("msg", "【"+model.getArtificialMatch() + "】在地址别名中已存在!"); + errMap.put("msg", "銆�"+model.getArtificialMatch() + "銆戝湪鍦板潃鍒悕涓凡瀛樺湪锛�"); } errMap.put("trId", model.getId()); }else{ @@ -214,9 +214,9 @@ public class AddressController { } }else{ if(districts != null && districts.size() > 1){ - errMap.put("msg", "【"+model.getCityDisplay()+"】【"+model.getArtificialMatchStatus()+"】【"+model.getArtificialMatch() + "】在数据库中有多个,请确定唯一!"); + errMap.put("msg", "銆�"+model.getCityDisplay()+"銆戙��"+model.getArtificialMatchStatus()+"銆戙��"+model.getArtificialMatch() + "銆戝湪鏁版嵁搴撲腑鏈夊涓紝璇风‘瀹氬敮涓�锛�"); }else{ - errMap.put("msg", "没有找到【"+model.getCityDisplay()+"】【"+model.getArtificialMatchStatus()+"】【"+model.getArtificialMatch() + "】"); + errMap.put("msg", "娌℃湁鎵惧埌銆�"+model.getCityDisplay()+"銆戙��"+model.getArtificialMatchStatus()+"銆戙��"+model.getArtificialMatch() + "銆�"); } } } @@ -291,15 +291,15 @@ public class AddressController { model.setViewType("json"); String cat = ""; if(StringUtils.isNotBlank(model.getCategory())){ - if(model.getCategory().equals("住宅")){ + if(model.getCategory().equals("浣忓畢")){ cat = "district"; - }else if(model.getCategory().equals("商铺")){ + }else if(model.getCategory().equals("鍟嗛摵")){ cat = "shop"; - }else if(model.getCategory().equals("写字楼")){ + }else if(model.getCategory().equals("鍐欏瓧妤�")){ cat = "office"; } }else{ - model.setMsg("类型不能为空!"); + model.setMsg("绫诲瀷涓嶈兘涓虹┖锛�"); return model; } List params = new ArrayList(); @@ -310,7 +310,7 @@ public class AddressController { List districts = districtService.findAllByParams(params); if(districts.size() > 0){ - model.setMsg( model.getName()+" 已存在!"); + model.setMsg( model.getName()+" 宸插瓨鍦紒"); return model; } District district = new District(); @@ -368,16 +368,16 @@ public class AddressController { model.setSearchFlag(1); } if(model.getSource() == null){ - model.setSource("房价通"); + model.setSource("鎴夸环閫�"); } List logs= addressMatchLogService.findAddressMathLog(model.getCityDisplay(), model.getSource(), model.getStatus(), model.getSearchFlag(),model.getCompany(), model.getEmail(),model.getStartDate(),model.getEndDate()); OutputStream os = null; BufferedOutputStream fos = null; - String[] columns = {"城市","用户输入","来源","公司","技术匹配","技术匹配结果","搜索结果","记录时间"}; + String[] columns = {"鍩庡競","鐢ㄦ埛杈撳叆","鏉ユ簮","鍏徃","鎶�鏈尮閰�","鎶�鏈尮閰嶇粨鏋�","鎼滅储缁撴灉","璁板綍鏃堕棿"}; HSSFWorkbook wb= new HSSFWorkbook(); - Sheet sheet = wb.createSheet("地址匹配"); + Sheet sheet = wb.createSheet("鍦板潃鍖归厤"); Row row = sheet.createRow(0); for(int i =0 ;i < columns.length ; i++){ row.createCell(i).setCellValue(columns[i]); @@ -407,20 +407,20 @@ public class AddressController { } row.createCell(5).setCellValue(names); row.createCell(6).setCellValue(log.getSearchCount()>0?"Yes":"No"); - row.createCell(7).setCellValue(DateUtil.formatByPattern(log.getCreationDate(), "yyyy年MM月dd日")); + row.createCell(7).setCellValue(DateUtil.formatByPattern(log.getCreationDate(), "yyyy骞碝M鏈坉d鏃�")); } - String fileName = "地址匹配" + "(" + DateUtil.formatByPattern(new Date(), "yyyyMMddHHmmss") + ").xls"; + String fileName = "鍦板潃鍖归厤" + "(" + DateUtil.formatByPattern(new Date(), "yyyyMMddHHmmss") + ").xls"; try { HttpServletResponse response = ActionContext.getContext().getResponse(); response.setCharacterEncoding("UTF-8"); - //response.reset();// 清空输出流 + //response.reset();// 娓呯┖杈撳嚭娴� response.setContentType("application/x-download;charset=UTF-8"); fileName = new String(fileName.getBytes("GBK"),"ISO-8859-1"); - if(fileName.length()>150){//解决IE 6.0 bug + if(fileName.length()>150){//瑙e喅IE 6.0 bug fileName = new String(fileName.getBytes("GBK"),"ISO-8859-1"); } response.setHeader( "Content-Disposition", "attachment;filename=" + fileName); - os = response.getOutputStream();// 取得输出流 + os = response.getOutputStream();// 鍙栧緱杈撳嚭娴� wb.write(os); os.flush(); }catch (Exception e) { diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/AddressMatchController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/AddressMatchController.java index d74a68186..8fec72438 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/AddressMatchController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/AddressMatchController.java @@ -52,17 +52,17 @@ public class AddressMatchController { private FpkUsersService fpkUsersService; private DistrictService districtService; private static final Map HUMAN_MATCH_STATUS = new HashMap(){{ - put(-2,"系统匹配错误"); - put(-1,"输入无效"); - put(0,"人工匹配失败"); - put(1,"CPDB库新增"); - put(2,"CPDB库存在"); + put(-2,"绯荤粺鍖归厤閿欒"); + put(-1,"杈撳叆鏃犳晥"); + put(0,"浜哄伐鍖归厤澶辫触"); + put(1,"CPDB搴撴柊澧�"); + put(2,"CPDB搴撳瓨鍦�"); }}; private static final Map OPERATING_MODE = new HashMap(){{ - put(1,"名称别名"); - put(2,"地址别名"); - put(3,"入库编辑"); + put(1,"鍚嶇О鍒悕"); + put(2,"鍦板潃鍒悕"); + put(3,"鍏ュ簱缂栬緫"); }}; @@ -93,11 +93,11 @@ public class AddressMatchController { public Object loadCompanyAction(AddressMatchModel model){ JsonModel jsonModel = new JsonModel(); Map data = new HashMap(); - if("房价通".equals(model.getSource())){ + if("鎴夸环閫�".equals(model.getSource())){ data.put("companyList",usersDetailService.findAllCompanyName(model.getKeyword())); }else if("API".equals(model.getSource())){ data.put("companyList",apiUserService.findAllCompanyName(model.getKeyword())); - }else if("房评卡".equals(model.getSource())){ + }else if("鎴胯瘎鍗�".equals(model.getSource())){ data.put("companyList",fpkUsersService.findAllCompanyName(model.getKeyword())); } jsonModel.setJsonModel(data); @@ -109,11 +109,11 @@ public class AddressMatchController { params.add(new QueryParam("visible", 0)); if(StringUtils.isBlank(model.getCategory())){ params.add(new QueryParam("category", "district,shop,office")); - }else if( "住宅".equals(model.getCategory())){ + }else if( "浣忓畢".equals(model.getCategory())){ params.add(new QueryParam("category", "district")); - }else if( "商铺".equals(model.getCategory())){ + }else if( "鍟嗛摵".equals(model.getCategory())){ params.add(new QueryParam("category", "shop")); - }else if( "写字楼".equals(model.getCategory())){ + }else if( "鍐欏瓧妤�".equals(model.getCategory())){ params.add(new QueryParam("category", "office")); } if (StringUtils.isNotBlank(model.getCityDisplay())) { @@ -169,31 +169,31 @@ public class AddressMatchController { }else{ if(3 == address.getOperatingMode()){ cpdbTotal ++; - if("住宅".equals(address.getHumanMatchCategory())){ + if("浣忓畢".equals(address.getHumanMatchCategory())){ districtTotal ++; - }else if("写字楼".equals(address.getHumanMatchCategory())){ + }else if("鍐欏瓧妤�".equals(address.getHumanMatchCategory())){ officeTotal ++; - }else if("商铺".equals(address.getHumanMatchCategory())){ + }else if("鍟嗛摵".equals(address.getHumanMatchCategory())){ shopTotal ++; } }else if(2 == address.getOperatingMode()){ addrAliasTotal++; - if("住宅".equals(address.getHumanMatchCategory())){ + if("浣忓畢".equals(address.getHumanMatchCategory())){ addrAliasDistrictTotal ++; - }else if("写字楼".equals(address.getHumanMatchCategory())){ + }else if("鍐欏瓧妤�".equals(address.getHumanMatchCategory())){ addrAliasOfficeTotal ++; - }else if("商铺".equals(address.getHumanMatchCategory())){ + }else if("鍟嗛摵".equals(address.getHumanMatchCategory())){ addrAliasShopTotal ++; } }else if(1 == address.getOperatingMode() ){ nameAliasTotal++; - if("住宅".equals(address.getHumanMatchCategory())){ + if("浣忓畢".equals(address.getHumanMatchCategory())){ nameAliasDistrictTotal ++; - }else if("写字楼".equals(address.getHumanMatchCategory())){ + }else if("鍐欏瓧妤�".equals(address.getHumanMatchCategory())){ nameAliasShopTotal ++; - }else if("商铺".equals(address.getHumanMatchCategory())){ + }else if("鍟嗛摵".equals(address.getHumanMatchCategory())){ nameAliasOfficeTotal ++; } } @@ -203,62 +203,62 @@ public class AddressMatchController { HSSFWorkbook book = new HSSFWorkbook(); - HSSFSheet sheet = book.createSheet("统计结果"); + HSSFSheet sheet = book.createSheet("缁熻缁撴灉"); HSSFRow row = sheet.createRow(0); HSSFCell cell= row.createCell(0,Cell.CELL_TYPE_STRING); - cell.setCellValue("城市"); + cell.setCellValue("鍩庡競"); cell= row.createCell(1,Cell.CELL_TYPE_STRING); cell.setCellValue(model.getCityDisplay()); row = sheet.createRow(1); cell= row.createCell(0,Cell.CELL_TYPE_STRING); - cell.setCellValue("来源"); + cell.setCellValue("鏉ユ簮"); cell= row.createCell(1,Cell.CELL_TYPE_STRING); cell.setCellValue(model.getSource()); row = sheet.createRow(2); cell= row.createCell(0,Cell.CELL_TYPE_STRING); - cell.setCellValue("时间段"); + cell.setCellValue("鏃堕棿娈�"); cell= row.createCell(1,Cell.CELL_TYPE_STRING); - cell.setCellValue(DateUtil.formatByPattern(model.getStartDate(),"yyyy年MM月dd日") + "到" + DateUtil.formatByPattern(model.getEndDate(),"yyyy年MM月dd日")); + cell.setCellValue(DateUtil.formatByPattern(model.getStartDate(),"yyyy骞碝M鏈坉d鏃�") + "鍒�" + DateUtil.formatByPattern(model.getEndDate(),"yyyy骞碝M鏈坉d鏃�")); row = sheet.createRow(3); cell= row.createCell(0,Cell.CELL_TYPE_STRING); - cell.setCellValue("人工操作总量"); + cell.setCellValue("浜哄伐鎿嶄綔鎬婚噺"); cell= row.createCell(1,Cell.CELL_TYPE_STRING); cell.setCellValue(addressMatches.size()); row = sheet.createRow(4); cell= row.createCell(0,Cell.CELL_TYPE_STRING); sheet.addMergedRegion(new CellRangeAddress(4, 6, 0, 0)); - cell.setCellValue("CPDB库新增总量"); + cell.setCellValue("CPDB搴撴柊澧炴�婚噺"); cell= row.createCell(1,Cell.CELL_TYPE_STRING); sheet.addMergedRegion(new CellRangeAddress(4, 6, 1, 1)); cell.setCellValue(cpdbTotal); cell= row.createCell(2,Cell.CELL_TYPE_STRING); - cell.setCellValue("新增住宅"); + cell.setCellValue("鏂板浣忓畢"); cell= row.createCell(3,Cell.CELL_TYPE_NUMERIC); cell.setCellValue(districtTotal); row = sheet.createRow(5); cell= row.createCell(2,Cell.CELL_TYPE_STRING); - cell.setCellValue("新增写字楼"); + cell.setCellValue("鏂板鍐欏瓧妤�"); cell= row.createCell(3,Cell.CELL_TYPE_NUMERIC); cell.setCellValue(officeTotal); row = sheet.createRow(6); cell= row.createCell(2,Cell.CELL_TYPE_STRING); - cell.setCellValue("新增商铺"); + cell.setCellValue("鏂板鍟嗛摵"); cell= row.createCell(3,Cell.CELL_TYPE_NUMERIC); cell.setCellValue(shopTotal); row = sheet.createRow(7); cell= row.createCell(0,Cell.CELL_TYPE_STRING); sheet.addMergedRegion(new CellRangeAddress(7, 12, 0, 0)); - cell.setCellValue("CPDB库新增存在"); + cell.setCellValue("CPDB搴撴柊澧炲瓨鍦�"); cell= row.createCell(1,Cell.CELL_TYPE_NUMERIC); sheet.addMergedRegion(new CellRangeAddress(7,12,1,1)); @@ -266,77 +266,77 @@ public class AddressMatchController { cell= row.createCell(2,Cell.CELL_TYPE_STRING); sheet.addMergedRegion(new CellRangeAddress(7,9,2,2)); - cell.setCellValue("名称别名"); + cell.setCellValue("鍚嶇О鍒悕"); cell= row.createCell(3,Cell.CELL_TYPE_NUMERIC); sheet.addMergedRegion(new CellRangeAddress(7,9,3,3)); cell.setCellValue(nameAliasTotal); cell= row.createCell(4,Cell.CELL_TYPE_STRING); - cell.setCellValue("住宅别名"); + cell.setCellValue("浣忓畢鍒悕"); cell= row.createCell(5,Cell.CELL_TYPE_NUMERIC); cell.setCellValue(nameAliasDistrictTotal); row = sheet.createRow(8); cell= row.createCell(4,Cell.CELL_TYPE_STRING); - cell.setCellValue("写字楼别名"); + cell.setCellValue("鍐欏瓧妤煎埆鍚�"); cell= row.createCell(5,Cell.CELL_TYPE_NUMERIC); cell.setCellValue(nameAliasOfficeTotal); row = sheet.createRow(9); cell= row.createCell(4,Cell.CELL_TYPE_STRING); - cell.setCellValue("商铺别名"); + cell.setCellValue("鍟嗛摵鍒悕"); cell= row.createCell(5,Cell.CELL_TYPE_NUMERIC); cell.setCellValue(nameAliasShopTotal); row = sheet.createRow(10); cell= row.createCell(2,Cell.CELL_TYPE_STRING); sheet.addMergedRegion(new CellRangeAddress(10,12,2,2)); - cell.setCellValue("地址别名"); + cell.setCellValue("鍦板潃鍒悕"); cell= row.createCell(3,Cell.CELL_TYPE_NUMERIC); sheet.addMergedRegion(new CellRangeAddress(10,12,3,3)); cell.setCellValue(addrAliasTotal); cell= row.createCell(4,Cell.CELL_TYPE_STRING); - cell.setCellValue("住宅地址别名"); + cell.setCellValue("浣忓畢鍦板潃鍒悕"); cell= row.createCell(5,Cell.CELL_TYPE_NUMERIC); cell.setCellValue(addrAliasDistrictTotal); row = sheet.createRow(11); cell= row.createCell(4,Cell.CELL_TYPE_STRING); - cell.setCellValue("写字楼住宅别名"); + cell.setCellValue("鍐欏瓧妤间綇瀹呭埆鍚�"); cell= row.createCell(5,Cell.CELL_TYPE_NUMERIC); cell.setCellValue(addrAliasOfficeTotal); row = sheet.createRow(12); cell= row.createCell(4,Cell.CELL_TYPE_STRING); - cell.setCellValue("商铺地址别名"); + cell.setCellValue("鍟嗛摵鍦板潃鍒悕"); cell= row.createCell(5,Cell.CELL_TYPE_NUMERIC); cell.setCellValue(addrAliasShopTotal); row = sheet.createRow(13); cell= row.createCell(0,Cell.CELL_TYPE_STRING); - cell.setCellValue("输入无效"); + cell.setCellValue("杈撳叆鏃犳晥"); cell= row.createCell(1,Cell.CELL_TYPE_NUMERIC); cell.setCellValue(inputInvalidTotal); row = sheet.createRow(14); cell= row.createCell(0,Cell.CELL_TYPE_STRING); - cell.setCellValue("人工匹配失败"); + cell.setCellValue("浜哄伐鍖归厤澶辫触"); cell= row.createCell(1,Cell.CELL_TYPE_NUMERIC); cell.setCellValue(humanMatchFailure); row = sheet.createRow(15); cell= row.createCell(0,Cell.CELL_TYPE_STRING); - cell.setCellValue("系统匹配错误"); + cell.setCellValue("绯荤粺鍖归厤閿欒"); cell= row.createCell(1,Cell.CELL_TYPE_NUMERIC); cell.setCellValue(sysMatchErrorTotal); row = sheet.createRow(16); cell= row.createCell(0,Cell.CELL_TYPE_STRING); - cell.setCellValue("CPDB库中已存在"); + cell.setCellValue("CPDB搴撲腑宸插瓨鍦�"); cell= row.createCell(1,Cell.CELL_TYPE_NUMERIC); cell.setCellValue(cpdbExistsTotal); @@ -349,11 +349,11 @@ public class AddressMatchController { response.setCharacterEncoding("UTF-8"); response.setContentType("application/x-download;charset=UTF-8"); fileName = new String(fileName.getBytes("GBK"),"ISO-8859-1"); - if(fileName.length()>150){//解决IE 6.0 bug + if(fileName.length()>150){//瑙e喅IE 6.0 bug fileName = new String(fileName.getBytes("GBK"),"ISO-8859-1"); } response.setHeader( "Content-Disposition", "attachment;filename=" + fileName); - os = response.getOutputStream();// 取得输出流 + os = response.getOutputStream();// 鍙栧緱杈撳嚭娴� book.write(os); os.flush(); }catch (Exception e) { @@ -374,11 +374,11 @@ public class AddressMatchController { model.setViewType("json"); String cat = ""; if(StringUtils.isNotBlank(model.getCategory())){ - if(model.getCategory().equals("住宅")){ + if(model.getCategory().equals("浣忓畢")){ cat = "district"; - }else if(model.getCategory().equals("商铺")){ + }else if(model.getCategory().equals("鍟嗛摵")){ cat = "shop"; - }else if(model.getCategory().equals("写字楼")){ + }else if(model.getCategory().equals("鍐欏瓧妤�")){ cat = "office"; } }else{ @@ -393,7 +393,7 @@ public class AddressMatchController { List districts = districtService.findAllByParams(params); if(districts.size() > 0){ - model.setMsg( model.getName()+" 已存在!"); + model.setMsg( model.getName()+" 宸插瓨鍦紒"); return model; } District district = new District(); diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/AdvertisementController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/AdvertisementController.java index 11d120bb2..ee2bca83e 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/AdvertisementController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/AdvertisementController.java @@ -27,7 +27,7 @@ import javax.imageio.ImageIO; import javax.servlet.http.HttpServletRequest; /** - * @Desc : 房价网后台广告配置 + * @Desc : 鎴夸环缃戝悗鍙板箍鍛婇厤缃� * @User : xh */ public class AdvertisementController { @@ -37,7 +37,7 @@ public class AdvertisementController { private AdvertisementService advertisementService; /** - * 展示广告列表+查询 + * 灞曠ず骞垮憡鍒楄〃+鏌ヨ * @param model * @return */ @@ -88,25 +88,25 @@ public class AdvertisementController { return max; } /** - * 根据时间+排序检测是否重复 - * @return true:无重复 、 false:重复 + * 鏍规嵁鏃堕棿+鎺掑簭妫�娴嬫槸鍚﹂噸澶� + * @return true锛氭棤閲嶅 銆� false锛氶噸澶� */ private boolean checkSort(String oldId, int source, String model, int location, int type, int sort, Date startDate, Date endDate){ - //查询对应类型和sort的广告 + //鏌ヨ瀵瑰簲绫诲瀷鍜宻ort鐨勫箍鍛� List advertisements = advertisementService.listByParam(model, source, location, type, sort, null, null); - if(advertisements==null||advertisements.size()==0) {//无不存在重复 + if(advertisements==null||advertisements.size()==0) {//鏃犱笉瀛樺湪閲嶅 return true; } - boolean newBeforeOld = true;//待插入的时间在所有已存在的时间之前 - boolean newAfterOld = true;//待插入的时间在所有已存在的时间之后 + boolean newBeforeOld = true;//寰呮彃鍏ョ殑鏃堕棿鍦ㄦ墍鏈夊凡瀛樺湪鐨勬椂闂翠箣鍓� + boolean newAfterOld = true;//寰呮彃鍏ョ殑鏃堕棿鍦ㄦ墍鏈夊凡瀛樺湪鐨勬椂闂翠箣鍚� for(Advertisement a : advertisements) { - if(oldId!=null&&oldId.equals(a.getId())) {//排除自己(如果存在) + if(oldId!=null&&oldId.equals(a.getId())) {//鎺掗櫎鑷繁锛堝鏋滃瓨鍦級 continue; } - if(a.getStartDate()!=null&&!endDate.before(a.getStartDate())) {//不在前面 + if(a.getStartDate()!=null&&!endDate.before(a.getStartDate())) {//涓嶅湪鍓嶉潰 newBeforeOld = false; } - if(a.getEndDate()!=null&&!startDate.after(a.getEndDate())) {//不在后面 + if(a.getEndDate()!=null&&!startDate.after(a.getEndDate())) {//涓嶅湪鍚庨潰 newAfterOld = false; } } @@ -145,20 +145,20 @@ public class AdvertisementController { model.setViewType("json"); if(model.getSort()==null) { model.setCode("-1"); - model.setMsg("操作失败,未获得排序号!"); + model.setMsg("鎿嶄綔澶辫触锛屾湭鑾峰緱鎺掑簭鍙凤紒"); return model; } Advertisement advertisement = advertisementService.findById(model.getId()); if(advertisement==null) { model.setCode("-1"); - model.setMsg("操作失败,查询广告位失败!"); + model.setMsg("鎿嶄綔澶辫触锛屾煡璇㈠箍鍛婁綅澶辫触锛�"); return model; } - if(model.getSort()!=0&&model.getSort()!=advertisement.getSort()) {//不为0且不与原排序相等时(即修改时)才加限制 + if(model.getSort()!=0&&model.getSort()!=advertisement.getSort()) {//涓嶄负0涓斾笉涓庡師鎺掑簭鐩哥瓑鏃讹紙鍗充慨鏀规椂锛夋墠鍔犻檺鍒� List advertisements = advertisementService.listByParam(advertisement.getModel(),advertisement.getSource(),advertisement.getLocation(),advertisement.getType(),model.getSort(),null,null); if(advertisements!=null&&advertisements.size()>0) { model.setCode("-1"); - model.setMsg("操作失败,该排序号的广告已存在!"); + model.setMsg("鎿嶄綔澶辫触锛岃鎺掑簭鍙风殑骞垮憡宸插瓨鍦紒"); return model; } } @@ -237,7 +237,7 @@ public class AdvertisementController { Advertisement advertisement = advertisementService.findById(model.getId()); if(advertisement==null) { model.setCode("-1"); - model.setMsg("根据Id查询广告失败!"); + model.setMsg("鏍规嵁Id鏌ヨ骞垮憡澶辫触锛�"); return model; } String startDateStr = model.getStartDateStr(); @@ -250,19 +250,19 @@ public class AdvertisementController { endDate = sdf.parse(endDateStr); if(startDate.after(endDate)) { model.setCode("-1"); - model.setMsg("操作失败,开始时间不可以在结束时间之后!"); + model.setMsg("鎿嶄綔澶辫触锛屽紑濮嬫椂闂翠笉鍙互鍦ㄧ粨鏉熸椂闂翠箣鍚庯紒"); return model; } }catch(Exception e) { - LOGGER.error("时间转换失败",e); + LOGGER.error("鏃堕棿杞崲澶辫触",e); model.setCode("-1"); - model.setMsg("时间转换失败"); + model.setMsg("鏃堕棿杞崲澶辫触"); return model; } - if(model.getSort()!=0) {//排序不为0才加限制 + if(model.getSort()!=0) {//鎺掑簭涓嶄负0鎵嶅姞闄愬埗 if(!checkSort(advertisement.getId(),advertisement.getSource(),advertisement.getModel(),advertisement.getLocation(),advertisement.getType(),model.getSort(),startDate,endDate)) { model.setCode("-1"); - model.setMsg("操作失败,该位置广告存在重复(存在同序号且时间重叠的广告)!"); + model.setMsg("鎿嶄綔澶辫触锛岃浣嶇疆骞垮憡瀛樺湪閲嶅锛堝瓨鍦ㄥ悓搴忓彿涓旀椂闂撮噸鍙犵殑骞垮憡锛夛紒"); return model; } } @@ -287,14 +287,14 @@ public class AdvertisementController { Advertisement advertisement = advertisementService.findById(model.getId()); if(advertisement==null) { model.setCode("-1"); - model.setMsg("根据Id查询广告失败!"); + model.setMsg("鏍规嵁Id鏌ヨ骞垮憡澶辫触锛�"); return model; } -// if(model.getSort()!=0&&model.getSort()!=advertisement.getSort()) {//不为0且不与原排序相等时(即修改时)才加限制 +// if(model.getSort()!=0&&model.getSort()!=advertisement.getSort()) {//涓嶄负0涓斾笉涓庡師鎺掑簭鐩哥瓑鏃讹紙鍗充慨鏀规椂锛夋墠鍔犻檺鍒� // List advertisements = advertisementService.listByParam(advertisement.getModel(),advertisement.getSource(),advertisement.getLocation(),advertisement.getType(),model.getSort(),null,null); // if(advertisements!=null&&advertisements.size()>0) { // model.setCode("-1"); -// model.setMsg("操作失败,该排序号的广告已存在!"); +// model.setMsg("鎿嶄綔澶辫触锛岃鎺掑簭鍙风殑骞垮憡宸插瓨鍦紒"); // return model; // } // } @@ -315,12 +315,12 @@ public class AdvertisementController { model.setCode("1"); return model; } - //图片上传 + //鍥剧墖涓婁紶 public Object uploadImageAction(HttpServletRequest request) { JsonModel json = new JsonModel(); Map paraMap = ActionContext.getContext().getParameters(); Object[] objects = paraMap.get("fileInputStream"); - Object[] objectsHeight = paraMap.get("height");//带过来的参数 + Object[] objectsHeight = paraMap.get("height");//甯﹁繃鏉ョ殑鍙傛暟 Object[] objectsWidth = paraMap.get("width"); if(objectsHeight==null||objectsWidth==null||objectsHeight.length==0||objectsWidth.length==0) { ImageUploadModel model = new ImageUploadModel(false,""); @@ -343,9 +343,9 @@ public class AdvertisementController { baos.flush(); InputStream inputStream1 = new ByteArrayInputStream(baos.toByteArray()); InputStream inputStream2 = new ByteArrayInputStream(baos.toByteArray()); - if(!imageCheck(inputStream1,height,width)) {//长宽检测 + if(!imageCheck(inputStream1,height,width)) {//闀垮妫�娴� ImageUploadModel model = new ImageUploadModel(false,""); - model.setLink("图片长宽与所填数值不对应"); + model.setLink("鍥剧墖闀垮涓庢墍濉暟鍊间笉瀵瑰簲"); json.setJsonModel(model); return json; }; @@ -362,7 +362,7 @@ public class AdvertisementController { String link = jsonObj.getJSONObject("result").getString("link"); ImageUploadModel model = new ImageUploadModel(true,link); json.setJsonModel(model); - Thread.sleep(2000);//等待2秒,前端页面图片可能展示失败 + Thread.sleep(2000);//绛夊緟2绉掞紝鍓嶇椤甸潰鍥剧墖鍙兘灞曠ず澶辫触 return json; } } @@ -370,15 +370,15 @@ public class AdvertisementController { ex.printStackTrace(); } ImageUploadModel model = new ImageUploadModel(false,""); - model.setLink("上传失败"); + model.setLink("涓婁紶澶辫触"); json.setJsonModel(model); return json; } - //宽高检查 + //瀹介珮妫�鏌� private boolean imageCheck(InputStream inputStream, int height, int width) throws IOException { BufferedImage bufferedImage = ImageIO.read(inputStream); - int imgHeight = bufferedImage.getHeight();//图片真实的高 - int imgWidth = bufferedImage.getWidth();//图片的真实的宽 + int imgHeight = bufferedImage.getHeight();//鍥剧墖鐪熷疄鐨勯珮 + int imgWidth = bufferedImage.getWidth();//鍥剧墖鐨勭湡瀹炵殑瀹� if(height==imgHeight&&imgWidth==width) { return true; } diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/AdvertisementOperationController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/AdvertisementOperationController.java index 85b69d0af..bdcca67b4 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/AdvertisementOperationController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/AdvertisementOperationController.java @@ -34,7 +34,7 @@ import javax.imageio.ImageIO; import javax.servlet.http.HttpServletRequest; /** - * @Desc : 房价网后台广告运营 + * @Desc : 鎴夸环缃戝悗鍙板箍鍛婅繍钀� * @User : xh */ public class AdvertisementOperationController { @@ -54,7 +54,7 @@ public class AdvertisementOperationController { } /** - * 展示广告列表+查询 + * 灞曠ず骞垮憡鍒楄〃+鏌ヨ * @param model * @return */ @@ -64,7 +64,7 @@ public class AdvertisementOperationController { } /** - * 页面列表+查询 + * 椤甸潰鍒楄〃+鏌ヨ * @param model * @return */ @@ -77,12 +77,12 @@ public class AdvertisementOperationController { List resultMap = new ArrayList(); List list = new ArrayList(); if(model.getDateType() == 0){ - model.setDateType(1); //默认全部 + model.setDateType(1); //榛樿鍏ㄩ儴 } list = adLogService.listByParam(model.getDateType(), model.getStartDate(), model.getEndDate(), model.getModel(), model.getSource(), model.getType()); - //广告商-总量 + //骞垮憡鍟�-鎬婚噺 Map map1 = new TreeMap(); - //广告商-日期查询 + //骞垮憡鍟�-鏃ユ湡鏌ヨ Map> map2 = new HashMap>(); if(model.getWay()==null || "1".equals(model.getWay())){ adList(model,list,resultMap,map1,map2); @@ -93,7 +93,7 @@ public class AdvertisementOperationController { int todayCount = adLogService.todayCount(); model.setTodayCount(todayCount); } - //广告商页面 + //骞垮憡鍟嗛〉闈� private void adList(AdvertisementOperationModel model,List list,List resultMap, Map map1,Map> map2){ SimpleDateFormat sdf = new SimpleDateFormat("MM/dd"); @@ -120,7 +120,7 @@ public class AdvertisementOperationController { } Map adCountSumMap = sortValue(map1); - int sumCount = 0;//第一条数据(数据量最大) + int sumCount = 0;//绗竴鏉℃暟鎹紙鏁版嵁閲忔渶澶э級 for (String key : adCountSumMap.keySet()) { if(adCountSumMap.get(key) > sumCount){ sumCount = adCountSumMap.get(key); @@ -128,7 +128,7 @@ public class AdvertisementOperationController { Map map = new HashMap(); map.put("advertiser", key); map.put("count", map1.get(key)); - //查询全部数据,不显示日期分段数据 + //鏌ヨ鍏ㄩ儴鏁版嵁锛屼笉鏄剧ず鏃ユ湡鍒嗘鏁版嵁 if(model.getStartDate()==null && model.getEndDate()==null && model.getDateType()==1){ }else{ @@ -143,12 +143,12 @@ public class AdvertisementOperationController { model.setSumCount(sumCount); } - //页面页面 + //椤甸潰椤甸潰 private void sourceList(AdvertisementOperationModel model,List list,List resultMap, Map map1,Map> map2){ SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd"); List dateList = new LinkedList(); - // 页面+时间 单日总量、类型数量 + // 椤甸潰+鏃堕棿 鍗曟棩鎬婚噺銆佺被鍨嬫暟閲� Map detailMap = new HashMap(); for(AdLog adLog:list){ if(map1.containsKey(adLog.getSource())){ @@ -162,20 +162,20 @@ public class AdvertisementOperationController { dateList.add(dateStr); } if(dateList.contains(dateStr)){ - //判断当天页面不同类型下的数据是否已经存在 + //鍒ゆ柇褰撳ぉ椤甸潰涓嶅悓绫诲瀷涓嬬殑鏁版嵁鏄惁宸茬粡瀛樺湪 if(detailMap.containsKey(adLog.getSource()+dateStr+"_count")){ detailMap.put(adLog.getSource()+dateStr+"_count", detailMap.get(adLog.getSource()+dateStr+"_count")+1); }else{ detailMap.put(adLog.getSource()+dateStr+"_count", 1); } - if("单独位".equals(adLog.getType())){ + if("鍗曠嫭浣�".equals(adLog.getType())){ if(detailMap.containsKey(adLog.getSource()+dateStr+"_singleCount")){ detailMap.put(adLog.getSource()+dateStr+"_singleCount", detailMap.get(adLog.getSource()+dateStr+"_singleCount")+1); }else{ detailMap.put(adLog.getSource()+dateStr+"_singleCount", 1); } } - if("轮播位".equals(adLog.getType())){ + if("杞挱浣�".equals(adLog.getType())){ if(detailMap.containsKey(adLog.getSource()+dateStr+"_aroundCount")){ detailMap.put(adLog.getSource()+dateStr+"_aroundCount", detailMap.get(adLog.getSource()+dateStr+"_aroundCount")+1); }else{ @@ -208,7 +208,7 @@ public class AdvertisementOperationController { @Override public int compare(Entry o1, Entry o2) { - return o2.getValue().compareTo(o1.getValue());//倒序 + return o2.getValue().compareTo(o1.getValue());//鍊掑簭 } }); Map adCountSumMap = new LinkedHashMap(); diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/AnalyResultController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/AnalyResultController.java index 568348ce1..9c2f7412a 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/AnalyResultController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/AnalyResultController.java @@ -23,14 +23,14 @@ public class AnalyResultController { public Object totalLineAction(AnalyResultModel model){ if(null != model.getDayBefore()){ - model.setSdateStart(Integer.parseInt(DateUtil.formatToTightYYYYMMDD(DateUtil.getBeforeDay(new Date(), model.getDayBefore())))); //最近一季度 + model.setSdateStart(Integer.parseInt(DateUtil.formatToTightYYYYMMDD(DateUtil.getBeforeDay(new Date(), model.getDayBefore())))); //鏈�杩戜竴瀛e害 model.setSdateEnd(Integer.parseInt(DateUtil.formatToTightYYYYMMDD(DateUtil.getBeforeDay(new Date(), 1)))); } if(StringUtils.isBlank(model.getCityDisplay())){ - model.setCityDisplay("全国"); + model.setCityDisplay("鍏ㄥ浗"); } if(model.getSdateStart() <= 0 || model.getSdateEnd() <= 0) { - model.setSdateStart(Integer.parseInt(DateUtil.formatToTightYYYYMMDD(DateUtil.getBeforeDay(new Date(), 8)))); //最近一季度 + model.setSdateStart(Integer.parseInt(DateUtil.formatToTightYYYYMMDD(DateUtil.getBeforeDay(new Date(), 8)))); //鏈�杩戜竴瀛e害 model.setSdateEnd(Integer.parseInt(DateUtil.formatToTightYYYYMMDD(DateUtil.getBeforeDay(new Date(), 1)))); } @@ -66,12 +66,12 @@ public class AnalyResultController { JSONArray pt1 = new JSONArray(), pt2 = new JSONArray(), pt3 = new JSONArray(), pt4 = new JSONArray(), pt5 = new JSONArray(), pt6 = new JSONArray(); - jo1.put("name", "二手房"); - jo2.put("name", "租房"); - jo3.put("name", "写字楼出售"); - jo4.put("name", "写字楼出租"); - jo5.put("name", "商铺出售"); - jo6.put("name", "商铺出租"); + jo1.put("name", "浜屾墜鎴�"); + jo2.put("name", "绉熸埧"); + jo3.put("name", "鍐欏瓧妤煎嚭鍞�"); + jo4.put("name", "鍐欏瓧妤煎嚭绉�"); + jo5.put("name", "鍟嗛摵鍑哄敭"); + jo6.put("name", "鍟嗛摵鍑虹"); for(AnalyTotalBo vo : bos){ Date date = DateUtil.parseFormatDate(vo.getDateStr()); long tms = date.getTime(); @@ -173,7 +173,7 @@ public class AnalyResultController { model.setVts("1-2-3-4-5-6"); } - //查询所有的数据 + //鏌ヨ鎵�鏈夌殑鏁版嵁 List list = analyResultService.findAnalyResults(model.getCityDisplay(), model.getSiteName(), DateUtil.parseDate(String.valueOf(model.getSdateStart()), "yyyyMMdd"), DateUtil.parseDate(String.valueOf(model.getSdateEnd()), "yyyyMMdd")); @@ -194,7 +194,7 @@ public class AnalyResultController { model.setVts("1-2-3-4-5-6"); } - //查询所有的数据 + //鏌ヨ鎵�鏈夌殑鏁版嵁 List list = analyResultService.findAnalyResults(model.getCityDisplay(), model.getSiteName(), DateUtil.parseDate(String.valueOf(model.getSdateStart()), "yyyyMMdd"), DateUtil.parseDate(String.valueOf(model.getSdateEnd()), "yyyyMMdd")); @@ -337,10 +337,10 @@ public class AnalyResultController { jo3 = new JSONObject(), jo4 = new JSONObject(); JSONArray pt1 = new JSONArray(), pt2 = new JSONArray(), pt3 = new JSONArray(), pt4 = new JSONArray(); - jo1.put("name", "二手房解析错误"); - jo2.put("name", "租房解析错误"); - jo3.put("name", "二手房规则过滤"); - jo4.put("name", "租房规则过滤"); + jo1.put("name", "浜屾墜鎴胯В鏋愰敊璇�"); + jo2.put("name", "绉熸埧瑙f瀽閿欒"); + jo3.put("name", "浜屾墜鎴胯鍒欒繃婊�"); + jo4.put("name", "绉熸埧瑙勫垯杩囨护"); for(AnalyTotalBo vo : bos){ Date date = DateUtil.parseFormatDate(vo.getDateStr()); long tms = date.getTime(); @@ -462,7 +462,7 @@ public class AnalyResultController { public Object failAnalyDetailPieAction(AnalyResultModel model){ if(null != model.getDayBefore()){ - model.setSdateStart(Integer.parseInt(DateUtil.formatToTightYYYYMMDD(DateUtil.getBeforeDay(new Date(), model.getDayBefore())))); //最近一季度 + model.setSdateStart(Integer.parseInt(DateUtil.formatToTightYYYYMMDD(DateUtil.getBeforeDay(new Date(), model.getDayBefore())))); //鏈�杩戜竴瀛e害 model.setSdateEnd(Integer.parseInt(DateUtil.formatToTightYYYYMMDD(new Date()))); } diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiCountLogController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiCountLogController.java index 5b263ce18..5f8beeee2 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiCountLogController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiCountLogController.java @@ -55,7 +55,7 @@ import java.util.*; /** - * api用户开通等管理controller + * api鐢ㄦ埛寮�閫氱瓑绠$悊controller * * @author */ diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiMonitorController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiMonitorController.java index cca977eea..ecc206f11 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiMonitorController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiMonitorController.java @@ -34,9 +34,9 @@ import com.fangjia.service.open.OpenUriAnalyService; import com.fangjia.service.sql.UserService; /** - * API监控后台 + * API鐩戞帶鍚庡彴 * @author yinjihuan - * @date 2016年10月20日 + * @date 2016骞�10鏈�20鏃� * */ public class ApiMonitorController { @@ -149,7 +149,7 @@ public class ApiMonitorController { info.setUsername(user.getUserName()); } - //统计当前接口剩余使用次数 + //缁熻褰撳墠鎺ュ彛鍓╀綑浣跨敤娆℃暟 long totalCallCount = apiVisitCountService.findApiVisitTotalCountByUser(analy.getApiUserId().longValue(), analy.getUrl()); try { ApiUserAuthority author = apiUserAuthorityService.findByUserId(analy.getApiUserId().longValue()); @@ -171,7 +171,7 @@ public class ApiMonitorController { } } } - //统计接口当前剩余时间 + //缁熻鎺ュ彛褰撳墠鍓╀綑鏃堕棿 Map deadLineMap = author.getDeadlineMap(); if(deadLineMap != null) { if(analy.getUrl().equals("/property/transaction")){ diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiTestApplyController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiTestApplyController.java index 847d791fc..41b13c3c7 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiTestApplyController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiTestApplyController.java @@ -30,9 +30,9 @@ import com.fangjia.service.sql.ApiUserService; import com.fangjia.service.sql.UserService; import com.fangjia.service.user.UsersInfoService; /** - * 测试申请控制器 + * 娴嬭瘯鐢宠鎺у埗鍣� * @author yinjihuan - * @date 2016年6月13日 + * @date 2016骞�6鏈�13鏃� * */ public class ApiTestApplyController { @@ -71,9 +71,9 @@ public class ApiTestApplyController { } /** - * 进入管理页面 + * 杩涘叆绠$悊椤甸潰 * @author yinjihuan - * @date 2016年6月13日 + * @date 2016骞�6鏈�13鏃� * @param model * @return */ @@ -122,9 +122,9 @@ public class ApiTestApplyController { } /** - * 批准申请 + * 鎵瑰噯鐢宠 * @author yinjihuan - * @date 2016年6月8日 + * @date 2016骞�6鏈�8鏃� * @param model * @return */ @@ -134,7 +134,7 @@ public class ApiTestApplyController { try { FangJiaUser fjuser = fangJiaUserService.getUserById(model.getUserId()); if(fjuser != null) { - //判断是否已有API账号,没有则添加 + //鍒ゆ柇鏄惁宸叉湁API璐﹀彿锛屾病鏈夊垯娣诲姞 Long apiUserId = 0L; User old = userService.findByUserId(model.getUserId()); if(old == null){ @@ -163,17 +163,17 @@ public class ApiTestApplyController { } else { apiUserId = old.getId(); } - //加上测试申请的接口使用次数 + //鍔犱笂娴嬭瘯鐢宠鐨勬帴鍙d娇鐢ㄦ鏁� ApiTestApply apiTestApply = apiService.getTestApply(model.getUserId()); String[] fields = apiTestApply.getTestFields().split(","); for (String field : fields) { apiUserAuthorityService.increaseVisitCount(apiUserId, "/property/transaction", field, 100, getMonthAfterTime()); } - //更新申请状态 + //鏇存柊鐢宠鐘舵�� apiService.approvalApply(model.getUserId()); - //发送短信 + //鍙戦�佺煭淇� String format_fields = formatTestFields(apiTestApply.getTestFields()); - String message = "【房价网】您申请的"+format_fields+"接口免费测试已审核通过,您可以进行在线测试。"; + String message = "銆愭埧浠风綉銆戞偍鐢宠鐨�"+format_fields+"鎺ュ彛鍏嶈垂娴嬭瘯宸插鏍搁�氳繃锛屾偍鍙互杩涜鍦ㄧ嚎娴嬭瘯銆�"; smsService.send(fjuser.getMobile(), message); } } catch (Exception e) { @@ -185,9 +185,9 @@ public class ApiTestApplyController { } /** - * 格式化测试字段,编码转成中文显示 + * 鏍煎紡鍖栨祴璇曞瓧娈碉紝缂栫爜杞垚涓枃鏄剧ず * @author yinjihuan - * @date 2016年6月13日 + * @date 2016骞�6鏈�13鏃� * @param apiTestApply * @return */ @@ -207,7 +207,7 @@ public class ApiTestApplyController { private Date getMonthAfterTime() { Calendar cd = Calendar.getInstance(); cd.setTime(new Date()); - cd.add(Calendar.MONTH, 1);//增加一个月 + cd.add(Calendar.MONTH, 1);//澧炲姞涓�涓湀 return cd.getTime(); } } diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiTestController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiTestController.java index 9aad322c5..48e1b058f 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiTestController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiTestController.java @@ -64,8 +64,8 @@ public class ApiTestController { //String filePath = request.getRealPath("/") +"file" + "\\" + model.getFileName()+".xls"; String filePath = BkoffConfig.getConfig().getDownloadPath()+"\\downLoad\\" + model.getFileName()+".xls"; - File file = new File(filePath);// path是根据日志路径和文件名拼接出来的 - String filename = file.getName();// 获取日志文件名称 + File file = new File(filePath);// path鏄牴鎹棩蹇楄矾寰勫拰鏂囦欢鍚嶆嫾鎺ュ嚭鏉ョ殑 + String filename = file.getName();// 鑾峰彇鏃ュ織鏂囦欢鍚嶇О InputStream fis; try { fis = new BufferedInputStream(new FileInputStream(filePath)); @@ -73,12 +73,12 @@ public class ApiTestController { fis.read(buffer); fis.close(); response.reset(); - // 先去掉文件名称中的空格,然后转换编码格式为utf-8,保证不出现乱码,这个文件名称用于浏览器的下载框中自动显示的文件名 + // 鍏堝幓鎺夋枃浠跺悕绉颁腑鐨勭┖鏍�,鐒跺悗杞崲缂栫爜鏍煎紡涓簎tf-8,淇濊瘉涓嶅嚭鐜颁贡鐮�,杩欎釜鏂囦欢鍚嶇О鐢ㄤ簬娴忚鍣ㄧ殑涓嬭浇妗嗕腑鑷姩鏄剧ず鐨勬枃浠跺悕 response.addHeader("Content-Disposition", "attachment;filename=" + new String(filename.replaceAll(" ", "").getBytes("utf-8"),"iso8859-1")); response.addHeader("Content-Length", "" + file.length()); OutputStream os = new BufferedOutputStream(response.getOutputStream()); response.setContentType("application/octet-stream"); - os.write(buffer);// 输出文件 + os.write(buffer);// 杈撳嚭鏂囦欢 os.flush(); os.close(); } catch (Exception e) { @@ -101,7 +101,7 @@ public class ApiTestController { //final String filePath = ActionContext.getContext().getRequest().getRealPath("/")+"file"+"\\"; final String filePath = BkoffConfig.getConfig().getDownloadPath()+"\\"+"downLoad"+"\\" ; - System.out.println("create:"+filePath+task.getFileName()+".xls"); + System.out.println("create锛�"+filePath+task.getFileName()+".xls"); if(StringUtils.isNotBlank(model.getContent())){ Runnable myRunnable = new Runnable(){ @@ -130,7 +130,7 @@ public class ApiTestController { if(StringUtils.isNotBlank(model.getId())){ apiTaskService.deleteTask(model.getId()); - //删除文件 + //鍒犻櫎鏂囦欢 //String filePath = ActionContext.getContext().getRequest().getRealPath("/")+"file"+"\\"; String filePath = BkoffConfig.getConfig().getDownloadPath()+"\\downLoad\\"; System.out.println("delete:"+filePath+model.getFileName()+".xls"); @@ -146,13 +146,13 @@ public class ApiTestController { public void task(ApiTestModel model, String id, String filePath, String fileName) throws Exception{ String[] fields = model.getUrlParams().split(","); List fieldsList = new ArrayList(Arrays.asList(fields)); - List> ret = getResult(model.getContent(), fieldsList);//文本结果格式化 + List> ret = getResult(model.getContent(), fieldsList);//鏂囨湰缁撴灉鏍煎紡鍖� String token = getToken(); List> lastMap = new ArrayList>(); for(Map params : ret){ - Map map = run(params, token, model.getUri());//接口调用 + Map map = run(params, token, model.getUri());//鎺ュ彛璋冪敤 for(String key : fieldsList){ if(!map.containsKey(key)){ @@ -161,18 +161,18 @@ public class ApiTestController { } lastMap.add(map); - fieldsList = getResultFlieds(map, fieldsList);//提取结果中key,做为excel标题 + fieldsList = getResultFlieds(map, fieldsList);//鎻愬彇缁撴灉涓璳ey锛屽仛涓篹xcel鏍囬 } for(Map map : lastMap){ - isExist(filePath);//是否存在该目录,不存在创建 - writeExcel(map, fieldsList, filePath, fileName);//写入excel + isExist(filePath);//鏄惁瀛樺湪璇ョ洰褰曪紝涓嶅瓨鍦ㄥ垱寤� + writeExcel(map, fieldsList, filePath, fileName);//鍐欏叆excel } Map data = new HashMap(); data.put("status", 2); - apiTaskService.updateTaskStatus(id, data);//修改任务状态 - System.out.println("任务完成......"); + apiTaskService.updateTaskStatus(id, data);//淇敼浠诲姟鐘舵�� + System.out.println("浠诲姟瀹屾垚......"); } public List getResultFlieds(Map map, List fields ){ @@ -207,7 +207,7 @@ public class ApiTestController { row.createCell((short)index).setCellValue(fields.get(index)); } } - if(rowNum==0){//创建标题 + if(rowNum==0){//鍒涘缓鏍囬 row=sheet.createRow((short)(sheet.getPhysicalNumberOfRows())); for(int index=0 ; index < fields.size() ; index++){ row.createCell((short)index).setCellValue(fields.get(index)); @@ -240,14 +240,14 @@ public class ApiTestController { workbook.write(fOut); fOut.flush(); fOut.close(); - System.out.println("文件生成..."); + System.out.println("鏂囦欢鐢熸垚..."); return workbook; } public void isExist(String path) { File file = new File(path); - //判断文件夹是否存在,如果不存在则创建文件夹 + //鍒ゆ柇鏂囦欢澶规槸鍚﹀瓨鍦�,濡傛灉涓嶅瓨鍦ㄥ垯鍒涘缓鏂囦欢澶� if (!file.exists()) { file.mkdir(); } diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiTradeController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiTradeController.java index 6f92a5946..ae46b56bc 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiTradeController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiTradeController.java @@ -128,7 +128,7 @@ public class ApiTradeController { data.put("result", "fail"); if(StringUtils.isNotBlank(model.getId()) && model.getNumber()>=0 && model.getCost()!=null){ - String tradeNo = ObjectId.get().toString();//订单号 + String tradeNo = ObjectId.get().toString();//璁㈠崟鍙� ApiBuyApply apiBuyApply = apiBuyApplyService.findById(model.getId()); apiBuyApply.setStatus(1); apiBuyApply.setApiCount(model.getNumber()); @@ -139,14 +139,14 @@ public class ApiTradeController { } apiBuyApplyService.update(apiBuyApply); - //创建或更改API-USER的状态 + //鍒涘缓鎴栨洿鏀笰PI-USER鐨勭姸鎬� FangJiaUser fjuser = fangJiaUserService.getUser(apiBuyApply.getMobile()); increaseVisetCount(fjuser, "", apiBuyApply.getServiceId(), model.getNumber()); - //增加购买记录 + //澧炲姞璐拱璁板綍 ApiPurchaseRecord apiPurchaseRecord = new ApiPurchaseRecord(); apiPurchaseRecord.setOrderDate(new Date()); - apiPurchaseRecord.setChannel("线下"); + apiPurchaseRecord.setChannel("绾夸笅"); apiPurchaseRecord.setOrderNumber(tradeNo); apiPurchaseRecord.setUserId(fjuser.getId()); apiPurchaseRecord.setStatus("success"); @@ -164,11 +164,11 @@ public class ApiTradeController { } /** - * 增加api调用次数 - * @param fjuser 房价网对应的user - * @param ip 请求来源IP - * @param subServiceCode 产品码 - * @param count 增加的次数 + * 澧炲姞api璋冪敤娆℃暟 + * @param fjuser 鎴夸环缃戝搴旂殑user + * @param ip 璇锋眰鏉ユ簮IP + * @param subServiceCode 浜у搧鐮� + * @param count 澧炲姞鐨勬鏁� * @throws Exception */ private void increaseVisetCount(FangJiaUser fjuser, String ip, String subServiceCode, int count) throws Exception { @@ -202,7 +202,7 @@ public class ApiTradeController { apiUserId = old.getId(); apiUserService.update(ImmutableMap.of("city", "all"), apiUserId); } - //更新次数 + //鏇存柊娆℃暟 apiUserAuthorityService.increaseVisitCount(apiUserId, "/property/transaction", subServiceCode, count, new SimpleDateFormat("yyyy").parse("2099")); } 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 0b41a057d..2cadda4e8 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 @@ -64,7 +64,7 @@ import java.util.*; /** - * api用户开通等管理controller + * api鐢ㄦ埛寮�閫氱瓑绠$悊controller * * @author */ @@ -86,19 +86,19 @@ public class ApiUserController { private RegionBlockService regionBlockService; /** - * 所有api用户的信息展示 + * 鎵�鏈塧pi鐢ㄦ埛鐨勪俊鎭睍绀� * * @param model * @return */ public Object listAction(ApiUserModel model) { /** - * open中公开出的接口资源 ApiUserAuthority 用户的权限信息 + * open涓叕寮�鍑虹殑鎺ュ彛璧勬簮 ApiUserAuthority 鐢ㄦ埛鐨勬潈闄愪俊鎭� * * @param ApiUser - * :用户的资料信息 + * :鐢ㄦ埛鐨勮祫鏂欎俊鎭� * @param ApiUser - * :用户的appKey username、等资料 + * :鐢ㄦ埛鐨刟ppKey username銆佺瓑璧勬枡 */ ArrayList queryParams = new ArrayList(); if (model.getStatus() != null) { @@ -178,7 +178,7 @@ public class ApiUserController { } /** - * 新增api用户的信息 + * 鏂板api鐢ㄦ埛鐨勪俊鎭� * * @param model * @return @@ -190,7 +190,7 @@ public class ApiUserController { public Object doAddAction(ApiUserModel model) throws Exception { if (StringUtils.isBlank(model.getDisplayName()) || StringUtils.isBlank(model.getUserName()) || StringUtils.isBlank(model.getPassword())) { - model.setMsg("昵称,用户名,密码不能为空"); + model.setMsg("鏄电О,鐢ㄦ埛鍚�,瀵嗙爜涓嶈兘涓虹┖"); model.forward("/apiUser/add"); return model; } @@ -228,7 +228,7 @@ public class ApiUserController { apiUser.setIsMonitorUsed(model.getIsMonitorUsed()); apiUser.setIsWarnExpired(model.getIsWarnExpired()); this.apiUserService.save(apiUser); - // 新增用户,默认挂牌价改为默认评估价 + // 鏂板鐢ㄦ埛锛岄粯璁ゆ寕鐗屼环鏀逛负榛樿璇勪及浠� model.setPriceType("2B"); modifyUserCfg(id, ApiUserCfg.ApiUserCfgKey.PRICE_TYPE, model.getPriceType()); if (model.getEvaluateRate() != null && model.getEvaluateRate() != 0) { @@ -237,17 +237,17 @@ public class ApiUserController { apiUserCfg.setCfgValue(model.getEvaluateRate()); this.apiUserCfgService.save(apiUserCfg, ApiUserCfg.ApiUserCfgKey.EVALUATE_RATE); } - model.setMsg("新建成功!"); + model.setMsg("鏂板缓鎴愬姛!"); } catch (Exception e) { e.printStackTrace(); - model.setMsg("新建失败!"); + model.setMsg("鏂板缓澶辫触!"); } model.redirect("/apiUser/add?msg=" + URLEncoder.encode(model.getMsg(), "UTF-8")); return model; } /** - * 编辑api用户信息 + * 缂栬緫api鐢ㄦ埛淇℃伅 * * @param model * @return @@ -287,13 +287,13 @@ public class ApiUserController { model.setApiUserBo(bo); if (StringUtils.isNotBlank(model.getMsg()) && model.getMsg().equals("success")) { - model.setMsg("更新成功!"); + model.setMsg("鏇存柊鎴愬姛锛�"); } return model; } /** - * 修改用户登录状态 + * 淇敼鐢ㄦ埛鐧诲綍鐘舵�� * * @param model * @return @@ -309,7 +309,7 @@ public class ApiUserController { } /** - * 手动修改api用户appkey值 + * 鎵嬪姩淇敼api鐢ㄦ埛appkey鍊� * * @param model * @return @@ -334,9 +334,9 @@ public class ApiUserController { dataApiUser.put("isMonitorUsed",model.getIsMonitorUsed()); dataApiUser.put("isWarnExpired",model.getIsWarnExpired()); this.apiUserService.update(dataApiUser, userId); - // 更改用户密码 + // 鏇存敼鐢ㄦ埛瀵嗙爜 // this.userService.updateById(user,userId); - // 刷新缓存 + // 鍒锋柊缂撳瓨 // this.apiUserService.clearApiUserAuthorityCache(userId); @@ -355,9 +355,9 @@ public class ApiUserController { Map user = new HashMap(); user.put("password", DigestUtils.md5Hex(model.getPassword())); // -// // 更改用户密码 +// // 鏇存敼鐢ㄦ埛瀵嗙爜 this.userService.updateById(user, userId); - // 刷新缓存 + // 鍒锋柊缂撳瓨 this.apiUserService.clearApiUserAuthorityCache(userId); model.setViewType("redirect"); @@ -410,7 +410,7 @@ public class ApiUserController { } /** - * 重置appkey值,默认为userid md5加上useridmd5再md5, 64位 + * 閲嶇疆appkey鍊硷紝榛樿涓簎serid md5鍔犱笂useridmd5鍐峬d5锛� 64浣� * * @param model * @return @@ -432,7 +432,7 @@ public class ApiUserController { model.setViewParam("config", null); User user = userService.findByUserName(model.getUserName()); if (user != null) { - model.setMsg("此用户名已经存在!"); + model.setMsg("姝ょ敤鎴峰悕宸茬粡瀛樺湪!"); return model; } return model; @@ -468,11 +468,11 @@ public class ApiUserController { model.setDisplayName(user.getDisplayName() == null ? "" : user.getDisplayName()); model.setProvinceList(getProvinceList()); model.setCityFirstLetters(Arrays.asList(getCityFirstLetter())); - List serverAreaList = serverAreaService.findAll();// Load城市列表 - if (StringUtils.isBlank(model.getType()) || "all".equals(model.getType())) {// 字母分组列表 + List serverAreaList = serverAreaService.findAll();// Load鍩庡競鍒楄〃 + if (StringUtils.isBlank(model.getType()) || "all".equals(model.getType())) {// 瀛楁瘝鍒嗙粍鍒楄〃 model.setServerAreaList(null); - } else { // 首字母查询 - List> serverAreaLetterList = new ArrayList>();// Load城市列表 + } else { // 棣栧瓧姣嶆煡璇� + List> serverAreaLetterList = new ArrayList>();// Load鍩庡競鍒楄〃 for (ServerArea serverArea : serverAreaList) { if (serverArea.getSpell().substring(0, 1).toUpperCase().equals(model.getType())) { Map map = new HashMap(); @@ -504,10 +504,10 @@ public class ApiUserController { model.setServerAreaList(serverAreaLetterList); } - StringBuffer openCitys = new StringBuffer();// Load城市列表 + StringBuffer openCitys = new StringBuffer();// Load鍩庡競鍒楄〃 if (StringUtils.isBlank(apiUser.getCity())) { } else if ("all".equals(apiUser.getCity())) { - openCitys.append("全部城市"); + openCitys.append("鍏ㄩ儴鍩庡競"); } else { int cnt = 0; if (StringUtils.isNotBlank(apiUser.getCity()) && !apiUser.getCity().endsWith(",")) { @@ -524,7 +524,7 @@ public class ApiUserController { } } } - openCitys.append(";
共" + cnt + "个城市"); + openCitys.append(";
鍏�" + cnt + "涓煄甯�"); } model.setOpenCitys(openCitys.toString()); model.setCitys(apiUser.getCity()); @@ -628,19 +628,19 @@ public class ApiUserController { } /** - * 所有api用户的信息展示 + * 鎵�鏈塧pi鐢ㄦ埛鐨勪俊鎭睍绀� * * @param model * @return */ public Object authAction(ApiUserModel model) throws IllegalAccessException { /** - * OpenResource open中公开出的接口资源 User 本地user ApiUserAuthority 用户的权限信息 + * OpenResource open涓叕寮�鍑虹殑鎺ュ彛璧勬簮 User 鏈湴user ApiUserAuthority 鐢ㄦ埛鐨勬潈闄愪俊鎭� * * @param ApiUser - * :用户的资料信息 + * :鐢ㄦ埛鐨勮祫鏂欎俊鎭� * @param AuthorityBo - * :用户的appKey username、等资料 + * :鐢ㄦ埛鐨刟ppKey username銆佺瓑璧勬枡 */ List queryParams = Arrays.asList(new QueryParam("pubStatus", 1)); List openResourceList = openResourceService.findOpenResource(queryParams); @@ -655,7 +655,7 @@ public class ApiUserController { model.setDisplayName(user.getDisplayName() == null ? "" : user.getDisplayName()); Map urisMap = authority.getOpenResourseUrisMap(); - // 用户有的uri + // 鐢ㄦ埛鏈夌殑uri String flag = model.getMsg(); List userResources = new ArrayList(); @@ -673,7 +673,7 @@ public class ApiUserController { } } - // 改成遍历用户有的uri + // 鏀规垚閬嶅巻鐢ㄦ埛鏈夌殑uri for (OpenResource openResource : userResources) { AuthorityBo bo = new AuthorityBo(); BeanUtils.copyProperties(openResource, bo); @@ -764,7 +764,7 @@ public class ApiUserController { totalCountMap = new HashMap(); } Integer count = model.getSum(); - //增加次数修改日志 + //澧炲姞娆℃暟淇敼鏃ュ織 ApiCountLog apiCountLog = new ApiCountLog(); if (countMap != null && countMap.containsKey(model.getUri())) { String bkoffUserId = (String) ThreadLocalData.getInstance().get(ThreadLocalKey.UserId); @@ -779,13 +779,13 @@ public class ApiUserController { apiCountLog.setOldCount(oldCount); apiCountLog.setNewCount(count); if (count > oldCount) { - apiCountLog.setOperate("增加" + (count - oldCount) + "次"); + apiCountLog.setOperate("澧炲姞" + (count - oldCount) + "娆�"); } else if (oldCount > count) { - apiCountLog.setOperate("减少" + (oldCount - count) + "次"); + apiCountLog.setOperate("鍑忓皯" + (oldCount - count) + "娆�"); } apiCountLog.setOperateTime(new Date()); - // 次数改变了再记录 + // 娆℃暟鏀瑰彉浜嗗啀璁板綍 if (!count.equals(oldCount)) { apiCountLogService.save(apiCountLog); } @@ -820,7 +820,7 @@ public class ApiUserController { apiUserAuthorityService.update(authority); } } - // 刷新缓存 + // 鍒锋柊缂撳瓨 this.apiUserService.clearApiUserAuthorityCache(userId); return model; } @@ -967,7 +967,7 @@ public class ApiUserController { } } - return "{name:'访问量',data:[" + s + "]}"; + return "{name:'璁块棶閲�',data:[" + s + "]}"; } private String toSeries2(Map map, List> dates) { @@ -980,9 +980,9 @@ public class ApiUserController { int count = (Integer) map.get(date); if (i + 1 == dateList.size()) { - String name = "上周"; + String name = "涓婂懆"; if (k == 1) { - name = "最近7天"; + name = "鏈�杩�7澶�"; } temp = "{name:'" + name + "',data:[" + temp + String.valueOf(count) + "]}"; } else { @@ -1077,10 +1077,10 @@ public class ApiUserController { } else { cities = new ArrayList(); } - // 只查询正式账号 + // 鍙煡璇㈡寮忚处鍙� List queryParams = Arrays.asList(new QueryParam("isTest", 0)); List apiUsers = this.apiUserService.findApiUsersByParamsSortDate(queryParams); - // 获取正式账号的ids + // 鑾峰彇姝e紡璐﹀彿鐨刬ds List ids = new ArrayList(); for (ApiUser apiUser : apiUsers) { ids.add((int) apiUser.getId()); @@ -1192,30 +1192,30 @@ public class ApiUserController { long diffInMillies = Math.abs(endDate.getTime() - startDate.getTime()); - // 将毫秒转换为天数 - long days = diffInMillies / (1000 * 60 * 60 * 24); // 使用long来计算天数 + // 灏嗘绉掕浆鎹负澶╂暟 + long days = diffInMillies / (1000 * 60 * 60 * 24); // 浣跨敤long鏉ヨ绠楀ぉ鏁� - // 只查询正式账号、未过期、未禁用 + // 鍙煡璇㈡寮忚处鍙枫�佹湭杩囨湡銆佹湭绂佺敤 List queryParams = Arrays.asList(new QueryParam("isTest", 0), new QueryParam("status", 0), new QueryParam("deadTime", QueryParam.GREATER_THAN_EQUAL_OPERATOR, new Date())); List apiUsers = this.apiUserService.findApiUsersByParamsSortDate(queryParams); - //所有API + //鎵�鏈堿PI List allApi = openResourceService.findAll(); - // 所有API的URI与name对应Map + // 鎵�鏈堿PI鐨刄RI涓巒ame瀵瑰簲Map Map apiMap = converMapData(allApi); List bosAll = new ArrayList(); if (CollectionUtils.isNotEmpty(apiUsers)) { - // 根据访问遍历用户 + // 鏍规嵁璁块棶閬嶅巻鐢ㄦ埛 for (ApiUser apiUser : apiUsers) { long id = apiUser.getId(); - // 获取每个用户的访问 + // 鑾峰彇姣忎釜鐢ㄦ埛鐨勮闂� ApiUserAuthority authority = apiUserAuthorityService.findByUserId(id); - // 用户有的api + // 鐢ㄦ埛鏈夌殑api List userApi = authority.getOpenResourseUris(); Map countMap = authority.getTotalCountMap(); - // 获取用户名 + // 鑾峰彇鐢ㄦ埛鍚� User user = userService.findById(id); long date = DateUtil.parseStringToDate("2016-11-23").getTime(); if (startDate.getTime() >= date && endDate.getTime() > date) { @@ -1236,13 +1236,13 @@ public class ApiUserController { Map> weekResultMap = getCountByUri(weekApiInvokeStatisticalList); Map> monthResultMap = getCountByUri(monthApiInvokeStatisticalList); - // 遍历用户所有的api + // 閬嶅巻鐢ㄦ埛鎵�鏈夌殑api for (String url : userApi) { - // 统计用过的api + // 缁熻鐢ㄨ繃鐨刟pi String urlName = apiMap.get(url); StatAnalyBo bo = new StatAnalyBo(); if (resultMap.containsKey(url)) { - // 自定义时间的数据 + // 鑷畾涔夋椂闂寸殑鏁版嵁 bo.setSuccessEffectiveTime(resultMap.get(url).get("successEffectiveCount")); bo.setSuccessInvalidTime(resultMap.get(url).get("successInvalidCount")); bo.setDefeatTime(resultMap.get(url).get("defeatCount")); @@ -1251,7 +1251,7 @@ public class ApiUserController { bo.setDailyUse(dailyUse); } if (weekResultMap.containsKey(url)) { - // 近一周数据 + // 杩戜竴鍛ㄦ暟鎹� bo.setWeekSuccessEffectiveTime(weekResultMap.get(url).get("successEffectiveCount")); bo.setWeekSuccessInvalidTime(weekResultMap.get(url).get("successInvalidCount")); bo.setWeekDefeatTime(weekResultMap.get(url).get("defeatCount")); @@ -1260,11 +1260,11 @@ public class ApiUserController { bo.setWeekDailyUse(dailyUse); } if (monthResultMap.containsKey(url)) { - // 成功有效次数 + // 鎴愬姛鏈夋晥娆℃暟 bo.setMonthSuccessEffectiveTime(monthResultMap.get(url).get("successEffectiveCount")); - // 成功无效次数 + // 鎴愬姛鏃犳晥娆℃暟 bo.setMonthSuccessInvalidTime(monthResultMap.get(url).get("successInvalidCount")); - // 失败次数 + // 澶辫触娆℃暟 bo.setMonthDefeatTime(monthResultMap.get(url).get("defeatCount")); bo.setMonthCount(monthResultMap.get(url).get("totalCount")); double dailyUse = bo.getMonthCount() * 1.0 / 30; @@ -1276,7 +1276,7 @@ public class ApiUserController { bo.setDeadline(apiUser.getDeadTime()); bo.setUserId((int) id); bo.setUserName(user.getDisplayName()); - //剩余调用量 + //鍓╀綑璋冪敤閲� long curVistedCount = apiVisitCountService.findApiVisitCountByDay(id, url, DateUtil.truncateDay(new Date())); long historyCount = apiVisitCountService.findApiVisitAllCount(id, url, DateUtil.truncateDay(new Date())); if (countMap != null && countMap.containsKey(url)) { @@ -1306,10 +1306,10 @@ public class ApiUserController { row.add(bo.getUrl() != null ? bo.getUrl().toString() : ""); row.add(bo.getUrlName() != null ? bo.getUrlName().toString() : ""); row.add(bo.getSurplusCallCount() != null ? bo.getSurplusCallCount().toString() : ""); - // 上周 + // 涓婂懆 row.add(bo.getWeekCount() != null ? bo.getWeekCount().toString() : ""); if (bo.getWeekDailyUse() != null) { - // 格式化为保留一位小数的字符串 + // 鏍煎紡鍖栦负淇濈暀涓�浣嶅皬鏁扮殑瀛楃涓� String formattedDailyUse = String.format("%.1f", bo.getWeekDailyUse()); row.add(formattedDailyUse); } else { @@ -1318,10 +1318,10 @@ public class ApiUserController { row.add(bo.getWeekSuccessEffectiveTime() != null ? bo.getWeekSuccessEffectiveTime().toString() : ""); row.add(bo.getWeekSuccessInvalidTime() != null ? bo.getWeekSuccessInvalidTime().toString() : ""); row.add(bo.getWeekDefeatTime() != null ? bo.getWeekDefeatTime().toString() : ""); - // 上个月 + // 涓婁釜鏈� row.add(bo.getMonthCount() != null ? bo.getMonthCount().toString() : ""); if (bo.getMonthDailyUse() != null) { - // 格式化为保留一位小数的字符串 + // 鏍煎紡鍖栦负淇濈暀涓�浣嶅皬鏁扮殑瀛楃涓� String formattedDailyUse = String.format("%.1f", bo.getMonthDailyUse()); row.add(formattedDailyUse); } else { @@ -1330,10 +1330,10 @@ public class ApiUserController { row.add(bo.getMonthSuccessEffectiveTime() != null ? bo.getMonthSuccessEffectiveTime().toString() : ""); row.add(bo.getMonthSuccessInvalidTime() != null ? bo.getMonthSuccessInvalidTime().toString() : ""); row.add(bo.getMonthDefeatTime() != null ? bo.getMonthDefeatTime().toString() : ""); - // 自定义时间 + // 鑷畾涔夋椂闂� row.add(bo.getCount() != null ? bo.getCount().toString() : ""); if (bo.getDailyUse() != null) { - // 格式化为保留一位小数的字符串 + // 鏍煎紡鍖栦负淇濈暀涓�浣嶅皬鏁扮殑瀛楃涓� String formattedDailyUse = String.format("%.1f", bo.getDailyUse()); row.add(formattedDailyUse); } else { @@ -1345,27 +1345,27 @@ public class ApiUserController { dataList.add(row); } - String dateStr = "(" + DateUtils.format(startDate, "yyyy/MM/dd") + "—" + DateUtils.format(endDate, "yyyy/MM/dd") + ")"; - String fileName = "用户账号使用统计" + dateStr + ".xlsx"; + String dateStr = "(" + DateUtils.format(startDate, "yyyy/MM/dd") + "鈥�" + DateUtils.format(endDate, "yyyy/MM/dd") + ")"; + String fileName = "鐢ㄦ埛璐﹀彿浣跨敤缁熻" + dateStr + ".xlsx"; // ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream()).build(); String displayName = URLEncoder.encode(fileName, "UTF-8"); response.setHeader("Content-Disposition", "attachment; filename=\"" + displayName + "\""); response.setContentType("application/x-download;charset=utf-8"); Workbook workbook = new XSSFWorkbook(); - Sheet sheet = workbook.createSheet("用户账号使用统计"); + Sheet sheet = workbook.createSheet("鐢ㄦ埛璐﹀彿浣跨敤缁熻"); List head = Arrays.asList( - "用户ID", "账号", "合同到期时间", "接口", "接口名称", "剩余使用次数", - "访问次数(近一周)", "日均访问量(近一周)", "成功并有效(近一周)", "成功并无效(近一周)", "失败次数(近一周)", - "访问次数(近一月)", "日均访问量(近一月)", "成功并有效(近一月)", "成功并无效(近一月)", "失败次数(近一月)", - "访问次数" + dateStr, "日均访问量" + dateStr, "成功并有效" + dateStr, "成功并无效" + dateStr, "失败次数" + dateStr + "鐢ㄦ埛ID", "璐﹀彿", "鍚堝悓鍒版湡鏃堕棿", "鎺ュ彛", "鎺ュ彛鍚嶇О", "鍓╀綑浣跨敤娆℃暟", + "璁块棶娆℃暟(杩戜竴鍛�)", "鏃ュ潎璁块棶閲�(杩戜竴鍛�)", "鎴愬姛骞舵湁鏁�(杩戜竴鍛�)", "鎴愬姛骞舵棤鏁�(杩戜竴鍛�)", "澶辫触娆℃暟(杩戜竴鍛�)", + "璁块棶娆℃暟(杩戜竴鏈�)", "鏃ュ潎璁块棶閲�(杩戜竴鏈�)", "鎴愬姛骞舵湁鏁�(杩戜竴鏈�)", "鎴愬姛骞舵棤鏁�(杩戜竴鏈�)", "澶辫触娆℃暟(杩戜竴鏈�)", + "璁块棶娆℃暟" + dateStr, "鏃ュ潎璁块棶閲�" + dateStr, "鎴愬姛骞舵湁鏁�" + dateStr, "鎴愬姛骞舵棤鏁�" + dateStr, "澶辫触娆℃暟" + dateStr ); - // 创建表头 + // 鍒涘缓琛ㄥご Row headRow = sheet.createRow(0); for (int i = 0; i < head.size(); i++) { Cell cell = headRow.createCell(i); cell.setCellValue(head.get(i)); } - // 写入数据,从第二行 + // 鍐欏叆鏁版嵁锛屼粠绗簩琛� for (int i = 0; i < dataList.size(); i++) { Row row = sheet.createRow(i + 1); List data = dataList.get(i); @@ -1563,7 +1563,7 @@ public class ApiUserController { HSSFCellStyle cellStyle = workbook.createCellStyle(); cellStyle.setAlignment(HSSFCellStyle.ALIGN_CENTER); cellStyle.setVerticalAlignment(HSSFCellStyle.VERTICAL_CENTER); - HSSFSheet sheet = workbook.createSheet("数据导出"); + HSSFSheet sheet = workbook.createSheet("鏁版嵁瀵煎嚭"); HSSFRow row = sheet.createRow(0); HSSFCell cell0 = row.createCell(0); HSSFCell cell1 = row.createCell(1); @@ -1571,12 +1571,12 @@ public class ApiUserController { HSSFCell cell3 = row.createCell(3); HSSFCell cell4 = row.createCell(4); HSSFCell cell5 = row.createCell(5); - cell0.setCellValue("城市"); - cell1.setCellValue("调用总量"); - cell2.setCellValue("成功调用次数"); - cell3.setCellValue("占比"); - cell4.setCellValue("失败调用次数"); - cell5.setCellValue("占比"); + cell0.setCellValue("鍩庡競"); + cell1.setCellValue("璋冪敤鎬婚噺"); + cell2.setCellValue("鎴愬姛璋冪敤娆℃暟"); + cell3.setCellValue("鍗犳瘮"); + cell4.setCellValue("澶辫触璋冪敤娆℃暟"); + cell5.setCellValue("鍗犳瘮"); if (null != eachCityBos) { for (int i = 0; i < eachCityBos.size(); i++) { HSSFRow rows = sheet.createRow(i + 1); @@ -1933,15 +1933,15 @@ public class ApiUserController { if (bo.getKey().equals("level_0")) { array.put("0s"); } else if (bo.getKey().equals("level_1")) { - array.put("1s以下"); + array.put("1s浠ヤ笅"); } else if (bo.getKey().equals("level_2")) { - array.put("1-2s以下"); + array.put("1-2s浠ヤ笅"); } else if (bo.getKey().equals("level_3")) { - array.put("2-3s以下"); + array.put("2-3s浠ヤ笅"); } else if (bo.getKey().equals("level_4")) { - array.put("3s以上"); + array.put("3s浠ヤ笂"); } else if (bo.getKey().equals("level_100")) { - array.put("暂无数据"); + array.put("鏆傛棤鏁版嵁"); } else { array.put(bo.getKey()); } @@ -1956,7 +1956,7 @@ public class ApiUserController { } /** - * 页面查询条件 + * 椤甸潰鏌ヨ鏉′欢 * * @return */ @@ -1967,10 +1967,10 @@ public class ApiUserController { } private List getProvinceList(){ List provinces = Arrays.asList( - "山东", "福建", "河北", "河南", "湖北", "湖南", "江西", "海南", - "黑龙江", "陕西", "贵州", "新疆", "江苏", "安徽", "西藏", - "吉林", "山西", "甘肃", "宁夏", "四川", "浙江", "广西", - "云南", "直辖市", "内蒙古", "辽宁", "广东", "青海" + "灞变笢", "绂忓缓", "娌冲寳", "娌冲崡", "婀栧寳", "婀栧崡", "姹熻タ", "娴峰崡", + "榛戦緳姹�", "闄曡タ", "璐靛窞", "鏂扮枂", "姹熻嫃", "瀹夊窘", "瑗胯棌", + "鍚夋灄", "灞辫タ", "鐢樿們", "瀹佸", "鍥涘窛", "娴欐睙", "骞胯タ", + "浜戝崡", "鐩磋緰甯�", "鍐呰挋鍙�", "杈藉畞", "骞夸笢", "闈掓捣" ); return provinces; } @@ -2152,9 +2152,9 @@ public class ApiUserController { String province = ""; if (city.getProvince() == null || city.getProvince() == "") { province = null; - } else if (city.getProvince().equals("上海") || city.getProvince().equals("北京") || city.getProvince().equals("天津") - || city.getProvince().equals("重庆")) { - province = "直辖市"; + } else if (city.getProvince().equals("涓婃捣") || city.getProvince().equals("鍖椾含") || city.getProvince().equals("澶╂触") + || city.getProvince().equals("閲嶅簡")) { + province = "鐩磋緰甯�"; } else { province = city.getProvince(); } @@ -2209,8 +2209,8 @@ public class ApiUserController { private String spell; private String name; private List cityRegion; - private int haveDistrict; // 0:没有 , > 0:有 - private Map cityRegionHaveDistrict; // 区域有无小区统计 0:没有 + private int haveDistrict; // 0:娌℃湁 锛� > 0:鏈� + private Map cityRegionHaveDistrict; // 鍖哄煙鏈夋棤灏忓尯缁熻 0锛氭病鏈� public String getId() { return id; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ArtemisLogController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ArtemisLogController.java index cdff6c4b3..be5ab9805 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ArtemisLogController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ArtemisLogController.java @@ -23,7 +23,7 @@ public class ArtemisLogController { public Object ipListAction(ArtemisLogModel model){ if(model.getSdateStart() <= 0 || model.getSdateEnd() <= 0) { - model.setSdateStart(Integer.parseInt(DateUtil.formatToTightYYYYMMDD(DateUtil.getBeforeDay(new Date(), 30)))); //最近一季度 + model.setSdateStart(Integer.parseInt(DateUtil.formatToTightYYYYMMDD(DateUtil.getBeforeDay(new Date(), 30)))); //鏈�杩戜竴瀛e害 model.setSdateEnd(Integer.parseInt(DateUtil.formatToTightYYYYMMDD(new Date()))); } if(StringUtils.isBlank(model.getStype())) { @@ -41,7 +41,7 @@ public class ArtemisLogController { public Object loadIpDataAction(ArtemisLogModel model) { if(model.getSdateStart() <= 0 || model.getSdateEnd() <= 0) { - model.setSdateStart(Integer.parseInt(DateUtil.formatToTightYYYYMMDD(DateUtil.getBeforeDay(new Date(), 30)))); //最近一季度 + model.setSdateStart(Integer.parseInt(DateUtil.formatToTightYYYYMMDD(DateUtil.getBeforeDay(new Date(), 30)))); //鏈�杩戜竴瀛e害 model.setSdateEnd(Integer.parseInt(DateUtil.formatToTightYYYYMMDD(new Date()))); } @@ -204,7 +204,7 @@ public class ArtemisLogController { public Object typeListAction(ArtemisLogModel model){ if(model.getSdateStart() <= 0 || model.getSdateEnd() <= 0) { - model.setSdateStart(Integer.parseInt(DateUtil.formatToTightYYYYMMDD(DateUtil.getBeforeDay(new Date(), 30)))); //最近一季度 + model.setSdateStart(Integer.parseInt(DateUtil.formatToTightYYYYMMDD(DateUtil.getBeforeDay(new Date(), 30)))); //鏈�杩戜竴瀛e害 model.setSdateEnd(Integer.parseInt(DateUtil.formatToTightYYYYMMDD(new Date()))); } if(StringUtils.isBlank(model.getStype())) { @@ -221,7 +221,7 @@ public class ArtemisLogController { public Object loadTypeDataAction(ArtemisLogModel model) { if(model.getSdateStart() <= 0 || model.getSdateEnd() <= 0) { - model.setSdateStart(Integer.parseInt(DateUtil.formatToTightYYYYMMDD(DateUtil.getBeforeDay(new Date(), 30)))); //最近一季度 + model.setSdateStart(Integer.parseInt(DateUtil.formatToTightYYYYMMDD(DateUtil.getBeforeDay(new Date(), 30)))); //鏈�杩戜竴瀛e害 model.setSdateEnd(Integer.parseInt(DateUtil.formatToTightYYYYMMDD(new Date()))); } diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/AuditHouseController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/AuditHouseController.java index d9d9360d0..40207cfd9 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/AuditHouseController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/AuditHouseController.java @@ -29,14 +29,14 @@ public class AuditHouseController { private ReportHouseService reportHouseService; /** - * 列表 + * 鍒楄〃 * * @param model * @return */ public Object listAction(HouseModel model) { if (model.getStatus() == null) { - model.setStatus(2); // 未审核 + model.setStatus(2); // 鏈鏍� } Pager pager = model.getPager(20); @@ -74,7 +74,7 @@ public class AuditHouseController { } /** - * 删除房源 + * 鍒犻櫎鎴挎簮 * * @param model * @return @@ -140,7 +140,7 @@ public class AuditHouseController { } /*** - * 查看详情 + * 鏌ョ湅璇︽儏 * * @param model * @return @@ -272,13 +272,13 @@ public class AuditHouseController { } public String stripHtml(String content) { - //

段落替换为换行 + //

娈佃惤鏇挎崲涓烘崲琛� content = content.replaceAll("

", "\r\n"); - //

替换为换行 + //

鏇挎崲涓烘崲琛� content = content.replaceAll("", "\r\n"); - // 去掉其它的<>之间的东西 + // 鍘绘帀鍏跺畠鐨�<>涔嬮棿鐨勪笢瑗� content = content.replaceAll("\\<.*?>", ""); - // 还原HTML + // 杩樺師HTML // content = HTMLDecoder.decode(content); return content; } diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/AutoController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/AutoController.java index 11cd00d67..e35a1b2f0 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/AutoController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/AutoController.java @@ -37,7 +37,7 @@ public class AutoController { private final static Logger LOGGER = LoggerFactory.getLogger(AutoController.class); /** - * 自动完成词列表 + * 鑷姩瀹屾垚璇嶅垪琛� * * @param model * @return @@ -63,7 +63,7 @@ public class AutoController { } /** - * 编辑 + * 缂栬緫 * * @param model * @return @@ -76,7 +76,7 @@ public class AutoController { } if (auto.getCatCity() == null) { - auto.setCatCity(Arrays.asList("none_全国")); + auto.setCatCity(Arrays.asList("none_鍏ㄥ浗")); } Object[] array = (Object[]) auto.getCatCity().toArray(); @@ -88,18 +88,18 @@ public class AutoController { } /** - * 保存 + * 淇濆瓨 * * @param model * @return */ public Object updateAction(AutoModel model) { if (StringUtils.isBlank(model.getKeyword())) { - model.setMsg("keyword不能为空"); + model.setMsg("keyword涓嶈兘涓虹┖"); return model; } if (StringUtils.isBlank(model.getCatCityString())) { - model.setCatCityString("none_全国"); + model.setCatCityString("none_鍏ㄥ浗"); } if ("1".equals(model.getType())) { @@ -108,12 +108,12 @@ public class AutoController { autoOperatorService.saveOrUpdate(model.getKeyword(), model.getCatCityString(), model.getInfoString()); } - model.setMsg("修改成功"); + model.setMsg("淇敼鎴愬姛"); return model; } /** - * 删除 + * 鍒犻櫎 * * @param model * @return @@ -128,7 +128,7 @@ public class AutoController { } /** - * 重新导入基础数据 + * 閲嶆柊瀵煎叆鍩虹鏁版嵁 * * @param model * @return @@ -140,7 +140,7 @@ public class AutoController { } /** - * 导入自动完成的基础数据 + * 瀵煎叆鑷姩瀹屾垚鐨勫熀纭�鏁版嵁 * * @param model * @return @@ -160,7 +160,7 @@ public class AutoController { } /** - * 把小区导入到自动完成 + * 鎶婂皬鍖哄鍏ュ埌鑷姩瀹屾垚 * * @param cityName */ diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/AverageStatisticsController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/AverageStatisticsController.java index 71ff8fb02..8e27443fa 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/AverageStatisticsController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/AverageStatisticsController.java @@ -119,8 +119,8 @@ public class AverageStatisticsController { HSSFSheet sheet = wb.createSheet(model.getCityDisplay()); initSheet(sheet); HSSFCellStyle setBorder = wb.createCellStyle(); - setBorder.setAlignment(CellStyle.ALIGN_CENTER);//水平居中 - setBorder.setVerticalAlignment(CellStyle.VERTICAL_CENTER);//垂直居中 + setBorder.setAlignment(CellStyle.ALIGN_CENTER);//姘村钩灞呬腑 + setBorder.setVerticalAlignment(CellStyle.VERTICAL_CENTER);//鍨傜洿灞呬腑 setBorder.setFillBackgroundColor((short)13); @@ -189,19 +189,19 @@ public class AverageStatisticsController { } } - String fileName = "房价对比(" + model.getShortDate() + ").xls"; + String fileName = "鎴夸环瀵规瘮(" + model.getShortDate() + ").xls"; OutputStream os =null; try { HttpServletResponse response = ActionContext.getContext().getResponse(); response.setCharacterEncoding("UTF-8"); - //response.reset();// 清空输出流 + //response.reset();// 娓呯┖杈撳嚭娴� response.setContentType("application/x-download;charset=UTF-8"); fileName = new String(fileName.getBytes("GBK"),"ISO-8859-1"); - if(fileName.length()>150){//解决IE 6.0 bug + if(fileName.length()>150){//瑙e喅IE 6.0 bug fileName = new String(fileName.getBytes("GBK"),"ISO-8859-1"); } response.setHeader( "Content-Disposition", "attachment;filename=" + fileName); - os = response.getOutputStream();// 取得输出流 + os = response.getOutputStream();// 鍙栧緱杈撳嚭娴� wb.write(os); os.flush(); }catch (Exception e) { @@ -220,7 +220,7 @@ public class AverageStatisticsController { - //初始化sheet,设置列数和每列宽度 + //鍒濆鍖杝heet锛岃缃垪鏁板拰姣忓垪瀹藉害 private void initSheet(HSSFSheet sheet){ sheet.setColumnWidth(0, (int)(35.7 * 150)); sheet.setColumnWidth(1, (int)(35.7 * 100)); @@ -235,10 +235,10 @@ public class AverageStatisticsController { row.setRowStyle(style); //sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 3)); - row.createCell(0, HSSFCell.CELL_TYPE_STRING).setCellValue("区域"); - row.createCell(1, HSSFCell.CELL_TYPE_STRING).setCellValue("名称"); - row.createCell(2, HSSFCell.CELL_TYPE_STRING).setCellValue("计算均价"); - row.createCell(3, HSSFCell.CELL_TYPE_STRING).setCellValue("可信度"); + row.createCell(0, HSSFCell.CELL_TYPE_STRING).setCellValue("鍖哄煙"); + row.createCell(1, HSSFCell.CELL_TYPE_STRING).setCellValue("鍚嶇О"); + row.createCell(2, HSSFCell.CELL_TYPE_STRING).setCellValue("璁$畻鍧囦环"); + row.createCell(3, HSSFCell.CELL_TYPE_STRING).setCellValue("鍙俊搴�"); sheet.addMergedRegion(new CellRangeAddress(0, 2, 0, 0)); sheet.addMergedRegion(new CellRangeAddress(0, 2, 1, 1)); sheet.addMergedRegion(new CellRangeAddress(0, 2, 2, 2)); @@ -247,26 +247,26 @@ public class AverageStatisticsController { if(fields.contains("level")){ cellNum = cellNum +1; sheet.addMergedRegion(new CellRangeAddress(0, 2, cellNum, cellNum)); - row.createCell(cellNum, HSSFCell.CELL_TYPE_STRING).setCellValue("价格等级"); + row.createCell(cellNum, HSSFCell.CELL_TYPE_STRING).setCellValue("浠锋牸绛夌骇"); } if(fields.contains("lastAvgPrice")){ cellNum = cellNum +1; sheet.addMergedRegion(new CellRangeAddress(0, 2, cellNum, cellNum)); - row.createCell(cellNum, HSSFCell.CELL_TYPE_STRING).setCellValue("修正价格"); + row.createCell(cellNum, HSSFCell.CELL_TYPE_STRING).setCellValue("淇浠锋牸"); } if(fields.contains("maxDeviate")){ cellNum = cellNum +1; sheet.addMergedRegion(new CellRangeAddress(0, 2, cellNum, cellNum)); - row.createCell(cellNum, HSSFCell.CELL_TYPE_STRING).setCellValue("均价偏离最大"); + row.createCell(cellNum, HSSFCell.CELL_TYPE_STRING).setCellValue("鍧囦环鍋忕鏈�澶�"); } if(fields.contains("artificialPrice")){ cellNum = cellNum +1; sheet.addMergedRegion(new CellRangeAddress(0, 2, cellNum, cellNum)); - row.createCell(cellNum, HSSFCell.CELL_TYPE_STRING).setCellValue("人工修改"); + row.createCell(cellNum, HSSFCell.CELL_TYPE_STRING).setCellValue("浜哄伐淇敼"); } HSSFRow row1=sheet.createRow(1); @@ -279,128 +279,128 @@ public class AverageStatisticsController { continue; } if(s.contains("lianjia")){ - row.createCell(cellNum+1, HSSFCell.CELL_TYPE_STRING).setCellValue("链家"); + row.createCell(cellNum+1, HSSFCell.CELL_TYPE_STRING).setCellValue("閾惧"); sheet.addMergedRegion(new CellRangeAddress(0, 0, cellNum+1, cellNum+4)); - row1.createCell(cellNum + 1, HSSFCell.CELL_TYPE_STRING).setCellValue("新房"); + row1.createCell(cellNum + 1, HSSFCell.CELL_TYPE_STRING).setCellValue("鏂版埧"); sheet.addMergedRegion(new CellRangeAddress(1, 1, cellNum+1, cellNum+2)); - row1.createCell(cellNum + 3, HSSFCell.CELL_TYPE_STRING).setCellValue("二手房"); + row1.createCell(cellNum + 3, HSSFCell.CELL_TYPE_STRING).setCellValue("浜屾墜鎴�"); sheet.addMergedRegion(new CellRangeAddress(1, 1, cellNum+3, cellNum+4)); - row2.createCell(cellNum + 1, HSSFCell.CELL_TYPE_STRING).setCellValue("价格"); - row2.createCell(cellNum + 2, HSSFCell.CELL_TYPE_STRING).setCellValue("差比"); - row2.createCell(cellNum + 3, HSSFCell.CELL_TYPE_STRING).setCellValue("价格"); - row2.createCell(cellNum + 4, HSSFCell.CELL_TYPE_STRING).setCellValue("差比"); + row2.createCell(cellNum + 1, HSSFCell.CELL_TYPE_STRING).setCellValue("浠锋牸"); + row2.createCell(cellNum + 2, HSSFCell.CELL_TYPE_STRING).setCellValue("宸瘮"); + row2.createCell(cellNum + 3, HSSFCell.CELL_TYPE_STRING).setCellValue("浠锋牸"); + row2.createCell(cellNum + 4, HSSFCell.CELL_TYPE_STRING).setCellValue("宸瘮"); cellNum = cellNum +4; } if(s.contains("yungujia")){ - row.createCell(cellNum+1, HSSFCell.CELL_TYPE_STRING).setCellValue("云估价"); + row.createCell(cellNum+1, HSSFCell.CELL_TYPE_STRING).setCellValue("浜戜及浠�"); sheet.addMergedRegion(new CellRangeAddress(0, 0, cellNum+1, cellNum+4)); - row1.createCell(cellNum + 1, HSSFCell.CELL_TYPE_STRING).setCellValue("新房"); + row1.createCell(cellNum + 1, HSSFCell.CELL_TYPE_STRING).setCellValue("鏂版埧"); sheet.addMergedRegion(new CellRangeAddress(1, 1, cellNum+1, cellNum+2)); - row1.createCell(cellNum + 3, HSSFCell.CELL_TYPE_STRING).setCellValue("二手房"); + row1.createCell(cellNum + 3, HSSFCell.CELL_TYPE_STRING).setCellValue("浜屾墜鎴�"); sheet.addMergedRegion(new CellRangeAddress(1, 1, cellNum+3, cellNum+4)); - row2.createCell(cellNum + 1, HSSFCell.CELL_TYPE_STRING).setCellValue("价格"); - row2.createCell(cellNum + 2, HSSFCell.CELL_TYPE_STRING).setCellValue("差比"); - row2.createCell(cellNum + 3, HSSFCell.CELL_TYPE_STRING).setCellValue("价格"); - row2.createCell(cellNum + 4, HSSFCell.CELL_TYPE_STRING).setCellValue("差比"); + row2.createCell(cellNum + 1, HSSFCell.CELL_TYPE_STRING).setCellValue("浠锋牸"); + row2.createCell(cellNum + 2, HSSFCell.CELL_TYPE_STRING).setCellValue("宸瘮"); + row2.createCell(cellNum + 3, HSSFCell.CELL_TYPE_STRING).setCellValue("浠锋牸"); + row2.createCell(cellNum + 4, HSSFCell.CELL_TYPE_STRING).setCellValue("宸瘮"); cellNum = cellNum +4; } if(s.contains("fanggugu")){ - row.createCell(cellNum+1, HSSFCell.CELL_TYPE_STRING).setCellValue("房估估"); + row.createCell(cellNum+1, HSSFCell.CELL_TYPE_STRING).setCellValue("鎴夸及浼�"); sheet.addMergedRegion(new CellRangeAddress(0, 0, cellNum+1, cellNum+4)); - row1.createCell(cellNum + 1, HSSFCell.CELL_TYPE_STRING).setCellValue("新房"); + row1.createCell(cellNum + 1, HSSFCell.CELL_TYPE_STRING).setCellValue("鏂版埧"); sheet.addMergedRegion(new CellRangeAddress(1, 1, cellNum+1, cellNum+2)); - row1.createCell(cellNum + 3, HSSFCell.CELL_TYPE_STRING).setCellValue("二手房"); + row1.createCell(cellNum + 3, HSSFCell.CELL_TYPE_STRING).setCellValue("浜屾墜鎴�"); sheet.addMergedRegion(new CellRangeAddress(1, 1, cellNum+3, cellNum+4)); - row2.createCell(cellNum + 1, HSSFCell.CELL_TYPE_STRING).setCellValue("价格"); - row2.createCell(cellNum + 2, HSSFCell.CELL_TYPE_STRING).setCellValue("差比"); - row2.createCell(cellNum + 3, HSSFCell.CELL_TYPE_STRING).setCellValue("价格"); - row2.createCell(cellNum + 4, HSSFCell.CELL_TYPE_STRING).setCellValue("差比"); + row2.createCell(cellNum + 1, HSSFCell.CELL_TYPE_STRING).setCellValue("浠锋牸"); + row2.createCell(cellNum + 2, HSSFCell.CELL_TYPE_STRING).setCellValue("宸瘮"); + row2.createCell(cellNum + 3, HSSFCell.CELL_TYPE_STRING).setCellValue("浠锋牸"); + row2.createCell(cellNum + 4, HSSFCell.CELL_TYPE_STRING).setCellValue("宸瘮"); cellNum = cellNum +4; } if(s.contains("soufang")){ - row.createCell(cellNum+1, HSSFCell.CELL_TYPE_STRING).setCellValue("搜房"); + row.createCell(cellNum+1, HSSFCell.CELL_TYPE_STRING).setCellValue("鎼滄埧"); sheet.addMergedRegion(new CellRangeAddress(0, 0, cellNum+1, cellNum+4)); - row1.createCell(cellNum + 1, HSSFCell.CELL_TYPE_STRING).setCellValue("新房"); + row1.createCell(cellNum + 1, HSSFCell.CELL_TYPE_STRING).setCellValue("鏂版埧"); sheet.addMergedRegion(new CellRangeAddress(1, 1, cellNum+1, cellNum+2)); - row1.createCell(cellNum + 3, HSSFCell.CELL_TYPE_STRING).setCellValue("二手房"); + row1.createCell(cellNum + 3, HSSFCell.CELL_TYPE_STRING).setCellValue("浜屾墜鎴�"); sheet.addMergedRegion(new CellRangeAddress(1, 1, cellNum+3, cellNum+4)); - row2.createCell(cellNum + 1, HSSFCell.CELL_TYPE_STRING).setCellValue("价格"); - row2.createCell(cellNum + 2, HSSFCell.CELL_TYPE_STRING).setCellValue("差比"); - row2.createCell(cellNum + 3, HSSFCell.CELL_TYPE_STRING).setCellValue("价格"); - row2.createCell(cellNum + 4, HSSFCell.CELL_TYPE_STRING).setCellValue("差比"); + row2.createCell(cellNum + 1, HSSFCell.CELL_TYPE_STRING).setCellValue("浠锋牸"); + row2.createCell(cellNum + 2, HSSFCell.CELL_TYPE_STRING).setCellValue("宸瘮"); + row2.createCell(cellNum + 3, HSSFCell.CELL_TYPE_STRING).setCellValue("浠锋牸"); + row2.createCell(cellNum + 4, HSSFCell.CELL_TYPE_STRING).setCellValue("宸瘮"); cellNum = cellNum +4; } if(s.contains("ganji")){ - row.createCell(cellNum+1, HSSFCell.CELL_TYPE_STRING).setCellValue("赶集"); + row.createCell(cellNum+1, HSSFCell.CELL_TYPE_STRING).setCellValue("璧堕泦"); sheet.addMergedRegion(new CellRangeAddress(0, 0, cellNum+1, cellNum+4)); - row1.createCell(cellNum + 1, HSSFCell.CELL_TYPE_STRING).setCellValue("新房"); + row1.createCell(cellNum + 1, HSSFCell.CELL_TYPE_STRING).setCellValue("鏂版埧"); sheet.addMergedRegion(new CellRangeAddress(1, 1, cellNum+1, cellNum+2)); - row1.createCell(cellNum + 3, HSSFCell.CELL_TYPE_STRING).setCellValue("二手房"); + row1.createCell(cellNum + 3, HSSFCell.CELL_TYPE_STRING).setCellValue("浜屾墜鎴�"); sheet.addMergedRegion(new CellRangeAddress(1, 1, cellNum+3, cellNum+4)); - row2.createCell(cellNum + 1, HSSFCell.CELL_TYPE_STRING).setCellValue("价格"); - row2.createCell(cellNum + 2, HSSFCell.CELL_TYPE_STRING).setCellValue("差比"); - row2.createCell(cellNum + 3, HSSFCell.CELL_TYPE_STRING).setCellValue("价格"); - row2.createCell(cellNum + 4, HSSFCell.CELL_TYPE_STRING).setCellValue("差比"); + row2.createCell(cellNum + 1, HSSFCell.CELL_TYPE_STRING).setCellValue("浠锋牸"); + row2.createCell(cellNum + 2, HSSFCell.CELL_TYPE_STRING).setCellValue("宸瘮"); + row2.createCell(cellNum + 3, HSSFCell.CELL_TYPE_STRING).setCellValue("浠锋牸"); + row2.createCell(cellNum + 4, HSSFCell.CELL_TYPE_STRING).setCellValue("宸瘮"); cellNum = cellNum +4; } if(s.contains("anjuke")){ - row.createCell(cellNum+1, HSSFCell.CELL_TYPE_STRING).setCellValue("安居客"); + row.createCell(cellNum+1, HSSFCell.CELL_TYPE_STRING).setCellValue("瀹夊眳瀹�"); sheet.addMergedRegion(new CellRangeAddress(0, 0, cellNum+1, cellNum+4)); - row1.createCell(cellNum + 1, HSSFCell.CELL_TYPE_STRING).setCellValue("新房"); + row1.createCell(cellNum + 1, HSSFCell.CELL_TYPE_STRING).setCellValue("鏂版埧"); sheet.addMergedRegion(new CellRangeAddress(1, 1, cellNum+1, cellNum+2)); - row1.createCell(cellNum + 3, HSSFCell.CELL_TYPE_STRING).setCellValue("二手房"); + row1.createCell(cellNum + 3, HSSFCell.CELL_TYPE_STRING).setCellValue("浜屾墜鎴�"); sheet.addMergedRegion(new CellRangeAddress(1, 1, cellNum+3, cellNum+4)); - row2.createCell(cellNum + 1, HSSFCell.CELL_TYPE_STRING).setCellValue("价格"); - row2.createCell(cellNum + 2, HSSFCell.CELL_TYPE_STRING).setCellValue("差比"); - row2.createCell(cellNum + 3, HSSFCell.CELL_TYPE_STRING).setCellValue("价格"); - row2.createCell(cellNum + 4, HSSFCell.CELL_TYPE_STRING).setCellValue("差比"); + row2.createCell(cellNum + 1, HSSFCell.CELL_TYPE_STRING).setCellValue("浠锋牸"); + row2.createCell(cellNum + 2, HSSFCell.CELL_TYPE_STRING).setCellValue("宸瘮"); + row2.createCell(cellNum + 3, HSSFCell.CELL_TYPE_STRING).setCellValue("浠锋牸"); + row2.createCell(cellNum + 4, HSSFCell.CELL_TYPE_STRING).setCellValue("宸瘮"); cellNum = cellNum +4; } if(s.contains("tuboshi")){ - row.createCell(cellNum+1, HSSFCell.CELL_TYPE_STRING).setCellValue("兔博士"); + row.createCell(cellNum+1, HSSFCell.CELL_TYPE_STRING).setCellValue("鍏斿崥澹�"); sheet.addMergedRegion(new CellRangeAddress(0, 0, cellNum+1, cellNum+4)); - row1.createCell(cellNum + 1, HSSFCell.CELL_TYPE_STRING).setCellValue("新房"); + row1.createCell(cellNum + 1, HSSFCell.CELL_TYPE_STRING).setCellValue("鏂版埧"); sheet.addMergedRegion(new CellRangeAddress(1, 1, cellNum+1, cellNum+2)); - row1.createCell(cellNum + 3, HSSFCell.CELL_TYPE_STRING).setCellValue("二手房"); + row1.createCell(cellNum + 3, HSSFCell.CELL_TYPE_STRING).setCellValue("浜屾墜鎴�"); sheet.addMergedRegion(new CellRangeAddress(1, 1, cellNum+3, cellNum+4)); - row2.createCell(cellNum + 1, HSSFCell.CELL_TYPE_STRING).setCellValue("价格"); - row2.createCell(cellNum + 2, HSSFCell.CELL_TYPE_STRING).setCellValue("差比"); - row2.createCell(cellNum + 3, HSSFCell.CELL_TYPE_STRING).setCellValue("价格"); - row2.createCell(cellNum + 4, HSSFCell.CELL_TYPE_STRING).setCellValue("差比"); + row2.createCell(cellNum + 1, HSSFCell.CELL_TYPE_STRING).setCellValue("浠锋牸"); + row2.createCell(cellNum + 2, HSSFCell.CELL_TYPE_STRING).setCellValue("宸瘮"); + row2.createCell(cellNum + 3, HSSFCell.CELL_TYPE_STRING).setCellValue("浠锋牸"); + row2.createCell(cellNum + 4, HSSFCell.CELL_TYPE_STRING).setCellValue("宸瘮"); cellNum = cellNum +4; } if(s.contains("centanet")){ - row.createCell(cellNum+1, HSSFCell.CELL_TYPE_STRING).setCellValue("中原"); + row.createCell(cellNum+1, HSSFCell.CELL_TYPE_STRING).setCellValue("涓師"); sheet.addMergedRegion(new CellRangeAddress(0, 0, cellNum+1, cellNum+4)); - row1.createCell(cellNum + 1, HSSFCell.CELL_TYPE_STRING).setCellValue("新房"); + row1.createCell(cellNum + 1, HSSFCell.CELL_TYPE_STRING).setCellValue("鏂版埧"); sheet.addMergedRegion(new CellRangeAddress(1, 1, cellNum+1, cellNum+2)); - row1.createCell(cellNum + 3, HSSFCell.CELL_TYPE_STRING).setCellValue("二手房"); + row1.createCell(cellNum + 3, HSSFCell.CELL_TYPE_STRING).setCellValue("浜屾墜鎴�"); sheet.addMergedRegion(new CellRangeAddress(1, 1, cellNum+3, cellNum+4)); - row2.createCell(cellNum + 1, HSSFCell.CELL_TYPE_STRING).setCellValue("价格"); - row2.createCell(cellNum + 2, HSSFCell.CELL_TYPE_STRING).setCellValue("差比"); - row2.createCell(cellNum + 3, HSSFCell.CELL_TYPE_STRING).setCellValue("价格"); - row2.createCell(cellNum + 4, HSSFCell.CELL_TYPE_STRING).setCellValue("差比"); + row2.createCell(cellNum + 1, HSSFCell.CELL_TYPE_STRING).setCellValue("浠锋牸"); + row2.createCell(cellNum + 2, HSSFCell.CELL_TYPE_STRING).setCellValue("宸瘮"); + row2.createCell(cellNum + 3, HSSFCell.CELL_TYPE_STRING).setCellValue("浠锋牸"); + row2.createCell(cellNum + 4, HSSFCell.CELL_TYPE_STRING).setCellValue("宸瘮"); cellNum = cellNum +4; } } @@ -409,74 +409,74 @@ public class AverageStatisticsController { - /*row.createCell(5, HSSFCell.CELL_TYPE_STRING).setCellValue("中介调查"); - row.createCell(6, HSSFCell.CELL_TYPE_STRING).setCellValue("用户反馈"); + /*row.createCell(5, HSSFCell.CELL_TYPE_STRING).setCellValue("涓粙璋冩煡"); + row.createCell(6, HSSFCell.CELL_TYPE_STRING).setCellValue("鐢ㄦ埛鍙嶉"); - row.createCell(7, HSSFCell.CELL_TYPE_STRING).setCellValue("搜房"); + row.createCell(7, HSSFCell.CELL_TYPE_STRING).setCellValue("鎼滄埧"); sheet.addMergedRegion(new CellRangeAddress(0, 0, 7, 10)); - row.createCell(11, HSSFCell.CELL_TYPE_STRING).setCellValue("安居客"); + row.createCell(11, HSSFCell.CELL_TYPE_STRING).setCellValue("瀹夊眳瀹�"); sheet.addMergedRegion(new CellRangeAddress(0, 0, 11, 14)); - row.createCell(15, HSSFCell.CELL_TYPE_STRING).setCellValue("新浪乐居"); + row.createCell(15, HSSFCell.CELL_TYPE_STRING).setCellValue("鏂版氮涔愬眳"); sheet.addMergedRegion(new CellRangeAddress(0, 0, 15, 18)); - row.createCell(19, HSSFCell.CELL_TYPE_STRING).setCellValue("克尔瑞"); + row.createCell(19, HSSFCell.CELL_TYPE_STRING).setCellValue("鍏嬪皵鐟�"); sheet.addMergedRegion(new CellRangeAddress(0, 0, 19, 22)); - row.createCell(23, HSSFCell.CELL_TYPE_STRING).setCellValue("赶集网"); + row.createCell(23, HSSFCell.CELL_TYPE_STRING).setCellValue("璧堕泦缃�"); sheet.addMergedRegion(new CellRangeAddress(0, 0, 23, 26)); HSSFRow row1=sheet.createRow(1); row1.setRowStyle(style); - row1.createCell(0, HSSFCell.CELL_TYPE_STRING).setCellValue("区域"); + row1.createCell(0, HSSFCell.CELL_TYPE_STRING).setCellValue("鍖哄煙"); sheet.addMergedRegion(new CellRangeAddress(1, 2, 0, 0)); - row1.createCell(1, HSSFCell.CELL_TYPE_STRING).setCellValue("名称"); + row1.createCell(1, HSSFCell.CELL_TYPE_STRING).setCellValue("鍚嶇О"); sheet.addMergedRegion(new CellRangeAddress(1, 2, 1, 1)); - row1.createCell(2, HSSFCell.CELL_TYPE_STRING).setCellValue("计算均价"); + row1.createCell(2, HSSFCell.CELL_TYPE_STRING).setCellValue("璁$畻鍧囦环"); sheet.addMergedRegion(new CellRangeAddress(1, 2, 2, 2)); - row1.createCell(3, HSSFCell.CELL_TYPE_STRING).setCellValue("可信度"); + row1.createCell(3, HSSFCell.CELL_TYPE_STRING).setCellValue("鍙俊搴�"); sheet.addMergedRegion(new CellRangeAddress(1, 2, 3, 3)); sheet.addMergedRegion(new CellRangeAddress(0, 2, 4, 4)); sheet.addMergedRegion(new CellRangeAddress(0, 2, 5, 5)); sheet.addMergedRegion(new CellRangeAddress(0, 2, 6, 6)); - row1.createCell(7, HSSFCell.CELL_TYPE_STRING).setCellValue("新房"); + row1.createCell(7, HSSFCell.CELL_TYPE_STRING).setCellValue("鏂版埧"); sheet.addMergedRegion(new CellRangeAddress(1, 1, 7, 8)); - row1.createCell(9, HSSFCell.CELL_TYPE_STRING).setCellValue("二手房"); + row1.createCell(9, HSSFCell.CELL_TYPE_STRING).setCellValue("浜屾墜鎴�"); sheet.addMergedRegion(new CellRangeAddress(1, 1, 9, 10)); - row1.createCell(11, HSSFCell.CELL_TYPE_STRING).setCellValue("新房"); + row1.createCell(11, HSSFCell.CELL_TYPE_STRING).setCellValue("鏂版埧"); sheet.addMergedRegion(new CellRangeAddress(1, 1, 11, 12)); - row1.createCell(13, HSSFCell.CELL_TYPE_STRING).setCellValue("二手房"); + row1.createCell(13, HSSFCell.CELL_TYPE_STRING).setCellValue("浜屾墜鎴�"); sheet.addMergedRegion(new CellRangeAddress(1, 1, 13, 14)); - row1.createCell(15, HSSFCell.CELL_TYPE_STRING).setCellValue("新房"); + row1.createCell(15, HSSFCell.CELL_TYPE_STRING).setCellValue("鏂版埧"); sheet.addMergedRegion(new CellRangeAddress(1, 1, 15, 16)); - row1.createCell(17, HSSFCell.CELL_TYPE_STRING).setCellValue("二手房"); + row1.createCell(17, HSSFCell.CELL_TYPE_STRING).setCellValue("浜屾墜鎴�"); sheet.addMergedRegion(new CellRangeAddress(1, 1, 17, 18)); - row1.createCell(19, HSSFCell.CELL_TYPE_STRING).setCellValue("新房"); + row1.createCell(19, HSSFCell.CELL_TYPE_STRING).setCellValue("鏂版埧"); sheet.addMergedRegion(new CellRangeAddress(1, 1, 19, 20)); - row1.createCell(21, HSSFCell.CELL_TYPE_STRING).setCellValue("二手房"); + row1.createCell(21, HSSFCell.CELL_TYPE_STRING).setCellValue("浜屾墜鎴�"); sheet.addMergedRegion(new CellRangeAddress(1, 1, 21, 22)); - row1.createCell(23, HSSFCell.CELL_TYPE_STRING).setCellValue("新房"); + row1.createCell(23, HSSFCell.CELL_TYPE_STRING).setCellValue("鏂版埧"); sheet.addMergedRegion(new CellRangeAddress(1, 1, 23, 24)); - row1.createCell(25, HSSFCell.CELL_TYPE_STRING).setCellValue("二手房"); + row1.createCell(25, HSSFCell.CELL_TYPE_STRING).setCellValue("浜屾墜鎴�"); sheet.addMergedRegion(new CellRangeAddress(1, 1, 25, 26)); HSSFRow row2 = sheet.createRow(2); row2.setRowStyle(style); - row2.createCell(7, HSSFCell.CELL_TYPE_STRING).setCellValue("价格"); - row2.createCell(8, HSSFCell.CELL_TYPE_STRING).setCellValue("差比"); - row2.createCell(9, HSSFCell.CELL_TYPE_STRING).setCellValue("价格"); - row2.createCell(10, HSSFCell.CELL_TYPE_STRING).setCellValue("差比"); - row2.createCell(11, HSSFCell.CELL_TYPE_STRING).setCellValue("价格"); - row2.createCell(12, HSSFCell.CELL_TYPE_STRING).setCellValue("差比"); - row2.createCell(13, HSSFCell.CELL_TYPE_STRING).setCellValue("价格"); - row2.createCell(14, HSSFCell.CELL_TYPE_STRING).setCellValue("差比"); - row2.createCell(15, HSSFCell.CELL_TYPE_STRING).setCellValue("价格"); - row2.createCell(16, HSSFCell.CELL_TYPE_STRING).setCellValue("差比"); - row2.createCell(17, HSSFCell.CELL_TYPE_STRING).setCellValue("价格"); - row2.createCell(18, HSSFCell.CELL_TYPE_STRING).setCellValue("差比"); - row2.createCell(19, HSSFCell.CELL_TYPE_STRING).setCellValue("价格"); - row2.createCell(20, HSSFCell.CELL_TYPE_STRING).setCellValue("差比"); - row2.createCell(21, HSSFCell.CELL_TYPE_STRING).setCellValue("价格"); - row2.createCell(22, HSSFCell.CELL_TYPE_STRING).setCellValue("差比"); - row2.createCell(23, HSSFCell.CELL_TYPE_STRING).setCellValue("价格"); - row2.createCell(24, HSSFCell.CELL_TYPE_STRING).setCellValue("差比"); - row2.createCell(25, HSSFCell.CELL_TYPE_STRING).setCellValue("价格"); - row2.createCell(26, HSSFCell.CELL_TYPE_STRING).setCellValue("差比");*/ + row2.createCell(7, HSSFCell.CELL_TYPE_STRING).setCellValue("浠锋牸"); + row2.createCell(8, HSSFCell.CELL_TYPE_STRING).setCellValue("宸瘮"); + row2.createCell(9, HSSFCell.CELL_TYPE_STRING).setCellValue("浠锋牸"); + row2.createCell(10, HSSFCell.CELL_TYPE_STRING).setCellValue("宸瘮"); + row2.createCell(11, HSSFCell.CELL_TYPE_STRING).setCellValue("浠锋牸"); + row2.createCell(12, HSSFCell.CELL_TYPE_STRING).setCellValue("宸瘮"); + row2.createCell(13, HSSFCell.CELL_TYPE_STRING).setCellValue("浠锋牸"); + row2.createCell(14, HSSFCell.CELL_TYPE_STRING).setCellValue("宸瘮"); + row2.createCell(15, HSSFCell.CELL_TYPE_STRING).setCellValue("浠锋牸"); + row2.createCell(16, HSSFCell.CELL_TYPE_STRING).setCellValue("宸瘮"); + row2.createCell(17, HSSFCell.CELL_TYPE_STRING).setCellValue("浠锋牸"); + row2.createCell(18, HSSFCell.CELL_TYPE_STRING).setCellValue("宸瘮"); + row2.createCell(19, HSSFCell.CELL_TYPE_STRING).setCellValue("浠锋牸"); + row2.createCell(20, HSSFCell.CELL_TYPE_STRING).setCellValue("宸瘮"); + row2.createCell(21, HSSFCell.CELL_TYPE_STRING).setCellValue("浠锋牸"); + row2.createCell(22, HSSFCell.CELL_TYPE_STRING).setCellValue("宸瘮"); + row2.createCell(23, HSSFCell.CELL_TYPE_STRING).setCellValue("浠锋牸"); + row2.createCell(24, HSSFCell.CELL_TYPE_STRING).setCellValue("宸瘮"); + row2.createCell(25, HSSFCell.CELL_TYPE_STRING).setCellValue("浠锋牸"); + row2.createCell(26, HSSFCell.CELL_TYPE_STRING).setCellValue("宸瘮");*/ } public Object exportOfficeExcelAction(AverageStatisticsModel model){ @@ -490,8 +490,8 @@ public class AverageStatisticsController { HSSFWorkbook wb = new HSSFWorkbook(); HSSFSheet sheet = wb.createSheet(model.getCityDisplay()); HSSFCellStyle setBorder = wb.createCellStyle(); - setBorder.setAlignment(CellStyle.ALIGN_CENTER);//水平居中 - setBorder.setVerticalAlignment(CellStyle.ALIGN_CENTER);//垂直居中 + setBorder.setAlignment(CellStyle.ALIGN_CENTER);//姘村钩灞呬腑 + setBorder.setVerticalAlignment(CellStyle.ALIGN_CENTER);//鍨傜洿灞呬腑 setBorder.setFillBackgroundColor((short)13); initOfficeTableHeader(sheet,setBorder); List list = averageStatisticsDao.find("office",model.getCityDisplay(), model.getShortDate(),model.getRegion(),model.getName(),model.getLevel(),model.getMaxDeviate(),null ,model.getOrderby(), Boolean.valueOf(model.getAsc()),model.getDiffField(),model.getMin(),model.getMax(),null); @@ -544,19 +544,19 @@ public class AverageStatisticsController { } i++; } - String fileName = "写字楼均价对比(" + model.getShortDate() + ").xls"; + String fileName = "鍐欏瓧妤煎潎浠峰姣�(" + model.getShortDate() + ").xls"; OutputStream os =null; try { HttpServletResponse response = ActionContext.getContext().getResponse(); response.setCharacterEncoding("UTF-8"); - //response.reset();// 清空输出流 + //response.reset();// 娓呯┖杈撳嚭娴� response.setContentType("application/x-download;charset=UTF-8"); fileName = new String(fileName.getBytes("GBK"),"ISO-8859-1"); - if(fileName.length()>150){//解决IE 6.0 bug + if(fileName.length()>150){//瑙e喅IE 6.0 bug fileName = new String(fileName.getBytes("GBK"),"ISO-8859-1"); } response.setHeader( "Content-Disposition", "attachment;filename=" + fileName); - os = response.getOutputStream();// 取得输出流 + os = response.getOutputStream();// 鍙栧緱杈撳嚭娴� wb.write(os); os.flush(); }catch (Exception e) { @@ -579,52 +579,52 @@ public class AverageStatisticsController { HSSFRow row=sheet.createRow(0); sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 1)); - row.createCell(2, HSSFCell.CELL_TYPE_STRING).setCellValue("房价网"); + row.createCell(2, HSSFCell.CELL_TYPE_STRING).setCellValue("鎴夸环缃�"); sheet.addMergedRegion(new CellRangeAddress(0, 0, 2, 3)); - row.createCell(4, HSSFCell.CELL_TYPE_STRING).setCellValue("搜房网"); + row.createCell(4, HSSFCell.CELL_TYPE_STRING).setCellValue("鎼滄埧缃�"); sheet.addMergedRegion(new CellRangeAddress(0, 0, 4, 7)); - row.createCell(8, HSSFCell.CELL_TYPE_STRING).setCellValue("安居客"); + row.createCell(8, HSSFCell.CELL_TYPE_STRING).setCellValue("瀹夊眳瀹�"); sheet.addMergedRegion(new CellRangeAddress(0, 0, 8, 11)); - row.createCell(12, HSSFCell.CELL_TYPE_STRING).setCellValue("中国写字楼网"); + row.createCell(12, HSSFCell.CELL_TYPE_STRING).setCellValue("涓浗鍐欏瓧妤肩綉"); sheet.addMergedRegion(new CellRangeAddress(0, 0,12, 15)); row.setRowStyle(style); HSSFRow row1=sheet.createRow(1); row1.setRowStyle(style); - row1.createCell(0, HSSFCell.CELL_TYPE_STRING).setCellValue("区域"); + row1.createCell(0, HSSFCell.CELL_TYPE_STRING).setCellValue("鍖哄煙"); sheet.addMergedRegion(new CellRangeAddress(1, 2, 0, 0)); - row1.createCell(1, HSSFCell.CELL_TYPE_STRING).setCellValue("名称"); + row1.createCell(1, HSSFCell.CELL_TYPE_STRING).setCellValue("鍚嶇О"); sheet.addMergedRegion(new CellRangeAddress(1, 2, 1, 1)); - row1.createCell(2, HSSFCell.CELL_TYPE_STRING).setCellValue("售价"); + row1.createCell(2, HSSFCell.CELL_TYPE_STRING).setCellValue("鍞环"); sheet.addMergedRegion(new CellRangeAddress(1, 2, 2, 2)); - row1.createCell(3, HSSFCell.CELL_TYPE_STRING).setCellValue("租金"); + row1.createCell(3, HSSFCell.CELL_TYPE_STRING).setCellValue("绉熼噾"); sheet.addMergedRegion(new CellRangeAddress(1, 2, 3, 3)); - row1.createCell(4, HSSFCell.CELL_TYPE_STRING).setCellValue("售价"); + row1.createCell(4, HSSFCell.CELL_TYPE_STRING).setCellValue("鍞环"); sheet.addMergedRegion(new CellRangeAddress(1, 1, 4, 5)); - row1.createCell(6, HSSFCell.CELL_TYPE_STRING).setCellValue("租金"); + row1.createCell(6, HSSFCell.CELL_TYPE_STRING).setCellValue("绉熼噾"); sheet.addMergedRegion(new CellRangeAddress(1, 1, 6, 7)); - row1.createCell(8, HSSFCell.CELL_TYPE_STRING).setCellValue("售价"); + row1.createCell(8, HSSFCell.CELL_TYPE_STRING).setCellValue("鍞环"); sheet.addMergedRegion(new CellRangeAddress(1, 1, 8, 9)); - row1.createCell(10, HSSFCell.CELL_TYPE_STRING).setCellValue("租金"); + row1.createCell(10, HSSFCell.CELL_TYPE_STRING).setCellValue("绉熼噾"); sheet.addMergedRegion(new CellRangeAddress(1, 1, 10, 11)); - row1.createCell(12, HSSFCell.CELL_TYPE_STRING).setCellValue("售价"); + row1.createCell(12, HSSFCell.CELL_TYPE_STRING).setCellValue("鍞环"); sheet.addMergedRegion(new CellRangeAddress(1, 1, 12, 13)); - row1.createCell(14, HSSFCell.CELL_TYPE_STRING).setCellValue("租金"); + row1.createCell(14, HSSFCell.CELL_TYPE_STRING).setCellValue("绉熼噾"); sheet.addMergedRegion(new CellRangeAddress(1, 1, 14, 15)); HSSFRow row2 = sheet.createRow(2); row2.setRowStyle(style); - row2.createCell(4, HSSFCell.CELL_TYPE_STRING).setCellValue("价格"); - row2.createCell(5, HSSFCell.CELL_TYPE_STRING).setCellValue("差比"); - row2.createCell(6, HSSFCell.CELL_TYPE_STRING).setCellValue("价格"); - row2.createCell(7, HSSFCell.CELL_TYPE_STRING).setCellValue("差比"); - row2.createCell(8, HSSFCell.CELL_TYPE_STRING).setCellValue("价格"); - row2.createCell(9, HSSFCell.CELL_TYPE_STRING).setCellValue("差比"); - row2.createCell(10, HSSFCell.CELL_TYPE_STRING).setCellValue("价格"); - row2.createCell(11, HSSFCell.CELL_TYPE_STRING).setCellValue("差比"); - row2.createCell(12, HSSFCell.CELL_TYPE_STRING).setCellValue("价格"); - row2.createCell(13, HSSFCell.CELL_TYPE_STRING).setCellValue("差比"); - row2.createCell(14, HSSFCell.CELL_TYPE_STRING).setCellValue("价格"); - row2.createCell(15, HSSFCell.CELL_TYPE_STRING).setCellValue("差比"); + row2.createCell(4, HSSFCell.CELL_TYPE_STRING).setCellValue("浠锋牸"); + row2.createCell(5, HSSFCell.CELL_TYPE_STRING).setCellValue("宸瘮"); + row2.createCell(6, HSSFCell.CELL_TYPE_STRING).setCellValue("浠锋牸"); + row2.createCell(7, HSSFCell.CELL_TYPE_STRING).setCellValue("宸瘮"); + row2.createCell(8, HSSFCell.CELL_TYPE_STRING).setCellValue("浠锋牸"); + row2.createCell(9, HSSFCell.CELL_TYPE_STRING).setCellValue("宸瘮"); + row2.createCell(10, HSSFCell.CELL_TYPE_STRING).setCellValue("浠锋牸"); + row2.createCell(11, HSSFCell.CELL_TYPE_STRING).setCellValue("宸瘮"); + row2.createCell(12, HSSFCell.CELL_TYPE_STRING).setCellValue("浠锋牸"); + row2.createCell(13, HSSFCell.CELL_TYPE_STRING).setCellValue("宸瘮"); + row2.createCell(14, HSSFCell.CELL_TYPE_STRING).setCellValue("浠锋牸"); + row2.createCell(15, HSSFCell.CELL_TYPE_STRING).setCellValue("宸瘮"); } public Object exportShopExcelAction(AverageStatisticsModel model){ if (StringUtils.isBlank(model.getCityDisplay())) { @@ -637,8 +637,8 @@ public class AverageStatisticsController { HSSFWorkbook wb = new HSSFWorkbook(); HSSFSheet sheet = wb.createSheet(model.getCityDisplay()); HSSFCellStyle setBorder = wb.createCellStyle(); - setBorder.setAlignment(CellStyle.ALIGN_CENTER);//水平居中 - setBorder.setVerticalAlignment(CellStyle.VERTICAL_CENTER);//垂直居中 + setBorder.setAlignment(CellStyle.ALIGN_CENTER);//姘村钩灞呬腑 + setBorder.setVerticalAlignment(CellStyle.VERTICAL_CENTER);//鍨傜洿灞呬腑 setBorder.setFillBackgroundColor((short)13); initShopTableHeader(sheet,setBorder); List list = averageStatisticsDao.find("shop",model.getCityDisplay(), model.getShortDate(),model.getRegion(),model.getName(),model.getLevel(),model.getMaxDeviate(),null ,model.getOrderby(), Boolean.valueOf(model.getAsc()),model.getDiffField(),model.getMin(),model.getMax(), null); @@ -693,19 +693,19 @@ public class AverageStatisticsController { row.createCell(12, HSSFCell.CELL_TYPE_STRING).setCellValue( StringUtils.isEmpty(estate) ? "": estate); i++; } - String fileName = "商铺均价对比(" + model.getShortDate() + ").xls"; + String fileName = "鍟嗛摵鍧囦环瀵规瘮(" + model.getShortDate() + ").xls"; OutputStream os =null; try { HttpServletResponse response = ActionContext.getContext().getResponse(); response.setCharacterEncoding("UTF-8"); - //response.reset();// 清空输出流 + //response.reset();// 娓呯┖杈撳嚭娴� response.setContentType("application/x-download;charset=UTF-8"); fileName = new String(fileName.getBytes("GBK"),"ISO-8859-1"); - if(fileName.length()>150){//解决IE 6.0 bug + if(fileName.length()>150){//瑙e喅IE 6.0 bug fileName = new String(fileName.getBytes("GBK"),"ISO-8859-1"); } response.setHeader( "Content-Disposition", "attachment;filename=" + fileName); - os = response.getOutputStream();// 取得输出流 + os = response.getOutputStream();// 鍙栧緱杈撳嚭娴� wb.write(os); os.flush(); }catch (Exception e) { @@ -727,42 +727,42 @@ public class AverageStatisticsController { HSSFRow row=sheet.createRow(0); row.setRowStyle(style); sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 1)); - row.createCell(2, HSSFCell.CELL_TYPE_STRING).setCellValue("房价网"); + row.createCell(2, HSSFCell.CELL_TYPE_STRING).setCellValue("鎴夸环缃�"); sheet.addMergedRegion(new CellRangeAddress(0, 0, 2, 3)); - row.createCell(4, HSSFCell.CELL_TYPE_STRING).setCellValue("搜房网"); + row.createCell(4, HSSFCell.CELL_TYPE_STRING).setCellValue("鎼滄埧缃�"); sheet.addMergedRegion(new CellRangeAddress(0, 0, 4, 7)); - row.createCell(8, HSSFCell.CELL_TYPE_STRING).setCellValue("安居客"); + row.createCell(8, HSSFCell.CELL_TYPE_STRING).setCellValue("瀹夊眳瀹�"); sheet.addMergedRegion(new CellRangeAddress(0, 0, 8, 11)); HSSFRow row1=sheet.createRow(1); row1.setRowStyle(style); - row1.createCell(0, HSSFCell.CELL_TYPE_STRING).setCellValue("区域"); + row1.createCell(0, HSSFCell.CELL_TYPE_STRING).setCellValue("鍖哄煙"); sheet.addMergedRegion(new CellRangeAddress(1, 2, 0, 0)); - row1.createCell(1, HSSFCell.CELL_TYPE_STRING).setCellValue("名称"); + row1.createCell(1, HSSFCell.CELL_TYPE_STRING).setCellValue("鍚嶇О"); sheet.addMergedRegion(new CellRangeAddress(1, 2, 1, 1)); - row1.createCell(2, HSSFCell.CELL_TYPE_STRING).setCellValue("售价"); + row1.createCell(2, HSSFCell.CELL_TYPE_STRING).setCellValue("鍞环"); sheet.addMergedRegion(new CellRangeAddress(1, 2, 2, 2)); - row1.createCell(3, HSSFCell.CELL_TYPE_STRING).setCellValue("租金"); + row1.createCell(3, HSSFCell.CELL_TYPE_STRING).setCellValue("绉熼噾"); sheet.addMergedRegion(new CellRangeAddress(1, 2, 3, 3)); - row1.createCell(4, HSSFCell.CELL_TYPE_STRING).setCellValue("售价"); + row1.createCell(4, HSSFCell.CELL_TYPE_STRING).setCellValue("鍞环"); sheet.addMergedRegion(new CellRangeAddress(1, 1, 4, 5)); - row1.createCell(6, HSSFCell.CELL_TYPE_STRING).setCellValue("租金"); + row1.createCell(6, HSSFCell.CELL_TYPE_STRING).setCellValue("绉熼噾"); sheet.addMergedRegion(new CellRangeAddress(1, 1, 6, 7)); - row1.createCell(8, HSSFCell.CELL_TYPE_STRING).setCellValue("售价"); + row1.createCell(8, HSSFCell.CELL_TYPE_STRING).setCellValue("鍞环"); sheet.addMergedRegion(new CellRangeAddress(1, 1, 8, 9)); - row1.createCell(10, HSSFCell.CELL_TYPE_STRING).setCellValue("租金"); + row1.createCell(10, HSSFCell.CELL_TYPE_STRING).setCellValue("绉熼噾"); sheet.addMergedRegion(new CellRangeAddress(1, 1, 10, 11)); HSSFRow row2 = sheet.createRow(2); row2.setRowStyle(style); - row2.createCell(4, HSSFCell.CELL_TYPE_STRING).setCellValue("价格"); - row2.createCell(5, HSSFCell.CELL_TYPE_STRING).setCellValue("差比"); - row2.createCell(6, HSSFCell.CELL_TYPE_STRING).setCellValue("价格"); - row2.createCell(7, HSSFCell.CELL_TYPE_STRING).setCellValue("差比"); - row2.createCell(8, HSSFCell.CELL_TYPE_STRING).setCellValue("价格"); - row2.createCell(9, HSSFCell.CELL_TYPE_STRING).setCellValue("差比"); - row2.createCell(10, HSSFCell.CELL_TYPE_STRING).setCellValue("价格"); - row2.createCell(11, HSSFCell.CELL_TYPE_STRING).setCellValue("差比"); - row2.createCell(12, HSSFCell.CELL_TYPE_STRING).setCellValue("物业类型"); + row2.createCell(4, HSSFCell.CELL_TYPE_STRING).setCellValue("浠锋牸"); + row2.createCell(5, HSSFCell.CELL_TYPE_STRING).setCellValue("宸瘮"); + row2.createCell(6, HSSFCell.CELL_TYPE_STRING).setCellValue("浠锋牸"); + row2.createCell(7, HSSFCell.CELL_TYPE_STRING).setCellValue("宸瘮"); + row2.createCell(8, HSSFCell.CELL_TYPE_STRING).setCellValue("浠锋牸"); + row2.createCell(9, HSSFCell.CELL_TYPE_STRING).setCellValue("宸瘮"); + row2.createCell(10, HSSFCell.CELL_TYPE_STRING).setCellValue("浠锋牸"); + row2.createCell(11, HSSFCell.CELL_TYPE_STRING).setCellValue("宸瘮"); + row2.createCell(12, HSSFCell.CELL_TYPE_STRING).setCellValue("鐗╀笟绫诲瀷"); } public Object summaryAction(AverageStatisticsModel model){ @@ -787,9 +787,9 @@ public class AverageStatisticsController { int row =0; for(int i=7;i>=-8;i--){ if(i==7){ - data[row][0]="70以上"; + data[row][0]="70浠ヤ笂"; }else if(i==-8){ - data[row][0]="-70以下"; + data[row][0]="-70浠ヤ笅"; }else{ data[row][0]=(i*10)+"~"+((i+1)*10); } @@ -830,15 +830,15 @@ public class AverageStatisticsController { x.remove(0); String[] sites = {"soufang_new","anjuke_new","sina_new","cric_new","soufang_esf","anjuke_esf","sina_esf","cric_esf","ganji_esf"}; Map citiesNamesMap =new HashMap(); - citiesNamesMap.put("soufang_new", "搜房新房"); - citiesNamesMap.put("anjuke_new", "安居客新房"); - citiesNamesMap.put("sina_new", "新浪新房"); - citiesNamesMap.put("cric_new", "克尔瑞新房"); - citiesNamesMap.put("soufang_esf", "搜房二手房"); - citiesNamesMap.put("anjuke_esf", "安居客二手房"); - citiesNamesMap.put("sina_esf", "新浪二手房"); - citiesNamesMap.put("cric_esf", "克尔瑞二手房"); - citiesNamesMap.put("ganji_esf", "赶集网二手房"); + citiesNamesMap.put("soufang_new", "鎼滄埧鏂版埧"); + citiesNamesMap.put("anjuke_new", "瀹夊眳瀹㈡柊鎴�"); + citiesNamesMap.put("sina_new", "鏂版氮鏂版埧"); + citiesNamesMap.put("cric_new", "鍏嬪皵鐟炴柊鎴�"); + citiesNamesMap.put("soufang_esf", "鎼滄埧浜屾墜鎴�"); + citiesNamesMap.put("anjuke_esf", "瀹夊眳瀹簩鎵嬫埧"); + citiesNamesMap.put("sina_esf", "鏂版氮浜屾墜鎴�"); + citiesNamesMap.put("cric_esf", "鍏嬪皵鐟炰簩鎵嬫埧"); + citiesNamesMap.put("ganji_esf", "璧堕泦缃戜簩鎵嬫埧"); BasicDBList y = new BasicDBList(); BasicDBObject unit ; for(String site:sites){ @@ -885,9 +885,9 @@ public class AverageStatisticsController { int row =0; for(int i=7;i>=-8;i--){ if(i==7){ - data[row][0]="70以上"; + data[row][0]="70浠ヤ笂"; }else if(i==-8){ - data[row][0]="-70以下"; + data[row][0]="-70浠ヤ笅"; }else{ data[row][0]=(i*10)+"~"+((i+1)*10); } @@ -937,9 +937,9 @@ public class AverageStatisticsController { int row =0; for(int i=7;i>=-8;i--){ if(i==7){ - data[row][0]="70以上"; + data[row][0]="70浠ヤ笂"; }else if(i==-8){ - data[row][0]="-70以下"; + data[row][0]="-70浠ヤ笅"; }else{ data[row][0]=(i*10)+"~"+((i+1)*10); } @@ -962,7 +962,7 @@ public class AverageStatisticsController { } /** - * 查询基准数据 + * 鏌ヨ鍩哄噯鏁版嵁 * @param model * @return */ @@ -977,18 +977,18 @@ public class AverageStatisticsController { public Object expectAction(AverageStatisticsModel model) { List> data=new ArrayList>(); List list=new ArrayList(); - list.add("城市"); - list.add("区域"); - list.add("小区名"); - list.add("价格"); - list.add("是否加入指导价"); - list.add("调查时间"); - list.add("调查人"); - list.add("来源"); - list.add("来源小区名"); + list.add("鍩庡競"); + list.add("鍖哄煙"); + list.add("灏忓尯鍚�"); + list.add("浠锋牸"); + list.add("鏄惁鍔犲叆鎸囧浠�"); + list.add("璋冩煡鏃堕棿"); + list.add("璋冩煡浜�"); + list.add("鏉ユ簮"); + list.add("鏉ユ簮灏忓尯鍚�"); data.add(list); HSSFWorkbook workbook = new HSSFWorkbook(); - HSSFSheet sheet = workbook.createSheet("导入模板"); + HSSFSheet sheet = workbook.createSheet("瀵煎叆妯℃澘"); HSSFRow row = sheet.createRow(0); HSSFCell cell0 = row.createCell(0); HSSFCell cell1 = row.createCell(1); @@ -999,15 +999,15 @@ public class AverageStatisticsController { HSSFCell cell6 = row.createCell(6); HSSFCell cell7 = row.createCell(7); HSSFCell cell8 = row.createCell(8); - cell0.setCellValue("城市"); - cell1.setCellValue("区域"); - cell2.setCellValue("小区名"); - cell3.setCellValue("价格"); - cell4.setCellValue("是否加入指导价"); - cell5.setCellValue("调查时间"); - cell6.setCellValue("调查人"); - cell7.setCellValue("来源"); - cell8.setCellValue("来源小区名"); + cell0.setCellValue("鍩庡競"); + cell1.setCellValue("鍖哄煙"); + cell2.setCellValue("灏忓尯鍚�"); + cell3.setCellValue("浠锋牸"); + cell4.setCellValue("鏄惁鍔犲叆鎸囧浠�"); + cell5.setCellValue("璋冩煡鏃堕棿"); + cell6.setCellValue("璋冩煡浜�"); + cell7.setCellValue("鏉ユ簮"); + cell8.setCellValue("鏉ユ簮灏忓尯鍚�"); HttpServletResponse response = ActionContext.getContext().getResponse(); response.setCharacterEncoding("UTF-8"); response.setContentType("application/x-download;charset=UTF-8"); @@ -1024,7 +1024,7 @@ public class AverageStatisticsController { } /** - * 调查数据 + * 璋冩煡鏁版嵁 * @param model * @return */ @@ -1043,7 +1043,7 @@ public class AverageStatisticsController { } /** - * 保存调查结果 + * 淇濆瓨璋冩煡缁撴灉 * @param model * @return */ @@ -1072,7 +1072,7 @@ public class AverageStatisticsController { } /** - * 审核调查结果 + * 瀹℃牳璋冩煡缁撴灉 * @param model * @return */ @@ -1102,7 +1102,7 @@ public class AverageStatisticsController { } /** - * 查询准确率 + * 鏌ヨ鍑嗙‘鐜� * @param model * @return */ @@ -1149,7 +1149,7 @@ public class AverageStatisticsController { } /** - * 获取调查记录列表 + * 鑾峰彇璋冩煡璁板綍鍒楄〃 * @param model * @return */ diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/AveragerConfigController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/AveragerConfigController.java index 55a1fafcf..0ce3695b4 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/AveragerConfigController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/AveragerConfigController.java @@ -83,7 +83,7 @@ public class AveragerConfigController { List serverAreas = serverAreaService.findAllServerArea(); Map averagerConfigMap = getAllCityAveragerConfigMap(); for (ServerAreaBo serverAreaBo : serverAreas) { - if ("全国".equals(serverAreaBo.getDisplay())) { + if ("鍏ㄥ浗".equals(serverAreaBo.getDisplay())) { continue; } AveragerConfig averagerConfig = averagerConfigMap.get(serverAreaBo.getDisplay()); 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 9e99dd400..a08009bb0 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 @@ -72,9 +72,9 @@ import com.mongodb.DBObject; /** * - * 说明:负责均价更新任务的管理工作 + * 璇存槑:璐熻矗鍧囦环鏇存柊浠诲姟鐨勭鐞嗗伐浣� * - * @author 王文艳 + * @author 鐜嬫枃鑹� * */ public class AvgPriceUpdateController { @@ -96,17 +96,17 @@ public class AvgPriceUpdateController { private SeawaterService seawaterService; private static final List IPS = Arrays.asList("fangjia-priceanalysis-0"); - private static final List HOT_CITIES = Arrays.asList("上海", "北京", "广州", "深圳", "天津", "重庆", "成都", "杭州", "南京", "长沙", - "武汉", "西安", "沈阳"); + private static final List HOT_CITIES = Arrays.asList("涓婃捣", "鍖椾含", "骞垮窞", "娣卞湷", "澶╂触", "閲嶅簡", "鎴愰兘", "鏉窞", "鍗椾含", "闀挎矙", + "姝︽眽", "瑗垮畨", "娌堥槼"); public Object listQRAction(AvgPriceUpdateModel model) { if(StringUtils.isBlank(model.getCityDisplay())) { - model.setCityDisplay("全国"); + model.setCityDisplay("鍏ㄥ浗"); } if(model.getSdateStart() <= 0 || model.getSdateEnd() <= 0) { Date sunday = DateUtil.getThisSunday(new Date()); - model.setSdateStart(Integer.parseInt(DateUtil.formatToTightYYYYMMDD(DateUtil.getBeforeDay(sunday, 13 * 7)))); //最近一季度 + model.setSdateStart(Integer.parseInt(DateUtil.formatToTightYYYYMMDD(DateUtil.getBeforeDay(sunday, 13 * 7)))); //鏈�杩戜竴瀛e害 model.setSdateEnd(Integer.parseInt(DateUtil.formatToTightYYYYMMDD(sunday))); } @@ -123,12 +123,12 @@ public class AvgPriceUpdateController { public Object listSQRAction(AvgPriceUpdateModel model) { if(StringUtils.isBlank(model.getCityDisplay())) { - model.setCityDisplay("全国"); + model.setCityDisplay("鍏ㄥ浗"); } if(model.getSdateStart() <= 0 || model.getSdateEnd() <= 0) { Date sunday = DateUtil.getThisSunday(new Date()); - model.setSdateStart(Integer.parseInt(DateUtil.formatToTightYYYYMMDD(DateUtil.getBeforeDay(sunday, 13 * 7)))); //最近一季度 + model.setSdateStart(Integer.parseInt(DateUtil.formatToTightYYYYMMDD(DateUtil.getBeforeDay(sunday, 13 * 7)))); //鏈�杩戜竴瀛e害 model.setSdateEnd(Integer.parseInt(DateUtil.formatToTightYYYYMMDD(sunday))); } @@ -144,12 +144,12 @@ public class AvgPriceUpdateController { public Object loadQRDataAction(AvgPriceUpdateModel model) { if(StringUtils.isBlank(model.getCityDisplay())) { - model.setCityDisplay("全国"); + model.setCityDisplay("鍏ㄥ浗"); } if(model.getSdateStart() <= 0 || model.getSdateEnd() <= 0) { Date sunday = DateUtil.getThisSunday(new Date()); - model.setSdateStart(Integer.parseInt(DateUtil.formatToTightYYYYMMDD(DateUtil.getBeforeDay(sunday, 13)))); //最近一季度 + model.setSdateStart(Integer.parseInt(DateUtil.formatToTightYYYYMMDD(DateUtil.getBeforeDay(sunday, 13)))); //鏈�杩戜竴瀛e害 model.setSdateEnd(Integer.parseInt(DateUtil.formatToTightYYYYMMDD(sunday))); } @@ -164,12 +164,12 @@ public class AvgPriceUpdateController { public Object loadSQRDataAction(AvgPriceUpdateModel model) { if(StringUtils.isBlank(model.getCityDisplay())) { - model.setCityDisplay("全国"); + model.setCityDisplay("鍏ㄥ浗"); } if(model.getSdateStart() <= 0 || model.getSdateEnd() <= 0) { Date sunday = DateUtil.getThisSunday(new Date()); - model.setSdateStart(Integer.parseInt(DateUtil.formatToTightYYYYMMDD(DateUtil.getBeforeDay(sunday, 13)))); //最近一季度 + model.setSdateStart(Integer.parseInt(DateUtil.formatToTightYYYYMMDD(DateUtil.getBeforeDay(sunday, 13)))); //鏈�杩戜竴瀛e害 model.setSdateEnd(Integer.parseInt(DateUtil.formatToTightYYYYMMDD(sunday))); } @@ -193,9 +193,9 @@ public class AvgPriceUpdateController { pt5 = new JSONArray(), pt6 = new JSONArray(), pt7 = new JSONArray(), pt8 = new JSONArray(); if("1".equals(stype)) { - jo1.put("name", "一个月<10小区量"); - jo2.put("name", "一个月<30小区量"); - jo3.put("name", "一个月<100小区量"); + jo1.put("name", "涓�涓湀<10灏忓尯閲�"); + jo2.put("name", "涓�涓湀<30灏忓尯閲�"); + jo3.put("name", "涓�涓湀<100灏忓尯閲�"); for(SampleQualityReport sqr : sampleQualityReports) { long tms = DateUtil.parseDate(String.valueOf(sqr.getWeekend()), "yyyyMMdd").getTime(); pt1.add(JSONArray.fromObject("[" + tms + "," + sqr.getMonthCount1() + "]")); @@ -203,9 +203,9 @@ public class AvgPriceUpdateController { pt3.add(JSONArray.fromObject("[" + tms + "," + sqr.getMonthCount3() + "]")); } }else if("2".equals(stype)) { - jo1.put("name", "一个月<10比例"); - jo2.put("name", "一个月<30比例"); - jo3.put("name", "一个月<100比例"); + jo1.put("name", "涓�涓湀<10姣斾緥"); + jo2.put("name", "涓�涓湀<30姣斾緥"); + jo3.put("name", "涓�涓湀<100姣斾緥"); for(SampleQualityReport sqr : sampleQualityReports) { long tms = DateUtil.parseDate(String.valueOf(sqr.getWeekend()), "yyyyMMdd").getTime(); pt1.add(JSONArray.fromObject("[" + tms + "," + (int)((double)sqr.getMonthCount1() / (double)sqr.getDistrictCount() * 1000.0) / 10.0 + "]")); @@ -213,9 +213,9 @@ public class AvgPriceUpdateController { pt3.add(JSONArray.fromObject("[" + tms + "," + (int)((double)sqr.getMonthCount3() / (double)sqr.getDistrictCount() * 1000.0) / 10.0+ "]")); } }else if("3".equals(stype)) { - jo1.put("name", "季度<10小区量"); - jo2.put("name", "季度<30小区量"); - jo3.put("name", "季度<100小区量"); + jo1.put("name", "瀛e害<10灏忓尯閲�"); + jo2.put("name", "瀛e害<30灏忓尯閲�"); + jo3.put("name", "瀛e害<100灏忓尯閲�"); for(SampleQualityReport sqr : sampleQualityReports) { long tms = DateUtil.parseDate(String.valueOf(sqr.getWeekend()), "yyyyMMdd").getTime(); pt1.add(JSONArray.fromObject("[" + tms + "," + sqr.getQuarCount1() + "]")); @@ -223,9 +223,9 @@ public class AvgPriceUpdateController { pt3.add(JSONArray.fromObject("[" + tms + "," + sqr.getQuarCount3() + "]")); } }else if("4".equals(stype)) { - jo1.put("name", "季度<10比例"); - jo2.put("name", "季度<30比例"); - jo3.put("name", "季度<100比例"); + jo1.put("name", "瀛e害<10姣斾緥"); + jo2.put("name", "瀛e害<30姣斾緥"); + jo3.put("name", "瀛e害<100姣斾緥"); for(SampleQualityReport sqr : sampleQualityReports) { long tms = DateUtil.parseDate(String.valueOf(sqr.getWeekend()), "yyyyMMdd").getTime(); pt1.add(JSONArray.fromObject("[" + tms + "," + (int)((double)sqr.getQuarCount1() / (double)sqr.getDistrictCount() * 1000.0) / 10.0 + "]")); @@ -233,9 +233,9 @@ public class AvgPriceUpdateController { pt3.add(JSONArray.fromObject("[" + tms + "," + (int)((double)sqr.getQuarCount3() / (double)sqr.getDistrictCount() * 1000.0) / 10.0+ "]")); } }else if("5".equals(stype)) { - jo1.put("name", "半年<10小区量"); - jo2.put("name", "半年<30小区量"); - jo3.put("name", "半年<100小区量"); + jo1.put("name", "鍗婂勾<10灏忓尯閲�"); + jo2.put("name", "鍗婂勾<30灏忓尯閲�"); + jo3.put("name", "鍗婂勾<100灏忓尯閲�"); for(SampleQualityReport sqr : sampleQualityReports) { long tms = DateUtil.parseDate(String.valueOf(sqr.getWeekend()), "yyyyMMdd").getTime(); pt1.add(JSONArray.fromObject("[" + tms + "," + sqr.getHalfCount1() + "]")); @@ -243,9 +243,9 @@ public class AvgPriceUpdateController { pt3.add(JSONArray.fromObject("[" + tms + "," + sqr.getHalfCount3() + "]")); } }else if("6".equals(stype)) { - jo1.put("name", "半年<10比例"); - jo2.put("name", "半年<30比例"); - jo3.put("name", "半年<100比例"); + jo1.put("name", "鍗婂勾<10姣斾緥"); + jo2.put("name", "鍗婂勾<30姣斾緥"); + jo3.put("name", "鍗婂勾<100姣斾緥"); for(SampleQualityReport sqr : sampleQualityReports) { long tms = DateUtil.parseDate(String.valueOf(sqr.getWeekend()), "yyyyMMdd").getTime(); pt1.add(JSONArray.fromObject("[" + tms + "," + (int)((double)sqr.getHalfCount1() / (double)sqr.getDistrictCount() * 1000.0) / 10.0 + "]")); @@ -253,9 +253,9 @@ public class AvgPriceUpdateController { pt3.add(JSONArray.fromObject("[" + tms + "," + (int)((double)sqr.getHalfCount3() / (double)sqr.getDistrictCount() * 1000.0) / 10.0+ "]")); } }else if("7".equals(stype)) { - jo1.put("name", "一年<10小区量"); - jo2.put("name", "一年<30小区量"); - jo3.put("name", "一年<100小区量"); + jo1.put("name", "涓�骞�<10灏忓尯閲�"); + jo2.put("name", "涓�骞�<30灏忓尯閲�"); + jo3.put("name", "涓�骞�<100灏忓尯閲�"); for(SampleQualityReport sqr : sampleQualityReports) { long tms = DateUtil.parseDate(String.valueOf(sqr.getWeekend()), "yyyyMMdd").getTime(); pt1.add(JSONArray.fromObject("[" + tms + "," + sqr.getYearCount1() + "]")); @@ -263,9 +263,9 @@ public class AvgPriceUpdateController { pt3.add(JSONArray.fromObject("[" + tms + "," + sqr.getYearCount3() + "]")); } }else if("8".equals(stype)) { - jo1.put("name", "一年<10比例"); - jo2.put("name", "一年<30比例"); - jo3.put("name", "一年<100比例"); + jo1.put("name", "涓�骞�<10姣斾緥"); + jo2.put("name", "涓�骞�<30姣斾緥"); + jo3.put("name", "涓�骞�<100姣斾緥"); for(SampleQualityReport sqr : sampleQualityReports) { long tms = DateUtil.parseDate(String.valueOf(sqr.getWeekend()), "yyyyMMdd").getTime(); pt1.add(JSONArray.fromObject("[" + tms + "," + (int)((double)sqr.getYearCount1() / (double)sqr.getDistrictCount() * 1000.0) / 10.0 + "]")); @@ -299,14 +299,14 @@ public class AvgPriceUpdateController { JSONArray pt1 = new JSONArray(), pt2 = new JSONArray(), pt3 = new JSONArray(), pt4 = new JSONArray(), pt5 = new JSONArray(), pt6 = new JSONArray(), pt7 = new JSONArray(), pt8 = new JSONArray(); if("1".equals(stype)) { - jo1.put("name", "小区量(全部)"); - jo2.put("name", "小区量(无法计算)"); - jo3.put("name", "小区量(指导价)"); - jo4.put("name", "小区量(自身样本)"); - jo5.put("name", "小区量(第三方)"); - jo6.put("name", "小区量(成交数据)"); - jo7.put("name", "小区量(周边小区)"); - jo8.put("name", "小区量(推算)"); + jo1.put("name", "灏忓尯閲�(鍏ㄩ儴)"); + jo2.put("name", "灏忓尯閲�(鏃犳硶璁$畻)"); + jo3.put("name", "灏忓尯閲�(鎸囧浠�)"); + jo4.put("name", "灏忓尯閲�(鑷韩鏍锋湰)"); + jo5.put("name", "灏忓尯閲�(绗笁鏂�)"); + jo6.put("name", "灏忓尯閲�(鎴愪氦鏁版嵁)"); + jo7.put("name", "灏忓尯閲�(鍛ㄨ竟灏忓尯)"); + jo8.put("name", "灏忓尯閲�(鎺ㄧ畻)"); for(AveragerQualityReport aqr : averagerQualityReports) { long tms = DateUtil.parseDate(String.valueOf(aqr.getWeekend()), "yyyyMMdd").getTime(); pt1.add(JSONArray.fromObject("[" + tms + "," + aqr.getDistrictCount() + "]")); @@ -319,14 +319,14 @@ public class AvgPriceUpdateController { pt8.add(JSONArray.fromObject("[" + tms + "," + aqr.getDeriCount() + "]")); } }else if("2".equals(stype)) { - jo1.put("name", "平均可信度(全部)"); - jo2.put("name", "平均可信度(无法计算)"); - jo3.put("name", "平均可信度(指导价)"); - jo4.put("name", "平均可信度(自身样本)"); - jo5.put("name", "平均可信度(第三方)"); - jo6.put("name", "平均可信度(成交数据)"); - jo7.put("name", "平均可信度(周边小区)"); - jo8.put("name", "平均可信度(推算)"); + jo1.put("name", "骞冲潎鍙俊搴�(鍏ㄩ儴)"); + jo2.put("name", "骞冲潎鍙俊搴�(鏃犳硶璁$畻)"); + jo3.put("name", "骞冲潎鍙俊搴�(鎸囧浠�)"); + jo4.put("name", "骞冲潎鍙俊搴�(鑷韩鏍锋湰)"); + jo5.put("name", "骞冲潎鍙俊搴�(绗笁鏂�)"); + jo6.put("name", "骞冲潎鍙俊搴�(鎴愪氦鏁版嵁)"); + jo7.put("name", "骞冲潎鍙俊搴�(鍛ㄨ竟灏忓尯)"); + jo8.put("name", "骞冲潎鍙俊搴�(鎺ㄧ畻)"); for(AveragerQualityReport aqr : averagerQualityReports) { long tms = DateUtil.parseDate(String.valueOf(aqr.getWeekend()), "yyyyMMdd").getTime(); pt1.add(JSONArray.fromObject("[" + tms + "," + (int)(aqr.getAvgCredit() * 100000) + "]")); @@ -339,14 +339,14 @@ public class AvgPriceUpdateController { pt8.add(JSONArray.fromObject("[" + tms + "," + (int)(aqr.getDeriCredit() * 100000) + "]")); } }else if("3".equals(stype)) { - jo1.put("name", "测试案例数量(全部)"); - jo2.put("name", "测试案例数量(无法计算)"); - jo3.put("name", "测试案例数量(指导价)"); - jo4.put("name", "测试案例数量(自身样本)"); - jo5.put("name", "测试案例数量(第三方)"); - jo6.put("name", "测试案例数量(成交数据)"); - jo7.put("name", "测试案例数量(周边小区)"); - jo8.put("name", "测试案例数量(推算)"); + jo1.put("name", "娴嬭瘯妗堜緥鏁伴噺(鍏ㄩ儴)"); + jo2.put("name", "娴嬭瘯妗堜緥鏁伴噺(鏃犳硶璁$畻)"); + jo3.put("name", "娴嬭瘯妗堜緥鏁伴噺(鎸囧浠�)"); + jo4.put("name", "娴嬭瘯妗堜緥鏁伴噺(鑷韩鏍锋湰)"); + jo5.put("name", "娴嬭瘯妗堜緥鏁伴噺(绗笁鏂�)"); + jo6.put("name", "娴嬭瘯妗堜緥鏁伴噺(鎴愪氦鏁版嵁)"); + jo7.put("name", "娴嬭瘯妗堜緥鏁伴噺(鍛ㄨ竟灏忓尯)"); + jo8.put("name", "娴嬭瘯妗堜緥鏁伴噺(鎺ㄧ畻)"); for(AveragerQualityReport aqr : averagerQualityReports) { long tms = DateUtil.parseDate(String.valueOf(aqr.getWeekend()), "yyyyMMdd").getTime(); int allTest = aqr.getNoneTest() + aqr.getGuidingTest() + aqr.getOwnTest() + aqr.getThirdTest() + aqr.getDealTest() + aqr.getAroundTest() + aqr.getDeriTest(); @@ -360,14 +360,14 @@ public class AvgPriceUpdateController { pt8.add(JSONArray.fromObject("[" + tms + "," + aqr.getDeriTest() + "]")); } }else if("4".equals(stype)) { - jo1.put("name", "案例差比<10%量(全部)"); - jo2.put("name", "案例差比<10%量(无法计算)"); - jo3.put("name", "案例差比<10%量(指导价)"); - jo4.put("name", "案例差比<10%量(自身样本)"); - jo5.put("name", "案例差比<10%量(第三方)"); - jo6.put("name", "案例差比<10%量(成交数据)"); - jo7.put("name", "案例差比<10%量(周边小区)"); - jo8.put("name", "案例差比<10%量(推算)"); + jo1.put("name", "妗堜緥宸瘮<10%閲�(鍏ㄩ儴)"); + jo2.put("name", "妗堜緥宸瘮<10%閲�(鏃犳硶璁$畻)"); + jo3.put("name", "妗堜緥宸瘮<10%閲�(鎸囧浠�)"); + jo4.put("name", "妗堜緥宸瘮<10%閲�(鑷韩鏍锋湰)"); + jo5.put("name", "妗堜緥宸瘮<10%閲�(绗笁鏂�)"); + jo6.put("name", "妗堜緥宸瘮<10%閲�(鎴愪氦鏁版嵁)"); + jo7.put("name", "妗堜緥宸瘮<10%閲�(鍛ㄨ竟灏忓尯)"); + jo8.put("name", "妗堜緥宸瘮<10%閲�(鎺ㄧ畻)"); for(AveragerQualityReport aqr : averagerQualityReports) { long tms = DateUtil.parseDate(String.valueOf(aqr.getWeekend()), "yyyyMMdd").getTime(); int allTest = aqr.getNoneTest() + aqr.getGuidingTest() + aqr.getOwnTest() + aqr.getThirdTest() + aqr.getDealTest() + aqr.getAroundTest() + aqr.getDeriTest(); @@ -382,14 +382,14 @@ public class AvgPriceUpdateController { pt8.add(JSONArray.fromObject("[" + tms + "," + (int)((double)aqr.getDeriAccu1() / (double)allTest * 10000) / 100.0 + "]")); } }else if("5".equals(stype)) { - jo1.put("name", "案例差比<20%量(全部)"); - jo2.put("name", "案例差比<20%量(无法计算)"); - jo3.put("name", "案例差比<20%量(指导价)"); - jo4.put("name", "案例差比<20%量(自身样本)"); - jo5.put("name", "案例差比<20%量(第三方)"); - jo6.put("name", "案例差比<20%量(成交数据)"); - jo7.put("name", "案例差比<20%量(周边小区)"); - jo8.put("name", "案例差比<20%量(推算)"); + jo1.put("name", "妗堜緥宸瘮<20%閲�(鍏ㄩ儴)"); + jo2.put("name", "妗堜緥宸瘮<20%閲�(鏃犳硶璁$畻)"); + jo3.put("name", "妗堜緥宸瘮<20%閲�(鎸囧浠�)"); + jo4.put("name", "妗堜緥宸瘮<20%閲�(鑷韩鏍锋湰)"); + jo5.put("name", "妗堜緥宸瘮<20%閲�(绗笁鏂�)"); + jo6.put("name", "妗堜緥宸瘮<20%閲�(鎴愪氦鏁版嵁)"); + jo7.put("name", "妗堜緥宸瘮<20%閲�(鍛ㄨ竟灏忓尯)"); + jo8.put("name", "妗堜緥宸瘮<20%閲�(鎺ㄧ畻)"); for(AveragerQualityReport aqr : averagerQualityReports) { long tms = DateUtil.parseDate(String.valueOf(aqr.getWeekend()), "yyyyMMdd").getTime(); int allTest = aqr.getNoneTest() + aqr.getGuidingTest() + aqr.getOwnTest() + aqr.getThirdTest() + aqr.getDealTest() + aqr.getAroundTest() + aqr.getDeriTest(); @@ -404,14 +404,14 @@ public class AvgPriceUpdateController { pt8.add(JSONArray.fromObject("[" + tms + "," + (int)((double)aqr.getDeriAccu2() / (double)allTest * 10000) / 100.0 + "]")); } }else if("6".equals(stype)) { - jo1.put("name", "案例差比<30%量(全部)"); - jo2.put("name", "案例差比<30%量(无法计算)"); - jo3.put("name", "案例差比<30%量(指导价)"); - jo4.put("name", "案例差比<30%量(自身样本)"); - jo5.put("name", "案例差比<30%量(第三方)"); - jo6.put("name", "案例差比<30%量(成交数据)"); - jo7.put("name", "案例差比<30%量(周边小区)"); - jo8.put("name", "案例差比<30%量(推算)"); + jo1.put("name", "妗堜緥宸瘮<30%閲�(鍏ㄩ儴)"); + jo2.put("name", "妗堜緥宸瘮<30%閲�(鏃犳硶璁$畻)"); + jo3.put("name", "妗堜緥宸瘮<30%閲�(鎸囧浠�)"); + jo4.put("name", "妗堜緥宸瘮<30%閲�(鑷韩鏍锋湰)"); + jo5.put("name", "妗堜緥宸瘮<30%閲�(绗笁鏂�)"); + jo6.put("name", "妗堜緥宸瘮<30%閲�(鎴愪氦鏁版嵁)"); + jo7.put("name", "妗堜緥宸瘮<30%閲�(鍛ㄨ竟灏忓尯)"); + jo8.put("name", "妗堜緥宸瘮<30%閲�(鎺ㄧ畻)"); for(AveragerQualityReport aqr : averagerQualityReports) { long tms = DateUtil.parseDate(String.valueOf(aqr.getWeekend()), "yyyyMMdd").getTime(); int allTest = aqr.getNoneTest() + aqr.getGuidingTest() + aqr.getOwnTest() + aqr.getThirdTest() + aqr.getDealTest() + aqr.getAroundTest() + aqr.getDeriTest(); @@ -585,7 +585,7 @@ public class AvgPriceUpdateController { if(startDate != null && endDate != null) { List weekends = DateUtil.getWeekendBetweenDates(startDate, endDate); if (weekends.isEmpty()) { - json.put("msg", "你选择的日期不包含周末,请重新选择"); + json.put("msg", "浣犻�夋嫨鐨勬棩鏈熶笉鍖呭惈鍛ㄦ湯锛岃閲嶆柊閫夋嫨"); return model; } for (Date weekend : weekends) { @@ -601,9 +601,9 @@ public class AvgPriceUpdateController { } calcCommandService.save(cmds); - json.put("msg", "任务保存成功,共保存" + cmds.size() + "条任务"); + 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); @@ -644,7 +644,7 @@ public class AvgPriceUpdateController { cmd.setCalcType(1); } else { if (command.containsKey("startDate") && StringUtils.isNotBlank(command.getString("startDate"))) { - Date startDate = DateUtil.parseDate(command.getString("startDate"), "yyyy-MM-dd");// 均价开始时间 + Date startDate = DateUtil.parseDate(command.getString("startDate"), "yyyy-MM-dd");// 鍧囦环寮�濮嬫椂闂� if (weekend.before(startDate)) { return null; } @@ -704,13 +704,13 @@ public class AvgPriceUpdateController { JsonModel jsonModel = new JsonModel(); Map resMap = new HashMap(); if(model.getAvgPrice() <= 0) { - resMap.put("msg", "价格错误!"); + resMap.put("msg", "浠锋牸閿欒!"); jsonModel.setJsonModel(resMap); return jsonModel; } if(model.getWeekend() == null || model.getWeekend().getDay() > 0) { - resMap.put("msg", "日期错误!"); + resMap.put("msg", "鏃ユ湡閿欒!"); jsonModel.setJsonModel(resMap); return jsonModel; } @@ -723,25 +723,25 @@ public class AvgPriceUpdateController { city = model.getCityDisplay(); region = model.getRegion(); block = model.getBlock(); - cat = "板块"; + cat = "鏉垮潡"; }else if(StringUtils.isNotBlank(model.getCityDisplay()) && StringUtils.isNotBlank(model.getRegion()) && StringUtils.isBlank(model.getBlock())) { city = model.getCityDisplay(); region = model.getRegion(); - cat = "区域"; + cat = "鍖哄煙"; }else if(StringUtils.isNotBlank(model.getCityDisplay()) && StringUtils.isBlank(model.getRegion()) && StringUtils.isBlank(model.getBlock())) { city = model.getCityDisplay(); - cat = "城市"; + cat = "鍩庡競"; } if(city == null || region == null || block == null) { - resMap.put("msg", "城市区域板块错误!"); + resMap.put("msg", "鍩庡競鍖哄煙鏉垮潡閿欒!"); jsonModel.setJsonModel(resMap); return jsonModel; } RegionStat regionStat = regionStatService.findRegionStat(city, region, block, model.getWeekend()); if (regionStat != null) { - resMap.put("msg", "均价数据已存在!"); + resMap.put("msg", "鍧囦环鏁版嵁宸插瓨鍦�!"); jsonModel.setJsonModel(resMap); return jsonModel; } @@ -790,7 +790,7 @@ public class AvgPriceUpdateController { } /**a - * 加载某个小区的房源信息 + * 鍔犺浇鏌愪釜灏忓尯鐨勬埧婧愪俊鎭� * * @param model * @return @@ -843,7 +843,7 @@ public class AvgPriceUpdateController { Set regionsList = new LinkedHashSet(); regionsList.add(district.getRegion()); - //只有进行区域区分,才可以使用区域别名 + //鍙湁杩涜鍖哄煙鍖哄垎锛屾墠鍙互浣跨敤鍖哄煙鍒悕 if (isCaseRegion && isUseRegionAlias) { List regionAlias = RegionData.getRegionAlias(district.getCity(), district.getRegion()); if (regionAlias != null) { @@ -922,10 +922,10 @@ public class AvgPriceUpdateController { return null; } - if (district.getEstateType2() != null && district.getEstateType2().indexOf("别墅") > -1) { - district.setEstateType2("别墅"); + if (district.getEstateType2() != null && district.getEstateType2().indexOf("鍒") > -1) { + district.setEstateType2("鍒"); } else { - district.setEstateType2("普通住宅"); + district.setEstateType2("鏅�氫綇瀹�"); } model.setId(district.getId()); @@ -970,7 +970,7 @@ public class AvgPriceUpdateController { Map statMap = districtStatService.findDistrictStat(Arrays.asList(districtKey), false); if(statMap != null && statMap.containsKey(districtKey)) { - if (district.getEstateType2() != null && district.getEstateType2().indexOf("别墅") > -1) { + if (district.getEstateType2() != null && district.getEstateType2().indexOf("鍒") > -1) { model.setDistrictStat(statMap.get(districtKey).getVillaDistrictStat()); } else { model.setDistrictStat(statMap.get(districtKey).getDistrictStat()); @@ -994,7 +994,7 @@ public class AvgPriceUpdateController { guiding.setCity(district.getCity()); guiding.setRegion(district.getRegion()); guiding.setName(district.getName()); - guiding.setEstateType(district.getEstateType2().indexOf("别墅") > -1 ? "别墅" : "普通住宅"); + guiding.setEstateType(district.getEstateType2().indexOf("鍒") > -1 ? "鍒" : "鏅�氫綇瀹�"); guidingPriceService.save(guiding); JsonModel model = new JsonModel(); @@ -1042,7 +1042,7 @@ public class AvgPriceUpdateController { guiding.setCity(district.getCity()); guiding.setRegion(district.getRegion()); guiding.setName(district.getName()); - guiding.setEstateType(district.getEstateType2().indexOf("别墅") > -1 ? "别墅" : "普通住宅"); + guiding.setEstateType(district.getEstateType2().indexOf("鍒") > -1 ? "鍒" : "鏅�氫綇瀹�"); guidingPriceService.save(guiding); json.setJsonModel(model); return json; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/BeansController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/BeansController.java index dcb4adf2c..44b64c73a 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/BeansController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/BeansController.java @@ -42,7 +42,7 @@ public class BeansController { private FjtUsersService fjtUsersService; private ServerAreaService serverAreaService; /** - * 查询列表,默认空 + * 鏌ヨ鍒楄〃锛岄粯璁ょ┖ * @throws DateParseException */ public Object listAction(BeansModel model){ @@ -309,23 +309,23 @@ public class BeansController { } private void addNewBeanTask(){ - System.out.println("开始时间:"+new Date()); + System.out.println("寮�濮嬫椂闂达細"+new Date()); List serverAreas = serverAreaService.findAll(); String[] columns = {"city","region","block", "name","address","householdCount","developer","estateCompany","estateCharge","buildArea","allArea","finishBuildingDate","carSiteCount","undergroundCarSite"}; for(ServerArea serverArea : serverAreas){ - if(serverArea.getDisplay().equals("全国")){ + if(serverArea.getDisplay().equals("鍏ㄥ浗")){ continue; } addRows(serverArea.getDisplay(), "district", columns); - //删除之前的任务 + //鍒犻櫎涔嬪墠鐨勪换鍔� beansTaskService.deleteBeansTaskByParams(serverArea.getDisplay(), DateUtil.truncateDay(new Date())); //beansTaskService.deleteBeansTaskByParams(serverArea.getDisplay(), null); } - System.out.println("结束时间:"+new Date()); + System.out.println("缁撴潫鏃堕棿锛�"+new Date()); } @@ -336,7 +336,7 @@ public class BeansController { params.add(new QueryParam("visible", 0)); List districts = districtService.findAllByParams(params, null, 0, 100000, columns); for(District district : districts){ - //信息字段在3个以下的,添到后台任务表 + //淇℃伅瀛楁鍦�3涓互涓嬬殑,娣诲埌鍚庡彴浠诲姟琛� int score = getScore(district, columns); if(score < 3){ BeansTask beansTask = new BeansTask(); @@ -386,7 +386,7 @@ public class BeansController { }else if(obj instanceof String){ if(StringUtils.isNotBlank(obj.toString())){ String s = obj.toString().trim(); - List list = Arrays.asList("无","暂无","暂无数据","暂无资料","暂无数据","待定","未知","不详","年","0.0","0000-00-00","-","--","---"); + List list = Arrays.asList("鏃�","鏆傛棤","鏆傛棤鏁版嵁","鏆傛棤璧勬枡","鏆傛棤鏁版嵁","寰呭畾","鏈煡","涓嶈","骞�","0.0","0000-00-00","-","--","---"); if(s.length() > 0 && !list.contains(s)){ System.out.println(s); score ++; 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 index 159155d1c..8d7c64b13 100644 --- 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 @@ -20,7 +20,7 @@ public class BuildingRatioController { private BuildingRatioService buildingRatioService; /** - * 新建楼栋系数信息 + * 鏂板缓妤兼爧绯绘暟淇℃伅 * * @param model * @return @@ -46,10 +46,10 @@ public class BuildingRatioController { buildingRatio.setAvg_price(model.getAvg_price()); this.buildingRatioService.save(buildingRatio); - model.setMsg("新建成功!"); + model.setMsg("鏂板缓鎴愬姛!"); } catch (Exception e) { e.printStackTrace(); - model.setMsg("新建失败!"); + model.setMsg("鏂板缓澶辫触!"); } model.redirect("/buildingRatio/add?msg=" + URLEncoder.encode(model.getMsg(), "UTF-8")); return model; @@ -65,7 +65,7 @@ public class BuildingRatioController { } /** - * 修改楼栋系数信息 + * 淇敼妤兼爧绯绘暟淇℃伅 * * @param model * @return @@ -127,7 +127,7 @@ public class BuildingRatioController { } /** - * 编辑api用户信息 + * 缂栬緫api鐢ㄦ埛淇℃伅 * * @param model * @return @@ -149,7 +149,7 @@ public class BuildingRatioController { model.setBuildingRatioBo(bo); if (StringUtils.isNotBlank(model.getMsg()) && model.getMsg().equals("success")) { - model.setMsg("更新成功!"); + model.setMsg("鏇存柊鎴愬姛锛�"); } return model; } @@ -159,7 +159,7 @@ public class BuildingRatioController { model.setViewParam("config", null); List buildingRatioList = buildingRatioService.findAllByBuildingName(model.getCity_name(),model.getRegion(),model.getDistrict(),model.getBuilding_name()); if (buildingRatioList.size()>0) { - model.setMsg("此楼栋名称已经存在!"); + model.setMsg("姝ゆゼ鏍嬪悕绉板凡缁忓瓨鍦�!"); return true; } return false; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/BusinessController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/BusinessController.java index e2ed2259c..e8da01883 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/BusinessController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/BusinessController.java @@ -38,7 +38,7 @@ public class BusinessController { pager.setPageSize(30); if (StringUtils.isBlank(model.getCityDisplay())) { - model.setCityDisplay("上海"); + model.setCityDisplay("涓婃捣"); } List mallIds = null; @@ -101,16 +101,16 @@ public class BusinessController { public Object getTagsAction(BusinessModel model) { model.setViewType("json"); Map> map = new HashMap>(); - map.put("餐厅", Arrays.asList("本帮菜","蟹宴","杭帮菜","绍兴菜","宁波菜","淮扬菜","农家菜","其他江浙菜")); - map.put("休闲娱乐", Arrays.asList("星巴克","上岛咖啡","真锅咖啡厅","迪欧咖啡")); - map.put("丽人", Arrays.asList("美发","美容/SPA","瑜伽","舞蹈","美甲","瘦身纤体","化妆品","个性写真","齿科","整形")); - map.put("结婚", Arrays.asList("婚纱摄影","婚宴","婚戒首饰","婚纱礼服")); - map.put("亲子", Arrays.asList("幼儿教育","亲子摄影","亲子游乐","亲子购物")); -// map.put("爱车", Arrays.asList("","","","")); -// map.put("家装", Arrays.asList("","","","")); -// map.put("生活服务", Arrays.asList("","","","")); -// map.put("运动健身", Arrays.asList("","","","")); -// map.put("购物", Arrays.asList("","","","")); + map.put("椁愬巺", Arrays.asList("鏈府鑿�","锜瑰","鏉府鑿�","缁嶅叴鑿�","瀹佹尝鑿�","娣壃鑿�","鍐滃鑿�","鍏朵粬姹熸禉鑿�")); + map.put("浼戦棽濞变箰", Arrays.asList("鏄熷反鍏�","涓婂矝鍜栧暋","鐪熼攨鍜栧暋鍘�","杩鍜栧暋")); + map.put("涓戒汉", Arrays.asList("缇庡彂","缇庡/SPA","鐟滀冀","鑸炶箞","缇庣敳","鐦﹁韩绾や綋","鍖栧鍝�","涓�у啓鐪�","榻跨","鏁村舰")); + map.put("缁撳", Arrays.asList("濠氱罕鎽勫奖","濠氬","濠氭垝棣栭グ","濠氱罕绀兼湇")); + map.put("浜插瓙", Arrays.asList("骞煎効鏁欒偛","浜插瓙鎽勫奖","浜插瓙娓镐箰","浜插瓙璐墿")); +// map.put("鐖辫溅", Arrays.asList("","","","")); +// map.put("瀹惰", Arrays.asList("","","","")); +// map.put("鐢熸椿鏈嶅姟", Arrays.asList("","","","")); +// map.put("杩愬姩鍋ヨ韩", Arrays.asList("","","","")); +// map.put("璐墿", Arrays.asList("","","","")); model.setTagsList(map.get(model.getBusinessType())); return model; } @@ -139,7 +139,7 @@ public class BusinessController { model.setMallId(districts.get(0).getId()); }else{ - model.setErrMsg("没有名称为:[ "+model.getMallName()+" ]的商铺!"); + model.setErrMsg("娌℃湁鍚嶇О涓猴細[ "+model.getMallName()+" ]鐨勫晢閾猴紒"); return model; } diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/BusinessLoanController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/BusinessLoanController.java index a5381293e..b92ec1458 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/BusinessLoanController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/BusinessLoanController.java @@ -49,7 +49,7 @@ public class BusinessLoanController { BusinessLoan businessLoan = model.getBusinessLoan(); if (StringUtils.isNotBlank(businessLoan.getCity())) { - businessLoan.setCitys(Arrays.asList(businessLoan.getCity().split(",|,"))); + businessLoan.setCitys(Arrays.asList(businessLoan.getCity().split(",|锛�"))); } businessLoan.setFeature(StringUtils.join(model.getFeatures(), ",")); diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/CarLoanController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/CarLoanController.java index 887c726ab..6e85d47cd 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/CarLoanController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/CarLoanController.java @@ -50,7 +50,7 @@ public class CarLoanController { CarLoan carLoan = model.getCarLoan(); if (StringUtils.isNotBlank(carLoan.getCity())) { - carLoan.setCitys(Arrays.asList(carLoan.getCity().split(",|,"))); + carLoan.setCitys(Arrays.asList(carLoan.getCity().split(",|锛�"))); } carLoan.setFeature(StringUtils.join(model.getFeatures(), ",")); diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/CityController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/CityController.java index dee6fd940..78d3c37f4 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/CityController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/CityController.java @@ -72,33 +72,33 @@ public class CityController { private final static Logger LOGGER = LoggerFactory.getLogger(CityController.class); /** - * 按字母分组列表 + * 鎸夊瓧姣嶅垎缁勫垪琛� * * @param serverAreaMap * @return */ private static Map CITY_CODE_MAP = new HashMap(); static { - CITY_CODE_MAP.put("大兴安岭", "大兴安岭地区"); - CITY_CODE_MAP.put("塔城", "塔城地区"); - CITY_CODE_MAP.put("山南", "山南地区"); - CITY_CODE_MAP.put("日喀则", "日喀则地区"); - CITY_CODE_MAP.put("毕节", "毕节地区"); - CITY_CODE_MAP.put("海东", "海东地区"); - CITY_CODE_MAP.put("海北", "海北藏族自治州"); - CITY_CODE_MAP.put("海南", "海南藏族自治州"); - CITY_CODE_MAP.put("铜仁", "铜仁地区"); - CITY_CODE_MAP.put("阿里", "阿里地区"); - CITY_CODE_MAP.put("昌都", "昌都地区"); - CITY_CODE_MAP.put("林芝", "林芝地区"); - CITY_CODE_MAP.put("那曲", "那曲地区"); - CITY_CODE_MAP.put("阿勒泰", "阿勒泰地区"); - CITY_CODE_MAP.put("巴音郭楞", "巴音郭楞蒙古自治州"); - CITY_CODE_MAP.put("哈密", "哈密地区"); - CITY_CODE_MAP.put("和田", "和田地区"); - CITY_CODE_MAP.put("喀什", "喀什地区"); - CITY_CODE_MAP.put("吐鲁番", "吐鲁番地区"); - CITY_CODE_MAP.put("双鸭山", "双鸭山市"); + CITY_CODE_MAP.put("澶у叴瀹夊箔", "澶у叴瀹夊箔鍦板尯"); + CITY_CODE_MAP.put("濉斿煄", "濉斿煄鍦板尯"); + CITY_CODE_MAP.put("灞卞崡", "灞卞崡鍦板尯"); + CITY_CODE_MAP.put("鏃ュ杸鍒�", "鏃ュ杸鍒欏湴鍖�"); + CITY_CODE_MAP.put("姣曡妭", "姣曡妭鍦板尯"); + CITY_CODE_MAP.put("娴蜂笢", "娴蜂笢鍦板尯"); + CITY_CODE_MAP.put("娴峰寳", "娴峰寳钘忔棌鑷不宸�"); + CITY_CODE_MAP.put("娴峰崡", "娴峰崡钘忔棌鑷不宸�"); + CITY_CODE_MAP.put("閾滀粊", "閾滀粊鍦板尯"); + CITY_CODE_MAP.put("闃块噷", "闃块噷鍦板尯"); + CITY_CODE_MAP.put("鏄岄兘", "鏄岄兘鍦板尯"); + CITY_CODE_MAP.put("鏋楄姖", "鏋楄姖鍦板尯"); + CITY_CODE_MAP.put("閭f洸", "閭f洸鍦板尯"); + CITY_CODE_MAP.put("闃垮嫆娉�", "闃垮嫆娉板湴鍖�"); + CITY_CODE_MAP.put("宸撮煶閮", "宸撮煶閮钂欏彜鑷不宸�"); + CITY_CODE_MAP.put("鍝堝瘑", "鍝堝瘑鍦板尯"); + CITY_CODE_MAP.put("鍜岀敯", "鍜岀敯鍦板尯"); + CITY_CODE_MAP.put("鍠�浠�", "鍠�浠�鍦板尯"); + CITY_CODE_MAP.put("鍚愰瞾鐣�", "鍚愰瞾鐣湴鍖�"); + CITY_CODE_MAP.put("鍙岄腑灞�", "鍙岄腑灞卞競"); } private Map> getSortedServerAreaBoMap(List serverAreaList) { @@ -106,24 +106,24 @@ public class CityController { // List>(); // for (ServerArea serverArea : serverAreaList) { // String cityInitial = StringUtil.getFirstSpell(serverArea.getSpell(), - // true);// 城市首字母 + // true);// 鍩庡競棣栧瓧姣� // List serverAreaBoList = // getCachedServerAreaByInitial(serverAreaBoMap, cityInitial);// - // 按首字母加载城市列表 - // // 设置FLASH ICO + // 鎸夐瀛楁瘝鍔犺浇鍩庡競鍒楄〃 + // // 璁剧疆FLASH ICO // ServerAreaBo serverAreaBo = new ServerAreaBo(serverArea); // serverAreaBo.setExistFalsh(filesService.fileExist(serverAreaBo.getFlashId())); // serverAreaBo.setExistCityIco(filesService.fileExist(serverAreaBo.getIcoId())); // serverAreaBoList.add(serverAreaBo); - // sort(serverAreaBoList);// 字母内排序 + // sort(serverAreaBoList);// 瀛楁瘝鍐呮帓搴� // serverAreaBoMap.put(cityInitial, serverAreaBoList); // } - // // TreeMap按KEY默认排序 + // // TreeMap鎸塊EY榛樿鎺掑簭 // return new TreeMap>(serverAreaBoMap); Map> ret = new LinkedHashMap>(); for (ServerArea serverArea : serverAreaList) { - if ("全国".equals(serverArea.getDisplay()) || StringUtils.isBlank(serverArea.getProvince())) { + if ("鍏ㄥ浗".equals(serverArea.getDisplay()) || StringUtils.isBlank(serverArea.getProvince())) { continue; } @@ -145,7 +145,7 @@ public class CityController { } /** - * 按KEY获取Map值 + * 鎸塊EY鑾峰彇Map鍊� * * @param serverAreaBoMap * @param cityInitial @@ -160,7 +160,7 @@ public class CityController { } /** - * 城市字母内排序 + * 鍩庡競瀛楁瘝鍐呮帓搴� * * @param serverAreaBoList */ @@ -183,7 +183,7 @@ public class CityController { } /** - * 页面查询条件 + * 椤甸潰鏌ヨ鏉′欢 * * @return */ @@ -194,19 +194,19 @@ public class CityController { } /** - * 城市列表页面 + * 鍩庡競鍒楄〃椤甸潰 * * @param model * @return */ public Object listAction(ServerAreaModel model) { Pager pager = model.getPager(1000); - model.setCityFirstLetters(Arrays.asList(getCityFirstLetter()));// 页面字母查询条件 + model.setCityFirstLetters(Arrays.asList(getCityFirstLetter()));// 椤甸潰瀛楁瘝鏌ヨ鏉′欢 if (StringUtils.isNotBlank(model.getType())) { - List serverAreaList = serverAreaService.findAllBySort();// Load城市列表 - if ("all".equals(model.getType())) {// 字母分组列表 + List serverAreaList = serverAreaService.findAllBySort();// Load鍩庡競鍒楄〃 + if ("all".equals(model.getType())) {// 瀛楁瘝鍒嗙粍鍒楄〃 model.setServerAreasMap(getSortedServerAreaBoMap(serverAreaList)); - } else { // 首字母分组查询 + } else { // 棣栧瓧姣嶅垎缁勬煡璇� List serverAreaBoList = new ArrayList(); for (ServerArea serverArea : serverAreaList) { if (StringUtil.getFirstSpell(serverArea.getSpell(), true).equals(model.getType())) { @@ -217,7 +217,7 @@ public class CityController { model.setServerAreaBoList(serverAreaBoList); } } else { - // 默认分页列表,按序列号升序查询 + // 榛樿鍒嗛〉鍒楄〃,鎸夊簭鍒楀彿鍗囧簭鏌ヨ pager = model.getPager(1000); List serverAreaBoList = serverAreaService.findAllServerArea(); settingFlashAndCityIco(serverAreaBoList); @@ -227,7 +227,7 @@ public class CityController { } /** - * 设置城市FLASH和图片信息 + * 璁剧疆鍩庡競FLASH鍜屽浘鐗囦俊鎭� * * @param serverAreaBoList */ @@ -253,7 +253,7 @@ public class CityController { } /** - * 新建城市 + * 鏂板缓鍩庡競 * * @param model * @return @@ -263,7 +263,7 @@ public class CityController { if ("create".equals(model.getMethod())) { if (serverAreaService.findByDisplayOrNameOrSpell(model.getDisplay(), model.getName(), model.getSpell(), null)) { - model.setMsg("城市名称/简拼/全拼已存在"); + model.setMsg("鍩庡競鍚嶇О/绠�鎷�/鍏ㄦ嫾宸插瓨鍦�"); return model; } @@ -282,7 +282,7 @@ public class CityController { serverArea.setAlias(alias); } serverAreaService.save(serverArea); - model.setMsg("新建成功"); + model.setMsg("鏂板缓鎴愬姛"); } else { @@ -296,7 +296,7 @@ public class CityController { } /** - * 编辑修改城市 + * 缂栬緫淇敼鍩庡競 * * @param model * @return @@ -306,7 +306,7 @@ public class CityController { if (StringUtils.isNotBlank(model.getId())) { if (serverAreaService.findByDisplayOrNameOrSpell(model.getDisplay(), model.getName(), model.getSpell(), model.getId())) { - model.setMsg("城市名称/简拼/全拼已存在"); + model.setMsg("鍩庡競鍚嶇О/绠�鎷�/鍏ㄦ嫾宸插瓨鍦�"); return model; } ServerArea serverArea = serverAreaService.findById(model.getId()); @@ -343,9 +343,9 @@ public class CityController { // ServerArea serverArea = new ServerArea(); // BeanUtils.copyProperties(model, serverArea); serverAreaService.update(serverArea); - model.setMsg("修改成功"); + model.setMsg("淇敼鎴愬姛"); } else { - model.setMsg("修改有问题"); + model.setMsg("淇敼鏈夐棶棰�"); } } else { if (StringUtils.isNotBlank(model.getId())) { @@ -355,7 +355,7 @@ public class CityController { model.setAlias(StringUtils.join(serverArea.getAlias(), "\r\n")); } } else { - model.setMsg("ID 错了"); + model.setMsg("ID 閿欎簡"); } } return model; @@ -384,7 +384,7 @@ public class CityController { } /** - * Flash 上传 + * Flash 涓婁紶 * * @param model * @param request @@ -418,7 +418,7 @@ public class CityController { filesService.deleteFilesByIds(Arrays.asList(new String[] { flashFile.getId() })); filesService.save(flashFile); model.setExistFalsh(true); - model.setMsg("Flash 编辑成功 ! "); + model.setMsg("Flash 缂栬緫鎴愬姛 锛� "); } } } @@ -438,7 +438,7 @@ public class CityController { } /** - * 城市背景图片 上传 + * 鍩庡競鑳屾櫙鍥剧墖 涓婁紶 * * @param model * @param request @@ -469,7 +469,7 @@ public class CityController { filesService.deleteFilesByIds(Arrays.asList(new String[] { flashFile.getId() })); filesService.save(flashFile); model.setExistCityIco(true); - model.setMsg("Flash 图片编辑成功 ! "); + model.setMsg("Flash 鍥剧墖缂栬緫鎴愬姛 锛� "); } } } @@ -495,19 +495,19 @@ public class CityController { } if (0 == model.getStatus()) { - // 城市下线 + // 鍩庡競涓嬬嚎 Map data = new HashMap(1); data.put("status", 0); serverAreaService.updateById(data, model.getId()); return model; } else { - // 城市上线 + // 鍩庡競涓婄嚎 ServerArea city = checkData(model.getId(), model); if (model.isPassCheck()) { Map data = new HashMap(1); data.put("status", 2); serverAreaService.updateById(data, model.getId()); - // 如果过检测,则异步导入基础数据 + // 濡傛灉杩囨娴�,鍒欏紓姝ュ鍏ュ熀纭�鏁版嵁 if (city != null) { // processBaseData(city.getDisplay()); } @@ -522,7 +522,7 @@ public class CityController { } /** - * 城市列表页面 + * 鍩庡競鍒楄〃椤甸潰 * * @param model * @return @@ -646,7 +646,7 @@ public class CityController { return cityBo; } - // 统计有小区覆盖的城市数量 + // 缁熻鏈夊皬鍖鸿鐩栫殑鍩庡競鏁伴噺 private long calculateCountsCityHaveDist(Map> cityInProvinceMap) { long counts = 0; for (String province : cityInProvinceMap.keySet()) { @@ -660,7 +660,7 @@ public class CityController { return counts; } - // 统计城市小区数量 + // 缁熻鍩庡競灏忓尯鏁伴噺 private Map> ensureInfoInCity(final String cat, Map> cityInProvinceMap) { /*for (String province : cityInProvinceMap.keySet()) { List citiesInProvince = cityInProvinceMap.get(province); @@ -710,7 +710,7 @@ public class CityController { } /** - * 导入自动完成的基础数据 + * 瀵煎叆鑷姩瀹屾垚鐨勫熀纭�鏁版嵁 * * @param model * @return @@ -720,9 +720,9 @@ public class CityController { // processBaseData(model.getDisplay()); // return model; // } - // 准备基础数据 + // 鍑嗗鍩虹鏁版嵁 // private void processBaseData(final String cityName) { - // // 把小区导入到自动完成中 + // // 鎶婂皬鍖哄鍏ュ埌鑷姩瀹屾垚涓� // Thread thread = new Thread() { // public void run() { // LOGGER.info("{}: import data to auto start at {}", new Object[] { @@ -735,7 +735,7 @@ public class CityController { // thread.start(); // } /** - * 把小区导入到自动完成 + * 鎶婂皬鍖哄鍏ュ埌鑷姩瀹屾垚 * * @param cityName */ @@ -746,7 +746,7 @@ public class CityController { // } // DBCollection knowBaseCollection = // MongoService.getInstance().getCollection("know_base"); - // // 从知识库取当前城市的所有区域 + // // 浠庣煡璇嗗簱鍙栧綋鍓嶅煄甯傜殑鎵�鏈夊尯鍩� // DBObject query = new BasicDBObject(); // query.put("cat", "district_name"); // query.put("extra_data.city", cityName); @@ -816,7 +816,7 @@ public class CityController { // districtAutos.clear(); // } // - // // 先删除,再添加 + // // 鍏堝垹闄わ紝鍐嶆坊鍔� // if (addressAutos.size() > 100) { // List tmp = new ArrayList(); // for (Auto addr : addressAutos) { @@ -827,7 +827,7 @@ public class CityController { // addressAutos.clear(); // } // - // // 先删除,再添加 + // // 鍏堝垹闄わ紝鍐嶆坊鍔� // if (aliasAutos.size() > 100) { // List tmp = new ArrayList(); // for (Auto alias : aliasAutos) { @@ -841,14 +841,14 @@ public class CityController { // // autoService.saveAutoKeywords(districtAutos); // - // // 先删除,再添加 + // // 鍏堝垹闄わ紝鍐嶆坊鍔� // List tmp = new ArrayList(); // for (Auto addr : addressAutos) { // tmp.add(addr.getKeyword()); // } // autoService.saveAutoKeywords(addressAutos); // - // // 先删除,再添加 + // // 鍏堝垹闄わ紝鍐嶆坊鍔� // tmp = new ArrayList(); // for (Auto alias : aliasAutos) { // tmp.add(alias.getKeyword()); @@ -856,89 +856,89 @@ public class CityController { // autoService.saveAutoKeywords(aliasAutos); // } /** - * 城市上线验证 + * 鍩庡競涓婄嚎楠岃瘉 */ private ServerArea checkData(String cityId, ServerAreaModel model) { boolean ret = true; List retList = new ArrayList(); - // 检查城市信息 + // 妫�鏌ュ煄甯備俊鎭� ServerArea cityArea = serverAreaService.findById(cityId); if (null == cityArea) { - // 城市ID有误 - retList.add("城市ID_ERROR"); + // 鍩庡競ID鏈夎 + retList.add("鍩庡競ID_ERROR"); ret = false; } else { - retList.add("城市ID_OK"); + retList.add("鍩庡競ID_OK"); } if (null == filesService.findById(cityId + ((null != cityArea.getFalshVersion()) ? cityArea.getFalshVersion() : "") + "#m")) { - // 没有Flash - retList.add("城市Flash_ERROR"); + // 娌℃湁Flash + retList.add("鍩庡競Flash_ERROR"); ret = false; } else { - retList.add("城市Flash_OK"); + retList.add("鍩庡競Flash_OK"); } if (null == filesService .findById(cityId + ((null != cityArea.getIcoVersion()) ? cityArea.getIcoVersion() : "") + "ico#m")) { - // 没有图片 - retList.add("城市图片_ERROR"); + // 娌℃湁鍥剧墖 + retList.add("鍩庡競鍥剧墖_ERROR"); ret = false; } else { - retList.add("城市图片_OK"); + retList.add("鍩庡競鍥剧墖_OK"); } if (cityArea.getLat() > 53.5 || cityArea.getLat() < 4 || cityArea.getLng() > 135.083 || cityArea.getLng() < 73.6667) { - // 经纬度不正确 - retList.add("城市经纬度_ERROR"); + // 缁忕含搴︿笉姝g‘ + retList.add("鍩庡競缁忕含搴ERROR"); ret = false; } else { - retList.add("城市经纬度_OK"); + retList.add("鍩庡競缁忕含搴OK"); } if (cityArea.getHomeMapId() <= 0) { - // 没有设置全国地图MapId - retList.add("城市的FlashMapId_ERROR"); + // 娌℃湁璁剧疆鍏ㄥ浗鍦板浘MapId + retList.add("鍩庡競鐨凢lashMapId_ERROR"); ret = false; } else { - retList.add("城市的FlashMapId_OK"); + retList.add("鍩庡競鐨凢lashMapId_OK"); } if (cityArea.getCityGrade() != 1 && cityArea.getCityGrade() != 2 && cityArea.getCityGrade() != 3) { - // 没有设置城市级别 - retList.add("城市级别_ERROR"); + // 娌℃湁璁剧疆鍩庡競绾у埆 + retList.add("鍩庡競绾у埆_ERROR"); ret = false; } else { - retList.add("城市级别_OK"); + retList.add("鍩庡競绾у埆_OK"); } if (StringUtils.isBlank(cityArea.getSection())) { - // 没有设置城市所属区域 - retList.add("城市所属区域(如华东)_ERROR"); + // 娌℃湁璁剧疆鍩庡競鎵�灞炲尯鍩� + retList.add("鍩庡競鎵�灞炲尯鍩�(濡傚崕涓�)_ERROR"); ret = false; } else { - retList.add("城市所属区域_OK"); + retList.add("鍩庡競鎵�灞炲尯鍩焈OK"); } - // 检查区域信息 + // 妫�鏌ュ尯鍩熶俊鎭� List boList = regionBlockService.findRegionBlockBoList(cityArea.getDisplay(), cityArea.isSupportBlock()); if (CollectionUtils.isEmpty(boList)) { - // 没有区域信息 - retList.add("城市下辖区域_ERROR"); + // 娌℃湁鍖哄煙淇℃伅 + retList.add("鍩庡競涓嬭緰鍖哄煙_ERROR"); ret = false; } else { for (RegionBlockBo regionBo : boList) { if (null == regionBo.getMapId() || regionBo.getMapId() < 0) { - retList.add("城市下辖区域FlashMapId_ERROR"); + retList.add("鍩庡競涓嬭緰鍖哄煙FlashMapId_ERROR"); ret = false; break; } if (StringUtils.isBlank(regionBo.getOrgName())) { - retList.add("城市下辖区域显示名称_ERROR"); + retList.add("鍩庡競涓嬭緰鍖哄煙鏄剧ず鍚嶇О_ERROR"); ret = false; break; } @@ -947,7 +947,7 @@ public class CityController { if (cityArea.isSupportBlock() && CollectionUtils.isNotEmpty(blockList)) { for (RegionBlock block : blockList) { if (StringUtils.isBlank(block.getOrgName())) { - retList.add("城市下辖板块显示名称_ERROR"); + retList.add("鍩庡競涓嬭緰鏉垮潡鏄剧ず鍚嶇О_ERROR"); ret = false; break; } @@ -963,7 +963,7 @@ public class CityController { } /** - * 根据所属省份,拆分城市 (只包含县级市) + * 鏍规嵁鎵�灞炵渷浠斤紝鎷嗗垎鍩庡競 (鍙寘鍚幙绾у競) * * @param allCitys * @return @@ -988,9 +988,9 @@ public class CityController { String province = ""; if (city.getProvince() == null || city.getProvince() == "") { province = null; - } else if (city.getProvince().equals("上海") || city.getProvince().equals("北京") || city.getProvince().equals("天津") - || city.getProvince().equals("重庆")) { - province = "直辖市"; + } else if (city.getProvince().equals("涓婃捣") || city.getProvince().equals("鍖椾含") || city.getProvince().equals("澶╂触") + || city.getProvince().equals("閲嶅簡")) { + province = "鐩磋緰甯�"; } else { province = city.getProvince(); } @@ -1028,7 +1028,7 @@ public class CityController { } /** - * 根据所属省份,拆分城市 + * 鏍规嵁鎵�灞炵渷浠斤紝鎷嗗垎鍩庡競 * * @param allCitys * @return @@ -1043,9 +1043,9 @@ public class CityController { String province = ""; if (city.getProvince() == null || city.getProvince() == "") { province = null; - } else if (city.getProvince().equals("上海") || city.getProvince().equals("北京") || city.getProvince().equals("天津") - || city.getProvince().equals("重庆")) { - province = "直辖市"; + } else if (city.getProvince().equals("涓婃捣") || city.getProvince().equals("鍖椾含") || city.getProvince().equals("澶╂触") + || city.getProvince().equals("閲嶅簡")) { + province = "鐩磋緰甯�"; } else { province = city.getProvince(); } @@ -1075,7 +1075,7 @@ public class CityController { for (int i = 0; i < langth; i++) { - if (provinceArr[i].equals("直辖市")) { + if (provinceArr[i].equals("鐩磋緰甯�")) { String temp = provinceArr[i]; provinceArr[i] = provinceArr[0]; @@ -1085,59 +1085,59 @@ public class CityController { Map provincePinyinMap = new HashMap(); for (int i = 1; i < langth; i++) { - if (provinceArr[i].equals("黑龙江")) { + if (provinceArr[i].equals("榛戦緳姹�")) { provincePinyinMap.put("heilongjiang", provinceArr[i]); - } else if (provinceArr[i].equals("吉林")) { + } else if (provinceArr[i].equals("鍚夋灄")) { provincePinyinMap.put("jilin", provinceArr[i]); - } else if (provinceArr[i].equals("辽宁")) { + } else if (provinceArr[i].equals("杈藉畞")) { provincePinyinMap.put("liaoning", provinceArr[i]); - } else if (provinceArr[i].equals("河北")) { + } else if (provinceArr[i].equals("娌冲寳")) { provincePinyinMap.put("hebei", provinceArr[i]); - } else if (provinceArr[i].equals("山东")) { + } else if (provinceArr[i].equals("灞变笢")) { provincePinyinMap.put("shandong", provinceArr[i]); - } else if (provinceArr[i].equals("江苏")) { + } else if (provinceArr[i].equals("姹熻嫃")) { provincePinyinMap.put("jiangsu", provinceArr[i]); - } else if (provinceArr[i].equals("浙江")) { + } else if (provinceArr[i].equals("娴欐睙")) { provincePinyinMap.put("zhejiang", provinceArr[i]); - } else if (provinceArr[i].equals("福建")) { + } else if (provinceArr[i].equals("绂忓缓")) { provincePinyinMap.put("fujian", provinceArr[i]); - } else if (provinceArr[i].equals("广东")) { + } else if (provinceArr[i].equals("骞夸笢")) { provincePinyinMap.put("guangdong", provinceArr[i]); - } else if (provinceArr[i].equals("海南")) { + } else if (provinceArr[i].equals("娴峰崡")) { provincePinyinMap.put("hainan", provinceArr[i]); - } else if (provinceArr[i].equals("云南")) { + } else if (provinceArr[i].equals("浜戝崡")) { provincePinyinMap.put("yunnan", provinceArr[i]); - } else if (provinceArr[i].equals("四川")) { + } else if (provinceArr[i].equals("鍥涘窛")) { provincePinyinMap.put("sichuan", provinceArr[i]); - } else if (provinceArr[i].equals("青海")) { + } else if (provinceArr[i].equals("闈掓捣")) { provincePinyinMap.put("qinghai", provinceArr[i]); - } else if (provinceArr[i].equals("甘肃")) { + } else if (provinceArr[i].equals("鐢樿們")) { provincePinyinMap.put("gansu", provinceArr[i]); - } else if (provinceArr[i].equals("贵州")) { + } else if (provinceArr[i].equals("璐靛窞")) { provincePinyinMap.put("guzhou", provinceArr[i]); - } else if (provinceArr[i].equals("湖南")) { + } else if (provinceArr[i].equals("婀栧崡")) { provincePinyinMap.put("hunan", provinceArr[i]); - } else if (provinceArr[i].equals("湖北")) { + } else if (provinceArr[i].equals("婀栧寳")) { provincePinyinMap.put("hubei", provinceArr[i]); - } else if (provinceArr[i].equals("江西")) { + } else if (provinceArr[i].equals("姹熻タ")) { provincePinyinMap.put("jiangxi", provinceArr[i]); - } else if (provinceArr[i].equals("安徽")) { + } else if (provinceArr[i].equals("瀹夊窘")) { provincePinyinMap.put("anhui", provinceArr[i]); - } else if (provinceArr[i].equals("河南")) { + } else if (provinceArr[i].equals("娌冲崡")) { provincePinyinMap.put("henan", provinceArr[i]); - } else if (provinceArr[i].equals("山西")) { + } else if (provinceArr[i].equals("灞辫タ")) { provincePinyinMap.put("shanxi", provinceArr[i]); - } else if (provinceArr[i].equals("陕西")) { + } else if (provinceArr[i].equals("闄曡タ")) { provincePinyinMap.put("shanxi2", provinceArr[i]); - } else if (provinceArr[i].equals("新疆")) { + } else if (provinceArr[i].equals("鏂扮枂")) { provincePinyinMap.put("xinjiang", provinceArr[i]); - } else if (provinceArr[i].equals("西藏")) { + } else if (provinceArr[i].equals("瑗胯棌")) { provincePinyinMap.put("xizang", provinceArr[i]); - } else if (provinceArr[i].equals("宁夏")) { + } else if (provinceArr[i].equals("瀹佸")) { provincePinyinMap.put("ningxia", provinceArr[i]); - } else if (provinceArr[i].equals("广西")) { + } else if (provinceArr[i].equals("骞胯タ")) { provincePinyinMap.put("guangxi", provinceArr[i]); - } else if (provinceArr[i].equals("内蒙古")) { + } else if (provinceArr[i].equals("鍐呰挋鍙�")) { provincePinyinMap.put("neimenggu", provinceArr[i]); } @@ -1160,8 +1160,8 @@ public class CityController { private String spell; private String name; private List cityRegion; - private int haveDistrict; // 0:没有 , > 0:有 - private Map cityRegionHaveDistrict; // 区域有无小区统计 0:没有 + private int haveDistrict; // 0:娌℃湁 锛� > 0:鏈� + private Map cityRegionHaveDistrict; // 鍖哄煙鏈夋棤灏忓尯缁熻 0锛氭病鏈� public String getId() { return id; @@ -1243,9 +1243,9 @@ public class CityController { public Object exportExcelAction(ServerAreaModel model) { List serverAreaBoList = serverAreaService.findAllServerArea(); - Map> cityInProvinceMap = splitCityAllRegionInProvince(serverAreaBoList); // 得到城市信息 + Map> cityInProvinceMap = splitCityAllRegionInProvince(serverAreaBoList); // 寰楀埌鍩庡競淇℃伅 - cityInProvinceMap = ensureInfoInCity(model.getCat(), cityInProvinceMap); // 统计城市覆盖情况 + cityInProvinceMap = ensureInfoInCity(model.getCat(), cityInProvinceMap); // 缁熻鍩庡競瑕嗙洊鎯呭喌 String[] provinceArr = new String[cityInProvinceMap.keySet().size()]; provinceArr = cityInProvinceMap.keySet().toArray(provinceArr); @@ -1259,7 +1259,7 @@ public class CityController { CityBo cityBo = citys.get(num); List regionBlocks = cityBo.getCityRegion(); if (regionBlocks != null) { - cityBo = ensureInfoInCityRegion(model.getCat(), cityBo); // 统计城市区域覆盖情况 + cityBo = ensureInfoInCityRegion(model.getCat(), cityBo); // 缁熻鍩庡競鍖哄煙瑕嗙洊鎯呭喌 citys.set(num, cityBo); } } @@ -1271,18 +1271,18 @@ public class CityController { OutputStream os = null; BufferedOutputStream fos = null; HSSFWorkbook wb = createExcel(model); - String fileName = model.getCat() + "信息数量统计(" + DateUtils.formatDate(new Date(), "yyyyMMddHHmmss") + ").xls"; + String fileName = model.getCat() + "淇℃伅鏁伴噺缁熻(" + DateUtils.formatDate(new Date(), "yyyyMMddHHmmss") + ").xls"; try { HttpServletResponse response = ActionContext.getContext().getResponse(); response.setCharacterEncoding("UTF-8"); - // response.reset();// 清空输出流 + // response.reset();// 娓呯┖杈撳嚭娴� response.setContentType("application/x-download;charset=UTF-8"); fileName = new String(fileName.getBytes("GBK"), "ISO-8859-1"); - if (fileName.length() > 150) {// 解决IE 6.0 bug + if (fileName.length() > 150) {// 瑙e喅IE 6.0 bug fileName = new String(fileName.getBytes("GBK"), "ISO-8859-1"); } response.setHeader("Content-Disposition", "attachment;filename=" + fileName); - os = response.getOutputStream();// 取得输出流 + os = response.getOutputStream();// 鍙栧緱杈撳嚭娴� wb.write(os); os.flush(); } catch (Exception e) { @@ -1304,7 +1304,7 @@ public class CityController { private HSSFWorkbook createExcel(ServerAreaModel model) { HSSFWorkbook wb = new HSSFWorkbook(); - HSSFSheet fieldSheet = wb.createSheet(model.getCat() + "统计"); + HSSFSheet fieldSheet = wb.createSheet(model.getCat() + "缁熻"); int rowInx = 0; HSSFRow row = fieldSheet.createRow(rowInx); @@ -1337,7 +1337,7 @@ public class CityController { } HSSFCell prov = cityInfoRow.createCell(0); - if (("直辖市").equals(province)) { + if (("鐩磋緰甯�").equals(province)) { prov.setCellValue(cityName); } else { prov.setCellValue(province); @@ -1367,7 +1367,7 @@ public class CityController { } HSSFCell provcell = cityRegionInfoRow.createCell(0); - if (("直辖市").equals(province)) { + if (("鐩磋緰甯�").equals(province)) { provcell.setCellValue(cityName); } else { provcell.setCellValue(province); @@ -1394,7 +1394,7 @@ public class CityController { } HSSFCell provcell = regionInfoRow.createCell(0); - if (("直辖市").equals(province)) { + if (("鐩磋緰甯�").equals(province)) { provcell.setCellValue(cityName); } else { provcell.setCellValue(province); @@ -1430,31 +1430,31 @@ public class CityController { private HSSFRow setTableHeader(HSSFRow row) { int cellInx = 0; HSSFCell provCell = row.createCell(cellInx); - provCell.setCellValue("省份"); + provCell.setCellValue("鐪佷唤"); cellInx = 1; HSSFCell cityCell = row.createCell(cellInx); - cityCell.setCellValue("城市"); + cityCell.setCellValue("鍩庡競"); cellInx = 2; HSSFCell cityCountsCell = row.createCell(cellInx); - cityCountsCell.setCellValue("总量"); + cityCountsCell.setCellValue("鎬婚噺"); cellInx = 3; HSSFCell cityRegionCell = row.createCell(cellInx); - cityRegionCell.setCellValue("县级市"); + cityRegionCell.setCellValue("鍘跨骇甯�"); cellInx = 4; HSSFCell cityRegionCountsCell = row.createCell(cellInx); - cityRegionCountsCell.setCellValue("总量"); + cityRegionCountsCell.setCellValue("鎬婚噺"); cellInx = 5; HSSFCell regionCell = row.createCell(cellInx); - regionCell.setCellValue("区县"); + regionCell.setCellValue("鍖哄幙"); cellInx = 6; HSSFCell regionCountsCell = row.createCell(cellInx); - regionCountsCell.setCellValue("总量"); + regionCountsCell.setCellValue("鎬婚噺"); return row; } diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ClickPageController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ClickPageController.java index b2f799eda..b048fa01d 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ClickPageController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ClickPageController.java @@ -38,7 +38,7 @@ public class ClickPageController { } /** - * 进入“新增页面”页面 + * 杩涘叆鈥滄柊澧為〉闈⑩�濋〉闈� * * @param model * @return @@ -48,7 +48,7 @@ public class ClickPageController { } /** - * 进入“新增模块”页面 + * 杩涘叆鈥滄柊澧炴ā鍧椻�濋〉闈� * * @param model * @return @@ -61,7 +61,7 @@ public class ClickPageController { } /** - * 保存新增的页面 + * 淇濆瓨鏂板鐨勯〉闈� * * @param model * @return @@ -78,7 +78,7 @@ public class ClickPageController { } /** - * 保存新增的模块 + * 淇濆瓨鏂板鐨勬ā鍧� * * @param model * @return @@ -96,7 +96,7 @@ public class ClickPageController { } /** - * 删除页面 + * 鍒犻櫎椤甸潰 * * @param model * @return @@ -110,7 +110,7 @@ public class ClickPageController { } /** - * 删除模块 + * 鍒犻櫎妯″潡 * * @param model * @return @@ -124,7 +124,7 @@ public class ClickPageController { } /** - * 修改页面 + * 淇敼椤甸潰 * * @param model * @return @@ -147,7 +147,7 @@ public class ClickPageController { } /** - * 修改模块 + * 淇敼妯″潡 * * @param model * @return diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ComparePriceController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ComparePriceController.java index 89b05003c..d243009ea 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ComparePriceController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ComparePriceController.java @@ -24,12 +24,12 @@ public class ComparePriceController { public Object listQRAction(ComparePriceModel model) { if(StringUtils.isBlank(model.getCityDisplay())) { - model.setCityDisplay("全国"); + model.setCityDisplay("鍏ㄥ浗"); } if(model.getSdateStart() <= 0 || model.getSdateEnd() <= 0) { Date sunday = DateUtil.getThisSunday(new Date()); - model.setSdateStart(Integer.parseInt(DateUtil.formatToTightYYYYMMDD(DateUtil.getBeforeDay(sunday, 13 * 7)))); //最近一季度 + model.setSdateStart(Integer.parseInt(DateUtil.formatToTightYYYYMMDD(DateUtil.getBeforeDay(sunday, 13 * 7)))); //鏈�杩戜竴瀛e害 model.setSdateEnd(Integer.parseInt(DateUtil.formatToTightYYYYMMDD(sunday))); } @@ -51,12 +51,12 @@ public class ComparePriceController { public Object loadQRDataAction(AvgPriceUpdateModel model) { if(StringUtils.isBlank(model.getCityDisplay())) { - model.setCityDisplay("全国"); + model.setCityDisplay("鍏ㄥ浗"); } if(model.getSdateStart() <= 0 || model.getSdateEnd() <= 0) { Date sunday = DateUtil.getThisSunday(new Date()); - model.setSdateStart(Integer.parseInt(DateUtil.formatToTightYYYYMMDD(DateUtil.getBeforeDay(sunday, 13 * 7)))); //最近一季度 + model.setSdateStart(Integer.parseInt(DateUtil.formatToTightYYYYMMDD(DateUtil.getBeforeDay(sunday, 13 * 7)))); //鏈�杩戜竴瀛e害 model.setSdateEnd(Integer.parseInt(DateUtil.formatToTightYYYYMMDD(sunday))); } @@ -72,12 +72,12 @@ public class ComparePriceController { jo5 = new JSONObject(), jo6 = new JSONObject(); JSONArray pt1 = new JSONArray(), pt2 = new JSONArray(), pt3 = new JSONArray(), pt4 = new JSONArray(), pt5 = new JSONArray(), pt6 = new JSONArray(); - jo1.put("name", "近一个月人工支持度%"); - jo2.put("name", "近一个月系统支持度%"); - jo3.put("name", "近半年人工支持度%"); - jo4.put("name", "近半年系统支持度%"); - jo5.put("name", "历史数据人工支持度%"); - jo6.put("name", "历史数据系统支持度%"); + jo1.put("name", "杩戜竴涓湀浜哄伐鏀寔搴�%"); + jo2.put("name", "杩戜竴涓湀绯荤粺鏀寔搴�%"); + jo3.put("name", "杩戝崐骞翠汉宸ユ敮鎸佸害%"); + jo4.put("name", "杩戝崐骞寸郴缁熸敮鎸佸害%"); + jo5.put("name", "鍘嗗彶鏁版嵁浜哄伐鏀寔搴�%"); + jo6.put("name", "鍘嗗彶鏁版嵁绯荤粺鏀寔搴�%"); for(ComparePriceCity aqr : comparePriceCitys) { String dateStr = DateUtil.formatToTightYYYYMMDD(aqr.getCreationDate()); Integer date = Integer.valueOf(dateStr); diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ConsumerAddressController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ConsumerAddressController.java index e2c341ce3..fe46c591b 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ConsumerAddressController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ConsumerAddressController.java @@ -33,46 +33,46 @@ import javax.servlet.http.HttpServletResponse; import java.io.*; import java.util.*; -/**客户地址分析 +/**瀹㈡埛鍦板潃鍒嗘瀽 * Created by ideoj on 2016/7/29. */ public class ConsumerAddressController { Map locations = new HashMap(){ { - put("上海", "121.487899486,31.24916171"); - put("北京", "116.395645038,39.9299857781"); - put("天津", "117.210813092,39.1439299033"); - put("重庆", "106.530635013,29.5446061089"); + put("涓婃捣", "121.487899486,31.24916171"); + put("鍖椾含", "116.395645038,39.9299857781"); + put("澶╂触", "117.210813092,39.1439299033"); + put("閲嶅簡", "106.530635013,29.5446061089"); - put("黑龙江", "126.657716855,45.7732246332"); - put("吉林", "125.313642427,43.8983376071"); - put("辽宁", "123.432790922,41.8086447835"); - put("河北", "114.522081844,38.0489583146"); - put("甘肃", "103.823305441,36.064225525"); - put("青海", "101.76792099,36.640738612"); - put("陕西", "108.953098279,34.2777998978"); - put("河南", "113.64964385,34.7566100641"); - put("山东", "117.024967066,36.6827847272"); - put("山西", "112.550863589,37.890277054"); - put("安徽", "117.282699092,31.8669422607"); - put("湖北", "114.316200103,30.5810841269"); - put("湖南", "112.979352788,28.2134782309"); - put("江苏", "118.778074408,32.0572355018"); - put("四川", "104.067923463,30.6799428454"); - put("贵州", "106.709177096,26.6299067414"); - put("云南", "102.714601139,25.0491531005"); - put("浙江", "120.219375416,30.2592444615"); - put("江西", "115.893527546,28.6895780001"); - put("广东", "113.307649675,23.1200491021"); - put("福建", "119.330221107,26.0471254966"); - put("台湾", "114.130474436,22.3748329286"); - put("海南", "110.330801848,20.022071277"); + put("榛戦緳姹�", "126.657716855,45.7732246332"); + put("鍚夋灄", "125.313642427,43.8983376071"); + put("杈藉畞", "123.432790922,41.8086447835"); + put("娌冲寳", "114.522081844,38.0489583146"); + put("鐢樿們", "103.823305441,36.064225525"); + put("闈掓捣", "101.76792099,36.640738612"); + put("闄曡タ", "108.953098279,34.2777998978"); + put("娌冲崡", "113.64964385,34.7566100641"); + put("灞变笢", "117.024967066,36.6827847272"); + put("灞辫タ", "112.550863589,37.890277054"); + put("瀹夊窘", "117.282699092,31.8669422607"); + put("婀栧寳", "114.316200103,30.5810841269"); + put("婀栧崡", "112.979352788,28.2134782309"); + put("姹熻嫃", "118.778074408,32.0572355018"); + put("鍥涘窛", "104.067923463,30.6799428454"); + put("璐靛窞", "106.709177096,26.6299067414"); + put("浜戝崡", "102.714601139,25.0491531005"); + put("娴欐睙", "120.219375416,30.2592444615"); + put("姹熻タ", "115.893527546,28.6895780001"); + put("骞夸笢", "113.307649675,23.1200491021"); + put("绂忓缓", "119.330221107,26.0471254966"); + put("鍙版咕", "114.130474436,22.3748329286"); + put("娴峰崡", "110.330801848,20.022071277"); - put("新疆", "87.5649877411,43.8403803472"); - put("内蒙古", "111.66035052,40.8283188731"); - put("宁夏", "106.206478608,38.5026210119"); - put("广西", "108.297233556,22.8064929356"); - put("西藏", "91.111890896,29.6625570621"); + put("鏂扮枂", "87.5649877411,43.8403803472"); + put("鍐呰挋鍙�", "111.66035052,40.8283188731"); + put("瀹佸", "106.206478608,38.5026210119"); + put("骞胯タ", "108.297233556,22.8064929356"); + put("瑗胯棌", "91.111890896,29.6625570621"); } }; @@ -108,7 +108,7 @@ public class ConsumerAddressController { public Object uploadAction(HttpServletRequest request, ConsumerAddressModel model) { CommonsMultipartResolver multipartResolver = new CommonsMultipartResolver(request.getSession().getServletContext()); - if(multipartResolver.isMultipart(request)) {//先判断request中是否包涵multipart类型的数据 + if(multipartResolver.isMultipart(request)) {//鍏堝垽鏂璻equest涓槸鍚﹀寘娑祄ultipart绫诲瀷鐨勬暟鎹� Map params = ActionContext.getContext().getParameters(); String name = (String)(params.get("fileFileName")[0]); FileInputStream fileInputStream = (FileInputStream)(params.get("fileInputStream")[0]); @@ -134,7 +134,7 @@ public class ConsumerAddressController { for (int i = 0; i < sheetCount; ++i) { HSSFSheet hssfSheet = hssfWorkbook.getSheetAt(i); String sheetName = hssfSheet.getSheetName(); - if(sheetName.contains("总表")) { + if(sheetName.contains("鎬昏〃")) { continue; } for(int j=hssfSheet.getFirstRowNum()+1; j<=hssfSheet.getLastRowNum(); ++j) { @@ -157,7 +157,7 @@ public class ConsumerAddressController { } ConsumerAddress findObj = consumerAddressService.findByNameAndAddress(name, address); - if(findObj != null || StringUtils.isBlank(address) || StringUtils.isBlank(name)) {//根据名称和地址找到匹配项,则跳过;否则,入库 + if(findObj != null || StringUtils.isBlank(address) || StringUtils.isBlank(name)) {//鏍规嵁鍚嶇О鍜屽湴鍧�鎵惧埌鍖归厤椤癸紝鍒欒烦杩囷紱鍚﹀垯锛屽叆搴� continue; } ConsumerAddress consumerAddress = new ConsumerAddress(); @@ -185,7 +185,7 @@ public class ConsumerAddressController { for (int i = 0; i < sheetCount; ++i) { XSSFSheet xssfSheet = xssfWorkbook.getSheetAt(i); String sheetName = xssfSheet.getSheetName(); - if(sheetName.contains("总表")) { + if(sheetName.contains("鎬昏〃")) { continue; } for(int j=xssfSheet.getFirstRowNum()+1; j<=xssfSheet.getLastRowNum(); ++j) { @@ -208,7 +208,7 @@ public class ConsumerAddressController { } ConsumerAddress findObj = consumerAddressService.findByNameAndAddress(name, address); - if(findObj != null || StringUtils.isBlank(address)) {//根据名称和地址找到匹配项,则跳过;否则,入库 + if(findObj != null || StringUtils.isBlank(address)) {//鏍规嵁鍚嶇О鍜屽湴鍧�鎵惧埌鍖归厤椤癸紝鍒欒烦杩囷紱鍚﹀垯锛屽叆搴� continue; } ConsumerAddress consumerAddress = new ConsumerAddress(); @@ -235,7 +235,7 @@ public class ConsumerAddressController { Map result = Maps.newHashMap(); Map consumerAddressMap = Maps.newHashMap(); - resortConsumerAddress(findObjs, consumerAddressMap);//按行业进行分类 + resortConsumerAddress(findObjs, consumerAddressMap);//鎸夎涓氳繘琛屽垎绫� result.put("status", 0); result.put("counts", consumerAddressMap); result.put("datas", findObjs); @@ -315,12 +315,12 @@ public class ConsumerAddressController { HSSFSheet hssfSheet = hssfWorkbook.getSheet(consumerAddress.getCat()); if(hssfSheet==null) { hssfSheet = hssfWorkbook.createSheet(consumerAddress.getCat()); - //生成表头 + //鐢熸垚琛ㄥご HSSFRow hssfRow = hssfSheet.createRow(0); - hssfRow.createCell(0).setCellValue("名称"); - hssfRow.createCell(1).setCellValue("地址"); - hssfRow.createCell(2).setCellValue("联系方式"); - hssfRow.createCell(3).setCellValue("邮箱"); + hssfRow.createCell(0).setCellValue("鍚嶇О"); + hssfRow.createCell(1).setCellValue("鍦板潃"); + hssfRow.createCell(2).setCellValue("鑱旂郴鏂瑰紡"); + hssfRow.createCell(3).setCellValue("閭"); } int lastRowNum = hssfSheet.getLastRowNum(); HSSFRow row = hssfSheet.createRow(lastRowNum + 1); diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ConsumptionLoanController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ConsumptionLoanController.java index ffdcfd1ec..01e666098 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ConsumptionLoanController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ConsumptionLoanController.java @@ -50,7 +50,7 @@ public class ConsumptionLoanController { ConsumptionLoan consumptionLoan = model.getConsumptionLoan(); if (StringUtils.isNotBlank(consumptionLoan.getCity())) { - consumptionLoan.setCitys(Arrays.asList(consumptionLoan.getCity().split(",|,"))); + consumptionLoan.setCitys(Arrays.asList(consumptionLoan.getCity().split(",|锛�"))); } consumptionLoan.setFeature(StringUtils.join(model.getFeatures(), ",")); diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/CopyrightConfigController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/CopyrightConfigController.java index 70e4b6179..68fd21e19 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/CopyrightConfigController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/CopyrightConfigController.java @@ -11,8 +11,8 @@ import com.fangjia.dal.mongo.fangjia.model.CopyrightConfig; import com.fangjia.service.mongo.fangjia.CopyrightConfigService; /** - * 版权配置管理 - * H5投放使用 + * 鐗堟潈閰嶇疆绠$悊 + * H5鎶曟斁浣跨敤 * @author yinjihuan * */ @@ -26,7 +26,7 @@ public class CopyrightConfigController { } /** - * 列表页面 + * 鍒楄〃椤甸潰 * @param model * @return */ @@ -47,10 +47,10 @@ public class CopyrightConfigController { copyrightConfig.setModifyDate(new Date()); copyrightConfigService.update(copyrightConfig); data.put("success", true); - data.put("msg", "修改成功"); + data.put("msg", "淇敼鎴愬姛"); } else { data.put("success", false); - data.put("msg", "编号不存在"); + data.put("msg", "缂栧彿涓嶅瓨鍦�"); } jsonModel.setJsonModel(data); return jsonModel; @@ -69,10 +69,10 @@ public class CopyrightConfigController { copyrightConfig.setModifyDate(new Date()); copyrightConfigService.save(copyrightConfig); data.put("success", true); - data.put("msg", "添加成功"); + data.put("msg", "娣诲姞鎴愬姛"); } else { data.put("success", false); - data.put("msg", "编号重复"); + data.put("msg", "缂栧彿閲嶅"); } jsonModel.setJsonModel(data); return jsonModel; @@ -82,7 +82,7 @@ public class CopyrightConfigController { JsonModel jsonModel = new JsonModel(); Map data = new HashMap(); data.put("success", true); - data.put("msg", "删除成功"); + data.put("msg", "鍒犻櫎鎴愬姛"); copyrightConfigService.remove(model.getNumber()); jsonModel.setJsonModel(data); return jsonModel; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/CrawlTemplateController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/CrawlTemplateController.java index ca2e03cf5..b432b80ff 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/CrawlTemplateController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/CrawlTemplateController.java @@ -87,7 +87,7 @@ public class CrawlTemplateController { params.add(new QueryParam("jobId",model.getJobId())); List crawlTemplates = crawlTemplateDao.findAllByParams(params); if((crawlTemplates != null) && !crawlTemplates.isEmpty()){ - model.setErrMsg("此任务号已存在!"); + model.setErrMsg("姝や换鍔″彿宸插瓨鍦紒"); } return model; } diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/CustomerConsultController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/CustomerConsultController.java index 0d3698bec..2e8ea9b9c 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/CustomerConsultController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/CustomerConsultController.java @@ -30,8 +30,8 @@ import org.sothis.web.mvc.ActionContext; /** * - * 说明:FangJia China 用户咨询 - * @author 王文艳 + * 璇存槑:FangJia China 鐢ㄦ埛鍜ㄨ + * @author 鐜嬫枃鑹� * */ public class CustomerConsultController { @@ -81,9 +81,9 @@ public class CustomerConsultController { OutputStream os = null; BufferedOutputStream fos = null; - String[] columns = {"姓名","公司","邮箱","手机","来源","内容","咨询日期","IP"}; + String[] columns = {"濮撳悕","鍏徃","閭","鎵嬫満","鏉ユ簮","鍐呭","鍜ㄨ鏃ユ湡","IP"}; HSSFWorkbook wb= new HSSFWorkbook(); - Sheet sheet = wb.createSheet("信息详情"); + Sheet sheet = wb.createSheet("淇℃伅璇︽儏"); Row row = sheet.createRow(0); for(int i =0 ;i < columns.length ; i++){ row.createCell(i).setCellValue(columns[i]); @@ -101,18 +101,18 @@ public class CustomerConsultController { row.createCell(6).setCellValue(DateUtil.formatByPattern(log.getCreateDate(), "yyyy-MM-dd HH:mm")); row.createCell(7).setCellValue(log.getIp()); } - String fileName = "FangjiaChina用户信息" + "(" + DateUtil.formatByPattern(new Date(), "yyyyMMddHHmmss") + ").xls"; + String fileName = "FangjiaChina鐢ㄦ埛淇℃伅" + "(" + DateUtil.formatByPattern(new Date(), "yyyyMMddHHmmss") + ").xls"; try { HttpServletResponse response = ActionContext.getContext().getResponse(); response.setCharacterEncoding("UTF-8"); - //response.reset();// 清空输出流 + //response.reset();// 娓呯┖杈撳嚭娴� response.setContentType("application/x-download;charset=UTF-8"); fileName = new String(fileName.getBytes("GBK"),"ISO-8859-1"); - if(fileName.length()>150){//解决IE 6.0 bug + if(fileName.length()>150){//瑙e喅IE 6.0 bug fileName = new String(fileName.getBytes("GBK"),"ISO-8859-1"); } response.setHeader( "Content-Disposition", "attachment;filename=" + fileName); - os = response.getOutputStream();// 取得输出流 + os = response.getOutputStream();// 鍙栧緱杈撳嚭娴� wb.write(os); os.flush(); }catch (Exception e) { diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/CustomqueryController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/CustomqueryController.java index 92a7be88e..629e8aae2 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/CustomqueryController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/CustomqueryController.java @@ -75,7 +75,7 @@ public class CustomqueryController { queryBean.setType(model.getType()); List customqueryBoList = customqueryService.findByQueryBean(queryBean); if (customqueryBoList != null && customqueryBoList.size() > 0) { - model.flash().setAttribute("message", model.getName() + "已经存在"); + model.flash().setAttribute("message", model.getName() + "宸茬粡瀛樺湪"); return model.redirect("/customquery/create"); } @@ -84,7 +84,7 @@ public class CustomqueryController { customquery.setName(model.getName()); customquery.setCaption(model.getCaption()); if (StringUtils.isBlank(model.getDisplay())) { - customquery.setCity("全国"); + customquery.setCity("鍏ㄥ浗"); } else { customquery.setCity(model.getDisplay()); } @@ -127,10 +127,10 @@ public class CustomqueryController { customquery.setStatus(0); customqueryService.save(customquery); if (StringUtils.isNotBlank(customquery.getId())) { - model.flash().setAttribute("message", "ID: " + customquery.getId() + " 保存成功"); + model.flash().setAttribute("message", "ID: " + customquery.getId() + " 淇濆瓨鎴愬姛"); return model.redirect("/customquery/show?id=" + customquery.getId()); } else { - model.flash().setAttribute("message", "Customquery 保存失败"); + model.flash().setAttribute("message", "Customquery 淇濆瓨澶辫触"); return model.redirect("/customquery/create"); } } @@ -138,7 +138,7 @@ public class CustomqueryController { public Object showAction(CustomqueryModel model) { Customquery customquery = customqueryService.findById(model.getId()); if (null == customquery) { - model.flash().setAttribute("message", "ID: " + model.getId() + " 没找到结果"); + model.flash().setAttribute("message", "ID: " + model.getId() + " 娌℃壘鍒扮粨鏋�"); return model.redirect("/customquery/list"); } else { model.setCustomqueryBo(new CustomqueryBo(customquery)); @@ -150,7 +150,7 @@ public class CustomqueryController { public Object editAction(CustomqueryModel model) { Customquery customquery = customqueryService.findById(model.getId()); if (null == customquery) { - model.flash().setAttribute("message", "ID: " + model.getId() + " 没找到结果"); + model.flash().setAttribute("message", "ID: " + model.getId() + " 娌℃壘鍒扮粨鏋�"); return model.redirect("/customquery/list"); } else { model.setCustomqueryBo(new CustomqueryBo(customquery)); @@ -165,14 +165,14 @@ public class CustomqueryController { try { BeanUtils.copyProperties(model.getCustomqueryBo(), customquery); customqueryService.update(customquery); - model.flash().setAttribute("message", "ID: " + model.getCustomqueryBo().getId() + " 更新成功"); + model.flash().setAttribute("message", "ID: " + model.getCustomqueryBo().getId() + " 鏇存柊鎴愬姛"); return model.redirect("/customquery/show?id=" + model.getCustomqueryBo().getId()); } catch (Exception e) { - model.flash().setAttribute("message", "ID: " + model.getCustomqueryBo().getId() + " 更新失败"); + model.flash().setAttribute("message", "ID: " + model.getCustomqueryBo().getId() + " 鏇存柊澶辫触"); return model.redirect("/customquery/edit"); } } else { - model.flash().setAttribute("message", "ID: " + model.getCustomqueryBo().getId() + " 没找到结果"); + model.flash().setAttribute("message", "ID: " + model.getCustomqueryBo().getId() + " 娌℃壘鍒扮粨鏋�"); return model.redirect("/customquery/list"); } } @@ -182,10 +182,10 @@ public class CustomqueryController { Customquery customquery = customqueryService.findById(model.getId()); customquery.setStatus(1); customqueryService.update(customquery); - model.flash().setAttribute("message", "ID: " + model.getId() + " 删除成功"); + model.flash().setAttribute("message", "ID: " + model.getId() + " 鍒犻櫎鎴愬姛"); return model.redirect("/customquery/list"); } else { - model.flash().setAttribute("message", "ID: " + model.getId() + " 删除失败"); + model.flash().setAttribute("message", "ID: " + model.getId() + " 鍒犻櫎澶辫触"); return model.redirect("/customquery/list"); } } 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 3aae49c4d..cc2641f9a 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 @@ -127,12 +127,12 @@ public class DataController { } final Map levelMap=new HashMap(); - levelMap.put("一线", 1000); - levelMap.put("新一线", 1000); - levelMap.put("二线", 2000); - levelMap.put("三线", 3000); - levelMap.put("四线", 4000); - levelMap.put("五线", 5000); + levelMap.put("涓�绾�", 1000); + levelMap.put("鏂颁竴绾�", 1000); + levelMap.put("浜岀嚎", 2000); + levelMap.put("涓夌嚎", 3000); + levelMap.put("鍥涚嚎", 4000); + levelMap.put("浜旂嚎", 5000); Collections.sort(allCityInfos,new Comparator(){ @Override @@ -160,7 +160,7 @@ public class DataController { }); model.setAllCityInfos(allCityInfos); - // 城市Flash和图片信息 + // 鍩庡競Flash鍜屽浘鐗囦俊鎭� List serverAreaBoList = new ArrayList(); for (ServerArea serverArea : serverAreaList) { serverAreaBoList.add(new ServerAreaBo(serverArea)); @@ -283,7 +283,7 @@ public class DataController { } /** - * 设置城市FLASH和图片信息 + * 璁剧疆鍩庡競FLASH鍜屽浘鐗囦俊鎭� * * @param serverAreaBoList */ @@ -311,7 +311,7 @@ public class DataController { public Object regionAction(DataModel model) { String city = model.getCityDisplay(); if (StringUtils.isBlank(city)) { - city = "上海"; + city = "涓婃捣"; model.setCityDisplay(city); } @@ -353,7 +353,7 @@ public class DataController { private List buildDealPriceStatParams(DataModel model) { List params = Lists.newArrayList(); - if(StringUtils.isNotBlank(model.getCityDisplay()) && !"全国".equals(model.getCityDisplay())) { + if(StringUtils.isNotBlank(model.getCityDisplay()) && !"鍏ㄥ浗".equals(model.getCityDisplay())) { params.add(new QueryParam("city", model.getCityDisplay())); } if(StringUtils.isNotBlank(model.getRegion())){ @@ -379,7 +379,7 @@ public class DataController { private List buildDealPriceParams(DataModel model) { List params = Lists.newArrayList(); - if(StringUtils.isNotBlank(model.getCityDisplay()) && !"全国".equals(model.getCityDisplay())) { + if(StringUtils.isNotBlank(model.getCityDisplay()) && !"鍏ㄥ浗".equals(model.getCityDisplay())) { params.add(new QueryParam("city", model.getCityDisplay())); } if(StringUtils.isNotBlank(model.getSource())){ @@ -405,7 +405,7 @@ public class DataController { private List buildDealCountStatParams(DealCountStatModel model) { List params = Lists.newArrayList(); - if(StringUtils.isNotBlank(model.getCityDisplay()) && !"全国".equals(model.getCityDisplay())) { + if(StringUtils.isNotBlank(model.getCityDisplay()) && !"鍏ㄥ浗".equals(model.getCityDisplay())) { params.add(new QueryParam("city", model.getCityDisplay())); } SimpleDateFormat sdf = new SimpleDateFormat("yyyyMM"); @@ -424,7 +424,7 @@ public class DataController { List queryParams = buildNewHouseParams(model); List sortParams = buildSortParams(model); int countNewHouse = dataService.countNewHouse(queryParams); - //TODO 获取详细列表总数 + //TODO 鑾峰彇璇︾粏鍒楄〃鎬绘暟 int countNewHouseDetail = 0; model.setSumCount(countNewHouse); model.setDetailCount(countNewHouseDetail); @@ -444,7 +444,7 @@ public class DataController { private List buildNewHouseParams(DataModel model) { SimpleDateFormat sdf = new SimpleDateFormat("yyyyMM"); List params = new ArrayList(); - if(StringUtils.isNotBlank(model.getCityDisplay()) && !"全国".equals(model.getCityDisplay())){ + if(StringUtils.isNotBlank(model.getCityDisplay()) && !"鍏ㄥ浗".equals(model.getCityDisplay())){ params.add(new QueryParam("city", model.getCityDisplay())); } if(StringUtils.isNotBlank(model.getRegion())){ @@ -600,18 +600,18 @@ public class DataController { BufferedOutputStream fos = null; HSSFWorkbook wb = createExcel(model); //Date weekend = DateUtil.getFirstDayOfWeek(new Date()); - String fileName = "城市覆盖率统计(" + model.getWeekend() + ").xls"; + String fileName = "鍩庡競瑕嗙洊鐜囩粺璁�(" + model.getWeekend() + ").xls"; try { HttpServletResponse response = ActionContext.getContext().getResponse(); response.setCharacterEncoding("UTF-8"); - //response.reset();// 清空输出流 + //response.reset();// 娓呯┖杈撳嚭娴� response.setContentType("application/x-download;charset=UTF-8"); fileName = new String(fileName.getBytes("GBK"),"ISO-8859-1"); - if(fileName.length()>150){//解决IE 6.0 bug + if(fileName.length()>150){//瑙e喅IE 6.0 bug fileName = new String(fileName.getBytes("GBK"),"ISO-8859-1"); } response.setHeader( "Content-Disposition", "attachment;filename=" + fileName); - os = response.getOutputStream();// 取得输出流 + os = response.getOutputStream();// 鍙栧緱杈撳嚭娴� wb.write(os); os.flush(); }catch (Exception e) { @@ -637,7 +637,7 @@ public class DataController { Map resultModel = Maps.newHashMap(); if(StringUtils.isBlank(email)) { resultModel.put("status", 0); - resultModel.put("msg", "邮箱不能为空"); + resultModel.put("msg", "閭涓嶈兘涓虹┖"); jsonModel.setJsonModel(resultModel); return jsonModel; } @@ -645,20 +645,20 @@ public class DataController { List cities = ServerAreaData.getServerAreaDisplayList(1000); Mail mail = new Mail(); if(districtsHasLoudong.get() < cities.size()) { - //统计程序正在运行 + //缁熻绋嬪簭姝e湪杩愯 if(districtsHasLoudong.get() > 0) { resultModel.put("status", 200); - resultModel.put("msg", "统计程序正在运行,已统计["+districtsHasLoudong.get()+"]个城市"); + resultModel.put("msg", "缁熻绋嬪簭姝e湪杩愯锛屽凡缁熻["+districtsHasLoudong.get()+"]涓煄甯�"); jsonModel.setJsonModel(resultModel); return jsonModel; } - //统计并拼接成结果 - mail.setSubject("最新统计数据 — 有楼栋的房号库"); + //缁熻骞舵嫾鎺ユ垚缁撴灉 + mail.setSubject("鏈�鏂扮粺璁℃暟鎹� 鈥� 鏈夋ゼ鏍嬬殑鎴垮彿搴�"); StringBuffer emailMsg = new StringBuffer(); emailMsg.append("") - .append("") - .append(""); + .append("") + .append(""); for(String city : cities) { long districtCount = districtService.findCityDistrictCount(city); @@ -666,33 +666,33 @@ public class DataController { emailMsg.append(""); - //更新缓存 + //鏇存柊缂撳瓨 districtsHasLoudong.incrementAndGet(); } emailMsg.append("
有楼栋的房号库
城市小区数有楼栋的房号库
鏈夋ゼ鏍嬬殑鎴垮彿搴�
鍩庡競灏忓尯鏁�鏈夋ゼ鏍嬬殑鎴垮彿搴�
").append(city).append("") .append(districtCount).append("").append(districtHasLoudongCount) .append("
"); mail.setContent(emailMsg.toString()); } - //发送邮件 + //鍙戦�侀偖浠� for(String receiveEmail : receiveEmails) { try { mail.setReceiver(new MailUser(receiveEmail)); emailService.sendMail(mail); } catch (Exception e) { - LOGGER.error("统计邮件发送失败 -> " + receiveEmail + "\n" + e.getMessage()); + LOGGER.error("缁熻閭欢鍙戦�佸け璐� -> " + receiveEmail + "\n" + e.getMessage()); } } receiveEmails.clear(); districtsHasLoudong.set(0); resultModel.put("status", 200); - resultModel.put("msg", "统计程序运行结束"); + resultModel.put("msg", "缁熻绋嬪簭杩愯缁撴潫"); jsonModel.setJsonModel(resultModel); return jsonModel; } /** - * 根据城市查询有楼栋的小区数 + * 鏍规嵁鍩庡競鏌ヨ鏈夋ゼ鏍嬬殑灏忓尯鏁� * @param city * @return */ @@ -735,18 +735,18 @@ public class DataController { // TODO Auto-generated catch block e.printStackTrace(); } - createSheet(wb, 0, "小区", weekend); - createSheet(wb, 1, "写字楼", weekend); - createSheet(wb, 2, "房号", weekend); - createSheet(wb, 3, "商铺", weekend); - createSheet(wb, 4, "楼栋", weekend); + createSheet(wb, 0, "灏忓尯", weekend); + createSheet(wb, 1, "鍐欏瓧妤�", weekend); + createSheet(wb, 2, "鎴垮彿", weekend); + createSheet(wb, 3, "鍟嗛摵", weekend); + createSheet(wb, 4, "妤兼爧", weekend); return wb; } public HSSFWorkbook createSheet(HSSFWorkbook wb, int sheetIndex, String cat, Date weekend){ HSSFSheet s = wb.createSheet(); - wb.setSheetName(sheetIndex, cat+"字段覆盖率"); + wb.setSheetName(sheetIndex, cat+"瀛楁瑕嗙洊鐜�"); List results = dataService.findAllCityInfo(weekend); List> list = new ArrayList>(); List outfields = new ArrayList(); @@ -765,7 +765,7 @@ public class DataController { outfields.add("city"); outfields.add("cityLevel"); outfields.add("rankingLevel"); - if(cat.equals("小区")){ + if(cat.equals("灏忓尯")){ outfields.add("existingDistrictCount"); outfields.add("districtsHasLoudong"); outfields.add("districtsHasFanghao"); @@ -784,9 +784,9 @@ public class DataController { outfields.add("licence"); outfields.add("buildStructure"); - }else if(cat.equals("写字楼")){ + }else if(cat.equals("鍐欏瓧妤�")){ outfields.add("existingOfficeCount"); - }else if(cat.equals("商铺")){ + }else if(cat.equals("鍟嗛摵")){ outfields.add("existingShopCount"); } @@ -798,7 +798,7 @@ public class DataController { map.put("province",cityMap.get(cityInfo.getCity())); map.put("cityLevel", cityInfo.getCityLevel()); map.put("rankingLevel", rankMap.get(cityInfo.getCity())); - if(cat.equals("小区")){ + if(cat.equals("灏忓尯")){ map.put("existingDistrictCount", cityInfo.getExistingDistrictCount()); map.put("districtsHasLoudong", cityInfo.getDistrictsHasLoudong() == null ? 0 : cityInfo.getDistrictsHasLoudong()); map.put("districtsHasFanghao", cityInfo.getDistrictsHasFanghao() == null ? 0 : cityInfo.getDistrictsHasFanghao()); @@ -808,23 +808,23 @@ public class DataController { map.put("priceCreditGte66Coverage", cityInfo.getPriceCreditGte66Coverage()); map.put("priceCreditGte60Coverage", cityInfo.getPriceCreditGte60Coverage()); map.put("priceCreditGte00Coverage", cityInfo.getPriceCreditGte00Coverage()); - }else if(cat.equals("写字楼")){ + }else if(cat.equals("鍐欏瓧妤�")){ map.put("existingOfficeCount", cityInfo.getExistingOfficeCount()); - }else if(cat.equals("商铺")){ + }else if(cat.equals("鍟嗛摵")){ map.put("existingShopCount", cityInfo.getExistingShopCount()); } Map detailMap = null; - if(cat.equals("小区")){ + if(cat.equals("灏忓尯")){ detailMap = cityInfo.getDistrictDetail(); - }else if(cat.equals("写字楼")){ + }else if(cat.equals("鍐欏瓧妤�")){ detailMap = cityInfo.getOfficeDetail(); - }else if(cat.equals("房号")){ + }else if(cat.equals("鎴垮彿")){ detailMap = cityInfo.getHouseLoudongDetail(); - }else if(cat.equals("商铺")){ + }else if(cat.equals("鍟嗛摵")){ detailMap = cityInfo.getShopDetail(); - }else if(cat.equals("楼栋")){ + }else if(cat.equals("妤兼爧")){ detailMap = cityInfo.getLoudongDetail(); } if(null != detailMap){ @@ -844,7 +844,7 @@ public class DataController { Map displayMap = getFliedDisplay(cat); /* - 以displayMap为准 移除outfields中多余字段 + 浠isplayMap涓哄噯 绉婚櫎outfields涓浣欏瓧娈� */ Iterator it = outfields.iterator(); while(it.hasNext()) { @@ -860,9 +860,9 @@ public class DataController { it.remove(); } } -//因 写字楼导出仅展示写字楼后台的字段需求 改动 +//鍥� 鍐欏瓧妤煎鍑轰粎灞曠ず鍐欏瓧妤煎悗鍙扮殑瀛楁闇�姹� 鏀瑰姩 // for(String key : outfields){ -// if(cat.equals("商铺")){ +// if(cat.equals("鍟嗛摵")){ // if(key.equals("bedKind")){ // continue; // } @@ -881,7 +881,7 @@ public class DataController { int index = 0; for (String key : outfields) { Object obj = map.get(key); - if(cat.equals("商铺")){ + if(cat.equals("鍟嗛摵")){ if(key.equals("bedKind")){ continue; } @@ -913,233 +913,233 @@ public class DataController { public Map getFliedDisplay(String cat){ Map map = new HashMap(){ { - put( "province" , "省份" ); - put( "city" , "城市" ); - put( "cityLevel" , "城市等级" ); - put( "rankingLevel" , "行政区划" ); - put( "latLng" , "mapabc经纬度" ); - put( "latLng2" , "百度经纬度" ); + put( "province" , "鐪佷唤" ); + put( "city" , "鍩庡競" ); + put( "cityLevel" , "鍩庡競绛夌骇" ); + put( "rankingLevel" , "琛屾斂鍖哄垝" ); + put( "latLng" , "mapabc缁忕含搴�" ); + put( "latLng2" , "鐧惧害缁忕含搴�" ); -// 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","建筑年代"); +// 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("小区")){ + if(cat.equals("灏忓尯")){ map = setDistrictFields(map); - }else if(cat.equals("写字楼")){ + }else if(cat.equals("鍐欏瓧妤�")){ map = setOfficeFields(map); - }else if(cat.equals("房号")){ + }else if(cat.equals("鎴垮彿")){ map = setRoomNumberFields(map); - }else if(cat.equals("商铺")){ + }else if(cat.equals("鍟嗛摵")){ map = setShopsFields(map); - }else if(cat.equals("楼栋")){ + }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","得房率"); + 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","绔e伐鏃堕棿"); + 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","地下层数"); - map.put("rentPrice","租金价格"); - map.put("halfYearRentPrice","近半年租金价格"); + 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","绔e伐鏃堕棿"); +// 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","鍦颁笅灞傛暟"); + map.put("rentPrice","绉熼噾浠锋牸"); + map.put("halfYearRentPrice","杩戝崐骞寸閲戜环鏍�"); 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","建筑类型覆盖率"); + 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","地下层数"); + 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","绔e伐鏃堕棿"); + 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","建筑总面积覆盖率"); + 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; } @@ -1216,7 +1216,7 @@ public class DataController { } private void addLngLattask(){ - System.out.println("开始时间:"+new Date()); + System.out.println("寮�濮嬫椂闂达細"+new Date()); isRun = true; @@ -1226,14 +1226,14 @@ public class DataController { params.add(new QueryParam("processStatus", 0)); List noLatlngDistricts = noLatlngDistrictService.findAllByParams(params); if(noLatlngDistricts.size()==0){ - //删除老记录 + //鍒犻櫎鑰佽褰� noLatlngDistrictService.deleteAll(); addNoLatLngDistricts(serverAreas); } for(NoLatlngDistrict noLatLngDistrict : noLatlngDistricts){ - //地址改变更改相应的百度经纬度及mapabc经纬度 + //鍦板潃鏀瑰彉鏇存敼鐩稿簲鐨勭櫨搴︾粡绾害鍙妋apabc缁忕含搴� double lng2 = 0; double lat2 = 0; Map resultMap = null; @@ -1290,7 +1290,7 @@ public class DataController { } } - System.out.println("结束时间:"+new Date()); + System.out.println("缁撴潫鏃堕棿锛�"+new Date()); isRun = false; } @@ -1298,9 +1298,9 @@ public class DataController { private void addNoLatLngDistricts(List serverAreas){ String[] columns = {"city","region","name","address","lat","lng","lat2","lng2"}; - //新增没有经纬度的小区 + //鏂板娌℃湁缁忕含搴︾殑灏忓尯 for(ServerArea serverArea : serverAreas){ - if(serverArea.getDisplay().equals("全国")){ + if(serverArea.getDisplay().equals("鍏ㄥ浗")){ continue; } addRows(serverArea.getDisplay(), "district", columns); diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DataDealController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DataDealController.java index cae90e621..59f40cc3b 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DataDealController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DataDealController.java @@ -53,14 +53,14 @@ public class DataDealController { private DealRuleDao dealRuleDao; private DistrictDao districtDao; private SurplusDistrictService surplusDistrictService; - private static List distTypes = Arrays.asList("多层","小高层","超高层","高层","花园洋房","老洋房","四合院"); - private static List villaTypes = Arrays.asList("独栋","双拼","联排","叠加"); - private static List shopTypes = Arrays.asList("多层","小高层","超高层","高层","独栋","双拼","联排","叠加"); + private static List distTypes = Arrays.asList("澶氬眰","灏忛珮灞�","瓒呴珮灞�","楂樺眰","鑺卞洯娲嬫埧","鑰佹磱鎴�","鍥涘悎闄�"); + private static List villaTypes = Arrays.asList("鐙爧","鍙屾嫾","鑱旀帓","鍙犲姞"); + private static List shopTypes = Arrays.asList("澶氬眰","灏忛珮灞�","瓒呴珮灞�","楂樺眰","鐙爧","鍙屾嫾","鑱旀帓","鍙犲姞"); public static int statusFlag=0; /** - * 查询列表,默认空 + * 鏌ヨ鍒楄〃锛岄粯璁ょ┖ * @throws SecurityException * @throws NoSuchMethodException * @throws IllegalAccessException @@ -68,7 +68,7 @@ public class DataDealController { */ public Object listAction(DealModel model) throws Exception { - //查询所有规则 + //鏌ヨ鎵�鏈夎鍒� List ruleList = dealRuleDao.findAll(); model.setRuleList(ruleList); @@ -202,11 +202,11 @@ public class DataDealController { List result = null; if(tempBuildTypes != null && tempBuildTypes.size() > 0){ if(StringUtils.isNotBlank(district.getEstateType2())){ - if(district.getEstateType2().equals("普通住宅")){ + if(district.getEstateType2().equals("鏅�氫綇瀹�")){ result = changeValue(tempBuildTypes, distTypes); - }else if(district.getEstateType2().equals("别墅")){ + }else if(district.getEstateType2().equals("鍒")){ result = changeValue(tempBuildTypes, villaTypes); - }else if(district.getEstateType2().equals("商住")){ + }else if(district.getEstateType2().equals("鍟嗕綇")){ result = changeValue(tempBuildTypes, shopTypes); } }else{ @@ -242,7 +242,7 @@ public class DataDealController { } /** - * 执行选择脚本,判断小区是否符合 + * 鎵ц閫夋嫨鑴氭湰锛屽垽鏂皬鍖烘槸鍚︾鍚� * @param condition * @param district * @return @@ -261,7 +261,7 @@ public class DataDealController { } /** - * 执行操作脚本,对数据进行操作 + * 鎵ц鎿嶄綔鑴氭湰锛屽鏁版嵁杩涜鎿嶄綔 * @param condition * @param district * @throws ScriptException @@ -287,7 +287,7 @@ public class DataDealController { } /** - * 页面点击的方法 + * 椤甸潰鐐瑰嚮鐨勬柟娉� * @param model * @return * @throws NoSuchMethodException @@ -376,7 +376,7 @@ public class DataDealController { } /** - * 转换数据 + * 杞崲鏁版嵁 * @param tempBuildTypes * @param types * @return @@ -395,7 +395,7 @@ public class DataDealController { } /** - * 添加规则 + * 娣诲姞瑙勫垯 * @param model * @return */ @@ -426,7 +426,7 @@ public class DataDealController { } /** - * 删除规则 + * 鍒犻櫎瑙勫垯 */ public Object deleteRuleAction(DealModel model){ if(StringUtils.isNotBlank(model.getRuleId())){ @@ -436,7 +436,7 @@ public class DataDealController { } /** - * 规则管理页面 + * 瑙勫垯绠$悊椤甸潰 * @param model * @return */ @@ -465,7 +465,7 @@ public class DataDealController { } /** - * 获取待编辑的规则数据 + * 鑾峰彇寰呯紪杈戠殑瑙勫垯鏁版嵁 * @param model * @return */ @@ -479,7 +479,7 @@ public class DataDealController { } /** - * 获取城市下的区域、板块信息(ajax用) + * 鑾峰彇鍩庡競涓嬬殑鍖哄煙銆佹澘鍧椾俊鎭紙ajax鐢級 */ public Object getRegionsAction(DistrictModel model) { model.setViewType("json"); diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DatastoreStatController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DatastoreStatController.java index e44201db9..b6afbdc7b 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DatastoreStatController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DatastoreStatController.java @@ -76,9 +76,9 @@ public class DatastoreStatController { List citys = null; if(StringUtils.isBlank(model.getCityDisplay())){ - model.setCityDisplay("上海"); + model.setCityDisplay("涓婃捣"); citys = new ArrayList(); - citys.add("上海"); + citys.add("涓婃捣"); }else{ if(model.getCityDisplay().indexOf(",")!=-1){ citys = getCitys(model.getCityDisplay()); @@ -107,9 +107,9 @@ public class DatastoreStatController { List citys = null; if(StringUtils.isBlank(model.getCityDisplay())){ - model.setCityDisplay("全国"); + model.setCityDisplay("鍏ㄥ浗"); citys = new ArrayList(); - citys.add("全国"); + citys.add("鍏ㄥ浗"); }else{ if(model.getCityDisplay().indexOf(",")!=-1){ citys = getCitys(model.getCityDisplay()); diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DevelopmentZoneController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DevelopmentZoneController.java index 036ffc89d..ecf61ee64 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DevelopmentZoneController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DevelopmentZoneController.java @@ -96,16 +96,16 @@ public class DevelopmentZoneController { Map data = new HashMap(); ret.setJsonModel(data); if (model.getId() == null) { - // name province bdLocation level 不能为空 + // name province bdLocation level 涓嶈兘涓虹┖ if (StringUtils.isBlank(model.getProvince()) || StringUtils.isBlank(model.getName()) || StringUtils.isBlank(model.getLevel())) { - data.put("msg", "保存失败(开发区名称,所在省份,级别不能为空)"); + data.put("msg", "淇濆瓨澶辫触(寮�鍙戝尯鍚嶇О锛屾墍鍦ㄧ渷浠斤紝绾у埆涓嶈兘涓虹┖)"); return ret; } DevelopmentZone entity = new DevelopmentZone(); - // name province bdLocation level 不能为空/ + // name province bdLocation level 涓嶈兘涓虹┖/ entity.setName(model.getName()); entity.setProvince(model.getProvince()); - // 新加开发区,围栏不是必须有的 + // 鏂板姞寮�鍙戝尯锛屽洿鏍忎笉鏄繀椤绘湁鐨� if (model.getBdShape() != null && !model.getBdShape().toString().equals("[]")) { String locationStr = model.getBdShape().toString().replaceAll("\\[", "").replaceAll("\\]", "").replaceAll(" ", ""); List> bdLocationList = new ArrayList>(); @@ -117,25 +117,25 @@ public class DevelopmentZoneController { location.add(Double.parseDouble(splitStr2[1])); bdLocationList.add(location); } - //加上第一个,形成首尾闭合 + //鍔犱笂绗竴涓紝褰㈡垚棣栧熬闂悎 bdLocationList.add(bdLocationList.get(0)); model.setBdShape(bdLocationList); - // 百度经纬度 + // 鐧惧害缁忕含搴� Map bdShape = new HashMap(); bdShape.put("type", "polygon"); bdShape.put("coordinates", model.getBdShape()); entity.setBdShape(bdShape); - // 高德经纬度 + // 楂樺痉缁忕含搴� Map shape = new HashMap(); shape.put("type", "polygon"); Object coordinates = convertGeoList(model.getBdShape()); shape.put("coordinates", coordinates); entity.setShape(shape); - entity.setOperateResult("已处理"); + entity.setOperateResult("宸插鐞�"); } entity.setLevel(model.getLevel()); - String aliasString = model.getAlias().replaceAll(",", ","); + String aliasString = model.getAlias().replaceAll("锛�", ","); List alias = Arrays.asList(aliasString.split("\\s*,\\s*")); entity.setAlias(alias); entity.setAddress(StringUtils.isBlank(model.getAddress()) ? "" : model.getAddress()); @@ -151,10 +151,10 @@ public class DevelopmentZoneController { entity.setDistrict(StringUtils.isBlank(model.getDistrict()) ? "" : model.getDistrict()); entity.setImgUrl(StringUtils.isBlank(model.getImgUrl()) ? "" : model.getImgUrl()); entity.setOperateResult(StringUtils.isBlank(model.getOperateResult()) ? "" : model.getOperateResult()); - //记录操作人员 + //璁板綍鎿嶄綔浜哄憳 entity.setOperator(user.getRealName()); developmentZoneService.saveDevelopmentZone(entity); - data.put("msg", "保存成功"); + data.put("msg", "淇濆瓨鎴愬姛"); } else { // DevelopmentZone entity = developmentZoneService.findDevelopmentZone(model.getId()); Map udata = new HashMap(); @@ -178,25 +178,25 @@ public class DevelopmentZoneController { location.add(Double.parseDouble(splitStr2[1])); bdLocationList.add(location); } - //加上第一个,形成首尾闭合 + //鍔犱笂绗竴涓紝褰㈡垚棣栧熬闂悎 bdLocationList.add(bdLocationList.get(0)); model.setBdShape(bdLocationList); - // 百度经纬度 + // 鐧惧害缁忕含搴� Map bdShape = new HashMap(); bdShape.put("type", "polygon"); bdShape.put("coordinates", model.getBdShape()); udata.put("bdShape", bdShape); - // 高德经纬度 + // 楂樺痉缁忕含搴� Map shape = new HashMap(); shape.put("type", "polygon"); Object coordinates = convertGeoList(model.getBdShape()); shape.put("coordinates", coordinates); udata.put("shape", shape); - udata.put("operateResult", "已处理"); + udata.put("operateResult", "宸插鐞�"); } if (StringUtils.isNotBlank(model.getAlias())) { - String aliasString = model.getAlias().replaceAll(",", ","); - List alias = Arrays.asList(aliasString.split("\\s*,\\s*")); + String aliasString = model.getAlias().replaceAll(",", "锛�"); + List alias = Arrays.asList(aliasString.split("\\s*锛孿\s*")); udata.put("alias", alias); } if (StringUtils.isNotBlank(model.getAddress())) { @@ -236,10 +236,10 @@ public class DevelopmentZoneController { udata.put("operateResult", model.getOperateResult()); } udata.put("createTime", new Date()); - //记录操作人员 + //璁板綍鎿嶄綔浜哄憳 udata.put("operator", user.getRealName()); developmentZoneService.updateDevelopmentZone(udata, model.getId()); - data.put("msg", "修改成功"); + data.put("msg", "淇敼鎴愬姛"); } return ret; @@ -273,15 +273,15 @@ public class DevelopmentZoneController { public void setBkoffUsersService(BkoffUsersService bkoffUsersService) { this.bkoffUsersService = bkoffUsersService; } - //将百度坐标转为高德坐标 + //灏嗙櫨搴﹀潗鏍囪浆涓洪珮寰峰潗鏍� public List> convertGeoList(List> bdLocationList) { List> gdLocationList = new ArrayList>(); - // 使用增强的 for 循环遍历列表 + // 浣跨敤澧炲己鐨� for 寰幆閬嶅巻鍒楄〃 for (List bdLocation : bdLocationList) { List gdLocation = new ArrayList(); - // 将百度坐标转为高德坐标 + // 灏嗙櫨搴﹀潗鏍囪浆涓洪珮寰峰潗鏍� Map map = GeoUtils.bd09ToGcj02(bdLocation.get(0), bdLocation.get(1)); gdLocation.add(map.get(LAT)); gdLocation.add(map.get(LNG)); @@ -298,11 +298,11 @@ public class DevelopmentZoneController { .field("file", file) .field("token", "F54F52381C49BB9EB4A33EB1B65604AE4B71A28AEE53518A94A2F360408B9056D57553931D15CE6DDE765562DAD286BA38E05A4CDAFC51C3D527A4959BF8E75A3B95DB7108FCEA340DDE61925616DB55118E1851E67D83EAD800460D100D6B667A4ED8EE67C8F7FB") .asString(); - // 获取返回的链接 + // 鑾峰彇杩斿洖鐨勯摼鎺� JSONObject jsonResponse = new JSONObject(response.getBody()); String link = jsonResponse.getJSONObject("result").getString("link"); data.put("imgUrl", link); - data.put("msg", "图片上传成功"); + data.put("msg", "鍥剧墖涓婁紶鎴愬姛"); ret.setJsonModel(data); return ret; } diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DictionaryController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DictionaryController.java index 2a1bd4092..100c98163 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DictionaryController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DictionaryController.java @@ -40,7 +40,7 @@ public class DictionaryController { public Object saveAction(DictionaryModel model) { if (StringUtils.isBlank(model.getDictionaryBo().getName()) || StringUtils.isBlank(model.getDictionaryBo().getCat())) { - model.flash().setAttribute("message", "信息输入不完整"); + model.flash().setAttribute("message", "淇℃伅杈撳叆涓嶅畬鏁�"); return model.redirect("/dictionary/create"); } @@ -49,7 +49,7 @@ public class DictionaryController { queryBean.setName(model.getDictionaryBo().getName()); List boList = dictionaryService.findByQueryBean(queryBean); if (boList != null && boList.size() > 0) { - model.flash().setAttribute("message", "该类型的词已经存在"); + model.flash().setAttribute("message", "璇ョ被鍨嬬殑璇嶅凡缁忓瓨鍦�"); return model.redirect("/dictionary/create"); } @@ -60,10 +60,10 @@ public class DictionaryController { dictionary.setCDate(new Date()); dictionaryService.save(dictionary); if (StringUtils.isNotBlank(dictionary.getId())) { - model.flash().setAttribute("message", "ID: " + dictionary.getId() + " 保存成功"); + model.flash().setAttribute("message", "ID: " + dictionary.getId() + " 淇濆瓨鎴愬姛"); return model.redirect("/dictionary/show?id=" + dictionary.getId()); } else { - model.flash().setAttribute("message", "Dictionary 保存失败"); + model.flash().setAttribute("message", "Dictionary 淇濆瓨澶辫触"); return model.redirect("/dictionary/create"); } } @@ -71,7 +71,7 @@ public class DictionaryController { public Object showAction(DictionaryModel model) { Dictionary dictionary = dictionaryService.findById(model.getId()); if (null == dictionary) { - model.flash().setAttribute("message", "ID: " + model.getId() + " 没找到结果"); + model.flash().setAttribute("message", "ID: " + model.getId() + " 娌℃壘鍒扮粨鏋�"); return model.redirect("/dictionary/list"); } else { DictionaryBo bo = new DictionaryBo(dictionary); @@ -89,7 +89,7 @@ public class DictionaryController { // Dictionary dictionary = dictionaryService.findById(model.getId()); // if (null == dictionary) { // model.flash().setAttribute("message", "ID: " + model.getId() + - // " 没找到结果"); + // " 娌℃壘鍒扮粨鏋�"); // return model.redirect("/dictionary/list"); // } else { // model.setDictionaryBo(new DictionaryBo(dictionary)); @@ -107,17 +107,17 @@ public class DictionaryController { // BeanUtils.copyProperties(model.getDictionaryBo(), dictionary); // dictionaryService.update(dictionary); // model.flash().setAttribute("message", "ID: " + - // model.getDictionaryBo().getId() + " 更新成功"); + // model.getDictionaryBo().getId() + " 鏇存柊鎴愬姛"); // return model.redirect("/dictionary/show?id=" + // model.getDictionaryBo().getId()); // } catch (Exception e) { // model.flash().setAttribute("message", "ID: " + - // model.getDictionaryBo().getId() + " 更新失败"); + // model.getDictionaryBo().getId() + " 鏇存柊澶辫触"); // return model.redirect("/dictionary/edit"); // } // } else { // model.flash().setAttribute("message", "ID: " + - // model.getDictionaryBo().getId() + " 没找到结果"); + // model.getDictionaryBo().getId() + " 娌℃壘鍒扮粨鏋�"); // return model.redirect("/dictionary/list"); // } @@ -127,10 +127,10 @@ public class DictionaryController { public Object deleteAction(DictionaryModel model) { if (StringUtils.isNotBlank(model.getId())) { dictionaryService.deleteById(model.getId()); - model.flash().setAttribute("message", "ID: " + model.getId() + " 删除成功"); + model.flash().setAttribute("message", "ID: " + model.getId() + " 鍒犻櫎鎴愬姛"); return model.redirect("/dictionary/list"); } else { - model.flash().setAttribute("message", "ID: " + model.getId() + " 删除失败"); + model.flash().setAttribute("message", "ID: " + model.getId() + " 鍒犻櫎澶辫触"); return model.redirect("/dictionary/list"); } diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DikuaiController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DikuaiController.java index 9a1999a6d..022f09d9a 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DikuaiController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DikuaiController.java @@ -21,7 +21,7 @@ import com.fangjia.service.bkoff.DikuaiService; import com.fangjia.service.mongo.fangjia.RegionBlockService; /** - * 地块控制器 + * 鍦板潡鎺у埗鍣� * * @author yinjihuan * @@ -38,7 +38,7 @@ public class DikuaiController { } /** - * 列表查询页 + * 鍒楄〃鏌ヨ椤� * * @param model * @return @@ -60,7 +60,7 @@ public class DikuaiController { } /** - * 删除数据 + * 鍒犻櫎鏁版嵁 * * @param model * @return @@ -72,7 +72,7 @@ public class DikuaiController { } /** - * 进入编辑页面 + * 杩涘叆缂栬緫椤甸潰 * * @param model * @return @@ -116,7 +116,7 @@ public class DikuaiController { } /** - * 保存和修改 + * 淇濆瓨鍜屼慨鏀� * @param diKuai * @return */ @@ -131,7 +131,7 @@ public class DikuaiController { } else { diKuai.setId(null); diKuai.setCreateDate(new Date()); - diKuai.setFrom("人工"); + diKuai.setFrom("浜哄伐"); dikuaiService.save(diKuai); } return new JsonModel(); diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/District2Controller.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/District2Controller.java index ff1ff0425..dfd660e71 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/District2Controller.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/District2Controller.java @@ -71,7 +71,7 @@ public class District2Controller { private OfficeStatService officeStatService; private RentStatDao rentStatDao; /** - * 查询列表,默认空 + * 鏌ヨ鍒楄〃锛岄粯璁ょ┖ */ public Object listAction(DistrictModel model) { Pager pager = model.getPager(20); @@ -85,7 +85,7 @@ public class District2Controller { List params = new ArrayList(); params.add(new QueryParam("category", "shop")); - if (StringUtils.isNotBlank(model.getCityDisplay())&&!"全国".equals(model.getCityDisplay())) { + if (StringUtils.isNotBlank(model.getCityDisplay())&&!"鍏ㄥ浗".equals(model.getCityDisplay())) { params.add(new QueryParam("city", model.getCityDisplay())); } @@ -249,7 +249,7 @@ public class District2Controller { List queryparams = new ArrayList(); List params = new ArrayList(); params.add(new QueryParam("category", "office")); - if (StringUtils.isNotBlank(model.getCityDisplay())&&!"全国".equals(model.getCityDisplay())) { + if (StringUtils.isNotBlank(model.getCityDisplay())&&!"鍏ㄥ浗".equals(model.getCityDisplay())) { params.add(new QueryParam("city", model.getCityDisplay())); } @@ -369,14 +369,14 @@ public class District2Controller { Date weekend=DateUtil.getFirstDayOfWeek(new Date()); DistrictStatBo bo=new DistrictStatBo(); if(district.getCategory().equals("shop")){ - type = "商铺"; + type = "鍟嗛摵"; bo =shopStatService.findAllShopStat(new DistrictKey(district.getCity(), district.getRegion(), district.getName()), weekend); ShopStat stat = bo.getShopStat(); if(null != stat){ map.put("avg_price", stat.getAvgPrice()); } }else if(district.getCategory().equals("office")){ - type = "写字楼"; + type = "鍐欏瓧妤�"; bo = officeStatService.findOfficeStat(new DistrictKey(district.getCity(), district.getRegion(), district.getName()), weekend); OfficeStat stat = bo.getOfficeStat(); if(null != stat){ @@ -411,7 +411,7 @@ public class District2Controller { } /** - * 进入新增页 + * 杩涘叆鏂板椤� */ public Object addAction(DistrictModel model) { if (StringUtils.isNotBlank(model.getCityDisplay())) { @@ -423,7 +423,7 @@ public class District2Controller { } /** - * 进入新增页 + * 杩涘叆鏂板椤� */ public Object addOfficeAction(DistrictModel model) { if (StringUtils.isNotBlank(model.getCityDisplay())) { @@ -435,7 +435,7 @@ public class District2Controller { } /** - * 保存新增小区 + * 淇濆瓨鏂板灏忓尯 */ public Object doAddOfficeAction(DistrictModel model) throws UnsupportedEncodingException { District district = model.getDistrict(); @@ -497,7 +497,7 @@ public class District2Controller { return model; } /** - * 保存新增小区 + * 淇濆瓨鏂板灏忓尯 */ public Object doAddAction(DistrictModel model) throws UnsupportedEncodingException { District district = model.getDistrict(); @@ -583,7 +583,7 @@ public class District2Controller { } /** - * 进入小区编辑页 + * 杩涘叆灏忓尯缂栬緫椤� */ public Object editAction(DistrictModel model) throws UnsupportedEncodingException { if (StringUtils.isBlank(model.getId()) || !ObjectId.isValid(model.getId())) { @@ -633,7 +633,7 @@ public class District2Controller { /** - * 进入写字楼编辑页 + * 杩涘叆鍐欏瓧妤肩紪杈戦〉 */ public Object editOfficeAction(DistrictModel model) throws UnsupportedEncodingException { if (StringUtils.isBlank(model.getId()) || !ObjectId.isValid(model.getId())) { @@ -664,7 +664,7 @@ public class District2Controller { return model; } /** - * 保存小区修改 + * 淇濆瓨灏忓尯淇敼 */ public Object saveAction(DistrictModel model) throws UnsupportedEncodingException { District district = model.getDistrict(); @@ -837,7 +837,7 @@ public class District2Controller { data.put("realUsePercent", district.getRealUsePercent()); } districtService.updateById(data, district.getId()); - msg="保存成功!"; + msg="淇濆瓨鎴愬姛!"; } model.setViewType("redirect"); @@ -850,7 +850,7 @@ public class District2Controller { } /** - * 删除小区(status置1) + * 鍒犻櫎灏忓尯锛坰tatus缃�1锛� */ public Object deleteAction(DistrictModel model) throws UnsupportedEncodingException { if (StringUtils.isNotBlank(model.getId()) && ObjectId.isValid(model.getId())) { @@ -880,7 +880,7 @@ public class District2Controller { } /** - * 删除小区ajax(status置1) + * 鍒犻櫎灏忓尯ajax锛坰tatus缃�1锛� */ public Object deleteajaxAction(DistrictModel model) throws UnsupportedEncodingException { JsonModel ret = new JsonModel(); @@ -896,7 +896,7 @@ public class District2Controller { } /** - * 恢复小区(status置0) + * 鎭㈠灏忓尯锛坰tatus缃�0锛� */ public Object restoreAction(DistrictModel model) throws UnsupportedEncodingException { if (StringUtils.isNotBlank(model.getId()) && ObjectId.isValid(model.getId())) { @@ -917,7 +917,7 @@ public class District2Controller { } /** - * 进入图片编辑页 + * 杩涘叆鍥剧墖缂栬緫椤� */ public Object editPicAction(DistrictModel model) throws UnsupportedEncodingException { model.setViewParam("path", "/district2/editPic"); @@ -1482,7 +1482,7 @@ public class District2Controller { district.setAddress(model.getAddress()); Map markMap = district.getMarkMap(); if(markMap == null || !markMap.containsKey("baiDuCoordLock") || !new Integer(1).equals(markMap.get("baiDuCoordLock"))){ - //地址改变更改相应的百度经纬度及mapabc经纬度 + //鍦板潃鏀瑰彉鏇存敼鐩稿簲鐨勭櫨搴︾粡绾害鍙妋apabc缁忕含搴� double lng2 = 0; double lat2 = 0; Map infomap = AddressParser.getLngLatByAddress(district.getCity(), model.getAddress()); @@ -1527,7 +1527,7 @@ public class District2Controller { } /** - * 进入编辑边框页面 + * 杩涘叆缂栬緫杈规椤甸潰 * @param model * @return */ @@ -1548,7 +1548,7 @@ public class District2Controller { } /** - * 设置写字楼百度边框 + * 璁剧疆鍐欏瓧妤肩櫨搴﹁竟妗� * @param model * @return */ @@ -1556,7 +1556,7 @@ public class District2Controller { DistrictJsonModel json = new DistrictJsonModel(); if (StringUtils.isBlank(model.getId()) || StringUtils.isBlank(model.getBaiduBorder())) { json.setSuccess(false); - json.setMsg("参数不能为空"); + json.setMsg("鍙傛暟涓嶈兘涓虹┖"); return json; } Map data = new HashMap(); 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 a9c2fb20d..fb1acf8af 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 @@ -90,9 +90,9 @@ public class DistrictController { private AverageStatisticsService averageStatisticsService; - private static List distTypes = Arrays.asList("多层", "小高层", "超高层", "高层", "花园洋房", "老洋房", "四合院"); - private static List villaTypes = Arrays.asList("独栋", "双拼", "联排", "叠加"); - private static List shopTypes = Arrays.asList("多层", "小高层", "超高层", "高层", "独栋", "双拼", "联排", "叠加"); + private static List distTypes = Arrays.asList("澶氬眰", "灏忛珮灞�", "瓒呴珮灞�", "楂樺眰", "鑺卞洯娲嬫埧", "鑰佹磱鎴�", "鍥涘悎闄�"); + private static List villaTypes = Arrays.asList("鐙爧", "鍙屾嫾", "鑱旀帓", "鍙犲姞"); + private static List shopTypes = Arrays.asList("澶氬眰", "灏忛珮灞�", "瓒呴珮灞�", "楂樺眰", "鐙爧", "鍙屾嫾", "鑱旀帓", "鍙犲姞"); private static Map CITY_CODE_MAP = new HashMap(); public static int statusFlag = 0; @@ -104,26 +104,26 @@ public class DistrictController { private final static Logger LOGGER = LoggerFactory.getLogger(DistrictController.class); static { - CITY_CODE_MAP.put("大兴安岭", "大兴安岭地区"); - CITY_CODE_MAP.put("塔城", "塔城地区"); - CITY_CODE_MAP.put("山南", "山南地区"); - CITY_CODE_MAP.put("日喀则", "日喀则地区"); - CITY_CODE_MAP.put("毕节", "毕节地区"); - CITY_CODE_MAP.put("海东", "海东地区"); - CITY_CODE_MAP.put("海北", "海北藏族自治州"); - CITY_CODE_MAP.put("海南", "海南藏族自治州"); - CITY_CODE_MAP.put("铜仁", "铜仁地区"); - CITY_CODE_MAP.put("阿里", "阿里地区"); - CITY_CODE_MAP.put("昌都", "昌都地区"); - CITY_CODE_MAP.put("林芝", "林芝地区"); - CITY_CODE_MAP.put("那曲", "那曲地区"); - CITY_CODE_MAP.put("阿勒泰", "阿勒泰地区"); - CITY_CODE_MAP.put("巴音郭楞", "巴音郭楞蒙古自治州"); - CITY_CODE_MAP.put("哈密", "哈密地区"); - CITY_CODE_MAP.put("和田", "和田地区"); - CITY_CODE_MAP.put("喀什", "喀什地区"); - CITY_CODE_MAP.put("吐鲁番", "吐鲁番地区"); - CITY_CODE_MAP.put("双鸭山", "双鸭山市"); + CITY_CODE_MAP.put("澶у叴瀹夊箔", "澶у叴瀹夊箔鍦板尯"); + CITY_CODE_MAP.put("濉斿煄", "濉斿煄鍦板尯"); + CITY_CODE_MAP.put("灞卞崡", "灞卞崡鍦板尯"); + CITY_CODE_MAP.put("鏃ュ杸鍒�", "鏃ュ杸鍒欏湴鍖�"); + CITY_CODE_MAP.put("姣曡妭", "姣曡妭鍦板尯"); + CITY_CODE_MAP.put("娴蜂笢", "娴蜂笢鍦板尯"); + CITY_CODE_MAP.put("娴峰寳", "娴峰寳钘忔棌鑷不宸�"); + CITY_CODE_MAP.put("娴峰崡", "娴峰崡钘忔棌鑷不宸�"); + CITY_CODE_MAP.put("閾滀粊", "閾滀粊鍦板尯"); + CITY_CODE_MAP.put("闃块噷", "闃块噷鍦板尯"); + CITY_CODE_MAP.put("鏄岄兘", "鏄岄兘鍦板尯"); + CITY_CODE_MAP.put("鏋楄姖", "鏋楄姖鍦板尯"); + CITY_CODE_MAP.put("閭f洸", "閭f洸鍦板尯"); + CITY_CODE_MAP.put("闃垮嫆娉�", "闃垮嫆娉板湴鍖�"); + CITY_CODE_MAP.put("宸撮煶閮", "宸撮煶閮钂欏彜鑷不宸�"); + CITY_CODE_MAP.put("鍝堝瘑", "鍝堝瘑鍦板尯"); + CITY_CODE_MAP.put("鍜岀敯", "鍜岀敯鍦板尯"); + CITY_CODE_MAP.put("鍠�浠�", "鍠�浠�鍦板尯"); + CITY_CODE_MAP.put("鍚愰瞾鐣�", "鍚愰瞾鐣湴鍖�"); + CITY_CODE_MAP.put("鍙岄腑灞�", "鍙岄腑灞卞競"); try { SEAWEED = new DataStore("seaweed.db.fangjia.com", 27007).getCollection("fangjia.seaweed"); @@ -171,7 +171,7 @@ public class DistrictController { } /** - * 查询列表,默认空 + * 鏌ヨ鍒楄〃锛岄粯璁ょ┖ */ public Object listAction(DistrictModel model) { if (StringUtils.isBlank(model.getColumnIds()) || model.getColumnIds().equals("null")) { @@ -185,7 +185,7 @@ public class DistrictController { List params = new ArrayList(); List queryparams = new ArrayList(); - if (StringUtils.isNotBlank(model.getCityDisplay()) && !"全国".equals(model.getCityDisplay())) { + if (StringUtils.isNotBlank(model.getCityDisplay()) && !"鍏ㄥ浗".equals(model.getCityDisplay())) { params.add(new QueryParam("city", model.getCityDisplay())); } params.add(new QueryParam("category", "district")); @@ -327,7 +327,7 @@ public class DistrictController { int districtValidCount = (int) districtService.findDistrictCount(0, params); int districtInvalidCount = (int) districtService.findDistrictCount(1, params); - // 分期数据量 + // 鍒嗘湡鏁版嵁閲� List fenQiParams = new ArrayList(); for (QueryParam pa : params) { fenQiParams.add(pa); @@ -372,7 +372,7 @@ public class DistrictController { districts.add(districtService.findById(dist.getSid())); } } else if (model.getValid() != null && model.getValid() == 3) { - // 分期数据处理 + // 鍒嗘湡鏁版嵁澶勭悊 params.add(new QueryParam("visible", 0)); params.add(new QueryParam("masterDistrictName", "master")); districts = districtService.findDistrictList(pager, params, sortParams); @@ -431,11 +431,11 @@ public class DistrictController { List result = null; if (tempBuildTypes != null && tempBuildTypes.size() > 0) { if (StringUtils.isNotBlank(district.getEstateType2())) { - if (district.getEstateType2().equals("普通住宅")) { + if (district.getEstateType2().equals("鏅�氫綇瀹�")) { result = changeValue(tempBuildTypes, distTypes); - } else if (district.getEstateType2().equals("别墅")) { + } else if (district.getEstateType2().equals("鍒")) { result = changeValue(tempBuildTypes, villaTypes); - } else if (district.getEstateType2().equals("商住")) { + } else if (district.getEstateType2().equals("鍟嗕綇")) { result = changeValue(tempBuildTypes, shopTypes); } } else { @@ -543,7 +543,7 @@ public class DistrictController { List baiduSearch(String city, String name, String cat) { List dbObjects = new ArrayList(); - name = name.toString().replace("小区", "").replace("住宅", ""); + name = name.toString().replace("灏忓尯", "").replace("浣忓畢", ""); JSONObject resp = BaiDuApiUtils.search(city, name, null, 2, 10, 0); boolean hasSameNameDistrict = false; if (resp != null && resp.getInt("status") == 0 && resp.containsKey("results")) { @@ -584,7 +584,7 @@ public class DistrictController { dbo.append("tag", detailInfo.get("tag")); dbo.append("detailUrl", detailInfo.get("detail_url")); } - String itemName = dbo.getString("name").replace(".", "").replace("·", ""); + String itemName = dbo.getString("name").replace(".", "").replace("路", ""); if (!hasSameNameDistrict || name.equals(itemName)) { dbObjects.add(dbo); } @@ -597,7 +597,7 @@ public class DistrictController { } /** - * 查询列表,默认空 + * 鏌ヨ鍒楄〃锛岄粯璁ょ┖ */ public Object listForRemoveAction(DistrictModel model) { @@ -645,8 +645,8 @@ public class DistrictController { String region = dis.getRegion(); String name = dis.getName(); if (StringUtils.isNotBlank(name)) { - if (name.indexOf("期") != -1) { - int temp = name.indexOf("期"); + if (name.indexOf("鏈�") != -1) { + int temp = name.indexOf("鏈�"); if (temp > 2) { String districtName = ""; districtName = name.substring(0, temp - 1); @@ -712,13 +712,13 @@ public class DistrictController { objname = arrs[2]; } Map agingMap = new HashMap(); - if (objname.indexOf("期") != -1) { - int temp = objname.indexOf('期'); + if (objname.indexOf("鏈�") != -1) { + int temp = objname.indexOf('鏈�'); if (temp > 2) { String districtName = ""; districtName = objname.substring(0, temp - 1); - String[] agArray = { "", "一期", "二期", "三期", "四期", "五期", "六期", "七期" }; + String[] agArray = { "", "涓�鏈�", "浜屾湡", "涓夋湡", "鍥涙湡", "浜旀湡", "鍏湡", "涓冩湡" }; String[] fieldArr = { "loopLineInfo", "block", "businessQuarter", "estateCompany", "developer", "facilities", "relateInfo", "estateCharge", "streetCommunity", "cubagePercent", "virescencePercent", "houseProperty", "floorInfo", "traffic", "fitmentMaterials", "outPics", @@ -742,12 +742,12 @@ public class DistrictController { } if (StringUtils.isBlank(estateType2)) { if (null != districtValue.getEstateType2() - && "商住".equals(districtValue.getEstateType2())) { + && "鍟嗕綇".equals(districtValue.getEstateType2())) { estateType2 = districtValue.getEstateType2(); - agingMap.put("propertyLife", "50年"); + agingMap.put("propertyLife", "50骞�"); } else { estateType2 = districtValue.getEstateType2(); - agingMap.put("propertyLife", "70年"); + agingMap.put("propertyLife", "70骞�"); } } @@ -832,7 +832,7 @@ public class DistrictController { } /** - * 进入图片编辑页 + * 杩涘叆鍥剧墖缂栬緫椤� */ public Object editPicAction(DistrictModel model) throws UnsupportedEncodingException { model.setViewParam("path", "/district/editPic"); @@ -840,7 +840,7 @@ public class DistrictController { } /** - * 保存图片修改 + * 淇濆瓨鍥剧墖淇敼 */ public Object savePicAction(DistrictModel model) throws UnsupportedEncodingException { model.setViewType("redirect"); @@ -902,11 +902,11 @@ public class DistrictController { } /** - * 处理图片(从FS删除图片,保存新图片到FS,更新小区图片url列表) + * 澶勭悊鍥剧墖锛堜粠FS鍒犻櫎鍥剧墖锛屼繚瀛樻柊鍥剧墖鍒癋S锛屾洿鏂板皬鍖哄浘鐗噓rl鍒楄〃锛� */ @SuppressWarnings({ "rawtypes", "unchecked" }) private void processPics(District district, DistrictModel model) { - // 删除图片 + // 鍒犻櫎鍥剧墖 fileService.delPics(model.getDelPics(), FileServiceImpl.SIZE_ORIGINAL); // List floorplanPics = new ArrayList(); @@ -1003,7 +1003,7 @@ public class DistrictController { @SuppressWarnings({ "rawtypes", "unchecked" }) private void processFjtPics(FjtEvaluation fjtEvaluation, DistrictModel model) { - // 删除图片 + // 鍒犻櫎鍥剧墖 fileService.delPics(model.getDelPics(), FileServiceImpl.SIZE_ORIGINAL); List delPics = model.getDelPics(); @@ -1085,7 +1085,7 @@ public class DistrictController { } /** - * 保存图片到FS + * 淇濆瓨鍥剧墖鍒癋S */ private List savePics(String districtId, List pics) { List ret = new ArrayList(pics.size()); @@ -1116,7 +1116,7 @@ public class DistrictController { } /** - * 验证图片文件类型,目前支持gif、jpg + * 楠岃瘉鍥剧墖鏂囦欢绫诲瀷锛岀洰鍓嶆敮鎸乬if銆乯pg * * @param pic * @return @@ -1154,7 +1154,7 @@ public class DistrictController { } /** - * 进入新增页 + * 杩涘叆鏂板椤� */ public Object addAction(DistrictModel model) { District district = new District(); @@ -1164,7 +1164,7 @@ public class DistrictController { district.setId(null); model.setUrlFrom("copy"); } else { - district.setEstateType2("普通住宅"); + district.setEstateType2("鏅�氫綇瀹�"); } model.setDistrict(district); if (StringUtils.isNotBlank(model.getCityDisplay())) { @@ -1202,7 +1202,7 @@ public class DistrictController { 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) { @@ -1234,14 +1234,14 @@ public class DistrictController { } /** - * 保存新增小区 + * 淇濆瓨鏂板灏忓尯 */ public Object doAddAction(DistrictModel model) throws UnsupportedEncodingException { District district = model.getDistrict(); List districts = districtService.findByKey(district.getCity(), district.getRegion(), district.getName(), "district"); if (!districts.isEmpty() && districts.get(0).getName().equals(district.getName())) { - model.setMsg("小区名已存在!"); + model.setMsg("灏忓尯鍚嶅凡瀛樺湪锛�"); return model; } if (StringUtils.isNotBlank(district.getName())) { @@ -1362,7 +1362,7 @@ public class DistrictController { } else { JsonModel ret = new JsonModel(); Map data = new HashMap(); - data.put("success", "保存成功!"); + data.put("success", "淇濆瓨鎴愬姛锛�"); ret.setJsonModel(data); return ret; } @@ -1372,7 +1372,7 @@ public class DistrictController { } /** - * 获取城市下的区域、板块信息(ajax用) + * 鑾峰彇鍩庡競涓嬬殑鍖哄煙銆佹澘鍧椾俊鎭紙ajax鐢級 */ public Object getRegionsAction(DistrictModel model) { model.setViewType("json"); @@ -1399,7 +1399,7 @@ public class DistrictController { } /** - * 获取区域下版块信息(ajax用) + * 鑾峰彇鍖哄煙涓嬬増鍧椾俊鎭紙ajax鐢級 */ public Object getBlocksAction(DistrictModel model) { model.setViewType("json"); @@ -1478,7 +1478,7 @@ public class DistrictController { } /** - * 进入小区编辑页 + * 杩涘叆灏忓尯缂栬緫椤� */ public Object editAction(DistrictModel model) throws UnsupportedEncodingException { if (StringUtils.isBlank(model.getId()) || !ObjectId.isValid(model.getId())) { @@ -1500,7 +1500,7 @@ public class DistrictController { districtService.save(district); } - // modify by shibb 2015-6-9,注释掉过滤器,以便数据部查看我们数据库有但是被过滤器过滤掉的数据 + // modify by shibb 2015-6-9,娉ㄩ噴鎺夎繃婊ゅ櫒锛屼互渚挎暟鎹儴鏌ョ湅鎴戜滑鏁版嵁搴撴湁浣嗘槸琚繃婊ゅ櫒杩囨护鎺夌殑鏁版嵁 // fieldFilterService.filter(district); if (null != district && "new_district".equals(district.getCategory())) { district = districtService.findNewDistrict(district.getDistrictKey()); @@ -1527,7 +1527,7 @@ public class DistrictController { } /** - * 进入小区周边配套页 + * 杩涘叆灏忓尯鍛ㄨ竟閰嶅椤� */ public Object editNearbyAction(DistrictModel model) throws UnsupportedEncodingException { if (StringUtils.isBlank(model.getId()) || !ObjectId.isValid(model.getId())) { @@ -1546,32 +1546,32 @@ public class DistrictController { Set keyStr = nearByMap.keySet(); Iterator it = keyStr.iterator(); - String[] keywords = { "酒店", "餐馆", "医院", "超市", "银行", "公交车站", "电影院", "加油站" }; + String[] keywords = { "閰掑簵", "椁愰", "鍖婚櫌", "瓒呭競", "閾惰", "鍏氦杞︾珯", "鐢靛奖闄�", "鍔犳补绔�" }; while (it.hasNext()) { String key = it.next().toString(); List nearbyList = new ArrayList(); - if (key.equals("酒店")) { + if (key.equals("閰掑簵")) { nearbyList = nearByMap.get(key); model.setHotelList(nearbyList); - } else if (key.equals("餐馆")) { + } else if (key.equals("椁愰")) { nearbyList = nearByMap.get(key); model.setEstaurantList(nearbyList); - } else if (key.equals("医院")) { + } else if (key.equals("鍖婚櫌")) { nearbyList = nearByMap.get(key); model.setHospitalList(nearbyList); - } else if (key.equals("超市")) { + } else if (key.equals("瓒呭競")) { nearbyList = nearByMap.get(key); model.setMarketList(nearbyList); - } else if (key.equals("银行")) { + } else if (key.equals("閾惰")) { nearbyList = nearByMap.get(key); model.setBankList(nearbyList); - } else if (key.equals("公交车站")) { + } else if (key.equals("鍏氦杞︾珯")) { nearbyList = nearByMap.get(key); model.setBusList(nearbyList); - } else if ("电影院".equals(key)) { + } else if ("鐢靛奖闄�".equals(key)) { nearbyList = nearByMap.get(key); model.setFilmList(nearbyList); - } else if ("加油站".equals(key)) { + } else if ("鍔犳补绔�".equals(key)) { nearbyList = nearByMap.get(key); model.setOilList(nearbyList); } @@ -1590,7 +1590,7 @@ public class DistrictController { } /** - * 进入小区周边配套详情页 + * 杩涘叆灏忓尯鍛ㄨ竟閰嶅璇︽儏椤� */ public Object editNearbyNameAction(DistrictModel model) throws UnsupportedEncodingException { if (StringUtils.isBlank(model.getId()) || !ObjectId.isValid(model.getId())) { @@ -1792,7 +1792,7 @@ public class DistrictController { } /** - * 进入小区周边配套页 + * 杩涘叆灏忓尯鍛ㄨ竟閰嶅椤� */ public Object districtNearbyAction(DistrictModel model) throws UnsupportedEncodingException { if (StringUtils.isBlank(model.getId()) || !ObjectId.isValid(model.getId())) { @@ -1812,35 +1812,35 @@ public class DistrictController { Set keyStr = nearByMap.keySet(); Iterator it = keyStr.iterator(); - String[] keywords = { "酒店", "餐馆", "医院", "学校", "超市", "银行", "公交车站", "电影院", "加油站" }; + String[] keywords = { "閰掑簵", "椁愰", "鍖婚櫌", "瀛︽牎", "瓒呭競", "閾惰", "鍏氦杞︾珯", "鐢靛奖闄�", "鍔犳补绔�" }; while (it.hasNext()) { String key = it.next().toString(); List nearbyList = new ArrayList(); - if (key.equals("酒店")) { + if (key.equals("閰掑簵")) { nearbyList = nearByMap.get(key); model.setHotelList(nearbyList); - } else if (key.equals("餐馆")) { + } else if (key.equals("椁愰")) { nearbyList = nearByMap.get(key); model.setEstaurantList(nearbyList); - } else if (key.equals("医院")) { + } else if (key.equals("鍖婚櫌")) { nearbyList = nearByMap.get(key); model.setHospitalList(nearbyList); - } else if (key.equals("超市")) { + } else if (key.equals("瓒呭競")) { nearbyList = nearByMap.get(key); model.setMarketList(nearbyList); - } else if (key.equals("银行")) { + } else if (key.equals("閾惰")) { nearbyList = nearByMap.get(key); model.setBankList(nearbyList); - } else if (key.equals("公交车站")) { + } else if (key.equals("鍏氦杞︾珯")) { nearbyList = nearByMap.get(key); model.setBusList(nearbyList); - } else if ("电影院".equals(key)) { + } else if ("鐢靛奖闄�".equals(key)) { nearbyList = nearByMap.get(key); model.setFilmList(nearbyList); - } else if ("加油站".equals(key)) { + } else if ("鍔犳补绔�".equals(key)) { nearbyList = nearByMap.get(key); model.setOilList(nearbyList); - } else if ("学校".equals(key)) { + } else if ("瀛︽牎".equals(key)) { nearbyList = nearByMap.get(key); model.setSchoolList(nearbyList); } @@ -1936,7 +1936,7 @@ public class DistrictController { Map markMap = district.getMarkMap(); if (markMap == null || !markMap.containsKey("baiDuCoordLock") || !new Integer(1).equals(markMap.get("baiDuCoordLock"))) { - // 地址改变更改相应的百度经纬度及mapabc经纬度 + // 鍦板潃鏀瑰彉鏇存敼鐩稿簲鐨勭櫨搴︾粡绾害鍙妋apabc缁忕含搴� double lng2 = 0; double lat2 = 0; Map infomap = AddressParser.getLngLatByAddress(district.getCity(), @@ -1995,7 +1995,7 @@ public class DistrictController { district = districtNearbyService.findById(model.getId()); if (StringUtils.isNotBlank(model.getAddress())) { district.setAddress(model.getAddress()); - // 地址改变更改相应的百度经纬度及mapabc经纬度 + // 鍦板潃鏀瑰彉鏇存敼鐩稿簲鐨勭櫨搴︾粡绾害鍙妋apabc缁忕含搴� double lng2 = 0.0; double lat2 = 0.0; Map infomap = AddressParser.getLngLatByAddress(district.getCity(), model.getAddress()); @@ -2027,7 +2027,7 @@ public class DistrictController { } /** - * 保存小区修改 + * 淇濆瓨灏忓尯淇敼 */ public Object saveAction(DistrictModel model) throws UnsupportedEncodingException { District district = model.getDistrict(); @@ -2045,7 +2045,7 @@ public class DistrictController { if (exist) { model.setViewType("redirect"); model.setViewParam("location", - "/district/edit?id=" + district.getId() + "&msg=" + URLEncoder.encode("小区名已存在", "UTF-8")); + "/district/edit?id=" + district.getId() + "&msg=" + URLEncoder.encode("灏忓尯鍚嶅凡瀛樺湪", "UTF-8")); return model; } @@ -2285,9 +2285,9 @@ public class DistrictController { data.put("markMap", markMap); data.put("modificationDate", new Date()); districtService.updateById(data, district.getId()); - //创建更新任务,用为更新常州农商行数据 + //鍒涘缓鏇存柊浠诲姟锛岀敤涓烘洿鏂板父宸炲啘鍟嗚鏁版嵁 createJnTask(district.getId(), null); - msg = "保存成功了!!!"; + msg = "淇濆瓨鎴愬姛浜嗭紒锛侊紒"; } model.setViewType("redirect"); @@ -2421,7 +2421,7 @@ public class DistrictController { } /** - * 删除小区(status置1) + * 鍒犻櫎灏忓尯锛坰tatus缃�1锛� */ public Object deleteAction(DistrictModel model) throws UnsupportedEncodingException { if (ObjectId.isValid(model.getId())) { @@ -2463,7 +2463,7 @@ public class DistrictController { } /** - * 删除小区ajax(status置1) + * 鍒犻櫎灏忓尯ajax锛坰tatus缃�1锛� */ public Object deleteajaxAction(DistrictModel model) throws UnsupportedEncodingException { JsonModel ret = new JsonModel(); @@ -2481,7 +2481,7 @@ public class DistrictController { } /** - * 恢复小区(status置0) + * 鎭㈠灏忓尯锛坰tatus缃�0锛� */ public Object restoreAction(DistrictModel model) throws UnsupportedEncodingException { if (ObjectId.isValid(model.getId())) { @@ -2502,7 +2502,7 @@ public class DistrictController { } /** - * 新盘转小区 + * 鏂扮洏杞皬鍖� */ public Object toDistrictAction(DistrictModel model) throws UnsupportedEncodingException { int count = 0; @@ -2519,7 +2519,7 @@ public class DistrictController { "/district/list?cityDisplay=" + URLEncoder.encode(StringUtils.trimToEmpty(model.getCityDisplay()), "UTF-8") + "&keyword=" + URLEncoder.encode(StringUtils.trimToEmpty(model.getKeyword()), "UTF-8") + "&cat=" - + model.getCat() + "&msg=" + URLEncoder.encode("已将" + count + "个新盘转成小区!!!", "UTF-8")); + + model.getCat() + "&msg=" + URLEncoder.encode("宸插皢" + count + "涓柊鐩樿浆鎴愬皬鍖猴紒锛侊紒", "UTF-8")); return model; } @@ -2668,7 +2668,7 @@ public class DistrictController { return jsonModel; } Map seaweedUpdate = new HashMap(); - if (fieldName.contains("lias")) {// 别名和地址别名需要转成List + if (fieldName.contains("lias")) {// 鍒悕鍜屽湴鍧�鍒悕闇�瑕佽浆鎴怢ist List v = new ArrayList(Arrays.asList(fieldValue.split("\n"))); Iterator it = v.iterator(); while (it.hasNext()) { @@ -2727,7 +2727,7 @@ public class DistrictController { String cityDisplay = model.getCityDisplay(); if (StringUtils.isEmpty(model.getKeyword())) { if (StringUtils.isEmpty(cityDisplay)) { - cityDisplay = "上海"; + cityDisplay = "涓婃捣"; } ServerArea cityDis = ServerAreaData.getServerAreaByDisplay(cityDisplay); model.setCityLat(cityDis.getLat()); @@ -2766,11 +2766,11 @@ public class DistrictController { String categoryStr = ""; if (cityDisplay != null && keyword != null) { - if (keyword.indexOf("写字") != -1 || keyword.indexOf("办公") != -1) { + if (keyword.indexOf("鍐欏瓧") != -1 || keyword.indexOf("鍔炲叕") != -1) { categoryStr = "office"; - } else if (keyword.indexOf("商铺") != -1) { + } else if (keyword.indexOf("鍟嗛摵") != -1) { categoryStr = "shop"; - } else if (keyword.indexOf("住宅") != -1) { + } else if (keyword.indexOf("浣忓畢") != -1) { categoryStr = "district"; } List baidulogList = baidulogService.findByBaidulog(cityDisplay, categoryStr); @@ -2822,7 +2822,7 @@ public class DistrictController { district.setEstateType2(model.getEstateType()); if (StringUtils.isNotBlank(model.getAddress())) { district.setAddress(model.getAddress()); - // 地址改变更改相应的百度经纬度及mapabc经纬度 + // 鍦板潃鏀瑰彉鏇存敼鐩稿簲鐨勭櫨搴︾粡绾害鍙妋apabc缁忕含搴� double lng2 = 0; double lat2 = 0; Map infomap = AddressParser.getLngLatByAddress(model.getCityDisplay(), model.getAddress()); @@ -2890,11 +2890,11 @@ public class DistrictController { List params = new ArrayList(); List queryparams = new ArrayList(); - if (StringUtils.isNotBlank(model.getCityDisplay()) && !"全国".equals(model.getCityDisplay())) { + if (StringUtils.isNotBlank(model.getCityDisplay()) && !"鍏ㄥ浗".equals(model.getCityDisplay())) { params.add(new QueryParam("city", model.getCityDisplay())); } - boolean isDistrict = false;// 标示查询的数据是不是小区 + boolean isDistrict = false;// 鏍囩ず鏌ヨ鐨勬暟鎹槸涓嶆槸灏忓尯 if (StringUtils.isNotBlank(model.getCat())) { params.add(new QueryParam("category", model.getCat())); if ("district".equals(model.getCategory())) { @@ -3133,14 +3133,14 @@ public class DistrictController { try { HttpServletResponse response = ActionContext.getContext().getResponse(); response.setCharacterEncoding("UTF-8"); - // response.reset();// 清空输出流 + // response.reset();// 娓呯┖杈撳嚭娴� response.setContentType("application/x-download;charset=UTF-8"); fileName = new String(fileName.getBytes("GBK"), "ISO-8859-1"); - if (fileName.length() > 150) {// 解决IE 6.0 bug + if (fileName.length() > 150) {// 瑙e喅IE 6.0 bug fileName = new String(fileName.getBytes("GBK"), "ISO-8859-1"); } response.setHeader("Content-Disposition", "attachment;filename=" + fileName); - os = response.getOutputStream();// 取得输出流 + os = response.getOutputStream();// 鍙栧緱杈撳嚭娴� wb.write(os); os.flush(); } catch (Exception e) { @@ -3164,16 +3164,16 @@ public class DistrictController { Map changedMarkupMap, Map avgPriceMap, Map creditMap, Map calcTypeMap, Map> otherAvgPrice) throws Exception { HSSFWorkbook wb = new HSSFWorkbook(); - // createSheet(wb, 0, "住宅"); + // createSheet(wb, 0, "浣忓畢"); HSSFSheet s = wb.createSheet(); if (StringUtils.isNotBlank(model.getCat())) { if (model.getCat().equals("shop")) { - wb.setSheetName(0, "商铺"); + wb.setSheetName(0, "鍟嗛摵"); } else if (model.getCat().equals("office")) { - wb.setSheetName(0, "写字楼"); + wb.setSheetName(0, "鍐欏瓧妤�"); } } else { - wb.setSheetName(0, "住宅"); + wb.setSheetName(0, "浣忓畢"); } List outFields = Arrays.asList(s3); @@ -3313,73 +3313,73 @@ public class DistrictController { public Map getFliedDisplay() { Map map = new HashMap() { { - put("sid", "编号"); - put("city", "城市"); - put("name", "名称"); - put("region", "区域"); - put("block", "板块"); - put("address", "地址"); - put("estateType2", "物业类型"); - put("streetCommunity", "街道社区"); - put("householdCount", "户数"); - put("openDate", "开盘时间"); - put("licence", "预售证"); - put("latLng", "mapabc经纬度"); - put("latLng2", "百度经纬度"); - put("allArea", "占地面积"); - put("buildArea", "建筑面积"); - put("buildType", "建筑类型"); - put("alias", "名称别名"); - put("addrAlias", "地址别名"); - put("developer", "开发商"); - put("estateCompany", "物业公司"); - put("cubagePercent", "容积率"); - put("virescencePercent", "绿化率"); - put("carSite", "停车位(描述)"); - put("estateCharge", "物业费"); - put("floorplanPics", "楼层平面图"); - put("outPics", "外景图"); - put("rentPrice", "租金"); - put("bedKind", "写字楼等级"); - put("houseFloor", "楼层"); - put("houseHeight", "楼高"); - put("leaseTerm", "租赁年限"); - put("paymentPattern", "付款方式"); - put("rentPrice", "出租价格"); - put("sellPrice", "出售价格"); - put("floor", "建筑楼层"); - put("floorInfo", "楼层状况"); - put("bayArea", "开间面积"); - put("finishBuildingDate", "竣工时间"); - put("liveDate", "开业时间"); - put("divisible", "是否可分割"); - put("unifiedManage", "是否统一管理"); - put("carSiteCount", "停车位"); - put("metroInfo", "地铁沿线"); - put("metroNames", "地铁站名"); - put("facilities", "配套设施"); - put("propertyInfo", "物业概况"); - put("traffic", "交通情况"); - put("surrounding", "周边情况"); - put("businessStatus", "经营业态"); - put("rentType", "租售类型"); - put("price", "价格"); - put("businessQuarter", "商圈"); - put("status", "状态"); - put("standardHeight", "标准层高"); - put("foreign", "是否涉外"); - put("register", "是否注册"); - put("realUsePercent", "实用率"); - put("liveDate", "交房时间"); - put("changedMarkup", "周变化"); - put("avgPrice", "均价"); - put("calcType", "计算方式"); - put("lat2", "百度纬度"); - put("lng2", "百度经度"); - put("lat", "高德纬度"); - put("lng", "高德经度"); - put("loopLineInfo", "环线位置"); - put("intelligenceLevel", "智能水平"); + put("sid", "缂栧彿"); + put("city", "鍩庡競"); + put("name", "鍚嶇О"); + put("region", "鍖哄煙"); + put("block", "鏉垮潡"); + put("address", "鍦板潃"); + put("estateType2", "鐗╀笟绫诲瀷"); + put("streetCommunity", "琛楅亾绀惧尯"); + put("householdCount", "鎴锋暟"); + put("openDate", "寮�鐩樻椂闂�"); + put("licence", "棰勫敭璇�"); + put("latLng", "mapabc缁忕含搴�"); + put("latLng2", "鐧惧害缁忕含搴�"); + put("allArea", "鍗犲湴闈㈢Н"); + put("buildArea", "寤虹瓚闈㈢Н"); + put("buildType", "寤虹瓚绫诲瀷"); + put("alias", "鍚嶇О鍒悕"); + put("addrAlias", "鍦板潃鍒悕"); + put("developer", "寮�鍙戝晢"); + put("estateCompany", "鐗╀笟鍏徃"); + put("cubagePercent", "瀹圭Н鐜�"); + put("virescencePercent", "缁垮寲鐜�"); + put("carSite", "鍋滆溅浣�(鎻忚堪)"); + put("estateCharge", "鐗╀笟璐�"); + put("floorplanPics", "妤煎眰骞抽潰鍥�"); + put("outPics", "澶栨櫙鍥�"); + put("rentPrice", "绉熼噾"); + put("bedKind", "鍐欏瓧妤肩瓑绾�"); + put("houseFloor", "妤煎眰"); + put("houseHeight", "妤奸珮"); + put("leaseTerm", "绉熻祦骞撮檺"); + put("paymentPattern", "浠樻鏂瑰紡"); + put("rentPrice", "鍑虹浠锋牸"); + put("sellPrice", "鍑哄敭浠锋牸"); + put("floor", "寤虹瓚妤煎眰"); + put("floorInfo", "妤煎眰鐘跺喌"); + put("bayArea", "寮�闂撮潰绉�"); + put("finishBuildingDate", "绔e伐鏃堕棿"); + put("liveDate", "寮�涓氭椂闂�"); + put("divisible", "鏄惁鍙垎鍓�"); + put("unifiedManage", "鏄惁缁熶竴绠$悊"); + put("carSiteCount", "鍋滆溅浣�"); + put("metroInfo", "鍦伴搧娌跨嚎"); + put("metroNames", "鍦伴搧绔欏悕"); + put("facilities", "閰嶅璁炬柦"); + put("propertyInfo", "鐗╀笟姒傚喌"); + put("traffic", "浜ら�氭儏鍐�"); + put("surrounding", "鍛ㄨ竟鎯呭喌"); + put("businessStatus", "缁忚惀涓氭��"); + put("rentType", "绉熷敭绫诲瀷"); + put("price", "浠锋牸"); + put("businessQuarter", "鍟嗗湀"); + put("status", "鐘舵��"); + put("standardHeight", "鏍囧噯灞傞珮"); + put("foreign", "鏄惁娑夊"); + put("register", "鏄惁娉ㄥ唽"); + put("realUsePercent", "瀹炵敤鐜�"); + put("liveDate", "浜ゆ埧鏃堕棿"); + put("changedMarkup", "鍛ㄥ彉鍖�"); + put("avgPrice", "鍧囦环"); + put("calcType", "璁$畻鏂瑰紡"); + put("lat2", "鐧惧害绾害"); + put("lng2", "鐧惧害缁忓害"); + put("lat", "楂樺痉绾害"); + put("lng", "楂樺痉缁忓害"); + put("loopLineInfo", "鐜嚎浣嶇疆"); + put("intelligenceLevel", "鏅鸿兘姘村钩"); } };// return map; @@ -3413,17 +3413,17 @@ public class DistrictController { Map data = new HashMap(); jsonModel.setJsonModel(data); if (StringUtils.isBlank(model.getCityDisplay())) { - data.put("msg", "城市不能为空"); + data.put("msg", "鍩庡競涓嶈兘涓虹┖"); return jsonModel; } if (StringUtils.isBlank(model.getDestRegion()) || StringUtils.isBlank(model.getOrgRegion())) { - data.put("msg", "原区域和目标区域不能为空"); + data.put("msg", "鍘熷尯鍩熷拰鐩爣鍖哄煙涓嶈兘涓虹┖"); return jsonModel; } String orgRegion = model.getOrgRegion(); String destRegion = model.getDestRegion(); if (orgRegion.equals(destRegion)) { - data.put("msg", "原区域和目标区域不能相同"); + data.put("msg", "鍘熷尯鍩熷拰鐩爣鍖哄煙涓嶈兘鐩稿悓"); return jsonModel; } List existsDistrict = new ArrayList(); @@ -3458,7 +3458,7 @@ public class DistrictController { districtUpdateTaskService.createTask(district.getId(), 1, null, null); } } - data.put("msg", "数据迁移完成:迁移小区" + count + "个,由于目标区域存在被删除小区" + deleteCount + "个"); + data.put("msg", "鏁版嵁杩佺Щ瀹屾垚:杩佺Щ灏忓尯" + count + "涓�,鐢变簬鐩爣鍖哄煙瀛樺湪琚垹闄ゅ皬鍖�" + deleteCount + "涓�"); data.put("success", true); return jsonModel; } @@ -3472,7 +3472,7 @@ public class DistrictController { } /** - * 根据小区ID查询小区信息 + * 鏍规嵁灏忓尯ID鏌ヨ灏忓尯淇℃伅 * * @param model * @return @@ -3491,7 +3491,7 @@ public class DistrictController { } /** - * 添加小区分期数据 + * 娣诲姞灏忓尯鍒嗘湡鏁版嵁 * * @param model * @return @@ -3504,7 +3504,7 @@ public class DistrictController { String[] stages = str.split("##"); District masterDistrict = null; Set cityRegions = new TreeSet(); - // 检测这个小区是否已经是主小区 + // 妫�娴嬭繖涓皬鍖烘槸鍚﹀凡缁忔槸涓诲皬鍖� for (String stage : stages) { String[] stas = stage.split("__"); String id = stas[0]; @@ -3516,14 +3516,14 @@ public class DistrictController { if (dis != null && dis.getMasterDistrictName() != null && dis.getMasterDistrictName().equals("master")) { json.setSuccess(false); - json.setMsg(dis.getName() + "已经是主小区了"); + json.setMsg(dis.getName() + "宸茬粡鏄富灏忓尯浜�"); return json; } cityRegions.add(dis.getCity() + dis.getRegion()); } if (cityRegions.size() > 1) { json.setSuccess(false); - json.setMsg("所有小区必须在同一城市和区域下"); + json.setMsg("鎵�鏈夊皬鍖哄繀椤诲湪鍚屼竴鍩庡競鍜屽尯鍩熶笅"); return json; } for (String stage : stages) { @@ -3534,7 +3534,7 @@ public class DistrictController { Map data = new HashMap(); data.put("masterDistrictName", "master"); districtService.updateById(data, id); - // 设置为人工操作分期标识 + // 璁剧疆涓轰汉宸ユ搷浣滃垎鏈熸爣璇� districtService.setPersonOperate(id); } else { Map data = new HashMap(); @@ -3547,7 +3547,7 @@ public class DistrictController { } /** - * 为主小区添加从小区 + * 涓轰富灏忓尯娣诲姞浠庡皬鍖� * * @param model * @return @@ -3563,13 +3563,13 @@ public class DistrictController { District slaveDistrict = districtService.findById(slaveId); if (slaveDistrict == null) { json.setSuccess(false); - json.setMsg("小区不存在,请检查是否输入正确"); + json.setMsg("灏忓尯涓嶅瓨鍦紝璇锋鏌ユ槸鍚﹁緭鍏ユ纭�"); return json; } if (slaveDistrict.getMasterDistrictName() != null && slaveDistrict.getMasterDistrictName().equals("master")) { json.setSuccess(false); - json.setMsg(slaveDistrict.getName() + "已经是主小区了"); + json.setMsg(slaveDistrict.getName() + "宸茬粡鏄富灏忓尯浜�"); return json; } District masterDistrict = districtService.findById(masterId); @@ -3578,11 +3578,11 @@ public class DistrictController { Map data = new HashMap(); data.put("masterDistrictName", masterDistrict.getName()); districtService.updateById(data, slaveId); - // 设置为人工操作分期标识 + // 璁剧疆涓轰汉宸ユ搷浣滃垎鏈熸爣璇� districtService.setPersonOperate(masterDistrict.getId()); } else { json.setSuccess(false); - json.setMsg("城市区域不一致"); + json.setMsg("鍩庡競鍖哄煙涓嶄竴鑷�"); return json; } } @@ -3590,7 +3590,7 @@ public class DistrictController { } /** - * 删除分期 + * 鍒犻櫎鍒嗘湡 * * @param model * @return @@ -3605,7 +3605,7 @@ public class DistrictController { Map data = new HashMap(); data.put("masterDistrictName", null); districtService.updateById(data, model.getId()); - // 设置为人工操作分期标识 + // 璁剧疆涓轰汉宸ユ搷浣滃垎鏈熸爣璇� if (masterDistrict != null) { districtService.setPersonOperate(masterDistrict.getId()); } @@ -3614,7 +3614,7 @@ public class DistrictController { } /** - * 解散分期 + * 瑙f暎鍒嗘湡 * * @param model * @return @@ -3632,14 +3632,14 @@ public class DistrictController { districtService.updateById(data, district.getId()); } districtService.updateById(data, masterDistrict.getId()); - // 取消分期人工操作标识 + // 鍙栨秷鍒嗘湡浜哄伐鎿嶄綔鏍囪瘑 districtService.unsetPersonOperate(masterDistrict.getId()); } return json; } /** - * 设置为主小区 + * 璁剧疆涓轰富灏忓尯 * * @param model * @return @@ -3658,7 +3658,7 @@ public class DistrictController { List list = districtService.findAllByParams(params); if (list == null || list.size() == 0) { json.setSuccess(false); - json.setMsg("没找到对应的主小区"); + json.setMsg("娌℃壘鍒板搴旂殑涓诲皬鍖�"); return json; } String masterId = list.get(0).getId(); @@ -3671,7 +3671,7 @@ public class DistrictController { Map data = new HashMap(); data.put("masterDistrictName", "master"); districtService.updateById(data, district.getId()); - // 设置为人工操作分期标识 + // 璁剧疆涓轰汉宸ユ搷浣滃垎鏈熸爣璇� districtService.setPersonOperate(district.getId()); } else { Map data = new HashMap(); diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DistrictCoverController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DistrictCoverController.java index 010986ae9..c1e7d4c08 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DistrictCoverController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DistrictCoverController.java @@ -25,7 +25,7 @@ import java.util.*; public class DistrictCoverController { - private final static String NO_THING = "暂无资料"; + private final static String NO_THING = "鏆傛棤璧勬枡"; private DistrictService districtService; private HouseService houseService; private RentHouseService rentHouseService; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DistrictHouseStatController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DistrictHouseStatController.java index cdc2c7412..69728d644 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DistrictHouseStatController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DistrictHouseStatController.java @@ -19,7 +19,7 @@ public class DistrictHouseStatController { pager.setPageSize(30); if (StringUtils.isBlank(model.getCityDisplay())) { - model.setCityDisplay("上海"); + model.setCityDisplay("涓婃捣"); } String sortField = null; String sortWay = null; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DistrictHouseTypeController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DistrictHouseTypeController.java index fc639c66a..674c17e3e 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DistrictHouseTypeController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DistrictHouseTypeController.java @@ -32,7 +32,7 @@ public class DistrictHouseTypeController { public Object roomListAction(DistrictHouseTypeModel model){ if(StringUtils.isBlank(model.getCityDisplay())) { - model.setCityDisplay("全国"); + model.setCityDisplay("鍏ㄥ浗"); }else{ Date lastMonthDate = null; @@ -92,7 +92,7 @@ public Object addAction(DistrictRentModel model){ DistrictHousetype districtHouseType = districtHousetypeService.findAllByParams(model.getCityDisplay(), model.getRegion(),model.getDistrictName(), model.getRoom()); if(districtHouseType!=null){ - data.put("data", "此记录已存在!"); + data.put("data", "姝よ褰曞凡瀛樺湪!"); json.setJsonModel(data); return json; } diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DistrictRentController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DistrictRentController.java index 5b4d2b7ff..57f851c12 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DistrictRentController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DistrictRentController.java @@ -62,7 +62,7 @@ public class DistrictRentController { model.setDates(dates); if (StringUtils.isBlank(model.getCityDisplay())) { - model.setCityDisplay("全国"); + model.setCityDisplay("鍏ㄥ浗"); } else { Pager pager = model.getPager(10); @@ -172,7 +172,7 @@ public class DistrictRentController { Date lastDate = DateUtil.truncateDay(DateUtil .getLastDayOfMonth(statDate)); if (statDate.getTime() != lastDate.getTime()) { - data.put("data", "请选择月末"); + data.put("data", "璇烽�夋嫨鏈堟湯"); json.setJsonModel(data); return json; } @@ -183,7 +183,7 @@ public class DistrictRentController { .getRegion(), model.getDistrictName()), statDate, model.getRoom()); if (stat != null) { - data.put("data", "此记录已存在!"); + data.put("data", "姝よ褰曞凡瀛樺湪!"); json.setJsonModel(data); return json; } @@ -290,8 +290,8 @@ public class DistrictRentController { } JSONObject jo = new JSONObject(); - jo.put("name", room + "室"); - // jo.put("color", "室"); + jo.put("name", room + "瀹�"); + // jo.put("color", "瀹�"); jo.put("data", datas); result.add(jo); } @@ -345,11 +345,11 @@ public class DistrictRentController { } JSONObject jo = new JSONObject(); - jo.put("name", room + "室"); + jo.put("name", room + "瀹�"); jo.put("data", datas); JSONObject jo1 = new JSONObject(); - jo1.put("name", room + "室(原)"); + jo1.put("name", room + "瀹�(鍘�)"); jo1.put("data", oldDatas); if (i == 0) { jo.put("visible", true); @@ -395,8 +395,8 @@ public class DistrictRentController { } JSONObject jo = new JSONObject(); - jo.put("name", room + "室"); - // jo.put("color", "室"); + jo.put("name", room + "瀹�"); + // jo.put("color", "瀹�"); jo.put("data", datas); result.add(jo); } @@ -454,7 +454,7 @@ public class DistrictRentController { model.getRoom(), remark)); calcCommandService.save(cmds); - data.put("msg", "任务保存成功!"); + data.put("msg", "浠诲姟淇濆瓨鎴愬姛!"); return json; } diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DistrictTmpController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DistrictTmpController.java index f6032487d..eca119357 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DistrictTmpController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DistrictTmpController.java @@ -74,9 +74,9 @@ public class DistrictTmpController { private FieldFilterService fieldFilterService; private static long MAX_PIC_SIZE = 2 * 1024 * 1024; - private static List distTypes = Arrays.asList("多层","小高层","超高层","高层","花园洋房","老洋房","四合院"); - private static List villaTypes = Arrays.asList("独栋","双拼","联排","叠加"); - private static List shopTypes = Arrays.asList("多层","小高层","超高层","高层","独栋","双拼","联排","叠加"); + private static List distTypes = Arrays.asList("澶氬眰","灏忛珮灞�","瓒呴珮灞�","楂樺眰","鑺卞洯娲嬫埧","鑰佹磱鎴�","鍥涘悎闄�"); + private static List villaTypes = Arrays.asList("鐙爧","鍙屾嫾","鑱旀帓","鍙犲姞"); + private static List shopTypes = Arrays.asList("澶氬眰","灏忛珮灞�","瓒呴珮灞�","楂樺眰","鐙爧","鍙屾嫾","鑱旀帓","鍙犲姞"); private static Map CITY_CODE_MAP=new HashMap(); public static int statusFlag=0; @@ -84,26 +84,26 @@ public class DistrictTmpController { private static DSCollection SEAWEED = null; static{ - CITY_CODE_MAP.put("大兴安岭", "大兴安岭地区"); - CITY_CODE_MAP.put("塔城", "塔城地区"); - CITY_CODE_MAP.put("山南", "山南地区"); - CITY_CODE_MAP.put("日喀则", "日喀则地区"); - CITY_CODE_MAP.put("毕节", "毕节地区"); - CITY_CODE_MAP.put("海东", "海东地区"); - CITY_CODE_MAP.put("海北", "海北藏族自治州"); - CITY_CODE_MAP.put("海南", "海南藏族自治州"); - CITY_CODE_MAP.put("铜仁", "铜仁地区"); - CITY_CODE_MAP.put("阿里", "阿里地区"); - CITY_CODE_MAP.put("昌都", "昌都地区"); - CITY_CODE_MAP.put("林芝", "林芝地区"); - CITY_CODE_MAP.put("那曲", "那曲地区"); - CITY_CODE_MAP.put("阿勒泰", "阿勒泰地区"); - CITY_CODE_MAP.put("巴音郭楞", "巴音郭楞蒙古自治州"); - CITY_CODE_MAP.put("哈密", "哈密地区"); - CITY_CODE_MAP.put("和田", "和田地区"); - CITY_CODE_MAP.put("喀什", "喀什地区"); - CITY_CODE_MAP.put("吐鲁番", "吐鲁番地区"); - CITY_CODE_MAP.put("双鸭山", "双鸭山市"); + CITY_CODE_MAP.put("澶у叴瀹夊箔", "澶у叴瀹夊箔鍦板尯"); + CITY_CODE_MAP.put("濉斿煄", "濉斿煄鍦板尯"); + CITY_CODE_MAP.put("灞卞崡", "灞卞崡鍦板尯"); + CITY_CODE_MAP.put("鏃ュ杸鍒�", "鏃ュ杸鍒欏湴鍖�"); + CITY_CODE_MAP.put("姣曡妭", "姣曡妭鍦板尯"); + CITY_CODE_MAP.put("娴蜂笢", "娴蜂笢鍦板尯"); + CITY_CODE_MAP.put("娴峰寳", "娴峰寳钘忔棌鑷不宸�"); + CITY_CODE_MAP.put("娴峰崡", "娴峰崡钘忔棌鑷不宸�"); + CITY_CODE_MAP.put("閾滀粊", "閾滀粊鍦板尯"); + CITY_CODE_MAP.put("闃块噷", "闃块噷鍦板尯"); + CITY_CODE_MAP.put("鏄岄兘", "鏄岄兘鍦板尯"); + CITY_CODE_MAP.put("鏋楄姖", "鏋楄姖鍦板尯"); + CITY_CODE_MAP.put("閭f洸", "閭f洸鍦板尯"); + CITY_CODE_MAP.put("闃垮嫆娉�", "闃垮嫆娉板湴鍖�"); + CITY_CODE_MAP.put("宸撮煶閮", "宸撮煶閮钂欏彜鑷不宸�"); + CITY_CODE_MAP.put("鍝堝瘑", "鍝堝瘑鍦板尯"); + CITY_CODE_MAP.put("鍜岀敯", "鍜岀敯鍦板尯"); + CITY_CODE_MAP.put("鍠�浠�", "鍠�浠�鍦板尯"); + CITY_CODE_MAP.put("鍚愰瞾鐣�", "鍚愰瞾鐣湴鍖�"); + CITY_CODE_MAP.put("鍙岄腑灞�", "鍙岄腑灞卞競"); try { SEAWEED = new DataStore("seaweed.db.fangjia.com", 27007).getCollection("fangjia.seaweed"); @@ -132,7 +132,7 @@ public class DistrictTmpController { } /** - * 查询列表,默认空 + * 鏌ヨ鍒楄〃锛岄粯璁ょ┖ */ public Object listAction(DistrictModel model) { @@ -311,11 +311,11 @@ public class DistrictTmpController { List result = null; if(tempBuildTypes != null && tempBuildTypes.size() > 0){ if(StringUtils.isNotBlank(district.getEstateType2())){ - if(district.getEstateType2().equals("普通住宅")){ + if(district.getEstateType2().equals("鏅�氫綇瀹�")){ result = changeValue(tempBuildTypes, distTypes); - }else if(district.getEstateType2().equals("别墅")){ + }else if(district.getEstateType2().equals("鍒")){ result = changeValue(tempBuildTypes, villaTypes); - }else if(district.getEstateType2().equals("商住")){ + }else if(district.getEstateType2().equals("鍟嗕綇")){ result = changeValue(tempBuildTypes, shopTypes); } }else{ @@ -377,7 +377,7 @@ public class DistrictTmpController { List baiduSearch(String city,String name,String cat) { List dbObjects = new ArrayList(); - name = name.toString().replace("小区","").replace("住宅",""); + name = name.toString().replace("灏忓尯","").replace("浣忓畢",""); JSONObject resp = BaiDuApiUtils.search(city, name, null, 2, 10, 0); boolean hasSameNameDistrict = false; if (resp != null && resp.getInt("status") == 0 && resp.containsKey("results")) { @@ -418,7 +418,7 @@ public class DistrictTmpController { dbo.append("tag",detailInfo.get("tag")); dbo.append("detailUrl",detailInfo.get("detail_url")); } - String itemName = dbo.getString("name").replace(".","").replace("·",""); + String itemName = dbo.getString("name").replace(".","").replace("路",""); if(!hasSameNameDistrict || name.equals(itemName)){ dbObjects.add(dbo); } @@ -431,7 +431,7 @@ public class DistrictTmpController { } /** - * 查询列表,默认空 + * 鏌ヨ鍒楄〃锛岄粯璁ょ┖ */ public Object listForRemoveAction(DistrictModel model) { @@ -479,8 +479,8 @@ public class DistrictTmpController { String region=dis.getRegion(); String name=dis.getName(); if(StringUtils.isNotBlank(name)){ - if(name.indexOf("期")!=-1){ - int temp=name.indexOf("期"); + if(name.indexOf("鏈�")!=-1){ + int temp=name.indexOf("鏈�"); if(temp>2){ String districtName=""; districtName=name.substring(0,temp-1); @@ -546,13 +546,13 @@ public class DistrictTmpController { objname=arrs[2]; } Map agingMap = new HashMap(); - if(objname.indexOf("期")!=-1){ - int temp=objname.indexOf('期'); + if(objname.indexOf("鏈�")!=-1){ + int temp=objname.indexOf('鏈�'); if(temp>2){ String districtName=""; districtName=objname.substring(0,temp-1); - String[] agArray={"","一期","二期","三期","四期","五期","六期","七期"}; + String[] agArray={"","涓�鏈�","浜屾湡","涓夋湡","鍥涙湡","浜旀湡","鍏湡","涓冩湡"}; String [] fieldArr={"loopLineInfo","block","businessQuarter","estateCompany","developer","facilities","relateInfo", "estateCharge","streetCommunity","cubagePercent","virescencePercent","houseProperty","floorInfo","traffic","fitmentMaterials","outPics","buildStructure"}; @@ -575,12 +575,12 @@ public class DistrictTmpController { continue; } if(StringUtils.isBlank(estateType2)){ - if(null !=districtValue.getEstateType2() && "商住".equals(districtValue.getEstateType2())){ + if(null !=districtValue.getEstateType2() && "鍟嗕綇".equals(districtValue.getEstateType2())){ estateType2=districtValue.getEstateType2(); - agingMap.put("propertyLife", "50年"); + agingMap.put("propertyLife", "50骞�"); }else{ estateType2=districtValue.getEstateType2(); - agingMap.put("propertyLife", "70年"); + agingMap.put("propertyLife", "70骞�"); } } @@ -664,7 +664,7 @@ public class DistrictTmpController { } /** - * 进入图片编辑页 + * 杩涘叆鍥剧墖缂栬緫椤� */ public Object editPicAction(DistrictModel model) throws UnsupportedEncodingException { model.setViewParam("path", "/district/editPic"); @@ -672,7 +672,7 @@ public class DistrictTmpController { } /** - * 保存图片修改 + * 淇濆瓨鍥剧墖淇敼 */ public Object savePicAction(DistrictModel model) throws UnsupportedEncodingException { model.setViewType("redirect"); @@ -731,11 +731,11 @@ public class DistrictTmpController { } /** - * 处理图片(从FS删除图片,保存新图片到FS,更新小区图片url列表) + * 澶勭悊鍥剧墖锛堜粠FS鍒犻櫎鍥剧墖锛屼繚瀛樻柊鍥剧墖鍒癋S锛屾洿鏂板皬鍖哄浘鐗噓rl鍒楄〃锛� */ @SuppressWarnings({ "rawtypes", "unchecked" }) private void processPics(District district, DistrictModel model) { - // 删除图片 + // 鍒犻櫎鍥剧墖 fileService.delPics(model.getDelPics(), FileServiceImpl.SIZE_ORIGINAL); // List floorplanPics = new ArrayList(); @@ -834,7 +834,7 @@ public class DistrictTmpController { @SuppressWarnings({ "rawtypes", "unchecked" }) private void processFjtPics(FjtEvaluation fjtEvaluation, DistrictModel model) { - // 删除图片 + // 鍒犻櫎鍥剧墖 fileService.delPics(model.getDelPics(), FileServiceImpl.SIZE_ORIGINAL); List delPics = model.getDelPics(); @@ -916,7 +916,7 @@ public class DistrictTmpController { return s; } /** - * 保存图片到FS + * 淇濆瓨鍥剧墖鍒癋S */ private List savePics(String districtId, List pics) { List ret = new ArrayList(pics.size()); @@ -947,7 +947,7 @@ public class DistrictTmpController { } /** - * 验证图片文件类型,目前支持gif、jpg + * 楠岃瘉鍥剧墖鏂囦欢绫诲瀷锛岀洰鍓嶆敮鎸乬if銆乯pg * * @param pic * @return @@ -985,7 +985,7 @@ public class DistrictTmpController { } /** - * 进入新增页 + * 杩涘叆鏂板椤� */ public Object addAction(DistrictModel model) { District district = new District(); @@ -995,7 +995,7 @@ public class DistrictTmpController { district.setId(null); model.setUrlFrom("copy"); }else{ - district.setEstateType2("普通住宅"); + district.setEstateType2("鏅�氫綇瀹�"); } model.setDistrict(district); if (StringUtils.isNotBlank(model.getCityDisplay())) { @@ -1030,13 +1030,13 @@ public class DistrictTmpController { /** - * 保存新增小区 + * 淇濆瓨鏂板灏忓尯 */ public Object doAddAction(DistrictModel model) throws UnsupportedEncodingException { District district = model.getDistrict(); List districts=districtService.findByKey(district.getCity(), district.getRegion(), district.getName(), "district"); if(!districts.isEmpty()){ - model.setMsg("小区名已存在!"); + model.setMsg("灏忓尯鍚嶅凡瀛樺湪锛�"); return model; } if(StringUtils.isNotBlank(district.getName())){ @@ -1114,7 +1114,7 @@ public class DistrictTmpController { } else { JsonModel ret = new JsonModel(); Map data = new HashMap(); - data.put("success", "保存成功!"); + data.put("success", "淇濆瓨鎴愬姛锛�"); ret.setJsonModel(data); return ret; } @@ -1124,7 +1124,7 @@ public class DistrictTmpController { } /** - * 获取城市下的区域、板块信息(ajax用) + * 鑾峰彇鍩庡競涓嬬殑鍖哄煙銆佹澘鍧椾俊鎭紙ajax鐢級 */ public Object getRegionsAction(DistrictModel model) { model.setViewType("json"); @@ -1153,7 +1153,7 @@ public class DistrictTmpController { /** - * 获取区域下版块信息(ajax用) + * 鑾峰彇鍖哄煙涓嬬増鍧椾俊鎭紙ajax鐢級 */ public Object getBlocksAction(DistrictModel model) { model.setViewType("json"); @@ -1233,7 +1233,7 @@ public class DistrictTmpController { } /** - * 进入小区编辑页 + * 杩涘叆灏忓尯缂栬緫椤� */ public Object editAction(DistrictModel model) throws UnsupportedEncodingException { if (StringUtils.isBlank(model.getId()) || !ObjectId.isValid(model.getId())) { @@ -1244,7 +1244,7 @@ public class DistrictTmpController { return model; } District district = districtService.findById(model.getId()); - //modify by shibb 2015-6-9,注释掉过滤器,以便数据部查看我们数据库有但是被过滤器过滤掉的数据 + //modify by shibb 2015-6-9,娉ㄩ噴鎺夎繃婊ゅ櫒锛屼互渚挎暟鎹儴鏌ョ湅鎴戜滑鏁版嵁搴撴湁浣嗘槸琚繃婊ゅ櫒杩囨护鎺夌殑鏁版嵁 // fieldFilterService.filter(district); if (null != district && "new_district".equals(district.getCategory())) { district = districtService.findNewDistrict(district.getDistrictKey()); @@ -1272,7 +1272,7 @@ public class DistrictTmpController { /** - * 进入小区周边配套页 + * 杩涘叆灏忓尯鍛ㄨ竟閰嶅椤� */ public Object editNearbyAction(DistrictModel model) throws UnsupportedEncodingException { if (StringUtils.isBlank(model.getId()) || !ObjectId.isValid(model.getId())) { @@ -1290,32 +1290,32 @@ public class DistrictTmpController { Set keyStr=nearByMap.keySet(); Iterator it=keyStr.iterator(); - String[] keywords={"酒店","餐馆","医院","超市","银行","公交车站","电影院","加油站"}; + String[] keywords={"閰掑簵","椁愰","鍖婚櫌","瓒呭競","閾惰","鍏氦杞︾珯","鐢靛奖闄�","鍔犳补绔�"}; while(it.hasNext()){ String key= it.next().toString(); List nearbyList=new ArrayList(); - if(key.equals("酒店")){ + if(key.equals("閰掑簵")){ nearbyList=nearByMap.get(key); model.setHotelList(nearbyList); - }else if(key.equals("餐馆")){ + }else if(key.equals("椁愰")){ nearbyList=nearByMap.get(key); model.setEstaurantList(nearbyList); - }else if(key.equals("医院")){ + }else if(key.equals("鍖婚櫌")){ nearbyList=nearByMap.get(key); model.setHospitalList(nearbyList); - }else if(key.equals("超市")){ + }else if(key.equals("瓒呭競")){ nearbyList=nearByMap.get(key); model.setMarketList(nearbyList); - }else if(key.equals("银行")){ + }else if(key.equals("閾惰")){ nearbyList=nearByMap.get(key); model.setBankList(nearbyList); - }else if(key.equals("公交车站")){ + }else if(key.equals("鍏氦杞︾珯")){ nearbyList=nearByMap.get(key); model.setBusList(nearbyList); - }else if("电影院".equals(key)){ + }else if("鐢靛奖闄�".equals(key)){ nearbyList=nearByMap.get(key); model.setFilmList(nearbyList); - }else if("加油站".equals(key)){ + }else if("鍔犳补绔�".equals(key)){ nearbyList=nearByMap.get(key); model.setOilList(nearbyList); } @@ -1333,7 +1333,7 @@ public class DistrictTmpController { } /** - * 进入小区周边配套详情页 + * 杩涘叆灏忓尯鍛ㄨ竟閰嶅璇︽儏椤� */ public Object editNearbyNameAction(DistrictModel model) throws UnsupportedEncodingException { if (StringUtils.isBlank(model.getId()) || !ObjectId.isValid(model.getId())) { @@ -1391,19 +1391,19 @@ public class DistrictTmpController { headRow.createCell(5).setCellValue("Grid_SW_Lat_WGS84"); headRow.createCell(6).setCellValue("Grid_SW_Lon_WGS84"); headRow.createCell(7).setCellValue("format_city"); - headRow.createCell(8).setCellValue("1公里内"); - headRow.createCell(9).setCellValue("周边1公里"); - headRow.createCell(10).setCellValue("周边2公里"); - headRow.createCell(11).setCellValue("周边3公里"); - headRow.createCell(12).setCellValue("周边4公里"); - headRow.createCell(13).setCellValue("周边5公里"); - headRow.createCell(14).setCellValue("周边6公里"); - headRow.createCell(15).setCellValue("周边7公里"); - headRow.createCell(16).setCellValue("周边8公里"); - headRow.createCell(17).setCellValue("周边9公里"); - headRow.createCell(18).setCellValue("周边10公里"); - headRow.createCell(19).setCellValue("百度经度"); - headRow.createCell(20).setCellValue("百度纬度"); + headRow.createCell(8).setCellValue("1鍏噷鍐�"); + headRow.createCell(9).setCellValue("鍛ㄨ竟1鍏噷"); + headRow.createCell(10).setCellValue("鍛ㄨ竟2鍏噷"); + headRow.createCell(11).setCellValue("鍛ㄨ竟3鍏噷"); + headRow.createCell(12).setCellValue("鍛ㄨ竟4鍏噷"); + headRow.createCell(13).setCellValue("鍛ㄨ竟5鍏噷"); + headRow.createCell(14).setCellValue("鍛ㄨ竟6鍏噷"); + headRow.createCell(15).setCellValue("鍛ㄨ竟7鍏噷"); + headRow.createCell(16).setCellValue("鍛ㄨ竟8鍏噷"); + headRow.createCell(17).setCellValue("鍛ㄨ竟9鍏噷"); + headRow.createCell(18).setCellValue("鍛ㄨ竟10鍏噷"); + headRow.createCell(19).setCellValue("鐧惧害缁忓害"); + headRow.createCell(20).setCellValue("鐧惧害绾害"); while(cur.hasNext()) { DBObject dbo = cur.next(); @@ -1490,7 +1490,7 @@ public class DistrictTmpController { response.setContentType("application/x-download;charset=UTF-8"); fileName = new String(fileName.getBytes("GBK"),"ISO-8859-1"); response.setHeader( "Content-Disposition", "attachment;filename=" + fileName); - os = response.getOutputStream();// 取得输出流 + os = response.getOutputStream();// 鍙栧緱杈撳嚭娴� wb.write(os); os.flush(); }catch (Exception e) { @@ -1596,7 +1596,7 @@ public class DistrictTmpController { } /** - * 进入小区周边配套页 + * 杩涘叆灏忓尯鍛ㄨ竟閰嶅椤� */ public Object districtNearbyAction(DistrictModel model) throws UnsupportedEncodingException { if (StringUtils.isBlank(model.getId()) || !ObjectId.isValid(model.getId())) { @@ -1615,35 +1615,35 @@ public class DistrictTmpController { Set keyStr=nearByMap.keySet(); Iterator it=keyStr.iterator(); - String[] keywords={"酒店","餐馆","医院","学校","超市","银行","公交车站","电影院","加油站"}; + String[] keywords={"閰掑簵","椁愰","鍖婚櫌","瀛︽牎","瓒呭競","閾惰","鍏氦杞︾珯","鐢靛奖闄�","鍔犳补绔�"}; while(it.hasNext()){ String key= it.next().toString(); List nearbyList=new ArrayList(); - if(key.equals("酒店")){ + if(key.equals("閰掑簵")){ nearbyList=nearByMap.get(key); model.setHotelList(nearbyList); - }else if(key.equals("餐馆")){ + }else if(key.equals("椁愰")){ nearbyList=nearByMap.get(key); model.setEstaurantList(nearbyList); - }else if(key.equals("医院")){ + }else if(key.equals("鍖婚櫌")){ nearbyList=nearByMap.get(key); model.setHospitalList(nearbyList); - }else if(key.equals("超市")){ + }else if(key.equals("瓒呭競")){ nearbyList=nearByMap.get(key); model.setMarketList(nearbyList); - }else if(key.equals("银行")){ + }else if(key.equals("閾惰")){ nearbyList=nearByMap.get(key); model.setBankList(nearbyList); - }else if(key.equals("公交车站")){ + }else if(key.equals("鍏氦杞︾珯")){ nearbyList=nearByMap.get(key); model.setBusList(nearbyList); - }else if("电影院".equals(key)){ + }else if("鐢靛奖闄�".equals(key)){ nearbyList=nearByMap.get(key); model.setFilmList(nearbyList); - }else if("加油站".equals(key)){ + }else if("鍔犳补绔�".equals(key)){ nearbyList=nearByMap.get(key); model.setOilList(nearbyList); - }else if("学校".equals(key)){ + }else if("瀛︽牎".equals(key)){ nearbyList=nearByMap.get(key); model.setSchoolList(nearbyList); } @@ -1715,7 +1715,7 @@ public class DistrictTmpController { district.setAddress(model.getAddress()); Map markMap = district.getMarkMap(); if(markMap == null || !markMap.containsKey("baiDuCoordLock") || !new Integer(1).equals(markMap.get("baiDuCoordLock"))){ - //地址改变更改相应的百度经纬度及mapabc经纬度 + //鍦板潃鏀瑰彉鏇存敼鐩稿簲鐨勭櫨搴︾粡绾害鍙妋apabc缁忕含搴� double lng2 = 0; double lat2 = 0; Map infomap = AddressParser.getLngLatByAddress(district.getCity(), model.getAddress()); @@ -1772,7 +1772,7 @@ public class DistrictTmpController { district=districtNearbyService.findById(model.getId()); if(StringUtils.isNotBlank(model.getAddress())){ district.setAddress(model.getAddress()); - //地址改变更改相应的百度经纬度及mapabc经纬度 + //鍦板潃鏀瑰彉鏇存敼鐩稿簲鐨勭櫨搴︾粡绾害鍙妋apabc缁忕含搴� double lng2 = 0.0; double lat2 = 0.0; Map infomap = AddressParser.getLngLatByAddress(district.getCity(), model.getAddress()); @@ -1803,7 +1803,7 @@ public class DistrictTmpController { return model; } /** - * 保存小区修改 + * 淇濆瓨灏忓尯淇敼 */ public Object saveAction(DistrictModel model) throws UnsupportedEncodingException { District district = model.getDistrict(); @@ -1819,7 +1819,7 @@ public class DistrictTmpController { } if(exist){ model.setViewType("redirect"); - model.setViewParam("location", "/district/edit?id=" + district.getId() + "&msg=" + URLEncoder.encode("小区名已存在", "UTF-8")); + model.setViewParam("location", "/district/edit?id=" + district.getId() + "&msg=" + URLEncoder.encode("灏忓尯鍚嶅凡瀛樺湪", "UTF-8")); return model; } @@ -1951,7 +1951,7 @@ public class DistrictTmpController { data.put("markMap", orgDis.getMarkMap()); data.put("modificationDate", new Date()); districtService.updateById(data, district.getId()); - msg = "保存成功了!!!"; + msg = "淇濆瓨鎴愬姛浜嗭紒锛侊紒"; } model.setViewType("redirect"); @@ -2069,7 +2069,7 @@ public class DistrictTmpController { } /** - * 删除小区(status置1) + * 鍒犻櫎灏忓尯锛坰tatus缃�1锛� */ public Object deleteAction(DistrictModel model) throws UnsupportedEncodingException { if (StringUtils.isNotBlank(model.getId()) && ObjectId.isValid(model.getId())) { @@ -2109,7 +2109,7 @@ public class DistrictTmpController { } /** - * 删除小区ajax(status置1) + * 鍒犻櫎灏忓尯ajax锛坰tatus缃�1锛� */ public Object deleteajaxAction(DistrictModel model) throws UnsupportedEncodingException { JsonModel ret = new JsonModel(); @@ -2124,7 +2124,7 @@ public class DistrictTmpController { return ret; } /** - * 恢复小区(status置0) + * 鎭㈠灏忓尯锛坰tatus缃�0锛� */ public Object restoreAction(DistrictModel model) throws UnsupportedEncodingException { if (StringUtils.isNotBlank(model.getId()) && ObjectId.isValid(model.getId())) { @@ -2145,7 +2145,7 @@ public class DistrictTmpController { } /** - * 新盘转小区 + * 鏂扮洏杞皬鍖� */ public Object toDistrictAction(DistrictModel model) throws UnsupportedEncodingException { int count = 0; @@ -2162,7 +2162,7 @@ public class DistrictTmpController { "location", "/district/list?cityDisplay=" + URLEncoder.encode(StringUtils.trimToEmpty(model.getCityDisplay()), "UTF-8") + "&keyword=" + URLEncoder.encode(StringUtils.trimToEmpty(model.getKeyword()), "UTF-8") + "&cat=" - + model.getCat() + "&msg=" + URLEncoder.encode("已将" + count + "个新盘转成小区!!!", "UTF-8")); + + model.getCat() + "&msg=" + URLEncoder.encode("宸插皢" + count + "涓柊鐩樿浆鎴愬皬鍖猴紒锛侊紒", "UTF-8")); return model; } @@ -2307,7 +2307,7 @@ public class DistrictTmpController { return jsonModel; } Map seaweedUpdate = new HashMap(); - if(fieldName.contains("lias")){//别名和地址别名需要转成List + if(fieldName.contains("lias")){//鍒悕鍜屽湴鍧�鍒悕闇�瑕佽浆鎴怢ist List v = new ArrayList(Arrays.asList(fieldValue.split("\n"))); Iterator it = v.iterator(); while(it.hasNext()){ @@ -2365,7 +2365,7 @@ public class DistrictTmpController { String cityDisplay=model.getCityDisplay(); if(StringUtils.isEmpty(model.getKeyword())){ if(StringUtils.isEmpty(cityDisplay)){ - cityDisplay="上海"; + cityDisplay="涓婃捣"; } ServerArea cityDis = ServerAreaData.getServerAreaByDisplay(cityDisplay); model.setCityLat(cityDis.getLat()); @@ -2404,11 +2404,11 @@ public class DistrictTmpController { String categoryStr=""; if(cityDisplay !=null && keyword!=null){ - if(keyword.indexOf("写字")!=-1 || keyword.indexOf("办公")!=-1){ + if(keyword.indexOf("鍐欏瓧")!=-1 || keyword.indexOf("鍔炲叕")!=-1){ categoryStr="office"; - }else if(keyword.indexOf("商铺")!=-1){ + }else if(keyword.indexOf("鍟嗛摵")!=-1){ categoryStr="shop"; - }else if(keyword.indexOf("住宅")!=-1){ + }else if(keyword.indexOf("浣忓畢")!=-1){ categoryStr="district"; } List baidulogList=baidulogService.findByBaidulog(cityDisplay, categoryStr); @@ -2457,7 +2457,7 @@ public class DistrictTmpController { district.setEstateType2(model.getEstateType()); if(StringUtils.isNotBlank(model.getAddress())){ district.setAddress(model.getAddress()); - //地址改变更改相应的百度经纬度及mapabc经纬度 + //鍦板潃鏀瑰彉鏇存敼鐩稿簲鐨勭櫨搴︾粡绾害鍙妋apabc缁忕含搴� double lng2 = 0; double lat2 = 0; Map infomap = AddressParser.getLngLatByAddress(model.getCityDisplay(), model.getAddress()); @@ -2531,7 +2531,7 @@ public class DistrictTmpController { params.add(new QueryParam("city", model.getCityDisplay())); } - boolean isDistrict = false;//标示查询的数据是不是小区 + boolean isDistrict = false;//鏍囩ず鏌ヨ鐨勬暟鎹槸涓嶆槸灏忓尯 if(StringUtils.isNotBlank(model.getCat())){ params.add(new QueryParam("category", model.getCat())); if("district".equals(model.getCategory())){ @@ -2639,14 +2639,14 @@ public class DistrictTmpController { try { HttpServletResponse response = ActionContext.getContext().getResponse(); response.setCharacterEncoding("UTF-8"); - //response.reset();// 清空输出流 + //response.reset();// 娓呯┖杈撳嚭娴� response.setContentType("application/x-download;charset=UTF-8"); fileName = new String(fileName.getBytes("GBK"),"ISO-8859-1"); - if(fileName.length()>150){//解决IE 6.0 bug + if(fileName.length()>150){//瑙e喅IE 6.0 bug fileName = new String(fileName.getBytes("GBK"),"ISO-8859-1"); } response.setHeader( "Content-Disposition", "attachment;filename=" + fileName); - os = response.getOutputStream();// 取得输出流 + os = response.getOutputStream();// 鍙栧緱杈撳嚭娴� wb.write(os); os.flush(); }catch (Exception e) { @@ -2668,16 +2668,16 @@ public class DistrictTmpController { private HSSFWorkbook createExcel(DistrictModel model, List districts, String[] s3) throws Exception{ HSSFWorkbook wb = new HSSFWorkbook(); - //createSheet(wb, 0, "住宅"); + //createSheet(wb, 0, "浣忓畢"); HSSFSheet s = wb.createSheet(); if(StringUtils.isNotBlank(model.getCat())){ if(model.getCat().equals("shop")){ - wb.setSheetName(0, "商铺"); + wb.setSheetName(0, "鍟嗛摵"); }else if(model.getCat().equals("office")){ - wb.setSheetName(0, "写字楼"); + wb.setSheetName(0, "鍐欏瓧妤�"); } }else{ - wb.setSheetName(0, "住宅"); + wb.setSheetName(0, "浣忓畢"); } @@ -2768,63 +2768,63 @@ public class DistrictTmpController { public Map getFliedDisplay(){ Map map = new HashMap(){ { - put( "city" , "城市" ); - put( "name" , "名称" ); - put( "region" , "区域" ); - put( "block" , "板块" ); - put( "address" , "地址" ); - put( "estateType2" , "物业类型" ); - put( "streetCommunity" , "街道社区" ); - put( "householdCount" , "户数" ); - put( "openDate" , "开盘时间" ); - put( "licence" , "预售证" ); - put( "latLng" , "mapabc经纬度" ); - put( "latLng2" , "百度经纬度" ); - put( "allArea" , "占地面积" ); - put( "buildArea" , "建筑面积" ); - put( "buildType" , "建筑类型" ); - put( "alias" , "名称别名" ); - put( "addrAlias" , "地址别名" ); - put( "developer" , "开发商" ); - put( "estateCompany" , "物业公司" ); - put( "cubagePercent" , "容积率" ); - put( "virescencePercent" , "绿化率" ); - put( "carSite" , "停车位(描述)" ); - put( "estateCharge" , "物业费" ); - put( "floorplanPics" , "楼层平面图" ); - put( "outPics" , "外景图" ); - put( "rentPrice" , "租金" ); - put( "bedKind" , "写字楼等级" ); - put( "houseFloor" , "楼层" ); - put( "houseHeight" , "楼高" ); - put( "leaseTerm","租赁年限"); - put( "paymentPattern","付款方式"); - put( "rentPrice","出租价格"); - put( "sellPrice","出售价格"); - put( "floor","建筑楼层"); - put( "floorInfo","楼层状况"); - put( "bayArea","开间面积"); - put( "finishBuildingDate","竣工时间"); - put( "liveDate","开业时间"); - put( "divisible","是否可分割"); - put( "unifiedManage","是否统一管理"); - put( "carSiteCount","停车位"); - put( "metroInfo","地铁沿线"); - put( "metroNames","地铁站名"); - put( "facilities","配套设施"); - put( "propertyInfo","物业概况"); - put( "traffic","交通情况"); - put( "surrounding","周边情况"); - put( "businessStatus","经营业态"); - put( "rentType","租售类型"); - put( "price","价格"); - put( "businessQuarter","商圈"); - put( "status","状态"); - put( "standardHeight","标准层高"); - put( "foreign","是否涉外"); - put( "register","是否注册"); - put( "realUsePercent","实用率"); - put( "liveDate","交房时间"); + put( "city" , "鍩庡競" ); + put( "name" , "鍚嶇О" ); + put( "region" , "鍖哄煙" ); + put( "block" , "鏉垮潡" ); + put( "address" , "鍦板潃" ); + put( "estateType2" , "鐗╀笟绫诲瀷" ); + put( "streetCommunity" , "琛楅亾绀惧尯" ); + put( "householdCount" , "鎴锋暟" ); + put( "openDate" , "寮�鐩樻椂闂�" ); + put( "licence" , "棰勫敭璇�" ); + put( "latLng" , "mapabc缁忕含搴�" ); + put( "latLng2" , "鐧惧害缁忕含搴�" ); + put( "allArea" , "鍗犲湴闈㈢Н" ); + put( "buildArea" , "寤虹瓚闈㈢Н" ); + put( "buildType" , "寤虹瓚绫诲瀷" ); + put( "alias" , "鍚嶇О鍒悕" ); + put( "addrAlias" , "鍦板潃鍒悕" ); + put( "developer" , "寮�鍙戝晢" ); + put( "estateCompany" , "鐗╀笟鍏徃" ); + put( "cubagePercent" , "瀹圭Н鐜�" ); + put( "virescencePercent" , "缁垮寲鐜�" ); + put( "carSite" , "鍋滆溅浣�(鎻忚堪)" ); + put( "estateCharge" , "鐗╀笟璐�" ); + put( "floorplanPics" , "妤煎眰骞抽潰鍥�" ); + put( "outPics" , "澶栨櫙鍥�" ); + put( "rentPrice" , "绉熼噾" ); + put( "bedKind" , "鍐欏瓧妤肩瓑绾�" ); + put( "houseFloor" , "妤煎眰" ); + put( "houseHeight" , "妤奸珮" ); + put( "leaseTerm","绉熻祦骞撮檺"); + put( "paymentPattern","浠樻鏂瑰紡"); + put( "rentPrice","鍑虹浠锋牸"); + put( "sellPrice","鍑哄敭浠锋牸"); + put( "floor","寤虹瓚妤煎眰"); + put( "floorInfo","妤煎眰鐘跺喌"); + put( "bayArea","寮�闂撮潰绉�"); + put( "finishBuildingDate","绔e伐鏃堕棿"); + put( "liveDate","寮�涓氭椂闂�"); + put( "divisible","鏄惁鍙垎鍓�"); + put( "unifiedManage","鏄惁缁熶竴绠$悊"); + put( "carSiteCount","鍋滆溅浣�"); + put( "metroInfo","鍦伴搧娌跨嚎"); + put( "metroNames","鍦伴搧绔欏悕"); + put( "facilities","閰嶅璁炬柦"); + put( "propertyInfo","鐗╀笟姒傚喌"); + put( "traffic","浜ら�氭儏鍐�"); + put( "surrounding","鍛ㄨ竟鎯呭喌"); + put( "businessStatus","缁忚惀涓氭��"); + put( "rentType","绉熷敭绫诲瀷"); + put( "price","浠锋牸"); + put( "businessQuarter","鍟嗗湀"); + put( "status","鐘舵��"); + put( "standardHeight","鏍囧噯灞傞珮"); + put( "foreign","鏄惁娑夊"); + put( "register","鏄惁娉ㄥ唽"); + put( "realUsePercent","瀹炵敤鐜�"); + put( "liveDate","浜ゆ埧鏃堕棿"); } };// return map; } @@ -2857,17 +2857,17 @@ public class DistrictTmpController { Map data = new HashMap(); jsonModel.setJsonModel(data); if(StringUtils.isBlank(model.getCityDisplay())){ - data.put("msg","城市不能为空"); + data.put("msg","鍩庡競涓嶈兘涓虹┖"); return jsonModel; } if(StringUtils.isBlank(model.getDestRegion()) || StringUtils.isBlank(model.getOrgRegion())){ - data.put("msg","原区域和目标区域不能为空"); + data.put("msg","鍘熷尯鍩熷拰鐩爣鍖哄煙涓嶈兘涓虹┖"); return jsonModel; } String orgRegion = model.getOrgRegion(); String destRegion = model.getDestRegion(); if(orgRegion.equals(destRegion)){ - data.put("msg","原区域和目标区域不能相同"); + data.put("msg","鍘熷尯鍩熷拰鐩爣鍖哄煙涓嶈兘鐩稿悓"); return jsonModel; } List existsDistrict = new ArrayList(); @@ -2900,7 +2900,7 @@ public class DistrictTmpController { districtUpdateTaskService.createTask(district.getId(), 1, null, null); } } - data.put("msg","数据迁移完成:迁移小区" + count + "个,由于目标区域存在被删除小区" + deleteCount + "个"); + data.put("msg","鏁版嵁杩佺Щ瀹屾垚:杩佺Щ灏忓尯" + count + "涓�,鐢变簬鐩爣鍖哄煙瀛樺湪琚垹闄ゅ皬鍖�" + deleteCount + "涓�"); data.put("success",true); return jsonModel; } diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ElevateWordController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ElevateWordController.java index e46f1048a..6f2eea13f 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ElevateWordController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ElevateWordController.java @@ -24,7 +24,7 @@ public class ElevateWordController { private ServerAreaService serverAreaService; /** - * 精品词列表 + * 绮惧搧璇嶅垪琛� * * @param model * @return @@ -86,7 +86,7 @@ public class ElevateWordController { } /** - * 保存 + * 淇濆瓨 * * @param model * @return @@ -122,7 +122,7 @@ public class ElevateWordController { dataMap.put("seoIndexDescription", model.getSeoIndexDescription()); elevateWordService.updateById(model.getId(), dataMap); - model.setMsg("修改成功"); + model.setMsg("淇敼鎴愬姛"); } else { ElevateWord elevateWord = new ElevateWord(); elevateWord.setCategory(model.getCategory()); @@ -157,7 +157,7 @@ public class ElevateWordController { } /** - * 删除 + * 鍒犻櫎 * * @param model * @return diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/EntityClassController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/EntityClassController.java index 30eb89dba..3e0e5bf33 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/EntityClassController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/EntityClassController.java @@ -94,7 +94,7 @@ public class EntityClassController { flag=true; } } - // AccessibleTest类中的成员变量为private,故必须进行此操作 + // AccessibleTest绫讳腑鐨勬垚鍛樺彉閲忎负private,鏁呭繀椤昏繘琛屾鎿嶄綔 if(flag==false){ fields[i].setAccessible(true); Class type=fields[i].getType(); diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/EvaluateController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/EvaluateController.java index d93512a31..ffa5e1a12 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/EvaluateController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/EvaluateController.java @@ -60,7 +60,7 @@ public class EvaluateController { } if (model.getQualifications() != null) { - List qs = Arrays.asList(StringUtils.split(model.getQualifications(), "\r\n|、|,|,")); + List qs = Arrays.asList(StringUtils.split(model.getQualifications(), "\r\n|銆亅锛寍,")); List qualifications = new ArrayList(5); for (String q : qs) { if (StringUtils.isNotBlank(q)) { @@ -71,7 +71,7 @@ public class EvaluateController { } if (model.getRegions() != null) { - List rs = Arrays.asList(StringUtils.split(model.getRegions(), "\r\n|、|,|,")); + List rs = Arrays.asList(StringUtils.split(model.getRegions(), "\r\n|銆亅锛寍,")); List regions = new ArrayList(5); for (String r : rs) { if (StringUtils.isNotBlank(r)) { @@ -82,7 +82,7 @@ public class EvaluateController { } if (model.getExpertRegions() != null) { - List rs = Arrays.asList(StringUtils.split(model.getExpertRegions(), "\r\n|、|,|,")); + List rs = Arrays.asList(StringUtils.split(model.getExpertRegions(), "\r\n|銆亅锛寍,")); List regions = new ArrayList(5); for (String r : rs) { if (StringUtils.isNotBlank(r)) { @@ -101,9 +101,9 @@ public class EvaluateController { } } - if (cats.contains("全部")) { + if (cats.contains("鍏ㄩ儴")) { cats = new ArrayList(1); - cats.add("全部"); + cats.add("鍏ㄩ儴"); } entity.setMainCategory(cats); @@ -237,8 +237,8 @@ public class EvaluateController { } StringBuilder sb = new StringBuilder(); - sb.append("有房价网").append(bo.getApplication().getUserName()).append("(手机").append(bo.getApplication().getMobile()) - .append(")申请估价师服务,请您立刻回电!"); + sb.append("鏈夋埧浠风綉").append(bo.getApplication().getUserName()).append("锛堟墜鏈�").append(bo.getApplication().getMobile()) + .append("锛夌敵璇蜂及浠峰笀鏈嶅姟锛岃鎮ㄧ珛鍒诲洖鐢碉紒"); try { smsService.sendForRongshidai(bo.getMaster().getMobile(), sb.toString()); evaluateApplicationService.updateStatus1(model.getId()); diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/EvaluationAuditController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/EvaluationAuditController.java index a101d08b2..77a35ef65 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/EvaluationAuditController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/EvaluationAuditController.java @@ -60,7 +60,7 @@ public class EvaluationAuditController { private final static Logger LOGGER = LoggerFactory.getLogger(EvaluationAuditController.class); public Object listAction(EvaluationAuditModel model){ - //重新重复地址时先查出全部后面再分页 + //閲嶆柊閲嶅鍦板潃鏃跺厛鏌ュ嚭鍏ㄩ儴鍚庨潰鍐嶅垎椤� Pager pager = model.getPager(20); if(model.isRepeat()){ pager = new Pager(Integer.MAX_VALUE); @@ -168,7 +168,7 @@ public class EvaluationAuditController { bo.setBuildType(eval.getBuildType()); bo.setFloorDesc(eval.getFloorDesc()); bos.add(bo); - //根据地址,楼栋号判断是否是同一套房 + //鏍规嵁鍦板潃锛屾ゼ鏍嬪彿鍒ゆ柇鏄惁鏄悓涓�濂楁埧 List evaluations = fjtEvaluationService.findAllFjtEvaluationByConditions(eval.getCity(), eval.getRegion(), bo.getAddress(), eval.getHouseNum(), eval.getRoomNum()); if(evaluations!=null && evaluations.size()>=2){ List ids = new ArrayList(); @@ -192,7 +192,7 @@ public class EvaluationAuditController { for(EvaluationAuditBo audit:model.getEvaluationAuditBoList()){ UserTrades userTrade = userTradesService.findUserTradesByEvaluationId(audit.getEvaluationId()); if(userTrade==null || StringUtils.isBlank(userTrade.getReconcile())){ - audit.setReconcile("未结账"); + audit.setReconcile("鏈粨璐�"); }else{ audit.setReconcile(userTrade.getReconcile()); } @@ -206,7 +206,7 @@ public class EvaluationAuditController { FjtEvaluation eval = fjtEvaluationService.findEvaluationById(Long.parseLong(model.getEvaluationId())); if(eval==null) { model.setCode("-1"); - model.setMsg("更新失败:根据Id查询evaluation信息失败!"); + model.setMsg("鏇存柊澶辫触锛氭牴鎹甀d鏌ヨevaluation淇℃伅澶辫触锛�"); return model; } eval.setAccountChecker(model.getAccountChecker()); @@ -218,7 +218,7 @@ public class EvaluationAuditController { /** - * 手写根据地址分组 + * 鎵嬪啓鏍规嵁鍦板潃鍒嗙粍 */ private List sortByAddress(List bos,Pager pager){ List list = new ArrayList(); @@ -228,16 +228,16 @@ public class EvaluationAuditController { for(EvaluationAuditBo bo:bos){ String key = bo.getAddress()+bo.getHouseNum()+bo.getRoomNum(); if(StringUtils.isNotBlank(key)){ - if(map.containsKey(key)){ //map中已存在,将该数据存放到同一个key的map中 + if(map.containsKey(key)){ //map涓凡瀛樺湪锛屽皢璇ユ暟鎹瓨鏀惧埌鍚屼竴涓猭ey鐨刴ap涓� map.get(key).add(bo); - }else{ //map中不存在,新建key,用来存放数据 + }else{ //map涓笉瀛樺湪锛屾柊寤簁ey锛岀敤鏉ュ瓨鏀炬暟鎹� List boList = new ArrayList(); boList.add(bo); map.put(key, boList); } } } - //遍历 + //閬嶅巻 for (List value : map.values()) { if(value.size() > 1){ list.addAll(value); @@ -325,9 +325,9 @@ public class EvaluationAuditController { OutputStream os = null; BufferedOutputStream fos = null; - String[] columns = {"城市","输入","地址","用户名","公司","面积","总价","估价日期","输入成交价","调查价","终审价格","对账情况","对账老师","报告收费","审核时间","操作人","备注"}; + String[] columns = {"鍩庡競","杈撳叆","鍦板潃","鐢ㄦ埛鍚�","鍏徃","闈㈢Н","鎬讳环","浼颁环鏃ユ湡","杈撳叆鎴愪氦浠�","璋冩煡浠�","缁堝浠锋牸","瀵硅处鎯呭喌","瀵硅处鑰佸笀","鎶ュ憡鏀惰垂","瀹℃牳鏃堕棿","鎿嶄綔浜�","澶囨敞"}; HSSFWorkbook wb= new HSSFWorkbook(); - Sheet sheet = wb.createSheet("审核价格"); + Sheet sheet = wb.createSheet("瀹℃牳浠锋牸"); Row row = sheet.createRow(0); for(int i =0 ;i < columns.length ; i++){ row.createCell(i).setCellValue(columns[i]); @@ -397,16 +397,16 @@ public class EvaluationAuditController { for(EvaluationAuditBo bo:bos){ String key = bo.getAddress()+bo.getHouseNum()+bo.getRoomNum(); if(StringUtils.isNotBlank(key)){ - if(map.containsKey(key)){ //map中已存在,将该数据存放到同一个key的map中 + if(map.containsKey(key)){ //map涓凡瀛樺湪锛屽皢璇ユ暟鎹瓨鏀惧埌鍚屼竴涓猭ey鐨刴ap涓� map.get(key).add(bo); - }else{ //map中不存在,新建key,用来存放数据 + }else{ //map涓笉瀛樺湪锛屾柊寤簁ey锛岀敤鏉ュ瓨鏀炬暟鎹� List boList = new ArrayList(); boList.add(bo); map.put(key, boList); } } } - //遍历 + //閬嶅巻 for (List value : map.values()) { if(value.size() > 1){ auditList.addAll(value); @@ -420,16 +420,16 @@ public class EvaluationAuditController { for(EvaluationAuditBo audit:auditList){ UserTrades userTrade = userTradesService.findUserTradesByEvaluationId(audit.getEvaluationId()); if(userTrade==null || StringUtils.isBlank(userTrade.getReconcile())){ - audit.setReconcile("未结账"); + audit.setReconcile("鏈粨璐�"); }else{ audit.setReconcile(userTrade.getReconcile()); } String address = audit.getAddress(); if(StringUtils.isNotBlank(audit.getHouseNum())){ - address = address +audit.getHouseNum()+"栋"; + address = address +audit.getHouseNum()+"鏍�"; } if(StringUtils.isNotBlank(audit.getRoomNum())){ - address = address + audit.getRoomNum()+"室"; + address = address + audit.getRoomNum()+"瀹�"; } row = sheet.createRow(i++); row.createCell(0).setCellValue(audit.getCity()); @@ -438,24 +438,24 @@ public class EvaluationAuditController { row.createCell(3).setCellValue(audit.getUserName()); row.createCell(4).setCellValue(audit.getCompany()); row.createCell(5).setCellValue(audit.getHouseArea()); - row.createCell(6).setCellValue(audit.getTotalPrice()+ "万元"); - row.createCell(7).setCellValue(DateUtil.formatByPattern(audit.getLastUpdated(), "yyyy年MM月dd日 HH:mm")); + row.createCell(6).setCellValue(audit.getTotalPrice()+ "涓囧厓"); + row.createCell(7).setCellValue(DateUtil.formatByPattern(audit.getLastUpdated(), "yyyy骞碝M鏈坉d鏃� HH:mm")); if(audit.getDealPrice() != null){ - row.createCell(8).setCellValue(audit.getDealPrice() + "万元"); + row.createCell(8).setCellValue(audit.getDealPrice() + "涓囧厓"); } if(audit.getInvestigatePrice()!=null){ - row.createCell(9).setCellValue(audit.getInvestigatePrice() + "万元"); + row.createCell(9).setCellValue(audit.getInvestigatePrice() + "涓囧厓"); } if(audit.getAuditPrice() != null){ - row.createCell(10).setCellValue(audit.getAuditPrice()+ "万元"); + row.createCell(10).setCellValue(audit.getAuditPrice()+ "涓囧厓"); } row.createCell(11).setCellValue(audit.getReconcile()); row.createCell(12).setCellValue(audit.getAccountChecker()); if(audit.getCharge() != null){ - row.createCell(13).setCellValue(audit.getCharge() + "元"); + row.createCell(13).setCellValue(audit.getCharge() + "鍏�"); } if(audit.getAuditDate() != null){ - row.createCell(14).setCellValue(DateUtil.formatByPattern(audit.getAuditDate(),"yyyy年MM月dd日 HH:mm")); + row.createCell(14).setCellValue(DateUtil.formatByPattern(audit.getAuditDate(),"yyyy骞碝M鏈坉d鏃� HH:mm")); } if(audit.getAuditor()!=null){ row.createCell(15).setCellValue(audit.getAuditor()); @@ -465,18 +465,18 @@ public class EvaluationAuditController { } } - String fileName = "价格审核" + "(" + DateUtils.formatDate(new Date(), "yyyyMMddHHmmss") + ").xls"; + String fileName = "浠锋牸瀹℃牳" + "(" + DateUtils.formatDate(new Date(), "yyyyMMddHHmmss") + ").xls"; try { HttpServletResponse response = ActionContext.getContext().getResponse(); response.setCharacterEncoding("UTF-8"); - //response.reset();// 清空输出流 + //response.reset();// 娓呯┖杈撳嚭娴� response.setContentType("application/x-download;charset=UTF-8"); fileName = new String(fileName.getBytes("GBK"),"ISO-8859-1"); - if(fileName.length()>150){//解决IE 6.0 bug + if(fileName.length()>150){//瑙e喅IE 6.0 bug fileName = new String(fileName.getBytes("GBK"),"ISO-8859-1"); } response.setHeader( "Content-Disposition", "attachment;filename=" + fileName); - os = response.getOutputStream();// 取得输出流 + os = response.getOutputStream();// 鍙栧緱杈撳嚭娴� wb.write(os); os.flush(); }catch (Exception e) { diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/EvaluationConditionController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/EvaluationConditionController.java index ec9bc0377..57f5a4cae 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/EvaluationConditionController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/EvaluationConditionController.java @@ -56,7 +56,7 @@ public class EvaluationConditionController { evaluationCondition.setCondition(model.getCondition()); evaluationCondition.setConditionEN(model.getConditionEN()); evaluationCondition.setSeq(1); - evaluationCondition.setShowType("单选框"); + evaluationCondition.setShowType("鍗曢�夋"); String condition = evaluationCondition.getCondition(); String estateType = evaluationCondition.getEstateType(); if(evaluationCondition.getId()==null){ diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/EvaluationController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/EvaluationController.java index 7df4607b1..4236758eb 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/EvaluationController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/EvaluationController.java @@ -94,8 +94,8 @@ public class EvaluationController { private static long MAX_PIC_SIZE = 2 * 1024 * 1024; - private static String POSITIVE_WORD = "好,佳,漂亮,喜欢,满意,值得,美丽,不错,挺好,方便,崭新,快捷,便利,干净,整洁,态度好,服务好,物业好,素质高,环境优美,绿化面积大,小区环境好,安全,干净,整洁,电梯快,美丽,离地铁近,公交方便,四通八达,有大卖场,有超市,房价便宜,得房率高,租金便宜,公园,空气好,有菜场,配套齐全,出行方便,近医院,学区房,有名校,性价比高,风水好,公交多,档次高,商铺多,停车方便,有车库,朝向好,视野佳,保安好"; - private static String NEGATIVE_WORD = "脏,乱,差,难,恶劣,厌恶,讨厌,恶心,后悔,难过,晕,烦,头疼,郁闷,麻烦,恨,陈旧,不方便,慢,臭,危险环境差,绿化少,保安差,物业差,态度差,态度恶劣,质量差,漏水, 裂缝,失窃,不安全,物业不作为,服务差,得房率低,电梯老,电梯慢,乱堆杂物,停车难,无车位,配套少,维修慢,推销,小偷,陌生人,黑三轮,黑车,小广告,乱扔垃圾,臭水沟,交通不方便,没有超市,失窃,偷车,出行不便,沿马路,有噪音,吵闹,没医院,扰民,遮挡光线,素质差,群租房,房龄老"; + private static String POSITIVE_WORD = "濂斤紝浣筹紝婕備寒锛屽枩娆紝婊℃剰锛屽�煎緱锛岀編涓斤紝涓嶉敊锛屾尯濂斤紝鏂逛究锛屽喘鏂帮紝蹇嵎锛屼究鍒╋紝骞插噣锛屾暣娲侊紝鎬佸害濂斤紝鏈嶅姟濂斤紝鐗╀笟濂斤紝绱犺川楂橈紝鐜浼樼編锛岀豢鍖栭潰绉ぇ锛屽皬鍖虹幆澧冨ソ锛屽畨鍏紝骞插噣锛屾暣娲侊紝鐢垫蹇紝缇庝附锛岀鍦伴搧杩戯紝鍏氦鏂逛究锛屽洓閫氬叓杈撅紝鏈夊ぇ鍗栧満锛屾湁瓒呭競锛屾埧浠蜂究瀹滐紝寰楁埧鐜囬珮锛岀閲戜究瀹滐紝鍏洯锛岀┖姘斿ソ锛屾湁鑿滃満锛岄厤濂楅綈鍏紝鍑鸿鏂逛究锛岃繎鍖婚櫌锛屽鍖烘埧锛屾湁鍚嶆牎锛屾�т环姣旈珮锛岄姘村ソ锛屽叕浜ゅ锛屾。娆¢珮锛屽晢閾哄锛屽仠杞︽柟渚匡紝鏈夎溅搴擄紝鏈濆悜濂斤紝瑙嗛噹浣筹紝淇濆畨濂�"; + private static String NEGATIVE_WORD = "鑴忥紝涔憋紝宸紝闅撅紝鎭跺姡锛屽帉鎭讹紝璁ㄥ帉锛屾伓蹇冿紝鍚庢倲锛岄毦杩囷紝鏅曪紝鐑︼紝澶寸柤锛岄儊闂凤紝楹荤儲锛屾仺锛岄檲鏃э紝涓嶆柟渚匡紝鎱紝鑷紝鍗遍櫓鐜宸紝缁垮寲灏戯紝淇濆畨宸紝鐗╀笟宸紝鎬佸害宸紝鎬佸害鎭跺姡锛岃川閲忓樊锛屾紡姘达紝 瑁傜紳锛屽け绐冿紝涓嶅畨鍏紝鐗╀笟涓嶄綔涓猴紝鏈嶅姟宸紝寰楁埧鐜囦綆锛岀數姊�侊紝鐢垫鎱紝涔卞爢鏉傜墿锛屽仠杞﹂毦锛屾棤杞︿綅锛岄厤濂楀皯锛岀淮淇參锛屾帹閿�锛屽皬鍋凤紝闄岀敓浜猴紝榛戜笁杞紝榛戣溅锛屽皬骞垮憡锛屼贡鎵斿瀮鍦撅紝鑷按娌燂紝浜ら�氫笉鏂逛究锛屾病鏈夎秴甯傦紝澶辩獌锛屽伔杞︼紝鍑鸿涓嶄究锛屾部椹矾锛屾湁鍣煶锛屽惖闂癸紝娌″尰闄紝鎵版皯锛岄伄鎸″厜绾匡紝绱犺川宸紝缇ょ鎴匡紝鎴块緞鑰�"; public Object listAction(EvaluationExportModel model) { @@ -183,8 +183,8 @@ public class EvaluationController { evaluation.getDistrictName()); model.setMetros(metros); - model.setPositives(Arrays.asList(POSITIVE_WORD.split(","))); - model.setNegatives(Arrays.asList(NEGATIVE_WORD.split(","))); + model.setPositives(Arrays.asList(POSITIVE_WORD.split("锛�"))); + model.setNegatives(Arrays.asList(NEGATIVE_WORD.split("锛�"))); if (StringUtils.isNotEmpty(district.getDeveloper())) { model.setDeveloperObj(developerService.findByName(null, district.getDeveloper())); } @@ -337,7 +337,7 @@ public class EvaluationController { } else { Mail mail = new Mail(); mail.setReceiver(new MailUser(model.getEmail())); - mail.setSubject("房价网—房产专业调查分析报告"); + mail.setSubject("鎴夸环缃戔�旀埧浜т笓涓氳皟鏌ュ垎鏋愭姤鍛�"); Date _now = new Date(); String email_content = ""; EmailTemplate sd = new EmailTemplate("reportEmail.ftl"); @@ -352,8 +352,8 @@ public class EvaluationController { mail.setContent(email_content); mail.setImportant(true); mail.setAttachment(true); - mail.setAttachmentDes("房产专业调查分析报告"); - mail.setAttachmentName("房产专业调查分析报告.pdf"); + mail.setAttachmentDes("鎴夸骇涓撲笟璋冩煡鍒嗘瀽鎶ュ憡"); + mail.setAttachmentName("鎴夸骇涓撲笟璋冩煡鍒嗘瀽鎶ュ憡.pdf"); if (report.getCat() != 0) { mail.setAttachmentUrl("http://sh.fangjia.com/report2?eid=" + SecurityUtil.encode(model.getEvaluationId())); } else { @@ -418,15 +418,15 @@ public class EvaluationController { String text = document.toString(); Document doc = DocumentHelper.parseText(text); Element root = (Element) doc.getRootElement(); - String is_success = root.elementText("is_success");// is_success为T - // 为确认发货成功 + String is_success = root.elementText("is_success");// is_success涓篢 + // 涓虹‘璁ゅ彂璐ф垚鍔� // if(is_success.equals("T")){ String content = ""; if (isAlipay) { - content = "尊敬的客户,《房调报告》已发送您指定邮箱,请注意查收,并在支付宝确认收货,谢谢!客服热线:021-62391139"; + content = "灏婃暚鐨勫鎴凤紝銆婃埧璋冩姤鍛娿�嬪凡鍙戦�佹偍鎸囧畾閭锛岃娉ㄦ剰鏌ユ敹锛屽苟鍦ㄦ敮浠樺疂纭鏀惰揣锛岃阿璋紒瀹㈡湇鐑嚎锛�021-62391139"; } else { - content = "尊敬的客户,《房调报告》已发送您指定邮箱,请注意查收,谢谢!客服热线:021-62391139"; + content = "灏婃暚鐨勫鎴凤紝銆婃埧璋冩姤鍛娿�嬪凡鍙戦�佹偍鎸囧畾閭锛岃娉ㄦ剰鏌ユ敹锛岃阿璋紒瀹㈡湇鐑嚎锛�021-62391139"; } smsService.send(report.getPhone(), content); // } @@ -455,7 +455,7 @@ public class EvaluationController { } try { - String content = "尊敬的用户,恭喜您获得了房价网《房调报告》的免费体验,报告需人工审核,将在24小时内发送您提供的邮箱,请耐心等待,谢谢关注!客服电话:021-62391139"; + String content = "灏婃暚鐨勭敤鎴凤紝鎭枩鎮ㄨ幏寰椾簡鎴夸环缃戙�婃埧璋冩姤鍛娿�嬬殑鍏嶈垂浣撻獙锛屾姤鍛婇渶浜哄伐瀹℃牳锛屽皢鍦�24灏忔椂鍐呭彂閫佹偍鎻愪緵鐨勯偖绠憋紝璇疯�愬績绛夊緟锛岃阿璋㈠叧娉紒瀹㈡湇鐢佃瘽锛�021-62391139"; smsService.send(taste.getUserMobile(), content); } catch (Exception e) { e.printStackTrace(); @@ -907,7 +907,7 @@ public class EvaluationController { private void processOutPics(District district, EvaluationExportModel model) { // System.out.println(model.getDelPics()); - // // 删除图片 + // // 鍒犻櫎鍥剧墖 // fileService.delPics(model.getDelPics(), // FileServiceImpl.SIZE_ORIGINAL); List old_outPics = district.getOutPics(); @@ -950,7 +950,7 @@ public class EvaluationController { } /** - * 处理图片(从FS删除图片,保存新图片到FS,更新小区图片url列表) + * 澶勭悊鍥剧墖锛堜粠FS鍒犻櫎鍥剧墖锛屼繚瀛樻柊鍥剧墖鍒癋S锛屾洿鏂板皬鍖哄浘鐗噓rl鍒楄〃锛� */ private void processFloorPics(District district, EvaluationExportModel model) { @@ -993,7 +993,7 @@ public class EvaluationController { } } - // 删除图片 + // 鍒犻櫎鍥剧墖 // fileService.delPics(model.getDelPics(), // FileServiceImpl.SIZE_ORIGINAL); // @@ -1036,7 +1036,7 @@ public class EvaluationController { } /** - * 保存图片到FS + * 淇濆瓨鍥剧墖鍒癋S */ private List savePics(String districtId, List pics) { List ret = new ArrayList(pics.size()); @@ -1067,7 +1067,7 @@ public class EvaluationController { } /** - * 验证图片文件类型,目前支持gif、jpg + * 楠岃瘉鍥剧墖鏂囦欢绫诲瀷锛岀洰鍓嶆敮鎸乬if銆乯pg * * @param pic * @return diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/EvaluationPurposeAnalysisController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/EvaluationPurposeAnalysisController.java index 5be673cce..2f97239a5 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/EvaluationPurposeAnalysisController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/EvaluationPurposeAnalysisController.java @@ -20,7 +20,7 @@ import java.util.Map; /** - * 房价网1.1 用户分析 + * 鎴夸环缃�1.1 鐢ㄦ埛鍒嗘瀽 * @author zhangran * */ @@ -42,7 +42,7 @@ public class EvaluationPurposeAnalysisController { pager.getStartRow(),pager.getPageSize()); for(EvaluationPurposeAnalysis purposeAnalysis : list) { if(StringUtils.isBlank(purposeAnalysis.getLeadsSource())) { - purposeAnalysis.setLeadsSource("房价网"); + purposeAnalysis.setLeadsSource("鎴夸环缃�"); } } model.setList(list); @@ -57,7 +57,7 @@ public class EvaluationPurposeAnalysisController { model.getVisitTime(),model.getReportType(),model.getStartDate(),model.getEndDate(),0,Integer.MAX_VALUE); for(EvaluationPurposeAnalysis purposeAnalysis : list) { if(StringUtils.isBlank(purposeAnalysis.getLeadsSource())) { - purposeAnalysis.setLeadsSource("房价网"); + purposeAnalysis.setLeadsSource("鎴夸环缃�"); } } if ( list.size() > 65536) { @@ -69,7 +69,7 @@ public class EvaluationPurposeAnalysisController { response.setCharacterEncoding("UTF-8"); response.setContentType("application/octet-stream;charset=UTF-8"); - ExcelZipUtil.excuteStream(response, workbookMap, "用户分析","UserAnalysis"); + ExcelZipUtil.excuteStream(response, workbookMap, "鐢ㄦ埛鍒嗘瀽","UserAnalysis"); model.setViewType("stream"); return model; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/FjBusinessLoanController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/FjBusinessLoanController.java index bcacc4c96..f41807c41 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/FjBusinessLoanController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/FjBusinessLoanController.java @@ -49,7 +49,7 @@ public class FjBusinessLoanController { FjBusinessLoan businessLoan = model.getBusinessLoan(); if (StringUtils.isNotBlank(businessLoan.getCity())) { - businessLoan.setCitys(Arrays.asList(businessLoan.getCity().split(",|,"))); + businessLoan.setCitys(Arrays.asList(businessLoan.getCity().split(",|锛�"))); } businessLoan.setFeature(StringUtils.join(model.getFeatures(), ",")); diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/FjCarLoanController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/FjCarLoanController.java index bfdf9d12b..99635b5c2 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/FjCarLoanController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/FjCarLoanController.java @@ -50,7 +50,7 @@ public class FjCarLoanController { FjCarLoan carLoan = model.getCarLoan(); if (StringUtils.isNotBlank(carLoan.getCity())) { - carLoan.setCitys(Arrays.asList(carLoan.getCity().split(",|,"))); + carLoan.setCitys(Arrays.asList(carLoan.getCity().split(",|锛�"))); } carLoan.setFeature(StringUtils.join(model.getFeatures(), ",")); diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/FjConsumptionLoanController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/FjConsumptionLoanController.java index 062302840..7c3802b90 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/FjConsumptionLoanController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/FjConsumptionLoanController.java @@ -50,7 +50,7 @@ public class FjConsumptionLoanController { FjConsumptionLoan consumptionLoan = model.getConsumptionLoan(); if (StringUtils.isNotBlank(consumptionLoan.getCity())) { - consumptionLoan.setCitys(Arrays.asList(consumptionLoan.getCity().split(",|,"))); + consumptionLoan.setCitys(Arrays.asList(consumptionLoan.getCity().split(",|锛�"))); } consumptionLoan.setFeature(StringUtils.join(model.getFeatures(), ",")); diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/FjHouseLoanController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/FjHouseLoanController.java index 2391ee5f2..2db8d7b3b 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/FjHouseLoanController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/FjHouseLoanController.java @@ -53,7 +53,7 @@ public class FjHouseLoanController { FjHouseLoan houseLoan = model.getHouseLoan(); if (StringUtils.isNotBlank(houseLoan.getCity())) { - houseLoan.setCitys(Arrays.asList(houseLoan.getCity().split(",|,"))); + houseLoan.setCitys(Arrays.asList(houseLoan.getCity().split(",|锛�"))); } houseLoan.setFeature(StringUtils.join(model.getFeatures(), ",")); diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/FjLoanerInfoController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/FjLoanerInfoController.java index 4c801c225..9754ae17c 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/FjLoanerInfoController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/FjLoanerInfoController.java @@ -143,7 +143,7 @@ public class FjLoanerInfoController { } /** - * 给用户发送短信 + * 缁欑敤鎴峰彂閫佺煭淇� */ private void sendUserMsg(FjLoanBo productInfo, FjBaseLoan loanInfo, FjLoanOfficer officerInfo, String mobile) { String callNumber = getOfficerCallNumber(officerInfo); @@ -154,9 +154,9 @@ public class FjLoanerInfoController { StringBuffer msg = new StringBuffer(); msg.append(productInfo.getAgencyName()).append(" "); msg.append(loanInfo.getProductName()).append(" "); - msg.append("信贷员 ").append(officerInfo.getName()).append("的联系方式为").append(callNumber); + msg.append("淇¤捶鍛� ").append(officerInfo.getName()).append("鐨勮仈绯绘柟寮忎负").append(callNumber); - msg.append(" 贷款产品尽在sh.fangjia.com"); + msg.append(" 璐锋浜у搧灏藉湪sh.fangjia.com"); try { smsService.send(mobile, msg.toString()); @@ -165,7 +165,7 @@ public class FjLoanerInfoController { } /** - * 给信贷员发送短信 + * 缁欎俊璐峰憳鍙戦�佺煭淇� */ private void sendOfficerMsg(FjBaseLoan loanInfo, FjLoanOfficer officerInfo, FjLoanerInfo loanerInfo) { String mobile = getOfficerMobile(officerInfo); @@ -174,16 +174,16 @@ public class FjLoanerInfoController { } StringBuffer msg = new StringBuffer(); - msg.append(loanerInfo.getUserName()).append("(手机").append(loanerInfo.getMobile()).append(")选择了您发布的“") - .append(loanInfo.getProductName()).append("”。"); + msg.append(loanerInfo.getUserName()).append("锛堟墜鏈�").append(loanerInfo.getMobile()).append("锛夐�夋嫨浜嗘偍鍙戝竷鐨勨��") + .append(loanInfo.getProductName()).append("鈥濄��"); Evaluation evaluation = evaluationService.findEvaluationById(loanerInfo.getEvaId()); if (null != evaluation) { - msg.append("房产信息:").append(evaluation.getRegion()).append(evaluation.getDistrictName()) - .append(evaluation.getHouseNum()).append("号").append(evaluation.getRoomNum()).append("室") - .append(evaluation.getArea()).append("平米,估价").append((int) (evaluation.getTotalPrice() / 10000)) - .append("万,申请").append(loanerInfo.getLoanAmount()).append("万贷款,期限").append(loanerInfo.getLoanMonth()) - .append("个月。"); + msg.append("鎴夸骇淇℃伅锛�").append(evaluation.getRegion()).append(evaluation.getDistrictName()) + .append(evaluation.getHouseNum()).append("鍙�").append(evaluation.getRoomNum()).append("瀹�") + .append(evaluation.getArea()).append("骞崇背锛屼及浠�").append((int) (evaluation.getTotalPrice() / 10000)) + .append("涓囷紝鐢宠").append(loanerInfo.getLoanAmount()).append("涓囪捶娆撅紝鏈熼檺").append(loanerInfo.getLoanMonth()) + .append("涓湀銆�"); } try { diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/FjtArtificialController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/FjtArtificialController.java index b5eb7bd54..4c044aa1d 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/FjtArtificialController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/FjtArtificialController.java @@ -153,13 +153,13 @@ public class FjtArtificialController { fjtEvaluationService.updateEvaluation(fjtEvaluation); } - saveDistrictProcessResult(fjtEvaluation,model);//保存处理结果 - //发短信 + saveDistrictProcessResult(fjtEvaluation,model);//淇濆瓨澶勭悊缁撴灉 + //鍙戠煭淇� String content = ""; if(StringUtils.isNotBlank(userDetail.getName())){ content = userDetail.getName() +","; } - content = content + "您好!您需要处理的"+fjtEvaluation.getAddress()+",已处理完成!请在房价通中查看!"; + content = content + "鎮ㄥソ锛佹偍闇�瑕佸鐞嗙殑"+fjtEvaluation.getAddress()+",宸插鐞嗗畬鎴愶紒璇峰湪鎴夸环閫氫腑鏌ョ湅锛�"; try { smsService.send(userDetail.getMobile(), content); } catch (Exception e) { @@ -203,12 +203,12 @@ public class FjtArtificialController { FjtEvaluation fjtEvaluation = fjtEvaluationService.findEvaluationById(evaluationTask.getEvaluationId()); UsersDetail userDetail = usersDetailService.findById(evaluationTask.getUserId()); if(userDetail != null && StringUtils.isNotBlank(userDetail.getMobile())){ - //发短信 + //鍙戠煭淇� String content = ""; if(StringUtils.isNotBlank(userDetail.getName())){ content = userDetail.getName() +","; } - content = content + "您好!您需要处理的"+fjtEvaluation.getAddress()+",暂时未找到相关的信息,请仔细检查您的输入是否正确!"; + content = content + "鎮ㄥソ锛佹偍闇�瑕佸鐞嗙殑"+fjtEvaluation.getAddress()+",鏆傛椂鏈壘鍒扮浉鍏崇殑淇℃伅锛岃浠旂粏妫�鏌ユ偍鐨勮緭鍏ユ槸鍚︽纭紒"; try { smsService.send(userDetail.getMobile(), content); } catch (Exception e) { @@ -224,7 +224,7 @@ public class FjtArtificialController { } /** - * 保存人工处理结果 + * 淇濆瓨浜哄伐澶勭悊缁撴灉 * @param fjtEvaluation * @param model */ @@ -238,15 +238,15 @@ public class FjtArtificialController { cat = "office"; }else if(fjtEvaluation.getBuildType() == 3 || fjtEvaluation.getBuildType() == 8){ cat = "district"; - estateType = "普通住宅"; + estateType = "鏅�氫綇瀹�"; }else if(fjtEvaluation.getBuildType() >=4 && fjtEvaluation.getBuildType() <=7){ cat = "district"; - estateType = "别墅"; + estateType = "鍒"; } - if(cat != null) {//已知物业类型 + if(cat != null) {//宸茬煡鐗╀笟绫诲瀷 model.setDistrictName(model.getDistrictName().replaceAll("(^\\s{1,})|(\\s{1,}$)", "")); List districts = districtService.findByKey(fjtEvaluation.getCity(), model.getRegion(), model.getDistrictName(), cat); - if (districts.isEmpty()) {//如果小区不存在则入库 + if (districts.isEmpty()) {//濡傛灉灏忓尯涓嶅瓨鍦ㄥ垯鍏ュ簱 District district = new District(); district.setCity(fjtEvaluation.getCity()); district.setRegion(model.getRegion()); @@ -264,7 +264,7 @@ public class FjtArtificialController { } /** - * 为小区添加指导价 + * 涓哄皬鍖烘坊鍔犳寚瀵间环 * @param district * @param avgPrice * @param operator @@ -288,7 +288,7 @@ public class FjtArtificialController { } guidingPriceService.save(guiding); - String remark = MessageFormat.format("房价通->人工处理添加 添加人:{0}", new String[]{operator}); + String remark = MessageFormat.format("鎴夸环閫�->浜哄伐澶勭悊娣诲姞 娣诲姞浜�:{0}", new String[]{operator}); CalcCommand cmd = new CalcCommand(); cmd.setCity(district.getCity()); cmd.setRegion(district.getRegion()); @@ -349,7 +349,7 @@ public class FjtArtificialController { return model; } - //对未分配的任务进行分配 + //瀵规湭鍒嗛厤鐨勪换鍔¤繘琛屽垎閰� public Object tasksAction(EvaluationTaskModel model){ String name = (String) ActionContext.getContext().getRequest().getSession().getAttribute("realName"); List tasks = evaluationTaskService.findEvaluationTasks(null, 1, null, name, null, null, "asc", 0, 0); diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/FjtController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/FjtController.java index b379d4058..9263e325c 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/FjtController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/FjtController.java @@ -51,7 +51,7 @@ public class FjtController { private CitysService citysService; /** - * 根据角色获用户信息 + * 鏍规嵁瑙掕壊鑾风敤鎴蜂俊鎭� * @param model * @return */ @@ -72,7 +72,7 @@ public class FjtController { return model; } - /**用户管理*/ + /**鐢ㄦ埛绠$悊*/ public Object userlistAction(FjtModel model){ Pager pager = model.getPager(20); pager.setTotalRows((int) fjtUsersService.findUserCont(model.getEmail(), model.getRole(), model.getMobile())); @@ -113,7 +113,7 @@ public class FjtController { List serverAreas = serverAreaService.findAll(); List allCitys = new ArrayList(); for(ServerArea serverArea : serverAreas){ - if(!serverArea.getDisplay().equals("全国")){ + if(!serverArea.getDisplay().equals("鍏ㄥ浗")){ allCitys.add(serverArea.getDisplay()); } } @@ -124,11 +124,11 @@ public class FjtController { for (ServerArea serverArea : serverAreas) { //if(serverArea.isSupportGujia()){ if(names.contains(serverArea.getDisplay())){ - String cityInitial = StringUtil.getFirstSpell(serverArea.getSpell(), true);// 城市首字母 - List serverAreaBoList = getCachedServerAreaByInitial(serverAreaBoMap, cityInitial);// 按首字母加载城市列表 + String cityInitial = StringUtil.getFirstSpell(serverArea.getSpell(), true);// 鍩庡競棣栧瓧姣� + List serverAreaBoList = getCachedServerAreaByInitial(serverAreaBoMap, cityInitial);// 鎸夐瀛楁瘝鍔犺浇鍩庡競鍒楄〃 ServerAreaBo serverAreaBo = new ServerAreaBo(serverArea); serverAreaBoList.add(serverAreaBo); - sort(serverAreaBoList);// 字母内排序 + sort(serverAreaBoList);// 瀛楁瘝鍐呮帓搴� if(!firstWords.contains(cityInitial)){ firstWords.add(cityInitial); } @@ -163,7 +163,7 @@ public class FjtController { /** - * 城市字母内排序 + * 鍩庡競瀛楁瘝鍐呮帓搴� * * @param serverAreaBoList */ @@ -329,7 +329,7 @@ public class FjtController { model.setViewType("json"); FjtUsers user = fjtUsersService.findByEmail(model.getEmail()); if(user != null){ - model.setErrMsg("此帐号已存在!"); + model.setErrMsg("姝ゅ笎鍙峰凡瀛樺湪锛�"); } return model; @@ -413,7 +413,7 @@ public class FjtController { logs.setGoldCount(Math.abs(model.getChongzhiCount())); logs.setUserId(user.getId()); logs.setStatus(1); - logs.setContent("淘宝充值"); + logs.setContent("娣樺疂鍏呭��"); logs.setActionType(0); logs.setDateCreated(new Date()); logs.setLastUpdated(new Date()); @@ -425,7 +425,7 @@ public class FjtController { logs.setGoldCount(Math.abs(model.getZengsongCount())); logs.setUserId(user.getId()); logs.setStatus(1); - logs.setContent("淘宝充值赠送"); + logs.setContent("娣樺疂鍏呭�艰禒閫�"); logs.setActionType(0); logs.setDateCreated(new Date()); logs.setLastUpdated(new Date()); @@ -436,7 +436,7 @@ public class FjtController { logs.setGoldCount(Math.abs(model.getChexiaoCount())); logs.setUserId(user.getId()); logs.setStatus(2); - logs.setContent("系统撤消"); + logs.setContent("绯荤粺鎾ゆ秷"); logs.setActionType(0); logs.setDateCreated(new Date()); logs.setLastUpdated(new Date()); diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/FjtMenuController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/FjtMenuController.java index b0e60c326..4869aa3cf 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/FjtMenuController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/FjtMenuController.java @@ -18,7 +18,7 @@ public class FjtMenuController { private FjtMenuService fjtMenuService; private RoleMenuService roleMenuService; - /**菜单管理*/ + /**鑿滃崟绠$悊*/ public Object menulistAction(FjtmenuModel model){ List menus = fjtMenuService.findAllMenus(); model.setFjtmenus(menus); diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/FpkMenuController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/FpkMenuController.java index 0b21f685b..950c93933 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/FpkMenuController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/FpkMenuController.java @@ -18,7 +18,7 @@ public class FpkMenuController { private FpkMenuService fpkMenuService; /** - * 菜单管理 + * 鑿滃崟绠$悊 * */ public Object menulistAction(FpkMenuModel model){ List menus = fpkMenuService.findAllMenus(); diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/FpkPriceController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/FpkPriceController.java index f12ff1647..02cb8ff17 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/FpkPriceController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/FpkPriceController.java @@ -21,7 +21,7 @@ public class FpkPriceController { public Object listAction(FpkPriceModel model) { if(StringUtils.isBlank(model.getCityDisplay())) { - model.setCityDisplay("全国"); + model.setCityDisplay("鍏ㄥ浗"); } PricePredict pricePredict = pricePredictService.findPredictResult(model.getCityDisplay(), model.getCategory(), model.getRegion(),model.getKeyword()); model.setPricePredict(pricePredict); @@ -77,7 +77,7 @@ public class FpkPriceController { public Object addAction(FpkPriceModel model) { if(StringUtils.isBlank(model.getCityDisplay())) { - model.setCityDisplay("全国"); + model.setCityDisplay("鍏ㄥ浗"); } if(StringUtils.isNotBlank(model.getId())){ diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/FpkUsersController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/FpkUsersController.java index fc9af8827..b88969f84 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/FpkUsersController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/FpkUsersController.java @@ -27,7 +27,7 @@ public class FpkUsersController { static final String PASSWORD_MASK = "********"; /** - * 用户管理 + * 鐢ㄦ埛绠$悊 * */ public Object userlistAction(FpkUsersModel model){ @@ -53,7 +53,7 @@ public class FpkUsersController { List serverAreas = serverAreaService.findAll(); List allCitys = new ArrayList(); for(ServerArea serverArea : serverAreas){ - if(!serverArea.getDisplay().equals("全国")){ + if(!serverArea.getDisplay().equals("鍏ㄥ浗")){ allCitys.add(serverArea.getDisplay()); } } @@ -62,11 +62,11 @@ public class FpkUsersController { Map> serverAreaBoMap = new HashMap>(); for (ServerArea serverArea : serverAreas) { if(serverArea.isSupportGujia()){ - String cityInitial = StringUtil.getFirstSpell(serverArea.getSpell(), true);// 城市首字母 - List serverAreaBoList = getCachedServerAreaByInitial(serverAreaBoMap, cityInitial);// 按首字母加载城市列表 + String cityInitial = StringUtil.getFirstSpell(serverArea.getSpell(), true);// 鍩庡競棣栧瓧姣� + List serverAreaBoList = getCachedServerAreaByInitial(serverAreaBoMap, cityInitial);// 鎸夐瀛楁瘝鍔犺浇鍩庡競鍒楄〃 ServerAreaBo serverAreaBo = new ServerAreaBo(serverArea); serverAreaBoList.add(serverAreaBo); - sort(serverAreaBoList);// 字母内排序 + sort(serverAreaBoList);// 瀛楁瘝鍐呮帓搴� if(!firstWords.contains(cityInitial)){ firstWords.add(cityInitial); } @@ -90,7 +90,7 @@ public class FpkUsersController { /** - * 城市字母内排序 + * 鍩庡競瀛楁瘝鍐呮帓搴� * * @param serverAreaBoList */ @@ -204,7 +204,7 @@ public class FpkUsersController { model.setViewType("json"); FpkUsers user = fpkUsersService.findByName(model.getName()); if(user != null){ - model.setErrMsg("此帐号已存在!"); + model.setErrMsg("姝ゅ笎鍙峰凡瀛樺湪锛�"); } return model; } diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/FriendLinkController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/FriendLinkController.java index fbda58bc4..593052d16 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/FriendLinkController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/FriendLinkController.java @@ -29,15 +29,15 @@ public class FriendLinkController { private ServerAreaService serverAreaService; /** - * 友情链接管理列表 + * 鍙嬫儏閾炬帴绠$悊鍒楄〃 * * @param model * @return */ public Object listAction(FriendLinkModel model) { model.setServerAreasList(serverAreaService.findAll()); - if (StringUtils.isBlank(model.getCityDisplay())) {// 分城市友情链接处理 - model.setCityDisplay("上海"); + if (StringUtils.isBlank(model.getCityDisplay())) {// 鍒嗗煄甯傚弸鎯呴摼鎺ュ鐞� + model.setCityDisplay("涓婃捣"); } List links = friendLinkService.findAllByCity(model.getCityDisplay()); List friendLinkList = getFriendLinkSequence(links); @@ -46,7 +46,7 @@ public class FriendLinkController { } /** - * 全国首页友情链接 + * 鍏ㄥ浗棣栭〉鍙嬫儏閾炬帴 * * @param model * @return @@ -60,7 +60,7 @@ public class FriendLinkController { } /** - * 组装友情链接页面序列 + * 缁勮鍙嬫儏閾炬帴椤甸潰搴忓垪 * * @param links * @return @@ -199,10 +199,10 @@ public class FriendLinkController { html = getMethod.getResponseBodyAsString(); } } catch (HttpException e) { - model.setMsg("网络不正常"); + model.setMsg("缃戠粶涓嶆甯�"); return model; } catch (IOException e) { - model.setMsg("异常"); + model.setMsg("寮傚父"); return model; } @@ -215,7 +215,7 @@ public class FriendLinkController { } /** - * 删除友情链接 + * 鍒犻櫎鍙嬫儏閾炬帴 * * @param model * @return diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/HouseController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/HouseController.java index f0f81e756..174bebe11 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/HouseController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/HouseController.java @@ -32,14 +32,14 @@ import java.net.URLEncoder; import java.util.*; /** - * 二手房controller + * 浜屾墜鎴縞ontroller * * @author liupei */ public class HouseController { private final static Logger LOGGER = LoggerFactory.getLogger(HouseController.class); /** - * 二手房Service + * 浜屾墜鎴縎ervice */ private HouseService houseService; private DistrictService districtService; @@ -48,7 +48,7 @@ public class HouseController { private FilesService filesService; /** - * 列表Action + * 鍒楄〃Action * * @param model * @return @@ -82,7 +82,7 @@ public class HouseController { } /** - * 删除房源 + * 鍒犻櫎鎴挎簮 * * @param model * @return @@ -100,7 +100,7 @@ public class HouseController { } /** - * 进入更新房源页面Action + * 杩涘叆鏇存柊鎴挎簮椤甸潰Action * * @param model * @return @@ -114,7 +114,7 @@ public class HouseController { } /** - * 执行删除房源图片Action + * 鎵ц鍒犻櫎鎴挎簮鍥剧墖Action * * @param model * @return @@ -160,7 +160,7 @@ public class HouseController { } /** - * 解析房源id + * 瑙f瀽鎴挎簮id * * @param idStr * @return diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/HouseLoanController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/HouseLoanController.java index 4fffe371e..ed5a1b679 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/HouseLoanController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/HouseLoanController.java @@ -50,7 +50,7 @@ public class HouseLoanController { HouseLoan houseLoan = model.getHouseLoan(); if (StringUtils.isNotBlank(houseLoan.getCity())) { - houseLoan.setCitys(Arrays.asList(houseLoan.getCity().split(",|,"))); + houseLoan.setCitys(Arrays.asList(houseLoan.getCity().split(",|锛�"))); } houseLoan.setFeature(StringUtils.join(model.getFeatures(), ",")); diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/HouseLoudongController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/HouseLoudongController.java index 8838dc10f..cdaf95598 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/HouseLoudongController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/HouseLoudongController.java @@ -130,7 +130,7 @@ public class HouseLoudongController { } /** - * 编辑房号信息 + * 缂栬緫鎴垮彿淇℃伅 * @param model * @return * @throws UnsupportedEncodingException @@ -460,7 +460,7 @@ public class HouseLoudongController { /** - * 导出Excel,只能导出小区的房号数据 + * 瀵煎嚭Excel锛屽彧鑳藉鍑哄皬鍖虹殑鎴垮彿鏁版嵁 * @param model * @return */ @@ -475,21 +475,21 @@ public class HouseLoudongController { if (list == null || list.size() == 0) { JsonModel jsonModel = new JsonModel(); Map data = new HashMap(); - data.put("msg", "无数据"); + data.put("msg", "鏃犳暟鎹�"); jsonModel.setJsonModel(data); return jsonModel; } String fileName = city + "-" + name + "(" + DateUtils.formatDate(new Date(), "yyyyMMddHHmmss") + ").xlsx"; List> datas = new ArrayList>(); List l = new ArrayList(); - l.add("城市"); - l.add("区域"); - l.add("小区"); - l.add("楼号"); - l.add("室号"); - l.add("单元"); - l.add("面积"); - l.add("户型"); + l.add("鍩庡競"); + l.add("鍖哄煙"); + l.add("灏忓尯"); + l.add("妤煎彿"); + l.add("瀹ゅ彿"); + l.add("鍗曞厓"); + l.add("闈㈢Н"); + l.add("鎴峰瀷"); datas.add(l); for (HouseLoudong house : list) { l = new ArrayList(); @@ -510,14 +510,14 @@ public class HouseLoudongController { filePath = ExcelUtil.write(fileName, datas, "sheet"); HttpServletResponse response = ActionContext.getContext().getResponse(); response.setCharacterEncoding("UTF-8"); - //response.reset();// 清空输出流 + //response.reset();// 娓呯┖杈撳嚭娴� response.setContentType("application/x-download;charset=UTF-8"); fileName = new String(fileName.getBytes("GBK"),"ISO-8859-1"); - if(fileName.length()>150){//解决IE 6.0 bug + if(fileName.length()>150){//瑙e喅IE 6.0 bug fileName = new String(fileName.getBytes("GBK"),"ISO-8859-1"); } response.setHeader( "Content-Disposition", "attachment;filename=" + fileName); - os = response.getOutputStream();// 取得输出流 + os = response.getOutputStream();// 鍙栧緱杈撳嚭娴� inputStream = new FileInputStream(filePath); byte[] buffer = new byte[1024]; int i = -1; @@ -544,7 +544,7 @@ public class HouseLoudongController { } else { JsonModel jsonModel = new JsonModel(); Map data = new HashMap(); - data.put("msg", "请选择城市下的小区进行数据导出"); + data.put("msg", "璇烽�夋嫨鍩庡競涓嬬殑灏忓尯杩涜鏁版嵁瀵煎嚭"); jsonModel.setJsonModel(data); return jsonModel; } @@ -552,7 +552,7 @@ public class HouseLoudongController { } /** - * 保存房号信息 + * 淇濆瓨鎴垮彿淇℃伅 * @param model * @return * @throws UnsupportedEncodingException @@ -723,7 +723,7 @@ public class HouseLoudongController { } /** - * 房号信息列表查询显示 + * 鎴垮彿淇℃伅鍒楄〃鏌ヨ鏄剧ず * @param model * @return */ @@ -853,7 +853,7 @@ public class HouseLoudongController { if (StringUtils.isBlank(model.getCat())) { model.setCat("district"); } - if("全市".equals(model.getRegion())){ + if("鍏ㄥ競".equals(model.getRegion())){ model.setRegion(null); } model.setRegionList(getRegionNameList(model.getCityDisplay())); @@ -905,7 +905,7 @@ public class HouseLoudongController { List params = new ArrayList(); String city = model.getCityDisplay(); - if(StringUtils.isNotBlank(city) && !"全国".equals(city)) { + if(StringUtils.isNotBlank(city) && !"鍏ㄥ浗".equals(city)) { params.add(new QueryParam("city", city)); } if(StringUtils.isNotBlank(model.getRegion())) { diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/HouseMonitorController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/HouseMonitorController.java index 7a4172ff7..8869b9036 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/HouseMonitorController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/HouseMonitorController.java @@ -36,7 +36,7 @@ public class HouseMonitorController { model.setCategoriesX(houseSourceCountService.toChartX(dates)); if(StringUtils.isBlank(model.getCityDisplay())){ - model.setCityDisplay("全国"); + model.setCityDisplay("鍏ㄥ浗"); } @@ -50,10 +50,10 @@ public class HouseMonitorController { model.setPictrue("line"); } - if(model.getPictrue().equals("pie")){//饼图 + if(model.getPictrue().equals("pie")){//楗煎浘 Map houseMap=new HashMap(); - //增量 + //澧為噺 if(StringUtils.isNotBlank(model.getKind()) && model.getKind().equals("add")){ List houseSourceCounts1 = houseSourceCountService.findHouseBycity(dates.get(0), model.getCityDisplay(), model.getCategory(), model.getSource()); List houseSourceCounts2 = houseSourceCountService.findHouseBycity(dates.get(dates.size()-1), model.getCityDisplay(), model.getCategory(), model.getSource()); @@ -78,7 +78,7 @@ public class HouseMonitorController { model.setHouseMap(houseMap); model.setChartSeries(houseSourceCountService.createPieChartSeries2(houseMap, model.getCityDisplay(), dates, model.getSource())); - }else{//曲线图 + }else{//鏇茬嚎鍥� Map> chartDataMap = houseSourceCountService.findAllHouseCountData(dates.get(0), dates.get(dates.size()-1), model.getCityDisplay(), model.getCategory(), model.getSource(), model.getKind()); String data = createChartData2(dates, chartDataMap, model.getCategory(), model.getCityDisplay(), model.getSource(), model.getKind()); model.setChartSeries(data); @@ -119,8 +119,8 @@ public class HouseMonitorController { if(StringUtils.isNotBlank(model.getCityDisplay())){ - if(model.getCityDisplay().equals("all")||model.getCityDisplay().equals("全国")){ - model.setCityDisplay("全国"); + if(model.getCityDisplay().equals("all")||model.getCityDisplay().equals("鍏ㄥ浗")){ + model.setCityDisplay("鍏ㄥ浗"); Map dataMap = new HashMap(); @@ -128,7 +128,7 @@ public class HouseMonitorController { List houseSourceCounts = houseSourceCountService.findChartData(dates.get(dates.size()-2), dates.get(dates.size()-1), null, model.getCategory(), model.getSource()); for(HouseSourceCount house : houseSourceCounts){ - if(!house.getCity().equals("全国")&&house.getAddCount()>0){ + if(!house.getCity().equals("鍏ㄥ浗")&&house.getAddCount()>0){ dataMap.put(house.getCity(), house.getAddCount()); } } @@ -139,7 +139,7 @@ public class HouseMonitorController { List houseSourceCounts = houseSourceCountService.findHouseBycity(dates.get(dates.size()-1), null, model.getCategory(), model.getSource()); for(HouseSourceCount house : houseSourceCounts){ - if(!house.getCity().equals("全国")&&house.getTotal()>0){ + if(!house.getCity().equals("鍏ㄥ浗")&&house.getTotal()>0){ dataMap.put(house.getCity(), house.getTotal()); } } @@ -165,7 +165,7 @@ public class HouseMonitorController { List> infoIds = new ArrayList>(map.entrySet()); - //排序 + //鎺掑簭 Collections.sort(infoIds, new Comparator>() { public int compare(Map.Entry o1, Map.Entry o2) { //return (o2.getValue() - o1.getValue()); @@ -257,7 +257,7 @@ public class HouseMonitorController { } JSONObject jo = new JSONObject(); jo.put("data", "["+sb.toString()+"]"); - jo.put("name", "总增量"); + jo.put("name", "鎬诲閲�"); jo.put("marker", "{radius: 3}"); jo.put("color", "#E0E0E0"); jo.put("selected", false); diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/HouseQualityController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/HouseQualityController.java index cdbb1e153..4d5a4053f 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/HouseQualityController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/HouseQualityController.java @@ -75,29 +75,29 @@ public class HouseQualityController { } JSONObject jo = new JSONObject(); - jo.put("name", "房型数量"); + jo.put("name", "鎴垮瀷鏁伴噺"); jo.put("data", data1); result.add(jo); JSONObject jo1 = new JSONObject(); - jo1.put("name", "小于10个房源小区数"); + jo1.put("name", "灏忎簬10涓埧婧愬皬鍖烘暟"); jo1.put("data", data2); result.add(jo1); JSONObject jo2 = new JSONObject(); - jo2.put("name", "房源总量"); + jo2.put("name", "鎴挎簮鎬婚噺"); jo2.put("data", data3); result.add(jo2); JSONObject jo3 = new JSONObject(); - jo3.put("name", "匹配小区房源总量"); + jo3.put("name", "鍖归厤灏忓尯鎴挎簮鎬婚噺"); jo3.put("data", data4); result.add(jo3); JSONObject jo4 = new JSONObject(); - jo4.put("name", "小于10个房源小区占比"); + jo4.put("name", "灏忎簬10涓埧婧愬皬鍖哄崰姣�"); jo4.put("data", data5); result.add(jo4); return result.toString(); diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/HousesReportController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/HousesReportController.java index dc94b4db6..45644c2f4 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/HousesReportController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/HousesReportController.java @@ -94,7 +94,7 @@ public class HousesReportController { beforeYesterdayArrs.add(beforeYesterdayDataReason.getJobId()); } - // 今有,前无 + // 浠婃湁锛屽墠鏃� for(String dataJobId : arrs) { if(!beforeYesterdayArrs.contains(dataJobId)) { if(beforeYesterdayHousesReportMap.get("1") != null){ @@ -109,7 +109,7 @@ public class HousesReportController { } } - // 今无,前有 + // 浠婃棤锛屽墠鏈� for(String dataJobId : beforeYesterdayArrs) { if(!arrs.contains(dataJobId)) { if(beforeYesterdayHousesReportMap.get("0") != null){ @@ -145,7 +145,7 @@ public class HousesReportController { yesterdayArrs.add(yesterdayDataReason.getJobId()); } - // 今有,昨无 + // 浠婃湁锛屾槰鏃� for(String dataJobId : arrs) { if(!yesterdayArrs.contains(dataJobId)) { if(yesterdayHousesReportMap.get("1") != null){ @@ -160,7 +160,7 @@ public class HousesReportController { } } - // 今无,昨有 + // 浠婃棤锛屾槰鏈� for(String dataJobId : yesterdayArrs) { if(!arrs.contains(dataJobId)) { if(yesterdayHousesReportMap.get("0") != null){ diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ImageManagerController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ImageManagerController.java index 40e8ee197..a982c5ebb 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ImageManagerController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ImageManagerController.java @@ -71,11 +71,11 @@ public class ImageManagerController { imageManager.setModifyDate(new Date()); imageManagerService.save(imageManager); model.setResultCode(1); - model.setMsg("操作成功"); + model.setMsg("鎿嶄綔鎴愬姛"); }catch(Exception e) { e.printStackTrace(); model.setResultCode(-1); - model.setErrMsg("操作失败,请刷新页面再试"); + model.setErrMsg("鎿嶄綔澶辫触锛岃鍒锋柊椤甸潰鍐嶈瘯"); } return model; } @@ -96,11 +96,11 @@ public class ImageManagerController { } catch (Exception e) { e.printStackTrace(); model.setResultCode(-1); - model.setErrMsg("操作失败,请刷新页面再试"); + model.setErrMsg("鎿嶄綔澶辫触锛岃鍒锋柊椤甸潰鍐嶈瘯"); return model; } model.setResultCode(1); - model.setMsg("操作成功"); + model.setMsg("鎿嶄綔鎴愬姛"); return model; } diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ImportExcelController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ImportExcelController.java index eed4a40b1..909b18243 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ImportExcelController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ImportExcelController.java @@ -45,22 +45,22 @@ public class ImportExcelController extends HttpServlet { public Object expectAction(ImportExcelModel model) { List> data=new ArrayList>(); List list=new ArrayList(); - list.add("表名"); - list.add("删除"); + list.add("琛ㄥ悕"); + list.add("鍒犻櫎"); list.add("id"); - list.add("数据"); + list.add("鏁版嵁"); data.add(list); HSSFWorkbook workbook = new HSSFWorkbook(); - HSSFSheet sheet = workbook.createSheet("导入模板"); + HSSFSheet sheet = workbook.createSheet("瀵煎叆妯℃澘"); HSSFRow row = sheet.createRow(0); HSSFCell cell0 = row.createCell(0); HSSFCell cell1 = row.createCell(1); HSSFCell cell2 = row.createCell(2); HSSFCell cell3= row.createCell(3); - cell0.setCellValue("表名"); - cell1.setCellValue("操作"); + cell0.setCellValue("琛ㄥ悕"); + cell1.setCellValue("鎿嶄綔"); cell2.setCellValue("id"); - cell3.setCellValue("数据"); + cell3.setCellValue("鏁版嵁"); HttpServletResponse response = ActionContext.getContext().getResponse(); response.setCharacterEncoding("UTF-8"); response.setContentType("application/x-download;charset=UTF-8"); diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/IndexStatsController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/IndexStatsController.java index 394b7b033..300a401a1 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/IndexStatsController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/IndexStatsController.java @@ -92,7 +92,7 @@ public class IndexStatsController { HttpServletRequest request=ActionContext.getContext().getRequest(); MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; MultipartFile multipartFile = multipartRequest.getFile("filexls"); - String sourceName = multipartFile.getOriginalFilename(); // 原始文件名 + String sourceName = multipartFile.getOriginalFilename(); // 鍘熷鏂囦欢鍚� String fileTypes = sourceName.substring(sourceName.lastIndexOf(".")); diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/InputUserInfoController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/InputUserInfoController.java index 5b9cffbab..0033de53f 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/InputUserInfoController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/InputUserInfoController.java @@ -19,7 +19,7 @@ import com.fangjia.dal.mongo.model.InputUserInfo; import com.fangjia.service.mongo.fangjia.InputUserInfoService; /** - * C to B用户信息收集管理 + * C to B鐢ㄦ埛淇℃伅鏀堕泦绠$悊 * @author yinjihuan * */ @@ -39,7 +39,7 @@ public class InputUserInfoController { } /** - * 导出Excel + * 瀵煎嚭Excel * @param model * @return */ @@ -47,22 +47,22 @@ public class InputUserInfoController { OutputStream os = null; String fileName = null; if (model.getStartDate() == null || model.getEndDate() == null) { - fileName = "所有记录"+DateUtil.formatToYYYYMMDDhhmmss(new Date()) + ".xlsx"; + fileName = "鎵�鏈夎褰�"+DateUtil.formatToYYYYMMDDhhmmss(new Date()) + ".xlsx"; } else { - fileName = DateUtil.formatToTightYYYYMMDD(model.getStartDate()) + "至" + DateUtil.formatToTightYYYYMMDD(model.getEndDate()) + ".xlsx"; + fileName = DateUtil.formatToTightYYYYMMDD(model.getStartDate()) + "鑷�" + DateUtil.formatToTightYYYYMMDD(model.getEndDate()) + ".xlsx"; } List> datas = new ArrayList>(); List l = new ArrayList(); - l.add("用户ID"); - l.add("姓名"); - l.add("公司"); - l.add("职务"); - l.add("城市"); - l.add("手机"); - l.add("邮箱"); - l.add("你通过房价网估价是为了什么?"); - l.add("反馈日期"); + l.add("鐢ㄦ埛ID"); + l.add("濮撳悕"); + l.add("鍏徃"); + l.add("鑱屽姟"); + l.add("鍩庡競"); + l.add("鎵嬫満"); + l.add("閭"); + l.add("浣犻�氳繃鎴夸环缃戜及浠锋槸涓轰簡浠�涔堬紵"); + l.add("鍙嶉鏃ユ湡"); datas.add(l); List list = inputUserInfoService.list(model.getStartDate(), model.getEndDate()); for (InputUserInfo user : list) { @@ -85,14 +85,14 @@ public class InputUserInfoController { filePath = ExcelUtil.write(fileName, datas, "sheet"); HttpServletResponse response = ActionContext.getContext().getResponse(); response.setCharacterEncoding("UTF-8"); - //response.reset();// 清空输出流 + //response.reset();// 娓呯┖杈撳嚭娴� response.setContentType("application/x-download;charset=UTF-8"); fileName = new String(fileName.getBytes("GBK"),"ISO-8859-1"); - if(fileName.length()>150){//解决IE 6.0 bug + if(fileName.length()>150){//瑙e喅IE 6.0 bug fileName = new String(fileName.getBytes("GBK"),"ISO-8859-1"); } response.setHeader( "Content-Disposition", "attachment;filename=" + fileName); - os = response.getOutputStream();// 取得输出流 + os = response.getOutputStream();// 鍙栧緱杈撳嚭娴� inputStream = new FileInputStream(filePath); byte[] buffer = new byte[1024]; int i = -1; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/InquiryController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/InquiryController.java index c96fd1c20..80f8c2753 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/InquiryController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/InquiryController.java @@ -71,21 +71,21 @@ public class InquiryController { if(null != bkoffUsers.getSupportInquiryTask()){ FjtRole role = null; if(1 == bkoffUsers.getSupportInquiryTask().intValue()){ - role = fjtRoleService.findRolesByName("农行"); + role = fjtRoleService.findRolesByName("鍐滆"); }else if(2 == bkoffUsers.getSupportInquiryTask().intValue()){ - role = fjtRoleService.findRolesByName("深圳农行"); + role = fjtRoleService.findRolesByName("娣卞湷鍐滆"); }else if(3 == bkoffUsers.getSupportInquiryTask().intValue()){ - role = fjtRoleService.findRolesByName("大正评估"); + role = fjtRoleService.findRolesByName("澶ф璇勪及"); } - List zqUserIds = userCityService.findUserIdByCity("肇庆"); + List zqUserIds = userCityService.findUserIdByCity("鑲囧簡"); if(role!=null){ List users2 = fjtUsersService.findUsers(null, (int) role.getId()); if(users2.size() > 0){ for(FjtUsers vo2 : users2){ if(vo2.getRole()==12){ if(!zqUserIds.contains(vo2.getId())){ - userIds.add(vo2.getId());//农行排除肇庆农行 + userIds.add(vo2.getId());//鍐滆鎺掗櫎鑲囧簡鍐滆 } }else if(vo2.getRole()==16){ userIds.add(vo2.getId()); @@ -94,8 +94,8 @@ public class InquiryController { } } - if(role.getName().equals("深圳农行")){ - userIds.addAll(zqUserIds);//深圳新增肇庆农行 + if(role.getName().equals("娣卞湷鍐滆")){ + userIds.addAll(zqUserIds);//娣卞湷鏂板鑲囧簡鍐滆 } } } @@ -145,7 +145,7 @@ public class InquiryController { InquiryPrice inquiryPrice =inquiryPriceService.findInquiryPriceById(model.getId()); if(inquiryPrice==null) { model.setCode("-1"); - model.setMsg("更新失败:根据Id查询询价信息失败!"); + model.setMsg("鏇存柊澶辫触锛氭牴鎹甀d鏌ヨ璇环淇℃伅澶辫触锛�"); return model; } inquiryPrice.setAccountChecker(model.getAccountChecker()); @@ -243,7 +243,7 @@ public class InquiryController { return model; } - //首页查询inquirys + //棣栭〉鏌ヨinquirys public Object inquirysAction(InquiryModel model){ String name = (String) ActionContext.getContext().getRequest().getSession().getAttribute("realName"); BkoffUsers bkoffUsers = bkoffUsersService.findBkoffUsersByRealName(name); @@ -254,9 +254,9 @@ public class InquiryController { // List users = inquiryUsersService.findAllInquiryUsersByStatus(); FjtRole role = null; if(null != bkoffUsers.getSupportInquiryTask() && 1 == bkoffUsers.getSupportInquiryTask().intValue()){ - role = fjtRoleService.findRolesByName("农行"); + role = fjtRoleService.findRolesByName("鍐滆"); }else if(null != bkoffUsers.getSupportInquiryTask() && 2 == bkoffUsers.getSupportInquiryTask().intValue()){ - role = fjtRoleService.findRolesByName("深圳农行"); + role = fjtRoleService.findRolesByName("娣卞湷鍐滆"); } if(role!=null){ List userIds = new ArrayList(); @@ -330,18 +330,18 @@ public class InquiryController { } List inquiryPrices = inquiryPriceService.findinquiryPricesByIds(model.getStatus(), userIds); HSSFWorkbook wb = createExcel(inquiryPrices); - String fileName = "人工询价(" + DateUtils.formatDate(new Date(), "yyyyMMddHHmmss") + ").xls"; + String fileName = "浜哄伐璇环(" + DateUtils.formatDate(new Date(), "yyyyMMddHHmmss") + ").xls"; OutputStream os = null; try { HttpServletResponse response = ActionContext.getContext().getResponse(); response.setCharacterEncoding("UTF-8"); response.setContentType("application/x-download;charset=UTF-8"); fileName = new String(fileName.getBytes("GBK"),"ISO-8859-1"); - if(fileName.length()>150){//解决IE 6.0 bug + if(fileName.length()>150){//瑙e喅IE 6.0 bug fileName = new String(fileName.getBytes("GBK"),"ISO-8859-1"); } response.setHeader( "Content-Disposition", "attachment;filename=" + fileName); - os = response.getOutputStream();// 取得输出流 + os = response.getOutputStream();// 鍙栧緱杈撳嚭娴� wb.write(os); os.flush(); }catch(Exception e) { @@ -363,18 +363,18 @@ public class InquiryController { private HSSFWorkbook createExcel(List inquiryPrices) { HSSFWorkbook wb = new HSSFWorkbook(); HSSFSheet s = wb.createSheet(); - wb.setSheetName(0, "人工询价"); + wb.setSheetName(0, "浜哄伐璇环"); HSSFRow onerow = s.createRow(0); - fillHead(onerow);//填充头部字段 + fillHead(onerow);//濉厖澶撮儴瀛楁 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - //塞数据 + //濉炴暟鎹� for(InquiryPrice vo : inquiryPrices){ HSSFRow row = s.createRow(s.getPhysicalNumberOfRows()); FjtUsers user = fjtUsersService.findById(vo.getUserId()); String buildType = getBuildType(vo.getBuildType()); String purpose = getPurpose(vo.getPurpose()); String dateCreated = sdf.format(vo.getDateCreated()); - row.createCell(0).setCellValue(vo.getHouseAddress()+(vo.getHouseNum()==null?"":vo.getHouseNum()+"号")+(vo.getRoomNum()==null?"":vo.getRoomNum()+"室")); + row.createCell(0).setCellValue(vo.getHouseAddress()+(vo.getHouseNum()==null?"":vo.getHouseNum()+"鍙�")+(vo.getRoomNum()==null?"":vo.getRoomNum()+"瀹�")); row.createCell(1).setCellValue(user==null?"":user.getEmail()); row.createCell(2).setCellValue(vo.getArea()); row.createCell(3).setCellValue(buildType); @@ -384,19 +384,19 @@ public class InquiryController { row.createCell(7).setCellValue(vo.getPersonValue()); row.createCell(8).setCellValue(dateCreated); row.createCell(8).setCellValue(vo.getAccountChecker()); - row.createCell(9).setCellValue(vo.getStatus()==1?"已回复":"等待回复"); + row.createCell(9).setCellValue(vo.getStatus()==1?"宸插洖澶�":"绛夊緟鍥炲"); } return wb; } private String getPurpose(int purpose) { switch(purpose) { - case 1: return"抵押"; - case 2: return"资产证明"; - case 3: return"复估"; - case 4: return"了解市值"; - case 5: return"测试"; - case 6: return"其他"; + case 1: return"鎶垫娂"; + case 2: return"璧勪骇璇佹槑"; + case 3: return"澶嶄及"; + case 4: return"浜嗚В甯傚��"; + case 5: return"娴嬭瘯"; + case 6: return"鍏朵粬"; default: return ""; } } @@ -404,29 +404,29 @@ public class InquiryController { private String getBuildType(int buildType) { switch(buildType) { - case 1 : return "商铺"; - case 2 : return "写字楼"; - case 3 : return "其他"; - case 4 : return "别墅"; - case 8 : return "住宅"; + case 1 : return "鍟嗛摵"; + case 2 : return "鍐欏瓧妤�"; + case 3 : return "鍏朵粬"; + case 4 : return "鍒"; + case 8 : return "浣忓畢"; default : return ""; } } - //人工询价Excel头部字段 + //浜哄伐璇环Excel澶撮儴瀛楁 private void fillHead(HSSFRow onerow) { - onerow.createCell(0).setCellValue("物业地址"); - onerow.createCell(1).setCellValue("用户"); - onerow.createCell(2).setCellValue("面积"); - onerow.createCell(3).setCellValue("物业类型"); - onerow.createCell(4).setCellValue("询价目的"); - onerow.createCell(5).setCellValue("期望值"); - onerow.createCell(6).setCellValue("房价通估值"); - onerow.createCell(7).setCellValue("人工估值"); - onerow.createCell(8).setCellValue("询问日期"); - onerow.createCell(8).setCellValue("对账老师"); - onerow.createCell(9).setCellValue("状态"); + onerow.createCell(0).setCellValue("鐗╀笟鍦板潃"); + onerow.createCell(1).setCellValue("鐢ㄦ埛"); + onerow.createCell(2).setCellValue("闈㈢Н"); + onerow.createCell(3).setCellValue("鐗╀笟绫诲瀷"); + onerow.createCell(4).setCellValue("璇环鐩殑"); + onerow.createCell(5).setCellValue("鏈熸湜鍊�"); + onerow.createCell(6).setCellValue("鎴夸环閫氫及鍊�"); + onerow.createCell(7).setCellValue("浜哄伐浼板��"); + onerow.createCell(8).setCellValue("璇㈤棶鏃ユ湡"); + onerow.createCell(8).setCellValue("瀵硅处鑰佸笀"); + onerow.createCell(9).setCellValue("鐘舵��"); } diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/K8sController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/K8sController.java index 11a80b8a2..df5d9e8fe 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/K8sController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/K8sController.java @@ -1,7 +1,7 @@ package com.fangjia.bkoff.controllers; /** - * 房价网后台存活监控 + * 鎴夸环缃戝悗鍙板瓨娲荤洃鎺� * * @author shenjian * @since 2021/6/7 @@ -9,7 +9,7 @@ package com.fangjia.bkoff.controllers; public class K8sController { /** - * 存活检查 + * 瀛樻椿妫�鏌� * * @return */ @@ -18,7 +18,7 @@ public class K8sController { } /** - * 就绪检查 + * 灏辩华妫�鏌� * * @return */ diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/LandPriceController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/LandPriceController.java index 1cf6f4247..aa5fa8829 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/LandPriceController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/LandPriceController.java @@ -63,18 +63,18 @@ public class LandPriceController { year = model.getYears().get(0); } Map> landPriceMap = new HashMap>(); - landPriceMap.put("住宅用途", new ArrayList()); - landPriceMap.put("工业用途", new ArrayList()); - landPriceMap.put("商业用途", new ArrayList()); + landPriceMap.put("浣忓畢鐢ㄩ��", new ArrayList()); + landPriceMap.put("宸ヤ笟鐢ㄩ��", new ArrayList()); + landPriceMap.put("鍟嗕笟鐢ㄩ��", new ArrayList()); if(StringUtils.isNotBlank(year)){ landPrices = landPriceService.findAllLandPrice(model.getCityDisplay(), DateUtil.parseDate(year,"yyyy-MM-dd")); for(LandPrice landPrice : landPrices){ - if("商业用途".equals(landPrice.getPurpose())){ - landPriceMap.get("商业用途").add(landPrice); - }else if("工业用途".equals(landPrice.getPurpose())){ - landPriceMap.get("工业用途").add(landPrice); - }else if("住宅用途".equals(landPrice.getPurpose())){ - landPriceMap.get("住宅用途").add(landPrice); + if("鍟嗕笟鐢ㄩ��".equals(landPrice.getPurpose())){ + landPriceMap.get("鍟嗕笟鐢ㄩ��").add(landPrice); + }else if("宸ヤ笟鐢ㄩ��".equals(landPrice.getPurpose())){ + landPriceMap.get("宸ヤ笟鐢ㄩ��").add(landPrice); + }else if("浣忓畢鐢ㄩ��".equals(landPrice.getPurpose())){ + landPriceMap.get("浣忓畢鐢ㄩ��").add(landPrice); } } } @@ -84,8 +84,8 @@ public class LandPriceController { Collections.sort(landPrices1, new Comparator() { @Override public int compare(LandPrice o1, LandPrice o2) { - Integer level1 = Integer.valueOf(CNNMFilter.cnNumericToArabic(o1.getLevel().replaceAll("级",""), true)); - Integer level2 = Integer.valueOf(CNNMFilter.cnNumericToArabic(o2.getLevel().replaceAll("级",""), true)); + Integer level1 = Integer.valueOf(CNNMFilter.cnNumericToArabic(o1.getLevel().replaceAll("绾�",""), true)); + Integer level2 = Integer.valueOf(CNNMFilter.cnNumericToArabic(o2.getLevel().replaceAll("绾�",""), true)); return level1.compareTo(level2); } }); @@ -118,13 +118,13 @@ public class LandPriceController { List factoryLandPrices=new ArrayList(); if(landPrices!=null && landPrices.size()>0){ for(LandPrice stat:landPrices){ - if(stat.getPurpose().equals("商业用途")){ + if(stat.getPurpose().equals("鍟嗕笟鐢ㄩ��")){ shopLandPrices.add(stat); } - if(stat.getPurpose().equals("住宅用途")){ + if(stat.getPurpose().equals("浣忓畢鐢ㄩ��")){ districtLandPrices.add(stat); } - if(stat.getPurpose().equals("工业用途")){ + if(stat.getPurpose().equals("宸ヤ笟鐢ㄩ��")){ factoryLandPrices.add(stat); } } diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/LandPriceIndexController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/LandPriceIndexController.java index 1262d4ff5..cd14d5558 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/LandPriceIndexController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/LandPriceIndexController.java @@ -14,7 +14,7 @@ public class LandPriceIndexController { private LandPriceIndexService landPriceIndexService; /** - *查询 + *鏌ヨ * param y:city */ public Object listAction(LandPriceIndexModel model) { @@ -25,7 +25,7 @@ public class LandPriceIndexController { model.setYear(lastYear); } - if("全国".equals(model.getDisplay())) { + if("鍏ㄥ浗".equals(model.getDisplay())) { model.setDisplay(null); } diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/LatlngPolygonController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/LatlngPolygonController.java index 1d3384d52..5709f232a 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/LatlngPolygonController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/LatlngPolygonController.java @@ -56,7 +56,7 @@ public class LatlngPolygonController { Map data = new HashMap(); ret.setJsonModel(data); if (StringUtils.isBlank(model.getCityDisplay()) || StringUtils.isBlank(model.getCategory()) || StringUtils.isBlank(model.getName()) || StringUtils.isBlank(model.getLatlngs())) { - data.put("msg", "保存失败"); + data.put("msg", "淇濆瓨澶辫触"); return ret; } @@ -68,11 +68,11 @@ public class LatlngPolygonController { entity.setLatlngs(Arrays.asList(model.getLatlngs().split(";"))); entity.setCreationDate(new Date()); latlngPolygonService.saveLatlngPolygon(entity); - data.put("msg", "保存成功"); + data.put("msg", "淇濆瓨鎴愬姛"); } else { LatlngPolygon object = latlngPolygonService.findLatlngPolygon(model.getCityDisplay(), model.getCategory(), model.getName()); if (object != null) { - data.put("msg", "已经该类型名称存在"); + data.put("msg", "宸茬粡璇ョ被鍨嬪悕绉板瓨鍦�"); } else { Map udata = new HashMap(); if (StringUtils.isNotBlank(model.getCityDisplay())) { @@ -88,7 +88,7 @@ public class LatlngPolygonController { udata.put("latlngs", Arrays.asList(model.getLatlngs().split(";"))); } latlngPolygonService.updateLatlngPolygon(model.getId(), udata); - data.put("msg", "更新成功"); + data.put("msg", "鏇存柊鎴愬姛"); } } diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/LoanAgreementController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/LoanAgreementController.java index 7d6c9dc61..84c54bcf9 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/LoanAgreementController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/LoanAgreementController.java @@ -75,27 +75,27 @@ public class LoanAgreementController { List loanAgreements = loanAgreementService.list(model.getName(),model.getAgreementId(),model.getCardStatus(),model.getSignStatus(),model.getStartDate(),endDate, pager.getStartRow(), pager.getPageSize()); List loanAgreementVos = new ArrayList(); for(LoanAgreement l : loanAgreements) { - //过期处理 + //杩囨湡澶勭悊 expireHandle(l); LoanAgreementVo loanAgreementVo = new LoanAgreementVo(); toLoanAgreementVo(loanAgreementVo,l); loanAgreementVo.setLoanId(l.getLoanId()); - //获取最新有效的协议 并 重新整理排序 + //鑾峰彇鏈�鏂版湁鏁堢殑鍗忚 骞� 閲嶆柊鏁寸悊鎺掑簭 List ids = l.getAgreementIds(); List agreements = new ArrayList(); if(ids!=null&&ids.size()>0) { agreements = agreementService.list(ids); } - List agreementVos = new ArrayList();//列表展示4条数据 - List extraAgreementVos = new ArrayList();//点击按钮展示额外数据 + List agreementVos = new ArrayList();//鍒楄〃灞曠ず4鏉℃暟鎹� + List extraAgreementVos = new ArrayList();//鐐瑰嚮鎸夐挳灞曠ず棰濆鏁版嵁 boolean deleteAll = false; if(agreements!=null&&agreements.size()>0) { int total = agreements.size(); if(total>4) { loanAgreementVo.setShowButton(1); } - Agreement a = agreements.get(total-1);//最新的一条 + Agreement a = agreements.get(total-1);//鏈�鏂扮殑涓�鏉� LoanWithHold loanWithHold = loanWithHoldService.findByParam(a.getAgreementId(),null,null); if(loanWithHold==null){ loanAgreementVo.setWithHoldStatus(-1); @@ -103,14 +103,14 @@ public class LoanAgreementController { loanAgreementVo.setWithHoldStatus(loanWithHold.getStatus()); } getNewest(loanAgreementVo,a); - //列表协议展示处理 + //鍒楄〃鍗忚灞曠ず澶勭悊 for(int i = total;i>0;i--) { Agreement agreement = agreements.get(i-1); if(agreement.getStatus()==1){ deleteAll = true; } AgreementVo agreementVo = new AgreementVo(); - agreementVo.setAgreementName("协议"+i); + agreementVo.setAgreementName("鍗忚"+i); agreementVo.setId(agreement.getId()); agreementVo.setStatus(agreement.getStatus()); if(i>(total-4)) { @@ -130,19 +130,19 @@ public class LoanAgreementController { } /** - * 判断是否过期并处理 - * 返回true:说明是过期的(具体处不处理 不确定,可能之前已经处理过) - * 返回false:说明未过期 + * 鍒ゆ柇鏄惁杩囨湡骞跺鐞� + * 杩斿洖true锛氳鏄庢槸杩囨湡鐨勶紙鍏蜂綋澶勪笉澶勭悊 涓嶇‘瀹氾紝鍙兘涔嬪墠宸茬粡澶勭悊杩囷級 + * 杩斿洖false锛氳鏄庢湭杩囨湡 * @param l * @return */ private boolean expireHandle(LoanAgreement l) { - if(l.getConfirmTime()==null) {//废除未新建状态 + if(l.getConfirmTime()==null) {//搴熼櫎鏈柊寤虹姸鎬� return false; } - //过期检查 - if((new Date().getTime()-l.getConfirmTime().getTime())>(24*60*60*1000)) {//已过期 - if(l.getCardStatus()==0||l.getSignStatus()==0) {//存在未认证的才处理(初步判断) + //杩囨湡妫�鏌� + if((new Date().getTime()-l.getConfirmTime().getTime())>(24*60*60*1000)) {//宸茶繃鏈� + if(l.getCardStatus()==0||l.getSignStatus()==0) {//瀛樺湪鏈璇佺殑鎵嶅鐞嗭紙鍒濇鍒ゆ柇锛� loanAgreementService.invalid(l); } return true; @@ -155,21 +155,21 @@ public class LoanAgreementController { loanAgreementVo.setLoanId(l.getLoanId()); switch(l.getCardStatus()) { case 0: - loanAgreementVo.setCardStatus("未认证");break; + loanAgreementVo.setCardStatus("鏈璇�");break; case 1: - loanAgreementVo.setCardStatus("已认证");break; + loanAgreementVo.setCardStatus("宸茶璇�");break; case 2: - loanAgreementVo.setCardStatus("已失效");break; + loanAgreementVo.setCardStatus("宸插け鏁�");break; } switch(l.getSignStatus()) { case 0: - loanAgreementVo.setSignStatus("未签约");break; + loanAgreementVo.setSignStatus("鏈绾�");break; case 1: - loanAgreementVo.setSignStatus("已签约");break; + loanAgreementVo.setSignStatus("宸茬绾�");break; case 2: - loanAgreementVo.setSignStatus("已失效");break; + loanAgreementVo.setSignStatus("宸插け鏁�");break; case 3: - loanAgreementVo.setSignStatus("已拒绝");break; + loanAgreementVo.setSignStatus("宸叉嫆缁�");break; case 4: } if(l.getCardStatus()==1&&l.getSignStatus()==1) { @@ -183,7 +183,7 @@ public class LoanAgreementController { - //列表的行数据获取 对应最新的协议数据 + //鍒楄〃鐨勮鏁版嵁鑾峰彇 瀵瑰簲鏈�鏂扮殑鍗忚鏁版嵁 private void getNewest(LoanAgreementVo loanAgreementVo, Agreement a) { loanAgreementVo.setName(a.getName()); loanAgreementVo.setMobile(a.getMobile()==null?null:a.getMobile().replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2")); @@ -220,18 +220,18 @@ public class LoanAgreementController { } } - //编辑协议(agreement修改同事,LoanAgreement里面部分数据要同步下) + //缂栬緫鍗忚锛坅greement淇敼鍚屼簨锛孡oanAgreement閲岄潰閮ㄥ垎鏁版嵁瑕佸悓姝ヤ笅锛� private LoanAgreementModel editAgreement(LoanAgreementModel model) { LoanAgreement loanAgreement = loanAgreementService.findById(model.getId()); Agreement agreement = agreementService.findById(model.getAgreeId()); if(loanAgreement==null||agreement==null) { model.setCode(-1); - model.setMsg("查询失败"); + model.setMsg("鏌ヨ澶辫触"); return model; } if(expireHandle(loanAgreement)) { model.setCode(-1); - model.setMsg("协议已过期,请刷新页面获取最新协议状态。"); + model.setMsg("鍗忚宸茶繃鏈燂紝璇峰埛鏂伴〉闈㈣幏鍙栨渶鏂板崗璁姸鎬併��"); return model; } agreement.setName(model.getName()); @@ -246,16 +246,16 @@ public class LoanAgreementController { return model; } - //在原基础上添加一个协议 + //鍦ㄥ師鍩虹涓婃坊鍔犱竴涓崗璁� private LoanAgreementModel addAgreement(LoanAgreementModel model) { LoanAgreement loanAgreement = loanAgreementService.findById(model.getId()); List agreements = new ArrayList(); if(loanAgreement==null) { model.setCode(-1); - model.setMsg("查询失败"); + model.setMsg("鏌ヨ澶辫触"); return model; } - //取出最新协议 + //鍙栧嚭鏈�鏂板崗璁� List ids = loanAgreement.getAgreementIds(); if(ids!=null&&ids.size()>0) { agreements = agreementService.list(ids); @@ -263,23 +263,23 @@ public class LoanAgreementController { Agreement a = null; if(agreements!=null&&agreements.size()>0) { int total = agreements.size(); - a = agreements.get(total-1);//最新的一条 + a = agreements.get(total-1);//鏈�鏂扮殑涓�鏉� if(a.getStatus()==1) { model.setCode(-1); - model.setMsg("存在进行中的协议,无法添加新协议。请刷新页面再试。"); + model.setMsg("瀛樺湪杩涜涓殑鍗忚锛屾棤娉曟坊鍔犳柊鍗忚銆傝鍒锋柊椤甸潰鍐嶈瘯銆�"); return model; } } String name = model.getName(); double loanAmount = model.getLoanAmount(); double serviceRate = model.getServiceRate(); - //新协议原贷款编号无需新增 + //鏂板崗璁師璐锋缂栧彿鏃犻渶鏂板 loanAgreement.setAddTime(new Date()); loanAgreement.setModTime(new Date()); loanAgreement.setConfirmTime(new Date()); loanAgreement.setSignStatus(0); loanAgreement.setName(name); - //原最新的协议数据要保留下来 + //鍘熸渶鏂扮殑鍗忚鏁版嵁瑕佷繚鐣欎笅鏉� a.setId(null); a.setAddTime(new Date()); a.setAgreementId(getAgreementId()); @@ -290,9 +290,9 @@ public class LoanAgreementController { a.setServiceRate(serviceRate); a.setStatus(1); a.setName(name); - if(ids==null) {//应该必不为空 + if(ids==null) {//搴旇蹇呬笉涓虹┖ model.setCode(-1); - model.setMsg("查询协议失败,刷新页面再试"); + model.setMsg("鏌ヨ鍗忚澶辫触锛屽埛鏂伴〉闈㈠啀璇�"); return model; // ids = new ArrayList(); // ids.add(a.getId()); @@ -314,7 +314,7 @@ public class LoanAgreementController { return model; } - //添加全新的 + //娣诲姞鍏ㄦ柊鐨� private LoanAgreementModel addLoanAgreement(LoanAgreementModel model) { String name = model.getName(); double loanAmount = model.getLoanAmount(); @@ -346,24 +346,24 @@ public class LoanAgreementController { return model; } - //获取贷款编号 + //鑾峰彇璐锋缂栧彿 private String getLoanId() { StringBuilder s = new StringBuilder(); s.append("FDD").append(getNowString()).append(getRandomNum(4)); return s.toString(); } - //获取协议编号 + //鑾峰彇鍗忚缂栧彿 private String getAgreementId() { StringBuilder s = new StringBuilder(); s.append("HT").append(getNowString()).append(getRandomNum(5)); return s.toString(); } - //当前时间的年月日时分秒毫秒 + //褰撳墠鏃堕棿鐨勫勾鏈堟棩鏃跺垎绉掓绉� private String getNowString() { return DateUtil.formatByPattern(new Date(), "yyyyMMddHHmmssSSS"); } - //随机数 + //闅忔満鏁� private String getRandomNum(int digit) { Random r = new Random(); String num = ""; @@ -373,7 +373,7 @@ public class LoanAgreementController { return num; } /** - * 查询贷款协议(最新的一条) + * 鏌ヨ璐锋鍗忚锛堟渶鏂扮殑涓�鏉★級 * @return */ public Object getLoanAgreementAction(LoanAgreementModel model) { @@ -381,26 +381,26 @@ public class LoanAgreementController { String id = model.getId(); if(StringUtils.isBlank(id)) { model.setCode(-1); - model.setMsg("贷款协议Id为空,刷新页面再试"); + model.setMsg("璐锋鍗忚Id涓虹┖锛屽埛鏂伴〉闈㈠啀璇�"); return model; } LoanAgreement loanAgreement = loanAgreementService.findById(id); if(loanAgreement==null) { model.setCode(-1); - model.setMsg("查询失败"); + model.setMsg("鏌ヨ澶辫触"); return model; } LoanAgreementVo loanAgreementVo = new LoanAgreementVo(); toLoanAgreementVo(loanAgreementVo, loanAgreement); List agreements = new ArrayList(); - //取出最新协议 + //鍙栧嚭鏈�鏂板崗璁� List ids = loanAgreement.getAgreementIds(); if(ids!=null&&ids.size()>0) { agreements = agreementService.list(ids); } if(agreements!=null&&agreements.size()>0) { int total = agreements.size(); - Agreement a = agreements.get(total-1);//最新的一条 + Agreement a = agreements.get(total-1);//鏈�鏂扮殑涓�鏉� getNewest(loanAgreementVo,a); } model.setLoanAgreementVo(loanAgreementVo); @@ -409,7 +409,7 @@ public class LoanAgreementController { } /** - * 废除协议 + * 搴熼櫎鍗忚 * @param model * @return */ @@ -421,7 +421,7 @@ public class LoanAgreementController { Agreement agreement = agreementService.findById(agreeId); if(loanAgreement==null||agreement==null) { model.setCode(-1); - model.setMsg("查询失败"); + model.setMsg("鏌ヨ澶辫触"); return model; } loanAgreement.setModTime(new Date()); diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/LoanBurialPointController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/LoanBurialPointController.java index a9356e035..8fd65c4ef 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/LoanBurialPointController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/LoanBurialPointController.java @@ -67,9 +67,9 @@ public class LoanBurialPointController { HttpServletResponse response = ActionContext.getContext().getResponse(); response.setCharacterEncoding("UTF-8"); response.setContentType("application/octet-stream;charset=UTF-8"); - ExcelZipUtil.excuteStream(response, workbookMap, "评估统计管","LoanBurialPoint"); + ExcelZipUtil.excuteStream(response, workbookMap, "璇勪及缁熻绠�","LoanBurialPoint"); } catch (Exception e) { - LOGGER.error("数据导出异常", e); + LOGGER.error("鏁版嵁瀵煎嚭寮傚父", e); } model.setViewType("stream"); return model; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/LoanKnowledgeController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/LoanKnowledgeController.java index fba3c70cf..85348e3cb 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/LoanKnowledgeController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/LoanKnowledgeController.java @@ -32,7 +32,7 @@ public class LoanKnowledgeController { return model; } - // 按ID批量查询 + // 鎸塈D鎵归噺鏌ヨ List ids = StringUtil.split(model.getIds(), "[\r\n ]"); model.setKnowledgeList(loanKnowledgeService.findByIds(ids)); model.setPager(pager); diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/LoanLeadsController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/LoanLeadsController.java index b5ce58af8..9a240c2f4 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/LoanLeadsController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/LoanLeadsController.java @@ -56,7 +56,7 @@ public class LoanLeadsController { pager.setTotalRows(count); List list = loanLeadsService.listByParam(model.getQueryName(),model.getQueryValue(), model.getStartDate(), model.getEndDate(),model.getIntentType(),model.getLoanType(),pager.getStartRow(),pager.getPageSize()); - boolean executeAuth = containRole("执行人权限"); + boolean executeAuth = containRole("鎵ц浜烘潈闄�"); model.setExecuteAuth(executeAuth); if(executeAuth) { for(LoanLeads loanlead : list) { @@ -66,13 +66,13 @@ public class LoanLeadsController { loanlead.setMobile(mobile.replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2")); } if(address!=null) { - loanlead.setAddress(address.replaceAll("[0-9]|零|一|二|三|四|五|六|七|八|九|十", "*")); + loanlead.setAddress(address.replaceAll("[0-9]|闆秥涓�|浜寍涓墊鍥泑浜攟鍏瓅涓億鍏珅涔潀鍗�", "*")); } } } for(LoanLeads loanlead : list) { if(StringUtils.isBlank(loanlead.getLeads_source())) { - loanlead.setLeads_source("房价网"); + loanlead.setLeads_source("鎴夸环缃�"); } } model.setList(list); @@ -81,11 +81,11 @@ public class LoanLeadsController { return model; } - //是否含有某角色 + //鏄惁鍚湁鏌愯鑹� private boolean containRole(String role) { String userId = (String) ActionContext.getContext().getRequest().getSession().getAttribute("user_id"); if(userId!=null) { - List roles = authorityService.findUserRoles(userId);//用户下的角色 + List roles = authorityService.findUserRoles(userId);//鐢ㄦ埛涓嬬殑瑙掕壊 if(roles!=null&&roles.size()>0&&role!=null) { for(Role r : roles) { if(role.equals(r.getName())) { @@ -121,17 +121,17 @@ public class LoanLeadsController { } } List plist = new ArrayList(pset); - plist.add(0,"请选择"); + plist.add(0,"璇烽�夋嫨"); model.setPlist(plist); LoanLeads loanLeads = loanLeadsService.getById(model.getId()); - if(containRole("执行人权限")) { + if(containRole("鎵ц浜烘潈闄�")) { String mobile = loanLeads.getMobile(); String address = loanLeads.getAddress(); if(mobile!=null) { loanLeads.setMobile(mobile.replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2")); } if(address!=null) { - loanLeads.setAddress(address.replaceAll("[0-9]|零|一|二|三|四|五|六|七|八|九|十", "*")); + loanLeads.setAddress(address.replaceAll("[0-9]|闆秥涓�|浜寍涓墊鍥泑浜攟鍏瓅涓億鍏珅涔潀鍗�", "*")); } } model.setLoanLeads(loanLeads); @@ -150,14 +150,14 @@ public class LoanLeadsController { public Object batchDeleteAction(LoanLeadsModel model) { model.setViewType("json"); if (model.getIds().length == 0) { - model.setMsg("参数错误"); + model.setMsg("鍙傛暟閿欒"); } else { for (int i = 0; i < model.getIds().length; i++) { LoanLeads loanLeads = loanLeadsService.getById(model.getIds()[i]); loanLeads.setFlag(0); loanLeadsService.update(loanLeads); } - model.setMsg("删除成功"); + model.setMsg("鍒犻櫎鎴愬姛"); } return model; } @@ -194,10 +194,10 @@ public class LoanLeadsController { } LoanLeads oldLoanLeads = loanLeadsService.getById(model.getId()); if(oldLoanLeads!=null) { - if(loanLeads.getMobile()!=null&&loanLeads.getMobile().contains("*")) {//含*视为未改 + if(loanLeads.getMobile()!=null&&loanLeads.getMobile().contains("*")) {//鍚�*瑙嗕负鏈敼 loanLeads.setMobile(oldLoanLeads.getMobile()); } - if(loanLeads.getAddress()!=null&&loanLeads.getAddress().contains("*")) {//含*视为未改 + if(loanLeads.getAddress()!=null&&loanLeads.getAddress().contains("*")) {//鍚�*瑙嗕负鏈敼 loanLeads.setAddress(oldLoanLeads.getAddress()); } } @@ -234,7 +234,7 @@ public class LoanLeadsController { HttpServletResponse response = ActionContext.getContext().getResponse(); response.setCharacterEncoding("UTF-8"); response.setContentType("application/octet-stream;charset=UTF-8"); - ExcelZipUtil.excuteStream(response, workbookMap, "贷款线索","LoanLeads"); + ExcelZipUtil.excuteStream(response, workbookMap, "璐锋绾跨储","LoanLeads"); } catch (Exception e) { e.printStackTrace(); } @@ -247,13 +247,13 @@ public class LoanLeadsController { public Object updateIntentCustomerAction(LoanLeadsModel model) { LoanLeads loanLeads = loanLeadsService.getById(model.getId()); if (loanLeads == null) { - model.setMsg("更新失败"); + model.setMsg("鏇存柊澶辫触"); return model; } else { loanLeads.setIntentCustomer(model.getIntentCustomer()); loanLeadsService.update(loanLeads); - model.setMsg("更新成功"); + model.setMsg("鏇存柊鎴愬姛"); } model.setViewType("json"); return model; @@ -264,7 +264,7 @@ public class LoanLeadsController { public Object updateVisitValueAction(LoanLeadsModel model) { LoanLeads loanLeads = loanLeadsService.getById(model.getId()); if (loanLeads == null || model.getUpdateVal() == 1) { - model.setMsg("库中无此ID对应的贷款线索"); + model.setMsg("搴撲腑鏃犳ID瀵瑰簲鐨勮捶娆剧嚎绱�"); } else { Map updateMap = loanLeads.getReturnVisit(); @@ -274,7 +274,7 @@ public class LoanLeadsController { updateMap.put(model.getUpdateName(),model.getUpdateVal()); loanLeads.setReturnVisit(updateMap); loanLeadsService.update(loanLeads); - model.setMsg("更新成功"); + model.setMsg("鏇存柊鎴愬姛"); } model.setViewType("json"); return model; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/LoanProductController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/LoanProductController.java index eb5dfdcef..bd058f9c6 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/LoanProductController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/LoanProductController.java @@ -46,9 +46,9 @@ public class LoanProductController { model.getStartDate(), endDate)); List LoanProductModel = loanProductService.findAllLoanProduct(model.getName(), "-1".equals(model.getType())?null:model.getType(), model.getStartDate(), endDate, pager.getStartRow(), pager.getPageSize()); - List loanProductTagList = loanProductTagService.listTag(null);// 所有标签 - List mechanismList = mechanismService.findAllMechanism();// 所有合作机构 - LoanProductPositionEnum[] positionList = LoanProductPositionEnum.values();// 所有投放位置 + List loanProductTagList = loanProductTagService.listTag(null);// 鎵�鏈夋爣绛� + List mechanismList = mechanismService.findAllMechanism();// 鎵�鏈夊悎浣滄満鏋� + LoanProductPositionEnum[] positionList = LoanProductPositionEnum.values();// 鎵�鏈夋姇鏀句綅缃� Map loanProductTagMap = loanProductTagListToMap(loanProductTagList); Map mechanismMap = mechanismListToMap(mechanismList); Map positionMap = positionListToMap(positionList); @@ -79,13 +79,13 @@ public class LoanProductController { e.printStackTrace(); } } - model.setLoanProductType(Arrays.asList("信用贷", "房抵贷")); + model.setLoanProductType(Arrays.asList("淇$敤璐�", "鎴挎姷璐�")); model.setLoanProductDtoList(loanProductDtoList); return model; } public Object addAction(LoanProductModel model) { - model.setLoanProductType(Arrays.asList("信用贷", "房抵贷")); + model.setLoanProductType(Arrays.asList("淇$敤璐�", "鎴挎姷璐�")); model.setLoanProductTagList(loanProductTagService.listTag(null)); model.setMechanismList(mechanismService.findAllMechanism()); model.setPositionList(LoanProductPositionEnum.values()); @@ -99,11 +99,11 @@ public class LoanProductController { } catch (Exception e) { e.printStackTrace(); model.setResultCode(-1); - model.setErrMsg("操作失败,请刷新页面再试"); + model.setErrMsg("鎿嶄綔澶辫触锛岃鍒锋柊椤甸潰鍐嶈瘯"); return model; } model.setResultCode(1); - model.setMsg("操作成功"); + model.setMsg("鎿嶄綔鎴愬姛"); return model; } @@ -111,7 +111,7 @@ public class LoanProductController { LoanProduct loanProduct = loanProductService.findById(model.getId()); model.setLoanProduct(loanProduct); - model.setLoanProductType(Arrays.asList("信用贷", "房抵贷")); + model.setLoanProductType(Arrays.asList("淇$敤璐�", "鎴挎姷璐�")); model.setLoanProductTagList(loanProductTagService.listTag(null)); model.setMechanismList(mechanismService.findAllMechanism()); model.setPositionList(LoanProductPositionEnum.values()); @@ -125,11 +125,11 @@ public class LoanProductController { loanProductService.update(toLoanProductEntity(model)); } catch (Exception e) { model.setResultCode(-1); - model.setErrMsg("操作失败,请刷新页面再试"); + model.setErrMsg("鎿嶄綔澶辫触锛岃鍒锋柊椤甸潰鍐嶈瘯"); return model; } model.setResultCode(1); - model.setMsg("操作成功"); + model.setMsg("鎿嶄綔鎴愬姛"); return model; } diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/LoanPushController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/LoanPushController.java index a10927ffc..a82243a3e 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/LoanPushController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/LoanPushController.java @@ -16,7 +16,7 @@ import java.util.List; /** * Created by luoxf on 2018/12/17. - * 贷款推送 + * 璐锋鎺ㄩ�� */ public class LoanPushController { @@ -59,7 +59,7 @@ public class LoanPushController { LoanPush loanPush = loanPushService.getByPhone(model.getPhone()); if (loanPush != null) { model.setResult(1); - model.setMsg("手机号有重复,建议进行人工记录与处理"); + model.setMsg("鎵嬫満鍙锋湁閲嶅锛屽缓璁繘琛屼汉宸ヨ褰曚笌澶勭悊"); return true; } return false; @@ -99,25 +99,25 @@ public class LoanPushController { String id = model.getId(); if (StringUtils.isBlank(id)) { model.setResult(1); - model.setMsg("id为空,刷新页面再试"); + model.setMsg("id涓虹┖锛屽埛鏂伴〉闈㈠啀璇�"); return model; } LoanPush loanPush = loanPushService.getById(id); if (loanPush == null) { model.setResult(1); - model.setMsg("查询失败"); + model.setMsg("鏌ヨ澶辫触"); return model; } if (model.getXsyPush() == 1 && loanPush.getXsyPushFlag()!=1) { - if (!"北京".equals(loanPush.getCity()) && !"上海".equals(loanPush.getCity()) - && !"广州".equals(loanPush.getCity()) && !"深圳".equals(loanPush.getCity())) { + if (!"鍖椾含".equals(loanPush.getCity()) && !"涓婃捣".equals(loanPush.getCity()) + && !"骞垮窞".equals(loanPush.getCity()) && !"娣卞湷".equals(loanPush.getCity())) { model.setResult(1); - model.setMsg("小神鱼线索需求城市不符合条件"); + model.setMsg("灏忕楸肩嚎绱㈤渶姹傚煄甯備笉绗﹀悎鏉′欢"); return model; } if (loanPush.getMoney() < 50000) { model.setResult(1); - model.setMsg("小神鱼需求金额需为50000及50000以上"); + model.setMsg("灏忕楸奸渶姹傞噾棰濋渶涓�50000鍙�50000浠ヤ笂"); return model; } } diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/LoanWithHoldController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/LoanWithHoldController.java index 132899c2e..5826d775d 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/LoanWithHoldController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/LoanWithHoldController.java @@ -38,7 +38,7 @@ import com.yeepay.g3.sdk.yop.client.YopRequest; import com.yeepay.g3.sdk.yop.client.YopResponse; /** - * 代扣管理 + * 浠f墸绠$悊 * @author Administrator * */ @@ -65,18 +65,18 @@ public class LoanWithHoldController { } private Map bankMap = new HashMap(){{ - put("中国工商银行", 5000); - put("中国农业银行", 1250); - put("中国建设银行", 1250); - put("招商银行",950); - put("中国邮政储蓄银行",5000); - put("中国交通银行",950); - put("广发银行",1800); - put("中国光大银行",700); - put("兴业银行",50000); - put("平安银行",50000); - put("浦东发展银行",950); - put("北京银行",200000); + put("涓浗宸ュ晢閾惰", 5000); + put("涓浗鍐滀笟閾惰", 1250); + put("涓浗寤鸿閾惰", 1250); + put("鎷涘晢閾惰",950); + put("涓浗閭斂鍌ㄨ搫閾惰",5000); + put("涓浗浜ら�氶摱琛�",950); + put("骞垮彂閾惰",1800); + put("涓浗鍏夊ぇ閾惰",700); + put("鍏翠笟閾惰",50000); + put("骞冲畨閾惰",50000); + put("娴︿笢鍙戝睍閾惰",950); + put("鍖椾含閾惰",200000); }}; public Object listAction(LoanWithHoldModel model) { @@ -133,7 +133,7 @@ public class LoanWithHoldController { } /** - * 贷款协议列表批量添加至代扣管理 + * 璐锋鍗忚鍒楄〃鎵归噺娣诲姞鑷充唬鎵g鐞� * @param model * @return */ @@ -142,7 +142,7 @@ public class LoanWithHoldController { int rightNum = 0; int errorNum = 0; if (model.getIds().length == 0) { - model.setMsg("参数错误"); + model.setMsg("鍙傛暟閿欒"); } else { for (int i = 0; i < model.getIds().length; i++) { LoanAgreement loanAgreement = loanAgreementService.findById(model.getIds()[i]); @@ -157,7 +157,7 @@ public class LoanWithHoldController { rightNum++; LoanWithHold loanWithHold = new LoanWithHold(); loanWithHold.setLoanId(loanAgreement.getLoanId()); - //获取最新有效的协议 并 重新整理排序 + //鑾峰彇鏈�鏂版湁鏁堢殑鍗忚 骞� 閲嶆柊鏁寸悊鎺掑簭 List ids = loanAgreement.getAgreementIds(); List agreements = new ArrayList(); if(ids!=null&&ids.size()>0) { @@ -165,7 +165,7 @@ public class LoanWithHoldController { } if(agreements!=null&&agreements.size()>0) { int total = agreements.size(); - Agreement agreement = agreements.get(total-1);//最新的一条 + Agreement agreement = agreements.get(total-1);//鏈�鏂扮殑涓�鏉� loanWithHoldService.deleteByAgreementId(agreement.getAgreementId()); getNewest(loanWithHold,agreement); } @@ -173,20 +173,20 @@ public class LoanWithHoldController { loanAgreementService.update(loanAgreement); loanWithHoldService.save(loanWithHold); } - model.setMsg("添加成功"+rightNum+"条,失败"+errorNum+"条"); + model.setMsg("娣诲姞鎴愬姛"+rightNum+"鏉�,澶辫触"+errorNum+"鏉�"); } return model; } /** - * 批量删除代扣管理 + * 鎵归噺鍒犻櫎浠f墸绠$悊 * @param model * @return */ public Object batchDeleteAction(LoanWithHoldModel model) { model.setViewType("json"); if (model.getIds().length == 0) { - model.setMsg("请选择代扣协议"); + model.setMsg("璇烽�夋嫨浠f墸鍗忚"); } else { int count = 0; for (int i = 0; i < model.getIds().length; i++) { @@ -201,13 +201,13 @@ public class LoanWithHoldController { } } } - model.setMsg("成功删除"+count+"条"); + model.setMsg("鎴愬姛鍒犻櫎"+count+"鏉�"); } return model; } /** - * 修改实际放款金额 + * 淇敼瀹為檯鏀炬閲戦 * @param model * @return */ @@ -220,7 +220,7 @@ public class LoanWithHoldController { } /** - * 查询代扣协议 + * 鏌ヨ浠f墸鍗忚 * @return */ public Object getLoanWithHoldAction(LoanWithHoldModel model) { @@ -228,13 +228,13 @@ public class LoanWithHoldController { String id = model.getId(); if(StringUtils.isBlank(id)) { model.setCode(-1); - model.setMsg("代扣协议Id为空,刷新页面再试"); + model.setMsg("浠f墸鍗忚Id涓虹┖锛屽埛鏂伴〉闈㈠啀璇�"); return model; } LoanWithHold loanWithHold = loanWithHoldService.findById(id); if(loanWithHold==null) { model.setCode(-1); - model.setMsg("查询失败"); + model.setMsg("鏌ヨ澶辫触"); return model; } LoanWithHoldVo loanWithHoldVo = new LoanWithHoldVo(); @@ -250,7 +250,7 @@ public class LoanWithHoldController { } /** - * 通过协议编号查询代扣协议 + * 閫氳繃鍗忚缂栧彿鏌ヨ浠f墸鍗忚 * @return */ public Object getLoanWithHoldByLoanAgreementIdAction(LoanWithHoldModel model) { @@ -261,7 +261,7 @@ public class LoanWithHoldController { if(StringUtils.isBlank(loanAgreement.getWithHoldId())){ LoanWithHold loanWithHold = new LoanWithHold(); loanWithHold.setLoanId(loanAgreement.getLoanId()); - //获取最新有效的协议 并 重新整理排序 + //鑾峰彇鏈�鏂版湁鏁堢殑鍗忚 骞� 閲嶆柊鏁寸悊鎺掑簭 List ids = loanAgreement.getAgreementIds(); List agreements = new ArrayList(); if(ids!=null&&ids.size()>0) { @@ -269,7 +269,7 @@ public class LoanWithHoldController { } if(agreements!=null&&agreements.size()>0) { int total = agreements.size(); - Agreement agreement = agreements.get(total-1);//最新的一条 + Agreement agreement = agreements.get(total-1);//鏈�鏂扮殑涓�鏉� loanWithHoldVo.setLoanId(loanAgreement.getLoanId()); loanWithHoldVo.setName(agreement.getName()); loanWithHoldVo.setMobile(agreement.getMobile()); @@ -290,7 +290,7 @@ public class LoanWithHoldController { LoanWithHold loanWithHold = loanWithHoldService.findByParam(null,null,loanAgreement.getWithHoldId()); if(loanWithHold==null) { model.setCode(-1); - model.setMsg("查询失败"); + model.setMsg("鏌ヨ澶辫触"); return model; } BeanUtils.copyProperties(loanWithHold, loanWithHoldVo); @@ -303,7 +303,7 @@ public class LoanWithHoldController { return model; } - //列表的行数据获取 对应最新的协议数据 + //鍒楄〃鐨勮鏁版嵁鑾峰彇 瀵瑰簲鏈�鏂扮殑鍗忚鏁版嵁 private void getNewest(LoanWithHold loanWithHold, Agreement agreement) { loanWithHold.setMobile(agreement.getMobile()); loanWithHold.setAgreementId(agreement.getAgreementId()); @@ -314,7 +314,7 @@ public class LoanWithHoldController { loanWithHold.setWithHoldId(getWithHoldId()); loanWithHold.setAddTime(new Date()); loanWithHold.setUpdateTime(new Date()); - loanWithHold.setStatus(0);//等待代扣 + loanWithHold.setStatus(0);//绛夊緟浠f墸 } private void wrapParam(LoanWithHoldVo loanWithHoldVo, Agreement agreement) { @@ -324,18 +324,18 @@ public class LoanWithHoldController { loanWithHoldVo.setBank(agreement.getBank()); } - //获取代扣编号 + //鑾峰彇浠f墸缂栧彿 private String getWithHoldId() { StringBuilder s = new StringBuilder(); s.append("DK").append(getNowString()).append(getRandomNum(6)); return s.toString(); } - //当前时间的年月日时分秒毫秒 + //褰撳墠鏃堕棿鐨勫勾鏈堟棩鏃跺垎绉掓绉� private String getNowString() { return DateUtil.formatByPattern(new Date(), "yyyyMMddHHmmssSSS"); } - //随机数 + //闅忔満鏁� private String getRandomNum(int digit) { Random r = new Random(); String num = ""; @@ -346,7 +346,7 @@ public class LoanWithHoldController { } /** - * 代扣 + * 浠f墸 * @param model * @return */ @@ -357,52 +357,52 @@ public class LoanWithHoldController { LOGGER.error("loanWithHold id "+model.getId()); if(loanWithHold==null){ map.put("success", false); - map.put("msg", "参数错误"); + map.put("msg", "鍙傛暟閿欒"); return JsonUtils.toJson(map); }else if(loanWithHold.getAmount()==0){ map.put("success", false); - map.put("msg", "请填写代扣金额"); + map.put("msg", "璇峰~鍐欎唬鎵i噾棰�"); return JsonUtils.toJson(map); } Agreement agreement = agreementService.findByAgreementId(loanWithHold.getAgreementId()); LOGGER.error("loanWithHold agreeementId "+loanWithHold.getAgreementId()); if(agreement == null){ map.put("success", false); - map.put("msg", "参数错误"); + map.put("msg", "鍙傛暟閿欒"); return JsonUtils.toJson(map); } - int status = 0; //订单状态 0-等待代扣,1-代扣成功,2-代扣失败,3-处理中,4-超时失败,5-系统异常 - String yborderid = ""; //易宝支付流水号 + int status = 0; //璁㈠崟鐘舵�� 0-绛夊緟浠f墸,1-浠f墸鎴愬姛,2-浠f墸澶辫触,3-澶勭悊涓�,4-瓒呮椂澶辫触,5-绯荤粺寮傚父 + String yborderid = ""; //鏄撳疂鏀粯娴佹按鍙� Map resultMap = withHold(agreement,loanWithHold,response,req); if(resultMap != null){ if(resultMap.get("status")!=null){ if("PAY_FAIL".equals(resultMap.get("status").toString())){ map.put("success", false); - map.put("msg", "支付失败"); + map.put("msg", "鏀粯澶辫触"); status = 2; }else if("PROCESSING".equals(resultMap.get("status").toString())){ map.put("success", false); - map.put("msg", "处理中"); + map.put("msg", "澶勭悊涓�"); status = 3; }else if("TIME_OUT".equals(resultMap.get("status").toString())){ map.put("success", false); - map.put("msg", "超时失败"); + map.put("msg", "瓒呮椂澶辫触"); status = 4; }else if("FAIL".equals(resultMap.get("status").toString())){ map.put("success", false); - map.put("msg", "系统异常"); + map.put("msg", "绯荤粺寮傚父"); status = 5; } yborderid = resultMap.get("yborderid").toString(); }else{ LOGGER.error("doWithHoldAction status is null"); map.put("success", false); - map.put("msg", "支付失败"); + map.put("msg", "鏀粯澶辫触"); } }else{ LOGGER.error("doWithHoldAction resultMap is null"); map.put("success", false); - map.put("msg", "支付失败"); + map.put("msg", "鏀粯澶辫触"); } loanWithHold.setStatus(status); loanWithHold.setYborderid(yborderid); @@ -411,13 +411,13 @@ public class LoanWithHoldController { } catch (Exception e) { LOGGER.error("doWithHoldAction Exception:"+e); map.put("success", false); - map.put("msg", "支付失败"); + map.put("msg", "鏀粯澶辫触"); } return JsonUtils.toJson(map); } /** - * 代扣交易接口 + * 浠f墸浜ゆ槗鎺ュ彛 * @param request * @param response * @return @@ -434,10 +434,10 @@ public class LoanWithHoldController { } LOGGER.error("yoprequest param:"+yoprequest.getParams()); LOGGER.error("request url:"+BkoffConfig.getConfig().get("authbindcardreqUri","/rest/v1.0/paperorder/unified/pay")); - //向YOP发请求 + //鍚慪OP鍙戣姹� YopResponse yopresponse = YopClient3.postRsa(BkoffConfig.getConfig().get("authbindcardreqUri","/rest/v1.0/paperorder/unified/pay"), yoprequest); LOGGER.error("yoprequest result:"+yopresponse); - //成功则进行相关处理 + //鎴愬姛鍒欒繘琛岀浉鍏冲鐞� Map result = new HashMap(); if (yopresponse.getStringResult() != null) { result = JXMConvertUtil.JsonConvertHashMap(yopresponse.getStringResult()); @@ -446,19 +446,19 @@ public class LoanWithHoldController { } /** - * 封装绑卡验证参数 - * acc_no 银行卡卡号 - * id_card 身份证号码 - * id_holder 姓名 - * mobile 银行预留手机号 + * 灏佽缁戝崱楠岃瘉鍙傛暟 + * acc_no 閾惰鍗″崱鍙� + * id_card 韬唤璇佸彿鐮� + * id_holder 濮撳悕 + * mobile 閾惰棰勭暀鎵嬫満鍙� */ private Map wrapBindParams(Agreement agreement,LoanWithHold loanWithHold){ - String merchantno = format(BkoffConfig.getConfig().get("merchantno","10000469946")); //商户编号 - String requestno = UUID.randomUUID().toString().replace("-", ""); //业务请求号 + String merchantno = format(BkoffConfig.getConfig().get("merchantno","10000469946")); //鍟嗘埛缂栧彿 + String requestno = UUID.randomUUID().toString().replace("-", ""); //涓氬姟璇锋眰鍙� - String identityid = format(agreement.getNumber()); //用户标识 - String identitytype = "ID_CARD"; //用户标识类型 - String issms = "false"; //是否有短信验证码 + String identityid = format(agreement.getNumber()); //鐢ㄦ埛鏍囪瘑 + String identitytype = "ID_CARD"; //鐢ㄦ埛鏍囪瘑绫诲瀷 + String issms = "false"; //鏄惁鏈夌煭淇¢獙璇佺爜 String requesttime = DateUtil.formatByPattern(new Date(),"yyyy-MM-dd HH:mm:ss");; String bankNumber = agreement.getCardNumber(); LOGGER.error("loanWithHold bankNumber "+agreement.getCardNumber()); @@ -468,21 +468,21 @@ public class LoanWithHoldController { map.put("issms", issms); map.put("identityid", identityid); map.put("identitytype", identitytype); - map.put("cardtop", bankNumber.substring(0, 6)); //卡号前六位 - map.put("cardlast", bankNumber.substring(bankNumber.length()-4, bankNumber.length())); //卡号后四位 - map.put("amount", String.valueOf(loanWithHold.getAmount())); //还款金额 - map.put("avaliabletime", "60"); //有效期(默认1小时) + map.put("cardtop", bankNumber.substring(0, 6)); //鍗″彿鍓嶅叚浣� + map.put("cardlast", bankNumber.substring(bankNumber.length()-4, bankNumber.length())); //鍗″彿鍚庡洓浣� + map.put("amount", String.valueOf(loanWithHold.getAmount())); //杩樻閲戦 + map.put("avaliabletime", "60"); //鏈夋晥鏈燂紙榛樿1灏忔椂锛� LOGGER.error("cardtop "+bankNumber.substring(0, 6)); LOGGER.error("cardlast "+bankNumber.substring(bankNumber.length()-4, bankNumber.length())); - map.put("productname", "贷款手续费"); //商品名称 - map.put("callbackurl", "http://www.fangjia.com/withHold/yeepayCallBack"); //回调地址 - map.put("requesttime", requesttime); //请求时间 yyyy-MM-dd HH:mm:ss + map.put("productname", "璐锋鎵嬬画璐�"); //鍟嗗搧鍚嶇О + map.put("callbackurl", "http://www.fangjia.com/withHold/yeepayCallBack"); //鍥炶皟鍦板潃 + map.put("requesttime", requesttime); //璇锋眰鏃堕棿 yyyy-MM-dd HH:mm:ss if(bankMap.get(agreement.getBank())!=null && bankMap.get(agreement.getBank())>=loanWithHold.getAmount()){ - map.put("terminalno", "SQKKSCENE10"); //终端标识码-代扣 + map.put("terminalno", "SQKKSCENE10"); //缁堢鏍囪瘑鐮�-浠f墸 }else{ - map.put("terminalno", "SQKKSCENEKJ010"); //终端标识码-快捷 + map.put("terminalno", "SQKKSCENEKJ010"); //缁堢鏍囪瘑鐮�-蹇嵎 } return map; } diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/LoginController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/LoginController.java index a51c6999c..b9849fa2d 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/LoginController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/LoginController.java @@ -48,7 +48,7 @@ public class LoginController { String userId=user.getId(); List userRoles = this.userRoleDao.findAllByParams(Arrays.asList(new QueryParam("userId", userId))); if(userRoles.isEmpty()){ - model.setMsg("用户信息错误!请联系管理员!"); + model.setMsg("鐢ㄦ埛淇℃伅閿欒锛佽鑱旂郴绠$悊鍛橈紒"); return model.forward("index"); }else{ List roleIds=new ArrayList(userRoles.size()); @@ -58,7 +58,7 @@ public class LoginController { List roles = roleDao.findAllByIds(roleIds); for(Role role : roles){ - if(role.getName().equals("数据编辑角色")){ + if(role.getName().equals("鏁版嵁缂栬緫瑙掕壊")){ ActionContext.getContext().getRequest().getSession().setAttribute("showWindow", "true"); break; } @@ -78,9 +78,9 @@ public class LoginController { ActionContext.getContext().getRequest().getSession().setAttribute(user.getId() + "_resources", resources); } String ip = AnalyticsUtil.getIpAddress(ActionContext.getContext().getRequest()); - LOGGER.info("【登录系统】名称:{},登录IP:{},登陆时间:{}", new Object[]{user.getRealName(), ip, DateUtil.formatByPattern(new Date(), "yyyy年MM月dd日HH:mm:ss")}); + LOGGER.info("銆愮櫥褰曠郴缁熴�戝悕绉�:{},鐧诲綍IP:{},鐧婚檰鏃堕棿:{}", new Object[]{user.getRealName(), ip, DateUtil.formatByPattern(new Date(), "yyyy骞碝M鏈坉d鏃H:mm:ss")}); if (user.getPassword().equals(DigestUtils.md5Hex("111111"))) { - model.flash().setAttribute("message", "您的密码过于简单,请更换密码!"); + model.flash().setAttribute("message", "鎮ㄧ殑瀵嗙爜杩囦簬绠�鍗曪紝璇锋洿鎹㈠瘑鐮侊紒"); return model.redirect("/users/selfEdit"); } else { String forward = StringUtils.defaultIfEmpty(model.getForward(), "/"); @@ -92,7 +92,7 @@ public class LoginController { } } else { - model.setMsg("用户名或密码错误!"); + model.setMsg("鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒锛�"); return model.forward("index"); } } @@ -102,7 +102,7 @@ public class LoginController { } /** - * 注销 + * 娉ㄩ攢 * * @return */ diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/LosePropertyController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/LosePropertyController.java index d7014c4c1..5d6924dbf 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/LosePropertyController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/LosePropertyController.java @@ -28,7 +28,7 @@ public class LosePropertyController { private LosePropertyService losePropertyService; - private String[] EXCEL_TITLE_LABEL = new String[]{"城市", "区域", "漏抓小区", "漏抓网站", "网址", "问题反馈人", "创建日期", "状态", "处理人", "技术反馈结果", "备注", "处理时间"}; + private String[] EXCEL_TITLE_LABEL = new String[]{"鍩庡競", "鍖哄煙", "婕忔姄灏忓尯", "婕忔姄缃戠珯", "缃戝潃", "闂鍙嶉浜�", "鍒涘缓鏃ユ湡", "鐘舵��", "澶勭悊浜�", "鎶�鏈弽棣堢粨鏋�", "澶囨敞", "澶勭悊鏃堕棿"}; public LosePropertyModel listAction(LosePropertyModel model) { Pager pager = model.getPager(20); @@ -48,7 +48,7 @@ public class LosePropertyController { List list = losePropertyService.findAll(model.getCityDisplay(), model.getName(), model.getWebsite(), model.getStartDate(), model.getEndDate(), model.getStatus(), null, new ArrayList()); Workbook wb = new SXSSFWorkbook(); - Sheet sheet = wb.createSheet("漏抓小区"); + Sheet sheet = wb.createSheet("婕忔姄灏忓尯"); Row row = sheet.createRow(0); for(int i = 0; i < EXCEL_TITLE_LABEL.length; i ++){ row.createCell(i).setCellValue(EXCEL_TITLE_LABEL[i]); @@ -66,11 +66,11 @@ public class LosePropertyController { row.createCell(rowNum++).setCellValue(loseProperty.getDiscoverer()); row.createCell(rowNum++).setCellValue(DateUtil.formatByPattern(loseProperty.getCreatedDate(), "yyyy-MM-dd HH:mm:ss")); if(loseProperty.getStatus() == 0){ - row.createCell(rowNum++).setCellValue("未审核"); + row.createCell(rowNum++).setCellValue("鏈鏍�"); }else if(loseProperty.getStatus() == 1){ - row.createCell(rowNum++).setCellValue("已审核"); + row.createCell(rowNum++).setCellValue("宸插鏍�"); }else if(loseProperty.getStatus() == 2){ - row.createCell(rowNum++).setCellValue("已删除"); + row.createCell(rowNum++).setCellValue("宸插垹闄�"); } row.createCell(rowNum++).setCellValue(loseProperty.getTreatedHuman()); row.createCell(rowNum++).setCellValue(loseProperty.getFeedback()); @@ -81,19 +81,19 @@ public class LosePropertyController { row.createCell(rowNum++).setCellValue(""); } } - String fileName = "小区漏抓.xlsx"; + String fileName = "灏忓尯婕忔姄.xlsx"; OutputStream os = null; try { HttpServletResponse response = ActionContext.getContext().getResponse(); response.setCharacterEncoding("UTF-8"); - //response.reset();// 清空输出流 + //response.reset();// 娓呯┖杈撳嚭娴� response.setContentType("application/x-download;charset=UTF-8"); fileName = new String(fileName.getBytes("GBK"),"ISO-8859-1"); - if(fileName.length()>150){//解决IE 6.0 bug + if(fileName.length()>150){//瑙e喅IE 6.0 bug fileName = new String(fileName.getBytes("GBK"),"ISO-8859-1"); } response.setHeader( "Content-Disposition", "attachment;filename=" + fileName); - os = response.getOutputStream();// 取得输出流 + os = response.getOutputStream();// 鍙栧緱杈撳嚭娴� wb.write(os); os.flush(); }catch (Exception e) { diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/LoudongController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/LoudongController.java index bd9b0358a..9abd9c26f 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/LoudongController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/LoudongController.java @@ -38,7 +38,7 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; /** - * 楼栋信息 + * 妤兼爧淇℃伅 * Created by linxsh on 2016/10/14. */ public class LoudongController { @@ -47,7 +47,7 @@ public class LoudongController { private RegionBlockService regionBlockService; /** - * 查询楼栋列表信息 + * 鏌ヨ妤兼爧鍒楄〃淇℃伅 * @return */ public Object listAction(LoudongModel model) { @@ -59,7 +59,7 @@ public class LoudongController { String from = model.getFrom(); String fuzzyMatch = model.getFuzzyMatch(); Pager pager = model.getPager(20); - if("全国".equals(city)){ + if("鍏ㄥ浗".equals(city)){ city = ""; } if("YES".equalsIgnoreCase(fuzzyMatch)) { @@ -79,7 +79,7 @@ public class LoudongController { } /** - * 导出到Excel + * 瀵煎嚭鍒癊xcel * @param model * @return */ @@ -91,10 +91,10 @@ public class LoudongController { String unitNumber = model.getUnitNumber(); String from = model.getFrom(); String fuzzyMatch = model.getFuzzyMatch(); - if("全国".equals(city) || StringUtils.isBlank(city)){ + if("鍏ㄥ浗".equals(city) || StringUtils.isBlank(city)){ JsonModel jsonModel = new JsonModel(); Map data = new HashMap(); - data.put("msg", "数据量太大,请联系管理员!"); + data.put("msg", "鏁版嵁閲忓お澶э紝璇疯仈绯荤鐞嗗憳锛�"); jsonModel.setJsonModel(data); return jsonModel; } @@ -111,7 +111,7 @@ public class LoudongController { if(workbookMap== null) { JsonModel jsonModel = new JsonModel(); Map data = new HashMap(); - data.put("msg", "数据量太大,请联系管理员!"); + data.put("msg", "鏁版嵁閲忓お澶э紝璇疯仈绯荤鐞嗗憳锛�"); jsonModel.setJsonModel(data); return jsonModel; } @@ -158,7 +158,7 @@ public class LoudongController { /** - * 查看详情或修改信息 + * 鏌ョ湅璇︽儏鎴栦慨鏀逛俊鎭� * @param model * @return */ @@ -260,7 +260,7 @@ public class LoudongController { } else { putIfNotNull(data, "createDate", new Date()); putIfNotNull(data, "status", 1); - putIfNotNull(data, "from", Arrays.asList("人工")); + putIfNotNull(data, "from", Arrays.asList("浜哄伐")); loudongService.save(data); } return outModel; @@ -312,7 +312,7 @@ public class LoudongController { } /** - * 封装查询参数 + * 灏佽鏌ヨ鍙傛暟 * @param city * @param region * @param name @@ -349,7 +349,7 @@ public class LoudongController { } /** - * 创建排序参数 + * 鍒涘缓鎺掑簭鍙傛暟 * @param sortName * @param sortType * @return diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/Manage400Controller.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/Manage400Controller.java index c680d9165..d9d7ab257 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/Manage400Controller.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/Manage400Controller.java @@ -24,7 +24,7 @@ public class Manage400Controller { private RegionBlockService regionBlockService; /** - * 400 开通城市 设置 + * 400 寮�閫氬煄甯� 璁剧疆 * * @param model * @return @@ -37,7 +37,7 @@ public class Manage400Controller { setting400.setCity(model.getCurrentCityName()); setting400.setCategory(model.getCurrentCategory()); setting400Service.update(setting400); - model.setMessage("修改成功"); + model.setMessage("淇敼鎴愬姛"); } else { Setting400 setting400 = new Setting400(); BeanUtils.copyProperties(model, setting400); @@ -45,12 +45,12 @@ public class Manage400Controller { setting400.setCategory(model.getCurrentCategory()); setting400.setId(null); setting400Service.save(setting400); - model.setMessage("新开通成功"); + model.setMessage("鏂板紑閫氭垚鍔�"); } } String currentCityName = model.getCurrentCityName(); if (StringUtils.isBlank(currentCityName)) { - currentCityName = "上海"; + currentCityName = "涓婃捣"; model.setCurrentCityName(currentCityName); } String currentCategory = model.getCurrentCategory(); diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/MatchController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/MatchController.java index b47155079..771ec0c60 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/MatchController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/MatchController.java @@ -53,7 +53,7 @@ public class MatchController { public Object listAction(MatchModel model) { Pager pager = model.getPager(20); - if (model.getCityDisplay() !=null && model.getCityDisplay().equals("全国")){ + if (model.getCityDisplay() !=null && model.getCityDisplay().equals("鍏ㄥ浗")){ model.setCityDisplay(null); } Integer count = matchService.countByParam(model.getShopName(),model.getSource(),model.getLoanType(), @@ -74,7 +74,7 @@ public class MatchController { matchService.batchDisable(model.getIds()); model.setResponseData("1"); } catch (Exception e) { - logger.info("批量禁用错误 " + e); + logger.info("鎵归噺绂佺敤閿欒 " + e); model.setResponseData("0"); } } @@ -88,7 +88,7 @@ public class MatchController { matchService.batchEnable(model.getIds()); model.setResponseData("1"); } catch (Exception e) { - logger.info("批量开启错误 " + e); + logger.info("鎵归噺寮�鍚敊璇� " + e); model.setResponseData("0"); } } @@ -100,7 +100,7 @@ public class MatchController { try { matchService.delete(model.getId()); } catch (Exception e) { - logger.info("删除匹配规则错误 " + e); + logger.info("鍒犻櫎鍖归厤瑙勫垯閿欒 " + e); } } model.setViewType("redirect"); diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/MechanismController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/MechanismController.java index c3f23962e..c8ec01da4 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/MechanismController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/MechanismController.java @@ -20,7 +20,7 @@ public class MechanismController { private MechanismService mechanismService; /** - * 合作机构列表 + * 鍚堜綔鏈烘瀯鍒楄〃 * * @return */ @@ -45,12 +45,12 @@ public class MechanismController { model.setViewType("json"); if (model == null || StringUtils.isBlank(model.getName())) { model.setResultCode(-1); - model.setErrMsg("参数有误"); + model.setErrMsg("鍙傛暟鏈夎"); return model; } if (checkName(model.getName())) { model.setResultCode(-1); - model.setErrMsg("所填写的合作机构名已存在,请重新填写一个合作机构名"); + model.setErrMsg("鎵�濉啓鐨勫悎浣滄満鏋勫悕宸插瓨鍦紝璇烽噸鏂板~鍐欎竴涓悎浣滄満鏋勫悕"); return model; } Mechanism m = new Mechanism(); @@ -60,7 +60,7 @@ public class MechanismController { m.setModifyDate(new Date()); mechanismService.save(m); model.setResultCode(1); - model.setMsg("操作成功"); + model.setMsg("鎿嶄綔鎴愬姛"); return model; } @@ -68,14 +68,14 @@ public class MechanismController { model.setViewType("json"); if (model == null || StringUtils.isBlank(model.getId()) || StringUtils.isBlank(model.getName())) { model.setResultCode(-1); - model.setErrMsg("参数有误"); + model.setErrMsg("鍙傛暟鏈夎"); return model; } Mechanism oldM = mechanismService.findById(model.getId()); if (!oldM.getName().equals(model.getName())) { if (checkName(model.getName())) { model.setResultCode(-1); - model.setErrMsg("所填写的合作机构名已存在,请重新填写一个合作机构名"); + model.setErrMsg("鎵�濉啓鐨勫悎浣滄満鏋勫悕宸插瓨鍦紝璇烽噸鏂板~鍐欎竴涓悎浣滄満鏋勫悕"); return model; } } @@ -84,13 +84,13 @@ public class MechanismController { oldM.setModifyDate(new Date()); mechanismService.update(oldM); model.setResultCode(1); - model.setMsg("操作成功"); + model.setMsg("鎿嶄綔鎴愬姛"); return model; } private boolean checkName(String name) { if (mechanismService.findByName(name) != null) { - return true;// 存在同名 + return true;// 瀛樺湪鍚屽悕 } return false; } diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/MessengerController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/MessengerController.java index 9a7f769f9..33ce36275 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/MessengerController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/MessengerController.java @@ -62,12 +62,12 @@ public class MessengerController { Map response = new HashMap(); jsonModel.setJsonModel(response); if(StringUtils.isBlank(model.getId()) || !ObjectId.isValid(model.getId())){ - response.put("msg","操作失败"); + response.put("msg","鎿嶄綔澶辫触"); return jsonModel; } Messenger messenger = messengerService.findById(model.getId()); if(messenger ==null){ - response.put("msg","操作失败"); + response.put("msg","鎿嶄綔澶辫触"); return jsonModel; } String name = (String) ActionContext.getContext().getRequest().getSession().getAttribute("realName"); @@ -76,7 +76,7 @@ public class MessengerController { data.put("status",model.getStatus()); data.put("readers",messenger.getReaders()); messengerService.update(model.getId(),data); - response.put("msg","更新成功"); + response.put("msg","鏇存柊鎴愬姛"); return jsonModel; } public MessengerService getMessengerService() { diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/MetroController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/MetroController.java index 97480001a..47650551f 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/MetroController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/MetroController.java @@ -19,7 +19,7 @@ import com.fangjia.service.mongo.fangjia.MetroService; import com.fangjia.service.mongo.fangjia.ServerAreaService; /** - * 地铁站点管理 + * 鍦伴搧绔欑偣绠$悊 * * @author yukai * @@ -58,7 +58,7 @@ public class MetroController { } /** - * 更新站点信息 + * 鏇存柊绔欑偣淇℃伅 * * @param model * @return @@ -87,7 +87,7 @@ public class MetroController { } /** - * 进入新增页面 + * 杩涘叆鏂板椤甸潰 * * @param model * @return @@ -100,7 +100,7 @@ public class MetroController { } /** - * 异步获取城市下的地铁线路 + * 寮傛鑾峰彇鍩庡競涓嬬殑鍦伴搧绾胯矾 * * @param model * @return @@ -114,7 +114,7 @@ public class MetroController { } /** - * 保存新增的站点 + * 淇濆瓨鏂板鐨勭珯鐐� * * @param model * @return @@ -139,7 +139,7 @@ public class MetroController { } /** - * 删除地铁站点 + * 鍒犻櫎鍦伴搧绔欑偣 * * @param model * @return diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/MetroLineController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/MetroLineController.java index dfeb9a73e..a54bd81a8 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/MetroLineController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/MetroLineController.java @@ -13,7 +13,7 @@ import com.fangjia.service.mongo.fangjia.MetroLineService; import com.fangjia.service.mongo.fangjia.ServerAreaService; /** - * 地铁线路管理 + * 鍦伴搧绾胯矾绠$悊 * * @author yukai * @@ -27,7 +27,7 @@ public class MetroLineController { return model; } - // 找不到城市返回默认页 + // 鎵句笉鍒板煄甯傝繑鍥為粯璁ら〉 ServerArea cityArea = serverAreaService.findById(model.getCityId()); if (null == cityArea) { return model; @@ -39,7 +39,7 @@ public class MetroLineController { } /** - * 删除地铁线路 + * 鍒犻櫎鍦伴搧绾胯矾 * * @param model * @return @@ -55,7 +55,7 @@ public class MetroLineController { } /** - * 更新线路信息 + * 鏇存柊绾胯矾淇℃伅 * * @param model * @return @@ -78,7 +78,7 @@ public class MetroLineController { } /** - * 进入新增页面 + * 杩涘叆鏂板椤甸潰 * * @param model * @return @@ -88,7 +88,7 @@ public class MetroLineController { } /** - * 保存新增的线路 + * 淇濆瓨鏂板鐨勭嚎璺� * * @param model * @return diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/MobileBlackListController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/MobileBlackListController.java index 98bb6fa9f..b38e5518d 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/MobileBlackListController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/MobileBlackListController.java @@ -9,7 +9,7 @@ import com.fangjia.bkoff.model.MobileBlackListModel; import com.fangjia.service.mongo.bkoff.MobileBlackListService; /** - * 经纪人号码黑名单 + * 缁忕邯浜哄彿鐮侀粦鍚嶅崟 * * @author yukai * @@ -20,7 +20,7 @@ public class MobileBlackListController { public Object listAction(MobileBlackListModel model) { List phoneNos = null; if (StringUtils.isNotBlank(model.getPhoneNos())) { - phoneNos = Arrays.asList(model.getPhoneNos().split(",|,")); + phoneNos = Arrays.asList(model.getPhoneNos().split(",|锛�")); } model.setBlackList(mobileBlackListService.findByNumbers(phoneNos)); return model; @@ -29,7 +29,7 @@ public class MobileBlackListController { public Object saveAction(MobileBlackListModel model) { List phoneNos = null; if (StringUtils.isNotBlank(model.getPhoneNos())) { - phoneNos = Arrays.asList(model.getPhoneNos().split(",|,")); + phoneNos = Arrays.asList(model.getPhoneNos().split(",|锛�")); } mobileBlackListService.saveAll(phoneNos); @@ -41,7 +41,7 @@ public class MobileBlackListController { public Object deleteAction(MobileBlackListModel model) { List ids = null; if (StringUtils.isNotBlank(model.getIdCheck())) { - ids = Arrays.asList(model.getIdCheck().split(",|,")); + ids = Arrays.asList(model.getIdCheck().split(",|锛�")); } mobileBlackListService.deleteByIds(ids); diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/MortgageInfoController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/MortgageInfoController.java index 2ee35ec4e..81fce7759 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/MortgageInfoController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/MortgageInfoController.java @@ -36,7 +36,7 @@ public class MortgageInfoController { public Object listAction(MortgageInfoModel model) { if (model.getCityDisplay() != null - && model.getCityDisplay().equals("全国")) { + && model.getCityDisplay().equals("鍏ㄥ浗")) { model.setCityDisplay(null); } Pager pager = model.getPager(20); @@ -92,7 +92,7 @@ public class MortgageInfoController { return model; } - // excel导入 + // excel瀵煎叆 public Object importExcelAction(MortgageInfoModel model) { Sheet sheet = null; List> totalList = new ArrayList>(); @@ -104,11 +104,11 @@ public class MortgageInfoController { * Workbook wb = null; wb = new XSSFWorkbook(inputStream); */ Workbook wb = WorkbookFactory.create(inputStream); - sheet = wb.getSheetAt(0); // 获得第一个表单 - Iterator rows = sheet.rowIterator(); // 获得第一个表单的迭代器 + sheet = wb.getSheetAt(0); // 鑾峰緱绗竴涓〃鍗� + Iterator rows = sheet.rowIterator(); // 鑾峰緱绗竴涓〃鍗曠殑杩唬鍣� while (rows.hasNext()) { ArrayList list = new ArrayList(); - Row row = rows.next(); // 获得行数据 + Row row = rows.next(); // 鑾峰緱琛屾暟鎹� if (row.getRowNum() == 0) { continue; } else { @@ -117,24 +117,24 @@ public class MortgageInfoController { if (cell == null) { list.add(i, null); } else { - switch (cell.getCellType()) { // 根据cell中的类型来输出数据 + switch (cell.getCellType()) { // 鏍规嵁cell涓殑绫诲瀷鏉ヨ緭鍑烘暟鎹� case HSSFCell.CELL_TYPE_BLANK: list.add(cell.getColumnIndex(), null); break; case HSSFCell.CELL_TYPE_NUMERIC: String result = new String(); - if (HSSFDateUtil.isCellDateFormatted(cell)) {// 处理日期格式、时间格式 + if (HSSFDateUtil.isCellDateFormatted(cell)) {// 澶勭悊鏃ユ湡鏍煎紡銆佹椂闂存牸寮� SimpleDateFormat sdf = null; if (cell.getCellStyle().getDataFormat() == HSSFDataFormat .getBuiltinFormat("h:mm")) { sdf = new SimpleDateFormat("HH:mm"); - } else {// 日期 + } else {// 鏃ユ湡 sdf = new SimpleDateFormat("yyyy-MM-dd"); } Date date = cell.getDateCellValue(); result = sdf.format(date); } else if (cell.getCellStyle().getDataFormat() == 58) { - // 处理自定义日期格式:m月d日(通过判断单元格的格式id解决,id的值是58) + // 澶勭悊鑷畾涔夋棩鏈熸牸寮忥細m鏈坉鏃�(閫氳繃鍒ゆ柇鍗曞厓鏍肩殑鏍煎紡id瑙e喅锛宨d鐨勫�兼槸58) SimpleDateFormat sdf = new SimpleDateFormat( "yyyy-MM-dd"); double value = cell.getNumericCellValue(); @@ -146,7 +146,7 @@ public class MortgageInfoController { CellStyle style = cell.getCellStyle(); DecimalFormat format = new DecimalFormat(); String temp = style.getDataFormatString(); - // 单元格设置成常规 + // 鍗曞厓鏍艰缃垚甯歌 if (temp.equals("General")) { format.applyPattern("#"); } @@ -177,7 +177,7 @@ public class MortgageInfoController { } catch (Exception e) { e.printStackTrace(); } - // 将解析出来的list存进数据库中 + // 灏嗚В鏋愬嚭鏉ョ殑list瀛樿繘鏁版嵁搴撲腑 boolean haveNull = false; if (totalList.size() > 0) { for (List mortgageInfoList : totalList) { @@ -203,12 +203,12 @@ public class MortgageInfoController { public void exportExcelAction(MortgageInfoModel model) { OutputStream os = null; BufferedOutputStream fos = null; - String[] columns = { "城市", "区域", "原始地址", "面积", "来源", "原始小区名称", "匹配城市", - "匹配区域", "匹配小区", "均价", "物业类型", "时间" }; - String[] columns1 = { "上海", "浦东", "华夏东路122号", "100", "某某公司", "沙田公寓", - "上海", "浦东", "沙田公寓", "10000", "小区", "2016-09-09" }; + String[] columns = { "鍩庡競", "鍖哄煙", "鍘熷鍦板潃", "闈㈢Н", "鏉ユ簮", "鍘熷灏忓尯鍚嶇О", "鍖归厤鍩庡競", + "鍖归厤鍖哄煙", "鍖归厤灏忓尯", "鍧囦环", "鐗╀笟绫诲瀷", "鏃堕棿" }; + String[] columns1 = { "涓婃捣", "娴︿笢", "鍗庡涓滆矾122鍙�", "100", "鏌愭煇鍏徃", "娌欑敯鍏瘬", + "涓婃捣", "娴︿笢", "娌欑敯鍏瘬", "10000", "灏忓尯", "2016-09-09" }; HSSFWorkbook wb = new HSSFWorkbook(); - Sheet sheet = wb.createSheet("抵押品表"); + Sheet sheet = wb.createSheet("鎶垫娂鍝佽〃"); Row row = sheet.createRow(0); for (int i = 0; i < columns.length; i++) { row.createCell(i).setCellValue(columns[i]); @@ -217,21 +217,21 @@ public class MortgageInfoController { for (int i = 0; i < columns1.length; i++) { row1.createCell(i).setCellValue(columns1[i]); } - String fileName = "抵押品模板表.xls"; + String fileName = "鎶垫娂鍝佹ā鏉胯〃.xls"; try { HttpServletResponse response = ActionContext.getContext() .getResponse(); response.setCharacterEncoding("UTF-8"); - // response.reset();// 清空输出流 + // response.reset();// 娓呯┖杈撳嚭娴� response.setContentType("application/x-download;charset=UTF-8"); fileName = new String(fileName.getBytes("GBK"), "ISO-8859-1"); - if (fileName.length() > 150) {// 解决IE 6.0 bug + if (fileName.length() > 150) {// 瑙e喅IE 6.0 bug fileName = new String(fileName.getBytes("GBK"), "ISO-8859-1"); } response.setHeader("Content-Disposition", "attachment;filename=" + fileName); model.redirect("/mortgageInfo/list"); - os = response.getOutputStream();// 取得输出流 + os = response.getOutputStream();// 鍙栧緱杈撳嚭娴� wb.write(os); os.flush(); } catch (Exception e) { diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/NetworkPriceController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/NetworkPriceController.java index e4f92fec9..dc39e4333 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/NetworkPriceController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/NetworkPriceController.java @@ -38,7 +38,7 @@ public class NetworkPriceController { Integer fggPriceFlag = 0; if(StringUtils.isNotBlank(model.getAssociateYgj())){ - if(model.getAssociateYgj().equals("是")){ + if(model.getAssociateYgj().equals("鏄�")){ ygjPriceFlag = 1; }else{ ygjPriceFlag = 2; @@ -46,7 +46,7 @@ public class NetworkPriceController { } if(StringUtils.isNotBlank(model.getAssociateFgg())){ - if(model.getAssociateFgg().equals("是")){ + if(model.getAssociateFgg().equals("鏄�")){ fggPriceFlag = 1; }else{ fggPriceFlag = 2; @@ -68,7 +68,7 @@ public class NetworkPriceController { data.put("peopleMark", 1); networkPriceService.updateById(model.getId(), data); - //修改任务表 + //淇敼浠诲姟琛� NetworkPriceTask task = networkPriceTaskService.findByParams(model.getId()); if(task==null){ task = new NetworkPriceTask(); @@ -94,7 +94,7 @@ public class NetworkPriceController { Integer fggPriceFlag = 0; if(StringUtils.isNotBlank(model.getAssociateYgj())){ - if(model.getAssociateYgj().equals("是")){ + if(model.getAssociateYgj().equals("鏄�")){ ygjPriceFlag = 1; }else{ ygjPriceFlag = 2; @@ -102,7 +102,7 @@ public class NetworkPriceController { } if(StringUtils.isNotBlank(model.getAssociateFgg())){ - if(model.getAssociateFgg().equals("是")){ + if(model.getAssociateFgg().equals("鏄�")){ fggPriceFlag = 1; }else{ fggPriceFlag = 2; @@ -115,9 +115,9 @@ public class NetworkPriceController { OutputStream os = null; BufferedOutputStream fos = null; - String[] columns = {"城市","区域","小区名","小区自增编号","小区编号","房价网均价","可信度","房估估小区编号","房估估小区名称","房估估小区均价","云估价小区编号","云估价小区名称","云估价小区均价"}; + String[] columns = {"鍩庡競","鍖哄煙","灏忓尯鍚�","灏忓尯鑷缂栧彿","灏忓尯缂栧彿","鎴夸环缃戝潎浠�","鍙俊搴�","鎴夸及浼板皬鍖虹紪鍙�","鎴夸及浼板皬鍖哄悕绉�","鎴夸及浼板皬鍖哄潎浠�","浜戜及浠峰皬鍖虹紪鍙�","浜戜及浠峰皬鍖哄悕绉�","浜戜及浠峰皬鍖哄潎浠�"}; HSSFWorkbook wb= new HSSFWorkbook(); - Sheet sheet = wb.createSheet("信息详情"); + Sheet sheet = wb.createSheet("淇℃伅璇︽儏"); Row row = sheet.createRow(0); for(int i =0 ;i < columns.length ; i++){ row.createCell(i).setCellValue(columns[i]); @@ -166,18 +166,18 @@ public class NetworkPriceController { } } - String fileName = "三家关联信息" + "(" + DateUtil.formatByPattern(new Date(), "yyyyMMddHHmmss") + ").xls"; + String fileName = "涓夊鍏宠仈淇℃伅" + "(" + DateUtil.formatByPattern(new Date(), "yyyyMMddHHmmss") + ").xls"; try { HttpServletResponse response = ActionContext.getContext().getResponse(); response.setCharacterEncoding("UTF-8"); - //response.reset();// 清空输出流 + //response.reset();// 娓呯┖杈撳嚭娴� response.setContentType("application/x-download;charset=UTF-8"); fileName = new String(fileName.getBytes("GBK"),"ISO-8859-1"); - if(fileName.length()>150){//解决IE 6.0 bug + if(fileName.length()>150){//瑙e喅IE 6.0 bug fileName = new String(fileName.getBytes("GBK"),"ISO-8859-1"); } response.setHeader( "Content-Disposition", "attachment;filename=" + fileName); - os = response.getOutputStream();// 取得输出流 + os = response.getOutputStream();// 鍙栧緱杈撳嚭娴� wb.write(os); os.flush(); }catch (Exception e) { diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/NewResourceController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/NewResourceController.java index 99719792f..d0e8f1d0d 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/NewResourceController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/NewResourceController.java @@ -15,7 +15,7 @@ import java.util.Date; import java.util.List; /** - * 资源管理中心 + * 璧勬簮绠$悊涓績 */ public class NewResourceController { @@ -54,7 +54,7 @@ public class NewResourceController { NewsResource newsResource = model.getNewsResource(); if(StringUtils.isNotBlank(newsResource.getId())){ NewsResource dbNewsResource = newsResourceService.findById(newsResource.getId()); - /**未修改字段*/ + /**鏈慨鏀瑰瓧娈�*/ newsResource.setCreateDate(dbNewsResource.getCreateDate()); newsResource.setAddUser(dbNewsResource.getAddUser()); newsResource.setVisitCount(dbNewsResource.getVisitCount()); diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/News2Controller.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/News2Controller.java index 262d90086..2bec8301d 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/News2Controller.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/News2Controller.java @@ -17,7 +17,7 @@ import com.fangjia.dal.mongo.model.NewsInfo; import com.fangjia.service.mongo.fangjia.NewsDynamicService; /** - * 新闻资讯 + * 鏂伴椈璧勮 * * @author _tyler * diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/NewsController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/NewsController.java index c6dbf23c7..06ff4b171 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/NewsController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/NewsController.java @@ -28,7 +28,7 @@ import com.fangjia.service.news.NewsPublishService; import com.fangjia.service.news.NewsService; /** - * 新闻资讯 + * 鏂伴椈璧勮 * * @author _tyler * @@ -69,7 +69,7 @@ public class NewsController { // public Object publishImageAction(NewsModel model) { // // if (StringUtils.isBlank(model.getCurrentCity())) { -// model.setCurrentCity("全国"); +// model.setCurrentCity("鍏ㄥ浗"); // } // // NewsImageArea newsImageArea = newsPublishService.getFirstNewsImageAreaByCity(model.getCurrentCity()); @@ -104,7 +104,7 @@ public class NewsController { // } // // if (StringUtils.isBlank(model.getCurrentCity())) { -// model.setCurrentCity("全国"); +// model.setCurrentCity("鍏ㄥ浗"); // } // // List newsList = newsService.findAllByIds(newsIdList); @@ -137,7 +137,7 @@ public class NewsController { // // obj.setData(data); // newsPublishService.saveNewsImageArea(obj); -// model.flash().setAttribute("message", "发布成功"); +// model.flash().setAttribute("message", "鍙戝竷鎴愬姛"); // if ("".equals(model.getCurrentCity())) { // return model.redirect("/news/publishImage"); // } else { @@ -155,7 +155,7 @@ public class NewsController { // NewsIndexPageBo newsIndexPageBo = new NewsIndexPageBo(); // BeanUtils.copyProperties(model, newsIndexPageBo); // if (StringUtils.isBlank(model.getCurrentCity())) { -// newsIndexPageBo.setCity("全国"); +// newsIndexPageBo.setCity("鍏ㄥ浗"); // } else { // newsIndexPageBo.setCity(model.getCurrentCity()); // } @@ -171,7 +171,7 @@ public class NewsController { // } // // /** -// * 新闻资讯查询列表 +// * 鏂伴椈璧勮鏌ヨ鍒楄〃 // * // * @param model // * @return @@ -188,9 +188,9 @@ public class NewsController { // pager.setMaxPage(300); // } // -// // 默认的后台发布列表 +// // 榛樿鐨勫悗鍙板彂甯冨垪琛� // if (StringUtils.isBlank(model.getIds())) { -// // 按发布者类型查询 +// // 鎸夊彂甯冭�呯被鍨嬫煡璇� // int publishType = 11; // FacetQueryResult newsResults = this.newsService.findNewsListByPublisherType(publishType, pager.getStartRow(), // pager.getPageSize()); @@ -200,7 +200,7 @@ public class NewsController { // return model; // } // -// // 按ID批量查询 +// // 鎸塈D鎵归噺鏌ヨ // List ids = StringUtil.split(model.getIds(), "[\r\n ]"); // model.setNewsSearchResults(this.newsService.findAllByIds(ids)); // model.setPager(pager); @@ -208,7 +208,7 @@ public class NewsController { // } // // /** -// * 删除新闻资讯 +// * 鍒犻櫎鏂伴椈璧勮 // * // * @param model // * @return @@ -223,7 +223,7 @@ public class NewsController { // } // // /** -// * 显示新闻资讯 +// * 鏄剧ず鏂伴椈璧勮 // * // * @param model // * @return @@ -247,7 +247,7 @@ public class NewsController { // } // // /** -// * 保存新闻资讯 +// * 淇濆瓨鏂伴椈璧勮 // * // * @param model // * @return @@ -273,7 +273,7 @@ public class NewsController { // } // // /** -// * 更新新闻资讯 +// * 鏇存柊鏂伴椈璧勮 // * // * @param model // * @return @@ -292,11 +292,11 @@ public class NewsController { // news.setSource(model.getSource()); // if (StringUtils.isNotBlank(model.getKeyWords())) { // String keyWords = model.getKeyWords(); -// news.setKeywords(Arrays.asList(keyWords.split("\\,"))); +// news.setKeywords(Arrays.asList(keyWords.split("\\锛�"))); // } // newsService.updateNewsById(news, model.getId()); // model.setViewType("redirect"); -// StringBuilder re_url = new StringBuilder("");// 重定向的url +// StringBuilder re_url = new StringBuilder("");// 閲嶅畾鍚戠殑url // re_url.append("../news/show").append("?id=").append(model.getId()); // model.setViewParam("location", re_url); // return model; @@ -304,61 +304,61 @@ public class NewsController { // // private String validateNewsIndexPage(NewsModel model) { // if (model == null) { -// return "错误"; +// return "閿欒"; // } // if (model.getFirstTitle() == null || model.getFirstTitle().getId() == null // || StringUtils.isBlank(model.getFirstTitle().getName())) { -// return "主标题错误"; +// return "涓绘爣棰橀敊璇�"; // } else if (model.getSecondTitle() == null || model.getSecondTitle().getId() == null // || StringUtils.isBlank(model.getSecondTitle().getName())) { -// return "主标题2错误"; +// return "涓绘爣棰�2閿欒"; // } else if (model.getTitle1() == null || model.getTitle1().getId() == null // || StringUtils.isBlank(model.getTitle1().getName())) { -// return "标题1错误"; +// return "鏍囬1閿欒"; // } else if (model.getTitle2() == null || model.getTitle2().getId() == null // || StringUtils.isBlank(model.getTitle2().getName())) { -// return "标题2错误"; +// return "鏍囬2閿欒"; // } else if (model.getTitle3() == null || model.getTitle3().getId() == null // || StringUtils.isBlank(model.getTitle3().getName())) { -// return "标题3错误"; +// return "鏍囬3閿欒"; // } else if (model.getTitle4() == null || model.getTitle4().getId() == null // || StringUtils.isBlank(model.getTitle4().getName())) { -// return "标题4错误"; +// return "鏍囬4閿欒"; // } else if (model.getTitle5() == null || model.getTitle5().getId() == null // || StringUtils.isBlank(model.getTitle5().getName())) { -// return "标题5错误"; +// return "鏍囬5閿欒"; // } else if (model.getTitle6() == null || model.getTitle6().getId() == null // || StringUtils.isBlank(model.getTitle6().getName())) { -// return "标题6错误"; +// return "鏍囬6閿欒"; // } else if (model.getTitle7() == null || model.getTitle7().getId() == null // || StringUtils.isBlank(model.getTitle7().getName())) { -// return "标题7错误"; +// return "鏍囬7閿欒"; // } else if (model.getTitle8() == null || model.getTitle8().getId() == null // || StringUtils.isBlank(model.getTitle8().getName())) { -// return "标题8错误"; +// return "鏍囬8閿欒"; // } else if (model.getTitle9() == null || model.getTitle9().getId() == null // || StringUtils.isBlank(model.getTitle9().getName())) { -// return "标题9错误"; +// return "鏍囬9閿欒"; // } else if (model.getTitle10() == null || model.getTitle10().getId() == null // || StringUtils.isBlank(model.getTitle10().getName())) { -// return "标题10错误"; +// return "鏍囬10閿欒"; // } else if (model.getTitle11() == null || model.getTitle11().getId() == null // || StringUtils.isBlank(model.getTitle11().getName())) { -// return "标题11错误"; +// return "鏍囬11閿欒"; // } else if (model.getTitle12() == null || model.getTitle12().getId() == null // || StringUtils.isBlank(model.getTitle12().getName())) { -// return "标题12错误"; +// return "鏍囬12閿欒"; // } else if (model.getTitle13() == null || model.getTitle13().getId() == null // || StringUtils.isBlank(model.getTitle13().getName())) { -// return "标题13错误"; +// return "鏍囬13閿欒"; // } else if (model.getTitle14() == null || model.getTitle14().getId() == null // || StringUtils.isBlank(model.getTitle14().getName())) { -// return "标题14错误"; +// return "鏍囬14閿欒"; // } // // if (StringUtils.isBlank(model.getSubTitle1().getName()) && StringUtils.isBlank(model.getSubTitle2().getName()) // && StringUtils.isBlank(model.getSubTitle3().getName())) { -// return "副标题至少填一个"; +// return "鍓爣棰樿嚦灏戝~涓�涓�"; // } // // if (StringUtils.isBlank(model.getSubTitle1().getName())) { @@ -381,7 +381,7 @@ public class NewsController { // } // // private String getFormatPattern() { -// return "yyyy年MM月dd日 HH时mm分ss秒"; +// return "yyyy骞碝M鏈坉d鏃� HH鏃秏m鍒唖s绉�"; // } // // private String formateDate(Date date) { @@ -392,11 +392,11 @@ public class NewsController { // if (values == null) { // return ""; // } -// return StringUtils.join(values.toArray(), ","); +// return StringUtils.join(values.toArray(), "锛�"); // } // // private List convert(String value) { -// return Arrays.asList(value.split("\\,")); +// return Arrays.asList(value.split("\\锛�")); // } // // public void setNewsService(NewsService newsService) { diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/NoExistDistrictController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/NoExistDistrictController.java index 0e7a5a270..7e7888045 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/NoExistDistrictController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/NoExistDistrictController.java @@ -22,7 +22,7 @@ public class NoExistDistrictController { if(StringUtils.isNotBlank(model.getDistrictName())||model.getStatus()>=0){ - List list = noExistDistrictService.findNoExistDistrict("上海", model.getDistrictName(), model.getStatus()); + List list = noExistDistrictService.findNoExistDistrict("涓婃捣", model.getDistrictName(), model.getStatus()); model.setNoExistDistrictBoList(list); } @@ -37,7 +37,7 @@ public class NoExistDistrictController { } model.setViewType("redirect"); try { - model.setViewParam("location", "/district/add?cityDisplay="+URLEncoder.encode(StringUtils.trimToEmpty("上海"),"UTF-8")+"&keyword="+URLEncoder.encode(StringUtils.trimToEmpty(model.getDistrictName()),"UTF-8")); + model.setViewParam("location", "/district/add?cityDisplay="+URLEncoder.encode(StringUtils.trimToEmpty("涓婃捣"),"UTF-8")+"&keyword="+URLEncoder.encode(StringUtils.trimToEmpty(model.getDistrictName()),"UTF-8")); } catch (Exception e) { // TODO Auto-generated catch block e.printStackTrace(); diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/OpenResourceController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/OpenResourceController.java index ce5fc7904..760471f3f 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/OpenResourceController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/OpenResourceController.java @@ -45,7 +45,7 @@ public class OpenResourceController { apiCodeSet.add(resource.getApiCode()); } if (model.getApiCode() != 0 && apiCodeSet.contains(model.getApiCode())){ - model.setMsg("APICode已存在"); + model.setMsg("APICode宸插瓨鍦�"); return model; } if (!"doAdd".equals(model.getMethod())) { @@ -54,23 +54,23 @@ public class OpenResourceController { String uri = model.getUri(); String name = model.getName(); if (StringUtils.isBlank(uri)) { - model.setMsg("请填写URI"); + model.setMsg("璇峰~鍐橴RI"); return model; } if (StringUtils.isBlank(name)) { - model.setMsg("请填写名称"); + model.setMsg("璇峰~鍐欏悕绉�"); return model; } uri = formatUri(uri); List params = new ArrayList(); params.add(new QueryParam("uri", uri)); if (CollectionUtils.isNotEmpty(this.openResourceService.findOpenResource(params))) { - model.setMsg("URI已存在"); + model.setMsg("URI宸插瓨鍦�"); return model; } /*params.add(new QueryParam("name", name)); if (CollectionUtils.isNotEmpty(this.openResourceService.findOpenResource(params))) { - model.setMsg("URI或名称已存在"); + model.setMsg("URI鎴栧悕绉板凡瀛樺湪"); return model; }*/ OpenResource r = new OpenResource(); @@ -81,7 +81,7 @@ public class OpenResourceController { r.setPubStatus(model.getPubStatus() ? 1 : 0); r.setDescription(model.getDescription()); this.openResourceService.save(r); - model.setMsg("添加成功!"); + model.setMsg("娣诲姞鎴愬姛锛�"); return model; } @@ -90,7 +90,7 @@ public class OpenResourceController { data.put("saveResult",model.getSave_result()); data.put("pubStatus",model.getPubStatus() ? 1 : 0); this.openResourceService.update(data,model.getId()); - model.setMsg("保存成功"); + model.setMsg("淇濆瓨鎴愬姛"); JsonModel model1 = new JsonModel(); return model1; } @@ -100,11 +100,11 @@ public class OpenResourceController { String uri = model.getUri(); String name = model.getName(); if (StringUtils.isBlank(uri)) { - model.setMsg("请填写URI"); + model.setMsg("璇峰~鍐橴RI"); return model; } if (StringUtils.isBlank(name)) { - model.setMsg("请填写名称"); + model.setMsg("璇峰~鍐欏悕绉�"); return model; } uri = formatUri(uri); @@ -121,11 +121,11 @@ public class OpenResourceController { params.add(new QueryParam("uri", uri)); params.add(new QueryParam("name", name)); if (CollectionUtils.isNotEmpty(this.openResourceService.findOpenResourceExceptId(params, model.getId()))) { - model.setMsg("URI或名称已存在"); + model.setMsg("URI鎴栧悕绉板凡瀛樺湪"); return model; } this.openResourceService.update(data, model.getId()); - model.setMsg("更新成功!"); + model.setMsg("鏇存柊鎴愬姛锛�"); } model.setOr(this.openResourceService.findOpenResourceById(model.getId())); } else { @@ -145,14 +145,14 @@ public class OpenResourceController { this.openResourceService.delete(model.getId()); } model.setViewType("redirect"); - model.setViewParam("location", "list?msg=" + URLEncoder.encode("删除成功!", "UTF-8")); + model.setViewParam("location", "list?msg=" + URLEncoder.encode("鍒犻櫎鎴愬姛锛�", "UTF-8")); return model; } /** - * 格式化URI + * 鏍煎紡鍖朥RI * * @param uri * @return diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/OpenUriLogController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/OpenUriLogController.java index 71be1f040..a157fea9f 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/OpenUriLogController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/OpenUriLogController.java @@ -32,7 +32,7 @@ import java.util.*; */ public class OpenUriLogController { - static final String[] EXCEL_TITLE_LABEL = new String[]{ "用户ID", "用户名称", "IP", "访问链接", "访问时间", "tid", "dataStatus","code","msg", "参数","resMap"}; + static final String[] EXCEL_TITLE_LABEL = new String[]{ "鐢ㄦ埛ID", "鐢ㄦ埛鍚嶇О", "IP", "璁块棶閾炬帴", "璁块棶鏃堕棿", "tid", "dataStatus","code","msg", "鍙傛暟","resMap"}; private OpenUriLogService offlineOpenUriLogService; @@ -69,7 +69,7 @@ public class OpenUriLogController { Integer online = model.getOnline(); if(online!=null&&online==0){ - //线上 + //绾夸笂 pager.setTotalRows(openUriLogService.findOpenUriLogsCount(userId, startDate, endDate, code)); List results = openUriLogService.findOpenUriLogList(userId, startDate, endDate, code, pager.getStartRow(), pager.getPageSize()); Map parameterMaps = new HashMap(); @@ -96,7 +96,7 @@ public class OpenUriLogController { model.setParameterMaps(JSONObject.fromObject(parameterMaps).toString()); model.setOpenUriLogs(results); }else { - //线下 + //绾夸笅 pager.setTotalRows(offlineOpenUriLogService.findOpenUriLogsCount(userId, startDate, endDate, code)); List results = offlineOpenUriLogService.findOpenUriLogList(userId, startDate, endDate, code, pager.getStartRow(), pager.getPageSize()); Map parameterMaps = new HashMap(); @@ -153,10 +153,10 @@ public class OpenUriLogController { Integer online = model.getOnline(); Workbook wb = new SXSSFWorkbook(); if(online!=null&&online==0) { - //线上 + //绾夸笂 pager.setTotalRows(openUriLogService.findOpenUriLogsCount(userId, startDate, endDate, code)); String parameter = ""; - Sheet sheet = wb.createSheet("API操作日志管理"); + Sheet sheet = wb.createSheet("API鎿嶄綔鏃ュ織绠$悊"); List results = openUriLogService.findOpenUriLogList(userId, startDate, endDate, code, 0, pager.getTotalRows()); Map parameterMaps = new HashMap(); for (OpenUriLog openUriLog : results) { @@ -205,11 +205,11 @@ public class OpenUriLogController { i++; } }else { - //线下 + //绾夸笅 pager.setTotalRows(offlineOpenUriLogService.findOpenUriLogsCount(userId, startDate, endDate, code)); String parameter = ""; - Sheet sheet = wb.createSheet("API操作日志管理"); + Sheet sheet = wb.createSheet("API鎿嶄綔鏃ュ織绠$悊"); List results = offlineOpenUriLogService.findOpenUriLogList(userId, startDate, endDate, code, 0, pager.getTotalRows()); Map parameterMaps = new HashMap(); for (OpenUriLog openUriLog : results) { @@ -261,19 +261,19 @@ public class OpenUriLogController { } - String fileName = "API操作日志管理.xlsx"; + String fileName = "API鎿嶄綔鏃ュ織绠$悊.xlsx"; OutputStream os = null; try { HttpServletResponse response = ActionContext.getContext().getResponse(); response.setCharacterEncoding("UTF-8"); - //response.reset();// 清空输出流 + //response.reset();// 娓呯┖杈撳嚭娴� response.setContentType("application/x-download;charset=UTF-8"); fileName = new String(fileName.getBytes("GBK"), "ISO-8859-1"); - if (fileName.length() > 150) {//解决IE 6.0 bug + if (fileName.length() > 150) {//瑙e喅IE 6.0 bug fileName = new String(fileName.getBytes("GBK"), "ISO-8859-1"); } response.setHeader("Content-Disposition", "attachment;filename=" + fileName); - os = response.getOutputStream();// 取得输出流 + os = response.getOutputStream();// 鍙栧緱杈撳嚭娴� wb.write(os); os.flush(); } catch (Exception e) { diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/OperationLogController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/OperationLogController.java index e9d7794ba..d205e11b6 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/OperationLogController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/OperationLogController.java @@ -11,7 +11,7 @@ import java.util.List; import java.util.Map; /** - * 操作日志 + * 鎿嶄綔鏃ュ織 * @author wenyan */ public class OperationLogController{ @@ -20,83 +20,83 @@ public class OperationLogController{ private OperationLogService operationLogService; static Map map = new HashMap(){ { - put( "city" , "城市" ); - put( "name" , "名称" ); - put( "region" , "区域" ); - put( "block" , "板块" ); - put( "address" , "地址" ); - put( "loop_line_info" , "环线" ); - put( "estate_type2" , "物业类型" ); - put( "street_community" , "街道社区" ); - put( "household_count" , "户数" ); - put( "open_date" , "开盘时间" ); - put( "licence" , "预售证" ); - put( "lat" , "mapabc纬度" ); - put( "lng" , "mapabc经度" ); - put( "lat2" , "百度纬度" ); - put( "lng2" , "百度经度" ); - put( "all_area" , "占地面积" ); - put( "build_area" , "建筑面积" ); - put( "build_aype" , "建筑类型" ); - put( "alias" , "名称别名" ); - put( "addr_alias" , "地址别名" ); - put( "developer" , "开发商" ); - put( "estate_company" , "物业公司" ); - put( "fitment" , "装修情况" ); - put( "cubage_percent" , "容积率" ); - put( "virescence_percent" , "绿化率" ); - put( "car_site" , "停车位(描述)" ); - put( "estate_charge" , "物业费" ); - put( "floorplan_pics" , "楼层平面图" ); - put( "out_pics" , "外景图" ); - put( "rent_price" , "租金" ); - put( "bedKind" , "写字楼等级" ); - put( "house_floor" , "楼层" ); - put( "house_height" , "楼高" ); - put( "lease_term","租赁年限"); - put( "payment_pattern","付款方式"); - put( "sell_price","出售价格"); - put( "floor","建筑楼层"); - put( "floor_info","楼层状况"); - put( "build_structure","建筑结构"); - put( "characteristic","项目特色"); - put( "bay_area","开间面积"); - put( "finish_building_date","竣工时间"); - put( "divisible","是否可分割"); - put( "unified_manage","是否统一管理"); - put( "metro_info","地铁沿线"); - put( "car_site_count","停车位"); - put( "car_Site","停车位(描述)"); - put( "property_life","产权年限"); - put( "house_property","产权性质"); - put( "land_property","小区性质"); - put( "start_building_date","开工时间"); - put( "metro_names","地铁站名"); - put( "facilities","配套设施"); - put( "property_info","物业概况"); - put( "traffic","交通情况"); - put( "surrounding","周边情况"); - put( "business_status","经营业态"); - put( "rent_type","租售类型"); - put( "fitment_materials","建材装修"); - put( "relate_info","相关信息"); - put( "description","描述"); - put( "avg_price","均价"); - put( "sell_address","售楼地址"); - put( "mobile","售楼电话"); - put( "discount","折扣信息"); - put( "price","价格"); - put( "business_quarter","商圈"); - put( "status","状态"); - put( "standard_height","标准层高"); - put( "foreign","是否涉外"); - put( "register","是否注册"); - put( "real_use_percent","实用率"); - put( "live_date","交房时间"); - put( "m_date","修改时间"); - put( "build_type","建筑类型"); - put( "cat","分类"); - put( "c_date","创建时间"); + put( "city" , "鍩庡競" ); + put( "name" , "鍚嶇О" ); + put( "region" , "鍖哄煙" ); + put( "block" , "鏉垮潡" ); + put( "address" , "鍦板潃" ); + put( "loop_line_info" , "鐜嚎" ); + put( "estate_type2" , "鐗╀笟绫诲瀷" ); + put( "street_community" , "琛楅亾绀惧尯" ); + put( "household_count" , "鎴锋暟" ); + put( "open_date" , "寮�鐩樻椂闂�" ); + put( "licence" , "棰勫敭璇�" ); + put( "lat" , "mapabc绾害" ); + put( "lng" , "mapabc缁忓害" ); + put( "lat2" , "鐧惧害绾害" ); + put( "lng2" , "鐧惧害缁忓害" ); + put( "all_area" , "鍗犲湴闈㈢Н" ); + put( "build_area" , "寤虹瓚闈㈢Н" ); + put( "build_aype" , "寤虹瓚绫诲瀷" ); + put( "alias" , "鍚嶇О鍒悕" ); + put( "addr_alias" , "鍦板潃鍒悕" ); + put( "developer" , "寮�鍙戝晢" ); + put( "estate_company" , "鐗╀笟鍏徃" ); + put( "fitment" , "瑁呬慨鎯呭喌" ); + put( "cubage_percent" , "瀹圭Н鐜�" ); + put( "virescence_percent" , "缁垮寲鐜�" ); + put( "car_site" , "鍋滆溅浣�(鎻忚堪)" ); + put( "estate_charge" , "鐗╀笟璐�" ); + put( "floorplan_pics" , "妤煎眰骞抽潰鍥�" ); + put( "out_pics" , "澶栨櫙鍥�" ); + put( "rent_price" , "绉熼噾" ); + put( "bedKind" , "鍐欏瓧妤肩瓑绾�" ); + put( "house_floor" , "妤煎眰" ); + put( "house_height" , "妤奸珮" ); + put( "lease_term","绉熻祦骞撮檺"); + put( "payment_pattern","浠樻鏂瑰紡"); + put( "sell_price","鍑哄敭浠锋牸"); + put( "floor","寤虹瓚妤煎眰"); + put( "floor_info","妤煎眰鐘跺喌"); + put( "build_structure","寤虹瓚缁撴瀯"); + put( "characteristic","椤圭洰鐗硅壊"); + put( "bay_area","寮�闂撮潰绉�"); + put( "finish_building_date","绔e伐鏃堕棿"); + put( "divisible","鏄惁鍙垎鍓�"); + put( "unified_manage","鏄惁缁熶竴绠$悊"); + put( "metro_info","鍦伴搧娌跨嚎"); + put( "car_site_count","鍋滆溅浣�"); + put( "car_Site","鍋滆溅浣�(鎻忚堪)"); + put( "property_life","浜ф潈骞撮檺"); + put( "house_property","浜ф潈鎬ц川"); + put( "land_property","灏忓尯鎬ц川"); + put( "start_building_date","寮�宸ユ椂闂�"); + put( "metro_names","鍦伴搧绔欏悕"); + put( "facilities","閰嶅璁炬柦"); + put( "property_info","鐗╀笟姒傚喌"); + put( "traffic","浜ら�氭儏鍐�"); + put( "surrounding","鍛ㄨ竟鎯呭喌"); + put( "business_status","缁忚惀涓氭��"); + put( "rent_type","绉熷敭绫诲瀷"); + put( "fitment_materials","寤烘潗瑁呬慨"); + put( "relate_info","鐩稿叧淇℃伅"); + put( "description","鎻忚堪"); + put( "avg_price","鍧囦环"); + put( "sell_address","鍞ゼ鍦板潃"); + put( "mobile","鍞ゼ鐢佃瘽"); + put( "discount","鎶樻墸淇℃伅"); + put( "price","浠锋牸"); + put( "business_quarter","鍟嗗湀"); + put( "status","鐘舵��"); + put( "standard_height","鏍囧噯灞傞珮"); + put( "foreign","鏄惁娑夊"); + put( "register","鏄惁娉ㄥ唽"); + put( "real_use_percent","瀹炵敤鐜�"); + put( "live_date","浜ゆ埧鏃堕棿"); + put( "m_date","淇敼鏃堕棿"); + put( "build_type","寤虹瓚绫诲瀷"); + put( "cat","鍒嗙被"); + put( "c_date","鍒涘缓鏃堕棿"); } };// public Object listAction(OperationLogModel model){ @@ -124,7 +124,7 @@ public class OperationLogController{ for(String key : log.getData().keySet()){ val = log.getData().get(key); if(val == null){ - data.put(getFieldDesc(key),"置空"); + data.put(getFieldDesc(key),"缃┖"); }else if(val instanceof String){ String v = (String)val; if(v.contains("$date")){ diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/PaphValuationController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/PaphValuationController.java index 4ed6be6c2..7a9c1313e 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/PaphValuationController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/PaphValuationController.java @@ -23,17 +23,17 @@ import java.util.List; import java.util.Map; /** - * 平安普惠人工估价后台 + * 骞冲畨鏅儬浜哄伐浼颁环鍚庡彴 * - * @author 王文艳 + * @author 鐜嬫枃鑹� * @create 2016-11-15 **/ public class PaphValuationController { PaphEvaluateService paphEvaluateService; - static final String[] EXCEL_TITLE_LABEL = new String[]{ "CaseId", "请求估价时间", "小区名称", "物业地址", "建筑面积","楼层","总楼层", "建成年代", "匹配城市", "匹配区域", "匹配小区名", "楼栋号","室号", - "买方中介单价", "买方中介总价","买方中介电话","买方中介姓氏","买方备注", "卖方中介单价", "卖方中介总价","卖方中介电话","卖方中介姓氏","卖方备注","估价","均价","备注","估价状态","操作人","操作日期"}; + static final String[] EXCEL_TITLE_LABEL = new String[]{ "CaseId", "璇锋眰浼颁环鏃堕棿", "灏忓尯鍚嶇О", "鐗╀笟鍦板潃", "寤虹瓚闈㈢Н","妤煎眰","鎬绘ゼ灞�", "寤烘垚骞翠唬", "鍖归厤鍩庡競", "鍖归厤鍖哄煙", "鍖归厤灏忓尯鍚�", "妤兼爧鍙�","瀹ゅ彿", + "涔版柟涓粙鍗曚环", "涔版柟涓粙鎬讳环","涔版柟涓粙鐢佃瘽","涔版柟涓粙濮撴皬","涔版柟澶囨敞", "鍗栨柟涓粙鍗曚环", "鍗栨柟涓粙鎬讳环","鍗栨柟涓粙鐢佃瘽","鍗栨柟涓粙濮撴皬","鍗栨柟澶囨敞","浼颁环","鍧囦环","澶囨敞","浼颁环鐘舵��","鎿嶄綔浜�","鎿嶄綔鏃ユ湡"}; public Object listAction(ArtificialValuationModel model) { model.setEvaluateWay("artificial"); @@ -65,7 +65,7 @@ public class PaphValuationController { model.setEvaluateWay("artificial"); List paphEvaluates = paphEvaluateService.findAll(model.getStatus(), model.getEvaluateWay(), model.getStartDate(), model.getEndDate(), null, false, 0, 60000); Workbook wb = new SXSSFWorkbook(); - Sheet sheet = wb.createSheet("平安普惠估价记录"); + Sheet sheet = wb.createSheet("骞冲畨鏅儬浼颁环璁板綍"); Row row = sheet.createRow(0); for(int i = 0; i < EXCEL_TITLE_LABEL.length; i ++){ row.createCell(i).setCellValue(EXCEL_TITLE_LABEL[i]); @@ -132,9 +132,9 @@ public class PaphValuationController { row.createCell(rowNum++).setCellValue(""); } if(paphEvaluate.getStatus() == 1){ - row.createCell(rowNum++).setCellValue("估价成功"); + row.createCell(rowNum++).setCellValue("浼颁环鎴愬姛"); }else if(paphEvaluate.getStatus() == 2){ - row.createCell(rowNum++).setCellValue("地址无效估价失败"); + row.createCell(rowNum++).setCellValue("鍦板潃鏃犳晥浼颁环澶辫触"); }else{ row.createCell(rowNum++).setCellValue(""); } @@ -149,19 +149,19 @@ public class PaphValuationController { row.createCell(rowNum++).setCellValue(DateUtil.formatByPattern(paphEvaluate.getEvaluateDate(), "yyyy-MM-dd HH:mm")); } } - String fileName = "平安普惠人工估价.xlsx"; + String fileName = "骞冲畨鏅儬浜哄伐浼颁环.xlsx"; OutputStream os = null; try { HttpServletResponse response = ActionContext.getContext().getResponse(); response.setCharacterEncoding("UTF-8"); - //response.reset();// 清空输出流 + //response.reset();// 娓呯┖杈撳嚭娴� response.setContentType("application/x-download;charset=UTF-8"); fileName = new String(fileName.getBytes("GBK"),"ISO-8859-1"); - if(fileName.length()>150){//解决IE 6.0 bug + if(fileName.length()>150){//瑙e喅IE 6.0 bug fileName = new String(fileName.getBytes("GBK"),"ISO-8859-1"); } response.setHeader( "Content-Disposition", "attachment;filename=" + fileName); - os = response.getOutputStream();// 取得输出流 + os = response.getOutputStream();// 鍙栧緱杈撳嚭娴� wb.write(os); os.flush(); }catch (Exception e) { diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ParseTradeDataController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ParseTradeDataController.java index 21f5a64ad..7c5db0fdb 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ParseTradeDataController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ParseTradeDataController.java @@ -31,7 +31,7 @@ public class ParseTradeDataController { private DistrictService districtService; private RegionBlockService regionBlockService; - public static final String[] TRADE_DETAIL_CITY = { "上海" }; + public static final String[] TRADE_DETAIL_CITY = { "涓婃捣" }; public Object tradeDetailAction(ParseTradeDataModel model) { return model; @@ -64,12 +64,12 @@ public class ParseTradeDataController { processTradeDetail(monthDate); } - model.flash().setAttribute("message", "同步成功"); + model.flash().setAttribute("message", "鍚屾鎴愬姛"); return model.redirect("/parseTradeData/tradeDetail"); } private ModelAndViewSupport returnRrror(ParseTradeDataModel model) { - model.flash().setAttribute("message", "同步错误"); + model.flash().setAttribute("message", "鍚屾閿欒"); return model.redirect("/parseTradeData/tradeDetail"); } diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/PictureController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/PictureController.java index 68d63f9b9..e59002202 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/PictureController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/PictureController.java @@ -240,7 +240,7 @@ public class PictureController { } private static List listFile(List lstFileNames, File f, String suffix, boolean isdepth) { - // 若是目录, 采用递归的方法遍历子目录 + // 鑻ユ槸鐩綍, 閲囩敤閫掑綊鐨勬柟娉曢亶鍘嗗瓙鐩綍 if (f.isDirectory()) { File[] t = f.listFiles(); @@ -252,7 +252,7 @@ public class PictureController { } else { String filePath = f.getAbsolutePath(); if (!suffix.equals("")) { - int begIndex = filePath.lastIndexOf("."); // 最后一个.(即后缀名前面的.)的索引 + int begIndex = filePath.lastIndexOf("."); // 鏈�鍚庝竴涓�.(鍗冲悗缂�鍚嶅墠闈㈢殑.)鐨勭储寮� String tempsuffix = ""; if (begIndex != -1) { diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/PpcDetailController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/PpcDetailController.java index 4a29ce336..7197a347e 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/PpcDetailController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/PpcDetailController.java @@ -58,20 +58,20 @@ public class PpcDetailController { List ppcDetails = this.ppcDetailService.findPpcDetails(model, null); ActionContext.getContext().getResponse().setHeader("Content-disposition", "attachment; filename=400calls.xls"); WritableWorkbook workbook = Workbook.createWorkbook(ActionContext.getContext().getResponse().getOutputStream()); - WritableSheet sheet = workbook.createSheet("400电话", 0); + WritableSheet sheet = workbook.createSheet("400鐢佃瘽", 0); WritableCellFormat cellFormat = new WritableCellFormat(); cellFormat.setAlignment(Alignment.CENTRE); cellFormat.setBackground(Colour.GRAY_25); cellFormat.setBorder(Border.ALL, BorderLineStyle.THIN); cellFormat.setVerticalAlignment(VerticalAlignment.CENTRE); - sheet.addCell(new Label(0, 0, "主叫", cellFormat)); - sheet.addCell(new Label(1, 0, "被叫", cellFormat)); - sheet.addCell(new Label(2, 0, "城市", cellFormat)); - sheet.addCell(new Label(3, 0, "房源", cellFormat)); - sheet.addCell(new Label(4, 0, "公司", cellFormat)); - sheet.addCell(new Label(5, 0, "时间", cellFormat)); - sheet.addCell(new Label(6, 0, "时长", cellFormat)); - sheet.addCell(new Label(7, 0, "状态", cellFormat)); + sheet.addCell(new Label(0, 0, "涓诲彨", cellFormat)); + sheet.addCell(new Label(1, 0, "琚彨", cellFormat)); + sheet.addCell(new Label(2, 0, "鍩庡競", cellFormat)); + sheet.addCell(new Label(3, 0, "鎴挎簮", cellFormat)); + sheet.addCell(new Label(4, 0, "鍏徃", cellFormat)); + sheet.addCell(new Label(5, 0, "鏃堕棿", cellFormat)); + sheet.addCell(new Label(6, 0, "鏃堕暱", cellFormat)); + sheet.addCell(new Label(7, 0, "鐘舵��", cellFormat)); sheet.addCell(new Label(8, 0, "400", cellFormat)); for (int i = 0; i < ppcDetails.size(); i++) { PpcDetailBo bo = ppcDetails.get(i); @@ -84,7 +84,7 @@ public class PpcDetailController { link.setDescription(pd.getRelateId()); sheet.addHyperlink(link); } else { - sheet.addCell(new Label(3, i + 1, "资源类型无法识别!ppc_detail_id:" + pd.getId())); + sheet.addCell(new Label(3, i + 1, "璧勬簮绫诲瀷鏃犳硶璇嗗埆锛乸pc_detail_id:" + pd.getId())); } sheet.addCell(new Label(4, i + 1, DataUtil.removeHtml(pd.getCompany()))); sheet.addCell(new Label(5, i + 1, DateUtil.formatToYYYYMMDDhhmmss(pd.getStartDate()))); diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/PriceSurveyController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/PriceSurveyController.java index a2bfd1dd9..d00316ab0 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/PriceSurveyController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/PriceSurveyController.java @@ -69,7 +69,7 @@ public class PriceSurveyController { ret.setJsonModel(json); if(StringUtils.isBlank(model.getId()) || !ObjectId.isValid(model.getId())) { - json.put("msg", "删除失败!"); + json.put("msg", "鍒犻櫎澶辫触!"); } priceSurveyRecordDao.deleteById(model.getId()); @@ -81,18 +81,18 @@ public class PriceSurveyController { Map json = new HashMap(); ret.setJsonModel(json); if (StringUtils.isBlank(model.getCityDisplay()) || StringUtils.isBlank(model.getRegion()) || StringUtils.isBlank(model.getDistrictName())) { - json.put("msg", "城市、区域、小区名为空"); + json.put("msg", "鍩庡競銆佸尯鍩熴�佸皬鍖哄悕涓虹┖"); return ret; } District district = districtService.findDistrict(new DistrictKey(model.getCityDisplay(), model.getRegion(), model.getDistrictName()), "district"); if (district == null) { - json.put("msg", "小区不存在"); + json.put("msg", "灏忓尯涓嶅瓨鍦�"); return ret; } if (model.getPrice() == null || model.getPrice() <= 0) { - json.put("msg", "价格不合法"); + json.put("msg", "浠锋牸涓嶅悎娉�"); return ret; } diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ReasonController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ReasonController.java index f52dc1743..c4cc738e8 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ReasonController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ReasonController.java @@ -84,7 +84,7 @@ public class ReasonController { List ret = new ArrayList(); JSONObject jo = new JSONObject(); jo.put("type", "pie"); - jo.put("name", "网站分布"); + jo.put("name", "缃戠珯鍒嗗竷"); List allJa = new ArrayList(); for (String key : siteNameMap.keySet()) { List ja = new ArrayList(); @@ -103,7 +103,7 @@ public class ReasonController { model.setCat("sell"); } if (StringUtils.isBlank(model.getCurrentCityDisplay())) { - model.setCurrentCityDisplay("全国"); + model.setCurrentCityDisplay("鍏ㄥ浗"); } List reasonBoList = getReasonBoList(model.getCat(), model.getCurrentCityDisplay()); @@ -144,7 +144,7 @@ public class ReasonController { private int getSellVisibleCount(String city) { HouseQueryBean queryBean = new HouseQueryBean(); queryBean.setVisible(0); - if (city != null && !"全国".equals(city)) { + if (city != null && !"鍏ㄥ浗".equals(city)) { queryBean.setCity(city); } FacetQueryResult facetResults = houseService.findByQueryBeanSort(new Pager(1), queryBean, null, false); @@ -154,7 +154,7 @@ public class ReasonController { private int getRentVisibleCount(String city) { RentHouseQueryBean queryBean = new RentHouseQueryBean(); queryBean.setVisible(0); - if (city != null && !"全国".equals(city)) { + if (city != null && !"鍏ㄥ浗".equals(city)) { queryBean.setCity(city); } FacetQueryResult facetResults = rentHouseService.findByQueryBeanSort(new Pager(1), queryBean, null, false); @@ -171,7 +171,7 @@ public class ReasonController { ReasonBo bo = new ReasonBo(); bo.setName(r.name()); bo.setMsg(r.getMsg()); - if (!"".equals(city) && !"全国".equals(city)) { + if (!"".equals(city) && !"鍏ㄥ浗".equals(city)) { bo.setStatus(reasonService.isReasonValidNoCache(r.name(), cat, city) ? 0 : 1); } else { if (reasonStatusMap.get(r.name()) != null) { @@ -197,7 +197,7 @@ public class ReasonController { if ("sell".equals(cat)) { HouseQueryBean queryBean = new HouseQueryBean(); queryBean.setVisible(-1); - if (city != null && !"全国".equals(city)) { + if (city != null && !"鍏ㄥ浗".equals(city)) { queryBean.setCity(city); } FacetQuery fq = new FacetQuery(); @@ -210,7 +210,7 @@ public class ReasonController { } else if ("rent".equals(cat)) { RentHouseQueryBean queryBean = new RentHouseQueryBean(); queryBean.setVisible(-1); - if (city != null && !"全国".equals(city)) { + if (city != null && !"鍏ㄥ浗".equals(city)) { queryBean.setCity(city); } FacetQuery fq = new FacetQuery(); @@ -244,58 +244,58 @@ public class ReasonController { public Object updateStatusAction(ReasonModel model) throws UnsupportedEncodingException { if (StringUtils.isBlank(model.getName())) { - model.flash().setAttribute("message", "错误"); + model.flash().setAttribute("message", "閿欒"); return model.redirect("/reason/list"); } reasonService.updateReasonStats(model.getName(), model.getCat(), model.getStatus()); - model.flash().setAttribute("message", "更新成功"); + model.flash().setAttribute("message", "鏇存柊鎴愬姛"); return model.redirect("/reason/list?currentCityDisplay=" + URLEncoder.encode(model.getCurrentCityDisplay(), "UTF-8") + "&cat=" + model.getCat()); } public Object deleteAction(ReasonModel model) { if (StringUtils.isBlank(model.getId())) { - model.flash().setAttribute("message", "id错误"); + model.flash().setAttribute("message", "id閿欒"); return model.redirect("/reason/list"); } ReasonBo reason = reasonService.findReasonConfigById(model.getId()); if (reason == null) { - model.flash().setAttribute("message", "id不存在"); + model.flash().setAttribute("message", "id涓嶅瓨鍦�"); return model.redirect("/reason/list"); } reasonService.deleteReasonConfigById(reason.getId()); - model.flash().setAttribute("message", "删除成功"); + model.flash().setAttribute("message", "鍒犻櫎鎴愬姛"); return model.redirect("/reason/edit?name=" + reason.getName() + "&cat=" + model.getCat()); } public Object saveAction(ReasonModel model) { if (StringUtils.isBlank(model.getName())) { - model.flash().setAttribute("message", "错误"); + model.flash().setAttribute("message", "閿欒"); return model.redirect("/reason/list"); } ReasonEnum reasonEnum = ReasonEnum.parseName(model.getName()); if (reasonEnum == null) { - model.flash().setAttribute("message", "错误"); + model.flash().setAttribute("message", "閿欒"); return model.redirect("/reason/list"); } if (StringUtils.isBlank(model.getCat())) { - model.flash().setAttribute("message", "类型不能为空"); + model.flash().setAttribute("message", "绫诲瀷涓嶈兘涓虹┖"); return model.redirect("/reason/edit?name=" + model.getName()); } if (StringUtils.isBlank(model.getConfigCity()) || ServerAreaData.getServerAreaByDisplayDefaultNull(model.getConfigCity()) == null) { - model.flash().setAttribute("message", "城市输入不正确"); + model.flash().setAttribute("message", "鍩庡競杈撳叆涓嶆纭�"); return model.redirect("/reason/edit?name=" + model.getName()); } ReasonBo oldReason = reasonService.findReasonConfig(reasonEnum.name(), model.getCat(), model.getConfigCity()); if (oldReason != null) { - model.flash().setAttribute("message", "该规则已经存在"); + model.flash().setAttribute("message", "璇ヨ鍒欏凡缁忓瓨鍦�"); return model.redirect("/reason/edit?name=" + model.getName()); } @@ -307,10 +307,10 @@ public class ReasonController { reason.setStatus(1); reasonService.saveReasonConfig(reason); if (StringUtils.isNotBlank(reason.getId())) { - model.flash().setAttribute("message", "保存成功"); + model.flash().setAttribute("message", "淇濆瓨鎴愬姛"); return model.redirect("/reason/edit?name=" + reason.getName() + "&cat=" + model.getCat()); } else { - model.flash().setAttribute("message", "保存失败"); + model.flash().setAttribute("message", "淇濆瓨澶辫触"); return model.redirect("/reason/create"); } } diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/RegTimeAndEvaTimeController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/RegTimeAndEvaTimeController.java index 699664bb4..10384bb9a 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/RegTimeAndEvaTimeController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/RegTimeAndEvaTimeController.java @@ -21,9 +21,9 @@ import com.fangjia.dal.mongo.model.RegTimeAndEvaTime; import com.fangjia.service.mongo.bkoff.RegTimeAndEvaTimeService; /** - * API监控后台 + * API鐩戞帶鍚庡彴 * @author yinjihuan - * @date 2016年10月20日 + * @date 2016骞�10鏈�20鏃� * */ public class RegTimeAndEvaTimeController { @@ -62,7 +62,7 @@ public class RegTimeAndEvaTimeController { return model; } - //将数据导出 + //灏嗘暟鎹鍑� public void exportExcelAction(RegTimeAndEvaTimeModel model) { Date beginDate = null; Date endDate = null; @@ -81,10 +81,10 @@ public class RegTimeAndEvaTimeController { } OutputStream os = null; BufferedOutputStream fos = null; - String[] columns = { "估价次数", "注册次数", "日期"}; + String[] columns = { "浼颁环娆℃暟", "娉ㄥ唽娆℃暟", "鏃ユ湡"}; List regTimeEvaTimes = regTimeAndEvaTimeService.findByParams(beginDate,endDate); HSSFWorkbook wb = new HSSFWorkbook(); - Sheet sheet = wb.createSheet("注册和估价统计"); + Sheet sheet = wb.createSheet("娉ㄥ唽鍜屼及浠风粺璁�"); Row row = sheet.createRow(0); for (int i = 0; i < columns.length; i++) { row.createCell(i).setCellValue(columns[i]); @@ -97,21 +97,21 @@ public class RegTimeAndEvaTimeController { otherRow.createCell(2).setCellValue(DateUtil.formatToYYYYMMDD(regTimeEvaTimes.get(j).getCreatedDate())); } } - String fileName = "注册和估价统计表.xls"; + String fileName = "娉ㄥ唽鍜屼及浠风粺璁¤〃.xls"; try { HttpServletResponse response = ActionContext.getContext() .getResponse(); response.setCharacterEncoding("UTF-8"); - // response.reset();// 清空输出流 + // response.reset();// 娓呯┖杈撳嚭娴� response.setContentType("application/x-download;charset=UTF-8"); fileName = new String(fileName.getBytes("GBK"), "ISO-8859-1"); - if (fileName.length() > 150) {// 解决IE 6.0 bug + if (fileName.length() > 150) {// 瑙e喅IE 6.0 bug fileName = new String(fileName.getBytes("GBK"), "ISO-8859-1"); } response.setHeader("Content-Disposition", "attachment;filename=" + fileName); model.redirect("/regTimeAndEvaTime/list"); - os = response.getOutputStream();// 取得输出流 + os = response.getOutputStream();// 鍙栧緱杈撳嚭娴� wb.write(os); os.flush(); } catch (Exception e) { diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/RegionHouseController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/RegionHouseController.java index a46ca7058..46126d73a 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/RegionHouseController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/RegionHouseController.java @@ -18,14 +18,14 @@ public class RegionHouseController { public Object listAction(RegionHouseModel model) { if (StringUtils.isBlank(model.getCityDisplay())) { - model.setCityDisplay("上海"); + model.setCityDisplay("涓婃捣"); } List regionHouses = houseStatService.findAllHouseStat(model.getCityDisplay()); List regions = null; - if(model.getCityDisplay().equals("上海")){ - regions = Arrays.asList("全市","浦东","黄浦","徐汇","长宁","静安","普陀","闸北","虹口","杨浦","闵行","宝山","嘉定","金山","松江","青浦","奉贤","崇明"); - }else if(model.getCityDisplay().equals("北京")){ - regions = Arrays.asList("全市","东城","西城","朝阳","丰台","石景山","海淀","房山","通州","顺义","昌平","大兴","门头沟","怀柔","平谷","密云","延庆"); + if(model.getCityDisplay().equals("涓婃捣")){ + regions = Arrays.asList("鍏ㄥ競","娴︿笢","榛勬郸","寰愭眹","闀垮畞","闈欏畨","鏅檧","闂稿寳","铏瑰彛","鏉ㄦ郸","闂佃","瀹濆北","鍢夊畾","閲戝北","鏉炬睙","闈掓郸","濂夎搐","宕囨槑"); + }else if(model.getCityDisplay().equals("鍖椾含")){ + regions = Arrays.asList("鍏ㄥ競","涓滃煄","瑗垮煄","鏈濋槼","涓板彴","鐭虫櫙灞�","娴锋穩","鎴垮北","閫氬窞","椤轰箟","鏄屽钩","澶у叴","闂ㄥご娌�","鎬�鏌�","骞宠胺","瀵嗕簯","寤跺簡"); } if (model.getRate() == 0) { if (regionHouses.size() > 0) { diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/RegionRentController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/RegionRentController.java index 302e31a2b..11092cf93 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/RegionRentController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/RegionRentController.java @@ -31,7 +31,7 @@ public class RegionRentController { public Object regionListAction(DistrictRentModel model) { if(StringUtils.isBlank(model.getCityDisplay())) { - model.setCityDisplay("全国"); + model.setCityDisplay("鍏ㄥ浗"); }else{ Date lastMonthDate = null; // if(model.getStartDate()==null && model.getEndDate()==null){ @@ -87,14 +87,14 @@ public class RegionRentController { Date statDate = DateUtil.parseFormatDate(model.getStatDate()); Date lastDate = DateUtil.truncateDay(DateUtil.getLastDayOfMonth(statDate)); if(statDate.getTime() != lastDate.getTime()){ - data.put("data", "请选择月末"); + data.put("data", "璇烽�夋嫨鏈堟湯"); json.setJsonModel(data); return json; } RegionStatRent stat = regionStatRentService.findRegionStatRentByParams(model.getCityDisplay(), model.getRegion(), statDate, model.getRoom()); if(stat!=null){ - data.put("data", "此记录已存在!"); + data.put("data", "姝よ褰曞凡瀛樺湪!"); json.setJsonModel(data); return json; } @@ -180,8 +180,8 @@ public class RegionRentController { } JSONObject jo = new JSONObject(); - jo.put("name", room+"室"); - //jo.put("color", "室"); + jo.put("name", room+"瀹�"); + //jo.put("color", "瀹�"); jo.put("data", datas); result.add(jo); } @@ -214,8 +214,8 @@ public class RegionRentController { } JSONObject jo = new JSONObject(); - jo.put("name", room+"室"); - //jo.put("color", "室"); + jo.put("name", room+"瀹�"); + //jo.put("color", "瀹�"); jo.put("data", datas); result.add(jo); } @@ -249,8 +249,8 @@ public class RegionRentController { } JSONObject jo = new JSONObject(); - jo.put("name", room+"室"); - //jo.put("color", "室"); + jo.put("name", room+"瀹�"); + //jo.put("color", "瀹�"); jo.put("data", datas); result.add(jo); } diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/RegionblockController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/RegionblockController.java index f8de8c1b1..8665e3c87 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/RegionblockController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/RegionblockController.java @@ -63,7 +63,7 @@ public class RegionblockController { } /** - * 更新 + * 鏇存柊 */ public Object updateAction(RegionBlockModel model) { model.setViewType("json"); @@ -134,10 +134,10 @@ public class RegionblockController { if (null != model.getSequence()) { data.put("sequence", model.getSequence()); } - if (StringUtils.isNotBlank(model.getShow()) && "显示".equals(model.getShow())) { + if (StringUtils.isNotBlank(model.getShow()) && "鏄剧ず".equals(model.getShow())) { data.put("show", 1); } - if (StringUtils.isNotBlank(model.getShow()) && "隐藏".equals(model.getShow())) { + if (StringUtils.isNotBlank(model.getShow()) && "闅愯棌".equals(model.getShow())) { data.put("show", 0); } @@ -162,7 +162,7 @@ public class RegionblockController { } /** - * 同步区域板块数据 + * 鍚屾鍖哄煙鏉垮潡鏁版嵁 */ @Ignore public Object importRegionAction(RegionBlockModel model) { @@ -181,22 +181,22 @@ public class RegionblockController { return model; } - // TODO:未完成代码!!!! + // TODO:鏈畬鎴愪唬鐮侊紒锛侊紒锛� @SuppressWarnings("unchecked") private void importRegion(String cityName, DBCollection knowBaseCollection) { - // 处理区域 - Map oldRegionMap = regionBlockService.findRegionsByCity(cityName); // 现有区域 - List newRegions = new ArrayList(); // 新增的区域列表 - List delRegionIds = new ArrayList(); // 已删除的区域ID列表 + // 澶勭悊鍖哄煙 + Map oldRegionMap = regionBlockService.findRegionsByCity(cityName); // 鐜版湁鍖哄煙 + List newRegions = new ArrayList(); // 鏂板鐨勫尯鍩熷垪琛� + List delRegionIds = new ArrayList(); // 宸插垹闄ょ殑鍖哄煙ID鍒楄〃 - // 从知识库取当前城市的所有区域 + // 浠庣煡璇嗗簱鍙栧綋鍓嶅煄甯傜殑鎵�鏈夊尯鍩� DBObject query = new BasicDBObject(); query.put("cat", "region"); query.put("extra_data.city", cityName); DBCursor cursor = knowBaseCollection.find(query); - int regionIndex = 1; // 序号 + int regionIndex = 1; // 搴忓彿 while (cursor.hasNext()) { - // 知识库中的数据 + // 鐭ヨ瘑搴撲腑鐨勬暟鎹� DBObject curRegion = cursor.next(); Map extraData = (Map) curRegion.get("extra_data"); String value = (String) curRegion.get("value"); @@ -212,7 +212,7 @@ public class RegionblockController { String key = cityName + "_" + value; RegionBlock oldRegion = oldRegionMap.get(key); if (null == oldRegion) { - // 新增区域 + // 鏂板鍖哄煙 RegionBlock newRegion = new RegionBlock(); newRegion.setCategory("region"); newRegion.setCity(cityName); @@ -239,7 +239,7 @@ public class RegionblockController { data.put("orgName", value); } - // 如有更新的字段 + // 濡傛湁鏇存柊鐨勫瓧娈� if (MapUtils.isNotEmpty(data)) { regionBlockService.updateById(data, oldRegion.getId()); } @@ -248,17 +248,17 @@ public class RegionblockController { } } - // 如有新增区域 + // 濡傛湁鏂板鍖哄煙 if (CollectionUtils.isNotEmpty(newRegions)) { regionBlockService.saveList(newRegions); } - // 有删除的区域 + // 鏈夊垹闄ょ殑鍖哄煙 if (MapUtils.isNotEmpty(oldRegionMap)) { for (RegionBlock oldRegion : oldRegionMap.values()) { delRegionIds.add(oldRegion.getId()); - // 删除该区域下的板块数据 + // 鍒犻櫎璇ュ尯鍩熶笅鐨勬澘鍧楁暟鎹� regionBlockService.deleteBlocksByRegion(cityName, oldRegion.getName()); } regionBlockService.deleteByIds(delRegionIds); @@ -267,19 +267,19 @@ public class RegionblockController { @SuppressWarnings("unchecked") private void importBlock(String cityName, DBCollection knowBaseCollection) { - // 处理板块 - Map oldBlockMap = regionBlockService.findBlocksByCity(cityName, null); // 现有板块 - List newBlocks = new ArrayList(); // 新增的板块列表 - List delBlockIds = new ArrayList(); // 已删除的板块ID列表 + // 澶勭悊鏉垮潡 + Map oldBlockMap = regionBlockService.findBlocksByCity(cityName, null); // 鐜版湁鏉垮潡 + List newBlocks = new ArrayList(); // 鏂板鐨勬澘鍧楀垪琛� + List delBlockIds = new ArrayList(); // 宸插垹闄ょ殑鏉垮潡ID鍒楄〃 - // 从知识库取当前城市的所有板块 + // 浠庣煡璇嗗簱鍙栧綋鍓嶅煄甯傜殑鎵�鏈夋澘鍧� DBObject query = new BasicDBObject(); query.put("cat", "block"); query.put("extra_data.city", cityName); DBCursor cursor = knowBaseCollection.find(query); int blockIndex = 1; while (cursor.hasNext()) { - // 知识库中的数据 + // 鐭ヨ瘑搴撲腑鐨勬暟鎹� DBObject curRegion = cursor.next(); Map extraData = (Map) curRegion.get("extra_data"); String value = (String) curRegion.get("value"); @@ -296,7 +296,7 @@ public class RegionblockController { String key = cityName + "_" + parent + "_" + value; RegionBlock oldBlock = oldBlockMap.get(key); if (null == oldBlock) { - // 新增板块 + // 鏂板鏉垮潡 RegionBlock newBlock = new RegionBlock(); newBlock.setCategory("block"); newBlock.setCity(cityName); @@ -326,7 +326,7 @@ public class RegionblockController { data.put("orgName", value); } - // 如有更新的字段 + // 濡傛湁鏇存柊鐨勫瓧娈� if (MapUtils.isNotEmpty(data)) { regionBlockService.updateById(data, oldBlock.getId()); } @@ -335,12 +335,12 @@ public class RegionblockController { } } - // 如有新增区域 + // 濡傛湁鏂板鍖哄煙 if (CollectionUtils.isNotEmpty(newBlocks)) { regionBlockService.saveList(newBlocks); } - // 有删除的区域 + // 鏈夊垹闄ょ殑鍖哄煙 if (MapUtils.isNotEmpty(oldBlockMap)) { for (RegionBlock oldBlock : oldBlockMap.values()) { delBlockIds.add(oldBlock.getId()); diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/RegisterInfoController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/RegisterInfoController.java index b1b327e78..d20d40b18 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/RegisterInfoController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/RegisterInfoController.java @@ -69,7 +69,7 @@ public class RegisterInfoController { } /** - * 小区调查审核 + * 灏忓尯璋冩煡瀹℃牳 * @author shibb on 2015-4-20 * @param model * @return @@ -90,7 +90,7 @@ public class RegisterInfoController { } /** - * 小区调查审核通过 + * 灏忓尯璋冩煡瀹℃牳閫氳繃 * @author shibb on 2015-4-20 * @param model * @return @@ -101,7 +101,7 @@ public class RegisterInfoController { List taskResultList = taskService.findTaskResultsByTaskId(model.getTaskId()); if(StringUtils.isBlank(model.getTaskId())){ - //保存审核人自己填写的内容,同时将所有其他人的回答设置成未被采纳 + //淇濆瓨瀹℃牳浜鸿嚜宸卞~鍐欑殑鍐呭锛屽悓鏃跺皢鎵�鏈夊叾浠栦汉鐨勫洖绛旇缃垚鏈閲囩撼 BasicDBObject obj = new BasicDBObject(); obj.append("property", model.getProperty()); obj.append("price", model.getPrice()); @@ -115,13 +115,13 @@ public class RegisterInfoController { } } }else{ - //将被采纳的人的回答状态设置成已采纳 + //灏嗚閲囩撼鐨勪汉鐨勫洖绛旂姸鎬佽缃垚宸查噰绾� TaskResult taskResult = taskService.findTaskResultById(model.getTaskResultId()); data.put("taskResult", taskResult.getResult()); Map resultData = new HashMap(); resultData.put("status", StatusEnum.ADOPT.getValue()); taskService.updateTaskResult(model.getTaskResultId(), resultData); - //将未被采纳的人员的回答设置成为采纳 + //灏嗘湭琚噰绾崇殑浜哄憳鐨勫洖绛旇缃垚涓洪噰绾� if(taskResultList.size()>1){ for(TaskResult vo:taskResultList){ if(!vo.getId().equals(model.getTaskResultId())){ @@ -132,15 +132,15 @@ public class RegisterInfoController { } } } - //将任务状态设置为处理完成 + //灏嗕换鍔$姸鎬佽缃负澶勭悊瀹屾垚 data.put("status", TaskStatusEnum.SUC.getValue()); - //如果有奖励,则保存奖励 + //濡傛灉鏈夊鍔憋紝鍒欎繚瀛樺鍔� if(!StringUtils.isBlank(model.getReward())){ data.put("reward", Double.parseDouble(model.getReward())); } - //获取用户姓名 + //鑾峰彇鐢ㄦ埛濮撳悕 String userName = (String) ActionContext.getContext().getRequest().getSession().getAttribute("realName"); - //保存审核人 + //淇濆瓨瀹℃牳浜� data.put("verifier", userName); data.put("dateModified", new Date()); taskService.updateTask(model.getTaskId(), data); diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/RentHouseController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/RentHouseController.java index 665c1717a..d43fcbad2 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/RentHouseController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/RentHouseController.java @@ -22,21 +22,21 @@ import com.fangjia.service.datastore.RentHouseService; import com.fangjia.service.mongo.fs.FilesService; /** - * 租房controller + * 绉熸埧controller * * @author liupei */ public class RentHouseController { private final static Logger LOGGER = LoggerFactory.getLogger(RentHouseController.class); /** - * 租房Service + * 绉熸埧Service */ private RentHouseService rentHouseService; private FilesService filesService; /** - * 列表Action + * 鍒楄〃Action * * @param model * @return @@ -72,7 +72,7 @@ public class RentHouseController { } /** - * 删除房源 + * 鍒犻櫎鎴挎簮 * * @param model * @return @@ -89,7 +89,7 @@ public class RentHouseController { } /** - * 进入更新房源页面Action + * 杩涘叆鏇存柊鎴挎簮椤甸潰Action * * @param model * @return @@ -103,7 +103,7 @@ public class RentHouseController { } /** - * 执行删除房源图片Action + * 鎵ц鍒犻櫎鎴挎簮鍥剧墖Action * * @param model * @return @@ -141,7 +141,7 @@ public class RentHouseController { } /** - * 解析房源id + * 瑙f瀽鎴挎簮id * * @param idStr * @return diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/RentPriceUpdateController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/RentPriceUpdateController.java index 7964e3813..7c1a804c5 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/RentPriceUpdateController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/RentPriceUpdateController.java @@ -49,7 +49,7 @@ import javax.servlet.http.HttpSession; import java.util.*; /** - * 负责租金更新任务的管理工作 + * 璐熻矗绉熼噾鏇存柊浠诲姟鐨勭鐞嗗伐浣� */ public class RentPriceUpdateController { @@ -71,17 +71,17 @@ public class RentPriceUpdateController { private SeawaterService seawaterService; private static final List IPS = Arrays.asList("fangjia-priceanalysis-0"); - private static final List HOT_CITIES = Arrays.asList("上海", "北京", "广州", "深圳", "天津", "重庆", "成都", "杭州", "南京", "长沙", - "武汉", "西安", "沈阳"); + private static final List HOT_CITIES = Arrays.asList("涓婃捣", "鍖椾含", "骞垮窞", "娣卞湷", "澶╂触", "閲嶅簡", "鎴愰兘", "鏉窞", "鍗椾含", "闀挎矙", + "姝︽眽", "瑗垮畨", "娌堥槼"); public Object listQRAction(AvgPriceUpdateModel model) { if(StringUtils.isBlank(model.getCityDisplay())) { - model.setCityDisplay("全国"); + model.setCityDisplay("鍏ㄥ浗"); } if(model.getSdateStart() <= 0 || model.getSdateEnd() <= 0) { Date sunday = DateUtil.getThisSunday(new Date()); - model.setSdateStart(Integer.parseInt(DateUtil.formatToTightYYYYMMDD(DateUtil.getBeforeDay(sunday, 13 * 7)))); //最近一季度 + model.setSdateStart(Integer.parseInt(DateUtil.formatToTightYYYYMMDD(DateUtil.getBeforeDay(sunday, 13 * 7)))); //鏈�杩戜竴瀛e害 model.setSdateEnd(Integer.parseInt(DateUtil.formatToTightYYYYMMDD(sunday))); } @@ -98,12 +98,12 @@ public class RentPriceUpdateController { public Object listSQRAction(AvgPriceUpdateModel model) { if(StringUtils.isBlank(model.getCityDisplay())) { - model.setCityDisplay("全国"); + model.setCityDisplay("鍏ㄥ浗"); } if(model.getSdateStart() <= 0 || model.getSdateEnd() <= 0) { Date sunday = DateUtil.getThisSunday(new Date()); - model.setSdateStart(Integer.parseInt(DateUtil.formatToTightYYYYMMDD(DateUtil.getBeforeDay(sunday, 13 * 7)))); //最近一季度 + model.setSdateStart(Integer.parseInt(DateUtil.formatToTightYYYYMMDD(DateUtil.getBeforeDay(sunday, 13 * 7)))); //鏈�杩戜竴瀛e害 model.setSdateEnd(Integer.parseInt(DateUtil.formatToTightYYYYMMDD(sunday))); } @@ -119,12 +119,12 @@ public class RentPriceUpdateController { public Object loadQRDataAction(AvgPriceUpdateModel model) { if(StringUtils.isBlank(model.getCityDisplay())) { - model.setCityDisplay("全国"); + model.setCityDisplay("鍏ㄥ浗"); } if(model.getSdateStart() <= 0 || model.getSdateEnd() <= 0) { Date sunday = DateUtil.getThisSunday(new Date()); - model.setSdateStart(Integer.parseInt(DateUtil.formatToTightYYYYMMDD(DateUtil.getBeforeDay(sunday, 13)))); //最近一季度 + model.setSdateStart(Integer.parseInt(DateUtil.formatToTightYYYYMMDD(DateUtil.getBeforeDay(sunday, 13)))); //鏈�杩戜竴瀛e害 model.setSdateEnd(Integer.parseInt(DateUtil.formatToTightYYYYMMDD(sunday))); } @@ -139,12 +139,12 @@ public class RentPriceUpdateController { public Object loadSQRDataAction(AvgPriceUpdateModel model) { if(StringUtils.isBlank(model.getCityDisplay())) { - model.setCityDisplay("全国"); + model.setCityDisplay("鍏ㄥ浗"); } if(model.getSdateStart() <= 0 || model.getSdateEnd() <= 0) { Date sunday = DateUtil.getThisSunday(new Date()); - model.setSdateStart(Integer.parseInt(DateUtil.formatToTightYYYYMMDD(DateUtil.getBeforeDay(sunday, 13)))); //最近一季度 + model.setSdateStart(Integer.parseInt(DateUtil.formatToTightYYYYMMDD(DateUtil.getBeforeDay(sunday, 13)))); //鏈�杩戜竴瀛e害 model.setSdateEnd(Integer.parseInt(DateUtil.formatToTightYYYYMMDD(sunday))); } @@ -168,9 +168,9 @@ public class RentPriceUpdateController { pt5 = new JSONArray(), pt6 = new JSONArray(), pt7 = new JSONArray(), pt8 = new JSONArray(); if("1".equals(stype)) { - jo1.put("name", "一个月<10小区量"); - jo2.put("name", "一个月<30小区量"); - jo3.put("name", "一个月<100小区量"); + jo1.put("name", "涓�涓湀<10灏忓尯閲�"); + jo2.put("name", "涓�涓湀<30灏忓尯閲�"); + jo3.put("name", "涓�涓湀<100灏忓尯閲�"); for(SampleQualityReport sqr : sampleQualityReports) { long tms = DateUtil.parseDate(String.valueOf(sqr.getWeekend()), "yyyyMMdd").getTime(); pt1.add(JSONArray.fromObject("[" + tms + "," + sqr.getMonthCount1() + "]")); @@ -178,9 +178,9 @@ public class RentPriceUpdateController { pt3.add(JSONArray.fromObject("[" + tms + "," + sqr.getMonthCount3() + "]")); } }else if("2".equals(stype)) { - jo1.put("name", "一个月<10比例"); - jo2.put("name", "一个月<30比例"); - jo3.put("name", "一个月<100比例"); + jo1.put("name", "涓�涓湀<10姣斾緥"); + jo2.put("name", "涓�涓湀<30姣斾緥"); + jo3.put("name", "涓�涓湀<100姣斾緥"); for(SampleQualityReport sqr : sampleQualityReports) { long tms = DateUtil.parseDate(String.valueOf(sqr.getWeekend()), "yyyyMMdd").getTime(); pt1.add(JSONArray.fromObject("[" + tms + "," + (int)((double)sqr.getMonthCount1() / (double)sqr.getDistrictCount() * 1000.0) / 10.0 + "]")); @@ -188,9 +188,9 @@ public class RentPriceUpdateController { pt3.add(JSONArray.fromObject("[" + tms + "," + (int)((double)sqr.getMonthCount3() / (double)sqr.getDistrictCount() * 1000.0) / 10.0+ "]")); } }else if("3".equals(stype)) { - jo1.put("name", "季度<10小区量"); - jo2.put("name", "季度<30小区量"); - jo3.put("name", "季度<100小区量"); + jo1.put("name", "瀛e害<10灏忓尯閲�"); + jo2.put("name", "瀛e害<30灏忓尯閲�"); + jo3.put("name", "瀛e害<100灏忓尯閲�"); for(SampleQualityReport sqr : sampleQualityReports) { long tms = DateUtil.parseDate(String.valueOf(sqr.getWeekend()), "yyyyMMdd").getTime(); pt1.add(JSONArray.fromObject("[" + tms + "," + sqr.getQuarCount1() + "]")); @@ -198,9 +198,9 @@ public class RentPriceUpdateController { pt3.add(JSONArray.fromObject("[" + tms + "," + sqr.getQuarCount3() + "]")); } }else if("4".equals(stype)) { - jo1.put("name", "季度<10比例"); - jo2.put("name", "季度<30比例"); - jo3.put("name", "季度<100比例"); + jo1.put("name", "瀛e害<10姣斾緥"); + jo2.put("name", "瀛e害<30姣斾緥"); + jo3.put("name", "瀛e害<100姣斾緥"); for(SampleQualityReport sqr : sampleQualityReports) { long tms = DateUtil.parseDate(String.valueOf(sqr.getWeekend()), "yyyyMMdd").getTime(); pt1.add(JSONArray.fromObject("[" + tms + "," + (int)((double)sqr.getQuarCount1() / (double)sqr.getDistrictCount() * 1000.0) / 10.0 + "]")); @@ -208,9 +208,9 @@ public class RentPriceUpdateController { pt3.add(JSONArray.fromObject("[" + tms + "," + (int)((double)sqr.getQuarCount3() / (double)sqr.getDistrictCount() * 1000.0) / 10.0+ "]")); } }else if("5".equals(stype)) { - jo1.put("name", "半年<10小区量"); - jo2.put("name", "半年<30小区量"); - jo3.put("name", "半年<100小区量"); + jo1.put("name", "鍗婂勾<10灏忓尯閲�"); + jo2.put("name", "鍗婂勾<30灏忓尯閲�"); + jo3.put("name", "鍗婂勾<100灏忓尯閲�"); for(SampleQualityReport sqr : sampleQualityReports) { long tms = DateUtil.parseDate(String.valueOf(sqr.getWeekend()), "yyyyMMdd").getTime(); pt1.add(JSONArray.fromObject("[" + tms + "," + sqr.getHalfCount1() + "]")); @@ -218,9 +218,9 @@ public class RentPriceUpdateController { pt3.add(JSONArray.fromObject("[" + tms + "," + sqr.getHalfCount3() + "]")); } }else if("6".equals(stype)) { - jo1.put("name", "半年<10比例"); - jo2.put("name", "半年<30比例"); - jo3.put("name", "半年<100比例"); + jo1.put("name", "鍗婂勾<10姣斾緥"); + jo2.put("name", "鍗婂勾<30姣斾緥"); + jo3.put("name", "鍗婂勾<100姣斾緥"); for(SampleQualityReport sqr : sampleQualityReports) { long tms = DateUtil.parseDate(String.valueOf(sqr.getWeekend()), "yyyyMMdd").getTime(); pt1.add(JSONArray.fromObject("[" + tms + "," + (int)((double)sqr.getHalfCount1() / (double)sqr.getDistrictCount() * 1000.0) / 10.0 + "]")); @@ -228,9 +228,9 @@ public class RentPriceUpdateController { pt3.add(JSONArray.fromObject("[" + tms + "," + (int)((double)sqr.getHalfCount3() / (double)sqr.getDistrictCount() * 1000.0) / 10.0+ "]")); } }else if("7".equals(stype)) { - jo1.put("name", "一年<10小区量"); - jo2.put("name", "一年<30小区量"); - jo3.put("name", "一年<100小区量"); + jo1.put("name", "涓�骞�<10灏忓尯閲�"); + jo2.put("name", "涓�骞�<30灏忓尯閲�"); + jo3.put("name", "涓�骞�<100灏忓尯閲�"); for(SampleQualityReport sqr : sampleQualityReports) { long tms = DateUtil.parseDate(String.valueOf(sqr.getWeekend()), "yyyyMMdd").getTime(); pt1.add(JSONArray.fromObject("[" + tms + "," + sqr.getYearCount1() + "]")); @@ -238,9 +238,9 @@ public class RentPriceUpdateController { pt3.add(JSONArray.fromObject("[" + tms + "," + sqr.getYearCount3() + "]")); } }else if("8".equals(stype)) { - jo1.put("name", "一年<10比例"); - jo2.put("name", "一年<30比例"); - jo3.put("name", "一年<100比例"); + jo1.put("name", "涓�骞�<10姣斾緥"); + jo2.put("name", "涓�骞�<30姣斾緥"); + jo3.put("name", "涓�骞�<100姣斾緥"); for(SampleQualityReport sqr : sampleQualityReports) { long tms = DateUtil.parseDate(String.valueOf(sqr.getWeekend()), "yyyyMMdd").getTime(); pt1.add(JSONArray.fromObject("[" + tms + "," + (int)((double)sqr.getYearCount1() / (double)sqr.getDistrictCount() * 1000.0) / 10.0 + "]")); @@ -274,14 +274,14 @@ public class RentPriceUpdateController { JSONArray pt1 = new JSONArray(), pt2 = new JSONArray(), pt3 = new JSONArray(), pt4 = new JSONArray(), pt5 = new JSONArray(), pt6 = new JSONArray(), pt7 = new JSONArray(), pt8 = new JSONArray(); if("1".equals(stype)) { - jo1.put("name", "小区量(全部)"); - jo2.put("name", "小区量(无法计算)"); - jo3.put("name", "小区量(指导价)"); - jo4.put("name", "小区量(自身样本)"); - jo5.put("name", "小区量(第三方)"); - jo6.put("name", "小区量(成交数据)"); - jo7.put("name", "小区量(周边小区)"); - jo8.put("name", "小区量(推算)"); + jo1.put("name", "灏忓尯閲�(鍏ㄩ儴)"); + jo2.put("name", "灏忓尯閲�(鏃犳硶璁$畻)"); + jo3.put("name", "灏忓尯閲�(鎸囧浠�)"); + jo4.put("name", "灏忓尯閲�(鑷韩鏍锋湰)"); + jo5.put("name", "灏忓尯閲�(绗笁鏂�)"); + jo6.put("name", "灏忓尯閲�(鎴愪氦鏁版嵁)"); + jo7.put("name", "灏忓尯閲�(鍛ㄨ竟灏忓尯)"); + jo8.put("name", "灏忓尯閲�(鎺ㄧ畻)"); for(AveragerQualityReport aqr : averagerQualityReports) { long tms = DateUtil.parseDate(String.valueOf(aqr.getWeekend()), "yyyyMMdd").getTime(); pt1.add(JSONArray.fromObject("[" + tms + "," + aqr.getDistrictCount() + "]")); @@ -294,14 +294,14 @@ public class RentPriceUpdateController { pt8.add(JSONArray.fromObject("[" + tms + "," + aqr.getDeriCount() + "]")); } }else if("2".equals(stype)) { - jo1.put("name", "平均可信度(全部)"); - jo2.put("name", "平均可信度(无法计算)"); - jo3.put("name", "平均可信度(指导价)"); - jo4.put("name", "平均可信度(自身样本)"); - jo5.put("name", "平均可信度(第三方)"); - jo6.put("name", "平均可信度(成交数据)"); - jo7.put("name", "平均可信度(周边小区)"); - jo8.put("name", "平均可信度(推算)"); + jo1.put("name", "骞冲潎鍙俊搴�(鍏ㄩ儴)"); + jo2.put("name", "骞冲潎鍙俊搴�(鏃犳硶璁$畻)"); + jo3.put("name", "骞冲潎鍙俊搴�(鎸囧浠�)"); + jo4.put("name", "骞冲潎鍙俊搴�(鑷韩鏍锋湰)"); + jo5.put("name", "骞冲潎鍙俊搴�(绗笁鏂�)"); + jo6.put("name", "骞冲潎鍙俊搴�(鎴愪氦鏁版嵁)"); + jo7.put("name", "骞冲潎鍙俊搴�(鍛ㄨ竟灏忓尯)"); + jo8.put("name", "骞冲潎鍙俊搴�(鎺ㄧ畻)"); for(AveragerQualityReport aqr : averagerQualityReports) { long tms = DateUtil.parseDate(String.valueOf(aqr.getWeekend()), "yyyyMMdd").getTime(); pt1.add(JSONArray.fromObject("[" + tms + "," + (int)(aqr.getAvgCredit() * 100000) + "]")); @@ -314,14 +314,14 @@ public class RentPriceUpdateController { pt8.add(JSONArray.fromObject("[" + tms + "," + (int)(aqr.getDeriCredit() * 100000) + "]")); } }else if("3".equals(stype)) { - jo1.put("name", "测试案例数量(全部)"); - jo2.put("name", "测试案例数量(无法计算)"); - jo3.put("name", "测试案例数量(指导价)"); - jo4.put("name", "测试案例数量(自身样本)"); - jo5.put("name", "测试案例数量(第三方)"); - jo6.put("name", "测试案例数量(成交数据)"); - jo7.put("name", "测试案例数量(周边小区)"); - jo8.put("name", "测试案例数量(推算)"); + jo1.put("name", "娴嬭瘯妗堜緥鏁伴噺(鍏ㄩ儴)"); + jo2.put("name", "娴嬭瘯妗堜緥鏁伴噺(鏃犳硶璁$畻)"); + jo3.put("name", "娴嬭瘯妗堜緥鏁伴噺(鎸囧浠�)"); + jo4.put("name", "娴嬭瘯妗堜緥鏁伴噺(鑷韩鏍锋湰)"); + jo5.put("name", "娴嬭瘯妗堜緥鏁伴噺(绗笁鏂�)"); + jo6.put("name", "娴嬭瘯妗堜緥鏁伴噺(鎴愪氦鏁版嵁)"); + jo7.put("name", "娴嬭瘯妗堜緥鏁伴噺(鍛ㄨ竟灏忓尯)"); + jo8.put("name", "娴嬭瘯妗堜緥鏁伴噺(鎺ㄧ畻)"); for(AveragerQualityReport aqr : averagerQualityReports) { long tms = DateUtil.parseDate(String.valueOf(aqr.getWeekend()), "yyyyMMdd").getTime(); int allTest = aqr.getNoneTest() + aqr.getGuidingTest() + aqr.getOwnTest() + aqr.getThirdTest() + aqr.getDealTest() + aqr.getAroundTest() + aqr.getDeriTest(); @@ -335,14 +335,14 @@ public class RentPriceUpdateController { pt8.add(JSONArray.fromObject("[" + tms + "," + aqr.getDeriTest() + "]")); } }else if("4".equals(stype)) { - jo1.put("name", "案例差比<10%量(全部)"); - jo2.put("name", "案例差比<10%量(无法计算)"); - jo3.put("name", "案例差比<10%量(指导价)"); - jo4.put("name", "案例差比<10%量(自身样本)"); - jo5.put("name", "案例差比<10%量(第三方)"); - jo6.put("name", "案例差比<10%量(成交数据)"); - jo7.put("name", "案例差比<10%量(周边小区)"); - jo8.put("name", "案例差比<10%量(推算)"); + jo1.put("name", "妗堜緥宸瘮<10%閲�(鍏ㄩ儴)"); + jo2.put("name", "妗堜緥宸瘮<10%閲�(鏃犳硶璁$畻)"); + jo3.put("name", "妗堜緥宸瘮<10%閲�(鎸囧浠�)"); + jo4.put("name", "妗堜緥宸瘮<10%閲�(鑷韩鏍锋湰)"); + jo5.put("name", "妗堜緥宸瘮<10%閲�(绗笁鏂�)"); + jo6.put("name", "妗堜緥宸瘮<10%閲�(鎴愪氦鏁版嵁)"); + jo7.put("name", "妗堜緥宸瘮<10%閲�(鍛ㄨ竟灏忓尯)"); + jo8.put("name", "妗堜緥宸瘮<10%閲�(鎺ㄧ畻)"); for(AveragerQualityReport aqr : averagerQualityReports) { long tms = DateUtil.parseDate(String.valueOf(aqr.getWeekend()), "yyyyMMdd").getTime(); int allTest = aqr.getNoneTest() + aqr.getGuidingTest() + aqr.getOwnTest() + aqr.getThirdTest() + aqr.getDealTest() + aqr.getAroundTest() + aqr.getDeriTest(); @@ -357,14 +357,14 @@ public class RentPriceUpdateController { pt8.add(JSONArray.fromObject("[" + tms + "," + (int)((double)aqr.getDeriAccu1() / (double)allTest * 10000) / 100.0 + "]")); } }else if("5".equals(stype)) { - jo1.put("name", "案例差比<20%量(全部)"); - jo2.put("name", "案例差比<20%量(无法计算)"); - jo3.put("name", "案例差比<20%量(指导价)"); - jo4.put("name", "案例差比<20%量(自身样本)"); - jo5.put("name", "案例差比<20%量(第三方)"); - jo6.put("name", "案例差比<20%量(成交数据)"); - jo7.put("name", "案例差比<20%量(周边小区)"); - jo8.put("name", "案例差比<20%量(推算)"); + jo1.put("name", "妗堜緥宸瘮<20%閲�(鍏ㄩ儴)"); + jo2.put("name", "妗堜緥宸瘮<20%閲�(鏃犳硶璁$畻)"); + jo3.put("name", "妗堜緥宸瘮<20%閲�(鎸囧浠�)"); + jo4.put("name", "妗堜緥宸瘮<20%閲�(鑷韩鏍锋湰)"); + jo5.put("name", "妗堜緥宸瘮<20%閲�(绗笁鏂�)"); + jo6.put("name", "妗堜緥宸瘮<20%閲�(鎴愪氦鏁版嵁)"); + jo7.put("name", "妗堜緥宸瘮<20%閲�(鍛ㄨ竟灏忓尯)"); + jo8.put("name", "妗堜緥宸瘮<20%閲�(鎺ㄧ畻)"); for(AveragerQualityReport aqr : averagerQualityReports) { long tms = DateUtil.parseDate(String.valueOf(aqr.getWeekend()), "yyyyMMdd").getTime(); int allTest = aqr.getNoneTest() + aqr.getGuidingTest() + aqr.getOwnTest() + aqr.getThirdTest() + aqr.getDealTest() + aqr.getAroundTest() + aqr.getDeriTest(); @@ -379,14 +379,14 @@ public class RentPriceUpdateController { pt8.add(JSONArray.fromObject("[" + tms + "," + (int)((double)aqr.getDeriAccu2() / (double)allTest * 10000) / 100.0 + "]")); } }else if("6".equals(stype)) { - jo1.put("name", "案例差比<30%量(全部)"); - jo2.put("name", "案例差比<30%量(无法计算)"); - jo3.put("name", "案例差比<30%量(指导价)"); - jo4.put("name", "案例差比<30%量(自身样本)"); - jo5.put("name", "案例差比<30%量(第三方)"); - jo6.put("name", "案例差比<30%量(成交数据)"); - jo7.put("name", "案例差比<30%量(周边小区)"); - jo8.put("name", "案例差比<30%量(推算)"); + jo1.put("name", "妗堜緥宸瘮<30%閲�(鍏ㄩ儴)"); + jo2.put("name", "妗堜緥宸瘮<30%閲�(鏃犳硶璁$畻)"); + jo3.put("name", "妗堜緥宸瘮<30%閲�(鎸囧浠�)"); + jo4.put("name", "妗堜緥宸瘮<30%閲�(鑷韩鏍锋湰)"); + jo5.put("name", "妗堜緥宸瘮<30%閲�(绗笁鏂�)"); + jo6.put("name", "妗堜緥宸瘮<30%閲�(鎴愪氦鏁版嵁)"); + jo7.put("name", "妗堜緥宸瘮<30%閲�(鍛ㄨ竟灏忓尯)"); + jo8.put("name", "妗堜緥宸瘮<30%閲�(鎺ㄧ畻)"); for(AveragerQualityReport aqr : averagerQualityReports) { long tms = DateUtil.parseDate(String.valueOf(aqr.getWeekend()), "yyyyMMdd").getTime(); int allTest = aqr.getNoneTest() + aqr.getGuidingTest() + aqr.getOwnTest() + aqr.getThirdTest() + aqr.getDealTest() + aqr.getAroundTest() + aqr.getDeriTest(); @@ -538,7 +538,7 @@ public class RentPriceUpdateController { // JSONObject command = (JSONObject) commands.get(i); // cmds.add(commandToCalcCommand(command, null, remark)); // } - // startDate取createYear或buildYear最小值 + // startDate鍙朿reateYear鎴朾uildYear鏈�灏忓�� JSONObject command = (JSONObject) commands.get(0); District district = districtService.findByName(command.getString("city"), command.getString("region"), command.getString("name"), "district"); Integer createYear = null; @@ -552,10 +552,10 @@ public class RentPriceUpdateController { } } if (createYear == null) { - // 重算一年 + // 閲嶇畻涓�骞� createYear = Integer.valueOf(DateUtil.formatByPattern(DateUtils.addYears(new Date(), -1), "yyyy")); } else if (Integer.valueOf(DateUtil.formatByPattern(new Date(), "yyyy")) - createYear > 2) { - // 对于大于两年取两年 + // 瀵逛簬澶т簬涓ゅ勾鍙栦袱骞� createYear = Integer.valueOf(DateUtil.formatByPattern(DateUtils.addYears(new Date(), -2), "yyyy")); } startDate = DateUtil.parseDate(String.valueOf(createYear), "yyyy"); @@ -581,7 +581,7 @@ public class RentPriceUpdateController { if(startDate != null && endDate != null) { List months = DateUtil.getLastDayBetweenDates(startDate, endDate); if (months.isEmpty()) { - json.put("msg", "你选择的日期不包含周末,请重新选择"); + json.put("msg", "浣犻�夋嫨鐨勬棩鏈熶笉鍖呭惈鍛ㄦ湯锛岃閲嶆柊閫夋嫨"); return model; } for (Date month : months) { @@ -597,7 +597,7 @@ public class RentPriceUpdateController { } calcCommandService.save(cmds); - json.put("msg", "任务保存成功,共保存" + cmds.size() + "条任务"); + json.put("msg", "浠诲姟淇濆瓨鎴愬姛锛屽叡淇濆瓨" + cmds.size() + "鏉′换鍔�"); return model; } @@ -628,7 +628,7 @@ public class RentPriceUpdateController { cmd.setCalcType(1); } else { if (command.containsKey("startDate") && StringUtils.isNotBlank(command.getString("startDate"))) { - Date startDate = DateUtil.parseDate(command.getString("startDate"), "yyyy-MM-dd");// 均价开始时间 + Date startDate = DateUtil.parseDate(command.getString("startDate"), "yyyy-MM-dd");// 鍧囦环寮�濮嬫椂闂� if (weekend.before(startDate)) { return null; } @@ -688,13 +688,13 @@ public class RentPriceUpdateController { JsonModel jsonModel = new JsonModel(); Map resMap = new HashMap(); if(model.getAvgPrice() <= 0) { - resMap.put("msg", "价格错误!"); + resMap.put("msg", "浠锋牸閿欒!"); jsonModel.setJsonModel(resMap); return jsonModel; } if(model.getWeekend() == null || model.getWeekend().getDay() > 0) { - resMap.put("msg", "日期错误!"); + resMap.put("msg", "鏃ユ湡閿欒!"); jsonModel.setJsonModel(resMap); return jsonModel; } @@ -707,25 +707,25 @@ public class RentPriceUpdateController { city = model.getCityDisplay(); region = model.getRegion(); block = model.getBlock(); - cat = "板块"; + cat = "鏉垮潡"; }else if(StringUtils.isNotBlank(model.getCityDisplay()) && StringUtils.isNotBlank(model.getRegion()) && StringUtils.isBlank(model.getBlock())) { city = model.getCityDisplay(); region = model.getRegion(); - cat = "区域"; + cat = "鍖哄煙"; }else if(StringUtils.isNotBlank(model.getCityDisplay()) && StringUtils.isBlank(model.getRegion()) && StringUtils.isBlank(model.getBlock())) { city = model.getCityDisplay(); - cat = "城市"; + cat = "鍩庡競"; } if(city == null || region == null || block == null) { - resMap.put("msg", "城市区域板块错误!"); + resMap.put("msg", "鍩庡競鍖哄煙鏉垮潡閿欒!"); jsonModel.setJsonModel(resMap); return jsonModel; } RegionStat regionStat = regionStatService.findRegionStat(city, region, block, model.getWeekend()); if (regionStat != null) { - resMap.put("msg", "均价数据已存在!"); + resMap.put("msg", "鍧囦环鏁版嵁宸插瓨鍦�!"); jsonModel.setJsonModel(resMap); return jsonModel; } @@ -774,7 +774,7 @@ public class RentPriceUpdateController { } /**a - * 加载某个小区的房源信息 + * 鍔犺浇鏌愪釜灏忓尯鐨勬埧婧愪俊鎭� * * @param model * @return @@ -827,7 +827,7 @@ public class RentPriceUpdateController { Set regionsList = new LinkedHashSet(); regionsList.add(district.getRegion()); - //只有进行区域区分,才可以使用区域别名 + //鍙湁杩涜鍖哄煙鍖哄垎锛屾墠鍙互浣跨敤鍖哄煙鍒悕 if (isCaseRegion && isUseRegionAlias) { List regionAlias = RegionData.getRegionAlias(district.getCity(), district.getRegion()); if (regionAlias != null) { @@ -906,10 +906,10 @@ public class RentPriceUpdateController { return null; } - if (district.getEstateType2() != null && district.getEstateType2().indexOf("别墅") > -1) { - district.setEstateType2("别墅"); + if (district.getEstateType2() != null && district.getEstateType2().indexOf("鍒") > -1) { + district.setEstateType2("鍒"); } else { - district.setEstateType2("普通住宅"); + district.setEstateType2("鏅�氫綇瀹�"); } model.setId(district.getId()); @@ -972,7 +972,7 @@ public class RentPriceUpdateController { guiding.setCity(district.getCity()); guiding.setRegion(district.getRegion()); guiding.setName(district.getName()); - guiding.setEstateType(district.getEstateType2().indexOf("别墅") > -1 ? "别墅" : "普通住宅"); + guiding.setEstateType(district.getEstateType2().indexOf("鍒") > -1 ? "鍒" : "鏅�氫綇瀹�"); guidingPriceService.save(guiding); JsonModel model = new JsonModel(); @@ -1020,7 +1020,7 @@ public class RentPriceUpdateController { guiding.setCity(district.getCity()); guiding.setRegion(district.getRegion()); guiding.setName(district.getName()); - guiding.setEstateType(district.getEstateType2().indexOf("别墅") > -1 ? "别墅" : "普通住宅"); + guiding.setEstateType(district.getEstateType2().indexOf("鍒") > -1 ? "鍒" : "鏅�氫綇瀹�"); guidingPriceService.save(guiding); json.setJsonModel(model); return json; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ResourceController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ResourceController.java index 50e512c0d..ac1fb9894 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ResourceController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ResourceController.java @@ -16,7 +16,7 @@ public class ResourceController { } /** - * 创建资源 + * 鍒涘缓璧勬簮 * * @param model * @return @@ -29,7 +29,7 @@ public class ResourceController { } /** - * 保存资源 + * 淇濆瓨璧勬簮 * * @param model * @return @@ -45,7 +45,7 @@ public class ResourceController { } /** - * 资源详情 + * 璧勬簮璇︽儏 * * @param id * @return @@ -60,7 +60,7 @@ public class ResourceController { } /** - * 修改资源 + * 淇敼璧勬簮 * * @param id * @return @@ -75,7 +75,7 @@ public class ResourceController { } /** - * 删除资源 + * 鍒犻櫎璧勬簮 * * @param id * @return @@ -86,7 +86,7 @@ public class ResourceController { } /** - * 更新资源 + * 鏇存柊璧勬簮 * * @param model * @return diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/RobotController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/RobotController.java index 2cb2bc8f6..4a0f16cee 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/RobotController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/RobotController.java @@ -6,7 +6,7 @@ import org.apache.commons.lang.StringUtils; import org.bson.types.ObjectId; /** - * 钉钉群机器人管理界面 + * 閽夐拤缇ゆ満鍣ㄤ汉绠$悊鐣岄潰 */ public class RobotController { diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/RoleController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/RoleController.java index e606f53e9..d27db2bdb 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/RoleController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/RoleController.java @@ -19,7 +19,7 @@ public class RoleController { } /** - * 创建角色 + * 鍒涘缓瑙掕壊 * * @param model * @return @@ -33,7 +33,7 @@ public class RoleController { } /** - * 保存角色 + * 淇濆瓨瑙掕壊 * * @param model * @return @@ -50,7 +50,7 @@ public class RoleController { } /** - * 角色详情 + * 瑙掕壊璇︽儏 * * @param id * @return @@ -66,7 +66,7 @@ public class RoleController { } /** - * 修改角色 + * 淇敼瑙掕壊 * * @param id * @return @@ -91,7 +91,7 @@ public class RoleController { } /** - * 删除角色 + * 鍒犻櫎瑙掕壊 * * @param id * @return @@ -102,7 +102,7 @@ public class RoleController { } /** - * 更新角色 + * 鏇存柊瑙掕壊 * * @param model * @return diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/SaleLeadsController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/SaleLeadsController.java index 788c5e721..921f13421 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/SaleLeadsController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/SaleLeadsController.java @@ -69,7 +69,7 @@ public class SaleLeadsController { HttpServletResponse response = ActionContext.getContext().getResponse(); response.setCharacterEncoding("UTF-8"); response.setContentType("application/octet-stream;charset=UTF-8"); - ExcelZipUtil.excuteStream(response, workbookMap,"销售线索","SaleLeads"); + ExcelZipUtil.excuteStream(response, workbookMap,"閿�鍞嚎绱�","SaleLeads"); model.setViewType("stream"); return model; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/SearchWordsAnalyticsController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/SearchWordsAnalyticsController.java index e33aefd07..e93146cec 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/SearchWordsAnalyticsController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/SearchWordsAnalyticsController.java @@ -26,13 +26,13 @@ public class SearchWordsAnalyticsController { } if(model.getCat() != null &&!"default".equals(model.getCat())){ if("ershoufang".equals(model.getCat())){ - params.add(new QueryParam("cat",QueryParam.EQUAL_OPERATOR,"二手房")); + params.add(new QueryParam("cat",QueryParam.EQUAL_OPERATOR,"浜屾墜鎴�")); }else if("xiaoqu".equals(model.getCat())){ - params.add(new QueryParam("cat",QueryParam.EQUAL_OPERATOR,"小区")); + params.add(new QueryParam("cat",QueryParam.EQUAL_OPERATOR,"灏忓尯")); }else if("gujia".equals(model.getCat())){ - params.add(new QueryParam("cat",QueryParam.EQUAL_OPERATOR,"估价")); + params.add(new QueryParam("cat",QueryParam.EQUAL_OPERATOR,"浼颁环")); }else if("zufang".equals(model.getCat())){ - params.add(new QueryParam("cat",QueryParam.EQUAL_OPERATOR,"租房")); + params.add(new QueryParam("cat",QueryParam.EQUAL_OPERATOR,"绉熸埧")); } } model.setSearchWordsAnalyticses(searchWordsAnalyticsService.findByParams(params, model.getPager(50))); diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/SeawaterController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/SeawaterController.java index 4db96b47b..2a025fab1 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/SeawaterController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/SeawaterController.java @@ -100,14 +100,14 @@ public class SeawaterController { if(StringUtils.isBlank(seawater.getName())){ continue; } - if(seawater.getName().indexOf("独栋") > -1) { - tagsMap.put(seawater.getId(), "独栋"); - }else if(seawater.getName().indexOf("联排") > -1) { - tagsMap.put(seawater.getId(), "联排"); - }else if(seawater.getName().indexOf("叠加") > -1 || seawater.getName().indexOf("叠拼") > -1) { - tagsMap.put(seawater.getId(), "叠加"); - }else if(seawater.getName().indexOf("双拼") > -1) { - tagsMap.put(seawater.getId(), "双拼"); + if(seawater.getName().indexOf("鐙爧") > -1) { + tagsMap.put(seawater.getId(), "鐙爧"); + }else if(seawater.getName().indexOf("鑱旀帓") > -1) { + tagsMap.put(seawater.getId(), "鑱旀帓"); + }else if(seawater.getName().indexOf("鍙犲姞") > -1 || seawater.getName().indexOf("鍙犳嫾") > -1) { + tagsMap.put(seawater.getId(), "鍙犲姞"); + }else if(seawater.getName().indexOf("鍙屾嫾") > -1) { + tagsMap.put(seawater.getId(), "鍙屾嫾"); } } model.setTagsMap(tagsMap); @@ -138,7 +138,7 @@ public class SeawaterController { } /** - * 按条件批量删除数据(小区名称只匹配主名不匹配别名,查询时匹配别名) + * 鎸夋潯浠舵壒閲忓垹闄ゆ暟鎹�(灏忓尯鍚嶇О鍙尮閰嶄富鍚嶄笉鍖归厤鍒悕锛屾煡璇㈡椂鍖归厤鍒悕) * @param model * @return */ @@ -164,7 +164,7 @@ public class SeawaterController { } /** - * 按条件批量修改物业类型(小区名称只匹配主名不匹配别名,查询时匹配别名) + * 鎸夋潯浠舵壒閲忎慨鏀圭墿涓氱被鍨�(灏忓尯鍚嶇О鍙尮閰嶄富鍚嶄笉鍖归厤鍒悕锛屾煡璇㈡椂鍖归厤鍒悕) * @param model * @return */ diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/SpiderController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/SpiderController.java index fa50ba471..0191abc2b 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/SpiderController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/SpiderController.java @@ -16,7 +16,7 @@ public class SpiderController { } /** - * 创建 + * 鍒涘缓 * * @param model * @return @@ -29,7 +29,7 @@ public class SpiderController { } /** - * 保存 + * 淇濆瓨 * * @param model * @return @@ -45,7 +45,7 @@ public class SpiderController { } /** - * 详情 + * 璇︽儏 * * @param id * @return @@ -60,7 +60,7 @@ public class SpiderController { } /** - * 修改 + * 淇敼 * * @param id * @return @@ -75,7 +75,7 @@ public class SpiderController { } /** - * 删除 + * 鍒犻櫎 * * @param id * @return @@ -86,7 +86,7 @@ public class SpiderController { } /** - * 更新 + * 鏇存柊 * * @param model * @return diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/SqMetreRentController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/SqMetreRentController.java index 8e2662190..592da3255 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/SqMetreRentController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/SqMetreRentController.java @@ -36,7 +36,7 @@ public class SqMetreRentController { public Object listAction(SqMetreRentModel model) { if(StringUtils.isBlank(model.getCityDisplay())) { - model.setCityDisplay("全国"); + model.setCityDisplay("鍏ㄥ浗"); }else{ Pager pager = model.getPager(10); @@ -186,14 +186,14 @@ public class SqMetreRentController { Date statDate = DateUtil.parseFormatDate(model.getStatDate()); Date lastDate = DateUtil.truncateDay(DateUtil.getThisSunday(statDate)); if(statDate.getTime() != lastDate.getTime()){ - data.put("data", "请选择周末"); + data.put("data", "璇烽�夋嫨鍛ㄦ湯"); json.setJsonModel(data); return json; } SqmetreRent stat = sqmetreRentService.findSqmetreRent(model.getCityDisplay(), model.getRegion(), model.getDistrictName(), model.getCat(), statDate); if(stat!=null){ - data.put("data", "此记录已存在!"); + data.put("data", "姝よ褰曞凡瀛樺湪!"); json.setJsonModel(data); return json; } diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/StatisticReportController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/StatisticReportController.java index 0d3cc7bb9..6c6fee3f8 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/StatisticReportController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/StatisticReportController.java @@ -33,7 +33,7 @@ public class StatisticReportController { private StatisticReportService statisticReportService; private static final int MAX_SHEET_ROW_NUM = 500; - private static final int DEFAULT_CELL_WIDTH = 15 * 2 * 256;// 15个汉字宽度 + private static final int DEFAULT_CELL_WIDTH = 15 * 2 * 256;// 15涓眽瀛楀搴� protected HssfCellStyleUtil styleUtil = null; protected ExportExcel exportExcel; @SuppressWarnings("unchecked") @@ -46,7 +46,7 @@ public class StatisticReportController { new Date(), "yyyyMM")); } List list = statisticReportService - .findStatisticReport("成交数据覆盖率", calculatedDate, null, null); + .findStatisticReport("鎴愪氦鏁版嵁瑕嗙洊鐜�", calculatedDate, null, null); if (!list.isEmpty()) { model.setStatisticReport(list.get(0)); final String orderBy; @@ -96,7 +96,7 @@ public class StatisticReportController { new Date(), "yyyyMM")); } List list = statisticReportService - .findStatisticReport("房源覆盖率", calculatedDate, null, null); + .findStatisticReport("鎴挎簮瑕嗙洊鐜�", calculatedDate, null, null); if (!list.isEmpty()) { model.setStatisticReport(list.get(0)); final String orderBy; @@ -146,10 +146,10 @@ public class StatisticReportController { if ("deal".equalsIgnoreCase(type)) { wb = createExcel(model); - fileName = "成交数据覆盖率统计.xls"; + fileName = "鎴愪氦鏁版嵁瑕嗙洊鐜囩粺璁�.xls"; } else if ("house".equalsIgnoreCase(type)) { wb = createFangExcel(model); - fileName = "房源数据覆盖率统计.xls"; + fileName = "鎴挎簮鏁版嵁瑕嗙洊鐜囩粺璁�.xls"; } else { return model; } @@ -157,15 +157,15 @@ public class StatisticReportController { HttpServletResponse response = ActionContext.getContext() .getResponse(); response.setCharacterEncoding("UTF-8"); - // response.reset();// 清空输出流 + // response.reset();// 娓呯┖杈撳嚭娴� response.setContentType("application/x-download;charset=UTF-8"); fileName = new String(fileName.getBytes("GBK"), "ISO-8859-1"); - if (fileName.length() > 150) {// 解决IE 6.0 bug + if (fileName.length() > 150) {// 瑙e喅IE 6.0 bug fileName = new String(fileName.getBytes("GBK"), "ISO-8859-1"); } response.setHeader("Content-Disposition", "attachment;filename=" + fileName); - os = response.getOutputStream();// 取得输出流 + os = response.getOutputStream();// 鍙栧緱杈撳嚭娴� wb.write(os); os.flush(); } catch (Exception e) { @@ -199,7 +199,7 @@ public class StatisticReportController { new Date(), "yyyyMM")); } List results = statisticReportService - .findStatisticReport("成交数据覆盖率", calculatedDate, null, null); + .findStatisticReport("鎴愪氦鏁版嵁瑕嗙洊鐜�", calculatedDate, null, null); List> list = new ArrayList>(); StatisticReport spReport = results.get(0); List> data = new ArrayList>(); @@ -218,22 +218,22 @@ public class StatisticReportController { } HSSFRow onerow = sheet.createRow(0); - onerow.createCell((short) 0).setCellValue("城市"); - onerow.createCell((short) 1).setCellValue("住宅总量"); - onerow.createCell((short) 2).setCellValue("成交数据总量"); - onerow.createCell((short) 3).setCellValue("有成交数据住宅总量"); - onerow.createCell((short) 4).setCellValue("比例"); + onerow.createCell((short) 0).setCellValue("鍩庡競"); + onerow.createCell((short) 1).setCellValue("浣忓畢鎬婚噺"); + onerow.createCell((short) 2).setCellValue("鎴愪氦鏁版嵁鎬婚噺"); + onerow.createCell((short) 3).setCellValue("鏈夋垚浜ゆ暟鎹綇瀹呮�婚噺"); + onerow.createCell((short) 4).setCellValue("姣斾緥"); for (int i = 0; i < 5; i++) { onerow.getCell(i).setCellStyle(styleUtil.getLightYellow_color_bg()); onerow.getCell(i).setCellStyle(styleUtil.getAlignmentLeftCenter()); //onerow.getCell(i).setCellStyle(styleUtil.getCellStyle((short)i)); } - /*exportExcel.createHead("城市", 0); - exportExcel.createHead("住宅总量", 1); - exportExcel.createHead("成交数据总量", 2); - exportExcel.createHead("有成交数据住宅总量", 3); - exportExcel.createHead("比例", 4);*/ + /*exportExcel.createHead("鍩庡競", 0); + exportExcel.createHead("浣忓畢鎬婚噺", 1); + exportExcel.createHead("鎴愪氦鏁版嵁鎬婚噺", 2); + exportExcel.createHead("鏈夋垚浜ゆ暟鎹綇瀹呮�婚噺", 3); + exportExcel.createHead("姣斾緥", 4);*/ for (Map map : list) { HSSFRow row = sheet.createRow(sheet.getPhysicalNumberOfRows()); int index = 0; @@ -272,7 +272,7 @@ public class StatisticReportController { new Date(), "yyyyMM")); } List results = statisticReportService - .findStatisticReport("房源覆盖率", calculatedDate, null, null); + .findStatisticReport("鎴挎簮瑕嗙洊鐜�", calculatedDate, null, null); List> list = new ArrayList>(); StatisticReport spReport = results.get(0); List> data = new ArrayList>(); @@ -306,21 +306,21 @@ public class StatisticReportController { list.add(map); } HSSFRow onerow = s.createRow(0); - onerow.createCell((short) 0).setCellValue("城市"); - onerow.createCell((short) 1).setCellValue("住宅总量(近一月)"); - onerow.createCell((short) 2).setCellValue("房源总量(近一月)"); - onerow.createCell((short) 3).setCellValue("有房源小区总量(近一月)"); - onerow.createCell((short) 4).setCellValue("比例(近一月)"); + onerow.createCell((short) 0).setCellValue("鍩庡競"); + onerow.createCell((short) 1).setCellValue("浣忓畢鎬婚噺(杩戜竴鏈�)"); + onerow.createCell((short) 2).setCellValue("鎴挎簮鎬婚噺(杩戜竴鏈�)"); + onerow.createCell((short) 3).setCellValue("鏈夋埧婧愬皬鍖烘�婚噺(杩戜竴鏈�)"); + onerow.createCell((short) 4).setCellValue("姣斾緥(杩戜竴鏈�)"); - onerow.createCell((short) 5).setCellValue("住宅总量(近半年)"); - onerow.createCell((short) 6).setCellValue("房源总量(近半年)"); - onerow.createCell((short) 7).setCellValue("有房源小区总量(近半年)"); - onerow.createCell((short) 8).setCellValue("比例(近半年)"); + onerow.createCell((short) 5).setCellValue("浣忓畢鎬婚噺(杩戝崐骞�)"); + onerow.createCell((short) 6).setCellValue("鎴挎簮鎬婚噺(杩戝崐骞�)"); + onerow.createCell((short) 7).setCellValue("鏈夋埧婧愬皬鍖烘�婚噺(杩戝崐骞�)"); + onerow.createCell((short) 8).setCellValue("姣斾緥(杩戝崐骞�)"); - onerow.createCell((short) 9).setCellValue("住宅总量(所有)"); - onerow.createCell((short) 10).setCellValue("房源总量(所有)"); - onerow.createCell((short) 11).setCellValue("有房源小区总量(所有)"); - onerow.createCell((short) 12).setCellValue("比例(所有)"); + onerow.createCell((short) 9).setCellValue("浣忓畢鎬婚噺(鎵�鏈�)"); + onerow.createCell((short) 10).setCellValue("鎴挎簮鎬婚噺(鎵�鏈�)"); + onerow.createCell((short) 11).setCellValue("鏈夋埧婧愬皬鍖烘�婚噺(鎵�鏈�)"); + onerow.createCell((short) 12).setCellValue("姣斾緥(鎵�鏈�)"); for (int i = 0; i < 13; i++) { onerow.getCell(i).setCellStyle(styleUtil.getLightYellow_color_bg()); diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/TaoBaoAuctionController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/TaoBaoAuctionController.java index 073d71fdd..3a91926fd 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/TaoBaoAuctionController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/TaoBaoAuctionController.java @@ -8,7 +8,7 @@ import org.sothis.core.util.Pager; import java.util.List; /** - * 淘宝房产拍卖Controller + * 娣樺疂鎴夸骇鎷嶅崠Controller */ public class TaoBaoAuctionController { @@ -17,7 +17,7 @@ public class TaoBaoAuctionController { public Object listAction(TaoBaoAuctionModel model){ Pager pager = model.getPager(20); - if("全国".equals(model.getCityDisplay())){ + if("鍏ㄥ浗".equals(model.getCityDisplay())){ model.setCityDisplay(null); } pager.setTotalRows(taoBaoAuctionService.countAll(model.getCityDisplay(), model.getTitle(), model.getBidId())); diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ToolClickStatController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ToolClickStatController.java index b2777c78c..5f19404d0 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ToolClickStatController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ToolClickStatController.java @@ -23,7 +23,7 @@ import com.fangjia.service.sql.UserService; import com.fangjia.service.tool.ToolClickDetailService; /** - * 小工具点击统计controller + * 灏忓伐鍏风偣鍑荤粺璁ontroller * * @author liupei */ @@ -33,7 +33,7 @@ public class ToolClickStatController { private UserService userService; /** - * 所有合作网站点击统计 + * 鎵�鏈夊悎浣滅綉绔欑偣鍑荤粺璁� * * @param model * @return @@ -81,7 +81,7 @@ public class ToolClickStatController { } /** - * 合作网站点击详情页 + * 鍚堜綔缃戠珯鐐瑰嚮璇︽儏椤� * * @param model * @return diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/TownshipController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/TownshipController.java index af225d92a..5585e729c 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/TownshipController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/TownshipController.java @@ -51,15 +51,15 @@ public class TownshipController { if (model.getId() != null) { Map udata = new HashMap(); if (StringUtils.isNotBlank(model.getAlias())) { - String aliasString = model.getAlias().replaceAll(",", ","); - List alias = Arrays.asList(aliasString.split("\\s*,\\s*")); + String aliasString = model.getAlias().replaceAll(",", "锛�"); + List alias = Arrays.asList(aliasString.split("\\s*锛孿\s*")); udata.put("alias", alias); } udata.put("updateTime", new Date()); - //记录操作人员 + //璁板綍鎿嶄綔浜哄憳 udata.put("operator", user.getRealName()); townshipService.updateTownship(udata, model.getId()); - data.put("msg", "修改成功"); + data.put("msg", "淇敼鎴愬姛"); } ret.setJsonModel(data); return ret; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/UserController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/UserController.java index 54cba2d62..92dfb609c 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/UserController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/UserController.java @@ -43,7 +43,7 @@ public class UserController { /** - * 展示注册用户列表+查询 + * 灞曠ず娉ㄥ唽鐢ㄦ埛鍒楄〃+鏌ヨ * @param model * @return */ @@ -58,7 +58,7 @@ public class UserController { } /** - * 导出所查询的数据到Excel + * 瀵煎嚭鎵�鏌ヨ鐨勬暟鎹埌Excel * @param model * @return */ @@ -76,14 +76,14 @@ public class UserController { HttpServletResponse response = ActionContext.getContext().getResponse(); response.setCharacterEncoding("UTF-8"); response.setContentType("application/octet-stream;charset=UTF-8"); - ExcelZipUtil.excuteStream(response,workbookMap,"注册用户","RegistUser"); + ExcelZipUtil.excuteStream(response,workbookMap,"娉ㄥ唽鐢ㄦ埛","RegistUser"); model.setViewType("stream"); return model; } - //用户评估记录页列表+查询 + //鐢ㄦ埛璇勪及璁板綍椤靛垪琛�+鏌ヨ public Object evaluateAction(EvaluationRecordModel model) { Pager pager = model.getPager(20); @@ -106,7 +106,7 @@ public class UserController { } /** - * 导出个人评估记录Excel + * 瀵煎嚭涓汉璇勪及璁板綍Excel * @param model * @return */ @@ -130,7 +130,7 @@ public class UserController { HttpServletResponse response = ActionContext.getContext().getResponse(); response.setCharacterEncoding("UTF-8"); response.setContentType("application/octet-stream;charset=UTF-8"); - ExcelZipUtil.excuteStream(response, workbookMap,"评估记录","evaluateRecord"); + ExcelZipUtil.excuteStream(response, workbookMap,"璇勪及璁板綍","evaluateRecord"); model.setViewType("stream"); return model; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/UsersController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/UsersController.java index ac3bfad83..7ffcc3021 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/UsersController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/UsersController.java @@ -32,7 +32,7 @@ public class UsersController { private ServerAreaService serverAreaService; /** - * 用户列表 + * 鐢ㄦ埛鍒楄〃 * * @param model * @return @@ -43,7 +43,7 @@ public class UsersController { } /** - * 创建用户 + * 鍒涘缓鐢ㄦ埛 * * @param model * @return @@ -55,18 +55,18 @@ public class UsersController { List serverAreas = serverAreaService.findAll(); List allCitys = new ArrayList(); for(ServerArea serverArea : serverAreas){ - if(!serverArea.getDisplay().equals("全国")){ + if(!serverArea.getDisplay().equals("鍏ㄥ浗")){ allCitys.add(serverArea.getDisplay()); } } List firstWords = new ArrayList(); Map> serverAreaBoMap = new HashMap>(); for (ServerArea serverArea : serverAreas) { - String cityInitial = StringUtil.getFirstSpell(serverArea.getSpell(), true);// 城市首字母 - List serverAreaBoList = getCachedServerAreaByInitial(serverAreaBoMap, cityInitial);// 按首字母加载城市列表 + String cityInitial = StringUtil.getFirstSpell(serverArea.getSpell(), true);// 鍩庡競棣栧瓧姣� + List serverAreaBoList = getCachedServerAreaByInitial(serverAreaBoMap, cityInitial);// 鎸夐瀛楁瘝鍔犺浇鍩庡競鍒楄〃 ServerAreaBo serverAreaBo = new ServerAreaBo(serverArea); serverAreaBoList.add(serverAreaBo); - sort(serverAreaBoList);// 字母内排序 + sort(serverAreaBoList);// 瀛楁瘝鍐呮帓搴� if(!firstWords.contains(cityInitial)){ firstWords.add(cityInitial); } @@ -82,7 +82,7 @@ public class UsersController { } /** - * 城市字母内排序 + * 鍩庡競瀛楁瘝鍐呮帓搴� * * @param serverAreaBoList */ @@ -113,7 +113,7 @@ public class UsersController { } /** - * 保存用户 + * 淇濆瓨鐢ㄦ埛 * * @param model * @return @@ -143,7 +143,7 @@ public class UsersController { } /** - * 用户详情 + * 鐢ㄦ埛璇︽儏 * * @param id * @return @@ -159,7 +159,7 @@ public class UsersController { } /** - * 编辑用户信息 + * 缂栬緫鐢ㄦ埛淇℃伅 * * @return */ @@ -170,14 +170,14 @@ public class UsersController { } /** - * 编辑用户信息 + * 缂栬緫鐢ㄦ埛淇℃伅 * * @return */ public Object selfUpdateAction(BkoffUsersModel model) { if (null == model.getBkoffUsers() || StringUtils.isEmpty(model.getBkoffUsers().getUsername()) || StringUtils.isEmpty(model.getBkoffUsers().getPassword())) { - model.setErrorMessage("用户名或密码不能为空!"); + model.setErrorMessage("鐢ㄦ埛鍚嶆垨瀵嗙爜涓嶈兘涓虹┖锛�"); model.setBkoffUsers(this.bkoffUsersService.findBkoffUsersById(model.getLoginUserId())); return model.forward("selfEdit"); } @@ -188,25 +188,25 @@ public class UsersController { if (!users.getUsername().equals(model.getBkoffUsers().getUsername())) { BkoffUsers u = this.bkoffUsersService.findBkoffUsersByUsername(model.getBkoffUsers().getUsername()); if (null != u) { - model.setErrorMessage("用户名已被使用!"); + model.setErrorMessage("鐢ㄦ埛鍚嶅凡琚娇鐢紒"); return model.forward("selfEdit"); } } users.setUsername(model.getBkoffUsers().getUsername()); if (!users.getPassword().equals(model.getBkoffUsers().getPassword())) { if (PasswordUtils.isWeekPassword(model.getBkoffUsers().getPassword())) { - model.setErrorMessage("您的密码过于简单!"); + model.setErrorMessage("鎮ㄧ殑瀵嗙爜杩囦簬绠�鍗曪紒"); return model.forward("selfEdit"); } users.setPassword(DigestUtils.md5Hex(model.getBkoffUsers().getPassword())); } this.bkoffUsersService.saveBkoffUsers(users); - model.flash().setAttribute("message", "更新成功!"); + model.flash().setAttribute("message", "鏇存柊鎴愬姛锛�"); return model.redirect("selfEdit"); } /** - * 修改用户 + * 淇敼鐢ㄦ埛 * * @param id * @return @@ -220,18 +220,18 @@ public class UsersController { List serverAreas = serverAreaService.findAll(); List allCitys = new ArrayList(); for(ServerArea serverArea : serverAreas){ - if(!serverArea.getDisplay().equals("全国")){ + if(!serverArea.getDisplay().equals("鍏ㄥ浗")){ allCitys.add(serverArea.getDisplay()); } } List firstWords = new ArrayList(); Map> serverAreaBoMap = new HashMap>(); for (ServerArea serverArea : serverAreas) { - String cityInitial = StringUtil.getFirstSpell(serverArea.getSpell(), true);// 城市首字母 - List serverAreaBoList = getCachedServerAreaByInitial(serverAreaBoMap, cityInitial);// 按首字母加载城市列表 + String cityInitial = StringUtil.getFirstSpell(serverArea.getSpell(), true);// 鍩庡競棣栧瓧姣� + List serverAreaBoList = getCachedServerAreaByInitial(serverAreaBoMap, cityInitial);// 鎸夐瀛楁瘝鍔犺浇鍩庡競鍒楄〃 ServerAreaBo serverAreaBo = new ServerAreaBo(serverArea); serverAreaBoList.add(serverAreaBo); - sort(serverAreaBoList);// 字母内排序 + sort(serverAreaBoList);// 瀛楁瘝鍐呮帓搴� if(!firstWords.contains(cityInitial)){ firstWords.add(cityInitial); } @@ -258,7 +258,7 @@ public class UsersController { } /** - * 删除用户 + * 鍒犻櫎鐢ㄦ埛 * * @param id * @return @@ -269,7 +269,7 @@ public class UsersController { } /** - * 更新用户 + * 鏇存柊鐢ㄦ埛 * * @param model * @return @@ -308,7 +308,7 @@ public class UsersController { this.bkoffUsersService.saveBkoffUsers(users); this.authorityService.saveUserRoles(users.getId(), model.getRoleIds()); model.setBkoffUsers(users); - model.flash().setAttribute("message", "更新成功!"); + model.flash().setAttribute("message", "鏇存柊鎴愬姛锛�"); return model.redirect("show?id=" + model.getBkoffUsers().getId()); } diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/VillageIdentifyController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/VillageIdentifyController.java index 771eaa2e4..3c1ab0553 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/VillageIdentifyController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/VillageIdentifyController.java @@ -36,14 +36,14 @@ public class VillageIdentifyController { public void expectAction(HttpServletRequest request, HttpServletResponse response) throws IOException { response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); - // 编码文件名,避免乱码 - String fileName = "涉农结果导入后台模板.xlsx"; + // 缂栫爜鏂囦欢鍚嶏紝閬垮厤涔辩爜 + String fileName = "娑夊啘缁撴灉瀵煎叆鍚庡彴妯℃澘.xlsx"; String encodedFileName = encodeFileName(fileName, request); - // 设置 Content-Disposition 响应头 + // 璁剧疆 Content-Disposition 鍝嶅簲澶� response.setHeader("Content-Disposition", "attachment; filename=\"" + encodedFileName + "\""); - // 使用 ClassPathResource 来获取资源文件 + // 浣跨敤 ClassPathResource 鏉ヨ幏鍙栬祫婧愭枃浠� ClassPathResource resource = new ClassPathResource(fileName); InputStream in = resource.getInputStream(); OutputStream out = response.getOutputStream(); @@ -64,10 +64,10 @@ public class VillageIdentifyController { String encodedFileName; if (userAgent.contains("MSIE") || userAgent.contains("Trident")) { - // 针对IE浏览器 + // 閽堝IE娴忚鍣� encodedFileName = URLEncoder.encode(fileName, "UTF-8").replace("+", "%20"); } else { - // 针对其他浏览器 + // 閽堝鍏朵粬娴忚鍣� encodedFileName = new String(fileName.getBytes("UTF-8"), "ISO-8859-1"); } @@ -82,16 +82,16 @@ public class VillageIdentifyController { List> addressList = dataMap.get("data"); List> headers = dataMap.get("header"); - if (!("涉农类型".equals(headers.get(0)) && "地址".equals(headers.get(2)))) { - data.put("msg", "模板错误"); + if (!("娑夊啘绫诲瀷".equals(headers.get(0)) && "鍦板潃".equals(headers.get(2)))) { + data.put("msg", "妯℃澘閿欒"); } else if (addressList.size() > 100000) { - data.put("msg", "该批次数据量超过100000条"); + data.put("msg", "璇ユ壒娆℃暟鎹噺瓒呰繃100000鏉�"); } else { - //模板正确,数据不超过100000,开始处理数据 + //妯℃澘姝g‘锛屾暟鎹笉瓒呰繃100000锛屽紑濮嬪鐞嗘暟鎹� for (List row : addressList) { Map updata = new HashMap(); - // 创建一个包含所有key的list + // 鍒涘缓涓�涓寘鍚墍鏈塳ey鐨刲ist List keys = Arrays.asList( "villageType", "cityParam", "address", "province", "provinceCode", "city1", "cityCode", "district", "districtCode", "town", "townCode", @@ -100,21 +100,21 @@ public class VillageIdentifyController { "devDistrictName", "devLevel", "countyGov", "addrArea" ); - // 遍历keys list并从row中获取相应的值放入updata中 + // 閬嶅巻keys list骞朵粠row涓幏鍙栫浉搴旂殑鍊兼斁鍏pdata涓� for (int i = 0; i < keys.size(); i++) { if (i < row.size() && StringUtils.isNotBlank(row.get(i))) { updata.put(keys.get(i), row.get(i)); } } - // 处理特定情况: cityParam + // 澶勭悊鐗瑰畾鎯呭喌锛� cityParam String cityParam = ""; if (StringUtils.isNotBlank(row.get(1))) { cityParam = row.get(1); updata.put("cityParam", cityParam); } - // 添加createTime + // 娣诲姞createTime updata.put("createTime", new Date()); List queryParams = new ArrayList(); queryParams.add(new QueryParam("address", updata.get("address"))); @@ -122,10 +122,10 @@ public class VillageIdentifyController { queryParams.add(new QueryParam("cityParam", cityParam)); } queryParams.add(new QueryParam("villageType", updata.get("villageType"))); - // 保存/更新 + // 淇濆瓨/鏇存柊 villageIdentifyService.updateByparams(updata, queryParams); } - data.put("msg", "保存成功"); + data.put("msg", "淇濆瓨鎴愬姛"); } diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/WebAverageController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/WebAverageController.java index aff328c82..be458f4f0 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/WebAverageController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/WebAverageController.java @@ -311,7 +311,7 @@ public class WebAverageController { response.setCharacterEncoding("UTF-8"); response.setContentType("application/x-download;charset=UTF-8"); response.setHeader( "Content-Disposition", "attachment;filename=" + fileName); - os = response.getOutputStream();// 取得输出流 + os = response.getOutputStream();// 鍙栧緱杈撳嚭娴� wb.write(os); os.flush(); }catch (Exception e) { @@ -337,18 +337,18 @@ public class WebAverageController { } private HSSFWorkbook createSheet(HSSFWorkbook wb, int sheetIndex) { HSSFSheet s = wb.createSheet(); - wb.setSheetName(sheetIndex, "均价对比"); + wb.setSheetName(sheetIndex, "鍧囦环瀵规瘮"); HSSFRow onerow=s.createRow(0); - onerow.createCell((short)0).setCellValue("名称"); - onerow.createCell((short)1).setCellValue("房价网价格"); - onerow.createCell((short)2).setCellValue("搜房网价格"); - onerow.createCell((short)3).setCellValue("安居客价格"); - onerow.createCell((short)4).setCellValue("搜房差比"); - onerow.createCell((short)5).setCellValue("安居客差比"); - onerow.createCell((short)6).setCellValue("地址"); - onerow.createCell((short)7).setCellValue("物业类型"); - onerow.createCell((short)8).setCellValue("小区别名"); - onerow.createCell((short)9).setCellValue("地址别名"); + onerow.createCell((short)0).setCellValue("鍚嶇О"); + onerow.createCell((short)1).setCellValue("鎴夸环缃戜环鏍�"); + onerow.createCell((short)2).setCellValue("鎼滄埧缃戜环鏍�"); + onerow.createCell((short)3).setCellValue("瀹夊眳瀹环鏍�"); + onerow.createCell((short)4).setCellValue("鎼滄埧宸瘮"); + onerow.createCell((short)5).setCellValue("瀹夊眳瀹㈠樊姣�"); + onerow.createCell((short)6).setCellValue("鍦板潃"); + onerow.createCell((short)7).setCellValue("鐗╀笟绫诲瀷"); + onerow.createCell((short)8).setCellValue("灏忓尯鍒悕"); + onerow.createCell((short)9).setCellValue("鍦板潃鍒悕"); List webAverageList = new ArrayList(); if(averageExport.size()>0){ webAverageList=(List) averageExport.get(0); @@ -393,7 +393,7 @@ public class WebAverageController { try { DSCollection collection = new DataStore("seaweed.db.fangjia.com", 27007).getCollection("fangjia.seaweed"); DBObject data = new BasicDBObject(); - data.put("city", "广州"); + data.put("city", "骞垮窞"); data.put("visible", 0); data.put("cat", "district"); DSCursor cursor = collection.find(data); diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/XcxUsersController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/XcxUsersController.java index 6e3c3b17d..c53143a63 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/XcxUsersController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/XcxUsersController.java @@ -29,7 +29,7 @@ public class XcxUsersController { private XcxLoanInfoService xcxLoanInfoService; /** - * 用户列表 + * 鐢ㄦ埛鍒楄〃 * */ public Object userListAction(XcxUsersModel model){ Pager pager = model.getPager(20); @@ -39,7 +39,7 @@ public class XcxUsersController { return model; } /** - * 故事列表 + * 鏁呬簨鍒楄〃 * */ public Object storyListAction(XcxStoryModel model){ Pager pager = model.getPager(20); @@ -59,7 +59,7 @@ public class XcxUsersController { return model; } /** - * 估价结果页面 + * 浼颁环缁撴灉椤甸潰 * */ public Object evaluationListAction(XcxEvaluationModel model){ Pager pager = model.getPager(20); @@ -80,7 +80,7 @@ public class XcxUsersController { } /** - * 小程序贷款线索 + * 灏忕▼搴忚捶娆剧嚎绱� * */ public Object loanListAction(XcxLoanModel model){ Pager pager = model.getPager(20); diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/YugudanController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/YugudanController.java index 5d15317e7..d66a735fa 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/YugudanController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/YugudanController.java @@ -156,13 +156,13 @@ public class YugudanController { InquiryPrice inquiryPrice = inquiryPriceService.findAllInquiryPriceByEvaluationId(String.valueOf(evaluation.getId())); model.setInquiryPrice(inquiryPrice); - //参考房源 + //鍙傝�冩埧婧� List houseBos = houseService.findDistrictHouseByCat(evaluation.getCity(), evaluation.getRegion(), evaluation.getDistrictName(), 20, "sell", (float)(evaluation.getHouseArea()-5), (float)(evaluation.getHouseArea()+5)); List houses = filterHouses(houseBos, evaluation.getTotalPrice()); model.setHouses(houses); - //人工所选房源 + //浜哄伐鎵�閫夋埧婧� List result = referenceHouseService.findAllByParams(String.valueOf(model.getId())); List houseIds = new ArrayList(); @@ -206,12 +206,12 @@ public class YugudanController { InquiryPrice inquiryPrice = inquiryPrices.get(0); inquiryPrice.setEvaluationId(String.valueOf(evaluation.getId())); inquiryPriceService.update(inquiryPrice); - lastRetMap.put("success", "成功!"); + lastRetMap.put("success", "鎴愬姛锛�"); }else{ - lastRetMap.put("error", "没有找到相应的人工询价记录,请查看地址,面积,用户是否一致!"); + lastRetMap.put("error", "娌℃湁鎵惧埌鐩稿簲鐨勪汉宸ヨ浠疯褰曪紝璇锋煡鐪嬪湴鍧�锛岄潰绉紝鐢ㄦ埛鏄惁涓�鑷达紒"); } }else{ - lastRetMap.put("error", "数据参数缺失!"); + lastRetMap.put("error", "鏁版嵁鍙傛暟缂哄け锛�"); } ret.setJsonModel(lastRetMap); @@ -490,7 +490,7 @@ public class YugudanController { }else{ evaluation.setLng(0d); } - evaluation.setType(2);//后台新增预估单为2,前台不做显示 + evaluation.setType(2);//鍚庡彴鏂板棰勪及鍗曚负2,鍓嶅彴涓嶅仛鏄剧ず int avgPrice = 0; if (model.getTotalPrice() > 0) { @@ -817,7 +817,7 @@ public class YugudanController { public Object findLatlngAction(YugudanModel model) { JsonModel ret = new JsonModel(); - //地址改变更改相应的百度经纬度及mapabc经纬度 + //鍦板潃鏀瑰彉鏇存敼鐩稿簲鐨勭櫨搴︾粡绾害鍙妋apabc缁忕含搴� double lng2 = 0; double lat2 = 0; Map infomap = AddressParser.getLngLatByAddress(model.getCityDisplay(), model.getAddress()); @@ -865,9 +865,9 @@ public class YugudanController { OutputStream os = null; BufferedOutputStream fos = null; - String[] columns = {"城市","区域","楼盘名称","帐号","面积","总价","是否修改价格","最后评估时间"}; + String[] columns = {"鍩庡競","鍖哄煙","妤肩洏鍚嶇О","甯愬彿","闈㈢Н","鎬讳环","鏄惁淇敼浠锋牸","鏈�鍚庤瘎浼版椂闂�"}; HSSFWorkbook wb= new HSSFWorkbook(); - Sheet sheet = wb.createSheet("评估记录"); + Sheet sheet = wb.createSheet("璇勪及璁板綍"); Row row = sheet.createRow(0); for(int i =0 ;i < columns.length ; i++){ row.createCell(i).setCellValue(columns[i]); @@ -883,21 +883,21 @@ public class YugudanController { row.createCell(3).setCellValue(map.get(String.valueOf(evaluation.getUserId()))); row.createCell(4).setCellValue(evaluation.getHouseArea()); row.createCell(5).setCellValue(evaluation.getTotalPrice()); - row.createCell(6).setCellValue(evaluation.getPeopleEdit()==1?"是":"否"); - row.createCell(7).setCellValue(DateUtil.formatByPattern(evaluation.getLastUpdated(), "yyyy年MM月dd日")); + row.createCell(6).setCellValue(evaluation.getPeopleEdit()==1?"鏄�":"鍚�"); + row.createCell(7).setCellValue(DateUtil.formatByPattern(evaluation.getLastUpdated(), "yyyy骞碝M鏈坉d鏃�")); } - String fileName = "评估记录" + "(" + DateUtil.formatByPattern(new Date(), "yyyyMMddHHmmss") + ").xls"; + String fileName = "璇勪及璁板綍" + "(" + DateUtil.formatByPattern(new Date(), "yyyyMMddHHmmss") + ").xls"; try { HttpServletResponse response = ActionContext.getContext().getResponse(); response.setCharacterEncoding("UTF-8"); - //response.reset();// 清空输出流 + //response.reset();// 娓呯┖杈撳嚭娴� response.setContentType("application/x-download;charset=UTF-8"); fileName = new String(fileName.getBytes("GBK"),"ISO-8859-1"); - if(fileName.length()>150){//解决IE 6.0 bug + if(fileName.length()>150){//瑙e喅IE 6.0 bug fileName = new String(fileName.getBytes("GBK"),"ISO-8859-1"); } response.setHeader( "Content-Disposition", "attachment;filename=" + fileName); - os = response.getOutputStream();// 取得输出流 + os = response.getOutputStream();// 鍙栧緱杈撳嚭娴� wb.write(os); os.flush(); }catch (Exception e) { diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/fjtEvaluationController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/fjtEvaluationController.java index e0d863383..4b6b00744 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/fjtEvaluationController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/fjtEvaluationController.java @@ -63,7 +63,7 @@ public class fjtEvaluationController { public Object listAction(FjtEvaluationModel model){ ActionContext.getContext().getRequest().getSession().removeAttribute("errorDatas"); - //重新重复地址时先查出全部后面再分页 + //閲嶆柊閲嶅鍦板潃鏃跺厛鏌ュ嚭鍏ㄩ儴鍚庨潰鍐嶅垎椤� Pager pager = model.getPager(20); if(model.isRepeat()){ pager = new Pager(Integer.MAX_VALUE); @@ -89,11 +89,11 @@ public class fjtEvaluationController { if(list!=null){ for(UserTrades trade:list){ if(StringUtils.isBlank(trade.getReconcile())){ - trade.setReconcile("未结账"); + trade.setReconcile("鏈粨璐�"); userTradesService.updateUserTrades(trade); } if(StringUtils.isBlank(trade.getOriginal())){ - trade.setOriginal("未出原件"); + trade.setOriginal("鏈嚭鍘熶欢"); userTradesService.updateUserTrades(trade); } } @@ -119,10 +119,10 @@ public class fjtEvaluationController { addr += evaluation.getAddress(); } if(StringUtils.isNotBlank(evaluation.getHouseNum())){ - addr += (evaluation.getHouseNum() + "栋"); + addr += (evaluation.getHouseNum() + "鏍�"); } if(StringUtils.isNotBlank(evaluation.getRoomNum())){ - addr += (evaluation.getRoomNum() + "室"); + addr += (evaluation.getRoomNum() + "瀹�"); } bo.setAddress(addr); bo.setLeader(evaluation.getLender()); @@ -150,7 +150,7 @@ public class fjtEvaluationController { } /** - * 手写根据地址分组 + * 鎵嬪啓鏍规嵁鍦板潃鍒嗙粍 */ private List sortByAddress(List bos,Pager pager){ List list = new ArrayList(); @@ -160,16 +160,16 @@ public class fjtEvaluationController { for(UserTradesBo bo:bos){ String key = bo.getAddress(); if(StringUtils.isNotBlank(key)){ - if(map.containsKey(key)){ //map中已存在,将该数据存放到同一个key的map中 + if(map.containsKey(key)){ //map涓凡瀛樺湪锛屽皢璇ユ暟鎹瓨鏀惧埌鍚屼竴涓猭ey鐨刴ap涓� map.get(key).add(bo); - }else{ //map中不存在,新建key,用来存放数据 + }else{ //map涓笉瀛樺湪锛屾柊寤簁ey锛岀敤鏉ュ瓨鏀炬暟鎹� List boList = new ArrayList(); boList.add(bo); map.put(key, boList); } } } - //遍历 + //閬嶅巻 for (List value : map.values()) { if(value.size() > 1){ list.addAll(value); @@ -194,9 +194,9 @@ public class fjtEvaluationController { OutputStream os = null; BufferedOutputStream fos = null; - String[] columns = {"估价报告编号","城市","区域","楼盘名称","地址","主贷人","身份证号","帐号","身份","报告费用","下载时间", "对账情况","出原件情况","对账时间","对账老师","公司","总价","估价日期","输入成交价","终审价格","审核时间","面积"}; + String[] columns = {"浼颁环鎶ュ憡缂栧彿","鍩庡競","鍖哄煙","妤肩洏鍚嶇О","鍦板潃","涓昏捶浜�","韬唤璇佸彿","甯愬彿","韬唤","鎶ュ憡璐圭敤","涓嬭浇鏃堕棿", "瀵硅处鎯呭喌","鍑哄師浠舵儏鍐�","瀵硅处鏃堕棿","瀵硅处鑰佸笀","鍏徃","鎬讳环","浼颁环鏃ユ湡","杈撳叆鎴愪氦浠�","缁堝浠锋牸","瀹℃牳鏃堕棿","闈㈢Н"}; HSSFWorkbook wb= new HSSFWorkbook(); - Sheet sheet = wb.createSheet("下载记录"); + Sheet sheet = wb.createSheet("涓嬭浇璁板綍"); Row row = sheet.createRow(0); for(int i =0 ;i < columns.length ; i++){ row.createCell(i).setCellValue(columns[i]); @@ -265,10 +265,10 @@ public class fjtEvaluationController { addr += evaluation.getAddress(); } if(StringUtils.isNotBlank(evaluation.getHouseNum())){ - addr += (evaluation.getHouseNum() + "栋"); + addr += (evaluation.getHouseNum() + "鏍�"); } if(StringUtils.isNotBlank(evaluation.getRoomNum())){ - addr += (evaluation.getRoomNum() + "室"); + addr += (evaluation.getRoomNum() + "瀹�"); } bo.setAddress(addr); bo.setLeader(evaluation.getLender()); @@ -287,16 +287,16 @@ public class fjtEvaluationController { for(UserTradesBo userTrade:userTradesBos){ String key = userTrade.getAddress(); if(StringUtils.isNotBlank(key)){ - if(map.containsKey(key)){ //map中已存在,将该数据存放到同一个key的map中 + if(map.containsKey(key)){ //map涓凡瀛樺湪锛屽皢璇ユ暟鎹瓨鏀惧埌鍚屼竴涓猭ey鐨刴ap涓� map.get(key).add(userTrade); - }else{ //map中不存在,新建key,用来存放数据 + }else{ //map涓笉瀛樺湪锛屾柊寤簁ey锛岀敤鏉ュ瓨鏀炬暟鎹� List boList = new ArrayList(); boList.add(userTrade); map.put(key, boList); } } } - //遍历 + //閬嶅巻 for (List value : map.values()) { if(value.size() > 1){ list.addAll(value); @@ -313,7 +313,7 @@ public class fjtEvaluationController { Map userDetailMap = getUserDetailMap(uids); for(UserTradesBo bo : list){ row = sheet.createRow(i++); - if(bo.getRole() == 12 || bo.getRole() == 16){//农行版 + if(bo.getRole() == 12 || bo.getRole() == 16){//鍐滆鐗� //EvaluationAudit audit = evaluationAuditService.findByEvalutionId(String.valueOf(bo.getEvaluationId())); EvaluationAudit audit = evalAuditMap.get(Long.valueOf(bo.getEvaluationId())); if(audit == null){ @@ -327,24 +327,24 @@ public class fjtEvaluationController { row.createCell(7).setCellValue(bo.getEmail()); row.createCell(8).setCellValue(allRoles.get(String.valueOf(bo.getRole()))); if(bo.getCharge() != null){ - row.createCell(9).setCellValue(bo.getCharge() + "元"); + row.createCell(9).setCellValue(bo.getCharge() + "鍏�"); } - row.createCell(10).setCellValue(DateUtil.formatByPattern(bo.getDateCreated(),"yyyy年MM月dd日")); + row.createCell(10).setCellValue(DateUtil.formatByPattern(bo.getDateCreated(),"yyyy骞碝M鏈坉d鏃�")); if(StringUtils.isNotBlank(bo.getReconcile())){ row.createCell(11).setCellValue(bo.getReconcile()); }else{ - row.createCell(11).setCellValue("未结账"); + row.createCell(11).setCellValue("鏈粨璐�"); } if(StringUtils.isNotBlank(bo.getOriginal())){ row.createCell(12).setCellValue(bo.getOriginal()); }else{ - row.createCell(12).setCellValue("未出原件"); + row.createCell(12).setCellValue("鏈嚭鍘熶欢"); } if(bo.getCloseAccountDate()!=null){ - row.createCell(13).setCellValue(DateUtil.formatByPattern(bo.getCloseAccountDate(), "yyyy年MM月dd日")); + row.createCell(13).setCellValue(DateUtil.formatByPattern(bo.getCloseAccountDate(), "yyyy骞碝M鏈坉d鏃�")); } row.createCell(14).setCellValue(bo.getAccountChecker()); //UsersDetail usersDetail = usersDetailService.findById(bo.getUserId()); @@ -353,12 +353,12 @@ public class fjtEvaluationController { row.createCell(15).setCellValue(bo.getCompany()); } if(bo.getTotalPrice()!=null){ - row.createCell(16).setCellValue(DataUtil.roundDouble(bo.getTotalPrice()/10000d,2)+ "万元"); + row.createCell(16).setCellValue(DataUtil.roundDouble(bo.getTotalPrice()/10000d,2)+ "涓囧厓"); }else{ row.createCell(16).setCellValue(""); } - row.createCell(17).setCellValue(DateUtil.formatByPattern(bo.getEvaluationDate(), "yyyy年MM月dd日")); + row.createCell(17).setCellValue(DateUtil.formatByPattern(bo.getEvaluationDate(), "yyyy骞碝M鏈坉d鏃�")); }else{ @@ -372,36 +372,36 @@ public class fjtEvaluationController { row.createCell(7).setCellValue(audit.getUserName()); row.createCell(8).setCellValue(allRoles.get(String.valueOf(bo.getRole()))); if(bo.getCharge() != null){ - row.createCell(9).setCellValue(bo.getCharge().intValue() + "元"); + row.createCell(9).setCellValue(bo.getCharge().intValue() + "鍏�"); } - row.createCell(10).setCellValue(DateUtil.formatByPattern(audit.getDateCreated(),"yyyy年MM月dd日")); + row.createCell(10).setCellValue(DateUtil.formatByPattern(audit.getDateCreated(),"yyyy骞碝M鏈坉d鏃�")); if(StringUtils.isNotBlank(bo.getReconcile())){ row.createCell(11).setCellValue(bo.getReconcile()); }else{ - row.createCell(11).setCellValue("未结账"); + row.createCell(11).setCellValue("鏈粨璐�"); } if(StringUtils.isNotBlank(bo.getOriginal())){ row.createCell(12).setCellValue(bo.getOriginal()); }else{ - row.createCell(12).setCellValue("未出原件"); + row.createCell(12).setCellValue("鏈嚭鍘熶欢"); } if(bo.getCloseAccountDate()!=null){ - row.createCell(13).setCellValue(DateUtil.formatByPattern(bo.getCloseAccountDate(), "yyyy年MM月dd日")); + row.createCell(13).setCellValue(DateUtil.formatByPattern(bo.getCloseAccountDate(), "yyyy骞碝M鏈坉d鏃�")); } row.createCell(14).setCellValue(bo.getAccountChecker()); row.createCell(15).setCellValue(audit.getCompany()); - row.createCell(16).setCellValue(audit.getTotalPrice()+ "万元"); - row.createCell(17).setCellValue(DateUtil.formatByPattern(bo.getEvaluationDate(), "yyyy年MM月dd日")); + row.createCell(16).setCellValue(audit.getTotalPrice()+ "涓囧厓"); + row.createCell(17).setCellValue(DateUtil.formatByPattern(bo.getEvaluationDate(), "yyyy骞碝M鏈坉d鏃�")); if(audit.getDealPrice() != null){ - row.createCell(18).setCellValue(audit.getDealPrice() + "万元"); + row.createCell(18).setCellValue(audit.getDealPrice() + "涓囧厓"); } if(audit.getAuditPrice() != null){ - row.createCell(19).setCellValue(audit.getAuditPrice()+ "万元"); + row.createCell(19).setCellValue(audit.getAuditPrice()+ "涓囧厓"); } if(audit.getAuditDate() != null){ - row.createCell(20).setCellValue(DateUtil.formatByPattern(audit.getAuditDate(),"yyyy年MM月dd日")); + row.createCell(20).setCellValue(DateUtil.formatByPattern(audit.getAuditDate(),"yyyy骞碝M鏈坉d鏃�")); } } @@ -423,25 +423,25 @@ public class fjtEvaluationController { row.createCell(7).setCellValue(bo.getEmail()); row.createCell(8).setCellValue(allRoles.get(String.valueOf(bo.getRole()))); row.createCell(9).setCellValue(""); - row.createCell(10).setCellValue(DateUtil.formatByPattern(bo.getDateCreated(),"yyyy年MM月dd日")); + row.createCell(10).setCellValue(DateUtil.formatByPattern(bo.getDateCreated(),"yyyy骞碝M鏈坉d鏃�")); row.createCell(13).setCellValue(bo.getAccountChecker()); row.createCell(14).setCellValue(""); - row.createCell(17).setCellValue(DateUtil.formatByPattern(bo.getEvaluationDate(), "yyyy年MM月dd日")); + row.createCell(17).setCellValue(DateUtil.formatByPattern(bo.getEvaluationDate(), "yyyy骞碝M鏈坉d鏃�")); } } - String fileName = "下载记录" + "(" + DateUtils.formatDate(new Date(), "yyyyMMddHHmmss") + ").xls"; + String fileName = "涓嬭浇璁板綍" + "(" + DateUtils.formatDate(new Date(), "yyyyMMddHHmmss") + ").xls"; try { HttpServletResponse response = ActionContext.getContext().getResponse(); response.setCharacterEncoding("UTF-8"); - //response.reset();// 清空输出流 + //response.reset();// 娓呯┖杈撳嚭娴� response.setContentType("application/x-download;charset=UTF-8"); fileName = new String(fileName.getBytes("GBK"),"ISO-8859-1"); - if(fileName.length()>150){//解决IE 6.0 bug + if(fileName.length()>150){//瑙e喅IE 6.0 bug fileName = new String(fileName.getBytes("GBK"),"ISO-8859-1"); } response.setHeader( "Content-Disposition", "attachment;filename=" + fileName); - os = response.getOutputStream();// 取得输出流 + os = response.getOutputStream();// 鍙栧緱杈撳嚭娴� wb.write(os); os.flush(); }catch (Exception e) { @@ -575,24 +575,24 @@ public class fjtEvaluationController { Mail mail = new Mail(); // mail.setReceiver(new MailUser("linxiaoshuai@fangjia.com")); mail.setReceiver(new MailUser(email)); - mail.setSubject("房价网—房产估价报告"); + mail.setSubject("鎴夸环缃戔�旀埧浜т及浠锋姤鍛�"); mail.setContent(email_content); mail.setImportant(true); mail.setAttachment(true); - mail.setAttachmentDes("房价网房产估价报告"); - mail.setAttachmentName("房价网专业房产估价报告.pdf"); + mail.setAttachmentDes("鎴夸环缃戞埧浜т及浠锋姤鍛�"); + mail.setAttachmentName("鎴夸环缃戜笓涓氭埧浜т及浠锋姤鍛�.pdf"); mail.setAttachmentUrl("http://user.fangjia.com/fangjiatong2/evaluation/exportPdf?evaluationId="+userTrades.getEvaluationId()+"&bkoffDownload=true&userId="+userTrades.getUserId()); emailService.sendHtmlMailWithFile(mail); - //更新状态 + //鏇存柊鐘舵�� userTrades.setSend(0); userTradesService.updateUserTrades(userTrades); result.put("status", 200); - result.put("msg", "发送成功"); + result.put("msg", "鍙戦�佹垚鍔�"); } catch (Exception e) { result.put("status", 0); - result.put("msg", "发送失败"); - System.out.println("需发送的email:"+email); + result.put("msg", "鍙戦�佸け璐�"); + System.out.println("闇�鍙戦�佺殑email:"+email); e.printStackTrace(); } @@ -683,9 +683,9 @@ public class fjtEvaluationController { List> errorDatas = (List>)ActionContext.getContext().getRequest().getSession().getAttribute("errorDatas"); OutputStream os = null; BufferedOutputStream fos = null; - String[] columns = {"地址","主贷人","支行账号","结账日期"}; + String[] columns = {"鍦板潃","涓昏捶浜�","鏀璐﹀彿","缁撹处鏃ユ湡"}; HSSFWorkbook wb= new HSSFWorkbook(); - Sheet sheet = wb.createSheet("错误记录"); + Sheet sheet = wb.createSheet("閿欒璁板綍"); Row row = sheet.createRow(0); for(int i =0 ;i < columns.length ; i++){ row.createCell(i).setCellValue(columns[i]); @@ -696,28 +696,28 @@ public class fjtEvaluationController { row = sheet.createRow(j++); Map errorData = errorDatas.get(i); for(String key:errorData.keySet()) { - if(("地址").equals(key)){ + if(("鍦板潃").equals(key)){ if(errorData.get(key)!=null){ row.createCell(0).setCellValue(errorData.get(key)); }else{ row.createCell(0).setCellValue(""); } } - if(("主贷人").equals(key)){ + if(("涓昏捶浜�").equals(key)){ if(errorData.get(key)!=null){ row.createCell(1).setCellValue(errorData.get(key)); }else{ row.createCell(1).setCellValue(""); } } - if(("支行账号").equals(key)){ + if(("鏀璐﹀彿").equals(key)){ if(errorData.get(key)!=null){ row.createCell(2).setCellValue(errorData.get(key)); }else{ row.createCell(2).setCellValue(""); } } - if(("结账日期").equals(key)){ + if(("缁撹处鏃ユ湡").equals(key)){ if(errorData.get(key)!=null){ row.createCell(3).setCellValue(errorData.get(key)); }else{ @@ -726,18 +726,18 @@ public class fjtEvaluationController { } } } - String fileName = "错误记录" + "(" + DateUtils.formatDate(new Date(), "yyyyMMddHHmmss") + ").xls"; + String fileName = "閿欒璁板綍" + "(" + DateUtils.formatDate(new Date(), "yyyyMMddHHmmss") + ").xls"; try { HttpServletResponse response = ActionContext.getContext().getResponse(); response.setCharacterEncoding("UTF-8"); - //response.reset();// 清空输出流 + //response.reset();// 娓呯┖杈撳嚭娴� response.setContentType("application/x-download;charset=UTF-8"); fileName = new String(fileName.getBytes("GBK"),"ISO-8859-1"); - if(fileName.length()>150){//解决IE 6.0 bug + if(fileName.length()>150){//瑙e喅IE 6.0 bug fileName = new String(fileName.getBytes("GBK"),"ISO-8859-1"); } response.setHeader( "Content-Disposition", "attachment;filename=" + fileName); - os = response.getOutputStream();// 取得输出流 + os = response.getOutputStream();// 鍙栧緱杈撳嚭娴� wb.write(os); os.flush(); }catch (Exception e) { diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/interceptor/AuthInterceptor.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/interceptor/AuthInterceptor.java index 111b3c515..9987ef08a 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/interceptor/AuthInterceptor.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/interceptor/AuthInterceptor.java @@ -49,7 +49,7 @@ public class AuthInterceptor implements Interceptor { BkoffUsers user = this.bkoffUsersDao.findById(userId); if (!actionFullName.equals("/users/selfEdit") && !actionFullName.equals("/users/selfUpdate")) { if (null != user && user.getPassword().equals("96e79218965eb72c92a549dd5a330112")) { - model.flash().setAttribute("message", "您的密码过于简单,请更换密码!"); + model.flash().setAttribute("message", "鎮ㄧ殑瀵嗙爜杩囦簬绠�鍗曪紝璇锋洿鎹㈠瘑鐮侊紒"); ret = model.redirect("/users/selfEdit"); } } @@ -66,7 +66,7 @@ public class AuthInterceptor implements Interceptor { if(StringUtils.isNotBlank(token) && StringUtils.isNotBlank(time) && token.equals(DigestUtils.md5Hex(time + ":" + INTERNAL_PROGRAM_ACCESS_KEY))){ return invocation.invoke(); }else{ - // 如果没登陆,让去登陆 + // 濡傛灉娌$櫥闄嗭紝璁╁幓鐧婚檰 model.setViewType("redirect"); String requestUrl = request.getRequestURL().toString(); if (null != request.getQueryString()) { diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/interceptor/FileUploadInterceptor.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/interceptor/FileUploadInterceptor.java index 6d1da882e..9edf753cc 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/interceptor/FileUploadInterceptor.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/interceptor/FileUploadInterceptor.java @@ -13,7 +13,7 @@ import org.sothis.web.mvc.interceptors.MultipartHttpServletRequest; import javax.servlet.http.HttpServletRequest; /** - * 文件上传拦截器 + * 鏂囦欢涓婁紶鎷︽埅鍣� * @author wenyan */ @Bean(scope = Scope.SINGLETON) diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/AdSpaceModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/AdSpaceModel.java index ad3c2b1d6..1a8a63d0e 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/AdSpaceModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/AdSpaceModel.java @@ -16,18 +16,18 @@ public class AdSpaceModel extends BaseModel { */ private static final long serialVersionUID = 1515970248866728137L; private String id; - private String materialType; // 素材类型 - private String materialURL; // 素材路径 - private String materialURLSmall; // 素材路径,收缩形态时用 - private double width; // 广告位宽度 - private double height; // 广告位高度 - private String links; // 链接 - private String pageId; // 页面ID - private String position; // 位置 - private double sequenceNumber; // 序号 - private String currentlyCity; // 城市 - private String materialContent; // 素材内容 - private String remark; // 备注 + private String materialType; // 绱犳潗绫诲瀷 + private String materialURL; // 绱犳潗璺緞 + private String materialURLSmall; // 绱犳潗璺緞锛屾敹缂╁舰鎬佹椂鐢� + private double width; // 骞垮憡浣嶅搴� + private double height; // 骞垮憡浣嶉珮搴� + private String links; // 閾炬帴 + private String pageId; // 椤甸潰ID + private String position; // 浣嶇疆 + private double sequenceNumber; // 搴忓彿 + private String currentlyCity; // 鍩庡競 + private String materialContent; // 绱犳潗鍐呭 + private String remark; // 澶囨敞 private List adSpaceBoList; private List serverAreaList; private Map positionMap; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/AdvertisementModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/AdvertisementModel.java index f1f20a31b..299252955 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/AdvertisementModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/AdvertisementModel.java @@ -6,7 +6,7 @@ import java.util.List; import com.fangjia.dal.mongo.model.bkoff.Advertisement; /** - * @Desc : 广告查询实体类 + * @Desc : 骞垮憡鏌ヨ瀹炰綋绫� * @User : xh */ public class AdvertisementModel extends BaseModel { @@ -15,46 +15,46 @@ public class AdvertisementModel extends BaseModel { private String id; - // 设备类型(PC、mobile) + // 璁惧绫诲瀷(PC銆乵obile) private String model; - // 页面(前端页面固定) 1-评估页,2-评估结果页,3-资讯列表页,4-资讯详情页 + // 椤甸潰(鍓嶇椤甸潰鍥哄畾) 1-璇勪及椤�,2-璇勪及缁撴灉椤�,3-璧勮鍒楄〃椤�,4-璧勮璇︽儏椤� private int source; - // 广告位位置 1-右侧竖排广告位,2-横排轮播位 + // 骞垮憡浣嶄綅缃� 1-鍙充晶绔栨帓骞垮憡浣�,2-妯帓杞挱浣� private int location; - // 广告位类型(不同页面的类型不相同) 1-单独位,2-轮播位 + // 骞垮憡浣嶇被鍨�(涓嶅悓椤甸潰鐨勭被鍨嬩笉鐩稿悓) 1-鍗曠嫭浣�,2-杞挱浣� private int type; private Integer height; private Integer width; - // 广告商 + // 骞垮憡鍟� private String advertiser; private String image; - // 标题(广告类型为轮播位时无此字段) + // 鏍囬锛堝箍鍛婄被鍨嬩负杞挱浣嶆椂鏃犳瀛楁锛� private String title; private String url; private String subTitle; - // 开始时间 + // 寮�濮嬫椂闂� private Date startDate; - // 结束时间 + // 缁撴潫鏃堕棿 private Date endDate; - // 开始时间 + // 寮�濮嬫椂闂� private String startDateStr; - // 结束时间 + // 缁撴潫鏃堕棿 private String endDateStr; - // 状态(0 - 开启、1 - 关闭) + // 鐘舵�侊紙0 - 寮�鍚��1 - 鍏抽棴锛� private Integer status; private List list; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/AdvertisementOperationModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/AdvertisementOperationModel.java index 3a01dcfe3..78430f93e 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/AdvertisementOperationModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/AdvertisementOperationModel.java @@ -7,7 +7,7 @@ import java.util.Map; import com.fangjia.dal.mongo.model.bkoff.Advertisement; /** - * @Desc : 广告运营查询实体类 + * @Desc : 骞垮憡杩愯惀鏌ヨ瀹炰綋绫� * @User : xh */ public class AdvertisementOperationModel extends BaseModel { @@ -16,45 +16,45 @@ public class AdvertisementOperationModel extends BaseModel { private String id; - // 设备类型(PC、mobile) + // 璁惧绫诲瀷(PC銆乵obile) private String model; - // 查询时间类型 1-一天,3-三天,7-七天 + // 鏌ヨ鏃堕棿绫诲瀷 1-涓�澶╋紝3-涓夊ぉ锛�7-涓冨ぉ private int dateType; - // 页面(前端页面固定) + // 椤甸潰(鍓嶇椤甸潰鍥哄畾) private String source; - // 广告位类型(不同页面的类型不相同) + // 骞垮憡浣嶇被鍨�(涓嶅悓椤甸潰鐨勭被鍨嬩笉鐩稿悓) private String type; - // 广告商 + // 骞垮憡鍟� private String advertiser; - // 开始时间 + // 寮�濮嬫椂闂� private Date startDate; - // 结束时间 + // 缁撴潫鏃堕棿 private Date endDate; - //今日总点击量 + //浠婃棩鎬荤偣鍑婚噺 private int todayCount; private List resultMap; - //跳转页面 1-广告商数据 2-页面数据 + //璺宠浆椤甸潰 1-骞垮憡鍟嗘暟鎹� 2-椤甸潰鏁版嵁 private String way; - //勾选的idsList(用于详情显示) + //鍕鹃�夌殑idsList(鐢ㄤ簬璇︽儏鏄剧ず) private List idsList; - //第一条数据量 + //绗竴鏉℃暟鎹噺 private int sumCount; - //页面详细数据时间列表 + //椤甸潰璇︾粏鏁版嵁鏃堕棿鍒楄〃 private List dateList; - //页面详细数据表 Map 封装成json字符串 + //椤甸潰璇︾粏鏁版嵁琛� Map 灏佽鎴恓son瀛楃涓� private String detailMap; public String getId() { diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/AgentMasterModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/AgentMasterModel.java index 40daa9376..63b4eb183 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/AgentMasterModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/AgentMasterModel.java @@ -18,9 +18,9 @@ public class AgentMasterModel extends BaseModel { private String logoUrl; private String honors; private Date creationDate; - private String representative; // 法人代表 - private String enterpriseAptitude; // 企业资质 - private String managementClass; // 经营类型 + private String representative; // 娉曚汉浠h〃 + private String enterpriseAptitude; // 浼佷笟璧勮川 + private String managementClass; // 缁忚惀绫诲瀷 private AgentMaster agentMaster; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/AgreementVo.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/AgreementVo.java index 38c3617a9..209455aed 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/AgreementVo.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/AgreementVo.java @@ -1,7 +1,7 @@ package com.fangjia.bkoff.model; public class AgreementVo { - private String agreementName;//协议一 协议二。。。 + private String agreementName;//鍗忚涓� 鍗忚浜屻�傘�傘�� private String id; private int status; public String getAgreementName() { diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/ApiCountLogModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/ApiCountLogModel.java index 61045484b..e9f313de2 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/ApiCountLogModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/ApiCountLogModel.java @@ -25,10 +25,10 @@ public class ApiCountLogModel extends BaseModel { @JSONField(name = "operate_time") private Date operateTime; - // 修改次数前总次数 + // 淇敼娆℃暟鍓嶆�绘鏁� @JSONField(name = "old_count") private Integer oldCount; - // 修改次数后的次数 + // 淇敼娆℃暟鍚庣殑娆℃暟 @JSONField(name = "new_count") private Integer newCount; private List apiCountLogList; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/ApiInvokeStatisticalModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/ApiInvokeStatisticalModel.java index 90fb90ec8..9d14f8000 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/ApiInvokeStatisticalModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/ApiInvokeStatisticalModel.java @@ -10,8 +10,8 @@ public class ApiInvokeStatisticalModel extends BaseModel { private static final long serialVersionUID = 2669730379316862920L; private String id; - private String beginDate;// 查询开始日期 - private String endDate;// 查询结束日期 + private String beginDate;// 鏌ヨ寮�濮嬫棩鏈� + private String endDate;// 鏌ヨ缁撴潫鏃ユ湡 private String userId; private String userName; private List apiInvokeStatisticals; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/ApiTestApplyInfo.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/ApiTestApplyInfo.java index cc7b049c2..bf240356e 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/ApiTestApplyInfo.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/ApiTestApplyInfo.java @@ -9,40 +9,40 @@ public class ApiTestApplyInfo { private long id; /** - * 用户id + * 鐢ㄦ埛id */ private String userId; /** - * 姓名 + * 濮撳悕 */ private String name; /** - * 公司 + * 鍏徃 */ private String company; /** - * 邮箱 + * 閭 */ private String email; /** - * 行业 + * 琛屼笟 */ private String industry; /** - * 审核进度 + * 瀹℃牳杩涘害 */ private String auditSchedule; /** - * 申请时间 + * 鐢宠鏃堕棿 */ private Date applyTime; /** - * 审核时间 + * 瀹℃牳鏃堕棿 */ private Date auditTime; /** - * 测试字段(多个,逗号隔开) + * 娴嬭瘯瀛楁锛堝涓紝閫楀彿闅斿紑锛� */ private String testFields; private String mobile; 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 a312fb80b..e97feedf7 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 @@ -16,8 +16,8 @@ public class ApiUserModel extends BaseModel { */ private static final long serialVersionUID = 7044341510628330454L; - private String begDate;// 查询开始日期 - private String endDate;// 查询结束日期 + private String begDate;// 鏌ヨ寮�濮嬫棩鏈� + private String endDate;// 鏌ヨ缁撴潫鏃ユ湡 private String statDate; private String appKey; private String userName; @@ -68,18 +68,18 @@ public class ApiUserModel extends BaseModel { private Integer sum; private Integer limit; - /*** 权限控制相关 **/ + /*** 鏉冮檺鎺у埗鐩稿叧 **/ private ApiUserBo apiUserBo; private List authorityList; private ApiUserAuthority authority; private List authorityBoList; //private List serverAreaList; private List> serverAreaList; - private String openCitys;// 汉字说明 - private List cityFirstLetters;// 城市拼音首字母 + private String openCitys;// 姹夊瓧璇存槑 + private List cityFirstLetters;// 鍩庡競鎷奸煶棣栧瓧姣� private String type; private String citys;// spell - private String unCheckCitys;// 页面反选的city + private String unCheckCitys;// 椤甸潰鍙嶉�夌殑city private Integer status; private String uri; private boolean hasAuth; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/ArtificialValuationModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/ArtificialValuationModel.java index b2cbadd49..eb1e6f1a7 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/ArtificialValuationModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/ArtificialValuationModel.java @@ -6,7 +6,7 @@ import java.util.Date; import java.util.List; /** - * @author 王文艳 + * @author 鐜嬫枃鑹� * @create 2016-11-15 **/ public class ArtificialValuationModel extends BaseModel { diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/BackLinkModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/BackLinkModel.java index 71424d422..73eeb4f3c 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/BackLinkModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/BackLinkModel.java @@ -257,6 +257,6 @@ public class BackLinkModel extends EntityModel implements Sort @Override public String getEntityName() { // TODO Auto-generated method stub - return "主域名"; + return "涓诲煙鍚�"; } } diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/BkoffUsersModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/BkoffUsersModel.java index e927a5151..78fca1293 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/BkoffUsersModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/BkoffUsersModel.java @@ -16,7 +16,7 @@ public class BkoffUsersModel extends BaseModel { private String id; private List roleIds; private String errorMessage; - private List citys; // 开通城市 + private List citys; // 寮�閫氬煄甯� private List supportCity; private List allCity; private Map> serverAreaBoMap; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/BusinessModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/BusinessModel.java index 62f6263d2..0f679bf98 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/BusinessModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/BusinessModel.java @@ -24,22 +24,22 @@ public class BusinessModel extends BaseModel{ private String businessType; - private String alias;//别名 - private String address;//商户地址 - private String tags;//标签 - private String feature;//特色 - private String businessScope;//商家业态 - private String telephone;//商家电话 - private Integer consumption;//人均消费 - private Integer commentCount;//点评量 - private String businessHours;//营业时间 - private String parkingInfo;//停车信息 - private String trafficInfo;//交通信息 - private String commends;//推荐产品 - private Double productScore;//产品评分 - private Double environmentScore;//环境评分 - private Double serviceScore;//服务评分 - private String introduction;//商户简介 + private String alias;//鍒悕 + private String address;//鍟嗘埛鍦板潃 + private String tags;//鏍囩 + private String feature;//鐗硅壊 + private String businessScope;//鍟嗗涓氭�� + private String telephone;//鍟嗗鐢佃瘽 + private Integer consumption;//浜哄潎娑堣垂 + private Integer commentCount;//鐐硅瘎閲� + private String businessHours;//钀ヤ笟鏃堕棿 + private String parkingInfo;//鍋滆溅淇℃伅 + private String trafficInfo;//浜ら�氫俊鎭� + private String commends;//鎺ㄨ崘浜у搧 + private Double productScore;//浜у搧璇勫垎 + private Double environmentScore;//鐜璇勫垎 + private Double serviceScore;//鏈嶅姟璇勫垎 + private String introduction;//鍟嗘埛绠�浠� private String otherTags; private List districts; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/CalcCommandModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/CalcCommandModel.java index eb2103770..928203162 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/CalcCommandModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/CalcCommandModel.java @@ -18,11 +18,11 @@ public class CalcCommandModel extends BaseModel{ private String name; private String block; private String category; // district,shop,office - private String estateType; // 物业类型(普通住宅、别墅、商住楼) - private Integer calcType; // 计算类型(0-指定日期计算 1-全部重算 2-全部补充重算) - private Date calcDate; // 计算日期 - private Integer status; // 命令状态 0-初始状态 1-处理中 2-处理完成 3-处理异常 - private int priority; // 优先级 0-普通(后台人员操作) 1-中(每周算均价的标志) 2-高(预留标志位,特殊情况下使用) + private String estateType; // 鐗╀笟绫诲瀷锛堟櫘閫氫綇瀹呫�佸埆澧呫�佸晢浣忔ゼ锛� + private Integer calcType; // 璁$畻绫诲瀷(0-鎸囧畾鏃ユ湡璁$畻 1-鍏ㄩ儴閲嶇畻 2-鍏ㄩ儴琛ュ厖閲嶇畻) + private Date calcDate; // 璁$畻鏃ユ湡 + private Integer status; // 鍛戒护鐘舵�� 0-鍒濆鐘舵�� 1-澶勭悊涓� 2-澶勭悊瀹屾垚 3-澶勭悊寮傚父 + private int priority; // 浼樺厛绾� 0-鏅��(鍚庡彴浜哄憳鎿嶄綔) 1-涓紙姣忓懆绠楀潎浠风殑鏍囧織锛� 2-楂橈紙棰勭暀鏍囧織浣嶏紝鐗规畩鎯呭喌涓嬩娇鐢級 private Date creationDate; private String remark; private String keyword; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/ConsumerAddressModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/ConsumerAddressModel.java index 90825c15f..2cd6529bb 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/ConsumerAddressModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/ConsumerAddressModel.java @@ -13,15 +13,15 @@ public class ConsumerAddressModel extends BaseModel { private static final long serialVersionUID = 5339458429144496348L; /** - * 城市 + * 鍩庡競 */ private String cityParam; /** - * 行业 + * 琛屼笟 */ private String industry; /** - * 搜索参数 + * 鎼滅储鍙傛暟 */ private String key; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/CopyrightConfigModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/CopyrightConfigModel.java index 0806a484b..d660f672e 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/CopyrightConfigModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/CopyrightConfigModel.java @@ -9,17 +9,17 @@ public class CopyrightConfigModel extends BaseModel { private String id; /** - * 编号,唯一 + * 缂栧彿锛屽敮涓� */ private String number; /** - * 版权内容 + * 鐗堟潈鍐呭 */ private String copyright; /** - * 备案号 + * 澶囨鍙� */ private String recordNumber; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/CrowdsourceModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/CrowdsourceModel.java index acd23a287..0ae69a8a6 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/CrowdsourceModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/CrowdsourceModel.java @@ -6,7 +6,7 @@ import java.util.Date; import java.util.List; /** - * 众包 + * 浼楀寘 * @author wenyan 2015/4/18. */ public class CrowdsourceModel extends BaseModel { diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/DataModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/DataModel.java index 28594ed8d..c9e0eab43 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/DataModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/DataModel.java @@ -15,8 +15,8 @@ public class DataModel extends BaseModel { private String sort; private String cityDisplay; private String infoId; - private Integer cityPop; // 城市人口 - private Integer disAvgPop; // 小区平均人口 + private Integer cityPop; // 鍩庡競浜哄彛 + private Integer disAvgPop; // 灏忓尯骞冲潎浜哄彛 private Double rate; private CityInfo cityInfo; private Integer showTemp; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/DiKuaiModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/DiKuaiModel.java index f47ef8d9f..99ff72f40 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/DiKuaiModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/DiKuaiModel.java @@ -8,17 +8,17 @@ import com.google.common.collect.Lists; public class DiKuaiModel extends BaseModel { private static final long serialVersionUID = -4185218207486406320L; private String id; - private String cityDisplay; //城市 - private String region; //区域 - private String purpose; //规划用途 - private String did; //地块编号 - private String status; //成交状态 - private String name; //地块名称 - private String location; //地块位置 - private String controlNumber; //电子监管号 - private String op; //操作标识(save和update) - private List regionList = Lists.newArrayList(); //区域集合 - //地块数据 + private String cityDisplay; //鍩庡競 + private String region; //鍖哄煙 + private String purpose; //瑙勫垝鐢ㄩ�� + private String did; //鍦板潡缂栧彿 + private String status; //鎴愪氦鐘舵�� + private String name; //鍦板潡鍚嶇О + private String location; //鍦板潡浣嶇疆 + private String controlNumber; //鐢靛瓙鐩戠鍙� + private String op; //鎿嶄綔鏍囪瘑锛坰ave鍜寀pdate锛� + private List regionList = Lists.newArrayList(); //鍖哄煙闆嗗悎 + //鍦板潡鏁版嵁 private List list; private DiKuai diKuai; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/DistrictModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/DistrictModel.java index d9e07c3a5..10394a365 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/DistrictModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/DistrictModel.java @@ -104,7 +104,7 @@ public class DistrictModel extends BaseModel { private Integer ifSellStat; private Integer ifThirdStat; private Integer rentPrice; - // 新盘的属性 + // 鏂扮洏鐨勫睘鎬� private String mobile; private Date openDate; // private String liveDate; @@ -123,8 +123,8 @@ public class DistrictModel extends BaseModel { private String knowbaseId; private int status; - private Integer avgPrice; // 元/㎡ - private Integer totalPrice; // 万元/套 + private Integer avgPrice; // 鍏�/銕� + private Integer totalPrice; // 涓囧厓/濂� private Date weekend; private int diffPercent; @@ -209,13 +209,13 @@ public class DistrictModel extends BaseModel { private Integer radius; private String districtSummary; private List> boxesDetail; - //百度地图边框 + //鐧惧害鍦板浘杈规 private String baiduBorder; - //按照物业类型查询 + //鎸夌収鐗╀笟绫诲瀷鏌ヨ private String searchType; private String sid; - //按照网站来源查询 + //鎸夌収缃戠珯鏉ユ簮鏌ヨ private String sourceWeb; private String createYear; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/ElevateWordModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/ElevateWordModel.java index 6e9a5d428..3d0603fae 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/ElevateWordModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/ElevateWordModel.java @@ -21,7 +21,7 @@ public class ElevateWordModel extends BaseModel { private String recommendCity; /** - * 公司简介 + * 鍏徃绠�浠� */ private String description; private String creationDate; @@ -30,9 +30,9 @@ public class ElevateWordModel extends BaseModel { private String msg; private String ids; private String keyword; - private Integer showInHome;// 表示 是否在首页显示 - private Integer showInIndexHome;// 全国首页显示标识 - private String showCities;// 显示的城市列表 + private Integer showInHome;// 琛ㄧず 鏄惁鍦ㄩ椤垫樉绀� + private Integer showInIndexHome;// 鍏ㄥ浗棣栭〉鏄剧ず鏍囪瘑 + private String showCities;// 鏄剧ず鐨勫煄甯傚垪琛� private String defaultHouseType; private String seoTitle; private String seoKeyword; @@ -45,12 +45,12 @@ public class ElevateWordModel extends BaseModel { private List cityVOs; /** - * 二级域名 + * 浜岀骇鍩熷悕 */ private String secondLevelDomain; /** - * 详细介绍 + * 璇︾粏浠嬬粛 */ private String detailDescription; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/EvaluateModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/EvaluateModel.java index effb26ab8..5c4a307ca 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/EvaluateModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/EvaluateModel.java @@ -16,7 +16,7 @@ public class EvaluateModel extends BaseModel { private int status; private String fullName; private String logoUrl; - private String qualifications; // 企业资质 + private String qualifications; // 浼佷笟璧勮川 private String regions; private String expertRegions; private String mainCategory; @@ -29,10 +29,10 @@ public class EvaluateModel extends BaseModel { private String telephone; private String email; private String cityDisplay; - private int jobExperience; // 执业年限 - private int experienceLevel; // 经验指数 - private String position; // 职位 - private String title; // 头衔 + private int jobExperience; // 鎵т笟骞撮檺 + private int experienceLevel; // 缁忛獙鎸囨暟 + private String position; // 鑱屼綅 + private String title; // 澶磋 private List evaluateCompanyList; private EvaluateCompany evaluateCompany; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/EvaluationConditionModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/EvaluationConditionModel.java index b4dd64f9b..c529e81ef 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/EvaluationConditionModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/EvaluationConditionModel.java @@ -14,10 +14,10 @@ public class EvaluationConditionModel extends BaseModel { private String id; private Integer view; private String estateType; - private String condition;// 影响因数 + private String condition;// 褰卞搷鍥犳暟 private String conditionEN; - private Integer seq;// 序列 - private String showType;// 展示类型 + private Integer seq;// 搴忓垪 + private String showType;// 灞曠ず绫诲瀷 private List EvaluationConditions; private EvaluationCondition EvaluationCondition; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/EvaluationExportModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/EvaluationExportModel.java index 0af4aa05a..4af448490 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/EvaluationExportModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/EvaluationExportModel.java @@ -41,7 +41,7 @@ public class EvaluationExportModel extends BaseModel { private String encryptId; private int message; - private int again;// 是否重新发送 1:重新发 + private int again;// 鏄惁閲嶆柊鍙戦�� 1锛氶噸鏂板彂 private int totalPrice; @@ -62,10 +62,10 @@ public class EvaluationExportModel extends BaseModel { private Double gardenArea; private Double basementArea; - private String insidepos;// 小区位置 - private String sight;// 景观情况 - private String lightingVentilation;// 采光通风 - private String sideset;// 边套装置 + private String insidepos;// 灏忓尯浣嶇疆 + private String sight;// 鏅鎯呭喌 + private String lightingVentilation;// 閲囧厜閫氶 + private String sideset;// 杈瑰瑁呯疆 private String noise; private String worryFacility; private String carport; @@ -146,7 +146,7 @@ public class EvaluationExportModel extends BaseModel { private File pic3D; - private int reportType; // 0:买家版;1:房东版 + private int reportType; // 0锛氫拱瀹剁増锛�1锛氭埧涓滅増 private HouseSummary houseSummary; private DistrictHot districtHot; private CityHot cityHot; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/EvaluationPurposeAnalysisModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/EvaluationPurposeAnalysisModel.java index ad518bba4..ab4785b55 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/EvaluationPurposeAnalysisModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/EvaluationPurposeAnalysisModel.java @@ -6,34 +6,34 @@ import java.util.Date; import java.util.List; /** - * 房价网v1.1 用户分析模型 + * 鎴夸环缃憊1.1 鐢ㄦ埛鍒嗘瀽妯″瀷 * @author zhangran */ public class EvaluationPurposeAnalysisModel extends BaseModel{ private List list; /** - * 用户手机 + * 鐢ㄦ埛鎵嬫満 */ private String mobile; /** - * 开始时间 + * 寮�濮嬫椂闂� */ private Date startDate; /** - * 开始时间 + * 寮�濮嬫椂闂� */ private Date endDate; /** - * 查看报告类型 参考:ReportTypeEnum + * 鏌ョ湅鎶ュ憡绫诲瀷 鍙傝�冿細ReportTypeEnum */ private Integer reportType; /** - * 查看报告停留时间(秒) + * 鏌ョ湅鎶ュ憡鍋滅暀鏃堕棿(绉�) */ private Integer visitTime; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/ExtractDistrictModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/ExtractDistrictModel.java index 5dbe3e17d..27d553730 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/ExtractDistrictModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/ExtractDistrictModel.java @@ -62,7 +62,7 @@ public class ExtractDistrictModel extends BaseModel { private String descriptions; - // 新盘的属性 + // 鏂扮洏鐨勫睘鎬� private String mobile; private Date openDate; // private String liveDate; @@ -81,8 +81,8 @@ public class ExtractDistrictModel extends BaseModel { private String knowbaseId; private int status; - private Integer avgPrice; // 元/㎡ - private Integer totalPrice; // 万元/套 + private Integer avgPrice; // 鍏�/銕� + private Integer totalPrice; // 涓囧厓/濂� private Date weekend; private int diffPercent; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/FjLoanOfficerModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/FjLoanOfficerModel.java index 62d7a26ee..2e9d44228 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/FjLoanOfficerModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/FjLoanOfficerModel.java @@ -17,7 +17,7 @@ public class FjLoanOfficerModel extends BaseModel { public Integer getActiveStatus() { if (activeStatus == null) { - activeStatus = 0;// 未激活 + activeStatus = 0;// 鏈縺娲� } return activeStatus; } diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/FjtAnalyModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/FjtAnalyModel.java index 19e1241f2..fd4fc3f40 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/FjtAnalyModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/FjtAnalyModel.java @@ -5,8 +5,8 @@ import java.util.List; import java.util.Map; public class FjtAnalyModel extends BaseModel{ - private String begDate;// 查询开始日期 - private String endDate;// 查询结束日期 + private String begDate;// 鏌ヨ寮�濮嬫棩鏈� + private String endDate;// 鏌ヨ缁撴潫鏃ユ湡 private List dates; private List>> resultList; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/FjtEvaluationModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/FjtEvaluationModel.java index 4fb7f47a8..b1cc4fd5a 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/FjtEvaluationModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/FjtEvaluationModel.java @@ -34,10 +34,10 @@ public class FjtEvaluationModel extends BaseModel { private String lender; private Integer send; private Date closeAccountDate; - //是否查询重复 + //鏄惁鏌ヨ閲嶅 private boolean repeat; - //0-导出Excel 1-成功 + //0-瀵煎嚭Excel 1-鎴愬姛 private int status; public String getUserName() { diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/FjtModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/FjtModel.java index 0974d6558..ee9b32df2 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/FjtModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/FjtModel.java @@ -61,16 +61,16 @@ public class FjtModel extends BaseModel{ private String closeDate; /** - * 是否管理员(1是0否) + * 鏄惁绠$悊鍛�(1鏄�0鍚�) */ private int manager; /** - * 管理能才查看统计的用户 + * 绠$悊鑳芥墠鏌ョ湅缁熻鐨勭敤鎴� */ private String roleUsers; /** - * 销售负责人 + * 閿�鍞礋璐d汉 */ private String saleName; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/FpkDownloadModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/FpkDownloadModel.java index 45c23bcae..fc825703f 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/FpkDownloadModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/FpkDownloadModel.java @@ -10,7 +10,7 @@ import com.fangjia.service.bo.UserTradesBo; /** - * 房评卡报告下载记录表 + * 鎴胯瘎鍗℃姤鍛婁笅杞借褰曡〃 * */ public class FpkDownloadModel extends BaseModel { @@ -30,7 +30,7 @@ public class FpkDownloadModel extends BaseModel { private String roleId; private String cityDisplay; private Date downloadDate; - // TODO 按需求加字段 如:报告的一些信息 + // TODO 鎸夐渶姹傚姞瀛楁 濡傦細鎶ュ憡鐨勪竴浜涗俊鎭� public String getId() { return id; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/FpkFeedbackModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/FpkFeedbackModel.java index 57aa90137..0807edc88 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/FpkFeedbackModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/FpkFeedbackModel.java @@ -7,7 +7,7 @@ import com.fangjia.chafangtong.dal.mongo.model.FpkFeedback; /** - * 房评卡用户反馈表 + * 鎴胯瘎鍗$敤鎴峰弽棣堣〃 * */ public class FpkFeedbackModel extends BaseModel { diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/FpkMenuModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/FpkMenuModel.java index c9dd4e586..cded9fe4f 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/FpkMenuModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/FpkMenuModel.java @@ -8,17 +8,17 @@ import com.fangjia.chafangtong.dal.mongo.model.FpkMenu; /** - * 房评卡菜单表 + * 鎴胯瘎鍗¤彍鍗曡〃 * */ public class FpkMenuModel extends BaseModel { private static final long serialVersionUID = -6309545731097038246L; private String id; - private String name; // 名称 - private String type; // 类型 目前分住宅、商铺 - private String uri; // 访问地址 如:/local/shop - private int sn; // 序号 从小到大排序 + private String name; // 鍚嶇О + private String type; // 绫诲瀷 鐩墠鍒嗕綇瀹呫�佸晢閾� + private String uri; // 璁块棶鍦板潃 濡傦細/local/shop + private int sn; // 搴忓彿 浠庡皬鍒板ぇ鎺掑簭 private Date creationDate; private Date modificationDate; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/FpkRoleModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/FpkRoleModel.java index 6e73775a0..229bd0307 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/FpkRoleModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/FpkRoleModel.java @@ -8,7 +8,7 @@ import com.fangjia.chafangtong.dal.mongo.model.FpkRole; /** - * 角色 + * 瑙掕壊 * */ public class FpkRoleModel extends BaseModel { @@ -18,9 +18,9 @@ public class FpkRoleModel extends BaseModel { */ private static final long serialVersionUID = 5526039440365176987L; private String id; - private String name; // 名称 - private String desc; // 描述 - private List menus; // 权限菜单 有序 + private String name; // 鍚嶇О + private String desc; // 鎻忚堪 + private List menus; // 鏉冮檺鑿滃崟 鏈夊簭 private Date creationDate; private Date modificationDate; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/FpkUsersModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/FpkUsersModel.java index 882107939..ec4e0e416 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/FpkUsersModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/FpkUsersModel.java @@ -9,7 +9,7 @@ import com.fangjia.chafangtong.dal.mongo.model.FpkUsers; import com.fangjia.service.bo.ServerAreaBo; /** - * 房评卡用户 + * 鎴胯瘎鍗$敤鎴� * */ public class FpkUsersModel extends BaseModel { @@ -21,12 +21,12 @@ public class FpkUsersModel extends BaseModel { private String id; private String name; private String password; - private int status; // 状态 0 正常 - private String role; // 用户身份 - private Date creationDate; // 创建日期 - private Date modificationDate; // 修改日期 - private Date validDate; // 有效期(截至日期) - private List citys; // 开通城市 + private int status; // 鐘舵�� 0 姝e父 + private String role; // 鐢ㄦ埛韬唤 + private Date creationDate; // 鍒涘缓鏃ユ湡 + private Date modificationDate; // 淇敼鏃ユ湡 + private Date validDate; // 鏈夋晥鏈燂紙鎴嚦鏃ユ湡锛� + private List citys; // 寮�閫氬煄甯� private String company; private List supportCity; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/FriendLinkModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/FriendLinkModel.java index ff1f7529e..0000c5251 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/FriendLinkModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/FriendLinkModel.java @@ -20,7 +20,7 @@ public class FriendLinkModel extends BaseModel { private Integer type; private Integer sequence; private String msg; - private String placement;// 多选框 拼接字符串 + private String placement;// 澶氶�夋 鎷兼帴瀛楃涓� private List serverAreasList; private Integer toName; private String elevateWords; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/HouseLoudongModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/HouseLoudongModel.java index cc5c299cf..9ef00048f 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/HouseLoudongModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/HouseLoudongModel.java @@ -32,19 +32,19 @@ public class HouseLoudongModel extends BaseModel { private String refRoomNum; private String houseNumId; private String msg; - private String hourseStructure; //户型结构 例:平层、跃层、复式、错层等 - private Integer actualFloor; //实际层 - private Integer nominalFloor; //名义层 - private Double floorHeight; // 层高 - private double dwellingSpaceArea;//套内建筑面积 - private String houseNumType;//房号类型 + private String hourseStructure; //鎴峰瀷缁撴瀯 渚嬶細骞冲眰銆佽穬灞傘�佸寮忋�侀敊灞傜瓑 + private Integer actualFloor; //瀹為檯灞� + private Integer nominalFloor; //鍚嶄箟灞� + private Double floorHeight; // 灞傞珮 + private double dwellingSpaceArea;//濂楀唴寤虹瓚闈㈢Н + private String houseNumType;//鎴垮彿绫诲瀷 private Integer totalFloor; /** - * 小区编号 + * 灏忓尯缂栧彿 */ private String districtNo; /** - * seaweed中的小区名 + * seaweed涓殑灏忓尯鍚� */ private String nameInSeaweed; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/ImageManagerModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/ImageManagerModel.java index df0789482..7a9b36768 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/ImageManagerModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/ImageManagerModel.java @@ -15,27 +15,27 @@ public class ImageManagerModel extends BaseModel { private String id; /** - * 图片类型 + * 鍥剧墖绫诲瀷 */ private String type; /** - * 图片url + * 鍥剧墖url */ private String url; /** - * 名称 + * 鍚嶇О */ private String name; /** - * 创建时间 + * 鍒涘缓鏃堕棿 */ private Date createDate; /** - * 修改时间 + * 淇敼鏃堕棿 */ private Date modifyDate; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/InquiryModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/InquiryModel.java index f76e65bc7..7020d7ce3 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/InquiryModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/InquiryModel.java @@ -33,7 +33,7 @@ public class InquiryModel extends BaseModel{ private String inquiryName; private List inquiryUsersList; private String inquiryUsersId; - private Integer type;//0表示从首页跳转过来 + private Integer type;//0琛ㄧず浠庨椤佃烦杞繃鏉� private int visible; private int total; private String accountChecker; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/LandPriceIndexModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/LandPriceIndexModel.java index 72defe9f3..f623aea7c 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/LandPriceIndexModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/LandPriceIndexModel.java @@ -19,7 +19,7 @@ public class LandPriceIndexModel extends BaseModel { private List landPriceIndexList; - //查询年份列表 + //鏌ヨ骞翠唤鍒楄〃 private List years; public String getId() { diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/LoanAgreementModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/LoanAgreementModel.java index e3b8fc354..15baa34fd 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/LoanAgreementModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/LoanAgreementModel.java @@ -41,13 +41,13 @@ public class LoanAgreementModel extends BaseModel { private String msg; - //开发环境 0:本地 1:测试 2:线上 + //寮�鍙戠幆澧� 0锛氭湰鍦� 1锛氭祴璇� 2锛氱嚎涓� private int server; private String[] ids; /* - * 是否有代扣管理的权限 + * 鏄惁鏈変唬鎵g鐞嗙殑鏉冮檺 */ private boolean loanWithHoldRole; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/LoanAgreementVo.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/LoanAgreementVo.java index f887bc669..183dfe940 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/LoanAgreementVo.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/LoanAgreementVo.java @@ -9,33 +9,33 @@ public class LoanAgreementVo { private double loanAmount; private double serviceRate; private String certificate; - private String number;//证件号码 - private String cardNumber;//银行卡号 - private String bank;//开户行 + private String number;//璇佷欢鍙风爜 + private String cardNumber;//閾惰鍗″彿 + private String bank;//寮�鎴疯 private String signatureUrl; private String loanId; - private String agreementId;//协议编号 - private String agreeId;//协议Id(最新的) - private String cardStatus; // 0:未认证 1:已认证 2:已失效 - private String signStatus; // 0:未签约 1:已签约 2:已失效 3:已拒绝 - private int agreementStatus;//协议的状态 1:有效 0:无效 + private String agreementId;//鍗忚缂栧彿 + private String agreeId;//鍗忚Id(鏈�鏂扮殑) + private String cardStatus; // 0:鏈璇� 1锛氬凡璁よ瘉 2锛氬凡澶辨晥 + private String signStatus; // 0锛氭湭绛剧害 1锛氬凡绛剧害 2锛氬凡澶辨晥 3锛氬凡鎷掔粷 + private int agreementStatus;//鍗忚鐨勭姸鎬� 1锛氭湁鏁� 0锛氭棤鏁� /* - * 协议是否全部废除 + * 鍗忚鏄惁鍏ㄩ儴搴熼櫎 */ private boolean deleteAll; /** - * 操作状态 :列表操作列的控制 - * 0:正常状态( 未认证0、未签约0|已认证1、未签约0)可以操作 二维码、复制链接、编辑、废除 - * 1:成功状态(已认证1、已签约1)可以操作 废除 - * 2:异常状态(存在 失效|拒绝|) 可以操作 生成协议 、 废除 + * 鎿嶄綔鐘舵�� 锛氬垪琛ㄦ搷浣滃垪鐨勬帶鍒� + * 0:姝e父鐘舵�侊紙 鏈璇�0銆佹湭绛剧害0|宸茶璇�1銆佹湭绛剧害0锛夊彲浠ユ搷浣� 浜岀淮鐮併�佸鍒堕摼鎺ャ�佺紪杈戙�佸簾闄� + * 1:鎴愬姛鐘舵�侊紙宸茶璇�1銆佸凡绛剧害1锛夊彲浠ユ搷浣� 搴熼櫎 + * 2锛氬紓甯哥姸鎬侊紙瀛樺湪 澶辨晥|鎷掔粷|锛� 鍙互鎿嶄綔 鐢熸垚鍗忚 銆� 搴熼櫎 */ private int operationStatus; - private List agreementVos;//列表展示的4个 - private int showButton;//协议过多的按钮 - private List extraAgreementVos;//额外的协议 + private List agreementVos;//鍒楄〃灞曠ず鐨�4涓� + private int showButton;//鍗忚杩囧鐨勬寜閽� + private List extraAgreementVos;//棰濆鐨勫崗璁� - private Integer withHoldStatus; //显示代扣或等待代扣的状态(代扣管理列表有该条数据时表示等待代扣)0-代扣,1-等待代扣 + private Integer withHoldStatus; //鏄剧ず浠f墸鎴栫瓑寰呬唬鎵g殑鐘舵�侊紙浠f墸绠$悊鍒楄〃鏈夎鏉℃暟鎹椂琛ㄧず绛夊緟浠f墸锛�0-浠f墸锛�1-绛夊緟浠f墸 public String getId() { return id; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/LoanBurialPointModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/LoanBurialPointModel.java index 53e8d2765..d8f32948d 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/LoanBurialPointModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/LoanBurialPointModel.java @@ -7,37 +7,37 @@ import com.fangjia.dal.mongo.fangjia.model.LoanBurialPoint; public class LoanBurialPointModel extends BaseModel { /** - * 手机号码 + * 鎵嬫満鍙风爜 */ private String mobile; /** - * 渠道名称 + * 娓犻亾鍚嶇О */ private String leadSource; /** - * 开始时间 + * 寮�濮嬫椂闂� */ private String startTime; /** - * 结束时间 + * 缁撴潫鏃堕棿 */ private String endTime; /** - * 页面来源 + * 椤甸潰鏉ユ簮 */ private String pageSource; /** - * 事件ID + * 浜嬩欢ID */ private String burialPointName; /** - * 数据集合 + * 鏁版嵁闆嗗悎 */ private List datas; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/LoanLeadsModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/LoanLeadsModel.java index c355bfcd9..0a5b9825c 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/LoanLeadsModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/LoanLeadsModel.java @@ -13,21 +13,21 @@ import java.util.List; */ public class LoanLeadsModel extends BaseModel{ - //编辑、删除传递的ID + //缂栬緫銆佸垹闄や紶閫掔殑ID private String id; - //查询字段,值 + //鏌ヨ瀛楁锛屽�� private String queryName; private String queryValue; - //查询日期 + //鏌ヨ鏃ユ湡 private Date startDate; private Date endDate; - //list页面列表 + //list椤甸潰鍒楄〃 private List list; - //省份列表 + //鐪佷唤鍒楄〃 private List plist; - //城市列表 + //鍩庡競鍒楄〃 private List clist; - //联动值 + //鑱斿姩鍊� private String province; private LoanLeads loanLeads; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/LoanOfficerModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/LoanOfficerModel.java index 57ad997fa..82020f1f5 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/LoanOfficerModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/LoanOfficerModel.java @@ -21,7 +21,7 @@ public class LoanOfficerModel extends BaseModel { public Integer getActiveStatus() { if(activeStatus == null){ - activeStatus = 0;//未激活 + activeStatus = 0;//鏈縺娲� } return activeStatus; } diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/LoanProductModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/LoanProductModel.java index b00fca619..3b7d7eb81 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/LoanProductModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/LoanProductModel.java @@ -22,102 +22,102 @@ public class LoanProductModel extends BaseModel { private String id; /** - * 产品名称 + * 浜у搧鍚嶇О */ private String name; /** - * 产品类型 + * 浜у搧绫诲瀷 */ private String type; /** - * 合作结构ID + * 鍚堜綔缁撴瀯ID */ private String mechanismId; /** - * 产品logo + * 浜у搧logo */ private String logo; /** - * 贷款额最小(万) + * 璐锋棰濇渶灏忥紙涓囷級 */ private double minLoanMoney; /** - * 贷款额最大(万) + * 璐锋棰濇渶澶э紙涓囷級 */ private double maxLoanMoney; /** - * 贷款期限最小(月) + * 璐锋鏈熼檺鏈�灏忥紙鏈堬級 */ private int minLoanTerm; /** - * 贷款期限最大(月) + * 璐锋鏈熼檺鏈�澶э紙鏈堬級 */ private int maxLoanTerm; /** - * 放款时间最小(天) + * 鏀炬鏃堕棿鏈�灏忥紙澶╋級 */ private int minFkTime; /** - * 放款时间最大(天) + * 鏀炬鏃堕棿鏈�澶э紙澶╋級 */ private int maxFkTime; /** - * 放款时间说明 + * 鏀炬鏃堕棿璇存槑 */ private String fkTimeDesc; /** - * 月利率最小(%) + * 鏈堝埄鐜囨渶灏忥紙%锛� */ private double minMonthInterestRate; /** - * 月利率最大(%) + * 鏈堝埄鐜囨渶澶э紙%锛� */ private double maxMonthInterestRate; /** - * 最小月管理费(%) + * 鏈�灏忔湀绠$悊璐癸紙%锛� */ private double minMonthManagementExpense; /** - * 最大月管理费(%) + * 鏈�澶ф湀绠$悊璐癸紙%锛� */ private double maxMonthManagementExpense; /** - * 产品特色 + * 浜у搧鐗硅壊 */ private String productFeature; /** - * 标签ID集合 对应标签表:LoanProductTag + * 鏍囩ID闆嗗悎 瀵瑰簲鏍囩琛細LoanProductTag */ private List tagIds; /** - * 投放位置 参考:LoanProductPositionEnum + * 鎶曟斁浣嶇疆 鍙傝�冿細LoanProductPositionEnum */ private List positions; /** - * 创建时间 + * 鍒涘缓鏃堕棿 */ private Date createDate; /** - * 修改时间 + * 淇敼鏃堕棿 */ private Date modifyDate; @@ -127,13 +127,13 @@ public class LoanProductModel extends BaseModel { private List loanProductDtoList; - private List loanProductType;//贷款类型 + private List loanProductType;//璐锋绫诲瀷 - private List loanProductTagList;//标签 + private List loanProductTagList;//鏍囩 - private List mechanismList;//合作机构 + private List mechanismList;//鍚堜綔鏈烘瀯 - private LoanProductPositionEnum[] positionList;//投放位置 + private LoanProductPositionEnum[] positionList;//鎶曟斁浣嶇疆 private Integer resultCode; @@ -146,7 +146,7 @@ public class LoanProductModel extends BaseModel { private Date endDate; /** - * 合作公司贷款产品的url,当有这个地址时前台贷款申请跳转到该url,不需要填写我们自己的申请 + * 鍚堜綔鍏徃璐锋浜у搧鐨剈rl,褰撴湁杩欎釜鍦板潃鏃跺墠鍙拌捶娆剧敵璇疯烦杞埌璇rl,涓嶉渶瑕佸~鍐欐垜浠嚜宸辩殑鐢宠 */ private String url; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/LoanPushModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/LoanPushModel.java index f79366c2c..3d93bc85c 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/LoanPushModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/LoanPushModel.java @@ -17,46 +17,46 @@ public class LoanPushModel extends BaseModel { private String logId; - //姓名 + //濮撳悕 private String name; - //手机号 + //鎵嬫満鍙� private String phone; - //需求金额 + //闇�姹傞噾棰� private double money; - //城市 + //鍩庡競 private String loanCity; - //贷款期限 + //璐锋鏈熼檺 private int term; - //是否有车(0:未知 1:有 2:无) + //鏄惁鏈夎溅锛�0锛氭湭鐭� 1锛氭湁 2锛氭棤锛� private int isCar; - //是否有房(0:未知 1:有 2:无) + //鏄惁鏈夋埧锛�0锛氭湭鐭� 1锛氭湁 2锛氭棤锛� private int isHouse; - //是否有商业保险(0:未知 1:有 2:无) + //鏄惁鏈夊晢涓氫繚闄╋紙0锛氭湭鐭� 1锛氭湁 2锛氭棤锛� private int isInsurance; - //是否有公积金(0:未知 1:有 2:无) + //鏄惁鏈夊叕绉噾锛�0锛氭湭鐭� 1锛氭湁 2锛氭棤锛� private int isAccumulationFund; - //是否有社保(0:未知 1:有 2:无) + //鏄惁鏈夌ぞ淇濓紙0锛氭湭鐭� 1锛氭湁 2锛氭棤锛� private int isSocialSecurity; - //是否有微粒贷(0:未知 1:有 2:无) + //鏄惁鏈夊井绮掕捶锛�0锛氭湭鐭� 1锛氭湁 2锛氭棤锛� private int isParticulateLoan; - //是否有寿险(0:未知 1:有 2:无) + //鏄惁鏈夊闄╋紙0锛氭湭鐭� 1锛氭湁 2锛氭棤锛� private int isLifeInsurance; - //是否有信用卡(0:未知 1:有 2:无) + //鏄惁鏈変俊鐢ㄥ崱锛�0锛氭湭鐭� 1锛氭湁 2锛氭棤锛� private int isCreditCard; - //收入 + //鏀跺叆 private double income; private int moneyFlag; @@ -69,10 +69,10 @@ public class LoanPushModel extends BaseModel { private List list; - //小神鱼(0:不推送 1:推送) + //灏忕楸�(0锛氫笉鎺ㄩ�� 1锛氭帹閫�) private int xsyPush; - //房金所(0:不推送 1:推送) + //鎴块噾鎵�(0锛氫笉鎺ㄩ�� 1锛氭帹閫�) private int fjsPush; private int code; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/LoanWithHoldVo.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/LoanWithHoldVo.java index 32106b7aa..ac50e511c 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/LoanWithHoldVo.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/LoanWithHoldVo.java @@ -5,99 +5,99 @@ import java.util.Date; public class LoanWithHoldVo { /** - * 代扣订单编号 + * 浠f墸璁㈠崟缂栧彿 */ private String id; /** - * 协议编号 + * 鍗忚缂栧彿 */ private String agreementId; /** - * 代扣编号id + * 浠f墸缂栧彿id */ private String withHoldId; /** - * 贷款编号 + * 璐锋缂栧彿 */ private String loanId; /** - * 身份证号 + * 韬唤璇佸彿 */ private String idNumber; /** - * 银行卡号 + * 閾惰鍗″彿 */ private String cardNumber; /** - * 开户行 + * 寮�鎴疯 */ private String bank; /** - * 账户名 + * 璐︽埛鍚� */ private String name; /** - * 手机号 + * 鎵嬫満鍙� */ private String mobile; /** - * 实际贷款金额 + * 瀹為檯璐锋閲戦 */ private double loanAmount; /** - * 服务费比率 + * 鏈嶅姟璐规瘮鐜� */ private double serviceRate; /** - * 代扣金额 + * 浠f墸閲戦 */ private double amount; /** - * 订单状态 0-status,1-代扣成功,2-代扣失败,3-处理中,4-超时失败,5-系统异常 + * 璁㈠崟鐘舵�� 0-status,1-浠f墸鎴愬姛,2-浠f墸澶辫触,3-澶勭悊涓�,4-瓒呮椂澶辫触,5-绯荤粺寮傚父 */ private int status; /** - * 订单创建时间 + * 璁㈠崟鍒涘缓鏃堕棿 */ private Date addTime; /** - * 扣款时间 + * 鎵f鏃堕棿 */ private Date finishTime; /** - * 订单创建时间(字符串) + * 璁㈠崟鍒涘缓鏃堕棿(瀛楃涓�) */ private String addTimeStr; /** - * 扣款时间(字符串) + * 鎵f鏃堕棿(瀛楃涓�) */ private String finishTimeStr; /** - * 修改时间 + * 淇敼鏃堕棿 */ private Date updateTime; /** - * 易宝支付流水号 + * 鏄撳疂鏀粯娴佹按鍙� */ private String yborderid; /** - * 易宝支付错误详情 + * 鏄撳疂鏀粯閿欒璇︽儏 */ private String errorMsg; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/LosePropertyModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/LosePropertyModel.java index d708d3514..05ed7c769 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/LosePropertyModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/LosePropertyModel.java @@ -6,7 +6,7 @@ import java.util.Date; import java.util.List; /** - * 小区漏抓Model + * 灏忓尯婕忔姄Model * @author wenyan */ public class LosePropertyModel extends BaseModel { diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/LoudongModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/LoudongModel.java index 41eb02500..c81747e2f 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/LoudongModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/LoudongModel.java @@ -35,22 +35,22 @@ public class LoudongModel extends BaseModel { private Date end; private Date creationDate; - //房号信息 + //鎴垮彿淇℃伅 private List houseLoudongList; - private String roomNum; //室号 + private String roomNum; //瀹ゅ彿 private Integer households; /** - * 小区编号 + * 灏忓尯缂栧彿 */ private String districtNo; /** - * seaweed中的小区名 + * seaweed涓殑灏忓尯鍚� */ private String nameInSeaweed; - //进入修改页面标识(update表示修改,save表示在这条数据基础上添加楼栋信息) + //杩涘叆淇敼椤甸潰鏍囪瘑锛坲pdate琛ㄧず淇敼锛宻ave琛ㄧず鍦ㄨ繖鏉℃暟鎹熀纭�涓婃坊鍔犳ゼ鏍嬩俊鎭級 private String op; public void setOp(String op) { diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/MatchModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/MatchModel.java index 93522689e..5153af94c 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/MatchModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/MatchModel.java @@ -37,7 +37,7 @@ public class MatchModel extends BaseModel{ private String actionCode; /** - * 保存参数 + * 淇濆瓨鍙傛暟 */ private String addedCity; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/MechanismModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/MechanismModel.java index c75a6bbed..93cc57ffe 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/MechanismModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/MechanismModel.java @@ -19,21 +19,21 @@ public class MechanismModel extends BaseModel{ private String id; /** - * 机构名称 + * 鏈烘瀯鍚嶇О */ private String name; /** - * 创建时间 + * 鍒涘缓鏃堕棿 */ private Date createDate; /** - * 机构简介 + * 鏈烘瀯绠�浠� */ private String introduction; /** - * 修改时间 + * 淇敼鏃堕棿 */ private Date modifyDate; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/MetroModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/MetroModel.java index 3dc7c7570..6eae55cc7 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/MetroModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/MetroModel.java @@ -8,21 +8,21 @@ import com.fangjia.dal.mongo.model.MetroLine; public class MetroModel extends BaseModel { private static final long serialVersionUID = 5881528137494477410L; - private List metroLineList; // 城市下的所有地铁线路 - private List stationList; // 城市某线路下的所有站点 + private List metroLineList; // 鍩庡競涓嬬殑鎵�鏈夊湴閾佺嚎璺� + private List stationList; // 鍩庡競鏌愮嚎璺笅鐨勬墍鏈夌珯鐐� private String cityId; - private String display; // 城市名称 + private String display; // 鍩庡競鍚嶇О - private String lineId; // 线路id - private String lineName; // 线路名称 + private String lineId; // 绾胯矾id + private String lineName; // 绾胯矾鍚嶇О - private String stationId; // 站点id - private String stationName; // 站点名称 + private String stationId; // 绔欑偣id + private String stationName; // 绔欑偣鍚嶇О private Long lng; private Long lat; - private Integer sequence; // 序号(线路或站点) + private Integer sequence; // 搴忓彿锛堢嚎璺垨绔欑偣锛� private String msg; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/Models.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/Models.java index 8ca15532f..10c9c3b62 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/Models.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/Models.java @@ -3,17 +3,17 @@ package com.fangjia.bkoff.model; public final class Models { /** - * 404错误面页的model + * 404閿欒闈㈤〉鐨刴odel */ public static final BaseModel NOT_FOUNT = createModel(404, "/error"); /** - * 一般错误面页的model + * 涓�鑸敊璇潰椤电殑model */ public static final BaseModel ERROR = createModel(500, "/error"); /** - * 500错误面页的model + * 500閿欒闈㈤〉鐨刴odel */ public static final BaseModel FORBIDDEN = createModel(400, "/forbidden"); diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/MortgageInfoModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/MortgageInfoModel.java index 5d63d4447..8b660427e 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/MortgageInfoModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/MortgageInfoModel.java @@ -13,8 +13,8 @@ public class MortgageInfoModel extends BaseModel { private String id; private String cityDisplay; - private String originalAddress;//原始 名称 - private String origin;//来源 + private String originalAddress;//鍘熷 鍚嶇О + private String origin;//鏉ユ簮 private MortgageInfo mortgageInfo; private List mortgageInfos; private MultipartFile fileExl; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/NewsModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/NewsModel.java index 81c01b4cd..85868039b 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/NewsModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/NewsModel.java @@ -11,15 +11,15 @@ import com.fangjia.service.bo.Title; /** * - * 新闻资讯Model + * 鏂伴椈璧勮Model * */ public class NewsModel extends BaseModel { private static final long serialVersionUID = 3276101295184183686L; - private NewsInfo news;// 新闻 - private List newsList;// 新闻 + private NewsInfo news;// 鏂伴椈 + private List newsList;// 鏂伴椈 private String id; private String name; private String source; @@ -34,11 +34,11 @@ public class NewsModel extends BaseModel { private String type; - private String ids;// 新闻ID拼接字符串 + private String ids;// 鏂伴椈ID鎷兼帴瀛楃涓� private String currentCity; - private List newsSearchResults;// 新闻列表 + private List newsSearchResults;// 鏂伴椈鍒楄〃 private List newsBoList; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/NoLineDistrictModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/NoLineDistrictModel.java index b70541f5b..d8e5b0d0a 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/NoLineDistrictModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/NoLineDistrictModel.java @@ -9,7 +9,7 @@ public class NoLineDistrictModel extends BaseModel{ private static final long serialVersionUID = 1L; private String id; - private String cityDisplay; // 选择的城市名 + private String cityDisplay; // 閫夋嫨鐨勫煄甯傚悕 private String districtName; private int status; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/OpenUriLogModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/OpenUriLogModel.java index fad20b5f0..8b7874313 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/OpenUriLogModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/OpenUriLogModel.java @@ -16,8 +16,8 @@ public class OpenUriLogModel extends BaseModel { private static final long serialVersionUID = 2669730379316862920L; private String id; - private String beginDate;// 查询开始日期 - private String endDate;// 查询结束日期 + private String beginDate;// 鏌ヨ寮�濮嬫棩鏈� + private String endDate;// 鏌ヨ缁撴潫鏃ユ湡 private String userId; private String userName; private List openUriLogs; @@ -25,7 +25,7 @@ public class OpenUriLogModel extends BaseModel { private OpenUriLog openUriLog; private String parameterMaps ; private Integer code; - private Integer online;//线上0 线下1 + private Integer online;//绾夸笂0 绾夸笅1 public Integer getOnline() { return online; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/PropertyRegisterInfoModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/PropertyRegisterInfoModel.java index 9a5ba4d06..9fb7e7ab9 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/PropertyRegisterInfoModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/PropertyRegisterInfoModel.java @@ -23,15 +23,15 @@ public class PropertyRegisterInfoModel extends BaseModel { private String propertyAddress; private String propertyNumber; /** - * 任务处理状态 - * 1:待处理 - * 2:处理中 - * 3:处理失败 - * 4:成功处理 + * 浠诲姟澶勭悊鐘舵�� + * 1:寰呭鐞� + * 2:澶勭悊涓� + * 3:澶勭悊澶辫触 + * 4锛氭垚鍔熷鐞� */ private int status; /** - * 任务处理描述 + * 浠诲姟澶勭悊鎻忚堪 */ private String msg; @@ -40,47 +40,47 @@ public class PropertyRegisterInfoModel extends BaseModel { private String unitNumber; private Double size; private Double undergroundSize; - private Integer maxFloor;//总楼层 + private Integer maxFloor;//鎬绘ゼ灞� private Integer floor; - private String propertyType;//房屋类型 + private String propertyType;//鎴垮眿绫诲瀷 private String buildingStructure; private String finishBuildTime; - private String landNo;//地号 + private String landNo;//鍦板彿 private Date beginUseDate; private Date endUseDate; - private String rightFrom;//使用权来源 + private String rightFrom;//浣跨敤鏉冩潵婧� private String permittedPurpose; private Double totalUsedSize; private Double totalSize; - private String obligee;//权利人 - private String coparcener;//共有人以及情况 + private String obligee;//鏉冨埄浜� + private String coparcener;//鍏辨湁浜轰互鍙婃儏鍐� private String address; private String acceptedDate; private String checkDate; private String propertyRemark; /** - * 其他信息 - * rightType:权利种类 - * loadAmount:债权金额 - * address:房屋坐落 - * certificateNo:权证或证明号 - * setDate:设定日期 - * checkDate:核准日期 - * endDate: 结束日期 - * acceptDate:受理日期 - * obligee :他项权利人 + * 鍏朵粬淇℃伅 + * rightType:鏉冨埄绉嶇被 + * loadAmount:鍊烘潈閲戦 + * address:鎴垮眿鍧愯惤 + * certificateNo:鏉冭瘉鎴栬瘉鏄庡彿 + * setDate:璁惧畾鏃ユ湡 + * checkDate:鏍稿噯鏃ユ湡 + * endDate: 缁撴潫鏃ユ湡 + * acceptDate:鍙楃悊鏃ユ湡 + * obligee :浠栭」鏉冨埄浜� */ private List othersInfo; private String receiptNo; - private String registrationSmallCategory;//登记小类 + private String registrationSmallCategory;//鐧昏灏忕被 private String proposer; - private String handAddress;//坐落 + private String handAddress;//鍧愯惤 private String userName; private Date createDate; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/RegTimeAndEvaTimeModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/RegTimeAndEvaTimeModel.java index 57d6c46bf..eef8687e8 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/RegTimeAndEvaTimeModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/RegTimeAndEvaTimeModel.java @@ -11,8 +11,8 @@ public class RegTimeAndEvaTimeModel extends BaseModel { private static final long serialVersionUID = 2669730379316862555L; private String id; - private String beginDate;// 查询开始日期 - private String endDate;// 查询结束日期 + private String beginDate;// 鏌ヨ寮�濮嬫棩鏈� + private String endDate;// 鏌ヨ缁撴潫鏃ユ湡 private List regTimeAndEvaTimes; public String getId() { diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/RegionBlockModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/RegionBlockModel.java index 126d27729..3dd0278d3 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/RegionBlockModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/RegionBlockModel.java @@ -9,7 +9,7 @@ import com.fangjia.service.bo.RegionBlockBo; public class RegionBlockModel extends BaseModel { private static final long serialVersionUID = 2242802365433169906L; private String id; - private String display; // 选择的城市名 + private String display; // 閫夋嫨鐨勫煄甯傚悕 private String name; private String orgName; private Double lng; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/RegionHouseModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/RegionHouseModel.java index 43dd7a75d..7c90bc0c5 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/RegionHouseModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/RegionHouseModel.java @@ -12,7 +12,7 @@ public class RegionHouseModel extends BaseModel { private static final long serialVersionUID = 1L; private String id; - private String cityDisplay; // 选择的城市名 + private String cityDisplay; // 閫夋嫨鐨勫煄甯傚悕 private double rate; private float standardPeopleCount; private int districtAvgPopulation; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/ResourceModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/ResourceModel.java index 3818f5a5d..4faa00fae 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/ResourceModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/ResourceModel.java @@ -20,6 +20,6 @@ public class ResourceModel extends EntityModel implements Sort } public String getEntityName() { - return "资源"; + return "璧勬簮"; } } diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/RoleModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/RoleModel.java index 10a9296ba..5802d742b 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/RoleModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/RoleModel.java @@ -26,7 +26,7 @@ public class RoleModel extends EntityModel implements SortedQueryB } public String getEntityName() { - return "角色"; + return "瑙掕壊"; } public List getResourceList() { diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/ServerAreaModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/ServerAreaModel.java index 829e486a0..6235144de 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/ServerAreaModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/ServerAreaModel.java @@ -46,7 +46,7 @@ public class ServerAreaModel extends BaseModel { private Map> serverAreasMap; - private List cityFirstLetters;// 城市拼音首字母 + private List cityFirstLetters;// 鍩庡競鎷奸煶棣栧瓧姣� private String msg; @@ -64,9 +64,9 @@ public class ServerAreaModel extends BaseModel { private boolean existCityIco; - private List msgList; // 城市上线校验信息 + private List msgList; // 鍩庡競涓婄嚎鏍¢獙淇℃伅 - private boolean passCheck; // 是否通过城市上线校验 + private boolean passCheck; // 鏄惁閫氳繃鍩庡競涓婄嚎鏍¢獙 private Integer falshVersion; @@ -82,9 +82,9 @@ public class ServerAreaModel extends BaseModel { private List relatedCity; - private Map> cityInProvinceMap; //城市按省份总览列表 + private Map> cityInProvinceMap; //鍩庡競鎸夌渷浠芥�昏鍒楄〃 - private List provinceList; //省份列表 + private List provinceList; //鐪佷唤鍒楄〃 private Map countsMap; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/SpiderModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/SpiderModel.java index 08d273dbc..de5a43fb9 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/SpiderModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/SpiderModel.java @@ -56,7 +56,7 @@ public class SpiderModel extends EntityModel implements SortedQu @Override public String getEntityName() { - return "蜘蛛"; + return "铚樿洓"; } public String getIp() { diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/ToolClickStatModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/ToolClickStatModel.java index ce154e014..3276619e5 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/ToolClickStatModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/ToolClickStatModel.java @@ -9,8 +9,8 @@ import com.fangjia.service.open.ToolClickDetailLogBo; public class ToolClickStatModel extends BaseModel { private static final long serialVersionUID = -8437728335582726283L; - private String begDate;// 查询开始日期 - private String endDate;// 查询结束日期 + private String begDate;// 鏌ヨ寮�濮嬫棩鏈� + private String endDate;// 鏌ヨ缁撴潫鏃ユ湡 private String appKey; private String displayName; private String siteName; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/TownshipModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/TownshipModel.java index 7de4c3b55..a6685f0f8 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/TownshipModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/TownshipModel.java @@ -52,12 +52,12 @@ public class TownshipModel extends BaseModel { @JSONField(name = "street_pinyin") private String streetPinyin; - //民政部区域和统计局区域是否相同,1为相同,0为不同,为了解决2条的问题 + //姘戞斂閮ㄥ尯鍩熷拰缁熻灞�鍖哄煙鏄惁鐩稿悓锛�1涓虹浉鍚岋紝0涓轰笉鍚岋紝涓轰簡瑙e喅2鏉$殑闂 @JSONField(name = "district_diff") private Integer districtDiff; - //乡镇街道是否输出 0:不输出 1:输出 + //涔¢晣琛楅亾鏄惁杈撳嚭 0锛氫笉杈撳嚭 1锛氳緭鍑� @JSONField(name = "street_output") private Integer streetOutput; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/VillageIdentifyModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/VillageIdentifyModel.java index 40c172b33..0673f0410 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/VillageIdentifyModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/VillageIdentifyModel.java @@ -24,15 +24,15 @@ public class VillageIdentifyModel extends BaseModel { private String committeeCode; private String typeCode; private String typeName; - private String verifyFlag;//涉农标识 - private String addrVerify;//地址是否有效信息 + private String verifyFlag;//娑夊啘鏍囪瘑 + private String addrVerify;//鍦板潃鏄惁鏈夋晥淇℃伅 - private String countyLevelCity;//是否为县级市 - private String administrativeTowns;//是否市辖建制镇 - private String countyGov;//是否为县政府 - private String devDistrict;//是否为开发区 - private String devDistrictName;//开发区 - private String devLevel;//开发区等级 + private String countyLevelCity;//鏄惁涓哄幙绾у競 + private String administrativeTowns;//鏄惁甯傝緰寤哄埗闀� + private String countyGov;//鏄惁涓哄幙鏀垮簻 + private String devDistrict;//鏄惁涓哄紑鍙戝尯 + private String devDistrictName;//寮�鍙戝尯 + private String devLevel;//寮�鍙戝尯绛夌骇 private Double lat; private Double lng; @@ -40,15 +40,15 @@ public class VillageIdentifyModel extends BaseModel { private String addrArea; - //测试时使用 + //娴嬭瘯鏃朵娇鐢� private String splitCommittee; private String splitStreet; private String poiName; private String splitStreetNum; private String dev; - private String communitySource;//居委来源 - private String matchPoiName;//匹配poi的名称 - private String regionInfo;//围栏区域信息 + private String communitySource;//灞呭鏉ユ簮 + private String matchPoiName;//鍖归厤poi鐨勫悕绉� + private String regionInfo;//鍥存爮鍖哄煙淇℃伅 private String tjjDistrictName; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/XcxEvaluationModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/XcxEvaluationModel.java index 9bb69a915..83bd4c58e 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/XcxEvaluationModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/XcxEvaluationModel.java @@ -7,7 +7,7 @@ import com.fangjia.service.bo.XcxEvaluationBo; /** - * 小程序故事页面 + * 灏忕▼搴忔晠浜嬮〉闈� */ public class XcxEvaluationModel extends BaseModel { diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/XcxLoanModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/XcxLoanModel.java index 0e36e1223..d8352bcc3 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/XcxLoanModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/XcxLoanModel.java @@ -8,7 +8,7 @@ import com.fangjia.service.bo.XcxLoanBo; /** - * 小程序故事页面 + * 灏忕▼搴忔晠浜嬮〉闈� */ public class XcxLoanModel extends BaseModel { diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/XcxStoryModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/XcxStoryModel.java index b39f30de2..1c7295547 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/XcxStoryModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/XcxStoryModel.java @@ -8,7 +8,7 @@ import com.fangjia.service.bo.StoryBo; /** - * 小程序故事页面 + * 灏忕▼搴忔晠浜嬮〉闈� */ public class XcxStoryModel extends BaseModel { diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/XcxUsersModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/XcxUsersModel.java index bca202a5c..b77f03613 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/XcxUsersModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/XcxUsersModel.java @@ -7,7 +7,7 @@ import com.fangjia.dal.mongo.model.bkoff.XcxUserInfo; /** - * 房评卡用户 + * 鎴胯瘎鍗$敤鎴� * */ public class XcxUsersModel extends BaseModel { diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/YugudanModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/YugudanModel.java index 10db294b2..c8d25bde2 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/YugudanModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/YugudanModel.java @@ -77,15 +77,15 @@ public class YugudanModel extends BaseModel{ private Integer houseProperty;; - private Integer insidepos;// 小区位置 - private Integer insidepos1;// 小区位置 - private Integer insidepos2;// 小区位置 - private Integer insidepos3;// 小区位置 - private Integer sight;// 景观情况 - private Integer sight1;// 景观情况 - private Integer lightingVentilation;// 采光通风 - private Integer lightingVentilation1;// 采光通风 - private Integer sideset;// 边套装置 + private Integer insidepos;// 灏忓尯浣嶇疆 + private Integer insidepos1;// 灏忓尯浣嶇疆 + private Integer insidepos2;// 灏忓尯浣嶇疆 + private Integer insidepos3;// 灏忓尯浣嶇疆 + private Integer sight;// 鏅鎯呭喌 + private Integer sight1;// 鏅鎯呭喌 + private Integer lightingVentilation;// 閲囧厜閫氶 + private Integer lightingVentilation1;// 閲囧厜閫氶 + private Integer sideset;// 杈瑰瑁呯疆 private Integer noise; private Integer noise1; private Integer worryFacility; @@ -108,29 +108,29 @@ public class YugudanModel extends BaseModel{ private Integer hall; private Integer toilet; - private Integer facade; //门面开间 - private Integer facade1; //门面开间 - private Integer traffice;// 公共交通 - private Integer traffice1;// 公共交通 - private Integer shape; // 形状 - private Integer obstacle; // 障碍物 - private Integer obstacle1; // 障碍物 - private Integer obstacle2; // 障碍物 - private Integer obstacle3; // 障碍物 - private Integer industry; //经营性质 - private Integer industry1; //经营性质 - private Integer industry2; //经营性质 - private Integer industry3; //经营性质 - private Integer supportDevice; // 配套设备 - private Integer supportDevice1; // 配套设备 - private Integer supportDevice2; // 配套设备 - private Integer supportDevice3; // 配套设备 - private Integer leftPosition; //距离扶梯位置 - private Integer leftPosition1; //距离扶梯位置 - private Integer shopType;//商铺类型 - private Integer shopUnique; //商铺唯一性 - private Integer location; //商铺位置 - private Integer location1; //商铺位置 + private Integer facade; //闂ㄩ潰寮�闂� + private Integer facade1; //闂ㄩ潰寮�闂� + private Integer traffice;// 鍏叡浜ら�� + private Integer traffice1;// 鍏叡浜ら�� + private Integer shape; // 褰㈢姸 + private Integer obstacle; // 闅滅鐗� + private Integer obstacle1; // 闅滅鐗� + private Integer obstacle2; // 闅滅鐗� + private Integer obstacle3; // 闅滅鐗� + private Integer industry; //缁忚惀鎬ц川 + private Integer industry1; //缁忚惀鎬ц川 + private Integer industry2; //缁忚惀鎬ц川 + private Integer industry3; //缁忚惀鎬ц川 + private Integer supportDevice; // 閰嶅璁惧 + private Integer supportDevice1; // 閰嶅璁惧 + private Integer supportDevice2; // 閰嶅璁惧 + private Integer supportDevice3; // 閰嶅璁惧 + private Integer leftPosition; //璺濈鎵舵浣嶇疆 + private Integer leftPosition1; //璺濈鎵舵浣嶇疆 + private Integer shopType;//鍟嗛摵绫诲瀷 + private Integer shopUnique; //鍟嗛摵鍞竴鎬� + private Integer location; //鍟嗛摵浣嶇疆 + private Integer location1; //鍟嗛摵浣嶇疆 private List outPics; private List floorPlanPics; @@ -149,7 +149,7 @@ public class YugudanModel extends BaseModel{ private EvaluationAudit evaluationAudit; private String reportNum; - private Integer askPriceId;//人工询价id + private Integer askPriceId;//浜哄伐璇环id private String certificateAddress; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/AddressLatlng.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/AddressLatlng.java index 728af09d0..cc0ed2256 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/AddressLatlng.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/AddressLatlng.java @@ -34,7 +34,7 @@ public class AddressLatlng { public static void main(String[] args){ - AddressLatlng.getLngLatByAddress("上海", "金海路站"); + AddressLatlng.getLngLatByAddress("涓婃捣", "閲戞捣璺珯"); } public static Map getLngLatByAddress(String city, String address){ diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/AddressParser.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/AddressParser.java index 17c41afc0..900890c62 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/AddressParser.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/AddressParser.java @@ -34,7 +34,7 @@ public class AddressParser { public static void main(String[] args){ - AddressParser.getLngLatByAddress("三亚",""); + AddressParser.getLngLatByAddress("涓変簹",""); } public static Map getLngLatByAddress(String city, String address){ diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/BaseAvgImportServlet.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/BaseAvgImportServlet.java index 22c68e4cb..83884897c 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/BaseAvgImportServlet.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/BaseAvgImportServlet.java @@ -50,7 +50,7 @@ import java.util.*; public class BaseAvgImportServlet extends HttpServlet { - private static final String[] columns = { "城市", "区域", "小区名", "价格", "是否加入指导价", "调查时间", "调查人" , "来源", "来源小区名"}; + private static final String[] columns = { "鍩庡競", "鍖哄煙", "灏忓尯鍚�", "浠锋牸", "鏄惁鍔犲叆鎸囧浠�", "璋冩煡鏃堕棿", "璋冩煡浜�" , "鏉ユ簮", "鏉ユ簮灏忓尯鍚�"}; private AvgBaseDao avgBaseDao; private GuidingPriceService guidingPriceService; @@ -78,29 +78,29 @@ public class BaseAvgImportServlet extends HttpServlet { @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - request.setCharacterEncoding("UTF-8"); // 转码 + request.setCharacterEncoding("UTF-8"); // 杞爜 response.setContentType("text/html;charset=UTF-8"); - // 构造一个文件上传处理对象 + // 鏋勯�犱竴涓枃浠朵笂浼犲鐞嗗璞� FileItemFactory factory = new DiskFileItemFactory(); ServletFileUpload upload = new ServletFileUpload(factory); HttpSession session = request.getSession(); String realName = session.getAttribute("realName").toString(); Iterator items; try { - // 解析表单中提交的所有文件内容 + // 瑙f瀽琛ㄥ崟涓彁浜ょ殑鎵�鏈夋枃浠跺唴瀹� items = upload.parseRequest(request).iterator(); while (items.hasNext()) { FileItem item = (FileItem) items.next(); if (!item.isFormField()) { - // 取出上传文件的文件名称 + // 鍙栧嚭涓婁紶鏂囦欢鐨勬枃浠跺悕绉� String name = item.getName(); - // 取得上传文件以后的存储路径 + // 鍙栧緱涓婁紶鏂囦欢浠ュ悗鐨勫瓨鍌ㄨ矾寰� Workbook workbook = getWorkbookFromStream(name, item); workbook.setForceFormulaRecalculation(true); Map infoMap = new HashMap(); if (workbook == null) { - infoMap.put("error", "上传类型不匹配!"); + infoMap.put("error", "涓婁紶绫诲瀷涓嶅尮閰嶏紒"); String json = JSONObject.fromObject(infoMap).toString(); response.getWriter().write(json.toString()); response.getWriter().flush(); @@ -121,7 +121,7 @@ public class BaseAvgImportServlet extends HttpServlet { for (List errors : ret) { List fields = (List) errors.get(1); - info = info + "第" + errors.get(0) + "行," + StringUtils.join(fields, " ") + "有误\\n"; + info = info + "绗�" + errors.get(0) + "琛岋紝" + StringUtils.join(fields, " ") + "鏈夎\\n"; } response.getWriter().write(info); @@ -176,18 +176,18 @@ public class BaseAvgImportServlet extends HttpServlet { private Map checkUploadData(Sheet sheet, String name, long version, Map infoMap, String realName) { int totalNum = sheet.getLastRowNum(); - System.out.println("上传文件共:" + totalNum + "个"); + System.out.println("涓婁紶鏂囦欢鍏�:" + totalNum + "涓�"); if (totalNum > 20000) { totalNum = 20000; } - Integer totalLine = 0;// 总行数 - Integer totalIsNull = 0;// 为空行的总行数 - Integer totalErrorLine = 0;// 总错误行 - String message = "上传成功!"; + Integer totalLine = 0;// 鎬昏鏁� + Integer totalIsNull = 0;// 涓虹┖琛岀殑鎬昏鏁� + Integer totalErrorLine = 0;// 鎬婚敊璇 + String message = "涓婁紶鎴愬姛!"; - // 获取总列数 - int coloumNum = sheet.getRow(0).getPhysicalNumberOfCells();// 获得总列数 + // 鑾峰彇鎬诲垪鏁� + int coloumNum = sheet.getRow(0).getPhysicalNumberOfCells();// 鑾峰緱鎬诲垪鏁� List> ret = new ArrayList>(); List> datas = new ArrayList>(); for (int rowj = 1; rowj <= totalNum; rowj++) { @@ -200,16 +200,16 @@ public class BaseAvgImportServlet extends HttpServlet { Map dataMap = new HashMap(); List errorList = new ArrayList(); - // 字段验证 + // 瀛楁楠岃瘉 for (int i = 0; i < coloumNum; i++) { Object val = getCellVal(row.getCell(i)); if (null != val && isBlankRows) { isBlankRows = false; } - // 空值检查 + // 绌哄�兼鏌� if (null == val) { - // 手机号和渠道名称必填 + // 鎵嬫満鍙峰拰娓犻亾鍚嶇О蹇呭~ if (i >= 0 && i <= 3) { totalIsNull++; } @@ -223,7 +223,7 @@ public class BaseAvgImportServlet extends HttpServlet { dataMap.put(columns[i], null); } } else { - // 数字类型检查 + // 鏁板瓧绫诲瀷妫�鏌� if (i == 4 || i == 3) { if (!DataUtil.getNumberFromString(val.toString())) { errorFlag = true; @@ -232,7 +232,7 @@ public class BaseAvgImportServlet extends HttpServlet { dataMap.put(columns[i], val.toString()); } } else if (i == 5) { - // 日期类型检查 + // 鏃ユ湡绫诲瀷妫�鏌� Date date = DateUtil.parseDate(val.toString(), "yyyy-MM-dd"); if (null == date) { errorFlag = true; @@ -246,7 +246,7 @@ public class BaseAvgImportServlet extends HttpServlet { } } - if (!isBlankRows) {// 不是空白行 + if (!isBlankRows) {// 涓嶆槸绌虹櫧琛� totalLine++; if (errorFlag) { totalErrorLine++; @@ -258,21 +258,21 @@ public class BaseAvgImportServlet extends HttpServlet { } } - // 保存上传文件的总体情况 + // 淇濆瓨涓婁紶鏂囦欢鐨勬�讳綋鎯呭喌 if (totalErrorLine > 0) { - infoMap.put("error", "上传失败!"); + infoMap.put("error", "涓婁紶澶辫触!"); infoMap.put("errorMsg", ret); } else if (totalLine == 0) { - ret.add(Arrays.asList("0", Arrays.asList("格式有误或无数据"))); + ret.add(Arrays.asList("0", Arrays.asList("鏍煎紡鏈夎鎴栨棤鏁版嵁"))); infoMap.put("errorMsg", ret); - infoMap.put("error", "上传失败!"); + infoMap.put("error", "涓婁紶澶辫触!"); } else if (totalIsNull > 0) { - ret.add(Arrays.asList("0", Arrays.asList("城市、区域、小区名、价格 不能为空"))); + ret.add(Arrays.asList("0", Arrays.asList("鍩庡競銆佸尯鍩熴�佸皬鍖哄悕銆佷环鏍� 涓嶈兘涓虹┖"))); infoMap.put("errorMsg", ret); - infoMap.put("error", "上传失败!"); + infoMap.put("error", "涓婁紶澶辫触!"); } else { infoMap.put("success", message); - // 验证通过后,保存信息 + // 楠岃瘉閫氳繃鍚�,淇濆瓨淇℃伅 saveSuccessToDB(datas, version); } @@ -362,13 +362,13 @@ public class BaseAvgImportServlet extends HttpServlet { */ while (ite.hasNext()) { String key = (String) ite.next(); - if (key.equals("城市") && map.get(key) != null) { + if (key.equals("鍩庡競") && map.get(key) != null) { avgBase.setCity((map.get(key))); - } else if (key.equals("区域") && map.get(key) != null) { + } else if (key.equals("鍖哄煙") && map.get(key) != null) { avgBase.setRegion(map.get(key)); - } else if (key.equals("小区名") && map.get(key) != null) { + } else if (key.equals("灏忓尯鍚�") && map.get(key) != null) { avgBase.setDistrictName(map.get(key)); - } else if (key.equals("价格") && map.get(key) != null) { + } else if (key.equals("浠锋牸") && map.get(key) != null) { String val = formatNumer(map.get(key)); if (StringUtils.isNotBlank(val)) { double dd = Double.parseDouble(val); @@ -376,20 +376,20 @@ public class BaseAvgImportServlet extends HttpServlet { avgBase.setPrice(x); } - } else if (key.equals("是否加入指导价") && map.get(key) != null) { + } else if (key.equals("鏄惁鍔犲叆鎸囧浠�") && map.get(key) != null) { String val = formatNumer(map.get(key)); if (StringUtils.isNotBlank(val)) { int x = Integer.parseInt(val); avgBase.setIsGuidancePrice(x); } - } else if (key.equals("调查时间")) { + } else if (key.equals("璋冩煡鏃堕棿")) { Date applyDate = (DateUtil.parseDate(map.get(key), "yyyy-MM-dd")); avgBase.setCreationDate(applyDate == null ? curDate : applyDate); - } else if (key.equals("调查人") && map.get(key) != null) { + } else if (key.equals("璋冩煡浜�") && map.get(key) != null) { avgBase.setUserName(map.get(key)); - } else if (key.equals("来源") && map.get(key) !=null){ + } else if (key.equals("鏉ユ簮") && map.get(key) !=null){ avgBase.setSource(map.get(key).replaceAll("\\s", "")); - } else if (key.equals("来源小区名") && map.get(key) != null){ + } else if (key.equals("鏉ユ簮灏忓尯鍚�") && map.get(key) != null){ avgBase.setSourceCommName(map.get(key).replaceAll("\\s", "")); } avgBase.setRegion(RegionData.formatRegion(avgBase.getCity(), avgBase.getRegion())); @@ -455,7 +455,7 @@ public class BaseAvgImportServlet extends HttpServlet { price.setGuidingPerson(avgBase.getUserName()); price.setGuidingDate(avgBase.getCreationDate()); price.setGuidingValue(avgBase.getPrice()); - price.setEstateType(dis.getEstateType2().contains("别墅") ? "别墅" : "普通住宅"); + price.setEstateType(dis.getEstateType2().contains("鍒") ? "鍒" : "鏅�氫綇瀹�"); price.setCat("district"); price.setModifyDate(new Date()); guidingPriceService.save(price); @@ -478,7 +478,7 @@ public class BaseAvgImportServlet extends HttpServlet { e.printStackTrace(); } }else{ - System.out.println("小区不存在"+ avgBase.getDistrictName()); + System.out.println("灏忓尯涓嶅瓨鍦�"+ avgBase.getDistrictName()); } } } diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/CityDirective.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/CityDirective.java index de9553aca..dcf409b3f 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/CityDirective.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/CityDirective.java @@ -34,34 +34,34 @@ public class CityDirective implements TemplateDirectiveModel { public static Map cityRegionMap=new HashMap() {{ -// put("临夏","临夏州") ; -// put("甘南","甘南州") ; -// put("黔南","黔南州") ; -// put("黔东南","黔东南州") ; -// put("黔西南","黔西南州") ; -// put("恩施","恩施州") ; -// put("湘西","湘西州") ; -// put("红河","红河州") ; -// put("楚雄","楚雄州") ; -// put("大理","大理州") ; -// put("山南","山南地区") ; -// put("那曲","那曲地区") ; -// put("昌都","昌都地区") ; -// put("日喀则","日喀则地区") ; -// put("阿里","阿里地区") ; -// put("林芝","林芝地区") ; -// put("大兴安岭","大兴安岭地区") ; -// put("吐鲁番","吐鲁番地区") ; -// put("哈密","哈密地区") ; -// put("昌吉","昌吉州") ; -// put("伊犁","伊犁州") ; -// put("博尔塔拉","博尔塔拉州") ; -// put("巴音郭楞","巴音郭楞州") ; -// put("克孜勒苏","克孜勒苏柯尔克孜州") ; -// put("阿克苏","阿克苏地区") ; -// put("喀什","喀什地区") ; -// put("和田","和田地区") ; -// put("阿勒泰","阿勒泰地区"); +// put("涓村","涓村宸�") ; +// put("鐢樺崡","鐢樺崡宸�") ; +// put("榛斿崡","榛斿崡宸�") ; +// put("榛斾笢鍗�","榛斾笢鍗楀窞") ; +// put("榛旇タ鍗�","榛旇タ鍗楀窞") ; +// put("鎭╂柦","鎭╂柦宸�") ; +// put("婀樿タ","婀樿タ宸�") ; +// put("绾㈡渤","绾㈡渤宸�") ; +// put("妤氶泟","妤氶泟宸�") ; +// put("澶х悊","澶х悊宸�") ; +// put("灞卞崡","灞卞崡鍦板尯") ; +// put("閭f洸","閭f洸鍦板尯") ; +// put("鏄岄兘","鏄岄兘鍦板尯") ; +// put("鏃ュ杸鍒�","鏃ュ杸鍒欏湴鍖�") ; +// put("闃块噷","闃块噷鍦板尯") ; +// put("鏋楄姖","鏋楄姖鍦板尯") ; +// put("澶у叴瀹夊箔","澶у叴瀹夊箔鍦板尯") ; +// put("鍚愰瞾鐣�","鍚愰瞾鐣湴鍖�") ; +// put("鍝堝瘑","鍝堝瘑鍦板尯") ; +// put("鏄屽悏","鏄屽悏宸�") ; +// put("浼婄妬","浼婄妬宸�") ; +// put("鍗氬皵濉旀媺","鍗氬皵濉旀媺宸�") ; +// put("宸撮煶閮","宸撮煶閮宸�") ; +// put("鍏嬪瓬鍕掕嫃","鍏嬪瓬鍕掕嫃鏌皵鍏嬪瓬宸�") ; +// put("闃垮厠鑻�","闃垮厠鑻忓湴鍖�") ; +// put("鍠�浠�","鍠�浠�鍦板尯") ; +// put("鍜岀敯","鍜岀敯鍦板尯") ; +// put("闃垮嫆娉�","闃垮嫆娉板湴鍖�"); }}; @SuppressWarnings("rawtypes") @@ -71,7 +71,7 @@ public class CityDirective implements TemplateDirectiveModel { ActionContext actionContext = ActionContext.getContext(); String callback = MapUtils.getString(params, "callback", ""); String callbackField = MapUtils.getString(params, "callbackField", "display"); - String defaultValue = MapUtils.getString(params, "defaultValue", "选择城市"); + String defaultValue = MapUtils.getString(params, "defaultValue", "閫夋嫨鍩庡競"); String showCountry = MapUtils.getString(params, "showCountry", "0"); String path = MapUtils.getString(params, "path", "/ftl/city.ftl"); @@ -81,7 +81,7 @@ public class CityDirective implements TemplateDirectiveModel { String name = MapUtils.getString(params, "name", ""); Map templateContext = new HashMap(); templateContext.put("callback", callback); - templateContext.put("defaultValue", "all".equals(defaultValue) ? "全部" : defaultValue); + templateContext.put("defaultValue", "all".equals(defaultValue) ? "鍏ㄩ儴" : defaultValue); templateContext.put("showClear", showClear); templateContext.put("showAll", showAll); templateContext.put("id", id); @@ -127,7 +127,7 @@ public class CityDirective implements TemplateDirectiveModel { Map cityDisplayMap=new HashMap(); - cityDisplayMap.put("请选择", "请选择"); + cityDisplayMap.put("璇烽�夋嫨", "璇烽�夋嫨"); for(ServerArea server:allCitys){ if(StringUtils.isNotBlank(server.getDisplay()) && cityRegionMap.containsKey(server.getDisplay())){ cityDisplayMap.put(server.getDisplay(), cityRegionMap.get(server.getDisplay())); @@ -146,7 +146,7 @@ public class CityDirective implements TemplateDirectiveModel { } /** - * 根据城市名获取首字母 + * 鏍规嵁鍩庡競鍚嶈幏鍙栭瀛楁瘝 * * @param display * @param allCitys @@ -166,7 +166,7 @@ public class CityDirective implements TemplateDirectiveModel { } /** - * 根据城市全拼的首字母,拆分城市 + * 鏍规嵁鍩庡競鍏ㄦ嫾鐨勯瀛楁瘝锛屾媶鍒嗗煄甯� * * @param allCitys * @return @@ -204,7 +204,7 @@ public class CityDirective implements TemplateDirectiveModel { } /** - * 城市排序 + * 鍩庡競鎺掑簭 * * @param serverAreaBoList */ @@ -227,7 +227,7 @@ public class CityDirective implements TemplateDirectiveModel { } /** - * 根据所属省份,拆分城市 + * 鏍规嵁鎵�灞炵渷浠斤紝鎷嗗垎鍩庡競 * * @param allCitys * @return @@ -243,8 +243,8 @@ public class CityDirective implements TemplateDirectiveModel { String province = ""; if(city.getProvince() == null || city.getProvince() == ""){ province = null; - }else if(city.getProvince().equals("上海") || city.getProvince().equals("北京") || city.getProvince().equals("天津") || city.getProvince().equals("重庆")) { - province = "直辖市"; + }else if(city.getProvince().equals("涓婃捣") || city.getProvince().equals("鍖椾含") || city.getProvince().equals("澶╂触") || city.getProvince().equals("閲嶅簡")) { + province = "鐩磋緰甯�"; } else { province = city.getProvince(); } @@ -280,7 +280,7 @@ public class CityDirective implements TemplateDirectiveModel { for(int i = 0 ; i < langth ; i ++){ - if(provinceArr[i].equals("直辖市")){ + if(provinceArr[i].equals("鐩磋緰甯�")){ String temp = provinceArr[i]; provinceArr[i] = provinceArr[0]; @@ -292,59 +292,59 @@ public class CityDirective implements TemplateDirectiveModel { Map provincePinyinMap = new HashMap(); for(int i = 1 ; i < langth ; i ++){ - if(provinceArr[i].equals("黑龙江")){ + if(provinceArr[i].equals("榛戦緳姹�")){ provincePinyinMap.put("heilongjiang", provinceArr[i]); - } else if(provinceArr[i].equals("吉林")) { + } else if(provinceArr[i].equals("鍚夋灄")) { provincePinyinMap.put("jilin", provinceArr[i]); - } else if(provinceArr[i].equals("辽宁")) { + } else if(provinceArr[i].equals("杈藉畞")) { provincePinyinMap.put("liaoning", provinceArr[i]); - } else if(provinceArr[i].equals("河北")) { + } else if(provinceArr[i].equals("娌冲寳")) { provincePinyinMap.put("hebei", provinceArr[i]); - } else if(provinceArr[i].equals("山东")) { + } else if(provinceArr[i].equals("灞变笢")) { provincePinyinMap.put("shandong", provinceArr[i]); - } else if(provinceArr[i].equals("江苏")) { + } else if(provinceArr[i].equals("姹熻嫃")) { provincePinyinMap.put("jiangsu", provinceArr[i]); - } else if(provinceArr[i].equals("浙江")) { + } else if(provinceArr[i].equals("娴欐睙")) { provincePinyinMap.put("zhejiang", provinceArr[i]); - } else if(provinceArr[i].equals("福建")) { + } else if(provinceArr[i].equals("绂忓缓")) { provincePinyinMap.put("fujian", provinceArr[i]); - } else if(provinceArr[i].equals("广东")) { + } else if(provinceArr[i].equals("骞夸笢")) { provincePinyinMap.put("guangdong", provinceArr[i]); - } else if(provinceArr[i].equals("海南")) { + } else if(provinceArr[i].equals("娴峰崡")) { provincePinyinMap.put("hainan", provinceArr[i]); - } else if(provinceArr[i].equals("云南")) { + } else if(provinceArr[i].equals("浜戝崡")) { provincePinyinMap.put("yunnan", provinceArr[i]); - } else if(provinceArr[i].equals("四川")) { + } else if(provinceArr[i].equals("鍥涘窛")) { provincePinyinMap.put("sichuan", provinceArr[i]); - } else if(provinceArr[i].equals("青海")) { + } else if(provinceArr[i].equals("闈掓捣")) { provincePinyinMap.put("qinghai", provinceArr[i]); - } else if(provinceArr[i].equals("甘肃")) { + } else if(provinceArr[i].equals("鐢樿們")) { provincePinyinMap.put("gansu", provinceArr[i]); - } else if(provinceArr[i].equals("贵州")) { + } else if(provinceArr[i].equals("璐靛窞")) { provincePinyinMap.put("guzhou", provinceArr[i]); - } else if(provinceArr[i].equals("湖南")) { + } else if(provinceArr[i].equals("婀栧崡")) { provincePinyinMap.put("hunan", provinceArr[i]); - } else if(provinceArr[i].equals("湖北")) { + } else if(provinceArr[i].equals("婀栧寳")) { provincePinyinMap.put("hubei", provinceArr[i]); - } else if(provinceArr[i].equals("江西")) { + } else if(provinceArr[i].equals("姹熻タ")) { provincePinyinMap.put("jiangxi", provinceArr[i]); - } else if(provinceArr[i].equals("安徽")) { + } else if(provinceArr[i].equals("瀹夊窘")) { provincePinyinMap.put("anhui", provinceArr[i]); - } else if(provinceArr[i].equals("河南")) { + } else if(provinceArr[i].equals("娌冲崡")) { provincePinyinMap.put("henan", provinceArr[i]); - } else if(provinceArr[i].equals("山西")) { + } else if(provinceArr[i].equals("灞辫タ")) { provincePinyinMap.put("shanxi", provinceArr[i]); - } else if(provinceArr[i].equals("陕西")) { + } else if(provinceArr[i].equals("闄曡タ")) { provincePinyinMap.put("shanxi2", provinceArr[i]); - } else if(provinceArr[i].equals("新疆")) { + } else if(provinceArr[i].equals("鏂扮枂")) { provincePinyinMap.put("xinjiang", provinceArr[i]); - } else if(provinceArr[i].equals("西藏")) { + } else if(provinceArr[i].equals("瑗胯棌")) { provincePinyinMap.put("xizang", provinceArr[i]); - } else if(provinceArr[i].equals("宁夏")) { + } else if(provinceArr[i].equals("瀹佸")) { provincePinyinMap.put("ningxia", provinceArr[i]); - } else if(provinceArr[i].equals("广西")) { + } else if(provinceArr[i].equals("骞胯タ")) { provincePinyinMap.put("guangxi", provinceArr[i]); - } else if(provinceArr[i].equals("内蒙古")) { + } else if(provinceArr[i].equals("鍐呰挋鍙�")) { provincePinyinMap.put("neimenggu", provinceArr[i]); } diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/DownloadRecordImportServlet.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/DownloadRecordImportServlet.java index 13c97fd24..b3852d3f3 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/DownloadRecordImportServlet.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/DownloadRecordImportServlet.java @@ -61,7 +61,7 @@ import java.util.*; */ public class DownloadRecordImportServlet extends HttpServlet { - private static final String[] columns = {"地址","主贷人","支行账号","结账日期"}; + private static final String[] columns = {"鍦板潃","涓昏捶浜�","鏀璐﹀彿","缁撹处鏃ユ湡"}; private FjtUsersService fjtUsersService; @@ -88,27 +88,27 @@ public class DownloadRecordImportServlet extends HttpServlet { @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - request.setCharacterEncoding("UTF-8"); //转码 + request.setCharacterEncoding("UTF-8"); //杞爜 response.setContentType("text/html;charset=UTF-8"); - //构造一个文件上传处理对象 + //鏋勯�犱竴涓枃浠朵笂浼犲鐞嗗璞� FileItemFactory factory = new DiskFileItemFactory(); ServletFileUpload upload = new ServletFileUpload(factory); Iterator items; try{ - //解析表单中提交的所有文件内容 + //瑙f瀽琛ㄥ崟涓彁浜ょ殑鎵�鏈夋枃浠跺唴瀹� items = upload.parseRequest(request).iterator(); while(items.hasNext()){ FileItem item = (FileItem) items.next(); if(!item.isFormField()){ - //取出上传文件的文件名称 + //鍙栧嚭涓婁紶鏂囦欢鐨勬枃浠跺悕绉� String name = item.getName(); - //取得上传文件以后的存储路径 + //鍙栧緱涓婁紶鏂囦欢浠ュ悗鐨勫瓨鍌ㄨ矾寰� Workbook workbook = getWorkbookFromStream(name, item); workbook.setForceFormulaRecalculation(true); Map infoMap = new HashMap(); if(workbook == null){ - infoMap.put("error", "上传类型不匹配!"); + infoMap.put("error", "涓婁紶绫诲瀷涓嶅尮閰嶏紒"); String json = JSONObject.fromObject(infoMap).toString(); response.getWriter().write(json.toString()); response.getWriter().flush(); @@ -167,24 +167,24 @@ public class DownloadRecordImportServlet extends HttpServlet { private Map checkUploadData(Sheet sheet, String name, long version, Map infoMap) { int totalNum = sheet.getLastRowNum(); - System.out.println("上传文件共:"+totalNum+"个"); + System.out.println("涓婁紶鏂囦欢鍏�:"+totalNum+"涓�"); if(totalNum>1000){ totalNum = 1000; } - Integer totalErrorLine = 0;//总错误行 + Integer totalErrorLine = 0;//鎬婚敊璇 - //获取总列数 - int coloumNum=sheet.getRow(0).getPhysicalNumberOfCells();//获得总列数 + //鑾峰彇鎬诲垪鏁� + int coloumNum=sheet.getRow(0).getPhysicalNumberOfCells();//鑾峰緱鎬诲垪鏁� List> errorDatas = new ArrayList>(); for(int rowj=1;rowj <= totalNum;rowj++){ Row row= sheet.getRow(rowj); if(row!=null){ Map errorDataMap = new HashMap(); - Object val0 = getCellVal(row.getCell(0));//地址 - Object val1 = getCellVal(row.getCell(1));//主贷人 - Object val2 = getCellVal(row.getCell(2));//支行账号 - Object val3 = getCellVal(row.getCell(3));//结账日期 + Object val0 = getCellVal(row.getCell(0));//鍦板潃 + Object val1 = getCellVal(row.getCell(1));//涓昏捶浜� + Object val2 = getCellVal(row.getCell(2));//鏀璐﹀彿 + Object val3 = getCellVal(row.getCell(3));//缁撹处鏃ユ湡 String address=""; String lender=""; @@ -205,7 +205,7 @@ public class DownloadRecordImportServlet extends HttpServlet { continue; } if(val0 != null){ - address = val0.toString().replaceAll("栋", "").replaceAll("室", ""); + address = val0.toString().replaceAll("鏍�", "").replaceAll("瀹�", ""); } if(val1 != null){ lender = val1.toString(); @@ -258,13 +258,13 @@ public class DownloadRecordImportServlet extends HttpServlet { } - //保存上传文件的总体情况 + //淇濆瓨涓婁紶鏂囦欢鐨勬�讳綋鎯呭喌 if(totalErrorLine > 0){ - infoMap.put("error", "您有"+totalErrorLine+"条记录出错,请更正后导入"); + infoMap.put("error", "鎮ㄦ湁"+totalErrorLine+"鏉¤褰曞嚭閿�,璇锋洿姝e悗瀵煎叆"); ActionContext.getContext().getRequest().getSession().setAttribute("errorDatas", errorDatas); //export(errorDatas); }else{ - infoMap.put("success", "全部对账成功"); + infoMap.put("success", "鍏ㄩ儴瀵硅处鎴愬姛"); } return infoMap; @@ -325,7 +325,7 @@ public class DownloadRecordImportServlet extends HttpServlet { return false; } UserTrades userTrade = userTrades.get(0); - userTrade.setReconcile("已结账"); + userTrade.setReconcile("宸茬粨璐�"); userTrade.setCloseAccountDate(DateUtil.parseFormatDate(date)); userTradesService.update(userTrade); return true; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/ExcelUtils.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/ExcelUtils.java index bc9974c76..8d072f4c2 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/ExcelUtils.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/ExcelUtils.java @@ -18,15 +18,15 @@ import java.util.List; import java.util.Map; /** - * excel读写工具类 + * excel璇诲啓宸ュ叿绫� * * @author shenjian * @since 2021/07/12 */ public class ExcelUtils { public static Map read(InputStream inputStream, int sheetIndex, int skipRow) { - // sheetIndex sheet下标 - // skipRow 跳过的表头行数 + // sheetIndex sheet涓嬫爣 + // skipRow 璺宠繃鐨勮〃澶磋鏁� Map map = new HashMap(); List> ret = new ArrayList>(); InputStream inp = null; @@ -36,7 +36,7 @@ public class ExcelUtils { Workbook workbook = WorkbookFactory.create(bufferedInputStream); workbook.setForceFormulaRecalculation(true); Sheet sheet = workbook.getSheetAt(sheetIndex); - //行号 + //琛屽彿 int rowIndex = 0; for (Row row : sheet) { rowIndex++; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/ExcelZipUtil.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/ExcelZipUtil.java index 833f50f23..cada80a13 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/ExcelZipUtil.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/ExcelZipUtil.java @@ -16,7 +16,7 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; /** - * 抽出导出重复的部分,减少重复代码 + * 鎶藉嚭瀵煎嚭閲嶅鐨勯儴鍒嗭紝鍑忓皯閲嶅浠g爜 * @author zhangran * */ @@ -59,7 +59,7 @@ public class ExcelZipUtil { public static JsonModel excelRowOverSize(){ JsonModel jsonModel = new JsonModel(); Map data = new HashMap(); - data.put("msg", "数据量太大,请联系管理员!"); + data.put("msg", "鏁版嵁閲忓お澶э紝璇疯仈绯荤鐞嗗憳锛�"); jsonModel.setJsonModel(data); return jsonModel; } diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/ExportExcel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/ExportExcel.java index 495fdaeae..8598aacbd 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/ExportExcel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/ExportExcel.java @@ -31,16 +31,16 @@ public class ExportExcel { cell.setCellType(HSSFCell.ENCODING_UTF_16); cell.setCellValue(new HSSFRichTextString("")); - //指定合并区域 + //鎸囧畾鍚堝苟鍖哄煙 sheet.addMergedRegion(new Region(0,(short)0,0,(short)colSum)); HSSFCellStyle cellStyle = wb.createCellStyle(); cellStyle.setAlignment(HSSFCellStyle.ALIGN_CENTER); cellStyle.setVerticalAlignment(HSSFCellStyle.VERTICAL_CENTER); - cellStyle.setWrapText(true);// 指定单元格自动换行 + cellStyle.setWrapText(true);// 鎸囧畾鍗曞厓鏍艰嚜鍔ㄦ崲琛� HSSFFont font=wb.createFont(); font.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD); - font.setFontName("宋体"); + font.setFontName("瀹嬩綋"); font.setFontHeight((short)300); cellStyle.setFont(font); } @@ -51,14 +51,14 @@ public class ExportExcel { HSSFCell cell2 = row1.createCell(0); cell2.setCellType(HSSFCell.ENCODING_UTF_16); - cell2.setCellValue(new HSSFRichTextString("统计时间:" + params[0] + "至" + cell2.setCellValue(new HSSFRichTextString("缁熻鏃堕棿锛�" + params[0] + "鑷�" + params[1])); sheet.addMergedRegion(new Region(1, (short) 0, 1, (short) colSum)); HSSFCellStyle cellStyle = wb.createCellStyle(); - cellStyle.setAlignment(HSSFCellStyle.ALIGN_CENTER); // 指定单元格居中对齐 - cellStyle.setVerticalAlignment(HSSFCellStyle.VERTICAL_CENTER);// 指定单元格垂直居中对齐 - cellStyle.setWrapText(true);// 指定单元格自动换行 + cellStyle.setAlignment(HSSFCellStyle.ALIGN_CENTER); // 鎸囧畾鍗曞厓鏍煎眳涓榻� + cellStyle.setVerticalAlignment(HSSFCellStyle.VERTICAL_CENTER);// 鎸囧畾鍗曞厓鏍煎瀭鐩村眳涓榻� + cellStyle.setWrapText(true);// 鎸囧畾鍗曞厓鏍艰嚜鍔ㄦ崲琛� HSSFFont font=wb.createFont(); font.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD); @@ -73,19 +73,19 @@ public class ExportExcel { row2.setHeight((short) 600); HSSFCellStyle cellStyle = wb.createCellStyle(); - cellStyle.setAlignment(HSSFCellStyle.ALIGN_CENTER); // 指定单元格居中对齐 - cellStyle.setVerticalAlignment(HSSFCellStyle.VERTICAL_CENTER);// 指定单元格垂直居中对齐 - cellStyle.setWrapText(true);// 指定单元格自动换行 + cellStyle.setAlignment(HSSFCellStyle.ALIGN_CENTER); // 鎸囧畾鍗曞厓鏍煎眳涓榻� + cellStyle.setVerticalAlignment(HSSFCellStyle.VERTICAL_CENTER);// 鎸囧畾鍗曞厓鏍煎瀭鐩村眳涓榻� + cellStyle.setWrapText(true);// 鎸囧畾鍗曞厓鏍艰嚜鍔ㄦ崲琛� HSSFFont font = wb.createFont(); font.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD); - font.setFontName("宋体"); + font.setFontName("瀹嬩綋"); font.setFontHeight((short) 250); cellStyle.setFont(font); - /*cellStyle.setBorderBottom(HSSFCellStyle.BORDER_THIN); // 设置单无格的边框为粗体 - cellStyle.setBottomBorderColor(HSSFColor.BLACK.index); // 设置单元格的边框颜色. + /*cellStyle.setBorderBottom(HSSFCellStyle.BORDER_THIN); // 璁剧疆鍗曟棤鏍肩殑杈规涓虹矖浣� + cellStyle.setBottomBorderColor(HSSFColor.BLACK.index); // 璁剧疆鍗曞厓鏍肩殑杈规棰滆壊锛� cellStyle.setBorderLeft(HSSFCellStyle.BORDER_THIN); cellStyle.setLeftBorderColor(HSSFColor.BLACK.index); cellStyle.setBorderRight(HSSFCellStyle.BORDER_THIN); @@ -116,24 +116,24 @@ public class ExportExcel { public void createLastSumRow(int colSum, String[] cellValue){ HSSFCellStyle cellStyle = wb.createCellStyle(); - cellStyle.setAlignment(HSSFCellStyle.ALIGN_CENTER); // 指定单元格居中对齐 - cellStyle.setVerticalAlignment(HSSFCellStyle.VERTICAL_CENTER);// 指定单元格垂直居中对齐 - cellStyle.setWrapText(true);// 指定单元格自动换行 + cellStyle.setAlignment(HSSFCellStyle.ALIGN_CENTER); // 鎸囧畾鍗曞厓鏍煎眳涓榻� + cellStyle.setVerticalAlignment(HSSFCellStyle.VERTICAL_CENTER);// 鎸囧畾鍗曞厓鏍煎瀭鐩村眳涓榻� + cellStyle.setWrapText(true);// 鎸囧畾鍗曞厓鏍艰嚜鍔ㄦ崲琛� - // 单元格字体 + // 鍗曞厓鏍煎瓧浣� HSSFFont font = wb.createFont(); font.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD); - font.setFontName("宋体"); + font.setFontName("瀹嬩綋"); font.setFontHeight((short) 250); cellStyle.setFont(font); HSSFRow lastRow = sheet.createRow((short) (sheet.getLastRowNum() + 1)); HSSFCell sumCell = lastRow.createCell(0); - sumCell.setCellValue(new HSSFRichTextString("合计")); + sumCell.setCellValue(new HSSFRichTextString("鍚堣")); sumCell.setCellStyle(cellStyle); sheet.addMergedRegion(new Region(sheet.getLastRowNum(), (short) 0, - sheet.getLastRowNum(), (short) colSum));// 指定合并区域 + sheet.getLastRowNum(), (short) colSum));// 鎸囧畾鍚堝苟鍖哄煙 for (int i = 2; i < (cellValue.length + 2); i++) { sumCell = lastRow.createCell(i); diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/FileUploadServlet.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/FileUploadServlet.java index 3cd668304..a70666df2 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/FileUploadServlet.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/FileUploadServlet.java @@ -49,9 +49,9 @@ public class FileUploadServlet extends HttpServlet{ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - request.setCharacterEncoding("UTF-8"); //转码 + request.setCharacterEncoding("UTF-8"); //杞爜 response.setContentType("text/html;charset=UTF-8"); - //构造一个文件上传处理对象 + //鏋勯�犱竴涓枃浠朵笂浼犲鐞嗗璞� FileItemFactory factory = new DiskFileItemFactory(); ServletFileUpload upload = new ServletFileUpload(factory); @@ -60,14 +60,14 @@ public class FileUploadServlet extends HttpServlet{ Iterator items; Map map = new HashMap(); try{ - //解析表单中提交的所有文件内容 + //瑙f瀽琛ㄥ崟涓彁浜ょ殑鎵�鏈夋枃浠跺唴瀹� items = upload.parseRequest(request).iterator(); while(items.hasNext()){ FileItem item = (FileItem) items.next(); if(!item.isFormField()){ - //最大图片的大小 + //鏈�澶у浘鐗囩殑澶у皬 int maxSize = 10240000; - //取出上传文件的文件名称 + //鍙栧嚭涓婁紶鏂囦欢鐨勬枃浠跺悕绉� String name = item.getName(); String type = item.getContentType(); @@ -75,10 +75,10 @@ public class FileUploadServlet extends HttpServlet{ byte[] dataByte = IOUtils.toByteArray(in); String fileType = type.substring(type.lastIndexOf("/")+1); - //取得上传文件以后的存储路径 + //鍙栧緱涓婁紶鏂囦欢浠ュ悗鐨勫瓨鍌ㄨ矾寰� if(!imageTypes.contains(fileType) && !uploadTypes.contains(fileType)){ map.put("error", 1); - map.put("message", "上传类型不匹配!gif,jpg,jpeg,png,bmp,pdf,zip,rar"); + map.put("message", "涓婁紶绫诲瀷涓嶅尮閰嶏紒gif,jpg,jpeg,png,bmp,pdf,zip,rar"); String json = JSONObject.fromObject(map).toString(); response.getWriter().write(json.toString()); response.getWriter().flush(); @@ -95,7 +95,7 @@ public class FileUploadServlet extends HttpServlet{ saveFile(fileName, name, FileServiceImpl.SIZE_ORIGINAL, dataByte, type, "attachment"); category = "attachment"; } - //返回上传成功后的url + //杩斿洖涓婁紶鎴愬姛鍚庣殑url if(StringUtils.isNotBlank(fileName)){ fileName = FileUtils.encodePicUrl(fileName, FileServiceImpl.SIZE_ORIGINAL, category); map.put("error", 0); diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/GetLatAndLngByBaidu.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/GetLatAndLngByBaidu.java index 4da588cd7..f139a82d4 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/GetLatAndLngByBaidu.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/GetLatAndLngByBaidu.java @@ -16,7 +16,7 @@ import net.sf.json.JSONObject; public class GetLatAndLngByBaidu { /** * @param addr - * 查询的地址 + * 鏌ヨ鐨勫湴鍧� * @return * @throws IOException */ @@ -42,7 +42,7 @@ public class GetLatAndLngByBaidu { InputStreamReader insr = null; BufferedReader br = null; try { - httpsConn = (URLConnection) myURL.openConnection();// 不使用代理 + httpsConn = (URLConnection) myURL.openConnection();// 涓嶄娇鐢ㄤ唬鐞� if (httpsConn != null) { insr = new InputStreamReader(httpsConn.getInputStream(), "UTF-8"); @@ -83,7 +83,7 @@ public class GetLatAndLngByBaidu { return columnValMap; } public static void main(String[] args) throws IOException { - Map map = getCoordinate("鸡西市 "); + Map map = getCoordinate("楦¤タ甯� "); System.out.println(map); } } diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/HssfCellStyleUtil.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/HssfCellStyleUtil.java index 69d96fa74..a3bc40668 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/HssfCellStyleUtil.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/HssfCellStyleUtil.java @@ -10,10 +10,10 @@ import org.apache.poi.hssf.util.HSSFColor; * */ public class HssfCellStyleUtil { - private HSSFCellStyle light_yellow_color_bg; // 浅黄背景样式 - private HSSFCellStyle numberStyle;// 数字(可含小数)样式 - private HSSFCellStyle integerNumStyle;// 整数样式 - private HSSFCellStyle warpTextStyle;//自动换行样式 + private HSSFCellStyle light_yellow_color_bg; // 娴呴粍鑳屾櫙鏍峰紡 + private HSSFCellStyle numberStyle;// 鏁板瓧(鍙惈灏忔暟)鏍峰紡 + private HSSFCellStyle integerNumStyle;// 鏁存暟鏍峰紡 + private HSSFCellStyle warpTextStyle;//鑷姩鎹㈣鏍峰紡 private HSSFCellStyle alignmentLeftCenter; private HSSFWorkbook wb; @@ -25,7 +25,7 @@ public class HssfCellStyleUtil { } /** - * 自动换行样式 + * 鑷姩鎹㈣鏍峰紡 * @return */ public HSSFCellStyle getWarpTextStyle(){ @@ -39,7 +39,7 @@ public class HssfCellStyleUtil { } /** - * 设置左对齐,上下居中 + * 璁剧疆宸﹀榻愶紝涓婁笅灞呬腑 * @return */ public HSSFCellStyle getAlignmentLeftCenter(){ @@ -52,7 +52,7 @@ public class HssfCellStyleUtil { } /** - * 浅黄背景样式 + * 娴呴粍鑳屾櫙鏍峰紡 * * @author zhaoshumao * @return @@ -65,7 +65,7 @@ public class HssfCellStyleUtil { } /** - * 小数样式 + * 灏忔暟鏍峰紡 * * @author zhaoshumao * @return @@ -78,7 +78,7 @@ public class HssfCellStyleUtil { } /** - * 整数样式 + * 鏁存暟鏍峰紡 * * @author zhaoshumao * @return @@ -91,7 +91,7 @@ public class HssfCellStyleUtil { /** - * 创建颜色样式 + * 鍒涘缓棰滆壊鏍峰紡 * * @author zhaoshumao * @param wb @@ -106,7 +106,7 @@ public class HssfCellStyleUtil { /** - * 创建cell的数据格式 + * 鍒涘缓cell鐨勬暟鎹牸寮� * * @author zhaoshumao * @param wb @@ -129,8 +129,8 @@ public class HssfCellStyleUtil { HSSFCellStyle style=wb.createCellStyle(); style.setBorderBottom(type); style.setBorderLeft(type); - style.setBorderRight(type);// 右边框 - style.setBorderTop(type);// 上边框 + style.setBorderRight(type);// 鍙宠竟妗� + style.setBorderTop(type);// 涓婅竟妗� return style; } } diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/ImportExcelServlet.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/ImportExcelServlet.java index cb3dd7908..23c747ddf 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/ImportExcelServlet.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/ImportExcelServlet.java @@ -51,12 +51,12 @@ public class ImportExcelServlet extends HttpServlet { @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - //构造一个文件上传处理对象 + //鏋勯�犱竴涓枃浠朵笂浼犲鐞嗗璞� FileItemFactory factory = new DiskFileItemFactory(); ServletFileUpload upload = new ServletFileUpload(factory); Iterator items; try { - //解析表单中提交的所有文件内容 + //瑙f瀽琛ㄥ崟涓彁浜ょ殑鎵�鏈夋枃浠跺唴瀹� items = upload.parseRequest(request).iterator(); InputStream is = null; String note = null; @@ -181,11 +181,11 @@ public class ImportExcelServlet extends HttpServlet { if (POIXMLDocument.hasOOXMLHeader(inp)) { return new XSSFWorkbook(OPCPackage.open(inp)); } - throw new IllegalArgumentException("你的excel版本目前poi解析不了"); + throw new IllegalArgumentException("浣犵殑excel鐗堟湰鐩墠poi瑙f瀽涓嶄簡"); } private Object dealMap(HttpServletRequest request, HttpServletResponse response, List> ret, String note) { - StringBuffer stringBuffer = new StringBuffer("导入失败行数:"); + StringBuffer stringBuffer = new StringBuffer("瀵煎叆澶辫触琛屾暟:"); int deleteNum = 0; int updateNum = 0; int addNum = 0; @@ -194,24 +194,24 @@ public class ImportExcelServlet extends HttpServlet { DBCollection dbCollection = getColl(collection); boolean isContinue = false; if (dbCollection == null) { - stringBuffer.append("第" + (i + 2) + "行的表名录入错误,请核对!"); + stringBuffer.append("绗�" + (i + 2) + "琛岀殑琛ㄥ悕褰曞叆閿欒锛岃鏍稿锛�"); continue; } String doWhat = ret.get(i).get("do").toString(); String id = ret.get(i).get("id").toString(); String content = ret.get(i).get("content").toString(); - if (doWhat.equals("删除")) { + if (doWhat.equals("鍒犻櫎")) { if (StringUtils.isBlank(id) || !ObjectId.isValid(id)) { - stringBuffer.append("第" + (i + 2) + "行执行删除时请准确录入数据库中的id值!"); + stringBuffer.append("绗�" + (i + 2) + "琛屾墽琛屽垹闄ゆ椂璇峰噯纭綍鍏ユ暟鎹簱涓殑id鍊硷紒"); continue; } else { BasicDBObject basicDBObject = new BasicDBObject("status", 1); dbCollection.update(new BasicDBObject("_id", new ObjectId(id)), new BasicDBObject("$set", basicDBObject), false, false); deleteNum++; } - } else if (doWhat.equals("更新")) { + } else if (doWhat.equals("鏇存柊")) { if (StringUtils.isBlank(id) || !ObjectId.isValid(id)) { - stringBuffer.append("第" + (i + 2) + "行执行更新操作时请准确录入数据库中的id值!"); + stringBuffer.append("绗�" + (i + 2) + "琛屾墽琛屾洿鏂版搷浣滄椂璇峰噯纭綍鍏ユ暟鎹簱涓殑id鍊硷紒"); continue; } else { try { @@ -239,7 +239,7 @@ public class ImportExcelServlet extends HttpServlet { updateNum++; } } catch (Exception e) { - stringBuffer.append("第" + (i + 2) + "行的数据录入错误,请核对!"); + stringBuffer.append("绗�" + (i + 2) + "琛岀殑鏁版嵁褰曞叆閿欒锛岃鏍稿锛�"); isContinue = true; } finally { if (isContinue) { @@ -247,7 +247,7 @@ public class ImportExcelServlet extends HttpServlet { } } } - } else if (doWhat.equals("增加")) { + } else if (doWhat.equals("澧炲姞")) { try { if (StringUtils.isNotBlank(content)) { BasicDBObject basicDBObject = new BasicDBObject(); @@ -273,7 +273,7 @@ public class ImportExcelServlet extends HttpServlet { addNum++; } } catch (Exception e) { - stringBuffer.append("第" + (i + 2) + "行的数据录入错误,请核对!"); + stringBuffer.append("绗�" + (i + 2) + "琛岀殑鏁版嵁褰曞叆閿欒锛岃鏍稿锛�"); isContinue = true; } finally { if (isContinue) { @@ -281,7 +281,7 @@ public class ImportExcelServlet extends HttpServlet { } } } else { - stringBuffer.append("第" + (i + 2) + "行的操作录入有误!"); + stringBuffer.append("绗�" + (i + 2) + "琛岀殑鎿嶄綔褰曞叆鏈夎锛�"); continue; } } @@ -307,9 +307,9 @@ public class ImportExcelServlet extends HttpServlet { private DBCollection getColl(String collection) { - if (collection.equals("房号库")) { + if (collection.equals("鎴垮彿搴�")) { stat_index = MongoUtils.getDbCollection(Constants.FANGJIA_MONGO_URI, "fangjia", "house_loudong"); - } else if (collection.equals("楼栋库")) { + } else if (collection.equals("妤兼爧搴�")) { stat_index = MongoUtils.getDbCollection(Constants.FANGJIA_MONGO_URI, "fangjia_base", "loudong"); } return stat_index; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/ImportServlet.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/ImportServlet.java index 2970fc0d1..073816095 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/ImportServlet.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/ImportServlet.java @@ -55,35 +55,35 @@ public class ImportServlet extends HttpServlet { protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { boolean isMultipart= ServletFileUpload.isMultipartContent(request); if(isMultipart){ - //构造一个文件上传处理对象 + //鏋勯�犱竴涓枃浠朵笂浼犲鐞嗗璞� FileItemFactory factory = new DiskFileItemFactory(); ServletFileUpload upload = new ServletFileUpload(factory); String yearmonth=request.getParameter("yearmonth"); String catds=request.getParameter("catds")==null?"":request.getParameter("catds"); Iterator items; try{ - //解析表单中提交的所有文件内容 + //瑙f瀽琛ㄥ崟涓彁浜ょ殑鎵�鏈夋枃浠跺唴瀹� items=upload.parseRequest(request).iterator(); while(items.hasNext()){ FileItem item = (FileItem) items.next(); if(!item.isFormField()){ - //取出上传文件的文件名称 + //鍙栧嚭涓婁紶鏂囦欢鐨勬枃浠跺悕绉� String name = item.getName(); - //取得上传文件以后的存储路径 + //鍙栧緱涓婁紶鏂囦欢浠ュ悗鐨勫瓨鍌ㄨ矾寰� InputStream is =item.getInputStream(); String fileName=name.substring(name.lastIndexOf('\\')+1,name.length()); int index=fileName.lastIndexOf("."); String fileType=fileName.substring(index); - if(catds.equalsIgnoreCase("district") && fileName.indexOf("二手")!=-1){ + if(catds.equalsIgnoreCase("district") && fileName.indexOf("浜屾墜")!=-1){ saveDistrictValue(is,fileType); - }else if(catds.equalsIgnoreCase("new") && fileName.indexOf("新")!=-1){ + }else if(catds.equalsIgnoreCase("new") && fileName.indexOf("鏂�")!=-1){ saveNewValue(is,fileType); - }else if(catds.equalsIgnoreCase("shop") && fileName.indexOf("商铺")!=-1){ + }else if(catds.equalsIgnoreCase("shop") && fileName.indexOf("鍟嗛摵")!=-1){ saveShopValue(is,fileType); - }else if(catds.equalsIgnoreCase("office") && fileName.indexOf("写字楼")!=-1){ + }else if(catds.equalsIgnoreCase("office") && fileName.indexOf("鍐欏瓧妤�")!=-1){ saveOfficeValue(is,fileType); }else{ - response.getWriter().print("所选的类型不匹配!"); + response.getWriter().print("鎵�閫夌殑绫诲瀷涓嶅尮閰�!"); } } } @@ -165,9 +165,9 @@ public class ImportServlet extends HttpServlet { } } } - mapobj.put("cat", "district");//小区 + mapobj.put("cat", "district");//灏忓尯 mapobj.put("source", 1); - mapobj.put("remark", "统计局数据导入"); + mapobj.put("remark", "缁熻灞�鏁版嵁瀵煎叆"); String tempCity = (String) retMap.get("city"); if(tempCity!=null && StringUtils.isNotEmpty(tempCity)){ DBObject query = new BasicDBObject(); @@ -277,9 +277,9 @@ public class ImportServlet extends HttpServlet { } } } - mapobj.put("cat", "district");//小区 + mapobj.put("cat", "district");//灏忓尯 mapobj.put("source", 1); - mapobj.put("remark", "统计局数据导入"); + mapobj.put("remark", "缁熻灞�鏁版嵁瀵煎叆"); String tempCity = (String) retMap.get("city"); if(tempCity!=null && StringUtils.isNotEmpty(tempCity)){ DBObject query = new BasicDBObject(); @@ -368,7 +368,7 @@ public class ImportServlet extends HttpServlet { } mapobj.put("cat", "office"); mapobj.put("source", 1); - mapobj.put("remark", "搜房"); + mapobj.put("remark", "鎼滄埧"); if(StringUtils.isNotEmpty(retMap.get("city").toString())){ DBObject query = new BasicDBObject(); query.put("city", DataUtil.getCnWord(retMap.get("city").toString())); @@ -459,9 +459,9 @@ public class ImportServlet extends HttpServlet { } } } - mapobj.put("cat", "shop");//小区 + mapobj.put("cat", "shop");//灏忓尯 mapobj.put("source", 1); - mapobj.put("remark", "搜房"); + mapobj.put("remark", "鎼滄埧"); if(StringUtils.isNotEmpty(retMap.get("city").toString())){ DBObject query = new BasicDBObject(); query.put("city", DataUtil.getCnWord(retMap.get("city").toString())); @@ -523,7 +523,7 @@ public class ImportServlet extends HttpServlet { if (POIXMLDocument.hasOOXMLHeader(inp)) { return new XSSFWorkbook(OPCPackage.open(inp)); } - throw new IllegalArgumentException("你的excel版本目前poi解析不了"); + throw new IllegalArgumentException("浣犵殑excel鐗堟湰鐩墠poi瑙f瀽涓嶄簡"); } } diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/LoanImportServlet.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/LoanImportServlet.java index 204835beb..c661507ad 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/LoanImportServlet.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/LoanImportServlet.java @@ -46,7 +46,7 @@ import java.util.*; */ public class LoanImportServlet extends HttpServlet { - private static final String[] columns = {"手机","省份","城市","估值房屋地址","小区名称","房屋估值价格","房屋面积","房屋单价","申请贷款类型","贷款人姓名","贷款用途","是否意向客户","线索来源","渠道名称","渠道类型","备注","申请日期","贷款金额", "资产类型"}; + private static final String[] columns = {"鎵嬫満","鐪佷唤","鍩庡競","浼板�兼埧灞嬪湴鍧�","灏忓尯鍚嶇О","鎴垮眿浼板�间环鏍�","鎴垮眿闈㈢Н","鎴垮眿鍗曚环","鐢宠璐锋绫诲瀷","璐锋浜哄鍚�","璐锋鐢ㄩ��","鏄惁鎰忓悜瀹㈡埛","绾跨储鏉ユ簮","娓犻亾鍚嶇О","娓犻亾绫诲瀷","澶囨敞","鐢宠鏃ユ湡","璐锋閲戦", "璧勪骇绫诲瀷"}; private LoanLeadsService loanLeadsService; @@ -68,27 +68,27 @@ public class LoanImportServlet extends HttpServlet { @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - request.setCharacterEncoding("UTF-8"); //转码 + request.setCharacterEncoding("UTF-8"); //杞爜 response.setContentType("text/html;charset=UTF-8"); - //构造一个文件上传处理对象 + //鏋勯�犱竴涓枃浠朵笂浼犲鐞嗗璞� FileItemFactory factory = new DiskFileItemFactory(); ServletFileUpload upload = new ServletFileUpload(factory); Iterator items; try{ - //解析表单中提交的所有文件内容 + //瑙f瀽琛ㄥ崟涓彁浜ょ殑鎵�鏈夋枃浠跺唴瀹� items = upload.parseRequest(request).iterator(); while(items.hasNext()){ FileItem item = (FileItem) items.next(); if(!item.isFormField()){ - //取出上传文件的文件名称 + //鍙栧嚭涓婁紶鏂囦欢鐨勬枃浠跺悕绉� String name = item.getName(); - //取得上传文件以后的存储路径 + //鍙栧緱涓婁紶鏂囦欢浠ュ悗鐨勫瓨鍌ㄨ矾寰� Workbook workbook = getWorkbookFromStream(name, item); workbook.setForceFormulaRecalculation(true); Map infoMap = new HashMap(); if(workbook == null){ - infoMap.put("error", "上传类型不匹配!"); + infoMap.put("error", "涓婁紶绫诲瀷涓嶅尮閰嶏紒"); String json = JSONObject.fromObject(infoMap).toString(); response.getWriter().write(json.toString()); response.getWriter().flush(); @@ -113,7 +113,7 @@ public class LoanImportServlet extends HttpServlet { for(List errors : ret){ List fields = (List) errors.get(1); - info = info + "第"+errors.get(0)+"行,"+StringUtils.join(fields, " ")+"有误\\n"; + info = info + "绗�"+errors.get(0)+"琛岋紝"+StringUtils.join(fields, " ")+"鏈夎\\n"; } response.getWriter().write(info); @@ -168,18 +168,18 @@ public class LoanImportServlet extends HttpServlet { private Map checkUploadData(Sheet sheet, String name, long version, Map infoMap) { int totalNum = sheet.getLastRowNum(); - System.out.println("上传文件共:"+totalNum+"个"); + System.out.println("涓婁紶鏂囦欢鍏�:"+totalNum+"涓�"); if(totalNum>1000){ totalNum = 1000; } - Integer totalLine = 0;//总行数 - Integer totalIsNull = 0;//为空行的总行数 - Integer totalErrorLine = 0;//总错误行 - String message = "上传成功!"; + Integer totalLine = 0;//鎬昏鏁� + Integer totalIsNull = 0;//涓虹┖琛岀殑鎬昏鏁� + Integer totalErrorLine = 0;//鎬婚敊璇 + String message = "涓婁紶鎴愬姛!"; - //获取总列数 - int coloumNum=sheet.getRow(0).getPhysicalNumberOfCells();//获得总列数 + //鑾峰彇鎬诲垪鏁� + int coloumNum=sheet.getRow(0).getPhysicalNumberOfCells();//鑾峰緱鎬诲垪鏁� List> ret = new ArrayList>(); List> datas = new ArrayList>(); for(int rowj=1;rowj <= totalNum;rowj++){ @@ -192,16 +192,16 @@ public class LoanImportServlet extends HttpServlet { Map dataMap = new HashMap(); List errorList = new ArrayList(); - //字段验证 + //瀛楁楠岃瘉 for(int i=0;i=5 && i<=7){ if(!DataUtil.getNumberFromString(val.toString())){ errorFlag = true; @@ -223,7 +223,7 @@ public class LoanImportServlet extends HttpServlet { dataMap.put(columns[i], val.toString()); } }else if(i==16){ - //日期类型检查 + //鏃ユ湡绫诲瀷妫�鏌� Date date = DateUtil.parseDate(val.toString(), "yyyy-MM-dd HH:mm:ss"); if(null == date){ errorFlag = true; @@ -237,7 +237,7 @@ public class LoanImportServlet extends HttpServlet { } } - if(!isBlankRows){//不是空白行 + if(!isBlankRows){//涓嶆槸绌虹櫧琛� totalLine ++; if(errorFlag){ totalErrorLine++; @@ -250,21 +250,21 @@ public class LoanImportServlet extends HttpServlet { } - //保存上传文件的总体情况 + //淇濆瓨涓婁紶鏂囦欢鐨勬�讳綋鎯呭喌 if(totalErrorLine > 0){ - infoMap.put("error", "上传失败!"); + infoMap.put("error", "涓婁紶澶辫触!"); infoMap.put("errorMsg", ret); }else if(totalLine==0){ - ret.add(Arrays.asList("0", Arrays.asList("格式有误或无数据"))); + ret.add(Arrays.asList("0", Arrays.asList("鏍煎紡鏈夎鎴栨棤鏁版嵁"))); infoMap.put("errorMsg", ret); - infoMap.put("error", "上传失败!"); + infoMap.put("error", "涓婁紶澶辫触!"); }else if(totalIsNull > 0){ - ret.add(Arrays.asList("0", Arrays.asList("手机号或渠道名称不能为空"))); + ret.add(Arrays.asList("0", Arrays.asList("鎵嬫満鍙锋垨娓犻亾鍚嶇О涓嶈兘涓虹┖"))); infoMap.put("errorMsg", ret); - infoMap.put("error", "上传失败!"); + infoMap.put("error", "涓婁紶澶辫触!"); }else{ infoMap.put("success", message); - //验证通过后,保存信息 + //楠岃瘉閫氳繃鍚�,淇濆瓨淇℃伅 saveSuccessToDB(datas, version); } @@ -350,33 +350,33 @@ public class LoanImportServlet extends HttpServlet { DBObject detailDbo = new BasicDBObject();*/ while(ite.hasNext()){ String key = (String) ite.next(); - if(key.equals("手机")){ + if(key.equals("鎵嬫満")){ loanLeads.setMobile(formatNumer(map.get(key))); // houseDbo.put("city", map.get(key)); - }else if(key.equals("省份") && map.get(key)!=null){ + }else if(key.equals("鐪佷唤") && map.get(key)!=null){ loanLeads.setProvince(map.get(key)); // houseDbo.put("estate_type", map.get(key)); - }else if(key.equals("城市") && map.get(key)!=null){ + }else if(key.equals("鍩庡競") && map.get(key)!=null){ loanLeads.setCity(map.get(key)); // houseDbo.put("old_address", map.get(key)); - }else if(key.equals("估值房屋地址") && map.get(key)!=null){ + }else if(key.equals("浼板�兼埧灞嬪湴鍧�") && map.get(key)!=null){ loanLeads.setAddress(map.get(key)); // houseDbo.put("house_number", formatNumer(map.get(key))); - }else if(key.equals("小区名称") && map.get(key)!=null){ + }else if(key.equals("灏忓尯鍚嶇О") && map.get(key)!=null){ loanLeads.setName(map.get(key)); // houseDbo.put("unit_number", formatNumer(map.get(key))); - }else if(key.equals("房屋估值价格")){ + }else if(key.equals("鎴垮眿浼板�间环鏍�")){ String val = formatNumer(map.get(key)); if(StringUtils.isNotBlank(val)){ loanLeads.setTotalPrice(Long.valueOf(val)); } // houseDbo.put("room_number", formatNumer(map.get(key))); - }else if(key.equals("房屋面积")){ + }else if(key.equals("鎴垮眿闈㈢Н")){ if(null != map.get(key)){ loanLeads.setArea(NumberUtils.toDouble(map.get(key))); } // houseDbo.put("area", Double.valueOf(formatNumer(map.get(key)))); - }else if(key.equals("房屋单价")){ + }else if(key.equals("鎴垮眿鍗曚环")){ String val = formatNumer(map.get(key)); if(StringUtils.isNotBlank(val)){ int x = Integer.parseInt(val); @@ -384,40 +384,40 @@ public class LoanImportServlet extends HttpServlet { } // houseDbo.put("total_price", formatInt(formatNumer(map.get(key)))); - }else if(key.equals("申请贷款类型") && map.get(key)!=null){ + }else if(key.equals("鐢宠璐锋绫诲瀷") && map.get(key)!=null){ loanLeads.setLoanType(map.get(key).replace(".00","")); // detailDbo.put("lending_date", DateUtil.parseDate(map.get(key),"yyyy/MM/dd")); - }else if(key.equals("贷款人姓名") && map.get(key)!=null){ + }else if(key.equals("璐锋浜哄鍚�") && map.get(key)!=null){ loanLeads.setLoanUserName(map.get(key)); // loanLeads.put("lending_price", formatInt(formatNumer(map.get(key)))); - }else if(key.equals("贷款用途") && map.get(key)!=null){ + }else if(key.equals("璐锋鐢ㄩ��") && map.get(key)!=null){ loanLeads.setLoanPurpose(map.get(key)); // detailDbo.put("rate", Double.valueOf(formatNumer(map.get(key)))); - }else if(key.equals("是否意向客户") && map.get(key)!=null){ - if (null!=map.get(key) && map.get(key).equals("是")) { + }else if(key.equals("鏄惁鎰忓悜瀹㈡埛") && map.get(key)!=null){ + if (null!=map.get(key) && map.get(key).equals("鏄�")) { loanLeads.setIntentCustomer(true); - } else if(null!=map.get(key) && map.get(key).equals("否")){ + } else if(null!=map.get(key) && map.get(key).equals("鍚�")){ loanLeads.setIntentCustomer(false); }else{ loanLeads.setIntentCustomer(null); } // detailDbo.put("loan_month", formatInt(formatNumer(map.get(key)))); - }else if(key.equals("线索来源") && map.get(key)!=null){ + }else if(key.equals("绾跨储鏉ユ簮") && map.get(key)!=null){ loanLeads.setClueSource(map.get(key)); - }else if(key.equals("渠道名称")){ + }else if(key.equals("娓犻亾鍚嶇О")){ loanLeads.setLeads_source(map.get(key)); } - else if(key.equals("渠道类型") && map.get(key)!=null){ + else if(key.equals("娓犻亾绫诲瀷") && map.get(key)!=null){ loanLeads.setChannelType(map.get(key)); - }else if(key.equals("备注") && map.get(key)!=null) { + }else if(key.equals("澶囨敞") && map.get(key)!=null) { loanLeads.setRemarks(map.get(key)); - }else if(key.equals("申请日期")) { + }else if(key.equals("鐢宠鏃ユ湡")) { Date applyDate = (DateUtil.parseDate(map.get(key), "yyyy-MM-dd HH:mm:ss")); loanLeads.setCreateDate(applyDate == null ? curDate : applyDate); - }else if(key.equals("贷款金额")){ + }else if(key.equals("璐锋閲戦")){ loanLeads.setAmount(Long.valueOf(formatNumer(map.get(key)))); - }else if(key.equals("资产类型") && map.get(key)!=null){ + }else if(key.equals("璧勪骇绫诲瀷") && map.get(key)!=null){ loanLeads.setAssetType(map.get(key)); } diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/MyHttpServer.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/MyHttpServer.java index 6e3a49e70..020198597 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/MyHttpServer.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/MyHttpServer.java @@ -29,8 +29,8 @@ public class MyHttpServer { } /** - * 读取文件内容,转化为byte数组 - * @param filename 文件名 + * 璇诲彇鏂囦欢鍐呭锛岃浆鍖栦负byte鏁扮粍 + * @param filename 鏂囦欢鍚� * @return * @throws IOException */ @@ -52,10 +52,10 @@ public class MyHttpServer { /** - * 分析http请求中的url,分析用户请求的资源,并将请求url规范化 - * 例如请求 "/"要规范成"/index.html","/index"要规范成"/index.html" - * @param queryurl 用户原始的url - * @return 规范化的url,即为用户请求资源的路径 + * 鍒嗘瀽http璇锋眰涓殑url,鍒嗘瀽鐢ㄦ埛璇锋眰鐨勮祫婧愶紝骞跺皢璇锋眰url瑙勮寖鍖� + * 渚嬪璇锋眰 "/"瑕佽鑼冩垚"/index.html","/index"瑕佽鑼冩垚"/index.html" + * @param queryurl 鐢ㄦ埛鍘熷鐨剈rl + * @return 瑙勮寖鍖栫殑url锛屽嵆涓虹敤鎴疯姹傝祫婧愮殑璺緞 */ private String getQueryResource(String queryurl) { @@ -85,7 +85,7 @@ public class MyHttpServer { /** - * 根据用户请求的资源类型,设定http响应头的信息,主要是判断用户请求的文件类型(html、jpg...) + * 鏍规嵁鐢ㄦ埛璇锋眰鐨勮祫婧愮被鍨嬶紝璁惧畾http鍝嶅簲澶寸殑淇℃伅锛屼富瑕佹槸鍒ゆ柇鐢ㄦ埛璇锋眰鐨勬枃浠剁被鍨嬶紙html銆乯pg...锛� * @param queryresource * @return */ diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/SaleImportServlet.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/SaleImportServlet.java index 32355b59b..cffefca8f 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/SaleImportServlet.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/SaleImportServlet.java @@ -41,7 +41,7 @@ import java.util.*; */ public class SaleImportServlet extends HttpServlet { - private static final String[] columns = {"姓名" ,"公司名称","手机","座机","邮箱","省份","城市","行业性质","其他行业性质","工作职能","其他工作职能","业务需求","其他业务需求","是否接受邮件","是否意向客户","下载内容","线索来源","渠道类型","备注","日期" + private static final String[] columns = {"濮撳悕" ,"鍏徃鍚嶇О","鎵嬫満","搴ф満","閭","鐪佷唤","鍩庡競","琛屼笟鎬ц川","鍏朵粬琛屼笟鎬ц川","宸ヤ綔鑱岃兘","鍏朵粬宸ヤ綔鑱岃兘","涓氬姟闇�姹�","鍏朵粬涓氬姟闇�姹�","鏄惁鎺ュ彈閭欢","鏄惁鎰忓悜瀹㈡埛","涓嬭浇鍐呭","绾跨储鏉ユ簮","娓犻亾绫诲瀷","澶囨敞","鏃ユ湡" }; @@ -64,27 +64,27 @@ public class SaleImportServlet extends HttpServlet { @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - request.setCharacterEncoding("UTF-8"); //转码 + request.setCharacterEncoding("UTF-8"); //杞爜 response.setContentType("text/html;charset=UTF-8"); - //构造一个文件上传处理对象 + //鏋勯�犱竴涓枃浠朵笂浼犲鐞嗗璞� FileItemFactory factory = new DiskFileItemFactory(); ServletFileUpload upload = new ServletFileUpload(factory); Iterator items; try{ - //解析表单中提交的所有文件内容 + //瑙f瀽琛ㄥ崟涓彁浜ょ殑鎵�鏈夋枃浠跺唴瀹� items = upload.parseRequest(request).iterator(); while(items.hasNext()){ FileItem item = (FileItem) items.next(); if(!item.isFormField()){ - //取出上传文件的文件名称 + //鍙栧嚭涓婁紶鏂囦欢鐨勬枃浠跺悕绉� String name = item.getName(); - //取得上传文件以后的存储路径 + //鍙栧緱涓婁紶鏂囦欢浠ュ悗鐨勫瓨鍌ㄨ矾寰� Workbook workbook = getWorkbookFromStream(name, item); workbook.setForceFormulaRecalculation(true); Map infoMap = new HashMap(); if(workbook == null){ - infoMap.put("error", "上传类型不匹配!"); + infoMap.put("error", "涓婁紶绫诲瀷涓嶅尮閰嶏紒"); String json = JSONObject.fromObject(infoMap).toString(); response.getWriter().write(json.toString()); response.getWriter().flush(); @@ -143,17 +143,17 @@ public class SaleImportServlet extends HttpServlet { private Map checkUploadData(Sheet sheet, String name, long version, Map infoMap) { int totalNum = sheet.getLastRowNum(); - System.out.println("上传文件共:"+totalNum+"个"); + System.out.println("涓婁紶鏂囦欢鍏�:"+totalNum+"涓�"); if(totalNum>1000){ totalNum = 1000; } - Integer totalLine = 0;//总行数 - Integer totalErrorLine = 0;//总错误行 - String message = "上传成功!"; + Integer totalLine = 0;//鎬昏鏁� + Integer totalErrorLine = 0;//鎬婚敊璇 + String message = "涓婁紶鎴愬姛!"; - //获取总列数 - int coloumNum=sheet.getRow(0).getPhysicalNumberOfCells();//获得总列数 + //鑾峰彇鎬诲垪鏁� + int coloumNum=sheet.getRow(0).getPhysicalNumberOfCells();//鑾峰緱鎬诲垪鏁� List> ret = new ArrayList>(); List> datas = new ArrayList>(); for(int rowj=1;rowj <= totalNum;rowj++){ @@ -166,13 +166,13 @@ public class SaleImportServlet extends HttpServlet { Map dataMap = new HashMap(); List errorList = new ArrayList(); - //字段验证 + //瀛楁楠岃瘉 for(int i=0;i=3 || dateArr[2].length()>=3))){ errorFlag = true; @@ -197,7 +197,7 @@ public class SaleImportServlet extends HttpServlet { } } - if(!isBlankRows){//不是空白行 + if(!isBlankRows){//涓嶆槸绌虹櫧琛� totalLine ++; if(errorFlag){ totalErrorLine++; @@ -210,15 +210,15 @@ public class SaleImportServlet extends HttpServlet { } - //保存上传文件的总体情况 + //淇濆瓨涓婁紶鏂囦欢鐨勬�讳綋鎯呭喌 if(totalErrorLine > 0){ - infoMap.put("error", "上传失败!"); + infoMap.put("error", "涓婁紶澶辫触!"); }else if(totalLine==0){ - ret.add(Arrays.asList("0", Arrays.asList("格式有误或无数据"))); - infoMap.put("error", "上传失败!"); + ret.add(Arrays.asList("0", Arrays.asList("鏍煎紡鏈夎鎴栨棤鏁版嵁"))); + infoMap.put("error", "涓婁紶澶辫触!"); }else{ infoMap.put("success", message); - //验证通过后,保存信息 + //楠岃瘉閫氳繃鍚�,淇濆瓨淇℃伅 saveSuccessToDB(datas, version); } @@ -298,46 +298,46 @@ public class SaleImportServlet extends HttpServlet { while(ite.hasNext()){ String key = (String) ite.next(); - if(key.equals("姓名")){ + if(key.equals("濮撳悕")){ saleLeads.setUname(map.get(key)); - }else if(key.equals("公司名称")){ + }else if(key.equals("鍏徃鍚嶇О")){ saleLeads.setCompany(map.get(key)); - }else if(key.equals("手机")){ + }else if(key.equals("鎵嬫満")){ saleLeads.setMobile(formatNumer(map.get(key))); - }else if(key.equals("座机")){ + }else if(key.equals("搴ф満")){ saleLeads.setTelPhone(formatNumer(map.get(key))); - }else if(key.equals("邮箱")){ + }else if(key.equals("閭")){ saleLeads.setEmail(map.get(key)); - }else if(key.equals("省份")){ + }else if(key.equals("鐪佷唤")){ saleLeads.setProvince(map.get(key)); - }else if(key.equals("城市")){ + }else if(key.equals("鍩庡競")){ saleLeads.setCity(map.get(key)); - }else if(key.equals("行业性质")){ + }else if(key.equals("琛屼笟鎬ц川")){ saleLeads.setIndustryNature(map.get(key)); - }else if(key.equals("其他行业性质")){ + }else if(key.equals("鍏朵粬琛屼笟鎬ц川")){ saleLeads.setOtherIndustryNature(map.get(key)); - }else if(key.equals("工作职能")){ + }else if(key.equals("宸ヤ綔鑱岃兘")){ saleLeads.setWork(map.get(key)); - }else if(key.equals("其他工作职能")){ + }else if(key.equals("鍏朵粬宸ヤ綔鑱岃兘")){ saleLeads.setOtherWork(map.get(key)); - }else if(key.equals("业务需求")){ + }else if(key.equals("涓氬姟闇�姹�")){ saleLeads.setBusiness(map.get(key)); - }else if(key.equals("其他业务需求")){ + }else if(key.equals("鍏朵粬涓氬姟闇�姹�")){ saleLeads.setOtherBusiness(map.get(key)); - }else if(key.equals("是否接受邮件")){ - saleLeads.setEmailStatus(map.get(key).equals("是")?true:false); + }else if(key.equals("鏄惁鎺ュ彈閭欢")){ + saleLeads.setEmailStatus(map.get(key).equals("鏄�")?true:false); } - else if(key.equals("是否意向客户")){ - saleLeads.setIntentionalCustomer(map.get(key).equals("是")?true:false); - }else if(key.equals("下载内容")) { + else if(key.equals("鏄惁鎰忓悜瀹㈡埛")){ + saleLeads.setIntentionalCustomer(map.get(key).equals("鏄�")?true:false); + }else if(key.equals("涓嬭浇鍐呭")) { saleLeads.setDownContent(map.get(key)); - }else if(key.equals("线索来源")){ + }else if(key.equals("绾跨储鏉ユ簮")){ saleLeads.setClueSource(map.get(key)); - } else if(key.equals("渠道类型")){ + } else if(key.equals("娓犻亾绫诲瀷")){ saleLeads.setChannelType(map.get(key)); - }else if(key.equals("备注")) { + }else if(key.equals("澶囨敞")) { saleLeads.setRemarks(map.get(key)); - }else if(key.equals("日期")) { + }else if(key.equals("鏃ユ湡")) { saleLeads.setCreateDate((DateUtil.parseDate(map.get(key), "yyyy/MM/dd"))); } diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/SelectDirective.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/SelectDirective.java index d43b0a59c..d0a49cb56 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/SelectDirective.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/SelectDirective.java @@ -18,7 +18,7 @@ import freemarker.template.TemplateDirectiveModel; import freemarker.template.TemplateException; import freemarker.template.TemplateModel; /** - * 自定义下拉框 + * 鑷畾涔変笅鎷夋 * @author Administrator * */ @@ -38,7 +38,7 @@ public class SelectDirective implements TemplateDirectiveModel { // multiple boolean multiple = Boolean.valueOf(MapUtils.getString(params, "multiple")); - // onEventName:默认有callback时为onChange + // onEventName锛氶粯璁ゆ湁callback鏃朵负onChange String onEventName = MapUtils.getString(params, "onEventName","onChange"); // callBack String callBack = MapUtils.getString(params, "callBack"); @@ -58,7 +58,7 @@ public class SelectDirective implements TemplateDirectiveModel { } //strList - String strList = MapUtils.getString(params, "strList");// strList : 文字:1,图片:2 + String strList = MapUtils.getString(params, "strList");// strList : 鏂囧瓧:1,鍥剧墖:2 if(StringUtils.isNotBlank(strList)){ if(StringUtils.isNotBlank(strList)){ templateContext.put("strList", Arrays.asList(strList.split(","))); diff --git a/projects/fangjia-common/src/main/java/com/fangjia/core/BaseConfiguration.java b/projects/fangjia-common/src/main/java/com/fangjia/core/BaseConfiguration.java index b012543f5..076f6c0aa 100644 --- a/projects/fangjia-common/src/main/java/com/fangjia/core/BaseConfiguration.java +++ b/projects/fangjia-common/src/main/java/com/fangjia/core/BaseConfiguration.java @@ -24,7 +24,7 @@ public class BaseConfiguration extends ConfigurationSupport { } /** - * 是否在开发环境中运行 + * 鏄惁鍦ㄥ紑鍙戠幆澧冧腑杩愯 * * @return */ @@ -33,7 +33,7 @@ public class BaseConfiguration extends ConfigurationSupport { } /** - * 是否在测试环境中运行 + * 鏄惁鍦ㄦ祴璇曠幆澧冧腑杩愯 * * @return */ @@ -42,7 +42,7 @@ public class BaseConfiguration extends ConfigurationSupport { } /** - * 是否在生产环境中运行 + * 鏄惁鍦ㄧ敓浜х幆澧冧腑杩愯 * * @return */ @@ -51,7 +51,7 @@ public class BaseConfiguration extends ConfigurationSupport { } /** - * 判断是否禁用cache,默认为true + * 鍒ゆ柇鏄惁绂佺敤cache锛岄粯璁や负true * * @return */ @@ -60,7 +60,7 @@ public class BaseConfiguration extends ConfigurationSupport { } /** - * 判断是否禁用本地缓存cache,默认为true + * 鍒ゆ柇鏄惁绂佺敤鏈湴缂撳瓨cache锛岄粯璁や负true * * @return */ diff --git a/projects/fangjia-common/src/main/java/com/fangjia/core/util/AnalyticsUtil.java b/projects/fangjia-common/src/main/java/com/fangjia/core/util/AnalyticsUtil.java index 66f92a8cf..64961614a 100644 --- a/projects/fangjia-common/src/main/java/com/fangjia/core/util/AnalyticsUtil.java +++ b/projects/fangjia-common/src/main/java/com/fangjia/core/util/AnalyticsUtil.java @@ -17,7 +17,7 @@ public class AnalyticsUtil { private static final Logger LOG = Logger.getLogger(AnalyticsUtil.class.getPackage().getName()); /** - * 增加跟踪信息数据 + * 澧炲姞璺熻釜淇℃伅鏁版嵁 * * @param key * @param value @@ -40,7 +40,7 @@ public class AnalyticsUtil { } /** - * 在通过Apache,Squid等反向代理软件时获得用户的真实IP. + * 鍦ㄩ�氳繃Apache,Squid绛夊弽鍚戜唬鐞嗚蒋浠舵椂鑾峰緱鐢ㄦ埛鐨勭湡瀹濱P. * * @param request * @return @@ -71,7 +71,7 @@ public class AnalyticsUtil { } /** - * 是否是需要被忽略的IP + * 鏄惁鏄渶瑕佽蹇界暐鐨処P * @param request * @return */ @@ -84,7 +84,7 @@ public class AnalyticsUtil { } /** - * 得到本地机器名 + * 寰楀埌鏈湴鏈哄櫒鍚� * * @return */ @@ -101,7 +101,7 @@ public class AnalyticsUtil { } /** - * 获取参数对应的Cookie值 + * 鑾峰彇鍙傛暟瀵瑰簲鐨凜ookie鍊� * * @param httpRequest * @param parameter @@ -144,7 +144,7 @@ public class AnalyticsUtil { } /** - * 得到编码过的URI 把URI从iso-8859-1转换成UTF-8 + * 寰楀埌缂栫爜杩囩殑URI 鎶奤RI浠巌so-8859-1杞崲鎴怳TF-8 * * @param uri * @return diff --git a/projects/fangjia-common/src/main/java/com/fangjia/core/util/AsyncThread.java b/projects/fangjia-common/src/main/java/com/fangjia/core/util/AsyncThread.java index 5a142b1b2..2994d1ab0 100644 --- a/projects/fangjia-common/src/main/java/com/fangjia/core/util/AsyncThread.java +++ b/projects/fangjia-common/src/main/java/com/fangjia/core/util/AsyncThread.java @@ -4,7 +4,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * 异步运行线程 + * 寮傛杩愯绾跨▼ * * @author xiaoyu * diff --git a/projects/fangjia-common/src/main/java/com/fangjia/core/util/BeanUtils.java b/projects/fangjia-common/src/main/java/com/fangjia/core/util/BeanUtils.java index 8f058fa1b..21eca16dd 100644 --- a/projects/fangjia-common/src/main/java/com/fangjia/core/util/BeanUtils.java +++ b/projects/fangjia-common/src/main/java/com/fangjia/core/util/BeanUtils.java @@ -14,9 +14,9 @@ public class BeanUtils { private final static Logger LOGGER = LoggerFactory.getLogger(BeanUtils.class); /** - * 复制 source 属性 到 target + * 澶嶅埗 source 灞炴�� 鍒� target * - * 数据类型 参数名 不同 忽略 + * 鏁版嵁绫诲瀷 鍙傛暟鍚� 涓嶅悓 蹇界暐 * * @param model * @return @@ -52,7 +52,7 @@ public class BeanUtils { } /** - * 复制JSON对象属性到target + * 澶嶅埗JSON瀵硅薄灞炴�у埌target * * @param source * @param target diff --git a/projects/fangjia-common/src/main/java/com/fangjia/core/util/BigNumber.java b/projects/fangjia-common/src/main/java/com/fangjia/core/util/BigNumber.java index df70822c5..c116bb732 100644 --- a/projects/fangjia-common/src/main/java/com/fangjia/core/util/BigNumber.java +++ b/projects/fangjia-common/src/main/java/com/fangjia/core/util/BigNumber.java @@ -4,19 +4,19 @@ import java.math.BigDecimal; import java.math.BigInteger; public class BigNumber { - //默认除法运算精度,即保留小数点多少位 + //榛樿闄ゆ硶杩愮畻绮惧害,鍗充繚鐣欏皬鏁扮偣澶氬皯浣� private static final int DEFAULT_DIV_SCALE = 10; - //这个类不能实例化 + //杩欎釜绫讳笉鑳藉疄渚嬪寲 private BigNumber() { } /** - * 提供精确的加法运算。 + * 鎻愪緵绮剧‘鐨勫姞娉曡繍绠椼�� * - * @param v1 被加数 - * @param v2 加数 - * @return 两个参数的和 + * @param v1 琚姞鏁� + * @param v2 鍔犳暟 + * @return 涓や釜鍙傛暟鐨勫拰 */ public static double add(double v1, double v2) { BigDecimal b1 = new BigDecimal(Double.toString(v1)); @@ -25,11 +25,11 @@ public class BigNumber { } /** - * 提供精确的减法运算。 + * 鎻愪緵绮剧‘鐨勫噺娉曡繍绠椼�� * - * @param v1 被减数 - * @param v2 减数 - * @return 两个参数的差 + * @param v1 琚噺鏁� + * @param v2 鍑忔暟 + * @return 涓や釜鍙傛暟鐨勫樊 */ public static double sub(double v1, double v2) { BigDecimal b1 = new BigDecimal(Double.toString(v1)); @@ -38,11 +38,11 @@ public class BigNumber { } /** - * 提供精确的乘法运算。 + * 鎻愪緵绮剧‘鐨勪箻娉曡繍绠椼�� * - * @param v1 被乘数 - * @param v2 乘数 - * @return 两个参数的积 + * @param v1 琚箻鏁� + * @param v2 涔樻暟 + * @return 涓や釜鍙傛暟鐨勭Н */ public static double mul(double v1, double v2) { BigDecimal b1 = new BigDecimal(Double.toString(v1)); @@ -51,29 +51,29 @@ public class BigNumber { } /** - * 提供(相对)精确的除法运算,当发生除不尽的情况时,精确到 - * 小数点以后多少位,以后的数字四舍五入。 + * 鎻愪緵锛堢浉瀵癸級绮剧‘鐨勯櫎娉曡繍绠楋紝褰撳彂鐢熼櫎涓嶅敖鐨勬儏鍐垫椂锛岀簿纭埌 + * 灏忔暟鐐逛互鍚庡灏戜綅锛屼互鍚庣殑鏁板瓧鍥涜垗浜斿叆銆� * - * @param v1 被除数 - * @param v2 除数 - * @return 两个参数的商 + * @param v1 琚櫎鏁� + * @param v2 闄ゆ暟 + * @return 涓や釜鍙傛暟鐨勫晢 */ public static double div(double v1, double v2) { return div(v1, v2, DEFAULT_DIV_SCALE); } /** - * 提供(相对)精确的除法运算。当发生除不尽的情况时,由scale参数指 - * 定精度,以后的数字四舍五入。 + * 鎻愪緵锛堢浉瀵癸級绮剧‘鐨勯櫎娉曡繍绠椼�傚綋鍙戠敓闄や笉灏界殑鎯呭喌鏃讹紝鐢眘cale鍙傛暟鎸� + * 瀹氱簿搴︼紝浠ュ悗鐨勬暟瀛楀洓鑸嶄簲鍏ャ�� * - * @param v1 被除数 - * @param v2 除数 - * @param scale 表示需要精确到小数点以后几位。 - * @return 两个参数的商 + * @param v1 琚櫎鏁� + * @param v2 闄ゆ暟 + * @param scale 琛ㄧず闇�瑕佺簿纭埌灏忔暟鐐逛互鍚庡嚑浣嶃�� + * @return 涓や釜鍙傛暟鐨勫晢 */ public static double div(double v1, double v2, int scale) { if (scale < 0) { - System.err.println("除法精度必须大于0!"); + System.err.println("闄ゆ硶绮惧害蹇呴』澶т簬0!"); return 0; } BigDecimal b1 = new BigDecimal(Double.toString(v1)); @@ -82,29 +82,29 @@ public class BigNumber { } /** - * 计算Factorial阶乘! + * 璁$畻Factorial闃朵箻锛� * - * @param n 任意大于等于0的int - * @return n!的值 + * @param n 浠绘剰澶т簬绛変簬0鐨刬nt + * @return n!鐨勫�� */ public static BigInteger getFactorial(int n) { if (n < 0) { - System.err.println("n必须大于等于0!"); + System.err.println("n蹇呴』澶т簬绛変簬0锛�"); return new BigInteger("-1"); } else if (n == 0) { return new BigInteger("0"); } - //将数组换成字符串后构造BigInteger + //灏嗘暟缁勬崲鎴愬瓧绗︿覆鍚庢瀯閫燘igInteger BigInteger result = new BigInteger("1"); for (; n > 0; n--) { - //将数字n转换成字符串后,再构造一个BigInteger对象,与现有结果做乘法 + //灏嗘暟瀛梟杞崲鎴愬瓧绗︿覆鍚庯紝鍐嶆瀯閫犱竴涓狟igInteger瀵硅薄锛屼笌鐜版湁缁撴灉鍋氫箻娉� result = result.multiply(new BigInteger(new Integer(n).toString())); } return result; } public static void main(String[] args) { - // 如果我们编译运行下面这个程序会看到什么? + // 濡傛灉鎴戜滑缂栬瘧杩愯涓嬮潰杩欎釜绋嬪簭浼氱湅鍒颁粈涔堬紵 System.out.println(0.05 + 0.01); System.out.println(1.0 - 0.42); System.out.println(4.015 * 100); @@ -113,22 +113,22 @@ public class BigNumber { // 0.5800000000000001 // 401.49999999999994 // 1.2329999999999999 - //计算阶乘,可以将n设得更大 + //璁$畻闃朵箻锛屽彲浠ュ皢n璁惧緱鏇村ぇ int n = 30; - System.out.println("计算n的阶乘" + n + "! = " + BigNumber.getFactorial(n)); - //用double构造BigDecimal + System.out.println("璁$畻n鐨勯樁涔�" + n + "! = " + BigNumber.getFactorial(n)); + //鐢╠ouble鏋勯�燘igDecimal BigDecimal bd1 = new BigDecimal(0.1); System.out.println("(bd1 = new BigDecimal(0.1)) = " + bd1.toString()); - //用String构造BigDecimal + //鐢⊿tring鏋勯�燘igDecimal BigDecimal bd2 = new BigDecimal("0.1"); System.out.println("(bd2 = new BigDecimal(\"0.1\")) = " + bd2.toString()); BigDecimal bd3 = new BigDecimal("0.10"); - //equals方法比较两个BigDecimal对象是否相等,相等返回true,不等返回false + //equals鏂规硶姣旇緝涓や釜BigDecimal瀵硅薄鏄惁鐩哥瓑锛岀浉绛夎繑鍥瀟rue锛屼笉绛夎繑鍥瀎alse System.out.println("bd2.equals(bd3) = " + bd2.equals(bd3));//false - //compareTo方法比较两个BigDecimal对象的大小,相等返回0,小于返回-1,大于返回1。 + //compareTo鏂规硶姣旇緝涓や釜BigDecimal瀵硅薄鐨勫ぇ灏忥紝鐩哥瓑杩斿洖0锛屽皬浜庤繑鍥�-1锛屽ぇ浜庤繑鍥�1銆� System.out.println("bd2.compareTo(bd3) = " + bd2.compareTo(bd3));//0 - //进行精确计算 + //杩涜绮剧‘璁$畻 System.out.println("0.05 + 0.01 = " + BigNumber.add(0.05, 0.01)); System.out.println("1.0 - 0.42 = " + BigNumber.sub(1.0, 0.42)); System.out.println("4.015 * 100 =" + BigNumber.mul(4.015, 100)); diff --git a/projects/fangjia-common/src/main/java/com/fangjia/core/util/CurrencyConverter.java b/projects/fangjia-common/src/main/java/com/fangjia/core/util/CurrencyConverter.java index d4314ba66..bd74f95f0 100644 --- a/projects/fangjia-common/src/main/java/com/fangjia/core/util/CurrencyConverter.java +++ b/projects/fangjia-common/src/main/java/com/fangjia/core/util/CurrencyConverter.java @@ -4,20 +4,20 @@ import java.text.DecimalFormat; /** * - * 货币转换 + * 璐у竵杞崲 * */ public class CurrencyConverter { - /** 大写数字 */ - private static final String[] NUMBERS = { "零", "壹", "贰", "叁", "肆", "伍", "陆", "柒", "捌", "玖" }; - /** 整数部分的单位 */ - private static final String[] IUNIT = { "元", "拾", "佰", "仟", "万", "拾", "佰", "仟", "亿", "拾", "佰", "仟", "万", "拾", "佰", "仟" }; - /** 小数部分的单位 */ - private static final String[] DUNIT = { "角", "分", "厘" }; + /** 澶у啓鏁板瓧 */ + private static final String[] NUMBERS = { "闆�", "澹�", "璐�", "鍙�", "鑲�", "浼�", "闄�", "鏌�", "鎹�", "鐜�" }; + /** 鏁存暟閮ㄥ垎鐨勫崟浣� */ + private static final String[] IUNIT = { "鍏�", "鎷�", "浣�", "浠�", "涓�", "鎷�", "浣�", "浠�", "浜�", "鎷�", "浣�", "浠�", "涓�", "鎷�", "浣�", "浠�" }; + /** 灏忔暟閮ㄥ垎鐨勫崟浣� */ + private static final String[] DUNIT = { "瑙�", "鍒�", "鍘�" }; /** - * 得到大写金额。 + * 寰楀埌澶у啓閲戦銆� */ public static String toChinese(String str) { str = str.replaceAll(",", ""); @@ -40,18 +40,18 @@ public class CurrencyConverter { } } if (integerStr.length() > IUNIT.length) { - System.out.println(str + ":超出处理能力"); + System.out.println(str + ":瓒呭嚭澶勭悊鑳藉姏"); return str; } - int[] integers = toArray(integerStr);// 整数部分数字 - boolean isMust5 = isMust5(integerStr);// 设置万单位 - int[] decimals = toArray(decimalStr);// 小数部分数字 + int[] integers = toArray(integerStr);// 鏁存暟閮ㄥ垎鏁板瓧 + boolean isMust5 = isMust5(integerStr);// 璁剧疆涓囧崟浣� + int[] decimals = toArray(decimalStr);// 灏忔暟閮ㄥ垎鏁板瓧 return getChineseInteger(integers, isMust5) + getChineseDecimal(decimals); } /** - * 整数部分和小数部分转换为数组,从高位至低位 + * 鏁存暟閮ㄥ垎鍜屽皬鏁伴儴鍒嗚浆鎹负鏁扮粍锛屼粠楂樹綅鑷充綆浣� */ private static int[] toArray(String number) { int[] array = new int[number.length()]; @@ -62,25 +62,25 @@ public class CurrencyConverter { } /** - * 得到中文金额的整数部分。 + * 寰楀埌涓枃閲戦鐨勬暣鏁伴儴鍒嗐�� */ private static String getChineseInteger(int[] integers, boolean isMust5) { StringBuffer chineseInteger = new StringBuffer(""); int length = integers.length; for (int i = 0; i < length; i++) { - // 0出现在关键位置:1234(万)5678(亿)9012(万)3456(元) - // 特殊情况:10(拾元、壹拾元、壹拾万元、拾万元) + // 0鍑虹幇鍦ㄥ叧閿綅缃細1234(涓�)5678(浜�)9012(涓�)3456(鍏�) + // 鐗规畩鎯呭喌锛�10(鎷惧厓銆佸9鎷惧厓銆佸9鎷句竾鍏冦�佹嬀涓囧厓) String key = ""; if (integers[i] == 0) { - if ((length - i) == 13)// 万(亿)(必填) + if ((length - i) == 13)// 涓�(浜�)(蹇呭~) key = IUNIT[4]; - else if ((length - i) == 9)// 亿(必填) + else if ((length - i) == 9)// 浜�(蹇呭~) key = IUNIT[8]; - else if ((length - i) == 5 && isMust5)// 万(不必填) + else if ((length - i) == 5 && isMust5)// 涓�(涓嶅繀濉�) key = IUNIT[4]; - else if ((length - i) == 1)// 元(必填) + else if ((length - i) == 1)// 鍏�(蹇呭~) key = IUNIT[0]; - // 0遇非0时补零,不包含最后一位 + // 0閬囬潪0鏃惰ˉ闆讹紝涓嶅寘鍚渶鍚庝竴浣� if ((length - i) > 1 && integers[i + 1] != 0) key += NUMBERS[0]; } @@ -90,12 +90,12 @@ public class CurrencyConverter { } /** - * 得到中文金额的小数部分。 + * 寰楀埌涓枃閲戦鐨勫皬鏁伴儴鍒嗐�� */ private static String getChineseDecimal(int[] decimals) { StringBuffer chineseDecimal = new StringBuffer(""); for (int i = 0; i < decimals.length; i++) { - // 舍去3位小数之后的 + // 鑸嶅幓3浣嶅皬鏁颁箣鍚庣殑 if (i == 3) break; chineseDecimal.append(decimals[i] == 0 ? "" : (NUMBERS[decimals[i]] + DUNIT[i])); @@ -104,14 +104,14 @@ public class CurrencyConverter { } /** - * 判断第5位数字的单位"万"是否应加。 + * 鍒ゆ柇绗�5浣嶆暟瀛楃殑鍗曚綅"涓�"鏄惁搴斿姞銆� */ private static boolean isMust5(String integerStr) { int length = integerStr.length(); if (length > 4) { String subInteger = ""; if (length > 8) { - // 取得从低位数,第5到第8位的字串 + // 鍙栧緱浠庝綆浣嶆暟锛岀5鍒扮8浣嶇殑瀛椾覆 subInteger = integerStr.substring(length - 8, length - 4); } else { subInteger = integerStr.substring(0, length - 4); @@ -123,7 +123,7 @@ public class CurrencyConverter { } /** - * 格式化数字为千分位显示 + * 鏍煎紡鍖栨暟瀛椾负鍗冨垎浣嶆樉绀� * * @return */ diff --git a/projects/fangjia-common/src/main/java/com/fangjia/core/util/DataUtil.java b/projects/fangjia-common/src/main/java/com/fangjia/core/util/DataUtil.java index a38ff7f6b..9e5900fc8 100644 --- a/projects/fangjia-common/src/main/java/com/fangjia/core/util/DataUtil.java +++ b/projects/fangjia-common/src/main/java/com/fangjia/core/util/DataUtil.java @@ -45,18 +45,18 @@ import org.slf4j.LoggerFactory; import org.sothis.core.util.CollectionUtils; public class DataUtil { - public static Pattern cellPhonePattern = Pattern.compile("^(1[23456789][0-9]{1})(-)?([0-9]{8})$");//判断是否手机号码 + public static Pattern cellPhonePattern = Pattern.compile("^(1[23456789][0-9]{1})(-)?([0-9]{8})$");//鍒ゆ柇鏄惁鎵嬫満鍙风爜 private final static Logger LOGGER = LoggerFactory.getLogger(DataUtil.class); - public static Pattern LINK = Pattern.compile("[a-zA-z]+://[a-zA-Z0-9./%?=&-]*"); // 网址 + public static Pattern LINK = Pattern.compile("[a-zA-z]+://[a-zA-Z0-9./%?=&-]*"); // 缃戝潃 // public static Pattern MOBILE_344 = // Pattern.compile("(\\d{3}-\\d{4}-\\d{4})"); - public static Pattern NUM_SERIES = Pattern.compile("(?:\\d[\\s-]*){7}");// ;连续数字 - public static Pattern URL_SUFFIX = Pattern.compile("[a-zA-Z0-9.]*\\.((?:com)|(?:COM)|(?:cn)|(?:CN)|(?:net)|(?:NET))"); // 后缀 - public static Pattern IMG = Pattern.compile("]*?>"); // 图片链接地址 - public static Pattern OUT_TAG = Pattern.compile("]*>"); // 外部标签 - public static final Pattern WORDS = Pattern.compile(".*[a-zA-Z].*");//是否包含字母 + public static Pattern NUM_SERIES = Pattern.compile("(?:\\d[\\s-]*){7}");// ;杩炵画鏁板瓧 + public static Pattern URL_SUFFIX = Pattern.compile("[a-zA-Z0-9.]*\\.((?:com)|(?:COM)|(?:cn)|(?:CN)|(?:net)|(?:NET))"); // 鍚庣紑 + public static Pattern IMG = Pattern.compile("]*?>"); // 鍥剧墖閾炬帴鍦板潃 + public static Pattern OUT_TAG = Pattern.compile("]*>"); // 澶栭儴鏍囩 + public static final Pattern WORDS = Pattern.compile(".*[a-zA-Z].*");//鏄惁鍖呭惈瀛楁瘝 public static final Pattern NO_WORDS = Pattern.compile(".*[^a-zA-Z].*"); - public static String SPACIAL_PATTERN = "[`~!@#$%^&*()+=|{}':;',\\[\\].<>/?~!@#¥%……&*()——+|{}【】‘;:”“’。,、?]"; + public static String SPACIAL_PATTERN = "[`~!@#$%^&*()+=|{}':;',\\[\\].<>/?~锛丂#锟�%鈥︹��&*锛堬級鈥斺��+|{}銆愩�戔�橈紱锛氣�濃�溾�欍�傦紝銆侊紵]"; public static final HanyuPinyinOutputFormat pinyinFormat = new HanyuPinyinOutputFormat(); public static final Pattern PRICE_PATT = Pattern.compile("(\\d+)"); public static String replaceAll(String original, String with, Pattern... pattern) { @@ -71,11 +71,11 @@ public class DataUtil { } /** - * 清理指定字符串中的特殊字符 + * 娓呯悊鎸囧畾瀛楃涓蹭腑鐨勭壒娈婂瓧绗� * - * 目前清理特殊字符有:手机、电话、QQ、邮箱、MSN + * 鐩墠娓呯悊鐗规畩瀛楃鏈夛細鎵嬫満銆佺數璇濄�丵Q銆侀偖绠便�丮SN * - * 例: 联系电话:13569335693 清理后: 联系电话:******5693 + * 渚嬶細 鑱旂郴鐢佃瘽锛�13569335693 娓呯悊鍚庯細 鑱旂郴鐢佃瘽:******5693 * * @author liupei */ @@ -101,18 +101,18 @@ public class DataUtil { } /** - * 截取字符串 + * 鎴彇瀛楃涓� * - * 若原始字符串的长度小于最大截取长度,则直接返回原始字符串 + * 鑻ュ師濮嬪瓧绗︿覆鐨勯暱搴﹀皬浜庢渶澶ф埅鍙栭暱搴︼紝鍒欑洿鎺ヨ繑鍥炲師濮嬪瓧绗︿覆 * * @param targetString - * 原始字符串 + * 鍘熷瀛楃涓� * @param targetLength - * 最大长度 + * 鏈�澶ч暱搴� * @param tailLength - * 尾巴长度 + * 灏惧反闀垮害 * @param tailString - * 结尾字符串 + * 缁撳熬瀛楃涓� * @return */ public static String cutString(String targetString, int targetLength, int tailLength, String tailString) { @@ -127,12 +127,12 @@ public class DataUtil { } /** - * 按字节截取字符串 + * 鎸夊瓧鑺傛埅鍙栧瓧绗︿覆 * * @param targetString - * 原始字符串 + * 鍘熷瀛楃涓� * @param length - * 截取长度 + * 鎴彇闀垮害 * @return * @throws UnsupportedEncodingException */ @@ -145,14 +145,14 @@ public class DataUtil { if (bytes.length <= length) { return targetString; } else { - int n = 0; // 表示当前的字节数 - int i = 2; // 要截取的字节数,从第3个字节开始 + int n = 0; // 琛ㄧず褰撳墠鐨勫瓧鑺傛暟 + int i = 2; // 瑕佹埅鍙栫殑瀛楄妭鏁帮紝浠庣3涓瓧鑺傚紑濮� for (; i < bytes.length && n < length; i++) { - // 奇数位置,如3、5、7等,为UCS2编码中两个字节的第二个字节 + // 濂囨暟浣嶇疆锛屽3銆�5銆�7绛夛紝涓篣CS2缂栫爜涓袱涓瓧鑺傜殑绗簩涓瓧鑺� if (i % 2 == 1) { - n++; // 在UCS2第二个字节时n加1 + n++; // 鍦║CS2绗簩涓瓧鑺傛椂n鍔�1 } else { - // 当UCS2编码的第一个字节不等于0时,该UCS2字符为汉字,一个汉字算两个字节 + // 褰揢CS2缂栫爜鐨勭涓�涓瓧鑺備笉绛変簬0鏃讹紝璇CS2瀛楃涓烘眽瀛楋紝涓�涓眽瀛楃畻涓や釜瀛楄妭 if (bytes[i] != 0) { n++; } @@ -160,12 +160,12 @@ public class DataUtil { } if (i % 2 == 1) { - // 如果i为奇数时,处理成偶数 + // 濡傛灉i涓哄鏁版椂锛屽鐞嗘垚鍋舵暟 if (bytes[i - 1] != 0) { - // 该UCS2字符是汉字时,去掉这个截一半的汉字 + // 璇CS2瀛楃鏄眽瀛楁椂锛屽幓鎺夎繖涓埅涓�鍗婄殑姹夊瓧 i = i - 1; } else { - // 该UCS2字符是字母或数字,则保留该字符 + // 璇CS2瀛楃鏄瓧姣嶆垨鏁板瓧锛屽垯淇濈暀璇ュ瓧绗� i = i + 1; } } @@ -175,9 +175,9 @@ public class DataUtil { } /** - * 格式化均价 + * 鏍煎紡鍖栧潎浠� * - * 将个位和十位直接变为0 + * 灏嗕釜浣嶅拰鍗佷綅鐩存帴鍙樹负0 * * @param avgPirce * @return @@ -191,7 +191,7 @@ public class DataUtil { } /** - * 全角转半角 + * 鍏ㄨ杞崐瑙� * * @param input * @return @@ -212,7 +212,7 @@ public class DataUtil { } /** - * 判断文本中的链接是否是fangjia,如果不是就删除 + * 鍒ゆ柇鏂囨湰涓殑閾炬帴鏄惁鏄痜angjia,濡傛灉涓嶆槸灏卞垹闄� * * @param htmlDes * @return @@ -271,7 +271,7 @@ public class DataUtil { } /** - * 加密图片url + * 鍔犲瘑鍥剧墖url * * @param u * @param s @@ -290,7 +290,7 @@ public class DataUtil { } /** - * 把字符串以16进制数值显示出来 + * 鎶婂瓧绗︿覆浠�16杩涘埗鏁板�兼樉绀哄嚭鏉� * * @param data * @return @@ -305,7 +305,7 @@ public class DataUtil { return ret.toString(); } - // 字节码转换成16进制字符串 + // 瀛楄妭鐮佽浆鎹㈡垚16杩涘埗瀛楃涓� public static String byte2hex(byte bytes[]) { StringBuffer retString = new StringBuffer(); for (int i = 0; i < bytes.length; ++i) { @@ -314,7 +314,7 @@ public class DataUtil { return retString.toString(); } - // 将16进制字符串转换成字节码 + // 灏�16杩涘埗瀛楃涓茶浆鎹㈡垚瀛楄妭鐮� public static byte[] hex2byte(String hex) { byte[] bts = new byte[hex.length() / 2]; for (int i = 0; i < bts.length; i++) { @@ -324,7 +324,7 @@ public class DataUtil { } /** - * 判断是否是标准的手机号码 + * 鍒ゆ柇鏄惁鏄爣鍑嗙殑鎵嬫満鍙风爜 * * @param phoneNum * @return @@ -386,7 +386,7 @@ public class DataUtil { } /** - * 去掉str中的html标记 + * 鍘绘帀str涓殑html鏍囪 * * @param str * @return @@ -400,10 +400,10 @@ public class DataUtil { } /** - * 去除特殊字符串 + * 鍘婚櫎鐗规畩瀛楃涓� * *

- * 特殊字符串定义:html,&*;,\[a-z] + * 鐗规畩瀛楃涓插畾涔�:html,&*;,\[a-z] *

* * @param str @@ -421,7 +421,7 @@ public class DataUtil { public static Pattern nameTags = Pattern.compile("]*)(\\s|$|>)"); /** - * 去除html中不完整的标签 + * 鍘婚櫎html涓笉瀹屾暣鐨勬爣绛� * * @param html * @return @@ -503,10 +503,10 @@ public class DataUtil { } /** - * 四舍五入 + * 鍥涜垗浜斿叆 * * @param dSource - * 浮点数 + * 娴偣鏁� * @return */ public static int getRound(double dSource) { @@ -534,7 +534,7 @@ public class DataUtil { return decimalFormat.parse(decimalFormat.format(n)).doubleValue(); } - public static List SENSITIVE_WORDS = Arrays.asList("上门服务", "小姐", "冰毒", "手枪", "疏通", "掏粪", "污水", "办证", "公务员", "汽狗"); + public static List SENSITIVE_WORDS = Arrays.asList("涓婇棬鏈嶅姟", "灏忓", "鍐版瘨", "鎵嬫灙", "鐤忛��", "鎺忕勃", "姹℃按", "鍔炶瘉", "鍏姟鍛�", "姹界嫍"); public static List getSensitiveWords() { return SENSITIVE_WORDS; @@ -591,7 +591,7 @@ public class DataUtil { } /** - * 将集合反向排序 + * 灏嗛泦鍚堝弽鍚戞帓搴� * * @param * @param col @@ -609,12 +609,12 @@ public class DataUtil { } /** - * 根据Value对Map进行排序 + * 鏍规嵁Value瀵筂ap杩涜鎺掑簭 * * @param targetMap+ * key:Object value:Number * @param asc - * true:升序 false:降序 + * true:鍗囧簭 false:闄嶅簭 * @return */ @SuppressWarnings({ "unchecked", "rawtypes" }) @@ -672,7 +672,7 @@ public class DataUtil { } /** - * 获取url的主域名 + * 鑾峰彇url鐨勪富鍩熷悕 * * @param url * @return @@ -693,34 +693,34 @@ public class DataUtil { switch (Integer.parseInt(ca)) { case 0: - ret.append("零"); + ret.append("闆�"); break; case 1: - ret.append("壹"); + ret.append("澹�"); break; case 2: - ret.append("贰"); + ret.append("璐�"); break; case 3: - ret.append("叁"); + ret.append("鍙�"); break; case 4: - ret.append("肆"); + ret.append("鑲�"); break; case 5: - ret.append("伍"); + ret.append("浼�"); break; case 6: - ret.append("陆"); + ret.append("闄�"); break; case 7: - ret.append("柒"); + ret.append("鏌�"); break; case 8: - ret.append("捌"); + ret.append("鎹�"); break; case 9: - ret.append("玖"); + ret.append("鐜�"); break; default: ret.append(ca); @@ -747,31 +747,31 @@ public class DataUtil { ret.append("0"); break; case 1: - ret.append("一"); + ret.append("涓�"); break; case 2: - ret.append("二"); + ret.append("浜�"); break; case 3: - ret.append("三"); + ret.append("涓�"); break; case 4: - ret.append("四"); + ret.append("鍥�"); break; case 5: - ret.append("五"); + ret.append("浜�"); break; case 6: - ret.append("六"); + ret.append("鍏�"); break; case 7: - ret.append("七"); + ret.append("涓�"); break; case 8: - ret.append("八"); + ret.append("鍏�"); break; case 9: - ret.append("九"); + ret.append("涔�"); break; default: ret.append(ca); @@ -789,25 +789,25 @@ public class DataUtil { for (int i = 0; i < charArray.length; i++) { String ca = String.valueOf(charArray[i]); - if (ca.equals("零")) { + if (ca.equals("闆�")) { ret.append("0"); - } else if (ca.equals("壹")) { + } else if (ca.equals("澹�")) { ret.append("1"); - } else if (ca.equals("贰")) { + } else if (ca.equals("璐�")) { ret.append("2"); - } else if (ca.equals("叁")) { + } else if (ca.equals("鍙�")) { ret.append("3"); - } else if (ca.equals("肆")) { + } else if (ca.equals("鑲�")) { ret.append("4"); - } else if (ca.equals("伍")) { + } else if (ca.equals("浼�")) { ret.append("5"); - } else if (ca.equals("陆")) { + } else if (ca.equals("闄�")) { ret.append("6"); - } else if (ca.equals("柒")) { + } else if (ca.equals("鏌�")) { ret.append("7"); - } else if (ca.equals("捌")) { + } else if (ca.equals("鎹�")) { ret.append("8"); - } else if (ca.equals("玖")) { + } else if (ca.equals("鐜�")) { ret.append("9"); } else { ret.append(ca); @@ -823,27 +823,27 @@ public class DataUtil { for (int i = 0; i < charArray.length; i++) { String ca = String.valueOf(charArray[i]); - if (ca.equals("零")) { + if (ca.equals("闆�")) { ret.append("0"); - } else if (ca.equals("一")) { + } else if (ca.equals("涓�")) { ret.append("1"); - } else if (ca.equals("二")) { + } else if (ca.equals("浜�")) { ret.append("2"); - } else if (ca.equals("三")) { + } else if (ca.equals("涓�")) { ret.append("3"); - } else if (ca.equals("四")) { + } else if (ca.equals("鍥�")) { ret.append("4"); - } else if (ca.equals("五")) { + } else if (ca.equals("浜�")) { ret.append("5"); - } else if (ca.equals("六")) { + } else if (ca.equals("鍏�")) { ret.append("6"); - } else if (ca.equals("七")) { + } else if (ca.equals("涓�")) { ret.append("7"); - } else if (ca.equals("八")) { + } else if (ca.equals("鍏�")) { ret.append("8"); - } else if (ca.equals("九")) { + } else if (ca.equals("涔�")) { ret.append("9"); - } else if (ca.equals("两")) { + } else if (ca.equals("涓�")) { ret.append("2"); } else { ret.append(ca); @@ -859,27 +859,27 @@ public class DataUtil { StringBuilder ret = new StringBuilder(); for (int i = 0; i < charArray.length; i++) { String ca = String.valueOf(charArray[i]); - if (ca.equals("零") || ca.equals("0")) { + if (ca.equals("闆�") || ca.equals("0")) { ret.append("0"); - } else if (ca.equals("一")) { + } else if (ca.equals("涓�")) { ret.append("1"); - } else if (ca.equals("二")) { + } else if (ca.equals("浜�")) { ret.append("2"); - } else if (ca.equals("三")) { + } else if (ca.equals("涓�")) { ret.append("3"); - } else if (ca.equals("四")) { + } else if (ca.equals("鍥�")) { ret.append("4"); - } else if (ca.equals("五")) { + } else if (ca.equals("浜�")) { ret.append("5"); - } else if (ca.equals("六")) { + } else if (ca.equals("鍏�")) { ret.append("6"); - } else if (ca.equals("七")) { + } else if (ca.equals("涓�")) { ret.append("7"); - } else if (ca.equals("八")) { + } else if (ca.equals("鍏�")) { ret.append("8"); - } else if (ca.equals("九")) { + } else if (ca.equals("涔�")) { ret.append("9"); - } else if (ca.equals("两")) { + } else if (ca.equals("涓�")) { ret.append("2"); } else { ret.append(ca); @@ -938,7 +938,7 @@ public class DataUtil { } /** - * 是否包含字母 + * 鏄惁鍖呭惈瀛楁瘝 * * @param str * @return @@ -953,7 +953,7 @@ public class DataUtil { } /** - * 是否包含非字母 + * 鏄惁鍖呭惈闈炲瓧姣� * * @param str * @return @@ -967,7 +967,7 @@ public class DataUtil { } /** - * 避免solr中的特殊符号 + * 閬垮厤solr涓殑鐗规畩绗﹀彿 * * @param keyword * @return @@ -978,7 +978,7 @@ public class DataUtil { } keyword = encoding(keyword); keyword = keyword.replace("-", ""); - keyword = keyword.replace("-", ""); + keyword = keyword.replace("锛�", ""); keyword = keyword.replace("\"", ""); keyword = keyword.replaceAll(SPACIAL_PATTERN, ""); keyword = keyword.replace("\\", " "); @@ -1010,7 +1010,7 @@ public class DataUtil { } /** - * 汉语全拼 + * 姹夎鍏ㄦ嫾 * * @param keyword * @param separator @@ -1036,7 +1036,7 @@ public class DataUtil { } /** - * 汉语简拼 + * 姹夎绠�鎷� * * @param keyword * @return @@ -1058,20 +1058,20 @@ public class DataUtil { } /** - * 格式化板块,将"板块"字符串去掉 + * 鏍煎紡鍖栨澘鍧�,灏�"鏉垮潡"瀛楃涓插幓鎺� * * @param block * @return */ public static String formatBlock(String block) { if (StringUtils.isNotBlank(block)) { - return block.replace("板块", ""); + return block.replace("鏉垮潡", ""); } return StringUtils.EMPTY; } /** - * 获取字符串中汉字部分 + * 鑾峰彇瀛楃涓蹭腑姹夊瓧閮ㄥ垎 * * @param s * @return @@ -1104,12 +1104,12 @@ public class DataUtil { } /** - * 检查经纬度是否合法 + * 妫�鏌ョ粡绾害鏄惁鍚堟硶 * * @param lat - * 纬度为正负900000000000 + * 绾害涓烘璐�900000000000 * @param lng - * 经度为正负1800000000000 + * 缁忓害涓烘璐�1800000000000 * @return */ public static boolean verifyLatLng(Long lat, Long lng) { @@ -1121,12 +1121,12 @@ public class DataUtil { } /** - * 检查经纬度是否合法 + * 妫�鏌ョ粡绾害鏄惁鍚堟硶 * * @param lat - * 纬度为正负90 + * 绾害涓烘璐�90 * @param lng - * 经度为正负180 + * 缁忓害涓烘璐�180 * @return */ public static boolean verifyLatLng(Double lat, Double lng) { @@ -1148,7 +1148,7 @@ public class DataUtil { } /** - * 压缩 + * 鍘嬬缉 * * @param content * @return @@ -1175,7 +1175,7 @@ public class DataUtil { } /** - * 解压 + * 瑙e帇 * * @param content * @return @@ -1245,7 +1245,7 @@ public class DataUtil { } public static String trim(String str) { - return null == str ? null : str.replaceAll("^[\\s ]*|[\\s ]*$", ""); + return null == str ? null : str.replaceAll("^[\\s銆�]*|[\\s ]*$", ""); } public static boolean isNumeric(String str) { @@ -1268,7 +1268,7 @@ public class DataUtil { public static String stringFilter(String str) { - String regEx = "[`~!@#$%^&*()+=|{}':;',//[//].<>/?~!@#¥%……&*()——+|{}【】‘;:”“’。,、?]"; + String regEx = "[`~!@#$%^&*()+=|{}':;',//[//].<>/?~锛丂#锟�%鈥︹��&*锛堬級鈥斺��+|{}銆愩�戔�橈紱锛氣�濃�溾�欍�傦紝銆侊紵]"; Pattern p = Pattern.compile(regEx); Matcher m = p.matcher(str); return m.replaceAll("").trim(); diff --git a/projects/fangjia-common/src/main/java/com/fangjia/core/util/DateUtil.java b/projects/fangjia-common/src/main/java/com/fangjia/core/util/DateUtil.java index 6b538987e..289a73d3b 100644 --- a/projects/fangjia-common/src/main/java/com/fangjia/core/util/DateUtil.java +++ b/projects/fangjia-common/src/main/java/com/fangjia/core/util/DateUtil.java @@ -64,7 +64,7 @@ public class DateUtil { } - /*获得2个日期间的日期,包括endDate*/ + /*鑾峰緱2涓棩鏈熼棿鐨勬棩鏈燂紝鍖呮嫭endDate*/ public static List getInDateBetweenDates(Date startDate, Date endDate) { if (startDate.after(endDate)) { return Collections.EMPTY_LIST; @@ -80,7 +80,7 @@ public class DateUtil { } /** - * 获取去年同期的一个星期日 + * 鑾峰彇鍘诲勾鍚屾湡鐨勪竴涓槦鏈熸棩 * * @return */ @@ -91,7 +91,7 @@ public class DateUtil { } /** - * 获取半年前同期的一个星期日 + * 鑾峰彇鍗婂勾鍓嶅悓鏈熺殑涓�涓槦鏈熸棩 * * @return */ @@ -102,7 +102,7 @@ public class DateUtil { } /** - * 去年同月的第一天 + * 鍘诲勾鍚屾湀鐨勭涓�澶� */ public static Date getThisMonthInLastYear(Date date) { date = getDateOfLastMonth(null == date ? new Date() : date, -12); @@ -111,7 +111,7 @@ public class DateUtil { } /** - * 上个月第一天 + * 涓婁釜鏈堢涓�澶� */ public static Date getFirstDayOfLastMonth(Date date) { date = getDateOfLastMonth(date, -1); @@ -147,7 +147,7 @@ public class DateUtil { } /** - * 根据日历得到那一天的星期天是哪天 注意:输入的calendar最后的值同返回值一样 + * 鏍规嵁鏃ュ巻寰楀埌閭d竴澶╃殑鏄熸湡澶╂槸鍝ぉ 娉ㄦ剰锛氳緭鍏ョ殑calendar鏈�鍚庣殑鍊煎悓杩斿洖鍊间竴鏍� * * @param calendar * @return @@ -306,7 +306,7 @@ public class DateUtil { } /** - * 把date truncate到日期为止,去掉时分秒 + * 鎶奷ate truncate鍒版棩鏈熶负姝�,鍘绘帀鏃跺垎绉� * * @param date * @return @@ -316,7 +316,7 @@ public class DateUtil { } /** - * 得到这一天的范围.比如如果输入的是2007-12-12 12:36:40,则返回的是2007-12-12 00:00:00和2007-12-13 + * 寰楀埌杩欎竴澶╃殑鑼冨洿.姣斿濡傛灉杈撳叆鐨勬槸2007-12-12 12:36:40,鍒欒繑鍥炵殑鏄�2007-12-12 00:00:00鍜�2007-12-13 * 0:0:0 * * @return @@ -329,7 +329,7 @@ public class DateUtil { } /** - * 转化日期成yyyy-mm-dd的String格式 + * 杞寲鏃ユ湡鎴恲yyy-mm-dd鐨凷tring鏍煎紡 * * @param date * @return @@ -361,7 +361,7 @@ public class DateUtil { } /** - * 转化日期成yyyy-mm-dd hh:mm:ss的String格式 + * 杞寲鏃ユ湡鎴恲yyy-mm-dd hh:mm:ss鐨凷tring鏍煎紡 * * @param date * @return @@ -409,7 +409,7 @@ public class DateUtil { } /** - * 转化日期成yyyymmddhhmmss的String格式 + * 杞寲鏃ユ湡鎴恲yyymmddhhmmss鐨凷tring鏍煎紡 * * @param date * @return @@ -428,7 +428,7 @@ public class DateUtil { } /** - * 转化日期成yyyymmdd的String格式 + * 杞寲鏃ユ湡鎴恲yyymmdd鐨凷tring鏍煎紡 * * @param date * @return @@ -447,7 +447,7 @@ public class DateUtil { } /** - * 转化日期HHmmss的String格式 + * 杞寲鏃ユ湡HHmmss鐨凷tring鏍煎紡 * * @param date * @return @@ -466,7 +466,7 @@ public class DateUtil { } /** - * 转化日期成yymmdd的String格式 + * 杞寲鏃ユ湡鎴恲ymmdd鐨凷tring鏍煎紡 * * @param date * @return @@ -485,7 +485,7 @@ public class DateUtil { } /** - * 转化日期成yy-mm-dd的String格式 + * 杞寲鏃ユ湡鎴恲y-mm-dd鐨凷tring鏍煎紡 * * @param date * @return @@ -504,7 +504,7 @@ public class DateUtil { } /*************************************************************************** - * 返回之前几个月或之后几个月的今天 + * 杩斿洖涔嬪墠鍑犱釜鏈堟垨涔嬪悗鍑犱釜鏈堢殑浠婂ぉ * * @param date * @param num @@ -528,8 +528,8 @@ public class DateUtil { } /*************************************************************************** - * 根据传入的日期以及数字获得当前日期之前或者之后月份的起始日期 如传入2007-06-21,6返回 日期为2007-12-1的date - * 如传入2007-06-21,-6返回 日期为2006-12-1的date + * 鏍规嵁浼犲叆鐨勬棩鏈熶互鍙婃暟瀛楄幏寰楀綋鍓嶆棩鏈熶箣鍓嶆垨鑰呬箣鍚庢湀浠界殑璧峰鏃ユ湡 濡備紶鍏�2007-06-21锛�6杩斿洖 鏃ユ湡涓�2007-12-1鐨刣ate + * 濡備紶鍏�2007-06-21锛�-6杩斿洖 鏃ユ湡涓�2006-12-1鐨刣ate * * @param date * @param num @@ -585,8 +585,8 @@ public class DateUtil { } /** - * 获取给定日期date向后推算num天的日期列表
- * 注意:此时包含传入的date, 否则可设置第三个参数为false + * 鑾峰彇缁欏畾鏃ユ湡date鍚戝悗鎺ㄧ畻num澶╃殑鏃ユ湡鍒楄〃
+ * 娉ㄦ剰锛氭鏃跺寘鍚紶鍏ョ殑date, 鍚﹀垯鍙缃涓変釜鍙傛暟涓篺alse * * @param date * @param num @@ -597,12 +597,12 @@ public class DateUtil { } /** - * 获取给定日期date向后推算num天的日期列表 + * 鑾峰彇缁欏畾鏃ユ湡date鍚戝悗鎺ㄧ畻num澶╃殑鏃ユ湡鍒楄〃 * * @param date * @param num * @param contains - * 是否包含date + * 鏄惁鍖呭惈date * @return */ public static List getBeforeDates(Date date, int num, boolean contains) { @@ -771,7 +771,7 @@ public class DateUtil { } /** - * 获取与dete之前或后的第num个整点 + * 鑾峰彇涓巇ete涔嬪墠鎴栧悗鐨勭num涓暣鐐� */ public static Date getHour(Date date, int num) { date = DateUtils.addHours(date, num); @@ -805,7 +805,7 @@ public class DateUtil { /** * @param endDate * @param count - * @return 自endDate始,共count个weekend的列表 + * @return 鑷猠ndDate濮嬶紝鍏眂ount涓獁eekend鐨勫垪琛� */ public static List getWeekendList(Date endDate, int count) { if (count < 1) @@ -831,7 +831,7 @@ public class DateUtil { /** * * @param pattern - * @return 到endMonth为止,共count个月,用pattern进行格式化 + * @return 鍒癳ndMonth涓烘锛屽叡count涓湀锛岀敤pattern杩涜鏍煎紡鍖� */ public static List formatDates(List dates, String pattern) { List ret = new ArrayList(dates.size()); @@ -846,7 +846,7 @@ public class DateUtil { * * @param endMonth * @param count - * @return 到endMonth为止,共count个月 + * @return 鍒癳ndMonth涓烘锛屽叡count涓湀 */ public static List getMonthList(Date endMonth, int count) { if (count < 1) @@ -900,7 +900,7 @@ public class DateUtil { * * @param endMonth * @param count - * @return 自endMonth起,count个月的weekend列表 + * @return 鑷猠ndMonth璧凤紝count涓湀鐨剋eekend鍒楄〃 */ public static List getWeekendListByMonth(Date endMonth, int count) { if (count < 1) @@ -961,7 +961,7 @@ public class DateUtil { } /** - * 得到两个日期的差值
+ * 寰楀埌涓や釜鏃ユ湡鐨勫樊鍊�
* between('2009-11-10', '2008-12-12', Calendar.YEAR) == 1
* between('2009-11-10', '2008-12-12', Calendar.MONTH) == 11
* between('2009-11-10', '2008-12-12', Calendar.WEEK_OF_YEAR) == 47
@@ -1052,7 +1052,7 @@ public class DateUtil { return calendar.getTime(); } - // yyyy-MM-dd HH:mm:ss 24小时 + // yyyy-MM-dd HH:mm:ss 24灏忔椂 @SuppressWarnings("deprecation") public static List getDateByInterval(Date startDate, Date endDate, int interval, int calendarField, String switching, @@ -1108,7 +1108,7 @@ public class DateUtil { } } - // 推荐使用 + // 鎺ㄨ崘浣跨敤 @SuppressWarnings("deprecation") public static List getDateByIntervalL(Date startDate, Date endDate, int interval, int calendarField, String switching) { Date _startDate = DateUtils.truncate(startDate, calendarField); @@ -1165,7 +1165,7 @@ public class DateUtil { private static long YEAR_SEC = MONTH_SEC * 12; /** - * 获取时间与日期时间的文字描述 + * 鑾峰彇鏃堕棿涓庢棩鏈熸椂闂寸殑鏂囧瓧鎻忚堪 * * @param date * @return @@ -1180,39 +1180,39 @@ public class DateUtil { long diffSec = (msNow - msInput) / 1000; if (diffSec < DAY_SEC) { if (diffSec >= HOUR_SEC) { - return (diffSec / HOUR_SEC) + "小时前"; + return (diffSec / HOUR_SEC) + "灏忔椂鍓�"; } else if (diffSec >= MINU_SEC) { - return (diffSec / MINU_SEC) + "分钟前"; + return (diffSec / MINU_SEC) + "鍒嗛挓鍓�"; } else { - return "刚刚"; + return "鍒氬垰"; } } else if (diffSec < MONTH_SEC) { - return (diffSec / DAY_SEC) + "天前"; + return (diffSec / DAY_SEC) + "澶╁墠"; } else if (diffSec < YEAR_SEC) { - return ((int) (diffSec / MONTH_SEC)) + "月前"; + return ((int) (diffSec / MONTH_SEC)) + "鏈堝墠"; } else { int yearInput = inputCalendar.get(Calendar.YEAR); int yearNow = systemCalendar.get(Calendar.YEAR); - return (yearNow - yearInput) + "年前"; + return (yearNow - yearInput) + "骞村墠"; } } else { - return "刚刚";// 输入时间大于 系统时间 返回 "刚刚" + return "鍒氬垰";// 杈撳叆鏃堕棿澶т簬 绯荤粺鏃堕棿 杩斿洖 "鍒氬垰" } } /** - * 获取距离系统时间的数字型 - * FIXME:该代码有bug,(例如:2012年1月1日-2011年12月30日返回的是1年前),推荐使用getShortDateText(Date + * 鑾峰彇璺濈绯荤粺鏃堕棿鐨勬暟瀛楀瀷 + * FIXME:璇ヤ唬鐮佹湁bug锛�(渚嬪:2012骞�1鏈�1鏃�-2011骞�12鏈�30鏃ヨ繑鍥炵殑鏄�1骞村墠),鎺ㄨ崘浣跨敤getShortDateText(Date * date) */ public static String getDaysBeforeNow(Date date) { long sysTime = Long.parseLong(formatToYYYYMMDDhhmmss(new Date())); long ymdhms = Long.parseLong(formatToYYYYMMDDhhmmss(date)); - String strYear = "年前"; - String strMonth = "月前"; - String strDay = "天前"; - String strHour = "小时前"; - String strMinute = "分钟前"; + String strYear = "骞村墠"; + String strMonth = "鏈堝墠"; + String strDay = "澶╁墠"; + String strHour = "灏忔椂鍓�"; + String strMinute = "鍒嗛挓鍓�"; try { if (ymdhms == 0) { return ""; @@ -1244,7 +1244,7 @@ public class DateUtil { } /** - * 获取大概小时差 + * 鑾峰彇澶ф灏忔椂宸� * * @param publishDate * @param strFormatter @@ -1255,7 +1255,7 @@ public class DateUtil { if (null != publishDate) { if (publishDate.after(range[0]) && publishDate.before(range[1])) { int dateDiff = DateUtil.getHour(new Date()) - DateUtil.getHour(publishDate); - return dateDiff > 0 ? dateDiff + "小时前" : "1小时内"; + return dateDiff > 0 ? dateDiff + "灏忔椂鍓�" : "1灏忔椂鍐�"; } else { return (DateUtil.formatByPattern(publishDate, strFormatter)); } @@ -1265,7 +1265,7 @@ public class DateUtil { } /** - * 获取给定日期的本周星期天 + * 鑾峰彇缁欏畾鏃ユ湡鐨勬湰鍛ㄦ槦鏈熷ぉ * * @param date * @return @@ -1279,7 +1279,7 @@ public class DateUtil { } /** - * 获取给定日期的下一个星期天 + * 鑾峰彇缁欏畾鏃ユ湡鐨勪笅涓�涓槦鏈熷ぉ * * @param date * @return @@ -1289,7 +1289,7 @@ public class DateUtil { } /** - * 获取给定日期的上一个星期天 + * 鑾峰彇缁欏畾鏃ユ湡鐨勪笂涓�涓槦鏈熷ぉ * * @param date * @return @@ -1300,7 +1300,7 @@ public class DateUtil { /** - * 将任意字符串将成date + * 灏嗕换鎰忓瓧绗︿覆灏嗘垚date * @param date * @return * @throws ParseException @@ -1309,10 +1309,10 @@ public class DateUtil { public static Date parseStringToDate(String date) { Date result = null; String parse = null; - //parse=parse.replaceFirst("^.*?[0-9]{4}(年)?([^0-9]?)", "yyyy$1"); - //parse=parse.replaceFirst("([^0-9]?)[0-9]{1,2}(月)?([^0-9]?)", "$1MM$2"); + //parse=parse.replaceFirst("^.*?[0-9]{4}(骞�)?([^0-9]?)", "yyyy$1"); + //parse=parse.replaceFirst("([^0-9]?)[0-9]{1,2}(鏈�)?([^0-9]?)", "$1MM$2"); //parse=parse.replaceFirst("([^0-9]?)[0-9]{1,2}( ?)", "$1dd$2"); - Pattern p=Pattern.compile("(\\d{4})[-|年|.]?(\\d{1,2})?[-|月|.]?(\\d{1,2})?日?"); + Pattern p=Pattern.compile("(\\d{4})[-|骞磡.]?(\\d{1,2})?[-|鏈坾.]?(\\d{1,2})?鏃�?"); Matcher m=p.matcher(date); if(m.find()){ @@ -1352,7 +1352,7 @@ public class DateUtil { if(dateStr == null){ return null; } - Pattern p=Pattern.compile("(\\d{1,4})[-|年|/|.]?(\\d{1,2})?[-|月|/|.]?(\\d{1,2})?日?"); + Pattern p=Pattern.compile("(\\d{1,4})[-|骞磡/|.]?(\\d{1,2})?[-|鏈坾/|.]?(\\d{1,2})?鏃�?"); Matcher m=p.matcher(dateStr); String finalPattern = "yyyy"; String pattern = ""; diff --git a/projects/fangjia-common/src/main/java/com/fangjia/core/util/GeoUtils.java b/projects/fangjia-common/src/main/java/com/fangjia/core/util/GeoUtils.java index d71648bc9..5a74fb0d3 100644 --- a/projects/fangjia-common/src/main/java/com/fangjia/core/util/GeoUtils.java +++ b/projects/fangjia-common/src/main/java/com/fangjia/core/util/GeoUtils.java @@ -27,7 +27,7 @@ public class GeoUtils { /** * @param raidus - * 单位米 + * 鍗曚綅绫� * * @return minLat,maxLat, minLng,maxLng */ @@ -53,10 +53,10 @@ public class GeoUtils { /** - * 根据给定的经纬度、距离、角度,计算对应的经纬度 - * @param Lat 原始纬度 - * @param Lon 原始精度 - * @param distance 距离(米) + * 鏍规嵁缁欏畾鐨勭粡绾害銆佽窛绂汇�佽搴︼紝璁$畻瀵瑰簲鐨勭粡绾害 + * @param Lat 鍘熷绾害 + * @param Lon 鍘熷绮惧害 + * @param distance 璺濈锛堢背锛� * @param angle , 90: right, 180: down * @return */ @@ -71,14 +71,14 @@ public class GeoUtils { } /** - * 纬度的弧度 + * 绾害鐨勫姬搴� */ public static double radLat(double Lat) { return Lat * Math.PI / 180; } /** - * 经度的弧度 + * 缁忓害鐨勫姬搴� */ public static double eadLon(double Lon) { return Lon * Math.PI / 180; @@ -90,8 +90,8 @@ public class GeoUtils { return ec * Math.cos(radLat); } - final static int EARTH_RADIUS = 6378137;//赤道半径 earth radius - final static int POLAR_RADIUS = 6356725;//极半径 polar radius + final static int EARTH_RADIUS = 6378137;//璧ら亾鍗婂緞 earth radius + final static int POLAR_RADIUS = 6356725;//鏋佸崐寰� polar radius public static double ecc(double Lat) { return POLAR_RADIUS + (EARTH_RADIUS - POLAR_RADIUS) * (90 - Lat) / 90; } diff --git a/projects/fangjia-common/src/main/java/com/fangjia/core/util/PageBean.java b/projects/fangjia-common/src/main/java/com/fangjia/core/util/PageBean.java index acea0a067..8bf1c5936 100644 --- a/projects/fangjia-common/src/main/java/com/fangjia/core/util/PageBean.java +++ b/projects/fangjia-common/src/main/java/com/fangjia/core/util/PageBean.java @@ -4,23 +4,23 @@ import java.util.Collections; import java.util.List; /** - * 分页查询值对象 + * 鍒嗛〉鏌ヨ鍊煎璞� * @author yinjihuan - * @param 返回数据类型 + * @param 杩斿洖鏁版嵁绫诲瀷 */ public class PageBean { - private int start;//起始记录数 + private int start;//璧峰璁板綍鏁� - private int limit;//最大记录数 + private int limit;//鏈�澶ц褰曟暟 - private long totalRecords;//总记录数 + private long totalRecords;//鎬昏褰曟暟 - private int currentPage;//当前页 + private int currentPage;//褰撳墠椤� - private int totalPages;//总页数 + private int totalPages;//鎬婚〉鏁� - private List list;//查询数据对象 + private List list;//鏌ヨ鏁版嵁瀵硅薄 public static int page2Start(int page, int limit){ return page * limit - limit; diff --git a/projects/fangjia-common/src/main/java/com/fangjia/core/util/RandomUtil.java b/projects/fangjia-common/src/main/java/com/fangjia/core/util/RandomUtil.java index 25f4d5a12..564f0fb6b 100644 --- a/projects/fangjia-common/src/main/java/com/fangjia/core/util/RandomUtil.java +++ b/projects/fangjia-common/src/main/java/com/fangjia/core/util/RandomUtil.java @@ -4,7 +4,7 @@ import org.apache.commons.lang.math.RandomUtils; public final class RandomUtil extends RandomUtils { /** - * 随机得到两个Long类型数字间任意数字 + * 闅忔満寰楀埌涓や釜Long绫诲瀷鏁板瓧闂翠换鎰忔暟瀛� * * @param l1 * @param l2 @@ -17,7 +17,7 @@ public final class RandomUtil extends RandomUtils { } /** - * 随机得到两个Long类型数字间任意数字 + * 闅忔満寰楀埌涓や釜Long绫诲瀷鏁板瓧闂翠换鎰忔暟瀛� * * @param i1 * @param i2 diff --git a/projects/fangjia-common/src/main/java/com/fangjia/core/util/SecurityUtil.java b/projects/fangjia-common/src/main/java/com/fangjia/core/util/SecurityUtil.java index c03435e1c..c05307b6a 100644 --- a/projects/fangjia-common/src/main/java/com/fangjia/core/util/SecurityUtil.java +++ b/projects/fangjia-common/src/main/java/com/fangjia/core/util/SecurityUtil.java @@ -24,7 +24,7 @@ public class SecurityUtil { Security.addProvider(new com.sun.crypto.provider.SunJCE()); } - private static String Algorithm = "DES"; // 定义 加密算法,可用 DES,DESede,Blowfish + private static String Algorithm = "DES"; // 瀹氫箟 鍔犲瘑绠楁硶,鍙敤 DES,DESede,Blowfish private static String PK = "525E9DC4D0382C4C"; private static byte[] PK_BYTES = DataUtil.hex2byte(PK); private static final Pattern TOKEN_PATTERN = Pattern.compile("[A-Fa-f0-9]+"); @@ -34,7 +34,7 @@ public class SecurityUtil { } /** - * 加密 + * 鍔犲瘑 * * @throws NoSuchPaddingException * @throws NoSuchAlgorithmException @@ -48,7 +48,7 @@ public class SecurityUtil { } /** - * 解密 + * 瑙e瘑 */ public static byte[] decode(byte[] input, byte[] key) throws Exception { SecretKey deskey = new javax.crypto.spec.SecretKeySpec(key, Algorithm); @@ -59,7 +59,7 @@ public class SecurityUtil { } /** - * 生成密钥, 注意此步骤时间比较长 + * 鐢熸垚瀵嗛挜, 娉ㄦ剰姝ゆ楠ゆ椂闂存瘮杈冮暱 */ public static byte[] getKey() throws Exception { KeyGenerator keygen = KeyGenerator.getInstance(Algorithm); @@ -68,7 +68,7 @@ public class SecurityUtil { } /** - * 对输入字符串进行加密 + * 瀵硅緭鍏ュ瓧绗︿覆杩涜鍔犲瘑 * * @param s * @return @@ -92,7 +92,7 @@ public class SecurityUtil { } /** - * 对输入的加密参数进行解密 + * 瀵硅緭鍏ョ殑鍔犲瘑鍙傛暟杩涜瑙e瘑 * * @param s * @return @@ -112,7 +112,7 @@ public class SecurityUtil { } /** - * 根据tokenString得到实际的值 + * 鏍规嵁tokenString寰楀埌瀹為檯鐨勫�� * * @param tokenString * @return @@ -129,7 +129,7 @@ public class SecurityUtil { } /** - * 得到随机的数值 + * 寰楀埌闅忔満鐨勬暟鍊� * * @return */ @@ -148,7 +148,7 @@ public class SecurityUtil { } /** - * 是否是有效的验证码 + * 鏄惁鏄湁鏁堢殑楠岃瘉鐮� * * @param tokenString * @param sand diff --git a/projects/fangjia-common/src/main/java/com/fangjia/core/util/SerializeUtil.java b/projects/fangjia-common/src/main/java/com/fangjia/core/util/SerializeUtil.java index cf94cbdce..9f441ebec 100644 --- a/projects/fangjia-common/src/main/java/com/fangjia/core/util/SerializeUtil.java +++ b/projects/fangjia-common/src/main/java/com/fangjia/core/util/SerializeUtil.java @@ -8,7 +8,7 @@ import java.io.*; public class SerializeUtil { - //序列化 + //搴忓垪鍖� public static String serialize(Serializable obj) { ObjectOutputStream outputStream; ByteArrayOutputStream bai; @@ -24,7 +24,7 @@ public class SerializeUtil { return null; } - //反序列化 + //鍙嶅簭鍒楀寲 public static Object unserizlize(String byt) { ObjectInputStream oii; ByteArrayInputStream bis; diff --git a/projects/fangjia-core/pom.xml b/projects/fangjia-core/pom.xml index 4b5915438..e77110fb2 100644 --- a/projects/fangjia-core/pom.xml +++ b/projects/fangjia-core/pom.xml @@ -7,7 +7,7 @@ 0.0.1-SNAPSHOT fangjia-core - GBK + UTF-8 fangjia-core @@ -19,7 +19,7 @@ 8 8 - GBK + UTF-8 diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/BaseConfiguration.java b/projects/fangjia-core/src/main/java/com/fangjia/core/BaseConfiguration.java index 8181950f5..8b7557d5b 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/BaseConfiguration.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/BaseConfiguration.java @@ -29,7 +29,7 @@ public class BaseConfiguration extends ConfigurationSupport { } /** - * 是否在开发环境中运行 + * 鏄惁鍦ㄥ紑鍙戠幆澧冧腑杩愯 * * @return */ @@ -38,7 +38,7 @@ public class BaseConfiguration extends ConfigurationSupport { } /** - * 是否在测试环境中运行 + * 鏄惁鍦ㄦ祴璇曠幆澧冧腑杩愯 * * @return */ @@ -47,7 +47,7 @@ public class BaseConfiguration extends ConfigurationSupport { } /** - * 是否在生产环境中运行 + * 鏄惁鍦ㄧ敓浜х幆澧冧腑杩愯 * * @return */ @@ -56,7 +56,7 @@ public class BaseConfiguration extends ConfigurationSupport { } /** - * 判断是否禁用cache,默认为true + * 鍒ゆ柇鏄惁绂佺敤cache锛岄粯璁や负true * * @return */ @@ -65,7 +65,7 @@ public class BaseConfiguration extends ConfigurationSupport { } /** - * 判断是否禁用本地缓存cache,默认为true + * 鍒ゆ柇鏄惁绂佺敤鏈湴缂撳瓨cache锛岄粯璁や负true * * @return */ diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/BlockData.java b/projects/fangjia-core/src/main/java/com/fangjia/core/BlockData.java index 81697c594..de53aeb9f 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/BlockData.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/BlockData.java @@ -128,14 +128,14 @@ public class BlockData implements PriorityOrdered { } /** - * 根据别名匹配板块 + * 鏍规嵁鍒悕鍖归厤鏉垮潡 */ private static String format(Map> regionBlockMap, String block) { if (regionBlockMap.containsKey(block)) { return block; } - // 遍历所有板块的别名 + // 閬嶅巻鎵�鏈夋澘鍧楃殑鍒悕 Set nameSet = regionBlockMap.keySet(); for (String key : nameSet) { List alias = regionBlockMap.get(key); @@ -151,7 +151,7 @@ public class BlockData implements PriorityOrdered { } public static void main(String[] args) { - System.out.print(formatBlock("上海", "宝山", "高境")); + System.out.print(formatBlock("涓婃捣", "瀹濆北", "楂樺")); } public static Map>> getAllBlocks(String city) { diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/Configuration.java b/projects/fangjia-core/src/main/java/com/fangjia/core/Configuration.java index 59d8cfe4b..f215ca359 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/Configuration.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/Configuration.java @@ -42,7 +42,7 @@ public class Configuration extends PropertiesConfiguration { } /** - * 是否在开发环境中运行 + * 鏄惁鍦ㄥ紑鍙戠幆澧冧腑杩愯 * * @return */ @@ -51,7 +51,7 @@ public class Configuration extends PropertiesConfiguration { } /** - * 是否在测试环境中运行 + * 鏄惁鍦ㄦ祴璇曠幆澧冧腑杩愯 * * @return */ @@ -60,7 +60,7 @@ public class Configuration extends PropertiesConfiguration { } /** - * 是否在生产环境中运行 + * 鏄惁鍦ㄧ敓浜х幆澧冧腑杩愯 * * @return */ @@ -69,7 +69,7 @@ public class Configuration extends PropertiesConfiguration { } /** - * 子类可以重写这个方法,如果需要做一些自定义的操作 + * 瀛愮被鍙互閲嶅啓杩欎釜鏂规硶锛屽鏋滈渶瑕佸仛涓�浜涜嚜瀹氫箟鐨勬搷浣� * * @return * @throws IOException @@ -136,7 +136,7 @@ public class Configuration extends PropertiesConfiguration { } /** - * 判断是否禁用cache,默认为true + * 鍒ゆ柇鏄惁绂佺敤cache锛岄粯璁や负true * * @return */ @@ -145,7 +145,7 @@ public class Configuration extends PropertiesConfiguration { } /** - * 判断是否禁用本地缓存cache,默认为true + * 鍒ゆ柇鏄惁绂佺敤鏈湴缂撳瓨cache锛岄粯璁や负true * * @return */ diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/CpcHouseTypeEnum.java b/projects/fangjia-core/src/main/java/com/fangjia/core/CpcHouseTypeEnum.java index e8667f30f..118b420d4 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/CpcHouseTypeEnum.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/CpcHouseTypeEnum.java @@ -1,7 +1,7 @@ package com.fangjia.core; /** - * CPC房源类型,移植自goojia + * CPC鎴挎簮绫诲瀷锛岀Щ妞嶈嚜goojia * * @author yukai * diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/DistrictKindEnum.java b/projects/fangjia-core/src/main/java/com/fangjia/core/DistrictKindEnum.java index 62fc95aab..4723644ef 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/DistrictKindEnum.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/DistrictKindEnum.java @@ -1,7 +1,7 @@ package com.fangjia.core; public enum DistrictKindEnum { - gongyu("公寓", "小区"), bieshu("别墅", "别墅"), shangpu("商铺", "商铺"), xiezilou("写字楼", "写字楼"), all("公寓,别墅", "小区,别墅"); + gongyu("鍏瘬", "灏忓尯"), bieshu("鍒", "鍒"), shangpu("鍟嗛摵", "鍟嗛摵"), xiezilou("鍐欏瓧妤�", "鍐欏瓧妤�"), all("鍏瘬,鍒", "灏忓尯,鍒"); private final String display; private final String value; @@ -12,7 +12,7 @@ public enum DistrictKindEnum { } /** - * 根据display获取对应的value + * 鏍规嵁display鑾峰彇瀵瑰簲鐨剉alue * * @param display * @return @@ -28,7 +28,7 @@ public enum DistrictKindEnum { } /** - * 用于显示 + * 鐢ㄤ簬鏄剧ず * * @return */ @@ -37,7 +37,7 @@ public enum DistrictKindEnum { } /** - * 用于查询 + * 鐢ㄤ簬鏌ヨ * * @return */ diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/ProvinceData.java b/projects/fangjia-core/src/main/java/com/fangjia/core/ProvinceData.java index 2e997682c..f210ab1b8 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/ProvinceData.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/ProvinceData.java @@ -10,7 +10,7 @@ import java.util.*; import java.util.Map.Entry; /** - * 全国省份简称 全称数据 + * 鍏ㄥ浗鐪佷唤绠�绉� 鍏ㄧО鏁版嵁 * @author wenyan */ public class ProvinceData { @@ -18,64 +18,64 @@ public class ProvinceData { final static Logger logger = Logger.getLogger(ProvinceData.class); static final Map> data = new HashMap>() {{ - put("河北", Arrays.asList(new String[]{"河北省", "冀"})); - put("河南", Arrays.asList(new String[]{"河南省", "豫"})); - put("云南", Arrays.asList(new String[]{"云南省", "滇"})); - put("辽宁", Arrays.asList(new String[]{"辽宁省", "辽"})); - put("黑龙江", Arrays.asList(new String[]{"黑龙江省", "黑"})); - put("湖南", Arrays.asList(new String[]{"湖南省", "湘"})); - put("湖北", Arrays.asList(new String[]{"湖北省", "鄂"})); - put("安徽", Arrays.asList(new String[]{"安徽省", "皖"})); - put("山东", Arrays.asList(new String[]{"山东省", "鲁"})); - put("新疆", Arrays.asList(new String[]{"新疆维吾尔自治区", "新疆省","新"})); - put("江苏", Arrays.asList(new String[]{"江苏省", "苏"})); - put("浙江", Arrays.asList(new String[]{"浙江省", "浙"})); - put("江西", Arrays.asList(new String[]{"江西省", "赣"})); - put("广西", Arrays.asList(new String[]{"广西省","广西壮族自治区", "桂"})); - put("甘肃", Arrays.asList(new String[]{"甘肃省", "甘"})); - put("山西", Arrays.asList(new String[]{"山西省", "晋"})); - put("内蒙古", Arrays.asList(new String[]{"内蒙古自治区", "内蒙古省","蒙"})); - put("陕西", Arrays.asList(new String[]{"陕西省", "陜西", "陜西省", "陕"})); - put("吉林", Arrays.asList(new String[]{"吉林省", "吉"})); - put("福建", Arrays.asList(new String[]{"福建省", "褔建省", "闽"})); - put("贵州", Arrays.asList(new String[]{"贵州省", "黔"})); - put("广东", Arrays.asList(new String[]{"广东省", "粤"})); - put("青海", Arrays.asList(new String[]{"青海省", "青"})); - put("西藏", Arrays.asList(new String[]{"西藏自治区", "藏"})); - put("四川", Arrays.asList(new String[]{"四川省", "川"})); - put("宁夏", Arrays.asList(new String[]{"宁夏回族自治区", "宁夏省", "宁"})); - put("海南", Arrays.asList(new String[]{"海南省", "琼"})); - put("台湾", Arrays.asList(new String[]{"台湾省", "台"})); + put("娌冲寳", Arrays.asList(new String[]{"娌冲寳鐪�", "鍐�"})); + put("娌冲崡", Arrays.asList(new String[]{"娌冲崡鐪�", "璞�"})); + put("浜戝崡", Arrays.asList(new String[]{"浜戝崡鐪�", "婊�"})); + put("杈藉畞", Arrays.asList(new String[]{"杈藉畞鐪�", "杈�"})); + put("榛戦緳姹�", Arrays.asList(new String[]{"榛戦緳姹熺渷", "榛�"})); + put("婀栧崡", Arrays.asList(new String[]{"婀栧崡鐪�", "婀�"})); + put("婀栧寳", Arrays.asList(new String[]{"婀栧寳鐪�", "閯�"})); + put("瀹夊窘", Arrays.asList(new String[]{"瀹夊窘鐪�", "鐨�"})); + put("灞变笢", Arrays.asList(new String[]{"灞变笢鐪�", "椴�"})); + put("鏂扮枂", Arrays.asList(new String[]{"鏂扮枂缁村惥灏旇嚜娌诲尯", "鏂扮枂鐪�","鏂�"})); + put("姹熻嫃", Arrays.asList(new String[]{"姹熻嫃鐪�", "鑻�"})); + put("娴欐睙", Arrays.asList(new String[]{"娴欐睙鐪�", "娴�"})); + put("姹熻タ", Arrays.asList(new String[]{"姹熻タ鐪�", "璧�"})); + put("骞胯タ", Arrays.asList(new String[]{"骞胯タ鐪�","骞胯タ澹棌鑷不鍖�", "妗�"})); + put("鐢樿們", Arrays.asList(new String[]{"鐢樿們鐪�", "鐢�"})); + put("灞辫タ", Arrays.asList(new String[]{"灞辫タ鐪�", "鏅�"})); + put("鍐呰挋鍙�", Arrays.asList(new String[]{"鍐呰挋鍙よ嚜娌诲尯", "鍐呰挋鍙ょ渷","钂�"})); + put("闄曡タ", Arrays.asList(new String[]{"闄曡タ鐪�", "闄滆タ", "闄滆タ鐪�", "闄�"})); + put("鍚夋灄", Arrays.asList(new String[]{"鍚夋灄鐪�", "鍚�"})); + put("绂忓缓", Arrays.asList(new String[]{"绂忓缓鐪�", "瑜斿缓鐪�", "闂�"})); + put("璐靛窞", Arrays.asList(new String[]{"璐靛窞鐪�", "榛�"})); + put("骞夸笢", Arrays.asList(new String[]{"骞夸笢鐪�", "绮�"})); + put("闈掓捣", Arrays.asList(new String[]{"闈掓捣鐪�", "闈�"})); + put("瑗胯棌", Arrays.asList(new String[]{"瑗胯棌鑷不鍖�", "钘�"})); + put("鍥涘窛", Arrays.asList(new String[]{"鍥涘窛鐪�", "宸�"})); + put("瀹佸", Arrays.asList(new String[]{"瀹佸鍥炴棌鑷不鍖�", "瀹佸鐪�", "瀹�"})); + put("娴峰崡", Arrays.asList(new String[]{"娴峰崡鐪�", "鐞�"})); + put("鍙版咕", Arrays.asList(new String[]{"鍙版咕鐪�", "鍙�"})); }}; static final Map> GOVERNMENT_CITY_LIST = new HashMap>(){{ - put("上海", Arrays.asList(new String[]{"上海市", "沪"})); - put("北京", Arrays.asList(new String[]{"北京市", "京"})); - put("天津", Arrays.asList(new String[]{"天津市", "津"})); - put("重庆", Arrays.asList(new String[]{"重庆市", "渝"})); + put("涓婃捣", Arrays.asList(new String[]{"涓婃捣甯�", "娌�"})); + put("鍖椾含", Arrays.asList(new String[]{"鍖椾含甯�", "浜�"})); + put("澶╂触", Arrays.asList(new String[]{"澶╂触甯�", "娲�"})); + put("閲嶅簡", Arrays.asList(new String[]{"閲嶅簡甯�", "娓�"})); }}; static final Map> SPECIAL_ADMIN_REGION = new HashMap>(){{ - put("香港",new ArrayList() {{add("港");add("香港特别行政区");add("Hong Kong");add("HK");add("HKSAR");}}); - put("澳门",new ArrayList() {{add("澳");add("澳门特别行政区");add("Macao");add("Macau");}}); + put("棣欐腐",new ArrayList() {{add("娓�");add("棣欐腐鐗瑰埆琛屾斂鍖�");add("Hong Kong");add("HK");add("HKSAR");}}); + put("婢抽棬",new ArrayList() {{add("婢�");add("婢抽棬鐗瑰埆琛屾斂鍖�");add("Macao");add("Macau");}}); }}; - /**城市:省份*/ + /**鍩庡競:鐪佷唤*/ public static Map CITY_PROVINCE_MAP = new HashMap(); static DBCollection SERVER_AREA = MongoUtils.getDbCollection(Constants.FANGJIA_MONGO_URI, "fangjia", "server_area"); static { - logger.info("开始加载省份信息"); + logger.info("寮�濮嬪姞杞界渷浠戒俊鎭�"); DBCursor cursor = SERVER_AREA.find(new BasicDBObject(), new BasicDBObject("province", 1).append("display", 1)).batchSize(300); BasicDBObject dbo; while(cursor.hasNext()){ dbo = (BasicDBObject)cursor.next(); - if(!"全国".equals(dbo.getString("display"))){ + if(!"鍏ㄥ浗".equals(dbo.getString("display"))){ CITY_PROVINCE_MAP.put(dbo.getString("display"),dbo.getString("province")); } } - logger.info("省份信息加载结束"); + logger.info("鐪佷唤淇℃伅鍔犺浇缁撴潫"); } private ProvinceData(){} @@ -93,7 +93,7 @@ public class ProvinceData { /** - * 判断城市是不是直辖市 + * 鍒ゆ柇鍩庡競鏄笉鏄洿杈栧競 * @param city * @return */ @@ -121,7 +121,7 @@ public class ProvinceData { } /** - * 获得城市所在的省份 + * 鑾峰緱鍩庡競鎵�鍦ㄧ殑鐪佷唤 * @param city * @return */ @@ -130,7 +130,7 @@ public class ProvinceData { } /** - * 获取省份下的所有城市 + * 鑾峰彇鐪佷唤涓嬬殑鎵�鏈夊煄甯� * @param province * @return */ @@ -145,7 +145,7 @@ public class ProvinceData { } /** - * 获取所有的兄弟城市 + * 鑾峰彇鎵�鏈夌殑鍏勫紵鍩庡競 * @param city * @return */ @@ -159,7 +159,7 @@ public class ProvinceData { } /** - * 获取城市列表 + * 鑾峰彇鍩庡競鍒楄〃 * @return */ public static List getAllCity(){ diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/RegionData.java b/projects/fangjia-core/src/main/java/com/fangjia/core/RegionData.java index 4add48eb1..af3ab7d76 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/RegionData.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/RegionData.java @@ -30,7 +30,7 @@ public class RegionData implements PriorityOrdered { private static Map> cityAndAliasMap = new HashMap>(); /** - * 城市对应级别Map + * 鍩庡競瀵瑰簲绾у埆Map */ private static Map cityGradeMap = new HashMap(); @@ -46,7 +46,7 @@ public class RegionData implements PriorityOrdered { BasicDBObject dbo; while(cursor.hasNext()){ dbo = (BasicDBObject) cursor.next(); - if(!"全国".equals(dbo.getString("display"))){ + if(!"鍏ㄥ浗".equals(dbo.getString("display"))){ ALL_CITY.add(dbo.getString("display")); cityGradeMap.put(dbo.getString("display"), dbo.getInt("city_grade")); Object object = dbo.get("alias"); @@ -191,7 +191,7 @@ public class RegionData implements PriorityOrdered { try { Calendar cal = Calendar.getInstance(); if (nextScheduleHour == cal.get(Calendar.HOUR_OF_DAY)) { - if(cal.get(Calendar.HOUR_OF_DAY) % 8 == 0) {//每8个小时执行一次 + if(cal.get(Calendar.HOUR_OF_DAY) % 8 == 0) {//姣�8涓皬鏃舵墽琛屼竴娆� LOGGER.info("RegionData reload runing"); RegionData.reload(); LOGGER.info("RegionData reload success"); @@ -356,14 +356,14 @@ public class RegionData implements PriorityOrdered { } /** - * 根据别名匹配区域 + * 鏍规嵁鍒悕鍖归厤鍖哄煙 */ private static String format(Map> cityRegionMap, String region) { if (cityRegionMap.containsKey(region)) { return region; } - // 遍历所有区域的别名 + // 閬嶅巻鎵�鏈夊尯鍩熺殑鍒悕 Set nameSet = cityRegionMap.keySet(); for (String key : nameSet) { List alias = cityRegionMap.get(key); @@ -379,7 +379,7 @@ public class RegionData implements PriorityOrdered { } /** - * 格式化城市名称 + * 鏍煎紡鍖栧煄甯傚悕绉� * @param cityName * @return */ @@ -401,7 +401,7 @@ public class RegionData implements PriorityOrdered { } /** - * 判断一个城市名称是否是一个标准的城市名称 + * 鍒ゆ柇涓�涓煄甯傚悕绉版槸鍚︽槸涓�涓爣鍑嗙殑鍩庡競鍚嶇О * @param cityName * @return */ @@ -442,7 +442,7 @@ public class RegionData implements PriorityOrdered { } /** - * 从地址中解析城市 + * 浠庡湴鍧�涓В鏋愬煄甯� * @param address * @return */ @@ -454,7 +454,7 @@ public class RegionData implements PriorityOrdered { Set cities = RegionData.getAllCity(); Map cityScoreMap = new HashMap(); for (String city : cities) { - if (address.contains(city + "市")) { + if (address.contains(city + "甯�")) { if(cityScoreMap.containsKey(city)){ cityScoreMap.put(city, cityScoreMap.get(city) + 1); }else{ @@ -483,7 +483,7 @@ public class RegionData implements PriorityOrdered { List cityAlias = RegionData.getCityAlias(city); if(cityAlias != null){ for(String alia : cityAlias){ - if(alia != null && (alia.endsWith("市") || alia.endsWith("区") || alia.endsWith("县")) + if(alia != null && (alia.endsWith("甯�") || alia.endsWith("鍖�") || alia.endsWith("鍘�")) && address.contains(alia)){ if(cityScoreMap.containsKey(city)){ cityScoreMap.put(city, cityScoreMap.get(city) + 1); @@ -543,7 +543,7 @@ public class RegionData implements PriorityOrdered { } Map> regionMap = RegionData.getAllRegions(city); for(String region : regionMap.keySet()){ - if(address.contains(region + "区") || address.contains(region + "县") || address.contains(region + "市")){ + if(address.contains(region + "鍖�") || address.contains(region + "鍘�") || address.contains(region + "甯�")){ if(cityScoreMap.containsKey(city)){ cityScoreMap.put(city, cityScoreMap.get(city) + 1); }else{ diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/ServerAreaEnum.java b/projects/fangjia-core/src/main/java/com/fangjia/core/ServerAreaEnum.java index e881d9bfc..67e3d1ffc 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/ServerAreaEnum.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/ServerAreaEnum.java @@ -13,171 +13,171 @@ import org.apache.commons.lang.StringUtils; /** * @author ralphj - * @deprecated 请使用com.fangjia.dal.mongo.fangjia.model.ServerArea + * @deprecated 璇蜂娇鐢╟om.fangjia.dal.mongo.fangjia.model.ServerArea */ @SuppressWarnings("unchecked") @Deprecated() public enum ServerAreaEnum { /** - * 上海 + * 涓婃捣 */ - sh("上海", "shanghai", "021", 121.4759159000, 31.2243531000), + sh("涓婃捣", "shanghai", "021", 121.4759159000, 31.2243531000), /** - * 上海 + * 涓婃捣 */ - bj("北京", "beijing", "010", false, true, 116.4071200000, 39.9063400000), + bj("鍖椾含", "beijing", "010", false, true, 116.4071200000, 39.9063400000), /** - * 广州 + * 骞垮窞 */ - gz("广州", "guangzhou", "020", false, true, 113.2661500000, 23.1335800000), + gz("骞垮窞", "guangzhou", "020", false, true, 113.2661500000, 23.1335800000), /** - * 杭州 + * 鏉窞 */ - hz("杭州", "hangzhou", "0571", false, false, 120.1557400000, 30.2730400000), + hz("鏉窞", "hangzhou", "0571", false, false, 120.1557400000, 30.2730400000), /** - * 深圳 + * 娣卞湷 */ - sz("深圳", "shenzhen", "0755", false, true, 114.07, 22.33), + sz("娣卞湷", "shenzhen", "0755", false, true, 114.07, 22.33), /** - * 扬州 + * 鎵窞 */ - yz("扬州", "yangzhou", "0514", false, false, 119.26, 32.23), + yz("鎵窞", "yangzhou", "0514", false, false, 119.26, 32.23), /** - * 南京 + * 鍗椾含 */ - nj("南京", "nanjing", "025", false, true, 118.7963900000, 32.0583600000), + nj("鍗椾含", "nanjing", "025", false, true, 118.7963900000, 32.0583600000), /** - * 天津 + * 澶╂触 */ - tj("天津", "tianjin", "022", false, true, 117.2142500000, 39.1213000000), + tj("澶╂触", "tianjin", "022", false, true, 117.2142500000, 39.1213000000), /** - * 成都 + * 鎴愰兘 */ - cd("成都", "chengdu", "028", false, true, 104.0646800000, 30.6585800000), + cd("鎴愰兘", "chengdu", "028", false, true, 104.0646800000, 30.6585800000), /** - * 西安 + * 瑗垮畨 */ - xa("西安", "xian", "029", false, false, 108.9442900000, 34.2647700000), + xa("瑗垮畨", "xian", "029", false, false, 108.9442900000, 34.2647700000), /** - * 沈阳 + * 娌堥槼 */ - sy("沈阳", "shenyang", "024", false, true, 123.4321800000, 41.8062600000), + sy("娌堥槼", "shenyang", "024", false, true, 123.4321800000, 41.8062600000), /** - * 重庆 + * 閲嶅簡 */ - cq("重庆", "chongqing", "023", false, true, 106.5522700000, 29.5632900000), + cq("閲嶅簡", "chongqing", "023", false, true, 106.5522700000, 29.5632900000), /** - * 苏州 + * 鑻忓窞 */ - suz("苏州", "suzhou", "0512", false, false, 120.5865600000, 31.2976400000), + suz("鑻忓窞", "suzhou", "0512", false, false, 120.5865600000, 31.2976400000), /** - * 武汉 + * 姝︽眽 */ - wh("武汉", "wuhan", "027", false, true, 114.3054200000, 30.5927300000), + wh("姝︽眽", "wuhan", "027", false, true, 114.3054200000, 30.5927300000), /** - * 长沙 + * 闀挎矙 */ - cs("长沙", "changsha", "0731", false, false, 112.9389100000, 28.2280500000), + cs("闀挎矙", "changsha", "0731", false, false, 112.9389100000, 28.2280500000), /** - * 石家庄 + * 鐭冲搴� */ - sjz("石家庄", "shijiazhuang", "0311", false, false, 114.5144300000, 38.0428500000), + sjz("鐭冲搴�", "shijiazhuang", "0311", false, false, 114.5144300000, 38.0428500000), /** - * 青岛 + * 闈掑矝 */ - qd("青岛", "qingdao", "0532", false, false, 120.3830400000, 36.0662400000), + qd("闈掑矝", "qingdao", "0532", false, false, 120.3830400000, 36.0662400000), /** - * 福州 + * 绂忓窞 */ - fz("福州", "fuzhou", "0591", false, false, 119.2962600000, 26.0741000000), + fz("绂忓窞", "fuzhou", "0591", false, false, 119.2962600000, 26.0741000000), /** - * 济南 + * 娴庡崡 */ - jn("济南", "jinan", "0531", false, false, 117.0420100000, 36.7277800000), + jn("娴庡崡", "jinan", "0531", false, false, 117.0420100000, 36.7277800000), /** - * 厦门 + * 鍘﹂棬 */ - xm("厦门", "xiamen", "0592", false, false, 118.10000, 24.46667), + xm("鍘﹂棬", "xiamen", "0592", false, false, 118.10000, 24.46667), /** - * 宁波 + * 瀹佹尝 */ - nb("宁波", "ningbo", "0574", false, false, 121.5504100000, 29.8736300000), + nb("瀹佹尝", "ningbo", "0574", false, false, 121.5504100000, 29.8736300000), /** - * 大连 + * 澶ц繛 */ - dl("大连", "dalian", "0411", false, true, 121.6143400000, 38.9142900000), + dl("澶ц繛", "dalian", "0411", false, true, 121.6143400000, 38.9142900000), /** - * 无锡 + * 鏃犻敗 */ - wx("无锡", "wuxi", "0510", false, false, 120.3028100000, 31.5660400000), + wx("鏃犻敗", "wuxi", "0510", false, false, 120.3028100000, 31.5660400000), /** - * 三亚 + * 涓変簹 */ - sanya("三亚", "sanya", "0899", true, false, 109.50000, 18.20000), + sanya("涓変簹", "sanya", "0899", true, false, 109.50000, 18.20000), /** - * 太原 + * 澶師 */ - ty("太原", "taiyuan", "0351", false, false, 112.53333, 37.86667), + ty("澶師", "taiyuan", "0351", false, false, 112.53333, 37.86667), /** - * 福州 + * 绂忓窞 */ - wz("温州", "wenzhou", "0577", false, false, 120.38, 28.00), + wz("娓╁窞", "wenzhou", "0577", false, false, 120.38, 28.00), /** - * 佛山 + * 浣涘北 */ - fs("佛山", "foshan", "0757", true, false, 113.1214160000, 23.0215480000), + fs("浣涘北", "foshan", "0757", true, false, 113.1214160000, 23.0215480000), /** - * 郑州 + * 閮戝窞 */ - zz("郑州", "zhengzhou", "0371", true, false, 113.65000, 34.76667); + zz("閮戝窞", "zhengzhou", "0371", true, false, 113.65000, 34.76667); - // dg("东莞", "dongguan", false), - // hrb("哈尔滨", "haerbin", false), + // dg("涓滆帪", "dongguan", false), + // hrb("鍝堝皵婊�", "haerbin", false), - // hf("合肥", "hefei", false), - // km("昆明", "kunming", false), - // nc("南昌", "nanchang", false), - // nn("南宁", "nanning", false), - // lz("兰州", "lanzhou", false); + // hf("鍚堣偉", "hefei", false), + // km("鏄嗘槑", "kunming", false), + // nc("鍗楁槍", "nanchang", false), + // nn("鍗楀畞", "nanning", false), + // lz("鍏板窞", "lanzhou", false); private final String display; private final String spell; /** - * 是否启用 + * 鏄惁鍚敤 */ private final boolean enabled; /** - * 是否支持板块 + * 鏄惁鏀寔鏉垮潡 */ private final boolean supportBlock; /** - * 是否支持地铁找房 + * 鏄惁鏀寔鍦伴搧鎵炬埧 */ private final boolean supportMetro; @@ -185,11 +185,11 @@ public enum ServerAreaEnum { private final double lng; private final double lat; /** - * 首页地图所用城市(排序后) + * 棣栭〉鍦板浘鎵�鐢ㄥ煄甯�(鎺掑簭鍚�) */ public static final Map homeMapCities; /** - * 区与城市列表的映射 + * 鍖轰笌鍩庡競鍒楄〃鐨勬槧灏� */ public final static Map> sectionMap; private final static Map nameMap; @@ -238,7 +238,7 @@ public enum ServerAreaEnum { citys.add(ServerAreaEnum.dl); citys.add(ServerAreaEnum.ty); citys.add(ServerAreaEnum.zz); - sectionMap.put("华北东北", citys); + sectionMap.put("鍗庡寳涓滃寳", citys); citys = new ArrayList(); citys.add(ServerAreaEnum.sh); citys.add(ServerAreaEnum.hz); @@ -248,7 +248,7 @@ public enum ServerAreaEnum { citys.add(ServerAreaEnum.wx); citys.add(ServerAreaEnum.wz); citys.add(ServerAreaEnum.yz); - sectionMap.put("华东城市", citys); + sectionMap.put("鍗庝笢鍩庡競", citys); citys = new ArrayList(); citys.add(ServerAreaEnum.gz); citys.add(ServerAreaEnum.sz); @@ -258,12 +258,12 @@ public enum ServerAreaEnum { citys.add(ServerAreaEnum.xm); citys.add(ServerAreaEnum.sanya); citys.add(ServerAreaEnum.fs); - sectionMap.put("华南华中", citys); + sectionMap.put("鍗庡崡鍗庝腑", citys); citys = new ArrayList(); citys.add(ServerAreaEnum.cd); citys.add(ServerAreaEnum.xa); citys.add(ServerAreaEnum.cq); - sectionMap.put("西部城市", citys); + sectionMap.put("瑗块儴鍩庡競", citys); ServerAreaEnum[] values = ServerAreaEnum.getEnabledCity(); nameMap = new HashMap(values.length); @@ -373,7 +373,7 @@ public enum ServerAreaEnum { } /** - * 通过SPELL得到ENUM对象 + * 閫氳繃SPELL寰楀埌ENUM瀵硅薄 * * @param spell * @return @@ -387,7 +387,7 @@ public enum ServerAreaEnum { } /** - * 通过SPELL得到ENUM对象 + * 閫氳繃SPELL寰楀埌ENUM瀵硅薄 * * @param spell * @return @@ -397,10 +397,10 @@ public enum ServerAreaEnum { } /** - * 根据name或spell获取ENUM对象 + * 鏍规嵁name鎴杝pell鑾峰彇ENUM瀵硅薄 * *

- * 若name匹配到,则返回ENUM对象,否则返回spell匹配到的ENUM对象 + * 鑻ame鍖归厤鍒帮紝鍒欒繑鍥濫NUM瀵硅薄锛屽惁鍒欒繑鍥瀞pell鍖归厤鍒扮殑ENUM瀵硅薄 *

* * @param str @@ -415,7 +415,7 @@ public enum ServerAreaEnum { } /** - * 通过display得到ENUM对象 + * 閫氳繃display寰楀埌ENUM瀵硅薄 * * @param spell * @return @@ -429,7 +429,7 @@ public enum ServerAreaEnum { } /** - * 通过display得到ENUM对象,找不到返回null + * 閫氳繃display寰楀埌ENUM瀵硅薄锛屾壘涓嶅埌杩斿洖null * * @param display * @return @@ -439,7 +439,7 @@ public enum ServerAreaEnum { } /** - * 通过name得到ENUM对象,找不到返回null + * 閫氳繃name寰楀埌ENUM瀵硅薄锛屾壘涓嶅埌杩斿洖null * * @param display * @return @@ -449,7 +449,7 @@ public enum ServerAreaEnum { } /** - * 根据输入的字符串中包含某个城市名称就认为就是那个城市的 比如输入的字符串为浙江省杭州市就认为是杭州市的 如果没有找到某个城市则返回null + * 鏍规嵁杈撳叆鐨勫瓧绗︿覆涓寘鍚煇涓煄甯傚悕绉板氨璁や负灏辨槸閭d釜鍩庡競鐨� 姣斿杈撳叆鐨勫瓧绗︿覆涓烘禉姹熺渷鏉窞甯傚氨璁や负鏄澀宸炲競鐨� 濡傛灉娌℃湁鎵惧埌鏌愪釜鍩庡競鍒欒繑鍥瀗ull * * @param s * @return @@ -467,7 +467,7 @@ public enum ServerAreaEnum { } /** - * 返回区与城市列表的映射 + * 杩斿洖鍖轰笌鍩庡競鍒楄〃鐨勬槧灏� */ public static Map> getSectionMap() { return sectionMap; @@ -486,7 +486,7 @@ public enum ServerAreaEnum { } /** - * 得到各个城市的400号 + * 寰楀埌鍚勪釜鍩庡競鐨�400鍙� * * @return */ diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/cache/MemCachedManager.java b/projects/fangjia-core/src/main/java/com/fangjia/core/cache/MemCachedManager.java index 50df1d71f..a43e9f086 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/cache/MemCachedManager.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/cache/MemCachedManager.java @@ -132,7 +132,7 @@ public abstract class MemCachedManager { } /** - * 对当前线程的数据库访问进行计数 + * 瀵瑰綋鍓嶇嚎绋嬬殑鏁版嵁搴撹闂繘琛岃鏁� */ protected final void increaseExecuteCounter(String operation, long time) { ExecuteCounter.getThreadLocalInstance(ThreadLocalKey.DaoExecuteCounter).increase(this.getClass().getSimpleName(), @@ -166,7 +166,7 @@ public abstract class MemCachedManager { * @param key * @param value * @param milliseconds - * (毫秒级) + * (姣绾�) * @return */ abstract public boolean set(String key, Serializable value, long milliseconds); diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/cache/controllers/MemcachedController.java b/projects/fangjia-core/src/main/java/com/fangjia/core/cache/controllers/MemcachedController.java index a2ea1c71d..5fabf6dde 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/cache/controllers/MemcachedController.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/cache/controllers/MemcachedController.java @@ -24,7 +24,7 @@ public class MemcachedController { private final static InetAddress LOCAL_ADDRESS = getLocalNetworkAddress(); /** - * 查看memcached的miss统计 + * 鏌ョ湅memcached鐨刴iss缁熻 * * @return */ diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/rest/ReponseData.java b/projects/fangjia-core/src/main/java/com/fangjia/core/rest/ReponseData.java index 2aaba959d..36df51278 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/rest/ReponseData.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/rest/ReponseData.java @@ -25,8 +25,8 @@ public class ReponseData implements Serializable { } private void setSuccess() { - this.code = 200;// 默认操作成功 - this.msg = "成功"; + this.code = 200;// 榛樿鎿嶄綔鎴愬姛 + this.msg = "鎴愬姛"; } public int getCode() { diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/seabridformat/DirectionType.java b/projects/fangjia-core/src/main/java/com/fangjia/core/seabridformat/DirectionType.java index cbc783a5e..f5337d77b 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/seabridformat/DirectionType.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/seabridformat/DirectionType.java @@ -2,7 +2,7 @@ package com.fangjia.core.seabridformat; public enum DirectionType { - DONG("东"), NAN("南"), XI("西"), BEI("北"), DONG_NAN("东南"), NAN_BEI("南北"), XI_NAN("西南"), DONG_BEI("东北"), XI_BEI("西北"), DONG_XI("东西"); + DONG("涓�"), NAN("鍗�"), XI("瑗�"), BEI("鍖�"), DONG_NAN("涓滃崡"), NAN_BEI("鍗楀寳"), XI_NAN("瑗垮崡"), DONG_BEI("涓滃寳"), XI_BEI("瑗垮寳"), DONG_XI("涓滆タ"); private String type; diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/seabridformat/FitmentType.java b/projects/fangjia-core/src/main/java/com/fangjia/core/seabridformat/FitmentType.java index 68b0cfe8a..cbf922412 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/seabridformat/FitmentType.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/seabridformat/FitmentType.java @@ -1,12 +1,12 @@ package com.fangjia.core.seabridformat; /** - * 装修类型定义 + * 瑁呬慨绫诲瀷瀹氫箟 * @author yinjihuan * */ public enum FitmentType { - HAO_ZHUANG("豪装"), JING_ZHUANG("精装"), JIAN_ZHUANG("简装"), MAO_PI("毛坯"); + HAO_ZHUANG("璞"), JING_ZHUANG("绮捐"), JIAN_ZHUANG("绠�瑁�"), MAO_PI("姣涘澂"); private String type; diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/seabridformat/SeabirdFormatUtils.java b/projects/fangjia-core/src/main/java/com/fangjia/core/seabridformat/SeabirdFormatUtils.java index 0c0e14e02..0cc18128a 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/seabridformat/SeabirdFormatUtils.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/seabridformat/SeabirdFormatUtils.java @@ -13,63 +13,63 @@ import com.mongodb.BasicDBObject; /** - * 房源标准化工具类 + * 鎴挎簮鏍囧噯鍖栧伐鍏风被 * @author yinjihuan * */ public class SeabirdFormatUtils { /** - * 装修关键词
- * key:装修 value:关键词 + * 瑁呬慨鍏抽敭璇�
+ * key:瑁呬慨 value:鍏抽敭璇� */ static Map> fitmentKeywordMap = new HashMap>(); /** - * 朝向关键词等于处理
- * key:朝向 value:关键词 + * 鏈濆悜鍏抽敭璇嶇瓑浜庡鐞�
+ * key:鏈濆悜 value:鍏抽敭璇� */ static Map> directionEqualsKeywordMap = new HashMap>(); /** - * 朝向关键词包含处理
- * key:朝向 value:关键词 + * 鏈濆悜鍏抽敭璇嶅寘鍚鐞�
+ * key:鏈濆悜 value:鍏抽敭璇� */ static Map> directionContainsKeywordMap = new HashMap>(); /** - * 普通关键词包含处理
- * key:朝向 value:关键词 + * 鏅�氬叧閿瘝鍖呭惈澶勭悊
+ * key:鏈濆悜 value:鍏抽敭璇� */ static Map> estateTypeKeywordMap = new HashMap>(); - static List ZhuanXiuNullKeys = Arrays.asList("暂无", "-", "其他", "0", "不限"); + static List ZhuanXiuNullKeys = Arrays.asList("鏆傛棤", "-", "鍏朵粬", "0", "涓嶉檺"); static { - fitmentKeywordMap.put(FitmentType.HAO_ZHUANG.getType(), Arrays.asList("豪", "高档", "顶级")); - fitmentKeywordMap.put(FitmentType.JING_ZHUANG.getType(), Arrays.asList("中档", "中等", "中修", "中装", "精", "全装修", "新装修")); - fitmentKeywordMap.put(FitmentType.JIAN_ZHUANG.getType(), Arrays.asList("简", "普通", "一般", "局部")); - fitmentKeywordMap.put(FitmentType.MAO_PI.getType(), Arrays.asList("毛坯", "无装", "清水", "未装")); + fitmentKeywordMap.put(FitmentType.HAO_ZHUANG.getType(), Arrays.asList("璞�", "楂樻。", "椤剁骇")); + fitmentKeywordMap.put(FitmentType.JING_ZHUANG.getType(), Arrays.asList("涓。", "涓瓑", "涓慨", "涓", "绮�", "鍏ㄨ淇�", "鏂拌淇�")); + fitmentKeywordMap.put(FitmentType.JIAN_ZHUANG.getType(), Arrays.asList("绠�", "鏅��", "涓�鑸�", "灞�閮�")); + fitmentKeywordMap.put(FitmentType.MAO_PI.getType(), Arrays.asList("姣涘澂", "鏃犺", "娓呮按", "鏈")); directionEqualsKeywordMap.put(DirectionType.DONG.getType(), Arrays.asList(DirectionType.DONG.getType())); directionEqualsKeywordMap.put(DirectionType.NAN.getType(), Arrays.asList(DirectionType.NAN.getType())); directionEqualsKeywordMap.put(DirectionType.XI.getType(), Arrays.asList(DirectionType.XI.getType())); directionEqualsKeywordMap.put(DirectionType.BEI.getType(), Arrays.asList(DirectionType.BEI.getType())); - directionContainsKeywordMap.put("东南", Arrays.asList("东南")); - directionContainsKeywordMap.put("南北", Arrays.asList("南北")); - directionContainsKeywordMap.put("西南", Arrays.asList("西南")); - directionContainsKeywordMap.put("东北", Arrays.asList("东北")); - directionContainsKeywordMap.put("西北", Arrays.asList("西北")); - directionContainsKeywordMap.put("东西", Arrays.asList("东西")); + directionContainsKeywordMap.put("涓滃崡", Arrays.asList("涓滃崡")); + directionContainsKeywordMap.put("鍗楀寳", Arrays.asList("鍗楀寳")); + directionContainsKeywordMap.put("瑗垮崡", Arrays.asList("瑗垮崡")); + directionContainsKeywordMap.put("涓滃寳", Arrays.asList("涓滃寳")); + directionContainsKeywordMap.put("瑗垮寳", Arrays.asList("瑗垮寳")); + directionContainsKeywordMap.put("涓滆タ", Arrays.asList("涓滆タ")); - estateTypeKeywordMap.put("普通住宅", Arrays.asList("住宅", "酒店式公寓")); - estateTypeKeywordMap.put("别墅", Arrays.asList("别墅", "独栋", "双拼", "联排", "叠加")); + estateTypeKeywordMap.put("鏅�氫綇瀹�", Arrays.asList("浣忓畢", "閰掑簵寮忓叕瀵�")); + estateTypeKeywordMap.put("鍒", Arrays.asList("鍒", "鐙爧", "鍙屾嫾", "鑱旀帓", "鍙犲姞")); } /** - * 格式化装修字段 - * @param fitment 装修 + * 鏍煎紡鍖栬淇瓧娈� + * @param fitment 瑁呬慨 * @return */ public static String formatFitment(String fitment) { @@ -91,8 +91,8 @@ public class SeabirdFormatUtils { } /** - * 格式化朝向字段 - * @param direction 朝向 + * 鏍煎紡鍖栨湞鍚戝瓧娈� + * @param direction 鏈濆悜 * @return */ public static String formatDirection(String direction) { @@ -107,8 +107,8 @@ public class SeabirdFormatUtils { } /** - * 格式化物业类型 - * @param estate_type 物业类型 + * 鏍煎紡鍖栫墿涓氱被鍨� + * @param estate_type 鐗╀笟绫诲瀷 * @return */ public static String formatEstateType(String estate_type) { @@ -123,7 +123,7 @@ public class SeabirdFormatUtils { } /** - * 格式化楼层 + * 鏍煎紡鍖栨ゼ灞� * @return */ public static Integer formatFloor(int floor) { @@ -134,10 +134,10 @@ public class SeabirdFormatUtils { } /** - * 获取格式化之后的值 - * @param keywords 关键词Map - * @param str 格式化内容 - * @param opType 操作类型(equals,contains) + * 鑾峰彇鏍煎紡鍖栦箣鍚庣殑鍊� + * @param keywords 鍏抽敭璇峂ap + * @param str 鏍煎紡鍖栧唴瀹� + * @param opType 鎿嶄綔绫诲瀷锛坋quals,contains锛� */ private static String getFormatValue(Map> keywords, String str, String opType) { Set keys = keywords.keySet(); @@ -159,22 +159,22 @@ public class SeabirdFormatUtils { } /** - * 按面积判断是否要过滤 - * @param estate_type 物业类型 - * @param room 室 - * @param area 面积 - * @return true表示要过滤,false不过滤 + * 鎸夐潰绉垽鏂槸鍚﹁杩囨护 + * @param estate_type 鐗╀笟绫诲瀷 + * @param room 瀹� + * @param area 闈㈢Н + * @return true琛ㄧず瑕佽繃婊わ紝false涓嶈繃婊� */ public static boolean filterBySize(String estate_type, int room, double area) { int size = 10; - if (!StringUtils.hasText(estate_type) || estate_type.equals("普通住宅")) { + if (!StringUtils.hasText(estate_type) || estate_type.equals("鏅�氫綇瀹�")) { if (area > 700 || area < size * room) { return true; } if (room < 1 && area < 10) { return true; } - } else if (estate_type.equals("别墅")) { + } else if (estate_type.equals("鍒")) { if (area < 50) { return true; } @@ -183,19 +183,19 @@ public class SeabirdFormatUtils { } /** - * 根据房型判断是否要过滤 - * @param estate_type 物业类型 - * @param room 室 - * @param hall 厅 - * @param toilet 卫 - * @return true表示要过滤,false不过滤 + * 鏍规嵁鎴垮瀷鍒ゆ柇鏄惁瑕佽繃婊� + * @param estate_type 鐗╀笟绫诲瀷 + * @param room 瀹� + * @param hall 鍘� + * @param toilet 鍗� + * @return true琛ㄧず瑕佽繃婊わ紝false涓嶈繃婊� */ public static boolean filterByFangXin(String estate_type, int room, int hall, int toilet) { - if (!StringUtils.hasText(estate_type) || estate_type.equals("普通住宅")) { + if (!StringUtils.hasText(estate_type) || estate_type.equals("鏅�氫綇瀹�")) { if (room >= 1 && room <= 6 && hall >= 0 && hall <= 3 && toilet >= 0 && toilet <= 5 && toilet <= room) { return false; } - } else if (estate_type.equals("别墅")) { + } else if (estate_type.equals("鍒")) { if (room >= 3 && hall >= 2 && hall <= 4 && toilet <= room) { return false; } @@ -204,11 +204,11 @@ public class SeabirdFormatUtils { } /** - * 根据总价判断是否要过滤 - * @param city 城市 - * @param total_price 总价 - * @param area 面积 - * @return true表示要过滤,false不过滤 + * 鏍规嵁鎬讳环鍒ゆ柇鏄惁瑕佽繃婊� + * @param city 鍩庡競 + * @param total_price 鎬讳环 + * @param area 闈㈢Н + * @return true琛ㄧず瑕佽繃婊わ紝false涓嶈繃婊� */ public static boolean filterByTotalPrice(String city, int total_price, double area) { Integer grade = RegionData.getCityGrade(city); @@ -245,9 +245,9 @@ public class SeabirdFormatUtils { } /** - * 根据建造年代判断是否要过滤 - * @param build_date 建造年代 - * @return true表示要过滤,false不过滤 + * 鏍规嵁寤洪�犲勾浠e垽鏂槸鍚﹁杩囨护 + * @param build_date 寤洪�犲勾浠� + * @return true琛ㄧず瑕佽繃婊わ紝false涓嶈繃婊� */ public static boolean filterBybuildDate(int build_date) { if (build_date == 0) { @@ -260,11 +260,11 @@ public class SeabirdFormatUtils { } /** - * 根据楼层判断是否要过滤 - * @param estate_type 物业类型 - * @param floor 所在楼层 - * @param height 楼高 - * @return true表示要过滤,false不过滤 + * 鏍规嵁妤煎眰鍒ゆ柇鏄惁瑕佽繃婊� + * @param estate_type 鐗╀笟绫诲瀷 + * @param floor 鎵�鍦ㄦゼ灞� + * @param height 妤奸珮 + * @return true琛ㄧず瑕佽繃婊わ紝false涓嶈繃婊� */ public static boolean filterByFloor(String estate_type, int floor, int height) { if (height == 0) { @@ -273,11 +273,11 @@ public class SeabirdFormatUtils { if (floor > height) { return true; } - if (!StringUtils.hasText(estate_type) || estate_type.equals("普通住宅")) { + if (!StringUtils.hasText(estate_type) || estate_type.equals("鏅�氫綇瀹�")) { if (height >= 3 && height <= 62) { return false; } - } else if (estate_type.equals("别墅")) { + } else if (estate_type.equals("鍒")) { if (height >= 1 && height <= 6) { return false; } @@ -286,9 +286,9 @@ public class SeabirdFormatUtils { } /** - * 根据楼层判断有无电梯 - * @param floor 楼层 - * @return true表示有电梯 false表示无电梯 + * 鏍规嵁妤煎眰鍒ゆ柇鏈夋棤鐢垫 + * @param floor 妤煎眰 + * @return true琛ㄧず鏈夌數姊� false琛ㄧず鏃犵數姊� */ public static boolean checkIsElevator(int floor) { if (floor > 7) { @@ -298,9 +298,9 @@ public class SeabirdFormatUtils { } /** - * 是否要过滤房源 + * 鏄惁瑕佽繃婊ゆ埧婧� * @param data - * @return true表示要过滤,false不过滤 + * @return true琛ㄧず瑕佽繃婊わ紝false涓嶈繃婊� */ public static boolean filterAll(BasicDBObject data) { String estate_type = data.getString("estate_type"); @@ -328,9 +328,9 @@ public class SeabirdFormatUtils { } /** - * 过滤以及格式化 - * @param data 房源对象 - * @return 符合房源则返回格式化后的数据,不符合则返回null + * 杩囨护浠ュ強鏍煎紡鍖� + * @param data 鎴挎簮瀵硅薄 + * @return 绗﹀悎鎴挎簮鍒欒繑鍥炴牸寮忓寲鍚庣殑鏁版嵁锛屼笉绗﹀悎鍒欒繑鍥瀗ull */ public static BasicDBObject filterAllByForamt(BasicDBObject data) { data = formatAll(data); @@ -341,8 +341,8 @@ public class SeabirdFormatUtils { } /** - * 格式化房源
- * 装修,朝向,区域 + * 鏍煎紡鍖栨埧婧�
+ * 瑁呬慨锛屾湞鍚戯紝鍖哄煙 * @param data * @return */ diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/AddressLatlng.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/AddressLatlng.java index 45fc384df..f6ebe87a9 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/AddressLatlng.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/AddressLatlng.java @@ -34,7 +34,7 @@ public class AddressLatlng { public static void main(String[] args){ - AddressLatlng.getLngLatByAddress("上海", "金海路站"); + AddressLatlng.getLngLatByAddress("涓婃捣", "閲戞捣璺珯"); } public static Map getLngLatByAddress(String city, String address){ diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/AddressParser.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/AddressParser.java index 6d52633ad..b4d792e59 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/AddressParser.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/AddressParser.java @@ -17,51 +17,51 @@ import java.util.regex.Pattern; public class AddressParser { - static Pattern regExp_checkRoad1=Pattern.compile("^[\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[一二三四五六七八九十\\d]+(\u5F04|\u53F7)$"); - static Pattern regExp_checkRoad2=Pattern.compile("^[\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[一二三四五六七八九十\\d]+(\u5F04|\u53F7)[0-9]+\u652F\u5F04$"); - static Pattern regExp_checkRoad3=Pattern.compile("^[\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[一二三四五六七八九十\\d]+(\u5F04|\u53F7)[0-9]+\u53F7?\\-[0-9]+\u53F7$"); - static Pattern regExp_checkRoad4=Pattern.compile("^[\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[一二三四五六七八九十\\d]+(\u5F04|\u53F7)[0-9]+\u652F\u5F04[0-9]+\u53F7?\\-[0-9]+\u53F7$"); - static Pattern regExp_checkRoad5=Pattern.compile("^[\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[一二三四五六七八九十\\d]+$"); - static Pattern regExp_checkRoad6=Pattern.compile("^[\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[一二三四五六七八九十\\d]+(\u5F04|\u53F7)[0-9]+\u53F7$"); - static Pattern regExp_checkRoad7=Pattern.compile("^[\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[一二三四五六七八九十\\d]+(\u5F04|\u53F7)[0-9]+\u652F\u5F04[0-9]+\u53F7$"); - static Pattern regExp_checkRoad8=Pattern.compile("^[\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[一二三四五六七八九十\\d]+(\u5F04|\u53F7)?\\-[0-9]+(\u5F04|\u53F7)$"); + static Pattern regExp_checkRoad1=Pattern.compile("^[\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[涓�浜屼笁鍥涗簲鍏竷鍏節鍗乗\d]+(\u5F04|\u53F7)$"); + static Pattern regExp_checkRoad2=Pattern.compile("^[\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[涓�浜屼笁鍥涗簲鍏竷鍏節鍗乗\d]+(\u5F04|\u53F7)[0-9]+\u652F\u5F04$"); + static Pattern regExp_checkRoad3=Pattern.compile("^[\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[涓�浜屼笁鍥涗簲鍏竷鍏節鍗乗\d]+(\u5F04|\u53F7)[0-9]+\u53F7?\\-[0-9]+\u53F7$"); + static Pattern regExp_checkRoad4=Pattern.compile("^[\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[涓�浜屼笁鍥涗簲鍏竷鍏節鍗乗\d]+(\u5F04|\u53F7)[0-9]+\u652F\u5F04[0-9]+\u53F7?\\-[0-9]+\u53F7$"); + static Pattern regExp_checkRoad5=Pattern.compile("^[\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[涓�浜屼笁鍥涗簲鍏竷鍏節鍗乗\d]+$"); + static Pattern regExp_checkRoad6=Pattern.compile("^[\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[涓�浜屼笁鍥涗簲鍏竷鍏節鍗乗\d]+(\u5F04|\u53F7)[0-9]+\u53F7$"); + static Pattern regExp_checkRoad7=Pattern.compile("^[\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[涓�浜屼笁鍥涗簲鍏竷鍏節鍗乗\d]+(\u5F04|\u53F7)[0-9]+\u652F\u5F04[0-9]+\u53F7$"); + static Pattern regExp_checkRoad8=Pattern.compile("^[\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[涓�浜屼笁鍥涗簲鍏竷鍏節鍗乗\d]+(\u5F04|\u53F7)?\\-[0-9]+(\u5F04|\u53F7)$"); static Pattern invalidAddrStartRegx=Pattern.compile("^[,\\(\\)\\-\\.\\&\\/\"\']"); - static Pattern invalidAddrNotationRegx=Pattern.compile("[^一-龥\\w#\\/\\-\\\\]+"); + static Pattern invalidAddrNotationRegx=Pattern.compile("[^涓�-榫\w#\\/\\-\\\\]+"); static Pattern regExp_splitAddress1=Pattern.compile("\\s+|\u3000|\u3001|\uFF0C|,|/|;"); - static Pattern regExp_splitAddress2=Pattern.compile("^([\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[一二三四五六七八九十\\d]+(\u5F04|\u53F7)?)"); + static Pattern regExp_splitAddress2=Pattern.compile("^([\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[涓�浜屼笁鍥涗簲鍏竷鍏節鍗乗\d]+(\u5F04|\u53F7)?)"); static Pattern regExp_checkRoadNo1=Pattern.compile("^[0-9]+(\u5F04|\u53F7)$"); static Pattern regExp_replaceRoadNo1=Pattern.compile("[0-9]+(\u53F7)"); static Pattern regExp_replaceRoadNo2=Pattern.compile("[0-9]+(\u5F04)"); static Pattern[] address_regExp_arr=new Pattern[]{ - Pattern.compile("^([\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[一二三四五六七八九十\\d]+(\u5F04|\u53F7)?\\-[0-9]+(\u5F04|\u53F7))") - , Pattern.compile("^([\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[一二三四五六七八九十\\d]+(\u5F04|\u53F7)[0-9]+\u652F\u5F04[0-9]+\u53F7)") - , Pattern.compile("^([\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[一二三四五六七八九十\\d]+(\u5F04|\u53F7)[0-9]+\u652F\u5F04[0-9]+\u53F7?\\-[0-9]+\u53F7)") - , Pattern.compile("^([\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[一二三四五六七八九十\\d]+(\u5F04|\u53F7)[0-9]+\u53F7?\\-[0-9]+\u53F7)") - , Pattern.compile("^([\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[一二三四五六七八九十\\d]+(\u5F04|\u53F7)[0-9]+\u652F\u5F04)") - , Pattern.compile("^([\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[一二三四五六七八九十\\d]+(\u5F04|\u53F7)[0-9]+\u53F7)") - , Pattern.compile("^([\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[一二三四五六七八九十\\d]+(\u5F04|\u53F7))") - , Pattern.compile("^([\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[一二三四五六七八九十\\d]+)") + Pattern.compile("^([\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[涓�浜屼笁鍥涗簲鍏竷鍏節鍗乗\d]+(\u5F04|\u53F7)?\\-[0-9]+(\u5F04|\u53F7))") + , Pattern.compile("^([\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[涓�浜屼笁鍥涗簲鍏竷鍏節鍗乗\d]+(\u5F04|\u53F7)[0-9]+\u652F\u5F04[0-9]+\u53F7)") + , Pattern.compile("^([\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[涓�浜屼笁鍥涗簲鍏竷鍏節鍗乗\d]+(\u5F04|\u53F7)[0-9]+\u652F\u5F04[0-9]+\u53F7?\\-[0-9]+\u53F7)") + , Pattern.compile("^([\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[涓�浜屼笁鍥涗簲鍏竷鍏節鍗乗\d]+(\u5F04|\u53F7)[0-9]+\u53F7?\\-[0-9]+\u53F7)") + , Pattern.compile("^([\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[涓�浜屼笁鍥涗簲鍏竷鍏節鍗乗\d]+(\u5F04|\u53F7)[0-9]+\u652F\u5F04)") + , Pattern.compile("^([\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[涓�浜屼笁鍥涗簲鍏竷鍏節鍗乗\d]+(\u5F04|\u53F7)[0-9]+\u53F7)") + , Pattern.compile("^([\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[涓�浜屼笁鍥涗簲鍏竷鍏節鍗乗\d]+(\u5F04|\u53F7))") + , Pattern.compile("^([\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[涓�浜屼笁鍥涗簲鍏竷鍏節鍗乗\d]+)") }; - static Pattern address_regExp_1=Pattern.compile("^(([\u4e00-\u9fa5]{2,30}(\u5927\u9053|\u8DEF|街|道)([一二三四五六七八九十\\d]+(\u5F04|\u53F7))?)+)([\u4e00-\u9fa5\\.·]{3,15})([\\w]+.*)"); - static Pattern address_regExp_2=Pattern.compile("^([\u4e00-\u9fa5]{2,30}(\u5927\u9053|\u8DEF|街|道)([一二三四五六七八九十\\d]+(\u5F04|\u53F7)))(.*)"); - static Pattern address_regExp_3=Pattern.compile("^([\u4e00-\u9fa5\\.·]{4,30})([第一二三四五六七八九十\\w东南西北甲乙丙]+(房|单元|侧|区|#|栋|幢|座|号|楼).*)"); - static Pattern address_regExp_4=Pattern.compile("^(([\u4e00-\u9fa5]{4,30}([\\d]+米)?)+)([第一二三四五六七八九十\\w东南西北甲乙丙]+(房|单元|侧|区|#|栋|幢|座|号|楼).*)"); - static Pattern address_regExp_5=Pattern.compile("^([\u4e00-\u9fa5\\.·]{4,30})([\\w\\-]+.*)"); + static Pattern address_regExp_1=Pattern.compile("^(([\u4e00-\u9fa5]{2,30}(\u5927\u9053|\u8DEF|琛梶閬�)([涓�浜屼笁鍥涗簲鍏竷鍏節鍗乗\d]+(\u5F04|\u53F7))?)+)([\u4e00-\u9fa5\\.路]{3,15})([\\w]+.*)"); + static Pattern address_regExp_2=Pattern.compile("^([\u4e00-\u9fa5]{2,30}(\u5927\u9053|\u8DEF|琛梶閬�)([涓�浜屼笁鍥涗簲鍏竷鍏節鍗乗\d]+(\u5F04|\u53F7)))(.*)"); + static Pattern address_regExp_3=Pattern.compile("^([\u4e00-\u9fa5\\.路]{4,30})([绗竴浜屼笁鍥涗簲鍏竷鍏節鍗乗\w涓滃崡瑗垮寳鐢蹭箼涓橾+(鎴縷鍗曞厓|渚鍖簗#|鏍媩骞搴鍙穦妤�).*)"); + static Pattern address_regExp_4=Pattern.compile("^(([\u4e00-\u9fa5]{4,30}([\\d]+绫�)?)+)([绗竴浜屼笁鍥涗簲鍏竷鍏節鍗乗\w涓滃崡瑗垮寳鐢蹭箼涓橾+(鎴縷鍗曞厓|渚鍖簗#|鏍媩骞搴鍙穦妤�).*)"); + static Pattern address_regExp_5=Pattern.compile("^([\u4e00-\u9fa5\\.路]{4,30})([\\w\\-]+.*)"); - static String room_houseSuffix="[幢号座楼栋#]+"; - static String room_unitSuffix="[单元梯座]+"; - static String room_numSuffix="[房室号]{0,2}"; + static String room_houseSuffix="[骞㈠彿搴фゼ鏍�#]+"; + static String room_unitSuffix="[鍗曞厓姊骇]+"; + static String room_numSuffix="[鎴垮鍙穄{0,2}"; static Pattern[] room_regExp_arr2=new Pattern[]{ - Pattern.compile(String.format("([\\w]+)%s([\\w]+)%s[\\d]+层([\\w]+)%s$", room_houseSuffix, room_unitSuffix, room_numSuffix)) + Pattern.compile(String.format("([\\w]+)%s([\\w]+)%s[\\d]+灞�([\\w]+)%s$", room_houseSuffix, room_unitSuffix, room_numSuffix)) , Pattern.compile(String.format("([\\w]+)%s([\\w]+)%s([\\w]+)%s$", room_houseSuffix, room_unitSuffix, room_numSuffix)) , Pattern.compile(String.format("([\\w]+)%s([\\w]+)\\-([\\w]+)%s$", room_houseSuffix, room_numSuffix)) - , Pattern.compile(String.format("([\\w]+)%s()[\\d]+层([\\w]+)%s$", room_houseSuffix, room_numSuffix)) + , Pattern.compile(String.format("([\\w]+)%s()[\\d]+灞�([\\w]+)%s$", room_houseSuffix, room_numSuffix)) , Pattern.compile(String.format("([\\w]+)\\-([\\w]+)\\-([\\w]+)%s$", room_numSuffix)) , Pattern.compile(String.format("([\\w]+)\\\\([\\w]+)\\\\([\\w]+)$")) , Pattern.compile(String.format("()([\\w]+)\\/([\\w]+)$")) @@ -78,9 +78,9 @@ public class AddressParser { }; - //替换重复的镇名或路名: 千灯镇千灯镇黄浦路 + //鏇挎崲閲嶅鐨勯晣鍚嶆垨璺悕锛� 鍗冪伅闀囧崈鐏晣榛勬郸璺� static String replaceRepeatAddr(String address){ - Pattern placeRegx=Pattern.compile("([^镇.]{2,5}镇)"); + Pattern placeRegx=Pattern.compile("([^闀�.]{2,5}闀�)"); Matcher matcher=placeRegx.matcher(address); if(matcher.find()){ String place=matcher.group(1); @@ -94,7 +94,7 @@ public class AddressParser { } } - placeRegx=Pattern.compile("([^路.]{2,5}路)"); + placeRegx=Pattern.compile("([^璺�.]{2,5}璺�)"); matcher=placeRegx.matcher(address); if(matcher.find()){ String place=matcher.group(1); @@ -139,7 +139,7 @@ public class AddressParser { if(cityParents!=null){ for(int k=0; k splitMutilAddr(String city, String address){ @@ -358,7 +358,7 @@ public class AddressParser { addresses.add(address); }else{ /** - * 匹配多个地址 + * 鍖归厤澶氫釜鍦板潃 */ addresses=splitMutilAddr(city, address1); if(addresses.size()==0){ @@ -369,11 +369,11 @@ public class AddressParser { } /** - * result[0]: 城市 - * result[1]: 区域 - * result[2]: 地址 - * result[3]: 小区名 - * result[4]: 楼号室号 + * result[0]: 鍩庡競 + * result[1]: 鍖哄煙 + * result[2]: 鍦板潃 + * result[3]: 灏忓尯鍚� + * result[4]: 妤煎彿瀹ゅ彿 * * @param city * @param origAddress @@ -395,19 +395,19 @@ public class AddressParser { String address=null; String name=null; String restAddr=null; - //提取城市 + //鎻愬彇鍩庡競 String[] rt=parseCity(origAddress); origAddress=rt[1]; if(!isEmpty(rt[0])){ city=rt[0]; } - //去除省名城市名区等 + //鍘婚櫎鐪佸悕鍩庡競鍚嶅尯绛� String[] rt2=doReplaceDistrict(city, origAddress, true); if(rt2!=null){ addressResult.region=rt2[0]; origAddress=rt2[1]; }else if(isEmpty(city)){ - //提取区域 + //鎻愬彇鍖哄煙 rt2=parseRegion(origAddress); if(rt2!=null){ city=rt2[0]; @@ -416,7 +416,7 @@ public class AddressParser { } if(!isEmpty(addressResult.region)){ - Pattern regionRegx=Pattern.compile("^"+addressResult.region+"(区|县|市)?(房价|均价)?$"); + Pattern regionRegx=Pattern.compile("^"+addressResult.region+"(鍖簗鍘縷甯�)?(鎴夸环|鍧囦环)?$"); matcher=regionRegx.matcher(origAddress); if(matcher.find()){ addressResult.city=city; @@ -427,7 +427,7 @@ public class AddressParser { int matchType=0; /** - * 解析室号 + * 瑙f瀽瀹ゅ彿 */ for(int k=0; k city_districts=new LinkedHashMap(); static{ - city_districts.put("上海", new String[]{"闸北", "南汇", "奉贤", "黄浦", "卢湾", "徐汇", "长宁", "静安", "普陀", "虹口", "杨浦", "宝山", "闵行", "浦东", "嘉定", "松江", "金山", "青浦", "崇明" }); - city_districts.put("北京", new String[]{"北京周边", "石景山", "延庆", "通州", "门头沟", "朝阳", "顺义", "平谷", "怀柔", "昌平", "西城", "东城", "海淀", "密云", "大兴", "房山", "丰台" }); - city_districts.put("广州", new String[]{"白云", "清远", "天河", "黄埔", "海珠", "萝岗", "荔湾", "南沙", "番禺", "花都", "越秀", "增城", "从化", "广州周边" }); - city_districts.put("深圳", new String[]{"惠州", "东莞", "福田", "罗湖", "南山", "盐田", "宝安", "龙岗", "坪山新区", "光明新区", "大鹏新区", "龙华新区" }); - city_districts.put("杭州", new String[]{"余杭", "桐庐", "西湖", "建德", "杭州周边", "萧山", "富阳", "临安", "淳安", "江干", "拱墅", "滨江", "下城", "上城" }); - city_districts.put("天津", new String[]{"宁河", "河东", "开发", "和平", "西青", "北辰", "大港", "南开", "河西", "河北", "津南", "红桥", "塘沽", "东丽", "蓟县", "武清", "静海", "汉沽", "宝坻" }); - city_districts.put("绍兴", new String[]{"新昌", "袍江", "嵊州", "越城", "上虞", "诸暨", "绍兴", "镜湖" }); - city_districts.put("南京", new String[]{"建邺", "南京周边", "下关", "玄武", "浦口", "雨花", "栖霞", "白下", "秦淮", "鼓楼", "江宁", "六合", "溧水", "高淳" }); - city_districts.put("西安", new String[]{"高新", "临潼", "城西", "灞桥", "未央", "城内", "城北", "城东", "城南", "咸阳", "浐灞", "周边", "经开", "西咸新区", "长安", "新城", "雁塔", "莲湖", "碑林", "阎良", "蓝田", "周至", "户县", "高陵" }); - city_districts.put("成都", new String[]{"蒲江", "大邑", "金堂", "高新西", "邛崃", "都江堰", "崇州", "新津", "郫县", "双流", "武侯", "金牛", "锦江", "温江", "青羊", "青白江", "龙泉驿", "成华", "新都", "彭州", "高新" }); - city_districts.put("武汉", new String[]{"青山", "阳逻", "硚口", "沌口开发", "黄陂", "汉南", "新洲", "蔡甸", "汉阳", "江岸", "江汉", "东西湖", "洪山", "武昌", "江夏", "东湖高新开发" }); - city_districts.put("宁波", new String[]{"东钱湖旅游渡假", "鄞州", "象山", "杭州湾新", "宁波周边", "高新", "镇海", "江北", "宁海", "江东", "海曙", "余姚", "奉化", "北仑", "慈溪" }); - city_districts.put("青岛", new String[]{"市南", "即墨", "黄岛", "市北", "李沧", "崂山", "城阳", "胶州", "平度", "莱西" }); - city_districts.put("沈阳", new String[]{"法库", "辽中", "沈河", "和平", "皇姑", "大东", "铁西", "苏家屯", "东陵", "沈北", "于洪", "新民", "康平", "浑南" }); - city_districts.put("大连", new String[]{"高新园", "长海", "瓦房店", "长兴岛", "开发", "大连周边", "普湾新区", "西岗", "中山", "沙河口", "甘井子", "旅顺口", "金州", "普兰店", "庄河" }); - city_districts.put("济南", new String[]{"平阴", "章丘", "市中", "天桥", "历下", "槐荫", "历城", "长清", "商河", "济阳", "高新" }); - city_districts.put("福州", new String[]{"仓山", "晋安", "台江", "闽清", "鼓楼", "马尾", "闽侯", "长乐", "福清", "连江", "罗源", "永泰", "平潭" }); - city_districts.put("郑州", new String[]{"管城回族", "金水", "上街", "惠济", "郑东", "高新技术开发", "经济技术开发", "新郑市", "登封市", "新密市", "巩义市", "荥阳市", "中牟县", "中原", "二七" }); - city_districts.put("长沙", new String[]{"宁乡", "星沙", "开福", "雨花", "天心", "岳麓", "芙蓉", "望城", "浏阳" }); - city_districts.put("昆明", new String[]{"西山", "安宁", "呈贡", "官渡", "盘龙", "五华", "东川", "富民", "晋宁", "嵩明", "寻甸", "宜良", "禄劝", "石林" }); - city_districts.put("长春", new String[]{"榆树市", "九台市", "经开", "南关", "朝阳", "二道", "高新", "宽城", "绿园", "汽开", "双阳", "德惠市", "农安县", "净月" }); - city_districts.put("厦门", new String[]{"同安", "翔安", "湖里", "思明", "集美", "海沧" }); - city_districts.put("哈尔滨", new String[]{"阿城", "道里", "道外", "呼兰", "南岗", "平房", "松北", "香坊", "宾县", "巴彦", "依兰", "延寿", "木兰", "通河", "方正", "五常", "双城", "尚志" }); - city_districts.put("苏州", new String[]{"园区", "新区", "苏州周边", "吴江", "太仓", "常熟", "吴中", "相城", "张家港", "昆山", "姑苏" }); - city_districts.put("无锡", new String[]{"宜兴", "新区", "北塘", "滨湖", "南长", "崇安", "锡山", "惠山", "江阴" }); - city_districts.put("合肥", new String[]{"巢湖", "庐阳", "包河", "瑶海", "高新", "新站", "蜀山", "经开", "政务", "滨湖", "长丰县", "肥东县", "肥西县" }); - city_districts.put("太原", new String[]{"榆次", "尖草坪", "杏花岭", "小店", "迎泽", "万柏林", "晋源", "古交", "清徐", "阳曲", "娄烦" }); - city_districts.put("石家庄", new String[]{"矿区", "深泽", "开发", "空港新", "裕华", "新华", "桥西", "平山", "桥东", "正定", "鹿泉", "长安", "藁城", "栾城", "新乐", "辛集", "晋州", "赵县", "赞皇", "灵寿", "高邑", "无极", "行唐", "井陉", "元氏" }); - city_districts.put("南昌", new String[]{"新建", "安义", "湾里", "昌北", "进贤", "南昌县", "东湖", "西湖", "青云谱", "青山湖", "红谷滩", "高新开发", "桑海", "英雄" }); - city_districts.put("呼和浩特", new String[]{"郊区", "新城", "回民", "玉泉", "金川开发", "赛罕", "金桥开发", "如意开发", "金山开发", "土默特左旗", "托克托", "和林格尔", "清水河", "武川" }); - city_districts.put("南宁", new String[]{"江南", "西乡塘", "马山县", "武鸣县", "邕宁", "青秀", "桂林", "钦州", "横县", "隆安县", "兴宁", "北海", "上林县", "良庆", "宾阳县" }); - city_districts.put("烟台", new String[]{"招远", "高新", "栖霞", "芝罘", "福山", "海阳", "开发", "龙口", "莱山", "莱州", "牟平", "蓬莱", "莱阳", "长岛县" }); - city_districts.put("佛山", new String[]{"禅城", "三水", "南海", "顺德", "高明" }); - city_districts.put("唐山", new String[]{"路南", "路北", "古冶", "开平", "丰南", "丰润", "滦县", "滦南", "乐亭", "迁西", "玉田", "唐海", "海港开发", "南堡", "遵化", "迁安", "高新", "曹妃甸", "汉沽", "芦台" }); - city_districts.put("泉州", new String[]{"石狮", "洛江", "惠安", "德化", "永春", "安溪", "晋江", "丰泽", "泉港", "鲤城", "南安" }); - city_districts.put("东莞", new String[]{"凤岗", "石碣", "石龙", "莞城", "长安", "虎门", "东城", "塘厦", "寮步", "常平", "樟木头", "厚街", "黄江", "南城", "石排", "清溪", "沙田", "大朗", "万江", "横沥", "茶山", "大岭山", "道滘", "东坑", "高埗", "洪梅", "麻涌", "企石", "桥头", "望牛墩", "谢岗", "中堂", "松山湖" }); - city_districts.put("海口", new String[]{"龙华", "秀英", "美兰", "琼山" }); - city_districts.put("汕头", new String[]{"金平", "龙湖", "濠江", "澄海", "南澳", "潮南", "潮阳" }); - city_districts.put("徐州", new String[]{"丰县", "鼓楼", "云龙", "贾汪", "泉山", "铜山", "金山桥开发", "睢宁", "新城", "沛县", "新沂", "邳州" }); - city_districts.put("珠海", new String[]{"香洲", "金湾", "斗门", "横琴", "高栏港", "高新", "万山" }); - city_districts.put("温州", new String[]{"瓯海", "鹿城", "龙湾", "瑞安", "乐清", "洞头", "永嘉", "平阳", "苍南", "文成", "泰顺" }); - city_districts.put("常州", new String[]{"溧阳", "戚区", "天宁", "武进", "新北", "金坛", "钟楼" }); - city_districts.put("南通", new String[]{"崇川", "港闸", "通州", "开发", "海安", "如东", "启东", "如皋", "海门" }); - city_districts.put("大庆", new String[]{"龙凤", "高新", "林甸县", "杜尔伯特蒙古族自治县", "肇源县", "红岗", "萨尔图", "肇州县", "让胡路", "大同" }); - city_districts.put("中山", new String[]{"沙溪", "阜沙", "三角", "民众", "五桂山", "三乡", "板芙", "神湾", "坦洲", "古镇", "小榄", "东凤", "南头", "横栏", "大涌", "东升", "黄圃", "南朗", "东区", "南区", "西区", "石岐", "火炬", "港口" }); - city_districts.put("威海", new String[]{"环翠", "荣成", "文登", "经区", "工业", "高区", "乳山" }); - city_districts.put("金华", new String[]{"东阳", "金东", "浦江", "婺城", "兰溪", "磐安", "武义", "永康", "义乌" }); - city_districts.put("嘉兴", new String[]{"市区", "南湖", "秀洲", "嘉善", "海盐", "海宁", "平湖", "桐乡", "经济开发", "中心城", "运河", "国际商务" }); - city_districts.put("湖州", new String[]{"市中心", "织里", "吴兴", "西南新城", "湖东", "仁皇山", "南浔", "南太湖", "凤凰开发", "德清", "长兴", "安吉" }); - city_districts.put("镇江", new String[]{"京口", "润州", "丹徒", "镇江新", "丹阳", "扬中", "句容" }); - city_districts.put("东营", new String[]{"" }); - city_districts.put("惠州", new String[]{"博罗", "惠城", "龙门", "惠东", "仲恺", "大亚湾", "惠阳" }); - city_districts.put("扬州", new String[]{"开发", "广陵", "邗江", "维扬", "宝应", "仪征", "高邮", "江都" }); - city_districts.put("盐城", new String[]{"全盐城", "盐都", "滨海", "响水", "东台", "大丰", "阜宁", "建湖", "亭湖", "射阳" }); - city_districts.put("江门", new String[]{"恩平市", "江海", "开平市", "新会", "台山市", "蓬江", "鹤山市" }); - city_districts.put("常熟", new String[]{"古里镇", "董浜镇", "支塘镇", "王庄镇", "尚湖镇", "虞山镇", "海虞镇", "梅李镇", "新港镇", "沙家浜", "辛庄镇", "练塘镇", "东南开发区" }); - city_districts.put("昆山", new String[]{"巴城", "玉山", "淀山湖", "周庄", "张浦", "周市", "陆家", "周边", "花桥", "开发区", "锦溪", "千灯" }); - city_districts.put("萧山", new String[]{"" }); - city_districts.put("义乌", new String[]{"义乌" }); - city_districts.put("余姚", new String[]{"余姚" }); - city_districts.put("慈溪", new String[]{"慈溪" }); - city_districts.put("云浮", new String[]{"云城", "罗定", "新兴", "郁南", "云安" }); - city_districts.put("本溪", new String[]{"平山", "明山", "溪湖", "南芬", "本溪", "桓仁" }); - city_districts.put("玉溪", new String[]{"红塔", "峨山", "通海", "江川", "华宁", "澄江", "元江", "易门", "新平" }); - city_districts.put("鄂尔多斯", new String[]{"" }); - city_districts.put("贵阳", new String[]{"南明", "小河", "云岩", "花溪", "乌当", "白云", "金阳", "开阳", "修文", "息烽", "清镇" }); - city_districts.put("乌鲁木齐", new String[]{"天山", "沙依巴克", "新市", "水磨沟", "头屯河", "米东", "达坂城", "乌鲁木齐县" }); - city_districts.put("泰州", new String[]{"高港", "姜堰市", "城西", "城南", "城北", "泰兴市", "靖江市", "兴化市", "城中", "城东" }); - city_districts.put("秦皇岛", new String[]{"卢龙县", "青龙县", "海港", "抚宁县", "昌黎县", "山海关", "北戴河" }); - city_districts.put("台州", new String[]{"路桥", "三门", "黄岩", "临海", "椒江", "天台", "仙居", "玉环", "温岭" }); - city_districts.put("清远", new String[]{"新城", "清新", "清城", "阳山", "旧城", "连州", "英德", "佛冈", "连南", "连山" }); - city_districts.put("兰州", new String[]{"永登", "城关", "七里河", "西固", "安宁", "红古", "皋兰", "榆中" }); - city_districts.put("柳州", new String[]{"柳城", "三江", "柳东", "融安", "柳江", "鱼峰", "城中", "柳南", "融水", "柳北", "鹿寨", "高新" }); - city_districts.put("湛江", new String[]{"麻章", "坡头", "霞山", "廉江", "吴川", "雷州", "徐闻", "遂溪", "赤坎", "开发" }); - city_districts.put("赣州", new String[]{"赣县", "信丰", "章贡", "宁都", "瑞金", "南康" }); - city_districts.put("丹东", new String[]{"全丹东", "振安", "元宝", "宽甸", "凤城", "东港", "振兴" }); - city_districts.put("咸阳", new String[]{"兴平市", "武功县", "秦都", "长武县", "旬邑县", "渭城", "杨陵", "礼泉县", "乾县", "泾阳县", "三原县", "永寿县", "彬县", "淳化县" }); - city_districts.put("丽江", new String[]{"全丽江", "古城", "永胜", "玉龙", "宁蒗", "华坪" }); - city_districts.put("张家界", new String[]{"全张家界", "慈利", "永定", "武陵源", "桑植" }); - city_districts.put("银川", new String[]{"西夏", "永宁", "贺兰", "灵武", "金凤", "兴庆" }); - city_districts.put("大理", new String[]{"全大理", "洱源", "剑川", "大理", "漾濞", "巍山", "宾川", "弥渡", "鹤庆", "祥云", "永平", "云龙", "南涧" }); - city_districts.put("宿迁", new String[]{"宿豫", "沭阳", "泗洪", "宿城", "泗阳", "宿城新" }); - city_districts.put("芜湖", new String[]{"镜湖", "芜湖", "繁昌", "南陵", "开发", "弋江", "鸠江", "三山" }); - city_districts.put("马鞍山", new String[]{"当涂县", "花山", "开发", "雨山", "金家庄", "含山县", "佳山", "慈湖", "和县", "向山" }); - city_districts.put("玉林", new String[]{"全玉林", "容县", "北流", "博白", "陆川", "兴业", "玉州" }); - city_districts.put("潍坊", new String[]{"安丘", "高密", "昌邑", "临朐", "昌乐", "奎文", "潍城", "寒亭", "坊子", "经济开发", "高新技术开发", "青州", "诸城", "寿光", "滨海经济开发" }); - city_districts.put("连云港", new String[]{"连云", "开发", "海州", "东海", "赣榆", "灌南", "灌云", "新浦" }); - city_districts.put("延安", new String[]{"富县", "洛川", "黄陵", "甘泉", "全延安", "吴起", "延长", "宝塔", "黄龙", "安塞", "子长", "志丹", "宜川", "延川" }); - city_districts.put("九江", new String[]{"浔阳", "庐山", "彭泽县", "星子县", "德安县", "都昌县", "九江县", "共青城市", "修水县", "永修县", "武宁县", "瑞昌市", "湖口县", "开发" }); - city_districts.put("三亚", new String[]{"陵水", "博鳌", "乐东", "琼海", "万宁", "小东海", "亚龙湾", "保亭", "五指山", "三亚湾", "海棠湾", "崖城", "凤凰", "天涯", "田独", "育才", "河东", "河西", "大东海" }); - city_districts.put("宜昌", new String[]{"五峰土家族自治县", "猇亭", "点军", "伍家岗", "西陵", "夷陵", "秭归县", "宜都", "兴山县", "远安县", "东山开发", "枝江", "当阳", "长阳土家族自治县" }); - city_districts.put("六盘水", new String[]{"全六盘水", "盘县", "六枝特", "钟山", "水城" }); - city_districts.put("吉林", new String[]{"船营", "龙潭", "丰满", "经开", "永吉", "高新", "蛟河", "桦甸", "舒兰", "磐石", "昌邑" }); - city_districts.put("鞍山", new String[]{"高新", "铁西", "海城", "立山", "岫岩满族自治县", "千山", "台安", "铁东" }); - city_districts.put("保定", new String[]{"满城", "安国", "南市", "涿州", "高新技术产业开发", "新市", "定州", "北市", "清苑", "高碑店" }); - city_districts.put("宜宾", new String[]{"珙县", "高县", "江安", "宜宾", "长宁", "南溪", "翠屏", "兴文", "筠连", "屏山", "全宜宾" }); - city_districts.put("莆田", new String[]{"涵江", "仙游", "城厢", "秀屿", "全莆田", "荔城" }); - city_districts.put("西宁", new String[]{"城南", "城东", "城西", "城北", "城南新", "城北生物科技园", "海湖", "城中" }); - city_districts.put("自贡", new String[]{"全自贡", "大安", "贡井", "荣县", "自流井", "富顺", "沿滩" }); - city_districts.put("淄博", new String[]{"淄川", "周村", "高新", "沂源", "桓台", "临淄", "张店", "博山", "高青" }); - city_districts.put("攀枝花", new String[]{"仁和", "米易", "盐边", "西区", "东区", "全攀枝花" }); - city_districts.put("衢州", new String[]{"北区", "双港开发", "南区", "西区", "巨化", "老城", "经济开发", "柯城", "衢江", "江山", "龙游", "常山", "开化" }); - city_districts.put("邯郸", new String[]{"高开", "邱县", "永年", "曲周", "邯郸", "肥乡", "馆陶", "涉县", "广平", "魏县", "磁县", "大名", "丛台", "邯山", "峰峰", "武安", "鸡泽", "成安", "临漳", "复兴" }); - city_districts.put("北海", new String[]{"银海", "铁山港", "海城", "合浦" }); - city_districts.put("廊坊", new String[]{"大城", "安次", "大厂", "永清", "固安", "霸州", "香河", "文安", "三河", "广阳" }); - city_districts.put("洛阳", new String[]{"嵩县", "涧西", "西工", "老城", "瀍河", "洛龙", "吉利", "偃师", "栾川", "孟津", "伊川", "宜阳", "新安", "洛宁", "汝阳" }); - city_districts.put("桂林", new String[]{"叠彩", "象山", "七星", "雁山", "灵川", "兴安", "全州", "灌阳", "资源", "永福", "荔浦", "阳朔", "平乐", "龙胜", "恭城", "秀峰", "西城" }); - city_districts.put("株洲", new String[]{"荷塘", "芦淞", "攸县", "石峰", "株洲", "天元", "全株洲", "茶陵", "醴陵", "炎陵" }); - city_districts.put("湘潭", new String[]{"岳塘", "全湘潭", "湘乡", "湘潭", "雨湖", "韶山" }); - city_districts.put("重庆", new String[]{"铜梁", "开县", "南川", "潼南", "重庆周边", "合川", "永川", "武隆", "江津", "长寿", "万州", "涪陵", "綦江", "璧山", "万盛", "渝中", "江北", "渝北", "南岸", "沙坪坝", "九龙坡", "大渡口", "北碚", "巴南" }); - city_districts.put("绵阳", new String[]{"安县", "江油市", "平武县", "高新", "科创园", "农科", "梓潼县", "涪城", "北川县", "盐亭县", "仙海", "三台县", "经开", "游仙" }); - city_districts.put("岳阳", new String[]{"岳阳楼区" }); - city_districts.put("增城", new String[]{"增城" }); - city_districts.put("吴江", new String[]{"松陵", "盛泽", "同里", "震泽", "平望", "桃源", "横扇", "七都", "黎里", "滨湖新城", "汾湖" }); - city_districts.put("瑞安", new String[]{"碧山", "安阳", "曹村", "东山", "飞云", "湖岭", "锦湖", "龙湖", "马屿", "潘岱", "平阳坑", "上望", "塘下", "陶山", "汀田", "仙降", "莘塍", "玉海", "老城" }); - city_districts.put("乐清", new String[]{"清江", "大荆", "雁荡", "南塘", "芙蓉", "南岳", "蒲岐", "虹桥", "翁垟", "象阳", "仙溪", "七里港", "北白象", "淡溪", "石帆", "湖雾", "白石", "黄华", "磐石", "柳市", "乐成" }); - city_districts.put("奉化", new String[]{"奉化" }); - city_districts.put("温岭", new String[]{"温岭" }); - city_districts.put("宜兴", new String[]{"芳桥", "宜城", "新建", "新庄", "丁蜀", "湖父", "官林", "周铁", "万石", "高塍", "张渚", "西渚", "徐舍", "杨巷", "和桥", "太华", "新街", "环保科技工业园", "宜兴经济开发区", "屺亭" }); - city_districts.put("肇庆", new String[]{"鼎湖", "德庆", "广宁", "大旺", "四会", "高要", "怀集", "封开", "端州" }); - city_districts.put("安阳", new String[]{"安阳新区", "开发区", "安阳县", "滑县", "林州", "龙安", "殷都", "北关", "文峰", "内黄", "汤阴" }); - city_districts.put("曲靖", new String[]{"马龙", "会泽", "罗平", "师宗", "沾益", "陆良", "富源", "宣威", "麒麟" }); - city_districts.put("衡阳", new String[]{"南岳", "珠晖", "雁峰", "石鼓", "蒸湘", "常宁", "耒阳", "衡南", "衡阳县", "衡山", "衡东", "祁东" }); - city_districts.put("新乡", new String[]{"卫滨", "红旗", "牧野", "凤泉", "辉县", "卫辉", "新乡县", "获嘉", "原阳", "延津", "封丘", "长垣" }); - city_districts.put("营口", new String[]{"站前", "西市", "老边", "鲅鱼圈", "大石桥", "盖州" }); - city_districts.put("潮州", new String[]{"湘桥", "枫溪", "潮安", "饶平" }); - city_districts.put("河源", new String[]{"源城", "东源", "和平", "连平", "龙川", "紫金" }); - city_districts.put("黄石", new String[]{"黄石港", "西塞山", "下陆", "铁山", "大冶", "阳新", "黄石经济开发区" }); - city_districts.put("焦作", new String[]{"温县", "解放", "山阳", "中站", "马村", "高新", "沁阳", "孟州", "博爱", "武陟", "修武" }); - city_districts.put("揭阳", new String[]{"榕城", "揭东", "惠来", "揭西", "普宁" }); - city_districts.put("茂名", new String[]{"茂港", "茂南", "信宜", "化州", "高州", "电白" }); - city_districts.put("牡丹江", new String[]{"东安", "西安", "爱民", "阳明", "江南", "绥芬河", "宁安", "海林", "穆棱", "林口", "东宁" }); - city_districts.put("盘锦", new String[]{"大洼", "盘山", "双台子", "兴隆台" }); - city_districts.put("平顶山", new String[]{"郏县", "叶县", "湛河", "石龙", "新华", "卫东", "汝州", "舞钢", "宝丰", "鲁山" }); - city_districts.put("韶关", new String[]{"仁化", "翁源", "新丰", "始兴", "南雄", "乐昌", "浈江", "武江", "曲江", "乳源" }); - city_districts.put("阳江", new String[]{"阳春", "阳东", "阳西", "海陵区", "高新区", "江城" }); - city_districts.put("梅州", new String[]{"梅江", "兴宁", "梅县", "平远", "蕉岭", "大埔", "丰顺", "五华" }); + city_districts.put("涓婃捣", new String[]{"闂稿寳", "鍗楁眹", "濂夎搐", "榛勬郸", "鍗㈡咕", "寰愭眹", "闀垮畞", "闈欏畨", "鏅檧", "铏瑰彛", "鏉ㄦ郸", "瀹濆北", "闂佃", "娴︿笢", "鍢夊畾", "鏉炬睙", "閲戝北", "闈掓郸", "宕囨槑" }); + city_districts.put("鍖椾含", new String[]{"鍖椾含鍛ㄨ竟", "鐭虫櫙灞�", "寤跺簡", "閫氬窞", "闂ㄥご娌�", "鏈濋槼", "椤轰箟", "骞宠胺", "鎬�鏌�", "鏄屽钩", "瑗垮煄", "涓滃煄", "娴锋穩", "瀵嗕簯", "澶у叴", "鎴垮北", "涓板彴" }); + city_districts.put("骞垮窞", new String[]{"鐧戒簯", "娓呰繙", "澶╂渤", "榛勫煍", "娴风彔", "钀濆矖", "鑽旀咕", "鍗楁矙", "鐣", "鑺遍兘", "瓒婄", "澧炲煄", "浠庡寲", "骞垮窞鍛ㄨ竟" }); + city_districts.put("娣卞湷", new String[]{"鎯犲窞", "涓滆帪", "绂忕敯", "缃楁箹", "鍗楀北", "鐩愮敯", "瀹濆畨", "榫欏矖", "鍧北鏂板尯", "鍏夋槑鏂板尯", "澶ч箯鏂板尯", "榫欏崕鏂板尯" }); + city_districts.put("鏉窞", new String[]{"浣欐澀", "妗愬簮", "瑗挎箹", "寤哄痉", "鏉窞鍛ㄨ竟", "钀у北", "瀵岄槼", "涓村畨", "娣冲畨", "姹熷共", "鎷卞", "婊ㄦ睙", "涓嬪煄", "涓婂煄" }); + city_districts.put("澶╂触", new String[]{"瀹佹渤", "娌充笢", "寮�鍙�", "鍜屽钩", "瑗块潚", "鍖楄景", "澶ф腐", "鍗楀紑", "娌宠タ", "娌冲寳", "娲ュ崡", "绾㈡ˉ", "濉樻步", "涓滀附", "钃熷幙", "姝︽竻", "闈欐捣", "姹夋步", "瀹濆澔" }); + city_districts.put("缁嶅叴", new String[]{"鏂版槍", "琚嶆睙", "宓婂窞", "瓒婂煄", "涓婅櫈", "璇告毃", "缁嶅叴", "闀滄箹" }); + city_districts.put("鍗椾含", new String[]{"寤洪偤", "鍗椾含鍛ㄨ竟", "涓嬪叧", "鐜勬", "娴﹀彛", "闆ㄨ姳", "鏍栭湠", "鐧戒笅", "绉︽樊", "榧撴ゼ", "姹熷畞", "鍏悎", "婧ф按", "楂樻烦" }); + city_districts.put("瑗垮畨", new String[]{"楂樻柊", "涓存郊", "鍩庤タ", "鐏炴ˉ", "鏈ぎ", "鍩庡唴", "鍩庡寳", "鍩庝笢", "鍩庡崡", "鍜搁槼", "娴愮仦", "鍛ㄨ竟", "缁忓紑", "瑗垮捀鏂板尯", "闀垮畨", "鏂板煄", "闆佸", "鑾叉箹", "纰戞灄", "闃庤壇", "钃濈敯", "鍛ㄨ嚦", "鎴峰幙", "楂橀櫟" }); + city_districts.put("鎴愰兘", new String[]{"钂叉睙", "澶ч倯", "閲戝爞", "楂樻柊瑗�", "閭涘磧", "閮芥睙鍫�", "宕囧窞", "鏂版触", "閮幙", "鍙屾祦", "姝︿警", "閲戠墰", "閿︽睙", "娓╂睙", "闈掔緤", "闈掔櫧姹�", "榫欐硥椹�", "鎴愬崕", "鏂伴兘", "褰窞", "楂樻柊" }); + city_districts.put("姝︽眽", new String[]{"闈掑北", "闃抽��", "纭氬彛", "娌屽彛寮�鍙�", "榛勯檪", "姹夊崡", "鏂版床", "钄$敻", "姹夐槼", "姹熷哺", "姹熸眽", "涓滆タ婀�", "娲北", "姝︽槍", "姹熷", "涓滄箹楂樻柊寮�鍙�" }); + city_districts.put("瀹佹尝", new String[]{"涓滈挶婀栨梾娓告浮鍋�", "閯炲窞", "璞″北", "鏉窞婀炬柊", "瀹佹尝鍛ㄨ竟", "楂樻柊", "闀囨捣", "姹熷寳", "瀹佹捣", "姹熶笢", "娴锋洐", "浣欏", "濂夊寲", "鍖椾粦", "鎱堟邯" }); + city_districts.put("闈掑矝", new String[]{"甯傚崡", "鍗冲ⅷ", "榛勫矝", "甯傚寳", "鏉庢钵", "宕傚北", "鍩庨槼", "鑳跺窞", "骞冲害", "鑾辫タ" }); + city_districts.put("娌堥槼", new String[]{"娉曞簱", "杈戒腑", "娌堟渤", "鍜屽钩", "鐨囧", "澶т笢", "閾佽タ", "鑻忓灞�", "涓滈櫟", "娌堝寳", "浜庢椽", "鏂版皯", "搴峰钩", "娴戝崡" }); + city_districts.put("澶ц繛", new String[]{"楂樻柊鍥�", "闀挎捣", "鐡︽埧搴�", "闀垮叴宀�", "寮�鍙�", "澶ц繛鍛ㄨ竟", "鏅咕鏂板尯", "瑗垮矖", "涓北", "娌欐渤鍙�", "鐢樹簳瀛�", "鏃呴『鍙�", "閲戝窞", "鏅叞搴�", "搴勬渤" }); + city_districts.put("娴庡崡", new String[]{"骞抽槾", "绔犱笜", "甯備腑", "澶╂ˉ", "鍘嗕笅", "妲愯崼", "鍘嗗煄", "闀挎竻", "鍟嗘渤", "娴庨槼", "楂樻柊" }); + city_districts.put("绂忓窞", new String[]{"浠撳北", "鏅嬪畨", "鍙版睙", "闂芥竻", "榧撴ゼ", "椹熬", "闂戒警", "闀夸箰", "绂忔竻", "杩炴睙", "缃楁簮", "姘告嘲", "骞虫江" }); + city_districts.put("閮戝窞", new String[]{"绠″煄鍥炴棌", "閲戞按", "涓婅", "鎯犳祹", "閮戜笢", "楂樻柊鎶�鏈紑鍙�", "缁忔祹鎶�鏈紑鍙�", "鏂伴儜甯�", "鐧诲皝甯�", "鏂板瘑甯�", "宸╀箟甯�", "鑽ラ槼甯�", "涓墴鍘�", "涓師", "浜屼竷" }); + city_districts.put("闀挎矙", new String[]{"瀹佷埂", "鏄熸矙", "寮�绂�", "闆ㄨ姳", "澶╁績", "宀抽簱", "鑺欒搲", "鏈涘煄", "娴忛槼" }); + city_districts.put("鏄嗘槑", new String[]{"瑗垮北", "瀹夊畞", "鍛堣础", "瀹樻浮", "鐩橀緳", "浜斿崕", "涓滃窛", "瀵屾皯", "鏅嬪畞", "宓╂槑", "瀵荤敻", "瀹滆壇", "绂勫姖", "鐭虫灄" }); + city_districts.put("闀挎槬", new String[]{"姒嗘爲甯�", "涔濆彴甯�", "缁忓紑", "鍗楀叧", "鏈濋槼", "浜岄亾", "楂樻柊", "瀹藉煄", "缁垮洯", "姹藉紑", "鍙岄槼", "寰锋儬甯�", "鍐滃畨鍘�", "鍑�鏈�" }); + city_districts.put("鍘﹂棬", new String[]{"鍚屽畨", "缈斿畨", "婀栭噷", "鎬濇槑", "闆嗙編", "娴锋钵" }); + city_districts.put("鍝堝皵婊�", new String[]{"闃垮煄", "閬撻噷", "閬撳", "鍛煎叞", "鍗楀矖", "骞虫埧", "鏉惧寳", "棣欏潑", "瀹惧幙", "宸村溅", "渚濆叞", "寤跺", "鏈ㄥ叞", "閫氭渤", "鏂规", "浜斿父", "鍙屽煄", "灏氬織" }); + city_districts.put("鑻忓窞", new String[]{"鍥尯", "鏂板尯", "鑻忓窞鍛ㄨ竟", "鍚存睙", "澶粨", "甯哥啛", "鍚翠腑", "鐩稿煄", "寮犲娓�", "鏄嗗北", "濮戣嫃" }); + city_districts.put("鏃犻敗", new String[]{"瀹滃叴", "鏂板尯", "鍖楀", "婊ㄦ箹", "鍗楅暱", "宕囧畨", "閿″北", "鎯犲北", "姹熼槾" }); + city_districts.put("鍚堣偉", new String[]{"宸㈡箹", "搴愰槼", "鍖呮渤", "鐟舵捣", "楂樻柊", "鏂扮珯", "铚�灞�", "缁忓紑", "鏀垮姟", "婊ㄦ箹", "闀夸赴鍘�", "鑲ヤ笢鍘�", "鑲ヨタ鍘�" }); + city_districts.put("澶師", new String[]{"姒嗘", "灏栬崏鍧�", "鏉忚姳宀�", "灏忓簵", "杩庢辰", "涓囨煆鏋�", "鏅嬫簮", "鍙や氦", "娓呭緪", "闃虫洸", "濞勭儲" }); + city_districts.put("鐭冲搴�", new String[]{"鐭垮尯", "娣辨辰", "寮�鍙�", "绌烘腐鏂�", "瑁曞崕", "鏂板崕", "妗ヨタ", "骞冲北", "妗ヤ笢", "姝e畾", "楣挎硥", "闀垮畨", "钘佸煄", "鏍惧煄", "鏂颁箰", "杈涢泦", "鏅嬪窞", "璧靛幙", "璧炵殗", "鐏靛", "楂橀倯", "鏃犳瀬", "琛屽攼", "浜曢檳", "鍏冩皬" }); + city_districts.put("鍗楁槍", new String[]{"鏂板缓", "瀹変箟", "婀鹃噷", "鏄屽寳", "杩涜搐", "鍗楁槍鍘�", "涓滄箹", "瑗挎箹", "闈掍簯璋�", "闈掑北婀�", "绾㈣胺婊�", "楂樻柊寮�鍙�", "妗戞捣", "鑻遍泟" }); + city_districts.put("鍛煎拰娴╃壒", new String[]{"閮婂尯", "鏂板煄", "鍥炴皯", "鐜夋硥", "閲戝窛寮�鍙�", "璧涚綍", "閲戞ˉ寮�鍙�", "濡傛剰寮�鍙�", "閲戝北寮�鍙�", "鍦熼粯鐗瑰乏鏃�", "鎵樺厠鎵�", "鍜屾灄鏍煎皵", "娓呮按娌�", "姝﹀窛" }); + city_districts.put("鍗楀畞", new String[]{"姹熷崡", "瑗夸埂濉�", "椹北鍘�", "姝﹂福鍘�", "閭曞畞", "闈掔", "妗傛灄", "閽﹀窞", "妯幙", "闅嗗畨鍘�", "鍏村畞", "鍖楁捣", "涓婃灄鍘�", "鑹簡", "瀹鹃槼鍘�" }); + city_districts.put("鐑熷彴", new String[]{"鎷涜繙", "楂樻柊", "鏍栭湠", "鑺濈綐", "绂忓北", "娴烽槼", "寮�鍙�", "榫欏彛", "鑾卞北", "鑾卞窞", "鐗熷钩", "钃幈", "鑾遍槼", "闀垮矝鍘�" }); + city_districts.put("浣涘北", new String[]{"绂呭煄", "涓夋按", "鍗楁捣", "椤哄痉", "楂樻槑" }); + city_districts.put("鍞愬北", new String[]{"璺崡", "璺寳", "鍙ゅ喍", "寮�骞�", "涓板崡", "涓版鼎", "婊﹀幙", "婊﹀崡", "涔愪涵", "杩佽タ", "鐜夌敯", "鍞愭捣", "娴锋腐寮�鍙�", "鍗楀牎", "閬靛寲", "杩佸畨", "楂樻柊", "鏇瑰鐢�", "姹夋步", "鑺﹀彴" }); + city_districts.put("娉夊窞", new String[]{"鐭崇嫯", "娲涙睙", "鎯犲畨", "寰峰寲", "姘告槬", "瀹夋邯", "鏅嬫睙", "涓版辰", "娉夋腐", "椴ゅ煄", "鍗楀畨" }); + city_districts.put("涓滆帪", new String[]{"鍑ゅ矖", "鐭崇ⅲ", "鐭抽緳", "鑾炲煄", "闀垮畨", "铏庨棬", "涓滃煄", "濉樺帵", "瀵", "甯稿钩", "妯熸湪澶�", "鍘氳", "榛勬睙", "鍗楀煄", "鐭虫帓", "娓呮邯", "娌欑敯", "澶ф湕", "涓囨睙", "妯播", "鑼跺北", "澶у箔灞�", "閬撴粯", "涓滃潙", "楂樺煑", "娲", "楹绘秾", "浼佺煶", "妗ュご", "鏈涚墰澧�", "璋㈠矖", "涓爞", "鏉惧北婀�" }); + city_districts.put("娴峰彛", new String[]{"榫欏崕", "绉�鑻�", "缇庡叞", "鐞煎北" }); + city_districts.put("姹曞ご", new String[]{"閲戝钩", "榫欐箹", "婵犳睙", "婢勬捣", "鍗楁境", "娼崡", "娼槼" }); + city_districts.put("寰愬窞", new String[]{"涓板幙", "榧撴ゼ", "浜戦緳", "璐炬豹", "娉夊北", "閾滃北", "閲戝北妗ュ紑鍙�", "鐫㈠畞", "鏂板煄", "娌涘幙", "鏂版矀", "閭冲窞" }); + city_districts.put("鐝犳捣", new String[]{"棣欐床", "閲戞咕", "鏂楅棬", "妯惔", "楂樻爮娓�", "楂樻柊", "涓囧北" }); + city_districts.put("娓╁窞", new String[]{"鐡捣", "楣垮煄", "榫欐咕", "鐟炲畨", "涔愭竻", "娲炲ご", "姘稿槈", "骞抽槼", "鑻嶅崡", "鏂囨垚", "娉伴『" }); + city_districts.put("甯稿窞", new String[]{"婧ч槼", "鎴氬尯", "澶╁畞", "姝﹁繘", "鏂板寳", "閲戝潧", "閽熸ゼ" }); + city_districts.put("鍗楅��", new String[]{"宕囧窛", "娓椄", "閫氬窞", "寮�鍙�", "娴峰畨", "濡備笢", "鍚笢", "濡傜殝", "娴烽棬" }); + city_districts.put("澶у簡", new String[]{"榫欏嚖", "楂樻柊", "鏋楃敻鍘�", "鏉滃皵浼壒钂欏彜鏃忚嚜娌诲幙", "鑲囨簮鍘�", "绾㈠矖", "钀ㄥ皵鍥�", "鑲囧窞鍘�", "璁╄儭璺�", "澶у悓" }); + city_districts.put("涓北", new String[]{"娌欐邯", "闃滄矙", "涓夎", "姘戜紬", "浜旀灞�", "涓変埂", "鏉胯姍", "绁炴咕", "鍧︽床", "鍙ら晣", "灏忔", "涓滃嚖", "鍗楀ご", "妯爮", "澶ф秾", "涓滃崌", "榛勫渻", "鍗楁湕", "涓滃尯", "鍗楀尯", "瑗垮尯", "鐭冲矏", "鐏偓", "娓彛" }); + city_districts.put("濞佹捣", new String[]{"鐜繝", "鑽f垚", "鏂囩櫥", "缁忓尯", "宸ヤ笟", "楂樺尯", "涔冲北" }); + city_districts.put("閲戝崕", new String[]{"涓滈槼", "閲戜笢", "娴︽睙", "濠哄煄", "鍏版邯", "纾愬畨", "姝︿箟", "姘稿悍", "涔変箤" }); + city_districts.put("鍢夊叴", new String[]{"甯傚尯", "鍗楁箹", "绉�娲�", "鍢夊杽", "娴风洂", "娴峰畞", "骞虫箹", "妗愪埂", "缁忔祹寮�鍙�", "涓績鍩�", "杩愭渤", "鍥介檯鍟嗗姟" }); + city_districts.put("婀栧窞", new String[]{"甯備腑蹇�", "缁囬噷", "鍚村叴", "瑗垮崡鏂板煄", "婀栦笢", "浠佺殗灞�", "鍗楁禂", "鍗楀お婀�", "鍑ゅ嚢寮�鍙�", "寰锋竻", "闀垮叴", "瀹夊悏" }); + city_districts.put("闀囨睙", new String[]{"浜彛", "娑﹀窞", "涓瑰緬", "闀囨睙鏂�", "涓归槼", "鎵腑", "鍙ュ" }); + city_districts.put("涓滆惀", new String[]{"" }); + city_districts.put("鎯犲窞", new String[]{"鍗氱綏", "鎯犲煄", "榫欓棬", "鎯犱笢", "浠叉伜", "澶т簹婀�", "鎯犻槼" }); + city_districts.put("鎵窞", new String[]{"寮�鍙�", "骞块櫟", "閭楁睙", "缁存壃", "瀹濆簲", "浠緛", "楂橀偖", "姹熼兘" }); + city_districts.put("鐩愬煄", new String[]{"鍏ㄧ洂鍩�", "鐩愰兘", "婊ㄦ捣", "鍝嶆按", "涓滃彴", "澶т赴", "闃滃畞", "寤烘箹", "浜箹", "灏勯槼" }); + city_districts.put("姹熼棬", new String[]{"鎭╁钩甯�", "姹熸捣", "寮�骞冲競", "鏂颁細", "鍙板北甯�", "钃睙", "楣ゅ北甯�" }); + city_districts.put("甯哥啛", new String[]{"鍙ら噷闀�", "钁f禍闀�", "鏀闀�", "鐜嬪簞闀�", "灏氭箹闀�", "铏炲北闀�", "娴疯櫈闀�", "姊呮潕闀�", "鏂版腐闀�", "娌欏娴�", "杈涘簞闀�", "缁冨闀�", "涓滃崡寮�鍙戝尯" }); + city_districts.put("鏄嗗北", new String[]{"宸村煄", "鐜夊北", "娣�灞辨箹", "鍛ㄥ簞", "寮犳郸", "鍛ㄥ競", "闄嗗", "鍛ㄨ竟", "鑺辨ˉ", "寮�鍙戝尯", "閿︽邯", "鍗冪伅" }); + city_districts.put("钀у北", new String[]{"" }); + city_districts.put("涔変箤", new String[]{"涔変箤" }); + city_districts.put("浣欏", new String[]{"浣欏" }); + city_districts.put("鎱堟邯", new String[]{"鎱堟邯" }); + city_districts.put("浜戞诞", new String[]{"浜戝煄", "缃楀畾", "鏂板叴", "閮佸崡", "浜戝畨" }); + city_districts.put("鏈邯", new String[]{"骞冲北", "鏄庡北", "婧箹", "鍗楄姮", "鏈邯", "妗撲粊" }); + city_districts.put("鐜夋邯", new String[]{"绾㈠", "宄ㄥ北", "閫氭捣", "姹熷窛", "鍗庡畞", "婢勬睙", "鍏冩睙", "鏄撻棬", "鏂板钩" }); + city_districts.put("閯傚皵澶氭柉", new String[]{"" }); + city_districts.put("璐甸槼", new String[]{"鍗楁槑", "灏忔渤", "浜戝博", "鑺辨邯", "涔屽綋", "鐧戒簯", "閲戦槼", "寮�闃�", "淇枃", "鎭兘", "娓呴晣" }); + city_districts.put("涔岄瞾鏈ㄩ綈", new String[]{"澶╁北", "娌欎緷宸村厠", "鏂板競", "姘寸(娌�", "澶村悲娌�", "绫充笢", "杈惧潅鍩�", "涔岄瞾鏈ㄩ綈鍘�" }); + city_districts.put("娉板窞", new String[]{"楂樻腐", "濮滃牥甯�", "鍩庤タ", "鍩庡崡", "鍩庡寳", "娉板叴甯�", "闈栨睙甯�", "鍏村寲甯�", "鍩庝腑", "鍩庝笢" }); + city_districts.put("绉︾殗宀�", new String[]{"鍗㈤緳鍘�", "闈掗緳鍘�", "娴锋腐", "鎶氬畞鍘�", "鏄岄粠鍘�", "灞辨捣鍏�", "鍖楁埓娌�" }); + city_districts.put("鍙板窞", new String[]{"璺ˉ", "涓夐棬", "榛勫博", "涓存捣", "妞掓睙", "澶╁彴", "浠欏眳", "鐜夌幆", "娓╁箔" }); + city_districts.put("娓呰繙", new String[]{"鏂板煄", "娓呮柊", "娓呭煄", "闃冲北", "鏃у煄", "杩炲窞", "鑻卞痉", "浣涘唸", "杩炲崡", "杩炲北" }); + city_districts.put("鍏板窞", new String[]{"姘哥櫥", "鍩庡叧", "涓冮噷娌�", "瑗垮浐", "瀹夊畞", "绾㈠彜", "鐨嬪叞", "姒嗕腑" }); + city_districts.put("鏌冲窞", new String[]{"鏌冲煄", "涓夋睙", "鏌充笢", "铻嶅畨", "鏌虫睙", "楸煎嘲", "鍩庝腑", "鏌冲崡", "铻嶆按", "鏌冲寳", "楣垮", "楂樻柊" }); + city_districts.put("婀涙睙", new String[]{"楹荤珷", "鍧″ご", "闇炲北", "寤夋睙", "鍚村窛", "闆峰窞", "寰愰椈", "閬傛邯", "璧ゅ潕", "寮�鍙�" }); + city_districts.put("璧e窞", new String[]{"璧e幙", "淇′赴", "绔犺础", "瀹侀兘", "鐟為噾", "鍗楀悍" }); + city_districts.put("涓逛笢", new String[]{"鍏ㄤ腹涓�", "鎸畨", "鍏冨疂", "瀹界敻", "鍑ゅ煄", "涓滄腐", "鎸叴" }); + city_districts.put("鍜搁槼", new String[]{"鍏村钩甯�", "姝﹀姛鍘�", "绉﹂兘", "闀挎鍘�", "鏃倯鍘�", "娓煄", "鏉ㄩ櫟", "绀兼硥鍘�", "涔惧幙", "娉鹃槼鍘�", "涓夊師鍘�", "姘稿鍘�", "褰幙", "娣冲寲鍘�" }); + city_districts.put("涓芥睙", new String[]{"鍏ㄤ附姹�", "鍙ゅ煄", "姘歌儨", "鐜夐緳", "瀹佽挆", "鍗庡潽" }); + city_districts.put("寮犲鐣�", new String[]{"鍏ㄥ紶瀹剁晫", "鎱堝埄", "姘稿畾", "姝﹂櫟婧�", "妗戞" }); + city_districts.put("閾跺窛", new String[]{"瑗垮", "姘稿畞", "璐哄叞", "鐏垫", "閲戝嚖", "鍏村簡" }); + city_districts.put("澶х悊", new String[]{"鍏ㄥぇ鐞�", "娲辨簮", "鍓戝窛", "澶х悊", "婕炬繛", "宸嶅北", "瀹惧窛", "寮ユ浮", "楣ゅ簡", "绁ヤ簯", "姘稿钩", "浜戦緳", "鍗楁锭" }); + city_districts.put("瀹胯縼", new String[]{"瀹胯鲍", "娌槼", "娉楁椽", "瀹垮煄", "娉楅槼", "瀹垮煄鏂�" }); + city_districts.put("鑺滄箹", new String[]{"闀滄箹", "鑺滄箹", "绻佹槍", "鍗楅櫟", "寮�鍙�", "寮嬫睙", "楦犳睙", "涓夊北" }); + city_districts.put("椹瀺灞�", new String[]{"褰撴秱鍘�", "鑺卞北", "寮�鍙�", "闆ㄥ北", "閲戝搴�", "鍚北鍘�", "浣冲北", "鎱堟箹", "鍜屽幙", "鍚戝北" }); + city_districts.put("鐜夋灄", new String[]{"鍏ㄧ帀鏋�", "瀹瑰幙", "鍖楁祦", "鍗氱櫧", "闄嗗窛", "鍏翠笟", "鐜夊窞" }); + city_districts.put("娼嶅潑", new String[]{"瀹変笜", "楂樺瘑", "鏄岄倯", "涓存湊", "鏄屼箰", "濂庢枃", "娼嶅煄", "瀵掍涵", "鍧婂瓙", "缁忔祹寮�鍙�", "楂樻柊鎶�鏈紑鍙�", "闈掑窞", "璇稿煄", "瀵垮厜", "婊ㄦ捣缁忔祹寮�鍙�" }); + city_districts.put("杩炰簯娓�", new String[]{"杩炰簯", "寮�鍙�", "娴峰窞", "涓滄捣", "璧f", "鐏屽崡", "鐏屼簯", "鏂版郸" }); + city_districts.put("寤跺畨", new String[]{"瀵屽幙", "娲涘窛", "榛勯櫟", "鐢樻硥", "鍏ㄥ欢瀹�", "鍚磋捣", "寤堕暱", "瀹濆", "榛勯緳", "瀹夊", "瀛愰暱", "蹇椾腹", "瀹滃窛", "寤跺窛" }); + city_districts.put("涔濇睙", new String[]{"娴旈槼", "搴愬北", "褰辰鍘�", "鏄熷瓙鍘�", "寰峰畨鍘�", "閮芥槍鍘�", "涔濇睙鍘�", "鍏遍潚鍩庡競", "淇按鍘�", "姘镐慨鍘�", "姝﹀畞鍘�", "鐟炴槍甯�", "婀栧彛鍘�", "寮�鍙�" }); + city_districts.put("涓変簹", new String[]{"闄垫按", "鍗氶硨", "涔愪笢", "鐞兼捣", "涓囧畞", "灏忎笢娴�", "浜氶緳婀�", "淇濅涵", "浜旀寚灞�", "涓変簹婀�", "娴锋婀�", "宕栧煄", "鍑ゅ嚢", "澶╂动", "鐢扮嫭", "鑲叉墠", "娌充笢", "娌宠タ", "澶т笢娴�" }); + city_districts.put("瀹滄槍", new String[]{"浜斿嘲鍦熷鏃忚嚜娌诲幙", "鐚囦涵", "鐐瑰啗", "浼嶅宀�", "瑗块櫟", "澶烽櫟", "绉綊鍘�", "瀹滈兘", "鍏村北鍘�", "杩滃畨鍘�", "涓滃北寮�鍙�", "鏋濇睙", "褰撻槼", "闀块槼鍦熷鏃忚嚜娌诲幙" }); + city_districts.put("鍏洏姘�", new String[]{"鍏ㄥ叚鐩樻按", "鐩樺幙", "鍏灊鐗�", "閽熷北", "姘村煄" }); + city_districts.put("鍚夋灄", new String[]{"鑸硅惀", "榫欐江", "涓版弧", "缁忓紑", "姘稿悏", "楂樻柊", "铔熸渤", "妗︾敻", "鑸掑叞", "纾愮煶", "鏄岄倯" }); + city_districts.put("闉嶅北", new String[]{"楂樻柊", "閾佽タ", "娴峰煄", "绔嬪北", "宀博婊℃棌鑷不鍘�", "鍗冨北", "鍙板畨", "閾佷笢" }); + city_districts.put("淇濆畾", new String[]{"婊″煄", "瀹夊浗", "鍗楀競", "娑垮窞", "楂樻柊鎶�鏈骇涓氬紑鍙�", "鏂板競", "瀹氬窞", "鍖楀競", "娓呰嫅", "楂樼搴�" }); + city_districts.put("瀹滃", new String[]{"鐝欏幙", "楂樺幙", "姹熷畨", "瀹滃", "闀垮畞", "鍗楁邯", "缈犲睆", "鍏存枃", "绛犺繛", "灞忓北", "鍏ㄥ疁瀹�" }); + city_districts.put("鑾嗙敯", new String[]{"娑垫睙", "浠欐父", "鍩庡帰", "绉�灞�", "鍏ㄨ巻鐢�", "鑽斿煄" }); + city_districts.put("瑗垮畞", new String[]{"鍩庡崡", "鍩庝笢", "鍩庤タ", "鍩庡寳", "鍩庡崡鏂�", "鍩庡寳鐢熺墿绉戞妧鍥�", "娴锋箹", "鍩庝腑" }); + city_districts.put("鑷础", new String[]{"鍏ㄨ嚜璐�", "澶у畨", "璐′簳", "鑽e幙", "鑷祦浜�", "瀵岄『", "娌挎哗" }); + city_districts.put("娣勫崥", new String[]{"娣勫窛", "鍛ㄦ潙", "楂樻柊", "娌傛簮", "妗撳彴", "涓存穭", "寮犲簵", "鍗氬北", "楂橀潚" }); + city_districts.put("鏀�鏋濊姳", new String[]{"浠佸拰", "绫虫槗", "鐩愯竟", "瑗垮尯", "涓滃尯", "鍏ㄦ攢鏋濊姳" }); + city_districts.put("琛㈠窞", new String[]{"鍖楀尯", "鍙屾腐寮�鍙�", "鍗楀尯", "瑗垮尯", "宸ㄥ寲", "鑰佸煄", "缁忔祹寮�鍙�", "鏌煄", "琛㈡睙", "姹熷北", "榫欐父", "甯稿北", "寮�鍖�" }); + city_districts.put("閭兏", new String[]{"楂樺紑", "閭卞幙", "姘稿勾", "鏇插懆", "閭兏", "鑲ヤ埂", "棣嗛櫠", "娑夊幙", "骞垮钩", "榄忓幙", "纾佸幙", "澶у悕", "涓涘彴", "閭北", "宄板嘲", "姝﹀畨", "楦℃辰", "鎴愬畨", "涓存汲", "澶嶅叴" }); + city_districts.put("鍖楁捣", new String[]{"閾舵捣", "閾佸北娓�", "娴峰煄", "鍚堟郸" }); + city_districts.put("寤婂潑", new String[]{"澶у煄", "瀹夋", "澶у巶", "姘告竻", "鍥哄畨", "闇稿窞", "棣欐渤", "鏂囧畨", "涓夋渤", "骞块槼" }); + city_districts.put("娲涢槼", new String[]{"宓╁幙", "娑цタ", "瑗垮伐", "鑰佸煄", "鐎嶆渤", "娲涢緳", "鍚夊埄", "鍋冨笀", "鏍惧窛", "瀛熸触", "浼婂窛", "瀹滈槼", "鏂板畨", "娲涘畞", "姹濋槼" }); + city_districts.put("妗傛灄", new String[]{"鍙犲僵", "璞″北", "涓冩槦", "闆佸北", "鐏靛窛", "鍏村畨", "鍏ㄥ窞", "鐏岄槼", "璧勬簮", "姘哥", "鑽旀郸", "闃虫湐", "骞充箰", "榫欒儨", "鎭煄", "绉�宄�", "瑗垮煄" }); + city_districts.put("鏍床", new String[]{"鑽峰", "鑺︽窞", "鏀稿幙", "鐭冲嘲", "鏍床", "澶╁厓", "鍏ㄦ牚娲�", "鑼堕櫟", "閱撮櫟", "鐐庨櫟" }); + city_districts.put("婀樻江", new String[]{"宀冲", "鍏ㄦ箻娼�", "婀樹埂", "婀樻江", "闆ㄦ箹", "闊跺北" }); + city_districts.put("閲嶅簡", new String[]{"閾滄", "寮�鍘�", "鍗楀窛", "娼煎崡", "閲嶅簡鍛ㄨ竟", "鍚堝窛", "姘稿窛", "姝﹂殕", "姹熸触", "闀垮", "涓囧窞", "娑櫟", "缍︽睙", "鐠у北", "涓囩洓", "娓濅腑", "姹熷寳", "娓濆寳", "鍗楀哺", "娌欏潽鍧�", "涔濋緳鍧�", "澶ф浮鍙�", "鍖楃", "宸村崡" }); + city_districts.put("缁甸槼", new String[]{"瀹夊幙", "姹熸补甯�", "骞虫鍘�", "楂樻柊", "绉戝垱鍥�", "鍐滅", "姊撴郊鍘�", "娑煄", "鍖楀窛鍘�", "鐩愪涵鍘�", "浠欐捣", "涓夊彴鍘�", "缁忓紑", "娓镐粰" }); + city_districts.put("宀抽槼", new String[]{"宀抽槼妤煎尯" }); + city_districts.put("澧炲煄", new String[]{"澧炲煄" }); + city_districts.put("鍚存睙", new String[]{"鏉鹃櫟", "鐩涙辰", "鍚岄噷", "闇囨辰", "骞虫湜", "妗冩簮", "妯墖", "涓冮兘", "榛庨噷", "婊ㄦ箹鏂板煄", "姹炬箹" }); + city_districts.put("鐟炲畨", new String[]{"纰у北", "瀹夐槼", "鏇规潙", "涓滃北", "椋炰簯", "婀栧箔", "閿︽箹", "榫欐箹", "椹笨", "娼樺脖", "骞抽槼鍧�", "涓婃湜", "濉樹笅", "闄跺北", "姹�鐢�", "浠欓檷", "鑾樺", "鐜夋捣", "鑰佸煄" }); + city_districts.put("涔愭竻", new String[]{"娓呮睙", "澶ц崋", "闆佽崱", "鍗楀", "鑺欒搲", "鍗楀渤", "钂插矏", "铏规ˉ", "缈佸灍", "璞¢槼", "浠欐邯", "涓冮噷娓�", "鍖楃櫧璞�", "娣℃邯", "鐭冲竼", "婀栭浘", "鐧界煶", "榛勫崕", "纾愮煶", "鏌冲競", "涔愭垚" }); + city_districts.put("濂夊寲", new String[]{"濂夊寲" }); + city_districts.put("娓╁箔", new String[]{"娓╁箔" }); + city_districts.put("瀹滃叴", new String[]{"鑺虫ˉ", "瀹滃煄", "鏂板缓", "鏂板簞", "涓佽渶", "婀栫埗", "瀹樻灄", "鍛ㄩ搧", "涓囩煶", "楂樺", "寮犳笟", "瑗挎笟", "寰愯垗", "鏉ㄥ贩", "鍜屾ˉ", "澶崕", "鏂拌", "鐜繚绉戞妧宸ヤ笟鍥�", "瀹滃叴缁忔祹寮�鍙戝尯", "灞轰涵" }); + city_districts.put("鑲囧簡", new String[]{"榧庢箹", "寰峰簡", "骞垮畞", "澶ф椇", "鍥涗細", "楂樿", "鎬�闆�", "灏佸紑", "绔窞" }); + city_districts.put("瀹夐槼", new String[]{"瀹夐槼鏂板尯", "寮�鍙戝尯", "瀹夐槼鍘�", "婊戝幙", "鏋楀窞", "榫欏畨", "娈烽兘", "鍖楀叧", "鏂囧嘲", "鍐呴粍", "姹ら槾" }); + city_districts.put("鏇查潠", new String[]{"椹緳", "浼氭辰", "缃楀钩", "甯堝畻", "娌剧泭", "闄嗚壇", "瀵屾簮", "瀹e▉", "楹掗簾" }); + city_districts.put("琛¢槼", new String[]{"鍗楀渤", "鐝犳櫀", "闆佸嘲", "鐭抽紦", "钂告箻", "甯稿畞", "鑰掗槼", "琛″崡", "琛¢槼鍘�", "琛″北", "琛′笢", "绁佷笢" }); + city_districts.put("鏂颁埂", new String[]{"鍗花", "绾㈡棗", "鐗ч噹", "鍑ゆ硥", "杈夊幙", "鍗緣", "鏂颁埂鍘�", "鑾峰槈", "鍘熼槼", "寤舵触", "灏佷笜", "闀垮灒" }); + city_districts.put("钀ュ彛", new String[]{"绔欏墠", "瑗垮競", "鑰佽竟", "椴呴奔鍦�", "澶х煶妗�", "鐩栧窞" }); + city_districts.put("娼窞", new String[]{"婀樻ˉ", "鏋邯", "娼畨", "楗跺钩" }); + city_districts.put("娌虫簮", new String[]{"婧愬煄", "涓滄簮", "鍜屽钩", "杩炲钩", "榫欏窛", "绱噾" }); + city_districts.put("榛勭煶", new String[]{"榛勭煶娓�", "瑗垮灞�", "涓嬮檰", "閾佸北", "澶у喍", "闃虫柊", "榛勭煶缁忔祹寮�鍙戝尯" }); + city_districts.put("鐒︿綔", new String[]{"娓╁幙", "瑙f斁", "灞遍槼", "涓珯", "椹潙", "楂樻柊", "娌侀槼", "瀛熷窞", "鍗氱埍", "姝﹂櫉", "淇" }); + city_districts.put("鎻槼", new String[]{"姒曞煄", "鎻笢", "鎯犳潵", "鎻タ", "鏅畞" }); + city_districts.put("鑼傚悕", new String[]{"鑼傛腐", "鑼傚崡", "淇″疁", "鍖栧窞", "楂樺窞", "鐢电櫧" }); + city_districts.put("鐗′腹姹�", new String[]{"涓滃畨", "瑗垮畨", "鐖辨皯", "闃虫槑", "姹熷崡", "缁ヨ姮娌�", "瀹佸畨", "娴锋灄", "绌嗘1", "鏋楀彛", "涓滃畞" }); + city_districts.put("鐩橀敠", new String[]{"澶ф醇", "鐩樺北", "鍙屽彴瀛�", "鍏撮殕鍙�" }); + city_districts.put("骞抽《灞�", new String[]{"閮忓幙", "鍙跺幙", "婀涙渤", "鐭抽緳", "鏂板崕", "鍗笢", "姹濆窞", "鑸為挗", "瀹濅赴", "椴佸北" }); + city_districts.put("闊跺叧", new String[]{"浠佸寲", "缈佹簮", "鏂颁赴", "濮嬪叴", "鍗楅泟", "涔愭槍", "娴堟睙", "姝︽睙", "鏇叉睙", "涔虫簮" }); + city_districts.put("闃虫睙", new String[]{"闃虫槬", "闃充笢", "闃宠タ", "娴烽櫟鍖�", "楂樻柊鍖�", "姹熷煄" }); + city_districts.put("姊呭窞", new String[]{"姊呮睙", "鍏村畞", "姊呭幙", "骞宠繙", "钑夊箔", "澶у煍", "涓伴『", "浜斿崕" }); } static Map city_districtRoads=new HashMap(); static{ - city_districtRoads.put("上海", new String[]{"浦东南路", "长宁支路", "浦东北路"}); + city_districtRoads.put("涓婃捣", new String[]{"娴︿笢鍗楄矾", "闀垮畞鏀矾", "娴︿笢鍖楄矾"}); } static Map city_parents=new HashMap(); static{ - city_parents.put("上海", new String[]{"上海"}); - city_parents.put("北京", new String[]{"北京"}); - city_parents.put("天津", new String[]{"天津"}); - city_parents.put("广州", new String[]{"广东", "广州"}); - city_parents.put("深圳", new String[]{"广东", "深圳"}); - city_parents.put("杭州", new String[]{"浙江", "杭州"}); - city_parents.put("南京", new String[]{"江苏", "南京"}); - city_parents.put("西安", new String[]{"陕西", "西安"}); - city_parents.put("成都", new String[]{"四川", "成都"}); - city_parents.put("武汉", new String[]{"湖北", "武汉"}); - city_parents.put("宁波", new String[]{"浙江", "宁波"}); - city_parents.put("青岛", new String[]{"山东", "青岛"}); - city_parents.put("沈阳", new String[]{"辽宁", "沈阳"}); - city_parents.put("大连", new String[]{"辽宁", "大连"}); - city_parents.put("济南", new String[]{"山东", "济南"}); - city_parents.put("福州", new String[]{"福建", "福州"}); - city_parents.put("郑州", new String[]{"河南", "郑州"}); - city_parents.put("长沙", new String[]{"湖南", "长沙"}); - city_parents.put("昆明", new String[]{"云南", "昆明"}); - city_parents.put("长春", new String[]{"吉林", "长春"}); - city_parents.put("厦门", new String[]{"福建", "厦门"}); - city_parents.put("哈尔滨", new String[]{"黑龙江", "哈尔滨"}); - city_parents.put("苏州", new String[]{"江苏", "苏州"}); - city_parents.put("无锡", new String[]{"江苏", "无锡"}); - city_parents.put("合肥", new String[]{"安徽", "合肥"}); - city_parents.put("太原", new String[]{"山西", "太原"}); - city_parents.put("石家庄", new String[]{"河北", "石家庄"}); - city_parents.put("南昌", new String[]{"江西", "南昌"}); - city_parents.put("呼和浩特", new String[]{"内蒙古", "呼和浩特"}); - city_parents.put("南宁", new String[]{"广西", "南宁"}); - city_parents.put("烟台", new String[]{"山东", "烟台"}); - city_parents.put("佛山", new String[]{"广东", "佛山"}); - city_parents.put("唐山", new String[]{"河北", "唐山"}); - city_parents.put("泉州", new String[]{"福建", "泉州"}); - city_parents.put("东莞", new String[]{"广东", "东莞"}); - city_parents.put("海口", new String[]{"海南", "海口"}); - city_parents.put("汕头", new String[]{"广东", "汕头"}); - city_parents.put("徐州", new String[]{"江苏", "徐州"}); - city_parents.put("珠海", new String[]{"广东", "珠海"}); - city_parents.put("温州", new String[]{"浙江", "温州"}); - city_parents.put("绍兴", new String[]{"浙江", "绍兴"}); - city_parents.put("常州", new String[]{"江苏", "常州"}); - city_parents.put("南通", new String[]{"江苏", "南通"}); - city_parents.put("大庆", new String[]{"黑龙江", "大庆"}); - city_parents.put("中山", new String[]{"广东", "中山"}); - city_parents.put("威海", new String[]{"山东", "威海"}); - city_parents.put("金华", new String[]{"浙江", "金华"}); - city_parents.put("嘉兴", new String[]{"浙江", "嘉兴"}); - city_parents.put("湖州", new String[]{"浙江", "湖州"}); - city_parents.put("镇江", new String[]{"江苏", "镇江"}); - city_parents.put("东营", new String[]{"山东", "东营"}); - city_parents.put("惠州", new String[]{"广东", "惠州"}); - city_parents.put("扬州", new String[]{"江苏", "扬州"}); - city_parents.put("盐城", new String[]{"江苏", "盐城"}); - city_parents.put("江门", new String[]{"广东", "江门"}); - city_parents.put("昆山", new String[]{"江苏", "苏州", "昆山"}); - city_parents.put("常熟", new String[]{"江苏", "苏州", "常熟"}); - city_parents.put("萧山", new String[]{"浙江", "杭州", "萧山"}); - city_parents.put("义乌", new String[]{"浙江", "金华", "义乌"}); - city_parents.put("余姚", new String[]{"浙江", "宁波", "余姚"}); - city_parents.put("慈溪", new String[]{"浙江", "宁波", "慈溪"}); + city_parents.put("涓婃捣", new String[]{"涓婃捣"}); + city_parents.put("鍖椾含", new String[]{"鍖椾含"}); + city_parents.put("澶╂触", new String[]{"澶╂触"}); + city_parents.put("骞垮窞", new String[]{"骞夸笢", "骞垮窞"}); + city_parents.put("娣卞湷", new String[]{"骞夸笢", "娣卞湷"}); + city_parents.put("鏉窞", new String[]{"娴欐睙", "鏉窞"}); + city_parents.put("鍗椾含", new String[]{"姹熻嫃", "鍗椾含"}); + city_parents.put("瑗垮畨", new String[]{"闄曡タ", "瑗垮畨"}); + city_parents.put("鎴愰兘", new String[]{"鍥涘窛", "鎴愰兘"}); + city_parents.put("姝︽眽", new String[]{"婀栧寳", "姝︽眽"}); + city_parents.put("瀹佹尝", new String[]{"娴欐睙", "瀹佹尝"}); + city_parents.put("闈掑矝", new String[]{"灞变笢", "闈掑矝"}); + city_parents.put("娌堥槼", new String[]{"杈藉畞", "娌堥槼"}); + city_parents.put("澶ц繛", new String[]{"杈藉畞", "澶ц繛"}); + city_parents.put("娴庡崡", new String[]{"灞变笢", "娴庡崡"}); + city_parents.put("绂忓窞", new String[]{"绂忓缓", "绂忓窞"}); + city_parents.put("閮戝窞", new String[]{"娌冲崡", "閮戝窞"}); + city_parents.put("闀挎矙", new String[]{"婀栧崡", "闀挎矙"}); + city_parents.put("鏄嗘槑", new String[]{"浜戝崡", "鏄嗘槑"}); + city_parents.put("闀挎槬", new String[]{"鍚夋灄", "闀挎槬"}); + city_parents.put("鍘﹂棬", new String[]{"绂忓缓", "鍘﹂棬"}); + city_parents.put("鍝堝皵婊�", new String[]{"榛戦緳姹�", "鍝堝皵婊�"}); + city_parents.put("鑻忓窞", new String[]{"姹熻嫃", "鑻忓窞"}); + city_parents.put("鏃犻敗", new String[]{"姹熻嫃", "鏃犻敗"}); + city_parents.put("鍚堣偉", new String[]{"瀹夊窘", "鍚堣偉"}); + city_parents.put("澶師", new String[]{"灞辫タ", "澶師"}); + city_parents.put("鐭冲搴�", new String[]{"娌冲寳", "鐭冲搴�"}); + city_parents.put("鍗楁槍", new String[]{"姹熻タ", "鍗楁槍"}); + city_parents.put("鍛煎拰娴╃壒", new String[]{"鍐呰挋鍙�", "鍛煎拰娴╃壒"}); + city_parents.put("鍗楀畞", new String[]{"骞胯タ", "鍗楀畞"}); + city_parents.put("鐑熷彴", new String[]{"灞变笢", "鐑熷彴"}); + city_parents.put("浣涘北", new String[]{"骞夸笢", "浣涘北"}); + city_parents.put("鍞愬北", new String[]{"娌冲寳", "鍞愬北"}); + city_parents.put("娉夊窞", new String[]{"绂忓缓", "娉夊窞"}); + city_parents.put("涓滆帪", new String[]{"骞夸笢", "涓滆帪"}); + city_parents.put("娴峰彛", new String[]{"娴峰崡", "娴峰彛"}); + city_parents.put("姹曞ご", new String[]{"骞夸笢", "姹曞ご"}); + city_parents.put("寰愬窞", new String[]{"姹熻嫃", "寰愬窞"}); + city_parents.put("鐝犳捣", new String[]{"骞夸笢", "鐝犳捣"}); + city_parents.put("娓╁窞", new String[]{"娴欐睙", "娓╁窞"}); + city_parents.put("缁嶅叴", new String[]{"娴欐睙", "缁嶅叴"}); + city_parents.put("甯稿窞", new String[]{"姹熻嫃", "甯稿窞"}); + city_parents.put("鍗楅��", new String[]{"姹熻嫃", "鍗楅��"}); + city_parents.put("澶у簡", new String[]{"榛戦緳姹�", "澶у簡"}); + city_parents.put("涓北", new String[]{"骞夸笢", "涓北"}); + city_parents.put("濞佹捣", new String[]{"灞变笢", "濞佹捣"}); + city_parents.put("閲戝崕", new String[]{"娴欐睙", "閲戝崕"}); + city_parents.put("鍢夊叴", new String[]{"娴欐睙", "鍢夊叴"}); + city_parents.put("婀栧窞", new String[]{"娴欐睙", "婀栧窞"}); + city_parents.put("闀囨睙", new String[]{"姹熻嫃", "闀囨睙"}); + city_parents.put("涓滆惀", new String[]{"灞变笢", "涓滆惀"}); + city_parents.put("鎯犲窞", new String[]{"骞夸笢", "鎯犲窞"}); + city_parents.put("鎵窞", new String[]{"姹熻嫃", "鎵窞"}); + city_parents.put("鐩愬煄", new String[]{"姹熻嫃", "鐩愬煄"}); + city_parents.put("姹熼棬", new String[]{"骞夸笢", "姹熼棬"}); + city_parents.put("鏄嗗北", new String[]{"姹熻嫃", "鑻忓窞", "鏄嗗北"}); + city_parents.put("甯哥啛", new String[]{"姹熻嫃", "鑻忓窞", "甯哥啛"}); + city_parents.put("钀у北", new String[]{"娴欐睙", "鏉窞", "钀у北"}); + city_parents.put("涔変箤", new String[]{"娴欐睙", "閲戝崕", "涔変箤"}); + city_parents.put("浣欏", new String[]{"娴欐睙", "瀹佹尝", "浣欏"}); + city_parents.put("鎱堟邯", new String[]{"娴欐睙", "瀹佹尝", "鎱堟邯"}); - city_parents.put("云浮", new String[]{"广东", "云浮"}); - city_parents.put("本溪", new String[]{"辽宁", "本溪"}); - city_parents.put("玉溪", new String[]{"云南", "玉溪"}); - city_parents.put("鄂尔多斯", new String[]{"内蒙古", "鄂尔多斯"}); - city_parents.put("贵阳", new String[]{"贵州", "贵阳"}); - city_parents.put("乌鲁木齐", new String[]{"新疆维吾尔", "乌鲁木齐"}); - city_parents.put("泰州", new String[]{"江苏", "泰州"}); - city_parents.put("秦皇岛", new String[]{"河北", "秦皇岛"}); - city_parents.put("台州", new String[]{"浙江", "台州"}); - city_parents.put("清远", new String[]{"广东", "清远"}); - city_parents.put("兰州", new String[]{"甘肃", "兰州"}); - city_parents.put("柳州", new String[]{"广西壮族", "柳州"}); - city_parents.put("湛江", new String[]{"广东", "湛江"}); - city_parents.put("赣州", new String[]{"江西", "赣州"}); - city_parents.put("丹东", new String[]{"辽宁", "丹东"}); - city_parents.put("咸阳", new String[]{"陕西", "咸阳"}); - city_parents.put("丽江", new String[]{"云南", "丽江"}); - city_parents.put("张家界", new String[]{"湖南", "张家界"}); - city_parents.put("银川", new String[]{"宁夏回族", "银川"}); - city_parents.put("大理", new String[]{"云南", "大理白族自治州", "大理"}); - city_parents.put("宿迁", new String[]{"江苏", "宿迁"}); - city_parents.put("芜湖", new String[]{"安徽", "芜湖"}); - city_parents.put("马鞍山", new String[]{"安徽", "马鞍山"}); - city_parents.put("玉林", new String[]{"广西壮族", "玉林"}); - city_parents.put("潍坊", new String[]{"山东", "潍坊"}); - city_parents.put("连云港", new String[]{"江苏", "连云港"}); - city_parents.put("延安", new String[]{"陕西", "延安"}); - city_parents.put("九江", new String[]{"江西", "九江"}); - city_parents.put("三亚", new String[]{"海南", "三亚"}); - city_parents.put("宜昌", new String[]{"湖北", "宜昌"}); - city_parents.put("六盘水", new String[]{"贵州", "六盘水"}); - city_parents.put("吉林", new String[]{"吉林", "吉林"}); - city_parents.put("鞍山", new String[]{"辽宁", "鞍山"}); - city_parents.put("保定", new String[]{"河北", "保定"}); - city_parents.put("宜宾", new String[]{"四川", "宜宾"}); - city_parents.put("莆田", new String[]{"福建", "莆田"}); - city_parents.put("西宁", new String[]{"青海", "西宁"}); - city_parents.put("自贡", new String[]{"四川", "自贡"}); - city_parents.put("淄博", new String[]{"山东", "淄博"}); - city_parents.put("攀枝花", new String[]{"四川", "攀枝花"}); - city_parents.put("衢州", new String[]{"浙江", "衢州"}); - city_parents.put("邯郸", new String[]{"河北", "邯郸"}); - city_parents.put("北海", new String[]{"广西壮族", "北海"}); - city_parents.put("廊坊", new String[]{"河北", "廊坊"}); - city_parents.put("洛阳", new String[]{"河南", "洛阳"}); - city_parents.put("桂林", new String[]{"广西壮族", "桂林"}); - city_parents.put("株洲", new String[]{"湖南", "株洲"}); - city_parents.put("湘潭", new String[]{"湖南", "湘潭"}); - city_parents.put("重庆", new String[]{"重庆", "重庆"}); - city_parents.put("绵阳", new String[]{"四川", "绵阳"}); - city_parents.put("岳阳", new String[]{"湖南", "岳阳"}); - city_parents.put("增城", new String[]{"广东", "广州", "增城"}); - city_parents.put("吴江", new String[]{"江苏", "苏州", "吴江"}); - city_parents.put("瑞安", new String[]{"浙江", "温州", "瑞安"}); - city_parents.put("乐清", new String[]{"浙江", "温州", "乐清"}); - city_parents.put("奉化", new String[]{"浙江", "宁波", "奉化"}); - city_parents.put("温岭", new String[]{"浙江", "台州", "温岭"}); - city_parents.put("宜兴", new String[]{"江苏", "无锡", "宜兴"}); - city_parents.put("肇庆", new String[]{"广东", "肇庆"}); - city_parents.put("安阳", new String[]{"河南", "安阳"}); - city_parents.put("曲靖", new String[]{"云南", "曲靖"}); - city_parents.put("衡阳", new String[]{"湖南", "衡阳"}); - city_parents.put("新乡", new String[]{"河南", "新乡"}); - city_parents.put("营口", new String[]{"辽宁", "营口"}); - city_parents.put("潮州", new String[]{"广东", "潮州"}); - city_parents.put("河源", new String[]{"广东", "河源"}); - city_parents.put("黄石", new String[]{"湖北", "黄石"}); - city_parents.put("焦作", new String[]{"河南", "焦作"}); - city_parents.put("揭阳", new String[]{"广东", "揭阳"}); - city_parents.put("茂名", new String[]{"广东", "茂名"}); - city_parents.put("牡丹江", new String[]{"黑龙江", "牡丹江"}); - city_parents.put("盘锦", new String[]{"辽宁", "盘锦"}); - city_parents.put("平顶山", new String[]{"河南", "平顶山"}); - city_parents.put("韶关", new String[]{"广东", "韶关"}); - city_parents.put("阳江", new String[]{"广东", "阳江"}); - city_parents.put("梅州", new String[]{"广东", "梅州"}); - city_parents.put("顺德", new String[]{"广东", "佛山"}); + city_parents.put("浜戞诞", new String[]{"骞夸笢", "浜戞诞"}); + city_parents.put("鏈邯", new String[]{"杈藉畞", "鏈邯"}); + city_parents.put("鐜夋邯", new String[]{"浜戝崡", "鐜夋邯"}); + city_parents.put("閯傚皵澶氭柉", new String[]{"鍐呰挋鍙�", "閯傚皵澶氭柉"}); + city_parents.put("璐甸槼", new String[]{"璐靛窞", "璐甸槼"}); + city_parents.put("涔岄瞾鏈ㄩ綈", new String[]{"鏂扮枂缁村惥灏�", "涔岄瞾鏈ㄩ綈"}); + city_parents.put("娉板窞", new String[]{"姹熻嫃", "娉板窞"}); + city_parents.put("绉︾殗宀�", new String[]{"娌冲寳", "绉︾殗宀�"}); + city_parents.put("鍙板窞", new String[]{"娴欐睙", "鍙板窞"}); + city_parents.put("娓呰繙", new String[]{"骞夸笢", "娓呰繙"}); + city_parents.put("鍏板窞", new String[]{"鐢樿們", "鍏板窞"}); + city_parents.put("鏌冲窞", new String[]{"骞胯タ澹棌", "鏌冲窞"}); + city_parents.put("婀涙睙", new String[]{"骞夸笢", "婀涙睙"}); + city_parents.put("璧e窞", new String[]{"姹熻タ", "璧e窞"}); + city_parents.put("涓逛笢", new String[]{"杈藉畞", "涓逛笢"}); + city_parents.put("鍜搁槼", new String[]{"闄曡タ", "鍜搁槼"}); + city_parents.put("涓芥睙", new String[]{"浜戝崡", "涓芥睙"}); + city_parents.put("寮犲鐣�", new String[]{"婀栧崡", "寮犲鐣�"}); + city_parents.put("閾跺窛", new String[]{"瀹佸鍥炴棌", "閾跺窛"}); + city_parents.put("澶х悊", new String[]{"浜戝崡", "澶х悊鐧芥棌鑷不宸�", "澶х悊"}); + city_parents.put("瀹胯縼", new String[]{"姹熻嫃", "瀹胯縼"}); + city_parents.put("鑺滄箹", new String[]{"瀹夊窘", "鑺滄箹"}); + city_parents.put("椹瀺灞�", new String[]{"瀹夊窘", "椹瀺灞�"}); + city_parents.put("鐜夋灄", new String[]{"骞胯タ澹棌", "鐜夋灄"}); + city_parents.put("娼嶅潑", new String[]{"灞变笢", "娼嶅潑"}); + city_parents.put("杩炰簯娓�", new String[]{"姹熻嫃", "杩炰簯娓�"}); + city_parents.put("寤跺畨", new String[]{"闄曡タ", "寤跺畨"}); + city_parents.put("涔濇睙", new String[]{"姹熻タ", "涔濇睙"}); + city_parents.put("涓変簹", new String[]{"娴峰崡", "涓変簹"}); + city_parents.put("瀹滄槍", new String[]{"婀栧寳", "瀹滄槍"}); + city_parents.put("鍏洏姘�", new String[]{"璐靛窞", "鍏洏姘�"}); + city_parents.put("鍚夋灄", new String[]{"鍚夋灄", "鍚夋灄"}); + city_parents.put("闉嶅北", new String[]{"杈藉畞", "闉嶅北"}); + city_parents.put("淇濆畾", new String[]{"娌冲寳", "淇濆畾"}); + city_parents.put("瀹滃", new String[]{"鍥涘窛", "瀹滃"}); + city_parents.put("鑾嗙敯", new String[]{"绂忓缓", "鑾嗙敯"}); + city_parents.put("瑗垮畞", new String[]{"闈掓捣", "瑗垮畞"}); + city_parents.put("鑷础", new String[]{"鍥涘窛", "鑷础"}); + city_parents.put("娣勫崥", new String[]{"灞变笢", "娣勫崥"}); + city_parents.put("鏀�鏋濊姳", new String[]{"鍥涘窛", "鏀�鏋濊姳"}); + city_parents.put("琛㈠窞", new String[]{"娴欐睙", "琛㈠窞"}); + city_parents.put("閭兏", new String[]{"娌冲寳", "閭兏"}); + city_parents.put("鍖楁捣", new String[]{"骞胯タ澹棌", "鍖楁捣"}); + city_parents.put("寤婂潑", new String[]{"娌冲寳", "寤婂潑"}); + city_parents.put("娲涢槼", new String[]{"娌冲崡", "娲涢槼"}); + city_parents.put("妗傛灄", new String[]{"骞胯タ澹棌", "妗傛灄"}); + city_parents.put("鏍床", new String[]{"婀栧崡", "鏍床"}); + city_parents.put("婀樻江", new String[]{"婀栧崡", "婀樻江"}); + city_parents.put("閲嶅簡", new String[]{"閲嶅簡", "閲嶅簡"}); + city_parents.put("缁甸槼", new String[]{"鍥涘窛", "缁甸槼"}); + city_parents.put("宀抽槼", new String[]{"婀栧崡", "宀抽槼"}); + city_parents.put("澧炲煄", new String[]{"骞夸笢", "骞垮窞", "澧炲煄"}); + city_parents.put("鍚存睙", new String[]{"姹熻嫃", "鑻忓窞", "鍚存睙"}); + city_parents.put("鐟炲畨", new String[]{"娴欐睙", "娓╁窞", "鐟炲畨"}); + city_parents.put("涔愭竻", new String[]{"娴欐睙", "娓╁窞", "涔愭竻"}); + city_parents.put("濂夊寲", new String[]{"娴欐睙", "瀹佹尝", "濂夊寲"}); + city_parents.put("娓╁箔", new String[]{"娴欐睙", "鍙板窞", "娓╁箔"}); + city_parents.put("瀹滃叴", new String[]{"姹熻嫃", "鏃犻敗", "瀹滃叴"}); + city_parents.put("鑲囧簡", new String[]{"骞夸笢", "鑲囧簡"}); + city_parents.put("瀹夐槼", new String[]{"娌冲崡", "瀹夐槼"}); + city_parents.put("鏇查潠", new String[]{"浜戝崡", "鏇查潠"}); + city_parents.put("琛¢槼", new String[]{"婀栧崡", "琛¢槼"}); + city_parents.put("鏂颁埂", new String[]{"娌冲崡", "鏂颁埂"}); + city_parents.put("钀ュ彛", new String[]{"杈藉畞", "钀ュ彛"}); + city_parents.put("娼窞", new String[]{"骞夸笢", "娼窞"}); + city_parents.put("娌虫簮", new String[]{"骞夸笢", "娌虫簮"}); + city_parents.put("榛勭煶", new String[]{"婀栧寳", "榛勭煶"}); + city_parents.put("鐒︿綔", new String[]{"娌冲崡", "鐒︿綔"}); + city_parents.put("鎻槼", new String[]{"骞夸笢", "鎻槼"}); + city_parents.put("鑼傚悕", new String[]{"骞夸笢", "鑼傚悕"}); + city_parents.put("鐗′腹姹�", new String[]{"榛戦緳姹�", "鐗′腹姹�"}); + city_parents.put("鐩橀敠", new String[]{"杈藉畞", "鐩橀敠"}); + city_parents.put("骞抽《灞�", new String[]{"娌冲崡", "骞抽《灞�"}); + city_parents.put("闊跺叧", new String[]{"骞夸笢", "闊跺叧"}); + city_parents.put("闃虫睙", new String[]{"骞夸笢", "闃虫睙"}); + city_parents.put("姊呭窞", new String[]{"骞夸笢", "姊呭窞"}); + city_parents.put("椤哄痉", new String[]{"骞夸笢", "浣涘北"}); } static Map province_citys=new HashMap(); @@ -320,4838 +320,4838 @@ public static String[] provinces=new String[]{ " static Map> city_DistrictNames=new HashMap>(); static{ - city_DistrictNames.put("重庆", new ArrayList(){{ - add(new String[]{"重庆森林公寓", "重庆"}); - add(new String[]{"重庆天地雍江艺庭", "重庆"}); - add(new String[]{"重庆大学B区集资楼", "重庆"}); - add(new String[]{"重庆喜来登国际中心", "重庆"}); - add(new String[]{"重庆森林", "重庆"}); - add(new String[]{"重庆村", "重庆"}); - add(new String[]{"重庆师范大学师大园", "重庆"}); - add(new String[]{"重庆宾馆商务大厦", "重庆"}); - add(new String[]{"重庆出版社小区", "重庆"}); - add(new String[]{"重庆戴斯大酒店", "重庆"}); - add(new String[]{"重庆上海中心", "重庆"}); - add(new String[]{"重庆天地雍江翠璟", "重庆"}); - add(new String[]{"重庆天地雍江悦庭", "重庆"}); - add(new String[]{"重庆大学A区松林村", "重庆"}); - add(new String[]{"重庆桃源居国际花园一区", "重庆"}); - add(new String[]{"重庆世界之窗", "重庆"}); - add(new String[]{"重庆公馆", "重庆"}); - add(new String[]{"重庆公寓", "上海"}); - add(new String[]{"重庆大楼", "上海"}); - add(new String[]{"重庆国际家纺城绣色", "重庆"}); - add(new String[]{"重庆万豪国际金融中心", "重庆"}); - add(new String[]{"重庆天地雍江御庭", "重庆"}); - add(new String[]{"重庆广告产业园", "重庆"}); - add(new String[]{"重庆总部城", "重庆"}); - add(new String[]{"重庆棕榈泉国际花园", "重庆"}); - }}); - city_DistrictNames.put("重庆", new ArrayList(){{ - add(new String[]{"重庆森林公寓", "重庆"}); - add(new String[]{"重庆天地雍江艺庭", "重庆"}); - add(new String[]{"重庆大学B区集资楼", "重庆"}); - add(new String[]{"重庆喜来登国际中心", "重庆"}); - add(new String[]{"重庆森林", "重庆"}); - add(new String[]{"重庆村", "重庆"}); - add(new String[]{"重庆师范大学师大园", "重庆"}); - add(new String[]{"重庆宾馆商务大厦", "重庆"}); - add(new String[]{"重庆出版社小区", "重庆"}); - add(new String[]{"重庆戴斯大酒店", "重庆"}); - add(new String[]{"重庆上海中心", "重庆"}); - add(new String[]{"重庆天地雍江翠璟", "重庆"}); - add(new String[]{"重庆天地雍江悦庭", "重庆"}); - add(new String[]{"重庆大学A区松林村", "重庆"}); - add(new String[]{"重庆桃源居国际花园一区", "重庆"}); - add(new String[]{"重庆世界之窗", "重庆"}); - add(new String[]{"重庆公馆", "重庆"}); - add(new String[]{"重庆公寓", "上海"}); - add(new String[]{"重庆大楼", "上海"}); - add(new String[]{"重庆国际家纺城绣色", "重庆"}); - add(new String[]{"重庆万豪国际金融中心", "重庆"}); - add(new String[]{"重庆天地雍江御庭", "重庆"}); - add(new String[]{"重庆广告产业园", "重庆"}); - add(new String[]{"重庆总部城", "重庆"}); - add(new String[]{"重庆棕榈泉国际花园", "重庆"}); - }}); - city_DistrictNames.put("河北", new ArrayList(){{ - add(new String[]{"河北税务学校生活区", "石家庄"}); - add(new String[]{"河北经济日报社宿舍", "石家庄"}); - add(new String[]{"河北美术出版社宿舍", "石家庄"}); - add(new String[]{"河北物资宿舍", "石家庄"}); - add(new String[]{"河北化工医药职业技术学院宿舍", "石家庄"}); - add(new String[]{"河北电机宿舍", "石家庄"}); - add(new String[]{"河北日报社宿舍", "石家庄"}); - add(new String[]{"河北工程造价管理总站宿舍", "石家庄"}); - add(new String[]{"河北康城", "潍坊"}); - add(new String[]{"河北社区", "沈阳"}); - add(new String[]{"河北医科大学宿舍", "石家庄"}); - add(new String[]{"河北省人大宿舍", "石家庄"}); - add(new String[]{"河北新人家", "唐山"}); - add(new String[]{"河北一号", "唐山"}); - add(new String[]{"河北机要局宿舍", "石家庄"}); - add(new String[]{"河北广播电视报宿舍", "石家庄"}); - add(new String[]{"河北商城", "青岛"}); - add(new String[]{"河北长城饭店", "石家庄"}); - add(new String[]{"河北村小区", "北京"}); - add(new String[]{"河北桃江里", "天津"}); - add(new String[]{"河北师大青年公寓楼", "石家庄"}); - add(new String[]{"河北绛", "无锡"}); - add(new String[]{"河北社区", "本溪"}); - add(new String[]{"河北楼", "唐山"}); - }}); - city_DistrictNames.put("唐山", new ArrayList(){{ - add(new String[]{"唐山第三空间综合体", "唐山"}); - add(new String[]{"唐山万达广场", "唐山"}); - add(new String[]{"唐山里", "天津"}); - add(new String[]{"唐山市供电公司古冶分公司住宅楼11号楼12号楼", "唐山"}); - add(new String[]{"唐山国际五金商城", "唐山"}); - add(new String[]{"唐山新苑", "上海"}); - add(new String[]{"唐山义乌小商品城", "唐山"}); - }}); - city_DistrictNames.put("湖南", new ArrayList(){{ - add(new String[]{"湖南大厦", "海口"}); - add(new String[]{"湖南师大张公岭校区宿舍", "长沙"}); - add(new String[]{"湖南省进出口公司宿舍", "长沙"}); - add(new String[]{"湖南广电宿舍", "长沙"}); - add(new String[]{"湖南机床厂宿舍", "长沙"}); - add(new String[]{"湖南制药厂宿舍", "长沙"}); - add(new String[]{"湖南供销大厦", "长沙"}); - add(new String[]{"湖南化工医药设计院宿舍", "长沙"}); - add(new String[]{"湖南工商银行宿舍机关大院", "长沙"}); - add(new String[]{"湖南省国防科公办机关院内宿舍", "长沙"}); - add(new String[]{"湖南报业文化城", "长沙"}); - add(new String[]{"湖南省交通设计院", "长沙"}); - add(new String[]{"湖南联通住宅小区", "长沙"}); - add(new String[]{"湖南电视台单位宿舍", "长沙"}); - add(new String[]{"湖南开关厂宿舍", "长沙"}); - add(new String[]{"湖南小区", "北京"}); - add(new String[]{"湖南邮电新村小区", "鞍山"}); - add(new String[]{"湖南省科学技术厅宿舍", "长沙"}); - add(new String[]{"湖南省国安厅单位房", "长沙"}); - add(new String[]{"湖南省木偶剧团宿舍", "长沙"}); - add(new String[]{"湖南省气象局宿舍", "长沙"}); - add(new String[]{"湖南女子大学教师公寓", "长沙"}); - add(new String[]{"湖南省农业机械研究所", "长沙"}); - add(new String[]{"湖南教育装备综合大楼", "长沙"}); - add(new String[]{"湖南省劳动卫生所", "长沙"}); - add(new String[]{"湖南省质量技术监督局宿舍", "长沙"}); - add(new String[]{"湖南省金属回收公司宿舍", "长沙"}); - add(new String[]{"湖南省塑料研究所", "长沙"}); - add(new String[]{"湖南省高级人民检查院单位房", "长沙"}); - add(new String[]{"湖南交通职院宿舍", "长沙"}); - add(new String[]{"湖南省冶金材料研究所", "长沙"}); - add(new String[]{"湖南金蜂音像出版社", "长沙"}); - add(new String[]{"湖南省物资厅宿舍", "长沙"}); - add(new String[]{"湖南家电商城", "长沙"}); - add(new String[]{"湖南国际商务中心", "长沙"}); - add(new String[]{"湖南财富中心", "长沙"}); - add(new String[]{"湖南国际汽车城", "长沙"}); - add(new String[]{"湖南亚大数码港", "长沙"}); - add(new String[]{"湖南大厦", "南宁"}); - add(new String[]{"湖南大厦", "上海"}); - add(new String[]{"湖南星沙汽配城", "长沙"}); - add(new String[]{"湖南艺校单位房", "长沙"}); - add(new String[]{"湖南财专教职工宿舍", "长沙"}); - add(new String[]{"湖南省机械进出口公司宿舍", "长沙"}); - add(new String[]{"湖南日报单位宿舍", "长沙"}); - add(new String[]{"湖南岸后畈小区", "绍兴"}); - }}); - city_DistrictNames.put("张家界", new ArrayList(){{ - add(new String[]{"张家界天门一号", "张家界"}); - }}); - city_DistrictNames.put("内蒙古", new ArrayList(){{ - add(new String[]{"内蒙古电大小区", "呼和浩特"}); - add(new String[]{"内蒙古日报社安全文明小区", "呼和浩特"}); - add(new String[]{"内蒙古政府住宅小区", "呼和浩特"}); - add(new String[]{"内蒙古自治区国税局住宅区", "呼和浩特"}); - add(new String[]{"内蒙古政协住宅小区", "呼和浩特"}); - add(new String[]{"内蒙古经贸学院家属院", "呼和浩特"}); - add(new String[]{"内蒙古党校南苑小区", "呼和浩特"}); - add(new String[]{"内蒙古医院家属楼", "呼和浩特"}); - add(new String[]{"内蒙古国际商贸城", "呼和浩特"}); - }}); - city_DistrictNames.put("呼和浩特", new ArrayList(){{ - }}); - city_DistrictNames.put("甘肃", new ArrayList(){{ - add(new String[]{"甘肃联合大学家属院", "兰州"}); - add(new String[]{"甘肃省青少年科技活动中心家属院", "兰州"}); - add(new String[]{"甘肃省新闻出版局家属院", "兰州"}); - add(new String[]{"甘肃省邮电建设公司家属院", "兰州"}); - add(new String[]{"甘肃省审计局家属院", "兰州"}); - add(new String[]{"甘肃省体育局家属院", "兰州"}); - add(new String[]{"甘肃省种子公司家属院", "兰州"}); - add(new String[]{"甘肃农业职业技术学院家属院", "兰州"}); - add(new String[]{"甘肃省广电总局家属院", "兰州"}); - add(new String[]{"甘肃中医院", "兰州"}); - add(new String[]{"甘肃省建筑设计研究所家属院", "兰州"}); - add(new String[]{"甘肃省政府家属院(旧大路)", "兰州"}); - add(new String[]{"甘肃省供销社家属院", "兰州"}); - add(new String[]{"甘肃省人事厅家属院", "兰州"}); - add(new String[]{"甘肃会展中心建筑群", "兰州"}); - add(new String[]{"甘肃第一建设集团公司小区", "兰州"}); - add(new String[]{"甘肃省旅游局家属院", "兰州"}); - add(new String[]{"甘肃化工机械厂家属院", "兰州"}); - add(new String[]{"甘肃人防大厦", "兰州"}); - add(new String[]{"甘肃省地矿局高层住宅", "兰州"}); - add(new String[]{"甘肃电视台家属院", "兰州"}); - add(new String[]{"甘肃省疾控中心家属院", "兰州"}); - add(new String[]{"甘肃职工大厦", "兰州"}); - add(new String[]{"甘肃省电子公司家属院", "兰州"}); - }}); - city_DistrictNames.put("兰州", new ArrayList(){{ - add(new String[]{"兰州一中家属院", "兰州"}); - add(new String[]{"兰州军区颜家沟物业小区", "兰州"}); - add(new String[]{"兰州市粮食局家属院(永昌路)", "兰州"}); - add(new String[]{"兰州市政公司家属院", "兰州"}); - add(new String[]{"兰州军区副食品基地", "兰州"}); - add(new String[]{"兰州减速机厂家属院", "兰州"}); - add(new String[]{"兰州军区家属院", "兰州"}); - add(new String[]{"兰州公交万众住宅小区", "兰州"}); - add(new String[]{"兰州钢厂家属院", "兰州"}); - add(new String[]{"兰州市女子职业技术学校家属楼", "兰州"}); - add(new String[]{"兰州市印刷厂家属院", "兰州"}); - add(new String[]{"兰州晟佳公司家属院南一门", "兰州"}); - add(new String[]{"兰州建筑段家属院", "兰州"}); - add(new String[]{"兰州炼油总厂家属院", "兰州"}); - add(new String[]{"兰州国资物业第二家园", "兰州"}); - add(new String[]{"兰州雁滩市公安局家属院", "兰州"}); - add(new String[]{"兰州高新开发区大学科技园", "兰州"}); - add(new String[]{"兰州银行科技支行家属院", "兰州"}); - add(new String[]{"兰州市城管区何家庄财政家属院", "兰州"}); - add(new String[]{"兰州市七里河区林家庄铁路小区", "兰州"}); - add(new String[]{"兰州市火车站乘警大队家属院", "兰州"}); - add(new String[]{"兰州新村", "上海"}); - add(new String[]{"兰州市国税局家属院", "兰州"}); - add(new String[]{"兰州剧院家属院", "兰州"}); - add(new String[]{"兰州电子工业学校家属院", "兰州"}); - add(new String[]{"兰州市人大家属院", "兰州"}); - add(new String[]{"兰州军区副食品基地家属院", "兰州"}); - add(new String[]{"兰州市教育局家属院", "兰州"}); - }}); - city_DistrictNames.put("山东", new ArrayList(){{ - add(new String[]{"山东里", "秦皇岛"}); - add(new String[]{"山东经济学院宿舍", "济南"}); - add(new String[]{"山东省卫生厅宿舍", "济南"}); - add(new String[]{"山东省民政厅宿舍", "济南"}); - add(new String[]{"山东省商业集团总公司宿舍", "济南"}); - add(new String[]{"山东医科大学教师宿舍", "济南"}); - add(new String[]{"山东外贸大厦", "青岛"}); - add(new String[]{"山东大厦", "深圳"}); - add(new String[]{"山东堡社区", "沈阳"}); - add(new String[]{"山东艺术学院宿舍", "济南"}); - add(new String[]{"山东黄金崮云湖高尔夫别墅", "济南"}); - add(new String[]{"山东司法警官学院宿舍", "济南"}); - add(new String[]{"山东省科学院高新技术研究分院", "青岛"}); - add(new String[]{"山东建工学院宿舍", "济南"}); - add(new String[]{"山东庙小区", "沈阳"}); - add(new String[]{"山东乳山银滩海景房", "威海"}); - add(new String[]{"山东头村", "青岛"}); - add(new String[]{"山东省畜牧局宿舍", "济南"}); - }}); - city_DistrictNames.put("青岛", new ArrayList(){{ - add(new String[]{"青岛嘉园", "北京"}); - add(new String[]{"青岛天山华庭", "青岛"}); - add(new String[]{"青岛太平洋中心", "青岛"}); - add(new String[]{"青岛裕龙大厦", "青岛"}); - add(new String[]{"青岛通信花园", "青岛"}); - add(new String[]{"青岛维多利亚广场", "青岛"}); - add(new String[]{"青岛山花园", "青岛"}); - add(new String[]{"青岛启阳国际", "青岛"}); - add(new String[]{"青岛世界贸易中心", "青岛"}); - add(new String[]{"青岛正商红河谷", "青岛"}); - add(new String[]{"青岛花园二期 (顺安馨城)", "连云港"}); - add(new String[]{"青岛家园A区", "乌鲁木齐"}); - add(new String[]{"青岛花苑", "乌鲁木齐"}); - add(new String[]{"青岛家园B区", "乌鲁木齐"}); - add(new String[]{"青岛花园一期", "连云港"}); - add(new String[]{"青岛阳光嘉园", "青岛"}); - add(new String[]{"青岛御景峰", "青岛"}); - add(new String[]{"青岛东方美景", "青岛"}); - add(new String[]{"青岛阳光馨苑", "青岛"}); - add(new String[]{"青岛公馆", "青岛"}); - add(new String[]{"青岛公寓", "洛阳"}); - add(new String[]{"青岛盐业小区", "青岛"}); - add(new String[]{"青岛山公寓", "青岛"}); - add(new String[]{"青岛景苑", "潍坊"}); - add(new String[]{"青岛台湾创新工业园", "青岛"}); - add(new String[]{"青岛印象山", "青岛"}); - add(new String[]{"青岛宝门公寓", "青岛"}); - add(new String[]{"青岛数码科技中心", "青岛"}); - add(new String[]{"青岛龙湖原山", "青岛"}); - add(new String[]{"青岛印象金沙滩", "青岛"}); - add(new String[]{"青岛万德丰观景苑", "青岛"}); - add(new String[]{"青岛鲁中家居城", "青岛"}); - add(new String[]{"青岛红树林度假世界", "青岛"}); - add(new String[]{"青岛凤凰城", "青岛"}); - add(new String[]{"青岛海上嘉年华", "青岛"}); - add(new String[]{"青岛开发区国际贸易中心", "青岛"}); - add(new String[]{"青岛珠山天鹅湖生态旅游度假区", "青岛"}); - }}); - city_DistrictNames.put("江西", new ArrayList(){{ - add(new String[]{"江西省建工集团", "南昌"}); - add(new String[]{"江西财经大学邮政宿舍", "南昌"}); - add(new String[]{"江西省图书馆宿舍", "南昌"}); - add(new String[]{"江西宾馆旁边", "南昌"}); - add(new String[]{"江西行政学院宿舍", "南昌"}); - add(new String[]{"江西财经大学宿舍", "南昌"}); - add(new String[]{"江西科技师范学院宿舍", "南昌"}); - add(new String[]{"江西省广播电台宿舍", "南昌"}); - add(new String[]{"江西东华计量研究所宿舍", "南昌"}); - add(new String[]{"江西客车厂宿舍", "南昌"}); - add(new String[]{"江西仪器厂宿舍", "南昌"}); - add(new String[]{"江西昌东汽车交易广场", "南昌"}); - add(new String[]{"江西旧货大世界", "南昌"}); - add(new String[]{"江西日报宿舍", "南昌"}); - }}); - city_DistrictNames.put("南昌", new ArrayList(){{ - add(new String[]{"南昌大桥管理处宿舍", "南昌"}); - add(new String[]{"南昌公交总公司宿舍", "南昌"}); - add(new String[]{"南昌市经济大楼", "南昌"}); - add(new String[]{"南昌居住主题公园别墅", "南昌"}); - add(new String[]{"南昌市委党校宿舍", "南昌"}); - add(new String[]{"南昌市建设路", "南昌"}); - add(new String[]{"南昌县公安局宿舍", "南昌"}); - add(new String[]{"南昌三十中宿舍", "南昌"}); - add(new String[]{"南昌博泰生态商务园", "南昌"}); - add(new String[]{"南昌衡机厂宿舍", "南昌"}); - add(new String[]{"南昌居住主题公园", "南昌"}); - add(new String[]{"南昌花苑", "上海"}); - add(new String[]{"南昌中央香榭", "南昌"}); - }}); - city_DistrictNames.put("江苏", new ArrayList(){{ - add(new String[]{"江苏省农科院", "南京"}); - add(new String[]{"江苏油田石油山庄", "扬州"}); - add(new String[]{"江苏警官学院", "南京"}); - add(new String[]{"江苏省高级专家园", "南京"}); - add(new String[]{"江苏油田石油山庄", "扬州"}); - add(new String[]{"江苏议事园", "南京"}); - add(new String[]{"江苏国际塑化城", "常州"}); - add(new String[]{"江苏万和国际商贸城", "常州"}); - }}); - city_DistrictNames.put("连云港", new ArrayList(){{ - add(new String[]{"连云港光伸", "连云港"}); - }}); - city_DistrictNames.put("山东", new ArrayList(){{ - add(new String[]{"山东里", "秦皇岛"}); - add(new String[]{"山东经济学院宿舍", "济南"}); - add(new String[]{"山东省卫生厅宿舍", "济南"}); - add(new String[]{"山东省民政厅宿舍", "济南"}); - add(new String[]{"山东省商业集团总公司宿舍", "济南"}); - add(new String[]{"山东医科大学教师宿舍", "济南"}); - add(new String[]{"山东外贸大厦", "青岛"}); - add(new String[]{"山东大厦", "深圳"}); - add(new String[]{"山东堡社区", "沈阳"}); - add(new String[]{"山东艺术学院宿舍", "济南"}); - add(new String[]{"山东黄金崮云湖高尔夫别墅", "济南"}); - add(new String[]{"山东司法警官学院宿舍", "济南"}); - add(new String[]{"山东省科学院高新技术研究分院", "青岛"}); - add(new String[]{"山东建工学院宿舍", "济南"}); - add(new String[]{"山东庙小区", "沈阳"}); - add(new String[]{"山东乳山银滩海景房", "威海"}); - add(new String[]{"山东头村", "青岛"}); - add(new String[]{"山东省畜牧局宿舍", "济南"}); - }}); - city_DistrictNames.put("淄博", new ArrayList(){{ - add(new String[]{"淄博奥林匹克花园", "淄博"}); - }}); - city_DistrictNames.put("广东", new ArrayList(){{ - add(new String[]{"广东外贸广场", "广州"}); - add(new String[]{"广东外语艺术学院教师宿舍", "广州"}); - add(new String[]{"广东建科院宿舍", "广州"}); - add(new String[]{"广东司法警官职业学院宿舍", "广州"}); - add(new String[]{"广东环保大厦", "广州"}); - add(new String[]{"广东商业大厦", "广州"}); - add(new String[]{"广东医学院教师宿舍楼", "东莞"}); - add(new String[]{"广东国际大厦", "广州"}); - add(new String[]{"广东省技术监督局宿舍", "广州"}); - add(new String[]{"广东工业大学宿舍", "广州"}); - add(new String[]{"广东教育学院宿舍", "广州"}); - add(new String[]{"广东省银行大厦", "深圳"}); - add(new String[]{"广东大厦", "天津"}); - add(new String[]{"广东山庄", "镇江"}); - add(new String[]{"广东红盾大厦", "广州"}); - add(new String[]{"广东药学院宿舍", "广州"}); - add(new String[]{"广东青年干部学院宿舍", "广州"}); - add(new String[]{"广东基础楼", "深圳"}); - add(new String[]{"广东省科技干部学院宿舍", "广州"}); - add(new String[]{"广东省农业管理干部学院社区", "广州"}); - add(new String[]{"广东芭蕾雨·逸景", "佛山"}); - }}); - city_DistrictNames.put("肇庆", new ArrayList(){{ - add(new String[]{"肇庆碧桂园", "肇庆"}); - add(new String[]{"肇庆蓝领公寓", "肇庆"}); - add(new String[]{"肇庆·景德尚都", "肇庆"}); - add(new String[]{"肇庆碧桂园·山湖城", "肇庆"}); - }}); - city_DistrictNames.put("江苏", new ArrayList(){{ - add(new String[]{"江苏省农科院", "南京"}); - add(new String[]{"江苏油田石油山庄", "扬州"}); - add(new String[]{"江苏警官学院", "南京"}); - add(new String[]{"江苏省高级专家园", "南京"}); - add(new String[]{"江苏油田石油山庄", "扬州"}); - add(new String[]{"江苏议事园", "南京"}); - add(new String[]{"江苏国际塑化城", "常州"}); - add(new String[]{"江苏万和国际商贸城", "常州"}); - }}); - city_DistrictNames.put("徐州", new ArrayList(){{ - add(new String[]{"徐州人家", "徐州"}); - add(new String[]{"徐州金达小区", "徐州"}); - add(new String[]{"徐州礼品城", "徐州"}); - add(new String[]{"徐州里", "天津"}); - }}); - city_DistrictNames.put("新疆维吾尔", new ArrayList(){{ - add(new String[]{"新疆维吾尔医院家属院", "乌鲁木齐"}); - }}); - city_DistrictNames.put("乌鲁木齐", new ArrayList(){{ - add(new String[]{"乌鲁木齐卫生防疫站家属院", "乌鲁木齐"}); - add(new String[]{"乌鲁木齐仓房沟农工商贸公司", "乌鲁木齐"}); - add(new String[]{"乌鲁木齐排水管理处住宅", "乌鲁木齐"}); - add(new String[]{"乌鲁木齐市第一人民医院家属院", "乌鲁木齐"}); - add(new String[]{"乌鲁木齐成人教育家属院", "乌鲁木齐"}); - add(new String[]{"乌鲁木齐卫生局家属院", "乌鲁木齐"}); - add(new String[]{"乌鲁木齐市文物局家属院", "乌鲁木齐"}); - add(new String[]{"乌鲁木齐第一干休所", "乌鲁木齐"}); - }}); - city_DistrictNames.put("湖南", new ArrayList(){{ - add(new String[]{"湖南大厦", "海口"}); - add(new String[]{"湖南师大张公岭校区宿舍", "长沙"}); - add(new String[]{"湖南省进出口公司宿舍", "长沙"}); - add(new String[]{"湖南广电宿舍", "长沙"}); - add(new String[]{"湖南机床厂宿舍", "长沙"}); - add(new String[]{"湖南制药厂宿舍", "长沙"}); - add(new String[]{"湖南供销大厦", "长沙"}); - add(new String[]{"湖南化工医药设计院宿舍", "长沙"}); - add(new String[]{"湖南工商银行宿舍机关大院", "长沙"}); - add(new String[]{"湖南省国防科公办机关院内宿舍", "长沙"}); - add(new String[]{"湖南报业文化城", "长沙"}); - add(new String[]{"湖南省交通设计院", "长沙"}); - add(new String[]{"湖南联通住宅小区", "长沙"}); - add(new String[]{"湖南电视台单位宿舍", "长沙"}); - add(new String[]{"湖南开关厂宿舍", "长沙"}); - add(new String[]{"湖南小区", "北京"}); - add(new String[]{"湖南邮电新村小区", "鞍山"}); - add(new String[]{"湖南省科学技术厅宿舍", "长沙"}); - add(new String[]{"湖南省国安厅单位房", "长沙"}); - add(new String[]{"湖南省木偶剧团宿舍", "长沙"}); - add(new String[]{"湖南省气象局宿舍", "长沙"}); - add(new String[]{"湖南女子大学教师公寓", "长沙"}); - add(new String[]{"湖南省农业机械研究所", "长沙"}); - add(new String[]{"湖南教育装备综合大楼", "长沙"}); - add(new String[]{"湖南省劳动卫生所", "长沙"}); - add(new String[]{"湖南省质量技术监督局宿舍", "长沙"}); - add(new String[]{"湖南省金属回收公司宿舍", "长沙"}); - add(new String[]{"湖南省塑料研究所", "长沙"}); - add(new String[]{"湖南省高级人民检查院单位房", "长沙"}); - add(new String[]{"湖南交通职院宿舍", "长沙"}); - add(new String[]{"湖南省冶金材料研究所", "长沙"}); - add(new String[]{"湖南金蜂音像出版社", "长沙"}); - add(new String[]{"湖南省物资厅宿舍", "长沙"}); - add(new String[]{"湖南家电商城", "长沙"}); - add(new String[]{"湖南国际商务中心", "长沙"}); - add(new String[]{"湖南财富中心", "长沙"}); - add(new String[]{"湖南国际汽车城", "长沙"}); - add(new String[]{"湖南亚大数码港", "长沙"}); - add(new String[]{"湖南大厦", "南宁"}); - add(new String[]{"湖南大厦", "上海"}); - add(new String[]{"湖南星沙汽配城", "长沙"}); - add(new String[]{"湖南艺校单位房", "长沙"}); - add(new String[]{"湖南财专教职工宿舍", "长沙"}); - add(new String[]{"湖南省机械进出口公司宿舍", "长沙"}); - add(new String[]{"湖南日报单位宿舍", "长沙"}); - add(new String[]{"湖南岸后畈小区", "绍兴"}); - }}); - city_DistrictNames.put("株洲", new ArrayList(){{ - }}); - city_DistrictNames.put("江苏", new ArrayList(){{ - add(new String[]{"江苏省农科院", "南京"}); - add(new String[]{"江苏油田石油山庄", "扬州"}); - add(new String[]{"江苏警官学院", "南京"}); - add(new String[]{"江苏省高级专家园", "南京"}); - add(new String[]{"江苏油田石油山庄", "扬州"}); - add(new String[]{"江苏议事园", "南京"}); - add(new String[]{"江苏国际塑化城", "常州"}); - add(new String[]{"江苏万和国际商贸城", "常州"}); - }}); - city_DistrictNames.put("扬州", new ArrayList(){{ - add(new String[]{"扬州水乡", "北京"}); - add(new String[]{"扬州花园", "泰州"}); - add(new String[]{"扬州念香苑", "扬州"}); - add(new String[]{"扬州天下别墅", "扬州"}); - add(new String[]{"扬州念香苑", "扬州"}); - add(new String[]{"扬州市教工宿舍", "扬州"}); - add(new String[]{"扬州师范学院宿舍", "扬州"}); - add(new String[]{"扬州京剧团宿舍", "扬州"}); - add(new String[]{"扬州大世界国际广场", "扬州"}); - add(new String[]{"扬州印象花园", "扬州"}); - add(new String[]{"扬州里", "天津"}); - add(new String[]{"扬州花园", "泰州"}); - add(new String[]{"扬州印象花园", "扬州"}); - add(new String[]{"扬州画舫", "扬州"}); - add(new String[]{"扬州工学院宿舍", "扬州"}); - add(new String[]{"扬州天下花园", "扬州"}); - add(new String[]{"扬州天下别墅", "扬州"}); - add(new String[]{"扬州水乡别墅", "北京"}); - add(new String[]{"扬州天下花园", "扬州"}); - add(new String[]{"扬州城", "丹东"}); - add(new String[]{"扬州高力汽车汽配城", "扬州"}); - add(new String[]{"扬州人家", "扬州"}); - add(new String[]{"扬州市双子星国际广场", "扬州"}); - }}); - city_DistrictNames.put("广西壮族", new ArrayList(){{ - add(new String[]{"广西壮族自治区司法厅宿舍", "南宁"}); - add(new String[]{"广西壮族自治区农业厅宿舍", "南宁"}); - }}); - city_DistrictNames.put("柳州", new ArrayList(){{ - add(new String[]{"柳州·温州商贸城", "柳州"}); - }}); - city_DistrictNames.put("宁夏回族", new ArrayList(){{ - }}); - city_DistrictNames.put("银川", new ArrayList(){{ - add(new String[]{"银川美居", "青岛"}); - add(new String[]{"银川国际贸易中心", "银川"}); - add(new String[]{"银川山苑", "青岛"}); - add(new String[]{"银川小区", "沈阳"}); - }}); - city_DistrictNames.put("浙江", new ArrayList(){{ - add(new String[]{"浙江工业大学教师宿舍", "杭州"}); - add(new String[]{"浙江大厦", "太原"}); - add(new String[]{"浙江办事处宿舍", "太原"}); - add(new String[]{"浙江仁和居老年养生公寓", "湖州"}); - add(new String[]{"浙江交运大厦", "杭州"}); - add(new String[]{"浙江工商大学宿舍", "杭州"}); - add(new String[]{"浙江商贸城", "合肥"}); - add(new String[]{"浙江工业大学之江学院", "杭州"}); - }}); - city_DistrictNames.put("温州", new ArrayList(){{ - add(new String[]{"温州大厦", "海口"}); - add(new String[]{"温州城", "贵阳"}); - add(new String[]{"温州公寓", "贵阳"}); - add(new String[]{"温州商城", "湖州"}); - add(new String[]{"温州商城", "唐山"}); - add(new String[]{"温州世贸中心大厦", "温州"}); - add(new String[]{"温州世贸中心广场", "温州"}); - add(new String[]{"温州人才大厦", "温州"}); - add(new String[]{"温州龙湾万达广场", "温州"}); - add(new String[]{"温州城·都乐汇", "沈阳"}); - add(new String[]{"温州商城", "金华"}); - }}); - city_DistrictNames.put("辽宁", new ArrayList(){{ - add(new String[]{"辽宁中医家属楼", "沈阳"}); - add(new String[]{"辽宁里", "天津"}); - }}); - city_DistrictNames.put("大连", new ArrayList(){{ - add(new String[]{"大连万科天麓", "大连"}); - add(new String[]{"大连门小区", "大连"}); - add(new String[]{"大连门广场", "大连"}); - add(new String[]{"大连明珠", "大连"}); - add(new String[]{"大连中心裕景", "大连"}); - add(new String[]{"大连新村", "上海"}); - add(new String[]{"大连小区", "上海"}); - add(new String[]{"大连天地悦翠台", "大连"}); - add(new String[]{"大连安波国际温泉新城", "大连"}); - add(new String[]{"大连金州区福佳新天地", "丹东"}); - }}); - city_DistrictNames.put("浙江", new ArrayList(){{ - add(new String[]{"浙江工业大学教师宿舍", "杭州"}); - add(new String[]{"浙江大厦", "太原"}); - add(new String[]{"浙江办事处宿舍", "太原"}); - add(new String[]{"浙江仁和居老年养生公寓", "湖州"}); - add(new String[]{"浙江交运大厦", "杭州"}); - add(new String[]{"浙江工商大学宿舍", "杭州"}); - add(new String[]{"浙江商贸城", "合肥"}); - add(new String[]{"浙江工业大学之江学院", "杭州"}); - }}); - city_DistrictNames.put("宁波", new ArrayList(){{ - add(new String[]{"宁波里", "天津"}); - add(new String[]{"宁波里", "武汉"}); - add(new String[]{"宁波商会大厦", "宁波"}); - add(new String[]{"宁波外代大厦", "宁波"}); - add(new String[]{"宁波小区", "上海"}); - }}); - city_DistrictNames.put("辽宁", new ArrayList(){{ - add(new String[]{"辽宁中医家属楼", "沈阳"}); - add(new String[]{"辽宁里", "天津"}); - }}); - city_DistrictNames.put("本溪", new ArrayList(){{ - add(new String[]{"本溪楼", "天津"}); - add(new String[]{"本溪花园", "天津"}); - add(new String[]{"本溪西芬城建", "本溪"}); - }}); - city_DistrictNames.put("广东", new ArrayList(){{ - add(new String[]{"广东外贸广场", "广州"}); - add(new String[]{"广东外语艺术学院教师宿舍", "广州"}); - add(new String[]{"广东建科院宿舍", "广州"}); - add(new String[]{"广东司法警官职业学院宿舍", "广州"}); - add(new String[]{"广东环保大厦", "广州"}); - add(new String[]{"广东商业大厦", "广州"}); - add(new String[]{"广东医学院教师宿舍楼", "东莞"}); - add(new String[]{"广东国际大厦", "广州"}); - add(new String[]{"广东省技术监督局宿舍", "广州"}); - add(new String[]{"广东工业大学宿舍", "广州"}); - add(new String[]{"广东教育学院宿舍", "广州"}); - add(new String[]{"广东省银行大厦", "深圳"}); - add(new String[]{"广东大厦", "天津"}); - add(new String[]{"广东山庄", "镇江"}); - add(new String[]{"广东红盾大厦", "广州"}); - add(new String[]{"广东药学院宿舍", "广州"}); - add(new String[]{"广东青年干部学院宿舍", "广州"}); - add(new String[]{"广东基础楼", "深圳"}); - add(new String[]{"广东省科技干部学院宿舍", "广州"}); - add(new String[]{"广东省农业管理干部学院社区", "广州"}); - add(new String[]{"广东芭蕾雨·逸景", "佛山"}); - }}); - city_DistrictNames.put("茂名", new ArrayList(){{ - add(new String[]{"茂名大厦", "广州"}); - add(new String[]{"茂名大楼", "上海"}); - add(new String[]{"茂名大厦", "上海"}); - add(new String[]{"茂名坊", "上海"}); - add(new String[]{"茂名公寓", "上海"}); - add(new String[]{"茂名亿城名苑", "茂名"}); - add(new String[]{"茂名碧桂园", "茂名"}); - add(new String[]{"茂名石油化工学院", "茂名"}); - }}); - city_DistrictNames.put("浙江", new ArrayList(){{ - add(new String[]{"浙江工业大学教师宿舍", "杭州"}); - add(new String[]{"浙江大厦", "太原"}); - add(new String[]{"浙江办事处宿舍", "太原"}); - add(new String[]{"浙江仁和居老年养生公寓", "湖州"}); - add(new String[]{"浙江交运大厦", "杭州"}); - add(new String[]{"浙江工商大学宿舍", "杭州"}); - add(new String[]{"浙江商贸城", "合肥"}); - add(new String[]{"浙江工业大学之江学院", "杭州"}); - }}); - city_DistrictNames.put("台州", new ArrayList(){{ - add(new String[]{"台州香格里拉花园 (香格里拉,香格里拉花园)", "台州"}); - add(new String[]{"台州国际塑料城 (国际塑料城)", "台州"}); - add(new String[]{"台州世贸中心 (世贸中心)", "台州"}); - add(new String[]{"台州汽配城 (汽配城)", "台州"}); - add(new String[]{"台州海洋广场", "台州"}); - add(new String[]{"台州耀江广场", "台州"}); - }}); - city_DistrictNames.put("温岭", new ArrayList(){{ - add(new String[]{"温岭锦都花园", "台州"}); - add(new String[]{"温岭东方花园", "温岭"}); - }}); - city_DistrictNames.put("浙江", new ArrayList(){{ - add(new String[]{"浙江工业大学教师宿舍", "杭州"}); - add(new String[]{"浙江大厦", "太原"}); - add(new String[]{"浙江办事处宿舍", "太原"}); - add(new String[]{"浙江仁和居老年养生公寓", "湖州"}); - add(new String[]{"浙江交运大厦", "杭州"}); - add(new String[]{"浙江工商大学宿舍", "杭州"}); - add(new String[]{"浙江商贸城", "合肥"}); - add(new String[]{"浙江工业大学之江学院", "杭州"}); - }}); - city_DistrictNames.put("绍兴", new ArrayList(){{ - add(new String[]{"绍兴天下", "绍兴"}); - add(new String[]{"绍兴新村", "杭州"}); - add(new String[]{"绍兴颐景园", "杭州"}); - add(new String[]{"绍兴社区", "武汉"}); - add(new String[]{"绍兴东方花园", "绍兴"}); - add(new String[]{"绍兴轻纺贸易中心", "绍兴"}); - }}); - city_DistrictNames.put("山东", new ArrayList(){{ - add(new String[]{"山东里", "秦皇岛"}); - add(new String[]{"山东经济学院宿舍", "济南"}); - add(new String[]{"山东省卫生厅宿舍", "济南"}); - add(new String[]{"山东省民政厅宿舍", "济南"}); - add(new String[]{"山东省商业集团总公司宿舍", "济南"}); - add(new String[]{"山东医科大学教师宿舍", "济南"}); - add(new String[]{"山东外贸大厦", "青岛"}); - add(new String[]{"山东大厦", "深圳"}); - add(new String[]{"山东堡社区", "沈阳"}); - add(new String[]{"山东艺术学院宿舍", "济南"}); - add(new String[]{"山东黄金崮云湖高尔夫别墅", "济南"}); - add(new String[]{"山东司法警官学院宿舍", "济南"}); - add(new String[]{"山东省科学院高新技术研究分院", "青岛"}); - add(new String[]{"山东建工学院宿舍", "济南"}); - add(new String[]{"山东庙小区", "沈阳"}); - add(new String[]{"山东乳山银滩海景房", "威海"}); - add(new String[]{"山东头村", "青岛"}); - add(new String[]{"山东省畜牧局宿舍", "济南"}); - }}); - city_DistrictNames.put("烟台", new ArrayList(){{ - add(new String[]{"烟台数码港", "烟台"}); - }}); - city_DistrictNames.put("贵州", new ArrayList(){{ - add(new String[]{"贵州大厦", "海口"}); - add(new String[]{"贵州科技大厦", "贵阳"}); - add(new String[]{"贵州日报社糖果厂宿舍", "贵阳"}); - add(new String[]{"贵州驴友人家酒店式连锁家庭公寓", "贵阳"}); - add(new String[]{"贵州日报社糖果厂宿舍", "贵阳"}); - add(new String[]{"贵州商贸物流港", "贵阳"}); - }}); - city_DistrictNames.put("贵阳", new ArrayList(){{ - add(new String[]{"贵阳市遵义路遵义巷", "贵阳"}); - add(new String[]{"贵阳医学院附属医院宿舍", "贵阳"}); - add(new String[]{"贵阳建筑设计院宿舍", "贵阳"}); - add(new String[]{"贵阳花苑", "北海"}); - add(new String[]{"贵阳里", "天津"}); - add(new String[]{"贵阳公寓", "天津"}); - add(new String[]{"贵阳市科研所宿舍", "贵阳"}); - add(new String[]{"贵阳观山湖一号", "贵阳"}); - add(new String[]{"贵阳恒大绿洲", "贵阳"}); - add(new String[]{"贵阳恒大城", "贵阳"}); - add(new String[]{"贵阳经济开发区", "贵阳"}); - add(new String[]{"贵阳中医学院教师宿舍", "贵阳"}); - add(new String[]{"贵阳饭店", "贵阳"}); - add(new String[]{"贵阳小区", "长春"}); - add(new String[]{"贵阳市遵义路遵义巷小区", "贵阳"}); - }}); - city_DistrictNames.put("河南", new ArrayList(){{ - add(new String[]{"河南庄小区", "青岛"}); - add(new String[]{"河南财专家属院", "郑州"}); - add(new String[]{"河南省新华书店家属院", "郑州"}); - add(new String[]{"河南省商业科学研究所家属院", "郑州"}); - add(new String[]{"河南省日报社家属院", "郑州"}); - add(new String[]{"河南女子高中家属院", "郑州"}); - add(new String[]{"河南外贸大院", "深圳"}); - add(new String[]{"河南里", "天津"}); - add(new String[]{"河南新村", "福州"}); - add(new String[]{"河南财经学院家属院", "郑州"}); - add(new String[]{"河南岸公园小区", "惠州"}); - add(new String[]{"河南岸新村", "惠州"}); - add(new String[]{"河南村", "北京"}); - add(new String[]{"河南理工学校家属院", "郑州"}); - add(new String[]{"河南省人事厅家属院", "郑州"}); - add(new String[]{"河南岸中心小区", "惠州"}); - add(new String[]{"河南省外贸学校家属院", "郑州"}); - add(new String[]{"河南村", "上海"}); - add(new String[]{"河南新村", "上海"}); - add(new String[]{"河南工业大学家属院", "郑州"}); - }}); - city_DistrictNames.put("焦作", new ArrayList(){{ - add(new String[]{"焦作群英家苑", "焦作"}); - add(new String[]{"焦作中海丽江", "焦作"}); - add(new String[]{"焦作白云苑", "焦作"}); - add(new String[]{"焦作滨河小区", "焦作"}); - }}); - city_DistrictNames.put("湖南", new ArrayList(){{ - add(new String[]{"湖南大厦", "海口"}); - add(new String[]{"湖南师大张公岭校区宿舍", "长沙"}); - add(new String[]{"湖南省进出口公司宿舍", "长沙"}); - add(new String[]{"湖南广电宿舍", "长沙"}); - add(new String[]{"湖南机床厂宿舍", "长沙"}); - add(new String[]{"湖南制药厂宿舍", "长沙"}); - add(new String[]{"湖南供销大厦", "长沙"}); - add(new String[]{"湖南化工医药设计院宿舍", "长沙"}); - add(new String[]{"湖南工商银行宿舍机关大院", "长沙"}); - add(new String[]{"湖南省国防科公办机关院内宿舍", "长沙"}); - add(new String[]{"湖南报业文化城", "长沙"}); - add(new String[]{"湖南省交通设计院", "长沙"}); - add(new String[]{"湖南联通住宅小区", "长沙"}); - add(new String[]{"湖南电视台单位宿舍", "长沙"}); - add(new String[]{"湖南开关厂宿舍", "长沙"}); - add(new String[]{"湖南小区", "北京"}); - add(new String[]{"湖南邮电新村小区", "鞍山"}); - add(new String[]{"湖南省科学技术厅宿舍", "长沙"}); - add(new String[]{"湖南省国安厅单位房", "长沙"}); - add(new String[]{"湖南省木偶剧团宿舍", "长沙"}); - add(new String[]{"湖南省气象局宿舍", "长沙"}); - add(new String[]{"湖南女子大学教师公寓", "长沙"}); - add(new String[]{"湖南省农业机械研究所", "长沙"}); - add(new String[]{"湖南教育装备综合大楼", "长沙"}); - add(new String[]{"湖南省劳动卫生所", "长沙"}); - add(new String[]{"湖南省质量技术监督局宿舍", "长沙"}); - add(new String[]{"湖南省金属回收公司宿舍", "长沙"}); - add(new String[]{"湖南省塑料研究所", "长沙"}); - add(new String[]{"湖南省高级人民检查院单位房", "长沙"}); - add(new String[]{"湖南交通职院宿舍", "长沙"}); - add(new String[]{"湖南省冶金材料研究所", "长沙"}); - add(new String[]{"湖南金蜂音像出版社", "长沙"}); - add(new String[]{"湖南省物资厅宿舍", "长沙"}); - add(new String[]{"湖南家电商城", "长沙"}); - add(new String[]{"湖南国际商务中心", "长沙"}); - add(new String[]{"湖南财富中心", "长沙"}); - add(new String[]{"湖南国际汽车城", "长沙"}); - add(new String[]{"湖南亚大数码港", "长沙"}); - add(new String[]{"湖南大厦", "南宁"}); - add(new String[]{"湖南大厦", "上海"}); - add(new String[]{"湖南星沙汽配城", "长沙"}); - add(new String[]{"湖南艺校单位房", "长沙"}); - add(new String[]{"湖南财专教职工宿舍", "长沙"}); - add(new String[]{"湖南省机械进出口公司宿舍", "长沙"}); - add(new String[]{"湖南日报单位宿舍", "长沙"}); - add(new String[]{"湖南岸后畈小区", "绍兴"}); - }}); - city_DistrictNames.put("岳阳", new ArrayList(){{ - add(new String[]{"岳阳小区", "厦门"}); - add(new String[]{"岳阳舒苑", "天津"}); - add(new String[]{"岳阳里", "天津"}); - add(new String[]{"岳阳西里", "厦门"}); - add(new String[]{"岳阳里·和平区", "天津"}); - add(new String[]{"岳阳小区", "上海"}); - add(new String[]{"岳阳大楼", "上海"}); - add(new String[]{"岳阳花苑", "上海"}); - }}); - city_DistrictNames.put("江苏", new ArrayList(){{ - add(new String[]{"江苏省农科院", "南京"}); - add(new String[]{"江苏油田石油山庄", "扬州"}); - add(new String[]{"江苏警官学院", "南京"}); - add(new String[]{"江苏省高级专家园", "南京"}); - add(new String[]{"江苏油田石油山庄", "扬州"}); - add(new String[]{"江苏议事园", "南京"}); - add(new String[]{"江苏国际塑化城", "常州"}); - add(new String[]{"江苏万和国际商贸城", "常州"}); - }}); - city_DistrictNames.put("南通", new ArrayList(){{ - add(new String[]{"南通花园", "珠海"}); - add(new String[]{"南通电信宿舍", "长沙"}); - add(new String[]{"南通里", "天津"}); - add(new String[]{"南通大厦", "南通"}); - add(new String[]{"南通紫竹苑", "南通"}); - add(new String[]{"南通中央商务区", "南通"}); - add(new String[]{"南通壹城水木清华", "南通"}); - add(new String[]{"南通国际贸易中心", "南通"}); - add(new String[]{"南通星光耀广场", "南通"}); - add(new String[]{"南通现代生活广场", "南通"}); - add(new String[]{"南通·金游城", "南通"}); - }}); - city_DistrictNames.put("江苏", new ArrayList(){{ - add(new String[]{"江苏省农科院", "南京"}); - add(new String[]{"江苏油田石油山庄", "扬州"}); - add(new String[]{"江苏警官学院", "南京"}); - add(new String[]{"江苏省高级专家园", "南京"}); - add(new String[]{"江苏油田石油山庄", "扬州"}); - add(new String[]{"江苏议事园", "南京"}); - add(new String[]{"江苏国际塑化城", "常州"}); - add(new String[]{"江苏万和国际商贸城", "常州"}); - }}); - city_DistrictNames.put("南京", new ArrayList(){{ - add(new String[]{"南京花园", "哈尔滨"}); - add(new String[]{"南京艺术学院家属区", "南京"}); - add(new String[]{"南京国际广场", "南京"}); - add(new String[]{"南京财经大学教师宿舍楼", "南京"}); - add(new String[]{"南京炼油厂小区", "南京"}); - add(new String[]{"南京南社区", "沈阳"}); - add(new String[]{"南京江天花园", "连云港"}); - add(new String[]{"南京世界村", "南京"}); - add(new String[]{"南京万达广场", "南京"}); - add(new String[]{"南京沪江商贸城", "南京"}); - add(new String[]{"南京理工大学", "南京"}); - add(new String[]{"南京海峡城", "南京"}); - add(new String[]{"南京小区", "上海"}); - add(new String[]{"南京湾锦绣香江", "南京"}); - }}); - city_DistrictNames.put("黑龙江", new ArrayList(){{ - }}); - city_DistrictNames.put("牡丹江", new ArrayList(){{ - add(new String[]{"牡丹江社区", "沈阳"}); - }}); - city_DistrictNames.put("安徽", new ArrayList(){{ - add(new String[]{"安徽师范大学教师公寓", "芜湖"}); - add(new String[]{"安徽电视台宿舍", "合肥"}); - add(new String[]{"安徽日报社宿舍", "合肥"}); - add(new String[]{"安徽大厦", "珠海"}); - add(new String[]{"安徽杂技团宿舍", "合肥"}); - add(new String[]{"安徽警官职业学院宿舍", "合肥"}); - add(new String[]{"安徽税务学校宿舍", "合肥"}); - add(new String[]{"安徽汽配城", "合肥"}); - add(new String[]{"安徽国强钢材交易中心", "合肥"}); - add(new String[]{"安徽国际购物广场", "合肥"}); - add(new String[]{"安徽大市场", "合肥"}); - }}); - city_DistrictNames.put("马鞍山", new ArrayList(){{ - add(new String[]{"马鞍山小区", "成都"}); - add(new String[]{"马鞍山一号", "广州"}); - }}); - city_DistrictNames.put("浙江", new ArrayList(){{ - add(new String[]{"浙江工业大学教师宿舍", "杭州"}); - add(new String[]{"浙江大厦", "太原"}); - add(new String[]{"浙江办事处宿舍", "太原"}); - add(new String[]{"浙江仁和居老年养生公寓", "湖州"}); - add(new String[]{"浙江交运大厦", "杭州"}); - add(new String[]{"浙江工商大学宿舍", "杭州"}); - add(new String[]{"浙江商贸城", "合肥"}); - add(new String[]{"浙江工业大学之江学院", "杭州"}); - }}); - city_DistrictNames.put("台州", new ArrayList(){{ - add(new String[]{"台州香格里拉花园 (香格里拉,香格里拉花园)", "台州"}); - add(new String[]{"台州国际塑料城 (国际塑料城)", "台州"}); - add(new String[]{"台州世贸中心 (世贸中心)", "台州"}); - add(new String[]{"台州汽配城 (汽配城)", "台州"}); - add(new String[]{"台州海洋广场", "台州"}); - add(new String[]{"台州耀江广场", "台州"}); - }}); - city_DistrictNames.put("广东", new ArrayList(){{ - add(new String[]{"广东外贸广场", "广州"}); - add(new String[]{"广东外语艺术学院教师宿舍", "广州"}); - add(new String[]{"广东建科院宿舍", "广州"}); - add(new String[]{"广东司法警官职业学院宿舍", "广州"}); - add(new String[]{"广东环保大厦", "广州"}); - add(new String[]{"广东商业大厦", "广州"}); - add(new String[]{"广东医学院教师宿舍楼", "东莞"}); - add(new String[]{"广东国际大厦", "广州"}); - add(new String[]{"广东省技术监督局宿舍", "广州"}); - add(new String[]{"广东工业大学宿舍", "广州"}); - add(new String[]{"广东教育学院宿舍", "广州"}); - add(new String[]{"广东省银行大厦", "深圳"}); - add(new String[]{"广东大厦", "天津"}); - add(new String[]{"广东山庄", "镇江"}); - add(new String[]{"广东红盾大厦", "广州"}); - add(new String[]{"广东药学院宿舍", "广州"}); - add(new String[]{"广东青年干部学院宿舍", "广州"}); - add(new String[]{"广东基础楼", "深圳"}); - add(new String[]{"广东省科技干部学院宿舍", "广州"}); - add(new String[]{"广东省农业管理干部学院社区", "广州"}); - add(new String[]{"广东芭蕾雨·逸景", "佛山"}); - }}); - city_DistrictNames.put("汕头", new ArrayList(){{ - add(new String[]{"汕头新城", "汕头"}); - }}); - city_DistrictNames.put("浙江", new ArrayList(){{ - add(new String[]{"浙江工业大学教师宿舍", "杭州"}); - add(new String[]{"浙江大厦", "太原"}); - add(new String[]{"浙江办事处宿舍", "太原"}); - add(new String[]{"浙江仁和居老年养生公寓", "湖州"}); - add(new String[]{"浙江交运大厦", "杭州"}); - add(new String[]{"浙江工商大学宿舍", "杭州"}); - add(new String[]{"浙江商贸城", "合肥"}); - add(new String[]{"浙江工业大学之江学院", "杭州"}); - }}); - city_DistrictNames.put("宁波", new ArrayList(){{ - add(new String[]{"宁波里", "天津"}); - add(new String[]{"宁波里", "武汉"}); - add(new String[]{"宁波商会大厦", "宁波"}); - add(new String[]{"宁波外代大厦", "宁波"}); - add(new String[]{"宁波小区", "上海"}); - }}); - city_DistrictNames.put("奉化", new ArrayList(){{ - add(new String[]{"奉化亲亲家园", "宁波"}); - add(new String[]{"奉化亲亲家园", "奉化"}); - add(new String[]{"奉化中央花园", "宁波"}); - }}); - city_DistrictNames.put("广西壮族", new ArrayList(){{ - add(new String[]{"广西壮族自治区司法厅宿舍", "南宁"}); - add(new String[]{"广西壮族自治区农业厅宿舍", "南宁"}); - }}); - city_DistrictNames.put("桂林", new ArrayList(){{ - add(new String[]{"桂林国际旅游商品批发城", "桂林"}); - add(new String[]{"桂林小区", "长春"}); - add(new String[]{"桂林小区", "沈阳"}); - add(new String[]{"桂林小区", "大连"}); - add(new String[]{"桂林苑", "大连"}); - add(new String[]{"桂林公馆原乡墅", "桂林"}); - add(new String[]{"桂林润园", "桂林"}); - add(new String[]{"桂林奥林匹克花园", "桂林"}); - add(new String[]{"桂林大世界", "桂林"}); - add(new String[]{"桂林万灵润园", "桂林"}); - add(new String[]{"桂林新苑", "上海"}); - add(new String[]{"桂林苑", "上海"}); - add(new String[]{"桂林花苑", "上海"}); - add(new String[]{"桂林坊", "嘉兴"}); - }}); - city_DistrictNames.put("广东", new ArrayList(){{ - add(new String[]{"广东外贸广场", "广州"}); - add(new String[]{"广东外语艺术学院教师宿舍", "广州"}); - add(new String[]{"广东建科院宿舍", "广州"}); - add(new String[]{"广东司法警官职业学院宿舍", "广州"}); - add(new String[]{"广东环保大厦", "广州"}); - add(new String[]{"广东商业大厦", "广州"}); - add(new String[]{"广东医学院教师宿舍楼", "东莞"}); - add(new String[]{"广东国际大厦", "广州"}); - add(new String[]{"广东省技术监督局宿舍", "广州"}); - add(new String[]{"广东工业大学宿舍", "广州"}); - add(new String[]{"广东教育学院宿舍", "广州"}); - add(new String[]{"广东省银行大厦", "深圳"}); - add(new String[]{"广东大厦", "天津"}); - add(new String[]{"广东山庄", "镇江"}); - add(new String[]{"广东红盾大厦", "广州"}); - add(new String[]{"广东药学院宿舍", "广州"}); - add(new String[]{"广东青年干部学院宿舍", "广州"}); - add(new String[]{"广东基础楼", "深圳"}); - add(new String[]{"广东省科技干部学院宿舍", "广州"}); - add(new String[]{"广东省农业管理干部学院社区", "广州"}); - add(new String[]{"广东芭蕾雨·逸景", "佛山"}); - }}); - city_DistrictNames.put("广州", new ArrayList(){{ - add(new String[]{"广州卫生厅大院", "广州"}); - add(new String[]{"广州雅居乐花园雅逸庭", "广州"}); - add(new String[]{"广州客车厂宿舍", "广州"}); - add(new String[]{"广州后花园", "清远"}); - add(new String[]{"广州后花园", "清远"}); - add(new String[]{"广州雅居乐花园浅山小筑", "广州"}); - add(new String[]{"广州雅居乐花园雅悦庭", "广州"}); - add(new String[]{"广州雅居乐花园雅翠庭", "广州"}); - add(new String[]{"广州奥林匹克花园", "广州"}); - add(new String[]{"广州雅居乐花园邻居", "广州"}); - add(new String[]{"广州雅居乐花园逸心园", "广州"}); - add(new String[]{"广州大学教师楼", "广州"}); - add(new String[]{"广州市社会福利院宿舍", "广州"}); - add(new String[]{"广州体育学院宿舍", "广州"}); - add(new String[]{"广州市食品宿舍", "广州"}); - add(new String[]{"广州湾时代广场", "湛江"}); - add(new String[]{"广州军区房管所宿舍", "武汉"}); - add(new String[]{"广州新塘新世界花园", "广州"}); - add(new String[]{"广州空港假日别墅酒店", "广州"}); - add(new String[]{"广州星河丹堤", "广州"}); - add(new String[]{"广州雅居乐花园十年小雅", "广州"}); - add(new String[]{"广州雅居乐花园花巷", "广州"}); - add(new String[]{"广州雅居乐花园峰会", "广州"}); - add(new String[]{"广州雅居乐花园御景峰别墅", "广州"}); - add(new String[]{"广州碧桂园福苑", "广州"}); - add(new String[]{"广州碧桂园华苑", "广州"}); - add(new String[]{"广州碧桂园雅苑", "广州"}); - add(new String[]{"广州碧桂园美苑", "广州"}); - add(new String[]{"广州碧桂园乐苑", "广州"}); - add(new String[]{"广州碧桂园锦苑", "广州"}); - add(new String[]{"广州雅居乐花园·欧洲故事", "广州"}); - add(new String[]{"广州雅居乐花园灏湖居", "广州"}); - add(new String[]{"广州雅居乐花园雅湖居", "广州"}); - add(new String[]{"广州雅居乐花园", "广州"}); - add(new String[]{"广州雅居乐花园一尺山居", "广州"}); - add(new String[]{"广州雅居乐花园·新地", "广州"}); - add(new String[]{"广州雅居乐花园·天域", "广州"}); - add(new String[]{"广州雅居乐花园·挪威森林", "广州"}); - add(new String[]{"广州雅居乐花园雕刻时光", "广州"}); - add(new String[]{"广州碧桂园秀苑", "广州"}); - add(new String[]{"广州雅居乐花园上善若水", "广州"}); - add(new String[]{"广州港瑞酒店公寓", "广州"}); - add(new String[]{"广州亚运城·天誉", "广州"}); - add(new String[]{"广州白天鹅花园", "广州"}); - add(new String[]{"广州碧桂园绿茵苑", "广州"}); - add(new String[]{"广州雅居乐花园时光九篇", "广州"}); - add(new String[]{"广州碧桂园康苑", "广州"}); - add(new String[]{"广州海运大厦", "广州"}); - add(new String[]{"广州有色金属研究院", "广州"}); - add(new String[]{"广州碧桂园丽苑", "广州"}); - add(new String[]{"广州碧桂园翠苑", "广州"}); - add(new String[]{"广州富力城", "广州"}); - add(new String[]{"广州碧桂园", "广州"}); - add(new String[]{"广州新塘新世界花园", "增城"}); - }}); - city_DistrictNames.put("增城", new ArrayList(){{ - add(new String[]{"增城富丽花园", "广州"}); - add(new String[]{"增城时代倾城", "广州"}); - add(new String[]{"增城雅居乐御宾府", "广州"}); - add(new String[]{"增城沙园中路小区", "广州"}); - add(new String[]{"增城群星大厦", "广州"}); - add(new String[]{"增城怡康花园", "广州"}); - add(new String[]{"增城富景居", "广州"}); - add(new String[]{"增城金田花园", "广州"}); - add(new String[]{"增城通园花园", "广州"}); - add(new String[]{"增城顺景楼", "广州"}); - add(new String[]{"增城翠景苑", "广州"}); - add(new String[]{"增城农行宿舍", "广州"}); - add(new String[]{"增城阳光家园", "广州"}); - add(new String[]{"增城锦城花园", "广州"}); - add(new String[]{"增城万达广场", "广州"}); - add(new String[]{"增城金田花园", "增城"}); - add(new String[]{"增城时代倾城", "增城"}); - add(new String[]{"增城沙园中路小区", "增城"}); - add(new String[]{"增城富丽花园", "增城"}); - add(new String[]{"增城雅居乐御宾府", "增城"}); - add(new String[]{"增城富景居", "增城"}); - add(new String[]{"增城通园花园", "增城"}); - add(new String[]{"增城农行宿舍", "增城"}); - add(new String[]{"增城翠景苑", "增城"}); - add(new String[]{"增城群星大厦", "增城"}); - add(new String[]{"增城锦城花园", "增城"}); - add(new String[]{"增城顺景楼", "增城"}); - add(new String[]{"增城阳光家园", "增城"}); - add(new String[]{"增城怡康花园", "增城"}); - }}); - city_DistrictNames.put("广东", new ArrayList(){{ - add(new String[]{"广东外贸广场", "广州"}); - add(new String[]{"广东外语艺术学院教师宿舍", "广州"}); - add(new String[]{"广东建科院宿舍", "广州"}); - add(new String[]{"广东司法警官职业学院宿舍", "广州"}); - add(new String[]{"广东环保大厦", "广州"}); - add(new String[]{"广东商业大厦", "广州"}); - add(new String[]{"广东医学院教师宿舍楼", "东莞"}); - add(new String[]{"广东国际大厦", "广州"}); - add(new String[]{"广东省技术监督局宿舍", "广州"}); - add(new String[]{"广东工业大学宿舍", "广州"}); - add(new String[]{"广东教育学院宿舍", "广州"}); - add(new String[]{"广东省银行大厦", "深圳"}); - add(new String[]{"广东大厦", "天津"}); - add(new String[]{"广东山庄", "镇江"}); - add(new String[]{"广东红盾大厦", "广州"}); - add(new String[]{"广东药学院宿舍", "广州"}); - add(new String[]{"广东青年干部学院宿舍", "广州"}); - add(new String[]{"广东基础楼", "深圳"}); - add(new String[]{"广东省科技干部学院宿舍", "广州"}); - add(new String[]{"广东省农业管理干部学院社区", "广州"}); - add(new String[]{"广东芭蕾雨·逸景", "佛山"}); - }}); - city_DistrictNames.put("阳江", new ArrayList(){{ - add(new String[]{"阳江碧湖雅苑", "阳江"}); - add(new String[]{"阳江山庄别墅", "阳江"}); - }}); - city_DistrictNames.put("天津", new ArrayList(){{ - add(new String[]{"天津湾海景雅苑", "天津"}); - add(new String[]{"天津新村", "南京"}); - add(new String[]{"天津富力桃园", "天津"}); - add(new String[]{"天津中心", "天津"}); - add(new String[]{"天津园艺工程研究所", "天津"}); - add(new String[]{"天津宾馆温泉公寓", "天津"}); - add(new String[]{"天津湾海河国际花园", "天津"}); - add(new String[]{"天津奥式商务公园", "天津"}); - add(new String[]{"天津倍儿幸福", "天津"}); - add(new String[]{"天津华侨城", "天津"}); - add(new String[]{"天津大都会", "天津"}); - add(new String[]{"天津雅颂居", "天津"}); - add(new String[]{"天津碧桂园", "天津"}); - add(new String[]{"天津未来城", "天津"}); - add(new String[]{"天津科技广场", "天津"}); - add(new String[]{"天津大院", "武汉"}); - add(new String[]{"天津大悦城悦府", "天津"}); - add(new String[]{"天津大悦城大悦公寓", "天津"}); - add(new String[]{"天津富力湾", "天津"}); - add(new String[]{"天津津南新城别墅", "天津"}); - add(new String[]{"天津公馆", "天津"}); - add(new String[]{"天津津南新城", "天津"}); - add(new String[]{"天津富力中心", "天津"}); - add(new String[]{"天津环球金融中心", "天津"}); - add(new String[]{"天津港湾中心", "天津"}); - }}); - city_DistrictNames.put("广东", new ArrayList(){{ - add(new String[]{"广东外贸广场", "广州"}); - add(new String[]{"广东外语艺术学院教师宿舍", "广州"}); - add(new String[]{"广东建科院宿舍", "广州"}); - add(new String[]{"广东司法警官职业学院宿舍", "广州"}); - add(new String[]{"广东环保大厦", "广州"}); - add(new String[]{"广东商业大厦", "广州"}); - add(new String[]{"广东医学院教师宿舍楼", "东莞"}); - add(new String[]{"广东国际大厦", "广州"}); - add(new String[]{"广东省技术监督局宿舍", "广州"}); - add(new String[]{"广东工业大学宿舍", "广州"}); - add(new String[]{"广东教育学院宿舍", "广州"}); - add(new String[]{"广东省银行大厦", "深圳"}); - add(new String[]{"广东大厦", "天津"}); - add(new String[]{"广东山庄", "镇江"}); - add(new String[]{"广东红盾大厦", "广州"}); - add(new String[]{"广东药学院宿舍", "广州"}); - add(new String[]{"广东青年干部学院宿舍", "广州"}); - add(new String[]{"广东基础楼", "深圳"}); - add(new String[]{"广东省科技干部学院宿舍", "广州"}); - add(new String[]{"广东省农业管理干部学院社区", "广州"}); - add(new String[]{"广东芭蕾雨·逸景", "佛山"}); - }}); - city_DistrictNames.put("清远", new ArrayList(){{ - add(new String[]{"清远维港尚城", "清远"}); - add(new String[]{"清远奥园", "清远"}); - add(new String[]{"清远里", "杭州"}); - add(new String[]{"清远维港尚城", "清远"}); - add(new String[]{"清远一区", "乐清"}); - }}); - city_DistrictNames.put("河北", new ArrayList(){{ - add(new String[]{"河北税务学校生活区", "石家庄"}); - add(new String[]{"河北经济日报社宿舍", "石家庄"}); - add(new String[]{"河北美术出版社宿舍", "石家庄"}); - add(new String[]{"河北物资宿舍", "石家庄"}); - add(new String[]{"河北化工医药职业技术学院宿舍", "石家庄"}); - add(new String[]{"河北电机宿舍", "石家庄"}); - add(new String[]{"河北日报社宿舍", "石家庄"}); - add(new String[]{"河北工程造价管理总站宿舍", "石家庄"}); - add(new String[]{"河北康城", "潍坊"}); - add(new String[]{"河北社区", "沈阳"}); - add(new String[]{"河北医科大学宿舍", "石家庄"}); - add(new String[]{"河北省人大宿舍", "石家庄"}); - add(new String[]{"河北新人家", "唐山"}); - add(new String[]{"河北一号", "唐山"}); - add(new String[]{"河北机要局宿舍", "石家庄"}); - add(new String[]{"河北广播电视报宿舍", "石家庄"}); - add(new String[]{"河北商城", "青岛"}); - add(new String[]{"河北长城饭店", "石家庄"}); - add(new String[]{"河北村小区", "北京"}); - add(new String[]{"河北桃江里", "天津"}); - add(new String[]{"河北师大青年公寓楼", "石家庄"}); - add(new String[]{"河北绛", "无锡"}); - add(new String[]{"河北社区", "本溪"}); - add(new String[]{"河北楼", "唐山"}); - }}); - city_DistrictNames.put("秦皇岛", new ArrayList(){{ - add(new String[]{"秦皇岛恒大城", "秦皇岛"}); - }}); - city_DistrictNames.put("浙江", new ArrayList(){{ - add(new String[]{"浙江工业大学教师宿舍", "杭州"}); - add(new String[]{"浙江大厦", "太原"}); - add(new String[]{"浙江办事处宿舍", "太原"}); - add(new String[]{"浙江仁和居老年养生公寓", "湖州"}); - add(new String[]{"浙江交运大厦", "杭州"}); - add(new String[]{"浙江工商大学宿舍", "杭州"}); - add(new String[]{"浙江商贸城", "合肥"}); - add(new String[]{"浙江工业大学之江学院", "杭州"}); - }}); - city_DistrictNames.put("湖州", new ArrayList(){{ - add(new String[]{"湖州东苑", "杭州"}); - add(new String[]{"湖州竹翠园小区", "湖州"}); - }}); - city_DistrictNames.put("浙江", new ArrayList(){{ - add(new String[]{"浙江工业大学教师宿舍", "杭州"}); - add(new String[]{"浙江大厦", "太原"}); - add(new String[]{"浙江办事处宿舍", "太原"}); - add(new String[]{"浙江仁和居老年养生公寓", "湖州"}); - add(new String[]{"浙江交运大厦", "杭州"}); - add(new String[]{"浙江工商大学宿舍", "杭州"}); - add(new String[]{"浙江商贸城", "合肥"}); - add(new String[]{"浙江工业大学之江学院", "杭州"}); - }}); - city_DistrictNames.put("杭州", new ArrayList(){{ - add(new String[]{"杭州赛码城", "杭州"}); - add(new String[]{"杭州天清岛度假别墅", "杭州"}); - add(new String[]{"杭州湾公寓", "杭州"}); - add(new String[]{"杭州里", "天津"}); - add(new String[]{"杭州大厦", "台州"}); - add(new String[]{"杭州香港城", "杭州"}); - add(new String[]{"杭州休斯顿高科技园", "杭州"}); - add(new String[]{"杭州宏丰家居城宏丰公寓", "杭州"}); - add(new String[]{"杭州大润城", "杭州"}); - add(new String[]{"杭州乐园风情街", "杭州"}); - add(new String[]{"杭州乔司商城", "杭州"}); - add(new String[]{"杭州碧桂园", "杭州"}); - add(new String[]{"杭州市交警复兴中队宿舍", "杭州"}); - }}); - city_DistrictNames.put("萧山", new ArrayList(){{ - add(new String[]{"萧山金城花园", "杭州"}); - add(new String[]{"萧山家景园", "杭州"}); - add(new String[]{"萧山时代广场", "杭州"}); - add(new String[]{"萧山众安服务楼", "杭州"}); - }}); - city_DistrictNames.put("福建", new ArrayList(){{ - add(new String[]{"福建园", "南宁"}); - add(new String[]{"福建省四建宿舍北门", "厦门"}); - add(new String[]{"福建联通花园", "福州"}); - add(new String[]{"福建日报社宿舍", "福州"}); - add(new String[]{"福建省中心检验所单位宿舍", "福州"}); - add(new String[]{"福建电影制片厂单位宿舍", "福州"}); - add(new String[]{"福建省女子监狱宿舍", "福州"}); - add(new String[]{"福建省医药公司大王里单位宿舍", "福州"}); - add(new String[]{"福建省第二公路工程公司宿舍", "福州"}); - add(new String[]{"福建省蚕桑研究所单位宿舍", "福州"}); - add(new String[]{"福建新村", "南京"}); - add(new String[]{"福建里", "天津"}); - add(new String[]{"福建社区", "武汉"}); - add(new String[]{"福建大厦", "贵阳"}); - add(new String[]{"福建巷小区", "成都"}); - add(new String[]{"福建大厦", "深圳"}); - add(new String[]{"福建生态工程学校单位宿舍", "福州"}); - add(new String[]{"福建医科大学教工宿舍", "福州"}); - }}); - city_DistrictNames.put("泉州", new ArrayList(){{ - add(new String[]{"泉州奥林匹克花园", "泉州"}); - add(new String[]{"泉州商城", "泉州"}); - }}); - city_DistrictNames.put("河北", new ArrayList(){{ - add(new String[]{"河北税务学校生活区", "石家庄"}); - add(new String[]{"河北经济日报社宿舍", "石家庄"}); - add(new String[]{"河北美术出版社宿舍", "石家庄"}); - add(new String[]{"河北物资宿舍", "石家庄"}); - add(new String[]{"河北化工医药职业技术学院宿舍", "石家庄"}); - add(new String[]{"河北电机宿舍", "石家庄"}); - add(new String[]{"河北日报社宿舍", "石家庄"}); - add(new String[]{"河北工程造价管理总站宿舍", "石家庄"}); - add(new String[]{"河北康城", "潍坊"}); - add(new String[]{"河北社区", "沈阳"}); - add(new String[]{"河北医科大学宿舍", "石家庄"}); - add(new String[]{"河北省人大宿舍", "石家庄"}); - add(new String[]{"河北新人家", "唐山"}); - add(new String[]{"河北一号", "唐山"}); - add(new String[]{"河北机要局宿舍", "石家庄"}); - add(new String[]{"河北广播电视报宿舍", "石家庄"}); - add(new String[]{"河北商城", "青岛"}); - add(new String[]{"河北长城饭店", "石家庄"}); - add(new String[]{"河北村小区", "北京"}); - add(new String[]{"河北桃江里", "天津"}); - add(new String[]{"河北师大青年公寓楼", "石家庄"}); - add(new String[]{"河北绛", "无锡"}); - add(new String[]{"河北社区", "本溪"}); - add(new String[]{"河北楼", "唐山"}); - }}); - city_DistrictNames.put("邯郸", new ArrayList(){{ - }}); - city_DistrictNames.put("广东", new ArrayList(){{ - add(new String[]{"广东外贸广场", "广州"}); - add(new String[]{"广东外语艺术学院教师宿舍", "广州"}); - add(new String[]{"广东建科院宿舍", "广州"}); - add(new String[]{"广东司法警官职业学院宿舍", "广州"}); - add(new String[]{"广东环保大厦", "广州"}); - add(new String[]{"广东商业大厦", "广州"}); - add(new String[]{"广东医学院教师宿舍楼", "东莞"}); - add(new String[]{"广东国际大厦", "广州"}); - add(new String[]{"广东省技术监督局宿舍", "广州"}); - add(new String[]{"广东工业大学宿舍", "广州"}); - add(new String[]{"广东教育学院宿舍", "广州"}); - add(new String[]{"广东省银行大厦", "深圳"}); - add(new String[]{"广东大厦", "天津"}); - add(new String[]{"广东山庄", "镇江"}); - add(new String[]{"广东红盾大厦", "广州"}); - add(new String[]{"广东药学院宿舍", "广州"}); - add(new String[]{"广东青年干部学院宿舍", "广州"}); - add(new String[]{"广东基础楼", "深圳"}); - add(new String[]{"广东省科技干部学院宿舍", "广州"}); - add(new String[]{"广东省农业管理干部学院社区", "广州"}); - add(new String[]{"广东芭蕾雨·逸景", "佛山"}); - }}); - city_DistrictNames.put("河源", new ArrayList(){{ - add(new String[]{"河源小区", "哈尔滨"}); - add(new String[]{"河源大厦", "广州"}); - add(new String[]{"河源碧水湾花园", "河源"}); - }}); - city_DistrictNames.put("浙江", new ArrayList(){{ - add(new String[]{"浙江工业大学教师宿舍", "杭州"}); - add(new String[]{"浙江大厦", "太原"}); - add(new String[]{"浙江办事处宿舍", "太原"}); - add(new String[]{"浙江仁和居老年养生公寓", "湖州"}); - add(new String[]{"浙江交运大厦", "杭州"}); - add(new String[]{"浙江工商大学宿舍", "杭州"}); - add(new String[]{"浙江商贸城", "合肥"}); - add(new String[]{"浙江工业大学之江学院", "杭州"}); - }}); - city_DistrictNames.put("杭州", new ArrayList(){{ - add(new String[]{"杭州赛码城", "杭州"}); - add(new String[]{"杭州天清岛度假别墅", "杭州"}); - add(new String[]{"杭州湾公寓", "杭州"}); - add(new String[]{"杭州里", "天津"}); - add(new String[]{"杭州大厦", "台州"}); - add(new String[]{"杭州香港城", "杭州"}); - add(new String[]{"杭州休斯顿高科技园", "杭州"}); - add(new String[]{"杭州宏丰家居城宏丰公寓", "杭州"}); - add(new String[]{"杭州大润城", "杭州"}); - add(new String[]{"杭州乐园风情街", "杭州"}); - add(new String[]{"杭州乔司商城", "杭州"}); - add(new String[]{"杭州碧桂园", "杭州"}); - add(new String[]{"杭州市交警复兴中队宿舍", "杭州"}); - }}); - city_DistrictNames.put("湖南", new ArrayList(){{ - add(new String[]{"湖南大厦", "海口"}); - add(new String[]{"湖南师大张公岭校区宿舍", "长沙"}); - add(new String[]{"湖南省进出口公司宿舍", "长沙"}); - add(new String[]{"湖南广电宿舍", "长沙"}); - add(new String[]{"湖南机床厂宿舍", "长沙"}); - add(new String[]{"湖南制药厂宿舍", "长沙"}); - add(new String[]{"湖南供销大厦", "长沙"}); - add(new String[]{"湖南化工医药设计院宿舍", "长沙"}); - add(new String[]{"湖南工商银行宿舍机关大院", "长沙"}); - add(new String[]{"湖南省国防科公办机关院内宿舍", "长沙"}); - add(new String[]{"湖南报业文化城", "长沙"}); - add(new String[]{"湖南省交通设计院", "长沙"}); - add(new String[]{"湖南联通住宅小区", "长沙"}); - add(new String[]{"湖南电视台单位宿舍", "长沙"}); - add(new String[]{"湖南开关厂宿舍", "长沙"}); - add(new String[]{"湖南小区", "北京"}); - add(new String[]{"湖南邮电新村小区", "鞍山"}); - add(new String[]{"湖南省科学技术厅宿舍", "长沙"}); - add(new String[]{"湖南省国安厅单位房", "长沙"}); - add(new String[]{"湖南省木偶剧团宿舍", "长沙"}); - add(new String[]{"湖南省气象局宿舍", "长沙"}); - add(new String[]{"湖南女子大学教师公寓", "长沙"}); - add(new String[]{"湖南省农业机械研究所", "长沙"}); - add(new String[]{"湖南教育装备综合大楼", "长沙"}); - add(new String[]{"湖南省劳动卫生所", "长沙"}); - add(new String[]{"湖南省质量技术监督局宿舍", "长沙"}); - add(new String[]{"湖南省金属回收公司宿舍", "长沙"}); - add(new String[]{"湖南省塑料研究所", "长沙"}); - add(new String[]{"湖南省高级人民检查院单位房", "长沙"}); - add(new String[]{"湖南交通职院宿舍", "长沙"}); - add(new String[]{"湖南省冶金材料研究所", "长沙"}); - add(new String[]{"湖南金蜂音像出版社", "长沙"}); - add(new String[]{"湖南省物资厅宿舍", "长沙"}); - add(new String[]{"湖南家电商城", "长沙"}); - add(new String[]{"湖南国际商务中心", "长沙"}); - add(new String[]{"湖南财富中心", "长沙"}); - add(new String[]{"湖南国际汽车城", "长沙"}); - add(new String[]{"湖南亚大数码港", "长沙"}); - add(new String[]{"湖南大厦", "南宁"}); - add(new String[]{"湖南大厦", "上海"}); - add(new String[]{"湖南星沙汽配城", "长沙"}); - add(new String[]{"湖南艺校单位房", "长沙"}); - add(new String[]{"湖南财专教职工宿舍", "长沙"}); - add(new String[]{"湖南省机械进出口公司宿舍", "长沙"}); - add(new String[]{"湖南日报单位宿舍", "长沙"}); - add(new String[]{"湖南岸后畈小区", "绍兴"}); - }}); - city_DistrictNames.put("衡阳", new ArrayList(){{ - add(new String[]{"衡阳新居(住宅)", "南宁"}); - add(new String[]{"衡阳名郡", "衡阳"}); - }}); - city_DistrictNames.put("广西壮族", new ArrayList(){{ - add(new String[]{"广西壮族自治区司法厅宿舍", "南宁"}); - add(new String[]{"广西壮族自治区农业厅宿舍", "南宁"}); - }}); - city_DistrictNames.put("玉林", new ArrayList(){{ - add(new String[]{"玉林东里", "北京"}); - add(new String[]{"玉林里小区", "北京"}); - add(new String[]{"玉林小区", "北京"}); - add(new String[]{"玉林八巷社区", "成都"}); - add(new String[]{"玉林六巷6号院", "成都"}); - add(new String[]{"玉林玉通巷8号院", "成都"}); - add(new String[]{"玉林苑二期", "成都"}); - add(new String[]{"玉林蓓蕾社区", "成都"}); - add(new String[]{"玉林七巷", "成都"}); - add(new String[]{"玉林西里小区", "北京"}); - add(new String[]{"玉林小区", "重庆"}); - add(new String[]{"玉林苑", "成都"}); - add(new String[]{"玉林小区", "成都"}); - add(new String[]{"玉林嘉苑", "成都"}); - add(new String[]{"玉林人家", "成都"}); - add(new String[]{"玉林祥和苑", "成都"}); - add(new String[]{"玉林大厦", "武汉"}); - add(new String[]{"玉林品上", "成都"}); - add(new String[]{"玉林都市金岸", "成都"}); - add(new String[]{"玉林名居", "成都"}); - add(new String[]{"玉林九巷4号院", "成都"}); - add(new String[]{"玉林六巷2号院", "成都"}); - add(new String[]{"玉林北巷8号院", "成都"}); - add(new String[]{"玉林二里", "北京"}); - add(new String[]{"玉林倍特科技园", "成都"}); - add(new String[]{"玉林苑", "昆山"}); - add(new String[]{"玉林公安厅宿舍", "成都"}); - add(new String[]{"玉林新天地", "成都"}); - add(new String[]{"玉林芳华", "成都"}); - add(new String[]{"玉林山水", "曲靖"}); - add(new String[]{"玉林小区(沾益)", "曲靖"}); - add(new String[]{"玉林小区", "曲靖"}); - add(new String[]{"玉林园小区", "丽江"}); - add(new String[]{"玉林花园", "丽江"}); - add(new String[]{"玉林大新社区", "玉林"}); - add(new String[]{"玉林东盛华府", "玉林"}); - add(new String[]{"玉林华商国际", "玉林"}); - }}); - city_DistrictNames.put("辽宁", new ArrayList(){{ - add(new String[]{"辽宁中医家属楼", "沈阳"}); - add(new String[]{"辽宁里", "天津"}); - }}); - city_DistrictNames.put("丹东", new ArrayList(){{ - add(new String[]{"丹东里", "天津"}); - }}); - city_DistrictNames.put("湖北", new ArrayList(){{ - add(new String[]{"湖北小区", "北京"}); - add(new String[]{"湖北宝丰花园", "深圳"}); - add(new String[]{"湖北经济学院宿舍", "武汉"}); - add(new String[]{"湖北大学宿舍", "武汉"}); - add(new String[]{"湖北日报宿舍", "武汉"}); - add(new String[]{"湖北省文联宿舍", "武汉"}); - add(new String[]{"湖北现代五金电器城", "武汉"}); - add(new String[]{"湖北饭店宿舍", "武汉"}); - add(new String[]{"湖北保险公司家属楼", "武汉"}); - add(new String[]{"湖北林业勘察院小区", "武汉"}); - add(new String[]{"湖北交通职业技术学院宿舍", "武汉"}); - add(new String[]{"湖北省艺术学校宿舍", "武汉"}); - add(new String[]{"湖北大厦", "厦门"}); - add(new String[]{"湖北质量监督局宿舍", "武汉"}); - add(new String[]{"湖北省医药监督管理局宿舍", "武汉"}); - add(new String[]{"湖北教育出版社宿舍", "武汉"}); - add(new String[]{"湖北省药材公司宿舍", "武汉"}); - add(new String[]{"湖北二师宿舍", "武汉"}); - add(new String[]{"湖北中医学院宿舍", "武汉"}); - add(new String[]{"湖北省生活资料公司居民小区", "武汉"}); - add(new String[]{"湖北商务广场", "武汉"}); - add(new String[]{"湖北教育学院宿舍", "武汉"}); - add(new String[]{"湖北省监狱管理局宿舍", "武汉"}); - add(new String[]{"湖北省安全监察局宿舍", "武汉"}); - }}); - city_DistrictNames.put("宜昌", new ArrayList(){{ - add(new String[]{"宜昌公寓", "天津"}); - add(new String[]{"宜昌CBD中心商务区", "宜昌"}); - add(new String[]{"宜昌小区", "沈阳"}); - add(new String[]{"宜昌里", "天津"}); - add(new String[]{"宜昌万达广场", "宜昌"}); - add(new String[]{"宜昌商业步行街紫晶城", "宜昌"}); - add(new String[]{"宜昌商业步行街", "宜昌"}); - add(new String[]{"宜昌花园二期", "珠海"}); - add(new String[]{"宜昌南里", "天津"}); - add(new String[]{"宜昌北里", "天津"}); - add(new String[]{"宜昌馨园", "青岛"}); - add(new String[]{"宜昌家园", "青岛"}); - add(new String[]{"宜昌南里·塘沽区", "天津"}); - add(new String[]{"宜昌商业步行街小区", "宜昌"}); - }}); - city_DistrictNames.put("浙江", new ArrayList(){{ - add(new String[]{"浙江工业大学教师宿舍", "杭州"}); - add(new String[]{"浙江大厦", "太原"}); - add(new String[]{"浙江办事处宿舍", "太原"}); - add(new String[]{"浙江仁和居老年养生公寓", "湖州"}); - add(new String[]{"浙江交运大厦", "杭州"}); - add(new String[]{"浙江工商大学宿舍", "杭州"}); - add(new String[]{"浙江商贸城", "合肥"}); - add(new String[]{"浙江工业大学之江学院", "杭州"}); - }}); - city_DistrictNames.put("温州", new ArrayList(){{ - add(new String[]{"温州大厦", "海口"}); - add(new String[]{"温州城", "贵阳"}); - add(new String[]{"温州公寓", "贵阳"}); - add(new String[]{"温州商城", "湖州"}); - add(new String[]{"温州商城", "唐山"}); - add(new String[]{"温州世贸中心大厦", "温州"}); - add(new String[]{"温州世贸中心广场", "温州"}); - add(new String[]{"温州人才大厦", "温州"}); - add(new String[]{"温州龙湾万达广场", "温州"}); - add(new String[]{"温州城·都乐汇", "沈阳"}); - add(new String[]{"温州商城", "金华"}); - }}); - city_DistrictNames.put("乐清", new ArrayList(){{ - add(new String[]{"乐清小区", "深圳"}); - add(new String[]{"乐清·中央公馆", "乐清"}); - add(new String[]{"乐清财富新天地", "乐清"}); - add(new String[]{"乐清雁荡小镇", "乐清"}); - add(new String[]{"乐清花园", "绍兴"}); - add(new String[]{"乐清雁荡小镇", "温州"}); - add(new String[]{"乐清·中央公馆", "温州"}); - add(new String[]{"乐清财富新天地", "温州"}); - }}); - city_DistrictNames.put("吉林", new ArrayList(){{ - add(new String[]{"吉林大厦", "海口"}); - add(new String[]{"吉林花园", "贵阳"}); - add(new String[]{"吉林社区", "武汉"}); - add(new String[]{"吉林省团校家属楼", "长春"}); - add(new String[]{"吉林里", "天津"}); - }}); - city_DistrictNames.put("吉林", new ArrayList(){{ - add(new String[]{"吉林大厦", "海口"}); - add(new String[]{"吉林花园", "贵阳"}); - add(new String[]{"吉林社区", "武汉"}); - add(new String[]{"吉林省团校家属楼", "长春"}); - add(new String[]{"吉林里", "天津"}); - }}); - city_DistrictNames.put("黑龙江", new ArrayList(){{ - }}); - city_DistrictNames.put("大庆", new ArrayList(){{ - add(new String[]{"大庆一区", "威海"}); - add(new String[]{"大庆村石油小区", "重庆"}); - add(new String[]{"大庆蜀苑", "成都"}); - add(new String[]{"大庆里", "天津"}); - add(new String[]{"大庆新村", "宁波"}); - add(new String[]{"大庆新村", "湘潭"}); - add(new String[]{"大庆新村", "盐城"}); - }}); - city_DistrictNames.put("广西", new ArrayList(){{ - add(new String[]{"广西电视台宿舍", "南宁"}); - add(new String[]{"广西气象局新竹路生活小区", "南宁"}); - add(new String[]{"广西木材公司宿舍", "南宁"}); - add(new String[]{"广西壮族自治区司法厅宿舍", "南宁"}); - add(new String[]{"广西新闻出版局生活区", "南宁"}); - add(new String[]{"广西出入境检验检疫局宿舍", "南宁"}); - add(new String[]{"广西南宁白沙大道麻纺厂宿舍", "南宁"}); - add(new String[]{"广西区粮食局宿舍", "南宁"}); - add(new String[]{"广西电网公司生活区", "南宁"}); - add(new String[]{"广西超大公司宿舍", "南宁"}); - add(new String[]{"广西电力有限公司琅东生活区", "南宁"}); - add(new String[]{"广西二建一分公司宿舍", "南宁"}); - add(new String[]{"广西壮族自治区农业厅宿舍", "南宁"}); - add(new String[]{"广西二建宿舍", "南宁"}); - add(new String[]{"广西一建职工生活区", "南宁"}); - add(new String[]{"广西区丝绸公司宿舍", "南宁"}); - add(new String[]{"广西水电工程局科园基地", "南宁"}); - add(new String[]{"广西电网公司宿舍", "南宁"}); - add(new String[]{"广西六建生活区", "南宁"}); - add(new String[]{"广西重阳老年公寓", "南宁"}); - add(new String[]{"广西农业厅值保总站宿舍", "南宁"}); - add(new String[]{"广西地凯科技公司宿舍", "南宁"}); - add(new String[]{"广西机电设备公司宿舍", "南宁"}); - add(new String[]{"广西丰林林业集团", "南宁"}); - add(new String[]{"广西聚福隆灯饰广场", "南宁"}); - add(new String[]{"广西兴桂大厦", "南宁"}); - add(new String[]{"广西女子劳动教育改造宿舍", "南宁"}); - add(new String[]{"广西出版总社商住楼", "南宁"}); - add(new String[]{"广西第一安装公司生活区", "南宁"}); - add(new String[]{"广西器械厂宿舍", "南宁"}); - add(new String[]{"广西机械进出口公司宿舍", "南宁"}); - add(new String[]{"广西区档案局宿舍", "南宁"}); - add(new String[]{"广西发展大厦东楼", "南宁"}); - add(new String[]{"广西冶建一公司宿舍", "南宁"}); - add(new String[]{"广西外贸大院小区", "深圳"}); - add(new String[]{"广西日报社宿舍", "南宁"}); - add(new String[]{"广西农业机械研究院", "南宁"}); - add(new String[]{"广西招生考试院", "南宁"}); - add(new String[]{"广西兽医大院", "南宁"}); - add(new String[]{"广西华南烹饪专业学校宿舍", "南宁"}); - add(new String[]{"广西南宁南风机器总厂", "南宁"}); - add(new String[]{"广西区审计厅宿舍", "南宁"}); - add(new String[]{"广西卫生厅单位房", "南宁"}); - add(new String[]{"广西发展大厦", "南宁"}); - }}); - city_DistrictNames.put("南宁", new ArrayList(){{ - add(new String[]{"南宁奥园", "南宁"}); - add(new String[]{"南宁海事局宿舍", "南宁"}); - add(new String[]{"南宁市蔬菜研究所宿舍", "南宁"}); - add(new String[]{"南宁市电网公司宿舍", "南宁"}); - add(new String[]{"南宁市金融小区", "南宁"}); - add(new String[]{"南宁地区行政公署衡阳生活区", "南宁"}); - add(new String[]{"南宁供电局白沙生活区", "南宁"}); - add(new String[]{"南宁第四职业中学", "南宁"}); - add(new String[]{"南宁针织厂宿舍", "南宁"}); - add(new String[]{"南宁市橡胶厂宿舍", "南宁"}); - add(new String[]{"南宁监狱局宿舍", "南宁"}); - add(new String[]{"南宁建宁供用电工程宿舍", "南宁"}); - add(new String[]{"南宁荷花味精厂宿舍", "南宁"}); - add(new String[]{"南宁铝厂宿舍", "南宁"}); - add(new String[]{"南宁经济技术合作公司", "南宁"}); - add(new String[]{"南宁制糖造纸厂", "南宁"}); - add(new String[]{"南宁恒大绿洲", "南宁"}); - add(new String[]{"南宁市面粉厂宿舍", "南宁"}); - add(new String[]{"南宁市整治朝阳溪管理处宿舍", "南宁"}); - add(new String[]{"南宁市新环球橱柜广场", "南宁"}); - add(new String[]{"南宁机械厂宿舍(南区)", "南宁"}); - add(new String[]{"南宁市二建公司宿舍", "南宁"}); - add(new String[]{"南宁市聚秀园", "南宁"}); - add(new String[]{"南宁二轻宿舍", "南宁"}); - add(new String[]{"南宁边检站", "南宁"}); - add(new String[]{"南宁电信大楼", "南宁"}); - add(new String[]{"南宁重型机器厂生活区", "南宁"}); - add(new String[]{"南宁供电局祥宾路生活区", "南宁"}); - add(new String[]{"南宁材料厂", "南宁"}); - add(new String[]{"南宁被服厂宿舍", "南宁"}); - add(new String[]{"南宁市自来水公司宿舍", "南宁"}); - add(new String[]{"南宁嘉士摩根国际", "南宁"}); - add(new String[]{"南宁银杉电线电缆小区", "南宁"}); - add(new String[]{"南宁市机电公司宿舍", "南宁"}); - add(new String[]{"南宁市管理局宿舍", "南宁"}); - add(new String[]{"南宁市自来水公司河南水厂宿舍", "南宁"}); - add(new String[]{"南宁小区", "沈阳"}); - add(new String[]{"南宁馨苑", "沈阳"}); - add(new String[]{"南宁小区", "成都"}); - add(new String[]{"南宁市勘测院北湖住宅小区", "南宁"}); - add(new String[]{"南宁市机关车队宿舍", "南宁"}); - add(new String[]{"南宁市供电局", "南宁"}); - add(new String[]{"南宁毛纺厂宿舍", "南宁"}); - add(new String[]{"南宁日报社单位宿舍区", "南宁"}); - add(new String[]{"南宁职业技术学院四分院", "南宁"}); - add(new String[]{"南宁吉玛特", "曲靖"}); - add(new String[]{"南宁小区", "曲靖"}); - }}); - city_DistrictNames.put("广东", new ArrayList(){{ - add(new String[]{"广东外贸广场", "广州"}); - add(new String[]{"广东外语艺术学院教师宿舍", "广州"}); - add(new String[]{"广东建科院宿舍", "广州"}); - add(new String[]{"广东司法警官职业学院宿舍", "广州"}); - add(new String[]{"广东环保大厦", "广州"}); - add(new String[]{"广东商业大厦", "广州"}); - add(new String[]{"广东医学院教师宿舍楼", "东莞"}); - add(new String[]{"广东国际大厦", "广州"}); - add(new String[]{"广东省技术监督局宿舍", "广州"}); - add(new String[]{"广东工业大学宿舍", "广州"}); - add(new String[]{"广东教育学院宿舍", "广州"}); - add(new String[]{"广东省银行大厦", "深圳"}); - add(new String[]{"广东大厦", "天津"}); - add(new String[]{"广东山庄", "镇江"}); - add(new String[]{"广东红盾大厦", "广州"}); - add(new String[]{"广东药学院宿舍", "广州"}); - add(new String[]{"广东青年干部学院宿舍", "广州"}); - add(new String[]{"广东基础楼", "深圳"}); - add(new String[]{"广东省科技干部学院宿舍", "广州"}); - add(new String[]{"广东省农业管理干部学院社区", "广州"}); - add(new String[]{"广东芭蕾雨·逸景", "佛山"}); - }}); - city_DistrictNames.put("梅州", new ArrayList(){{ - add(new String[]{"梅州大厦", "广州"}); - add(new String[]{"梅州大楼", "上海"}); - add(new String[]{"梅州新村", "上海"}); - add(new String[]{"梅州大厦", "深圳"}); - }}); - city_DistrictNames.put("山东", new ArrayList(){{ - add(new String[]{"山东里", "秦皇岛"}); - add(new String[]{"山东经济学院宿舍", "济南"}); - add(new String[]{"山东省卫生厅宿舍", "济南"}); - add(new String[]{"山东省民政厅宿舍", "济南"}); - add(new String[]{"山东省商业集团总公司宿舍", "济南"}); - add(new String[]{"山东医科大学教师宿舍", "济南"}); - add(new String[]{"山东外贸大厦", "青岛"}); - add(new String[]{"山东大厦", "深圳"}); - add(new String[]{"山东堡社区", "沈阳"}); - add(new String[]{"山东艺术学院宿舍", "济南"}); - add(new String[]{"山东黄金崮云湖高尔夫别墅", "济南"}); - add(new String[]{"山东司法警官学院宿舍", "济南"}); - add(new String[]{"山东省科学院高新技术研究分院", "青岛"}); - add(new String[]{"山东建工学院宿舍", "济南"}); - add(new String[]{"山东庙小区", "沈阳"}); - add(new String[]{"山东乳山银滩海景房", "威海"}); - add(new String[]{"山东头村", "青岛"}); - add(new String[]{"山东省畜牧局宿舍", "济南"}); - }}); - city_DistrictNames.put("东营", new ArrayList(){{ - add(new String[]{"东营里5号院", "北京"}); - add(new String[]{"东营里1号院", "北京"}); - add(new String[]{"东营里2号院", "北京"}); - add(new String[]{"东营里3号院", "北京"}); - add(new String[]{"东营里", "北京"}); - add(new String[]{"东营房小区", "北京"}); - add(new String[]{"东营房八条", "北京"}); - }}); - city_DistrictNames.put("四川", new ArrayList(){{ - add(new String[]{"四川省直机关工委宿舍", "成都"}); - add(new String[]{"四川省林业厅宿舍", "成都"}); - add(new String[]{"四川音乐学院宿舍", "成都"}); - add(new String[]{"四川省闽中市驻疆办事处小区", "乌鲁木齐"}); - add(new String[]{"四川大厦", "厦门"}); - add(new String[]{"四川省科技厅宿舍", "成都"}); - add(new String[]{"四川专用汽车厂宿舍", "成都"}); - add(new String[]{"四川日报宿舍", "成都"}); - add(new String[]{"四川艺术职业学院家属楼", "成都"}); - add(new String[]{"四川营胡同", "北京"}); - add(new String[]{"四川小区", "上海"}); - add(new String[]{"四川幼师宿舍", "成都"}); - add(new String[]{"四川大学农林村", "成都"}); - }}); - city_DistrictNames.put("自贡", new ArrayList(){{ - add(new String[]{"自贡市塞纳河畔", "自贡"}); - }}); - city_DistrictNames.put("湖北", new ArrayList(){{ - add(new String[]{"湖北小区", "北京"}); - add(new String[]{"湖北宝丰花园", "深圳"}); - add(new String[]{"湖北经济学院宿舍", "武汉"}); - add(new String[]{"湖北大学宿舍", "武汉"}); - add(new String[]{"湖北日报宿舍", "武汉"}); - add(new String[]{"湖北省文联宿舍", "武汉"}); - add(new String[]{"湖北现代五金电器城", "武汉"}); - add(new String[]{"湖北饭店宿舍", "武汉"}); - add(new String[]{"湖北保险公司家属楼", "武汉"}); - add(new String[]{"湖北林业勘察院小区", "武汉"}); - add(new String[]{"湖北交通职业技术学院宿舍", "武汉"}); - add(new String[]{"湖北省艺术学校宿舍", "武汉"}); - add(new String[]{"湖北大厦", "厦门"}); - add(new String[]{"湖北质量监督局宿舍", "武汉"}); - add(new String[]{"湖北省医药监督管理局宿舍", "武汉"}); - add(new String[]{"湖北教育出版社宿舍", "武汉"}); - add(new String[]{"湖北省药材公司宿舍", "武汉"}); - add(new String[]{"湖北二师宿舍", "武汉"}); - add(new String[]{"湖北中医学院宿舍", "武汉"}); - add(new String[]{"湖北省生活资料公司居民小区", "武汉"}); - add(new String[]{"湖北商务广场", "武汉"}); - add(new String[]{"湖北教育学院宿舍", "武汉"}); - add(new String[]{"湖北省监狱管理局宿舍", "武汉"}); - add(new String[]{"湖北省安全监察局宿舍", "武汉"}); - }}); - city_DistrictNames.put("武汉", new ArrayList(){{ - add(new String[]{"武汉社区", "大连"}); - add(new String[]{"武汉小学单位宿舍", "武汉"}); - add(new String[]{"武汉中学书香苑", "武汉"}); - add(new String[]{"武汉雄楚楼社区", "武汉"}); - add(new String[]{"武汉话剧院宿舍", "武汉"}); - add(new String[]{"武汉楚剧团宿舍", "武汉"}); - add(new String[]{"武汉恒大城", "武汉"}); - add(new String[]{"武汉市委党委宿舍", "武汉"}); - add(new String[]{"武汉铁塔厂宿舍", "武汉"}); - add(new String[]{"武汉大学珞桂教师小区", "武汉"}); - add(new String[]{"武汉市老干部宿舍", "武汉"}); - add(new String[]{"武汉汉剧院宿舍", "武汉"}); - add(new String[]{"武汉汽车锁厂宿舍", "武汉"}); - add(new String[]{"武汉制药厂小区", "武汉"}); - add(new String[]{"武汉第一职教中心公寓", "武汉"}); - add(new String[]{"武汉市第一技术学校宿舍", "武汉"}); - add(new String[]{"武汉广场", "武汉"}); - add(new String[]{"武汉天地御江苑", "武汉"}); - add(new String[]{"武汉四中小区", "武汉"}); - add(new String[]{"武汉大厦", "厦门"}); - add(new String[]{"武汉机床厂宿舍", "武汉"}); - add(new String[]{"武汉长岛", "武汉"}); - add(new String[]{"武汉国信城", "武汉"}); - add(new String[]{"武汉生物研究所宿舍", "武汉"}); - add(new String[]{"武汉万锦江城", "武汉"}); - add(new String[]{"武汉晚报宿舍", "武汉"}); - add(new String[]{"武汉科技学院阳光校区宿舍", "武汉"}); - add(new String[]{"武汉博物馆宿舍", "武汉"}); - add(new String[]{"武汉公安局交警宿舍", "武汉"}); - add(new String[]{"武汉剧院村", "武汉"}); - add(new String[]{"武汉科技学院教师小区", "武汉"}); - add(new String[]{"武汉工程大学教工宿舍", "武汉"}); - add(new String[]{"武汉缝纫机厂宿舍", "武汉"}); - add(new String[]{"武汉交通学校家属区", "武汉"}); - add(new String[]{"武汉二建小区", "武汉"}); - add(new String[]{"武汉天润工业园", "武汉"}); - add(new String[]{"武汉恒丰上河图", "武汉"}); - add(new String[]{"武汉国际大厦", "武汉"}); - add(new String[]{"武汉国际会展中心", "武汉"}); - add(new String[]{"武汉大学宿舍", "武汉"}); - add(new String[]{"武汉科技大学教工宿舍", "武汉"}); - add(new String[]{"武汉纺织大学宿舍", "武汉"}); - add(new String[]{"武汉数码港", "武汉"}); - add(new String[]{"武汉新航城星城街区", "武汉"}); - add(new String[]{"武汉时代广场", "武汉"}); - add(new String[]{"武汉碧桂园别墅", "武汉"}); - }}); - city_DistrictNames.put("浙江", new ArrayList(){{ - add(new String[]{"浙江工业大学教师宿舍", "杭州"}); - add(new String[]{"浙江大厦", "太原"}); - add(new String[]{"浙江办事处宿舍", "太原"}); - add(new String[]{"浙江仁和居老年养生公寓", "湖州"}); - add(new String[]{"浙江交运大厦", "杭州"}); - add(new String[]{"浙江工商大学宿舍", "杭州"}); - add(new String[]{"浙江商贸城", "合肥"}); - add(new String[]{"浙江工业大学之江学院", "杭州"}); - }}); - city_DistrictNames.put("衢州", new ArrayList(){{ - add(new String[]{"衢州花园", "衢州"}); - add(new String[]{"衢州人家", "衢州"}); - add(new String[]{"衢州远景城", "衢州"}); - add(new String[]{"衢州·君悦东方", "衢州"}); - add(new String[]{"衢州广场西苑", "衢州"}); - }}); - city_DistrictNames.put("河北", new ArrayList(){{ - add(new String[]{"河北税务学校生活区", "石家庄"}); - add(new String[]{"河北经济日报社宿舍", "石家庄"}); - add(new String[]{"河北美术出版社宿舍", "石家庄"}); - add(new String[]{"河北物资宿舍", "石家庄"}); - add(new String[]{"河北化工医药职业技术学院宿舍", "石家庄"}); - add(new String[]{"河北电机宿舍", "石家庄"}); - add(new String[]{"河北日报社宿舍", "石家庄"}); - add(new String[]{"河北工程造价管理总站宿舍", "石家庄"}); - add(new String[]{"河北康城", "潍坊"}); - add(new String[]{"河北社区", "沈阳"}); - add(new String[]{"河北医科大学宿舍", "石家庄"}); - add(new String[]{"河北省人大宿舍", "石家庄"}); - add(new String[]{"河北新人家", "唐山"}); - add(new String[]{"河北一号", "唐山"}); - add(new String[]{"河北机要局宿舍", "石家庄"}); - add(new String[]{"河北广播电视报宿舍", "石家庄"}); - add(new String[]{"河北商城", "青岛"}); - add(new String[]{"河北长城饭店", "石家庄"}); - add(new String[]{"河北村小区", "北京"}); - add(new String[]{"河北桃江里", "天津"}); - add(new String[]{"河北师大青年公寓楼", "石家庄"}); - add(new String[]{"河北绛", "无锡"}); - add(new String[]{"河北社区", "本溪"}); - add(new String[]{"河北楼", "唐山"}); - }}); - city_DistrictNames.put("石家庄", new ArrayList(){{ - add(new String[]{"石家庄大学宿舍", "石家庄"}); - add(new String[]{"石家庄经济学院宿舍", "石家庄"}); - add(new String[]{"石家庄日报社宿舍", "石家庄"}); - add(new String[]{"石家庄饮食公司宿舍", "石家庄"}); - add(new String[]{"石家庄炼油厂二区", "石家庄"}); - add(new String[]{"石家庄学院宿舍", "石家庄"}); - }}); - city_DistrictNames.put("江西", new ArrayList(){{ - add(new String[]{"江西省建工集团", "南昌"}); - add(new String[]{"江西财经大学邮政宿舍", "南昌"}); - add(new String[]{"江西省图书馆宿舍", "南昌"}); - add(new String[]{"江西宾馆旁边", "南昌"}); - add(new String[]{"江西行政学院宿舍", "南昌"}); - add(new String[]{"江西财经大学宿舍", "南昌"}); - add(new String[]{"江西科技师范学院宿舍", "南昌"}); - add(new String[]{"江西省广播电台宿舍", "南昌"}); - add(new String[]{"江西东华计量研究所宿舍", "南昌"}); - add(new String[]{"江西客车厂宿舍", "南昌"}); - add(new String[]{"江西仪器厂宿舍", "南昌"}); - add(new String[]{"江西昌东汽车交易广场", "南昌"}); - add(new String[]{"江西旧货大世界", "南昌"}); - add(new String[]{"江西日报宿舍", "南昌"}); - }}); - city_DistrictNames.put("九江", new ArrayList(){{ - add(new String[]{"九江里", "天津"}); - add(new String[]{"九江小区", "丹东"}); - add(new String[]{"九江丽都", "丹东"}); - add(new String[]{"九江公寓", "丹东"}); - }}); - city_DistrictNames.put("广东", new ArrayList(){{ - add(new String[]{"广东外贸广场", "广州"}); - add(new String[]{"广东外语艺术学院教师宿舍", "广州"}); - add(new String[]{"广东建科院宿舍", "广州"}); - add(new String[]{"广东司法警官职业学院宿舍", "广州"}); - add(new String[]{"广东环保大厦", "广州"}); - add(new String[]{"广东商业大厦", "广州"}); - add(new String[]{"广东医学院教师宿舍楼", "东莞"}); - add(new String[]{"广东国际大厦", "广州"}); - add(new String[]{"广东省技术监督局宿舍", "广州"}); - add(new String[]{"广东工业大学宿舍", "广州"}); - add(new String[]{"广东教育学院宿舍", "广州"}); - add(new String[]{"广东省银行大厦", "深圳"}); - add(new String[]{"广东大厦", "天津"}); - add(new String[]{"广东山庄", "镇江"}); - add(new String[]{"广东红盾大厦", "广州"}); - add(new String[]{"广东药学院宿舍", "广州"}); - add(new String[]{"广东青年干部学院宿舍", "广州"}); - add(new String[]{"广东基础楼", "深圳"}); - add(new String[]{"广东省科技干部学院宿舍", "广州"}); - add(new String[]{"广东省农业管理干部学院社区", "广州"}); - add(new String[]{"广东芭蕾雨·逸景", "佛山"}); - }}); - city_DistrictNames.put("揭阳", new ArrayList(){{ - add(new String[]{"揭阳岭南明珠二期", "揭阳"}); - }}); - city_DistrictNames.put("北京", new ArrayList(){{ - add(new String[]{"北京GOLF公寓", "北京"}); - add(new String[]{"北京汇", "北京"}); - add(new String[]{"北京花园", "北京"}); - add(new String[]{"北京VISA", "北京"}); - add(new String[]{"北京科技大学家属楼", "北京"}); - add(new String[]{"北京ONE", "北京"}); - add(new String[]{"北京奥林匹克花园", "北京"}); - add(new String[]{"北京高尔夫公寓", "北京"}); - add(new String[]{"北京上舍", "北京"}); - add(new String[]{"北京湾", "北京"}); - add(new String[]{"北京华侨城", "北京"}); - add(new String[]{"北京青年城", "北京"}); - add(new String[]{"北京人家", "北京"}); - add(new String[]{"北京印象", "北京"}); - add(new String[]{"北京玫瑰园", "北京"}); - add(new String[]{"北京随园公寓", "北京"}); - add(new String[]{"北京尊府", "北京"}); - add(new String[]{"北京太阳城", "北京"}); - add(new String[]{"北京大厦", "海口"}); - add(new String[]{"北京第九区", "廊坊"}); - add(new String[]{"北京公园", "大连"}); - add(new String[]{"北京太阳城三期", "北京"}); - add(new String[]{"北京半岛", "北京"}); - add(new String[]{"北京好漾", "北京"}); - add(new String[]{"北京北", "北京"}); - add(new String[]{"北京公馆", "北京"}); - add(new String[]{"北京乡村高尔夫别墅", "北京"}); - add(new String[]{"北京农学院家属院", "北京"}); - add(new String[]{"北京广播学院家属院", "北京"}); - add(new String[]{"北京工商大学职工宿舍", "北京"}); - add(new String[]{"北京外国语大学家属院", "北京"}); - add(new String[]{"北京石油大院家属楼", "北京"}); - add(new String[]{"北京舞蹈学院小区", "北京"}); - add(new String[]{"北京城建熙城", "重庆"}); - add(new String[]{"北京公馆", "保定"}); - add(new String[]{"北京花园", "宜昌"}); - add(new String[]{"北京城花园小区", "乌鲁木齐"}); - add(new String[]{"北京城", "乌鲁木齐"}); - add(new String[]{"北京金山", "福州"}); - add(new String[]{"北京国际花园温泉别墅", "北京"}); - add(new String[]{"北京北辰高级花园别墅", "北京"}); - add(new String[]{"北京温溪山庄", "北京"}); - add(new String[]{"北京气象局宿舍", "北京"}); - add(new String[]{"北京城建·筑华年", "北京"}); - add(new String[]{"北京银泰中心", "北京"}); - add(new String[]{"北京龙脉温泉花园", "北京"}); - add(new String[]{"北京绿都源中心", "北京"}); - add(new String[]{"北京颐泉汇", "北京"}); - add(new String[]{"北京联合大学广告学院老师宿舍楼", "北京"}); - add(new String[]{"北京长毛绒厂宿舍", "北京"}); - add(new String[]{"北京嘉里中心", "北京"}); - add(new String[]{"北京辉盛阁国际公寓", "北京"}); - add(new String[]{"北京理想城", "保定"}); - add(new String[]{"北京国际航空俱乐部别墅", "北京"}); - add(new String[]{"北京香颂", "北京"}); - add(new String[]{"北京国际中心", "北京"}); - add(new String[]{"北京太阳城二期金色池塘", "北京"}); - add(new String[]{"北京南站车站路小区", "北京"}); - add(new String[]{"北京机械工业学院宿舍", "北京"}); - add(new String[]{"北京科技会展中心公寓", "北京"}); - add(new String[]{"北京太阳城别墅", "北京"}); - add(new String[]{"北京城建龙樾湾", "成都"}); - add(new String[]{"北京公馆", "唐山"}); - add(new String[]{"北京壹号公馆", "南通"}); - add(new String[]{"北京洋房", "北京"}); - add(new String[]{"北京城建·世华泊郡", "北京"}); - add(new String[]{"北京国立福利老年公寓", "北京"}); - add(new String[]{"北京四季世家", "北京"}); - add(new String[]{"北京耀辉国际城", "北京"}); - add(new String[]{"北京INN", "北京"}); - add(new String[]{"北京苏活", "北京"}); - add(new String[]{"北京城建·红木林", "北京"}); - add(new String[]{"北京城建·N次方", "北京"}); - add(new String[]{"北京新天地", "北京"}); - add(new String[]{"北京华贸城", "北京"}); - add(new String[]{"北京夏都湾", "北京"}); - add(new String[]{"北京风景", "北京"}); - add(new String[]{"北京第九区", "北京"}); - add(new String[]{"北京新邨", "上海"}); - add(new String[]{"北京大厦", "广州"}); - add(new String[]{"北京青果", "北京"}); - add(new String[]{"北京方糖", "北京"}); - add(new String[]{"北京自在城", "北京"}); - add(new String[]{"北京城建龙樾湾", "重庆"}); - }}); - city_DistrictNames.put("广东", new ArrayList(){{ - add(new String[]{"广东外贸广场", "广州"}); - add(new String[]{"广东外语艺术学院教师宿舍", "广州"}); - add(new String[]{"广东建科院宿舍", "广州"}); - add(new String[]{"广东司法警官职业学院宿舍", "广州"}); - add(new String[]{"广东环保大厦", "广州"}); - add(new String[]{"广东商业大厦", "广州"}); - add(new String[]{"广东医学院教师宿舍楼", "东莞"}); - add(new String[]{"广东国际大厦", "广州"}); - add(new String[]{"广东省技术监督局宿舍", "广州"}); - add(new String[]{"广东工业大学宿舍", "广州"}); - add(new String[]{"广东教育学院宿舍", "广州"}); - add(new String[]{"广东省银行大厦", "深圳"}); - add(new String[]{"广东大厦", "天津"}); - add(new String[]{"广东山庄", "镇江"}); - add(new String[]{"广东红盾大厦", "广州"}); - add(new String[]{"广东药学院宿舍", "广州"}); - add(new String[]{"广东青年干部学院宿舍", "广州"}); - add(new String[]{"广东基础楼", "深圳"}); - add(new String[]{"广东省科技干部学院宿舍", "广州"}); - add(new String[]{"广东省农业管理干部学院社区", "广州"}); - add(new String[]{"广东芭蕾雨·逸景", "佛山"}); - }}); - city_DistrictNames.put("江门", new ArrayList(){{ - add(new String[]{"江门奥园", "江门"}); - add(new String[]{"江门都市豪庭", "江门"}); - add(new String[]{"江门嘉悦名都", "江门"}); - add(new String[]{"江门里", "天津"}); - }}); - city_DistrictNames.put("云南", new ArrayList(){{ - add(new String[]{"云南大厦", "广州"}); - add(new String[]{"云南省杂技团家属院", "昆明"}); - add(new String[]{"云南华侨城", "昆明"}); - add(new String[]{"云南艺术家园区", "昆明"}); - add(new String[]{"云南农业大学教工住宅区", "昆明"}); - add(new String[]{"云南财经大学住宅", "昆明"}); - add(new String[]{"云南大学龙泉路小区", "昆明"}); - add(new String[]{"云南工业职业技术学院", "昆明"}); - add(new String[]{"云南印象城", "昆明"}); - add(new String[]{"云南映象", "昆明"}); - add(new String[]{"云南省畜牧局宿舍", "昆明"}); - add(new String[]{"云南省建筑材料学研究设计院", "昆明"}); - add(new String[]{"云南测绘工程院", "昆明"}); - add(new String[]{"云南省第一轻工机械厂", "昆明"}); - add(new String[]{"云南日报社单位房", "昆明"}); - add(new String[]{"云南白药厂单位福利房", "昆明"}); - add(new String[]{"云南大学东二院", "昆明"}); - add(new String[]{"云南省委党校生活区", "昆明"}); - add(new String[]{"云南印象城别墅", "昆明"}); - add(new String[]{"云南白药福利房", "昆明"}); - }}); - city_DistrictNames.put("大理白族自治州", new ArrayList(){{ - }}); - city_DistrictNames.put("大理", new ArrayList(){{ - add(new String[]{"大理小区", "贵阳"}); - add(new String[]{"大理小区17组团", "贵阳"}); - add(new String[]{"大理感通别墅", "昆明"}); - add(new String[]{"大理观音塘白族民居", "大理"}); - add(new String[]{"大理州环科院宿舍", "大理"}); - add(new String[]{"大理古城绿玉小区", "大理"}); - add(new String[]{"大理公馆", "大理"}); - add(new String[]{"大理春天广场", "昆明"}); - add(new String[]{"大理金港", "昆明"}); - add(new String[]{"大理学府商家", "昆明"}); - add(new String[]{"大理红龙井", "昆明"}); - add(new String[]{"大理南国城", "昆明"}); - add(new String[]{"大理洱海国际生态城", "大理"}); - }}); - city_DistrictNames.put("云南", new ArrayList(){{ - add(new String[]{"云南大厦", "广州"}); - add(new String[]{"云南省杂技团家属院", "昆明"}); - add(new String[]{"云南华侨城", "昆明"}); - add(new String[]{"云南艺术家园区", "昆明"}); - add(new String[]{"云南农业大学教工住宅区", "昆明"}); - add(new String[]{"云南财经大学住宅", "昆明"}); - add(new String[]{"云南大学龙泉路小区", "昆明"}); - add(new String[]{"云南工业职业技术学院", "昆明"}); - add(new String[]{"云南印象城", "昆明"}); - add(new String[]{"云南映象", "昆明"}); - add(new String[]{"云南省畜牧局宿舍", "昆明"}); - add(new String[]{"云南省建筑材料学研究设计院", "昆明"}); - add(new String[]{"云南测绘工程院", "昆明"}); - add(new String[]{"云南省第一轻工机械厂", "昆明"}); - add(new String[]{"云南日报社单位房", "昆明"}); - add(new String[]{"云南白药厂单位福利房", "昆明"}); - add(new String[]{"云南大学东二院", "昆明"}); - add(new String[]{"云南省委党校生活区", "昆明"}); - add(new String[]{"云南印象城别墅", "昆明"}); - add(new String[]{"云南白药福利房", "昆明"}); - }}); - city_DistrictNames.put("昆明", new ArrayList(){{ - add(new String[]{"昆明花园项目", "西安"}); - add(new String[]{"昆明社区", "大连"}); - add(new String[]{"昆明湖花园别墅", "北京"}); - add(new String[]{"昆明公寓", "天津"}); - add(new String[]{"昆明雅居", "沈阳"}); - add(new String[]{"昆明花园", "大连"}); - add(new String[]{"昆明大厦春苑", "西安"}); - add(new String[]{"昆明天湖岛温泉旅游渡假村酒店", "昆明"}); - add(new String[]{"昆明化油器厂", "昆明"}); - add(new String[]{"昆明卷烟厂田坝区", "昆明"}); - add(new String[]{"昆明医学院职工楼", "昆明"}); - add(new String[]{"昆明大学西二院", "昆明"}); - add(new String[]{"昆明人家", "昆明"}); - add(new String[]{"昆明傲城", "昆明"}); - add(new String[]{"昆明小区", "上海"}); - add(new String[]{"昆明公寓", "上海"}); - add(new String[]{"昆明玉器城翡翠花园", "昆明"}); - add(new String[]{"昆明机床厂", "昆明"}); - add(new String[]{"昆明档案局", "昆明"}); - add(new String[]{"昆明水泥厂", "昆明"}); - add(new String[]{"昆明日报社单位福利房", "昆明"}); - add(new String[]{"昆明灯具总厂", "昆明"}); - add(new String[]{"昆明机床厂宿舍", "昆明"}); - }}); - city_DistrictNames.put("广东", new ArrayList(){{ - add(new String[]{"广东外贸广场", "广州"}); - add(new String[]{"广东外语艺术学院教师宿舍", "广州"}); - add(new String[]{"广东建科院宿舍", "广州"}); - add(new String[]{"广东司法警官职业学院宿舍", "广州"}); - add(new String[]{"广东环保大厦", "广州"}); - add(new String[]{"广东商业大厦", "广州"}); - add(new String[]{"广东医学院教师宿舍楼", "东莞"}); - add(new String[]{"广东国际大厦", "广州"}); - add(new String[]{"广东省技术监督局宿舍", "广州"}); - add(new String[]{"广东工业大学宿舍", "广州"}); - add(new String[]{"广东教育学院宿舍", "广州"}); - add(new String[]{"广东省银行大厦", "深圳"}); - add(new String[]{"广东大厦", "天津"}); - add(new String[]{"广东山庄", "镇江"}); - add(new String[]{"广东红盾大厦", "广州"}); - add(new String[]{"广东药学院宿舍", "广州"}); - add(new String[]{"广东青年干部学院宿舍", "广州"}); - add(new String[]{"广东基础楼", "深圳"}); - add(new String[]{"广东省科技干部学院宿舍", "广州"}); - add(new String[]{"广东省农业管理干部学院社区", "广州"}); - add(new String[]{"广东芭蕾雨·逸景", "佛山"}); - }}); - city_DistrictNames.put("云浮", new ArrayList(){{ - add(new String[]{"云浮碧桂园", "肇庆"}); - add(new String[]{"云浮恒大城", "云浮"}); - }}); - city_DistrictNames.put("浙江", new ArrayList(){{ - add(new String[]{"浙江工业大学教师宿舍", "杭州"}); - add(new String[]{"浙江大厦", "太原"}); - add(new String[]{"浙江办事处宿舍", "太原"}); - add(new String[]{"浙江仁和居老年养生公寓", "湖州"}); - add(new String[]{"浙江交运大厦", "杭州"}); - add(new String[]{"浙江工商大学宿舍", "杭州"}); - add(new String[]{"浙江商贸城", "合肥"}); - add(new String[]{"浙江工业大学之江学院", "杭州"}); - }}); - city_DistrictNames.put("宁波", new ArrayList(){{ - add(new String[]{"宁波里", "天津"}); - add(new String[]{"宁波里", "武汉"}); - add(new String[]{"宁波商会大厦", "宁波"}); - add(new String[]{"宁波外代大厦", "宁波"}); - add(new String[]{"宁波小区", "上海"}); - }}); - city_DistrictNames.put("余姚", new ArrayList(){{ - add(new String[]{"余姚泰和家园", "宁波"}); - add(new String[]{"余姚小区", "上海"}); - add(new String[]{"余姚泰和家园", "余姚"}); - }}); - city_DistrictNames.put("广东", new ArrayList(){{ - add(new String[]{"广东外贸广场", "广州"}); - add(new String[]{"广东外语艺术学院教师宿舍", "广州"}); - add(new String[]{"广东建科院宿舍", "广州"}); - add(new String[]{"广东司法警官职业学院宿舍", "广州"}); - add(new String[]{"广东环保大厦", "广州"}); - add(new String[]{"广东商业大厦", "广州"}); - add(new String[]{"广东医学院教师宿舍楼", "东莞"}); - add(new String[]{"广东国际大厦", "广州"}); - add(new String[]{"广东省技术监督局宿舍", "广州"}); - add(new String[]{"广东工业大学宿舍", "广州"}); - add(new String[]{"广东教育学院宿舍", "广州"}); - add(new String[]{"广东省银行大厦", "深圳"}); - add(new String[]{"广东大厦", "天津"}); - add(new String[]{"广东山庄", "镇江"}); - add(new String[]{"广东红盾大厦", "广州"}); - add(new String[]{"广东药学院宿舍", "广州"}); - add(new String[]{"广东青年干部学院宿舍", "广州"}); - add(new String[]{"广东基础楼", "深圳"}); - add(new String[]{"广东省科技干部学院宿舍", "广州"}); - add(new String[]{"广东省农业管理干部学院社区", "广州"}); - add(new String[]{"广东芭蕾雨·逸景", "佛山"}); - }}); - city_DistrictNames.put("深圳", new ArrayList(){{ - add(new String[]{"深圳湾畔花园", "深圳"}); - add(new String[]{"深圳花园", "吉林"}); - add(new String[]{"深圳花园", "合肥"}); - add(new String[]{"深圳湾花园", "深圳"}); - add(new String[]{"深圳湾1号", "深圳"}); - add(new String[]{"深圳高尔夫别墅", "深圳"}); - add(new String[]{"深圳工业园", "襄阳"}); - add(new String[]{"深圳印象", "西宁"}); - add(new String[]{"深圳君临天下", "深圳"}); - add(new String[]{"深圳房地产大厦", "深圳"}); - add(new String[]{"深圳电子技术学校住宅", "深圳"}); - add(new String[]{"深圳发展银行宿舍", "深圳"}); - add(new String[]{"深圳来福士广场", "深圳"}); - add(new String[]{"深圳城市春天项目", "深圳"}); - }}); - city_DistrictNames.put("广东", new ArrayList(){{ - add(new String[]{"广东外贸广场", "广州"}); - add(new String[]{"广东外语艺术学院教师宿舍", "广州"}); - add(new String[]{"广东建科院宿舍", "广州"}); - add(new String[]{"广东司法警官职业学院宿舍", "广州"}); - add(new String[]{"广东环保大厦", "广州"}); - add(new String[]{"广东商业大厦", "广州"}); - add(new String[]{"广东医学院教师宿舍楼", "东莞"}); - add(new String[]{"广东国际大厦", "广州"}); - add(new String[]{"广东省技术监督局宿舍", "广州"}); - add(new String[]{"广东工业大学宿舍", "广州"}); - add(new String[]{"广东教育学院宿舍", "广州"}); - add(new String[]{"广东省银行大厦", "深圳"}); - add(new String[]{"广东大厦", "天津"}); - add(new String[]{"广东山庄", "镇江"}); - add(new String[]{"广东红盾大厦", "广州"}); - add(new String[]{"广东药学院宿舍", "广州"}); - add(new String[]{"广东青年干部学院宿舍", "广州"}); - add(new String[]{"广东基础楼", "深圳"}); - add(new String[]{"广东省科技干部学院宿舍", "广州"}); - add(new String[]{"广东省农业管理干部学院社区", "广州"}); - add(new String[]{"广东芭蕾雨·逸景", "佛山"}); - }}); - city_DistrictNames.put("惠州", new ArrayList(){{ - add(new String[]{"惠州星河丹堤", "惠州"}); - add(new String[]{"惠州里", "天津"}); - add(new String[]{"惠州海伦堡", "惠州"}); - add(new String[]{"惠州星河丹堤别墅", "惠州"}); - add(new String[]{"惠州凯悦华庭", "惠州"}); - add(new String[]{"惠州星河丹堤别墅", "深圳"}); - add(new String[]{"惠州蓝湾半岛", "惠州"}); - }}); - city_DistrictNames.put("河北", new ArrayList(){{ - add(new String[]{"河北税务学校生活区", "石家庄"}); - add(new String[]{"河北经济日报社宿舍", "石家庄"}); - add(new String[]{"河北美术出版社宿舍", "石家庄"}); - add(new String[]{"河北物资宿舍", "石家庄"}); - add(new String[]{"河北化工医药职业技术学院宿舍", "石家庄"}); - add(new String[]{"河北电机宿舍", "石家庄"}); - add(new String[]{"河北日报社宿舍", "石家庄"}); - add(new String[]{"河北工程造价管理总站宿舍", "石家庄"}); - add(new String[]{"河北康城", "潍坊"}); - add(new String[]{"河北社区", "沈阳"}); - add(new String[]{"河北医科大学宿舍", "石家庄"}); - add(new String[]{"河北省人大宿舍", "石家庄"}); - add(new String[]{"河北新人家", "唐山"}); - add(new String[]{"河北一号", "唐山"}); - add(new String[]{"河北机要局宿舍", "石家庄"}); - add(new String[]{"河北广播电视报宿舍", "石家庄"}); - add(new String[]{"河北商城", "青岛"}); - add(new String[]{"河北长城饭店", "石家庄"}); - add(new String[]{"河北村小区", "北京"}); - add(new String[]{"河北桃江里", "天津"}); - add(new String[]{"河北师大青年公寓楼", "石家庄"}); - add(new String[]{"河北绛", "无锡"}); - add(new String[]{"河北社区", "本溪"}); - add(new String[]{"河北楼", "唐山"}); - }}); - city_DistrictNames.put("保定", new ArrayList(){{ - add(new String[]{"保定里", "天津"}); - add(new String[]{"保定新村", "福州"}); - add(new String[]{"保定小区", "福州"}); - }}); - city_DistrictNames.put("云南", new ArrayList(){{ - add(new String[]{"云南大厦", "广州"}); - add(new String[]{"云南省杂技团家属院", "昆明"}); - add(new String[]{"云南华侨城", "昆明"}); - add(new String[]{"云南艺术家园区", "昆明"}); - add(new String[]{"云南农业大学教工住宅区", "昆明"}); - add(new String[]{"云南财经大学住宅", "昆明"}); - add(new String[]{"云南大学龙泉路小区", "昆明"}); - add(new String[]{"云南工业职业技术学院", "昆明"}); - add(new String[]{"云南印象城", "昆明"}); - add(new String[]{"云南映象", "昆明"}); - add(new String[]{"云南省畜牧局宿舍", "昆明"}); - add(new String[]{"云南省建筑材料学研究设计院", "昆明"}); - add(new String[]{"云南测绘工程院", "昆明"}); - add(new String[]{"云南省第一轻工机械厂", "昆明"}); - add(new String[]{"云南日报社单位房", "昆明"}); - add(new String[]{"云南白药厂单位福利房", "昆明"}); - add(new String[]{"云南大学东二院", "昆明"}); - add(new String[]{"云南省委党校生活区", "昆明"}); - add(new String[]{"云南印象城别墅", "昆明"}); - add(new String[]{"云南白药福利房", "昆明"}); - }}); - city_DistrictNames.put("曲靖", new ArrayList(){{ - add(new String[]{"曲靖供电局一生活区", "曲靖"}); - add(new String[]{"曲靖圣庭花园", "曲靖"}); - add(new String[]{"曲靖工行康桥生活区", "曲靖"}); - add(new String[]{"曲靖都市印象", "曲靖"}); - add(new String[]{"曲靖市水务小区", "曲靖"}); - }}); - city_DistrictNames.put("河南", new ArrayList(){{ - add(new String[]{"河南庄小区", "青岛"}); - add(new String[]{"河南财专家属院", "郑州"}); - add(new String[]{"河南省新华书店家属院", "郑州"}); - add(new String[]{"河南省商业科学研究所家属院", "郑州"}); - add(new String[]{"河南省日报社家属院", "郑州"}); - add(new String[]{"河南女子高中家属院", "郑州"}); - add(new String[]{"河南外贸大院", "深圳"}); - add(new String[]{"河南里", "天津"}); - add(new String[]{"河南新村", "福州"}); - add(new String[]{"河南财经学院家属院", "郑州"}); - add(new String[]{"河南岸公园小区", "惠州"}); - add(new String[]{"河南岸新村", "惠州"}); - add(new String[]{"河南村", "北京"}); - add(new String[]{"河南理工学校家属院", "郑州"}); - add(new String[]{"河南省人事厅家属院", "郑州"}); - add(new String[]{"河南岸中心小区", "惠州"}); - add(new String[]{"河南省外贸学校家属院", "郑州"}); - add(new String[]{"河南村", "上海"}); - add(new String[]{"河南新村", "上海"}); - add(new String[]{"河南工业大学家属院", "郑州"}); - }}); - city_DistrictNames.put("安阳", new ArrayList(){{ - add(new String[]{"安阳花苑", "常州"}); - add(new String[]{"安阳里", "天津"}); - add(new String[]{"安阳小区", "大连"}); - add(new String[]{"安阳小区", "上海"}); - }}); - city_DistrictNames.put("广东", new ArrayList(){{ - add(new String[]{"广东外贸广场", "广州"}); - add(new String[]{"广东外语艺术学院教师宿舍", "广州"}); - add(new String[]{"广东建科院宿舍", "广州"}); - add(new String[]{"广东司法警官职业学院宿舍", "广州"}); - add(new String[]{"广东环保大厦", "广州"}); - add(new String[]{"广东商业大厦", "广州"}); - add(new String[]{"广东医学院教师宿舍楼", "东莞"}); - add(new String[]{"广东国际大厦", "广州"}); - add(new String[]{"广东省技术监督局宿舍", "广州"}); - add(new String[]{"广东工业大学宿舍", "广州"}); - add(new String[]{"广东教育学院宿舍", "广州"}); - add(new String[]{"广东省银行大厦", "深圳"}); - add(new String[]{"广东大厦", "天津"}); - add(new String[]{"广东山庄", "镇江"}); - add(new String[]{"广东红盾大厦", "广州"}); - add(new String[]{"广东药学院宿舍", "广州"}); - add(new String[]{"广东青年干部学院宿舍", "广州"}); - add(new String[]{"广东基础楼", "深圳"}); - add(new String[]{"广东省科技干部学院宿舍", "广州"}); - add(new String[]{"广东省农业管理干部学院社区", "广州"}); - add(new String[]{"广东芭蕾雨·逸景", "佛山"}); - }}); - city_DistrictNames.put("佛山", new ArrayList(){{ - add(new String[]{"佛山奥园凯茵苑", "佛山"}); - add(new String[]{"佛山奥园灏景峰", "佛山"}); - add(new String[]{"佛山雅居乐", "佛山"}); - add(new String[]{"佛山雅居乐花园", "佛山"}); - add(new String[]{"佛山奥园凯旋湾", "佛山"}); - add(new String[]{"佛山里", "天津"}); - add(new String[]{"佛山苑", "济南"}); - add(new String[]{"佛山奥园", "佛山"}); - add(new String[]{"佛山力迅上筑", "佛山"}); - add(new String[]{"佛山大学教师住宅", "佛山"}); - add(new String[]{"佛山奥园威尼水岸", "佛山"}); - add(new String[]{"佛山奥园美林水岸", "佛山"}); - add(new String[]{"佛山奥园贝沙轩", "佛山"}); - add(new String[]{"佛山奥园美林水岸", "顺德"}); - add(new String[]{"佛山奥园灏景峰", "顺德"}); - add(new String[]{"佛山奥园", "顺德"}); - add(new String[]{"佛山奥园凯茵苑", "顺德"}); - add(new String[]{"佛山奥园贝沙轩", "顺德"}); - add(new String[]{"佛山万科广场", "佛山"}); - add(new String[]{"佛山万科城", "佛山"}); - add(new String[]{"佛山雅居乐花园别墅", "佛山"}); - }}); - city_DistrictNames.put("四川", new ArrayList(){{ - add(new String[]{"四川省直机关工委宿舍", "成都"}); - add(new String[]{"四川省林业厅宿舍", "成都"}); - add(new String[]{"四川音乐学院宿舍", "成都"}); - add(new String[]{"四川省闽中市驻疆办事处小区", "乌鲁木齐"}); - add(new String[]{"四川大厦", "厦门"}); - add(new String[]{"四川省科技厅宿舍", "成都"}); - add(new String[]{"四川专用汽车厂宿舍", "成都"}); - add(new String[]{"四川日报宿舍", "成都"}); - add(new String[]{"四川艺术职业学院家属楼", "成都"}); - add(new String[]{"四川营胡同", "北京"}); - add(new String[]{"四川小区", "上海"}); - add(new String[]{"四川幼师宿舍", "成都"}); - add(new String[]{"四川大学农林村", "成都"}); - }}); - city_DistrictNames.put("绵阳", new ArrayList(){{ - add(new String[]{"绵阳电力小区", "绵阳"}); - add(new String[]{"绵阳电力小区", "绵阳"}); - }}); - city_DistrictNames.put("广东", new ArrayList(){{ - add(new String[]{"广东外贸广场", "广州"}); - add(new String[]{"广东外语艺术学院教师宿舍", "广州"}); - add(new String[]{"广东建科院宿舍", "广州"}); - add(new String[]{"广东司法警官职业学院宿舍", "广州"}); - add(new String[]{"广东环保大厦", "广州"}); - add(new String[]{"广东商业大厦", "广州"}); - add(new String[]{"广东医学院教师宿舍楼", "东莞"}); - add(new String[]{"广东国际大厦", "广州"}); - add(new String[]{"广东省技术监督局宿舍", "广州"}); - add(new String[]{"广东工业大学宿舍", "广州"}); - add(new String[]{"广东教育学院宿舍", "广州"}); - add(new String[]{"广东省银行大厦", "深圳"}); - add(new String[]{"广东大厦", "天津"}); - add(new String[]{"广东山庄", "镇江"}); - add(new String[]{"广东红盾大厦", "广州"}); - add(new String[]{"广东药学院宿舍", "广州"}); - add(new String[]{"广东青年干部学院宿舍", "广州"}); - add(new String[]{"广东基础楼", "深圳"}); - add(new String[]{"广东省科技干部学院宿舍", "广州"}); - add(new String[]{"广东省农业管理干部学院社区", "广州"}); - add(new String[]{"广东芭蕾雨·逸景", "佛山"}); - }}); - city_DistrictNames.put("潮州", new ArrayList(){{ - add(new String[]{"潮州恒大城", "潮州"}); - }}); - city_DistrictNames.put("浙江", new ArrayList(){{ - add(new String[]{"浙江工业大学教师宿舍", "杭州"}); - add(new String[]{"浙江大厦", "太原"}); - add(new String[]{"浙江办事处宿舍", "太原"}); - add(new String[]{"浙江仁和居老年养生公寓", "湖州"}); - add(new String[]{"浙江交运大厦", "杭州"}); - add(new String[]{"浙江工商大学宿舍", "杭州"}); - add(new String[]{"浙江商贸城", "合肥"}); - add(new String[]{"浙江工业大学之江学院", "杭州"}); - }}); - city_DistrictNames.put("嘉兴", new ArrayList(){{ - add(new String[]{"嘉兴小区", "海口"}); - add(new String[]{"嘉兴花园", "嘉兴"}); - add(new String[]{"嘉兴-青年新城", "保定"}); - add(new String[]{"嘉兴花园", "太原"}); - add(new String[]{"嘉兴国际中港城购物中心公寓", "嘉兴"}); - add(new String[]{"嘉兴花园", "威海"}); - add(new String[]{"嘉兴花园", "东莞"}); - add(new String[]{"嘉兴小区", "佛山"}); - add(new String[]{"嘉兴楼", "东莞"}); - add(new String[]{"嘉兴苑", "太原"}); - add(new String[]{"嘉兴总部商务花园", "嘉兴"}); - add(new String[]{"嘉兴苑", "深圳"}); - add(new String[]{"嘉兴社区", "沈阳"}); - add(new String[]{"嘉兴青年新城", "保定"}); - add(new String[]{"嘉兴逸园", "绵阳"}); - add(new String[]{"嘉兴青年新城", "保定"}); - add(new String[]{"嘉兴小区", "福州"}); - add(new String[]{"嘉兴园", "厦门"}); - add(new String[]{"嘉兴苑", "合肥"}); - add(new String[]{"嘉兴园", "西安"}); - add(new String[]{"嘉兴苑别墅区", "太原"}); - add(new String[]{"嘉兴国际", "沈阳"}); - add(new String[]{"嘉兴东苑", "杭州"}); - add(new String[]{"嘉兴花园", "重庆"}); - add(new String[]{"嘉兴园", "武汉"}); - add(new String[]{"嘉兴东方巴黎城", "嘉兴"}); - add(new String[]{"嘉兴东方巴黎城别墅", "嘉兴"}); - add(new String[]{"嘉兴中安市场", "嘉兴"}); - add(new String[]{"嘉兴南湖投资养老房", "嘉兴"}); - add(new String[]{"嘉兴苑", "昆山"}); - add(new String[]{"嘉兴国际电气城", "上海"}); - add(new String[]{"嘉兴国际中港城购物中心公寓", "上海"}); - add(new String[]{"嘉兴南湖投资养老房", "上海"}); - add(new String[]{"嘉兴东方巴黎城", "上海"}); - add(new String[]{"嘉兴国际大厦", "沈阳"}); - add(new String[]{"嘉兴商城", "嘉兴"}); - }}); - city_DistrictNames.put("湖南", new ArrayList(){{ - add(new String[]{"湖南大厦", "海口"}); - add(new String[]{"湖南师大张公岭校区宿舍", "长沙"}); - add(new String[]{"湖南省进出口公司宿舍", "长沙"}); - add(new String[]{"湖南广电宿舍", "长沙"}); - add(new String[]{"湖南机床厂宿舍", "长沙"}); - add(new String[]{"湖南制药厂宿舍", "长沙"}); - add(new String[]{"湖南供销大厦", "长沙"}); - add(new String[]{"湖南化工医药设计院宿舍", "长沙"}); - add(new String[]{"湖南工商银行宿舍机关大院", "长沙"}); - add(new String[]{"湖南省国防科公办机关院内宿舍", "长沙"}); - add(new String[]{"湖南报业文化城", "长沙"}); - add(new String[]{"湖南省交通设计院", "长沙"}); - add(new String[]{"湖南联通住宅小区", "长沙"}); - add(new String[]{"湖南电视台单位宿舍", "长沙"}); - add(new String[]{"湖南开关厂宿舍", "长沙"}); - add(new String[]{"湖南小区", "北京"}); - add(new String[]{"湖南邮电新村小区", "鞍山"}); - add(new String[]{"湖南省科学技术厅宿舍", "长沙"}); - add(new String[]{"湖南省国安厅单位房", "长沙"}); - add(new String[]{"湖南省木偶剧团宿舍", "长沙"}); - add(new String[]{"湖南省气象局宿舍", "长沙"}); - add(new String[]{"湖南女子大学教师公寓", "长沙"}); - add(new String[]{"湖南省农业机械研究所", "长沙"}); - add(new String[]{"湖南教育装备综合大楼", "长沙"}); - add(new String[]{"湖南省劳动卫生所", "长沙"}); - add(new String[]{"湖南省质量技术监督局宿舍", "长沙"}); - add(new String[]{"湖南省金属回收公司宿舍", "长沙"}); - add(new String[]{"湖南省塑料研究所", "长沙"}); - add(new String[]{"湖南省高级人民检查院单位房", "长沙"}); - add(new String[]{"湖南交通职院宿舍", "长沙"}); - add(new String[]{"湖南省冶金材料研究所", "长沙"}); - add(new String[]{"湖南金蜂音像出版社", "长沙"}); - add(new String[]{"湖南省物资厅宿舍", "长沙"}); - add(new String[]{"湖南家电商城", "长沙"}); - add(new String[]{"湖南国际商务中心", "长沙"}); - add(new String[]{"湖南财富中心", "长沙"}); - add(new String[]{"湖南国际汽车城", "长沙"}); - add(new String[]{"湖南亚大数码港", "长沙"}); - add(new String[]{"湖南大厦", "南宁"}); - add(new String[]{"湖南大厦", "上海"}); - add(new String[]{"湖南星沙汽配城", "长沙"}); - add(new String[]{"湖南艺校单位房", "长沙"}); - add(new String[]{"湖南财专教职工宿舍", "长沙"}); - add(new String[]{"湖南省机械进出口公司宿舍", "长沙"}); - add(new String[]{"湖南日报单位宿舍", "长沙"}); - add(new String[]{"湖南岸后畈小区", "绍兴"}); - }}); - city_DistrictNames.put("湘潭", new ArrayList(){{ - add(new String[]{"湘潭花园小区", "吉林"}); - add(new String[]{"湘潭小区", "吉林"}); - add(new String[]{"湘潭社区", "吉林"}); - add(new String[]{"湘潭东里", "天津"}); - add(new String[]{"湘潭里", "天津"}); - }}); - city_DistrictNames.put("福建", new ArrayList(){{ - add(new String[]{"福建园", "南宁"}); - add(new String[]{"福建省四建宿舍北门", "厦门"}); - add(new String[]{"福建联通花园", "福州"}); - add(new String[]{"福建日报社宿舍", "福州"}); - add(new String[]{"福建省中心检验所单位宿舍", "福州"}); - add(new String[]{"福建电影制片厂单位宿舍", "福州"}); - add(new String[]{"福建省女子监狱宿舍", "福州"}); - add(new String[]{"福建省医药公司大王里单位宿舍", "福州"}); - add(new String[]{"福建省第二公路工程公司宿舍", "福州"}); - add(new String[]{"福建省蚕桑研究所单位宿舍", "福州"}); - add(new String[]{"福建新村", "南京"}); - add(new String[]{"福建里", "天津"}); - add(new String[]{"福建社区", "武汉"}); - add(new String[]{"福建大厦", "贵阳"}); - add(new String[]{"福建巷小区", "成都"}); - add(new String[]{"福建大厦", "深圳"}); - add(new String[]{"福建生态工程学校单位宿舍", "福州"}); - add(new String[]{"福建医科大学教工宿舍", "福州"}); - }}); - city_DistrictNames.put("莆田", new ArrayList(){{ - add(new String[]{"莆田万科城", "莆田"}); - add(new String[]{"莆田学园花园", "莆田"}); - }}); - city_DistrictNames.put("河南", new ArrayList(){{ - add(new String[]{"河南庄小区", "青岛"}); - add(new String[]{"河南财专家属院", "郑州"}); - add(new String[]{"河南省新华书店家属院", "郑州"}); - add(new String[]{"河南省商业科学研究所家属院", "郑州"}); - add(new String[]{"河南省日报社家属院", "郑州"}); - add(new String[]{"河南女子高中家属院", "郑州"}); - add(new String[]{"河南外贸大院", "深圳"}); - add(new String[]{"河南里", "天津"}); - add(new String[]{"河南新村", "福州"}); - add(new String[]{"河南财经学院家属院", "郑州"}); - add(new String[]{"河南岸公园小区", "惠州"}); - add(new String[]{"河南岸新村", "惠州"}); - add(new String[]{"河南村", "北京"}); - add(new String[]{"河南理工学校家属院", "郑州"}); - add(new String[]{"河南省人事厅家属院", "郑州"}); - add(new String[]{"河南岸中心小区", "惠州"}); - add(new String[]{"河南省外贸学校家属院", "郑州"}); - add(new String[]{"河南村", "上海"}); - add(new String[]{"河南新村", "上海"}); - add(new String[]{"河南工业大学家属院", "郑州"}); - }}); - city_DistrictNames.put("郑州", new ArrayList(){{ - add(new String[]{"郑州图书城家属院", "郑州"}); - add(new String[]{"郑州西四环建材市场", "郑州"}); - add(new String[]{"郑州国际城", "郑州"}); - add(new String[]{"郑州轻工业学院家属院", "郑州"}); - add(new String[]{"郑州箱包城", "郑州"}); - add(new String[]{"郑州晚报社家属院", "郑州"}); - add(new String[]{"郑州核五院家属院", "郑州"}); - add(new String[]{"郑州市政法委家属院", "郑州"}); - add(new String[]{"郑州日报社家属院", "郑州"}); - add(new String[]{"郑州欧丽公司家属院", "郑州"}); - add(new String[]{"郑州恒大名都", "郑州"}); - add(new String[]{"郑州大酒店", "郑州"}); - add(new String[]{"郑州劳动服务公司家属院", "郑州"}); - add(new String[]{"郑州大厨房农副产品物流港", "郑州"}); - add(new String[]{"郑州国际美食娱乐广场", "郑州"}); - add(new String[]{"郑州国贸中心", "郑州"}); - }}); - city_DistrictNames.put("福建", new ArrayList(){{ - add(new String[]{"福建园", "南宁"}); - add(new String[]{"福建省四建宿舍北门", "厦门"}); - add(new String[]{"福建联通花园", "福州"}); - add(new String[]{"福建日报社宿舍", "福州"}); - add(new String[]{"福建省中心检验所单位宿舍", "福州"}); - add(new String[]{"福建电影制片厂单位宿舍", "福州"}); - add(new String[]{"福建省女子监狱宿舍", "福州"}); - add(new String[]{"福建省医药公司大王里单位宿舍", "福州"}); - add(new String[]{"福建省第二公路工程公司宿舍", "福州"}); - add(new String[]{"福建省蚕桑研究所单位宿舍", "福州"}); - add(new String[]{"福建新村", "南京"}); - add(new String[]{"福建里", "天津"}); - add(new String[]{"福建社区", "武汉"}); - add(new String[]{"福建大厦", "贵阳"}); - add(new String[]{"福建巷小区", "成都"}); - add(new String[]{"福建大厦", "深圳"}); - add(new String[]{"福建生态工程学校单位宿舍", "福州"}); - add(new String[]{"福建医科大学教工宿舍", "福州"}); - }}); - city_DistrictNames.put("福州", new ArrayList(){{ - add(new String[]{"福州一中三牧坊单位宿舍", "福州"}); - add(new String[]{"福州公安公寓", "福州"}); - add(new String[]{"福州春天", "福州"}); - add(new String[]{"福州市公安局小柳单位宿舍", "福州"}); - add(new String[]{"福州奥林匹克花园", "福州"}); - add(new String[]{"福州人民日报社印务中心单位宿舍", "福州"}); - add(new String[]{"福州发展和改革委员会单位宿舍", "福州"}); - add(new String[]{"福州星势力", "福州"}); - add(new String[]{"福州豪庭", "福州"}); - add(new String[]{"福州豪廷", "福州"}); - add(new String[]{"福州大楼", "上海"}); - }}); - city_DistrictNames.put("湖南", new ArrayList(){{ - add(new String[]{"湖南大厦", "海口"}); - add(new String[]{"湖南师大张公岭校区宿舍", "长沙"}); - add(new String[]{"湖南省进出口公司宿舍", "长沙"}); - add(new String[]{"湖南广电宿舍", "长沙"}); - add(new String[]{"湖南机床厂宿舍", "长沙"}); - add(new String[]{"湖南制药厂宿舍", "长沙"}); - add(new String[]{"湖南供销大厦", "长沙"}); - add(new String[]{"湖南化工医药设计院宿舍", "长沙"}); - add(new String[]{"湖南工商银行宿舍机关大院", "长沙"}); - add(new String[]{"湖南省国防科公办机关院内宿舍", "长沙"}); - add(new String[]{"湖南报业文化城", "长沙"}); - add(new String[]{"湖南省交通设计院", "长沙"}); - add(new String[]{"湖南联通住宅小区", "长沙"}); - add(new String[]{"湖南电视台单位宿舍", "长沙"}); - add(new String[]{"湖南开关厂宿舍", "长沙"}); - add(new String[]{"湖南小区", "北京"}); - add(new String[]{"湖南邮电新村小区", "鞍山"}); - add(new String[]{"湖南省科学技术厅宿舍", "长沙"}); - add(new String[]{"湖南省国安厅单位房", "长沙"}); - add(new String[]{"湖南省木偶剧团宿舍", "长沙"}); - add(new String[]{"湖南省气象局宿舍", "长沙"}); - add(new String[]{"湖南女子大学教师公寓", "长沙"}); - add(new String[]{"湖南省农业机械研究所", "长沙"}); - add(new String[]{"湖南教育装备综合大楼", "长沙"}); - add(new String[]{"湖南省劳动卫生所", "长沙"}); - add(new String[]{"湖南省质量技术监督局宿舍", "长沙"}); - add(new String[]{"湖南省金属回收公司宿舍", "长沙"}); - add(new String[]{"湖南省塑料研究所", "长沙"}); - add(new String[]{"湖南省高级人民检查院单位房", "长沙"}); - add(new String[]{"湖南交通职院宿舍", "长沙"}); - add(new String[]{"湖南省冶金材料研究所", "长沙"}); - add(new String[]{"湖南金蜂音像出版社", "长沙"}); - add(new String[]{"湖南省物资厅宿舍", "长沙"}); - add(new String[]{"湖南家电商城", "长沙"}); - add(new String[]{"湖南国际商务中心", "长沙"}); - add(new String[]{"湖南财富中心", "长沙"}); - add(new String[]{"湖南国际汽车城", "长沙"}); - add(new String[]{"湖南亚大数码港", "长沙"}); - add(new String[]{"湖南大厦", "南宁"}); - add(new String[]{"湖南大厦", "上海"}); - add(new String[]{"湖南星沙汽配城", "长沙"}); - add(new String[]{"湖南艺校单位房", "长沙"}); - add(new String[]{"湖南财专教职工宿舍", "长沙"}); - add(new String[]{"湖南省机械进出口公司宿舍", "长沙"}); - add(new String[]{"湖南日报单位宿舍", "长沙"}); - add(new String[]{"湖南岸后畈小区", "绍兴"}); - }}); - city_DistrictNames.put("长沙", new ArrayList(){{ - add(new String[]{"长沙市长堪设计院", "长沙"}); - add(new String[]{"长沙银行单位房", "长沙"}); - add(new String[]{"长沙恒大绿洲", "长沙"}); - add(new String[]{"长沙南苑小区", "长沙"}); - add(new String[]{"长沙市烟草专卖局单位宿舍", "长沙"}); - add(new String[]{"长沙理工大学教职工住宅区", "长沙"}); - add(new String[]{"长沙烟草局宿舍", "长沙"}); - add(new String[]{"长沙晚报宿舍", "长沙"}); - add(new String[]{"长沙市委党校宿舍", "长沙"}); - add(new String[]{"长沙标准件厂宿舍", "长沙"}); - add(new String[]{"长沙冶金厂宿舍", "长沙"}); - add(new String[]{"长沙市一中宿舍", "长沙"}); - add(new String[]{"长沙白沙啤酒公寓", "长沙"}); - add(new String[]{"长沙恒大城", "长沙"}); - add(new String[]{"长沙世茂铂翠湾", "长沙"}); - add(new String[]{"长沙第二十六中宿舍", "长沙"}); - add(new String[]{"长沙市九中宿舍", "长沙"}); - add(new String[]{"长沙市美术公司宿舍", "长沙"}); - add(new String[]{"长沙勘察设计院宿舍单位房", "长沙"}); - add(new String[]{"长沙市规划设计院宿舍", "长沙"}); - add(new String[]{"长沙污水处理厂宿舍", "长沙"}); - add(new String[]{"长沙商贸旅游教师宿舍", "长沙"}); - add(new String[]{"长沙伍家岭生活广场", "长沙"}); - add(new String[]{"长沙新大新大厦", "长沙"}); - add(new String[]{"长沙新苑", "珠海"}); - add(new String[]{"长沙卷烟厂宿舍", "长沙"}); - add(new String[]{"长沙市雨花区工贸学院", "长沙"}); - add(new String[]{"长沙生态动物园宠物馆门面", "长沙"}); - add(new String[]{"长沙监狱宿舍", "长沙"}); - add(new String[]{"长沙市营山巷52", "长沙"}); - add(new String[]{"长沙市外运宿舍", "长沙"}); - add(new String[]{"长沙理工金盆岭小区宿舍", "长沙"}); - add(new String[]{"长沙市质量技术监督局住宅小区", "长沙"}); - add(new String[]{"长沙二十一中宿舍", "长沙"}); - add(new String[]{"长沙茶市", "长沙"}); - add(new String[]{"长沙轴承厂宿舍", "长沙"}); - add(new String[]{"长沙冷柜厂宿舍", "长沙"}); - add(new String[]{"长沙玫瑰园别墅", "长沙"}); - add(new String[]{"长沙市国土局宿舍", "长沙"}); - add(new String[]{"长沙文化广场", "长沙"}); - add(new String[]{"长沙玫瑰园", "长沙"}); - add(new String[]{"长沙开福万达广场", "长沙"}); - add(new String[]{"长沙欧洲城", "长沙"}); - add(new String[]{"长沙深国投", "长沙"}); - add(new String[]{"长沙小区", "青岛"}); - add(new String[]{"长沙县财政局", "长沙"}); - add(new String[]{"长沙县林业局单位房", "长沙"}); - add(new String[]{"长沙县农机局宿舍", "长沙"}); - add(new String[]{"长沙县公安局单位房", "长沙"}); - add(new String[]{"长沙玻璃纤维厂宿舍", "长沙"}); - add(new String[]{"长沙奥林匹克花园", "长沙"}); - add(new String[]{"长沙嘉华城", "长沙"}); - add(new String[]{"长沙之芯", "长沙"}); - add(new String[]{"长沙港小区", "长沙"}); - }}); - city_DistrictNames.put("河南", new ArrayList(){{ - add(new String[]{"河南庄小区", "青岛"}); - add(new String[]{"河南财专家属院", "郑州"}); - add(new String[]{"河南省新华书店家属院", "郑州"}); - add(new String[]{"河南省商业科学研究所家属院", "郑州"}); - add(new String[]{"河南省日报社家属院", "郑州"}); - add(new String[]{"河南女子高中家属院", "郑州"}); - add(new String[]{"河南外贸大院", "深圳"}); - add(new String[]{"河南里", "天津"}); - add(new String[]{"河南新村", "福州"}); - add(new String[]{"河南财经学院家属院", "郑州"}); - add(new String[]{"河南岸公园小区", "惠州"}); - add(new String[]{"河南岸新村", "惠州"}); - add(new String[]{"河南村", "北京"}); - add(new String[]{"河南理工学校家属院", "郑州"}); - add(new String[]{"河南省人事厅家属院", "郑州"}); - add(new String[]{"河南岸中心小区", "惠州"}); - add(new String[]{"河南省外贸学校家属院", "郑州"}); - add(new String[]{"河南村", "上海"}); - add(new String[]{"河南新村", "上海"}); - add(new String[]{"河南工业大学家属院", "郑州"}); - }}); - city_DistrictNames.put("新乡", new ArrayList(){{ - add(new String[]{"新乡县安居小区", "新乡"}); - }}); - city_DistrictNames.put("江苏", new ArrayList(){{ - add(new String[]{"江苏省农科院", "南京"}); - add(new String[]{"江苏油田石油山庄", "扬州"}); - add(new String[]{"江苏警官学院", "南京"}); - add(new String[]{"江苏省高级专家园", "南京"}); - add(new String[]{"江苏油田石油山庄", "扬州"}); - add(new String[]{"江苏议事园", "南京"}); - add(new String[]{"江苏国际塑化城", "常州"}); - add(new String[]{"江苏万和国际商贸城", "常州"}); - }}); - city_DistrictNames.put("无锡", new ArrayList(){{ - add(new String[]{"无锡大厦", "上海"}); - add(new String[]{"无锡滨湖万达广场", "无锡"}); - add(new String[]{"无锡碧桂园", "无锡"}); - add(new String[]{"无锡世界贸易中心一期世贸公寓", "无锡"}); - add(new String[]{"无锡洛城橙郡", "无锡"}); - add(new String[]{"无锡塞纳庄园", "宜兴"}); - add(new String[]{"无锡玉兰花园", "宜兴"}); - }}); - city_DistrictNames.put("宜兴", new ArrayList(){{ - add(new String[]{"宜兴南里", "天津"}); - add(new String[]{"宜兴阳光花苑", "宜兴"}); - add(new String[]{"宜兴太滆花苑", "宜兴"}); - }}); - city_DistrictNames.put("辽宁", new ArrayList(){{ - add(new String[]{"辽宁中医家属楼", "沈阳"}); - add(new String[]{"辽宁里", "天津"}); - }}); - city_DistrictNames.put("沈阳", new ArrayList(){{ - add(new String[]{"沈阳中体奥林匹克花园·花园一号", "沈阳"}); - add(new String[]{"沈阳恒大城", "沈阳"}); - add(new String[]{"沈阳恒大绿洲", "沈阳"}); - add(new String[]{"沈阳奥林匹克花园三期", "沈阳"}); - add(new String[]{"沈阳市炮兵学院小区", "沈阳"}); - add(new String[]{"沈阳恒大名都", "沈阳"}); - add(new String[]{"沈阳海韵广场(锦江大酒店B座)", "沈阳"}); - add(new String[]{"沈阳站小区", "沈阳"}); - add(new String[]{"沈阳财富中心", "沈阳"}); - add(new String[]{"沈阳城市立方新居", "沈阳"}); - add(new String[]{"沈阳中体奥林匹克花园·花园新城", "沈阳"}); - add(new String[]{"沈阳中体奥林匹克花园·福城", "沈阳"}); - add(new String[]{"沈阳中国女人街", "沈阳"}); - add(new String[]{"沈阳社区", "武汉"}); - add(new String[]{"沈阳天地", "沈阳"}); - add(new String[]{"沈阳恒大江湾", "沈阳"}); - add(new String[]{"沈阳恒大华府", "沈阳"}); - add(new String[]{"沈阳万达公馆", "沈阳"}); - add(new String[]{"沈阳国际品牌总部大厦", "沈阳"}); - add(new String[]{"沈阳国际品牌总部大厦(国际鞋城)", "沈阳"}); - add(new String[]{"沈阳五金机电城", "沈阳"}); - add(new String[]{"沈阳商业城(西区)", "沈阳"}); - }}); - city_DistrictNames.put("辽宁", new ArrayList(){{ - add(new String[]{"辽宁中医家属楼", "沈阳"}); - add(new String[]{"辽宁里", "天津"}); - }}); - city_DistrictNames.put("营口", new ArrayList(){{ - add(new String[]{"营口大厦", "上海"}); - }}); - city_DistrictNames.put("浙江", new ArrayList(){{ - add(new String[]{"浙江工业大学教师宿舍", "杭州"}); - add(new String[]{"浙江大厦", "太原"}); - add(new String[]{"浙江办事处宿舍", "太原"}); - add(new String[]{"浙江仁和居老年养生公寓", "湖州"}); - add(new String[]{"浙江交运大厦", "杭州"}); - add(new String[]{"浙江工商大学宿舍", "杭州"}); - add(new String[]{"浙江商贸城", "合肥"}); - add(new String[]{"浙江工业大学之江学院", "杭州"}); - }}); - city_DistrictNames.put("宁波", new ArrayList(){{ - add(new String[]{"宁波里", "天津"}); - add(new String[]{"宁波里", "武汉"}); - add(new String[]{"宁波商会大厦", "宁波"}); - add(new String[]{"宁波外代大厦", "宁波"}); - add(new String[]{"宁波小区", "上海"}); - }}); - city_DistrictNames.put("慈溪", new ArrayList(){{ - add(new String[]{"慈溪金水湾", "宁波"}); - add(new String[]{"慈溪中央大厦", "宁波"}); - add(new String[]{"慈溪一品空间", "宁波"}); - add(new String[]{"慈溪财富中心", "宁波"}); - add(new String[]{"慈溪中央大厦", "慈溪"}); - add(new String[]{"慈溪一品空间", "慈溪"}); - add(new String[]{"慈溪金水湾", "慈溪"}); - }}); - city_DistrictNames.put("安徽", new ArrayList(){{ - add(new String[]{"安徽师范大学教师公寓", "芜湖"}); - add(new String[]{"安徽电视台宿舍", "合肥"}); - add(new String[]{"安徽日报社宿舍", "合肥"}); - add(new String[]{"安徽大厦", "珠海"}); - add(new String[]{"安徽杂技团宿舍", "合肥"}); - add(new String[]{"安徽警官职业学院宿舍", "合肥"}); - add(new String[]{"安徽税务学校宿舍", "合肥"}); - add(new String[]{"安徽汽配城", "合肥"}); - add(new String[]{"安徽国强钢材交易中心", "合肥"}); - add(new String[]{"安徽国际购物广场", "合肥"}); - add(new String[]{"安徽大市场", "合肥"}); - }}); - city_DistrictNames.put("芜湖", new ArrayList(){{ - add(new String[]{"芜湖文化公园", "芜湖"}); - add(new String[]{"芜湖碧桂园", "芜湖"}); - }}); - city_DistrictNames.put("贵州", new ArrayList(){{ - add(new String[]{"贵州大厦", "海口"}); - add(new String[]{"贵州科技大厦", "贵阳"}); - add(new String[]{"贵州日报社糖果厂宿舍", "贵阳"}); - add(new String[]{"贵州驴友人家酒店式连锁家庭公寓", "贵阳"}); - add(new String[]{"贵州日报社糖果厂宿舍", "贵阳"}); - add(new String[]{"贵州商贸物流港", "贵阳"}); - }}); - city_DistrictNames.put("六盘水", new ArrayList(){{ - }}); - city_DistrictNames.put("广东", new ArrayList(){{ - add(new String[]{"广东外贸广场", "广州"}); - add(new String[]{"广东外语艺术学院教师宿舍", "广州"}); - add(new String[]{"广东建科院宿舍", "广州"}); - add(new String[]{"广东司法警官职业学院宿舍", "广州"}); - add(new String[]{"广东环保大厦", "广州"}); - add(new String[]{"广东商业大厦", "广州"}); - add(new String[]{"广东医学院教师宿舍楼", "东莞"}); - add(new String[]{"广东国际大厦", "广州"}); - add(new String[]{"广东省技术监督局宿舍", "广州"}); - add(new String[]{"广东工业大学宿舍", "广州"}); - add(new String[]{"广东教育学院宿舍", "广州"}); - add(new String[]{"广东省银行大厦", "深圳"}); - add(new String[]{"广东大厦", "天津"}); - add(new String[]{"广东山庄", "镇江"}); - add(new String[]{"广东红盾大厦", "广州"}); - add(new String[]{"广东药学院宿舍", "广州"}); - add(new String[]{"广东青年干部学院宿舍", "广州"}); - add(new String[]{"广东基础楼", "深圳"}); - add(new String[]{"广东省科技干部学院宿舍", "广州"}); - add(new String[]{"广东省农业管理干部学院社区", "广州"}); - add(new String[]{"广东芭蕾雨·逸景", "佛山"}); - }}); - city_DistrictNames.put("湛江", new ArrayList(){{ - add(new String[]{"湛江里", "天津"}); - add(new String[]{"湛江数码大厦", "湛江"}); - add(new String[]{"湛江世贸大厦", "湛江"}); - add(new String[]{"湛江国贸大厦", "湛江"}); - }}); - city_DistrictNames.put("河南", new ArrayList(){{ - add(new String[]{"河南庄小区", "青岛"}); - add(new String[]{"河南财专家属院", "郑州"}); - add(new String[]{"河南省新华书店家属院", "郑州"}); - add(new String[]{"河南省商业科学研究所家属院", "郑州"}); - add(new String[]{"河南省日报社家属院", "郑州"}); - add(new String[]{"河南女子高中家属院", "郑州"}); - add(new String[]{"河南外贸大院", "深圳"}); - add(new String[]{"河南里", "天津"}); - add(new String[]{"河南新村", "福州"}); - add(new String[]{"河南财经学院家属院", "郑州"}); - add(new String[]{"河南岸公园小区", "惠州"}); - add(new String[]{"河南岸新村", "惠州"}); - add(new String[]{"河南村", "北京"}); - add(new String[]{"河南理工学校家属院", "郑州"}); - add(new String[]{"河南省人事厅家属院", "郑州"}); - add(new String[]{"河南岸中心小区", "惠州"}); - add(new String[]{"河南省外贸学校家属院", "郑州"}); - add(new String[]{"河南村", "上海"}); - add(new String[]{"河南新村", "上海"}); - add(new String[]{"河南工业大学家属院", "郑州"}); - }}); - city_DistrictNames.put("平顶山", new ArrayList(){{ - add(new String[]{"平顶山小区", "乌鲁木齐"}); - add(new String[]{"平顶山运输公司家属院", "乌鲁木齐"}); - }}); - city_DistrictNames.put("云南", new ArrayList(){{ - add(new String[]{"云南大厦", "广州"}); - add(new String[]{"云南省杂技团家属院", "昆明"}); - add(new String[]{"云南华侨城", "昆明"}); - add(new String[]{"云南艺术家园区", "昆明"}); - add(new String[]{"云南农业大学教工住宅区", "昆明"}); - add(new String[]{"云南财经大学住宅", "昆明"}); - add(new String[]{"云南大学龙泉路小区", "昆明"}); - add(new String[]{"云南工业职业技术学院", "昆明"}); - add(new String[]{"云南印象城", "昆明"}); - add(new String[]{"云南映象", "昆明"}); - add(new String[]{"云南省畜牧局宿舍", "昆明"}); - add(new String[]{"云南省建筑材料学研究设计院", "昆明"}); - add(new String[]{"云南测绘工程院", "昆明"}); - add(new String[]{"云南省第一轻工机械厂", "昆明"}); - add(new String[]{"云南日报社单位房", "昆明"}); - add(new String[]{"云南白药厂单位福利房", "昆明"}); - add(new String[]{"云南大学东二院", "昆明"}); - add(new String[]{"云南省委党校生活区", "昆明"}); - add(new String[]{"云南印象城别墅", "昆明"}); - add(new String[]{"云南白药福利房", "昆明"}); - }}); - city_DistrictNames.put("玉溪", new ArrayList(){{ - add(new String[]{"玉溪高仓时代明珠", "玉溪"}); - add(new String[]{"玉溪一小区", "玉溪"}); - }}); - city_DistrictNames.put("吉林", new ArrayList(){{ - add(new String[]{"吉林大厦", "海口"}); - add(new String[]{"吉林花园", "贵阳"}); - add(new String[]{"吉林社区", "武汉"}); - add(new String[]{"吉林省团校家属楼", "长春"}); - add(new String[]{"吉林里", "天津"}); - }}); - city_DistrictNames.put("长春", new ArrayList(){{ - add(new String[]{"长春明珠", "长春"}); - add(new String[]{"长春经济开发区经开六区", "长春"}); - add(new String[]{"长春万科城市花园", "长春"}); - add(new String[]{"长春银座", "长春"}); - add(new String[]{"长春豪园", "长春"}); - add(new String[]{"长春理工大学家属楼", "长春"}); - add(new String[]{"长春工程学院宿舍", "长春"}); - add(new String[]{"长春工业大学公寓", "长春"}); - add(new String[]{"长春工大住宅", "长春"}); - add(new String[]{"长春市双阳区客运综合服务区", "长春"}); - add(new String[]{"长春市东苑15号楼", "长春"}); - add(new String[]{"长春昆仑", "长春"}); - add(new String[]{"长春村", "南昌"}); - add(new String[]{"长春小区", "武汉"}); - add(new String[]{"长春西里", "天津"}); - add(new String[]{"长春小区", "襄阳"}); - add(new String[]{"长春小区电气化", "襄阳"}); - add(new String[]{"长春苑小区", "乌鲁木齐"}); - add(new String[]{"长春花园 (长春花苑)", "乌鲁木齐"}); - add(new String[]{"长春花园", "深圳"}); - add(new String[]{"长春花园", "福州"}); - add(new String[]{"长春花园", "大连"}); - add(new String[]{"长春花园城", "温州"}); - add(new String[]{"长春里", "天津"}); - add(new String[]{"长春观社区", "武汉"}); - add(new String[]{"长春小区二期", "武汉"}); - add(new String[]{"长春钻石城", "长春"}); - add(new String[]{"长春市德阳购物中心", "长春"}); - add(new String[]{"长春都市豪庭", "合肥"}); - add(new String[]{"长春花园", "昆明"}); - add(new String[]{"长春都市花园", "合肥"}); - add(new String[]{"长春苑", "上海"}); - add(new String[]{"长春新苑", "上海"}); - add(new String[]{"长春小区", "上海"}); - add(new String[]{"长春公寓", "上海"}); - add(new String[]{"长春花园城", "瑞安"}); - add(new String[]{"长春二区", "义乌"}); - add(new String[]{"长春三区", "义乌"}); - add(new String[]{"长春小区", "义乌"}); - add(new String[]{"长春三区", "金华"}); - add(new String[]{"长春小区", "金华"}); - add(new String[]{"长春二区", "金华"}); - add(new String[]{"长春红星美凯龙全球家居生活广场", "长春"}); - add(new String[]{"长春明珠二期", "长春"}); - }}); - city_DistrictNames.put("山东", new ArrayList(){{ - add(new String[]{"山东里", "秦皇岛"}); - add(new String[]{"山东经济学院宿舍", "济南"}); - add(new String[]{"山东省卫生厅宿舍", "济南"}); - add(new String[]{"山东省民政厅宿舍", "济南"}); - add(new String[]{"山东省商业集团总公司宿舍", "济南"}); - add(new String[]{"山东医科大学教师宿舍", "济南"}); - add(new String[]{"山东外贸大厦", "青岛"}); - add(new String[]{"山东大厦", "深圳"}); - add(new String[]{"山东堡社区", "沈阳"}); - add(new String[]{"山东艺术学院宿舍", "济南"}); - add(new String[]{"山东黄金崮云湖高尔夫别墅", "济南"}); - add(new String[]{"山东司法警官学院宿舍", "济南"}); - add(new String[]{"山东省科学院高新技术研究分院", "青岛"}); - add(new String[]{"山东建工学院宿舍", "济南"}); - add(new String[]{"山东庙小区", "沈阳"}); - add(new String[]{"山东乳山银滩海景房", "威海"}); - add(new String[]{"山东头村", "青岛"}); - add(new String[]{"山东省畜牧局宿舍", "济南"}); - }}); - city_DistrictNames.put("威海", new ArrayList(){{ - add(new String[]{"威海仁柳庄别墅", "威海"}); - add(new String[]{"威海华新园", "威海"}); - add(new String[]{"威海中医院", "威海"}); - add(new String[]{"威海西御康", "威海"}); - add(new String[]{"威海石岛碧海鹏城", "威海"}); - add(new String[]{"威海天鹅湖畔", "威海"}); - add(new String[]{"威海洲际休闲旅游度假区", "威海"}); - add(new String[]{"威海苑", "上海"}); - add(new String[]{"威海别墅", "上海"}); - add(new String[]{"威海大楼", "上海"}); - }}); - city_DistrictNames.put("浙江", new ArrayList(){{ - add(new String[]{"浙江工业大学教师宿舍", "杭州"}); - add(new String[]{"浙江大厦", "太原"}); - add(new String[]{"浙江办事处宿舍", "太原"}); - add(new String[]{"浙江仁和居老年养生公寓", "湖州"}); - add(new String[]{"浙江交运大厦", "杭州"}); - add(new String[]{"浙江工商大学宿舍", "杭州"}); - add(new String[]{"浙江商贸城", "合肥"}); - add(new String[]{"浙江工业大学之江学院", "杭州"}); - }}); - city_DistrictNames.put("金华", new ArrayList(){{ - add(new String[]{"金华里", "北京"}); - add(new String[]{"金华苑", "海口"}); - add(new String[]{"金华新村", "大连"}); - add(new String[]{"金华公寓", "青岛"}); - add(new String[]{"金华园", "中山"}); - add(new String[]{"金华花园", "东莞"}); - add(new String[]{"金华世家", "贵阳"}); - add(new String[]{"金华园", "贵阳"}); - add(new String[]{"金华花园", "广州"}); - add(new String[]{"金华新村", "杭州"}); - add(new String[]{"金华苑", "潍坊"}); - add(new String[]{"金华丽小区", "潍坊"}); - add(new String[]{"金华花园", "重庆"}); - add(new String[]{"金华阁", "深圳"}); - add(new String[]{"金华大厦大渡口", "重庆"}); - add(new String[]{"金华苑小区", "重庆"}); - add(new String[]{"金华里", "天津"}); - add(new String[]{"金华小区", "石家庄"}); - add(new String[]{"金华大厦", "重庆"}); - add(new String[]{"金华园", "重庆"}); - add(new String[]{"金华云鼎", "重庆"}); - add(new String[]{"金华园", "沈阳"}); - add(new String[]{"金华公寓", "成都"}); - add(new String[]{"金华苑", "成都"}); - add(new String[]{"金华大厦", "武汉"}); - add(new String[]{"金华学府", "呼和浩特"}); - add(new String[]{"金华世家别墅", "贵阳"}); - add(new String[]{"金华公寓", "福州"}); - add(new String[]{"金华小区", "大连"}); - add(new String[]{"金华里(西青)", "天津"}); - add(new String[]{"金华楼", "厦门"}); - add(new String[]{"金华苑", "兰州"}); - add(new String[]{"金华园别墅", "北京"}); - add(new String[]{"金华小区三期", "大连"}); - add(new String[]{"金华花园", "中山"}); - add(new String[]{"金华园", "佛山"}); - add(new String[]{"金华苑", "青岛"}); - add(new String[]{"金华小区二期", "大连"}); - add(new String[]{"金华园", "昆明"}); - add(new String[]{"金华苑", "上海"}); - add(new String[]{"金华园", "北京"}); - add(new String[]{"金华新村", "上海"}); - add(new String[]{"金华公司宿舍", "昆明"}); - add(new String[]{"金华苑", "平顶山"}); - add(new String[]{"金华家园 ", "盘锦"}); - add(new String[]{"金华家园", "盘锦"}); - add(new String[]{"金华万达广场", "金华"}); - add(new String[]{"金华世贸中心", "金华"}); - add(new String[]{"金华汽配城二期", "金华"}); - add(new String[]{"金华巷一号", "攀枝花"}); - }}); - city_DistrictNames.put("义乌", new ArrayList(){{ - add(new String[]{"义乌批发市场", "重庆"}); - add(new String[]{"义乌小商品批发城", "惠州"}); - add(new String[]{"义乌公寓", "惠州"}); - add(new String[]{"义乌金茂大厦", "义乌"}); - add(new String[]{"义乌世纪商城", "义乌"}); - add(new String[]{"义乌欧景名城", "义乌"}); - add(new String[]{"义乌现代城", "义乌"}); - add(new String[]{"义乌时代花园", "义乌"}); - add(new String[]{"义乌金茂大厦", "金华"}); - add(new String[]{"义乌世纪商城", "金华"}); - add(new String[]{"义乌时代花园", "金华"}); - add(new String[]{"义乌西城广场", "金华"}); - add(new String[]{"义乌现代城", "金华"}); - add(new String[]{"义乌欧景名城", "金华"}); - }}); - city_DistrictNames.put("江苏", new ArrayList(){{ - add(new String[]{"江苏省农科院", "南京"}); - add(new String[]{"江苏油田石油山庄", "扬州"}); - add(new String[]{"江苏警官学院", "南京"}); - add(new String[]{"江苏省高级专家园", "南京"}); - add(new String[]{"江苏油田石油山庄", "扬州"}); - add(new String[]{"江苏议事园", "南京"}); - add(new String[]{"江苏国际塑化城", "常州"}); - add(new String[]{"江苏万和国际商贸城", "常州"}); - }}); - city_DistrictNames.put("宿迁", new ArrayList(){{ - }}); - city_DistrictNames.put("辽宁", new ArrayList(){{ - add(new String[]{"辽宁中医家属楼", "沈阳"}); - add(new String[]{"辽宁里", "天津"}); - }}); - city_DistrictNames.put("鞍山", new ArrayList(){{ - add(new String[]{"鞍山恒基兆业园林路地块", "鞍山"}); - add(new String[]{"鞍山恒大绿洲", "鞍山"}); - add(new String[]{"鞍山三村", "上海"}); - add(new String[]{"鞍山四村", "上海"}); - add(new String[]{"鞍山六村", "上海"}); - add(new String[]{"鞍山七村", "上海"}); - add(new String[]{"鞍山八村", "上海"}); - add(new String[]{"鞍山一村", "上海"}); - add(new String[]{"鞍山五村", "上海"}); - }}); - city_DistrictNames.put("福建", new ArrayList(){{ - add(new String[]{"福建园", "南宁"}); - add(new String[]{"福建省四建宿舍北门", "厦门"}); - add(new String[]{"福建联通花园", "福州"}); - add(new String[]{"福建日报社宿舍", "福州"}); - add(new String[]{"福建省中心检验所单位宿舍", "福州"}); - add(new String[]{"福建电影制片厂单位宿舍", "福州"}); - add(new String[]{"福建省女子监狱宿舍", "福州"}); - add(new String[]{"福建省医药公司大王里单位宿舍", "福州"}); - add(new String[]{"福建省第二公路工程公司宿舍", "福州"}); - add(new String[]{"福建省蚕桑研究所单位宿舍", "福州"}); - add(new String[]{"福建新村", "南京"}); - add(new String[]{"福建里", "天津"}); - add(new String[]{"福建社区", "武汉"}); - add(new String[]{"福建大厦", "贵阳"}); - add(new String[]{"福建巷小区", "成都"}); - add(new String[]{"福建大厦", "深圳"}); - add(new String[]{"福建生态工程学校单位宿舍", "福州"}); - add(new String[]{"福建医科大学教工宿舍", "福州"}); - }}); - city_DistrictNames.put("厦门", new ArrayList(){{ - add(new String[]{"厦门国际广场", "厦门"}); - add(new String[]{"厦门大学城", "厦门"}); - add(new String[]{"厦门千禧园", "厦门"}); - add(new String[]{"厦门罐头厂宿舍", "厦门"}); - add(new String[]{"厦门民防", "厦门"}); - add(new String[]{"厦门莲坂新小区", "厦门"}); - add(new String[]{"厦门钢窗厂宿舍", "厦门"}); - add(new String[]{"厦门造船厂宿舍", "厦门"}); - add(new String[]{"厦门航空宿舍", "福州"}); - add(new String[]{"厦门市中心血站宿舍楼", "厦门"}); - add(new String[]{"厦门医药站宿舍", "厦门"}); - add(new String[]{"厦门行车公寓", "厦门"}); - add(new String[]{"厦门国际文化大厦", "厦门"}); - add(new String[]{"厦门华苑", "盐城"}); - add(new String[]{"厦门电机厂宿舍", "厦门"}); - }}); - city_DistrictNames.put("海南", new ArrayList(){{ - add(new String[]{"海南之心", "海口"}); - add(new String[]{"海南大学南希科技苑", "海口"}); - add(new String[]{"海南日报社宿舍", "海口"}); - add(new String[]{"海南省审计机关美舍住宅区", "海口"}); - add(new String[]{"海南社保", "海口"}); - add(new String[]{"海南省人大常委会机关住宅小区", "海口"}); - add(new String[]{"海南大学教师宿舍", "海口"}); - add(new String[]{"海南燃化公司宿舍", "海口"}); - add(new String[]{"海南省体校宿舍", "海口"}); - add(new String[]{"海南统计局宿舍", "海口"}); - add(new String[]{"海南省工商银行宿舍", "海口"}); - add(new String[]{"海南工商大厦", "海口"}); - add(new String[]{"海南时代广场", "海口"}); - add(new String[]{"海南师范学院金花园", "海口"}); - add(new String[]{"海南大厦", "海口"}); - add(new String[]{"海南电力厂宿舍", "海口"}); - add(new String[]{"海南省三亚六建单位", "三亚"}); - add(new String[]{"海南陵水富力湾", "三亚"}); - add(new String[]{"海南大公馆", "海口"}); - add(new String[]{"海南美林湖国际度假社区", "三亚"}); - add(new String[]{"海南家园", "北京"}); - add(new String[]{"海南干休所", "广州"}); - add(new String[]{"海南绿城清水湾", "三亚"}); - add(new String[]{"海南·三亚·美亚之心", "三亚"}); - add(new String[]{"海南西弄51弄", "上海"}); - add(new String[]{"海南干休所(天河)", "广州"}); - add(new String[]{"海南后海温泉小镇", "重庆"}); - }}); - city_DistrictNames.put("三亚", new ArrayList(){{ - add(new String[]{"三亚金蓝湾小区", "三亚"}); - add(new String[]{"三亚远洋公馆", "三亚"}); - add(new String[]{"三亚海岳半岛成邦", "三亚"}); - add(new String[]{"三亚北京公馆", "三亚"}); - add(new String[]{"三亚荣德苑", "三亚"}); - add(new String[]{"三亚椰岛阳光花园", "三亚"}); - add(new String[]{"三亚芭堤雅度假酒店", "三亚"}); - add(new String[]{"三亚爱琴海岸康年套房度假酒店", "三亚"}); - add(new String[]{"三亚湾红树林", "三亚"}); - add(new String[]{"三亚印象", "三亚"}); - add(new String[]{"三亚金中海蓝钻", "三亚"}); - add(new String[]{"三亚东岸假日", "三亚"}); - add(new String[]{"三亚椰河湾", "三亚"}); - add(new String[]{"三亚湾红树林", "三亚"}); - add(new String[]{"三亚花开四季", "三亚"}); - add(new String[]{"三亚印象", "三亚"}); - add(new String[]{"三亚鸿洲佳园", "三亚"}); - add(new String[]{"三亚魅力之冠", "三亚"}); - add(new String[]{"三亚海楼云月", "三亚"}); - add(new String[]{"三亚湾蓝色海岸", "三亚"}); - add(new String[]{"三亚心天地", "三亚"}); - add(new String[]{"三亚时代海岸", "三亚"}); - add(new String[]{"三亚星海度假公寓", "三亚"}); - add(new String[]{"三亚椰景南岸", "三亚"}); - add(new String[]{"三亚民航局小区", "三亚"}); - add(new String[]{"三亚凤凰水城", "三亚"}); - add(new String[]{"三亚丽苑", "三亚"}); - add(new String[]{"三亚国光滨海花园", "三亚"}); - add(new String[]{"三亚榆林湾(金色年华海景小区)", "三亚"}); - add(new String[]{"三亚泰和花园", "三亚"}); - add(new String[]{"三亚新大洲印象", "三亚"}); - add(new String[]{"三亚监狱小区", "三亚"}); - add(new String[]{"三亚三永凤凰城", "三亚"}); - add(new String[]{"三亚凤凰水城凤凰湾", "三亚"}); - add(new String[]{"三亚鲁能游艇二区", "三亚"}); - add(new String[]{"三亚鲁能美丽三区", "三亚"}); - add(new String[]{"三亚海之韵", "三亚"}); - add(new String[]{"三亚环卫局宿舍", "三亚"}); - add(new String[]{"三亚国际饭店", "三亚"}); - add(new String[]{"三亚美丽之苑", "三亚"}); - add(new String[]{"三亚鸿洲国际公馆", "三亚"}); - add(new String[]{"三亚汇凯花园", "三亚"}); - add(new String[]{"三亚南新职工住宅楼", "三亚"}); - add(new String[]{"三亚同心家园", "三亚"}); - add(new String[]{"三亚南海佳园", "三亚"}); - add(new String[]{"三亚紫豪海景酒店", "三亚"}); - add(new String[]{"三亚腾涛公寓", "三亚"}); - add(new String[]{"三亚市建筑工程总公司住宅小区", "三亚"}); - add(new String[]{"三亚湾鸿运楼", "三亚"}); - add(new String[]{"三亚海航小区一期二期", "三亚"}); - add(new String[]{"三亚绿岛公寓", "三亚"}); - add(new String[]{"三亚湾我释海", "三亚"}); - add(new String[]{"三亚交通小区", "三亚"}); - add(new String[]{"三亚阳光家园", "三亚"}); - add(new String[]{"三亚海滨假日别墅", "三亚"}); - add(new String[]{"三亚圣煜花园", "三亚"}); - add(new String[]{"三亚金茂海景公寓", "三亚"}); - add(new String[]{"三亚清平乐", "三亚"}); - add(new String[]{"三亚市黄金广场", "三亚"}); - add(new String[]{"三亚馨海湾", "三亚"}); - add(new String[]{"三亚福瑞国际公馆", "三亚"}); - add(new String[]{"三亚市食品厂职工安置房", "三亚"}); - add(new String[]{"三亚湾国际公馆", "三亚"}); - add(new String[]{"三亚山", "三亚"}); - add(new String[]{"三亚富春山居", "三亚"}); - add(new String[]{"三亚高级知识分子住宅园", "三亚"}); - add(new String[]{"三亚环卫局宿舍", "三亚"}); - add(new String[]{"三亚奇林生态花园小区", "三亚"}); - add(new String[]{"三亚嶺海", "三亚"}); - add(new String[]{"三亚美丽春天温泉度假酒店公寓", "三亚"}); - add(new String[]{"三亚丽景温泉", "三亚"}); - add(new String[]{"三亚广友花园", "三亚"}); - add(new String[]{"三亚花冠渔歌海韵", "三亚"}); - add(new String[]{"三亚·山水国际", "三亚"}); - add(new String[]{"三亚卓达季风苑", "三亚"}); - add(new String[]{"三亚塘小区", "惠州"}); - add(new String[]{"三亚中体奥林匹克湾", "三亚"}); - add(new String[]{"三亚湾鲁能高尔夫三区别墅", "三亚"}); - add(new String[]{"三亚市我是一只鱼", "三亚"}); - add(new String[]{"三亚辰光假日酒店", "三亚"}); - add(new String[]{"三亚海悦台", "三亚"}); - add(new String[]{"三亚高级知识分子住宅园", "三亚"}); - add(new String[]{"三亚湾蓝波湾", "三亚"}); - add(new String[]{"三亚凤凰岛", "三亚"}); - add(new String[]{"三亚爱琴海岸", "三亚"}); - add(new String[]{"三亚湾蓝色海岸", "三亚"}); - add(new String[]{"三亚湾碧海蓝天", "三亚"}); - add(new String[]{"三亚海楼云月", "三亚"}); - }}); - city_DistrictNames.put("安徽", new ArrayList(){{ - add(new String[]{"安徽师范大学教师公寓", "芜湖"}); - add(new String[]{"安徽电视台宿舍", "合肥"}); - add(new String[]{"安徽日报社宿舍", "合肥"}); - add(new String[]{"安徽大厦", "珠海"}); - add(new String[]{"安徽杂技团宿舍", "合肥"}); - add(new String[]{"安徽警官职业学院宿舍", "合肥"}); - add(new String[]{"安徽税务学校宿舍", "合肥"}); - add(new String[]{"安徽汽配城", "合肥"}); - add(new String[]{"安徽国强钢材交易中心", "合肥"}); - add(new String[]{"安徽国际购物广场", "合肥"}); - add(new String[]{"安徽大市场", "合肥"}); - }}); - city_DistrictNames.put("合肥", new ArrayList(){{ - add(new String[]{"合肥晚报社宿舍", "合肥"}); - add(new String[]{"合肥铝厂宿舍", "合肥"}); - add(new String[]{"合肥学院教师宿舍楼", "合肥"}); - add(new String[]{"合肥锁厂宿舍", "合肥"}); - add(new String[]{"合肥万达广场", "合肥"}); - add(new String[]{"合肥恒大城", "合肥"}); - add(new String[]{"合肥合作经济广场", "合肥"}); - add(new String[]{"合肥恒通食品批发市场", "合肥"}); - }}); - city_DistrictNames.put("江苏", new ArrayList(){{ - add(new String[]{"江苏省农科院", "南京"}); - add(new String[]{"江苏油田石油山庄", "扬州"}); - add(new String[]{"江苏警官学院", "南京"}); - add(new String[]{"江苏省高级专家园", "南京"}); - add(new String[]{"江苏油田石油山庄", "扬州"}); - add(new String[]{"江苏议事园", "南京"}); - add(new String[]{"江苏国际塑化城", "常州"}); - add(new String[]{"江苏万和国际商贸城", "常州"}); - }}); - city_DistrictNames.put("盐城", new ArrayList(){{ - add(new String[]{"盐城大桥东", "盐城"}); - add(new String[]{"盐城市月湖花城", "盐城"}); - }}); - city_DistrictNames.put("广西壮族", new ArrayList(){{ - add(new String[]{"广西壮族自治区司法厅宿舍", "南宁"}); - add(new String[]{"广西壮族自治区农业厅宿舍", "南宁"}); - }}); - city_DistrictNames.put("北海", new ArrayList(){{ - add(new String[]{"北海庄园", "邯郸"}); - add(new String[]{"北海岸88号", "海口"}); - add(new String[]{"北海新城", "烟台"}); - add(new String[]{"北海银滩之家客栈", "南宁"}); - add(new String[]{"北海新居", "长春"}); - add(new String[]{"北海分局家属院", "青岛"}); - add(new String[]{"北海新城", "威海"}); - add(new String[]{"北海四合院", "北京"}); - add(new String[]{"北海公寓", "潍坊"}); - add(new String[]{"北海宿舍小区", "潍坊"}); - add(new String[]{"北海凯旋国际商住大厦", "北海"}); - add(new String[]{"北海花园", "北海"}); - add(new String[]{"北海社区", "沈阳"}); - add(new String[]{"北海嘉园", "沈阳"}); - add(new String[]{"北海华美财富广场", "北海"}); - add(new String[]{"北海佳苑", "青岛"}); - add(new String[]{"北海胜利公社别墅", "大连"}); - add(new String[]{"北海花园", "青岛"}); - add(new String[]{"北海胜利公社", "大连"}); - add(new String[]{"北海明珠", "潍坊"}); - add(new String[]{"北海花园", "哈尔滨"}); - add(new String[]{"北海里", "天津"}); - add(new String[]{"北海花园", "潍坊"}); - add(new String[]{"北海苑", "绍兴"}); - add(new String[]{"北海花园", "绍兴"}); - add(new String[]{"北海大厦公寓", "上海"}); - add(new String[]{"北海新苑", "上海"}); - add(new String[]{"北海岸一品阁", "青岛"}); - add(new String[]{"北海苑", "青岛"}); - add(new String[]{"北海花园", "盐城"}); - add(new String[]{"北海四期", "盐城"}); - }}); - city_DistrictNames.put("江苏", new ArrayList(){{ - add(new String[]{"江苏省农科院", "南京"}); - add(new String[]{"江苏油田石油山庄", "扬州"}); - add(new String[]{"江苏警官学院", "南京"}); - add(new String[]{"江苏省高级专家园", "南京"}); - add(new String[]{"江苏油田石油山庄", "扬州"}); - add(new String[]{"江苏议事园", "南京"}); - add(new String[]{"江苏国际塑化城", "常州"}); - add(new String[]{"江苏万和国际商贸城", "常州"}); - }}); - city_DistrictNames.put("苏州", new ArrayList(){{ - add(new String[]{"苏州北巷", "大连"}); - add(new String[]{"苏州里", "天津"}); - add(new String[]{"苏州花园一期", "乌鲁木齐"}); - add(new String[]{"苏州花园二期", "乌鲁木齐"}); - add(new String[]{"苏州花园", "宿迁"}); - add(new String[]{"苏州小区", "北京"}); - add(new String[]{"苏州公寓", "北京"}); - add(new String[]{"苏州幻象", "济南"}); - add(new String[]{"苏州凤凰文化广场", "苏州"}); - add(new String[]{"苏州国际轻纺城", "苏州"}); - add(new String[]{"苏州世茂运河城", "苏州"}); - add(new String[]{"苏州市沧浪科技创业园", "苏州"}); - add(new String[]{"苏州高新区人力资源大厦", "苏州"}); - add(new String[]{"苏州新东方汽配城", "苏州"}); - add(new String[]{"苏州礼品商品城", "苏州"}); - add(new String[]{"苏州沿海国际中心", "苏州"}); - add(new String[]{"苏州机电五金城", "苏州"}); - add(new String[]{"苏州市沧浪科技创业园东区", "苏州"}); - add(new String[]{"苏州世茂广场公寓", "苏州"}); - }}); - city_DistrictNames.put("常熟", new ArrayList(){{ - add(new String[]{"常熟北里", "天津"}); - add(new String[]{"常熟南里", "天津"}); - add(new String[]{"常熟中关村科技城", "常熟"}); - add(new String[]{"常熟花园", "常熟"}); - add(new String[]{"常熟滨江花园", "常熟"}); - }}); - city_DistrictNames.put("四川", new ArrayList(){{ - add(new String[]{"四川省直机关工委宿舍", "成都"}); - add(new String[]{"四川省林业厅宿舍", "成都"}); - add(new String[]{"四川音乐学院宿舍", "成都"}); - add(new String[]{"四川省闽中市驻疆办事处小区", "乌鲁木齐"}); - add(new String[]{"四川大厦", "厦门"}); - add(new String[]{"四川省科技厅宿舍", "成都"}); - add(new String[]{"四川专用汽车厂宿舍", "成都"}); - add(new String[]{"四川日报宿舍", "成都"}); - add(new String[]{"四川艺术职业学院家属楼", "成都"}); - add(new String[]{"四川营胡同", "北京"}); - add(new String[]{"四川小区", "上海"}); - add(new String[]{"四川幼师宿舍", "成都"}); - add(new String[]{"四川大学农林村", "成都"}); - }}); - city_DistrictNames.put("宜宾", new ArrayList(){{ - add(new String[]{"宜宾北里", "天津"}); - add(new String[]{"宜宾东里", "天津"}); - add(new String[]{"宜宾西里", "天津"}); - add(new String[]{"宜宾楼", "天津"}); - add(new String[]{"宜宾学院A区", "宜宾"}); - }}); - city_DistrictNames.put("云南", new ArrayList(){{ - add(new String[]{"云南大厦", "广州"}); - add(new String[]{"云南省杂技团家属院", "昆明"}); - add(new String[]{"云南华侨城", "昆明"}); - add(new String[]{"云南艺术家园区", "昆明"}); - add(new String[]{"云南农业大学教工住宅区", "昆明"}); - add(new String[]{"云南财经大学住宅", "昆明"}); - add(new String[]{"云南大学龙泉路小区", "昆明"}); - add(new String[]{"云南工业职业技术学院", "昆明"}); - add(new String[]{"云南印象城", "昆明"}); - add(new String[]{"云南映象", "昆明"}); - add(new String[]{"云南省畜牧局宿舍", "昆明"}); - add(new String[]{"云南省建筑材料学研究设计院", "昆明"}); - add(new String[]{"云南测绘工程院", "昆明"}); - add(new String[]{"云南省第一轻工机械厂", "昆明"}); - add(new String[]{"云南日报社单位房", "昆明"}); - add(new String[]{"云南白药厂单位福利房", "昆明"}); - add(new String[]{"云南大学东二院", "昆明"}); - add(new String[]{"云南省委党校生活区", "昆明"}); - add(new String[]{"云南印象城别墅", "昆明"}); - add(new String[]{"云南白药福利房", "昆明"}); - }}); - city_DistrictNames.put("丽江", new ArrayList(){{ - add(new String[]{"丽江花园", "广州"}); - add(new String[]{"丽江花园左岸", "广州"}); - add(new String[]{"丽江花园玉树别院", "广州"}); - add(new String[]{"丽江花园丽字楼", "广州"}); - add(new String[]{"丽江花园九如通津", "广州"}); - add(new String[]{"丽江花园丽岛翠堤", "广州"}); - add(new String[]{"丽江蓝湾", "长春"}); - add(new String[]{"丽江花园", "长春"}); - add(new String[]{"丽江茗园", "常州"}); - add(new String[]{"丽江区", "南宁"}); - add(new String[]{"丽江花园丽荃楼", "广州"}); - add(new String[]{"丽江花园丽波楼", "广州"}); - add(new String[]{"丽江新都", "宁波"}); - add(new String[]{"丽江花园", "中山"}); - add(new String[]{"丽江名庭", "宁波"}); - add(new String[]{"丽江公寓", "三亚"}); - add(new String[]{"丽江花园", "温州"}); - add(new String[]{"丽江翠园", "长沙"}); - add(new String[]{"丽江水花园", "郑州"}); - add(new String[]{"丽江度假公寓", "三亚"}); - add(new String[]{"丽江新村", "广州"}); - add(new String[]{"丽江花园王台别墅", "广州"}); - add(new String[]{"丽江花园康城居", "广州"}); - add(new String[]{"丽江花园萃锦苑", "广州"}); - add(new String[]{"丽江花园星海洲", "广州"}); - add(new String[]{"丽江花园德字楼", "广州"}); - add(new String[]{"丽江花园棕榈滩", "广州"}); - add(new String[]{"丽江花园华林居", "广州"}); - add(new String[]{"丽江半岛花园", "石家庄"}); - add(new String[]{"丽江新居", "武汉"}); - add(new String[]{"丽江苑", "武汉"}); - add(new String[]{"丽江豪庭", "赣州"}); - add(new String[]{"丽江公馆", "赣州"}); - add(new String[]{"丽江豪庭", "佛山"}); - add(new String[]{"丽江村", "南宁"}); - add(new String[]{"丽江花苑", "温州"}); - add(new String[]{"丽江花园4期丽园盛景", "中山"}); - add(new String[]{"丽江花园", "南宁"}); - add(new String[]{"丽江花园萃锦苑别墅", "广州"}); - add(new String[]{"丽江花园二期", "中山"}); - add(new String[]{"丽江花园一期", "中山"}); - add(new String[]{"丽江花园四期", "中山"}); - add(new String[]{"丽江一期", "中山"}); - add(new String[]{"丽江花园", "惠州"}); - add(new String[]{"丽江花园丽彦楼", "广州"}); - add(new String[]{"丽江花园丽茵楼", "广州"}); - add(new String[]{"丽江花园丽影楼", "广州"}); - add(new String[]{"丽江翠园山水郡", "长沙"}); - add(new String[]{"丽江锦庭", "上海"}); - add(new String[]{"丽江村小区", "南宁"}); - add(new String[]{"丽江苑", "上海"}); - add(new String[]{"丽江佳苑", "上海"}); - add(new String[]{"丽江豪庭", "顺德"}); - add(new String[]{"丽江苑", "肇庆"}); - add(new String[]{"丽江名庭", "奉化"}); - add(new String[]{"丽江小区", "重庆"}); - add(new String[]{"丽江天下", "丽江"}); - add(new String[]{"丽江万隆花园", "丽江"}); - add(new String[]{"丽江古城狮子山", "丽江"}); - add(new String[]{"丽江北门坡", "丽江"}); - add(new String[]{"丽江古城", "丽江"}); - add(new String[]{"丽江假日", "丽江"}); - add(new String[]{"丽江人家3期", "丽江"}); - add(new String[]{"丽江人家第三期", "丽江"}); - add(new String[]{"丽江人家文笔园", "丽江"}); - add(new String[]{"丽江民居", "丽江"}); - add(new String[]{"丽江人家文笔苑", "丽江"}); - add(new String[]{"丽江人家片区玉龙园", "丽江"}); - add(new String[]{"丽江古城高尔夫别墅", "丽江"}); - add(new String[]{"丽江1号别墅", "丽江"}); - add(new String[]{"丽江人家", "丽江"}); - add(new String[]{"丽江映像", "丽江"}); - add(new String[]{"丽江人家三期", "丽江"}); - add(new String[]{"丽江人家文泽园", "丽江"}); - add(new String[]{"丽江印象", "丽江"}); - add(new String[]{"丽江1号", "丽江"}); - add(new String[]{"丽江家园", "丽江"}); - add(new String[]{"丽江名居", "丽江"}); - add(new String[]{"丽江一号", "丽江"}); - add(new String[]{"丽江人家玉龙园", "丽江"}); - add(new String[]{"丽江花园", "玉林"}); - add(new String[]{"丽江城", "河源"}); - add(new String[]{"丽江豪庭", "河源"}); - add(new String[]{"丽江雅苑", "阳江"}); - add(new String[]{"丽江阳天下", "丽江"}); - add(new String[]{"丽江人家白玉园", "丽江"}); - add(new String[]{"丽江苑", "六盘水"}); - add(new String[]{"丽江鱼米河", "丽江"}); - add(new String[]{"丽江古城民居", "丽江"}); - }}); - city_DistrictNames.put("黑龙江", new ArrayList(){{ - }}); - city_DistrictNames.put("哈尔滨", new ArrayList(){{ - add(new String[]{"哈尔滨星光耀广场", "哈尔滨"}); - }}); - city_DistrictNames.put("辽宁", new ArrayList(){{ - add(new String[]{"辽宁中医家属楼", "沈阳"}); - add(new String[]{"辽宁里", "天津"}); - }}); - city_DistrictNames.put("盘锦", new ArrayList(){{ - add(new String[]{"盘锦花园", "南京"}); - add(new String[]{"盘锦华府", "南京"}); - add(new String[]{"盘锦漫步中海", "盘锦"}); - add(new String[]{"盘锦馨悦小区", "盘锦"}); - }}); - city_DistrictNames.put("浙江", new ArrayList(){{ - add(new String[]{"浙江工业大学教师宿舍", "杭州"}); - add(new String[]{"浙江大厦", "太原"}); - add(new String[]{"浙江办事处宿舍", "太原"}); - add(new String[]{"浙江仁和居老年养生公寓", "湖州"}); - add(new String[]{"浙江交运大厦", "杭州"}); - add(new String[]{"浙江工商大学宿舍", "杭州"}); - add(new String[]{"浙江商贸城", "合肥"}); - add(new String[]{"浙江工业大学之江学院", "杭州"}); - }}); - city_DistrictNames.put("温州", new ArrayList(){{ - add(new String[]{"温州大厦", "海口"}); - add(new String[]{"温州城", "贵阳"}); - add(new String[]{"温州公寓", "贵阳"}); - add(new String[]{"温州商城", "湖州"}); - add(new String[]{"温州商城", "唐山"}); - add(new String[]{"温州世贸中心大厦", "温州"}); - add(new String[]{"温州世贸中心广场", "温州"}); - add(new String[]{"温州人才大厦", "温州"}); - add(new String[]{"温州龙湾万达广场", "温州"}); - add(new String[]{"温州城·都乐汇", "沈阳"}); - add(new String[]{"温州商城", "金华"}); - }}); - city_DistrictNames.put("瑞安", new ArrayList(){{ - add(new String[]{"瑞安创逸", "广州"}); - add(new String[]{"瑞安花园", "佛山"}); - add(new String[]{"瑞安花园", "广州"}); - add(new String[]{"瑞安重庆天地", "重庆"}); - add(new String[]{"瑞安小区", "重庆"}); - add(new String[]{"瑞安花园", "中山"}); - add(new String[]{"瑞安名邸", "南通"}); - add(new String[]{"瑞安大厦", "温州"}); - add(new String[]{"瑞安苑", "成都"}); - add(new String[]{"瑞安家园", "大连"}); - add(new String[]{"瑞安大厦", "长沙"}); - add(new String[]{"瑞安·君汇", "北京"}); - add(new String[]{"瑞安雅景苑", "瑞安"}); - add(new String[]{"瑞安大厦", "瑞安"}); - add(new String[]{"瑞安宏瑞大厦", "瑞安"}); - add(new String[]{"瑞安市兴隆家园", "瑞安"}); - add(new String[]{"瑞安花园", "衡阳"}); - add(new String[]{"瑞安楼", "河源"}); - add(new String[]{"瑞安时代大厦", "温州"}); - add(new String[]{"瑞安雅景苑", "温州"}); - add(new String[]{"瑞安新世纪大厦", "温州"}); - }}); - city_DistrictNames.put("河北", new ArrayList(){{ - add(new String[]{"河北税务学校生活区", "石家庄"}); - add(new String[]{"河北经济日报社宿舍", "石家庄"}); - add(new String[]{"河北美术出版社宿舍", "石家庄"}); - add(new String[]{"河北物资宿舍", "石家庄"}); - add(new String[]{"河北化工医药职业技术学院宿舍", "石家庄"}); - add(new String[]{"河北电机宿舍", "石家庄"}); - add(new String[]{"河北日报社宿舍", "石家庄"}); - add(new String[]{"河北工程造价管理总站宿舍", "石家庄"}); - add(new String[]{"河北康城", "潍坊"}); - add(new String[]{"河北社区", "沈阳"}); - add(new String[]{"河北医科大学宿舍", "石家庄"}); - add(new String[]{"河北省人大宿舍", "石家庄"}); - add(new String[]{"河北新人家", "唐山"}); - add(new String[]{"河北一号", "唐山"}); - add(new String[]{"河北机要局宿舍", "石家庄"}); - add(new String[]{"河北广播电视报宿舍", "石家庄"}); - add(new String[]{"河北商城", "青岛"}); - add(new String[]{"河北长城饭店", "石家庄"}); - add(new String[]{"河北村小区", "北京"}); - add(new String[]{"河北桃江里", "天津"}); - add(new String[]{"河北师大青年公寓楼", "石家庄"}); - add(new String[]{"河北绛", "无锡"}); - add(new String[]{"河北社区", "本溪"}); - add(new String[]{"河北楼", "唐山"}); - }}); - city_DistrictNames.put("廊坊", new ArrayList(){{ - add(new String[]{"廊坊万达广场", "廊坊"}); - }}); - city_DistrictNames.put("四川", new ArrayList(){{ - add(new String[]{"四川省直机关工委宿舍", "成都"}); - add(new String[]{"四川省林业厅宿舍", "成都"}); - add(new String[]{"四川音乐学院宿舍", "成都"}); - add(new String[]{"四川省闽中市驻疆办事处小区", "乌鲁木齐"}); - add(new String[]{"四川大厦", "厦门"}); - add(new String[]{"四川省科技厅宿舍", "成都"}); - add(new String[]{"四川专用汽车厂宿舍", "成都"}); - add(new String[]{"四川日报宿舍", "成都"}); - add(new String[]{"四川艺术职业学院家属楼", "成都"}); - add(new String[]{"四川营胡同", "北京"}); - add(new String[]{"四川小区", "上海"}); - add(new String[]{"四川幼师宿舍", "成都"}); - add(new String[]{"四川大学农林村", "成都"}); - }}); - city_DistrictNames.put("成都", new ArrayList(){{ - add(new String[]{"成都国际公寓", "成都"}); - add(new String[]{"成都高速大厦", "成都"}); - add(new String[]{"成都血液中心小区", "成都"}); - add(new String[]{"成都花园别墅", "成都"}); - add(new String[]{"成都花园", "成都"}); - add(new String[]{"成都民航宿舍", "成都"}); - add(new String[]{"成都卷烟厂宿舍", "成都"}); - add(new String[]{"成都华侨城纯水岸", "成都"}); - add(new String[]{"成都花园", "三亚"}); - add(new String[]{"成都新天地", "成都"}); - add(new String[]{"成都ICC", "成都"}); - add(new String[]{"成都雅居乐花园", "成都"}); - add(new String[]{"成都华侨城东岸", "成都"}); - add(new String[]{"成都后花园二期", "成都"}); - add(new String[]{"成都绿地中心468公馆", "成都"}); - add(new String[]{"成都花园上城", "成都"}); - add(new String[]{"成都森林", "成都"}); - add(new String[]{"成都后花园", "成都"}); - add(new String[]{"成都金牛万达广场", "成都"}); - add(new String[]{"成都电力局宿舍", "成都"}); - add(new String[]{"成都玉园", "成都"}); - add(new String[]{"成都国奥村", "成都"}); - add(new String[]{"成都花园翠雍华庭", "成都"}); - add(new String[]{"成都早晨", "成都"}); - add(new String[]{"成都合院", "成都"}); - add(new String[]{"成都后花园国宾红葉", "成都"}); - add(new String[]{"成都合院之学院壹品", "成都"}); - add(new String[]{"成都后花园二期别墅", "成都"}); - add(new String[]{"成都棕榈泉国际中心", "成都"}); - add(new String[]{"成都大魔方", "成都"}); - add(new String[]{"成都A区", "成都"}); - add(new String[]{"成都大学教师公寓", "成都"}); - }}); - city_DistrictNames.put("江苏", new ArrayList(){{ - add(new String[]{"江苏省农科院", "南京"}); - add(new String[]{"江苏油田石油山庄", "扬州"}); - add(new String[]{"江苏警官学院", "南京"}); - add(new String[]{"江苏省高级专家园", "南京"}); - add(new String[]{"江苏油田石油山庄", "扬州"}); - add(new String[]{"江苏议事园", "南京"}); - add(new String[]{"江苏国际塑化城", "常州"}); - add(new String[]{"江苏万和国际商贸城", "常州"}); - }}); - city_DistrictNames.put("泰州", new ArrayList(){{ - add(new String[]{"泰州碧桂园", "泰州"}); - add(new String[]{"泰州华侨城纯水岸", "泰州"}); - add(new String[]{"泰州美好家园", "泰州"}); - }}); - city_DistrictNames.put("山西", new ArrayList(){{ - add(new String[]{"山西教育出版局宿舍", "太原"}); - add(new String[]{"山西政府家属院", "天津"}); - add(new String[]{"山西省电力堪测设计院宿舍", "太原"}); - add(new String[]{"山西煤炭职工培训中心宿舍", "太原"}); - add(new String[]{"山西医科大学家属楼", "太原"}); - add(new String[]{"山西电力杏花岭小区", "太原"}); - add(new String[]{"山西报社宿舍楼", "太原"}); - add(new String[]{"山西省医药公司住宅小区", "太原"}); - add(new String[]{"山西省文物局宿舍", "太原"}); - add(new String[]{"山西汽运集团东岗路宿舍", "太原"}); - add(new String[]{"山西省地质科研所地矿小区", "太原"}); - add(new String[]{"山西省供销学校宿舍", "太原"}); - add(new String[]{"山西省汾河水库管理局宿舍", "太原"}); - add(new String[]{"山西广播电视大学宿舍", "太原"}); - add(new String[]{"山西省体育局宿舍", "太原"}); - add(new String[]{"山西省水产科学研究院宿舍", "太原"}); - add(new String[]{"山西社会主义学院宿舍", "太原"}); - add(new String[]{"山西省经济信息中心宿舍", "太原"}); - add(new String[]{"山西省气象台宿舍", "太原"}); - add(new String[]{"山西省电力公司宿舍", "太原"}); - add(new String[]{"山西省农机局宿舍", "太原"}); - add(new String[]{"山西省机电设计研究院宿舍", "太原"}); - add(new String[]{"山西医科大学家属楼北院", "太原"}); - add(new String[]{"山西省歌舞剧院宿舍", "太原"}); - add(new String[]{"山西省轻工宿舍", "太原"}); - add(new String[]{"山西煤炭职业技术学院宿舍", "太原"}); - add(new String[]{"山西省交通监理公司宿舍", "太原"}); - add(new String[]{"山西交通职业技术学院家属楼", "太原"}); - add(new String[]{"山西大学宿舍", "太原"}); - add(new String[]{"山西省轻工建设公司宿舍", "太原"}); - add(new String[]{"山西省送变电宿舍", "太原"}); - add(new String[]{"山西省建筑科学研究院公房", "太原"}); - add(new String[]{"山西省物资管理储备局并州北路家属院小区", "太原"}); - add(new String[]{"山西省盐业储运公司宿舍", "太原"}); - add(new String[]{"山西省地震局宿舍", "太原"}); - add(new String[]{"山西省展览馆宿舍", "太原"}); - add(new String[]{"山西无线电厂宿舍", "太原"}); - add(new String[]{"山西无线电厂小区", "太原"}); - add(new String[]{"山西金金业集团宿舍", "太原"}); - add(new String[]{"山西省自动化研究所宿舍", "太原"}); - add(new String[]{"山西煤矿厅局宿舍", "太原"}); - add(new String[]{"山西高速管理局宿舍", "太原"}); - add(new String[]{"山西省木材公司宿舍", "太原"}); - add(new String[]{"山西省医药与生命科学研究院", "太原"}); - add(new String[]{"山西纸张公司宿舍", "太原"}); - add(new String[]{"山西焦煤集团滨河小区", "太原"}); - add(new String[]{"山西宏安国际大厦", "太原"}); - add(new String[]{"山西园", "杭州"}); - add(new String[]{"山西南村", "南京"}); - add(new String[]{"山西证券大厦", "西安"}); - add(new String[]{"山西职业技术学院宿舍", "太原"}); - add(new String[]{"山西建筑职业技术学院宿舍", "太原"}); - add(new String[]{"山西省少管所宿舍", "太原"}); - add(new String[]{"山西日报宿舍", "太原"}); - add(new String[]{"山西建筑学院", "太原"}); - add(new String[]{"山西世贸中心", "太原"}); - add(new String[]{"山西国际贸易中心", "太原"}); - add(new String[]{"山西小区", "上海"}); - add(new String[]{"山西新村", "金华"}); - }}); - city_DistrictNames.put("太原", new ArrayList(){{ - add(new String[]{"太原卫校长风小区", "太原"}); - add(new String[]{"太原刚玉生活区", "太原"}); - add(new String[]{"太原富力现代广场", "太原"}); - add(new String[]{"太原恒大绿洲", "太原"}); - add(new String[]{"太原市政建设开发处宿舍", "太原"}); - add(new String[]{"太原师范学院宿舍", "太原"}); - add(new String[]{"太原理工大社区住宅小区东院", "太原"}); - add(new String[]{"太原大学师范学院宿舍", "太原"}); - add(new String[]{"太原长城光电子工业公司宿舍", "太原"}); - add(new String[]{"太原警备区家属院", "太原"}); - add(new String[]{"太原电视台宿舍小区", "太原"}); - add(new String[]{"太原理工大社区住宅小区西院", "太原"}); - add(new String[]{"太原市园林局宿舍", "太原"}); - add(new String[]{"太原大学小区", "太原"}); - add(new String[]{"太原理工大学西区宿舍", "太原"}); - add(new String[]{"太原市中心医院宿舍", "太原"}); - add(new String[]{"太原新华印刷厂宿舍", "太原"}); - add(new String[]{"太原市机电公司宿舍", "太原"}); - add(new String[]{"太原市实验中学宿舍", "太原"}); - add(new String[]{"太原市公司宿舍", "太原"}); - add(new String[]{"太原市地方税务局直属分局宿舍", "太原"}); - add(new String[]{"太原刚玉砂轮小区", "太原"}); - add(new String[]{"太原市中医院宿舍", "太原"}); - add(new String[]{"太原中药厂宿舍", "太原"}); - add(new String[]{"太原市第四军区干休所", "太原"}); - add(new String[]{"太原市塑料四厂宿舍", "太原"}); - add(new String[]{"太原市疾病预防控制中心宿舍", "太原"}); - add(new String[]{"太原日报社宿舍", "太原"}); - add(new String[]{"太原农牧场宿舍", "太原"}); - add(new String[]{"太原市园林绿化工程队宿舍", "太原"}); - add(new String[]{"太原市交通局宿舍", "太原"}); - add(new String[]{"太原市木材公司宿舍", "太原"}); - add(new String[]{"太原市燕科公司宿舍", "太原"}); - add(new String[]{"太原理工大学长风住宅小区", "太原"}); - add(new String[]{"太原市第一建筑公司宿舍", "太原"}); - add(new String[]{"太原燃料公司宿舍", "太原"}); - add(new String[]{"太原通信分公司小新城住宅小区", "太原"}); - add(new String[]{"太原市国税局宿舍", "太原"}); - add(new String[]{"太原时代", "沈阳"}); - add(new String[]{"太原小区", "沈阳"}); - add(new String[]{"太原佳园", "沈阳"}); - add(new String[]{"太原柳巷铜锣湾宝地小区", "太原"}); - add(new String[]{"太原工程职业技术学院宿舍", "太原"}); - add(new String[]{"太原钢丝厂宿舍", "太原"}); - add(new String[]{"太原金鼎国际商务中心", "太原"}); - add(new String[]{"太原万达公馆", "太原"}); - add(new String[]{"太原奥林匹克花园", "太原"}); - add(new String[]{"太原别墅", "上海"}); - add(new String[]{"太原邸", "上海"}); - add(new String[]{"太原星河湾三期", "太原"}); - }}); - city_DistrictNames.put("四川", new ArrayList(){{ - add(new String[]{"四川省直机关工委宿舍", "成都"}); - add(new String[]{"四川省林业厅宿舍", "成都"}); - add(new String[]{"四川音乐学院宿舍", "成都"}); - add(new String[]{"四川省闽中市驻疆办事处小区", "乌鲁木齐"}); - add(new String[]{"四川大厦", "厦门"}); - add(new String[]{"四川省科技厅宿舍", "成都"}); - add(new String[]{"四川专用汽车厂宿舍", "成都"}); - add(new String[]{"四川日报宿舍", "成都"}); - add(new String[]{"四川艺术职业学院家属楼", "成都"}); - add(new String[]{"四川营胡同", "北京"}); - add(new String[]{"四川小区", "上海"}); - add(new String[]{"四川幼师宿舍", "成都"}); - add(new String[]{"四川大学农林村", "成都"}); - }}); - city_DistrictNames.put("攀枝花", new ArrayList(){{ - add(new String[]{"攀枝花苑", "海口"}); - }}); - city_DistrictNames.put("广东", new ArrayList(){{ - add(new String[]{"广东外贸广场", "广州"}); - add(new String[]{"广东外语艺术学院教师宿舍", "广州"}); - add(new String[]{"广东建科院宿舍", "广州"}); - add(new String[]{"广东司法警官职业学院宿舍", "广州"}); - add(new String[]{"广东环保大厦", "广州"}); - add(new String[]{"广东商业大厦", "广州"}); - add(new String[]{"广东医学院教师宿舍楼", "东莞"}); - add(new String[]{"广东国际大厦", "广州"}); - add(new String[]{"广东省技术监督局宿舍", "广州"}); - add(new String[]{"广东工业大学宿舍", "广州"}); - add(new String[]{"广东教育学院宿舍", "广州"}); - add(new String[]{"广东省银行大厦", "深圳"}); - add(new String[]{"广东大厦", "天津"}); - add(new String[]{"广东山庄", "镇江"}); - add(new String[]{"广东红盾大厦", "广州"}); - add(new String[]{"广东药学院宿舍", "广州"}); - add(new String[]{"广东青年干部学院宿舍", "广州"}); - add(new String[]{"广东基础楼", "深圳"}); - add(new String[]{"广东省科技干部学院宿舍", "广州"}); - add(new String[]{"广东省农业管理干部学院社区", "广州"}); - add(new String[]{"广东芭蕾雨·逸景", "佛山"}); - }}); - city_DistrictNames.put("珠海", new ArrayList(){{ - add(new String[]{"珠海市吉大九洲蓝湾花园", "珠海"}); - add(new String[]{"珠海里", "天津"}); - add(new String[]{"珠海新村", "昆山"}); - add(new String[]{"珠海二区", "青岛"}); - add(new String[]{"珠海雅苑", "青岛"}); - add(new String[]{"珠海都市花园", "大理"}); - add(new String[]{"珠海锦绣阳光花园", "温州"}); - }}); - city_DistrictNames.put("江苏", new ArrayList(){{ - add(new String[]{"江苏省农科院", "南京"}); - add(new String[]{"江苏油田石油山庄", "扬州"}); - add(new String[]{"江苏警官学院", "南京"}); - add(new String[]{"江苏省高级专家园", "南京"}); - add(new String[]{"江苏油田石油山庄", "扬州"}); - add(new String[]{"江苏议事园", "南京"}); - add(new String[]{"江苏国际塑化城", "常州"}); - add(new String[]{"江苏万和国际商贸城", "常州"}); - }}); - city_DistrictNames.put("镇江", new ArrayList(){{ - add(new String[]{"镇江里", "天津"}); - add(new String[]{"镇江新区国际会议中心", "镇江"}); - add(new String[]{"镇江亿都家居建材城", "镇江"}); - add(new String[]{"镇江旭辉朗香郡", "镇江"}); - add(new String[]{"镇江万达广场", "镇江"}); - }}); - city_DistrictNames.put("江苏", new ArrayList(){{ - add(new String[]{"江苏省农科院", "南京"}); - add(new String[]{"江苏油田石油山庄", "扬州"}); - add(new String[]{"江苏警官学院", "南京"}); - add(new String[]{"江苏省高级专家园", "南京"}); - add(new String[]{"江苏油田石油山庄", "扬州"}); - add(new String[]{"江苏议事园", "南京"}); - add(new String[]{"江苏国际塑化城", "常州"}); - add(new String[]{"江苏万和国际商贸城", "常州"}); - }}); - city_DistrictNames.put("苏州", new ArrayList(){{ - add(new String[]{"苏州北巷", "大连"}); - add(new String[]{"苏州里", "天津"}); - add(new String[]{"苏州花园一期", "乌鲁木齐"}); - add(new String[]{"苏州花园二期", "乌鲁木齐"}); - add(new String[]{"苏州花园", "宿迁"}); - add(new String[]{"苏州小区", "北京"}); - add(new String[]{"苏州公寓", "北京"}); - add(new String[]{"苏州幻象", "济南"}); - add(new String[]{"苏州凤凰文化广场", "苏州"}); - add(new String[]{"苏州国际轻纺城", "苏州"}); - add(new String[]{"苏州世茂运河城", "苏州"}); - add(new String[]{"苏州市沧浪科技创业园", "苏州"}); - add(new String[]{"苏州高新区人力资源大厦", "苏州"}); - add(new String[]{"苏州新东方汽配城", "苏州"}); - add(new String[]{"苏州礼品商品城", "苏州"}); - add(new String[]{"苏州沿海国际中心", "苏州"}); - add(new String[]{"苏州机电五金城", "苏州"}); - add(new String[]{"苏州市沧浪科技创业园东区", "苏州"}); - add(new String[]{"苏州世茂广场公寓", "苏州"}); - }}); - city_DistrictNames.put("江苏", new ArrayList(){{ - add(new String[]{"江苏省农科院", "南京"}); - add(new String[]{"江苏油田石油山庄", "扬州"}); - add(new String[]{"江苏警官学院", "南京"}); - add(new String[]{"江苏省高级专家园", "南京"}); - add(new String[]{"江苏油田石油山庄", "扬州"}); - add(new String[]{"江苏议事园", "南京"}); - add(new String[]{"江苏国际塑化城", "常州"}); - add(new String[]{"江苏万和国际商贸城", "常州"}); - }}); - city_DistrictNames.put("苏州", new ArrayList(){{ - add(new String[]{"苏州北巷", "大连"}); - add(new String[]{"苏州里", "天津"}); - add(new String[]{"苏州花园一期", "乌鲁木齐"}); - add(new String[]{"苏州花园二期", "乌鲁木齐"}); - add(new String[]{"苏州花园", "宿迁"}); - add(new String[]{"苏州小区", "北京"}); - add(new String[]{"苏州公寓", "北京"}); - add(new String[]{"苏州幻象", "济南"}); - add(new String[]{"苏州凤凰文化广场", "苏州"}); - add(new String[]{"苏州国际轻纺城", "苏州"}); - add(new String[]{"苏州世茂运河城", "苏州"}); - add(new String[]{"苏州市沧浪科技创业园", "苏州"}); - add(new String[]{"苏州高新区人力资源大厦", "苏州"}); - add(new String[]{"苏州新东方汽配城", "苏州"}); - add(new String[]{"苏州礼品商品城", "苏州"}); - add(new String[]{"苏州沿海国际中心", "苏州"}); - add(new String[]{"苏州机电五金城", "苏州"}); - add(new String[]{"苏州市沧浪科技创业园东区", "苏州"}); - add(new String[]{"苏州世茂广场公寓", "苏州"}); - }}); - city_DistrictNames.put("吴江", new ArrayList(){{ - add(new String[]{"吴江振泰小区", "苏州"}); - add(new String[]{"吴江时代家园", "苏州"}); - add(new String[]{"吴江凤凰花园", "苏州"}); - add(new String[]{"吴江中央花园", "苏州"}); - add(new String[]{"吴江湖滨花园", "苏州"}); - add(new String[]{"吴江名城花园", "苏州"}); - add(new String[]{"吴江供电小区", "苏州"}); - add(new String[]{"吴江公安新村", "苏州"}); - add(new String[]{"吴江湖滨花园", "吴江"}); - add(new String[]{"吴江名城花园", "吴江"}); - add(new String[]{"吴江时代家园", "吴江"}); - add(new String[]{"吴江凤凰花园", "吴江"}); - add(new String[]{"吴江中央花园", "吴江"}); - add(new String[]{"吴江丽都国际", "吴江"}); - add(new String[]{"吴江公安新村", "吴江"}); - add(new String[]{"吴江供电小区", "吴江"}); - add(new String[]{"吴江振泰小区", "吴江"}); - add(new String[]{"吴江绿地中心", "苏州"}); - add(new String[]{"吴江赛格广场", "苏州"}); - }}); - city_DistrictNames.put("浙江", new ArrayList(){{ - add(new String[]{"浙江工业大学教师宿舍", "杭州"}); - add(new String[]{"浙江大厦", "太原"}); - add(new String[]{"浙江办事处宿舍", "太原"}); - add(new String[]{"浙江仁和居老年养生公寓", "湖州"}); - add(new String[]{"浙江交运大厦", "杭州"}); - add(new String[]{"浙江工商大学宿舍", "杭州"}); - add(new String[]{"浙江商贸城", "合肥"}); - add(new String[]{"浙江工业大学之江学院", "杭州"}); - }}); - city_DistrictNames.put("金华", new ArrayList(){{ - add(new String[]{"金华里", "北京"}); - add(new String[]{"金华苑", "海口"}); - add(new String[]{"金华新村", "大连"}); - add(new String[]{"金华公寓", "青岛"}); - add(new String[]{"金华园", "中山"}); - add(new String[]{"金华花园", "东莞"}); - add(new String[]{"金华世家", "贵阳"}); - add(new String[]{"金华园", "贵阳"}); - add(new String[]{"金华花园", "广州"}); - add(new String[]{"金华新村", "杭州"}); - add(new String[]{"金华苑", "潍坊"}); - add(new String[]{"金华丽小区", "潍坊"}); - add(new String[]{"金华花园", "重庆"}); - add(new String[]{"金华阁", "深圳"}); - add(new String[]{"金华大厦大渡口", "重庆"}); - add(new String[]{"金华苑小区", "重庆"}); - add(new String[]{"金华里", "天津"}); - add(new String[]{"金华小区", "石家庄"}); - add(new String[]{"金华大厦", "重庆"}); - add(new String[]{"金华园", "重庆"}); - add(new String[]{"金华云鼎", "重庆"}); - add(new String[]{"金华园", "沈阳"}); - add(new String[]{"金华公寓", "成都"}); - add(new String[]{"金华苑", "成都"}); - add(new String[]{"金华大厦", "武汉"}); - add(new String[]{"金华学府", "呼和浩特"}); - add(new String[]{"金华世家别墅", "贵阳"}); - add(new String[]{"金华公寓", "福州"}); - add(new String[]{"金华小区", "大连"}); - add(new String[]{"金华里(西青)", "天津"}); - add(new String[]{"金华楼", "厦门"}); - add(new String[]{"金华苑", "兰州"}); - add(new String[]{"金华园别墅", "北京"}); - add(new String[]{"金华小区三期", "大连"}); - add(new String[]{"金华花园", "中山"}); - add(new String[]{"金华园", "佛山"}); - add(new String[]{"金华苑", "青岛"}); - add(new String[]{"金华小区二期", "大连"}); - add(new String[]{"金华园", "昆明"}); - add(new String[]{"金华苑", "上海"}); - add(new String[]{"金华园", "北京"}); - add(new String[]{"金华新村", "上海"}); - add(new String[]{"金华公司宿舍", "昆明"}); - add(new String[]{"金华苑", "平顶山"}); - add(new String[]{"金华家园 ", "盘锦"}); - add(new String[]{"金华家园", "盘锦"}); - add(new String[]{"金华万达广场", "金华"}); - add(new String[]{"金华世贸中心", "金华"}); - add(new String[]{"金华汽配城二期", "金华"}); - add(new String[]{"金华巷一号", "攀枝花"}); - }}); - city_DistrictNames.put("江苏", new ArrayList(){{ - add(new String[]{"江苏省农科院", "南京"}); - add(new String[]{"江苏油田石油山庄", "扬州"}); - add(new String[]{"江苏警官学院", "南京"}); - add(new String[]{"江苏省高级专家园", "南京"}); - add(new String[]{"江苏油田石油山庄", "扬州"}); - add(new String[]{"江苏议事园", "南京"}); - add(new String[]{"江苏国际塑化城", "常州"}); - add(new String[]{"江苏万和国际商贸城", "常州"}); - }}); - city_DistrictNames.put("无锡", new ArrayList(){{ - add(new String[]{"无锡大厦", "上海"}); - add(new String[]{"无锡滨湖万达广场", "无锡"}); - add(new String[]{"无锡碧桂园", "无锡"}); - add(new String[]{"无锡世界贸易中心一期世贸公寓", "无锡"}); - add(new String[]{"无锡洛城橙郡", "无锡"}); - add(new String[]{"无锡塞纳庄园", "宜兴"}); - add(new String[]{"无锡玉兰花园", "宜兴"}); - }}); - city_DistrictNames.put("广东", new ArrayList(){{ - add(new String[]{"广东外贸广场", "广州"}); - add(new String[]{"广东外语艺术学院教师宿舍", "广州"}); - add(new String[]{"广东建科院宿舍", "广州"}); - add(new String[]{"广东司法警官职业学院宿舍", "广州"}); - add(new String[]{"广东环保大厦", "广州"}); - add(new String[]{"广东商业大厦", "广州"}); - add(new String[]{"广东医学院教师宿舍楼", "东莞"}); - add(new String[]{"广东国际大厦", "广州"}); - add(new String[]{"广东省技术监督局宿舍", "广州"}); - add(new String[]{"广东工业大学宿舍", "广州"}); - add(new String[]{"广东教育学院宿舍", "广州"}); - add(new String[]{"广东省银行大厦", "深圳"}); - add(new String[]{"广东大厦", "天津"}); - add(new String[]{"广东山庄", "镇江"}); - add(new String[]{"广东红盾大厦", "广州"}); - add(new String[]{"广东药学院宿舍", "广州"}); - add(new String[]{"广东青年干部学院宿舍", "广州"}); - add(new String[]{"广东基础楼", "深圳"}); - add(new String[]{"广东省科技干部学院宿舍", "广州"}); - add(new String[]{"广东省农业管理干部学院社区", "广州"}); - add(new String[]{"广东芭蕾雨·逸景", "佛山"}); - }}); - city_DistrictNames.put("广州", new ArrayList(){{ - add(new String[]{"广州卫生厅大院", "广州"}); - add(new String[]{"广州雅居乐花园雅逸庭", "广州"}); - add(new String[]{"广州客车厂宿舍", "广州"}); - add(new String[]{"广州后花园", "清远"}); - add(new String[]{"广州后花园", "清远"}); - add(new String[]{"广州雅居乐花园浅山小筑", "广州"}); - add(new String[]{"广州雅居乐花园雅悦庭", "广州"}); - add(new String[]{"广州雅居乐花园雅翠庭", "广州"}); - add(new String[]{"广州奥林匹克花园", "广州"}); - add(new String[]{"广州雅居乐花园邻居", "广州"}); - add(new String[]{"广州雅居乐花园逸心园", "广州"}); - add(new String[]{"广州大学教师楼", "广州"}); - add(new String[]{"广州市社会福利院宿舍", "广州"}); - add(new String[]{"广州体育学院宿舍", "广州"}); - add(new String[]{"广州市食品宿舍", "广州"}); - add(new String[]{"广州湾时代广场", "湛江"}); - add(new String[]{"广州军区房管所宿舍", "武汉"}); - add(new String[]{"广州新塘新世界花园", "广州"}); - add(new String[]{"广州空港假日别墅酒店", "广州"}); - add(new String[]{"广州星河丹堤", "广州"}); - add(new String[]{"广州雅居乐花园十年小雅", "广州"}); - add(new String[]{"广州雅居乐花园花巷", "广州"}); - add(new String[]{"广州雅居乐花园峰会", "广州"}); - add(new String[]{"广州雅居乐花园御景峰别墅", "广州"}); - add(new String[]{"广州碧桂园福苑", "广州"}); - add(new String[]{"广州碧桂园华苑", "广州"}); - add(new String[]{"广州碧桂园雅苑", "广州"}); - add(new String[]{"广州碧桂园美苑", "广州"}); - add(new String[]{"广州碧桂园乐苑", "广州"}); - add(new String[]{"广州碧桂园锦苑", "广州"}); - add(new String[]{"广州雅居乐花园·欧洲故事", "广州"}); - add(new String[]{"广州雅居乐花园灏湖居", "广州"}); - add(new String[]{"广州雅居乐花园雅湖居", "广州"}); - add(new String[]{"广州雅居乐花园", "广州"}); - add(new String[]{"广州雅居乐花园一尺山居", "广州"}); - add(new String[]{"广州雅居乐花园·新地", "广州"}); - add(new String[]{"广州雅居乐花园·天域", "广州"}); - add(new String[]{"广州雅居乐花园·挪威森林", "广州"}); - add(new String[]{"广州雅居乐花园雕刻时光", "广州"}); - add(new String[]{"广州碧桂园秀苑", "广州"}); - add(new String[]{"广州雅居乐花园上善若水", "广州"}); - add(new String[]{"广州港瑞酒店公寓", "广州"}); - add(new String[]{"广州亚运城·天誉", "广州"}); - add(new String[]{"广州白天鹅花园", "广州"}); - add(new String[]{"广州碧桂园绿茵苑", "广州"}); - add(new String[]{"广州雅居乐花园时光九篇", "广州"}); - add(new String[]{"广州碧桂园康苑", "广州"}); - add(new String[]{"广州海运大厦", "广州"}); - add(new String[]{"广州有色金属研究院", "广州"}); - add(new String[]{"广州碧桂园丽苑", "广州"}); - add(new String[]{"广州碧桂园翠苑", "广州"}); - add(new String[]{"广州富力城", "广州"}); - add(new String[]{"广州碧桂园", "广州"}); - add(new String[]{"广州新塘新世界花园", "增城"}); - }}); - city_DistrictNames.put("海南", new ArrayList(){{ - add(new String[]{"海南之心", "海口"}); - add(new String[]{"海南大学南希科技苑", "海口"}); - add(new String[]{"海南日报社宿舍", "海口"}); - add(new String[]{"海南省审计机关美舍住宅区", "海口"}); - add(new String[]{"海南社保", "海口"}); - add(new String[]{"海南省人大常委会机关住宅小区", "海口"}); - add(new String[]{"海南大学教师宿舍", "海口"}); - add(new String[]{"海南燃化公司宿舍", "海口"}); - add(new String[]{"海南省体校宿舍", "海口"}); - add(new String[]{"海南统计局宿舍", "海口"}); - add(new String[]{"海南省工商银行宿舍", "海口"}); - add(new String[]{"海南工商大厦", "海口"}); - add(new String[]{"海南时代广场", "海口"}); - add(new String[]{"海南师范学院金花园", "海口"}); - add(new String[]{"海南大厦", "海口"}); - add(new String[]{"海南电力厂宿舍", "海口"}); - add(new String[]{"海南省三亚六建单位", "三亚"}); - add(new String[]{"海南陵水富力湾", "三亚"}); - add(new String[]{"海南大公馆", "海口"}); - add(new String[]{"海南美林湖国际度假社区", "三亚"}); - add(new String[]{"海南家园", "北京"}); - add(new String[]{"海南干休所", "广州"}); - add(new String[]{"海南绿城清水湾", "三亚"}); - add(new String[]{"海南·三亚·美亚之心", "三亚"}); - add(new String[]{"海南西弄51弄", "上海"}); - add(new String[]{"海南干休所(天河)", "广州"}); - add(new String[]{"海南后海温泉小镇", "重庆"}); - }}); - city_DistrictNames.put("海口", new ArrayList(){{ - add(new String[]{"海口鸿洲新城", "海口"}); - add(new String[]{"海口电信小区", "海口"}); - add(new String[]{"海口电视台宿舍", "海口"}); - add(new String[]{"海口经贸大厦", "海口"}); - add(new String[]{"海口科技大厦", "海口"}); - add(new String[]{"海口晚报社宿舍", "海口"}); - add(new String[]{"海口港大厦", "海口"}); - add(new String[]{"海口市人民医院宿舍", "海口"}); - add(new String[]{"海口花园", "长春"}); - add(new String[]{"海口市首力大厦", "海口"}); - }}); - city_DistrictNames.put("陕西", new ArrayList(){{ - add(new String[]{"陕西电力公司家属院", "西安"}); - add(new String[]{"陕西国际会展中心", "西安"}); - add(new String[]{"陕西巷", "北京"}); - add(new String[]{"陕西省委机关联建小区", "西安"}); - add(new String[]{"陕西省疾控中心家属院", "西安"}); - add(new String[]{"陕西歌舞剧院家属院", "西安"}); - add(new String[]{"陕西戏曲研究院", "西安"}); - add(new String[]{"陕西交通职业技术家属院", "西安"}); - add(new String[]{"陕西广播电视大学家属院", "西安"}); - add(new String[]{"陕西鹏豪园", "西安"}); - add(new String[]{"陕西物产集团公司家属院", "西安"}); - add(new String[]{"陕西金霖商住小区", "西安"}); - }}); - city_DistrictNames.put("延安", new ArrayList(){{ - add(new String[]{"延安中学单位宿舍", "福州"}); - add(new String[]{"延安小区", "贵阳"}); - add(new String[]{"延安新村", "杭州"}); - add(new String[]{"延安里", "天津"}); - add(new String[]{"延安楼", "天津"}); - add(new String[]{"延安里社区", "沈阳"}); - add(new String[]{"延安小区", "大连"}); - add(new String[]{"延安小区", "芜湖"}); - add(new String[]{"延安嘉苑", "上海"}); - add(new String[]{"延安新村", "上海"}); - add(new String[]{"延安小区", "上海"}); - add(new String[]{"延安公寓", "上海"}); - add(new String[]{"延安新村", "无锡"}); - add(new String[]{"延安岭社区", "黄石"}); - add(new String[]{"延安桃源小区", "延安"}); - add(new String[]{"延安北龙大厦", "延安"}); - add(new String[]{"延安绽小区", "延安"}); - }}); - city_DistrictNames.put("广东", new ArrayList(){{ - add(new String[]{"广东外贸广场", "广州"}); - add(new String[]{"广东外语艺术学院教师宿舍", "广州"}); - add(new String[]{"广东建科院宿舍", "广州"}); - add(new String[]{"广东司法警官职业学院宿舍", "广州"}); - add(new String[]{"广东环保大厦", "广州"}); - add(new String[]{"广东商业大厦", "广州"}); - add(new String[]{"广东医学院教师宿舍楼", "东莞"}); - add(new String[]{"广东国际大厦", "广州"}); - add(new String[]{"广东省技术监督局宿舍", "广州"}); - add(new String[]{"广东工业大学宿舍", "广州"}); - add(new String[]{"广东教育学院宿舍", "广州"}); - add(new String[]{"广东省银行大厦", "深圳"}); - add(new String[]{"广东大厦", "天津"}); - add(new String[]{"广东山庄", "镇江"}); - add(new String[]{"广东红盾大厦", "广州"}); - add(new String[]{"广东药学院宿舍", "广州"}); - add(new String[]{"广东青年干部学院宿舍", "广州"}); - add(new String[]{"广东基础楼", "深圳"}); - add(new String[]{"广东省科技干部学院宿舍", "广州"}); - add(new String[]{"广东省农业管理干部学院社区", "广州"}); - add(new String[]{"广东芭蕾雨·逸景", "佛山"}); - }}); - city_DistrictNames.put("中山", new ArrayList(){{ - add(new String[]{"中山三院宿舍", "广州"}); - add(new String[]{"中山二院宿舍", "广州"}); - add(new String[]{"中山花园", "长春"}); - add(new String[]{"中山小区", "郑州"}); - add(new String[]{"中山村", "南昌"}); - add(new String[]{"中山城", "南昌"}); - add(new String[]{"中山桥工商银行宿舍", "南昌"}); - add(new String[]{"中山桥地税局宿舍", "南昌"}); - add(new String[]{"中山壹品", "南昌"}); - add(new String[]{"中山佳苑", "南昌"}); - add(new String[]{"中山名座", "南昌"}); - add(new String[]{"中山桥人民银行宿舍", "南昌"}); - add(new String[]{"中山名苑", "哈尔滨"}); - add(new String[]{"中山国际", "哈尔滨"}); - add(new String[]{"中山福苑", "哈尔滨"}); - add(new String[]{"中山苑", "常州"}); - add(new String[]{"中山门公寓", "常州"}); - add(new String[]{"中山大学西区", "广州"}); - add(new String[]{"中山凯旋门", "石家庄"}); - add(new String[]{"中山宾馆宿舍", "石家庄"}); - add(new String[]{"中山公园附近宿舍", "济南"}); - add(new String[]{"中山门小区", "南京"}); - add(new String[]{"中山城市花园", "柳州"}); - add(new String[]{"中山公寓", "大连"}); - add(new String[]{"中山鸿景苑", "福州"}); - add(new String[]{"中山花园", "泉州"}); - add(new String[]{"中山家园", "宁波"}); - add(new String[]{"中山首府", "宁波"}); - add(new String[]{"中山名都", "宁波"}); - add(new String[]{"中山雅园", "宁波"}); - add(new String[]{"中山小区", "宁波"}); - add(new String[]{"中山帝景苑", "中山"}); - add(new String[]{"中山华庭", "宁波"}); - add(new String[]{"中山·怡和园", "嘉兴"}); - add(new String[]{"中山花园", "嘉兴"}); - add(new String[]{"中山名府", "嘉兴"}); - add(new String[]{"中山大厦商务楼", "嘉兴"}); - add(new String[]{"中山建校小区", "呼和浩特"}); - add(new String[]{"中山大厦", "贵阳"}); - add(new String[]{"中山御庭", "杭州"}); - add(new String[]{"中山花苑", "杭州"}); - add(new String[]{"中山北园", "杭州"}); - add(new String[]{"中山苑", "杭州"}); - add(new String[]{"中山花园", "杭州"}); - add(new String[]{"中山国际", "天津"}); - add(new String[]{"中山苑", "深圳"}); - add(new String[]{"中山颐景花园", "深圳"}); - add(new String[]{"中山花园", "深圳"}); - add(new String[]{"中山门丹尼尔小区", "西安"}); - add(new String[]{"中山小区", "西安"}); - add(new String[]{"中山北里", "天津"}); - add(new String[]{"中山门南里", "天津"}); - add(new String[]{"中山门东里", "天津"}); - add(new String[]{"中山大厦", "天津"}); - add(new String[]{"中山门四号路小区", "天津"}); - add(new String[]{"中山秀景", "沈阳"}); - add(new String[]{"中山南社区", "沈阳"}); - add(new String[]{"中山花园", "武汉"}); - add(new String[]{"中山社区", "武汉"}); - add(new String[]{"中山大厦", "台州"}); - add(new String[]{"中山花园", "马鞍山"}); - add(new String[]{"中山花园", "连云港"}); - add(new String[]{"中山公园小区", "武汉"}); - add(new String[]{"中山桥社区", "武汉"}); - add(new String[]{"中山东升乐意居花园", "中山"}); - add(new String[]{"中山东升丽城花园", "中山"}); - add(new String[]{"中山泮庐别墅", "中山"}); - add(new String[]{"中山花园", "哈尔滨"}); - add(new String[]{"中山蓝色水岸", "哈尔滨"}); - add(new String[]{"中山花园", "贵阳"}); - add(new String[]{"中山大厦", "福州"}); - add(new String[]{"中山艾菲堡", "中山"}); - add(new String[]{"中山九号", "大连"}); - add(new String[]{"中山南苑", "大连"}); - add(new String[]{"中山西苑", "镇江"}); - add(new String[]{"中山门西里", "天津"}); - add(new String[]{"中山门北里", "天津"}); - add(new String[]{"中山东里", "天津"}); - add(new String[]{"中山亭纺织品公司宿舍", "长沙"}); - add(new String[]{"中山大厦", "武汉"}); - add(new String[]{"中山西苑", "宁波"}); - add(new String[]{"中山大学东区", "广州"}); - add(new String[]{"中山二院南院宿舍", "广州"}); - add(new String[]{"中山林建筑公司家属院", "兰州"}); - add(new String[]{"中山SOHO公寓", "宁波"}); - add(new String[]{"中山医学院宿舍", "广州"}); - add(new String[]{"中山城区商铺", "中山"}); - add(new String[]{"中山小区", "重庆"}); - add(new String[]{"中山佳苑", "重庆"}); - add(new String[]{"中山二桥侧", "中山"}); - add(new String[]{"中山海景广场", "厦门"}); - add(new String[]{"中山广场", "佛山"}); - add(new String[]{"中山大院", "福州"}); - add(new String[]{"中山广场", "武汉"}); - add(new String[]{"中山大厦", "贵阳"}); - add(new String[]{"中山豪源", "佛山"}); - add(new String[]{"中山颐景花园二期", "深圳"}); - add(new String[]{"中山广场", "大连"}); - add(new String[]{"中山大学蒲园区", "广州"}); - add(new String[]{"中山新村", "昆山"}); - add(new String[]{"中山苑", "上海"}); - add(new String[]{"中山中信大楼", "上海"}); - add(new String[]{"中山新村", "上海"}); - add(new String[]{"中山广场", "上海"}); - add(new String[]{"中山大楼", "上海"}); - add(new String[]{"中山大厦", "上海"}); - add(new String[]{"中山元一新苑", "上海"}); - add(new String[]{"中山公寓", "上海"}); - add(new String[]{"中山大楼(长宁)", "上海"}); - add(new String[]{"中山医院家属区", "南京"}); - add(new String[]{"中山商务楼", "南京"}); - add(new String[]{"中山大厦", "衡阳"}); - add(new String[]{"中山小区", "宜宾"}); - add(new String[]{"中山国际大厦", "长沙"}); - add(new String[]{"中山西苑景泰里", "宁波"}); - add(new String[]{"中山西苑广安里", "宁波"}); - add(new String[]{"中山社区升平路住宅", "厦门"}); - add(new String[]{"中山名都", "嘉兴"}); - add(new String[]{"中山新村", "苏州"}); - add(new String[]{"中山奥园", "中山"}); - add(new String[]{"中山林二十七中家属院", "兰州"}); - }}); - city_DistrictNames.put("江西", new ArrayList(){{ - add(new String[]{"江西省建工集团", "南昌"}); - add(new String[]{"江西财经大学邮政宿舍", "南昌"}); - add(new String[]{"江西省图书馆宿舍", "南昌"}); - add(new String[]{"江西宾馆旁边", "南昌"}); - add(new String[]{"江西行政学院宿舍", "南昌"}); - add(new String[]{"江西财经大学宿舍", "南昌"}); - add(new String[]{"江西科技师范学院宿舍", "南昌"}); - add(new String[]{"江西省广播电台宿舍", "南昌"}); - add(new String[]{"江西东华计量研究所宿舍", "南昌"}); - add(new String[]{"江西客车厂宿舍", "南昌"}); - add(new String[]{"江西仪器厂宿舍", "南昌"}); - add(new String[]{"江西昌东汽车交易广场", "南昌"}); - add(new String[]{"江西旧货大世界", "南昌"}); - add(new String[]{"江西日报宿舍", "南昌"}); - }}); - city_DistrictNames.put("赣州", new ArrayList(){{ - add(new String[]{"赣州府", "赣州"}); - add(new String[]{"赣州家具大市场", "赣州"}); - add(new String[]{"赣州粮食城", "赣州"}); - }}); - city_DistrictNames.put("陕西", new ArrayList(){{ - add(new String[]{"陕西电力公司家属院", "西安"}); - add(new String[]{"陕西国际会展中心", "西安"}); - add(new String[]{"陕西巷", "北京"}); - add(new String[]{"陕西省委机关联建小区", "西安"}); - add(new String[]{"陕西省疾控中心家属院", "西安"}); - add(new String[]{"陕西歌舞剧院家属院", "西安"}); - add(new String[]{"陕西戏曲研究院", "西安"}); - add(new String[]{"陕西交通职业技术家属院", "西安"}); - add(new String[]{"陕西广播电视大学家属院", "西安"}); - add(new String[]{"陕西鹏豪园", "西安"}); - add(new String[]{"陕西物产集团公司家属院", "西安"}); - add(new String[]{"陕西金霖商住小区", "西安"}); - }}); - city_DistrictNames.put("咸阳", new ArrayList(){{ - add(new String[]{"咸阳里", "天津"}); - add(new String[]{"咸阳南里", "天津"}); - add(new String[]{"咸阳北里", "天津"}); - }}); - city_DistrictNames.put("上海", new ArrayList(){{ - add(new String[]{"上海沙龙", "北京"}); - add(new String[]{"上海滩花园", "烟台"}); - add(new String[]{"上海新城", "南昌"}); - add(new String[]{"上海故事", "南昌"}); - add(new String[]{"上海嘉园", "哈尔滨"}); - add(new String[]{"上海大花园二期", "泰州"}); - add(new String[]{"上海城", "中山"}); - add(new String[]{"上海花园", "温州"}); - add(new String[]{"上海城", "长沙"}); - add(new String[]{"上海年华", "郑州"}); - add(new String[]{"上海公寓", "贵阳"}); - add(new String[]{"上海城市", "合肥"}); - add(new String[]{"上海明珠花园", "南京"}); - add(new String[]{"上海城二期", "重庆"}); - add(new String[]{"上海国际服饰城", "徐州"}); - add(new String[]{"上海大厦", "重庆"}); - add(new String[]{"上海城公馆", "西安"}); - add(new String[]{"上海城", "重庆"}); - add(new String[]{"上海滩大华国际公馆", "天津"}); - add(new String[]{"上海新城", "南通"}); - add(new String[]{"上海城名人苑", "绵阳"}); - add(new String[]{"上海嘉苑", "南通"}); - add(new String[]{"上海公馆", "襄阳"}); - add(new String[]{"上海家园", "台州"}); - add(new String[]{"上海花园", "台州"}); - add(new String[]{"上海豪苑一期", "连云港"}); - add(new String[]{"上海之春二期", "连云港"}); - add(new String[]{"上海之春一期", "连云港"}); - add(new String[]{"上海豪苑二期", "连云港"}); - add(new String[]{"上海豪苑16#楼", "连云港"}); - add(new String[]{"上海城", "苏州"}); - add(new String[]{"上海市场步行街1号院", "洛阳"}); - add(new String[]{"上海滩华府", "洛阳"}); - add(new String[]{"上海市场2号院", "洛阳"}); - add(new String[]{"上海新村", "银川"}); - add(new String[]{"上海西新村", "福州"}); - add(new String[]{"上海花园", "济南"}); - add(new String[]{"上海公寓", "镇江"}); - add(new String[]{"上海豪庭", "威海"}); - add(new String[]{"上海花苑", "青岛"}); - add(new String[]{"上海花园南邻宿舍", "济南"}); - add(new String[]{"上海村", "武汉"}); - add(new String[]{"上海国际花园", "威海"}); - add(new String[]{"上海大花园一期", "泰州"}); - add(new String[]{"上海城繁华纪", "重庆"}); - add(new String[]{"上海城", "绍兴"}); - add(new String[]{"上海东方花苑", "重庆"}); - add(new String[]{"上海城三期天域", "重庆"}); - add(new String[]{"上海城LOMO公寓", "重庆"}); - add(new String[]{"上海城", "威海"}); - add(new String[]{"上海东韵", "成都"}); - add(new String[]{"上海恒联新天地花园", "昆明"}); - add(new String[]{"上海沙龙二期", "昆明"}); - add(new String[]{"上海沙龙三期", "昆明"}); - add(new String[]{"上海公馆", "昆山"}); - add(new String[]{"上海裕花园", "昆山"}); - add(new String[]{"上海后花园", "昆山"}); - add(new String[]{"上海捷座", "昆山"}); - add(new String[]{"上海星城别墅", "昆山"}); - add(new String[]{"上海万科第五园", "上海"}); - add(new String[]{"上海绿城三期", "上海"}); - add(new String[]{"上海滩花园洋房", "上海"}); - add(new String[]{"上海绿城二期", "上海"}); - add(new String[]{"上海绿城", "上海"}); - add(new String[]{"上海滩花园洋房别墅", "上海"}); - add(new String[]{"上海未来", "上海"}); - add(new String[]{"上海未来黄山新城", "上海"}); - add(new String[]{"上海蓝堡", "上海"}); - add(new String[]{"上海第一八佰伴", "上海"}); - add(new String[]{"上海两港装饰材料城", "上海"}); - add(new String[]{"上海鼎城", "上海"}); - add(new String[]{"上海桥梓湾购物中心", "上海"}); - add(new String[]{"上海世博东湖公寓酒店", "上海"}); - add(new String[]{"上海建筑", "北京"}); - add(new String[]{"上海六百", "上海"}); - add(new String[]{"上海梦想", "上海"}); - add(new String[]{"上海关港工业园区", "上海"}); - add(new String[]{"上海电子艺术创意产业基地", "上海"}); - add(new String[]{"上海大花园", "上海"}); - add(new String[]{"上海捷克住宅小区", "上海"}); - add(new String[]{"上海国际摩尔城", "上海"}); - add(new String[]{"上海皇家花园", "上海"}); - add(new String[]{"上海国际中小企业城", "上海"}); - add(new String[]{"上海五月天", "上海"}); - add(new String[]{"上海北竿山国际艺术中心", "上海"}); - add(new String[]{"上海本色", "上海"}); - add(new String[]{"上海漕河泾开发区松江高科技园一期", "上海"}); - add(new String[]{"上海松江万达广场", "上海"}); - add(new String[]{"上海诗林别墅", "上海"}); - add(new String[]{"上海合生国际花园", "上海"}); - add(new String[]{"上海公馆", "上海"}); - add(new String[]{"上海紫园二期", "上海"}); - add(new String[]{"上海裕花园", "上海"}); - add(new String[]{"上海葡萄城科技产业生产大楼", "上海"}); - add(new String[]{"上海两港装饰城公寓", "上海"}); - add(new String[]{"上海白马大厦", "上海"}); - add(new String[]{"上海新村", "上海"}); - add(new String[]{"上海大悦城", "上海"}); - add(new String[]{"上海国际时尚中心", "上海"}); - add(new String[]{"上海商务中心", "上海"}); - add(new String[]{"上海理工大学国家大学科技园", "上海"}); - add(new String[]{"上海财经大学国家大学科技园", "上海"}); - add(new String[]{"上海滩大宁城", "上海"}); - add(new String[]{"上海师大科技园", "上海"}); - add(new String[]{"上海豪都国际花园别墅", "上海"}); - add(new String[]{"上海诗林", "上海"}); - add(new String[]{"上海家天下花园别墅", "上海"}); - add(new String[]{"上海源花城", "上海"}); - add(new String[]{"上海青年城", "上海"}); - add(new String[]{"上海威尼斯花园", "上海"}); - add(new String[]{"上海晶碧产业园", "上海"}); - add(new String[]{"上海天地软件园", "上海"}); - add(new String[]{"上海银座", "上海"}); - add(new String[]{"上海豪都国际花园", "上海"}); - add(new String[]{"上海豪园", "上海"}); - add(new String[]{"上海汇力得电子商务产业园", "上海"}); - add(new String[]{"上海利比富文具礼品商厦", "上海"}); - add(new String[]{"上海之春公寓", "上海"}); - add(new String[]{"上海香溢花城", "上海"}); - add(new String[]{"上海星河湾", "上海"}); - add(new String[]{"上海年华", "上海"}); - add(new String[]{"上海知音", "上海"}); - add(new String[]{"上海知音二期", "上海"}); - add(new String[]{"上海莘城牡丹阁", "上海"}); - add(new String[]{"上海紫旺城", "上海"}); - add(new String[]{"上海星港", "上海"}); - add(new String[]{"上海春天", "上海"}); - add(new String[]{"上海家园", "上海"}); - add(new String[]{"上海莘城都市情园", "上海"}); - add(new String[]{"上海漕河泾开发区闵行高科技园", "上海"}); - add(new String[]{"上海莘城", "上海"}); - add(new String[]{"上海康城三期", "上海"}); - add(new String[]{"上海·绿城玫瑰园", "上海"}); - add(new String[]{"上海花园别墅", "上海"}); - add(new String[]{"上海康城四期", "上海"}); - add(new String[]{"上海别墅", "上海"}); - add(new String[]{"上海共富园", "上海"}); - add(new String[]{"上海滩花园", "上海"}); - add(new String[]{"上海花园", "上海"}); - add(new String[]{"上海侨园天宝财富创意园区", "上海"}); - add(new String[]{"上海风景", "上海"}); - add(new String[]{"上海滩新昌城", "上海"}); - add(new String[]{"上海商城", "上海"}); - add(new String[]{"上海康城二期", "上海"}); - add(new String[]{"上海阳城", "上海"}); - add(new String[]{"上海金鹰购物中心", "上海"}); - add(new String[]{"上海春城", "上海"}); - add(new String[]{"上海康城", "上海"}); - add(new String[]{"上海上实南洋广场", "上海"}); - add(new String[]{"上海绿地香颂公寓", "上海"}); - add(new String[]{"上海花城", "上海"}); - add(new String[]{"上海绿地香颂别墅", "上海"}); - add(new String[]{"上海金山义乌小商品城", "上海"}); - add(new String[]{"上海捷座", "上海"}); - add(new String[]{"上海花园广场", "上海"}); - add(new String[]{"上海新天鸿名人高尔夫别墅社区", "上海"}); - add(new String[]{"上海唐朝酒店", "上海"}); - add(new String[]{"上海加州花园", "上海"}); - add(new String[]{"上海花园", "青岛"}); - add(new String[]{"上海景园", "青岛"}); - add(new String[]{"上海沙龙一期", "昆明"}); - add(new String[]{"上海花园", "成都"}); - add(new String[]{"上海城", "肇庆"}); - add(new String[]{"上海花园", "乐清"}); - add(new String[]{"上海城", "吴江"}); - add(new String[]{"上海城", "新乡"}); - add(new String[]{"上海印象", "牡丹江"}); - add(new String[]{"上海丽苑", "盐城"}); - add(new String[]{"上海九久青年城二期", "上海"}); - add(new String[]{"上海电影广场", "上海"}); - add(new String[]{"上海三湘海尚", "上海"}); - add(new String[]{"上海三湘海尚别墅", "上海"}); - add(new String[]{"上海国际钢铁服务业中心", "上海"}); - add(new String[]{"上海海港国际贸易中心", "上海"}); - add(new String[]{"上海锦珂国际塑胶中心", "上海"}); - add(new String[]{"上海西郊商务区", "上海"}); - add(new String[]{"上海锦江国际购物中心", "上海"}); - add(new String[]{"上海新体育广场", "上海"}); - add(new String[]{"上海青年城公寓", "上海"}); - add(new String[]{"上海博伦综合市场", "上海"}); - add(new String[]{"上海兴力达国际装饰城", "上海"}); - add(new String[]{"上海花园", "攀枝花"}); - add(new String[]{"上海星城", "苏州"}); - add(new String[]{"上海滩商厦", "上海"}); - add(new String[]{"上海国际鞋城", "上海"}); - add(new String[]{"上海装饰市场", "上海"}); - add(new String[]{"上海周浦万达广场公寓", "上海"}); - add(new String[]{"上海城新天地家园", "苏州"}); - add(new String[]{"上海裕花园", "苏州"}); - add(new String[]{"上海之春", "连云港"}); - }}); - city_DistrictNames.put("江苏", new ArrayList(){{ - add(new String[]{"江苏省农科院", "南京"}); - add(new String[]{"江苏油田石油山庄", "扬州"}); - add(new String[]{"江苏警官学院", "南京"}); - add(new String[]{"江苏省高级专家园", "南京"}); - add(new String[]{"江苏油田石油山庄", "扬州"}); - add(new String[]{"江苏议事园", "南京"}); - add(new String[]{"江苏国际塑化城", "常州"}); - add(new String[]{"江苏万和国际商贸城", "常州"}); - }}); - city_DistrictNames.put("苏州", new ArrayList(){{ - add(new String[]{"苏州北巷", "大连"}); - add(new String[]{"苏州里", "天津"}); - add(new String[]{"苏州花园一期", "乌鲁木齐"}); - add(new String[]{"苏州花园二期", "乌鲁木齐"}); - add(new String[]{"苏州花园", "宿迁"}); - add(new String[]{"苏州小区", "北京"}); - add(new String[]{"苏州公寓", "北京"}); - add(new String[]{"苏州幻象", "济南"}); - add(new String[]{"苏州凤凰文化广场", "苏州"}); - add(new String[]{"苏州国际轻纺城", "苏州"}); - add(new String[]{"苏州世茂运河城", "苏州"}); - add(new String[]{"苏州市沧浪科技创业园", "苏州"}); - add(new String[]{"苏州高新区人力资源大厦", "苏州"}); - add(new String[]{"苏州新东方汽配城", "苏州"}); - add(new String[]{"苏州礼品商品城", "苏州"}); - add(new String[]{"苏州沿海国际中心", "苏州"}); - add(new String[]{"苏州机电五金城", "苏州"}); - add(new String[]{"苏州市沧浪科技创业园东区", "苏州"}); - add(new String[]{"苏州世茂广场公寓", "苏州"}); - }}); - city_DistrictNames.put("昆山", new ArrayList(){{ - add(new String[]{"昆山小区", "沈阳"}); - add(new String[]{"昆山南小区", "沈阳"}); - add(new String[]{"昆山里", "天津"}); - add(new String[]{"昆山花园", "昆山"}); - add(new String[]{"昆山亿丰机电城", "昆山"}); - add(new String[]{"昆山柏悦商务大厦", "昆山"}); - add(new String[]{"昆山国际模具城", "昆山"}); - add(new String[]{"昆山绿城玫瑰园", "昆山"}); - add(new String[]{"昆山亿丰广场", "昆山"}); - add(new String[]{"昆山香溢紫郡", "昆山"}); - add(new String[]{"昆山中宇广场", "上海"}); - add(new String[]{"昆山赛格电子", "上海"}); - add(new String[]{"昆山云山诗意", "苏州"}); - add(new String[]{"昆山柏悦商务大厦", "苏州"}); - }}); - city_DistrictNames.put("内蒙古", new ArrayList(){{ - add(new String[]{"内蒙古电大小区", "呼和浩特"}); - add(new String[]{"内蒙古日报社安全文明小区", "呼和浩特"}); - add(new String[]{"内蒙古政府住宅小区", "呼和浩特"}); - add(new String[]{"内蒙古自治区国税局住宅区", "呼和浩特"}); - add(new String[]{"内蒙古政协住宅小区", "呼和浩特"}); - add(new String[]{"内蒙古经贸学院家属院", "呼和浩特"}); - add(new String[]{"内蒙古党校南苑小区", "呼和浩特"}); - add(new String[]{"内蒙古医院家属楼", "呼和浩特"}); - add(new String[]{"内蒙古国际商贸城", "呼和浩特"}); - }}); - city_DistrictNames.put("鄂尔多斯", new ArrayList(){{ - }}); - city_DistrictNames.put("广东", new ArrayList(){{ - add(new String[]{"广东外贸广场", "广州"}); - add(new String[]{"广东外语艺术学院教师宿舍", "广州"}); - add(new String[]{"广东建科院宿舍", "广州"}); - add(new String[]{"广东司法警官职业学院宿舍", "广州"}); - add(new String[]{"广东环保大厦", "广州"}); - add(new String[]{"广东商业大厦", "广州"}); - add(new String[]{"广东医学院教师宿舍楼", "东莞"}); - add(new String[]{"广东国际大厦", "广州"}); - add(new String[]{"广东省技术监督局宿舍", "广州"}); - add(new String[]{"广东工业大学宿舍", "广州"}); - add(new String[]{"广东教育学院宿舍", "广州"}); - add(new String[]{"广东省银行大厦", "深圳"}); - add(new String[]{"广东大厦", "天津"}); - add(new String[]{"广东山庄", "镇江"}); - add(new String[]{"广东红盾大厦", "广州"}); - add(new String[]{"广东药学院宿舍", "广州"}); - add(new String[]{"广东青年干部学院宿舍", "广州"}); - add(new String[]{"广东基础楼", "深圳"}); - add(new String[]{"广东省科技干部学院宿舍", "广州"}); - add(new String[]{"广东省农业管理干部学院社区", "广州"}); - add(new String[]{"广东芭蕾雨·逸景", "佛山"}); - }}); - city_DistrictNames.put("韶关", new ArrayList(){{ - add(new String[]{"韶关碧桂园", "韶关"}); - }}); - city_DistrictNames.put("陕西", new ArrayList(){{ - add(new String[]{"陕西电力公司家属院", "西安"}); - add(new String[]{"陕西国际会展中心", "西安"}); - add(new String[]{"陕西巷", "北京"}); - add(new String[]{"陕西省委机关联建小区", "西安"}); - add(new String[]{"陕西省疾控中心家属院", "西安"}); - add(new String[]{"陕西歌舞剧院家属院", "西安"}); - add(new String[]{"陕西戏曲研究院", "西安"}); - add(new String[]{"陕西交通职业技术家属院", "西安"}); - add(new String[]{"陕西广播电视大学家属院", "西安"}); - add(new String[]{"陕西鹏豪园", "西安"}); - add(new String[]{"陕西物产集团公司家属院", "西安"}); - add(new String[]{"陕西金霖商住小区", "西安"}); - }}); - city_DistrictNames.put("西安", new ArrayList(){{ - add(new String[]{"西安花园", "长春"}); - add(new String[]{"西安苑", "厦门"}); - add(new String[]{"西安福胡同", "北京"}); - add(new String[]{"西安门小区", "北京"}); - add(new String[]{"西安印象", "西安"}); - add(new String[]{"西安朝阳小区", "西安"}); - add(new String[]{"西安锦都", "西安"}); - add(new String[]{"西安市政府小区", "西安"}); - add(new String[]{"西安锦园", "西安"}); - add(new String[]{"西安阳光里", "西安"}); - add(new String[]{"西安市人民检察院家属院", "西安"}); - add(new String[]{"西安恒立苑", "西安"}); - add(new String[]{"西安市建行家属院", "西安"}); - add(new String[]{"西安仪表厂101社区", "西安"}); - add(new String[]{"西安高新区创业研发院", "西安"}); - add(new String[]{"西安广场", "厦门"}); - add(new String[]{"西安市劳动局家属院", "西安"}); - add(new String[]{"西安大洋商厦", "西安"}); - add(new String[]{"西安市商业银行城东支行家属院", "西安"}); - add(new String[]{"西安外运小区", "西安"}); - add(new String[]{"西安日报社家属院", "西安"}); - add(new String[]{"西安院子", "西安"}); - add(new String[]{"西安电缆公司家属院", "西安"}); - add(new String[]{"西安盛世广场", "西安"}); - add(new String[]{"西安民乐园万达广场", "西安"}); - add(new String[]{"西安首创国际城/首创漫香郡", "西安"}); - add(new String[]{"西安交通大学扬州科技园", "扬州"}); - }}); - city_DistrictNames.put("山东", new ArrayList(){{ - add(new String[]{"山东里", "秦皇岛"}); - add(new String[]{"山东经济学院宿舍", "济南"}); - add(new String[]{"山东省卫生厅宿舍", "济南"}); - add(new String[]{"山东省民政厅宿舍", "济南"}); - add(new String[]{"山东省商业集团总公司宿舍", "济南"}); - add(new String[]{"山东医科大学教师宿舍", "济南"}); - add(new String[]{"山东外贸大厦", "青岛"}); - add(new String[]{"山东大厦", "深圳"}); - add(new String[]{"山东堡社区", "沈阳"}); - add(new String[]{"山东艺术学院宿舍", "济南"}); - add(new String[]{"山东黄金崮云湖高尔夫别墅", "济南"}); - add(new String[]{"山东司法警官学院宿舍", "济南"}); - add(new String[]{"山东省科学院高新技术研究分院", "青岛"}); - add(new String[]{"山东建工学院宿舍", "济南"}); - add(new String[]{"山东庙小区", "沈阳"}); - add(new String[]{"山东乳山银滩海景房", "威海"}); - add(new String[]{"山东头村", "青岛"}); - add(new String[]{"山东省畜牧局宿舍", "济南"}); - }}); - city_DistrictNames.put("潍坊", new ArrayList(){{ - add(new String[]{"潍坊二建宿舍", "潍坊"}); - add(new String[]{"潍坊烟草公司宿舍", "潍坊"}); - add(new String[]{"潍坊市教育局", "潍坊"}); - add(new String[]{"潍坊大酒店宿舍", "潍坊"}); - add(new String[]{"潍坊东方家园", "潍坊"}); - add(new String[]{"潍坊供销社宿舍", "潍坊"}); - add(new String[]{"潍坊建工局宿舍", "潍坊"}); - add(new String[]{"潍坊学院宿舍(沃尔玛后)", "潍坊"}); - add(new String[]{"潍坊中学家属院", "潍坊"}); - add(new String[]{"潍坊动配宿舍", "潍坊"}); - add(new String[]{"潍坊银行宿舍(樱前街)", "潍坊"}); - add(new String[]{"潍坊银行宿舍", "潍坊"}); - add(new String[]{"潍坊十村", "上海"}); - add(new String[]{"潍坊二村", "上海"}); - add(new String[]{"潍坊九村", "上海"}); - add(new String[]{"潍坊六村", "上海"}); - add(new String[]{"潍坊大楼", "上海"}); - add(new String[]{"潍坊四村", "上海"}); - add(new String[]{"潍坊一村", "上海"}); - add(new String[]{"潍坊八村", "上海"}); - add(new String[]{"潍坊五村", "上海"}); - add(new String[]{"潍坊七村", "上海"}); - add(new String[]{"潍坊三村", "上海"}); - }}); - city_DistrictNames.put("河南", new ArrayList(){{ - add(new String[]{"河南庄小区", "青岛"}); - add(new String[]{"河南财专家属院", "郑州"}); - add(new String[]{"河南省新华书店家属院", "郑州"}); - add(new String[]{"河南省商业科学研究所家属院", "郑州"}); - add(new String[]{"河南省日报社家属院", "郑州"}); - add(new String[]{"河南女子高中家属院", "郑州"}); - add(new String[]{"河南外贸大院", "深圳"}); - add(new String[]{"河南里", "天津"}); - add(new String[]{"河南新村", "福州"}); - add(new String[]{"河南财经学院家属院", "郑州"}); - add(new String[]{"河南岸公园小区", "惠州"}); - add(new String[]{"河南岸新村", "惠州"}); - add(new String[]{"河南村", "北京"}); - add(new String[]{"河南理工学校家属院", "郑州"}); - add(new String[]{"河南省人事厅家属院", "郑州"}); - add(new String[]{"河南岸中心小区", "惠州"}); - add(new String[]{"河南省外贸学校家属院", "郑州"}); - add(new String[]{"河南村", "上海"}); - add(new String[]{"河南新村", "上海"}); - add(new String[]{"河南工业大学家属院", "郑州"}); - }}); - city_DistrictNames.put("洛阳", new ArrayList(){{ - add(new String[]{"洛阳花园", "长春"}); - add(new String[]{"洛阳嘉汇城", "洛阳"}); - add(new String[]{"洛阳市高质人才居住区", "洛阳"}); - add(new String[]{"洛阳新城", "泉州"}); - add(new String[]{"洛阳银行家属院", "洛阳"}); - add(new String[]{"洛阳嘉汇城", "洛阳"}); - add(new String[]{"洛阳饭店家属院", "洛阳"}); - add(new String[]{"洛阳泊林绿洲", "洛阳"}); - add(new String[]{"洛阳新村", "上海"}); - add(new String[]{"洛阳升龙广场", "洛阳"}); - add(new String[]{"洛阳信息科技城", "洛阳"}); - add(new String[]{"洛阳升龙城", "洛阳"}); - }}); - city_DistrictNames.put("江苏", new ArrayList(){{ - add(new String[]{"江苏省农科院", "南京"}); - add(new String[]{"江苏油田石油山庄", "扬州"}); - add(new String[]{"江苏警官学院", "南京"}); - add(new String[]{"江苏省高级专家园", "南京"}); - add(new String[]{"江苏油田石油山庄", "扬州"}); - add(new String[]{"江苏议事园", "南京"}); - add(new String[]{"江苏国际塑化城", "常州"}); - add(new String[]{"江苏万和国际商贸城", "常州"}); - }}); - city_DistrictNames.put("常州", new ArrayList(){{ - add(new String[]{"常州里", "天津"}); - }}); - city_DistrictNames.put("广东", new ArrayList(){{ - add(new String[]{"广东外贸广场", "广州"}); - add(new String[]{"广东外语艺术学院教师宿舍", "广州"}); - add(new String[]{"广东建科院宿舍", "广州"}); - add(new String[]{"广东司法警官职业学院宿舍", "广州"}); - add(new String[]{"广东环保大厦", "广州"}); - add(new String[]{"广东商业大厦", "广州"}); - add(new String[]{"广东医学院教师宿舍楼", "东莞"}); - add(new String[]{"广东国际大厦", "广州"}); - add(new String[]{"广东省技术监督局宿舍", "广州"}); - add(new String[]{"广东工业大学宿舍", "广州"}); - add(new String[]{"广东教育学院宿舍", "广州"}); - add(new String[]{"广东省银行大厦", "深圳"}); - add(new String[]{"广东大厦", "天津"}); - add(new String[]{"广东山庄", "镇江"}); - add(new String[]{"广东红盾大厦", "广州"}); - add(new String[]{"广东药学院宿舍", "广州"}); - add(new String[]{"广东青年干部学院宿舍", "广州"}); - add(new String[]{"广东基础楼", "深圳"}); - add(new String[]{"广东省科技干部学院宿舍", "广州"}); - add(new String[]{"广东省农业管理干部学院社区", "广州"}); - add(new String[]{"广东芭蕾雨·逸景", "佛山"}); - }}); - city_DistrictNames.put("东莞", new ArrayList(){{ - add(new String[]{"东莞庄工商局宿舍", "广州"}); - add(new String[]{"东莞市家居装饰城", "东莞"}); - add(new String[]{"东莞长安万达广场", "东莞"}); - add(new String[]{"东莞华南国际汽配城", "东莞"}); - add(new String[]{"东莞外贸大厦", "深圳"}); - add(new String[]{"东莞家私城", "黄石"}); - }}); - city_DistrictNames.put("湖北", new ArrayList(){{ - add(new String[]{"湖北小区", "北京"}); - add(new String[]{"湖北宝丰花园", "深圳"}); - add(new String[]{"湖北经济学院宿舍", "武汉"}); - add(new String[]{"湖北大学宿舍", "武汉"}); - add(new String[]{"湖北日报宿舍", "武汉"}); - add(new String[]{"湖北省文联宿舍", "武汉"}); - add(new String[]{"湖北现代五金电器城", "武汉"}); - add(new String[]{"湖北饭店宿舍", "武汉"}); - add(new String[]{"湖北保险公司家属楼", "武汉"}); - add(new String[]{"湖北林业勘察院小区", "武汉"}); - add(new String[]{"湖北交通职业技术学院宿舍", "武汉"}); - add(new String[]{"湖北省艺术学校宿舍", "武汉"}); - add(new String[]{"湖北大厦", "厦门"}); - add(new String[]{"湖北质量监督局宿舍", "武汉"}); - add(new String[]{"湖北省医药监督管理局宿舍", "武汉"}); - add(new String[]{"湖北教育出版社宿舍", "武汉"}); - add(new String[]{"湖北省药材公司宿舍", "武汉"}); - add(new String[]{"湖北二师宿舍", "武汉"}); - add(new String[]{"湖北中医学院宿舍", "武汉"}); - add(new String[]{"湖北省生活资料公司居民小区", "武汉"}); - add(new String[]{"湖北商务广场", "武汉"}); - add(new String[]{"湖北教育学院宿舍", "武汉"}); - add(new String[]{"湖北省监狱管理局宿舍", "武汉"}); - add(new String[]{"湖北省安全监察局宿舍", "武汉"}); - }}); - city_DistrictNames.put("黄石", new ArrayList(){{ - add(new String[]{"黄石大厦", "广州"}); - add(new String[]{"黄石花园", "广州"}); - add(new String[]{"黄石司法学校宿舍", "广州"}); - add(new String[]{"黄石岭小区", "河源"}); - add(new String[]{"黄石港亚光新村", "黄石"}); - add(new String[]{"黄石公园", "黄石"}); - add(new String[]{"黄石港迎宾御园", "黄石"}); - }}); - city_DistrictNames.put("青海", new ArrayList(){{ - add(new String[]{"青海湖花园", "西宁"}); - add(new String[]{"青海园丁园", "西宁"}); - add(new String[]{"青海园", "天津"}); - add(new String[]{"青海大厦", "深圳"}); - add(new String[]{"青海干休所", "无锡"}); - add(new String[]{"青海新村", "南通"}); - }}); - city_DistrictNames.put("西宁", new ArrayList(){{ - }}); - city_DistrictNames.put("山东", new ArrayList(){{ - add(new String[]{"山东里", "秦皇岛"}); - add(new String[]{"山东经济学院宿舍", "济南"}); - add(new String[]{"山东省卫生厅宿舍", "济南"}); - add(new String[]{"山东省民政厅宿舍", "济南"}); - add(new String[]{"山东省商业集团总公司宿舍", "济南"}); - add(new String[]{"山东医科大学教师宿舍", "济南"}); - add(new String[]{"山东外贸大厦", "青岛"}); - add(new String[]{"山东大厦", "深圳"}); - add(new String[]{"山东堡社区", "沈阳"}); - add(new String[]{"山东艺术学院宿舍", "济南"}); - add(new String[]{"山东黄金崮云湖高尔夫别墅", "济南"}); - add(new String[]{"山东司法警官学院宿舍", "济南"}); - add(new String[]{"山东省科学院高新技术研究分院", "青岛"}); - add(new String[]{"山东建工学院宿舍", "济南"}); - add(new String[]{"山东庙小区", "沈阳"}); - add(new String[]{"山东乳山银滩海景房", "威海"}); - add(new String[]{"山东头村", "青岛"}); - add(new String[]{"山东省畜牧局宿舍", "济南"}); - }}); - city_DistrictNames.put("济南", new ArrayList(){{ - add(new String[]{"济南一中宿舍", "济南"}); - add(new String[]{"济南四建宿舍", "济南"}); - add(new String[]{"济南饭店宿舍", "济南"}); - add(new String[]{"济南中学附近宿舍", "济南"}); - add(new String[]{"济南灯泡厂宿舍", "济南"}); - add(new String[]{"济南普利商务中心", "济南"}); - add(new String[]{"济南大学宿舍", "济南"}); - add(new String[]{"济南三中教师宿舍", "济南"}); - add(new String[]{"济南三建宿舍", "济南"}); - add(new String[]{"济南十四中宿舍", "济南"}); - add(new String[]{"济南市房管局宿舍", "济南"}); - add(new String[]{"济南鲁能领秀城", "济南"}); - add(new String[]{"济南大学西校区附近宿舍", "济南"}); - add(new String[]{"济南第九中学宿舍", "济南"}); - add(new String[]{"济南军区总医院宿舍", "济南"}); - add(new String[]{"济南黄金花园", "济南"}); - add(new String[]{"济南恒大名都", "济南"}); - add(new String[]{"济南恒大绿洲", "济南"}); - add(new String[]{"济南一中对面宿舍", "济南"}); - add(new String[]{"济南汇苑家园", "济南"}); - add(new String[]{"济南电视广播大学东校区宿舍", "济南"}); - add(new String[]{"济南玫瑰园新城", "济南"}); - add(new String[]{"济南农信联社宿舍", "济南"}); - add(new String[]{"济南韩国产业城", "济南"}); - add(new String[]{"济南天马相城", "济南"}); - add(new String[]{"济南恒大帝景", "济南"}); - add(new String[]{"济南华强广场", "济南"}); + city_DistrictNames.put("閲嶅簡", new ArrayList(){{ + add(new String[]{"閲嶅簡妫灄鍏瘬", "閲嶅簡"}); + add(new String[]{"閲嶅簡澶╁湴闆嶆睙鑹哄涵", "閲嶅簡"}); + add(new String[]{"閲嶅簡澶уB鍖洪泦璧勬ゼ", "閲嶅簡"}); + add(new String[]{"閲嶅簡鍠滄潵鐧诲浗闄呬腑蹇�", "閲嶅簡"}); + add(new String[]{"閲嶅簡妫灄", "閲嶅簡"}); + add(new String[]{"閲嶅簡鏉�", "閲嶅簡"}); + add(new String[]{"閲嶅簡甯堣寖澶у甯堝ぇ鍥�", "閲嶅簡"}); + add(new String[]{"閲嶅簡瀹鹃鍟嗗姟澶у帵", "閲嶅簡"}); + add(new String[]{"閲嶅簡鍑虹増绀惧皬鍖�", "閲嶅簡"}); + add(new String[]{"閲嶅簡鎴存柉澶ч厭搴�", "閲嶅簡"}); + add(new String[]{"閲嶅簡涓婃捣涓績", "閲嶅簡"}); + add(new String[]{"閲嶅簡澶╁湴闆嶆睙缈犵挓", "閲嶅簡"}); + add(new String[]{"閲嶅簡澶╁湴闆嶆睙鎮﹀涵", "閲嶅簡"}); + add(new String[]{"閲嶅簡澶уA鍖烘澗鏋楁潙", "閲嶅簡"}); + add(new String[]{"閲嶅簡妗冩簮灞呭浗闄呰姳鍥竴鍖�", "閲嶅簡"}); + add(new String[]{"閲嶅簡涓栫晫涔嬬獥", "閲嶅簡"}); + add(new String[]{"閲嶅簡鍏", "閲嶅簡"}); + add(new String[]{"閲嶅簡鍏瘬", "涓婃捣"}); + add(new String[]{"閲嶅簡澶фゼ", "涓婃捣"}); + add(new String[]{"閲嶅簡鍥介檯瀹剁汉鍩庣唬鑹�", "閲嶅簡"}); + add(new String[]{"閲嶅簡涓囪豹鍥介檯閲戣瀺涓績", "閲嶅簡"}); + add(new String[]{"閲嶅簡澶╁湴闆嶆睙寰″涵", "閲嶅簡"}); + add(new String[]{"閲嶅簡骞垮憡浜т笟鍥�", "閲嶅簡"}); + add(new String[]{"閲嶅簡鎬婚儴鍩�", "閲嶅簡"}); + add(new String[]{"閲嶅簡妫曟娉夊浗闄呰姳鍥�", "閲嶅簡"}); + }}); + city_DistrictNames.put("閲嶅簡", new ArrayList(){{ + add(new String[]{"閲嶅簡妫灄鍏瘬", "閲嶅簡"}); + add(new String[]{"閲嶅簡澶╁湴闆嶆睙鑹哄涵", "閲嶅簡"}); + add(new String[]{"閲嶅簡澶уB鍖洪泦璧勬ゼ", "閲嶅簡"}); + add(new String[]{"閲嶅簡鍠滄潵鐧诲浗闄呬腑蹇�", "閲嶅簡"}); + add(new String[]{"閲嶅簡妫灄", "閲嶅簡"}); + add(new String[]{"閲嶅簡鏉�", "閲嶅簡"}); + add(new String[]{"閲嶅簡甯堣寖澶у甯堝ぇ鍥�", "閲嶅簡"}); + add(new String[]{"閲嶅簡瀹鹃鍟嗗姟澶у帵", "閲嶅簡"}); + add(new String[]{"閲嶅簡鍑虹増绀惧皬鍖�", "閲嶅簡"}); + add(new String[]{"閲嶅簡鎴存柉澶ч厭搴�", "閲嶅簡"}); + add(new String[]{"閲嶅簡涓婃捣涓績", "閲嶅簡"}); + add(new String[]{"閲嶅簡澶╁湴闆嶆睙缈犵挓", "閲嶅簡"}); + add(new String[]{"閲嶅簡澶╁湴闆嶆睙鎮﹀涵", "閲嶅簡"}); + add(new String[]{"閲嶅簡澶уA鍖烘澗鏋楁潙", "閲嶅簡"}); + add(new String[]{"閲嶅簡妗冩簮灞呭浗闄呰姳鍥竴鍖�", "閲嶅簡"}); + add(new String[]{"閲嶅簡涓栫晫涔嬬獥", "閲嶅簡"}); + add(new String[]{"閲嶅簡鍏", "閲嶅簡"}); + add(new String[]{"閲嶅簡鍏瘬", "涓婃捣"}); + add(new String[]{"閲嶅簡澶фゼ", "涓婃捣"}); + add(new String[]{"閲嶅簡鍥介檯瀹剁汉鍩庣唬鑹�", "閲嶅簡"}); + add(new String[]{"閲嶅簡涓囪豹鍥介檯閲戣瀺涓績", "閲嶅簡"}); + add(new String[]{"閲嶅簡澶╁湴闆嶆睙寰″涵", "閲嶅簡"}); + add(new String[]{"閲嶅簡骞垮憡浜т笟鍥�", "閲嶅簡"}); + add(new String[]{"閲嶅簡鎬婚儴鍩�", "閲嶅簡"}); + add(new String[]{"閲嶅簡妫曟娉夊浗闄呰姳鍥�", "閲嶅簡"}); + }}); + city_DistrictNames.put("娌冲寳", new ArrayList(){{ + add(new String[]{"娌冲寳绋庡姟瀛︽牎鐢熸椿鍖�", "鐭冲搴�"}); + add(new String[]{"娌冲寳缁忔祹鏃ユ姤绀惧鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳缇庢湳鍑虹増绀惧鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳鐗╄祫瀹胯垗", "鐭冲搴�"}); + add(new String[]{"娌冲寳鍖栧伐鍖昏嵂鑱屼笟鎶�鏈闄㈠鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳鐢垫満瀹胯垗", "鐭冲搴�"}); + add(new String[]{"娌冲寳鏃ユ姤绀惧鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳宸ョ▼閫犱环绠$悊鎬荤珯瀹胯垗", "鐭冲搴�"}); + add(new String[]{"娌冲寳搴峰煄", "娼嶅潑"}); + add(new String[]{"娌冲寳绀惧尯", "娌堥槼"}); + add(new String[]{"娌冲寳鍖荤澶у瀹胯垗", "鐭冲搴�"}); + add(new String[]{"娌冲寳鐪佷汉澶у鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳鏂颁汉瀹�", "鍞愬北"}); + add(new String[]{"娌冲寳涓�鍙�", "鍞愬北"}); + add(new String[]{"娌冲寳鏈鸿灞�瀹胯垗", "鐭冲搴�"}); + add(new String[]{"娌冲寳骞挎挱鐢佃鎶ュ鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳鍟嗗煄", "闈掑矝"}); + add(new String[]{"娌冲寳闀垮煄楗簵", "鐭冲搴�"}); + add(new String[]{"娌冲寳鏉戝皬鍖�", "鍖椾含"}); + add(new String[]{"娌冲寳妗冩睙閲�", "澶╂触"}); + add(new String[]{"娌冲寳甯堝ぇ闈掑勾鍏瘬妤�", "鐭冲搴�"}); + add(new String[]{"娌冲寳缁�", "鏃犻敗"}); + add(new String[]{"娌冲寳绀惧尯", "鏈邯"}); + add(new String[]{"娌冲寳妤�", "鍞愬北"}); + }}); + city_DistrictNames.put("鍞愬北", new ArrayList(){{ + add(new String[]{"鍞愬北绗笁绌洪棿缁煎悎浣�", "鍞愬北"}); + add(new String[]{"鍞愬北涓囪揪骞垮満", "鍞愬北"}); + add(new String[]{"鍞愬北閲�", "澶╂触"}); + add(new String[]{"鍞愬北甯備緵鐢靛叕鍙稿彜鍐跺垎鍏徃浣忓畢妤�11鍙锋ゼ12鍙锋ゼ", "鍞愬北"}); + add(new String[]{"鍞愬北鍥介檯浜旈噾鍟嗗煄", "鍞愬北"}); + add(new String[]{"鍞愬北鏂拌嫅", "涓婃捣"}); + add(new String[]{"鍞愬北涔変箤灏忓晢鍝佸煄", "鍞愬北"}); + }}); + city_DistrictNames.put("婀栧崡", new ArrayList(){{ + add(new String[]{"婀栧崡澶у帵", "娴峰彛"}); + add(new String[]{"婀栧崡甯堝ぇ寮犲叕宀牎鍖哄鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佽繘鍑哄彛鍏徃瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡骞跨數瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡鏈哄簥鍘傚鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鍒惰嵂鍘傚鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡渚涢攢澶у帵", "闀挎矙"}); + add(new String[]{"婀栧崡鍖栧伐鍖昏嵂璁捐闄㈠鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡宸ュ晢閾惰瀹胯垗鏈哄叧澶ч櫌", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸浗闃茬鍏姙鏈哄叧闄㈠唴瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡鎶ヤ笟鏂囧寲鍩�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佷氦閫氳璁¢櫌", "闀挎矙"}); + add(new String[]{"婀栧崡鑱旈�氫綇瀹呭皬鍖�", "闀挎矙"}); + add(new String[]{"婀栧崡鐢佃鍙板崟浣嶅鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡寮�鍏冲巶瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡灏忓尯", "鍖椾含"}); + add(new String[]{"婀栧崡閭數鏂版潙灏忓尯", "闉嶅北"}); + add(new String[]{"婀栧崡鐪佺瀛︽妧鏈巺瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸浗瀹夊巺鍗曚綅鎴�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佹湪鍋跺墽鍥㈠鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佹皵璞″眬瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡濂冲瓙澶у鏁欏笀鍏瘬", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸啘涓氭満姊扮爺绌舵墍", "闀挎矙"}); + add(new String[]{"婀栧崡鏁欒偛瑁呭缁煎悎澶фゼ", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸姵鍔ㄥ崼鐢熸墍", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佽川閲忔妧鏈洃鐫e眬瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡鐪侀噾灞炲洖鏀跺叕鍙稿鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸鏂欑爺绌舵墍", "闀挎矙"}); + add(new String[]{"婀栧崡鐪侀珮绾т汉姘戞鏌ラ櫌鍗曚綅鎴�", "闀挎矙"}); + add(new String[]{"婀栧崡浜ら�氳亴闄㈠鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸喍閲戞潗鏂欑爺绌舵墍", "闀挎矙"}); + add(new String[]{"婀栧崡閲戣渹闊冲儚鍑虹増绀�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佺墿璧勫巺瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡瀹剁數鍟嗗煄", "闀挎矙"}); + add(new String[]{"婀栧崡鍥介檯鍟嗗姟涓績", "闀挎矙"}); + add(new String[]{"婀栧崡璐㈠瘜涓績", "闀挎矙"}); + add(new String[]{"婀栧崡鍥介檯姹借溅鍩�", "闀挎矙"}); + add(new String[]{"婀栧崡浜氬ぇ鏁扮爜娓�", "闀挎矙"}); + add(new String[]{"婀栧崡澶у帵", "鍗楀畞"}); + add(new String[]{"婀栧崡澶у帵", "涓婃捣"}); + add(new String[]{"婀栧崡鏄熸矙姹介厤鍩�", "闀挎矙"}); + add(new String[]{"婀栧崡鑹烘牎鍗曚綅鎴�", "闀挎矙"}); + add(new String[]{"婀栧崡璐笓鏁欒亴宸ュ鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佹満姊拌繘鍑哄彛鍏徃瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡鏃ユ姤鍗曚綅瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡宀稿悗鐣堝皬鍖�", "缁嶅叴"}); + }}); + city_DistrictNames.put("寮犲鐣�", new ArrayList(){{ + add(new String[]{"寮犲鐣屽ぉ闂ㄤ竴鍙�", "寮犲鐣�"}); + }}); + city_DistrictNames.put("鍐呰挋鍙�", new ArrayList(){{ + add(new String[]{"鍐呰挋鍙ょ數澶у皬鍖�", "鍛煎拰娴╃壒"}); + add(new String[]{"鍐呰挋鍙ゆ棩鎶ョぞ瀹夊叏鏂囨槑灏忓尯", "鍛煎拰娴╃壒"}); + add(new String[]{"鍐呰挋鍙ゆ斂搴滀綇瀹呭皬鍖�", "鍛煎拰娴╃壒"}); + add(new String[]{"鍐呰挋鍙よ嚜娌诲尯鍥界◣灞�浣忓畢鍖�", "鍛煎拰娴╃壒"}); + add(new String[]{"鍐呰挋鍙ゆ斂鍗忎綇瀹呭皬鍖�", "鍛煎拰娴╃壒"}); + add(new String[]{"鍐呰挋鍙ょ粡璐稿闄㈠灞為櫌", "鍛煎拰娴╃壒"}); + add(new String[]{"鍐呰挋鍙ゅ厷鏍″崡鑻戝皬鍖�", "鍛煎拰娴╃壒"}); + add(new String[]{"鍐呰挋鍙ゅ尰闄㈠灞炴ゼ", "鍛煎拰娴╃壒"}); + add(new String[]{"鍐呰挋鍙ゅ浗闄呭晢璐稿煄", "鍛煎拰娴╃壒"}); + }}); + city_DistrictNames.put("鍛煎拰娴╃壒", new ArrayList(){{ + }}); + city_DistrictNames.put("鐢樿們", new ArrayList(){{ + add(new String[]{"鐢樿們鑱斿悎澶у瀹跺睘闄�", "鍏板窞"}); + add(new String[]{"鐢樿們鐪侀潚灏戝勾绉戞妧娲诲姩涓績瀹跺睘闄�", "鍏板窞"}); + add(new String[]{"鐢樿們鐪佹柊闂诲嚭鐗堝眬瀹跺睘闄�", "鍏板窞"}); + add(new String[]{"鐢樿們鐪侀偖鐢靛缓璁惧叕鍙稿灞為櫌", "鍏板窞"}); + add(new String[]{"鐢樿們鐪佸璁″眬瀹跺睘闄�", "鍏板窞"}); + add(new String[]{"鐢樿們鐪佷綋鑲插眬瀹跺睘闄�", "鍏板窞"}); + add(new String[]{"鐢樿們鐪佺瀛愬叕鍙稿灞為櫌", "鍏板窞"}); + add(new String[]{"鐢樿們鍐滀笟鑱屼笟鎶�鏈闄㈠灞為櫌", "鍏板窞"}); + add(new String[]{"鐢樿們鐪佸箍鐢垫�诲眬瀹跺睘闄�", "鍏板窞"}); + add(new String[]{"鐢樿們涓尰闄�", "鍏板窞"}); + add(new String[]{"鐢樿們鐪佸缓绛戣璁$爺绌舵墍瀹跺睘闄�", "鍏板窞"}); + add(new String[]{"鐢樿們鐪佹斂搴滃灞為櫌锛堟棫澶ц矾锛�", "鍏板窞"}); + add(new String[]{"鐢樿們鐪佷緵閿�绀惧灞為櫌", "鍏板窞"}); + add(new String[]{"鐢樿們鐪佷汉浜嬪巺瀹跺睘闄�", "鍏板窞"}); + add(new String[]{"鐢樿們浼氬睍涓績寤虹瓚缇�", "鍏板窞"}); + add(new String[]{"鐢樿們绗竴寤鸿闆嗗洟鍏徃灏忓尯", "鍏板窞"}); + add(new String[]{"鐢樿們鐪佹梾娓稿眬瀹跺睘闄�", "鍏板窞"}); + add(new String[]{"鐢樿們鍖栧伐鏈烘鍘傚灞為櫌", "鍏板窞"}); + add(new String[]{"鐢樿們浜洪槻澶у帵", "鍏板窞"}); + add(new String[]{"鐢樿們鐪佸湴鐭垮眬楂樺眰浣忓畢", "鍏板窞"}); + add(new String[]{"鐢樿們鐢佃鍙板灞為櫌", "鍏板窞"}); + add(new String[]{"鐢樿們鐪佺柧鎺т腑蹇冨灞為櫌", "鍏板窞"}); + add(new String[]{"鐢樿們鑱屽伐澶у帵", "鍏板窞"}); + add(new String[]{"鐢樿們鐪佺數瀛愬叕鍙稿灞為櫌", "鍏板窞"}); + }}); + city_DistrictNames.put("鍏板窞", new ArrayList(){{ + add(new String[]{"鍏板窞涓�涓灞為櫌", "鍏板窞"}); + add(new String[]{"鍏板窞鍐涘尯棰滃娌熺墿涓氬皬鍖�", "鍏板窞"}); + add(new String[]{"鍏板窞甯傜伯椋熷眬瀹跺睘闄紙姘告槍璺級", "鍏板窞"}); + add(new String[]{"鍏板窞甯傛斂鍏徃瀹跺睘闄�", "鍏板窞"}); + add(new String[]{"鍏板窞鍐涘尯鍓鍝佸熀鍦�", "鍏板窞"}); + add(new String[]{"鍏板窞鍑忛�熸満鍘傚灞為櫌", "鍏板窞"}); + add(new String[]{"鍏板窞鍐涘尯瀹跺睘闄�", "鍏板窞"}); + add(new String[]{"鍏板窞鍏氦涓囦紬浣忓畢灏忓尯", "鍏板窞"}); + add(new String[]{"鍏板窞閽㈠巶瀹跺睘闄�", "鍏板窞"}); + add(new String[]{"鍏板窞甯傚コ瀛愯亴涓氭妧鏈鏍″灞炴ゼ", "鍏板窞"}); + add(new String[]{"鍏板窞甯傚嵃鍒峰巶瀹跺睘闄�", "鍏板窞"}); + add(new String[]{"鍏板窞鏅熶匠鍏徃瀹跺睘闄㈠崡涓�闂�", "鍏板窞"}); + add(new String[]{"鍏板窞寤虹瓚娈靛灞為櫌", "鍏板窞"}); + add(new String[]{"鍏板窞鐐兼补鎬诲巶瀹跺睘闄�", "鍏板窞"}); + add(new String[]{"鍏板窞鍥借祫鐗╀笟绗簩瀹跺洯", "鍏板窞"}); + add(new String[]{"鍏板窞闆佹哗甯傚叕瀹夊眬瀹跺睘闄�", "鍏板窞"}); + add(new String[]{"鍏板窞楂樻柊寮�鍙戝尯澶у绉戞妧鍥�", "鍏板窞"}); + add(new String[]{"鍏板窞閾惰绉戞妧鏀瀹跺睘闄�", "鍏板窞"}); + add(new String[]{"鍏板窞甯傚煄绠″尯浣曞搴勮储鏀垮灞為櫌", "鍏板窞"}); + add(new String[]{"鍏板窞甯備竷閲屾渤鍖烘灄瀹跺簞閾佽矾灏忓尯", "鍏板窞"}); + add(new String[]{"鍏板窞甯傜伀杞︾珯涔樿澶ч槦瀹跺睘闄�", "鍏板窞"}); + add(new String[]{"鍏板窞鏂版潙", "涓婃捣"}); + add(new String[]{"鍏板窞甯傚浗绋庡眬瀹跺睘闄�", "鍏板窞"}); + add(new String[]{"鍏板窞鍓ч櫌瀹跺睘闄�", "鍏板窞"}); + add(new String[]{"鍏板窞鐢靛瓙宸ヤ笟瀛︽牎瀹跺睘闄�", "鍏板窞"}); + add(new String[]{"鍏板窞甯備汉澶у灞為櫌", "鍏板窞"}); + add(new String[]{"鍏板窞鍐涘尯鍓鍝佸熀鍦板灞為櫌", "鍏板窞"}); + add(new String[]{"鍏板窞甯傛暀鑲插眬瀹跺睘闄�", "鍏板窞"}); + }}); + city_DistrictNames.put("灞变笢", new ArrayList(){{ + add(new String[]{"灞变笢閲�", "绉︾殗宀�"}); + add(new String[]{"灞变笢缁忔祹瀛﹂櫌瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢鐪佸崼鐢熷巺瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢鐪佹皯鏀垮巺瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢鐪佸晢涓氶泦鍥㈡�诲叕鍙稿鑸�", "娴庡崡"}); + add(new String[]{"灞变笢鍖荤澶у鏁欏笀瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢澶栬锤澶у帵", "闈掑矝"}); + add(new String[]{"灞变笢澶у帵", "娣卞湷"}); + add(new String[]{"灞变笢鍫$ぞ鍖�", "娌堥槼"}); + add(new String[]{"灞变笢鑹烘湳瀛﹂櫌瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢榛勯噾宕簯婀栭珮灏斿か鍒", "娴庡崡"}); + add(new String[]{"灞变笢鍙告硶璀﹀畼瀛﹂櫌瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢鐪佺瀛﹂櫌楂樻柊鎶�鏈爺绌跺垎闄�", "闈掑矝"}); + add(new String[]{"灞变笢寤哄伐瀛﹂櫌瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢搴欏皬鍖�", "娌堥槼"}); + add(new String[]{"灞变笢涔冲北閾舵哗娴锋櫙鎴�", "濞佹捣"}); + add(new String[]{"灞变笢澶存潙", "闈掑矝"}); + add(new String[]{"灞变笢鐪佺暅鐗у眬瀹胯垗", "娴庡崡"}); + }}); + city_DistrictNames.put("闈掑矝", new ArrayList(){{ + add(new String[]{"闈掑矝鍢夊洯", "鍖椾含"}); + add(new String[]{"闈掑矝澶╁北鍗庡涵", "闈掑矝"}); + add(new String[]{"闈掑矝澶钩娲嬩腑蹇�", "闈掑矝"}); + add(new String[]{"闈掑矝瑁曢緳澶у帵", "闈掑矝"}); + add(new String[]{"闈掑矝閫氫俊鑺卞洯", "闈掑矝"}); + add(new String[]{"闈掑矝缁村鍒╀簹骞垮満", "闈掑矝"}); + add(new String[]{"闈掑矝灞辫姳鍥�", "闈掑矝"}); + add(new String[]{"闈掑矝鍚槼鍥介檯", "闈掑矝"}); + add(new String[]{"闈掑矝涓栫晫璐告槗涓績", "闈掑矝"}); + add(new String[]{"闈掑矝姝e晢绾㈡渤璋�", "闈掑矝"}); + add(new String[]{"闈掑矝鑺卞洯浜屾湡 (椤哄畨棣ㄥ煄)", "杩炰簯娓�"}); + add(new String[]{"闈掑矝瀹跺洯A鍖�", "涔岄瞾鏈ㄩ綈"}); + add(new String[]{"闈掑矝鑺辫嫅", "涔岄瞾鏈ㄩ綈"}); + add(new String[]{"闈掑矝瀹跺洯B鍖�", "涔岄瞾鏈ㄩ綈"}); + add(new String[]{"闈掑矝鑺卞洯涓�鏈�", "杩炰簯娓�"}); + add(new String[]{"闈掑矝闃冲厜鍢夊洯", "闈掑矝"}); + add(new String[]{"闈掑矝寰℃櫙宄�", "闈掑矝"}); + add(new String[]{"闈掑矝涓滄柟缇庢櫙", "闈掑矝"}); + add(new String[]{"闈掑矝闃冲厜棣ㄨ嫅", "闈掑矝"}); + add(new String[]{"闈掑矝鍏", "闈掑矝"}); + add(new String[]{"闈掑矝鍏瘬", "娲涢槼"}); + add(new String[]{"闈掑矝鐩愪笟灏忓尯", "闈掑矝"}); + add(new String[]{"闈掑矝灞卞叕瀵�", "闈掑矝"}); + add(new String[]{"闈掑矝鏅嫅", "娼嶅潑"}); + add(new String[]{"闈掑矝鍙版咕鍒涙柊宸ヤ笟鍥�", "闈掑矝"}); + add(new String[]{"闈掑矝鍗拌薄灞�", "闈掑矝"}); + add(new String[]{"闈掑矝瀹濋棬鍏瘬", "闈掑矝"}); + add(new String[]{"闈掑矝鏁扮爜绉戞妧涓績", "闈掑矝"}); + add(new String[]{"闈掑矝榫欐箹鍘熷北", "闈掑矝"}); + add(new String[]{"闈掑矝鍗拌薄閲戞矙婊�", "闈掑矝"}); + add(new String[]{"闈掑矝涓囧痉涓拌鏅嫅", "闈掑矝"}); + add(new String[]{"闈掑矝椴佷腑瀹跺眳鍩�", "闈掑矝"}); + add(new String[]{"闈掑矝绾㈡爲鏋楀害鍋囦笘鐣�", "闈掑矝"}); + add(new String[]{"闈掑矝鍑ゅ嚢鍩�", "闈掑矝"}); + add(new String[]{"闈掑矝娴蜂笂鍢夊勾鍗�", "闈掑矝"}); + add(new String[]{"闈掑矝寮�鍙戝尯鍥介檯璐告槗涓績", "闈掑矝"}); + add(new String[]{"闈掑矝鐝犲北澶╅箙婀栫敓鎬佹梾娓稿害鍋囧尯", "闈掑矝"}); + }}); + city_DistrictNames.put("姹熻タ", new ArrayList(){{ + add(new String[]{"姹熻タ鐪佸缓宸ラ泦鍥�", "鍗楁槍"}); + add(new String[]{"姹熻タ璐㈢粡澶у閭斂瀹胯垗", "鍗楁槍"}); + add(new String[]{"姹熻タ鐪佸浘涔﹂瀹胯垗", "鍗楁槍"}); + add(new String[]{"姹熻タ瀹鹃鏃佽竟", "鍗楁槍"}); + add(new String[]{"姹熻タ琛屾斂瀛﹂櫌瀹胯垗", "鍗楁槍"}); + add(new String[]{"姹熻タ璐㈢粡澶у瀹胯垗", "鍗楁槍"}); + add(new String[]{"姹熻タ绉戞妧甯堣寖瀛﹂櫌瀹胯垗", "鍗楁槍"}); + add(new String[]{"姹熻タ鐪佸箍鎾數鍙板鑸�", "鍗楁槍"}); + add(new String[]{"姹熻タ涓滃崕璁¢噺鐮旂┒鎵�瀹胯垗", "鍗楁槍"}); + add(new String[]{"姹熻タ瀹㈣溅鍘傚鑸�", "鍗楁槍"}); + add(new String[]{"姹熻タ浠櫒鍘傚鑸�", "鍗楁槍"}); + add(new String[]{"姹熻タ鏄屼笢姹借溅浜ゆ槗骞垮満", "鍗楁槍"}); + add(new String[]{"姹熻タ鏃ц揣澶т笘鐣�", "鍗楁槍"}); + add(new String[]{"姹熻タ鏃ユ姤瀹胯垗", "鍗楁槍"}); + }}); + city_DistrictNames.put("鍗楁槍", new ArrayList(){{ + add(new String[]{"鍗楁槍澶фˉ绠$悊澶勫鑸�", "鍗楁槍"}); + add(new String[]{"鍗楁槍鍏氦鎬诲叕鍙稿鑸�", "鍗楁槍"}); + add(new String[]{"鍗楁槍甯傜粡娴庡ぇ妤�", "鍗楁槍"}); + add(new String[]{"鍗楁槍灞呬綇涓婚鍏洯鍒", "鍗楁槍"}); + add(new String[]{"鍗楁槍甯傚鍏氭牎瀹胯垗", "鍗楁槍"}); + add(new String[]{"鍗楁槍甯傚缓璁捐矾", "鍗楁槍"}); + add(new String[]{"鍗楁槍鍘垮叕瀹夊眬瀹胯垗", "鍗楁槍"}); + add(new String[]{"鍗楁槍涓夊崄涓鑸�", "鍗楁槍"}); + add(new String[]{"鍗楁槍鍗氭嘲鐢熸�佸晢鍔″洯", "鍗楁槍"}); + add(new String[]{"鍗楁槍琛℃満鍘傚鑸�", "鍗楁槍"}); + add(new String[]{"鍗楁槍灞呬綇涓婚鍏洯", "鍗楁槍"}); + add(new String[]{"鍗楁槍鑺辫嫅", "涓婃捣"}); + add(new String[]{"鍗楁槍涓ぎ棣欐Ν", "鍗楁槍"}); + }}); + city_DistrictNames.put("姹熻嫃", new ArrayList(){{ + add(new String[]{"姹熻嫃鐪佸啘绉戦櫌", "鍗椾含"}); + add(new String[]{"姹熻嫃娌圭敯鐭虫补灞卞簞", "鎵窞"}); + add(new String[]{"姹熻嫃璀﹀畼瀛﹂櫌", "鍗椾含"}); + add(new String[]{"姹熻嫃鐪侀珮绾т笓瀹跺洯", "鍗椾含"}); + add(new String[]{"姹熻嫃娌圭敯鐭虫补灞卞簞", "鎵窞"}); + add(new String[]{"姹熻嫃璁簨鍥�", "鍗椾含"}); + add(new String[]{"姹熻嫃鍥介檯濉戝寲鍩�", "甯稿窞"}); + add(new String[]{"姹熻嫃涓囧拰鍥介檯鍟嗚锤鍩�", "甯稿窞"}); + }}); + city_DistrictNames.put("杩炰簯娓�", new ArrayList(){{ + add(new String[]{"杩炰簯娓厜浼�", "杩炰簯娓�"}); + }}); + city_DistrictNames.put("灞变笢", new ArrayList(){{ + add(new String[]{"灞变笢閲�", "绉︾殗宀�"}); + add(new String[]{"灞变笢缁忔祹瀛﹂櫌瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢鐪佸崼鐢熷巺瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢鐪佹皯鏀垮巺瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢鐪佸晢涓氶泦鍥㈡�诲叕鍙稿鑸�", "娴庡崡"}); + add(new String[]{"灞变笢鍖荤澶у鏁欏笀瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢澶栬锤澶у帵", "闈掑矝"}); + add(new String[]{"灞变笢澶у帵", "娣卞湷"}); + add(new String[]{"灞变笢鍫$ぞ鍖�", "娌堥槼"}); + add(new String[]{"灞变笢鑹烘湳瀛﹂櫌瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢榛勯噾宕簯婀栭珮灏斿か鍒", "娴庡崡"}); + add(new String[]{"灞变笢鍙告硶璀﹀畼瀛﹂櫌瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢鐪佺瀛﹂櫌楂樻柊鎶�鏈爺绌跺垎闄�", "闈掑矝"}); + add(new String[]{"灞变笢寤哄伐瀛﹂櫌瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢搴欏皬鍖�", "娌堥槼"}); + add(new String[]{"灞变笢涔冲北閾舵哗娴锋櫙鎴�", "濞佹捣"}); + add(new String[]{"灞变笢澶存潙", "闈掑矝"}); + add(new String[]{"灞变笢鐪佺暅鐗у眬瀹胯垗", "娴庡崡"}); + }}); + city_DistrictNames.put("娣勫崥", new ArrayList(){{ + add(new String[]{"娣勫崥濂ユ灄鍖瑰厠鑺卞洯", "娣勫崥"}); + }}); + city_DistrictNames.put("骞夸笢", new ArrayList(){{ + add(new String[]{"骞夸笢澶栬锤骞垮満", "骞垮窞"}); + add(new String[]{"骞夸笢澶栬鑹烘湳瀛﹂櫌鏁欏笀瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢寤虹闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢鍙告硶璀﹀畼鑱屼笟瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐜繚澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍟嗕笟澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍖诲闄㈡暀甯堝鑸嶆ゼ", "涓滆帪"}); + add(new String[]{"骞夸笢鍥介檯澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佹妧鏈洃鐫e眬瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢宸ヤ笟澶у瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鏁欒偛瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪侀摱琛屽ぇ鍘�", "娣卞湷"}); + add(new String[]{"骞夸笢澶у帵", "澶╂触"}); + add(new String[]{"骞夸笢灞卞簞", "闀囨睙"}); + add(new String[]{"骞夸笢绾㈢浘澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鑽闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢闈掑勾骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鍩虹妤�", "娣卞湷"}); + add(new String[]{"骞夸笢鐪佺鎶�骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佸啘涓氱鐞嗗共閮ㄥ闄㈢ぞ鍖�", "骞垮窞"}); + add(new String[]{"骞夸笢鑺暰闆烽�告櫙", "浣涘北"}); + }}); + city_DistrictNames.put("鑲囧簡", new ArrayList(){{ + add(new String[]{"鑲囧簡纰ф鍥�", "鑲囧簡"}); + add(new String[]{"鑲囧簡钃濋鍏瘬", "鑲囧簡"}); + add(new String[]{"鑲囧簡路鏅痉灏氶兘", "鑲囧簡"}); + add(new String[]{"鑲囧簡纰ф鍥峰北婀栧煄", "鑲囧簡"}); + }}); + city_DistrictNames.put("姹熻嫃", new ArrayList(){{ + add(new String[]{"姹熻嫃鐪佸啘绉戦櫌", "鍗椾含"}); + add(new String[]{"姹熻嫃娌圭敯鐭虫补灞卞簞", "鎵窞"}); + add(new String[]{"姹熻嫃璀﹀畼瀛﹂櫌", "鍗椾含"}); + add(new String[]{"姹熻嫃鐪侀珮绾т笓瀹跺洯", "鍗椾含"}); + add(new String[]{"姹熻嫃娌圭敯鐭虫补灞卞簞", "鎵窞"}); + add(new String[]{"姹熻嫃璁簨鍥�", "鍗椾含"}); + add(new String[]{"姹熻嫃鍥介檯濉戝寲鍩�", "甯稿窞"}); + add(new String[]{"姹熻嫃涓囧拰鍥介檯鍟嗚锤鍩�", "甯稿窞"}); + }}); + city_DistrictNames.put("寰愬窞", new ArrayList(){{ + add(new String[]{"寰愬窞浜哄", "寰愬窞"}); + add(new String[]{"寰愬窞閲戣揪灏忓尯", "寰愬窞"}); + add(new String[]{"寰愬窞绀煎搧鍩�", "寰愬窞"}); + add(new String[]{"寰愬窞閲�", "澶╂触"}); + }}); + city_DistrictNames.put("鏂扮枂缁村惥灏�", new ArrayList(){{ + add(new String[]{"鏂扮枂缁村惥灏斿尰闄㈠灞為櫌", "涔岄瞾鏈ㄩ綈"}); + }}); + city_DistrictNames.put("涔岄瞾鏈ㄩ綈", new ArrayList(){{ + add(new String[]{"涔岄瞾鏈ㄩ綈鍗敓闃茬柅绔欏灞為櫌", "涔岄瞾鏈ㄩ綈"}); + add(new String[]{"涔岄瞾鏈ㄩ綈浠撴埧娌熷啘宸ュ晢璐稿叕鍙�", "涔岄瞾鏈ㄩ綈"}); + add(new String[]{"涔岄瞾鏈ㄩ綈鎺掓按绠$悊澶勪綇瀹�", "涔岄瞾鏈ㄩ綈"}); + add(new String[]{"涔岄瞾鏈ㄩ綈甯傜涓�浜烘皯鍖婚櫌瀹跺睘闄�", "涔岄瞾鏈ㄩ綈"}); + add(new String[]{"涔岄瞾鏈ㄩ綈鎴愪汉鏁欒偛瀹跺睘闄�", "涔岄瞾鏈ㄩ綈"}); + add(new String[]{"涔岄瞾鏈ㄩ綈鍗敓灞�瀹跺睘闄�", "涔岄瞾鏈ㄩ綈"}); + add(new String[]{"涔岄瞾鏈ㄩ綈甯傛枃鐗╁眬瀹跺睘闄�", "涔岄瞾鏈ㄩ綈"}); + add(new String[]{"涔岄瞾鏈ㄩ綈绗竴骞蹭紤鎵�", "涔岄瞾鏈ㄩ綈"}); + }}); + city_DistrictNames.put("婀栧崡", new ArrayList(){{ + add(new String[]{"婀栧崡澶у帵", "娴峰彛"}); + add(new String[]{"婀栧崡甯堝ぇ寮犲叕宀牎鍖哄鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佽繘鍑哄彛鍏徃瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡骞跨數瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡鏈哄簥鍘傚鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鍒惰嵂鍘傚鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡渚涢攢澶у帵", "闀挎矙"}); + add(new String[]{"婀栧崡鍖栧伐鍖昏嵂璁捐闄㈠鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡宸ュ晢閾惰瀹胯垗鏈哄叧澶ч櫌", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸浗闃茬鍏姙鏈哄叧闄㈠唴瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡鎶ヤ笟鏂囧寲鍩�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佷氦閫氳璁¢櫌", "闀挎矙"}); + add(new String[]{"婀栧崡鑱旈�氫綇瀹呭皬鍖�", "闀挎矙"}); + add(new String[]{"婀栧崡鐢佃鍙板崟浣嶅鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡寮�鍏冲巶瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡灏忓尯", "鍖椾含"}); + add(new String[]{"婀栧崡閭數鏂版潙灏忓尯", "闉嶅北"}); + add(new String[]{"婀栧崡鐪佺瀛︽妧鏈巺瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸浗瀹夊巺鍗曚綅鎴�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佹湪鍋跺墽鍥㈠鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佹皵璞″眬瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡濂冲瓙澶у鏁欏笀鍏瘬", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸啘涓氭満姊扮爺绌舵墍", "闀挎矙"}); + add(new String[]{"婀栧崡鏁欒偛瑁呭缁煎悎澶фゼ", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸姵鍔ㄥ崼鐢熸墍", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佽川閲忔妧鏈洃鐫e眬瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡鐪侀噾灞炲洖鏀跺叕鍙稿鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸鏂欑爺绌舵墍", "闀挎矙"}); + add(new String[]{"婀栧崡鐪侀珮绾т汉姘戞鏌ラ櫌鍗曚綅鎴�", "闀挎矙"}); + add(new String[]{"婀栧崡浜ら�氳亴闄㈠鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸喍閲戞潗鏂欑爺绌舵墍", "闀挎矙"}); + add(new String[]{"婀栧崡閲戣渹闊冲儚鍑虹増绀�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佺墿璧勫巺瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡瀹剁數鍟嗗煄", "闀挎矙"}); + add(new String[]{"婀栧崡鍥介檯鍟嗗姟涓績", "闀挎矙"}); + add(new String[]{"婀栧崡璐㈠瘜涓績", "闀挎矙"}); + add(new String[]{"婀栧崡鍥介檯姹借溅鍩�", "闀挎矙"}); + add(new String[]{"婀栧崡浜氬ぇ鏁扮爜娓�", "闀挎矙"}); + add(new String[]{"婀栧崡澶у帵", "鍗楀畞"}); + add(new String[]{"婀栧崡澶у帵", "涓婃捣"}); + add(new String[]{"婀栧崡鏄熸矙姹介厤鍩�", "闀挎矙"}); + add(new String[]{"婀栧崡鑹烘牎鍗曚綅鎴�", "闀挎矙"}); + add(new String[]{"婀栧崡璐笓鏁欒亴宸ュ鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佹満姊拌繘鍑哄彛鍏徃瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡鏃ユ姤鍗曚綅瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡宀稿悗鐣堝皬鍖�", "缁嶅叴"}); + }}); + city_DistrictNames.put("鏍床", new ArrayList(){{ + }}); + city_DistrictNames.put("姹熻嫃", new ArrayList(){{ + add(new String[]{"姹熻嫃鐪佸啘绉戦櫌", "鍗椾含"}); + add(new String[]{"姹熻嫃娌圭敯鐭虫补灞卞簞", "鎵窞"}); + add(new String[]{"姹熻嫃璀﹀畼瀛﹂櫌", "鍗椾含"}); + add(new String[]{"姹熻嫃鐪侀珮绾т笓瀹跺洯", "鍗椾含"}); + add(new String[]{"姹熻嫃娌圭敯鐭虫补灞卞簞", "鎵窞"}); + add(new String[]{"姹熻嫃璁簨鍥�", "鍗椾含"}); + add(new String[]{"姹熻嫃鍥介檯濉戝寲鍩�", "甯稿窞"}); + add(new String[]{"姹熻嫃涓囧拰鍥介檯鍟嗚锤鍩�", "甯稿窞"}); + }}); + city_DistrictNames.put("鎵窞", new ArrayList(){{ + add(new String[]{"鎵窞姘翠埂", "鍖椾含"}); + add(new String[]{"鎵窞鑺卞洯", "娉板窞"}); + add(new String[]{"鎵窞蹇甸鑻�", "鎵窞"}); + add(new String[]{"鎵窞澶╀笅鍒", "鎵窞"}); + add(new String[]{"鎵窞蹇甸鑻�", "鎵窞"}); + add(new String[]{"鎵窞甯傛暀宸ュ鑸�", "鎵窞"}); + add(new String[]{"鎵窞甯堣寖瀛﹂櫌瀹胯垗", "鎵窞"}); + add(new String[]{"鎵窞浜墽鍥㈠鑸�", "鎵窞"}); + add(new String[]{"鎵窞澶т笘鐣屽浗闄呭箍鍦�", "鎵窞"}); + add(new String[]{"鎵窞鍗拌薄鑺卞洯", "鎵窞"}); + add(new String[]{"鎵窞閲�", "澶╂触"}); + add(new String[]{"鎵窞鑺卞洯", "娉板窞"}); + add(new String[]{"鎵窞鍗拌薄鑺卞洯", "鎵窞"}); + add(new String[]{"鎵窞鐢昏埆", "鎵窞"}); + add(new String[]{"鎵窞宸ュ闄㈠鑸�", "鎵窞"}); + add(new String[]{"鎵窞澶╀笅鑺卞洯", "鎵窞"}); + add(new String[]{"鎵窞澶╀笅鍒", "鎵窞"}); + add(new String[]{"鎵窞姘翠埂鍒", "鍖椾含"}); + add(new String[]{"鎵窞澶╀笅鑺卞洯", "鎵窞"}); + add(new String[]{"鎵窞鍩�", "涓逛笢"}); + add(new String[]{"鎵窞楂樺姏姹借溅姹介厤鍩�", "鎵窞"}); + add(new String[]{"鎵窞浜哄", "鎵窞"}); + add(new String[]{"鎵窞甯傚弻瀛愭槦鍥介檯骞垮満", "鎵窞"}); + }}); + city_DistrictNames.put("骞胯タ澹棌", new ArrayList(){{ + add(new String[]{"骞胯タ澹棌鑷不鍖哄徃娉曞巺瀹胯垗", "鍗楀畞"}); + add(new String[]{"骞胯タ澹棌鑷不鍖哄啘涓氬巺瀹胯垗", "鍗楀畞"}); + }}); + city_DistrictNames.put("鏌冲窞", new ArrayList(){{ + add(new String[]{"鏌冲窞路娓╁窞鍟嗚锤鍩�", "鏌冲窞"}); + }}); + city_DistrictNames.put("瀹佸鍥炴棌", new ArrayList(){{ + }}); + city_DistrictNames.put("閾跺窛", new ArrayList(){{ + add(new String[]{"閾跺窛缇庡眳", "闈掑矝"}); + add(new String[]{"閾跺窛鍥介檯璐告槗涓績", "閾跺窛"}); + add(new String[]{"閾跺窛灞辫嫅", "闈掑矝"}); + add(new String[]{"閾跺窛灏忓尯", "娌堥槼"}); + }}); + city_DistrictNames.put("娴欐睙", new ArrayList(){{ + add(new String[]{"娴欐睙宸ヤ笟澶у鏁欏笀瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙澶у帵", "澶師"}); + add(new String[]{"娴欐睙鍔炰簨澶勫鑸�", "澶師"}); + add(new String[]{"娴欐睙浠佸拰灞呰�佸勾鍏荤敓鍏瘬", "婀栧窞"}); + add(new String[]{"娴欐睙浜よ繍澶у帵", "鏉窞"}); + add(new String[]{"娴欐睙宸ュ晢澶у瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙鍟嗚锤鍩�", "鍚堣偉"}); + add(new String[]{"娴欐睙宸ヤ笟澶у涔嬫睙瀛﹂櫌", "鏉窞"}); + }}); + city_DistrictNames.put("娓╁窞", new ArrayList(){{ + add(new String[]{"娓╁窞澶у帵", "娴峰彛"}); + add(new String[]{"娓╁窞鍩�", "璐甸槼"}); + add(new String[]{"娓╁窞鍏瘬", "璐甸槼"}); + add(new String[]{"娓╁窞鍟嗗煄", "婀栧窞"}); + add(new String[]{"娓╁窞鍟嗗煄", "鍞愬北"}); + add(new String[]{"娓╁窞涓栬锤涓績澶у帵", "娓╁窞"}); + add(new String[]{"娓╁窞涓栬锤涓績骞垮満", "娓╁窞"}); + add(new String[]{"娓╁窞浜烘墠澶у帵", "娓╁窞"}); + add(new String[]{"娓╁窞榫欐咕涓囪揪骞垮満", "娓╁窞"}); + add(new String[]{"娓╁窞鍩幝烽兘涔愭眹", "娌堥槼"}); + add(new String[]{"娓╁窞鍟嗗煄", "閲戝崕"}); + }}); + city_DistrictNames.put("杈藉畞", new ArrayList(){{ + add(new String[]{"杈藉畞涓尰瀹跺睘妤�", "娌堥槼"}); + add(new String[]{"杈藉畞閲�", "澶╂触"}); + }}); + city_DistrictNames.put("澶ц繛", new ArrayList(){{ + add(new String[]{"澶ц繛涓囩澶╅簱", "澶ц繛"}); + add(new String[]{"澶ц繛闂ㄥ皬鍖�", "澶ц繛"}); + add(new String[]{"澶ц繛闂ㄥ箍鍦�", "澶ц繛"}); + add(new String[]{"澶ц繛鏄庣彔", "澶ц繛"}); + add(new String[]{"澶ц繛涓績瑁曟櫙", "澶ц繛"}); + add(new String[]{"澶ц繛鏂版潙", "涓婃捣"}); + add(new String[]{"澶ц繛灏忓尯", "涓婃捣"}); + add(new String[]{"澶ц繛澶╁湴鎮︾繝鍙�", "澶ц繛"}); + add(new String[]{"澶ц繛瀹夋尝鍥介檯娓╂硥鏂板煄", "澶ц繛"}); + add(new String[]{"澶ц繛閲戝窞鍖虹浣虫柊澶╁湴", "涓逛笢"}); + }}); + city_DistrictNames.put("娴欐睙", new ArrayList(){{ + add(new String[]{"娴欐睙宸ヤ笟澶у鏁欏笀瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙澶у帵", "澶師"}); + add(new String[]{"娴欐睙鍔炰簨澶勫鑸�", "澶師"}); + add(new String[]{"娴欐睙浠佸拰灞呰�佸勾鍏荤敓鍏瘬", "婀栧窞"}); + add(new String[]{"娴欐睙浜よ繍澶у帵", "鏉窞"}); + add(new String[]{"娴欐睙宸ュ晢澶у瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙鍟嗚锤鍩�", "鍚堣偉"}); + add(new String[]{"娴欐睙宸ヤ笟澶у涔嬫睙瀛﹂櫌", "鏉窞"}); + }}); + city_DistrictNames.put("瀹佹尝", new ArrayList(){{ + add(new String[]{"瀹佹尝閲�", "澶╂触"}); + add(new String[]{"瀹佹尝閲�", "姝︽眽"}); + add(new String[]{"瀹佹尝鍟嗕細澶у帵", "瀹佹尝"}); + add(new String[]{"瀹佹尝澶栦唬澶у帵", "瀹佹尝"}); + add(new String[]{"瀹佹尝灏忓尯", "涓婃捣"}); + }}); + city_DistrictNames.put("杈藉畞", new ArrayList(){{ + add(new String[]{"杈藉畞涓尰瀹跺睘妤�", "娌堥槼"}); + add(new String[]{"杈藉畞閲�", "澶╂触"}); + }}); + city_DistrictNames.put("鏈邯", new ArrayList(){{ + add(new String[]{"鏈邯妤�", "澶╂触"}); + add(new String[]{"鏈邯鑺卞洯", "澶╂触"}); + add(new String[]{"鏈邯瑗胯姮鍩庡缓", "鏈邯"}); + }}); + city_DistrictNames.put("骞夸笢", new ArrayList(){{ + add(new String[]{"骞夸笢澶栬锤骞垮満", "骞垮窞"}); + add(new String[]{"骞夸笢澶栬鑹烘湳瀛﹂櫌鏁欏笀瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢寤虹闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢鍙告硶璀﹀畼鑱屼笟瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐜繚澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍟嗕笟澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍖诲闄㈡暀甯堝鑸嶆ゼ", "涓滆帪"}); + add(new String[]{"骞夸笢鍥介檯澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佹妧鏈洃鐫e眬瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢宸ヤ笟澶у瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鏁欒偛瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪侀摱琛屽ぇ鍘�", "娣卞湷"}); + add(new String[]{"骞夸笢澶у帵", "澶╂触"}); + add(new String[]{"骞夸笢灞卞簞", "闀囨睙"}); + add(new String[]{"骞夸笢绾㈢浘澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鑽闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢闈掑勾骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鍩虹妤�", "娣卞湷"}); + add(new String[]{"骞夸笢鐪佺鎶�骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佸啘涓氱鐞嗗共閮ㄥ闄㈢ぞ鍖�", "骞垮窞"}); + add(new String[]{"骞夸笢鑺暰闆烽�告櫙", "浣涘北"}); + }}); + city_DistrictNames.put("鑼傚悕", new ArrayList(){{ + add(new String[]{"鑼傚悕澶у帵", "骞垮窞"}); + add(new String[]{"鑼傚悕澶фゼ", "涓婃捣"}); + add(new String[]{"鑼傚悕澶у帵", "涓婃捣"}); + add(new String[]{"鑼傚悕鍧�", "涓婃捣"}); + add(new String[]{"鑼傚悕鍏瘬", "涓婃捣"}); + add(new String[]{"鑼傚悕浜垮煄鍚嶈嫅", "鑼傚悕"}); + add(new String[]{"鑼傚悕纰ф鍥�", "鑼傚悕"}); + add(new String[]{"鑼傚悕鐭虫补鍖栧伐瀛﹂櫌", "鑼傚悕"}); + }}); + city_DistrictNames.put("娴欐睙", new ArrayList(){{ + add(new String[]{"娴欐睙宸ヤ笟澶у鏁欏笀瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙澶у帵", "澶師"}); + add(new String[]{"娴欐睙鍔炰簨澶勫鑸�", "澶師"}); + add(new String[]{"娴欐睙浠佸拰灞呰�佸勾鍏荤敓鍏瘬", "婀栧窞"}); + add(new String[]{"娴欐睙浜よ繍澶у帵", "鏉窞"}); + add(new String[]{"娴欐睙宸ュ晢澶у瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙鍟嗚锤鍩�", "鍚堣偉"}); + add(new String[]{"娴欐睙宸ヤ笟澶у涔嬫睙瀛﹂櫌", "鏉窞"}); + }}); + city_DistrictNames.put("鍙板窞", new ArrayList(){{ + add(new String[]{"鍙板窞棣欐牸閲屾媺鑺卞洯 (棣欐牸閲屾媺,棣欐牸閲屾媺鑺卞洯)", "鍙板窞"}); + add(new String[]{"鍙板窞鍥介檯濉戞枡鍩� (鍥介檯濉戞枡鍩�)", "鍙板窞"}); + add(new String[]{"鍙板窞涓栬锤涓績 (涓栬锤涓績)", "鍙板窞"}); + add(new String[]{"鍙板窞姹介厤鍩� (姹介厤鍩�)", "鍙板窞"}); + add(new String[]{"鍙板窞娴锋磱骞垮満", "鍙板窞"}); + add(new String[]{"鍙板窞鑰�姹熷箍鍦�", "鍙板窞"}); + }}); + city_DistrictNames.put("娓╁箔", new ArrayList(){{ + add(new String[]{"娓╁箔閿﹂兘鑺卞洯", "鍙板窞"}); + add(new String[]{"娓╁箔涓滄柟鑺卞洯", "娓╁箔"}); + }}); + city_DistrictNames.put("娴欐睙", new ArrayList(){{ + add(new String[]{"娴欐睙宸ヤ笟澶у鏁欏笀瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙澶у帵", "澶師"}); + add(new String[]{"娴欐睙鍔炰簨澶勫鑸�", "澶師"}); + add(new String[]{"娴欐睙浠佸拰灞呰�佸勾鍏荤敓鍏瘬", "婀栧窞"}); + add(new String[]{"娴欐睙浜よ繍澶у帵", "鏉窞"}); + add(new String[]{"娴欐睙宸ュ晢澶у瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙鍟嗚锤鍩�", "鍚堣偉"}); + add(new String[]{"娴欐睙宸ヤ笟澶у涔嬫睙瀛﹂櫌", "鏉窞"}); + }}); + city_DistrictNames.put("缁嶅叴", new ArrayList(){{ + add(new String[]{"缁嶅叴澶╀笅", "缁嶅叴"}); + add(new String[]{"缁嶅叴鏂版潙", "鏉窞"}); + add(new String[]{"缁嶅叴棰愭櫙鍥�", "鏉窞"}); + add(new String[]{"缁嶅叴绀惧尯", "姝︽眽"}); + add(new String[]{"缁嶅叴涓滄柟鑺卞洯", "缁嶅叴"}); + add(new String[]{"缁嶅叴杞荤汉璐告槗涓績", "缁嶅叴"}); + }}); + city_DistrictNames.put("灞变笢", new ArrayList(){{ + add(new String[]{"灞变笢閲�", "绉︾殗宀�"}); + add(new String[]{"灞变笢缁忔祹瀛﹂櫌瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢鐪佸崼鐢熷巺瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢鐪佹皯鏀垮巺瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢鐪佸晢涓氶泦鍥㈡�诲叕鍙稿鑸�", "娴庡崡"}); + add(new String[]{"灞变笢鍖荤澶у鏁欏笀瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢澶栬锤澶у帵", "闈掑矝"}); + add(new String[]{"灞变笢澶у帵", "娣卞湷"}); + add(new String[]{"灞变笢鍫$ぞ鍖�", "娌堥槼"}); + add(new String[]{"灞变笢鑹烘湳瀛﹂櫌瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢榛勯噾宕簯婀栭珮灏斿か鍒", "娴庡崡"}); + add(new String[]{"灞变笢鍙告硶璀﹀畼瀛﹂櫌瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢鐪佺瀛﹂櫌楂樻柊鎶�鏈爺绌跺垎闄�", "闈掑矝"}); + add(new String[]{"灞变笢寤哄伐瀛﹂櫌瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢搴欏皬鍖�", "娌堥槼"}); + add(new String[]{"灞变笢涔冲北閾舵哗娴锋櫙鎴�", "濞佹捣"}); + add(new String[]{"灞变笢澶存潙", "闈掑矝"}); + add(new String[]{"灞变笢鐪佺暅鐗у眬瀹胯垗", "娴庡崡"}); + }}); + city_DistrictNames.put("鐑熷彴", new ArrayList(){{ + add(new String[]{"鐑熷彴鏁扮爜娓�", "鐑熷彴"}); + }}); + city_DistrictNames.put("璐靛窞", new ArrayList(){{ + add(new String[]{"璐靛窞澶у帵", "娴峰彛"}); + add(new String[]{"璐靛窞绉戞妧澶у帵", "璐甸槼"}); + add(new String[]{"璐靛窞鏃ユ姤绀剧硸鏋滃巶瀹胯垗", "璐甸槼"}); + add(new String[]{"璐靛窞椹村弸浜哄閰掑簵寮忚繛閿佸搴叕瀵�", "璐甸槼"}); + add(new String[]{"璐靛窞鏃ユ姤绀剧硸鏋滃巶瀹胯垗", "璐甸槼"}); + add(new String[]{"璐靛窞鍟嗚锤鐗╂祦娓�", "璐甸槼"}); + }}); + city_DistrictNames.put("璐甸槼", new ArrayList(){{ + add(new String[]{"璐甸槼甯傞伒涔夎矾閬典箟宸�", "璐甸槼"}); + add(new String[]{"璐甸槼鍖诲闄㈤檮灞炲尰闄㈠鑸�", "璐甸槼"}); + add(new String[]{"璐甸槼寤虹瓚璁捐闄㈠鑸�", "璐甸槼"}); + add(new String[]{"璐甸槼鑺辫嫅", "鍖楁捣"}); + add(new String[]{"璐甸槼閲�", "澶╂触"}); + add(new String[]{"璐甸槼鍏瘬", "澶╂触"}); + add(new String[]{"璐甸槼甯傜鐮旀墍瀹胯垗", "璐甸槼"}); + add(new String[]{"璐甸槼瑙傚北婀栦竴鍙�", "璐甸槼"}); + add(new String[]{"璐甸槼鎭掑ぇ缁挎床", "璐甸槼"}); + add(new String[]{"璐甸槼鎭掑ぇ鍩�", "璐甸槼"}); + add(new String[]{"璐甸槼缁忔祹寮�鍙戝尯", "璐甸槼"}); + add(new String[]{"璐甸槼涓尰瀛﹂櫌鏁欏笀瀹胯垗", "璐甸槼"}); + add(new String[]{"璐甸槼楗簵", "璐甸槼"}); + add(new String[]{"璐甸槼灏忓尯", "闀挎槬"}); + add(new String[]{"璐甸槼甯傞伒涔夎矾閬典箟宸峰皬鍖�", "璐甸槼"}); + }}); + city_DistrictNames.put("娌冲崡", new ArrayList(){{ + add(new String[]{"娌冲崡搴勫皬鍖�", "闈掑矝"}); + add(new String[]{"娌冲崡璐笓瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡鐪佹柊鍗庝功搴楀灞為櫌", "閮戝窞"}); + add(new String[]{"娌冲崡鐪佸晢涓氱瀛︾爺绌舵墍瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡鐪佹棩鎶ョぞ瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡濂冲瓙楂樹腑瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡澶栬锤澶ч櫌", "娣卞湷"}); + add(new String[]{"娌冲崡閲�", "澶╂触"}); + add(new String[]{"娌冲崡鏂版潙", "绂忓窞"}); + add(new String[]{"娌冲崡璐㈢粡瀛﹂櫌瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡宀稿叕鍥皬鍖�", "鎯犲窞"}); + add(new String[]{"娌冲崡宀告柊鏉�", "鎯犲窞"}); + add(new String[]{"娌冲崡鏉�", "鍖椾含"}); + add(new String[]{"娌冲崡鐞嗗伐瀛︽牎瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡鐪佷汉浜嬪巺瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡宀镐腑蹇冨皬鍖�", "鎯犲窞"}); + add(new String[]{"娌冲崡鐪佸璐稿鏍″灞為櫌", "閮戝窞"}); + add(new String[]{"娌冲崡鏉�", "涓婃捣"}); + add(new String[]{"娌冲崡鏂版潙", "涓婃捣"}); + add(new String[]{"娌冲崡宸ヤ笟澶у瀹跺睘闄�", "閮戝窞"}); + }}); + city_DistrictNames.put("鐒︿綔", new ArrayList(){{ + add(new String[]{"鐒︿綔缇よ嫳瀹惰嫅", "鐒︿綔"}); + add(new String[]{"鐒︿綔涓捣涓芥睙", "鐒︿綔"}); + add(new String[]{"鐒︿綔鐧戒簯鑻�", "鐒︿綔"}); + add(new String[]{"鐒︿綔婊ㄦ渤灏忓尯", "鐒︿綔"}); + }}); + city_DistrictNames.put("婀栧崡", new ArrayList(){{ + add(new String[]{"婀栧崡澶у帵", "娴峰彛"}); + add(new String[]{"婀栧崡甯堝ぇ寮犲叕宀牎鍖哄鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佽繘鍑哄彛鍏徃瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡骞跨數瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡鏈哄簥鍘傚鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鍒惰嵂鍘傚鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡渚涢攢澶у帵", "闀挎矙"}); + add(new String[]{"婀栧崡鍖栧伐鍖昏嵂璁捐闄㈠鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡宸ュ晢閾惰瀹胯垗鏈哄叧澶ч櫌", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸浗闃茬鍏姙鏈哄叧闄㈠唴瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡鎶ヤ笟鏂囧寲鍩�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佷氦閫氳璁¢櫌", "闀挎矙"}); + add(new String[]{"婀栧崡鑱旈�氫綇瀹呭皬鍖�", "闀挎矙"}); + add(new String[]{"婀栧崡鐢佃鍙板崟浣嶅鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡寮�鍏冲巶瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡灏忓尯", "鍖椾含"}); + add(new String[]{"婀栧崡閭數鏂版潙灏忓尯", "闉嶅北"}); + add(new String[]{"婀栧崡鐪佺瀛︽妧鏈巺瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸浗瀹夊巺鍗曚綅鎴�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佹湪鍋跺墽鍥㈠鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佹皵璞″眬瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡濂冲瓙澶у鏁欏笀鍏瘬", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸啘涓氭満姊扮爺绌舵墍", "闀挎矙"}); + add(new String[]{"婀栧崡鏁欒偛瑁呭缁煎悎澶фゼ", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸姵鍔ㄥ崼鐢熸墍", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佽川閲忔妧鏈洃鐫e眬瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡鐪侀噾灞炲洖鏀跺叕鍙稿鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸鏂欑爺绌舵墍", "闀挎矙"}); + add(new String[]{"婀栧崡鐪侀珮绾т汉姘戞鏌ラ櫌鍗曚綅鎴�", "闀挎矙"}); + add(new String[]{"婀栧崡浜ら�氳亴闄㈠鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸喍閲戞潗鏂欑爺绌舵墍", "闀挎矙"}); + add(new String[]{"婀栧崡閲戣渹闊冲儚鍑虹増绀�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佺墿璧勫巺瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡瀹剁數鍟嗗煄", "闀挎矙"}); + add(new String[]{"婀栧崡鍥介檯鍟嗗姟涓績", "闀挎矙"}); + add(new String[]{"婀栧崡璐㈠瘜涓績", "闀挎矙"}); + add(new String[]{"婀栧崡鍥介檯姹借溅鍩�", "闀挎矙"}); + add(new String[]{"婀栧崡浜氬ぇ鏁扮爜娓�", "闀挎矙"}); + add(new String[]{"婀栧崡澶у帵", "鍗楀畞"}); + add(new String[]{"婀栧崡澶у帵", "涓婃捣"}); + add(new String[]{"婀栧崡鏄熸矙姹介厤鍩�", "闀挎矙"}); + add(new String[]{"婀栧崡鑹烘牎鍗曚綅鎴�", "闀挎矙"}); + add(new String[]{"婀栧崡璐笓鏁欒亴宸ュ鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佹満姊拌繘鍑哄彛鍏徃瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡鏃ユ姤鍗曚綅瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡宀稿悗鐣堝皬鍖�", "缁嶅叴"}); + }}); + city_DistrictNames.put("宀抽槼", new ArrayList(){{ + add(new String[]{"宀抽槼灏忓尯", "鍘﹂棬"}); + add(new String[]{"宀抽槼鑸掕嫅", "澶╂触"}); + add(new String[]{"宀抽槼閲�", "澶╂触"}); + add(new String[]{"宀抽槼瑗块噷", "鍘﹂棬"}); + add(new String[]{"宀抽槼閲屄峰拰骞冲尯", "澶╂触"}); + add(new String[]{"宀抽槼灏忓尯", "涓婃捣"}); + add(new String[]{"宀抽槼澶фゼ", "涓婃捣"}); + add(new String[]{"宀抽槼鑺辫嫅", "涓婃捣"}); + }}); + city_DistrictNames.put("姹熻嫃", new ArrayList(){{ + add(new String[]{"姹熻嫃鐪佸啘绉戦櫌", "鍗椾含"}); + add(new String[]{"姹熻嫃娌圭敯鐭虫补灞卞簞", "鎵窞"}); + add(new String[]{"姹熻嫃璀﹀畼瀛﹂櫌", "鍗椾含"}); + add(new String[]{"姹熻嫃鐪侀珮绾т笓瀹跺洯", "鍗椾含"}); + add(new String[]{"姹熻嫃娌圭敯鐭虫补灞卞簞", "鎵窞"}); + add(new String[]{"姹熻嫃璁簨鍥�", "鍗椾含"}); + add(new String[]{"姹熻嫃鍥介檯濉戝寲鍩�", "甯稿窞"}); + add(new String[]{"姹熻嫃涓囧拰鍥介檯鍟嗚锤鍩�", "甯稿窞"}); + }}); + city_DistrictNames.put("鍗楅��", new ArrayList(){{ + add(new String[]{"鍗楅�氳姳鍥�", "鐝犳捣"}); + add(new String[]{"鍗楅�氱數淇″鑸�", "闀挎矙"}); + add(new String[]{"鍗楅�氶噷", "澶╂触"}); + add(new String[]{"鍗楅�氬ぇ鍘�", "鍗楅��"}); + add(new String[]{"鍗楅�氱传绔硅嫅", "鍗楅��"}); + add(new String[]{"鍗楅�氫腑澶晢鍔″尯", "鍗楅��"}); + add(new String[]{"鍗楅�氬9鍩庢按鏈ㄦ竻鍗�", "鍗楅��"}); + add(new String[]{"鍗楅�氬浗闄呰锤鏄撲腑蹇�", "鍗楅��"}); + add(new String[]{"鍗楅�氭槦鍏夎��骞垮満", "鍗楅��"}); + add(new String[]{"鍗楅�氱幇浠g敓娲诲箍鍦�", "鍗楅��"}); + add(new String[]{"鍗楅�毬烽噾娓稿煄", "鍗楅��"}); + }}); + city_DistrictNames.put("姹熻嫃", new ArrayList(){{ + add(new String[]{"姹熻嫃鐪佸啘绉戦櫌", "鍗椾含"}); + add(new String[]{"姹熻嫃娌圭敯鐭虫补灞卞簞", "鎵窞"}); + add(new String[]{"姹熻嫃璀﹀畼瀛﹂櫌", "鍗椾含"}); + add(new String[]{"姹熻嫃鐪侀珮绾т笓瀹跺洯", "鍗椾含"}); + add(new String[]{"姹熻嫃娌圭敯鐭虫补灞卞簞", "鎵窞"}); + add(new String[]{"姹熻嫃璁簨鍥�", "鍗椾含"}); + add(new String[]{"姹熻嫃鍥介檯濉戝寲鍩�", "甯稿窞"}); + add(new String[]{"姹熻嫃涓囧拰鍥介檯鍟嗚锤鍩�", "甯稿窞"}); + }}); + city_DistrictNames.put("鍗椾含", new ArrayList(){{ + add(new String[]{"鍗椾含鑺卞洯", "鍝堝皵婊�"}); + add(new String[]{"鍗椾含鑹烘湳瀛﹂櫌瀹跺睘鍖�", "鍗椾含"}); + add(new String[]{"鍗椾含鍥介檯骞垮満", "鍗椾含"}); + add(new String[]{"鍗椾含璐㈢粡澶у鏁欏笀瀹胯垗妤�", "鍗椾含"}); + add(new String[]{"鍗椾含鐐兼补鍘傚皬鍖�", "鍗椾含"}); + add(new String[]{"鍗椾含鍗楃ぞ鍖�", "娌堥槼"}); + add(new String[]{"鍗椾含姹熷ぉ鑺卞洯", "杩炰簯娓�"}); + add(new String[]{"鍗椾含涓栫晫鏉�", "鍗椾含"}); + add(new String[]{"鍗椾含涓囪揪骞垮満", "鍗椾含"}); + add(new String[]{"鍗椾含娌睙鍟嗚锤鍩�", "鍗椾含"}); + add(new String[]{"鍗椾含鐞嗗伐澶у", "鍗椾含"}); + add(new String[]{"鍗椾含娴峰场鍩�", "鍗椾含"}); + add(new String[]{"鍗椾含灏忓尯", "涓婃捣"}); + add(new String[]{"鍗椾含婀鹃敠缁i姹�", "鍗椾含"}); + }}); + city_DistrictNames.put("榛戦緳姹�", new ArrayList(){{ + }}); + city_DistrictNames.put("鐗′腹姹�", new ArrayList(){{ + add(new String[]{"鐗′腹姹熺ぞ鍖�", "娌堥槼"}); + }}); + city_DistrictNames.put("瀹夊窘", new ArrayList(){{ + add(new String[]{"瀹夊窘甯堣寖澶у鏁欏笀鍏瘬", "鑺滄箹"}); + add(new String[]{"瀹夊窘鐢佃鍙板鑸�", "鍚堣偉"}); + add(new String[]{"瀹夊窘鏃ユ姤绀惧鑸�", "鍚堣偉"}); + add(new String[]{"瀹夊窘澶у帵", "鐝犳捣"}); + add(new String[]{"瀹夊窘鏉傛妧鍥㈠鑸�", "鍚堣偉"}); + add(new String[]{"瀹夊窘璀﹀畼鑱屼笟瀛﹂櫌瀹胯垗", "鍚堣偉"}); + add(new String[]{"瀹夊窘绋庡姟瀛︽牎瀹胯垗", "鍚堣偉"}); + add(new String[]{"瀹夊窘姹介厤鍩�", "鍚堣偉"}); + add(new String[]{"瀹夊窘鍥藉己閽㈡潗浜ゆ槗涓績", "鍚堣偉"}); + add(new String[]{"瀹夊窘鍥介檯璐墿骞垮満", "鍚堣偉"}); + add(new String[]{"瀹夊窘澶у競鍦�", "鍚堣偉"}); + }}); + city_DistrictNames.put("椹瀺灞�", new ArrayList(){{ + add(new String[]{"椹瀺灞卞皬鍖�", "鎴愰兘"}); + add(new String[]{"椹瀺灞变竴鍙�", "骞垮窞"}); + }}); + city_DistrictNames.put("娴欐睙", new ArrayList(){{ + add(new String[]{"娴欐睙宸ヤ笟澶у鏁欏笀瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙澶у帵", "澶師"}); + add(new String[]{"娴欐睙鍔炰簨澶勫鑸�", "澶師"}); + add(new String[]{"娴欐睙浠佸拰灞呰�佸勾鍏荤敓鍏瘬", "婀栧窞"}); + add(new String[]{"娴欐睙浜よ繍澶у帵", "鏉窞"}); + add(new String[]{"娴欐睙宸ュ晢澶у瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙鍟嗚锤鍩�", "鍚堣偉"}); + add(new String[]{"娴欐睙宸ヤ笟澶у涔嬫睙瀛﹂櫌", "鏉窞"}); + }}); + city_DistrictNames.put("鍙板窞", new ArrayList(){{ + add(new String[]{"鍙板窞棣欐牸閲屾媺鑺卞洯 (棣欐牸閲屾媺,棣欐牸閲屾媺鑺卞洯)", "鍙板窞"}); + add(new String[]{"鍙板窞鍥介檯濉戞枡鍩� (鍥介檯濉戞枡鍩�)", "鍙板窞"}); + add(new String[]{"鍙板窞涓栬锤涓績 (涓栬锤涓績)", "鍙板窞"}); + add(new String[]{"鍙板窞姹介厤鍩� (姹介厤鍩�)", "鍙板窞"}); + add(new String[]{"鍙板窞娴锋磱骞垮満", "鍙板窞"}); + add(new String[]{"鍙板窞鑰�姹熷箍鍦�", "鍙板窞"}); + }}); + city_DistrictNames.put("骞夸笢", new ArrayList(){{ + add(new String[]{"骞夸笢澶栬锤骞垮満", "骞垮窞"}); + add(new String[]{"骞夸笢澶栬鑹烘湳瀛﹂櫌鏁欏笀瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢寤虹闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢鍙告硶璀﹀畼鑱屼笟瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐜繚澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍟嗕笟澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍖诲闄㈡暀甯堝鑸嶆ゼ", "涓滆帪"}); + add(new String[]{"骞夸笢鍥介檯澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佹妧鏈洃鐫e眬瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢宸ヤ笟澶у瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鏁欒偛瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪侀摱琛屽ぇ鍘�", "娣卞湷"}); + add(new String[]{"骞夸笢澶у帵", "澶╂触"}); + add(new String[]{"骞夸笢灞卞簞", "闀囨睙"}); + add(new String[]{"骞夸笢绾㈢浘澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鑽闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢闈掑勾骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鍩虹妤�", "娣卞湷"}); + add(new String[]{"骞夸笢鐪佺鎶�骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佸啘涓氱鐞嗗共閮ㄥ闄㈢ぞ鍖�", "骞垮窞"}); + add(new String[]{"骞夸笢鑺暰闆烽�告櫙", "浣涘北"}); + }}); + city_DistrictNames.put("姹曞ご", new ArrayList(){{ + add(new String[]{"姹曞ご鏂板煄", "姹曞ご"}); + }}); + city_DistrictNames.put("娴欐睙", new ArrayList(){{ + add(new String[]{"娴欐睙宸ヤ笟澶у鏁欏笀瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙澶у帵", "澶師"}); + add(new String[]{"娴欐睙鍔炰簨澶勫鑸�", "澶師"}); + add(new String[]{"娴欐睙浠佸拰灞呰�佸勾鍏荤敓鍏瘬", "婀栧窞"}); + add(new String[]{"娴欐睙浜よ繍澶у帵", "鏉窞"}); + add(new String[]{"娴欐睙宸ュ晢澶у瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙鍟嗚锤鍩�", "鍚堣偉"}); + add(new String[]{"娴欐睙宸ヤ笟澶у涔嬫睙瀛﹂櫌", "鏉窞"}); + }}); + city_DistrictNames.put("瀹佹尝", new ArrayList(){{ + add(new String[]{"瀹佹尝閲�", "澶╂触"}); + add(new String[]{"瀹佹尝閲�", "姝︽眽"}); + add(new String[]{"瀹佹尝鍟嗕細澶у帵", "瀹佹尝"}); + add(new String[]{"瀹佹尝澶栦唬澶у帵", "瀹佹尝"}); + add(new String[]{"瀹佹尝灏忓尯", "涓婃捣"}); + }}); + city_DistrictNames.put("濂夊寲", new ArrayList(){{ + add(new String[]{"濂夊寲浜蹭翰瀹跺洯", "瀹佹尝"}); + add(new String[]{"濂夊寲浜蹭翰瀹跺洯", "濂夊寲"}); + add(new String[]{"濂夊寲涓ぎ鑺卞洯", "瀹佹尝"}); + }}); + city_DistrictNames.put("骞胯タ澹棌", new ArrayList(){{ + add(new String[]{"骞胯タ澹棌鑷不鍖哄徃娉曞巺瀹胯垗", "鍗楀畞"}); + add(new String[]{"骞胯タ澹棌鑷不鍖哄啘涓氬巺瀹胯垗", "鍗楀畞"}); + }}); + city_DistrictNames.put("妗傛灄", new ArrayList(){{ + add(new String[]{"妗傛灄鍥介檯鏃呮父鍟嗗搧鎵瑰彂鍩�", "妗傛灄"}); + add(new String[]{"妗傛灄灏忓尯", "闀挎槬"}); + add(new String[]{"妗傛灄灏忓尯", "娌堥槼"}); + add(new String[]{"妗傛灄灏忓尯", "澶ц繛"}); + add(new String[]{"妗傛灄鑻�", "澶ц繛"}); + add(new String[]{"妗傛灄鍏鍘熶埂澧�", "妗傛灄"}); + add(new String[]{"妗傛灄娑﹀洯", "妗傛灄"}); + add(new String[]{"妗傛灄濂ユ灄鍖瑰厠鑺卞洯", "妗傛灄"}); + add(new String[]{"妗傛灄澶т笘鐣�", "妗傛灄"}); + add(new String[]{"妗傛灄涓囩伒娑﹀洯", "妗傛灄"}); + add(new String[]{"妗傛灄鏂拌嫅", "涓婃捣"}); + add(new String[]{"妗傛灄鑻�", "涓婃捣"}); + add(new String[]{"妗傛灄鑺辫嫅", "涓婃捣"}); + add(new String[]{"妗傛灄鍧�", "鍢夊叴"}); + }}); + city_DistrictNames.put("骞夸笢", new ArrayList(){{ + add(new String[]{"骞夸笢澶栬锤骞垮満", "骞垮窞"}); + add(new String[]{"骞夸笢澶栬鑹烘湳瀛﹂櫌鏁欏笀瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢寤虹闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢鍙告硶璀﹀畼鑱屼笟瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐜繚澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍟嗕笟澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍖诲闄㈡暀甯堝鑸嶆ゼ", "涓滆帪"}); + add(new String[]{"骞夸笢鍥介檯澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佹妧鏈洃鐫e眬瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢宸ヤ笟澶у瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鏁欒偛瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪侀摱琛屽ぇ鍘�", "娣卞湷"}); + add(new String[]{"骞夸笢澶у帵", "澶╂触"}); + add(new String[]{"骞夸笢灞卞簞", "闀囨睙"}); + add(new String[]{"骞夸笢绾㈢浘澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鑽闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢闈掑勾骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鍩虹妤�", "娣卞湷"}); + add(new String[]{"骞夸笢鐪佺鎶�骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佸啘涓氱鐞嗗共閮ㄥ闄㈢ぞ鍖�", "骞垮窞"}); + add(new String[]{"骞夸笢鑺暰闆烽�告櫙", "浣涘北"}); + }}); + city_DistrictNames.put("骞垮窞", new ArrayList(){{ + add(new String[]{"骞垮窞鍗敓鍘呭ぇ闄�", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥泤閫稿涵", "骞垮窞"}); + add(new String[]{"骞垮窞瀹㈣溅鍘傚鑸�", "骞垮窞"}); + add(new String[]{"骞垮窞鍚庤姳鍥�", "娓呰繙"}); + add(new String[]{"骞垮窞鍚庤姳鍥�", "娓呰繙"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥祬灞卞皬绛�", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥泤鎮﹀涵", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥泤缈犲涵", "骞垮窞"}); + add(new String[]{"骞垮窞濂ユ灄鍖瑰厠鑺卞洯", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥偦灞�", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥�稿績鍥�", "骞垮窞"}); + add(new String[]{"骞垮窞澶у鏁欏笀妤�", "骞垮窞"}); + add(new String[]{"骞垮窞甯傜ぞ浼氱鍒╅櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞垮窞浣撹偛瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞垮窞甯傞鍝佸鑸�", "骞垮窞"}); + add(new String[]{"骞垮窞婀炬椂浠e箍鍦�", "婀涙睙"}); + add(new String[]{"骞垮窞鍐涘尯鎴跨鎵�瀹胯垗", "姝︽眽"}); + add(new String[]{"骞垮窞鏂板鏂颁笘鐣岃姳鍥�", "骞垮窞"}); + add(new String[]{"骞垮窞绌烘腐鍋囨棩鍒閰掑簵", "骞垮窞"}); + add(new String[]{"骞垮窞鏄熸渤涓瑰牑", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥崄骞村皬闆�", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥姳宸�", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥嘲浼�", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥尽鏅嘲鍒", "骞垮窞"}); + add(new String[]{"骞垮窞纰ф鍥鑻�", "骞垮窞"}); + add(new String[]{"骞垮窞纰ф鍥崕鑻�", "骞垮窞"}); + add(new String[]{"骞垮窞纰ф鍥泤鑻�", "骞垮窞"}); + add(new String[]{"骞垮窞纰ф鍥編鑻�", "骞垮窞"}); + add(new String[]{"骞垮窞纰ф鍥箰鑻�", "骞垮窞"}); + add(new String[]{"骞垮窞纰ф鍥敠鑻�", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥锋娲叉晠浜�", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥亸婀栧眳", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥泤婀栧眳", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥�", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥竴灏哄北灞�", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥锋柊鍦�", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥峰ぉ鍩�", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥锋尓濞佹.鏋�", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥洉鍒绘椂鍏�", "骞垮窞"}); + add(new String[]{"骞垮窞纰ф鍥鑻�", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥笂鍠勮嫢姘�", "骞垮窞"}); + add(new String[]{"骞垮窞娓憺閰掑簵鍏瘬", "骞垮窞"}); + add(new String[]{"骞垮窞浜氳繍鍩幝峰ぉ瑾�", "骞垮窞"}); + add(new String[]{"骞垮窞鐧藉ぉ楣呰姳鍥�", "骞垮窞"}); + add(new String[]{"骞垮窞纰ф鍥豢鑼佃嫅", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥椂鍏変節绡�", "骞垮窞"}); + add(new String[]{"骞垮窞纰ф鍥悍鑻�", "骞垮窞"}); + add(new String[]{"骞垮窞娴疯繍澶у帵", "骞垮窞"}); + add(new String[]{"骞垮窞鏈夎壊閲戝睘鐮旂┒闄�", "骞垮窞"}); + add(new String[]{"骞垮窞纰ф鍥附鑻�", "骞垮窞"}); + add(new String[]{"骞垮窞纰ф鍥繝鑻�", "骞垮窞"}); + add(new String[]{"骞垮窞瀵屽姏鍩�", "骞垮窞"}); + add(new String[]{"骞垮窞纰ф鍥�", "骞垮窞"}); + add(new String[]{"骞垮窞鏂板鏂颁笘鐣岃姳鍥�", "澧炲煄"}); + }}); + city_DistrictNames.put("澧炲煄", new ArrayList(){{ + add(new String[]{"澧炲煄瀵屼附鑺卞洯", "骞垮窞"}); + add(new String[]{"澧炲煄鏃朵唬鍊惧煄", "骞垮窞"}); + add(new String[]{"澧炲煄闆呭眳涔愬尽瀹惧簻", "骞垮窞"}); + add(new String[]{"澧炲煄娌欏洯涓矾灏忓尯", "骞垮窞"}); + add(new String[]{"澧炲煄缇ゆ槦澶у帵", "骞垮窞"}); + add(new String[]{"澧炲煄鎬″悍鑺卞洯", "骞垮窞"}); + add(new String[]{"澧炲煄瀵屾櫙灞�", "骞垮窞"}); + add(new String[]{"澧炲煄閲戠敯鑺卞洯", "骞垮窞"}); + add(new String[]{"澧炲煄閫氬洯鑺卞洯", "骞垮窞"}); + add(new String[]{"澧炲煄椤烘櫙妤�", "骞垮窞"}); + add(new String[]{"澧炲煄缈犳櫙鑻�", "骞垮窞"}); + add(new String[]{"澧炲煄鍐滆瀹胯垗", "骞垮窞"}); + add(new String[]{"澧炲煄闃冲厜瀹跺洯", "骞垮窞"}); + add(new String[]{"澧炲煄閿﹀煄鑺卞洯", "骞垮窞"}); + add(new String[]{"澧炲煄涓囪揪骞垮満", "骞垮窞"}); + add(new String[]{"澧炲煄閲戠敯鑺卞洯", "澧炲煄"}); + add(new String[]{"澧炲煄鏃朵唬鍊惧煄", "澧炲煄"}); + add(new String[]{"澧炲煄娌欏洯涓矾灏忓尯", "澧炲煄"}); + add(new String[]{"澧炲煄瀵屼附鑺卞洯", "澧炲煄"}); + add(new String[]{"澧炲煄闆呭眳涔愬尽瀹惧簻", "澧炲煄"}); + add(new String[]{"澧炲煄瀵屾櫙灞�", "澧炲煄"}); + add(new String[]{"澧炲煄閫氬洯鑺卞洯", "澧炲煄"}); + add(new String[]{"澧炲煄鍐滆瀹胯垗", "澧炲煄"}); + add(new String[]{"澧炲煄缈犳櫙鑻�", "澧炲煄"}); + add(new String[]{"澧炲煄缇ゆ槦澶у帵", "澧炲煄"}); + add(new String[]{"澧炲煄閿﹀煄鑺卞洯", "澧炲煄"}); + add(new String[]{"澧炲煄椤烘櫙妤�", "澧炲煄"}); + add(new String[]{"澧炲煄闃冲厜瀹跺洯", "澧炲煄"}); + add(new String[]{"澧炲煄鎬″悍鑺卞洯", "澧炲煄"}); + }}); + city_DistrictNames.put("骞夸笢", new ArrayList(){{ + add(new String[]{"骞夸笢澶栬锤骞垮満", "骞垮窞"}); + add(new String[]{"骞夸笢澶栬鑹烘湳瀛﹂櫌鏁欏笀瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢寤虹闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢鍙告硶璀﹀畼鑱屼笟瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐜繚澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍟嗕笟澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍖诲闄㈡暀甯堝鑸嶆ゼ", "涓滆帪"}); + add(new String[]{"骞夸笢鍥介檯澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佹妧鏈洃鐫e眬瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢宸ヤ笟澶у瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鏁欒偛瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪侀摱琛屽ぇ鍘�", "娣卞湷"}); + add(new String[]{"骞夸笢澶у帵", "澶╂触"}); + add(new String[]{"骞夸笢灞卞簞", "闀囨睙"}); + add(new String[]{"骞夸笢绾㈢浘澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鑽闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢闈掑勾骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鍩虹妤�", "娣卞湷"}); + add(new String[]{"骞夸笢鐪佺鎶�骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佸啘涓氱鐞嗗共閮ㄥ闄㈢ぞ鍖�", "骞垮窞"}); + add(new String[]{"骞夸笢鑺暰闆烽�告櫙", "浣涘北"}); + }}); + city_DistrictNames.put("闃虫睙", new ArrayList(){{ + add(new String[]{"闃虫睙纰ф箹闆呰嫅", "闃虫睙"}); + add(new String[]{"闃虫睙灞卞簞鍒", "闃虫睙"}); + }}); + city_DistrictNames.put("澶╂触", new ArrayList(){{ + add(new String[]{"澶╂触婀炬捣鏅泤鑻�", "澶╂触"}); + add(new String[]{"澶╂触鏂版潙", "鍗椾含"}); + add(new String[]{"澶╂触瀵屽姏妗冨洯", "澶╂触"}); + add(new String[]{"澶╂触涓績", "澶╂触"}); + add(new String[]{"澶╂触鍥壓宸ョ▼鐮旂┒鎵�", "澶╂触"}); + add(new String[]{"澶╂触瀹鹃娓╂硥鍏瘬", "澶╂触"}); + add(new String[]{"澶╂触婀炬捣娌冲浗闄呰姳鍥�", "澶╂触"}); + add(new String[]{"澶╂触濂ュ紡鍟嗗姟鍏洯", "澶╂触"}); + add(new String[]{"澶╂触鍊嶅効骞哥", "澶╂触"}); + add(new String[]{"澶╂触鍗庝鲸鍩�", "澶╂触"}); + add(new String[]{"澶╂触澶ч兘浼�", "澶╂触"}); + add(new String[]{"澶╂触闆呴灞�", "澶╂触"}); + add(new String[]{"澶╂触纰ф鍥�", "澶╂触"}); + add(new String[]{"澶╂触鏈潵鍩�", "澶╂触"}); + add(new String[]{"澶╂触绉戞妧骞垮満", "澶╂触"}); + add(new String[]{"澶╂触澶ч櫌", "姝︽眽"}); + add(new String[]{"澶╂触澶ф偊鍩庢偊搴�", "澶╂触"}); + add(new String[]{"澶╂触澶ф偊鍩庡ぇ鎮﹀叕瀵�", "澶╂触"}); + add(new String[]{"澶╂触瀵屽姏婀�", "澶╂触"}); + add(new String[]{"澶╂触娲ュ崡鏂板煄鍒", "澶╂触"}); + add(new String[]{"澶╂触鍏", "澶╂触"}); + add(new String[]{"澶╂触娲ュ崡鏂板煄", "澶╂触"}); + add(new String[]{"澶╂触瀵屽姏涓績", "澶╂触"}); + add(new String[]{"澶╂触鐜悆閲戣瀺涓績", "澶╂触"}); + add(new String[]{"澶╂触娓咕涓績", "澶╂触"}); + }}); + city_DistrictNames.put("骞夸笢", new ArrayList(){{ + add(new String[]{"骞夸笢澶栬锤骞垮満", "骞垮窞"}); + add(new String[]{"骞夸笢澶栬鑹烘湳瀛﹂櫌鏁欏笀瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢寤虹闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢鍙告硶璀﹀畼鑱屼笟瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐜繚澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍟嗕笟澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍖诲闄㈡暀甯堝鑸嶆ゼ", "涓滆帪"}); + add(new String[]{"骞夸笢鍥介檯澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佹妧鏈洃鐫e眬瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢宸ヤ笟澶у瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鏁欒偛瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪侀摱琛屽ぇ鍘�", "娣卞湷"}); + add(new String[]{"骞夸笢澶у帵", "澶╂触"}); + add(new String[]{"骞夸笢灞卞簞", "闀囨睙"}); + add(new String[]{"骞夸笢绾㈢浘澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鑽闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢闈掑勾骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鍩虹妤�", "娣卞湷"}); + add(new String[]{"骞夸笢鐪佺鎶�骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佸啘涓氱鐞嗗共閮ㄥ闄㈢ぞ鍖�", "骞垮窞"}); + add(new String[]{"骞夸笢鑺暰闆烽�告櫙", "浣涘北"}); + }}); + city_DistrictNames.put("娓呰繙", new ArrayList(){{ + add(new String[]{"娓呰繙缁存腐灏氬煄", "娓呰繙"}); + add(new String[]{"娓呰繙濂ュ洯", "娓呰繙"}); + add(new String[]{"娓呰繙閲�", "鏉窞"}); + add(new String[]{"娓呰繙缁存腐灏氬煄", "娓呰繙"}); + add(new String[]{"娓呰繙涓�鍖�", "涔愭竻"}); + }}); + city_DistrictNames.put("娌冲寳", new ArrayList(){{ + add(new String[]{"娌冲寳绋庡姟瀛︽牎鐢熸椿鍖�", "鐭冲搴�"}); + add(new String[]{"娌冲寳缁忔祹鏃ユ姤绀惧鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳缇庢湳鍑虹増绀惧鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳鐗╄祫瀹胯垗", "鐭冲搴�"}); + add(new String[]{"娌冲寳鍖栧伐鍖昏嵂鑱屼笟鎶�鏈闄㈠鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳鐢垫満瀹胯垗", "鐭冲搴�"}); + add(new String[]{"娌冲寳鏃ユ姤绀惧鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳宸ョ▼閫犱环绠$悊鎬荤珯瀹胯垗", "鐭冲搴�"}); + add(new String[]{"娌冲寳搴峰煄", "娼嶅潑"}); + add(new String[]{"娌冲寳绀惧尯", "娌堥槼"}); + add(new String[]{"娌冲寳鍖荤澶у瀹胯垗", "鐭冲搴�"}); + add(new String[]{"娌冲寳鐪佷汉澶у鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳鏂颁汉瀹�", "鍞愬北"}); + add(new String[]{"娌冲寳涓�鍙�", "鍞愬北"}); + add(new String[]{"娌冲寳鏈鸿灞�瀹胯垗", "鐭冲搴�"}); + add(new String[]{"娌冲寳骞挎挱鐢佃鎶ュ鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳鍟嗗煄", "闈掑矝"}); + add(new String[]{"娌冲寳闀垮煄楗簵", "鐭冲搴�"}); + add(new String[]{"娌冲寳鏉戝皬鍖�", "鍖椾含"}); + add(new String[]{"娌冲寳妗冩睙閲�", "澶╂触"}); + add(new String[]{"娌冲寳甯堝ぇ闈掑勾鍏瘬妤�", "鐭冲搴�"}); + add(new String[]{"娌冲寳缁�", "鏃犻敗"}); + add(new String[]{"娌冲寳绀惧尯", "鏈邯"}); + add(new String[]{"娌冲寳妤�", "鍞愬北"}); + }}); + city_DistrictNames.put("绉︾殗宀�", new ArrayList(){{ + add(new String[]{"绉︾殗宀涙亽澶у煄", "绉︾殗宀�"}); + }}); + city_DistrictNames.put("娴欐睙", new ArrayList(){{ + add(new String[]{"娴欐睙宸ヤ笟澶у鏁欏笀瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙澶у帵", "澶師"}); + add(new String[]{"娴欐睙鍔炰簨澶勫鑸�", "澶師"}); + add(new String[]{"娴欐睙浠佸拰灞呰�佸勾鍏荤敓鍏瘬", "婀栧窞"}); + add(new String[]{"娴欐睙浜よ繍澶у帵", "鏉窞"}); + add(new String[]{"娴欐睙宸ュ晢澶у瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙鍟嗚锤鍩�", "鍚堣偉"}); + add(new String[]{"娴欐睙宸ヤ笟澶у涔嬫睙瀛﹂櫌", "鏉窞"}); + }}); + city_DistrictNames.put("婀栧窞", new ArrayList(){{ + add(new String[]{"婀栧窞涓滆嫅", "鏉窞"}); + add(new String[]{"婀栧窞绔圭繝鍥皬鍖�", "婀栧窞"}); + }}); + city_DistrictNames.put("娴欐睙", new ArrayList(){{ + add(new String[]{"娴欐睙宸ヤ笟澶у鏁欏笀瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙澶у帵", "澶師"}); + add(new String[]{"娴欐睙鍔炰簨澶勫鑸�", "澶師"}); + add(new String[]{"娴欐睙浠佸拰灞呰�佸勾鍏荤敓鍏瘬", "婀栧窞"}); + add(new String[]{"娴欐睙浜よ繍澶у帵", "鏉窞"}); + add(new String[]{"娴欐睙宸ュ晢澶у瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙鍟嗚锤鍩�", "鍚堣偉"}); + add(new String[]{"娴欐睙宸ヤ笟澶у涔嬫睙瀛﹂櫌", "鏉窞"}); + }}); + city_DistrictNames.put("鏉窞", new ArrayList(){{ + add(new String[]{"鏉窞璧涚爜鍩�", "鏉窞"}); + add(new String[]{"鏉窞澶╂竻宀涘害鍋囧埆澧�", "鏉窞"}); + add(new String[]{"鏉窞婀惧叕瀵�", "鏉窞"}); + add(new String[]{"鏉窞閲�", "澶╂触"}); + add(new String[]{"鏉窞澶у帵", "鍙板窞"}); + add(new String[]{"鏉窞棣欐腐鍩�", "鏉窞"}); + add(new String[]{"鏉窞浼戞柉椤块珮绉戞妧鍥�", "鏉窞"}); + add(new String[]{"鏉窞瀹忎赴瀹跺眳鍩庡畯涓板叕瀵�", "鏉窞"}); + add(new String[]{"鏉窞澶ф鼎鍩�", "鏉窞"}); + add(new String[]{"鏉窞涔愬洯椋庢儏琛�", "鏉窞"}); + add(new String[]{"鏉窞涔斿徃鍟嗗煄", "鏉窞"}); + add(new String[]{"鏉窞纰ф鍥�", "鏉窞"}); + add(new String[]{"鏉窞甯備氦璀﹀鍏翠腑闃熷鑸�", "鏉窞"}); + }}); + city_DistrictNames.put("钀у北", new ArrayList(){{ + add(new String[]{"钀у北閲戝煄鑺卞洯", "鏉窞"}); + add(new String[]{"钀у北瀹舵櫙鍥�", "鏉窞"}); + add(new String[]{"钀у北鏃朵唬骞垮満", "鏉窞"}); + add(new String[]{"钀у北浼楀畨鏈嶅姟妤�", "鏉窞"}); + }}); + city_DistrictNames.put("绂忓缓", new ArrayList(){{ + add(new String[]{"绂忓缓鍥�", "鍗楀畞"}); + add(new String[]{"绂忓缓鐪佸洓寤哄鑸嶅寳闂�", "鍘﹂棬"}); + add(new String[]{"绂忓缓鑱旈�氳姳鍥�", "绂忓窞"}); + add(new String[]{"绂忓缓鏃ユ姤绀惧鑸�", "绂忓窞"}); + add(new String[]{"绂忓缓鐪佷腑蹇冩楠屾墍鍗曚綅瀹胯垗", "绂忓窞"}); + add(new String[]{"绂忓缓鐢靛奖鍒剁墖鍘傚崟浣嶅鑸�", "绂忓窞"}); + add(new String[]{"绂忓缓鐪佸コ瀛愮洃鐙卞鑸�", "绂忓窞"}); + add(new String[]{"绂忓缓鐪佸尰鑽叕鍙稿ぇ鐜嬮噷鍗曚綅瀹胯垗", "绂忓窞"}); + add(new String[]{"绂忓缓鐪佺浜屽叕璺伐绋嬪叕鍙稿鑸�", "绂忓窞"}); + add(new String[]{"绂忓缓鐪佽殨妗戠爺绌舵墍鍗曚綅瀹胯垗", "绂忓窞"}); + add(new String[]{"绂忓缓鏂版潙", "鍗椾含"}); + add(new String[]{"绂忓缓閲�", "澶╂触"}); + add(new String[]{"绂忓缓绀惧尯", "姝︽眽"}); + add(new String[]{"绂忓缓澶у帵", "璐甸槼"}); + add(new String[]{"绂忓缓宸峰皬鍖�", "鎴愰兘"}); + add(new String[]{"绂忓缓澶у帵", "娣卞湷"}); + add(new String[]{"绂忓缓鐢熸�佸伐绋嬪鏍″崟浣嶅鑸�", "绂忓窞"}); + add(new String[]{"绂忓缓鍖荤澶у鏁欏伐瀹胯垗", "绂忓窞"}); + }}); + city_DistrictNames.put("娉夊窞", new ArrayList(){{ + add(new String[]{"娉夊窞濂ユ灄鍖瑰厠鑺卞洯", "娉夊窞"}); + add(new String[]{"娉夊窞鍟嗗煄", "娉夊窞"}); + }}); + city_DistrictNames.put("娌冲寳", new ArrayList(){{ + add(new String[]{"娌冲寳绋庡姟瀛︽牎鐢熸椿鍖�", "鐭冲搴�"}); + add(new String[]{"娌冲寳缁忔祹鏃ユ姤绀惧鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳缇庢湳鍑虹増绀惧鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳鐗╄祫瀹胯垗", "鐭冲搴�"}); + add(new String[]{"娌冲寳鍖栧伐鍖昏嵂鑱屼笟鎶�鏈闄㈠鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳鐢垫満瀹胯垗", "鐭冲搴�"}); + add(new String[]{"娌冲寳鏃ユ姤绀惧鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳宸ョ▼閫犱环绠$悊鎬荤珯瀹胯垗", "鐭冲搴�"}); + add(new String[]{"娌冲寳搴峰煄", "娼嶅潑"}); + add(new String[]{"娌冲寳绀惧尯", "娌堥槼"}); + add(new String[]{"娌冲寳鍖荤澶у瀹胯垗", "鐭冲搴�"}); + add(new String[]{"娌冲寳鐪佷汉澶у鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳鏂颁汉瀹�", "鍞愬北"}); + add(new String[]{"娌冲寳涓�鍙�", "鍞愬北"}); + add(new String[]{"娌冲寳鏈鸿灞�瀹胯垗", "鐭冲搴�"}); + add(new String[]{"娌冲寳骞挎挱鐢佃鎶ュ鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳鍟嗗煄", "闈掑矝"}); + add(new String[]{"娌冲寳闀垮煄楗簵", "鐭冲搴�"}); + add(new String[]{"娌冲寳鏉戝皬鍖�", "鍖椾含"}); + add(new String[]{"娌冲寳妗冩睙閲�", "澶╂触"}); + add(new String[]{"娌冲寳甯堝ぇ闈掑勾鍏瘬妤�", "鐭冲搴�"}); + add(new String[]{"娌冲寳缁�", "鏃犻敗"}); + add(new String[]{"娌冲寳绀惧尯", "鏈邯"}); + add(new String[]{"娌冲寳妤�", "鍞愬北"}); + }}); + city_DistrictNames.put("閭兏", new ArrayList(){{ + }}); + city_DistrictNames.put("骞夸笢", new ArrayList(){{ + add(new String[]{"骞夸笢澶栬锤骞垮満", "骞垮窞"}); + add(new String[]{"骞夸笢澶栬鑹烘湳瀛﹂櫌鏁欏笀瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢寤虹闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢鍙告硶璀﹀畼鑱屼笟瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐜繚澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍟嗕笟澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍖诲闄㈡暀甯堝鑸嶆ゼ", "涓滆帪"}); + add(new String[]{"骞夸笢鍥介檯澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佹妧鏈洃鐫e眬瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢宸ヤ笟澶у瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鏁欒偛瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪侀摱琛屽ぇ鍘�", "娣卞湷"}); + add(new String[]{"骞夸笢澶у帵", "澶╂触"}); + add(new String[]{"骞夸笢灞卞簞", "闀囨睙"}); + add(new String[]{"骞夸笢绾㈢浘澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鑽闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢闈掑勾骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鍩虹妤�", "娣卞湷"}); + add(new String[]{"骞夸笢鐪佺鎶�骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佸啘涓氱鐞嗗共閮ㄥ闄㈢ぞ鍖�", "骞垮窞"}); + add(new String[]{"骞夸笢鑺暰闆烽�告櫙", "浣涘北"}); + }}); + city_DistrictNames.put("娌虫簮", new ArrayList(){{ + add(new String[]{"娌虫簮灏忓尯", "鍝堝皵婊�"}); + add(new String[]{"娌虫簮澶у帵", "骞垮窞"}); + add(new String[]{"娌虫簮纰ф按婀捐姳鍥�", "娌虫簮"}); + }}); + city_DistrictNames.put("娴欐睙", new ArrayList(){{ + add(new String[]{"娴欐睙宸ヤ笟澶у鏁欏笀瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙澶у帵", "澶師"}); + add(new String[]{"娴欐睙鍔炰簨澶勫鑸�", "澶師"}); + add(new String[]{"娴欐睙浠佸拰灞呰�佸勾鍏荤敓鍏瘬", "婀栧窞"}); + add(new String[]{"娴欐睙浜よ繍澶у帵", "鏉窞"}); + add(new String[]{"娴欐睙宸ュ晢澶у瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙鍟嗚锤鍩�", "鍚堣偉"}); + add(new String[]{"娴欐睙宸ヤ笟澶у涔嬫睙瀛﹂櫌", "鏉窞"}); + }}); + city_DistrictNames.put("鏉窞", new ArrayList(){{ + add(new String[]{"鏉窞璧涚爜鍩�", "鏉窞"}); + add(new String[]{"鏉窞澶╂竻宀涘害鍋囧埆澧�", "鏉窞"}); + add(new String[]{"鏉窞婀惧叕瀵�", "鏉窞"}); + add(new String[]{"鏉窞閲�", "澶╂触"}); + add(new String[]{"鏉窞澶у帵", "鍙板窞"}); + add(new String[]{"鏉窞棣欐腐鍩�", "鏉窞"}); + add(new String[]{"鏉窞浼戞柉椤块珮绉戞妧鍥�", "鏉窞"}); + add(new String[]{"鏉窞瀹忎赴瀹跺眳鍩庡畯涓板叕瀵�", "鏉窞"}); + add(new String[]{"鏉窞澶ф鼎鍩�", "鏉窞"}); + add(new String[]{"鏉窞涔愬洯椋庢儏琛�", "鏉窞"}); + add(new String[]{"鏉窞涔斿徃鍟嗗煄", "鏉窞"}); + add(new String[]{"鏉窞纰ф鍥�", "鏉窞"}); + add(new String[]{"鏉窞甯備氦璀﹀鍏翠腑闃熷鑸�", "鏉窞"}); + }}); + city_DistrictNames.put("婀栧崡", new ArrayList(){{ + add(new String[]{"婀栧崡澶у帵", "娴峰彛"}); + add(new String[]{"婀栧崡甯堝ぇ寮犲叕宀牎鍖哄鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佽繘鍑哄彛鍏徃瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡骞跨數瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡鏈哄簥鍘傚鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鍒惰嵂鍘傚鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡渚涢攢澶у帵", "闀挎矙"}); + add(new String[]{"婀栧崡鍖栧伐鍖昏嵂璁捐闄㈠鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡宸ュ晢閾惰瀹胯垗鏈哄叧澶ч櫌", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸浗闃茬鍏姙鏈哄叧闄㈠唴瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡鎶ヤ笟鏂囧寲鍩�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佷氦閫氳璁¢櫌", "闀挎矙"}); + add(new String[]{"婀栧崡鑱旈�氫綇瀹呭皬鍖�", "闀挎矙"}); + add(new String[]{"婀栧崡鐢佃鍙板崟浣嶅鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡寮�鍏冲巶瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡灏忓尯", "鍖椾含"}); + add(new String[]{"婀栧崡閭數鏂版潙灏忓尯", "闉嶅北"}); + add(new String[]{"婀栧崡鐪佺瀛︽妧鏈巺瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸浗瀹夊巺鍗曚綅鎴�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佹湪鍋跺墽鍥㈠鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佹皵璞″眬瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡濂冲瓙澶у鏁欏笀鍏瘬", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸啘涓氭満姊扮爺绌舵墍", "闀挎矙"}); + add(new String[]{"婀栧崡鏁欒偛瑁呭缁煎悎澶фゼ", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸姵鍔ㄥ崼鐢熸墍", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佽川閲忔妧鏈洃鐫e眬瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡鐪侀噾灞炲洖鏀跺叕鍙稿鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸鏂欑爺绌舵墍", "闀挎矙"}); + add(new String[]{"婀栧崡鐪侀珮绾т汉姘戞鏌ラ櫌鍗曚綅鎴�", "闀挎矙"}); + add(new String[]{"婀栧崡浜ら�氳亴闄㈠鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸喍閲戞潗鏂欑爺绌舵墍", "闀挎矙"}); + add(new String[]{"婀栧崡閲戣渹闊冲儚鍑虹増绀�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佺墿璧勫巺瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡瀹剁數鍟嗗煄", "闀挎矙"}); + add(new String[]{"婀栧崡鍥介檯鍟嗗姟涓績", "闀挎矙"}); + add(new String[]{"婀栧崡璐㈠瘜涓績", "闀挎矙"}); + add(new String[]{"婀栧崡鍥介檯姹借溅鍩�", "闀挎矙"}); + add(new String[]{"婀栧崡浜氬ぇ鏁扮爜娓�", "闀挎矙"}); + add(new String[]{"婀栧崡澶у帵", "鍗楀畞"}); + add(new String[]{"婀栧崡澶у帵", "涓婃捣"}); + add(new String[]{"婀栧崡鏄熸矙姹介厤鍩�", "闀挎矙"}); + add(new String[]{"婀栧崡鑹烘牎鍗曚綅鎴�", "闀挎矙"}); + add(new String[]{"婀栧崡璐笓鏁欒亴宸ュ鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佹満姊拌繘鍑哄彛鍏徃瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡鏃ユ姤鍗曚綅瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡宀稿悗鐣堝皬鍖�", "缁嶅叴"}); + }}); + city_DistrictNames.put("琛¢槼", new ArrayList(){{ + add(new String[]{"琛¢槼鏂板眳锛堜綇瀹咃級", "鍗楀畞"}); + add(new String[]{"琛¢槼鍚嶉儭", "琛¢槼"}); + }}); + city_DistrictNames.put("骞胯タ澹棌", new ArrayList(){{ + add(new String[]{"骞胯タ澹棌鑷不鍖哄徃娉曞巺瀹胯垗", "鍗楀畞"}); + add(new String[]{"骞胯タ澹棌鑷不鍖哄啘涓氬巺瀹胯垗", "鍗楀畞"}); + }}); + city_DistrictNames.put("鐜夋灄", new ArrayList(){{ + add(new String[]{"鐜夋灄涓滈噷", "鍖椾含"}); + add(new String[]{"鐜夋灄閲屽皬鍖�", "鍖椾含"}); + add(new String[]{"鐜夋灄灏忓尯", "鍖椾含"}); + add(new String[]{"鐜夋灄鍏贩绀惧尯", "鎴愰兘"}); + add(new String[]{"鐜夋灄鍏贩6鍙烽櫌", "鎴愰兘"}); + add(new String[]{"鐜夋灄鐜夐�氬贩8鍙烽櫌", "鎴愰兘"}); + add(new String[]{"鐜夋灄鑻戜簩鏈�", "鎴愰兘"}); + add(new String[]{"鐜夋灄钃撹暰绀惧尯", "鎴愰兘"}); + add(new String[]{"鐜夋灄涓冨贩", "鎴愰兘"}); + add(new String[]{"鐜夋灄瑗块噷灏忓尯", "鍖椾含"}); + add(new String[]{"鐜夋灄灏忓尯", "閲嶅簡"}); + add(new String[]{"鐜夋灄鑻�", "鎴愰兘"}); + add(new String[]{"鐜夋灄灏忓尯", "鎴愰兘"}); + add(new String[]{"鐜夋灄鍢夎嫅", "鎴愰兘"}); + add(new String[]{"鐜夋灄浜哄", "鎴愰兘"}); + add(new String[]{"鐜夋灄绁ュ拰鑻�", "鎴愰兘"}); + add(new String[]{"鐜夋灄澶у帵", "姝︽眽"}); + add(new String[]{"鐜夋灄鍝佷笂", "鎴愰兘"}); + add(new String[]{"鐜夋灄閮藉競閲戝哺", "鎴愰兘"}); + add(new String[]{"鐜夋灄鍚嶅眳", "鎴愰兘"}); + add(new String[]{"鐜夋灄涔濆贩4鍙烽櫌", "鎴愰兘"}); + add(new String[]{"鐜夋灄鍏贩2鍙烽櫌", "鎴愰兘"}); + add(new String[]{"鐜夋灄鍖楀贩8鍙烽櫌", "鎴愰兘"}); + add(new String[]{"鐜夋灄浜岄噷", "鍖椾含"}); + add(new String[]{"鐜夋灄鍊嶇壒绉戞妧鍥�", "鎴愰兘"}); + add(new String[]{"鐜夋灄鑻�", "鏄嗗北"}); + add(new String[]{"鐜夋灄鍏畨鍘呭鑸�", "鎴愰兘"}); + add(new String[]{"鐜夋灄鏂板ぉ鍦�", "鎴愰兘"}); + add(new String[]{"鐜夋灄鑺冲崕", "鎴愰兘"}); + add(new String[]{"鐜夋灄灞辨按", "鏇查潠"}); + add(new String[]{"鐜夋灄灏忓尯(娌剧泭)", "鏇查潠"}); + add(new String[]{"鐜夋灄灏忓尯", "鏇查潠"}); + add(new String[]{"鐜夋灄鍥皬鍖�", "涓芥睙"}); + add(new String[]{"鐜夋灄鑺卞洯", "涓芥睙"}); + add(new String[]{"鐜夋灄澶ф柊绀惧尯", "鐜夋灄"}); + add(new String[]{"鐜夋灄涓滅洓鍗庡簻", "鐜夋灄"}); + add(new String[]{"鐜夋灄鍗庡晢鍥介檯", "鐜夋灄"}); + }}); + city_DistrictNames.put("杈藉畞", new ArrayList(){{ + add(new String[]{"杈藉畞涓尰瀹跺睘妤�", "娌堥槼"}); + add(new String[]{"杈藉畞閲�", "澶╂触"}); + }}); + city_DistrictNames.put("涓逛笢", new ArrayList(){{ + add(new String[]{"涓逛笢閲�", "澶╂触"}); + }}); + city_DistrictNames.put("婀栧寳", new ArrayList(){{ + add(new String[]{"婀栧寳灏忓尯", "鍖椾含"}); + add(new String[]{"婀栧寳瀹濅赴鑺卞洯", "娣卞湷"}); + add(new String[]{"婀栧寳缁忔祹瀛﹂櫌瀹胯垗", "姝︽眽"}); + add(new String[]{"婀栧寳澶у瀹胯垗", "姝︽眽"}); + add(new String[]{"婀栧寳鏃ユ姤瀹胯垗", "姝︽眽"}); + add(new String[]{"婀栧寳鐪佹枃鑱斿鑸�", "姝︽眽"}); + add(new String[]{"婀栧寳鐜颁唬浜旈噾鐢靛櫒鍩�", "姝︽眽"}); + add(new String[]{"婀栧寳楗簵瀹胯垗", "姝︽眽"}); + add(new String[]{"婀栧寳淇濋櫓鍏徃瀹跺睘妤�", "姝︽眽"}); + add(new String[]{"婀栧寳鏋椾笟鍕樺療闄㈠皬鍖�", "姝︽眽"}); + add(new String[]{"婀栧寳浜ら�氳亴涓氭妧鏈闄㈠鑸�", "姝︽眽"}); + add(new String[]{"婀栧寳鐪佽壓鏈鏍″鑸�", "姝︽眽"}); + add(new String[]{"婀栧寳澶у帵", "鍘﹂棬"}); + add(new String[]{"婀栧寳璐ㄩ噺鐩戠潱灞�瀹胯垗", "姝︽眽"}); + add(new String[]{"婀栧寳鐪佸尰鑽洃鐫g鐞嗗眬瀹胯垗", "姝︽眽"}); + add(new String[]{"婀栧寳鏁欒偛鍑虹増绀惧鑸�", "姝︽眽"}); + add(new String[]{"婀栧寳鐪佽嵂鏉愬叕鍙稿鑸�", "姝︽眽"}); + add(new String[]{"婀栧寳浜屽笀瀹胯垗", "姝︽眽"}); + add(new String[]{"婀栧寳涓尰瀛﹂櫌瀹胯垗", "姝︽眽"}); + add(new String[]{"婀栧寳鐪佺敓娲昏祫鏂欏叕鍙稿眳姘戝皬鍖�", "姝︽眽"}); + add(new String[]{"婀栧寳鍟嗗姟骞垮満", "姝︽眽"}); + add(new String[]{"婀栧寳鏁欒偛瀛﹂櫌瀹胯垗", "姝︽眽"}); + add(new String[]{"婀栧寳鐪佺洃鐙辩鐞嗗眬瀹胯垗", "姝︽眽"}); + add(new String[]{"婀栧寳鐪佸畨鍏ㄧ洃瀵熷眬瀹胯垗", "姝︽眽"}); + }}); + city_DistrictNames.put("瀹滄槍", new ArrayList(){{ + add(new String[]{"瀹滄槍鍏瘬", "澶╂触"}); + add(new String[]{"瀹滄槍CBD涓績鍟嗗姟鍖�", "瀹滄槍"}); + add(new String[]{"瀹滄槍灏忓尯", "娌堥槼"}); + add(new String[]{"瀹滄槍閲�", "澶╂触"}); + add(new String[]{"瀹滄槍涓囪揪骞垮満", "瀹滄槍"}); + add(new String[]{"瀹滄槍鍟嗕笟姝ヨ琛楃传鏅跺煄", "瀹滄槍"}); + add(new String[]{"瀹滄槍鍟嗕笟姝ヨ琛�", "瀹滄槍"}); + add(new String[]{"瀹滄槍鑺卞洯浜屾湡", "鐝犳捣"}); + add(new String[]{"瀹滄槍鍗楅噷", "澶╂触"}); + add(new String[]{"瀹滄槍鍖楅噷", "澶╂触"}); + add(new String[]{"瀹滄槍棣ㄥ洯", "闈掑矝"}); + add(new String[]{"瀹滄槍瀹跺洯", "闈掑矝"}); + add(new String[]{"瀹滄槍鍗楅噷路濉樻步鍖�", "澶╂触"}); + add(new String[]{"瀹滄槍鍟嗕笟姝ヨ琛楀皬鍖�", "瀹滄槍"}); + }}); + city_DistrictNames.put("娴欐睙", new ArrayList(){{ + add(new String[]{"娴欐睙宸ヤ笟澶у鏁欏笀瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙澶у帵", "澶師"}); + add(new String[]{"娴欐睙鍔炰簨澶勫鑸�", "澶師"}); + add(new String[]{"娴欐睙浠佸拰灞呰�佸勾鍏荤敓鍏瘬", "婀栧窞"}); + add(new String[]{"娴欐睙浜よ繍澶у帵", "鏉窞"}); + add(new String[]{"娴欐睙宸ュ晢澶у瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙鍟嗚锤鍩�", "鍚堣偉"}); + add(new String[]{"娴欐睙宸ヤ笟澶у涔嬫睙瀛﹂櫌", "鏉窞"}); + }}); + city_DistrictNames.put("娓╁窞", new ArrayList(){{ + add(new String[]{"娓╁窞澶у帵", "娴峰彛"}); + add(new String[]{"娓╁窞鍩�", "璐甸槼"}); + add(new String[]{"娓╁窞鍏瘬", "璐甸槼"}); + add(new String[]{"娓╁窞鍟嗗煄", "婀栧窞"}); + add(new String[]{"娓╁窞鍟嗗煄", "鍞愬北"}); + add(new String[]{"娓╁窞涓栬锤涓績澶у帵", "娓╁窞"}); + add(new String[]{"娓╁窞涓栬锤涓績骞垮満", "娓╁窞"}); + add(new String[]{"娓╁窞浜烘墠澶у帵", "娓╁窞"}); + add(new String[]{"娓╁窞榫欐咕涓囪揪骞垮満", "娓╁窞"}); + add(new String[]{"娓╁窞鍩幝烽兘涔愭眹", "娌堥槼"}); + add(new String[]{"娓╁窞鍟嗗煄", "閲戝崕"}); + }}); + city_DistrictNames.put("涔愭竻", new ArrayList(){{ + add(new String[]{"涔愭竻灏忓尯", "娣卞湷"}); + add(new String[]{"涔愭竻路涓ぎ鍏", "涔愭竻"}); + add(new String[]{"涔愭竻璐㈠瘜鏂板ぉ鍦�", "涔愭竻"}); + add(new String[]{"涔愭竻闆佽崱灏忛晣", "涔愭竻"}); + add(new String[]{"涔愭竻鑺卞洯", "缁嶅叴"}); + add(new String[]{"涔愭竻闆佽崱灏忛晣", "娓╁窞"}); + add(new String[]{"涔愭竻路涓ぎ鍏", "娓╁窞"}); + add(new String[]{"涔愭竻璐㈠瘜鏂板ぉ鍦�", "娓╁窞"}); + }}); + city_DistrictNames.put("鍚夋灄", new ArrayList(){{ + add(new String[]{"鍚夋灄澶у帵", "娴峰彛"}); + add(new String[]{"鍚夋灄鑺卞洯", "璐甸槼"}); + add(new String[]{"鍚夋灄绀惧尯", "姝︽眽"}); + add(new String[]{"鍚夋灄鐪佸洟鏍″灞炴ゼ", "闀挎槬"}); + add(new String[]{"鍚夋灄閲�", "澶╂触"}); + }}); + city_DistrictNames.put("鍚夋灄", new ArrayList(){{ + add(new String[]{"鍚夋灄澶у帵", "娴峰彛"}); + add(new String[]{"鍚夋灄鑺卞洯", "璐甸槼"}); + add(new String[]{"鍚夋灄绀惧尯", "姝︽眽"}); + add(new String[]{"鍚夋灄鐪佸洟鏍″灞炴ゼ", "闀挎槬"}); + add(new String[]{"鍚夋灄閲�", "澶╂触"}); + }}); + city_DistrictNames.put("榛戦緳姹�", new ArrayList(){{ + }}); + city_DistrictNames.put("澶у簡", new ArrayList(){{ + add(new String[]{"澶у簡涓�鍖�", "濞佹捣"}); + add(new String[]{"澶у簡鏉戠煶娌瑰皬鍖�", "閲嶅簡"}); + add(new String[]{"澶у簡铚�鑻�", "鎴愰兘"}); + add(new String[]{"澶у簡閲�", "澶╂触"}); + add(new String[]{"澶у簡鏂版潙", "瀹佹尝"}); + add(new String[]{"澶у簡鏂版潙", "婀樻江"}); + add(new String[]{"澶у簡鏂版潙", "鐩愬煄"}); + }}); + city_DistrictNames.put("骞胯タ", new ArrayList(){{ + add(new String[]{"骞胯タ鐢佃鍙板鑸�", "鍗楀畞"}); + add(new String[]{"骞胯タ姘旇薄灞�鏂扮璺敓娲诲皬鍖�", "鍗楀畞"}); + add(new String[]{"骞胯タ鏈ㄦ潗鍏徃瀹胯垗", "鍗楀畞"}); + add(new String[]{"骞胯タ澹棌鑷不鍖哄徃娉曞巺瀹胯垗", "鍗楀畞"}); + add(new String[]{"骞胯タ鏂伴椈鍑虹増灞�鐢熸椿鍖�", "鍗楀畞"}); + add(new String[]{"骞胯タ鍑哄叆澧冩楠屾鐤眬瀹胯垗", "鍗楀畞"}); + add(new String[]{"骞胯タ鍗楀畞鐧芥矙澶ч亾楹荤汉鍘傚鑸�", "鍗楀畞"}); + add(new String[]{"骞胯タ鍖虹伯椋熷眬瀹胯垗", "鍗楀畞"}); + add(new String[]{"骞胯タ鐢电綉鍏徃鐢熸椿鍖�", "鍗楀畞"}); + add(new String[]{"骞胯タ瓒呭ぇ鍏徃瀹胯垗", "鍗楀畞"}); + add(new String[]{"骞胯タ鐢靛姏鏈夐檺鍏徃鐞呬笢鐢熸椿鍖�", "鍗楀畞"}); + add(new String[]{"骞胯タ浜屽缓涓�鍒嗗叕鍙稿鑸�", "鍗楀畞"}); + add(new String[]{"骞胯タ澹棌鑷不鍖哄啘涓氬巺瀹胯垗", "鍗楀畞"}); + add(new String[]{"骞胯タ浜屽缓瀹胯垗", "鍗楀畞"}); + add(new String[]{"骞胯タ涓�寤鸿亴宸ョ敓娲诲尯", "鍗楀畞"}); + add(new String[]{"骞胯タ鍖轰笣缁稿叕鍙稿鑸�", "鍗楀畞"}); + add(new String[]{"骞胯タ姘寸數宸ョ▼灞�绉戝洯鍩哄湴", "鍗楀畞"}); + add(new String[]{"骞胯タ鐢电綉鍏徃瀹胯垗", "鍗楀畞"}); + add(new String[]{"骞胯タ鍏缓鐢熸椿鍖�", "鍗楀畞"}); + add(new String[]{"骞胯タ閲嶉槼鑰佸勾鍏瘬", "鍗楀畞"}); + add(new String[]{"骞胯タ鍐滀笟鍘呭�间繚鎬荤珯瀹胯垗", "鍗楀畞"}); + add(new String[]{"骞胯タ鍦板嚡绉戞妧鍏徃瀹胯垗", "鍗楀畞"}); + add(new String[]{"骞胯タ鏈虹數璁惧鍏徃瀹胯垗", "鍗楀畞"}); + add(new String[]{"骞胯タ涓版灄鏋椾笟闆嗗洟", "鍗楀畞"}); + add(new String[]{"骞胯タ鑱氱闅嗙伅楗板箍鍦�", "鍗楀畞"}); + add(new String[]{"骞胯タ鍏存澶у帵", "鍗楀畞"}); + add(new String[]{"骞胯タ濂冲瓙鍔冲姩鏁欒偛鏀归�犲鑸�", "鍗楀畞"}); + add(new String[]{"骞胯タ鍑虹増鎬荤ぞ鍟嗕綇妤�", "鍗楀畞"}); + add(new String[]{"骞胯タ绗竴瀹夎鍏徃鐢熸椿鍖�", "鍗楀畞"}); + add(new String[]{"骞胯タ鍣ㄦ鍘傚鑸�", "鍗楀畞"}); + add(new String[]{"骞胯タ鏈烘杩涘嚭鍙e叕鍙稿鑸�", "鍗楀畞"}); + add(new String[]{"骞胯タ鍖烘。妗堝眬瀹胯垗", "鍗楀畞"}); + add(new String[]{"骞胯タ鍙戝睍澶у帵涓滄ゼ", "鍗楀畞"}); + add(new String[]{"骞胯タ鍐跺缓涓�鍏徃瀹胯垗", "鍗楀畞"}); + add(new String[]{"骞胯タ澶栬锤澶ч櫌灏忓尯", "娣卞湷"}); + add(new String[]{"骞胯タ鏃ユ姤绀惧鑸�", "鍗楀畞"}); + add(new String[]{"骞胯タ鍐滀笟鏈烘鐮旂┒闄�", "鍗楀畞"}); + add(new String[]{"骞胯タ鎷涚敓鑰冭瘯闄�", "鍗楀畞"}); + add(new String[]{"骞胯タ鍏藉尰澶ч櫌", "鍗楀畞"}); + add(new String[]{"骞胯タ鍗庡崡鐑归オ涓撲笟瀛︽牎瀹胯垗", "鍗楀畞"}); + add(new String[]{"骞胯タ鍗楀畞鍗楅鏈哄櫒鎬诲巶", "鍗楀畞"}); + add(new String[]{"骞胯タ鍖哄璁″巺瀹胯垗", "鍗楀畞"}); + add(new String[]{"骞胯タ鍗敓鍘呭崟浣嶆埧", "鍗楀畞"}); + add(new String[]{"骞胯タ鍙戝睍澶у帵", "鍗楀畞"}); + }}); + city_DistrictNames.put("鍗楀畞", new ArrayList(){{ + add(new String[]{"鍗楀畞濂ュ洯", "鍗楀畞"}); + add(new String[]{"鍗楀畞娴蜂簨灞�瀹胯垗", "鍗楀畞"}); + add(new String[]{"鍗楀畞甯傝敩鑿滅爺绌舵墍瀹胯垗", "鍗楀畞"}); + add(new String[]{"鍗楀畞甯傜數缃戝叕鍙稿鑸�", "鍗楀畞"}); + add(new String[]{"鍗楀畞甯傞噾铻嶅皬鍖�", "鍗楀畞"}); + add(new String[]{"鍗楀畞鍦板尯琛屾斂鍏讲琛¢槼鐢熸椿鍖�", "鍗楀畞"}); + add(new String[]{"鍗楀畞渚涚數灞�鐧芥矙鐢熸椿鍖�", "鍗楀畞"}); + add(new String[]{"鍗楀畞绗洓鑱屼笟涓", "鍗楀畞"}); + add(new String[]{"鍗楀畞閽堢粐鍘傚鑸�", "鍗楀畞"}); + add(new String[]{"鍗楀畞甯傛鑳跺巶瀹胯垗", "鍗楀畞"}); + add(new String[]{"鍗楀畞鐩戠嫳灞�瀹胯垗", "鍗楀畞"}); + add(new String[]{"鍗楀畞寤哄畞渚涚敤鐢靛伐绋嬪鑸�", "鍗楀畞"}); + add(new String[]{"鍗楀畞鑽疯姳鍛崇簿鍘傚鑸�", "鍗楀畞"}); + add(new String[]{"鍗楀畞閾濆巶瀹胯垗", "鍗楀畞"}); + add(new String[]{"鍗楀畞缁忔祹鎶�鏈悎浣滃叕鍙�", "鍗楀畞"}); + add(new String[]{"鍗楀畞鍒剁硸閫犵焊鍘�", "鍗楀畞"}); + add(new String[]{"鍗楀畞鎭掑ぇ缁挎床", "鍗楀畞"}); + add(new String[]{"鍗楀畞甯傞潰绮夊巶瀹胯垗", "鍗楀畞"}); + add(new String[]{"鍗楀畞甯傛暣娌绘湞闃虫邯绠$悊澶勫鑸�", "鍗楀畞"}); + add(new String[]{"鍗楀畞甯傛柊鐜悆姗辨煖骞垮満", "鍗楀畞"}); + add(new String[]{"鍗楀畞鏈烘鍘傚鑸嶏紙鍗楀尯锛�", "鍗楀畞"}); + add(new String[]{"鍗楀畞甯備簩寤哄叕鍙稿鑸�", "鍗楀畞"}); + add(new String[]{"鍗楀畞甯傝仛绉�鍥�", "鍗楀畞"}); + add(new String[]{"鍗楀畞浜岃交瀹胯垗", "鍗楀畞"}); + add(new String[]{"鍗楀畞杈规绔�", "鍗楀畞"}); + add(new String[]{"鍗楀畞鐢典俊澶фゼ", "鍗楀畞"}); + add(new String[]{"鍗楀畞閲嶅瀷鏈哄櫒鍘傜敓娲诲尯", "鍗楀畞"}); + add(new String[]{"鍗楀畞渚涚數灞�绁ュ璺敓娲诲尯", "鍗楀畞"}); + add(new String[]{"鍗楀畞鏉愭枡鍘�", "鍗楀畞"}); + add(new String[]{"鍗楀畞琚湇鍘傚鑸�", "鍗楀畞"}); + add(new String[]{"鍗楀畞甯傝嚜鏉ユ按鍏徃瀹胯垗", "鍗楀畞"}); + add(new String[]{"鍗楀畞鍢夊+鎽╂牴鍥介檯", "鍗楀畞"}); + add(new String[]{"鍗楀畞閾舵潐鐢电嚎鐢电紗灏忓尯", "鍗楀畞"}); + add(new String[]{"鍗楀畞甯傛満鐢靛叕鍙稿鑸�", "鍗楀畞"}); + add(new String[]{"鍗楀畞甯傜鐞嗗眬瀹胯垗", "鍗楀畞"}); + add(new String[]{"鍗楀畞甯傝嚜鏉ユ按鍏徃娌冲崡姘村巶瀹胯垗", "鍗楀畞"}); + add(new String[]{"鍗楀畞灏忓尯", "娌堥槼"}); + add(new String[]{"鍗楀畞棣ㄨ嫅", "娌堥槼"}); + add(new String[]{"鍗楀畞灏忓尯", "鎴愰兘"}); + add(new String[]{"鍗楀畞甯傚嫎娴嬮櫌鍖楁箹浣忓畢灏忓尯", "鍗楀畞"}); + add(new String[]{"鍗楀畞甯傛満鍏宠溅闃熷鑸�", "鍗楀畞"}); + add(new String[]{"鍗楀畞甯備緵鐢靛眬", "鍗楀畞"}); + add(new String[]{"鍗楀畞姣涚汉鍘傚鑸�", "鍗楀畞"}); + add(new String[]{"鍗楀畞鏃ユ姤绀惧崟浣嶅鑸嶅尯", "鍗楀畞"}); + add(new String[]{"鍗楀畞鑱屼笟鎶�鏈闄㈠洓鍒嗛櫌", "鍗楀畞"}); + add(new String[]{"鍗楀畞鍚夌帥鐗�", "鏇查潠"}); + add(new String[]{"鍗楀畞灏忓尯", "鏇查潠"}); + }}); + city_DistrictNames.put("骞夸笢", new ArrayList(){{ + add(new String[]{"骞夸笢澶栬锤骞垮満", "骞垮窞"}); + add(new String[]{"骞夸笢澶栬鑹烘湳瀛﹂櫌鏁欏笀瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢寤虹闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢鍙告硶璀﹀畼鑱屼笟瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐜繚澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍟嗕笟澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍖诲闄㈡暀甯堝鑸嶆ゼ", "涓滆帪"}); + add(new String[]{"骞夸笢鍥介檯澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佹妧鏈洃鐫e眬瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢宸ヤ笟澶у瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鏁欒偛瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪侀摱琛屽ぇ鍘�", "娣卞湷"}); + add(new String[]{"骞夸笢澶у帵", "澶╂触"}); + add(new String[]{"骞夸笢灞卞簞", "闀囨睙"}); + add(new String[]{"骞夸笢绾㈢浘澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鑽闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢闈掑勾骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鍩虹妤�", "娣卞湷"}); + add(new String[]{"骞夸笢鐪佺鎶�骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佸啘涓氱鐞嗗共閮ㄥ闄㈢ぞ鍖�", "骞垮窞"}); + add(new String[]{"骞夸笢鑺暰闆烽�告櫙", "浣涘北"}); + }}); + city_DistrictNames.put("姊呭窞", new ArrayList(){{ + add(new String[]{"姊呭窞澶у帵", "骞垮窞"}); + add(new String[]{"姊呭窞澶фゼ", "涓婃捣"}); + add(new String[]{"姊呭窞鏂版潙", "涓婃捣"}); + add(new String[]{"姊呭窞澶у帵", "娣卞湷"}); + }}); + city_DistrictNames.put("灞变笢", new ArrayList(){{ + add(new String[]{"灞变笢閲�", "绉︾殗宀�"}); + add(new String[]{"灞变笢缁忔祹瀛﹂櫌瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢鐪佸崼鐢熷巺瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢鐪佹皯鏀垮巺瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢鐪佸晢涓氶泦鍥㈡�诲叕鍙稿鑸�", "娴庡崡"}); + add(new String[]{"灞变笢鍖荤澶у鏁欏笀瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢澶栬锤澶у帵", "闈掑矝"}); + add(new String[]{"灞变笢澶у帵", "娣卞湷"}); + add(new String[]{"灞变笢鍫$ぞ鍖�", "娌堥槼"}); + add(new String[]{"灞变笢鑹烘湳瀛﹂櫌瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢榛勯噾宕簯婀栭珮灏斿か鍒", "娴庡崡"}); + add(new String[]{"灞变笢鍙告硶璀﹀畼瀛﹂櫌瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢鐪佺瀛﹂櫌楂樻柊鎶�鏈爺绌跺垎闄�", "闈掑矝"}); + add(new String[]{"灞变笢寤哄伐瀛﹂櫌瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢搴欏皬鍖�", "娌堥槼"}); + add(new String[]{"灞变笢涔冲北閾舵哗娴锋櫙鎴�", "濞佹捣"}); + add(new String[]{"灞变笢澶存潙", "闈掑矝"}); + add(new String[]{"灞变笢鐪佺暅鐗у眬瀹胯垗", "娴庡崡"}); + }}); + city_DistrictNames.put("涓滆惀", new ArrayList(){{ + add(new String[]{"涓滆惀閲�5鍙烽櫌", "鍖椾含"}); + add(new String[]{"涓滆惀閲�1鍙烽櫌", "鍖椾含"}); + add(new String[]{"涓滆惀閲�2鍙烽櫌", "鍖椾含"}); + add(new String[]{"涓滆惀閲�3鍙烽櫌", "鍖椾含"}); + add(new String[]{"涓滆惀閲�", "鍖椾含"}); + add(new String[]{"涓滆惀鎴垮皬鍖�", "鍖椾含"}); + add(new String[]{"涓滆惀鎴垮叓鏉�", "鍖椾含"}); + }}); + city_DistrictNames.put("鍥涘窛", new ArrayList(){{ + add(new String[]{"鍥涘窛鐪佺洿鏈哄叧宸ュ瀹胯垗", "鎴愰兘"}); + add(new String[]{"鍥涘窛鐪佹灄涓氬巺瀹胯垗", "鎴愰兘"}); + add(new String[]{"鍥涘窛闊充箰瀛﹂櫌瀹胯垗", "鎴愰兘"}); + add(new String[]{"鍥涘窛鐪侀椊涓競椹荤枂鍔炰簨澶勫皬鍖�", "涔岄瞾鏈ㄩ綈"}); + add(new String[]{"鍥涘窛澶у帵", "鍘﹂棬"}); + add(new String[]{"鍥涘窛鐪佺鎶�鍘呭鑸�", "鎴愰兘"}); + add(new String[]{"鍥涘窛涓撶敤姹借溅鍘傚鑸�", "鎴愰兘"}); + add(new String[]{"鍥涘窛鏃ユ姤瀹胯垗", "鎴愰兘"}); + add(new String[]{"鍥涘窛鑹烘湳鑱屼笟瀛﹂櫌瀹跺睘妤�", "鎴愰兘"}); + add(new String[]{"鍥涘窛钀ヨ儭鍚�", "鍖椾含"}); + add(new String[]{"鍥涘窛灏忓尯", "涓婃捣"}); + add(new String[]{"鍥涘窛骞煎笀瀹胯垗", "鎴愰兘"}); + add(new String[]{"鍥涘窛澶у鍐滄灄鏉�", "鎴愰兘"}); + }}); + city_DistrictNames.put("鑷础", new ArrayList(){{ + add(new String[]{"鑷础甯傚绾虫渤鐣�", "鑷础"}); + }}); + city_DistrictNames.put("婀栧寳", new ArrayList(){{ + add(new String[]{"婀栧寳灏忓尯", "鍖椾含"}); + add(new String[]{"婀栧寳瀹濅赴鑺卞洯", "娣卞湷"}); + add(new String[]{"婀栧寳缁忔祹瀛﹂櫌瀹胯垗", "姝︽眽"}); + add(new String[]{"婀栧寳澶у瀹胯垗", "姝︽眽"}); + add(new String[]{"婀栧寳鏃ユ姤瀹胯垗", "姝︽眽"}); + add(new String[]{"婀栧寳鐪佹枃鑱斿鑸�", "姝︽眽"}); + add(new String[]{"婀栧寳鐜颁唬浜旈噾鐢靛櫒鍩�", "姝︽眽"}); + add(new String[]{"婀栧寳楗簵瀹胯垗", "姝︽眽"}); + add(new String[]{"婀栧寳淇濋櫓鍏徃瀹跺睘妤�", "姝︽眽"}); + add(new String[]{"婀栧寳鏋椾笟鍕樺療闄㈠皬鍖�", "姝︽眽"}); + add(new String[]{"婀栧寳浜ら�氳亴涓氭妧鏈闄㈠鑸�", "姝︽眽"}); + add(new String[]{"婀栧寳鐪佽壓鏈鏍″鑸�", "姝︽眽"}); + add(new String[]{"婀栧寳澶у帵", "鍘﹂棬"}); + add(new String[]{"婀栧寳璐ㄩ噺鐩戠潱灞�瀹胯垗", "姝︽眽"}); + add(new String[]{"婀栧寳鐪佸尰鑽洃鐫g鐞嗗眬瀹胯垗", "姝︽眽"}); + add(new String[]{"婀栧寳鏁欒偛鍑虹増绀惧鑸�", "姝︽眽"}); + add(new String[]{"婀栧寳鐪佽嵂鏉愬叕鍙稿鑸�", "姝︽眽"}); + add(new String[]{"婀栧寳浜屽笀瀹胯垗", "姝︽眽"}); + add(new String[]{"婀栧寳涓尰瀛﹂櫌瀹胯垗", "姝︽眽"}); + add(new String[]{"婀栧寳鐪佺敓娲昏祫鏂欏叕鍙稿眳姘戝皬鍖�", "姝︽眽"}); + add(new String[]{"婀栧寳鍟嗗姟骞垮満", "姝︽眽"}); + add(new String[]{"婀栧寳鏁欒偛瀛﹂櫌瀹胯垗", "姝︽眽"}); + add(new String[]{"婀栧寳鐪佺洃鐙辩鐞嗗眬瀹胯垗", "姝︽眽"}); + add(new String[]{"婀栧寳鐪佸畨鍏ㄧ洃瀵熷眬瀹胯垗", "姝︽眽"}); + }}); + city_DistrictNames.put("姝︽眽", new ArrayList(){{ + add(new String[]{"姝︽眽绀惧尯", "澶ц繛"}); + add(new String[]{"姝︽眽灏忓鍗曚綅瀹胯垗", "姝︽眽"}); + add(new String[]{"姝︽眽涓涔﹂鑻�", "姝︽眽"}); + add(new String[]{"姝︽眽闆勬妤肩ぞ鍖�", "姝︽眽"}); + add(new String[]{"姝︽眽璇濆墽闄㈠鑸�", "姝︽眽"}); + add(new String[]{"姝︽眽妤氬墽鍥㈠鑸�", "姝︽眽"}); + add(new String[]{"姝︽眽鎭掑ぇ鍩�", "姝︽眽"}); + add(new String[]{"姝︽眽甯傚鍏氬瀹胯垗", "姝︽眽"}); + add(new String[]{"姝︽眽閾佸鍘傚鑸�", "姝︽眽"}); + add(new String[]{"姝︽眽澶у鐝炴鏁欏笀灏忓尯", "姝︽眽"}); + add(new String[]{"姝︽眽甯傝�佸共閮ㄥ鑸�", "姝︽眽"}); + add(new String[]{"姝︽眽姹夊墽闄㈠鑸�", "姝︽眽"}); + add(new String[]{"姝︽眽姹借溅閿佸巶瀹胯垗", "姝︽眽"}); + add(new String[]{"姝︽眽鍒惰嵂鍘傚皬鍖�", "姝︽眽"}); + add(new String[]{"姝︽眽绗竴鑱屾暀涓績鍏瘬", "姝︽眽"}); + add(new String[]{"姝︽眽甯傜涓�鎶�鏈鏍″鑸�", "姝︽眽"}); + add(new String[]{"姝︽眽骞垮満", "姝︽眽"}); + add(new String[]{"姝︽眽澶╁湴寰℃睙鑻�", "姝︽眽"}); + add(new String[]{"姝︽眽鍥涗腑灏忓尯", "姝︽眽"}); + add(new String[]{"姝︽眽澶у帵", "鍘﹂棬"}); + add(new String[]{"姝︽眽鏈哄簥鍘傚鑸�", "姝︽眽"}); + add(new String[]{"姝︽眽闀垮矝", "姝︽眽"}); + add(new String[]{"姝︽眽鍥戒俊鍩�", "姝︽眽"}); + add(new String[]{"姝︽眽鐢熺墿鐮旂┒鎵�瀹胯垗", "姝︽眽"}); + add(new String[]{"姝︽眽涓囬敠姹熷煄", "姝︽眽"}); + add(new String[]{"姝︽眽鏅氭姤瀹胯垗", "姝︽眽"}); + add(new String[]{"姝︽眽绉戞妧瀛﹂櫌闃冲厜鏍″尯瀹胯垗", "姝︽眽"}); + add(new String[]{"姝︽眽鍗氱墿棣嗗鑸�", "姝︽眽"}); + add(new String[]{"姝︽眽鍏畨灞�浜よ瀹胯垗", "姝︽眽"}); + add(new String[]{"姝︽眽鍓ч櫌鏉�", "姝︽眽"}); + add(new String[]{"姝︽眽绉戞妧瀛﹂櫌鏁欏笀灏忓尯", "姝︽眽"}); + add(new String[]{"姝︽眽宸ョ▼澶у鏁欏伐瀹胯垗", "姝︽眽"}); + add(new String[]{"姝︽眽缂濈韩鏈哄巶瀹胯垗", "姝︽眽"}); + add(new String[]{"姝︽眽浜ら�氬鏍″灞炲尯", "姝︽眽"}); + add(new String[]{"姝︽眽浜屽缓灏忓尯", "姝︽眽"}); + add(new String[]{"姝︽眽澶╂鼎宸ヤ笟鍥�", "姝︽眽"}); + add(new String[]{"姝︽眽鎭掍赴涓婃渤鍥�", "姝︽眽"}); + add(new String[]{"姝︽眽鍥介檯澶у帵", "姝︽眽"}); + add(new String[]{"姝︽眽鍥介檯浼氬睍涓績", "姝︽眽"}); + add(new String[]{"姝︽眽澶у瀹胯垗", "姝︽眽"}); + add(new String[]{"姝︽眽绉戞妧澶у鏁欏伐瀹胯垗", "姝︽眽"}); + add(new String[]{"姝︽眽绾虹粐澶у瀹胯垗", "姝︽眽"}); + add(new String[]{"姝︽眽鏁扮爜娓�", "姝︽眽"}); + add(new String[]{"姝︽眽鏂拌埅鍩庢槦鍩庤鍖�", "姝︽眽"}); + add(new String[]{"姝︽眽鏃朵唬骞垮満", "姝︽眽"}); + add(new String[]{"姝︽眽纰ф鍥埆澧�", "姝︽眽"}); + }}); + city_DistrictNames.put("娴欐睙", new ArrayList(){{ + add(new String[]{"娴欐睙宸ヤ笟澶у鏁欏笀瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙澶у帵", "澶師"}); + add(new String[]{"娴欐睙鍔炰簨澶勫鑸�", "澶師"}); + add(new String[]{"娴欐睙浠佸拰灞呰�佸勾鍏荤敓鍏瘬", "婀栧窞"}); + add(new String[]{"娴欐睙浜よ繍澶у帵", "鏉窞"}); + add(new String[]{"娴欐睙宸ュ晢澶у瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙鍟嗚锤鍩�", "鍚堣偉"}); + add(new String[]{"娴欐睙宸ヤ笟澶у涔嬫睙瀛﹂櫌", "鏉窞"}); + }}); + city_DistrictNames.put("琛㈠窞", new ArrayList(){{ + add(new String[]{"琛㈠窞鑺卞洯", "琛㈠窞"}); + add(new String[]{"琛㈠窞浜哄", "琛㈠窞"}); + add(new String[]{"琛㈠窞杩滄櫙鍩�", "琛㈠窞"}); + add(new String[]{"琛㈠窞路鍚涙偊涓滄柟", "琛㈠窞"}); + add(new String[]{"琛㈠窞骞垮満瑗胯嫅", "琛㈠窞"}); + }}); + city_DistrictNames.put("娌冲寳", new ArrayList(){{ + add(new String[]{"娌冲寳绋庡姟瀛︽牎鐢熸椿鍖�", "鐭冲搴�"}); + add(new String[]{"娌冲寳缁忔祹鏃ユ姤绀惧鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳缇庢湳鍑虹増绀惧鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳鐗╄祫瀹胯垗", "鐭冲搴�"}); + add(new String[]{"娌冲寳鍖栧伐鍖昏嵂鑱屼笟鎶�鏈闄㈠鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳鐢垫満瀹胯垗", "鐭冲搴�"}); + add(new String[]{"娌冲寳鏃ユ姤绀惧鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳宸ョ▼閫犱环绠$悊鎬荤珯瀹胯垗", "鐭冲搴�"}); + add(new String[]{"娌冲寳搴峰煄", "娼嶅潑"}); + add(new String[]{"娌冲寳绀惧尯", "娌堥槼"}); + add(new String[]{"娌冲寳鍖荤澶у瀹胯垗", "鐭冲搴�"}); + add(new String[]{"娌冲寳鐪佷汉澶у鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳鏂颁汉瀹�", "鍞愬北"}); + add(new String[]{"娌冲寳涓�鍙�", "鍞愬北"}); + add(new String[]{"娌冲寳鏈鸿灞�瀹胯垗", "鐭冲搴�"}); + add(new String[]{"娌冲寳骞挎挱鐢佃鎶ュ鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳鍟嗗煄", "闈掑矝"}); + add(new String[]{"娌冲寳闀垮煄楗簵", "鐭冲搴�"}); + add(new String[]{"娌冲寳鏉戝皬鍖�", "鍖椾含"}); + add(new String[]{"娌冲寳妗冩睙閲�", "澶╂触"}); + add(new String[]{"娌冲寳甯堝ぇ闈掑勾鍏瘬妤�", "鐭冲搴�"}); + add(new String[]{"娌冲寳缁�", "鏃犻敗"}); + add(new String[]{"娌冲寳绀惧尯", "鏈邯"}); + add(new String[]{"娌冲寳妤�", "鍞愬北"}); + }}); + city_DistrictNames.put("鐭冲搴�", new ArrayList(){{ + add(new String[]{"鐭冲搴勫ぇ瀛﹀鑸�", "鐭冲搴�"}); + add(new String[]{"鐭冲搴勭粡娴庡闄㈠鑸�", "鐭冲搴�"}); + add(new String[]{"鐭冲搴勬棩鎶ョぞ瀹胯垗", "鐭冲搴�"}); + add(new String[]{"鐭冲搴勯ギ椋熷叕鍙稿鑸�", "鐭冲搴�"}); + add(new String[]{"鐭冲搴勭偧娌瑰巶浜屽尯", "鐭冲搴�"}); + add(new String[]{"鐭冲搴勫闄㈠鑸�", "鐭冲搴�"}); + }}); + city_DistrictNames.put("姹熻タ", new ArrayList(){{ + add(new String[]{"姹熻タ鐪佸缓宸ラ泦鍥�", "鍗楁槍"}); + add(new String[]{"姹熻タ璐㈢粡澶у閭斂瀹胯垗", "鍗楁槍"}); + add(new String[]{"姹熻タ鐪佸浘涔﹂瀹胯垗", "鍗楁槍"}); + add(new String[]{"姹熻タ瀹鹃鏃佽竟", "鍗楁槍"}); + add(new String[]{"姹熻タ琛屾斂瀛﹂櫌瀹胯垗", "鍗楁槍"}); + add(new String[]{"姹熻タ璐㈢粡澶у瀹胯垗", "鍗楁槍"}); + add(new String[]{"姹熻タ绉戞妧甯堣寖瀛﹂櫌瀹胯垗", "鍗楁槍"}); + add(new String[]{"姹熻タ鐪佸箍鎾數鍙板鑸�", "鍗楁槍"}); + add(new String[]{"姹熻タ涓滃崕璁¢噺鐮旂┒鎵�瀹胯垗", "鍗楁槍"}); + add(new String[]{"姹熻タ瀹㈣溅鍘傚鑸�", "鍗楁槍"}); + add(new String[]{"姹熻タ浠櫒鍘傚鑸�", "鍗楁槍"}); + add(new String[]{"姹熻タ鏄屼笢姹借溅浜ゆ槗骞垮満", "鍗楁槍"}); + add(new String[]{"姹熻タ鏃ц揣澶т笘鐣�", "鍗楁槍"}); + add(new String[]{"姹熻タ鏃ユ姤瀹胯垗", "鍗楁槍"}); + }}); + city_DistrictNames.put("涔濇睙", new ArrayList(){{ + add(new String[]{"涔濇睙閲�", "澶╂触"}); + add(new String[]{"涔濇睙灏忓尯", "涓逛笢"}); + add(new String[]{"涔濇睙涓介兘", "涓逛笢"}); + add(new String[]{"涔濇睙鍏瘬", "涓逛笢"}); + }}); + city_DistrictNames.put("骞夸笢", new ArrayList(){{ + add(new String[]{"骞夸笢澶栬锤骞垮満", "骞垮窞"}); + add(new String[]{"骞夸笢澶栬鑹烘湳瀛﹂櫌鏁欏笀瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢寤虹闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢鍙告硶璀﹀畼鑱屼笟瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐜繚澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍟嗕笟澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍖诲闄㈡暀甯堝鑸嶆ゼ", "涓滆帪"}); + add(new String[]{"骞夸笢鍥介檯澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佹妧鏈洃鐫e眬瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢宸ヤ笟澶у瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鏁欒偛瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪侀摱琛屽ぇ鍘�", "娣卞湷"}); + add(new String[]{"骞夸笢澶у帵", "澶╂触"}); + add(new String[]{"骞夸笢灞卞簞", "闀囨睙"}); + add(new String[]{"骞夸笢绾㈢浘澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鑽闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢闈掑勾骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鍩虹妤�", "娣卞湷"}); + add(new String[]{"骞夸笢鐪佺鎶�骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佸啘涓氱鐞嗗共閮ㄥ闄㈢ぞ鍖�", "骞垮窞"}); + add(new String[]{"骞夸笢鑺暰闆烽�告櫙", "浣涘北"}); + }}); + city_DistrictNames.put("鎻槼", new ArrayList(){{ + add(new String[]{"鎻槼宀崡鏄庣彔浜屾湡", "鎻槼"}); + }}); + city_DistrictNames.put("鍖椾含", new ArrayList(){{ + add(new String[]{"鍖椾含GOLF鍏瘬", "鍖椾含"}); + add(new String[]{"鍖椾含姹�", "鍖椾含"}); + add(new String[]{"鍖椾含鑺卞洯", "鍖椾含"}); + add(new String[]{"鍖椾含VISA", "鍖椾含"}); + add(new String[]{"鍖椾含绉戞妧澶у瀹跺睘妤�", "鍖椾含"}); + add(new String[]{"鍖椾含ONE", "鍖椾含"}); + add(new String[]{"鍖椾含濂ユ灄鍖瑰厠鑺卞洯", "鍖椾含"}); + add(new String[]{"鍖椾含楂樺皵澶叕瀵�", "鍖椾含"}); + add(new String[]{"鍖椾含涓婅垗", "鍖椾含"}); + add(new String[]{"鍖椾含婀�", "鍖椾含"}); + add(new String[]{"鍖椾含鍗庝鲸鍩�", "鍖椾含"}); + add(new String[]{"鍖椾含闈掑勾鍩�", "鍖椾含"}); + add(new String[]{"鍖椾含浜哄", "鍖椾含"}); + add(new String[]{"鍖椾含鍗拌薄", "鍖椾含"}); + add(new String[]{"鍖椾含鐜懓鍥�", "鍖椾含"}); + add(new String[]{"鍖椾含闅忓洯鍏瘬", "鍖椾含"}); + add(new String[]{"鍖椾含灏婂簻", "鍖椾含"}); + add(new String[]{"鍖椾含澶槼鍩�", "鍖椾含"}); + add(new String[]{"鍖椾含澶у帵", "娴峰彛"}); + add(new String[]{"鍖椾含绗節鍖�", "寤婂潑"}); + add(new String[]{"鍖椾含鍏洯", "澶ц繛"}); + add(new String[]{"鍖椾含澶槼鍩庝笁鏈�", "鍖椾含"}); + add(new String[]{"鍖椾含鍗婂矝", "鍖椾含"}); + add(new String[]{"鍖椾含濂芥季", "鍖椾含"}); + add(new String[]{"鍖椾含鍖�", "鍖椾含"}); + add(new String[]{"鍖椾含鍏", "鍖椾含"}); + add(new String[]{"鍖椾含涔℃潙楂樺皵澶埆澧�", "鍖椾含"}); + add(new String[]{"鍖椾含鍐滃闄㈠灞為櫌", "鍖椾含"}); + add(new String[]{"鍖椾含骞挎挱瀛﹂櫌瀹跺睘闄�", "鍖椾含"}); + add(new String[]{"鍖椾含宸ュ晢澶у鑱屽伐瀹胯垗", "鍖椾含"}); + add(new String[]{"鍖椾含澶栧浗璇ぇ瀛﹀灞為櫌", "鍖椾含"}); + add(new String[]{"鍖椾含鐭虫补澶ч櫌瀹跺睘妤�", "鍖椾含"}); + add(new String[]{"鍖椾含鑸炶箞瀛﹂櫌灏忓尯", "鍖椾含"}); + add(new String[]{"鍖椾含鍩庡缓鐔欏煄", "閲嶅簡"}); + add(new String[]{"鍖椾含鍏", "淇濆畾"}); + add(new String[]{"鍖椾含鑺卞洯", "瀹滄槍"}); + add(new String[]{"鍖椾含鍩庤姳鍥皬鍖�", "涔岄瞾鏈ㄩ綈"}); + add(new String[]{"鍖椾含鍩�", "涔岄瞾鏈ㄩ綈"}); + add(new String[]{"鍖椾含閲戝北", "绂忓窞"}); + add(new String[]{"鍖椾含鍥介檯鑺卞洯娓╂硥鍒", "鍖椾含"}); + add(new String[]{"鍖椾含鍖楄景楂樼骇鑺卞洯鍒", "鍖椾含"}); + add(new String[]{"鍖椾含娓╂邯灞卞簞", "鍖椾含"}); + add(new String[]{"鍖椾含姘旇薄灞�瀹胯垗", "鍖椾含"}); + add(new String[]{"鍖椾含鍩庡缓路绛戝崕骞�", "鍖椾含"}); + add(new String[]{"鍖椾含閾舵嘲涓績", "鍖椾含"}); + add(new String[]{"鍖椾含榫欒剦娓╂硥鑺卞洯", "鍖椾含"}); + add(new String[]{"鍖椾含缁块兘婧愪腑蹇�", "鍖椾含"}); + add(new String[]{"鍖椾含棰愭硥姹�", "鍖椾含"}); + add(new String[]{"鍖椾含鑱斿悎澶у骞垮憡瀛﹂櫌鑰佸笀瀹胯垗妤�", "鍖椾含"}); + add(new String[]{"鍖椾含闀挎瘺缁掑巶瀹胯垗", "鍖椾含"}); + add(new String[]{"鍖椾含鍢夐噷涓績", "鍖椾含"}); + add(new String[]{"鍖椾含杈夌洓闃佸浗闄呭叕瀵�", "鍖椾含"}); + add(new String[]{"鍖椾含鐞嗘兂鍩�", "淇濆畾"}); + add(new String[]{"鍖椾含鍥介檯鑸┖淇变箰閮ㄥ埆澧�", "鍖椾含"}); + add(new String[]{"鍖椾含棣欓", "鍖椾含"}); + add(new String[]{"鍖椾含鍥介檯涓績", "鍖椾含"}); + add(new String[]{"鍖椾含澶槼鍩庝簩鏈熼噾鑹叉睜濉�", "鍖椾含"}); + add(new String[]{"鍖椾含鍗楃珯杞︾珯璺皬鍖�", "鍖椾含"}); + add(new String[]{"鍖椾含鏈烘宸ヤ笟瀛﹂櫌瀹胯垗", "鍖椾含"}); + add(new String[]{"鍖椾含绉戞妧浼氬睍涓績鍏瘬", "鍖椾含"}); + add(new String[]{"鍖椾含澶槼鍩庡埆澧�", "鍖椾含"}); + add(new String[]{"鍖椾含鍩庡缓榫欐ň婀�", "鎴愰兘"}); + add(new String[]{"鍖椾含鍏", "鍞愬北"}); + add(new String[]{"鍖椾含澹瑰彿鍏", "鍗楅��"}); + add(new String[]{"鍖椾含娲嬫埧", "鍖椾含"}); + add(new String[]{"鍖椾含鍩庡缓路涓栧崕娉婇儭", "鍖椾含"}); + add(new String[]{"鍖椾含鍥界珛绂忓埄鑰佸勾鍏瘬", "鍖椾含"}); + add(new String[]{"鍖椾含鍥涘涓栧", "鍖椾含"}); + add(new String[]{"鍖椾含鑰�杈夊浗闄呭煄", "鍖椾含"}); + add(new String[]{"鍖椾含INN", "鍖椾含"}); + add(new String[]{"鍖椾含鑻忔椿", "鍖椾含"}); + add(new String[]{"鍖椾含鍩庡缓路绾㈡湪鏋�", "鍖椾含"}); + add(new String[]{"鍖椾含鍩庡缓路N娆℃柟", "鍖椾含"}); + add(new String[]{"鍖椾含鏂板ぉ鍦�", "鍖椾含"}); + add(new String[]{"鍖椾含鍗庤锤鍩�", "鍖椾含"}); + add(new String[]{"鍖椾含澶忛兘婀�", "鍖椾含"}); + add(new String[]{"鍖椾含椋庢櫙", "鍖椾含"}); + add(new String[]{"鍖椾含绗節鍖�", "鍖椾含"}); + add(new String[]{"鍖椾含鏂伴偍", "涓婃捣"}); + add(new String[]{"鍖椾含澶у帵", "骞垮窞"}); + add(new String[]{"鍖椾含闈掓灉", "鍖椾含"}); + add(new String[]{"鍖椾含鏂圭硸", "鍖椾含"}); + add(new String[]{"鍖椾含鑷湪鍩�", "鍖椾含"}); + add(new String[]{"鍖椾含鍩庡缓榫欐ň婀�", "閲嶅簡"}); + }}); + city_DistrictNames.put("骞夸笢", new ArrayList(){{ + add(new String[]{"骞夸笢澶栬锤骞垮満", "骞垮窞"}); + add(new String[]{"骞夸笢澶栬鑹烘湳瀛﹂櫌鏁欏笀瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢寤虹闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢鍙告硶璀﹀畼鑱屼笟瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐜繚澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍟嗕笟澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍖诲闄㈡暀甯堝鑸嶆ゼ", "涓滆帪"}); + add(new String[]{"骞夸笢鍥介檯澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佹妧鏈洃鐫e眬瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢宸ヤ笟澶у瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鏁欒偛瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪侀摱琛屽ぇ鍘�", "娣卞湷"}); + add(new String[]{"骞夸笢澶у帵", "澶╂触"}); + add(new String[]{"骞夸笢灞卞簞", "闀囨睙"}); + add(new String[]{"骞夸笢绾㈢浘澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鑽闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢闈掑勾骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鍩虹妤�", "娣卞湷"}); + add(new String[]{"骞夸笢鐪佺鎶�骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佸啘涓氱鐞嗗共閮ㄥ闄㈢ぞ鍖�", "骞垮窞"}); + add(new String[]{"骞夸笢鑺暰闆烽�告櫙", "浣涘北"}); + }}); + city_DistrictNames.put("姹熼棬", new ArrayList(){{ + add(new String[]{"姹熼棬濂ュ洯", "姹熼棬"}); + add(new String[]{"姹熼棬閮藉競璞涵", "姹熼棬"}); + add(new String[]{"姹熼棬鍢夋偊鍚嶉兘", "姹熼棬"}); + add(new String[]{"姹熼棬閲�", "澶╂触"}); + }}); + city_DistrictNames.put("浜戝崡", new ArrayList(){{ + add(new String[]{"浜戝崡澶у帵", "骞垮窞"}); + add(new String[]{"浜戝崡鐪佹潅鎶�鍥㈠灞為櫌", "鏄嗘槑"}); + add(new String[]{"浜戝崡鍗庝鲸鍩�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鑹烘湳瀹跺洯鍖�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鍐滀笟澶у鏁欏伐浣忓畢鍖�", "鏄嗘槑"}); + add(new String[]{"浜戝崡璐㈢粡澶у浣忓畢", "鏄嗘槑"}); + add(new String[]{"浜戝崡澶у榫欐硥璺皬鍖�", "鏄嗘槑"}); + add(new String[]{"浜戝崡宸ヤ笟鑱屼笟鎶�鏈闄�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鍗拌薄鍩�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鏄犺薄", "鏄嗘槑"}); + add(new String[]{"浜戝崡鐪佺暅鐗у眬瀹胯垗", "鏄嗘槑"}); + add(new String[]{"浜戝崡鐪佸缓绛戞潗鏂欏鐮旂┒璁捐闄�", "鏄嗘槑"}); + add(new String[]{"浜戝崡娴嬬粯宸ョ▼闄�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鐪佺涓�杞诲伐鏈烘鍘�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鏃ユ姤绀惧崟浣嶆埧", "鏄嗘槑"}); + add(new String[]{"浜戝崡鐧借嵂鍘傚崟浣嶇鍒╂埧", "鏄嗘槑"}); + add(new String[]{"浜戝崡澶у涓滀簩闄�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鐪佸鍏氭牎鐢熸椿鍖�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鍗拌薄鍩庡埆澧�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鐧借嵂绂忓埄鎴�", "鏄嗘槑"}); + }}); + city_DistrictNames.put("澶х悊鐧芥棌鑷不宸�", new ArrayList(){{ + }}); + city_DistrictNames.put("澶х悊", new ArrayList(){{ + add(new String[]{"澶х悊灏忓尯", "璐甸槼"}); + add(new String[]{"澶х悊灏忓尯17缁勫洟", "璐甸槼"}); + add(new String[]{"澶х悊鎰熼�氬埆澧�", "鏄嗘槑"}); + add(new String[]{"澶х悊瑙傞煶濉樼櫧鏃忔皯灞�", "澶х悊"}); + add(new String[]{"澶х悊宸炵幆绉戦櫌瀹胯垗", "澶х悊"}); + add(new String[]{"澶х悊鍙ゅ煄缁跨帀灏忓尯", "澶х悊"}); + add(new String[]{"澶х悊鍏", "澶х悊"}); + add(new String[]{"澶х悊鏄ュぉ骞垮満", "鏄嗘槑"}); + add(new String[]{"澶х悊閲戞腐", "鏄嗘槑"}); + add(new String[]{"澶х悊瀛﹀簻鍟嗗", "鏄嗘槑"}); + add(new String[]{"澶х悊绾㈤緳浜�", "鏄嗘槑"}); + add(new String[]{"澶х悊鍗楀浗鍩�", "鏄嗘槑"}); + add(new String[]{"澶х悊娲辨捣鍥介檯鐢熸�佸煄", "澶х悊"}); + }}); + city_DistrictNames.put("浜戝崡", new ArrayList(){{ + add(new String[]{"浜戝崡澶у帵", "骞垮窞"}); + add(new String[]{"浜戝崡鐪佹潅鎶�鍥㈠灞為櫌", "鏄嗘槑"}); + add(new String[]{"浜戝崡鍗庝鲸鍩�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鑹烘湳瀹跺洯鍖�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鍐滀笟澶у鏁欏伐浣忓畢鍖�", "鏄嗘槑"}); + add(new String[]{"浜戝崡璐㈢粡澶у浣忓畢", "鏄嗘槑"}); + add(new String[]{"浜戝崡澶у榫欐硥璺皬鍖�", "鏄嗘槑"}); + add(new String[]{"浜戝崡宸ヤ笟鑱屼笟鎶�鏈闄�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鍗拌薄鍩�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鏄犺薄", "鏄嗘槑"}); + add(new String[]{"浜戝崡鐪佺暅鐗у眬瀹胯垗", "鏄嗘槑"}); + add(new String[]{"浜戝崡鐪佸缓绛戞潗鏂欏鐮旂┒璁捐闄�", "鏄嗘槑"}); + add(new String[]{"浜戝崡娴嬬粯宸ョ▼闄�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鐪佺涓�杞诲伐鏈烘鍘�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鏃ユ姤绀惧崟浣嶆埧", "鏄嗘槑"}); + add(new String[]{"浜戝崡鐧借嵂鍘傚崟浣嶇鍒╂埧", "鏄嗘槑"}); + add(new String[]{"浜戝崡澶у涓滀簩闄�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鐪佸鍏氭牎鐢熸椿鍖�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鍗拌薄鍩庡埆澧�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鐧借嵂绂忓埄鎴�", "鏄嗘槑"}); + }}); + city_DistrictNames.put("鏄嗘槑", new ArrayList(){{ + add(new String[]{"鏄嗘槑鑺卞洯椤圭洰", "瑗垮畨"}); + add(new String[]{"鏄嗘槑绀惧尯", "澶ц繛"}); + add(new String[]{"鏄嗘槑婀栬姳鍥埆澧�", "鍖椾含"}); + add(new String[]{"鏄嗘槑鍏瘬", "澶╂触"}); + add(new String[]{"鏄嗘槑闆呭眳", "娌堥槼"}); + add(new String[]{"鏄嗘槑鑺卞洯", "澶ц繛"}); + add(new String[]{"鏄嗘槑澶у帵鏄ヨ嫅", "瑗垮畨"}); + add(new String[]{"鏄嗘槑澶╂箹宀涙俯娉夋梾娓告浮鍋囨潙閰掑簵", "鏄嗘槑"}); + add(new String[]{"鏄嗘槑鍖栨补鍣ㄥ巶", "鏄嗘槑"}); + add(new String[]{"鏄嗘槑鍗风儫鍘傜敯鍧濆尯", "鏄嗘槑"}); + add(new String[]{"鏄嗘槑鍖诲闄㈣亴宸ユゼ", "鏄嗘槑"}); + add(new String[]{"鏄嗘槑澶у瑗夸簩闄�", "鏄嗘槑"}); + add(new String[]{"鏄嗘槑浜哄", "鏄嗘槑"}); + add(new String[]{"鏄嗘槑鍌插煄", "鏄嗘槑"}); + add(new String[]{"鏄嗘槑灏忓尯", "涓婃捣"}); + add(new String[]{"鏄嗘槑鍏瘬", "涓婃捣"}); + add(new String[]{"鏄嗘槑鐜夊櫒鍩庣俊缈犺姳鍥�", "鏄嗘槑"}); + add(new String[]{"鏄嗘槑鏈哄簥鍘�", "鏄嗘槑"}); + add(new String[]{"鏄嗘槑妗f灞�", "鏄嗘槑"}); + add(new String[]{"鏄嗘槑姘存偿鍘�", "鏄嗘槑"}); + add(new String[]{"鏄嗘槑鏃ユ姤绀惧崟浣嶇鍒╂埧", "鏄嗘槑"}); + add(new String[]{"鏄嗘槑鐏叿鎬诲巶", "鏄嗘槑"}); + add(new String[]{"鏄嗘槑鏈哄簥鍘傚鑸�", "鏄嗘槑"}); + }}); + city_DistrictNames.put("骞夸笢", new ArrayList(){{ + add(new String[]{"骞夸笢澶栬锤骞垮満", "骞垮窞"}); + add(new String[]{"骞夸笢澶栬鑹烘湳瀛﹂櫌鏁欏笀瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢寤虹闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢鍙告硶璀﹀畼鑱屼笟瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐜繚澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍟嗕笟澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍖诲闄㈡暀甯堝鑸嶆ゼ", "涓滆帪"}); + add(new String[]{"骞夸笢鍥介檯澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佹妧鏈洃鐫e眬瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢宸ヤ笟澶у瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鏁欒偛瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪侀摱琛屽ぇ鍘�", "娣卞湷"}); + add(new String[]{"骞夸笢澶у帵", "澶╂触"}); + add(new String[]{"骞夸笢灞卞簞", "闀囨睙"}); + add(new String[]{"骞夸笢绾㈢浘澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鑽闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢闈掑勾骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鍩虹妤�", "娣卞湷"}); + add(new String[]{"骞夸笢鐪佺鎶�骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佸啘涓氱鐞嗗共閮ㄥ闄㈢ぞ鍖�", "骞垮窞"}); + add(new String[]{"骞夸笢鑺暰闆烽�告櫙", "浣涘北"}); + }}); + city_DistrictNames.put("浜戞诞", new ArrayList(){{ + add(new String[]{"浜戞诞纰ф鍥�", "鑲囧簡"}); + add(new String[]{"浜戞诞鎭掑ぇ鍩�", "浜戞诞"}); + }}); + city_DistrictNames.put("娴欐睙", new ArrayList(){{ + add(new String[]{"娴欐睙宸ヤ笟澶у鏁欏笀瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙澶у帵", "澶師"}); + add(new String[]{"娴欐睙鍔炰簨澶勫鑸�", "澶師"}); + add(new String[]{"娴欐睙浠佸拰灞呰�佸勾鍏荤敓鍏瘬", "婀栧窞"}); + add(new String[]{"娴欐睙浜よ繍澶у帵", "鏉窞"}); + add(new String[]{"娴欐睙宸ュ晢澶у瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙鍟嗚锤鍩�", "鍚堣偉"}); + add(new String[]{"娴欐睙宸ヤ笟澶у涔嬫睙瀛﹂櫌", "鏉窞"}); + }}); + city_DistrictNames.put("瀹佹尝", new ArrayList(){{ + add(new String[]{"瀹佹尝閲�", "澶╂触"}); + add(new String[]{"瀹佹尝閲�", "姝︽眽"}); + add(new String[]{"瀹佹尝鍟嗕細澶у帵", "瀹佹尝"}); + add(new String[]{"瀹佹尝澶栦唬澶у帵", "瀹佹尝"}); + add(new String[]{"瀹佹尝灏忓尯", "涓婃捣"}); + }}); + city_DistrictNames.put("浣欏", new ArrayList(){{ + add(new String[]{"浣欏娉板拰瀹跺洯", "瀹佹尝"}); + add(new String[]{"浣欏灏忓尯", "涓婃捣"}); + add(new String[]{"浣欏娉板拰瀹跺洯", "浣欏"}); + }}); + city_DistrictNames.put("骞夸笢", new ArrayList(){{ + add(new String[]{"骞夸笢澶栬锤骞垮満", "骞垮窞"}); + add(new String[]{"骞夸笢澶栬鑹烘湳瀛﹂櫌鏁欏笀瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢寤虹闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢鍙告硶璀﹀畼鑱屼笟瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐜繚澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍟嗕笟澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍖诲闄㈡暀甯堝鑸嶆ゼ", "涓滆帪"}); + add(new String[]{"骞夸笢鍥介檯澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佹妧鏈洃鐫e眬瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢宸ヤ笟澶у瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鏁欒偛瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪侀摱琛屽ぇ鍘�", "娣卞湷"}); + add(new String[]{"骞夸笢澶у帵", "澶╂触"}); + add(new String[]{"骞夸笢灞卞簞", "闀囨睙"}); + add(new String[]{"骞夸笢绾㈢浘澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鑽闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢闈掑勾骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鍩虹妤�", "娣卞湷"}); + add(new String[]{"骞夸笢鐪佺鎶�骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佸啘涓氱鐞嗗共閮ㄥ闄㈢ぞ鍖�", "骞垮窞"}); + add(new String[]{"骞夸笢鑺暰闆烽�告櫙", "浣涘北"}); + }}); + city_DistrictNames.put("娣卞湷", new ArrayList(){{ + add(new String[]{"娣卞湷婀剧晹鑺卞洯", "娣卞湷"}); + add(new String[]{"娣卞湷鑺卞洯", "鍚夋灄"}); + add(new String[]{"娣卞湷鑺卞洯", "鍚堣偉"}); + add(new String[]{"娣卞湷婀捐姳鍥�", "娣卞湷"}); + add(new String[]{"娣卞湷婀�1鍙�", "娣卞湷"}); + add(new String[]{"娣卞湷楂樺皵澶埆澧�", "娣卞湷"}); + add(new String[]{"娣卞湷宸ヤ笟鍥�", "瑗勯槼"}); + add(new String[]{"娣卞湷鍗拌薄", "瑗垮畞"}); + add(new String[]{"娣卞湷鍚涗复澶╀笅", "娣卞湷"}); + add(new String[]{"娣卞湷鎴垮湴浜уぇ鍘�", "娣卞湷"}); + add(new String[]{"娣卞湷鐢靛瓙鎶�鏈鏍′綇瀹�", "娣卞湷"}); + add(new String[]{"娣卞湷鍙戝睍閾惰瀹胯垗", "娣卞湷"}); + add(new String[]{"娣卞湷鏉ョ澹箍鍦�", "娣卞湷"}); + add(new String[]{"娣卞湷鍩庡競鏄ュぉ椤圭洰", "娣卞湷"}); + }}); + city_DistrictNames.put("骞夸笢", new ArrayList(){{ + add(new String[]{"骞夸笢澶栬锤骞垮満", "骞垮窞"}); + add(new String[]{"骞夸笢澶栬鑹烘湳瀛﹂櫌鏁欏笀瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢寤虹闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢鍙告硶璀﹀畼鑱屼笟瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐜繚澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍟嗕笟澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍖诲闄㈡暀甯堝鑸嶆ゼ", "涓滆帪"}); + add(new String[]{"骞夸笢鍥介檯澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佹妧鏈洃鐫e眬瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢宸ヤ笟澶у瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鏁欒偛瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪侀摱琛屽ぇ鍘�", "娣卞湷"}); + add(new String[]{"骞夸笢澶у帵", "澶╂触"}); + add(new String[]{"骞夸笢灞卞簞", "闀囨睙"}); + add(new String[]{"骞夸笢绾㈢浘澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鑽闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢闈掑勾骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鍩虹妤�", "娣卞湷"}); + add(new String[]{"骞夸笢鐪佺鎶�骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佸啘涓氱鐞嗗共閮ㄥ闄㈢ぞ鍖�", "骞垮窞"}); + add(new String[]{"骞夸笢鑺暰闆烽�告櫙", "浣涘北"}); + }}); + city_DistrictNames.put("鎯犲窞", new ArrayList(){{ + add(new String[]{"鎯犲窞鏄熸渤涓瑰牑", "鎯犲窞"}); + add(new String[]{"鎯犲窞閲�", "澶╂触"}); + add(new String[]{"鎯犲窞娴蜂鸡鍫�", "鎯犲窞"}); + add(new String[]{"鎯犲窞鏄熸渤涓瑰牑鍒", "鎯犲窞"}); + add(new String[]{"鎯犲窞鍑偊鍗庡涵", "鎯犲窞"}); + add(new String[]{"鎯犲窞鏄熸渤涓瑰牑鍒", "娣卞湷"}); + add(new String[]{"鎯犲窞钃濇咕鍗婂矝", "鎯犲窞"}); + }}); + city_DistrictNames.put("娌冲寳", new ArrayList(){{ + add(new String[]{"娌冲寳绋庡姟瀛︽牎鐢熸椿鍖�", "鐭冲搴�"}); + add(new String[]{"娌冲寳缁忔祹鏃ユ姤绀惧鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳缇庢湳鍑虹増绀惧鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳鐗╄祫瀹胯垗", "鐭冲搴�"}); + add(new String[]{"娌冲寳鍖栧伐鍖昏嵂鑱屼笟鎶�鏈闄㈠鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳鐢垫満瀹胯垗", "鐭冲搴�"}); + add(new String[]{"娌冲寳鏃ユ姤绀惧鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳宸ョ▼閫犱环绠$悊鎬荤珯瀹胯垗", "鐭冲搴�"}); + add(new String[]{"娌冲寳搴峰煄", "娼嶅潑"}); + add(new String[]{"娌冲寳绀惧尯", "娌堥槼"}); + add(new String[]{"娌冲寳鍖荤澶у瀹胯垗", "鐭冲搴�"}); + add(new String[]{"娌冲寳鐪佷汉澶у鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳鏂颁汉瀹�", "鍞愬北"}); + add(new String[]{"娌冲寳涓�鍙�", "鍞愬北"}); + add(new String[]{"娌冲寳鏈鸿灞�瀹胯垗", "鐭冲搴�"}); + add(new String[]{"娌冲寳骞挎挱鐢佃鎶ュ鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳鍟嗗煄", "闈掑矝"}); + add(new String[]{"娌冲寳闀垮煄楗簵", "鐭冲搴�"}); + add(new String[]{"娌冲寳鏉戝皬鍖�", "鍖椾含"}); + add(new String[]{"娌冲寳妗冩睙閲�", "澶╂触"}); + add(new String[]{"娌冲寳甯堝ぇ闈掑勾鍏瘬妤�", "鐭冲搴�"}); + add(new String[]{"娌冲寳缁�", "鏃犻敗"}); + add(new String[]{"娌冲寳绀惧尯", "鏈邯"}); + add(new String[]{"娌冲寳妤�", "鍞愬北"}); + }}); + city_DistrictNames.put("淇濆畾", new ArrayList(){{ + add(new String[]{"淇濆畾閲�", "澶╂触"}); + add(new String[]{"淇濆畾鏂版潙", "绂忓窞"}); + add(new String[]{"淇濆畾灏忓尯", "绂忓窞"}); + }}); + city_DistrictNames.put("浜戝崡", new ArrayList(){{ + add(new String[]{"浜戝崡澶у帵", "骞垮窞"}); + add(new String[]{"浜戝崡鐪佹潅鎶�鍥㈠灞為櫌", "鏄嗘槑"}); + add(new String[]{"浜戝崡鍗庝鲸鍩�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鑹烘湳瀹跺洯鍖�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鍐滀笟澶у鏁欏伐浣忓畢鍖�", "鏄嗘槑"}); + add(new String[]{"浜戝崡璐㈢粡澶у浣忓畢", "鏄嗘槑"}); + add(new String[]{"浜戝崡澶у榫欐硥璺皬鍖�", "鏄嗘槑"}); + add(new String[]{"浜戝崡宸ヤ笟鑱屼笟鎶�鏈闄�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鍗拌薄鍩�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鏄犺薄", "鏄嗘槑"}); + add(new String[]{"浜戝崡鐪佺暅鐗у眬瀹胯垗", "鏄嗘槑"}); + add(new String[]{"浜戝崡鐪佸缓绛戞潗鏂欏鐮旂┒璁捐闄�", "鏄嗘槑"}); + add(new String[]{"浜戝崡娴嬬粯宸ョ▼闄�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鐪佺涓�杞诲伐鏈烘鍘�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鏃ユ姤绀惧崟浣嶆埧", "鏄嗘槑"}); + add(new String[]{"浜戝崡鐧借嵂鍘傚崟浣嶇鍒╂埧", "鏄嗘槑"}); + add(new String[]{"浜戝崡澶у涓滀簩闄�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鐪佸鍏氭牎鐢熸椿鍖�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鍗拌薄鍩庡埆澧�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鐧借嵂绂忓埄鎴�", "鏄嗘槑"}); + }}); + city_DistrictNames.put("鏇查潠", new ArrayList(){{ + add(new String[]{"鏇查潠渚涚數灞�涓�鐢熸椿鍖�", "鏇查潠"}); + add(new String[]{"鏇查潠鍦e涵鑺卞洯", "鏇查潠"}); + add(new String[]{"鏇查潠宸ヨ搴锋ˉ鐢熸椿鍖�", "鏇查潠"}); + add(new String[]{"鏇查潠閮藉競鍗拌薄", "鏇查潠"}); + add(new String[]{"鏇查潠甯傛按鍔″皬鍖�", "鏇查潠"}); + }}); + city_DistrictNames.put("娌冲崡", new ArrayList(){{ + add(new String[]{"娌冲崡搴勫皬鍖�", "闈掑矝"}); + add(new String[]{"娌冲崡璐笓瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡鐪佹柊鍗庝功搴楀灞為櫌", "閮戝窞"}); + add(new String[]{"娌冲崡鐪佸晢涓氱瀛︾爺绌舵墍瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡鐪佹棩鎶ョぞ瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡濂冲瓙楂樹腑瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡澶栬锤澶ч櫌", "娣卞湷"}); + add(new String[]{"娌冲崡閲�", "澶╂触"}); + add(new String[]{"娌冲崡鏂版潙", "绂忓窞"}); + add(new String[]{"娌冲崡璐㈢粡瀛﹂櫌瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡宀稿叕鍥皬鍖�", "鎯犲窞"}); + add(new String[]{"娌冲崡宀告柊鏉�", "鎯犲窞"}); + add(new String[]{"娌冲崡鏉�", "鍖椾含"}); + add(new String[]{"娌冲崡鐞嗗伐瀛︽牎瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡鐪佷汉浜嬪巺瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡宀镐腑蹇冨皬鍖�", "鎯犲窞"}); + add(new String[]{"娌冲崡鐪佸璐稿鏍″灞為櫌", "閮戝窞"}); + add(new String[]{"娌冲崡鏉�", "涓婃捣"}); + add(new String[]{"娌冲崡鏂版潙", "涓婃捣"}); + add(new String[]{"娌冲崡宸ヤ笟澶у瀹跺睘闄�", "閮戝窞"}); + }}); + city_DistrictNames.put("瀹夐槼", new ArrayList(){{ + add(new String[]{"瀹夐槼鑺辫嫅", "甯稿窞"}); + add(new String[]{"瀹夐槼閲�", "澶╂触"}); + add(new String[]{"瀹夐槼灏忓尯", "澶ц繛"}); + add(new String[]{"瀹夐槼灏忓尯", "涓婃捣"}); + }}); + city_DistrictNames.put("骞夸笢", new ArrayList(){{ + add(new String[]{"骞夸笢澶栬锤骞垮満", "骞垮窞"}); + add(new String[]{"骞夸笢澶栬鑹烘湳瀛﹂櫌鏁欏笀瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢寤虹闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢鍙告硶璀﹀畼鑱屼笟瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐜繚澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍟嗕笟澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍖诲闄㈡暀甯堝鑸嶆ゼ", "涓滆帪"}); + add(new String[]{"骞夸笢鍥介檯澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佹妧鏈洃鐫e眬瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢宸ヤ笟澶у瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鏁欒偛瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪侀摱琛屽ぇ鍘�", "娣卞湷"}); + add(new String[]{"骞夸笢澶у帵", "澶╂触"}); + add(new String[]{"骞夸笢灞卞簞", "闀囨睙"}); + add(new String[]{"骞夸笢绾㈢浘澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鑽闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢闈掑勾骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鍩虹妤�", "娣卞湷"}); + add(new String[]{"骞夸笢鐪佺鎶�骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佸啘涓氱鐞嗗共閮ㄥ闄㈢ぞ鍖�", "骞垮窞"}); + add(new String[]{"骞夸笢鑺暰闆烽�告櫙", "浣涘北"}); + }}); + city_DistrictNames.put("浣涘北", new ArrayList(){{ + add(new String[]{"浣涘北濂ュ洯鍑尩鑻�", "浣涘北"}); + add(new String[]{"浣涘北濂ュ洯鐏忔櫙宄�", "浣涘北"}); + add(new String[]{"浣涘北闆呭眳涔�", "浣涘北"}); + add(new String[]{"浣涘北闆呭眳涔愯姳鍥�", "浣涘北"}); + add(new String[]{"浣涘北濂ュ洯鍑棆婀�", "浣涘北"}); + add(new String[]{"浣涘北閲�", "澶╂触"}); + add(new String[]{"浣涘北鑻�", "娴庡崡"}); + add(new String[]{"浣涘北濂ュ洯", "浣涘北"}); + add(new String[]{"浣涘北鍔涜繀涓婄瓚", "浣涘北"}); + add(new String[]{"浣涘北澶у鏁欏笀浣忓畢", "浣涘北"}); + add(new String[]{"浣涘北濂ュ洯濞佸凹姘村哺", "浣涘北"}); + add(new String[]{"浣涘北濂ュ洯缇庢灄姘村哺", "浣涘北"}); + add(new String[]{"浣涘北濂ュ洯璐濇矙杞�", "浣涘北"}); + add(new String[]{"浣涘北濂ュ洯缇庢灄姘村哺", "椤哄痉"}); + add(new String[]{"浣涘北濂ュ洯鐏忔櫙宄�", "椤哄痉"}); + add(new String[]{"浣涘北濂ュ洯", "椤哄痉"}); + add(new String[]{"浣涘北濂ュ洯鍑尩鑻�", "椤哄痉"}); + add(new String[]{"浣涘北濂ュ洯璐濇矙杞�", "椤哄痉"}); + add(new String[]{"浣涘北涓囩骞垮満", "浣涘北"}); + add(new String[]{"浣涘北涓囩鍩�", "浣涘北"}); + add(new String[]{"浣涘北闆呭眳涔愯姳鍥埆澧�", "浣涘北"}); + }}); + city_DistrictNames.put("鍥涘窛", new ArrayList(){{ + add(new String[]{"鍥涘窛鐪佺洿鏈哄叧宸ュ瀹胯垗", "鎴愰兘"}); + add(new String[]{"鍥涘窛鐪佹灄涓氬巺瀹胯垗", "鎴愰兘"}); + add(new String[]{"鍥涘窛闊充箰瀛﹂櫌瀹胯垗", "鎴愰兘"}); + add(new String[]{"鍥涘窛鐪侀椊涓競椹荤枂鍔炰簨澶勫皬鍖�", "涔岄瞾鏈ㄩ綈"}); + add(new String[]{"鍥涘窛澶у帵", "鍘﹂棬"}); + add(new String[]{"鍥涘窛鐪佺鎶�鍘呭鑸�", "鎴愰兘"}); + add(new String[]{"鍥涘窛涓撶敤姹借溅鍘傚鑸�", "鎴愰兘"}); + add(new String[]{"鍥涘窛鏃ユ姤瀹胯垗", "鎴愰兘"}); + add(new String[]{"鍥涘窛鑹烘湳鑱屼笟瀛﹂櫌瀹跺睘妤�", "鎴愰兘"}); + add(new String[]{"鍥涘窛钀ヨ儭鍚�", "鍖椾含"}); + add(new String[]{"鍥涘窛灏忓尯", "涓婃捣"}); + add(new String[]{"鍥涘窛骞煎笀瀹胯垗", "鎴愰兘"}); + add(new String[]{"鍥涘窛澶у鍐滄灄鏉�", "鎴愰兘"}); + }}); + city_DistrictNames.put("缁甸槼", new ArrayList(){{ + add(new String[]{"缁甸槼鐢靛姏灏忓尯", "缁甸槼"}); + add(new String[]{"缁甸槼鐢靛姏灏忓尯", "缁甸槼"}); + }}); + city_DistrictNames.put("骞夸笢", new ArrayList(){{ + add(new String[]{"骞夸笢澶栬锤骞垮満", "骞垮窞"}); + add(new String[]{"骞夸笢澶栬鑹烘湳瀛﹂櫌鏁欏笀瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢寤虹闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢鍙告硶璀﹀畼鑱屼笟瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐜繚澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍟嗕笟澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍖诲闄㈡暀甯堝鑸嶆ゼ", "涓滆帪"}); + add(new String[]{"骞夸笢鍥介檯澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佹妧鏈洃鐫e眬瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢宸ヤ笟澶у瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鏁欒偛瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪侀摱琛屽ぇ鍘�", "娣卞湷"}); + add(new String[]{"骞夸笢澶у帵", "澶╂触"}); + add(new String[]{"骞夸笢灞卞簞", "闀囨睙"}); + add(new String[]{"骞夸笢绾㈢浘澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鑽闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢闈掑勾骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鍩虹妤�", "娣卞湷"}); + add(new String[]{"骞夸笢鐪佺鎶�骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佸啘涓氱鐞嗗共閮ㄥ闄㈢ぞ鍖�", "骞垮窞"}); + add(new String[]{"骞夸笢鑺暰闆烽�告櫙", "浣涘北"}); + }}); + city_DistrictNames.put("娼窞", new ArrayList(){{ + add(new String[]{"娼窞鎭掑ぇ鍩�", "娼窞"}); + }}); + city_DistrictNames.put("娴欐睙", new ArrayList(){{ + add(new String[]{"娴欐睙宸ヤ笟澶у鏁欏笀瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙澶у帵", "澶師"}); + add(new String[]{"娴欐睙鍔炰簨澶勫鑸�", "澶師"}); + add(new String[]{"娴欐睙浠佸拰灞呰�佸勾鍏荤敓鍏瘬", "婀栧窞"}); + add(new String[]{"娴欐睙浜よ繍澶у帵", "鏉窞"}); + add(new String[]{"娴欐睙宸ュ晢澶у瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙鍟嗚锤鍩�", "鍚堣偉"}); + add(new String[]{"娴欐睙宸ヤ笟澶у涔嬫睙瀛﹂櫌", "鏉窞"}); + }}); + city_DistrictNames.put("鍢夊叴", new ArrayList(){{ + add(new String[]{"鍢夊叴灏忓尯", "娴峰彛"}); + add(new String[]{"鍢夊叴鑺卞洯", "鍢夊叴"}); + add(new String[]{"鍢夊叴-闈掑勾鏂板煄", "淇濆畾"}); + add(new String[]{"鍢夊叴鑺卞洯", "澶師"}); + add(new String[]{"鍢夊叴鍥介檯涓腐鍩庤喘鐗╀腑蹇冨叕瀵�", "鍢夊叴"}); + add(new String[]{"鍢夊叴鑺卞洯", "濞佹捣"}); + add(new String[]{"鍢夊叴鑺卞洯", "涓滆帪"}); + add(new String[]{"鍢夊叴灏忓尯", "浣涘北"}); + add(new String[]{"鍢夊叴妤�", "涓滆帪"}); + add(new String[]{"鍢夊叴鑻�", "澶師"}); + add(new String[]{"鍢夊叴鎬婚儴鍟嗗姟鑺卞洯", "鍢夊叴"}); + add(new String[]{"鍢夊叴鑻�", "娣卞湷"}); + add(new String[]{"鍢夊叴绀惧尯", "娌堥槼"}); + add(new String[]{"鍢夊叴闈掑勾鏂板煄", "淇濆畾"}); + add(new String[]{"鍢夊叴閫稿洯", "缁甸槼"}); + add(new String[]{"鍢夊叴闈掑勾鏂板煄", "淇濆畾"}); + add(new String[]{"鍢夊叴灏忓尯", "绂忓窞"}); + add(new String[]{"鍢夊叴鍥�", "鍘﹂棬"}); + add(new String[]{"鍢夊叴鑻�", "鍚堣偉"}); + add(new String[]{"鍢夊叴鍥�", "瑗垮畨"}); + add(new String[]{"鍢夊叴鑻戝埆澧呭尯", "澶師"}); + add(new String[]{"鍢夊叴鍥介檯", "娌堥槼"}); + add(new String[]{"鍢夊叴涓滆嫅", "鏉窞"}); + add(new String[]{"鍢夊叴鑺卞洯", "閲嶅簡"}); + add(new String[]{"鍢夊叴鍥�", "姝︽眽"}); + add(new String[]{"鍢夊叴涓滄柟宸撮粠鍩�", "鍢夊叴"}); + add(new String[]{"鍢夊叴涓滄柟宸撮粠鍩庡埆澧�", "鍢夊叴"}); + add(new String[]{"鍢夊叴涓畨甯傚満", "鍢夊叴"}); + add(new String[]{"鍢夊叴鍗楁箹鎶曡祫鍏昏�佹埧", "鍢夊叴"}); + add(new String[]{"鍢夊叴鑻�", "鏄嗗北"}); + add(new String[]{"鍢夊叴鍥介檯鐢垫皵鍩�", "涓婃捣"}); + add(new String[]{"鍢夊叴鍥介檯涓腐鍩庤喘鐗╀腑蹇冨叕瀵�", "涓婃捣"}); + add(new String[]{"鍢夊叴鍗楁箹鎶曡祫鍏昏�佹埧", "涓婃捣"}); + add(new String[]{"鍢夊叴涓滄柟宸撮粠鍩�", "涓婃捣"}); + add(new String[]{"鍢夊叴鍥介檯澶у帵", "娌堥槼"}); + add(new String[]{"鍢夊叴鍟嗗煄", "鍢夊叴"}); + }}); + city_DistrictNames.put("婀栧崡", new ArrayList(){{ + add(new String[]{"婀栧崡澶у帵", "娴峰彛"}); + add(new String[]{"婀栧崡甯堝ぇ寮犲叕宀牎鍖哄鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佽繘鍑哄彛鍏徃瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡骞跨數瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡鏈哄簥鍘傚鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鍒惰嵂鍘傚鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡渚涢攢澶у帵", "闀挎矙"}); + add(new String[]{"婀栧崡鍖栧伐鍖昏嵂璁捐闄㈠鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡宸ュ晢閾惰瀹胯垗鏈哄叧澶ч櫌", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸浗闃茬鍏姙鏈哄叧闄㈠唴瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡鎶ヤ笟鏂囧寲鍩�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佷氦閫氳璁¢櫌", "闀挎矙"}); + add(new String[]{"婀栧崡鑱旈�氫綇瀹呭皬鍖�", "闀挎矙"}); + add(new String[]{"婀栧崡鐢佃鍙板崟浣嶅鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡寮�鍏冲巶瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡灏忓尯", "鍖椾含"}); + add(new String[]{"婀栧崡閭數鏂版潙灏忓尯", "闉嶅北"}); + add(new String[]{"婀栧崡鐪佺瀛︽妧鏈巺瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸浗瀹夊巺鍗曚綅鎴�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佹湪鍋跺墽鍥㈠鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佹皵璞″眬瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡濂冲瓙澶у鏁欏笀鍏瘬", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸啘涓氭満姊扮爺绌舵墍", "闀挎矙"}); + add(new String[]{"婀栧崡鏁欒偛瑁呭缁煎悎澶фゼ", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸姵鍔ㄥ崼鐢熸墍", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佽川閲忔妧鏈洃鐫e眬瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡鐪侀噾灞炲洖鏀跺叕鍙稿鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸鏂欑爺绌舵墍", "闀挎矙"}); + add(new String[]{"婀栧崡鐪侀珮绾т汉姘戞鏌ラ櫌鍗曚綅鎴�", "闀挎矙"}); + add(new String[]{"婀栧崡浜ら�氳亴闄㈠鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸喍閲戞潗鏂欑爺绌舵墍", "闀挎矙"}); + add(new String[]{"婀栧崡閲戣渹闊冲儚鍑虹増绀�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佺墿璧勫巺瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡瀹剁數鍟嗗煄", "闀挎矙"}); + add(new String[]{"婀栧崡鍥介檯鍟嗗姟涓績", "闀挎矙"}); + add(new String[]{"婀栧崡璐㈠瘜涓績", "闀挎矙"}); + add(new String[]{"婀栧崡鍥介檯姹借溅鍩�", "闀挎矙"}); + add(new String[]{"婀栧崡浜氬ぇ鏁扮爜娓�", "闀挎矙"}); + add(new String[]{"婀栧崡澶у帵", "鍗楀畞"}); + add(new String[]{"婀栧崡澶у帵", "涓婃捣"}); + add(new String[]{"婀栧崡鏄熸矙姹介厤鍩�", "闀挎矙"}); + add(new String[]{"婀栧崡鑹烘牎鍗曚綅鎴�", "闀挎矙"}); + add(new String[]{"婀栧崡璐笓鏁欒亴宸ュ鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佹満姊拌繘鍑哄彛鍏徃瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡鏃ユ姤鍗曚綅瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡宀稿悗鐣堝皬鍖�", "缁嶅叴"}); + }}); + city_DistrictNames.put("婀樻江", new ArrayList(){{ + add(new String[]{"婀樻江鑺卞洯灏忓尯", "鍚夋灄"}); + add(new String[]{"婀樻江灏忓尯", "鍚夋灄"}); + add(new String[]{"婀樻江绀惧尯", "鍚夋灄"}); + add(new String[]{"婀樻江涓滈噷", "澶╂触"}); + add(new String[]{"婀樻江閲�", "澶╂触"}); + }}); + city_DistrictNames.put("绂忓缓", new ArrayList(){{ + add(new String[]{"绂忓缓鍥�", "鍗楀畞"}); + add(new String[]{"绂忓缓鐪佸洓寤哄鑸嶅寳闂�", "鍘﹂棬"}); + add(new String[]{"绂忓缓鑱旈�氳姳鍥�", "绂忓窞"}); + add(new String[]{"绂忓缓鏃ユ姤绀惧鑸�", "绂忓窞"}); + add(new String[]{"绂忓缓鐪佷腑蹇冩楠屾墍鍗曚綅瀹胯垗", "绂忓窞"}); + add(new String[]{"绂忓缓鐢靛奖鍒剁墖鍘傚崟浣嶅鑸�", "绂忓窞"}); + add(new String[]{"绂忓缓鐪佸コ瀛愮洃鐙卞鑸�", "绂忓窞"}); + add(new String[]{"绂忓缓鐪佸尰鑽叕鍙稿ぇ鐜嬮噷鍗曚綅瀹胯垗", "绂忓窞"}); + add(new String[]{"绂忓缓鐪佺浜屽叕璺伐绋嬪叕鍙稿鑸�", "绂忓窞"}); + add(new String[]{"绂忓缓鐪佽殨妗戠爺绌舵墍鍗曚綅瀹胯垗", "绂忓窞"}); + add(new String[]{"绂忓缓鏂版潙", "鍗椾含"}); + add(new String[]{"绂忓缓閲�", "澶╂触"}); + add(new String[]{"绂忓缓绀惧尯", "姝︽眽"}); + add(new String[]{"绂忓缓澶у帵", "璐甸槼"}); + add(new String[]{"绂忓缓宸峰皬鍖�", "鎴愰兘"}); + add(new String[]{"绂忓缓澶у帵", "娣卞湷"}); + add(new String[]{"绂忓缓鐢熸�佸伐绋嬪鏍″崟浣嶅鑸�", "绂忓窞"}); + add(new String[]{"绂忓缓鍖荤澶у鏁欏伐瀹胯垗", "绂忓窞"}); + }}); + city_DistrictNames.put("鑾嗙敯", new ArrayList(){{ + add(new String[]{"鑾嗙敯涓囩鍩�", "鑾嗙敯"}); + add(new String[]{"鑾嗙敯瀛﹀洯鑺卞洯", "鑾嗙敯"}); + }}); + city_DistrictNames.put("娌冲崡", new ArrayList(){{ + add(new String[]{"娌冲崡搴勫皬鍖�", "闈掑矝"}); + add(new String[]{"娌冲崡璐笓瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡鐪佹柊鍗庝功搴楀灞為櫌", "閮戝窞"}); + add(new String[]{"娌冲崡鐪佸晢涓氱瀛︾爺绌舵墍瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡鐪佹棩鎶ョぞ瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡濂冲瓙楂樹腑瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡澶栬锤澶ч櫌", "娣卞湷"}); + add(new String[]{"娌冲崡閲�", "澶╂触"}); + add(new String[]{"娌冲崡鏂版潙", "绂忓窞"}); + add(new String[]{"娌冲崡璐㈢粡瀛﹂櫌瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡宀稿叕鍥皬鍖�", "鎯犲窞"}); + add(new String[]{"娌冲崡宀告柊鏉�", "鎯犲窞"}); + add(new String[]{"娌冲崡鏉�", "鍖椾含"}); + add(new String[]{"娌冲崡鐞嗗伐瀛︽牎瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡鐪佷汉浜嬪巺瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡宀镐腑蹇冨皬鍖�", "鎯犲窞"}); + add(new String[]{"娌冲崡鐪佸璐稿鏍″灞為櫌", "閮戝窞"}); + add(new String[]{"娌冲崡鏉�", "涓婃捣"}); + add(new String[]{"娌冲崡鏂版潙", "涓婃捣"}); + add(new String[]{"娌冲崡宸ヤ笟澶у瀹跺睘闄�", "閮戝窞"}); + }}); + city_DistrictNames.put("閮戝窞", new ArrayList(){{ + add(new String[]{"閮戝窞鍥句功鍩庡灞為櫌", "閮戝窞"}); + add(new String[]{"閮戝窞瑗垮洓鐜缓鏉愬競鍦�", "閮戝窞"}); + add(new String[]{"閮戝窞鍥介檯鍩�", "閮戝窞"}); + add(new String[]{"閮戝窞杞诲伐涓氬闄㈠灞為櫌", "閮戝窞"}); + add(new String[]{"閮戝窞绠卞寘鍩�", "閮戝窞"}); + add(new String[]{"閮戝窞鏅氭姤绀惧灞為櫌", "閮戝窞"}); + add(new String[]{"閮戝窞鏍镐簲闄㈠灞為櫌", "閮戝窞"}); + add(new String[]{"閮戝窞甯傛斂娉曞瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"閮戝窞鏃ユ姤绀惧灞為櫌", "閮戝窞"}); + add(new String[]{"閮戝窞娆т附鍏徃瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"閮戝窞鎭掑ぇ鍚嶉兘", "閮戝窞"}); + add(new String[]{"閮戝窞澶ч厭搴�", "閮戝窞"}); + add(new String[]{"閮戝窞鍔冲姩鏈嶅姟鍏徃瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"閮戝窞澶у帹鎴垮啘鍓骇鍝佺墿娴佹腐", "閮戝窞"}); + add(new String[]{"閮戝窞鍥介檯缇庨濞变箰骞垮満", "閮戝窞"}); + add(new String[]{"閮戝窞鍥借锤涓績", "閮戝窞"}); + }}); + city_DistrictNames.put("绂忓缓", new ArrayList(){{ + add(new String[]{"绂忓缓鍥�", "鍗楀畞"}); + add(new String[]{"绂忓缓鐪佸洓寤哄鑸嶅寳闂�", "鍘﹂棬"}); + add(new String[]{"绂忓缓鑱旈�氳姳鍥�", "绂忓窞"}); + add(new String[]{"绂忓缓鏃ユ姤绀惧鑸�", "绂忓窞"}); + add(new String[]{"绂忓缓鐪佷腑蹇冩楠屾墍鍗曚綅瀹胯垗", "绂忓窞"}); + add(new String[]{"绂忓缓鐢靛奖鍒剁墖鍘傚崟浣嶅鑸�", "绂忓窞"}); + add(new String[]{"绂忓缓鐪佸コ瀛愮洃鐙卞鑸�", "绂忓窞"}); + add(new String[]{"绂忓缓鐪佸尰鑽叕鍙稿ぇ鐜嬮噷鍗曚綅瀹胯垗", "绂忓窞"}); + add(new String[]{"绂忓缓鐪佺浜屽叕璺伐绋嬪叕鍙稿鑸�", "绂忓窞"}); + add(new String[]{"绂忓缓鐪佽殨妗戠爺绌舵墍鍗曚綅瀹胯垗", "绂忓窞"}); + add(new String[]{"绂忓缓鏂版潙", "鍗椾含"}); + add(new String[]{"绂忓缓閲�", "澶╂触"}); + add(new String[]{"绂忓缓绀惧尯", "姝︽眽"}); + add(new String[]{"绂忓缓澶у帵", "璐甸槼"}); + add(new String[]{"绂忓缓宸峰皬鍖�", "鎴愰兘"}); + add(new String[]{"绂忓缓澶у帵", "娣卞湷"}); + add(new String[]{"绂忓缓鐢熸�佸伐绋嬪鏍″崟浣嶅鑸�", "绂忓窞"}); + add(new String[]{"绂忓缓鍖荤澶у鏁欏伐瀹胯垗", "绂忓窞"}); + }}); + city_DistrictNames.put("绂忓窞", new ArrayList(){{ + add(new String[]{"绂忓窞涓�涓笁鐗у潑鍗曚綅瀹胯垗", "绂忓窞"}); + add(new String[]{"绂忓窞鍏畨鍏瘬", "绂忓窞"}); + add(new String[]{"绂忓窞鏄ュぉ", "绂忓窞"}); + add(new String[]{"绂忓窞甯傚叕瀹夊眬灏忔煶鍗曚綅瀹胯垗", "绂忓窞"}); + add(new String[]{"绂忓窞濂ユ灄鍖瑰厠鑺卞洯", "绂忓窞"}); + add(new String[]{"绂忓窞浜烘皯鏃ユ姤绀惧嵃鍔′腑蹇冨崟浣嶅鑸�", "绂忓窞"}); + add(new String[]{"绂忓窞鍙戝睍鍜屾敼闈╁鍛樹細鍗曚綅瀹胯垗", "绂忓窞"}); + add(new String[]{"绂忓窞鏄熷娍鍔�", "绂忓窞"}); + add(new String[]{"绂忓窞璞涵", "绂忓窞"}); + add(new String[]{"绂忓窞璞环", "绂忓窞"}); + add(new String[]{"绂忓窞澶фゼ", "涓婃捣"}); + }}); + city_DistrictNames.put("婀栧崡", new ArrayList(){{ + add(new String[]{"婀栧崡澶у帵", "娴峰彛"}); + add(new String[]{"婀栧崡甯堝ぇ寮犲叕宀牎鍖哄鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佽繘鍑哄彛鍏徃瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡骞跨數瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡鏈哄簥鍘傚鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鍒惰嵂鍘傚鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡渚涢攢澶у帵", "闀挎矙"}); + add(new String[]{"婀栧崡鍖栧伐鍖昏嵂璁捐闄㈠鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡宸ュ晢閾惰瀹胯垗鏈哄叧澶ч櫌", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸浗闃茬鍏姙鏈哄叧闄㈠唴瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡鎶ヤ笟鏂囧寲鍩�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佷氦閫氳璁¢櫌", "闀挎矙"}); + add(new String[]{"婀栧崡鑱旈�氫綇瀹呭皬鍖�", "闀挎矙"}); + add(new String[]{"婀栧崡鐢佃鍙板崟浣嶅鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡寮�鍏冲巶瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡灏忓尯", "鍖椾含"}); + add(new String[]{"婀栧崡閭數鏂版潙灏忓尯", "闉嶅北"}); + add(new String[]{"婀栧崡鐪佺瀛︽妧鏈巺瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸浗瀹夊巺鍗曚綅鎴�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佹湪鍋跺墽鍥㈠鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佹皵璞″眬瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡濂冲瓙澶у鏁欏笀鍏瘬", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸啘涓氭満姊扮爺绌舵墍", "闀挎矙"}); + add(new String[]{"婀栧崡鏁欒偛瑁呭缁煎悎澶фゼ", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸姵鍔ㄥ崼鐢熸墍", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佽川閲忔妧鏈洃鐫e眬瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡鐪侀噾灞炲洖鏀跺叕鍙稿鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸鏂欑爺绌舵墍", "闀挎矙"}); + add(new String[]{"婀栧崡鐪侀珮绾т汉姘戞鏌ラ櫌鍗曚綅鎴�", "闀挎矙"}); + add(new String[]{"婀栧崡浜ら�氳亴闄㈠鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸喍閲戞潗鏂欑爺绌舵墍", "闀挎矙"}); + add(new String[]{"婀栧崡閲戣渹闊冲儚鍑虹増绀�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佺墿璧勫巺瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡瀹剁數鍟嗗煄", "闀挎矙"}); + add(new String[]{"婀栧崡鍥介檯鍟嗗姟涓績", "闀挎矙"}); + add(new String[]{"婀栧崡璐㈠瘜涓績", "闀挎矙"}); + add(new String[]{"婀栧崡鍥介檯姹借溅鍩�", "闀挎矙"}); + add(new String[]{"婀栧崡浜氬ぇ鏁扮爜娓�", "闀挎矙"}); + add(new String[]{"婀栧崡澶у帵", "鍗楀畞"}); + add(new String[]{"婀栧崡澶у帵", "涓婃捣"}); + add(new String[]{"婀栧崡鏄熸矙姹介厤鍩�", "闀挎矙"}); + add(new String[]{"婀栧崡鑹烘牎鍗曚綅鎴�", "闀挎矙"}); + add(new String[]{"婀栧崡璐笓鏁欒亴宸ュ鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佹満姊拌繘鍑哄彛鍏徃瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡鏃ユ姤鍗曚綅瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡宀稿悗鐣堝皬鍖�", "缁嶅叴"}); + }}); + city_DistrictNames.put("闀挎矙", new ArrayList(){{ + add(new String[]{"闀挎矙甯傞暱鍫璁¢櫌", "闀挎矙"}); + add(new String[]{"闀挎矙閾惰鍗曚綅鎴�", "闀挎矙"}); + add(new String[]{"闀挎矙鎭掑ぇ缁挎床", "闀挎矙"}); + add(new String[]{"闀挎矙鍗楄嫅灏忓尯", "闀挎矙"}); + add(new String[]{"闀挎矙甯傜儫鑽変笓鍗栧眬鍗曚綅瀹胯垗", "闀挎矙"}); + add(new String[]{"闀挎矙鐞嗗伐澶у鏁欒亴宸ヤ綇瀹呭尯", "闀挎矙"}); + add(new String[]{"闀挎矙鐑熻崏灞�瀹胯垗", "闀挎矙"}); + add(new String[]{"闀挎矙鏅氭姤瀹胯垗", "闀挎矙"}); + add(new String[]{"闀挎矙甯傚鍏氭牎瀹胯垗", "闀挎矙"}); + add(new String[]{"闀挎矙鏍囧噯浠跺巶瀹胯垗", "闀挎矙"}); + add(new String[]{"闀挎矙鍐堕噾鍘傚鑸�", "闀挎矙"}); + add(new String[]{"闀挎矙甯備竴涓鑸�", "闀挎矙"}); + add(new String[]{"闀挎矙鐧芥矙鍟ら厭鍏瘬", "闀挎矙"}); + add(new String[]{"闀挎矙鎭掑ぇ鍩�", "闀挎矙"}); + add(new String[]{"闀挎矙涓栬寕閾傜繝婀�", "闀挎矙"}); + add(new String[]{"闀挎矙绗簩鍗佸叚涓鑸�", "闀挎矙"}); + add(new String[]{"闀挎矙甯備節涓鑸�", "闀挎矙"}); + add(new String[]{"闀挎矙甯傜編鏈叕鍙稿鑸�", "闀挎矙"}); + add(new String[]{"闀挎矙鍕樺療璁捐闄㈠鑸嶅崟浣嶆埧", "闀挎矙"}); + add(new String[]{"闀挎矙甯傝鍒掕璁¢櫌瀹胯垗", "闀挎矙"}); + add(new String[]{"闀挎矙姹℃按澶勭悊鍘傚鑸�", "闀挎矙"}); + add(new String[]{"闀挎矙鍟嗚锤鏃呮父鏁欏笀瀹胯垗", "闀挎矙"}); + add(new String[]{"闀挎矙浼嶅宀敓娲诲箍鍦�", "闀挎矙"}); + add(new String[]{"闀挎矙鏂板ぇ鏂板ぇ鍘�", "闀挎矙"}); + add(new String[]{"闀挎矙鏂拌嫅", "鐝犳捣"}); + add(new String[]{"闀挎矙鍗风儫鍘傚鑸�", "闀挎矙"}); + add(new String[]{"闀挎矙甯傞洦鑺卞尯宸ヨ锤瀛﹂櫌", "闀挎矙"}); + add(new String[]{"闀挎矙鐢熸�佸姩鐗╁洯瀹犵墿棣嗛棬闈�", "闀挎矙"}); + add(new String[]{"闀挎矙鐩戠嫳瀹胯垗", "闀挎矙"}); + add(new String[]{"闀挎矙甯傝惀灞卞贩52", "闀挎矙"}); + add(new String[]{"闀挎矙甯傚杩愬鑸�", "闀挎矙"}); + add(new String[]{"闀挎矙鐞嗗伐閲戠泦宀皬鍖哄鑸�", "闀挎矙"}); + add(new String[]{"闀挎矙甯傝川閲忔妧鏈洃鐫e眬浣忓畢灏忓尯", "闀挎矙"}); + add(new String[]{"闀挎矙浜屽崄涓�涓鑸�", "闀挎矙"}); + add(new String[]{"闀挎矙鑼跺競", "闀挎矙"}); + add(new String[]{"闀挎矙杞存壙鍘傚鑸�", "闀挎矙"}); + add(new String[]{"闀挎矙鍐锋煖鍘傚鑸�", "闀挎矙"}); + add(new String[]{"闀挎矙鐜懓鍥埆澧�", "闀挎矙"}); + add(new String[]{"闀挎矙甯傚浗鍦熷眬瀹胯垗", "闀挎矙"}); + add(new String[]{"闀挎矙鏂囧寲骞垮満", "闀挎矙"}); + add(new String[]{"闀挎矙鐜懓鍥�", "闀挎矙"}); + add(new String[]{"闀挎矙寮�绂忎竾杈惧箍鍦�", "闀挎矙"}); + add(new String[]{"闀挎矙娆ф床鍩�", "闀挎矙"}); + add(new String[]{"闀挎矙娣卞浗鎶�", "闀挎矙"}); + add(new String[]{"闀挎矙灏忓尯", "闈掑矝"}); + add(new String[]{"闀挎矙鍘胯储鏀垮眬", "闀挎矙"}); + add(new String[]{"闀挎矙鍘挎灄涓氬眬鍗曚綅鎴�", "闀挎矙"}); + add(new String[]{"闀挎矙鍘垮啘鏈哄眬瀹胯垗", "闀挎矙"}); + add(new String[]{"闀挎矙鍘垮叕瀹夊眬鍗曚綅鎴�", "闀挎矙"}); + add(new String[]{"闀挎矙鐜荤拑绾ょ淮鍘傚鑸�", "闀挎矙"}); + add(new String[]{"闀挎矙濂ユ灄鍖瑰厠鑺卞洯", "闀挎矙"}); + add(new String[]{"闀挎矙鍢夊崕鍩�", "闀挎矙"}); + add(new String[]{"闀挎矙涔嬭姱", "闀挎矙"}); + add(new String[]{"闀挎矙娓皬鍖�", "闀挎矙"}); + }}); + city_DistrictNames.put("娌冲崡", new ArrayList(){{ + add(new String[]{"娌冲崡搴勫皬鍖�", "闈掑矝"}); + add(new String[]{"娌冲崡璐笓瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡鐪佹柊鍗庝功搴楀灞為櫌", "閮戝窞"}); + add(new String[]{"娌冲崡鐪佸晢涓氱瀛︾爺绌舵墍瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡鐪佹棩鎶ョぞ瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡濂冲瓙楂樹腑瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡澶栬锤澶ч櫌", "娣卞湷"}); + add(new String[]{"娌冲崡閲�", "澶╂触"}); + add(new String[]{"娌冲崡鏂版潙", "绂忓窞"}); + add(new String[]{"娌冲崡璐㈢粡瀛﹂櫌瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡宀稿叕鍥皬鍖�", "鎯犲窞"}); + add(new String[]{"娌冲崡宀告柊鏉�", "鎯犲窞"}); + add(new String[]{"娌冲崡鏉�", "鍖椾含"}); + add(new String[]{"娌冲崡鐞嗗伐瀛︽牎瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡鐪佷汉浜嬪巺瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡宀镐腑蹇冨皬鍖�", "鎯犲窞"}); + add(new String[]{"娌冲崡鐪佸璐稿鏍″灞為櫌", "閮戝窞"}); + add(new String[]{"娌冲崡鏉�", "涓婃捣"}); + add(new String[]{"娌冲崡鏂版潙", "涓婃捣"}); + add(new String[]{"娌冲崡宸ヤ笟澶у瀹跺睘闄�", "閮戝窞"}); + }}); + city_DistrictNames.put("鏂颁埂", new ArrayList(){{ + add(new String[]{"鏂颁埂鍘垮畨灞呭皬鍖�", "鏂颁埂"}); + }}); + city_DistrictNames.put("姹熻嫃", new ArrayList(){{ + add(new String[]{"姹熻嫃鐪佸啘绉戦櫌", "鍗椾含"}); + add(new String[]{"姹熻嫃娌圭敯鐭虫补灞卞簞", "鎵窞"}); + add(new String[]{"姹熻嫃璀﹀畼瀛﹂櫌", "鍗椾含"}); + add(new String[]{"姹熻嫃鐪侀珮绾т笓瀹跺洯", "鍗椾含"}); + add(new String[]{"姹熻嫃娌圭敯鐭虫补灞卞簞", "鎵窞"}); + add(new String[]{"姹熻嫃璁簨鍥�", "鍗椾含"}); + add(new String[]{"姹熻嫃鍥介檯濉戝寲鍩�", "甯稿窞"}); + add(new String[]{"姹熻嫃涓囧拰鍥介檯鍟嗚锤鍩�", "甯稿窞"}); + }}); + city_DistrictNames.put("鏃犻敗", new ArrayList(){{ + add(new String[]{"鏃犻敗澶у帵", "涓婃捣"}); + add(new String[]{"鏃犻敗婊ㄦ箹涓囪揪骞垮満", "鏃犻敗"}); + add(new String[]{"鏃犻敗纰ф鍥�", "鏃犻敗"}); + add(new String[]{"鏃犻敗涓栫晫璐告槗涓績涓�鏈熶笘璐稿叕瀵�", "鏃犻敗"}); + add(new String[]{"鏃犻敗娲涘煄姗欓儭", "鏃犻敗"}); + add(new String[]{"鏃犻敗濉炵撼搴勫洯", "瀹滃叴"}); + add(new String[]{"鏃犻敗鐜夊叞鑺卞洯", "瀹滃叴"}); + }}); + city_DistrictNames.put("瀹滃叴", new ArrayList(){{ + add(new String[]{"瀹滃叴鍗楅噷", "澶╂触"}); + add(new String[]{"瀹滃叴闃冲厜鑺辫嫅", "瀹滃叴"}); + add(new String[]{"瀹滃叴澶粏鑺辫嫅", "瀹滃叴"}); + }}); + city_DistrictNames.put("杈藉畞", new ArrayList(){{ + add(new String[]{"杈藉畞涓尰瀹跺睘妤�", "娌堥槼"}); + add(new String[]{"杈藉畞閲�", "澶╂触"}); + }}); + city_DistrictNames.put("娌堥槼", new ArrayList(){{ + add(new String[]{"娌堥槼涓綋濂ユ灄鍖瑰厠鑺卞洯路鑺卞洯涓�鍙�", "娌堥槼"}); + add(new String[]{"娌堥槼鎭掑ぇ鍩�", "娌堥槼"}); + add(new String[]{"娌堥槼鎭掑ぇ缁挎床", "娌堥槼"}); + add(new String[]{"娌堥槼濂ユ灄鍖瑰厠鑺卞洯涓夋湡", "娌堥槼"}); + add(new String[]{"娌堥槼甯傜偖鍏靛闄㈠皬鍖�", "娌堥槼"}); + add(new String[]{"娌堥槼鎭掑ぇ鍚嶉兘", "娌堥槼"}); + add(new String[]{"娌堥槼娴烽煹骞垮満锛堥敠姹熷ぇ閰掑簵B搴э級", "娌堥槼"}); + add(new String[]{"娌堥槼绔欏皬鍖�", "娌堥槼"}); + add(new String[]{"娌堥槼璐㈠瘜涓績", "娌堥槼"}); + add(new String[]{"娌堥槼鍩庡競绔嬫柟鏂板眳", "娌堥槼"}); + add(new String[]{"娌堥槼涓綋濂ユ灄鍖瑰厠鑺卞洯路鑺卞洯鏂板煄", "娌堥槼"}); + add(new String[]{"娌堥槼涓綋濂ユ灄鍖瑰厠鑺卞洯路绂忓煄", "娌堥槼"}); + add(new String[]{"娌堥槼涓浗濂充汉琛�", "娌堥槼"}); + add(new String[]{"娌堥槼绀惧尯", "姝︽眽"}); + add(new String[]{"娌堥槼澶╁湴", "娌堥槼"}); + add(new String[]{"娌堥槼鎭掑ぇ姹熸咕", "娌堥槼"}); + add(new String[]{"娌堥槼鎭掑ぇ鍗庡簻", "娌堥槼"}); + add(new String[]{"娌堥槼涓囪揪鍏", "娌堥槼"}); + add(new String[]{"娌堥槼鍥介檯鍝佺墝鎬婚儴澶у帵", "娌堥槼"}); + add(new String[]{"娌堥槼鍥介檯鍝佺墝鎬婚儴澶у帵锛堝浗闄呴瀷鍩庯級", "娌堥槼"}); + add(new String[]{"娌堥槼浜旈噾鏈虹數鍩�", "娌堥槼"}); + add(new String[]{"娌堥槼鍟嗕笟鍩庯紙瑗垮尯锛�", "娌堥槼"}); + }}); + city_DistrictNames.put("杈藉畞", new ArrayList(){{ + add(new String[]{"杈藉畞涓尰瀹跺睘妤�", "娌堥槼"}); + add(new String[]{"杈藉畞閲�", "澶╂触"}); + }}); + city_DistrictNames.put("钀ュ彛", new ArrayList(){{ + add(new String[]{"钀ュ彛澶у帵", "涓婃捣"}); + }}); + city_DistrictNames.put("娴欐睙", new ArrayList(){{ + add(new String[]{"娴欐睙宸ヤ笟澶у鏁欏笀瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙澶у帵", "澶師"}); + add(new String[]{"娴欐睙鍔炰簨澶勫鑸�", "澶師"}); + add(new String[]{"娴欐睙浠佸拰灞呰�佸勾鍏荤敓鍏瘬", "婀栧窞"}); + add(new String[]{"娴欐睙浜よ繍澶у帵", "鏉窞"}); + add(new String[]{"娴欐睙宸ュ晢澶у瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙鍟嗚锤鍩�", "鍚堣偉"}); + add(new String[]{"娴欐睙宸ヤ笟澶у涔嬫睙瀛﹂櫌", "鏉窞"}); + }}); + city_DistrictNames.put("瀹佹尝", new ArrayList(){{ + add(new String[]{"瀹佹尝閲�", "澶╂触"}); + add(new String[]{"瀹佹尝閲�", "姝︽眽"}); + add(new String[]{"瀹佹尝鍟嗕細澶у帵", "瀹佹尝"}); + add(new String[]{"瀹佹尝澶栦唬澶у帵", "瀹佹尝"}); + add(new String[]{"瀹佹尝灏忓尯", "涓婃捣"}); + }}); + city_DistrictNames.put("鎱堟邯", new ArrayList(){{ + add(new String[]{"鎱堟邯閲戞按婀�", "瀹佹尝"}); + add(new String[]{"鎱堟邯涓ぎ澶у帵", "瀹佹尝"}); + add(new String[]{"鎱堟邯涓�鍝佺┖闂�", "瀹佹尝"}); + add(new String[]{"鎱堟邯璐㈠瘜涓績", "瀹佹尝"}); + add(new String[]{"鎱堟邯涓ぎ澶у帵", "鎱堟邯"}); + add(new String[]{"鎱堟邯涓�鍝佺┖闂�", "鎱堟邯"}); + add(new String[]{"鎱堟邯閲戞按婀�", "鎱堟邯"}); + }}); + city_DistrictNames.put("瀹夊窘", new ArrayList(){{ + add(new String[]{"瀹夊窘甯堣寖澶у鏁欏笀鍏瘬", "鑺滄箹"}); + add(new String[]{"瀹夊窘鐢佃鍙板鑸�", "鍚堣偉"}); + add(new String[]{"瀹夊窘鏃ユ姤绀惧鑸�", "鍚堣偉"}); + add(new String[]{"瀹夊窘澶у帵", "鐝犳捣"}); + add(new String[]{"瀹夊窘鏉傛妧鍥㈠鑸�", "鍚堣偉"}); + add(new String[]{"瀹夊窘璀﹀畼鑱屼笟瀛﹂櫌瀹胯垗", "鍚堣偉"}); + add(new String[]{"瀹夊窘绋庡姟瀛︽牎瀹胯垗", "鍚堣偉"}); + add(new String[]{"瀹夊窘姹介厤鍩�", "鍚堣偉"}); + add(new String[]{"瀹夊窘鍥藉己閽㈡潗浜ゆ槗涓績", "鍚堣偉"}); + add(new String[]{"瀹夊窘鍥介檯璐墿骞垮満", "鍚堣偉"}); + add(new String[]{"瀹夊窘澶у競鍦�", "鍚堣偉"}); + }}); + city_DistrictNames.put("鑺滄箹", new ArrayList(){{ + add(new String[]{"鑺滄箹鏂囧寲鍏洯", "鑺滄箹"}); + add(new String[]{"鑺滄箹纰ф鍥�", "鑺滄箹"}); + }}); + city_DistrictNames.put("璐靛窞", new ArrayList(){{ + add(new String[]{"璐靛窞澶у帵", "娴峰彛"}); + add(new String[]{"璐靛窞绉戞妧澶у帵", "璐甸槼"}); + add(new String[]{"璐靛窞鏃ユ姤绀剧硸鏋滃巶瀹胯垗", "璐甸槼"}); + add(new String[]{"璐靛窞椹村弸浜哄閰掑簵寮忚繛閿佸搴叕瀵�", "璐甸槼"}); + add(new String[]{"璐靛窞鏃ユ姤绀剧硸鏋滃巶瀹胯垗", "璐甸槼"}); + add(new String[]{"璐靛窞鍟嗚锤鐗╂祦娓�", "璐甸槼"}); + }}); + city_DistrictNames.put("鍏洏姘�", new ArrayList(){{ + }}); + city_DistrictNames.put("骞夸笢", new ArrayList(){{ + add(new String[]{"骞夸笢澶栬锤骞垮満", "骞垮窞"}); + add(new String[]{"骞夸笢澶栬鑹烘湳瀛﹂櫌鏁欏笀瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢寤虹闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢鍙告硶璀﹀畼鑱屼笟瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐜繚澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍟嗕笟澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍖诲闄㈡暀甯堝鑸嶆ゼ", "涓滆帪"}); + add(new String[]{"骞夸笢鍥介檯澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佹妧鏈洃鐫e眬瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢宸ヤ笟澶у瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鏁欒偛瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪侀摱琛屽ぇ鍘�", "娣卞湷"}); + add(new String[]{"骞夸笢澶у帵", "澶╂触"}); + add(new String[]{"骞夸笢灞卞簞", "闀囨睙"}); + add(new String[]{"骞夸笢绾㈢浘澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鑽闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢闈掑勾骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鍩虹妤�", "娣卞湷"}); + add(new String[]{"骞夸笢鐪佺鎶�骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佸啘涓氱鐞嗗共閮ㄥ闄㈢ぞ鍖�", "骞垮窞"}); + add(new String[]{"骞夸笢鑺暰闆烽�告櫙", "浣涘北"}); + }}); + city_DistrictNames.put("婀涙睙", new ArrayList(){{ + add(new String[]{"婀涙睙閲�", "澶╂触"}); + add(new String[]{"婀涙睙鏁扮爜澶у帵", "婀涙睙"}); + add(new String[]{"婀涙睙涓栬锤澶у帵", "婀涙睙"}); + add(new String[]{"婀涙睙鍥借锤澶у帵", "婀涙睙"}); + }}); + city_DistrictNames.put("娌冲崡", new ArrayList(){{ + add(new String[]{"娌冲崡搴勫皬鍖�", "闈掑矝"}); + add(new String[]{"娌冲崡璐笓瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡鐪佹柊鍗庝功搴楀灞為櫌", "閮戝窞"}); + add(new String[]{"娌冲崡鐪佸晢涓氱瀛︾爺绌舵墍瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡鐪佹棩鎶ョぞ瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡濂冲瓙楂樹腑瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡澶栬锤澶ч櫌", "娣卞湷"}); + add(new String[]{"娌冲崡閲�", "澶╂触"}); + add(new String[]{"娌冲崡鏂版潙", "绂忓窞"}); + add(new String[]{"娌冲崡璐㈢粡瀛﹂櫌瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡宀稿叕鍥皬鍖�", "鎯犲窞"}); + add(new String[]{"娌冲崡宀告柊鏉�", "鎯犲窞"}); + add(new String[]{"娌冲崡鏉�", "鍖椾含"}); + add(new String[]{"娌冲崡鐞嗗伐瀛︽牎瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡鐪佷汉浜嬪巺瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡宀镐腑蹇冨皬鍖�", "鎯犲窞"}); + add(new String[]{"娌冲崡鐪佸璐稿鏍″灞為櫌", "閮戝窞"}); + add(new String[]{"娌冲崡鏉�", "涓婃捣"}); + add(new String[]{"娌冲崡鏂版潙", "涓婃捣"}); + add(new String[]{"娌冲崡宸ヤ笟澶у瀹跺睘闄�", "閮戝窞"}); + }}); + city_DistrictNames.put("骞抽《灞�", new ArrayList(){{ + add(new String[]{"骞抽《灞卞皬鍖�", "涔岄瞾鏈ㄩ綈"}); + add(new String[]{"骞抽《灞辫繍杈撳叕鍙稿灞為櫌", "涔岄瞾鏈ㄩ綈"}); + }}); + city_DistrictNames.put("浜戝崡", new ArrayList(){{ + add(new String[]{"浜戝崡澶у帵", "骞垮窞"}); + add(new String[]{"浜戝崡鐪佹潅鎶�鍥㈠灞為櫌", "鏄嗘槑"}); + add(new String[]{"浜戝崡鍗庝鲸鍩�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鑹烘湳瀹跺洯鍖�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鍐滀笟澶у鏁欏伐浣忓畢鍖�", "鏄嗘槑"}); + add(new String[]{"浜戝崡璐㈢粡澶у浣忓畢", "鏄嗘槑"}); + add(new String[]{"浜戝崡澶у榫欐硥璺皬鍖�", "鏄嗘槑"}); + add(new String[]{"浜戝崡宸ヤ笟鑱屼笟鎶�鏈闄�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鍗拌薄鍩�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鏄犺薄", "鏄嗘槑"}); + add(new String[]{"浜戝崡鐪佺暅鐗у眬瀹胯垗", "鏄嗘槑"}); + add(new String[]{"浜戝崡鐪佸缓绛戞潗鏂欏鐮旂┒璁捐闄�", "鏄嗘槑"}); + add(new String[]{"浜戝崡娴嬬粯宸ョ▼闄�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鐪佺涓�杞诲伐鏈烘鍘�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鏃ユ姤绀惧崟浣嶆埧", "鏄嗘槑"}); + add(new String[]{"浜戝崡鐧借嵂鍘傚崟浣嶇鍒╂埧", "鏄嗘槑"}); + add(new String[]{"浜戝崡澶у涓滀簩闄�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鐪佸鍏氭牎鐢熸椿鍖�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鍗拌薄鍩庡埆澧�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鐧借嵂绂忓埄鎴�", "鏄嗘槑"}); + }}); + city_DistrictNames.put("鐜夋邯", new ArrayList(){{ + add(new String[]{"鐜夋邯楂樹粨鏃朵唬鏄庣彔", "鐜夋邯"}); + add(new String[]{"鐜夋邯涓�灏忓尯", "鐜夋邯"}); + }}); + city_DistrictNames.put("鍚夋灄", new ArrayList(){{ + add(new String[]{"鍚夋灄澶у帵", "娴峰彛"}); + add(new String[]{"鍚夋灄鑺卞洯", "璐甸槼"}); + add(new String[]{"鍚夋灄绀惧尯", "姝︽眽"}); + add(new String[]{"鍚夋灄鐪佸洟鏍″灞炴ゼ", "闀挎槬"}); + add(new String[]{"鍚夋灄閲�", "澶╂触"}); + }}); + city_DistrictNames.put("闀挎槬", new ArrayList(){{ + add(new String[]{"闀挎槬鏄庣彔", "闀挎槬"}); + add(new String[]{"闀挎槬缁忔祹寮�鍙戝尯缁忓紑鍏尯", "闀挎槬"}); + add(new String[]{"闀挎槬涓囩鍩庡競鑺卞洯", "闀挎槬"}); + add(new String[]{"闀挎槬閾跺骇", "闀挎槬"}); + add(new String[]{"闀挎槬璞洯", "闀挎槬"}); + add(new String[]{"闀挎槬鐞嗗伐澶у瀹跺睘妤�", "闀挎槬"}); + add(new String[]{"闀挎槬宸ョ▼瀛﹂櫌瀹胯垗", "闀挎槬"}); + add(new String[]{"闀挎槬宸ヤ笟澶у鍏瘬", "闀挎槬"}); + add(new String[]{"闀挎槬宸ュぇ浣忓畢", "闀挎槬"}); + add(new String[]{"闀挎槬甯傚弻闃冲尯瀹㈣繍缁煎悎鏈嶅姟鍖�", "闀挎槬"}); + add(new String[]{"闀挎槬甯備笢鑻�15鍙锋ゼ", "闀挎槬"}); + add(new String[]{"闀挎槬鏄嗕粦", "闀挎槬"}); + add(new String[]{"闀挎槬鏉�", "鍗楁槍"}); + add(new String[]{"闀挎槬灏忓尯", "姝︽眽"}); + add(new String[]{"闀挎槬瑗块噷", "澶╂触"}); + add(new String[]{"闀挎槬灏忓尯", "瑗勯槼"}); + add(new String[]{"闀挎槬灏忓尯鐢垫皵鍖�", "瑗勯槼"}); + add(new String[]{"闀挎槬鑻戝皬鍖�", "涔岄瞾鏈ㄩ綈"}); + add(new String[]{"闀挎槬鑺卞洯 (闀挎槬鑺辫嫅)", "涔岄瞾鏈ㄩ綈"}); + add(new String[]{"闀挎槬鑺卞洯", "娣卞湷"}); + add(new String[]{"闀挎槬鑺卞洯", "绂忓窞"}); + add(new String[]{"闀挎槬鑺卞洯", "澶ц繛"}); + add(new String[]{"闀挎槬鑺卞洯鍩�", "娓╁窞"}); + add(new String[]{"闀挎槬閲�", "澶╂触"}); + add(new String[]{"闀挎槬瑙傜ぞ鍖�", "姝︽眽"}); + add(new String[]{"闀挎槬灏忓尯浜屾湡", "姝︽眽"}); + add(new String[]{"闀挎槬閽荤煶鍩�", "闀挎槬"}); + add(new String[]{"闀挎槬甯傚痉闃宠喘鐗╀腑蹇�", "闀挎槬"}); + add(new String[]{"闀挎槬閮藉競璞涵", "鍚堣偉"}); + add(new String[]{"闀挎槬鑺卞洯", "鏄嗘槑"}); + add(new String[]{"闀挎槬閮藉競鑺卞洯", "鍚堣偉"}); + add(new String[]{"闀挎槬鑻�", "涓婃捣"}); + add(new String[]{"闀挎槬鏂拌嫅", "涓婃捣"}); + add(new String[]{"闀挎槬灏忓尯", "涓婃捣"}); + add(new String[]{"闀挎槬鍏瘬", "涓婃捣"}); + add(new String[]{"闀挎槬鑺卞洯鍩�", "鐟炲畨"}); + add(new String[]{"闀挎槬浜屽尯", "涔変箤"}); + add(new String[]{"闀挎槬涓夊尯", "涔変箤"}); + add(new String[]{"闀挎槬灏忓尯", "涔変箤"}); + add(new String[]{"闀挎槬涓夊尯", "閲戝崕"}); + add(new String[]{"闀挎槬灏忓尯", "閲戝崕"}); + add(new String[]{"闀挎槬浜屽尯", "閲戝崕"}); + add(new String[]{"闀挎槬绾㈡槦缇庡嚡榫欏叏鐞冨灞呯敓娲诲箍鍦�", "闀挎槬"}); + add(new String[]{"闀挎槬鏄庣彔浜屾湡", "闀挎槬"}); + }}); + city_DistrictNames.put("灞变笢", new ArrayList(){{ + add(new String[]{"灞变笢閲�", "绉︾殗宀�"}); + add(new String[]{"灞变笢缁忔祹瀛﹂櫌瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢鐪佸崼鐢熷巺瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢鐪佹皯鏀垮巺瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢鐪佸晢涓氶泦鍥㈡�诲叕鍙稿鑸�", "娴庡崡"}); + add(new String[]{"灞变笢鍖荤澶у鏁欏笀瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢澶栬锤澶у帵", "闈掑矝"}); + add(new String[]{"灞变笢澶у帵", "娣卞湷"}); + add(new String[]{"灞变笢鍫$ぞ鍖�", "娌堥槼"}); + add(new String[]{"灞变笢鑹烘湳瀛﹂櫌瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢榛勯噾宕簯婀栭珮灏斿か鍒", "娴庡崡"}); + add(new String[]{"灞变笢鍙告硶璀﹀畼瀛﹂櫌瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢鐪佺瀛﹂櫌楂樻柊鎶�鏈爺绌跺垎闄�", "闈掑矝"}); + add(new String[]{"灞变笢寤哄伐瀛﹂櫌瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢搴欏皬鍖�", "娌堥槼"}); + add(new String[]{"灞变笢涔冲北閾舵哗娴锋櫙鎴�", "濞佹捣"}); + add(new String[]{"灞变笢澶存潙", "闈掑矝"}); + add(new String[]{"灞变笢鐪佺暅鐗у眬瀹胯垗", "娴庡崡"}); + }}); + city_DistrictNames.put("濞佹捣", new ArrayList(){{ + add(new String[]{"濞佹捣浠佹煶搴勫埆澧�", "濞佹捣"}); + add(new String[]{"濞佹捣鍗庢柊鍥�", "濞佹捣"}); + add(new String[]{"濞佹捣涓尰闄�", "濞佹捣"}); + add(new String[]{"濞佹捣瑗垮尽搴�", "濞佹捣"}); + add(new String[]{"濞佹捣鐭冲矝纰ф捣楣忓煄", "濞佹捣"}); + add(new String[]{"濞佹捣澶╅箙婀栫晹", "濞佹捣"}); + add(new String[]{"濞佹捣娲查檯浼戦棽鏃呮父搴﹀亣鍖�", "濞佹捣"}); + add(new String[]{"濞佹捣鑻�", "涓婃捣"}); + add(new String[]{"濞佹捣鍒", "涓婃捣"}); + add(new String[]{"濞佹捣澶фゼ", "涓婃捣"}); + }}); + city_DistrictNames.put("娴欐睙", new ArrayList(){{ + add(new String[]{"娴欐睙宸ヤ笟澶у鏁欏笀瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙澶у帵", "澶師"}); + add(new String[]{"娴欐睙鍔炰簨澶勫鑸�", "澶師"}); + add(new String[]{"娴欐睙浠佸拰灞呰�佸勾鍏荤敓鍏瘬", "婀栧窞"}); + add(new String[]{"娴欐睙浜よ繍澶у帵", "鏉窞"}); + add(new String[]{"娴欐睙宸ュ晢澶у瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙鍟嗚锤鍩�", "鍚堣偉"}); + add(new String[]{"娴欐睙宸ヤ笟澶у涔嬫睙瀛﹂櫌", "鏉窞"}); + }}); + city_DistrictNames.put("閲戝崕", new ArrayList(){{ + add(new String[]{"閲戝崕閲�", "鍖椾含"}); + add(new String[]{"閲戝崕鑻�", "娴峰彛"}); + add(new String[]{"閲戝崕鏂版潙", "澶ц繛"}); + add(new String[]{"閲戝崕鍏瘬", "闈掑矝"}); + add(new String[]{"閲戝崕鍥�", "涓北"}); + add(new String[]{"閲戝崕鑺卞洯", "涓滆帪"}); + add(new String[]{"閲戝崕涓栧", "璐甸槼"}); + add(new String[]{"閲戝崕鍥�", "璐甸槼"}); + add(new String[]{"閲戝崕鑺卞洯", "骞垮窞"}); + add(new String[]{"閲戝崕鏂版潙", "鏉窞"}); + add(new String[]{"閲戝崕鑻�", "娼嶅潑"}); + add(new String[]{"閲戝崕涓藉皬鍖�", "娼嶅潑"}); + add(new String[]{"閲戝崕鑺卞洯", "閲嶅簡"}); + add(new String[]{"閲戝崕闃�", "娣卞湷"}); + add(new String[]{"閲戝崕澶у帵澶ф浮鍙�", "閲嶅簡"}); + add(new String[]{"閲戝崕鑻戝皬鍖�", "閲嶅簡"}); + add(new String[]{"閲戝崕閲�", "澶╂触"}); + add(new String[]{"閲戝崕灏忓尯", "鐭冲搴�"}); + add(new String[]{"閲戝崕澶у帵", "閲嶅簡"}); + add(new String[]{"閲戝崕鍥�", "閲嶅簡"}); + add(new String[]{"閲戝崕浜戦紟", "閲嶅簡"}); + add(new String[]{"閲戝崕鍥�", "娌堥槼"}); + add(new String[]{"閲戝崕鍏瘬", "鎴愰兘"}); + add(new String[]{"閲戝崕鑻�", "鎴愰兘"}); + add(new String[]{"閲戝崕澶у帵", "姝︽眽"}); + add(new String[]{"閲戝崕瀛﹀簻", "鍛煎拰娴╃壒"}); + add(new String[]{"閲戝崕涓栧鍒", "璐甸槼"}); + add(new String[]{"閲戝崕鍏瘬", "绂忓窞"}); + add(new String[]{"閲戝崕灏忓尯", "澶ц繛"}); + add(new String[]{"閲戝崕閲岋紙瑗块潚锛�", "澶╂触"}); + add(new String[]{"閲戝崕妤�", "鍘﹂棬"}); + add(new String[]{"閲戝崕鑻�", "鍏板窞"}); + add(new String[]{"閲戝崕鍥埆澧�", "鍖椾含"}); + add(new String[]{"閲戝崕灏忓尯涓夋湡", "澶ц繛"}); + add(new String[]{"閲戝崕鑺卞洯", "涓北"}); + add(new String[]{"閲戝崕鍥�", "浣涘北"}); + add(new String[]{"閲戝崕鑻�", "闈掑矝"}); + add(new String[]{"閲戝崕灏忓尯浜屾湡", "澶ц繛"}); + add(new String[]{"閲戝崕鍥�", "鏄嗘槑"}); + add(new String[]{"閲戝崕鑻�", "涓婃捣"}); + add(new String[]{"閲戝崕鍥�", "鍖椾含"}); + add(new String[]{"閲戝崕鏂版潙", "涓婃捣"}); + add(new String[]{"閲戝崕鍏徃瀹胯垗", "鏄嗘槑"}); + add(new String[]{"閲戝崕鑻�", "骞抽《灞�"}); + add(new String[]{"閲戝崕瀹跺洯 ", "鐩橀敠"}); + add(new String[]{"閲戝崕瀹跺洯", "鐩橀敠"}); + add(new String[]{"閲戝崕涓囪揪骞垮満", "閲戝崕"}); + add(new String[]{"閲戝崕涓栬锤涓績", "閲戝崕"}); + add(new String[]{"閲戝崕姹介厤鍩庝簩鏈�", "閲戝崕"}); + add(new String[]{"閲戝崕宸蜂竴鍙�", "鏀�鏋濊姳"}); + }}); + city_DistrictNames.put("涔変箤", new ArrayList(){{ + add(new String[]{"涔変箤鎵瑰彂甯傚満", "閲嶅簡"}); + add(new String[]{"涔変箤灏忓晢鍝佹壒鍙戝煄", "鎯犲窞"}); + add(new String[]{"涔変箤鍏瘬", "鎯犲窞"}); + add(new String[]{"涔変箤閲戣寕澶у帵", "涔変箤"}); + add(new String[]{"涔変箤涓栫邯鍟嗗煄", "涔変箤"}); + add(new String[]{"涔変箤娆ф櫙鍚嶅煄", "涔変箤"}); + add(new String[]{"涔変箤鐜颁唬鍩�", "涔変箤"}); + add(new String[]{"涔変箤鏃朵唬鑺卞洯", "涔変箤"}); + add(new String[]{"涔変箤閲戣寕澶у帵", "閲戝崕"}); + add(new String[]{"涔変箤涓栫邯鍟嗗煄", "閲戝崕"}); + add(new String[]{"涔変箤鏃朵唬鑺卞洯", "閲戝崕"}); + add(new String[]{"涔変箤瑗垮煄骞垮満", "閲戝崕"}); + add(new String[]{"涔変箤鐜颁唬鍩�", "閲戝崕"}); + add(new String[]{"涔変箤娆ф櫙鍚嶅煄", "閲戝崕"}); + }}); + city_DistrictNames.put("姹熻嫃", new ArrayList(){{ + add(new String[]{"姹熻嫃鐪佸啘绉戦櫌", "鍗椾含"}); + add(new String[]{"姹熻嫃娌圭敯鐭虫补灞卞簞", "鎵窞"}); + add(new String[]{"姹熻嫃璀﹀畼瀛﹂櫌", "鍗椾含"}); + add(new String[]{"姹熻嫃鐪侀珮绾т笓瀹跺洯", "鍗椾含"}); + add(new String[]{"姹熻嫃娌圭敯鐭虫补灞卞簞", "鎵窞"}); + add(new String[]{"姹熻嫃璁簨鍥�", "鍗椾含"}); + add(new String[]{"姹熻嫃鍥介檯濉戝寲鍩�", "甯稿窞"}); + add(new String[]{"姹熻嫃涓囧拰鍥介檯鍟嗚锤鍩�", "甯稿窞"}); + }}); + city_DistrictNames.put("瀹胯縼", new ArrayList(){{ + }}); + city_DistrictNames.put("杈藉畞", new ArrayList(){{ + add(new String[]{"杈藉畞涓尰瀹跺睘妤�", "娌堥槼"}); + add(new String[]{"杈藉畞閲�", "澶╂触"}); + }}); + city_DistrictNames.put("闉嶅北", new ArrayList(){{ + add(new String[]{"闉嶅北鎭掑熀鍏嗕笟鍥灄璺湴鍧�", "闉嶅北"}); + add(new String[]{"闉嶅北鎭掑ぇ缁挎床", "闉嶅北"}); + add(new String[]{"闉嶅北涓夋潙", "涓婃捣"}); + add(new String[]{"闉嶅北鍥涙潙", "涓婃捣"}); + add(new String[]{"闉嶅北鍏潙", "涓婃捣"}); + add(new String[]{"闉嶅北涓冩潙", "涓婃捣"}); + add(new String[]{"闉嶅北鍏潙", "涓婃捣"}); + add(new String[]{"闉嶅北涓�鏉�", "涓婃捣"}); + add(new String[]{"闉嶅北浜旀潙", "涓婃捣"}); + }}); + city_DistrictNames.put("绂忓缓", new ArrayList(){{ + add(new String[]{"绂忓缓鍥�", "鍗楀畞"}); + add(new String[]{"绂忓缓鐪佸洓寤哄鑸嶅寳闂�", "鍘﹂棬"}); + add(new String[]{"绂忓缓鑱旈�氳姳鍥�", "绂忓窞"}); + add(new String[]{"绂忓缓鏃ユ姤绀惧鑸�", "绂忓窞"}); + add(new String[]{"绂忓缓鐪佷腑蹇冩楠屾墍鍗曚綅瀹胯垗", "绂忓窞"}); + add(new String[]{"绂忓缓鐢靛奖鍒剁墖鍘傚崟浣嶅鑸�", "绂忓窞"}); + add(new String[]{"绂忓缓鐪佸コ瀛愮洃鐙卞鑸�", "绂忓窞"}); + add(new String[]{"绂忓缓鐪佸尰鑽叕鍙稿ぇ鐜嬮噷鍗曚綅瀹胯垗", "绂忓窞"}); + add(new String[]{"绂忓缓鐪佺浜屽叕璺伐绋嬪叕鍙稿鑸�", "绂忓窞"}); + add(new String[]{"绂忓缓鐪佽殨妗戠爺绌舵墍鍗曚綅瀹胯垗", "绂忓窞"}); + add(new String[]{"绂忓缓鏂版潙", "鍗椾含"}); + add(new String[]{"绂忓缓閲�", "澶╂触"}); + add(new String[]{"绂忓缓绀惧尯", "姝︽眽"}); + add(new String[]{"绂忓缓澶у帵", "璐甸槼"}); + add(new String[]{"绂忓缓宸峰皬鍖�", "鎴愰兘"}); + add(new String[]{"绂忓缓澶у帵", "娣卞湷"}); + add(new String[]{"绂忓缓鐢熸�佸伐绋嬪鏍″崟浣嶅鑸�", "绂忓窞"}); + add(new String[]{"绂忓缓鍖荤澶у鏁欏伐瀹胯垗", "绂忓窞"}); + }}); + city_DistrictNames.put("鍘﹂棬", new ArrayList(){{ + add(new String[]{"鍘﹂棬鍥介檯骞垮満", "鍘﹂棬"}); + add(new String[]{"鍘﹂棬澶у鍩�", "鍘﹂棬"}); + add(new String[]{"鍘﹂棬鍗冪Η鍥�", "鍘﹂棬"}); + add(new String[]{"鍘﹂棬缃愬ご鍘傚鑸�", "鍘﹂棬"}); + add(new String[]{"鍘﹂棬姘戦槻", "鍘﹂棬"}); + add(new String[]{"鍘﹂棬鑾插潅鏂板皬鍖�", "鍘﹂棬"}); + add(new String[]{"鍘﹂棬閽㈢獥鍘傚鑸�", "鍘﹂棬"}); + add(new String[]{"鍘﹂棬閫犺埞鍘傚鑸�", "鍘﹂棬"}); + add(new String[]{"鍘﹂棬鑸┖瀹胯垗", "绂忓窞"}); + add(new String[]{"鍘﹂棬甯備腑蹇冭绔欏鑸嶆ゼ", "鍘﹂棬"}); + add(new String[]{"鍘﹂棬鍖昏嵂绔欏鑸�", "鍘﹂棬"}); + add(new String[]{"鍘﹂棬琛岃溅鍏瘬", "鍘﹂棬"}); + add(new String[]{"鍘﹂棬鍥介檯鏂囧寲澶у帵", "鍘﹂棬"}); + add(new String[]{"鍘﹂棬鍗庤嫅", "鐩愬煄"}); + add(new String[]{"鍘﹂棬鐢垫満鍘傚鑸�", "鍘﹂棬"}); + }}); + city_DistrictNames.put("娴峰崡", new ArrayList(){{ + add(new String[]{"娴峰崡涔嬪績", "娴峰彛"}); + add(new String[]{"娴峰崡澶у鍗楀笇绉戞妧鑻�", "娴峰彛"}); + add(new String[]{"娴峰崡鏃ユ姤绀惧鑸�", "娴峰彛"}); + add(new String[]{"娴峰崡鐪佸璁℃満鍏崇編鑸嶄綇瀹呭尯", "娴峰彛"}); + add(new String[]{"娴峰崡绀句繚", "娴峰彛"}); + add(new String[]{"娴峰崡鐪佷汉澶у父濮斾細鏈哄叧浣忓畢灏忓尯", "娴峰彛"}); + add(new String[]{"娴峰崡澶у鏁欏笀瀹胯垗", "娴峰彛"}); + add(new String[]{"娴峰崡鐕冨寲鍏徃瀹胯垗", "娴峰彛"}); + add(new String[]{"娴峰崡鐪佷綋鏍″鑸�", "娴峰彛"}); + add(new String[]{"娴峰崡缁熻灞�瀹胯垗", "娴峰彛"}); + add(new String[]{"娴峰崡鐪佸伐鍟嗛摱琛屽鑸�", "娴峰彛"}); + add(new String[]{"娴峰崡宸ュ晢澶у帵", "娴峰彛"}); + add(new String[]{"娴峰崡鏃朵唬骞垮満", "娴峰彛"}); + add(new String[]{"娴峰崡甯堣寖瀛﹂櫌閲戣姳鍥�", "娴峰彛"}); + add(new String[]{"娴峰崡澶у帵", "娴峰彛"}); + add(new String[]{"娴峰崡鐢靛姏鍘傚鑸�", "娴峰彛"}); + add(new String[]{"娴峰崡鐪佷笁浜氬叚寤哄崟浣�", "涓変簹"}); + add(new String[]{"娴峰崡闄垫按瀵屽姏婀�", "涓変簹"}); + add(new String[]{"娴峰崡澶у叕棣�", "娴峰彛"}); + add(new String[]{"娴峰崡缇庢灄婀栧浗闄呭害鍋囩ぞ鍖�", "涓変簹"}); + add(new String[]{"娴峰崡瀹跺洯", "鍖椾含"}); + add(new String[]{"娴峰崡骞蹭紤鎵�", "骞垮窞"}); + add(new String[]{"娴峰崡缁垮煄娓呮按婀�", "涓変簹"}); + add(new String[]{"娴峰崡路涓変簹路缇庝簹涔嬪績", "涓変簹"}); + add(new String[]{"娴峰崡瑗垮紕51寮�", "涓婃捣"}); + add(new String[]{"娴峰崡骞蹭紤鎵�锛堝ぉ娌筹級", "骞垮窞"}); + add(new String[]{"娴峰崡鍚庢捣娓╂硥灏忛晣", "閲嶅簡"}); + }}); + city_DistrictNames.put("涓変簹", new ArrayList(){{ + add(new String[]{"涓変簹閲戣摑婀惧皬鍖�", "涓変簹"}); + add(new String[]{"涓変簹杩滄磱鍏", "涓変簹"}); + add(new String[]{"涓変簹娴峰渤鍗婂矝鎴愰偊", "涓変簹"}); + add(new String[]{"涓変簹鍖椾含鍏", "涓変簹"}); + add(new String[]{"涓変簹鑽e痉鑻�", "涓変簹"}); + add(new String[]{"涓変簹妞板矝闃冲厜鑺卞洯", "涓変簹"}); + add(new String[]{"涓変簹鑺牑闆呭害鍋囬厭搴�", "涓変簹"}); + add(new String[]{"涓変簹鐖辩惔娴峰哺搴峰勾濂楁埧搴﹀亣閰掑簵", "涓変簹"}); + add(new String[]{"涓変簹婀剧孩鏍戞灄", "涓変簹"}); + add(new String[]{"涓変簹鍗拌薄", "涓変簹"}); + add(new String[]{"涓変簹閲戜腑娴疯摑閽�", "涓変簹"}); + add(new String[]{"涓変簹涓滃哺鍋囨棩", "涓変簹"}); + add(new String[]{"涓変簹妞版渤婀�", "涓変簹"}); + add(new String[]{"涓変簹婀剧孩鏍戞灄", "涓変簹"}); + add(new String[]{"涓変簹鑺卞紑鍥涘", "涓変簹"}); + add(new String[]{"涓変簹鍗拌薄", "涓変簹"}); + add(new String[]{"涓変簹楦挎床浣冲洯", "涓変簹"}); + add(new String[]{"涓変簹榄呭姏涔嬪啝", "涓変簹"}); + add(new String[]{"涓変簹娴锋ゼ浜戞湀", "涓変簹"}); + add(new String[]{"涓変簹婀捐摑鑹叉捣宀�", "涓変簹"}); + add(new String[]{"涓変簹蹇冨ぉ鍦�", "涓変簹"}); + add(new String[]{"涓変簹鏃朵唬娴峰哺", "涓変簹"}); + add(new String[]{"涓変簹鏄熸捣搴﹀亣鍏瘬", "涓変簹"}); + add(new String[]{"涓変簹妞版櫙鍗楀哺", "涓変簹"}); + add(new String[]{"涓変簹姘戣埅灞�灏忓尯", "涓変簹"}); + add(new String[]{"涓変簹鍑ゅ嚢姘村煄", "涓変簹"}); + add(new String[]{"涓変簹涓借嫅", "涓変簹"}); + add(new String[]{"涓変簹鍥藉厜婊ㄦ捣鑺卞洯", "涓変簹"}); + add(new String[]{"涓変簹姒嗘灄婀撅紙閲戣壊骞村崕娴锋櫙灏忓尯锛�", "涓変簹"}); + add(new String[]{"涓変簹娉板拰鑺卞洯", "涓変簹"}); + add(new String[]{"涓変簹鏂板ぇ娲插嵃璞�", "涓変簹"}); + add(new String[]{"涓変簹鐩戠嫳灏忓尯", "涓変簹"}); + add(new String[]{"涓変簹涓夋案鍑ゅ嚢鍩�", "涓変簹"}); + add(new String[]{"涓変簹鍑ゅ嚢姘村煄鍑ゅ嚢婀�", "涓変簹"}); + add(new String[]{"涓変簹椴佽兘娓歌墖浜屽尯", "涓変簹"}); + add(new String[]{"涓変簹椴佽兘缇庝附涓夊尯", "涓変簹"}); + add(new String[]{"涓変簹娴蜂箣闊�", "涓変簹"}); + add(new String[]{"涓変簹鐜崼灞�瀹胯垗", "涓変簹"}); + add(new String[]{"涓変簹鍥介檯楗簵", "涓変簹"}); + add(new String[]{"涓変簹缇庝附涔嬭嫅", "涓変簹"}); + add(new String[]{"涓変簹楦挎床鍥介檯鍏", "涓変簹"}); + add(new String[]{"涓変簹姹囧嚡鑺卞洯", "涓変簹"}); + add(new String[]{"涓変簹鍗楁柊鑱屽伐浣忓畢妤�", "涓変簹"}); + add(new String[]{"涓変簹鍚屽績瀹跺洯", "涓変簹"}); + add(new String[]{"涓変簹鍗楁捣浣冲洯", "涓変簹"}); + add(new String[]{"涓変簹绱豹娴锋櫙閰掑簵", "涓変簹"}); + add(new String[]{"涓変簹鑵炬稕鍏瘬", "涓変簹"}); + add(new String[]{"涓変簹甯傚缓绛戝伐绋嬫�诲叕鍙镐綇瀹呭皬鍖�", "涓変簹"}); + add(new String[]{"涓変簹婀鹃缚杩愭ゼ", "涓変簹"}); + add(new String[]{"涓変簹娴疯埅灏忓尯涓�鏈熶簩鏈�", "涓変簹"}); + add(new String[]{"涓変簹缁垮矝鍏瘬", "涓変簹"}); + add(new String[]{"涓変簹婀炬垜閲婃捣", "涓変簹"}); + add(new String[]{"涓変簹浜ら�氬皬鍖�", "涓変簹"}); + add(new String[]{"涓変簹闃冲厜瀹跺洯", "涓変簹"}); + add(new String[]{"涓変簹娴锋花鍋囨棩鍒", "涓変簹"}); + add(new String[]{"涓変簹鍦g厹鑺卞洯", "涓変簹"}); + add(new String[]{"涓変簹閲戣寕娴锋櫙鍏瘬", "涓変簹"}); + add(new String[]{"涓変簹娓呭钩涔�", "涓変簹"}); + add(new String[]{"涓変簹甯傞粍閲戝箍鍦�", "涓変簹"}); + add(new String[]{"涓変簹棣ㄦ捣婀�", "涓変簹"}); + add(new String[]{"涓変簹绂忕憺鍥介檯鍏", "涓変簹"}); + add(new String[]{"涓変簹甯傞鍝佸巶鑱屽伐瀹夌疆鎴�", "涓変簹"}); + add(new String[]{"涓変簹婀惧浗闄呭叕棣�", "涓変簹"}); + add(new String[]{"涓変簹灞�", "涓変簹"}); + add(new String[]{"涓変簹瀵屾槬灞卞眳", "涓変簹"}); + add(new String[]{"涓変簹楂樼骇鐭ヨ瘑鍒嗗瓙浣忓畢鍥�", "涓変簹"}); + add(new String[]{"涓変簹鐜崼灞�瀹胯垗", "涓変簹"}); + add(new String[]{"涓変簹濂囨灄鐢熸�佽姳鍥皬鍖�", "涓変簹"}); + add(new String[]{"涓変簹宥烘捣", "涓変簹"}); + add(new String[]{"涓変簹缇庝附鏄ュぉ娓╂硥搴﹀亣閰掑簵鍏瘬", "涓変簹"}); + add(new String[]{"涓変簹涓芥櫙娓╂硥", "涓変簹"}); + add(new String[]{"涓変簹骞垮弸鑺卞洯", "涓変簹"}); + add(new String[]{"涓変簹鑺卞啝娓旀瓕娴烽煹", "涓変簹"}); + add(new String[]{"涓変簹路灞辨按鍥介檯", "涓変簹"}); + add(new String[]{"涓変簹鍗撹揪瀛i鑻�", "涓変簹"}); + add(new String[]{"涓変簹濉樺皬鍖�", "鎯犲窞"}); + add(new String[]{"涓変簹涓綋濂ユ灄鍖瑰厠婀�", "涓変簹"}); + add(new String[]{"涓変簹婀鹃瞾鑳介珮灏斿か涓夊尯鍒", "涓変簹"}); + add(new String[]{"涓変簹甯傛垜鏄竴鍙奔", "涓変簹"}); + add(new String[]{"涓変簹杈板厜鍋囨棩閰掑簵", "涓変簹"}); + add(new String[]{"涓変簹娴锋偊鍙�", "涓変簹"}); + add(new String[]{"涓変簹楂樼骇鐭ヨ瘑鍒嗗瓙浣忓畢鍥�", "涓変簹"}); + add(new String[]{"涓変簹婀捐摑娉㈡咕", "涓変簹"}); + add(new String[]{"涓変簹鍑ゅ嚢宀�", "涓変簹"}); + add(new String[]{"涓変簹鐖辩惔娴峰哺", "涓変簹"}); + add(new String[]{"涓変簹婀捐摑鑹叉捣宀�", "涓変簹"}); + add(new String[]{"涓変簹婀剧ⅶ娴疯摑澶�", "涓変簹"}); + add(new String[]{"涓変簹娴锋ゼ浜戞湀", "涓変簹"}); + }}); + city_DistrictNames.put("瀹夊窘", new ArrayList(){{ + add(new String[]{"瀹夊窘甯堣寖澶у鏁欏笀鍏瘬", "鑺滄箹"}); + add(new String[]{"瀹夊窘鐢佃鍙板鑸�", "鍚堣偉"}); + add(new String[]{"瀹夊窘鏃ユ姤绀惧鑸�", "鍚堣偉"}); + add(new String[]{"瀹夊窘澶у帵", "鐝犳捣"}); + add(new String[]{"瀹夊窘鏉傛妧鍥㈠鑸�", "鍚堣偉"}); + add(new String[]{"瀹夊窘璀﹀畼鑱屼笟瀛﹂櫌瀹胯垗", "鍚堣偉"}); + add(new String[]{"瀹夊窘绋庡姟瀛︽牎瀹胯垗", "鍚堣偉"}); + add(new String[]{"瀹夊窘姹介厤鍩�", "鍚堣偉"}); + add(new String[]{"瀹夊窘鍥藉己閽㈡潗浜ゆ槗涓績", "鍚堣偉"}); + add(new String[]{"瀹夊窘鍥介檯璐墿骞垮満", "鍚堣偉"}); + add(new String[]{"瀹夊窘澶у競鍦�", "鍚堣偉"}); + }}); + city_DistrictNames.put("鍚堣偉", new ArrayList(){{ + add(new String[]{"鍚堣偉鏅氭姤绀惧鑸�", "鍚堣偉"}); + add(new String[]{"鍚堣偉閾濆巶瀹胯垗", "鍚堣偉"}); + add(new String[]{"鍚堣偉瀛﹂櫌鏁欏笀瀹胯垗妤�", "鍚堣偉"}); + add(new String[]{"鍚堣偉閿佸巶瀹胯垗", "鍚堣偉"}); + add(new String[]{"鍚堣偉涓囪揪骞垮満", "鍚堣偉"}); + add(new String[]{"鍚堣偉鎭掑ぇ鍩�", "鍚堣偉"}); + add(new String[]{"鍚堣偉鍚堜綔缁忔祹骞垮満", "鍚堣偉"}); + add(new String[]{"鍚堣偉鎭掗�氶鍝佹壒鍙戝競鍦�", "鍚堣偉"}); + }}); + city_DistrictNames.put("姹熻嫃", new ArrayList(){{ + add(new String[]{"姹熻嫃鐪佸啘绉戦櫌", "鍗椾含"}); + add(new String[]{"姹熻嫃娌圭敯鐭虫补灞卞簞", "鎵窞"}); + add(new String[]{"姹熻嫃璀﹀畼瀛﹂櫌", "鍗椾含"}); + add(new String[]{"姹熻嫃鐪侀珮绾т笓瀹跺洯", "鍗椾含"}); + add(new String[]{"姹熻嫃娌圭敯鐭虫补灞卞簞", "鎵窞"}); + add(new String[]{"姹熻嫃璁簨鍥�", "鍗椾含"}); + add(new String[]{"姹熻嫃鍥介檯濉戝寲鍩�", "甯稿窞"}); + add(new String[]{"姹熻嫃涓囧拰鍥介檯鍟嗚锤鍩�", "甯稿窞"}); + }}); + city_DistrictNames.put("鐩愬煄", new ArrayList(){{ + add(new String[]{"鐩愬煄澶фˉ涓�", "鐩愬煄"}); + add(new String[]{"鐩愬煄甯傛湀婀栬姳鍩�", "鐩愬煄"}); + }}); + city_DistrictNames.put("骞胯タ澹棌", new ArrayList(){{ + add(new String[]{"骞胯タ澹棌鑷不鍖哄徃娉曞巺瀹胯垗", "鍗楀畞"}); + add(new String[]{"骞胯タ澹棌鑷不鍖哄啘涓氬巺瀹胯垗", "鍗楀畞"}); + }}); + city_DistrictNames.put("鍖楁捣", new ArrayList(){{ + add(new String[]{"鍖楁捣搴勫洯", "閭兏"}); + add(new String[]{"鍖楁捣宀�88鍙�", "娴峰彛"}); + add(new String[]{"鍖楁捣鏂板煄", "鐑熷彴"}); + add(new String[]{"鍖楁捣閾舵哗涔嬪瀹㈡爤", "鍗楀畞"}); + add(new String[]{"鍖楁捣鏂板眳", "闀挎槬"}); + add(new String[]{"鍖楁捣鍒嗗眬瀹跺睘闄�", "闈掑矝"}); + add(new String[]{"鍖楁捣鏂板煄", "濞佹捣"}); + add(new String[]{"鍖楁捣鍥涘悎闄�", "鍖椾含"}); + add(new String[]{"鍖楁捣鍏瘬", "娼嶅潑"}); + add(new String[]{"鍖楁捣瀹胯垗灏忓尯", "娼嶅潑"}); + add(new String[]{"鍖楁捣鍑棆鍥介檯鍟嗕綇澶у帵", "鍖楁捣"}); + add(new String[]{"鍖楁捣鑺卞洯", "鍖楁捣"}); + add(new String[]{"鍖楁捣绀惧尯", "娌堥槼"}); + add(new String[]{"鍖楁捣鍢夊洯", "娌堥槼"}); + add(new String[]{"鍖楁捣鍗庣編璐㈠瘜骞垮満", "鍖楁捣"}); + add(new String[]{"鍖楁捣浣宠嫅", "闈掑矝"}); + add(new String[]{"鍖楁捣鑳滃埄鍏ぞ鍒", "澶ц繛"}); + add(new String[]{"鍖楁捣鑺卞洯", "闈掑矝"}); + add(new String[]{"鍖楁捣鑳滃埄鍏ぞ", "澶ц繛"}); + add(new String[]{"鍖楁捣鏄庣彔", "娼嶅潑"}); + add(new String[]{"鍖楁捣鑺卞洯", "鍝堝皵婊�"}); + add(new String[]{"鍖楁捣閲�", "澶╂触"}); + add(new String[]{"鍖楁捣鑺卞洯", "娼嶅潑"}); + add(new String[]{"鍖楁捣鑻�", "缁嶅叴"}); + add(new String[]{"鍖楁捣鑺卞洯", "缁嶅叴"}); + add(new String[]{"鍖楁捣澶у帵鍏瘬", "涓婃捣"}); + add(new String[]{"鍖楁捣鏂拌嫅", "涓婃捣"}); + add(new String[]{"鍖楁捣宀镐竴鍝侀榿", "闈掑矝"}); + add(new String[]{"鍖楁捣鑻�", "闈掑矝"}); + add(new String[]{"鍖楁捣鑺卞洯", "鐩愬煄"}); + add(new String[]{"鍖楁捣鍥涙湡", "鐩愬煄"}); + }}); + city_DistrictNames.put("姹熻嫃", new ArrayList(){{ + add(new String[]{"姹熻嫃鐪佸啘绉戦櫌", "鍗椾含"}); + add(new String[]{"姹熻嫃娌圭敯鐭虫补灞卞簞", "鎵窞"}); + add(new String[]{"姹熻嫃璀﹀畼瀛﹂櫌", "鍗椾含"}); + add(new String[]{"姹熻嫃鐪侀珮绾т笓瀹跺洯", "鍗椾含"}); + add(new String[]{"姹熻嫃娌圭敯鐭虫补灞卞簞", "鎵窞"}); + add(new String[]{"姹熻嫃璁簨鍥�", "鍗椾含"}); + add(new String[]{"姹熻嫃鍥介檯濉戝寲鍩�", "甯稿窞"}); + add(new String[]{"姹熻嫃涓囧拰鍥介檯鍟嗚锤鍩�", "甯稿窞"}); + }}); + city_DistrictNames.put("鑻忓窞", new ArrayList(){{ + add(new String[]{"鑻忓窞鍖楀贩", "澶ц繛"}); + add(new String[]{"鑻忓窞閲�", "澶╂触"}); + add(new String[]{"鑻忓窞鑺卞洯涓�鏈�", "涔岄瞾鏈ㄩ綈"}); + add(new String[]{"鑻忓窞鑺卞洯浜屾湡", "涔岄瞾鏈ㄩ綈"}); + add(new String[]{"鑻忓窞鑺卞洯", "瀹胯縼"}); + add(new String[]{"鑻忓窞灏忓尯", "鍖椾含"}); + add(new String[]{"鑻忓窞鍏瘬", "鍖椾含"}); + add(new String[]{"鑻忓窞骞昏薄", "娴庡崡"}); + add(new String[]{"鑻忓窞鍑ゅ嚢鏂囧寲骞垮満", "鑻忓窞"}); + add(new String[]{"鑻忓窞鍥介檯杞荤汉鍩�", "鑻忓窞"}); + add(new String[]{"鑻忓窞涓栬寕杩愭渤鍩�", "鑻忓窞"}); + add(new String[]{"鑻忓窞甯傛钵娴鎶�鍒涗笟鍥�", "鑻忓窞"}); + add(new String[]{"鑻忓窞楂樻柊鍖轰汉鍔涜祫婧愬ぇ鍘�", "鑻忓窞"}); + add(new String[]{"鑻忓窞鏂颁笢鏂规苯閰嶅煄", "鑻忓窞"}); + add(new String[]{"鑻忓窞绀煎搧鍟嗗搧鍩�", "鑻忓窞"}); + add(new String[]{"鑻忓窞娌挎捣鍥介檯涓績", "鑻忓窞"}); + add(new String[]{"鑻忓窞鏈虹數浜旈噾鍩�", "鑻忓窞"}); + add(new String[]{"鑻忓窞甯傛钵娴鎶�鍒涗笟鍥笢鍖�", "鑻忓窞"}); + add(new String[]{"鑻忓窞涓栬寕骞垮満鍏瘬", "鑻忓窞"}); + }}); + city_DistrictNames.put("甯哥啛", new ArrayList(){{ + add(new String[]{"甯哥啛鍖楅噷", "澶╂触"}); + add(new String[]{"甯哥啛鍗楅噷", "澶╂触"}); + add(new String[]{"甯哥啛涓叧鏉戠鎶�鍩�", "甯哥啛"}); + add(new String[]{"甯哥啛鑺卞洯", "甯哥啛"}); + add(new String[]{"甯哥啛婊ㄦ睙鑺卞洯", "甯哥啛"}); + }}); + city_DistrictNames.put("鍥涘窛", new ArrayList(){{ + add(new String[]{"鍥涘窛鐪佺洿鏈哄叧宸ュ瀹胯垗", "鎴愰兘"}); + add(new String[]{"鍥涘窛鐪佹灄涓氬巺瀹胯垗", "鎴愰兘"}); + add(new String[]{"鍥涘窛闊充箰瀛﹂櫌瀹胯垗", "鎴愰兘"}); + add(new String[]{"鍥涘窛鐪侀椊涓競椹荤枂鍔炰簨澶勫皬鍖�", "涔岄瞾鏈ㄩ綈"}); + add(new String[]{"鍥涘窛澶у帵", "鍘﹂棬"}); + add(new String[]{"鍥涘窛鐪佺鎶�鍘呭鑸�", "鎴愰兘"}); + add(new String[]{"鍥涘窛涓撶敤姹借溅鍘傚鑸�", "鎴愰兘"}); + add(new String[]{"鍥涘窛鏃ユ姤瀹胯垗", "鎴愰兘"}); + add(new String[]{"鍥涘窛鑹烘湳鑱屼笟瀛﹂櫌瀹跺睘妤�", "鎴愰兘"}); + add(new String[]{"鍥涘窛钀ヨ儭鍚�", "鍖椾含"}); + add(new String[]{"鍥涘窛灏忓尯", "涓婃捣"}); + add(new String[]{"鍥涘窛骞煎笀瀹胯垗", "鎴愰兘"}); + add(new String[]{"鍥涘窛澶у鍐滄灄鏉�", "鎴愰兘"}); + }}); + city_DistrictNames.put("瀹滃", new ArrayList(){{ + add(new String[]{"瀹滃鍖楅噷", "澶╂触"}); + add(new String[]{"瀹滃涓滈噷", "澶╂触"}); + add(new String[]{"瀹滃瑗块噷", "澶╂触"}); + add(new String[]{"瀹滃妤�", "澶╂触"}); + add(new String[]{"瀹滃瀛﹂櫌A鍖�", "瀹滃"}); + }}); + city_DistrictNames.put("浜戝崡", new ArrayList(){{ + add(new String[]{"浜戝崡澶у帵", "骞垮窞"}); + add(new String[]{"浜戝崡鐪佹潅鎶�鍥㈠灞為櫌", "鏄嗘槑"}); + add(new String[]{"浜戝崡鍗庝鲸鍩�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鑹烘湳瀹跺洯鍖�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鍐滀笟澶у鏁欏伐浣忓畢鍖�", "鏄嗘槑"}); + add(new String[]{"浜戝崡璐㈢粡澶у浣忓畢", "鏄嗘槑"}); + add(new String[]{"浜戝崡澶у榫欐硥璺皬鍖�", "鏄嗘槑"}); + add(new String[]{"浜戝崡宸ヤ笟鑱屼笟鎶�鏈闄�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鍗拌薄鍩�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鏄犺薄", "鏄嗘槑"}); + add(new String[]{"浜戝崡鐪佺暅鐗у眬瀹胯垗", "鏄嗘槑"}); + add(new String[]{"浜戝崡鐪佸缓绛戞潗鏂欏鐮旂┒璁捐闄�", "鏄嗘槑"}); + add(new String[]{"浜戝崡娴嬬粯宸ョ▼闄�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鐪佺涓�杞诲伐鏈烘鍘�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鏃ユ姤绀惧崟浣嶆埧", "鏄嗘槑"}); + add(new String[]{"浜戝崡鐧借嵂鍘傚崟浣嶇鍒╂埧", "鏄嗘槑"}); + add(new String[]{"浜戝崡澶у涓滀簩闄�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鐪佸鍏氭牎鐢熸椿鍖�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鍗拌薄鍩庡埆澧�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鐧借嵂绂忓埄鎴�", "鏄嗘槑"}); + }}); + city_DistrictNames.put("涓芥睙", new ArrayList(){{ + add(new String[]{"涓芥睙鑺卞洯", "骞垮窞"}); + add(new String[]{"涓芥睙鑺卞洯宸﹀哺", "骞垮窞"}); + add(new String[]{"涓芥睙鑺卞洯鐜夋爲鍒櫌", "骞垮窞"}); + add(new String[]{"涓芥睙鑺卞洯涓藉瓧妤�", "骞垮窞"}); + add(new String[]{"涓芥睙鑺卞洯涔濆閫氭触", "骞垮窞"}); + add(new String[]{"涓芥睙鑺卞洯涓藉矝缈犲牑", "骞垮窞"}); + add(new String[]{"涓芥睙钃濇咕", "闀挎槬"}); + add(new String[]{"涓芥睙鑺卞洯", "闀挎槬"}); + add(new String[]{"涓芥睙鑼楀洯", "甯稿窞"}); + add(new String[]{"涓芥睙鍖�", "鍗楀畞"}); + add(new String[]{"涓芥睙鑺卞洯涓借崈妤�", "骞垮窞"}); + add(new String[]{"涓芥睙鑺卞洯涓芥尝妤�", "骞垮窞"}); + add(new String[]{"涓芥睙鏂伴兘", "瀹佹尝"}); + add(new String[]{"涓芥睙鑺卞洯", "涓北"}); + add(new String[]{"涓芥睙鍚嶅涵", "瀹佹尝"}); + add(new String[]{"涓芥睙鍏瘬", "涓変簹"}); + add(new String[]{"涓芥睙鑺卞洯", "娓╁窞"}); + add(new String[]{"涓芥睙缈犲洯", "闀挎矙"}); + add(new String[]{"涓芥睙姘磋姳鍥�", "閮戝窞"}); + add(new String[]{"涓芥睙搴﹀亣鍏瘬", "涓変簹"}); + add(new String[]{"涓芥睙鏂版潙", "骞垮窞"}); + add(new String[]{"涓芥睙鑺卞洯鐜嬪彴鍒", "骞垮窞"}); + add(new String[]{"涓芥睙鑺卞洯搴峰煄灞�", "骞垮窞"}); + add(new String[]{"涓芥睙鑺卞洯钀冮敠鑻�", "骞垮窞"}); + add(new String[]{"涓芥睙鑺卞洯鏄熸捣娲�", "骞垮窞"}); + add(new String[]{"涓芥睙鑺卞洯寰峰瓧妤�", "骞垮窞"}); + add(new String[]{"涓芥睙鑺卞洯妫曟婊�", "骞垮窞"}); + add(new String[]{"涓芥睙鑺卞洯鍗庢灄灞�", "骞垮窞"}); + add(new String[]{"涓芥睙鍗婂矝鑺卞洯", "鐭冲搴�"}); + add(new String[]{"涓芥睙鏂板眳", "姝︽眽"}); + add(new String[]{"涓芥睙鑻�", "姝︽眽"}); + add(new String[]{"涓芥睙璞涵", "璧e窞"}); + add(new String[]{"涓芥睙鍏", "璧e窞"}); + add(new String[]{"涓芥睙璞涵", "浣涘北"}); + add(new String[]{"涓芥睙鏉�", "鍗楀畞"}); + add(new String[]{"涓芥睙鑺辫嫅", "娓╁窞"}); + add(new String[]{"涓芥睙鑺卞洯4鏈熶附鍥洓鏅�", "涓北"}); + add(new String[]{"涓芥睙鑺卞洯", "鍗楀畞"}); + add(new String[]{"涓芥睙鑺卞洯钀冮敠鑻戝埆澧�", "骞垮窞"}); + add(new String[]{"涓芥睙鑺卞洯浜屾湡", "涓北"}); + add(new String[]{"涓芥睙鑺卞洯涓�鏈�", "涓北"}); + add(new String[]{"涓芥睙鑺卞洯鍥涙湡", "涓北"}); + add(new String[]{"涓芥睙涓�鏈�", "涓北"}); + add(new String[]{"涓芥睙鑺卞洯", "鎯犲窞"}); + add(new String[]{"涓芥睙鑺卞洯涓藉溅妤�", "骞垮窞"}); + add(new String[]{"涓芥睙鑺卞洯涓借尩妤�", "骞垮窞"}); + add(new String[]{"涓芥睙鑺卞洯涓藉奖妤�", "骞垮窞"}); + add(new String[]{"涓芥睙缈犲洯灞辨按閮�", "闀挎矙"}); + add(new String[]{"涓芥睙閿﹀涵", "涓婃捣"}); + add(new String[]{"涓芥睙鏉戝皬鍖�", "鍗楀畞"}); + add(new String[]{"涓芥睙鑻�", "涓婃捣"}); + add(new String[]{"涓芥睙浣宠嫅", "涓婃捣"}); + add(new String[]{"涓芥睙璞涵", "椤哄痉"}); + add(new String[]{"涓芥睙鑻�", "鑲囧簡"}); + add(new String[]{"涓芥睙鍚嶅涵", "濂夊寲"}); + add(new String[]{"涓芥睙灏忓尯", "閲嶅簡"}); + add(new String[]{"涓芥睙澶╀笅", "涓芥睙"}); + add(new String[]{"涓芥睙涓囬殕鑺卞洯", "涓芥睙"}); + add(new String[]{"涓芥睙鍙ゅ煄鐙瓙灞�", "涓芥睙"}); + add(new String[]{"涓芥睙鍖楅棬鍧�", "涓芥睙"}); + add(new String[]{"涓芥睙鍙ゅ煄", "涓芥睙"}); + add(new String[]{"涓芥睙鍋囨棩", "涓芥睙"}); + add(new String[]{"涓芥睙浜哄3鏈�", "涓芥睙"}); + add(new String[]{"涓芥睙浜哄绗笁鏈�", "涓芥睙"}); + add(new String[]{"涓芥睙浜哄鏂囩瑪鍥�", "涓芥睙"}); + add(new String[]{"涓芥睙姘戝眳", "涓芥睙"}); + add(new String[]{"涓芥睙浜哄鏂囩瑪鑻�", "涓芥睙"}); + add(new String[]{"涓芥睙浜哄鐗囧尯鐜夐緳鍥�", "涓芥睙"}); + add(new String[]{"涓芥睙鍙ゅ煄楂樺皵澶埆澧�", "涓芥睙"}); + add(new String[]{"涓芥睙1鍙峰埆澧�", "涓芥睙"}); + add(new String[]{"涓芥睙浜哄", "涓芥睙"}); + add(new String[]{"涓芥睙鏄犲儚", "涓芥睙"}); + add(new String[]{"涓芥睙浜哄涓夋湡", "涓芥睙"}); + add(new String[]{"涓芥睙浜哄鏂囨辰鍥�", "涓芥睙"}); + add(new String[]{"涓芥睙鍗拌薄", "涓芥睙"}); + add(new String[]{"涓芥睙1鍙�", "涓芥睙"}); + add(new String[]{"涓芥睙瀹跺洯", "涓芥睙"}); + add(new String[]{"涓芥睙鍚嶅眳", "涓芥睙"}); + add(new String[]{"涓芥睙涓�鍙�", "涓芥睙"}); + add(new String[]{"涓芥睙浜哄鐜夐緳鍥�", "涓芥睙"}); + add(new String[]{"涓芥睙鑺卞洯", "鐜夋灄"}); + add(new String[]{"涓芥睙鍩�", "娌虫簮"}); + add(new String[]{"涓芥睙璞涵", "娌虫簮"}); + add(new String[]{"涓芥睙闆呰嫅", "闃虫睙"}); + add(new String[]{"涓芥睙闃冲ぉ涓�", "涓芥睙"}); + add(new String[]{"涓芥睙浜哄鐧界帀鍥�", "涓芥睙"}); + add(new String[]{"涓芥睙鑻�", "鍏洏姘�"}); + add(new String[]{"涓芥睙楸肩背娌�", "涓芥睙"}); + add(new String[]{"涓芥睙鍙ゅ煄姘戝眳", "涓芥睙"}); + }}); + city_DistrictNames.put("榛戦緳姹�", new ArrayList(){{ + }}); + city_DistrictNames.put("鍝堝皵婊�", new ArrayList(){{ + add(new String[]{"鍝堝皵婊ㄦ槦鍏夎��骞垮満", "鍝堝皵婊�"}); + }}); + city_DistrictNames.put("杈藉畞", new ArrayList(){{ + add(new String[]{"杈藉畞涓尰瀹跺睘妤�", "娌堥槼"}); + add(new String[]{"杈藉畞閲�", "澶╂触"}); + }}); + city_DistrictNames.put("鐩橀敠", new ArrayList(){{ + add(new String[]{"鐩橀敠鑺卞洯", "鍗椾含"}); + add(new String[]{"鐩橀敠鍗庡簻", "鍗椾含"}); + add(new String[]{"鐩橀敠婕涓捣", "鐩橀敠"}); + add(new String[]{"鐩橀敠棣ㄦ偊灏忓尯", "鐩橀敠"}); + }}); + city_DistrictNames.put("娴欐睙", new ArrayList(){{ + add(new String[]{"娴欐睙宸ヤ笟澶у鏁欏笀瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙澶у帵", "澶師"}); + add(new String[]{"娴欐睙鍔炰簨澶勫鑸�", "澶師"}); + add(new String[]{"娴欐睙浠佸拰灞呰�佸勾鍏荤敓鍏瘬", "婀栧窞"}); + add(new String[]{"娴欐睙浜よ繍澶у帵", "鏉窞"}); + add(new String[]{"娴欐睙宸ュ晢澶у瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙鍟嗚锤鍩�", "鍚堣偉"}); + add(new String[]{"娴欐睙宸ヤ笟澶у涔嬫睙瀛﹂櫌", "鏉窞"}); + }}); + city_DistrictNames.put("娓╁窞", new ArrayList(){{ + add(new String[]{"娓╁窞澶у帵", "娴峰彛"}); + add(new String[]{"娓╁窞鍩�", "璐甸槼"}); + add(new String[]{"娓╁窞鍏瘬", "璐甸槼"}); + add(new String[]{"娓╁窞鍟嗗煄", "婀栧窞"}); + add(new String[]{"娓╁窞鍟嗗煄", "鍞愬北"}); + add(new String[]{"娓╁窞涓栬锤涓績澶у帵", "娓╁窞"}); + add(new String[]{"娓╁窞涓栬锤涓績骞垮満", "娓╁窞"}); + add(new String[]{"娓╁窞浜烘墠澶у帵", "娓╁窞"}); + add(new String[]{"娓╁窞榫欐咕涓囪揪骞垮満", "娓╁窞"}); + add(new String[]{"娓╁窞鍩幝烽兘涔愭眹", "娌堥槼"}); + add(new String[]{"娓╁窞鍟嗗煄", "閲戝崕"}); + }}); + city_DistrictNames.put("鐟炲畨", new ArrayList(){{ + add(new String[]{"鐟炲畨鍒涢��", "骞垮窞"}); + add(new String[]{"鐟炲畨鑺卞洯", "浣涘北"}); + add(new String[]{"鐟炲畨鑺卞洯", "骞垮窞"}); + add(new String[]{"鐟炲畨閲嶅簡澶╁湴", "閲嶅簡"}); + add(new String[]{"鐟炲畨灏忓尯", "閲嶅簡"}); + add(new String[]{"鐟炲畨鑺卞洯", "涓北"}); + add(new String[]{"鐟炲畨鍚嶉偢", "鍗楅��"}); + add(new String[]{"鐟炲畨澶у帵", "娓╁窞"}); + add(new String[]{"鐟炲畨鑻�", "鎴愰兘"}); + add(new String[]{"鐟炲畨瀹跺洯", "澶ц繛"}); + add(new String[]{"鐟炲畨澶у帵", "闀挎矙"}); + add(new String[]{"鐟炲畨路鍚涙眹", "鍖椾含"}); + add(new String[]{"鐟炲畨闆呮櫙鑻�", "鐟炲畨"}); + add(new String[]{"鐟炲畨澶у帵", "鐟炲畨"}); + add(new String[]{"鐟炲畨瀹忕憺澶у帵", "鐟炲畨"}); + add(new String[]{"鐟炲畨甯傚叴闅嗗鍥�", "鐟炲畨"}); + add(new String[]{"鐟炲畨鑺卞洯", "琛¢槼"}); + add(new String[]{"鐟炲畨妤�", "娌虫簮"}); + add(new String[]{"鐟炲畨鏃朵唬澶у帵", "娓╁窞"}); + add(new String[]{"鐟炲畨闆呮櫙鑻�", "娓╁窞"}); + add(new String[]{"鐟炲畨鏂颁笘绾ぇ鍘�", "娓╁窞"}); + }}); + city_DistrictNames.put("娌冲寳", new ArrayList(){{ + add(new String[]{"娌冲寳绋庡姟瀛︽牎鐢熸椿鍖�", "鐭冲搴�"}); + add(new String[]{"娌冲寳缁忔祹鏃ユ姤绀惧鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳缇庢湳鍑虹増绀惧鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳鐗╄祫瀹胯垗", "鐭冲搴�"}); + add(new String[]{"娌冲寳鍖栧伐鍖昏嵂鑱屼笟鎶�鏈闄㈠鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳鐢垫満瀹胯垗", "鐭冲搴�"}); + add(new String[]{"娌冲寳鏃ユ姤绀惧鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳宸ョ▼閫犱环绠$悊鎬荤珯瀹胯垗", "鐭冲搴�"}); + add(new String[]{"娌冲寳搴峰煄", "娼嶅潑"}); + add(new String[]{"娌冲寳绀惧尯", "娌堥槼"}); + add(new String[]{"娌冲寳鍖荤澶у瀹胯垗", "鐭冲搴�"}); + add(new String[]{"娌冲寳鐪佷汉澶у鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳鏂颁汉瀹�", "鍞愬北"}); + add(new String[]{"娌冲寳涓�鍙�", "鍞愬北"}); + add(new String[]{"娌冲寳鏈鸿灞�瀹胯垗", "鐭冲搴�"}); + add(new String[]{"娌冲寳骞挎挱鐢佃鎶ュ鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳鍟嗗煄", "闈掑矝"}); + add(new String[]{"娌冲寳闀垮煄楗簵", "鐭冲搴�"}); + add(new String[]{"娌冲寳鏉戝皬鍖�", "鍖椾含"}); + add(new String[]{"娌冲寳妗冩睙閲�", "澶╂触"}); + add(new String[]{"娌冲寳甯堝ぇ闈掑勾鍏瘬妤�", "鐭冲搴�"}); + add(new String[]{"娌冲寳缁�", "鏃犻敗"}); + add(new String[]{"娌冲寳绀惧尯", "鏈邯"}); + add(new String[]{"娌冲寳妤�", "鍞愬北"}); + }}); + city_DistrictNames.put("寤婂潑", new ArrayList(){{ + add(new String[]{"寤婂潑涓囪揪骞垮満", "寤婂潑"}); + }}); + city_DistrictNames.put("鍥涘窛", new ArrayList(){{ + add(new String[]{"鍥涘窛鐪佺洿鏈哄叧宸ュ瀹胯垗", "鎴愰兘"}); + add(new String[]{"鍥涘窛鐪佹灄涓氬巺瀹胯垗", "鎴愰兘"}); + add(new String[]{"鍥涘窛闊充箰瀛﹂櫌瀹胯垗", "鎴愰兘"}); + add(new String[]{"鍥涘窛鐪侀椊涓競椹荤枂鍔炰簨澶勫皬鍖�", "涔岄瞾鏈ㄩ綈"}); + add(new String[]{"鍥涘窛澶у帵", "鍘﹂棬"}); + add(new String[]{"鍥涘窛鐪佺鎶�鍘呭鑸�", "鎴愰兘"}); + add(new String[]{"鍥涘窛涓撶敤姹借溅鍘傚鑸�", "鎴愰兘"}); + add(new String[]{"鍥涘窛鏃ユ姤瀹胯垗", "鎴愰兘"}); + add(new String[]{"鍥涘窛鑹烘湳鑱屼笟瀛﹂櫌瀹跺睘妤�", "鎴愰兘"}); + add(new String[]{"鍥涘窛钀ヨ儭鍚�", "鍖椾含"}); + add(new String[]{"鍥涘窛灏忓尯", "涓婃捣"}); + add(new String[]{"鍥涘窛骞煎笀瀹胯垗", "鎴愰兘"}); + add(new String[]{"鍥涘窛澶у鍐滄灄鏉�", "鎴愰兘"}); + }}); + city_DistrictNames.put("鎴愰兘", new ArrayList(){{ + add(new String[]{"鎴愰兘鍥介檯鍏瘬", "鎴愰兘"}); + add(new String[]{"鎴愰兘楂橀�熷ぇ鍘�", "鎴愰兘"}); + add(new String[]{"鎴愰兘琛�娑蹭腑蹇冨皬鍖�", "鎴愰兘"}); + add(new String[]{"鎴愰兘鑺卞洯鍒", "鎴愰兘"}); + add(new String[]{"鎴愰兘鑺卞洯", "鎴愰兘"}); + add(new String[]{"鎴愰兘姘戣埅瀹胯垗", "鎴愰兘"}); + add(new String[]{"鎴愰兘鍗风儫鍘傚鑸�", "鎴愰兘"}); + add(new String[]{"鎴愰兘鍗庝鲸鍩庣函姘村哺", "鎴愰兘"}); + add(new String[]{"鎴愰兘鑺卞洯", "涓変簹"}); + add(new String[]{"鎴愰兘鏂板ぉ鍦�", "鎴愰兘"}); + add(new String[]{"鎴愰兘ICC", "鎴愰兘"}); + add(new String[]{"鎴愰兘闆呭眳涔愯姳鍥�", "鎴愰兘"}); + add(new String[]{"鎴愰兘鍗庝鲸鍩庝笢宀�", "鎴愰兘"}); + add(new String[]{"鎴愰兘鍚庤姳鍥簩鏈�", "鎴愰兘"}); + add(new String[]{"鎴愰兘缁垮湴涓績468鍏", "鎴愰兘"}); + add(new String[]{"鎴愰兘鑺卞洯涓婂煄", "鎴愰兘"}); + add(new String[]{"鎴愰兘妫灄", "鎴愰兘"}); + add(new String[]{"鎴愰兘鍚庤姳鍥�", "鎴愰兘"}); + add(new String[]{"鎴愰兘閲戠墰涓囪揪骞垮満", "鎴愰兘"}); + add(new String[]{"鎴愰兘鐢靛姏灞�瀹胯垗", "鎴愰兘"}); + add(new String[]{"鎴愰兘鐜夊洯", "鎴愰兘"}); + add(new String[]{"鎴愰兘鍥藉ゥ鏉�", "鎴愰兘"}); + add(new String[]{"鎴愰兘鑺卞洯缈犻泹鍗庡涵", "鎴愰兘"}); + add(new String[]{"鎴愰兘鏃╂櫒", "鎴愰兘"}); + add(new String[]{"鎴愰兘鍚堥櫌", "鎴愰兘"}); + add(new String[]{"鎴愰兘鍚庤姳鍥浗瀹剧孩钁�", "鎴愰兘"}); + add(new String[]{"鎴愰兘鍚堥櫌涔嬪闄㈠9鍝�", "鎴愰兘"}); + add(new String[]{"鎴愰兘鍚庤姳鍥簩鏈熷埆澧�", "鎴愰兘"}); + add(new String[]{"鎴愰兘妫曟娉夊浗闄呬腑蹇�", "鎴愰兘"}); + add(new String[]{"鎴愰兘澶ч瓟鏂�", "鎴愰兘"}); + add(new String[]{"鎴愰兘A鍖�", "鎴愰兘"}); + add(new String[]{"鎴愰兘澶у鏁欏笀鍏瘬", "鎴愰兘"}); + }}); + city_DistrictNames.put("姹熻嫃", new ArrayList(){{ + add(new String[]{"姹熻嫃鐪佸啘绉戦櫌", "鍗椾含"}); + add(new String[]{"姹熻嫃娌圭敯鐭虫补灞卞簞", "鎵窞"}); + add(new String[]{"姹熻嫃璀﹀畼瀛﹂櫌", "鍗椾含"}); + add(new String[]{"姹熻嫃鐪侀珮绾т笓瀹跺洯", "鍗椾含"}); + add(new String[]{"姹熻嫃娌圭敯鐭虫补灞卞簞", "鎵窞"}); + add(new String[]{"姹熻嫃璁簨鍥�", "鍗椾含"}); + add(new String[]{"姹熻嫃鍥介檯濉戝寲鍩�", "甯稿窞"}); + add(new String[]{"姹熻嫃涓囧拰鍥介檯鍟嗚锤鍩�", "甯稿窞"}); + }}); + city_DistrictNames.put("娉板窞", new ArrayList(){{ + add(new String[]{"娉板窞纰ф鍥�", "娉板窞"}); + add(new String[]{"娉板窞鍗庝鲸鍩庣函姘村哺", "娉板窞"}); + add(new String[]{"娉板窞缇庡ソ瀹跺洯", "娉板窞"}); + }}); + city_DistrictNames.put("灞辫タ", new ArrayList(){{ + add(new String[]{"灞辫タ鏁欒偛鍑虹増灞�瀹胯垗", "澶師"}); + add(new String[]{"灞辫タ鏀垮簻瀹跺睘闄�", "澶╂触"}); + add(new String[]{"灞辫タ鐪佺數鍔涘牚娴嬭璁¢櫌瀹胯垗", "澶師"}); + add(new String[]{"灞辫タ鐓ょ偔鑱屽伐鍩硅涓績瀹胯垗", "澶師"}); + add(new String[]{"灞辫タ鍖荤澶у瀹跺睘妤�", "澶師"}); + add(new String[]{"灞辫タ鐢靛姏鏉忚姳宀皬鍖�", "澶師"}); + add(new String[]{"灞辫タ鎶ョぞ瀹胯垗妤�", "澶師"}); + add(new String[]{"灞辫タ鐪佸尰鑽叕鍙镐綇瀹呭皬鍖�", "澶師"}); + add(new String[]{"灞辫タ鐪佹枃鐗╁眬瀹胯垗", "澶師"}); + add(new String[]{"灞辫タ姹借繍闆嗗洟涓滃矖璺鑸�", "澶師"}); + add(new String[]{"灞辫タ鐪佸湴璐ㄧ鐮旀墍鍦扮熆灏忓尯", "澶師"}); + add(new String[]{"灞辫タ鐪佷緵閿�瀛︽牎瀹胯垗", "澶師"}); + add(new String[]{"灞辫タ鐪佹本娌虫按搴撶鐞嗗眬瀹胯垗", "澶師"}); + add(new String[]{"灞辫タ骞挎挱鐢佃澶у瀹胯垗", "澶師"}); + add(new String[]{"灞辫タ鐪佷綋鑲插眬瀹胯垗", "澶師"}); + add(new String[]{"灞辫タ鐪佹按浜х瀛︾爺绌堕櫌瀹胯垗", "澶師"}); + add(new String[]{"灞辫タ绀句細涓讳箟瀛﹂櫌瀹胯垗", "澶師"}); + add(new String[]{"灞辫タ鐪佺粡娴庝俊鎭腑蹇冨鑸�", "澶師"}); + add(new String[]{"灞辫タ鐪佹皵璞″彴瀹胯垗", "澶師"}); + add(new String[]{"灞辫タ鐪佺數鍔涘叕鍙稿鑸�", "澶師"}); + add(new String[]{"灞辫タ鐪佸啘鏈哄眬瀹胯垗", "澶師"}); + add(new String[]{"灞辫タ鐪佹満鐢佃璁$爺绌堕櫌瀹胯垗", "澶師"}); + add(new String[]{"灞辫タ鍖荤澶у瀹跺睘妤煎寳闄�", "澶師"}); + add(new String[]{"灞辫タ鐪佹瓕鑸炲墽闄㈠鑸�", "澶師"}); + add(new String[]{"灞辫タ鐪佽交宸ュ鑸�", "澶師"}); + add(new String[]{"灞辫タ鐓ょ偔鑱屼笟鎶�鏈闄㈠鑸�", "澶師"}); + add(new String[]{"灞辫タ鐪佷氦閫氱洃鐞嗗叕鍙稿鑸�", "澶師"}); + add(new String[]{"灞辫タ浜ら�氳亴涓氭妧鏈闄㈠灞炴ゼ", "澶師"}); + add(new String[]{"灞辫タ澶у瀹胯垗", "澶師"}); + add(new String[]{"灞辫タ鐪佽交宸ュ缓璁惧叕鍙稿鑸�", "澶師"}); + add(new String[]{"灞辫タ鐪侀�佸彉鐢靛鑸�", "澶師"}); + add(new String[]{"灞辫タ鐪佸缓绛戠瀛︾爺绌堕櫌鍏埧", "澶師"}); + add(new String[]{"灞辫タ鐪佺墿璧勭鐞嗗偍澶囧眬骞跺窞鍖楄矾瀹跺睘闄㈠皬鍖�", "澶師"}); + add(new String[]{"灞辫タ鐪佺洂涓氬偍杩愬叕鍙稿鑸�", "澶師"}); + add(new String[]{"灞辫タ鐪佸湴闇囧眬瀹胯垗", "澶師"}); + add(new String[]{"灞辫タ鐪佸睍瑙堥瀹胯垗", "澶師"}); + add(new String[]{"灞辫タ鏃犵嚎鐢靛巶瀹胯垗", "澶師"}); + add(new String[]{"灞辫タ鏃犵嚎鐢靛巶灏忓尯", "澶師"}); + add(new String[]{"灞辫タ閲戦噾涓氶泦鍥㈠鑸�", "澶師"}); + add(new String[]{"灞辫タ鐪佽嚜鍔ㄥ寲鐮旂┒鎵�瀹胯垗", "澶師"}); + add(new String[]{"灞辫タ鐓ょ熆鍘呭眬瀹胯垗", "澶師"}); + add(new String[]{"灞辫タ楂橀�熺鐞嗗眬瀹胯垗", "澶師"}); + add(new String[]{"灞辫タ鐪佹湪鏉愬叕鍙稿鑸�", "澶師"}); + add(new String[]{"灞辫タ鐪佸尰鑽笌鐢熷懡绉戝鐮旂┒闄�", "澶師"}); + add(new String[]{"灞辫タ绾稿紶鍏徃瀹胯垗", "澶師"}); + add(new String[]{"灞辫タ鐒︾叅闆嗗洟婊ㄦ渤灏忓尯", "澶師"}); + add(new String[]{"灞辫タ瀹忓畨鍥介檯澶у帵", "澶師"}); + add(new String[]{"灞辫タ鍥�", "鏉窞"}); + add(new String[]{"灞辫タ鍗楁潙", "鍗椾含"}); + add(new String[]{"灞辫タ璇佸埜澶у帵", "瑗垮畨"}); + add(new String[]{"灞辫タ鑱屼笟鎶�鏈闄㈠鑸�", "澶師"}); + add(new String[]{"灞辫タ寤虹瓚鑱屼笟鎶�鏈闄㈠鑸�", "澶師"}); + add(new String[]{"灞辫タ鐪佸皯绠℃墍瀹胯垗", "澶師"}); + add(new String[]{"灞辫タ鏃ユ姤瀹胯垗", "澶師"}); + add(new String[]{"灞辫タ寤虹瓚瀛﹂櫌", "澶師"}); + add(new String[]{"灞辫タ涓栬锤涓績", "澶師"}); + add(new String[]{"灞辫タ鍥介檯璐告槗涓績", "澶師"}); + add(new String[]{"灞辫タ灏忓尯", "涓婃捣"}); + add(new String[]{"灞辫タ鏂版潙", "閲戝崕"}); + }}); + city_DistrictNames.put("澶師", new ArrayList(){{ + add(new String[]{"澶師鍗牎闀块灏忓尯", "澶師"}); + add(new String[]{"澶師鍒氱帀鐢熸椿鍖�", "澶師"}); + add(new String[]{"澶師瀵屽姏鐜颁唬骞垮満", "澶師"}); + add(new String[]{"澶師鎭掑ぇ缁挎床", "澶師"}); + add(new String[]{"澶師甯傛斂寤鸿寮�鍙戝瀹胯垗", "澶師"}); + add(new String[]{"澶師甯堣寖瀛﹂櫌瀹胯垗", "澶師"}); + add(new String[]{"澶師鐞嗗伐澶хぞ鍖轰綇瀹呭皬鍖轰笢闄�", "澶師"}); + add(new String[]{"澶師澶у甯堣寖瀛﹂櫌瀹胯垗", "澶師"}); + add(new String[]{"澶師闀垮煄鍏夌數瀛愬伐涓氬叕鍙稿鑸�", "澶師"}); + add(new String[]{"澶師璀﹀鍖哄灞為櫌", "澶師"}); + add(new String[]{"澶師鐢佃鍙板鑸嶅皬鍖�", "澶師"}); + add(new String[]{"澶師鐞嗗伐澶хぞ鍖轰綇瀹呭皬鍖鸿タ闄�", "澶師"}); + add(new String[]{"澶師甯傚洯鏋楀眬瀹胯垗", "澶師"}); + add(new String[]{"澶師澶у灏忓尯", "澶師"}); + add(new String[]{"澶師鐞嗗伐澶у瑗垮尯瀹胯垗", "澶師"}); + add(new String[]{"澶師甯備腑蹇冨尰闄㈠鑸�", "澶師"}); + add(new String[]{"澶師鏂板崕鍗板埛鍘傚鑸�", "澶師"}); + add(new String[]{"澶師甯傛満鐢靛叕鍙稿鑸�", "澶師"}); + add(new String[]{"澶師甯傚疄楠屼腑瀛﹀鑸�", "澶師"}); + add(new String[]{"澶師甯傚叕鍙稿鑸�", "澶師"}); + add(new String[]{"澶師甯傚湴鏂圭◣鍔″眬鐩村睘鍒嗗眬瀹胯垗", "澶師"}); + add(new String[]{"澶師鍒氱帀鐮傝疆灏忓尯", "澶師"}); + add(new String[]{"澶師甯備腑鍖婚櫌瀹胯垗", "澶師"}); + add(new String[]{"澶師涓嵂鍘傚鑸�", "澶師"}); + add(new String[]{"澶師甯傜鍥涘啗鍖哄共浼戞墍", "澶師"}); + add(new String[]{"澶師甯傚鏂欏洓鍘傚鑸�", "澶師"}); + add(new String[]{"澶師甯傜柧鐥呴闃叉帶鍒朵腑蹇冨鑸�", "澶師"}); + add(new String[]{"澶師鏃ユ姤绀惧鑸�", "澶師"}); + add(new String[]{"澶師鍐滅墽鍦哄鑸�", "澶師"}); + add(new String[]{"澶師甯傚洯鏋楃豢鍖栧伐绋嬮槦瀹胯垗", "澶師"}); + add(new String[]{"澶師甯備氦閫氬眬瀹胯垗", "澶師"}); + add(new String[]{"澶師甯傛湪鏉愬叕鍙稿鑸�", "澶師"}); + add(new String[]{"澶師甯傜嚂绉戝叕鍙稿鑸�", "澶師"}); + add(new String[]{"澶師鐞嗗伐澶у闀块浣忓畢灏忓尯", "澶師"}); + add(new String[]{"澶師甯傜涓�寤虹瓚鍏徃瀹胯垗", "澶師"}); + add(new String[]{"澶師鐕冩枡鍏徃瀹胯垗", "澶師"}); + add(new String[]{"澶師閫氫俊鍒嗗叕鍙稿皬鏂板煄浣忓畢灏忓尯", "澶師"}); + add(new String[]{"澶師甯傚浗绋庡眬瀹胯垗", "澶師"}); + add(new String[]{"澶師鏃朵唬", "娌堥槼"}); + add(new String[]{"澶師灏忓尯", "娌堥槼"}); + add(new String[]{"澶師浣冲洯", "娌堥槼"}); + add(new String[]{"澶師鏌冲贩閾滈敚婀惧疂鍦板皬鍖�", "澶師"}); + add(new String[]{"澶師宸ョ▼鑱屼笟鎶�鏈闄㈠鑸�", "澶師"}); + add(new String[]{"澶師閽笣鍘傚鑸�", "澶師"}); + add(new String[]{"澶師閲戦紟鍥介檯鍟嗗姟涓績", "澶師"}); + add(new String[]{"澶師涓囪揪鍏", "澶師"}); + add(new String[]{"澶師濂ユ灄鍖瑰厠鑺卞洯", "澶師"}); + add(new String[]{"澶師鍒", "涓婃捣"}); + add(new String[]{"澶師閭�", "涓婃捣"}); + add(new String[]{"澶師鏄熸渤婀句笁鏈�", "澶師"}); + }}); + city_DistrictNames.put("鍥涘窛", new ArrayList(){{ + add(new String[]{"鍥涘窛鐪佺洿鏈哄叧宸ュ瀹胯垗", "鎴愰兘"}); + add(new String[]{"鍥涘窛鐪佹灄涓氬巺瀹胯垗", "鎴愰兘"}); + add(new String[]{"鍥涘窛闊充箰瀛﹂櫌瀹胯垗", "鎴愰兘"}); + add(new String[]{"鍥涘窛鐪侀椊涓競椹荤枂鍔炰簨澶勫皬鍖�", "涔岄瞾鏈ㄩ綈"}); + add(new String[]{"鍥涘窛澶у帵", "鍘﹂棬"}); + add(new String[]{"鍥涘窛鐪佺鎶�鍘呭鑸�", "鎴愰兘"}); + add(new String[]{"鍥涘窛涓撶敤姹借溅鍘傚鑸�", "鎴愰兘"}); + add(new String[]{"鍥涘窛鏃ユ姤瀹胯垗", "鎴愰兘"}); + add(new String[]{"鍥涘窛鑹烘湳鑱屼笟瀛﹂櫌瀹跺睘妤�", "鎴愰兘"}); + add(new String[]{"鍥涘窛钀ヨ儭鍚�", "鍖椾含"}); + add(new String[]{"鍥涘窛灏忓尯", "涓婃捣"}); + add(new String[]{"鍥涘窛骞煎笀瀹胯垗", "鎴愰兘"}); + add(new String[]{"鍥涘窛澶у鍐滄灄鏉�", "鎴愰兘"}); + }}); + city_DistrictNames.put("鏀�鏋濊姳", new ArrayList(){{ + add(new String[]{"鏀�鏋濊姳鑻�", "娴峰彛"}); + }}); + city_DistrictNames.put("骞夸笢", new ArrayList(){{ + add(new String[]{"骞夸笢澶栬锤骞垮満", "骞垮窞"}); + add(new String[]{"骞夸笢澶栬鑹烘湳瀛﹂櫌鏁欏笀瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢寤虹闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢鍙告硶璀﹀畼鑱屼笟瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐜繚澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍟嗕笟澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍖诲闄㈡暀甯堝鑸嶆ゼ", "涓滆帪"}); + add(new String[]{"骞夸笢鍥介檯澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佹妧鏈洃鐫e眬瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢宸ヤ笟澶у瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鏁欒偛瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪侀摱琛屽ぇ鍘�", "娣卞湷"}); + add(new String[]{"骞夸笢澶у帵", "澶╂触"}); + add(new String[]{"骞夸笢灞卞簞", "闀囨睙"}); + add(new String[]{"骞夸笢绾㈢浘澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鑽闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢闈掑勾骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鍩虹妤�", "娣卞湷"}); + add(new String[]{"骞夸笢鐪佺鎶�骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佸啘涓氱鐞嗗共閮ㄥ闄㈢ぞ鍖�", "骞垮窞"}); + add(new String[]{"骞夸笢鑺暰闆烽�告櫙", "浣涘北"}); + }}); + city_DistrictNames.put("鐝犳捣", new ArrayList(){{ + add(new String[]{"鐝犳捣甯傚悏澶т節娲茶摑婀捐姳鍥�", "鐝犳捣"}); + add(new String[]{"鐝犳捣閲�", "澶╂触"}); + add(new String[]{"鐝犳捣鏂版潙", "鏄嗗北"}); + add(new String[]{"鐝犳捣浜屽尯", "闈掑矝"}); + add(new String[]{"鐝犳捣闆呰嫅", "闈掑矝"}); + add(new String[]{"鐝犳捣閮藉競鑺卞洯", "澶х悊"}); + add(new String[]{"鐝犳捣閿︾唬闃冲厜鑺卞洯", "娓╁窞"}); + }}); + city_DistrictNames.put("姹熻嫃", new ArrayList(){{ + add(new String[]{"姹熻嫃鐪佸啘绉戦櫌", "鍗椾含"}); + add(new String[]{"姹熻嫃娌圭敯鐭虫补灞卞簞", "鎵窞"}); + add(new String[]{"姹熻嫃璀﹀畼瀛﹂櫌", "鍗椾含"}); + add(new String[]{"姹熻嫃鐪侀珮绾т笓瀹跺洯", "鍗椾含"}); + add(new String[]{"姹熻嫃娌圭敯鐭虫补灞卞簞", "鎵窞"}); + add(new String[]{"姹熻嫃璁簨鍥�", "鍗椾含"}); + add(new String[]{"姹熻嫃鍥介檯濉戝寲鍩�", "甯稿窞"}); + add(new String[]{"姹熻嫃涓囧拰鍥介檯鍟嗚锤鍩�", "甯稿窞"}); + }}); + city_DistrictNames.put("闀囨睙", new ArrayList(){{ + add(new String[]{"闀囨睙閲�", "澶╂触"}); + add(new String[]{"闀囨睙鏂板尯鍥介檯浼氳涓績", "闀囨睙"}); + add(new String[]{"闀囨睙浜块兘瀹跺眳寤烘潗鍩�", "闀囨睙"}); + add(new String[]{"闀囨睙鏃緣鏈楅閮�", "闀囨睙"}); + add(new String[]{"闀囨睙涓囪揪骞垮満", "闀囨睙"}); + }}); + city_DistrictNames.put("姹熻嫃", new ArrayList(){{ + add(new String[]{"姹熻嫃鐪佸啘绉戦櫌", "鍗椾含"}); + add(new String[]{"姹熻嫃娌圭敯鐭虫补灞卞簞", "鎵窞"}); + add(new String[]{"姹熻嫃璀﹀畼瀛﹂櫌", "鍗椾含"}); + add(new String[]{"姹熻嫃鐪侀珮绾т笓瀹跺洯", "鍗椾含"}); + add(new String[]{"姹熻嫃娌圭敯鐭虫补灞卞簞", "鎵窞"}); + add(new String[]{"姹熻嫃璁簨鍥�", "鍗椾含"}); + add(new String[]{"姹熻嫃鍥介檯濉戝寲鍩�", "甯稿窞"}); + add(new String[]{"姹熻嫃涓囧拰鍥介檯鍟嗚锤鍩�", "甯稿窞"}); + }}); + city_DistrictNames.put("鑻忓窞", new ArrayList(){{ + add(new String[]{"鑻忓窞鍖楀贩", "澶ц繛"}); + add(new String[]{"鑻忓窞閲�", "澶╂触"}); + add(new String[]{"鑻忓窞鑺卞洯涓�鏈�", "涔岄瞾鏈ㄩ綈"}); + add(new String[]{"鑻忓窞鑺卞洯浜屾湡", "涔岄瞾鏈ㄩ綈"}); + add(new String[]{"鑻忓窞鑺卞洯", "瀹胯縼"}); + add(new String[]{"鑻忓窞灏忓尯", "鍖椾含"}); + add(new String[]{"鑻忓窞鍏瘬", "鍖椾含"}); + add(new String[]{"鑻忓窞骞昏薄", "娴庡崡"}); + add(new String[]{"鑻忓窞鍑ゅ嚢鏂囧寲骞垮満", "鑻忓窞"}); + add(new String[]{"鑻忓窞鍥介檯杞荤汉鍩�", "鑻忓窞"}); + add(new String[]{"鑻忓窞涓栬寕杩愭渤鍩�", "鑻忓窞"}); + add(new String[]{"鑻忓窞甯傛钵娴鎶�鍒涗笟鍥�", "鑻忓窞"}); + add(new String[]{"鑻忓窞楂樻柊鍖轰汉鍔涜祫婧愬ぇ鍘�", "鑻忓窞"}); + add(new String[]{"鑻忓窞鏂颁笢鏂规苯閰嶅煄", "鑻忓窞"}); + add(new String[]{"鑻忓窞绀煎搧鍟嗗搧鍩�", "鑻忓窞"}); + add(new String[]{"鑻忓窞娌挎捣鍥介檯涓績", "鑻忓窞"}); + add(new String[]{"鑻忓窞鏈虹數浜旈噾鍩�", "鑻忓窞"}); + add(new String[]{"鑻忓窞甯傛钵娴鎶�鍒涗笟鍥笢鍖�", "鑻忓窞"}); + add(new String[]{"鑻忓窞涓栬寕骞垮満鍏瘬", "鑻忓窞"}); + }}); + city_DistrictNames.put("姹熻嫃", new ArrayList(){{ + add(new String[]{"姹熻嫃鐪佸啘绉戦櫌", "鍗椾含"}); + add(new String[]{"姹熻嫃娌圭敯鐭虫补灞卞簞", "鎵窞"}); + add(new String[]{"姹熻嫃璀﹀畼瀛﹂櫌", "鍗椾含"}); + add(new String[]{"姹熻嫃鐪侀珮绾т笓瀹跺洯", "鍗椾含"}); + add(new String[]{"姹熻嫃娌圭敯鐭虫补灞卞簞", "鎵窞"}); + add(new String[]{"姹熻嫃璁簨鍥�", "鍗椾含"}); + add(new String[]{"姹熻嫃鍥介檯濉戝寲鍩�", "甯稿窞"}); + add(new String[]{"姹熻嫃涓囧拰鍥介檯鍟嗚锤鍩�", "甯稿窞"}); + }}); + city_DistrictNames.put("鑻忓窞", new ArrayList(){{ + add(new String[]{"鑻忓窞鍖楀贩", "澶ц繛"}); + add(new String[]{"鑻忓窞閲�", "澶╂触"}); + add(new String[]{"鑻忓窞鑺卞洯涓�鏈�", "涔岄瞾鏈ㄩ綈"}); + add(new String[]{"鑻忓窞鑺卞洯浜屾湡", "涔岄瞾鏈ㄩ綈"}); + add(new String[]{"鑻忓窞鑺卞洯", "瀹胯縼"}); + add(new String[]{"鑻忓窞灏忓尯", "鍖椾含"}); + add(new String[]{"鑻忓窞鍏瘬", "鍖椾含"}); + add(new String[]{"鑻忓窞骞昏薄", "娴庡崡"}); + add(new String[]{"鑻忓窞鍑ゅ嚢鏂囧寲骞垮満", "鑻忓窞"}); + add(new String[]{"鑻忓窞鍥介檯杞荤汉鍩�", "鑻忓窞"}); + add(new String[]{"鑻忓窞涓栬寕杩愭渤鍩�", "鑻忓窞"}); + add(new String[]{"鑻忓窞甯傛钵娴鎶�鍒涗笟鍥�", "鑻忓窞"}); + add(new String[]{"鑻忓窞楂樻柊鍖轰汉鍔涜祫婧愬ぇ鍘�", "鑻忓窞"}); + add(new String[]{"鑻忓窞鏂颁笢鏂规苯閰嶅煄", "鑻忓窞"}); + add(new String[]{"鑻忓窞绀煎搧鍟嗗搧鍩�", "鑻忓窞"}); + add(new String[]{"鑻忓窞娌挎捣鍥介檯涓績", "鑻忓窞"}); + add(new String[]{"鑻忓窞鏈虹數浜旈噾鍩�", "鑻忓窞"}); + add(new String[]{"鑻忓窞甯傛钵娴鎶�鍒涗笟鍥笢鍖�", "鑻忓窞"}); + add(new String[]{"鑻忓窞涓栬寕骞垮満鍏瘬", "鑻忓窞"}); + }}); + city_DistrictNames.put("鍚存睙", new ArrayList(){{ + add(new String[]{"鍚存睙鎸嘲灏忓尯", "鑻忓窞"}); + add(new String[]{"鍚存睙鏃朵唬瀹跺洯", "鑻忓窞"}); + add(new String[]{"鍚存睙鍑ゅ嚢鑺卞洯", "鑻忓窞"}); + add(new String[]{"鍚存睙涓ぎ鑺卞洯", "鑻忓窞"}); + add(new String[]{"鍚存睙婀栨花鑺卞洯", "鑻忓窞"}); + add(new String[]{"鍚存睙鍚嶅煄鑺卞洯", "鑻忓窞"}); + add(new String[]{"鍚存睙渚涚數灏忓尯", "鑻忓窞"}); + add(new String[]{"鍚存睙鍏畨鏂版潙", "鑻忓窞"}); + add(new String[]{"鍚存睙婀栨花鑺卞洯", "鍚存睙"}); + add(new String[]{"鍚存睙鍚嶅煄鑺卞洯", "鍚存睙"}); + add(new String[]{"鍚存睙鏃朵唬瀹跺洯", "鍚存睙"}); + add(new String[]{"鍚存睙鍑ゅ嚢鑺卞洯", "鍚存睙"}); + add(new String[]{"鍚存睙涓ぎ鑺卞洯", "鍚存睙"}); + add(new String[]{"鍚存睙涓介兘鍥介檯", "鍚存睙"}); + add(new String[]{"鍚存睙鍏畨鏂版潙", "鍚存睙"}); + add(new String[]{"鍚存睙渚涚數灏忓尯", "鍚存睙"}); + add(new String[]{"鍚存睙鎸嘲灏忓尯", "鍚存睙"}); + add(new String[]{"鍚存睙缁垮湴涓績", "鑻忓窞"}); + add(new String[]{"鍚存睙璧涙牸骞垮満", "鑻忓窞"}); + }}); + city_DistrictNames.put("娴欐睙", new ArrayList(){{ + add(new String[]{"娴欐睙宸ヤ笟澶у鏁欏笀瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙澶у帵", "澶師"}); + add(new String[]{"娴欐睙鍔炰簨澶勫鑸�", "澶師"}); + add(new String[]{"娴欐睙浠佸拰灞呰�佸勾鍏荤敓鍏瘬", "婀栧窞"}); + add(new String[]{"娴欐睙浜よ繍澶у帵", "鏉窞"}); + add(new String[]{"娴欐睙宸ュ晢澶у瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙鍟嗚锤鍩�", "鍚堣偉"}); + add(new String[]{"娴欐睙宸ヤ笟澶у涔嬫睙瀛﹂櫌", "鏉窞"}); + }}); + city_DistrictNames.put("閲戝崕", new ArrayList(){{ + add(new String[]{"閲戝崕閲�", "鍖椾含"}); + add(new String[]{"閲戝崕鑻�", "娴峰彛"}); + add(new String[]{"閲戝崕鏂版潙", "澶ц繛"}); + add(new String[]{"閲戝崕鍏瘬", "闈掑矝"}); + add(new String[]{"閲戝崕鍥�", "涓北"}); + add(new String[]{"閲戝崕鑺卞洯", "涓滆帪"}); + add(new String[]{"閲戝崕涓栧", "璐甸槼"}); + add(new String[]{"閲戝崕鍥�", "璐甸槼"}); + add(new String[]{"閲戝崕鑺卞洯", "骞垮窞"}); + add(new String[]{"閲戝崕鏂版潙", "鏉窞"}); + add(new String[]{"閲戝崕鑻�", "娼嶅潑"}); + add(new String[]{"閲戝崕涓藉皬鍖�", "娼嶅潑"}); + add(new String[]{"閲戝崕鑺卞洯", "閲嶅簡"}); + add(new String[]{"閲戝崕闃�", "娣卞湷"}); + add(new String[]{"閲戝崕澶у帵澶ф浮鍙�", "閲嶅簡"}); + add(new String[]{"閲戝崕鑻戝皬鍖�", "閲嶅簡"}); + add(new String[]{"閲戝崕閲�", "澶╂触"}); + add(new String[]{"閲戝崕灏忓尯", "鐭冲搴�"}); + add(new String[]{"閲戝崕澶у帵", "閲嶅簡"}); + add(new String[]{"閲戝崕鍥�", "閲嶅簡"}); + add(new String[]{"閲戝崕浜戦紟", "閲嶅簡"}); + add(new String[]{"閲戝崕鍥�", "娌堥槼"}); + add(new String[]{"閲戝崕鍏瘬", "鎴愰兘"}); + add(new String[]{"閲戝崕鑻�", "鎴愰兘"}); + add(new String[]{"閲戝崕澶у帵", "姝︽眽"}); + add(new String[]{"閲戝崕瀛﹀簻", "鍛煎拰娴╃壒"}); + add(new String[]{"閲戝崕涓栧鍒", "璐甸槼"}); + add(new String[]{"閲戝崕鍏瘬", "绂忓窞"}); + add(new String[]{"閲戝崕灏忓尯", "澶ц繛"}); + add(new String[]{"閲戝崕閲岋紙瑗块潚锛�", "澶╂触"}); + add(new String[]{"閲戝崕妤�", "鍘﹂棬"}); + add(new String[]{"閲戝崕鑻�", "鍏板窞"}); + add(new String[]{"閲戝崕鍥埆澧�", "鍖椾含"}); + add(new String[]{"閲戝崕灏忓尯涓夋湡", "澶ц繛"}); + add(new String[]{"閲戝崕鑺卞洯", "涓北"}); + add(new String[]{"閲戝崕鍥�", "浣涘北"}); + add(new String[]{"閲戝崕鑻�", "闈掑矝"}); + add(new String[]{"閲戝崕灏忓尯浜屾湡", "澶ц繛"}); + add(new String[]{"閲戝崕鍥�", "鏄嗘槑"}); + add(new String[]{"閲戝崕鑻�", "涓婃捣"}); + add(new String[]{"閲戝崕鍥�", "鍖椾含"}); + add(new String[]{"閲戝崕鏂版潙", "涓婃捣"}); + add(new String[]{"閲戝崕鍏徃瀹胯垗", "鏄嗘槑"}); + add(new String[]{"閲戝崕鑻�", "骞抽《灞�"}); + add(new String[]{"閲戝崕瀹跺洯 ", "鐩橀敠"}); + add(new String[]{"閲戝崕瀹跺洯", "鐩橀敠"}); + add(new String[]{"閲戝崕涓囪揪骞垮満", "閲戝崕"}); + add(new String[]{"閲戝崕涓栬锤涓績", "閲戝崕"}); + add(new String[]{"閲戝崕姹介厤鍩庝簩鏈�", "閲戝崕"}); + add(new String[]{"閲戝崕宸蜂竴鍙�", "鏀�鏋濊姳"}); + }}); + city_DistrictNames.put("姹熻嫃", new ArrayList(){{ + add(new String[]{"姹熻嫃鐪佸啘绉戦櫌", "鍗椾含"}); + add(new String[]{"姹熻嫃娌圭敯鐭虫补灞卞簞", "鎵窞"}); + add(new String[]{"姹熻嫃璀﹀畼瀛﹂櫌", "鍗椾含"}); + add(new String[]{"姹熻嫃鐪侀珮绾т笓瀹跺洯", "鍗椾含"}); + add(new String[]{"姹熻嫃娌圭敯鐭虫补灞卞簞", "鎵窞"}); + add(new String[]{"姹熻嫃璁簨鍥�", "鍗椾含"}); + add(new String[]{"姹熻嫃鍥介檯濉戝寲鍩�", "甯稿窞"}); + add(new String[]{"姹熻嫃涓囧拰鍥介檯鍟嗚锤鍩�", "甯稿窞"}); + }}); + city_DistrictNames.put("鏃犻敗", new ArrayList(){{ + add(new String[]{"鏃犻敗澶у帵", "涓婃捣"}); + add(new String[]{"鏃犻敗婊ㄦ箹涓囪揪骞垮満", "鏃犻敗"}); + add(new String[]{"鏃犻敗纰ф鍥�", "鏃犻敗"}); + add(new String[]{"鏃犻敗涓栫晫璐告槗涓績涓�鏈熶笘璐稿叕瀵�", "鏃犻敗"}); + add(new String[]{"鏃犻敗娲涘煄姗欓儭", "鏃犻敗"}); + add(new String[]{"鏃犻敗濉炵撼搴勫洯", "瀹滃叴"}); + add(new String[]{"鏃犻敗鐜夊叞鑺卞洯", "瀹滃叴"}); + }}); + city_DistrictNames.put("骞夸笢", new ArrayList(){{ + add(new String[]{"骞夸笢澶栬锤骞垮満", "骞垮窞"}); + add(new String[]{"骞夸笢澶栬鑹烘湳瀛﹂櫌鏁欏笀瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢寤虹闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢鍙告硶璀﹀畼鑱屼笟瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐜繚澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍟嗕笟澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍖诲闄㈡暀甯堝鑸嶆ゼ", "涓滆帪"}); + add(new String[]{"骞夸笢鍥介檯澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佹妧鏈洃鐫e眬瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢宸ヤ笟澶у瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鏁欒偛瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪侀摱琛屽ぇ鍘�", "娣卞湷"}); + add(new String[]{"骞夸笢澶у帵", "澶╂触"}); + add(new String[]{"骞夸笢灞卞簞", "闀囨睙"}); + add(new String[]{"骞夸笢绾㈢浘澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鑽闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢闈掑勾骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鍩虹妤�", "娣卞湷"}); + add(new String[]{"骞夸笢鐪佺鎶�骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佸啘涓氱鐞嗗共閮ㄥ闄㈢ぞ鍖�", "骞垮窞"}); + add(new String[]{"骞夸笢鑺暰闆烽�告櫙", "浣涘北"}); + }}); + city_DistrictNames.put("骞垮窞", new ArrayList(){{ + add(new String[]{"骞垮窞鍗敓鍘呭ぇ闄�", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥泤閫稿涵", "骞垮窞"}); + add(new String[]{"骞垮窞瀹㈣溅鍘傚鑸�", "骞垮窞"}); + add(new String[]{"骞垮窞鍚庤姳鍥�", "娓呰繙"}); + add(new String[]{"骞垮窞鍚庤姳鍥�", "娓呰繙"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥祬灞卞皬绛�", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥泤鎮﹀涵", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥泤缈犲涵", "骞垮窞"}); + add(new String[]{"骞垮窞濂ユ灄鍖瑰厠鑺卞洯", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥偦灞�", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥�稿績鍥�", "骞垮窞"}); + add(new String[]{"骞垮窞澶у鏁欏笀妤�", "骞垮窞"}); + add(new String[]{"骞垮窞甯傜ぞ浼氱鍒╅櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞垮窞浣撹偛瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞垮窞甯傞鍝佸鑸�", "骞垮窞"}); + add(new String[]{"骞垮窞婀炬椂浠e箍鍦�", "婀涙睙"}); + add(new String[]{"骞垮窞鍐涘尯鎴跨鎵�瀹胯垗", "姝︽眽"}); + add(new String[]{"骞垮窞鏂板鏂颁笘鐣岃姳鍥�", "骞垮窞"}); + add(new String[]{"骞垮窞绌烘腐鍋囨棩鍒閰掑簵", "骞垮窞"}); + add(new String[]{"骞垮窞鏄熸渤涓瑰牑", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥崄骞村皬闆�", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥姳宸�", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥嘲浼�", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥尽鏅嘲鍒", "骞垮窞"}); + add(new String[]{"骞垮窞纰ф鍥鑻�", "骞垮窞"}); + add(new String[]{"骞垮窞纰ф鍥崕鑻�", "骞垮窞"}); + add(new String[]{"骞垮窞纰ф鍥泤鑻�", "骞垮窞"}); + add(new String[]{"骞垮窞纰ф鍥編鑻�", "骞垮窞"}); + add(new String[]{"骞垮窞纰ф鍥箰鑻�", "骞垮窞"}); + add(new String[]{"骞垮窞纰ф鍥敠鑻�", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥锋娲叉晠浜�", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥亸婀栧眳", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥泤婀栧眳", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥�", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥竴灏哄北灞�", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥锋柊鍦�", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥峰ぉ鍩�", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥锋尓濞佹.鏋�", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥洉鍒绘椂鍏�", "骞垮窞"}); + add(new String[]{"骞垮窞纰ф鍥鑻�", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥笂鍠勮嫢姘�", "骞垮窞"}); + add(new String[]{"骞垮窞娓憺閰掑簵鍏瘬", "骞垮窞"}); + add(new String[]{"骞垮窞浜氳繍鍩幝峰ぉ瑾�", "骞垮窞"}); + add(new String[]{"骞垮窞鐧藉ぉ楣呰姳鍥�", "骞垮窞"}); + add(new String[]{"骞垮窞纰ф鍥豢鑼佃嫅", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥椂鍏変節绡�", "骞垮窞"}); + add(new String[]{"骞垮窞纰ф鍥悍鑻�", "骞垮窞"}); + add(new String[]{"骞垮窞娴疯繍澶у帵", "骞垮窞"}); + add(new String[]{"骞垮窞鏈夎壊閲戝睘鐮旂┒闄�", "骞垮窞"}); + add(new String[]{"骞垮窞纰ф鍥附鑻�", "骞垮窞"}); + add(new String[]{"骞垮窞纰ф鍥繝鑻�", "骞垮窞"}); + add(new String[]{"骞垮窞瀵屽姏鍩�", "骞垮窞"}); + add(new String[]{"骞垮窞纰ф鍥�", "骞垮窞"}); + add(new String[]{"骞垮窞鏂板鏂颁笘鐣岃姳鍥�", "澧炲煄"}); + }}); + city_DistrictNames.put("娴峰崡", new ArrayList(){{ + add(new String[]{"娴峰崡涔嬪績", "娴峰彛"}); + add(new String[]{"娴峰崡澶у鍗楀笇绉戞妧鑻�", "娴峰彛"}); + add(new String[]{"娴峰崡鏃ユ姤绀惧鑸�", "娴峰彛"}); + add(new String[]{"娴峰崡鐪佸璁℃満鍏崇編鑸嶄綇瀹呭尯", "娴峰彛"}); + add(new String[]{"娴峰崡绀句繚", "娴峰彛"}); + add(new String[]{"娴峰崡鐪佷汉澶у父濮斾細鏈哄叧浣忓畢灏忓尯", "娴峰彛"}); + add(new String[]{"娴峰崡澶у鏁欏笀瀹胯垗", "娴峰彛"}); + add(new String[]{"娴峰崡鐕冨寲鍏徃瀹胯垗", "娴峰彛"}); + add(new String[]{"娴峰崡鐪佷綋鏍″鑸�", "娴峰彛"}); + add(new String[]{"娴峰崡缁熻灞�瀹胯垗", "娴峰彛"}); + add(new String[]{"娴峰崡鐪佸伐鍟嗛摱琛屽鑸�", "娴峰彛"}); + add(new String[]{"娴峰崡宸ュ晢澶у帵", "娴峰彛"}); + add(new String[]{"娴峰崡鏃朵唬骞垮満", "娴峰彛"}); + add(new String[]{"娴峰崡甯堣寖瀛﹂櫌閲戣姳鍥�", "娴峰彛"}); + add(new String[]{"娴峰崡澶у帵", "娴峰彛"}); + add(new String[]{"娴峰崡鐢靛姏鍘傚鑸�", "娴峰彛"}); + add(new String[]{"娴峰崡鐪佷笁浜氬叚寤哄崟浣�", "涓変簹"}); + add(new String[]{"娴峰崡闄垫按瀵屽姏婀�", "涓変簹"}); + add(new String[]{"娴峰崡澶у叕棣�", "娴峰彛"}); + add(new String[]{"娴峰崡缇庢灄婀栧浗闄呭害鍋囩ぞ鍖�", "涓変簹"}); + add(new String[]{"娴峰崡瀹跺洯", "鍖椾含"}); + add(new String[]{"娴峰崡骞蹭紤鎵�", "骞垮窞"}); + add(new String[]{"娴峰崡缁垮煄娓呮按婀�", "涓変簹"}); + add(new String[]{"娴峰崡路涓変簹路缇庝簹涔嬪績", "涓変簹"}); + add(new String[]{"娴峰崡瑗垮紕51寮�", "涓婃捣"}); + add(new String[]{"娴峰崡骞蹭紤鎵�锛堝ぉ娌筹級", "骞垮窞"}); + add(new String[]{"娴峰崡鍚庢捣娓╂硥灏忛晣", "閲嶅簡"}); + }}); + city_DistrictNames.put("娴峰彛", new ArrayList(){{ + add(new String[]{"娴峰彛楦挎床鏂板煄", "娴峰彛"}); + add(new String[]{"娴峰彛鐢典俊灏忓尯", "娴峰彛"}); + add(new String[]{"娴峰彛鐢佃鍙板鑸�", "娴峰彛"}); + add(new String[]{"娴峰彛缁忚锤澶у帵", "娴峰彛"}); + add(new String[]{"娴峰彛绉戞妧澶у帵", "娴峰彛"}); + add(new String[]{"娴峰彛鏅氭姤绀惧鑸�", "娴峰彛"}); + add(new String[]{"娴峰彛娓ぇ鍘�", "娴峰彛"}); + add(new String[]{"娴峰彛甯備汉姘戝尰闄㈠鑸�", "娴峰彛"}); + add(new String[]{"娴峰彛鑺卞洯", "闀挎槬"}); + add(new String[]{"娴峰彛甯傞鍔涘ぇ鍘�", "娴峰彛"}); + }}); + city_DistrictNames.put("闄曡タ", new ArrayList(){{ + add(new String[]{"闄曡タ鐢靛姏鍏徃瀹跺睘闄�", "瑗垮畨"}); + add(new String[]{"闄曡タ鍥介檯浼氬睍涓績", "瑗垮畨"}); + add(new String[]{"闄曡タ宸�", "鍖椾含"}); + add(new String[]{"闄曡タ鐪佸鏈哄叧鑱斿缓灏忓尯", "瑗垮畨"}); + add(new String[]{"闄曡タ鐪佺柧鎺т腑蹇冨灞為櫌", "瑗垮畨"}); + add(new String[]{"闄曡タ姝岃垶鍓ч櫌瀹跺睘闄�", "瑗垮畨"}); + add(new String[]{"闄曡タ鎴忔洸鐮旂┒闄�", "瑗垮畨"}); + add(new String[]{"闄曡タ浜ら�氳亴涓氭妧鏈灞為櫌", "瑗垮畨"}); + add(new String[]{"闄曡タ骞挎挱鐢佃澶у瀹跺睘闄�", "瑗垮畨"}); + add(new String[]{"闄曡タ楣忚豹鍥�", "瑗垮畨"}); + add(new String[]{"闄曡タ鐗╀骇闆嗗洟鍏徃瀹跺睘闄�", "瑗垮畨"}); + add(new String[]{"闄曡タ閲戦湒鍟嗕綇灏忓尯", "瑗垮畨"}); + }}); + city_DistrictNames.put("寤跺畨", new ArrayList(){{ + add(new String[]{"寤跺畨涓鍗曚綅瀹胯垗", "绂忓窞"}); + add(new String[]{"寤跺畨灏忓尯", "璐甸槼"}); + add(new String[]{"寤跺畨鏂版潙", "鏉窞"}); + add(new String[]{"寤跺畨閲�", "澶╂触"}); + add(new String[]{"寤跺畨妤�", "澶╂触"}); + add(new String[]{"寤跺畨閲岀ぞ鍖�", "娌堥槼"}); + add(new String[]{"寤跺畨灏忓尯", "澶ц繛"}); + add(new String[]{"寤跺畨灏忓尯", "鑺滄箹"}); + add(new String[]{"寤跺畨鍢夎嫅", "涓婃捣"}); + add(new String[]{"寤跺畨鏂版潙", "涓婃捣"}); + add(new String[]{"寤跺畨灏忓尯", "涓婃捣"}); + add(new String[]{"寤跺畨鍏瘬", "涓婃捣"}); + add(new String[]{"寤跺畨鏂版潙", "鏃犻敗"}); + add(new String[]{"寤跺畨宀ぞ鍖�", "榛勭煶"}); + add(new String[]{"寤跺畨妗冩簮灏忓尯", "寤跺畨"}); + add(new String[]{"寤跺畨鍖楅緳澶у帵", "寤跺畨"}); + add(new String[]{"寤跺畨缁藉皬鍖�", "寤跺畨"}); + }}); + city_DistrictNames.put("骞夸笢", new ArrayList(){{ + add(new String[]{"骞夸笢澶栬锤骞垮満", "骞垮窞"}); + add(new String[]{"骞夸笢澶栬鑹烘湳瀛﹂櫌鏁欏笀瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢寤虹闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢鍙告硶璀﹀畼鑱屼笟瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐜繚澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍟嗕笟澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍖诲闄㈡暀甯堝鑸嶆ゼ", "涓滆帪"}); + add(new String[]{"骞夸笢鍥介檯澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佹妧鏈洃鐫e眬瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢宸ヤ笟澶у瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鏁欒偛瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪侀摱琛屽ぇ鍘�", "娣卞湷"}); + add(new String[]{"骞夸笢澶у帵", "澶╂触"}); + add(new String[]{"骞夸笢灞卞簞", "闀囨睙"}); + add(new String[]{"骞夸笢绾㈢浘澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鑽闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢闈掑勾骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鍩虹妤�", "娣卞湷"}); + add(new String[]{"骞夸笢鐪佺鎶�骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佸啘涓氱鐞嗗共閮ㄥ闄㈢ぞ鍖�", "骞垮窞"}); + add(new String[]{"骞夸笢鑺暰闆烽�告櫙", "浣涘北"}); + }}); + city_DistrictNames.put("涓北", new ArrayList(){{ + add(new String[]{"涓北涓夐櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"涓北浜岄櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"涓北鑺卞洯", "闀挎槬"}); + add(new String[]{"涓北灏忓尯", "閮戝窞"}); + add(new String[]{"涓北鏉�", "鍗楁槍"}); + add(new String[]{"涓北鍩�", "鍗楁槍"}); + add(new String[]{"涓北妗ュ伐鍟嗛摱琛屽鑸�", "鍗楁槍"}); + add(new String[]{"涓北妗ュ湴绋庡眬瀹胯垗", "鍗楁槍"}); + add(new String[]{"涓北澹瑰搧", "鍗楁槍"}); + add(new String[]{"涓北浣宠嫅", "鍗楁槍"}); + add(new String[]{"涓北鍚嶅骇", "鍗楁槍"}); + add(new String[]{"涓北妗ヤ汉姘戦摱琛屽鑸�", "鍗楁槍"}); + add(new String[]{"涓北鍚嶈嫅", "鍝堝皵婊�"}); + add(new String[]{"涓北鍥介檯", "鍝堝皵婊�"}); + add(new String[]{"涓北绂忚嫅", "鍝堝皵婊�"}); + add(new String[]{"涓北鑻�", "甯稿窞"}); + add(new String[]{"涓北闂ㄥ叕瀵�", "甯稿窞"}); + add(new String[]{"涓北澶у瑗垮尯", "骞垮窞"}); + add(new String[]{"涓北鍑棆闂�", "鐭冲搴�"}); + add(new String[]{"涓北瀹鹃瀹胯垗", "鐭冲搴�"}); + add(new String[]{"涓北鍏洯闄勮繎瀹胯垗", "娴庡崡"}); + add(new String[]{"涓北闂ㄥ皬鍖�", "鍗椾含"}); + add(new String[]{"涓北鍩庡競鑺卞洯", "鏌冲窞"}); + add(new String[]{"涓北鍏瘬", "澶ц繛"}); + add(new String[]{"涓北楦挎櫙鑻�", "绂忓窞"}); + add(new String[]{"涓北鑺卞洯", "娉夊窞"}); + add(new String[]{"涓北瀹跺洯", "瀹佹尝"}); + add(new String[]{"涓北棣栧簻", "瀹佹尝"}); + add(new String[]{"涓北鍚嶉兘", "瀹佹尝"}); + add(new String[]{"涓北闆呭洯", "瀹佹尝"}); + add(new String[]{"涓北灏忓尯", "瀹佹尝"}); + add(new String[]{"涓北甯濇櫙鑻�", "涓北"}); + add(new String[]{"涓北鍗庡涵", "瀹佹尝"}); + add(new String[]{"涓北路鎬″拰鍥�", "鍢夊叴"}); + add(new String[]{"涓北鑺卞洯", "鍢夊叴"}); + add(new String[]{"涓北鍚嶅簻", "鍢夊叴"}); + add(new String[]{"涓北澶у帵鍟嗗姟妤�", "鍢夊叴"}); + add(new String[]{"涓北寤烘牎灏忓尯", "鍛煎拰娴╃壒"}); + add(new String[]{"涓北澶у帵", "璐甸槼"}); + add(new String[]{"涓北寰″涵", "鏉窞"}); + add(new String[]{"涓北鑺辫嫅", "鏉窞"}); + add(new String[]{"涓北鍖楀洯", "鏉窞"}); + add(new String[]{"涓北鑻�", "鏉窞"}); + add(new String[]{"涓北鑺卞洯", "鏉窞"}); + add(new String[]{"涓北鍥介檯", "澶╂触"}); + add(new String[]{"涓北鑻�", "娣卞湷"}); + add(new String[]{"涓北棰愭櫙鑺卞洯", "娣卞湷"}); + add(new String[]{"涓北鑺卞洯", "娣卞湷"}); + add(new String[]{"涓北闂ㄤ腹灏煎皵灏忓尯", "瑗垮畨"}); + add(new String[]{"涓北灏忓尯", "瑗垮畨"}); + add(new String[]{"涓北鍖楅噷", "澶╂触"}); + add(new String[]{"涓北闂ㄥ崡閲�", "澶╂触"}); + add(new String[]{"涓北闂ㄤ笢閲�", "澶╂触"}); + add(new String[]{"涓北澶у帵", "澶╂触"}); + add(new String[]{"涓北闂ㄥ洓鍙疯矾灏忓尯", "澶╂触"}); + add(new String[]{"涓北绉�鏅�", "娌堥槼"}); + add(new String[]{"涓北鍗楃ぞ鍖�", "娌堥槼"}); + add(new String[]{"涓北鑺卞洯", "姝︽眽"}); + add(new String[]{"涓北绀惧尯", "姝︽眽"}); + add(new String[]{"涓北澶у帵", "鍙板窞"}); + add(new String[]{"涓北鑺卞洯", "椹瀺灞�"}); + add(new String[]{"涓北鑺卞洯", "杩炰簯娓�"}); + add(new String[]{"涓北鍏洯灏忓尯", "姝︽眽"}); + add(new String[]{"涓北妗ョぞ鍖�", "姝︽眽"}); + add(new String[]{"涓北涓滃崌涔愭剰灞呰姳鍥�", "涓北"}); + add(new String[]{"涓北涓滃崌涓藉煄鑺卞洯", "涓北"}); + add(new String[]{"涓北娉簮鍒", "涓北"}); + add(new String[]{"涓北鑺卞洯", "鍝堝皵婊�"}); + add(new String[]{"涓北钃濊壊姘村哺", "鍝堝皵婊�"}); + add(new String[]{"涓北鑺卞洯", "璐甸槼"}); + add(new String[]{"涓北澶у帵", "绂忓窞"}); + add(new String[]{"涓北鑹捐彶鍫�", "涓北"}); + add(new String[]{"涓北涔濆彿", "澶ц繛"}); + add(new String[]{"涓北鍗楄嫅", "澶ц繛"}); + add(new String[]{"涓北瑗胯嫅", "闀囨睙"}); + add(new String[]{"涓北闂ㄨタ閲�", "澶╂触"}); + add(new String[]{"涓北闂ㄥ寳閲�", "澶╂触"}); + add(new String[]{"涓北涓滈噷", "澶╂触"}); + add(new String[]{"涓北浜汉缁囧搧鍏徃瀹胯垗", "闀挎矙"}); + add(new String[]{"涓北澶у帵", "姝︽眽"}); + add(new String[]{"涓北瑗胯嫅", "瀹佹尝"}); + add(new String[]{"涓北澶у涓滃尯", "骞垮窞"}); + add(new String[]{"涓北浜岄櫌鍗楅櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"涓北鏋楀缓绛戝叕鍙稿灞為櫌", "鍏板窞"}); + add(new String[]{"涓北SOHO鍏瘬", "瀹佹尝"}); + add(new String[]{"涓北鍖诲闄㈠鑸�", "骞垮窞"}); + add(new String[]{"涓北鍩庡尯鍟嗛摵", "涓北"}); + add(new String[]{"涓北灏忓尯", "閲嶅簡"}); + add(new String[]{"涓北浣宠嫅", "閲嶅簡"}); + add(new String[]{"涓北浜屾ˉ渚�", "涓北"}); + add(new String[]{"涓北娴锋櫙骞垮満", "鍘﹂棬"}); + add(new String[]{"涓北骞垮満", "浣涘北"}); + add(new String[]{"涓北澶ч櫌", "绂忓窞"}); + add(new String[]{"涓北骞垮満", "姝︽眽"}); + add(new String[]{"涓北澶у帵", "璐甸槼"}); + add(new String[]{"涓北璞簮", "浣涘北"}); + add(new String[]{"涓北棰愭櫙鑺卞洯浜屾湡", "娣卞湷"}); + add(new String[]{"涓北骞垮満", "澶ц繛"}); + add(new String[]{"涓北澶у钂插洯鍖�", "骞垮窞"}); + add(new String[]{"涓北鏂版潙", "鏄嗗北"}); + add(new String[]{"涓北鑻�", "涓婃捣"}); + add(new String[]{"涓北涓俊澶фゼ", "涓婃捣"}); + add(new String[]{"涓北鏂版潙", "涓婃捣"}); + add(new String[]{"涓北骞垮満", "涓婃捣"}); + add(new String[]{"涓北澶фゼ", "涓婃捣"}); + add(new String[]{"涓北澶у帵", "涓婃捣"}); + add(new String[]{"涓北鍏冧竴鏂拌嫅", "涓婃捣"}); + add(new String[]{"涓北鍏瘬", "涓婃捣"}); + add(new String[]{"涓北澶фゼ锛堥暱瀹侊級", "涓婃捣"}); + add(new String[]{"涓北鍖婚櫌瀹跺睘鍖�", "鍗椾含"}); + add(new String[]{"涓北鍟嗗姟妤�", "鍗椾含"}); + add(new String[]{"涓北澶у帵", "琛¢槼"}); + add(new String[]{"涓北灏忓尯", "瀹滃"}); + add(new String[]{"涓北鍥介檯澶у帵", "闀挎矙"}); + add(new String[]{"涓北瑗胯嫅鏅嘲閲�", "瀹佹尝"}); + add(new String[]{"涓北瑗胯嫅骞垮畨閲�", "瀹佹尝"}); + add(new String[]{"涓北绀惧尯鍗囧钩璺綇瀹�", "鍘﹂棬"}); + add(new String[]{"涓北鍚嶉兘", "鍢夊叴"}); + add(new String[]{"涓北鏂版潙", "鑻忓窞"}); + add(new String[]{"涓北濂ュ洯", "涓北"}); + add(new String[]{"涓北鏋椾簩鍗佷竷涓灞為櫌", "鍏板窞"}); + }}); + city_DistrictNames.put("姹熻タ", new ArrayList(){{ + add(new String[]{"姹熻タ鐪佸缓宸ラ泦鍥�", "鍗楁槍"}); + add(new String[]{"姹熻タ璐㈢粡澶у閭斂瀹胯垗", "鍗楁槍"}); + add(new String[]{"姹熻タ鐪佸浘涔﹂瀹胯垗", "鍗楁槍"}); + add(new String[]{"姹熻タ瀹鹃鏃佽竟", "鍗楁槍"}); + add(new String[]{"姹熻タ琛屾斂瀛﹂櫌瀹胯垗", "鍗楁槍"}); + add(new String[]{"姹熻タ璐㈢粡澶у瀹胯垗", "鍗楁槍"}); + add(new String[]{"姹熻タ绉戞妧甯堣寖瀛﹂櫌瀹胯垗", "鍗楁槍"}); + add(new String[]{"姹熻タ鐪佸箍鎾數鍙板鑸�", "鍗楁槍"}); + add(new String[]{"姹熻タ涓滃崕璁¢噺鐮旂┒鎵�瀹胯垗", "鍗楁槍"}); + add(new String[]{"姹熻タ瀹㈣溅鍘傚鑸�", "鍗楁槍"}); + add(new String[]{"姹熻タ浠櫒鍘傚鑸�", "鍗楁槍"}); + add(new String[]{"姹熻タ鏄屼笢姹借溅浜ゆ槗骞垮満", "鍗楁槍"}); + add(new String[]{"姹熻タ鏃ц揣澶т笘鐣�", "鍗楁槍"}); + add(new String[]{"姹熻タ鏃ユ姤瀹胯垗", "鍗楁槍"}); + }}); + city_DistrictNames.put("璧e窞", new ArrayList(){{ + add(new String[]{"璧e窞搴�", "璧e窞"}); + add(new String[]{"璧e窞瀹跺叿澶у競鍦�", "璧e窞"}); + add(new String[]{"璧e窞绮鍩�", "璧e窞"}); + }}); + city_DistrictNames.put("闄曡タ", new ArrayList(){{ + add(new String[]{"闄曡タ鐢靛姏鍏徃瀹跺睘闄�", "瑗垮畨"}); + add(new String[]{"闄曡タ鍥介檯浼氬睍涓績", "瑗垮畨"}); + add(new String[]{"闄曡タ宸�", "鍖椾含"}); + add(new String[]{"闄曡タ鐪佸鏈哄叧鑱斿缓灏忓尯", "瑗垮畨"}); + add(new String[]{"闄曡タ鐪佺柧鎺т腑蹇冨灞為櫌", "瑗垮畨"}); + add(new String[]{"闄曡タ姝岃垶鍓ч櫌瀹跺睘闄�", "瑗垮畨"}); + add(new String[]{"闄曡タ鎴忔洸鐮旂┒闄�", "瑗垮畨"}); + add(new String[]{"闄曡タ浜ら�氳亴涓氭妧鏈灞為櫌", "瑗垮畨"}); + add(new String[]{"闄曡タ骞挎挱鐢佃澶у瀹跺睘闄�", "瑗垮畨"}); + add(new String[]{"闄曡タ楣忚豹鍥�", "瑗垮畨"}); + add(new String[]{"闄曡タ鐗╀骇闆嗗洟鍏徃瀹跺睘闄�", "瑗垮畨"}); + add(new String[]{"闄曡タ閲戦湒鍟嗕綇灏忓尯", "瑗垮畨"}); + }}); + city_DistrictNames.put("鍜搁槼", new ArrayList(){{ + add(new String[]{"鍜搁槼閲�", "澶╂触"}); + add(new String[]{"鍜搁槼鍗楅噷", "澶╂触"}); + add(new String[]{"鍜搁槼鍖楅噷", "澶╂触"}); + }}); + city_DistrictNames.put("涓婃捣", new ArrayList(){{ + add(new String[]{"涓婃捣娌欓緳", "鍖椾含"}); + add(new String[]{"涓婃捣婊╄姳鍥�", "鐑熷彴"}); + add(new String[]{"涓婃捣鏂板煄", "鍗楁槍"}); + add(new String[]{"涓婃捣鏁呬簨", "鍗楁槍"}); + add(new String[]{"涓婃捣鍢夊洯", "鍝堝皵婊�"}); + add(new String[]{"涓婃捣澶ц姳鍥簩鏈�", "娉板窞"}); + add(new String[]{"涓婃捣鍩�", "涓北"}); + add(new String[]{"涓婃捣鑺卞洯", "娓╁窞"}); + add(new String[]{"涓婃捣鍩�", "闀挎矙"}); + add(new String[]{"涓婃捣骞村崕", "閮戝窞"}); + add(new String[]{"涓婃捣鍏瘬", "璐甸槼"}); + add(new String[]{"涓婃捣鍩庡競", "鍚堣偉"}); + add(new String[]{"涓婃捣鏄庣彔鑺卞洯", "鍗椾含"}); + add(new String[]{"涓婃捣鍩庝簩鏈�", "閲嶅簡"}); + add(new String[]{"涓婃捣鍥介檯鏈嶉グ鍩�", "寰愬窞"}); + add(new String[]{"涓婃捣澶у帵", "閲嶅簡"}); + add(new String[]{"涓婃捣鍩庡叕棣�", "瑗垮畨"}); + add(new String[]{"涓婃捣鍩�", "閲嶅簡"}); + add(new String[]{"涓婃捣婊╁ぇ鍗庡浗闄呭叕棣�", "澶╂触"}); + add(new String[]{"涓婃捣鏂板煄", "鍗楅��"}); + add(new String[]{"涓婃捣鍩庡悕浜鸿嫅", "缁甸槼"}); + add(new String[]{"涓婃捣鍢夎嫅", "鍗楅��"}); + add(new String[]{"涓婃捣鍏", "瑗勯槼"}); + add(new String[]{"涓婃捣瀹跺洯", "鍙板窞"}); + add(new String[]{"涓婃捣鑺卞洯", "鍙板窞"}); + add(new String[]{"涓婃捣璞嫅涓�鏈�", "杩炰簯娓�"}); + add(new String[]{"涓婃捣涔嬫槬浜屾湡", "杩炰簯娓�"}); + add(new String[]{"涓婃捣涔嬫槬涓�鏈�", "杩炰簯娓�"}); + add(new String[]{"涓婃捣璞嫅浜屾湡", "杩炰簯娓�"}); + add(new String[]{"涓婃捣璞嫅16#妤�", "杩炰簯娓�"}); + add(new String[]{"涓婃捣鍩�", "鑻忓窞"}); + add(new String[]{"涓婃捣甯傚満姝ヨ琛�1鍙烽櫌", "娲涢槼"}); + add(new String[]{"涓婃捣婊╁崕搴�", "娲涢槼"}); + add(new String[]{"涓婃捣甯傚満2鍙烽櫌", "娲涢槼"}); + add(new String[]{"涓婃捣鏂版潙", "閾跺窛"}); + add(new String[]{"涓婃捣瑗挎柊鏉�", "绂忓窞"}); + add(new String[]{"涓婃捣鑺卞洯", "娴庡崡"}); + add(new String[]{"涓婃捣鍏瘬", "闀囨睙"}); + add(new String[]{"涓婃捣璞涵", "濞佹捣"}); + add(new String[]{"涓婃捣鑺辫嫅", "闈掑矝"}); + add(new String[]{"涓婃捣鑺卞洯鍗楅偦瀹胯垗", "娴庡崡"}); + add(new String[]{"涓婃捣鏉�", "姝︽眽"}); + add(new String[]{"涓婃捣鍥介檯鑺卞洯", "濞佹捣"}); + add(new String[]{"涓婃捣澶ц姳鍥竴鏈�", "娉板窞"}); + add(new String[]{"涓婃捣鍩庣箒鍗庣邯", "閲嶅簡"}); + add(new String[]{"涓婃捣鍩�", "缁嶅叴"}); + add(new String[]{"涓婃捣涓滄柟鑺辫嫅", "閲嶅簡"}); + add(new String[]{"涓婃捣鍩庝笁鏈熷ぉ鍩�", "閲嶅簡"}); + add(new String[]{"涓婃捣鍩嶭OMO鍏瘬", "閲嶅簡"}); + add(new String[]{"涓婃捣鍩�", "濞佹捣"}); + add(new String[]{"涓婃捣涓滈煹", "鎴愰兘"}); + add(new String[]{"涓婃捣鎭掕仈鏂板ぉ鍦拌姳鍥�", "鏄嗘槑"}); + add(new String[]{"涓婃捣娌欓緳浜屾湡", "鏄嗘槑"}); + add(new String[]{"涓婃捣娌欓緳涓夋湡", "鏄嗘槑"}); + add(new String[]{"涓婃捣鍏", "鏄嗗北"}); + add(new String[]{"涓婃捣瑁曡姳鍥�", "鏄嗗北"}); + add(new String[]{"涓婃捣鍚庤姳鍥�", "鏄嗗北"}); + add(new String[]{"涓婃捣鎹峰骇", "鏄嗗北"}); + add(new String[]{"涓婃捣鏄熷煄鍒", "鏄嗗北"}); + add(new String[]{"涓婃捣涓囩绗簲鍥�", "涓婃捣"}); + add(new String[]{"涓婃捣缁垮煄涓夋湡", "涓婃捣"}); + add(new String[]{"涓婃捣婊╄姳鍥磱鎴�", "涓婃捣"}); + add(new String[]{"涓婃捣缁垮煄浜屾湡", "涓婃捣"}); + add(new String[]{"涓婃捣缁垮煄", "涓婃捣"}); + add(new String[]{"涓婃捣婊╄姳鍥磱鎴垮埆澧�", "涓婃捣"}); + add(new String[]{"涓婃捣鏈潵", "涓婃捣"}); + add(new String[]{"涓婃捣鏈潵榛勫北鏂板煄", "涓婃捣"}); + add(new String[]{"涓婃捣钃濆牎", "涓婃捣"}); + add(new String[]{"涓婃捣绗竴鍏桨浼�", "涓婃捣"}); + add(new String[]{"涓婃捣涓ゆ腐瑁呴グ鏉愭枡鍩�", "涓婃捣"}); + add(new String[]{"涓婃捣榧庡煄", "涓婃捣"}); + add(new String[]{"涓婃捣妗ユ婀捐喘鐗╀腑蹇�", "涓婃捣"}); + add(new String[]{"涓婃捣涓栧崥涓滄箹鍏瘬閰掑簵", "涓婃捣"}); + add(new String[]{"涓婃捣寤虹瓚", "鍖椾含"}); + add(new String[]{"涓婃捣鍏櫨", "涓婃捣"}); + add(new String[]{"涓婃捣姊︽兂", "涓婃捣"}); + add(new String[]{"涓婃捣鍏虫腐宸ヤ笟鍥尯", "涓婃捣"}); + add(new String[]{"涓婃捣鐢靛瓙鑹烘湳鍒涙剰浜т笟鍩哄湴", "涓婃捣"}); + add(new String[]{"涓婃捣澶ц姳鍥�", "涓婃捣"}); + add(new String[]{"涓婃捣鎹峰厠浣忓畢灏忓尯", "涓婃捣"}); + add(new String[]{"涓婃捣鍥介檯鎽╁皵鍩�", "涓婃捣"}); + add(new String[]{"涓婃捣鐨囧鑺卞洯", "涓婃捣"}); + add(new String[]{"涓婃捣鍥介檯涓皬浼佷笟鍩�", "涓婃捣"}); + add(new String[]{"涓婃捣浜旀湀澶�", "涓婃捣"}); + add(new String[]{"涓婃捣鍖楃灞卞浗闄呰壓鏈腑蹇�", "涓婃捣"}); + add(new String[]{"涓婃捣鏈壊", "涓婃捣"}); + add(new String[]{"涓婃捣婕曟渤娉惧紑鍙戝尯鏉炬睙楂樼鎶�鍥竴鏈�", "涓婃捣"}); + add(new String[]{"涓婃捣鏉炬睙涓囪揪骞垮満", "涓婃捣"}); + add(new String[]{"涓婃捣璇楁灄鍒", "涓婃捣"}); + add(new String[]{"涓婃捣鍚堢敓鍥介檯鑺卞洯", "涓婃捣"}); + add(new String[]{"涓婃捣鍏", "涓婃捣"}); + add(new String[]{"涓婃捣绱洯浜屾湡", "涓婃捣"}); + add(new String[]{"涓婃捣瑁曡姳鍥�", "涓婃捣"}); + add(new String[]{"涓婃捣钁¤悇鍩庣鎶�浜т笟鐢熶骇澶фゼ", "涓婃捣"}); + add(new String[]{"涓婃捣涓ゆ腐瑁呴グ鍩庡叕瀵�", "涓婃捣"}); + add(new String[]{"涓婃捣鐧介┈澶у帵", "涓婃捣"}); + add(new String[]{"涓婃捣鏂版潙", "涓婃捣"}); + add(new String[]{"涓婃捣澶ф偊鍩�", "涓婃捣"}); + add(new String[]{"涓婃捣鍥介檯鏃跺皻涓績", "涓婃捣"}); + add(new String[]{"涓婃捣鍟嗗姟涓績", "涓婃捣"}); + add(new String[]{"涓婃捣鐞嗗伐澶у鍥藉澶у绉戞妧鍥�", "涓婃捣"}); + add(new String[]{"涓婃捣璐㈢粡澶у鍥藉澶у绉戞妧鍥�", "涓婃捣"}); + add(new String[]{"涓婃捣婊╁ぇ瀹佸煄", "涓婃捣"}); + add(new String[]{"涓婃捣甯堝ぇ绉戞妧鍥�", "涓婃捣"}); + add(new String[]{"涓婃捣璞兘鍥介檯鑺卞洯鍒", "涓婃捣"}); + add(new String[]{"涓婃捣璇楁灄", "涓婃捣"}); + add(new String[]{"涓婃捣瀹跺ぉ涓嬭姳鍥埆澧�", "涓婃捣"}); + add(new String[]{"涓婃捣婧愯姳鍩�", "涓婃捣"}); + add(new String[]{"涓婃捣闈掑勾鍩�", "涓婃捣"}); + add(new String[]{"涓婃捣濞佸凹鏂姳鍥�", "涓婃捣"}); + add(new String[]{"涓婃捣鏅剁ⅶ浜т笟鍥�", "涓婃捣"}); + add(new String[]{"涓婃捣澶╁湴杞欢鍥�", "涓婃捣"}); + add(new String[]{"涓婃捣閾跺骇", "涓婃捣"}); + add(new String[]{"涓婃捣璞兘鍥介檯鑺卞洯", "涓婃捣"}); + add(new String[]{"涓婃捣璞洯", "涓婃捣"}); + add(new String[]{"涓婃捣姹囧姏寰楃數瀛愬晢鍔′骇涓氬洯", "涓婃捣"}); + add(new String[]{"涓婃捣鍒╂瘮瀵屾枃鍏风ぜ鍝佸晢鍘�", "涓婃捣"}); + add(new String[]{"涓婃捣涔嬫槬鍏瘬", "涓婃捣"}); + add(new String[]{"涓婃捣棣欐孩鑺卞煄", "涓婃捣"}); + add(new String[]{"涓婃捣鏄熸渤婀�", "涓婃捣"}); + add(new String[]{"涓婃捣骞村崕", "涓婃捣"}); + add(new String[]{"涓婃捣鐭ラ煶", "涓婃捣"}); + add(new String[]{"涓婃捣鐭ラ煶浜屾湡", "涓婃捣"}); + add(new String[]{"涓婃捣鑾樺煄鐗′腹闃�", "涓婃捣"}); + add(new String[]{"涓婃捣绱椇鍩�", "涓婃捣"}); + add(new String[]{"涓婃捣鏄熸腐", "涓婃捣"}); + add(new String[]{"涓婃捣鏄ュぉ", "涓婃捣"}); + add(new String[]{"涓婃捣瀹跺洯", "涓婃捣"}); + add(new String[]{"涓婃捣鑾樺煄閮藉競鎯呭洯", "涓婃捣"}); + add(new String[]{"涓婃捣婕曟渤娉惧紑鍙戝尯闂佃楂樼鎶�鍥�", "涓婃捣"}); + add(new String[]{"涓婃捣鑾樺煄", "涓婃捣"}); + add(new String[]{"涓婃捣搴峰煄涓夋湡", "涓婃捣"}); + add(new String[]{"涓婃捣路缁垮煄鐜懓鍥�", "涓婃捣"}); + add(new String[]{"涓婃捣鑺卞洯鍒", "涓婃捣"}); + add(new String[]{"涓婃捣搴峰煄鍥涙湡", "涓婃捣"}); + add(new String[]{"涓婃捣鍒", "涓婃捣"}); + add(new String[]{"涓婃捣鍏卞瘜鍥�", "涓婃捣"}); + add(new String[]{"涓婃捣婊╄姳鍥�", "涓婃捣"}); + add(new String[]{"涓婃捣鑺卞洯", "涓婃捣"}); + add(new String[]{"涓婃捣渚ㄥ洯澶╁疂璐㈠瘜鍒涙剰鍥尯", "涓婃捣"}); + add(new String[]{"涓婃捣椋庢櫙", "涓婃捣"}); + add(new String[]{"涓婃捣婊╂柊鏄屽煄", "涓婃捣"}); + add(new String[]{"涓婃捣鍟嗗煄", "涓婃捣"}); + add(new String[]{"涓婃捣搴峰煄浜屾湡", "涓婃捣"}); + add(new String[]{"涓婃捣闃冲煄", "涓婃捣"}); + add(new String[]{"涓婃捣閲戦拱璐墿涓績", "涓婃捣"}); + add(new String[]{"涓婃捣鏄ュ煄", "涓婃捣"}); + add(new String[]{"涓婃捣搴峰煄", "涓婃捣"}); + add(new String[]{"涓婃捣涓婂疄鍗楁磱骞垮満", "涓婃捣"}); + add(new String[]{"涓婃捣缁垮湴棣欓鍏瘬", "涓婃捣"}); + add(new String[]{"涓婃捣鑺卞煄", "涓婃捣"}); + add(new String[]{"涓婃捣缁垮湴棣欓鍒", "涓婃捣"}); + add(new String[]{"涓婃捣閲戝北涔変箤灏忓晢鍝佸煄", "涓婃捣"}); + add(new String[]{"涓婃捣鎹峰骇", "涓婃捣"}); + add(new String[]{"涓婃捣鑺卞洯骞垮満", "涓婃捣"}); + add(new String[]{"涓婃捣鏂板ぉ楦垮悕浜洪珮灏斿か鍒绀惧尯", "涓婃捣"}); + add(new String[]{"涓婃捣鍞愭湞閰掑簵", "涓婃捣"}); + add(new String[]{"涓婃捣鍔犲窞鑺卞洯", "涓婃捣"}); + add(new String[]{"涓婃捣鑺卞洯", "闈掑矝"}); + add(new String[]{"涓婃捣鏅洯", "闈掑矝"}); + add(new String[]{"涓婃捣娌欓緳涓�鏈�", "鏄嗘槑"}); + add(new String[]{"涓婃捣鑺卞洯", "鎴愰兘"}); + add(new String[]{"涓婃捣鍩�", "鑲囧簡"}); + add(new String[]{"涓婃捣鑺卞洯", "涔愭竻"}); + add(new String[]{"涓婃捣鍩�", "鍚存睙"}); + add(new String[]{"涓婃捣鍩�", "鏂颁埂"}); + add(new String[]{"涓婃捣鍗拌薄", "鐗′腹姹�"}); + add(new String[]{"涓婃捣涓借嫅", "鐩愬煄"}); + add(new String[]{"涓婃捣涔濅箙闈掑勾鍩庝簩鏈�", "涓婃捣"}); + add(new String[]{"涓婃捣鐢靛奖骞垮満", "涓婃捣"}); + add(new String[]{"涓婃捣涓夋箻娴峰皻", "涓婃捣"}); + add(new String[]{"涓婃捣涓夋箻娴峰皻鍒", "涓婃捣"}); + add(new String[]{"涓婃捣鍥介檯閽㈤搧鏈嶅姟涓氫腑蹇�", "涓婃捣"}); + add(new String[]{"涓婃捣娴锋腐鍥介檯璐告槗涓績", "涓婃捣"}); + add(new String[]{"涓婃捣閿︾弬鍥介檯濉戣兌涓績", "涓婃捣"}); + add(new String[]{"涓婃捣瑗块儕鍟嗗姟鍖�", "涓婃捣"}); + add(new String[]{"涓婃捣閿︽睙鍥介檯璐墿涓績", "涓婃捣"}); + add(new String[]{"涓婃捣鏂颁綋鑲插箍鍦�", "涓婃捣"}); + add(new String[]{"涓婃捣闈掑勾鍩庡叕瀵�", "涓婃捣"}); + add(new String[]{"涓婃捣鍗氫鸡缁煎悎甯傚満", "涓婃捣"}); + add(new String[]{"涓婃捣鍏村姏杈惧浗闄呰楗板煄", "涓婃捣"}); + add(new String[]{"涓婃捣鑺卞洯", "鏀�鏋濊姳"}); + add(new String[]{"涓婃捣鏄熷煄", "鑻忓窞"}); + add(new String[]{"涓婃捣婊╁晢鍘�", "涓婃捣"}); + add(new String[]{"涓婃捣鍥介檯闉嬪煄", "涓婃捣"}); + add(new String[]{"涓婃捣瑁呴グ甯傚満", "涓婃捣"}); + add(new String[]{"涓婃捣鍛ㄦ郸涓囪揪骞垮満鍏瘬", "涓婃捣"}); + add(new String[]{"涓婃捣鍩庢柊澶╁湴瀹跺洯", "鑻忓窞"}); + add(new String[]{"涓婃捣瑁曡姳鍥�", "鑻忓窞"}); + add(new String[]{"涓婃捣涔嬫槬", "杩炰簯娓�"}); + }}); + city_DistrictNames.put("姹熻嫃", new ArrayList(){{ + add(new String[]{"姹熻嫃鐪佸啘绉戦櫌", "鍗椾含"}); + add(new String[]{"姹熻嫃娌圭敯鐭虫补灞卞簞", "鎵窞"}); + add(new String[]{"姹熻嫃璀﹀畼瀛﹂櫌", "鍗椾含"}); + add(new String[]{"姹熻嫃鐪侀珮绾т笓瀹跺洯", "鍗椾含"}); + add(new String[]{"姹熻嫃娌圭敯鐭虫补灞卞簞", "鎵窞"}); + add(new String[]{"姹熻嫃璁簨鍥�", "鍗椾含"}); + add(new String[]{"姹熻嫃鍥介檯濉戝寲鍩�", "甯稿窞"}); + add(new String[]{"姹熻嫃涓囧拰鍥介檯鍟嗚锤鍩�", "甯稿窞"}); + }}); + city_DistrictNames.put("鑻忓窞", new ArrayList(){{ + add(new String[]{"鑻忓窞鍖楀贩", "澶ц繛"}); + add(new String[]{"鑻忓窞閲�", "澶╂触"}); + add(new String[]{"鑻忓窞鑺卞洯涓�鏈�", "涔岄瞾鏈ㄩ綈"}); + add(new String[]{"鑻忓窞鑺卞洯浜屾湡", "涔岄瞾鏈ㄩ綈"}); + add(new String[]{"鑻忓窞鑺卞洯", "瀹胯縼"}); + add(new String[]{"鑻忓窞灏忓尯", "鍖椾含"}); + add(new String[]{"鑻忓窞鍏瘬", "鍖椾含"}); + add(new String[]{"鑻忓窞骞昏薄", "娴庡崡"}); + add(new String[]{"鑻忓窞鍑ゅ嚢鏂囧寲骞垮満", "鑻忓窞"}); + add(new String[]{"鑻忓窞鍥介檯杞荤汉鍩�", "鑻忓窞"}); + add(new String[]{"鑻忓窞涓栬寕杩愭渤鍩�", "鑻忓窞"}); + add(new String[]{"鑻忓窞甯傛钵娴鎶�鍒涗笟鍥�", "鑻忓窞"}); + add(new String[]{"鑻忓窞楂樻柊鍖轰汉鍔涜祫婧愬ぇ鍘�", "鑻忓窞"}); + add(new String[]{"鑻忓窞鏂颁笢鏂规苯閰嶅煄", "鑻忓窞"}); + add(new String[]{"鑻忓窞绀煎搧鍟嗗搧鍩�", "鑻忓窞"}); + add(new String[]{"鑻忓窞娌挎捣鍥介檯涓績", "鑻忓窞"}); + add(new String[]{"鑻忓窞鏈虹數浜旈噾鍩�", "鑻忓窞"}); + add(new String[]{"鑻忓窞甯傛钵娴鎶�鍒涗笟鍥笢鍖�", "鑻忓窞"}); + add(new String[]{"鑻忓窞涓栬寕骞垮満鍏瘬", "鑻忓窞"}); + }}); + city_DistrictNames.put("鏄嗗北", new ArrayList(){{ + add(new String[]{"鏄嗗北灏忓尯", "娌堥槼"}); + add(new String[]{"鏄嗗北鍗楀皬鍖�", "娌堥槼"}); + add(new String[]{"鏄嗗北閲�", "澶╂触"}); + add(new String[]{"鏄嗗北鑺卞洯", "鏄嗗北"}); + add(new String[]{"鏄嗗北浜夸赴鏈虹數鍩�", "鏄嗗北"}); + add(new String[]{"鏄嗗北鏌忔偊鍟嗗姟澶у帵", "鏄嗗北"}); + add(new String[]{"鏄嗗北鍥介檯妯″叿鍩�", "鏄嗗北"}); + add(new String[]{"鏄嗗北缁垮煄鐜懓鍥�", "鏄嗗北"}); + add(new String[]{"鏄嗗北浜夸赴骞垮満", "鏄嗗北"}); + add(new String[]{"鏄嗗北棣欐孩绱儭", "鏄嗗北"}); + add(new String[]{"鏄嗗北涓畤骞垮満", "涓婃捣"}); + add(new String[]{"鏄嗗北璧涙牸鐢靛瓙", "涓婃捣"}); + add(new String[]{"鏄嗗北浜戝北璇楁剰", "鑻忓窞"}); + add(new String[]{"鏄嗗北鏌忔偊鍟嗗姟澶у帵", "鑻忓窞"}); + }}); + city_DistrictNames.put("鍐呰挋鍙�", new ArrayList(){{ + add(new String[]{"鍐呰挋鍙ょ數澶у皬鍖�", "鍛煎拰娴╃壒"}); + add(new String[]{"鍐呰挋鍙ゆ棩鎶ョぞ瀹夊叏鏂囨槑灏忓尯", "鍛煎拰娴╃壒"}); + add(new String[]{"鍐呰挋鍙ゆ斂搴滀綇瀹呭皬鍖�", "鍛煎拰娴╃壒"}); + add(new String[]{"鍐呰挋鍙よ嚜娌诲尯鍥界◣灞�浣忓畢鍖�", "鍛煎拰娴╃壒"}); + add(new String[]{"鍐呰挋鍙ゆ斂鍗忎綇瀹呭皬鍖�", "鍛煎拰娴╃壒"}); + add(new String[]{"鍐呰挋鍙ょ粡璐稿闄㈠灞為櫌", "鍛煎拰娴╃壒"}); + add(new String[]{"鍐呰挋鍙ゅ厷鏍″崡鑻戝皬鍖�", "鍛煎拰娴╃壒"}); + add(new String[]{"鍐呰挋鍙ゅ尰闄㈠灞炴ゼ", "鍛煎拰娴╃壒"}); + add(new String[]{"鍐呰挋鍙ゅ浗闄呭晢璐稿煄", "鍛煎拰娴╃壒"}); + }}); + city_DistrictNames.put("閯傚皵澶氭柉", new ArrayList(){{ + }}); + city_DistrictNames.put("骞夸笢", new ArrayList(){{ + add(new String[]{"骞夸笢澶栬锤骞垮満", "骞垮窞"}); + add(new String[]{"骞夸笢澶栬鑹烘湳瀛﹂櫌鏁欏笀瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢寤虹闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢鍙告硶璀﹀畼鑱屼笟瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐜繚澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍟嗕笟澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍖诲闄㈡暀甯堝鑸嶆ゼ", "涓滆帪"}); + add(new String[]{"骞夸笢鍥介檯澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佹妧鏈洃鐫e眬瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢宸ヤ笟澶у瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鏁欒偛瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪侀摱琛屽ぇ鍘�", "娣卞湷"}); + add(new String[]{"骞夸笢澶у帵", "澶╂触"}); + add(new String[]{"骞夸笢灞卞簞", "闀囨睙"}); + add(new String[]{"骞夸笢绾㈢浘澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鑽闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢闈掑勾骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鍩虹妤�", "娣卞湷"}); + add(new String[]{"骞夸笢鐪佺鎶�骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佸啘涓氱鐞嗗共閮ㄥ闄㈢ぞ鍖�", "骞垮窞"}); + add(new String[]{"骞夸笢鑺暰闆烽�告櫙", "浣涘北"}); + }}); + city_DistrictNames.put("闊跺叧", new ArrayList(){{ + add(new String[]{"闊跺叧纰ф鍥�", "闊跺叧"}); + }}); + city_DistrictNames.put("闄曡タ", new ArrayList(){{ + add(new String[]{"闄曡タ鐢靛姏鍏徃瀹跺睘闄�", "瑗垮畨"}); + add(new String[]{"闄曡タ鍥介檯浼氬睍涓績", "瑗垮畨"}); + add(new String[]{"闄曡タ宸�", "鍖椾含"}); + add(new String[]{"闄曡タ鐪佸鏈哄叧鑱斿缓灏忓尯", "瑗垮畨"}); + add(new String[]{"闄曡タ鐪佺柧鎺т腑蹇冨灞為櫌", "瑗垮畨"}); + add(new String[]{"闄曡タ姝岃垶鍓ч櫌瀹跺睘闄�", "瑗垮畨"}); + add(new String[]{"闄曡タ鎴忔洸鐮旂┒闄�", "瑗垮畨"}); + add(new String[]{"闄曡タ浜ら�氳亴涓氭妧鏈灞為櫌", "瑗垮畨"}); + add(new String[]{"闄曡タ骞挎挱鐢佃澶у瀹跺睘闄�", "瑗垮畨"}); + add(new String[]{"闄曡タ楣忚豹鍥�", "瑗垮畨"}); + add(new String[]{"闄曡タ鐗╀骇闆嗗洟鍏徃瀹跺睘闄�", "瑗垮畨"}); + add(new String[]{"闄曡タ閲戦湒鍟嗕綇灏忓尯", "瑗垮畨"}); + }}); + city_DistrictNames.put("瑗垮畨", new ArrayList(){{ + add(new String[]{"瑗垮畨鑺卞洯", "闀挎槬"}); + add(new String[]{"瑗垮畨鑻�", "鍘﹂棬"}); + add(new String[]{"瑗垮畨绂忚儭鍚�", "鍖椾含"}); + add(new String[]{"瑗垮畨闂ㄥ皬鍖�", "鍖椾含"}); + add(new String[]{"瑗垮畨鍗拌薄", "瑗垮畨"}); + add(new String[]{"瑗垮畨鏈濋槼灏忓尯", "瑗垮畨"}); + add(new String[]{"瑗垮畨閿﹂兘", "瑗垮畨"}); + add(new String[]{"瑗垮畨甯傛斂搴滃皬鍖�", "瑗垮畨"}); + add(new String[]{"瑗垮畨閿﹀洯", "瑗垮畨"}); + add(new String[]{"瑗垮畨闃冲厜閲�", "瑗垮畨"}); + add(new String[]{"瑗垮畨甯備汉姘戞瀵熼櫌瀹跺睘闄�", "瑗垮畨"}); + add(new String[]{"瑗垮畨鎭掔珛鑻�", "瑗垮畨"}); + add(new String[]{"瑗垮畨甯傚缓琛屽灞為櫌", "瑗垮畨"}); + add(new String[]{"瑗垮畨浠〃鍘�101绀惧尯", "瑗垮畨"}); + add(new String[]{"瑗垮畨楂樻柊鍖哄垱涓氱爺鍙戦櫌", "瑗垮畨"}); + add(new String[]{"瑗垮畨骞垮満", "鍘﹂棬"}); + add(new String[]{"瑗垮畨甯傚姵鍔ㄥ眬瀹跺睘闄�", "瑗垮畨"}); + add(new String[]{"瑗垮畨澶ф磱鍟嗗帵", "瑗垮畨"}); + add(new String[]{"瑗垮畨甯傚晢涓氶摱琛屽煄涓滄敮琛屽灞為櫌", "瑗垮畨"}); + add(new String[]{"瑗垮畨澶栬繍灏忓尯", "瑗垮畨"}); + add(new String[]{"瑗垮畨鏃ユ姤绀惧灞為櫌", "瑗垮畨"}); + add(new String[]{"瑗垮畨闄㈠瓙", "瑗垮畨"}); + add(new String[]{"瑗垮畨鐢电紗鍏徃瀹跺睘闄�", "瑗垮畨"}); + add(new String[]{"瑗垮畨鐩涗笘骞垮満", "瑗垮畨"}); + add(new String[]{"瑗垮畨姘戜箰鍥竾杈惧箍鍦�", "瑗垮畨"}); + add(new String[]{"瑗垮畨棣栧垱鍥介檯鍩�/棣栧垱婕閮�", "瑗垮畨"}); + add(new String[]{"瑗垮畨浜ら�氬ぇ瀛︽壃宸炵鎶�鍥�", "鎵窞"}); + }}); + city_DistrictNames.put("灞变笢", new ArrayList(){{ + add(new String[]{"灞变笢閲�", "绉︾殗宀�"}); + add(new String[]{"灞变笢缁忔祹瀛﹂櫌瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢鐪佸崼鐢熷巺瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢鐪佹皯鏀垮巺瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢鐪佸晢涓氶泦鍥㈡�诲叕鍙稿鑸�", "娴庡崡"}); + add(new String[]{"灞变笢鍖荤澶у鏁欏笀瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢澶栬锤澶у帵", "闈掑矝"}); + add(new String[]{"灞变笢澶у帵", "娣卞湷"}); + add(new String[]{"灞变笢鍫$ぞ鍖�", "娌堥槼"}); + add(new String[]{"灞变笢鑹烘湳瀛﹂櫌瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢榛勯噾宕簯婀栭珮灏斿か鍒", "娴庡崡"}); + add(new String[]{"灞变笢鍙告硶璀﹀畼瀛﹂櫌瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢鐪佺瀛﹂櫌楂樻柊鎶�鏈爺绌跺垎闄�", "闈掑矝"}); + add(new String[]{"灞变笢寤哄伐瀛﹂櫌瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢搴欏皬鍖�", "娌堥槼"}); + add(new String[]{"灞变笢涔冲北閾舵哗娴锋櫙鎴�", "濞佹捣"}); + add(new String[]{"灞变笢澶存潙", "闈掑矝"}); + add(new String[]{"灞变笢鐪佺暅鐗у眬瀹胯垗", "娴庡崡"}); + }}); + city_DistrictNames.put("娼嶅潑", new ArrayList(){{ + add(new String[]{"娼嶅潑浜屽缓瀹胯垗", "娼嶅潑"}); + add(new String[]{"娼嶅潑鐑熻崏鍏徃瀹胯垗", "娼嶅潑"}); + add(new String[]{"娼嶅潑甯傛暀鑲插眬", "娼嶅潑"}); + add(new String[]{"娼嶅潑澶ч厭搴楀鑸�", "娼嶅潑"}); + add(new String[]{"娼嶅潑涓滄柟瀹跺洯", "娼嶅潑"}); + add(new String[]{"娼嶅潑渚涢攢绀惧鑸�", "娼嶅潑"}); + add(new String[]{"娼嶅潑寤哄伐灞�瀹胯垗", "娼嶅潑"}); + add(new String[]{"娼嶅潑瀛﹂櫌瀹胯垗锛堟矁灏旂帥鍚庯級", "娼嶅潑"}); + add(new String[]{"娼嶅潑涓瀹跺睘闄�", "娼嶅潑"}); + add(new String[]{"娼嶅潑鍔ㄩ厤瀹胯垗", "娼嶅潑"}); + add(new String[]{"娼嶅潑閾惰瀹胯垗锛堟ū鍓嶈锛�", "娼嶅潑"}); + add(new String[]{"娼嶅潑閾惰瀹胯垗", "娼嶅潑"}); + add(new String[]{"娼嶅潑鍗佹潙", "涓婃捣"}); + add(new String[]{"娼嶅潑浜屾潙", "涓婃捣"}); + add(new String[]{"娼嶅潑涔濇潙", "涓婃捣"}); + add(new String[]{"娼嶅潑鍏潙", "涓婃捣"}); + add(new String[]{"娼嶅潑澶фゼ", "涓婃捣"}); + add(new String[]{"娼嶅潑鍥涙潙", "涓婃捣"}); + add(new String[]{"娼嶅潑涓�鏉�", "涓婃捣"}); + add(new String[]{"娼嶅潑鍏潙", "涓婃捣"}); + add(new String[]{"娼嶅潑浜旀潙", "涓婃捣"}); + add(new String[]{"娼嶅潑涓冩潙", "涓婃捣"}); + add(new String[]{"娼嶅潑涓夋潙", "涓婃捣"}); + }}); + city_DistrictNames.put("娌冲崡", new ArrayList(){{ + add(new String[]{"娌冲崡搴勫皬鍖�", "闈掑矝"}); + add(new String[]{"娌冲崡璐笓瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡鐪佹柊鍗庝功搴楀灞為櫌", "閮戝窞"}); + add(new String[]{"娌冲崡鐪佸晢涓氱瀛︾爺绌舵墍瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡鐪佹棩鎶ョぞ瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡濂冲瓙楂樹腑瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡澶栬锤澶ч櫌", "娣卞湷"}); + add(new String[]{"娌冲崡閲�", "澶╂触"}); + add(new String[]{"娌冲崡鏂版潙", "绂忓窞"}); + add(new String[]{"娌冲崡璐㈢粡瀛﹂櫌瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡宀稿叕鍥皬鍖�", "鎯犲窞"}); + add(new String[]{"娌冲崡宀告柊鏉�", "鎯犲窞"}); + add(new String[]{"娌冲崡鏉�", "鍖椾含"}); + add(new String[]{"娌冲崡鐞嗗伐瀛︽牎瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡鐪佷汉浜嬪巺瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡宀镐腑蹇冨皬鍖�", "鎯犲窞"}); + add(new String[]{"娌冲崡鐪佸璐稿鏍″灞為櫌", "閮戝窞"}); + add(new String[]{"娌冲崡鏉�", "涓婃捣"}); + add(new String[]{"娌冲崡鏂版潙", "涓婃捣"}); + add(new String[]{"娌冲崡宸ヤ笟澶у瀹跺睘闄�", "閮戝窞"}); + }}); + city_DistrictNames.put("娲涢槼", new ArrayList(){{ + add(new String[]{"娲涢槼鑺卞洯", "闀挎槬"}); + add(new String[]{"娲涢槼鍢夋眹鍩�", "娲涢槼"}); + add(new String[]{"娲涢槼甯傞珮璐ㄤ汉鎵嶅眳浣忓尯", "娲涢槼"}); + add(new String[]{"娲涢槼鏂板煄", "娉夊窞"}); + add(new String[]{"娲涢槼閾惰瀹跺睘闄�", "娲涢槼"}); + add(new String[]{"娲涢槼鍢夋眹鍩�", "娲涢槼"}); + add(new String[]{"娲涢槼楗簵瀹跺睘闄�", "娲涢槼"}); + add(new String[]{"娲涢槼娉婃灄缁挎床", "娲涢槼"}); + add(new String[]{"娲涢槼鏂版潙", "涓婃捣"}); + add(new String[]{"娲涢槼鍗囬緳骞垮満", "娲涢槼"}); + add(new String[]{"娲涢槼淇℃伅绉戞妧鍩�", "娲涢槼"}); + add(new String[]{"娲涢槼鍗囬緳鍩�", "娲涢槼"}); + }}); + city_DistrictNames.put("姹熻嫃", new ArrayList(){{ + add(new String[]{"姹熻嫃鐪佸啘绉戦櫌", "鍗椾含"}); + add(new String[]{"姹熻嫃娌圭敯鐭虫补灞卞簞", "鎵窞"}); + add(new String[]{"姹熻嫃璀﹀畼瀛﹂櫌", "鍗椾含"}); + add(new String[]{"姹熻嫃鐪侀珮绾т笓瀹跺洯", "鍗椾含"}); + add(new String[]{"姹熻嫃娌圭敯鐭虫补灞卞簞", "鎵窞"}); + add(new String[]{"姹熻嫃璁簨鍥�", "鍗椾含"}); + add(new String[]{"姹熻嫃鍥介檯濉戝寲鍩�", "甯稿窞"}); + add(new String[]{"姹熻嫃涓囧拰鍥介檯鍟嗚锤鍩�", "甯稿窞"}); + }}); + city_DistrictNames.put("甯稿窞", new ArrayList(){{ + add(new String[]{"甯稿窞閲�", "澶╂触"}); + }}); + city_DistrictNames.put("骞夸笢", new ArrayList(){{ + add(new String[]{"骞夸笢澶栬锤骞垮満", "骞垮窞"}); + add(new String[]{"骞夸笢澶栬鑹烘湳瀛﹂櫌鏁欏笀瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢寤虹闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢鍙告硶璀﹀畼鑱屼笟瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐜繚澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍟嗕笟澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍖诲闄㈡暀甯堝鑸嶆ゼ", "涓滆帪"}); + add(new String[]{"骞夸笢鍥介檯澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佹妧鏈洃鐫e眬瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢宸ヤ笟澶у瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鏁欒偛瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪侀摱琛屽ぇ鍘�", "娣卞湷"}); + add(new String[]{"骞夸笢澶у帵", "澶╂触"}); + add(new String[]{"骞夸笢灞卞簞", "闀囨睙"}); + add(new String[]{"骞夸笢绾㈢浘澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鑽闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢闈掑勾骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鍩虹妤�", "娣卞湷"}); + add(new String[]{"骞夸笢鐪佺鎶�骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佸啘涓氱鐞嗗共閮ㄥ闄㈢ぞ鍖�", "骞垮窞"}); + add(new String[]{"骞夸笢鑺暰闆烽�告櫙", "浣涘北"}); + }}); + city_DistrictNames.put("涓滆帪", new ArrayList(){{ + add(new String[]{"涓滆帪搴勫伐鍟嗗眬瀹胯垗", "骞垮窞"}); + add(new String[]{"涓滆帪甯傚灞呰楗板煄", "涓滆帪"}); + add(new String[]{"涓滆帪闀垮畨涓囪揪骞垮満", "涓滆帪"}); + add(new String[]{"涓滆帪鍗庡崡鍥介檯姹介厤鍩�", "涓滆帪"}); + add(new String[]{"涓滆帪澶栬锤澶у帵", "娣卞湷"}); + add(new String[]{"涓滆帪瀹剁鍩�", "榛勭煶"}); + }}); + city_DistrictNames.put("婀栧寳", new ArrayList(){{ + add(new String[]{"婀栧寳灏忓尯", "鍖椾含"}); + add(new String[]{"婀栧寳瀹濅赴鑺卞洯", "娣卞湷"}); + add(new String[]{"婀栧寳缁忔祹瀛﹂櫌瀹胯垗", "姝︽眽"}); + add(new String[]{"婀栧寳澶у瀹胯垗", "姝︽眽"}); + add(new String[]{"婀栧寳鏃ユ姤瀹胯垗", "姝︽眽"}); + add(new String[]{"婀栧寳鐪佹枃鑱斿鑸�", "姝︽眽"}); + add(new String[]{"婀栧寳鐜颁唬浜旈噾鐢靛櫒鍩�", "姝︽眽"}); + add(new String[]{"婀栧寳楗簵瀹胯垗", "姝︽眽"}); + add(new String[]{"婀栧寳淇濋櫓鍏徃瀹跺睘妤�", "姝︽眽"}); + add(new String[]{"婀栧寳鏋椾笟鍕樺療闄㈠皬鍖�", "姝︽眽"}); + add(new String[]{"婀栧寳浜ら�氳亴涓氭妧鏈闄㈠鑸�", "姝︽眽"}); + add(new String[]{"婀栧寳鐪佽壓鏈鏍″鑸�", "姝︽眽"}); + add(new String[]{"婀栧寳澶у帵", "鍘﹂棬"}); + add(new String[]{"婀栧寳璐ㄩ噺鐩戠潱灞�瀹胯垗", "姝︽眽"}); + add(new String[]{"婀栧寳鐪佸尰鑽洃鐫g鐞嗗眬瀹胯垗", "姝︽眽"}); + add(new String[]{"婀栧寳鏁欒偛鍑虹増绀惧鑸�", "姝︽眽"}); + add(new String[]{"婀栧寳鐪佽嵂鏉愬叕鍙稿鑸�", "姝︽眽"}); + add(new String[]{"婀栧寳浜屽笀瀹胯垗", "姝︽眽"}); + add(new String[]{"婀栧寳涓尰瀛﹂櫌瀹胯垗", "姝︽眽"}); + add(new String[]{"婀栧寳鐪佺敓娲昏祫鏂欏叕鍙稿眳姘戝皬鍖�", "姝︽眽"}); + add(new String[]{"婀栧寳鍟嗗姟骞垮満", "姝︽眽"}); + add(new String[]{"婀栧寳鏁欒偛瀛﹂櫌瀹胯垗", "姝︽眽"}); + add(new String[]{"婀栧寳鐪佺洃鐙辩鐞嗗眬瀹胯垗", "姝︽眽"}); + add(new String[]{"婀栧寳鐪佸畨鍏ㄧ洃瀵熷眬瀹胯垗", "姝︽眽"}); + }}); + city_DistrictNames.put("榛勭煶", new ArrayList(){{ + add(new String[]{"榛勭煶澶у帵", "骞垮窞"}); + add(new String[]{"榛勭煶鑺卞洯", "骞垮窞"}); + add(new String[]{"榛勭煶鍙告硶瀛︽牎瀹胯垗", "骞垮窞"}); + add(new String[]{"榛勭煶宀皬鍖�", "娌虫簮"}); + add(new String[]{"榛勭煶娓簹鍏夋柊鏉�", "榛勭煶"}); + add(new String[]{"榛勭煶鍏洯", "榛勭煶"}); + add(new String[]{"榛勭煶娓繋瀹惧尽鍥�", "榛勭煶"}); + }}); + city_DistrictNames.put("闈掓捣", new ArrayList(){{ + add(new String[]{"闈掓捣婀栬姳鍥�", "瑗垮畞"}); + add(new String[]{"闈掓捣鍥竵鍥�", "瑗垮畞"}); + add(new String[]{"闈掓捣鍥�", "澶╂触"}); + add(new String[]{"闈掓捣澶у帵", "娣卞湷"}); + add(new String[]{"闈掓捣骞蹭紤鎵�", "鏃犻敗"}); + add(new String[]{"闈掓捣鏂版潙", "鍗楅��"}); + }}); + city_DistrictNames.put("瑗垮畞", new ArrayList(){{ + }}); + city_DistrictNames.put("灞变笢", new ArrayList(){{ + add(new String[]{"灞变笢閲�", "绉︾殗宀�"}); + add(new String[]{"灞变笢缁忔祹瀛﹂櫌瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢鐪佸崼鐢熷巺瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢鐪佹皯鏀垮巺瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢鐪佸晢涓氶泦鍥㈡�诲叕鍙稿鑸�", "娴庡崡"}); + add(new String[]{"灞变笢鍖荤澶у鏁欏笀瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢澶栬锤澶у帵", "闈掑矝"}); + add(new String[]{"灞变笢澶у帵", "娣卞湷"}); + add(new String[]{"灞变笢鍫$ぞ鍖�", "娌堥槼"}); + add(new String[]{"灞变笢鑹烘湳瀛﹂櫌瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢榛勯噾宕簯婀栭珮灏斿か鍒", "娴庡崡"}); + add(new String[]{"灞变笢鍙告硶璀﹀畼瀛﹂櫌瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢鐪佺瀛﹂櫌楂樻柊鎶�鏈爺绌跺垎闄�", "闈掑矝"}); + add(new String[]{"灞变笢寤哄伐瀛﹂櫌瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢搴欏皬鍖�", "娌堥槼"}); + add(new String[]{"灞变笢涔冲北閾舵哗娴锋櫙鎴�", "濞佹捣"}); + add(new String[]{"灞变笢澶存潙", "闈掑矝"}); + add(new String[]{"灞变笢鐪佺暅鐗у眬瀹胯垗", "娴庡崡"}); + }}); + city_DistrictNames.put("娴庡崡", new ArrayList(){{ + add(new String[]{"娴庡崡涓�涓鑸�", "娴庡崡"}); + add(new String[]{"娴庡崡鍥涘缓瀹胯垗", "娴庡崡"}); + add(new String[]{"娴庡崡楗簵瀹胯垗", "娴庡崡"}); + add(new String[]{"娴庡崡涓闄勮繎瀹胯垗", "娴庡崡"}); + add(new String[]{"娴庡崡鐏场鍘傚鑸�", "娴庡崡"}); + add(new String[]{"娴庡崡鏅埄鍟嗗姟涓績", "娴庡崡"}); + add(new String[]{"娴庡崡澶у瀹胯垗", "娴庡崡"}); + add(new String[]{"娴庡崡涓変腑鏁欏笀瀹胯垗", "娴庡崡"}); + add(new String[]{"娴庡崡涓夊缓瀹胯垗", "娴庡崡"}); + add(new String[]{"娴庡崡鍗佸洓涓鑸�", "娴庡崡"}); + add(new String[]{"娴庡崡甯傛埧绠″眬瀹胯垗", "娴庡崡"}); + add(new String[]{"娴庡崡椴佽兘棰嗙鍩�", "娴庡崡"}); + add(new String[]{"娴庡崡澶у瑗挎牎鍖洪檮杩戝鑸�", "娴庡崡"}); + add(new String[]{"娴庡崡绗節涓瀹胯垗", "娴庡崡"}); + add(new String[]{"娴庡崡鍐涘尯鎬诲尰闄㈠鑸�", "娴庡崡"}); + add(new String[]{"娴庡崡榛勯噾鑺卞洯", "娴庡崡"}); + add(new String[]{"娴庡崡鎭掑ぇ鍚嶉兘", "娴庡崡"}); + add(new String[]{"娴庡崡鎭掑ぇ缁挎床", "娴庡崡"}); + add(new String[]{"娴庡崡涓�涓闈㈠鑸�", "娴庡崡"}); + add(new String[]{"娴庡崡姹囪嫅瀹跺洯", "娴庡崡"}); + add(new String[]{"娴庡崡鐢佃骞挎挱澶у涓滄牎鍖哄鑸�", "娴庡崡"}); + add(new String[]{"娴庡崡鐜懓鍥柊鍩�", "娴庡崡"}); + add(new String[]{"娴庡崡鍐滀俊鑱旂ぞ瀹胯垗", "娴庡崡"}); + add(new String[]{"娴庡崡闊╁浗浜т笟鍩�", "娴庡崡"}); + add(new String[]{"娴庡崡澶╅┈鐩稿煄", "娴庡崡"}); + add(new String[]{"娴庡崡鎭掑ぇ甯濇櫙", "娴庡崡"}); + add(new String[]{"娴庡崡鍗庡己骞垮満", "娴庡崡"}); }}); } diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/AddressParserUtils.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/AddressParserUtils.java index 68761ef79..6cc46d57f 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/AddressParserUtils.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/AddressParserUtils.java @@ -13,7 +13,7 @@ public class AddressParserUtils { public static String filteSpecialChar(String address){ if(null != address && StringUtils.isNotBlank(address)){ - address = address.replace("#", "#").replaceAll(",", "、").replace("●", "·").replace(",", "、").replace(" ", "").replace("()", ""); + address = address.replace("锛�", "#").replaceAll("锛�", "銆�").replace("鈼�", "路").replace(",", "銆�").replace(" ", "").replace("锛堬級", ""); address = removeInvalidChar(address); } return address; @@ -22,8 +22,8 @@ public class AddressParserUtils { private static String removeInvalidChar(String s) { s = DataUtil.removeHtml(DataUtil.balanceTags(s)); s = s.replace(" ", "").replace("·", "").replace("??", "").replace("\u000b", ""); - if(s.indexOf("本段合作编辑者") > -1) { - s = StringUtils.substringBeforeLast(s, "本段合作编辑者"); + if(s.indexOf("鏈鍚堜綔缂栬緫鑰�") > -1) { + s = StringUtils.substringBeforeLast(s, "鏈鍚堜綔缂栬緫鑰�"); } s = decode(s); s = s.replace(" ", "").replace("·", "").replace("??", ""); @@ -54,7 +54,7 @@ public class AddressParserUtils { public static String filterCity(String city, String address){ if (StringUtils.isNotBlank(city) && address.indexOf(city)!=-1){ address = address.substring(city.length()); - if (address.startsWith("市")){ + if (address.startsWith("甯�")){ address = address.substring(1); } } @@ -62,11 +62,11 @@ public class AddressParserUtils { } public static String filteLoopInfo(String address){ - Map ret = findPattern(address, "[\u4E00-\u9FFF]{1}环[到|至]+[\u4E00-\u9FFF]{1}环[内|之]?间?", 0); + Map ret = findPattern(address, "[\u4E00-\u9FFF]{1}鐜痆鍒皘鑷砞+[\u4E00-\u9FFF]{1}鐜痆鍐厊涔媇?闂�?", 0); if(ret.size() ==0){ - ret = findPattern(address, "[\u4E00-\u9FFF]{1}环(以)?[内|外]", 0); + ret = findPattern(address, "[\u4E00-\u9FFF]{1}鐜�(浠�)?[鍐厊澶朷", 0); if(ret.size() == 0){ - ret = findPattern(address, "[\u4E00-\u9FFF]{1}环与[\u4E00-\u9FFF]{1,3}环线之间", 0); + ret = findPattern(address, "[\u4E00-\u9FFF]{1}鐜笌[\u4E00-\u9FFF]{1,3}鐜嚎涔嬮棿", 0); } } @@ -83,9 +83,9 @@ public class AddressParserUtils { public static String filterZhen(String address){ if(StringUtils.isNotBlank(address)){ - int index = address.indexOf("镇"); - int spIndex = address.indexOf("小镇"); - int roadIndex = address.indexOf("镇路"); + int index = address.indexOf("闀�"); + int spIndex = address.indexOf("灏忛晣"); + int roadIndex = address.indexOf("闀囪矾"); if (index > 0 && spIndex==-1 && roadIndex ==-1){ address = address.substring(index+1); } @@ -107,7 +107,7 @@ public class AddressParserUtils { } if(tempIndex > index){ String s = address.substring(tempIndex); - if(!s.startsWith("坊")){ + if(!s.startsWith("鍧�")){ index = tempIndex; keywordIndex = i; } @@ -117,7 +117,7 @@ public class AddressParserUtils { String keyword = keywords[keywordIndex]; Map loadret = findPattern(address, "("+keyword+")+\\d+",0); - if(loadret.size()==0 && keyword!="镇"){ + if(loadret.size()==0 && keyword!="闀�"){ loadret = findPattern(address, "(.*?)("+keyword+")+",0); } return loadret; @@ -132,42 +132,42 @@ public class AddressParserUtils { String s3 = null; String s1 = null; Map ret = null; -//// Map loadret = findPattern(address, "(东侧|南段|中段|以东|以西|西侧|东段)+(\\d+)?",0); +//// Map loadret = findPattern(address, "(涓滀晶|鍗楁|涓|浠ヤ笢|浠ヨタ|瑗夸晶|涓滄)+(\\d+)?",0); //// if(loadret.size()==0){ -//// loadret = findPattern(address, "(路北|街道|大道北|大道中|交界处|交界|办事处|地块|片区|大道|路|街|道|巷|组|旁|东侧|南段|中段|以东|以西|西侧|东段)+\\d+",0); +//// loadret = findPattern(address, "(璺寳|琛楅亾|澶ч亾鍖梶澶ч亾涓瓅浜ょ晫澶剕浜ょ晫|鍔炰簨澶剕鍦板潡|鐗囧尯|澶ч亾|璺瘄琛梶閬搢宸穦缁剕鏃亅涓滀晶|鍗楁|涓|浠ヤ笢|浠ヨタ|瑗夸晶|涓滄)+\\d+",0); //// } // //// if(loadret.size()==0){ -//// loadret = findPattern(address, "(.*?)(路北|街道|大道北|大道中|交界处|交界|办事处|地块|片区|大道|路|街|道|巷|组|旁|东侧|南段|中段|以东|以西|西侧|东段)+",0); +//// loadret = findPattern(address, "(.*?)(璺寳|琛楅亾|澶ч亾鍖梶澶ч亾涓瓅浜ょ晫澶剕浜ょ晫|鍔炰簨澶剕鍦板潡|鐗囧尯|澶ч亾|璺瘄琛梶閬搢宸穦缁剕鏃亅涓滀晶|鍗楁|涓|浠ヤ笢|浠ヨタ|瑗夸晶|涓滄)+",0); //// } - String[] keywords = {"东侧","南段","中段","以东","以西","西侧","东段","路北","街道","大道北","大道中","交界处","交界","办事处","地块","片区","大道","路南","路东","路北","路西","路","街","道","巷","组","旁"}; + String[] keywords = {"涓滀晶","鍗楁","涓","浠ヤ笢","浠ヨタ","瑗夸晶","涓滄","璺寳","琛楅亾","澶ч亾鍖�","澶ч亾涓�","浜ょ晫澶�","浜ょ晫","鍔炰簨澶�","鍦板潡","鐗囧尯","澶ч亾","璺崡","璺笢","璺寳","璺タ","璺�","琛�","閬�","宸�","缁�","鏃�"}; Map loadret = selectRoad(keywords, address); s1 = loadret.get("match"); if(null != s1){ s1 = address.substring(0, address.indexOf(s1)+s1.length()); s3 = address.substring(address.indexOf(s1)+s1.length()); - if(s3.startsWith("号")||s3.startsWith("-")){ - s1 = s1 + "号"; + if(s3.startsWith("鍙�")||s3.startsWith("-")){ + s1 = s1 + "鍙�"; s3 = s3.substring(1); - }else if(s3.startsWith("栋")){ - Map m = findPattern(s1, "[路北|街道|大道北|交界处|交界|办事处|地块|片区|大道|路|街|道|巷|组|旁]+(\\d+)",0); + }else if(s3.startsWith("鏍�")){ + Map m = findPattern(s1, "[璺寳|琛楅亾|澶ч亾鍖梶浜ょ晫澶剕浜ょ晫|鍔炰簨澶剕鍦板潡|鐗囧尯|澶ч亾|璺瘄琛梶閬搢宸穦缁剕鏃乚+(\\d+)",0); String num = m.get("num1"); if(StringUtils.isNotBlank(num)){ s1 = s1.substring(0, s1.indexOf(num)); s3 = num + s3; } - }else if(s3.startsWith("弄")){ - s1 = s1 + "弄"; + }else if(s3.startsWith("寮�")){ + s1 = s1 + "寮�"; s3 = s3.substring(1); - }else if(s3.startsWith("组")){ - s1 = s1 + "组"; + }else if(s3.startsWith("缁�")){ + s1 = s1 + "缁�"; s3 = s3.substring(1); }else{ Map m = findPattern(s1, ".*(\\d+)",0); String num = m.get("num1"); if(num!=null&&s1.endsWith(num)){ - s1 = s1 + "号"; + s1 = s1 + "鍙�"; } } } @@ -179,144 +179,144 @@ public class AddressParserUtils { if(s3 != null){ - if(s3.startsWith("栋")){ - ret = findPattern(s3, "栋(\\d+)层(\\d+)单元(\\d+)号", 0); + if(s3.startsWith("鏍�")){ + ret = findPattern(s3, "鏍�(\\d+)灞�(\\d+)鍗曞厓(\\d+)鍙�", 0); houseNum = ret.get("num1"); unitNum = ret.get("num3"); - }else if(findPattern(s3, "(\\d+|\\w+)[号楼|栋|幢]+(\\d+|\\w+|\\S)单元(.*?)层(\\d{1,5})号", 0).size()>0){ - ret = findPattern(s3, "(\\d+|\\w+)[号楼|栋|幢]+(\\d+|\\w+|\\S)单元(.*?)层(\\d{1,5})号", 0); + }else if(findPattern(s3, "(\\d+|\\w+)[鍙锋ゼ|鏍媩骞+(\\d+|\\w+|\\S)鍗曞厓(.*?)灞�(\\d{1,5})鍙�", 0).size()>0){ + ret = findPattern(s3, "(\\d+|\\w+)[鍙锋ゼ|鏍媩骞+(\\d+|\\w+|\\S)鍗曞厓(.*?)灞�(\\d{1,5})鍙�", 0); houseNum = ret.get("num1"); unitNum = ret.get("num2"); roomNum = ret.get("num4"); - }else if(findPattern(s3, "(\\d+|\\w+)+[号楼|栋|幢](.*?)层(\\d+|\\w+|\\S)单元(\\d{1,5})号", 0).size()>0){ - ret = findPattern(s3, "(\\d+|\\w+)[号楼|栋|幢]+(.*?)层(\\d+|\\w+|\\S)单元(\\d{1,5})号", 0); + }else if(findPattern(s3, "(\\d+|\\w+)+[鍙锋ゼ|鏍媩骞(.*?)灞�(\\d+|\\w+|\\S)鍗曞厓(\\d{1,5})鍙�", 0).size()>0){ + ret = findPattern(s3, "(\\d+|\\w+)[鍙锋ゼ|鏍媩骞+(.*?)灞�(\\d+|\\w+|\\S)鍗曞厓(\\d{1,5})鍙�", 0); houseNum = ret.get("num1"); unitNum = ret.get("num3"); roomNum = ret.get("num4"); - }else if(findPattern(s3, "(\\d+|\\w+)[号楼|幢]+(\\d+|\\w+|\\S|.*)单元(\\d+)层(西\\w{0,1}|东\\w{0,1}|南\\w{0,1}|北\\w{0,1}|\\d+)[号|户]?", 0).size()>0){ - ret = findPattern(s3, "(\\d+|\\w+)[号楼|幢]+(\\d+|\\w+|\\S|.*)单元(\\d+)层(西\\w{0,1}|东\\w{0,1}|南\\w{0,1}|北\\w{0,1}|\\d+)[号|户]?", 0); + }else if(findPattern(s3, "(\\d+|\\w+)[鍙锋ゼ|骞+(\\d+|\\w+|\\S|.*)鍗曞厓(\\d+)灞�(瑗縗\w{0,1}|涓淺\w{0,1}|鍗梊\w{0,1}|鍖梊\w{0,1}|\\d+)[鍙穦鎴穄?", 0).size()>0){ + ret = findPattern(s3, "(\\d+|\\w+)[鍙锋ゼ|骞+(\\d+|\\w+|\\S|.*)鍗曞厓(\\d+)灞�(瑗縗\w{0,1}|涓淺\w{0,1}|鍗梊\w{0,1}|鍖梊\w{0,1}|\\d+)[鍙穦鎴穄?", 0); houseNum = ret.get("num1"); unitNum = ret.get("num2"); roomNum = ret.get("num4"); - }else if(findPattern(s3, "(\\d+)[号楼|幢]+(\\d+)单元(\\d+)[号|户]", 0).size()>0){ - ret = findPattern(s3, "(\\d+)[号楼|幢]+(\\d+)单元(\\d+)[号|户]", 0); + }else if(findPattern(s3, "(\\d+)[鍙锋ゼ|骞+(\\d+)鍗曞厓(\\d+)[鍙穦鎴穄", 0).size()>0){ + ret = findPattern(s3, "(\\d+)[鍙锋ゼ|骞+(\\d+)鍗曞厓(\\d+)[鍙穦鎴穄", 0); houseNum = ret.get("num1"); unitNum = ret.get("num2"); roomNum = ret.get("num3"); - }else if(findPattern(s3, "(\\d+|\\w+)[号楼|幢]+[东|南|西|北]?(\\d+)单元(西|东|南|北|\\d+)[号|户]", 0).size()>0){ - ret = findPattern(s3, "(\\d+|\\w+)[号楼|幢]+[东|南|西|北]?(\\d+)单元(西|东|南|北|\\d+)[号|户]", 0); + }else if(findPattern(s3, "(\\d+|\\w+)[鍙锋ゼ|骞+[涓渱鍗梶瑗縷鍖梋?(\\d+)鍗曞厓(瑗縷涓渱鍗梶鍖梶\\d+)[鍙穦鎴穄", 0).size()>0){ + ret = findPattern(s3, "(\\d+|\\w+)[鍙锋ゼ|骞+[涓渱鍗梶瑗縷鍖梋?(\\d+)鍗曞厓(瑗縷涓渱鍗梶鍖梶\\d+)[鍙穦鎴穄", 0); houseNum = ret.get("num1"); unitNum = ret.get("num2"); roomNum = ret.get("num3"); - }else if(findPattern(s3, "(\\d+|\\w+)[号楼|幢]+(.*?)单元(\\d{3,5})", 0).size()>0){ - ret = findPattern(s3, "(\\d+|\\w+)[号楼|幢]+(.*?)单元(\\d{3,5})", 0); + }else if(findPattern(s3, "(\\d+|\\w+)[鍙锋ゼ|骞+(.*?)鍗曞厓(\\d{3,5})", 0).size()>0){ + ret = findPattern(s3, "(\\d+|\\w+)[鍙锋ゼ|骞+(.*?)鍗曞厓(\\d{3,5})", 0); houseNum = ret.get("num1"); unitNum = ret.get("num2"); roomNum = ret.get("num3"); - }else if(findPattern(s3, "(\\d+|\\w+)[号楼|幢]+(\\d+)层(\\d{1,5}|南|西|北|东)[号|户|室]", 0).size()>0){ - ret = findPattern(s3, "(\\d+|\\w+)[号楼|幢]+(\\d+)层(\\d{1,5}|南|西|北|东)[号|户|室]", 0); + }else if(findPattern(s3, "(\\d+|\\w+)[鍙锋ゼ|骞+(\\d+)灞�(\\d{1,5}|鍗梶瑗縷鍖梶涓�)[鍙穦鎴穦瀹", 0).size()>0){ + ret = findPattern(s3, "(\\d+|\\w+)[鍙锋ゼ|骞+(\\d+)灞�(\\d{1,5}|鍗梶瑗縷鍖梶涓�)[鍙穦鎴穦瀹", 0); houseNum = ret.get("num1"); roomNum = ret.get("num3"); - }else if(findPattern(s3, "(\\w+)[号楼|幢|栋](\\d+)层(\\d+|\\w+|\\S)单元(\\d+)号", 0).size()>0){ - ret = findPattern(s3, "(\\w+)[号楼|幢|栋](\\d+)层(\\d+|\\w+|\\S)单元(\\d+)号", 0); + }else if(findPattern(s3, "(\\w+)[鍙锋ゼ|骞鏍媇(\\d+)灞�(\\d+|\\w+|\\S)鍗曞厓(\\d+)鍙�", 0).size()>0){ + ret = findPattern(s3, "(\\w+)[鍙锋ゼ|骞鏍媇(\\d+)灞�(\\d+|\\w+|\\S)鍗曞厓(\\d+)鍙�", 0); unitNum = ret.get("num3"); roomNum = ret.get("num4"); houseNum = ret.get("num1"); - }else if(findPattern(s3, "(\\d+|\\w+)[#|幢|栋|号|#楼]+(\\d+|\\w+|\\S)单元(\\d{1,5})[室|号]", 0).size()>0){ - ret = findPattern(s3, "(\\d+|\\w+)[#|幢|栋|号|#楼]+(\\d+|\\w+|\\S)单元(\\d{1,5})[室|号]", 0); + }else if(findPattern(s3, "(\\d+|\\w+)[#|骞鏍媩鍙穦#妤糫+(\\d+|\\w+|\\S)鍗曞厓(\\d{1,5})[瀹鍙穄", 0).size()>0){ + ret = findPattern(s3, "(\\d+|\\w+)[#|骞鏍媩鍙穦#妤糫+(\\d+|\\w+|\\S)鍗曞厓(\\d{1,5})[瀹鍙穄", 0); unitNum = ret.get("num2"); roomNum = ret.get("num3"); houseNum = ret.get("num1"); - }else if(findPattern(s3, "(\\d+)幢(\\d+|\\w+)号(.*)?[室]", 0).size()>0){ - ret = findPattern(s3, "(\\d+)幢(\\d+|\\w+)号(.*)?[室]", 0); + }else if(findPattern(s3, "(\\d+)骞�(\\d+|\\w+)鍙�(.*)?[瀹", 0).size()>0){ + ret = findPattern(s3, "(\\d+)骞�(\\d+|\\w+)鍙�(.*)?[瀹", 0); houseNum = ret.get("num1"); unitNum = ret.get("num2"); roomNum = ret.get("num3"); - }else if(findPattern(s3, "(\\d+)[#|幢|-](\\d{3,5}[、|,|,]?\\d{3,5}?)?[室]", 0).size()>0){ - ret = findPattern(s3, "(\\d+)[#|幢|-](\\d{3,5}[、|,|,]?\\d{3,5}?)?[室]", 0); + }else if(findPattern(s3, "(\\d+)[#|骞-](\\d{3,5}[銆亅,|锛宂?\\d{3,5}?)?[瀹", 0).size()>0){ + ret = findPattern(s3, "(\\d+)[#|骞-](\\d{3,5}[銆亅,|锛宂?\\d{3,5}?)?[瀹", 0); houseNum = ret.get("num1"); roomNum = ret.get("num2"); - }else if(findPattern(s3, "(\\d+)[#|幢|-](\\d{3,5})[室]", 0).size()>0){ - ret = findPattern(s3, "(\\d+)[#|幢|-](\\d{3,5})[室]", 0); + }else if(findPattern(s3, "(\\d+)[#|骞-](\\d{3,5})[瀹", 0).size()>0){ + ret = findPattern(s3, "(\\d+)[#|骞-](\\d{3,5})[瀹", 0); houseNum = ret.get("num1"); roomNum = ret.get("num2"); - }else if(findPattern(s3, "(\\d+|\\w+)号(.*)?[室]", 0).size()>0){ - ret = findPattern(s3, "(\\d+|\\w+)号(.*)?[室]", 0); + }else if(findPattern(s3, "(\\d+|\\w+)鍙�(.*)?[瀹", 0).size()>0){ + ret = findPattern(s3, "(\\d+|\\w+)鍙�(.*)?[瀹", 0); houseNum = ret.get("num1"); roomNum = ret.get("num2"); - }else if(findPattern(s3, "(\\d+|\\w+)[#楼|号楼]+(\\d{3,5})", 0).size()>0){ - ret = findPattern(s3, "(\\d+|\\w+)[#楼|号楼]+(\\d{3,5})", 0); + }else if(findPattern(s3, "(\\d+|\\w+)[#妤紎鍙锋ゼ]+(\\d{3,5})", 0).size()>0){ + ret = findPattern(s3, "(\\d+|\\w+)[#妤紎鍙锋ゼ]+(\\d{3,5})", 0); houseNum = ret.get("num1"); roomNum = ret.get("num2"); - }else if(findPattern(s3, "(\\w+)[组团|组]+(\\d+)[#|幢|-](\\d{3,5})[室]?", 0).size()>0){ - ret = findPattern(s3, "(\\w+)[组团|组]+(\\d+)[#|幢|-](\\d{3,5})[室]?", 0); + }else if(findPattern(s3, "(\\w+)[缁勫洟|缁刔+(\\d+)[#|骞-](\\d{3,5})[瀹?", 0).size()>0){ + ret = findPattern(s3, "(\\w+)[缁勫洟|缁刔+(\\d+)[#|骞-](\\d{3,5})[瀹?", 0); houseNum = ret.get("num2"); roomNum = ret.get("num3"); - }else if(findPattern(s3, "(\\d+\\S{1}\\d+)[#|幢](\\d{3,5})[室]?", 0).size()>0){ - ret = findPattern(s3, "(\\d+\\S{1}\\d+)[#|幢](\\d{3,5})[室]?", 0); + }else if(findPattern(s3, "(\\d+\\S{1}\\d+)[#|骞(\\d{3,5})[瀹?", 0).size()>0){ + ret = findPattern(s3, "(\\d+\\S{1}\\d+)[#|骞(\\d{3,5})[瀹?", 0); houseNum = ret.get("num1"); roomNum = ret.get("num2"); - }else if(findPattern(s3, "(\\w+)座(\\d+)单元(\\d+)层(南|西|北|东)[号|户]", 0).size()>0){ - ret = findPattern(s3, "(\\w+)座(\\d+)单元(\\d+)层(南|西|北|东)[号|户]", 0); + }else if(findPattern(s3, "(\\w+)搴�(\\d+)鍗曞厓(\\d+)灞�(鍗梶瑗縷鍖梶涓�)[鍙穦鎴穄", 0).size()>0){ + ret = findPattern(s3, "(\\w+)搴�(\\d+)鍗曞厓(\\d+)灞�(鍗梶瑗縷鍖梶涓�)[鍙穦鎴穄", 0); houseNum = ret.get("num1"); unitNum = ret.get("num2"); roomNum = ret.get("num4"); - }else if(findPattern(s3, "(\\w+)座(\\d+)层(南|西|北|东)[号|户]", 0).size()>0){ - ret = findPattern(s3, "(\\w+)座(\\d+)层(南|西|北|东)[号|户]", 0); + }else if(findPattern(s3, "(\\w+)搴�(\\d+)灞�(鍗梶瑗縷鍖梶涓�)[鍙穦鎴穄", 0).size()>0){ + ret = findPattern(s3, "(\\w+)搴�(\\d+)灞�(鍗梶瑗縷鍖梶涓�)[鍙穦鎴穄", 0); houseNum = ret.get("num1"); roomNum = ret.get("num3"); - }else if(findPattern(s3, "(\\d+)座(\\d+|\\w+|\\S)单元", 0).size()>0){ - ret = findPattern(s3, "(\\d+)座(\\d+|\\w+|\\S)单元", 0); + }else if(findPattern(s3, "(\\d+)搴�(\\d+|\\w+|\\S)鍗曞厓", 0).size()>0){ + ret = findPattern(s3, "(\\d+)搴�(\\d+|\\w+|\\S)鍗曞厓", 0); houseNum = ret.get("num1"); unitNum = ret.get("num2"); - }else if(findPattern(s3, "(\\d+|\\w+|\\S)单元((\\d+)层\\d+)号", 0).size()>0){ - ret = findPattern(s3, "(\\d+|\\w+|\\S)单元(\\d+)层(\\d+)号", 0); + }else if(findPattern(s3, "(\\d+|\\w+|\\S)鍗曞厓((\\d+)灞俓\d+)鍙�", 0).size()>0){ + ret = findPattern(s3, "(\\d+|\\w+|\\S)鍗曞厓(\\d+)灞�(\\d+)鍙�", 0); unitNum = ret.get("num1"); roomNum = ret.get("num3"); - }else if(findPattern(s3, "(\\d+|\\w+|\\S)单元(\\d{1,5})[室|号]", 0).size()>0){ - ret = findPattern(s3, "(\\d+|\\w+|\\S)单元(\\d{1,5})[室|号]", 0); + }else if(findPattern(s3, "(\\d+|\\w+|\\S)鍗曞厓(\\d{1,5})[瀹鍙穄", 0).size()>0){ + ret = findPattern(s3, "(\\d+|\\w+|\\S)鍗曞厓(\\d{1,5})[瀹鍙穄", 0); unitNum = ret.get("num1"); roomNum = ret.get("num2"); - }else if(findPattern(s3, "(\\w+)幢(\\d+)-(\\d{3,5})[室|号]?", 0).size()>0){ - ret = findPattern(s3, "(\\w+)幢(\\d+)-(\\d{3,5})[室|号]?", 0); + }else if(findPattern(s3, "(\\w+)骞�(\\d+)-(\\d{3,5})[瀹鍙穄?", 0).size()>0){ + ret = findPattern(s3, "(\\w+)骞�(\\d+)-(\\d{3,5})[瀹鍙穄?", 0); houseNum = ret.get("num1"); unitNum = ret.get("num2"); roomNum = ret.get("num3"); - }else if(findPattern(s3, "(\\w+)幢(\\d+|\\w+|\\S)单元(.*?)室",0).size()>0){ - ret = findPattern(s3, "(\\w+)幢(\\d+|\\w+|\\S)单元(.*?)室",0); + }else if(findPattern(s3, "(\\w+)骞�(\\d+|\\w+|\\S)鍗曞厓(.*?)瀹�",0).size()>0){ + ret = findPattern(s3, "(\\w+)骞�(\\d+|\\w+|\\S)鍗曞厓(.*?)瀹�",0); unitNum = ret.get("num2"); roomNum = ret.get("num3"); houseNum = ret.get("num1"); - }else if(findPattern(s3,"(\\d+|\\w+|甲\\d+|甲-\\d+)[#|幢|栋|号](\\d{3,5}[、|,]?\\d{3,5}?)?[室]?", 0).size()>0){ - ret = findPattern(s3, "(\\d+|\\w+|甲\\d+|甲-\\d+)[#|幢|栋|号](\\d{3,5}[、|,]?\\d{3,5}?)?[室]?", 0); + }else if(findPattern(s3,"(\\d+|\\w+|鐢瞈\d+|鐢�-\\d+)[#|骞鏍媩鍙穄(\\d{3,5}[銆亅,]?\\d{3,5}?)?[瀹?", 0).size()>0){ + ret = findPattern(s3, "(\\d+|\\w+|鐢瞈\d+|鐢�-\\d+)[#|骞鏍媩鍙穄(\\d{3,5}[銆亅,]?\\d{3,5}?)?[瀹?", 0); houseNum = ret.get("num1"); roomNum = ret.get("num2"); - }else if(findPattern(s3, "(\\w+)幢(\\d{3,5}[、|,]?\\d{3,5}?)?室",0).size()>0){ - ret = findPattern(s3, "(\\w+)幢(\\d{3,5}[、|,]?\\d{3,5}?)?室",0); + }else if(findPattern(s3, "(\\w+)骞�(\\d{3,5}[銆亅,]?\\d{3,5}?)?瀹�",0).size()>0){ + ret = findPattern(s3, "(\\w+)骞�(\\d{3,5}[銆亅,]?\\d{3,5}?)?瀹�",0); houseNum = ret.get("num1"); roomNum = ret.get("num2"); - }else if(findPattern(s3, "(\\w+)幢(\\d{3,5})室",0).size()>0){ - ret = findPattern(s3, "(\\w+)幢(\\d{3,5})室",0); + }else if(findPattern(s3, "(\\w+)骞�(\\d{3,5})瀹�",0).size()>0){ + ret = findPattern(s3, "(\\w+)骞�(\\d{3,5})瀹�",0); roomNum = ret.get("num2"); houseNum = ret.get("num1"); - }else if(findPattern(s3, "(\\w+)号(.*?)室",0).size()>0){ - ret = findPattern(s3, "(\\w+)号(.*?)室",0); + }else if(findPattern(s3, "(\\w+)鍙�(.*?)瀹�",0).size()>0){ + ret = findPattern(s3, "(\\w+)鍙�(.*?)瀹�",0); roomNum = ret.get("num2"); houseNum = ret.get("num1"); - }else if(findPattern(s3, "(\\w+)[#楼|座]+(.*?)单元",0).size()>0){ - ret = findPattern(s3, "(\\w+)[#楼|座]+(.*?)单元",0); + }else if(findPattern(s3, "(\\w+)[#妤紎搴+(.*?)鍗曞厓",0).size()>0){ + ret = findPattern(s3, "(\\w+)[#妤紎搴+(.*?)鍗曞厓",0); houseNum = ret.get("num1"); unitNum = ret.get("num2"); - }else if(findPattern(s3, "(\\d+)层(\\d+|\\w+|\\S)单元(\\d+)号", 0).size()>0){ - ret = findPattern(s3, "(\\d+)层(\\d+|\\w+|\\S)单元(\\d+)号", 0); + }else if(findPattern(s3, "(\\d+)灞�(\\d+|\\w+|\\S)鍗曞厓(\\d+)鍙�", 0).size()>0){ + ret = findPattern(s3, "(\\d+)灞�(\\d+|\\w+|\\S)鍗曞厓(\\d+)鍙�", 0); unitNum = ret.get("num2"); roomNum = ret.get("num3"); - }else if(findPattern(s3, "(\\d+)层(\\d+|\\w+|\\S)单元", 0).size()>0){ - ret = findPattern(s3, "(\\d+)层(\\d+|\\w+|\\S)单元", 0); + }else if(findPattern(s3, "(\\d+)灞�(\\d+|\\w+|\\S)鍗曞厓", 0).size()>0){ + ret = findPattern(s3, "(\\d+)灞�(\\d+|\\w+|\\S)鍗曞厓", 0); unitNum = ret.get("num2"); - }else if(findPattern(s3, "(\\d+|\\w+|\\S)[单元|座]+", 0).size()>0){ - ret = findPattern(s3, "(\\d+|\\w+|\\S)[单元|座]+", 0); + }else if(findPattern(s3, "(\\d+|\\w+|\\S)[鍗曞厓|搴+", 0).size()>0){ + ret = findPattern(s3, "(\\d+|\\w+|\\S)[鍗曞厓|搴+", 0); unitNum = ret.get("num1"); }else if(findPattern(s3, "(\\w{1,3})-(\\w{1,3})-(\\d{3,5})", 0).size()>0){ ret = findPattern(s3, "(\\w{1,3})-(\\w{1,3})-(\\d{3,5})", 0); @@ -328,11 +328,11 @@ public class AddressParserUtils { ret = findPattern(s3, "(\\w{1,3})-(\\d{3,5})", 0); roomNum = ret.get("num2"); houseNum = ret.get("num1"); - }else if(findPattern(address, "(\\w{3,5}[、|,]?\\d{3,5}?)室", 0).size()>0){ - ret = findPattern(address, "(\\w{3,5}[、|,]?\\d{3,5}?)室", 0); + }else if(findPattern(address, "(\\w{3,5}[銆亅,]?\\d{3,5}?)瀹�", 0).size()>0){ + ret = findPattern(address, "(\\w{3,5}[銆亅,]?\\d{3,5}?)瀹�", 0); roomNum = ret.get("num1"); - }else if(findPattern(s3, "(\\d{3,5})室", 0).size()>0){ - ret = findPattern(s3, "(\\d{3,5})室", 0); + }else if(findPattern(s3, "(\\d{3,5})瀹�", 0).size()>0){ + ret = findPattern(s3, "(\\d{3,5})瀹�", 0); roomNum = ret.get("num1"); }else if(findPattern(s3, "(\\d{3,5})", 0).size()>0){ ret = findPattern(s3, "(\\d{3,5})", 0); @@ -347,15 +347,15 @@ public class AddressParserUtils { String s4 = ret.get("match"); if(StringUtils.isNotBlank(s4)){ String s = s3.substring(0, s3.indexOf(s4)); - if(s.indexOf("号")!=-1){ + if(s.indexOf("鍙�")!=-1){ if(s1==null){ - s1 = s.substring(0, s.indexOf("号")+1); - s2 = s.substring(s.indexOf("号")+1); + s1 = s.substring(0, s.indexOf("鍙�")+1); + s2 = s.substring(s.indexOf("鍙�")+1); } }else{ - s2 = s.replace("(", "").replace(")", ""); + s2 = s.replace("锛�", "").replace("锛�", ""); } } @@ -368,8 +368,8 @@ public class AddressParserUtils { } - if(StringUtils.isNotBlank(roomNum)&&roomNum.indexOf("室")!=-1){ - roomNum = roomNum.substring(0, roomNum.indexOf("室")); + if(StringUtils.isNotBlank(roomNum)&&roomNum.indexOf("瀹�")!=-1){ + roomNum = roomNum.substring(0, roomNum.indexOf("瀹�")); } if(StringUtils.isBlank(s1)&&StringUtils.isBlank(s2)){ @@ -419,46 +419,46 @@ public class AddressParserUtils { String floorNum = null; Map ret = null; - String[] keywords = {"东侧","西侧","南侧","北侧","南段","东段","中段","西段","五段","以东","以西","街道","大道北","大道西","大道中","交界处","交界","办事处","片区","大道","交口","夜市","对面","后面","路","街","道","巷","旁","米","镇"}; + String[] keywords = {"涓滀晶","瑗夸晶","鍗椾晶","鍖椾晶","鍗楁","涓滄","涓","瑗挎","浜旀","浠ヤ笢","浠ヨタ","琛楅亾","澶ч亾鍖�","澶ч亾瑗�","澶ч亾涓�","浜ょ晫澶�","浜ょ晫","鍔炰簨澶�","鐗囧尯","澶ч亾","浜ゅ彛","澶滃競","瀵归潰","鍚庨潰","璺�","琛�","閬�","宸�","鏃�","绫�","闀�"}; Map loadret = selectRoad(keywords, address); s1 = loadret.get("match"); int prefixIndex = 1000; if(null != s1){ - if(address.indexOf("支弄")!=-1){ - s1 = address.substring(0, address.indexOf("支弄") + 2); - s3 = address.substring(address.indexOf("支弄") + 2); + if(address.indexOf("鏀紕")!=-1){ + s1 = address.substring(0, address.indexOf("鏀紕") + 2); + s3 = address.substring(address.indexOf("鏀紕") + 2); }else{ s1 = address.substring(0, address.indexOf(s1)+s1.length()); s3 = address.substring(address.lastIndexOf(s1)+s1.length()); - if(s3.startsWith("号院")||s3.startsWith("号大院")){ - s1 = s1 + "号院"; + if(s3.startsWith("鍙烽櫌")||s3.startsWith("鍙峰ぇ闄�")){ + s1 = s1 + "鍙烽櫌"; s3 = s3.substring(2); - }else if(s3.startsWith("号")||s3.startsWith("-")){ - s1 = s1 + "号"; + }else if(s3.startsWith("鍙�")||s3.startsWith("-")){ + s1 = s1 + "鍙�"; s3 = s3.substring(1); - }else if(s3.startsWith("栋")){ - Map m = findPattern(s1, "[路北|街道|大道北|交界处|交界|办事处|地块|片区|大道|路|街|道|巷|组|旁]+(\\d+)",0); + }else if(s3.startsWith("鏍�")){ + Map m = findPattern(s1, "[璺寳|琛楅亾|澶ч亾鍖梶浜ょ晫澶剕浜ょ晫|鍔炰簨澶剕鍦板潡|鐗囧尯|澶ч亾|璺瘄琛梶閬搢宸穦缁剕鏃乚+(\\d+)",0); String num = m.get("num1"); if(StringUtils.isNotBlank(num)){ s1 = s1.substring(0, s1.indexOf(num)); s3 = num + s3; } - }else if(s3.startsWith("弄")){ - s1 = s1 + "弄"; + }else if(s3.startsWith("寮�")){ + s1 = s1 + "寮�"; s3 = s3.substring(1); - }else if(s3.startsWith("组")){ - s1 = s1 + "组"; + }else if(s3.startsWith("缁�")){ + s1 = s1 + "缁�"; s3 = s3.substring(1); - }else if(s3.startsWith("区")){ - s1 = s1 + "区"; + }else if(s3.startsWith("鍖�")){ + s1 = s1 + "鍖�"; s3 = s3.substring(1); }else{ Map m = findPattern(s1, ".*(\\d+)",0); String num = m.get("num1"); - if(!s1.endsWith("米") && num!=null && s1.endsWith(num)){ - s1 = s1 + "号"; + if(!s1.endsWith("绫�") && num!=null && s1.endsWith(num)){ + s1 = s1 + "鍙�"; } } } @@ -466,38 +466,38 @@ public class AddressParserUtils { } if(s3 == null){ - if(address.indexOf("号大院")!=-1){ - s1 = address.substring(0, address.indexOf("号大院")+3); - s3 = address.substring(address.indexOf("号大院")+3); - }else if (address.indexOf("号院")!=-1){ - s1 = address.substring(0, address.indexOf("号院")+2); - s3 = address.substring(address.indexOf("号院")+2); + if(address.indexOf("鍙峰ぇ闄�")!=-1){ + s1 = address.substring(0, address.indexOf("鍙峰ぇ闄�")+3); + s3 = address.substring(address.indexOf("鍙峰ぇ闄�")+3); + }else if (address.indexOf("鍙烽櫌")!=-1){ + s1 = address.substring(0, address.indexOf("鍙烽櫌")+2); + s3 = address.substring(address.indexOf("鍙烽櫌")+2); }else{ s3 = address; } } if(s3 != null){ - if(s3.startsWith("栋")){ - // TODO 这里好像有问题 - ret = findPattern(s3, "栋(\\d+)层(\\d+)单元(\\d+)号", 0); - houseNum = ret.get("num1"); // num1是楼层? - unitNum = ret.get("num3"); // num3是房号? + if(s3.startsWith("鏍�")){ + // TODO 杩欓噷濂藉儚鏈夐棶棰� + ret = findPattern(s3, "鏍�(\\d+)灞�(\\d+)鍗曞厓(\\d+)鍙�", 0); + houseNum = ret.get("num1"); // num1鏄ゼ灞傦紵 + unitNum = ret.get("num3"); // num3鏄埧鍙凤紵 }else{ - //栋号 + //鏍嬪彿 - // TODO ? \\w 改成\\S - if(findPattern(s3, "(\\w+|一|二|三|四|五|六|七|八|九|十)号?楼",0).size()>0){ - ret = findPattern(s3, "(\\w+|一|二|三|四|五|六|七|八|九|十)号?楼", 0); + // TODO ? \\w 鏀规垚\\S + if(findPattern(s3, "(\\w+|涓�|浜寍涓墊鍥泑浜攟鍏瓅涓億鍏珅涔潀鍗�)鍙�?妤�",0).size()>0){ + ret = findPattern(s3, "(\\w+|涓�|浜寍涓墊鍥泑浜攟鍏瓅涓億鍏珅涔潀鍗�)鍙�?妤�", 0); houseNum = ret.get("num1"); if(s3.indexOf(ret.get("match"))0){ - ret = findPattern(s3, "第(.*?)[幢|栋]", 0); + if(findPattern(s3, "绗�(.*?)[骞鏍媇",0).size()>0){ + ret = findPattern(s3, "绗�(.*?)[骞鏍媇", 0); houseNum = ret.get("num1"); if(s3.indexOf(ret.get("match"))0){ - ret = findPattern(s3, "(\\w+|一|二|三|四|五|六|七|八|九|十)[#|栋|幢|棟]+", 0); + if(findPattern(s3, "(\\w+|涓�|浜寍涓墊鍥泑浜攟鍏瓅涓億鍏珅涔潀鍗�)[#|鏍媩骞妫焆+",0).size()>0){ + ret = findPattern(s3, "(\\w+|涓�|浜寍涓墊鍥泑浜攟鍏瓅涓億鍏珅涔潀鍗�)[#|鏍媩骞妫焆+", 0); houseNum = ret.get("num1"); if(s3.indexOf(ret.get("match"))0){ - ret = findPattern(s3, "(\\d+|一|二|三|四|五|六|七|八|九|十)楼", 0); + if(findPattern(s3, "(\\d+|涓�|浜寍涓墊鍥泑浜攟鍏瓅涓億鍏珅涔潀鍗�)妤�",0).size()>0){ + ret = findPattern(s3, "(\\d+|涓�|浜寍涓墊鍥泑浜攟鍏瓅涓億鍏珅涔潀鍗�)妤�", 0); floorNum = ret.get("num1"); if(s3.indexOf(ret.get("match"))0){ - ret = findPattern(s3, "(\\w+|东|南|西|北)[室|房|户]+", 0); + //瀹ゅ彿 + if(findPattern(s3, "(\\w+|涓渱鍗梶瑗縷鍖�)[瀹鎴縷鎴穄+",0).size()>0){ + ret = findPattern(s3, "(\\w+|涓渱鍗梶瑗縷鍖�)[瀹鎴縷鎴穄+", 0); roomNum = ret.get("num1"); if(s3.indexOf(ret.get("match"))0&& StringUtils.isBlank(roomNum)){ - ret = findPattern(s3, "(\\w+)[门|梯]", 0); + if(findPattern(s3, "(\\w+)[闂▅姊痌",0).size()>0&& StringUtils.isBlank(roomNum)){ + ret = findPattern(s3, "(\\w+)[闂▅姊痌", 0); unitNum = ret.get("num1"); if(s3.indexOf(ret.get("match"))0&& StringUtils.isBlank(roomNum)){ - ret = findPattern(s3, "(\\w+)组", 0); + if(findPattern(s3, "(\\w+)缁�",0).size()>0&& StringUtils.isBlank(roomNum)){ + ret = findPattern(s3, "(\\w+)缁�", 0); if(s3.indexOf(ret.get("match"))0 ){ - ret = findPattern(s3, "(\\w+|一|二|三|四|五|六|七|八|九|十)单元", 0); + if(findPattern(s3, "(\\w+|涓�|浜寍涓墊鍥泑浜攟鍏瓅涓億鍏珅涔潀鍗�)鍗曞厓",0).size()>0 ){ + ret = findPattern(s3, "(\\w+|涓�|浜寍涓墊鍥泑浜攟鍏瓅涓億鍏珅涔潀鍗�)鍗曞厓", 0); String sNum = ret.get("num1"); if(isNumber(sNum)){ int num = Integer.parseInt(sNum); @@ -564,8 +564,8 @@ public class AddressParserUtils { prefixIndex = s3.indexOf(ret.get("match")); } } - if(findPattern(s3, "(\\w+|东|南|西|北|一|二|三|四|五|六|七|八|九|十)[幢|座]",0).size()>0){ - ret = findPattern(s3, "(\\w+|东|南|西|北|一|二|三|四|五|六|七|八|九|十)[幢|座]", 0); + if(findPattern(s3, "(\\w+|涓渱鍗梶瑗縷鍖梶涓�|浜寍涓墊鍥泑浜攟鍏瓅涓億鍏珅涔潀鍗�)[骞搴",0).size()>0){ + ret = findPattern(s3, "(\\w+|涓渱鍗梶瑗縷鍖梶涓�|浜寍涓墊鍥泑浜攟鍏瓅涓億鍏珅涔潀鍗�)[骞搴", 0); if(StringUtils.isNotBlank(houseNum)&&StringUtils.isBlank(unitNum)){ unitNum = ret.get("num1"); @@ -580,8 +580,8 @@ public class AddressParserUtils { - if(findPattern(s3, "(\\w+|一|二|三|四|五|六|七|八|九|十)层",0).size()>0){ - ret = findPattern(s3, "(\\w+|一|二|三|四|五|六|七|八|九|十)层", 0); + if(findPattern(s3, "(\\w+|涓�|浜寍涓墊鍥泑浜攟鍏瓅涓億鍏珅涔潀鍗�)灞�",0).size()>0){ + ret = findPattern(s3, "(\\w+|涓�|浜寍涓墊鍥泑浜攟鍏瓅涓億鍏珅涔潀鍗�)灞�", 0); floorNum = ret.get("num1"); if(s3.indexOf(ret.get("match"))0){ - ret = findPattern(s3, "(\\w{1,3})[-号](\\d{3,5})", 0); + }else if(findPattern(s3, "(\\w{1,3})[-鍙穄(\\d{3,5})", 0).size()>0){ + ret = findPattern(s3, "(\\w{1,3})[-鍙穄(\\d{3,5})", 0); roomNum = ret.get("num2"); if(StringUtils.isNotBlank(houseNum)){ unitNum = ret.get("num1"); @@ -611,11 +611,11 @@ public class AddressParserUtils { } } - //单元201 - if(findPattern(s3, "单元(\\w+)[^层]",0).size()>0&& StringUtils.isBlank(roomNum)){ - ret = findPattern(s3, "单元(\\w+)[^层]", 0); - roomNum = ret.get("match").replace("单元", ""); - if(!roomNum.endsWith("至") && !roomNum.endsWith("-") && !roomNum.endsWith("楼")){ + //鍗曞厓201 + if(findPattern(s3, "鍗曞厓(\\w+)[^灞俔",0).size()>0&& StringUtils.isBlank(roomNum)){ + ret = findPattern(s3, "鍗曞厓(\\w+)[^灞俔", 0); + roomNum = ret.get("match").replace("鍗曞厓", ""); + if(!roomNum.endsWith("鑷�") && !roomNum.endsWith("-") && !roomNum.endsWith("妤�")){ if(s3.indexOf(ret.get("match"))0&& s3.indexOf("办公楼")==-1&& s3.indexOf("写字楼")==-1&& StringUtils.isBlank(roomNum)){ - ret = findPattern(s3, "楼(\\w+)$", 0); - roomNum = ret.get("match").replace("楼", ""); + if(findPattern(s3, "妤�(\\w+)$",0).size()>0&& s3.indexOf("鍔炲叕妤�")==-1&& s3.indexOf("鍐欏瓧妤�")==-1&& StringUtils.isBlank(roomNum)){ + ret = findPattern(s3, "妤�(\\w+)$", 0); + roomNum = ret.get("match").replace("妤�", ""); if(s3.indexOf(ret.get("match"))0&& StringUtils.isBlank(roomNum)){ - ret = findPattern(s3, "座((\\w+)[^梯|门|层|单])?", 0); + if(findPattern(s3, "搴�((\\w+)[^姊瘄闂▅灞倈鍗昡)?",0).size()>0&& StringUtils.isBlank(roomNum)){ + ret = findPattern(s3, "搴�((\\w+)[^姊瘄闂▅灞倈鍗昡)?", 0); roomNum = ret.get("num1"); if(s3.indexOf(ret.get("match"))0 && StringUtils.isBlank(unitNum)){ - ret = findPattern(s3, "(\\w+)梯(\\d{3,5})", 0); + if(findPattern(s3, "姊�(\\d{3,5})",0).size()>0 && StringUtils.isBlank(unitNum)){ + ret = findPattern(s3, "(\\w+)姊�(\\d{3,5})", 0); if(ret.size() >0){ unitNum = ret.get("num1"); if(StringUtils.isBlank(roomNum)){ @@ -656,9 +656,9 @@ public class AddressParserUtils { } } - //层号 - if(findPattern(s3, "层(\\w+)",0).size()>0 && StringUtils.isBlank(roomNum)){ - ret = findPattern(s3, "层(\\w+)", 0); + //灞傚彿 + if(findPattern(s3, "灞�(\\w+)",0).size()>0 && StringUtils.isBlank(roomNum)){ + ret = findPattern(s3, "灞�(\\w+)", 0); roomNum = ret.get("num1"); if(s3.indexOf(ret.get("match"))0){ - ret = findPattern(s3, "(\\w+|甲\\w+)号", 0); + if(StringUtils.isNotBlank(s1) && (s1.indexOf("鍙�")!=-1||s1.endsWith("寮�")) && s3.indexOf("鍙�")!=-1 && StringUtils.isBlank(houseNum)){ + if(findPattern(s3, "(\\w+|鐢瞈\w+)鍙�",0).size()>0){ + ret = findPattern(s3, "(\\w+|鐢瞈\w+)鍙�", 0); houseNum = ret.get("num1"); if(s3.indexOf(ret.get("match"))0 && StringUtils.isBlank(houseNum)){ - ret = findPattern(s3, "(\\w+)号", 0); + if(findPattern(s3, "(\\w+)鍙�",0).size()>0 && StringUtils.isBlank(houseNum)){ + ret = findPattern(s3, "(\\w+)鍙�", 0); houseNum = ret.get("num1"); if(s3.indexOf(ret.get("match"))0){ - ret = findPattern(s3, "(\\w+)[#|栋|幢]+(\\d{3,5}|\\w+)[单元|梯|号]+", 0); + if(findPattern(s3, "(\\w+)[#|鏍媩骞+(\\d{3,5}|\\w+)[鍗曞厓|姊瘄鍙穄+",0).size()>0){ + ret = findPattern(s3, "(\\w+)[#|鏍媩骞+(\\d{3,5}|\\w+)[鍗曞厓|姊瘄鍙穄+", 0); houseNum = ret.get("num1"); unitNum = ret.get("num2"); if(s3.indexOf(ret.get("match"))0){ - ret = findPattern(s3, "(\\w+)[#|栋|幢]+(\\d{3,5}|\\w+)", 0); + }else if(findPattern(s3, "(\\w+)[#|鏍媩骞+(\\d{3,5}|\\w+)",0).size()>0){ + ret = findPattern(s3, "(\\w+)[#|鏍媩骞+(\\d{3,5}|\\w+)", 0); houseNum = ret.get("num1"); roomNum = ret.get("num2"); if(s3.indexOf(ret.get("match"))0){ - ret = findPattern(s2, "(\\w+)[号|街坊]+",0); + if(findPattern(s2, "(\\w+)[鍙穦琛楀潑]+",0).size()>0){ + ret = findPattern(s2, "(\\w+)[鍙穦琛楀潑]+",0); String match = ret.get("match"); if(StringUtils.isBlank(s1)){ s1 = s2.substring(0, s2.indexOf(match)+match.length()); @@ -723,11 +723,11 @@ public class AddressParserUtils { } if(StringUtils.isNotBlank(roomNum)){ - if(roomNum.indexOf("室")!=-1){ - roomNum = roomNum.substring(0, roomNum.indexOf("室")); + if(roomNum.indexOf("瀹�")!=-1){ + roomNum = roomNum.substring(0, roomNum.indexOf("瀹�")); } - if(roomNum.indexOf("号")!=-1){ - roomNum = roomNum.substring(0, roomNum.indexOf("号")); + if(roomNum.indexOf("鍙�")!=-1){ + roomNum = roomNum.substring(0, roomNum.indexOf("鍙�")); } } @@ -750,7 +750,7 @@ public class AddressParserUtils { if(StringUtils.isBlank(s2) && prefixIndex != 0 && StringUtils.isNotBlank(s3)){ ret = findPattern(s3, "[\u4E00-\u9FFF]+(\\w+)", 0); - if(ret.size()>0 && !ret.get("match").startsWith("号")){ + if(ret.size()>0 && !ret.get("match").startsWith("鍙�")){ String ma = ret.get("num1"); s2 = s3.substring(0, s3.indexOf(ma)); }else{ @@ -761,7 +761,7 @@ public class AddressParserUtils { s2 = filterName(s2); if(StringUtils.isNotBlank(s2)){ - s2 = s2.replace(")", "").replace("(", "").replace("【", "").replace("】", ""); + s2 = s2.replace("锛�", "").replace("锛�", "").replace("銆�", "").replace("銆�", ""); if(s2.length()<=2||s2.length()>15){ s2 = ""; } @@ -792,7 +792,7 @@ public class AddressParserUtils { public static String filterName(String s){ if(StringUtils.isNotBlank(s)){ - String[] words = {"小区","厦","期","苑","花园","家园","广场","公寓","宿舍","家属院","号院","居","阳光","城"}; + String[] words = {"灏忓尯","鍘�","鏈�","鑻�","鑺卞洯","瀹跺洯","骞垮満","鍏瘬","瀹胯垗","瀹跺睘闄�","鍙烽櫌","灞�","闃冲厜","鍩�"}; for(String word : words){ if(s.indexOf(word)!=-1){ s = s.substring(0, s.indexOf(word)+word.length()); @@ -800,7 +800,7 @@ public class AddressParserUtils { } } - String[] names = {"综合楼", "综合","之一", "之二","小区"}; + String[] names = {"缁煎悎妤�", "缁煎悎","涔嬩竴", "涔嬩簩","灏忓尯"}; for(String name : names){ if(s.equals(name)){ s = ""; @@ -879,12 +879,12 @@ public class AddressParserUtils { * @param args */ public static void main(String[] args) { - //selectUnitNum("福州市鼓楼区温泉街道树汤路60号蔚蓝雅园(原盛亚豪苑)3#楼702单元"); -// System.out.println(filteLoopInfo("南京市白下区苜蓿园东街4号06幢504室")); + //selectUnitNum("绂忓窞甯傞紦妤煎尯娓╂硥琛楅亾鏍戞堡璺�60鍙疯敋钃濋泤鍥紙鍘熺洓浜氳豹鑻戯級3#妤�702鍗曞厓"); +// System.out.println(filteLoopInfo("鍗椾含甯傜櫧涓嬪尯鑻滆摽鍥笢琛�4鍙�06骞�504瀹�")); // -// System.out.println(selectHouseNumAndRoom2(filteSpecialChar("南京市白下区苜蓿园东街4号06幢504室"))); +// System.out.println(selectHouseNumAndRoom2(filteSpecialChar("鍗椾含甯傜櫧涓嬪尯鑻滆摽鍥笢琛�4鍙�06骞�504瀹�"))); - Map ret = findPattern("栋12层5单元102号", "栋(\\d+)层(\\d+)单元(\\d+)号", 0); + Map ret = findPattern("鏍�12灞�5鍗曞厓102鍙�", "鏍�(\\d+)灞�(\\d+)鍗曞厓(\\d+)鍙�", 0); for (String k : ret.keySet()) { System.out.println(k + ": " + ret.get(k)); diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/AnalyTitleUtil.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/AnalyTitleUtil.java index cb3949f2d..7c6cc0710 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/AnalyTitleUtil.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/AnalyTitleUtil.java @@ -10,154 +10,154 @@ public class AnalyTitleUtil { // public static String getTitle(String cat) { // String name = ""; // if ("sell".equals(cat)) { -// name = "二手房总量"; +// name = "浜屾墜鎴挎�婚噺"; // } else if ("rent".equals(cat)) { -// name = "租房总量"; +// name = "绉熸埧鎬婚噺"; // } else if ("sellSuc".equals(cat)) { -// name = "二手房成功量"; +// name = "浜屾墜鎴挎垚鍔熼噺"; // } else if ("sellSave".equals(cat)) { -// name = "二手房新增量"; +// name = "浜屾墜鎴挎柊澧為噺"; // } else if ("sellUpdate".equals(cat)) { -// name = "二手房更新量"; +// name = "浜屾墜鎴挎洿鏂伴噺"; // } else if ("sellGiveUp".equals(cat)) { -// name = "二手房放弃量"; +// name = "浜屾墜鎴挎斁寮冮噺"; // } else if ("rentSuc".equals(cat)) { -// name = "租房成功量"; +// name = "绉熸埧鎴愬姛閲�"; // } else if ("rentSave".equals(cat)) { -// name = "租房新增量"; +// name = "绉熸埧鏂板閲�"; // } else if ("rentUpdate".equals(cat)) { -// name = "租房更新量"; +// name = "绉熸埧鏇存柊閲�"; // } else if ("rentGiveUp".equals(cat)) { -// name = "租房放弃量"; +// name = "绉熸埧鏀惧純閲�"; // } else if ("officeSell".equals(cat)) { -// name = "写字楼出售总量"; +// name = "鍐欏瓧妤煎嚭鍞�婚噺"; // } else if ("officeRent".equals(cat)) { -// name = "写字楼出租总量"; +// name = "鍐欏瓧妤煎嚭绉熸�婚噺"; // } else if ("shopSell".equals(cat)) { -// name = "商铺出售总量"; +// name = "鍟嗛摵鍑哄敭鎬婚噺"; // } else if ("shopRent".equals(cat)) { -// name = "商铺出租总量"; +// name = "鍟嗛摵鍑虹鎬婚噺"; // } else if ("officeSellSuc".equals(cat)) { -// name = "写字楼出售成功量"; +// name = "鍐欏瓧妤煎嚭鍞垚鍔熼噺"; // } else if ("officeSellSave".equals(cat)) { -// name = "写字楼出售新增量"; +// name = "鍐欏瓧妤煎嚭鍞柊澧為噺"; // } else if ("officeSellUpdate".equals(cat)) { -// name = "写字楼出售更新量"; +// name = "鍐欏瓧妤煎嚭鍞洿鏂伴噺"; // } else if ("officeSellGiveUp".equals(cat)) { -// name = "写字楼出售放弃量"; +// name = "鍐欏瓧妤煎嚭鍞斁寮冮噺"; // } else if ("shopSellSuc".equals(cat)) { -// name = "商铺出售成功量"; +// name = "鍟嗛摵鍑哄敭鎴愬姛閲�"; // } else if ("shopSellSave".equals(cat)) { -// name = "商铺出售新增量"; +// name = "鍟嗛摵鍑哄敭鏂板閲�"; // } else if ("shopSellUpdate".equals(cat)) { -// name = "商铺出售更新量"; +// name = "鍟嗛摵鍑哄敭鏇存柊閲�"; // } else if ("shopSellGiveUp".equals(cat)) { -// name = "商铺出售放弃量"; +// name = "鍟嗛摵鍑哄敭鏀惧純閲�"; // } else if ("officeRentSuc".equals(cat)) { -// name = "写字楼出租成功量"; +// name = "鍐欏瓧妤煎嚭绉熸垚鍔熼噺"; // } else if ("officeRentSave".equals(cat)) { -// name = "写字楼出租新增量"; +// name = "鍐欏瓧妤煎嚭绉熸柊澧為噺"; // } else if ("officeRentUpdate".equals(cat)) { -// name = "写字楼出租更新量"; +// name = "鍐欏瓧妤煎嚭绉熸洿鏂伴噺"; // } else if ("officeRentGiveUp".equals(cat)) { -// name = "写字楼出租放弃量"; +// name = "鍐欏瓧妤煎嚭绉熸斁寮冮噺"; // } else if ("shopRentSuc".equals(cat)) { -// name = "商铺出租成功量"; +// name = "鍟嗛摵鍑虹鎴愬姛閲�"; // } else if ("shopRentSave".equals(cat)) { -// name = "商铺出租新增量"; +// name = "鍟嗛摵鍑虹鏂板閲�"; // } else if ("shopRentUpdate".equals(cat)) { -// name = "商铺出租更新量"; +// name = "鍟嗛摵鍑虹鏇存柊閲�"; // } else if ("shopRentGiveUp".equals(cat)) { -// name = "商铺出租放弃量"; +// name = "鍟嗛摵鍑虹鏀惧純閲�"; // } else if ("sellFail".equals(cat)) { -// name = "二手房错误总量"; +// name = "浜屾墜鎴块敊璇�婚噺"; // } else if ("sellError".equals(cat)) { -// name = "二手房解析错误量"; +// name = "浜屾墜鎴胯В鏋愰敊璇噺"; // } else if ("sellFilter".equals(cat)) { -// name = "二手房规则过滤量"; +// name = "浜屾墜鎴胯鍒欒繃婊ら噺"; // } else if ("rentFail".equals(cat)) { -// name = "租房错误总量"; +// name = "绉熸埧閿欒鎬婚噺"; // } else if ("rentError".equals(cat)) { -// name = "租房解析错误量"; +// name = "绉熸埧瑙f瀽閿欒閲�"; // } else if ("rentFilter".equals(cat)) { -// name = "租房规则过滤量"; +// name = "绉熸埧瑙勫垯杩囨护閲�"; // } else if ("officeSellFail".equals(cat)) { -// name = "写字楼出售错误总量"; +// name = "鍐欏瓧妤煎嚭鍞敊璇�婚噺"; // } else if ("officeSellError".equals(cat)) { -// name = "写字楼出售解析错误量"; +// name = "鍐欏瓧妤煎嚭鍞В鏋愰敊璇噺"; // } else if ("officeSellFilter".equals(cat)) { -// name = "写字楼出售规则过滤量"; +// name = "鍐欏瓧妤煎嚭鍞鍒欒繃婊ら噺"; // } else if ("shopSellFail".equals(cat)) { -// name = "商铺出售错误总量"; +// name = "鍟嗛摵鍑哄敭閿欒鎬婚噺"; // } else if ("shopSellError".equals(cat)) { -// name = "商铺出售解析错误量"; +// name = "鍟嗛摵鍑哄敭瑙f瀽閿欒閲�"; // } else if ("shopSellFilter".equals(cat)) { -// name = "商铺出售规则过滤量"; +// name = "鍟嗛摵鍑哄敭瑙勫垯杩囨护閲�"; // } else if ("officeRentFail".equals(cat)) { -// name = "写字楼出租错误总量"; +// name = "鍐欏瓧妤煎嚭绉熼敊璇�婚噺"; // } else if ("officeRentError".equals(cat)) { -// name = "写字楼出租解析错误量"; +// name = "鍐欏瓧妤煎嚭绉熻В鏋愰敊璇噺"; // } else if ("officeRentFilter".equals(cat)) { -// name = "写字楼出租规则过滤量"; +// name = "鍐欏瓧妤煎嚭绉熻鍒欒繃婊ら噺"; // } else if ("shopRentFail".equals(cat)) { -// name = "商铺出租错误总量"; +// name = "鍟嗛摵鍑虹閿欒鎬婚噺"; // } else if ("shopRentError".equals(cat)) { -// name = "商铺出租解析错误量"; +// name = "鍟嗛摵鍑虹瑙f瀽閿欒閲�"; // } else if ("shopRentFilter".equals(cat)) { -// name = "商铺出租规则过滤量"; +// name = "鍟嗛摵鍑虹瑙勫垯杩囨护閲�"; // } // return name; // } static { - TITLE_MAP.put("sell", "二手房总量"); - TITLE_MAP.put("rent", "租房总量"); - TITLE_MAP.put("sellSuc", "二手房成功量"); - TITLE_MAP.put("sellSave", "二手房新增量"); - TITLE_MAP.put("sellUpdate", "二手房更新量"); - TITLE_MAP.put("sellGiveUp", "二手房放弃量"); - TITLE_MAP.put("rentSuc", "租房成功量"); - TITLE_MAP.put("rentSave", "租房新增量"); - TITLE_MAP.put("rentUpdate", "租房更新量"); - TITLE_MAP.put("rentGiveUp", "租房放弃量"); - TITLE_MAP.put("officeSell", "写字楼出售总量"); - TITLE_MAP.put("officeRent", "写字楼出租总量"); - TITLE_MAP.put("shopSell", "商铺出售总量"); - TITLE_MAP.put("shopRent", "商铺出租总量"); - TITLE_MAP.put("officeSellSuc", "写字楼出售成功量"); - TITLE_MAP.put("officeSellSave", "写字楼出售新增量"); - TITLE_MAP.put("officeSellUpdate", "写字楼出售更新量"); - TITLE_MAP.put("officeSellGiveUp", "写字楼出售放弃量"); - TITLE_MAP.put("shopSellSuc", "商铺出售成功量"); - TITLE_MAP.put("shopSellSave", "商铺出售新增量"); - TITLE_MAP.put("shopSellUpdate", "商铺出售更新量"); - TITLE_MAP.put("shopSellGiveUp", "商铺出售放弃量"); - TITLE_MAP.put("officeRentSuc", "写字楼出租成功量"); - TITLE_MAP.put("officeRentSave", "写字楼出租新增量"); - TITLE_MAP.put("officeRentUpdate", "写字楼出租更新量"); - TITLE_MAP.put("officeRentGiveUp", "写字楼出租放弃量"); - TITLE_MAP.put("shopRentSuc", "商铺出租成功量"); - TITLE_MAP.put("shopRentSave", "商铺出租新增量"); - TITLE_MAP.put("shopRentUpdate", "商铺出租更新量"); - TITLE_MAP.put("shopRentGiveUp", "商铺出租放弃量"); - TITLE_MAP.put("sellFail", "二手房错误总量"); - TITLE_MAP.put("sellError", "二手房解析错误量"); - TITLE_MAP.put("sellFilter", "二手房规则过滤量"); - TITLE_MAP.put("rentFail", "租房错误总量"); - TITLE_MAP.put("rentError", "租房解析错误量"); - TITLE_MAP.put("rentFilter", "租房规则过滤量"); - TITLE_MAP.put("officeSellFail", "写字楼出售错误总量"); - TITLE_MAP.put("officeSellError", "写字楼出售解析错误量"); - TITLE_MAP.put("officeSellFilter", "写字楼出售规则过滤量"); - TITLE_MAP.put("shopSellFail", "商铺出售错误总量"); - TITLE_MAP.put("shopSellError", "商铺出售解析错误量"); - TITLE_MAP.put("shopSellFilter", "商铺出售规则过滤量"); - TITLE_MAP.put("officeRentFail", "写字楼出租错误总量"); - TITLE_MAP.put("officeRentError", "写字楼出租解析错误量"); - TITLE_MAP.put("officeRentFilter", "写字楼出租规则过滤量"); - TITLE_MAP.put("shopRentFail", "商铺出租错误总量"); - TITLE_MAP.put("shopRentError", "商铺出租解析错误量"); - TITLE_MAP.put("shopRentFilter", "商铺出租规则过滤量"); + TITLE_MAP.put("sell", "浜屾墜鎴挎�婚噺"); + TITLE_MAP.put("rent", "绉熸埧鎬婚噺"); + TITLE_MAP.put("sellSuc", "浜屾墜鎴挎垚鍔熼噺"); + TITLE_MAP.put("sellSave", "浜屾墜鎴挎柊澧為噺"); + TITLE_MAP.put("sellUpdate", "浜屾墜鎴挎洿鏂伴噺"); + TITLE_MAP.put("sellGiveUp", "浜屾墜鎴挎斁寮冮噺"); + TITLE_MAP.put("rentSuc", "绉熸埧鎴愬姛閲�"); + TITLE_MAP.put("rentSave", "绉熸埧鏂板閲�"); + TITLE_MAP.put("rentUpdate", "绉熸埧鏇存柊閲�"); + TITLE_MAP.put("rentGiveUp", "绉熸埧鏀惧純閲�"); + TITLE_MAP.put("officeSell", "鍐欏瓧妤煎嚭鍞�婚噺"); + TITLE_MAP.put("officeRent", "鍐欏瓧妤煎嚭绉熸�婚噺"); + TITLE_MAP.put("shopSell", "鍟嗛摵鍑哄敭鎬婚噺"); + TITLE_MAP.put("shopRent", "鍟嗛摵鍑虹鎬婚噺"); + TITLE_MAP.put("officeSellSuc", "鍐欏瓧妤煎嚭鍞垚鍔熼噺"); + TITLE_MAP.put("officeSellSave", "鍐欏瓧妤煎嚭鍞柊澧為噺"); + TITLE_MAP.put("officeSellUpdate", "鍐欏瓧妤煎嚭鍞洿鏂伴噺"); + TITLE_MAP.put("officeSellGiveUp", "鍐欏瓧妤煎嚭鍞斁寮冮噺"); + TITLE_MAP.put("shopSellSuc", "鍟嗛摵鍑哄敭鎴愬姛閲�"); + TITLE_MAP.put("shopSellSave", "鍟嗛摵鍑哄敭鏂板閲�"); + TITLE_MAP.put("shopSellUpdate", "鍟嗛摵鍑哄敭鏇存柊閲�"); + TITLE_MAP.put("shopSellGiveUp", "鍟嗛摵鍑哄敭鏀惧純閲�"); + TITLE_MAP.put("officeRentSuc", "鍐欏瓧妤煎嚭绉熸垚鍔熼噺"); + TITLE_MAP.put("officeRentSave", "鍐欏瓧妤煎嚭绉熸柊澧為噺"); + TITLE_MAP.put("officeRentUpdate", "鍐欏瓧妤煎嚭绉熸洿鏂伴噺"); + TITLE_MAP.put("officeRentGiveUp", "鍐欏瓧妤煎嚭绉熸斁寮冮噺"); + TITLE_MAP.put("shopRentSuc", "鍟嗛摵鍑虹鎴愬姛閲�"); + TITLE_MAP.put("shopRentSave", "鍟嗛摵鍑虹鏂板閲�"); + TITLE_MAP.put("shopRentUpdate", "鍟嗛摵鍑虹鏇存柊閲�"); + TITLE_MAP.put("shopRentGiveUp", "鍟嗛摵鍑虹鏀惧純閲�"); + TITLE_MAP.put("sellFail", "浜屾墜鎴块敊璇�婚噺"); + TITLE_MAP.put("sellError", "浜屾墜鎴胯В鏋愰敊璇噺"); + TITLE_MAP.put("sellFilter", "浜屾墜鎴胯鍒欒繃婊ら噺"); + TITLE_MAP.put("rentFail", "绉熸埧閿欒鎬婚噺"); + TITLE_MAP.put("rentError", "绉熸埧瑙f瀽閿欒閲�"); + TITLE_MAP.put("rentFilter", "绉熸埧瑙勫垯杩囨护閲�"); + TITLE_MAP.put("officeSellFail", "鍐欏瓧妤煎嚭鍞敊璇�婚噺"); + TITLE_MAP.put("officeSellError", "鍐欏瓧妤煎嚭鍞В鏋愰敊璇噺"); + TITLE_MAP.put("officeSellFilter", "鍐欏瓧妤煎嚭鍞鍒欒繃婊ら噺"); + TITLE_MAP.put("shopSellFail", "鍟嗛摵鍑哄敭閿欒鎬婚噺"); + TITLE_MAP.put("shopSellError", "鍟嗛摵鍑哄敭瑙f瀽閿欒閲�"); + TITLE_MAP.put("shopSellFilter", "鍟嗛摵鍑哄敭瑙勫垯杩囨护閲�"); + TITLE_MAP.put("officeRentFail", "鍐欏瓧妤煎嚭绉熼敊璇�婚噺"); + TITLE_MAP.put("officeRentError", "鍐欏瓧妤煎嚭绉熻В鏋愰敊璇噺"); + TITLE_MAP.put("officeRentFilter", "鍐欏瓧妤煎嚭绉熻鍒欒繃婊ら噺"); + TITLE_MAP.put("shopRentFail", "鍟嗛摵鍑虹閿欒鎬婚噺"); + TITLE_MAP.put("shopRentError", "鍟嗛摵鍑虹瑙f瀽閿欒閲�"); + TITLE_MAP.put("shopRentFilter", "鍟嗛摵鍑虹瑙勫垯杩囨护閲�"); } } diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/AnalyticsUtil.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/AnalyticsUtil.java index 599b74683..c921712d0 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/AnalyticsUtil.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/AnalyticsUtil.java @@ -17,7 +17,7 @@ public class AnalyticsUtil { private static final Logger LOG = Logger.getLogger(AnalyticsUtil.class.getPackage().getName()); /** - * 增加跟踪信息数据 + * 澧炲姞璺熻釜淇℃伅鏁版嵁 * * @param key * @param value @@ -40,7 +40,7 @@ public class AnalyticsUtil { } /** - * 在通过Apache,Squid等反向代理软件时获得用户的真实IP. + * 鍦ㄩ�氳繃Apache,Squid绛夊弽鍚戜唬鐞嗚蒋浠舵椂鑾峰緱鐢ㄦ埛鐨勭湡瀹濱P. * * @param request * @return @@ -83,7 +83,7 @@ public class AnalyticsUtil { } /** - * 是否是需要被忽略的IP + * 鏄惁鏄渶瑕佽蹇界暐鐨処P * @param request * @return */ @@ -96,7 +96,7 @@ public class AnalyticsUtil { } /** - * 得到本地机器名 + * 寰楀埌鏈湴鏈哄櫒鍚� * * @return */ @@ -113,7 +113,7 @@ public class AnalyticsUtil { } /** - * 获取参数对应的Cookie值 + * 鑾峰彇鍙傛暟瀵瑰簲鐨凜ookie鍊� * * @param httpRequest * @param parameter @@ -156,7 +156,7 @@ public class AnalyticsUtil { } /** - * 得到编码过的URI 把URI从iso-8859-1转换成UTF-8 + * 寰楀埌缂栫爜杩囩殑URI 鎶奤RI浠巌so-8859-1杞崲鎴怳TF-8 * * @param uri * @return diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/AsyncThread.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/AsyncThread.java index 5a142b1b2..2994d1ab0 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/AsyncThread.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/AsyncThread.java @@ -4,7 +4,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * 异步运行线程 + * 寮傛杩愯绾跨▼ * * @author xiaoyu * diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/AvmUrls.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/AvmUrls.java index 58a46b2bf..c6116cf58 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/AvmUrls.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/AvmUrls.java @@ -2,13 +2,13 @@ package com.fangjia.core.util; public class AvmUrls { /** - * 商铺出售评估及样例房源 + * 鍟嗛摵鍑哄敭璇勪及鍙婃牱渚嬫埧婧� */ public static final String SHOPSELL_EVALUATE = "/avmWeb/shopSell"; /** - * 商铺出租评估及样例房源 + * 鍟嗛摵鍑虹璇勪及鍙婃牱渚嬫埧婧� */ public static final String SHOPRENT_EVALUATE = "/avmWeb/shopRent"; diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/BaiDuApiUtils.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/BaiDuApiUtils.java index 354e4c4ff..b6f525560 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/BaiDuApiUtils.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/BaiDuApiUtils.java @@ -8,7 +8,7 @@ import java.net.URLEncoder; import java.util.*; /** - * 百度API服务调用工具类 + * 鐧惧害API鏈嶅姟璋冪敤宸ュ叿绫� * Created by wenyan on 2015/4/15. */ public class BaiDuApiUtils { @@ -27,13 +27,13 @@ public class BaiDuApiUtils { /** - * 区域检索POI服务 - * @param region 城市或者区域 - * @param query 检索关键字 - * @param tag 标签项 例如:住宅区,小区,别墅,别墅,写字楼 - * @param scope 检索结果详细程度 1:基本信息 2:详细信息 - * @param pageSize 每页最大记录数 - * @param pageNum 分页页码 0 1 2 ... + * 鍖哄煙妫�绱OI鏈嶅姟 + * @param region 鍩庡競鎴栬�呭尯鍩� + * @param query 妫�绱㈠叧閿瓧 + * @param tag 鏍囩椤� 渚嬪:浣忓畢鍖�,灏忓尯,鍒,鍒,鍐欏瓧妤� + * @param scope 妫�绱㈢粨鏋滆缁嗙▼搴� 1:鍩烘湰淇℃伅 2:璇︾粏淇℃伅 + * @param pageSize 姣忛〉鏈�澶ц褰曟暟 + * @param pageNum 鍒嗛〉椤电爜 0 1 2 ... * @return */ public static JSONObject search(String region,String query,String tag ,int scope,Integer pageSize,Integer pageNum){ @@ -99,7 +99,7 @@ public class BaiDuApiUtils { /** - * 提供从地址到经纬度坐标或者从经纬度坐标到地址的转换服务 + * 鎻愪緵浠庡湴鍧�鍒扮粡绾害鍧愭爣鎴栬�呬粠缁忕含搴﹀潗鏍囧埌鍦板潃鐨勮浆鎹㈡湇鍔� * @param location * @param address * @return @@ -164,7 +164,7 @@ public class BaiDuApiUtils { } /** - * 获取该城市范围内经纬度所在的区域 + * 鑾峰彇璇ュ煄甯傝寖鍥村唴缁忕含搴︽墍鍦ㄧ殑鍖哄煙 * @param city * @param lng * @param lat @@ -189,7 +189,7 @@ public class BaiDuApiUtils { } /** - * 获取经纬度所在的城市 + * 鑾峰彇缁忕含搴︽墍鍦ㄧ殑鍩庡競 * @param lng * @param lat * @return @@ -201,7 +201,7 @@ public class BaiDuApiUtils { if(geoResult.containsKey("addressComponent")){ String city = geoResult.getJSONObject("addressComponent").getString("city"); if(StringUtils.isNotBlank(city)) { - if(city.endsWith("市")) { + if(city.endsWith("甯�")) { return city.substring(0, city.length() - 1); }else { return city; @@ -274,7 +274,7 @@ public class BaiDuApiUtils { } return json.getJSONArray("result").getJSONObject(0); }catch (Exception e){ - System.out.println("错误:"+result); + System.out.println("閿欒:"+result); e.printStackTrace(); } return null; @@ -343,14 +343,14 @@ public class BaiDuApiUtils { public synchronized static void changeAK(){ if(!HAS_AVAILABLE_AK){ - throw new RuntimeException("无可用百度AK"); + throw new RuntimeException("鏃犲彲鐢ㄧ櫨搴K"); } - System.out.println("更换AK"); + System.out.println("鏇存崲AK"); for(int i = 0 ;i < AKS.length; i++){ if(i == AKS.length - 1){ AK = AKS[0]; HAS_AVAILABLE_AK = false; - throw new RuntimeException("无可用百度AK"); + throw new RuntimeException("鏃犲彲鐢ㄧ櫨搴K"); }else{ if(AK.equals(AKS[i])){ AK = AKS[i + 1]; @@ -415,10 +415,10 @@ public class BaiDuApiUtils { public static void main(String[] args) { -// System.out.println(getRegionByGeo("上海",121.43163,31.341042)); -// System.out.println(getRegionByGeo("北京",121.402336,31.254335)); -// System.out.println(geocode("北京", "方恒国际中心A座").toString()); -// System.out.println(geocoder(null, "上海市辖区场北张异宅15号")); +// System.out.println(getRegionByGeo("涓婃捣",121.43163,31.341042)); +// System.out.println(getRegionByGeo("鍖椾含",121.402336,31.254335)); +// System.out.println(geocode("鍖椾含", "鏂规亽鍥介檯涓績A搴�").toString()); +// System.out.println(geocoder(null, "涓婃捣甯傝緰鍖哄満鍖楀紶寮傚畢15鍙�")); // System.out.println(getCityByGeo(118.36335,34.04937)); System.out.println(getAddressByKeyword(34.04937,118.36335)); } diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/BeanUtils.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/BeanUtils.java index 8f058fa1b..21eca16dd 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/BeanUtils.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/BeanUtils.java @@ -14,9 +14,9 @@ public class BeanUtils { private final static Logger LOGGER = LoggerFactory.getLogger(BeanUtils.class); /** - * 复制 source 属性 到 target + * 澶嶅埗 source 灞炴�� 鍒� target * - * 数据类型 参数名 不同 忽略 + * 鏁版嵁绫诲瀷 鍙傛暟鍚� 涓嶅悓 蹇界暐 * * @param model * @return @@ -52,7 +52,7 @@ public class BeanUtils { } /** - * 复制JSON对象属性到target + * 澶嶅埗JSON瀵硅薄灞炴�у埌target * * @param source * @param target diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/BloomFilter.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/BloomFilter.java index 82cb07415..bf3e0a78d 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/BloomFilter.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/BloomFilter.java @@ -13,7 +13,7 @@ import com.fangjia.core.util.AsyncThread.Call; /** - * 布隆过滤器 + * 甯冮殕杩囨护鍣� * * @author xiaoyu * @@ -34,7 +34,7 @@ public class BloomFilter { e.printStackTrace(); } - // 每隔一分钟保存 + // 姣忛殧涓�鍒嗛挓淇濆瓨 new AsyncThread(30 * 1000, new Call() { public void invoke() { saveBit(); @@ -131,7 +131,7 @@ public class BloomFilter { bits = (BitSet) ois.readObject(); ois.close(); - // 合并文件中已有的记录和新记录 + // 鍚堝苟鏂囦欢涓凡鏈夌殑璁板綍鍜屾柊璁板綍 this.bits.or(bits); } catch (IOException e) { throw e; diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/CNNMFilter.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/CNNMFilter.java index 63cb9e143..e5891b41d 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/CNNMFilter.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/CNNMFilter.java @@ -13,16 +13,16 @@ import java.util.regex.Pattern; public class CNNMFilter { private static final Character[] CN_NUMERIC = { - '一', '二', '三', '四', '五', '六', '七', '八', '九', - '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖', - '十', '百', '千', '拾', '佰', '仟', '万', '亿', '○', 'O', '零'}; + '涓�', '浜�', '涓�', '鍥�', '浜�', '鍏�', '涓�', '鍏�', '涔�', + '澹�', '璐�', '鍙�', '鑲�', '浼�', '闄�', '鏌�', '鎹�', '鐜�', + '鍗�', '鐧�', '鍗�', '鎷�', '浣�', '浠�', '涓�', '浜�', '鈼�', '锛�', '闆�'}; private static final List CM_NUMERICS = Arrays.asList(CN_NUMERIC); private static Map cnNumeric = null; - private static final String[] digits = new String[]{"零", "一", "二", "三", "四", "五", "六", "七", "八", "九"}; - private static final String[] radices = new String[]{"", "十", "百", "千"}; - private static final String[] bigRadices = new String[]{"", "万", "亿", "万"}; + private static final String[] digits = new String[]{"闆�", "涓�", "浜�", "涓�", "鍥�", "浜�", "鍏�", "涓�", "鍏�", "涔�"}; + private static final String[] radices = new String[]{"", "鍗�", "鐧�", "鍗�"}; + private static final String[] bigRadices = new String[]{"", "涓�", "浜�", "涓�"}; private static final Pattern NUMERIC_PATTERN = Pattern.compile("\\d+(\\.\\d+)?"); @@ -32,33 +32,33 @@ public class CNNMFilter { cnNumeric.put(CN_NUMERIC[j], j + 1); for (int j = 9; j < 18; j++) cnNumeric.put(CN_NUMERIC[j], j - 8); - cnNumeric.put('两', 2); - cnNumeric.put('十', 10); - cnNumeric.put('拾', 10); - cnNumeric.put('百', 100); - cnNumeric.put('佰', 100); - cnNumeric.put('千', 1000); - cnNumeric.put('仟', 1000); - cnNumeric.put('万', 10000); - cnNumeric.put('亿', 100000000); + cnNumeric.put('涓�', 2); + cnNumeric.put('鍗�', 10); + cnNumeric.put('鎷�', 10); + cnNumeric.put('鐧�', 100); + cnNumeric.put('浣�', 100); + cnNumeric.put('鍗�', 1000); + cnNumeric.put('浠�', 1000); + cnNumeric.put('涓�', 10000); + cnNumeric.put('浜�', 100000000); } public static String convert(String currencyDigits) { if(currencyDigits.length() > 11){ return currencyDigits; } - String integral; // 整数部分 - String decimal; // 小数部分 - String outputCharacters; // 最终转换输出结果 + String integral; // 鏁存暟閮ㄥ垎 + String decimal; // 灏忔暟閮ㄥ垎 + String outputCharacters; // 鏈�缁堣浆鎹㈣緭鍑虹粨鏋� String d; int zeroCount = 0, p = 0, quotient = 0, modulus = 0; - currencyDigits = currencyDigits.replace("/,/g", ""); // 删除数字中的逗号, - currencyDigits = currencyDigits.replace("/^0+/", ""); // 删除数字左边的0 - String[] parts = currencyDigits.split("\\."); // 拆分数字中的整数与小数部分 + currencyDigits = currencyDigits.replace("/,/g", ""); // 鍒犻櫎鏁板瓧涓殑閫楀彿, + currencyDigits = currencyDigits.replace("/^0+/", ""); // 鍒犻櫎鏁板瓧宸﹁竟鐨�0 + String[] parts = currencyDigits.split("\\."); // 鎷嗗垎鏁板瓧涓殑鏁存暟涓庡皬鏁伴儴鍒� if (parts.length > 1) { integral = parts[0]; decimal = parts[1]; - if (decimal.length() > 2) { // 如果小数部分长度大于2,四舍五入,保留两位小数 + if (decimal.length() > 2) { // 濡傛灉灏忔暟閮ㄥ垎闀垮害澶т簬2锛屽洓鑸嶄簲鍏ワ紝淇濈暀涓や綅灏忔暟 long dd = Math.round(Double.parseDouble("0." + decimal) * 100); decimal = Long.toString(dd); } @@ -85,7 +85,7 @@ public class CNNMFilter { } } if (Double.parseDouble(decimal) > 0) for (int i = 0; i < decimal.length(); i++) d = decimal.substring(i, i + 1); - if(outputCharacters.startsWith("一十")) { + if(outputCharacters.startsWith("涓�鍗�")) { outputCharacters = outputCharacters.substring(1); } return outputCharacters; @@ -129,12 +129,12 @@ public class CNNMFilter { if (cnn.length() == 1) return isCNNumeric(cnn.charAt(0)); - if (flag) cnn = cnn.replace('佰', '百') - .replace('仟', '千').replace('拾', '十').replace('零', ' '); + if (flag) cnn = cnn.replace('浣�', '鐧�') + .replace('浠�', '鍗�').replace('鎷�', '鍗�').replace('闆�', ' '); //System.out.println(cnn); int yi = -1, wan = -1, qian = -1, bai = -1, shi = -1; int val = 0; - yi = cnn.lastIndexOf('亿'); + yi = cnn.lastIndexOf('浜�'); if (yi > -1) { val += cnNumericToArabic(cnn.substring(0, yi), false) * 100000000; if (yi < cnn.length() - 1) @@ -150,7 +150,7 @@ public class CNNMFilter { } } - wan = cnn.lastIndexOf('万'); + wan = cnn.lastIndexOf('涓�'); if (wan > -1) { val += cnNumericToArabic(cnn.substring(0, wan), false) * 10000; if (wan < cnn.length() - 1) @@ -165,7 +165,7 @@ public class CNNMFilter { } } - qian = cnn.lastIndexOf('千'); + qian = cnn.lastIndexOf('鍗�'); if (qian > -1) { val += cnNumericToArabic(cnn.substring(0, qian), false) * 1000; if (qian < cnn.length() - 1) @@ -180,7 +180,7 @@ public class CNNMFilter { } } - bai = cnn.lastIndexOf('百'); + bai = cnn.lastIndexOf('鐧�'); if (bai > -1) { val += cnNumericToArabic(cnn.substring(0, bai), false) * 100; if (bai < cnn.length() - 1) @@ -195,7 +195,7 @@ public class CNNMFilter { } } - shi = cnn.lastIndexOf('十'); + shi = cnn.lastIndexOf('鍗�'); if (shi > -1) { if (shi == 0) val += 1 * 10; @@ -243,8 +243,8 @@ public class CNNMFilter { } public static void main(String[] args) { - System.out.println(convertCnNumber("1111-156号")); - System.out.println(convertArabicToCnNumeric("申滨路1051弄1-156号")); + System.out.println(convertCnNumber("1111-156鍙�")); + System.out.println(convertArabicToCnNumeric("鐢虫花璺�1051寮�1-156鍙�")); } public static int qCNNumericToArabic(String cnn) { diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/CacheUtils.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/CacheUtils.java index a6009d5ce..4f75b6849 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/CacheUtils.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/CacheUtils.java @@ -20,7 +20,7 @@ import com.google.common.base.Function; import com.google.common.collect.MapMaker; /** - * 主要使用如下两个方法对cache进行处理 public static Object getValue(CachePolicyEnum + * 涓昏浣跨敤濡備笅涓や釜鏂规硶瀵筩ache杩涜澶勭悊 public static Object getValue(CachePolicyEnum * cachePolicy, Class keyClass, String extraKey)
* public static boolean putValue(CachePolicyEnum cachePolicy, Class keyClass, * String extraKey, Object value) @@ -81,7 +81,7 @@ public class CacheUtils { } /** - * 见 {@link #getValue(Class, Collection, CachePolicyEnum, Closure)}方法 + * 瑙� {@link #getValue(Class, Collection, CachePolicyEnum, Closure)}鏂规硶 * * @param * @param @@ -198,25 +198,25 @@ public class CacheUtils { } /** - * 根据region和keyList批量从缓存中取数据。
- * 对于缓存中不存在的key,会调用closure的execute方法来生成数据并放入缓存中,execute方法的参数是缓存所对于的key, - * 返回key所对应的数据。 + * 鏍规嵁region鍜宬eyList鎵归噺浠庣紦瀛樹腑鍙栨暟鎹��
+ * 瀵逛簬缂撳瓨涓笉瀛樺湪鐨刱ey锛屼細璋冪敤closure鐨別xecute鏂规硶鏉ョ敓鎴愭暟鎹苟鏀惧叆缂撳瓨涓紝execute鏂规硶鐨勫弬鏁版槸缂撳瓨鎵�瀵逛簬鐨刱ey锛� + * 杩斿洖key鎵�瀵瑰簲鐨勬暟鎹�� * * @param - * 缓存中的key + * 缂撳瓨涓殑key * @param - * 缓存中的数据 + * 缂撳瓨涓殑鏁版嵁 * @param region - * 缓存区域 + * 缂撳瓨鍖哄煙 * @param extraKey - * 调用处的方法名 + * 璋冪敤澶勭殑鏂规硶鍚� * @param keyList - * 缓存key列表 + * 缂撳瓨key鍒楄〃 * @param cachePolicy - * 缓存策略 + * 缂撳瓨绛栫暐 * @param closure - * 对于缓存中不存在的key,会调用closure的execute方法来生成数据并放入缓存中, - * execute方法的参数是缓存所对于的key,返回key所对应的数据。 + * 瀵逛簬缂撳瓨涓笉瀛樺湪鐨刱ey锛屼細璋冪敤closure鐨別xecute鏂规硶鏉ョ敓鎴愭暟鎹苟鏀惧叆缂撳瓨涓紝 + * execute鏂规硶鐨勫弬鏁版槸缂撳瓨鎵�瀵逛簬鐨刱ey锛岃繑鍥瀔ey鎵�瀵瑰簲鐨勬暟鎹�� * @return */ public static Map getValues(Class region, String extraKey, Collection keyList, @@ -272,7 +272,7 @@ public class CacheUtils { } } - // 缓存中没有的数据,调用方法获取 + // 缂撳瓨涓病鏈夌殑鏁版嵁锛岃皟鐢ㄦ柟娉曡幏鍙� if (!nullValueKeys.isEmpty()) { Map exeRet = closure.execute(nullValueKeys); if (null != exeRet) { @@ -308,7 +308,7 @@ public class CacheUtils { } /** - * 供CacheThread调用 + * 渚汣acheThread璋冪敤 * * @param key * @param value @@ -374,7 +374,7 @@ public class CacheUtils { } /** - * 组装memcache key 组装规则:region+"_" +city + "_" + key + * 缁勮memcache key 缁勮瑙勫垯锛歳egion+"_" +city + "_" + key * * @param regionName * @param key @@ -396,31 +396,31 @@ public class CacheUtils { public static enum CachePolicyEnum { /** - * 10秒 + * 10绉� */ SECOND(TimeUnit.SECONDS.toMillis(10)), /** - * 1分钟 + * 1鍒嗛挓 */ SMALL(TimeUnit.MINUTES.toMillis(1)), /** - * 5分钟 + * 5鍒嗛挓 */ TINY(TimeUnit.MINUTES.toMillis(5)), /** - * 30分钟 + * 30鍒嗛挓 */ SHORT(TimeUnit.MINUTES.toMillis(30)), /** - * 1天 + * 1澶� */ MIDDLE(TimeUnit.DAYS.toMillis(1)), /** - * 7天 + * 7澶� */ LONG(TimeUnit.DAYS.toMillis(7)), /** - * 有效期为当天,过了24点后过期 + * 鏈夋晥鏈熶负褰撳ぉ锛岃繃浜�24鐐瑰悗杩囨湡 */ TODAY(0) { public long getCacheTime() { @@ -429,7 +429,7 @@ public class CacheUtils { } }, /** - * 本周日24点后过期 + * 鏈懆鏃�24鐐瑰悗杩囨湡 */ NEXT_SUNDAY(0) { public long getCacheTime() { @@ -438,7 +438,7 @@ public class CacheUtils { } }, /** - * 本月底24点后过期 + * 鏈湀搴�24鐐瑰悗杩囨湡 */ NEXT_MONTH(0) { public long getCacheTime() { @@ -447,7 +447,7 @@ public class CacheUtils { } }, /** - * 本周六24点后过期 + * 鏈懆鍏�24鐐瑰悗杩囨湡 */ NEXT_SATURDAY(0) { public long getCacheTime() { @@ -456,7 +456,7 @@ public class CacheUtils { } }, /** - * 有效期为当前这一小时,过了整点后过期 + * 鏈夋晥鏈熶负褰撳墠杩欎竴灏忔椂锛岃繃浜嗘暣鐐瑰悗杩囨湡 */ HOUR(0) { public long getCacheTime() { @@ -465,19 +465,19 @@ public class CacheUtils { } }, /** - * 2个小时 + * 2涓皬鏃� */ TWOHOURS(TimeUnit.HOURS.toMillis(2)), /** - * 4个小时 + * 4涓皬鏃� */ FOURHOURS(TimeUnit.HOURS.toMillis(4)), /** - * 一个月(按30天计) + * 涓�涓湀锛堟寜30澶╄锛� */ MONTH(TimeUnit.DAYS.toMillis(30)), /** - * 5秒钟 + * 5绉掗挓 */ MOMENT(1000 * 5); diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/Cluster.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/Cluster.java index d4e9c8a6a..4945bbb9d 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/Cluster.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/Cluster.java @@ -4,13 +4,13 @@ import java.util.ArrayList; import java.util.List; /** - * 聚类结果定义 + * 鑱氱被缁撴灉瀹氫箟 * * @author dxy - * @value 表示主要的聚类值 - * @secondaryValue 如果这个值存在,说明这些样本有两组相对较大的聚类,样本意见分歧较大 - * @mean 加权平均值 - * @median 中位数 + * @value 琛ㄧず涓昏鐨勮仛绫诲�� + * @secondaryValue 濡傛灉杩欎釜鍊煎瓨鍦紝璇存槑杩欎簺鏍锋湰鏈変袱缁勭浉瀵硅緝澶х殑鑱氱被锛屾牱鏈剰瑙佸垎姝ц緝澶� + * @mean 鍔犳潈骞冲潎鍊� + * @median 涓綅鏁� */ public final class Cluster { private int value; @@ -18,7 +18,7 @@ public final class Cluster { private int median; private Integer secondaryValue; - private int sampleSize; // 样本数量 + private int sampleSize; // 鏍锋湰鏁伴噺 private double[][] cluters; public Cluster(double[][] cluters) { @@ -46,7 +46,7 @@ public final class Cluster { mean = (int) (total / sampleSize); List list = new ArrayList(); - // 如果第一个聚类超过一半,就使用这个聚类 + // 濡傛灉绗竴涓仛绫昏秴杩囦竴鍗婏紝灏变娇鐢ㄨ繖涓仛绫� if (cluters[0].length >= sampleSize * 0.5) { for (int i = 0; i < cluters[0].length; i++) { list.add(cluters[0][i]); @@ -59,7 +59,7 @@ public final class Cluster { } } - // 如果有两个以上的聚簇,并且第二个聚簇的占比超过35%,说明改聚类有较大的分歧,所以需要把第二聚簇作为次要值考虑 + // 濡傛灉鏈変袱涓互涓婄殑鑱氱皣锛屽苟涓旂浜屼釜鑱氱皣鐨勫崰姣旇秴杩�35%锛岃鏄庢敼鑱氱被鏈夎緝澶х殑鍒嗘锛屾墍浠ラ渶瑕佹妸绗簩鑱氱皣浣滀负娆¤鍊艰�冭檻 if (cluters.length >= 2) { if (cluters[1].length >= sampleSize * 0.35) { long stc = 0; @@ -83,7 +83,7 @@ public final class Cluster { } /** - * 参与聚类的样本量 + * 鍙備笌鑱氱被鐨勬牱鏈噺 * * @return */ @@ -92,7 +92,7 @@ public final class Cluster { } /** - * 主要类簇的值的平均值 + * 涓昏绫荤皣鐨勫�肩殑骞冲潎鍊� * * @return */ @@ -101,7 +101,7 @@ public final class Cluster { } /** - * 所有点加权平均 + * 鎵�鏈夌偣鍔犳潈骞冲潎 * * @return */ @@ -110,7 +110,7 @@ public final class Cluster { } /** - * 聚类详细数据 + * 鑱氱被璇︾粏鏁版嵁 * * @return */ @@ -119,7 +119,7 @@ public final class Cluster { } /** - * 最大类簇的中位数 + * 鏈�澶х被绨囩殑涓綅鏁� * * @return */ diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/CodeDictionary.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/CodeDictionary.java index 2cf376fe2..bacc51173 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/CodeDictionary.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/CodeDictionary.java @@ -7,33 +7,33 @@ public class CodeDictionary { public static final Map FITMENT_CODE_MAP = new HashMap() { { - put(1, "毛坯"); - put(2, "简装"); - put(3, "精装"); - put(4, "豪装"); + put(1, "姣涘澂"); + put(2, "绠�瑁�"); + put(3, "绮捐"); + put(4, "璞"); } }; public static final Map PROPERTY_TYPE_CODE_MAP = new HashMap() { { - put(0, "普通住宅"); - put(1, "别墅"); - put(2, "商住"); + put(0, "鏅�氫綇瀹�"); + put(1, "鍒"); + put(2, "鍟嗕綇"); } }; public static final Map DIRECTION_CODE_MAP = new HashMap() { { - put(1, "西南"); - put(2, "东南"); - put(3, "南"); - put(4, "西北"); - put(5, "东北"); - put(6, "东"); - put(7, "西"); - put(8, "北"); - put(9, "东西"); - put(10, "南北"); + put(1, "瑗垮崡"); + put(2, "涓滃崡"); + put(3, "鍗�"); + put(4, "瑗垮寳"); + put(5, "涓滃寳"); + put(6, "涓�"); + put(7, "瑗�"); + put(8, "鍖�"); + put(9, "涓滆タ"); + put(10, "鍗楀寳"); } }; diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/CoordPoint.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/CoordPoint.java index d96d0543e..5fe78a2ea 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/CoordPoint.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/CoordPoint.java @@ -3,8 +3,8 @@ package com.fangjia.core.util; public class CoordPoint { - private double lat;// 纬度 - private double lng;// 经度 + private double lat;// 绾害 + private double lng;// 缁忓害 public CoordPoint() { } diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/CoordinateConversion.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/CoordinateConversion.java index 5084266e6..6b588c860 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/CoordinateConversion.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/CoordinateConversion.java @@ -8,10 +8,10 @@ public class CoordinateConversion { private static final double ee = 0.00669342162296594323; /** - * gg_lat 纬度 - * gg_lon 经度 - * GCJ-02转换BD-09 - * Google地图经纬度转百度地图经纬度 + * gg_lat 绾害 + * gg_lon 缁忓害 + * GCJ-02杞崲BD-09 + * Google鍦板浘缁忕含搴﹁浆鐧惧害鍦板浘缁忕含搴� * */ public static CoordPoint google_bd_encrypt(double gg_lat, double gg_lon){ CoordPoint point= new CoordPoint(); @@ -26,10 +26,10 @@ public class CoordinateConversion { } /** - * wgLat 纬度 - * wgLon 经度 - * BD-09转换GCJ-02 - * 百度转google + * wgLat 绾害 + * wgLon 缁忓害 + * BD-09杞崲GCJ-02 + * 鐧惧害杞琯oogle * */ public static CoordPoint bd_google_encrypt(double bd_lat, double bd_lon){ CoordPoint point=new CoordPoint(); @@ -46,9 +46,9 @@ public class CoordinateConversion { /** - * wgLat 纬度 - * wgLon 经度 - * WGS-84 到 GCJ-02 的转换(即 GPS 加偏) + * wgLat 绾害 + * wgLon 缁忓害 + * WGS-84 鍒� GCJ-02 鐨勮浆鎹紙鍗� GPS 鍔犲亸锛� * */ public static CoordPoint wgs_gcj_encrypts(double wgLat, double wgLon) { CoordPoint point=new CoordPoint(); diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/CosineSimilarAlgorithm.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/CosineSimilarAlgorithm.java index 6c87bd448..41272b2c8 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/CosineSimilarAlgorithm.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/CosineSimilarAlgorithm.java @@ -17,7 +17,7 @@ public class CosineSimilarAlgorithm { if (doc1.trim().length() > 0 && doc2.trim().length() > 0) { Map AlgorithmMap = new HashMap(); - //将两个字符串中的中文字符以及出现的总数封装到,AlgorithmMap中 + //灏嗕袱涓瓧绗︿覆涓殑涓枃瀛楃浠ュ強鍑虹幇鐨勬�绘暟灏佽鍒帮紝AlgorithmMap涓� for (int i = 0; i < doc1.length(); i++) { char d1 = doc1.charAt(i); if(isHanZi(d1)){ @@ -76,26 +76,26 @@ public class CosineSimilarAlgorithm { } public static boolean isHanZi(char ch) { - // 判断是否汉字 + // 鍒ゆ柇鏄惁姹夊瓧 return (ch >= 0x4E00 && ch <= 0x9FA5); } /** - * 根据输入的Unicode字符,获取它的GB2312编码或者ascii编码, + * 鏍规嵁杈撳叆鐨刄nicode瀛楃锛岃幏鍙栧畠鐨凣B2312缂栫爜鎴栬�卆scii缂栫爜锛� * * @param ch - * 输入的GB2312中文字符或者ASCII字符(128个) - * @return ch在GB2312中的位置,-1表示该字符不认识 + * 杈撳叆鐨凣B2312涓枃瀛楃鎴栬�匒SCII瀛楃(128涓�) + * @return ch鍦℅B2312涓殑浣嶇疆锛�-1琛ㄧず璇ュ瓧绗︿笉璁よ瘑 */ public static short getGB2312Id(char ch) { try { byte[] buffer = Character.toString(ch).getBytes("GB2312"); if (buffer.length != 2) { - // 正常情况下buffer应该是两个字节,否则说明ch不属于GB2312编码,故返回'?',此时说明不认识该字符 + // 姝e父鎯呭喌涓媌uffer搴旇鏄袱涓瓧鑺傦紝鍚﹀垯璇存槑ch涓嶅睘浜嶨B2312缂栫爜锛屾晠杩斿洖'?'锛屾鏃惰鏄庝笉璁よ瘑璇ュ瓧绗� return -1; } - int b0 = (int) (buffer[0] & 0x0FF) - 161; // 编码从A1开始,因此减去0xA1=161 - int b1 = (int) (buffer[1] & 0x0FF) - 161; // 第一个字符和最后一个字符没有汉字,因此每个区只收16*6-2=94个汉字 + int b0 = (int) (buffer[0] & 0x0FF) - 161; // 缂栫爜浠嶢1寮�濮嬶紝鍥犳鍑忓幓0xA1=161 + int b1 = (int) (buffer[1] & 0x0FF) - 161; // 绗竴涓瓧绗﹀拰鏈�鍚庝竴涓瓧绗︽病鏈夋眽瀛楋紝鍥犳姣忎釜鍖哄彧鏀�16*6-2=94涓眽瀛� return (short) (b0 * 94 + b1); } catch (UnsupportedEncodingException e) { e.printStackTrace(); @@ -107,14 +107,14 @@ public class CosineSimilarAlgorithm { private static int compare(String str, String target) { - int[][] d; // 矩阵 + int[][] d; // 鐭╅樀 int n = str.length(); int m = target.length(); - int i; // 遍历str的 - int j; // 遍历target的 - char ch1; // str的 - char ch2; // target的 - int temp; // 记录相同字符,在某个矩阵位置值的增量,不是0就是1 + int i; // 閬嶅巻str鐨� + int j; // 閬嶅巻target鐨� + char ch1; // str鐨� + char ch2; // target鐨� + int temp; // 璁板綍鐩稿悓瀛楃,鍦ㄦ煇涓煩闃典綅缃�肩殑澧為噺,涓嶆槸0灏辨槸1 if (n == 0) { return m; } @@ -122,16 +122,16 @@ public class CosineSimilarAlgorithm { return n; } d = new int[n + 1][m + 1]; - for (i = 0; i <= n; i++) { // 初始化第一列 + for (i = 0; i <= n; i++) { // 鍒濆鍖栫涓�鍒� d[i][0] = i; } - for (j = 0; j <= m; j++) { // 初始化第一行 + for (j = 0; j <= m; j++) { // 鍒濆鍖栫涓�琛� d[0][j] = j; } - for (i = 1; i <= n; i++) { // 遍历str + for (i = 1; i <= n; i++) { // 閬嶅巻str ch1 = str.charAt(i - 1); - // 去匹配target + // 鍘诲尮閰峵arget for (j = 1; j <= m; j++) { ch2 = target.charAt(j - 1); if (ch1 == ch2) { @@ -139,7 +139,7 @@ public class CosineSimilarAlgorithm { } else { temp = 1; } - // 左边+1,上边+1, 左上角+temp取最小 + // 宸﹁竟+1,涓婅竟+1, 宸︿笂瑙�+temp鍙栨渶灏� d[i][j] = min(d[i - 1][j] + 1, d[i][j - 1] + 1, d[i - 1][j - 1] + temp); } } @@ -152,7 +152,7 @@ public class CosineSimilarAlgorithm { } /** - * 获取两字符串的相似度 + * 鑾峰彇涓ゅ瓧绗︿覆鐨勭浉浼煎害 * * @param str * @param target diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/CurrencyConverter.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/CurrencyConverter.java index d4314ba66..bd74f95f0 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/CurrencyConverter.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/CurrencyConverter.java @@ -4,20 +4,20 @@ import java.text.DecimalFormat; /** * - * 货币转换 + * 璐у竵杞崲 * */ public class CurrencyConverter { - /** 大写数字 */ - private static final String[] NUMBERS = { "零", "壹", "贰", "叁", "肆", "伍", "陆", "柒", "捌", "玖" }; - /** 整数部分的单位 */ - private static final String[] IUNIT = { "元", "拾", "佰", "仟", "万", "拾", "佰", "仟", "亿", "拾", "佰", "仟", "万", "拾", "佰", "仟" }; - /** 小数部分的单位 */ - private static final String[] DUNIT = { "角", "分", "厘" }; + /** 澶у啓鏁板瓧 */ + private static final String[] NUMBERS = { "闆�", "澹�", "璐�", "鍙�", "鑲�", "浼�", "闄�", "鏌�", "鎹�", "鐜�" }; + /** 鏁存暟閮ㄥ垎鐨勫崟浣� */ + private static final String[] IUNIT = { "鍏�", "鎷�", "浣�", "浠�", "涓�", "鎷�", "浣�", "浠�", "浜�", "鎷�", "浣�", "浠�", "涓�", "鎷�", "浣�", "浠�" }; + /** 灏忔暟閮ㄥ垎鐨勫崟浣� */ + private static final String[] DUNIT = { "瑙�", "鍒�", "鍘�" }; /** - * 得到大写金额。 + * 寰楀埌澶у啓閲戦銆� */ public static String toChinese(String str) { str = str.replaceAll(",", ""); @@ -40,18 +40,18 @@ public class CurrencyConverter { } } if (integerStr.length() > IUNIT.length) { - System.out.println(str + ":超出处理能力"); + System.out.println(str + ":瓒呭嚭澶勭悊鑳藉姏"); return str; } - int[] integers = toArray(integerStr);// 整数部分数字 - boolean isMust5 = isMust5(integerStr);// 设置万单位 - int[] decimals = toArray(decimalStr);// 小数部分数字 + int[] integers = toArray(integerStr);// 鏁存暟閮ㄥ垎鏁板瓧 + boolean isMust5 = isMust5(integerStr);// 璁剧疆涓囧崟浣� + int[] decimals = toArray(decimalStr);// 灏忔暟閮ㄥ垎鏁板瓧 return getChineseInteger(integers, isMust5) + getChineseDecimal(decimals); } /** - * 整数部分和小数部分转换为数组,从高位至低位 + * 鏁存暟閮ㄥ垎鍜屽皬鏁伴儴鍒嗚浆鎹负鏁扮粍锛屼粠楂樹綅鑷充綆浣� */ private static int[] toArray(String number) { int[] array = new int[number.length()]; @@ -62,25 +62,25 @@ public class CurrencyConverter { } /** - * 得到中文金额的整数部分。 + * 寰楀埌涓枃閲戦鐨勬暣鏁伴儴鍒嗐�� */ private static String getChineseInteger(int[] integers, boolean isMust5) { StringBuffer chineseInteger = new StringBuffer(""); int length = integers.length; for (int i = 0; i < length; i++) { - // 0出现在关键位置:1234(万)5678(亿)9012(万)3456(元) - // 特殊情况:10(拾元、壹拾元、壹拾万元、拾万元) + // 0鍑虹幇鍦ㄥ叧閿綅缃細1234(涓�)5678(浜�)9012(涓�)3456(鍏�) + // 鐗规畩鎯呭喌锛�10(鎷惧厓銆佸9鎷惧厓銆佸9鎷句竾鍏冦�佹嬀涓囧厓) String key = ""; if (integers[i] == 0) { - if ((length - i) == 13)// 万(亿)(必填) + if ((length - i) == 13)// 涓�(浜�)(蹇呭~) key = IUNIT[4]; - else if ((length - i) == 9)// 亿(必填) + else if ((length - i) == 9)// 浜�(蹇呭~) key = IUNIT[8]; - else if ((length - i) == 5 && isMust5)// 万(不必填) + else if ((length - i) == 5 && isMust5)// 涓�(涓嶅繀濉�) key = IUNIT[4]; - else if ((length - i) == 1)// 元(必填) + else if ((length - i) == 1)// 鍏�(蹇呭~) key = IUNIT[0]; - // 0遇非0时补零,不包含最后一位 + // 0閬囬潪0鏃惰ˉ闆讹紝涓嶅寘鍚渶鍚庝竴浣� if ((length - i) > 1 && integers[i + 1] != 0) key += NUMBERS[0]; } @@ -90,12 +90,12 @@ public class CurrencyConverter { } /** - * 得到中文金额的小数部分。 + * 寰楀埌涓枃閲戦鐨勫皬鏁伴儴鍒嗐�� */ private static String getChineseDecimal(int[] decimals) { StringBuffer chineseDecimal = new StringBuffer(""); for (int i = 0; i < decimals.length; i++) { - // 舍去3位小数之后的 + // 鑸嶅幓3浣嶅皬鏁颁箣鍚庣殑 if (i == 3) break; chineseDecimal.append(decimals[i] == 0 ? "" : (NUMBERS[decimals[i]] + DUNIT[i])); @@ -104,14 +104,14 @@ public class CurrencyConverter { } /** - * 判断第5位数字的单位"万"是否应加。 + * 鍒ゆ柇绗�5浣嶆暟瀛楃殑鍗曚綅"涓�"鏄惁搴斿姞銆� */ private static boolean isMust5(String integerStr) { int length = integerStr.length(); if (length > 4) { String subInteger = ""; if (length > 8) { - // 取得从低位数,第5到第8位的字串 + // 鍙栧緱浠庝綆浣嶆暟锛岀5鍒扮8浣嶇殑瀛椾覆 subInteger = integerStr.substring(length - 8, length - 4); } else { subInteger = integerStr.substring(0, length - 4); @@ -123,7 +123,7 @@ public class CurrencyConverter { } /** - * 格式化数字为千分位显示 + * 鏍煎紡鍖栨暟瀛椾负鍗冨垎浣嶆樉绀� * * @return */ diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/DataCluster.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/DataCluster.java index cd8992ed0..91c8d4756 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/DataCluster.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/DataCluster.java @@ -5,20 +5,20 @@ import java.util.*; public class DataCluster { - // 聚类桶宽百分比 + // 鑱氱被妗跺鐧惧垎姣� public static final int CLUSTER_PERCENT = 5; - // 聚类中最小的成员数 + // 鑱氱被涓渶灏忕殑鎴愬憳鏁� public static final int MIN_SUPPORT_COUNT = 3; - // 聚类中最大值与最小值的比差 + // 鑱氱被涓渶澶у�间笌鏈�灏忓�肩殑姣斿樊 public static final double HIGH_DIFFERENCE_PERCENT = 1.2; - // 小区聚类的最小聚类簇个数 + // 灏忓尯鑱氱被鐨勬渶灏忚仛绫荤皣涓暟 public static final int MIN_CLUSTER_COUNT = 1; - // 区域聚类的聚类簇个数 + // 鍖哄煙鑱氱被鐨勮仛绫荤皣涓暟 public static final int REGION_CLUSTER_SIZE = 3; /** - * 聚类算法 + * 鑱氱被绠楁硶 * * @param values * @return List @@ -45,16 +45,16 @@ public class DataCluster { /** * * @param allAvgs - * 数值列表 + * 鏁板�煎垪琛� * @param minCluster - * 最少聚出的类个数 + * 鏈�灏戣仛鍑虹殑绫讳釜鏁� * @param percent - * 聚类间距 + * 鑱氱被闂磋窛 * @param minSize - * 聚类中最小的成员数 + * 鑱氱被涓渶灏忕殑鎴愬憳鏁� * @param heightDifferencePercent - * 如果聚类中最大值与最小值的比差,只在聚出一个类,并且最小聚类大于一的情况下使用 - * @return 聚类列表 + * 濡傛灉鑱氱被涓渶澶у�间笌鏈�灏忓�肩殑姣斿樊,鍙湪鑱氬嚭涓�涓被,骞朵笖鏈�灏忚仛绫诲ぇ浜庝竴鐨勬儏鍐典笅浣跨敤 + * @return 鑱氱被鍒楄〃 */ private static double[][] cluster(List allAvgs, int minCluster, int percent, int minSize, double heightDifferencePercent) { @@ -79,10 +79,10 @@ public class DataCluster { allClusterSep += allAvgs.get(i); } - int clusterSep = round(allClusterSep * percent * 1.0d / (100 * (allAvgs.size() - startfrom)));// 平均数量大小,总值 - compStep = round(clusterSep * 0.5);// 增量 - compAvg = allAvgs.get(startfrom) + compStep;// 初始均价大小 - startfrom_temp = startfrom;// 起始点 + int clusterSep = round(allClusterSep * percent * 1.0d / (100 * (allAvgs.size() - startfrom)));// 骞冲潎鏁伴噺澶у皬锛屾�诲�� + compStep = round(clusterSep * 0.5);// 澧為噺 + compAvg = allAvgs.get(startfrom) + compStep;// 鍒濆鍧囦环澶у皬 + startfrom_temp = startfrom;// 璧峰鐐� ArrayList clusters = new ArrayList(); ArrayList historyClusters = new ArrayList(); @@ -107,14 +107,14 @@ public class DataCluster { } if (end - start + 1 >= minSize) { historyClusters.add(new int[] { start, end }); - if (clusters.isEmpty()) {// 新加组 + if (clusters.isEmpty()) {// 鏂板姞缁� clusters.add(new int[] { start, end }); } else { int[] before = clusters.get(clusters.size() - 1); - if (start <= before[1]) {// 合并 + if (start <= before[1]) {// 鍚堝苟 before[1] = end; - } else {// 新加组 + } else {// 鏂板姞缁� clusters.add(new int[] { start, end }); } } @@ -179,7 +179,7 @@ public class DataCluster { } /** - * 对大簇进行划分 + * 瀵瑰ぇ绨囪繘琛屽垝鍒� * * @param cluster * @param minCluster @@ -199,7 +199,7 @@ public class DataCluster { int clusterLength = cluster.length; - int compStep = round(clusterSep * 0.5);// 增量 + int compStep = round(clusterSep * 0.5);// 澧為噺 int compAvg = allAvgs.get(cluster[0]) + compStep; while (compAvg <= allAvgs.get(cluster[clusterLength - 1])) { @@ -245,7 +245,7 @@ public class DataCluster { int bs = b[1] - b[0]; int cs = c[1] - c[0]; - if (bs > as && bs > cs) {// 波峰 + if (bs > as && bs > cs) {// 娉㈠嘲 int avg = 0; for (int k = b[0]; k <= b[1]; k++) { avg += allAvgs.get(k); @@ -255,17 +255,17 @@ public class DataCluster { topWaveMarkCount++; flag = 0; - } else if (bs < as && bs < cs) {// 波谷 + } else if (bs < as && bs < cs) {// 娉㈣胺 waveMark.add(new int[] { i * -1, 0 }); bottomWaveMarkCount++; flag = 0; - } else if (bs > as && bs == cs) {// 波峰开始 + } else if (bs > as && bs == cs) {// 娉㈠嘲寮�濮� flag = 1; - } else if (bs < as && bs == cs) {// 波谷开始 + } else if (bs < as && bs == cs) {// 娉㈣胺寮�濮� flag = -1; - } else if (flag == 1 && (bs == as && bs > cs)) {// 波峰 - // 下降通道 + } else if (flag == 1 && (bs == as && bs > cs)) {// 娉㈠嘲 + // 涓嬮檷閫氶亾 int avg = 0; for (int k = b[0]; k <= b[1]; k++) { avg += allAvgs.get(k); @@ -275,13 +275,13 @@ public class DataCluster { topWaveMarkCount++; flag = 0; - } else if (flag == -1 && (bs == as && bs < cs)) {// 波谷 - // 上升通道 + } else if (flag == -1 && (bs == as && bs < cs)) {// 娉㈣胺 + // 涓婂崌閫氶亾 waveMark.add(new int[] { i * -1, 0 }); bottomWaveMarkCount++; flag = 0; - } else if (bs == as && bs == cs) {// 平滑区 + } else if (bs == as && bs == cs) {// 骞虫粦鍖� } else { flag = 0; @@ -291,11 +291,11 @@ public class DataCluster { List bottomMark = new ArrayList(); - // 取出(minCluster-1)个波谷,断裂 + // 鍙栧嚭(minCluster-1)涓尝璋�,鏂 if (bottomWaveMarkCount > 0) { clusters.clear(); - if (topWaveMarkCount > minCluster) {// 按波峰之间的距离选取聚类 + if (topWaveMarkCount > minCluster) {// 鎸夋尝宄颁箣闂寸殑璺濈閫夊彇鑱氱被 int startIndex = 2; @@ -307,12 +307,12 @@ public class DataCluster { int count = 0; for (int i = startIndex; i < waveMark.size(); i += 2) { - x[count][0] = waveMark.get(i)[1] - waveMark.get(i - 2)[1]; // 均价间距 - x[count][1] = i - 1; // 记录波谷位置 + x[count][0] = waveMark.get(i)[1] - waveMark.get(i - 2)[1]; // 鍧囦环闂磋窛 + x[count][1] = i - 1; // 璁板綍娉㈣胺浣嶇疆 count++; } - // 按间距排序 + // 鎸夐棿璺濇帓搴� Arrays.sort(x, new Comparator() { public int compare(int[] o1, int[] o2) { @@ -339,14 +339,14 @@ public class DataCluster { Collections.sort(bottomMark); - // 合并 + // 鍚堝苟 int lastIndex = 0; for (int i = 0; i <= bottomMark.size(); i++) { int start = Integer.MAX_VALUE; int end = 0; - // 求峰值的平均值,往两边扩散 + // 姹傚嘲鍊肩殑骞冲潎鍊�,寰�涓よ竟鎵╂暎 int bottomIndex = 0; if (i == bottomMark.size()) bottomIndex = waveMark.size(); @@ -386,7 +386,7 @@ public class DataCluster { } /** - * 判断是否是正数 + * 鍒ゆ柇鏄惁鏄鏁� * @return */ private static boolean isPositive(Number num) { diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/DataUtil.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/DataUtil.java index 117bb32e7..c87091603 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/DataUtil.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/DataUtil.java @@ -38,20 +38,20 @@ import java.util.zip.GZIPInputStream; import java.util.zip.GZIPOutputStream; public class DataUtil { - public static Pattern cellPhonePattern = Pattern.compile("^(1[23456789][0-9]{1})(-)?([0-9]{8})$");// 判断是否手机号码 + public static Pattern cellPhonePattern = Pattern.compile("^(1[23456789][0-9]{1})(-)?([0-9]{8})$");// 鍒ゆ柇鏄惁鎵嬫満鍙风爜 private final static Logger LOGGER = LoggerFactory.getLogger(DataUtil.class); - public static Pattern LINK = Pattern.compile("[a-zA-z]+://[a-zA-Z0-9./%?=&-]*"); // 网址 + public static Pattern LINK = Pattern.compile("[a-zA-z]+://[a-zA-Z0-9./%?=&-]*"); // 缃戝潃 // public static Pattern MOBILE_344 = // Pattern.compile("(\\d{3}-\\d{4}-\\d{4})"); - public static Pattern NUM_SERIES = Pattern.compile("(?:\\d[\\s-]*){7}");// ;连续数字 + public static Pattern NUM_SERIES = Pattern.compile("(?:\\d[\\s-]*){7}");// ;杩炵画鏁板瓧 public static Pattern URL_SUFFIX = Pattern - .compile("[a-zA-Z0-9.]*\\.((?:com)|(?:COM)|(?:cn)|(?:CN)|(?:net)|(?:NET))"); // 后缀 - public static Pattern IMG = Pattern.compile("]*?>"); // 图片链接地址 - public static Pattern OUT_TAG = Pattern.compile("]*>"); // 外部标签 - public static final Pattern WORDS = Pattern.compile(".*[a-zA-Z].*");// 是否包含字母 + .compile("[a-zA-Z0-9.]*\\.((?:com)|(?:COM)|(?:cn)|(?:CN)|(?:net)|(?:NET))"); // 鍚庣紑 + public static Pattern IMG = Pattern.compile("]*?>"); // 鍥剧墖閾炬帴鍦板潃 + public static Pattern OUT_TAG = Pattern.compile("]*>"); // 澶栭儴鏍囩 + public static final Pattern WORDS = Pattern.compile(".*[a-zA-Z].*");// 鏄惁鍖呭惈瀛楁瘝 public static final Pattern NO_WORDS = Pattern.compile(".*[^a-zA-Z].*"); - public static String SPACIAL_PATTERN = "[`~!@#$%^&*()+=|{}':;',\\[\\].<>/?~!@#¥%……&*()——+|{}【】‘;:”“’。,、?]"; + public static String SPACIAL_PATTERN = "[`~!@#$%^&*()+=|{}':;',\\[\\].<>/?~锛丂#锟�%鈥︹��&*锛堬級鈥斺��+|{}銆愩�戔�橈紱锛氣�濃�溾�欍�傦紝銆侊紵]"; public static final HanyuPinyinOutputFormat pinyinFormat = new HanyuPinyinOutputFormat(); public static final Pattern PRICE_PATT = Pattern.compile("(\\d+)"); public static final Pattern NUMBER = Pattern.compile("^\\d*(.\\d*)?$"); @@ -61,7 +61,7 @@ public class DataUtil { private static final String hanziReg = "[\\u4e00-\\u9fa5]"; private static final String englishReg = "[A-Za-z]"; - public static String[] TAGS =new String[]{"独栋", "联排", "叠加", "双拼", "花园面积", "泳池", "别墅", "带花园", "洋房", "叠拼", "独院", "联体", "微墅", "大平墅"}; + public static String[] TAGS =new String[]{"鐙爧", "鑱旀帓", "鍙犲姞", "鍙屾嫾", "鑺卞洯闈㈢Н", "娉虫睜", "鍒", "甯﹁姳鍥�", "娲嬫埧", "鍙犳嫾", "鐙櫌", "鑱斾綋", "寰", "澶у钩澧�"}; public static String replaceAll(String original, String with, Pattern... pattern) { if (StringUtils.isNotBlank(original)) { @@ -75,11 +75,11 @@ public class DataUtil { } /** - * 清理指定字符串中的特殊字符 + * 娓呯悊鎸囧畾瀛楃涓蹭腑鐨勭壒娈婂瓧绗� * - * 目前清理特殊字符有:手机、电话、QQ、邮箱、MSN + * 鐩墠娓呯悊鐗规畩瀛楃鏈夛細鎵嬫満銆佺數璇濄�丵Q銆侀偖绠便�丮SN * - * 例: 联系电话:13569335693 清理后: 联系电话:******5693 + * 渚嬶細 鑱旂郴鐢佃瘽锛�13569335693 娓呯悊鍚庯細 鑱旂郴鐢佃瘽:******5693 * * @author liupei */ @@ -105,7 +105,7 @@ public class DataUtil { } /** - * 产生num个[0,maxBound)区间范围内的数字 + * 浜х敓num涓猍0,maxBound)鍖洪棿鑼冨洿鍐呯殑鏁板瓧 * * @param num * @param maxBound @@ -127,18 +127,18 @@ public class DataUtil { } /** - * 截取字符串 + * 鎴彇瀛楃涓� * - * 若原始字符串的长度小于最大截取长度,则直接返回原始字符串 + * 鑻ュ師濮嬪瓧绗︿覆鐨勯暱搴﹀皬浜庢渶澶ф埅鍙栭暱搴︼紝鍒欑洿鎺ヨ繑鍥炲師濮嬪瓧绗︿覆 * * @param targetString - * 原始字符串 + * 鍘熷瀛楃涓� * @param targetLength - * 最大长度 + * 鏈�澶ч暱搴� * @param tailLength - * 尾巴长度 + * 灏惧反闀垮害 * @param tailString - * 结尾字符串 + * 缁撳熬瀛楃涓� * @return */ public static String cutString(String targetString, int targetLength, int tailLength, String tailString) { @@ -153,12 +153,12 @@ public class DataUtil { } /** - * 按字节截取字符串 + * 鎸夊瓧鑺傛埅鍙栧瓧绗︿覆 * * @param targetString - * 原始字符串 + * 鍘熷瀛楃涓� * @param length - * 截取长度 + * 鎴彇闀垮害 * @return * @throws UnsupportedEncodingException */ @@ -171,14 +171,14 @@ public class DataUtil { if (bytes.length <= length) { return targetString; } else { - int n = 0; // 表示当前的字节数 - int i = 2; // 要截取的字节数,从第3个字节开始 + int n = 0; // 琛ㄧず褰撳墠鐨勫瓧鑺傛暟 + int i = 2; // 瑕佹埅鍙栫殑瀛楄妭鏁帮紝浠庣3涓瓧鑺傚紑濮� for (; i < bytes.length && n < length; i++) { - // 奇数位置,如3、5、7等,为UCS2编码中两个字节的第二个字节 + // 濂囨暟浣嶇疆锛屽3銆�5銆�7绛夛紝涓篣CS2缂栫爜涓袱涓瓧鑺傜殑绗簩涓瓧鑺� if (i % 2 == 1) { - n++; // 在UCS2第二个字节时n加1 + n++; // 鍦║CS2绗簩涓瓧鑺傛椂n鍔�1 } else { - // 当UCS2编码的第一个字节不等于0时,该UCS2字符为汉字,一个汉字算两个字节 + // 褰揢CS2缂栫爜鐨勭涓�涓瓧鑺備笉绛変簬0鏃讹紝璇CS2瀛楃涓烘眽瀛楋紝涓�涓眽瀛楃畻涓や釜瀛楄妭 if (bytes[i] != 0) { n++; } @@ -186,12 +186,12 @@ public class DataUtil { } if (i % 2 == 1) { - // 如果i为奇数时,处理成偶数 + // 濡傛灉i涓哄鏁版椂锛屽鐞嗘垚鍋舵暟 if (bytes[i - 1] != 0) { - // 该UCS2字符是汉字时,去掉这个截一半的汉字 + // 璇CS2瀛楃鏄眽瀛楁椂锛屽幓鎺夎繖涓埅涓�鍗婄殑姹夊瓧 i = i - 1; } else { - // 该UCS2字符是字母或数字,则保留该字符 + // 璇CS2瀛楃鏄瓧姣嶆垨鏁板瓧锛屽垯淇濈暀璇ュ瓧绗� i = i + 1; } } @@ -201,9 +201,9 @@ public class DataUtil { } /** - * 格式化均价 + * 鏍煎紡鍖栧潎浠� * - * 将个位和十位直接变为0 + * 灏嗕釜浣嶅拰鍗佷綅鐩存帴鍙樹负0 * * @param avgPirce * @return @@ -217,7 +217,7 @@ public class DataUtil { } /** - * 全角转半角 + * 鍏ㄨ杞崐瑙� * * @param input * @return @@ -237,7 +237,7 @@ public class DataUtil { } /** - * 判断文本中的链接是否是fangjia,如果不是就删除 + * 鍒ゆ柇鏂囨湰涓殑閾炬帴鏄惁鏄痜angjia,濡傛灉涓嶆槸灏卞垹闄� * * @param htmlDes * @return @@ -305,7 +305,7 @@ public class DataUtil { } /** - * 把字符串以16进制数值显示出来 + * 鎶婂瓧绗︿覆浠�16杩涘埗鏁板�兼樉绀哄嚭鏉� * * @param data * @return @@ -320,7 +320,7 @@ public class DataUtil { return ret.toString(); } - // 字节码转换成16进制字符串 + // 瀛楄妭鐮佽浆鎹㈡垚16杩涘埗瀛楃涓� public static String byte2hex(byte bytes[]) { StringBuffer retString = new StringBuffer(); for (int i = 0; i < bytes.length; ++i) { @@ -329,7 +329,7 @@ public class DataUtil { return retString.toString(); } - // 将16进制字符串转换成字节码 + // 灏�16杩涘埗瀛楃涓茶浆鎹㈡垚瀛楄妭鐮� public static byte[] hex2byte(String hex) { byte[] bts = new byte[hex.length() / 2]; for (int i = 0; i < bts.length; i++) { @@ -339,7 +339,7 @@ public class DataUtil { } /** - * 判断是否是标准的手机号码 + * 鍒ゆ柇鏄惁鏄爣鍑嗙殑鎵嬫満鍙风爜 * * @param phoneNum * @return @@ -401,7 +401,7 @@ public class DataUtil { } /** - * 去掉str中的html标记 + * 鍘绘帀str涓殑html鏍囪 * * @param str * @return @@ -415,10 +415,10 @@ public class DataUtil { } /** - * 去除特殊字符串 + * 鍘婚櫎鐗规畩瀛楃涓� * *

- * 特殊字符串定义:html,&*;,\[a-z] + * 鐗规畩瀛楃涓插畾涔�:html,&*;,\[a-z] *

* * @param str @@ -437,7 +437,7 @@ public class DataUtil { public static Pattern nameTags = Pattern.compile("]*)(\\s|$|>)"); /** - * 去除html中不完整的标签 + * 鍘婚櫎html涓笉瀹屾暣鐨勬爣绛� * * @param html * @return @@ -519,10 +519,10 @@ public class DataUtil { } /** - * 四舍五入 + * 鍥涜垗浜斿叆 * * @param dSource - * 浮点数 + * 娴偣鏁� * @return */ public static int getRound(double dSource) { @@ -550,8 +550,8 @@ public class DataUtil { return decimalFormat.parse(decimalFormat.format(n)).doubleValue(); } - public static List SENSITIVE_WORDS = Arrays.asList("上门服务", "小姐", "冰毒", "手枪", "疏通", "掏粪", "污水", "办证", "公务员", - "汽狗"); + public static List SENSITIVE_WORDS = Arrays.asList("涓婇棬鏈嶅姟", "灏忓", "鍐版瘨", "鎵嬫灙", "鐤忛��", "鎺忕勃", "姹℃按", "鍔炶瘉", "鍏姟鍛�", + "姹界嫍"); public static List getSensitiveWords() { return SENSITIVE_WORDS; @@ -608,7 +608,7 @@ public class DataUtil { } /** - * 将集合反向排序 + * 灏嗛泦鍚堝弽鍚戞帓搴� * * @param * @param col @@ -626,12 +626,12 @@ public class DataUtil { } /** - * 根据Value对Map进行排序 + * 鏍规嵁Value瀵筂ap杩涜鎺掑簭 * * @param targetMap * key:Object value:Number * @param asc - * true:升序 false:降序 + * true:鍗囧簭 false:闄嶅簭 * @return */ @SuppressWarnings("unchecked") @@ -690,7 +690,7 @@ public class DataUtil { } /** - * 获取url的主域名 + * 鑾峰彇url鐨勪富鍩熷悕 * * @param url * @return @@ -711,34 +711,34 @@ public class DataUtil { switch (Integer.parseInt(ca)) { case 0: - ret.append("零"); + ret.append("闆�"); break; case 1: - ret.append("壹"); + ret.append("澹�"); break; case 2: - ret.append("贰"); + ret.append("璐�"); break; case 3: - ret.append("叁"); + ret.append("鍙�"); break; case 4: - ret.append("肆"); + ret.append("鑲�"); break; case 5: - ret.append("伍"); + ret.append("浼�"); break; case 6: - ret.append("陆"); + ret.append("闄�"); break; case 7: - ret.append("柒"); + ret.append("鏌�"); break; case 8: - ret.append("捌"); + ret.append("鎹�"); break; case 9: - ret.append("玖"); + ret.append("鐜�"); break; default: ret.append(ca); @@ -765,31 +765,31 @@ public class DataUtil { ret.append("0"); break; case 1: - ret.append("一"); + ret.append("涓�"); break; case 2: - ret.append("二"); + ret.append("浜�"); break; case 3: - ret.append("三"); + ret.append("涓�"); break; case 4: - ret.append("四"); + ret.append("鍥�"); break; case 5: - ret.append("五"); + ret.append("浜�"); break; case 6: - ret.append("六"); + ret.append("鍏�"); break; case 7: - ret.append("七"); + ret.append("涓�"); break; case 8: - ret.append("八"); + ret.append("鍏�"); break; case 9: - ret.append("九"); + ret.append("涔�"); break; default: ret.append(ca); @@ -807,25 +807,25 @@ public class DataUtil { for (int i = 0; i < charArray.length; i++) { String ca = String.valueOf(charArray[i]); - if (ca.equals("零")) { + if (ca.equals("闆�")) { ret.append("0"); - } else if (ca.equals("壹")) { + } else if (ca.equals("澹�")) { ret.append("1"); - } else if (ca.equals("贰")) { + } else if (ca.equals("璐�")) { ret.append("2"); - } else if (ca.equals("叁")) { + } else if (ca.equals("鍙�")) { ret.append("3"); - } else if (ca.equals("肆")) { + } else if (ca.equals("鑲�")) { ret.append("4"); - } else if (ca.equals("伍")) { + } else if (ca.equals("浼�")) { ret.append("5"); - } else if (ca.equals("陆")) { + } else if (ca.equals("闄�")) { ret.append("6"); - } else if (ca.equals("柒")) { + } else if (ca.equals("鏌�")) { ret.append("7"); - } else if (ca.equals("捌")) { + } else if (ca.equals("鎹�")) { ret.append("8"); - } else if (ca.equals("玖")) { + } else if (ca.equals("鐜�")) { ret.append("9"); } else { ret.append(ca); @@ -841,25 +841,25 @@ public class DataUtil { for (int i = 0; i < charArray.length; i++) { String ca = String.valueOf(charArray[i]); - if (ca.equals("零")) { + if (ca.equals("闆�")) { ret.append("0"); - } else if (ca.equals("一")) { + } else if (ca.equals("涓�")) { ret.append("1"); - } else if (ca.equals("二")) { + } else if (ca.equals("浜�")) { ret.append("2"); - } else if (ca.equals("三")) { + } else if (ca.equals("涓�")) { ret.append("3"); - } else if (ca.equals("四")) { + } else if (ca.equals("鍥�")) { ret.append("4"); - } else if (ca.equals("五")) { + } else if (ca.equals("浜�")) { ret.append("5"); - } else if (ca.equals("六")) { + } else if (ca.equals("鍏�")) { ret.append("6"); - } else if (ca.equals("七")) { + } else if (ca.equals("涓�")) { ret.append("7"); - } else if (ca.equals("八")) { + } else if (ca.equals("鍏�")) { ret.append("8"); - } else if (ca.equals("九")) { + } else if (ca.equals("涔�")) { ret.append("9"); } else { ret.append(ca); @@ -874,27 +874,27 @@ public class DataUtil { // return 0; // } // int result = 0; - // int temp = 1;//存放一个单位的数字如:十万 - // int count = 0;//判断是否有chArr - // char[] cnArr = new char[]{'一','二','三','四','五','六','七','八','九'}; - // char[] chArr = new char[]{'十','百','千','万','亿'}; + // int temp = 1;//瀛樻斁涓�涓崟浣嶇殑鏁板瓧濡傦細鍗佷竾 + // int count = 0;//鍒ゆ柇鏄惁鏈塩hArr + // char[] cnArr = new char[]{'涓�','浜�','涓�','鍥�','浜�','鍏�','涓�','鍏�','涔�'}; + // char[] chArr = new char[]{'鍗�','鐧�','鍗�','涓�','浜�'}; // for (int i = 0; i < input.length(); i++) { - // boolean b = true;//判断是否是chArr + // boolean b = true;//鍒ゆ柇鏄惁鏄痗hArr // char c = input.charAt(i); - // for (int j = 0; j < cnArr.length; j++) {//非单位,即数字 + // for (int j = 0; j < cnArr.length; j++) {//闈炲崟浣嶏紝鍗虫暟瀛� // if (c == cnArr[j]) { - // if(0 != count){//添加下一个单位之前,先把上一个单位值添加到结果中 + // if(0 != count){//娣诲姞涓嬩竴涓崟浣嶄箣鍓嶏紝鍏堟妸涓婁竴涓崟浣嶅�兼坊鍔犲埌缁撴灉涓� // result += temp; // temp = 1; // count = 0; // } - // // 下标+1,就是对应的值 + // // 涓嬫爣+1锛屽氨鏄搴旂殑鍊� // temp = j + 1; // b = false; // break; // } // } - // if(b){//单位{'十','百','千','万','亿'} + // if(b){//鍗曚綅{'鍗�','鐧�','鍗�','涓�','浜�'} // for (int j = 0; j < chArr.length; j++) { // if (c == chArr[j]) { // switch (j) { @@ -920,7 +920,7 @@ public class DataUtil { // } // } // } - // if (i == input.length() - 1) {//遍历到最后一个字符 + // if (i == input.length() - 1) {//閬嶅巻鍒版渶鍚庝竴涓瓧绗� // result += temp; // } // } @@ -988,7 +988,7 @@ public class DataUtil { } /** - * 是否包含字母 + * 鏄惁鍖呭惈瀛楁瘝 * * @param str * @return @@ -1003,7 +1003,7 @@ public class DataUtil { } /** - * 是否包含非字母 + * 鏄惁鍖呭惈闈炲瓧姣� * * @param str * @return @@ -1017,7 +1017,7 @@ public class DataUtil { } /** - * 避免solr中的特殊符号 + * 閬垮厤solr涓殑鐗规畩绗﹀彿 * * @param keyword * @return @@ -1028,7 +1028,7 @@ public class DataUtil { } keyword = encoding(keyword); keyword = keyword.replace("-", ""); - keyword = keyword.replace("-", ""); + keyword = keyword.replace("锛�", ""); keyword = keyword.replace("\"", ""); keyword = keyword.replaceAll(SPACIAL_PATTERN, ""); keyword = keyword.replace("\\", " "); @@ -1053,7 +1053,7 @@ public class DataUtil { } s = encoding(s); s = s.replace("-", ""); - s = s.replace("-", ""); + s = s.replace("锛�", ""); s = s.replace("\"", ""); s = s.replaceAll(SPACIAL_PATTERN, ""); s = s.replace("\\", " "); @@ -1122,7 +1122,7 @@ public class DataUtil { } /** - * 汉语全拼 + * 姹夎鍏ㄦ嫾 * * @param keyword * @param separator @@ -1148,7 +1148,7 @@ public class DataUtil { } /** - * 汉语全拼 + * 姹夎鍏ㄦ嫾 * * @param keyword * @param separator @@ -1200,7 +1200,7 @@ public class DataUtil { } /** - * 汉语简拼 + * 姹夎绠�鎷� * * @param keyword * @return @@ -1222,20 +1222,20 @@ public class DataUtil { } /** - * 格式化板块,将"板块"字符串去掉 + * 鏍煎紡鍖栨澘鍧�,灏�"鏉垮潡"瀛楃涓插幓鎺� * * @param block * @return */ public static String formatBlock(String block) { if (StringUtils.isNotBlank(block)) { - return block.replace("板块", ""); + return block.replace("鏉垮潡", ""); } return StringUtils.EMPTY; } /** - * 获取字符串中汉字部分 + * 鑾峰彇瀛楃涓蹭腑姹夊瓧閮ㄥ垎 * * @param s * @return @@ -1268,12 +1268,12 @@ public class DataUtil { } /** - * 检查经纬度是否合法 + * 妫�鏌ョ粡绾害鏄惁鍚堟硶 * * @param lat - * 纬度为正负900000000000 + * 绾害涓烘璐�900000000000 * @param lng - * 经度为正负1800000000000 + * 缁忓害涓烘璐�1800000000000 * @return */ public static boolean verifyLatLng(Long lat, Long lng) { @@ -1285,12 +1285,12 @@ public class DataUtil { } /** - * 检查经纬度是否合法 + * 妫�鏌ョ粡绾害鏄惁鍚堟硶 * * @param lat - * 纬度为正负90 + * 绾害涓烘璐�90 * @param lng - * 经度为正负180 + * 缁忓害涓烘璐�180 * @return */ public static boolean verifyLatLng(Double lat, Double lng) { @@ -1312,7 +1312,7 @@ public class DataUtil { } /** - * 压缩 + * 鍘嬬缉 * * @param content * @return @@ -1340,7 +1340,7 @@ public class DataUtil { } /** - * 解压 + * 瑙e帇 * * @param content * @return @@ -1410,11 +1410,11 @@ public class DataUtil { } public static String trim(String str) { - return null == str ? null : str.replaceAll("^[\\s ]*|[\\s ]*$", "").replaceAll((char) 160 + "", ""); + return null == str ? null : str.replaceAll("^[\\s銆�]*|[\\s ]*$", "").replaceAll((char) 160 + "", ""); } /** - * 匹配符合条件的字符串 + * 鍖归厤绗﹀悎鏉′欢鐨勫瓧绗︿覆 * * @param str * @param pattern @@ -1432,7 +1432,7 @@ public class DataUtil { } /** - * 匹配符合条件的字符串 + * 鍖归厤绗﹀悎鏉′欢鐨勫瓧绗︿覆 * * @param str * @param pattern @@ -1488,7 +1488,7 @@ public class DataUtil { } /** - * 判断短字符串中的字符是否按照顺序出现在长字符串中 + * 鍒ゆ柇鐭瓧绗︿覆涓殑瀛楃鏄惁鎸夌収椤哄簭鍑虹幇鍦ㄩ暱瀛楃涓蹭腑 * * @param str1 * @param str2 @@ -1522,7 +1522,7 @@ public class DataUtil { } /** - * 运行linux命令 + * 杩愯linux鍛戒护 * * @param cmd * @return @@ -1598,7 +1598,7 @@ public class DataUtil { } /** - * 判断是否是正数 + * 鍒ゆ柇鏄惁鏄鏁� * * @return */ @@ -1683,11 +1683,11 @@ public class DataUtil { return null; } - static final Pattern NUMERICAL_STAGE_PATTERN = Pattern.compile("\\d+(期|区)"); - static final Pattern LETTER_STAGE_PATTERN = Pattern.compile("[A-Za-z]+\\d+(期|区)"); + static final Pattern NUMERICAL_STAGE_PATTERN = Pattern.compile("\\d+(鏈焲鍖�)"); + static final Pattern LETTER_STAGE_PATTERN = Pattern.compile("[A-Za-z]+\\d+(鏈焲鍖�)"); /** - * 格式化要入库的小区名 + * 鏍煎紡鍖栬鍏ュ簱鐨勫皬鍖哄悕 * * @param name * @return @@ -1703,33 +1703,33 @@ public class DataUtil { } /** - * 把自己大小转成人性化的描述 + * 鎶婅嚜宸卞ぇ灏忚浆鎴愪汉鎬у寲鐨勬弿杩� * * @param size * @return */ public static String getHumanSize(long size) { - // 如果字节数少于1024,则直接以B为单位,否则先除于1024,后3位因太少无意义 + // 濡傛灉瀛楄妭鏁板皯浜�1024锛屽垯鐩存帴浠涓哄崟浣嶏紝鍚﹀垯鍏堥櫎浜�1024锛屽悗3浣嶅洜澶皯鏃犳剰涔� if (size < 1024) { return String.valueOf(size) + "B"; } else { size = size / 1024; } - // 如果原字节数除于1024之后,少于1024,则可以直接以KB作为单位 - // 因为还没有到达要使用另一个单位的时候 - // 接下去以此类推 + // 濡傛灉鍘熷瓧鑺傛暟闄や簬1024涔嬪悗锛屽皯浜�1024锛屽垯鍙互鐩存帴浠B浣滀负鍗曚綅 + // 鍥犱负杩樻病鏈夊埌杈捐浣跨敤鍙︿竴涓崟浣嶇殑鏃跺�� + // 鎺ヤ笅鍘讳互姝ょ被鎺� if (size < 1024) { return String.valueOf(size) + "KB"; } else { size = size / 1024; } if (size < 1024) { - // 因为如果以MB为单位的话,要保留最后1位小数, - // 因此,把此数乘以100之后再取余 + // 鍥犱负濡傛灉浠B涓哄崟浣嶇殑璇濓紝瑕佷繚鐣欐渶鍚�1浣嶅皬鏁帮紝 + // 鍥犳锛屾妸姝ゆ暟涔樹互100涔嬪悗鍐嶅彇浣� size = size * 100; return String.valueOf((size / 100)) + "." + String.valueOf((size % 100)) + "MB"; } else { - // 否则如果要以GB为单位的,先除于1024再作同样的处理 + // 鍚﹀垯濡傛灉瑕佷互GB涓哄崟浣嶇殑锛屽厛闄や簬1024鍐嶄綔鍚屾牱鐨勫鐞� size = size * 100 / 1024; return String.valueOf((size / 100)) + "." + String.valueOf((size % 100)) + "GB"; } @@ -1739,8 +1739,8 @@ public class DataUtil { if (str1 == null || str2 == null) { return false; } - str1 = DataUtil.toDBCcase(str1).replace("·", ""); - str2 = DataUtil.toDBCcase(str2).replace("·", ""); + str1 = DataUtil.toDBCcase(str1).replace("路", ""); + str2 = DataUtil.toDBCcase(str2).replace("路", ""); if (str1.contains(str2)) { return true; } @@ -1753,8 +1753,8 @@ public class DataUtil { if (str1 == null || str2 == null) { return false; } - str1 = convertNumberToCn(str1).replace("·", "").toUpperCase(); - str2 = convertNumberToCn(str2).replace("·", "").toUpperCase(); + str1 = convertNumberToCn(str1).replace("路", "").toUpperCase(); + str2 = convertNumberToCn(str2).replace("路", "").toUpperCase(); return str1.contains(str2); } @@ -1774,7 +1774,7 @@ public class DataUtil { } /** - * 返回首字母,如果是汉语,则返回首个汉字拼音的首字母 + * 杩斿洖棣栧瓧姣�,濡傛灉鏄眽璇紝鍒欒繑鍥為涓眽瀛楁嫾闊崇殑棣栧瓧姣� * * @param word * @return @@ -1809,7 +1809,7 @@ public class DataUtil { } /** - * 加密图片url + * 鍔犲瘑鍥剧墖url * * @param u * @param s @@ -1838,7 +1838,7 @@ public class DataUtil { } /** - * 是否是别墅 + * 鏄惁鏄埆澧� * @return */ public static boolean isVilla(Double area, String name, Integer height, Integer room) { @@ -1877,20 +1877,20 @@ public class DataUtil { public static int generateRandomNumber(String address) { - // 使用地址的哈希值作为随机种子 + // 浣跨敤鍦板潃鐨勫搱甯屽�间綔涓洪殢鏈虹瀛� long seed = address.hashCode(); Random random = new Random(seed); - // 生成一个初始随机数来决定范围 + // 鐢熸垚涓�涓垵濮嬮殢鏈烘暟鏉ュ喅瀹氳寖鍥� int initialRandom = random.nextInt(); int result; if (initialRandom > 0) { - // 生成2到10之间的随机数(包含2和10) - result = random.nextInt(9) + 2; // nextInt(9) 生成 0-8,+2 后得到 2-10 + // 鐢熸垚2鍒�10涔嬮棿鐨勯殢鏈烘暟锛堝寘鍚�2鍜�10锛� + result = random.nextInt(9) + 2; // nextInt(9) 鐢熸垚 0-8锛�+2 鍚庡緱鍒� 2-10 } else { - // 生成-5到-2之间的随机数(包含-5和-2) - result = random.nextInt(4) - 5; // nextInt(4) 生成 0-3,-5 后得到 -5到-2 + // 鐢熸垚-5鍒�-2涔嬮棿鐨勯殢鏈烘暟锛堝寘鍚�-5鍜�-2锛� + result = random.nextInt(4) - 5; // nextInt(4) 鐢熸垚 0-3锛�-5 鍚庡緱鍒� -5鍒�-2 } return result; } @@ -1898,8 +1898,8 @@ public class DataUtil { public static void main(String[] args) { - System.out.println(isChineseChar("6文怡a花园")); -// System.out.println(getFirstChar("文怡花园")); + System.out.println(isChineseChar("6鏂囨�鑺卞洯")); +// System.out.println(getFirstChar("鏂囨�¤姳鍥�")); // // System.out.println(FourUpSixInto("258.393", 2)); diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/DateUtil.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/DateUtil.java index 27657a036..2d0fc0d1a 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/DateUtil.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/DateUtil.java @@ -76,7 +76,7 @@ public class DateUtil { } /** - * 获取去年同期的一个星期日 + * 鑾峰彇鍘诲勾鍚屾湡鐨勪竴涓槦鏈熸棩 * * @return */ @@ -87,7 +87,7 @@ public class DateUtil { } /** - * 获取上个月同期的一个星期日 + * 鑾峰彇涓婁釜鏈堝悓鏈熺殑涓�涓槦鏈熸棩 * * @return */ @@ -98,7 +98,7 @@ public class DateUtil { } /** - * 获取半年前同期的一个星期日 + * 鑾峰彇鍗婂勾鍓嶅悓鏈熺殑涓�涓槦鏈熸棩 * * @return */ @@ -111,7 +111,7 @@ public class DateUtil { /** - * 去年同月的第一天 + * 鍘诲勾鍚屾湀鐨勭涓�澶� */ public static Date getThisMonthInLastYear(Date date) { date = getDateOfLastMonth(null == date ? new Date() : date, -12); @@ -120,7 +120,7 @@ public class DateUtil { } /** - * 上个月第一天 + * 涓婁釜鏈堢涓�澶� */ public static Date getFirstDayOfLastMonth(Date date) { date = getDateOfLastMonth(date, -1); @@ -129,7 +129,7 @@ public class DateUtil { } /** - * 当月第一天 + * 褰撴湀绗竴澶� */ public static Date getFirstDayOfCurrentMonth(Date date) { date = getDateOfLastMonth(date, 0); @@ -166,7 +166,7 @@ public class DateUtil { } /** - * 根据日历得到那一天的星期天是哪天 注意:输入的calendar最后的值同返回值一样 + * 鏍规嵁鏃ュ巻寰楀埌閭d竴澶╃殑鏄熸湡澶╂槸鍝ぉ 娉ㄦ剰锛氳緭鍏ョ殑calendar鏈�鍚庣殑鍊煎悓杩斿洖鍊间竴鏍� * * @param calendar * @return @@ -315,7 +315,7 @@ public class DateUtil { } /** - * 把date truncate到日期为止,去掉时分秒 + * 鎶奷ate truncate鍒版棩鏈熶负姝�,鍘绘帀鏃跺垎绉� * * @param date * @return @@ -325,7 +325,7 @@ public class DateUtil { } /** - * 得到这一天的范围.比如如果输入的是2007-12-12 12:36:40,则返回的是2007-12-12 00:00:00和2007-12-13 + * 寰楀埌杩欎竴澶╃殑鑼冨洿.姣斿濡傛灉杈撳叆鐨勬槸2007-12-12 12:36:40,鍒欒繑鍥炵殑鏄�2007-12-12 00:00:00鍜�2007-12-13 * 0:0:0 * * @param date @@ -339,7 +339,7 @@ public class DateUtil { } /** - * 转化日期成yyyy-mm-dd的String格式 + * 杞寲鏃ユ湡鎴恲yyy-mm-dd鐨凷tring鏍煎紡 * * @param date * @return @@ -373,7 +373,7 @@ public class DateUtil { /** - * 转化日期成yyyy-mm-dd hh:mm:ss的String格式 + * 杞寲鏃ユ湡鎴恲yyy-mm-dd hh:mm:ss鐨凷tring鏍煎紡 * * @param date * @return @@ -429,7 +429,7 @@ public class DateUtil { } /** - * 转化日期成yyyymmddhhmmss的String格式 + * 杞寲鏃ユ湡鎴恲yyymmddhhmmss鐨凷tring鏍煎紡 * * @param date * @return @@ -448,7 +448,7 @@ public class DateUtil { } /** - * 转化日期成yyyymmdd的String格式 + * 杞寲鏃ユ湡鎴恲yyymmdd鐨凷tring鏍煎紡 * * @param date * @return @@ -467,7 +467,7 @@ public class DateUtil { } /** - * 转化日期HHmmss的String格式 + * 杞寲鏃ユ湡HHmmss鐨凷tring鏍煎紡 * * @param date * @return @@ -486,7 +486,7 @@ public class DateUtil { } /** - * 转化日期成yymmdd的String格式 + * 杞寲鏃ユ湡鎴恲ymmdd鐨凷tring鏍煎紡 * * @param date * @return @@ -505,7 +505,7 @@ public class DateUtil { } /** - * 转化日期成yy-mm-dd的String格式 + * 杞寲鏃ユ湡鎴恲y-mm-dd鐨凷tring鏍煎紡 * * @param date * @return @@ -524,7 +524,7 @@ public class DateUtil { } /*************************************************************************** - * 返回之前几个月或之后几个月的今天 + * 杩斿洖涔嬪墠鍑犱釜鏈堟垨涔嬪悗鍑犱釜鏈堢殑浠婂ぉ * * @param date * @param num @@ -548,8 +548,8 @@ public class DateUtil { } /*************************************************************************** - * 根据传入的日期以及数字获得当前日期之前或者之后月份的起始日期 如传入2007-06-21,6返回 日期为2007-12-1的date - * 如传入2007-06-21,-6返回 日期为2006-12-1的date + * 鏍规嵁浼犲叆鐨勬棩鏈熶互鍙婃暟瀛楄幏寰楀綋鍓嶆棩鏈熶箣鍓嶆垨鑰呬箣鍚庢湀浠界殑璧峰鏃ユ湡 濡備紶鍏�2007-06-21锛�6杩斿洖 鏃ユ湡涓�2007-12-1鐨刣ate + * 濡備紶鍏�2007-06-21锛�-6杩斿洖 鏃ユ湡涓�2006-12-1鐨刣ate * * @param date * @param num @@ -605,8 +605,8 @@ public class DateUtil { } /** - * 获取给定日期date向后推算num天的日期列表
- * 注意:此时包含传入的date, 否则可设置第三个参数为false + * 鑾峰彇缁欏畾鏃ユ湡date鍚戝悗鎺ㄧ畻num澶╃殑鏃ユ湡鍒楄〃
+ * 娉ㄦ剰锛氭鏃跺寘鍚紶鍏ョ殑date, 鍚﹀垯鍙缃涓変釜鍙傛暟涓篺alse * * @param date * @param num @@ -617,12 +617,12 @@ public class DateUtil { } /** - * 获取给定日期date向后推算num天的日期列表 + * 鑾峰彇缁欏畾鏃ユ湡date鍚戝悗鎺ㄧ畻num澶╃殑鏃ユ湡鍒楄〃 * * @param date * @param num * @param contains - * 是否包含date + * 鏄惁鍖呭惈date * @return */ public static List getBeforeDates(Date date, int num, boolean contains) { @@ -791,7 +791,7 @@ public class DateUtil { } /** - * 获取与dete之前或后的第num个整点 + * 鑾峰彇涓巇ete涔嬪墠鎴栧悗鐨勭num涓暣鐐� */ public static Date getHour(Date date, int num) { date = DateUtils.addHours(date, num); @@ -825,7 +825,7 @@ public class DateUtil { /** * @param endDate * @param count - * @return 自endDate始,共count个weekend的列表 + * @return 鑷猠ndDate濮嬶紝鍏眂ount涓獁eekend鐨勫垪琛� */ public static List getWeekendList(Date endDate, int count) { if (count < 1) @@ -853,7 +853,7 @@ public class DateUtil { * @param dates * @param pattern * @param pattern - * @return 到endMonth为止,共count个月,用pattern进行格式化 + * @return 鍒癳ndMonth涓烘锛屽叡count涓湀锛岀敤pattern杩涜鏍煎紡鍖� */ public static List formatDates(List dates, String pattern) { List ret = new ArrayList(dates.size()); @@ -868,7 +868,7 @@ public class DateUtil { * * @param endMonth * @param count - * @return 到endMonth为止,共count个月 + * @return 鍒癳ndMonth涓烘锛屽叡count涓湀 */ public static List getMonthList(Date endMonth, int count) { if (count < 1) @@ -922,7 +922,7 @@ public class DateUtil { * * @param endMonth * @param count - * @return 自endMonth起,count个月的weekend列表 + * @return 鑷猠ndMonth璧凤紝count涓湀鐨剋eekend鍒楄〃 */ public static List getWeekendListByMonth(Date endMonth, int count) { if (count < 1) @@ -983,7 +983,7 @@ public class DateUtil { } /** - * 得到两个日期的差值
+ * 寰楀埌涓や釜鏃ユ湡鐨勫樊鍊�
* between('2009-11-10', '2008-12-12', Calendar.YEAR) == 1
* between('2009-11-10', '2008-12-12', Calendar.MONTH) == 11
* between('2009-11-10', '2008-12-12', Calendar.WEEK_OF_YEAR) == 47
@@ -1074,7 +1074,7 @@ public class DateUtil { return calendar.getTime(); } - // yyyy-MM-dd HH:mm:ss 24小时 + // yyyy-MM-dd HH:mm:ss 24灏忔椂 public static List getDateByInterval(Date startDate, Date endDate, int interval, int calendarField, String switching, String pattern) { @@ -1129,7 +1129,7 @@ public class DateUtil { } } - // 推荐使用 + // 鎺ㄨ崘浣跨敤 public static List getDateByIntervalL(Date startDate, Date endDate, int interval, int calendarField, String switching) { Date _startDate = DateUtils.truncate(startDate, calendarField); Date _endDate = DateUtils.truncate(endDate, calendarField); @@ -1185,7 +1185,7 @@ public class DateUtil { private static long YEAR_SEC = MONTH_SEC * 12; /** - * 获取时间与日期时间的文字描述 + * 鑾峰彇鏃堕棿涓庢棩鏈熸椂闂寸殑鏂囧瓧鎻忚堪 * * @param date * @return @@ -1200,23 +1200,23 @@ public class DateUtil { long diffSec = (msNow - msInput) / 1000; if (diffSec < DAY_SEC) { if (diffSec >= HOUR_SEC) { - return (diffSec / HOUR_SEC) + "小时前"; + return (diffSec / HOUR_SEC) + "灏忔椂鍓�"; } else if (diffSec >= MINU_SEC) { - return (diffSec / MINU_SEC) + "分钟前"; + return (diffSec / MINU_SEC) + "鍒嗛挓鍓�"; } else { - return "刚刚"; + return "鍒氬垰"; } } else if (diffSec < MONTH_SEC) { - return (diffSec / DAY_SEC) + "天前"; + return (diffSec / DAY_SEC) + "澶╁墠"; } else if (diffSec < YEAR_SEC) { - return ((int) (diffSec / MONTH_SEC)) + "月前"; + return ((int) (diffSec / MONTH_SEC)) + "鏈堝墠"; } else { int yearInput = inputCalendar.get(Calendar.YEAR); int yearNow = systemCalendar.get(Calendar.YEAR); - return (yearNow - yearInput) + "年前"; + return (yearNow - yearInput) + "骞村墠"; } } else { - return "刚刚";// 输入时间大于 系统时间 返回 "刚刚" + return "鍒氬垰";// 杈撳叆鏃堕棿澶т簬 绯荤粺鏃堕棿 杩斿洖 "鍒氬垰" } } @@ -1232,39 +1232,39 @@ public class DateUtil { long diffSec = (msNow - msInput) / 1000; if (diffSec < DAY_SEC) { if (diffSec >= HOUR_SEC) { - return (diffSec / HOUR_SEC) + "小时前"; + return (diffSec / HOUR_SEC) + "灏忔椂鍓�"; } else if (diffSec >= MINU_SEC) { - return (diffSec / MINU_SEC) + "分钟前"; + return (diffSec / MINU_SEC) + "鍒嗛挓鍓�"; } else { - return "刚刚"; + return "鍒氬垰"; } } else if (diffSec < MONTH_SEC) { - return (diffSec / DAY_SEC) + "天前"; + return (diffSec / DAY_SEC) + "澶╁墠"; } else if (diffSec < YEAR_SEC) { - return ((int) (diffSec / MONTH_SEC)) + "月前"; + return ((int) (diffSec / MONTH_SEC)) + "鏈堝墠"; } else { int yearInput = inputCalendar.get(Calendar.YEAR); int yearNow = systemCalendar.get(Calendar.YEAR); - return (yearNow - yearInput) + "年前"; + return (yearNow - yearInput) + "骞村墠"; } } else { - return "刚刚";// 输入时间大于 系统时间 返回 "刚刚" + return "鍒氬垰";// 杈撳叆鏃堕棿澶т簬 绯荤粺鏃堕棿 杩斿洖 "鍒氬垰" } } /** - * 获取距离系统时间的数字型 - * FIXME:该代码有bug,(例如:2012年1月1日-2011年12月30日返回的是1年前),推荐使用getShortDateText(Date + * 鑾峰彇璺濈绯荤粺鏃堕棿鐨勬暟瀛楀瀷 + * FIXME:璇ヤ唬鐮佹湁bug锛�(渚嬪:2012骞�1鏈�1鏃�-2011骞�12鏈�30鏃ヨ繑鍥炵殑鏄�1骞村墠),鎺ㄨ崘浣跨敤getShortDateText(Date * date) */ public static String getDaysBeforeNow(Date date) { long sysTime = Long.parseLong(formatToYYYYMMDDhhmmss(new Date())); long ymdhms = Long.parseLong(formatToYYYYMMDDhhmmss(date)); - String strYear = "年前"; - String strMonth = "月前"; - String strDay = "天前"; - String strHour = "小时前"; - String strMinute = "分钟前"; + String strYear = "骞村墠"; + String strMonth = "鏈堝墠"; + String strDay = "澶╁墠"; + String strHour = "灏忔椂鍓�"; + String strMinute = "鍒嗛挓鍓�"; try { if (ymdhms == 0) { return ""; @@ -1296,7 +1296,7 @@ public class DateUtil { } /** - * 获取大概小时差 + * 鑾峰彇澶ф灏忔椂宸� * * @param publishDate * @param strFormatter @@ -1307,7 +1307,7 @@ public class DateUtil { if (null != publishDate) { if (publishDate.after(range[0]) && publishDate.before(range[1])) { int dateDiff = DateUtil.getHour(new Date()) - DateUtil.getHour(publishDate); - return dateDiff > 0 ? dateDiff + "小时前" : "1小时内"; + return dateDiff > 0 ? dateDiff + "灏忔椂鍓�" : "1灏忔椂鍐�"; } else { return (DateUtil.formatByPattern(publishDate, strFormatter)); } @@ -1317,7 +1317,7 @@ public class DateUtil { } /** - * 获取给定日期的本周星期天 + * 鑾峰彇缁欏畾鏃ユ湡鐨勬湰鍛ㄦ槦鏈熷ぉ * * @param date * @return @@ -1331,7 +1331,7 @@ public class DateUtil { } /** - * 获取给定日期的下一个星期天 + * 鑾峰彇缁欏畾鏃ユ湡鐨勪笅涓�涓槦鏈熷ぉ * * @param date * @return @@ -1341,7 +1341,7 @@ public class DateUtil { } /** - * 获取给定日期的上一个星期天 + * 鑾峰彇缁欏畾鏃ユ湡鐨勪笂涓�涓槦鏈熷ぉ * * @param date * @return @@ -1352,7 +1352,7 @@ public class DateUtil { /** - * 将任意字符串将成date + * 灏嗕换鎰忓瓧绗︿覆灏嗘垚date * @param date * @return * @throws ParseException @@ -1363,10 +1363,10 @@ public class DateUtil { } Date result = null; String parse = null; - //parse=parse.replaceFirst("^.*?[0-9]{4}(年)?([^0-9]?)", "yyyy$1"); - //parse=parse.replaceFirst("([^0-9]?)[0-9]{1,2}(月)?([^0-9]?)", "$1MM$2"); + //parse=parse.replaceFirst("^.*?[0-9]{4}(骞�)?([^0-9]?)", "yyyy$1"); + //parse=parse.replaceFirst("([^0-9]?)[0-9]{1,2}(鏈�)?([^0-9]?)", "$1MM$2"); //parse=parse.replaceFirst("([^0-9]?)[0-9]{1,2}( ?)", "$1dd$2"); - Pattern p=Pattern.compile("(\\d{4})[-|年|.]?(\\d{1,2})?[-|月|.]?(\\d{1,2})?日?"); + Pattern p=Pattern.compile("(\\d{4})[-|骞磡.]?(\\d{1,2})?[-|鏈坾.]?(\\d{1,2})?鏃�?"); Matcher m=p.matcher(date); if(m.find()){ @@ -1401,7 +1401,7 @@ public class DateUtil { if(dateStr == null){ return null; } - Pattern p=Pattern.compile("(\\d{1,4})[-|年|/|.]?(\\d{1,2})?[-|月|/|.]?(\\d{1,2})?日?"); + Pattern p=Pattern.compile("(\\d{1,4})[-|骞磡/|.]?(\\d{1,2})?[-|鏈坾/|.]?(\\d{1,2})?鏃�?"); Matcher m=p.matcher(dateStr); String finalPattern = "yyyy"; String pattern = ""; @@ -1462,7 +1462,7 @@ public class DateUtil { if(dateStr == null){ return null; } - Pattern p=Pattern.compile("(\\d{1,4})[-|年|/|.]?(\\d{1,2})?[-|月|/|.]?(\\d{1,2})?日?"); + Pattern p=Pattern.compile("(\\d{1,4})[-|骞磡/|.]?(\\d{1,2})?[-|鏈坾/|.]?(\\d{1,2})?鏃�?"); Matcher m=p.matcher(dateStr); String finalPattern = "yyyy"; String pattern = ""; @@ -1557,15 +1557,15 @@ public class DateUtil { } /** - * 增加日期的天数 - * 此方法用于给定一个日期后,增加指定数量的天数 + * 澧炲姞鏃ユ湡鐨勫ぉ鏁� + * 姝ゆ柟娉曠敤浜庣粰瀹氫竴涓棩鏈熷悗锛屽鍔犳寚瀹氭暟閲忕殑澶╂暟 * - * @param date 原始日期 - * @param amount 要增加的天数,正数表示未来日期,负数表示过去日期 - * @return 增加天数后的日期 + * @param date 鍘熷鏃ユ湡 + * @param amount 瑕佸鍔犵殑澶╂暟锛屾鏁拌〃绀烘湭鏉ユ棩鏈燂紝璐熸暟琛ㄧず杩囧幓鏃ユ湡 + * @return 澧炲姞澶╂暟鍚庣殑鏃ユ湡 */ public static Date add(Date date,int amount){ - // 调用另一个重载的add方法,将Calendar.DATE作为参数,表示按天数增加 + // 璋冪敤鍙︿竴涓噸杞界殑add鏂规硶锛屽皢Calendar.DATE浣滀负鍙傛暟锛岃〃绀烘寜澶╂暟澧炲姞 return add(date,Calendar.DATE,amount); } @@ -1631,7 +1631,7 @@ public class DateUtil { } /** - * 转化日期成yy-mm的String格式 + * 杞寲鏃ユ湡鎴恲y-mm鐨凷tring鏍煎紡 * * @param date * @return @@ -1661,7 +1661,7 @@ public class DateUtil { if (date == null) { return ""; } - String[] weekDays = { "星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六" }; + String[] weekDays = { "鏄熸湡鏃�", "鏄熸湡涓�", "鏄熸湡浜�", "鏄熸湡涓�", "鏄熸湡鍥�", "鏄熸湡浜�", "鏄熸湡鍏�" }; Calendar cal = Calendar.getInstance(); cal.setTime(date); int w = cal.get(Calendar.DAY_OF_WEEK) - 1; @@ -1686,18 +1686,18 @@ public class DateUtil { Calendar cal = Calendar.getInstance(); cal.setTime(date); cal.add(Calendar.MONTH, -1); - // 得到前一个月的第一天 + // 寰楀埌鍓嶄竴涓湀鐨勭涓�澶� cal.set(Calendar.DAY_OF_MONTH, cal.getActualMinimum(Calendar.DAY_OF_MONTH)); map.put("first", cal.getTime()); - // 得到前一个月的最后一天 + // 寰楀埌鍓嶄竴涓湀鐨勬渶鍚庝竴澶� cal.set(Calendar.DAY_OF_MONTH, cal.getActualMaximum(Calendar.DAY_OF_MONTH)); map.put("last", cal.getTime()); return map; } /** - * 根据传入的date得到days天之后的时间,days<0则取之前 + * 鏍规嵁浼犲叆鐨刣ate寰楀埌days澶╀箣鍚庣殑鏃堕棿,days<0鍒欏彇涔嬪墠 * * @param date * @param days diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/DictAccessUtil.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/DictAccessUtil.java index 8bad9a4e6..0dcc2b53c 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/DictAccessUtil.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/DictAccessUtil.java @@ -11,7 +11,7 @@ import org.apache.commons.lang.StringUtils; import com.fangjia.core.util.DataUtil; /** - * 词典准入规则 + * 璇嶅吀鍑嗗叆瑙勫垯 * * @author Administrator * @@ -19,20 +19,20 @@ import com.fangjia.core.util.DataUtil; public class DictAccessUtil { private static Pattern PATT1 = Pattern.compile(".+[0-9A-Za-z]$"); private static Pattern PATT2 = Pattern.compile("^[0-9].+"); - private static Pattern PATT3 = Pattern.compile("(.+)([0-9|一|二|三|四|五|六|七|八|九|十]期)$"); - private static Pattern PATT4 = Pattern.compile("(.+)([0-9A-Za-z|一|二|三|四|五|六|七|八|九|十]区)$"); - private static Pattern PATT5 = Pattern.compile("【.+】(.+)"); - private static final List LEFT_SYMBOLS = Arrays.asList("(","户型"); - private static final List SPLIT_SYMBOLS = Arrays.asList("·", ".", "?", "·", "-", "、", ","); - private static final List ILLEGAL_SYMBOLS = Arrays.asList("底商", "社区", "酒店", "项目", "供销楼", "站", "平楼","宿舍","回迁房","本案","贵宾楼"); + private static Pattern PATT3 = Pattern.compile("(.+)([0-9|涓�|浜寍涓墊鍥泑浜攟鍏瓅涓億鍏珅涔潀鍗乚鏈�)$"); + private static Pattern PATT4 = Pattern.compile("(.+)([0-9A-Za-z|涓�|浜寍涓墊鍥泑浜攟鍏瓅涓億鍏珅涔潀鍗乚鍖�)$"); + private static Pattern PATT5 = Pattern.compile("銆�.+銆�(.+)"); + private static final List LEFT_SYMBOLS = Arrays.asList("(","鎴峰瀷"); + private static final List SPLIT_SYMBOLS = Arrays.asList("路", ".", "?", "·", "-", "銆�", ","); + private static final List ILLEGAL_SYMBOLS = Arrays.asList("搴曞晢", "绀惧尯", "閰掑簵", "椤圭洰", "渚涢攢妤�", "绔�", "骞虫ゼ","瀹胯垗","鍥炶縼鎴�","鏈","璐靛妤�"); - private static Pattern ROAD1 = Pattern.compile("(.{2,7}[路|街|巷|巷子|大道|干道|南侧|北侧|东侧|西侧|南边|北边|东边|西边|旁|旁边|对面])(.*)"); - private static Pattern ROAD2 = Pattern.compile("([紧邻|毗邻](.){2,7})(.*)"); + private static Pattern ROAD1 = Pattern.compile("(.{2,7}[璺瘄琛梶宸穦宸峰瓙|澶ч亾|骞查亾|鍗椾晶|鍖椾晶|涓滀晶|瑗夸晶|鍗楄竟|鍖楄竟|涓滆竟|瑗胯竟|鏃亅鏃佽竟|瀵归潰])(.*)"); + private static Pattern ROAD2 = Pattern.compile("([绱ч偦|姣楅偦](.){2,7})(.*)"); - private static Pattern SPLIT1 = Pattern.compile("(.{2,})[和|与](.{2,})"); + private static Pattern SPLIT1 = Pattern.compile("(.{2,})[鍜寍涓嶿(.{2,})"); public static void main(String[] args) { -// String s = "白沙路仪化游泳馆旁"; +// String s = "鐧芥矙璺华鍖栨父娉抽鏃�"; // Matcher m = ROAD1.matcher(s); // if (m.matches()) { // System.out.println("------------------"); @@ -40,7 +40,7 @@ public class DictAccessUtil { // System.out.println(m.group(1)); // System.out.println(m.group(2)); // } - String s = "continuity(延平425)";//【南京】德国新城 + String s = "continuity(寤跺钩425)";//銆愬崡浜�戝痉鍥芥柊鍩� districtNameAccess(s); } @@ -67,7 +67,7 @@ public class DictAccessUtil { } /** - * 小区类型词典 + * 灏忓尯绫诲瀷璇嶅吀 * * @param p * @return diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/DingDingMessageUtil.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/DingDingMessageUtil.java index b1abdb86c..5fb73be68 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/DingDingMessageUtil.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/DingDingMessageUtil.java @@ -6,7 +6,7 @@ import java.net.HttpURLConnection; import java.net.URL; /** - * 钉钉机器人发送消息 + * 閽夐拤鏈哄櫒浜哄彂閫佹秷鎭� * https://open-doc.dingtalk.com/docs/doc.htm?spm=a219a.7629140.0.0.karFPe&treeId=257&articleId=105735&docType=1 * * @author yinjihuan @@ -22,7 +22,7 @@ public class DingDingMessageUtil { message.setMsgtype("text"); message.setText(new MessageInfo(msg)); URL url = new URL("https://oapi.dingtalk.com/robot/send?access_token=" + token); - // 建立http连接 + // 寤虹珛http杩炴帴 HttpURLConnection conn = (HttpURLConnection) url.openConnection(); conn.setDoOutput(true); conn.setDoInput(true); diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/DistrictCodeUtils.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/DistrictCodeUtils.java index 8fecac848..636a549c0 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/DistrictCodeUtils.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/DistrictCodeUtils.java @@ -25,681 +25,681 @@ public class DistrictCodeUtils { System.out.println(getCityName("110000")); } static{ - DISTRICT_CODES.put("阿拉善盟","152900"); - DISTRICT_CODES.put("锡林郭勒盟","152500"); - DISTRICT_CODES.put("兴安盟","152200"); - DISTRICT_CODES.put("林芝","542621"); - DISTRICT_CODES.put("阿里","542500"); - DISTRICT_CODES.put("昌都","542121"); - DISTRICT_CODES.put("红河","532529"); - DISTRICT_CODES.put("大兴安岭","232700"); - DISTRICT_CODES.put("那曲","542421"); - DISTRICT_CODES.put("山南","542200"); - DISTRICT_CODES.put("伊犁","654000"); - DISTRICT_CODES.put("克孜勒苏","653000"); - DISTRICT_CODES.put("巴音郭楞","652800"); - DISTRICT_CODES.put("博尔塔拉","652700"); - DISTRICT_CODES.put("铁门关","659006"); - DISTRICT_CODES.put("双河","659007"); - DISTRICT_CODES.put("北屯","659005"); - DISTRICT_CODES.put("北京","110000"); - DISTRICT_CODES.put("天津","120000"); - DISTRICT_CODES.put("石家庄","130100"); - DISTRICT_CODES.put("辛集","130181"); - DISTRICT_CODES.put("藁城","130182"); - DISTRICT_CODES.put("晋州","130183"); - DISTRICT_CODES.put("新乐","130184"); - DISTRICT_CODES.put("鹿泉","130185"); - DISTRICT_CODES.put("唐山","130200"); - DISTRICT_CODES.put("遵化","130281"); - DISTRICT_CODES.put("迁安","130283"); - DISTRICT_CODES.put("秦皇岛","130300"); - DISTRICT_CODES.put("邯郸","130400"); - DISTRICT_CODES.put("武安","130481"); - DISTRICT_CODES.put("邢台","130500"); - DISTRICT_CODES.put("南宫","130581"); - DISTRICT_CODES.put("沙河","130582"); - DISTRICT_CODES.put("保定","130600"); - DISTRICT_CODES.put("涿州","130681"); - DISTRICT_CODES.put("定州","130682"); - DISTRICT_CODES.put("安国","130683"); - DISTRICT_CODES.put("高碑店","130684"); - DISTRICT_CODES.put("张家口","130700"); - DISTRICT_CODES.put("承德","130800"); - DISTRICT_CODES.put("沧州","130900"); - DISTRICT_CODES.put("泊头","130981"); - DISTRICT_CODES.put("任丘","130982"); - DISTRICT_CODES.put("黄骅","130983"); - DISTRICT_CODES.put("河间","130984"); - DISTRICT_CODES.put("廊坊","131000"); - DISTRICT_CODES.put("霸州","131081"); - DISTRICT_CODES.put("三河","131082"); - DISTRICT_CODES.put("衡水","131100"); - DISTRICT_CODES.put("冀州","131181"); - DISTRICT_CODES.put("深州","131182"); - DISTRICT_CODES.put("太原","140100"); - DISTRICT_CODES.put("古交","140181"); - DISTRICT_CODES.put("大同","140200"); - DISTRICT_CODES.put("阳泉","140300"); - DISTRICT_CODES.put("长治","140400"); - DISTRICT_CODES.put("潞城","140481"); - DISTRICT_CODES.put("晋城","140500"); - DISTRICT_CODES.put("高平","140581"); - DISTRICT_CODES.put("朔州","140600"); - DISTRICT_CODES.put("晋中","140700"); - DISTRICT_CODES.put("介休","140781"); - DISTRICT_CODES.put("运城","140800"); - DISTRICT_CODES.put("永济","140881"); - DISTRICT_CODES.put("河津","140882"); - DISTRICT_CODES.put("忻州","140900"); - DISTRICT_CODES.put("原平","140981"); - DISTRICT_CODES.put("临汾","141000"); - DISTRICT_CODES.put("侯马","141081"); - DISTRICT_CODES.put("霍州","141082"); - DISTRICT_CODES.put("吕梁","141100"); - DISTRICT_CODES.put("孝义","141181"); - DISTRICT_CODES.put("汾阳","141182"); - DISTRICT_CODES.put("呼和浩特","150100"); - DISTRICT_CODES.put("包头","150200"); - DISTRICT_CODES.put("乌海","150300"); - DISTRICT_CODES.put("赤峰","150400"); - DISTRICT_CODES.put("通辽","150500"); - DISTRICT_CODES.put("霍林郭勒","150581"); - DISTRICT_CODES.put("鄂尔多斯","150600"); - DISTRICT_CODES.put("呼伦贝尔","150700"); - DISTRICT_CODES.put("满洲里","150781"); - DISTRICT_CODES.put("牙克石","150782"); - DISTRICT_CODES.put("扎兰屯","150783"); - DISTRICT_CODES.put("额尔古纳","150784"); - DISTRICT_CODES.put("根河","150785"); - DISTRICT_CODES.put("巴彦淖尔","150800"); - DISTRICT_CODES.put("乌兰察布","150900"); - DISTRICT_CODES.put("丰镇","150981"); - DISTRICT_CODES.put("乌兰浩特","152201"); - DISTRICT_CODES.put("阿尔山","152202"); - DISTRICT_CODES.put("二连浩特","152501"); - DISTRICT_CODES.put("锡林浩特","152502"); - DISTRICT_CODES.put("沈阳","210100"); - DISTRICT_CODES.put("新民","210181"); - DISTRICT_CODES.put("大连","210200"); - DISTRICT_CODES.put("瓦房店","210281"); - DISTRICT_CODES.put("普兰店","210282"); - DISTRICT_CODES.put("庄河","210283"); - DISTRICT_CODES.put("鞍山","210300"); - DISTRICT_CODES.put("海城","210381"); - DISTRICT_CODES.put("抚顺","210400"); - DISTRICT_CODES.put("本溪","210500"); - DISTRICT_CODES.put("丹东","210600"); - DISTRICT_CODES.put("东港","210681"); - DISTRICT_CODES.put("凤城","210682"); - DISTRICT_CODES.put("锦州","210700"); - DISTRICT_CODES.put("凌海","210781"); - DISTRICT_CODES.put("北镇","210782"); - DISTRICT_CODES.put("营口","210800"); - DISTRICT_CODES.put("盖州","210881"); - DISTRICT_CODES.put("大石桥","210882"); - DISTRICT_CODES.put("阜新","210900"); - DISTRICT_CODES.put("辽阳","211000"); - DISTRICT_CODES.put("灯塔","211081"); - DISTRICT_CODES.put("盘锦","211100"); - DISTRICT_CODES.put("铁岭","211200"); - DISTRICT_CODES.put("调兵山","211281"); - DISTRICT_CODES.put("开原","211282"); - DISTRICT_CODES.put("朝阳","211300"); - DISTRICT_CODES.put("北票","211381"); - DISTRICT_CODES.put("凌源","211382"); - DISTRICT_CODES.put("葫芦岛","211400"); - DISTRICT_CODES.put("兴城","211481"); - DISTRICT_CODES.put("长春","220100"); - DISTRICT_CODES.put("九台","220181"); - DISTRICT_CODES.put("榆树","220182"); - DISTRICT_CODES.put("德惠","220183"); - DISTRICT_CODES.put("吉林","220200"); - DISTRICT_CODES.put("蛟河","220281"); - DISTRICT_CODES.put("桦甸","220282"); - DISTRICT_CODES.put("舒兰","220283"); - DISTRICT_CODES.put("磐石","220284"); - DISTRICT_CODES.put("四平","220300"); - DISTRICT_CODES.put("公主岭","220381"); - DISTRICT_CODES.put("双辽","220382"); - DISTRICT_CODES.put("辽源","220400"); - DISTRICT_CODES.put("通化","220500"); - DISTRICT_CODES.put("梅河口","220581"); - DISTRICT_CODES.put("集安","220582"); - DISTRICT_CODES.put("白山","220600"); - DISTRICT_CODES.put("临江","220681"); - DISTRICT_CODES.put("松原","220700"); - DISTRICT_CODES.put("扶余","220781"); - DISTRICT_CODES.put("白城","220800"); - DISTRICT_CODES.put("洮南","220881"); - DISTRICT_CODES.put("大安","220882"); - DISTRICT_CODES.put("延吉","222401"); - DISTRICT_CODES.put("图们","222402"); - DISTRICT_CODES.put("敦化","222403"); - DISTRICT_CODES.put("珲春","222404"); - DISTRICT_CODES.put("龙井","222405"); - DISTRICT_CODES.put("和龙","222406"); - DISTRICT_CODES.put("哈尔滨","230100"); - DISTRICT_CODES.put("双城","230182"); - DISTRICT_CODES.put("尚志","230183"); - DISTRICT_CODES.put("五常","230184"); - DISTRICT_CODES.put("齐齐哈尔","230200"); - DISTRICT_CODES.put("讷河","230281"); - DISTRICT_CODES.put("鸡西","230300"); - DISTRICT_CODES.put("虎林","230381"); - DISTRICT_CODES.put("密山","230382"); - DISTRICT_CODES.put("鹤岗","230400"); - DISTRICT_CODES.put("双鸭山","230500"); - DISTRICT_CODES.put("大庆","230600"); - DISTRICT_CODES.put("伊春","230700"); - DISTRICT_CODES.put("铁力","230781"); - DISTRICT_CODES.put("佳木斯","230800"); - DISTRICT_CODES.put("同江","230881"); - DISTRICT_CODES.put("富锦","230882"); - DISTRICT_CODES.put("七台河","230900"); - DISTRICT_CODES.put("牡丹江","231000"); - DISTRICT_CODES.put("绥芬河","231081"); - DISTRICT_CODES.put("海林","231083"); - DISTRICT_CODES.put("宁安","231084"); - DISTRICT_CODES.put("穆棱","231085"); - DISTRICT_CODES.put("黑河","231100"); - DISTRICT_CODES.put("北安","231181"); - DISTRICT_CODES.put("五大连池","231182"); - DISTRICT_CODES.put("绥化","231200"); - DISTRICT_CODES.put("安达","231281"); - DISTRICT_CODES.put("肇东","231282"); - DISTRICT_CODES.put("海伦","231283"); - DISTRICT_CODES.put("上海","310000"); - DISTRICT_CODES.put("南京","320100"); - DISTRICT_CODES.put("无锡","320200"); - DISTRICT_CODES.put("江阴","320281"); - DISTRICT_CODES.put("宜兴","320282"); - DISTRICT_CODES.put("徐州","320300"); - DISTRICT_CODES.put("新沂","320381"); - DISTRICT_CODES.put("邳州","320382"); - DISTRICT_CODES.put("常州","320400"); - DISTRICT_CODES.put("溧阳","320481"); - DISTRICT_CODES.put("金坛","320482"); - DISTRICT_CODES.put("苏州","320500"); - DISTRICT_CODES.put("常熟","320581"); - DISTRICT_CODES.put("张家港","320582"); - DISTRICT_CODES.put("昆山","320583"); - DISTRICT_CODES.put("太仓","320585"); - DISTRICT_CODES.put("南通","320600"); - DISTRICT_CODES.put("启东","320681"); - DISTRICT_CODES.put("如皋","320682"); - DISTRICT_CODES.put("海门","320684"); - DISTRICT_CODES.put("连云港","320700"); - DISTRICT_CODES.put("淮安","320800"); - DISTRICT_CODES.put("盐城","320900"); - DISTRICT_CODES.put("东台","320981"); - DISTRICT_CODES.put("大丰","320982"); - DISTRICT_CODES.put("扬州","321000"); - DISTRICT_CODES.put("仪征","321081"); - DISTRICT_CODES.put("高邮","321084"); - DISTRICT_CODES.put("镇江","321100"); - DISTRICT_CODES.put("丹阳","321181"); - DISTRICT_CODES.put("扬中","321182"); - DISTRICT_CODES.put("句容","321183"); - DISTRICT_CODES.put("泰州","321200"); - DISTRICT_CODES.put("兴化","321281"); - DISTRICT_CODES.put("靖江","321282"); - DISTRICT_CODES.put("泰兴","321283"); - DISTRICT_CODES.put("宿迁","321300"); - DISTRICT_CODES.put("杭州","330100"); - DISTRICT_CODES.put("建德","330182"); - DISTRICT_CODES.put("富阳","330183"); - DISTRICT_CODES.put("临安","330185"); - DISTRICT_CODES.put("宁波","330200"); - DISTRICT_CODES.put("余姚","330281"); - DISTRICT_CODES.put("慈溪","330282"); - DISTRICT_CODES.put("奉化","330283"); - DISTRICT_CODES.put("温州","330300"); - DISTRICT_CODES.put("瑞安","330381"); - DISTRICT_CODES.put("乐清","330382"); - DISTRICT_CODES.put("嘉兴","330400"); - DISTRICT_CODES.put("海宁","330481"); - DISTRICT_CODES.put("平湖","330482"); - DISTRICT_CODES.put("桐乡","330483"); - DISTRICT_CODES.put("湖州","330500"); - DISTRICT_CODES.put("绍兴","330600"); - DISTRICT_CODES.put("诸暨","330681"); - DISTRICT_CODES.put("上虞","330682"); - DISTRICT_CODES.put("嵊州","330683"); - DISTRICT_CODES.put("金华","330700"); - DISTRICT_CODES.put("兰溪","330781"); - DISTRICT_CODES.put("义乌","330782"); - DISTRICT_CODES.put("东阳","330783"); - DISTRICT_CODES.put("永康","330784"); - DISTRICT_CODES.put("衢州","330800"); - DISTRICT_CODES.put("江山","330881"); - DISTRICT_CODES.put("舟山","330900"); - DISTRICT_CODES.put("台州","331000"); - DISTRICT_CODES.put("温岭","331081"); - DISTRICT_CODES.put("临海","331082"); - DISTRICT_CODES.put("丽水","331100"); - DISTRICT_CODES.put("龙泉","331181"); - DISTRICT_CODES.put("合肥","340100"); - DISTRICT_CODES.put("巢湖","340181"); - DISTRICT_CODES.put("芜湖","340200"); - DISTRICT_CODES.put("蚌埠","340300"); - DISTRICT_CODES.put("淮南","340400"); - DISTRICT_CODES.put("马鞍山","340500"); - DISTRICT_CODES.put("淮北","340600"); - DISTRICT_CODES.put("铜陵","340700"); - DISTRICT_CODES.put("安庆","340800"); - DISTRICT_CODES.put("桐城","340881"); - DISTRICT_CODES.put("黄山","341000"); - DISTRICT_CODES.put("滁州","341100"); - DISTRICT_CODES.put("天长","341181"); - DISTRICT_CODES.put("明光","341182"); - DISTRICT_CODES.put("阜阳","341200"); - DISTRICT_CODES.put("界首","341282"); - DISTRICT_CODES.put("宿州","341300"); - DISTRICT_CODES.put("六安","341500"); - DISTRICT_CODES.put("亳州","341600"); - DISTRICT_CODES.put("池州","341700"); - DISTRICT_CODES.put("宣城","341800"); - DISTRICT_CODES.put("宁国","341881"); - DISTRICT_CODES.put("福州","350100"); - DISTRICT_CODES.put("福清","350181"); - DISTRICT_CODES.put("长乐","350182"); - DISTRICT_CODES.put("厦门","350200"); - DISTRICT_CODES.put("莆田","350300"); - DISTRICT_CODES.put("三明","350400"); - DISTRICT_CODES.put("永安","350481"); - DISTRICT_CODES.put("泉州","350500"); - DISTRICT_CODES.put("石狮","350581"); - DISTRICT_CODES.put("晋江","350582"); - DISTRICT_CODES.put("南安","350583"); - DISTRICT_CODES.put("漳州","350600"); - DISTRICT_CODES.put("龙海","350681"); - DISTRICT_CODES.put("南平","350700"); - DISTRICT_CODES.put("邵武","350781"); - DISTRICT_CODES.put("武夷山","350782"); - DISTRICT_CODES.put("建瓯","350783"); - DISTRICT_CODES.put("建阳","350784"); - DISTRICT_CODES.put("龙岩","350800"); - DISTRICT_CODES.put("漳平","350881"); - DISTRICT_CODES.put("宁德","350900"); - DISTRICT_CODES.put("福安","350981"); - DISTRICT_CODES.put("福鼎","350982"); - DISTRICT_CODES.put("南昌","360100"); - DISTRICT_CODES.put("景德镇","360200"); - DISTRICT_CODES.put("乐平","360281"); - DISTRICT_CODES.put("萍乡","360300"); - DISTRICT_CODES.put("九江","360400"); - DISTRICT_CODES.put("瑞昌","360481"); - DISTRICT_CODES.put("共青城","360482"); - DISTRICT_CODES.put("新余","360500"); - DISTRICT_CODES.put("鹰潭","360600"); - DISTRICT_CODES.put("贵溪","360681"); - DISTRICT_CODES.put("赣州","360700"); - DISTRICT_CODES.put("瑞金","360781"); - DISTRICT_CODES.put("南康","360782"); - DISTRICT_CODES.put("吉安","360800"); - DISTRICT_CODES.put("井冈山","360881"); - DISTRICT_CODES.put("宜春","360900"); - DISTRICT_CODES.put("丰城","360981"); - DISTRICT_CODES.put("樟树","360982"); - DISTRICT_CODES.put("高安","360983"); - DISTRICT_CODES.put("抚州","361000"); - DISTRICT_CODES.put("上饶","361100"); - DISTRICT_CODES.put("德兴","361181"); - DISTRICT_CODES.put("济南","370100"); - DISTRICT_CODES.put("章丘","370181"); - DISTRICT_CODES.put("青岛","370200"); - DISTRICT_CODES.put("胶州","370281"); - DISTRICT_CODES.put("即墨","370282"); - DISTRICT_CODES.put("平度","370283"); - DISTRICT_CODES.put("莱西","370285"); - DISTRICT_CODES.put("淄博","370300"); - DISTRICT_CODES.put("枣庄","370400"); - DISTRICT_CODES.put("滕州","370481"); - DISTRICT_CODES.put("东营","370500"); - DISTRICT_CODES.put("烟台","370600"); - DISTRICT_CODES.put("龙口","370681"); - DISTRICT_CODES.put("莱阳","370682"); - DISTRICT_CODES.put("莱州","370683"); - DISTRICT_CODES.put("蓬莱","370684"); - DISTRICT_CODES.put("招远","370685"); - DISTRICT_CODES.put("栖霞","370686"); - DISTRICT_CODES.put("海阳","370687"); - DISTRICT_CODES.put("潍坊","370700"); - DISTRICT_CODES.put("青州","370781"); - DISTRICT_CODES.put("诸城","370782"); - DISTRICT_CODES.put("寿光","370783"); - DISTRICT_CODES.put("安丘","370784"); - DISTRICT_CODES.put("高密","370785"); - DISTRICT_CODES.put("昌邑","370786"); - DISTRICT_CODES.put("济宁","370800"); - DISTRICT_CODES.put("曲阜","370881"); - DISTRICT_CODES.put("兖州","370882"); - DISTRICT_CODES.put("邹城","370883"); - DISTRICT_CODES.put("泰安","370900"); - DISTRICT_CODES.put("新泰","370982"); - DISTRICT_CODES.put("肥城","370983"); - DISTRICT_CODES.put("威海","371000"); - DISTRICT_CODES.put("文登","371081"); - DISTRICT_CODES.put("荣成","371082"); - DISTRICT_CODES.put("乳山","371083"); - DISTRICT_CODES.put("日照","371100"); - DISTRICT_CODES.put("莱芜","371200"); - DISTRICT_CODES.put("临沂","371300"); - DISTRICT_CODES.put("德州","371400"); - DISTRICT_CODES.put("乐陵","371481"); - DISTRICT_CODES.put("禹城","371482"); - DISTRICT_CODES.put("聊城","371500"); - DISTRICT_CODES.put("临清","371581"); - DISTRICT_CODES.put("滨州","371600"); - DISTRICT_CODES.put("菏泽","371700"); - DISTRICT_CODES.put("郑州","410100"); - DISTRICT_CODES.put("巩义","410181"); - DISTRICT_CODES.put("荥阳","410182"); - DISTRICT_CODES.put("新密","410183"); - DISTRICT_CODES.put("新郑","410184"); - DISTRICT_CODES.put("登封","410185"); - DISTRICT_CODES.put("开封","410200"); - DISTRICT_CODES.put("洛阳","410300"); - DISTRICT_CODES.put("偃师","410381"); - DISTRICT_CODES.put("平顶山","410400"); - DISTRICT_CODES.put("舞钢","410481"); - DISTRICT_CODES.put("汝州","410482"); - DISTRICT_CODES.put("安阳","410500"); - DISTRICT_CODES.put("林州","410581"); - DISTRICT_CODES.put("鹤壁","410600"); - DISTRICT_CODES.put("新乡","410700"); - DISTRICT_CODES.put("卫辉","410781"); - DISTRICT_CODES.put("辉县","410782"); - DISTRICT_CODES.put("焦作","410800"); - DISTRICT_CODES.put("沁阳","410882"); - DISTRICT_CODES.put("孟州","410883"); - DISTRICT_CODES.put("濮阳","410900"); - DISTRICT_CODES.put("许昌","411000"); - DISTRICT_CODES.put("禹州","411081"); - DISTRICT_CODES.put("长葛","411082"); - DISTRICT_CODES.put("漯河","411100"); - DISTRICT_CODES.put("三门峡","411200"); - DISTRICT_CODES.put("义马","411281"); - DISTRICT_CODES.put("灵宝","411282"); - DISTRICT_CODES.put("南阳","411300"); - DISTRICT_CODES.put("邓州","411381"); - DISTRICT_CODES.put("商丘","411400"); - DISTRICT_CODES.put("永城","411481"); - DISTRICT_CODES.put("信阳","411500"); - DISTRICT_CODES.put("周口","411600"); - DISTRICT_CODES.put("项城","411681"); - DISTRICT_CODES.put("驻马店","411700"); - DISTRICT_CODES.put("济源","419001"); - DISTRICT_CODES.put("武汉","420100"); - DISTRICT_CODES.put("黄石","420200"); - DISTRICT_CODES.put("大冶","420281"); - DISTRICT_CODES.put("十堰","420300"); - DISTRICT_CODES.put("丹江口","420381"); - DISTRICT_CODES.put("宜昌","420500"); - DISTRICT_CODES.put("宜都","420581"); - DISTRICT_CODES.put("当阳","420582"); - DISTRICT_CODES.put("枝江","420583"); - DISTRICT_CODES.put("襄阳","420600"); - DISTRICT_CODES.put("老河口","420682"); - DISTRICT_CODES.put("枣阳","420683"); - DISTRICT_CODES.put("宜城","420684"); - DISTRICT_CODES.put("鄂州","420700"); - DISTRICT_CODES.put("荆门","420800"); - DISTRICT_CODES.put("钟祥","420881"); - DISTRICT_CODES.put("孝感","420900"); - DISTRICT_CODES.put("应城","420981"); - DISTRICT_CODES.put("安陆","420982"); - DISTRICT_CODES.put("汉川","420984"); - DISTRICT_CODES.put("荆州","421000"); - DISTRICT_CODES.put("石首","421081"); - DISTRICT_CODES.put("洪湖","421083"); - DISTRICT_CODES.put("松滋","421087"); - DISTRICT_CODES.put("黄冈","421100"); - DISTRICT_CODES.put("麻城","421181"); - DISTRICT_CODES.put("武穴","421182"); - DISTRICT_CODES.put("咸宁","421200"); - DISTRICT_CODES.put("赤壁","421281"); - DISTRICT_CODES.put("随州","421300"); - DISTRICT_CODES.put("广水","421381"); - DISTRICT_CODES.put("恩施","422801"); - DISTRICT_CODES.put("利川","422802"); - DISTRICT_CODES.put("仙桃","429004"); - DISTRICT_CODES.put("潜江","429005"); - DISTRICT_CODES.put("天门","429006"); - DISTRICT_CODES.put("长沙","430100"); - DISTRICT_CODES.put("浏阳","430181"); - DISTRICT_CODES.put("株洲","430200"); - DISTRICT_CODES.put("醴陵","430281"); - DISTRICT_CODES.put("湘潭","430300"); - DISTRICT_CODES.put("湘乡","430381"); - DISTRICT_CODES.put("韶山","430382"); - DISTRICT_CODES.put("衡阳","430400"); - DISTRICT_CODES.put("耒阳","430481"); - DISTRICT_CODES.put("常宁","430482"); - DISTRICT_CODES.put("邵阳","430500"); - DISTRICT_CODES.put("武冈","430581"); - DISTRICT_CODES.put("岳阳","430600"); - DISTRICT_CODES.put("汨罗","430681"); - DISTRICT_CODES.put("临湘","430682"); - DISTRICT_CODES.put("常德","430700"); - DISTRICT_CODES.put("津市","430781"); - DISTRICT_CODES.put("张家界","430800"); - DISTRICT_CODES.put("益阳","430900"); - DISTRICT_CODES.put("沅江","430981"); - DISTRICT_CODES.put("郴州","431000"); - DISTRICT_CODES.put("资兴","431081"); - DISTRICT_CODES.put("永州","431100"); - DISTRICT_CODES.put("怀化","431200"); - DISTRICT_CODES.put("洪江","431281"); - DISTRICT_CODES.put("娄底","431300"); - DISTRICT_CODES.put("冷水江","431381"); - DISTRICT_CODES.put("涟源","431382"); - DISTRICT_CODES.put("吉首","433101"); - DISTRICT_CODES.put("广州","440100"); - DISTRICT_CODES.put("增城","440183"); - DISTRICT_CODES.put("从化","440184"); - DISTRICT_CODES.put("韶关","440200"); - DISTRICT_CODES.put("乐昌","440281"); - DISTRICT_CODES.put("南雄","440282"); - DISTRICT_CODES.put("深圳","440300"); - DISTRICT_CODES.put("珠海","440400"); - DISTRICT_CODES.put("汕头","440500"); - DISTRICT_CODES.put("佛山","440600"); - DISTRICT_CODES.put("江门","440700"); - DISTRICT_CODES.put("台山","440781"); - DISTRICT_CODES.put("开平","440783"); - DISTRICT_CODES.put("鹤山","440784"); - DISTRICT_CODES.put("恩平","440785"); - DISTRICT_CODES.put("湛江","440800"); - DISTRICT_CODES.put("廉江","440881"); - DISTRICT_CODES.put("雷州","440882"); - DISTRICT_CODES.put("吴川","440883"); - DISTRICT_CODES.put("茂名","440900"); - DISTRICT_CODES.put("高州","440981"); - DISTRICT_CODES.put("化州","440982"); - DISTRICT_CODES.put("信宜","440983"); - DISTRICT_CODES.put("肇庆","441200"); - DISTRICT_CODES.put("高要","441283"); - DISTRICT_CODES.put("四会","441284"); - DISTRICT_CODES.put("惠州","441300"); - DISTRICT_CODES.put("梅州","441400"); - DISTRICT_CODES.put("兴宁","441481"); - DISTRICT_CODES.put("汕尾","441500"); - DISTRICT_CODES.put("陆丰","441581"); - DISTRICT_CODES.put("河源","441600"); - DISTRICT_CODES.put("阳江","441700"); - DISTRICT_CODES.put("阳春","441781"); - DISTRICT_CODES.put("清远","441800"); - DISTRICT_CODES.put("英德","441881"); - DISTRICT_CODES.put("连州","441882"); - DISTRICT_CODES.put("东莞","441900"); - DISTRICT_CODES.put("中山","442000"); - DISTRICT_CODES.put("潮州","445100"); - DISTRICT_CODES.put("揭阳","445200"); - DISTRICT_CODES.put("普宁","445281"); - DISTRICT_CODES.put("云浮","445300"); - DISTRICT_CODES.put("罗定","445381"); - DISTRICT_CODES.put("南宁","450100"); - DISTRICT_CODES.put("柳州","450200"); - DISTRICT_CODES.put("桂林","450300"); - DISTRICT_CODES.put("梧州","450400"); - DISTRICT_CODES.put("岑溪","450481"); - DISTRICT_CODES.put("北海","450500"); - DISTRICT_CODES.put("防城港","450600"); - DISTRICT_CODES.put("东兴","450681"); - DISTRICT_CODES.put("钦州","450700"); - DISTRICT_CODES.put("贵港","450800"); - DISTRICT_CODES.put("桂平","450881"); - DISTRICT_CODES.put("玉林","450900"); - DISTRICT_CODES.put("北流","450981"); - DISTRICT_CODES.put("百色","451000"); - DISTRICT_CODES.put("贺州","451100"); - DISTRICT_CODES.put("河池","451200"); - DISTRICT_CODES.put("宜州","451281"); - DISTRICT_CODES.put("来宾","451300"); - DISTRICT_CODES.put("合山","451381"); - DISTRICT_CODES.put("崇左","451400"); - DISTRICT_CODES.put("凭祥","451481"); - DISTRICT_CODES.put("海口","460100"); - DISTRICT_CODES.put("三亚","460200"); - DISTRICT_CODES.put("三沙","460300"); - DISTRICT_CODES.put("五指山","469001"); - DISTRICT_CODES.put("琼海","469002"); - DISTRICT_CODES.put("儋州","469003"); - DISTRICT_CODES.put("文昌","469005"); - DISTRICT_CODES.put("万宁","469006"); - DISTRICT_CODES.put("东方","469007"); - DISTRICT_CODES.put("重庆","500000"); - DISTRICT_CODES.put("成都","510100"); - DISTRICT_CODES.put("都江堰","510181"); - DISTRICT_CODES.put("彭州","510182"); - DISTRICT_CODES.put("邛崃","510183"); - DISTRICT_CODES.put("崇州","510184"); - DISTRICT_CODES.put("自贡","510300"); - DISTRICT_CODES.put("攀枝花","510400"); - DISTRICT_CODES.put("泸州","510500"); - DISTRICT_CODES.put("德阳","510600"); - DISTRICT_CODES.put("广汉","510681"); - DISTRICT_CODES.put("什邡","510682"); - DISTRICT_CODES.put("绵竹","510683"); - DISTRICT_CODES.put("绵阳","510700"); - DISTRICT_CODES.put("江油","510781"); - DISTRICT_CODES.put("广元","510800"); - DISTRICT_CODES.put("遂宁","510900"); - DISTRICT_CODES.put("内江","511000"); - DISTRICT_CODES.put("乐山","511100"); - DISTRICT_CODES.put("峨眉山","511181"); - DISTRICT_CODES.put("南充","511300"); - DISTRICT_CODES.put("阆中","511381"); - DISTRICT_CODES.put("眉山","511400"); - DISTRICT_CODES.put("宜宾","511500"); - DISTRICT_CODES.put("广安","511600"); - DISTRICT_CODES.put("华蓥","511681"); - DISTRICT_CODES.put("达州","511700"); - DISTRICT_CODES.put("万源","511781"); - DISTRICT_CODES.put("雅安","511800"); - DISTRICT_CODES.put("巴中","511900"); - DISTRICT_CODES.put("资阳","512000"); - DISTRICT_CODES.put("简阳","512081"); - DISTRICT_CODES.put("西昌","513401"); - DISTRICT_CODES.put("贵阳","520100"); - DISTRICT_CODES.put("清镇","520181"); - DISTRICT_CODES.put("六盘水","520200"); - DISTRICT_CODES.put("遵义","520300"); - DISTRICT_CODES.put("赤水","520381"); - DISTRICT_CODES.put("仁怀","520382"); - DISTRICT_CODES.put("安顺","520400"); - DISTRICT_CODES.put("毕节","520500"); - DISTRICT_CODES.put("铜仁","520600"); - DISTRICT_CODES.put("兴义","522301"); - DISTRICT_CODES.put("凯里","522601"); - DISTRICT_CODES.put("都匀","522701"); - DISTRICT_CODES.put("福泉","522702"); - DISTRICT_CODES.put("昆明","530100"); - DISTRICT_CODES.put("安宁","530181"); - DISTRICT_CODES.put("曲靖","530300"); - DISTRICT_CODES.put("宣威","530381"); - DISTRICT_CODES.put("玉溪","530400"); - DISTRICT_CODES.put("保山","530500"); - DISTRICT_CODES.put("昭通","530600"); - DISTRICT_CODES.put("丽江","530700"); - DISTRICT_CODES.put("普洱","530800"); - DISTRICT_CODES.put("临沧","530900"); - DISTRICT_CODES.put("楚雄","532301"); - DISTRICT_CODES.put("个旧","532501"); - DISTRICT_CODES.put("开远","532502"); - DISTRICT_CODES.put("蒙自","532503"); - DISTRICT_CODES.put("弥勒","532504"); - DISTRICT_CODES.put("文山","532601"); - DISTRICT_CODES.put("景洪","532801"); - DISTRICT_CODES.put("大理","532901"); - DISTRICT_CODES.put("瑞丽","533102"); - DISTRICT_CODES.put("芒","533103"); - DISTRICT_CODES.put("拉萨","540100"); - DISTRICT_CODES.put("日喀则","542301"); - DISTRICT_CODES.put("西安","610100"); - DISTRICT_CODES.put("铜川","610200"); - DISTRICT_CODES.put("宝鸡","610300"); - DISTRICT_CODES.put("咸阳","610400"); - DISTRICT_CODES.put("兴平","610481"); - DISTRICT_CODES.put("渭南","610500"); - DISTRICT_CODES.put("韩城","610581"); - DISTRICT_CODES.put("华阴","610582"); - DISTRICT_CODES.put("延安","610600"); - DISTRICT_CODES.put("汉中","610700"); - DISTRICT_CODES.put("榆林","610800"); - DISTRICT_CODES.put("安康","610900"); - DISTRICT_CODES.put("商洛","611000"); - DISTRICT_CODES.put("兰州","620100"); - DISTRICT_CODES.put("嘉峪关","620200"); - DISTRICT_CODES.put("金昌","620300"); - DISTRICT_CODES.put("白银","620400"); - DISTRICT_CODES.put("天水","620500"); - DISTRICT_CODES.put("武威","620600"); - DISTRICT_CODES.put("张掖","620700"); - DISTRICT_CODES.put("平凉","620800"); - DISTRICT_CODES.put("酒泉","620900"); - DISTRICT_CODES.put("玉门","620981"); - DISTRICT_CODES.put("敦煌","620982"); - DISTRICT_CODES.put("庆阳","621000"); - DISTRICT_CODES.put("定西","621100"); - DISTRICT_CODES.put("陇南","621200"); - DISTRICT_CODES.put("临夏","622901"); - DISTRICT_CODES.put("合作","623001"); - DISTRICT_CODES.put("西宁","630100"); - DISTRICT_CODES.put("海东","630200"); - DISTRICT_CODES.put("玉树","632701"); - DISTRICT_CODES.put("格尔木","632801"); - DISTRICT_CODES.put("德令哈","632802"); - DISTRICT_CODES.put("银川","640100"); - DISTRICT_CODES.put("灵武","640181"); - DISTRICT_CODES.put("石嘴山","640200"); - DISTRICT_CODES.put("吴忠","640300"); - DISTRICT_CODES.put("青铜峡","640381"); - DISTRICT_CODES.put("固原","640400"); - DISTRICT_CODES.put("中卫","640500"); - DISTRICT_CODES.put("乌鲁木齐","650100"); - DISTRICT_CODES.put("克拉玛依","650200"); - DISTRICT_CODES.put("吐鲁番","652101"); - DISTRICT_CODES.put("哈密","652201"); - DISTRICT_CODES.put("昌吉","652301"); - DISTRICT_CODES.put("阜康","652302"); - DISTRICT_CODES.put("博乐","652701"); - DISTRICT_CODES.put("阿拉山口","652702"); - DISTRICT_CODES.put("库尔勒","652801"); - DISTRICT_CODES.put("阿克苏","652901"); - DISTRICT_CODES.put("阿图什","653001"); - DISTRICT_CODES.put("喀什","653101"); - DISTRICT_CODES.put("和田","653201"); - DISTRICT_CODES.put("伊宁","654002"); - DISTRICT_CODES.put("奎屯","654003"); - DISTRICT_CODES.put("塔城","654201"); - DISTRICT_CODES.put("乌苏","654202"); - DISTRICT_CODES.put("阿勒泰","654301"); - DISTRICT_CODES.put("石河子","659001"); - DISTRICT_CODES.put("阿拉尔","659002"); - DISTRICT_CODES.put("图木舒克","659003"); - DISTRICT_CODES.put("五家渠","659004"); + DISTRICT_CODES.put("闃挎媺鍠勭洘","152900"); + DISTRICT_CODES.put("閿℃灄閮嫆鐩�","152500"); + DISTRICT_CODES.put("鍏村畨鐩�","152200"); + DISTRICT_CODES.put("鏋楄姖","542621"); + DISTRICT_CODES.put("闃块噷","542500"); + DISTRICT_CODES.put("鏄岄兘","542121"); + DISTRICT_CODES.put("绾㈡渤","532529"); + DISTRICT_CODES.put("澶у叴瀹夊箔","232700"); + DISTRICT_CODES.put("閭f洸","542421"); + DISTRICT_CODES.put("灞卞崡","542200"); + DISTRICT_CODES.put("浼婄妬","654000"); + DISTRICT_CODES.put("鍏嬪瓬鍕掕嫃","653000"); + DISTRICT_CODES.put("宸撮煶閮","652800"); + DISTRICT_CODES.put("鍗氬皵濉旀媺","652700"); + DISTRICT_CODES.put("閾侀棬鍏�","659006"); + DISTRICT_CODES.put("鍙屾渤","659007"); + DISTRICT_CODES.put("鍖楀悲","659005"); + DISTRICT_CODES.put("鍖椾含","110000"); + DISTRICT_CODES.put("澶╂触","120000"); + DISTRICT_CODES.put("鐭冲搴�","130100"); + DISTRICT_CODES.put("杈涢泦","130181"); + DISTRICT_CODES.put("钘佸煄","130182"); + DISTRICT_CODES.put("鏅嬪窞","130183"); + DISTRICT_CODES.put("鏂颁箰","130184"); + DISTRICT_CODES.put("楣挎硥","130185"); + DISTRICT_CODES.put("鍞愬北","130200"); + DISTRICT_CODES.put("閬靛寲","130281"); + DISTRICT_CODES.put("杩佸畨","130283"); + DISTRICT_CODES.put("绉︾殗宀�","130300"); + DISTRICT_CODES.put("閭兏","130400"); + DISTRICT_CODES.put("姝﹀畨","130481"); + DISTRICT_CODES.put("閭㈠彴","130500"); + DISTRICT_CODES.put("鍗楀","130581"); + DISTRICT_CODES.put("娌欐渤","130582"); + DISTRICT_CODES.put("淇濆畾","130600"); + DISTRICT_CODES.put("娑垮窞","130681"); + DISTRICT_CODES.put("瀹氬窞","130682"); + DISTRICT_CODES.put("瀹夊浗","130683"); + DISTRICT_CODES.put("楂樼搴�","130684"); + DISTRICT_CODES.put("寮犲鍙�","130700"); + DISTRICT_CODES.put("鎵垮痉","130800"); + DISTRICT_CODES.put("娌у窞","130900"); + DISTRICT_CODES.put("娉婂ご","130981"); + DISTRICT_CODES.put("浠讳笜","130982"); + DISTRICT_CODES.put("榛勯獏","130983"); + DISTRICT_CODES.put("娌抽棿","130984"); + DISTRICT_CODES.put("寤婂潑","131000"); + DISTRICT_CODES.put("闇稿窞","131081"); + DISTRICT_CODES.put("涓夋渤","131082"); + DISTRICT_CODES.put("琛℃按","131100"); + DISTRICT_CODES.put("鍐�宸�","131181"); + DISTRICT_CODES.put("娣卞窞","131182"); + DISTRICT_CODES.put("澶師","140100"); + DISTRICT_CODES.put("鍙や氦","140181"); + DISTRICT_CODES.put("澶у悓","140200"); + DISTRICT_CODES.put("闃虫硥","140300"); + DISTRICT_CODES.put("闀挎不","140400"); + DISTRICT_CODES.put("娼炲煄","140481"); + DISTRICT_CODES.put("鏅嬪煄","140500"); + DISTRICT_CODES.put("楂樺钩","140581"); + DISTRICT_CODES.put("鏈斿窞","140600"); + DISTRICT_CODES.put("鏅嬩腑","140700"); + DISTRICT_CODES.put("浠嬩紤","140781"); + DISTRICT_CODES.put("杩愬煄","140800"); + DISTRICT_CODES.put("姘告祹","140881"); + DISTRICT_CODES.put("娌虫触","140882"); + DISTRICT_CODES.put("蹇诲窞","140900"); + DISTRICT_CODES.put("鍘熷钩","140981"); + DISTRICT_CODES.put("涓存本","141000"); + DISTRICT_CODES.put("渚┈","141081"); + DISTRICT_CODES.put("闇嶅窞","141082"); + DISTRICT_CODES.put("鍚曟","141100"); + DISTRICT_CODES.put("瀛濅箟","141181"); + DISTRICT_CODES.put("姹鹃槼","141182"); + DISTRICT_CODES.put("鍛煎拰娴╃壒","150100"); + DISTRICT_CODES.put("鍖呭ご","150200"); + DISTRICT_CODES.put("涔屾捣","150300"); + DISTRICT_CODES.put("璧ゅ嘲","150400"); + DISTRICT_CODES.put("閫氳窘","150500"); + DISTRICT_CODES.put("闇嶆灄閮嫆","150581"); + DISTRICT_CODES.put("閯傚皵澶氭柉","150600"); + DISTRICT_CODES.put("鍛间鸡璐濆皵","150700"); + DISTRICT_CODES.put("婊℃床閲�","150781"); + DISTRICT_CODES.put("鐗欏厠鐭�","150782"); + DISTRICT_CODES.put("鎵庡叞灞�","150783"); + DISTRICT_CODES.put("棰濆皵鍙ょ撼","150784"); + DISTRICT_CODES.put("鏍规渤","150785"); + DISTRICT_CODES.put("宸村溅娣栧皵","150800"); + DISTRICT_CODES.put("涔屽叞瀵熷竷","150900"); + DISTRICT_CODES.put("涓伴晣","150981"); + DISTRICT_CODES.put("涔屽叞娴╃壒","152201"); + DISTRICT_CODES.put("闃垮皵灞�","152202"); + DISTRICT_CODES.put("浜岃繛娴╃壒","152501"); + DISTRICT_CODES.put("閿℃灄娴╃壒","152502"); + DISTRICT_CODES.put("娌堥槼","210100"); + DISTRICT_CODES.put("鏂版皯","210181"); + DISTRICT_CODES.put("澶ц繛","210200"); + DISTRICT_CODES.put("鐡︽埧搴�","210281"); + DISTRICT_CODES.put("鏅叞搴�","210282"); + DISTRICT_CODES.put("搴勬渤","210283"); + DISTRICT_CODES.put("闉嶅北","210300"); + DISTRICT_CODES.put("娴峰煄","210381"); + DISTRICT_CODES.put("鎶氶『","210400"); + DISTRICT_CODES.put("鏈邯","210500"); + DISTRICT_CODES.put("涓逛笢","210600"); + DISTRICT_CODES.put("涓滄腐","210681"); + DISTRICT_CODES.put("鍑ゅ煄","210682"); + DISTRICT_CODES.put("閿﹀窞","210700"); + DISTRICT_CODES.put("鍑屾捣","210781"); + DISTRICT_CODES.put("鍖楅晣","210782"); + DISTRICT_CODES.put("钀ュ彛","210800"); + DISTRICT_CODES.put("鐩栧窞","210881"); + DISTRICT_CODES.put("澶х煶妗�","210882"); + DISTRICT_CODES.put("闃滄柊","210900"); + DISTRICT_CODES.put("杈介槼","211000"); + DISTRICT_CODES.put("鐏","211081"); + DISTRICT_CODES.put("鐩橀敠","211100"); + DISTRICT_CODES.put("閾佸箔","211200"); + DISTRICT_CODES.put("璋冨叺灞�","211281"); + DISTRICT_CODES.put("寮�鍘�","211282"); + DISTRICT_CODES.put("鏈濋槼","211300"); + DISTRICT_CODES.put("鍖楃エ","211381"); + DISTRICT_CODES.put("鍑屾簮","211382"); + DISTRICT_CODES.put("钁姦宀�","211400"); + DISTRICT_CODES.put("鍏村煄","211481"); + DISTRICT_CODES.put("闀挎槬","220100"); + DISTRICT_CODES.put("涔濆彴","220181"); + DISTRICT_CODES.put("姒嗘爲","220182"); + DISTRICT_CODES.put("寰锋儬","220183"); + DISTRICT_CODES.put("鍚夋灄","220200"); + DISTRICT_CODES.put("铔熸渤","220281"); + DISTRICT_CODES.put("妗︾敻","220282"); + DISTRICT_CODES.put("鑸掑叞","220283"); + DISTRICT_CODES.put("纾愮煶","220284"); + DISTRICT_CODES.put("鍥涘钩","220300"); + DISTRICT_CODES.put("鍏富宀�","220381"); + DISTRICT_CODES.put("鍙岃窘","220382"); + DISTRICT_CODES.put("杈芥簮","220400"); + DISTRICT_CODES.put("閫氬寲","220500"); + DISTRICT_CODES.put("姊呮渤鍙�","220581"); + DISTRICT_CODES.put("闆嗗畨","220582"); + DISTRICT_CODES.put("鐧藉北","220600"); + DISTRICT_CODES.put("涓存睙","220681"); + DISTRICT_CODES.put("鏉惧師","220700"); + DISTRICT_CODES.put("鎵朵綑","220781"); + DISTRICT_CODES.put("鐧藉煄","220800"); + DISTRICT_CODES.put("娲崡","220881"); + DISTRICT_CODES.put("澶у畨","220882"); + DISTRICT_CODES.put("寤跺悏","222401"); + DISTRICT_CODES.put("鍥句滑","222402"); + DISTRICT_CODES.put("鏁﹀寲","222403"); + DISTRICT_CODES.put("鐝叉槬","222404"); + DISTRICT_CODES.put("榫欎簳","222405"); + DISTRICT_CODES.put("鍜岄緳","222406"); + DISTRICT_CODES.put("鍝堝皵婊�","230100"); + DISTRICT_CODES.put("鍙屽煄","230182"); + DISTRICT_CODES.put("灏氬織","230183"); + DISTRICT_CODES.put("浜斿父","230184"); + DISTRICT_CODES.put("榻愰綈鍝堝皵","230200"); + DISTRICT_CODES.put("璁锋渤","230281"); + DISTRICT_CODES.put("楦¤タ","230300"); + DISTRICT_CODES.put("铏庢灄","230381"); + DISTRICT_CODES.put("瀵嗗北","230382"); + DISTRICT_CODES.put("楣ゅ矖","230400"); + DISTRICT_CODES.put("鍙岄腑灞�","230500"); + DISTRICT_CODES.put("澶у簡","230600"); + DISTRICT_CODES.put("浼婃槬","230700"); + DISTRICT_CODES.put("閾佸姏","230781"); + DISTRICT_CODES.put("浣虫湪鏂�","230800"); + DISTRICT_CODES.put("鍚屾睙","230881"); + DISTRICT_CODES.put("瀵岄敠","230882"); + DISTRICT_CODES.put("涓冨彴娌�","230900"); + DISTRICT_CODES.put("鐗′腹姹�","231000"); + DISTRICT_CODES.put("缁ヨ姮娌�","231081"); + DISTRICT_CODES.put("娴锋灄","231083"); + DISTRICT_CODES.put("瀹佸畨","231084"); + DISTRICT_CODES.put("绌嗘1","231085"); + DISTRICT_CODES.put("榛戞渤","231100"); + DISTRICT_CODES.put("鍖楀畨","231181"); + DISTRICT_CODES.put("浜斿ぇ杩炴睜","231182"); + DISTRICT_CODES.put("缁ュ寲","231200"); + DISTRICT_CODES.put("瀹夎揪","231281"); + DISTRICT_CODES.put("鑲囦笢","231282"); + DISTRICT_CODES.put("娴蜂鸡","231283"); + DISTRICT_CODES.put("涓婃捣","310000"); + DISTRICT_CODES.put("鍗椾含","320100"); + DISTRICT_CODES.put("鏃犻敗","320200"); + DISTRICT_CODES.put("姹熼槾","320281"); + DISTRICT_CODES.put("瀹滃叴","320282"); + DISTRICT_CODES.put("寰愬窞","320300"); + DISTRICT_CODES.put("鏂版矀","320381"); + DISTRICT_CODES.put("閭冲窞","320382"); + DISTRICT_CODES.put("甯稿窞","320400"); + DISTRICT_CODES.put("婧ч槼","320481"); + DISTRICT_CODES.put("閲戝潧","320482"); + DISTRICT_CODES.put("鑻忓窞","320500"); + DISTRICT_CODES.put("甯哥啛","320581"); + DISTRICT_CODES.put("寮犲娓�","320582"); + DISTRICT_CODES.put("鏄嗗北","320583"); + DISTRICT_CODES.put("澶粨","320585"); + DISTRICT_CODES.put("鍗楅��","320600"); + DISTRICT_CODES.put("鍚笢","320681"); + DISTRICT_CODES.put("濡傜殝","320682"); + DISTRICT_CODES.put("娴烽棬","320684"); + DISTRICT_CODES.put("杩炰簯娓�","320700"); + DISTRICT_CODES.put("娣畨","320800"); + DISTRICT_CODES.put("鐩愬煄","320900"); + DISTRICT_CODES.put("涓滃彴","320981"); + DISTRICT_CODES.put("澶т赴","320982"); + DISTRICT_CODES.put("鎵窞","321000"); + DISTRICT_CODES.put("浠緛","321081"); + DISTRICT_CODES.put("楂橀偖","321084"); + DISTRICT_CODES.put("闀囨睙","321100"); + DISTRICT_CODES.put("涓归槼","321181"); + DISTRICT_CODES.put("鎵腑","321182"); + DISTRICT_CODES.put("鍙ュ","321183"); + DISTRICT_CODES.put("娉板窞","321200"); + DISTRICT_CODES.put("鍏村寲","321281"); + DISTRICT_CODES.put("闈栨睙","321282"); + DISTRICT_CODES.put("娉板叴","321283"); + DISTRICT_CODES.put("瀹胯縼","321300"); + DISTRICT_CODES.put("鏉窞","330100"); + DISTRICT_CODES.put("寤哄痉","330182"); + DISTRICT_CODES.put("瀵岄槼","330183"); + DISTRICT_CODES.put("涓村畨","330185"); + DISTRICT_CODES.put("瀹佹尝","330200"); + DISTRICT_CODES.put("浣欏","330281"); + DISTRICT_CODES.put("鎱堟邯","330282"); + DISTRICT_CODES.put("濂夊寲","330283"); + DISTRICT_CODES.put("娓╁窞","330300"); + DISTRICT_CODES.put("鐟炲畨","330381"); + DISTRICT_CODES.put("涔愭竻","330382"); + DISTRICT_CODES.put("鍢夊叴","330400"); + DISTRICT_CODES.put("娴峰畞","330481"); + DISTRICT_CODES.put("骞虫箹","330482"); + DISTRICT_CODES.put("妗愪埂","330483"); + DISTRICT_CODES.put("婀栧窞","330500"); + DISTRICT_CODES.put("缁嶅叴","330600"); + DISTRICT_CODES.put("璇告毃","330681"); + DISTRICT_CODES.put("涓婅櫈","330682"); + DISTRICT_CODES.put("宓婂窞","330683"); + DISTRICT_CODES.put("閲戝崕","330700"); + DISTRICT_CODES.put("鍏版邯","330781"); + DISTRICT_CODES.put("涔変箤","330782"); + DISTRICT_CODES.put("涓滈槼","330783"); + DISTRICT_CODES.put("姘稿悍","330784"); + DISTRICT_CODES.put("琛㈠窞","330800"); + DISTRICT_CODES.put("姹熷北","330881"); + DISTRICT_CODES.put("鑸熷北","330900"); + DISTRICT_CODES.put("鍙板窞","331000"); + DISTRICT_CODES.put("娓╁箔","331081"); + DISTRICT_CODES.put("涓存捣","331082"); + DISTRICT_CODES.put("涓芥按","331100"); + DISTRICT_CODES.put("榫欐硥","331181"); + DISTRICT_CODES.put("鍚堣偉","340100"); + DISTRICT_CODES.put("宸㈡箹","340181"); + DISTRICT_CODES.put("鑺滄箹","340200"); + DISTRICT_CODES.put("铓屽煚","340300"); + DISTRICT_CODES.put("娣崡","340400"); + DISTRICT_CODES.put("椹瀺灞�","340500"); + DISTRICT_CODES.put("娣寳","340600"); + DISTRICT_CODES.put("閾滈櫟","340700"); + DISTRICT_CODES.put("瀹夊簡","340800"); + DISTRICT_CODES.put("妗愬煄","340881"); + DISTRICT_CODES.put("榛勫北","341000"); + DISTRICT_CODES.put("婊佸窞","341100"); + DISTRICT_CODES.put("澶╅暱","341181"); + DISTRICT_CODES.put("鏄庡厜","341182"); + DISTRICT_CODES.put("闃滈槼","341200"); + DISTRICT_CODES.put("鐣岄","341282"); + DISTRICT_CODES.put("瀹垮窞","341300"); + DISTRICT_CODES.put("鍏畨","341500"); + DISTRICT_CODES.put("浜冲窞","341600"); + DISTRICT_CODES.put("姹犲窞","341700"); + DISTRICT_CODES.put("瀹e煄","341800"); + DISTRICT_CODES.put("瀹佸浗","341881"); + DISTRICT_CODES.put("绂忓窞","350100"); + DISTRICT_CODES.put("绂忔竻","350181"); + DISTRICT_CODES.put("闀夸箰","350182"); + DISTRICT_CODES.put("鍘﹂棬","350200"); + DISTRICT_CODES.put("鑾嗙敯","350300"); + DISTRICT_CODES.put("涓夋槑","350400"); + DISTRICT_CODES.put("姘稿畨","350481"); + DISTRICT_CODES.put("娉夊窞","350500"); + DISTRICT_CODES.put("鐭崇嫯","350581"); + DISTRICT_CODES.put("鏅嬫睙","350582"); + DISTRICT_CODES.put("鍗楀畨","350583"); + DISTRICT_CODES.put("婕冲窞","350600"); + DISTRICT_CODES.put("榫欐捣","350681"); + DISTRICT_CODES.put("鍗楀钩","350700"); + DISTRICT_CODES.put("閭垫","350781"); + DISTRICT_CODES.put("姝﹀し灞�","350782"); + DISTRICT_CODES.put("寤虹摨","350783"); + DISTRICT_CODES.put("寤洪槼","350784"); + DISTRICT_CODES.put("榫欏博","350800"); + DISTRICT_CODES.put("婕冲钩","350881"); + DISTRICT_CODES.put("瀹佸痉","350900"); + DISTRICT_CODES.put("绂忓畨","350981"); + DISTRICT_CODES.put("绂忛紟","350982"); + DISTRICT_CODES.put("鍗楁槍","360100"); + DISTRICT_CODES.put("鏅痉闀�","360200"); + DISTRICT_CODES.put("涔愬钩","360281"); + DISTRICT_CODES.put("钀嶄埂","360300"); + DISTRICT_CODES.put("涔濇睙","360400"); + DISTRICT_CODES.put("鐟炴槍","360481"); + DISTRICT_CODES.put("鍏遍潚鍩�","360482"); + DISTRICT_CODES.put("鏂颁綑","360500"); + DISTRICT_CODES.put("楣版江","360600"); + DISTRICT_CODES.put("璐垫邯","360681"); + DISTRICT_CODES.put("璧e窞","360700"); + DISTRICT_CODES.put("鐟為噾","360781"); + DISTRICT_CODES.put("鍗楀悍","360782"); + DISTRICT_CODES.put("鍚夊畨","360800"); + DISTRICT_CODES.put("浜曞唸灞�","360881"); + DISTRICT_CODES.put("瀹滄槬","360900"); + DISTRICT_CODES.put("涓板煄","360981"); + DISTRICT_CODES.put("妯熸爲","360982"); + DISTRICT_CODES.put("楂樺畨","360983"); + DISTRICT_CODES.put("鎶氬窞","361000"); + DISTRICT_CODES.put("涓婇ザ","361100"); + DISTRICT_CODES.put("寰峰叴","361181"); + DISTRICT_CODES.put("娴庡崡","370100"); + DISTRICT_CODES.put("绔犱笜","370181"); + DISTRICT_CODES.put("闈掑矝","370200"); + DISTRICT_CODES.put("鑳跺窞","370281"); + DISTRICT_CODES.put("鍗冲ⅷ","370282"); + DISTRICT_CODES.put("骞冲害","370283"); + DISTRICT_CODES.put("鑾辫タ","370285"); + DISTRICT_CODES.put("娣勫崥","370300"); + DISTRICT_CODES.put("鏋e簞","370400"); + DISTRICT_CODES.put("婊曞窞","370481"); + DISTRICT_CODES.put("涓滆惀","370500"); + DISTRICT_CODES.put("鐑熷彴","370600"); + DISTRICT_CODES.put("榫欏彛","370681"); + DISTRICT_CODES.put("鑾遍槼","370682"); + DISTRICT_CODES.put("鑾卞窞","370683"); + DISTRICT_CODES.put("钃幈","370684"); + DISTRICT_CODES.put("鎷涜繙","370685"); + DISTRICT_CODES.put("鏍栭湠","370686"); + DISTRICT_CODES.put("娴烽槼","370687"); + DISTRICT_CODES.put("娼嶅潑","370700"); + DISTRICT_CODES.put("闈掑窞","370781"); + DISTRICT_CODES.put("璇稿煄","370782"); + DISTRICT_CODES.put("瀵垮厜","370783"); + DISTRICT_CODES.put("瀹変笜","370784"); + DISTRICT_CODES.put("楂樺瘑","370785"); + DISTRICT_CODES.put("鏄岄倯","370786"); + DISTRICT_CODES.put("娴庡畞","370800"); + DISTRICT_CODES.put("鏇查槣","370881"); + DISTRICT_CODES.put("鍏栧窞","370882"); + DISTRICT_CODES.put("閭瑰煄","370883"); + DISTRICT_CODES.put("娉板畨","370900"); + DISTRICT_CODES.put("鏂版嘲","370982"); + DISTRICT_CODES.put("鑲ュ煄","370983"); + DISTRICT_CODES.put("濞佹捣","371000"); + DISTRICT_CODES.put("鏂囩櫥","371081"); + DISTRICT_CODES.put("鑽f垚","371082"); + DISTRICT_CODES.put("涔冲北","371083"); + DISTRICT_CODES.put("鏃ョ収","371100"); + DISTRICT_CODES.put("鑾辫姕","371200"); + DISTRICT_CODES.put("涓存矀","371300"); + DISTRICT_CODES.put("寰峰窞","371400"); + DISTRICT_CODES.put("涔愰櫟","371481"); + DISTRICT_CODES.put("绂瑰煄","371482"); + DISTRICT_CODES.put("鑱婂煄","371500"); + DISTRICT_CODES.put("涓存竻","371581"); + DISTRICT_CODES.put("婊ㄥ窞","371600"); + DISTRICT_CODES.put("鑿忔辰","371700"); + DISTRICT_CODES.put("閮戝窞","410100"); + DISTRICT_CODES.put("宸╀箟","410181"); + DISTRICT_CODES.put("鑽ラ槼","410182"); + DISTRICT_CODES.put("鏂板瘑","410183"); + DISTRICT_CODES.put("鏂伴儜","410184"); + DISTRICT_CODES.put("鐧诲皝","410185"); + DISTRICT_CODES.put("寮�灏�","410200"); + DISTRICT_CODES.put("娲涢槼","410300"); + DISTRICT_CODES.put("鍋冨笀","410381"); + DISTRICT_CODES.put("骞抽《灞�","410400"); + DISTRICT_CODES.put("鑸為挗","410481"); + DISTRICT_CODES.put("姹濆窞","410482"); + DISTRICT_CODES.put("瀹夐槼","410500"); + DISTRICT_CODES.put("鏋楀窞","410581"); + DISTRICT_CODES.put("楣ゅ","410600"); + DISTRICT_CODES.put("鏂颁埂","410700"); + DISTRICT_CODES.put("鍗緣","410781"); + DISTRICT_CODES.put("杈夊幙","410782"); + DISTRICT_CODES.put("鐒︿綔","410800"); + DISTRICT_CODES.put("娌侀槼","410882"); + DISTRICT_CODES.put("瀛熷窞","410883"); + DISTRICT_CODES.put("婵槼","410900"); + DISTRICT_CODES.put("璁告槍","411000"); + DISTRICT_CODES.put("绂瑰窞","411081"); + DISTRICT_CODES.put("闀胯憶","411082"); + DISTRICT_CODES.put("婕渤","411100"); + DISTRICT_CODES.put("涓夐棬宄�","411200"); + DISTRICT_CODES.put("涔夐┈","411281"); + DISTRICT_CODES.put("鐏靛疂","411282"); + DISTRICT_CODES.put("鍗楅槼","411300"); + DISTRICT_CODES.put("閭撳窞","411381"); + DISTRICT_CODES.put("鍟嗕笜","411400"); + DISTRICT_CODES.put("姘稿煄","411481"); + DISTRICT_CODES.put("淇¢槼","411500"); + DISTRICT_CODES.put("鍛ㄥ彛","411600"); + DISTRICT_CODES.put("椤瑰煄","411681"); + DISTRICT_CODES.put("椹婚┈搴�","411700"); + DISTRICT_CODES.put("娴庢簮","419001"); + DISTRICT_CODES.put("姝︽眽","420100"); + DISTRICT_CODES.put("榛勭煶","420200"); + DISTRICT_CODES.put("澶у喍","420281"); + DISTRICT_CODES.put("鍗佸牥","420300"); + DISTRICT_CODES.put("涓规睙鍙�","420381"); + DISTRICT_CODES.put("瀹滄槍","420500"); + DISTRICT_CODES.put("瀹滈兘","420581"); + DISTRICT_CODES.put("褰撻槼","420582"); + DISTRICT_CODES.put("鏋濇睙","420583"); + DISTRICT_CODES.put("瑗勯槼","420600"); + DISTRICT_CODES.put("鑰佹渤鍙�","420682"); + DISTRICT_CODES.put("鏋i槼","420683"); + DISTRICT_CODES.put("瀹滃煄","420684"); + DISTRICT_CODES.put("閯傚窞","420700"); + DISTRICT_CODES.put("鑽嗛棬","420800"); + DISTRICT_CODES.put("閽熺ゥ","420881"); + DISTRICT_CODES.put("瀛濇劅","420900"); + DISTRICT_CODES.put("搴斿煄","420981"); + DISTRICT_CODES.put("瀹夐檰","420982"); + DISTRICT_CODES.put("姹夊窛","420984"); + DISTRICT_CODES.put("鑽嗗窞","421000"); + DISTRICT_CODES.put("鐭抽","421081"); + DISTRICT_CODES.put("娲箹","421083"); + DISTRICT_CODES.put("鏉炬粙","421087"); + DISTRICT_CODES.put("榛勫唸","421100"); + DISTRICT_CODES.put("楹诲煄","421181"); + DISTRICT_CODES.put("姝︾┐","421182"); + DISTRICT_CODES.put("鍜稿畞","421200"); + DISTRICT_CODES.put("璧ゅ","421281"); + DISTRICT_CODES.put("闅忓窞","421300"); + DISTRICT_CODES.put("骞挎按","421381"); + DISTRICT_CODES.put("鎭╂柦","422801"); + DISTRICT_CODES.put("鍒╁窛","422802"); + DISTRICT_CODES.put("浠欐","429004"); + DISTRICT_CODES.put("娼滄睙","429005"); + DISTRICT_CODES.put("澶╅棬","429006"); + DISTRICT_CODES.put("闀挎矙","430100"); + DISTRICT_CODES.put("娴忛槼","430181"); + DISTRICT_CODES.put("鏍床","430200"); + DISTRICT_CODES.put("閱撮櫟","430281"); + DISTRICT_CODES.put("婀樻江","430300"); + DISTRICT_CODES.put("婀樹埂","430381"); + DISTRICT_CODES.put("闊跺北","430382"); + DISTRICT_CODES.put("琛¢槼","430400"); + DISTRICT_CODES.put("鑰掗槼","430481"); + DISTRICT_CODES.put("甯稿畞","430482"); + DISTRICT_CODES.put("閭甸槼","430500"); + DISTRICT_CODES.put("姝﹀唸","430581"); + DISTRICT_CODES.put("宀抽槼","430600"); + DISTRICT_CODES.put("姹ㄧ綏","430681"); + DISTRICT_CODES.put("涓存箻","430682"); + DISTRICT_CODES.put("甯稿痉","430700"); + DISTRICT_CODES.put("娲ュ競","430781"); + DISTRICT_CODES.put("寮犲鐣�","430800"); + DISTRICT_CODES.put("鐩婇槼","430900"); + DISTRICT_CODES.put("娌呮睙","430981"); + DISTRICT_CODES.put("閮村窞","431000"); + DISTRICT_CODES.put("璧勫叴","431081"); + DISTRICT_CODES.put("姘稿窞","431100"); + DISTRICT_CODES.put("鎬�鍖�","431200"); + DISTRICT_CODES.put("娲睙","431281"); + DISTRICT_CODES.put("濞勫簳","431300"); + DISTRICT_CODES.put("鍐锋按姹�","431381"); + DISTRICT_CODES.put("娑熸簮","431382"); + DISTRICT_CODES.put("鍚夐","433101"); + DISTRICT_CODES.put("骞垮窞","440100"); + DISTRICT_CODES.put("澧炲煄","440183"); + DISTRICT_CODES.put("浠庡寲","440184"); + DISTRICT_CODES.put("闊跺叧","440200"); + DISTRICT_CODES.put("涔愭槍","440281"); + DISTRICT_CODES.put("鍗楅泟","440282"); + DISTRICT_CODES.put("娣卞湷","440300"); + DISTRICT_CODES.put("鐝犳捣","440400"); + DISTRICT_CODES.put("姹曞ご","440500"); + DISTRICT_CODES.put("浣涘北","440600"); + DISTRICT_CODES.put("姹熼棬","440700"); + DISTRICT_CODES.put("鍙板北","440781"); + DISTRICT_CODES.put("寮�骞�","440783"); + DISTRICT_CODES.put("楣ゅ北","440784"); + DISTRICT_CODES.put("鎭╁钩","440785"); + DISTRICT_CODES.put("婀涙睙","440800"); + DISTRICT_CODES.put("寤夋睙","440881"); + DISTRICT_CODES.put("闆峰窞","440882"); + DISTRICT_CODES.put("鍚村窛","440883"); + DISTRICT_CODES.put("鑼傚悕","440900"); + DISTRICT_CODES.put("楂樺窞","440981"); + DISTRICT_CODES.put("鍖栧窞","440982"); + DISTRICT_CODES.put("淇″疁","440983"); + DISTRICT_CODES.put("鑲囧簡","441200"); + DISTRICT_CODES.put("楂樿","441283"); + DISTRICT_CODES.put("鍥涗細","441284"); + DISTRICT_CODES.put("鎯犲窞","441300"); + DISTRICT_CODES.put("姊呭窞","441400"); + DISTRICT_CODES.put("鍏村畞","441481"); + DISTRICT_CODES.put("姹曞熬","441500"); + DISTRICT_CODES.put("闄嗕赴","441581"); + DISTRICT_CODES.put("娌虫簮","441600"); + DISTRICT_CODES.put("闃虫睙","441700"); + DISTRICT_CODES.put("闃虫槬","441781"); + DISTRICT_CODES.put("娓呰繙","441800"); + DISTRICT_CODES.put("鑻卞痉","441881"); + DISTRICT_CODES.put("杩炲窞","441882"); + DISTRICT_CODES.put("涓滆帪","441900"); + DISTRICT_CODES.put("涓北","442000"); + DISTRICT_CODES.put("娼窞","445100"); + DISTRICT_CODES.put("鎻槼","445200"); + DISTRICT_CODES.put("鏅畞","445281"); + DISTRICT_CODES.put("浜戞诞","445300"); + DISTRICT_CODES.put("缃楀畾","445381"); + DISTRICT_CODES.put("鍗楀畞","450100"); + DISTRICT_CODES.put("鏌冲窞","450200"); + DISTRICT_CODES.put("妗傛灄","450300"); + DISTRICT_CODES.put("姊у窞","450400"); + DISTRICT_CODES.put("宀戞邯","450481"); + DISTRICT_CODES.put("鍖楁捣","450500"); + DISTRICT_CODES.put("闃插煄娓�","450600"); + DISTRICT_CODES.put("涓滃叴","450681"); + DISTRICT_CODES.put("閽﹀窞","450700"); + DISTRICT_CODES.put("璐垫腐","450800"); + DISTRICT_CODES.put("妗傚钩","450881"); + DISTRICT_CODES.put("鐜夋灄","450900"); + DISTRICT_CODES.put("鍖楁祦","450981"); + DISTRICT_CODES.put("鐧捐壊","451000"); + DISTRICT_CODES.put("璐哄窞","451100"); + DISTRICT_CODES.put("娌虫睜","451200"); + DISTRICT_CODES.put("瀹滃窞","451281"); + DISTRICT_CODES.put("鏉ュ","451300"); + DISTRICT_CODES.put("鍚堝北","451381"); + DISTRICT_CODES.put("宕囧乏","451400"); + DISTRICT_CODES.put("鍑ゥ","451481"); + DISTRICT_CODES.put("娴峰彛","460100"); + DISTRICT_CODES.put("涓変簹","460200"); + DISTRICT_CODES.put("涓夋矙","460300"); + DISTRICT_CODES.put("浜旀寚灞�","469001"); + DISTRICT_CODES.put("鐞兼捣","469002"); + DISTRICT_CODES.put("鍎嬪窞","469003"); + DISTRICT_CODES.put("鏂囨槍","469005"); + DISTRICT_CODES.put("涓囧畞","469006"); + DISTRICT_CODES.put("涓滄柟","469007"); + DISTRICT_CODES.put("閲嶅簡","500000"); + DISTRICT_CODES.put("鎴愰兘","510100"); + DISTRICT_CODES.put("閮芥睙鍫�","510181"); + DISTRICT_CODES.put("褰窞","510182"); + DISTRICT_CODES.put("閭涘磧","510183"); + DISTRICT_CODES.put("宕囧窞","510184"); + DISTRICT_CODES.put("鑷础","510300"); + DISTRICT_CODES.put("鏀�鏋濊姳","510400"); + DISTRICT_CODES.put("娉稿窞","510500"); + DISTRICT_CODES.put("寰烽槼","510600"); + DISTRICT_CODES.put("骞挎眽","510681"); + DISTRICT_CODES.put("浠�閭�","510682"); + DISTRICT_CODES.put("缁电","510683"); + DISTRICT_CODES.put("缁甸槼","510700"); + DISTRICT_CODES.put("姹熸补","510781"); + DISTRICT_CODES.put("骞垮厓","510800"); + DISTRICT_CODES.put("閬傚畞","510900"); + DISTRICT_CODES.put("鍐呮睙","511000"); + DISTRICT_CODES.put("涔愬北","511100"); + DISTRICT_CODES.put("宄ㄧ湁灞�","511181"); + DISTRICT_CODES.put("鍗楀厖","511300"); + DISTRICT_CODES.put("闃嗕腑","511381"); + DISTRICT_CODES.put("鐪夊北","511400"); + DISTRICT_CODES.put("瀹滃","511500"); + DISTRICT_CODES.put("骞垮畨","511600"); + DISTRICT_CODES.put("鍗庤摜","511681"); + DISTRICT_CODES.put("杈惧窞","511700"); + DISTRICT_CODES.put("涓囨簮","511781"); + DISTRICT_CODES.put("闆呭畨","511800"); + DISTRICT_CODES.put("宸翠腑","511900"); + DISTRICT_CODES.put("璧勯槼","512000"); + DISTRICT_CODES.put("绠�闃�","512081"); + DISTRICT_CODES.put("瑗挎槍","513401"); + DISTRICT_CODES.put("璐甸槼","520100"); + DISTRICT_CODES.put("娓呴晣","520181"); + DISTRICT_CODES.put("鍏洏姘�","520200"); + DISTRICT_CODES.put("閬典箟","520300"); + DISTRICT_CODES.put("璧ゆ按","520381"); + DISTRICT_CODES.put("浠佹��","520382"); + DISTRICT_CODES.put("瀹夐『","520400"); + DISTRICT_CODES.put("姣曡妭","520500"); + DISTRICT_CODES.put("閾滀粊","520600"); + DISTRICT_CODES.put("鍏翠箟","522301"); + DISTRICT_CODES.put("鍑噷","522601"); + DISTRICT_CODES.put("閮藉寑","522701"); + DISTRICT_CODES.put("绂忔硥","522702"); + DISTRICT_CODES.put("鏄嗘槑","530100"); + DISTRICT_CODES.put("瀹夊畞","530181"); + DISTRICT_CODES.put("鏇查潠","530300"); + DISTRICT_CODES.put("瀹e▉","530381"); + DISTRICT_CODES.put("鐜夋邯","530400"); + DISTRICT_CODES.put("淇濆北","530500"); + DISTRICT_CODES.put("鏄��","530600"); + DISTRICT_CODES.put("涓芥睙","530700"); + DISTRICT_CODES.put("鏅幢","530800"); + DISTRICT_CODES.put("涓存钵","530900"); + DISTRICT_CODES.put("妤氶泟","532301"); + DISTRICT_CODES.put("涓棫","532501"); + DISTRICT_CODES.put("寮�杩�","532502"); + DISTRICT_CODES.put("钂欒嚜","532503"); + DISTRICT_CODES.put("寮ュ嫆","532504"); + DISTRICT_CODES.put("鏂囧北","532601"); + DISTRICT_CODES.put("鏅椽","532801"); + DISTRICT_CODES.put("澶х悊","532901"); + DISTRICT_CODES.put("鐟炰附","533102"); + DISTRICT_CODES.put("鑺�","533103"); + DISTRICT_CODES.put("鎷夎惃","540100"); + DISTRICT_CODES.put("鏃ュ杸鍒�","542301"); + DISTRICT_CODES.put("瑗垮畨","610100"); + DISTRICT_CODES.put("閾滃窛","610200"); + DISTRICT_CODES.put("瀹濋浮","610300"); + DISTRICT_CODES.put("鍜搁槼","610400"); + DISTRICT_CODES.put("鍏村钩","610481"); + DISTRICT_CODES.put("娓崡","610500"); + DISTRICT_CODES.put("闊╁煄","610581"); + DISTRICT_CODES.put("鍗庨槾","610582"); + DISTRICT_CODES.put("寤跺畨","610600"); + DISTRICT_CODES.put("姹変腑","610700"); + DISTRICT_CODES.put("姒嗘灄","610800"); + DISTRICT_CODES.put("瀹夊悍","610900"); + DISTRICT_CODES.put("鍟嗘礇","611000"); + DISTRICT_CODES.put("鍏板窞","620100"); + DISTRICT_CODES.put("鍢夊唱鍏�","620200"); + DISTRICT_CODES.put("閲戞槍","620300"); + DISTRICT_CODES.put("鐧介摱","620400"); + DISTRICT_CODES.put("澶╂按","620500"); + DISTRICT_CODES.put("姝﹀▉","620600"); + DISTRICT_CODES.put("寮犳帠","620700"); + DISTRICT_CODES.put("骞冲噳","620800"); + DISTRICT_CODES.put("閰掓硥","620900"); + DISTRICT_CODES.put("鐜夐棬","620981"); + DISTRICT_CODES.put("鏁︾厡","620982"); + DISTRICT_CODES.put("搴嗛槼","621000"); + DISTRICT_CODES.put("瀹氳タ","621100"); + DISTRICT_CODES.put("闄囧崡","621200"); + DISTRICT_CODES.put("涓村","622901"); + DISTRICT_CODES.put("鍚堜綔","623001"); + DISTRICT_CODES.put("瑗垮畞","630100"); + DISTRICT_CODES.put("娴蜂笢","630200"); + DISTRICT_CODES.put("鐜夋爲","632701"); + DISTRICT_CODES.put("鏍煎皵鏈�","632801"); + DISTRICT_CODES.put("寰蜂护鍝�","632802"); + DISTRICT_CODES.put("閾跺窛","640100"); + DISTRICT_CODES.put("鐏垫","640181"); + DISTRICT_CODES.put("鐭冲槾灞�","640200"); + DISTRICT_CODES.put("鍚村繝","640300"); + DISTRICT_CODES.put("闈掗摐宄�","640381"); + DISTRICT_CODES.put("鍥哄師","640400"); + DISTRICT_CODES.put("涓崼","640500"); + DISTRICT_CODES.put("涔岄瞾鏈ㄩ綈","650100"); + DISTRICT_CODES.put("鍏嬫媺鐜涗緷","650200"); + DISTRICT_CODES.put("鍚愰瞾鐣�","652101"); + DISTRICT_CODES.put("鍝堝瘑","652201"); + DISTRICT_CODES.put("鏄屽悏","652301"); + DISTRICT_CODES.put("闃滃悍","652302"); + DISTRICT_CODES.put("鍗氫箰","652701"); + DISTRICT_CODES.put("闃挎媺灞卞彛","652702"); + DISTRICT_CODES.put("搴撳皵鍕�","652801"); + DISTRICT_CODES.put("闃垮厠鑻�","652901"); + DISTRICT_CODES.put("闃垮浘浠�","653001"); + DISTRICT_CODES.put("鍠�浠�","653101"); + DISTRICT_CODES.put("鍜岀敯","653201"); + DISTRICT_CODES.put("浼婂畞","654002"); + DISTRICT_CODES.put("濂庡悲","654003"); + DISTRICT_CODES.put("濉斿煄","654201"); + DISTRICT_CODES.put("涔岃嫃","654202"); + DISTRICT_CODES.put("闃垮嫆娉�","654301"); + DISTRICT_CODES.put("鐭虫渤瀛�","659001"); + DISTRICT_CODES.put("闃挎媺灏�","659002"); + DISTRICT_CODES.put("鍥炬湪鑸掑厠","659003"); + DISTRICT_CODES.put("浜斿娓�","659004"); } } diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/ExcelUtil.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/ExcelUtil.java index 509490d97..ac09e80ff 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/ExcelUtil.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/ExcelUtil.java @@ -26,9 +26,9 @@ public class ExcelUtil { } /** - * 写Excel数据 - * @param fileName 文件名 - * @param data 将要写入的数据 第一列为标题 + * 鍐橢xcel鏁版嵁 + * @param fileName 鏂囦欢鍚� + * @param data 灏嗚鍐欏叆鐨勬暟鎹� 绗竴鍒椾负鏍囬 * @param sheetName */ public static String write(String fileName ,List> data,String sheetName) throws Exception{ @@ -53,16 +53,16 @@ public class ExcelUtil { } mainSheet.createFreezePane( 1, 1); mainSheet.setDefaultRowHeightInPoints(30); - //生成第一行标题 + //鐢熸垚绗竴琛屾爣棰� Row row = mainSheet.createRow(0); row.setHeightInPoints(35); Font font = workBook.createFont(); - font.setFontName("宋体"); + font.setFontName("瀹嬩綋"); // font.setBoldweight(Font.BOLDWEIGHT_BOLD); font.setFontHeightInPoints((short) 12); CellStyle cellStyle = workBook.createCellStyle(); cellStyle.setFont(font); - cellStyle.setAlignment(CellStyle.ALIGN_CENTER); //水平布局:居中 + cellStyle.setAlignment(CellStyle.ALIGN_CENTER); //姘村钩甯冨眬锛氬眳涓� cellStyle.setVerticalAlignment(CellStyle.VERTICAL_CENTER); int maxColumnNum = 0; @@ -77,9 +77,9 @@ public class ExcelUtil { } maxColumnNum = headDataList.size(); } - //设置内容格式 + //璁剧疆鍐呭鏍煎紡 font = workBook.createFont(); - font.setFontName("宋体"); + font.setFontName("瀹嬩綋"); font.setFontHeightInPoints((short) 12); cellStyle = workBook.createCellStyle(); cellStyle.setFont(font); diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/ExecuteCounter.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/ExecuteCounter.java index 6045ebaae..e3c931515 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/ExecuteCounter.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/ExecuteCounter.java @@ -5,7 +5,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicLong; /** - * 执行计数器,可以用来对当前线程下的某些方法进行计数统计 + * 鎵ц璁℃暟鍣紝鍙互鐢ㄦ潵瀵瑰綋鍓嶇嚎绋嬩笅鐨勬煇浜涙柟娉曡繘琛岃鏁扮粺璁� * * @author velna * @@ -61,7 +61,7 @@ public class ExecuteCounter { } /** - * 对指定的key进行1次计数 + * 瀵规寚瀹氱殑key杩涜1娆¤鏁� * * @param key * @return @@ -78,7 +78,7 @@ public class ExecuteCounter { } /** - * 得到一个基于thread local的实例 + * 寰楀埌涓�涓熀浜巘hread local鐨勫疄渚� * * @return */ diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/FSHConstant.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/FSHConstant.java index 54c345b99..5f0443e57 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/FSHConstant.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/FSHConstant.java @@ -3,17 +3,17 @@ package com.fangjia.core.util; public class FSHConstant { public static final Double ZERO = 0.0; - public static final Double CITY_UNUSUAL_FACTOR = 0.4;//城市平稳度指数 - public static final Double REGION_UNUSUAL_FACTOR = 0.6;//区域平稳度指数 - public static final Double HOUSE_QUOTE_FACTOR = 0.4;//小区同类型挂牌房源量 - public static final Double HOUSE_SELL_FACTOR = 0.1;//小区成交量 - public static final Double SEE_TIME_FACTOR = 0.1;//房源带看数 - public static final Double AGENCY_COUNT_FACTOR = 0.3;//中介数 - public static final Double HOUSE_HOLD_FACTOR = 0.1;//户数 - public static final Double PRICE_STABILITY_FACTOR = 0.2;//价格异常指数 - public static final Double HANDLE_DEGREESCORE_FACTOR = 0.3;//处置难易度指数 - public static final Double PRICE_SCORE_FACTOR = 0.3;//价格指数 - public static final Double INCREASE_SCORE_FACTOR = 0.2;//年涨跌幅 + public static final Double CITY_UNUSUAL_FACTOR = 0.4;//鍩庡競骞崇ǔ搴︽寚鏁� + public static final Double REGION_UNUSUAL_FACTOR = 0.6;//鍖哄煙骞崇ǔ搴︽寚鏁� + public static final Double HOUSE_QUOTE_FACTOR = 0.4;//灏忓尯鍚岀被鍨嬫寕鐗屾埧婧愰噺 + public static final Double HOUSE_SELL_FACTOR = 0.1;//灏忓尯鎴愪氦閲� + public static final Double SEE_TIME_FACTOR = 0.1;//鎴挎簮甯︾湅鏁� + public static final Double AGENCY_COUNT_FACTOR = 0.3;//涓粙鏁� + public static final Double HOUSE_HOLD_FACTOR = 0.1;//鎴锋暟 + public static final Double PRICE_STABILITY_FACTOR = 0.2;//浠锋牸寮傚父鎸囨暟 + public static final Double HANDLE_DEGREESCORE_FACTOR = 0.3;//澶勭疆闅炬槗搴︽寚鏁� + public static final Double PRICE_SCORE_FACTOR = 0.3;//浠锋牸鎸囨暟 + public static final Double INCREASE_SCORE_FACTOR = 0.2;//骞存定璺屽箙 public static final Double MAX_COLLATERAL_RATE1 = 1.0;//90-100 public static final Double MAX_COLLATERAL_RATE2 = 0.97;//80-90 @@ -22,49 +22,49 @@ public class FSHConstant { public static final Double MAX_COLLATERAL_RATE5 = 0.8;//50-60 public static final Double MAX_COLLATERAL_RATE6 = 0.0;//40-50 - public static final Double CONSUME_FACTOR = 0.6;//消费 - public static final Double MANAGE_FACTOR = 0.7;//经营 - public static final String NO_DATA_MSG = "未知"; + public static final Double CONSUME_FACTOR = 0.6;//娑堣垂 + public static final Double MANAGE_FACTOR = 0.7;//缁忚惀 + public static final String NO_DATA_MSG = "鏈煡"; - //pds1.3相关默认参数 + //pds1.3鐩稿叧榛樿鍙傛暟 public static final Double ABSD_LINE = -1.3d;// public static final Double ABSC_LINE = 1d;// - public static final Double AGENCY_MAX = 90d;//中介最大数 - public static final Double AGENCY_MIN = 0d;//中介最小值 - public static final Double AGENCY_SCALE = 0.2d;//中介得分比例 + public static final Double AGENCY_MAX = 90d;//涓粙鏈�澶ф暟 + public static final Double AGENCY_MIN = 0d;//涓粙鏈�灏忓�� + public static final Double AGENCY_SCALE = 0.2d;//涓粙寰楀垎姣斾緥 - public static final Double TOTALPRICE_SCOREA = 270d;//总价A值 - public static final Double TOTALPRICE_SCOREB = 18d;//总价B值 - public static final Double TOTALPRICE_SCOREE = 54d;//总价E值 - public static final Double TOTALPRICE_SCOREF = 72d;//总价F值 - public static final Double TOTALPRICE_SCALE = 0.2d;//房屋总价权重 + public static final Double TOTALPRICE_SCOREA = 270d;//鎬讳环A鍊� + public static final Double TOTALPRICE_SCOREB = 18d;//鎬讳环B鍊� + public static final Double TOTALPRICE_SCOREE = 54d;//鎬讳环E鍊� + public static final Double TOTALPRICE_SCOREF = 72d;//鎬讳环F鍊� + public static final Double TOTALPRICE_SCALE = 0.2d;//鎴垮眿鎬讳环鏉冮噸 - public static final Double QUOTE_SCALE = 0.3d;//发布量权重 - public static final Double QUOTE_MAX = 900d;//发布量max值 - public static final Double QUOTE_MIN = 0d;//发布量min值 + public static final Double QUOTE_SCALE = 0.3d;//鍙戝竷閲忔潈閲� + public static final Double QUOTE_MAX = 900d;//鍙戝竷閲弇ax鍊� + public static final Double QUOTE_MIN = 0d;//鍙戝竷閲弇in鍊� - public static final Double TRAFFIC_SCALE = 0.2d;//交通权重 - public static final Double BUS_SCALE = 0.6d;//公交权重 - public static final Double METRO_SCALE = 0.4d;//地铁权重 - public static final Double BUS_MAX = 48d;//公交数量max值 - public static final Double BUS_MIN = 0d;//公交数量min值 - public static final Double METRO_MAX = 5d;//地铁数量max值 - public static final Double METRO_MIN = 0d;//地铁数量min值 + public static final Double TRAFFIC_SCALE = 0.2d;//浜ら�氭潈閲� + public static final Double BUS_SCALE = 0.6d;//鍏氦鏉冮噸 + public static final Double METRO_SCALE = 0.4d;//鍦伴搧鏉冮噸 + public static final Double BUS_MAX = 48d;//鍏氦鏁伴噺max鍊� + public static final Double BUS_MIN = 0d;//鍏氦鏁伴噺min鍊� + public static final Double METRO_MAX = 5d;//鍦伴搧鏁伴噺max鍊� + public static final Double METRO_MIN = 0d;//鍦伴搧鏁伴噺min鍊� - public static final Double DENSITY_SCALE = 0.1d;//小区密度权重 - public static final Double DENSITY_MAX = 400d;//小区密度max值 - public static final Double DENSITY_MIN = 10d;//小区密度min值 - public static final Double DENSITY_RADIUS = 1.0d;//小区密度取值半径范围 - public static final Double QUOTE_A = 850d;//发布量A值 + public static final Double DENSITY_SCALE = 0.1d;//灏忓尯瀵嗗害鏉冮噸 + public static final Double DENSITY_MAX = 400d;//灏忓尯瀵嗗害max鍊� + public static final Double DENSITY_MIN = 10d;//灏忓尯瀵嗗害min鍊� + public static final Double DENSITY_RADIUS = 1.0d;//灏忓尯瀵嗗害鍙栧�煎崐寰勮寖鍥� + public static final Double QUOTE_A = 850d;//鍙戝竷閲廇鍊� public static final Double QUOTE_B = 200d;// - public static final Double PRICE_STABILITY_SCALE = 0.2d;//价格异常指数权重 + public static final Double PRICE_STABILITY_SCALE = 0.2d;//浠锋牸寮傚父鎸囨暟鏉冮噸 - public static final Double HANDLE_STABILITY_SCALE = 0.8d;//押品处置风险权重 + public static final Double HANDLE_STABILITY_SCALE = 0.8d;//鎶煎搧澶勭疆椋庨櫓鏉冮噸 - public static final Double DEAL_COUNT_SCORE = 0.3d;//交易量评分权重 + public static final Double DEAL_COUNT_SCORE = 0.3d;//浜ゆ槗閲忚瘎鍒嗘潈閲� diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/Footprint.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/Footprint.java index daf54f0fa..093e6307d 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/Footprint.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/Footprint.java @@ -7,7 +7,7 @@ import org.apache.commons.codec.digest.DigestUtils; /** - * 查看URL防止重复抓取 + * 鏌ョ湅URL闃叉閲嶅鎶撳彇 * * @author xiaoyu * @@ -43,7 +43,7 @@ public class Footprint { } /** - * 是否在该任务中已经存在或处理过 + * 鏄惁鍦ㄨ浠诲姟涓凡缁忓瓨鍦ㄦ垨澶勭悊杩� * * @param url * @param jobId diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/GeoUtils.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/GeoUtils.java index 4de1dc719..5f04fcb52 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/GeoUtils.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/GeoUtils.java @@ -39,7 +39,7 @@ public class GeoUtils { } /** - * @param raidus 单位米 + * @param raidus 鍗曚綅绫� * @return minLat, maxLat, minLng,maxLng */ public static double[] getAround(double lat, double lng, double radius) { @@ -62,11 +62,11 @@ public class GeoUtils { } /** - * 根据给定的经纬度、距离、角度,计算对应的经纬度 + * 鏍规嵁缁欏畾鐨勭粡绾害銆佽窛绂汇�佽搴︼紝璁$畻瀵瑰簲鐨勭粡绾害 * - * @param Lat 原始纬度 - * @param Lon 原始精度 - * @param distance 距离(米) + * @param Lat 鍘熷绾害 + * @param Lon 鍘熷绮惧害 + * @param distance 璺濈锛堢背锛� * @param angle , 90: right, 180: down * @return */ @@ -81,14 +81,14 @@ public class GeoUtils { } /** - * 纬度的弧度 + * 绾害鐨勫姬搴� */ public static double radLat(double Lat) { return Lat * Math.PI / 180; } /** - * 经度的弧度 + * 缁忓害鐨勫姬搴� */ public static double eadLon(double Lon) { return Lon * Math.PI / 180; @@ -100,8 +100,8 @@ public class GeoUtils { return ec * Math.cos(radLat); } - final static int EARTH_RADIUS = 6378137;// 赤道半径 earth radius - final static int POLAR_RADIUS = 6356725;// 极半径 polar radius + final static int EARTH_RADIUS = 6378137;// 璧ら亾鍗婂緞 earth radius + final static int POLAR_RADIUS = 6356725;// 鏋佸崐寰� polar radius public static double ecc(double Lat) { return POLAR_RADIUS + (EARTH_RADIUS - POLAR_RADIUS) * (90 - Lat) / 90; @@ -121,7 +121,7 @@ public class GeoUtils { public static double ee = 0.00669342162296594323; /** - * 百度转 wgs84 + * 鐧惧害杞� wgs84 * * @param bd_lat * @param bd_lng @@ -133,7 +133,7 @@ public class GeoUtils { } /** - * wgs84 转百度 + * wgs84 杞櫨搴� * * @param bd_lat * @param bd_lng @@ -145,7 +145,7 @@ public class GeoUtils { } /** - * 火星坐标系 (GCJ-02) 与百度坐标系 (BD-09) 的转换算法 将 BD-09 坐标转换成GCJ-02 坐标 + * 鐏槦鍧愭爣绯� (GCJ-02) 涓庣櫨搴﹀潗鏍囩郴 (BD-09) 鐨勮浆鎹㈢畻娉� 灏� BD-09 鍧愭爣杞崲鎴怗CJ-02 鍧愭爣 */ public static Map bd09ToGcj02(double bd_lat, double bd_lng) { double x = bd_lng - 0.0065, y = bd_lat - 0.006; @@ -160,7 +160,7 @@ public class GeoUtils { } /** - * 火星坐标系 (GCJ-02) 与百度坐标系 (BD-09) 的转换算法 将 GCJ-02 坐标转换成 BD-09 坐标 + * 鐏槦鍧愭爣绯� (GCJ-02) 涓庣櫨搴﹀潗鏍囩郴 (BD-09) 鐨勮浆鎹㈢畻娉� 灏� GCJ-02 鍧愭爣杞崲鎴� BD-09 鍧愭爣 */ public static Map gcj02ToBd09(double gg_lat, double gg_lng) { double x = gg_lng, y = gg_lat; @@ -175,7 +175,7 @@ public class GeoUtils { } /** - * 地球坐标系 (WGS84) 与火星坐标系 (GCJ-02) 的转换算法 将 WGS84 坐标转换成 GCJ-02 坐标 + * 鍦扮悆鍧愭爣绯� (WGS84) 涓庣伀鏄熷潗鏍囩郴 (GCJ-02) 鐨勮浆鎹㈢畻娉� 灏� WGS84 鍧愭爣杞崲鎴� GCJ-02 鍧愭爣 */ public static Map gps84ToGcj02(double lat, double lng) { if (outOfChina(lat, lng)) { @@ -201,7 +201,7 @@ public class GeoUtils { } /** - * 地球坐标系 (WGS84) 与火星坐标系 (GCJ-02) 的转换算法 将 GCJ-02 坐标转换成 WGS84 坐标 + * 鍦扮悆鍧愭爣绯� (WGS84) 涓庣伀鏄熷潗鏍囩郴 (GCJ-02) 鐨勮浆鎹㈢畻娉� 灏� GCJ-02 鍧愭爣杞崲鎴� WGS84 鍧愭爣 */ public static Map gcjToGps84(double lat, double lng) { Map gps = transform(lat, lng); @@ -305,22 +305,22 @@ public class GeoUtils { } else if (json != null && "10044".equals(json.optString("infocode"))) { System.exit(1); } else if (json != null && "10004".equals(json.optString("infocode"))) { - // 开发者的单位时间内(1分钟)访问量超限,被系统自动封停,下一分钟自动解封。 + // 寮�鍙戣�呯殑鍗曚綅鏃堕棿鍐咃紙1鍒嗛挓锛夎闂噺瓒呴檺锛岃绯荤粺鑷姩灏佸仠锛屼笅涓�鍒嗛挓鑷姩瑙e皝銆� try { Thread.sleep(60000); } catch (InterruptedException ie) { Thread.currentThread().interrupt(); } } else if (json != null && "10017".equals(json.optString("infocode"))) { - // 所请求的资源不可用 + // 鎵�璇锋眰鐨勮祫婧愪笉鍙敤 System.exit(1); } - return null; // 如果没有返回值,可以根据需要处理 + return null; // 濡傛灉娌℃湁杩斿洖鍊硷紝鍙互鏍规嵁闇�瑕佸鐞� } private static String getGaodeKey(String endpoint) { - // 实现获取高德 API key 的逻辑 + // 瀹炵幇鑾峰彇楂樺痉 API key 鐨勯�昏緫 return "8796b9dfb3889b57c38e2fff1b7e51bd"; } @@ -328,7 +328,7 @@ public class GeoUtils { public static void main(String[] args) { // Map location = gps84ToGcj02(31.218024629574998,121.36562884455); // System.out.println(location.toString()); - Map result = parserByGaode("上海", "新泾三村"); + Map result = parserByGaode("涓婃捣", "鏂版尘涓夋潙"); System.out.println(result.toString()); } } diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/HouseValidator.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/HouseValidator.java index 79b9079bb..c4f48f3df 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/HouseValidator.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/HouseValidator.java @@ -7,47 +7,47 @@ import java.util.Map.Entry; /** * - * 说明:房源字段验证器 + * 璇存槑:鎴挎簮瀛楁楠岃瘉鍣� * - * @author 王文艳 + * @author 鐜嬫枃鑹� * */ public class HouseValidator { private static final List ESTATE_TYPES = Arrays - .asList(new String[] { "普通住宅", "别墅", "商住" }); - private static final List FITMENTS = Arrays.asList(new String[] {"毛坯", "精装", "简装", "中装", "豪装", "清水", "全装修", "初装修", "普通装修", "精装修","豪华装修", "简装修", "中等装修", "中装修" }); + .asList(new String[] { "鏅�氫綇瀹�", "鍒", "鍟嗕綇" }); + private static final List FITMENTS = Arrays.asList(new String[] {"姣涘澂", "绮捐", "绠�瑁�", "涓", "璞", "娓呮按", "鍏ㄨ淇�", "鍒濊淇�", "鏅�氳淇�", "绮捐淇�","璞崕瑁呬慨", "绠�瑁呬慨", "涓瓑瑁呬慨", "涓淇�" }); private static final HashMap> BUILDING_TYPES = new HashMap>(); private static final HashMap> FITMENTS_TYPES_MAPS = new HashMap>(); - private static final List DIRECTIONS = Arrays.asList(new String[] {"东北", "西北", "东南", "西南","南北","东西","东", "南", "西", "北" }); + private static final List DIRECTIONS = Arrays.asList(new String[] {"涓滃寳", "瑗垮寳", "涓滃崡", "瑗垮崡","鍗楀寳","涓滆タ","涓�", "鍗�", "瑗�", "鍖�" }); private static final Map FITMENTS_CODE_MAPS = new HashMap(); private static final Map DIRECTION_CODE_MAPS = new HashMap(); static { - BUILDING_TYPES.put("普通住宅",Arrays.asList(new String[] { "多层", "小高层", "超高层", "高层", "花园洋房","老洋房", "四合院" })); - BUILDING_TYPES.put("别墅",Arrays.asList(new String[] { "独栋", "双拼", "联排", "叠加" })); - BUILDING_TYPES.put("商住",Arrays.asList(new String[] { "多层", "小高层", "超高层", "高层" })); + BUILDING_TYPES.put("鏅�氫綇瀹�",Arrays.asList(new String[] { "澶氬眰", "灏忛珮灞�", "瓒呴珮灞�", "楂樺眰", "鑺卞洯娲嬫埧","鑰佹磱鎴�", "鍥涘悎闄�" })); + BUILDING_TYPES.put("鍒",Arrays.asList(new String[] { "鐙爧", "鍙屾嫾", "鑱旀帓", "鍙犲姞" })); + BUILDING_TYPES.put("鍟嗕綇",Arrays.asList(new String[] { "澶氬眰", "灏忛珮灞�", "瓒呴珮灞�", "楂樺眰" })); - FITMENTS_TYPES_MAPS.put("毛坯", Arrays.asList(new String[] { "毛坯", "清水", "无装修", "独栋毛坯","毛胚", "白坯", "旧装", "坯", "原房", "毛坏"})); - FITMENTS_TYPES_MAPS.put("简装", Arrays.asList(new String[] { "简装", "普通装修", "普通","简单装修","简易装修","普装", "一般装修", "一般", "简", "粗装修"})); - FITMENTS_TYPES_MAPS.put("精装", Arrays.asList(new String[] { "精装","全装修", "全装", "中等装修", "中装","中档装修","精致装修", "中档", "中等", "精", "中修", "优质装修", "时尚装修", "良装", "中高挡"})); - FITMENTS_TYPES_MAPS.put("豪装", Arrays.asList(new String[] { "豪华装修","高档","豪华","豪装", "高级装修", "高装","奢侈"})); + FITMENTS_TYPES_MAPS.put("姣涘澂", Arrays.asList(new String[] { "姣涘澂", "娓呮按", "鏃犺淇�", "鐙爧姣涘澂","姣涜儦", "鐧藉澂", "鏃ц", "鍧�", "鍘熸埧", "姣涘潖"})); + FITMENTS_TYPES_MAPS.put("绠�瑁�", Arrays.asList(new String[] { "绠�瑁�", "鏅�氳淇�", "鏅��","绠�鍗曡淇�","绠�鏄撹淇�","鏅", "涓�鑸淇�", "涓�鑸�", "绠�", "绮楄淇�"})); + FITMENTS_TYPES_MAPS.put("绮捐", Arrays.asList(new String[] { "绮捐","鍏ㄨ淇�", "鍏ㄨ", "涓瓑瑁呬慨", "涓","涓。瑁呬慨","绮捐嚧瑁呬慨", "涓。", "涓瓑", "绮�", "涓慨", "浼樿川瑁呬慨", "鏃跺皻瑁呬慨", "鑹", "涓珮鎸�"})); + FITMENTS_TYPES_MAPS.put("璞", Arrays.asList(new String[] { "璞崕瑁呬慨","楂樻。","璞崕","璞", "楂樼骇瑁呬慨", "楂樿","濂緢"})); - DIRECTION_CODE_MAPS.put("西南", 1); - DIRECTION_CODE_MAPS.put("东南", 2); - DIRECTION_CODE_MAPS.put("南", 3); - DIRECTION_CODE_MAPS.put("西北", 4); - DIRECTION_CODE_MAPS.put("东北", 5); - DIRECTION_CODE_MAPS.put("东", 6); - DIRECTION_CODE_MAPS.put("西", 7); - DIRECTION_CODE_MAPS.put("北", 8); - DIRECTION_CODE_MAPS.put("东西", 9); - DIRECTION_CODE_MAPS.put("南北", 10); + DIRECTION_CODE_MAPS.put("瑗垮崡", 1); + DIRECTION_CODE_MAPS.put("涓滃崡", 2); + DIRECTION_CODE_MAPS.put("鍗�", 3); + DIRECTION_CODE_MAPS.put("瑗垮寳", 4); + DIRECTION_CODE_MAPS.put("涓滃寳", 5); + DIRECTION_CODE_MAPS.put("涓�", 6); + DIRECTION_CODE_MAPS.put("瑗�", 7); + DIRECTION_CODE_MAPS.put("鍖�", 8); + DIRECTION_CODE_MAPS.put("涓滆タ", 9); + DIRECTION_CODE_MAPS.put("鍗楀寳", 10); - FITMENTS_CODE_MAPS.put("毛坯", 1); - FITMENTS_CODE_MAPS.put("简装", 2); - FITMENTS_CODE_MAPS.put("精装", 3); - FITMENTS_CODE_MAPS.put("豪装", 4); + FITMENTS_CODE_MAPS.put("姣涘澂", 1); + FITMENTS_CODE_MAPS.put("绠�瑁�", 2); + FITMENTS_CODE_MAPS.put("绮捐", 3); + FITMENTS_CODE_MAPS.put("璞", 4); } public static boolean validateArea(double area) { @@ -70,7 +70,7 @@ public class HouseValidator { return false; } List buildingTypes = BUILDING_TYPES.get(eatateType); - String[] bTypes = buildingType.split(",|,"); + String[] bTypes = buildingType.split(",|锛�"); for (String bType : bTypes) { if(!buildingTypes.contains(bType)){ return false; @@ -82,7 +82,7 @@ public class HouseValidator { } /** - * 把装修信息映射成装修编码 + * 鎶婅淇俊鎭槧灏勬垚瑁呬慨缂栫爜 * @param fitmentDesc * @return */ @@ -92,7 +92,7 @@ public class HouseValidator { } /** - * 把朝向信息映射成朝向编码 + * 鎶婃湞鍚戜俊鎭槧灏勬垚鏈濆悜缂栫爜 * @param direction * @return */ @@ -105,7 +105,7 @@ public class HouseValidator { if(buildingType == null){ return false; } - String[] builds = buildingType.split(",|,"); + String[] builds = buildingType.split(",|锛�"); for (String build : builds) { for (List types : BUILDING_TYPES.values()) { if (types.contains(build)) { @@ -128,7 +128,7 @@ public class HouseValidator { return null; } fitmentDesc = fitmentDesc.replaceAll("[\\s ]+", ""); - if(fitmentDesc.equals("非毛坯")){ + if(fitmentDesc.equals("闈炴瘺鍧�")){ return null; } Iterator>> it = FITMENTS_TYPES_MAPS @@ -154,7 +154,7 @@ public class HouseValidator { if (directionDesc == null) { return null; } - directionDesc = directionDesc.replaceAll("(\\(|(|《|\"|“|【|〔).+?(\\)|》|)|\"|”|】|〕)", "#_#"); + directionDesc = directionDesc.replaceAll("(\\(|锛坾銆妡\"|鈥渱銆恷銆�).+?(\\)|銆媩锛墊\"|鈥潀銆憒銆�)", "#_#"); StringBuffer sb = new StringBuffer(); for (int i = 0; i < directionDesc.length(); i++) { char c = directionDesc.charAt(i); @@ -181,7 +181,7 @@ public class HouseValidator { } public static void main(String[] args) { - System.out.println(fetchDirectionInfo("南北【好美嘉园】属鼠的选择哪种朝向的房子最好?2018-01-19")); + System.out.println(fetchDirectionInfo("鍗楀寳銆愬ソ缇庡槈鍥�戝睘榧犵殑閫夋嫨鍝鏈濆悜鐨勬埧瀛愭渶濂斤紵2018-01-19")); } } diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/HttpRequest.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/HttpRequest.java index 40e872ea0..ebf0191e4 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/HttpRequest.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/HttpRequest.java @@ -196,7 +196,7 @@ public class HttpRequest { String rt = EntityUtils.toString(response.getEntity(), charset); return rt; } catch (Exception e) { - LOGGER.error("请求异常:" + url, e); + LOGGER.error("璇锋眰寮傚父:" + url, e); throw new HttpRequestException(e); }finally { if(httpClient.getConnectionManager() != null){ @@ -387,11 +387,11 @@ public class HttpRequest { } /** - * 小神鱼post请求封装 - * 向指定 URL 发送POST方法的请求 - * @param url 发送请求的 URL - * @param param 请求参数,请求参数应该是 name1=value1&name2=value2 的形式。 - * @return 所代表远程资源的响应结果 + * 灏忕楸紁ost璇锋眰灏佽 + * 鍚戞寚瀹� URL 鍙戦�丳OST鏂规硶鐨勮姹� + * @param url 鍙戦�佽姹傜殑 URL + * @param param 璇锋眰鍙傛暟锛岃姹傚弬鏁板簲璇ユ槸 name1=value1&name2=value2 鐨勫舰寮忋�� + * @return 鎵�浠h〃杩滅▼璧勬簮鐨勫搷搴旂粨鏋� */ public static String sendPostTwo(String url, String param,Map headers) { PrintWriter out = null; @@ -399,9 +399,9 @@ public class HttpRequest { String result = ""; try { URL realUrl = new URL(url); - // 打开和URL之间的连接 + // 鎵撳紑鍜孶RL涔嬮棿鐨勮繛鎺� URLConnection conn = realUrl.openConnection(); - // 设置通用的请求属性 + // 璁剧疆閫氱敤鐨勮姹傚睘鎬� conn.setRequestProperty("accept", "*/*"); conn.setRequestProperty("connection", "Keep-Alive"); conn.setRequestProperty("user-agent", @@ -410,16 +410,16 @@ public class HttpRequest { String value = headers.get(key); conn.setRequestProperty(key,value); } - // 发送POST请求必须设置如下两行 + // 鍙戦�丳OST璇锋眰蹇呴』璁剧疆濡備笅涓よ conn.setDoOutput(true); conn.setDoInput(true); - // 获取URLConnection对象对应的输出流 + // 鑾峰彇URLConnection瀵硅薄瀵瑰簲鐨勮緭鍑烘祦 out = new PrintWriter(conn.getOutputStream()); - // 发送请求参数 + // 鍙戦�佽姹傚弬鏁� out.print(param); - // flush输出流的缓冲 + // flush杈撳嚭娴佺殑缂撳啿 out.flush(); - // 定义BufferedReader输入流来读取URL的响应 + // 瀹氫箟BufferedReader杈撳叆娴佹潵璇诲彇URL鐨勫搷搴� in = new BufferedReader( new InputStreamReader(conn.getInputStream())); String line; @@ -427,10 +427,10 @@ public class HttpRequest { result += line; } } catch (Exception e) { - System.out.println("发送 POST 请求出现异常!"+e); + System.out.println("鍙戦�� POST 璇锋眰鍑虹幇寮傚父锛�"+e); e.printStackTrace(); } - //使用finally块来关闭输出流、输入流 + //浣跨敤finally鍧楁潵鍏抽棴杈撳嚭娴併�佽緭鍏ユ祦 finally{ try{ if(out!=null){ diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/JXMConvertUtil.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/JXMConvertUtil.java index 8b168d255..d57a712f3 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/JXMConvertUtil.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/JXMConvertUtil.java @@ -1,5 +1,5 @@ /** - * 将XML转JSON String、将JSON转Map + * 灏哫ML杞琂SON String銆佸皢JSON杞琈ap */ package com.fangjia.core.util; import java.util.ArrayList; @@ -16,7 +16,7 @@ import net.sf.json.xml.XMLSerializer; public class JXMConvertUtil{ /** - * 将XML String转成JSON String + * 灏哫ML String杞垚JSON String * * @param XMLString * @return @@ -31,7 +31,7 @@ public class JXMConvertUtil{ } /** - * 将JSON转换成Map + * 灏咼SON杞崲鎴怣ap * @param object * @return * @@ -40,7 +40,7 @@ public class JXMConvertUtil{ public static Map JsonConvertHashMap(Object object) { Map RMap = new HashMap(); - // 将json字符串转换成jsonObject + // 灏唈son瀛楃涓茶浆鎹㈡垚jsonObject JSONObject jsonObject = JSONObject.fromObject(object); RMap=IteratorHash(jsonObject); @@ -49,7 +49,7 @@ public class JXMConvertUtil{ /** - * 递归遍历JSON对象。 + * 閫掑綊閬嶅巻JSON瀵硅薄銆� * * @param JsonToMap * @return @@ -61,9 +61,9 @@ public class JXMConvertUtil{ HashMap RMap = new HashMap(); while(it.hasNext()){ String key = String.valueOf(it.next()); - if(JsonToMap.get(key).getClass() == JSONArray.class){//判是否为列表 + if(JsonToMap.get(key).getClass() == JSONArray.class){//鍒ゆ槸鍚︿负鍒楄〃 - if(JsonToMap.getJSONArray(key).isEmpty()){//判列表是否为空 + if(JsonToMap.getJSONArray(key).isEmpty()){//鍒ゅ垪琛ㄦ槸鍚︿负绌� RMap.put(key,null); }else{ diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/JsonUtils.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/JsonUtils.java index 3eb130c54..b01b80948 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/JsonUtils.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/JsonUtils.java @@ -8,7 +8,7 @@ import java.io.IOException; import java.io.StringWriter; /** - * JSON 转换工具类 + * JSON 杞崲宸ュ叿绫� */ public class JsonUtils { @@ -21,12 +21,12 @@ public class JsonUtils { mapper.writeValue(writer, obj); return writer.toString(); }catch(Exception e){ - throw new RuntimeException("序列化对象【"+obj+"】时出错", e); + throw new RuntimeException("搴忓垪鍖栧璞°��"+obj+"銆戞椂鍑洪敊", e); } } /** - * 把JSON字符串装换成JAVA对象 + * 鎶奐SON瀛楃涓茶鎹㈡垚JAVA瀵硅薄 * @param jsonObject * @param clazz * @param @@ -37,7 +37,7 @@ public class JsonUtils { } /** - * 把JSON字符串装换成JAVA对象 + * 鎶奐SON瀛楃涓茶鎹㈡垚JAVA瀵硅薄 * @param clazz * @param * @return diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/MD5Util.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/MD5Util.java index e17fa169a..1ed2dc6f5 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/MD5Util.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/MD5Util.java @@ -8,7 +8,7 @@ import org.apache.commons.codec.digest.DigestUtils; * * @author JENIS * - * 2018年5月21日 下午17:29:28 + * 2018骞�5鏈�21鏃� 涓嬪崍17:29:28 */ public class MD5Util { @@ -17,12 +17,12 @@ public class MD5Util { } /** - * MD5加密 + * MD5鍔犲瘑 * * @param msg - * 密文 + * 瀵嗘枃 * @param charset - * 字符集 + * 瀛楃闆� * @return String e */ public static String encrypt(String msg, String charset) { diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/MathUtils.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/MathUtils.java index 3aae1219b..d5a8f341d 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/MathUtils.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/MathUtils.java @@ -19,7 +19,7 @@ public class MathUtils { } /** - * 所有计算排名 + * 鎵�鏈夎绠楁帓鍚� * @param cityRank * @param cityTotal * @return @@ -37,7 +37,7 @@ public class MathUtils { return f1; } - //押品综合评分 + //鎶煎搧缁煎悎璇勫垎 public static double calTotalScore(Double handleDegreeScore,Double priceStability,Double rate,Double handleRate){ double score = 0d; score = (double)((handleDegreeScore*handleRate)+(priceStability*rate)); @@ -45,7 +45,7 @@ public class MathUtils { double f1 = b.setScale(4,BigDecimal.ROUND_HALF_UP).doubleValue(); return f1; } - //处置难易度 + //澶勭疆闅炬槗搴� public static double calHandleDegreeScore(Double agencyScore,Double quoteScore,Double trafficScore,Double distirctDensityScore,Double totalPriceScore ,Double agencyScale ,Double quoteScale ,Double trafficScale ,Double densityScale,Double totalPriceScale){ double score = 0d; score = (double)((agencyScore*agencyScale)+(quoteScore*quoteScale)+(trafficScore*trafficScale)+(distirctDensityScore*densityScale)+(totalPriceScore*totalPriceScale)); @@ -53,7 +53,7 @@ public class MathUtils { double f1 = b.setScale(4,BigDecimal.ROUND_HALF_UP).doubleValue(); return f1; } - //小区密度小于max的时候 + //灏忓尯瀵嗗害灏忎簬max鐨勬椂鍊� public static double calDensityScoreLessThanMax(Integer quoteHouseSix,Double quoteA,Double quoteB){ double fenmu = quoteA-quoteB; if(fenmu==0){ @@ -66,7 +66,7 @@ public class MathUtils { return f1; } - //小区密度大于max的时候 + //灏忓尯瀵嗗害澶т簬max鐨勬椂鍊� public static double calDensityScoreBigThanMax(Integer quoteHouseSix,Double quoteA,Double quoteB){ double fenmu = quoteA-quoteB; if(fenmu==0){ @@ -79,7 +79,7 @@ public class MathUtils { return f1; } - //小区密度在中间的时候公式 + //灏忓尯瀵嗗害鍦ㄤ腑闂寸殑鏃跺�欏叕寮� public static double calDensityScoreBetween(Integer districtCount,Double densityMin,Double densityMax){ double fenmu = densityMax-densityMin; if(fenmu==0){ @@ -92,7 +92,7 @@ public class MathUtils { return f1; } - //交通得分 + //浜ら�氬緱鍒� public static double calTrafficScore(Double metroScore,Double busScore,Double metroScale,Double busScale){ double score = 0d; score = (metroScore*metroScale)+(busScore*busScale); @@ -100,7 +100,7 @@ public class MathUtils { double f1 = b.setScale(4,BigDecimal.ROUND_HALF_UP).doubleValue(); return f1; } - //地铁数量在中间的时候公式 + //鍦伴搧鏁伴噺鍦ㄤ腑闂寸殑鏃跺�欏叕寮� public static double calBusScoreBetween(Integer busCount,Double busMax,Double busMin){ double fenmu = busMax-busMin; if(fenmu==0){ @@ -113,7 +113,7 @@ public class MathUtils { return f1; } - //地铁数量在中间的时候公式 + //鍦伴搧鏁伴噺鍦ㄤ腑闂寸殑鏃跺�欏叕寮� public static double calMetroScoreBetween(Integer metroCount,Double metroMax,Double metroMin){ double fenmu = metroMax-metroMin; if(fenmu==0){ @@ -126,7 +126,7 @@ public class MathUtils { return f1; } - //挂牌量在中间的时候公式 + //鎸傜墝閲忓湪涓棿鐨勬椂鍊欏叕寮� public static double calQuoteScoreBetween(Double quoteMax,Double quoteMin,long quoteHouseSix){ double fenmu = quoteMax-quoteMin; if(fenmu==0){ @@ -139,7 +139,7 @@ public class MathUtils { return f1; } - //城市均价*F<总价<城市均价*A + //鍩庡競鍧囦环*F锛滄�讳环锛滃煄甯傚潎浠�*A public static double calTotalPriceScoreLessThanA(Integer cityAvgPrice,Integer totalPrice,Double totalPriceA,Double totalPriceF){ double fenmu = (cityAvgPrice*totalPriceA)-(cityAvgPrice*totalPriceF); if(fenmu==0){ @@ -152,7 +152,7 @@ public class MathUtils { return f1; } - //城市均价*B<总价<城市均价*E + //鍩庡競鍧囦环*B锛滄�讳环锛滃煄甯傚潎浠�*E public static double calTotalPriceScoreLessThanE(Integer cityAvgPrice,Integer totalPrice,Double totalPriceE,Double totalPriceB){ double fenmu = (cityAvgPrice*totalPriceE)-(cityAvgPrice*totalPriceB); if(fenmu==0){ @@ -166,7 +166,7 @@ public class MathUtils { } - //中介数得分算法 + //涓粙鏁板緱鍒嗙畻娉� public static double calAgencyScore(int allAgency,Double agencyMax,Double agencyMin){ if(agencyMax==0){ return 0d; @@ -178,7 +178,7 @@ public class MathUtils { return f1; } - //小于一年的时候 差比小于D + //灏忎簬涓�骞寸殑鏃跺�� 宸瘮灏忎簬D public static double absBigThanLineHigh(Double yoy,Double absDLine){ double score = 0d; yoy = Math.abs(yoy); @@ -188,7 +188,7 @@ public class MathUtils { return f1; } - //小于一年的时候 差比小于c + //灏忎簬涓�骞寸殑鏃跺�� 宸瘮灏忎簬c public static double absBigThanLineLess(Double yoy,Double absCLine){ double score = 0d; @@ -198,7 +198,7 @@ public class MathUtils { return f1; } - //差比小于c值得时候 + //宸瘮灏忎簬c鍊煎緱鏃跺�� public static double absLessThanC(Double regionAbs,Double absCLine){ if(absCLine==0){ return 0d; @@ -211,7 +211,7 @@ public class MathUtils { } - //yoy>0且当小于D的时候 价格稳定指数 + //yoy>0涓斿綋灏忎簬D鐨勬椂鍊� 浠锋牸绋冲畾鎸囨暟 public static double absLessThanZero(Double abs){ double score = 0d; score = 55d+((abs+1d)*45d); @@ -221,20 +221,20 @@ public class MathUtils { } - //yoy<0且当小于D的时候 价格稳定指数 + //yoy<0涓斿綋灏忎簬D鐨勬椂鍊� 浠锋牸绋冲畾鎸囨暟 public static double absBigThanLine(Double abs,Double absLine){ if(absLine == 1){ return 0d; } double score = 0d; - //得分=10+(D-|差比|)*45/D + //寰楀垎=10+锛圖-|宸瘮|锛�*45/D score = 10d+((45d*(absLine-Math.abs(abs)))/(absLine)); BigDecimal b = new BigDecimal(score); double f1 = b.setScale(4,BigDecimal.ROUND_HALF_UP).doubleValue(); return f1; } - //区域涨跌幅差比 + //鍖哄煙娑ㄨ穼骞呭樊姣� public static double yoyAbs(double disYoy,double regionYoy){ double abs = (disYoy-regionYoy)/regionYoy; BigDecimal b = new BigDecimal(abs); @@ -243,7 +243,7 @@ public class MathUtils { } - //±5 ±10范围内的均价 + //卤5 卤10鑼冨洿鍐呯殑鍧囦环 public static Map getAvgPriceChange(Integer avgPrice,Double range){ Map map = new HashMap(); double minPrice = 0d; @@ -257,8 +257,8 @@ public class MathUtils { /** - * yinjihuan:2017-10-13修改默认值为-1,改之前是1 - * 改为-1时房生活均价排名隐藏掉 + * yinjihuan:2017-10-13淇敼榛樿鍊间负-1锛屾敼涔嬪墠鏄�1 + * 鏀逛负-1鏃舵埧鐢熸椿鍧囦环鎺掑悕闅愯棌鎺� * @param cityLevel * @param citySize * @return @@ -290,10 +290,10 @@ public class MathUtils { return 0d; } - // 计算最高抵押率 + // 璁$畻鏈�楂樻姷鎶肩巼 public static Double getMaxCollateralRate(Double collateralTotalScore,String usage) { Double maxCollateralRate = 0.0; - if(StringUtils.isNotBlank(usage)&&usage.equals("消费")){ + if(StringUtils.isNotBlank(usage)&&usage.equals("娑堣垂")){ if (collateralTotalScore <= 100 && collateralTotalScore > 80) { maxCollateralRate = mul(PDSConstant.CONSUME_FACTOR, PDSConstant.MAX_COLLATERAL_RATE1); @@ -348,7 +348,7 @@ public class MathUtils { return maxCollateralRate; } - // 押品综合得分 + // 鎶煎搧缁煎悎寰楀垎 public static Double getCollateralTotalScore(Double priceStability, Double handleDegreeScore, Double priceScore, Double increaseScore) { Double collateralTotalScore = add( @@ -360,7 +360,7 @@ public class MathUtils { return collateralTotalScore; } - // 押品综合得分 + // 鎶煎搧缁煎悎寰楀垎 public static Double getNewCollateralTotalScore(Double priceStability, Double handleDegreeScore, Double priceScore, Double increaseScore) { Double collateralTotalScore = add( @@ -371,7 +371,7 @@ public class MathUtils { return collateralTotalScore; } - // 处理难易度指数 + // 澶勭悊闅炬槗搴︽寚鏁� public static Double getHandleDegreeScore(Double houseQuoteScore, Double houseSellScore, Double seeTimeScore, Double agencyScore, Double houseHoldScore) { @@ -409,7 +409,7 @@ public class MathUtils { if (momCityLevel == 0) { momCityLevel = 1; } - // 得分=100-100/(总名次数-1)*(A-1) + // 寰楀垎=100-100/锛堟�诲悕娆℃暟-1锛�*锛圓-1锛� Double sub1 = sub((double) momCityLevel, 1.0); Double sub2 = sub((double) citySize, 1.0); Double mul = mul(sub1, 100.0); @@ -420,7 +420,7 @@ public class MathUtils { public static Double getHouseQuoteScore(Integer citySize, Integer momCityLevel) { - // 挂牌房源量得分=100-100/(总名次数-1)*(A-1) + // 鎸傜墝鎴挎簮閲忓緱鍒�=100-100/锛堟�诲悕娆℃暟-1锛�*锛圓-1锛� if(citySize>1&&momCityLevel>=1){ Double sub1 = sub((double) momCityLevel, 1.0); Double sub2 = sub((double) citySize, 1.0); @@ -436,7 +436,7 @@ public class MathUtils { public static Double getPriceScore(Integer cityRank, Integer cityRankTotal) { if (cityRank != null && cityRankTotal != null) { - // 价格指数=100-100/(总名次数-1)*(A-1) + // 浠锋牸鎸囨暟=100-100/锛堟�诲悕娆℃暟-1锛�*锛圓-1锛� Double sub1 = sub((double) cityRank, 1.0); Double sub2 = sub((double) cityRankTotal, 1.0); Double mul = mul(100.0, sub1); @@ -448,7 +448,7 @@ public class MathUtils { } public static Double getIncreaseScore(int allSize, int levelInCity) { - // 得分=100+(-1)*100/(总名次数-1)*(年涨幅城市排名-1) + // 寰楀垎=100+锛�-1锛�*100/锛堟�诲悕娆℃暟-1锛�*锛堝勾娑ㄥ箙鍩庡競鎺掑悕-1锛� Double sub1 = sub((double) allSize, 1.0); Double sub2 = sub((double) levelInCity, 1.0); Double mul = mul(sub2, 100.0); @@ -458,7 +458,7 @@ public class MathUtils { } /** - * 价格平稳度 + * 浠锋牸骞崇ǔ搴� * * @param cityPriceStability * @param regionPriceStability @@ -473,7 +473,7 @@ public class MathUtils { } /** - * 价格异常指数 + * 浠锋牸寮傚父鎸囨暟 */ public static Double getPriceStability(Integer allMinusDivideSize, Integer minusDivideLevel) { @@ -491,7 +491,7 @@ public class MathUtils { } /** - * 获得差绝对值 + * 鑾峰緱宸粷瀵瑰�� * * @param districtYearIn * @param cityYearIn @@ -503,7 +503,7 @@ public class MathUtils { } /** - * 加 + * 鍔� * * @param v1 * @param v2 @@ -516,7 +516,7 @@ public class MathUtils { } /** - * 减 + * 鍑� * * @param v1 * @param v2 @@ -529,7 +529,7 @@ public class MathUtils { } /** - * 乘 + * 涔� * * @param v1 * @param v2 @@ -542,7 +542,7 @@ public class MathUtils { } /** - * 除 + * 闄� * * @param v1 * @param v2 @@ -584,7 +584,7 @@ public class MathUtils { return found; } public static void main(String[] args) { - System.out.println(patternCompile("1234我是","\\d+")); + System.out.println(patternCompile("1234鎴戞槸","\\d+")); } } diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/Mongo3Utils.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/Mongo3Utils.java index 9fb771958..0ad1ad407 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/Mongo3Utils.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/Mongo3Utils.java @@ -22,7 +22,7 @@ public class Mongo3Utils { /** - * 获取MongoServer + * 鑾峰彇MongoServer * @param uri * @return */ @@ -47,8 +47,8 @@ public class Mongo3Utils { /** * MongoCollection * @param uri uri - * @param db 数据库 - * @param name 集合 + * @param db 鏁版嵁搴� + * @param name 闆嗗悎 * @return */ public static MongoCollection getDbCollection(String uri, String db, String name) { @@ -56,9 +56,9 @@ public class Mongo3Utils { } /** - * 获取主数据库 MongoCollection - * @param db 数据库 - * @param name 集合 + * 鑾峰彇涓绘暟鎹簱 MongoCollection + * @param db 鏁版嵁搴� + * @param name 闆嗗悎 * @return */ public static MongoCollection getDbCollection(String db, String name) { diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/NumberText.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/NumberText.java index 78bb481d9..6031f3a5b 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/NumberText.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/NumberText.java @@ -454,12 +454,12 @@ public abstract class NumberText { static enum Type { Simplified, Traditional; } static enum Connect { - Di ("第", "第"), - Fu ("负", "負"), - Ling ("零", "零"), - Shi ("十", "拾"), - Bai ("百", "佰"), - Qian ("千", "仟"), + Di ("绗�", "绗�"), + Fu ("璐�", "璨�"), + Ling ("闆�", "闆�"), + Shi ("鍗�", "鎷�"), + Bai ("鐧�", "浣�"), + Qian ("鍗�", "浠�"), ; final String display, displayTraditional; @@ -471,17 +471,17 @@ public abstract class NumberText { static enum Power { - Wan ("万", "萬"), // 10^4 - Yi ("亿", "億"), // 10^8 - Zhao ("兆", "兆"), // 10^12 - Jing ("京", "京"), // 10^16 (enough for Long.MAX_VALUE) - Gai ("垓", "垓"), // 10^20 - Zi ("秭", "秭"), // 10^24 - Rang ("穰", "穰"), // 10^28 - Gou ("沟", "溝"), // 10^32 - Jian ("涧", "澗"), // 10^36 - Zheng ("正", "正"), // 10^40 - Zai ("载", "載"), // 10^44 + Wan ("涓�", "钀�"), // 10^4 + Yi ("浜�", "鍎�"), // 10^8 + Zhao ("鍏�", "鍏�"), // 10^12 + Jing ("浜�", "浜�"), // 10^16 (enough for Long.MAX_VALUE) + Gai ("鍨�", "鍨�"), // 10^20 + Zi ("绉�", "绉�"), // 10^24 + Rang ("绌�", "绌�"), // 10^28 + Gou ("娌�", "婧�"), // 10^32 + Jian ("娑�", "婢�"), // 10^36 + Zheng ("姝�", "姝�"), // 10^40 + Zai ("杞�", "杓�"), // 10^44 ; final String display, displayTraditional; @@ -493,16 +493,16 @@ public abstract class NumberText { static enum Digit { - Ling ("零", "零"), // just to occupy this position - Yi ("一", "壹"), - Er ("二", "贰"), - San ("三", "叁"), - Si ("四", "肆"), - Wu ("五", "伍"), - Liu ("六", "陆"), - Qi ("七", "柒"), - Ba ("八", "捌"), - Jiu ("九", "玖"), + Ling ("闆�", "闆�"), // just to occupy this position + Yi ("涓�", "澹�"), + Er ("浜�", "璐�"), + San ("涓�", "鍙�"), + Si ("鍥�", "鑲�"), + Wu ("浜�", "浼�"), + Liu ("鍏�", "闄�"), + Qi ("涓�", "鏌�"), + Ba ("鍏�", "鎹�"), + Jiu ("涔�", "鐜�"), ; final String display, displayTraditional; diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/Numeric2Chinese.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/Numeric2Chinese.java index 06c6d6f5c..5775c5742 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/Numeric2Chinese.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/Numeric2Chinese.java @@ -1,41 +1,41 @@ package com.fangjia.core.util; public class Numeric2Chinese { - static String[] units = new String[] { "十", "百", "千", "万", "十", "百", "千", - "亿" }; - static String[] numeric = new String[] { "零", "一", "二", "三", "四", "五", "六", - "七", "八", "九" }; + static String[] units = new String[] { "鍗�", "鐧�", "鍗�", "涓�", "鍗�", "鐧�", "鍗�", + "浜�" }; + static String[] numeric = new String[] { "闆�", "涓�", "浜�", "涓�", "鍥�", "浜�", "鍏�", + "涓�", "鍏�", "涔�" }; static String numeric2Chinese(String s) { String res = ""; for (int k = -1; s.length() > 0; k++) { - // 解析最后一位 + // 瑙f瀽鏈�鍚庝竴浣� int j = Integer.parseInt(s.substring(s.length() - 1, s.length())); String rtemp = numeric[j]; - // 数值不是0且不是个位 或者是万位或者是亿位 则去取单位 + // 鏁板�间笉鏄�0涓斾笉鏄釜浣� 鎴栬�呮槸涓囦綅鎴栬�呮槸浜夸綅 鍒欏幓鍙栧崟浣� if (j != 0 && k != -1 || k % 8 == 3 || k % 8 == 7) { rtemp += units[k % 8]; } - // 拼在之前的前面 + // 鎷煎湪涔嬪墠鐨勫墠闈� res = rtemp + res; - // 去除最后一位 + // 鍘婚櫎鏈�鍚庝竴浣� s = s.substring(0, s.length() - 1); } - // 去除后面连续的零零.. + // 鍘婚櫎鍚庨潰杩炵画鐨勯浂闆�.. while (res.endsWith(numeric[0])) { res = res.substring(0, res.lastIndexOf(numeric[0])); } - // 将零零替换成零 + // 灏嗛浂闆舵浛鎹㈡垚闆� while (res.indexOf(numeric[0] + numeric[0]) != -1) { res = res.replaceAll(numeric[0] + numeric[0], numeric[0]); } - // 将 零+某个单位 这样的窜替换成 该单位 去掉单位前面的零 + // 灏� 闆�+鏌愪釜鍗曚綅 杩欐牱鐨勭獪鏇挎崲鎴� 璇ュ崟浣� 鍘绘帀鍗曚綅鍓嶉潰鐨勯浂 for (int m = 1; m < units.length; m++) { res = res.replaceAll(numeric[0] + units[m], units[m]); } diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/PDSConstant.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/PDSConstant.java index 5de131451..f1638ecd7 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/PDSConstant.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/PDSConstant.java @@ -3,17 +3,17 @@ package com.fangjia.core.util; public class PDSConstant { public static final Double ZERO = 0.0; - public static final Double CITY_UNUSUAL_FACTOR = 0.4;//城市平稳度指数 - public static final Double REGION_UNUSUAL_FACTOR = 0.6;//区域平稳度指数 - public static final Double HOUSE_QUOTE_FACTOR = 0.4;//小区同类型挂牌房源量 - public static final Double HOUSE_SELL_FACTOR = 0.1;//小区成交量 - public static final Double SEE_TIME_FACTOR = 0.1;//房源带看数 - public static final Double AGENCY_COUNT_FACTOR = 0.3;//中介数 - public static final Double HOUSE_HOLD_FACTOR = 0.1;//户数 - public static final Double PRICE_STABILITY_FACTOR = 0.2;//价格异常指数 - public static final Double HANDLE_DEGREESCORE_FACTOR = 0.3;//处置难易度指数 - public static final Double PRICE_SCORE_FACTOR = 0.3;//价格指数 - public static final Double INCREASE_SCORE_FACTOR = 0.2;//年涨跌幅 + public static final Double CITY_UNUSUAL_FACTOR = 0.4;//鍩庡競骞崇ǔ搴︽寚鏁� + public static final Double REGION_UNUSUAL_FACTOR = 0.6;//鍖哄煙骞崇ǔ搴︽寚鏁� + public static final Double HOUSE_QUOTE_FACTOR = 0.4;//灏忓尯鍚岀被鍨嬫寕鐗屾埧婧愰噺 + public static final Double HOUSE_SELL_FACTOR = 0.1;//灏忓尯鎴愪氦閲� + public static final Double SEE_TIME_FACTOR = 0.1;//鎴挎簮甯︾湅鏁� + public static final Double AGENCY_COUNT_FACTOR = 0.3;//涓粙鏁� + public static final Double HOUSE_HOLD_FACTOR = 0.1;//鎴锋暟 + public static final Double PRICE_STABILITY_FACTOR = 0.2;//浠锋牸寮傚父鎸囨暟 + public static final Double HANDLE_DEGREESCORE_FACTOR = 0.3;//澶勭疆闅炬槗搴︽寚鏁� + public static final Double PRICE_SCORE_FACTOR = 0.3;//浠锋牸鎸囨暟 + public static final Double INCREASE_SCORE_FACTOR = 0.2;//骞存定璺屽箙 public static final Double MAX_COLLATERAL_RATE1 = 1.0;//90-100 public static final Double MAX_COLLATERAL_RATE2 = 0.97;//80-90 @@ -22,47 +22,47 @@ public class PDSConstant { public static final Double MAX_COLLATERAL_RATE5 = 0.8;//50-60 public static final Double MAX_COLLATERAL_RATE6 = 0.0;//40-50 - public static final Double CONSUME_FACTOR = 0.6;//消费 - public static final Double MANAGE_FACTOR = 0.7;//经营 - public static final String NO_DATA_MSG = "未知"; + public static final Double CONSUME_FACTOR = 0.6;//娑堣垂 + public static final Double MANAGE_FACTOR = 0.7;//缁忚惀 + public static final String NO_DATA_MSG = "鏈煡"; - //pds1.3相关默认参数 + //pds1.3鐩稿叧榛樿鍙傛暟 public static final Double ABSD_LINE = -1.3d;// public static final Double ABSC_LINE = 1d;// - public static final Double AGENCY_MAX = 90d;//中介最大数 - public static final Double AGENCY_MIN = 0d;//中介最小值 - public static final Double AGENCY_SCALE = 0.2d;//中介得分比例 + public static final Double AGENCY_MAX = 90d;//涓粙鏈�澶ф暟 + public static final Double AGENCY_MIN = 0d;//涓粙鏈�灏忓�� + public static final Double AGENCY_SCALE = 0.2d;//涓粙寰楀垎姣斾緥 - public static final Double TOTALPRICE_SCOREA = 270d;//总价A值 - public static final Double TOTALPRICE_SCOREB = 18d;//总价B值 - public static final Double TOTALPRICE_SCOREE = 54d;//总价E值 - public static final Double TOTALPRICE_SCOREF = 72d;//总价F值 - public static final Double TOTALPRICE_SCALE = 0.2d;//房屋总价权重 + public static final Double TOTALPRICE_SCOREA = 270d;//鎬讳环A鍊� + public static final Double TOTALPRICE_SCOREB = 18d;//鎬讳环B鍊� + public static final Double TOTALPRICE_SCOREE = 54d;//鎬讳环E鍊� + public static final Double TOTALPRICE_SCOREF = 72d;//鎬讳环F鍊� + public static final Double TOTALPRICE_SCALE = 0.2d;//鎴垮眿鎬讳环鏉冮噸 - public static final Double QUOTE_SCALE = 0.3d;//发布量权重 - public static final Double QUOTE_MAX = 900d;//发布量max值 - public static final Double QUOTE_MIN = 0d;//发布量min值 + public static final Double QUOTE_SCALE = 0.3d;//鍙戝竷閲忔潈閲� + public static final Double QUOTE_MAX = 900d;//鍙戝竷閲弇ax鍊� + public static final Double QUOTE_MIN = 0d;//鍙戝竷閲弇in鍊� - public static final Double TRAFFIC_SCALE = 0.2d;//交通权重 - public static final Double BUS_SCALE = 0.6d;//公交权重 - public static final Double METRO_SCALE = 0.4d;//地铁权重 - public static final Double BUS_MAX = 48d;//公交数量max值 - public static final Double BUS_MIN = 0d;//公交数量min值 - public static final Double METRO_MAX = 5d;//地铁数量max值 - public static final Double METRO_MIN = 0d;//地铁数量min值 + public static final Double TRAFFIC_SCALE = 0.2d;//浜ら�氭潈閲� + public static final Double BUS_SCALE = 0.6d;//鍏氦鏉冮噸 + public static final Double METRO_SCALE = 0.4d;//鍦伴搧鏉冮噸 + public static final Double BUS_MAX = 48d;//鍏氦鏁伴噺max鍊� + public static final Double BUS_MIN = 0d;//鍏氦鏁伴噺min鍊� + public static final Double METRO_MAX = 5d;//鍦伴搧鏁伴噺max鍊� + public static final Double METRO_MIN = 0d;//鍦伴搧鏁伴噺min鍊� - public static final Double DENSITY_SCALE = 0.1d;//小区密度权重 - public static final Double DENSITY_MAX = 400d;//小区密度max值 - public static final Double DENSITY_MIN = 10d;//小区密度min值 - public static final Double DENSITY_RADIUS = 1.0d;//小区密度取值半径范围 - public static final Double QUOTE_A = 850d;//发布量A值 + public static final Double DENSITY_SCALE = 0.1d;//灏忓尯瀵嗗害鏉冮噸 + public static final Double DENSITY_MAX = 400d;//灏忓尯瀵嗗害max鍊� + public static final Double DENSITY_MIN = 10d;//灏忓尯瀵嗗害min鍊� + public static final Double DENSITY_RADIUS = 1.0d;//灏忓尯瀵嗗害鍙栧�煎崐寰勮寖鍥� + public static final Double QUOTE_A = 850d;//鍙戝竷閲廇鍊� public static final Double QUOTE_B = 200d;// - public static final Double PRICE_STABILITY_SCALE = 0.2d;//价格异常指数权重 + public static final Double PRICE_STABILITY_SCALE = 0.2d;//浠锋牸寮傚父鎸囨暟鏉冮噸 - public static final Double HANDLE_STABILITY_SCALE = 0.8d;//押品处置风险权重 + public static final Double HANDLE_STABILITY_SCALE = 0.8d;//鎶煎搧澶勭疆椋庨櫓鏉冮噸 diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/PageBean.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/PageBean.java index acea0a067..8bf1c5936 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/PageBean.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/PageBean.java @@ -4,23 +4,23 @@ import java.util.Collections; import java.util.List; /** - * 分页查询值对象 + * 鍒嗛〉鏌ヨ鍊煎璞� * @author yinjihuan - * @param 返回数据类型 + * @param 杩斿洖鏁版嵁绫诲瀷 */ public class PageBean { - private int start;//起始记录数 + private int start;//璧峰璁板綍鏁� - private int limit;//最大记录数 + private int limit;//鏈�澶ц褰曟暟 - private long totalRecords;//总记录数 + private long totalRecords;//鎬昏褰曟暟 - private int currentPage;//当前页 + private int currentPage;//褰撳墠椤� - private int totalPages;//总页数 + private int totalPages;//鎬婚〉鏁� - private List list;//查询数据对象 + private List list;//鏌ヨ鏁版嵁瀵硅薄 public static int page2Start(int page, int limit){ return page * limit - limit; diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/PriceData.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/PriceData.java index 591bc73bb..7c3d7e4f8 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/PriceData.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/PriceData.java @@ -10,7 +10,7 @@ import java.util.Random; public class PriceData { private String yearmonth; private Double price; - private Double volume; // 新增成交量字段 + private Double volume; // 鏂板鎴愪氦閲忓瓧娈� public PriceData() {} diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/RandomUtil.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/RandomUtil.java index 234c29d79..e1256a01a 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/RandomUtil.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/RandomUtil.java @@ -4,7 +4,7 @@ import org.apache.commons.lang.math.RandomUtils; public final class RandomUtil extends RandomUtils { /** - * 随机得到两个Long类型数字间任意数字 + * 闅忔満寰楀埌涓や釜Long绫诲瀷鏁板瓧闂翠换鎰忔暟瀛� * * @param l1 * @param l2 @@ -17,7 +17,7 @@ public final class RandomUtil extends RandomUtils { } /** - * 随机得到两个Long类型数字间任意数字 + * 闅忔満寰楀埌涓や釜Long绫诲瀷鏁板瓧闂翠换鎰忔暟瀛� * * @param i1 * @param i2 diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/SeaweedUtils.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/SeaweedUtils.java index 698833bd5..010bdfe3a 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/SeaweedUtils.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/SeaweedUtils.java @@ -13,10 +13,10 @@ public class SeaweedUtils { System.out.println(formatVirescencePercent("1")); } /** - * 标准化输出绿化率 + * 鏍囧噯鍖栬緭鍑虹豢鍖栫巼 */ public static String formatVirescencePercent(String virescence_percent) { - // 绿化率 + // 缁垮寲鐜� if (StringUtils.isNotBlank(virescence_percent) && checkValue(virescence_percent)!=null) { double val = Double.valueOf(virescence_percent); if (val < 1) { @@ -34,7 +34,7 @@ public class SeaweedUtils { } /** - * 标准化容积率输出 + * 鏍囧噯鍖栧绉巼杈撳嚭 */ public static String formatCubagePercent(String cubage_percent) { if (StringUtils.isNotBlank(cubage_percent) && checkValue(cubage_percent)!=null) { @@ -57,7 +57,7 @@ public class SeaweedUtils { } /** - * 标准化车位输出 + * 鏍囧噯鍖栬溅浣嶈緭鍑� */ public static String formatCarSiteCount(String car_site_count) { if (StringUtils.isNotBlank(car_site_count) && checkValue(car_site_count)!=null) { @@ -71,12 +71,12 @@ public class SeaweedUtils { } /** - * 标准化户数输出 + * 鏍囧噯鍖栨埛鏁拌緭鍑� */ public static String formatHouseholdCount(String household_count) { if (StringUtils.isNotBlank(household_count) && checkValue(household_count)!=null ) { if (Integer.valueOf(household_count) < 50) { - return null; // 户数 + return null; // 鎴锋暟 } return household_count; } @@ -84,14 +84,14 @@ public class SeaweedUtils { } /** - * 标准化总占地面积输出 + * 鏍囧噯鍖栨�诲崰鍦伴潰绉緭鍑� */ public static String formatAllArea(String all_area) { if (StringUtils.isNotBlank(all_area)) { Double formattedVal = 0.0; - if (all_area.toString().indexOf("公顷") != -1) { + if (all_area.toString().indexOf("鍏》") != -1) { String val = all_area.toString(); - formattedVal = (Double.valueOf(val.substring(0, val.indexOf("公顷"))) * 10000); + formattedVal = (Double.valueOf(val.substring(0, val.indexOf("鍏》"))) * 10000); } else if(checkValue(all_area)!=null) { formattedVal = Double.valueOf(all_area); } @@ -104,7 +104,7 @@ public class SeaweedUtils { } /** - * 提取浮点数与整数 + * 鎻愬彇娴偣鏁颁笌鏁存暟 */ static String getNumber(String input) { Pattern pattern = Pattern.compile("\\d+(\\.\\d+)?"); @@ -168,7 +168,7 @@ public class SeaweedUtils { } /** - * 正则表达式去掉多余的.与0 + * 姝e垯琛ㄨ揪寮忓幓鎺夊浣欑殑.涓�0 * @param * @return */ diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/SecurityUtil.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/SecurityUtil.java index 6a6218b87..e934ba04d 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/SecurityUtil.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/SecurityUtil.java @@ -20,7 +20,7 @@ public class SecurityUtil { Security.addProvider(new com.sun.crypto.provider.SunJCE()); } - private static String Algorithm = "DES"; // 定义 加密算法,可用 DES,DESede,Blowfish + private static String Algorithm = "DES"; // 瀹氫箟 鍔犲瘑绠楁硶,鍙敤 DES,DESede,Blowfish private static String PK = "525E9DC4D0382C4C"; private static byte[] PK_BYTES = DataUtil.hex2byte(PK); private static final Pattern TOKEN_PATTERN = Pattern.compile("[A-Fa-f0-9]+"); @@ -30,7 +30,7 @@ public class SecurityUtil { } /** - * 加密 + * 鍔犲瘑 * * @throws NoSuchPaddingException * @throws NoSuchAlgorithmException @@ -44,7 +44,7 @@ public class SecurityUtil { } /** - * 解密 + * 瑙e瘑 */ public static byte[] decode(byte[] input, byte[] key) throws Exception { SecretKey deskey = new javax.crypto.spec.SecretKeySpec(key, Algorithm); @@ -55,7 +55,7 @@ public class SecurityUtil { } /** - * 生成密钥, 注意此步骤时间比较长 + * 鐢熸垚瀵嗛挜, 娉ㄦ剰姝ゆ楠ゆ椂闂存瘮杈冮暱 */ public static byte[] getKey() throws Exception { KeyGenerator keygen = KeyGenerator.getInstance(Algorithm); @@ -64,7 +64,7 @@ public class SecurityUtil { } /** - * 对输入字符串进行加密 + * 瀵硅緭鍏ュ瓧绗︿覆杩涜鍔犲瘑 * * @param s * @return @@ -88,7 +88,7 @@ public class SecurityUtil { } /** - * 对输入的加密参数进行解密 + * 瀵硅緭鍏ョ殑鍔犲瘑鍙傛暟杩涜瑙e瘑 * * @param s * @return @@ -108,7 +108,7 @@ public class SecurityUtil { } /** - * 根据tokenString得到实际的值 + * 鏍规嵁tokenString寰楀埌瀹為檯鐨勫�� * * @param tokenString * @return @@ -125,7 +125,7 @@ public class SecurityUtil { } /** - * 得到随机的数值 + * 寰楀埌闅忔満鐨勬暟鍊� * * @return */ @@ -144,7 +144,7 @@ public class SecurityUtil { } /** - * 是否是有效的验证码 + * 鏄惁鏄湁鏁堢殑楠岃瘉鐮� * * @param tokenString * @param sand diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/SourceNameUtil.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/SourceNameUtil.java index e1011b321..382e74350 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/SourceNameUtil.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/SourceNameUtil.java @@ -14,7465 +14,7465 @@ private static final Map SOURCE_MAP = new HashMap( } private static void setMap1() { - SOURCE_MAP.put("tjzf.com", "天津租房网"); - SOURCE_MAP.put("jiwu.com", "吉屋网"); - SOURCE_MAP.put("eeju.com", "易居网"); - SOURCE_MAP.put("scol.com.cn", "四川在线"); - SOURCE_MAP.put("funi.com", "房联"); - SOURCE_MAP.put("goufang.com", "购房网"); - SOURCE_MAP.put("fangdi.com.cn", "网上房地产"); - SOURCE_MAP.put("chengdufc.com", "成都房产网"); - SOURCE_MAP.put("ijj.cn", "爱家家房产网"); - SOURCE_MAP.put("house100.cn", "成都好房网"); - SOURCE_MAP.put("xkhouse.com", "星空地产网"); - SOURCE_MAP.put("fc198.com", "房资网"); - SOURCE_MAP.put("ecen.com.cn", "伊城地产"); - SOURCE_MAP.put("sh.cn", "上海热线"); - SOURCE_MAP.put("ehomeday.com", "房之窗"); - SOURCE_MAP.put("fczm.com", "房产之门"); - SOURCE_MAP.put("bjhouse.com", "百家房网"); - SOURCE_MAP.put("fangchanwang.com", "房产网"); - SOURCE_MAP.put("bjfang.com", "天朗房网"); - SOURCE_MAP.put("o.cn", "都市圈房产"); - SOURCE_MAP.put("iefang.com", "爱易房"); - SOURCE_MAP.put("liaoing.com", "聊宅网"); - SOURCE_MAP.put("njhouse.com.cn", "南京网上房地产"); - SOURCE_MAP.put("hzfc.gov.cn", "杭州房管局"); - SOURCE_MAP.put("xbsyw.com", "西部商业网"); - SOURCE_MAP.put("lejiazhiye.cn", "乐家房产网"); - SOURCE_MAP.put("fangle.com", "房乐网"); - SOURCE_MAP.put("365jia.cn", "万家热线"); - SOURCE_MAP.put("taofw.cn", "淘房屋"); - SOURCE_MAP.put("funxoo.com", "房秀网"); - SOURCE_MAP.put("jlsp.com", "四平信息港"); - SOURCE_MAP.put("spgdfc.com", "四平房产网spgdfc"); - SOURCE_MAP.put("0953fc.com", "吴忠房产网"); - SOURCE_MAP.put("cnchu.com", "楚网"); - SOURCE_MAP.put("5khouse.com", "看房网_C"); - SOURCE_MAP.put("to8to.com", "土巴兔"); - SOURCE_MAP.put("gy-fdc.com", "广元房管处"); - SOURCE_MAP.put("gxwuzhou.com", "鸳江生活网"); - SOURCE_MAP.put("jhanju.com", "江淮安居网"); - SOURCE_MAP.put("hh.cn", "中国红河"); - SOURCE_MAP.put("dingxi.gov.cn", "定西市住房和城乡建设局"); - SOURCE_MAP.put("xian-house.com", "西安房产秘书网"); - SOURCE_MAP.put("0744fdc.com", "张家界房地产信息网"); - SOURCE_MAP.put("jmfcj.com.cn", "江门住房建设局"); - SOURCE_MAP.put("dongbeifdc.com", "哈尔滨房地产网dongbeifdc"); - SOURCE_MAP.put("0745f.com", "房地产信息网"); - SOURCE_MAP.put("e0745.com", "怀化房产网e0745"); - SOURCE_MAP.put("huaif.cn", "怀化房产网huaif"); - SOURCE_MAP.put("zhendafang.com", "振达房产"); - SOURCE_MAP.put("dalihouse.org", "大理房产信息网"); - SOURCE_MAP.put("0471vip.com", "呼和浩特在线"); - SOURCE_MAP.put("glfcj.gov.cn", "桂林房管局"); - SOURCE_MAP.put("100gf.com", "100购房网"); - SOURCE_MAP.put("9maifang.cn", "玖麦房产网"); - SOURCE_MAP.put("enshi.cn", "恩施新闻网房产频道"); - SOURCE_MAP.put("jhfc.gov.cn", "金华市房产交易管理网"); - SOURCE_MAP.put("allfang.com", "全房"); - SOURCE_MAP.put("laipaiya.com", "来拍呀"); - SOURCE_MAP.put("huzfbz.com", "湖州住房保障网"); - SOURCE_MAP.put("sxhouse.com.cn", "绍兴房产官方门户"); - SOURCE_MAP.put("tjhousing.com", "天津住宅集团"); - SOURCE_MAP.put("ksgfw.com", "昆山购房网"); - SOURCE_MAP.put("jiulongw.cn", "九龙网"); - SOURCE_MAP.put("tczjw.gov.cn", "铜川住建网"); - SOURCE_MAP.put("wffangchan.com.cn", "潍坊网上房产"); - SOURCE_MAP.put("rafg.com.cn", "瑞安住房管理局"); - SOURCE_MAP.put("cxsfdcglzx.com", "慈溪房产管理中心"); - SOURCE_MAP.put("nhfg.cn", "宁海房产网"); - SOURCE_MAP.put("fhfcw.org", "奉化房产信息网"); - SOURCE_MAP.put("yyfdc.com.cn", "余姚房产信息网"); - SOURCE_MAP.put("wlfc.gov.cn", "温岭透明售房网"); - SOURCE_MAP.put("yxhouse.net", "宜兴房产网"); - SOURCE_MAP.put("yiwufg.com", "义乌房产信息网"); - SOURCE_MAP.put("jzfdc.gov.cn", "焦作房产管理中心"); - SOURCE_MAP.put("fang580.com", "好房网_fang580"); - SOURCE_MAP.put("shenchuang.com", "深圳之窗"); - SOURCE_MAP.put("szfdc.net.cn", "深圳房产网_szfdc"); - SOURCE_MAP.put("179179.cn", "一起购房网"); - SOURCE_MAP.put("fzg360.com", "房掌柜"); - SOURCE_MAP.put("ckj345.com", "超可居"); - SOURCE_MAP.put("enorth.com.cn", "北方网"); - SOURCE_MAP.put("tjzz.com.cn", "天津住宅网"); - SOURCE_MAP.put("dingcity.com", "第N城"); - SOURCE_MAP.put("chengw.com", "橙网"); - SOURCE_MAP.put("fdc.com.cn", "亿房网"); - SOURCE_MAP.put("023cqfc.com", "重庆房产"); - SOURCE_MAP.put("jinlingke.com", "金陵客"); - SOURCE_MAP.put("ifoboo.com", "易房宝"); - SOURCE_MAP.put("szfcw.com.cn", "苏州房产网"); - SOURCE_MAP.put("ksls.com.cn", "昆山楼上网"); - SOURCE_MAP.put("kunfun.com", "昆房网"); - SOURCE_MAP.put("ks-lxjy.com", "理想家园"); - SOURCE_MAP.put("di1fang.com", "昆山第一房产"); - SOURCE_MAP.put("kunshan0512.com", "昆山诺亚地产网"); - SOURCE_MAP.put("ksfdc.com.cn", "昆山房产网_ksfdc"); - SOURCE_MAP.put("ksgfw.com", "昆山购房网"); - SOURCE_MAP.put("100ks.cn", "百分百房产"); - SOURCE_MAP.put("wst.cn", "二泉房产"); - SOURCE_MAP.put("wxfcw.com", "无锡房产网_wxfcw"); - SOURCE_MAP.put("cnnb.com.cn", "宁波地产网"); - SOURCE_MAP.put("nbnt.com.cn", "南天房产"); - SOURCE_MAP.put("nb19.com", "宁波租房网"); - SOURCE_MAP.put("nblide.com", "21世纪不动产_nblide"); - SOURCE_MAP.put("hfhouse.com", "合肥房地产交易网"); - SOURCE_MAP.put("jidahouse.com", "吉大房产"); - SOURCE_MAP.put("cnhubei.com", "荆楚网"); - SOURCE_MAP.put("tengfang.net", "腾房网"); - SOURCE_MAP.put("tiboo.cn", "地宝网"); - SOURCE_MAP.put("nc118.com", "南昌118搜房网"); - SOURCE_MAP.put("0791esf.com", "0791二手房"); - SOURCE_MAP.put("rednet.cn", "红网"); - SOURCE_MAP.put("fangyuan365.com", "365房产网"); - SOURCE_MAP.put("zyloushi.com", "中原楼市网"); - SOURCE_MAP.put("henanfdc.com", "河南房产网"); - SOURCE_MAP.put("house371.com", "郑州房产网_house371"); - SOURCE_MAP.put("360fc.com.cn", "360房产"); - SOURCE_MAP.put("ejo.cc", "易就房产网"); - SOURCE_MAP.put("fdc0451.com", "哈尔滨房地产网"); - SOURCE_MAP.put("0451zf.com", "哈市在线"); - SOURCE_MAP.put("55555558.com", "骄阳地产"); - SOURCE_MAP.put("0768w.com", "潮州在线"); - SOURCE_MAP.put("dadalian.net", "大连房源网"); - SOURCE_MAP.put("zhudalian.com", "住大连"); - SOURCE_MAP.put("dl.cc", "大连房产网"); - SOURCE_MAP.put("runsky.com", "天健房产"); - SOURCE_MAP.put("dllp.cn", "精品楼盘网"); - SOURCE_MAP.put("maifun.com", "买房网"); - SOURCE_MAP.put("dswtv.com", "动视网"); - SOURCE_MAP.put("fc0531.com", "济房网"); - SOURCE_MAP.put("jnfcw.org", "济南房产网_jnfcw"); - SOURCE_MAP.put("fangxiaoer.com", "房小二"); - SOURCE_MAP.put("liaofang.com", "聊房网"); - SOURCE_MAP.put("024zf.com", "沈阳租房网"); - SOURCE_MAP.put("xwh.cn", "新文化网"); - SOURCE_MAP.put("gz162.com", "贵州房产在线"); - SOURCE_MAP.put("wlfce.com", "温岭房产网"); - SOURCE_MAP.put("wlfdcw.com", "温岭房地产网"); - SOURCE_MAP.put("wlfcw.com", "温岭房产信息网"); - SOURCE_MAP.put("wlfcw.cn", "温岭房地产网_wlfcw"); - SOURCE_MAP.put("wenlinghouse.com", "温岭房子"); - SOURCE_MAP.put("zc173.com", "增城家园"); - SOURCE_MAP.put("8e8e8.cn", "增城房产网"); - SOURCE_MAP.put("zcfk.cn", "增城房客网"); - SOURCE_MAP.put("yaxf0911.com", "延安房产信息网"); - SOURCE_MAP.put("fhfce.com", "奉化房产网"); - SOURCE_MAP.put("967890.com", "奉化房产交易网"); - SOURCE_MAP.put("bbsfh.net", "奉化房产网_bbsfh"); - SOURCE_MAP.put("http://www.house-yt.com/", "烟台房产在线"); - SOURCE_MAP.put("hiao.com", "烟台好网"); - SOURCE_MAP.put("ytfdcw.net", "烟台房地产_ytfdcw"); - SOURCE_MAP.put("yantailoupan.com", "烟台楼盘网"); - SOURCE_MAP.put("yantaihouse.net", "烟台房产热线"); - SOURCE_MAP.put("0991fc.com", "乌鲁木齐房产网"); - SOURCE_MAP.put("wlmqfcw.com", "乌鲁木齐房产"); - SOURCE_MAP.put("c21wlmq.com.cn", "21世纪不动产"); - SOURCE_MAP.put("house12315.com", "福建房地产联合网"); - SOURCE_MAP.put("fzfc.com.cn", "福州房产网"); - SOURCE_MAP.put("99fj.com", "点房网"); - SOURCE_MAP.put("sjjtx.com", "家天下房产"); - SOURCE_MAP.put("timedg.com", "东莞时间网"); - SOURCE_MAP.put("dgmfw.com", "莞民网"); - SOURCE_MAP.put("e0757.cn", "佛山房产网"); - SOURCE_MAP.put("fs.cc", "佛山房产网_fs"); - SOURCE_MAP.put("0757.cn", "佛山信息港"); - SOURCE_MAP.put("esouwu.com", "易搜屋"); - SOURCE_MAP.put("114haihui.com", "海汇房产"); - SOURCE_MAP.put("xianhouse.com", "西安市房地产超市"); - SOURCE_MAP.put("ejiacn.com", "E家网"); - SOURCE_MAP.put("kunmingfdc.com", "昆明房地产网"); - SOURCE_MAP.put("kmhouses.com", "昆明房地产信息网"); - SOURCE_MAP.put("kunming.cn", "昆明信息港"); - SOURCE_MAP.put("km185.com", "昆明房网"); - SOURCE_MAP.put("kmfw.com.cn", "昆明房网_kmfw.com"); - SOURCE_MAP.put("qzfb.net", "泉州房吧"); - SOURCE_MAP.put("qzef.com", "泉州E房网"); - SOURCE_MAP.put("ejfc.cn", "易嘉房产"); - SOURCE_MAP.put("wanzid.com", "泉州望安置地"); - SOURCE_MAP.put("qzpp.com", "泉州房产交易网"); - SOURCE_MAP.put("csjju.com", "城市佳居"); - SOURCE_MAP.put("mxun.com", "麦讯网"); - SOURCE_MAP.put("fangnmg.com", "内蒙古房地产信息网"); - SOURCE_MAP.put("nhsky.com", "宁海房产热线"); - SOURCE_MAP.put("nhfdcw.com", "宁海房地产网"); - SOURCE_MAP.put("nhfcrx.com", "宁海房产热线_nhfcrx"); - SOURCE_MAP.put("nhnews.com.cn", "宁海房市"); - SOURCE_MAP.put("0858f.com", "六盘水房产网_0858f"); - SOURCE_MAP.put("sg169.com", "韶关房产网"); - SOURCE_MAP.put("shangdu.com", "焦作信息港"); - SOURCE_MAP.put("wzfcw.net", "温州房产网_wzfcw"); - SOURCE_MAP.put("zj.cn", "温州热线"); - SOURCE_MAP.put("0577dc.com", "温州楼市"); - SOURCE_MAP.put("cnwzfc.com", "温州房产网_cnwzfc"); - SOURCE_MAP.put("wbyj.com.cn", "晚报易家"); - SOURCE_MAP.put("fc577.com", "温州购房网"); - SOURCE_MAP.put("wzzf.cn", "温州租房网"); - SOURCE_MAP.put("teambuy.com.cn", "中团网"); - SOURCE_MAP.put("sky008.com", "天空房产网"); - SOURCE_MAP.put("axfc.cn", "爱心房产"); - SOURCE_MAP.put("xz21th.com", "徐州房产网"); - SOURCE_MAP.put("xzfc.net", "516房产"); - SOURCE_MAP.put("xscfc.com", "新视窗房产"); - SOURCE_MAP.put("jilinfc.com", "房产之家"); - SOURCE_MAP.put("jlfdc.net", "吉林房产网"); - SOURCE_MAP.put("jlmaifang.com", "吉林买房"); - SOURCE_MAP.put("jldsw.com", "吉林市房产网"); - SOURCE_MAP.put("shjnet.cn", "松花江网"); - SOURCE_MAP.put("jl.cn", "吉林市信息港"); - SOURCE_MAP.put("xnfcsc.com", "西宁房产网"); - SOURCE_MAP.put("2zf.cn", "爱租房"); - SOURCE_MAP.put("0951house.com", "银川房产网"); - SOURCE_MAP.put("nxsq.com", "宁夏仕奇房产网"); - SOURCE_MAP.put("ycxpy.com", "麦吉屋"); - SOURCE_MAP.put("czsfdcw.com", "常州市房地产网"); - SOURCE_MAP.put("czzf.com", "常州住房"); - SOURCE_MAP.put("dzfdc.com", "万邻房产网"); - SOURCE_MAP.put("yexiangwang.com", "新房源网"); - SOURCE_MAP.put("hainan3.com", "海南房产网"); - SOURCE_MAP.put("wanziqianhong.cn", "万紫千红房产"); - SOURCE_MAP.put("hainan.net", "海南在线"); - SOURCE_MAP.put("0898fcw.cn", "海南房产网_0898fcw"); - SOURCE_MAP.put("weifangloushi.com", "潍坊楼市"); - SOURCE_MAP.put("wfhouse.com", "潍坊房地产网"); - SOURCE_MAP.put("0536home.com", "潍坊房产网"); - SOURCE_MAP.put("lyhome.com", "洛阳房产网_lyhome"); - SOURCE_MAP.put("lyw.cc", "洛阳城"); - SOURCE_MAP.put("0379fcw.com", "洛阳房产_0379fcw"); - SOURCE_MAP.put("luoyangfdc.com", "洛阳房产网"); - SOURCE_MAP.put("lyhcfc.com", "海川房产"); - SOURCE_MAP.put("shangdu.com", "洛阳信息港"); - SOURCE_MAP.put("379fcw.com", "379房产网"); - SOURCE_MAP.put("zbhouse.com.cn", "淄博房产在线"); - SOURCE_MAP.put("hellozb.com", "淄房网"); - SOURCE_MAP.put("ziboloushi.com", "淄博楼市"); - SOURCE_MAP.put("zbinfo.net", "淄博信息港"); - SOURCE_MAP.put("sxfcw.org", "绍兴房产网_sxfcw"); - SOURCE_MAP.put("0575ls.cn", "绍兴楼市"); - SOURCE_MAP.put("officezz.com", "郑州写字楼网"); - SOURCE_MAP.put("bleju.com", "百乐居"); - SOURCE_MAP.put("shangdu.com", "商都网"); - SOURCE_MAP.put("douanju.com", "都安居"); - SOURCE_MAP.put("371fang.cn", "郑房网"); - SOURCE_MAP.put("5wee.com", "五维"); - SOURCE_MAP.put("wwxxg.com", "武威信息港"); - SOURCE_MAP.put("0437.com", "辽源信息港"); - SOURCE_MAP.put("inlishui.com", "居家中国"); - SOURCE_MAP.put("fangbx.com", "房宝箱"); - SOURCE_MAP.put("521qz.com", "钦民网"); - SOURCE_MAP.put("zailinyi.com", "在临沂"); - SOURCE_MAP.put("tlfc.cn", "通辽房产网"); - SOURCE_MAP.put("0435.com", "通化在线"); - SOURCE_MAP.put("0543.com", "0543滨州网"); - SOURCE_MAP.put("0314fdc.com", "承房网"); - SOURCE_MAP.put("hjfcs.cn", "海景房超市"); - SOURCE_MAP.put("bqqm.com", "便民网"); - SOURCE_MAP.put("seezy.com", "遵义房产网"); - SOURCE_MAP.put("huaian.com", "淮安房产网"); - SOURCE_MAP.put("huainet.com", "淮网房产"); - SOURCE_MAP.put("zufang.com", "租房网"); - SOURCE_MAP.put("ezfcw.cn", "鄂州房产网"); - SOURCE_MAP.put("0318ol.com", "衡水在线"); - SOURCE_MAP.put("zzfcw.com.cn", "枣房网"); - SOURCE_MAP.put("xc0561.com", "相城房产网"); - SOURCE_MAP.put("hbloushi.com", "鹤壁楼市"); - SOURCE_MAP.put("f537.com", "济宁房房网"); - SOURCE_MAP.put("fangguagua.com", "房呱呱"); - SOURCE_MAP.put("jnfcw.com.cn", "济房网jnfcw"); - SOURCE_MAP.put("dzwww.com", "大众网"); - SOURCE_MAP.put("66house.com", "房联网"); - SOURCE_MAP.put("0701.com", "鹰潭房产网"); - SOURCE_MAP.put("hgfc.cc", "黄冈房产网"); - SOURCE_MAP.put("163.com", "网易房产"); - SOURCE_MAP.put("qq.com", "腾讯房产"); - SOURCE_MAP.put("haowangpu.com", "好旺铺"); - SOURCE_MAP.put("fhfce.com", "奉化房产网"); - SOURCE_MAP.put("900fc.com", "温州房产网_900fc"); - SOURCE_MAP.put("jlmaifang.com", "吉林买房"); - SOURCE_MAP.put("0971fc.com", "西房网"); - SOURCE_MAP.put("yexiangwang.com", "新房源网"); - SOURCE_MAP.put("1188fc.com", "海南房产专线"); - SOURCE_MAP.put("hainan3.com", "海南房产网"); - SOURCE_MAP.put("zbhouse.cn", "淄博房产网"); - SOURCE_MAP.put("ziboloushi.com", "淄博楼市"); - SOURCE_MAP.put("seezy.com", "遵义房产网"); - SOURCE_MAP.put("ilinyi.net", "爱临沂"); + SOURCE_MAP.put("tjzf.com", "澶╂触绉熸埧缃�"); + SOURCE_MAP.put("jiwu.com", "鍚夊眿缃�"); + SOURCE_MAP.put("eeju.com", "鏄撳眳缃�"); + SOURCE_MAP.put("scol.com.cn", "鍥涘窛鍦ㄧ嚎"); + SOURCE_MAP.put("funi.com", "鎴胯仈"); + SOURCE_MAP.put("goufang.com", "璐埧缃�"); + SOURCE_MAP.put("fangdi.com.cn", "缃戜笂鎴垮湴浜�"); + SOURCE_MAP.put("chengdufc.com", "鎴愰兘鎴夸骇缃�"); + SOURCE_MAP.put("ijj.cn", "鐖卞瀹舵埧浜х綉"); + SOURCE_MAP.put("house100.cn", "鎴愰兘濂芥埧缃�"); + SOURCE_MAP.put("xkhouse.com", "鏄熺┖鍦颁骇缃�"); + SOURCE_MAP.put("fc198.com", "鎴胯祫缃�"); + SOURCE_MAP.put("ecen.com.cn", "浼婂煄鍦颁骇"); + SOURCE_MAP.put("sh.cn", "涓婃捣鐑嚎"); + SOURCE_MAP.put("ehomeday.com", "鎴夸箣绐�"); + SOURCE_MAP.put("fczm.com", "鎴夸骇涔嬮棬"); + SOURCE_MAP.put("bjhouse.com", "鐧惧鎴跨綉"); + SOURCE_MAP.put("fangchanwang.com", "鎴夸骇缃�"); + SOURCE_MAP.put("bjfang.com", "澶╂湕鎴跨綉"); + SOURCE_MAP.put("o.cn", "閮藉競鍦堟埧浜�"); + SOURCE_MAP.put("iefang.com", "鐖辨槗鎴�"); + SOURCE_MAP.put("liaoing.com", "鑱婂畢缃�"); + SOURCE_MAP.put("njhouse.com.cn", "鍗椾含缃戜笂鎴垮湴浜�"); + SOURCE_MAP.put("hzfc.gov.cn", "鏉窞鎴跨灞�"); + SOURCE_MAP.put("xbsyw.com", "瑗块儴鍟嗕笟缃�"); + SOURCE_MAP.put("lejiazhiye.cn", "涔愬鎴夸骇缃�"); + SOURCE_MAP.put("fangle.com", "鎴夸箰缃�"); + SOURCE_MAP.put("365jia.cn", "涓囧鐑嚎"); + SOURCE_MAP.put("taofw.cn", "娣樻埧灞�"); + SOURCE_MAP.put("funxoo.com", "鎴跨缃�"); + SOURCE_MAP.put("jlsp.com", "鍥涘钩淇℃伅娓�"); + SOURCE_MAP.put("spgdfc.com", "鍥涘钩鎴夸骇缃憇pgdfc"); + SOURCE_MAP.put("0953fc.com", "鍚村繝鎴夸骇缃�"); + SOURCE_MAP.put("cnchu.com", "妤氱綉"); + SOURCE_MAP.put("5khouse.com", "鐪嬫埧缃慱C"); + SOURCE_MAP.put("to8to.com", "鍦熷反鍏�"); + SOURCE_MAP.put("gy-fdc.com", "骞垮厓鎴跨澶�"); + SOURCE_MAP.put("gxwuzhou.com", "楦虫睙鐢熸椿缃�"); + SOURCE_MAP.put("jhanju.com", "姹熸樊瀹夊眳缃�"); + SOURCE_MAP.put("hh.cn", "涓浗绾㈡渤"); + SOURCE_MAP.put("dingxi.gov.cn", "瀹氳タ甯備綇鎴垮拰鍩庝埂寤鸿灞�"); + SOURCE_MAP.put("xian-house.com", "瑗垮畨鎴夸骇绉樹功缃�"); + SOURCE_MAP.put("0744fdc.com", "寮犲鐣屾埧鍦颁骇淇℃伅缃�"); + SOURCE_MAP.put("jmfcj.com.cn", "姹熼棬浣忔埧寤鸿灞�"); + SOURCE_MAP.put("dongbeifdc.com", "鍝堝皵婊ㄦ埧鍦颁骇缃慸ongbeifdc"); + SOURCE_MAP.put("0745f.com", "鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("e0745.com", "鎬�鍖栨埧浜х綉e0745"); + SOURCE_MAP.put("huaif.cn", "鎬�鍖栨埧浜х綉huaif"); + SOURCE_MAP.put("zhendafang.com", "鎸揪鎴夸骇"); + SOURCE_MAP.put("dalihouse.org", "澶х悊鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("0471vip.com", "鍛煎拰娴╃壒鍦ㄧ嚎"); + SOURCE_MAP.put("glfcj.gov.cn", "妗傛灄鎴跨灞�"); + SOURCE_MAP.put("100gf.com", "100璐埧缃�"); + SOURCE_MAP.put("9maifang.cn", "鐜栭害鎴夸骇缃�"); + SOURCE_MAP.put("enshi.cn", "鎭╂柦鏂伴椈缃戞埧浜ч閬�"); + SOURCE_MAP.put("jhfc.gov.cn", "閲戝崕甯傛埧浜т氦鏄撶鐞嗙綉"); + SOURCE_MAP.put("allfang.com", "鍏ㄦ埧"); + SOURCE_MAP.put("laipaiya.com", "鏉ユ媿鍛�"); + SOURCE_MAP.put("huzfbz.com", "婀栧窞浣忔埧淇濋殰缃�"); + SOURCE_MAP.put("sxhouse.com.cn", "缁嶅叴鎴夸骇瀹樻柟闂ㄦ埛"); + SOURCE_MAP.put("tjhousing.com", "澶╂触浣忓畢闆嗗洟"); + SOURCE_MAP.put("ksgfw.com", "鏄嗗北璐埧缃�"); + SOURCE_MAP.put("jiulongw.cn", "涔濋緳缃�"); + SOURCE_MAP.put("tczjw.gov.cn", "閾滃窛浣忓缓缃�"); + SOURCE_MAP.put("wffangchan.com.cn", "娼嶅潑缃戜笂鎴夸骇"); + SOURCE_MAP.put("rafg.com.cn", "鐟炲畨浣忔埧绠$悊灞�"); + SOURCE_MAP.put("cxsfdcglzx.com", "鎱堟邯鎴夸骇绠$悊涓績"); + SOURCE_MAP.put("nhfg.cn", "瀹佹捣鎴夸骇缃�"); + SOURCE_MAP.put("fhfcw.org", "濂夊寲鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("yyfdc.com.cn", "浣欏鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("wlfc.gov.cn", "娓╁箔閫忔槑鍞埧缃�"); + SOURCE_MAP.put("yxhouse.net", "瀹滃叴鎴夸骇缃�"); + SOURCE_MAP.put("yiwufg.com", "涔変箤鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("jzfdc.gov.cn", "鐒︿綔鎴夸骇绠$悊涓績"); + SOURCE_MAP.put("fang580.com", "濂芥埧缃慱fang580"); + SOURCE_MAP.put("shenchuang.com", "娣卞湷涔嬬獥"); + SOURCE_MAP.put("szfdc.net.cn", "娣卞湷鎴夸骇缃慱szfdc"); + SOURCE_MAP.put("179179.cn", "涓�璧疯喘鎴跨綉"); + SOURCE_MAP.put("fzg360.com", "鎴挎帉鏌�"); + SOURCE_MAP.put("ckj345.com", "瓒呭彲灞�"); + SOURCE_MAP.put("enorth.com.cn", "鍖楁柟缃�"); + SOURCE_MAP.put("tjzz.com.cn", "澶╂触浣忓畢缃�"); + SOURCE_MAP.put("dingcity.com", "绗琋鍩�"); + SOURCE_MAP.put("chengw.com", "姗欑綉"); + SOURCE_MAP.put("fdc.com.cn", "浜挎埧缃�"); + SOURCE_MAP.put("023cqfc.com", "閲嶅簡鎴夸骇"); + SOURCE_MAP.put("jinlingke.com", "閲戦櫟瀹�"); + SOURCE_MAP.put("ifoboo.com", "鏄撴埧瀹�"); + SOURCE_MAP.put("szfcw.com.cn", "鑻忓窞鎴夸骇缃�"); + SOURCE_MAP.put("ksls.com.cn", "鏄嗗北妤间笂缃�"); + SOURCE_MAP.put("kunfun.com", "鏄嗘埧缃�"); + SOURCE_MAP.put("ks-lxjy.com", "鐞嗘兂瀹跺洯"); + SOURCE_MAP.put("di1fang.com", "鏄嗗北绗竴鎴夸骇"); + SOURCE_MAP.put("kunshan0512.com", "鏄嗗北璇轰簹鍦颁骇缃�"); + SOURCE_MAP.put("ksfdc.com.cn", "鏄嗗北鎴夸骇缃慱ksfdc"); + SOURCE_MAP.put("ksgfw.com", "鏄嗗北璐埧缃�"); + SOURCE_MAP.put("100ks.cn", "鐧惧垎鐧炬埧浜�"); + SOURCE_MAP.put("wst.cn", "浜屾硥鎴夸骇"); + SOURCE_MAP.put("wxfcw.com", "鏃犻敗鎴夸骇缃慱wxfcw"); + SOURCE_MAP.put("cnnb.com.cn", "瀹佹尝鍦颁骇缃�"); + SOURCE_MAP.put("nbnt.com.cn", "鍗楀ぉ鎴夸骇"); + SOURCE_MAP.put("nb19.com", "瀹佹尝绉熸埧缃�"); + SOURCE_MAP.put("nblide.com", "21涓栫邯涓嶅姩浜nblide"); + SOURCE_MAP.put("hfhouse.com", "鍚堣偉鎴垮湴浜т氦鏄撶綉"); + SOURCE_MAP.put("jidahouse.com", "鍚夊ぇ鎴夸骇"); + SOURCE_MAP.put("cnhubei.com", "鑽嗘缃�"); + SOURCE_MAP.put("tengfang.net", "鑵炬埧缃�"); + SOURCE_MAP.put("tiboo.cn", "鍦板疂缃�"); + SOURCE_MAP.put("nc118.com", "鍗楁槍118鎼滄埧缃�"); + SOURCE_MAP.put("0791esf.com", "0791浜屾墜鎴�"); + SOURCE_MAP.put("rednet.cn", "绾㈢綉"); + SOURCE_MAP.put("fangyuan365.com", "365鎴夸骇缃�"); + SOURCE_MAP.put("zyloushi.com", "涓師妤煎競缃�"); + SOURCE_MAP.put("henanfdc.com", "娌冲崡鎴夸骇缃�"); + SOURCE_MAP.put("house371.com", "閮戝窞鎴夸骇缃慱house371"); + SOURCE_MAP.put("360fc.com.cn", "360鎴夸骇"); + SOURCE_MAP.put("ejo.cc", "鏄撳氨鎴夸骇缃�"); + SOURCE_MAP.put("fdc0451.com", "鍝堝皵婊ㄦ埧鍦颁骇缃�"); + SOURCE_MAP.put("0451zf.com", "鍝堝競鍦ㄧ嚎"); + SOURCE_MAP.put("55555558.com", "楠勯槼鍦颁骇"); + SOURCE_MAP.put("0768w.com", "娼窞鍦ㄧ嚎"); + SOURCE_MAP.put("dadalian.net", "澶ц繛鎴挎簮缃�"); + SOURCE_MAP.put("zhudalian.com", "浣忓ぇ杩�"); + SOURCE_MAP.put("dl.cc", "澶ц繛鎴夸骇缃�"); + SOURCE_MAP.put("runsky.com", "澶╁仴鎴夸骇"); + SOURCE_MAP.put("dllp.cn", "绮惧搧妤肩洏缃�"); + SOURCE_MAP.put("maifun.com", "涔版埧缃�"); + SOURCE_MAP.put("dswtv.com", "鍔ㄨ缃�"); + SOURCE_MAP.put("fc0531.com", "娴庢埧缃�"); + SOURCE_MAP.put("jnfcw.org", "娴庡崡鎴夸骇缃慱jnfcw"); + SOURCE_MAP.put("fangxiaoer.com", "鎴垮皬浜�"); + SOURCE_MAP.put("liaofang.com", "鑱婃埧缃�"); + SOURCE_MAP.put("024zf.com", "娌堥槼绉熸埧缃�"); + SOURCE_MAP.put("xwh.cn", "鏂版枃鍖栫綉"); + SOURCE_MAP.put("gz162.com", "璐靛窞鎴夸骇鍦ㄧ嚎"); + SOURCE_MAP.put("wlfce.com", "娓╁箔鎴夸骇缃�"); + SOURCE_MAP.put("wlfdcw.com", "娓╁箔鎴垮湴浜х綉"); + SOURCE_MAP.put("wlfcw.com", "娓╁箔鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("wlfcw.cn", "娓╁箔鎴垮湴浜х綉_wlfcw"); + SOURCE_MAP.put("wenlinghouse.com", "娓╁箔鎴垮瓙"); + SOURCE_MAP.put("zc173.com", "澧炲煄瀹跺洯"); + SOURCE_MAP.put("8e8e8.cn", "澧炲煄鎴夸骇缃�"); + SOURCE_MAP.put("zcfk.cn", "澧炲煄鎴垮缃�"); + SOURCE_MAP.put("yaxf0911.com", "寤跺畨鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("fhfce.com", "濂夊寲鎴夸骇缃�"); + SOURCE_MAP.put("967890.com", "濂夊寲鎴夸骇浜ゆ槗缃�"); + SOURCE_MAP.put("bbsfh.net", "濂夊寲鎴夸骇缃慱bbsfh"); + SOURCE_MAP.put("http://www.house-yt.com/", "鐑熷彴鎴夸骇鍦ㄧ嚎"); + SOURCE_MAP.put("hiao.com", "鐑熷彴濂界綉"); + SOURCE_MAP.put("ytfdcw.net", "鐑熷彴鎴垮湴浜ytfdcw"); + SOURCE_MAP.put("yantailoupan.com", "鐑熷彴妤肩洏缃�"); + SOURCE_MAP.put("yantaihouse.net", "鐑熷彴鎴夸骇鐑嚎"); + SOURCE_MAP.put("0991fc.com", "涔岄瞾鏈ㄩ綈鎴夸骇缃�"); + SOURCE_MAP.put("wlmqfcw.com", "涔岄瞾鏈ㄩ綈鎴夸骇"); + SOURCE_MAP.put("c21wlmq.com.cn", "21涓栫邯涓嶅姩浜�"); + SOURCE_MAP.put("house12315.com", "绂忓缓鎴垮湴浜ц仈鍚堢綉"); + SOURCE_MAP.put("fzfc.com.cn", "绂忓窞鎴夸骇缃�"); + SOURCE_MAP.put("99fj.com", "鐐规埧缃�"); + SOURCE_MAP.put("sjjtx.com", "瀹跺ぉ涓嬫埧浜�"); + SOURCE_MAP.put("timedg.com", "涓滆帪鏃堕棿缃�"); + SOURCE_MAP.put("dgmfw.com", "鑾炴皯缃�"); + SOURCE_MAP.put("e0757.cn", "浣涘北鎴夸骇缃�"); + SOURCE_MAP.put("fs.cc", "浣涘北鎴夸骇缃慱fs"); + SOURCE_MAP.put("0757.cn", "浣涘北淇℃伅娓�"); + SOURCE_MAP.put("esouwu.com", "鏄撴悳灞�"); + SOURCE_MAP.put("114haihui.com", "娴锋眹鎴夸骇"); + SOURCE_MAP.put("xianhouse.com", "瑗垮畨甯傛埧鍦颁骇瓒呭競"); + SOURCE_MAP.put("ejiacn.com", "E瀹剁綉"); + SOURCE_MAP.put("kunmingfdc.com", "鏄嗘槑鎴垮湴浜х綉"); + SOURCE_MAP.put("kmhouses.com", "鏄嗘槑鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("kunming.cn", "鏄嗘槑淇℃伅娓�"); + SOURCE_MAP.put("km185.com", "鏄嗘槑鎴跨綉"); + SOURCE_MAP.put("kmfw.com.cn", "鏄嗘槑鎴跨綉_kmfw.com"); + SOURCE_MAP.put("qzfb.net", "娉夊窞鎴垮惂"); + SOURCE_MAP.put("qzef.com", "娉夊窞E鎴跨綉"); + SOURCE_MAP.put("ejfc.cn", "鏄撳槈鎴夸骇"); + SOURCE_MAP.put("wanzid.com", "娉夊窞鏈涘畨缃湴"); + SOURCE_MAP.put("qzpp.com", "娉夊窞鎴夸骇浜ゆ槗缃�"); + SOURCE_MAP.put("csjju.com", "鍩庡競浣冲眳"); + SOURCE_MAP.put("mxun.com", "楹﹁缃�"); + SOURCE_MAP.put("fangnmg.com", "鍐呰挋鍙ゆ埧鍦颁骇淇℃伅缃�"); + SOURCE_MAP.put("nhsky.com", "瀹佹捣鎴夸骇鐑嚎"); + SOURCE_MAP.put("nhfdcw.com", "瀹佹捣鎴垮湴浜х綉"); + SOURCE_MAP.put("nhfcrx.com", "瀹佹捣鎴夸骇鐑嚎_nhfcrx"); + SOURCE_MAP.put("nhnews.com.cn", "瀹佹捣鎴垮競"); + SOURCE_MAP.put("0858f.com", "鍏洏姘存埧浜х綉_0858f"); + SOURCE_MAP.put("sg169.com", "闊跺叧鎴夸骇缃�"); + SOURCE_MAP.put("shangdu.com", "鐒︿綔淇℃伅娓�"); + SOURCE_MAP.put("wzfcw.net", "娓╁窞鎴夸骇缃慱wzfcw"); + SOURCE_MAP.put("zj.cn", "娓╁窞鐑嚎"); + SOURCE_MAP.put("0577dc.com", "娓╁窞妤煎競"); + SOURCE_MAP.put("cnwzfc.com", "娓╁窞鎴夸骇缃慱cnwzfc"); + SOURCE_MAP.put("wbyj.com.cn", "鏅氭姤鏄撳"); + SOURCE_MAP.put("fc577.com", "娓╁窞璐埧缃�"); + SOURCE_MAP.put("wzzf.cn", "娓╁窞绉熸埧缃�"); + SOURCE_MAP.put("teambuy.com.cn", "涓洟缃�"); + SOURCE_MAP.put("sky008.com", "澶╃┖鎴夸骇缃�"); + SOURCE_MAP.put("axfc.cn", "鐖卞績鎴夸骇"); + SOURCE_MAP.put("xz21th.com", "寰愬窞鎴夸骇缃�"); + SOURCE_MAP.put("xzfc.net", "516鎴夸骇"); + SOURCE_MAP.put("xscfc.com", "鏂拌绐楁埧浜�"); + SOURCE_MAP.put("jilinfc.com", "鎴夸骇涔嬪"); + SOURCE_MAP.put("jlfdc.net", "鍚夋灄鎴夸骇缃�"); + SOURCE_MAP.put("jlmaifang.com", "鍚夋灄涔版埧"); + SOURCE_MAP.put("jldsw.com", "鍚夋灄甯傛埧浜х綉"); + SOURCE_MAP.put("shjnet.cn", "鏉捐姳姹熺綉"); + SOURCE_MAP.put("jl.cn", "鍚夋灄甯備俊鎭腐"); + SOURCE_MAP.put("xnfcsc.com", "瑗垮畞鎴夸骇缃�"); + SOURCE_MAP.put("2zf.cn", "鐖辩鎴�"); + SOURCE_MAP.put("0951house.com", "閾跺窛鎴夸骇缃�"); + SOURCE_MAP.put("nxsq.com", "瀹佸浠曞鎴夸骇缃�"); + SOURCE_MAP.put("ycxpy.com", "楹﹀悏灞�"); + SOURCE_MAP.put("czsfdcw.com", "甯稿窞甯傛埧鍦颁骇缃�"); + SOURCE_MAP.put("czzf.com", "甯稿窞浣忔埧"); + SOURCE_MAP.put("dzfdc.com", "涓囬偦鎴夸骇缃�"); + SOURCE_MAP.put("yexiangwang.com", "鏂版埧婧愮綉"); + SOURCE_MAP.put("hainan3.com", "娴峰崡鎴夸骇缃�"); + SOURCE_MAP.put("wanziqianhong.cn", "涓囩传鍗冪孩鎴夸骇"); + SOURCE_MAP.put("hainan.net", "娴峰崡鍦ㄧ嚎"); + SOURCE_MAP.put("0898fcw.cn", "娴峰崡鎴夸骇缃慱0898fcw"); + SOURCE_MAP.put("weifangloushi.com", "娼嶅潑妤煎競"); + SOURCE_MAP.put("wfhouse.com", "娼嶅潑鎴垮湴浜х綉"); + SOURCE_MAP.put("0536home.com", "娼嶅潑鎴夸骇缃�"); + SOURCE_MAP.put("lyhome.com", "娲涢槼鎴夸骇缃慱lyhome"); + SOURCE_MAP.put("lyw.cc", "娲涢槼鍩�"); + SOURCE_MAP.put("0379fcw.com", "娲涢槼鎴夸骇_0379fcw"); + SOURCE_MAP.put("luoyangfdc.com", "娲涢槼鎴夸骇缃�"); + SOURCE_MAP.put("lyhcfc.com", "娴峰窛鎴夸骇"); + SOURCE_MAP.put("shangdu.com", "娲涢槼淇℃伅娓�"); + SOURCE_MAP.put("379fcw.com", "379鎴夸骇缃�"); + SOURCE_MAP.put("zbhouse.com.cn", "娣勫崥鎴夸骇鍦ㄧ嚎"); + SOURCE_MAP.put("hellozb.com", "娣勬埧缃�"); + SOURCE_MAP.put("ziboloushi.com", "娣勫崥妤煎競"); + SOURCE_MAP.put("zbinfo.net", "娣勫崥淇℃伅娓�"); + SOURCE_MAP.put("sxfcw.org", "缁嶅叴鎴夸骇缃慱sxfcw"); + SOURCE_MAP.put("0575ls.cn", "缁嶅叴妤煎競"); + SOURCE_MAP.put("officezz.com", "閮戝窞鍐欏瓧妤肩綉"); + SOURCE_MAP.put("bleju.com", "鐧句箰灞�"); + SOURCE_MAP.put("shangdu.com", "鍟嗛兘缃�"); + SOURCE_MAP.put("douanju.com", "閮藉畨灞�"); + SOURCE_MAP.put("371fang.cn", "閮戞埧缃�"); + SOURCE_MAP.put("5wee.com", "浜旂淮"); + SOURCE_MAP.put("wwxxg.com", "姝﹀▉淇℃伅娓�"); + SOURCE_MAP.put("0437.com", "杈芥簮淇℃伅娓�"); + SOURCE_MAP.put("inlishui.com", "灞呭涓浗"); + SOURCE_MAP.put("fangbx.com", "鎴垮疂绠�"); + SOURCE_MAP.put("521qz.com", "閽︽皯缃�"); + SOURCE_MAP.put("zailinyi.com", "鍦ㄤ复娌�"); + SOURCE_MAP.put("tlfc.cn", "閫氳窘鎴夸骇缃�"); + SOURCE_MAP.put("0435.com", "閫氬寲鍦ㄧ嚎"); + SOURCE_MAP.put("0543.com", "0543婊ㄥ窞缃�"); + SOURCE_MAP.put("0314fdc.com", "鎵挎埧缃�"); + SOURCE_MAP.put("hjfcs.cn", "娴锋櫙鎴胯秴甯�"); + SOURCE_MAP.put("bqqm.com", "渚挎皯缃�"); + SOURCE_MAP.put("seezy.com", "閬典箟鎴夸骇缃�"); + SOURCE_MAP.put("huaian.com", "娣畨鎴夸骇缃�"); + SOURCE_MAP.put("huainet.com", "娣綉鎴夸骇"); + SOURCE_MAP.put("zufang.com", "绉熸埧缃�"); + SOURCE_MAP.put("ezfcw.cn", "閯傚窞鎴夸骇缃�"); + SOURCE_MAP.put("0318ol.com", "琛℃按鍦ㄧ嚎"); + SOURCE_MAP.put("zzfcw.com.cn", "鏋f埧缃�"); + SOURCE_MAP.put("xc0561.com", "鐩稿煄鎴夸骇缃�"); + SOURCE_MAP.put("hbloushi.com", "楣ゅ妤煎競"); + SOURCE_MAP.put("f537.com", "娴庡畞鎴挎埧缃�"); + SOURCE_MAP.put("fangguagua.com", "鎴垮懕鍛�"); + SOURCE_MAP.put("jnfcw.com.cn", "娴庢埧缃慾nfcw"); + SOURCE_MAP.put("dzwww.com", "澶т紬缃�"); + SOURCE_MAP.put("66house.com", "鎴胯仈缃�"); + SOURCE_MAP.put("0701.com", "楣版江鎴夸骇缃�"); + SOURCE_MAP.put("hgfc.cc", "榛勫唸鎴夸骇缃�"); + SOURCE_MAP.put("163.com", "缃戞槗鎴夸骇"); + SOURCE_MAP.put("qq.com", "鑵捐鎴夸骇"); + SOURCE_MAP.put("haowangpu.com", "濂芥椇閾�"); + SOURCE_MAP.put("fhfce.com", "濂夊寲鎴夸骇缃�"); + SOURCE_MAP.put("900fc.com", "娓╁窞鎴夸骇缃慱900fc"); + SOURCE_MAP.put("jlmaifang.com", "鍚夋灄涔版埧"); + SOURCE_MAP.put("0971fc.com", "瑗挎埧缃�"); + SOURCE_MAP.put("yexiangwang.com", "鏂版埧婧愮綉"); + SOURCE_MAP.put("1188fc.com", "娴峰崡鎴夸骇涓撶嚎"); + SOURCE_MAP.put("hainan3.com", "娴峰崡鎴夸骇缃�"); + SOURCE_MAP.put("zbhouse.cn", "娣勫崥鎴夸骇缃�"); + SOURCE_MAP.put("ziboloushi.com", "娣勫崥妤煎競"); + SOURCE_MAP.put("seezy.com", "閬典箟鎴夸骇缃�"); + SOURCE_MAP.put("ilinyi.net", "鐖变复娌�"); SOURCE_MAP.put("bynefc.com", "FIND YOUR HOME"); - SOURCE_MAP.put("0314fdc.com", "承房网"); - SOURCE_MAP.put("lejiazhiye.cn", "乐家房产网"); - SOURCE_MAP.put("jmfc.com.cn", "荆门房产热线"); - SOURCE_MAP.put("e0838.com", "住在德阳网"); - SOURCE_MAP.put("house777.cn", "大连房地产网"); - SOURCE_MAP.put("hljfdc.net", "黑龙江房产网"); - SOURCE_MAP.put("jafdc.cn", "吉安房产局"); - SOURCE_MAP.put("qq.com", "腾讯房产"); - SOURCE_MAP.put("sina.com.cn", "新浪乐居"); - SOURCE_MAP.put("iefang.com", "爱易房"); - SOURCE_MAP.put("liyhy.com", "溧阳昊业房产"); - SOURCE_MAP.put("fangtoo.com", "房途网"); - SOURCE_MAP.put("bjfang.com", "天朗房网"); - SOURCE_MAP.put("house0579.com", "亚和房产"); - SOURCE_MAP.put("mayanchina.com", "玛雅房屋"); - SOURCE_MAP.put("yysyfdc.com", "余姚生益房产"); - SOURCE_MAP.put("fdc0746.com", "0746楼市网"); - SOURCE_MAP.put("whfc.com.cn", "威海房产交易网"); - SOURCE_MAP.put("04828.com", "兴安盟信息网"); - SOURCE_MAP.put("jiayouhh.com", "加油红河网"); - SOURCE_MAP.put("0455.sh.cn", "绥化信息港(SH)"); - SOURCE_MAP.put("78sys.com", "78双鸭山"); - SOURCE_MAP.put("0464.net.cn", "0464信息网"); - SOURCE_MAP.put("0790dcw.com", "新余地产网0790"); - SOURCE_MAP.put("xykanfang.com", "新余看房网"); - SOURCE_MAP.put("tr169.cn", "铜仁都市网"); - SOURCE_MAP.put("trren.cn", "铜仁房产"); - SOURCE_MAP.put("trfcw.com", "铜仁房产网trfcw"); - SOURCE_MAP.put("syfang.net", "十堰房产网syfang"); - SOURCE_MAP.put("d0598.com", "三明房产网d0598"); - SOURCE_MAP.put("xnjhome.com", "新内江房产网"); - SOURCE_MAP.put("0597321.com", "龙岩321房产网"); - SOURCE_MAP.put("jn234.com", "济宁新信息港"); - SOURCE_MAP.put("jiningloushi.com", "济宁楼市"); - SOURCE_MAP.put("jqcn.net", "酒泉生活网"); - SOURCE_MAP.put("0470a.com", "呼伦贝尔火网"); - SOURCE_MAP.put("ehuludao.com", "葫芦岛在线"); - SOURCE_MAP.put("hldkfw.com", "葫芦岛看房网"); - SOURCE_MAP.put("hldinfo.net", "葫芦岛信息港"); - SOURCE_MAP.put("yx0429.com", "葫芦岛房地产超市网"); - SOURCE_MAP.put("hldhouse.com", "葫芦岛房地产网"); - SOURCE_MAP.put("c0798.com", "景德镇买房网"); - SOURCE_MAP.put("jianfc.com", "吉安房产网"); - SOURCE_MAP.put("jxych.cn", "达成宜春房产网"); - SOURCE_MAP.put("hbloushi.com", "鹤壁楼市"); - SOURCE_MAP.put("726000.net", "商洛房产网"); - SOURCE_MAP.put("yjwn.cn", "易居渭南"); - SOURCE_MAP.put("kfang.com.cn", "看房网"); - SOURCE_MAP.put("0355fdc.com", "0355房产网"); - SOURCE_MAP.put("tcfcw.net", "铜川房产网"); - SOURCE_MAP.put("jxrtv.com", "嘉兴人网"); - SOURCE_MAP.put(".yizfc", "仪征房产网"); - SOURCE_MAP.put("h0758.net", "肇房网"); - SOURCE_MAP.put("gzcjy128.com", "创家易"); - SOURCE_MAP.put("52bendi.com", "本地房产家居网"); - SOURCE_MAP.put("0830360.com", "泸州房产网"); - SOURCE_MAP.put("jzsfc.gov.cn", "晋中房地产信息网"); - SOURCE_MAP.put("zhengfafa.com", "正发发分类信息网"); - SOURCE_MAP.put("huzfbz.com", "湖州住房保障网"); - SOURCE_MAP.put("gmfdcw.com", "高密房产信息网"); - SOURCE_MAP.put("rednet.cn", "红网"); - SOURCE_MAP.put("0744.ccoo.cn", "张家界门户网"); - SOURCE_MAP.put("fcpzh.com", "攀枝花房产网"); - SOURCE_MAP.put("ipzh.cn", "爱尚花城网"); - SOURCE_MAP.put("fc0576.com", "台州房产网"); - SOURCE_MAP.put("tzfy.cn", "台州房源网"); - SOURCE_MAP.put("tzview.com", "台州视窗"); - SOURCE_MAP.put("tzfdctv.com", "台州百联房产网"); - SOURCE_MAP.put("tzeju.com", "台州易居网"); - SOURCE_MAP.put("ljwcom.com", "龙江网"); - SOURCE_MAP.put("dqfc114.com", "大庆房产信息网"); - SOURCE_MAP.put("daqing.net", "大庆信息港"); - SOURCE_MAP.put("0412aj.com", "鞍山爱家房产网"); - SOURCE_MAP.put("23fdc.com", "鞍山房产网"); - SOURCE_MAP.put("zh51home.com", "珠海房产之窗"); - SOURCE_MAP.put("gogohome.com", "房产信息网"); - SOURCE_MAP.put("zhnews.net", "珠海惠买房"); - SOURCE_MAP.put("zh-o.com", "珠海西区房产网"); - SOURCE_MAP.put("kingia.com", "君越地产"); - SOURCE_MAP.put("gd.cn", "珠海视窗搜房"); - SOURCE_MAP.put("doumenqu.com", "斗门视窗"); - SOURCE_MAP.put("0760dc.com", "中山房产网_0760dc"); - SOURCE_MAP.put("zgfdc.net", "中山楼市"); - SOURCE_MAP.put("0760t.com", "中山租房网"); - SOURCE_MAP.put("shushifang.com", "舒适房网"); - SOURCE_MAP.put("dinju.com", "定居网"); - SOURCE_MAP.put("stre.net", "汕头房地产信息网"); - SOURCE_MAP.put("stlafc.com", "利安房产"); - SOURCE_MAP.put("live754.com", "e居房产"); - SOURCE_MAP.put("stfdcw.com", "汕头房地产网"); - SOURCE_MAP.put("tt5598.com", "汕头雅居网"); - SOURCE_MAP.put("0754ok.com", "房居网"); - SOURCE_MAP.put("bfqfc.com", "百富勤房产"); - SOURCE_MAP.put("stfc118.com", "汕头房产在线"); - SOURCE_MAP.put("sthtfc.com", "顺泰泓泰房产"); - SOURCE_MAP.put("very-e.net", "上易找房"); - SOURCE_MAP.put("0754house.com", "佳成房产"); - SOURCE_MAP.put("bdhouse.net", "嘉信房产"); - SOURCE_MAP.put("bdzfw.net", "保定找房网"); - SOURCE_MAP.put("bxfcw.net", "溪房网"); - SOURCE_MAP.put("0414aj.com", "本溪爱家房产网"); - SOURCE_MAP.put("bxydt.com", "本溪房吧"); - SOURCE_MAP.put("pdshouse.com", "平顶山房产"); - SOURCE_MAP.put("pdsloushi.com", "平顶山楼市"); - SOURCE_MAP.put("qjfdc.cn", "曲靖房地产信息网"); - SOURCE_MAP.put("0874114.cn", "曲靖便民网"); - SOURCE_MAP.put("cityfdc.com", "中国房地产信息网"); - SOURCE_MAP.put("hdzc.net", "邯郸之窗"); - SOURCE_MAP.put("qhdfcjj.com", "秦皇岛房产家居网"); - SOURCE_MAP.put("qhd.com.cn", "秦皇岛信息港"); - SOURCE_MAP.put("daomin.net", "秦皇岛岛民网"); - SOURCE_MAP.put("qhd678.com", "秦皇岛大众信息港"); - SOURCE_MAP.put("weihaifangchan.cn", "威海房产团购网"); - SOURCE_MAP.put("pjfdc.com", "盘锦房地产网"); - SOURCE_MAP.put("panjin.net", "鹤乡热线"); - SOURCE_MAP.put("0427.com", "互联盘锦"); - SOURCE_MAP.put("pj0427.net", "盘锦在线"); - SOURCE_MAP.put("pjfyw.com", "盘锦房源网"); - SOURCE_MAP.put("0714.yy.cm", "黄石房产网"); - SOURCE_MAP.put("cuwall.com", "房产在线"); - SOURCE_MAP.put("daloupan.com", "大楼盘"); - SOURCE_MAP.put("88fw.com", "黄石成功房产网"); - SOURCE_MAP.put("edfdc.com", "有居网"); - SOURCE_MAP.put("hsren.com", "黄石热线"); - SOURCE_MAP.put("hsfc.net.cn", "黄石房产网_hsfc"); - SOURCE_MAP.put("zaihuangshi.com", "黄石生活网"); - SOURCE_MAP.put("hynews.org", "河源新闻网"); - SOURCE_MAP.put("fs0762.com", "房视网"); - SOURCE_MAP.put("ykfc.net", "营口房产信息网"); - SOURCE_MAP.put("ykouf.cn", "营口房产网"); - SOURCE_MAP.put("yingkoufangchan.com", "营口房产"); - SOURCE_MAP.put("xxfang.com", "新乡房产"); - SOURCE_MAP.put("xxloushi.com", "新乡楼市"); - SOURCE_MAP.put("xxgfw.cn", "新乡购房者"); - SOURCE_MAP.put("yynews.com.cn", "余姚新闻网"); - SOURCE_MAP.put("eyuyao.com", "余姚生活网"); - SOURCE_MAP.put("571888.com", "余姚房产信息"); - SOURCE_MAP.put("0574yye.com", "余姚房产"); - SOURCE_MAP.put("yydushi.com", "余姚房产_yydushi"); - SOURCE_MAP.put("yyjbfc.com", "余姚家博房产"); - SOURCE_MAP.put("yysyfdc.com", "余姚生益房产"); - SOURCE_MAP.put("eyuyao.com", "旺佳房产"); - SOURCE_MAP.put("cs090.com", "零距离房产"); - SOURCE_MAP.put("ycls.cn", "虞城楼市"); - SOURCE_MAP.put("csfcw.com", "常熟房产网"); - SOURCE_MAP.put("cshfc.cn", "常熟房产网_cshfc"); - SOURCE_MAP.put("02fw.com", "常熟二手房"); - SOURCE_MAP.put("zp365.com", "住朋网"); - SOURCE_MAP.put("lijiangfc.com", "丽江房产网"); - SOURCE_MAP.put("ljsoufang.com", "丽江搜房"); - SOURCE_MAP.put("ljfdc.cn", "丽江房地产信息网"); - SOURCE_MAP.put("ljfw.com", "丽江房产网_ljfw"); - SOURCE_MAP.put("lijiangdc.com", "居安房地产"); - SOURCE_MAP.put("ljhouse.cn", "丽江房网"); - SOURCE_MAP.put("ljfw.com.cn", "丽江房网_ljfw"); - SOURCE_MAP.put("daqin029.com", "大秦咸阳网"); - SOURCE_MAP.put("sanqinfang.com", "三秦房"); - SOURCE_MAP.put("zhuoyuefch.com", "咸阳卓越房产"); - SOURCE_MAP.put("lejufc.com", "乐居房产"); - SOURCE_MAP.put("jieyangzf.com", "揭阳房产信息网"); - SOURCE_MAP.put("d0898.com", "三亚房产网_d0898"); - SOURCE_MAP.put("sanyagf.com", "三亚购房者"); - SOURCE_MAP.put("0831home.com", "三江房产网"); - SOURCE_MAP.put("ybvv.cn", "宜宾房地产网"); - SOURCE_MAP.put("ybfc.cn", "宜宾房产网"); - SOURCE_MAP.put("ybbbs.net", "宜宾房产网_ybbbs"); - SOURCE_MAP.put("jj831.com", "金江网"); - SOURCE_MAP.put("ybfdcw.com", "宜宾房地产网_ybfdcw"); - SOURCE_MAP.put("0831xyfc.com", "欣宜房产"); - SOURCE_MAP.put("ybzfw.com", "宜宾住房网"); - SOURCE_MAP.put("pt594.com", "莆田房产网"); - SOURCE_MAP.put("ptfc123.com", "莆田房产"); - SOURCE_MAP.put("ptfcw.com", "莆田房产网_ptfcw"); - SOURCE_MAP.put("qilinsw.com", "莆田奇林房产网"); - SOURCE_MAP.put("pt-house.com", "莆田联合房产网"); - SOURCE_MAP.put("pthouse.com.cn", "莆田房地产联合网"); - SOURCE_MAP.put("ptfcxxw.com", "莆田房产信息网_ptfcxxw"); - SOURCE_MAP.put("ptwcfc.com", "万城房产网"); - SOURCE_MAP.put("zxip.com", "慈溪房产网_xip"); - SOURCE_MAP.put("cxfccs.com", "慈溪房产网_cxfccs"); - SOURCE_MAP.put("cxnews.cn", "慈溪房产家居网"); - SOURCE_MAP.put("cixi.cn", "慈溪房地产网"); - SOURCE_MAP.put("cixiw.com", "慈溪房产在线"); - SOURCE_MAP.put("guanhaiwei.com", "慈溪房产网"); - SOURCE_MAP.put("ruifc.cn", "瑞安房产网_ruifc"); - SOURCE_MAP.put("rafdcw.com", "瑞安房地产网"); - SOURCE_MAP.put("rafcxx.com", "瑞安房产中介网"); - SOURCE_MAP.put("ruian.com", "瑞安论坛"); - SOURCE_MAP.put("razyfc.com", "瑞安房网"); - SOURCE_MAP.put("auouo.com", "瑞安生活网"); - SOURCE_MAP.put("wjhouses.com", "吴江房产信息港"); - SOURCE_MAP.put("wjshw.com", "吴江房产信息网_wjshw"); - SOURCE_MAP.put("wjfcw.com", "吴江房产网_wjfcw"); - SOURCE_MAP.put("tt919.com", "当家网"); - SOURCE_MAP.put("wjls.com.cn", "吴江楼市网"); - SOURCE_MAP.put("168house.cn", "吴江房产信息网"); - SOURCE_MAP.put("renjoin.com", "人居网"); - SOURCE_MAP.put("wjhao.com", "吴江房产网_wjhao"); - SOURCE_MAP.put("wjgfw.com", "吴江购房网"); - SOURCE_MAP.put("yxfcw.cn", "宜兴房产网_yxfcw"); - SOURCE_MAP.put("tdfcw.com", "陶都房产网"); - SOURCE_MAP.put("yuntaodu.com", "云陶都房产网"); - SOURCE_MAP.put("yxfcw.com", "宜兴房地产网"); - SOURCE_MAP.put("yixing.cc", "在线房产"); - SOURCE_MAP.put("rmfcw.cn", "宜兴人民房产"); - SOURCE_MAP.put("yxfyfc.com", "宜兴方圆房产中介"); - SOURCE_MAP.put("999fc.net", "宜兴租房网"); - SOURCE_MAP.put("yxfccs.com", "宜兴房产超市网"); - SOURCE_MAP.put("yixing.cc", "宜兴在线"); - SOURCE_MAP.put("bsfcw.net", "宜兴百盛房产"); - SOURCE_MAP.put("yxhbfc.com", "宜兴天桥房产网"); - SOURCE_MAP.put("yxhxfc.com", "宜兴和信房产"); - SOURCE_MAP.put("yxls.com.cn", "宜兴楼市网"); - SOURCE_MAP.put("yxfqfc.com", "宜兴富强房产"); - SOURCE_MAP.put("zqlos.com", "肈庆楼市"); - SOURCE_MAP.put("0758fc.net", "肈庆房产网"); - SOURCE_MAP.put("tcsw.cn", "肇庆房地产"); - SOURCE_MAP.put("ayinfo.cn", "安阳房产网"); - SOURCE_MAP.put("ayloushi.com", "安阳楼市"); - SOURCE_MAP.put("0372fdc.com", "安阳房地产网"); - SOURCE_MAP.put("zj.cn", "义乌信息网"); - SOURCE_MAP.put("ywfc.net", "义乌房产网"); - SOURCE_MAP.put("ywfc.cc", "汇鑫房产"); - SOURCE_MAP.put("houseyw.com", "香居房产"); - SOURCE_MAP.put("15518.com", "幸福房产信息"); - SOURCE_MAP.put("169l.com", "义乌房产"); - SOURCE_MAP.put("15fcw.com", "友好房产"); - SOURCE_MAP.put("ywhouse365.com", "义乌方圆房产"); - SOURCE_MAP.put("15jp.com", "锦鹏不动产"); - SOURCE_MAP.put("ywfhfc.com", "义乌富华房产"); - SOURCE_MAP.put("afz.cc", "爱房站"); - SOURCE_MAP.put("ywjlfc.com.cn", "蛟龙房产网"); - SOURCE_MAP.put("ywhhfc.com", "义乌火红房产"); - SOURCE_MAP.put("ylfdc.com", "玉林房地产信息网"); - SOURCE_MAP.put("yulintimes.com", "玉林时代网"); - SOURCE_MAP.put("717.so", "房产乐园"); - SOURCE_MAP.put("tsloushi.com", "唐山楼市网"); - SOURCE_MAP.put("0315dg.com", "唐山房产网"); - SOURCE_MAP.put("tszp.com", "唐山房网"); - SOURCE_MAP.put("0710.com", "襄阳0710网"); - SOURCE_MAP.put("0270710.com", "0710襄阳房产网"); - SOURCE_MAP.put("jinxiangyang.com", "襄阳分类信息网"); - SOURCE_MAP.put("0527lsw.com", "宿迁楼市网"); - SOURCE_MAP.put("0527c.net", "宿迁房产网_0527c"); - SOURCE_MAP.put("0527fc.com", "宿迁房产网_0527fc"); - SOURCE_MAP.put("sqhouse.cn", "宿迁房地产网"); - SOURCE_MAP.put("114b2c.com", "宿迁房产网_114b2c"); - SOURCE_MAP.put("sqfczx.cc", "宿迁房产网_sqfczx"); - SOURCE_MAP.put("mmfc.cc", "茂名房产"); - SOURCE_MAP.put("nt138.com", "茂名南天地产网"); - SOURCE_MAP.put("gdmmfdc.com", "茂名房地产信息网"); - SOURCE_MAP.put("230668.com", "茂名房产网"); - SOURCE_MAP.put("my0668.com", "茂名房市网"); - SOURCE_MAP.put("mmxfw.com", "茂名寻房网"); - SOURCE_MAP.put("fdc0518.com", "连云港房产百事通"); - SOURCE_MAP.put("0518gfw.com", "连云港购房网"); - SOURCE_MAP.put("lygfc.com", "连云港房产网"); - SOURCE_MAP.put("0555fc.com", "马鞍山房产网_0555fc"); - SOURCE_MAP.put("masf.cn", "马鞍山房产网"); - SOURCE_MAP.put("ym234.com", "易马网"); - SOURCE_MAP.put("mdjhouse.com", "牡丹江房产网"); - SOURCE_MAP.put("mdjlife.com", "牡丹江生活网"); - SOURCE_MAP.put("myzf.net", "绵阳住房网"); - SOURCE_MAP.put("88zf.com", "芜湖找房"); - SOURCE_MAP.put("roboo.com", "芜湖房产"); - SOURCE_MAP.put("0792f.cn", "房盟"); - SOURCE_MAP.put("0792fcw.com", "九江房产网"); - SOURCE_MAP.put("0797fdc.com.cn", "赣州房地产信息网"); - SOURCE_MAP.put("0797fdc.net", "赣州房产在线"); - SOURCE_MAP.put("jxdxfc.com", "鼎信房地产"); - SOURCE_MAP.put("0662fang.com", "阳江房产交易网"); - SOURCE_MAP.put("bbs0763.com", "清远房产网"); - SOURCE_MAP.put("qy-house.com", "清远家园"); - SOURCE_MAP.put("0763888.com", "清远生活网"); - SOURCE_MAP.put("zhuzhouwang.com", "株洲网"); - SOURCE_MAP.put("0732fc.net", "湘潭房地产综合网"); - SOURCE_MAP.put("zg163.net", "自贡房地产"); - SOURCE_MAP.put("qz828.com", "衢州新闻网"); - SOURCE_MAP.put("house018.com", "衢州房网"); - SOURCE_MAP.put("0570.com", "衢房网"); - SOURCE_MAP.put("qzmyfc.com", "衢州名扬房产网"); - SOURCE_MAP.put("qzfce.cn", "衢州房产e网"); - SOURCE_MAP.put("e0570.com", "衢州热线"); - SOURCE_MAP.put("qzdcfc.com", "大成房产"); - SOURCE_MAP.put("0771555.com", "邕房网"); - SOURCE_MAP.put("0572hu.com", "住在湖州网"); - SOURCE_MAP.put("yzfc123.com", "扬州房产"); - SOURCE_MAP.put("yz2shou.com", "扬州二手网"); - SOURCE_MAP.put("yzloupan.com", "扬州楼盘网"); - SOURCE_MAP.put("yongbangfc.com", "永邦房产"); - SOURCE_MAP.put("zjwqfc.com", "万千房产"); - SOURCE_MAP.put("newzj.net", "新镇江"); - SOURCE_MAP.put("qfdm.gov.cn", "江门房产网"); - SOURCE_MAP.put("jmnews.com.cn", "江门楼市网"); - SOURCE_MAP.put("dpdc.net.cn", "东鹏地产"); - SOURCE_MAP.put("0750f.com", "江房网"); - SOURCE_MAP.put("x0750.com", "五邑房产网"); - SOURCE_MAP.put("ycfcw.cn", "盐城房产网"); - SOURCE_MAP.put("yfcw.cn", "盐城房产网_yfcw"); - SOURCE_MAP.put("ycfcw.com", "盐城房产网_ycfcw"); - SOURCE_MAP.put("0515fc.com", "盐城房产网_0515fc"); - SOURCE_MAP.put("ycfcw.com.cn", "盐城房地产"); - SOURCE_MAP.put("ycfc8.com", "盐城房产"); - SOURCE_MAP.put("yifan2006.com", "一帆房产"); - SOURCE_MAP.put("09fc.com", "第九区房产网"); - SOURCE_MAP.put("djfw.com", "大家房产"); - SOURCE_MAP.put("fclm.cn", "房产联盟"); - SOURCE_MAP.put("t1ti.com", "天天房产"); - SOURCE_MAP.put("jx8588.com", "嘉兴房产网_jx8588"); - SOURCE_MAP.put("cnjxol.com", "嘉兴在线"); - SOURCE_MAP.put("19lou.com", "19楼"); - SOURCE_MAP.put("anjufw.cn", "安居房网"); - SOURCE_MAP.put("0579zf.com", "金华找房网"); - SOURCE_MAP.put("0579f.com", "浙中房网"); - SOURCE_MAP.put("591fw.com", "金华591房产网"); - SOURCE_MAP.put("btfcw.net", "比特房产"); - SOURCE_MAP.put("tzzufang.com", "泰州房产网"); - SOURCE_MAP.put("tzfcw.com", "新世纪房产"); - SOURCE_MAP.put("tzjhfcw.com", "泰州房产网_tzjhfcw"); - SOURCE_MAP.put("ty7.cn", "泰州楼市"); - SOURCE_MAP.put("tzwxwj.com", "我想我家"); - SOURCE_MAP.put("tzfcxx.com", "泰州房产信息网"); - SOURCE_MAP.put("guifc.com", "桂林房产网_guifc"); - SOURCE_MAP.put("huizhou.cn", "今日惠州网"); - SOURCE_MAP.put("hzcom.cn", "惠州房产"); - SOURCE_MAP.put("l8.com.cn", "隆塬地产"); - SOURCE_MAP.put("0759home.com", "湛江购房网"); - SOURCE_MAP.put("0759f.com", "湛江房产网_0759f"); - SOURCE_MAP.put("zjttdc.com", "天天地产"); - SOURCE_MAP.put("hsjdc.com", "好世界地产"); - SOURCE_MAP.put("yinsha.com", "银沙房产网"); - SOURCE_MAP.put("hnzzfc.com", "株洲房产网"); - SOURCE_MAP.put("zzxfdc.com", "株洲县房地产网"); - SOURCE_MAP.put("hyfcw.com", "衡阳房产网"); - SOURCE_MAP.put("0734hysfc.com", "衡阳房产网_0734hysfc"); - SOURCE_MAP.put("e0734.com", "中国衡阳新闻网"); - SOURCE_MAP.put("fc0734.com", "衡阳红房"); - SOURCE_MAP.put("0734f.com", "衡阳二手房"); - SOURCE_MAP.put("hysfcw.com", "衡阳市房产网"); - SOURCE_MAP.put("yichangfang.com", "宜昌房产网"); - SOURCE_MAP.put("e0717.net", "宜昌房产网_e0717"); - SOURCE_MAP.put("winshang.com", "赢商商务"); - SOURCE_MAP.put("mpuba.com", "买铺吧"); - SOURCE_MAP.put("city8.com", "全景房产"); - SOURCE_MAP.put("yuedutz.com", "一手商铺网"); - SOURCE_MAP.put("soupu.com", "搜铺"); - SOURCE_MAP.put("leadshang.com", "领商网"); - SOURCE_MAP.put("shanghaioffice.net", "上海写字楼网"); - SOURCE_MAP.put("officese.com", "中华写字楼网"); - SOURCE_MAP.put("126office.com", "瑞阳不动产"); - SOURCE_MAP.put("souloub.com", "搜楼帮"); - SOURCE_MAP.put("cbdzl.com", "北京写字楼网"); - SOURCE_MAP.put("vpv.cn", "旺铺网"); - SOURCE_MAP.put("office-beijing.com.cn", "北京写字楼咨询中心"); - SOURCE_MAP.put("beijingxiezilou.cn", "北京写字楼信息网"); - SOURCE_MAP.put("58.com", "58同城"); - SOURCE_MAP.put("edeng.cn", "易登网"); - SOURCE_MAP.put("pupuwang.cn", "铺铺旺"); - SOURCE_MAP.put("bendibao.com", "本地宝"); - SOURCE_MAP.put("ilantu.com", "爱蓝图"); - SOURCE_MAP.put("bjhome.cn", "北京写字楼网bjhome"); - SOURCE_MAP.put("5izf.com", "北京写字楼出租网"); - SOURCE_MAP.put("bjoffices.com.cn", "北京写字楼网bjoffices"); - SOURCE_MAP.put("86office.com", "86写字楼网"); - SOURCE_MAP.put("ccto.com.cn", "北京写字楼总网"); - SOURCE_MAP.put("haoloubang.com", "好楼帮"); - SOURCE_MAP.put("028office.com", "成都写字楼信息网"); - SOURCE_MAP.put("vcbd.com.cn", "成都写字楼租赁网"); - SOURCE_MAP.put("hellobuilding.com", "好楼在线"); - SOURCE_MAP.put("qu114.com", "去114分类信息网"); - SOURCE_MAP.put("officecd.net", "成都写字楼租售网"); - SOURCE_MAP.put("gzgov.net", "广州信息港"); - SOURCE_MAP.put("go007.com", "城际分类"); - SOURCE_MAP.put("yes515.com", "515房产网"); - SOURCE_MAP.put("o.cn", "都市圈房产"); - SOURCE_MAP.put("sofang.com", "搜房sofang"); - SOURCE_MAP.put("h2h.cn", "手递手"); - SOURCE_MAP.put("99fang.com", "九九房"); - SOURCE_MAP.put("jinti.com", "今题房产网"); - SOURCE_MAP.put("taofw.cn", "淘房屋"); - SOURCE_MAP.put("sunhouse.com.cn", "深圳写字楼网"); - SOURCE_MAP.put("4567.com.cn", "深圳商业地产网"); - SOURCE_MAP.put("szcbdoffice.com", "美百年"); - SOURCE_MAP.put("zhaotie.com", "找贴网"); - SOURCE_MAP.put("aifangke.com", "爱房客"); - SOURCE_MAP.put("tjxiezilou.com", "天津写字楼信息网"); - SOURCE_MAP.put("qrwu.com", "七日屋租房网"); - SOURCE_MAP.put("suanpi.com", "蒜皮网"); - SOURCE_MAP.put("ukecy.com", "优客园区招商网"); - SOURCE_MAP.put("tjjxdc.net", "聚鑫地产"); - SOURCE_MAP.put("51zhantai.com", "51站台网"); - SOURCE_MAP.put("fundon.cn", "房东网"); - SOURCE_MAP.put("sydcw.net", "天津商业地产网"); - SOURCE_MAP.put("njofficeol.com", "南京写字楼在线"); - SOURCE_MAP.put("office-cbd.com", "南京蓝诺商业地产租赁机构"); - SOURCE_MAP.put("daikan.cn", "带看网"); - SOURCE_MAP.put("6doffice.net", "六度写字楼"); - SOURCE_MAP.put("021office.net", "上海写字楼"); - SOURCE_MAP.put("fangtoo.com", "房途网"); - SOURCE_MAP.put("fc571.com", "杭州房产网"); - SOURCE_MAP.put("0571cbd.com", "杭州写字楼网0571cbd"); - SOURCE_MAP.put("hzcf.net", "杭州写字楼网hzcf"); - SOURCE_MAP.put("bgo.cn", "必够网"); - SOURCE_MAP.put("kfw001.com", "快房网"); - SOURCE_MAP.put("hzzlys.com", "左邻右舍"); - SOURCE_MAP.put("eeju.com", "易居网"); - SOURCE_MAP.put("shmec.gov.cn", "上海教育"); - SOURCE_MAP.put("age06.com", "上海学前教育网"); - SOURCE_MAP.put("bjedu.gov.cn", "北京教育委员会"); - SOURCE_MAP.put("bjguahao.gov.cn", "北京市预约挂号统一平台"); - SOURCE_MAP.put("qqyy.com", "中国医院大全"); - SOURCE_MAP.put("pcbaby.com.cn", "太平洋亲子网"); - SOURCE_MAP.put("guahao.com", "挂号网"); - SOURCE_MAP.put("hzws.gov.cn", "杭州市免费预约挂号系统"); - SOURCE_MAP.put("hangzhoupaotui.com", "杭州罗兰跑腿"); - SOURCE_MAP.put("99.com.cn", "就诊指南"); - SOURCE_MAP.put("gzxuexiao.com", "广州学校网"); - SOURCE_MAP.put("120china.org", "医疗信息网"); - SOURCE_MAP.put("njbaidu.cn", "南京摆渡网"); - SOURCE_MAP.put("cdzk.net", "普通高校信息库"); - SOURCE_MAP.put("cdzk.net", "成都高中信息库"); - SOURCE_MAP.put("91160.com", "就医160"); - SOURCE_MAP.put("bendibao.com", "本地宝"); - SOURCE_MAP.put("sz.gov.cn", "深圳政府在线"); - SOURCE_MAP.put("yihu.com", "医护网"); - SOURCE_MAP.put("120.net", "120健康网"); - SOURCE_MAP.put("szxuexiao.com", "深圳学校网"); - SOURCE_MAP.put("jthysh.com", "家庭医生网"); - SOURCE_MAP.put("xywy.com", "寻医问药网"); - SOURCE_MAP.put("bjedu.com", "北京教育网"); - SOURCE_MAP.put("cdjjedu.net", "锦江教育网"); - SOURCE_MAP.put("qyei.com", "青羊教育网"); - SOURCE_MAP.put("xdedu.net", "新都教育网"); - SOURCE_MAP.put("whjyw.com", "武侯教育信息网"); - SOURCE_MAP.put("cdchedu.com", "成华教育信息网"); - SOURCE_MAP.put("cdgxedu.com", "高新教育网"); - SOURCE_MAP.put("cdedu.com", "成都教育在线"); - SOURCE_MAP.put("czedu.net.cn", "崇州教育信息网"); - SOURCE_MAP.put("99.com.cn", "南京市医院大全"); - SOURCE_MAP.put("yudaxsf.com", "裕达网"); - SOURCE_MAP.put("e21.cn", "湖北学校网"); - SOURCE_MAP.put("tjmec.gov.cn", "天津教育委员会"); - SOURCE_MAP.put("njedu.gov.cn", "南京教育(幼儿园)"); - SOURCE_MAP.put("njedu.gov.cn", "南京教育(初中)"); - SOURCE_MAP.put("njedu.gov.cn", "南京教育(小学)"); - SOURCE_MAP.put("njedu.gov.cn", "南京教育(中专)"); - SOURCE_MAP.put("njedu.gov.cn", "南京教育(高中)"); - SOURCE_MAP.put("njedu.gov.cn", "南京教育(民办)"); - SOURCE_MAP.put("nje.cn", "南京教育地图"); - SOURCE_MAP.put("njedu.gov.cn", "南京教育(特殊)"); - SOURCE_MAP.put("hzedu.gov.cn", "杭州教育网"); - SOURCE_MAP.put("hzedu.gov.cn", "杭州教育网(高校)"); - SOURCE_MAP.put("hzve.cn", "杭州职业教育信息网"); - SOURCE_MAP.put("zjedu.gov.cn", "浙江省教育厅"); - SOURCE_MAP.put("gdhed.edu.cn", "广东省教育厅"); - SOURCE_MAP.put("sz.gov.cn", "深圳政府在线"); - SOURCE_MAP.put("szxqjy.cn", "深圳学前教育管理在线"); - SOURCE_MAP.put("yhpdd.com", "南京幼儿园"); - SOURCE_MAP.put("nje.cn", "南京学前教育"); - SOURCE_MAP.put("gz.gov.cn", "中国广州政府"); - SOURCE_MAP.put("whjy.net", "武汉学前教育网"); - SOURCE_MAP.put("jajy.gov.cn", "江岸区教育局"); - SOURCE_MAP.put("qiaokou.gov.cn", "硚口教育"); - SOURCE_MAP.put("hyjyedu.com", "汉阳区教育局"); - SOURCE_MAP.put("wuchang-edu.com", "武昌区教育局"); - SOURCE_MAP.put("hedu.com.cn", "洪山教育信息网"); - SOURCE_MAP.put("qsjy.com", "青山教育信息网"); - SOURCE_MAP.put("wedzjy.com", "武汉开发区教育网"); - SOURCE_MAP.put("dxhedu.net", "东西湖教育信息网"); - SOURCE_MAP.put("whhnjy.net", "汉南教育信息网"); - SOURCE_MAP.put("whjy.net", "蔡甸教育信息网"); - SOURCE_MAP.put("chengdu.gov.cn", "成都市人民政府"); - SOURCE_MAP.put("hangzhou.gov.cn", "中国杭州市政府"); - SOURCE_MAP.put("whjyj.gov.cn", "武汉市教育局(小学)"); - SOURCE_MAP.put("whjyj.gov.cn", "武汉市教育局(幼)"); - SOURCE_MAP.put("whjyj.gov.cn", "武汉市教育局(中学)"); - SOURCE_MAP.put("whjyj.gov.cn", "武汉市教育局(特殊)"); - SOURCE_MAP.put("cqxzl.cn", "重庆写字楼网"); - SOURCE_MAP.put("xuanoffice.com", "成都广亿房地产"); - SOURCE_MAP.put("goufang.com", "购房网"); - SOURCE_MAP.put("sydcw.net", "重庆商业地产网"); - SOURCE_MAP.put("gov86.cn", "中国招商热线"); - SOURCE_MAP.put("ctrip.com", "携程"); - SOURCE_MAP.put("fdc668.com", "大连房地产网"); - SOURCE_MAP.put("zhuapo.com", "抓破网"); - SOURCE_MAP.put("51room.net", "51房产网"); - SOURCE_MAP.put("tgxzl.com", "团购写字楼网"); - SOURCE_MAP.put("fbook360.com", "房播客"); - SOURCE_MAP.put("szhome.com", "房网二手房"); - SOURCE_MAP.put("0757home.com", "佛山房屋网"); - SOURCE_MAP.put("citygf.com", "广佛都市网"); - SOURCE_MAP.put("wincn.com", "佛山招商网"); - SOURCE_MAP.put("fangdr.com", "房博士"); - SOURCE_MAP.put("fzfc.com.cn", "福州房产网"); - SOURCE_MAP.put("fangke.cn", "房客网"); - SOURCE_MAP.put("fdc668.com", "福州房地产网"); - SOURCE_MAP.put("hrbslfc.com", "世联房地产"); - SOURCE_MAP.put("96963.com", "哈尔滨信息港"); - SOURCE_MAP.put("hlj.net", "黑龙江信息港"); - SOURCE_MAP.put("0451zf.com", "哈市在线"); - SOURCE_MAP.put("fc0531.com", "济房网"); - SOURCE_MAP.put("fdc668.com", "济南房地产"); - SOURCE_MAP.put("jnfdc.gov.cn", "济南住宅与房地产信息网"); - SOURCE_MAP.put("jnhouse.com.cn", "济南房地产信息网"); - SOURCE_MAP.put("iqilu.com", "齐鲁网"); - SOURCE_MAP.put("lanfw.com", "蓝房网"); - SOURCE_MAP.put("house-jn.com", "济南房产在线"); - SOURCE_MAP.put("d2d.cn", "重庆房产网"); - SOURCE_MAP.put("kunming.cn", "昆明信息港"); - SOURCE_MAP.put("inpuu.com", "赢铺网"); - SOURCE_MAP.put("haopoo.com", "好铺网"); - SOURCE_MAP.put("shangpusou.com", "商投网"); - SOURCE_MAP.put("menmian.com", "门面网"); - SOURCE_MAP.put("hpe.cn", "黄浦教育(小学)"); - SOURCE_MAP.put("hpe.cn", "黄浦教育(初中)"); - SOURCE_MAP.put("sh.cn", "闸北教育(小学)"); - SOURCE_MAP.put("sh.cn", "闸北教育(初中)"); - SOURCE_MAP.put("sh.cn", "虹口教育"); - SOURCE_MAP.put("eju.com", "易居购房网"); - SOURCE_MAP.put("officeqd.com", "青岛写字楼信息网"); - SOURCE_MAP.put("qdbgl.com", "青岛写字楼网qdbgl"); - SOURCE_MAP.put("qingdaonews.com", "青岛新闻网"); - SOURCE_MAP.put("xzlzl.cn", "青岛写字楼租赁网"); - SOURCE_MAP.put("sd.cn", "青岛房产在线"); - SOURCE_MAP.put("homelink.com.cn", "链家在线"); - SOURCE_MAP.put("tedahu.com", "特大户网"); - SOURCE_MAP.put("lnfcw.net", "辽宁房产网"); - SOURCE_MAP.put("0311.com.cn", "新城网"); - SOURCE_MAP.put("funxoo.com", "房秀网"); - SOURCE_MAP.put("fdc668.com", "苏州房地产网"); - SOURCE_MAP.put("longcity.net", "住在龙城"); - SOURCE_MAP.put("anju51.cn", "安居无忧"); - SOURCE_MAP.put("haofang.net", "好房在线"); - SOURCE_MAP.put("xinfun.net", "新房网"); - SOURCE_MAP.put("xmzf.net", "厦门租房网"); - SOURCE_MAP.put("fcjjr.com", "中纪互联"); - SOURCE_MAP.put("xmfc.com", "厦门房产网"); - SOURCE_MAP.put("xmfangzi.com", "厦门房子网"); - SOURCE_MAP.put("xmhouse.com", "厦门房地产联合网"); - SOURCE_MAP.put("517gf.com", "517购房网"); - SOURCE_MAP.put("fdc668.com", "中山房地产网"); - SOURCE_MAP.put("66fc.com", "中山房地产"); - SOURCE_MAP.put("zsfdc.gov.cn", "中山市国土资源局"); - SOURCE_MAP.put("zsnews.cn", "中山楼市网"); - SOURCE_MAP.put("zgfdc.net", "中山楼市"); - SOURCE_MAP.put("0760dc.com", "中山房产网"); - SOURCE_MAP.put("mhedu.sh.cn", "闵行招生考试信息公开"); - SOURCE_MAP.put("eicbs.com", "宝山教育(小学)"); - SOURCE_MAP.put("eicbs.com", "宝山教育(中学)"); - SOURCE_MAP.put("sjedu.cn", "松江教育"); - SOURCE_MAP.put("sh.cn", "金山教育"); - SOURCE_MAP.put("hospital2", "医院大全网"); - SOURCE_MAP.put("qiuyi.cn", "求医网"); - SOURCE_MAP.put("fh21.com.cn", "飞华健康网"); - SOURCE_MAP.put("pharmnet.com.cn", "医药网"); - SOURCE_MAP.put("dg163.cn", "东莞健康网"); - SOURCE_MAP.put("qingdaonews.com", "青岛医院网上挂号"); - SOURCE_MAP.put("69jk.cn", "中国健康网"); - SOURCE_MAP.put("sina.com", "新浪健康"); - SOURCE_MAP.put("cq.cn", "万州教育"); - SOURCE_MAP.put("cq.cn", "万州教育(学前)"); - SOURCE_MAP.put("cdzk.net", "成都招生考试网"); - SOURCE_MAP.put("dl.gov.cn", "中国大连"); - SOURCE_MAP.put("dledu.com", "大连教育"); - SOURCE_MAP.put("dledu.com", "大连教育(民办)"); - SOURCE_MAP.put("dledu.com", "大连教育(概览)"); - SOURCE_MAP.put("dgjy.net", "东莞教育"); - SOURCE_MAP.put("sun0769.com", "东莞阳光网"); - SOURCE_MAP.put("fsjy.net", "佛山教育信息港"); - SOURCE_MAP.put("chancheng.gov.cn", "佛山禅城"); - SOURCE_MAP.put("fsjy.net", "佛山教育信息"); - SOURCE_MAP.put("fuzhou.gov.cn", "中国福州"); - SOURCE_MAP.put("hledu.net", "哈尔滨教育行政网"); - SOURCE_MAP.put("jnedu.gov.cn", "济南市教育局"); - SOURCE_MAP.put("qdedu.gov.cn", "青岛市教育局"); - SOURCE_MAP.put("qingdaonews.com", "青岛新闻网"); - SOURCE_MAP.put("ln.gov.cn", "辽宁省人民政府"); - SOURCE_MAP.put("shanxigov.cn", "山西省人民政府"); - SOURCE_MAP.put("xmedu.gov.cn", "厦门市教育局"); - SOURCE_MAP.put("zsedu.net", "中山教育财务网"); - SOURCE_MAP.put("zs.gov.cn", "中国中山"); - SOURCE_MAP.put("sdfdc.com", "山东房地产网"); - SOURCE_MAP.put("soho365.net", "济南写字楼网"); - SOURCE_MAP.put("suzhou.gov.cn", "中国苏州"); - SOURCE_MAP.put("dcjy.net", "东城教育"); - SOURCE_MAP.put("hdavec.org", "海淀教育网"); - SOURCE_MAP.put("ftedu.gov.cn", "丰台教育小学"); - SOURCE_MAP.put("ftedu.gov.cn", "丰台教育中学"); - SOURCE_MAP.put("bjedu.cn", "门头沟教育信息网"); - SOURCE_MAP.put("tzedu.gov.cn", "通州区教育委员会"); - SOURCE_MAP.put("shyedu.gov.cn", "教育资源"); - SOURCE_MAP.put("hredu.gov.cn", "怀柔阳光教育网"); - SOURCE_MAP.put("szftedu.cn", "福田教育网"); - SOURCE_MAP.put("360fc.cn", "360房产网"); - SOURCE_MAP.put("371fang.cn", "郑房网"); - SOURCE_MAP.put("371house.com", "郑州楼市"); - SOURCE_MAP.put("dahehouse.com", "大河房产"); - SOURCE_MAP.put("zzloupan.com", "郑州楼盘网"); - SOURCE_MAP.put("51zupu.com", "我要租铺网"); - SOURCE_MAP.put("bendibao.com", "本地宝"); - SOURCE_MAP.put("yes515.com", "515房产网"); - SOURCE_MAP.put("yaoee.com", "易易网"); - SOURCE_MAP.put("shangdu.com", "商都网"); - SOURCE_MAP.put("360fc.cn", "360房产网"); - SOURCE_MAP.put("fanging.com", "河南房产网"); - SOURCE_MAP.put("371house.com", "郑州楼市网"); - SOURCE_MAP.put("zzedu.net.cn", "郑州教育信息网"); - SOURCE_MAP.put("bgo.cn", "必够"); - SOURCE_MAP.put("myliving.cn", "租售情报网"); - SOURCE_MAP.put("kunfun.com", "昆房网"); - SOURCE_MAP.put("39world.com", "39健康世界"); - SOURCE_MAP.put("wolai.com", "我来房产"); - SOURCE_MAP.put("kunshan0512.com", "昆山地产网"); - SOURCE_MAP.put("ksshangpu.com", "昆山商铺租售"); - SOURCE_MAP.put("di1fang.com", "昆山第一房产"); - SOURCE_MAP.put("ksfc.gov.cn", "昆山房产信息网"); - SOURCE_MAP.put("510wx.com", "510房产"); - SOURCE_MAP.put("wxfcw.com", "无锡房产网"); - SOURCE_MAP.put("thmzfc.com", "明珠房产网"); - SOURCE_MAP.put("http://efw.cn/", "e房网"); - SOURCE_MAP.put("taihuwang.com", "无锡太湖网"); - SOURCE_MAP.put("0574-office.com", "宁波写字楼租售网"); - SOURCE_MAP.put("nbre001.com", "宁波商业地产网"); - SOURCE_MAP.put("cnnb.com.cn", "宁波地产网"); - SOURCE_MAP.put("ihoome.com", "爱家网"); - SOURCE_MAP.put("xafc.com", "新安写字楼"); - SOURCE_MAP.put("365jia.cn", "万家房产"); - SOURCE_MAP.put("sydcw.net", "合肥商业地产网"); - SOURCE_MAP.put("hfhome.cn", "合肥家园网"); - SOURCE_MAP.put("haoju.cn", "好居"); - SOURCE_MAP.put("for2000.com", "南昌写字楼网"); - SOURCE_MAP.put("lfang.com", "爱房网"); - SOURCE_MAP.put("5y365.com", "无忧365购房网"); - SOURCE_MAP.put("0731.cn", "长株潭房产网"); - SOURCE_MAP.put("changsha.cn", "长沙房产网"); - SOURCE_MAP.put("xf88.com", "湘房网"); - SOURCE_MAP.put("5j99.com", "新环境房屋"); - SOURCE_MAP.put("fangle.com", "房乐网"); - SOURCE_MAP.put("cztzy.com", "长株潭置业"); - SOURCE_MAP.put("changchunfangdichan.com", "长春房地产网"); - SOURCE_MAP.put("365jilin.com", "吉和房产"); - SOURCE_MAP.put("kanfangji.com", "看房网"); - SOURCE_MAP.put("gzre.com", "贵阳房地产交易网"); - SOURCE_MAP.put("ythouse.com", "烟台房地产网"); - SOURCE_MAP.put("house-yt.com", "烟台房产在线"); - SOURCE_MAP.put("hiao.com", "烟台好网"); - SOURCE_MAP.put("fcdbz.com", "房产大巴扎"); - SOURCE_MAP.put("xjfangwu.com", "新疆房屋网"); - SOURCE_MAP.put("gshouse.com", "甘房网"); - SOURCE_MAP.put("lejiazhiye.cn", "乐家房产网"); - SOURCE_MAP.put("jufang.cc", "海西聚房网"); - SOURCE_MAP.put("qzfc.com", "大泉州房产网"); - SOURCE_MAP.put("0471fcw.com", "0471房产网"); - SOURCE_MAP.put("365hf.com", "呼和浩特房地产网"); - SOURCE_MAP.put("fooju.com.cn", "福居网"); - SOURCE_MAP.put("nmgfc.cn", "内蒙古房地产"); - SOURCE_MAP.put("577house.com", "温州房产热线"); - SOURCE_MAP.put("ntfdc.net", "南通房产信息网"); - SOURCE_MAP.put("nthfw.com", "好房网nthfw"); - SOURCE_MAP.put("nthaohe.com", "濠河网"); - SOURCE_MAP.put("xfzc.com", "寻房之窗"); - SOURCE_MAP.put("86516.com", "彭城视窗"); - SOURCE_MAP.put("52fdc.com", "52房地产网"); - SOURCE_MAP.put("xz21th.com", "21世纪房屋置换"); - SOURCE_MAP.put("pcls.com.cn", "彭城楼市网"); - SOURCE_MAP.put("xzloushi.cn", "徐州楼市"); - SOURCE_MAP.put("jilinfc.com", "房产之家"); - SOURCE_MAP.put("sydcw.net", "吉林商业地产"); - SOURCE_MAP.put("jlmaifang.com", "吉林买房"); - SOURCE_MAP.put("dianping.com", "大众点评"); - SOURCE_MAP.put("0772fang.com", "柳房网"); - SOURCE_MAP.put("ljia.net", "恋家网"); - SOURCE_MAP.put("whhouse.com", "威海房地产网"); - SOURCE_MAP.put("yzfdc.cn", "扬州房地产信息网"); - SOURCE_MAP.put("yzfdcw.com", "扬州房产网"); - SOURCE_MAP.put("yz2shou.com", "扬州二手网"); - SOURCE_MAP.put("my0511.com", "镇江房产网"); - SOURCE_MAP.put("anjia8.com", "安家吧"); - SOURCE_MAP.put("jsw.com.cn", "镇江第一房产网"); - SOURCE_MAP.put("zjgfw.com", "镇江购房网"); - SOURCE_MAP.put("ycfcw.com", "盐城房产网ycfcw"); - SOURCE_MAP.put("ychouse.com", "盐城房产信息网"); - SOURCE_MAP.put("0515house.cn", "盐城第一房产网"); - SOURCE_MAP.put("yfcw.cn/", "盐城房产网yfcw"); - SOURCE_MAP.put("ejcs.com.cn", "宜居城市"); - SOURCE_MAP.put("fclm.cn", "房产联盟"); - SOURCE_MAP.put("0573ren.com", "嘉兴人房产"); - SOURCE_MAP.put("0579.cn", "浙中在线"); - SOURCE_MAP.put("zz.cc", "郑州房产网_zz"); - SOURCE_MAP.put("haofung.com", "好房网haofung"); - SOURCE_MAP.put("fanging.com", "平顶山房产网"); - SOURCE_MAP.put("ahhouse.com", "安房网"); - SOURCE_MAP.put("zgsof.com", "自贡搜房网"); - SOURCE_MAP.put("tsloushi.com", "唐山楼市网"); - SOURCE_MAP.put("csfcw.com", "常熟房产网"); - SOURCE_MAP.put("jscsfc.com", "常熟透明售房网"); - SOURCE_MAP.put("wjhouse.com", "吴江房产家居网"); - SOURCE_MAP.put("xhdch.com", "新恒迪商业地产"); - SOURCE_MAP.put("enorth.com.cn", "北方网"); - SOURCE_MAP.put("962013.com", "苏房网"); - SOURCE_MAP.put("gsfcw.com", "姑苏房产网"); - SOURCE_MAP.put("kunshan0512.com", "昆山地产网"); - SOURCE_MAP.put("js.cn", "昆山房产网"); - SOURCE_MAP.put("szhome.com", "深圳商业地产"); - SOURCE_MAP.put("efw.cn", "e房网"); - SOURCE_MAP.put("5asydc.com", "商业地产网"); - SOURCE_MAP.put("zjol.com.cn/", "住在杭州网"); - SOURCE_MAP.put("365jia.cn", "万家热线"); - SOURCE_MAP.put("fdc.com.cn", "亿房"); - SOURCE_MAP.put("jxdcw.com", "江西地产网"); - SOURCE_MAP.put("xkhouse.com", "星空地产网"); - SOURCE_MAP.put("fangyuan365.com", "长沙365房产网"); - SOURCE_MAP.put("hfhouse.com", "合肥房地产交易信息网"); - SOURCE_MAP.put("ccgoufang.com", "购房网ccgoufang"); - SOURCE_MAP.put("soufang365.com", "龙江搜房"); - SOURCE_MAP.put("99.com.cn", "99健康网"); - SOURCE_MAP.put("yynet.cn", "医元网"); - SOURCE_MAP.put("sdfdc.com", "山房"); - SOURCE_MAP.put("jnfdc.gov.cn", "济南住宅与房地产信息网"); - SOURCE_MAP.put("iqilu.com", "齐鲁网"); - SOURCE_MAP.put("sdchina.com", "中国山东网"); - SOURCE_MAP.put("familydoctor.com.cn", "家庭医生在线"); - SOURCE_MAP.put("lanfw.com", "蓝房网"); - SOURCE_MAP.put("changchunfangdichan.com", "长春房地产网"); - SOURCE_MAP.put("ythouse.com", "烟台房地产网"); - SOURCE_MAP.put("jiaodong.net", "胶东房产网"); - SOURCE_MAP.put("shm.com.cn", "水母房产"); - SOURCE_MAP.put("yantai.hiao.com", "烟台好房"); - SOURCE_MAP.put("xjfangwu.com", "新疆房屋网"); - SOURCE_MAP.put("xjfc.com.cn", "乌鲁木齐房产网"); - SOURCE_MAP.put("fcdbz.com", "房产大巴扎"); - SOURCE_MAP.put("xjhouse.cn", "新疆房产网xjhouse"); - SOURCE_MAP.put("jefun.cn", "甘房网"); - SOURCE_MAP.put("xmfc.com", "厦门房产网"); - SOURCE_MAP.put("xmhouse.com", "厦门房地产联合网"); - SOURCE_MAP.put("ffw.com.cn", "福房网"); - SOURCE_MAP.put("sun0769.com", "阳光房产网"); - SOURCE_MAP.put("dg163.cn", "东莞房地产网"); - SOURCE_MAP.put("home77.com", "房讯网"); - SOURCE_MAP.put("qfang.com", "Q房网"); - SOURCE_MAP.put("fssydc.com", "佛山商业地产网"); - SOURCE_MAP.put("95191.com", "楼市通"); - SOURCE_MAP.put("longcity.net", "住在龙城"); - SOURCE_MAP.put("52youju.com", "优居网"); - SOURCE_MAP.put("inhe.cn", "银河房产网"); - SOURCE_MAP.put("shdc.org.cn", "医联网"); - SOURCE_MAP.put("haodf.com", "好大夫在线"); - SOURCE_MAP.put("sohu.com", "搜狐健康"); - SOURCE_MAP.put("39.net", "就医助手"); - SOURCE_MAP.put("zhijia.com", "置家网"); - SOURCE_MAP.put("kunming.cn", "昆明信息港"); - SOURCE_MAP.put("kmfcw.com", "昆明房产网"); - SOURCE_MAP.put("qzfc.com", "大泉州房产网"); - SOURCE_MAP.put("jufang.cc", "海西聚房网"); - SOURCE_MAP.put("qingkai.com", "青岛开发区信息港"); - SOURCE_MAP.put("qingdaonews.com", "青岛新闻网"); - SOURCE_MAP.put("51fdc.com", "无忧房网"); - SOURCE_MAP.put("qdfd.com.cn", "青岛网上房地产"); - SOURCE_MAP.put("365hf.com", "呼和浩特房地产网"); - SOURCE_MAP.put("fooju.com.cn", "福居网"); - SOURCE_MAP.put("0471fcw.com", "0471房产网"); - SOURCE_MAP.put("0577home.net", "温州房网"); - SOURCE_MAP.put("0577wzlf.com", "温州蓝房网"); - SOURCE_MAP.put("sky008.com", "天空房产网"); - SOURCE_MAP.put("nthaohe.com", "濠河网"); - SOURCE_MAP.put("0513.org", "濠滨房产"); - SOURCE_MAP.put("nthfw.com", "好房网"); - SOURCE_MAP.put("ntfdc.net", "南通房产信息网"); - SOURCE_MAP.put("1f.cn", "易房"); - SOURCE_MAP.put("fangle.com", "房乐网"); - SOURCE_MAP.put("xfzc.com", "寻房之窗"); - SOURCE_MAP.put("86516.com", "彭城视窗"); - SOURCE_MAP.put("52fdc.com", "52房地产"); - SOURCE_MAP.put("pcls.com.cn", "彭城楼市网"); - SOURCE_MAP.put("xzloushi.cn", "徐州楼市"); - SOURCE_MAP.put("xnfcsc.com", "西宁房产市场网"); - SOURCE_MAP.put("0971fc.com", "西房网"); - SOURCE_MAP.put("xiadu.com", "夏都网"); - SOURCE_MAP.put("nxfang.com", "宁夏房网"); - SOURCE_MAP.put("nxsq.com", "宁夏仕奇房产网"); - SOURCE_MAP.put("haofung.com", "好房网haofung"); - SOURCE_MAP.put("haofang.net", "好房在线"); - SOURCE_MAP.put("hinews.cn", "南海网"); - SOURCE_MAP.put("hkfdcw.com", "海口房地产网"); - SOURCE_MAP.put("wokanfang.com", "看房网"); - SOURCE_MAP.put("wofang.com", "我房网"); - SOURCE_MAP.put("wftzfc.com", "潍坊天泽房产网"); - SOURCE_MAP.put("wffdc.com", "山东房地产网"); - SOURCE_MAP.put("zyloushi.com", "中原楼市"); - SOURCE_MAP.put("lyloushi.com", "洛阳楼市"); - SOURCE_MAP.put("bleju.com", "百乐居"); - SOURCE_MAP.put("0379city.com", "洛城房产"); - SOURCE_MAP.put("zbsydc.com", "淄博商业地产网"); - SOURCE_MAP.put("hellozb.com", "淄房网"); - SOURCE_MAP.put("zbhouse.cn", "淄博房产网"); - SOURCE_MAP.put("zbzzfdc.gov.cn", "淄博住宅与房地产信息网"); - SOURCE_MAP.put("0575ls.cn", "绍兴楼市网"); - SOURCE_MAP.put("sxhouse.cn", "绍兴房产网"); - SOURCE_MAP.put("tzlsw.cn", "台州楼市网"); - SOURCE_MAP.put("tzeju.com", "台州易居网"); - SOURCE_MAP.put("fc0576.com", "台州房产网"); - SOURCE_MAP.put("tzfy.cn", "台州房源网"); - SOURCE_MAP.put("haofang365.com", "好房365"); - SOURCE_MAP.put("zhland.com", "珠海房产网"); - SOURCE_MAP.put("house10000.com", "中山万房网"); - SOURCE_MAP.put("zsnews.cn", "中山网"); - SOURCE_MAP.put("0760dc.com", "中山房产网"); - SOURCE_MAP.put("0772fang.com", "柳房网"); - SOURCE_MAP.put("zp365.com", "住朋网"); - SOURCE_MAP.put("0754fw.com", "汕头房网"); - SOURCE_MAP.put("tt5598.com", "汕头雅居网"); - SOURCE_MAP.put("wolai.com", "我来房产"); - SOURCE_MAP.put("bdinfo.net", "互动房缘"); - SOURCE_MAP.put("3650310.net", "房产楼市"); - SOURCE_MAP.put("weihaifc.net", "威海房产网"); - SOURCE_MAP.put("venfang.com", "问房网"); - SOURCE_MAP.put("iweihai.cn", "爱威海"); - SOURCE_MAP.put("veryhome.com", "威海房地产网"); - SOURCE_MAP.put("whhouse.com.cn", "威海房信网"); - SOURCE_MAP.put("whinfo.net.cn", "威海信息港"); - SOURCE_MAP.put("0572hu.com", "住在湖州网"); - SOURCE_MAP.put("nantaihu.com", "南太湖房产"); - SOURCE_MAP.put("hz66.com", "湖州在线"); - SOURCE_MAP.put("hutaihu.com", "太湖网"); - SOURCE_MAP.put("yzfc.cn", "扬房网"); - SOURCE_MAP.put("yzkdfcw.com", "扬州宽带房产网"); - SOURCE_MAP.put("yzjia.com", "扬州家园"); - SOURCE_MAP.put("yzfyw.com", "扬州房源网"); - SOURCE_MAP.put("yzfdc.cn", "扬州房地产信息网"); - SOURCE_MAP.put("yzfdcw.com", "扬州房产网"); - SOURCE_MAP.put("jsw.com.cn", "镇江第一房产网"); - SOURCE_MAP.put("zjgfw.com", "镇江购房网"); - SOURCE_MAP.put("anjia8.com", "安家吧"); - SOURCE_MAP.put("goufw.com", "GO房网"); - SOURCE_MAP.put("ycfcw.com", "盐城房产网"); - SOURCE_MAP.put("ycfczx.com", "盐城房产咨询网"); - SOURCE_MAP.put("0515house.cn", "盐城第一房产网"); - SOURCE_MAP.put("ycmfw.com", "盐城买房网"); - SOURCE_MAP.put("fclm.cn", "房产联盟"); - SOURCE_MAP.put("0573ren.com", "嘉兴人房产"); - SOURCE_MAP.put("cnjxol.com", "嘉兴在线"); - SOURCE_MAP.put("yijuhome.com", "宜居家园"); - SOURCE_MAP.put("0579zf.com", "金华找房网"); - SOURCE_MAP.put("0579fw.com", "金华房网"); - SOURCE_MAP.put("0579fang.com", "金华房产网"); - SOURCE_MAP.put("tzfdc.com.cn", "泰州房地产信息网"); - SOURCE_MAP.put("t56.net", "泰无聊房产网"); - SOURCE_MAP.put("fj360.com", "房集网"); - SOURCE_MAP.put("ufang.com", "U房网"); - SOURCE_MAP.put("fz0752.com", "惠民之家"); - SOURCE_MAP.put("szhome.com", "新房在线"); - SOURCE_MAP.put("hzcom.cn", "惠州房产"); - SOURCE_MAP.put("0750fw.com", "江门房网"); - SOURCE_MAP.put("gohome114.com", "房产联盟gohome114"); - SOURCE_MAP.put("0731fdc.com", "0731房产网"); - SOURCE_MAP.put("xf88.com", "湘房网"); - SOURCE_MAP.put("zzzye.com/", "株洲置业"); - SOURCE_MAP.put("hi0734.com", "你好衡阳网"); - SOURCE_MAP.put("hyfdcw.com", "衡阳房地产信息网"); - SOURCE_MAP.put("hejia.tv", "合家网"); - SOURCE_MAP.put("pdshouse.com", "平顶山房产"); - SOURCE_MAP.put("pdsloushi.com", "平顶山楼市"); - SOURCE_MAP.put("liaoing.com", "聊宅网"); - SOURCE_MAP.put("douanju.com", "都安居"); - SOURCE_MAP.put("9ilou.com", "赣州爱楼帮"); - SOURCE_MAP.put("jjxwfc.com", "大九江房产网"); - SOURCE_MAP.put("lfang.com", "爱房网"); - SOURCE_MAP.put("zzjjw.cn", "住在九江"); - SOURCE_MAP.put("ahhouse.com", "安房网"); - SOURCE_MAP.put("mytaofang.com", "淘房家居网"); - SOURCE_MAP.put("mychefang.com", "车房网"); - SOURCE_MAP.put("mdjhouse.com", "牡丹江房产网"); - SOURCE_MAP.put("iwu123.com", "爱屋网"); - SOURCE_MAP.put("masff.com", "房房网"); - SOURCE_MAP.put("0555yi.com", "易房网"); - SOURCE_MAP.put("gdmmfdc.com", "茂名房地产信息网"); - SOURCE_MAP.put("ylw0813.com", "盐龙网"); - SOURCE_MAP.put("zg163.net", "自贡房地产"); - SOURCE_MAP.put("0570fc.com", "衢州房产网"); - SOURCE_MAP.put("qzfdc.com", "衢州房地产网"); - SOURCE_MAP.put("qz123.com", "衢州房产频道"); - SOURCE_MAP.put("0316.cc", "廊房网"); - SOURCE_MAP.put("lfang.cn", "第一房产网"); - SOURCE_MAP.put("xtfconline.com", "湘潭房产在线"); - SOURCE_MAP.put("0731.cn", "长株潭房产网"); - SOURCE_MAP.put("fun114.com", "湘潭房产网"); - SOURCE_MAP.put("haofz.com", "好房子"); - SOURCE_MAP.put("3qhouse.com", "三秦房产网"); - SOURCE_MAP.put("800j.com.cn", "八百家"); - SOURCE_MAP.put("0744fz.com", "张家界买房网"); - SOURCE_MAP.put("sqanju.com", "安居网"); - SOURCE_MAP.put("xiangyu.cc", "项羽房产网"); - SOURCE_MAP.put("sqfcw.com.cn", "西楚房产网"); - SOURCE_MAP.put("sqfcw.cc", "宿迁房产网"); - SOURCE_MAP.put("xiangyang.net", "百腾热线"); - SOURCE_MAP.put("xyfc.com", "襄阳房产"); - SOURCE_MAP.put("xfsfc.com.cn", "襄阳住宅与房地产信息网"); - SOURCE_MAP.put("0710hf.com", "襄阳好房网"); - SOURCE_MAP.put("tsloushi.com", "唐山楼市网"); - SOURCE_MAP.put("tangrenju.net", "唐人居"); - SOURCE_MAP.put("tsfcxx.com", "唐山房产信息网"); - SOURCE_MAP.put("0775fcw.com", "玉林房产网"); - SOURCE_MAP.put("http://ylfct.com/", "玉林房地产信息网"); - SOURCE_MAP.put("fangyuan365.com", "张家界365房产网"); - SOURCE_MAP.put("syfff.com", "三亚地产信息网"); - SOURCE_MAP.put("fhainan.com", "海南购房网"); - SOURCE_MAP.put("lpslzl.com", "六盘水联众力房产网"); - SOURCE_MAP.put("0831f.com", "宜房网"); - SOURCE_MAP.put("hiputian.com", "莆田新城房产"); - SOURCE_MAP.put("pzhls.com", "攀枝花楼市网"); - SOURCE_MAP.put("77949.com", "北海安家网"); - SOURCE_MAP.put("beihaidc.com", "北海房地产交易网"); - SOURCE_MAP.put("lesohome.com", "乐搜房产网"); - SOURCE_MAP.put("5khouse.com", "看房网5khouse"); - SOURCE_MAP.put("ycls.cn", "虞城楼市"); - SOURCE_MAP.put("jscsfc.com", "常熟透明售房网"); - SOURCE_MAP.put("lifang100.com", "荔房网"); - SOURCE_MAP.put("funxoo.com", "房秀网"); - SOURCE_MAP.put("wjls.com.cn", "吴江楼市网"); - SOURCE_MAP.put("wjfcw.com", "吴江房产网"); - SOURCE_MAP.put("yxhouse.net", "宜兴房产网"); - SOURCE_MAP.put("tdfcw.com", "陶都房产网"); - SOURCE_MAP.put("yxfc.cc", "宜兴房产网yxfc"); - SOURCE_MAP.put("0372.cn", "安阳信息网"); - SOURCE_MAP.put("ayfcw.com", "安阳房产网"); - SOURCE_MAP.put("0372fdc.com", "安阳房地产网"); - SOURCE_MAP.put("ayloushi.com", "安阳楼市"); - SOURCE_MAP.put("ljia.net", "恋家网"); - SOURCE_MAP.put("houseyw.com", "香居房产"); - SOURCE_MAP.put("ynhouse.com", "云南房网"); - SOURCE_MAP.put("373f.com/", "新乡信息港"); - SOURCE_MAP.put("xxgfw.cn", "新乡购房网"); - SOURCE_MAP.put("0768fcw.com", "潮州房产网"); - SOURCE_MAP.put("0762home.com", "河源房产信息网"); - SOURCE_MAP.put("076299.cn", "九九房产网"); - SOURCE_MAP.put("fs0762.com", "房视网"); - SOURCE_MAP.put("u0762.com", "河源优房网"); - SOURCE_MAP.put("0391fc.cn", "焦作房产网"); - SOURCE_MAP.put("jzloushi.com", "焦作楼市"); - SOURCE_MAP.put("fangzhanhui.com", "房展汇"); - SOURCE_MAP.put("ff1.com.cn", "第一房网"); - SOURCE_MAP.put("ksedu.cn", "昆山教育"); - SOURCE_MAP.put("chinawuxi.gov.cn", "无锡市教育局"); - SOURCE_MAP.put("nbedu.gov.cn", "宁波教科网"); - SOURCE_MAP.put("nbedu.net.cn", "宁波市学校信息资源库"); - SOURCE_MAP.put("nb06edu.com", "宁波学前教育网"); - SOURCE_MAP.put("hfjy.net.cn", "合肥教育信息网"); - SOURCE_MAP.put("ahzsks.cn", "安徽省教育招生考试院"); - SOURCE_MAP.put("huaue.com", "华禹教育网"); - SOURCE_MAP.put("jxedu.gov.cn", "江西教育网"); - SOURCE_MAP.put("nc.gov.cn", "中国南昌"); - SOURCE_MAP.put("changsha.gov.cn", "中国长沙"); - SOURCE_MAP.put("ccedin.net", "长春教育网"); - SOURCE_MAP.put("ccnews.gov.cn", "长春新闻网"); - SOURCE_MAP.put("gysjyw.gov.cn", "贵阳教育信息网"); - SOURCE_MAP.put("ytedu.cn", "烟台教育"); - SOURCE_MAP.put("xxzs.org", "高考招生信息港"); - SOURCE_MAP.put("urumqi.gov.cn", "乌鲁木齐之窗"); - SOURCE_MAP.put("fjqz.gov.cn", "中国泉州"); - SOURCE_MAP.put("wenzhou.gov.cn", "中国温州"); - SOURCE_MAP.put("nantong.gov.cn", "南通教育"); - SOURCE_MAP.put("jse.gov.cn", "江苏教育"); - SOURCE_MAP.put("zjol.com.cn", "浙江省医院预约诊疗服务平台"); - SOURCE_MAP.put("a-hospital.com", "医学百科"); - SOURCE_MAP.put("ycjyzk.com", "银川教育招生考试网"); - SOURCE_MAP.put("xqq.gov.cn", "兴庆区政府"); - SOURCE_MAP.put("czedu.gov.cn", "常州教育"); - SOURCE_MAP.put("haikou.gov.cn", "海口政府"); - SOURCE_MAP.put("wfjyw.net", "潍坊教育网"); - SOURCE_MAP.put("weifang.gov.cn", "中国潍坊"); - SOURCE_MAP.put("lyenet.org", "洛阳教育城域网"); - SOURCE_MAP.put("ly.gov.cn", "中国洛阳"); - SOURCE_MAP.put("zibo.gov.cn", "淄博市人民政府"); - SOURCE_MAP.put("sxsedu.net", "绍兴教育网"); - SOURCE_MAP.put("zjtz.gov.cn", "台州"); - SOURCE_MAP.put("daqing.gov.cn", "中国大庆"); - SOURCE_MAP.put("asit.gov.cn", "中国鞍山"); - SOURCE_MAP.put("zhuhai.gov.cn", "中国珠海"); - SOURCE_MAP.put("doule.org", "柳州教育"); - SOURCE_MAP.put("stedu.net", "汕头教育信息网"); - SOURCE_MAP.put("shantou.gov.cn", "汕头市政府"); - SOURCE_MAP.put("bbshouse.com", "楼视界"); - SOURCE_MAP.put("zsxxg.com", "舟山信息港"); - SOURCE_MAP.put("hdjy.net.cn", "邯郸市教育局"); - SOURCE_MAP.put("qhdedu.cn", "秦皇岛教育"); - SOURCE_MAP.put("whedu21.com", "威海市教育局"); - SOURCE_MAP.put("yangzhou.gov.cn", "中国扬州"); - SOURCE_MAP.put("zhenjiang.gov.cn", "中国镇江"); - SOURCE_MAP.put("yce.cn", "盐城教育"); - SOURCE_MAP.put("jxedu.net.cn", "嘉兴教育"); - SOURCE_MAP.put("fang99.com", "西安房管局"); - SOURCE_MAP.put("028028.net", "成都房产超市网"); - SOURCE_MAP.put("taizhou.gov.cn", "台州市政府"); - SOURCE_MAP.put("gledu.cn", "桂林教育信息网"); - SOURCE_MAP.put("house365.com", "365地产家居网"); - SOURCE_MAP.put("zhanjiang.gov.cn", "中国湛江"); - SOURCE_MAP.put("jiangmen.gov.cn", "中国江门"); - SOURCE_MAP.put("zhuzhou.gov.cn", "中国株洲"); - SOURCE_MAP.put("hengyang.gov.cn", "中国衡阳"); - SOURCE_MAP.put("e21.cn", "宜昌教育"); - SOURCE_MAP.put("yichang.gov.cn", "中国宜昌"); - SOURCE_MAP.put("pds.gov.cn", "平顶山人民政府"); - SOURCE_MAP.put("ganzhou.gov.cn", "赣州市人民政府"); - SOURCE_MAP.put("jiujiang.gov.cn", "中国九江"); - SOURCE_MAP.put("my.gov.cn", "中国绵阳"); - SOURCE_MAP.put("mdjedu.net", "牡丹江教育网"); - SOURCE_MAP.put("bxjyw.com", "本溪教育网"); - SOURCE_MAP.put("mas.gov.cn", "中国马鞍山"); - SOURCE_MAP.put("mmjynet.com", "茂名教育信息网"); - SOURCE_MAP.put("jieyang.gov.cn", "中国揭阳"); - SOURCE_MAP.put("focus.cn", "搜狐焦点"); - SOURCE_MAP.put("nanning.gov.cn", "中国南宁"); - SOURCE_MAP.put("qzedu.net", "衢州教育"); - SOURCE_MAP.put("xiangtan.gov.cn", "中国湘潭"); - SOURCE_MAP.put("yangjiang.gov.cn", "中国阳江"); - SOURCE_MAP.put("loupan.com", "楼盘网"); - SOURCE_MAP.put("zjj.gov.cn", "中国张家界"); - SOURCE_MAP.put("cq.gov.cn", "重庆市渝北区人民政府"); - SOURCE_MAP.put("cqyz.gov.cn", "重庆市渝中区人民政府"); - SOURCE_MAP.put("ddk.gov.cn", "重庆市大渡口区人民政府"); - SOURCE_MAP.put("cq.gov.cn", "江北区人民政府"); - SOURCE_MAP.put("cq.gov.cn", "沙坪坝区人民政府"); - SOURCE_MAP.put("cq.gov.cn", "九龙坡区人民政府"); - SOURCE_MAP.put("beibei.gov.cn", "北碚区人民政府"); - SOURCE_MAP.put("cq.gov.cn", "万盛经济技术开发区"); - SOURCE_MAP.put("cq.gov.cn", "渝北区人民政府"); - SOURCE_MAP.put("cq.gov.cn", "巴南区人民政府"); - SOURCE_MAP.put("cq.gov.cn", "长寿区人民政府"); - SOURCE_MAP.put("hc.gov.cn", "合川区人民政府"); - SOURCE_MAP.put("cq.gov.cn", "永川区人民政府"); - SOURCE_MAP.put("cqqj.gov.cn", "綦江区人民政府"); - SOURCE_MAP.put("cq.gov.cn", "潼南县人民政府"); - SOURCE_MAP.put("dazu.gov.cn", "中国大足"); - SOURCE_MAP.put("yndali.gov.cn", "中国大理"); - SOURCE_MAP.put("suqian.gov.cn", "网上宿迁"); - SOURCE_MAP.put("xf.gov.cn", "中国襄阳"); - SOURCE_MAP.put("tangshan.gov.cn", "中国唐山"); - SOURCE_MAP.put("sanya.gov.cn", "中国三亚"); - SOURCE_MAP.put("gzlps.gov.cn", "中国凉都六盘水"); - SOURCE_MAP.put("yibin.gov.cn", "宜宾市人民政府"); - SOURCE_MAP.put("putian.gov.cn", "中国莆田"); - SOURCE_MAP.put("panzhihua.gov.cn", "攀枝花公众信息网"); - SOURCE_MAP.put("yuxi.gov.cn", "玉溪市人民政府"); - SOURCE_MAP.put("yunfu.gov.cn", "中国云浮"); - SOURCE_MAP.put("changshu.gov.cn", "中国常熟"); - SOURCE_MAP.put("zengcheng.gov.cn", "中国广州增城"); - SOURCE_MAP.put("ruian.gov.cn", "中国瑞安"); - SOURCE_MAP.put("yueqing.gov.cn", "中国乐清"); - SOURCE_MAP.put("ningbo.gov.cn", "慈溪政府网"); - SOURCE_MAP.put("ningbo.gov.cn", "中国宁海"); - SOURCE_MAP.put("fh.gov.cn", "中国奉化"); - SOURCE_MAP.put("yy.gov.cn", "中国余姚"); - SOURCE_MAP.put("wl.gov.cn", "中国温岭"); - SOURCE_MAP.put("yixing.gov.cn", "中国宜兴"); - SOURCE_MAP.put("zhaoqing.gov.cn", "肇庆市人民政府"); - SOURCE_MAP.put("yw.gov.cn", "中国义乌"); - SOURCE_MAP.put("xxjy.gov.cn", "新乡市教育局"); - SOURCE_MAP.put("chaozhou.gov.cn", "中国潮州政府"); - SOURCE_MAP.put("huangshi.gov.cn", "黄石市人民政府"); - SOURCE_MAP.put("sjz.gov.cn", "中国石家庄(学前)"); - SOURCE_MAP.put("sjz.gov.cn", "中国石家庄(小学)"); - SOURCE_MAP.put("sjz.gov.cn", "中国石家庄(中学)"); - SOURCE_MAP.put("sjz.gov.cn", "中国石家庄(高中)"); - SOURCE_MAP.put("km.gov.cn", "中国昆明"); - SOURCE_MAP.put("nxnews.net", "宁夏教育网"); - SOURCE_MAP.put("hainan.gov.cn", "海南省人民政府"); - SOURCE_MAP.put("yipu.com.cn", "易铺网"); - SOURCE_MAP.put("163.com", "网易房产"); - SOURCE_MAP.put("fang99.com", "房屋管理服务网"); - SOURCE_MAP.put("focus.cn", "搜狐焦点"); - SOURCE_MAP.put("fangtoo.com", "房途网"); - SOURCE_MAP.put("cnbb.com.cn", "互联天地房产网"); - SOURCE_MAP.put("sxhouse.com.cn", "绍兴房产官方门户"); - SOURCE_MAP.put("gz.cc", "广州房产网"); - SOURCE_MAP.put("hz66.com", "湖州在线"); - SOURCE_MAP.put("fcxxw.com", "房产信息网_fcxxw"); - SOURCE_MAP.put("0579fw.com", "金华房网"); - SOURCE_MAP.put("qz123.com", "衢州信息港"); - SOURCE_MAP.put("koofang.com", "酷房网"); - SOURCE_MAP.put("daikan.cn", "带看"); - SOURCE_MAP.put("hutaihu.com", "太湖网"); - SOURCE_MAP.put("sxol.com", "绍兴房产在线"); - SOURCE_MAP.put("berui.com", "百瑞地产家居网"); - SOURCE_MAP.put("allfang.com", "全房"); - SOURCE_MAP.put("fangjee.com", "房集"); - SOURCE_MAP.put("wolai.com", "我来房产"); - SOURCE_MAP.put("ihk.cn", "房王"); - SOURCE_MAP.put("anhuinews.com", "中安房产网"); - SOURCE_MAP.put("zsxxg.com", "舟山信息港"); - SOURCE_MAP.put("wzfg.com", "温州房产市场信息"); - SOURCE_MAP.put("cnnbfdc.com", "宁波住宅与房产网"); - SOURCE_MAP.put("qq.com", "腾讯"); - SOURCE_MAP.put("028f.com", "成房网"); - SOURCE_MAP.put("mfmf100.com", "ESE百悦大通"); - SOURCE_MAP.put("szfmall.com", "苏州团房网"); - SOURCE_MAP.put("962013.com", "苏房网"); - SOURCE_MAP.put("fyhouse.net", "阜阳房地产信息网"); - SOURCE_MAP.put("0452m.com", "齐齐哈尔房产网"); - SOURCE_MAP.put("lsfun.com", "丽水房产信息网"); - SOURCE_MAP.put("0452sh.com", "齐齐哈尔生活网"); - SOURCE_MAP.put("hzfjw.com", "汉中房产交易资讯网"); - SOURCE_MAP.put("0839fc.com", "广元房产网"); - SOURCE_MAP.put("0932fdc.com", "定西房产网"); - SOURCE_MAP.put("zunyifang.cn", "遵义房产网zunyifang"); - SOURCE_MAP.put("zxfc.cn", "置信房产"); - SOURCE_MAP.put("0454.com", "佳木斯三江网"); - SOURCE_MAP.put("hsjsfc.com", "黄山精盛房产"); - SOURCE_MAP.put("yangzhou.gov.cn", "扬州房管局"); - SOURCE_MAP.put("k0410.com", "看铁岭"); - SOURCE_MAP.put("tlxxb.com", "铁岭信息板"); - SOURCE_MAP.put("leju.com", "乐居购房网"); - SOURCE_MAP.put("tljs.gov.cn", "铁岭住房建设"); - SOURCE_MAP.put("0538fcw.com", "泰安房产交易中心"); - SOURCE_MAP.put("tainfo.net", "泰安信息港"); - SOURCE_MAP.put("taian.com", "泰安网房产"); - SOURCE_MAP.put("tc917.com", "泰安房产"); - SOURCE_MAP.put("taianhome.com", "泰安房产网"); - SOURCE_MAP.put("idc2008.com.cn", "泰安房产网tafc"); - SOURCE_MAP.put("tanhyjy.com", "壹加壹房产网"); - SOURCE_MAP.put("thmzfc.com", "明珠房产网"); - SOURCE_MAP.put("tianshui.gov.cn", "天水市房管局"); - SOURCE_MAP.put("tsfcjy.com", "天水房产交易登记网"); - SOURCE_MAP.put("tianshuiinfo.cn", "天水信息网"); - SOURCE_MAP.put("zhantai.com", "站台网"); - SOURCE_MAP.put("730fc.com", "岳阳房产网"); - SOURCE_MAP.put("0730r.com", "爱家房产网"); - SOURCE_MAP.put("fangchan0455.com", "绥化恋家房产"); - SOURCE_MAP.put("bt160.com", "包头房产网bt160"); - SOURCE_MAP.put("baotf.cn", "包头房产网baotf"); - SOURCE_MAP.put("8720000.com.cn", "绥化佳家房产"); - SOURCE_MAP.put("shhomeland.com", "绥化家园网"); - SOURCE_MAP.put("cnsuihua.net", "绥化信息港"); - SOURCE_MAP.put("qzfcw.com", "钦州房产网"); - SOURCE_MAP.put("wdfc.com.cn", "维度房产网"); - SOURCE_MAP.put("fcxgx.com", "房产新干线"); - SOURCE_MAP.put("0952fdc.com", "石嘴山房产网"); - SOURCE_MAP.put("0475.cn", "通辽信息网"); - SOURCE_MAP.put("fx8888.com", "华博网"); - SOURCE_MAP.put("114chn.com", "114生活网"); - SOURCE_MAP.put("0319f.com", "刑房网"); - SOURCE_MAP.put("ggfdc.com", "贵港房地产网"); - SOURCE_MAP.put("0557100.com", "宿州在线"); - SOURCE_MAP.put("sddzz.com", "枣庄视窗"); - SOURCE_MAP.put("zyfgj.cn", "资阳房管局"); - SOURCE_MAP.put("bsfw.cn", "保山房网"); - SOURCE_MAP.put("msfc114.com", "眉山淘房网"); - SOURCE_MAP.put("07358.com", "郴房网"); - SOURCE_MAP.put("dy6c.com", "德阳6城网"); - SOURCE_MAP.put("gafcw.cn", "广安房产网"); - SOURCE_MAP.put("0826fang.com", "广安房产网0826fang"); - SOURCE_MAP.put("gafc8.cn", "租房吧"); - SOURCE_MAP.put("zmdfcw.com", "驻马店房产网"); - SOURCE_MAP.put("beiww.com", "北纬网"); - SOURCE_MAP.put("yaanjq.com", "金桥房介网"); - SOURCE_MAP.put("anjia8.com", "安家吧"); - SOURCE_MAP.put("my0511.com", "镇江房产网"); - SOURCE_MAP.put("goufw.com", "GO房网"); - SOURCE_MAP.put("huaian.com", "淮安房产网"); - SOURCE_MAP.put("hezefc.com", "菏泽房产网"); - SOURCE_MAP.put("0932fdc.com", "定西房产网"); - SOURCE_MAP.put("dzcnc.com", "鲁北房产"); - SOURCE_MAP.put("0439.com", "白山在线"); - SOURCE_MAP.put("zmdfcxx.com", "驻马店房产信息网"); + SOURCE_MAP.put("0314fdc.com", "鎵挎埧缃�"); + SOURCE_MAP.put("lejiazhiye.cn", "涔愬鎴夸骇缃�"); + SOURCE_MAP.put("jmfc.com.cn", "鑽嗛棬鎴夸骇鐑嚎"); + SOURCE_MAP.put("e0838.com", "浣忓湪寰烽槼缃�"); + SOURCE_MAP.put("house777.cn", "澶ц繛鎴垮湴浜х綉"); + SOURCE_MAP.put("hljfdc.net", "榛戦緳姹熸埧浜х綉"); + SOURCE_MAP.put("jafdc.cn", "鍚夊畨鎴夸骇灞�"); + SOURCE_MAP.put("qq.com", "鑵捐鎴夸骇"); + SOURCE_MAP.put("sina.com.cn", "鏂版氮涔愬眳"); + SOURCE_MAP.put("iefang.com", "鐖辨槗鎴�"); + SOURCE_MAP.put("liyhy.com", "婧ч槼鏄婁笟鎴夸骇"); + SOURCE_MAP.put("fangtoo.com", "鎴块�旂綉"); + SOURCE_MAP.put("bjfang.com", "澶╂湕鎴跨綉"); + SOURCE_MAP.put("house0579.com", "浜氬拰鎴夸骇"); + SOURCE_MAP.put("mayanchina.com", "鐜涢泤鎴垮眿"); + SOURCE_MAP.put("yysyfdc.com", "浣欏鐢熺泭鎴夸骇"); + SOURCE_MAP.put("fdc0746.com", "0746妤煎競缃�"); + SOURCE_MAP.put("whfc.com.cn", "濞佹捣鎴夸骇浜ゆ槗缃�"); + SOURCE_MAP.put("04828.com", "鍏村畨鐩熶俊鎭綉"); + SOURCE_MAP.put("jiayouhh.com", "鍔犳补绾㈡渤缃�"); + SOURCE_MAP.put("0455.sh.cn", "缁ュ寲淇℃伅娓紙SH)"); + SOURCE_MAP.put("78sys.com", "78鍙岄腑灞�"); + SOURCE_MAP.put("0464.net.cn", "0464淇℃伅缃�"); + SOURCE_MAP.put("0790dcw.com", "鏂颁綑鍦颁骇缃�0790"); + SOURCE_MAP.put("xykanfang.com", "鏂颁綑鐪嬫埧缃�"); + SOURCE_MAP.put("tr169.cn", "閾滀粊閮藉競缃�"); + SOURCE_MAP.put("trren.cn", "閾滀粊鎴夸骇"); + SOURCE_MAP.put("trfcw.com", "閾滀粊鎴夸骇缃憈rfcw"); + SOURCE_MAP.put("syfang.net", "鍗佸牥鎴夸骇缃憇yfang"); + SOURCE_MAP.put("d0598.com", "涓夋槑鎴夸骇缃慸0598"); + SOURCE_MAP.put("xnjhome.com", "鏂板唴姹熸埧浜х綉"); + SOURCE_MAP.put("0597321.com", "榫欏博321鎴夸骇缃�"); + SOURCE_MAP.put("jn234.com", "娴庡畞鏂颁俊鎭腐"); + SOURCE_MAP.put("jiningloushi.com", "娴庡畞妤煎競"); + SOURCE_MAP.put("jqcn.net", "閰掓硥鐢熸椿缃�"); + SOURCE_MAP.put("0470a.com", "鍛间鸡璐濆皵鐏綉"); + SOURCE_MAP.put("ehuludao.com", "钁姦宀涘湪绾�"); + SOURCE_MAP.put("hldkfw.com", "钁姦宀涚湅鎴跨綉"); + SOURCE_MAP.put("hldinfo.net", "钁姦宀涗俊鎭腐"); + SOURCE_MAP.put("yx0429.com", "钁姦宀涙埧鍦颁骇瓒呭競缃�"); + SOURCE_MAP.put("hldhouse.com", "钁姦宀涙埧鍦颁骇缃�"); + SOURCE_MAP.put("c0798.com", "鏅痉闀囦拱鎴跨綉"); + SOURCE_MAP.put("jianfc.com", "鍚夊畨鎴夸骇缃�"); + SOURCE_MAP.put("jxych.cn", "杈炬垚瀹滄槬鎴夸骇缃�"); + SOURCE_MAP.put("hbloushi.com", "楣ゅ妤煎競"); + SOURCE_MAP.put("726000.net", "鍟嗘礇鎴夸骇缃�"); + SOURCE_MAP.put("yjwn.cn", "鏄撳眳娓崡"); + SOURCE_MAP.put("kfang.com.cn", "鐪嬫埧缃�"); + SOURCE_MAP.put("0355fdc.com", "0355鎴夸骇缃�"); + SOURCE_MAP.put("tcfcw.net", "閾滃窛鎴夸骇缃�"); + SOURCE_MAP.put("jxrtv.com", "鍢夊叴浜虹綉"); + SOURCE_MAP.put(".yizfc", "浠緛鎴夸骇缃�"); + SOURCE_MAP.put("h0758.net", "鑲囨埧缃�"); + SOURCE_MAP.put("gzcjy128.com", "鍒涘鏄�"); + SOURCE_MAP.put("52bendi.com", "鏈湴鎴夸骇瀹跺眳缃�"); + SOURCE_MAP.put("0830360.com", "娉稿窞鎴夸骇缃�"); + SOURCE_MAP.put("jzsfc.gov.cn", "鏅嬩腑鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("zhengfafa.com", "姝e彂鍙戝垎绫讳俊鎭綉"); + SOURCE_MAP.put("huzfbz.com", "婀栧窞浣忔埧淇濋殰缃�"); + SOURCE_MAP.put("gmfdcw.com", "楂樺瘑鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("rednet.cn", "绾㈢綉"); + SOURCE_MAP.put("0744.ccoo.cn", "寮犲鐣岄棬鎴风綉"); + SOURCE_MAP.put("fcpzh.com", "鏀�鏋濊姳鎴夸骇缃�"); + SOURCE_MAP.put("ipzh.cn", "鐖卞皻鑺卞煄缃�"); + SOURCE_MAP.put("fc0576.com", "鍙板窞鎴夸骇缃�"); + SOURCE_MAP.put("tzfy.cn", "鍙板窞鎴挎簮缃�"); + SOURCE_MAP.put("tzview.com", "鍙板窞瑙嗙獥"); + SOURCE_MAP.put("tzfdctv.com", "鍙板窞鐧捐仈鎴夸骇缃�"); + SOURCE_MAP.put("tzeju.com", "鍙板窞鏄撳眳缃�"); + SOURCE_MAP.put("ljwcom.com", "榫欐睙缃�"); + SOURCE_MAP.put("dqfc114.com", "澶у簡鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("daqing.net", "澶у簡淇℃伅娓�"); + SOURCE_MAP.put("0412aj.com", "闉嶅北鐖卞鎴夸骇缃�"); + SOURCE_MAP.put("23fdc.com", "闉嶅北鎴夸骇缃�"); + SOURCE_MAP.put("zh51home.com", "鐝犳捣鎴夸骇涔嬬獥"); + SOURCE_MAP.put("gogohome.com", "鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("zhnews.net", "鐝犳捣鎯犱拱鎴�"); + SOURCE_MAP.put("zh-o.com", "鐝犳捣瑗垮尯鎴夸骇缃�"); + SOURCE_MAP.put("kingia.com", "鍚涜秺鍦颁骇"); + SOURCE_MAP.put("gd.cn", "鐝犳捣瑙嗙獥鎼滄埧"); + SOURCE_MAP.put("doumenqu.com", "鏂楅棬瑙嗙獥"); + SOURCE_MAP.put("0760dc.com", "涓北鎴夸骇缃慱0760dc"); + SOURCE_MAP.put("zgfdc.net", "涓北妤煎競"); + SOURCE_MAP.put("0760t.com", "涓北绉熸埧缃�"); + SOURCE_MAP.put("shushifang.com", "鑸掗�傛埧缃�"); + SOURCE_MAP.put("dinju.com", "瀹氬眳缃�"); + SOURCE_MAP.put("stre.net", "姹曞ご鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("stlafc.com", "鍒╁畨鎴夸骇"); + SOURCE_MAP.put("live754.com", "e灞呮埧浜�"); + SOURCE_MAP.put("stfdcw.com", "姹曞ご鎴垮湴浜х綉"); + SOURCE_MAP.put("tt5598.com", "姹曞ご闆呭眳缃�"); + SOURCE_MAP.put("0754ok.com", "鎴垮眳缃�"); + SOURCE_MAP.put("bfqfc.com", "鐧惧瘜鍕ゆ埧浜�"); + SOURCE_MAP.put("stfc118.com", "姹曞ご鎴夸骇鍦ㄧ嚎"); + SOURCE_MAP.put("sthtfc.com", "椤烘嘲娉撴嘲鎴夸骇"); + SOURCE_MAP.put("very-e.net", "涓婃槗鎵炬埧"); + SOURCE_MAP.put("0754house.com", "浣虫垚鎴夸骇"); + SOURCE_MAP.put("bdhouse.net", "鍢変俊鎴夸骇"); + SOURCE_MAP.put("bdzfw.net", "淇濆畾鎵炬埧缃�"); + SOURCE_MAP.put("bxfcw.net", "婧埧缃�"); + SOURCE_MAP.put("0414aj.com", "鏈邯鐖卞鎴夸骇缃�"); + SOURCE_MAP.put("bxydt.com", "鏈邯鎴垮惂"); + SOURCE_MAP.put("pdshouse.com", "骞抽《灞辨埧浜�"); + SOURCE_MAP.put("pdsloushi.com", "骞抽《灞辨ゼ甯�"); + SOURCE_MAP.put("qjfdc.cn", "鏇查潠鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("0874114.cn", "鏇查潠渚挎皯缃�"); + SOURCE_MAP.put("cityfdc.com", "涓浗鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("hdzc.net", "閭兏涔嬬獥"); + SOURCE_MAP.put("qhdfcjj.com", "绉︾殗宀涙埧浜у灞呯綉"); + SOURCE_MAP.put("qhd.com.cn", "绉︾殗宀涗俊鎭腐"); + SOURCE_MAP.put("daomin.net", "绉︾殗宀涘矝姘戠綉"); + SOURCE_MAP.put("qhd678.com", "绉︾殗宀涘ぇ浼椾俊鎭腐"); + SOURCE_MAP.put("weihaifangchan.cn", "濞佹捣鎴夸骇鍥㈣喘缃�"); + SOURCE_MAP.put("pjfdc.com", "鐩橀敠鎴垮湴浜х綉"); + SOURCE_MAP.put("panjin.net", "楣や埂鐑嚎"); + SOURCE_MAP.put("0427.com", "浜掕仈鐩橀敠"); + SOURCE_MAP.put("pj0427.net", "鐩橀敠鍦ㄧ嚎"); + SOURCE_MAP.put("pjfyw.com", "鐩橀敠鎴挎簮缃�"); + SOURCE_MAP.put("0714.yy.cm", "榛勭煶鎴夸骇缃�"); + SOURCE_MAP.put("cuwall.com", "鎴夸骇鍦ㄧ嚎"); + SOURCE_MAP.put("daloupan.com", "澶фゼ鐩�"); + SOURCE_MAP.put("88fw.com", "榛勭煶鎴愬姛鎴夸骇缃�"); + SOURCE_MAP.put("edfdc.com", "鏈夊眳缃�"); + SOURCE_MAP.put("hsren.com", "榛勭煶鐑嚎"); + SOURCE_MAP.put("hsfc.net.cn", "榛勭煶鎴夸骇缃慱hsfc"); + SOURCE_MAP.put("zaihuangshi.com", "榛勭煶鐢熸椿缃�"); + SOURCE_MAP.put("hynews.org", "娌虫簮鏂伴椈缃�"); + SOURCE_MAP.put("fs0762.com", "鎴胯缃�"); + SOURCE_MAP.put("ykfc.net", "钀ュ彛鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("ykouf.cn", "钀ュ彛鎴夸骇缃�"); + SOURCE_MAP.put("yingkoufangchan.com", "钀ュ彛鎴夸骇"); + SOURCE_MAP.put("xxfang.com", "鏂颁埂鎴夸骇"); + SOURCE_MAP.put("xxloushi.com", "鏂颁埂妤煎競"); + SOURCE_MAP.put("xxgfw.cn", "鏂颁埂璐埧鑰�"); + SOURCE_MAP.put("yynews.com.cn", "浣欏鏂伴椈缃�"); + SOURCE_MAP.put("eyuyao.com", "浣欏鐢熸椿缃�"); + SOURCE_MAP.put("571888.com", "浣欏鎴夸骇淇℃伅"); + SOURCE_MAP.put("0574yye.com", "浣欏鎴夸骇"); + SOURCE_MAP.put("yydushi.com", "浣欏鎴夸骇_yydushi"); + SOURCE_MAP.put("yyjbfc.com", "浣欏瀹跺崥鎴夸骇"); + SOURCE_MAP.put("yysyfdc.com", "浣欏鐢熺泭鎴夸骇"); + SOURCE_MAP.put("eyuyao.com", "鏃轰匠鎴夸骇"); + SOURCE_MAP.put("cs090.com", "闆惰窛绂绘埧浜�"); + SOURCE_MAP.put("ycls.cn", "铏炲煄妤煎競"); + SOURCE_MAP.put("csfcw.com", "甯哥啛鎴夸骇缃�"); + SOURCE_MAP.put("cshfc.cn", "甯哥啛鎴夸骇缃慱cshfc"); + SOURCE_MAP.put("02fw.com", "甯哥啛浜屾墜鎴�"); + SOURCE_MAP.put("zp365.com", "浣忔湅缃�"); + SOURCE_MAP.put("lijiangfc.com", "涓芥睙鎴夸骇缃�"); + SOURCE_MAP.put("ljsoufang.com", "涓芥睙鎼滄埧"); + SOURCE_MAP.put("ljfdc.cn", "涓芥睙鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("ljfw.com", "涓芥睙鎴夸骇缃慱ljfw"); + SOURCE_MAP.put("lijiangdc.com", "灞呭畨鎴垮湴浜�"); + SOURCE_MAP.put("ljhouse.cn", "涓芥睙鎴跨綉"); + SOURCE_MAP.put("ljfw.com.cn", "涓芥睙鎴跨綉_ljfw"); + SOURCE_MAP.put("daqin029.com", "澶хЕ鍜搁槼缃�"); + SOURCE_MAP.put("sanqinfang.com", "涓夌Е鎴�"); + SOURCE_MAP.put("zhuoyuefch.com", "鍜搁槼鍗撹秺鎴夸骇"); + SOURCE_MAP.put("lejufc.com", "涔愬眳鎴夸骇"); + SOURCE_MAP.put("jieyangzf.com", "鎻槼鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("d0898.com", "涓変簹鎴夸骇缃慱d0898"); + SOURCE_MAP.put("sanyagf.com", "涓変簹璐埧鑰�"); + SOURCE_MAP.put("0831home.com", "涓夋睙鎴夸骇缃�"); + SOURCE_MAP.put("ybvv.cn", "瀹滃鎴垮湴浜х綉"); + SOURCE_MAP.put("ybfc.cn", "瀹滃鎴夸骇缃�"); + SOURCE_MAP.put("ybbbs.net", "瀹滃鎴夸骇缃慱ybbbs"); + SOURCE_MAP.put("jj831.com", "閲戞睙缃�"); + SOURCE_MAP.put("ybfdcw.com", "瀹滃鎴垮湴浜х綉_ybfdcw"); + SOURCE_MAP.put("0831xyfc.com", "娆e疁鎴夸骇"); + SOURCE_MAP.put("ybzfw.com", "瀹滃浣忔埧缃�"); + SOURCE_MAP.put("pt594.com", "鑾嗙敯鎴夸骇缃�"); + SOURCE_MAP.put("ptfc123.com", "鑾嗙敯鎴夸骇"); + SOURCE_MAP.put("ptfcw.com", "鑾嗙敯鎴夸骇缃慱ptfcw"); + SOURCE_MAP.put("qilinsw.com", "鑾嗙敯濂囨灄鎴夸骇缃�"); + SOURCE_MAP.put("pt-house.com", "鑾嗙敯鑱斿悎鎴夸骇缃�"); + SOURCE_MAP.put("pthouse.com.cn", "鑾嗙敯鎴垮湴浜ц仈鍚堢綉"); + SOURCE_MAP.put("ptfcxxw.com", "鑾嗙敯鎴夸骇淇℃伅缃慱ptfcxxw"); + SOURCE_MAP.put("ptwcfc.com", "涓囧煄鎴夸骇缃�"); + SOURCE_MAP.put("zxip.com", "鎱堟邯鎴夸骇缃慱xip"); + SOURCE_MAP.put("cxfccs.com", "鎱堟邯鎴夸骇缃慱cxfccs"); + SOURCE_MAP.put("cxnews.cn", "鎱堟邯鎴夸骇瀹跺眳缃�"); + SOURCE_MAP.put("cixi.cn", "鎱堟邯鎴垮湴浜х綉"); + SOURCE_MAP.put("cixiw.com", "鎱堟邯鎴夸骇鍦ㄧ嚎"); + SOURCE_MAP.put("guanhaiwei.com", "鎱堟邯鎴夸骇缃�"); + SOURCE_MAP.put("ruifc.cn", "鐟炲畨鎴夸骇缃慱ruifc"); + SOURCE_MAP.put("rafdcw.com", "鐟炲畨鎴垮湴浜х綉"); + SOURCE_MAP.put("rafcxx.com", "鐟炲畨鎴夸骇涓粙缃�"); + SOURCE_MAP.put("ruian.com", "鐟炲畨璁哄潧"); + SOURCE_MAP.put("razyfc.com", "鐟炲畨鎴跨綉"); + SOURCE_MAP.put("auouo.com", "鐟炲畨鐢熸椿缃�"); + SOURCE_MAP.put("wjhouses.com", "鍚存睙鎴夸骇淇℃伅娓�"); + SOURCE_MAP.put("wjshw.com", "鍚存睙鎴夸骇淇℃伅缃慱wjshw"); + SOURCE_MAP.put("wjfcw.com", "鍚存睙鎴夸骇缃慱wjfcw"); + SOURCE_MAP.put("tt919.com", "褰撳缃�"); + SOURCE_MAP.put("wjls.com.cn", "鍚存睙妤煎競缃�"); + SOURCE_MAP.put("168house.cn", "鍚存睙鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("renjoin.com", "浜哄眳缃�"); + SOURCE_MAP.put("wjhao.com", "鍚存睙鎴夸骇缃慱wjhao"); + SOURCE_MAP.put("wjgfw.com", "鍚存睙璐埧缃�"); + SOURCE_MAP.put("yxfcw.cn", "瀹滃叴鎴夸骇缃慱yxfcw"); + SOURCE_MAP.put("tdfcw.com", "闄堕兘鎴夸骇缃�"); + SOURCE_MAP.put("yuntaodu.com", "浜戦櫠閮芥埧浜х綉"); + SOURCE_MAP.put("yxfcw.com", "瀹滃叴鎴垮湴浜х綉"); + SOURCE_MAP.put("yixing.cc", "鍦ㄧ嚎鎴夸骇"); + SOURCE_MAP.put("rmfcw.cn", "瀹滃叴浜烘皯鎴夸骇"); + SOURCE_MAP.put("yxfyfc.com", "瀹滃叴鏂瑰渾鎴夸骇涓粙"); + SOURCE_MAP.put("999fc.net", "瀹滃叴绉熸埧缃�"); + SOURCE_MAP.put("yxfccs.com", "瀹滃叴鎴夸骇瓒呭競缃�"); + SOURCE_MAP.put("yixing.cc", "瀹滃叴鍦ㄧ嚎"); + SOURCE_MAP.put("bsfcw.net", "瀹滃叴鐧剧洓鎴夸骇"); + SOURCE_MAP.put("yxhbfc.com", "瀹滃叴澶╂ˉ鎴夸骇缃�"); + SOURCE_MAP.put("yxhxfc.com", "瀹滃叴鍜屼俊鎴夸骇"); + SOURCE_MAP.put("yxls.com.cn", "瀹滃叴妤煎競缃�"); + SOURCE_MAP.put("yxfqfc.com", "瀹滃叴瀵屽己鎴夸骇"); + SOURCE_MAP.put("zqlos.com", "鑲堝簡妤煎競"); + SOURCE_MAP.put("0758fc.net", "鑲堝簡鎴夸骇缃�"); + SOURCE_MAP.put("tcsw.cn", "鑲囧簡鎴垮湴浜�"); + SOURCE_MAP.put("ayinfo.cn", "瀹夐槼鎴夸骇缃�"); + SOURCE_MAP.put("ayloushi.com", "瀹夐槼妤煎競"); + SOURCE_MAP.put("0372fdc.com", "瀹夐槼鎴垮湴浜х綉"); + SOURCE_MAP.put("zj.cn", "涔変箤淇℃伅缃�"); + SOURCE_MAP.put("ywfc.net", "涔変箤鎴夸骇缃�"); + SOURCE_MAP.put("ywfc.cc", "姹囬懌鎴夸骇"); + SOURCE_MAP.put("houseyw.com", "棣欏眳鎴夸骇"); + SOURCE_MAP.put("15518.com", "骞哥鎴夸骇淇℃伅"); + SOURCE_MAP.put("169l.com", "涔変箤鎴夸骇"); + SOURCE_MAP.put("15fcw.com", "鍙嬪ソ鎴夸骇"); + SOURCE_MAP.put("ywhouse365.com", "涔変箤鏂瑰渾鎴夸骇"); + SOURCE_MAP.put("15jp.com", "閿﹂箯涓嶅姩浜�"); + SOURCE_MAP.put("ywfhfc.com", "涔変箤瀵屽崕鎴夸骇"); + SOURCE_MAP.put("afz.cc", "鐖辨埧绔�"); + SOURCE_MAP.put("ywjlfc.com.cn", "铔熼緳鎴夸骇缃�"); + SOURCE_MAP.put("ywhhfc.com", "涔変箤鐏孩鎴夸骇"); + SOURCE_MAP.put("ylfdc.com", "鐜夋灄鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("yulintimes.com", "鐜夋灄鏃朵唬缃�"); + SOURCE_MAP.put("717.so", "鎴夸骇涔愬洯"); + SOURCE_MAP.put("tsloushi.com", "鍞愬北妤煎競缃�"); + SOURCE_MAP.put("0315dg.com", "鍞愬北鎴夸骇缃�"); + SOURCE_MAP.put("tszp.com", "鍞愬北鎴跨綉"); + SOURCE_MAP.put("0710.com", "瑗勯槼0710缃�"); + SOURCE_MAP.put("0270710.com", "0710瑗勯槼鎴夸骇缃�"); + SOURCE_MAP.put("jinxiangyang.com", "瑗勯槼鍒嗙被淇℃伅缃�"); + SOURCE_MAP.put("0527lsw.com", "瀹胯縼妤煎競缃�"); + SOURCE_MAP.put("0527c.net", "瀹胯縼鎴夸骇缃慱0527c"); + SOURCE_MAP.put("0527fc.com", "瀹胯縼鎴夸骇缃慱0527fc"); + SOURCE_MAP.put("sqhouse.cn", "瀹胯縼鎴垮湴浜х綉"); + SOURCE_MAP.put("114b2c.com", "瀹胯縼鎴夸骇缃慱114b2c"); + SOURCE_MAP.put("sqfczx.cc", "瀹胯縼鎴夸骇缃慱sqfczx"); + SOURCE_MAP.put("mmfc.cc", "鑼傚悕鎴夸骇"); + SOURCE_MAP.put("nt138.com", "鑼傚悕鍗楀ぉ鍦颁骇缃�"); + SOURCE_MAP.put("gdmmfdc.com", "鑼傚悕鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("230668.com", "鑼傚悕鎴夸骇缃�"); + SOURCE_MAP.put("my0668.com", "鑼傚悕鎴垮競缃�"); + SOURCE_MAP.put("mmxfw.com", "鑼傚悕瀵绘埧缃�"); + SOURCE_MAP.put("fdc0518.com", "杩炰簯娓埧浜х櫨浜嬮��"); + SOURCE_MAP.put("0518gfw.com", "杩炰簯娓喘鎴跨綉"); + SOURCE_MAP.put("lygfc.com", "杩炰簯娓埧浜х綉"); + SOURCE_MAP.put("0555fc.com", "椹瀺灞辨埧浜х綉_0555fc"); + SOURCE_MAP.put("masf.cn", "椹瀺灞辨埧浜х綉"); + SOURCE_MAP.put("ym234.com", "鏄撻┈缃�"); + SOURCE_MAP.put("mdjhouse.com", "鐗′腹姹熸埧浜х綉"); + SOURCE_MAP.put("mdjlife.com", "鐗′腹姹熺敓娲荤綉"); + SOURCE_MAP.put("myzf.net", "缁甸槼浣忔埧缃�"); + SOURCE_MAP.put("88zf.com", "鑺滄箹鎵炬埧"); + SOURCE_MAP.put("roboo.com", "鑺滄箹鎴夸骇"); + SOURCE_MAP.put("0792f.cn", "鎴跨洘"); + SOURCE_MAP.put("0792fcw.com", "涔濇睙鎴夸骇缃�"); + SOURCE_MAP.put("0797fdc.com.cn", "璧e窞鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("0797fdc.net", "璧e窞鎴夸骇鍦ㄧ嚎"); + SOURCE_MAP.put("jxdxfc.com", "榧庝俊鎴垮湴浜�"); + SOURCE_MAP.put("0662fang.com", "闃虫睙鎴夸骇浜ゆ槗缃�"); + SOURCE_MAP.put("bbs0763.com", "娓呰繙鎴夸骇缃�"); + SOURCE_MAP.put("qy-house.com", "娓呰繙瀹跺洯"); + SOURCE_MAP.put("0763888.com", "娓呰繙鐢熸椿缃�"); + SOURCE_MAP.put("zhuzhouwang.com", "鏍床缃�"); + SOURCE_MAP.put("0732fc.net", "婀樻江鎴垮湴浜х患鍚堢綉"); + SOURCE_MAP.put("zg163.net", "鑷础鎴垮湴浜�"); + SOURCE_MAP.put("qz828.com", "琛㈠窞鏂伴椈缃�"); + SOURCE_MAP.put("house018.com", "琛㈠窞鎴跨綉"); + SOURCE_MAP.put("0570.com", "琛㈡埧缃�"); + SOURCE_MAP.put("qzmyfc.com", "琛㈠窞鍚嶆壃鎴夸骇缃�"); + SOURCE_MAP.put("qzfce.cn", "琛㈠窞鎴夸骇e缃�"); + SOURCE_MAP.put("e0570.com", "琛㈠窞鐑嚎"); + SOURCE_MAP.put("qzdcfc.com", "澶ф垚鎴夸骇"); + SOURCE_MAP.put("0771555.com", "閭曟埧缃�"); + SOURCE_MAP.put("0572hu.com", "浣忓湪婀栧窞缃�"); + SOURCE_MAP.put("yzfc123.com", "鎵窞鎴夸骇"); + SOURCE_MAP.put("yz2shou.com", "鎵窞浜屾墜缃�"); + SOURCE_MAP.put("yzloupan.com", "鎵窞妤肩洏缃�"); + SOURCE_MAP.put("yongbangfc.com", "姘搁偊鎴夸骇"); + SOURCE_MAP.put("zjwqfc.com", "涓囧崈鎴夸骇"); + SOURCE_MAP.put("newzj.net", "鏂伴晣姹�"); + SOURCE_MAP.put("qfdm.gov.cn", "姹熼棬鎴夸骇缃�"); + SOURCE_MAP.put("jmnews.com.cn", "姹熼棬妤煎競缃�"); + SOURCE_MAP.put("dpdc.net.cn", "涓滈箯鍦颁骇"); + SOURCE_MAP.put("0750f.com", "姹熸埧缃�"); + SOURCE_MAP.put("x0750.com", "浜旈倯鎴夸骇缃�"); + SOURCE_MAP.put("ycfcw.cn", "鐩愬煄鎴夸骇缃�"); + SOURCE_MAP.put("yfcw.cn", "鐩愬煄鎴夸骇缃慱yfcw"); + SOURCE_MAP.put("ycfcw.com", "鐩愬煄鎴夸骇缃慱ycfcw"); + SOURCE_MAP.put("0515fc.com", "鐩愬煄鎴夸骇缃慱0515fc"); + SOURCE_MAP.put("ycfcw.com.cn", "鐩愬煄鎴垮湴浜�"); + SOURCE_MAP.put("ycfc8.com", "鐩愬煄鎴夸骇"); + SOURCE_MAP.put("yifan2006.com", "涓�甯嗘埧浜�"); + SOURCE_MAP.put("09fc.com", "绗節鍖烘埧浜х綉"); + SOURCE_MAP.put("djfw.com", "澶у鎴夸骇"); + SOURCE_MAP.put("fclm.cn", "鎴夸骇鑱旂洘"); + SOURCE_MAP.put("t1ti.com", "澶╁ぉ鎴夸骇"); + SOURCE_MAP.put("jx8588.com", "鍢夊叴鎴夸骇缃慱jx8588"); + SOURCE_MAP.put("cnjxol.com", "鍢夊叴鍦ㄧ嚎"); + SOURCE_MAP.put("19lou.com", "19妤�"); + SOURCE_MAP.put("anjufw.cn", "瀹夊眳鎴跨綉"); + SOURCE_MAP.put("0579zf.com", "閲戝崕鎵炬埧缃�"); + SOURCE_MAP.put("0579f.com", "娴欎腑鎴跨綉"); + SOURCE_MAP.put("591fw.com", "閲戝崕591鎴夸骇缃�"); + SOURCE_MAP.put("btfcw.net", "姣旂壒鎴夸骇"); + SOURCE_MAP.put("tzzufang.com", "娉板窞鎴夸骇缃�"); + SOURCE_MAP.put("tzfcw.com", "鏂颁笘绾埧浜�"); + SOURCE_MAP.put("tzjhfcw.com", "娉板窞鎴夸骇缃慱tzjhfcw"); + SOURCE_MAP.put("ty7.cn", "娉板窞妤煎競"); + SOURCE_MAP.put("tzwxwj.com", "鎴戞兂鎴戝"); + SOURCE_MAP.put("tzfcxx.com", "娉板窞鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("guifc.com", "妗傛灄鎴夸骇缃慱guifc"); + SOURCE_MAP.put("huizhou.cn", "浠婃棩鎯犲窞缃�"); + SOURCE_MAP.put("hzcom.cn", "鎯犲窞鎴夸骇"); + SOURCE_MAP.put("l8.com.cn", "闅嗗‖鍦颁骇"); + SOURCE_MAP.put("0759home.com", "婀涙睙璐埧缃�"); + SOURCE_MAP.put("0759f.com", "婀涙睙鎴夸骇缃慱0759f"); + SOURCE_MAP.put("zjttdc.com", "澶╁ぉ鍦颁骇"); + SOURCE_MAP.put("hsjdc.com", "濂戒笘鐣屽湴浜�"); + SOURCE_MAP.put("yinsha.com", "閾舵矙鎴夸骇缃�"); + SOURCE_MAP.put("hnzzfc.com", "鏍床鎴夸骇缃�"); + SOURCE_MAP.put("zzxfdc.com", "鏍床鍘挎埧鍦颁骇缃�"); + SOURCE_MAP.put("hyfcw.com", "琛¢槼鎴夸骇缃�"); + SOURCE_MAP.put("0734hysfc.com", "琛¢槼鎴夸骇缃慱0734hysfc"); + SOURCE_MAP.put("e0734.com", "涓浗琛¢槼鏂伴椈缃�"); + SOURCE_MAP.put("fc0734.com", "琛¢槼绾㈡埧"); + SOURCE_MAP.put("0734f.com", "琛¢槼浜屾墜鎴�"); + SOURCE_MAP.put("hysfcw.com", "琛¢槼甯傛埧浜х綉"); + SOURCE_MAP.put("yichangfang.com", "瀹滄槍鎴夸骇缃�"); + SOURCE_MAP.put("e0717.net", "瀹滄槍鎴夸骇缃慱e0717"); + SOURCE_MAP.put("winshang.com", "璧㈠晢鍟嗗姟"); + SOURCE_MAP.put("mpuba.com", "涔伴摵鍚�"); + SOURCE_MAP.put("city8.com", "鍏ㄦ櫙鎴夸骇"); + SOURCE_MAP.put("yuedutz.com", "涓�鎵嬪晢閾虹綉"); + SOURCE_MAP.put("soupu.com", "鎼滈摵"); + SOURCE_MAP.put("leadshang.com", "棰嗗晢缃�"); + SOURCE_MAP.put("shanghaioffice.net", "涓婃捣鍐欏瓧妤肩綉"); + SOURCE_MAP.put("officese.com", "涓崕鍐欏瓧妤肩綉"); + SOURCE_MAP.put("126office.com", "鐟為槼涓嶅姩浜�"); + SOURCE_MAP.put("souloub.com", "鎼滄ゼ甯�"); + SOURCE_MAP.put("cbdzl.com", "鍖椾含鍐欏瓧妤肩綉"); + SOURCE_MAP.put("vpv.cn", "鏃洪摵缃�"); + SOURCE_MAP.put("office-beijing.com.cn", "鍖椾含鍐欏瓧妤煎挩璇腑蹇�"); + SOURCE_MAP.put("beijingxiezilou.cn", "鍖椾含鍐欏瓧妤间俊鎭綉"); + SOURCE_MAP.put("58.com", "58鍚屽煄"); + SOURCE_MAP.put("edeng.cn", "鏄撶櫥缃�"); + SOURCE_MAP.put("pupuwang.cn", "閾洪摵鏃�"); + SOURCE_MAP.put("bendibao.com", "鏈湴瀹�"); + SOURCE_MAP.put("ilantu.com", "鐖辫摑鍥�"); + SOURCE_MAP.put("bjhome.cn", "鍖椾含鍐欏瓧妤肩綉bjhome"); + SOURCE_MAP.put("5izf.com", "鍖椾含鍐欏瓧妤煎嚭绉熺綉"); + SOURCE_MAP.put("bjoffices.com.cn", "鍖椾含鍐欏瓧妤肩綉bjoffices"); + SOURCE_MAP.put("86office.com", "86鍐欏瓧妤肩綉"); + SOURCE_MAP.put("ccto.com.cn", "鍖椾含鍐欏瓧妤兼�荤綉"); + SOURCE_MAP.put("haoloubang.com", "濂芥ゼ甯�"); + SOURCE_MAP.put("028office.com", "鎴愰兘鍐欏瓧妤间俊鎭綉"); + SOURCE_MAP.put("vcbd.com.cn", "鎴愰兘鍐欏瓧妤肩璧佺綉"); + SOURCE_MAP.put("hellobuilding.com", "濂芥ゼ鍦ㄧ嚎"); + SOURCE_MAP.put("qu114.com", "鍘�114鍒嗙被淇℃伅缃�"); + SOURCE_MAP.put("officecd.net", "鎴愰兘鍐欏瓧妤肩鍞綉"); + SOURCE_MAP.put("gzgov.net", "骞垮窞淇℃伅娓�"); + SOURCE_MAP.put("go007.com", "鍩庨檯鍒嗙被"); + SOURCE_MAP.put("yes515.com", "515鎴夸骇缃�"); + SOURCE_MAP.put("o.cn", "閮藉競鍦堟埧浜�"); + SOURCE_MAP.put("sofang.com", "鎼滄埧sofang"); + SOURCE_MAP.put("h2h.cn", "鎵嬮�掓墜"); + SOURCE_MAP.put("99fang.com", "涔濅節鎴�"); + SOURCE_MAP.put("jinti.com", "浠婇鎴夸骇缃�"); + SOURCE_MAP.put("taofw.cn", "娣樻埧灞�"); + SOURCE_MAP.put("sunhouse.com.cn", "娣卞湷鍐欏瓧妤肩綉"); + SOURCE_MAP.put("4567.com.cn", "娣卞湷鍟嗕笟鍦颁骇缃�"); + SOURCE_MAP.put("szcbdoffice.com", "缇庣櫨骞�"); + SOURCE_MAP.put("zhaotie.com", "鎵捐创缃�"); + SOURCE_MAP.put("aifangke.com", "鐖辨埧瀹�"); + SOURCE_MAP.put("tjxiezilou.com", "澶╂触鍐欏瓧妤间俊鎭綉"); + SOURCE_MAP.put("qrwu.com", "涓冩棩灞嬬鎴跨綉"); + SOURCE_MAP.put("suanpi.com", "钂滅毊缃�"); + SOURCE_MAP.put("ukecy.com", "浼樺鍥尯鎷涘晢缃�"); + SOURCE_MAP.put("tjjxdc.net", "鑱氶懌鍦颁骇"); + SOURCE_MAP.put("51zhantai.com", "51绔欏彴缃�"); + SOURCE_MAP.put("fundon.cn", "鎴夸笢缃�"); + SOURCE_MAP.put("sydcw.net", "澶╂触鍟嗕笟鍦颁骇缃�"); + SOURCE_MAP.put("njofficeol.com", "鍗椾含鍐欏瓧妤煎湪绾�"); + SOURCE_MAP.put("office-cbd.com", "鍗椾含钃濊鍟嗕笟鍦颁骇绉熻祦鏈烘瀯"); + SOURCE_MAP.put("daikan.cn", "甯︾湅缃�"); + SOURCE_MAP.put("6doffice.net", "鍏害鍐欏瓧妤�"); + SOURCE_MAP.put("021office.net", "涓婃捣鍐欏瓧妤�"); + SOURCE_MAP.put("fangtoo.com", "鎴块�旂綉"); + SOURCE_MAP.put("fc571.com", "鏉窞鎴夸骇缃�"); + SOURCE_MAP.put("0571cbd.com", "鏉窞鍐欏瓧妤肩綉0571cbd"); + SOURCE_MAP.put("hzcf.net", "鏉窞鍐欏瓧妤肩綉hzcf"); + SOURCE_MAP.put("bgo.cn", "蹇呭缃�"); + SOURCE_MAP.put("kfw001.com", "蹇埧缃�"); + SOURCE_MAP.put("hzzlys.com", "宸﹂偦鍙宠垗"); + SOURCE_MAP.put("eeju.com", "鏄撳眳缃�"); + SOURCE_MAP.put("shmec.gov.cn", "涓婃捣鏁欒偛"); + SOURCE_MAP.put("age06.com", "涓婃捣瀛﹀墠鏁欒偛缃�"); + SOURCE_MAP.put("bjedu.gov.cn", "鍖椾含鏁欒偛濮斿憳浼�"); + SOURCE_MAP.put("bjguahao.gov.cn", "鍖椾含甯傞绾︽寕鍙风粺涓�骞冲彴"); + SOURCE_MAP.put("qqyy.com", "涓浗鍖婚櫌澶у叏"); + SOURCE_MAP.put("pcbaby.com.cn", "澶钩娲嬩翰瀛愮綉"); + SOURCE_MAP.put("guahao.com", "鎸傚彿缃�"); + SOURCE_MAP.put("hzws.gov.cn", "鏉窞甯傚厤璐归绾︽寕鍙风郴缁�"); + SOURCE_MAP.put("hangzhoupaotui.com", "鏉窞缃楀叞璺戣吙"); + SOURCE_MAP.put("99.com.cn", "灏辫瘖鎸囧崡"); + SOURCE_MAP.put("gzxuexiao.com", "骞垮窞瀛︽牎缃�"); + SOURCE_MAP.put("120china.org", "鍖荤枟淇℃伅缃�"); + SOURCE_MAP.put("njbaidu.cn", "鍗椾含鎽嗘浮缃�"); + SOURCE_MAP.put("cdzk.net", "鏅�氶珮鏍′俊鎭簱"); + SOURCE_MAP.put("cdzk.net", "鎴愰兘楂樹腑淇℃伅搴�"); + SOURCE_MAP.put("91160.com", "灏卞尰160"); + SOURCE_MAP.put("bendibao.com", "鏈湴瀹�"); + SOURCE_MAP.put("sz.gov.cn", "娣卞湷鏀垮簻鍦ㄧ嚎"); + SOURCE_MAP.put("yihu.com", "鍖绘姢缃�"); + SOURCE_MAP.put("120.net", "120鍋ュ悍缃�"); + SOURCE_MAP.put("szxuexiao.com", "娣卞湷瀛︽牎缃�"); + SOURCE_MAP.put("jthysh.com", "瀹跺涵鍖荤敓缃�"); + SOURCE_MAP.put("xywy.com", "瀵诲尰闂嵂缃�"); + SOURCE_MAP.put("bjedu.com", "鍖椾含鏁欒偛缃�"); + SOURCE_MAP.put("cdjjedu.net", "閿︽睙鏁欒偛缃�"); + SOURCE_MAP.put("qyei.com", "闈掔緤鏁欒偛缃�"); + SOURCE_MAP.put("xdedu.net", "鏂伴兘鏁欒偛缃�"); + SOURCE_MAP.put("whjyw.com", "姝︿警鏁欒偛淇℃伅缃�"); + SOURCE_MAP.put("cdchedu.com", "鎴愬崕鏁欒偛淇℃伅缃�"); + SOURCE_MAP.put("cdgxedu.com", "楂樻柊鏁欒偛缃�"); + SOURCE_MAP.put("cdedu.com", "鎴愰兘鏁欒偛鍦ㄧ嚎"); + SOURCE_MAP.put("czedu.net.cn", "宕囧窞鏁欒偛淇℃伅缃�"); + SOURCE_MAP.put("99.com.cn", "鍗椾含甯傚尰闄㈠ぇ鍏�"); + SOURCE_MAP.put("yudaxsf.com", "瑁曡揪缃�"); + SOURCE_MAP.put("e21.cn", "婀栧寳瀛︽牎缃�"); + SOURCE_MAP.put("tjmec.gov.cn", "澶╂触鏁欒偛濮斿憳浼�"); + SOURCE_MAP.put("njedu.gov.cn", "鍗椾含鏁欒偛锛堝辜鍎垮洯锛�"); + SOURCE_MAP.put("njedu.gov.cn", "鍗椾含鏁欒偛锛堝垵涓級"); + SOURCE_MAP.put("njedu.gov.cn", "鍗椾含鏁欒偛锛堝皬瀛︼級"); + SOURCE_MAP.put("njedu.gov.cn", "鍗椾含鏁欒偛锛堜腑涓擄級"); + SOURCE_MAP.put("njedu.gov.cn", "鍗椾含鏁欒偛锛堥珮涓級"); + SOURCE_MAP.put("njedu.gov.cn", "鍗椾含鏁欒偛锛堟皯鍔烇級"); + SOURCE_MAP.put("nje.cn", "鍗椾含鏁欒偛鍦板浘"); + SOURCE_MAP.put("njedu.gov.cn", "鍗椾含鏁欒偛锛堢壒娈婏級"); + SOURCE_MAP.put("hzedu.gov.cn", "鏉窞鏁欒偛缃�"); + SOURCE_MAP.put("hzedu.gov.cn", "鏉窞鏁欒偛缃戯紙楂樻牎锛�"); + SOURCE_MAP.put("hzve.cn", "鏉窞鑱屼笟鏁欒偛淇℃伅缃�"); + SOURCE_MAP.put("zjedu.gov.cn", "娴欐睙鐪佹暀鑲插巺"); + SOURCE_MAP.put("gdhed.edu.cn", "骞夸笢鐪佹暀鑲插巺"); + SOURCE_MAP.put("sz.gov.cn", "娣卞湷鏀垮簻鍦ㄧ嚎"); + SOURCE_MAP.put("szxqjy.cn", "娣卞湷瀛﹀墠鏁欒偛绠$悊鍦ㄧ嚎"); + SOURCE_MAP.put("yhpdd.com", "鍗椾含骞煎効鍥�"); + SOURCE_MAP.put("nje.cn", "鍗椾含瀛﹀墠鏁欒偛"); + SOURCE_MAP.put("gz.gov.cn", "涓浗骞垮窞鏀垮簻"); + SOURCE_MAP.put("whjy.net", "姝︽眽瀛﹀墠鏁欒偛缃�"); + SOURCE_MAP.put("jajy.gov.cn", "姹熷哺鍖烘暀鑲插眬"); + SOURCE_MAP.put("qiaokou.gov.cn", "纭氬彛鏁欒偛"); + SOURCE_MAP.put("hyjyedu.com", "姹夐槼鍖烘暀鑲插眬"); + SOURCE_MAP.put("wuchang-edu.com", "姝︽槍鍖烘暀鑲插眬"); + SOURCE_MAP.put("hedu.com.cn", "娲北鏁欒偛淇℃伅缃�"); + SOURCE_MAP.put("qsjy.com", "闈掑北鏁欒偛淇℃伅缃�"); + SOURCE_MAP.put("wedzjy.com", "姝︽眽寮�鍙戝尯鏁欒偛缃�"); + SOURCE_MAP.put("dxhedu.net", "涓滆タ婀栨暀鑲蹭俊鎭綉"); + SOURCE_MAP.put("whhnjy.net", "姹夊崡鏁欒偛淇℃伅缃�"); + SOURCE_MAP.put("whjy.net", "钄$敻鏁欒偛淇℃伅缃�"); + SOURCE_MAP.put("chengdu.gov.cn", "鎴愰兘甯備汉姘戞斂搴�"); + SOURCE_MAP.put("hangzhou.gov.cn", "涓浗鏉窞甯傛斂搴�"); + SOURCE_MAP.put("whjyj.gov.cn", "姝︽眽甯傛暀鑲插眬锛堝皬瀛︼級"); + SOURCE_MAP.put("whjyj.gov.cn", "姝︽眽甯傛暀鑲插眬锛堝辜锛�"); + SOURCE_MAP.put("whjyj.gov.cn", "姝︽眽甯傛暀鑲插眬锛堜腑瀛︼級"); + SOURCE_MAP.put("whjyj.gov.cn", "姝︽眽甯傛暀鑲插眬锛堢壒娈婏級"); + SOURCE_MAP.put("cqxzl.cn", "閲嶅簡鍐欏瓧妤肩綉"); + SOURCE_MAP.put("xuanoffice.com", "鎴愰兘骞夸嚎鎴垮湴浜�"); + SOURCE_MAP.put("goufang.com", "璐埧缃�"); + SOURCE_MAP.put("sydcw.net", "閲嶅簡鍟嗕笟鍦颁骇缃�"); + SOURCE_MAP.put("gov86.cn", "涓浗鎷涘晢鐑嚎"); + SOURCE_MAP.put("ctrip.com", "鎼虹▼"); + SOURCE_MAP.put("fdc668.com", "澶ц繛鎴垮湴浜х綉"); + SOURCE_MAP.put("zhuapo.com", "鎶撶牬缃�"); + SOURCE_MAP.put("51room.net", "51鎴夸骇缃�"); + SOURCE_MAP.put("tgxzl.com", "鍥㈣喘鍐欏瓧妤肩綉"); + SOURCE_MAP.put("fbook360.com", "鎴挎挱瀹�"); + SOURCE_MAP.put("szhome.com", "鎴跨綉浜屾墜鎴�"); + SOURCE_MAP.put("0757home.com", "浣涘北鎴垮眿缃�"); + SOURCE_MAP.put("citygf.com", "骞夸經閮藉競缃�"); + SOURCE_MAP.put("wincn.com", "浣涘北鎷涘晢缃�"); + SOURCE_MAP.put("fangdr.com", "鎴垮崥澹�"); + SOURCE_MAP.put("fzfc.com.cn", "绂忓窞鎴夸骇缃�"); + SOURCE_MAP.put("fangke.cn", "鎴垮缃�"); + SOURCE_MAP.put("fdc668.com", "绂忓窞鎴垮湴浜х綉"); + SOURCE_MAP.put("hrbslfc.com", "涓栬仈鎴垮湴浜�"); + SOURCE_MAP.put("96963.com", "鍝堝皵婊ㄤ俊鎭腐"); + SOURCE_MAP.put("hlj.net", "榛戦緳姹熶俊鎭腐"); + SOURCE_MAP.put("0451zf.com", "鍝堝競鍦ㄧ嚎"); + SOURCE_MAP.put("fc0531.com", "娴庢埧缃�"); + SOURCE_MAP.put("fdc668.com", "娴庡崡鎴垮湴浜�"); + SOURCE_MAP.put("jnfdc.gov.cn", "娴庡崡浣忓畢涓庢埧鍦颁骇淇℃伅缃�"); + SOURCE_MAP.put("jnhouse.com.cn", "娴庡崡鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("iqilu.com", "榻愰瞾缃�"); + SOURCE_MAP.put("lanfw.com", "钃濇埧缃�"); + SOURCE_MAP.put("house-jn.com", "娴庡崡鎴夸骇鍦ㄧ嚎"); + SOURCE_MAP.put("d2d.cn", "閲嶅簡鎴夸骇缃�"); + SOURCE_MAP.put("kunming.cn", "鏄嗘槑淇℃伅娓�"); + SOURCE_MAP.put("inpuu.com", "璧㈤摵缃�"); + SOURCE_MAP.put("haopoo.com", "濂介摵缃�"); + SOURCE_MAP.put("shangpusou.com", "鍟嗘姇缃�"); + SOURCE_MAP.put("menmian.com", "闂ㄩ潰缃�"); + SOURCE_MAP.put("hpe.cn", "榛勬郸鏁欒偛锛堝皬瀛︼級"); + SOURCE_MAP.put("hpe.cn", "榛勬郸鏁欒偛锛堝垵涓級"); + SOURCE_MAP.put("sh.cn", "闂稿寳鏁欒偛锛堝皬瀛︼級"); + SOURCE_MAP.put("sh.cn", "闂稿寳鏁欒偛锛堝垵涓級"); + SOURCE_MAP.put("sh.cn", "铏瑰彛鏁欒偛"); + SOURCE_MAP.put("eju.com", "鏄撳眳璐埧缃�"); + SOURCE_MAP.put("officeqd.com", "闈掑矝鍐欏瓧妤间俊鎭綉"); + SOURCE_MAP.put("qdbgl.com", "闈掑矝鍐欏瓧妤肩綉qdbgl"); + SOURCE_MAP.put("qingdaonews.com", "闈掑矝鏂伴椈缃�"); + SOURCE_MAP.put("xzlzl.cn", "闈掑矝鍐欏瓧妤肩璧佺綉"); + SOURCE_MAP.put("sd.cn", "闈掑矝鎴夸骇鍦ㄧ嚎"); + SOURCE_MAP.put("homelink.com.cn", "閾惧鍦ㄧ嚎"); + SOURCE_MAP.put("tedahu.com", "鐗瑰ぇ鎴风綉"); + SOURCE_MAP.put("lnfcw.net", "杈藉畞鎴夸骇缃�"); + SOURCE_MAP.put("0311.com.cn", "鏂板煄缃�"); + SOURCE_MAP.put("funxoo.com", "鎴跨缃�"); + SOURCE_MAP.put("fdc668.com", "鑻忓窞鎴垮湴浜х綉"); + SOURCE_MAP.put("longcity.net", "浣忓湪榫欏煄"); + SOURCE_MAP.put("anju51.cn", "瀹夊眳鏃犲咖"); + SOURCE_MAP.put("haofang.net", "濂芥埧鍦ㄧ嚎"); + SOURCE_MAP.put("xinfun.net", "鏂版埧缃�"); + SOURCE_MAP.put("xmzf.net", "鍘﹂棬绉熸埧缃�"); + SOURCE_MAP.put("fcjjr.com", "涓邯浜掕仈"); + SOURCE_MAP.put("xmfc.com", "鍘﹂棬鎴夸骇缃�"); + SOURCE_MAP.put("xmfangzi.com", "鍘﹂棬鎴垮瓙缃�"); + SOURCE_MAP.put("xmhouse.com", "鍘﹂棬鎴垮湴浜ц仈鍚堢綉"); + SOURCE_MAP.put("517gf.com", "517璐埧缃�"); + SOURCE_MAP.put("fdc668.com", "涓北鎴垮湴浜х綉"); + SOURCE_MAP.put("66fc.com", "涓北鎴垮湴浜�"); + SOURCE_MAP.put("zsfdc.gov.cn", "涓北甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("zsnews.cn", "涓北妤煎競缃�"); + SOURCE_MAP.put("zgfdc.net", "涓北妤煎競"); + SOURCE_MAP.put("0760dc.com", "涓北鎴夸骇缃�"); + SOURCE_MAP.put("mhedu.sh.cn", "闂佃鎷涚敓鑰冭瘯淇℃伅鍏紑"); + SOURCE_MAP.put("eicbs.com", "瀹濆北鏁欒偛锛堝皬瀛︼級"); + SOURCE_MAP.put("eicbs.com", "瀹濆北鏁欒偛锛堜腑瀛︼級"); + SOURCE_MAP.put("sjedu.cn", "鏉炬睙鏁欒偛"); + SOURCE_MAP.put("sh.cn", "閲戝北鏁欒偛"); + SOURCE_MAP.put("hospital2", "鍖婚櫌澶у叏缃�"); + SOURCE_MAP.put("qiuyi.cn", "姹傚尰缃�"); + SOURCE_MAP.put("fh21.com.cn", "椋炲崕鍋ュ悍缃�"); + SOURCE_MAP.put("pharmnet.com.cn", "鍖昏嵂缃�"); + SOURCE_MAP.put("dg163.cn", "涓滆帪鍋ュ悍缃�"); + SOURCE_MAP.put("qingdaonews.com", "闈掑矝鍖婚櫌缃戜笂鎸傚彿"); + SOURCE_MAP.put("69jk.cn", "涓浗鍋ュ悍缃�"); + SOURCE_MAP.put("sina.com", "鏂版氮鍋ュ悍"); + SOURCE_MAP.put("cq.cn", "涓囧窞鏁欒偛"); + SOURCE_MAP.put("cq.cn", "涓囧窞鏁欒偛锛堝鍓嶏級"); + SOURCE_MAP.put("cdzk.net", "鎴愰兘鎷涚敓鑰冭瘯缃�"); + SOURCE_MAP.put("dl.gov.cn", "涓浗澶ц繛"); + SOURCE_MAP.put("dledu.com", "澶ц繛鏁欒偛"); + SOURCE_MAP.put("dledu.com", "澶ц繛鏁欒偛锛堟皯鍔烇級"); + SOURCE_MAP.put("dledu.com", "澶ц繛鏁欒偛锛堟瑙堬級"); + SOURCE_MAP.put("dgjy.net", "涓滆帪鏁欒偛"); + SOURCE_MAP.put("sun0769.com", "涓滆帪闃冲厜缃�"); + SOURCE_MAP.put("fsjy.net", "浣涘北鏁欒偛淇℃伅娓�"); + SOURCE_MAP.put("chancheng.gov.cn", "浣涘北绂呭煄"); + SOURCE_MAP.put("fsjy.net", "浣涘北鏁欒偛淇℃伅"); + SOURCE_MAP.put("fuzhou.gov.cn", "涓浗绂忓窞"); + SOURCE_MAP.put("hledu.net", "鍝堝皵婊ㄦ暀鑲茶鏀跨綉"); + SOURCE_MAP.put("jnedu.gov.cn", "娴庡崡甯傛暀鑲插眬"); + SOURCE_MAP.put("qdedu.gov.cn", "闈掑矝甯傛暀鑲插眬"); + SOURCE_MAP.put("qingdaonews.com", "闈掑矝鏂伴椈缃�"); + SOURCE_MAP.put("ln.gov.cn", "杈藉畞鐪佷汉姘戞斂搴�"); + SOURCE_MAP.put("shanxigov.cn", "灞辫タ鐪佷汉姘戞斂搴�"); + SOURCE_MAP.put("xmedu.gov.cn", "鍘﹂棬甯傛暀鑲插眬"); + SOURCE_MAP.put("zsedu.net", "涓北鏁欒偛璐㈠姟缃�"); + SOURCE_MAP.put("zs.gov.cn", "涓浗涓北"); + SOURCE_MAP.put("sdfdc.com", "灞变笢鎴垮湴浜х綉"); + SOURCE_MAP.put("soho365.net", "娴庡崡鍐欏瓧妤肩綉"); + SOURCE_MAP.put("suzhou.gov.cn", "涓浗鑻忓窞"); + SOURCE_MAP.put("dcjy.net", "涓滃煄鏁欒偛"); + SOURCE_MAP.put("hdavec.org", "娴锋穩鏁欒偛缃�"); + SOURCE_MAP.put("ftedu.gov.cn", "涓板彴鏁欒偛灏忓"); + SOURCE_MAP.put("ftedu.gov.cn", "涓板彴鏁欒偛涓"); + SOURCE_MAP.put("bjedu.cn", "闂ㄥご娌熸暀鑲蹭俊鎭綉"); + SOURCE_MAP.put("tzedu.gov.cn", "閫氬窞鍖烘暀鑲插鍛樹細"); + SOURCE_MAP.put("shyedu.gov.cn", "鏁欒偛璧勬簮"); + SOURCE_MAP.put("hredu.gov.cn", "鎬�鏌旈槼鍏夋暀鑲茬綉"); + SOURCE_MAP.put("szftedu.cn", "绂忕敯鏁欒偛缃�"); + SOURCE_MAP.put("360fc.cn", "360鎴夸骇缃�"); + SOURCE_MAP.put("371fang.cn", "閮戞埧缃�"); + SOURCE_MAP.put("371house.com", "閮戝窞妤煎競"); + SOURCE_MAP.put("dahehouse.com", "澶ф渤鎴夸骇"); + SOURCE_MAP.put("zzloupan.com", "閮戝窞妤肩洏缃�"); + SOURCE_MAP.put("51zupu.com", "鎴戣绉熼摵缃�"); + SOURCE_MAP.put("bendibao.com", "鏈湴瀹�"); + SOURCE_MAP.put("yes515.com", "515鎴夸骇缃�"); + SOURCE_MAP.put("yaoee.com", "鏄撴槗缃�"); + SOURCE_MAP.put("shangdu.com", "鍟嗛兘缃�"); + SOURCE_MAP.put("360fc.cn", "360鎴夸骇缃�"); + SOURCE_MAP.put("fanging.com", "娌冲崡鎴夸骇缃�"); + SOURCE_MAP.put("371house.com", "閮戝窞妤煎競缃�"); + SOURCE_MAP.put("zzedu.net.cn", "閮戝窞鏁欒偛淇℃伅缃�"); + SOURCE_MAP.put("bgo.cn", "蹇呭"); + SOURCE_MAP.put("myliving.cn", "绉熷敭鎯呮姤缃�"); + SOURCE_MAP.put("kunfun.com", "鏄嗘埧缃�"); + SOURCE_MAP.put("39world.com", "39鍋ュ悍涓栫晫"); + SOURCE_MAP.put("wolai.com", "鎴戞潵鎴夸骇"); + SOURCE_MAP.put("kunshan0512.com", "鏄嗗北鍦颁骇缃�"); + SOURCE_MAP.put("ksshangpu.com", "鏄嗗北鍟嗛摵绉熷敭"); + SOURCE_MAP.put("di1fang.com", "鏄嗗北绗竴鎴夸骇"); + SOURCE_MAP.put("ksfc.gov.cn", "鏄嗗北鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("510wx.com", "510鎴夸骇"); + SOURCE_MAP.put("wxfcw.com", "鏃犻敗鎴夸骇缃�"); + SOURCE_MAP.put("thmzfc.com", "鏄庣彔鎴夸骇缃�"); + SOURCE_MAP.put("http://efw.cn/", "e鎴跨綉"); + SOURCE_MAP.put("taihuwang.com", "鏃犻敗澶箹缃�"); + SOURCE_MAP.put("0574-office.com", "瀹佹尝鍐欏瓧妤肩鍞綉"); + SOURCE_MAP.put("nbre001.com", "瀹佹尝鍟嗕笟鍦颁骇缃�"); + SOURCE_MAP.put("cnnb.com.cn", "瀹佹尝鍦颁骇缃�"); + SOURCE_MAP.put("ihoome.com", "鐖卞缃�"); + SOURCE_MAP.put("xafc.com", "鏂板畨鍐欏瓧妤�"); + SOURCE_MAP.put("365jia.cn", "涓囧鎴夸骇"); + SOURCE_MAP.put("sydcw.net", "鍚堣偉鍟嗕笟鍦颁骇缃�"); + SOURCE_MAP.put("hfhome.cn", "鍚堣偉瀹跺洯缃�"); + SOURCE_MAP.put("haoju.cn", "濂藉眳"); + SOURCE_MAP.put("for2000.com", "鍗楁槍鍐欏瓧妤肩綉"); + SOURCE_MAP.put("lfang.com", "鐖辨埧缃�"); + SOURCE_MAP.put("5y365.com", "鏃犲咖365璐埧缃�"); + SOURCE_MAP.put("0731.cn", "闀挎牚娼埧浜х綉"); + SOURCE_MAP.put("changsha.cn", "闀挎矙鎴夸骇缃�"); + SOURCE_MAP.put("xf88.com", "婀樻埧缃�"); + SOURCE_MAP.put("5j99.com", "鏂扮幆澧冩埧灞�"); + SOURCE_MAP.put("fangle.com", "鎴夸箰缃�"); + SOURCE_MAP.put("cztzy.com", "闀挎牚娼疆涓�"); + SOURCE_MAP.put("changchunfangdichan.com", "闀挎槬鎴垮湴浜х綉"); + SOURCE_MAP.put("365jilin.com", "鍚夊拰鎴夸骇"); + SOURCE_MAP.put("kanfangji.com", "鐪嬫埧缃�"); + SOURCE_MAP.put("gzre.com", "璐甸槼鎴垮湴浜т氦鏄撶綉"); + SOURCE_MAP.put("ythouse.com", "鐑熷彴鎴垮湴浜х綉"); + SOURCE_MAP.put("house-yt.com", "鐑熷彴鎴夸骇鍦ㄧ嚎"); + SOURCE_MAP.put("hiao.com", "鐑熷彴濂界綉"); + SOURCE_MAP.put("fcdbz.com", "鎴夸骇澶у反鎵�"); + SOURCE_MAP.put("xjfangwu.com", "鏂扮枂鎴垮眿缃�"); + SOURCE_MAP.put("gshouse.com", "鐢樻埧缃�"); + SOURCE_MAP.put("lejiazhiye.cn", "涔愬鎴夸骇缃�"); + SOURCE_MAP.put("jufang.cc", "娴疯タ鑱氭埧缃�"); + SOURCE_MAP.put("qzfc.com", "澶ф硥宸炴埧浜х綉"); + SOURCE_MAP.put("0471fcw.com", "0471鎴夸骇缃�"); + SOURCE_MAP.put("365hf.com", "鍛煎拰娴╃壒鎴垮湴浜х綉"); + SOURCE_MAP.put("fooju.com.cn", "绂忓眳缃�"); + SOURCE_MAP.put("nmgfc.cn", "鍐呰挋鍙ゆ埧鍦颁骇"); + SOURCE_MAP.put("577house.com", "娓╁窞鎴夸骇鐑嚎"); + SOURCE_MAP.put("ntfdc.net", "鍗楅�氭埧浜т俊鎭綉"); + SOURCE_MAP.put("nthfw.com", "濂芥埧缃憂thfw"); + SOURCE_MAP.put("nthaohe.com", "婵犳渤缃�"); + SOURCE_MAP.put("xfzc.com", "瀵绘埧涔嬬獥"); + SOURCE_MAP.put("86516.com", "褰煄瑙嗙獥"); + SOURCE_MAP.put("52fdc.com", "52鎴垮湴浜х綉"); + SOURCE_MAP.put("xz21th.com", "21涓栫邯鎴垮眿缃崲"); + SOURCE_MAP.put("pcls.com.cn", "褰煄妤煎競缃�"); + SOURCE_MAP.put("xzloushi.cn", "寰愬窞妤煎競"); + SOURCE_MAP.put("jilinfc.com", "鎴夸骇涔嬪"); + SOURCE_MAP.put("sydcw.net", "鍚夋灄鍟嗕笟鍦颁骇"); + SOURCE_MAP.put("jlmaifang.com", "鍚夋灄涔版埧"); + SOURCE_MAP.put("dianping.com", "澶т紬鐐硅瘎"); + SOURCE_MAP.put("0772fang.com", "鏌虫埧缃�"); + SOURCE_MAP.put("ljia.net", "鎭嬪缃�"); + SOURCE_MAP.put("whhouse.com", "濞佹捣鎴垮湴浜х綉"); + SOURCE_MAP.put("yzfdc.cn", "鎵窞鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("yzfdcw.com", "鎵窞鎴夸骇缃�"); + SOURCE_MAP.put("yz2shou.com", "鎵窞浜屾墜缃�"); + SOURCE_MAP.put("my0511.com", "闀囨睙鎴夸骇缃�"); + SOURCE_MAP.put("anjia8.com", "瀹夊鍚�"); + SOURCE_MAP.put("jsw.com.cn", "闀囨睙绗竴鎴夸骇缃�"); + SOURCE_MAP.put("zjgfw.com", "闀囨睙璐埧缃�"); + SOURCE_MAP.put("ycfcw.com", "鐩愬煄鎴夸骇缃憏cfcw"); + SOURCE_MAP.put("ychouse.com", "鐩愬煄鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("0515house.cn", "鐩愬煄绗竴鎴夸骇缃�"); + SOURCE_MAP.put("yfcw.cn/", "鐩愬煄鎴夸骇缃憏fcw"); + SOURCE_MAP.put("ejcs.com.cn", "瀹滃眳鍩庡競"); + SOURCE_MAP.put("fclm.cn", "鎴夸骇鑱旂洘"); + SOURCE_MAP.put("0573ren.com", "鍢夊叴浜烘埧浜�"); + SOURCE_MAP.put("0579.cn", "娴欎腑鍦ㄧ嚎"); + SOURCE_MAP.put("zz.cc", "閮戝窞鎴夸骇缃慱zz"); + SOURCE_MAP.put("haofung.com", "濂芥埧缃慼aofung"); + SOURCE_MAP.put("fanging.com", "骞抽《灞辨埧浜х綉"); + SOURCE_MAP.put("ahhouse.com", "瀹夋埧缃�"); + SOURCE_MAP.put("zgsof.com", "鑷础鎼滄埧缃�"); + SOURCE_MAP.put("tsloushi.com", "鍞愬北妤煎競缃�"); + SOURCE_MAP.put("csfcw.com", "甯哥啛鎴夸骇缃�"); + SOURCE_MAP.put("jscsfc.com", "甯哥啛閫忔槑鍞埧缃�"); + SOURCE_MAP.put("wjhouse.com", "鍚存睙鎴夸骇瀹跺眳缃�"); + SOURCE_MAP.put("xhdch.com", "鏂版亽杩晢涓氬湴浜�"); + SOURCE_MAP.put("enorth.com.cn", "鍖楁柟缃�"); + SOURCE_MAP.put("962013.com", "鑻忔埧缃�"); + SOURCE_MAP.put("gsfcw.com", "濮戣嫃鎴夸骇缃�"); + SOURCE_MAP.put("kunshan0512.com", "鏄嗗北鍦颁骇缃�"); + SOURCE_MAP.put("js.cn", "鏄嗗北鎴夸骇缃�"); + SOURCE_MAP.put("szhome.com", "娣卞湷鍟嗕笟鍦颁骇"); + SOURCE_MAP.put("efw.cn", "e鎴跨綉"); + SOURCE_MAP.put("5asydc.com", "鍟嗕笟鍦颁骇缃�"); + SOURCE_MAP.put("zjol.com.cn/", "浣忓湪鏉窞缃�"); + SOURCE_MAP.put("365jia.cn", "涓囧鐑嚎"); + SOURCE_MAP.put("fdc.com.cn", "浜挎埧"); + SOURCE_MAP.put("jxdcw.com", "姹熻タ鍦颁骇缃�"); + SOURCE_MAP.put("xkhouse.com", "鏄熺┖鍦颁骇缃�"); + SOURCE_MAP.put("fangyuan365.com", "闀挎矙365鎴夸骇缃�"); + SOURCE_MAP.put("hfhouse.com", "鍚堣偉鎴垮湴浜т氦鏄撲俊鎭綉"); + SOURCE_MAP.put("ccgoufang.com", "璐埧缃慶cgoufang"); + SOURCE_MAP.put("soufang365.com", "榫欐睙鎼滄埧"); + SOURCE_MAP.put("99.com.cn", "99鍋ュ悍缃�"); + SOURCE_MAP.put("yynet.cn", "鍖诲厓缃�"); + SOURCE_MAP.put("sdfdc.com", "灞辨埧"); + SOURCE_MAP.put("jnfdc.gov.cn", "娴庡崡浣忓畢涓庢埧鍦颁骇淇℃伅缃�"); + SOURCE_MAP.put("iqilu.com", "榻愰瞾缃�"); + SOURCE_MAP.put("sdchina.com", "涓浗灞变笢缃�"); + SOURCE_MAP.put("familydoctor.com.cn", "瀹跺涵鍖荤敓鍦ㄧ嚎"); + SOURCE_MAP.put("lanfw.com", "钃濇埧缃�"); + SOURCE_MAP.put("changchunfangdichan.com", "闀挎槬鎴垮湴浜х綉"); + SOURCE_MAP.put("ythouse.com", "鐑熷彴鎴垮湴浜х綉"); + SOURCE_MAP.put("jiaodong.net", "鑳朵笢鎴夸骇缃�"); + SOURCE_MAP.put("shm.com.cn", "姘存瘝鎴夸骇"); + SOURCE_MAP.put("yantai.hiao.com", "鐑熷彴濂芥埧"); + SOURCE_MAP.put("xjfangwu.com", "鏂扮枂鎴垮眿缃�"); + SOURCE_MAP.put("xjfc.com.cn", "涔岄瞾鏈ㄩ綈鎴夸骇缃�"); + SOURCE_MAP.put("fcdbz.com", "鎴夸骇澶у反鎵�"); + SOURCE_MAP.put("xjhouse.cn", "鏂扮枂鎴夸骇缃憍jhouse"); + SOURCE_MAP.put("jefun.cn", "鐢樻埧缃�"); + SOURCE_MAP.put("xmfc.com", "鍘﹂棬鎴夸骇缃�"); + SOURCE_MAP.put("xmhouse.com", "鍘﹂棬鎴垮湴浜ц仈鍚堢綉"); + SOURCE_MAP.put("ffw.com.cn", "绂忔埧缃�"); + SOURCE_MAP.put("sun0769.com", "闃冲厜鎴夸骇缃�"); + SOURCE_MAP.put("dg163.cn", "涓滆帪鎴垮湴浜х綉"); + SOURCE_MAP.put("home77.com", "鎴胯缃�"); + SOURCE_MAP.put("qfang.com", "Q鎴跨綉"); + SOURCE_MAP.put("fssydc.com", "浣涘北鍟嗕笟鍦颁骇缃�"); + SOURCE_MAP.put("95191.com", "妤煎競閫�"); + SOURCE_MAP.put("longcity.net", "浣忓湪榫欏煄"); + SOURCE_MAP.put("52youju.com", "浼樺眳缃�"); + SOURCE_MAP.put("inhe.cn", "閾舵渤鎴夸骇缃�"); + SOURCE_MAP.put("shdc.org.cn", "鍖昏仈缃�"); + SOURCE_MAP.put("haodf.com", "濂藉ぇ澶湪绾�"); + SOURCE_MAP.put("sohu.com", "鎼滅嫄鍋ュ悍"); + SOURCE_MAP.put("39.net", "灏卞尰鍔╂墜"); + SOURCE_MAP.put("zhijia.com", "缃缃�"); + SOURCE_MAP.put("kunming.cn", "鏄嗘槑淇℃伅娓�"); + SOURCE_MAP.put("kmfcw.com", "鏄嗘槑鎴夸骇缃�"); + SOURCE_MAP.put("qzfc.com", "澶ф硥宸炴埧浜х綉"); + SOURCE_MAP.put("jufang.cc", "娴疯タ鑱氭埧缃�"); + SOURCE_MAP.put("qingkai.com", "闈掑矝寮�鍙戝尯淇℃伅娓�"); + SOURCE_MAP.put("qingdaonews.com", "闈掑矝鏂伴椈缃�"); + SOURCE_MAP.put("51fdc.com", "鏃犲咖鎴跨綉"); + SOURCE_MAP.put("qdfd.com.cn", "闈掑矝缃戜笂鎴垮湴浜�"); + SOURCE_MAP.put("365hf.com", "鍛煎拰娴╃壒鎴垮湴浜х綉"); + SOURCE_MAP.put("fooju.com.cn", "绂忓眳缃�"); + SOURCE_MAP.put("0471fcw.com", "0471鎴夸骇缃�"); + SOURCE_MAP.put("0577home.net", "娓╁窞鎴跨綉"); + SOURCE_MAP.put("0577wzlf.com", "娓╁窞钃濇埧缃�"); + SOURCE_MAP.put("sky008.com", "澶╃┖鎴夸骇缃�"); + SOURCE_MAP.put("nthaohe.com", "婵犳渤缃�"); + SOURCE_MAP.put("0513.org", "婵犳花鎴夸骇"); + SOURCE_MAP.put("nthfw.com", "濂芥埧缃�"); + SOURCE_MAP.put("ntfdc.net", "鍗楅�氭埧浜т俊鎭綉"); + SOURCE_MAP.put("1f.cn", "鏄撴埧"); + SOURCE_MAP.put("fangle.com", "鎴夸箰缃�"); + SOURCE_MAP.put("xfzc.com", "瀵绘埧涔嬬獥"); + SOURCE_MAP.put("86516.com", "褰煄瑙嗙獥"); + SOURCE_MAP.put("52fdc.com", "52鎴垮湴浜�"); + SOURCE_MAP.put("pcls.com.cn", "褰煄妤煎競缃�"); + SOURCE_MAP.put("xzloushi.cn", "寰愬窞妤煎競"); + SOURCE_MAP.put("xnfcsc.com", "瑗垮畞鎴夸骇甯傚満缃�"); + SOURCE_MAP.put("0971fc.com", "瑗挎埧缃�"); + SOURCE_MAP.put("xiadu.com", "澶忛兘缃�"); + SOURCE_MAP.put("nxfang.com", "瀹佸鎴跨綉"); + SOURCE_MAP.put("nxsq.com", "瀹佸浠曞鎴夸骇缃�"); + SOURCE_MAP.put("haofung.com", "濂芥埧缃慼aofung"); + SOURCE_MAP.put("haofang.net", "濂芥埧鍦ㄧ嚎"); + SOURCE_MAP.put("hinews.cn", "鍗楁捣缃�"); + SOURCE_MAP.put("hkfdcw.com", "娴峰彛鎴垮湴浜х綉"); + SOURCE_MAP.put("wokanfang.com", "鐪嬫埧缃�"); + SOURCE_MAP.put("wofang.com", "鎴戞埧缃�"); + SOURCE_MAP.put("wftzfc.com", "娼嶅潑澶╂辰鎴夸骇缃�"); + SOURCE_MAP.put("wffdc.com", "灞变笢鎴垮湴浜х綉"); + SOURCE_MAP.put("zyloushi.com", "涓師妤煎競"); + SOURCE_MAP.put("lyloushi.com", "娲涢槼妤煎競"); + SOURCE_MAP.put("bleju.com", "鐧句箰灞�"); + SOURCE_MAP.put("0379city.com", "娲涘煄鎴夸骇"); + SOURCE_MAP.put("zbsydc.com", "娣勫崥鍟嗕笟鍦颁骇缃�"); + SOURCE_MAP.put("hellozb.com", "娣勬埧缃�"); + SOURCE_MAP.put("zbhouse.cn", "娣勫崥鎴夸骇缃�"); + SOURCE_MAP.put("zbzzfdc.gov.cn", "娣勫崥浣忓畢涓庢埧鍦颁骇淇℃伅缃�"); + SOURCE_MAP.put("0575ls.cn", "缁嶅叴妤煎競缃�"); + SOURCE_MAP.put("sxhouse.cn", "缁嶅叴鎴夸骇缃�"); + SOURCE_MAP.put("tzlsw.cn", "鍙板窞妤煎競缃�"); + SOURCE_MAP.put("tzeju.com", "鍙板窞鏄撳眳缃�"); + SOURCE_MAP.put("fc0576.com", "鍙板窞鎴夸骇缃�"); + SOURCE_MAP.put("tzfy.cn", "鍙板窞鎴挎簮缃�"); + SOURCE_MAP.put("haofang365.com", "濂芥埧365"); + SOURCE_MAP.put("zhland.com", "鐝犳捣鎴夸骇缃�"); + SOURCE_MAP.put("house10000.com", "涓北涓囨埧缃�"); + SOURCE_MAP.put("zsnews.cn", "涓北缃�"); + SOURCE_MAP.put("0760dc.com", "涓北鎴夸骇缃�"); + SOURCE_MAP.put("0772fang.com", "鏌虫埧缃�"); + SOURCE_MAP.put("zp365.com", "浣忔湅缃�"); + SOURCE_MAP.put("0754fw.com", "姹曞ご鎴跨綉"); + SOURCE_MAP.put("tt5598.com", "姹曞ご闆呭眳缃�"); + SOURCE_MAP.put("wolai.com", "鎴戞潵鎴夸骇"); + SOURCE_MAP.put("bdinfo.net", "浜掑姩鎴跨紭"); + SOURCE_MAP.put("3650310.net", "鎴夸骇妤煎競"); + SOURCE_MAP.put("weihaifc.net", "濞佹捣鎴夸骇缃�"); + SOURCE_MAP.put("venfang.com", "闂埧缃�"); + SOURCE_MAP.put("iweihai.cn", "鐖卞▉娴�"); + SOURCE_MAP.put("veryhome.com", "濞佹捣鎴垮湴浜х綉"); + SOURCE_MAP.put("whhouse.com.cn", "濞佹捣鎴夸俊缃�"); + SOURCE_MAP.put("whinfo.net.cn", "濞佹捣淇℃伅娓�"); + SOURCE_MAP.put("0572hu.com", "浣忓湪婀栧窞缃�"); + SOURCE_MAP.put("nantaihu.com", "鍗楀お婀栨埧浜�"); + SOURCE_MAP.put("hz66.com", "婀栧窞鍦ㄧ嚎"); + SOURCE_MAP.put("hutaihu.com", "澶箹缃�"); + SOURCE_MAP.put("yzfc.cn", "鎵埧缃�"); + SOURCE_MAP.put("yzkdfcw.com", "鎵窞瀹藉甫鎴夸骇缃�"); + SOURCE_MAP.put("yzjia.com", "鎵窞瀹跺洯"); + SOURCE_MAP.put("yzfyw.com", "鎵窞鎴挎簮缃�"); + SOURCE_MAP.put("yzfdc.cn", "鎵窞鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("yzfdcw.com", "鎵窞鎴夸骇缃�"); + SOURCE_MAP.put("jsw.com.cn", "闀囨睙绗竴鎴夸骇缃�"); + SOURCE_MAP.put("zjgfw.com", "闀囨睙璐埧缃�"); + SOURCE_MAP.put("anjia8.com", "瀹夊鍚�"); + SOURCE_MAP.put("goufw.com", "GO鎴跨綉"); + SOURCE_MAP.put("ycfcw.com", "鐩愬煄鎴夸骇缃�"); + SOURCE_MAP.put("ycfczx.com", "鐩愬煄鎴夸骇鍜ㄨ缃�"); + SOURCE_MAP.put("0515house.cn", "鐩愬煄绗竴鎴夸骇缃�"); + SOURCE_MAP.put("ycmfw.com", "鐩愬煄涔版埧缃�"); + SOURCE_MAP.put("fclm.cn", "鎴夸骇鑱旂洘"); + SOURCE_MAP.put("0573ren.com", "鍢夊叴浜烘埧浜�"); + SOURCE_MAP.put("cnjxol.com", "鍢夊叴鍦ㄧ嚎"); + SOURCE_MAP.put("yijuhome.com", "瀹滃眳瀹跺洯"); + SOURCE_MAP.put("0579zf.com", "閲戝崕鎵炬埧缃�"); + SOURCE_MAP.put("0579fw.com", "閲戝崕鎴跨綉"); + SOURCE_MAP.put("0579fang.com", "閲戝崕鎴夸骇缃�"); + SOURCE_MAP.put("tzfdc.com.cn", "娉板窞鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("t56.net", "娉版棤鑱婃埧浜х綉"); + SOURCE_MAP.put("fj360.com", "鎴块泦缃�"); + SOURCE_MAP.put("ufang.com", "U鎴跨綉"); + SOURCE_MAP.put("fz0752.com", "鎯犳皯涔嬪"); + SOURCE_MAP.put("szhome.com", "鏂版埧鍦ㄧ嚎"); + SOURCE_MAP.put("hzcom.cn", "鎯犲窞鎴夸骇"); + SOURCE_MAP.put("0750fw.com", "姹熼棬鎴跨綉"); + SOURCE_MAP.put("gohome114.com", "鎴夸骇鑱旂洘gohome114"); + SOURCE_MAP.put("0731fdc.com", "0731鎴夸骇缃�"); + SOURCE_MAP.put("xf88.com", "婀樻埧缃�"); + SOURCE_MAP.put("zzzye.com/", "鏍床缃笟"); + SOURCE_MAP.put("hi0734.com", "浣犲ソ琛¢槼缃�"); + SOURCE_MAP.put("hyfdcw.com", "琛¢槼鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("hejia.tv", "鍚堝缃�"); + SOURCE_MAP.put("pdshouse.com", "骞抽《灞辨埧浜�"); + SOURCE_MAP.put("pdsloushi.com", "骞抽《灞辨ゼ甯�"); + SOURCE_MAP.put("liaoing.com", "鑱婂畢缃�"); + SOURCE_MAP.put("douanju.com", "閮藉畨灞�"); + SOURCE_MAP.put("9ilou.com", "璧e窞鐖辨ゼ甯�"); + SOURCE_MAP.put("jjxwfc.com", "澶т節姹熸埧浜х綉"); + SOURCE_MAP.put("lfang.com", "鐖辨埧缃�"); + SOURCE_MAP.put("zzjjw.cn", "浣忓湪涔濇睙"); + SOURCE_MAP.put("ahhouse.com", "瀹夋埧缃�"); + SOURCE_MAP.put("mytaofang.com", "娣樻埧瀹跺眳缃�"); + SOURCE_MAP.put("mychefang.com", "杞︽埧缃�"); + SOURCE_MAP.put("mdjhouse.com", "鐗′腹姹熸埧浜х綉"); + SOURCE_MAP.put("iwu123.com", "鐖卞眿缃�"); + SOURCE_MAP.put("masff.com", "鎴挎埧缃�"); + SOURCE_MAP.put("0555yi.com", "鏄撴埧缃�"); + SOURCE_MAP.put("gdmmfdc.com", "鑼傚悕鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("ylw0813.com", "鐩愰緳缃�"); + SOURCE_MAP.put("zg163.net", "鑷础鎴垮湴浜�"); + SOURCE_MAP.put("0570fc.com", "琛㈠窞鎴夸骇缃�"); + SOURCE_MAP.put("qzfdc.com", "琛㈠窞鎴垮湴浜х綉"); + SOURCE_MAP.put("qz123.com", "琛㈠窞鎴夸骇棰戦亾"); + SOURCE_MAP.put("0316.cc", "寤婃埧缃�"); + SOURCE_MAP.put("lfang.cn", "绗竴鎴夸骇缃�"); + SOURCE_MAP.put("xtfconline.com", "婀樻江鎴夸骇鍦ㄧ嚎"); + SOURCE_MAP.put("0731.cn", "闀挎牚娼埧浜х綉"); + SOURCE_MAP.put("fun114.com", "婀樻江鎴夸骇缃�"); + SOURCE_MAP.put("haofz.com", "濂芥埧瀛�"); + SOURCE_MAP.put("3qhouse.com", "涓夌Е鎴夸骇缃�"); + SOURCE_MAP.put("800j.com.cn", "鍏櫨瀹�"); + SOURCE_MAP.put("0744fz.com", "寮犲鐣屼拱鎴跨綉"); + SOURCE_MAP.put("sqanju.com", "瀹夊眳缃�"); + SOURCE_MAP.put("xiangyu.cc", "椤圭窘鎴夸骇缃�"); + SOURCE_MAP.put("sqfcw.com.cn", "瑗挎鎴夸骇缃�"); + SOURCE_MAP.put("sqfcw.cc", "瀹胯縼鎴夸骇缃�"); + SOURCE_MAP.put("xiangyang.net", "鐧捐吘鐑嚎"); + SOURCE_MAP.put("xyfc.com", "瑗勯槼鎴夸骇"); + SOURCE_MAP.put("xfsfc.com.cn", "瑗勯槼浣忓畢涓庢埧鍦颁骇淇℃伅缃�"); + SOURCE_MAP.put("0710hf.com", "瑗勯槼濂芥埧缃�"); + SOURCE_MAP.put("tsloushi.com", "鍞愬北妤煎競缃�"); + SOURCE_MAP.put("tangrenju.net", "鍞愪汉灞�"); + SOURCE_MAP.put("tsfcxx.com", "鍞愬北鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("0775fcw.com", "鐜夋灄鎴夸骇缃�"); + SOURCE_MAP.put("http://ylfct.com/", "鐜夋灄鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("fangyuan365.com", "寮犲鐣�365鎴夸骇缃�"); + SOURCE_MAP.put("syfff.com", "涓変簹鍦颁骇淇℃伅缃�"); + SOURCE_MAP.put("fhainan.com", "娴峰崡璐埧缃�"); + SOURCE_MAP.put("lpslzl.com", "鍏洏姘磋仈浼楀姏鎴夸骇缃�"); + SOURCE_MAP.put("0831f.com", "瀹滄埧缃�"); + SOURCE_MAP.put("hiputian.com", "鑾嗙敯鏂板煄鎴夸骇"); + SOURCE_MAP.put("pzhls.com", "鏀�鏋濊姳妤煎競缃�"); + SOURCE_MAP.put("77949.com", "鍖楁捣瀹夊缃�"); + SOURCE_MAP.put("beihaidc.com", "鍖楁捣鎴垮湴浜т氦鏄撶綉"); + SOURCE_MAP.put("lesohome.com", "涔愭悳鎴夸骇缃�"); + SOURCE_MAP.put("5khouse.com", "鐪嬫埧缃�5khouse"); + SOURCE_MAP.put("ycls.cn", "铏炲煄妤煎競"); + SOURCE_MAP.put("jscsfc.com", "甯哥啛閫忔槑鍞埧缃�"); + SOURCE_MAP.put("lifang100.com", "鑽旀埧缃�"); + SOURCE_MAP.put("funxoo.com", "鎴跨缃�"); + SOURCE_MAP.put("wjls.com.cn", "鍚存睙妤煎競缃�"); + SOURCE_MAP.put("wjfcw.com", "鍚存睙鎴夸骇缃�"); + SOURCE_MAP.put("yxhouse.net", "瀹滃叴鎴夸骇缃�"); + SOURCE_MAP.put("tdfcw.com", "闄堕兘鎴夸骇缃�"); + SOURCE_MAP.put("yxfc.cc", "瀹滃叴鎴夸骇缃憏xfc"); + SOURCE_MAP.put("0372.cn", "瀹夐槼淇℃伅缃�"); + SOURCE_MAP.put("ayfcw.com", "瀹夐槼鎴夸骇缃�"); + SOURCE_MAP.put("0372fdc.com", "瀹夐槼鎴垮湴浜х綉"); + SOURCE_MAP.put("ayloushi.com", "瀹夐槼妤煎競"); + SOURCE_MAP.put("ljia.net", "鎭嬪缃�"); + SOURCE_MAP.put("houseyw.com", "棣欏眳鎴夸骇"); + SOURCE_MAP.put("ynhouse.com", "浜戝崡鎴跨綉"); + SOURCE_MAP.put("373f.com/", "鏂颁埂淇℃伅娓�"); + SOURCE_MAP.put("xxgfw.cn", "鏂颁埂璐埧缃�"); + SOURCE_MAP.put("0768fcw.com", "娼窞鎴夸骇缃�"); + SOURCE_MAP.put("0762home.com", "娌虫簮鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("076299.cn", "涔濅節鎴夸骇缃�"); + SOURCE_MAP.put("fs0762.com", "鎴胯缃�"); + SOURCE_MAP.put("u0762.com", "娌虫簮浼樻埧缃�"); + SOURCE_MAP.put("0391fc.cn", "鐒︿綔鎴夸骇缃�"); + SOURCE_MAP.put("jzloushi.com", "鐒︿綔妤煎競"); + SOURCE_MAP.put("fangzhanhui.com", "鎴垮睍姹�"); + SOURCE_MAP.put("ff1.com.cn", "绗竴鎴跨綉"); + SOURCE_MAP.put("ksedu.cn", "鏄嗗北鏁欒偛"); + SOURCE_MAP.put("chinawuxi.gov.cn", "鏃犻敗甯傛暀鑲插眬"); + SOURCE_MAP.put("nbedu.gov.cn", "瀹佹尝鏁欑缃�"); + SOURCE_MAP.put("nbedu.net.cn", "瀹佹尝甯傚鏍′俊鎭祫婧愬簱"); + SOURCE_MAP.put("nb06edu.com", "瀹佹尝瀛﹀墠鏁欒偛缃�"); + SOURCE_MAP.put("hfjy.net.cn", "鍚堣偉鏁欒偛淇℃伅缃�"); + SOURCE_MAP.put("ahzsks.cn", "瀹夊窘鐪佹暀鑲叉嫑鐢熻�冭瘯闄�"); + SOURCE_MAP.put("huaue.com", "鍗庣鏁欒偛缃�"); + SOURCE_MAP.put("jxedu.gov.cn", "姹熻タ鏁欒偛缃�"); + SOURCE_MAP.put("nc.gov.cn", "涓浗鍗楁槍"); + SOURCE_MAP.put("changsha.gov.cn", "涓浗闀挎矙"); + SOURCE_MAP.put("ccedin.net", "闀挎槬鏁欒偛缃�"); + SOURCE_MAP.put("ccnews.gov.cn", "闀挎槬鏂伴椈缃�"); + SOURCE_MAP.put("gysjyw.gov.cn", "璐甸槼鏁欒偛淇℃伅缃�"); + SOURCE_MAP.put("ytedu.cn", "鐑熷彴鏁欒偛"); + SOURCE_MAP.put("xxzs.org", "楂樿�冩嫑鐢熶俊鎭腐"); + SOURCE_MAP.put("urumqi.gov.cn", "涔岄瞾鏈ㄩ綈涔嬬獥"); + SOURCE_MAP.put("fjqz.gov.cn", "涓浗娉夊窞"); + SOURCE_MAP.put("wenzhou.gov.cn", "涓浗娓╁窞"); + SOURCE_MAP.put("nantong.gov.cn", "鍗楅�氭暀鑲�"); + SOURCE_MAP.put("jse.gov.cn", "姹熻嫃鏁欒偛"); + SOURCE_MAP.put("zjol.com.cn", "娴欐睙鐪佸尰闄㈤绾﹁瘖鐤楁湇鍔″钩鍙�"); + SOURCE_MAP.put("a-hospital.com", "鍖诲鐧剧"); + SOURCE_MAP.put("ycjyzk.com", "閾跺窛鏁欒偛鎷涚敓鑰冭瘯缃�"); + SOURCE_MAP.put("xqq.gov.cn", "鍏村簡鍖烘斂搴�"); + SOURCE_MAP.put("czedu.gov.cn", "甯稿窞鏁欒偛"); + SOURCE_MAP.put("haikou.gov.cn", "娴峰彛鏀垮簻"); + SOURCE_MAP.put("wfjyw.net", "娼嶅潑鏁欒偛缃�"); + SOURCE_MAP.put("weifang.gov.cn", "涓浗娼嶅潑"); + SOURCE_MAP.put("lyenet.org", "娲涢槼鏁欒偛鍩庡煙缃�"); + SOURCE_MAP.put("ly.gov.cn", "涓浗娲涢槼"); + SOURCE_MAP.put("zibo.gov.cn", "娣勫崥甯備汉姘戞斂搴�"); + SOURCE_MAP.put("sxsedu.net", "缁嶅叴鏁欒偛缃�"); + SOURCE_MAP.put("zjtz.gov.cn", "鍙板窞"); + SOURCE_MAP.put("daqing.gov.cn", "涓浗澶у簡"); + SOURCE_MAP.put("asit.gov.cn", "涓浗闉嶅北"); + SOURCE_MAP.put("zhuhai.gov.cn", "涓浗鐝犳捣"); + SOURCE_MAP.put("doule.org", "鏌冲窞鏁欒偛"); + SOURCE_MAP.put("stedu.net", "姹曞ご鏁欒偛淇℃伅缃�"); + SOURCE_MAP.put("shantou.gov.cn", "姹曞ご甯傛斂搴�"); + SOURCE_MAP.put("bbshouse.com", "妤艰鐣�"); + SOURCE_MAP.put("zsxxg.com", "鑸熷北淇℃伅娓�"); + SOURCE_MAP.put("hdjy.net.cn", "閭兏甯傛暀鑲插眬"); + SOURCE_MAP.put("qhdedu.cn", "绉︾殗宀涙暀鑲�"); + SOURCE_MAP.put("whedu21.com", "濞佹捣甯傛暀鑲插眬"); + SOURCE_MAP.put("yangzhou.gov.cn", "涓浗鎵窞"); + SOURCE_MAP.put("zhenjiang.gov.cn", "涓浗闀囨睙"); + SOURCE_MAP.put("yce.cn", "鐩愬煄鏁欒偛"); + SOURCE_MAP.put("jxedu.net.cn", "鍢夊叴鏁欒偛"); + SOURCE_MAP.put("fang99.com", "瑗垮畨鎴跨灞�"); + SOURCE_MAP.put("028028.net", "鎴愰兘鎴夸骇瓒呭競缃�"); + SOURCE_MAP.put("taizhou.gov.cn", "鍙板窞甯傛斂搴�"); + SOURCE_MAP.put("gledu.cn", "妗傛灄鏁欒偛淇℃伅缃�"); + SOURCE_MAP.put("house365.com", "365鍦颁骇瀹跺眳缃�"); + SOURCE_MAP.put("zhanjiang.gov.cn", "涓浗婀涙睙"); + SOURCE_MAP.put("jiangmen.gov.cn", "涓浗姹熼棬"); + SOURCE_MAP.put("zhuzhou.gov.cn", "涓浗鏍床"); + SOURCE_MAP.put("hengyang.gov.cn", "涓浗琛¢槼"); + SOURCE_MAP.put("e21.cn", "瀹滄槍鏁欒偛"); + SOURCE_MAP.put("yichang.gov.cn", "涓浗瀹滄槍"); + SOURCE_MAP.put("pds.gov.cn", "骞抽《灞变汉姘戞斂搴�"); + SOURCE_MAP.put("ganzhou.gov.cn", "璧e窞甯備汉姘戞斂搴�"); + SOURCE_MAP.put("jiujiang.gov.cn", "涓浗涔濇睙"); + SOURCE_MAP.put("my.gov.cn", "涓浗缁甸槼"); + SOURCE_MAP.put("mdjedu.net", "鐗′腹姹熸暀鑲茬綉"); + SOURCE_MAP.put("bxjyw.com", "鏈邯鏁欒偛缃�"); + SOURCE_MAP.put("mas.gov.cn", "涓浗椹瀺灞�"); + SOURCE_MAP.put("mmjynet.com", "鑼傚悕鏁欒偛淇℃伅缃�"); + SOURCE_MAP.put("jieyang.gov.cn", "涓浗鎻槼"); + SOURCE_MAP.put("focus.cn", "鎼滅嫄鐒︾偣"); + SOURCE_MAP.put("nanning.gov.cn", "涓浗鍗楀畞"); + SOURCE_MAP.put("qzedu.net", "琛㈠窞鏁欒偛"); + SOURCE_MAP.put("xiangtan.gov.cn", "涓浗婀樻江"); + SOURCE_MAP.put("yangjiang.gov.cn", "涓浗闃虫睙"); + SOURCE_MAP.put("loupan.com", "妤肩洏缃�"); + SOURCE_MAP.put("zjj.gov.cn", "涓浗寮犲鐣�"); + SOURCE_MAP.put("cq.gov.cn", "閲嶅簡甯傛笣鍖楀尯浜烘皯鏀垮簻"); + SOURCE_MAP.put("cqyz.gov.cn", "閲嶅簡甯傛笣涓尯浜烘皯鏀垮簻"); + SOURCE_MAP.put("ddk.gov.cn", "閲嶅簡甯傚ぇ娓″彛鍖轰汉姘戞斂搴�"); + SOURCE_MAP.put("cq.gov.cn", "姹熷寳鍖轰汉姘戞斂搴�"); + SOURCE_MAP.put("cq.gov.cn", "娌欏潽鍧濆尯浜烘皯鏀垮簻"); + SOURCE_MAP.put("cq.gov.cn", "涔濋緳鍧″尯浜烘皯鏀垮簻"); + SOURCE_MAP.put("beibei.gov.cn", "鍖楃鍖轰汉姘戞斂搴�"); + SOURCE_MAP.put("cq.gov.cn", "涓囩洓缁忔祹鎶�鏈紑鍙戝尯"); + SOURCE_MAP.put("cq.gov.cn", "娓濆寳鍖轰汉姘戞斂搴�"); + SOURCE_MAP.put("cq.gov.cn", "宸村崡鍖轰汉姘戞斂搴�"); + SOURCE_MAP.put("cq.gov.cn", "闀垮鍖轰汉姘戞斂搴�"); + SOURCE_MAP.put("hc.gov.cn", "鍚堝窛鍖轰汉姘戞斂搴�"); + SOURCE_MAP.put("cq.gov.cn", "姘稿窛鍖轰汉姘戞斂搴�"); + SOURCE_MAP.put("cqqj.gov.cn", "缍︽睙鍖轰汉姘戞斂搴�"); + SOURCE_MAP.put("cq.gov.cn", "娼煎崡鍘夸汉姘戞斂搴�"); + SOURCE_MAP.put("dazu.gov.cn", "涓浗澶ц冻"); + SOURCE_MAP.put("yndali.gov.cn", "涓浗澶х悊"); + SOURCE_MAP.put("suqian.gov.cn", "缃戜笂瀹胯縼"); + SOURCE_MAP.put("xf.gov.cn", "涓浗瑗勯槼"); + SOURCE_MAP.put("tangshan.gov.cn", "涓浗鍞愬北"); + SOURCE_MAP.put("sanya.gov.cn", "涓浗涓変簹"); + SOURCE_MAP.put("gzlps.gov.cn", "涓浗鍑夐兘鍏洏姘�"); + SOURCE_MAP.put("yibin.gov.cn", "瀹滃甯備汉姘戞斂搴�"); + SOURCE_MAP.put("putian.gov.cn", "涓浗鑾嗙敯"); + SOURCE_MAP.put("panzhihua.gov.cn", "鏀�鏋濊姳鍏紬淇℃伅缃�"); + SOURCE_MAP.put("yuxi.gov.cn", "鐜夋邯甯備汉姘戞斂搴�"); + SOURCE_MAP.put("yunfu.gov.cn", "涓浗浜戞诞"); + SOURCE_MAP.put("changshu.gov.cn", "涓浗甯哥啛"); + SOURCE_MAP.put("zengcheng.gov.cn", "涓浗骞垮窞澧炲煄"); + SOURCE_MAP.put("ruian.gov.cn", "涓浗鐟炲畨"); + SOURCE_MAP.put("yueqing.gov.cn", "涓浗涔愭竻"); + SOURCE_MAP.put("ningbo.gov.cn", "鎱堟邯鏀垮簻缃�"); + SOURCE_MAP.put("ningbo.gov.cn", "涓浗瀹佹捣"); + SOURCE_MAP.put("fh.gov.cn", "涓浗濂夊寲"); + SOURCE_MAP.put("yy.gov.cn", "涓浗浣欏"); + SOURCE_MAP.put("wl.gov.cn", "涓浗娓╁箔"); + SOURCE_MAP.put("yixing.gov.cn", "涓浗瀹滃叴"); + SOURCE_MAP.put("zhaoqing.gov.cn", "鑲囧簡甯備汉姘戞斂搴�"); + SOURCE_MAP.put("yw.gov.cn", "涓浗涔変箤"); + SOURCE_MAP.put("xxjy.gov.cn", "鏂颁埂甯傛暀鑲插眬"); + SOURCE_MAP.put("chaozhou.gov.cn", "涓浗娼窞鏀垮簻"); + SOURCE_MAP.put("huangshi.gov.cn", "榛勭煶甯備汉姘戞斂搴�"); + SOURCE_MAP.put("sjz.gov.cn", "涓浗鐭冲搴勶紙瀛﹀墠锛�"); + SOURCE_MAP.put("sjz.gov.cn", "涓浗鐭冲搴勶紙灏忓锛�"); + SOURCE_MAP.put("sjz.gov.cn", "涓浗鐭冲搴勶紙涓锛�"); + SOURCE_MAP.put("sjz.gov.cn", "涓浗鐭冲搴勶紙楂樹腑锛�"); + SOURCE_MAP.put("km.gov.cn", "涓浗鏄嗘槑"); + SOURCE_MAP.put("nxnews.net", "瀹佸鏁欒偛缃�"); + SOURCE_MAP.put("hainan.gov.cn", "娴峰崡鐪佷汉姘戞斂搴�"); + SOURCE_MAP.put("yipu.com.cn", "鏄撻摵缃�"); + SOURCE_MAP.put("163.com", "缃戞槗鎴夸骇"); + SOURCE_MAP.put("fang99.com", "鎴垮眿绠$悊鏈嶅姟缃�"); + SOURCE_MAP.put("focus.cn", "鎼滅嫄鐒︾偣"); + SOURCE_MAP.put("fangtoo.com", "鎴块�旂綉"); + SOURCE_MAP.put("cnbb.com.cn", "浜掕仈澶╁湴鎴夸骇缃�"); + SOURCE_MAP.put("sxhouse.com.cn", "缁嶅叴鎴夸骇瀹樻柟闂ㄦ埛"); + SOURCE_MAP.put("gz.cc", "骞垮窞鎴夸骇缃�"); + SOURCE_MAP.put("hz66.com", "婀栧窞鍦ㄧ嚎"); + SOURCE_MAP.put("fcxxw.com", "鎴夸骇淇℃伅缃慱fcxxw"); + SOURCE_MAP.put("0579fw.com", "閲戝崕鎴跨綉"); + SOURCE_MAP.put("qz123.com", "琛㈠窞淇℃伅娓�"); + SOURCE_MAP.put("koofang.com", "閰锋埧缃�"); + SOURCE_MAP.put("daikan.cn", "甯︾湅"); + SOURCE_MAP.put("hutaihu.com", "澶箹缃�"); + SOURCE_MAP.put("sxol.com", "缁嶅叴鎴夸骇鍦ㄧ嚎"); + SOURCE_MAP.put("berui.com", "鐧剧憺鍦颁骇瀹跺眳缃�"); + SOURCE_MAP.put("allfang.com", "鍏ㄦ埧"); + SOURCE_MAP.put("fangjee.com", "鎴块泦"); + SOURCE_MAP.put("wolai.com", "鎴戞潵鎴夸骇"); + SOURCE_MAP.put("ihk.cn", "鎴跨帇"); + SOURCE_MAP.put("anhuinews.com", "涓畨鎴夸骇缃�"); + SOURCE_MAP.put("zsxxg.com", "鑸熷北淇℃伅娓�"); + SOURCE_MAP.put("wzfg.com", "娓╁窞鎴夸骇甯傚満淇℃伅"); + SOURCE_MAP.put("cnnbfdc.com", "瀹佹尝浣忓畢涓庢埧浜х綉"); + SOURCE_MAP.put("qq.com", "鑵捐"); + SOURCE_MAP.put("028f.com", "鎴愭埧缃�"); + SOURCE_MAP.put("mfmf100.com", "ESE鐧炬偊澶ч��"); + SOURCE_MAP.put("szfmall.com", "鑻忓窞鍥㈡埧缃�"); + SOURCE_MAP.put("962013.com", "鑻忔埧缃�"); + SOURCE_MAP.put("fyhouse.net", "闃滈槼鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("0452m.com", "榻愰綈鍝堝皵鎴夸骇缃�"); + SOURCE_MAP.put("lsfun.com", "涓芥按鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("0452sh.com", "榻愰綈鍝堝皵鐢熸椿缃�"); + SOURCE_MAP.put("hzfjw.com", "姹変腑鎴夸骇浜ゆ槗璧勮缃�"); + SOURCE_MAP.put("0839fc.com", "骞垮厓鎴夸骇缃�"); + SOURCE_MAP.put("0932fdc.com", "瀹氳タ鎴夸骇缃�"); + SOURCE_MAP.put("zunyifang.cn", "閬典箟鎴夸骇缃憐unyifang"); + SOURCE_MAP.put("zxfc.cn", "缃俊鎴夸骇"); + SOURCE_MAP.put("0454.com", "浣虫湪鏂笁姹熺綉"); + SOURCE_MAP.put("hsjsfc.com", "榛勫北绮剧洓鎴夸骇"); + SOURCE_MAP.put("yangzhou.gov.cn", "鎵窞鎴跨灞�"); + SOURCE_MAP.put("k0410.com", "鐪嬮搧宀�"); + SOURCE_MAP.put("tlxxb.com", "閾佸箔淇℃伅鏉�"); + SOURCE_MAP.put("leju.com", "涔愬眳璐埧缃�"); + SOURCE_MAP.put("tljs.gov.cn", "閾佸箔浣忔埧寤鸿"); + SOURCE_MAP.put("0538fcw.com", "娉板畨鎴夸骇浜ゆ槗涓績"); + SOURCE_MAP.put("tainfo.net", "娉板畨淇℃伅娓�"); + SOURCE_MAP.put("taian.com", "娉板畨缃戞埧浜�"); + SOURCE_MAP.put("tc917.com", "娉板畨鎴夸骇"); + SOURCE_MAP.put("taianhome.com", "娉板畨鎴夸骇缃�"); + SOURCE_MAP.put("idc2008.com.cn", "娉板畨鎴夸骇缃憈afc"); + SOURCE_MAP.put("tanhyjy.com", "澹瑰姞澹规埧浜х綉"); + SOURCE_MAP.put("thmzfc.com", "鏄庣彔鎴夸骇缃�"); + SOURCE_MAP.put("tianshui.gov.cn", "澶╂按甯傛埧绠″眬"); + SOURCE_MAP.put("tsfcjy.com", "澶╂按鎴夸骇浜ゆ槗鐧昏缃�"); + SOURCE_MAP.put("tianshuiinfo.cn", "澶╂按淇℃伅缃�"); + SOURCE_MAP.put("zhantai.com", "绔欏彴缃�"); + SOURCE_MAP.put("730fc.com", "宀抽槼鎴夸骇缃�"); + SOURCE_MAP.put("0730r.com", "鐖卞鎴夸骇缃�"); + SOURCE_MAP.put("fangchan0455.com", "缁ュ寲鎭嬪鎴夸骇"); + SOURCE_MAP.put("bt160.com", "鍖呭ご鎴夸骇缃慴t160"); + SOURCE_MAP.put("baotf.cn", "鍖呭ご鎴夸骇缃慴aotf"); + SOURCE_MAP.put("8720000.com.cn", "缁ュ寲浣冲鎴夸骇"); + SOURCE_MAP.put("shhomeland.com", "缁ュ寲瀹跺洯缃�"); + SOURCE_MAP.put("cnsuihua.net", "缁ュ寲淇℃伅娓�"); + SOURCE_MAP.put("qzfcw.com", "閽﹀窞鎴夸骇缃�"); + SOURCE_MAP.put("wdfc.com.cn", "缁村害鎴夸骇缃�"); + SOURCE_MAP.put("fcxgx.com", "鎴夸骇鏂板共绾�"); + SOURCE_MAP.put("0952fdc.com", "鐭冲槾灞辨埧浜х綉"); + SOURCE_MAP.put("0475.cn", "閫氳窘淇℃伅缃�"); + SOURCE_MAP.put("fx8888.com", "鍗庡崥缃�"); + SOURCE_MAP.put("114chn.com", "114鐢熸椿缃�"); + SOURCE_MAP.put("0319f.com", "鍒戞埧缃�"); + SOURCE_MAP.put("ggfdc.com", "璐垫腐鎴垮湴浜х綉"); + SOURCE_MAP.put("0557100.com", "瀹垮窞鍦ㄧ嚎"); + SOURCE_MAP.put("sddzz.com", "鏋e簞瑙嗙獥"); + SOURCE_MAP.put("zyfgj.cn", "璧勯槼鎴跨灞�"); + SOURCE_MAP.put("bsfw.cn", "淇濆北鎴跨綉"); + SOURCE_MAP.put("msfc114.com", "鐪夊北娣樻埧缃�"); + SOURCE_MAP.put("07358.com", "閮存埧缃�"); + SOURCE_MAP.put("dy6c.com", "寰烽槼6鍩庣綉"); + SOURCE_MAP.put("gafcw.cn", "骞垮畨鎴夸骇缃�"); + SOURCE_MAP.put("0826fang.com", "骞垮畨鎴夸骇缃�0826fang"); + SOURCE_MAP.put("gafc8.cn", "绉熸埧鍚�"); + SOURCE_MAP.put("zmdfcw.com", "椹婚┈搴楁埧浜х綉"); + SOURCE_MAP.put("beiww.com", "鍖楃含缃�"); + SOURCE_MAP.put("yaanjq.com", "閲戞ˉ鎴夸粙缃�"); + SOURCE_MAP.put("anjia8.com", "瀹夊鍚�"); + SOURCE_MAP.put("my0511.com", "闀囨睙鎴夸骇缃�"); + SOURCE_MAP.put("goufw.com", "GO鎴跨綉"); + SOURCE_MAP.put("huaian.com", "娣畨鎴夸骇缃�"); + SOURCE_MAP.put("hezefc.com", "鑿忔辰鎴夸骇缃�"); + SOURCE_MAP.put("0932fdc.com", "瀹氳タ鎴夸骇缃�"); + SOURCE_MAP.put("dzcnc.com", "椴佸寳鎴夸骇"); + SOURCE_MAP.put("0439.com", "鐧藉北鍦ㄧ嚎"); + SOURCE_MAP.put("zmdfcxx.com", "椹婚┈搴楁埧浜т俊鎭綉"); SOURCE_MAP.put("bynefc.com", "FIND YOUR HOME"); - SOURCE_MAP.put("c0798.com", "景德镇买房网"); - SOURCE_MAP.put("haidong360.com", "海东房地产信息网"); - SOURCE_MAP.put("hotfcw.com", "热点房产网"); - SOURCE_MAP.put("ptdfc.com", "平潭房产网"); - SOURCE_MAP.put("0475fang.com", "通辽房地产网"); - SOURCE_MAP.put("qilinf.com", "麒麟房网"); - SOURCE_MAP.put("huainet.com", "淮网房产"); - SOURCE_MAP.put("bzgd.com", "巴中房产"); - SOURCE_MAP.put("365kl.net", "快乐房产"); - SOURCE_MAP.put("0736home", "常德市房地产信息网"); - SOURCE_MAP.put("dzloupan.cn", "达州楼盘网"); - SOURCE_MAP.put("nnddw.com", "固原房产网"); - SOURCE_MAP.put("chafangwang.com", "CFW查房网"); - SOURCE_MAP.put("hccun.com", "河池生活网"); - SOURCE_MAP.put("yq918.com", "阳泉家园网"); - SOURCE_MAP.put("dyfc.cn", "德阳房地产网"); - SOURCE_MAP.put("053000.com", "衡水房产网"); - SOURCE_MAP.put("zzfcw.com.cn", "枣房网"); - SOURCE_MAP.put("tcfcw.net", "铜川房产网"); - SOURCE_MAP.put("dianfun.com", "点房网"); - SOURCE_MAP.put("baixing.com", "百姓网"); - SOURCE_MAP.put("centanet.com", "中原(工商铺)"); + SOURCE_MAP.put("c0798.com", "鏅痉闀囦拱鎴跨綉"); + SOURCE_MAP.put("haidong360.com", "娴蜂笢鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("hotfcw.com", "鐑偣鎴夸骇缃�"); + SOURCE_MAP.put("ptdfc.com", "骞虫江鎴夸骇缃�"); + SOURCE_MAP.put("0475fang.com", "閫氳窘鎴垮湴浜х綉"); + SOURCE_MAP.put("qilinf.com", "楹掗簾鎴跨綉"); + SOURCE_MAP.put("huainet.com", "娣綉鎴夸骇"); + SOURCE_MAP.put("bzgd.com", "宸翠腑鎴夸骇"); + SOURCE_MAP.put("365kl.net", "蹇箰鎴夸骇"); + SOURCE_MAP.put("0736home", "甯稿痉甯傛埧鍦颁骇淇℃伅缃�"); + SOURCE_MAP.put("dzloupan.cn", "杈惧窞妤肩洏缃�"); + SOURCE_MAP.put("nnddw.com", "鍥哄師鎴夸骇缃�"); + SOURCE_MAP.put("chafangwang.com", "CFW鏌ユ埧缃�"); + SOURCE_MAP.put("hccun.com", "娌虫睜鐢熸椿缃�"); + SOURCE_MAP.put("yq918.com", "闃虫硥瀹跺洯缃�"); + SOURCE_MAP.put("dyfc.cn", "寰烽槼鎴垮湴浜х綉"); + SOURCE_MAP.put("053000.com", "琛℃按鎴夸骇缃�"); + SOURCE_MAP.put("zzfcw.com.cn", "鏋f埧缃�"); + SOURCE_MAP.put("tcfcw.net", "閾滃窛鎴夸骇缃�"); + SOURCE_MAP.put("dianfun.com", "鐐规埧缃�"); + SOURCE_MAP.put("baixing.com", "鐧惧缃�"); + SOURCE_MAP.put("centanet.com", "涓師(宸ュ晢閾�)"); SOURCE_MAP.put("9office.com", "9office"); - SOURCE_MAP.put("qq.com", "腾讯房产"); - SOURCE_MAP.put("kfw001.com", "快房网"); - SOURCE_MAP.put("dzwww.com", "大众网"); - SOURCE_MAP.put("hfhome.cn", "合肥家园网"); - SOURCE_MAP.put("dqfcj.com.cn", "大庆网上房地产"); - SOURCE_MAP.put("022ky.com", "科源地产"); - SOURCE_MAP.put("xjksfcw.com", "喀什房产网"); - SOURCE_MAP.put("xjksfx.com", "喀什市房地产业协会"); - SOURCE_MAP.put("cxhouse.org", "楚雄房产信息网"); - SOURCE_MAP.put("dpcm.cn", "大鹏新闻网"); - SOURCE_MAP.put("aft888.com", "阿凡提"); - SOURCE_MAP.put("w.cn", "达步溜"); - SOURCE_MAP.put("qd8.com.cn", "快点8"); - SOURCE_MAP.put("bz.cn", "巴州在线"); - SOURCE_MAP.put("hm169.com", "哈密网"); - SOURCE_MAP.put("hm169.com", "哈密网"); - SOURCE_MAP.put("ihami.cn", "爱哈密"); - SOURCE_MAP.put("97hami.com", "九旗网"); - SOURCE_MAP.put("2ks.com.cn", "喀什网"); - SOURCE_MAP.put("hh126.com", "红河126"); - SOURCE_MAP.put("hhzc.cn", "中国红河"); - SOURCE_MAP.put("xlglfdc.com", "锡盟房产网"); - SOURCE_MAP.put("0479xx.com", "锡盟信息港"); - SOURCE_MAP.put("chengw.com", "橙网"); - SOURCE_MAP.put("jinlingke.com", "金陵客"); - SOURCE_MAP.put("js.cn", "昆山房产网"); - SOURCE_MAP.put("zjol.com.cn", "住在杭州网"); - SOURCE_MAP.put("kjfcw.com", "客家房产网"); - SOURCE_MAP.put("tyfc.cn", "太原房产"); - SOURCE_MAP.put("0311fang.com", "石房网"); - SOURCE_MAP.put("xz21th.com", "徐州房产网"); - SOURCE_MAP.put("yuxi.tv", "玉溪在线"); - SOURCE_MAP.put("gogopzh.com", "攀西网络新媒体"); - SOURCE_MAP.put("tzinfo.net", "台州房产主网"); - SOURCE_MAP.put("tzview.com", "台州视窗"); - SOURCE_MAP.put("qzfdc.gov.cn", "泉州住房建设网"); - SOURCE_MAP.put("goufw.com", "GO房网"); - SOURCE_MAP.put("soufun.com", "搜房"); - SOURCE_MAP.put("lianjia.com", "链家"); - SOURCE_MAP.put("soufun.com", "搜房"); - SOURCE_MAP.put("deyoo.net.cn", "德佑地产"); - SOURCE_MAP.put("xiaoganshi.net", "念家不动产"); - SOURCE_MAP.put("tzwxwj.com", "我想我家"); - SOURCE_MAP.put("btfcw.net", "比特房产"); - SOURCE_MAP.put("eyuyao.com", "旺佳房产"); - SOURCE_MAP.put("hwj.com", "好旺角房屋"); - SOURCE_MAP.put("jtfdc.com.cn", "金坛房地产信息网"); - SOURCE_MAP.put("jtfdc.com", "金坛房产网jtfdc"); - SOURCE_MAP.put("liyangf.com", "溧阳房"); - SOURCE_MAP.put("15jp.com", "锦鹏不动产"); - SOURCE_MAP.put("0831xyfc.com", "欣宜房产"); - SOURCE_MAP.put("smecj.gov.cn", "新疆昌吉州中小企业"); - SOURCE_MAP.put("hfhome.cn", "合肥家园网"); - SOURCE_MAP.put("ytfc.gov.cn", "鹰潭市房产信息网"); - SOURCE_MAP.put("xyfcj.com", "新余房产信息网"); - SOURCE_MAP.put("ldfdcw.com", "娄房网"); - SOURCE_MAP.put("gafdc.cn", "广安市房产交易平台"); - SOURCE_MAP.put("zstmsf.com", "舟山市透明售房网"); - SOURCE_MAP.put("tsfcxx.com", "唐山房产信息网"); - SOURCE_MAP.put("ljhouse.org", "丽江房产信息网"); - SOURCE_MAP.put("lzfcjys.com", "柳州房产交易网"); - SOURCE_MAP.put("lzfc.com.cn", "兰州商品房"); - SOURCE_MAP.put("ufc.gov.cn", "乌鲁木齐房管局"); - SOURCE_MAP.put("0731fdc.com", "长沙房产信息网"); - SOURCE_MAP.put("njhouse.com.cn", "南京网上房地产"); - SOURCE_MAP.put("liyangf.com", "溧阳房"); - SOURCE_MAP.put("1f.cn", "易房"); - SOURCE_MAP.put("xmfc.com", "厦门房产网"); - SOURCE_MAP.put("ftan.cn", "房探网"); - SOURCE_MAP.put("honghe01.com", "红河"); - SOURCE_MAP.put("cjxxg.com", "昌吉信息港"); - SOURCE_MAP.put("bazhou163.com", "巴州163.com"); - SOURCE_MAP.put("bazhou5.com", "巴州网"); - SOURCE_MAP.put("dxal.cn", "网上中介"); - SOURCE_MAP.put("i0469.com", "双鸭山在线"); - SOURCE_MAP.put("hljxxg.com", "鹤岗信息网"); - SOURCE_MAP.put("dqytw.com", "大庆房产网"); - SOURCE_MAP.put("aft888.com", "阿凡提"); - SOURCE_MAP.put("0790f.cn", "新余房产网0790f"); - SOURCE_MAP.put("xyanjia.com", "新余房产网"); - SOURCE_MAP.put("xchfc.cn", "宣城房产网xchfc"); - SOURCE_MAP.put("0856.com.cn", "铜仁在线"); - SOURCE_MAP.put("trlpw.com", "铜仁楼盘网"); - SOURCE_MAP.put("onfun.net", "房产在线onfun"); - SOURCE_MAP.put("0598f.cn", "三明房产网0598f"); - SOURCE_MAP.put("smzf.net", "三明住房网"); - SOURCE_MAP.put("860598.com", "三明芭乐网"); - SOURCE_MAP.put("0832h.com", "内江房交网"); - SOURCE_MAP.put("liaofw.com", "聊房网liaofw"); - SOURCE_MAP.put("lc365.net", "聊城房地产网lc365"); - SOURCE_MAP.put("364000.com", "龙岩网"); - SOURCE_MAP.put("jnzx.net.cn", "济宁在线"); - SOURCE_MAP.put("jn678.com", "济宁房产网"); - SOURCE_MAP.put("f537.com", "济宁房房网"); - SOURCE_MAP.put("m937.com", "酒泉招贴"); - SOURCE_MAP.put("haidong360.com", "海东房地产信息网"); - SOURCE_MAP.put("0795dcw.com", "宜春地产网"); - SOURCE_MAP.put("i0456.com", "黑河门户网"); - SOURCE_MAP.put("yichunfc.com", "宜春房产网"); - SOURCE_MAP.put("zzsr.com", "上饶房产网"); - SOURCE_MAP.put("bm0392.com", "鹤壁便民网"); - SOURCE_MAP.put("gooddt.com", "都市信息"); - SOURCE_MAP.put("hbshw.cn", "鹤壁生活网"); - SOURCE_MAP.put("xinhs.com", "衡水信息港"); - SOURCE_MAP.put("0318ol.com", "衡水在线"); - SOURCE_MAP.put("hsfang.cn", "衡水房客"); - SOURCE_MAP.put("wnfcw.cn", "渭南房产网"); - SOURCE_MAP.put("ganpuwang.com", "赶铺网"); - SOURCE_MAP.put("yjwn.cn", "易居渭南"); - SOURCE_MAP.put("52fdc.com", "52房地产网"); - SOURCE_MAP.put(".yzfcxxw", "仪征房地产信息网"); - SOURCE_MAP.put("goufw.com", "GO房网"); - SOURCE_MAP.put("tyfc.cn", "太原房产"); - SOURCE_MAP.put("yyfdcw.com", "岳阳房地产网"); - SOURCE_MAP.put("cdsfgj.gov.cn", "常德市房地产管理局"); - SOURCE_MAP.put("aibang.com", "爱帮网"); - SOURCE_MAP.put("qzfczy.com", "泉州房产置业网"); - SOURCE_MAP.put("gotoip1.com", "四平房产网"); - SOURCE_MAP.put("essfdc.gov.cn", "恩施市房地产信息网"); - SOURCE_MAP.put("lasafc.com", "拉萨房产网"); - SOURCE_MAP.put("akfc.gov.cn", "安康市房产管理局"); - SOURCE_MAP.put("0475fang.com", "通辽房地产网"); - SOURCE_MAP.put("xnfcj.com", "咸宁住房信息网"); - SOURCE_MAP.put("hldfcxx.com", "葫芦岛房产信息网"); - SOURCE_MAP.put("cdfcw.com", "承德房产网"); - SOURCE_MAP.put("xyjw.gov.cn", "信阳住建局"); - SOURCE_MAP.put("loupan.com", "楼盘网"); - SOURCE_MAP.put("gzwsfdc.com", "赣州网上房地产"); - SOURCE_MAP.put("gxfangchan.com", "广西房产网"); - SOURCE_MAP.put("shenyang1.com", "沈阳房产网"); - SOURCE_MAP.put("nxsq.com", "宁夏仕奇房产网"); - SOURCE_MAP.put("hnfgw.com", "海宁透明售房网"); - SOURCE_MAP.put("fuzhou.gov.cn", "福州市房屋登记中心"); - SOURCE_MAP.put("zhen22.com", "真二网"); - SOURCE_MAP.put("fenlei168.com", "中国分类信息网"); - SOURCE_MAP.put("laipaiya.com", "来拍呀"); - SOURCE_MAP.put("w.cn", "达步溜"); - SOURCE_MAP.put("xinliuzhou.com", "新柳州网"); - SOURCE_MAP.put("8720000.com.cn", "绥化佳家房产"); - SOURCE_MAP.put("shanxian.cn", "单县在线"); + SOURCE_MAP.put("qq.com", "鑵捐鎴夸骇"); + SOURCE_MAP.put("kfw001.com", "蹇埧缃�"); + SOURCE_MAP.put("dzwww.com", "澶т紬缃�"); + SOURCE_MAP.put("hfhome.cn", "鍚堣偉瀹跺洯缃�"); + SOURCE_MAP.put("dqfcj.com.cn", "澶у簡缃戜笂鎴垮湴浜�"); + SOURCE_MAP.put("022ky.com", "绉戞簮鍦颁骇"); + SOURCE_MAP.put("xjksfcw.com", "鍠�浠�鎴夸骇缃�"); + SOURCE_MAP.put("xjksfx.com", "鍠�浠�甯傛埧鍦颁骇涓氬崗浼�"); + SOURCE_MAP.put("cxhouse.org", "妤氶泟鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("dpcm.cn", "澶ч箯鏂伴椈缃�"); + SOURCE_MAP.put("aft888.com", "闃垮嚒鎻�"); + SOURCE_MAP.put("w.cn", "杈炬婧�"); + SOURCE_MAP.put("qd8.com.cn", "蹇偣8"); + SOURCE_MAP.put("bz.cn", "宸村窞鍦ㄧ嚎"); + SOURCE_MAP.put("hm169.com", "鍝堝瘑缃�"); + SOURCE_MAP.put("hm169.com", "鍝堝瘑缃�"); + SOURCE_MAP.put("ihami.cn", "鐖卞搱瀵�"); + SOURCE_MAP.put("97hami.com", "涔濇棗缃�"); + SOURCE_MAP.put("2ks.com.cn", "鍠�浠�缃�"); + SOURCE_MAP.put("hh126.com", "绾㈡渤126"); + SOURCE_MAP.put("hhzc.cn", "涓浗绾㈡渤"); + SOURCE_MAP.put("xlglfdc.com", "閿$洘鎴夸骇缃�"); + SOURCE_MAP.put("0479xx.com", "閿$洘淇℃伅娓�"); + SOURCE_MAP.put("chengw.com", "姗欑綉"); + SOURCE_MAP.put("jinlingke.com", "閲戦櫟瀹�"); + SOURCE_MAP.put("js.cn", "鏄嗗北鎴夸骇缃�"); + SOURCE_MAP.put("zjol.com.cn", "浣忓湪鏉窞缃�"); + SOURCE_MAP.put("kjfcw.com", "瀹㈠鎴夸骇缃�"); + SOURCE_MAP.put("tyfc.cn", "澶師鎴夸骇"); + SOURCE_MAP.put("0311fang.com", "鐭虫埧缃�"); + SOURCE_MAP.put("xz21th.com", "寰愬窞鎴夸骇缃�"); + SOURCE_MAP.put("yuxi.tv", "鐜夋邯鍦ㄧ嚎"); + SOURCE_MAP.put("gogopzh.com", "鏀�瑗跨綉缁滄柊濯掍綋"); + SOURCE_MAP.put("tzinfo.net", "鍙板窞鎴夸骇涓荤綉"); + SOURCE_MAP.put("tzview.com", "鍙板窞瑙嗙獥"); + SOURCE_MAP.put("qzfdc.gov.cn", "娉夊窞浣忔埧寤鸿缃�"); + SOURCE_MAP.put("goufw.com", "GO鎴跨綉"); + SOURCE_MAP.put("soufun.com", "鎼滄埧"); + SOURCE_MAP.put("lianjia.com", "閾惧"); + SOURCE_MAP.put("soufun.com", "鎼滄埧"); + SOURCE_MAP.put("deyoo.net.cn", "寰蜂綉鍦颁骇"); + SOURCE_MAP.put("xiaoganshi.net", "蹇靛涓嶅姩浜�"); + SOURCE_MAP.put("tzwxwj.com", "鎴戞兂鎴戝"); + SOURCE_MAP.put("btfcw.net", "姣旂壒鎴夸骇"); + SOURCE_MAP.put("eyuyao.com", "鏃轰匠鎴夸骇"); + SOURCE_MAP.put("hwj.com", "濂芥椇瑙掓埧灞�"); + SOURCE_MAP.put("jtfdc.com.cn", "閲戝潧鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("jtfdc.com", "閲戝潧鎴夸骇缃慾tfdc"); + SOURCE_MAP.put("liyangf.com", "婧ч槼鎴�"); + SOURCE_MAP.put("15jp.com", "閿﹂箯涓嶅姩浜�"); + SOURCE_MAP.put("0831xyfc.com", "娆e疁鎴夸骇"); + SOURCE_MAP.put("smecj.gov.cn", "鏂扮枂鏄屽悏宸炰腑灏忎紒涓�"); + SOURCE_MAP.put("hfhome.cn", "鍚堣偉瀹跺洯缃�"); + SOURCE_MAP.put("ytfc.gov.cn", "楣版江甯傛埧浜т俊鎭綉"); + SOURCE_MAP.put("xyfcj.com", "鏂颁綑鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("ldfdcw.com", "濞勬埧缃�"); + SOURCE_MAP.put("gafdc.cn", "骞垮畨甯傛埧浜т氦鏄撳钩鍙�"); + SOURCE_MAP.put("zstmsf.com", "鑸熷北甯傞�忔槑鍞埧缃�"); + SOURCE_MAP.put("tsfcxx.com", "鍞愬北鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("ljhouse.org", "涓芥睙鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("lzfcjys.com", "鏌冲窞鎴夸骇浜ゆ槗缃�"); + SOURCE_MAP.put("lzfc.com.cn", "鍏板窞鍟嗗搧鎴�"); + SOURCE_MAP.put("ufc.gov.cn", "涔岄瞾鏈ㄩ綈鎴跨灞�"); + SOURCE_MAP.put("0731fdc.com", "闀挎矙鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("njhouse.com.cn", "鍗椾含缃戜笂鎴垮湴浜�"); + SOURCE_MAP.put("liyangf.com", "婧ч槼鎴�"); + SOURCE_MAP.put("1f.cn", "鏄撴埧"); + SOURCE_MAP.put("xmfc.com", "鍘﹂棬鎴夸骇缃�"); + SOURCE_MAP.put("ftan.cn", "鎴挎帰缃�"); + SOURCE_MAP.put("honghe01.com", "绾㈡渤"); + SOURCE_MAP.put("cjxxg.com", "鏄屽悏淇℃伅娓�"); + SOURCE_MAP.put("bazhou163.com", "宸村窞163.com"); + SOURCE_MAP.put("bazhou5.com", "宸村窞缃�"); + SOURCE_MAP.put("dxal.cn", "缃戜笂涓粙"); + SOURCE_MAP.put("i0469.com", "鍙岄腑灞卞湪绾�"); + SOURCE_MAP.put("hljxxg.com", "楣ゅ矖淇℃伅缃�"); + SOURCE_MAP.put("dqytw.com", "澶у簡鎴夸骇缃�"); + SOURCE_MAP.put("aft888.com", "闃垮嚒鎻�"); + SOURCE_MAP.put("0790f.cn", "鏂颁綑鎴夸骇缃�0790f"); + SOURCE_MAP.put("xyanjia.com", "鏂颁綑鎴夸骇缃�"); + SOURCE_MAP.put("xchfc.cn", "瀹e煄鎴夸骇缃憍chfc"); + SOURCE_MAP.put("0856.com.cn", "閾滀粊鍦ㄧ嚎"); + SOURCE_MAP.put("trlpw.com", "閾滀粊妤肩洏缃�"); + SOURCE_MAP.put("onfun.net", "鎴夸骇鍦ㄧ嚎onfun"); + SOURCE_MAP.put("0598f.cn", "涓夋槑鎴夸骇缃�0598f"); + SOURCE_MAP.put("smzf.net", "涓夋槑浣忔埧缃�"); + SOURCE_MAP.put("860598.com", "涓夋槑鑺箰缃�"); + SOURCE_MAP.put("0832h.com", "鍐呮睙鎴夸氦缃�"); + SOURCE_MAP.put("liaofw.com", "鑱婃埧缃憀iaofw"); + SOURCE_MAP.put("lc365.net", "鑱婂煄鎴垮湴浜х綉lc365"); + SOURCE_MAP.put("364000.com", "榫欏博缃�"); + SOURCE_MAP.put("jnzx.net.cn", "娴庡畞鍦ㄧ嚎"); + SOURCE_MAP.put("jn678.com", "娴庡畞鎴夸骇缃�"); + SOURCE_MAP.put("f537.com", "娴庡畞鎴挎埧缃�"); + SOURCE_MAP.put("m937.com", "閰掓硥鎷涜创"); + SOURCE_MAP.put("haidong360.com", "娴蜂笢鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("0795dcw.com", "瀹滄槬鍦颁骇缃�"); + SOURCE_MAP.put("i0456.com", "榛戞渤闂ㄦ埛缃�"); + SOURCE_MAP.put("yichunfc.com", "瀹滄槬鎴夸骇缃�"); + SOURCE_MAP.put("zzsr.com", "涓婇ザ鎴夸骇缃�"); + SOURCE_MAP.put("bm0392.com", "楣ゅ渚挎皯缃�"); + SOURCE_MAP.put("gooddt.com", "閮藉競淇℃伅"); + SOURCE_MAP.put("hbshw.cn", "楣ゅ鐢熸椿缃�"); + SOURCE_MAP.put("xinhs.com", "琛℃按淇℃伅娓�"); + SOURCE_MAP.put("0318ol.com", "琛℃按鍦ㄧ嚎"); + SOURCE_MAP.put("hsfang.cn", "琛℃按鎴垮"); + SOURCE_MAP.put("wnfcw.cn", "娓崡鎴夸骇缃�"); + SOURCE_MAP.put("ganpuwang.com", "璧堕摵缃�"); + SOURCE_MAP.put("yjwn.cn", "鏄撳眳娓崡"); + SOURCE_MAP.put("52fdc.com", "52鎴垮湴浜х綉"); + SOURCE_MAP.put(".yzfcxxw", "浠緛鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("goufw.com", "GO鎴跨綉"); + SOURCE_MAP.put("tyfc.cn", "澶師鎴夸骇"); + SOURCE_MAP.put("yyfdcw.com", "宀抽槼鎴垮湴浜х綉"); + SOURCE_MAP.put("cdsfgj.gov.cn", "甯稿痉甯傛埧鍦颁骇绠$悊灞�"); + SOURCE_MAP.put("aibang.com", "鐖卞府缃�"); + SOURCE_MAP.put("qzfczy.com", "娉夊窞鎴夸骇缃笟缃�"); + SOURCE_MAP.put("gotoip1.com", "鍥涘钩鎴夸骇缃�"); + SOURCE_MAP.put("essfdc.gov.cn", "鎭╂柦甯傛埧鍦颁骇淇℃伅缃�"); + SOURCE_MAP.put("lasafc.com", "鎷夎惃鎴夸骇缃�"); + SOURCE_MAP.put("akfc.gov.cn", "瀹夊悍甯傛埧浜х鐞嗗眬"); + SOURCE_MAP.put("0475fang.com", "閫氳窘鎴垮湴浜х綉"); + SOURCE_MAP.put("xnfcj.com", "鍜稿畞浣忔埧淇℃伅缃�"); + SOURCE_MAP.put("hldfcxx.com", "钁姦宀涙埧浜т俊鎭綉"); + SOURCE_MAP.put("cdfcw.com", "鎵垮痉鎴夸骇缃�"); + SOURCE_MAP.put("xyjw.gov.cn", "淇¢槼浣忓缓灞�"); + SOURCE_MAP.put("loupan.com", "妤肩洏缃�"); + SOURCE_MAP.put("gzwsfdc.com", "璧e窞缃戜笂鎴垮湴浜�"); + SOURCE_MAP.put("gxfangchan.com", "骞胯タ鎴夸骇缃�"); + SOURCE_MAP.put("shenyang1.com", "娌堥槼鎴夸骇缃�"); + SOURCE_MAP.put("nxsq.com", "瀹佸浠曞鎴夸骇缃�"); + SOURCE_MAP.put("hnfgw.com", "娴峰畞閫忔槑鍞埧缃�"); + SOURCE_MAP.put("fuzhou.gov.cn", "绂忓窞甯傛埧灞嬬櫥璁颁腑蹇�"); + SOURCE_MAP.put("zhen22.com", "鐪熶簩缃�"); + SOURCE_MAP.put("fenlei168.com", "涓浗鍒嗙被淇℃伅缃�"); + SOURCE_MAP.put("laipaiya.com", "鏉ユ媿鍛�"); + SOURCE_MAP.put("w.cn", "杈炬婧�"); + SOURCE_MAP.put("xinliuzhou.com", "鏂版煶宸炵綉"); + SOURCE_MAP.put("8720000.com.cn", "缁ュ寲浣冲鎴夸骇"); + SOURCE_MAP.put("shanxian.cn", "鍗曞幙鍦ㄧ嚎"); SOURCE_MAP.put("lfee.cn", "LEFF"); - SOURCE_MAP.put("maoyanyan.net", "榆林毛眼眼房产"); - SOURCE_MAP.put("ylxxg.com", "榆林信息港"); - SOURCE_MAP.put("akfcw.cn", "安康房产网akfcw"); - SOURCE_MAP.put("ylszjj.gov.cn", "榆林住房建设"); - SOURCE_MAP.put("qzfgw.gov.cn", "钦州住房建设"); - SOURCE_MAP.put("nyfdc.gov.cn", "南阳房管局"); - SOURCE_MAP.put("lyfdc.gov.cn", "临沂房产保障局"); - SOURCE_MAP.put("lffc.gov.cn", "临汾住房信息网"); - SOURCE_MAP.put("qinzhoufc.com", "钦州房产"); - SOURCE_MAP.put("qzfdcw.net", "钦州房产信息网"); - SOURCE_MAP.put("qzfcxh.com", "钦州房产协会"); - SOURCE_MAP.put("01ny.cn", "南阳房产网"); - SOURCE_MAP.put("xinxi263.com", "南阳信息港"); - SOURCE_MAP.put("linyiloushi.com", "临沂楼市"); - SOURCE_MAP.put("linyesf.com", "临沂房产网"); - SOURCE_MAP.put("linfangwang.com", "临房网"); - SOURCE_MAP.put("0539fc.com", "0539房产网"); - SOURCE_MAP.put("goufon.com", "临沂购房网"); - SOURCE_MAP.put("0539f.cn", "临沂房产网0539f"); - SOURCE_MAP.put("linfen365.com", "临汾365"); - SOURCE_MAP.put("0357linfen.com", "临汾网"); - SOURCE_MAP.put("wxhouse.com", "无锡房地产市场网"); - SOURCE_MAP.put("0731fdc.com", "0731房产网"); - SOURCE_MAP.put("whfcj.gov.cn", "武汉房产信息网"); - SOURCE_MAP.put("520953.com", "吴忠信息港"); - SOURCE_MAP.put("k0477.com", "鄂尔多斯信息港"); - SOURCE_MAP.put("qth8.com", "七台河信息网"); - SOURCE_MAP.put("zg163.net", "自贡房地产zg163"); - SOURCE_MAP.put("new0546.com", "新东营信息港"); - SOURCE_MAP.put("hi772.com", "来宾房产网"); - SOURCE_MAP.put("lbkfw.com", "来宾看房网"); - SOURCE_MAP.put("mayanchina.com", "玛雅房屋"); - SOURCE_MAP.put("xpchina.com", "地产中华网"); - SOURCE_MAP.put("0952100.com", "石嘴山生活网"); - SOURCE_MAP.put("0418fc.com", "阜新房产网"); - SOURCE_MAP.put("h0418.com", "阜新房产信息网"); - SOURCE_MAP.put("fxw.cc", "阜新房产网fxw"); - SOURCE_MAP.put("0474.net", "乌兰察布门户网"); - SOURCE_MAP.put("xtloushi.com", "邢台楼市"); - SOURCE_MAP.put("fc0319.com", "邢台房产网"); - SOURCE_MAP.put("housext.com", "邢台房地产网"); - SOURCE_MAP.put("zzfangchan.com", "郑州房产网"); - SOURCE_MAP.put("rzmaifang.com", "日照买方网"); - SOURCE_MAP.put("ggfcxx.com", "贵港房产信息网"); - SOURCE_MAP.put("0557.cn", "0557宿州房产网"); - SOURCE_MAP.put("fangchan0438.com", "松原房产网"); - SOURCE_MAP.put("0419f.com", "辽阳房产网"); - SOURCE_MAP.put("chzfdc.com", "池州房产生活网"); - SOURCE_MAP.put("chengdechina.com", "承德房产"); - SOURCE_MAP.put("zisai2.com", "紫塞房产网"); - SOURCE_MAP.put("my012.com", "1+2联合不动产"); - SOURCE_MAP.put("zzfcw.cn", "枣庄房产网"); - SOURCE_MAP.put("bjsfdc.com.cn", "宝鸡市房地产网"); - SOURCE_MAP.put("zaozhuangloushi.com", "枣庄楼市"); - SOURCE_MAP.put("laiwuloushi.com", "莱芜楼市"); - SOURCE_MAP.put("dayou123.com", "宝鸡房产"); - SOURCE_MAP.put("lwhouse.com", "莱芜房地产网"); - SOURCE_MAP.put("b0917.com", "宝鸡信息港"); - SOURCE_MAP.put("ptdfc.com", "平潭房产网"); - SOURCE_MAP.put("cn0917.com", "宝鸡网"); - SOURCE_MAP.put("ptfcxx.com", "平潭房产网cxx"); - SOURCE_MAP.put("39518.com", "潭房网"); - SOURCE_MAP.put("bazfc.cn", "巴中房产网"); - SOURCE_MAP.put("0827fc.com", "巴中房产网0827fc"); - SOURCE_MAP.put("qilinf.com", "麒麟房产"); - SOURCE_MAP.put("xiongqi.net", "巴中房产网xiongqi"); - SOURCE_MAP.put("bzleju.com", "巴中乐居房产网"); - SOURCE_MAP.put("bzhqfc.com", "鸿桥房产"); - SOURCE_MAP.put("bb365.cc", "蚌埠网"); - SOURCE_MAP.put("bzgd.com", "巴中房产"); - SOURCE_MAP.put("chuzf.cn", "滁州房产信息网"); - SOURCE_MAP.put("bzml.com", "巴中房产网bzml"); - SOURCE_MAP.put("shaofang.cc", "邵阳房产网"); - SOURCE_MAP.put("ztinfo.com", "鹤都网"); - SOURCE_MAP.put("zhtfc.cn", "昭通房产网"); - SOURCE_MAP.put("zzleju.com", "乐居网"); - SOURCE_MAP.put("bslife.cn", "保山生活网"); - SOURCE_MAP.put("ynju.com", "聚云南"); - SOURCE_MAP.put("kaifc.cn", "开封房产网"); - SOURCE_MAP.put("jiulongw.cn", "九龙网"); - SOURCE_MAP.put("zuojiang.com", "左江网"); - SOURCE_MAP.put("pefczx.com", "普洱房产咨询网"); - SOURCE_MAP.put("cz616.com", "崇左百事通"); - SOURCE_MAP.put("fcjyw.org", "房产交易网"); - SOURCE_MAP.put("chongzuobbs.com", "崇左网"); - SOURCE_MAP.put("0722h.com", "随州好房网"); - SOURCE_MAP.put("yongzhou.com", "永州网"); - SOURCE_MAP.put("jzcool.com", "荆州在线"); - SOURCE_MAP.put("xiaoganshi.net", "念家不动产"); - SOURCE_MAP.put("xianning.com", "咸宁网"); - SOURCE_MAP.put("dzfc.com", "达州房产网"); - SOURCE_MAP.put("dzfc.cn", "达州房产"); - SOURCE_MAP.put("dzloupan.cn", "达州楼盘网"); - SOURCE_MAP.put("dz090.com", "达州都市网"); - SOURCE_MAP.put("dz600.com", "达州生活网"); - SOURCE_MAP.put("dazhou.cc", "达州生活网dazhou"); - SOURCE_MAP.put("dz1fdc.com", "公元地产"); - SOURCE_MAP.put("dzwj.com.cn", "达州蜗居网"); - SOURCE_MAP.put("smxfcw.cn", "三门峡房产网"); - SOURCE_MAP.put("dzroom.com", "达州租房网"); - SOURCE_MAP.put("ezrea.com", "鄂州房产网ezrea"); - SOURCE_MAP.put("ezhfc.cn", "鄂州房产网ezhfc"); - SOURCE_MAP.put("sqdyf.com", "商丘第一房"); - SOURCE_MAP.put("300fc.com", "鄂州房产网300fc"); - SOURCE_MAP.put("436000.cn", "鄂州网"); - SOURCE_MAP.put("0711ez.cn", "鄂州房产网0711ez"); - SOURCE_MAP.put("fsfcw.net", "抚顺房产网fsfcw"); - SOURCE_MAP.put("fsfcxxw.com", "抚顺房产信息网"); - SOURCE_MAP.put("baidu0413.com", "抚顺好房子"); - SOURCE_MAP.put("xunju.net", "抚顺寻居房产网"); - SOURCE_MAP.put("lnfs.cn", "抚顺信息网"); - SOURCE_MAP.put("huaibeifangchan.com", "淮北房产网hbfc"); - SOURCE_MAP.put("xc0561.com", "相城房产网"); - SOURCE_MAP.put("fzhfc.cn", "抚州房产网"); - SOURCE_MAP.put("0778fang.com", "河池房网"); - SOURCE_MAP.put("gxhc365.com", "河池365"); - SOURCE_MAP.put("hccun.com", "河池生活网"); - SOURCE_MAP.put("fuzhoufc.com", "抚州房产网fuzhoufc"); - SOURCE_MAP.put("hrfcw.cn", "和润房产网"); - SOURCE_MAP.put("lejiafangchan.com", "衡水乐家房产中介"); - SOURCE_MAP.put("zhengdafangchan.com", "衡水正大房产网"); - SOURCE_MAP.put("hshdfc.com", "恒达房产"); - SOURCE_MAP.put("053000.com", "衡水房产网053000"); - SOURCE_MAP.put("0318ol.com", "衡水在线"); - SOURCE_MAP.put("jiayuanfangchan.com.cn", "佳缘房产"); - SOURCE_MAP.put("xinhs.com", "衡水信息港"); - SOURCE_MAP.put("hbshw.cn", "鹤壁生活网"); - SOURCE_MAP.put("gooddt.com", "都市信息"); - SOURCE_MAP.put("bm0392.com", "鹤壁便民网"); - SOURCE_MAP.put("458000.com", "鹤壁信息港"); - SOURCE_MAP.put("fc392.com", "鹤壁房产网fc392"); - SOURCE_MAP.put("hgd1.com", "鹤岗第一网"); - SOURCE_MAP.put("0468.com.cn", "鹤岗生活网"); - SOURCE_MAP.put("jianfc.com", "吉安房产网"); - SOURCE_MAP.put("huaif.cn", "怀化房产网huaif"); - SOURCE_MAP.put("jdzfgj.gov.cn", "景德镇市房管局"); - SOURCE_MAP.put("0745news.cn", "怀化新闻网"); - SOURCE_MAP.put("hhccdc.com", "诚成地产"); - SOURCE_MAP.put("e0745.com", "怀化房产网e0745"); - SOURCE_MAP.put("0745f.com", "房地产信息网"); - SOURCE_MAP.put("c0798.com", "景德镇买房网"); - SOURCE_MAP.put("hhjjfdc.com", "佳家地产"); - SOURCE_MAP.put("hldfcw.com", "葫芦岛房产"); - SOURCE_MAP.put("ashld.com", "葫芦岛门户网"); - SOURCE_MAP.put("yx0429.com", "葫芦岛房地产超市网"); - SOURCE_MAP.put("0429b.com", "葫芦岛房地产网0429b"); - SOURCE_MAP.put("hldinfo.net", "葫芦岛信息港"); - SOURCE_MAP.put("0470a.com", "呼伦贝尔火网"); - SOURCE_MAP.put("0470000.com", "呼伦贝尔生活网"); - SOURCE_MAP.put("jqcn.net", "酒泉生活网"); - SOURCE_MAP.put("jqwj.cc", "酒泉网聚"); - SOURCE_MAP.put("m937.com", "酒泉招贴"); - SOURCE_MAP.put("f537.com", "济宁房房网"); - SOURCE_MAP.put("jiningloushi.com", "济宁楼市"); - SOURCE_MAP.put("jn678.com", "济宁房产网"); - SOURCE_MAP.put("0537fangchan.com", "济宁房产网0537"); - SOURCE_MAP.put("fangguagua.com", "房呱呱"); - SOURCE_MAP.put("jninfo.net.cn", "济宁信息港"); - SOURCE_MAP.put("jiningxinxigang.com", "济宁信息港jnxxg"); - SOURCE_MAP.put("05376.com", "济宁信息网"); - SOURCE_MAP.put("jn234.com", "济宁新信息港"); - SOURCE_MAP.put("jnzx.net.cn", "济宁在线"); - SOURCE_MAP.put("ms537.com", "民生信息"); - SOURCE_MAP.put("jnfcw.com.cn", "济房网jnfcw"); - SOURCE_MAP.put("jzfc123.com", "晋中房产网jzfc123"); - SOURCE_MAP.put("woaixinjia.com", "新家网"); - SOURCE_MAP.put("364000.com", "龙岩网"); - SOURCE_MAP.put("0597321.com", "龙岩321房产网"); - SOURCE_MAP.put("0597kk.com", "龙岩KK网"); - SOURCE_MAP.put("0597house.com", "龙岩房产网0597"); - SOURCE_MAP.put("lyfang.com", "龙岩搜房网"); - SOURCE_MAP.put("597fcw.com", "龙岩房产网597fcw"); - SOURCE_MAP.put("fjlyfdc.com.cn", "龙岩房地产信息网"); - SOURCE_MAP.put("0597jia.com", "佳诚房产"); - SOURCE_MAP.put("lyanf.cn", "龙岩房产网lyanf"); - SOURCE_MAP.put("luohe.com.cn", "漯河网"); - SOURCE_MAP.put("0395fc.com", "漯河房产网0395fc"); - SOURCE_MAP.put("0395home.com", "漯河购房网"); - SOURCE_MAP.put("lhfc.cn", "漯河房产网lhfc"); - SOURCE_MAP.put("0395.tv", "漯房网"); - SOURCE_MAP.put("luohejie.com", "漯河街"); - SOURCE_MAP.put("0395mf.com", "漯河买房网"); - SOURCE_MAP.put("lcxwfc.com", "聊城房网"); - SOURCE_MAP.put("liaochengloushi.com", "聊城楼市"); - SOURCE_MAP.put("lcfcj.com", "聊城房产交易网"); - SOURCE_MAP.put("lcfdcw.com", "聊城房地产网"); - SOURCE_MAP.put("lc365.net", "聊城房地产网lc365"); - SOURCE_MAP.put("ilcw.net", "聊城网"); - SOURCE_MAP.put("fc0832.com", "内江房产"); - SOURCE_MAP.put("0832h.com", "内江房交网"); - SOURCE_MAP.put("njxinf.com", "内江新房产网"); - SOURCE_MAP.put("onzao.cn", "内江房产网onzao"); - SOURCE_MAP.put("njdsw.cn", "内江都市网"); - SOURCE_MAP.put("xnjhome.com", "新内江房产网"); - SOURCE_MAP.put("0598777.net", "三明房产家装网"); - SOURCE_MAP.put("860598.com", "三明芭乐网"); - SOURCE_MAP.put("d0598.com", "三明房产网d0598"); - SOURCE_MAP.put("smzf.net", "三明住房网"); - SOURCE_MAP.put("0598f.cn", "三明房产网0598f"); - SOURCE_MAP.put("smfdc.cn", "三明房产中介"); - SOURCE_MAP.put("0719house.com", "车城房产网"); - SOURCE_MAP.put("syfang.net", "十堰房产网syfang"); - SOURCE_MAP.put("0719114.com", "十堰房地产"); - SOURCE_MAP.put("trlpw.com", "铜仁楼盘网"); - SOURCE_MAP.put("trren.cn", "铜仁房产"); - SOURCE_MAP.put("tongren.gov.cn", "中国铜仁"); - SOURCE_MAP.put("tr169.cn", "铜仁都市网"); - SOURCE_MAP.put("0856.com.cn", "铜仁在线"); - SOURCE_MAP.put("aofenglu.com", "宣城房产网aofenglu"); - SOURCE_MAP.put("ok0563.com", "宣城房产交易网"); - SOURCE_MAP.put("xchfc.cn", "宣城房产网xchfc"); - SOURCE_MAP.put("0563fang.org", "0563房产网"); - SOURCE_MAP.put("xuanfang.org", "宣城房产网xuanfang"); - SOURCE_MAP.put("0790f.cn", "新余房产网0790f"); - SOURCE_MAP.put("jxdcw.com", "新余地产网"); - SOURCE_MAP.put("0790dcw.com", "新余地产网0790"); - SOURCE_MAP.put("0701dcw.com", "鹰潭地产网"); - SOURCE_MAP.put("0350.cn", "忻州信息港"); - SOURCE_MAP.put("shoufang123.com", "忻州售房网"); - SOURCE_MAP.put("xzhfy.com", "忻州好房缘"); - SOURCE_MAP.put("0701fdc.com", "鹰潭房地产联合网"); - SOURCE_MAP.put("yt99.com", "久久信息网"); - SOURCE_MAP.put("0701ba.com", "中国鹰潭"); - SOURCE_MAP.put("24yt.com", "合众鹰潭"); - SOURCE_MAP.put("juranhouse.com", "张掖房地产网"); - SOURCE_MAP.put("0936.co", "张掖在线"); - SOURCE_MAP.put("lowlo.cn", "楼外楼网"); - SOURCE_MAP.put("huainet.com", "淮安房产网"); - SOURCE_MAP.put("nthfw.com", "南通好房网"); - SOURCE_MAP.put("yajuke.com", "雅居客"); - SOURCE_MAP.put("xzloushi.cn", "徐州楼市"); - SOURCE_MAP.put("czfdc.com", "常房网"); - SOURCE_MAP.put("pcls.com.cn", "彭城楼市网"); - SOURCE_MAP.put("czfcw.com", "常州房产网"); - SOURCE_MAP.put("yzfc.cn", "扬房网"); - SOURCE_MAP.put("xz.gov.cn", "徐州房管局"); - SOURCE_MAP.put("0515house.cn", "盐城第一房产网"); - SOURCE_MAP.put("sqanju.com", "安居网"); - SOURCE_MAP.put("sqfcw.com", "宿迁找房网"); - SOURCE_MAP.put("sqfcw.com.cn", "西楚房产网"); - SOURCE_MAP.put("tzfdc.com.cn", "泰州房地产信息网"); - SOURCE_MAP.put("t56.net", "泰无聊房产网"); - SOURCE_MAP.put("lygfdc.com", "连云港房地产网"); - SOURCE_MAP.put("yancheng.gov.cn", "盐城房管局"); - SOURCE_MAP.put("gj0511.com", "镇江逛街网"); - SOURCE_MAP.put("0352fang.com", "大同房产网"); - SOURCE_MAP.put("h0476.com", "赤峰房地产网"); - SOURCE_MAP.put("nxfang.com/", "宁夏房网n"); - SOURCE_MAP.put("520953.com", "吴忠信息港"); - SOURCE_MAP.put("wuzhousky.com", "梧州时空网"); - SOURCE_MAP.put("sdchina.com/", "中国山东网m"); - SOURCE_MAP.put("dyfc.net", "东营房产网"); - SOURCE_MAP.put("zyhouse.com.cn", "遵义房地产信息网"); - SOURCE_MAP.put("yyfdcw.com", "岳阳房地产网"); - SOURCE_MAP.put("goufanggo.net", "岳阳购房网"); - SOURCE_MAP.put("591fcw.cn", "我就要房产网"); - SOURCE_MAP.put("51258.cn", "亳州房产信息网"); - SOURCE_MAP.put("365baotou.com", "包头房地产网"); - SOURCE_MAP.put("aqhouse.com", "安庆房地产交易网"); - SOURCE_MAP.put("0853fdc.com", "0853房产网"); - SOURCE_MAP.put("ndfdc.com", "宁德房地产网"); - SOURCE_MAP.put("lsfdc.com", "乐房网"); - SOURCE_MAP.put("dyfcw.com", "德阳房产网"); - SOURCE_MAP.put("dyfcw.com", "德阳房产网"); - SOURCE_MAP.put("e0838.com", "住在德阳网"); - SOURCE_MAP.put("shaofang.cc", "邵房网"); - SOURCE_MAP.put("jmfc.com.cn", "荆门房产热线"); - SOURCE_MAP.put("kaifc.cn", "开封房产网"); - SOURCE_MAP.put("akfang.com", "安康房地产门户网"); - SOURCE_MAP.put("xyfcw.com", "信阳房产网"); - SOURCE_MAP.put("xyfdcw.com.cn", "信阳房地产网"); - SOURCE_MAP.put("0473fdc.com", "乌海房产网"); - SOURCE_MAP.put("zmdfcw.com", "驻马店房产网"); - SOURCE_MAP.put("0316.cc", "廊房网"); - SOURCE_MAP.put("0827fc.com", "巴中房产网"); - SOURCE_MAP.put("0917fdc.com", "宝鸡房产网"); - SOURCE_MAP.put("gxbs.net", "百色市房地产信息网"); - SOURCE_MAP.put("songyuanfang.com", "松原购房网"); - SOURCE_MAP.put("0470fcw.com", "呼伦贝尔房产网"); - SOURCE_MAP.put("0470a.com", "呼伦贝尔火网"); - SOURCE_MAP.put("hldhouse.com", "葫芦岛房地产网"); - SOURCE_MAP.put("hldkfw.com", "葫芦岛看房网"); - SOURCE_MAP.put("ehuludao.com", "葫芦岛在线"); - SOURCE_MAP.put("xhengshui.com", "衡水易房网"); - SOURCE_MAP.put("yinuo1000.com", "一诺房产网"); - SOURCE_MAP.put("0561house.com", "淮北房产网"); - SOURCE_MAP.put("zmdfdc.com", "驻马店房地产信息网"); - SOURCE_MAP.put("xc0561.com", "相城房产网"); - SOURCE_MAP.put("zmdfcgl.com", "驻马店住房管理中心"); - SOURCE_MAP.put("jhhouse.com.cn", "江淮房地产网"); - SOURCE_MAP.put("lffdc.gov.cn", "廊坊房管局"); - SOURCE_MAP.put("juranhouse.com", "张掖房地产网"); - SOURCE_MAP.put("0701fc.com", "鹰潭房产网0701fc"); - SOURCE_MAP.put("tangrenju.net", "唐人居"); - SOURCE_MAP.put("hncyfc.com", "淮南朝阳房产"); - SOURCE_MAP.put("hzfc.cc", "荷房网"); - SOURCE_MAP.put("xyanjia.com", "新余房产网"); + SOURCE_MAP.put("maoyanyan.net", "姒嗘灄姣涚溂鐪兼埧浜�"); + SOURCE_MAP.put("ylxxg.com", "姒嗘灄淇℃伅娓�"); + SOURCE_MAP.put("akfcw.cn", "瀹夊悍鎴夸骇缃慳kfcw"); + SOURCE_MAP.put("ylszjj.gov.cn", "姒嗘灄浣忔埧寤鸿"); + SOURCE_MAP.put("qzfgw.gov.cn", "閽﹀窞浣忔埧寤鸿"); + SOURCE_MAP.put("nyfdc.gov.cn", "鍗楅槼鎴跨灞�"); + SOURCE_MAP.put("lyfdc.gov.cn", "涓存矀鎴夸骇淇濋殰灞�"); + SOURCE_MAP.put("lffc.gov.cn", "涓存本浣忔埧淇℃伅缃�"); + SOURCE_MAP.put("qinzhoufc.com", "閽﹀窞鎴夸骇"); + SOURCE_MAP.put("qzfdcw.net", "閽﹀窞鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("qzfcxh.com", "閽﹀窞鎴夸骇鍗忎細"); + SOURCE_MAP.put("01ny.cn", "鍗楅槼鎴夸骇缃�"); + SOURCE_MAP.put("xinxi263.com", "鍗楅槼淇℃伅娓�"); + SOURCE_MAP.put("linyiloushi.com", "涓存矀妤煎競"); + SOURCE_MAP.put("linyesf.com", "涓存矀鎴夸骇缃�"); + SOURCE_MAP.put("linfangwang.com", "涓存埧缃�"); + SOURCE_MAP.put("0539fc.com", "0539鎴夸骇缃�"); + SOURCE_MAP.put("goufon.com", "涓存矀璐埧缃�"); + SOURCE_MAP.put("0539f.cn", "涓存矀鎴夸骇缃�0539f"); + SOURCE_MAP.put("linfen365.com", "涓存本365"); + SOURCE_MAP.put("0357linfen.com", "涓存本缃�"); + SOURCE_MAP.put("wxhouse.com", "鏃犻敗鎴垮湴浜у競鍦虹綉"); + SOURCE_MAP.put("0731fdc.com", "0731鎴夸骇缃�"); + SOURCE_MAP.put("whfcj.gov.cn", "姝︽眽鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("520953.com", "鍚村繝淇℃伅娓�"); + SOURCE_MAP.put("k0477.com", "閯傚皵澶氭柉淇℃伅娓�"); + SOURCE_MAP.put("qth8.com", "涓冨彴娌充俊鎭綉"); + SOURCE_MAP.put("zg163.net", "鑷础鎴垮湴浜g163"); + SOURCE_MAP.put("new0546.com", "鏂颁笢钀ヤ俊鎭腐"); + SOURCE_MAP.put("hi772.com", "鏉ュ鎴夸骇缃�"); + SOURCE_MAP.put("lbkfw.com", "鏉ュ鐪嬫埧缃�"); + SOURCE_MAP.put("mayanchina.com", "鐜涢泤鎴垮眿"); + SOURCE_MAP.put("xpchina.com", "鍦颁骇涓崕缃�"); + SOURCE_MAP.put("0952100.com", "鐭冲槾灞辩敓娲荤綉"); + SOURCE_MAP.put("0418fc.com", "闃滄柊鎴夸骇缃�"); + SOURCE_MAP.put("h0418.com", "闃滄柊鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("fxw.cc", "闃滄柊鎴夸骇缃慺xw"); + SOURCE_MAP.put("0474.net", "涔屽叞瀵熷竷闂ㄦ埛缃�"); + SOURCE_MAP.put("xtloushi.com", "閭㈠彴妤煎競"); + SOURCE_MAP.put("fc0319.com", "閭㈠彴鎴夸骇缃�"); + SOURCE_MAP.put("housext.com", "閭㈠彴鎴垮湴浜х綉"); + SOURCE_MAP.put("zzfangchan.com", "閮戝窞鎴夸骇缃�"); + SOURCE_MAP.put("rzmaifang.com", "鏃ョ収涔版柟缃�"); + SOURCE_MAP.put("ggfcxx.com", "璐垫腐鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("0557.cn", "0557瀹垮窞鎴夸骇缃�"); + SOURCE_MAP.put("fangchan0438.com", "鏉惧師鎴夸骇缃�"); + SOURCE_MAP.put("0419f.com", "杈介槼鎴夸骇缃�"); + SOURCE_MAP.put("chzfdc.com", "姹犲窞鎴夸骇鐢熸椿缃�"); + SOURCE_MAP.put("chengdechina.com", "鎵垮痉鎴夸骇"); + SOURCE_MAP.put("zisai2.com", "绱鎴夸骇缃�"); + SOURCE_MAP.put("my012.com", "1+2鑱斿悎涓嶅姩浜�"); + SOURCE_MAP.put("zzfcw.cn", "鏋e簞鎴夸骇缃�"); + SOURCE_MAP.put("bjsfdc.com.cn", "瀹濋浮甯傛埧鍦颁骇缃�"); + SOURCE_MAP.put("zaozhuangloushi.com", "鏋e簞妤煎競"); + SOURCE_MAP.put("laiwuloushi.com", "鑾辫姕妤煎競"); + SOURCE_MAP.put("dayou123.com", "瀹濋浮鎴夸骇"); + SOURCE_MAP.put("lwhouse.com", "鑾辫姕鎴垮湴浜х綉"); + SOURCE_MAP.put("b0917.com", "瀹濋浮淇℃伅娓�"); + SOURCE_MAP.put("ptdfc.com", "骞虫江鎴夸骇缃�"); + SOURCE_MAP.put("cn0917.com", "瀹濋浮缃�"); + SOURCE_MAP.put("ptfcxx.com", "骞虫江鎴夸骇缃慶xx"); + SOURCE_MAP.put("39518.com", "娼埧缃�"); + SOURCE_MAP.put("bazfc.cn", "宸翠腑鎴夸骇缃�"); + SOURCE_MAP.put("0827fc.com", "宸翠腑鎴夸骇缃�0827fc"); + SOURCE_MAP.put("qilinf.com", "楹掗簾鎴夸骇"); + SOURCE_MAP.put("xiongqi.net", "宸翠腑鎴夸骇缃憍iongqi"); + SOURCE_MAP.put("bzleju.com", "宸翠腑涔愬眳鎴夸骇缃�"); + SOURCE_MAP.put("bzhqfc.com", "楦挎ˉ鎴夸骇"); + SOURCE_MAP.put("bb365.cc", "铓屽煚缃�"); + SOURCE_MAP.put("bzgd.com", "宸翠腑鎴夸骇"); + SOURCE_MAP.put("chuzf.cn", "婊佸窞鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("bzml.com", "宸翠腑鎴夸骇缃慴zml"); + SOURCE_MAP.put("shaofang.cc", "閭甸槼鎴夸骇缃�"); + SOURCE_MAP.put("ztinfo.com", "楣ら兘缃�"); + SOURCE_MAP.put("zhtfc.cn", "鏄�氭埧浜х綉"); + SOURCE_MAP.put("zzleju.com", "涔愬眳缃�"); + SOURCE_MAP.put("bslife.cn", "淇濆北鐢熸椿缃�"); + SOURCE_MAP.put("ynju.com", "鑱氫簯鍗�"); + SOURCE_MAP.put("kaifc.cn", "寮�灏佹埧浜х綉"); + SOURCE_MAP.put("jiulongw.cn", "涔濋緳缃�"); + SOURCE_MAP.put("zuojiang.com", "宸︽睙缃�"); + SOURCE_MAP.put("pefczx.com", "鏅幢鎴夸骇鍜ㄨ缃�"); + SOURCE_MAP.put("cz616.com", "宕囧乏鐧句簨閫�"); + SOURCE_MAP.put("fcjyw.org", "鎴夸骇浜ゆ槗缃�"); + SOURCE_MAP.put("chongzuobbs.com", "宕囧乏缃�"); + SOURCE_MAP.put("0722h.com", "闅忓窞濂芥埧缃�"); + SOURCE_MAP.put("yongzhou.com", "姘稿窞缃�"); + SOURCE_MAP.put("jzcool.com", "鑽嗗窞鍦ㄧ嚎"); + SOURCE_MAP.put("xiaoganshi.net", "蹇靛涓嶅姩浜�"); + SOURCE_MAP.put("xianning.com", "鍜稿畞缃�"); + SOURCE_MAP.put("dzfc.com", "杈惧窞鎴夸骇缃�"); + SOURCE_MAP.put("dzfc.cn", "杈惧窞鎴夸骇"); + SOURCE_MAP.put("dzloupan.cn", "杈惧窞妤肩洏缃�"); + SOURCE_MAP.put("dz090.com", "杈惧窞閮藉競缃�"); + SOURCE_MAP.put("dz600.com", "杈惧窞鐢熸椿缃�"); + SOURCE_MAP.put("dazhou.cc", "杈惧窞鐢熸椿缃慸azhou"); + SOURCE_MAP.put("dz1fdc.com", "鍏厓鍦颁骇"); + SOURCE_MAP.put("dzwj.com.cn", "杈惧窞铚楀眳缃�"); + SOURCE_MAP.put("smxfcw.cn", "涓夐棬宄℃埧浜х綉"); + SOURCE_MAP.put("dzroom.com", "杈惧窞绉熸埧缃�"); + SOURCE_MAP.put("ezrea.com", "閯傚窞鎴夸骇缃慹zrea"); + SOURCE_MAP.put("ezhfc.cn", "閯傚窞鎴夸骇缃慹zhfc"); + SOURCE_MAP.put("sqdyf.com", "鍟嗕笜绗竴鎴�"); + SOURCE_MAP.put("300fc.com", "閯傚窞鎴夸骇缃�300fc"); + SOURCE_MAP.put("436000.cn", "閯傚窞缃�"); + SOURCE_MAP.put("0711ez.cn", "閯傚窞鎴夸骇缃�0711ez"); + SOURCE_MAP.put("fsfcw.net", "鎶氶『鎴夸骇缃慺sfcw"); + SOURCE_MAP.put("fsfcxxw.com", "鎶氶『鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("baidu0413.com", "鎶氶『濂芥埧瀛�"); + SOURCE_MAP.put("xunju.net", "鎶氶『瀵诲眳鎴夸骇缃�"); + SOURCE_MAP.put("lnfs.cn", "鎶氶『淇℃伅缃�"); + SOURCE_MAP.put("huaibeifangchan.com", "娣寳鎴夸骇缃慼bfc"); + SOURCE_MAP.put("xc0561.com", "鐩稿煄鎴夸骇缃�"); + SOURCE_MAP.put("fzhfc.cn", "鎶氬窞鎴夸骇缃�"); + SOURCE_MAP.put("0778fang.com", "娌虫睜鎴跨綉"); + SOURCE_MAP.put("gxhc365.com", "娌虫睜365"); + SOURCE_MAP.put("hccun.com", "娌虫睜鐢熸椿缃�"); + SOURCE_MAP.put("fuzhoufc.com", "鎶氬窞鎴夸骇缃慺uzhoufc"); + SOURCE_MAP.put("hrfcw.cn", "鍜屾鼎鎴夸骇缃�"); + SOURCE_MAP.put("lejiafangchan.com", "琛℃按涔愬鎴夸骇涓粙"); + SOURCE_MAP.put("zhengdafangchan.com", "琛℃按姝eぇ鎴夸骇缃�"); + SOURCE_MAP.put("hshdfc.com", "鎭掕揪鎴夸骇"); + SOURCE_MAP.put("053000.com", "琛℃按鎴夸骇缃�053000"); + SOURCE_MAP.put("0318ol.com", "琛℃按鍦ㄧ嚎"); + SOURCE_MAP.put("jiayuanfangchan.com.cn", "浣崇紭鎴夸骇"); + SOURCE_MAP.put("xinhs.com", "琛℃按淇℃伅娓�"); + SOURCE_MAP.put("hbshw.cn", "楣ゅ鐢熸椿缃�"); + SOURCE_MAP.put("gooddt.com", "閮藉競淇℃伅"); + SOURCE_MAP.put("bm0392.com", "楣ゅ渚挎皯缃�"); + SOURCE_MAP.put("458000.com", "楣ゅ淇℃伅娓�"); + SOURCE_MAP.put("fc392.com", "楣ゅ鎴夸骇缃慺c392"); + SOURCE_MAP.put("hgd1.com", "楣ゅ矖绗竴缃�"); + SOURCE_MAP.put("0468.com.cn", "楣ゅ矖鐢熸椿缃�"); + SOURCE_MAP.put("jianfc.com", "鍚夊畨鎴夸骇缃�"); + SOURCE_MAP.put("huaif.cn", "鎬�鍖栨埧浜х綉huaif"); + SOURCE_MAP.put("jdzfgj.gov.cn", "鏅痉闀囧競鎴跨灞�"); + SOURCE_MAP.put("0745news.cn", "鎬�鍖栨柊闂荤綉"); + SOURCE_MAP.put("hhccdc.com", "璇氭垚鍦颁骇"); + SOURCE_MAP.put("e0745.com", "鎬�鍖栨埧浜х綉e0745"); + SOURCE_MAP.put("0745f.com", "鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("c0798.com", "鏅痉闀囦拱鎴跨綉"); + SOURCE_MAP.put("hhjjfdc.com", "浣冲鍦颁骇"); + SOURCE_MAP.put("hldfcw.com", "钁姦宀涙埧浜�"); + SOURCE_MAP.put("ashld.com", "钁姦宀涢棬鎴风綉"); + SOURCE_MAP.put("yx0429.com", "钁姦宀涙埧鍦颁骇瓒呭競缃�"); + SOURCE_MAP.put("0429b.com", "钁姦宀涙埧鍦颁骇缃�0429b"); + SOURCE_MAP.put("hldinfo.net", "钁姦宀涗俊鎭腐"); + SOURCE_MAP.put("0470a.com", "鍛间鸡璐濆皵鐏綉"); + SOURCE_MAP.put("0470000.com", "鍛间鸡璐濆皵鐢熸椿缃�"); + SOURCE_MAP.put("jqcn.net", "閰掓硥鐢熸椿缃�"); + SOURCE_MAP.put("jqwj.cc", "閰掓硥缃戣仛"); + SOURCE_MAP.put("m937.com", "閰掓硥鎷涜创"); + SOURCE_MAP.put("f537.com", "娴庡畞鎴挎埧缃�"); + SOURCE_MAP.put("jiningloushi.com", "娴庡畞妤煎競"); + SOURCE_MAP.put("jn678.com", "娴庡畞鎴夸骇缃�"); + SOURCE_MAP.put("0537fangchan.com", "娴庡畞鎴夸骇缃�0537"); + SOURCE_MAP.put("fangguagua.com", "鎴垮懕鍛�"); + SOURCE_MAP.put("jninfo.net.cn", "娴庡畞淇℃伅娓�"); + SOURCE_MAP.put("jiningxinxigang.com", "娴庡畞淇℃伅娓痡nxxg"); + SOURCE_MAP.put("05376.com", "娴庡畞淇℃伅缃�"); + SOURCE_MAP.put("jn234.com", "娴庡畞鏂颁俊鎭腐"); + SOURCE_MAP.put("jnzx.net.cn", "娴庡畞鍦ㄧ嚎"); + SOURCE_MAP.put("ms537.com", "姘戠敓淇℃伅"); + SOURCE_MAP.put("jnfcw.com.cn", "娴庢埧缃慾nfcw"); + SOURCE_MAP.put("jzfc123.com", "鏅嬩腑鎴夸骇缃慾zfc123"); + SOURCE_MAP.put("woaixinjia.com", "鏂板缃�"); + SOURCE_MAP.put("364000.com", "榫欏博缃�"); + SOURCE_MAP.put("0597321.com", "榫欏博321鎴夸骇缃�"); + SOURCE_MAP.put("0597kk.com", "榫欏博KK缃�"); + SOURCE_MAP.put("0597house.com", "榫欏博鎴夸骇缃�0597"); + SOURCE_MAP.put("lyfang.com", "榫欏博鎼滄埧缃�"); + SOURCE_MAP.put("597fcw.com", "榫欏博鎴夸骇缃�597fcw"); + SOURCE_MAP.put("fjlyfdc.com.cn", "榫欏博鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("0597jia.com", "浣宠瘹鎴夸骇"); + SOURCE_MAP.put("lyanf.cn", "榫欏博鎴夸骇缃憀yanf"); + SOURCE_MAP.put("luohe.com.cn", "婕渤缃�"); + SOURCE_MAP.put("0395fc.com", "婕渤鎴夸骇缃�0395fc"); + SOURCE_MAP.put("0395home.com", "婕渤璐埧缃�"); + SOURCE_MAP.put("lhfc.cn", "婕渤鎴夸骇缃憀hfc"); + SOURCE_MAP.put("0395.tv", "婕埧缃�"); + SOURCE_MAP.put("luohejie.com", "婕渤琛�"); + SOURCE_MAP.put("0395mf.com", "婕渤涔版埧缃�"); + SOURCE_MAP.put("lcxwfc.com", "鑱婂煄鎴跨綉"); + SOURCE_MAP.put("liaochengloushi.com", "鑱婂煄妤煎競"); + SOURCE_MAP.put("lcfcj.com", "鑱婂煄鎴夸骇浜ゆ槗缃�"); + SOURCE_MAP.put("lcfdcw.com", "鑱婂煄鎴垮湴浜х綉"); + SOURCE_MAP.put("lc365.net", "鑱婂煄鎴垮湴浜х綉lc365"); + SOURCE_MAP.put("ilcw.net", "鑱婂煄缃�"); + SOURCE_MAP.put("fc0832.com", "鍐呮睙鎴夸骇"); + SOURCE_MAP.put("0832h.com", "鍐呮睙鎴夸氦缃�"); + SOURCE_MAP.put("njxinf.com", "鍐呮睙鏂版埧浜х綉"); + SOURCE_MAP.put("onzao.cn", "鍐呮睙鎴夸骇缃憃nzao"); + SOURCE_MAP.put("njdsw.cn", "鍐呮睙閮藉競缃�"); + SOURCE_MAP.put("xnjhome.com", "鏂板唴姹熸埧浜х綉"); + SOURCE_MAP.put("0598777.net", "涓夋槑鎴夸骇瀹惰缃�"); + SOURCE_MAP.put("860598.com", "涓夋槑鑺箰缃�"); + SOURCE_MAP.put("d0598.com", "涓夋槑鎴夸骇缃慸0598"); + SOURCE_MAP.put("smzf.net", "涓夋槑浣忔埧缃�"); + SOURCE_MAP.put("0598f.cn", "涓夋槑鎴夸骇缃�0598f"); + SOURCE_MAP.put("smfdc.cn", "涓夋槑鎴夸骇涓粙"); + SOURCE_MAP.put("0719house.com", "杞﹀煄鎴夸骇缃�"); + SOURCE_MAP.put("syfang.net", "鍗佸牥鎴夸骇缃憇yfang"); + SOURCE_MAP.put("0719114.com", "鍗佸牥鎴垮湴浜�"); + SOURCE_MAP.put("trlpw.com", "閾滀粊妤肩洏缃�"); + SOURCE_MAP.put("trren.cn", "閾滀粊鎴夸骇"); + SOURCE_MAP.put("tongren.gov.cn", "涓浗閾滀粊"); + SOURCE_MAP.put("tr169.cn", "閾滀粊閮藉競缃�"); + SOURCE_MAP.put("0856.com.cn", "閾滀粊鍦ㄧ嚎"); + SOURCE_MAP.put("aofenglu.com", "瀹e煄鎴夸骇缃慳ofenglu"); + SOURCE_MAP.put("ok0563.com", "瀹e煄鎴夸骇浜ゆ槗缃�"); + SOURCE_MAP.put("xchfc.cn", "瀹e煄鎴夸骇缃憍chfc"); + SOURCE_MAP.put("0563fang.org", "0563鎴夸骇缃�"); + SOURCE_MAP.put("xuanfang.org", "瀹e煄鎴夸骇缃憍uanfang"); + SOURCE_MAP.put("0790f.cn", "鏂颁綑鎴夸骇缃�0790f"); + SOURCE_MAP.put("jxdcw.com", "鏂颁綑鍦颁骇缃�"); + SOURCE_MAP.put("0790dcw.com", "鏂颁綑鍦颁骇缃�0790"); + SOURCE_MAP.put("0701dcw.com", "楣版江鍦颁骇缃�"); + SOURCE_MAP.put("0350.cn", "蹇诲窞淇℃伅娓�"); + SOURCE_MAP.put("shoufang123.com", "蹇诲窞鍞埧缃�"); + SOURCE_MAP.put("xzhfy.com", "蹇诲窞濂芥埧缂�"); + SOURCE_MAP.put("0701fdc.com", "楣版江鎴垮湴浜ц仈鍚堢綉"); + SOURCE_MAP.put("yt99.com", "涔呬箙淇℃伅缃�"); + SOURCE_MAP.put("0701ba.com", "涓浗楣版江"); + SOURCE_MAP.put("24yt.com", "鍚堜紬楣版江"); + SOURCE_MAP.put("juranhouse.com", "寮犳帠鎴垮湴浜х綉"); + SOURCE_MAP.put("0936.co", "寮犳帠鍦ㄧ嚎"); + SOURCE_MAP.put("lowlo.cn", "妤煎妤肩綉"); + SOURCE_MAP.put("huainet.com", "娣畨鎴夸骇缃�"); + SOURCE_MAP.put("nthfw.com", "鍗楅�氬ソ鎴跨綉"); + SOURCE_MAP.put("yajuke.com", "闆呭眳瀹�"); + SOURCE_MAP.put("xzloushi.cn", "寰愬窞妤煎競"); + SOURCE_MAP.put("czfdc.com", "甯告埧缃�"); + SOURCE_MAP.put("pcls.com.cn", "褰煄妤煎競缃�"); + SOURCE_MAP.put("czfcw.com", "甯稿窞鎴夸骇缃�"); + SOURCE_MAP.put("yzfc.cn", "鎵埧缃�"); + SOURCE_MAP.put("xz.gov.cn", "寰愬窞鎴跨灞�"); + SOURCE_MAP.put("0515house.cn", "鐩愬煄绗竴鎴夸骇缃�"); + SOURCE_MAP.put("sqanju.com", "瀹夊眳缃�"); + SOURCE_MAP.put("sqfcw.com", "瀹胯縼鎵炬埧缃�"); + SOURCE_MAP.put("sqfcw.com.cn", "瑗挎鎴夸骇缃�"); + SOURCE_MAP.put("tzfdc.com.cn", "娉板窞鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("t56.net", "娉版棤鑱婃埧浜х綉"); + SOURCE_MAP.put("lygfdc.com", "杩炰簯娓埧鍦颁骇缃�"); + SOURCE_MAP.put("yancheng.gov.cn", "鐩愬煄鎴跨灞�"); + SOURCE_MAP.put("gj0511.com", "闀囨睙閫涜缃�"); + SOURCE_MAP.put("0352fang.com", "澶у悓鎴夸骇缃�"); + SOURCE_MAP.put("h0476.com", "璧ゅ嘲鎴垮湴浜х綉"); + SOURCE_MAP.put("nxfang.com/", "瀹佸鎴跨綉n"); + SOURCE_MAP.put("520953.com", "鍚村繝淇℃伅娓�"); + SOURCE_MAP.put("wuzhousky.com", "姊у窞鏃剁┖缃�"); + SOURCE_MAP.put("sdchina.com/", "涓浗灞变笢缃憁"); + SOURCE_MAP.put("dyfc.net", "涓滆惀鎴夸骇缃�"); + SOURCE_MAP.put("zyhouse.com.cn", "閬典箟鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("yyfdcw.com", "宀抽槼鎴垮湴浜х綉"); + SOURCE_MAP.put("goufanggo.net", "宀抽槼璐埧缃�"); + SOURCE_MAP.put("591fcw.cn", "鎴戝氨瑕佹埧浜х綉"); + SOURCE_MAP.put("51258.cn", "浜冲窞鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("365baotou.com", "鍖呭ご鎴垮湴浜х綉"); + SOURCE_MAP.put("aqhouse.com", "瀹夊簡鎴垮湴浜т氦鏄撶綉"); + SOURCE_MAP.put("0853fdc.com", "0853鎴夸骇缃�"); + SOURCE_MAP.put("ndfdc.com", "瀹佸痉鎴垮湴浜х綉"); + SOURCE_MAP.put("lsfdc.com", "涔愭埧缃�"); + SOURCE_MAP.put("dyfcw.com", "寰烽槼鎴夸骇缃�"); + SOURCE_MAP.put("dyfcw.com", "寰烽槼鎴夸骇缃�"); + SOURCE_MAP.put("e0838.com", "浣忓湪寰烽槼缃�"); + SOURCE_MAP.put("shaofang.cc", "閭垫埧缃�"); + SOURCE_MAP.put("jmfc.com.cn", "鑽嗛棬鎴夸骇鐑嚎"); + SOURCE_MAP.put("kaifc.cn", "寮�灏佹埧浜х綉"); + SOURCE_MAP.put("akfang.com", "瀹夊悍鎴垮湴浜ч棬鎴风綉"); + SOURCE_MAP.put("xyfcw.com", "淇¢槼鎴夸骇缃�"); + SOURCE_MAP.put("xyfdcw.com.cn", "淇¢槼鎴垮湴浜х綉"); + SOURCE_MAP.put("0473fdc.com", "涔屾捣鎴夸骇缃�"); + SOURCE_MAP.put("zmdfcw.com", "椹婚┈搴楁埧浜х綉"); + SOURCE_MAP.put("0316.cc", "寤婃埧缃�"); + SOURCE_MAP.put("0827fc.com", "宸翠腑鎴夸骇缃�"); + SOURCE_MAP.put("0917fdc.com", "瀹濋浮鎴夸骇缃�"); + SOURCE_MAP.put("gxbs.net", "鐧捐壊甯傛埧鍦颁骇淇℃伅缃�"); + SOURCE_MAP.put("songyuanfang.com", "鏉惧師璐埧缃�"); + SOURCE_MAP.put("0470fcw.com", "鍛间鸡璐濆皵鎴夸骇缃�"); + SOURCE_MAP.put("0470a.com", "鍛间鸡璐濆皵鐏綉"); + SOURCE_MAP.put("hldhouse.com", "钁姦宀涙埧鍦颁骇缃�"); + SOURCE_MAP.put("hldkfw.com", "钁姦宀涚湅鎴跨綉"); + SOURCE_MAP.put("ehuludao.com", "钁姦宀涘湪绾�"); + SOURCE_MAP.put("xhengshui.com", "琛℃按鏄撴埧缃�"); + SOURCE_MAP.put("yinuo1000.com", "涓�璇烘埧浜х綉"); + SOURCE_MAP.put("0561house.com", "娣寳鎴夸骇缃�"); + SOURCE_MAP.put("zmdfdc.com", "椹婚┈搴楁埧鍦颁骇淇℃伅缃�"); + SOURCE_MAP.put("xc0561.com", "鐩稿煄鎴夸骇缃�"); + SOURCE_MAP.put("zmdfcgl.com", "椹婚┈搴椾綇鎴跨鐞嗕腑蹇�"); + SOURCE_MAP.put("jhhouse.com.cn", "姹熸樊鎴垮湴浜х綉"); + SOURCE_MAP.put("lffdc.gov.cn", "寤婂潑鎴跨灞�"); + SOURCE_MAP.put("juranhouse.com", "寮犳帠鎴垮湴浜х綉"); + SOURCE_MAP.put("0701fc.com", "楣版江鎴夸骇缃�0701fc"); + SOURCE_MAP.put("tangrenju.net", "鍞愪汉灞�"); + SOURCE_MAP.put("hncyfc.com", "娣崡鏈濋槼鎴夸骇"); + SOURCE_MAP.put("hzfc.cc", "鑽锋埧缃�"); + SOURCE_MAP.put("xyanjia.com", "鏂颁綑鎴夸骇缃�"); SOURCE_MAP.put("house0562.com", "house0562"); - SOURCE_MAP.put("gxfdcw.com", "赣西房地产网"); - SOURCE_MAP.put("aofenglu.com", "宣城房产网"); - SOURCE_MAP.put("ok0563.com", "宣城房产交易网"); - SOURCE_MAP.put("fdc.cn", "漳州房地产"); - SOURCE_MAP.put("xuanfang.org", "宣城房产网xuanfang"); - SOURCE_MAP.put("trfcw.com", "铜仁房产网"); - SOURCE_MAP.put("trlpw.com", "铜仁楼盘网"); - SOURCE_MAP.put("0938f.com", "天水房产网"); - SOURCE_MAP.put("yc38.com", "扬成网"); - SOURCE_MAP.put("xibuwu.com", "西部屋"); - SOURCE_MAP.put("home0538.com", "泰安房地产网"); - SOURCE_MAP.put("taian.com", "泰安网房产"); - SOURCE_MAP.put("qth.ccoo.cn", "七台河网"); - SOURCE_MAP.put("0317.so", "沧搜网"); - SOURCE_MAP.put("jinti.com", "今题网"); - SOURCE_MAP.put("tl8.com.cn", "铁岭房产网"); - SOURCE_MAP.put("10fang.com", "十房网"); - SOURCE_MAP.put("zhaopuw.com", "找铺网"); - SOURCE_MAP.put("syfang.net", "十堰房产网"); - SOURCE_MAP.put("qzfcw.com", "钦州房产网"); - SOURCE_MAP.put("fc0832.com", "内江房产"); - SOURCE_MAP.put("njxinf.com", "内江新房产网"); - SOURCE_MAP.put("xnjhome.com", "新内江房产网"); - SOURCE_MAP.put("nyloushi.com", "南阳楼市"); - SOURCE_MAP.put("nyfang.cn", "南阳房地产"); - SOURCE_MAP.put("0826fang.com", "广安房产网"); - SOURCE_MAP.put("0377fw.com", "南阳房产网"); - SOURCE_MAP.put("lhloushi.com", "漯河楼市"); - SOURCE_MAP.put("0395.tv", "漯房网"); - SOURCE_MAP.put("lhfdc.com", "漯河房产网"); - SOURCE_MAP.put("fdc0746.com", "0746楼市网"); - SOURCE_MAP.put("luohejie.com", "漯河街"); - SOURCE_MAP.put("0597ok.com", "龙岩房地产联合网"); - SOURCE_MAP.put("58.com", "58同城"); - SOURCE_MAP.put("fdc99.com", "永州房地产信息网"); - SOURCE_MAP.put("lcfcw.com", "聊城房产网"); - SOURCE_MAP.put("ldfdcw.com", "娄房网"); - SOURCE_MAP.put("0738fdc.com", "娄底房产网"); - SOURCE_MAP.put("0738ld.com", "娄底房网"); - SOURCE_MAP.put("jz6.cc", "荆州第一房产网"); - SOURCE_MAP.put("0716fw.com", "荆房网"); - SOURCE_MAP.put("0715fc.com", "咸宁房产网"); - SOURCE_MAP.put("xnfw.com", "咸宁房网"); - SOURCE_MAP.put("0933f.com", "平凉房产网"); - SOURCE_MAP.put("smxloushi.com", "三门峡楼市"); - SOURCE_MAP.put("smxhaofang.com", "三门峡好房网"); - SOURCE_MAP.put("sqloushi.com", "商丘楼市"); - SOURCE_MAP.put("0355fdc.com", "0355房产网"); - SOURCE_MAP.put("ccoo.cn", "城市中国网"); - SOURCE_MAP.put("726000.net", "商洛房产网"); - SOURCE_MAP.put("0939.net", "陇南生活网"); - SOURCE_MAP.put("lyzhujia.com", "临沂住家网"); - SOURCE_MAP.put("jiazhuly.com", "金房网"); - SOURCE_MAP.put("lywww.com", "临沂在线房产网"); - SOURCE_MAP.put("zhufon.com", "临沂住房网"); - SOURCE_MAP.put("ly169.cn", "临沂信息港"); - SOURCE_MAP.put("linyiren.com", "临沂人房产网"); - SOURCE_MAP.put("lpwww.com", "楼盘在线"); - SOURCE_MAP.put("0539zf.com", "临沂找房网"); - SOURCE_MAP.put("goufon.com", "临沂购房网"); - SOURCE_MAP.put("ilinyi.net", "爱临沂"); - SOURCE_MAP.put("liaofw.com", "聊房网liaofw"); - SOURCE_MAP.put("sina.com.cn", "新浪乐居"); - SOURCE_MAP.put("51zhaolou.com", "找楼网"); - SOURCE_MAP.put("zaoloo.com", "找楼网_zaoloo"); - SOURCE_MAP.put("zufangb.com", "上海租房帮"); - SOURCE_MAP.put("anjuke.com", "安居客"); - SOURCE_MAP.put("szhome.com", "深圳房地产信息网"); - SOURCE_MAP.put("anjuke.com", "安居客"); - SOURCE_MAP.put("sy6w.com", "商业楼王"); - SOURCE_MAP.put("sina.com.cn", "新浪乐居"); - SOURCE_MAP.put("chineseoffice.com.cn", "中国写字楼网"); - SOURCE_MAP.put("hihifang.com", "乐房网"); - SOURCE_MAP.put("0577home.net", "温州房网"); - SOURCE_MAP.put("0311.com.cn", "新城网"); - SOURCE_MAP.put("inhe.net", "银河网"); - SOURCE_MAP.put("zhijia.com", "置家网"); - SOURCE_MAP.put("qf101.com", "青房101"); - SOURCE_MAP.put("bandao.cn", "半岛网"); - SOURCE_MAP.put("qingkai.com", "青岛开发区信息港"); - SOURCE_MAP.put("5y365.com", "无忧365购房网"); - SOURCE_MAP.put("fc12319.com", "12319房产网"); - SOURCE_MAP.put("zhijinfc.com", "沚津房产网"); - SOURCE_MAP.put("xafc.com", "新安房产网"); - SOURCE_MAP.put("newhouse.com.cn", "安徽新地产交易网"); - SOURCE_MAP.put("0731fdc.com", "长沙房产信息网"); - SOURCE_MAP.put("ahhouse.com", "安徽房地产交易网"); - SOURCE_MAP.put("whfdc.gov.cn", "芜湖房产信息网"); - SOURCE_MAP.put("d2d.cn", "重庆房产网"); - SOURCE_MAP.put("gyfc.net.cn", "筑房网"); - SOURCE_MAP.put("gzre.com", "贵阳房地产交易网"); - SOURCE_MAP.put("wlmq.com", "乌鲁木齐网"); - SOURCE_MAP.put("fcdbz.com", "房产大巴扎"); - SOURCE_MAP.put("xjfc.com.cn", "搜家网"); - SOURCE_MAP.put("ufc.gov.cn", "乌鲁木齐房管局"); - SOURCE_MAP.put("gshouse.com.cn", "甘房网"); - SOURCE_MAP.put("wazhe.com", "蛙者网"); - SOURCE_MAP.put("3qhouse.com", "三秦房产网"); - SOURCE_MAP.put("800j.com.cn", "八百家"); - SOURCE_MAP.put("95191.com", "楼市通"); - SOURCE_MAP.put("km915.com", "客迷网"); - SOURCE_MAP.put("kmfcw.com", "昆明房产网"); - SOURCE_MAP.put("fangke.cn", "房客网"); - SOURCE_MAP.put("0471fcw.com", "0471房产网"); - SOURCE_MAP.put("nmgfc.cn", "内蒙古房产网"); - SOURCE_MAP.put("365hf.com", "呼和浩特房地产网"); - SOURCE_MAP.put("hhhtfcj.gov.cn", "呼和浩特房管局"); - SOURCE_MAP.put("kmhouse.org", "昆明房产信息网"); - SOURCE_MAP.put("xmfish.com", "小鱼房产"); - SOURCE_MAP.put("xmjydj.com", "厦门网上房地产"); - SOURCE_MAP.put("nnfcj.gov.cn", "南宁房管局"); - SOURCE_MAP.put("517.cn", "517不动产"); - SOURCE_MAP.put("bxgfw.com", "百姓购房网"); - SOURCE_MAP.put("syinfo.com.cn", "沈阳房产信息网"); - SOURCE_MAP.put("house-cc.com", "长春房产在线"); - SOURCE_MAP.put("fcyhw.com", "房产一号网"); - SOURCE_MAP.put("house-jn.com", "济南房产在线"); - SOURCE_MAP.put("iqilu.com", "齐鲁网"); - SOURCE_MAP.put("ccgoufang.com", "长春购房网"); - SOURCE_MAP.put("gxsky.com", "时空房产网"); - SOURCE_MAP.put("ccfdw.com", "长春房管局"); - SOURCE_MAP.put("sdfdc.com", "山东房地产网"); - SOURCE_MAP.put("zfang114.com", "重庆商业地产网"); - SOURCE_MAP.put("sanyer.net", "西南商业地产网"); - SOURCE_MAP.put("gofng.com", "购房网_gofng"); - SOURCE_MAP.put("longhoo.net", "龙虎网"); - SOURCE_MAP.put("zzfdc.gov.cn", "郑州房地产网"); - SOURCE_MAP.put("xnhaofang.com", "西宁好房网"); - SOURCE_MAP.put("512888.com", "苏州房产信息网"); - SOURCE_MAP.put("xfzc.com", "寻房之窗"); - SOURCE_MAP.put("xnfcxx.com", "西宁房产信息网"); - SOURCE_MAP.put("haofang.net", "好房在线"); - SOURCE_MAP.put("zhaoju.com.cn", "找居网"); - SOURCE_MAP.put("sdjnfc.com.cn", "济南网上房地产"); - SOURCE_MAP.put("0453fdc.com", "0453房产网"); - SOURCE_MAP.put("baihuwang.com", "百湖网"); - SOURCE_MAP.put("hiao.com", "好房网"); - SOURCE_MAP.put("qiqhr.cn", "齐齐哈尔房产qiqhr"); - SOURCE_MAP.put("zhaofang.com", "找房网"); - SOURCE_MAP.put("zhifang.com", "智房"); - SOURCE_MAP.put("ycchinese.com", "伊春炎黄在线"); - SOURCE_MAP.put("qwjian.com", "千万间"); - SOURCE_MAP.put("jmsfdc.net", "佳木斯房地产网"); - SOURCE_MAP.put("qqhrfc.com", "齐齐哈尔市房产信息网"); - SOURCE_MAP.put("jms.gov.cn", "佳木斯市住房保障局"); - SOURCE_MAP.put("dushifang.com", "都市二手房网"); - SOURCE_MAP.put("edeng.cn", "易登网"); - SOURCE_MAP.put("jinti.com", "今题网"); - SOURCE_MAP.put("0467fc.com", "鸡西房产网"); - SOURCE_MAP.put("jxfcrx.com", "鸡西房产热线网"); - SOURCE_MAP.put("hao0469.com", "双鸭山都市网"); - SOURCE_MAP.put("fcwlm.cn", "房产网联盟"); - SOURCE_MAP.put("qthhz.com", "互众房产"); - SOURCE_MAP.put("mdjfdc.gov.cn", "牡丹江房地产网"); - SOURCE_MAP.put("i0456.com", "黑河门户网"); - SOURCE_MAP.put("jxfgj.gov.cn", "鸡西房管局"); - SOURCE_MAP.put("hgxxg.com", "鹤岗信息港"); - SOURCE_MAP.put("qthfc.com", "七台河房产网"); - SOURCE_MAP.put("shjs.gov.cn", "绥化住房建设网"); - SOURCE_MAP.put("8441111.com", "绥化宜家房产网"); - SOURCE_MAP.put("ai0455.com", "绥化房产网"); - SOURCE_MAP.put("baidu.com", "百度乐居"); - SOURCE_MAP.put("goufang.com", "购房网"); - SOURCE_MAP.put("fccs.com", "中国房产超市"); - SOURCE_MAP.put("http://cqsydcw.com", "重庆商业地产网cqsydcw"); - SOURCE_MAP.put("86db.com", "东北商业网"); - SOURCE_MAP.put("china.com.cn", "地产中国"); - SOURCE_MAP.put("0453fdc.com", "0453房产网"); - SOURCE_MAP.put("shenyang1.com", "沈阳房产网"); - SOURCE_MAP.put("jiwu.com", "吉屋网"); - SOURCE_MAP.put("zhifang.com", "智房"); - SOURCE_MAP.put("0467fc.com", "鸡西房产网"); - SOURCE_MAP.put("jxfcrx.com", "鸡西房产热线"); - SOURCE_MAP.put("taofang.com", "淘房"); - SOURCE_MAP.put("btooffice.com", "BTO写字楼网"); - SOURCE_MAP.put("022v.com", "房产V网"); - SOURCE_MAP.put("china.com.cn", "地产中国"); - SOURCE_MAP.put("chengw.com", "橙网房博士"); - SOURCE_MAP.put("baidu.com", "百度乐居"); - SOURCE_MAP.put("fccs.com", "中国房产超市网"); - SOURCE_MAP.put("loupan.com", "楼盘网"); - SOURCE_MAP.put("0453fdc.com", "0453房产网"); - SOURCE_MAP.put("shenyang1.com", "沈阳房产网"); - SOURCE_MAP.put("house365.com", "365地产家居网"); - SOURCE_MAP.put("aksfang.com", "阿克苏fang网"); - SOURCE_MAP.put("coopant.com", "仲象(上海)商业地产"); - SOURCE_MAP.put("cityhouse.cn", "城市房产"); - SOURCE_MAP.put("zhifang.com", "智房网"); - SOURCE_MAP.put("fangxiaoer.com", "房小二"); - SOURCE_MAP.put("aibang.com", "爱帮网"); - SOURCE_MAP.put("mapbar.com", "图吧"); - SOURCE_MAP.put("dqytw.com", "大庆房产网"); - SOURCE_MAP.put("mdjhouse.com", "牡丹江房产网"); - SOURCE_MAP.put("cjfcw.com", "昌吉房产网"); - SOURCE_MAP.put("mdjfcw.cn", "第1房产"); - SOURCE_MAP.put("dqytw.com", "大庆房产网"); - SOURCE_MAP.put("dqt.com.cn", "大庆油田信息港"); - SOURCE_MAP.put("eqqhr.com", "齐齐哈尔网"); - SOURCE_MAP.put("buscx.cn", "鹤岗分类信息网"); - SOURCE_MAP.put("sysfgj.com", "双鸭山市商品房网上签约备案平台"); - SOURCE_MAP.put("0469xxt.com", "双鸭山信息通"); - SOURCE_MAP.put("b2z.cn", "黑河信息港"); - SOURCE_MAP.put("0464.net.cn", "0464信息网"); - SOURCE_MAP.put("qitaihe8.com", "七台河二手房"); - SOURCE_MAP.put("ganji.com", "赶集网"); - SOURCE_MAP.put("ganji.com", "赶集网"); - SOURCE_MAP.put("jfw360.com", "佳房网"); - SOURCE_MAP.put("jmsfcw.cn", "佳木斯房产网"); - SOURCE_MAP.put("0458yc.cn", "伊春都市网"); - SOURCE_MAP.put("hljxxg.com", "鹤岗信息网"); - SOURCE_MAP.put("0469.cn", "双鸭山热线"); - SOURCE_MAP.put("i0469.com", "双鸭山在线"); - SOURCE_MAP.put("78sys.com", "78双鸭山"); - SOURCE_MAP.put("0469vip.com", "双鸭山百姓网"); - SOURCE_MAP.put("qithf.cn", "七台河房产网(QTH)"); - SOURCE_MAP.put("suihuawang.com", "绥化网"); - SOURCE_MAP.put("0455.sh.cn", "绥化信息港(SH)"); - SOURCE_MAP.put("dianping.com", "大众点评"); - SOURCE_MAP.put("cnyw.net", "热房网"); - SOURCE_MAP.put("house0579.com", "亚和房产"); - SOURCE_MAP.put("yiwu-house.com", "坐标不动产"); - SOURCE_MAP.put("dxal.cn", "网上中介"); - SOURCE_MAP.put("0457123.com", "大兴安岭信息网"); - SOURCE_MAP.put("maifangzi.net", "买房子"); - SOURCE_MAP.put("ohqly.com", "千里眼"); - SOURCE_MAP.put("liebiao.com/", "列表网"); - SOURCE_MAP.put("go007.com", "城际分类网"); - SOURCE_MAP.put("xbaixing.com", "小百姓"); - SOURCE_MAP.put("58fenlei.com", "58分类网"); - SOURCE_MAP.put("eebest.com", "一贝网"); - SOURCE_MAP.put("0996fang.com", "梨城房产网"); - SOURCE_MAP.put("834700.com.cn", "塔城在线"); - SOURCE_MAP.put("tc175.com", "塔城一起玩"); - SOURCE_MAP.put("53xj.com", "新疆房产网"); - SOURCE_MAP.put("altmhw.com", "阿勒泰门户网"); - SOURCE_MAP.put("bzfcw.com.cn", "巴州房产网"); - SOURCE_MAP.put("bazhou163.com", "巴州163.com"); - SOURCE_MAP.put("bz.cn", "巴州在线"); - SOURCE_MAP.put("ibazhou.com.cn", "大周信息网"); - SOURCE_MAP.put("balagzi.com", "巴郞网"); - SOURCE_MAP.put("hao0903.com", "和田门户网"); - SOURCE_MAP.put("i0995.com", "吐鲁番信息网"); - SOURCE_MAP.put("hitlf.com", "火洲热线"); - SOURCE_MAP.put("blxxw.com", "博乐信息网"); - SOURCE_MAP.put("blxxw.com", "博乐信息网"); - SOURCE_MAP.put("0996fang.com", "梨城房产网"); - SOURCE_MAP.put("0996fang.com", "梨城房产网"); - SOURCE_MAP.put("bzfcw.com.cn", "巴州房产网"); - SOURCE_MAP.put("bzfcw.com.cn", "巴州房产网"); - SOURCE_MAP.put("bazhou5.com", "巴州网"); - SOURCE_MAP.put("bazhou5.com", "巴州网"); - SOURCE_MAP.put("bazhou163.com", "巴州163.com"); - SOURCE_MAP.put("ylnet.com.cn/", "绿河谷"); - SOURCE_MAP.put("ylxw.com.cn/", "伊犁房产"); - SOURCE_MAP.put("ylxw.com.cn", "伊犁房产"); - SOURCE_MAP.put("ylxw.com.cn", "伊犁房产"); - SOURCE_MAP.put("i0995.com", "吐鲁番房产"); - SOURCE_MAP.put("hitlf.com", "火洲热线"); - SOURCE_MAP.put("aksfang.com", "阿克苏fang网"); - SOURCE_MAP.put("aksfang.com/", "阿克苏fang网"); - SOURCE_MAP.put("0902fc.com", "哈密房产网"); - SOURCE_MAP.put("ihami.cn", "爱哈密网"); - SOURCE_MAP.put("hmfdc.gov.cn", "哈密市房地产管理局"); - SOURCE_MAP.put("hamiw.com", "哈密都市网"); - SOURCE_MAP.put("hamiw.com", "哈密都市网"); - SOURCE_MAP.put("hamiw.com", "哈密都市网"); - SOURCE_MAP.put("97hami.com", "九旗网"); - SOURCE_MAP.put("0998xj.com", "喀什生活网"); - SOURCE_MAP.put("xjks.net", "喀什都市网"); - SOURCE_MAP.put("xjks.net", "喀什都市网"); - SOURCE_MAP.put("xjks.net", "喀什都市网"); - SOURCE_MAP.put("o0998.com", "喀什门户网"); - SOURCE_MAP.put("o0998.com", "喀什门户网"); - SOURCE_MAP.put("o0998.com", "喀什门户网"); - SOURCE_MAP.put("mlxks.com", "魅力喀什"); - SOURCE_MAP.put("mlxks.com", "魅力喀什"); - SOURCE_MAP.put("mlxks.com", "魅力喀什"); - SOURCE_MAP.put("2ks.com.cn", "喀什网"); - SOURCE_MAP.put("cj118114.com", "昌吉生活网"); - SOURCE_MAP.put("cj118114.com", "昌吉生活网"); - SOURCE_MAP.put("cj118114.com", "昌吉生活网"); - SOURCE_MAP.put("cjxxg.com", "昌吉信息港"); - SOURCE_MAP.put("cjxxg.com", "昌吉信息港"); - SOURCE_MAP.put("cjxxg.com", "昌吉信息港"); - SOURCE_MAP.put("smecj.gov.cn", "新疆昌吉州中小企业"); - SOURCE_MAP.put("0990bbs.com", "克拉玛依信息网"); - SOURCE_MAP.put("xjklmy.cn", "克拉玛依油城信息港"); - SOURCE_MAP.put("xjklmy.cn", "克拉玛依油城信息港"); - SOURCE_MAP.put("xjklmy.cc", "油城信息港"); - SOURCE_MAP.put("klmyr.com", "克拉玛依信息网(KLMY)"); - SOURCE_MAP.put("akszc.com", "阿克苏之窗"); - SOURCE_MAP.put("akszc.com", "阿克苏之窗"); - SOURCE_MAP.put("365tsh.com", "365天生活网"); - SOURCE_MAP.put("jiayouhh.com", "加油红河网"); - SOURCE_MAP.put("honghe.me", "红河房产网"); - SOURCE_MAP.put("hhzzx.com", "红河州在线"); - SOURCE_MAP.put("hhzzx.com", "红河州在线"); - SOURCE_MAP.put("hhzzx.com", "红河州在线"); - SOURCE_MAP.put("0955fc.com", "中卫房产网"); - SOURCE_MAP.put("nxfang.com", "宁夏房网"); - SOURCE_MAP.put("0939.net", "陇南生活网"); - SOURCE_MAP.put("ynhouse.com", "云南房网"); - SOURCE_MAP.put("hzfdc88.com", "贺州房地产信息网"); - SOURCE_MAP.put("bshfc.cn", "保山房产网"); - SOURCE_MAP.put("haofung.com", "好房网haofang"); - SOURCE_MAP.put("598fcw.com", "辽源房产网"); - SOURCE_MAP.put("0439.com", "白山房网"); - SOURCE_MAP.put("ddfsw.com", "豆豆房事网"); - SOURCE_MAP.put("tcfcw.net", "铜川房产网"); - SOURCE_MAP.put("nnddw.com", "宁南大地网"); - SOURCE_MAP.put("0954fc.com", "固原房产网0954fc"); - SOURCE_MAP.put("gxfangchan.com", "广西房产网"); - SOURCE_MAP.put("0437.gov.cn", "辽源市房产局"); - SOURCE_MAP.put("fccq.cn", "白山房地产信息网"); - SOURCE_MAP.put("bczj.gov.cn", "白城市住建局"); - SOURCE_MAP.put("lczjj.gov.cn", "临沧市住建局"); - SOURCE_MAP.put("plzjj.gov.cn", "平凉住建局"); - SOURCE_MAP.put("thfdckf.com", "通化房地产开发信息网"); - SOURCE_MAP.put("jcok.com.cn", "贺州佳成房产网"); - SOURCE_MAP.put("puerhouse.org", "普洱市房产信息网"); - SOURCE_MAP.put("xingan123.com", "兴安123网"); - SOURCE_MAP.put("04820482.com", "兴安盟信息港"); - SOURCE_MAP.put("0482home.com", "红城家园网"); - SOURCE_MAP.put("137400.net", "兴安时空"); - SOURCE_MAP.put("huimin168.com", "兴安惠民网"); - SOURCE_MAP.put("04828.com", "兴安盟信息网"); - SOURCE_MAP.put("w.cn", "达步溜"); - SOURCE_MAP.put("eebest.com", "一贝网"); - SOURCE_MAP.put("efw.cn", "e房网"); - SOURCE_MAP.put("t55.com", "淘窝窝"); - SOURCE_MAP.put("citygf.com", "广佛都市网"); - SOURCE_MAP.put("0757fc.com", "佛山房地产资讯网"); - SOURCE_MAP.put("0757home.com", "佛山房屋网"); - SOURCE_MAP.put("qzbbs.com", "小鱼房产_qzbbs"); - SOURCE_MAP.put("lyd.com.cn", "洛阳房产"); - SOURCE_MAP.put("0576h.com", "台州找房网"); - SOURCE_MAP.put("tzfc.cn", "台州房产网_tzfc"); - SOURCE_MAP.put("wf777.com", "潍房网"); - SOURCE_MAP.put("zhuhaifc.com", "珠海房产网"); - SOURCE_MAP.put("qfang.com", "Q房网"); - SOURCE_MAP.put("tzfdc.com", "台州房地产网"); - SOURCE_MAP.put("tzlsw.cn", "台州楼市网"); - SOURCE_MAP.put("0379city.com", "洛阳房产_0379city"); - SOURCE_MAP.put("lznews.cn", "鲁中网"); - SOURCE_MAP.put("fff01.com", "鲁中第一房产网"); - SOURCE_MAP.put("foryoo.cn", "泉州房友网"); - SOURCE_MAP.put("fang33.com", "房米网"); - SOURCE_MAP.put("wofang.com", "我房网"); - SOURCE_MAP.put("wfinfo.cn", "潍坊信息港"); - SOURCE_MAP.put("soufun.com", "搜房"); - SOURCE_MAP.put("soufun.com", "搜房网"); - SOURCE_MAP.put("0379home.com", "洛阳房地产信息网"); - SOURCE_MAP.put("lyfcw.com", "洛阳房产网_lyfcw"); - SOURCE_MAP.put("ly6s.com", "洛阳楼市"); - SOURCE_MAP.put("zbfc.gov.cn", "淄博市房管局"); - SOURCE_MAP.put("china.com.cn", "地产中国"); - SOURCE_MAP.put("iwjw.com", "爱屋吉屋"); - SOURCE_MAP.put("zsnews.cn", "中山楼市网"); - SOURCE_MAP.put("zshouse.com", "中山房地产资讯网"); - SOURCE_MAP.put("66fc.com", "中山房产网"); - SOURCE_MAP.put("gxhouse.com", "柳州房产街"); - SOURCE_MAP.put("bdinfo.net", "互动房缘"); - SOURCE_MAP.put("bd365.net", "金品房源"); - SOURCE_MAP.put("ljia.net", "恋家网"); - SOURCE_MAP.put("qhdr.com", "秦皇岛新闻网房产"); - SOURCE_MAP.put("whfc.com.cn", "威海房产交易网"); - SOURCE_MAP.put("whhouse.com", "威海房地产网_whhouse"); - SOURCE_MAP.put("hufdc.com", "湖州房产网"); - SOURCE_MAP.put("weihaifangchan.com", "威海房产信息网"); - SOURCE_MAP.put("whinfo.net.cn", "威海信息港"); - SOURCE_MAP.put("veryhome.com", "威海房地产网"); - SOURCE_MAP.put("iweihai.cn", "爱威海网"); - SOURCE_MAP.put("guifun.com", "桂房网"); - SOURCE_MAP.put("yfyc.tv", "有房有车"); - SOURCE_MAP.put("3xgd.com", "城市家园"); - SOURCE_MAP.put("0759cctv.com", "家房网"); - SOURCE_MAP.put("0750fw.com", "江门房网"); - SOURCE_MAP.put("fj360.com", "房集网"); - SOURCE_MAP.put("ufang.com", "U房网"); - SOURCE_MAP.put("hyfdcw.com", "衡阳房地产信息网"); - SOURCE_MAP.put("fc752.com", "惠州房产网_fc752"); - SOURCE_MAP.put("zzz4.com", "株洲在线"); - SOURCE_MAP.put("jhhouse.com.cn", "江淮房地产网"); - SOURCE_MAP.put("0797f.com", "赣州楼市网"); - SOURCE_MAP.put("797sun.com", "赣州晒房网"); - SOURCE_MAP.put("ijxjj.com", "九江网"); - SOURCE_MAP.put("990792.com", "九江门户网"); - SOURCE_MAP.put("lfang.com", "爱房网"); - SOURCE_MAP.put("bxfcj.cn", "本溪网上房地产"); - SOURCE_MAP.put("masff.com", "房房网"); - SOURCE_MAP.put("365baotou.com", "包头房地产网365baotou"); - SOURCE_MAP.put("51mam.com", "包头房产网"); - SOURCE_MAP.put("btfdcxx.com", "包头房地产信息网"); - SOURCE_MAP.put("0452e.com", "鹤城楼盘网"); - SOURCE_MAP.put("8888667.com", "亿享生活网"); - SOURCE_MAP.put("btfdc.com", "包头房地产网"); - SOURCE_MAP.put("0663f.com", "揭阳房网"); - SOURCE_MAP.put("gdmm.com", "茂名在线"); - SOURCE_MAP.put("sina.com.cn", "新浪乐居"); - SOURCE_MAP.put("dooioo.com", "德祐地产"); - SOURCE_MAP.put(".baidu.com", "百度房产"); - SOURCE_MAP.put("xkhouse.com", "星空地产网"); - SOURCE_MAP.put("to8to.com", "土巴兔"); - SOURCE_MAP.put("fangdr.com", "房博士"); - SOURCE_MAP.put("home77.com", "房讯网"); - SOURCE_MAP.put("ifoboo.com", "易房宝"); - SOURCE_MAP.put("douanju.com", "都安居"); - SOURCE_MAP.put("yc38.com", "扬成网"); - SOURCE_MAP.put("2zf.cn", "爱租房"); - SOURCE_MAP.put("fangjee.com", "房集"); - SOURCE_MAP.put("wolai.com", "我来房产"); - SOURCE_MAP.put("qq.com", "腾讯"); - SOURCE_MAP.put("leju.com", "乐居购房网"); - SOURCE_MAP.put("fangjiadp.com", "克而瑞房价"); - SOURCE_MAP.put("qilinf.com", "麒麟房产"); - SOURCE_MAP.put("fcjyw.org", "房产交易网"); - SOURCE_MAP.put("yajuke.com", "雅居客"); - SOURCE_MAP.put("mapbar.com", "图吧"); - SOURCE_MAP.put("maifangzi.net", "买房子"); - SOURCE_MAP.put("china.com.cn", "地产中国"); - SOURCE_MAP.put("sjjtx.com", "家天下房产"); - SOURCE_MAP.put("csjju.com", "城市佳居"); - SOURCE_MAP.put("kingia.com", "君越地产"); - SOURCE_MAP.put("0754house.com", "佳成房产"); - SOURCE_MAP.put("yyjbfc.com", "余姚家博房产"); - SOURCE_MAP.put("yysyfdc.com", "余姚生益房产"); - SOURCE_MAP.put("eyuyao.com", "旺佳房产"); - SOURCE_MAP.put("0831xyfc.com", "欣宜房产"); - SOURCE_MAP.put("999fc.net", "宜兴租房网"); - SOURCE_MAP.put("bsfcw.net", "宜兴百盛房产"); - SOURCE_MAP.put("yxhxfc.com", "宜兴和信房产"); - SOURCE_MAP.put("yxfqfc.com", "宜兴富强房产"); - SOURCE_MAP.put("ywfc.cc", "汇鑫房产"); - SOURCE_MAP.put("15jp.com", "锦鹏不动产"); - SOURCE_MAP.put("ywfhfc.com", "义乌富华房产"); - SOURCE_MAP.put("nt138.com", "茂名南天地产网"); - SOURCE_MAP.put("jxdxfc.com", "鼎信房地产"); - SOURCE_MAP.put("yongbangfc.com", "永邦房产"); - SOURCE_MAP.put("zjwqfc.com", "万千房产"); - SOURCE_MAP.put("yifan2006.com", "一帆房产"); - SOURCE_MAP.put("t1ti.com", "天天房产"); - SOURCE_MAP.put("hsjdc.com", "好世界地产"); - SOURCE_MAP.put("hsjsfc.com", "黄山精盛房产"); - SOURCE_MAP.put("lixiangw.com", "理想房产"); - SOURCE_MAP.put("yaanjq.com", "金桥房介网"); - SOURCE_MAP.put("my012.com", "1+2联合不动产"); - SOURCE_MAP.put("dz1fdc.com", "公元地产"); - SOURCE_MAP.put("jyjfdc.com", "居一家房地产"); - SOURCE_MAP.put("hshdfc.com", "恒达房产"); - SOURCE_MAP.put("hhccdc.com", "诚成地产"); - SOURCE_MAP.put("0597jia.com", "佳诚房产"); - SOURCE_MAP.put("boxinfangchan.com", "博馨房产"); - SOURCE_MAP.put("tjzf.com", "天津租房网"); - SOURCE_MAP.put("cd.cc", "成都房产网_cd"); - SOURCE_MAP.put("tffcw.com", "天府房产网"); - SOURCE_MAP.put("chengdufc.com", "成都房产网"); - SOURCE_MAP.put("ijj.cn", "爱家家房产网"); - SOURCE_MAP.put("house100.cn", "成都好房网"); - SOURCE_MAP.put("fangchanwang.com", "房产网"); - SOURCE_MAP.put("jlsp.com", "四平信息港"); - SOURCE_MAP.put("0953fc.com", "吴忠房产网"); - SOURCE_MAP.put("yuxifc.com", "玉溪房产信息网"); - SOURCE_MAP.put("ksls.com.cn", "昆山楼上网"); - SOURCE_MAP.put("di1fang.com", "昆山第一房产"); - SOURCE_MAP.put("http://www.house-yt.com/", "烟台房产在线"); - SOURCE_MAP.put("zhnews.net", "珠海惠买房"); - SOURCE_MAP.put("ddfw.cn", "丹东房屋网"); - SOURCE_MAP.put("pj0427.net", "盘锦在线"); - SOURCE_MAP.put("0762home.com", "河源房产信息网"); - SOURCE_MAP.put("076299.com", "九九房产网"); - SOURCE_MAP.put("qlqw.cn", "圈里圈外"); - SOURCE_MAP.put("373f.com", "新乡信息港"); - SOURCE_MAP.put("eyuyao.com", "余姚生活网"); - SOURCE_MAP.put("csgfw.cn", "常熟购房网"); - SOURCE_MAP.put("beihaidc.com", "北海房地产交易网"); - SOURCE_MAP.put("bhfangchan.com", "北海房地产网"); - SOURCE_MAP.put("sxxynews.com", "宜居咸阳"); - SOURCE_MAP.put("yuefc.com", "阅房网"); - SOURCE_MAP.put("0898hfw.com", "海南好房网"); - SOURCE_MAP.put("syfff.com", "三亚房地产信息网"); - SOURCE_MAP.put("sanyawu.com", "三亚房产网"); - SOURCE_MAP.put("sanyafz.com", "三亚房价网"); - SOURCE_MAP.put("syhome.cc", "三亚房网"); - SOURCE_MAP.put("ybxww.com", "宜宾新闻网"); - SOURCE_MAP.put("ybzfw.com", "宜宾住房网"); - SOURCE_MAP.put("ptajw.com", "莆田安居网"); - SOURCE_MAP.put("sun0758.com", "肈庆阳光网"); - SOURCE_MAP.put("0775fcw.com", "玉林房产网"); - SOURCE_MAP.put("xfsfc.com.cn", "襄阳住宅与房产信息网"); - SOURCE_MAP.put("0710fdc.com", "襄房网"); - SOURCE_MAP.put("0710hf.com", "襄阳好房网"); - SOURCE_MAP.put("zhuluxx.com", "逐鹿襄阳网"); - SOURCE_MAP.put("dlfdc.cn", "大理房地产信息网"); - SOURCE_MAP.put("mmtcw.com", "茂名同城网"); - SOURCE_MAP.put("0555yi.com", "易房网"); - SOURCE_MAP.put("mdjhouse.com", "牡丹江房产网"); - SOURCE_MAP.put("maihaofang.com", "阳江好房网"); - SOURCE_MAP.put("0662fang.com", "阳江房产交易网"); - SOURCE_MAP.put("0763fcw.com", "0763房产网"); - SOURCE_MAP.put("qybc.cn", "百川房产网"); - SOURCE_MAP.put("fcwqy.com", "清房网"); - SOURCE_MAP.put("0732fc.com", "0731房产网_0732fc"); - SOURCE_MAP.put("xf88.com", "湘房网"); - SOURCE_MAP.put("zgfc168.com", "自贡房产168"); - SOURCE_MAP.put("ylw0813.com", "盐龙网"); - SOURCE_MAP.put("my0813.com", "自贡都市网"); - SOURCE_MAP.put("qzfdc.com", "衢州房地产网"); - SOURCE_MAP.put("0579.cn", "浙中在线"); - SOURCE_MAP.put("hfang.cn", "惠房网"); - SOURCE_MAP.put("zznews.gov.cn", "株洲新闻网"); - SOURCE_MAP.put("0734.com", "衡阳网"); - SOURCE_MAP.put("360fc.cn", "360房产网"); - SOURCE_MAP.put("cnbb.com.cn", "互联天地房产网"); - SOURCE_MAP.put("sxhouse.com.cn", "绍兴房产官方门户"); - SOURCE_MAP.put("hz66.com", "湖州在线"); - SOURCE_MAP.put("0573ren.com", "嘉兴人"); - SOURCE_MAP.put("0579fang.com", "金华房产网"); - SOURCE_MAP.put("qz123.com", "衢州信息港"); + SOURCE_MAP.put("gxfdcw.com", "璧hタ鎴垮湴浜х綉"); + SOURCE_MAP.put("aofenglu.com", "瀹e煄鎴夸骇缃�"); + SOURCE_MAP.put("ok0563.com", "瀹e煄鎴夸骇浜ゆ槗缃�"); + SOURCE_MAP.put("fdc.cn", "婕冲窞鎴垮湴浜�"); + SOURCE_MAP.put("xuanfang.org", "瀹e煄鎴夸骇缃憍uanfang"); + SOURCE_MAP.put("trfcw.com", "閾滀粊鎴夸骇缃�"); + SOURCE_MAP.put("trlpw.com", "閾滀粊妤肩洏缃�"); + SOURCE_MAP.put("0938f.com", "澶╂按鎴夸骇缃�"); + SOURCE_MAP.put("yc38.com", "鎵垚缃�"); + SOURCE_MAP.put("xibuwu.com", "瑗块儴灞�"); + SOURCE_MAP.put("home0538.com", "娉板畨鎴垮湴浜х綉"); + SOURCE_MAP.put("taian.com", "娉板畨缃戞埧浜�"); + SOURCE_MAP.put("qth.ccoo.cn", "涓冨彴娌崇綉"); + SOURCE_MAP.put("0317.so", "娌ф悳缃�"); + SOURCE_MAP.put("jinti.com", "浠婇缃�"); + SOURCE_MAP.put("tl8.com.cn", "閾佸箔鎴夸骇缃�"); + SOURCE_MAP.put("10fang.com", "鍗佹埧缃�"); + SOURCE_MAP.put("zhaopuw.com", "鎵鹃摵缃�"); + SOURCE_MAP.put("syfang.net", "鍗佸牥鎴夸骇缃�"); + SOURCE_MAP.put("qzfcw.com", "閽﹀窞鎴夸骇缃�"); + SOURCE_MAP.put("fc0832.com", "鍐呮睙鎴夸骇"); + SOURCE_MAP.put("njxinf.com", "鍐呮睙鏂版埧浜х綉"); + SOURCE_MAP.put("xnjhome.com", "鏂板唴姹熸埧浜х綉"); + SOURCE_MAP.put("nyloushi.com", "鍗楅槼妤煎競"); + SOURCE_MAP.put("nyfang.cn", "鍗楅槼鎴垮湴浜�"); + SOURCE_MAP.put("0826fang.com", "骞垮畨鎴夸骇缃�"); + SOURCE_MAP.put("0377fw.com", "鍗楅槼鎴夸骇缃�"); + SOURCE_MAP.put("lhloushi.com", "婕渤妤煎競"); + SOURCE_MAP.put("0395.tv", "婕埧缃�"); + SOURCE_MAP.put("lhfdc.com", "婕渤鎴夸骇缃�"); + SOURCE_MAP.put("fdc0746.com", "0746妤煎競缃�"); + SOURCE_MAP.put("luohejie.com", "婕渤琛�"); + SOURCE_MAP.put("0597ok.com", "榫欏博鎴垮湴浜ц仈鍚堢綉"); + SOURCE_MAP.put("58.com", "58鍚屽煄"); + SOURCE_MAP.put("fdc99.com", "姘稿窞鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("lcfcw.com", "鑱婂煄鎴夸骇缃�"); + SOURCE_MAP.put("ldfdcw.com", "濞勬埧缃�"); + SOURCE_MAP.put("0738fdc.com", "濞勫簳鎴夸骇缃�"); + SOURCE_MAP.put("0738ld.com", "濞勫簳鎴跨綉"); + SOURCE_MAP.put("jz6.cc", "鑽嗗窞绗竴鎴夸骇缃�"); + SOURCE_MAP.put("0716fw.com", "鑽嗘埧缃�"); + SOURCE_MAP.put("0715fc.com", "鍜稿畞鎴夸骇缃�"); + SOURCE_MAP.put("xnfw.com", "鍜稿畞鎴跨綉"); + SOURCE_MAP.put("0933f.com", "骞冲噳鎴夸骇缃�"); + SOURCE_MAP.put("smxloushi.com", "涓夐棬宄℃ゼ甯�"); + SOURCE_MAP.put("smxhaofang.com", "涓夐棬宄″ソ鎴跨綉"); + SOURCE_MAP.put("sqloushi.com", "鍟嗕笜妤煎競"); + SOURCE_MAP.put("0355fdc.com", "0355鎴夸骇缃�"); + SOURCE_MAP.put("ccoo.cn", "鍩庡競涓浗缃�"); + SOURCE_MAP.put("726000.net", "鍟嗘礇鎴夸骇缃�"); + SOURCE_MAP.put("0939.net", "闄囧崡鐢熸椿缃�"); + SOURCE_MAP.put("lyzhujia.com", "涓存矀浣忓缃�"); + SOURCE_MAP.put("jiazhuly.com", "閲戞埧缃�"); + SOURCE_MAP.put("lywww.com", "涓存矀鍦ㄧ嚎鎴夸骇缃�"); + SOURCE_MAP.put("zhufon.com", "涓存矀浣忔埧缃�"); + SOURCE_MAP.put("ly169.cn", "涓存矀淇℃伅娓�"); + SOURCE_MAP.put("linyiren.com", "涓存矀浜烘埧浜х綉"); + SOURCE_MAP.put("lpwww.com", "妤肩洏鍦ㄧ嚎"); + SOURCE_MAP.put("0539zf.com", "涓存矀鎵炬埧缃�"); + SOURCE_MAP.put("goufon.com", "涓存矀璐埧缃�"); + SOURCE_MAP.put("ilinyi.net", "鐖变复娌�"); + SOURCE_MAP.put("liaofw.com", "鑱婃埧缃憀iaofw"); + SOURCE_MAP.put("sina.com.cn", "鏂版氮涔愬眳"); + SOURCE_MAP.put("51zhaolou.com", "鎵炬ゼ缃�"); + SOURCE_MAP.put("zaoloo.com", "鎵炬ゼ缃慱zaoloo"); + SOURCE_MAP.put("zufangb.com", "涓婃捣绉熸埧甯�"); + SOURCE_MAP.put("anjuke.com", "瀹夊眳瀹�"); + SOURCE_MAP.put("szhome.com", "娣卞湷鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("anjuke.com", "瀹夊眳瀹�"); + SOURCE_MAP.put("sy6w.com", "鍟嗕笟妤肩帇"); + SOURCE_MAP.put("sina.com.cn", "鏂版氮涔愬眳"); + SOURCE_MAP.put("chineseoffice.com.cn", "涓浗鍐欏瓧妤肩綉"); + SOURCE_MAP.put("hihifang.com", "涔愭埧缃�"); + SOURCE_MAP.put("0577home.net", "娓╁窞鎴跨綉"); + SOURCE_MAP.put("0311.com.cn", "鏂板煄缃�"); + SOURCE_MAP.put("inhe.net", "閾舵渤缃�"); + SOURCE_MAP.put("zhijia.com", "缃缃�"); + SOURCE_MAP.put("qf101.com", "闈掓埧101"); + SOURCE_MAP.put("bandao.cn", "鍗婂矝缃�"); + SOURCE_MAP.put("qingkai.com", "闈掑矝寮�鍙戝尯淇℃伅娓�"); + SOURCE_MAP.put("5y365.com", "鏃犲咖365璐埧缃�"); + SOURCE_MAP.put("fc12319.com", "12319鎴夸骇缃�"); + SOURCE_MAP.put("zhijinfc.com", "娌氭触鎴夸骇缃�"); + SOURCE_MAP.put("xafc.com", "鏂板畨鎴夸骇缃�"); + SOURCE_MAP.put("newhouse.com.cn", "瀹夊窘鏂板湴浜т氦鏄撶綉"); + SOURCE_MAP.put("0731fdc.com", "闀挎矙鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("ahhouse.com", "瀹夊窘鎴垮湴浜т氦鏄撶綉"); + SOURCE_MAP.put("whfdc.gov.cn", "鑺滄箹鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("d2d.cn", "閲嶅簡鎴夸骇缃�"); + SOURCE_MAP.put("gyfc.net.cn", "绛戞埧缃�"); + SOURCE_MAP.put("gzre.com", "璐甸槼鎴垮湴浜т氦鏄撶綉"); + SOURCE_MAP.put("wlmq.com", "涔岄瞾鏈ㄩ綈缃�"); + SOURCE_MAP.put("fcdbz.com", "鎴夸骇澶у反鎵�"); + SOURCE_MAP.put("xjfc.com.cn", "鎼滃缃�"); + SOURCE_MAP.put("ufc.gov.cn", "涔岄瞾鏈ㄩ綈鎴跨灞�"); + SOURCE_MAP.put("gshouse.com.cn", "鐢樻埧缃�"); + SOURCE_MAP.put("wazhe.com", "铔欒�呯綉"); + SOURCE_MAP.put("3qhouse.com", "涓夌Е鎴夸骇缃�"); + SOURCE_MAP.put("800j.com.cn", "鍏櫨瀹�"); + SOURCE_MAP.put("95191.com", "妤煎競閫�"); + SOURCE_MAP.put("km915.com", "瀹㈣糠缃�"); + SOURCE_MAP.put("kmfcw.com", "鏄嗘槑鎴夸骇缃�"); + SOURCE_MAP.put("fangke.cn", "鎴垮缃�"); + SOURCE_MAP.put("0471fcw.com", "0471鎴夸骇缃�"); + SOURCE_MAP.put("nmgfc.cn", "鍐呰挋鍙ゆ埧浜х綉"); + SOURCE_MAP.put("365hf.com", "鍛煎拰娴╃壒鎴垮湴浜х綉"); + SOURCE_MAP.put("hhhtfcj.gov.cn", "鍛煎拰娴╃壒鎴跨灞�"); + SOURCE_MAP.put("kmhouse.org", "鏄嗘槑鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("xmfish.com", "灏忛奔鎴夸骇"); + SOURCE_MAP.put("xmjydj.com", "鍘﹂棬缃戜笂鎴垮湴浜�"); + SOURCE_MAP.put("nnfcj.gov.cn", "鍗楀畞鎴跨灞�"); + SOURCE_MAP.put("517.cn", "517涓嶅姩浜�"); + SOURCE_MAP.put("bxgfw.com", "鐧惧璐埧缃�"); + SOURCE_MAP.put("syinfo.com.cn", "娌堥槼鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("house-cc.com", "闀挎槬鎴夸骇鍦ㄧ嚎"); + SOURCE_MAP.put("fcyhw.com", "鎴夸骇涓�鍙风綉"); + SOURCE_MAP.put("house-jn.com", "娴庡崡鎴夸骇鍦ㄧ嚎"); + SOURCE_MAP.put("iqilu.com", "榻愰瞾缃�"); + SOURCE_MAP.put("ccgoufang.com", "闀挎槬璐埧缃�"); + SOURCE_MAP.put("gxsky.com", "鏃剁┖鎴夸骇缃�"); + SOURCE_MAP.put("ccfdw.com", "闀挎槬鎴跨灞�"); + SOURCE_MAP.put("sdfdc.com", "灞变笢鎴垮湴浜х綉"); + SOURCE_MAP.put("zfang114.com", "閲嶅簡鍟嗕笟鍦颁骇缃�"); + SOURCE_MAP.put("sanyer.net", "瑗垮崡鍟嗕笟鍦颁骇缃�"); + SOURCE_MAP.put("gofng.com", "璐埧缃慱gofng"); + SOURCE_MAP.put("longhoo.net", "榫欒檸缃�"); + SOURCE_MAP.put("zzfdc.gov.cn", "閮戝窞鎴垮湴浜х綉"); + SOURCE_MAP.put("xnhaofang.com", "瑗垮畞濂芥埧缃�"); + SOURCE_MAP.put("512888.com", "鑻忓窞鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("xfzc.com", "瀵绘埧涔嬬獥"); + SOURCE_MAP.put("xnfcxx.com", "瑗垮畞鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("haofang.net", "濂芥埧鍦ㄧ嚎"); + SOURCE_MAP.put("zhaoju.com.cn", "鎵惧眳缃�"); + SOURCE_MAP.put("sdjnfc.com.cn", "娴庡崡缃戜笂鎴垮湴浜�"); + SOURCE_MAP.put("0453fdc.com", "0453鎴夸骇缃�"); + SOURCE_MAP.put("baihuwang.com", "鐧炬箹缃�"); + SOURCE_MAP.put("hiao.com", "濂芥埧缃�"); + SOURCE_MAP.put("qiqhr.cn", "榻愰綈鍝堝皵鎴夸骇qiqhr"); + SOURCE_MAP.put("zhaofang.com", "鎵炬埧缃�"); + SOURCE_MAP.put("zhifang.com", "鏅烘埧"); + SOURCE_MAP.put("ycchinese.com", "浼婃槬鐐庨粍鍦ㄧ嚎"); + SOURCE_MAP.put("qwjian.com", "鍗冧竾闂�"); + SOURCE_MAP.put("jmsfdc.net", "浣虫湪鏂埧鍦颁骇缃�"); + SOURCE_MAP.put("qqhrfc.com", "榻愰綈鍝堝皵甯傛埧浜т俊鎭綉"); + SOURCE_MAP.put("jms.gov.cn", "浣虫湪鏂競浣忔埧淇濋殰灞�"); + SOURCE_MAP.put("dushifang.com", "閮藉競浜屾墜鎴跨綉"); + SOURCE_MAP.put("edeng.cn", "鏄撶櫥缃�"); + SOURCE_MAP.put("jinti.com", "浠婇缃�"); + SOURCE_MAP.put("0467fc.com", "楦¤タ鎴夸骇缃�"); + SOURCE_MAP.put("jxfcrx.com", "楦¤タ鎴夸骇鐑嚎缃�"); + SOURCE_MAP.put("hao0469.com", "鍙岄腑灞遍兘甯傜綉"); + SOURCE_MAP.put("fcwlm.cn", "鎴夸骇缃戣仈鐩�"); + SOURCE_MAP.put("qthhz.com", "浜掍紬鎴夸骇"); + SOURCE_MAP.put("mdjfdc.gov.cn", "鐗′腹姹熸埧鍦颁骇缃�"); + SOURCE_MAP.put("i0456.com", "榛戞渤闂ㄦ埛缃�"); + SOURCE_MAP.put("jxfgj.gov.cn", "楦¤タ鎴跨灞�"); + SOURCE_MAP.put("hgxxg.com", "楣ゅ矖淇℃伅娓�"); + SOURCE_MAP.put("qthfc.com", "涓冨彴娌虫埧浜х綉"); + SOURCE_MAP.put("shjs.gov.cn", "缁ュ寲浣忔埧寤鸿缃�"); + SOURCE_MAP.put("8441111.com", "缁ュ寲瀹滃鎴夸骇缃�"); + SOURCE_MAP.put("ai0455.com", "缁ュ寲鎴夸骇缃�"); + SOURCE_MAP.put("baidu.com", "鐧惧害涔愬眳"); + SOURCE_MAP.put("goufang.com", "璐埧缃�"); + SOURCE_MAP.put("fccs.com", "涓浗鎴夸骇瓒呭競"); + SOURCE_MAP.put("http://cqsydcw.com", "閲嶅簡鍟嗕笟鍦颁骇缃慶qsydcw"); + SOURCE_MAP.put("86db.com", "涓滃寳鍟嗕笟缃�"); + SOURCE_MAP.put("china.com.cn", "鍦颁骇涓浗"); + SOURCE_MAP.put("0453fdc.com", "0453鎴夸骇缃�"); + SOURCE_MAP.put("shenyang1.com", "娌堥槼鎴夸骇缃�"); + SOURCE_MAP.put("jiwu.com", "鍚夊眿缃�"); + SOURCE_MAP.put("zhifang.com", "鏅烘埧"); + SOURCE_MAP.put("0467fc.com", "楦¤タ鎴夸骇缃�"); + SOURCE_MAP.put("jxfcrx.com", "楦¤タ鎴夸骇鐑嚎"); + SOURCE_MAP.put("taofang.com", "娣樻埧"); + SOURCE_MAP.put("btooffice.com", "BTO鍐欏瓧妤肩綉"); + SOURCE_MAP.put("022v.com", "鎴夸骇V缃�"); + SOURCE_MAP.put("china.com.cn", "鍦颁骇涓浗"); + SOURCE_MAP.put("chengw.com", "姗欑綉鎴垮崥澹�"); + SOURCE_MAP.put("baidu.com", "鐧惧害涔愬眳"); + SOURCE_MAP.put("fccs.com", "涓浗鎴夸骇瓒呭競缃�"); + SOURCE_MAP.put("loupan.com", "妤肩洏缃�"); + SOURCE_MAP.put("0453fdc.com", "0453鎴夸骇缃�"); + SOURCE_MAP.put("shenyang1.com", "娌堥槼鎴夸骇缃�"); + SOURCE_MAP.put("house365.com", "365鍦颁骇瀹跺眳缃�"); + SOURCE_MAP.put("aksfang.com", "闃垮厠鑻廸ang缃�"); + SOURCE_MAP.put("coopant.com", "浠茶薄锛堜笂娴凤級鍟嗕笟鍦颁骇"); + SOURCE_MAP.put("cityhouse.cn", "鍩庡競鎴夸骇"); + SOURCE_MAP.put("zhifang.com", "鏅烘埧缃�"); + SOURCE_MAP.put("fangxiaoer.com", "鎴垮皬浜�"); + SOURCE_MAP.put("aibang.com", "鐖卞府缃�"); + SOURCE_MAP.put("mapbar.com", "鍥惧惂"); + SOURCE_MAP.put("dqytw.com", "澶у簡鎴夸骇缃�"); + SOURCE_MAP.put("mdjhouse.com", "鐗′腹姹熸埧浜х綉"); + SOURCE_MAP.put("cjfcw.com", "鏄屽悏鎴夸骇缃�"); + SOURCE_MAP.put("mdjfcw.cn", "绗�1鎴夸骇"); + SOURCE_MAP.put("dqytw.com", "澶у簡鎴夸骇缃�"); + SOURCE_MAP.put("dqt.com.cn", "澶у簡娌圭敯淇℃伅娓�"); + SOURCE_MAP.put("eqqhr.com", "榻愰綈鍝堝皵缃�"); + SOURCE_MAP.put("buscx.cn", "楣ゅ矖鍒嗙被淇℃伅缃�"); + SOURCE_MAP.put("sysfgj.com", "鍙岄腑灞卞競鍟嗗搧鎴跨綉涓婄绾﹀妗堝钩鍙�"); + SOURCE_MAP.put("0469xxt.com", "鍙岄腑灞变俊鎭��"); + SOURCE_MAP.put("b2z.cn", "榛戞渤淇℃伅娓�"); + SOURCE_MAP.put("0464.net.cn", "0464淇℃伅缃�"); + SOURCE_MAP.put("qitaihe8.com", "涓冨彴娌充簩鎵嬫埧"); + SOURCE_MAP.put("ganji.com", "璧堕泦缃�"); + SOURCE_MAP.put("ganji.com", "璧堕泦缃�"); + SOURCE_MAP.put("jfw360.com", "浣虫埧缃�"); + SOURCE_MAP.put("jmsfcw.cn", "浣虫湪鏂埧浜х綉"); + SOURCE_MAP.put("0458yc.cn", "浼婃槬閮藉競缃�"); + SOURCE_MAP.put("hljxxg.com", "楣ゅ矖淇℃伅缃�"); + SOURCE_MAP.put("0469.cn", "鍙岄腑灞辩儹绾�"); + SOURCE_MAP.put("i0469.com", "鍙岄腑灞卞湪绾�"); + SOURCE_MAP.put("78sys.com", "78鍙岄腑灞�"); + SOURCE_MAP.put("0469vip.com", "鍙岄腑灞辩櫨濮撶綉"); + SOURCE_MAP.put("qithf.cn", "涓冨彴娌虫埧浜х綉锛圦TH锛�"); + SOURCE_MAP.put("suihuawang.com", "缁ュ寲缃�"); + SOURCE_MAP.put("0455.sh.cn", "缁ュ寲淇℃伅娓紙SH)"); + SOURCE_MAP.put("dianping.com", "澶т紬鐐硅瘎"); + SOURCE_MAP.put("cnyw.net", "鐑埧缃�"); + SOURCE_MAP.put("house0579.com", "浜氬拰鎴夸骇"); + SOURCE_MAP.put("yiwu-house.com", "鍧愭爣涓嶅姩浜�"); + SOURCE_MAP.put("dxal.cn", "缃戜笂涓粙"); + SOURCE_MAP.put("0457123.com", "澶у叴瀹夊箔淇℃伅缃�"); + SOURCE_MAP.put("maifangzi.net", "涔版埧瀛�"); + SOURCE_MAP.put("ohqly.com", "鍗冮噷鐪�"); + SOURCE_MAP.put("liebiao.com/", "鍒楄〃缃�"); + SOURCE_MAP.put("go007.com", "鍩庨檯鍒嗙被缃�"); + SOURCE_MAP.put("xbaixing.com", "灏忕櫨濮�"); + SOURCE_MAP.put("58fenlei.com", "58鍒嗙被缃�"); + SOURCE_MAP.put("eebest.com", "涓�璐濈綉"); + SOURCE_MAP.put("0996fang.com", "姊ㄥ煄鎴夸骇缃�"); + SOURCE_MAP.put("834700.com.cn", "濉斿煄鍦ㄧ嚎"); + SOURCE_MAP.put("tc175.com", "濉斿煄涓�璧风帺"); + SOURCE_MAP.put("53xj.com", "鏂扮枂鎴夸骇缃�"); + SOURCE_MAP.put("altmhw.com", "闃垮嫆娉伴棬鎴风綉"); + SOURCE_MAP.put("bzfcw.com.cn", "宸村窞鎴夸骇缃�"); + SOURCE_MAP.put("bazhou163.com", "宸村窞163.com"); + SOURCE_MAP.put("bz.cn", "宸村窞鍦ㄧ嚎"); + SOURCE_MAP.put("ibazhou.com.cn", "澶у懆淇℃伅缃�"); + SOURCE_MAP.put("balagzi.com", "宸撮優缃�"); + SOURCE_MAP.put("hao0903.com", "鍜岀敯闂ㄦ埛缃�"); + SOURCE_MAP.put("i0995.com", "鍚愰瞾鐣俊鎭綉"); + SOURCE_MAP.put("hitlf.com", "鐏床鐑嚎"); + SOURCE_MAP.put("blxxw.com", "鍗氫箰淇℃伅缃�"); + SOURCE_MAP.put("blxxw.com", "鍗氫箰淇℃伅缃�"); + SOURCE_MAP.put("0996fang.com", "姊ㄥ煄鎴夸骇缃�"); + SOURCE_MAP.put("0996fang.com", "姊ㄥ煄鎴夸骇缃�"); + SOURCE_MAP.put("bzfcw.com.cn", "宸村窞鎴夸骇缃�"); + SOURCE_MAP.put("bzfcw.com.cn", "宸村窞鎴夸骇缃�"); + SOURCE_MAP.put("bazhou5.com", "宸村窞缃�"); + SOURCE_MAP.put("bazhou5.com", "宸村窞缃�"); + SOURCE_MAP.put("bazhou163.com", "宸村窞163.com"); + SOURCE_MAP.put("ylnet.com.cn/", "缁挎渤璋�"); + SOURCE_MAP.put("ylxw.com.cn/", "浼婄妬鎴夸骇"); + SOURCE_MAP.put("ylxw.com.cn", "浼婄妬鎴夸骇"); + SOURCE_MAP.put("ylxw.com.cn", "浼婄妬鎴夸骇"); + SOURCE_MAP.put("i0995.com", "鍚愰瞾鐣埧浜�"); + SOURCE_MAP.put("hitlf.com", "鐏床鐑嚎"); + SOURCE_MAP.put("aksfang.com", "闃垮厠鑻廸ang缃�"); + SOURCE_MAP.put("aksfang.com/", "闃垮厠鑻廸ang缃�"); + SOURCE_MAP.put("0902fc.com", "鍝堝瘑鎴夸骇缃�"); + SOURCE_MAP.put("ihami.cn", "鐖卞搱瀵嗙綉"); + SOURCE_MAP.put("hmfdc.gov.cn", "鍝堝瘑甯傛埧鍦颁骇绠$悊灞�"); + SOURCE_MAP.put("hamiw.com", "鍝堝瘑閮藉競缃�"); + SOURCE_MAP.put("hamiw.com", "鍝堝瘑閮藉競缃�"); + SOURCE_MAP.put("hamiw.com", "鍝堝瘑閮藉競缃�"); + SOURCE_MAP.put("97hami.com", "涔濇棗缃�"); + SOURCE_MAP.put("0998xj.com", "鍠�浠�鐢熸椿缃�"); + SOURCE_MAP.put("xjks.net", "鍠�浠�閮藉競缃�"); + SOURCE_MAP.put("xjks.net", "鍠�浠�閮藉競缃�"); + SOURCE_MAP.put("xjks.net", "鍠�浠�閮藉競缃�"); + SOURCE_MAP.put("o0998.com", "鍠�浠�闂ㄦ埛缃�"); + SOURCE_MAP.put("o0998.com", "鍠�浠�闂ㄦ埛缃�"); + SOURCE_MAP.put("o0998.com", "鍠�浠�闂ㄦ埛缃�"); + SOURCE_MAP.put("mlxks.com", "榄呭姏鍠�浠�"); + SOURCE_MAP.put("mlxks.com", "榄呭姏鍠�浠�"); + SOURCE_MAP.put("mlxks.com", "榄呭姏鍠�浠�"); + SOURCE_MAP.put("2ks.com.cn", "鍠�浠�缃�"); + SOURCE_MAP.put("cj118114.com", "鏄屽悏鐢熸椿缃�"); + SOURCE_MAP.put("cj118114.com", "鏄屽悏鐢熸椿缃�"); + SOURCE_MAP.put("cj118114.com", "鏄屽悏鐢熸椿缃�"); + SOURCE_MAP.put("cjxxg.com", "鏄屽悏淇℃伅娓�"); + SOURCE_MAP.put("cjxxg.com", "鏄屽悏淇℃伅娓�"); + SOURCE_MAP.put("cjxxg.com", "鏄屽悏淇℃伅娓�"); + SOURCE_MAP.put("smecj.gov.cn", "鏂扮枂鏄屽悏宸炰腑灏忎紒涓�"); + SOURCE_MAP.put("0990bbs.com", "鍏嬫媺鐜涗緷淇℃伅缃�"); + SOURCE_MAP.put("xjklmy.cn", "鍏嬫媺鐜涗緷娌瑰煄淇℃伅娓�"); + SOURCE_MAP.put("xjklmy.cn", "鍏嬫媺鐜涗緷娌瑰煄淇℃伅娓�"); + SOURCE_MAP.put("xjklmy.cc", "娌瑰煄淇℃伅娓�"); + SOURCE_MAP.put("klmyr.com", "鍏嬫媺鐜涗緷淇℃伅缃戯紙KLMY锛�"); + SOURCE_MAP.put("akszc.com", "闃垮厠鑻忎箣绐�"); + SOURCE_MAP.put("akszc.com", "闃垮厠鑻忎箣绐�"); + SOURCE_MAP.put("365tsh.com", "365澶╃敓娲荤綉"); + SOURCE_MAP.put("jiayouhh.com", "鍔犳补绾㈡渤缃�"); + SOURCE_MAP.put("honghe.me", "绾㈡渤鎴夸骇缃�"); + SOURCE_MAP.put("hhzzx.com", "绾㈡渤宸炲湪绾�"); + SOURCE_MAP.put("hhzzx.com", "绾㈡渤宸炲湪绾�"); + SOURCE_MAP.put("hhzzx.com", "绾㈡渤宸炲湪绾�"); + SOURCE_MAP.put("0955fc.com", "涓崼鎴夸骇缃�"); + SOURCE_MAP.put("nxfang.com", "瀹佸鎴跨綉"); + SOURCE_MAP.put("0939.net", "闄囧崡鐢熸椿缃�"); + SOURCE_MAP.put("ynhouse.com", "浜戝崡鎴跨綉"); + SOURCE_MAP.put("hzfdc88.com", "璐哄窞鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("bshfc.cn", "淇濆北鎴夸骇缃�"); + SOURCE_MAP.put("haofung.com", "濂芥埧缃慼aofang"); + SOURCE_MAP.put("598fcw.com", "杈芥簮鎴夸骇缃�"); + SOURCE_MAP.put("0439.com", "鐧藉北鎴跨綉"); + SOURCE_MAP.put("ddfsw.com", "璞嗚眴鎴夸簨缃�"); + SOURCE_MAP.put("tcfcw.net", "閾滃窛鎴夸骇缃�"); + SOURCE_MAP.put("nnddw.com", "瀹佸崡澶у湴缃�"); + SOURCE_MAP.put("0954fc.com", "鍥哄師鎴夸骇缃�0954fc"); + SOURCE_MAP.put("gxfangchan.com", "骞胯タ鎴夸骇缃�"); + SOURCE_MAP.put("0437.gov.cn", "杈芥簮甯傛埧浜у眬"); + SOURCE_MAP.put("fccq.cn", "鐧藉北鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("bczj.gov.cn", "鐧藉煄甯備綇寤哄眬"); + SOURCE_MAP.put("lczjj.gov.cn", "涓存钵甯備綇寤哄眬"); + SOURCE_MAP.put("plzjj.gov.cn", "骞冲噳浣忓缓灞�"); + SOURCE_MAP.put("thfdckf.com", "閫氬寲鎴垮湴浜у紑鍙戜俊鎭綉"); + SOURCE_MAP.put("jcok.com.cn", "璐哄窞浣虫垚鎴夸骇缃�"); + SOURCE_MAP.put("puerhouse.org", "鏅幢甯傛埧浜т俊鎭綉"); + SOURCE_MAP.put("xingan123.com", "鍏村畨123缃�"); + SOURCE_MAP.put("04820482.com", "鍏村畨鐩熶俊鎭腐"); + SOURCE_MAP.put("0482home.com", "绾㈠煄瀹跺洯缃�"); + SOURCE_MAP.put("137400.net", "鍏村畨鏃剁┖"); + SOURCE_MAP.put("huimin168.com", "鍏村畨鎯犳皯缃�"); + SOURCE_MAP.put("04828.com", "鍏村畨鐩熶俊鎭綉"); + SOURCE_MAP.put("w.cn", "杈炬婧�"); + SOURCE_MAP.put("eebest.com", "涓�璐濈綉"); + SOURCE_MAP.put("efw.cn", "e鎴跨綉"); + SOURCE_MAP.put("t55.com", "娣樼獫绐�"); + SOURCE_MAP.put("citygf.com", "骞夸經閮藉競缃�"); + SOURCE_MAP.put("0757fc.com", "浣涘北鎴垮湴浜ц祫璁綉"); + SOURCE_MAP.put("0757home.com", "浣涘北鎴垮眿缃�"); + SOURCE_MAP.put("qzbbs.com", "灏忛奔鎴夸骇_qzbbs"); + SOURCE_MAP.put("lyd.com.cn", "娲涢槼鎴夸骇"); + SOURCE_MAP.put("0576h.com", "鍙板窞鎵炬埧缃�"); + SOURCE_MAP.put("tzfc.cn", "鍙板窞鎴夸骇缃慱tzfc"); + SOURCE_MAP.put("wf777.com", "娼嶆埧缃�"); + SOURCE_MAP.put("zhuhaifc.com", "鐝犳捣鎴夸骇缃�"); + SOURCE_MAP.put("qfang.com", "Q鎴跨綉"); + SOURCE_MAP.put("tzfdc.com", "鍙板窞鎴垮湴浜х綉"); + SOURCE_MAP.put("tzlsw.cn", "鍙板窞妤煎競缃�"); + SOURCE_MAP.put("0379city.com", "娲涢槼鎴夸骇_0379city"); + SOURCE_MAP.put("lznews.cn", "椴佷腑缃�"); + SOURCE_MAP.put("fff01.com", "椴佷腑绗竴鎴夸骇缃�"); + SOURCE_MAP.put("foryoo.cn", "娉夊窞鎴垮弸缃�"); + SOURCE_MAP.put("fang33.com", "鎴跨背缃�"); + SOURCE_MAP.put("wofang.com", "鎴戞埧缃�"); + SOURCE_MAP.put("wfinfo.cn", "娼嶅潑淇℃伅娓�"); + SOURCE_MAP.put("soufun.com", "鎼滄埧"); + SOURCE_MAP.put("soufun.com", "鎼滄埧缃�"); + SOURCE_MAP.put("0379home.com", "娲涢槼鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("lyfcw.com", "娲涢槼鎴夸骇缃慱lyfcw"); + SOURCE_MAP.put("ly6s.com", "娲涢槼妤煎競"); + SOURCE_MAP.put("zbfc.gov.cn", "娣勫崥甯傛埧绠″眬"); + SOURCE_MAP.put("china.com.cn", "鍦颁骇涓浗"); + SOURCE_MAP.put("iwjw.com", "鐖卞眿鍚夊眿"); + SOURCE_MAP.put("zsnews.cn", "涓北妤煎競缃�"); + SOURCE_MAP.put("zshouse.com", "涓北鎴垮湴浜ц祫璁綉"); + SOURCE_MAP.put("66fc.com", "涓北鎴夸骇缃�"); + SOURCE_MAP.put("gxhouse.com", "鏌冲窞鎴夸骇琛�"); + SOURCE_MAP.put("bdinfo.net", "浜掑姩鎴跨紭"); + SOURCE_MAP.put("bd365.net", "閲戝搧鎴挎簮"); + SOURCE_MAP.put("ljia.net", "鎭嬪缃�"); + SOURCE_MAP.put("qhdr.com", "绉︾殗宀涙柊闂荤綉鎴夸骇"); + SOURCE_MAP.put("whfc.com.cn", "濞佹捣鎴夸骇浜ゆ槗缃�"); + SOURCE_MAP.put("whhouse.com", "濞佹捣鎴垮湴浜х綉_whhouse"); + SOURCE_MAP.put("hufdc.com", "婀栧窞鎴夸骇缃�"); + SOURCE_MAP.put("weihaifangchan.com", "濞佹捣鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("whinfo.net.cn", "濞佹捣淇℃伅娓�"); + SOURCE_MAP.put("veryhome.com", "濞佹捣鎴垮湴浜х綉"); + SOURCE_MAP.put("iweihai.cn", "鐖卞▉娴风綉"); + SOURCE_MAP.put("guifun.com", "妗傛埧缃�"); + SOURCE_MAP.put("yfyc.tv", "鏈夋埧鏈夎溅"); + SOURCE_MAP.put("3xgd.com", "鍩庡競瀹跺洯"); + SOURCE_MAP.put("0759cctv.com", "瀹舵埧缃�"); + SOURCE_MAP.put("0750fw.com", "姹熼棬鎴跨綉"); + SOURCE_MAP.put("fj360.com", "鎴块泦缃�"); + SOURCE_MAP.put("ufang.com", "U鎴跨綉"); + SOURCE_MAP.put("hyfdcw.com", "琛¢槼鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("fc752.com", "鎯犲窞鎴夸骇缃慱fc752"); + SOURCE_MAP.put("zzz4.com", "鏍床鍦ㄧ嚎"); + SOURCE_MAP.put("jhhouse.com.cn", "姹熸樊鎴垮湴浜х綉"); + SOURCE_MAP.put("0797f.com", "璧e窞妤煎競缃�"); + SOURCE_MAP.put("797sun.com", "璧e窞鏅掓埧缃�"); + SOURCE_MAP.put("ijxjj.com", "涔濇睙缃�"); + SOURCE_MAP.put("990792.com", "涔濇睙闂ㄦ埛缃�"); + SOURCE_MAP.put("lfang.com", "鐖辨埧缃�"); + SOURCE_MAP.put("bxfcj.cn", "鏈邯缃戜笂鎴垮湴浜�"); + SOURCE_MAP.put("masff.com", "鎴挎埧缃�"); + SOURCE_MAP.put("365baotou.com", "鍖呭ご鎴垮湴浜х綉365baotou"); + SOURCE_MAP.put("51mam.com", "鍖呭ご鎴夸骇缃�"); + SOURCE_MAP.put("btfdcxx.com", "鍖呭ご鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("0452e.com", "楣ゅ煄妤肩洏缃�"); + SOURCE_MAP.put("8888667.com", "浜夸韩鐢熸椿缃�"); + SOURCE_MAP.put("btfdc.com", "鍖呭ご鎴垮湴浜х綉"); + SOURCE_MAP.put("0663f.com", "鎻槼鎴跨綉"); + SOURCE_MAP.put("gdmm.com", "鑼傚悕鍦ㄧ嚎"); + SOURCE_MAP.put("sina.com.cn", "鏂版氮涔愬眳"); + SOURCE_MAP.put("dooioo.com", "寰风鍦颁骇"); + SOURCE_MAP.put(".baidu.com", "鐧惧害鎴夸骇"); + SOURCE_MAP.put("xkhouse.com", "鏄熺┖鍦颁骇缃�"); + SOURCE_MAP.put("to8to.com", "鍦熷反鍏�"); + SOURCE_MAP.put("fangdr.com", "鎴垮崥澹�"); + SOURCE_MAP.put("home77.com", "鎴胯缃�"); + SOURCE_MAP.put("ifoboo.com", "鏄撴埧瀹�"); + SOURCE_MAP.put("douanju.com", "閮藉畨灞�"); + SOURCE_MAP.put("yc38.com", "鎵垚缃�"); + SOURCE_MAP.put("2zf.cn", "鐖辩鎴�"); + SOURCE_MAP.put("fangjee.com", "鎴块泦"); + SOURCE_MAP.put("wolai.com", "鎴戞潵鎴夸骇"); + SOURCE_MAP.put("qq.com", "鑵捐"); + SOURCE_MAP.put("leju.com", "涔愬眳璐埧缃�"); + SOURCE_MAP.put("fangjiadp.com", "鍏嬭�岀憺鎴夸环"); + SOURCE_MAP.put("qilinf.com", "楹掗簾鎴夸骇"); + SOURCE_MAP.put("fcjyw.org", "鎴夸骇浜ゆ槗缃�"); + SOURCE_MAP.put("yajuke.com", "闆呭眳瀹�"); + SOURCE_MAP.put("mapbar.com", "鍥惧惂"); + SOURCE_MAP.put("maifangzi.net", "涔版埧瀛�"); + SOURCE_MAP.put("china.com.cn", "鍦颁骇涓浗"); + SOURCE_MAP.put("sjjtx.com", "瀹跺ぉ涓嬫埧浜�"); + SOURCE_MAP.put("csjju.com", "鍩庡競浣冲眳"); + SOURCE_MAP.put("kingia.com", "鍚涜秺鍦颁骇"); + SOURCE_MAP.put("0754house.com", "浣虫垚鎴夸骇"); + SOURCE_MAP.put("yyjbfc.com", "浣欏瀹跺崥鎴夸骇"); + SOURCE_MAP.put("yysyfdc.com", "浣欏鐢熺泭鎴夸骇"); + SOURCE_MAP.put("eyuyao.com", "鏃轰匠鎴夸骇"); + SOURCE_MAP.put("0831xyfc.com", "娆e疁鎴夸骇"); + SOURCE_MAP.put("999fc.net", "瀹滃叴绉熸埧缃�"); + SOURCE_MAP.put("bsfcw.net", "瀹滃叴鐧剧洓鎴夸骇"); + SOURCE_MAP.put("yxhxfc.com", "瀹滃叴鍜屼俊鎴夸骇"); + SOURCE_MAP.put("yxfqfc.com", "瀹滃叴瀵屽己鎴夸骇"); + SOURCE_MAP.put("ywfc.cc", "姹囬懌鎴夸骇"); + SOURCE_MAP.put("15jp.com", "閿﹂箯涓嶅姩浜�"); + SOURCE_MAP.put("ywfhfc.com", "涔変箤瀵屽崕鎴夸骇"); + SOURCE_MAP.put("nt138.com", "鑼傚悕鍗楀ぉ鍦颁骇缃�"); + SOURCE_MAP.put("jxdxfc.com", "榧庝俊鎴垮湴浜�"); + SOURCE_MAP.put("yongbangfc.com", "姘搁偊鎴夸骇"); + SOURCE_MAP.put("zjwqfc.com", "涓囧崈鎴夸骇"); + SOURCE_MAP.put("yifan2006.com", "涓�甯嗘埧浜�"); + SOURCE_MAP.put("t1ti.com", "澶╁ぉ鎴夸骇"); + SOURCE_MAP.put("hsjdc.com", "濂戒笘鐣屽湴浜�"); + SOURCE_MAP.put("hsjsfc.com", "榛勫北绮剧洓鎴夸骇"); + SOURCE_MAP.put("lixiangw.com", "鐞嗘兂鎴夸骇"); + SOURCE_MAP.put("yaanjq.com", "閲戞ˉ鎴夸粙缃�"); + SOURCE_MAP.put("my012.com", "1+2鑱斿悎涓嶅姩浜�"); + SOURCE_MAP.put("dz1fdc.com", "鍏厓鍦颁骇"); + SOURCE_MAP.put("jyjfdc.com", "灞呬竴瀹舵埧鍦颁骇"); + SOURCE_MAP.put("hshdfc.com", "鎭掕揪鎴夸骇"); + SOURCE_MAP.put("hhccdc.com", "璇氭垚鍦颁骇"); + SOURCE_MAP.put("0597jia.com", "浣宠瘹鎴夸骇"); + SOURCE_MAP.put("boxinfangchan.com", "鍗氶Θ鎴夸骇"); + SOURCE_MAP.put("tjzf.com", "澶╂触绉熸埧缃�"); + SOURCE_MAP.put("cd.cc", "鎴愰兘鎴夸骇缃慱cd"); + SOURCE_MAP.put("tffcw.com", "澶╁簻鎴夸骇缃�"); + SOURCE_MAP.put("chengdufc.com", "鎴愰兘鎴夸骇缃�"); + SOURCE_MAP.put("ijj.cn", "鐖卞瀹舵埧浜х綉"); + SOURCE_MAP.put("house100.cn", "鎴愰兘濂芥埧缃�"); + SOURCE_MAP.put("fangchanwang.com", "鎴夸骇缃�"); + SOURCE_MAP.put("jlsp.com", "鍥涘钩淇℃伅娓�"); + SOURCE_MAP.put("0953fc.com", "鍚村繝鎴夸骇缃�"); + SOURCE_MAP.put("yuxifc.com", "鐜夋邯鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("ksls.com.cn", "鏄嗗北妤间笂缃�"); + SOURCE_MAP.put("di1fang.com", "鏄嗗北绗竴鎴夸骇"); + SOURCE_MAP.put("http://www.house-yt.com/", "鐑熷彴鎴夸骇鍦ㄧ嚎"); + SOURCE_MAP.put("zhnews.net", "鐝犳捣鎯犱拱鎴�"); + SOURCE_MAP.put("ddfw.cn", "涓逛笢鎴垮眿缃�"); + SOURCE_MAP.put("pj0427.net", "鐩橀敠鍦ㄧ嚎"); + SOURCE_MAP.put("0762home.com", "娌虫簮鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("076299.com", "涔濅節鎴夸骇缃�"); + SOURCE_MAP.put("qlqw.cn", "鍦堥噷鍦堝"); + SOURCE_MAP.put("373f.com", "鏂颁埂淇℃伅娓�"); + SOURCE_MAP.put("eyuyao.com", "浣欏鐢熸椿缃�"); + SOURCE_MAP.put("csgfw.cn", "甯哥啛璐埧缃�"); + SOURCE_MAP.put("beihaidc.com", "鍖楁捣鎴垮湴浜т氦鏄撶綉"); + SOURCE_MAP.put("bhfangchan.com", "鍖楁捣鎴垮湴浜х綉"); + SOURCE_MAP.put("sxxynews.com", "瀹滃眳鍜搁槼"); + SOURCE_MAP.put("yuefc.com", "闃呮埧缃�"); + SOURCE_MAP.put("0898hfw.com", "娴峰崡濂芥埧缃�"); + SOURCE_MAP.put("syfff.com", "涓変簹鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("sanyawu.com", "涓変簹鎴夸骇缃�"); + SOURCE_MAP.put("sanyafz.com", "涓変簹鎴夸环缃�"); + SOURCE_MAP.put("syhome.cc", "涓変簹鎴跨綉"); + SOURCE_MAP.put("ybxww.com", "瀹滃鏂伴椈缃�"); + SOURCE_MAP.put("ybzfw.com", "瀹滃浣忔埧缃�"); + SOURCE_MAP.put("ptajw.com", "鑾嗙敯瀹夊眳缃�"); + SOURCE_MAP.put("sun0758.com", "鑲堝簡闃冲厜缃�"); + SOURCE_MAP.put("0775fcw.com", "鐜夋灄鎴夸骇缃�"); + SOURCE_MAP.put("xfsfc.com.cn", "瑗勯槼浣忓畢涓庢埧浜т俊鎭綉"); + SOURCE_MAP.put("0710fdc.com", "瑗勬埧缃�"); + SOURCE_MAP.put("0710hf.com", "瑗勯槼濂芥埧缃�"); + SOURCE_MAP.put("zhuluxx.com", "閫愰箍瑗勯槼缃�"); + SOURCE_MAP.put("dlfdc.cn", "澶х悊鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("mmtcw.com", "鑼傚悕鍚屽煄缃�"); + SOURCE_MAP.put("0555yi.com", "鏄撴埧缃�"); + SOURCE_MAP.put("mdjhouse.com", "鐗′腹姹熸埧浜х綉"); + SOURCE_MAP.put("maihaofang.com", "闃虫睙濂芥埧缃�"); + SOURCE_MAP.put("0662fang.com", "闃虫睙鎴夸骇浜ゆ槗缃�"); + SOURCE_MAP.put("0763fcw.com", "0763鎴夸骇缃�"); + SOURCE_MAP.put("qybc.cn", "鐧惧窛鎴夸骇缃�"); + SOURCE_MAP.put("fcwqy.com", "娓呮埧缃�"); + SOURCE_MAP.put("0732fc.com", "0731鎴夸骇缃慱0732fc"); + SOURCE_MAP.put("xf88.com", "婀樻埧缃�"); + SOURCE_MAP.put("zgfc168.com", "鑷础鎴夸骇168"); + SOURCE_MAP.put("ylw0813.com", "鐩愰緳缃�"); + SOURCE_MAP.put("my0813.com", "鑷础閮藉競缃�"); + SOURCE_MAP.put("qzfdc.com", "琛㈠窞鎴垮湴浜х綉"); + SOURCE_MAP.put("0579.cn", "娴欎腑鍦ㄧ嚎"); + SOURCE_MAP.put("hfang.cn", "鎯犳埧缃�"); + SOURCE_MAP.put("zznews.gov.cn", "鏍床鏂伴椈缃�"); + SOURCE_MAP.put("0734.com", "琛¢槼缃�"); + SOURCE_MAP.put("360fc.cn", "360鎴夸骇缃�"); + SOURCE_MAP.put("cnbb.com.cn", "浜掕仈澶╁湴鎴夸骇缃�"); + SOURCE_MAP.put("sxhouse.com.cn", "缁嶅叴鎴夸骇瀹樻柟闂ㄦ埛"); + SOURCE_MAP.put("hz66.com", "婀栧窞鍦ㄧ嚎"); + SOURCE_MAP.put("0573ren.com", "鍢夊叴浜�"); + SOURCE_MAP.put("0579fang.com", "閲戝崕鎴夸骇缃�"); + SOURCE_MAP.put("qz123.com", "琛㈠窞淇℃伅娓�"); } private static void setMap2() { - SOURCE_MAP.put("hutaihu.com", "太湖网"); - SOURCE_MAP.put("sxol.com", "绍兴房产在线"); - SOURCE_MAP.put("zsxxg.com", "舟山信息港"); - SOURCE_MAP.put("mfmf100.com", "ESE百悦大通"); - SOURCE_MAP.put("szfmall.com", "苏州团房网"); - SOURCE_MAP.put("wwfcw.com", "武威二手房网"); - SOURCE_MAP.put("zyhouse.com.cn", "遵义房地产信息网"); - SOURCE_MAP.put("0853fdc.com", "0853房产网"); - SOURCE_MAP.put("0915home.com", "安康房地产信息网"); - SOURCE_MAP.put("jzfcw.com", "锦州精品楼盘网"); - SOURCE_MAP.put("jzhome.cn", "锦州房产网"); - SOURCE_MAP.put("0559fc.com", "黄山房产网"); - SOURCE_MAP.put("tl8.com.cn", "铁岭房产网"); - SOURCE_MAP.put("thmzfc.com", "明珠房产网"); - SOURCE_MAP.put("xibuwu.com", "西部屋"); - SOURCE_MAP.put("goufanggo.net", "岳阳购房网"); - SOURCE_MAP.put("52zjk.cn", "张垣生活网"); - SOURCE_MAP.put("0817.net", "南房网"); - SOURCE_MAP.put("0419.cn", "辽阳网"); - SOURCE_MAP.put("zzfcw.com.cn", "枣房网"); - SOURCE_MAP.put("m3fc.com", "眉山房产网"); - SOURCE_MAP.put("0835.com", "雅安在线"); - SOURCE_MAP.put("zmdfcxx.com", "驻马店房产信息网"); - SOURCE_MAP.put("fdc0737.com", "0737房产网"); - SOURCE_MAP.put("anjia8.com", "安家吧"); - SOURCE_MAP.put("haofz.com", "好房子"); - SOURCE_MAP.put("ylfcxx.com", "榆林房产"); - SOURCE_MAP.put("qinzf.com", "钦州住房网"); - SOURCE_MAP.put("nyloushi.com", "南阳楼市"); - SOURCE_MAP.put("nyfang.cn", "南阳房地产"); - SOURCE_MAP.put("xinnanyang.com", "南都网"); - SOURCE_MAP.put("0377fw.com", "南阳房产"); - SOURCE_MAP.put("lyfff.com", "家在临沂网"); - SOURCE_MAP.put("zhufon.com", "临沂住房网"); - SOURCE_MAP.put("ly169.cn", "临沂信息港"); - SOURCE_MAP.put("wuzhousky.com", "梧州时空网"); - SOURCE_MAP.put("dezhoudaily.com", "德州好房网"); - SOURCE_MAP.put("591fcw.cn", "我就要房产网"); - SOURCE_MAP.put("0475fang.com", "通辽房地产网"); - SOURCE_MAP.put("zhangjk.com", "张家口网房产"); - SOURCE_MAP.put("zjk169.net", "张家口楼盘网"); - SOURCE_MAP.put("rzfdc.com", "日照房产网"); - SOURCE_MAP.put("rzloupan.com", "日照楼盘网"); - SOURCE_MAP.put("bzfccs.com", "滨州房产超市网"); - SOURCE_MAP.put("0566fc.com", "0566池州房地产"); - SOURCE_MAP.put("0917fdc.com", "宝鸡房产网"); - SOURCE_MAP.put("0634.com", "都市网"); - SOURCE_MAP.put("brfcw.com", "巴房网"); - SOURCE_MAP.put("0596fc.com", "漳州房产在线"); - SOURCE_MAP.put("swfce.cn", "汕尾房产网"); - SOURCE_MAP.put("0825fang.com", "0825房产网"); - SOURCE_MAP.put("yafangke.com", "雅房客"); - SOURCE_MAP.put("scsn.cn", "遂宁之窗"); - SOURCE_MAP.put("fdc99.com", "永州房地产信息网"); - SOURCE_MAP.put("suifun.cn", "随房信息网"); - SOURCE_MAP.put("0716fw.com", "荆房网"); - SOURCE_MAP.put("jzhfz.com", "荆州好房子网"); - SOURCE_MAP.put("jzbdc.com", "荆州不动产"); - SOURCE_MAP.put("xgfw.cn", "孝感房网"); - SOURCE_MAP.put("lehuozaixian.com", "乐活在线"); - SOURCE_MAP.put("kkfcw.com", "看看房产网"); - SOURCE_MAP.put("ezfcw.cn", "鄂州房产网ezfcw"); - SOURCE_MAP.put("0359fdc.com", "0359房产网"); - SOURCE_MAP.put("0355fdc.com", "0355房产网"); - SOURCE_MAP.put("kfang.com.cn", "看房网"); - SOURCE_MAP.put("0413fc.net", "抚顺房产网0413fc"); - SOURCE_MAP.put("fshfc.cn", "抚顺房产网fshfc"); - SOURCE_MAP.put("yjwn.cn", "易居渭南"); - SOURCE_MAP.put("726000.net", "商洛房产网"); - SOURCE_MAP.put("9iwn.com", "新渭南房产网"); - SOURCE_MAP.put("lejuhouses.com", "渭南乐居网"); - SOURCE_MAP.put("jxpxf.cn", "萍乡房产网"); - SOURCE_MAP.put("xc0561.com", "相城房产网"); - SOURCE_MAP.put("yinuo1000.com", "一诺房产网"); - SOURCE_MAP.put("c0798.com", "景德镇买房网"); - SOURCE_MAP.put("0429b.com", "葫芦岛房地产网0429b"); - SOURCE_MAP.put("ehuludao.com", "葫芦岛在线"); - SOURCE_MAP.put("jiningloushi.com", "济宁楼市"); - SOURCE_MAP.put("jnzx.net.cn", "济宁在线"); - SOURCE_MAP.put("jnrx.cc", "济宁房产网jnrx"); - SOURCE_MAP.put("0597ok.com", "龙岩房地产联合网"); - SOURCE_MAP.put("liaochengloushi.com", "聊城楼市"); - SOURCE_MAP.put("liaofw.com", "聊房网liaofw"); - SOURCE_MAP.put("0832h.com", "内江房交网"); - SOURCE_MAP.put("d0598.com", "三明房产网d0598"); - SOURCE_MAP.put("5j5z.cn", "小袋鼠网"); - SOURCE_MAP.put("0598f.cn", "三明房产网0598f"); - SOURCE_MAP.put("10fang.com", "十房网"); - SOURCE_MAP.put("onfun.net", "房产在线onfun"); - SOURCE_MAP.put("syfang.net", "十堰房产网syfang"); - SOURCE_MAP.put("0563fang.org", "0563房产网"); - SOURCE_MAP.put("xykanfang.com", "新余看房网"); - SOURCE_MAP.put("jxdcw.com", "新余地产网"); - SOURCE_MAP.put("0701.com", "鹰潭房产网0701"); - SOURCE_MAP.put("nthaohe.com", "濠河网"); - SOURCE_MAP.put("xzloushi.cn", "徐州楼市"); - SOURCE_MAP.put("czfdc.com", "常房网"); - SOURCE_MAP.put("pcls.com.cn", "彭城楼市网"); - SOURCE_MAP.put("yzfyw.com", "扬州房源网"); - SOURCE_MAP.put("0515house.cn", "盐城第一房产网"); - SOURCE_MAP.put("sqanju.com", "安居网"); - SOURCE_MAP.put("lygfdc.com", "连云港房地产网"); - SOURCE_MAP.put("gj0511.com", "镇江逛街网"); - SOURCE_MAP.put("jwb.com.cn", "今晚网"); - SOURCE_MAP.put("tangrenju.net", "唐人居"); - SOURCE_MAP.put("qf101.com", "青房101"); - SOURCE_MAP.put("52youju.com", "优居网"); - SOURCE_MAP.put("zhijinfc.com", "沚津房产网"); - SOURCE_MAP.put("gzre.com", "贵阳房地产交易网"); - SOURCE_MAP.put("xjfangwu.com", "新疆房屋网"); - SOURCE_MAP.put("kmfcw.com", "昆明房产网"); - SOURCE_MAP.put("bxgfw.com", "百姓购房网"); - SOURCE_MAP.put("syinfo.com.cn", "沈阳房产信息网"); - SOURCE_MAP.put("house-cc.com", "长春房产在线"); - SOURCE_MAP.put("house-jn.com", "济南房产在线"); - SOURCE_MAP.put("f024.com", "沈阳房地产网"); - SOURCE_MAP.put("gofng.com", "购房网_gofng"); - SOURCE_MAP.put("xnhaofang.com", "西宁好房网"); - SOURCE_MAP.put("512888.com", "苏州房产信息网"); - SOURCE_MAP.put("zhaoju.com.cn", "找居网"); - SOURCE_MAP.put("0453fdc.com", "0453房产网"); - SOURCE_MAP.put("baihuwang.com", "百湖网"); - SOURCE_MAP.put("ycchinese.com", "伊春炎黄在线"); - SOURCE_MAP.put("jmsfdc.net", "佳木斯房地产网"); - SOURCE_MAP.put("0467fc.com", "鸡西房产网"); - SOURCE_MAP.put("hao0469.com", "双鸭山都市网"); - SOURCE_MAP.put("qthhz.com", "互众房产"); - SOURCE_MAP.put("i0456.com", "黑河门户网"); - SOURCE_MAP.put("hgxxg.com", "鹤岗信息港"); - SOURCE_MAP.put("qthfc.com", "七台河房产网"); - SOURCE_MAP.put("dqytw.com", "大庆房产网"); - SOURCE_MAP.put("buscx.cn", "鹤岗分类信息网"); - SOURCE_MAP.put("qitaihe8.com", "七台河二手房"); - SOURCE_MAP.put("jfw360.com", "佳房网"); - SOURCE_MAP.put("0457123.com", "大兴安岭信息网"); - SOURCE_MAP.put("0996fang.com", "梨城房产网"); - SOURCE_MAP.put("bzfcw.com.cn", "巴州房产网"); - SOURCE_MAP.put("bazhou5.com", "巴州网"); - SOURCE_MAP.put("bazhou163.com", "巴州163.com"); - SOURCE_MAP.put("bz.cn", "巴州在线"); - SOURCE_MAP.put("ibazhou.com.cn", "大周信息网"); - SOURCE_MAP.put("balagzi.com", "巴郞网"); - SOURCE_MAP.put("blxxw.com", "博乐信息网"); - SOURCE_MAP.put("ylnet.com.cn", "绿河谷"); - SOURCE_MAP.put("hm169.com", "哈密网"); - SOURCE_MAP.put("hm35.cn", "哈密商务网"); - SOURCE_MAP.put("2ks.com.cn", "喀什网"); - SOURCE_MAP.put("cj118114.com", "昌吉生活网"); - SOURCE_MAP.put("cjxxg.com", "昌吉信息港"); - SOURCE_MAP.put("hhzzx.com", "红河州在线"); - SOURCE_MAP.put("0955fc.com", "中卫房产网"); - SOURCE_MAP.put("hzfdc88.com", "贺州房地产信息网"); - SOURCE_MAP.put("598fcw.com", "辽源房产网"); - SOURCE_MAP.put("tcfcw.net", "铜川房产网"); - SOURCE_MAP.put("nnddw.com", "宁南大地网"); - SOURCE_MAP.put("0954fc.com", "固原房产网0954fc"); - SOURCE_MAP.put("haidong360.com", "海东房地产信息网"); - SOURCE_MAP.put("f0482.com", "兴安盟房地产网"); - SOURCE_MAP.put("xingan123.com", "兴安123网"); - SOURCE_MAP.put("citygf.com", "广佛都市网"); - SOURCE_MAP.put("0757fc.com", "佛山房地产资讯网"); - SOURCE_MAP.put("0757home.com", "佛山房屋网"); - SOURCE_MAP.put("qzbbs.com", "小鱼房产_qzbbs"); - SOURCE_MAP.put("lyd.com.cn", "洛阳房产"); - SOURCE_MAP.put("tzfc.cn", "台州房产网_tzfc"); - SOURCE_MAP.put("zhuhaifc.com", "珠海房产网"); - SOURCE_MAP.put("tzlsw.cn", "台州楼市网"); - SOURCE_MAP.put("0379city.com", "洛阳房产_0379city"); - SOURCE_MAP.put("fff01.com", "鲁中第一房产网"); - SOURCE_MAP.put("foryoo.cn", "泉州房友网"); - SOURCE_MAP.put("fang33.com", "房米网"); - SOURCE_MAP.put("66fc.com", "中山房产网"); - SOURCE_MAP.put("qhdr.com", "秦皇岛新闻网房产"); - SOURCE_MAP.put("veryhome.com", "威海房地产网"); - SOURCE_MAP.put("3xgd.com", "城市家园"); - SOURCE_MAP.put("0759cctv.com", "家房网"); - SOURCE_MAP.put("0750fw.com", "江门房网"); - SOURCE_MAP.put("fj360.com", "房集网"); - SOURCE_MAP.put("hyfdcw.com", "衡阳房地产信息网"); - SOURCE_MAP.put("fc752.com", "惠州房产网_fc752"); - SOURCE_MAP.put("zzz4.com", "株洲在线"); - SOURCE_MAP.put("jhhouse.com.cn", "江淮房地产网"); - SOURCE_MAP.put("0797f.com", "赣州楼市网"); - SOURCE_MAP.put("990792.com", "九江门户网"); - SOURCE_MAP.put("51mam.com", "包头房产网"); - SOURCE_MAP.put("btfdcxx.com", "包头房地产信息网"); - SOURCE_MAP.put("0452e.com", "鹤城楼盘网"); - SOURCE_MAP.put("8888667.com", "亿享生活网"); - SOURCE_MAP.put("0663f.com", "揭阳房网"); - SOURCE_MAP.put("gdmm.com", "茂名在线"); - SOURCE_MAP.put("9ihome.com", "新赣州房产网"); - SOURCE_MAP.put("masfdc.gov.cn", "马鞍山房产信息网"); - SOURCE_MAP.put("lygfcj.gov.cn", "连云港房管局"); - SOURCE_MAP.put("jlsfdc.com", "吉林房产信息网"); - SOURCE_MAP.put("fangchanbang.com", "房产帮"); - SOURCE_MAP.put("zjtzfg.gov.cn", "台州房产管理处"); - SOURCE_MAP.put("zsfdc.gov.cn", "中山国土资源局"); - SOURCE_MAP.put("ccnnhouse.com", "中城房产网"); - SOURCE_MAP.put("lzfcjys.com", "柳州房产交易网"); - SOURCE_MAP.put("hd.gov.cn", "邯郸房产管理局"); - SOURCE_MAP.put("house-wh.com", "威海房产在线"); - SOURCE_MAP.put("whfdcw.com", "威海房地产"); - SOURCE_MAP.put("yzfyw.com", "扬州房源网"); - SOURCE_MAP.put("0579fang.com", "金华房产网"); - SOURCE_MAP.put("southfang.com", "南方房产网"); - SOURCE_MAP.put("0759fdc.com", "湛江房产网"); - SOURCE_MAP.put("kuf.cn", "湛江酷房网"); - SOURCE_MAP.put("nethy8.com", "衡阳房产网_nethy8"); - SOURCE_MAP.put("ycfcjy.com", "宜昌房产交易网"); - SOURCE_MAP.put("ychaofang.com", "宜昌好房网"); - SOURCE_MAP.put("pdsfdc.gov.cn", "平顶山房管局"); - SOURCE_MAP.put("jjxw.cn", "大九江房产网"); - SOURCE_MAP.put("loupanwang.com", "露盼网"); - SOURCE_MAP.put("myfdc.com.cn", "绵阳房地产网"); - SOURCE_MAP.put("taofang.com", "淘房"); - SOURCE_MAP.put("e086.cn", "中华地产网"); - SOURCE_MAP.put("ylw0813.com", "盐龙网"); - SOURCE_MAP.put("zgfcn.com", "自贡房产网"); - SOURCE_MAP.put("zgsof.com", "自贡搜房网"); - SOURCE_MAP.put("my0813.com", "自贡都市网"); - SOURCE_MAP.put("xf88.com", "湘房网"); - SOURCE_MAP.put("ff1.com.cn", "第一房网"); - SOURCE_MAP.put("0763fcw.com", "0763房产网"); - SOURCE_MAP.put("dlfdc.cn", "大理房地产信息网"); - SOURCE_MAP.put("xyfc.com", "襄阳房产"); - SOURCE_MAP.put("0732fc.com", "0731房产网_0732fc"); - SOURCE_MAP.put("fcwqy.com", "清房网"); - SOURCE_MAP.put("0662f.com", "阳江房产网"); - SOURCE_MAP.put("maihaofang.com", "阳江好房网"); - SOURCE_MAP.put("mzhw.com", "梅州房产网"); - SOURCE_MAP.put("kjfcw.com", "客家房产网"); - SOURCE_MAP.put("ddfcw.com", "丹东房产网"); - SOURCE_MAP.put("i0415.cn", "丹东供求网"); - SOURCE_MAP.put("sxxynews.com", "宜居咸阳"); - SOURCE_MAP.put("zhuluxx.com", "逐鹿襄阳网"); - SOURCE_MAP.put("bendiw.cc", "本地网"); - SOURCE_MAP.put("0710fdc.com", "襄房网"); - SOURCE_MAP.put("0775fcw.com", "玉林房产网"); - SOURCE_MAP.put("qyfgj.cn", "清远房管局"); - SOURCE_MAP.put("dl-fangdi.com.cn", "大连房产交易中心"); - SOURCE_MAP.put("cqfdcw.cn", "重庆房地产网"); - SOURCE_MAP.put("ganji.com", "赶集"); - SOURCE_MAP.put("v007.net", "西江明珠房产网"); - SOURCE_MAP.put("sun0758.com", "肈庆阳光网"); - SOURCE_MAP.put("0744fdc.com", "张家界房地产信息网"); - SOURCE_MAP.put("sanyafz.com", "三亚房价网"); - SOURCE_MAP.put("sanyawu.com", "三亚房产网"); - SOURCE_MAP.put("syhome.cc", "三亚房网"); - SOURCE_MAP.put("deyoo.net.cn", "德佑地产"); - SOURCE_MAP.put("syfff.com", "三亚房地产信息网"); - SOURCE_MAP.put("xfsfc.com.cn", "襄阳住宅与房产信息网"); - SOURCE_MAP.put("ybxww.com", "宜宾新闻网"); - SOURCE_MAP.put("beihaidc.com", "北海房地产交易网"); - SOURCE_MAP.put("bhhouse.cn", "北海房地产信息网"); - SOURCE_MAP.put("bhfangchan.com", "北海房地产网"); - SOURCE_MAP.put("1188fc.com", "海南房产专线"); - SOURCE_MAP.put("ptfg.gov.cn", "莆田房产信息网"); - SOURCE_MAP.put("yuxi.tv", "玉溪在线"); - SOURCE_MAP.put("yuxifc.com", "玉溪房产信息网"); - SOURCE_MAP.put("ayfzxxw.com", "安阳房政信息网"); - SOURCE_MAP.put("ykhouse.com", "营口房产_ykhouse"); - SOURCE_MAP.put("qlqw.cn", "圈里圈外"); - SOURCE_MAP.put("373house.com", "新乡优房网"); - SOURCE_MAP.put("373f.com", "新乡信息港"); - SOURCE_MAP.put("hyfg.cn", "河源房管网"); - SOURCE_MAP.put("househy.com", "河源置业网"); - SOURCE_MAP.put("0762home.com", "河源房产信息网"); - SOURCE_MAP.put("076299.com", "九九房产网"); - SOURCE_MAP.put("zstmsf.com", "舟山市透明售房网"); - SOURCE_MAP.put("zyhouse.com.cn", "遵义房地产信息网"); - SOURCE_MAP.put("seezy.com", "遵义房产网"); - SOURCE_MAP.put("lsol.com.cn", "丽水房产网"); - SOURCE_MAP.put("lsfdc.com", "乐房网lsfdc"); - SOURCE_MAP.put("goufanggo.net", "岳阳购房网"); - SOURCE_MAP.put("tl8.com.cn", "铁岭房产网"); - SOURCE_MAP.put("0938f.com", "天水房产网"); - SOURCE_MAP.put("0377fw.com", "南阳房产"); - SOURCE_MAP.put("nyfang.cn", "南阳房地产"); - SOURCE_MAP.put("hrb88.com", "嘉吉二手房网"); - SOURCE_MAP.put("jhanju.com", "江淮安居网"); - SOURCE_MAP.put("51tie.com", "51同城"); - SOURCE_MAP.put("fenleiad.com", "分类广告网"); - SOURCE_MAP.put("tuitui99.com", "推推99房产网"); - SOURCE_MAP.put("gyfc.net.cn", "筑房网"); - SOURCE_MAP.put("guiyangfc.com", "贵阳房产网"); - SOURCE_MAP.put("aqfdc.com", "安庆房地产网aqfdc"); - SOURCE_MAP.put("dooioo.com", "德祐地产"); - SOURCE_MAP.put("baipusou.com", "百铺搜"); - SOURCE_MAP.put("eeju.com", "易居网"); - SOURCE_MAP.put("liaoing.com", "聊宅网"); - SOURCE_MAP.put("shangdu.com", "商都网"); - SOURCE_MAP.put("hnhaofang.com", "郑州好房网"); - SOURCE_MAP.put("371fang.cn", "郑房网"); - SOURCE_MAP.put("zshfcw.com", "舟山大象房产网"); - SOURCE_MAP.put("allfang.com", "全房"); - SOURCE_MAP.put("fangtoo.com", "房途网"); - SOURCE_MAP.put("nblide.com", "21世纪不动产_nblide"); - SOURCE_MAP.put("cnool.net", "东方热线房产网"); - SOURCE_MAP.put("cnnb.com.cn", "宁波地产网"); - SOURCE_MAP.put("nbnt.com.cn", "南天房产"); - SOURCE_MAP.put("goufang.com", "购房网"); - SOURCE_MAP.put("dadalian.net", "大连房源网"); - SOURCE_MAP.put("dllp.cn", "精品楼盘网"); - SOURCE_MAP.put("letfind.com", "猎房网"); - SOURCE_MAP.put("gaogulou.com", "高古楼房产网"); - SOURCE_MAP.put("fangyuan365.com", "365房产网"); - SOURCE_MAP.put("0731fdc.com", "0731房产网"); - SOURCE_MAP.put("wazhe.com", "蛙者网"); - SOURCE_MAP.put("800j.com.cn", "八百家"); - SOURCE_MAP.put("95191.com", "楼市通"); - SOURCE_MAP.put("ihk.cn", "房王"); - SOURCE_MAP.put("szhome.com", "深圳房地产信息网"); - SOURCE_MAP.put("zlhome.com", "中联地产网"); - SOURCE_MAP.put("qfang.com", "Q房网"); - SOURCE_MAP.put("guifc.com", "桂林房产网_guifc"); - SOURCE_MAP.put("yfyc.tv", "有房有车"); - SOURCE_MAP.put("guifun.com", "桂房网"); - SOURCE_MAP.put("fangke.cn", "房客网"); - SOURCE_MAP.put("ffw.com.cn", "福房网"); - SOURCE_MAP.put("66house.com", "房联网"); - SOURCE_MAP.put("h0591.com", "海西房产网"); - SOURCE_MAP.put("aqhouse.com", "安庆房地产交易网"); - SOURCE_MAP.put("aqfdc.cn", "安庆房地产网"); - SOURCE_MAP.put("ahhouse.com", "安徽房地产交易网"); - SOURCE_MAP.put("xafc.com", "新安房产网"); - SOURCE_MAP.put("lianm.com", "大象房产网"); - SOURCE_MAP.put("afcxx.com", "淮南房地产信息网"); - SOURCE_MAP.put("newhouse.com.cn", "安徽新地产交易网"); - SOURCE_MAP.put("0772fang.com", "柳房网"); - SOURCE_MAP.put("liebiao.com", "列表网"); - SOURCE_MAP.put("fccs.com", "中国房产超市网"); - SOURCE_MAP.put("centanet.com", "中原地产"); - SOURCE_MAP.put("0771555.com", "邕房网"); - SOURCE_MAP.put("zp365.com", "住朋网"); - SOURCE_MAP.put("0771hao.com", "房产家园网"); - SOURCE_MAP.put("kfw001.com", "快房网"); - SOURCE_MAP.put("house-book", "房谱"); - SOURCE_MAP.put("czfcw.com", "常州房产网"); - SOURCE_MAP.put("czfdc.com", "常房网"); - SOURCE_MAP.put("fdc.com.cn", "亿房网"); - SOURCE_MAP.put("jxdcw.com", "江西地产网"); - SOURCE_MAP.put("czfdc.com.cn", "常州房地产信息网"); - SOURCE_MAP.put("5y365.com", "无忧365购房网"); - SOURCE_MAP.put("tengfang.net", "腾房网"); - SOURCE_MAP.put("lfang.com", "爱房网"); - SOURCE_MAP.put("365jia.cn", "万家热线"); - SOURCE_MAP.put("hfhouse.com", "合肥房地产交易网"); - SOURCE_MAP.put("fcdbz.com", "房产大巴扎"); - SOURCE_MAP.put("km915.com", "客迷网"); - SOURCE_MAP.put("xjfc.com.cn", "搜家网"); - SOURCE_MAP.put("c21wlmq.com.cn", "21世纪不动产"); - SOURCE_MAP.put("taofang.com", "淘房"); - SOURCE_MAP.put("365jilin.com", "吉和房产"); - SOURCE_MAP.put("cnjxol.com", "嘉兴在线"); - SOURCE_MAP.put("djfw.com", "大家房产"); - SOURCE_MAP.put("efw.cn", "e房网"); - SOURCE_MAP.put("fc0576.com", "台州房产网"); - SOURCE_MAP.put("028f.com", "成房网"); - SOURCE_MAP.put("tzeju.com", "台州易居网"); - SOURCE_MAP.put("funi.com", "房联"); - SOURCE_MAP.put("577fang.com", "温州房产网"); - SOURCE_MAP.put("sxfcw.org", "绍兴房产网_sxfcw"); - SOURCE_MAP.put("ykouf.cn", "营口房产网"); - SOURCE_MAP.put("0575ls.cn", "绍兴楼市"); - SOURCE_MAP.put("0575360.com", "绍兴房产网"); - SOURCE_MAP.put("e0575.com", "买房租房"); - SOURCE_MAP.put("xfzc.com", "寻房之窗"); - SOURCE_MAP.put("98znz.com", "98指南针"); - SOURCE_MAP.put("iqilu.com", "齐鲁网"); - SOURCE_MAP.put("fc0531.com", "济房网"); - SOURCE_MAP.put("lywww.com", "临沂在线"); - SOURCE_MAP.put("lpwww.com", "楼盘在线"); - SOURCE_MAP.put("ejfc.cn", "易嘉房产"); - SOURCE_MAP.put("qzfc.com", "大泉州房产网"); - SOURCE_MAP.put("qzef.com", "泉州E房网"); - SOURCE_MAP.put("wxhouse.com", "无锡房地产市场网"); - SOURCE_MAP.put("longhoo.net", "龙虎网"); - SOURCE_MAP.put("23fdc.com", "鞍山房产网"); - SOURCE_MAP.put("qu114.com", "去114"); - SOURCE_MAP.put("xiadu.com", "夏都网"); - SOURCE_MAP.put("sdchina.com", "中国山东网"); - SOURCE_MAP.put("dzwww.com", "大众网"); - SOURCE_MAP.put("lyzhujia.com", "临沂住家网"); - SOURCE_MAP.put("inhe.net", "银河网"); - SOURCE_MAP.put("zhijia.com", "置家网"); - SOURCE_MAP.put("ejiacn.com", "E家网"); - SOURCE_MAP.put("ly6s.com", "洛阳楼市"); - SOURCE_MAP.put("0579fw.com", "金华房网"); - SOURCE_MAP.put("nthfw.com", "南通好房网"); - SOURCE_MAP.put("axfc.cn", "爱心房产"); - SOURCE_MAP.put("qzfce.cn", "衢州房产e网"); - SOURCE_MAP.put("xmhouse.com", "厦门房地产联合网"); - SOURCE_MAP.put("qwjian.com", "千万间"); - SOURCE_MAP.put("lsol.com.cn", "丽水房产网"); - SOURCE_MAP.put("t55.com", "淘窝窝"); - SOURCE_MAP.put("dushifang.com", "都市二手房网"); - SOURCE_MAP.put("ddfcw.com", "丹东房产网"); - SOURCE_MAP.put("i0415.cn", "丹东供求网"); - SOURCE_MAP.put("f537.com", "济宁房房网"); - SOURCE_MAP.put("jn678.com", "济宁房产网"); - SOURCE_MAP.put("nmgfc.cn", "内蒙古房产网"); - SOURCE_MAP.put("cn0477.com", "鄂尔多斯生活网"); - SOURCE_MAP.put("ijxjj.com", "九江网"); - SOURCE_MAP.put("jjhlfc.com", "恒力房产"); - SOURCE_MAP.put("tzfdc.com", "台州房地产网"); - SOURCE_MAP.put("tzesf.com", "台州二手房网"); - SOURCE_MAP.put("centanet.com", "中原地产"); - SOURCE_MAP.put("ycfcw.cn", "盐城房产网"); - SOURCE_MAP.put("ycfcw.com.cn", "盐城房地产"); - SOURCE_MAP.put("ycfc8.com", "盐城房产"); - SOURCE_MAP.put("kaifc.cn", "开封房产网"); - SOURCE_MAP.put("kaifengfcw.com", "开封房产网kaifengfcw"); - SOURCE_MAP.put("373house.com", "新乡优房网"); - SOURCE_MAP.put("ljia.net", "恋家网"); - SOURCE_MAP.put("zbinfo.net", "淄博信息港"); - SOURCE_MAP.put("lznews.cn", "鲁中网"); - SOURCE_MAP.put("zbfc.com", "淄博房产网(ZB)"); - SOURCE_MAP.put("bd365.net", "金品房源"); - SOURCE_MAP.put("tmsf.com", "透明售房网"); - SOURCE_MAP.put("fcwlm.cn", "房产网联盟"); - SOURCE_MAP.put("housoo.com", "山西房地产门户网"); - SOURCE_MAP.put("fooju.com.cn", "福居网"); - SOURCE_MAP.put("0471fcw.com", "0471房产网"); - SOURCE_MAP.put("365hf.com", "呼和浩特房地产网"); - SOURCE_MAP.put("0471vip.com", "呼和浩特在线"); - SOURCE_MAP.put("qiqhr.cn", "齐齐哈尔房产qiqhr"); - SOURCE_MAP.put("e086.cn", "中华地产网"); - SOURCE_MAP.put("ccoo.cn", "城市中国网"); - SOURCE_MAP.put("wftzfc.com", "天泽房产网"); - SOURCE_MAP.put("0536home.com", "潍坊房产网"); - SOURCE_MAP.put("wfinfo.cn", "潍坊信息港"); - SOURCE_MAP.put("pianyifun.com", "便宜房"); - SOURCE_MAP.put("jqcn.net", "酒泉生活网"); - SOURCE_MAP.put("my0511.com", "镇江房产网"); - SOURCE_MAP.put("huainet.com", "淮安房产网"); - SOURCE_MAP.put("lousw.com", "冲浪宜居"); - SOURCE_MAP.put("ha16.com", "精彩房产网"); - SOURCE_MAP.put("hdfangxun.cn", "邯郸房讯网"); - SOURCE_MAP.put("xmhouse.com", "厦门房地产联合网"); - SOURCE_MAP.put("0458yc.cn", "伊春都市网"); - SOURCE_MAP.put("bjjs.gov.cn", "北京市建设委员会"); - SOURCE_MAP.put("lyfc001", "溧阳房产网"); - SOURCE_MAP.put("czfdc.com", "常房网"); - SOURCE_MAP.put("czfcw.com", "常州房产网"); - SOURCE_MAP.put("house365.com", "365地产家居网"); - SOURCE_MAP.put("xzhouse.com.cn", "徐州房地产信息网"); - SOURCE_MAP.put("xzhouse.com.cn", "徐州房地产信息网"); - SOURCE_MAP.put("lsqss.com", "凉山全搜索"); - SOURCE_MAP.put("fang.com", "搜房网"); - SOURCE_MAP.put("soufy.cn", "搜房源网"); - SOURCE_MAP.put("baixinger.com", "百姓吧"); - SOURCE_MAP.put("baixinger.com", "百姓吧"); - SOURCE_MAP.put("fahaola.com", "发好啦"); - SOURCE_MAP.put("ahaola.com", "发好啦"); - SOURCE_MAP.put("zhengfafa.com", "正发发分类信息网"); - SOURCE_MAP.put("haofang.net", "好房在线"); - SOURCE_MAP.put("5i5j.com", "我爱我家"); - SOURCE_MAP.put("yes515.com", "515房产网"); - SOURCE_MAP.put("baidu.com", "百度乐居"); - SOURCE_MAP.put("goufang.com", "购房者"); - SOURCE_MAP.put("cityhouse.cn", "城市房产"); - SOURCE_MAP.put("baixing.com", "百姓网"); - SOURCE_MAP.put("bai58.com", "百五八网"); - SOURCE_MAP.put("bai58.com", "百五八网"); - SOURCE_MAP.put("ganji.com", "赶集网"); - SOURCE_MAP.put("58.com", "58同城"); - SOURCE_MAP.put("taofw.cn", "淘房屋"); - SOURCE_MAP.put("anjuke.com", "安居客"); - SOURCE_MAP.put("jinti.com", "今题网"); - SOURCE_MAP.put("loupan.com", "楼盘网"); - SOURCE_MAP.put("daikan.cn", "带看网"); - SOURCE_MAP.put("zufang.com", "租房网"); - SOURCE_MAP.put("fangjiadp.com", "克而瑞房价"); - SOURCE_MAP.put("shfg.gov.cn", "上海市住房保障和房屋管理局"); - SOURCE_MAP.put("iwjw.com", "爱屋吉屋"); - SOURCE_MAP.put("xinfun.net", "新房网"); - SOURCE_MAP.put("0470fcw.com", "呼伦贝尔房产网"); - SOURCE_MAP.put("srtong.com", "上饶通房产网"); - SOURCE_MAP.put("soufun.com", "搜房"); - SOURCE_MAP.put("58.com", "58同城"); - SOURCE_MAP.put("koofang.com", "酷房网"); - SOURCE_MAP.put("laho.gov.cn", "阳光家缘"); - SOURCE_MAP.put("cdfgj.gov.cn", "成都市房管局"); - SOURCE_MAP.put("bjjs.gov.cn", "北京市建设委员会"); - SOURCE_MAP.put("szpl.gov.cn", "深圳房产信息系统"); - SOURCE_MAP.put("tjfdc.com.cn", "天津房产信息网"); - SOURCE_MAP.put("cq315house.com", "重庆网上房地产"); - SOURCE_MAP.put("njhouse.com.cn", "南京网上房地产"); - SOURCE_MAP.put("ksfc.gov.cn", "昆山房产信息网"); - SOURCE_MAP.put("gyfc.net.cn", "筑房网"); - SOURCE_MAP.put("lzfc.com.cn", "兰州商品房"); - SOURCE_MAP.put("fang99.com", "西安房管局"); - SOURCE_MAP.put("kmhouse.org", "昆明房产信息网"); - SOURCE_MAP.put("qzfdc.gov.cn", "泉州住房建设网"); - SOURCE_MAP.put("qdfd.com.cn", "青岛网上房地产"); - SOURCE_MAP.put("hhhtfcj.gov.cn", "呼和浩特房管局"); - SOURCE_MAP.put("ntfdc.net", "南通房产信息网"); - SOURCE_MAP.put("xz.gov.cn", "徐州房管局"); - SOURCE_MAP.put("jlsfdc.com", "吉林房产信息网"); - SOURCE_MAP.put("xnfcxx.com", "西宁房产信息网"); - SOURCE_MAP.put("hkrealestate.gov.cn", "海口房产信息网"); - SOURCE_MAP.put("lyzbj.com", "洛阳房管局"); - SOURCE_MAP.put("zjtzfg.gov.cn", "台州房产管理处"); - SOURCE_MAP.put("dqfcj.com.cn", "大庆网上房地产"); - SOURCE_MAP.put("asfc.com.cn", "鞍山房产交易中心"); - SOURCE_MAP.put("zhzgj.gov.cn", "珠海商品房销售网"); - SOURCE_MAP.put("zsfdc.gov.cn", "中山国土资源局"); - SOURCE_MAP.put("yancheng.gov.cn", "盐城房管局"); - SOURCE_MAP.put("jjzzfdc.com.cn", "九江房管局"); - SOURCE_MAP.put("bxfcj.cn", "本溪网上房地产"); - SOURCE_MAP.put("maoming.gov.cn", "茂名房管局"); - SOURCE_MAP.put("jyfg.cn", "揭阳房管局"); - SOURCE_MAP.put("zgfdc.gov.cn", "自贡房管局"); - SOURCE_MAP.put("ptfg.gov.cn", "莆田房产信息网"); - SOURCE_MAP.put("cxsfdcglzx.com", "慈溪房产管理中心"); - SOURCE_MAP.put("hfhome.cn", "合肥家园网"); - SOURCE_MAP.put("cnnbfdc.com", "宁波住宅与房产网"); - SOURCE_MAP.put("whfcj.gov.cn", "武汉房产信息网"); - SOURCE_MAP.put("ncfdc.com.cn", "南昌房产信息网"); - SOURCE_MAP.put("0731fdc.com", "长沙房产信息网"); - SOURCE_MAP.put("hrbhouse365.com.cn", "哈尔滨网站房地产"); - SOURCE_MAP.put("sdjnfc.com.cn", "济南网上房地产"); - SOURCE_MAP.put("ccfdw.com", "长春房管局"); - SOURCE_MAP.put("ytfcjy.com", "烟台房产交易网"); - SOURCE_MAP.put("ufc.gov.cn", "乌鲁木齐房管局"); - SOURCE_MAP.put("xmjydj.com", "厦门网上房地产"); - SOURCE_MAP.put("fzhouse.com.cn", "福建房产信息网"); - SOURCE_MAP.put("dg.gov.cn", "东莞房产信息网"); - SOURCE_MAP.put("fsjw.gov.cn", "佛山房地产网"); - SOURCE_MAP.put("tyfdc.gov.cn", "太原房产信息网"); - SOURCE_MAP.put("lzfcjys.com", "柳州房产交易网"); - SOURCE_MAP.put("stfcj.gov.cn", "汕头房管局"); - SOURCE_MAP.put("bdfdc.net", "保定房产交易中心"); - SOURCE_MAP.put("whfc.com.cn", "威海房产交易网"); - SOURCE_MAP.put("hufdc.com", "湖州房产网"); - SOURCE_MAP.put("zjfdc.gov.cn", "镇江房产信息网"); - SOURCE_MAP.put("glfcj.gov.cn", "桂林房管局"); - SOURCE_MAP.put("huizhou.gov.cn", "惠州房管局"); - SOURCE_MAP.put("zjfgj.cn", "湛江房管局"); - SOURCE_MAP.put("jmfcj.com.cn", "江门住房建设局"); - SOURCE_MAP.put("zzfc.com", "株洲房产信息网"); - SOURCE_MAP.put("ycfcjy.com", "宜昌房产交易网"); - SOURCE_MAP.put("gzfcj.gov.cn", "赣州房管局"); - SOURCE_MAP.put("whfdc.gov.cn", "芜湖房产信息网"); - SOURCE_MAP.put("myfdc.com.cn", "绵阳房地产网"); - SOURCE_MAP.put("mdjfdc.gov.cn", "牡丹江房地产网"); - SOURCE_MAP.put("masfdc.gov.cn", "马鞍山房产信息网"); - SOURCE_MAP.put("lygfcj.gov.cn", "连云港房管局"); - SOURCE_MAP.put("nnfcj.gov.cn", "南宁房管局"); - SOURCE_MAP.put("qyfgj.cn", "清远房管局"); - SOURCE_MAP.put("yjjs.gov.cn", "阳江住房建设局"); - SOURCE_MAP.put("mzjs.gov.cn", "梅州住房建设局"); - SOURCE_MAP.put("xycj.gov.cn", "咸阳住房规划局"); - SOURCE_MAP.put("dalihouse.org", "大理房产信息网"); - SOURCE_MAP.put("xffgj.cn", "襄阳房管局"); - SOURCE_MAP.put("tsfcxx.com", "唐山房产信息网"); - SOURCE_MAP.put("yafc.gov.cn", "延安房产网"); - SOURCE_MAP.put("0898gt.com", "三亚房产信息网_0898gt"); - SOURCE_MAP.put("lpsfdc.cn", "六盘水房产信息网"); - SOURCE_MAP.put("pzhfc.cn", "攀枝花房管局"); - SOURCE_MAP.put("beihaire.gov.cn", "北海房地产"); - SOURCE_MAP.put("csfc.gov.cn", "常熟房产信息网"); - SOURCE_MAP.put("rafg.com.cn", "瑞安住房管理局"); - SOURCE_MAP.put("wzfg.com", "温州房产市场信息"); - SOURCE_MAP.put("nhfg.cn", "宁海房产网"); - SOURCE_MAP.put("fhfcw.org", "奉化房产信息网"); - SOURCE_MAP.put("yyfdc.com.cn", "余姚房产信息网"); - SOURCE_MAP.put("wlfc.gov.cn", "温岭透明售房网"); - SOURCE_MAP.put("yxhouse.net", "宜兴房产网"); - SOURCE_MAP.put("yiwufg.com", "义乌房产信息网"); - SOURCE_MAP.put("qjhouse.org", "曲靖房产信息网"); - SOURCE_MAP.put("xxfdc.gov.cn", "新乡房产管理信息网"); - SOURCE_MAP.put("ykhouse.com", "营口房产_ykhouse"); - SOURCE_MAP.put("hyfg.cn", "河源房管网"); - SOURCE_MAP.put("hsfdc.com", "黄石房产信息网"); - SOURCE_MAP.put("jzfdc.gov.cn", "焦作房产管理中心"); - SOURCE_MAP.put("ayfzxxw.com", "安阳房政信息网"); - SOURCE_MAP.put("sgfczc.com", "韶关房产之窗"); - SOURCE_MAP.put("zbzzfdc.gov.cn", "淄博房产信息网"); - SOURCE_MAP.put("zbfc.gov.cn", "淄博市房管局"); - SOURCE_MAP.put("sxhouse.gov.cn", "绍兴房管局信息网"); - SOURCE_MAP.put("cdfcw.com", "承德房产网"); - SOURCE_MAP.put("lwfccs.com", "莱芜房管局"); - SOURCE_MAP.put("czfcj.gov.cn", "郴州市房管局"); - SOURCE_MAP.put("qzfc.gov.cn", "衢州商品房销售网"); - SOURCE_MAP.put("fangdi.com.cn", "网上房地产"); - SOURCE_MAP.put("hzfc.gov.cn", "杭州房管局"); - SOURCE_MAP.put("lffdc.gov.cn", "廊坊房管局"); - SOURCE_MAP.put("dl-fangdi.com.cn", "大连房产交易中心"); - SOURCE_MAP.put("zzfdc.gov.cn", "郑州房地产网"); - SOURCE_MAP.put("xyjw.gov.cn", "信阳住建局"); - SOURCE_MAP.put("gafdc.cn", "广安市房产交易平台"); - SOURCE_MAP.put("zstmsf.com", "舟山市透明售房网"); - SOURCE_MAP.put("xcsfcjyw.com", "许昌房产交易信息网"); - SOURCE_MAP.put("hgfgj.com", "黄冈房地产管理局"); - SOURCE_MAP.put("hnfc.gov.cn", "淮南市房地产管理局"); - SOURCE_MAP.put("dtfc.gov.cn", "大同市房产信息网"); - SOURCE_MAP.put("hzfgj.com", "菏泽住宅与房地产信息网"); - SOURCE_MAP.put("cdsfgj.gov.cn", "常德市房地产信息网"); - SOURCE_MAP.put("wwsjw.gov.cn", "武威市住房和城乡建设局"); - SOURCE_MAP.put("qqhrfc.com", "齐齐哈尔市房产信息网"); - SOURCE_MAP.put("0437.gov.cn", "辽源市房产局"); - SOURCE_MAP.put("inlishui.com", "丽水房产公众信息网"); - SOURCE_MAP.put("spfcj.gov.cn", "四平市住房和城乡建设局"); - SOURCE_MAP.put("huaian.gov.cn", "淮安市房管局"); - SOURCE_MAP.put("hanzhong.gov.cn", "汉中市住房和城市管理局"); - SOURCE_MAP.put("dingxi.gov.cn", "定西市住房和城乡建设局"); - SOURCE_MAP.put("lsfdc.gov.cn", "乐山市房管局信息网"); - SOURCE_MAP.put("btfdc.com", "包头房地产网"); - SOURCE_MAP.put("jcsfdc.com.cn", "晋城市房地产信息网"); - SOURCE_MAP.put("fccq.cn", "白山房地产信息网"); - SOURCE_MAP.put("jzsfdc.gov.cn", "锦州市房地产信息网"); - SOURCE_MAP.put("akfc.gov.cn", "安康市房产管理局"); - SOURCE_MAP.put("jms.gov.cn", "佳木斯市住房保障局"); - SOURCE_MAP.put("yangzhou.gov.cn", "扬州房管局"); - SOURCE_MAP.put("hd.gov.cn", "邯郸房产管理局"); - SOURCE_MAP.put("tazzfdc.com", "泰安房管局"); - SOURCE_MAP.put("0538fcw.com", "泰安房产交易中心"); - SOURCE_MAP.put("tsfcjy.com", "天水房产交易登记网"); - SOURCE_MAP.put("shjs.gov.cn", "绥化住房建设网"); - SOURCE_MAP.put("vipoa.net", "中卫住房建设局"); - SOURCE_MAP.put("yyjs.gov.cn", "岳阳住房建设网"); - SOURCE_MAP.put("ylszjj.gov.cn", "榆林住房建设"); - SOURCE_MAP.put("qzfgw.gov.cn", "钦州住房建设"); - SOURCE_MAP.put("nyfdc.gov.cn", "南阳房管局"); - SOURCE_MAP.put("lyfdc.gov.cn", "临沂房产保障局"); - SOURCE_MAP.put("lffc.gov.cn", "临汾住房信息网"); - SOURCE_MAP.put("lffx.org", "临汾房产网"); - SOURCE_MAP.put("ordosfg.gov.cn", "鄂尔多斯房产局"); - SOURCE_MAP.put("wzfg.com.cn", "梧州房交网"); - SOURCE_MAP.put("bsfcj.com", "广西百色房产管理局"); - SOURCE_MAP.put("jxfgj.gov.cn", "鸡西房管局"); - SOURCE_MAP.put("bczj.gov.cn", "白城市住建局"); - SOURCE_MAP.put("feoou.org", "拉萨房地产交易网"); - SOURCE_MAP.put("cyfcxx.com", "朝阳房产信息网"); - SOURCE_MAP.put("hbczfdc.gov.cn", "沧州市房产信息网"); - SOURCE_MAP.put("dyfc.gov.cn", "东营住宅与房地产信息网"); - SOURCE_MAP.put("dzhfgj.cn", "德州市房产管理中心"); - SOURCE_MAP.put("ahbzfdc.com", "亳州市住宅与房地产信息网"); - SOURCE_MAP.put("aqhouse.net", "安庆市房地产交易中心"); - SOURCE_MAP.put("szshouse.com", "石嘴山房产信息网"); - SOURCE_MAP.put("thfdckf.com", "通化房地产开发信息网"); - SOURCE_MAP.put("fxfdcw.com", "阜新市房产信息网"); - SOURCE_MAP.put("xtfdc.gov.cn", "邢台房地产信息网"); - SOURCE_MAP.put("ndjsj.gov.cn", "宁德市住建网"); - SOURCE_MAP.put("rzfdc.com", "日照房博会"); - SOURCE_MAP.put("lczjj.gov.cn", "临沧市住建局"); - SOURCE_MAP.put("gxgg.gov.cn", "贵港市房管局"); - SOURCE_MAP.put("szfd.gov.cn", "宿州市房管局"); - SOURCE_MAP.put("ncfdj.gov.cn", "南昌市房地产管理局"); - SOURCE_MAP.put("czfdc.gov.cn", "池州网上房地产"); - SOURCE_MAP.put("sclzfc.com.cn", "泸州市房地产市场信息网"); - SOURCE_MAP.put("fjnpfdc.com", "南平市房信网"); - SOURCE_MAP.put("zzfcj.com.cn", "枣庄市房管局"); - SOURCE_MAP.put("bjsfdc.com.cn", "宝鸡市房地产网"); - SOURCE_MAP.put("zyfgj.cn", "资阳房管局政务网"); - SOURCE_MAP.put("bbfcjyw.com", "蚌埠房产交易网"); - SOURCE_MAP.put("czhome.com.cn", "滁州网上房地产"); - SOURCE_MAP.put("tlfdc.cn", "铜陵房地产信息网"); - SOURCE_MAP.put("sysfcj.com", "邵阳市房产局"); - SOURCE_MAP.put("fdc.gov.cn", "漳州市住建局"); - SOURCE_MAP.put("gzbjfc.com", "毕节房产市场"); - SOURCE_MAP.put("jmfdc.gov.cn", "荆门房管网"); - SOURCE_MAP.put("swfgj.gov.cn", "汕尾市房管局"); - SOURCE_MAP.put("kfjs.gov.cn", "开封住建局"); - SOURCE_MAP.put("puerhouse.org", "普洱市房产信息网"); - SOURCE_MAP.put("dyfc.cn", "德阳房地产网"); - SOURCE_MAP.put("yaan.gov.cn", "雅安市房地产信息网"); - SOURCE_MAP.put("fdc0746.com", "0746楼市网"); - SOURCE_MAP.put("ldfdcw.com", "娄房网"); - SOURCE_MAP.put("jzfc.gov.cn", "荆州市房管局"); - SOURCE_MAP.put("xnfcj.com", "咸宁住房信息网"); - SOURCE_MAP.put("ezrea.com", "鄂州房产网ezrea"); - SOURCE_MAP.put("sxyqfdc.com", "阳泉住房信息网"); - SOURCE_MAP.put("sxczfdc.com", "长治住房信息网"); - SOURCE_MAP.put("ycsfdc.com", "运城市房信网"); - SOURCE_MAP.put("llsfdc.com", "吕梁住房信息网"); - SOURCE_MAP.put("wnfdc.com", "渭南房地产信息网"); - SOURCE_MAP.put("fsfdc.com.cn", "抚顺交易登记中心"); - SOURCE_MAP.put("hbfdc.gov.cn", "淮北房地产信息网"); - SOURCE_MAP.put("plzjj.gov.cn", "平凉住建局"); - SOURCE_MAP.put("pxaaa.com", "萍乡市住房信息网"); - SOURCE_MAP.put("fzfgj.cn", "抚州市住房信息网"); - SOURCE_MAP.put("hcsfcglj.com", "河池房管局"); - SOURCE_MAP.put("qyfcglw.com", "庆阳房产网"); - SOURCE_MAP.put("ycfdcxxw.gov.cn", "宜春房信网"); - SOURCE_MAP.put("baiyin.cn", "白银房地产管理局"); - SOURCE_MAP.put("hhfcw.com", "怀化房产网hhfcw"); - SOURCE_MAP.put("hhfdcw.com", "怀化房产信息网"); - SOURCE_MAP.put("jdzfgj.com", "景德镇房地产交易管理网"); - SOURCE_MAP.put("syfg.org.cn", "松原房产信息网"); - SOURCE_MAP.put("hldfcxx.com", "葫芦岛房产信息网"); - SOURCE_MAP.put("jifcw.com", "济宁房产交易监理处"); - SOURCE_MAP.put("fjlyfdc.com.cn", "龙岩房地产信息网"); - SOURCE_MAP.put("fdcxh.com", "十堰房地产网"); - SOURCE_MAP.put("tongren.gov.cn", "中国铜仁"); - SOURCE_MAP.put("xcfdc.cn", "宣城网上房地产"); - SOURCE_MAP.put("xyfcj.com", "新余房产信息网"); - SOURCE_MAP.put("ytfc.gov.cn", "鹰潭市房产信息网"); - SOURCE_MAP.put("gy-fdc.com", "广元房管处"); - SOURCE_MAP.put("zmdfcgl.com", "驻马店住房管理中心"); - SOURCE_MAP.put("xjksfcw.com", "喀什房产网"); - SOURCE_MAP.put("xjksfx.com", "喀什市房地产业协会"); - SOURCE_MAP.put("cxhouse.org", "楚雄房产信息网"); - SOURCE_MAP.put("cjfcw.com", "昌吉房产网"); - SOURCE_MAP.put("hmfdc.gov.cn", "哈密市房地产管理局"); - SOURCE_MAP.put("smecj.gov.cn", "新疆昌吉州中小企业"); - SOURCE_MAP.put("sysfgj.com", "双鸭山市商品房网上签约备案平台"); - SOURCE_MAP.put("czfdc.com.cn", "常州商品房信息"); - SOURCE_MAP.put("bffdc.gov.cn", "平顶山房管监管查询"); - SOURCE_MAP.put("shfg.gov.cn", "上海市住房保障和房屋管理局"); - SOURCE_MAP.put("focus.cn", "搜狐焦点"); - SOURCE_MAP.put("ganji.com", "赶集"); - SOURCE_MAP.put("jiwu.com", "吉屋网"); - SOURCE_MAP.put("loupan.com", "楼盘网"); - SOURCE_MAP.put("haofang.net", "好房在线"); - SOURCE_MAP.put("5i5j.com", "我爱我家"); - SOURCE_MAP.put("yes515.com", "515房产网"); - SOURCE_MAP.put("baixing.com", "百姓网"); - SOURCE_MAP.put("sina.com.cn", "新浪乐居"); - SOURCE_MAP.put("dlfd.gov.cn", "大连市房地产交易登记中心"); - SOURCE_MAP.put("ffc.gov.cn", "临汾市住房与房地产信息网"); - SOURCE_MAP.put("ffc.gov.cn", "临汾市住房与房地产信息网"); - SOURCE_MAP.put("hrbfdc.gov.cn", "哈尔滨市房产住宅局"); - SOURCE_MAP.put("haoju.cn", "好居"); - SOURCE_MAP.put("house365.com", "365地产家居网"); - SOURCE_MAP.put("mytophome.com", "满堂红"); - SOURCE_MAP.put("centanet.com", "中原地产"); - SOURCE_MAP.put("ckj345.com", "超可居"); - SOURCE_MAP.put("fzg360.com", "房掌柜"); - SOURCE_MAP.put("ganji.com", "赶集"); - SOURCE_MAP.put("daikan.cn", "带看"); - SOURCE_MAP.put("hrbslfc.com", "哈尔滨世联房产"); - SOURCE_MAP.put("zhendafang.com", "振达房产"); - SOURCE_MAP.put("yiwu-house.com", "坐标不动产"); - SOURCE_MAP.put("boxinfangchan.com", "博馨房产"); - SOURCE_MAP.put("0597jia.com", "佳诚房产"); - SOURCE_MAP.put("0470jiaxing.com", "家兴房产"); - SOURCE_MAP.put("hhccdc.com", "诚成地产"); - SOURCE_MAP.put("jiayuanfangchan.com.cn", "佳缘房产"); - SOURCE_MAP.put("hshdfc.com", "恒达房产"); - SOURCE_MAP.put("zhengdafangchan.com", "衡水正大房产网"); - SOURCE_MAP.put("jyjfdc.com", "居一家房地产"); - SOURCE_MAP.put("dz1fdc.com", "公元地产"); - SOURCE_MAP.put("yaanjq.com", "金桥房介网"); - SOURCE_MAP.put("bzleju.com", "巴中乐居房产网"); - SOURCE_MAP.put("my012.com", "1+2联合不动产"); - SOURCE_MAP.put("517.cn", "517不动产"); - SOURCE_MAP.put("fangchan0455.com", "绥化恋家房产"); - SOURCE_MAP.put("8441111.com", "绥化宜家房产网"); - SOURCE_MAP.put("lixiangw.com", "理想房产"); - SOURCE_MAP.put("hsjsfc.com", "黄山精盛房产"); - SOURCE_MAP.put("zxfc.cn", "置信房产"); - SOURCE_MAP.put("tzjhfcw.com", "泰州房产网_tzjhfcw"); - SOURCE_MAP.put("djfw.com", "大家房产"); - SOURCE_MAP.put("yifan2006.com", "一帆房产"); - SOURCE_MAP.put("dpdc.net.cn", "东鹏地产"); - SOURCE_MAP.put("roboo.com", "芜湖房产"); - SOURCE_MAP.put("nt138.com", "茂名南天地产网"); - SOURCE_MAP.put("yxfqfc.com", "宜兴富强房产"); - SOURCE_MAP.put("999fc.net", "宜兴租房网"); - SOURCE_MAP.put("yxfyfc.com", "宜兴方圆房产中介"); - SOURCE_MAP.put("rafcxx.com", "瑞安房产中介网"); - SOURCE_MAP.put("0831xyfc.com", "欣宜房产"); - SOURCE_MAP.put("yyjbfc.com", "余姚家博房产"); - SOURCE_MAP.put("bdhouse.net", "嘉信房产"); - SOURCE_MAP.put("0754house.com", "佳成房产"); - SOURCE_MAP.put("sthtfc.com", "顺泰泓泰房产"); - SOURCE_MAP.put("stlafc.com", "利安房产"); - SOURCE_MAP.put("wanziqianhong.cn", "万紫千红房产"); - SOURCE_MAP.put("sjjtx.com", "家天下房产"); - SOURCE_MAP.put("c21wlmq.com.cn", "21世纪不动产"); - SOURCE_MAP.put("koofang.com", "酷房网"); - SOURCE_MAP.put("nblide.com", "21世纪不动产_nblide"); - SOURCE_MAP.put("100ks.cn", "百分百房产"); - SOURCE_MAP.put("mytophome.com", "满堂红地产网"); - SOURCE_MAP.put("ecen.com.cn", "伊城地产"); - SOURCE_MAP.put("jtfcw.cn", "金坛房产网"); - SOURCE_MAP.put("house3s.com", "山水房产网"); - SOURCE_MAP.put("519fcw.com", "金坛房产网519fcw"); - SOURCE_MAP.put("liyfc.cn", "溧阳房产网liyfc"); - SOURCE_MAP.put("jtfdc.com", "金坛房产网jtfdc"); - SOURCE_MAP.put("519fcw.com", "金坛房产网519fcw"); - SOURCE_MAP.put("jtfcw.cn", "金坛房产网"); - SOURCE_MAP.put("lyfcw.cn", "溧阳房产信息网"); - SOURCE_MAP.put("liyangf.com", "溧阳房"); - SOURCE_MAP.put("liyfc.cn", "溧阳房产网liyfc"); - SOURCE_MAP.put("1f.cn", "易房"); - SOURCE_MAP.put("0555yi.com", "易房网"); - SOURCE_MAP.put("tmsf.com", "透明售房网"); - SOURCE_MAP.put("house-book", "房谱"); - SOURCE_MAP.put("900fc.com", "温州房产网_900fc"); - SOURCE_MAP.put("577fang.com", "温州房产网"); - SOURCE_MAP.put("zjttdc.com", "天天地产"); - SOURCE_MAP.put("sun0769.com", "东莞阳光网"); - SOURCE_MAP.put("hffd.gov.cn", "合肥市房地产管理局"); - SOURCE_MAP.put("0898gt.com", "三亚房产信息网_0898gt"); - SOURCE_MAP.put("szpl.gov.cn", "深圳房产信息系统"); - SOURCE_MAP.put("liyfc.cn", "溧阳房产网liyfc"); - SOURCE_MAP.put("lyfcw.cn", "溧阳房产信息网"); - SOURCE_MAP.put("house3s.com", "山水房产网"); - SOURCE_MAP.put("dongbeifdc.com", "哈尔滨房地产网dongbeifdc"); - SOURCE_MAP.put("0482home.com", "红城家园网"); - SOURCE_MAP.put("04820482.com", "兴安盟信息港"); - SOURCE_MAP.put("srtong.com", "上饶通房产网"); - SOURCE_MAP.put("xhengshui.com", "衡水易房网"); - SOURCE_MAP.put("baidu0413.com", "抚顺好房子"); - SOURCE_MAP.put("fsfcw.net", "抚顺房产网fsfcw"); - SOURCE_MAP.put("fshfc.cn", "抚顺房产网fshfc"); - SOURCE_MAP.put("0413fc.net", "抚顺房产网0413fc"); - SOURCE_MAP.put("0711ez.cn", "鄂州房产网0711ez"); - SOURCE_MAP.put("fanging.com", "河南房产网fanging"); - SOURCE_MAP.put("yq918.com", "阳泉家园网"); - SOURCE_MAP.put("xnfw.com", "咸宁房网"); - SOURCE_MAP.put("zkloushi.com", "周口楼市网"); - SOURCE_MAP.put("xgrb.cn", "槐荫房产"); - SOURCE_MAP.put("xgfw.cn", "孝感房网"); - SOURCE_MAP.put("jzcool.com", "荆州在线"); - SOURCE_MAP.put("meyfang.com", "米房网"); - SOURCE_MAP.put("jzbdc.com", "荆州不动产"); - SOURCE_MAP.put("0712fang.com", "孝房网"); - SOURCE_MAP.put("jzhfz.com", "荆州好房子网"); - SOURCE_MAP.put("0716fw.com", "荆房网"); - SOURCE_MAP.put("jz6.cc", "荆州第一房产网"); - SOURCE_MAP.put("0738.cc", "0738信息港"); - SOURCE_MAP.put("0738ld.com", "娄底房网"); - SOURCE_MAP.put("yongzhou.com", "永州网"); - SOURCE_MAP.put("0722h.com", "随州好房网"); - SOURCE_MAP.put("szfcol.com", "随州房产在线"); - SOURCE_MAP.put("0722fc.com", "随房网"); - SOURCE_MAP.put("fdc99.com", "永州房地产信息网"); - SOURCE_MAP.put("fdc0737.com", "0737房产网"); - SOURCE_MAP.put("beiww.com", "北纬网"); - SOURCE_MAP.put("zmdfcw.com", "驻马店房产网"); - SOURCE_MAP.put("zmdfcxx.com", "驻马店房产信息网"); - SOURCE_MAP.put("0835.com", "雅安在线"); - SOURCE_MAP.put("gafc8.cn", "租房吧"); - SOURCE_MAP.put("0826fang.com", "广安房产网0826fang"); - SOURCE_MAP.put("dy6c.com", "德阳6城网"); - SOURCE_MAP.put("gafcw.cn", "广安房产网"); - SOURCE_MAP.put("ecz.cn", "易房网ecz"); - SOURCE_MAP.put("xyfdcw.com.cn", "信阳购房网"); - SOURCE_MAP.put("xyfcw.com", "信阳房产网"); - SOURCE_MAP.put("07358.com", "郴房网"); - SOURCE_MAP.put("dyfcw.com", "德阳房产网"); - SOURCE_MAP.put("e0838.com", "住在德阳网"); - SOURCE_MAP.put("msfc114.com", "眉山淘房网"); - SOURCE_MAP.put("ynpew.com", "云南普洱网"); - SOURCE_MAP.put("scsn.cn", "遂宁之窗"); - SOURCE_MAP.put("chongzuobbs.com", "崇左网"); - SOURCE_MAP.put("pefczx.com", "普洱房产咨询网"); - SOURCE_MAP.put("zuojiang.com", "左江网"); - SOURCE_MAP.put("jiulongw.cn", "九龙网"); - SOURCE_MAP.put("brfcw.com", "巴房网"); - SOURCE_MAP.put("39518.com", "潭房网"); - SOURCE_MAP.put("ptfcxx.com", "平潭房产网cxx"); - SOURCE_MAP.put("b0917.com", "宝鸡信息港"); - SOURCE_MAP.put("0634.com", "都市网"); - SOURCE_MAP.put("lwhouse.com", "莱芜房地产网"); - SOURCE_MAP.put("dayou123.com", "宝鸡房产"); - SOURCE_MAP.put("laiwuloushi.com", "莱芜楼市"); - SOURCE_MAP.put("zaozhuangloushi.com", "枣庄楼市"); - SOURCE_MAP.put("sddzz.com", "枣庄视窗"); - SOURCE_MAP.put("my0832.com", "资阳大众网"); - SOURCE_MAP.put("zzfcw.cn", "枣庄房产网"); - SOURCE_MAP.put("zzfcw.com.cn", "枣房网"); - SOURCE_MAP.put("0314fdc.com", "承房网"); - SOURCE_MAP.put("zisai2.com", "紫塞房产网"); - SOURCE_MAP.put("chengdechina.com", "承德房产"); - SOURCE_MAP.put("chzfdc.com", "池州房产生活网"); - SOURCE_MAP.put("0566fc.com", "0566池州房地产"); - SOURCE_MAP.put("chafangwang.com", "CFW查房网"); - SOURCE_MAP.put("songyuanfang.com", "松原购房网"); - SOURCE_MAP.put("ycchinese.com", "伊春炎黄在线"); - SOURCE_MAP.put("0557100.com", "宿州在线"); - SOURCE_MAP.put("0817.net", "南房网"); - SOURCE_MAP.put("365kl.net", "快乐房产"); - SOURCE_MAP.put("bzcm.net", "滨州传媒"); - SOURCE_MAP.put("ggfcxx.com", "贵港房产信息网"); - SOURCE_MAP.put("binfang.com", "滨房网"); - SOURCE_MAP.put("fc0633.com", "日照置业网"); - SOURCE_MAP.put("rzfdc.com", "日照房产网"); - SOURCE_MAP.put("zhangjk.com", "张家口网房产"); - SOURCE_MAP.put("jcok.com.cn", "贺州佳成房产网"); - SOURCE_MAP.put("fc0319.com", "邢台房产网"); - SOURCE_MAP.put("52zjk.cn", "张垣生活网"); - SOURCE_MAP.put("fxw.cc", "阜新房产网fxw"); - SOURCE_MAP.put("fx8888.com", "华博网"); - SOURCE_MAP.put("0435.com", "通化在线"); - SOURCE_MAP.put("0475fang.com", "通辽房地产网"); - SOURCE_MAP.put("aqhouse.com", "安庆房地产交易网"); - SOURCE_MAP.put("fcxgx.com", "房产新干线"); - SOURCE_MAP.put("51258.cn", "亳州房产信息网"); - SOURCE_MAP.put("0579.cn", "浙中在线"); - SOURCE_MAP.put("600258.com", "免中介租房网"); - SOURCE_MAP.put("inlishui.com", "丽水房产公众信息网"); - SOURCE_MAP.put("weiduqu.com", "许昌房产信息网"); - SOURCE_MAP.put("05188.com", "港城网"); - SOURCE_MAP.put("0372.cn", "安阳信息网"); - SOURCE_MAP.put("ganpuwang.com", "赶铺网"); - SOURCE_MAP.put("kfjs.gov.cn", "开封住建局"); - SOURCE_MAP.put("ddfw.cn", "丹东房屋网"); - SOURCE_MAP.put("0523fang.com", "0523泰州房产网"); - SOURCE_MAP.put("0912f.com", "榆林房产信息网"); - SOURCE_MAP.put("9iwn.com", "新渭南房产网"); - SOURCE_MAP.put("liebiao.com", "列表网"); - SOURCE_MAP.put("0359fdc.com", "0359房产网"); - SOURCE_MAP.put("zjol.com.cn", "住在杭州网"); - SOURCE_MAP.put("anjuke.com", "安居客"); - SOURCE_MAP.put("51zupu.com", "我要租铺"); - SOURCE_MAP.put("haopoo.com", "好铺网"); - SOURCE_MAP.put("jinti.com", "今题网"); - SOURCE_MAP.put("czfcw.com", "常州房产网"); - SOURCE_MAP.put("0355fdc.com", "0355房产网"); - SOURCE_MAP.put("baixing.com", "百姓网"); - SOURCE_MAP.put("baidu.com", "百度乐居"); - SOURCE_MAP.put("anjuke.com", "安居客"); - SOURCE_MAP.put("0516.1f.cn", "徐州房产网_0516"); - SOURCE_MAP.put("ganji.com", "赶集网"); - SOURCE_MAP.put("haopoo.com", "好铺网"); - SOURCE_MAP.put("baixing.com", "百姓网"); - SOURCE_MAP.put("baidu.com", "百度乐居"); - SOURCE_MAP.put("anjuke.com", "安居客"); - SOURCE_MAP.put("fang.com", "搜房网"); - SOURCE_MAP.put("ganji.com", "赶集网"); - SOURCE_MAP.put("qd8.com.cn", "快点8"); - SOURCE_MAP.put("jinti.com", "今题网"); - SOURCE_MAP.put("daikan.cn", "带看网"); - SOURCE_MAP.put("baixing.com", "百姓网"); - SOURCE_MAP.put("anjuke.com", "安居客"); - SOURCE_MAP.put("fang.com", "搜房网"); - SOURCE_MAP.put("ganji.com", "赶集网"); - SOURCE_MAP.put("house365.com", "365地产家居网"); - SOURCE_MAP.put("qd8.com.cn", "快点8"); - SOURCE_MAP.put("jinti.com", "今题网"); - SOURCE_MAP.put("daikan.cn", "带看网"); - SOURCE_MAP.put("baixing.com", "百姓网"); - SOURCE_MAP.put("chineseoffice.com.cn", "中国写字楼网"); - SOURCE_MAP.put("58.com", "58同城"); - SOURCE_MAP.put("chineseoffice.com.cn", "中国写字楼"); - SOURCE_MAP.put("58.com", "58同城"); - SOURCE_MAP.put("ganji.com", "赶集"); - SOURCE_MAP.put("58.com", "58同城"); - SOURCE_MAP.put("fang.com", "搜房"); - SOURCE_MAP.put(".gaoyfc", "高邮房产网"); - SOURCE_MAP.put(".byfdc", "宝房网"); - SOURCE_MAP.put("tsfcw.net", "台山房产网"); - SOURCE_MAP.put("epzx.com", "恩平在线"); - SOURCE_MAP.put("heshan.ccoo.cn", "鹤山在线"); - SOURCE_MAP.put("heshanren.com", "鹤山信息港"); - SOURCE_MAP.put("kpfcw.com", "开平房产网"); - SOURCE_MAP.put("kfhome.com", "开封之家房产网"); - SOURCE_MAP.put("kaye.cn", "凯业房源"); - SOURCE_MAP.put("hchouse.net", "海城房产网"); - SOURCE_MAP.put("hcfcw.com", "海城房产"); - SOURCE_MAP.put("3731.cn", "新乡生活网"); - SOURCE_MAP.put("jwb.com.cn", "今晚网"); - SOURCE_MAP.put("baidu.com", "百度乐居"); - SOURCE_MAP.put("centanet.com", "中原地产"); - SOURCE_MAP.put("zufang.com", "租房网"); - SOURCE_MAP.put("hrbslfc.com", "哈尔滨世联房产"); - SOURCE_MAP.put("hrbhouse365.com.cn", "哈尔滨网站房地产"); - SOURCE_MAP.put("01house.cn", "无锡第一房产网"); - SOURCE_MAP.put("jnhouse.com", "济南房产网"); - SOURCE_MAP.put("wxhouse.net", "汉斯房产网"); - SOURCE_MAP.put("51leye.cn", "我要乐业"); - SOURCE_MAP.put("house-book", "房谱"); - SOURCE_MAP.put("0433.tv", "延边房产网"); - SOURCE_MAP.put("0433.tv", "延边房产网"); - SOURCE_MAP.put("66house.com", "房联网"); - SOURCE_MAP.put("0433.tv", "延边房产网"); - SOURCE_MAP.put("ybhfz.com", "延边好房网"); - SOURCE_MAP.put("hfang.cn", "惠房网"); - SOURCE_MAP.put("fdc0760.com", "易搜房产网"); - SOURCE_MAP.put("315fangchan.com", "315房产网"); - SOURCE_MAP.put("0710fz.com", "襄阳房产网"); - SOURCE_MAP.put("xffgj.cn", "襄阳房管局"); - SOURCE_MAP.put("0898gt.com", "三亚房产信息网_0898gt"); - SOURCE_MAP.put("xtfc.gov.cn", "湘潭市房产管理局"); - SOURCE_MAP.put("cityhouse.cn", "城市房产"); - SOURCE_MAP.put("zqfdc.net", "肇庆房地产网"); - SOURCE_MAP.put("stfcj.gov.cn", "汕头房管局"); - SOURCE_MAP.put("lyfff.com", "家在临沂网"); - SOURCE_MAP.put("lyzhujia.com", "临沂住家网"); - SOURCE_MAP.put("zhufon.com", "临沂住房网"); - SOURCE_MAP.put("lpwww.com", "楼盘在线"); - SOURCE_MAP.put("0539zf.com", "临沂找房网"); - SOURCE_MAP.put("ilinyi.net", "爱临沂"); - SOURCE_MAP.put("lywww.com", "临沂在线"); - SOURCE_MAP.put("jz6.cc", "荆州第一房产网"); - SOURCE_MAP.put("0716fw.com", "荆房网"); - SOURCE_MAP.put("linyiren.com", "临沂人房产网"); - SOURCE_MAP.put("jzbdc.com", "荆州不动产"); - SOURCE_MAP.put("jzhfz.com", "荆州好房子网"); - SOURCE_MAP.put("letfind.com", "猎房网"); - SOURCE_MAP.put("cnhouse.com", "寻捕房"); - SOURCE_MAP.put("0312f.cn", "保定房产网"); - SOURCE_MAP.put("0312f.cn", "保定房产网"); - SOURCE_MAP.put("0510f.cn", "无锡房产网_0510f"); - SOURCE_MAP.put("0312fc.com.cn", "保定房产网_0312fc"); - SOURCE_MAP.put("qingdaonews.com", "新闻网房产"); - SOURCE_MAP.put("52youju.com", "优居网"); - SOURCE_MAP.put("xiadu.com", "夏都网"); - SOURCE_MAP.put("0971fc.com", "西房网"); - SOURCE_MAP.put("jzfcw.com", "锦州精品楼盘网"); - SOURCE_MAP.put("jnrx.cc", "济宁房产网jnrx"); - SOURCE_MAP.put("yyjs.gov.cn", "岳阳住房建设网"); - SOURCE_MAP.put("jifcw.com", "济宁房产交易监理处"); - SOURCE_MAP.put("sgmsw.cn", "韶关民声网"); - SOURCE_MAP.put("sclzfc.com.cn", "泸州市房地产市场信息网"); - SOURCE_MAP.put("0830e.com", "泸州房产信息网"); - SOURCE_MAP.put("ly169.cn", "临沂信息港"); - SOURCE_MAP.put("0817.net", "南房网"); - SOURCE_MAP.put("house365.com", "365地产家居网"); - SOURCE_MAP.put("bhsfdc.com", "北海房产网"); - SOURCE_MAP.put("sgfczc.com", "韶关房产之窗"); - SOURCE_MAP.put("changchunfangdichan.com", "长春房地产网"); - SOURCE_MAP.put("hz.cc", "杭州房产网"); - SOURCE_MAP.put("zjol.com.cn", "住在杭州网"); - SOURCE_MAP.put("cd.cc", "成都房产网_cd"); - SOURCE_MAP.put("sd.cn", "青岛房产在线"); - SOURCE_MAP.put("fooju.com.cn", "福居网"); - SOURCE_MAP.put("sina.com.cn", "新浪乐居"); - SOURCE_MAP.put("ynfww.com", "云南房屋网"); - SOURCE_MAP.put("aqhouse.com", "安庆房地产交易网"); - SOURCE_MAP.put("ftan.cn", "房探网"); - SOURCE_MAP.put("hljfdc.net", "黑龙江房产网"); - SOURCE_MAP.put("lejiazhiye.cn", "乐家房产网"); - SOURCE_MAP.put("fzhouse.com.cn", "福建房产信息网"); - SOURCE_MAP.put("gzcjy128.com", "创家易"); - SOURCE_MAP.put("szpl.gov.cn", "深圳房产信息系统"); - SOURCE_MAP.put("cnool.net", "东方热线房产网"); - SOURCE_MAP.put("aqhouse.net", "安庆市房地产交易中心"); - SOURCE_MAP.put("haofz.com", "好房子"); - SOURCE_MAP.put("jzsfdc.gov.cn", "锦州市房地产信息网"); - SOURCE_MAP.put("0311fang.com", "石房网"); - SOURCE_MAP.put("h0591.com", "海西房产网"); - SOURCE_MAP.put("home77.com", "房讯网"); - SOURCE_MAP.put("365jilin.com", "吉和房产"); - SOURCE_MAP.put("yc38.com", "扬成网"); - SOURCE_MAP.put("jifcw.cn", "济宁商品房网上备案"); - SOURCE_MAP.put("sgjsj.gov.cn", "韶关房产信息网"); - SOURCE_MAP.put("xmfc.com", "厦门房产网"); - SOURCE_MAP.put("bffdc.gov.cn", "平顶山房管监管查询"); - SOURCE_MAP.put("zhongfun.cn", "中房在线"); - SOURCE_MAP.put("haowu.cn", "好屋中国"); - SOURCE_MAP.put("wuxifc.cn", "无锡房产网"); - SOURCE_MAP.put("ytfcjy.com", "烟台房产交易网"); - SOURCE_MAP.put("lzfc.com.cn", "兰州商品房"); - SOURCE_MAP.put("ddfc.com.cn", "丹东房产交易网"); - SOURCE_MAP.put("gzfcj.gov.cn", "赣州房管局"); - SOURCE_MAP.put("f024.com", "沈阳房地产网"); - SOURCE_MAP.put("0736house.com", "常德买房网"); - SOURCE_MAP.put("beihaire.gov.cn", "北海房地产"); - SOURCE_MAP.put("0736fdc.com", "常德市房地产信息网"); - SOURCE_MAP.put("changdefang.com", "常德房产信息网"); - SOURCE_MAP.put("ncfdj.gov.cn", "南充市房地产管理局"); - SOURCE_MAP.put("laho.gov.cn", "阳光家缘"); - SOURCE_MAP.put("18qiang.com", "十八腔"); - SOURCE_MAP.put("pjsfw.com", "浦江搜房网"); - SOURCE_MAP.put("ykhfw.com", "永康好房网"); - SOURCE_MAP.put("tsfcxx.com", "唐山房产信息网"); - SOURCE_MAP.put("yzfdc.cn", "扬州房地产信息网"); - SOURCE_MAP.put("0710hf.com", "襄阳好房网"); - SOURCE_MAP.put("huizhou.gov.cn", "惠州房管局"); - SOURCE_MAP.put("tyfdc.gov.cn", "太原房产信息网"); - SOURCE_MAP.put("bbfcjyw.com", "蚌埠房产交易网"); - SOURCE_MAP.put("400114.com", "114搜房网"); - SOURCE_MAP.put("ccfdw.gov.cn", "长春房产网"); - SOURCE_MAP.put("ptajw.com", "莆田安居网"); - SOURCE_MAP.put("zzfc.com", "株洲房产信息网"); - SOURCE_MAP.put("qybc.cn", "百川房产网"); - SOURCE_MAP.put("0312fc.com.cn", "保定房产网_0312fc"); - SOURCE_MAP.put("h0758.net", "肇房网"); - SOURCE_MAP.put("fdc.com", "房地产信息"); - SOURCE_MAP.put("ftw.com", "房团网"); - SOURCE_MAP.put("czftw.com", "常州房团网"); - SOURCE_MAP.put("baidu.com", "百度乐居"); - SOURCE_MAP.put("jiazhuly.com", "家住临沂"); - SOURCE_MAP.put("zznews.gov.cn", "株洲新闻网"); - SOURCE_MAP.put("bdfdc.net", "保定房产交易中心"); - SOURCE_MAP.put("ythouse.com", "烟台房地产网"); - SOURCE_MAP.put("jzfc.gov.cn", "荆州市房管局"); - SOURCE_MAP.put("jz6.com", "荆州楼盘网"); - SOURCE_MAP.put("hnzz.cc", "株洲楼市网"); - SOURCE_MAP.put("qzfc.com", "大泉州房产网"); - SOURCE_MAP.put("zghouse.net", "中国房地产网"); - SOURCE_MAP.put("qzfdcgl.com", "衢州市房地产管理处"); - SOURCE_MAP.put("ajzfw.com", "安吉房产网"); - SOURCE_MAP.put("rexian.net.cn", "武汉热线房产网"); - SOURCE_MAP.put("zjcxfc.cn", "长兴透明售房网"); - SOURCE_MAP.put("ajrjw.cn", "安吉人居网"); - SOURCE_MAP.put("jx.123fc.com", "123房产网"); - SOURCE_MAP.put("qd8.com.cn", "快点8"); - SOURCE_MAP.put("123sfw.cn", "视房网"); - SOURCE_MAP.put("jtfdc.com.cn", "金坛房地产信息网"); - SOURCE_MAP.put("fang.tm", "房咖"); - SOURCE_MAP.put("czfdc.com.cn", "常州商品房信息"); - SOURCE_MAP.put("x3fang.com", "香山房产网"); - SOURCE_MAP.put("tuitui99.com", "推推99房产网"); - SOURCE_MAP.put("baixing.com", "百姓网"); - SOURCE_MAP.put("xcsfcjyw.com", "许昌房产交易信息网"); - SOURCE_MAP.put("douanju.com", "都安居"); - SOURCE_MAP.put("ccoo.cn", "城市中国网"); - SOURCE_MAP.put("o912.com", "榆林房产网"); - SOURCE_MAP.put("yes515.com", "515房产网"); - SOURCE_MAP.put("fayo.net", "飞扬网"); - SOURCE_MAP.put("lejuhouses.com", "渭南乐居网"); - SOURCE_MAP.put("zjfgj.cn", "湛江房管局"); - SOURCE_MAP.put("ylfcxx.com", "榆林房产"); - SOURCE_MAP.put("tjfdc.gov.cn", "天津市国土资源和房屋管理局政务门户"); - SOURCE_MAP.put("baijuyi.com.cn", "百居易"); - SOURCE_MAP.put("hyfc365.com", "衡阳房产政务网"); - SOURCE_MAP.put("wnfcw.cn", "渭南房产网"); - SOURCE_MAP.put("ycsfdc.com", "运城市房信网"); - SOURCE_MAP.put("kfang.com.cn", "看房网"); - SOURCE_MAP.put("0359sh.com", "生活网"); - SOURCE_MAP.put("ordosfg.gov.cn", "鄂尔多斯房产局"); - SOURCE_MAP.put("0470jiaxing.com", "家兴房产"); - SOURCE_MAP.put("sxhouse.gov.cn", "绍兴房管局信息网"); - SOURCE_MAP.put("hbczfdc.gov.cn", "沧州市房产信息网"); - SOURCE_MAP.put("ksfc.gov.cn", "昆山房产信息网"); - SOURCE_MAP.put("zjfdc.gov.cn", "镇江房产信息网"); - SOURCE_MAP.put("sdchina.com", "中国山东网"); - SOURCE_MAP.put("haozu.com", "好租网"); - SOURCE_MAP.put("sjzfgj.gov.cn", "石家庄房管局"); - SOURCE_MAP.put("tjfdc.com.cn", "天津房产信息网"); - SOURCE_MAP.put("0772fang.com", "柳房网"); - SOURCE_MAP.put("fsjw.gov.cn", "佛山房地产网"); - SOURCE_MAP.put("dg.gov.cn", "东莞房产信息网"); - SOURCE_MAP.put("yuefc.com", "阅房网"); - SOURCE_MAP.put("spfcj.gov.cn", "四平市住房和城乡建设局"); - SOURCE_MAP.put("wnfdc.com", "渭南房地产信息网"); - SOURCE_MAP.put("lousw.com", "盐城房产信息网"); - SOURCE_MAP.put("xinnanyang.com", "南都网"); - SOURCE_MAP.put("zhzgj.gov.cn", "珠海商品房销售网"); - SOURCE_MAP.put("jyfg.cn", "揭阳房管局"); - SOURCE_MAP.put("zbzzfdc.gov.cn", "淄博房产信息网"); - SOURCE_MAP.put("lianm.com", "大象房产网"); - SOURCE_MAP.put("maoming.gov.cn", "茂名房管局"); - SOURCE_MAP.put("wftzfc.com", "天泽房产网"); - SOURCE_MAP.put("js.cn", "昆山房产网"); - SOURCE_MAP.put("51fdc.com", "无忧房网"); - SOURCE_MAP.put("shangdu.com", "商都网"); - SOURCE_MAP.put("lffx.org", "临汾房产网"); - SOURCE_MAP.put("xycj.gov.cn", "咸阳住房规划局"); - SOURCE_MAP.put("lnfcw.net", "辽宁房产网"); - SOURCE_MAP.put("zgfdc.gov.cn", "自贡房管局"); - SOURCE_MAP.put("nyloushi.com", "南阳楼市"); - SOURCE_MAP.put("http://www.myfdc.com.cn/", "绵阳房地产"); - SOURCE_MAP.put("www.51banban.com", "办办网"); - SOURCE_MAP.put("51258.cn", "亳州房产信息网"); - SOURCE_MAP.put("ahbzfdc.com", "亳州市住宅与房地产信息网"); - SOURCE_MAP.put("binfang.com", "滨房网"); - SOURCE_MAP.put("cdfgj.gov.cn", "成都市房管局"); - SOURCE_MAP.put("bzfccs.com", "滨州房产超市网"); - SOURCE_MAP.put("bzcm.net", "滨州传媒"); - SOURCE_MAP.put("www.kmhouse.org", "昆明市房产信息网"); - SOURCE_MAP.put("yskfc.com", "溧阳顺开房产网"); - SOURCE_MAP.put("hualongxiang.com", "化龙巷"); - SOURCE_MAP.put("dyfc.net", "东营房产网"); - SOURCE_MAP.put("dyfc.gov.cn", "东营住宅与房地产信息网"); - SOURCE_MAP.put("0597ok.com", "龙岩房地产联合网"); - SOURCE_MAP.put("qinzf.com", "钦州住房网"); - SOURCE_MAP.put("5j5z.cn", "小袋鼠网"); - SOURCE_MAP.put("lanfw.com", "蓝房网"); - SOURCE_MAP.put("yxfdc.com", "玉溪房地产信息网"); - SOURCE_MAP.put("fdc.cn", "漳州房地产"); - SOURCE_MAP.put("596fc.com", "596漳州房产网"); - SOURCE_MAP.put("0596fc.com", "漳州房产在线"); - SOURCE_MAP.put("fangdd.com", "房多多"); - SOURCE_MAP.put("bianmin369.com", "便民369"); - SOURCE_MAP.put("wxdszy.com", "鼎盛置业"); - SOURCE_MAP.put("fangyi.com", "房一网"); - SOURCE_MAP.put("enshifdc.com", "恩施房网"); - SOURCE_MAP.put("youfangw.com", "游房网"); - SOURCE_MAP.put("esfdc.cn", "恩施房产网esfdc.cn"); - SOURCE_MAP.put("lingd.cc", "文山房地产网"); - SOURCE_MAP.put("dhfdc.net.cn", "德宏房地产"); - SOURCE_MAP.put("dhfcw.com", "德宏房产门户"); - SOURCE_MAP.put("msuccessgroup.com", "一手房信息监测系统"); - SOURCE_MAP.put("njfang.net", "怒江房产网"); - SOURCE_MAP.put("qxnfc.cn", "黔西南房产网"); - SOURCE_MAP.put("kuyiso.com", "酷易搜"); - SOURCE_MAP.put("bazhou5.com", "巴州网"); - SOURCE_MAP.put("0854fcw.com", "黔南房产网"); - SOURCE_MAP.put("qnzfc.com", "黔南房产"); - SOURCE_MAP.put("haidong360.com", "海东房地产信息网"); - SOURCE_MAP.put("linfang.cc", "临夏房产网"); - SOURCE_MAP.put("53xj.com", "新疆房产网"); - SOURCE_MAP.put("xyzc.cn", "兴义之窗"); - SOURCE_MAP.put("0941gn.com", "甘南州生活网"); - SOURCE_MAP.put("xbaixing.com", "小百姓网"); - SOURCE_MAP.put("98znz.com", "98指南针"); - SOURCE_MAP.put("xinxiniao.com", "信息鸟"); - SOURCE_MAP.put("fcqdn.com", "黔东南爱房网"); - SOURCE_MAP.put("klfcw.com", "凯里房产网"); - SOURCE_MAP.put("qdnzfc.cn", "黔东南房产网"); - SOURCE_MAP.put("58.com", "58同城"); - SOURCE_MAP.put("rkzzx.com", "日客则在线"); - SOURCE_MAP.put("qionghaif.com", "琼海房产网"); - SOURCE_MAP.put("home898.com", "海南房产信息网"); - SOURCE_MAP.put("qionghaifc.com", "琼海房产"); - SOURCE_MAP.put("qhbmw.net", "琼海便民网"); - SOURCE_MAP.put("qionghai7.com", "海房网二手房"); - SOURCE_MAP.put("hnfccs.com", "海南房产超市网"); - SOURCE_MAP.put("qiongzhongfdc.com", "琼中房产网"); - SOURCE_MAP.put("dinganfc.com", "定安房产网"); - SOURCE_MAP.put("wfang.cn", "万房网"); - SOURCE_MAP.put("dinganfc.com", "定安房产网"); - SOURCE_MAP.put("dinganfdc.com", "定安房产网dinganfdc"); - SOURCE_MAP.put("cmfdc.com.cn", "澄迈房地产网"); - SOURCE_MAP.put("lingaofdc.com", "临高房地产网"); - SOURCE_MAP.put("gfw0898.com", "海南购房网"); - SOURCE_MAP.put("fangfang.net", "房房网-海南"); - SOURCE_MAP.put("100fangchan.com", "百年房产网"); - SOURCE_MAP.put("hnlefang.com", "乐房网-海南"); - SOURCE_MAP.put("hnlefang.com", "乐房网-海南"); - SOURCE_MAP.put("0898ldfc.com", "海南蓝岛房产网"); - SOURCE_MAP.put("dongffc.cn", "东方房产网"); - SOURCE_MAP.put("dongfang6.com", "点击东方"); - SOURCE_MAP.put("dongfang0898.com", "东方在线"); - SOURCE_MAP.put("snjfw.com", "神农架百事通"); - SOURCE_MAP.put("xinfang400.com", "欣房网"); - SOURCE_MAP.put("snjfw.com", "神农架百事通"); - SOURCE_MAP.put("ludedc.com", "绿德地产网"); - SOURCE_MAP.put("isnj.cn", "神农架门户网"); - SOURCE_MAP.put("isnj.cn", "神农架门户网"); - SOURCE_MAP.put("dadou.com", "神农架大豆生活网"); - SOURCE_MAP.put("wcfcw.net", "海房网二手"); - SOURCE_MAP.put("afangw.com", "安房网"); - SOURCE_MAP.put("hnesf.net", "海南二手房网"); - SOURCE_MAP.put("ihfang.com", "爱好房网"); - SOURCE_MAP.put("maodong8.com", "猫冬网"); - SOURCE_MAP.put("hinews.cn", "地产海南"); - SOURCE_MAP.put("mf528.com", "海南买房网"); - SOURCE_MAP.put("baishafc.com", "白沙房地产网"); - SOURCE_MAP.put("hfunzx.com", "海房在线"); - SOURCE_MAP.put("hfunzx.com", "海房在线"); - SOURCE_MAP.put("0898meituan.com", "美房团"); - SOURCE_MAP.put("0898f.com", "观房网"); - SOURCE_MAP.put("hnyouju.com", "临高房产网hnyouju.com"); - SOURCE_MAP.put("365hfw.com", "365海房网"); - SOURCE_MAP.put("chengmaidc.com", "澄迈房产网"); - SOURCE_MAP.put("xj.cn", "新疆网"); - SOURCE_MAP.put("5douy.com", "我都有"); - SOURCE_MAP.put("xamfcxx.com", "兴安盟房产信息网"); - SOURCE_MAP.put("f391.com", "济源房产网"); - SOURCE_MAP.put("f0482.com", "兴安盟房地产网"); - SOURCE_MAP.put("xuanhuajie.com", "济源信息网"); - SOURCE_MAP.put("souyi.cc", "搜易网"); - SOURCE_MAP.put("jyloushi.com", "济源楼市网"); - SOURCE_MAP.put("fczx.com", "中国房产在线"); - SOURCE_MAP.put("enshifdc.com", "恩施房网"); - SOURCE_MAP.put("qxnfdc.cn", "黔西南房地产网"); - SOURCE_MAP.put("qxnfc.cn", "黔西南房产网"); - SOURCE_MAP.put("szfdc.gov.cn", "深圳市规划和国土资源网"); - SOURCE_MAP.put("yinuo1000.com", "一诺房产网"); - SOURCE_MAP.put("xhengshui.com", "衡水易房网"); - SOURCE_MAP.put("hsfang.cn", "衡水房客"); - SOURCE_MAP.put("52zjk.cn", "张垣生活网"); - SOURCE_MAP.put("zjkhome.net", "张家口楼市网"); - SOURCE_MAP.put("zjk169.net", "张家口楼盘网"); - SOURCE_MAP.put("wxhouse.com", "无锡房地产市场网"); - SOURCE_MAP.put("zhangjk.com", "张家口网房产"); - SOURCE_MAP.put("ohqly.com", "千里眼"); - SOURCE_MAP.put("xyzc.cn", "兴义之窗"); - SOURCE_MAP.put("fdc0859.com", "兴义房地产网"); - SOURCE_MAP.put("0854fcw.com", "黔南房产网"); - SOURCE_MAP.put("qnzfc.com", "黔南房产"); - SOURCE_MAP.put("duyunfcw.com", "都匀房产网"); - SOURCE_MAP.put("wsfcw.cc", "文山房产网"); - SOURCE_MAP.put("dhfcw.com", "德宏房产门户"); - SOURCE_MAP.put("linfang.cc", "临夏房产网"); - SOURCE_MAP.put("gannanzhou.com.cn", "甘南之窗"); - SOURCE_MAP.put("gnzxxw.com", "甘南信息网"); + SOURCE_MAP.put("hutaihu.com", "澶箹缃�"); + SOURCE_MAP.put("sxol.com", "缁嶅叴鎴夸骇鍦ㄧ嚎"); + SOURCE_MAP.put("zsxxg.com", "鑸熷北淇℃伅娓�"); + SOURCE_MAP.put("mfmf100.com", "ESE鐧炬偊澶ч��"); + SOURCE_MAP.put("szfmall.com", "鑻忓窞鍥㈡埧缃�"); + SOURCE_MAP.put("wwfcw.com", "姝﹀▉浜屾墜鎴跨綉"); + SOURCE_MAP.put("zyhouse.com.cn", "閬典箟鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("0853fdc.com", "0853鎴夸骇缃�"); + SOURCE_MAP.put("0915home.com", "瀹夊悍鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("jzfcw.com", "閿﹀窞绮惧搧妤肩洏缃�"); + SOURCE_MAP.put("jzhome.cn", "閿﹀窞鎴夸骇缃�"); + SOURCE_MAP.put("0559fc.com", "榛勫北鎴夸骇缃�"); + SOURCE_MAP.put("tl8.com.cn", "閾佸箔鎴夸骇缃�"); + SOURCE_MAP.put("thmzfc.com", "鏄庣彔鎴夸骇缃�"); + SOURCE_MAP.put("xibuwu.com", "瑗块儴灞�"); + SOURCE_MAP.put("goufanggo.net", "宀抽槼璐埧缃�"); + SOURCE_MAP.put("52zjk.cn", "寮犲灒鐢熸椿缃�"); + SOURCE_MAP.put("0817.net", "鍗楁埧缃�"); + SOURCE_MAP.put("0419.cn", "杈介槼缃�"); + SOURCE_MAP.put("zzfcw.com.cn", "鏋f埧缃�"); + SOURCE_MAP.put("m3fc.com", "鐪夊北鎴夸骇缃�"); + SOURCE_MAP.put("0835.com", "闆呭畨鍦ㄧ嚎"); + SOURCE_MAP.put("zmdfcxx.com", "椹婚┈搴楁埧浜т俊鎭綉"); + SOURCE_MAP.put("fdc0737.com", "0737鎴夸骇缃�"); + SOURCE_MAP.put("anjia8.com", "瀹夊鍚�"); + SOURCE_MAP.put("haofz.com", "濂芥埧瀛�"); + SOURCE_MAP.put("ylfcxx.com", "姒嗘灄鎴夸骇"); + SOURCE_MAP.put("qinzf.com", "閽﹀窞浣忔埧缃�"); + SOURCE_MAP.put("nyloushi.com", "鍗楅槼妤煎競"); + SOURCE_MAP.put("nyfang.cn", "鍗楅槼鎴垮湴浜�"); + SOURCE_MAP.put("xinnanyang.com", "鍗楅兘缃�"); + SOURCE_MAP.put("0377fw.com", "鍗楅槼鎴夸骇"); + SOURCE_MAP.put("lyfff.com", "瀹跺湪涓存矀缃�"); + SOURCE_MAP.put("zhufon.com", "涓存矀浣忔埧缃�"); + SOURCE_MAP.put("ly169.cn", "涓存矀淇℃伅娓�"); + SOURCE_MAP.put("wuzhousky.com", "姊у窞鏃剁┖缃�"); + SOURCE_MAP.put("dezhoudaily.com", "寰峰窞濂芥埧缃�"); + SOURCE_MAP.put("591fcw.cn", "鎴戝氨瑕佹埧浜х綉"); + SOURCE_MAP.put("0475fang.com", "閫氳窘鎴垮湴浜х綉"); + SOURCE_MAP.put("zhangjk.com", "寮犲鍙g綉鎴夸骇"); + SOURCE_MAP.put("zjk169.net", "寮犲鍙fゼ鐩樼綉"); + SOURCE_MAP.put("rzfdc.com", "鏃ョ収鎴夸骇缃�"); + SOURCE_MAP.put("rzloupan.com", "鏃ョ収妤肩洏缃�"); + SOURCE_MAP.put("bzfccs.com", "婊ㄥ窞鎴夸骇瓒呭競缃�"); + SOURCE_MAP.put("0566fc.com", "0566姹犲窞鎴垮湴浜�"); + SOURCE_MAP.put("0917fdc.com", "瀹濋浮鎴夸骇缃�"); + SOURCE_MAP.put("0634.com", "閮藉競缃�"); + SOURCE_MAP.put("brfcw.com", "宸存埧缃�"); + SOURCE_MAP.put("0596fc.com", "婕冲窞鎴夸骇鍦ㄧ嚎"); + SOURCE_MAP.put("swfce.cn", "姹曞熬鎴夸骇缃�"); + SOURCE_MAP.put("0825fang.com", "0825鎴夸骇缃�"); + SOURCE_MAP.put("yafangke.com", "闆呮埧瀹�"); + SOURCE_MAP.put("scsn.cn", "閬傚畞涔嬬獥"); + SOURCE_MAP.put("fdc99.com", "姘稿窞鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("suifun.cn", "闅忔埧淇℃伅缃�"); + SOURCE_MAP.put("0716fw.com", "鑽嗘埧缃�"); + SOURCE_MAP.put("jzhfz.com", "鑽嗗窞濂芥埧瀛愮綉"); + SOURCE_MAP.put("jzbdc.com", "鑽嗗窞涓嶅姩浜�"); + SOURCE_MAP.put("xgfw.cn", "瀛濇劅鎴跨綉"); + SOURCE_MAP.put("lehuozaixian.com", "涔愭椿鍦ㄧ嚎"); + SOURCE_MAP.put("kkfcw.com", "鐪嬬湅鎴夸骇缃�"); + SOURCE_MAP.put("ezfcw.cn", "閯傚窞鎴夸骇缃慹zfcw"); + SOURCE_MAP.put("0359fdc.com", "0359鎴夸骇缃�"); + SOURCE_MAP.put("0355fdc.com", "0355鎴夸骇缃�"); + SOURCE_MAP.put("kfang.com.cn", "鐪嬫埧缃�"); + SOURCE_MAP.put("0413fc.net", "鎶氶『鎴夸骇缃�0413fc"); + SOURCE_MAP.put("fshfc.cn", "鎶氶『鎴夸骇缃慺shfc"); + SOURCE_MAP.put("yjwn.cn", "鏄撳眳娓崡"); + SOURCE_MAP.put("726000.net", "鍟嗘礇鎴夸骇缃�"); + SOURCE_MAP.put("9iwn.com", "鏂版腑鍗楁埧浜х綉"); + SOURCE_MAP.put("lejuhouses.com", "娓崡涔愬眳缃�"); + SOURCE_MAP.put("jxpxf.cn", "钀嶄埂鎴夸骇缃�"); + SOURCE_MAP.put("xc0561.com", "鐩稿煄鎴夸骇缃�"); + SOURCE_MAP.put("yinuo1000.com", "涓�璇烘埧浜х綉"); + SOURCE_MAP.put("c0798.com", "鏅痉闀囦拱鎴跨綉"); + SOURCE_MAP.put("0429b.com", "钁姦宀涙埧鍦颁骇缃�0429b"); + SOURCE_MAP.put("ehuludao.com", "钁姦宀涘湪绾�"); + SOURCE_MAP.put("jiningloushi.com", "娴庡畞妤煎競"); + SOURCE_MAP.put("jnzx.net.cn", "娴庡畞鍦ㄧ嚎"); + SOURCE_MAP.put("jnrx.cc", "娴庡畞鎴夸骇缃慾nrx"); + SOURCE_MAP.put("0597ok.com", "榫欏博鎴垮湴浜ц仈鍚堢綉"); + SOURCE_MAP.put("liaochengloushi.com", "鑱婂煄妤煎競"); + SOURCE_MAP.put("liaofw.com", "鑱婃埧缃憀iaofw"); + SOURCE_MAP.put("0832h.com", "鍐呮睙鎴夸氦缃�"); + SOURCE_MAP.put("d0598.com", "涓夋槑鎴夸骇缃慸0598"); + SOURCE_MAP.put("5j5z.cn", "灏忚榧犵綉"); + SOURCE_MAP.put("0598f.cn", "涓夋槑鎴夸骇缃�0598f"); + SOURCE_MAP.put("10fang.com", "鍗佹埧缃�"); + SOURCE_MAP.put("onfun.net", "鎴夸骇鍦ㄧ嚎onfun"); + SOURCE_MAP.put("syfang.net", "鍗佸牥鎴夸骇缃憇yfang"); + SOURCE_MAP.put("0563fang.org", "0563鎴夸骇缃�"); + SOURCE_MAP.put("xykanfang.com", "鏂颁綑鐪嬫埧缃�"); + SOURCE_MAP.put("jxdcw.com", "鏂颁綑鍦颁骇缃�"); + SOURCE_MAP.put("0701.com", "楣版江鎴夸骇缃�0701"); + SOURCE_MAP.put("nthaohe.com", "婵犳渤缃�"); + SOURCE_MAP.put("xzloushi.cn", "寰愬窞妤煎競"); + SOURCE_MAP.put("czfdc.com", "甯告埧缃�"); + SOURCE_MAP.put("pcls.com.cn", "褰煄妤煎競缃�"); + SOURCE_MAP.put("yzfyw.com", "鎵窞鎴挎簮缃�"); + SOURCE_MAP.put("0515house.cn", "鐩愬煄绗竴鎴夸骇缃�"); + SOURCE_MAP.put("sqanju.com", "瀹夊眳缃�"); + SOURCE_MAP.put("lygfdc.com", "杩炰簯娓埧鍦颁骇缃�"); + SOURCE_MAP.put("gj0511.com", "闀囨睙閫涜缃�"); + SOURCE_MAP.put("jwb.com.cn", "浠婃櫄缃�"); + SOURCE_MAP.put("tangrenju.net", "鍞愪汉灞�"); + SOURCE_MAP.put("qf101.com", "闈掓埧101"); + SOURCE_MAP.put("52youju.com", "浼樺眳缃�"); + SOURCE_MAP.put("zhijinfc.com", "娌氭触鎴夸骇缃�"); + SOURCE_MAP.put("gzre.com", "璐甸槼鎴垮湴浜т氦鏄撶綉"); + SOURCE_MAP.put("xjfangwu.com", "鏂扮枂鎴垮眿缃�"); + SOURCE_MAP.put("kmfcw.com", "鏄嗘槑鎴夸骇缃�"); + SOURCE_MAP.put("bxgfw.com", "鐧惧璐埧缃�"); + SOURCE_MAP.put("syinfo.com.cn", "娌堥槼鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("house-cc.com", "闀挎槬鎴夸骇鍦ㄧ嚎"); + SOURCE_MAP.put("house-jn.com", "娴庡崡鎴夸骇鍦ㄧ嚎"); + SOURCE_MAP.put("f024.com", "娌堥槼鎴垮湴浜х綉"); + SOURCE_MAP.put("gofng.com", "璐埧缃慱gofng"); + SOURCE_MAP.put("xnhaofang.com", "瑗垮畞濂芥埧缃�"); + SOURCE_MAP.put("512888.com", "鑻忓窞鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("zhaoju.com.cn", "鎵惧眳缃�"); + SOURCE_MAP.put("0453fdc.com", "0453鎴夸骇缃�"); + SOURCE_MAP.put("baihuwang.com", "鐧炬箹缃�"); + SOURCE_MAP.put("ycchinese.com", "浼婃槬鐐庨粍鍦ㄧ嚎"); + SOURCE_MAP.put("jmsfdc.net", "浣虫湪鏂埧鍦颁骇缃�"); + SOURCE_MAP.put("0467fc.com", "楦¤タ鎴夸骇缃�"); + SOURCE_MAP.put("hao0469.com", "鍙岄腑灞遍兘甯傜綉"); + SOURCE_MAP.put("qthhz.com", "浜掍紬鎴夸骇"); + SOURCE_MAP.put("i0456.com", "榛戞渤闂ㄦ埛缃�"); + SOURCE_MAP.put("hgxxg.com", "楣ゅ矖淇℃伅娓�"); + SOURCE_MAP.put("qthfc.com", "涓冨彴娌虫埧浜х綉"); + SOURCE_MAP.put("dqytw.com", "澶у簡鎴夸骇缃�"); + SOURCE_MAP.put("buscx.cn", "楣ゅ矖鍒嗙被淇℃伅缃�"); + SOURCE_MAP.put("qitaihe8.com", "涓冨彴娌充簩鎵嬫埧"); + SOURCE_MAP.put("jfw360.com", "浣虫埧缃�"); + SOURCE_MAP.put("0457123.com", "澶у叴瀹夊箔淇℃伅缃�"); + SOURCE_MAP.put("0996fang.com", "姊ㄥ煄鎴夸骇缃�"); + SOURCE_MAP.put("bzfcw.com.cn", "宸村窞鎴夸骇缃�"); + SOURCE_MAP.put("bazhou5.com", "宸村窞缃�"); + SOURCE_MAP.put("bazhou163.com", "宸村窞163.com"); + SOURCE_MAP.put("bz.cn", "宸村窞鍦ㄧ嚎"); + SOURCE_MAP.put("ibazhou.com.cn", "澶у懆淇℃伅缃�"); + SOURCE_MAP.put("balagzi.com", "宸撮優缃�"); + SOURCE_MAP.put("blxxw.com", "鍗氫箰淇℃伅缃�"); + SOURCE_MAP.put("ylnet.com.cn", "缁挎渤璋�"); + SOURCE_MAP.put("hm169.com", "鍝堝瘑缃�"); + SOURCE_MAP.put("hm35.cn", "鍝堝瘑鍟嗗姟缃�"); + SOURCE_MAP.put("2ks.com.cn", "鍠�浠�缃�"); + SOURCE_MAP.put("cj118114.com", "鏄屽悏鐢熸椿缃�"); + SOURCE_MAP.put("cjxxg.com", "鏄屽悏淇℃伅娓�"); + SOURCE_MAP.put("hhzzx.com", "绾㈡渤宸炲湪绾�"); + SOURCE_MAP.put("0955fc.com", "涓崼鎴夸骇缃�"); + SOURCE_MAP.put("hzfdc88.com", "璐哄窞鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("598fcw.com", "杈芥簮鎴夸骇缃�"); + SOURCE_MAP.put("tcfcw.net", "閾滃窛鎴夸骇缃�"); + SOURCE_MAP.put("nnddw.com", "瀹佸崡澶у湴缃�"); + SOURCE_MAP.put("0954fc.com", "鍥哄師鎴夸骇缃�0954fc"); + SOURCE_MAP.put("haidong360.com", "娴蜂笢鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("f0482.com", "鍏村畨鐩熸埧鍦颁骇缃�"); + SOURCE_MAP.put("xingan123.com", "鍏村畨123缃�"); + SOURCE_MAP.put("citygf.com", "骞夸經閮藉競缃�"); + SOURCE_MAP.put("0757fc.com", "浣涘北鎴垮湴浜ц祫璁綉"); + SOURCE_MAP.put("0757home.com", "浣涘北鎴垮眿缃�"); + SOURCE_MAP.put("qzbbs.com", "灏忛奔鎴夸骇_qzbbs"); + SOURCE_MAP.put("lyd.com.cn", "娲涢槼鎴夸骇"); + SOURCE_MAP.put("tzfc.cn", "鍙板窞鎴夸骇缃慱tzfc"); + SOURCE_MAP.put("zhuhaifc.com", "鐝犳捣鎴夸骇缃�"); + SOURCE_MAP.put("tzlsw.cn", "鍙板窞妤煎競缃�"); + SOURCE_MAP.put("0379city.com", "娲涢槼鎴夸骇_0379city"); + SOURCE_MAP.put("fff01.com", "椴佷腑绗竴鎴夸骇缃�"); + SOURCE_MAP.put("foryoo.cn", "娉夊窞鎴垮弸缃�"); + SOURCE_MAP.put("fang33.com", "鎴跨背缃�"); + SOURCE_MAP.put("66fc.com", "涓北鎴夸骇缃�"); + SOURCE_MAP.put("qhdr.com", "绉︾殗宀涙柊闂荤綉鎴夸骇"); + SOURCE_MAP.put("veryhome.com", "濞佹捣鎴垮湴浜х綉"); + SOURCE_MAP.put("3xgd.com", "鍩庡競瀹跺洯"); + SOURCE_MAP.put("0759cctv.com", "瀹舵埧缃�"); + SOURCE_MAP.put("0750fw.com", "姹熼棬鎴跨綉"); + SOURCE_MAP.put("fj360.com", "鎴块泦缃�"); + SOURCE_MAP.put("hyfdcw.com", "琛¢槼鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("fc752.com", "鎯犲窞鎴夸骇缃慱fc752"); + SOURCE_MAP.put("zzz4.com", "鏍床鍦ㄧ嚎"); + SOURCE_MAP.put("jhhouse.com.cn", "姹熸樊鎴垮湴浜х綉"); + SOURCE_MAP.put("0797f.com", "璧e窞妤煎競缃�"); + SOURCE_MAP.put("990792.com", "涔濇睙闂ㄦ埛缃�"); + SOURCE_MAP.put("51mam.com", "鍖呭ご鎴夸骇缃�"); + SOURCE_MAP.put("btfdcxx.com", "鍖呭ご鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("0452e.com", "楣ゅ煄妤肩洏缃�"); + SOURCE_MAP.put("8888667.com", "浜夸韩鐢熸椿缃�"); + SOURCE_MAP.put("0663f.com", "鎻槼鎴跨綉"); + SOURCE_MAP.put("gdmm.com", "鑼傚悕鍦ㄧ嚎"); + SOURCE_MAP.put("9ihome.com", "鏂拌担宸炴埧浜х綉"); + SOURCE_MAP.put("masfdc.gov.cn", "椹瀺灞辨埧浜т俊鎭綉"); + SOURCE_MAP.put("lygfcj.gov.cn", "杩炰簯娓埧绠″眬"); + SOURCE_MAP.put("jlsfdc.com", "鍚夋灄鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("fangchanbang.com", "鎴夸骇甯�"); + SOURCE_MAP.put("zjtzfg.gov.cn", "鍙板窞鎴夸骇绠$悊澶�"); + SOURCE_MAP.put("zsfdc.gov.cn", "涓北鍥藉湡璧勬簮灞�"); + SOURCE_MAP.put("ccnnhouse.com", "涓煄鎴夸骇缃�"); + SOURCE_MAP.put("lzfcjys.com", "鏌冲窞鎴夸骇浜ゆ槗缃�"); + SOURCE_MAP.put("hd.gov.cn", "閭兏鎴夸骇绠$悊灞�"); + SOURCE_MAP.put("house-wh.com", "濞佹捣鎴夸骇鍦ㄧ嚎"); + SOURCE_MAP.put("whfdcw.com", "濞佹捣鎴垮湴浜�"); + SOURCE_MAP.put("yzfyw.com", "鎵窞鎴挎簮缃�"); + SOURCE_MAP.put("0579fang.com", "閲戝崕鎴夸骇缃�"); + SOURCE_MAP.put("southfang.com", "鍗楁柟鎴夸骇缃�"); + SOURCE_MAP.put("0759fdc.com", "婀涙睙鎴夸骇缃�"); + SOURCE_MAP.put("kuf.cn", "婀涙睙閰锋埧缃�"); + SOURCE_MAP.put("nethy8.com", "琛¢槼鎴夸骇缃慱nethy8"); + SOURCE_MAP.put("ycfcjy.com", "瀹滄槍鎴夸骇浜ゆ槗缃�"); + SOURCE_MAP.put("ychaofang.com", "瀹滄槍濂芥埧缃�"); + SOURCE_MAP.put("pdsfdc.gov.cn", "骞抽《灞辨埧绠″眬"); + SOURCE_MAP.put("jjxw.cn", "澶т節姹熸埧浜х綉"); + SOURCE_MAP.put("loupanwang.com", "闇茬浖缃�"); + SOURCE_MAP.put("myfdc.com.cn", "缁甸槼鎴垮湴浜х綉"); + SOURCE_MAP.put("taofang.com", "娣樻埧"); + SOURCE_MAP.put("e086.cn", "涓崕鍦颁骇缃�"); + SOURCE_MAP.put("ylw0813.com", "鐩愰緳缃�"); + SOURCE_MAP.put("zgfcn.com", "鑷础鎴夸骇缃�"); + SOURCE_MAP.put("zgsof.com", "鑷础鎼滄埧缃�"); + SOURCE_MAP.put("my0813.com", "鑷础閮藉競缃�"); + SOURCE_MAP.put("xf88.com", "婀樻埧缃�"); + SOURCE_MAP.put("ff1.com.cn", "绗竴鎴跨綉"); + SOURCE_MAP.put("0763fcw.com", "0763鎴夸骇缃�"); + SOURCE_MAP.put("dlfdc.cn", "澶х悊鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("xyfc.com", "瑗勯槼鎴夸骇"); + SOURCE_MAP.put("0732fc.com", "0731鎴夸骇缃慱0732fc"); + SOURCE_MAP.put("fcwqy.com", "娓呮埧缃�"); + SOURCE_MAP.put("0662f.com", "闃虫睙鎴夸骇缃�"); + SOURCE_MAP.put("maihaofang.com", "闃虫睙濂芥埧缃�"); + SOURCE_MAP.put("mzhw.com", "姊呭窞鎴夸骇缃�"); + SOURCE_MAP.put("kjfcw.com", "瀹㈠鎴夸骇缃�"); + SOURCE_MAP.put("ddfcw.com", "涓逛笢鎴夸骇缃�"); + SOURCE_MAP.put("i0415.cn", "涓逛笢渚涙眰缃�"); + SOURCE_MAP.put("sxxynews.com", "瀹滃眳鍜搁槼"); + SOURCE_MAP.put("zhuluxx.com", "閫愰箍瑗勯槼缃�"); + SOURCE_MAP.put("bendiw.cc", "鏈湴缃�"); + SOURCE_MAP.put("0710fdc.com", "瑗勬埧缃�"); + SOURCE_MAP.put("0775fcw.com", "鐜夋灄鎴夸骇缃�"); + SOURCE_MAP.put("qyfgj.cn", "娓呰繙鎴跨灞�"); + SOURCE_MAP.put("dl-fangdi.com.cn", "澶ц繛鎴夸骇浜ゆ槗涓績"); + SOURCE_MAP.put("cqfdcw.cn", "閲嶅簡鎴垮湴浜х綉"); + SOURCE_MAP.put("ganji.com", "璧堕泦"); + SOURCE_MAP.put("v007.net", "瑗挎睙鏄庣彔鎴夸骇缃�"); + SOURCE_MAP.put("sun0758.com", "鑲堝簡闃冲厜缃�"); + SOURCE_MAP.put("0744fdc.com", "寮犲鐣屾埧鍦颁骇淇℃伅缃�"); + SOURCE_MAP.put("sanyafz.com", "涓変簹鎴夸环缃�"); + SOURCE_MAP.put("sanyawu.com", "涓変簹鎴夸骇缃�"); + SOURCE_MAP.put("syhome.cc", "涓変簹鎴跨綉"); + SOURCE_MAP.put("deyoo.net.cn", "寰蜂綉鍦颁骇"); + SOURCE_MAP.put("syfff.com", "涓変簹鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("xfsfc.com.cn", "瑗勯槼浣忓畢涓庢埧浜т俊鎭綉"); + SOURCE_MAP.put("ybxww.com", "瀹滃鏂伴椈缃�"); + SOURCE_MAP.put("beihaidc.com", "鍖楁捣鎴垮湴浜т氦鏄撶綉"); + SOURCE_MAP.put("bhhouse.cn", "鍖楁捣鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("bhfangchan.com", "鍖楁捣鎴垮湴浜х綉"); + SOURCE_MAP.put("1188fc.com", "娴峰崡鎴夸骇涓撶嚎"); + SOURCE_MAP.put("ptfg.gov.cn", "鑾嗙敯鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("yuxi.tv", "鐜夋邯鍦ㄧ嚎"); + SOURCE_MAP.put("yuxifc.com", "鐜夋邯鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("ayfzxxw.com", "瀹夐槼鎴挎斂淇℃伅缃�"); + SOURCE_MAP.put("ykhouse.com", "钀ュ彛鎴夸骇_ykhouse"); + SOURCE_MAP.put("qlqw.cn", "鍦堥噷鍦堝"); + SOURCE_MAP.put("373house.com", "鏂颁埂浼樻埧缃�"); + SOURCE_MAP.put("373f.com", "鏂颁埂淇℃伅娓�"); + SOURCE_MAP.put("hyfg.cn", "娌虫簮鎴跨缃�"); + SOURCE_MAP.put("househy.com", "娌虫簮缃笟缃�"); + SOURCE_MAP.put("0762home.com", "娌虫簮鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("076299.com", "涔濅節鎴夸骇缃�"); + SOURCE_MAP.put("zstmsf.com", "鑸熷北甯傞�忔槑鍞埧缃�"); + SOURCE_MAP.put("zyhouse.com.cn", "閬典箟鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("seezy.com", "閬典箟鎴夸骇缃�"); + SOURCE_MAP.put("lsol.com.cn", "涓芥按鎴夸骇缃�"); + SOURCE_MAP.put("lsfdc.com", "涔愭埧缃憀sfdc"); + SOURCE_MAP.put("goufanggo.net", "宀抽槼璐埧缃�"); + SOURCE_MAP.put("tl8.com.cn", "閾佸箔鎴夸骇缃�"); + SOURCE_MAP.put("0938f.com", "澶╂按鎴夸骇缃�"); + SOURCE_MAP.put("0377fw.com", "鍗楅槼鎴夸骇"); + SOURCE_MAP.put("nyfang.cn", "鍗楅槼鎴垮湴浜�"); + SOURCE_MAP.put("hrb88.com", "鍢夊悏浜屾墜鎴跨綉"); + SOURCE_MAP.put("jhanju.com", "姹熸樊瀹夊眳缃�"); + SOURCE_MAP.put("51tie.com", "51鍚屽煄"); + SOURCE_MAP.put("fenleiad.com", "鍒嗙被骞垮憡缃�"); + SOURCE_MAP.put("tuitui99.com", "鎺ㄦ帹99鎴夸骇缃�"); + SOURCE_MAP.put("gyfc.net.cn", "绛戞埧缃�"); + SOURCE_MAP.put("guiyangfc.com", "璐甸槼鎴夸骇缃�"); + SOURCE_MAP.put("aqfdc.com", "瀹夊簡鎴垮湴浜х綉aqfdc"); + SOURCE_MAP.put("dooioo.com", "寰风鍦颁骇"); + SOURCE_MAP.put("baipusou.com", "鐧鹃摵鎼�"); + SOURCE_MAP.put("eeju.com", "鏄撳眳缃�"); + SOURCE_MAP.put("liaoing.com", "鑱婂畢缃�"); + SOURCE_MAP.put("shangdu.com", "鍟嗛兘缃�"); + SOURCE_MAP.put("hnhaofang.com", "閮戝窞濂芥埧缃�"); + SOURCE_MAP.put("371fang.cn", "閮戞埧缃�"); + SOURCE_MAP.put("zshfcw.com", "鑸熷北澶ц薄鎴夸骇缃�"); + SOURCE_MAP.put("allfang.com", "鍏ㄦ埧"); + SOURCE_MAP.put("fangtoo.com", "鎴块�旂綉"); + SOURCE_MAP.put("nblide.com", "21涓栫邯涓嶅姩浜nblide"); + SOURCE_MAP.put("cnool.net", "涓滄柟鐑嚎鎴夸骇缃�"); + SOURCE_MAP.put("cnnb.com.cn", "瀹佹尝鍦颁骇缃�"); + SOURCE_MAP.put("nbnt.com.cn", "鍗楀ぉ鎴夸骇"); + SOURCE_MAP.put("goufang.com", "璐埧缃�"); + SOURCE_MAP.put("dadalian.net", "澶ц繛鎴挎簮缃�"); + SOURCE_MAP.put("dllp.cn", "绮惧搧妤肩洏缃�"); + SOURCE_MAP.put("letfind.com", "鐚庢埧缃�"); + SOURCE_MAP.put("gaogulou.com", "楂樺彜妤兼埧浜х綉"); + SOURCE_MAP.put("fangyuan365.com", "365鎴夸骇缃�"); + SOURCE_MAP.put("0731fdc.com", "0731鎴夸骇缃�"); + SOURCE_MAP.put("wazhe.com", "铔欒�呯綉"); + SOURCE_MAP.put("800j.com.cn", "鍏櫨瀹�"); + SOURCE_MAP.put("95191.com", "妤煎競閫�"); + SOURCE_MAP.put("ihk.cn", "鎴跨帇"); + SOURCE_MAP.put("szhome.com", "娣卞湷鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("zlhome.com", "涓仈鍦颁骇缃�"); + SOURCE_MAP.put("qfang.com", "Q鎴跨綉"); + SOURCE_MAP.put("guifc.com", "妗傛灄鎴夸骇缃慱guifc"); + SOURCE_MAP.put("yfyc.tv", "鏈夋埧鏈夎溅"); + SOURCE_MAP.put("guifun.com", "妗傛埧缃�"); + SOURCE_MAP.put("fangke.cn", "鎴垮缃�"); + SOURCE_MAP.put("ffw.com.cn", "绂忔埧缃�"); + SOURCE_MAP.put("66house.com", "鎴胯仈缃�"); + SOURCE_MAP.put("h0591.com", "娴疯タ鎴夸骇缃�"); + SOURCE_MAP.put("aqhouse.com", "瀹夊簡鎴垮湴浜т氦鏄撶綉"); + SOURCE_MAP.put("aqfdc.cn", "瀹夊簡鎴垮湴浜х綉"); + SOURCE_MAP.put("ahhouse.com", "瀹夊窘鎴垮湴浜т氦鏄撶綉"); + SOURCE_MAP.put("xafc.com", "鏂板畨鎴夸骇缃�"); + SOURCE_MAP.put("lianm.com", "澶ц薄鎴夸骇缃�"); + SOURCE_MAP.put("afcxx.com", "娣崡鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("newhouse.com.cn", "瀹夊窘鏂板湴浜т氦鏄撶綉"); + SOURCE_MAP.put("0772fang.com", "鏌虫埧缃�"); + SOURCE_MAP.put("liebiao.com", "鍒楄〃缃�"); + SOURCE_MAP.put("fccs.com", "涓浗鎴夸骇瓒呭競缃�"); + SOURCE_MAP.put("centanet.com", "涓師鍦颁骇"); + SOURCE_MAP.put("0771555.com", "閭曟埧缃�"); + SOURCE_MAP.put("zp365.com", "浣忔湅缃�"); + SOURCE_MAP.put("0771hao.com", "鎴夸骇瀹跺洯缃�"); + SOURCE_MAP.put("kfw001.com", "蹇埧缃�"); + SOURCE_MAP.put("house-book", "鎴胯氨"); + SOURCE_MAP.put("czfcw.com", "甯稿窞鎴夸骇缃�"); + SOURCE_MAP.put("czfdc.com", "甯告埧缃�"); + SOURCE_MAP.put("fdc.com.cn", "浜挎埧缃�"); + SOURCE_MAP.put("jxdcw.com", "姹熻タ鍦颁骇缃�"); + SOURCE_MAP.put("czfdc.com.cn", "甯稿窞鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("5y365.com", "鏃犲咖365璐埧缃�"); + SOURCE_MAP.put("tengfang.net", "鑵炬埧缃�"); + SOURCE_MAP.put("lfang.com", "鐖辨埧缃�"); + SOURCE_MAP.put("365jia.cn", "涓囧鐑嚎"); + SOURCE_MAP.put("hfhouse.com", "鍚堣偉鎴垮湴浜т氦鏄撶綉"); + SOURCE_MAP.put("fcdbz.com", "鎴夸骇澶у反鎵�"); + SOURCE_MAP.put("km915.com", "瀹㈣糠缃�"); + SOURCE_MAP.put("xjfc.com.cn", "鎼滃缃�"); + SOURCE_MAP.put("c21wlmq.com.cn", "21涓栫邯涓嶅姩浜�"); + SOURCE_MAP.put("taofang.com", "娣樻埧"); + SOURCE_MAP.put("365jilin.com", "鍚夊拰鎴夸骇"); + SOURCE_MAP.put("cnjxol.com", "鍢夊叴鍦ㄧ嚎"); + SOURCE_MAP.put("djfw.com", "澶у鎴夸骇"); + SOURCE_MAP.put("efw.cn", "e鎴跨綉"); + SOURCE_MAP.put("fc0576.com", "鍙板窞鎴夸骇缃�"); + SOURCE_MAP.put("028f.com", "鎴愭埧缃�"); + SOURCE_MAP.put("tzeju.com", "鍙板窞鏄撳眳缃�"); + SOURCE_MAP.put("funi.com", "鎴胯仈"); + SOURCE_MAP.put("577fang.com", "娓╁窞鎴夸骇缃�"); + SOURCE_MAP.put("sxfcw.org", "缁嶅叴鎴夸骇缃慱sxfcw"); + SOURCE_MAP.put("ykouf.cn", "钀ュ彛鎴夸骇缃�"); + SOURCE_MAP.put("0575ls.cn", "缁嶅叴妤煎競"); + SOURCE_MAP.put("0575360.com", "缁嶅叴鎴夸骇缃�"); + SOURCE_MAP.put("e0575.com", "涔版埧绉熸埧"); + SOURCE_MAP.put("xfzc.com", "瀵绘埧涔嬬獥"); + SOURCE_MAP.put("98znz.com", "98鎸囧崡閽�"); + SOURCE_MAP.put("iqilu.com", "榻愰瞾缃�"); + SOURCE_MAP.put("fc0531.com", "娴庢埧缃�"); + SOURCE_MAP.put("lywww.com", "涓存矀鍦ㄧ嚎"); + SOURCE_MAP.put("lpwww.com", "妤肩洏鍦ㄧ嚎"); + SOURCE_MAP.put("ejfc.cn", "鏄撳槈鎴夸骇"); + SOURCE_MAP.put("qzfc.com", "澶ф硥宸炴埧浜х綉"); + SOURCE_MAP.put("qzef.com", "娉夊窞E鎴跨綉"); + SOURCE_MAP.put("wxhouse.com", "鏃犻敗鎴垮湴浜у競鍦虹綉"); + SOURCE_MAP.put("longhoo.net", "榫欒檸缃�"); + SOURCE_MAP.put("23fdc.com", "闉嶅北鎴夸骇缃�"); + SOURCE_MAP.put("qu114.com", "鍘�114"); + SOURCE_MAP.put("xiadu.com", "澶忛兘缃�"); + SOURCE_MAP.put("sdchina.com", "涓浗灞变笢缃�"); + SOURCE_MAP.put("dzwww.com", "澶т紬缃�"); + SOURCE_MAP.put("lyzhujia.com", "涓存矀浣忓缃�"); + SOURCE_MAP.put("inhe.net", "閾舵渤缃�"); + SOURCE_MAP.put("zhijia.com", "缃缃�"); + SOURCE_MAP.put("ejiacn.com", "E瀹剁綉"); + SOURCE_MAP.put("ly6s.com", "娲涢槼妤煎競"); + SOURCE_MAP.put("0579fw.com", "閲戝崕鎴跨綉"); + SOURCE_MAP.put("nthfw.com", "鍗楅�氬ソ鎴跨綉"); + SOURCE_MAP.put("axfc.cn", "鐖卞績鎴夸骇"); + SOURCE_MAP.put("qzfce.cn", "琛㈠窞鎴夸骇e缃�"); + SOURCE_MAP.put("xmhouse.com", "鍘﹂棬鎴垮湴浜ц仈鍚堢綉"); + SOURCE_MAP.put("qwjian.com", "鍗冧竾闂�"); + SOURCE_MAP.put("lsol.com.cn", "涓芥按鎴夸骇缃�"); + SOURCE_MAP.put("t55.com", "娣樼獫绐�"); + SOURCE_MAP.put("dushifang.com", "閮藉競浜屾墜鎴跨綉"); + SOURCE_MAP.put("ddfcw.com", "涓逛笢鎴夸骇缃�"); + SOURCE_MAP.put("i0415.cn", "涓逛笢渚涙眰缃�"); + SOURCE_MAP.put("f537.com", "娴庡畞鎴挎埧缃�"); + SOURCE_MAP.put("jn678.com", "娴庡畞鎴夸骇缃�"); + SOURCE_MAP.put("nmgfc.cn", "鍐呰挋鍙ゆ埧浜х綉"); + SOURCE_MAP.put("cn0477.com", "閯傚皵澶氭柉鐢熸椿缃�"); + SOURCE_MAP.put("ijxjj.com", "涔濇睙缃�"); + SOURCE_MAP.put("jjhlfc.com", "鎭掑姏鎴夸骇"); + SOURCE_MAP.put("tzfdc.com", "鍙板窞鎴垮湴浜х綉"); + SOURCE_MAP.put("tzesf.com", "鍙板窞浜屾墜鎴跨綉"); + SOURCE_MAP.put("centanet.com", "涓師鍦颁骇"); + SOURCE_MAP.put("ycfcw.cn", "鐩愬煄鎴夸骇缃�"); + SOURCE_MAP.put("ycfcw.com.cn", "鐩愬煄鎴垮湴浜�"); + SOURCE_MAP.put("ycfc8.com", "鐩愬煄鎴夸骇"); + SOURCE_MAP.put("kaifc.cn", "寮�灏佹埧浜х綉"); + SOURCE_MAP.put("kaifengfcw.com", "寮�灏佹埧浜х綉kaifengfcw"); + SOURCE_MAP.put("373house.com", "鏂颁埂浼樻埧缃�"); + SOURCE_MAP.put("ljia.net", "鎭嬪缃�"); + SOURCE_MAP.put("zbinfo.net", "娣勫崥淇℃伅娓�"); + SOURCE_MAP.put("lznews.cn", "椴佷腑缃�"); + SOURCE_MAP.put("zbfc.com", "娣勫崥鎴夸骇缃戯紙ZB锛�"); + SOURCE_MAP.put("bd365.net", "閲戝搧鎴挎簮"); + SOURCE_MAP.put("tmsf.com", "閫忔槑鍞埧缃�"); + SOURCE_MAP.put("fcwlm.cn", "鎴夸骇缃戣仈鐩�"); + SOURCE_MAP.put("housoo.com", "灞辫タ鎴垮湴浜ч棬鎴风綉"); + SOURCE_MAP.put("fooju.com.cn", "绂忓眳缃�"); + SOURCE_MAP.put("0471fcw.com", "0471鎴夸骇缃�"); + SOURCE_MAP.put("365hf.com", "鍛煎拰娴╃壒鎴垮湴浜х綉"); + SOURCE_MAP.put("0471vip.com", "鍛煎拰娴╃壒鍦ㄧ嚎"); + SOURCE_MAP.put("qiqhr.cn", "榻愰綈鍝堝皵鎴夸骇qiqhr"); + SOURCE_MAP.put("e086.cn", "涓崕鍦颁骇缃�"); + SOURCE_MAP.put("ccoo.cn", "鍩庡競涓浗缃�"); + SOURCE_MAP.put("wftzfc.com", "澶╂辰鎴夸骇缃�"); + SOURCE_MAP.put("0536home.com", "娼嶅潑鎴夸骇缃�"); + SOURCE_MAP.put("wfinfo.cn", "娼嶅潑淇℃伅娓�"); + SOURCE_MAP.put("pianyifun.com", "渚垮疁鎴�"); + SOURCE_MAP.put("jqcn.net", "閰掓硥鐢熸椿缃�"); + SOURCE_MAP.put("my0511.com", "闀囨睙鎴夸骇缃�"); + SOURCE_MAP.put("huainet.com", "娣畨鎴夸骇缃�"); + SOURCE_MAP.put("lousw.com", "鍐叉氮瀹滃眳"); + SOURCE_MAP.put("ha16.com", "绮惧僵鎴夸骇缃�"); + SOURCE_MAP.put("hdfangxun.cn", "閭兏鎴胯缃�"); + SOURCE_MAP.put("xmhouse.com", "鍘﹂棬鎴垮湴浜ц仈鍚堢綉"); + SOURCE_MAP.put("0458yc.cn", "浼婃槬閮藉競缃�"); + SOURCE_MAP.put("bjjs.gov.cn", "鍖椾含甯傚缓璁惧鍛樹細"); + SOURCE_MAP.put("lyfc001", "婧ч槼鎴夸骇缃�"); + SOURCE_MAP.put("czfdc.com", "甯告埧缃�"); + SOURCE_MAP.put("czfcw.com", "甯稿窞鎴夸骇缃�"); + SOURCE_MAP.put("house365.com", "365鍦颁骇瀹跺眳缃�"); + SOURCE_MAP.put("xzhouse.com.cn", "寰愬窞鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("xzhouse.com.cn", "寰愬窞鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("lsqss.com", "鍑夊北鍏ㄦ悳绱�"); + SOURCE_MAP.put("fang.com", "鎼滄埧缃�"); + SOURCE_MAP.put("soufy.cn", "鎼滄埧婧愮綉"); + SOURCE_MAP.put("baixinger.com", "鐧惧鍚�"); + SOURCE_MAP.put("baixinger.com", "鐧惧鍚�"); + SOURCE_MAP.put("fahaola.com", "鍙戝ソ鍟�"); + SOURCE_MAP.put("ahaola.com", "鍙戝ソ鍟�"); + SOURCE_MAP.put("zhengfafa.com", "姝e彂鍙戝垎绫讳俊鎭綉"); + SOURCE_MAP.put("haofang.net", "濂芥埧鍦ㄧ嚎"); + SOURCE_MAP.put("5i5j.com", "鎴戠埍鎴戝"); + SOURCE_MAP.put("yes515.com", "515鎴夸骇缃�"); + SOURCE_MAP.put("baidu.com", "鐧惧害涔愬眳"); + SOURCE_MAP.put("goufang.com", "璐埧鑰�"); + SOURCE_MAP.put("cityhouse.cn", "鍩庡競鎴夸骇"); + SOURCE_MAP.put("baixing.com", "鐧惧缃�"); + SOURCE_MAP.put("bai58.com", "鐧句簲鍏綉"); + SOURCE_MAP.put("bai58.com", "鐧句簲鍏綉"); + SOURCE_MAP.put("ganji.com", "璧堕泦缃�"); + SOURCE_MAP.put("58.com", "58鍚屽煄"); + SOURCE_MAP.put("taofw.cn", "娣樻埧灞�"); + SOURCE_MAP.put("anjuke.com", "瀹夊眳瀹�"); + SOURCE_MAP.put("jinti.com", "浠婇缃�"); + SOURCE_MAP.put("loupan.com", "妤肩洏缃�"); + SOURCE_MAP.put("daikan.cn", "甯︾湅缃�"); + SOURCE_MAP.put("zufang.com", "绉熸埧缃�"); + SOURCE_MAP.put("fangjiadp.com", "鍏嬭�岀憺鎴夸环"); + SOURCE_MAP.put("shfg.gov.cn", "涓婃捣甯備綇鎴夸繚闅滃拰鎴垮眿绠$悊灞�"); + SOURCE_MAP.put("iwjw.com", "鐖卞眿鍚夊眿"); + SOURCE_MAP.put("xinfun.net", "鏂版埧缃�"); + SOURCE_MAP.put("0470fcw.com", "鍛间鸡璐濆皵鎴夸骇缃�"); + SOURCE_MAP.put("srtong.com", "涓婇ザ閫氭埧浜х綉"); + SOURCE_MAP.put("soufun.com", "鎼滄埧"); + SOURCE_MAP.put("58.com", "58鍚屽煄"); + SOURCE_MAP.put("koofang.com", "閰锋埧缃�"); + SOURCE_MAP.put("laho.gov.cn", "闃冲厜瀹剁紭"); + SOURCE_MAP.put("cdfgj.gov.cn", "鎴愰兘甯傛埧绠″眬"); + SOURCE_MAP.put("bjjs.gov.cn", "鍖椾含甯傚缓璁惧鍛樹細"); + SOURCE_MAP.put("szpl.gov.cn", "娣卞湷鎴夸骇淇℃伅绯荤粺"); + SOURCE_MAP.put("tjfdc.com.cn", "澶╂触鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("cq315house.com", "閲嶅簡缃戜笂鎴垮湴浜�"); + SOURCE_MAP.put("njhouse.com.cn", "鍗椾含缃戜笂鎴垮湴浜�"); + SOURCE_MAP.put("ksfc.gov.cn", "鏄嗗北鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("gyfc.net.cn", "绛戞埧缃�"); + SOURCE_MAP.put("lzfc.com.cn", "鍏板窞鍟嗗搧鎴�"); + SOURCE_MAP.put("fang99.com", "瑗垮畨鎴跨灞�"); + SOURCE_MAP.put("kmhouse.org", "鏄嗘槑鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("qzfdc.gov.cn", "娉夊窞浣忔埧寤鸿缃�"); + SOURCE_MAP.put("qdfd.com.cn", "闈掑矝缃戜笂鎴垮湴浜�"); + SOURCE_MAP.put("hhhtfcj.gov.cn", "鍛煎拰娴╃壒鎴跨灞�"); + SOURCE_MAP.put("ntfdc.net", "鍗楅�氭埧浜т俊鎭綉"); + SOURCE_MAP.put("xz.gov.cn", "寰愬窞鎴跨灞�"); + SOURCE_MAP.put("jlsfdc.com", "鍚夋灄鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("xnfcxx.com", "瑗垮畞鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("hkrealestate.gov.cn", "娴峰彛鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("lyzbj.com", "娲涢槼鎴跨灞�"); + SOURCE_MAP.put("zjtzfg.gov.cn", "鍙板窞鎴夸骇绠$悊澶�"); + SOURCE_MAP.put("dqfcj.com.cn", "澶у簡缃戜笂鎴垮湴浜�"); + SOURCE_MAP.put("asfc.com.cn", "闉嶅北鎴夸骇浜ゆ槗涓績"); + SOURCE_MAP.put("zhzgj.gov.cn", "鐝犳捣鍟嗗搧鎴块攢鍞綉"); + SOURCE_MAP.put("zsfdc.gov.cn", "涓北鍥藉湡璧勬簮灞�"); + SOURCE_MAP.put("yancheng.gov.cn", "鐩愬煄鎴跨灞�"); + SOURCE_MAP.put("jjzzfdc.com.cn", "涔濇睙鎴跨灞�"); + SOURCE_MAP.put("bxfcj.cn", "鏈邯缃戜笂鎴垮湴浜�"); + SOURCE_MAP.put("maoming.gov.cn", "鑼傚悕鎴跨灞�"); + SOURCE_MAP.put("jyfg.cn", "鎻槼鎴跨灞�"); + SOURCE_MAP.put("zgfdc.gov.cn", "鑷础鎴跨灞�"); + SOURCE_MAP.put("ptfg.gov.cn", "鑾嗙敯鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("cxsfdcglzx.com", "鎱堟邯鎴夸骇绠$悊涓績"); + SOURCE_MAP.put("hfhome.cn", "鍚堣偉瀹跺洯缃�"); + SOURCE_MAP.put("cnnbfdc.com", "瀹佹尝浣忓畢涓庢埧浜х綉"); + SOURCE_MAP.put("whfcj.gov.cn", "姝︽眽鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("ncfdc.com.cn", "鍗楁槍鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("0731fdc.com", "闀挎矙鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("hrbhouse365.com.cn", "鍝堝皵婊ㄧ綉绔欐埧鍦颁骇"); + SOURCE_MAP.put("sdjnfc.com.cn", "娴庡崡缃戜笂鎴垮湴浜�"); + SOURCE_MAP.put("ccfdw.com", "闀挎槬鎴跨灞�"); + SOURCE_MAP.put("ytfcjy.com", "鐑熷彴鎴夸骇浜ゆ槗缃�"); + SOURCE_MAP.put("ufc.gov.cn", "涔岄瞾鏈ㄩ綈鎴跨灞�"); + SOURCE_MAP.put("xmjydj.com", "鍘﹂棬缃戜笂鎴垮湴浜�"); + SOURCE_MAP.put("fzhouse.com.cn", "绂忓缓鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("dg.gov.cn", "涓滆帪鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("fsjw.gov.cn", "浣涘北鎴垮湴浜х綉"); + SOURCE_MAP.put("tyfdc.gov.cn", "澶師鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("lzfcjys.com", "鏌冲窞鎴夸骇浜ゆ槗缃�"); + SOURCE_MAP.put("stfcj.gov.cn", "姹曞ご鎴跨灞�"); + SOURCE_MAP.put("bdfdc.net", "淇濆畾鎴夸骇浜ゆ槗涓績"); + SOURCE_MAP.put("whfc.com.cn", "濞佹捣鎴夸骇浜ゆ槗缃�"); + SOURCE_MAP.put("hufdc.com", "婀栧窞鎴夸骇缃�"); + SOURCE_MAP.put("zjfdc.gov.cn", "闀囨睙鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("glfcj.gov.cn", "妗傛灄鎴跨灞�"); + SOURCE_MAP.put("huizhou.gov.cn", "鎯犲窞鎴跨灞�"); + SOURCE_MAP.put("zjfgj.cn", "婀涙睙鎴跨灞�"); + SOURCE_MAP.put("jmfcj.com.cn", "姹熼棬浣忔埧寤鸿灞�"); + SOURCE_MAP.put("zzfc.com", "鏍床鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("ycfcjy.com", "瀹滄槍鎴夸骇浜ゆ槗缃�"); + SOURCE_MAP.put("gzfcj.gov.cn", "璧e窞鎴跨灞�"); + SOURCE_MAP.put("whfdc.gov.cn", "鑺滄箹鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("myfdc.com.cn", "缁甸槼鎴垮湴浜х綉"); + SOURCE_MAP.put("mdjfdc.gov.cn", "鐗′腹姹熸埧鍦颁骇缃�"); + SOURCE_MAP.put("masfdc.gov.cn", "椹瀺灞辨埧浜т俊鎭綉"); + SOURCE_MAP.put("lygfcj.gov.cn", "杩炰簯娓埧绠″眬"); + SOURCE_MAP.put("nnfcj.gov.cn", "鍗楀畞鎴跨灞�"); + SOURCE_MAP.put("qyfgj.cn", "娓呰繙鎴跨灞�"); + SOURCE_MAP.put("yjjs.gov.cn", "闃虫睙浣忔埧寤鸿灞�"); + SOURCE_MAP.put("mzjs.gov.cn", "姊呭窞浣忔埧寤鸿灞�"); + SOURCE_MAP.put("xycj.gov.cn", "鍜搁槼浣忔埧瑙勫垝灞�"); + SOURCE_MAP.put("dalihouse.org", "澶х悊鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("xffgj.cn", "瑗勯槼鎴跨灞�"); + SOURCE_MAP.put("tsfcxx.com", "鍞愬北鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("yafc.gov.cn", "寤跺畨鎴夸骇缃�"); + SOURCE_MAP.put("0898gt.com", "涓変簹鎴夸骇淇℃伅缃慱0898gt"); + SOURCE_MAP.put("lpsfdc.cn", "鍏洏姘存埧浜т俊鎭綉"); + SOURCE_MAP.put("pzhfc.cn", "鏀�鏋濊姳鎴跨灞�"); + SOURCE_MAP.put("beihaire.gov.cn", "鍖楁捣鎴垮湴浜�"); + SOURCE_MAP.put("csfc.gov.cn", "甯哥啛鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("rafg.com.cn", "鐟炲畨浣忔埧绠$悊灞�"); + SOURCE_MAP.put("wzfg.com", "娓╁窞鎴夸骇甯傚満淇℃伅"); + SOURCE_MAP.put("nhfg.cn", "瀹佹捣鎴夸骇缃�"); + SOURCE_MAP.put("fhfcw.org", "濂夊寲鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("yyfdc.com.cn", "浣欏鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("wlfc.gov.cn", "娓╁箔閫忔槑鍞埧缃�"); + SOURCE_MAP.put("yxhouse.net", "瀹滃叴鎴夸骇缃�"); + SOURCE_MAP.put("yiwufg.com", "涔変箤鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("qjhouse.org", "鏇查潠鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("xxfdc.gov.cn", "鏂颁埂鎴夸骇绠$悊淇℃伅缃�"); + SOURCE_MAP.put("ykhouse.com", "钀ュ彛鎴夸骇_ykhouse"); + SOURCE_MAP.put("hyfg.cn", "娌虫簮鎴跨缃�"); + SOURCE_MAP.put("hsfdc.com", "榛勭煶鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("jzfdc.gov.cn", "鐒︿綔鎴夸骇绠$悊涓績"); + SOURCE_MAP.put("ayfzxxw.com", "瀹夐槼鎴挎斂淇℃伅缃�"); + SOURCE_MAP.put("sgfczc.com", "闊跺叧鎴夸骇涔嬬獥"); + SOURCE_MAP.put("zbzzfdc.gov.cn", "娣勫崥鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("zbfc.gov.cn", "娣勫崥甯傛埧绠″眬"); + SOURCE_MAP.put("sxhouse.gov.cn", "缁嶅叴鎴跨灞�淇℃伅缃�"); + SOURCE_MAP.put("cdfcw.com", "鎵垮痉鎴夸骇缃�"); + SOURCE_MAP.put("lwfccs.com", "鑾辫姕鎴跨灞�"); + SOURCE_MAP.put("czfcj.gov.cn", "閮村窞甯傛埧绠″眬"); + SOURCE_MAP.put("qzfc.gov.cn", "琛㈠窞鍟嗗搧鎴块攢鍞綉"); + SOURCE_MAP.put("fangdi.com.cn", "缃戜笂鎴垮湴浜�"); + SOURCE_MAP.put("hzfc.gov.cn", "鏉窞鎴跨灞�"); + SOURCE_MAP.put("lffdc.gov.cn", "寤婂潑鎴跨灞�"); + SOURCE_MAP.put("dl-fangdi.com.cn", "澶ц繛鎴夸骇浜ゆ槗涓績"); + SOURCE_MAP.put("zzfdc.gov.cn", "閮戝窞鎴垮湴浜х綉"); + SOURCE_MAP.put("xyjw.gov.cn", "淇¢槼浣忓缓灞�"); + SOURCE_MAP.put("gafdc.cn", "骞垮畨甯傛埧浜т氦鏄撳钩鍙�"); + SOURCE_MAP.put("zstmsf.com", "鑸熷北甯傞�忔槑鍞埧缃�"); + SOURCE_MAP.put("xcsfcjyw.com", "璁告槍鎴夸骇浜ゆ槗淇℃伅缃�"); + SOURCE_MAP.put("hgfgj.com", "榛勫唸鎴垮湴浜х鐞嗗眬"); + SOURCE_MAP.put("hnfc.gov.cn", "娣崡甯傛埧鍦颁骇绠$悊灞�"); + SOURCE_MAP.put("dtfc.gov.cn", "澶у悓甯傛埧浜т俊鎭綉"); + SOURCE_MAP.put("hzfgj.com", "鑿忔辰浣忓畢涓庢埧鍦颁骇淇℃伅缃�"); + SOURCE_MAP.put("cdsfgj.gov.cn", "甯稿痉甯傛埧鍦颁骇淇℃伅缃�"); + SOURCE_MAP.put("wwsjw.gov.cn", "姝﹀▉甯備綇鎴垮拰鍩庝埂寤鸿灞�"); + SOURCE_MAP.put("qqhrfc.com", "榻愰綈鍝堝皵甯傛埧浜т俊鎭綉"); + SOURCE_MAP.put("0437.gov.cn", "杈芥簮甯傛埧浜у眬"); + SOURCE_MAP.put("inlishui.com", "涓芥按鎴夸骇鍏紬淇℃伅缃�"); + SOURCE_MAP.put("spfcj.gov.cn", "鍥涘钩甯備綇鎴垮拰鍩庝埂寤鸿灞�"); + SOURCE_MAP.put("huaian.gov.cn", "娣畨甯傛埧绠″眬"); + SOURCE_MAP.put("hanzhong.gov.cn", "姹変腑甯備綇鎴垮拰鍩庡競绠$悊灞�"); + SOURCE_MAP.put("dingxi.gov.cn", "瀹氳タ甯備綇鎴垮拰鍩庝埂寤鸿灞�"); + SOURCE_MAP.put("lsfdc.gov.cn", "涔愬北甯傛埧绠″眬淇℃伅缃�"); + SOURCE_MAP.put("btfdc.com", "鍖呭ご鎴垮湴浜х綉"); + SOURCE_MAP.put("jcsfdc.com.cn", "鏅嬪煄甯傛埧鍦颁骇淇℃伅缃�"); + SOURCE_MAP.put("fccq.cn", "鐧藉北鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("jzsfdc.gov.cn", "閿﹀窞甯傛埧鍦颁骇淇℃伅缃�"); + SOURCE_MAP.put("akfc.gov.cn", "瀹夊悍甯傛埧浜х鐞嗗眬"); + SOURCE_MAP.put("jms.gov.cn", "浣虫湪鏂競浣忔埧淇濋殰灞�"); + SOURCE_MAP.put("yangzhou.gov.cn", "鎵窞鎴跨灞�"); + SOURCE_MAP.put("hd.gov.cn", "閭兏鎴夸骇绠$悊灞�"); + SOURCE_MAP.put("tazzfdc.com", "娉板畨鎴跨灞�"); + SOURCE_MAP.put("0538fcw.com", "娉板畨鎴夸骇浜ゆ槗涓績"); + SOURCE_MAP.put("tsfcjy.com", "澶╂按鎴夸骇浜ゆ槗鐧昏缃�"); + SOURCE_MAP.put("shjs.gov.cn", "缁ュ寲浣忔埧寤鸿缃�"); + SOURCE_MAP.put("vipoa.net", "涓崼浣忔埧寤鸿灞�"); + SOURCE_MAP.put("yyjs.gov.cn", "宀抽槼浣忔埧寤鸿缃�"); + SOURCE_MAP.put("ylszjj.gov.cn", "姒嗘灄浣忔埧寤鸿"); + SOURCE_MAP.put("qzfgw.gov.cn", "閽﹀窞浣忔埧寤鸿"); + SOURCE_MAP.put("nyfdc.gov.cn", "鍗楅槼鎴跨灞�"); + SOURCE_MAP.put("lyfdc.gov.cn", "涓存矀鎴夸骇淇濋殰灞�"); + SOURCE_MAP.put("lffc.gov.cn", "涓存本浣忔埧淇℃伅缃�"); + SOURCE_MAP.put("lffx.org", "涓存本鎴夸骇缃�"); + SOURCE_MAP.put("ordosfg.gov.cn", "閯傚皵澶氭柉鎴夸骇灞�"); + SOURCE_MAP.put("wzfg.com.cn", "姊у窞鎴夸氦缃�"); + SOURCE_MAP.put("bsfcj.com", "骞胯タ鐧捐壊鎴夸骇绠$悊灞�"); + SOURCE_MAP.put("jxfgj.gov.cn", "楦¤タ鎴跨灞�"); + SOURCE_MAP.put("bczj.gov.cn", "鐧藉煄甯備綇寤哄眬"); + SOURCE_MAP.put("feoou.org", "鎷夎惃鎴垮湴浜т氦鏄撶綉"); + SOURCE_MAP.put("cyfcxx.com", "鏈濋槼鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("hbczfdc.gov.cn", "娌у窞甯傛埧浜т俊鎭綉"); + SOURCE_MAP.put("dyfc.gov.cn", "涓滆惀浣忓畢涓庢埧鍦颁骇淇℃伅缃�"); + SOURCE_MAP.put("dzhfgj.cn", "寰峰窞甯傛埧浜х鐞嗕腑蹇�"); + SOURCE_MAP.put("ahbzfdc.com", "浜冲窞甯備綇瀹呬笌鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("aqhouse.net", "瀹夊簡甯傛埧鍦颁骇浜ゆ槗涓績"); + SOURCE_MAP.put("szshouse.com", "鐭冲槾灞辨埧浜т俊鎭綉"); + SOURCE_MAP.put("thfdckf.com", "閫氬寲鎴垮湴浜у紑鍙戜俊鎭綉"); + SOURCE_MAP.put("fxfdcw.com", "闃滄柊甯傛埧浜т俊鎭綉"); + SOURCE_MAP.put("xtfdc.gov.cn", "閭㈠彴鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("ndjsj.gov.cn", "瀹佸痉甯備綇寤虹綉"); + SOURCE_MAP.put("rzfdc.com", "鏃ョ収鎴垮崥浼�"); + SOURCE_MAP.put("lczjj.gov.cn", "涓存钵甯備綇寤哄眬"); + SOURCE_MAP.put("gxgg.gov.cn", "璐垫腐甯傛埧绠″眬"); + SOURCE_MAP.put("szfd.gov.cn", "瀹垮窞甯傛埧绠″眬"); + SOURCE_MAP.put("ncfdj.gov.cn", "鍗楁槍甯傛埧鍦颁骇绠$悊灞�"); + SOURCE_MAP.put("czfdc.gov.cn", "姹犲窞缃戜笂鎴垮湴浜�"); + SOURCE_MAP.put("sclzfc.com.cn", "娉稿窞甯傛埧鍦颁骇甯傚満淇℃伅缃�"); + SOURCE_MAP.put("fjnpfdc.com", "鍗楀钩甯傛埧淇$綉"); + SOURCE_MAP.put("zzfcj.com.cn", "鏋e簞甯傛埧绠″眬"); + SOURCE_MAP.put("bjsfdc.com.cn", "瀹濋浮甯傛埧鍦颁骇缃�"); + SOURCE_MAP.put("zyfgj.cn", "璧勯槼鎴跨灞�鏀垮姟缃�"); + SOURCE_MAP.put("bbfcjyw.com", "铓屽煚鎴夸骇浜ゆ槗缃�"); + SOURCE_MAP.put("czhome.com.cn", "婊佸窞缃戜笂鎴垮湴浜�"); + SOURCE_MAP.put("tlfdc.cn", "閾滈櫟鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("sysfcj.com", "閭甸槼甯傛埧浜у眬"); + SOURCE_MAP.put("fdc.gov.cn", "婕冲窞甯備綇寤哄眬"); + SOURCE_MAP.put("gzbjfc.com", "姣曡妭鎴夸骇甯傚満"); + SOURCE_MAP.put("jmfdc.gov.cn", "鑽嗛棬鎴跨缃�"); + SOURCE_MAP.put("swfgj.gov.cn", "姹曞熬甯傛埧绠″眬"); + SOURCE_MAP.put("kfjs.gov.cn", "寮�灏佷綇寤哄眬"); + SOURCE_MAP.put("puerhouse.org", "鏅幢甯傛埧浜т俊鎭綉"); + SOURCE_MAP.put("dyfc.cn", "寰烽槼鎴垮湴浜х綉"); + SOURCE_MAP.put("yaan.gov.cn", "闆呭畨甯傛埧鍦颁骇淇℃伅缃�"); + SOURCE_MAP.put("fdc0746.com", "0746妤煎競缃�"); + SOURCE_MAP.put("ldfdcw.com", "濞勬埧缃�"); + SOURCE_MAP.put("jzfc.gov.cn", "鑽嗗窞甯傛埧绠″眬"); + SOURCE_MAP.put("xnfcj.com", "鍜稿畞浣忔埧淇℃伅缃�"); + SOURCE_MAP.put("ezrea.com", "閯傚窞鎴夸骇缃慹zrea"); + SOURCE_MAP.put("sxyqfdc.com", "闃虫硥浣忔埧淇℃伅缃�"); + SOURCE_MAP.put("sxczfdc.com", "闀挎不浣忔埧淇℃伅缃�"); + SOURCE_MAP.put("ycsfdc.com", "杩愬煄甯傛埧淇$綉"); + SOURCE_MAP.put("llsfdc.com", "鍚曟浣忔埧淇℃伅缃�"); + SOURCE_MAP.put("wnfdc.com", "娓崡鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("fsfdc.com.cn", "鎶氶『浜ゆ槗鐧昏涓績"); + SOURCE_MAP.put("hbfdc.gov.cn", "娣寳鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("plzjj.gov.cn", "骞冲噳浣忓缓灞�"); + SOURCE_MAP.put("pxaaa.com", "钀嶄埂甯備綇鎴夸俊鎭綉"); + SOURCE_MAP.put("fzfgj.cn", "鎶氬窞甯備綇鎴夸俊鎭綉"); + SOURCE_MAP.put("hcsfcglj.com", "娌虫睜鎴跨灞�"); + SOURCE_MAP.put("qyfcglw.com", "搴嗛槼鎴夸骇缃�"); + SOURCE_MAP.put("ycfdcxxw.gov.cn", "瀹滄槬鎴夸俊缃�"); + SOURCE_MAP.put("baiyin.cn", "鐧介摱鎴垮湴浜х鐞嗗眬"); + SOURCE_MAP.put("hhfcw.com", "鎬�鍖栨埧浜х綉hhfcw"); + SOURCE_MAP.put("hhfdcw.com", "鎬�鍖栨埧浜т俊鎭綉"); + SOURCE_MAP.put("jdzfgj.com", "鏅痉闀囨埧鍦颁骇浜ゆ槗绠$悊缃�"); + SOURCE_MAP.put("syfg.org.cn", "鏉惧師鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("hldfcxx.com", "钁姦宀涙埧浜т俊鎭綉"); + SOURCE_MAP.put("jifcw.com", "娴庡畞鎴夸骇浜ゆ槗鐩戠悊澶�"); + SOURCE_MAP.put("fjlyfdc.com.cn", "榫欏博鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("fdcxh.com", "鍗佸牥鎴垮湴浜х綉"); + SOURCE_MAP.put("tongren.gov.cn", "涓浗閾滀粊"); + SOURCE_MAP.put("xcfdc.cn", "瀹e煄缃戜笂鎴垮湴浜�"); + SOURCE_MAP.put("xyfcj.com", "鏂颁綑鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("ytfc.gov.cn", "楣版江甯傛埧浜т俊鎭綉"); + SOURCE_MAP.put("gy-fdc.com", "骞垮厓鎴跨澶�"); + SOURCE_MAP.put("zmdfcgl.com", "椹婚┈搴椾綇鎴跨鐞嗕腑蹇�"); + SOURCE_MAP.put("xjksfcw.com", "鍠�浠�鎴夸骇缃�"); + SOURCE_MAP.put("xjksfx.com", "鍠�浠�甯傛埧鍦颁骇涓氬崗浼�"); + SOURCE_MAP.put("cxhouse.org", "妤氶泟鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("cjfcw.com", "鏄屽悏鎴夸骇缃�"); + SOURCE_MAP.put("hmfdc.gov.cn", "鍝堝瘑甯傛埧鍦颁骇绠$悊灞�"); + SOURCE_MAP.put("smecj.gov.cn", "鏂扮枂鏄屽悏宸炰腑灏忎紒涓�"); + SOURCE_MAP.put("sysfgj.com", "鍙岄腑灞卞競鍟嗗搧鎴跨綉涓婄绾﹀妗堝钩鍙�"); + SOURCE_MAP.put("czfdc.com.cn", "甯稿窞鍟嗗搧鎴夸俊鎭�"); + SOURCE_MAP.put("bffdc.gov.cn", "骞抽《灞辨埧绠$洃绠℃煡璇�"); + SOURCE_MAP.put("shfg.gov.cn", "涓婃捣甯備綇鎴夸繚闅滃拰鎴垮眿绠$悊灞�"); + SOURCE_MAP.put("focus.cn", "鎼滅嫄鐒︾偣"); + SOURCE_MAP.put("ganji.com", "璧堕泦"); + SOURCE_MAP.put("jiwu.com", "鍚夊眿缃�"); + SOURCE_MAP.put("loupan.com", "妤肩洏缃�"); + SOURCE_MAP.put("haofang.net", "濂芥埧鍦ㄧ嚎"); + SOURCE_MAP.put("5i5j.com", "鎴戠埍鎴戝"); + SOURCE_MAP.put("yes515.com", "515鎴夸骇缃�"); + SOURCE_MAP.put("baixing.com", "鐧惧缃�"); + SOURCE_MAP.put("sina.com.cn", "鏂版氮涔愬眳"); + SOURCE_MAP.put("dlfd.gov.cn", "澶ц繛甯傛埧鍦颁骇浜ゆ槗鐧昏涓績"); + SOURCE_MAP.put("ffc.gov.cn", "涓存本甯備綇鎴夸笌鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("ffc.gov.cn", "涓存本甯備綇鎴夸笌鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("hrbfdc.gov.cn", "鍝堝皵婊ㄥ競鎴夸骇浣忓畢灞�"); + SOURCE_MAP.put("haoju.cn", "濂藉眳"); + SOURCE_MAP.put("house365.com", "365鍦颁骇瀹跺眳缃�"); + SOURCE_MAP.put("mytophome.com", "婊″爞绾�"); + SOURCE_MAP.put("centanet.com", "涓師鍦颁骇"); + SOURCE_MAP.put("ckj345.com", "瓒呭彲灞�"); + SOURCE_MAP.put("fzg360.com", "鎴挎帉鏌�"); + SOURCE_MAP.put("ganji.com", "璧堕泦"); + SOURCE_MAP.put("daikan.cn", "甯︾湅"); + SOURCE_MAP.put("hrbslfc.com", "鍝堝皵婊ㄤ笘鑱旀埧浜�"); + SOURCE_MAP.put("zhendafang.com", "鎸揪鎴夸骇"); + SOURCE_MAP.put("yiwu-house.com", "鍧愭爣涓嶅姩浜�"); + SOURCE_MAP.put("boxinfangchan.com", "鍗氶Θ鎴夸骇"); + SOURCE_MAP.put("0597jia.com", "浣宠瘹鎴夸骇"); + SOURCE_MAP.put("0470jiaxing.com", "瀹跺叴鎴夸骇"); + SOURCE_MAP.put("hhccdc.com", "璇氭垚鍦颁骇"); + SOURCE_MAP.put("jiayuanfangchan.com.cn", "浣崇紭鎴夸骇"); + SOURCE_MAP.put("hshdfc.com", "鎭掕揪鎴夸骇"); + SOURCE_MAP.put("zhengdafangchan.com", "琛℃按姝eぇ鎴夸骇缃�"); + SOURCE_MAP.put("jyjfdc.com", "灞呬竴瀹舵埧鍦颁骇"); + SOURCE_MAP.put("dz1fdc.com", "鍏厓鍦颁骇"); + SOURCE_MAP.put("yaanjq.com", "閲戞ˉ鎴夸粙缃�"); + SOURCE_MAP.put("bzleju.com", "宸翠腑涔愬眳鎴夸骇缃�"); + SOURCE_MAP.put("my012.com", "1+2鑱斿悎涓嶅姩浜�"); + SOURCE_MAP.put("517.cn", "517涓嶅姩浜�"); + SOURCE_MAP.put("fangchan0455.com", "缁ュ寲鎭嬪鎴夸骇"); + SOURCE_MAP.put("8441111.com", "缁ュ寲瀹滃鎴夸骇缃�"); + SOURCE_MAP.put("lixiangw.com", "鐞嗘兂鎴夸骇"); + SOURCE_MAP.put("hsjsfc.com", "榛勫北绮剧洓鎴夸骇"); + SOURCE_MAP.put("zxfc.cn", "缃俊鎴夸骇"); + SOURCE_MAP.put("tzjhfcw.com", "娉板窞鎴夸骇缃慱tzjhfcw"); + SOURCE_MAP.put("djfw.com", "澶у鎴夸骇"); + SOURCE_MAP.put("yifan2006.com", "涓�甯嗘埧浜�"); + SOURCE_MAP.put("dpdc.net.cn", "涓滈箯鍦颁骇"); + SOURCE_MAP.put("roboo.com", "鑺滄箹鎴夸骇"); + SOURCE_MAP.put("nt138.com", "鑼傚悕鍗楀ぉ鍦颁骇缃�"); + SOURCE_MAP.put("yxfqfc.com", "瀹滃叴瀵屽己鎴夸骇"); + SOURCE_MAP.put("999fc.net", "瀹滃叴绉熸埧缃�"); + SOURCE_MAP.put("yxfyfc.com", "瀹滃叴鏂瑰渾鎴夸骇涓粙"); + SOURCE_MAP.put("rafcxx.com", "鐟炲畨鎴夸骇涓粙缃�"); + SOURCE_MAP.put("0831xyfc.com", "娆e疁鎴夸骇"); + SOURCE_MAP.put("yyjbfc.com", "浣欏瀹跺崥鎴夸骇"); + SOURCE_MAP.put("bdhouse.net", "鍢変俊鎴夸骇"); + SOURCE_MAP.put("0754house.com", "浣虫垚鎴夸骇"); + SOURCE_MAP.put("sthtfc.com", "椤烘嘲娉撴嘲鎴夸骇"); + SOURCE_MAP.put("stlafc.com", "鍒╁畨鎴夸骇"); + SOURCE_MAP.put("wanziqianhong.cn", "涓囩传鍗冪孩鎴夸骇"); + SOURCE_MAP.put("sjjtx.com", "瀹跺ぉ涓嬫埧浜�"); + SOURCE_MAP.put("c21wlmq.com.cn", "21涓栫邯涓嶅姩浜�"); + SOURCE_MAP.put("koofang.com", "閰锋埧缃�"); + SOURCE_MAP.put("nblide.com", "21涓栫邯涓嶅姩浜nblide"); + SOURCE_MAP.put("100ks.cn", "鐧惧垎鐧炬埧浜�"); + SOURCE_MAP.put("mytophome.com", "婊″爞绾㈠湴浜х綉"); + SOURCE_MAP.put("ecen.com.cn", "浼婂煄鍦颁骇"); + SOURCE_MAP.put("jtfcw.cn", "閲戝潧鎴夸骇缃�"); + SOURCE_MAP.put("house3s.com", "灞辨按鎴夸骇缃�"); + SOURCE_MAP.put("519fcw.com", "閲戝潧鎴夸骇缃�519fcw"); + SOURCE_MAP.put("liyfc.cn", "婧ч槼鎴夸骇缃憀iyfc"); + SOURCE_MAP.put("jtfdc.com", "閲戝潧鎴夸骇缃慾tfdc"); + SOURCE_MAP.put("519fcw.com", "閲戝潧鎴夸骇缃�519fcw"); + SOURCE_MAP.put("jtfcw.cn", "閲戝潧鎴夸骇缃�"); + SOURCE_MAP.put("lyfcw.cn", "婧ч槼鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("liyangf.com", "婧ч槼鎴�"); + SOURCE_MAP.put("liyfc.cn", "婧ч槼鎴夸骇缃憀iyfc"); + SOURCE_MAP.put("1f.cn", "鏄撴埧"); + SOURCE_MAP.put("0555yi.com", "鏄撴埧缃�"); + SOURCE_MAP.put("tmsf.com", "閫忔槑鍞埧缃�"); + SOURCE_MAP.put("house-book", "鎴胯氨"); + SOURCE_MAP.put("900fc.com", "娓╁窞鎴夸骇缃慱900fc"); + SOURCE_MAP.put("577fang.com", "娓╁窞鎴夸骇缃�"); + SOURCE_MAP.put("zjttdc.com", "澶╁ぉ鍦颁骇"); + SOURCE_MAP.put("sun0769.com", "涓滆帪闃冲厜缃�"); + SOURCE_MAP.put("hffd.gov.cn", "鍚堣偉甯傛埧鍦颁骇绠$悊灞�"); + SOURCE_MAP.put("0898gt.com", "涓変簹鎴夸骇淇℃伅缃慱0898gt"); + SOURCE_MAP.put("szpl.gov.cn", "娣卞湷鎴夸骇淇℃伅绯荤粺"); + SOURCE_MAP.put("liyfc.cn", "婧ч槼鎴夸骇缃憀iyfc"); + SOURCE_MAP.put("lyfcw.cn", "婧ч槼鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("house3s.com", "灞辨按鎴夸骇缃�"); + SOURCE_MAP.put("dongbeifdc.com", "鍝堝皵婊ㄦ埧鍦颁骇缃慸ongbeifdc"); + SOURCE_MAP.put("0482home.com", "绾㈠煄瀹跺洯缃�"); + SOURCE_MAP.put("04820482.com", "鍏村畨鐩熶俊鎭腐"); + SOURCE_MAP.put("srtong.com", "涓婇ザ閫氭埧浜х綉"); + SOURCE_MAP.put("xhengshui.com", "琛℃按鏄撴埧缃�"); + SOURCE_MAP.put("baidu0413.com", "鎶氶『濂芥埧瀛�"); + SOURCE_MAP.put("fsfcw.net", "鎶氶『鎴夸骇缃慺sfcw"); + SOURCE_MAP.put("fshfc.cn", "鎶氶『鎴夸骇缃慺shfc"); + SOURCE_MAP.put("0413fc.net", "鎶氶『鎴夸骇缃�0413fc"); + SOURCE_MAP.put("0711ez.cn", "閯傚窞鎴夸骇缃�0711ez"); + SOURCE_MAP.put("fanging.com", "娌冲崡鎴夸骇缃慺anging"); + SOURCE_MAP.put("yq918.com", "闃虫硥瀹跺洯缃�"); + SOURCE_MAP.put("xnfw.com", "鍜稿畞鎴跨綉"); + SOURCE_MAP.put("zkloushi.com", "鍛ㄥ彛妤煎競缃�"); + SOURCE_MAP.put("xgrb.cn", "妲愯崼鎴夸骇"); + SOURCE_MAP.put("xgfw.cn", "瀛濇劅鎴跨綉"); + SOURCE_MAP.put("jzcool.com", "鑽嗗窞鍦ㄧ嚎"); + SOURCE_MAP.put("meyfang.com", "绫虫埧缃�"); + SOURCE_MAP.put("jzbdc.com", "鑽嗗窞涓嶅姩浜�"); + SOURCE_MAP.put("0712fang.com", "瀛濇埧缃�"); + SOURCE_MAP.put("jzhfz.com", "鑽嗗窞濂芥埧瀛愮綉"); + SOURCE_MAP.put("0716fw.com", "鑽嗘埧缃�"); + SOURCE_MAP.put("jz6.cc", "鑽嗗窞绗竴鎴夸骇缃�"); + SOURCE_MAP.put("0738.cc", "0738淇℃伅娓�"); + SOURCE_MAP.put("0738ld.com", "濞勫簳鎴跨綉"); + SOURCE_MAP.put("yongzhou.com", "姘稿窞缃�"); + SOURCE_MAP.put("0722h.com", "闅忓窞濂芥埧缃�"); + SOURCE_MAP.put("szfcol.com", "闅忓窞鎴夸骇鍦ㄧ嚎"); + SOURCE_MAP.put("0722fc.com", "闅忔埧缃�"); + SOURCE_MAP.put("fdc99.com", "姘稿窞鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("fdc0737.com", "0737鎴夸骇缃�"); + SOURCE_MAP.put("beiww.com", "鍖楃含缃�"); + SOURCE_MAP.put("zmdfcw.com", "椹婚┈搴楁埧浜х綉"); + SOURCE_MAP.put("zmdfcxx.com", "椹婚┈搴楁埧浜т俊鎭綉"); + SOURCE_MAP.put("0835.com", "闆呭畨鍦ㄧ嚎"); + SOURCE_MAP.put("gafc8.cn", "绉熸埧鍚�"); + SOURCE_MAP.put("0826fang.com", "骞垮畨鎴夸骇缃�0826fang"); + SOURCE_MAP.put("dy6c.com", "寰烽槼6鍩庣綉"); + SOURCE_MAP.put("gafcw.cn", "骞垮畨鎴夸骇缃�"); + SOURCE_MAP.put("ecz.cn", "鏄撴埧缃慹cz"); + SOURCE_MAP.put("xyfdcw.com.cn", "淇¢槼璐埧缃�"); + SOURCE_MAP.put("xyfcw.com", "淇¢槼鎴夸骇缃�"); + SOURCE_MAP.put("07358.com", "閮存埧缃�"); + SOURCE_MAP.put("dyfcw.com", "寰烽槼鎴夸骇缃�"); + SOURCE_MAP.put("e0838.com", "浣忓湪寰烽槼缃�"); + SOURCE_MAP.put("msfc114.com", "鐪夊北娣樻埧缃�"); + SOURCE_MAP.put("ynpew.com", "浜戝崡鏅幢缃�"); + SOURCE_MAP.put("scsn.cn", "閬傚畞涔嬬獥"); + SOURCE_MAP.put("chongzuobbs.com", "宕囧乏缃�"); + SOURCE_MAP.put("pefczx.com", "鏅幢鎴夸骇鍜ㄨ缃�"); + SOURCE_MAP.put("zuojiang.com", "宸︽睙缃�"); + SOURCE_MAP.put("jiulongw.cn", "涔濋緳缃�"); + SOURCE_MAP.put("brfcw.com", "宸存埧缃�"); + SOURCE_MAP.put("39518.com", "娼埧缃�"); + SOURCE_MAP.put("ptfcxx.com", "骞虫江鎴夸骇缃慶xx"); + SOURCE_MAP.put("b0917.com", "瀹濋浮淇℃伅娓�"); + SOURCE_MAP.put("0634.com", "閮藉競缃�"); + SOURCE_MAP.put("lwhouse.com", "鑾辫姕鎴垮湴浜х綉"); + SOURCE_MAP.put("dayou123.com", "瀹濋浮鎴夸骇"); + SOURCE_MAP.put("laiwuloushi.com", "鑾辫姕妤煎競"); + SOURCE_MAP.put("zaozhuangloushi.com", "鏋e簞妤煎競"); + SOURCE_MAP.put("sddzz.com", "鏋e簞瑙嗙獥"); + SOURCE_MAP.put("my0832.com", "璧勯槼澶т紬缃�"); + SOURCE_MAP.put("zzfcw.cn", "鏋e簞鎴夸骇缃�"); + SOURCE_MAP.put("zzfcw.com.cn", "鏋f埧缃�"); + SOURCE_MAP.put("0314fdc.com", "鎵挎埧缃�"); + SOURCE_MAP.put("zisai2.com", "绱鎴夸骇缃�"); + SOURCE_MAP.put("chengdechina.com", "鎵垮痉鎴夸骇"); + SOURCE_MAP.put("chzfdc.com", "姹犲窞鎴夸骇鐢熸椿缃�"); + SOURCE_MAP.put("0566fc.com", "0566姹犲窞鎴垮湴浜�"); + SOURCE_MAP.put("chafangwang.com", "CFW鏌ユ埧缃�"); + SOURCE_MAP.put("songyuanfang.com", "鏉惧師璐埧缃�"); + SOURCE_MAP.put("ycchinese.com", "浼婃槬鐐庨粍鍦ㄧ嚎"); + SOURCE_MAP.put("0557100.com", "瀹垮窞鍦ㄧ嚎"); + SOURCE_MAP.put("0817.net", "鍗楁埧缃�"); + SOURCE_MAP.put("365kl.net", "蹇箰鎴夸骇"); + SOURCE_MAP.put("bzcm.net", "婊ㄥ窞浼犲獟"); + SOURCE_MAP.put("ggfcxx.com", "璐垫腐鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("binfang.com", "婊ㄦ埧缃�"); + SOURCE_MAP.put("fc0633.com", "鏃ョ収缃笟缃�"); + SOURCE_MAP.put("rzfdc.com", "鏃ョ収鎴夸骇缃�"); + SOURCE_MAP.put("zhangjk.com", "寮犲鍙g綉鎴夸骇"); + SOURCE_MAP.put("jcok.com.cn", "璐哄窞浣虫垚鎴夸骇缃�"); + SOURCE_MAP.put("fc0319.com", "閭㈠彴鎴夸骇缃�"); + SOURCE_MAP.put("52zjk.cn", "寮犲灒鐢熸椿缃�"); + SOURCE_MAP.put("fxw.cc", "闃滄柊鎴夸骇缃慺xw"); + SOURCE_MAP.put("fx8888.com", "鍗庡崥缃�"); + SOURCE_MAP.put("0435.com", "閫氬寲鍦ㄧ嚎"); + SOURCE_MAP.put("0475fang.com", "閫氳窘鎴垮湴浜х綉"); + SOURCE_MAP.put("aqhouse.com", "瀹夊簡鎴垮湴浜т氦鏄撶綉"); + SOURCE_MAP.put("fcxgx.com", "鎴夸骇鏂板共绾�"); + SOURCE_MAP.put("51258.cn", "浜冲窞鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("0579.cn", "娴欎腑鍦ㄧ嚎"); + SOURCE_MAP.put("600258.com", "鍏嶄腑浠嬬鎴跨綉"); + SOURCE_MAP.put("inlishui.com", "涓芥按鎴夸骇鍏紬淇℃伅缃�"); + SOURCE_MAP.put("weiduqu.com", "璁告槍鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("05188.com", "娓煄缃�"); + SOURCE_MAP.put("0372.cn", "瀹夐槼淇℃伅缃�"); + SOURCE_MAP.put("ganpuwang.com", "璧堕摵缃�"); + SOURCE_MAP.put("kfjs.gov.cn", "寮�灏佷綇寤哄眬"); + SOURCE_MAP.put("ddfw.cn", "涓逛笢鎴垮眿缃�"); + SOURCE_MAP.put("0523fang.com", "0523娉板窞鎴夸骇缃�"); + SOURCE_MAP.put("0912f.com", "姒嗘灄鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("9iwn.com", "鏂版腑鍗楁埧浜х綉"); + SOURCE_MAP.put("liebiao.com", "鍒楄〃缃�"); + SOURCE_MAP.put("0359fdc.com", "0359鎴夸骇缃�"); + SOURCE_MAP.put("zjol.com.cn", "浣忓湪鏉窞缃�"); + SOURCE_MAP.put("anjuke.com", "瀹夊眳瀹�"); + SOURCE_MAP.put("51zupu.com", "鎴戣绉熼摵"); + SOURCE_MAP.put("haopoo.com", "濂介摵缃�"); + SOURCE_MAP.put("jinti.com", "浠婇缃�"); + SOURCE_MAP.put("czfcw.com", "甯稿窞鎴夸骇缃�"); + SOURCE_MAP.put("0355fdc.com", "0355鎴夸骇缃�"); + SOURCE_MAP.put("baixing.com", "鐧惧缃�"); + SOURCE_MAP.put("baidu.com", "鐧惧害涔愬眳"); + SOURCE_MAP.put("anjuke.com", "瀹夊眳瀹�"); + SOURCE_MAP.put("0516.1f.cn", "寰愬窞鎴夸骇缃慱0516"); + SOURCE_MAP.put("ganji.com", "璧堕泦缃�"); + SOURCE_MAP.put("haopoo.com", "濂介摵缃�"); + SOURCE_MAP.put("baixing.com", "鐧惧缃�"); + SOURCE_MAP.put("baidu.com", "鐧惧害涔愬眳"); + SOURCE_MAP.put("anjuke.com", "瀹夊眳瀹�"); + SOURCE_MAP.put("fang.com", "鎼滄埧缃�"); + SOURCE_MAP.put("ganji.com", "璧堕泦缃�"); + SOURCE_MAP.put("qd8.com.cn", "蹇偣8"); + SOURCE_MAP.put("jinti.com", "浠婇缃�"); + SOURCE_MAP.put("daikan.cn", "甯︾湅缃�"); + SOURCE_MAP.put("baixing.com", "鐧惧缃�"); + SOURCE_MAP.put("anjuke.com", "瀹夊眳瀹�"); + SOURCE_MAP.put("fang.com", "鎼滄埧缃�"); + SOURCE_MAP.put("ganji.com", "璧堕泦缃�"); + SOURCE_MAP.put("house365.com", "365鍦颁骇瀹跺眳缃�"); + SOURCE_MAP.put("qd8.com.cn", "蹇偣8"); + SOURCE_MAP.put("jinti.com", "浠婇缃�"); + SOURCE_MAP.put("daikan.cn", "甯︾湅缃�"); + SOURCE_MAP.put("baixing.com", "鐧惧缃�"); + SOURCE_MAP.put("chineseoffice.com.cn", "涓浗鍐欏瓧妤肩綉"); + SOURCE_MAP.put("58.com", "58鍚屽煄"); + SOURCE_MAP.put("chineseoffice.com.cn", "涓浗鍐欏瓧妤�"); + SOURCE_MAP.put("58.com", "58鍚屽煄"); + SOURCE_MAP.put("ganji.com", "璧堕泦"); + SOURCE_MAP.put("58.com", "58鍚屽煄"); + SOURCE_MAP.put("fang.com", "鎼滄埧"); + SOURCE_MAP.put(".gaoyfc", "楂橀偖鎴夸骇缃�"); + SOURCE_MAP.put(".byfdc", "瀹濇埧缃�"); + SOURCE_MAP.put("tsfcw.net", "鍙板北鎴夸骇缃�"); + SOURCE_MAP.put("epzx.com", "鎭╁钩鍦ㄧ嚎"); + SOURCE_MAP.put("heshan.ccoo.cn", "楣ゅ北鍦ㄧ嚎"); + SOURCE_MAP.put("heshanren.com", "楣ゅ北淇℃伅娓�"); + SOURCE_MAP.put("kpfcw.com", "寮�骞虫埧浜х綉"); + SOURCE_MAP.put("kfhome.com", "寮�灏佷箣瀹舵埧浜х綉"); + SOURCE_MAP.put("kaye.cn", "鍑笟鎴挎簮"); + SOURCE_MAP.put("hchouse.net", "娴峰煄鎴夸骇缃�"); + SOURCE_MAP.put("hcfcw.com", "娴峰煄鎴夸骇"); + SOURCE_MAP.put("3731.cn", "鏂颁埂鐢熸椿缃�"); + SOURCE_MAP.put("jwb.com.cn", "浠婃櫄缃�"); + SOURCE_MAP.put("baidu.com", "鐧惧害涔愬眳"); + SOURCE_MAP.put("centanet.com", "涓師鍦颁骇"); + SOURCE_MAP.put("zufang.com", "绉熸埧缃�"); + SOURCE_MAP.put("hrbslfc.com", "鍝堝皵婊ㄤ笘鑱旀埧浜�"); + SOURCE_MAP.put("hrbhouse365.com.cn", "鍝堝皵婊ㄧ綉绔欐埧鍦颁骇"); + SOURCE_MAP.put("01house.cn", "鏃犻敗绗竴鎴夸骇缃�"); + SOURCE_MAP.put("jnhouse.com", "娴庡崡鎴夸骇缃�"); + SOURCE_MAP.put("wxhouse.net", "姹夋柉鎴夸骇缃�"); + SOURCE_MAP.put("51leye.cn", "鎴戣涔愪笟"); + SOURCE_MAP.put("house-book", "鎴胯氨"); + SOURCE_MAP.put("0433.tv", "寤惰竟鎴夸骇缃�"); + SOURCE_MAP.put("0433.tv", "寤惰竟鎴夸骇缃�"); + SOURCE_MAP.put("66house.com", "鎴胯仈缃�"); + SOURCE_MAP.put("0433.tv", "寤惰竟鎴夸骇缃�"); + SOURCE_MAP.put("ybhfz.com", "寤惰竟濂芥埧缃�"); + SOURCE_MAP.put("hfang.cn", "鎯犳埧缃�"); + SOURCE_MAP.put("fdc0760.com", "鏄撴悳鎴夸骇缃�"); + SOURCE_MAP.put("315fangchan.com", "315鎴夸骇缃�"); + SOURCE_MAP.put("0710fz.com", "瑗勯槼鎴夸骇缃�"); + SOURCE_MAP.put("xffgj.cn", "瑗勯槼鎴跨灞�"); + SOURCE_MAP.put("0898gt.com", "涓変簹鎴夸骇淇℃伅缃慱0898gt"); + SOURCE_MAP.put("xtfc.gov.cn", "婀樻江甯傛埧浜х鐞嗗眬"); + SOURCE_MAP.put("cityhouse.cn", "鍩庡競鎴夸骇"); + SOURCE_MAP.put("zqfdc.net", "鑲囧簡鎴垮湴浜х綉"); + SOURCE_MAP.put("stfcj.gov.cn", "姹曞ご鎴跨灞�"); + SOURCE_MAP.put("lyfff.com", "瀹跺湪涓存矀缃�"); + SOURCE_MAP.put("lyzhujia.com", "涓存矀浣忓缃�"); + SOURCE_MAP.put("zhufon.com", "涓存矀浣忔埧缃�"); + SOURCE_MAP.put("lpwww.com", "妤肩洏鍦ㄧ嚎"); + SOURCE_MAP.put("0539zf.com", "涓存矀鎵炬埧缃�"); + SOURCE_MAP.put("ilinyi.net", "鐖变复娌�"); + SOURCE_MAP.put("lywww.com", "涓存矀鍦ㄧ嚎"); + SOURCE_MAP.put("jz6.cc", "鑽嗗窞绗竴鎴夸骇缃�"); + SOURCE_MAP.put("0716fw.com", "鑽嗘埧缃�"); + SOURCE_MAP.put("linyiren.com", "涓存矀浜烘埧浜х綉"); + SOURCE_MAP.put("jzbdc.com", "鑽嗗窞涓嶅姩浜�"); + SOURCE_MAP.put("jzhfz.com", "鑽嗗窞濂芥埧瀛愮綉"); + SOURCE_MAP.put("letfind.com", "鐚庢埧缃�"); + SOURCE_MAP.put("cnhouse.com", "瀵绘崟鎴�"); + SOURCE_MAP.put("0312f.cn", "淇濆畾鎴夸骇缃�"); + SOURCE_MAP.put("0312f.cn", "淇濆畾鎴夸骇缃�"); + SOURCE_MAP.put("0510f.cn", "鏃犻敗鎴夸骇缃慱0510f"); + SOURCE_MAP.put("0312fc.com.cn", "淇濆畾鎴夸骇缃慱0312fc"); + SOURCE_MAP.put("qingdaonews.com", "鏂伴椈缃戞埧浜�"); + SOURCE_MAP.put("52youju.com", "浼樺眳缃�"); + SOURCE_MAP.put("xiadu.com", "澶忛兘缃�"); + SOURCE_MAP.put("0971fc.com", "瑗挎埧缃�"); + SOURCE_MAP.put("jzfcw.com", "閿﹀窞绮惧搧妤肩洏缃�"); + SOURCE_MAP.put("jnrx.cc", "娴庡畞鎴夸骇缃慾nrx"); + SOURCE_MAP.put("yyjs.gov.cn", "宀抽槼浣忔埧寤鸿缃�"); + SOURCE_MAP.put("jifcw.com", "娴庡畞鎴夸骇浜ゆ槗鐩戠悊澶�"); + SOURCE_MAP.put("sgmsw.cn", "闊跺叧姘戝0缃�"); + SOURCE_MAP.put("sclzfc.com.cn", "娉稿窞甯傛埧鍦颁骇甯傚満淇℃伅缃�"); + SOURCE_MAP.put("0830e.com", "娉稿窞鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("ly169.cn", "涓存矀淇℃伅娓�"); + SOURCE_MAP.put("0817.net", "鍗楁埧缃�"); + SOURCE_MAP.put("house365.com", "365鍦颁骇瀹跺眳缃�"); + SOURCE_MAP.put("bhsfdc.com", "鍖楁捣鎴夸骇缃�"); + SOURCE_MAP.put("sgfczc.com", "闊跺叧鎴夸骇涔嬬獥"); + SOURCE_MAP.put("changchunfangdichan.com", "闀挎槬鎴垮湴浜х綉"); + SOURCE_MAP.put("hz.cc", "鏉窞鎴夸骇缃�"); + SOURCE_MAP.put("zjol.com.cn", "浣忓湪鏉窞缃�"); + SOURCE_MAP.put("cd.cc", "鎴愰兘鎴夸骇缃慱cd"); + SOURCE_MAP.put("sd.cn", "闈掑矝鎴夸骇鍦ㄧ嚎"); + SOURCE_MAP.put("fooju.com.cn", "绂忓眳缃�"); + SOURCE_MAP.put("sina.com.cn", "鏂版氮涔愬眳"); + SOURCE_MAP.put("ynfww.com", "浜戝崡鎴垮眿缃�"); + SOURCE_MAP.put("aqhouse.com", "瀹夊簡鎴垮湴浜т氦鏄撶綉"); + SOURCE_MAP.put("ftan.cn", "鎴挎帰缃�"); + SOURCE_MAP.put("hljfdc.net", "榛戦緳姹熸埧浜х綉"); + SOURCE_MAP.put("lejiazhiye.cn", "涔愬鎴夸骇缃�"); + SOURCE_MAP.put("fzhouse.com.cn", "绂忓缓鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("gzcjy128.com", "鍒涘鏄�"); + SOURCE_MAP.put("szpl.gov.cn", "娣卞湷鎴夸骇淇℃伅绯荤粺"); + SOURCE_MAP.put("cnool.net", "涓滄柟鐑嚎鎴夸骇缃�"); + SOURCE_MAP.put("aqhouse.net", "瀹夊簡甯傛埧鍦颁骇浜ゆ槗涓績"); + SOURCE_MAP.put("haofz.com", "濂芥埧瀛�"); + SOURCE_MAP.put("jzsfdc.gov.cn", "閿﹀窞甯傛埧鍦颁骇淇℃伅缃�"); + SOURCE_MAP.put("0311fang.com", "鐭虫埧缃�"); + SOURCE_MAP.put("h0591.com", "娴疯タ鎴夸骇缃�"); + SOURCE_MAP.put("home77.com", "鎴胯缃�"); + SOURCE_MAP.put("365jilin.com", "鍚夊拰鎴夸骇"); + SOURCE_MAP.put("yc38.com", "鎵垚缃�"); + SOURCE_MAP.put("jifcw.cn", "娴庡畞鍟嗗搧鎴跨綉涓婂妗�"); + SOURCE_MAP.put("sgjsj.gov.cn", "闊跺叧鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("xmfc.com", "鍘﹂棬鎴夸骇缃�"); + SOURCE_MAP.put("bffdc.gov.cn", "骞抽《灞辨埧绠$洃绠℃煡璇�"); + SOURCE_MAP.put("zhongfun.cn", "涓埧鍦ㄧ嚎"); + SOURCE_MAP.put("haowu.cn", "濂藉眿涓浗"); + SOURCE_MAP.put("wuxifc.cn", "鏃犻敗鎴夸骇缃�"); + SOURCE_MAP.put("ytfcjy.com", "鐑熷彴鎴夸骇浜ゆ槗缃�"); + SOURCE_MAP.put("lzfc.com.cn", "鍏板窞鍟嗗搧鎴�"); + SOURCE_MAP.put("ddfc.com.cn", "涓逛笢鎴夸骇浜ゆ槗缃�"); + SOURCE_MAP.put("gzfcj.gov.cn", "璧e窞鎴跨灞�"); + SOURCE_MAP.put("f024.com", "娌堥槼鎴垮湴浜х綉"); + SOURCE_MAP.put("0736house.com", "甯稿痉涔版埧缃�"); + SOURCE_MAP.put("beihaire.gov.cn", "鍖楁捣鎴垮湴浜�"); + SOURCE_MAP.put("0736fdc.com", "甯稿痉甯傛埧鍦颁骇淇℃伅缃�"); + SOURCE_MAP.put("changdefang.com", "甯稿痉鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("ncfdj.gov.cn", "鍗楀厖甯傛埧鍦颁骇绠$悊灞�"); + SOURCE_MAP.put("laho.gov.cn", "闃冲厜瀹剁紭"); + SOURCE_MAP.put("18qiang.com", "鍗佸叓鑵�"); + SOURCE_MAP.put("pjsfw.com", "娴︽睙鎼滄埧缃�"); + SOURCE_MAP.put("ykhfw.com", "姘稿悍濂芥埧缃�"); + SOURCE_MAP.put("tsfcxx.com", "鍞愬北鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("yzfdc.cn", "鎵窞鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("0710hf.com", "瑗勯槼濂芥埧缃�"); + SOURCE_MAP.put("huizhou.gov.cn", "鎯犲窞鎴跨灞�"); + SOURCE_MAP.put("tyfdc.gov.cn", "澶師鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("bbfcjyw.com", "铓屽煚鎴夸骇浜ゆ槗缃�"); + SOURCE_MAP.put("400114.com", "114鎼滄埧缃�"); + SOURCE_MAP.put("ccfdw.gov.cn", "闀挎槬鎴夸骇缃�"); + SOURCE_MAP.put("ptajw.com", "鑾嗙敯瀹夊眳缃�"); + SOURCE_MAP.put("zzfc.com", "鏍床鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("qybc.cn", "鐧惧窛鎴夸骇缃�"); + SOURCE_MAP.put("0312fc.com.cn", "淇濆畾鎴夸骇缃慱0312fc"); + SOURCE_MAP.put("h0758.net", "鑲囨埧缃�"); + SOURCE_MAP.put("fdc.com", "鎴垮湴浜т俊鎭�"); + SOURCE_MAP.put("ftw.com", "鎴垮洟缃�"); + SOURCE_MAP.put("czftw.com", "甯稿窞鎴垮洟缃�"); + SOURCE_MAP.put("baidu.com", "鐧惧害涔愬眳"); + SOURCE_MAP.put("jiazhuly.com", "瀹朵綇涓存矀"); + SOURCE_MAP.put("zznews.gov.cn", "鏍床鏂伴椈缃�"); + SOURCE_MAP.put("bdfdc.net", "淇濆畾鎴夸骇浜ゆ槗涓績"); + SOURCE_MAP.put("ythouse.com", "鐑熷彴鎴垮湴浜х綉"); + SOURCE_MAP.put("jzfc.gov.cn", "鑽嗗窞甯傛埧绠″眬"); + SOURCE_MAP.put("jz6.com", "鑽嗗窞妤肩洏缃�"); + SOURCE_MAP.put("hnzz.cc", "鏍床妤煎競缃�"); + SOURCE_MAP.put("qzfc.com", "澶ф硥宸炴埧浜х綉"); + SOURCE_MAP.put("zghouse.net", "涓浗鎴垮湴浜х綉"); + SOURCE_MAP.put("qzfdcgl.com", "琛㈠窞甯傛埧鍦颁骇绠$悊澶�"); + SOURCE_MAP.put("ajzfw.com", "瀹夊悏鎴夸骇缃�"); + SOURCE_MAP.put("rexian.net.cn", "姝︽眽鐑嚎鎴夸骇缃�"); + SOURCE_MAP.put("zjcxfc.cn", "闀垮叴閫忔槑鍞埧缃�"); + SOURCE_MAP.put("ajrjw.cn", "瀹夊悏浜哄眳缃�"); + SOURCE_MAP.put("jx.123fc.com", "123鎴夸骇缃�"); + SOURCE_MAP.put("qd8.com.cn", "蹇偣8"); + SOURCE_MAP.put("123sfw.cn", "瑙嗘埧缃�"); + SOURCE_MAP.put("jtfdc.com.cn", "閲戝潧鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("fang.tm", "鎴垮挅"); + SOURCE_MAP.put("czfdc.com.cn", "甯稿窞鍟嗗搧鎴夸俊鎭�"); + SOURCE_MAP.put("x3fang.com", "棣欏北鎴夸骇缃�"); + SOURCE_MAP.put("tuitui99.com", "鎺ㄦ帹99鎴夸骇缃�"); + SOURCE_MAP.put("baixing.com", "鐧惧缃�"); + SOURCE_MAP.put("xcsfcjyw.com", "璁告槍鎴夸骇浜ゆ槗淇℃伅缃�"); + SOURCE_MAP.put("douanju.com", "閮藉畨灞�"); + SOURCE_MAP.put("ccoo.cn", "鍩庡競涓浗缃�"); + SOURCE_MAP.put("o912.com", "姒嗘灄鎴夸骇缃�"); + SOURCE_MAP.put("yes515.com", "515鎴夸骇缃�"); + SOURCE_MAP.put("fayo.net", "椋炴壃缃�"); + SOURCE_MAP.put("lejuhouses.com", "娓崡涔愬眳缃�"); + SOURCE_MAP.put("zjfgj.cn", "婀涙睙鎴跨灞�"); + SOURCE_MAP.put("ylfcxx.com", "姒嗘灄鎴夸骇"); + SOURCE_MAP.put("tjfdc.gov.cn", "澶╂触甯傚浗鍦熻祫婧愬拰鎴垮眿绠$悊灞�鏀垮姟闂ㄦ埛"); + SOURCE_MAP.put("baijuyi.com.cn", "鐧惧眳鏄�"); + SOURCE_MAP.put("hyfc365.com", "琛¢槼鎴夸骇鏀垮姟缃�"); + SOURCE_MAP.put("wnfcw.cn", "娓崡鎴夸骇缃�"); + SOURCE_MAP.put("ycsfdc.com", "杩愬煄甯傛埧淇$綉"); + SOURCE_MAP.put("kfang.com.cn", "鐪嬫埧缃�"); + SOURCE_MAP.put("0359sh.com", "鐢熸椿缃�"); + SOURCE_MAP.put("ordosfg.gov.cn", "閯傚皵澶氭柉鎴夸骇灞�"); + SOURCE_MAP.put("0470jiaxing.com", "瀹跺叴鎴夸骇"); + SOURCE_MAP.put("sxhouse.gov.cn", "缁嶅叴鎴跨灞�淇℃伅缃�"); + SOURCE_MAP.put("hbczfdc.gov.cn", "娌у窞甯傛埧浜т俊鎭綉"); + SOURCE_MAP.put("ksfc.gov.cn", "鏄嗗北鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("zjfdc.gov.cn", "闀囨睙鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("sdchina.com", "涓浗灞变笢缃�"); + SOURCE_MAP.put("haozu.com", "濂界缃�"); + SOURCE_MAP.put("sjzfgj.gov.cn", "鐭冲搴勬埧绠″眬"); + SOURCE_MAP.put("tjfdc.com.cn", "澶╂触鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("0772fang.com", "鏌虫埧缃�"); + SOURCE_MAP.put("fsjw.gov.cn", "浣涘北鎴垮湴浜х綉"); + SOURCE_MAP.put("dg.gov.cn", "涓滆帪鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("yuefc.com", "闃呮埧缃�"); + SOURCE_MAP.put("spfcj.gov.cn", "鍥涘钩甯備綇鎴垮拰鍩庝埂寤鸿灞�"); + SOURCE_MAP.put("wnfdc.com", "娓崡鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("lousw.com", "鐩愬煄鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("xinnanyang.com", "鍗楅兘缃�"); + SOURCE_MAP.put("zhzgj.gov.cn", "鐝犳捣鍟嗗搧鎴块攢鍞綉"); + SOURCE_MAP.put("jyfg.cn", "鎻槼鎴跨灞�"); + SOURCE_MAP.put("zbzzfdc.gov.cn", "娣勫崥鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("lianm.com", "澶ц薄鎴夸骇缃�"); + SOURCE_MAP.put("maoming.gov.cn", "鑼傚悕鎴跨灞�"); + SOURCE_MAP.put("wftzfc.com", "澶╂辰鎴夸骇缃�"); + SOURCE_MAP.put("js.cn", "鏄嗗北鎴夸骇缃�"); + SOURCE_MAP.put("51fdc.com", "鏃犲咖鎴跨綉"); + SOURCE_MAP.put("shangdu.com", "鍟嗛兘缃�"); + SOURCE_MAP.put("lffx.org", "涓存本鎴夸骇缃�"); + SOURCE_MAP.put("xycj.gov.cn", "鍜搁槼浣忔埧瑙勫垝灞�"); + SOURCE_MAP.put("lnfcw.net", "杈藉畞鎴夸骇缃�"); + SOURCE_MAP.put("zgfdc.gov.cn", "鑷础鎴跨灞�"); + SOURCE_MAP.put("nyloushi.com", "鍗楅槼妤煎競"); + SOURCE_MAP.put("http://www.myfdc.com.cn/", "缁甸槼鎴垮湴浜�"); + SOURCE_MAP.put("www.51banban.com", "鍔炲姙缃�"); + SOURCE_MAP.put("51258.cn", "浜冲窞鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("ahbzfdc.com", "浜冲窞甯備綇瀹呬笌鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("binfang.com", "婊ㄦ埧缃�"); + SOURCE_MAP.put("cdfgj.gov.cn", "鎴愰兘甯傛埧绠″眬"); + SOURCE_MAP.put("bzfccs.com", "婊ㄥ窞鎴夸骇瓒呭競缃�"); + SOURCE_MAP.put("bzcm.net", "婊ㄥ窞浼犲獟"); + SOURCE_MAP.put("www.kmhouse.org", "鏄嗘槑甯傛埧浜т俊鎭綉"); + SOURCE_MAP.put("yskfc.com", "婧ч槼椤哄紑鎴夸骇缃�"); + SOURCE_MAP.put("hualongxiang.com", "鍖栭緳宸�"); + SOURCE_MAP.put("dyfc.net", "涓滆惀鎴夸骇缃�"); + SOURCE_MAP.put("dyfc.gov.cn", "涓滆惀浣忓畢涓庢埧鍦颁骇淇℃伅缃�"); + SOURCE_MAP.put("0597ok.com", "榫欏博鎴垮湴浜ц仈鍚堢綉"); + SOURCE_MAP.put("qinzf.com", "閽﹀窞浣忔埧缃�"); + SOURCE_MAP.put("5j5z.cn", "灏忚榧犵綉"); + SOURCE_MAP.put("lanfw.com", "钃濇埧缃�"); + SOURCE_MAP.put("yxfdc.com", "鐜夋邯鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("fdc.cn", "婕冲窞鎴垮湴浜�"); + SOURCE_MAP.put("596fc.com", "596婕冲窞鎴夸骇缃�"); + SOURCE_MAP.put("0596fc.com", "婕冲窞鎴夸骇鍦ㄧ嚎"); + SOURCE_MAP.put("fangdd.com", "鎴垮澶�"); + SOURCE_MAP.put("bianmin369.com", "渚挎皯369"); + SOURCE_MAP.put("wxdszy.com", "榧庣洓缃笟"); + SOURCE_MAP.put("fangyi.com", "鎴夸竴缃�"); + SOURCE_MAP.put("enshifdc.com", "鎭╂柦鎴跨綉"); + SOURCE_MAP.put("youfangw.com", "娓告埧缃�"); + SOURCE_MAP.put("esfdc.cn", "鎭╂柦鎴夸骇缃慹sfdc.cn"); + SOURCE_MAP.put("lingd.cc", "鏂囧北鎴垮湴浜х綉"); + SOURCE_MAP.put("dhfdc.net.cn", "寰峰畯鎴垮湴浜�"); + SOURCE_MAP.put("dhfcw.com", "寰峰畯鎴夸骇闂ㄦ埛"); + SOURCE_MAP.put("msuccessgroup.com", "涓�鎵嬫埧淇℃伅鐩戞祴绯荤粺"); + SOURCE_MAP.put("njfang.net", "鎬掓睙鎴夸骇缃�"); + SOURCE_MAP.put("qxnfc.cn", "榛旇タ鍗楁埧浜х綉"); + SOURCE_MAP.put("kuyiso.com", "閰锋槗鎼�"); + SOURCE_MAP.put("bazhou5.com", "宸村窞缃�"); + SOURCE_MAP.put("0854fcw.com", "榛斿崡鎴夸骇缃�"); + SOURCE_MAP.put("qnzfc.com", "榛斿崡鎴夸骇"); + SOURCE_MAP.put("haidong360.com", "娴蜂笢鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("linfang.cc", "涓村鎴夸骇缃�"); + SOURCE_MAP.put("53xj.com", "鏂扮枂鎴夸骇缃�"); + SOURCE_MAP.put("xyzc.cn", "鍏翠箟涔嬬獥"); + SOURCE_MAP.put("0941gn.com", "鐢樺崡宸炵敓娲荤綉"); + SOURCE_MAP.put("xbaixing.com", "灏忕櫨濮撶綉"); + SOURCE_MAP.put("98znz.com", "98鎸囧崡閽�"); + SOURCE_MAP.put("xinxiniao.com", "淇℃伅楦�"); + SOURCE_MAP.put("fcqdn.com", "榛斾笢鍗楃埍鎴跨綉"); + SOURCE_MAP.put("klfcw.com", "鍑噷鎴夸骇缃�"); + SOURCE_MAP.put("qdnzfc.cn", "榛斾笢鍗楁埧浜х綉"); + SOURCE_MAP.put("58.com", "58鍚屽煄"); + SOURCE_MAP.put("rkzzx.com", "鏃ュ鍒欏湪绾�"); + SOURCE_MAP.put("qionghaif.com", "鐞兼捣鎴夸骇缃�"); + SOURCE_MAP.put("home898.com", "娴峰崡鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("qionghaifc.com", "鐞兼捣鎴夸骇"); + SOURCE_MAP.put("qhbmw.net", "鐞兼捣渚挎皯缃�"); + SOURCE_MAP.put("qionghai7.com", "娴锋埧缃戜簩鎵嬫埧"); + SOURCE_MAP.put("hnfccs.com", "娴峰崡鎴夸骇瓒呭競缃�"); + SOURCE_MAP.put("qiongzhongfdc.com", "鐞间腑鎴夸骇缃�"); + SOURCE_MAP.put("dinganfc.com", "瀹氬畨鎴夸骇缃�"); + SOURCE_MAP.put("wfang.cn", "涓囨埧缃�"); + SOURCE_MAP.put("dinganfc.com", "瀹氬畨鎴夸骇缃�"); + SOURCE_MAP.put("dinganfdc.com", "瀹氬畨鎴夸骇缃慸inganfdc"); + SOURCE_MAP.put("cmfdc.com.cn", "婢勮繄鎴垮湴浜х綉"); + SOURCE_MAP.put("lingaofdc.com", "涓撮珮鎴垮湴浜х綉"); + SOURCE_MAP.put("gfw0898.com", "娴峰崡璐埧缃�"); + SOURCE_MAP.put("fangfang.net", "鎴挎埧缃�-娴峰崡"); + SOURCE_MAP.put("100fangchan.com", "鐧惧勾鎴夸骇缃�"); + SOURCE_MAP.put("hnlefang.com", "涔愭埧缃�-娴峰崡"); + SOURCE_MAP.put("hnlefang.com", "涔愭埧缃�-娴峰崡"); + SOURCE_MAP.put("0898ldfc.com", "娴峰崡钃濆矝鎴夸骇缃�"); + SOURCE_MAP.put("dongffc.cn", "涓滄柟鎴夸骇缃�"); + SOURCE_MAP.put("dongfang6.com", "鐐瑰嚮涓滄柟"); + SOURCE_MAP.put("dongfang0898.com", "涓滄柟鍦ㄧ嚎"); + SOURCE_MAP.put("snjfw.com", "绁炲啘鏋剁櫨浜嬮��"); + SOURCE_MAP.put("xinfang400.com", "娆f埧缃�"); + SOURCE_MAP.put("snjfw.com", "绁炲啘鏋剁櫨浜嬮��"); + SOURCE_MAP.put("ludedc.com", "缁垮痉鍦颁骇缃�"); + SOURCE_MAP.put("isnj.cn", "绁炲啘鏋堕棬鎴风綉"); + SOURCE_MAP.put("isnj.cn", "绁炲啘鏋堕棬鎴风綉"); + SOURCE_MAP.put("dadou.com", "绁炲啘鏋跺ぇ璞嗙敓娲荤綉"); + SOURCE_MAP.put("wcfcw.net", "娴锋埧缃戜簩鎵�"); + SOURCE_MAP.put("afangw.com", "瀹夋埧缃�"); + SOURCE_MAP.put("hnesf.net", "娴峰崡浜屾墜鎴跨綉"); + SOURCE_MAP.put("ihfang.com", "鐖卞ソ鎴跨綉"); + SOURCE_MAP.put("maodong8.com", "鐚啲缃�"); + SOURCE_MAP.put("hinews.cn", "鍦颁骇娴峰崡"); + SOURCE_MAP.put("mf528.com", "娴峰崡涔版埧缃�"); + SOURCE_MAP.put("baishafc.com", "鐧芥矙鎴垮湴浜х綉"); + SOURCE_MAP.put("hfunzx.com", "娴锋埧鍦ㄧ嚎"); + SOURCE_MAP.put("hfunzx.com", "娴锋埧鍦ㄧ嚎"); + SOURCE_MAP.put("0898meituan.com", "缇庢埧鍥�"); + SOURCE_MAP.put("0898f.com", "瑙傛埧缃�"); + SOURCE_MAP.put("hnyouju.com", "涓撮珮鎴夸骇缃慼nyouju.com"); + SOURCE_MAP.put("365hfw.com", "365娴锋埧缃�"); + SOURCE_MAP.put("chengmaidc.com", "婢勮繄鎴夸骇缃�"); + SOURCE_MAP.put("xj.cn", "鏂扮枂缃�"); + SOURCE_MAP.put("5douy.com", "鎴戦兘鏈�"); + SOURCE_MAP.put("xamfcxx.com", "鍏村畨鐩熸埧浜т俊鎭綉"); + SOURCE_MAP.put("f391.com", "娴庢簮鎴夸骇缃�"); + SOURCE_MAP.put("f0482.com", "鍏村畨鐩熸埧鍦颁骇缃�"); + SOURCE_MAP.put("xuanhuajie.com", "娴庢簮淇℃伅缃�"); + SOURCE_MAP.put("souyi.cc", "鎼滄槗缃�"); + SOURCE_MAP.put("jyloushi.com", "娴庢簮妤煎競缃�"); + SOURCE_MAP.put("fczx.com", "涓浗鎴夸骇鍦ㄧ嚎"); + SOURCE_MAP.put("enshifdc.com", "鎭╂柦鎴跨綉"); + SOURCE_MAP.put("qxnfdc.cn", "榛旇タ鍗楁埧鍦颁骇缃�"); + SOURCE_MAP.put("qxnfc.cn", "榛旇タ鍗楁埧浜х綉"); + SOURCE_MAP.put("szfdc.gov.cn", "娣卞湷甯傝鍒掑拰鍥藉湡璧勬簮缃�"); + SOURCE_MAP.put("yinuo1000.com", "涓�璇烘埧浜х綉"); + SOURCE_MAP.put("xhengshui.com", "琛℃按鏄撴埧缃�"); + SOURCE_MAP.put("hsfang.cn", "琛℃按鎴垮"); + SOURCE_MAP.put("52zjk.cn", "寮犲灒鐢熸椿缃�"); + SOURCE_MAP.put("zjkhome.net", "寮犲鍙fゼ甯傜綉"); + SOURCE_MAP.put("zjk169.net", "寮犲鍙fゼ鐩樼綉"); + SOURCE_MAP.put("wxhouse.com", "鏃犻敗鎴垮湴浜у競鍦虹綉"); + SOURCE_MAP.put("zhangjk.com", "寮犲鍙g綉鎴夸骇"); + SOURCE_MAP.put("ohqly.com", "鍗冮噷鐪�"); + SOURCE_MAP.put("xyzc.cn", "鍏翠箟涔嬬獥"); + SOURCE_MAP.put("fdc0859.com", "鍏翠箟鎴垮湴浜х綉"); + SOURCE_MAP.put("0854fcw.com", "榛斿崡鎴夸骇缃�"); + SOURCE_MAP.put("qnzfc.com", "榛斿崡鎴夸骇"); + SOURCE_MAP.put("duyunfcw.com", "閮藉寑鎴夸骇缃�"); + SOURCE_MAP.put("wsfcw.cc", "鏂囧北鎴夸骇缃�"); + SOURCE_MAP.put("dhfcw.com", "寰峰畯鎴夸骇闂ㄦ埛"); + SOURCE_MAP.put("linfang.cc", "涓村鎴夸骇缃�"); + SOURCE_MAP.put("gannanzhou.com.cn", "鐢樺崡涔嬬獥"); + SOURCE_MAP.put("gnzxxw.com", "鐢樺崡淇℃伅缃�"); SOURCE_MAP.put("go007.com", "go007"); - SOURCE_MAP.put("zgfc168.com", "自贡房产168"); - SOURCE_MAP.put("pzhfc.cn", "攀枝花房管局"); - SOURCE_MAP.put("yafc.gov.cn", "延安房产网"); - SOURCE_MAP.put("ljhouse.org", "丽江房产信息网"); - SOURCE_MAP.put("6psfc.com", "六盘水房屋信息网"); - SOURCE_MAP.put("lesohome.com", "乐搜房产网"); - SOURCE_MAP.put("lpsfdc.cn", "六盘水房产信息网"); - SOURCE_MAP.put("lpsfcw.cn", "六盘水房产网"); - SOURCE_MAP.put("rkzzx.com", "日喀则在线"); - SOURCE_MAP.put("1loushi.cn", "第1楼市"); - SOURCE_MAP.put("zhuapo.com", "抓破网"); - SOURCE_MAP.put("mapbar.com", "图吧"); - SOURCE_MAP.put("dqccc.com", "全球港"); - SOURCE_MAP.put("jiu6.com", "旧网"); - SOURCE_MAP.put("qu114.com", "去114"); - SOURCE_MAP.put("blxxw.com", "博乐信息网"); - SOURCE_MAP.put("lbx.cc", "老百姓网"); - SOURCE_MAP.put("ylnet.com.cn", "绿河谷"); - SOURCE_MAP.put("f391.com", "济源房产网"); - SOURCE_MAP.put("0898fz.com", "房道网"); - SOURCE_MAP.put("999house.com", "九房网"); - SOURCE_MAP.put("yaoanjia.com", "要安家"); - SOURCE_MAP.put("yaoanjia.co", "要安家"); - SOURCE_MAP.put("0898pf.com", "品房阁"); - SOURCE_MAP.put("zzcangzhou.com", "住在沧州"); - SOURCE_MAP.put("hinews.cn", "地产海南"); - SOURCE_MAP.put("yigouf.com", "易购房"); - SOURCE_MAP.put("yyly66.com", "博鳌椰韵"); - SOURCE_MAP.put("0313f.cn", "张家口房产网"); - SOURCE_MAP.put("0313f.cn", "张家口房产网"); - SOURCE_MAP.put("dalifcw.com", "大理房产网"); - SOURCE_MAP.put("0898yue.com", "海南阅房网"); - SOURCE_MAP.put("hifdc.com", "掌房网"); - SOURCE_MAP.put("qionghaif.com", "琼海房产网"); - SOURCE_MAP.put("qionghai7.com", "海房网-1"); - SOURCE_MAP.put("571400.net", "琼海信息网"); - SOURCE_MAP.put("ylfct.com", "房产网_ylfct"); - SOURCE_MAP.put("housegx.cn", "玉贵网"); - SOURCE_MAP.put("0853fdc.com", "0853房产网"); - SOURCE_MAP.put("zhongfangwang.com", "众房网"); - SOURCE_MAP.put("qionghaifc.com", "琼海房产"); - SOURCE_MAP.put("0898hfw.com", "海南好房网"); - SOURCE_MAP.put("home898.com", "海南房产信息网"); - SOURCE_MAP.put("haifangzi.com", "海房子"); - SOURCE_MAP.put("haifangwu.com", "海房屋"); - SOURCE_MAP.put("hnfccs.com", "海南房产超市网"); - SOURCE_MAP.put("afangw.com", "安房网"); - SOURCE_MAP.put("lexinfang.com", "乐新房"); - SOURCE_MAP.put("0898ffw.com", "富房网"); - SOURCE_MAP.put("wcfcw.net", "海房网住宅"); - SOURCE_MAP.put("0898-f.com", "海南房产网0898-f.com"); - SOURCE_MAP.put("hnhfang.com", "海南房产信息网hnhfang"); - SOURCE_MAP.put("danzhoufdc.com", "儋州房产网"); - SOURCE_MAP.put("ludedc.com", "绿德地产网"); - SOURCE_MAP.put("trfcw.com", "铜仁房产网trfcw"); - SOURCE_MAP.put("haikoufz.com", "海口房产网"); - SOURCE_MAP.put("0898f.com", "观房网"); - SOURCE_MAP.put("hnhome.com", "海南楼盘网"); - SOURCE_MAP.put("hainan0898.net", "海南购房"); - SOURCE_MAP.put("xycb.cn", "祥云传播"); - SOURCE_MAP.put("hd3158.cn", "图房网"); - SOURCE_MAP.put("exuanjia.com", "选家网"); - SOURCE_MAP.put("exuanjia.com", "选家网"); - SOURCE_MAP.put("swfce.cn", "汕尾房产网"); - SOURCE_MAP.put("swfgj.gov.cn", "汕尾市房管局"); - SOURCE_MAP.put("fcgzf.com", "防城港住房网"); - SOURCE_MAP.put("fcfcg.com", "防城港市房产网"); - SOURCE_MAP.put("czfdcw.net", "网上家缘"); - SOURCE_MAP.put("hzfgj.com", "菏泽住宅与房地产信息网"); - SOURCE_MAP.put("ufangw.com", "优房网"); - SOURCE_MAP.put("gxwuzhou.com", "鸳江生活网"); - SOURCE_MAP.put("0701fc.com", "鹰潭房产网0701fc"); - SOURCE_MAP.put("0701.com", "鹰潭房产网0701"); - SOURCE_MAP.put("0473fdc.com", "乌海房产网"); - SOURCE_MAP.put("0857fc.cn", "毕节房产网"); - SOURCE_MAP.put("0898hf.net", "海南好房在线"); - SOURCE_MAP.put("0898hn.net", "海南房产在线"); - SOURCE_MAP.put("wuzhousky.com", "梧州时空网"); - SOURCE_MAP.put("ytfc.gov.cn", "鹰潭市房产信息网"); - SOURCE_MAP.put("feoou.org", "拉萨房地产交易网"); - SOURCE_MAP.put("baiyin.cn", "白银房地产管理局"); - SOURCE_MAP.put("0898cfw.com", "海南诚房网"); - SOURCE_MAP.put("lingaofc.com", "临高房产网"); - SOURCE_MAP.put("ihfang.com", "爱好房网"); - SOURCE_MAP.put("hnfuleju.com", "富乐居"); - SOURCE_MAP.put("fangdr.com", "房博士"); - SOURCE_MAP.put("wzfg.com.cn", "梧州房交网"); - SOURCE_MAP.put("gzbjfc.com", "毕节房产市场"); - SOURCE_MAP.put("hcsfcglj.com", "河池房管局"); - SOURCE_MAP.put("dahainan.com", "亚房网"); - SOURCE_MAP.put("ccfdw.cn", "长春房产网"); - SOURCE_MAP.put("jnfdc.gov.cn", "济南房地产信息局"); - SOURCE_MAP.put("sjzfgj.gov.cn", "石家庄房产信息网"); - SOURCE_MAP.put("szfcweb", "苏州网上房地产"); - SOURCE_MAP.put("qhbmw.net", "琼海便民网"); - SOURCE_MAP.put(".czfdc.com.cn", "常州房地产信息网"); - SOURCE_MAP.put("dongffc.cn", "东方房地产网"); - SOURCE_MAP.put("dongfang6.com", "点击东方"); - SOURCE_MAP.put("suzhoufcw.com", "宿州易查网"); - SOURCE_MAP.put("czhome.com.cn", "滁州网上房地产"); - SOURCE_MAP.put("ycfdcxxw.gov.cn", "宜春房信网"); - SOURCE_MAP.put("0795dcw.com", "宜春地产网"); - SOURCE_MAP.put("yichunfc.com", "宜春房产网"); - SOURCE_MAP.put("jxych.cn", "达成宜春房产网"); - SOURCE_MAP.put("jyjfdc.com", "居一家房地产"); - SOURCE_MAP.put("sxczfdc.com", "长治住房信息网"); - SOURCE_MAP.put("qzfdcgl.com", "衢州市房地产管理政务网"); - SOURCE_MAP.put("vipoa.net", "中卫住房建设局"); - SOURCE_MAP.put("yzfdc.cn", "扬州房地产信息网"); - SOURCE_MAP.put("0745hhfc.com", "怀化购房信息网"); - SOURCE_MAP.put("yq918.com", "阳泉家园网"); - SOURCE_MAP.put("sxyqfdc.com", "阳泉住房信息网"); - SOURCE_MAP.put("hgfgj.com", "黄冈房地产管理局"); - SOURCE_MAP.put("syfg.org.cn", "松原房产信息网"); - SOURCE_MAP.put("songyuanfang.com", "松原购房网"); - SOURCE_MAP.put("chafangwang.com", "CFW查房网"); - SOURCE_MAP.put("wwsjw.gov.cn", "武威市住房和城乡建设局"); - SOURCE_MAP.put("wwfcw.com", "武威二手房网"); - SOURCE_MAP.put("0915home.com", "安康房地产信息网"); - SOURCE_MAP.put("ankang.net", "安康房产网"); - SOURCE_MAP.put("akfang.com", "安康房地产门户网"); - SOURCE_MAP.put("xcfdc.cn", "宣城网上房地产"); - SOURCE_MAP.put("llsfdc.com", "吕梁住房信息网"); - SOURCE_MAP.put("xxfdc.gov.cn", "新乡房产管理信息网"); - SOURCE_MAP.put("hnrealestate.gov.cn", "临高县住宅信息网"); - SOURCE_MAP.put("dinganfc.cn", "定安住宅与房地产信息网"); - SOURCE_MAP.put("hotfcw.com", "热点房产网"); - SOURCE_MAP.put("726000.net", "商洛房产网"); - SOURCE_MAP.put("sluof.cn", "商洛房产网sluof"); - SOURCE_MAP.put("fdc0737.com", "0737房产网"); - SOURCE_MAP.put("jmfc.com.cn", "荆门房产热线"); - SOURCE_MAP.put("0775fw.com", "贵居网"); - SOURCE_MAP.put("365kl.net", "快乐房产"); - SOURCE_MAP.put("smxloushi.com", "三门峡楼市"); - SOURCE_MAP.put("jmfdc.gov.cn", "荆门房管网"); - SOURCE_MAP.put("gxgg.gov.cn", "贵港市房管局"); - SOURCE_MAP.put("fxfdcw.com", "阜新市房产信息网"); - SOURCE_MAP.put("fc0775.com", "贵港房产热线"); - SOURCE_MAP.put("0478fdc.com", "巴彦淖尔房地产网"); - SOURCE_MAP.put("brfcw.com", "巴房网"); - SOURCE_MAP.put("gafdc.cn", "广安市房产交易平台"); - SOURCE_MAP.put("bynefc.com", "巴彦淖尔房产"); - SOURCE_MAP.put("0352fang.com", "大同房产网"); - SOURCE_MAP.put("dtfc.gov.cn", "大同市房产信息网"); - SOURCE_MAP.put("dahoutao.com", "大后套网"); - SOURCE_MAP.put("dangdi.cc", "当地网"); - SOURCE_MAP.put("hbloushi.com", "鹤壁楼市"); - SOURCE_MAP.put("szshouse.com", "石嘴山房产信息网"); - SOURCE_MAP.put("myfcxx.com", "绵阳房产信息网"); - SOURCE_MAP.put("fjnpfdc.com", "南平市房信网"); - SOURCE_MAP.put("jjshome.com", "家家顺房产网"); - SOURCE_MAP.put("ffw.com.cn", "福房网"); - SOURCE_MAP.put("lehuozaixian.com", "乐活在线"); - SOURCE_MAP.put("zkloushi.com", "周口楼市网"); - SOURCE_MAP.put("haofang5.com", "好房网haofang5"); - SOURCE_MAP.put("tlfdc.cn", "铜陵房地产信息网"); - SOURCE_MAP.put("sysfcj.com", "邵阳市房产局"); - SOURCE_MAP.put("focus.cn", "搜狐焦点"); + SOURCE_MAP.put("zgfc168.com", "鑷础鎴夸骇168"); + SOURCE_MAP.put("pzhfc.cn", "鏀�鏋濊姳鎴跨灞�"); + SOURCE_MAP.put("yafc.gov.cn", "寤跺畨鎴夸骇缃�"); + SOURCE_MAP.put("ljhouse.org", "涓芥睙鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("6psfc.com", "鍏洏姘存埧灞嬩俊鎭綉"); + SOURCE_MAP.put("lesohome.com", "涔愭悳鎴夸骇缃�"); + SOURCE_MAP.put("lpsfdc.cn", "鍏洏姘存埧浜т俊鎭綉"); + SOURCE_MAP.put("lpsfcw.cn", "鍏洏姘存埧浜х綉"); + SOURCE_MAP.put("rkzzx.com", "鏃ュ杸鍒欏湪绾�"); + SOURCE_MAP.put("1loushi.cn", "绗�1妤煎競"); + SOURCE_MAP.put("zhuapo.com", "鎶撶牬缃�"); + SOURCE_MAP.put("mapbar.com", "鍥惧惂"); + SOURCE_MAP.put("dqccc.com", "鍏ㄧ悆娓�"); + SOURCE_MAP.put("jiu6.com", "鏃х綉"); + SOURCE_MAP.put("qu114.com", "鍘�114"); + SOURCE_MAP.put("blxxw.com", "鍗氫箰淇℃伅缃�"); + SOURCE_MAP.put("lbx.cc", "鑰佺櫨濮撶綉"); + SOURCE_MAP.put("ylnet.com.cn", "缁挎渤璋�"); + SOURCE_MAP.put("f391.com", "娴庢簮鎴夸骇缃�"); + SOURCE_MAP.put("0898fz.com", "鎴块亾缃�"); + SOURCE_MAP.put("999house.com", "涔濇埧缃�"); + SOURCE_MAP.put("yaoanjia.com", "瑕佸畨瀹�"); + SOURCE_MAP.put("yaoanjia.co", "瑕佸畨瀹�"); + SOURCE_MAP.put("0898pf.com", "鍝佹埧闃�"); + SOURCE_MAP.put("zzcangzhou.com", "浣忓湪娌у窞"); + SOURCE_MAP.put("hinews.cn", "鍦颁骇娴峰崡"); + SOURCE_MAP.put("yigouf.com", "鏄撹喘鎴�"); + SOURCE_MAP.put("yyly66.com", "鍗氶硨妞伴煹"); + SOURCE_MAP.put("0313f.cn", "寮犲鍙f埧浜х綉"); + SOURCE_MAP.put("0313f.cn", "寮犲鍙f埧浜х綉"); + SOURCE_MAP.put("dalifcw.com", "澶х悊鎴夸骇缃�"); + SOURCE_MAP.put("0898yue.com", "娴峰崡闃呮埧缃�"); + SOURCE_MAP.put("hifdc.com", "鎺屾埧缃�"); + SOURCE_MAP.put("qionghaif.com", "鐞兼捣鎴夸骇缃�"); + SOURCE_MAP.put("qionghai7.com", "娴锋埧缃�-1"); + SOURCE_MAP.put("571400.net", "鐞兼捣淇℃伅缃�"); + SOURCE_MAP.put("ylfct.com", "鎴夸骇缃慱ylfct"); + SOURCE_MAP.put("housegx.cn", "鐜夎吹缃�"); + SOURCE_MAP.put("0853fdc.com", "0853鎴夸骇缃�"); + SOURCE_MAP.put("zhongfangwang.com", "浼楁埧缃�"); + SOURCE_MAP.put("qionghaifc.com", "鐞兼捣鎴夸骇"); + SOURCE_MAP.put("0898hfw.com", "娴峰崡濂芥埧缃�"); + SOURCE_MAP.put("home898.com", "娴峰崡鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("haifangzi.com", "娴锋埧瀛�"); + SOURCE_MAP.put("haifangwu.com", "娴锋埧灞�"); + SOURCE_MAP.put("hnfccs.com", "娴峰崡鎴夸骇瓒呭競缃�"); + SOURCE_MAP.put("afangw.com", "瀹夋埧缃�"); + SOURCE_MAP.put("lexinfang.com", "涔愭柊鎴�"); + SOURCE_MAP.put("0898ffw.com", "瀵屾埧缃�"); + SOURCE_MAP.put("wcfcw.net", "娴锋埧缃戜綇瀹�"); + SOURCE_MAP.put("0898-f.com", "娴峰崡鎴夸骇缃�0898-f.com"); + SOURCE_MAP.put("hnhfang.com", "娴峰崡鎴夸骇淇℃伅缃慼nhfang"); + SOURCE_MAP.put("danzhoufdc.com", "鍎嬪窞鎴夸骇缃�"); + SOURCE_MAP.put("ludedc.com", "缁垮痉鍦颁骇缃�"); + SOURCE_MAP.put("trfcw.com", "閾滀粊鎴夸骇缃憈rfcw"); + SOURCE_MAP.put("haikoufz.com", "娴峰彛鎴夸骇缃�"); + SOURCE_MAP.put("0898f.com", "瑙傛埧缃�"); + SOURCE_MAP.put("hnhome.com", "娴峰崡妤肩洏缃�"); + SOURCE_MAP.put("hainan0898.net", "娴峰崡璐埧"); + SOURCE_MAP.put("xycb.cn", "绁ヤ簯浼犳挱"); + SOURCE_MAP.put("hd3158.cn", "鍥炬埧缃�"); + SOURCE_MAP.put("exuanjia.com", "閫夊缃�"); + SOURCE_MAP.put("exuanjia.com", "閫夊缃�"); + SOURCE_MAP.put("swfce.cn", "姹曞熬鎴夸骇缃�"); + SOURCE_MAP.put("swfgj.gov.cn", "姹曞熬甯傛埧绠″眬"); + SOURCE_MAP.put("fcgzf.com", "闃插煄娓綇鎴跨綉"); + SOURCE_MAP.put("fcfcg.com", "闃插煄娓競鎴夸骇缃�"); + SOURCE_MAP.put("czfdcw.net", "缃戜笂瀹剁紭"); + SOURCE_MAP.put("hzfgj.com", "鑿忔辰浣忓畢涓庢埧鍦颁骇淇℃伅缃�"); + SOURCE_MAP.put("ufangw.com", "浼樻埧缃�"); + SOURCE_MAP.put("gxwuzhou.com", "楦虫睙鐢熸椿缃�"); + SOURCE_MAP.put("0701fc.com", "楣版江鎴夸骇缃�0701fc"); + SOURCE_MAP.put("0701.com", "楣版江鎴夸骇缃�0701"); + SOURCE_MAP.put("0473fdc.com", "涔屾捣鎴夸骇缃�"); + SOURCE_MAP.put("0857fc.cn", "姣曡妭鎴夸骇缃�"); + SOURCE_MAP.put("0898hf.net", "娴峰崡濂芥埧鍦ㄧ嚎"); + SOURCE_MAP.put("0898hn.net", "娴峰崡鎴夸骇鍦ㄧ嚎"); + SOURCE_MAP.put("wuzhousky.com", "姊у窞鏃剁┖缃�"); + SOURCE_MAP.put("ytfc.gov.cn", "楣版江甯傛埧浜т俊鎭綉"); + SOURCE_MAP.put("feoou.org", "鎷夎惃鎴垮湴浜т氦鏄撶綉"); + SOURCE_MAP.put("baiyin.cn", "鐧介摱鎴垮湴浜х鐞嗗眬"); + SOURCE_MAP.put("0898cfw.com", "娴峰崡璇氭埧缃�"); + SOURCE_MAP.put("lingaofc.com", "涓撮珮鎴夸骇缃�"); + SOURCE_MAP.put("ihfang.com", "鐖卞ソ鎴跨綉"); + SOURCE_MAP.put("hnfuleju.com", "瀵屼箰灞�"); + SOURCE_MAP.put("fangdr.com", "鎴垮崥澹�"); + SOURCE_MAP.put("wzfg.com.cn", "姊у窞鎴夸氦缃�"); + SOURCE_MAP.put("gzbjfc.com", "姣曡妭鎴夸骇甯傚満"); + SOURCE_MAP.put("hcsfcglj.com", "娌虫睜鎴跨灞�"); + SOURCE_MAP.put("dahainan.com", "浜氭埧缃�"); + SOURCE_MAP.put("ccfdw.cn", "闀挎槬鎴夸骇缃�"); + SOURCE_MAP.put("jnfdc.gov.cn", "娴庡崡鎴垮湴浜т俊鎭眬"); + SOURCE_MAP.put("sjzfgj.gov.cn", "鐭冲搴勬埧浜т俊鎭綉"); + SOURCE_MAP.put("szfcweb", "鑻忓窞缃戜笂鎴垮湴浜�"); + SOURCE_MAP.put("qhbmw.net", "鐞兼捣渚挎皯缃�"); + SOURCE_MAP.put(".czfdc.com.cn", "甯稿窞鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("dongffc.cn", "涓滄柟鎴垮湴浜х綉"); + SOURCE_MAP.put("dongfang6.com", "鐐瑰嚮涓滄柟"); + SOURCE_MAP.put("suzhoufcw.com", "瀹垮窞鏄撴煡缃�"); + SOURCE_MAP.put("czhome.com.cn", "婊佸窞缃戜笂鎴垮湴浜�"); + SOURCE_MAP.put("ycfdcxxw.gov.cn", "瀹滄槬鎴夸俊缃�"); + SOURCE_MAP.put("0795dcw.com", "瀹滄槬鍦颁骇缃�"); + SOURCE_MAP.put("yichunfc.com", "瀹滄槬鎴夸骇缃�"); + SOURCE_MAP.put("jxych.cn", "杈炬垚瀹滄槬鎴夸骇缃�"); + SOURCE_MAP.put("jyjfdc.com", "灞呬竴瀹舵埧鍦颁骇"); + SOURCE_MAP.put("sxczfdc.com", "闀挎不浣忔埧淇℃伅缃�"); + SOURCE_MAP.put("qzfdcgl.com", "琛㈠窞甯傛埧鍦颁骇绠$悊鏀垮姟缃�"); + SOURCE_MAP.put("vipoa.net", "涓崼浣忔埧寤鸿灞�"); + SOURCE_MAP.put("yzfdc.cn", "鎵窞鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("0745hhfc.com", "鎬�鍖栬喘鎴夸俊鎭綉"); + SOURCE_MAP.put("yq918.com", "闃虫硥瀹跺洯缃�"); + SOURCE_MAP.put("sxyqfdc.com", "闃虫硥浣忔埧淇℃伅缃�"); + SOURCE_MAP.put("hgfgj.com", "榛勫唸鎴垮湴浜х鐞嗗眬"); + SOURCE_MAP.put("syfg.org.cn", "鏉惧師鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("songyuanfang.com", "鏉惧師璐埧缃�"); + SOURCE_MAP.put("chafangwang.com", "CFW鏌ユ埧缃�"); + SOURCE_MAP.put("wwsjw.gov.cn", "姝﹀▉甯備綇鎴垮拰鍩庝埂寤鸿灞�"); + SOURCE_MAP.put("wwfcw.com", "姝﹀▉浜屾墜鎴跨綉"); + SOURCE_MAP.put("0915home.com", "瀹夊悍鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("ankang.net", "瀹夊悍鎴夸骇缃�"); + SOURCE_MAP.put("akfang.com", "瀹夊悍鎴垮湴浜ч棬鎴风綉"); + SOURCE_MAP.put("xcfdc.cn", "瀹e煄缃戜笂鎴垮湴浜�"); + SOURCE_MAP.put("llsfdc.com", "鍚曟浣忔埧淇℃伅缃�"); + SOURCE_MAP.put("xxfdc.gov.cn", "鏂颁埂鎴夸骇绠$悊淇℃伅缃�"); + SOURCE_MAP.put("hnrealestate.gov.cn", "涓撮珮鍘夸綇瀹呬俊鎭綉"); + SOURCE_MAP.put("dinganfc.cn", "瀹氬畨浣忓畢涓庢埧鍦颁骇淇℃伅缃�"); + SOURCE_MAP.put("hotfcw.com", "鐑偣鎴夸骇缃�"); + SOURCE_MAP.put("726000.net", "鍟嗘礇鎴夸骇缃�"); + SOURCE_MAP.put("sluof.cn", "鍟嗘礇鎴夸骇缃憇luof"); + SOURCE_MAP.put("fdc0737.com", "0737鎴夸骇缃�"); + SOURCE_MAP.put("jmfc.com.cn", "鑽嗛棬鎴夸骇鐑嚎"); + SOURCE_MAP.put("0775fw.com", "璐靛眳缃�"); + SOURCE_MAP.put("365kl.net", "蹇箰鎴夸骇"); + SOURCE_MAP.put("smxloushi.com", "涓夐棬宄℃ゼ甯�"); + SOURCE_MAP.put("jmfdc.gov.cn", "鑽嗛棬鎴跨缃�"); + SOURCE_MAP.put("gxgg.gov.cn", "璐垫腐甯傛埧绠″眬"); + SOURCE_MAP.put("fxfdcw.com", "闃滄柊甯傛埧浜т俊鎭綉"); + SOURCE_MAP.put("fc0775.com", "璐垫腐鎴夸骇鐑嚎"); + SOURCE_MAP.put("0478fdc.com", "宸村溅娣栧皵鎴垮湴浜х綉"); + SOURCE_MAP.put("brfcw.com", "宸存埧缃�"); + SOURCE_MAP.put("gafdc.cn", "骞垮畨甯傛埧浜т氦鏄撳钩鍙�"); + SOURCE_MAP.put("bynefc.com", "宸村溅娣栧皵鎴夸骇"); + SOURCE_MAP.put("0352fang.com", "澶у悓鎴夸骇缃�"); + SOURCE_MAP.put("dtfc.gov.cn", "澶у悓甯傛埧浜т俊鎭綉"); + SOURCE_MAP.put("dahoutao.com", "澶у悗濂楃綉"); + SOURCE_MAP.put("dangdi.cc", "褰撳湴缃�"); + SOURCE_MAP.put("hbloushi.com", "楣ゅ妤煎競"); + SOURCE_MAP.put("szshouse.com", "鐭冲槾灞辨埧浜т俊鎭綉"); + SOURCE_MAP.put("myfcxx.com", "缁甸槼鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("fjnpfdc.com", "鍗楀钩甯傛埧淇$綉"); + SOURCE_MAP.put("jjshome.com", "瀹跺椤烘埧浜х綉"); + SOURCE_MAP.put("ffw.com.cn", "绂忔埧缃�"); + SOURCE_MAP.put("lehuozaixian.com", "涔愭椿鍦ㄧ嚎"); + SOURCE_MAP.put("zkloushi.com", "鍛ㄥ彛妤煎競缃�"); + SOURCE_MAP.put("haofang5.com", "濂芥埧缃慼aofang5"); + SOURCE_MAP.put("tlfdc.cn", "閾滈櫟鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("sysfcj.com", "閭甸槼甯傛埧浜у眬"); + SOURCE_MAP.put("focus.cn", "鎼滅嫄鐒︾偣"); SOURCE_MAP.put("house0562.com", "house0562"); - SOURCE_MAP.put("boxinfangchan.com", "博馨房产"); - SOURCE_MAP.put("0715fc.com", "咸宁房产网"); - SOURCE_MAP.put("xnfw.com", "咸宁房网"); - SOURCE_MAP.put("fzfgj.cn", "抚州市住房信息网"); - SOURCE_MAP.put("xyanjia.com", "新余房产网"); - SOURCE_MAP.put("zyfgj.cn", "资阳房管局政务网"); - SOURCE_MAP.put("gxfdcw.com", "赣西房地产网"); - SOURCE_MAP.put("xykanfang.com", "新余看房网"); - SOURCE_MAP.put("akss.gov", "阿克苏市建设局"); - SOURCE_MAP.put("xinyumh.com", "新余门户网"); - SOURCE_MAP.put("xyfcj.com", "新余房产信息网"); - SOURCE_MAP.put("365fangjia.com", "中国房价网"); - SOURCE_MAP.put("tczjw.gov.cn", "铜川住建网"); - SOURCE_MAP.put("sqdyr.com", "天水网"); - SOURCE_MAP.put("hhfcw.com", "怀化房产网hhfcw"); - SOURCE_MAP.put("0436fc", "白城市房地产信息网"); - SOURCE_MAP.put("bozhou.gov.", "毫州市房地产管理局"); - SOURCE_MAP.put("suifun.cn", "随房信息网"); - SOURCE_MAP.put("cdsfgj.gov.", "常德市房地产管理局"); - SOURCE_MAP.put("0722fc.com", "随房网"); - SOURCE_MAP.put("ezfcj.com.cn", "鄂州市房产管理局"); - SOURCE_MAP.put("szfcol.com", "随州房产在线"); - SOURCE_MAP.put("ezfcw.cn", "鄂州房产网ezfcw"); - SOURCE_MAP.put("hhfdcw.com", "怀化房产信息网"); - SOURCE_MAP.put("jxpxf.cn", "萍乡房产网"); - SOURCE_MAP.put("pxaaa.com", "萍乡市住房信息网"); - SOURCE_MAP.put("jxdcw.com", "江西地产网"); - SOURCE_MAP.put("hldhouse.com", "葫芦岛房地产网"); - SOURCE_MAP.put("fdc0746.com", "0746楼市网"); - SOURCE_MAP.put("wofang.com", "我房网"); - SOURCE_MAP.put("hainanfz.com", "三亚房产网_hainanfz"); - SOURCE_MAP.put("lafdc.gov.cn", "六安市房地产管理局"); - SOURCE_MAP.put("fdc99.com", "永州房地产信息网"); - SOURCE_MAP.put("ehuludao.com", "葫芦岛在线"); - SOURCE_MAP.put("fdc518.com", "第一房产"); - SOURCE_MAP.put("hldkfw.com", "葫芦岛看房网"); - SOURCE_MAP.put("yaan.gov.cn", "雅安市房地产信息网"); - SOURCE_MAP.put("mzjs.gov.cn", "梅州住房建设局"); - SOURCE_MAP.put("0835.com", "雅安在线"); - SOURCE_MAP.put("czfdc.gov.cn", "池州网上房地产"); - SOURCE_MAP.put("meyfang.com", "米房网"); - SOURCE_MAP.put("0559fc.com", "黄山房产网"); - SOURCE_MAP.put("0712fang.com", "孝房网"); - SOURCE_MAP.put("cyfcxx.com", "朝阳房产信息网"); - SOURCE_MAP.put("0566fc.com", "0566池州房地产"); - SOURCE_MAP.put("xgrb.cn", "槐荫房产"); - SOURCE_MAP.put("xgfw.cn", "孝感房网"); - SOURCE_MAP.put("jdzfgj.com", "景德镇房地产交易管理网"); - SOURCE_MAP.put("168hs.com", "黄山市民网"); - SOURCE_MAP.put("my0832.com", "资阳大众网"); - SOURCE_MAP.put("lwfccs.com", "莱芜房管局"); - SOURCE_MAP.put("0634.com", "都市网"); - SOURCE_MAP.put("ndfdc.com", "宁德房地产网"); - SOURCE_MAP.put("m3fc.com", "眉山房产网"); - SOURCE_MAP.put("0413fc.net", "抚顺房产网0413fc"); - SOURCE_MAP.put("zzsr.com", "上饶房产网"); - SOURCE_MAP.put("0738ld.com", "娄底房网"); - SOURCE_MAP.put("fshfc.cn", "抚顺房产网fshfc"); - SOURCE_MAP.put("eol.cn", "学校黄历"); - SOURCE_MAP.put("ndjsj.gov.cn", "宁德市住建网"); - SOURCE_MAP.put("52m3.com", "眉山房产在线"); - SOURCE_MAP.put("ldfdcw.com", "娄房网"); - SOURCE_MAP.put("0738fdc.com", "娄底房产网"); - SOURCE_MAP.put("0738.cc", "0738信息港"); - SOURCE_MAP.put("jafdc.cn", "吉安房产局"); - SOURCE_MAP.put("hm169.com", "哈密网"); - SOURCE_MAP.put("hm35.cn", "哈密商务网"); - SOURCE_MAP.put("fsfdc.com.cn", "抚顺交易登记中心"); - SOURCE_MAP.put("ecz.cn", "易房网ecz"); - SOURCE_MAP.put("qyfcglw.com", "庆阳房产网"); - SOURCE_MAP.put("czfcj.gov.cn", "郴州市房管局"); - SOURCE_MAP.put("qjhouse.org", "曲靖房产信息网"); - SOURCE_MAP.put("dyfcw.com", "德阳房产网"); - SOURCE_MAP.put("dyfc.cn", "德阳房地产网"); - SOURCE_MAP.put("e0838.com", "住在德阳网"); - SOURCE_MAP.put("0356f.com", "晋城房产网"); - SOURCE_MAP.put("snefw.com", "遂宁房网"); - SOURCE_MAP.put("scsn.cn", "遂宁之窗"); - SOURCE_MAP.put("0825fang.com", "0825房产网"); - SOURCE_MAP.put("yafangke.com", "雅房客"); - SOURCE_MAP.put("pyfc.cn", "濮阳房产网"); - SOURCE_MAP.put("kkfcw.com", "看看房产网"); - SOURCE_MAP.put("pybxfc.com", "濮阳百姓房产网"); - SOURCE_MAP.put("jcsfdc.com.cn", "晋城市房地产信息网"); - SOURCE_MAP.put("0561house.com", "淮北房产网0561"); - SOURCE_MAP.put("hbfdc.gov.cn", "淮北房地产信息网"); - SOURCE_MAP.put("pyzhufang.com", "濮阳住房网"); - SOURCE_MAP.put("lsfc.net.cn", "嘉州房产网"); - SOURCE_MAP.put("jzloushi.com", "焦作楼市"); - SOURCE_MAP.put("zmdfcxx.com", "驻马店房产信息网"); - SOURCE_MAP.put("lsfdc.gov.cn", "乐山市房管局信息网"); - SOURCE_MAP.put("xyfdcw.com.cn", "信阳购房网"); - SOURCE_MAP.put("0393fcw.com", "0393房产网"); - SOURCE_MAP.put("yjjs.gov.cn", "阳江住房建设局"); - SOURCE_MAP.put("lhfdc.com", "漯河房产网lhfdc"); - SOURCE_MAP.put("lcfcw.com", "聊城房产网lcfcw"); - SOURCE_MAP.put("lhloushi.com", "漯河楼市"); - SOURCE_MAP.put("liaofw.com", "聊房网liaofw"); - SOURCE_MAP.put("liaochengfangchan.com", "聊城房产网lcfc"); - SOURCE_MAP.put("onfun.net", "房产在线onfun"); - SOURCE_MAP.put("10fang.com", "十房网"); - SOURCE_MAP.put("xtfdc.gov.cn", "邢台房地产信息网"); - SOURCE_MAP.put("xtzhiye.com", "邢台置业网"); - SOURCE_MAP.put("fdcxh.com", "十堰房地产网"); - SOURCE_MAP.put("honghe01.com", "红河"); - SOURCE_MAP.put("honghe.me", "红河房产网"); - SOURCE_MAP.put("dzcnc.com", "鲁北房产"); - SOURCE_MAP.put("dezhoudaily.com", "德州好房网"); - SOURCE_MAP.put("591fcw.cn", "我就要房产网"); - SOURCE_MAP.put("dzhfgj.cn", "德州市房产管理中心"); - SOURCE_MAP.put("hanzhong.gov.cn", "汉中市住房和城市管理局"); - SOURCE_MAP.put("zn.cn", "指南网"); - SOURCE_MAP.put("fanging.com", "河南房产网fanging"); - SOURCE_MAP.put("0370home.com", "商丘房产网"); - SOURCE_MAP.put("sqloushi.com", "商丘楼市"); - SOURCE_MAP.put("home0538.com", "泰安房地产网"); - SOURCE_MAP.put("zhaofangw.cn", "找房网w"); - SOURCE_MAP.put("zzfcw.com.cn", "枣房网"); - SOURCE_MAP.put("zzfcj.com.cn", "枣庄市房管局"); - SOURCE_MAP.put("tazzfdc.com", "泰安房管局"); - SOURCE_MAP.put("0519.ccoo.cn", "常州网"); - SOURCE_MAP.put("rzfdc.com", "日照房博会"); - SOURCE_MAP.put("rzbyfc.com", "日照报业房产网"); - SOURCE_MAP.put("rzfdc.com", "日照房产网"); - SOURCE_MAP.put("fc0633.com", "日照置业网"); - SOURCE_MAP.put("rzloupan.com", "日照楼盘网"); - SOURCE_MAP.put("lixiangw.com", "理想房产"); - SOURCE_MAP.put("51job.com", "前程无忧"); - SOURCE_MAP.put("zhaopin.com", "智联招聘"); - SOURCE_MAP.put("waimai.baidu.com", "百度外卖"); - SOURCE_MAP.put("meituan.com", "美团外卖"); - SOURCE_MAP.put("ele.me", "饿了么"); - SOURCE_MAP.put("jyyuan.com", "家缘网"); - SOURCE_MAP.put("eju.com", "易居购房网"); - SOURCE_MAP.put("wxhouse.net", "汉斯房产网"); - SOURCE_MAP.put("51leye.cn", "我要乐业"); - SOURCE_MAP.put("czftw.com", "常州团房网"); - SOURCE_MAP.put("0434.me", "吉林网媒"); - SOURCE_MAP.put("jlfxw.com", "吉林房信网"); - SOURCE_MAP.put("soufun.com", "搜房"); - SOURCE_MAP.put("whfdc.gov.cn", "芜湖房产信息网"); - SOURCE_MAP.put("bxifc.cn", "本溪安吉房产网"); - SOURCE_MAP.put("mmsfw.com", "茂名搜房网"); - SOURCE_MAP.put("baixing.com", "常州百姓网"); - SOURCE_MAP.put("0734.com", "衡阳网"); - SOURCE_MAP.put("mmtcw.com", "茂名同城网"); - SOURCE_MAP.put("ajlhw.com", "安家落户"); - SOURCE_MAP.put("tzinfo.net", "台州房产主网"); - SOURCE_MAP.put("anjuke.com", "安居客"); - SOURCE_MAP.put("haifangw.com", "海房网"); - SOURCE_MAP.put("whnews.cn", "威海新闻网"); - SOURCE_MAP.put("hkrealestate.gov.cn", "海口房产信息网"); - SOURCE_MAP.put("jjzzfdc.com.cn", "九江房管局"); - SOURCE_MAP.put("hdfangxun.cn", "邯郸房讯网"); - SOURCE_MAP.put("zbhouse.cn", "淄博房产网"); - SOURCE_MAP.put("asfc.com.cn", "鞍山房产交易中心"); - SOURCE_MAP.put("hsfdc.com", "黄石房产信息网"); - SOURCE_MAP.put("h0476.com", "赤峰房地产网"); - SOURCE_MAP.put("huaian.gov.cn", "淮安市房管局"); - SOURCE_MAP.put("hnfc.gov.cn", "淮南市房地产管理局"); - SOURCE_MAP.put("cffgj.com", "赤峰市房产管理局"); - SOURCE_MAP.put("0762fcw.com", "河源房产网"); - SOURCE_MAP.put("gogopzh.com", "攀西网络新媒体"); - SOURCE_MAP.put("qzfdc.com", "衢州房地产网"); - SOURCE_MAP.put("zqjs.gov.cn", "肇庆建设局"); - SOURCE_MAP.put("gzzyfc.com.cn", "遵义房产信息网"); - SOURCE_MAP.put("xibuwu.com", "西部屋"); - SOURCE_MAP.put("jhfc.gov.cn", "金华市房产交易管理网"); - SOURCE_MAP.put("gzwsfdc.com", "赣州网上房地产"); - SOURCE_MAP.put("lyzbj.com", "洛阳住房保障和房产管理局"); - SOURCE_MAP.put("lyzbj.com", "洛阳住房保障和房产管理局"); - SOURCE_MAP.put("gzzyfc.com.cn", "遵义房产信息网"); - SOURCE_MAP.put("hezefc.com", "菏泽房产网"); - SOURCE_MAP.put("jzhome.cn", "锦州房产网"); - SOURCE_MAP.put("bsfcj.com", "广西百色房产管理局"); - SOURCE_MAP.put("88tie.com", "88同城"); - SOURCE_MAP.put("51tie.com", "51同城"); - SOURCE_MAP.put("wolai.com", "我来房产"); - SOURCE_MAP.put("taofang.com", "淘房"); - SOURCE_MAP.put("soufy.cn", "搜房源网"); - SOURCE_MAP.put("tuitui99.com", "推推99房产网"); - SOURCE_MAP.put("lbx.cc", "老百姓网"); - SOURCE_MAP.put("w.cn", "达步溜"); - SOURCE_MAP.put("letfind.com", "猎房网"); - SOURCE_MAP.put("xbaixing.com", "小百姓网"); - SOURCE_MAP.put("liebiao.com", "列表网"); - SOURCE_MAP.put("e086.cn", "中华地产网"); - SOURCE_MAP.put("dushifang.com", "都市二手房网"); - SOURCE_MAP.put("jiu6.com", "旧网"); - SOURCE_MAP.put("lianm.com", "大象房产网"); - SOURCE_MAP.put("1buo.com", "一步租房"); - SOURCE_MAP.put("zufangzi.com", "丁丁租房"); - SOURCE_MAP.put("home77.com", "房讯网"); - SOURCE_MAP.put("qwjian.com", "千万间"); - SOURCE_MAP.put("ifoboo.com", "易房宝"); - SOURCE_MAP.put("fangjee.com", "房集"); + SOURCE_MAP.put("boxinfangchan.com", "鍗氶Θ鎴夸骇"); + SOURCE_MAP.put("0715fc.com", "鍜稿畞鎴夸骇缃�"); + SOURCE_MAP.put("xnfw.com", "鍜稿畞鎴跨綉"); + SOURCE_MAP.put("fzfgj.cn", "鎶氬窞甯備綇鎴夸俊鎭綉"); + SOURCE_MAP.put("xyanjia.com", "鏂颁綑鎴夸骇缃�"); + SOURCE_MAP.put("zyfgj.cn", "璧勯槼鎴跨灞�鏀垮姟缃�"); + SOURCE_MAP.put("gxfdcw.com", "璧hタ鎴垮湴浜х綉"); + SOURCE_MAP.put("xykanfang.com", "鏂颁綑鐪嬫埧缃�"); + SOURCE_MAP.put("akss.gov", "闃垮厠鑻忓競寤鸿灞�"); + SOURCE_MAP.put("xinyumh.com", "鏂颁綑闂ㄦ埛缃�"); + SOURCE_MAP.put("xyfcj.com", "鏂颁綑鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("365fangjia.com", "涓浗鎴夸环缃�"); + SOURCE_MAP.put("tczjw.gov.cn", "閾滃窛浣忓缓缃�"); + SOURCE_MAP.put("sqdyr.com", "澶╂按缃�"); + SOURCE_MAP.put("hhfcw.com", "鎬�鍖栨埧浜х綉hhfcw"); + SOURCE_MAP.put("0436fc", "鐧藉煄甯傛埧鍦颁骇淇℃伅缃�"); + SOURCE_MAP.put("bozhou.gov.", "姣窞甯傛埧鍦颁骇绠$悊灞�"); + SOURCE_MAP.put("suifun.cn", "闅忔埧淇℃伅缃�"); + SOURCE_MAP.put("cdsfgj.gov.", "甯稿痉甯傛埧鍦颁骇绠$悊灞�"); + SOURCE_MAP.put("0722fc.com", "闅忔埧缃�"); + SOURCE_MAP.put("ezfcj.com.cn", "閯傚窞甯傛埧浜х鐞嗗眬"); + SOURCE_MAP.put("szfcol.com", "闅忓窞鎴夸骇鍦ㄧ嚎"); + SOURCE_MAP.put("ezfcw.cn", "閯傚窞鎴夸骇缃慹zfcw"); + SOURCE_MAP.put("hhfdcw.com", "鎬�鍖栨埧浜т俊鎭綉"); + SOURCE_MAP.put("jxpxf.cn", "钀嶄埂鎴夸骇缃�"); + SOURCE_MAP.put("pxaaa.com", "钀嶄埂甯備綇鎴夸俊鎭綉"); + SOURCE_MAP.put("jxdcw.com", "姹熻タ鍦颁骇缃�"); + SOURCE_MAP.put("hldhouse.com", "钁姦宀涙埧鍦颁骇缃�"); + SOURCE_MAP.put("fdc0746.com", "0746妤煎競缃�"); + SOURCE_MAP.put("wofang.com", "鎴戞埧缃�"); + SOURCE_MAP.put("hainanfz.com", "涓変簹鎴夸骇缃慱hainanfz"); + SOURCE_MAP.put("lafdc.gov.cn", "鍏畨甯傛埧鍦颁骇绠$悊灞�"); + SOURCE_MAP.put("fdc99.com", "姘稿窞鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("ehuludao.com", "钁姦宀涘湪绾�"); + SOURCE_MAP.put("fdc518.com", "绗竴鎴夸骇"); + SOURCE_MAP.put("hldkfw.com", "钁姦宀涚湅鎴跨綉"); + SOURCE_MAP.put("yaan.gov.cn", "闆呭畨甯傛埧鍦颁骇淇℃伅缃�"); + SOURCE_MAP.put("mzjs.gov.cn", "姊呭窞浣忔埧寤鸿灞�"); + SOURCE_MAP.put("0835.com", "闆呭畨鍦ㄧ嚎"); + SOURCE_MAP.put("czfdc.gov.cn", "姹犲窞缃戜笂鎴垮湴浜�"); + SOURCE_MAP.put("meyfang.com", "绫虫埧缃�"); + SOURCE_MAP.put("0559fc.com", "榛勫北鎴夸骇缃�"); + SOURCE_MAP.put("0712fang.com", "瀛濇埧缃�"); + SOURCE_MAP.put("cyfcxx.com", "鏈濋槼鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("0566fc.com", "0566姹犲窞鎴垮湴浜�"); + SOURCE_MAP.put("xgrb.cn", "妲愯崼鎴夸骇"); + SOURCE_MAP.put("xgfw.cn", "瀛濇劅鎴跨綉"); + SOURCE_MAP.put("jdzfgj.com", "鏅痉闀囨埧鍦颁骇浜ゆ槗绠$悊缃�"); + SOURCE_MAP.put("168hs.com", "榛勫北甯傛皯缃�"); + SOURCE_MAP.put("my0832.com", "璧勯槼澶т紬缃�"); + SOURCE_MAP.put("lwfccs.com", "鑾辫姕鎴跨灞�"); + SOURCE_MAP.put("0634.com", "閮藉競缃�"); + SOURCE_MAP.put("ndfdc.com", "瀹佸痉鎴垮湴浜х綉"); + SOURCE_MAP.put("m3fc.com", "鐪夊北鎴夸骇缃�"); + SOURCE_MAP.put("0413fc.net", "鎶氶『鎴夸骇缃�0413fc"); + SOURCE_MAP.put("zzsr.com", "涓婇ザ鎴夸骇缃�"); + SOURCE_MAP.put("0738ld.com", "濞勫簳鎴跨綉"); + SOURCE_MAP.put("fshfc.cn", "鎶氶『鎴夸骇缃慺shfc"); + SOURCE_MAP.put("eol.cn", "瀛︽牎榛勫巻"); + SOURCE_MAP.put("ndjsj.gov.cn", "瀹佸痉甯備綇寤虹綉"); + SOURCE_MAP.put("52m3.com", "鐪夊北鎴夸骇鍦ㄧ嚎"); + SOURCE_MAP.put("ldfdcw.com", "濞勬埧缃�"); + SOURCE_MAP.put("0738fdc.com", "濞勫簳鎴夸骇缃�"); + SOURCE_MAP.put("0738.cc", "0738淇℃伅娓�"); + SOURCE_MAP.put("jafdc.cn", "鍚夊畨鎴夸骇灞�"); + SOURCE_MAP.put("hm169.com", "鍝堝瘑缃�"); + SOURCE_MAP.put("hm35.cn", "鍝堝瘑鍟嗗姟缃�"); + SOURCE_MAP.put("fsfdc.com.cn", "鎶氶『浜ゆ槗鐧昏涓績"); + SOURCE_MAP.put("ecz.cn", "鏄撴埧缃慹cz"); + SOURCE_MAP.put("qyfcglw.com", "搴嗛槼鎴夸骇缃�"); + SOURCE_MAP.put("czfcj.gov.cn", "閮村窞甯傛埧绠″眬"); + SOURCE_MAP.put("qjhouse.org", "鏇查潠鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("dyfcw.com", "寰烽槼鎴夸骇缃�"); + SOURCE_MAP.put("dyfc.cn", "寰烽槼鎴垮湴浜х綉"); + SOURCE_MAP.put("e0838.com", "浣忓湪寰烽槼缃�"); + SOURCE_MAP.put("0356f.com", "鏅嬪煄鎴夸骇缃�"); + SOURCE_MAP.put("snefw.com", "閬傚畞鎴跨綉"); + SOURCE_MAP.put("scsn.cn", "閬傚畞涔嬬獥"); + SOURCE_MAP.put("0825fang.com", "0825鎴夸骇缃�"); + SOURCE_MAP.put("yafangke.com", "闆呮埧瀹�"); + SOURCE_MAP.put("pyfc.cn", "婵槼鎴夸骇缃�"); + SOURCE_MAP.put("kkfcw.com", "鐪嬬湅鎴夸骇缃�"); + SOURCE_MAP.put("pybxfc.com", "婵槼鐧惧鎴夸骇缃�"); + SOURCE_MAP.put("jcsfdc.com.cn", "鏅嬪煄甯傛埧鍦颁骇淇℃伅缃�"); + SOURCE_MAP.put("0561house.com", "娣寳鎴夸骇缃�0561"); + SOURCE_MAP.put("hbfdc.gov.cn", "娣寳鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("pyzhufang.com", "婵槼浣忔埧缃�"); + SOURCE_MAP.put("lsfc.net.cn", "鍢夊窞鎴夸骇缃�"); + SOURCE_MAP.put("jzloushi.com", "鐒︿綔妤煎競"); + SOURCE_MAP.put("zmdfcxx.com", "椹婚┈搴楁埧浜т俊鎭綉"); + SOURCE_MAP.put("lsfdc.gov.cn", "涔愬北甯傛埧绠″眬淇℃伅缃�"); + SOURCE_MAP.put("xyfdcw.com.cn", "淇¢槼璐埧缃�"); + SOURCE_MAP.put("0393fcw.com", "0393鎴夸骇缃�"); + SOURCE_MAP.put("yjjs.gov.cn", "闃虫睙浣忔埧寤鸿灞�"); + SOURCE_MAP.put("lhfdc.com", "婕渤鎴夸骇缃憀hfdc"); + SOURCE_MAP.put("lcfcw.com", "鑱婂煄鎴夸骇缃憀cfcw"); + SOURCE_MAP.put("lhloushi.com", "婕渤妤煎競"); + SOURCE_MAP.put("liaofw.com", "鑱婃埧缃憀iaofw"); + SOURCE_MAP.put("liaochengfangchan.com", "鑱婂煄鎴夸骇缃憀cfc"); + SOURCE_MAP.put("onfun.net", "鎴夸骇鍦ㄧ嚎onfun"); + SOURCE_MAP.put("10fang.com", "鍗佹埧缃�"); + SOURCE_MAP.put("xtfdc.gov.cn", "閭㈠彴鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("xtzhiye.com", "閭㈠彴缃笟缃�"); + SOURCE_MAP.put("fdcxh.com", "鍗佸牥鎴垮湴浜х綉"); + SOURCE_MAP.put("honghe01.com", "绾㈡渤"); + SOURCE_MAP.put("honghe.me", "绾㈡渤鎴夸骇缃�"); + SOURCE_MAP.put("dzcnc.com", "椴佸寳鎴夸骇"); + SOURCE_MAP.put("dezhoudaily.com", "寰峰窞濂芥埧缃�"); + SOURCE_MAP.put("591fcw.cn", "鎴戝氨瑕佹埧浜х綉"); + SOURCE_MAP.put("dzhfgj.cn", "寰峰窞甯傛埧浜х鐞嗕腑蹇�"); + SOURCE_MAP.put("hanzhong.gov.cn", "姹変腑甯備綇鎴垮拰鍩庡競绠$悊灞�"); + SOURCE_MAP.put("zn.cn", "鎸囧崡缃�"); + SOURCE_MAP.put("fanging.com", "娌冲崡鎴夸骇缃慺anging"); + SOURCE_MAP.put("0370home.com", "鍟嗕笜鎴夸骇缃�"); + SOURCE_MAP.put("sqloushi.com", "鍟嗕笜妤煎競"); + SOURCE_MAP.put("home0538.com", "娉板畨鎴垮湴浜х綉"); + SOURCE_MAP.put("zhaofangw.cn", "鎵炬埧缃憌"); + SOURCE_MAP.put("zzfcw.com.cn", "鏋f埧缃�"); + SOURCE_MAP.put("zzfcj.com.cn", "鏋e簞甯傛埧绠″眬"); + SOURCE_MAP.put("tazzfdc.com", "娉板畨鎴跨灞�"); + SOURCE_MAP.put("0519.ccoo.cn", "甯稿窞缃�"); + SOURCE_MAP.put("rzfdc.com", "鏃ョ収鎴垮崥浼�"); + SOURCE_MAP.put("rzbyfc.com", "鏃ョ収鎶ヤ笟鎴夸骇缃�"); + SOURCE_MAP.put("rzfdc.com", "鏃ョ収鎴夸骇缃�"); + SOURCE_MAP.put("fc0633.com", "鏃ョ収缃笟缃�"); + SOURCE_MAP.put("rzloupan.com", "鏃ョ収妤肩洏缃�"); + SOURCE_MAP.put("lixiangw.com", "鐞嗘兂鎴夸骇"); + SOURCE_MAP.put("51job.com", "鍓嶇▼鏃犲咖"); + SOURCE_MAP.put("zhaopin.com", "鏅鸿仈鎷涜仒"); + SOURCE_MAP.put("waimai.baidu.com", "鐧惧害澶栧崠"); + SOURCE_MAP.put("meituan.com", "缇庡洟澶栧崠"); + SOURCE_MAP.put("ele.me", "楗夸簡涔�"); + SOURCE_MAP.put("jyyuan.com", "瀹剁紭缃�"); + SOURCE_MAP.put("eju.com", "鏄撳眳璐埧缃�"); + SOURCE_MAP.put("wxhouse.net", "姹夋柉鎴夸骇缃�"); + SOURCE_MAP.put("51leye.cn", "鎴戣涔愪笟"); + SOURCE_MAP.put("czftw.com", "甯稿窞鍥㈡埧缃�"); + SOURCE_MAP.put("0434.me", "鍚夋灄缃戝獟"); + SOURCE_MAP.put("jlfxw.com", "鍚夋灄鎴夸俊缃�"); + SOURCE_MAP.put("soufun.com", "鎼滄埧"); + SOURCE_MAP.put("whfdc.gov.cn", "鑺滄箹鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("bxifc.cn", "鏈邯瀹夊悏鎴夸骇缃�"); + SOURCE_MAP.put("mmsfw.com", "鑼傚悕鎼滄埧缃�"); + SOURCE_MAP.put("baixing.com", "甯稿窞鐧惧缃�"); + SOURCE_MAP.put("0734.com", "琛¢槼缃�"); + SOURCE_MAP.put("mmtcw.com", "鑼傚悕鍚屽煄缃�"); + SOURCE_MAP.put("ajlhw.com", "瀹夊钀芥埛"); + SOURCE_MAP.put("tzinfo.net", "鍙板窞鎴夸骇涓荤綉"); + SOURCE_MAP.put("anjuke.com", "瀹夊眳瀹�"); + SOURCE_MAP.put("haifangw.com", "娴锋埧缃�"); + SOURCE_MAP.put("whnews.cn", "濞佹捣鏂伴椈缃�"); + SOURCE_MAP.put("hkrealestate.gov.cn", "娴峰彛鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("jjzzfdc.com.cn", "涔濇睙鎴跨灞�"); + SOURCE_MAP.put("hdfangxun.cn", "閭兏鎴胯缃�"); + SOURCE_MAP.put("zbhouse.cn", "娣勫崥鎴夸骇缃�"); + SOURCE_MAP.put("asfc.com.cn", "闉嶅北鎴夸骇浜ゆ槗涓績"); + SOURCE_MAP.put("hsfdc.com", "榛勭煶鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("h0476.com", "璧ゅ嘲鎴垮湴浜х綉"); + SOURCE_MAP.put("huaian.gov.cn", "娣畨甯傛埧绠″眬"); + SOURCE_MAP.put("hnfc.gov.cn", "娣崡甯傛埧鍦颁骇绠$悊灞�"); + SOURCE_MAP.put("cffgj.com", "璧ゅ嘲甯傛埧浜х鐞嗗眬"); + SOURCE_MAP.put("0762fcw.com", "娌虫簮鎴夸骇缃�"); + SOURCE_MAP.put("gogopzh.com", "鏀�瑗跨綉缁滄柊濯掍綋"); + SOURCE_MAP.put("qzfdc.com", "琛㈠窞鎴垮湴浜х綉"); + SOURCE_MAP.put("zqjs.gov.cn", "鑲囧簡寤鸿灞�"); + SOURCE_MAP.put("gzzyfc.com.cn", "閬典箟鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("xibuwu.com", "瑗块儴灞�"); + SOURCE_MAP.put("jhfc.gov.cn", "閲戝崕甯傛埧浜т氦鏄撶鐞嗙綉"); + SOURCE_MAP.put("gzwsfdc.com", "璧e窞缃戜笂鎴垮湴浜�"); + SOURCE_MAP.put("lyzbj.com", "娲涢槼浣忔埧淇濋殰鍜屾埧浜х鐞嗗眬"); + SOURCE_MAP.put("lyzbj.com", "娲涢槼浣忔埧淇濋殰鍜屾埧浜х鐞嗗眬"); + SOURCE_MAP.put("gzzyfc.com.cn", "閬典箟鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("hezefc.com", "鑿忔辰鎴夸骇缃�"); + SOURCE_MAP.put("jzhome.cn", "閿﹀窞鎴夸骇缃�"); + SOURCE_MAP.put("bsfcj.com", "骞胯タ鐧捐壊鎴夸骇绠$悊灞�"); + SOURCE_MAP.put("88tie.com", "88鍚屽煄"); + SOURCE_MAP.put("51tie.com", "51鍚屽煄"); + SOURCE_MAP.put("wolai.com", "鎴戞潵鎴夸骇"); + SOURCE_MAP.put("taofang.com", "娣樻埧"); + SOURCE_MAP.put("soufy.cn", "鎼滄埧婧愮綉"); + SOURCE_MAP.put("tuitui99.com", "鎺ㄦ帹99鎴夸骇缃�"); + SOURCE_MAP.put("lbx.cc", "鑰佺櫨濮撶綉"); + SOURCE_MAP.put("w.cn", "杈炬婧�"); + SOURCE_MAP.put("letfind.com", "鐚庢埧缃�"); + SOURCE_MAP.put("xbaixing.com", "灏忕櫨濮撶綉"); + SOURCE_MAP.put("liebiao.com", "鍒楄〃缃�"); + SOURCE_MAP.put("e086.cn", "涓崕鍦颁骇缃�"); + SOURCE_MAP.put("dushifang.com", "閮藉競浜屾墜鎴跨綉"); + SOURCE_MAP.put("jiu6.com", "鏃х綉"); + SOURCE_MAP.put("lianm.com", "澶ц薄鎴夸骇缃�"); + SOURCE_MAP.put("1buo.com", "涓�姝ョ鎴�"); + SOURCE_MAP.put("zufangzi.com", "涓佷竵绉熸埧"); + SOURCE_MAP.put("home77.com", "鎴胯缃�"); + SOURCE_MAP.put("qwjian.com", "鍗冧竾闂�"); + SOURCE_MAP.put("ifoboo.com", "鏄撴埧瀹�"); + SOURCE_MAP.put("fangjee.com", "鎴块泦"); SOURCE_MAP.put("go007.com", "go007"); - SOURCE_MAP.put("zlhome.com", "中联地产网"); - SOURCE_MAP.put("douanju.com", "都安居"); - SOURCE_MAP.put("china.com.cn", "地产中国"); - SOURCE_MAP.put("hjfcs.cn", "海景房超市"); - SOURCE_MAP.put("liaofang.com", "聊房网"); - SOURCE_MAP.put("cnhouse.com", "寻捕房"); - SOURCE_MAP.put("ejiacn.com", "E家网"); - SOURCE_MAP.put("yajuke.com", "雅居客"); - SOURCE_MAP.put("xfzc.com", "寻房之窗"); - SOURCE_MAP.put("fdc0760.com", "易搜房产网"); - SOURCE_MAP.put("fccs.com", "中国房产超市网"); - SOURCE_MAP.put("edeng.cn", "易登网"); - SOURCE_MAP.put("fangle.com", "房乐网"); - SOURCE_MAP.put("bbshouse.com", "楼视界"); - SOURCE_MAP.put("haofung.com", "好房网haofang"); - SOURCE_MAP.put("ufangw.com", "优房网"); - SOURCE_MAP.put("98znz.com", "98指南针"); - SOURCE_MAP.put("eebest.com", "一贝网"); - SOURCE_MAP.put(".baidu.com", "百度房产"); - SOURCE_MAP.put("bai58.com", "百五八网"); - SOURCE_MAP.put("pinganfang.com", "平安好房"); - SOURCE_MAP.put("iwjw.com", "爱屋吉屋"); - SOURCE_MAP.put("qu114.com", "去114"); - SOURCE_MAP.put("qd8.com.cn", "快点8"); - SOURCE_MAP.put("1loushi.cn", "第1楼市"); - SOURCE_MAP.put("ohqly.com", "千里眼"); - SOURCE_MAP.put("lanfw.com", "蓝房网"); - SOURCE_MAP.put("fangbx.com", "房宝箱"); - SOURCE_MAP.put("zp365.com", "住朋网"); - SOURCE_MAP.put("fangtoo.com", "房途网"); - SOURCE_MAP.put("suinf.cn", "遂宁房产网"); - SOURCE_MAP.put("zhongpaiwang.com", "众拍"); - SOURCE_MAP.put("ccoo.cn", "城市中国网"); - SOURCE_MAP.put("efw.cn", "e房网"); - SOURCE_MAP.put("fcwlm.cn", "房产网联盟"); - SOURCE_MAP.put("fdc.com.cn", "亿房网"); - SOURCE_MAP.put("homelink.com.cn", "链家在线"); - SOURCE_MAP.put("qfang.com", "Q房网"); - SOURCE_MAP.put("liaoing.com", "聊宅网"); - SOURCE_MAP.put("86fxw.com", "86房讯网"); - SOURCE_MAP.put("qq.com", "腾讯"); - SOURCE_MAP.put("zhaofangw.cn", "找房网w"); - SOURCE_MAP.put("0419.cn", "辽阳网"); - SOURCE_MAP.put("0917fdc.com", "宝鸡房产网"); - SOURCE_MAP.put("taobao.com", "淘宝拍卖"); - SOURCE_MAP.put("cityhouse.cn", "城市房产"); - SOURCE_MAP.put("fccs.com", "中国房产超市网"); - SOURCE_MAP.put("163.com", "网易"); - SOURCE_MAP.put("fdc.gov.cn", "漳州市住建局"); - SOURCE_MAP.put("ynpew.com", "云南普洱网"); - SOURCE_MAP.put("szfd.gov.cn", "宿州市房管局"); - SOURCE_MAP.put("8080/house/", "怀化房产管理局"); - SOURCE_MAP.put("jxsrfdc.com", "上饶市房地产管理局"); - SOURCE_MAP.put("srfdc.com", "上饶房地产信息网"); - SOURCE_MAP.put("jxsrfdc.com", "上饶市房地产管理局"); - SOURCE_MAP.put("lbfdc.com", "来宾房地产网"); - SOURCE_MAP.put("njfang.net", "怒江房产网"); - SOURCE_MAP.put("xyfcw.com", "信阳房产网"); - SOURCE_MAP.put("taofw.cn", "淘房屋"); - SOURCE_MAP.put("xtfw.cn", "仙桃房网"); - SOURCE_MAP.put("0728f.com", "0728房网"); - SOURCE_MAP.put("tmfang.com", "天门房网"); - SOURCE_MAP.put("iefang.com", "爱易房"); - SOURCE_MAP.put(".fcwlm.cn", "神农架房产网"); - SOURCE_MAP.put("wcfang.com", "文昌房产网"); - SOURCE_MAP.put("cdfgj.gov.cn", "成都市房管局"); - SOURCE_MAP.put("yzfc.cn", "扬房网"); - SOURCE_MAP.put("masff.com", "房房网"); - SOURCE_MAP.put("x0750.com", "五邑房产网"); - SOURCE_MAP.put("dpdc.net.cn", "东鹏地产"); - SOURCE_MAP.put("lsfc.net.cn", "嘉州房产网"); - SOURCE_MAP.put("lsfdc.com", "乐房网lsfdc"); - SOURCE_MAP.put("iweihai.cn", "爱威海网"); - SOURCE_MAP.put("whinfo.net.cn", "威海信息港"); - SOURCE_MAP.put("weihaifangchan.com", "威海房产信息网"); - SOURCE_MAP.put("whhouse.com", "威海房地产网_whhouse"); - SOURCE_MAP.put("365baotou.com", "包头房地产网365baotou"); - SOURCE_MAP.put("bt160.com", "包头房产网bt160"); - SOURCE_MAP.put("1f.cn", "易房"); - SOURCE_MAP.put("88zf.com", "芜湖找房"); - SOURCE_MAP.put("yichangfang.com", "宜昌房产网"); - SOURCE_MAP.put("hualongxiang.com", "化龙巷"); - SOURCE_MAP.put("lc365.net", "聊城房地产网lc365"); - SOURCE_MAP.put("lcxwfc.com", "聊城房网"); - SOURCE_MAP.put("czfcw.com", "常州房产网"); - SOURCE_MAP.put("jz6.cc", "荆州第一房产网"); - SOURCE_MAP.put("lcfcw.com", "聊城房产网lcfcw"); - SOURCE_MAP.put("shjnet.cn", "松花江网"); - SOURCE_MAP.put("fdc.cn", "漳州房地产"); - SOURCE_MAP.put("jxych.cn", "达成宜春房产网"); - SOURCE_MAP.put("srtong.com", "上饶通房产网"); - SOURCE_MAP.put("596fc.com", "596漳州房产网"); - SOURCE_MAP.put("wnfcw.cn", "渭南房产网"); - SOURCE_MAP.put("sqfcw.com.cn", "西楚房产网"); - SOURCE_MAP.put("cityhouse.cn", "城市房产网"); - SOURCE_MAP.put("sqfcw.com", "宿迁找房网"); - SOURCE_MAP.put("cityhouse.cn", "城市房产网"); - SOURCE_MAP.put("ayloushi.com", "安阳楼市"); - SOURCE_MAP.put("0372.cn", "安阳信息网"); - SOURCE_MAP.put("t56.net", "泰无聊房产网"); - SOURCE_MAP.put("0470fcw.com", "呼伦贝尔房产网"); - SOURCE_MAP.put("fanging.com", "河南房产网fanging"); - SOURCE_MAP.put("house.163.com", "网易房产"); - SOURCE_MAP.put("bjgtj.gov.cn", "北京市国土资源局"); - SOURCE_MAP.put("shgtj.gov.cn", "上海市规划和国土资源管理局"); - SOURCE_MAP.put("laho.gov.cn", "广州市国土资源和房屋管理局"); - SOURCE_MAP.put("szpl.gov.cn", "深圳市规划和国土资源委员会"); - SOURCE_MAP.put("fangdi.com.cn", "网上房地产"); - SOURCE_MAP.put("tjfdc.gov.cn", "天津市国土资源局"); - SOURCE_MAP.put("fzgtzyj.gov.cn", "福州市国土资源局"); - SOURCE_MAP.put("urumqiland.gov.cn", "乌鲁木齐市国土资源管理局"); - SOURCE_MAP.put("funi.com", "成都透明房产网"); - SOURCE_MAP.put("landwx.com", "无锡国土资源交易网"); - SOURCE_MAP.put("lzgtj.gov.cn", "兰州市国土资源局"); - SOURCE_MAP.put("fsgtgh.gov.cn", "佛山市国土资源和城乡规划局"); - SOURCE_MAP.put("xaland.gov.cn", "西安市国土资源局"); - SOURCE_MAP.put("gtfwj.dl.gov.cn", "大连市国土资源和房屋局"); - SOURCE_MAP.put("jxgtzyjy.gov.cn", "江西省土地使用权和矿业权网上交易系统"); - SOURCE_MAP.put("zhaofangw.cn", "找房网w"); - SOURCE_MAP.put("hrbgtj.gov.cn", "哈尔滨市国土资源局"); - SOURCE_MAP.put("163.com", "网易"); - SOURCE_MAP.put("tylr.gov.cn", "太原市国土资源局"); - SOURCE_MAP.put("fc198.com", "房资网"); - SOURCE_MAP.put("liaofang.com", "聊房网"); - SOURCE_MAP.put("maifun.com", "买房网"); - SOURCE_MAP.put("ifeng.com", "凤凰网"); - SOURCE_MAP.put("bbshouse.com", "楼视界"); - SOURCE_MAP.put("zhuapo.com", "抓破网"); - SOURCE_MAP.put("hjfcs.cn", "海景房超市"); - SOURCE_MAP.put("sky008.com", "天空房产网"); - SOURCE_MAP.put("xpchina.com", "地产中华网"); - SOURCE_MAP.put("nblr.gov.cn", "宁波市国土资源局"); - SOURCE_MAP.put("ufangw.com", "优房网"); - SOURCE_MAP.put("zhantai.com", "站台网"); - SOURCE_MAP.put("lanfw.com", "蓝房网"); - SOURCE_MAP.put("edeng.cn", "易登网"); - SOURCE_MAP.put("zhifang.com", "智房"); - SOURCE_MAP.put("zhaofang.com", "找房网"); - SOURCE_MAP.put("fangdd.com", "房多多"); - SOURCE_MAP.put("fcyhw.com", "房产一号网"); - SOURCE_MAP.put("tzgt.gov.cn", "泰州国土资源局"); - SOURCE_MAP.put("jiangmen.gov.cn", "江门市国土资源局"); - SOURCE_MAP.put("hebqhdsgt.gov.cn", "秦皇岛市国土资源局"); - SOURCE_MAP.put("wzgt.gov.cn", "温州市国土资源局"); - SOURCE_MAP.put("zjtzgtj.gov.cn", "台州市国土资源局"); - SOURCE_MAP.put("dqlr.gov.cn", "大庆市国土资源局"); - SOURCE_MAP.put("gtjzh.gov.cn", "珠海市国土资源局"); - SOURCE_MAP.put("bxgtj.gov.cn", "本溪市国土资源局"); - SOURCE_MAP.put("lzblr.gov.cn", "柳州市国土资源局"); - SOURCE_MAP.put("lztdzx.com", "柳州市土地交易储备中心"); - SOURCE_MAP.put("zjlr.gov.cn", "湛江国土资源局"); - SOURCE_MAP.put("zjlra.gov.cn", "镇江市国土资源局"); - SOURCE_MAP.put("huzgt.gov.cn", "湖州市国土资源局"); - SOURCE_MAP.put("ntgt.gov.cn", "南通市国土资源局"); - SOURCE_MAP.put("wh.cn", "芜湖市国土资源局"); - SOURCE_MAP.put("masgt.gov.cn", "马鞍山市国土资源局"); - SOURCE_MAP.put("hzgtjy.com", "惠州市国土资源局"); - SOURCE_MAP.put("wfdlr.gov.cn", "潍坊市国土资源局"); - SOURCE_MAP.put("lygmlr.gov.cn", "连云港市国土资源局"); - SOURCE_MAP.put("hklorb.gov.cn", "海口市国土资源局"); - SOURCE_MAP.put("yclr.gov.cn", "宜昌市国土资源局"); - SOURCE_MAP.put("czlra.gov.cn", "常州市国土资源局"); - SOURCE_MAP.put("weihaiguotu.gov.cn", "威海市国土资源局"); - SOURCE_MAP.put("xzgtzy.gov.cn", "徐州市国土资源局"); - SOURCE_MAP.put("asgtzy.cn", "鞍山市国土资源局"); - SOURCE_MAP.put("jhdlr.gov.cn", "金华市国土资源局"); - SOURCE_MAP.put("ycgtj.gov.cn", "盐城市国土资源局"); - SOURCE_MAP.put("td.sx.gov.cn", "绍兴市国土资源局"); - SOURCE_MAP.put("zbgtj.gov.cn", "淄博市国土资源局"); - SOURCE_MAP.put("lyblr.gov.cn", "洛阳市国土资源局"); - SOURCE_MAP.put("jxgtzy.gov.cn", "嘉兴市国土资源局"); - SOURCE_MAP.put("zsfdc.gov.cn", "中山市国土资源局"); - SOURCE_MAP.put("glland.gov.cn", "桂林市国土资源局"); - SOURCE_MAP.put("zzsgtj.gov.cn", "株洲市国土资源局"); - SOURCE_MAP.put("gtj.my.gov.cn", "绵阳市国土资源局"); - SOURCE_MAP.put("haofung.com", "好房网haofang"); - SOURCE_MAP.put("sttdkyjy.gov.cn", "汕头市土地与矿业权交易中心"); - SOURCE_MAP.put("tdkcjy.maoming.gov.cn", "茂名市土地使用权网上交易系统"); - SOURCE_MAP.put("hljmdjlr.gov.cn", "牡丹江市国土资源局"); - SOURCE_MAP.put("pdsgt.gov.cn", "平顶山市国土资源局"); - SOURCE_MAP.put("hljqqhelr.gov.cn", "齐齐哈尔市国土资源局"); - SOURCE_MAP.put("pinganfang.com", "平安好房"); - SOURCE_MAP.put("hngtjy.com", "湖南省国土资源网上交易系统"); - SOURCE_MAP.put("hyblr.com", "衡阳市国土资源市场网"); - SOURCE_MAP.put("gtzyjy.jl.gov.cn", "吉林省国土资源网上交易平台"); - SOURCE_MAP.put("1loushi.cn", "第1楼市"); - SOURCE_MAP.put("yagt.gov.cn", "延安市国土资源局"); - SOURCE_MAP.put("fang.tm", "房咖"); - SOURCE_MAP.put("ptgt.gov.cn", "莆田市国土资源局"); - SOURCE_MAP.put("tdjy.yunfu.gov.cn", "云浮市国土资源和城乡规划管理局"); - SOURCE_MAP.put("zsblr.gov.cn", "舟山市国土资源局"); - SOURCE_MAP.put("qyggzy.cn", "清远市公共资源交易中心"); - SOURCE_MAP.put("xygtzyj.gov.cn", "咸阳市国土资源局"); - SOURCE_MAP.put("zjjgtzy.gov.cn", "张家界市国土资源局"); - SOURCE_MAP.put("sqmlr.gov.cn", "宿迁国土资源网"); - SOURCE_MAP.put("xfgt.gov.cn", "襄阳市国土资源局"); - SOURCE_MAP.put("xyfc.com", "襄阳房产"); - SOURCE_MAP.put("wkzf.com", "悟空找房"); - SOURCE_MAP.put("58fenlei.com", "58分类网"); - SOURCE_MAP.put("cnchu.com", "楚网"); - SOURCE_MAP.put("577house.com", "温州房产热线"); - SOURCE_MAP.put("bjfang.com", "天朗房网"); - SOURCE_MAP.put("bjhouse.com", "百家房网"); - SOURCE_MAP.put("sh.cn", "上海热线"); - SOURCE_MAP.put("shenchuang.com", "深圳之窗"); - SOURCE_MAP.put("dingcity.com", "第N城"); - SOURCE_MAP.put("enorth.com.cn", "北方网"); - SOURCE_MAP.put("szfdc.net.cn", "深圳房产网_szfdc"); - SOURCE_MAP.put("cqfdcw.cn", "重庆房地产网"); - SOURCE_MAP.put("szfcw.com.cn", "苏州房产网"); - SOURCE_MAP.put("kunfun.com", "昆房网"); - SOURCE_MAP.put("cnhubei.com", "荆楚网"); - SOURCE_MAP.put("0791esf.com", "0791二手房"); - SOURCE_MAP.put("fczx.com", "中国房产在线"); - SOURCE_MAP.put("baijuyi.com.cn", "百居易"); - SOURCE_MAP.put("hz.cc", "杭州房产网"); - SOURCE_MAP.put("jnfcw.org", "济南房产网_jnfcw"); - SOURCE_MAP.put("dswtv.com", "动视网"); - SOURCE_MAP.put("runsky.com", "天健房产"); - SOURCE_MAP.put("dl.cc", "大连房产网"); - SOURCE_MAP.put("zhudalian.com", "住大连"); - SOURCE_MAP.put("0451zf.com", "哈市在线"); - SOURCE_MAP.put("fdc0451.com", "哈尔滨房地产网"); - SOURCE_MAP.put("house371.com", "郑州房产网_house371"); - SOURCE_MAP.put("hiao.com", "烟台好网"); - SOURCE_MAP.put("bbsfh.net", "奉化房产网_bbsfh"); - SOURCE_MAP.put("967890.com", "奉化房产交易网"); - SOURCE_MAP.put("xwh.cn", "新文化网"); - SOURCE_MAP.put("jidahouse.com", "吉大房产"); - SOURCE_MAP.put("51fdc.com", "无忧房网"); - SOURCE_MAP.put("lsfun.com", "丽水房产信息网"); - SOURCE_MAP.put("fangbx.com", "房宝箱"); - SOURCE_MAP.put("qd8.com.cn", "快点8"); - SOURCE_MAP.put("tshgt.gov.cn", "唐山市国土资源局"); - SOURCE_MAP.put("gzlps.gov.cn", "六盘水市国土资源局"); - SOURCE_MAP.put("ybdlr.gov.cn", "宜宾市国土资源局"); - SOURCE_MAP.put("zglr.gov.cn", "自贡市国土资源局"); - SOURCE_MAP.put("pzhgt.gov.cn", "攀枝花市国土资源局"); - SOURCE_MAP.put("nnland.gov.cn", "南宁市国土资源局"); - SOURCE_MAP.put("quzgt.gov.cn", "衢州市国土管理局"); - SOURCE_MAP.put("lfgtzy.gov.cn", "廊坊市国土资源局"); - SOURCE_MAP.put("xtgt.gov.cn", "湘潭市国土资源局"); - SOURCE_MAP.put("zqgtzy.gov.cn", "肇庆市国土资源局"); - SOURCE_MAP.put("anyang.gov.cn", "安阳市国土资源局"); - SOURCE_MAP.put("xxblr.gov.cn", "新乡市国土资源局"); - SOURCE_MAP.put("ykgtj.gov.cn", "营口市国土资源局"); - SOURCE_MAP.put("czggzy.com", "潮州市公共资源交易中心"); - SOURCE_MAP.put("hsgtj.gov.cn", "黄石市国土资源局"); - SOURCE_MAP.put("jzgtzy.gov.cn", "焦作市国土资源局"); - SOURCE_MAP.put("pjgtj.gov.cn", "盘锦市国土资源局"); - SOURCE_MAP.put("mzgtzy.gov.cn", "梅州市国土资源局"); - SOURCE_MAP.put("yygt.gov.cn", "岳阳市国土资源局"); - SOURCE_MAP.put("hngtjy.cn", "河南省国土资源网上交易系统"); - SOURCE_MAP.put("hngt.gov.cn", "淮南市国土资源局"); - SOURCE_MAP.put("gtj.huaian.gov.cn", "淮安国土资源网"); - SOURCE_MAP.put("hljjmslr.gov.cn", "佳木斯市国土资源局"); - SOURCE_MAP.put("nygtzy.nanyang.gov.cn", "南阳市国土资源局"); - SOURCE_MAP.put("lygtzy.gov.cn", "山东省临沂市国土资源局"); - SOURCE_MAP.put("linfenlr.gov.cn", "临汾市国土资源局"); - SOURCE_MAP.put("ylgtj.gov.cn", "榆林市国土资源局"); - SOURCE_MAP.put("sglr.gov.cn", "韶关市国土资源局"); - SOURCE_MAP.put("hytudi.com", "河源市土地与矿业权网上交易系统"); - SOURCE_MAP.put("yjgtjy.com", "阳江市土地与矿业权网上交易系统"); - SOURCE_MAP.put("lr.hainan.gov.cn", "海南省国土资源厅"); - SOURCE_MAP.put("gtzy.cj.gov.cn", "昌吉回族自治州国土资源局"); - SOURCE_MAP.put("ohqly.com", "千里眼"); + SOURCE_MAP.put("zlhome.com", "涓仈鍦颁骇缃�"); + SOURCE_MAP.put("douanju.com", "閮藉畨灞�"); + SOURCE_MAP.put("china.com.cn", "鍦颁骇涓浗"); + SOURCE_MAP.put("hjfcs.cn", "娴锋櫙鎴胯秴甯�"); + SOURCE_MAP.put("liaofang.com", "鑱婃埧缃�"); + SOURCE_MAP.put("cnhouse.com", "瀵绘崟鎴�"); + SOURCE_MAP.put("ejiacn.com", "E瀹剁綉"); + SOURCE_MAP.put("yajuke.com", "闆呭眳瀹�"); + SOURCE_MAP.put("xfzc.com", "瀵绘埧涔嬬獥"); + SOURCE_MAP.put("fdc0760.com", "鏄撴悳鎴夸骇缃�"); + SOURCE_MAP.put("fccs.com", "涓浗鎴夸骇瓒呭競缃�"); + SOURCE_MAP.put("edeng.cn", "鏄撶櫥缃�"); + SOURCE_MAP.put("fangle.com", "鎴夸箰缃�"); + SOURCE_MAP.put("bbshouse.com", "妤艰鐣�"); + SOURCE_MAP.put("haofung.com", "濂芥埧缃慼aofang"); + SOURCE_MAP.put("ufangw.com", "浼樻埧缃�"); + SOURCE_MAP.put("98znz.com", "98鎸囧崡閽�"); + SOURCE_MAP.put("eebest.com", "涓�璐濈綉"); + SOURCE_MAP.put(".baidu.com", "鐧惧害鎴夸骇"); + SOURCE_MAP.put("bai58.com", "鐧句簲鍏綉"); + SOURCE_MAP.put("pinganfang.com", "骞冲畨濂芥埧"); + SOURCE_MAP.put("iwjw.com", "鐖卞眿鍚夊眿"); + SOURCE_MAP.put("qu114.com", "鍘�114"); + SOURCE_MAP.put("qd8.com.cn", "蹇偣8"); + SOURCE_MAP.put("1loushi.cn", "绗�1妤煎競"); + SOURCE_MAP.put("ohqly.com", "鍗冮噷鐪�"); + SOURCE_MAP.put("lanfw.com", "钃濇埧缃�"); + SOURCE_MAP.put("fangbx.com", "鎴垮疂绠�"); + SOURCE_MAP.put("zp365.com", "浣忔湅缃�"); + SOURCE_MAP.put("fangtoo.com", "鎴块�旂綉"); + SOURCE_MAP.put("suinf.cn", "閬傚畞鎴夸骇缃�"); + SOURCE_MAP.put("zhongpaiwang.com", "浼楁媿"); + SOURCE_MAP.put("ccoo.cn", "鍩庡競涓浗缃�"); + SOURCE_MAP.put("efw.cn", "e鎴跨綉"); + SOURCE_MAP.put("fcwlm.cn", "鎴夸骇缃戣仈鐩�"); + SOURCE_MAP.put("fdc.com.cn", "浜挎埧缃�"); + SOURCE_MAP.put("homelink.com.cn", "閾惧鍦ㄧ嚎"); + SOURCE_MAP.put("qfang.com", "Q鎴跨綉"); + SOURCE_MAP.put("liaoing.com", "鑱婂畢缃�"); + SOURCE_MAP.put("86fxw.com", "86鎴胯缃�"); + SOURCE_MAP.put("qq.com", "鑵捐"); + SOURCE_MAP.put("zhaofangw.cn", "鎵炬埧缃憌"); + SOURCE_MAP.put("0419.cn", "杈介槼缃�"); + SOURCE_MAP.put("0917fdc.com", "瀹濋浮鎴夸骇缃�"); + SOURCE_MAP.put("taobao.com", "娣樺疂鎷嶅崠"); + SOURCE_MAP.put("cityhouse.cn", "鍩庡競鎴夸骇"); + SOURCE_MAP.put("fccs.com", "涓浗鎴夸骇瓒呭競缃�"); + SOURCE_MAP.put("163.com", "缃戞槗"); + SOURCE_MAP.put("fdc.gov.cn", "婕冲窞甯備綇寤哄眬"); + SOURCE_MAP.put("ynpew.com", "浜戝崡鏅幢缃�"); + SOURCE_MAP.put("szfd.gov.cn", "瀹垮窞甯傛埧绠″眬"); + SOURCE_MAP.put("8080/house/", "鎬�鍖栨埧浜х鐞嗗眬"); + SOURCE_MAP.put("jxsrfdc.com", "涓婇ザ甯傛埧鍦颁骇绠$悊灞�"); + SOURCE_MAP.put("srfdc.com", "涓婇ザ鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("jxsrfdc.com", "涓婇ザ甯傛埧鍦颁骇绠$悊灞�"); + SOURCE_MAP.put("lbfdc.com", "鏉ュ鎴垮湴浜х綉"); + SOURCE_MAP.put("njfang.net", "鎬掓睙鎴夸骇缃�"); + SOURCE_MAP.put("xyfcw.com", "淇¢槼鎴夸骇缃�"); + SOURCE_MAP.put("taofw.cn", "娣樻埧灞�"); + SOURCE_MAP.put("xtfw.cn", "浠欐鎴跨綉"); + SOURCE_MAP.put("0728f.com", "0728鎴跨綉"); + SOURCE_MAP.put("tmfang.com", "澶╅棬鎴跨綉"); + SOURCE_MAP.put("iefang.com", "鐖辨槗鎴�"); + SOURCE_MAP.put(".fcwlm.cn", "绁炲啘鏋舵埧浜х綉"); + SOURCE_MAP.put("wcfang.com", "鏂囨槍鎴夸骇缃�"); + SOURCE_MAP.put("cdfgj.gov.cn", "鎴愰兘甯傛埧绠″眬"); + SOURCE_MAP.put("yzfc.cn", "鎵埧缃�"); + SOURCE_MAP.put("masff.com", "鎴挎埧缃�"); + SOURCE_MAP.put("x0750.com", "浜旈倯鎴夸骇缃�"); + SOURCE_MAP.put("dpdc.net.cn", "涓滈箯鍦颁骇"); + SOURCE_MAP.put("lsfc.net.cn", "鍢夊窞鎴夸骇缃�"); + SOURCE_MAP.put("lsfdc.com", "涔愭埧缃憀sfdc"); + SOURCE_MAP.put("iweihai.cn", "鐖卞▉娴风綉"); + SOURCE_MAP.put("whinfo.net.cn", "濞佹捣淇℃伅娓�"); + SOURCE_MAP.put("weihaifangchan.com", "濞佹捣鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("whhouse.com", "濞佹捣鎴垮湴浜х綉_whhouse"); + SOURCE_MAP.put("365baotou.com", "鍖呭ご鎴垮湴浜х綉365baotou"); + SOURCE_MAP.put("bt160.com", "鍖呭ご鎴夸骇缃慴t160"); + SOURCE_MAP.put("1f.cn", "鏄撴埧"); + SOURCE_MAP.put("88zf.com", "鑺滄箹鎵炬埧"); + SOURCE_MAP.put("yichangfang.com", "瀹滄槍鎴夸骇缃�"); + SOURCE_MAP.put("hualongxiang.com", "鍖栭緳宸�"); + SOURCE_MAP.put("lc365.net", "鑱婂煄鎴垮湴浜х綉lc365"); + SOURCE_MAP.put("lcxwfc.com", "鑱婂煄鎴跨綉"); + SOURCE_MAP.put("czfcw.com", "甯稿窞鎴夸骇缃�"); + SOURCE_MAP.put("jz6.cc", "鑽嗗窞绗竴鎴夸骇缃�"); + SOURCE_MAP.put("lcfcw.com", "鑱婂煄鎴夸骇缃憀cfcw"); + SOURCE_MAP.put("shjnet.cn", "鏉捐姳姹熺綉"); + SOURCE_MAP.put("fdc.cn", "婕冲窞鎴垮湴浜�"); + SOURCE_MAP.put("jxych.cn", "杈炬垚瀹滄槬鎴夸骇缃�"); + SOURCE_MAP.put("srtong.com", "涓婇ザ閫氭埧浜х綉"); + SOURCE_MAP.put("596fc.com", "596婕冲窞鎴夸骇缃�"); + SOURCE_MAP.put("wnfcw.cn", "娓崡鎴夸骇缃�"); + SOURCE_MAP.put("sqfcw.com.cn", "瑗挎鎴夸骇缃�"); + SOURCE_MAP.put("cityhouse.cn", "鍩庡競鎴夸骇缃�"); + SOURCE_MAP.put("sqfcw.com", "瀹胯縼鎵炬埧缃�"); + SOURCE_MAP.put("cityhouse.cn", "鍩庡競鎴夸骇缃�"); + SOURCE_MAP.put("ayloushi.com", "瀹夐槼妤煎競"); + SOURCE_MAP.put("0372.cn", "瀹夐槼淇℃伅缃�"); + SOURCE_MAP.put("t56.net", "娉版棤鑱婃埧浜х綉"); + SOURCE_MAP.put("0470fcw.com", "鍛间鸡璐濆皵鎴夸骇缃�"); + SOURCE_MAP.put("fanging.com", "娌冲崡鎴夸骇缃慺anging"); + SOURCE_MAP.put("house.163.com", "缃戞槗鎴夸骇"); + SOURCE_MAP.put("bjgtj.gov.cn", "鍖椾含甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("shgtj.gov.cn", "涓婃捣甯傝鍒掑拰鍥藉湡璧勬簮绠$悊灞�"); + SOURCE_MAP.put("laho.gov.cn", "骞垮窞甯傚浗鍦熻祫婧愬拰鎴垮眿绠$悊灞�"); + SOURCE_MAP.put("szpl.gov.cn", "娣卞湷甯傝鍒掑拰鍥藉湡璧勬簮濮斿憳浼�"); + SOURCE_MAP.put("fangdi.com.cn", "缃戜笂鎴垮湴浜�"); + SOURCE_MAP.put("tjfdc.gov.cn", "澶╂触甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("fzgtzyj.gov.cn", "绂忓窞甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("urumqiland.gov.cn", "涔岄瞾鏈ㄩ綈甯傚浗鍦熻祫婧愮鐞嗗眬"); + SOURCE_MAP.put("funi.com", "鎴愰兘閫忔槑鎴夸骇缃�"); + SOURCE_MAP.put("landwx.com", "鏃犻敗鍥藉湡璧勬簮浜ゆ槗缃�"); + SOURCE_MAP.put("lzgtj.gov.cn", "鍏板窞甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("fsgtgh.gov.cn", "浣涘北甯傚浗鍦熻祫婧愬拰鍩庝埂瑙勫垝灞�"); + SOURCE_MAP.put("xaland.gov.cn", "瑗垮畨甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("gtfwj.dl.gov.cn", "澶ц繛甯傚浗鍦熻祫婧愬拰鎴垮眿灞�"); + SOURCE_MAP.put("jxgtzyjy.gov.cn", "姹熻タ鐪佸湡鍦颁娇鐢ㄦ潈鍜岀熆涓氭潈缃戜笂浜ゆ槗绯荤粺"); + SOURCE_MAP.put("zhaofangw.cn", "鎵炬埧缃憌"); + SOURCE_MAP.put("hrbgtj.gov.cn", "鍝堝皵婊ㄥ競鍥藉湡璧勬簮灞�"); + SOURCE_MAP.put("163.com", "缃戞槗"); + SOURCE_MAP.put("tylr.gov.cn", "澶師甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("fc198.com", "鎴胯祫缃�"); + SOURCE_MAP.put("liaofang.com", "鑱婃埧缃�"); + SOURCE_MAP.put("maifun.com", "涔版埧缃�"); + SOURCE_MAP.put("ifeng.com", "鍑ゅ嚢缃�"); + SOURCE_MAP.put("bbshouse.com", "妤艰鐣�"); + SOURCE_MAP.put("zhuapo.com", "鎶撶牬缃�"); + SOURCE_MAP.put("hjfcs.cn", "娴锋櫙鎴胯秴甯�"); + SOURCE_MAP.put("sky008.com", "澶╃┖鎴夸骇缃�"); + SOURCE_MAP.put("xpchina.com", "鍦颁骇涓崕缃�"); + SOURCE_MAP.put("nblr.gov.cn", "瀹佹尝甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("ufangw.com", "浼樻埧缃�"); + SOURCE_MAP.put("zhantai.com", "绔欏彴缃�"); + SOURCE_MAP.put("lanfw.com", "钃濇埧缃�"); + SOURCE_MAP.put("edeng.cn", "鏄撶櫥缃�"); + SOURCE_MAP.put("zhifang.com", "鏅烘埧"); + SOURCE_MAP.put("zhaofang.com", "鎵炬埧缃�"); + SOURCE_MAP.put("fangdd.com", "鎴垮澶�"); + SOURCE_MAP.put("fcyhw.com", "鎴夸骇涓�鍙风綉"); + SOURCE_MAP.put("tzgt.gov.cn", "娉板窞鍥藉湡璧勬簮灞�"); + SOURCE_MAP.put("jiangmen.gov.cn", "姹熼棬甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("hebqhdsgt.gov.cn", "绉︾殗宀涘競鍥藉湡璧勬簮灞�"); + SOURCE_MAP.put("wzgt.gov.cn", "娓╁窞甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("zjtzgtj.gov.cn", "鍙板窞甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("dqlr.gov.cn", "澶у簡甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("gtjzh.gov.cn", "鐝犳捣甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("bxgtj.gov.cn", "鏈邯甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("lzblr.gov.cn", "鏌冲窞甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("lztdzx.com", "鏌冲窞甯傚湡鍦颁氦鏄撳偍澶囦腑蹇�"); + SOURCE_MAP.put("zjlr.gov.cn", "婀涙睙鍥藉湡璧勬簮灞�"); + SOURCE_MAP.put("zjlra.gov.cn", "闀囨睙甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("huzgt.gov.cn", "婀栧窞甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("ntgt.gov.cn", "鍗楅�氬競鍥藉湡璧勬簮灞�"); + SOURCE_MAP.put("wh.cn", "鑺滄箹甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("masgt.gov.cn", "椹瀺灞卞競鍥藉湡璧勬簮灞�"); + SOURCE_MAP.put("hzgtjy.com", "鎯犲窞甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("wfdlr.gov.cn", "娼嶅潑甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("lygmlr.gov.cn", "杩炰簯娓競鍥藉湡璧勬簮灞�"); + SOURCE_MAP.put("hklorb.gov.cn", "娴峰彛甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("yclr.gov.cn", "瀹滄槍甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("czlra.gov.cn", "甯稿窞甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("weihaiguotu.gov.cn", "濞佹捣甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("xzgtzy.gov.cn", "寰愬窞甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("asgtzy.cn", "闉嶅北甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("jhdlr.gov.cn", "閲戝崕甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("ycgtj.gov.cn", "鐩愬煄甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("td.sx.gov.cn", "缁嶅叴甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("zbgtj.gov.cn", "娣勫崥甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("lyblr.gov.cn", "娲涢槼甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("jxgtzy.gov.cn", "鍢夊叴甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("zsfdc.gov.cn", "涓北甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("glland.gov.cn", "妗傛灄甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("zzsgtj.gov.cn", "鏍床甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("gtj.my.gov.cn", "缁甸槼甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("haofung.com", "濂芥埧缃慼aofang"); + SOURCE_MAP.put("sttdkyjy.gov.cn", "姹曞ご甯傚湡鍦颁笌鐭夸笟鏉冧氦鏄撲腑蹇�"); + SOURCE_MAP.put("tdkcjy.maoming.gov.cn", "鑼傚悕甯傚湡鍦颁娇鐢ㄦ潈缃戜笂浜ゆ槗绯荤粺"); + SOURCE_MAP.put("hljmdjlr.gov.cn", "鐗′腹姹熷競鍥藉湡璧勬簮灞�"); + SOURCE_MAP.put("pdsgt.gov.cn", "骞抽《灞卞競鍥藉湡璧勬簮灞�"); + SOURCE_MAP.put("hljqqhelr.gov.cn", "榻愰綈鍝堝皵甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("pinganfang.com", "骞冲畨濂芥埧"); + SOURCE_MAP.put("hngtjy.com", "婀栧崡鐪佸浗鍦熻祫婧愮綉涓婁氦鏄撶郴缁�"); + SOURCE_MAP.put("hyblr.com", "琛¢槼甯傚浗鍦熻祫婧愬競鍦虹綉"); + SOURCE_MAP.put("gtzyjy.jl.gov.cn", "鍚夋灄鐪佸浗鍦熻祫婧愮綉涓婁氦鏄撳钩鍙�"); + SOURCE_MAP.put("1loushi.cn", "绗�1妤煎競"); + SOURCE_MAP.put("yagt.gov.cn", "寤跺畨甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("fang.tm", "鎴垮挅"); + SOURCE_MAP.put("ptgt.gov.cn", "鑾嗙敯甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("tdjy.yunfu.gov.cn", "浜戞诞甯傚浗鍦熻祫婧愬拰鍩庝埂瑙勫垝绠$悊灞�"); + SOURCE_MAP.put("zsblr.gov.cn", "鑸熷北甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("qyggzy.cn", "娓呰繙甯傚叕鍏辫祫婧愪氦鏄撲腑蹇�"); + SOURCE_MAP.put("xygtzyj.gov.cn", "鍜搁槼甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("zjjgtzy.gov.cn", "寮犲鐣屽競鍥藉湡璧勬簮灞�"); + SOURCE_MAP.put("sqmlr.gov.cn", "瀹胯縼鍥藉湡璧勬簮缃�"); + SOURCE_MAP.put("xfgt.gov.cn", "瑗勯槼甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("xyfc.com", "瑗勯槼鎴夸骇"); + SOURCE_MAP.put("wkzf.com", "鎮熺┖鎵炬埧"); + SOURCE_MAP.put("58fenlei.com", "58鍒嗙被缃�"); + SOURCE_MAP.put("cnchu.com", "妤氱綉"); + SOURCE_MAP.put("577house.com", "娓╁窞鎴夸骇鐑嚎"); + SOURCE_MAP.put("bjfang.com", "澶╂湕鎴跨綉"); + SOURCE_MAP.put("bjhouse.com", "鐧惧鎴跨綉"); + SOURCE_MAP.put("sh.cn", "涓婃捣鐑嚎"); + SOURCE_MAP.put("shenchuang.com", "娣卞湷涔嬬獥"); + SOURCE_MAP.put("dingcity.com", "绗琋鍩�"); + SOURCE_MAP.put("enorth.com.cn", "鍖楁柟缃�"); + SOURCE_MAP.put("szfdc.net.cn", "娣卞湷鎴夸骇缃慱szfdc"); + SOURCE_MAP.put("cqfdcw.cn", "閲嶅簡鎴垮湴浜х綉"); + SOURCE_MAP.put("szfcw.com.cn", "鑻忓窞鎴夸骇缃�"); + SOURCE_MAP.put("kunfun.com", "鏄嗘埧缃�"); + SOURCE_MAP.put("cnhubei.com", "鑽嗘缃�"); + SOURCE_MAP.put("0791esf.com", "0791浜屾墜鎴�"); + SOURCE_MAP.put("fczx.com", "涓浗鎴夸骇鍦ㄧ嚎"); + SOURCE_MAP.put("baijuyi.com.cn", "鐧惧眳鏄�"); + SOURCE_MAP.put("hz.cc", "鏉窞鎴夸骇缃�"); + SOURCE_MAP.put("jnfcw.org", "娴庡崡鎴夸骇缃慱jnfcw"); + SOURCE_MAP.put("dswtv.com", "鍔ㄨ缃�"); + SOURCE_MAP.put("runsky.com", "澶╁仴鎴夸骇"); + SOURCE_MAP.put("dl.cc", "澶ц繛鎴夸骇缃�"); + SOURCE_MAP.put("zhudalian.com", "浣忓ぇ杩�"); + SOURCE_MAP.put("0451zf.com", "鍝堝競鍦ㄧ嚎"); + SOURCE_MAP.put("fdc0451.com", "鍝堝皵婊ㄦ埧鍦颁骇缃�"); + SOURCE_MAP.put("house371.com", "閮戝窞鎴夸骇缃慱house371"); + SOURCE_MAP.put("hiao.com", "鐑熷彴濂界綉"); + SOURCE_MAP.put("bbsfh.net", "濂夊寲鎴夸骇缃慱bbsfh"); + SOURCE_MAP.put("967890.com", "濂夊寲鎴夸骇浜ゆ槗缃�"); + SOURCE_MAP.put("xwh.cn", "鏂版枃鍖栫綉"); + SOURCE_MAP.put("jidahouse.com", "鍚夊ぇ鎴夸骇"); + SOURCE_MAP.put("51fdc.com", "鏃犲咖鎴跨綉"); + SOURCE_MAP.put("lsfun.com", "涓芥按鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("fangbx.com", "鎴垮疂绠�"); + SOURCE_MAP.put("qd8.com.cn", "蹇偣8"); + SOURCE_MAP.put("tshgt.gov.cn", "鍞愬北甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("gzlps.gov.cn", "鍏洏姘村競鍥藉湡璧勬簮灞�"); + SOURCE_MAP.put("ybdlr.gov.cn", "瀹滃甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("zglr.gov.cn", "鑷础甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("pzhgt.gov.cn", "鏀�鏋濊姳甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("nnland.gov.cn", "鍗楀畞甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("quzgt.gov.cn", "琛㈠窞甯傚浗鍦熺鐞嗗眬"); + SOURCE_MAP.put("lfgtzy.gov.cn", "寤婂潑甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("xtgt.gov.cn", "婀樻江甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("zqgtzy.gov.cn", "鑲囧簡甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("anyang.gov.cn", "瀹夐槼甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("xxblr.gov.cn", "鏂颁埂甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("ykgtj.gov.cn", "钀ュ彛甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("czggzy.com", "娼窞甯傚叕鍏辫祫婧愪氦鏄撲腑蹇�"); + SOURCE_MAP.put("hsgtj.gov.cn", "榛勭煶甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("jzgtzy.gov.cn", "鐒︿綔甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("pjgtj.gov.cn", "鐩橀敠甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("mzgtzy.gov.cn", "姊呭窞甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("yygt.gov.cn", "宀抽槼甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("hngtjy.cn", "娌冲崡鐪佸浗鍦熻祫婧愮綉涓婁氦鏄撶郴缁�"); + SOURCE_MAP.put("hngt.gov.cn", "娣崡甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("gtj.huaian.gov.cn", "娣畨鍥藉湡璧勬簮缃�"); + SOURCE_MAP.put("hljjmslr.gov.cn", "浣虫湪鏂競鍥藉湡璧勬簮灞�"); + SOURCE_MAP.put("nygtzy.nanyang.gov.cn", "鍗楅槼甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("lygtzy.gov.cn", "灞变笢鐪佷复娌傚競鍥藉湡璧勬簮灞�"); + SOURCE_MAP.put("linfenlr.gov.cn", "涓存本甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("ylgtj.gov.cn", "姒嗘灄甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("sglr.gov.cn", "闊跺叧甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("hytudi.com", "娌虫簮甯傚湡鍦颁笌鐭夸笟鏉冪綉涓婁氦鏄撶郴缁�"); + SOURCE_MAP.put("yjgtjy.com", "闃虫睙甯傚湡鍦颁笌鐭夸笟鏉冪綉涓婁氦鏄撶郴缁�"); + SOURCE_MAP.put("lr.hainan.gov.cn", "娴峰崡鐪佸浗鍦熻祫婧愬巺"); + SOURCE_MAP.put("gtzy.cj.gov.cn", "鏄屽悏鍥炴棌鑷不宸炲浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("ohqly.com", "鍗冮噷鐪�"); SOURCE_MAP.put("go007.com", "go007"); - SOURCE_MAP.put("zysgtzyj.gov.cn", "遵义市国土资源局"); - SOURCE_MAP.put("ddgt.gov.cn", "丹东市国土资源局"); - SOURCE_MAP.put("jygtzy.cn", "济源市国土资源局"); - SOURCE_MAP.put("tlland.gov.cn", "铁岭市国土资源交易网"); - SOURCE_MAP.put("tslr.gov.cn", "天水市国土资源局"); - SOURCE_MAP.put("tagt.gov.cn", "泰安市国土资源局"); - SOURCE_MAP.put("hggtzy.gov.cn", "黄冈市国土资源局"); - SOURCE_MAP.put("gylr.gov.cn", "广元市国土资源局"); - SOURCE_MAP.put("gtj.fy.gov.cn", "阜阳市国土资源局"); - SOURCE_MAP.put("gsdlr.gov.cn", "甘肃国土资源"); - SOURCE_MAP.put("xbaixing.com", "小百姓网"); - SOURCE_MAP.put("lsblr.gov.cn", "乐山市国土资源局"); - SOURCE_MAP.put("sgfczc.com", "韶关房产之窗"); - SOURCE_MAP.put("gnzxxw.com", "甘南信息网"); - SOURCE_MAP.put("hzgt.gov.cn", "菏泽市国土资源局"); - SOURCE_MAP.put("jzsgt.gov.cn", "锦州市国土资源局"); - SOURCE_MAP.put("nmggtt.gov.cn", "内蒙古自治区国土资源厅"); - SOURCE_MAP.put("yndlr.gov.cn", "云南省国土资源厅"); - SOURCE_MAP.put("xjgtzy.gov.cn", "新疆维吾尔自治区国土资源厅"); - SOURCE_MAP.put("gxdlr.gov.cn", "广西壮族自治区国土资源厅"); - SOURCE_MAP.put("hebgt.gov.cn", "河北省国土资源厅"); - SOURCE_MAP.put("gd-jygt.gov.cn", "揭阳市土地和矿业权网上交易系统"); - SOURCE_MAP.put("gtj.hanzhong.gov.cn", "汉中市国土资源局"); - SOURCE_MAP.put("hsland.gov.cn", "黄山市国土资源局"); - SOURCE_MAP.put("bsgtj.gov.cn", "白山市国土资源局"); - SOURCE_MAP.put("asgtzy.gov.cn", "安顺市国土资源局"); - SOURCE_MAP.put("gtzy.net", "安康国土资源信息网"); - SOURCE_MAP.put("hljshlr.gov.cn", "绥化市国土资源局"); - SOURCE_MAP.put("qzlr.gov.cn", "钦州市国土资源局"); - SOURCE_MAP.put("landvalue.com.cn", "中国城市地价动态监测"); - SOURCE_MAP.put("andvalue.com.cn", "中国城市地价动态监测"); - SOURCE_MAP.put("hljjxlr.gov.cn", "鸡西市国土资源局"); - SOURCE_MAP.put("stats.gov.cn", "国家统计局-70个大中城市住宅销售价格"); - SOURCE_MAP.put("bcgtzyj.gov.cn", "吉林省白城市国土资源局"); - SOURCE_MAP.put("ahbzgt.gov.cn", "亳州市国土资源局"); - SOURCE_MAP.put("aqgtj.gov.cn", "安庆市国土资源局"); - SOURCE_MAP.put("lagt.gov.cn", "六安市国土资源局"); - SOURCE_MAP.put("nclr.gov.cn", "南充市国土资源局"); - SOURCE_MAP.put("lzsgtj.cn", "泸州市国土资源局"); - SOURCE_MAP.put("sczylr.gov.cn", "资阳市国土资源局"); - SOURCE_MAP.put("kfgtfcj.gov.cn", "开封市国土资源局"); - SOURCE_MAP.put("shuozhoulr.gov.cn", "朔州市国土资源局"); - SOURCE_MAP.put("plgtj.gov.cn", "平凉市国土资源局"); - SOURCE_MAP.put("bygtzyj.gov.cn", "白银国土资源"); - SOURCE_MAP.put("hljhglr.gov.cn", "鹤岗市国土资源局"); - SOURCE_MAP.put("trgtzy.gov.cn", "铜仁市国土资源局"); - SOURCE_MAP.put("npgtzy.gov.cn", "南平市国土资源局"); - SOURCE_MAP.put("gggt.gov.cn", "贵港市国土资源局"); - SOURCE_MAP.put("slgtzy.gov.cn", "商洛市国土资源局"); - SOURCE_MAP.put("nxgtt.gov.cn", "宁夏回族自治区国土资源厅"); - SOURCE_MAP.put("jcgt.jconline.cn", "晋城市国土资源厅"); - SOURCE_MAP.put("qhlr.gov.cn", "青海省国土资源厅"); - SOURCE_MAP.put("hljhhlr.gov.cn", "黑河市国土资源局"); - SOURCE_MAP.put("gtzyj.fuxin.gov.cn", "阜新市国土资源局"); - SOURCE_MAP.put("fsgtzy.gov.cn", "抚顺市国土资源局"); - SOURCE_MAP.put("hldland.gov.cn", "葫芦岛市国土资源局"); - SOURCE_MAP.put("jngtj.gov.cn", "济宁市国土资源局"); - SOURCE_MAP.put("rzgt.gov.cn", "日照市国土资源局"); - SOURCE_MAP.put("lcgtjy.com", "聊城市国土资源交易系统"); - SOURCE_MAP.put("bzgtzy.gov.cn", "滨州市国土资源局"); - SOURCE_MAP.put("hbgt.gov.cn", "淮北市国土资源局"); - SOURCE_MAP.put("ahxcgt.gov.cn", "宣城市国土资源局"); - SOURCE_MAP.put("szgt.gov.cn", "宿州市国土资源局"); - SOURCE_MAP.put("fjgtzy.gov.cn", "福建省土地使用权出让管理系统"); - SOURCE_MAP.put("czgtj.gov.cn", "池州市国土资源局"); - SOURCE_MAP.put("scnjlr.gov.cn", "内江市国土资源局"); - SOURCE_MAP.put("bzgt.gov.cn", "巴中市国土资源局"); - SOURCE_MAP.put("hhgtzy.gov.cn", "怀化市国土资源局"); - SOURCE_MAP.put("ezlr.gov.cn", "鄂州市国土资源局"); - SOURCE_MAP.put("hljyclr.gov.cn", "伊春市国土资源局"); - SOURCE_MAP.put("landnj.cn", "南京市国土资源局"); - SOURCE_MAP.put("gtzy.shiyan.gov.cn", "十堰市国土资源局"); - SOURCE_MAP.put("gtzyj.scsn.gov.cn", "遂宁市国土资源局"); - SOURCE_MAP.put("lhgtj.gov.cn", "漯河市国土资源局"); - SOURCE_MAP.put("0438land.com", "松原市国土资源网上交易系统"); - SOURCE_MAP.put("msdlr.gov.cn", "眉山市国土资源局"); - SOURCE_MAP.put("ggzy.hebi.gov.cn", "鹤壁市公共资源交易中心"); - SOURCE_MAP.put("xinzhoulr.gov.cn", "忻州市国土资源局"); - SOURCE_MAP.put("czgtzy.gov.cn", "郴州市国土资源局"); - SOURCE_MAP.put("czland.gov.cn", "郴州市国土资源网上挂牌出让系统"); - SOURCE_MAP.put("jinzhonglr.gov.cn", "晋中市国土资源局"); - SOURCE_MAP.put("yygtzy.gov.cn", "益阳市国土资源局"); - SOURCE_MAP.put("bjgt.gov.cn", "宝鸡市国土资源局"); - SOURCE_MAP.put("8009", "辽阳市国土资源交易网"); - SOURCE_MAP.put("hblr.gov.cn", "湖北省国土资源厅"); - SOURCE_MAP.put("cdgtzy.gov.cn", "承德市国土资源局"); - SOURCE_MAP.put("zzgtzy.gov.cn", "枣庄市国土资源局"); - SOURCE_MAP.put("zkgtzy.gov.cn", "河南省周口市国土资源局"); - SOURCE_MAP.put("pyblr.gov.cn", "濮阳市国土资源局"); - SOURCE_MAP.put("lwgtj.gov.cn", "山东省莱芜市国土资源局"); - SOURCE_MAP.put("yqgt.gov.cn", "阳泉市国土资源局"); - SOURCE_MAP.put("yunchenglr.gov.cn", "运城市国土资源局"); - SOURCE_MAP.put("bbsgtj.gov.cn", "蚌埠市国土资源局"); - SOURCE_MAP.put("wngtj.gov.cn", "渭南市国土资源局"); - SOURCE_MAP.put("czgtfc.gov.cn", "滁州市国土资源和房产管理局"); - SOURCE_MAP.put("tlgt.gov.cn", "铜陵市国土资源局"); - SOURCE_MAP.put("jygzyjy.com", "嘉峪关市公共资源交易中心"); - SOURCE_MAP.put("zzgt.gov.cn", "漳州市国土资源局"); - SOURCE_MAP.put("swgtjy.com", "汕尾市公共资源交易网"); - SOURCE_MAP.put("86fxw.com", "86房讯网"); - SOURCE_MAP.put("dygtj.cn", "德阳市国土资源局"); - SOURCE_MAP.put("dylr.gov.cn", "东营市国土资源局"); - SOURCE_MAP.put("galr.gov.cn", "广安市国土资源局"); - SOURCE_MAP.put("dzgtj.gov.cn", "德州市国土资源局"); - SOURCE_MAP.put("yasgtzy.0835.com", "雅安市国土资源局"); - SOURCE_MAP.put("yzsgt.gov.cn", "永州市国土资源局"); - SOURCE_MAP.put("ldgtzy.gov.cn", "娄底市国土资源局"); - SOURCE_MAP.put("jzgt.gov.cn", "荆州市国土资源局"); - SOURCE_MAP.put("smxgtzy.gov.cn", "三门峡市国土资源局"); - SOURCE_MAP.put("changzhilr.gov.cn", "长治市国土资源局"); - SOURCE_MAP.put("ggzy.llcftxw.gov.cn", "吕梁市公共资源交易网"); - SOURCE_MAP.put("xxzgt.gov.cn", "湘西自治州国土资源局"); - SOURCE_MAP.put("abgt.gov.cn", "阿坝州国土资源局"); - SOURCE_MAP.put("lszlr.gov.cn", "凉山州国土资源局"); - SOURCE_MAP.put("xygt.cn", "信阳市国土资源局"); - SOURCE_MAP.put("hcgt.cn", "河池市国土资源局"); - SOURCE_MAP.put("hnsygt.gov.cn", "邵阳市国土资源局"); - SOURCE_MAP.put("jmlr.com", "荆门市国土资源局"); - SOURCE_MAP.put("zmdgtj.gov.cn", "驻马店市国土资源局"); - SOURCE_MAP.put("tcgtjy.gov.cn", "铜川市国土资源交易网"); - SOURCE_MAP.put("czgt.gov.cn", "崇左市国土资源局"); - SOURCE_MAP.put("hljdxallr.gov.cn", "大兴安岭地区行署国土资源局"); - SOURCE_MAP.put("fangyi.com", "房一网"); - SOURCE_MAP.put("xtgtzy.gov.cn", "仙桃市国土资源局"); - SOURCE_MAP.put("bqqm.com", "便民网"); - SOURCE_MAP.put("hainan.gov.cn", "海南省人民政府"); - SOURCE_MAP.put("btgt.gov.cn", "新疆生产建设兵团国土资源局"); - SOURCE_MAP.put("cj.dloer.gov.cn", "昌江县国土资源局"); - SOURCE_MAP.put("qjgtj.gov.cn", "潜江市国土资源局"); - SOURCE_MAP.put("funxoo.com", "房秀网"); - SOURCE_MAP.put("tmlr.gov.cn", "天门市国土资源网"); - SOURCE_MAP.put("thgt.gov.cn", "通化市国土资源局"); - SOURCE_MAP.put("dzsgt.gov.cn", "达州市国土资源局"); - SOURCE_MAP.put("gtj.zhangye.gov.cn", "张掖市国土资源局"); - SOURCE_MAP.put("xgbidding.com", "孝感市公共资源交易信息网"); - SOURCE_MAP.put("gtj.jc.gansu.gov.cn", "金昌市国土资源局"); - SOURCE_MAP.put("ylgt.gov.cn", "伊犁州国土资源局"); - SOURCE_MAP.put("gtzyj.hh.gov.cn", "红河州国土资源局"); - SOURCE_MAP.put("gndlr.gov.cn", "甘南藏族自治州国土资源局"); - SOURCE_MAP.put("jndlr.gov.cn", "济南市国土资源局"); - SOURCE_MAP.put("ytgtjy.gov.cn", "烟台市国土资源网上交易系统"); - SOURCE_MAP.put("ytgt.gov.cn", "烟台市国土资源局"); - SOURCE_MAP.put("syghgt.gov.cn", "沈阳市规划和国土资源局"); - SOURCE_MAP.put("zzland.gov.cn", "郑州市国土资源局"); - SOURCE_MAP.put("tdkqw.kmggzy.com", "昆明市土地和矿业权交易网"); - SOURCE_MAP.put("qzgtj.gov.cn", "泉州市国土资源局"); - SOURCE_MAP.put("ccgt.gov.cn", "长春市国土资源局"); - SOURCE_MAP.put("szgtj.gov.cn", "苏州市国土资源局"); - SOURCE_MAP.put("hfgt.gov.cn", "合肥市国土资源局"); - SOURCE_MAP.put("fdzy.gov.cn", "青岛市国土资源和房屋管理局"); - SOURCE_MAP.put("csgtzy.gov.cn", "长沙市国土资源局"); - SOURCE_MAP.put("cdlr.gov.cn", "成都市国土资源局"); - SOURCE_MAP.put("cqgtfw.gov.cn", "重庆市土地和矿业权交易中心"); - SOURCE_MAP.put("hzgtj.gov.cn", "杭州市国土资源局"); - SOURCE_MAP.put("xmtfj.gov.cn", "厦门市土地矿产资源交易市场"); - SOURCE_MAP.put("dg.gov.cn", "东莞市国土资源局"); - SOURCE_MAP.put("0483hq.com", "阿拉善宏桥网"); - SOURCE_MAP.put("53xj.com", "新疆房产网"); - SOURCE_MAP.put("53xj.com", "新疆房产网"); - SOURCE_MAP.put("53xj.com", "新疆房产网"); - SOURCE_MAP.put("xinzhou.ccoo.cn", "忻州城市在线"); - SOURCE_MAP.put("ynfww.com", "云南房屋网"); - SOURCE_MAP.put("ff1.com.cn", "韶关房产网"); - SOURCE_MAP.put("zstmsf.com", "舟山透明售房网"); - SOURCE_MAP.put("0457.com", "大兴安岭港"); - SOURCE_MAP.put("chongzuo6.com", "崇左房产网"); - SOURCE_MAP.put("fangle.com", "房乐网"); - SOURCE_MAP.put("f0580.com", "大舟山房产"); - SOURCE_MAP.put("jc86.cn", "嘉诚搜房"); - SOURCE_MAP.put("sg169.com", "韶关房产网"); - SOURCE_MAP.put("dongfang0898.com", "东方在线"); - SOURCE_MAP.put("0937.com", "嘉峪关在线"); - SOURCE_MAP.put("dqccc.com", "全球港"); - SOURCE_MAP.put("lbfdc.com", "来宾房地产网lbfdc"); - SOURCE_MAP.put("teambuy.com.cn", "中团网"); - SOURCE_MAP.put("cnhouse.com", "寻捕房"); - SOURCE_MAP.put("jxhjfc.com", "鸿基房产"); - SOURCE_MAP.put("daxiangw.com", "大湘二手房"); - SOURCE_MAP.put("inlishui.com", "居家中国"); - SOURCE_MAP.put("lingaoren.com", "临高信息网"); - SOURCE_MAP.put("fang.com", "搜房网"); - SOURCE_MAP.put("qnz.com.cn", "黔南热线"); - SOURCE_MAP.put("focus.cn", "搜狐焦点"); - SOURCE_MAP.put("fang.com", "搜房网"); - SOURCE_MAP.put("duyunfcw.com", "都匀房产网"); - SOURCE_MAP.put("xamfcxx.com", "兴安盟房产信息网"); - SOURCE_MAP.put("21ccnn.com", "21房产频道"); - SOURCE_MAP.put("0914cn.com", "商洛网房产"); - SOURCE_MAP.put("ddfsw.com", "豆豆房事网"); - SOURCE_MAP.put("landchina.com", "中国土地市场网"); - SOURCE_MAP.put("trfcw.com", "铜仁房产网trfcw"); - SOURCE_MAP.put("yunland.cn", "云地"); - SOURCE_MAP.put("tudinet.com", "土流网"); - SOURCE_MAP.put("wsfcw.cc", "文山房产网"); - SOURCE_MAP.put("hainanfz.com", "三亚房产网_hainanfz"); - SOURCE_MAP.put("hainanfz.com", "三亚房产网_hainanfz"); - SOURCE_MAP.put("realestate.cei.gov.cn", "中国房地产信息网"); - SOURCE_MAP.put("lfang.com", "爱房网"); - SOURCE_MAP.put("fdc0859.com", "兴义房地产网"); - SOURCE_MAP.put("qxnfdc.cn", "黔西南房地产网"); - SOURCE_MAP.put("zhtfc.cn", "昭通房产网"); - SOURCE_MAP.put("smxfcw.cn", "三门峡房产网"); - SOURCE_MAP.put("wwxxg.com", "武威信息港"); - SOURCE_MAP.put("zhaotong.cn", "大昭网"); - SOURCE_MAP.put("hzfc.gov.cn", "杭州市住房保障和房产管理局"); - SOURCE_MAP.put("bjjs.gov.cn", "北京市住房和城乡建设委员会"); - SOURCE_MAP.put("sxhouse.com.cn", "绍兴市房地产信息网"); - SOURCE_MAP.put("07430743.com", "湘西生活网"); - SOURCE_MAP.put("xjks.net", "喀什都市网"); - SOURCE_MAP.put("hx0977.com", "青海·海西在线"); - SOURCE_MAP.put("0933f.com", "平凉房产网"); - SOURCE_MAP.put("xdhcfc.com", "选定房产"); - SOURCE_MAP.put("0913123.com", "渭南在线"); - SOURCE_MAP.put("517.cn", "517不动产"); - SOURCE_MAP.put("0857fc.cn", "毕节房产网"); - SOURCE_MAP.put("jhzhijia.com", "金海置家"); - SOURCE_MAP.put("yaanren.net", "雅安人网"); - SOURCE_MAP.put("esfcxx.com", "恩施二手房产"); - SOURCE_MAP.put("enfcw.cn", "恩施房产网"); - SOURCE_MAP.put("fcgzf.com", "防城港住房网"); - SOURCE_MAP.put("fcfcg.com", "防城港市房产网"); - SOURCE_MAP.put("wanjiazzfc.com", "万家自助房产网"); - SOURCE_MAP.put("0470jiaxing.com", "家兴房产"); - SOURCE_MAP.put("cnnbfdc.com", "中国宁波住宅与房地产网"); - SOURCE_MAP.put("0473fdc.com", "乌海房产网"); - SOURCE_MAP.put("yc2002.com", "一成网"); - SOURCE_MAP.put("0439.com", "白山房网"); - SOURCE_MAP.put("51258.cn", "亳州房产信息网"); - SOURCE_MAP.put("danzhou8.com", "儋州在线"); - SOURCE_MAP.put("xtfw.cn", "仙桃房网"); - SOURCE_MAP.put("0724f.com", "房信网"); - SOURCE_MAP.put("dd288.com", "点点房产网"); - SOURCE_MAP.put("0728f.com", "0728房网"); - SOURCE_MAP.put("0906bt.com", "北屯信息网"); - SOURCE_MAP.put("jmhfw.com", "荆门好房网"); - SOURCE_MAP.put("hainan0898.net", "海南购房网"); - SOURCE_MAP.put("0939.net", "陇南生活网"); - SOURCE_MAP.put("ibeitun.cn", "北屯房产"); - SOURCE_MAP.put("ibeitun.cn", "北屯房产"); - SOURCE_MAP.put("0437.com", "辽源信息港"); - SOURCE_MAP.put("honghe.me", "红河房产网"); - SOURCE_MAP.put("bazfc.cn", "巴中房产网"); - SOURCE_MAP.put("xiongqi.net", "巴中房产网xiongqi"); - SOURCE_MAP.put("ybfcw.net", "酒都房产网"); - SOURCE_MAP.put("tmfang.com", "天门房产网"); - SOURCE_MAP.put("zjjfcw.cn", "张家界房产网"); - SOURCE_MAP.put("xyanjia.com", "新余房产网"); - SOURCE_MAP.put("bendiw.cc", "本地网"); - SOURCE_MAP.put("jxfcrx.com", "鸡西房产热线"); - SOURCE_MAP.put("0722fc.com", "随房网"); - SOURCE_MAP.put("szfcol.com", "随州房产在线"); - SOURCE_MAP.put("shaofang.cc", "邵阳房产网"); - SOURCE_MAP.put("jlxfw.com", "监利房网"); - SOURCE_MAP.put("hhfxw.com", "洪湖房信网"); - SOURCE_MAP.put("hbszfw.com", "松滋房网"); - SOURCE_MAP.put("hbssfw.com", "石首房网"); - SOURCE_MAP.put("zkloushi.com", "周口楼市网"); - SOURCE_MAP.put("571400.net", "琼海信息网"); - SOURCE_MAP.put("0722h.com", "随州好房网"); - SOURCE_MAP.put("leju.com", "乐居网"); - SOURCE_MAP.put("jxbuild.gov.cn", "嘉兴市住房保障局"); - SOURCE_MAP.put("zjol.com.cn", "浙江在线"); - SOURCE_MAP.put("szsxbaixing.com", "小百姓"); - SOURCE_MAP.put("qichunfdc.com", "蕲春房产网"); - SOURCE_MAP.put("xsfcw.cn", "浠水房产网"); - SOURCE_MAP.put("wxfxw.com", "武穴房信网"); - SOURCE_MAP.put("hmfxw.com", "黄梅房信网"); - SOURCE_MAP.put("ltfcw.cn", "罗田房产网"); - SOURCE_MAP.put("house.zxip.com", "慈溪房产网"); - SOURCE_MAP.put("eyuyao.com", "余姚生活网"); - SOURCE_MAP.put("58.com", "58同城"); - SOURCE_MAP.put("fdc0746.com", "0746房产网"); - SOURCE_MAP.put("wzfg.com", "温州市房地产市场信息网"); - SOURCE_MAP.put("0557fdc.com", "宿房丁丁"); - SOURCE_MAP.put("0557.cn", "0557宿州房产网"); - SOURCE_MAP.put("0557100.com", "宿州在线"); - SOURCE_MAP.put("xiaoke101.com", "小柯"); - SOURCE_MAP.put("czfcw.com", "常州房产网"); - SOURCE_MAP.put("hzdajiangdong.com", "大江东网"); - SOURCE_MAP.put("hgfdc.com", "黄冈房地产网"); - SOURCE_MAP.put("bynef.cn", "巴彦淖尔房产网"); - SOURCE_MAP.put("gwytk.com", "怀化房产网"); - SOURCE_MAP.put("hhfcw.com", "怀化房产网huaihfcw"); - SOURCE_MAP.put("0735.com", "郴州新网"); - SOURCE_MAP.put("szsoufun.cn", "嵊州搜房网"); - SOURCE_MAP.put("lpsfcw.cn", "六盘水房产网"); - SOURCE_MAP.put("0916dc.com", "汉中房产网"); - SOURCE_MAP.put("0712fang.com", "孝房网"); - SOURCE_MAP.put("fzhfc.cn", "抚州房产网"); - SOURCE_MAP.put("fuzhoufc.com", "抚州房产网fuzhoufc"); - SOURCE_MAP.put("huaif.cn", "怀化房产网huaif"); - SOURCE_MAP.put("czbfw.com", "百房网"); - SOURCE_MAP.put("panjin.net", "鹤乡热线"); - SOURCE_MAP.put("cs0799.com", "萍乡城事网"); - SOURCE_MAP.put("my0832.com", "资阳大众网"); - SOURCE_MAP.put("newtonghua.com", "新通化网"); - SOURCE_MAP.put("yanbiancity.com", "延边都市房产"); - SOURCE_MAP.put("0433fc.cn", "延边房产网0433fc"); - SOURCE_MAP.put("0719house.com", "车城房产网"); - SOURCE_MAP.put("akfcw.cn", "安康房产网akfcw"); - SOURCE_MAP.put("0662f.com", "阳江房产网"); - SOURCE_MAP.put("jfw.com", "丽江房网ljfw"); - SOURCE_MAP.put("ls520.net", "凉山房产网"); - SOURCE_MAP.put("0283home.com", "眉山购房网"); - SOURCE_MAP.put("0434fang.com", "四平买房网"); - SOURCE_MAP.put("chafangwang.com", "CFW查房网"); - SOURCE_MAP.put("songyuanfang.com", "松原购房网"); - SOURCE_MAP.put("0938.cn", "天水生活网"); - SOURCE_MAP.put("0938f.com", "天水房产网"); - SOURCE_MAP.put("bxifc.cn", "本溪安吉房产网"); - SOURCE_MAP.put("bxfcj", "房屋市场"); - SOURCE_MAP.put("hrfcw.cn", "和润房产网"); - SOURCE_MAP.put("ai0455.com", "绥化之窗网"); - SOURCE_MAP.put("8441111.com", "绥化宜家房产网"); - SOURCE_MAP.put("dzfc.com", "达州房产网"); - SOURCE_MAP.put("234fang.com", "朝阳爱房网"); - SOURCE_MAP.put("househy.com", "河源置业网"); - SOURCE_MAP.put("0762fcw.com", "河源房产网"); - SOURCE_MAP.put("suinf.cn", "遂宁房产网"); - SOURCE_MAP.put("0738ld.com", "娄底房网"); - SOURCE_MAP.put("0738fdc.com", "娄底房产网"); - SOURCE_MAP.put("dyfcw.com", "德阳房产网"); - SOURCE_MAP.put("deyang5.com", "德阳信息网"); - SOURCE_MAP.put("jzloushi.com", "焦作楼市"); - SOURCE_MAP.put("cityhouse.cn", "城市房产"); - SOURCE_MAP.put("cityhouse.cn", "城市房产"); - SOURCE_MAP.put("xgrb.cn", "槐荫房产"); - SOURCE_MAP.put("0712fang.com", "孝房网"); - SOURCE_MAP.put("tielingfc.com", "铁岭房产网tlfcw"); - SOURCE_MAP.put("fcpzh.com", "攀枝花房产网"); - SOURCE_MAP.put("pzhls.com", "攀枝花楼市网"); - SOURCE_MAP.put("hldhouse.com", "葫芦岛房地产网"); - SOURCE_MAP.put("chuzf.cn", "滁州房产信息网"); - SOURCE_MAP.put("0550.com", "E滁州网"); - SOURCE_MAP.put("gafcw.cn", "广安房产网"); - SOURCE_MAP.put("sy0826.com", "广安思源房产网"); - SOURCE_MAP.put("dalihouse.org", "大理房产信息网"); - SOURCE_MAP.put("168hs.com", "黄山市民网"); - SOURCE_MAP.put("jiefc.cn", "揭阳房产网"); - SOURCE_MAP.put("dalifcw.com", "大理房产网"); - SOURCE_MAP.put("zmdfcw.com", "驻马店房产网"); - SOURCE_MAP.put("zmdfcw.cn", "驻马店房产网在线"); - SOURCE_MAP.put("zmdfang.cn", "天中房产网"); - SOURCE_MAP.put("hezefc.com", "菏泽房产网"); - SOURCE_MAP.put("hzfc.cc", "菏房网"); - SOURCE_MAP.put("hezels.com", "菏泽楼市网"); - SOURCE_MAP.put("dyfc.net", "东营房产网"); - SOURCE_MAP.put("0352fang.com", "大同房产网"); - SOURCE_MAP.put("tiboo.cn", "地宝网"); - SOURCE_MAP.put("0356f.com", "晋城房产网"); - SOURCE_MAP.put("0561house.com", "淮北房产网0561"); - SOURCE_MAP.put("v007.net", "西江明珠房产网"); - SOURCE_MAP.put("jianfc.com", "吉安房产网"); - SOURCE_MAP.put("0597321.com", "龙岩321房产网"); - SOURCE_MAP.put("0753fcw.cn", "梅州房产"); - SOURCE_MAP.put("bhhouse.cn", "北海房地产信息网"); - SOURCE_MAP.put("beihai365.com", "北海365房产网"); - SOURCE_MAP.put("fjlyfdc.com.cn", "龙岩房地产信息网"); - SOURCE_MAP.put("pybxfc.com", "濮阳百姓房产网"); - SOURCE_MAP.put("pyfc.cn", "濮阳房产网"); - SOURCE_MAP.put("mzhw.com", "梅州房产网"); - SOURCE_MAP.put("xcloushi.com", "许昌楼市"); - SOURCE_MAP.put("ynhouse.com", "云南房网"); - SOURCE_MAP.put("yxfdc.com", "玉溪房地产信息网"); - SOURCE_MAP.put("chinahlw.cn", "好来屋在线"); + SOURCE_MAP.put("zysgtzyj.gov.cn", "閬典箟甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("ddgt.gov.cn", "涓逛笢甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("jygtzy.cn", "娴庢簮甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("tlland.gov.cn", "閾佸箔甯傚浗鍦熻祫婧愪氦鏄撶綉"); + SOURCE_MAP.put("tslr.gov.cn", "澶╂按甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("tagt.gov.cn", "娉板畨甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("hggtzy.gov.cn", "榛勫唸甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("gylr.gov.cn", "骞垮厓甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("gtj.fy.gov.cn", "闃滈槼甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("gsdlr.gov.cn", "鐢樿們鍥藉湡璧勬簮"); + SOURCE_MAP.put("xbaixing.com", "灏忕櫨濮撶綉"); + SOURCE_MAP.put("lsblr.gov.cn", "涔愬北甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("sgfczc.com", "闊跺叧鎴夸骇涔嬬獥"); + SOURCE_MAP.put("gnzxxw.com", "鐢樺崡淇℃伅缃�"); + SOURCE_MAP.put("hzgt.gov.cn", "鑿忔辰甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("jzsgt.gov.cn", "閿﹀窞甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("nmggtt.gov.cn", "鍐呰挋鍙よ嚜娌诲尯鍥藉湡璧勬簮鍘�"); + SOURCE_MAP.put("yndlr.gov.cn", "浜戝崡鐪佸浗鍦熻祫婧愬巺"); + SOURCE_MAP.put("xjgtzy.gov.cn", "鏂扮枂缁村惥灏旇嚜娌诲尯鍥藉湡璧勬簮鍘�"); + SOURCE_MAP.put("gxdlr.gov.cn", "骞胯タ澹棌鑷不鍖哄浗鍦熻祫婧愬巺"); + SOURCE_MAP.put("hebgt.gov.cn", "娌冲寳鐪佸浗鍦熻祫婧愬巺"); + SOURCE_MAP.put("gd-jygt.gov.cn", "鎻槼甯傚湡鍦板拰鐭夸笟鏉冪綉涓婁氦鏄撶郴缁�"); + SOURCE_MAP.put("gtj.hanzhong.gov.cn", "姹変腑甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("hsland.gov.cn", "榛勫北甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("bsgtj.gov.cn", "鐧藉北甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("asgtzy.gov.cn", "瀹夐『甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("gtzy.net", "瀹夊悍鍥藉湡璧勬簮淇℃伅缃�"); + SOURCE_MAP.put("hljshlr.gov.cn", "缁ュ寲甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("qzlr.gov.cn", "閽﹀窞甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("landvalue.com.cn", "涓浗鍩庡競鍦颁环鍔ㄦ�佺洃娴�"); + SOURCE_MAP.put("andvalue.com.cn", "涓浗鍩庡競鍦颁环鍔ㄦ�佺洃娴�"); + SOURCE_MAP.put("hljjxlr.gov.cn", "楦¤タ甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("stats.gov.cn", "鍥藉缁熻灞�-70涓ぇ涓煄甯備綇瀹呴攢鍞环鏍�"); + SOURCE_MAP.put("bcgtzyj.gov.cn", "鍚夋灄鐪佺櫧鍩庡競鍥藉湡璧勬簮灞�"); + SOURCE_MAP.put("ahbzgt.gov.cn", "浜冲窞甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("aqgtj.gov.cn", "瀹夊簡甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("lagt.gov.cn", "鍏畨甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("nclr.gov.cn", "鍗楀厖甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("lzsgtj.cn", "娉稿窞甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("sczylr.gov.cn", "璧勯槼甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("kfgtfcj.gov.cn", "寮�灏佸競鍥藉湡璧勬簮灞�"); + SOURCE_MAP.put("shuozhoulr.gov.cn", "鏈斿窞甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("plgtj.gov.cn", "骞冲噳甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("bygtzyj.gov.cn", "鐧介摱鍥藉湡璧勬簮"); + SOURCE_MAP.put("hljhglr.gov.cn", "楣ゅ矖甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("trgtzy.gov.cn", "閾滀粊甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("npgtzy.gov.cn", "鍗楀钩甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("gggt.gov.cn", "璐垫腐甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("slgtzy.gov.cn", "鍟嗘礇甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("nxgtt.gov.cn", "瀹佸鍥炴棌鑷不鍖哄浗鍦熻祫婧愬巺"); + SOURCE_MAP.put("jcgt.jconline.cn", "鏅嬪煄甯傚浗鍦熻祫婧愬巺"); + SOURCE_MAP.put("qhlr.gov.cn", "闈掓捣鐪佸浗鍦熻祫婧愬巺"); + SOURCE_MAP.put("hljhhlr.gov.cn", "榛戞渤甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("gtzyj.fuxin.gov.cn", "闃滄柊甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("fsgtzy.gov.cn", "鎶氶『甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("hldland.gov.cn", "钁姦宀涘競鍥藉湡璧勬簮灞�"); + SOURCE_MAP.put("jngtj.gov.cn", "娴庡畞甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("rzgt.gov.cn", "鏃ョ収甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("lcgtjy.com", "鑱婂煄甯傚浗鍦熻祫婧愪氦鏄撶郴缁�"); + SOURCE_MAP.put("bzgtzy.gov.cn", "婊ㄥ窞甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("hbgt.gov.cn", "娣寳甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("ahxcgt.gov.cn", "瀹e煄甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("szgt.gov.cn", "瀹垮窞甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("fjgtzy.gov.cn", "绂忓缓鐪佸湡鍦颁娇鐢ㄦ潈鍑鸿绠$悊绯荤粺"); + SOURCE_MAP.put("czgtj.gov.cn", "姹犲窞甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("scnjlr.gov.cn", "鍐呮睙甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("bzgt.gov.cn", "宸翠腑甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("hhgtzy.gov.cn", "鎬�鍖栧競鍥藉湡璧勬簮灞�"); + SOURCE_MAP.put("ezlr.gov.cn", "閯傚窞甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("hljyclr.gov.cn", "浼婃槬甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("landnj.cn", "鍗椾含甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("gtzy.shiyan.gov.cn", "鍗佸牥甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("gtzyj.scsn.gov.cn", "閬傚畞甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("lhgtj.gov.cn", "婕渤甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("0438land.com", "鏉惧師甯傚浗鍦熻祫婧愮綉涓婁氦鏄撶郴缁�"); + SOURCE_MAP.put("msdlr.gov.cn", "鐪夊北甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("ggzy.hebi.gov.cn", "楣ゅ甯傚叕鍏辫祫婧愪氦鏄撲腑蹇�"); + SOURCE_MAP.put("xinzhoulr.gov.cn", "蹇诲窞甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("czgtzy.gov.cn", "閮村窞甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("czland.gov.cn", "閮村窞甯傚浗鍦熻祫婧愮綉涓婃寕鐗屽嚭璁╃郴缁�"); + SOURCE_MAP.put("jinzhonglr.gov.cn", "鏅嬩腑甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("yygtzy.gov.cn", "鐩婇槼甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("bjgt.gov.cn", "瀹濋浮甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("8009", "杈介槼甯傚浗鍦熻祫婧愪氦鏄撶綉"); + SOURCE_MAP.put("hblr.gov.cn", "婀栧寳鐪佸浗鍦熻祫婧愬巺"); + SOURCE_MAP.put("cdgtzy.gov.cn", "鎵垮痉甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("zzgtzy.gov.cn", "鏋e簞甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("zkgtzy.gov.cn", "娌冲崡鐪佸懆鍙e競鍥藉湡璧勬簮灞�"); + SOURCE_MAP.put("pyblr.gov.cn", "婵槼甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("lwgtj.gov.cn", "灞变笢鐪佽幈鑺滃競鍥藉湡璧勬簮灞�"); + SOURCE_MAP.put("yqgt.gov.cn", "闃虫硥甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("yunchenglr.gov.cn", "杩愬煄甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("bbsgtj.gov.cn", "铓屽煚甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("wngtj.gov.cn", "娓崡甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("czgtfc.gov.cn", "婊佸窞甯傚浗鍦熻祫婧愬拰鎴夸骇绠$悊灞�"); + SOURCE_MAP.put("tlgt.gov.cn", "閾滈櫟甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("jygzyjy.com", "鍢夊唱鍏冲競鍏叡璧勬簮浜ゆ槗涓績"); + SOURCE_MAP.put("zzgt.gov.cn", "婕冲窞甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("swgtjy.com", "姹曞熬甯傚叕鍏辫祫婧愪氦鏄撶綉"); + SOURCE_MAP.put("86fxw.com", "86鎴胯缃�"); + SOURCE_MAP.put("dygtj.cn", "寰烽槼甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("dylr.gov.cn", "涓滆惀甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("galr.gov.cn", "骞垮畨甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("dzgtj.gov.cn", "寰峰窞甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("yasgtzy.0835.com", "闆呭畨甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("yzsgt.gov.cn", "姘稿窞甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("ldgtzy.gov.cn", "濞勫簳甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("jzgt.gov.cn", "鑽嗗窞甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("smxgtzy.gov.cn", "涓夐棬宄″競鍥藉湡璧勬簮灞�"); + SOURCE_MAP.put("changzhilr.gov.cn", "闀挎不甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("ggzy.llcftxw.gov.cn", "鍚曟甯傚叕鍏辫祫婧愪氦鏄撶綉"); + SOURCE_MAP.put("xxzgt.gov.cn", "婀樿タ鑷不宸炲浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("abgt.gov.cn", "闃垮潩宸炲浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("lszlr.gov.cn", "鍑夊北宸炲浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("xygt.cn", "淇¢槼甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("hcgt.cn", "娌虫睜甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("hnsygt.gov.cn", "閭甸槼甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("jmlr.com", "鑽嗛棬甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("zmdgtj.gov.cn", "椹婚┈搴楀競鍥藉湡璧勬簮灞�"); + SOURCE_MAP.put("tcgtjy.gov.cn", "閾滃窛甯傚浗鍦熻祫婧愪氦鏄撶綉"); + SOURCE_MAP.put("czgt.gov.cn", "宕囧乏甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("hljdxallr.gov.cn", "澶у叴瀹夊箔鍦板尯琛岀讲鍥藉湡璧勬簮灞�"); + SOURCE_MAP.put("fangyi.com", "鎴夸竴缃�"); + SOURCE_MAP.put("xtgtzy.gov.cn", "浠欐甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("bqqm.com", "渚挎皯缃�"); + SOURCE_MAP.put("hainan.gov.cn", "娴峰崡鐪佷汉姘戞斂搴�"); + SOURCE_MAP.put("btgt.gov.cn", "鏂扮枂鐢熶骇寤鸿鍏靛洟鍥藉湡璧勬簮灞�"); + SOURCE_MAP.put("cj.dloer.gov.cn", "鏄屾睙鍘垮浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("qjgtj.gov.cn", "娼滄睙甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("funxoo.com", "鎴跨缃�"); + SOURCE_MAP.put("tmlr.gov.cn", "澶╅棬甯傚浗鍦熻祫婧愮綉"); + SOURCE_MAP.put("thgt.gov.cn", "閫氬寲甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("dzsgt.gov.cn", "杈惧窞甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("gtj.zhangye.gov.cn", "寮犳帠甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("xgbidding.com", "瀛濇劅甯傚叕鍏辫祫婧愪氦鏄撲俊鎭綉"); + SOURCE_MAP.put("gtj.jc.gansu.gov.cn", "閲戞槍甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("ylgt.gov.cn", "浼婄妬宸炲浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("gtzyj.hh.gov.cn", "绾㈡渤宸炲浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("gndlr.gov.cn", "鐢樺崡钘忔棌鑷不宸炲浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("jndlr.gov.cn", "娴庡崡甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("ytgtjy.gov.cn", "鐑熷彴甯傚浗鍦熻祫婧愮綉涓婁氦鏄撶郴缁�"); + SOURCE_MAP.put("ytgt.gov.cn", "鐑熷彴甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("syghgt.gov.cn", "娌堥槼甯傝鍒掑拰鍥藉湡璧勬簮灞�"); + SOURCE_MAP.put("zzland.gov.cn", "閮戝窞甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("tdkqw.kmggzy.com", "鏄嗘槑甯傚湡鍦板拰鐭夸笟鏉冧氦鏄撶綉"); + SOURCE_MAP.put("qzgtj.gov.cn", "娉夊窞甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("ccgt.gov.cn", "闀挎槬甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("szgtj.gov.cn", "鑻忓窞甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("hfgt.gov.cn", "鍚堣偉甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("fdzy.gov.cn", "闈掑矝甯傚浗鍦熻祫婧愬拰鎴垮眿绠$悊灞�"); + SOURCE_MAP.put("csgtzy.gov.cn", "闀挎矙甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("cdlr.gov.cn", "鎴愰兘甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("cqgtfw.gov.cn", "閲嶅簡甯傚湡鍦板拰鐭夸笟鏉冧氦鏄撲腑蹇�"); + SOURCE_MAP.put("hzgtj.gov.cn", "鏉窞甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("xmtfj.gov.cn", "鍘﹂棬甯傚湡鍦扮熆浜ц祫婧愪氦鏄撳競鍦�"); + SOURCE_MAP.put("dg.gov.cn", "涓滆帪甯傚浗鍦熻祫婧愬眬"); + SOURCE_MAP.put("0483hq.com", "闃挎媺鍠勫畯妗ョ綉"); + SOURCE_MAP.put("53xj.com", "鏂扮枂鎴夸骇缃�"); + SOURCE_MAP.put("53xj.com", "鏂扮枂鎴夸骇缃�"); + SOURCE_MAP.put("53xj.com", "鏂扮枂鎴夸骇缃�"); + SOURCE_MAP.put("xinzhou.ccoo.cn", "蹇诲窞鍩庡競鍦ㄧ嚎"); + SOURCE_MAP.put("ynfww.com", "浜戝崡鎴垮眿缃�"); + SOURCE_MAP.put("ff1.com.cn", "闊跺叧鎴夸骇缃�"); + SOURCE_MAP.put("zstmsf.com", "鑸熷北閫忔槑鍞埧缃�"); + SOURCE_MAP.put("0457.com", "澶у叴瀹夊箔娓�"); + SOURCE_MAP.put("chongzuo6.com", "宕囧乏鎴夸骇缃�"); + SOURCE_MAP.put("fangle.com", "鎴夸箰缃�"); + SOURCE_MAP.put("f0580.com", "澶ц垷灞辨埧浜�"); + SOURCE_MAP.put("jc86.cn", "鍢夎瘹鎼滄埧"); + SOURCE_MAP.put("sg169.com", "闊跺叧鎴夸骇缃�"); + SOURCE_MAP.put("dongfang0898.com", "涓滄柟鍦ㄧ嚎"); + SOURCE_MAP.put("0937.com", "鍢夊唱鍏冲湪绾�"); + SOURCE_MAP.put("dqccc.com", "鍏ㄧ悆娓�"); + SOURCE_MAP.put("lbfdc.com", "鏉ュ鎴垮湴浜х綉lbfdc"); + SOURCE_MAP.put("teambuy.com.cn", "涓洟缃�"); + SOURCE_MAP.put("cnhouse.com", "瀵绘崟鎴�"); + SOURCE_MAP.put("jxhjfc.com", "楦垮熀鎴夸骇"); + SOURCE_MAP.put("daxiangw.com", "澶ф箻浜屾墜鎴�"); + SOURCE_MAP.put("inlishui.com", "灞呭涓浗"); + SOURCE_MAP.put("lingaoren.com", "涓撮珮淇℃伅缃�"); + SOURCE_MAP.put("fang.com", "鎼滄埧缃�"); + SOURCE_MAP.put("qnz.com.cn", "榛斿崡鐑嚎"); + SOURCE_MAP.put("focus.cn", "鎼滅嫄鐒︾偣"); + SOURCE_MAP.put("fang.com", "鎼滄埧缃�"); + SOURCE_MAP.put("duyunfcw.com", "閮藉寑鎴夸骇缃�"); + SOURCE_MAP.put("xamfcxx.com", "鍏村畨鐩熸埧浜т俊鎭綉"); + SOURCE_MAP.put("21ccnn.com", "21鎴夸骇棰戦亾"); + SOURCE_MAP.put("0914cn.com", "鍟嗘礇缃戞埧浜�"); + SOURCE_MAP.put("ddfsw.com", "璞嗚眴鎴夸簨缃�"); + SOURCE_MAP.put("landchina.com", "涓浗鍦熷湴甯傚満缃�"); + SOURCE_MAP.put("trfcw.com", "閾滀粊鎴夸骇缃憈rfcw"); + SOURCE_MAP.put("yunland.cn", "浜戝湴"); + SOURCE_MAP.put("tudinet.com", "鍦熸祦缃�"); + SOURCE_MAP.put("wsfcw.cc", "鏂囧北鎴夸骇缃�"); + SOURCE_MAP.put("hainanfz.com", "涓変簹鎴夸骇缃慱hainanfz"); + SOURCE_MAP.put("hainanfz.com", "涓変簹鎴夸骇缃慱hainanfz"); + SOURCE_MAP.put("realestate.cei.gov.cn", "涓浗鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("lfang.com", "鐖辨埧缃�"); + SOURCE_MAP.put("fdc0859.com", "鍏翠箟鎴垮湴浜х綉"); + SOURCE_MAP.put("qxnfdc.cn", "榛旇タ鍗楁埧鍦颁骇缃�"); + SOURCE_MAP.put("zhtfc.cn", "鏄�氭埧浜х綉"); + SOURCE_MAP.put("smxfcw.cn", "涓夐棬宄℃埧浜х綉"); + SOURCE_MAP.put("wwxxg.com", "姝﹀▉淇℃伅娓�"); + SOURCE_MAP.put("zhaotong.cn", "澶ф槶缃�"); + SOURCE_MAP.put("hzfc.gov.cn", "鏉窞甯備綇鎴夸繚闅滃拰鎴夸骇绠$悊灞�"); + SOURCE_MAP.put("bjjs.gov.cn", "鍖椾含甯備綇鎴垮拰鍩庝埂寤鸿濮斿憳浼�"); + SOURCE_MAP.put("sxhouse.com.cn", "缁嶅叴甯傛埧鍦颁骇淇℃伅缃�"); + SOURCE_MAP.put("07430743.com", "婀樿タ鐢熸椿缃�"); + SOURCE_MAP.put("xjks.net", "鍠�浠�閮藉競缃�"); + SOURCE_MAP.put("hx0977.com", "闈掓捣路娴疯タ鍦ㄧ嚎"); + SOURCE_MAP.put("0933f.com", "骞冲噳鎴夸骇缃�"); + SOURCE_MAP.put("xdhcfc.com", "閫夊畾鎴夸骇"); + SOURCE_MAP.put("0913123.com", "娓崡鍦ㄧ嚎"); + SOURCE_MAP.put("517.cn", "517涓嶅姩浜�"); + SOURCE_MAP.put("0857fc.cn", "姣曡妭鎴夸骇缃�"); + SOURCE_MAP.put("jhzhijia.com", "閲戞捣缃"); + SOURCE_MAP.put("yaanren.net", "闆呭畨浜虹綉"); + SOURCE_MAP.put("esfcxx.com", "鎭╂柦浜屾墜鎴夸骇"); + SOURCE_MAP.put("enfcw.cn", "鎭╂柦鎴夸骇缃�"); + SOURCE_MAP.put("fcgzf.com", "闃插煄娓綇鎴跨綉"); + SOURCE_MAP.put("fcfcg.com", "闃插煄娓競鎴夸骇缃�"); + SOURCE_MAP.put("wanjiazzfc.com", "涓囧鑷姪鎴夸骇缃�"); + SOURCE_MAP.put("0470jiaxing.com", "瀹跺叴鎴夸骇"); + SOURCE_MAP.put("cnnbfdc.com", "涓浗瀹佹尝浣忓畢涓庢埧鍦颁骇缃�"); + SOURCE_MAP.put("0473fdc.com", "涔屾捣鎴夸骇缃�"); + SOURCE_MAP.put("yc2002.com", "涓�鎴愮綉"); + SOURCE_MAP.put("0439.com", "鐧藉北鎴跨綉"); + SOURCE_MAP.put("51258.cn", "浜冲窞鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("danzhou8.com", "鍎嬪窞鍦ㄧ嚎"); + SOURCE_MAP.put("xtfw.cn", "浠欐鎴跨綉"); + SOURCE_MAP.put("0724f.com", "鎴夸俊缃�"); + SOURCE_MAP.put("dd288.com", "鐐圭偣鎴夸骇缃�"); + SOURCE_MAP.put("0728f.com", "0728鎴跨綉"); + SOURCE_MAP.put("0906bt.com", "鍖楀悲淇℃伅缃�"); + SOURCE_MAP.put("jmhfw.com", "鑽嗛棬濂芥埧缃�"); + SOURCE_MAP.put("hainan0898.net", "娴峰崡璐埧缃�"); + SOURCE_MAP.put("0939.net", "闄囧崡鐢熸椿缃�"); + SOURCE_MAP.put("ibeitun.cn", "鍖楀悲鎴夸骇"); + SOURCE_MAP.put("ibeitun.cn", "鍖楀悲鎴夸骇"); + SOURCE_MAP.put("0437.com", "杈芥簮淇℃伅娓�"); + SOURCE_MAP.put("honghe.me", "绾㈡渤鎴夸骇缃�"); + SOURCE_MAP.put("bazfc.cn", "宸翠腑鎴夸骇缃�"); + SOURCE_MAP.put("xiongqi.net", "宸翠腑鎴夸骇缃憍iongqi"); + SOURCE_MAP.put("ybfcw.net", "閰掗兘鎴夸骇缃�"); + SOURCE_MAP.put("tmfang.com", "澶╅棬鎴夸骇缃�"); + SOURCE_MAP.put("zjjfcw.cn", "寮犲鐣屾埧浜х綉"); + SOURCE_MAP.put("xyanjia.com", "鏂颁綑鎴夸骇缃�"); + SOURCE_MAP.put("bendiw.cc", "鏈湴缃�"); + SOURCE_MAP.put("jxfcrx.com", "楦¤タ鎴夸骇鐑嚎"); + SOURCE_MAP.put("0722fc.com", "闅忔埧缃�"); + SOURCE_MAP.put("szfcol.com", "闅忓窞鎴夸骇鍦ㄧ嚎"); + SOURCE_MAP.put("shaofang.cc", "閭甸槼鎴夸骇缃�"); + SOURCE_MAP.put("jlxfw.com", "鐩戝埄鎴跨綉"); + SOURCE_MAP.put("hhfxw.com", "娲箹鎴夸俊缃�"); + SOURCE_MAP.put("hbszfw.com", "鏉炬粙鎴跨綉"); + SOURCE_MAP.put("hbssfw.com", "鐭抽鎴跨綉"); + SOURCE_MAP.put("zkloushi.com", "鍛ㄥ彛妤煎競缃�"); + SOURCE_MAP.put("571400.net", "鐞兼捣淇℃伅缃�"); + SOURCE_MAP.put("0722h.com", "闅忓窞濂芥埧缃�"); + SOURCE_MAP.put("leju.com", "涔愬眳缃�"); + SOURCE_MAP.put("jxbuild.gov.cn", "鍢夊叴甯備綇鎴夸繚闅滃眬"); + SOURCE_MAP.put("zjol.com.cn", "娴欐睙鍦ㄧ嚎"); + SOURCE_MAP.put("szsxbaixing.com", "灏忕櫨濮�"); + SOURCE_MAP.put("qichunfdc.com", "钑叉槬鎴夸骇缃�"); + SOURCE_MAP.put("xsfcw.cn", "娴犳按鎴夸骇缃�"); + SOURCE_MAP.put("wxfxw.com", "姝︾┐鎴夸俊缃�"); + SOURCE_MAP.put("hmfxw.com", "榛勬鎴夸俊缃�"); + SOURCE_MAP.put("ltfcw.cn", "缃楃敯鎴夸骇缃�"); + SOURCE_MAP.put("house.zxip.com", "鎱堟邯鎴夸骇缃�"); + SOURCE_MAP.put("eyuyao.com", "浣欏鐢熸椿缃�"); + SOURCE_MAP.put("58.com", "58鍚屽煄"); + SOURCE_MAP.put("fdc0746.com", "0746鎴夸骇缃�"); + SOURCE_MAP.put("wzfg.com", "娓╁窞甯傛埧鍦颁骇甯傚満淇℃伅缃�"); + SOURCE_MAP.put("0557fdc.com", "瀹挎埧涓佷竵"); + SOURCE_MAP.put("0557.cn", "0557瀹垮窞鎴夸骇缃�"); + SOURCE_MAP.put("0557100.com", "瀹垮窞鍦ㄧ嚎"); + SOURCE_MAP.put("xiaoke101.com", "灏忔煰"); + SOURCE_MAP.put("czfcw.com", "甯稿窞鎴夸骇缃�"); + SOURCE_MAP.put("hzdajiangdong.com", "澶ф睙涓滅綉"); + SOURCE_MAP.put("hgfdc.com", "榛勫唸鎴垮湴浜х綉"); + SOURCE_MAP.put("bynef.cn", "宸村溅娣栧皵鎴夸骇缃�"); + SOURCE_MAP.put("gwytk.com", "鎬�鍖栨埧浜х綉"); + SOURCE_MAP.put("hhfcw.com", "鎬�鍖栨埧浜х綉huaihfcw"); + SOURCE_MAP.put("0735.com", "閮村窞鏂扮綉"); + SOURCE_MAP.put("szsoufun.cn", "宓婂窞鎼滄埧缃�"); + SOURCE_MAP.put("lpsfcw.cn", "鍏洏姘存埧浜х綉"); + SOURCE_MAP.put("0916dc.com", "姹変腑鎴夸骇缃�"); + SOURCE_MAP.put("0712fang.com", "瀛濇埧缃�"); + SOURCE_MAP.put("fzhfc.cn", "鎶氬窞鎴夸骇缃�"); + SOURCE_MAP.put("fuzhoufc.com", "鎶氬窞鎴夸骇缃慺uzhoufc"); + SOURCE_MAP.put("huaif.cn", "鎬�鍖栨埧浜х綉huaif"); + SOURCE_MAP.put("czbfw.com", "鐧炬埧缃�"); + SOURCE_MAP.put("panjin.net", "楣や埂鐑嚎"); + SOURCE_MAP.put("cs0799.com", "钀嶄埂鍩庝簨缃�"); + SOURCE_MAP.put("my0832.com", "璧勯槼澶т紬缃�"); + SOURCE_MAP.put("newtonghua.com", "鏂伴�氬寲缃�"); + SOURCE_MAP.put("yanbiancity.com", "寤惰竟閮藉競鎴夸骇"); + SOURCE_MAP.put("0433fc.cn", "寤惰竟鎴夸骇缃�0433fc"); + SOURCE_MAP.put("0719house.com", "杞﹀煄鎴夸骇缃�"); + SOURCE_MAP.put("akfcw.cn", "瀹夊悍鎴夸骇缃慳kfcw"); + SOURCE_MAP.put("0662f.com", "闃虫睙鎴夸骇缃�"); + SOURCE_MAP.put("jfw.com", "涓芥睙鎴跨綉ljfw"); + SOURCE_MAP.put("ls520.net", "鍑夊北鎴夸骇缃�"); + SOURCE_MAP.put("0283home.com", "鐪夊北璐埧缃�"); + SOURCE_MAP.put("0434fang.com", "鍥涘钩涔版埧缃�"); + SOURCE_MAP.put("chafangwang.com", "CFW鏌ユ埧缃�"); + SOURCE_MAP.put("songyuanfang.com", "鏉惧師璐埧缃�"); + SOURCE_MAP.put("0938.cn", "澶╂按鐢熸椿缃�"); + SOURCE_MAP.put("0938f.com", "澶╂按鎴夸骇缃�"); + SOURCE_MAP.put("bxifc.cn", "鏈邯瀹夊悏鎴夸骇缃�"); + SOURCE_MAP.put("bxfcj", "鎴垮眿甯傚満"); + SOURCE_MAP.put("hrfcw.cn", "鍜屾鼎鎴夸骇缃�"); + SOURCE_MAP.put("ai0455.com", "缁ュ寲涔嬬獥缃�"); + SOURCE_MAP.put("8441111.com", "缁ュ寲瀹滃鎴夸骇缃�"); + SOURCE_MAP.put("dzfc.com", "杈惧窞鎴夸骇缃�"); + SOURCE_MAP.put("234fang.com", "鏈濋槼鐖辨埧缃�"); + SOURCE_MAP.put("househy.com", "娌虫簮缃笟缃�"); + SOURCE_MAP.put("0762fcw.com", "娌虫簮鎴夸骇缃�"); + SOURCE_MAP.put("suinf.cn", "閬傚畞鎴夸骇缃�"); + SOURCE_MAP.put("0738ld.com", "濞勫簳鎴跨綉"); + SOURCE_MAP.put("0738fdc.com", "濞勫簳鎴夸骇缃�"); + SOURCE_MAP.put("dyfcw.com", "寰烽槼鎴夸骇缃�"); + SOURCE_MAP.put("deyang5.com", "寰烽槼淇℃伅缃�"); + SOURCE_MAP.put("jzloushi.com", "鐒︿綔妤煎競"); + SOURCE_MAP.put("cityhouse.cn", "鍩庡競鎴夸骇"); + SOURCE_MAP.put("cityhouse.cn", "鍩庡競鎴夸骇"); + SOURCE_MAP.put("xgrb.cn", "妲愯崼鎴夸骇"); + SOURCE_MAP.put("0712fang.com", "瀛濇埧缃�"); + SOURCE_MAP.put("tielingfc.com", "閾佸箔鎴夸骇缃憈lfcw"); + SOURCE_MAP.put("fcpzh.com", "鏀�鏋濊姳鎴夸骇缃�"); + SOURCE_MAP.put("pzhls.com", "鏀�鏋濊姳妤煎競缃�"); + SOURCE_MAP.put("hldhouse.com", "钁姦宀涙埧鍦颁骇缃�"); + SOURCE_MAP.put("chuzf.cn", "婊佸窞鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("0550.com", "E婊佸窞缃�"); + SOURCE_MAP.put("gafcw.cn", "骞垮畨鎴夸骇缃�"); + SOURCE_MAP.put("sy0826.com", "骞垮畨鎬濇簮鎴夸骇缃�"); + SOURCE_MAP.put("dalihouse.org", "澶х悊鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("168hs.com", "榛勫北甯傛皯缃�"); + SOURCE_MAP.put("jiefc.cn", "鎻槼鎴夸骇缃�"); + SOURCE_MAP.put("dalifcw.com", "澶х悊鎴夸骇缃�"); + SOURCE_MAP.put("zmdfcw.com", "椹婚┈搴楁埧浜х綉"); + SOURCE_MAP.put("zmdfcw.cn", "椹婚┈搴楁埧浜х綉鍦ㄧ嚎"); + SOURCE_MAP.put("zmdfang.cn", "澶╀腑鎴夸骇缃�"); + SOURCE_MAP.put("hezefc.com", "鑿忔辰鎴夸骇缃�"); + SOURCE_MAP.put("hzfc.cc", "鑿忔埧缃�"); + SOURCE_MAP.put("hezels.com", "鑿忔辰妤煎競缃�"); + SOURCE_MAP.put("dyfc.net", "涓滆惀鎴夸骇缃�"); + SOURCE_MAP.put("0352fang.com", "澶у悓鎴夸骇缃�"); + SOURCE_MAP.put("tiboo.cn", "鍦板疂缃�"); + SOURCE_MAP.put("0356f.com", "鏅嬪煄鎴夸骇缃�"); + SOURCE_MAP.put("0561house.com", "娣寳鎴夸骇缃�0561"); + SOURCE_MAP.put("v007.net", "瑗挎睙鏄庣彔鎴夸骇缃�"); + SOURCE_MAP.put("jianfc.com", "鍚夊畨鎴夸骇缃�"); + SOURCE_MAP.put("0597321.com", "榫欏博321鎴夸骇缃�"); + SOURCE_MAP.put("0753fcw.cn", "姊呭窞鎴夸骇"); + SOURCE_MAP.put("bhhouse.cn", "鍖楁捣鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("beihai365.com", "鍖楁捣365鎴夸骇缃�"); + SOURCE_MAP.put("fjlyfdc.com.cn", "榫欏博鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("pybxfc.com", "婵槼鐧惧鎴夸骇缃�"); + SOURCE_MAP.put("pyfc.cn", "婵槼鎴夸骇缃�"); + SOURCE_MAP.put("mzhw.com", "姊呭窞鎴夸骇缃�"); + SOURCE_MAP.put("xcloushi.com", "璁告槍妤煎競"); + SOURCE_MAP.put("ynhouse.com", "浜戝崡鎴跨綉"); + SOURCE_MAP.put("yxfdc.com", "鐜夋邯鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("chinahlw.cn", "濂芥潵灞嬪湪绾�"); } private static void setMap3() { - SOURCE_MAP.put("chinahlw.cn", "好来屋在线"); - SOURCE_MAP.put("0736house.com", "常德买房网"); - SOURCE_MAP.put("0736fdc.com", "常德市房地产信息网"); - SOURCE_MAP.put("chinahlw.cn", "好来屋在线"); - SOURCE_MAP.put("mmsfw.com", "茂名搜房网"); - SOURCE_MAP.put("52bendi.com", "本地房产家居网"); - SOURCE_MAP.put("qilinsw.com", "莆田奇林房产网"); - SOURCE_MAP.put("0370home.com", "商丘房产网"); - SOURCE_MAP.put("435000.com", "黄石信息港"); - SOURCE_MAP.put("fang63.com", "乐山房产信息网"); - SOURCE_MAP.put("gxfdcw.com", "赣西房地产网"); - SOURCE_MAP.put("taicang.info", "太房热线"); - SOURCE_MAP.put("yichunfc.com", "宜春房产网"); - SOURCE_MAP.put("pdsloushi.com", "平顶山楼市"); - SOURCE_MAP.put("lsfcxx.com", "乐山房产网"); - SOURCE_MAP.put("nfxx.cn", "南充房产信息网"); - SOURCE_MAP.put("ykfc.net", "营口房产信息网"); - SOURCE_MAP.put("0830e.com", "泸州房产信息网"); - SOURCE_MAP.put("xyfdcw.com.cn", "信阳购房网"); - SOURCE_MAP.put("xyfcw.com", "信阳房产网"); - SOURCE_MAP.put("0376.cn", "信阳在线"); - SOURCE_MAP.put("lepu.cn", "乐铺"); - SOURCE_MAP.put("ddfc.com", "丹东房产交易网"); - SOURCE_MAP.put("angejia.com", "安个家"); - SOURCE_MAP.put("9ihome.com", "新赣州房产网"); - SOURCE_MAP.put("angejia.com", "安个家"); - SOURCE_MAP.put("797sun.com", "赣州晒房网"); - SOURCE_MAP.put("zzjjw.cn", "住在九江"); - SOURCE_MAP.put("0831home.com", "三江房产网"); - SOURCE_MAP.put("01ny.cn", "南阳房产网"); - SOURCE_MAP.put("fd114.com", "家讯房地产"); - SOURCE_MAP.put("rizhao.net", "日照信息港"); - SOURCE_MAP.put("0759f.com", "湛江房产网_0759f"); - SOURCE_MAP.put("0759home.com", "湛江购房网"); - SOURCE_MAP.put("asren.com", "鞍山信息网"); - SOURCE_MAP.put("0556xw.com", "兴旺房产"); - SOURCE_MAP.put("0556188.com", "安庆市兴旺房产"); - SOURCE_MAP.put("aqhjfc.com", "和居房产"); - SOURCE_MAP.put("5561718.com", "金九鼎房产"); - SOURCE_MAP.put("nyzufang.com", "南阳搜房"); - SOURCE_MAP.put("zgfcn.com", "自贡房产网"); - SOURCE_MAP.put("zgsof.com", "自贡搜房网"); - SOURCE_MAP.put("qzmyfc.com", "衢州名扬房产网"); - SOURCE_MAP.put("0570.com", "衢房网"); - SOURCE_MAP.put("fc0633.com", "日照置业网"); - SOURCE_MAP.put("rzmaifang.com", "日照买方网"); - SOURCE_MAP.put("0576h.com", "台州找房网"); - SOURCE_MAP.put("0555fc.com", "马鞍山房产网_0555fc"); - SOURCE_MAP.put("hncyfc.com", "淮南朝阳房产"); - SOURCE_MAP.put("guilinlife.com", "桂林生活网"); - SOURCE_MAP.put("stfdcw.com", "汕头房地产网"); - SOURCE_MAP.put("live754.com", "e居房产"); - SOURCE_MAP.put("sthtfc.com", "顺泰泓泰房产"); - SOURCE_MAP.put("dzcnc.com", "鲁北房产"); - SOURCE_MAP.put("zb2050.com", "宅邦网"); - SOURCE_MAP.put("binfang.com", "滨房网"); - SOURCE_MAP.put("maifanggo.com", "绵阳买房网"); - SOURCE_MAP.put("h0476.com", "赤峰房地产网"); - SOURCE_MAP.put("czfang.com", "沧州房产广场"); - SOURCE_MAP.put("home0538.com", "泰安房地产网"); - SOURCE_MAP.put("tz55.net", "添佳房地产"); - SOURCE_MAP.put("xffcol.com", "襄阳房产热线"); - SOURCE_MAP.put("jifcw.com", "济宁房产交易监理处"); - SOURCE_MAP.put("xffcol.com", "襄阳房产热线"); - SOURCE_MAP.put("tzwxwj.com", "我想我家"); - SOURCE_MAP.put("tzfdc.com.cn", "泰州房地产信息网"); - SOURCE_MAP.put("bshfc.cn", "保山房产网"); - SOURCE_MAP.put("ff1.com.cn", "第一房网"); - SOURCE_MAP.put("very-e.net", "上易找房"); - SOURCE_MAP.put("zpb365.com", "住朋帮"); - SOURCE_MAP.put("rexian.net", "武汉热线房产网"); - SOURCE_MAP.put("ncfdc.com", "南昌房产在线"); - SOURCE_MAP.put("deyi.com", "武汉得意房产"); - SOURCE_MAP.put("baifc.cn", "百色房产网"); - SOURCE_MAP.put("baifc.cn", "百色房产网"); - SOURCE_MAP.put("xnfw.com", "咸宁房网"); - SOURCE_MAP.put("hbloushi.com", "鹤壁楼市"); - SOURCE_MAP.put("hbshw.cn", "鹤壁生活网"); - SOURCE_MAP.put("xhengshui.com", "衡水易房网"); - SOURCE_MAP.put("hsfang.cn", "衡水房客"); - SOURCE_MAP.put("0577home.net", "温州房网"); - SOURCE_MAP.put("hihifang.com", "乐房网"); - SOURCE_MAP.put("wzzf.cn", "温州租房网"); - SOURCE_MAP.put("wzfcw.net", "温州房产网_wzfcw"); - SOURCE_MAP.put("xianhouse.com", "西安市房地产超市"); - SOURCE_MAP.put("3qhouse.com", "三秦房产网"); - SOURCE_MAP.put("homelink.com.cn", "链家在线"); - SOURCE_MAP.put("360fdc.com", "中房网"); - SOURCE_MAP.put("gxhouse.com", "柳州房产街"); - SOURCE_MAP.put("917.com", "917房产网"); - SOURCE_MAP.put("917.com", "917房产网"); - SOURCE_MAP.put("0434.me", "吉林网媒"); - SOURCE_MAP.put("hufdc.com", "湖州房产网"); - SOURCE_MAP.put("hufdc.com", "湖州房产网"); - SOURCE_MAP.put("jiaonan.tv", "胶南信息网"); - SOURCE_MAP.put("gxsky.com", "时空房产网"); - SOURCE_MAP.put("wf777.com", "潍房网"); - SOURCE_MAP.put("zshouse.com", "中山房地产资讯网"); - SOURCE_MAP.put("fdc0760.com", "易搜房产网"); - SOURCE_MAP.put("0572home.com", "德清房产网"); - SOURCE_MAP.put("deqing.biz", "德清房产网biz"); - SOURCE_MAP.put("iwjw.com", "爱屋吉屋"); - SOURCE_MAP.put("syfc.com.cn", "沈阳市房产网"); - SOURCE_MAP.put("syfc.com.cn", "沈阳市房产网"); - SOURCE_MAP.put("0553fang.com", "芜湖豪宅网"); - SOURCE_MAP.put("xmfish.com", "小鱼房产"); - SOURCE_MAP.put("soufun.com", "搜房"); - SOURCE_MAP.put("sdfdc.com", "山东房地产网"); - SOURCE_MAP.put("shenyang1.com", "沈阳房产网"); - SOURCE_MAP.put("024zf.com", "沈阳租房网"); - SOURCE_MAP.put("fangxiaoer.com", "房小二"); - SOURCE_MAP.put("sun0769.com", "东莞阳光网"); - SOURCE_MAP.put("yzfdc.cn", "扬州房地产信息网"); - SOURCE_MAP.put("yzkdfcw.com", "扬州宽带房产网"); - SOURCE_MAP.put("yzkdfcw.com", "扬州宽带房产网"); - SOURCE_MAP.put("0579zf.com", "金华找房网"); - SOURCE_MAP.put("mhfdc.net", "美好房产网"); - SOURCE_MAP.put("qingkai.com", "青岛开发区信息港"); - SOURCE_MAP.put("bandao.cn", "半岛网"); - SOURCE_MAP.put("qingdaonews.com", "新闻网房产"); - SOURCE_MAP.put("ilewed.com", "爱乐房产网"); - SOURCE_MAP.put("pjsfw.com", "浦江搜房网"); - SOURCE_MAP.put("yzfcjy.net", "扬州房产交易网"); - SOURCE_MAP.put("wxdszy.com", "鼎盛置业"); - SOURCE_MAP.put("jy510.com", "江阴510"); - SOURCE_MAP.put("daojiale.com", "重庆到家了网"); - SOURCE_MAP.put("house0769.com", "东莞房产网"); - SOURCE_MAP.put("lygfc.com", "连云港房产网"); - SOURCE_MAP.put("house3s.com", "山水房产网"); - SOURCE_MAP.put("jddfc.net", "金大地产房"); - SOURCE_MAP.put("123sfw.cn", "视房网"); - SOURCE_MAP.put("ftan.cn", "房探网"); - SOURCE_MAP.put("hrbslfc.com", "哈尔滨世联房产"); - SOURCE_MAP.put("0898hn.net", "海南房产在线"); - SOURCE_MAP.put("hainan.net", "海南在线"); - SOURCE_MAP.put("xizi.com", "西子房产"); - SOURCE_MAP.put("ufang.com", "U房网"); - SOURCE_MAP.put("rc100.cn", "荣城网"); - SOURCE_MAP.put("fz0752.com", "惠民之家"); - SOURCE_MAP.put("zhendafang.com", "振达房产"); - SOURCE_MAP.put("ejcs.com.cn", "宜居城市网"); - SOURCE_MAP.put("jjshome.com", "家家顺房产网"); - SOURCE_MAP.put("ythouse.com", "烟台房地产网"); - SOURCE_MAP.put("0519.ccoo.cn", "常州网"); - SOURCE_MAP.put("bjjs.gov.cn", "北京市建设委员会"); - SOURCE_MAP.put("meizhai.cn", "美宅网"); - SOURCE_MAP.put("ccgoufang.com", "长春购房网"); - SOURCE_MAP.put("ph-fc.com", "平湖房产网"); - SOURCE_MAP.put("0573fang.com", "嘉论房产网"); - SOURCE_MAP.put("gshouse.com.cn", "甘房网"); - SOURCE_MAP.put("lyfcw.com", "洛阳房产网_lyfcw"); - SOURCE_MAP.put("0379home.com", "洛阳房地产信息网"); - SOURCE_MAP.put("njsfcw.com", "南京房产"); - SOURCE_MAP.put("whnews.cn", "威海新闻网"); - SOURCE_MAP.put("longcity.net", "住在龙城"); - SOURCE_MAP.put("bdinfo.net", "互动房缘"); - SOURCE_MAP.put("esouwu.com", "易搜屋"); - SOURCE_MAP.put("fc12319.com", "12319房产网"); - SOURCE_MAP.put("lianhefangchan.com", "联合房产网"); - SOURCE_MAP.put("guodafdc.com", "国大地产网"); - SOURCE_MAP.put("0311.com.cn", "新城网"); - SOURCE_MAP.put("loukee.com", "楼客"); - SOURCE_MAP.put("bangonglou.com.cn", "华夏办公楼网"); - SOURCE_MAP.put("01cbd.com", "上海第一商业地产网"); - SOURCE_MAP.put("officehu.com", "上海办公楼网"); - SOURCE_MAP.put("nsfang.com", "上海写字楼租售中心"); - SOURCE_MAP.put("57office.com", "上海写字楼网57office"); - SOURCE_MAP.put("officeask.com", "上海写字楼租售网"); + SOURCE_MAP.put("chinahlw.cn", "濂芥潵灞嬪湪绾�"); + SOURCE_MAP.put("0736house.com", "甯稿痉涔版埧缃�"); + SOURCE_MAP.put("0736fdc.com", "甯稿痉甯傛埧鍦颁骇淇℃伅缃�"); + SOURCE_MAP.put("chinahlw.cn", "濂芥潵灞嬪湪绾�"); + SOURCE_MAP.put("mmsfw.com", "鑼傚悕鎼滄埧缃�"); + SOURCE_MAP.put("52bendi.com", "鏈湴鎴夸骇瀹跺眳缃�"); + SOURCE_MAP.put("qilinsw.com", "鑾嗙敯濂囨灄鎴夸骇缃�"); + SOURCE_MAP.put("0370home.com", "鍟嗕笜鎴夸骇缃�"); + SOURCE_MAP.put("435000.com", "榛勭煶淇℃伅娓�"); + SOURCE_MAP.put("fang63.com", "涔愬北鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("gxfdcw.com", "璧hタ鎴垮湴浜х綉"); + SOURCE_MAP.put("taicang.info", "澶埧鐑嚎"); + SOURCE_MAP.put("yichunfc.com", "瀹滄槬鎴夸骇缃�"); + SOURCE_MAP.put("pdsloushi.com", "骞抽《灞辨ゼ甯�"); + SOURCE_MAP.put("lsfcxx.com", "涔愬北鎴夸骇缃�"); + SOURCE_MAP.put("nfxx.cn", "鍗楀厖鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("ykfc.net", "钀ュ彛鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("0830e.com", "娉稿窞鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("xyfdcw.com.cn", "淇¢槼璐埧缃�"); + SOURCE_MAP.put("xyfcw.com", "淇¢槼鎴夸骇缃�"); + SOURCE_MAP.put("0376.cn", "淇¢槼鍦ㄧ嚎"); + SOURCE_MAP.put("lepu.cn", "涔愰摵"); + SOURCE_MAP.put("ddfc.com", "涓逛笢鎴夸骇浜ゆ槗缃�"); + SOURCE_MAP.put("angejia.com", "瀹変釜瀹�"); + SOURCE_MAP.put("9ihome.com", "鏂拌担宸炴埧浜х綉"); + SOURCE_MAP.put("angejia.com", "瀹変釜瀹�"); + SOURCE_MAP.put("797sun.com", "璧e窞鏅掓埧缃�"); + SOURCE_MAP.put("zzjjw.cn", "浣忓湪涔濇睙"); + SOURCE_MAP.put("0831home.com", "涓夋睙鎴夸骇缃�"); + SOURCE_MAP.put("01ny.cn", "鍗楅槼鎴夸骇缃�"); + SOURCE_MAP.put("fd114.com", "瀹惰鎴垮湴浜�"); + SOURCE_MAP.put("rizhao.net", "鏃ョ収淇℃伅娓�"); + SOURCE_MAP.put("0759f.com", "婀涙睙鎴夸骇缃慱0759f"); + SOURCE_MAP.put("0759home.com", "婀涙睙璐埧缃�"); + SOURCE_MAP.put("asren.com", "闉嶅北淇℃伅缃�"); + SOURCE_MAP.put("0556xw.com", "鍏存椇鎴夸骇"); + SOURCE_MAP.put("0556188.com", "瀹夊簡甯傚叴鏃烘埧浜�"); + SOURCE_MAP.put("aqhjfc.com", "鍜屽眳鎴夸骇"); + SOURCE_MAP.put("5561718.com", "閲戜節榧庢埧浜�"); + SOURCE_MAP.put("nyzufang.com", "鍗楅槼鎼滄埧"); + SOURCE_MAP.put("zgfcn.com", "鑷础鎴夸骇缃�"); + SOURCE_MAP.put("zgsof.com", "鑷础鎼滄埧缃�"); + SOURCE_MAP.put("qzmyfc.com", "琛㈠窞鍚嶆壃鎴夸骇缃�"); + SOURCE_MAP.put("0570.com", "琛㈡埧缃�"); + SOURCE_MAP.put("fc0633.com", "鏃ョ収缃笟缃�"); + SOURCE_MAP.put("rzmaifang.com", "鏃ョ収涔版柟缃�"); + SOURCE_MAP.put("0576h.com", "鍙板窞鎵炬埧缃�"); + SOURCE_MAP.put("0555fc.com", "椹瀺灞辨埧浜х綉_0555fc"); + SOURCE_MAP.put("hncyfc.com", "娣崡鏈濋槼鎴夸骇"); + SOURCE_MAP.put("guilinlife.com", "妗傛灄鐢熸椿缃�"); + SOURCE_MAP.put("stfdcw.com", "姹曞ご鎴垮湴浜х綉"); + SOURCE_MAP.put("live754.com", "e灞呮埧浜�"); + SOURCE_MAP.put("sthtfc.com", "椤烘嘲娉撴嘲鎴夸骇"); + SOURCE_MAP.put("dzcnc.com", "椴佸寳鎴夸骇"); + SOURCE_MAP.put("zb2050.com", "瀹呴偊缃�"); + SOURCE_MAP.put("binfang.com", "婊ㄦ埧缃�"); + SOURCE_MAP.put("maifanggo.com", "缁甸槼涔版埧缃�"); + SOURCE_MAP.put("h0476.com", "璧ゅ嘲鎴垮湴浜х綉"); + SOURCE_MAP.put("czfang.com", "娌у窞鎴夸骇骞垮満"); + SOURCE_MAP.put("home0538.com", "娉板畨鎴垮湴浜х綉"); + SOURCE_MAP.put("tz55.net", "娣讳匠鎴垮湴浜�"); + SOURCE_MAP.put("xffcol.com", "瑗勯槼鎴夸骇鐑嚎"); + SOURCE_MAP.put("jifcw.com", "娴庡畞鎴夸骇浜ゆ槗鐩戠悊澶�"); + SOURCE_MAP.put("xffcol.com", "瑗勯槼鎴夸骇鐑嚎"); + SOURCE_MAP.put("tzwxwj.com", "鎴戞兂鎴戝"); + SOURCE_MAP.put("tzfdc.com.cn", "娉板窞鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("bshfc.cn", "淇濆北鎴夸骇缃�"); + SOURCE_MAP.put("ff1.com.cn", "绗竴鎴跨綉"); + SOURCE_MAP.put("very-e.net", "涓婃槗鎵炬埧"); + SOURCE_MAP.put("zpb365.com", "浣忔湅甯�"); + SOURCE_MAP.put("rexian.net", "姝︽眽鐑嚎鎴夸骇缃�"); + SOURCE_MAP.put("ncfdc.com", "鍗楁槍鎴夸骇鍦ㄧ嚎"); + SOURCE_MAP.put("deyi.com", "姝︽眽寰楁剰鎴夸骇"); + SOURCE_MAP.put("baifc.cn", "鐧捐壊鎴夸骇缃�"); + SOURCE_MAP.put("baifc.cn", "鐧捐壊鎴夸骇缃�"); + SOURCE_MAP.put("xnfw.com", "鍜稿畞鎴跨綉"); + SOURCE_MAP.put("hbloushi.com", "楣ゅ妤煎競"); + SOURCE_MAP.put("hbshw.cn", "楣ゅ鐢熸椿缃�"); + SOURCE_MAP.put("xhengshui.com", "琛℃按鏄撴埧缃�"); + SOURCE_MAP.put("hsfang.cn", "琛℃按鎴垮"); + SOURCE_MAP.put("0577home.net", "娓╁窞鎴跨綉"); + SOURCE_MAP.put("hihifang.com", "涔愭埧缃�"); + SOURCE_MAP.put("wzzf.cn", "娓╁窞绉熸埧缃�"); + SOURCE_MAP.put("wzfcw.net", "娓╁窞鎴夸骇缃慱wzfcw"); + SOURCE_MAP.put("xianhouse.com", "瑗垮畨甯傛埧鍦颁骇瓒呭競"); + SOURCE_MAP.put("3qhouse.com", "涓夌Е鎴夸骇缃�"); + SOURCE_MAP.put("homelink.com.cn", "閾惧鍦ㄧ嚎"); + SOURCE_MAP.put("360fdc.com", "涓埧缃�"); + SOURCE_MAP.put("gxhouse.com", "鏌冲窞鎴夸骇琛�"); + SOURCE_MAP.put("917.com", "917鎴夸骇缃�"); + SOURCE_MAP.put("917.com", "917鎴夸骇缃�"); + SOURCE_MAP.put("0434.me", "鍚夋灄缃戝獟"); + SOURCE_MAP.put("hufdc.com", "婀栧窞鎴夸骇缃�"); + SOURCE_MAP.put("hufdc.com", "婀栧窞鎴夸骇缃�"); + SOURCE_MAP.put("jiaonan.tv", "鑳跺崡淇℃伅缃�"); + SOURCE_MAP.put("gxsky.com", "鏃剁┖鎴夸骇缃�"); + SOURCE_MAP.put("wf777.com", "娼嶆埧缃�"); + SOURCE_MAP.put("zshouse.com", "涓北鎴垮湴浜ц祫璁綉"); + SOURCE_MAP.put("fdc0760.com", "鏄撴悳鎴夸骇缃�"); + SOURCE_MAP.put("0572home.com", "寰锋竻鎴夸骇缃�"); + SOURCE_MAP.put("deqing.biz", "寰锋竻鎴夸骇缃慴iz"); + SOURCE_MAP.put("iwjw.com", "鐖卞眿鍚夊眿"); + SOURCE_MAP.put("syfc.com.cn", "娌堥槼甯傛埧浜х綉"); + SOURCE_MAP.put("syfc.com.cn", "娌堥槼甯傛埧浜х綉"); + SOURCE_MAP.put("0553fang.com", "鑺滄箹璞畢缃�"); + SOURCE_MAP.put("xmfish.com", "灏忛奔鎴夸骇"); + SOURCE_MAP.put("soufun.com", "鎼滄埧"); + SOURCE_MAP.put("sdfdc.com", "灞变笢鎴垮湴浜х綉"); + SOURCE_MAP.put("shenyang1.com", "娌堥槼鎴夸骇缃�"); + SOURCE_MAP.put("024zf.com", "娌堥槼绉熸埧缃�"); + SOURCE_MAP.put("fangxiaoer.com", "鎴垮皬浜�"); + SOURCE_MAP.put("sun0769.com", "涓滆帪闃冲厜缃�"); + SOURCE_MAP.put("yzfdc.cn", "鎵窞鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("yzkdfcw.com", "鎵窞瀹藉甫鎴夸骇缃�"); + SOURCE_MAP.put("yzkdfcw.com", "鎵窞瀹藉甫鎴夸骇缃�"); + SOURCE_MAP.put("0579zf.com", "閲戝崕鎵炬埧缃�"); + SOURCE_MAP.put("mhfdc.net", "缇庡ソ鎴夸骇缃�"); + SOURCE_MAP.put("qingkai.com", "闈掑矝寮�鍙戝尯淇℃伅娓�"); + SOURCE_MAP.put("bandao.cn", "鍗婂矝缃�"); + SOURCE_MAP.put("qingdaonews.com", "鏂伴椈缃戞埧浜�"); + SOURCE_MAP.put("ilewed.com", "鐖变箰鎴夸骇缃�"); + SOURCE_MAP.put("pjsfw.com", "娴︽睙鎼滄埧缃�"); + SOURCE_MAP.put("yzfcjy.net", "鎵窞鎴夸骇浜ゆ槗缃�"); + SOURCE_MAP.put("wxdszy.com", "榧庣洓缃笟"); + SOURCE_MAP.put("jy510.com", "姹熼槾510"); + SOURCE_MAP.put("daojiale.com", "閲嶅簡鍒板浜嗙綉"); + SOURCE_MAP.put("house0769.com", "涓滆帪鎴夸骇缃�"); + SOURCE_MAP.put("lygfc.com", "杩炰簯娓埧浜х綉"); + SOURCE_MAP.put("house3s.com", "灞辨按鎴夸骇缃�"); + SOURCE_MAP.put("jddfc.net", "閲戝ぇ鍦颁骇鎴�"); + SOURCE_MAP.put("123sfw.cn", "瑙嗘埧缃�"); + SOURCE_MAP.put("ftan.cn", "鎴挎帰缃�"); + SOURCE_MAP.put("hrbslfc.com", "鍝堝皵婊ㄤ笘鑱旀埧浜�"); + SOURCE_MAP.put("0898hn.net", "娴峰崡鎴夸骇鍦ㄧ嚎"); + SOURCE_MAP.put("hainan.net", "娴峰崡鍦ㄧ嚎"); + SOURCE_MAP.put("xizi.com", "瑗垮瓙鎴夸骇"); + SOURCE_MAP.put("ufang.com", "U鎴跨綉"); + SOURCE_MAP.put("rc100.cn", "鑽e煄缃�"); + SOURCE_MAP.put("fz0752.com", "鎯犳皯涔嬪"); + SOURCE_MAP.put("zhendafang.com", "鎸揪鎴夸骇"); + SOURCE_MAP.put("ejcs.com.cn", "瀹滃眳鍩庡競缃�"); + SOURCE_MAP.put("jjshome.com", "瀹跺椤烘埧浜х綉"); + SOURCE_MAP.put("ythouse.com", "鐑熷彴鎴垮湴浜х綉"); + SOURCE_MAP.put("0519.ccoo.cn", "甯稿窞缃�"); + SOURCE_MAP.put("bjjs.gov.cn", "鍖椾含甯傚缓璁惧鍛樹細"); + SOURCE_MAP.put("meizhai.cn", "缇庡畢缃�"); + SOURCE_MAP.put("ccgoufang.com", "闀挎槬璐埧缃�"); + SOURCE_MAP.put("ph-fc.com", "骞虫箹鎴夸骇缃�"); + SOURCE_MAP.put("0573fang.com", "鍢夎鎴夸骇缃�"); + SOURCE_MAP.put("gshouse.com.cn", "鐢樻埧缃�"); + SOURCE_MAP.put("lyfcw.com", "娲涢槼鎴夸骇缃慱lyfcw"); + SOURCE_MAP.put("0379home.com", "娲涢槼鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("njsfcw.com", "鍗椾含鎴夸骇"); + SOURCE_MAP.put("whnews.cn", "濞佹捣鏂伴椈缃�"); + SOURCE_MAP.put("longcity.net", "浣忓湪榫欏煄"); + SOURCE_MAP.put("bdinfo.net", "浜掑姩鎴跨紭"); + SOURCE_MAP.put("esouwu.com", "鏄撴悳灞�"); + SOURCE_MAP.put("fc12319.com", "12319鎴夸骇缃�"); + SOURCE_MAP.put("lianhefangchan.com", "鑱斿悎鎴夸骇缃�"); + SOURCE_MAP.put("guodafdc.com", "鍥藉ぇ鍦颁骇缃�"); + SOURCE_MAP.put("0311.com.cn", "鏂板煄缃�"); + SOURCE_MAP.put("loukee.com", "妤煎"); + SOURCE_MAP.put("bangonglou.com.cn", "鍗庡鍔炲叕妤肩綉"); + SOURCE_MAP.put("01cbd.com", "涓婃捣绗竴鍟嗕笟鍦颁骇缃�"); + SOURCE_MAP.put("officehu.com", "涓婃捣鍔炲叕妤肩綉"); + SOURCE_MAP.put("nsfang.com", "涓婃捣鍐欏瓧妤肩鍞腑蹇�"); + SOURCE_MAP.put("57office.com", "涓婃捣鍐欏瓧妤肩綉57office"); + SOURCE_MAP.put("officeask.com", "涓婃捣鍐欏瓧妤肩鍞綉"); SOURCE_MAP.put("51office.com", "51office"); - SOURCE_MAP.put("0316.cc", "廊房网"); - SOURCE_MAP.put("ntfdc.net", "南通房产网"); - SOURCE_MAP.put("371house.com", "郑州楼市"); - SOURCE_MAP.put("haoju.cn", "好居"); - SOURCE_MAP.put("berui.com", "百瑞地产家居网"); - SOURCE_MAP.put("962013.com", "苏房网"); - SOURCE_MAP.put("5khouse.com", "看房网_C"); - SOURCE_MAP.put("ntfdc.net", "南通房产网"); - SOURCE_MAP.put("wlmq.com", "乌鲁木齐网"); - SOURCE_MAP.put("nxfang.com", "宁夏房网"); - SOURCE_MAP.put("huxingoffice.com", "上海写字楼租赁中心"); - SOURCE_MAP.put("jiasz.com", "家在深圳"); - SOURCE_MAP.put("shjjw.gov.cn", "上海市住房和城乡建设管理委员会"); - SOURCE_MAP.put("maitian.cn", "麦田在线"); - SOURCE_MAP.put("maitian.cn", "麦田在线"); - SOURCE_MAP.put("ifeng.com", "凤凰网"); - SOURCE_MAP.put("5i5j.com", "我爱我家"); - SOURCE_MAP.put("zlhome.com", "中联地产网"); - SOURCE_MAP.put("cq315house.com", "重庆网上房地产"); - SOURCE_MAP.put("kshome.com.cn", "昆山市存量房网上备案系统"); - SOURCE_MAP.put("jyyuan.com", "家缘网"); - SOURCE_MAP.put("kshome.com.cn", "昆山市存量房网上备案系统"); - SOURCE_MAP.put("jyfcc.com.cn", "江阴商品房信息发布平台"); - SOURCE_MAP.put("zaf.cc", "中安房"); - SOURCE_MAP.put("xian-house.com", "西安房产秘书网"); - SOURCE_MAP.put("ishuo.cn", "经典网"); - SOURCE_MAP.put("ishuo.cn", "经典网"); - SOURCE_MAP.put("jz0574.com", "家在宁波"); - SOURCE_MAP.put("fangshijie.cn", "房世界"); - SOURCE_MAP.put("shzf.com", "上海找房网"); - SOURCE_MAP.put("bhfdc.org.cn", "滨海房地产信息网"); - SOURCE_MAP.put("pcestate.com", "太平洋房产网"); - SOURCE_MAP.put("xcqfw.com", "深圳小权房统建楼网"); - SOURCE_MAP.put("fangshijie.cn", "房世界"); - SOURCE_MAP.put("jz0574.com", "家在宁波"); - SOURCE_MAP.put("ihoome.com", "爱我家"); - SOURCE_MAP.put("bhfdc.org.cn", "滨海房地产信息网"); - SOURCE_MAP.put("pcestate.com", "太平洋房产网"); - SOURCE_MAP.put("csgfw.cn", "常熟购房网"); - SOURCE_MAP.put("csfc.gov.cn", "常熟房产信息网"); - SOURCE_MAP.put("kshome.com.cn", "昆山市存量房网上备案系统"); - SOURCE_MAP.put("16hour.com", "16小时网"); - SOURCE_MAP.put("taobao.com", "淘宝拍卖"); - SOURCE_MAP.put("szjsj.gov.cn", "苏州住房和城乡建设局"); - SOURCE_MAP.put("szjsj.gov.cn", "苏州住房和城乡建设局"); - SOURCE_MAP.put("pinganfang.com", "平安好房"); - SOURCE_MAP.put("hzjg.gov.cn", "杭州价格网"); - SOURCE_MAP.put("sz68.com", "深圳土地房产交易中心"); - SOURCE_MAP.put("shjiapai.cn", "嘉拍网"); - SOURCE_MAP.put("bhghgt.gov.cn", "天津市滨海新区规划和国土资源管理局"); - SOURCE_MAP.put("xiyang.gov.cn", "中国昔阳"); - SOURCE_MAP.put("bendibao.com", "本地宝"); - SOURCE_MAP.put("365hf.com", "呼和浩特房地产网"); - SOURCE_MAP.put("yyfdcw.com", "岳阳房地产网"); - SOURCE_MAP.put("0575360.com", "绍兴房产网"); - SOURCE_MAP.put("jy510.com", "510房超市"); - SOURCE_MAP.put("51juhang.com", "51居杭"); - SOURCE_MAP.put("flbang.com", "房利帮"); - SOURCE_MAP.put("jk5k.com", "即客办公"); - SOURCE_MAP.put("http://5i5pu.com", "我爱我铺"); - SOURCE_MAP.put("newfw.com", "杭州新房网"); - SOURCE_MAP.put("jy510.com", "510房超市"); - SOURCE_MAP.put("js0573.com", "嘉善房产网"); - SOURCE_MAP.put("fangtan007.com", "房探网ft"); - SOURCE_MAP.put("zsgfw.cn", "中山购房网"); - SOURCE_MAP.put("51juhang.com", "51居杭"); - SOURCE_MAP.put("xft77.com", "小房童"); - SOURCE_MAP.put("hnfgw.com", "海宁透明售房网"); - SOURCE_MAP.put("smfdc.com.cn", "三明市房地产信息网"); - SOURCE_MAP.put("wpl.gov.cn", "武汉市国土资源和规划局"); - SOURCE_MAP.put("mytophome.com", "满堂红地产网"); - SOURCE_MAP.put("80053.com", "芜湖房客网"); - SOURCE_MAP.put("czfdcw.net", "潮州房地产信息网"); - SOURCE_MAP.put("xiashanet.com", "下沙房产网"); - SOURCE_MAP.put("xiashanet.com", "下沙房产网"); - SOURCE_MAP.put("myliving.cn", "租售情报网"); - SOURCE_MAP.put("hzhuge888.com", "诸葛找房"); - SOURCE_MAP.put("sccin.com.cn", "四川建设网"); - SOURCE_MAP.put("grfy.net", "个人房源网"); - SOURCE_MAP.put("shzf.com", "上海找房网"); - SOURCE_MAP.put("ycmfw.com", "盐城买房网"); - SOURCE_MAP.put("jfzh.com.cn", "津房置换"); - SOURCE_MAP.put("shls.com.cn", "上海楼市网"); - SOURCE_MAP.put("qd818.com", "启东百业房产网"); - SOURCE_MAP.put("fangtan007.com", "房探网ft"); - SOURCE_MAP.put("js0573.com", "嘉善房产网"); - SOURCE_MAP.put("hzjg.gov.cn", "杭州价格网"); - SOURCE_MAP.put("bjjs.gov.cn", "北京市建设委员会"); - SOURCE_MAP.put("fuzhou.gov.cn", "福州市房屋登记中心"); - SOURCE_MAP.put("tmsf.com", "透明售房网"); - SOURCE_MAP.put("xjfangwu.com", "新疆房屋网"); - SOURCE_MAP.put("0572.com", "0572房产网"); - SOURCE_MAP.put("czfdc.com.cn", "常州新建商品房房价备案公示"); - SOURCE_MAP.put("lanfw.com", "蓝房网"); - SOURCE_MAP.put("0594.com", "甫房网"); - SOURCE_MAP.put("yccj.gov.cn", "宜春市城乡规划建设网"); - SOURCE_MAP.put("flbang.com", "房利帮"); - SOURCE_MAP.put("ncfdc.com.cn", "南昌房地产信息网"); - SOURCE_MAP.put("962121.net", "上海住宅物业网"); - SOURCE_MAP.put("80053.com", "芜湖房客网"); - SOURCE_MAP.put("housoo.com", "山西房地产门户网"); - SOURCE_MAP.put("tffcw.com", "天府房产网"); - SOURCE_MAP.put("80053.com", "芜湖房客网"); - SOURCE_MAP.put("sanwen8.cn", "作文网"); - SOURCE_MAP.put("paifun.net", "拍房网"); - SOURCE_MAP.put("grfy.net", "个人房源网"); - SOURCE_MAP.put("milike.com", "觅房网"); - SOURCE_MAP.put("hft58.com", "好房团"); - SOURCE_MAP.put("0515yc.com", "盐城房价"); - SOURCE_MAP.put("0515yc.com", "盐城房价"); - SOURCE_MAP.put("lffdc.com", "廊坊市住房保障和房产管理局"); - SOURCE_MAP.put("lffdc.com", "廊坊市住房保障和房产管理局"); - SOURCE_MAP.put("15fcw.cn", "义房网"); - SOURCE_MAP.put("15fcw.cn", "义房网"); - SOURCE_MAP.put("zhujia360.com", "筑家易"); - SOURCE_MAP.put("bqfang.cn", "北区房.cn"); - SOURCE_MAP.put("zzcszx.com", "枣庄城市在线"); - SOURCE_MAP.put("jfzh.com.cn", "津房置换"); - SOURCE_MAP.put("shls.com.cn", "上海楼市网"); - SOURCE_MAP.put("nantaihu.com", "南太湖房产"); - SOURCE_MAP.put("nantaihu.com", "南太湖房产"); - SOURCE_MAP.put("nantaihu.com", "南太湖房产"); - SOURCE_MAP.put("zaf.cc", "中安房"); - SOURCE_MAP.put("360fdc.com", "中房网"); - SOURCE_MAP.put("577house.com", "温州房产热线"); - SOURCE_MAP.put("ycfczc.com", "邳优房产网"); - SOURCE_MAP.put("ywcbd.com", "上海拍房网"); - SOURCE_MAP.put("chinesesfpm.com", "中国司法拍卖"); - SOURCE_MAP.put("51zhupai.com", "助拍网"); - SOURCE_MAP.put("xiashanet.com", "下沙房产网"); - SOURCE_MAP.put("smsjs.com", "三明市住房和城乡建设局"); - SOURCE_MAP.put("tprtc.com", "天津房产交易中心"); - SOURCE_MAP.put("myliving.cn", "租售情报网"); - SOURCE_MAP.put("cbex.com.cn", "北京产权交易所"); - SOURCE_MAP.put("cbrex.com", "房地在线"); - SOURCE_MAP.put("xmjs.gov.cn/", "厦门市建设局"); - SOURCE_MAP.put("xmfczc.com", "厦门房产之窗"); - SOURCE_MAP.put("fangj.com", "房界"); - SOURCE_MAP.put("001ce.com", "第一商业地产网"); - SOURCE_MAP.put("xfx.cn", "新房线"); - SOURCE_MAP.put("jjshome.com", "家家顺房产网"); - SOURCE_MAP.put("xzlou.cn", "徐州写字楼网"); - SOURCE_MAP.put("zqjs.gov.cn", "肇庆市住房和城乡建设局"); - SOURCE_MAP.put("dlfd.gov.cn", "大连市不动产登记中心"); - SOURCE_MAP.put("efw.cn/", "E房网"); - SOURCE_MAP.put("xfzc.com", "徐房之窗"); - SOURCE_MAP.put("gov.cn", "东莞市房产管理局"); - SOURCE_MAP.put("zfgou.cn", "中房网pt"); - SOURCE_MAP.put("zfgou.cn", "中房网pt"); - SOURCE_MAP.put("zhen22.com", "真二网"); - SOURCE_MAP.put("10fang.com", "十房网"); - SOURCE_MAP.put("house.qq.com", "腾讯网"); - SOURCE_MAP.put("imaifang.com", "买房网.imaifang.com"); - SOURCE_MAP.put("ihk.cn", "房王"); - SOURCE_MAP.put("liaoyi.com", "辽一网"); - SOURCE_MAP.put("liaoyi.com", "辽一网"); - SOURCE_MAP.put("u0762.com", "河源优房网"); - SOURCE_MAP.put("baixing.com", "百姓网"); - SOURCE_MAP.put("022zs.com", "天津写字楼网"); - SOURCE_MAP.put("dsfang.com", "独山房产网"); - SOURCE_MAP.put("szfcweb", "苏州网上房地产"); - SOURCE_MAP.put("hzhuge888.com", "诸葛找房"); - SOURCE_MAP.put("ph-fc.com", "平湖房产网"); - SOURCE_MAP.put("czhfc.com", "沧州大象房产网"); - SOURCE_MAP.put("lbx.cc", "老百姓网"); - SOURCE_MAP.put("cn0917.com", "宝鸡网"); - SOURCE_MAP.put("39518.com", "潭房网"); - SOURCE_MAP.put("0827fc.com", "巴中房产网0827fc"); - SOURCE_MAP.put("bslife.cn", "保山生活网"); - SOURCE_MAP.put("bbs.zuojiang.com", "左江网"); - SOURCE_MAP.put("wst.cn", "二泉房产"); - SOURCE_MAP.put("dqxxw.com", "大庆信息网"); - SOURCE_MAP.put("dqxxw.com", "大庆信息网"); - SOURCE_MAP.put("6666669.com", "大庆生活网"); - SOURCE_MAP.put("6666669.com", "大庆生活网"); - SOURCE_MAP.put("8e8e8.cn", "增城房产网"); - SOURCE_MAP.put("dlgfw.com", "大连购房网"); - SOURCE_MAP.put("eqqhr.com", "齐齐哈尔网"); - SOURCE_MAP.put("0469xxt.com", "双鸭山信息通"); - SOURCE_MAP.put("jzcool.com", "荆州在线"); - SOURCE_MAP.put("0469xxw.com", "双鸭山信息网"); - SOURCE_MAP.put("dz600.com", "达州生活网"); - SOURCE_MAP.put("78sys.com", "78双鸭山"); - SOURCE_MAP.put("xjhouse.cn", "新疆房产网xjhouse"); - SOURCE_MAP.put("renjoin.com", "人居网"); - SOURCE_MAP.put("timedg.com", "东莞时间网"); - SOURCE_MAP.put("wenlinghouse.com", "温岭房子"); - SOURCE_MAP.put("wlmqfcw.com", "乌鲁木齐房产"); - SOURCE_MAP.put("house12315.com", "福建房地产联合网"); - SOURCE_MAP.put("kmfw.com.cn", "昆明房网_kmfw.com"); - SOURCE_MAP.put("yixing.cc", "在线房产"); - SOURCE_MAP.put("0468.com.cn", "鹤岗生活网"); - SOURCE_MAP.put("0745news.cn", "怀化新闻网"); - SOURCE_MAP.put("hldfcw.com", "葫芦岛房产"); - SOURCE_MAP.put("yixing.cc", "宜兴在线"); - SOURCE_MAP.put("yxls.com.cn", "宜兴楼市网"); - SOURCE_MAP.put("0756fang.com", "真房网"); - SOURCE_MAP.put("wlfdcw.com", "温岭房地产网"); - SOURCE_MAP.put("6psfc.com", "六盘水房屋信息网"); - SOURCE_MAP.put("luoyangfdc.com", "洛阳房产网"); - SOURCE_MAP.put("doumenqu.com", "斗门视窗"); - SOURCE_MAP.put("wkzf.com", "悟空找房"); - SOURCE_MAP.put("taiwu.com", "太屋网"); - SOURCE_MAP.put("sddzz.com", "枣庄视窗"); - SOURCE_MAP.put("07358.com", "郴房网"); - SOURCE_MAP.put("aiximi.cn", "延边房产爱房网"); - SOURCE_MAP.put("179179.cn", "一起购房网"); - SOURCE_MAP.put("ckj345.com", "超可居"); - SOURCE_MAP.put("168fenlei.com", "168分类"); - SOURCE_MAP.put("hiao.com", "好房网"); - SOURCE_MAP.put("88tie.com", "88同城"); - SOURCE_MAP.put("jyloushi.com", "济源楼市网"); - SOURCE_MAP.put("zjttdc.com", "天天地产"); - SOURCE_MAP.put("tanhyjy.com", "壹加壹房产网"); - SOURCE_MAP.put("fangchan0455.com", "绥化恋家房产"); - SOURCE_MAP.put("yxhbfc.com", "宜兴天桥房产网"); - SOURCE_MAP.put("yiwu-house.com", "坐标不动产"); - SOURCE_MAP.put("hwj.com", "好旺角房屋"); - SOURCE_MAP.put("0519fc.cn", "溧阳金点房产"); - SOURCE_MAP.put("ywhouse365.com", "义乌方圆房产"); - SOURCE_MAP.put("house.cqkz.com", "开县网"); - SOURCE_MAP.put("f.wanbuti.com", "梯城网"); - SOURCE_MAP.put("szhome.com", "深圳房地产信息网"); - SOURCE_MAP.put("cszzc.cn", "苏州之窗"); - SOURCE_MAP.put("029k.com", "咸阳买房子"); - SOURCE_MAP.put("0391fc.com", "焦作房产信息网"); - SOURCE_MAP.put("fxun.com", "漳州房讯网"); - SOURCE_MAP.put("youfang123.com", "优房网123"); - SOURCE_MAP.put("52fuqing.com", "爱福清网"); - SOURCE_MAP.put("jzjz114.com", "锦州市便民服务中心"); - SOURCE_MAP.put("zhuoni.ccoo.cn", "卓尼在线"); - SOURCE_MAP.put("zhuoni.ccoo.cn", "卓尼在线"); - SOURCE_MAP.put("zhongmou.ccoo.cn", "中牟网"); - SOURCE_MAP.put("sfzxx.com", "搜房在线"); - SOURCE_MAP.put("360fdc.com", "360中房网"); - SOURCE_MAP.put("dichandadang.com", "上海地产搭配"); - SOURCE_MAP.put("qu114.com", "武汉去114网"); - SOURCE_MAP.put("657200.cn", "镇雄之窗"); - SOURCE_MAP.put("600617.com", "南昌写字楼网"); + SOURCE_MAP.put("0316.cc", "寤婃埧缃�"); + SOURCE_MAP.put("ntfdc.net", "鍗楅�氭埧浜х綉"); + SOURCE_MAP.put("371house.com", "閮戝窞妤煎競"); + SOURCE_MAP.put("haoju.cn", "濂藉眳"); + SOURCE_MAP.put("berui.com", "鐧剧憺鍦颁骇瀹跺眳缃�"); + SOURCE_MAP.put("962013.com", "鑻忔埧缃�"); + SOURCE_MAP.put("5khouse.com", "鐪嬫埧缃慱C"); + SOURCE_MAP.put("ntfdc.net", "鍗楅�氭埧浜х綉"); + SOURCE_MAP.put("wlmq.com", "涔岄瞾鏈ㄩ綈缃�"); + SOURCE_MAP.put("nxfang.com", "瀹佸鎴跨綉"); + SOURCE_MAP.put("huxingoffice.com", "涓婃捣鍐欏瓧妤肩璧佷腑蹇�"); + SOURCE_MAP.put("jiasz.com", "瀹跺湪娣卞湷"); + SOURCE_MAP.put("shjjw.gov.cn", "涓婃捣甯備綇鎴垮拰鍩庝埂寤鸿绠$悊濮斿憳浼�"); + SOURCE_MAP.put("maitian.cn", "楹︾敯鍦ㄧ嚎"); + SOURCE_MAP.put("maitian.cn", "楹︾敯鍦ㄧ嚎"); + SOURCE_MAP.put("ifeng.com", "鍑ゅ嚢缃�"); + SOURCE_MAP.put("5i5j.com", "鎴戠埍鎴戝"); + SOURCE_MAP.put("zlhome.com", "涓仈鍦颁骇缃�"); + SOURCE_MAP.put("cq315house.com", "閲嶅簡缃戜笂鎴垮湴浜�"); + SOURCE_MAP.put("kshome.com.cn", "鏄嗗北甯傚瓨閲忔埧缃戜笂澶囨绯荤粺"); + SOURCE_MAP.put("jyyuan.com", "瀹剁紭缃�"); + SOURCE_MAP.put("kshome.com.cn", "鏄嗗北甯傚瓨閲忔埧缃戜笂澶囨绯荤粺"); + SOURCE_MAP.put("jyfcc.com.cn", "姹熼槾鍟嗗搧鎴夸俊鎭彂甯冨钩鍙�"); + SOURCE_MAP.put("zaf.cc", "涓畨鎴�"); + SOURCE_MAP.put("xian-house.com", "瑗垮畨鎴夸骇绉樹功缃�"); + SOURCE_MAP.put("ishuo.cn", "缁忓吀缃�"); + SOURCE_MAP.put("ishuo.cn", "缁忓吀缃�"); + SOURCE_MAP.put("jz0574.com", "瀹跺湪瀹佹尝"); + SOURCE_MAP.put("fangshijie.cn", "鎴夸笘鐣�"); + SOURCE_MAP.put("shzf.com", "涓婃捣鎵炬埧缃�"); + SOURCE_MAP.put("bhfdc.org.cn", "婊ㄦ捣鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("pcestate.com", "澶钩娲嬫埧浜х綉"); + SOURCE_MAP.put("xcqfw.com", "娣卞湷灏忔潈鎴跨粺寤烘ゼ缃�"); + SOURCE_MAP.put("fangshijie.cn", "鎴夸笘鐣�"); + SOURCE_MAP.put("jz0574.com", "瀹跺湪瀹佹尝"); + SOURCE_MAP.put("ihoome.com", "鐖辨垜瀹�"); + SOURCE_MAP.put("bhfdc.org.cn", "婊ㄦ捣鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("pcestate.com", "澶钩娲嬫埧浜х綉"); + SOURCE_MAP.put("csgfw.cn", "甯哥啛璐埧缃�"); + SOURCE_MAP.put("csfc.gov.cn", "甯哥啛鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("kshome.com.cn", "鏄嗗北甯傚瓨閲忔埧缃戜笂澶囨绯荤粺"); + SOURCE_MAP.put("16hour.com", "16灏忔椂缃�"); + SOURCE_MAP.put("taobao.com", "娣樺疂鎷嶅崠"); + SOURCE_MAP.put("szjsj.gov.cn", "鑻忓窞浣忔埧鍜屽煄涔″缓璁惧眬"); + SOURCE_MAP.put("szjsj.gov.cn", "鑻忓窞浣忔埧鍜屽煄涔″缓璁惧眬"); + SOURCE_MAP.put("pinganfang.com", "骞冲畨濂芥埧"); + SOURCE_MAP.put("hzjg.gov.cn", "鏉窞浠锋牸缃�"); + SOURCE_MAP.put("sz68.com", "娣卞湷鍦熷湴鎴夸骇浜ゆ槗涓績"); + SOURCE_MAP.put("shjiapai.cn", "鍢夋媿缃�"); + SOURCE_MAP.put("bhghgt.gov.cn", "澶╂触甯傛花娴锋柊鍖鸿鍒掑拰鍥藉湡璧勬簮绠$悊灞�"); + SOURCE_MAP.put("xiyang.gov.cn", "涓浗鏄旈槼"); + SOURCE_MAP.put("bendibao.com", "鏈湴瀹�"); + SOURCE_MAP.put("365hf.com", "鍛煎拰娴╃壒鎴垮湴浜х綉"); + SOURCE_MAP.put("yyfdcw.com", "宀抽槼鎴垮湴浜х綉"); + SOURCE_MAP.put("0575360.com", "缁嶅叴鎴夸骇缃�"); + SOURCE_MAP.put("jy510.com", "510鎴胯秴甯�"); + SOURCE_MAP.put("51juhang.com", "51灞呮澀"); + SOURCE_MAP.put("flbang.com", "鎴垮埄甯�"); + SOURCE_MAP.put("jk5k.com", "鍗冲鍔炲叕"); + SOURCE_MAP.put("http://5i5pu.com", "鎴戠埍鎴戦摵"); + SOURCE_MAP.put("newfw.com", "鏉窞鏂版埧缃�"); + SOURCE_MAP.put("jy510.com", "510鎴胯秴甯�"); + SOURCE_MAP.put("js0573.com", "鍢夊杽鎴夸骇缃�"); + SOURCE_MAP.put("fangtan007.com", "鎴挎帰缃慺t"); + SOURCE_MAP.put("zsgfw.cn", "涓北璐埧缃�"); + SOURCE_MAP.put("51juhang.com", "51灞呮澀"); + SOURCE_MAP.put("xft77.com", "灏忔埧绔�"); + SOURCE_MAP.put("hnfgw.com", "娴峰畞閫忔槑鍞埧缃�"); + SOURCE_MAP.put("smfdc.com.cn", "涓夋槑甯傛埧鍦颁骇淇℃伅缃�"); + SOURCE_MAP.put("wpl.gov.cn", "姝︽眽甯傚浗鍦熻祫婧愬拰瑙勫垝灞�"); + SOURCE_MAP.put("mytophome.com", "婊″爞绾㈠湴浜х綉"); + SOURCE_MAP.put("80053.com", "鑺滄箹鎴垮缃�"); + SOURCE_MAP.put("czfdcw.net", "娼窞鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("xiashanet.com", "涓嬫矙鎴夸骇缃�"); + SOURCE_MAP.put("xiashanet.com", "涓嬫矙鎴夸骇缃�"); + SOURCE_MAP.put("myliving.cn", "绉熷敭鎯呮姤缃�"); + SOURCE_MAP.put("hzhuge888.com", "璇歌憶鎵炬埧"); + SOURCE_MAP.put("sccin.com.cn", "鍥涘窛寤鸿缃�"); + SOURCE_MAP.put("grfy.net", "涓汉鎴挎簮缃�"); + SOURCE_MAP.put("shzf.com", "涓婃捣鎵炬埧缃�"); + SOURCE_MAP.put("ycmfw.com", "鐩愬煄涔版埧缃�"); + SOURCE_MAP.put("jfzh.com.cn", "娲ユ埧缃崲"); + SOURCE_MAP.put("shls.com.cn", "涓婃捣妤煎競缃�"); + SOURCE_MAP.put("qd818.com", "鍚笢鐧句笟鎴夸骇缃�"); + SOURCE_MAP.put("fangtan007.com", "鎴挎帰缃慺t"); + SOURCE_MAP.put("js0573.com", "鍢夊杽鎴夸骇缃�"); + SOURCE_MAP.put("hzjg.gov.cn", "鏉窞浠锋牸缃�"); + SOURCE_MAP.put("bjjs.gov.cn", "鍖椾含甯傚缓璁惧鍛樹細"); + SOURCE_MAP.put("fuzhou.gov.cn", "绂忓窞甯傛埧灞嬬櫥璁颁腑蹇�"); + SOURCE_MAP.put("tmsf.com", "閫忔槑鍞埧缃�"); + SOURCE_MAP.put("xjfangwu.com", "鏂扮枂鎴垮眿缃�"); + SOURCE_MAP.put("0572.com", "0572鎴夸骇缃�"); + SOURCE_MAP.put("czfdc.com.cn", "甯稿窞鏂板缓鍟嗗搧鎴挎埧浠峰妗堝叕绀�"); + SOURCE_MAP.put("lanfw.com", "钃濇埧缃�"); + SOURCE_MAP.put("0594.com", "鐢埧缃�"); + SOURCE_MAP.put("yccj.gov.cn", "瀹滄槬甯傚煄涔¤鍒掑缓璁剧綉"); + SOURCE_MAP.put("flbang.com", "鎴垮埄甯�"); + SOURCE_MAP.put("ncfdc.com.cn", "鍗楁槍鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("962121.net", "涓婃捣浣忓畢鐗╀笟缃�"); + SOURCE_MAP.put("80053.com", "鑺滄箹鎴垮缃�"); + SOURCE_MAP.put("housoo.com", "灞辫タ鎴垮湴浜ч棬鎴风綉"); + SOURCE_MAP.put("tffcw.com", "澶╁簻鎴夸骇缃�"); + SOURCE_MAP.put("80053.com", "鑺滄箹鎴垮缃�"); + SOURCE_MAP.put("sanwen8.cn", "浣滄枃缃�"); + SOURCE_MAP.put("paifun.net", "鎷嶆埧缃�"); + SOURCE_MAP.put("grfy.net", "涓汉鎴挎簮缃�"); + SOURCE_MAP.put("milike.com", "瑙呮埧缃�"); + SOURCE_MAP.put("hft58.com", "濂芥埧鍥�"); + SOURCE_MAP.put("0515yc.com", "鐩愬煄鎴夸环"); + SOURCE_MAP.put("0515yc.com", "鐩愬煄鎴夸环"); + SOURCE_MAP.put("lffdc.com", "寤婂潑甯備綇鎴夸繚闅滃拰鎴夸骇绠$悊灞�"); + SOURCE_MAP.put("lffdc.com", "寤婂潑甯備綇鎴夸繚闅滃拰鎴夸骇绠$悊灞�"); + SOURCE_MAP.put("15fcw.cn", "涔夋埧缃�"); + SOURCE_MAP.put("15fcw.cn", "涔夋埧缃�"); + SOURCE_MAP.put("zhujia360.com", "绛戝鏄�"); + SOURCE_MAP.put("bqfang.cn", "鍖楀尯鎴�.cn"); + SOURCE_MAP.put("zzcszx.com", "鏋e簞鍩庡競鍦ㄧ嚎"); + SOURCE_MAP.put("jfzh.com.cn", "娲ユ埧缃崲"); + SOURCE_MAP.put("shls.com.cn", "涓婃捣妤煎競缃�"); + SOURCE_MAP.put("nantaihu.com", "鍗楀お婀栨埧浜�"); + SOURCE_MAP.put("nantaihu.com", "鍗楀お婀栨埧浜�"); + SOURCE_MAP.put("nantaihu.com", "鍗楀お婀栨埧浜�"); + SOURCE_MAP.put("zaf.cc", "涓畨鎴�"); + SOURCE_MAP.put("360fdc.com", "涓埧缃�"); + SOURCE_MAP.put("577house.com", "娓╁窞鎴夸骇鐑嚎"); + SOURCE_MAP.put("ycfczc.com", "閭充紭鎴夸骇缃�"); + SOURCE_MAP.put("ywcbd.com", "涓婃捣鎷嶆埧缃�"); + SOURCE_MAP.put("chinesesfpm.com", "涓浗鍙告硶鎷嶅崠"); + SOURCE_MAP.put("51zhupai.com", "鍔╂媿缃�"); + SOURCE_MAP.put("xiashanet.com", "涓嬫矙鎴夸骇缃�"); + SOURCE_MAP.put("smsjs.com", "涓夋槑甯備綇鎴垮拰鍩庝埂寤鸿灞�"); + SOURCE_MAP.put("tprtc.com", "澶╂触鎴夸骇浜ゆ槗涓績"); + SOURCE_MAP.put("myliving.cn", "绉熷敭鎯呮姤缃�"); + SOURCE_MAP.put("cbex.com.cn", "鍖椾含浜ф潈浜ゆ槗鎵�"); + SOURCE_MAP.put("cbrex.com", "鎴垮湴鍦ㄧ嚎"); + SOURCE_MAP.put("xmjs.gov.cn/", "鍘﹂棬甯傚缓璁惧眬"); + SOURCE_MAP.put("xmfczc.com", "鍘﹂棬鎴夸骇涔嬬獥"); + SOURCE_MAP.put("fangj.com", "鎴跨晫"); + SOURCE_MAP.put("001ce.com", "绗竴鍟嗕笟鍦颁骇缃�"); + SOURCE_MAP.put("xfx.cn", "鏂版埧绾�"); + SOURCE_MAP.put("jjshome.com", "瀹跺椤烘埧浜х綉"); + SOURCE_MAP.put("xzlou.cn", "寰愬窞鍐欏瓧妤肩綉"); + SOURCE_MAP.put("zqjs.gov.cn", "鑲囧簡甯備綇鎴垮拰鍩庝埂寤鸿灞�"); + SOURCE_MAP.put("dlfd.gov.cn", "澶ц繛甯備笉鍔ㄤ骇鐧昏涓績"); + SOURCE_MAP.put("efw.cn/", "E鎴跨綉"); + SOURCE_MAP.put("xfzc.com", "寰愭埧涔嬬獥"); + SOURCE_MAP.put("gov.cn", "涓滆帪甯傛埧浜х鐞嗗眬"); + SOURCE_MAP.put("zfgou.cn", "涓埧缃憄t"); + SOURCE_MAP.put("zfgou.cn", "涓埧缃憄t"); + SOURCE_MAP.put("zhen22.com", "鐪熶簩缃�"); + SOURCE_MAP.put("10fang.com", "鍗佹埧缃�"); + SOURCE_MAP.put("house.qq.com", "鑵捐缃�"); + SOURCE_MAP.put("imaifang.com", "涔版埧缃�.imaifang.com"); + SOURCE_MAP.put("ihk.cn", "鎴跨帇"); + SOURCE_MAP.put("liaoyi.com", "杈戒竴缃�"); + SOURCE_MAP.put("liaoyi.com", "杈戒竴缃�"); + SOURCE_MAP.put("u0762.com", "娌虫簮浼樻埧缃�"); + SOURCE_MAP.put("baixing.com", "鐧惧缃�"); + SOURCE_MAP.put("022zs.com", "澶╂触鍐欏瓧妤肩綉"); + SOURCE_MAP.put("dsfang.com", "鐙北鎴夸骇缃�"); + SOURCE_MAP.put("szfcweb", "鑻忓窞缃戜笂鎴垮湴浜�"); + SOURCE_MAP.put("hzhuge888.com", "璇歌憶鎵炬埧"); + SOURCE_MAP.put("ph-fc.com", "骞虫箹鎴夸骇缃�"); + SOURCE_MAP.put("czhfc.com", "娌у窞澶ц薄鎴夸骇缃�"); + SOURCE_MAP.put("lbx.cc", "鑰佺櫨濮撶綉"); + SOURCE_MAP.put("cn0917.com", "瀹濋浮缃�"); + SOURCE_MAP.put("39518.com", "娼埧缃�"); + SOURCE_MAP.put("0827fc.com", "宸翠腑鎴夸骇缃�0827fc"); + SOURCE_MAP.put("bslife.cn", "淇濆北鐢熸椿缃�"); + SOURCE_MAP.put("bbs.zuojiang.com", "宸︽睙缃�"); + SOURCE_MAP.put("wst.cn", "浜屾硥鎴夸骇"); + SOURCE_MAP.put("dqxxw.com", "澶у簡淇℃伅缃�"); + SOURCE_MAP.put("dqxxw.com", "澶у簡淇℃伅缃�"); + SOURCE_MAP.put("6666669.com", "澶у簡鐢熸椿缃�"); + SOURCE_MAP.put("6666669.com", "澶у簡鐢熸椿缃�"); + SOURCE_MAP.put("8e8e8.cn", "澧炲煄鎴夸骇缃�"); + SOURCE_MAP.put("dlgfw.com", "澶ц繛璐埧缃�"); + SOURCE_MAP.put("eqqhr.com", "榻愰綈鍝堝皵缃�"); + SOURCE_MAP.put("0469xxt.com", "鍙岄腑灞变俊鎭��"); + SOURCE_MAP.put("jzcool.com", "鑽嗗窞鍦ㄧ嚎"); + SOURCE_MAP.put("0469xxw.com", "鍙岄腑灞变俊鎭綉"); + SOURCE_MAP.put("dz600.com", "杈惧窞鐢熸椿缃�"); + SOURCE_MAP.put("78sys.com", "78鍙岄腑灞�"); + SOURCE_MAP.put("xjhouse.cn", "鏂扮枂鎴夸骇缃憍jhouse"); + SOURCE_MAP.put("renjoin.com", "浜哄眳缃�"); + SOURCE_MAP.put("timedg.com", "涓滆帪鏃堕棿缃�"); + SOURCE_MAP.put("wenlinghouse.com", "娓╁箔鎴垮瓙"); + SOURCE_MAP.put("wlmqfcw.com", "涔岄瞾鏈ㄩ綈鎴夸骇"); + SOURCE_MAP.put("house12315.com", "绂忓缓鎴垮湴浜ц仈鍚堢綉"); + SOURCE_MAP.put("kmfw.com.cn", "鏄嗘槑鎴跨綉_kmfw.com"); + SOURCE_MAP.put("yixing.cc", "鍦ㄧ嚎鎴夸骇"); + SOURCE_MAP.put("0468.com.cn", "楣ゅ矖鐢熸椿缃�"); + SOURCE_MAP.put("0745news.cn", "鎬�鍖栨柊闂荤綉"); + SOURCE_MAP.put("hldfcw.com", "钁姦宀涙埧浜�"); + SOURCE_MAP.put("yixing.cc", "瀹滃叴鍦ㄧ嚎"); + SOURCE_MAP.put("yxls.com.cn", "瀹滃叴妤煎競缃�"); + SOURCE_MAP.put("0756fang.com", "鐪熸埧缃�"); + SOURCE_MAP.put("wlfdcw.com", "娓╁箔鎴垮湴浜х綉"); + SOURCE_MAP.put("6psfc.com", "鍏洏姘存埧灞嬩俊鎭綉"); + SOURCE_MAP.put("luoyangfdc.com", "娲涢槼鎴夸骇缃�"); + SOURCE_MAP.put("doumenqu.com", "鏂楅棬瑙嗙獥"); + SOURCE_MAP.put("wkzf.com", "鎮熺┖鎵炬埧"); + SOURCE_MAP.put("taiwu.com", "澶眿缃�"); + SOURCE_MAP.put("sddzz.com", "鏋e簞瑙嗙獥"); + SOURCE_MAP.put("07358.com", "閮存埧缃�"); + SOURCE_MAP.put("aiximi.cn", "寤惰竟鎴夸骇鐖辨埧缃�"); + SOURCE_MAP.put("179179.cn", "涓�璧疯喘鎴跨綉"); + SOURCE_MAP.put("ckj345.com", "瓒呭彲灞�"); + SOURCE_MAP.put("168fenlei.com", "168鍒嗙被"); + SOURCE_MAP.put("hiao.com", "濂芥埧缃�"); + SOURCE_MAP.put("88tie.com", "88鍚屽煄"); + SOURCE_MAP.put("jyloushi.com", "娴庢簮妤煎競缃�"); + SOURCE_MAP.put("zjttdc.com", "澶╁ぉ鍦颁骇"); + SOURCE_MAP.put("tanhyjy.com", "澹瑰姞澹规埧浜х綉"); + SOURCE_MAP.put("fangchan0455.com", "缁ュ寲鎭嬪鎴夸骇"); + SOURCE_MAP.put("yxhbfc.com", "瀹滃叴澶╂ˉ鎴夸骇缃�"); + SOURCE_MAP.put("yiwu-house.com", "鍧愭爣涓嶅姩浜�"); + SOURCE_MAP.put("hwj.com", "濂芥椇瑙掓埧灞�"); + SOURCE_MAP.put("0519fc.cn", "婧ч槼閲戠偣鎴夸骇"); + SOURCE_MAP.put("ywhouse365.com", "涔変箤鏂瑰渾鎴夸骇"); + SOURCE_MAP.put("house.cqkz.com", "寮�鍘跨綉"); + SOURCE_MAP.put("f.wanbuti.com", "姊煄缃�"); + SOURCE_MAP.put("szhome.com", "娣卞湷鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("cszzc.cn", "鑻忓窞涔嬬獥"); + SOURCE_MAP.put("029k.com", "鍜搁槼涔版埧瀛�"); + SOURCE_MAP.put("0391fc.com", "鐒︿綔鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("fxun.com", "婕冲窞鎴胯缃�"); + SOURCE_MAP.put("youfang123.com", "浼樻埧缃�123"); + SOURCE_MAP.put("52fuqing.com", "鐖辩娓呯綉"); + SOURCE_MAP.put("jzjz114.com", "閿﹀窞甯備究姘戞湇鍔′腑蹇�"); + SOURCE_MAP.put("zhuoni.ccoo.cn", "鍗撳凹鍦ㄧ嚎"); + SOURCE_MAP.put("zhuoni.ccoo.cn", "鍗撳凹鍦ㄧ嚎"); + SOURCE_MAP.put("zhongmou.ccoo.cn", "涓墴缃�"); + SOURCE_MAP.put("sfzxx.com", "鎼滄埧鍦ㄧ嚎"); + SOURCE_MAP.put("360fdc.com", "360涓埧缃�"); + SOURCE_MAP.put("dichandadang.com", "涓婃捣鍦颁骇鎼厤"); + SOURCE_MAP.put("qu114.com", "姝︽眽鍘�114缃�"); + SOURCE_MAP.put("657200.cn", "闀囬泟涔嬬獥"); + SOURCE_MAP.put("600617.com", "鍗楁槍鍐欏瓧妤肩綉"); SOURCE_MAP.put("zuoyun.ccoo.cn", "zuoyun.ccoo.cn"); - SOURCE_MAP.put("0760cc.com", "中山城市在线"); - SOURCE_MAP.put("0574-office.net", "汇东房产"); - SOURCE_MAP.put("xmtfj.gov.cn", "厦门网上房地产xmtfj"); - SOURCE_MAP.put("diandianzu.com", "点点租"); - SOURCE_MAP.put("hrbfdc.gov.cn", "哈尔滨市住房保障和房产管理局"); - SOURCE_MAP.put("kongjianjia.com", "空间家"); - SOURCE_MAP.put("ggsfcw.com", "贵港市房产网"); - SOURCE_MAP.put("neijiang.gov.cn", "内江市住房和城乡建设局"); - SOURCE_MAP.put("222.74.69.146", "赤峰市房产管理局"); - SOURCE_MAP.put("ahshangpu.com", "安徽商铺网"); - SOURCE_MAP.put("0558bz.com", "亳州在线"); - SOURCE_MAP.put("dawu.ccoo.cn", "大悟在线"); - SOURCE_MAP.put("gem.ccoo.cn", "格尔木在线"); - SOURCE_MAP.put("ylnet.com.cn/", "绿河谷"); - SOURCE_MAP.put("okfang.com", "OK房"); - SOURCE_MAP.put("dongtai.so", "金鼎房产"); - SOURCE_MAP.put("zjghfw.com", "张家港好房网"); - SOURCE_MAP.put("885fang.com", "瞰房网"); - SOURCE_MAP.put("2ma2.com", "红番茄"); - SOURCE_MAP.put("885fang.com", "瞰房网"); - SOURCE_MAP.put("ntfdc.net", "南通房产信息网"); - SOURCE_MAP.put("nthaohe.com", "濠河网"); - SOURCE_MAP.put("100gf.com", "100购房网"); - SOURCE_MAP.put("01fy.cn", "第一时间"); - SOURCE_MAP.put("zcfun.com", "诸城房产网"); - SOURCE_MAP.put("e0575.com", "绍兴E网"); - SOURCE_MAP.put("e0575.com", "绍兴E网"); - SOURCE_MAP.put("zjgzf.cn", "张家港房产网"); - SOURCE_MAP.put("sxhouse.com.cn", "绍兴房产官方门户"); - SOURCE_MAP.put("365hf.com", "呼和浩特房地产网"); - SOURCE_MAP.put("kshome.com.cn", "昆山市存量房网上备案系统"); - SOURCE_MAP.put("2boss.cn", "兔博士"); - SOURCE_MAP.put("1200.com.cn/", "美联物业"); - SOURCE_MAP.put("qfang.com/", "Q房网"); - SOURCE_MAP.put("nbywfc.com", "甬旺房产"); - SOURCE_MAP.put("stfcj.gov.cn", "汕头市房产管理局"); - SOURCE_MAP.put("sgjsj.gov.cn", "韶关市建设与房地产信息网"); - SOURCE_MAP.put("sd888.org", "顺德楼市"); - SOURCE_MAP.put("aj0662.com/", "爱家网"); - SOURCE_MAP.put("jz0574.com", "家在宁波"); - SOURCE_MAP.put("todgo.com", "土地公"); - SOURCE_MAP.put("tx.2ma2.com", "天祥房产"); - SOURCE_MAP.put("tx.2ma2.com", "天祥房产"); - SOURCE_MAP.put("hanyuproperty.com", "汉宇地产"); - SOURCE_MAP.put("djyfc.cn", "都江堰房产网"); - SOURCE_MAP.put("xmfczc.com", "厦门房产之窗"); - SOURCE_MAP.put("xmfczc.com", "厦门房产之窗"); - SOURCE_MAP.put("djyfc.cn", "都江堰房产网"); - SOURCE_MAP.put("haohome.com.cn", "好好居房屋中介"); - SOURCE_MAP.put("sinyi.com.cn", "信义房屋"); - SOURCE_MAP.put("dg.gov.cn", "东莞市房产管理局"); - SOURCE_MAP.put("legongchang.com", "乐工场"); - SOURCE_MAP.put("zhujianpt.com", "中国住建网"); - SOURCE_MAP.put("zdzj.com", "正大房产"); - SOURCE_MAP.put("ptjj.gov.cn", "平谭综合实验区交通与建设网"); - SOURCE_MAP.put("bieshu.com", "别墅网"); - SOURCE_MAP.put("bjroom.cn", "必捷诺北京租房网"); - SOURCE_MAP.put("soufocus.com", "聚焦房产网"); - SOURCE_MAP.put("soufocus.com", "聚焦房产网"); - SOURCE_MAP.put("whouse.com.cn", "广汇房产网"); - SOURCE_MAP.put("byrenjia.com", "巴渝人家"); - SOURCE_MAP.put("house.024678.com", "沈阳生活网"); - SOURCE_MAP.put("house.024678.com", "沈阳生活网"); - SOURCE_MAP.put("kan3721.com", "杭州看房网"); - SOURCE_MAP.put("kan3721.com", "杭州看房网"); - SOURCE_MAP.put("hxhouse.com", "海西房产网hxhouse.com"); - SOURCE_MAP.put("daocheng.me", "岛城房产网"); - SOURCE_MAP.put("daocheng.me", "岛城房产网"); - SOURCE_MAP.put("hddcw.com", "黄岛地产网"); - SOURCE_MAP.put("hddcw.com", "黄岛地产网"); - SOURCE_MAP.put("fang2580.com", "房源网"); - SOURCE_MAP.put("fang2580.com", "房源网"); - SOURCE_MAP.put("sufangbao.com", "苏房宝"); - SOURCE_MAP.put("sufangbao.com", "苏房宝"); - SOURCE_MAP.put("xianaifang.com", "西安爱房"); - SOURCE_MAP.put("xianaifang.com", "西安爱房"); - SOURCE_MAP.put("wuhancn.com", "武汉房产"); - SOURCE_MAP.put("syhouse.net", "上虞房产"); - SOURCE_MAP.put("jcyshu.com", "京城亿墅"); - SOURCE_MAP.put("villacm.com", "中国别墅传媒网"); - SOURCE_MAP.put("gmfc.cc", "高密房产网"); - SOURCE_MAP.put("yycqc.com", "云阳人家"); - SOURCE_MAP.put("gqren.com", "共青都市网"); - SOURCE_MAP.put("houseshangdu.com", "商都房产网"); - SOURCE_MAP.put("2home.com.cn", "二房网"); - SOURCE_MAP.put("5598.cc", "到津网"); - SOURCE_MAP.put("cqfc.cc", "重庆房地产信息网"); - SOURCE_MAP.put("whqsfcw.com", "武汉青山房网"); - SOURCE_MAP.put("house5151.com", "溧阳房产网"); - SOURCE_MAP.put("1000lou.com", "1000千楼网"); - SOURCE_MAP.put("guodafdc.com", "国大地产"); - SOURCE_MAP.put("home0538.com", "泰安房产网"); - SOURCE_MAP.put("goufang.com/", "购房网"); - SOURCE_MAP.put("goufang.com", "购房网"); - SOURCE_MAP.put("xhj.com", "新环境房屋网"); - SOURCE_MAP.put("wuhai.gov.cn", "乌海房展网"); - SOURCE_MAP.put("sd888.org", "顺德楼市"); - SOURCE_MAP.put("mrlou.com", "楼先生"); - SOURCE_MAP.put("guangxinhongye.com", "办公选址网"); - SOURCE_MAP.put("funxun.com", "房讯网"); - SOURCE_MAP.put("zhaofangdong.cc", "找房东"); - SOURCE_MAP.put("zhaofangdong.cc", "找房东"); - SOURCE_MAP.put("bj-office.com.cn", "北京写字楼租赁中心"); - SOURCE_MAP.put("ycfcw.cn", "盐城房产网"); - SOURCE_MAP.put("lsfun.com", "丽水房产网"); - SOURCE_MAP.put("f0580.com", "大舟山房产"); - SOURCE_MAP.put("gov.cn", "佛山权威房地产网"); - SOURCE_MAP.put("bj-officerent.com", "北京写字楼信息大全网"); - SOURCE_MAP.put("beijing-office.com", "北京写字楼租售中心"); - SOURCE_MAP.put("uban.com", "优办"); + SOURCE_MAP.put("0760cc.com", "涓北鍩庡競鍦ㄧ嚎"); + SOURCE_MAP.put("0574-office.net", "姹囦笢鎴夸骇"); + SOURCE_MAP.put("xmtfj.gov.cn", "鍘﹂棬缃戜笂鎴垮湴浜mtfj"); + SOURCE_MAP.put("diandianzu.com", "鐐圭偣绉�"); + SOURCE_MAP.put("hrbfdc.gov.cn", "鍝堝皵婊ㄥ競浣忔埧淇濋殰鍜屾埧浜х鐞嗗眬"); + SOURCE_MAP.put("kongjianjia.com", "绌洪棿瀹�"); + SOURCE_MAP.put("ggsfcw.com", "璐垫腐甯傛埧浜х綉"); + SOURCE_MAP.put("neijiang.gov.cn", "鍐呮睙甯備綇鎴垮拰鍩庝埂寤鸿灞�"); + SOURCE_MAP.put("222.74.69.146", "璧ゅ嘲甯傛埧浜х鐞嗗眬"); + SOURCE_MAP.put("ahshangpu.com", "瀹夊窘鍟嗛摵缃�"); + SOURCE_MAP.put("0558bz.com", "浜冲窞鍦ㄧ嚎"); + SOURCE_MAP.put("dawu.ccoo.cn", "澶ф偀鍦ㄧ嚎"); + SOURCE_MAP.put("gem.ccoo.cn", "鏍煎皵鏈ㄥ湪绾�"); + SOURCE_MAP.put("ylnet.com.cn/", "缁挎渤璋�"); + SOURCE_MAP.put("okfang.com", "OK鎴�"); + SOURCE_MAP.put("dongtai.so", "閲戦紟鎴夸骇"); + SOURCE_MAP.put("zjghfw.com", "寮犲娓ソ鎴跨綉"); + SOURCE_MAP.put("885fang.com", "鐬版埧缃�"); + SOURCE_MAP.put("2ma2.com", "绾㈢暘鑼�"); + SOURCE_MAP.put("885fang.com", "鐬版埧缃�"); + SOURCE_MAP.put("ntfdc.net", "鍗楅�氭埧浜т俊鎭綉"); + SOURCE_MAP.put("nthaohe.com", "婵犳渤缃�"); + SOURCE_MAP.put("100gf.com", "100璐埧缃�"); + SOURCE_MAP.put("01fy.cn", "绗竴鏃堕棿"); + SOURCE_MAP.put("zcfun.com", "璇稿煄鎴夸骇缃�"); + SOURCE_MAP.put("e0575.com", "缁嶅叴E缃�"); + SOURCE_MAP.put("e0575.com", "缁嶅叴E缃�"); + SOURCE_MAP.put("zjgzf.cn", "寮犲娓埧浜х綉"); + SOURCE_MAP.put("sxhouse.com.cn", "缁嶅叴鎴夸骇瀹樻柟闂ㄦ埛"); + SOURCE_MAP.put("365hf.com", "鍛煎拰娴╃壒鎴垮湴浜х綉"); + SOURCE_MAP.put("kshome.com.cn", "鏄嗗北甯傚瓨閲忔埧缃戜笂澶囨绯荤粺"); + SOURCE_MAP.put("2boss.cn", "鍏斿崥澹�"); + SOURCE_MAP.put("1200.com.cn/", "缇庤仈鐗╀笟"); + SOURCE_MAP.put("qfang.com/", "Q鎴跨綉"); + SOURCE_MAP.put("nbywfc.com", "鐢椇鎴夸骇"); + SOURCE_MAP.put("stfcj.gov.cn", "姹曞ご甯傛埧浜х鐞嗗眬"); + SOURCE_MAP.put("sgjsj.gov.cn", "闊跺叧甯傚缓璁句笌鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("sd888.org", "椤哄痉妤煎競"); + SOURCE_MAP.put("aj0662.com/", "鐖卞缃�"); + SOURCE_MAP.put("jz0574.com", "瀹跺湪瀹佹尝"); + SOURCE_MAP.put("todgo.com", "鍦熷湴鍏�"); + SOURCE_MAP.put("tx.2ma2.com", "澶╃ゥ鎴夸骇"); + SOURCE_MAP.put("tx.2ma2.com", "澶╃ゥ鎴夸骇"); + SOURCE_MAP.put("hanyuproperty.com", "姹夊畤鍦颁骇"); + SOURCE_MAP.put("djyfc.cn", "閮芥睙鍫版埧浜х綉"); + SOURCE_MAP.put("xmfczc.com", "鍘﹂棬鎴夸骇涔嬬獥"); + SOURCE_MAP.put("xmfczc.com", "鍘﹂棬鎴夸骇涔嬬獥"); + SOURCE_MAP.put("djyfc.cn", "閮芥睙鍫版埧浜х綉"); + SOURCE_MAP.put("haohome.com.cn", "濂藉ソ灞呮埧灞嬩腑浠�"); + SOURCE_MAP.put("sinyi.com.cn", "淇′箟鎴垮眿"); + SOURCE_MAP.put("dg.gov.cn", "涓滆帪甯傛埧浜х鐞嗗眬"); + SOURCE_MAP.put("legongchang.com", "涔愬伐鍦�"); + SOURCE_MAP.put("zhujianpt.com", "涓浗浣忓缓缃�"); + SOURCE_MAP.put("zdzj.com", "姝eぇ鎴夸骇"); + SOURCE_MAP.put("ptjj.gov.cn", "骞宠碍缁煎悎瀹為獙鍖轰氦閫氫笌寤鸿缃�"); + SOURCE_MAP.put("bieshu.com", "鍒缃�"); + SOURCE_MAP.put("bjroom.cn", "蹇呮嵎璇哄寳浜鎴跨綉"); + SOURCE_MAP.put("soufocus.com", "鑱氱劍鎴夸骇缃�"); + SOURCE_MAP.put("soufocus.com", "鑱氱劍鎴夸骇缃�"); + SOURCE_MAP.put("whouse.com.cn", "骞挎眹鎴夸骇缃�"); + SOURCE_MAP.put("byrenjia.com", "宸存笣浜哄"); + SOURCE_MAP.put("house.024678.com", "娌堥槼鐢熸椿缃�"); + SOURCE_MAP.put("house.024678.com", "娌堥槼鐢熸椿缃�"); + SOURCE_MAP.put("kan3721.com", "鏉窞鐪嬫埧缃�"); + SOURCE_MAP.put("kan3721.com", "鏉窞鐪嬫埧缃�"); + SOURCE_MAP.put("hxhouse.com", "娴疯タ鎴夸骇缃慼xhouse.com"); + SOURCE_MAP.put("daocheng.me", "宀涘煄鎴夸骇缃�"); + SOURCE_MAP.put("daocheng.me", "宀涘煄鎴夸骇缃�"); + SOURCE_MAP.put("hddcw.com", "榛勫矝鍦颁骇缃�"); + SOURCE_MAP.put("hddcw.com", "榛勫矝鍦颁骇缃�"); + SOURCE_MAP.put("fang2580.com", "鎴挎簮缃�"); + SOURCE_MAP.put("fang2580.com", "鎴挎簮缃�"); + SOURCE_MAP.put("sufangbao.com", "鑻忔埧瀹�"); + SOURCE_MAP.put("sufangbao.com", "鑻忔埧瀹�"); + SOURCE_MAP.put("xianaifang.com", "瑗垮畨鐖辨埧"); + SOURCE_MAP.put("xianaifang.com", "瑗垮畨鐖辨埧"); + SOURCE_MAP.put("wuhancn.com", "姝︽眽鎴夸骇"); + SOURCE_MAP.put("syhouse.net", "涓婅櫈鎴夸骇"); + SOURCE_MAP.put("jcyshu.com", "浜煄浜垮"); + SOURCE_MAP.put("villacm.com", "涓浗鍒浼犲獟缃�"); + SOURCE_MAP.put("gmfc.cc", "楂樺瘑鎴夸骇缃�"); + SOURCE_MAP.put("yycqc.com", "浜戦槼浜哄"); + SOURCE_MAP.put("gqren.com", "鍏遍潚閮藉競缃�"); + SOURCE_MAP.put("houseshangdu.com", "鍟嗛兘鎴夸骇缃�"); + SOURCE_MAP.put("2home.com.cn", "浜屾埧缃�"); + SOURCE_MAP.put("5598.cc", "鍒版触缃�"); + SOURCE_MAP.put("cqfc.cc", "閲嶅簡鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("whqsfcw.com", "姝︽眽闈掑北鎴跨綉"); + SOURCE_MAP.put("house5151.com", "婧ч槼鎴夸骇缃�"); + SOURCE_MAP.put("1000lou.com", "1000鍗冩ゼ缃�"); + SOURCE_MAP.put("guodafdc.com", "鍥藉ぇ鍦颁骇"); + SOURCE_MAP.put("home0538.com", "娉板畨鎴夸骇缃�"); + SOURCE_MAP.put("goufang.com/", "璐埧缃�"); + SOURCE_MAP.put("goufang.com", "璐埧缃�"); + SOURCE_MAP.put("xhj.com", "鏂扮幆澧冩埧灞嬬綉"); + SOURCE_MAP.put("wuhai.gov.cn", "涔屾捣鎴垮睍缃�"); + SOURCE_MAP.put("sd888.org", "椤哄痉妤煎競"); + SOURCE_MAP.put("mrlou.com", "妤煎厛鐢�"); + SOURCE_MAP.put("guangxinhongye.com", "鍔炲叕閫夊潃缃�"); + SOURCE_MAP.put("funxun.com", "鎴胯缃�"); + SOURCE_MAP.put("zhaofangdong.cc", "鎵炬埧涓�"); + SOURCE_MAP.put("zhaofangdong.cc", "鎵炬埧涓�"); + SOURCE_MAP.put("bj-office.com.cn", "鍖椾含鍐欏瓧妤肩璧佷腑蹇�"); + SOURCE_MAP.put("ycfcw.cn", "鐩愬煄鎴夸骇缃�"); + SOURCE_MAP.put("lsfun.com", "涓芥按鎴夸骇缃�"); + SOURCE_MAP.put("f0580.com", "澶ц垷灞辨埧浜�"); + SOURCE_MAP.put("gov.cn", "浣涘北鏉冨▉鎴垮湴浜х綉"); + SOURCE_MAP.put("bj-officerent.com", "鍖椾含鍐欏瓧妤间俊鎭ぇ鍏ㄧ綉"); + SOURCE_MAP.put("beijing-office.com", "鍖椾含鍐欏瓧妤肩鍞腑蹇�"); + SOURCE_MAP.put("uban.com", "浼樺姙"); SOURCE_MAP.put("114offices.com", "114offices"); - SOURCE_MAP.put("51banban.com", "51办办网"); - SOURCE_MAP.put("quanhuaoffice.com", "全华网"); - SOURCE_MAP.put("hgfc.cc", "黄冈房产网"); - SOURCE_MAP.put("bjjs.gov.cn", "北京市建设委员会"); - SOURCE_MAP.put("qdfd.com.cn", "青岛网上房地产"); - SOURCE_MAP.put("baotf.cn", "包头房产网baotf"); - SOURCE_MAP.put("mytophome.com", "满堂红地产网"); - SOURCE_MAP.put("centanet.com", "中原地产"); - SOURCE_MAP.put("wuxf.com", "无锡房地产市场网"); - SOURCE_MAP.put("xkhouse.com", "星空地产网"); - SOURCE_MAP.put("zhongfun.cn", "中房在线"); - SOURCE_MAP.put("xianoffice.com", "西安写字楼信息网"); - SOURCE_MAP.put("800j.com.cn", "八百家"); - SOURCE_MAP.put("fang99.com", "房屋管理服务网"); - SOURCE_MAP.put("fang.taobao.com", "淘宝房产"); - SOURCE_MAP.put("fdc.com.cn", "亿房网"); - SOURCE_MAP.put("liebiao.com", "列表网"); - SOURCE_MAP.put("ningbo-office.com", "宁波写字楼网"); - SOURCE_MAP.put("smfdc.com.cn", "三明市房地产信息网"); - SOURCE_MAP.put("danxia.com", "丹霞网"); - SOURCE_MAP.put("http://www.xmdfc.com/loupan/", "鑫铭达房产网"); - SOURCE_MAP.put("yipu.com.cn", "易铺网"); - SOURCE_MAP.put("shenyangoffice.com", "沈阳写字楼"); - SOURCE_MAP.put("cbd86.com", "CBD写字楼网"); - SOURCE_MAP.put("3qhouse.com", "三秦房产网"); - SOURCE_MAP.put("cnool.net", "东方热线"); - SOURCE_MAP.put("jafcj.com", "六安市金安区房地产管理局"); - SOURCE_MAP.put("jafcj.com", "六安市金安区房地产管理局"); - SOURCE_MAP.put("ahhqfdc.cn", "霍邱县(六安下辖县)房地产管理局"); - SOURCE_MAP.put("luan.gov.cn", "六安市住房和城乡建设委员会"); - SOURCE_MAP.put("ahjzfdc.cn", "金寨县(六安市下辖县)房地产管理局"); - SOURCE_MAP.put("024cbd.com", "沈阳写字楼网"); - SOURCE_MAP.put("0532office.com", "青岛写字楼网"); - SOURCE_MAP.put("0731fdc.com", "0731新房网"); - SOURCE_MAP.put("taofang.com", "淘房网"); - SOURCE_MAP.put("jiwu.com", "吉屋网"); - SOURCE_MAP.put("028cbd.com", "成都写字楼网028cbd"); - SOURCE_MAP.put("pcestate.com", "太平洋房产网"); - SOURCE_MAP.put("cqoffice.net", "重庆写字楼网cqoffice"); - SOURCE_MAP.put("5asydc.com", "商业地产网"); - SOURCE_MAP.put("5acbd.com", "5A商用地产"); - SOURCE_MAP.put("5cbd.com", "五星写字楼网"); - SOURCE_MAP.put("5sw.com", "五星网"); - SOURCE_MAP.put("uban.com", "优办"); - SOURCE_MAP.put("2boss.cn", "兔博士"); - SOURCE_MAP.put("rc100.cn", "荣城网"); - SOURCE_MAP.put("jiu6.com", "旧网"); - SOURCE_MAP.put("liyhy.com", "溧阳昊业房产"); - SOURCE_MAP.put("hrb88.com", "嘉吉二手房网"); - SOURCE_MAP.put("xhj.com", "新环境房屋网"); - SOURCE_MAP.put("juhaof.com", "聚好房"); - SOURCE_MAP.put("jjjaaa.com", "家连家"); - SOURCE_MAP.put("stfc118.com", "汕头房产在线"); - SOURCE_MAP.put("bdzfw.net", "保定找房网"); - SOURCE_MAP.put("bxfcw.net", "溪房网"); - SOURCE_MAP.put("bxydt.com", "本溪房吧"); - SOURCE_MAP.put("pdshouse.com", "平顶山房产"); - SOURCE_MAP.put("0830360.com", "泸州房产网"); - SOURCE_MAP.put("chengdechina.com", "承德房产"); - SOURCE_MAP.put("zisai2.com", "紫塞房产网"); - SOURCE_MAP.put("shoufang123.com", "忻州售房网"); - SOURCE_MAP.put("xzhfy.com", "忻州好房缘"); - SOURCE_MAP.put("0701fdc.com", "鹰潭房地产联合网"); - SOURCE_MAP.put("yt99.com", "久久信息网"); - SOURCE_MAP.put("bfqfc.com", "百富勤房产"); - SOURCE_MAP.put("fooww.com", "房屋网"); - SOURCE_MAP.put("0874114.cn", "曲靖便民网"); - SOURCE_MAP.put("qjfdc.cn", "曲靖房地产信息网"); - SOURCE_MAP.put("gz162.com", "贵州房产在线"); - SOURCE_MAP.put("hdzc.net", "邯郸之窗"); - SOURCE_MAP.put("qhdfcjj.com", "秦皇岛房产家居网"); - SOURCE_MAP.put("wfhouse.com", "潍坊房地产网"); - SOURCE_MAP.put("daomin.net", "秦皇岛岛民网"); - SOURCE_MAP.put("qhd.com.cn", "秦皇岛信息港"); - SOURCE_MAP.put("qhd678.com", "秦皇岛大众信息港"); - SOURCE_MAP.put("whfdcw.com", "威海房地产"); - SOURCE_MAP.put("weihaifangchan.cn", "威海房产团购网"); - SOURCE_MAP.put("house-wh.com", "威海房产在线"); - SOURCE_MAP.put("pjfdc.com", "盘锦房地产网"); - SOURCE_MAP.put("0427.com", "互联盘锦"); - SOURCE_MAP.put("pjfyw.com", "盘锦房源网"); - SOURCE_MAP.put("0714.yy.cm", "黄石房产网"); - SOURCE_MAP.put("cuwall.com", "房产在线"); - SOURCE_MAP.put("daloupan.com", "大楼盘"); - SOURCE_MAP.put("0775fw.com", "贵居网"); - SOURCE_MAP.put("wanhao2008.com", "温州热线"); - SOURCE_MAP.put("zaozhuangloushi.com", "枣庄楼市"); - SOURCE_MAP.put("laiwuloushi.com", "莱芜楼市"); - SOURCE_MAP.put("dayou123.com", "宝鸡房产"); - SOURCE_MAP.put("yingtanol.com", "鹰潭网"); - SOURCE_MAP.put("88fw.com", "黄石成功房产网"); - SOURCE_MAP.put("edfdc.com", "有居网"); - SOURCE_MAP.put("hsren.com", "黄石热线"); - SOURCE_MAP.put("hsfc.net.cn", "黄石房产网_hsfc"); - SOURCE_MAP.put("zn.cn", "指南网"); - SOURCE_MAP.put("zaihuangshi.com", "黄石生活网"); - SOURCE_MAP.put("zzleju.com", "乐居网"); - SOURCE_MAP.put("sqdyr.com", "天水网"); - SOURCE_MAP.put("0793fcw.com", "上饶房产网"); - SOURCE_MAP.put("b0917.com", "宝鸡信息港"); - SOURCE_MAP.put("ptdfc.com", "平潭房产网"); - SOURCE_MAP.put("ptfcxx.com", "平潭房产网cxx"); - SOURCE_MAP.put("bb365.cc", "蚌埠网"); - SOURCE_MAP.put("bzgd.com", "巴中房产"); - SOURCE_MAP.put("bzml.com", "巴中房产网bzml"); + SOURCE_MAP.put("51banban.com", "51鍔炲姙缃�"); + SOURCE_MAP.put("quanhuaoffice.com", "鍏ㄥ崕缃�"); + SOURCE_MAP.put("hgfc.cc", "榛勫唸鎴夸骇缃�"); + SOURCE_MAP.put("bjjs.gov.cn", "鍖椾含甯傚缓璁惧鍛樹細"); + SOURCE_MAP.put("qdfd.com.cn", "闈掑矝缃戜笂鎴垮湴浜�"); + SOURCE_MAP.put("baotf.cn", "鍖呭ご鎴夸骇缃慴aotf"); + SOURCE_MAP.put("mytophome.com", "婊″爞绾㈠湴浜х綉"); + SOURCE_MAP.put("centanet.com", "涓師鍦颁骇"); + SOURCE_MAP.put("wuxf.com", "鏃犻敗鎴垮湴浜у競鍦虹綉"); + SOURCE_MAP.put("xkhouse.com", "鏄熺┖鍦颁骇缃�"); + SOURCE_MAP.put("zhongfun.cn", "涓埧鍦ㄧ嚎"); + SOURCE_MAP.put("xianoffice.com", "瑗垮畨鍐欏瓧妤间俊鎭綉"); + SOURCE_MAP.put("800j.com.cn", "鍏櫨瀹�"); + SOURCE_MAP.put("fang99.com", "鎴垮眿绠$悊鏈嶅姟缃�"); + SOURCE_MAP.put("fang.taobao.com", "娣樺疂鎴夸骇"); + SOURCE_MAP.put("fdc.com.cn", "浜挎埧缃�"); + SOURCE_MAP.put("liebiao.com", "鍒楄〃缃�"); + SOURCE_MAP.put("ningbo-office.com", "瀹佹尝鍐欏瓧妤肩綉"); + SOURCE_MAP.put("smfdc.com.cn", "涓夋槑甯傛埧鍦颁骇淇℃伅缃�"); + SOURCE_MAP.put("danxia.com", "涓归湠缃�"); + SOURCE_MAP.put("http://www.xmdfc.com/loupan/", "閼摥杈炬埧浜х綉"); + SOURCE_MAP.put("yipu.com.cn", "鏄撻摵缃�"); + SOURCE_MAP.put("shenyangoffice.com", "娌堥槼鍐欏瓧妤�"); + SOURCE_MAP.put("cbd86.com", "CBD鍐欏瓧妤肩綉"); + SOURCE_MAP.put("3qhouse.com", "涓夌Е鎴夸骇缃�"); + SOURCE_MAP.put("cnool.net", "涓滄柟鐑嚎"); + SOURCE_MAP.put("jafcj.com", "鍏畨甯傞噾瀹夊尯鎴垮湴浜х鐞嗗眬"); + SOURCE_MAP.put("jafcj.com", "鍏畨甯傞噾瀹夊尯鎴垮湴浜х鐞嗗眬"); + SOURCE_MAP.put("ahhqfdc.cn", "闇嶉偙鍘匡紙鍏畨涓嬭緰鍘匡級鎴垮湴浜х鐞嗗眬"); + SOURCE_MAP.put("luan.gov.cn", "鍏畨甯備綇鎴垮拰鍩庝埂寤鸿濮斿憳浼�"); + SOURCE_MAP.put("ahjzfdc.cn", "閲戝鍘匡紙鍏畨甯備笅杈栧幙锛夋埧鍦颁骇绠$悊灞�"); + SOURCE_MAP.put("024cbd.com", "娌堥槼鍐欏瓧妤肩綉"); + SOURCE_MAP.put("0532office.com", "闈掑矝鍐欏瓧妤肩綉"); + SOURCE_MAP.put("0731fdc.com", "0731鏂版埧缃�"); + SOURCE_MAP.put("taofang.com", "娣樻埧缃�"); + SOURCE_MAP.put("jiwu.com", "鍚夊眿缃�"); + SOURCE_MAP.put("028cbd.com", "鎴愰兘鍐欏瓧妤肩綉028cbd"); + SOURCE_MAP.put("pcestate.com", "澶钩娲嬫埧浜х綉"); + SOURCE_MAP.put("cqoffice.net", "閲嶅簡鍐欏瓧妤肩綉cqoffice"); + SOURCE_MAP.put("5asydc.com", "鍟嗕笟鍦颁骇缃�"); + SOURCE_MAP.put("5acbd.com", "5A鍟嗙敤鍦颁骇"); + SOURCE_MAP.put("5cbd.com", "浜旀槦鍐欏瓧妤肩綉"); + SOURCE_MAP.put("5sw.com", "浜旀槦缃�"); + SOURCE_MAP.put("uban.com", "浼樺姙"); + SOURCE_MAP.put("2boss.cn", "鍏斿崥澹�"); + SOURCE_MAP.put("rc100.cn", "鑽e煄缃�"); + SOURCE_MAP.put("jiu6.com", "鏃х綉"); + SOURCE_MAP.put("liyhy.com", "婧ч槼鏄婁笟鎴夸骇"); + SOURCE_MAP.put("hrb88.com", "鍢夊悏浜屾墜鎴跨綉"); + SOURCE_MAP.put("xhj.com", "鏂扮幆澧冩埧灞嬬綉"); + SOURCE_MAP.put("juhaof.com", "鑱氬ソ鎴�"); + SOURCE_MAP.put("jjjaaa.com", "瀹惰繛瀹�"); + SOURCE_MAP.put("stfc118.com", "姹曞ご鎴夸骇鍦ㄧ嚎"); + SOURCE_MAP.put("bdzfw.net", "淇濆畾鎵炬埧缃�"); + SOURCE_MAP.put("bxfcw.net", "婧埧缃�"); + SOURCE_MAP.put("bxydt.com", "鏈邯鎴垮惂"); + SOURCE_MAP.put("pdshouse.com", "骞抽《灞辨埧浜�"); + SOURCE_MAP.put("0830360.com", "娉稿窞鎴夸骇缃�"); + SOURCE_MAP.put("chengdechina.com", "鎵垮痉鎴夸骇"); + SOURCE_MAP.put("zisai2.com", "绱鎴夸骇缃�"); + SOURCE_MAP.put("shoufang123.com", "蹇诲窞鍞埧缃�"); + SOURCE_MAP.put("xzhfy.com", "蹇诲窞濂芥埧缂�"); + SOURCE_MAP.put("0701fdc.com", "楣版江鎴垮湴浜ц仈鍚堢綉"); + SOURCE_MAP.put("yt99.com", "涔呬箙淇℃伅缃�"); + SOURCE_MAP.put("bfqfc.com", "鐧惧瘜鍕ゆ埧浜�"); + SOURCE_MAP.put("fooww.com", "鎴垮眿缃�"); + SOURCE_MAP.put("0874114.cn", "鏇查潠渚挎皯缃�"); + SOURCE_MAP.put("qjfdc.cn", "鏇查潠鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("gz162.com", "璐靛窞鎴夸骇鍦ㄧ嚎"); + SOURCE_MAP.put("hdzc.net", "閭兏涔嬬獥"); + SOURCE_MAP.put("qhdfcjj.com", "绉︾殗宀涙埧浜у灞呯綉"); + SOURCE_MAP.put("wfhouse.com", "娼嶅潑鎴垮湴浜х綉"); + SOURCE_MAP.put("daomin.net", "绉︾殗宀涘矝姘戠綉"); + SOURCE_MAP.put("qhd.com.cn", "绉︾殗宀涗俊鎭腐"); + SOURCE_MAP.put("qhd678.com", "绉︾殗宀涘ぇ浼椾俊鎭腐"); + SOURCE_MAP.put("whfdcw.com", "濞佹捣鎴垮湴浜�"); + SOURCE_MAP.put("weihaifangchan.cn", "濞佹捣鎴夸骇鍥㈣喘缃�"); + SOURCE_MAP.put("house-wh.com", "濞佹捣鎴夸骇鍦ㄧ嚎"); + SOURCE_MAP.put("pjfdc.com", "鐩橀敠鎴垮湴浜х綉"); + SOURCE_MAP.put("0427.com", "浜掕仈鐩橀敠"); + SOURCE_MAP.put("pjfyw.com", "鐩橀敠鎴挎簮缃�"); + SOURCE_MAP.put("0714.yy.cm", "榛勭煶鎴夸骇缃�"); + SOURCE_MAP.put("cuwall.com", "鎴夸骇鍦ㄧ嚎"); + SOURCE_MAP.put("daloupan.com", "澶фゼ鐩�"); + SOURCE_MAP.put("0775fw.com", "璐靛眳缃�"); + SOURCE_MAP.put("wanhao2008.com", "娓╁窞鐑嚎"); + SOURCE_MAP.put("zaozhuangloushi.com", "鏋e簞妤煎競"); + SOURCE_MAP.put("laiwuloushi.com", "鑾辫姕妤煎競"); + SOURCE_MAP.put("dayou123.com", "瀹濋浮鎴夸骇"); + SOURCE_MAP.put("yingtanol.com", "楣版江缃�"); + SOURCE_MAP.put("88fw.com", "榛勭煶鎴愬姛鎴夸骇缃�"); + SOURCE_MAP.put("edfdc.com", "鏈夊眳缃�"); + SOURCE_MAP.put("hsren.com", "榛勭煶鐑嚎"); + SOURCE_MAP.put("hsfc.net.cn", "榛勭煶鎴夸骇缃慱hsfc"); + SOURCE_MAP.put("zn.cn", "鎸囧崡缃�"); + SOURCE_MAP.put("zaihuangshi.com", "榛勭煶鐢熸椿缃�"); + SOURCE_MAP.put("zzleju.com", "涔愬眳缃�"); + SOURCE_MAP.put("sqdyr.com", "澶╂按缃�"); + SOURCE_MAP.put("0793fcw.com", "涓婇ザ鎴夸骇缃�"); + SOURCE_MAP.put("b0917.com", "瀹濋浮淇℃伅娓�"); + SOURCE_MAP.put("ptdfc.com", "骞虫江鎴夸骇缃�"); + SOURCE_MAP.put("ptfcxx.com", "骞虫江鎴夸骇缃慶xx"); + SOURCE_MAP.put("bb365.cc", "铓屽煚缃�"); + SOURCE_MAP.put("bzgd.com", "宸翠腑鎴夸骇"); + SOURCE_MAP.put("bzml.com", "宸翠腑鎴夸骇缃慴zml"); SOURCE_MAP.put("house0562.com", "house0562"); - SOURCE_MAP.put("0763888.com", "清远生活网"); - SOURCE_MAP.put("bbs0763.com", "清远房产网"); - SOURCE_MAP.put("qy-house.com", "清远家园"); - SOURCE_MAP.put("0701ba.com", "中国鹰潭"); - SOURCE_MAP.put("0936.co", "张掖在线"); - SOURCE_MAP.put("juranhouse.com", "张掖房地产网"); - SOURCE_MAP.put("lowlo.cn", "楼外楼网"); - SOURCE_MAP.put("315fangchan.com", "315房产网"); - SOURCE_MAP.put("zbhouse.com.cn", "淄博房产在线"); - SOURCE_MAP.put("zailinyi.com", "在临沂"); - SOURCE_MAP.put("ksfdc.com.cn", "昆山房产网_ksfdc"); - SOURCE_MAP.put("lwhouse.com", "莱芜房地产网"); - SOURCE_MAP.put("zzfcw.com", "枣庄房产网"); - SOURCE_MAP.put("0701fc.com", "鹰潭房产网0701fc"); - SOURCE_MAP.put("zhuzhouwang.com", "株洲网"); - SOURCE_MAP.put("hynews.org", "河源新闻网"); - SOURCE_MAP.put("fs0762.com", "房视网"); - SOURCE_MAP.put("yingkoufangchan.com", "营口房产"); - SOURCE_MAP.put("xxgfw.cn", "新乡购房者"); - SOURCE_MAP.put("xxhaofang.com", "新乡好房网"); - SOURCE_MAP.put("0732fc.net", "湘潭房地产综合网"); - SOURCE_MAP.put("sd.cn", "青岛房产在线"); - SOURCE_MAP.put("ztinfo.com", "鹤都网"); - SOURCE_MAP.put("ynju.com", "聚云南"); - SOURCE_MAP.put("aksfang.com", "阿克苏fang网"); - SOURCE_MAP.put("mdjfcw.cn", "第1房产"); - SOURCE_MAP.put("yingtanol.com", "鹰潭网"); - SOURCE_MAP.put("24yt.com", "合众鹰潭"); - SOURCE_MAP.put("tjzz.com.cn", "天津住宅网"); - SOURCE_MAP.put("zpfdc.com", "邹平房产网"); - SOURCE_MAP.put("d2d.cn", "重庆房产网"); - SOURCE_MAP.put("023cqfc.com", "重庆房产"); - SOURCE_MAP.put("henanfdc.com", "河南房产网"); - SOURCE_MAP.put("ycfczc.com", "邳优房产网"); - SOURCE_MAP.put("kunshan0512.com", "昆山诺亚地产网"); - SOURCE_MAP.put("nc118.com", "南昌118搜房网"); - SOURCE_MAP.put("dqt.com.cn", "大庆油田信息港"); - SOURCE_MAP.put("haowu.cn", "好屋中国"); - SOURCE_MAP.put("fcesd.com", "房网通"); - SOURCE_MAP.put("eebest.com", "一贝网"); - SOURCE_MAP.put("nb19.com", "宁波租房网"); - SOURCE_MAP.put("zcfk.cn", "增城房客网"); - SOURCE_MAP.put("changchunfangdichan.com", "长春房地产网"); - SOURCE_MAP.put("wlfce.com", "温岭房产网"); - SOURCE_MAP.put("bieshuwang.com", "别墅网"); - SOURCE_MAP.put("pefczx.com", "普洱房产咨询网"); - SOURCE_MAP.put("wxfcw.com", "无锡房产网_wxfcw"); - SOURCE_MAP.put("zc173.com", "增城家园"); - SOURCE_MAP.put("fzfc.com.cn", "福州房产网"); - SOURCE_MAP.put("yydushi.com", "余姚房产_yydushi"); - SOURCE_MAP.put("buscx.cn", "鹤岗分类信息网"); - SOURCE_MAP.put("cz616.com", "崇左百事通"); - SOURCE_MAP.put("chongzuobbs.com", "崇左网"); - SOURCE_MAP.put("b2z.cn", "黑河信息港"); - SOURCE_MAP.put("0464.net.cn", "0464信息网"); - SOURCE_MAP.put("snefw.com", "遂宁房网"); - SOURCE_MAP.put("0797fdc.net", "赣州房产在线"); - SOURCE_MAP.put("mdjlife.com", "牡丹江生活网"); - SOURCE_MAP.put("fdc518.com", "第一房产"); - SOURCE_MAP.put("e0757.cn", "佛山房产网"); - SOURCE_MAP.put("99fj.com", "点房网"); - SOURCE_MAP.put("qitaihe8.com", "七台河二手房"); - SOURCE_MAP.put("jfw360.com", "佳房网"); - SOURCE_MAP.put("sgmsw.cn", "韶关民声网"); - SOURCE_MAP.put("jjxw.cn", "大九江房产网"); - SOURCE_MAP.put("shangdu.com", "焦作信息港"); - SOURCE_MAP.put("cnwzfc.com", "温州房产网_cnwzfc"); - SOURCE_MAP.put("wbyj.com.cn", "晚报易家"); - SOURCE_MAP.put("0792fcw.com", "九江房产网"); - SOURCE_MAP.put("loupanwang.com", "露盼网"); - SOURCE_MAP.put("fc577.com", "温州购房网"); - SOURCE_MAP.put("yongzhou.com", "永州网"); - SOURCE_MAP.put("0738.cc", "0738信息港"); - SOURCE_MAP.put("meyfang.com", "米房网"); - SOURCE_MAP.put("xianning.com", "咸宁网"); - SOURCE_MAP.put("xzfc.net", "516房产"); - SOURCE_MAP.put("jilinfc.com", "房产之家"); - SOURCE_MAP.put("jldsw.com", "吉林市房产网"); - SOURCE_MAP.put("0467w.com", "鸡西网"); - SOURCE_MAP.put("xnfcsc.com", "西宁房产网"); - SOURCE_MAP.put("0951house.com", "银川房产网"); - SOURCE_MAP.put("ycxpy.com", "麦吉屋"); - SOURCE_MAP.put("czsfdcw.com", "常州市房地产网"); - SOURCE_MAP.put("02fw.com", "常熟二手房"); - SOURCE_MAP.put("bhsfdc.com", "北海房产网"); - SOURCE_MAP.put("lijiangfc.com", "丽江房产网"); - SOURCE_MAP.put("ljsoufang.com", "丽江搜房"); - SOURCE_MAP.put("ljfdc.cn", "丽江房地产信息网"); - SOURCE_MAP.put("ljfw.com", "丽江房产网_ljfw"); - SOURCE_MAP.put("lijiangdc.com", "居安房地产"); - SOURCE_MAP.put("xxloushi.com", "新乡楼市"); - SOURCE_MAP.put("yynews.com.cn", "余姚新闻网"); - SOURCE_MAP.put("ynpew.com", "云南普洱网"); - SOURCE_MAP.put("nhsky.com", "宁海房产热线"); - SOURCE_MAP.put("jmsfcw.cn", "佳木斯房产网"); - SOURCE_MAP.put("haifangw.com", "海房网"); - SOURCE_MAP.put("0898fcw.cn", "海南房产网_0898fcw"); - SOURCE_MAP.put("lyw.cc", "洛阳城"); - SOURCE_MAP.put("0379fcw.com", "洛阳房产_0379fcw"); - SOURCE_MAP.put("lyhcfc.com", "海川房产"); - SOURCE_MAP.put("shangdu.com", "洛阳信息港"); - SOURCE_MAP.put("0467w.com", "鸡西网"); - SOURCE_MAP.put("zhoukou.haofung.com", "周口好房网"); - SOURCE_MAP.put("dzloupan.cn", "达州楼盘网"); - SOURCE_MAP.put("dzfc.cn", "达州房产"); - SOURCE_MAP.put("0469.cn", "双鸭山热线"); - SOURCE_MAP.put("i0469.com", "双鸭山在线"); - SOURCE_MAP.put("chaozhou.ccoo.cn", "潮州在线"); - SOURCE_MAP.put("571888.com", "余姚房产信息"); - SOURCE_MAP.put("lyhome.com", "洛阳房产网_lyhome"); - SOURCE_MAP.put("hljxxg.com", "鹤岗信息网"); - SOURCE_MAP.put("0574yye.com", "余姚房产"); - SOURCE_MAP.put("cs090.com", "零距离房产"); - SOURCE_MAP.put("ycls.cn", "虞城楼市"); - SOURCE_MAP.put("dz090.com", "达州都市网"); - SOURCE_MAP.put("daqin029.com", "大秦咸阳网"); - SOURCE_MAP.put("sanqinfang.com", "三秦房"); - SOURCE_MAP.put("lejufc.com", "乐居房产"); - SOURCE_MAP.put("jieyangzf.com", "揭阳房产信息网"); - SOURCE_MAP.put("sanyagf.com", "三亚购房者"); - SOURCE_MAP.put("dazhou.cc", "达州生活网dazhou"); - SOURCE_MAP.put("d0898.com", "三亚房产网_d0898"); - SOURCE_MAP.put("dahainan.com", "亚房网"); - SOURCE_MAP.put("smxloushi.com", "三门峡楼市"); - SOURCE_MAP.put("ybfc.cn", "宜宾房产网"); - SOURCE_MAP.put("ybbbs.net", "宜宾房产网_ybbbs"); - SOURCE_MAP.put("dzroom.com", "达州租房网"); - SOURCE_MAP.put("smxhaofang.com", "三门峡好房网"); - SOURCE_MAP.put("379fcw.com", "379房产网"); - SOURCE_MAP.put("0469xxw.com", "双鸭山信息网"); - SOURCE_MAP.put("0469vip.com", "双鸭山百姓网"); - SOURCE_MAP.put("hellozb.com", "淄房网"); - SOURCE_MAP.put("fangchanbang.com", "房产帮"); - SOURCE_MAP.put("521qz.com", "钦民网"); - SOURCE_MAP.put("0543.com", "0543滨州网"); - SOURCE_MAP.put("bzcm.net", "滨州传媒"); - SOURCE_MAP.put("365kl.net", "快乐房产"); - SOURCE_MAP.put("jj831.com", "金江网"); - SOURCE_MAP.put("ybfdcw.com", "宜宾房地产网_ybfdcw"); - SOURCE_MAP.put("ptfc123.com", "莆田房产"); - SOURCE_MAP.put("qz828.com", "衢州新闻网"); - SOURCE_MAP.put("0579f.com", "浙中房网"); - SOURCE_MAP.put("591fw.com", "金华591房产网"); - SOURCE_MAP.put("zg163.net", "自贡房地产"); - SOURCE_MAP.put("house018.com", "衢州房网"); - SOURCE_MAP.put("qzdcfc.com", "大成房产"); - SOURCE_MAP.put("0572hu.com", "住在湖州网"); - SOURCE_MAP.put("yzfc123.com", "扬州房产"); - SOURCE_MAP.put("yzloupan.com", "扬州楼盘网"); - SOURCE_MAP.put("newzj.net", "新镇江"); - SOURCE_MAP.put("qfdm.gov.cn", "江门房产网"); - SOURCE_MAP.put("jmnews.com.cn", "江门楼市网"); - SOURCE_MAP.put("0750f.com", "江房网"); - SOURCE_MAP.put("yfcw.cn", "盐城房产网_yfcw"); - SOURCE_MAP.put("09fc.com", "第九区房产网"); - SOURCE_MAP.put("ecz.cn", "易房网ecz"); - SOURCE_MAP.put("19lou.com", "19楼"); - SOURCE_MAP.put("jtfdc.com.cn", "金坛房地产信息网"); - SOURCE_MAP.put("pt-house.com", "莆田联合房产网"); - SOURCE_MAP.put("pthouse.com.cn", "莆田房地产联合网"); - SOURCE_MAP.put("ptfcxxw.com", "莆田房产信息网_ptfcxxw"); - SOURCE_MAP.put("ptwcfc.com", "万城房产网"); - SOURCE_MAP.put("9maifang.cn", "玖麦房产网"); - SOURCE_MAP.put("cixiw.com", "慈溪房产在线"); - SOURCE_MAP.put("guanhaiwei.com", "慈溪房产网"); - SOURCE_MAP.put("0483.ccoo.cn", "阿拉善在线"); - SOURCE_MAP.put("tlfc.cn", "通辽房产网"); - SOURCE_MAP.put("360fc.com.cn", "360房产"); - SOURCE_MAP.put("ejo.cc", "易就房产网"); - SOURCE_MAP.put("yantailoupan.com", "烟台楼盘网"); - SOURCE_MAP.put("razyfc.com", "瑞安房网"); - SOURCE_MAP.put("auouo.com", "瑞安生活网"); - SOURCE_MAP.put("yantaihouse.net", "烟台房产热线"); - SOURCE_MAP.put("dgmfw.com", "莞民网"); - SOURCE_MAP.put("e0570.com", "衢州热线"); - SOURCE_MAP.put("yz2shou.com", "扬州二手网"); - SOURCE_MAP.put("tt919.com", "当家网"); - SOURCE_MAP.put("fs.cc", "佛山房产网_fs"); - SOURCE_MAP.put("ycfcw.com", "盐城房产网_ycfcw"); - SOURCE_MAP.put("jx8588.com", "嘉兴房产网_jx8588"); - SOURCE_MAP.put("qithf.cn", "七台河房产网(QTH)"); - SOURCE_MAP.put("suihuawang.com", "绥化网"); - SOURCE_MAP.put("lefang365.com", "贵港乐房网"); - SOURCE_MAP.put("ybvv.cn", "宜宾房地产网"); - SOURCE_MAP.put("pyzhufang.com", "濮阳住房网"); - SOURCE_MAP.put("pt594.com", "莆田房产网"); - SOURCE_MAP.put("ptfcw.com", "莆田房产网_ptfcw"); - SOURCE_MAP.put("0515fc.com", "盐城房产网_0515fc"); - SOURCE_MAP.put("fclm.cn", "房产联盟"); - SOURCE_MAP.put("lefang365.com", "贵港乐房网"); - SOURCE_MAP.put("yq918.com", "阳泉家园网"); - SOURCE_MAP.put("cxnews.cn", "慈溪房产家居网"); - SOURCE_MAP.put("0757.cn", "佛山信息港"); - SOURCE_MAP.put("114haihui.com", "海汇房产"); - SOURCE_MAP.put("kunming.cn", "昆明信息港"); - SOURCE_MAP.put("km185.com", "昆明房网"); - SOURCE_MAP.put("qzfb.net", "泉州房吧"); - SOURCE_MAP.put("mxun.com", "麦讯网"); - SOURCE_MAP.put("nhfdcw.com", "宁海房地产网"); - SOURCE_MAP.put("nhfcrx.com", "宁海房产热线_nhfcrx"); - SOURCE_MAP.put("168house.cn", "吴江房产信息网"); - SOURCE_MAP.put("wjhao.com", "吴江房产网_wjhao"); - SOURCE_MAP.put("wjgfw.com", "吴江购房网"); - SOURCE_MAP.put("dxal.cn", "网上中介"); - SOURCE_MAP.put("yuntaodu.com", "云陶都房产网"); - SOURCE_MAP.put("834700.com.cn", "塔城在线"); - SOURCE_MAP.put("tc175.com", "塔城一起玩"); - SOURCE_MAP.put("rmfcw.cn", "宜兴人民房产"); - SOURCE_MAP.put("yxfccs.com", "宜兴房产超市网"); - SOURCE_MAP.put("gmfcw.cn", "高密房产网gmfcw.cn"); - SOURCE_MAP.put("cixi.cn", "慈溪房地产网"); - SOURCE_MAP.put("dzwj.com.cn", "达州蜗居网"); - SOURCE_MAP.put("sqloushi.com", "商丘楼市"); - SOURCE_MAP.put("0455.sh.cn", "绥化信息港(SH)"); - SOURCE_MAP.put("ruifc.cn", "瑞安房产网_ruifc"); - SOURCE_MAP.put("fang.xjks.net", "喀什房产网"); - SOURCE_MAP.put("zqfdc.net", "肇庆房地产网"); - SOURCE_MAP.put("cnyw.net", "热房网"); - SOURCE_MAP.put("zxip.com", "慈溪房产网_xip"); - SOURCE_MAP.put("0858f.com", "六盘水房产网_0858f"); - SOURCE_MAP.put("0577dc.com", "温州楼市"); - SOURCE_MAP.put("xscfc.com", "新视窗房产"); - SOURCE_MAP.put("zyloushi.com", "中原楼市网"); - SOURCE_MAP.put("jl.cn", "吉林市信息港"); - SOURCE_MAP.put("czzf.com", "常州住房"); - SOURCE_MAP.put("weifangloushi.com", "潍坊楼市"); - SOURCE_MAP.put("luoyanghf.com", "洛阳好房网"); - SOURCE_MAP.put("cxfccs.com", "慈溪房产网_cxfccs"); - SOURCE_MAP.put("zqlos.com", "肈庆楼市"); - SOURCE_MAP.put("0393fc.cn", "0393房产网"); - SOURCE_MAP.put("ezhfc.cn", "鄂州房产网ezhfc"); - SOURCE_MAP.put("nhnews.com.cn", "宁海房市"); - SOURCE_MAP.put("300fc.com", "鄂州房产网300fc"); - SOURCE_MAP.put("ezhou.com", "鄂州网"); - SOURCE_MAP.put("0359sh.com", "生活网"); - SOURCE_MAP.put("0711ez.cn", "鄂州房产网0711ez"); - SOURCE_MAP.put("tcsw.cn", "肇庆房地产"); - SOURCE_MAP.put("ayinfo.cn", "安阳房产网"); - SOURCE_MAP.put("0372fdc.com", "安阳房地产网"); - SOURCE_MAP.put("fdc0518.com", "连云港房产百事通"); - SOURCE_MAP.put("0518gfw.com", "连云港购房网"); - SOURCE_MAP.put("masf.cn", "马鞍山房产网"); - SOURCE_MAP.put("ym234.com", "易马网"); - SOURCE_MAP.put("baidu0413.com", "抚顺好房子"); - SOURCE_MAP.put("sluof.cn", "商洛房产网sluof"); - SOURCE_MAP.put("xunju.net", "抚顺寻居房产网"); - SOURCE_MAP.put("lnfs.cn", "抚顺信息网"); - SOURCE_MAP.put("fabu8.cn", "烟台发布吧"); - SOURCE_MAP.put("huaibeifangchan.com", "淮北房产网hbfc"); - SOURCE_MAP.put("0414aj.com", "本溪爱家房产网"); - SOURCE_MAP.put("dqfc114.com", "大庆房产信息网"); - SOURCE_MAP.put("tzfy.cn", "台州房源网"); - SOURCE_MAP.put("ipzh.cn", "爱尚花城网"); - SOURCE_MAP.put("honghe01.com", "红河"); - SOURCE_MAP.put("0435.com", "通化在线"); - SOURCE_MAP.put("0778fang.com", "河池房网"); - SOURCE_MAP.put("gxhc365.com", "河池365"); - SOURCE_MAP.put("xjhouse.cn", "新疆房产网xjhouse"); - SOURCE_MAP.put("0318ol.com", "衡水在线"); - SOURCE_MAP.put("xinhs.com", "衡水信息港"); - SOURCE_MAP.put("gooddt.com", "都市信息"); - SOURCE_MAP.put("458000.com", "鹤壁信息港"); - SOURCE_MAP.put("fc392.com", "鹤壁房产网fc392"); - SOURCE_MAP.put("tzzufang.com", "泰州房产网"); - SOURCE_MAP.put("ty7.cn", "泰州楼市"); - SOURCE_MAP.put("tzfcxx.com", "泰州房产信息网"); - SOURCE_MAP.put("huizhou.cn", "今日惠州网"); - SOURCE_MAP.put("southfang.com", "南方房产网"); - SOURCE_MAP.put("l8.com.cn", "隆塬地产"); - SOURCE_MAP.put("0759fdc.com", "湛江房产网"); - SOURCE_MAP.put("kuf.cn", "湛江酷房网"); - SOURCE_MAP.put("hnzzfc.com", "株洲房产网"); - SOURCE_MAP.put("zzxfdc.com", "株洲县房地产网"); - SOURCE_MAP.put("hyfcw.com", "衡阳房产网"); - SOURCE_MAP.put("nethy8.com", "衡阳房产网_nethy8"); - SOURCE_MAP.put("0734hysfc.com", "衡阳房产网_0734hysfc"); - SOURCE_MAP.put("e0734.com", "中国衡阳新闻网"); - SOURCE_MAP.put("hysfcw.com", "衡阳市房产网"); - SOURCE_MAP.put("ychaofang.com", "宜昌好房网"); - SOURCE_MAP.put("e0717.net", "宜昌房产网_e0717"); - SOURCE_MAP.put("afz.cc", "爱房站"); - SOURCE_MAP.put("ywjlfc.com.cn", "蛟龙房产网"); - SOURCE_MAP.put("ywhhfc.com", "义乌火红房产"); - SOURCE_MAP.put("ylfct.com", "房产网_ylfct"); - SOURCE_MAP.put("housegx.cn", "玉贵网"); - SOURCE_MAP.put("717.so", "房产乐园"); - SOURCE_MAP.put("0315dg.com", "唐山房产网"); - SOURCE_MAP.put("tszp.com", "唐山房网"); - SOURCE_MAP.put("0710fz.com", "襄阳房产网"); - SOURCE_MAP.put("0710.com", "襄阳0710网"); - SOURCE_MAP.put("0270710.com", "0710襄阳房产网"); - SOURCE_MAP.put("jinxiangyang.com", "襄阳分类信息网"); - SOURCE_MAP.put("0527lsw.com", "宿迁楼市网"); - SOURCE_MAP.put("0527c.net", "宿迁房产网_0527c"); - SOURCE_MAP.put("0527fc.com", "宿迁房产网_0527fc"); - SOURCE_MAP.put("sqhouse.cn", "宿迁房地产网"); - SOURCE_MAP.put("114b2c.com", "宿迁房产网_114b2c"); - SOURCE_MAP.put("sqfczx.cc", "宿迁房产网_sqfczx"); - SOURCE_MAP.put("mmfc.cc", "茂名房产"); - SOURCE_MAP.put("gdmmfdc.com", "茂名房地产信息网"); - SOURCE_MAP.put("230668.com", "茂名房产网"); - SOURCE_MAP.put("mmxfw.com", "茂名寻房网"); - SOURCE_MAP.put("scol.com.cn", "四川在线"); - SOURCE_MAP.put("ehomeday.com", "房之窗"); - SOURCE_MAP.put("fczm.com", "房产之门"); - SOURCE_MAP.put("o.cn", "都市圈房产"); - SOURCE_MAP.put("csfcw.com", "常熟房产网"); - SOURCE_MAP.put("fsfcw.net", "抚顺房产网fsfcw"); - SOURCE_MAP.put("fsfcxxw.com", "抚顺房产信息网"); - SOURCE_MAP.put("fayo.net", "飞扬网"); - SOURCE_MAP.put("lyfcw.cn", "溧阳房产信息网"); - SOURCE_MAP.put("sqdyf.com", "商丘第一房"); - SOURCE_MAP.put("cshfc.cn", "常熟房产网_cshfc"); - SOURCE_MAP.put("07353.com", "郴州房产网"); - SOURCE_MAP.put("tzfdctv.com", "台州百联房产网"); - SOURCE_MAP.put("52fangzi.com", "北京写字楼网_52fangzi"); - SOURCE_MAP.put("52fangzi.com", "北京写字楼网_52fangzi"); - SOURCE_MAP.put("ruian.com", "瑞安论坛"); - SOURCE_MAP.put("wjhouses.com", "吴江房产信息港"); - SOURCE_MAP.put("wjshw.com", "吴江房产信息网_wjshw"); - SOURCE_MAP.put("wjfcw.com", "吴江房产网_wjfcw"); - SOURCE_MAP.put("wjls.com.cn", "吴江楼市网"); - SOURCE_MAP.put("spgdfc.com", "四平房产网spgdfc"); - SOURCE_MAP.put("lesohome.com", "乐搜房产网"); - SOURCE_MAP.put("yaxf0911.com", "延安房产信息网"); - SOURCE_MAP.put("ytfdcw.net", "烟台房地产_ytfdcw"); - SOURCE_MAP.put("altmhw.com", "阿勒泰门户网"); - SOURCE_MAP.put("053000.com", "衡水房产网053000"); - SOURCE_MAP.put("tdfcw.com", "陶都房产网"); - SOURCE_MAP.put("hzcom.cn", "惠州房产"); - SOURCE_MAP.put("hnzz.cc", "株洲楼市网"); - SOURCE_MAP.put("fc0734.com", "衡阳红房"); - SOURCE_MAP.put("0734f.com", "衡阳二手房"); - SOURCE_MAP.put("bm0392.com", "鹤壁便民网"); - SOURCE_MAP.put("ljhouse.cn", "丽江房网"); - SOURCE_MAP.put("ljfw.com.cn", "丽江房网_ljfw"); - SOURCE_MAP.put("jzfdcxxw.cn", "焦作房信网"); - SOURCE_MAP.put("93fcw.com", "宁德房产网"); - SOURCE_MAP.put("hccun.com", "河池生活网"); - SOURCE_MAP.put("yxfcw.cn", "宜兴房产网_yxfcw"); - SOURCE_MAP.put("yinsha.com", "银沙房产网"); - SOURCE_MAP.put("hitlf.com", "火洲热线"); - SOURCE_MAP.put("i0995.com", "吐鲁番信息网"); - SOURCE_MAP.put("hao0903.com", "和田门户网"); - SOURCE_MAP.put("kunmingfdc.com", "昆明房地产网"); - SOURCE_MAP.put("ylxw.com.cn/", "伊犁房产"); - SOURCE_MAP.put("kmhouses.com", "昆明房地产信息网"); - SOURCE_MAP.put("ihami.cn", "爱哈密网"); - SOURCE_MAP.put("ayfdc.com", "安阳住宅与房地产信息网"); - SOURCE_MAP.put("qzpp.com", "泉州房产交易网"); - SOURCE_MAP.put("0594.com", "甫房网"); - SOURCE_MAP.put("0594.com", "甫房网"); - SOURCE_MAP.put("hgd1.com", "鹤岗第一网"); - SOURCE_MAP.put("0795dcw.com", "宜春地产网"); - SOURCE_MAP.put("e0745.com", "怀化房产网e0745"); - SOURCE_MAP.put("0745f.com", "房地产信息网"); - SOURCE_MAP.put("hhjjfdc.com", "佳家地产"); - SOURCE_MAP.put("ashld.com", "葫芦岛门户网"); - SOURCE_MAP.put("hldkfw.com", "葫芦岛看房网"); - SOURCE_MAP.put("mytaofang.com", "淘房家居网"); - SOURCE_MAP.put("mytaofang.com", "淘房家居网"); - SOURCE_MAP.put("yx0429.com", "葫芦岛房地产超市网"); - SOURCE_MAP.put("yxfcw.com", "宜兴房地产网"); - SOURCE_MAP.put("stfcxx.com", "汕头房产信息网"); - SOURCE_MAP.put("hamiw.com", "哈密都市网"); - SOURCE_MAP.put("0756fang.com", "真房网"); - SOURCE_MAP.put("wlfcw.com", "温岭房产信息网"); - SOURCE_MAP.put("fangnmg.com", "内蒙古房地产信息网"); - SOURCE_MAP.put("ljwcom.com", "龙江网"); - SOURCE_MAP.put("0412aj.com", "鞍山爱家房产网"); - SOURCE_MAP.put("gogohome.com", "房产信息网"); - SOURCE_MAP.put("wlfcw.cn", "温岭房地产网_wlfcw"); - SOURCE_MAP.put("leyoujia.com", "乐有家"); - SOURCE_MAP.put("0470000.com", "呼伦贝尔生活网"); - SOURCE_MAP.put("jqwj.cc", "酒泉网聚"); - SOURCE_MAP.put("m937.com", "酒泉招贴"); - SOURCE_MAP.put("0902fc.com", "哈密房产网"); - SOURCE_MAP.put("0758fc.net", "肈庆房产网"); - SOURCE_MAP.put("zz.cc", "郑州房产网_zz"); - SOURCE_MAP.put("gz.cc", "广州房产网"); - SOURCE_MAP.put("anhuinews.com", "中安房产网"); - SOURCE_MAP.put("fcxxw.com", "房产信息网_fcxxw"); - SOURCE_MAP.put("weiduqu.com", "许昌房产信息网"); - SOURCE_MAP.put("0452m.com", "齐齐哈尔房产网"); - SOURCE_MAP.put("0452sh.com", "齐齐哈尔生活网"); - SOURCE_MAP.put("gotoip1.com", "四平房产网"); - SOURCE_MAP.put("hzfjw.com", "汉中房产交易资讯网"); - SOURCE_MAP.put("0839fc.com", "广元房产网"); - SOURCE_MAP.put("0932fdc.com", "定西房产网"); - SOURCE_MAP.put("zunyifang.cn", "遵义房产网zunyifang"); - SOURCE_MAP.put("ankang.net", "安康房产网"); - SOURCE_MAP.put("akfang.com", "安康房地产门户网"); - SOURCE_MAP.put("0454.com", "佳木斯三江网"); - SOURCE_MAP.put("tainfo.net", "泰安信息港"); - SOURCE_MAP.put("tc917.com", "泰安房产"); - SOURCE_MAP.put("taianhome.com", "泰安房产网"); - SOURCE_MAP.put("tianshuiinfo.cn", "天水信息网"); - SOURCE_MAP.put("730fc.com", "岳阳房产网"); - SOURCE_MAP.put("0730r.com", "爱家房产网"); - SOURCE_MAP.put("shhomeland.com", "绥化家园网"); - SOURCE_MAP.put("cnsuihua.net", "绥化信息港"); - SOURCE_MAP.put("qzfcw.com", "钦州房产网"); - SOURCE_MAP.put("wdfc.com.cn", "维度房产网"); - SOURCE_MAP.put("fcxgx.com", "房产新干线"); - SOURCE_MAP.put("0952fdc.com", "石嘴山房产网"); - SOURCE_MAP.put("0319f.com", "刑房网"); - SOURCE_MAP.put("ggfdc.com", "贵港房地产网"); - SOURCE_MAP.put("ywfc.net", "义乌房产网"); - SOURCE_MAP.put("15518.com", "幸福房产信息"); - SOURCE_MAP.put("hldinfo.net", "葫芦岛信息港"); - SOURCE_MAP.put("0470a.com", "呼伦贝尔火网"); - SOURCE_MAP.put("169l.com", "义乌房产"); - SOURCE_MAP.put("15fcw.com", "友好房产"); - SOURCE_MAP.put("jlfdc.net", "吉林房产网"); - SOURCE_MAP.put("0537fangchan.com", "济宁房产网0537"); - SOURCE_MAP.put("jninfo.net.cn", "济宁信息港"); - SOURCE_MAP.put("fangguagua.com", "房呱呱"); - SOURCE_MAP.put("zh-o.com", "珠海西区房产网"); - SOURCE_MAP.put("gd.cn", "珠海视窗搜房"); - SOURCE_MAP.put("0760dc.com", "中山房产网_0760dc"); - SOURCE_MAP.put("ccnnhouse.com", "中城房产网"); - SOURCE_MAP.put("zgfdc.net", "中山楼市"); - SOURCE_MAP.put("0760t.com", "中山租房网"); - SOURCE_MAP.put("zj.cn", "义乌信息网"); - SOURCE_MAP.put("houseyw.com", "香居房产"); - SOURCE_MAP.put("daqing.net", "大庆信息港"); - SOURCE_MAP.put("zh51home.com", "珠海房产之窗"); - SOURCE_MAP.put("ylfdc.com", "玉林房地产信息网"); - SOURCE_MAP.put("yulintimes.com", "玉林时代网"); - SOURCE_MAP.put("jiningxinxigang.com", "济宁信息港jnxxg"); - SOURCE_MAP.put("05376.com", "济宁信息网"); - SOURCE_MAP.put("jn234.com", "济宁新信息港"); - SOURCE_MAP.put("ms537.com", "民生信息"); - SOURCE_MAP.put("k0410.com", "看铁岭"); - SOURCE_MAP.put("tlxxb.com", "铁岭信息板"); - SOURCE_MAP.put("taian.com", "泰安网房产"); - SOURCE_MAP.put("yyfdcw.com", "岳阳房地产网"); - SOURCE_MAP.put("0475.cn", "通辽信息网"); - SOURCE_MAP.put("fx8888.com", "华博网"); - SOURCE_MAP.put("xft77.com", "小房童"); - SOURCE_MAP.put("tsloushi.com", "唐山楼市网"); - SOURCE_MAP.put("idc2008.com.cn", "泰安房产网tafc"); - SOURCE_MAP.put("0572.com", "0572房产网"); - SOURCE_MAP.put("taiwu.com", "太屋网"); - SOURCE_MAP.put("taiwu.com", "太屋网"); - SOURCE_MAP.put("sh.koofang.com", "上海酷房网"); - SOURCE_MAP.put("sh.koofang.com", "上海酷房网"); - SOURCE_MAP.put("jnfcw.com.cn", "济房网jnfcw"); - SOURCE_MAP.put("jzfc123.com", "晋中房产网jzfc123"); - SOURCE_MAP.put("woaixinjia.com", "新家网"); - SOURCE_MAP.put("364000.com", "龙岩网"); - SOURCE_MAP.put("fuling.com", "涪陵房产"); - SOURCE_MAP.put("shushifang.com", "舒适房网"); - SOURCE_MAP.put("tt5598.com", "汕头雅居网"); - SOURCE_MAP.put("0546fdc.com", "0546房产网"); - SOURCE_MAP.put("xcfc999.com", "薛城房产网"); - SOURCE_MAP.put("dinju.com", "定居网"); - SOURCE_MAP.put("stre.net", "汕头房地产信息网"); - SOURCE_MAP.put("0754ok.com", "房居网"); - SOURCE_MAP.put("my0668.com", "茂名房市网"); - SOURCE_MAP.put("zjghfw.com", "张家港好房网"); - SOURCE_MAP.put("0513.org", "濠滨房产"); - SOURCE_MAP.put("lyanf.cn", "龙岩房产网lyanf"); - SOURCE_MAP.put("597fcw.com", "龙岩房产网597fcw"); - SOURCE_MAP.put("lyfang.com", "龙岩搜房网"); - SOURCE_MAP.put("lhfc.cn", "漯河房产网lhfc"); - SOURCE_MAP.put("0395.tv", "漯房网"); - SOURCE_MAP.put("lhfdc.com", "漯河房产网lhfdc"); - SOURCE_MAP.put("luohejie.com", "漯河街"); - SOURCE_MAP.put("0395mf.com", "漯河买房网"); - SOURCE_MAP.put("lcfcj.com", "聊城房产交易网"); - SOURCE_MAP.put("lcfdcw.com", "聊城房地产网"); - SOURCE_MAP.put("ilcw.net", "聊城网"); - SOURCE_MAP.put("liaocheng.cc", "聊城信息港"); - SOURCE_MAP.put("liaochengfangchan.com", "聊城房产网lcfc"); - SOURCE_MAP.put("fc0832.com", "内江房产"); - SOURCE_MAP.put("njdsw.cn", "内江都市网"); - SOURCE_MAP.put("onzao.cn", "内江房产网onzao"); - SOURCE_MAP.put("njxinf.com", "内江新房产网"); - SOURCE_MAP.put("xnjhome.com", "新内江房产网"); + SOURCE_MAP.put("0763888.com", "娓呰繙鐢熸椿缃�"); + SOURCE_MAP.put("bbs0763.com", "娓呰繙鎴夸骇缃�"); + SOURCE_MAP.put("qy-house.com", "娓呰繙瀹跺洯"); + SOURCE_MAP.put("0701ba.com", "涓浗楣版江"); + SOURCE_MAP.put("0936.co", "寮犳帠鍦ㄧ嚎"); + SOURCE_MAP.put("juranhouse.com", "寮犳帠鎴垮湴浜х綉"); + SOURCE_MAP.put("lowlo.cn", "妤煎妤肩綉"); + SOURCE_MAP.put("315fangchan.com", "315鎴夸骇缃�"); + SOURCE_MAP.put("zbhouse.com.cn", "娣勫崥鎴夸骇鍦ㄧ嚎"); + SOURCE_MAP.put("zailinyi.com", "鍦ㄤ复娌�"); + SOURCE_MAP.put("ksfdc.com.cn", "鏄嗗北鎴夸骇缃慱ksfdc"); + SOURCE_MAP.put("lwhouse.com", "鑾辫姕鎴垮湴浜х綉"); + SOURCE_MAP.put("zzfcw.com", "鏋e簞鎴夸骇缃�"); + SOURCE_MAP.put("0701fc.com", "楣版江鎴夸骇缃�0701fc"); + SOURCE_MAP.put("zhuzhouwang.com", "鏍床缃�"); + SOURCE_MAP.put("hynews.org", "娌虫簮鏂伴椈缃�"); + SOURCE_MAP.put("fs0762.com", "鎴胯缃�"); + SOURCE_MAP.put("yingkoufangchan.com", "钀ュ彛鎴夸骇"); + SOURCE_MAP.put("xxgfw.cn", "鏂颁埂璐埧鑰�"); + SOURCE_MAP.put("xxhaofang.com", "鏂颁埂濂芥埧缃�"); + SOURCE_MAP.put("0732fc.net", "婀樻江鎴垮湴浜х患鍚堢綉"); + SOURCE_MAP.put("sd.cn", "闈掑矝鎴夸骇鍦ㄧ嚎"); + SOURCE_MAP.put("ztinfo.com", "楣ら兘缃�"); + SOURCE_MAP.put("ynju.com", "鑱氫簯鍗�"); + SOURCE_MAP.put("aksfang.com", "闃垮厠鑻廸ang缃�"); + SOURCE_MAP.put("mdjfcw.cn", "绗�1鎴夸骇"); + SOURCE_MAP.put("yingtanol.com", "楣版江缃�"); + SOURCE_MAP.put("24yt.com", "鍚堜紬楣版江"); + SOURCE_MAP.put("tjzz.com.cn", "澶╂触浣忓畢缃�"); + SOURCE_MAP.put("zpfdc.com", "閭瑰钩鎴夸骇缃�"); + SOURCE_MAP.put("d2d.cn", "閲嶅簡鎴夸骇缃�"); + SOURCE_MAP.put("023cqfc.com", "閲嶅簡鎴夸骇"); + SOURCE_MAP.put("henanfdc.com", "娌冲崡鎴夸骇缃�"); + SOURCE_MAP.put("ycfczc.com", "閭充紭鎴夸骇缃�"); + SOURCE_MAP.put("kunshan0512.com", "鏄嗗北璇轰簹鍦颁骇缃�"); + SOURCE_MAP.put("nc118.com", "鍗楁槍118鎼滄埧缃�"); + SOURCE_MAP.put("dqt.com.cn", "澶у簡娌圭敯淇℃伅娓�"); + SOURCE_MAP.put("haowu.cn", "濂藉眿涓浗"); + SOURCE_MAP.put("fcesd.com", "鎴跨綉閫�"); + SOURCE_MAP.put("eebest.com", "涓�璐濈綉"); + SOURCE_MAP.put("nb19.com", "瀹佹尝绉熸埧缃�"); + SOURCE_MAP.put("zcfk.cn", "澧炲煄鎴垮缃�"); + SOURCE_MAP.put("changchunfangdichan.com", "闀挎槬鎴垮湴浜х綉"); + SOURCE_MAP.put("wlfce.com", "娓╁箔鎴夸骇缃�"); + SOURCE_MAP.put("bieshuwang.com", "鍒缃�"); + SOURCE_MAP.put("pefczx.com", "鏅幢鎴夸骇鍜ㄨ缃�"); + SOURCE_MAP.put("wxfcw.com", "鏃犻敗鎴夸骇缃慱wxfcw"); + SOURCE_MAP.put("zc173.com", "澧炲煄瀹跺洯"); + SOURCE_MAP.put("fzfc.com.cn", "绂忓窞鎴夸骇缃�"); + SOURCE_MAP.put("yydushi.com", "浣欏鎴夸骇_yydushi"); + SOURCE_MAP.put("buscx.cn", "楣ゅ矖鍒嗙被淇℃伅缃�"); + SOURCE_MAP.put("cz616.com", "宕囧乏鐧句簨閫�"); + SOURCE_MAP.put("chongzuobbs.com", "宕囧乏缃�"); + SOURCE_MAP.put("b2z.cn", "榛戞渤淇℃伅娓�"); + SOURCE_MAP.put("0464.net.cn", "0464淇℃伅缃�"); + SOURCE_MAP.put("snefw.com", "閬傚畞鎴跨綉"); + SOURCE_MAP.put("0797fdc.net", "璧e窞鎴夸骇鍦ㄧ嚎"); + SOURCE_MAP.put("mdjlife.com", "鐗′腹姹熺敓娲荤綉"); + SOURCE_MAP.put("fdc518.com", "绗竴鎴夸骇"); + SOURCE_MAP.put("e0757.cn", "浣涘北鎴夸骇缃�"); + SOURCE_MAP.put("99fj.com", "鐐规埧缃�"); + SOURCE_MAP.put("qitaihe8.com", "涓冨彴娌充簩鎵嬫埧"); + SOURCE_MAP.put("jfw360.com", "浣虫埧缃�"); + SOURCE_MAP.put("sgmsw.cn", "闊跺叧姘戝0缃�"); + SOURCE_MAP.put("jjxw.cn", "澶т節姹熸埧浜х綉"); + SOURCE_MAP.put("shangdu.com", "鐒︿綔淇℃伅娓�"); + SOURCE_MAP.put("cnwzfc.com", "娓╁窞鎴夸骇缃慱cnwzfc"); + SOURCE_MAP.put("wbyj.com.cn", "鏅氭姤鏄撳"); + SOURCE_MAP.put("0792fcw.com", "涔濇睙鎴夸骇缃�"); + SOURCE_MAP.put("loupanwang.com", "闇茬浖缃�"); + SOURCE_MAP.put("fc577.com", "娓╁窞璐埧缃�"); + SOURCE_MAP.put("yongzhou.com", "姘稿窞缃�"); + SOURCE_MAP.put("0738.cc", "0738淇℃伅娓�"); + SOURCE_MAP.put("meyfang.com", "绫虫埧缃�"); + SOURCE_MAP.put("xianning.com", "鍜稿畞缃�"); + SOURCE_MAP.put("xzfc.net", "516鎴夸骇"); + SOURCE_MAP.put("jilinfc.com", "鎴夸骇涔嬪"); + SOURCE_MAP.put("jldsw.com", "鍚夋灄甯傛埧浜х綉"); + SOURCE_MAP.put("0467w.com", "楦¤タ缃�"); + SOURCE_MAP.put("xnfcsc.com", "瑗垮畞鎴夸骇缃�"); + SOURCE_MAP.put("0951house.com", "閾跺窛鎴夸骇缃�"); + SOURCE_MAP.put("ycxpy.com", "楹﹀悏灞�"); + SOURCE_MAP.put("czsfdcw.com", "甯稿窞甯傛埧鍦颁骇缃�"); + SOURCE_MAP.put("02fw.com", "甯哥啛浜屾墜鎴�"); + SOURCE_MAP.put("bhsfdc.com", "鍖楁捣鎴夸骇缃�"); + SOURCE_MAP.put("lijiangfc.com", "涓芥睙鎴夸骇缃�"); + SOURCE_MAP.put("ljsoufang.com", "涓芥睙鎼滄埧"); + SOURCE_MAP.put("ljfdc.cn", "涓芥睙鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("ljfw.com", "涓芥睙鎴夸骇缃慱ljfw"); + SOURCE_MAP.put("lijiangdc.com", "灞呭畨鎴垮湴浜�"); + SOURCE_MAP.put("xxloushi.com", "鏂颁埂妤煎競"); + SOURCE_MAP.put("yynews.com.cn", "浣欏鏂伴椈缃�"); + SOURCE_MAP.put("ynpew.com", "浜戝崡鏅幢缃�"); + SOURCE_MAP.put("nhsky.com", "瀹佹捣鎴夸骇鐑嚎"); + SOURCE_MAP.put("jmsfcw.cn", "浣虫湪鏂埧浜х綉"); + SOURCE_MAP.put("haifangw.com", "娴锋埧缃�"); + SOURCE_MAP.put("0898fcw.cn", "娴峰崡鎴夸骇缃慱0898fcw"); + SOURCE_MAP.put("lyw.cc", "娲涢槼鍩�"); + SOURCE_MAP.put("0379fcw.com", "娲涢槼鎴夸骇_0379fcw"); + SOURCE_MAP.put("lyhcfc.com", "娴峰窛鎴夸骇"); + SOURCE_MAP.put("shangdu.com", "娲涢槼淇℃伅娓�"); + SOURCE_MAP.put("0467w.com", "楦¤タ缃�"); + SOURCE_MAP.put("zhoukou.haofung.com", "鍛ㄥ彛濂芥埧缃�"); + SOURCE_MAP.put("dzloupan.cn", "杈惧窞妤肩洏缃�"); + SOURCE_MAP.put("dzfc.cn", "杈惧窞鎴夸骇"); + SOURCE_MAP.put("0469.cn", "鍙岄腑灞辩儹绾�"); + SOURCE_MAP.put("i0469.com", "鍙岄腑灞卞湪绾�"); + SOURCE_MAP.put("chaozhou.ccoo.cn", "娼窞鍦ㄧ嚎"); + SOURCE_MAP.put("571888.com", "浣欏鎴夸骇淇℃伅"); + SOURCE_MAP.put("lyhome.com", "娲涢槼鎴夸骇缃慱lyhome"); + SOURCE_MAP.put("hljxxg.com", "楣ゅ矖淇℃伅缃�"); + SOURCE_MAP.put("0574yye.com", "浣欏鎴夸骇"); + SOURCE_MAP.put("cs090.com", "闆惰窛绂绘埧浜�"); + SOURCE_MAP.put("ycls.cn", "铏炲煄妤煎競"); + SOURCE_MAP.put("dz090.com", "杈惧窞閮藉競缃�"); + SOURCE_MAP.put("daqin029.com", "澶хЕ鍜搁槼缃�"); + SOURCE_MAP.put("sanqinfang.com", "涓夌Е鎴�"); + SOURCE_MAP.put("lejufc.com", "涔愬眳鎴夸骇"); + SOURCE_MAP.put("jieyangzf.com", "鎻槼鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("sanyagf.com", "涓変簹璐埧鑰�"); + SOURCE_MAP.put("dazhou.cc", "杈惧窞鐢熸椿缃慸azhou"); + SOURCE_MAP.put("d0898.com", "涓変簹鎴夸骇缃慱d0898"); + SOURCE_MAP.put("dahainan.com", "浜氭埧缃�"); + SOURCE_MAP.put("smxloushi.com", "涓夐棬宄℃ゼ甯�"); + SOURCE_MAP.put("ybfc.cn", "瀹滃鎴夸骇缃�"); + SOURCE_MAP.put("ybbbs.net", "瀹滃鎴夸骇缃慱ybbbs"); + SOURCE_MAP.put("dzroom.com", "杈惧窞绉熸埧缃�"); + SOURCE_MAP.put("smxhaofang.com", "涓夐棬宄″ソ鎴跨綉"); + SOURCE_MAP.put("379fcw.com", "379鎴夸骇缃�"); + SOURCE_MAP.put("0469xxw.com", "鍙岄腑灞变俊鎭綉"); + SOURCE_MAP.put("0469vip.com", "鍙岄腑灞辩櫨濮撶綉"); + SOURCE_MAP.put("hellozb.com", "娣勬埧缃�"); + SOURCE_MAP.put("fangchanbang.com", "鎴夸骇甯�"); + SOURCE_MAP.put("521qz.com", "閽︽皯缃�"); + SOURCE_MAP.put("0543.com", "0543婊ㄥ窞缃�"); + SOURCE_MAP.put("bzcm.net", "婊ㄥ窞浼犲獟"); + SOURCE_MAP.put("365kl.net", "蹇箰鎴夸骇"); + SOURCE_MAP.put("jj831.com", "閲戞睙缃�"); + SOURCE_MAP.put("ybfdcw.com", "瀹滃鎴垮湴浜х綉_ybfdcw"); + SOURCE_MAP.put("ptfc123.com", "鑾嗙敯鎴夸骇"); + SOURCE_MAP.put("qz828.com", "琛㈠窞鏂伴椈缃�"); + SOURCE_MAP.put("0579f.com", "娴欎腑鎴跨綉"); + SOURCE_MAP.put("591fw.com", "閲戝崕591鎴夸骇缃�"); + SOURCE_MAP.put("zg163.net", "鑷础鎴垮湴浜�"); + SOURCE_MAP.put("house018.com", "琛㈠窞鎴跨綉"); + SOURCE_MAP.put("qzdcfc.com", "澶ф垚鎴夸骇"); + SOURCE_MAP.put("0572hu.com", "浣忓湪婀栧窞缃�"); + SOURCE_MAP.put("yzfc123.com", "鎵窞鎴夸骇"); + SOURCE_MAP.put("yzloupan.com", "鎵窞妤肩洏缃�"); + SOURCE_MAP.put("newzj.net", "鏂伴晣姹�"); + SOURCE_MAP.put("qfdm.gov.cn", "姹熼棬鎴夸骇缃�"); + SOURCE_MAP.put("jmnews.com.cn", "姹熼棬妤煎競缃�"); + SOURCE_MAP.put("0750f.com", "姹熸埧缃�"); + SOURCE_MAP.put("yfcw.cn", "鐩愬煄鎴夸骇缃慱yfcw"); + SOURCE_MAP.put("09fc.com", "绗節鍖烘埧浜х綉"); + SOURCE_MAP.put("ecz.cn", "鏄撴埧缃慹cz"); + SOURCE_MAP.put("19lou.com", "19妤�"); + SOURCE_MAP.put("jtfdc.com.cn", "閲戝潧鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("pt-house.com", "鑾嗙敯鑱斿悎鎴夸骇缃�"); + SOURCE_MAP.put("pthouse.com.cn", "鑾嗙敯鎴垮湴浜ц仈鍚堢綉"); + SOURCE_MAP.put("ptfcxxw.com", "鑾嗙敯鎴夸骇淇℃伅缃慱ptfcxxw"); + SOURCE_MAP.put("ptwcfc.com", "涓囧煄鎴夸骇缃�"); + SOURCE_MAP.put("9maifang.cn", "鐜栭害鎴夸骇缃�"); + SOURCE_MAP.put("cixiw.com", "鎱堟邯鎴夸骇鍦ㄧ嚎"); + SOURCE_MAP.put("guanhaiwei.com", "鎱堟邯鎴夸骇缃�"); + SOURCE_MAP.put("0483.ccoo.cn", "闃挎媺鍠勫湪绾�"); + SOURCE_MAP.put("tlfc.cn", "閫氳窘鎴夸骇缃�"); + SOURCE_MAP.put("360fc.com.cn", "360鎴夸骇"); + SOURCE_MAP.put("ejo.cc", "鏄撳氨鎴夸骇缃�"); + SOURCE_MAP.put("yantailoupan.com", "鐑熷彴妤肩洏缃�"); + SOURCE_MAP.put("razyfc.com", "鐟炲畨鎴跨綉"); + SOURCE_MAP.put("auouo.com", "鐟炲畨鐢熸椿缃�"); + SOURCE_MAP.put("yantaihouse.net", "鐑熷彴鎴夸骇鐑嚎"); + SOURCE_MAP.put("dgmfw.com", "鑾炴皯缃�"); + SOURCE_MAP.put("e0570.com", "琛㈠窞鐑嚎"); + SOURCE_MAP.put("yz2shou.com", "鎵窞浜屾墜缃�"); + SOURCE_MAP.put("tt919.com", "褰撳缃�"); + SOURCE_MAP.put("fs.cc", "浣涘北鎴夸骇缃慱fs"); + SOURCE_MAP.put("ycfcw.com", "鐩愬煄鎴夸骇缃慱ycfcw"); + SOURCE_MAP.put("jx8588.com", "鍢夊叴鎴夸骇缃慱jx8588"); + SOURCE_MAP.put("qithf.cn", "涓冨彴娌虫埧浜х綉锛圦TH锛�"); + SOURCE_MAP.put("suihuawang.com", "缁ュ寲缃�"); + SOURCE_MAP.put("lefang365.com", "璐垫腐涔愭埧缃�"); + SOURCE_MAP.put("ybvv.cn", "瀹滃鎴垮湴浜х綉"); + SOURCE_MAP.put("pyzhufang.com", "婵槼浣忔埧缃�"); + SOURCE_MAP.put("pt594.com", "鑾嗙敯鎴夸骇缃�"); + SOURCE_MAP.put("ptfcw.com", "鑾嗙敯鎴夸骇缃慱ptfcw"); + SOURCE_MAP.put("0515fc.com", "鐩愬煄鎴夸骇缃慱0515fc"); + SOURCE_MAP.put("fclm.cn", "鎴夸骇鑱旂洘"); + SOURCE_MAP.put("lefang365.com", "璐垫腐涔愭埧缃�"); + SOURCE_MAP.put("yq918.com", "闃虫硥瀹跺洯缃�"); + SOURCE_MAP.put("cxnews.cn", "鎱堟邯鎴夸骇瀹跺眳缃�"); + SOURCE_MAP.put("0757.cn", "浣涘北淇℃伅娓�"); + SOURCE_MAP.put("114haihui.com", "娴锋眹鎴夸骇"); + SOURCE_MAP.put("kunming.cn", "鏄嗘槑淇℃伅娓�"); + SOURCE_MAP.put("km185.com", "鏄嗘槑鎴跨綉"); + SOURCE_MAP.put("qzfb.net", "娉夊窞鎴垮惂"); + SOURCE_MAP.put("mxun.com", "楹﹁缃�"); + SOURCE_MAP.put("nhfdcw.com", "瀹佹捣鎴垮湴浜х綉"); + SOURCE_MAP.put("nhfcrx.com", "瀹佹捣鎴夸骇鐑嚎_nhfcrx"); + SOURCE_MAP.put("168house.cn", "鍚存睙鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("wjhao.com", "鍚存睙鎴夸骇缃慱wjhao"); + SOURCE_MAP.put("wjgfw.com", "鍚存睙璐埧缃�"); + SOURCE_MAP.put("dxal.cn", "缃戜笂涓粙"); + SOURCE_MAP.put("yuntaodu.com", "浜戦櫠閮芥埧浜х綉"); + SOURCE_MAP.put("834700.com.cn", "濉斿煄鍦ㄧ嚎"); + SOURCE_MAP.put("tc175.com", "濉斿煄涓�璧风帺"); + SOURCE_MAP.put("rmfcw.cn", "瀹滃叴浜烘皯鎴夸骇"); + SOURCE_MAP.put("yxfccs.com", "瀹滃叴鎴夸骇瓒呭競缃�"); + SOURCE_MAP.put("gmfcw.cn", "楂樺瘑鎴夸骇缃慻mfcw.cn"); + SOURCE_MAP.put("cixi.cn", "鎱堟邯鎴垮湴浜х綉"); + SOURCE_MAP.put("dzwj.com.cn", "杈惧窞铚楀眳缃�"); + SOURCE_MAP.put("sqloushi.com", "鍟嗕笜妤煎競"); + SOURCE_MAP.put("0455.sh.cn", "缁ュ寲淇℃伅娓紙SH)"); + SOURCE_MAP.put("ruifc.cn", "鐟炲畨鎴夸骇缃慱ruifc"); + SOURCE_MAP.put("fang.xjks.net", "鍠�浠�鎴夸骇缃�"); + SOURCE_MAP.put("zqfdc.net", "鑲囧簡鎴垮湴浜х綉"); + SOURCE_MAP.put("cnyw.net", "鐑埧缃�"); + SOURCE_MAP.put("zxip.com", "鎱堟邯鎴夸骇缃慱xip"); + SOURCE_MAP.put("0858f.com", "鍏洏姘存埧浜х綉_0858f"); + SOURCE_MAP.put("0577dc.com", "娓╁窞妤煎競"); + SOURCE_MAP.put("xscfc.com", "鏂拌绐楁埧浜�"); + SOURCE_MAP.put("zyloushi.com", "涓師妤煎競缃�"); + SOURCE_MAP.put("jl.cn", "鍚夋灄甯備俊鎭腐"); + SOURCE_MAP.put("czzf.com", "甯稿窞浣忔埧"); + SOURCE_MAP.put("weifangloushi.com", "娼嶅潑妤煎競"); + SOURCE_MAP.put("luoyanghf.com", "娲涢槼濂芥埧缃�"); + SOURCE_MAP.put("cxfccs.com", "鎱堟邯鎴夸骇缃慱cxfccs"); + SOURCE_MAP.put("zqlos.com", "鑲堝簡妤煎競"); + SOURCE_MAP.put("0393fc.cn", "0393鎴夸骇缃�"); + SOURCE_MAP.put("ezhfc.cn", "閯傚窞鎴夸骇缃慹zhfc"); + SOURCE_MAP.put("nhnews.com.cn", "瀹佹捣鎴垮競"); + SOURCE_MAP.put("300fc.com", "閯傚窞鎴夸骇缃�300fc"); + SOURCE_MAP.put("ezhou.com", "閯傚窞缃�"); + SOURCE_MAP.put("0359sh.com", "鐢熸椿缃�"); + SOURCE_MAP.put("0711ez.cn", "閯傚窞鎴夸骇缃�0711ez"); + SOURCE_MAP.put("tcsw.cn", "鑲囧簡鎴垮湴浜�"); + SOURCE_MAP.put("ayinfo.cn", "瀹夐槼鎴夸骇缃�"); + SOURCE_MAP.put("0372fdc.com", "瀹夐槼鎴垮湴浜х綉"); + SOURCE_MAP.put("fdc0518.com", "杩炰簯娓埧浜х櫨浜嬮��"); + SOURCE_MAP.put("0518gfw.com", "杩炰簯娓喘鎴跨綉"); + SOURCE_MAP.put("masf.cn", "椹瀺灞辨埧浜х綉"); + SOURCE_MAP.put("ym234.com", "鏄撻┈缃�"); + SOURCE_MAP.put("baidu0413.com", "鎶氶『濂芥埧瀛�"); + SOURCE_MAP.put("sluof.cn", "鍟嗘礇鎴夸骇缃憇luof"); + SOURCE_MAP.put("xunju.net", "鎶氶『瀵诲眳鎴夸骇缃�"); + SOURCE_MAP.put("lnfs.cn", "鎶氶『淇℃伅缃�"); + SOURCE_MAP.put("fabu8.cn", "鐑熷彴鍙戝竷鍚�"); + SOURCE_MAP.put("huaibeifangchan.com", "娣寳鎴夸骇缃慼bfc"); + SOURCE_MAP.put("0414aj.com", "鏈邯鐖卞鎴夸骇缃�"); + SOURCE_MAP.put("dqfc114.com", "澶у簡鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("tzfy.cn", "鍙板窞鎴挎簮缃�"); + SOURCE_MAP.put("ipzh.cn", "鐖卞皻鑺卞煄缃�"); + SOURCE_MAP.put("honghe01.com", "绾㈡渤"); + SOURCE_MAP.put("0435.com", "閫氬寲鍦ㄧ嚎"); + SOURCE_MAP.put("0778fang.com", "娌虫睜鎴跨綉"); + SOURCE_MAP.put("gxhc365.com", "娌虫睜365"); + SOURCE_MAP.put("xjhouse.cn", "鏂扮枂鎴夸骇缃憍jhouse"); + SOURCE_MAP.put("0318ol.com", "琛℃按鍦ㄧ嚎"); + SOURCE_MAP.put("xinhs.com", "琛℃按淇℃伅娓�"); + SOURCE_MAP.put("gooddt.com", "閮藉競淇℃伅"); + SOURCE_MAP.put("458000.com", "楣ゅ淇℃伅娓�"); + SOURCE_MAP.put("fc392.com", "楣ゅ鎴夸骇缃慺c392"); + SOURCE_MAP.put("tzzufang.com", "娉板窞鎴夸骇缃�"); + SOURCE_MAP.put("ty7.cn", "娉板窞妤煎競"); + SOURCE_MAP.put("tzfcxx.com", "娉板窞鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("huizhou.cn", "浠婃棩鎯犲窞缃�"); + SOURCE_MAP.put("southfang.com", "鍗楁柟鎴夸骇缃�"); + SOURCE_MAP.put("l8.com.cn", "闅嗗‖鍦颁骇"); + SOURCE_MAP.put("0759fdc.com", "婀涙睙鎴夸骇缃�"); + SOURCE_MAP.put("kuf.cn", "婀涙睙閰锋埧缃�"); + SOURCE_MAP.put("hnzzfc.com", "鏍床鎴夸骇缃�"); + SOURCE_MAP.put("zzxfdc.com", "鏍床鍘挎埧鍦颁骇缃�"); + SOURCE_MAP.put("hyfcw.com", "琛¢槼鎴夸骇缃�"); + SOURCE_MAP.put("nethy8.com", "琛¢槼鎴夸骇缃慱nethy8"); + SOURCE_MAP.put("0734hysfc.com", "琛¢槼鎴夸骇缃慱0734hysfc"); + SOURCE_MAP.put("e0734.com", "涓浗琛¢槼鏂伴椈缃�"); + SOURCE_MAP.put("hysfcw.com", "琛¢槼甯傛埧浜х綉"); + SOURCE_MAP.put("ychaofang.com", "瀹滄槍濂芥埧缃�"); + SOURCE_MAP.put("e0717.net", "瀹滄槍鎴夸骇缃慱e0717"); + SOURCE_MAP.put("afz.cc", "鐖辨埧绔�"); + SOURCE_MAP.put("ywjlfc.com.cn", "铔熼緳鎴夸骇缃�"); + SOURCE_MAP.put("ywhhfc.com", "涔変箤鐏孩鎴夸骇"); + SOURCE_MAP.put("ylfct.com", "鎴夸骇缃慱ylfct"); + SOURCE_MAP.put("housegx.cn", "鐜夎吹缃�"); + SOURCE_MAP.put("717.so", "鎴夸骇涔愬洯"); + SOURCE_MAP.put("0315dg.com", "鍞愬北鎴夸骇缃�"); + SOURCE_MAP.put("tszp.com", "鍞愬北鎴跨綉"); + SOURCE_MAP.put("0710fz.com", "瑗勯槼鎴夸骇缃�"); + SOURCE_MAP.put("0710.com", "瑗勯槼0710缃�"); + SOURCE_MAP.put("0270710.com", "0710瑗勯槼鎴夸骇缃�"); + SOURCE_MAP.put("jinxiangyang.com", "瑗勯槼鍒嗙被淇℃伅缃�"); + SOURCE_MAP.put("0527lsw.com", "瀹胯縼妤煎競缃�"); + SOURCE_MAP.put("0527c.net", "瀹胯縼鎴夸骇缃慱0527c"); + SOURCE_MAP.put("0527fc.com", "瀹胯縼鎴夸骇缃慱0527fc"); + SOURCE_MAP.put("sqhouse.cn", "瀹胯縼鎴垮湴浜х綉"); + SOURCE_MAP.put("114b2c.com", "瀹胯縼鎴夸骇缃慱114b2c"); + SOURCE_MAP.put("sqfczx.cc", "瀹胯縼鎴夸骇缃慱sqfczx"); + SOURCE_MAP.put("mmfc.cc", "鑼傚悕鎴夸骇"); + SOURCE_MAP.put("gdmmfdc.com", "鑼傚悕鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("230668.com", "鑼傚悕鎴夸骇缃�"); + SOURCE_MAP.put("mmxfw.com", "鑼傚悕瀵绘埧缃�"); + SOURCE_MAP.put("scol.com.cn", "鍥涘窛鍦ㄧ嚎"); + SOURCE_MAP.put("ehomeday.com", "鎴夸箣绐�"); + SOURCE_MAP.put("fczm.com", "鎴夸骇涔嬮棬"); + SOURCE_MAP.put("o.cn", "閮藉競鍦堟埧浜�"); + SOURCE_MAP.put("csfcw.com", "甯哥啛鎴夸骇缃�"); + SOURCE_MAP.put("fsfcw.net", "鎶氶『鎴夸骇缃慺sfcw"); + SOURCE_MAP.put("fsfcxxw.com", "鎶氶『鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("fayo.net", "椋炴壃缃�"); + SOURCE_MAP.put("lyfcw.cn", "婧ч槼鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("sqdyf.com", "鍟嗕笜绗竴鎴�"); + SOURCE_MAP.put("cshfc.cn", "甯哥啛鎴夸骇缃慱cshfc"); + SOURCE_MAP.put("07353.com", "閮村窞鎴夸骇缃�"); + SOURCE_MAP.put("tzfdctv.com", "鍙板窞鐧捐仈鎴夸骇缃�"); + SOURCE_MAP.put("52fangzi.com", "鍖椾含鍐欏瓧妤肩綉_52fangzi"); + SOURCE_MAP.put("52fangzi.com", "鍖椾含鍐欏瓧妤肩綉_52fangzi"); + SOURCE_MAP.put("ruian.com", "鐟炲畨璁哄潧"); + SOURCE_MAP.put("wjhouses.com", "鍚存睙鎴夸骇淇℃伅娓�"); + SOURCE_MAP.put("wjshw.com", "鍚存睙鎴夸骇淇℃伅缃慱wjshw"); + SOURCE_MAP.put("wjfcw.com", "鍚存睙鎴夸骇缃慱wjfcw"); + SOURCE_MAP.put("wjls.com.cn", "鍚存睙妤煎競缃�"); + SOURCE_MAP.put("spgdfc.com", "鍥涘钩鎴夸骇缃憇pgdfc"); + SOURCE_MAP.put("lesohome.com", "涔愭悳鎴夸骇缃�"); + SOURCE_MAP.put("yaxf0911.com", "寤跺畨鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("ytfdcw.net", "鐑熷彴鎴垮湴浜ytfdcw"); + SOURCE_MAP.put("altmhw.com", "闃垮嫆娉伴棬鎴风綉"); + SOURCE_MAP.put("053000.com", "琛℃按鎴夸骇缃�053000"); + SOURCE_MAP.put("tdfcw.com", "闄堕兘鎴夸骇缃�"); + SOURCE_MAP.put("hzcom.cn", "鎯犲窞鎴夸骇"); + SOURCE_MAP.put("hnzz.cc", "鏍床妤煎競缃�"); + SOURCE_MAP.put("fc0734.com", "琛¢槼绾㈡埧"); + SOURCE_MAP.put("0734f.com", "琛¢槼浜屾墜鎴�"); + SOURCE_MAP.put("bm0392.com", "楣ゅ渚挎皯缃�"); + SOURCE_MAP.put("ljhouse.cn", "涓芥睙鎴跨綉"); + SOURCE_MAP.put("ljfw.com.cn", "涓芥睙鎴跨綉_ljfw"); + SOURCE_MAP.put("jzfdcxxw.cn", "鐒︿綔鎴夸俊缃�"); + SOURCE_MAP.put("93fcw.com", "瀹佸痉鎴夸骇缃�"); + SOURCE_MAP.put("hccun.com", "娌虫睜鐢熸椿缃�"); + SOURCE_MAP.put("yxfcw.cn", "瀹滃叴鎴夸骇缃慱yxfcw"); + SOURCE_MAP.put("yinsha.com", "閾舵矙鎴夸骇缃�"); + SOURCE_MAP.put("hitlf.com", "鐏床鐑嚎"); + SOURCE_MAP.put("i0995.com", "鍚愰瞾鐣俊鎭綉"); + SOURCE_MAP.put("hao0903.com", "鍜岀敯闂ㄦ埛缃�"); + SOURCE_MAP.put("kunmingfdc.com", "鏄嗘槑鎴垮湴浜х綉"); + SOURCE_MAP.put("ylxw.com.cn/", "浼婄妬鎴夸骇"); + SOURCE_MAP.put("kmhouses.com", "鏄嗘槑鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("ihami.cn", "鐖卞搱瀵嗙綉"); + SOURCE_MAP.put("ayfdc.com", "瀹夐槼浣忓畢涓庢埧鍦颁骇淇℃伅缃�"); + SOURCE_MAP.put("qzpp.com", "娉夊窞鎴夸骇浜ゆ槗缃�"); + SOURCE_MAP.put("0594.com", "鐢埧缃�"); + SOURCE_MAP.put("0594.com", "鐢埧缃�"); + SOURCE_MAP.put("hgd1.com", "楣ゅ矖绗竴缃�"); + SOURCE_MAP.put("0795dcw.com", "瀹滄槬鍦颁骇缃�"); + SOURCE_MAP.put("e0745.com", "鎬�鍖栨埧浜х綉e0745"); + SOURCE_MAP.put("0745f.com", "鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("hhjjfdc.com", "浣冲鍦颁骇"); + SOURCE_MAP.put("ashld.com", "钁姦宀涢棬鎴风綉"); + SOURCE_MAP.put("hldkfw.com", "钁姦宀涚湅鎴跨綉"); + SOURCE_MAP.put("mytaofang.com", "娣樻埧瀹跺眳缃�"); + SOURCE_MAP.put("mytaofang.com", "娣樻埧瀹跺眳缃�"); + SOURCE_MAP.put("yx0429.com", "钁姦宀涙埧鍦颁骇瓒呭競缃�"); + SOURCE_MAP.put("yxfcw.com", "瀹滃叴鎴垮湴浜х綉"); + SOURCE_MAP.put("stfcxx.com", "姹曞ご鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("hamiw.com", "鍝堝瘑閮藉競缃�"); + SOURCE_MAP.put("0756fang.com", "鐪熸埧缃�"); + SOURCE_MAP.put("wlfcw.com", "娓╁箔鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("fangnmg.com", "鍐呰挋鍙ゆ埧鍦颁骇淇℃伅缃�"); + SOURCE_MAP.put("ljwcom.com", "榫欐睙缃�"); + SOURCE_MAP.put("0412aj.com", "闉嶅北鐖卞鎴夸骇缃�"); + SOURCE_MAP.put("gogohome.com", "鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("wlfcw.cn", "娓╁箔鎴垮湴浜х綉_wlfcw"); + SOURCE_MAP.put("leyoujia.com", "涔愭湁瀹�"); + SOURCE_MAP.put("0470000.com", "鍛间鸡璐濆皵鐢熸椿缃�"); + SOURCE_MAP.put("jqwj.cc", "閰掓硥缃戣仛"); + SOURCE_MAP.put("m937.com", "閰掓硥鎷涜创"); + SOURCE_MAP.put("0902fc.com", "鍝堝瘑鎴夸骇缃�"); + SOURCE_MAP.put("0758fc.net", "鑲堝簡鎴夸骇缃�"); + SOURCE_MAP.put("zz.cc", "閮戝窞鎴夸骇缃慱zz"); + SOURCE_MAP.put("gz.cc", "骞垮窞鎴夸骇缃�"); + SOURCE_MAP.put("anhuinews.com", "涓畨鎴夸骇缃�"); + SOURCE_MAP.put("fcxxw.com", "鎴夸骇淇℃伅缃慱fcxxw"); + SOURCE_MAP.put("weiduqu.com", "璁告槍鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("0452m.com", "榻愰綈鍝堝皵鎴夸骇缃�"); + SOURCE_MAP.put("0452sh.com", "榻愰綈鍝堝皵鐢熸椿缃�"); + SOURCE_MAP.put("gotoip1.com", "鍥涘钩鎴夸骇缃�"); + SOURCE_MAP.put("hzfjw.com", "姹変腑鎴夸骇浜ゆ槗璧勮缃�"); + SOURCE_MAP.put("0839fc.com", "骞垮厓鎴夸骇缃�"); + SOURCE_MAP.put("0932fdc.com", "瀹氳タ鎴夸骇缃�"); + SOURCE_MAP.put("zunyifang.cn", "閬典箟鎴夸骇缃憐unyifang"); + SOURCE_MAP.put("ankang.net", "瀹夊悍鎴夸骇缃�"); + SOURCE_MAP.put("akfang.com", "瀹夊悍鎴垮湴浜ч棬鎴风綉"); + SOURCE_MAP.put("0454.com", "浣虫湪鏂笁姹熺綉"); + SOURCE_MAP.put("tainfo.net", "娉板畨淇℃伅娓�"); + SOURCE_MAP.put("tc917.com", "娉板畨鎴夸骇"); + SOURCE_MAP.put("taianhome.com", "娉板畨鎴夸骇缃�"); + SOURCE_MAP.put("tianshuiinfo.cn", "澶╂按淇℃伅缃�"); + SOURCE_MAP.put("730fc.com", "宀抽槼鎴夸骇缃�"); + SOURCE_MAP.put("0730r.com", "鐖卞鎴夸骇缃�"); + SOURCE_MAP.put("shhomeland.com", "缁ュ寲瀹跺洯缃�"); + SOURCE_MAP.put("cnsuihua.net", "缁ュ寲淇℃伅娓�"); + SOURCE_MAP.put("qzfcw.com", "閽﹀窞鎴夸骇缃�"); + SOURCE_MAP.put("wdfc.com.cn", "缁村害鎴夸骇缃�"); + SOURCE_MAP.put("fcxgx.com", "鎴夸骇鏂板共绾�"); + SOURCE_MAP.put("0952fdc.com", "鐭冲槾灞辨埧浜х綉"); + SOURCE_MAP.put("0319f.com", "鍒戞埧缃�"); + SOURCE_MAP.put("ggfdc.com", "璐垫腐鎴垮湴浜х綉"); + SOURCE_MAP.put("ywfc.net", "涔変箤鎴夸骇缃�"); + SOURCE_MAP.put("15518.com", "骞哥鎴夸骇淇℃伅"); + SOURCE_MAP.put("hldinfo.net", "钁姦宀涗俊鎭腐"); + SOURCE_MAP.put("0470a.com", "鍛间鸡璐濆皵鐏綉"); + SOURCE_MAP.put("169l.com", "涔変箤鎴夸骇"); + SOURCE_MAP.put("15fcw.com", "鍙嬪ソ鎴夸骇"); + SOURCE_MAP.put("jlfdc.net", "鍚夋灄鎴夸骇缃�"); + SOURCE_MAP.put("0537fangchan.com", "娴庡畞鎴夸骇缃�0537"); + SOURCE_MAP.put("jninfo.net.cn", "娴庡畞淇℃伅娓�"); + SOURCE_MAP.put("fangguagua.com", "鎴垮懕鍛�"); + SOURCE_MAP.put("zh-o.com", "鐝犳捣瑗垮尯鎴夸骇缃�"); + SOURCE_MAP.put("gd.cn", "鐝犳捣瑙嗙獥鎼滄埧"); + SOURCE_MAP.put("0760dc.com", "涓北鎴夸骇缃慱0760dc"); + SOURCE_MAP.put("ccnnhouse.com", "涓煄鎴夸骇缃�"); + SOURCE_MAP.put("zgfdc.net", "涓北妤煎競"); + SOURCE_MAP.put("0760t.com", "涓北绉熸埧缃�"); + SOURCE_MAP.put("zj.cn", "涔変箤淇℃伅缃�"); + SOURCE_MAP.put("houseyw.com", "棣欏眳鎴夸骇"); + SOURCE_MAP.put("daqing.net", "澶у簡淇℃伅娓�"); + SOURCE_MAP.put("zh51home.com", "鐝犳捣鎴夸骇涔嬬獥"); + SOURCE_MAP.put("ylfdc.com", "鐜夋灄鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("yulintimes.com", "鐜夋灄鏃朵唬缃�"); + SOURCE_MAP.put("jiningxinxigang.com", "娴庡畞淇℃伅娓痡nxxg"); + SOURCE_MAP.put("05376.com", "娴庡畞淇℃伅缃�"); + SOURCE_MAP.put("jn234.com", "娴庡畞鏂颁俊鎭腐"); + SOURCE_MAP.put("ms537.com", "姘戠敓淇℃伅"); + SOURCE_MAP.put("k0410.com", "鐪嬮搧宀�"); + SOURCE_MAP.put("tlxxb.com", "閾佸箔淇℃伅鏉�"); + SOURCE_MAP.put("taian.com", "娉板畨缃戞埧浜�"); + SOURCE_MAP.put("yyfdcw.com", "宀抽槼鎴垮湴浜х綉"); + SOURCE_MAP.put("0475.cn", "閫氳窘淇℃伅缃�"); + SOURCE_MAP.put("fx8888.com", "鍗庡崥缃�"); + SOURCE_MAP.put("xft77.com", "灏忔埧绔�"); + SOURCE_MAP.put("tsloushi.com", "鍞愬北妤煎競缃�"); + SOURCE_MAP.put("idc2008.com.cn", "娉板畨鎴夸骇缃憈afc"); + SOURCE_MAP.put("0572.com", "0572鎴夸骇缃�"); + SOURCE_MAP.put("taiwu.com", "澶眿缃�"); + SOURCE_MAP.put("taiwu.com", "澶眿缃�"); + SOURCE_MAP.put("sh.koofang.com", "涓婃捣閰锋埧缃�"); + SOURCE_MAP.put("sh.koofang.com", "涓婃捣閰锋埧缃�"); + SOURCE_MAP.put("jnfcw.com.cn", "娴庢埧缃慾nfcw"); + SOURCE_MAP.put("jzfc123.com", "鏅嬩腑鎴夸骇缃慾zfc123"); + SOURCE_MAP.put("woaixinjia.com", "鏂板缃�"); + SOURCE_MAP.put("364000.com", "榫欏博缃�"); + SOURCE_MAP.put("fuling.com", "娑櫟鎴夸骇"); + SOURCE_MAP.put("shushifang.com", "鑸掗�傛埧缃�"); + SOURCE_MAP.put("tt5598.com", "姹曞ご闆呭眳缃�"); + SOURCE_MAP.put("0546fdc.com", "0546鎴夸骇缃�"); + SOURCE_MAP.put("xcfc999.com", "钖涘煄鎴夸骇缃�"); + SOURCE_MAP.put("dinju.com", "瀹氬眳缃�"); + SOURCE_MAP.put("stre.net", "姹曞ご鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("0754ok.com", "鎴垮眳缃�"); + SOURCE_MAP.put("my0668.com", "鑼傚悕鎴垮競缃�"); + SOURCE_MAP.put("zjghfw.com", "寮犲娓ソ鎴跨綉"); + SOURCE_MAP.put("0513.org", "婵犳花鎴夸骇"); + SOURCE_MAP.put("lyanf.cn", "榫欏博鎴夸骇缃憀yanf"); + SOURCE_MAP.put("597fcw.com", "榫欏博鎴夸骇缃�597fcw"); + SOURCE_MAP.put("lyfang.com", "榫欏博鎼滄埧缃�"); + SOURCE_MAP.put("lhfc.cn", "婕渤鎴夸骇缃憀hfc"); + SOURCE_MAP.put("0395.tv", "婕埧缃�"); + SOURCE_MAP.put("lhfdc.com", "婕渤鎴夸骇缃憀hfdc"); + SOURCE_MAP.put("luohejie.com", "婕渤琛�"); + SOURCE_MAP.put("0395mf.com", "婕渤涔版埧缃�"); + SOURCE_MAP.put("lcfcj.com", "鑱婂煄鎴夸骇浜ゆ槗缃�"); + SOURCE_MAP.put("lcfdcw.com", "鑱婂煄鎴垮湴浜х綉"); + SOURCE_MAP.put("ilcw.net", "鑱婂煄缃�"); + SOURCE_MAP.put("liaocheng.cc", "鑱婂煄淇℃伅娓�"); + SOURCE_MAP.put("liaochengfangchan.com", "鑱婂煄鎴夸骇缃憀cfc"); + SOURCE_MAP.put("fc0832.com", "鍐呮睙鎴夸骇"); + SOURCE_MAP.put("njdsw.cn", "鍐呮睙閮藉競缃�"); + SOURCE_MAP.put("onzao.cn", "鍐呮睙鎴夸骇缃憃nzao"); + SOURCE_MAP.put("njxinf.com", "鍐呮睙鏂版埧浜х綉"); + SOURCE_MAP.put("xnjhome.com", "鏂板唴姹熸埧浜х綉"); SOURCE_MAP.put("0719mf.com", "FDC"); - SOURCE_MAP.put("ok0563.com", "宣城房产交易网"); - SOURCE_MAP.put("0856.com.cn", "铜仁在线"); - SOURCE_MAP.put("tr169.cn", "铜仁都市网"); - SOURCE_MAP.put("trren.cn", "铜仁房产"); - SOURCE_MAP.put("0350.cn", "忻州信息港"); - SOURCE_MAP.put("xinyumh.com", "新余门户网"); - SOURCE_MAP.put("0701dcw.com", "鹰潭地产网"); - SOURCE_MAP.put("0790dcw.com", "新余地产网0790"); - SOURCE_MAP.put("97hami.com", "九旗网"); - SOURCE_MAP.put("0998xj.com", "喀什生活网"); - SOURCE_MAP.put("o0998.com", "喀什门户网"); - SOURCE_MAP.put("0597kk.com", "龙岩KK网"); - SOURCE_MAP.put("luohe.com.cn", "漯河网"); - SOURCE_MAP.put("0395fc.com", "漯河房产网0395fc"); - SOURCE_MAP.put("0395home.com", "漯河购房网"); - SOURCE_MAP.put("ks-lxjy.com", "理想家园"); - SOURCE_MAP.put("elefang.com", "易乐房"); - SOURCE_MAP.put("gashw.com", "公安家园房产网"); - SOURCE_MAP.put("longcai0351.com", "哈尔滨二手房"); - SOURCE_MAP.put("6665.com", "上海滩"); - SOURCE_MAP.put("0598777.net", "三明房产家装网"); - SOURCE_MAP.put("860598.com", "三明芭乐网"); - SOURCE_MAP.put("0719114.com", "十堰房地产"); - SOURCE_MAP.put("trlpw.com", "铜仁楼盘网"); - SOURCE_MAP.put("aofenglu.com", "宣城房产网aofenglu"); - SOURCE_MAP.put("lhloushi.com", "漯河楼市"); - SOURCE_MAP.put("0597house.com", "龙岩房产网0597"); - SOURCE_MAP.put("myzf.net", "绵阳住房网"); - SOURCE_MAP.put("rafdcw.com", "瑞安房地产网"); - SOURCE_MAP.put("wzfc.net", "温州房产交易网"); - SOURCE_MAP.put("smzf.net", "三明住房网"); - SOURCE_MAP.put("xchfc.cn", "宣城房产网xchfc"); - SOURCE_MAP.put("0792f.cn", "房盟"); - SOURCE_MAP.put("0797fdc.com.cn", "赣州房地产信息网"); - SOURCE_MAP.put("ayxxz.com", "安阳信息站"); - SOURCE_MAP.put("mlxks.com", "魅力喀什"); - SOURCE_MAP.put("xuanfang.org", "宣城房产网xuanfang"); - SOURCE_MAP.put("xlzjdc.com", "兴隆置家网"); - SOURCE_MAP.put("sthouse.net", "汕头房产网"); - SOURCE_MAP.put("hzfcw.com", "杭州房产网hzfcw.com"); - SOURCE_MAP.put("0790f.cn", "新余房产网0790f"); - SOURCE_MAP.put("sj.net.cn", "茸城论坛"); - SOURCE_MAP.put("lizihang.com", "丽兹行"); - SOURCE_MAP.put("dytfw.com", "大邑二手房"); - SOURCE_MAP.put("laizhouba.com", "莱州信息网"); - SOURCE_MAP.put("51haofu.com", "51豪府"); - SOURCE_MAP.put("0990bbs.com", "克拉玛依信息网"); - SOURCE_MAP.put("akszc.com", "阿克苏之窗"); - SOURCE_MAP.put("xjklmy.cc", "油城信息港"); - SOURCE_MAP.put("klmyr.com", "克拉玛依信息网(KLMY)"); - SOURCE_MAP.put("365tsh.com", "365天生活网"); - SOURCE_MAP.put("jiayouhh.com", "加油红河网"); - SOURCE_MAP.put("jcok.com.cn", "贺州佳成房产网"); - SOURCE_MAP.put("0991fc.com", "乌鲁木齐房产网"); - SOURCE_MAP.put("t55.com", "淘窝窝"); - SOURCE_MAP.put("0482home.com", "红城家园网"); - SOURCE_MAP.put("huimin168.com", "兴安惠民网"); - SOURCE_MAP.put("04828.com", "兴安盟信息网"); - SOURCE_MAP.put("bsfw.cn", "保山房网"); - SOURCE_MAP.put("msfc114.com", "眉山淘房网"); - SOURCE_MAP.put("52m3.com", "眉山房产在线"); - SOURCE_MAP.put("dy6c.com", "德阳6城网"); - SOURCE_MAP.put("dangdi.cc", "当地网"); - SOURCE_MAP.put("0826fang.com", "广安房产网0826fang"); - SOURCE_MAP.put("gafc8.cn", "租房吧"); - SOURCE_MAP.put("beiww.com", "北纬网"); - SOURCE_MAP.put("dpcm.cn", "大鹏新闻网"); - SOURCE_MAP.put("hhzc.cn", "中国红河"); - SOURCE_MAP.put("xlglfdc.com", "锡盟房产网"); - SOURCE_MAP.put("0479xx.com", "锡盟信息港"); - SOURCE_MAP.put("o912.com", "榆林房产网"); - SOURCE_MAP.put("ylxxg.com", "榆林信息港"); - SOURCE_MAP.put("yzdsb.com", "买房"); - SOURCE_MAP.put("qinzhoufc.com", "钦州房产"); - SOURCE_MAP.put("qzfdcw.net", "钦州房产信息网"); - SOURCE_MAP.put("qzfcxh.com", "钦州房产协会"); - SOURCE_MAP.put("xinxi263.com", "南阳信息港"); - SOURCE_MAP.put("nyhaofang.com", "南阳好房网"); - SOURCE_MAP.put("jiazhuly.com", "家住临沂"); - SOURCE_MAP.put("linyiren.com", "临沂人房产网"); - SOURCE_MAP.put("0539zf.com", "临沂找房网"); - SOURCE_MAP.put("goufon.com", "临沂购房网"); - SOURCE_MAP.put("xjklmy.cn", "克拉玛依油城信息港"); - SOURCE_MAP.put("0539f.cn", "临沂房产网0539f"); - SOURCE_MAP.put("linfen365.com", "临汾365"); - SOURCE_MAP.put("520953.com", "吴忠信息港"); - SOURCE_MAP.put("k0477.com", "鄂尔多斯信息港"); - SOURCE_MAP.put("lasafc.com", "拉萨房产网"); - SOURCE_MAP.put("gxwuzhou.com", "鸳江生活网"); - SOURCE_MAP.put("0478fdc.com", "巴彦淖尔房地产网"); - SOURCE_MAP.put("dahoutao.com", "大后套网"); - SOURCE_MAP.put("hi772.com", "来宾房产网"); - SOURCE_MAP.put("lbkfw.com", "来宾看房网"); - SOURCE_MAP.put("0952100.com", "石嘴山生活网"); - SOURCE_MAP.put("0418fc.com", "阜新房产网"); - SOURCE_MAP.put("04820482.com", "兴安盟信息港"); - SOURCE_MAP.put("h0418.com", "阜新房产信息网"); - SOURCE_MAP.put("fxw.cc", "阜新房产网fxw"); - SOURCE_MAP.put("hotfcw.com", "热点房产网"); - SOURCE_MAP.put("zjkhome.net", "张家口楼市网"); - SOURCE_MAP.put("0474.net", "乌兰察布门户网"); - SOURCE_MAP.put("xtloushi.com", "邢台楼市"); - SOURCE_MAP.put("fc0319.com", "邢台房产网"); - SOURCE_MAP.put("housext.com", "邢台房地产网"); - SOURCE_MAP.put("xtzhiye.com", "邢台置业网"); - SOURCE_MAP.put("zzfangchan.com", "郑州房产网"); - SOURCE_MAP.put("ndfdc.com", "宁德房地产网"); - SOURCE_MAP.put("rzbyfc.com", "日照报业房产网"); - SOURCE_MAP.put("fc0775.com", "贵港房产热线"); - SOURCE_MAP.put("ggfcxx.com", "贵港房产信息网"); - SOURCE_MAP.put("suzhoufcw.com", "宿州易查网"); - SOURCE_MAP.put("fangchan0438.com", "松原房产网"); - SOURCE_MAP.put("0419f.com", "辽阳房产网"); - SOURCE_MAP.put("chzfdc.com", "池州房产生活网"); - SOURCE_MAP.put("137400.net", "兴安时空"); - SOURCE_MAP.put("xammh.com", "兴安盟门户网"); - SOURCE_MAP.put("xammh.com", "兴安盟门户网"); - SOURCE_MAP.put("zsnews.cn", "中山楼市网"); - SOURCE_MAP.put("haofang365.com", "好房365"); - SOURCE_MAP.put("aft888.com", "阿凡提"); - SOURCE_MAP.put("hh126.com", "红河126"); - SOURCE_MAP.put("maoyanyan.net", "榆林毛眼眼房产"); - SOURCE_MAP.put("0912f.com", "榆林房产信息网"); - SOURCE_MAP.put("linyiloushi.com", "临沂楼市"); - SOURCE_MAP.put("linyesf.com", "临沂房产网"); - SOURCE_MAP.put("0539fc.com", "0539房产网"); - SOURCE_MAP.put("0357linfen.com", "临汾网"); - SOURCE_MAP.put("qth8.com", "七台河信息网"); - SOURCE_MAP.put("new0546.com", "新东营信息港"); - SOURCE_MAP.put("anjufw.net", "安居房网"); - SOURCE_MAP.put("linfangwang.com", "临房网"); - SOURCE_MAP.put("ybfw.net", "延边千盛房产"); - SOURCE_MAP.put("yiwu.com.cn", "义乌网"); - SOURCE_MAP.put("xianyf.com", "咸阳大象房产网"); - SOURCE_MAP.put("fang580.com", "好房网_fang580"); - SOURCE_MAP.put("yoher.com", "吆喝网"); - SOURCE_MAP.put("cityfdc.com", "中国房地产信息网"); - SOURCE_MAP.put("114chn.com", "114生活网"); - SOURCE_MAP.put("xinfun.net", "新房网"); - SOURCE_MAP.put(".baidu.com", "百度房产"); - SOURCE_MAP.put("xxfang.com", "新乡房产"); - SOURCE_MAP.put("kfloushi.com", "开封楼市"); - SOURCE_MAP.put("bdbxw.com", "保定百姓网"); - SOURCE_MAP.put("0510f.cn", "无锡房产网_0510f"); - SOURCE_MAP.put("gannanzhou.com.cn", "甘南之窗"); - SOURCE_MAP.put("fang63.com", "乐山房产信息网"); - SOURCE_MAP.put("hd3158.cn", "图房网"); - SOURCE_MAP.put("laoke.com", "老客"); - SOURCE_MAP.put("mayanchina.com", "玛雅房屋"); - SOURCE_MAP.put("yskfc.com", "溧阳顺开房产网"); - SOURCE_MAP.put("ecen.com.cn", "伊城地产"); - SOURCE_MAP.put("wanzid.com", "泉州望安置地"); - SOURCE_MAP.put("yxfyfc.com", "宜兴方圆房产中介"); - SOURCE_MAP.put("bzleju.com", "巴中乐居房产网"); - SOURCE_MAP.put("xiaoganshi.net", "念家不动产"); - SOURCE_MAP.put("bzhqfc.com", "鸿桥房产"); - SOURCE_MAP.put("jiayuanfangchan.com.cn", "佳缘房产"); - SOURCE_MAP.put("zhengdafangchan.com", "衡水正大房产网"); - SOURCE_MAP.put("lejiafangchan.com", "衡水乐家房产中介"); - SOURCE_MAP.put("zxfc.cn", "置信房产"); - SOURCE_MAP.put("tzjhfcw.com", "泰州房产网_tzjhfcw"); - SOURCE_MAP.put("dooyoo.net.cn", "德佑地产"); - SOURCE_MAP.put("rafcxx.com", "瑞安房产中介网"); - SOURCE_MAP.put("house.e47.cn", "江津在线"); - SOURCE_MAP.put("wanziqianhong.cn", "万紫千红房产"); - SOURCE_MAP.put("100ks.cn", "百分百房产"); - SOURCE_MAP.put("55555558.com", "骄阳地产"); - SOURCE_MAP.put("roboo.com", "芜湖房产"); - SOURCE_MAP.put("house0579.com", "亚和房产"); - SOURCE_MAP.put("wanzhoufc.com", "万州租房网"); - SOURCE_MAP.put("fc.cqyy.net", "云阳房产网"); - SOURCE_MAP.put("aifengjie.com", "奉节生活网"); - SOURCE_MAP.put("btfcw.net", "比特房产"); - SOURCE_MAP.put("023755.com", "酉阳在线"); - SOURCE_MAP.put("xinle.ccoo.cn", "新乐网"); - SOURCE_MAP.put("stlafc.com", "利安房产"); - SOURCE_MAP.put("bdhouse.net", "嘉信房产"); - SOURCE_MAP.put("zhuoyuefch.com", "咸阳卓越房产"); - SOURCE_MAP.put("glhyfc.com.cn", "桂林鸿宇房产"); - SOURCE_MAP.put("cqmmgo.com", "重庆购物狂"); - SOURCE_MAP.put("0313house.com", "万佳"); - SOURCE_MAP.put("house.inhe.net", "银河房产"); - SOURCE_MAP.put("hechuan.ccoo.cn", "合川在线"); - SOURCE_MAP.put("xjjw.ccoo.cn", "新江津网"); - SOURCE_MAP.put("shizhu.ccoo.cn", "石柱在线"); - SOURCE_MAP.put("wulong365.com", "武隆在线"); - SOURCE_MAP.put("xiushan.ccoo.cn", "秀山之窗"); - SOURCE_MAP.put("gpai.net", "公拍网"); - SOURCE_MAP.put("hbfdc.gov.cn", "淮北市住宅与房地产信息网"); - SOURCE_MAP.put("grfy.net", "个人房源网"); - SOURCE_MAP.put("fangtan007.com", "房探网ft"); - SOURCE_MAP.put("01fy.cn", "第一时间"); - SOURCE_MAP.put("fdfy.cn", "房东房源"); - SOURCE_MAP.put("360fdc.com", "中房网"); - SOURCE_MAP.put("fdfy.cn", "房东房源"); - SOURCE_MAP.put("rcfc.cn", "荣昌房产网"); - SOURCE_MAP.put("rcfc.cn", "荣昌房产网"); - SOURCE_MAP.put("fengjie.ccoo.cn", "奉节在线"); - SOURCE_MAP.put("cqpsw.cn", "彭水网"); - SOURCE_MAP.put("cqhc.cn", "三江论坛"); - SOURCE_MAP.put("qj023.com", "綦江在线"); - SOURCE_MAP.put("epy.cn", "番禺房产网"); - SOURCE_MAP.put("epy.cn", "番禺房产网"); - SOURCE_MAP.put("409000.cn", "黔江在线"); - SOURCE_MAP.put("bbs.cqyc.net", "茶竹永川网"); - SOURCE_MAP.put("rexian.net.cn", "武汉热线房产网"); - SOURCE_MAP.put("house.sxdsw.net", "三峡都市网"); - SOURCE_MAP.put("hfhouse.com", "合肥房地产交易网"); - SOURCE_MAP.put("fdzfw.com", "房东租房网"); - SOURCE_MAP.put("fdzfw.com", "房东租房网"); - SOURCE_MAP.put("saofang.cn", "扫房网"); - SOURCE_MAP.put("saofang.cn", "扫房网"); - SOURCE_MAP.put("bbs.cqyc.net", "茶竹永川网"); - SOURCE_MAP.put("loveshang.com", "爱上网"); - SOURCE_MAP.put("loveshang.com", "爱上网"); - SOURCE_MAP.put("1fangchan.com", "1句容第一房产"); - SOURCE_MAP.put("1fangchan.com", "1句容第一房产"); - SOURCE_MAP.put("sun0769.com", "阳光房产网"); - SOURCE_MAP.put("fzg360.com", "房掌柜"); - SOURCE_MAP.put("zunars.com", "租哪儿"); - SOURCE_MAP.put("gusuwang.com", "姑苏房产"); - SOURCE_MAP.put("cszzc.cn", "苏州之窗"); - SOURCE_MAP.put("lbfcw.com", "鲁北房产网"); - SOURCE_MAP.put("tjs.cc", "道津网"); - SOURCE_MAP.put("tjs.cc", "道津网"); - SOURCE_MAP.put("china183.com", "183住房网"); - SOURCE_MAP.put("ifang.com", "一房网"); - SOURCE_MAP.put("ifang.com", "一房网"); - SOURCE_MAP.put("zhijia.com", "置家网"); - SOURCE_MAP.put("baozupo.com", "包租婆"); - SOURCE_MAP.put("haozu123.com", "好租123"); - SOURCE_MAP.put("0391fc.com", "焦作房产信息网"); - SOURCE_MAP.put("jzhome.cn", "锦州房产网"); - SOURCE_MAP.put("tzfdc.com.cn", "泰州房地产信息网"); - SOURCE_MAP.put("52mf.com", "魔方公寓租房"); - SOURCE_MAP.put("yujiangongyu.com", "寓见公寓"); - SOURCE_MAP.put("373f.com", "新乡房产网"); - SOURCE_MAP.put("tmsf.com", "透明售房网"); - SOURCE_MAP.put("baletu.com", "巴乐兔"); - SOURCE_MAP.put("goufw.com", "GO房网"); - SOURCE_MAP.put("qj-fang.com", "全景房源网"); - SOURCE_MAP.put("qj-fang.com", "全景房源网"); - SOURCE_MAP.put("gxsky.com", "时空房产网"); - SOURCE_MAP.put("51fdc.com", "无忧房网"); - SOURCE_MAP.put("rgfcw.com", "如皋房产网"); + SOURCE_MAP.put("ok0563.com", "瀹e煄鎴夸骇浜ゆ槗缃�"); + SOURCE_MAP.put("0856.com.cn", "閾滀粊鍦ㄧ嚎"); + SOURCE_MAP.put("tr169.cn", "閾滀粊閮藉競缃�"); + SOURCE_MAP.put("trren.cn", "閾滀粊鎴夸骇"); + SOURCE_MAP.put("0350.cn", "蹇诲窞淇℃伅娓�"); + SOURCE_MAP.put("xinyumh.com", "鏂颁綑闂ㄦ埛缃�"); + SOURCE_MAP.put("0701dcw.com", "楣版江鍦颁骇缃�"); + SOURCE_MAP.put("0790dcw.com", "鏂颁綑鍦颁骇缃�0790"); + SOURCE_MAP.put("97hami.com", "涔濇棗缃�"); + SOURCE_MAP.put("0998xj.com", "鍠�浠�鐢熸椿缃�"); + SOURCE_MAP.put("o0998.com", "鍠�浠�闂ㄦ埛缃�"); + SOURCE_MAP.put("0597kk.com", "榫欏博KK缃�"); + SOURCE_MAP.put("luohe.com.cn", "婕渤缃�"); + SOURCE_MAP.put("0395fc.com", "婕渤鎴夸骇缃�0395fc"); + SOURCE_MAP.put("0395home.com", "婕渤璐埧缃�"); + SOURCE_MAP.put("ks-lxjy.com", "鐞嗘兂瀹跺洯"); + SOURCE_MAP.put("elefang.com", "鏄撲箰鎴�"); + SOURCE_MAP.put("gashw.com", "鍏畨瀹跺洯鎴夸骇缃�"); + SOURCE_MAP.put("longcai0351.com", "鍝堝皵婊ㄤ簩鎵嬫埧"); + SOURCE_MAP.put("6665.com", "涓婃捣婊�"); + SOURCE_MAP.put("0598777.net", "涓夋槑鎴夸骇瀹惰缃�"); + SOURCE_MAP.put("860598.com", "涓夋槑鑺箰缃�"); + SOURCE_MAP.put("0719114.com", "鍗佸牥鎴垮湴浜�"); + SOURCE_MAP.put("trlpw.com", "閾滀粊妤肩洏缃�"); + SOURCE_MAP.put("aofenglu.com", "瀹e煄鎴夸骇缃慳ofenglu"); + SOURCE_MAP.put("lhloushi.com", "婕渤妤煎競"); + SOURCE_MAP.put("0597house.com", "榫欏博鎴夸骇缃�0597"); + SOURCE_MAP.put("myzf.net", "缁甸槼浣忔埧缃�"); + SOURCE_MAP.put("rafdcw.com", "鐟炲畨鎴垮湴浜х綉"); + SOURCE_MAP.put("wzfc.net", "娓╁窞鎴夸骇浜ゆ槗缃�"); + SOURCE_MAP.put("smzf.net", "涓夋槑浣忔埧缃�"); + SOURCE_MAP.put("xchfc.cn", "瀹e煄鎴夸骇缃憍chfc"); + SOURCE_MAP.put("0792f.cn", "鎴跨洘"); + SOURCE_MAP.put("0797fdc.com.cn", "璧e窞鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("ayxxz.com", "瀹夐槼淇℃伅绔�"); + SOURCE_MAP.put("mlxks.com", "榄呭姏鍠�浠�"); + SOURCE_MAP.put("xuanfang.org", "瀹e煄鎴夸骇缃憍uanfang"); + SOURCE_MAP.put("xlzjdc.com", "鍏撮殕缃缃�"); + SOURCE_MAP.put("sthouse.net", "姹曞ご鎴夸骇缃�"); + SOURCE_MAP.put("hzfcw.com", "鏉窞鎴夸骇缃慼zfcw.com"); + SOURCE_MAP.put("0790f.cn", "鏂颁綑鎴夸骇缃�0790f"); + SOURCE_MAP.put("sj.net.cn", "鑼稿煄璁哄潧"); + SOURCE_MAP.put("lizihang.com", "涓藉吂琛�"); + SOURCE_MAP.put("dytfw.com", "澶ч倯浜屾墜鎴�"); + SOURCE_MAP.put("laizhouba.com", "鑾卞窞淇℃伅缃�"); + SOURCE_MAP.put("51haofu.com", "51璞簻"); + SOURCE_MAP.put("0990bbs.com", "鍏嬫媺鐜涗緷淇℃伅缃�"); + SOURCE_MAP.put("akszc.com", "闃垮厠鑻忎箣绐�"); + SOURCE_MAP.put("xjklmy.cc", "娌瑰煄淇℃伅娓�"); + SOURCE_MAP.put("klmyr.com", "鍏嬫媺鐜涗緷淇℃伅缃戯紙KLMY锛�"); + SOURCE_MAP.put("365tsh.com", "365澶╃敓娲荤綉"); + SOURCE_MAP.put("jiayouhh.com", "鍔犳补绾㈡渤缃�"); + SOURCE_MAP.put("jcok.com.cn", "璐哄窞浣虫垚鎴夸骇缃�"); + SOURCE_MAP.put("0991fc.com", "涔岄瞾鏈ㄩ綈鎴夸骇缃�"); + SOURCE_MAP.put("t55.com", "娣樼獫绐�"); + SOURCE_MAP.put("0482home.com", "绾㈠煄瀹跺洯缃�"); + SOURCE_MAP.put("huimin168.com", "鍏村畨鎯犳皯缃�"); + SOURCE_MAP.put("04828.com", "鍏村畨鐩熶俊鎭綉"); + SOURCE_MAP.put("bsfw.cn", "淇濆北鎴跨綉"); + SOURCE_MAP.put("msfc114.com", "鐪夊北娣樻埧缃�"); + SOURCE_MAP.put("52m3.com", "鐪夊北鎴夸骇鍦ㄧ嚎"); + SOURCE_MAP.put("dy6c.com", "寰烽槼6鍩庣綉"); + SOURCE_MAP.put("dangdi.cc", "褰撳湴缃�"); + SOURCE_MAP.put("0826fang.com", "骞垮畨鎴夸骇缃�0826fang"); + SOURCE_MAP.put("gafc8.cn", "绉熸埧鍚�"); + SOURCE_MAP.put("beiww.com", "鍖楃含缃�"); + SOURCE_MAP.put("dpcm.cn", "澶ч箯鏂伴椈缃�"); + SOURCE_MAP.put("hhzc.cn", "涓浗绾㈡渤"); + SOURCE_MAP.put("xlglfdc.com", "閿$洘鎴夸骇缃�"); + SOURCE_MAP.put("0479xx.com", "閿$洘淇℃伅娓�"); + SOURCE_MAP.put("o912.com", "姒嗘灄鎴夸骇缃�"); + SOURCE_MAP.put("ylxxg.com", "姒嗘灄淇℃伅娓�"); + SOURCE_MAP.put("yzdsb.com", "涔版埧"); + SOURCE_MAP.put("qinzhoufc.com", "閽﹀窞鎴夸骇"); + SOURCE_MAP.put("qzfdcw.net", "閽﹀窞鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("qzfcxh.com", "閽﹀窞鎴夸骇鍗忎細"); + SOURCE_MAP.put("xinxi263.com", "鍗楅槼淇℃伅娓�"); + SOURCE_MAP.put("nyhaofang.com", "鍗楅槼濂芥埧缃�"); + SOURCE_MAP.put("jiazhuly.com", "瀹朵綇涓存矀"); + SOURCE_MAP.put("linyiren.com", "涓存矀浜烘埧浜х綉"); + SOURCE_MAP.put("0539zf.com", "涓存矀鎵炬埧缃�"); + SOURCE_MAP.put("goufon.com", "涓存矀璐埧缃�"); + SOURCE_MAP.put("xjklmy.cn", "鍏嬫媺鐜涗緷娌瑰煄淇℃伅娓�"); + SOURCE_MAP.put("0539f.cn", "涓存矀鎴夸骇缃�0539f"); + SOURCE_MAP.put("linfen365.com", "涓存本365"); + SOURCE_MAP.put("520953.com", "鍚村繝淇℃伅娓�"); + SOURCE_MAP.put("k0477.com", "閯傚皵澶氭柉淇℃伅娓�"); + SOURCE_MAP.put("lasafc.com", "鎷夎惃鎴夸骇缃�"); + SOURCE_MAP.put("gxwuzhou.com", "楦虫睙鐢熸椿缃�"); + SOURCE_MAP.put("0478fdc.com", "宸村溅娣栧皵鎴垮湴浜х綉"); + SOURCE_MAP.put("dahoutao.com", "澶у悗濂楃綉"); + SOURCE_MAP.put("hi772.com", "鏉ュ鎴夸骇缃�"); + SOURCE_MAP.put("lbkfw.com", "鏉ュ鐪嬫埧缃�"); + SOURCE_MAP.put("0952100.com", "鐭冲槾灞辩敓娲荤綉"); + SOURCE_MAP.put("0418fc.com", "闃滄柊鎴夸骇缃�"); + SOURCE_MAP.put("04820482.com", "鍏村畨鐩熶俊鎭腐"); + SOURCE_MAP.put("h0418.com", "闃滄柊鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("fxw.cc", "闃滄柊鎴夸骇缃慺xw"); + SOURCE_MAP.put("hotfcw.com", "鐑偣鎴夸骇缃�"); + SOURCE_MAP.put("zjkhome.net", "寮犲鍙fゼ甯傜綉"); + SOURCE_MAP.put("0474.net", "涔屽叞瀵熷竷闂ㄦ埛缃�"); + SOURCE_MAP.put("xtloushi.com", "閭㈠彴妤煎競"); + SOURCE_MAP.put("fc0319.com", "閭㈠彴鎴夸骇缃�"); + SOURCE_MAP.put("housext.com", "閭㈠彴鎴垮湴浜х綉"); + SOURCE_MAP.put("xtzhiye.com", "閭㈠彴缃笟缃�"); + SOURCE_MAP.put("zzfangchan.com", "閮戝窞鎴夸骇缃�"); + SOURCE_MAP.put("ndfdc.com", "瀹佸痉鎴垮湴浜х綉"); + SOURCE_MAP.put("rzbyfc.com", "鏃ョ収鎶ヤ笟鎴夸骇缃�"); + SOURCE_MAP.put("fc0775.com", "璐垫腐鎴夸骇鐑嚎"); + SOURCE_MAP.put("ggfcxx.com", "璐垫腐鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("suzhoufcw.com", "瀹垮窞鏄撴煡缃�"); + SOURCE_MAP.put("fangchan0438.com", "鏉惧師鎴夸骇缃�"); + SOURCE_MAP.put("0419f.com", "杈介槼鎴夸骇缃�"); + SOURCE_MAP.put("chzfdc.com", "姹犲窞鎴夸骇鐢熸椿缃�"); + SOURCE_MAP.put("137400.net", "鍏村畨鏃剁┖"); + SOURCE_MAP.put("xammh.com", "鍏村畨鐩熼棬鎴风綉"); + SOURCE_MAP.put("xammh.com", "鍏村畨鐩熼棬鎴风綉"); + SOURCE_MAP.put("zsnews.cn", "涓北妤煎競缃�"); + SOURCE_MAP.put("haofang365.com", "濂芥埧365"); + SOURCE_MAP.put("aft888.com", "闃垮嚒鎻�"); + SOURCE_MAP.put("hh126.com", "绾㈡渤126"); + SOURCE_MAP.put("maoyanyan.net", "姒嗘灄姣涚溂鐪兼埧浜�"); + SOURCE_MAP.put("0912f.com", "姒嗘灄鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("linyiloushi.com", "涓存矀妤煎競"); + SOURCE_MAP.put("linyesf.com", "涓存矀鎴夸骇缃�"); + SOURCE_MAP.put("0539fc.com", "0539鎴夸骇缃�"); + SOURCE_MAP.put("0357linfen.com", "涓存本缃�"); + SOURCE_MAP.put("qth8.com", "涓冨彴娌充俊鎭綉"); + SOURCE_MAP.put("new0546.com", "鏂颁笢钀ヤ俊鎭腐"); + SOURCE_MAP.put("anjufw.net", "瀹夊眳鎴跨綉"); + SOURCE_MAP.put("linfangwang.com", "涓存埧缃�"); + SOURCE_MAP.put("ybfw.net", "寤惰竟鍗冪洓鎴夸骇"); + SOURCE_MAP.put("yiwu.com.cn", "涔変箤缃�"); + SOURCE_MAP.put("xianyf.com", "鍜搁槼澶ц薄鎴夸骇缃�"); + SOURCE_MAP.put("fang580.com", "濂芥埧缃慱fang580"); + SOURCE_MAP.put("yoher.com", "鍚嗗枬缃�"); + SOURCE_MAP.put("cityfdc.com", "涓浗鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("114chn.com", "114鐢熸椿缃�"); + SOURCE_MAP.put("xinfun.net", "鏂版埧缃�"); + SOURCE_MAP.put(".baidu.com", "鐧惧害鎴夸骇"); + SOURCE_MAP.put("xxfang.com", "鏂颁埂鎴夸骇"); + SOURCE_MAP.put("kfloushi.com", "寮�灏佹ゼ甯�"); + SOURCE_MAP.put("bdbxw.com", "淇濆畾鐧惧缃�"); + SOURCE_MAP.put("0510f.cn", "鏃犻敗鎴夸骇缃慱0510f"); + SOURCE_MAP.put("gannanzhou.com.cn", "鐢樺崡涔嬬獥"); + SOURCE_MAP.put("fang63.com", "涔愬北鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("hd3158.cn", "鍥炬埧缃�"); + SOURCE_MAP.put("laoke.com", "鑰佸"); + SOURCE_MAP.put("mayanchina.com", "鐜涢泤鎴垮眿"); + SOURCE_MAP.put("yskfc.com", "婧ч槼椤哄紑鎴夸骇缃�"); + SOURCE_MAP.put("ecen.com.cn", "浼婂煄鍦颁骇"); + SOURCE_MAP.put("wanzid.com", "娉夊窞鏈涘畨缃湴"); + SOURCE_MAP.put("yxfyfc.com", "瀹滃叴鏂瑰渾鎴夸骇涓粙"); + SOURCE_MAP.put("bzleju.com", "宸翠腑涔愬眳鎴夸骇缃�"); + SOURCE_MAP.put("xiaoganshi.net", "蹇靛涓嶅姩浜�"); + SOURCE_MAP.put("bzhqfc.com", "楦挎ˉ鎴夸骇"); + SOURCE_MAP.put("jiayuanfangchan.com.cn", "浣崇紭鎴夸骇"); + SOURCE_MAP.put("zhengdafangchan.com", "琛℃按姝eぇ鎴夸骇缃�"); + SOURCE_MAP.put("lejiafangchan.com", "琛℃按涔愬鎴夸骇涓粙"); + SOURCE_MAP.put("zxfc.cn", "缃俊鎴夸骇"); + SOURCE_MAP.put("tzjhfcw.com", "娉板窞鎴夸骇缃慱tzjhfcw"); + SOURCE_MAP.put("dooyoo.net.cn", "寰蜂綉鍦颁骇"); + SOURCE_MAP.put("rafcxx.com", "鐟炲畨鎴夸骇涓粙缃�"); + SOURCE_MAP.put("house.e47.cn", "姹熸触鍦ㄧ嚎"); + SOURCE_MAP.put("wanziqianhong.cn", "涓囩传鍗冪孩鎴夸骇"); + SOURCE_MAP.put("100ks.cn", "鐧惧垎鐧炬埧浜�"); + SOURCE_MAP.put("55555558.com", "楠勯槼鍦颁骇"); + SOURCE_MAP.put("roboo.com", "鑺滄箹鎴夸骇"); + SOURCE_MAP.put("house0579.com", "浜氬拰鎴夸骇"); + SOURCE_MAP.put("wanzhoufc.com", "涓囧窞绉熸埧缃�"); + SOURCE_MAP.put("fc.cqyy.net", "浜戦槼鎴夸骇缃�"); + SOURCE_MAP.put("aifengjie.com", "濂夎妭鐢熸椿缃�"); + SOURCE_MAP.put("btfcw.net", "姣旂壒鎴夸骇"); + SOURCE_MAP.put("023755.com", "閰夐槼鍦ㄧ嚎"); + SOURCE_MAP.put("xinle.ccoo.cn", "鏂颁箰缃�"); + SOURCE_MAP.put("stlafc.com", "鍒╁畨鎴夸骇"); + SOURCE_MAP.put("bdhouse.net", "鍢変俊鎴夸骇"); + SOURCE_MAP.put("zhuoyuefch.com", "鍜搁槼鍗撹秺鎴夸骇"); + SOURCE_MAP.put("glhyfc.com.cn", "妗傛灄楦垮畤鎴夸骇"); + SOURCE_MAP.put("cqmmgo.com", "閲嶅簡璐墿鐙�"); + SOURCE_MAP.put("0313house.com", "涓囦匠"); + SOURCE_MAP.put("house.inhe.net", "閾舵渤鎴夸骇"); + SOURCE_MAP.put("hechuan.ccoo.cn", "鍚堝窛鍦ㄧ嚎"); + SOURCE_MAP.put("xjjw.ccoo.cn", "鏂版睙娲ョ綉"); + SOURCE_MAP.put("shizhu.ccoo.cn", "鐭虫煴鍦ㄧ嚎"); + SOURCE_MAP.put("wulong365.com", "姝﹂殕鍦ㄧ嚎"); + SOURCE_MAP.put("xiushan.ccoo.cn", "绉�灞变箣绐�"); + SOURCE_MAP.put("gpai.net", "鍏媿缃�"); + SOURCE_MAP.put("hbfdc.gov.cn", "娣寳甯備綇瀹呬笌鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("grfy.net", "涓汉鎴挎簮缃�"); + SOURCE_MAP.put("fangtan007.com", "鎴挎帰缃慺t"); + SOURCE_MAP.put("01fy.cn", "绗竴鏃堕棿"); + SOURCE_MAP.put("fdfy.cn", "鎴夸笢鎴挎簮"); + SOURCE_MAP.put("360fdc.com", "涓埧缃�"); + SOURCE_MAP.put("fdfy.cn", "鎴夸笢鎴挎簮"); + SOURCE_MAP.put("rcfc.cn", "鑽f槍鎴夸骇缃�"); + SOURCE_MAP.put("rcfc.cn", "鑽f槍鎴夸骇缃�"); + SOURCE_MAP.put("fengjie.ccoo.cn", "濂夎妭鍦ㄧ嚎"); + SOURCE_MAP.put("cqpsw.cn", "褰按缃�"); + SOURCE_MAP.put("cqhc.cn", "涓夋睙璁哄潧"); + SOURCE_MAP.put("qj023.com", "缍︽睙鍦ㄧ嚎"); + SOURCE_MAP.put("epy.cn", "鐣鎴夸骇缃�"); + SOURCE_MAP.put("epy.cn", "鐣鎴夸骇缃�"); + SOURCE_MAP.put("409000.cn", "榛旀睙鍦ㄧ嚎"); + SOURCE_MAP.put("bbs.cqyc.net", "鑼剁姘稿窛缃�"); + SOURCE_MAP.put("rexian.net.cn", "姝︽眽鐑嚎鎴夸骇缃�"); + SOURCE_MAP.put("house.sxdsw.net", "涓夊场閮藉競缃�"); + SOURCE_MAP.put("hfhouse.com", "鍚堣偉鎴垮湴浜т氦鏄撶綉"); + SOURCE_MAP.put("fdzfw.com", "鎴夸笢绉熸埧缃�"); + SOURCE_MAP.put("fdzfw.com", "鎴夸笢绉熸埧缃�"); + SOURCE_MAP.put("saofang.cn", "鎵埧缃�"); + SOURCE_MAP.put("saofang.cn", "鎵埧缃�"); + SOURCE_MAP.put("bbs.cqyc.net", "鑼剁姘稿窛缃�"); + SOURCE_MAP.put("loveshang.com", "鐖变笂缃�"); + SOURCE_MAP.put("loveshang.com", "鐖变笂缃�"); + SOURCE_MAP.put("1fangchan.com", "1鍙ュ绗竴鎴夸骇"); + SOURCE_MAP.put("1fangchan.com", "1鍙ュ绗竴鎴夸骇"); + SOURCE_MAP.put("sun0769.com", "闃冲厜鎴夸骇缃�"); + SOURCE_MAP.put("fzg360.com", "鎴挎帉鏌�"); + SOURCE_MAP.put("zunars.com", "绉熷摢鍎�"); + SOURCE_MAP.put("gusuwang.com", "濮戣嫃鎴夸骇"); + SOURCE_MAP.put("cszzc.cn", "鑻忓窞涔嬬獥"); + SOURCE_MAP.put("lbfcw.com", "椴佸寳鎴夸骇缃�"); + SOURCE_MAP.put("tjs.cc", "閬撴触缃�"); + SOURCE_MAP.put("tjs.cc", "閬撴触缃�"); + SOURCE_MAP.put("china183.com", "183浣忔埧缃�"); + SOURCE_MAP.put("ifang.com", "涓�鎴跨綉"); + SOURCE_MAP.put("ifang.com", "涓�鎴跨綉"); + SOURCE_MAP.put("zhijia.com", "缃缃�"); + SOURCE_MAP.put("baozupo.com", "鍖呯濠�"); + SOURCE_MAP.put("haozu123.com", "濂界123"); + SOURCE_MAP.put("0391fc.com", "鐒︿綔鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("jzhome.cn", "閿﹀窞鎴夸骇缃�"); + SOURCE_MAP.put("tzfdc.com.cn", "娉板窞鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("52mf.com", "榄旀柟鍏瘬绉熸埧"); + SOURCE_MAP.put("yujiangongyu.com", "瀵撹鍏瘬"); + SOURCE_MAP.put("373f.com", "鏂颁埂鎴夸骇缃�"); + SOURCE_MAP.put("tmsf.com", "閫忔槑鍞埧缃�"); + SOURCE_MAP.put("baletu.com", "宸翠箰鍏�"); + SOURCE_MAP.put("goufw.com", "GO鎴跨綉"); + SOURCE_MAP.put("qj-fang.com", "鍏ㄦ櫙鎴挎簮缃�"); + SOURCE_MAP.put("qj-fang.com", "鍏ㄦ櫙鎴挎簮缃�"); + SOURCE_MAP.put("gxsky.com", "鏃剁┖鎴夸骇缃�"); + SOURCE_MAP.put("51fdc.com", "鏃犲咖鎴跨綉"); + SOURCE_MAP.put("rgfcw.com", "濡傜殝鎴夸骇缃�"); SOURCE_MAP.put("warmjar.com", "warm+"); - SOURCE_MAP.put("0391fc.com", "焦作房产信息网"); - SOURCE_MAP.put("5a5f.com", "租房者网站"); - SOURCE_MAP.put("5a5f.com", "租房者网站"); - SOURCE_MAP.put("hmjfdc.com", "和美家地产"); - SOURCE_MAP.put("hmjfdc.com", "和美家地产"); - SOURCE_MAP.put("0757zj.com", "佛山之家"); - SOURCE_MAP.put("housetc.com", "太仓房产网"); - SOURCE_MAP.put("housetc.com", "太仓房产网"); - SOURCE_MAP.put("0951f.com", "银川房网"); - SOURCE_MAP.put("js.cn", "昆山房产网"); - SOURCE_MAP.put("haixilt.com", "漳州买房子"); - SOURCE_MAP.put("you0511.com", "0511生活网"); - SOURCE_MAP.put("zfzl.net", "郑州房产租赁网"); - SOURCE_MAP.put("7haikou.com", "海口在线"); - SOURCE_MAP.put("7haikou.com", "海口在线"); - SOURCE_MAP.put("suzfang.com", "su苏州房产网"); - SOURCE_MAP.put("houseshangdu.com", "商都房产网"); - SOURCE_MAP.put("zhiding8.com", "置顶吧"); - SOURCE_MAP.put("55555558.com", "骄阳地产"); - SOURCE_MAP.put("qk365.com", "青客"); - SOURCE_MAP.put("uoko.com", "优客逸家"); - SOURCE_MAP.put("mogoroom.com", "蘑菇租房"); - SOURCE_MAP.put("360fc.cn", "360房产网"); - SOURCE_MAP.put("0759h.com", "湛江二手房交易网"); - SOURCE_MAP.put("0759h.com", "湛江二手房交易网"); - SOURCE_MAP.put("lieju.com", "列举网"); - SOURCE_MAP.put("0595qz.com", "搜剿房产网"); - SOURCE_MAP.put("0595qz.com", "搜剿房产网"); - SOURCE_MAP.put("517zufang.com", "无忧房产网"); - SOURCE_MAP.put("ljia.net", "恋家网"); - SOURCE_MAP.put("haolaba.org", "好喇叭网"); - SOURCE_MAP.put("rehe2.com", "热河网"); - SOURCE_MAP.put("fanglianw.com", "九江房联网"); - SOURCE_MAP.put("ziroom.com", "自如网"); - SOURCE_MAP.put("njsfcw.com", "南京房产"); - SOURCE_MAP.put("107room.com", "107间"); - SOURCE_MAP.put("njsfcw.com", "南京房产"); - SOURCE_MAP.put("wangjing2008.com", "望京房产信息中心"); - SOURCE_MAP.put("wangjing2008.com", "望京房产信息中心"); - SOURCE_MAP.put("youfang123.com", "优房网123"); - SOURCE_MAP.put("3dfc.com", "3D房产网"); - SOURCE_MAP.put("1818js.ccoo.cn", "江山百姓网"); - SOURCE_MAP.put("1818js.ccoo.cn", "江山百姓网"); - SOURCE_MAP.put("anji.ccoo.cn", "今日安吉"); - SOURCE_MAP.put("anji.ccoo.cn", "今日安吉"); - SOURCE_MAP.put("221600.cn", "沛县便民网"); - SOURCE_MAP.put("221600.cn", "沛县便民网"); - SOURCE_MAP.put("daikan.cn", "带看"); - SOURCE_MAP.put("sqfcw.com.cn", "西楚房产网"); - SOURCE_MAP.put("ningbo.ccoo.cn", "宁波在线"); - SOURCE_MAP.put("ningbo.ccoo.cn", "宁波在线"); - SOURCE_MAP.put("cnool.net", "东方热线房产网"); - SOURCE_MAP.put("0570h.com", "江山二手房网"); - SOURCE_MAP.put("0570h.com", "江山二手房网"); - SOURCE_MAP.put("tengfang.net", "腾房网"); - SOURCE_MAP.put("dyfc.net", "东营房产网"); - SOURCE_MAP.put("ntxx.net", "南通热线"); - SOURCE_MAP.put("nbnt.com.cn", "南天房产"); - SOURCE_MAP.put("wofang.com", "我房网"); - SOURCE_MAP.put("0798.ws", "景德镇为民网"); - SOURCE_MAP.put("0798.ws", "景德镇为民网"); - SOURCE_MAP.put("0937.net", "嘉酒视窗"); - SOURCE_MAP.put("0937.net", "嘉酒视窗"); - SOURCE_MAP.put("0724fc.com", "荆门房产网"); - SOURCE_MAP.put("0724fc.com", "荆门房产网"); - SOURCE_MAP.put("nthouse.com.cn", "南通房产超市"); - SOURCE_MAP.put("f.cx", "房产讯"); - SOURCE_MAP.put("f.cx", "房产讯"); - SOURCE_MAP.put("fenlei265.com", "分类265网"); - SOURCE_MAP.put("fenlei265.com", "分类265网"); - SOURCE_MAP.put("jysq.net", "暨阳社区"); - SOURCE_MAP.put("feicheng.ccoo.cn", "肥城在线"); - SOURCE_MAP.put("feicheng.ccoo.cn", "肥城在线"); - SOURCE_MAP.put("grxxw.com", "广饶信息网"); - SOURCE_MAP.put("grxxw.com", "广饶信息网"); - SOURCE_MAP.put("guangyuan.ccoo.cn", "广元都市网"); - SOURCE_MAP.put("guangyuan.ccoo.cn", "广元都市网"); - SOURCE_MAP.put("itongxu.cn", "通许视窗"); - SOURCE_MAP.put("itongxu.cn", "通许视窗"); - SOURCE_MAP.put("zhashui.ccoo.cn", "柞水在线"); - SOURCE_MAP.put("zhashui.ccoo.cn", "柞水在线"); - SOURCE_MAP.put("zuoyun.ccoo.cn", "左云在线"); - SOURCE_MAP.put("zuoyun.ccoo.cn", "左云在线"); - SOURCE_MAP.put("jjw.com", "吉家网"); - SOURCE_MAP.put("212300.com", "丹阳房产"); - SOURCE_MAP.put("kffcww.com", "开封房产"); - SOURCE_MAP.put("jjw.com", "吉家网"); - SOURCE_MAP.put("0352fang.com", "大同房产网"); - SOURCE_MAP.put("zunhua.ccoo.cn", "遵化在线"); - SOURCE_MAP.put("zunhua.ccoo.cn", "遵化在线"); - SOURCE_MAP.put("ziyun.ccoo.cn", "紫云在线"); - SOURCE_MAP.put("ziyun.ccoo.cn", "紫云在线"); - SOURCE_MAP.put("212300.com", "丹阳房产"); - SOURCE_MAP.put("xyfc.com", "襄阳房产"); - SOURCE_MAP.put("hbzyfc.com", "枣阳房产网"); - SOURCE_MAP.put("hbzyfc.com", "枣阳房产网"); - SOURCE_MAP.put("lygrx.com", "连云港房产"); - SOURCE_MAP.put("lygrx.com", "连云港房产"); - SOURCE_MAP.put("izhails.com", "连云港房产超市"); - SOURCE_MAP.put("ziyang.ccoo.cn", "紫阳在线"); - SOURCE_MAP.put("ziyang.ccoo.cn", "紫阳在线"); - SOURCE_MAP.put("zijin.ccoo.cn", "紫金在线"); - SOURCE_MAP.put("zijin.ccoo.cn", "紫金在线"); - SOURCE_MAP.put("macheng.ccoo.cn", "麻城信息网"); - SOURCE_MAP.put("macheng.ccoo.cn", "麻城信息网"); - SOURCE_MAP.put("longnan.ccoo.cn", "陇南都市网"); - SOURCE_MAP.put("longnan.ccoo.cn", "陇南都市网"); - SOURCE_MAP.put("china-house.com", "国房网"); - SOURCE_MAP.put("fzbm.com", "福州便民网"); - SOURCE_MAP.put("fzbm.com", "福州便民网"); - SOURCE_MAP.put("zigui.ccoo.cn", "秭归在线"); - SOURCE_MAP.put("zigui.ccoo.cn", "秭归在线"); - SOURCE_MAP.put("zizhou.ccoo.cn", "子洲信息港"); - SOURCE_MAP.put("zizhou.ccoo.cn", "子洲信息港"); - SOURCE_MAP.put("haofang5.com", "好房网haofang5"); - SOURCE_MAP.put("mzl.ccoo.cn", "满洲里惠民网"); - SOURCE_MAP.put("mzl.ccoo.cn", "满洲里惠民网"); - SOURCE_MAP.put("qhxxg.net", "清河信息网"); - SOURCE_MAP.put("qhxxg.net", "清河信息网"); - SOURCE_MAP.put("zbinfo.net", "淄博信息港"); - SOURCE_MAP.put("zizhong.ccoo.cn", "资中在线"); - SOURCE_MAP.put("zizhong.ccoo.cn", "资中在线"); - SOURCE_MAP.put("sczy.ccoo.cn", "资阳在线"); - SOURCE_MAP.put("sczy.ccoo.cn", "资阳在线"); - SOURCE_MAP.put("fengdu.ccoo.cn", "丰都网"); - SOURCE_MAP.put("fengdu.ccoo.cn", "丰都网"); - SOURCE_MAP.put("binxian.cc", "彬县网"); - SOURCE_MAP.put("binxian.cc", "彬县网"); - SOURCE_MAP.put("songyuan114.net", "松原114"); - SOURCE_MAP.put("songyuan123.com", "松原123广告网"); - SOURCE_MAP.put("0825xx.com", "遂宁信息网"); - SOURCE_MAP.put("sz0557.cn", "宿州租房网"); - SOURCE_MAP.put("shunde.net.cn", "顺德房产网"); - SOURCE_MAP.put("shunde.net.cn", "顺德房产网"); - SOURCE_MAP.put("tsmj.com.cn", "唐山美家信息网"); - SOURCE_MAP.put("tsefang.com", "唐山E房网"); - SOURCE_MAP.put("tianmennet.com", "天门生活网"); - SOURCE_MAP.put("tlxxw.com", "通辽信息港"); - SOURCE_MAP.put("keq0475.com", "通辽买房网"); - SOURCE_MAP.put("tlfc.com.cn", "通辽房产信息网"); - SOURCE_MAP.put("lieju.com", "列举网"); - SOURCE_MAP.put("123sfw.cn", "视房网"); - SOURCE_MAP.put("danzhou8.com", "儋州在线"); - SOURCE_MAP.put("zixing.ccoo.cn", "资兴在线"); - SOURCE_MAP.put("zixing.ccoo.cn", "资兴在线"); - SOURCE_MAP.put("zhuozhou.ccoo.cn", "涿州之窗"); - SOURCE_MAP.put("zhuozhou.ccoo.cn", "涿州之窗"); - SOURCE_MAP.put("610115.com", "临潼之窗"); - SOURCE_MAP.put("610115.com", "临潼之窗"); - SOURCE_MAP.put("huanan.ccoo.cn", "桦南信息港"); - SOURCE_MAP.put("huanan.ccoo.cn", "桦南信息港"); - SOURCE_MAP.put("52zj.com.cn", "家在镇江"); - SOURCE_MAP.put("zfx365.com", "指房向"); - SOURCE_MAP.put("236400.com", "临泉在线"); - SOURCE_MAP.put("zjk100.com", "张家口资讯网"); - SOURCE_MAP.put("fangshijie.cn", "房世界"); - SOURCE_MAP.put("zhuozi.ccoo.cn", "卓资在线"); - SOURCE_MAP.put("zhuozi.ccoo.cn", "卓资在线"); - SOURCE_MAP.put("zhuolu.ccoo.cn", "涿鹿在线"); - SOURCE_MAP.put("zhuolu.ccoo.cn", "涿鹿在线"); - SOURCE_MAP.put("longhui.ccoo.cn", "隆回网"); - SOURCE_MAP.put("longhui.ccoo.cn", "隆回网"); - SOURCE_MAP.put("025002.com", "南京在线"); - SOURCE_MAP.put("025002.com", "南京在线"); - SOURCE_MAP.put("zge.ccoo.cn", "准格尔门户网"); - SOURCE_MAP.put("zge.ccoo.cn", "准格尔门户网"); - SOURCE_MAP.put("0731esf.com", "0731二手房网"); - SOURCE_MAP.put("jnhouse.com", "济南房产网"); - SOURCE_MAP.put("jnhouse.com", "济南房产网"); - SOURCE_MAP.put("hbzjrx.com", "枝江热线"); - SOURCE_MAP.put("hbzjrx.com", "枝江热线"); - SOURCE_MAP.put("snwugong.com", "武功在线"); - SOURCE_MAP.put("czfdc.com.cn", "常州房地产信息网"); - SOURCE_MAP.put("snwugong.com", "武功在线"); - SOURCE_MAP.put("czfdc.com.cn", "常州房地产信息网"); - SOURCE_MAP.put("365jia.cn", "万家热线"); - SOURCE_MAP.put("zhuanglang.ccoo.cn", "庄浪在线"); - SOURCE_MAP.put("zhuanglang.ccoo.cn", "庄浪在线"); - SOURCE_MAP.put("zhuanghe.ccoo.cn", "庄河在线"); - SOURCE_MAP.put("zhuanghe.ccoo.cn", "庄河在线"); - SOURCE_MAP.put("zxip.com", "慈溪房产网_xip"); - SOURCE_MAP.put("anxiw.com", "安溪网"); - SOURCE_MAP.put("anxiw.com", "安溪网"); - SOURCE_MAP.put("cqpsw.cn", "彭水网"); - SOURCE_MAP.put("tangyin.net", "汤阴在线"); - SOURCE_MAP.put("zhuxi.ccoo.cn", "竹溪在线"); - SOURCE_MAP.put("tangyin.net", "汤阴在线"); - SOURCE_MAP.put("zhuxi.ccoo.cn", "竹溪在线"); - SOURCE_MAP.put("zhushan.ccoo.cn", "竹山在线"); - SOURCE_MAP.put("zhushan.ccoo.cn", "竹山在线"); - SOURCE_MAP.put("ffw.com.cn", "福房网"); - SOURCE_MAP.put("jinta.ccoo.cn", "金塔在线"); - SOURCE_MAP.put("jinta.ccoo.cn", "金塔在线"); - SOURCE_MAP.put("0536qz.com", "青州在线"); - SOURCE_MAP.put("0536qz.com", "青州在线"); - SOURCE_MAP.put("0577home.net", "温州房网"); - SOURCE_MAP.put("js0573.com", "嘉善房产网"); - SOURCE_MAP.put("3dfc.com", "3D房产网"); - SOURCE_MAP.put("zhuzhouxian.ccoo.cn", "株洲县在线"); - SOURCE_MAP.put("zhuzhouxian.ccoo.cn", "株洲县在线"); - SOURCE_MAP.put("zhouning.ccoo.cn", "周宁在线"); - SOURCE_MAP.put("zhouning.ccoo.cn", "周宁在线"); - SOURCE_MAP.put("ok0911.com", "延安房产网"); - SOURCE_MAP.put("bxxx.cn", "延边百姓网"); - SOURCE_MAP.put("yczz.com", "盐城在线"); - SOURCE_MAP.put("0515fw.com", "盐城租房"); - SOURCE_MAP.put("0662f.net", "阳西二手房"); - SOURCE_MAP.put("yibinol.cn", "宜宾在线"); - SOURCE_MAP.put("835000.com", "伊犁买房子"); - SOURCE_MAP.put("chinayk.com", "中国营口论坛"); - SOURCE_MAP.put("jy510.com", "江阴510"); - SOURCE_MAP.put("ishangzu.com", "爱上租"); - SOURCE_MAP.put("zpfcw.com", "zpfcw.com邹平房产网"); - SOURCE_MAP.put("0476f.com", "赤峰房产信息网"); - SOURCE_MAP.put("0476f.com", "赤峰房产信息网"); - SOURCE_MAP.put("0715fc.com", "咸宁房产网"); - SOURCE_MAP.put("0715fc.com", "咸宁房产网"); - SOURCE_MAP.put("minle.ccoo.cn", "民乐信息港"); - SOURCE_MAP.put("minle.ccoo.cn", "民乐信息港"); - SOURCE_MAP.put("zg.ccoo.cn", "自贡都市网"); - SOURCE_MAP.put("china0796.com", "永丰网"); - SOURCE_MAP.put("china0796.com", "永丰网"); - SOURCE_MAP.put("342200.com", "寻乌在线"); - SOURCE_MAP.put("342200.com", "寻乌在线"); - SOURCE_MAP.put("xizi.com", "西子房产"); - SOURCE_MAP.put("pingguo.ccoo.cn", "平果视窗"); - SOURCE_MAP.put("pingguo.ccoo.cn", "平果视窗"); - SOURCE_MAP.put("fcdbz.com", "房产大巴扎"); - SOURCE_MAP.put("qingdaonews.com", "新闻网房产"); - SOURCE_MAP.put("fcptx.com", "兖州房产网"); - SOURCE_MAP.put("fcptx.com", "兖州房产网"); - SOURCE_MAP.put("jinfc.cn", "晋江房产网"); - SOURCE_MAP.put("jiaodong.net", "胶东房产网"); - SOURCE_MAP.put("ssfcw.net", "石狮房产网"); - SOURCE_MAP.put("jiaodong.net", "胶东房产网"); - SOURCE_MAP.put("jiaodong.net", "胶东房产网"); - SOURCE_MAP.put("xmfish.com", "小鱼房产"); - SOURCE_MAP.put("zhoushan.ccoo.cn", "舟山热线"); - SOURCE_MAP.put("zhoushan.ccoo.cn", "舟山热线"); - SOURCE_MAP.put("zhongxiang.ccoo.cn", "钟祥在线"); - SOURCE_MAP.put("zhongxiang.ccoo.cn", "钟祥在线"); - SOURCE_MAP.put("zhongmou.ccoo.cn", "中牟网"); - SOURCE_MAP.put("710089.ccoo.cn", "阎良之窗"); - SOURCE_MAP.put("710089.ccoo.cn", "阎良之窗"); - SOURCE_MAP.put("huoqiuw.com", "霍邱网"); - SOURCE_MAP.put("huoqiuw.com", "霍邱网"); - SOURCE_MAP.put("jiangyou.ccoo.cn", "江油在线"); - SOURCE_MAP.put("jiangyou.ccoo.cn", "江油在线"); - SOURCE_MAP.put("0434.cc", "四平新风采"); - SOURCE_MAP.put("zhongshan.ccoo.cn", "钟山在线"); - SOURCE_MAP.put("zhongshan.ccoo.cn", "钟山在线"); - SOURCE_MAP.put("033400.ccoo.cn", "中阳在线"); - SOURCE_MAP.put("033400.ccoo.cn", "中阳在线"); - SOURCE_MAP.put("ythouse.com", "烟台房地产网"); - SOURCE_MAP.put("lywww.com", "临沂在线"); + SOURCE_MAP.put("0391fc.com", "鐒︿綔鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("5a5f.com", "绉熸埧鑰呯綉绔�"); + SOURCE_MAP.put("5a5f.com", "绉熸埧鑰呯綉绔�"); + SOURCE_MAP.put("hmjfdc.com", "鍜岀編瀹跺湴浜�"); + SOURCE_MAP.put("hmjfdc.com", "鍜岀編瀹跺湴浜�"); + SOURCE_MAP.put("0757zj.com", "浣涘北涔嬪"); + SOURCE_MAP.put("housetc.com", "澶粨鎴夸骇缃�"); + SOURCE_MAP.put("housetc.com", "澶粨鎴夸骇缃�"); + SOURCE_MAP.put("0951f.com", "閾跺窛鎴跨綉"); + SOURCE_MAP.put("js.cn", "鏄嗗北鎴夸骇缃�"); + SOURCE_MAP.put("haixilt.com", "婕冲窞涔版埧瀛�"); + SOURCE_MAP.put("you0511.com", "0511鐢熸椿缃�"); + SOURCE_MAP.put("zfzl.net", "閮戝窞鎴夸骇绉熻祦缃�"); + SOURCE_MAP.put("7haikou.com", "娴峰彛鍦ㄧ嚎"); + SOURCE_MAP.put("7haikou.com", "娴峰彛鍦ㄧ嚎"); + SOURCE_MAP.put("suzfang.com", "su鑻忓窞鎴夸骇缃�"); + SOURCE_MAP.put("houseshangdu.com", "鍟嗛兘鎴夸骇缃�"); + SOURCE_MAP.put("zhiding8.com", "缃《鍚�"); + SOURCE_MAP.put("55555558.com", "楠勯槼鍦颁骇"); + SOURCE_MAP.put("qk365.com", "闈掑"); + SOURCE_MAP.put("uoko.com", "浼樺閫稿"); + SOURCE_MAP.put("mogoroom.com", "铇戣弴绉熸埧"); + SOURCE_MAP.put("360fc.cn", "360鎴夸骇缃�"); + SOURCE_MAP.put("0759h.com", "婀涙睙浜屾墜鎴夸氦鏄撶綉"); + SOURCE_MAP.put("0759h.com", "婀涙睙浜屾墜鎴夸氦鏄撶綉"); + SOURCE_MAP.put("lieju.com", "鍒椾妇缃�"); + SOURCE_MAP.put("0595qz.com", "鎼滃壙鎴夸骇缃�"); + SOURCE_MAP.put("0595qz.com", "鎼滃壙鎴夸骇缃�"); + SOURCE_MAP.put("517zufang.com", "鏃犲咖鎴夸骇缃�"); + SOURCE_MAP.put("ljia.net", "鎭嬪缃�"); + SOURCE_MAP.put("haolaba.org", "濂藉枃鍙綉"); + SOURCE_MAP.put("rehe2.com", "鐑渤缃�"); + SOURCE_MAP.put("fanglianw.com", "涔濇睙鎴胯仈缃�"); + SOURCE_MAP.put("ziroom.com", "鑷缃�"); + SOURCE_MAP.put("njsfcw.com", "鍗椾含鎴夸骇"); + SOURCE_MAP.put("107room.com", "107闂�"); + SOURCE_MAP.put("njsfcw.com", "鍗椾含鎴夸骇"); + SOURCE_MAP.put("wangjing2008.com", "鏈涗含鎴夸骇淇℃伅涓績"); + SOURCE_MAP.put("wangjing2008.com", "鏈涗含鎴夸骇淇℃伅涓績"); + SOURCE_MAP.put("youfang123.com", "浼樻埧缃�123"); + SOURCE_MAP.put("3dfc.com", "3D鎴夸骇缃�"); + SOURCE_MAP.put("1818js.ccoo.cn", "姹熷北鐧惧缃�"); + SOURCE_MAP.put("1818js.ccoo.cn", "姹熷北鐧惧缃�"); + SOURCE_MAP.put("anji.ccoo.cn", "浠婃棩瀹夊悏"); + SOURCE_MAP.put("anji.ccoo.cn", "浠婃棩瀹夊悏"); + SOURCE_MAP.put("221600.cn", "娌涘幙渚挎皯缃�"); + SOURCE_MAP.put("221600.cn", "娌涘幙渚挎皯缃�"); + SOURCE_MAP.put("daikan.cn", "甯︾湅"); + SOURCE_MAP.put("sqfcw.com.cn", "瑗挎鎴夸骇缃�"); + SOURCE_MAP.put("ningbo.ccoo.cn", "瀹佹尝鍦ㄧ嚎"); + SOURCE_MAP.put("ningbo.ccoo.cn", "瀹佹尝鍦ㄧ嚎"); + SOURCE_MAP.put("cnool.net", "涓滄柟鐑嚎鎴夸骇缃�"); + SOURCE_MAP.put("0570h.com", "姹熷北浜屾墜鎴跨綉"); + SOURCE_MAP.put("0570h.com", "姹熷北浜屾墜鎴跨綉"); + SOURCE_MAP.put("tengfang.net", "鑵炬埧缃�"); + SOURCE_MAP.put("dyfc.net", "涓滆惀鎴夸骇缃�"); + SOURCE_MAP.put("ntxx.net", "鍗楅�氱儹绾�"); + SOURCE_MAP.put("nbnt.com.cn", "鍗楀ぉ鎴夸骇"); + SOURCE_MAP.put("wofang.com", "鎴戞埧缃�"); + SOURCE_MAP.put("0798.ws", "鏅痉闀囦负姘戠綉"); + SOURCE_MAP.put("0798.ws", "鏅痉闀囦负姘戠綉"); + SOURCE_MAP.put("0937.net", "鍢夐厭瑙嗙獥"); + SOURCE_MAP.put("0937.net", "鍢夐厭瑙嗙獥"); + SOURCE_MAP.put("0724fc.com", "鑽嗛棬鎴夸骇缃�"); + SOURCE_MAP.put("0724fc.com", "鑽嗛棬鎴夸骇缃�"); + SOURCE_MAP.put("nthouse.com.cn", "鍗楅�氭埧浜ц秴甯�"); + SOURCE_MAP.put("f.cx", "鎴夸骇璁�"); + SOURCE_MAP.put("f.cx", "鎴夸骇璁�"); + SOURCE_MAP.put("fenlei265.com", "鍒嗙被265缃�"); + SOURCE_MAP.put("fenlei265.com", "鍒嗙被265缃�"); + SOURCE_MAP.put("jysq.net", "鏆ㄩ槼绀惧尯"); + SOURCE_MAP.put("feicheng.ccoo.cn", "鑲ュ煄鍦ㄧ嚎"); + SOURCE_MAP.put("feicheng.ccoo.cn", "鑲ュ煄鍦ㄧ嚎"); + SOURCE_MAP.put("grxxw.com", "骞块ザ淇℃伅缃�"); + SOURCE_MAP.put("grxxw.com", "骞块ザ淇℃伅缃�"); + SOURCE_MAP.put("guangyuan.ccoo.cn", "骞垮厓閮藉競缃�"); + SOURCE_MAP.put("guangyuan.ccoo.cn", "骞垮厓閮藉競缃�"); + SOURCE_MAP.put("itongxu.cn", "閫氳瑙嗙獥"); + SOURCE_MAP.put("itongxu.cn", "閫氳瑙嗙獥"); + SOURCE_MAP.put("zhashui.ccoo.cn", "鏌炴按鍦ㄧ嚎"); + SOURCE_MAP.put("zhashui.ccoo.cn", "鏌炴按鍦ㄧ嚎"); + SOURCE_MAP.put("zuoyun.ccoo.cn", "宸︿簯鍦ㄧ嚎"); + SOURCE_MAP.put("zuoyun.ccoo.cn", "宸︿簯鍦ㄧ嚎"); + SOURCE_MAP.put("jjw.com", "鍚夊缃�"); + SOURCE_MAP.put("212300.com", "涓归槼鎴夸骇"); + SOURCE_MAP.put("kffcww.com", "寮�灏佹埧浜�"); + SOURCE_MAP.put("jjw.com", "鍚夊缃�"); + SOURCE_MAP.put("0352fang.com", "澶у悓鎴夸骇缃�"); + SOURCE_MAP.put("zunhua.ccoo.cn", "閬靛寲鍦ㄧ嚎"); + SOURCE_MAP.put("zunhua.ccoo.cn", "閬靛寲鍦ㄧ嚎"); + SOURCE_MAP.put("ziyun.ccoo.cn", "绱簯鍦ㄧ嚎"); + SOURCE_MAP.put("ziyun.ccoo.cn", "绱簯鍦ㄧ嚎"); + SOURCE_MAP.put("212300.com", "涓归槼鎴夸骇"); + SOURCE_MAP.put("xyfc.com", "瑗勯槼鎴夸骇"); + SOURCE_MAP.put("hbzyfc.com", "鏋i槼鎴夸骇缃�"); + SOURCE_MAP.put("hbzyfc.com", "鏋i槼鎴夸骇缃�"); + SOURCE_MAP.put("lygrx.com", "杩炰簯娓埧浜�"); + SOURCE_MAP.put("lygrx.com", "杩炰簯娓埧浜�"); + SOURCE_MAP.put("izhails.com", "杩炰簯娓埧浜ц秴甯�"); + SOURCE_MAP.put("ziyang.ccoo.cn", "绱槼鍦ㄧ嚎"); + SOURCE_MAP.put("ziyang.ccoo.cn", "绱槼鍦ㄧ嚎"); + SOURCE_MAP.put("zijin.ccoo.cn", "绱噾鍦ㄧ嚎"); + SOURCE_MAP.put("zijin.ccoo.cn", "绱噾鍦ㄧ嚎"); + SOURCE_MAP.put("macheng.ccoo.cn", "楹诲煄淇℃伅缃�"); + SOURCE_MAP.put("macheng.ccoo.cn", "楹诲煄淇℃伅缃�"); + SOURCE_MAP.put("longnan.ccoo.cn", "闄囧崡閮藉競缃�"); + SOURCE_MAP.put("longnan.ccoo.cn", "闄囧崡閮藉競缃�"); + SOURCE_MAP.put("china-house.com", "鍥芥埧缃�"); + SOURCE_MAP.put("fzbm.com", "绂忓窞渚挎皯缃�"); + SOURCE_MAP.put("fzbm.com", "绂忓窞渚挎皯缃�"); + SOURCE_MAP.put("zigui.ccoo.cn", "绉綊鍦ㄧ嚎"); + SOURCE_MAP.put("zigui.ccoo.cn", "绉綊鍦ㄧ嚎"); + SOURCE_MAP.put("zizhou.ccoo.cn", "瀛愭床淇℃伅娓�"); + SOURCE_MAP.put("zizhou.ccoo.cn", "瀛愭床淇℃伅娓�"); + SOURCE_MAP.put("haofang5.com", "濂芥埧缃慼aofang5"); + SOURCE_MAP.put("mzl.ccoo.cn", "婊℃床閲屾儬姘戠綉"); + SOURCE_MAP.put("mzl.ccoo.cn", "婊℃床閲屾儬姘戠綉"); + SOURCE_MAP.put("qhxxg.net", "娓呮渤淇℃伅缃�"); + SOURCE_MAP.put("qhxxg.net", "娓呮渤淇℃伅缃�"); + SOURCE_MAP.put("zbinfo.net", "娣勫崥淇℃伅娓�"); + SOURCE_MAP.put("zizhong.ccoo.cn", "璧勪腑鍦ㄧ嚎"); + SOURCE_MAP.put("zizhong.ccoo.cn", "璧勪腑鍦ㄧ嚎"); + SOURCE_MAP.put("sczy.ccoo.cn", "璧勯槼鍦ㄧ嚎"); + SOURCE_MAP.put("sczy.ccoo.cn", "璧勯槼鍦ㄧ嚎"); + SOURCE_MAP.put("fengdu.ccoo.cn", "涓伴兘缃�"); + SOURCE_MAP.put("fengdu.ccoo.cn", "涓伴兘缃�"); + SOURCE_MAP.put("binxian.cc", "褰幙缃�"); + SOURCE_MAP.put("binxian.cc", "褰幙缃�"); + SOURCE_MAP.put("songyuan114.net", "鏉惧師114"); + SOURCE_MAP.put("songyuan123.com", "鏉惧師123骞垮憡缃�"); + SOURCE_MAP.put("0825xx.com", "閬傚畞淇℃伅缃�"); + SOURCE_MAP.put("sz0557.cn", "瀹垮窞绉熸埧缃�"); + SOURCE_MAP.put("shunde.net.cn", "椤哄痉鎴夸骇缃�"); + SOURCE_MAP.put("shunde.net.cn", "椤哄痉鎴夸骇缃�"); + SOURCE_MAP.put("tsmj.com.cn", "鍞愬北缇庡淇℃伅缃�"); + SOURCE_MAP.put("tsefang.com", "鍞愬北E鎴跨綉"); + SOURCE_MAP.put("tianmennet.com", "澶╅棬鐢熸椿缃�"); + SOURCE_MAP.put("tlxxw.com", "閫氳窘淇℃伅娓�"); + SOURCE_MAP.put("keq0475.com", "閫氳窘涔版埧缃�"); + SOURCE_MAP.put("tlfc.com.cn", "閫氳窘鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("lieju.com", "鍒椾妇缃�"); + SOURCE_MAP.put("123sfw.cn", "瑙嗘埧缃�"); + SOURCE_MAP.put("danzhou8.com", "鍎嬪窞鍦ㄧ嚎"); + SOURCE_MAP.put("zixing.ccoo.cn", "璧勫叴鍦ㄧ嚎"); + SOURCE_MAP.put("zixing.ccoo.cn", "璧勫叴鍦ㄧ嚎"); + SOURCE_MAP.put("zhuozhou.ccoo.cn", "娑垮窞涔嬬獥"); + SOURCE_MAP.put("zhuozhou.ccoo.cn", "娑垮窞涔嬬獥"); + SOURCE_MAP.put("610115.com", "涓存郊涔嬬獥"); + SOURCE_MAP.put("610115.com", "涓存郊涔嬬獥"); + SOURCE_MAP.put("huanan.ccoo.cn", "妗﹀崡淇℃伅娓�"); + SOURCE_MAP.put("huanan.ccoo.cn", "妗﹀崡淇℃伅娓�"); + SOURCE_MAP.put("52zj.com.cn", "瀹跺湪闀囨睙"); + SOURCE_MAP.put("zfx365.com", "鎸囨埧鍚�"); + SOURCE_MAP.put("236400.com", "涓存硥鍦ㄧ嚎"); + SOURCE_MAP.put("zjk100.com", "寮犲鍙h祫璁綉"); + SOURCE_MAP.put("fangshijie.cn", "鎴夸笘鐣�"); + SOURCE_MAP.put("zhuozi.ccoo.cn", "鍗撹祫鍦ㄧ嚎"); + SOURCE_MAP.put("zhuozi.ccoo.cn", "鍗撹祫鍦ㄧ嚎"); + SOURCE_MAP.put("zhuolu.ccoo.cn", "娑块箍鍦ㄧ嚎"); + SOURCE_MAP.put("zhuolu.ccoo.cn", "娑块箍鍦ㄧ嚎"); + SOURCE_MAP.put("longhui.ccoo.cn", "闅嗗洖缃�"); + SOURCE_MAP.put("longhui.ccoo.cn", "闅嗗洖缃�"); + SOURCE_MAP.put("025002.com", "鍗椾含鍦ㄧ嚎"); + SOURCE_MAP.put("025002.com", "鍗椾含鍦ㄧ嚎"); + SOURCE_MAP.put("zge.ccoo.cn", "鍑嗘牸灏旈棬鎴风綉"); + SOURCE_MAP.put("zge.ccoo.cn", "鍑嗘牸灏旈棬鎴风綉"); + SOURCE_MAP.put("0731esf.com", "0731浜屾墜鎴跨綉"); + SOURCE_MAP.put("jnhouse.com", "娴庡崡鎴夸骇缃�"); + SOURCE_MAP.put("jnhouse.com", "娴庡崡鎴夸骇缃�"); + SOURCE_MAP.put("hbzjrx.com", "鏋濇睙鐑嚎"); + SOURCE_MAP.put("hbzjrx.com", "鏋濇睙鐑嚎"); + SOURCE_MAP.put("snwugong.com", "姝﹀姛鍦ㄧ嚎"); + SOURCE_MAP.put("czfdc.com.cn", "甯稿窞鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("snwugong.com", "姝﹀姛鍦ㄧ嚎"); + SOURCE_MAP.put("czfdc.com.cn", "甯稿窞鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("365jia.cn", "涓囧鐑嚎"); + SOURCE_MAP.put("zhuanglang.ccoo.cn", "搴勬氮鍦ㄧ嚎"); + SOURCE_MAP.put("zhuanglang.ccoo.cn", "搴勬氮鍦ㄧ嚎"); + SOURCE_MAP.put("zhuanghe.ccoo.cn", "搴勬渤鍦ㄧ嚎"); + SOURCE_MAP.put("zhuanghe.ccoo.cn", "搴勬渤鍦ㄧ嚎"); + SOURCE_MAP.put("zxip.com", "鎱堟邯鎴夸骇缃慱xip"); + SOURCE_MAP.put("anxiw.com", "瀹夋邯缃�"); + SOURCE_MAP.put("anxiw.com", "瀹夋邯缃�"); + SOURCE_MAP.put("cqpsw.cn", "褰按缃�"); + SOURCE_MAP.put("tangyin.net", "姹ら槾鍦ㄧ嚎"); + SOURCE_MAP.put("zhuxi.ccoo.cn", "绔规邯鍦ㄧ嚎"); + SOURCE_MAP.put("tangyin.net", "姹ら槾鍦ㄧ嚎"); + SOURCE_MAP.put("zhuxi.ccoo.cn", "绔规邯鍦ㄧ嚎"); + SOURCE_MAP.put("zhushan.ccoo.cn", "绔瑰北鍦ㄧ嚎"); + SOURCE_MAP.put("zhushan.ccoo.cn", "绔瑰北鍦ㄧ嚎"); + SOURCE_MAP.put("ffw.com.cn", "绂忔埧缃�"); + SOURCE_MAP.put("jinta.ccoo.cn", "閲戝鍦ㄧ嚎"); + SOURCE_MAP.put("jinta.ccoo.cn", "閲戝鍦ㄧ嚎"); + SOURCE_MAP.put("0536qz.com", "闈掑窞鍦ㄧ嚎"); + SOURCE_MAP.put("0536qz.com", "闈掑窞鍦ㄧ嚎"); + SOURCE_MAP.put("0577home.net", "娓╁窞鎴跨綉"); + SOURCE_MAP.put("js0573.com", "鍢夊杽鎴夸骇缃�"); + SOURCE_MAP.put("3dfc.com", "3D鎴夸骇缃�"); + SOURCE_MAP.put("zhuzhouxian.ccoo.cn", "鏍床鍘垮湪绾�"); + SOURCE_MAP.put("zhuzhouxian.ccoo.cn", "鏍床鍘垮湪绾�"); + SOURCE_MAP.put("zhouning.ccoo.cn", "鍛ㄥ畞鍦ㄧ嚎"); + SOURCE_MAP.put("zhouning.ccoo.cn", "鍛ㄥ畞鍦ㄧ嚎"); + SOURCE_MAP.put("ok0911.com", "寤跺畨鎴夸骇缃�"); + SOURCE_MAP.put("bxxx.cn", "寤惰竟鐧惧缃�"); + SOURCE_MAP.put("yczz.com", "鐩愬煄鍦ㄧ嚎"); + SOURCE_MAP.put("0515fw.com", "鐩愬煄绉熸埧"); + SOURCE_MAP.put("0662f.net", "闃宠タ浜屾墜鎴�"); + SOURCE_MAP.put("yibinol.cn", "瀹滃鍦ㄧ嚎"); + SOURCE_MAP.put("835000.com", "浼婄妬涔版埧瀛�"); + SOURCE_MAP.put("chinayk.com", "涓浗钀ュ彛璁哄潧"); + SOURCE_MAP.put("jy510.com", "姹熼槾510"); + SOURCE_MAP.put("ishangzu.com", "鐖变笂绉�"); + SOURCE_MAP.put("zpfcw.com", "zpfcw.com閭瑰钩鎴夸骇缃�"); + SOURCE_MAP.put("0476f.com", "璧ゅ嘲鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("0476f.com", "璧ゅ嘲鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("0715fc.com", "鍜稿畞鎴夸骇缃�"); + SOURCE_MAP.put("0715fc.com", "鍜稿畞鎴夸骇缃�"); + SOURCE_MAP.put("minle.ccoo.cn", "姘戜箰淇℃伅娓�"); + SOURCE_MAP.put("minle.ccoo.cn", "姘戜箰淇℃伅娓�"); + SOURCE_MAP.put("zg.ccoo.cn", "鑷础閮藉競缃�"); + SOURCE_MAP.put("china0796.com", "姘镐赴缃�"); + SOURCE_MAP.put("china0796.com", "姘镐赴缃�"); + SOURCE_MAP.put("342200.com", "瀵讳箤鍦ㄧ嚎"); + SOURCE_MAP.put("342200.com", "瀵讳箤鍦ㄧ嚎"); + SOURCE_MAP.put("xizi.com", "瑗垮瓙鎴夸骇"); + SOURCE_MAP.put("pingguo.ccoo.cn", "骞虫灉瑙嗙獥"); + SOURCE_MAP.put("pingguo.ccoo.cn", "骞虫灉瑙嗙獥"); + SOURCE_MAP.put("fcdbz.com", "鎴夸骇澶у反鎵�"); + SOURCE_MAP.put("qingdaonews.com", "鏂伴椈缃戞埧浜�"); + SOURCE_MAP.put("fcptx.com", "鍏栧窞鎴夸骇缃�"); + SOURCE_MAP.put("fcptx.com", "鍏栧窞鎴夸骇缃�"); + SOURCE_MAP.put("jinfc.cn", "鏅嬫睙鎴夸骇缃�"); + SOURCE_MAP.put("jiaodong.net", "鑳朵笢鎴夸骇缃�"); + SOURCE_MAP.put("ssfcw.net", "鐭崇嫯鎴夸骇缃�"); + SOURCE_MAP.put("jiaodong.net", "鑳朵笢鎴夸骇缃�"); + SOURCE_MAP.put("jiaodong.net", "鑳朵笢鎴夸骇缃�"); + SOURCE_MAP.put("xmfish.com", "灏忛奔鎴夸骇"); + SOURCE_MAP.put("zhoushan.ccoo.cn", "鑸熷北鐑嚎"); + SOURCE_MAP.put("zhoushan.ccoo.cn", "鑸熷北鐑嚎"); + SOURCE_MAP.put("zhongxiang.ccoo.cn", "閽熺ゥ鍦ㄧ嚎"); + SOURCE_MAP.put("zhongxiang.ccoo.cn", "閽熺ゥ鍦ㄧ嚎"); + SOURCE_MAP.put("zhongmou.ccoo.cn", "涓墴缃�"); + SOURCE_MAP.put("710089.ccoo.cn", "闃庤壇涔嬬獥"); + SOURCE_MAP.put("710089.ccoo.cn", "闃庤壇涔嬬獥"); + SOURCE_MAP.put("huoqiuw.com", "闇嶉偙缃�"); + SOURCE_MAP.put("huoqiuw.com", "闇嶉偙缃�"); + SOURCE_MAP.put("jiangyou.ccoo.cn", "姹熸补鍦ㄧ嚎"); + SOURCE_MAP.put("jiangyou.ccoo.cn", "姹熸补鍦ㄧ嚎"); + SOURCE_MAP.put("0434.cc", "鍥涘钩鏂伴閲�"); + SOURCE_MAP.put("zhongshan.ccoo.cn", "閽熷北鍦ㄧ嚎"); + SOURCE_MAP.put("zhongshan.ccoo.cn", "閽熷北鍦ㄧ嚎"); + SOURCE_MAP.put("033400.ccoo.cn", "涓槼鍦ㄧ嚎"); + SOURCE_MAP.put("033400.ccoo.cn", "涓槼鍦ㄧ嚎"); + SOURCE_MAP.put("ythouse.com", "鐑熷彴鎴垮湴浜х綉"); + SOURCE_MAP.put("lywww.com", "涓存矀鍦ㄧ嚎"); SOURCE_MAP.put("0722fang.com", "0722fang"); - SOURCE_MAP.put("168hs.com", "黄山市民网"); - SOURCE_MAP.put("365hf.com", "呼和浩特房地产网"); - SOURCE_MAP.put("beihai365.com", "北海365房产网"); - SOURCE_MAP.put("zhongwei.ccoo.cn", "中卫在线"); - SOURCE_MAP.put("zhongwei.ccoo.cn", "中卫在线"); - SOURCE_MAP.put("zhongning.ccoo.cn", "中宁在线"); - SOURCE_MAP.put("zhongning.ccoo.cn", "中宁在线"); - SOURCE_MAP.put("shundejia.com", "顺德生活网"); - SOURCE_MAP.put("aofenglu.com", "宣城房产网"); - SOURCE_MAP.put("sanxia.net", "三峡热线"); - SOURCE_MAP.put("dcw0550.com", "大滁网"); - SOURCE_MAP.put("dcw0550.com", "大滁网"); - SOURCE_MAP.put("yanshi.ccoo.cn", "偃师生活网"); - SOURCE_MAP.put("yanshi.ccoo.cn", "偃师生活网"); - SOURCE_MAP.put("tdzyw.com", "土地资源网"); - SOURCE_MAP.put("zpfcw.com", "zpfcw.com邹平房产网"); - SOURCE_MAP.put("zpfdc.com", "邹平房产网"); - SOURCE_MAP.put("0356f.com", "晋城房产网"); - SOURCE_MAP.put("596fc.com", "596漳州房产网"); - SOURCE_MAP.put("zhiduo.ccoo.cn", "治多在线"); - SOURCE_MAP.put("zhiduo.ccoo.cn", "治多在线"); - SOURCE_MAP.put("hnzhijiang.ccoo.cn", "芷江在线"); - SOURCE_MAP.put("hnzhijiang.ccoo.cn", "芷江在线"); - SOURCE_MAP.put("yichun0795.com", "宜春房地产网"); - SOURCE_MAP.put("yichun0795.com", "宜春房地产网"); - SOURCE_MAP.put("zgyc.com.cn", "永春网"); - SOURCE_MAP.put("zgyc.com.cn", "永春网"); - SOURCE_MAP.put("zhenghe.ccoo.cn", "政和在线"); - SOURCE_MAP.put("zhenghe.ccoo.cn", "政和在线"); - SOURCE_MAP.put("5i5j.com", "我爱我家"); - SOURCE_MAP.put("sqfcw.com", "宿迁找房网"); - SOURCE_MAP.put("tengfun.com", "滕房网"); - SOURCE_MAP.put("tengfun.com", "滕房网"); - SOURCE_MAP.put("cnyw.net", "热房网"); - SOURCE_MAP.put("rz0375.com", "汝州在线"); - SOURCE_MAP.put("rz0375.com", "汝州在线"); - SOURCE_MAP.put("745300.ccoo.cn", "正宁百姓网"); - SOURCE_MAP.put("745300.ccoo.cn", "正宁百姓网"); - SOURCE_MAP.put("zy.ccoo.cn", "镇远信息港"); - SOURCE_MAP.put("zy.ccoo.cn", "镇远信息港"); - SOURCE_MAP.put("0744.ccoo.cn", "张家界门户网"); - SOURCE_MAP.put("lz520.net", "阆中房产网"); - SOURCE_MAP.put("lz520.net", "阆中房产网"); - SOURCE_MAP.put("hnfczl.cn", "河南房产租聘网"); - SOURCE_MAP.put("zhenyuan.ccoo.cn", "镇沅在线"); - SOURCE_MAP.put("taotaoju.vip", "淘淘居"); - SOURCE_MAP.put("zhenyuan.ccoo.cn", "镇沅在线"); - SOURCE_MAP.put("sxzp.ccoo.cn", "镇坪在线"); - SOURCE_MAP.put("sxzp.ccoo.cn", "镇坪在线"); - SOURCE_MAP.put("f0580.com", "大舟山房产"); - SOURCE_MAP.put("rjtrw.com", "榕江淘人网"); - SOURCE_MAP.put("rjtrw.com", "榕江淘人网"); - SOURCE_MAP.put("5khouse.com", "看房网_C"); - SOURCE_MAP.put("0736.ccoo.cn", "中国澧县网"); - SOURCE_MAP.put("0736.ccoo.cn", "中国澧县网"); - SOURCE_MAP.put("zhenning.ccoo.cn", "镇宁信息港"); - SOURCE_MAP.put("zhenning.ccoo.cn", "镇宁信息港"); - SOURCE_MAP.put("zhenkang.ccoo.cn", "镇康在线"); - SOURCE_MAP.put("panan.ccoo.cn", "磐安信息网"); - SOURCE_MAP.put("zhenkang.ccoo.cn", "镇康在线"); - SOURCE_MAP.put("2500fang.com", "苏房网new"); - SOURCE_MAP.put("gsfcw.com", "姑苏房产网"); - SOURCE_MAP.put("zj.ccoo.cn", "镇江网"); - SOURCE_MAP.put("zhenfeng.ccoo.cn", "贞丰在线"); - SOURCE_MAP.put("sqfcww.com", "商丘房产"); - SOURCE_MAP.put("0370house.com", "商丘房产网1"); - SOURCE_MAP.put("0793114.cn", "鄱阳买房网"); - SOURCE_MAP.put("0598yu.com", "渔网分类"); - SOURCE_MAP.put("mfw114.com", "梦房网"); - SOURCE_MAP.put("2hainan.com", "海房网"); - SOURCE_MAP.put("wz189.net", "易手网"); - SOURCE_MAP.put("sxdsw.net", "三峡都市网"); - SOURCE_MAP.put("tongling.cn", "铜陵网"); - SOURCE_MAP.put("tongling.cn", "铜陵网"); - SOURCE_MAP.put("shoufc.cn", "寿县房产网"); - SOURCE_MAP.put("shoufc.cn", "寿县房产网"); - SOURCE_MAP.put("135100.cn", "中国辉南网"); - SOURCE_MAP.put("luobei.ccoo.cn", "萝北信息港"); - SOURCE_MAP.put("luzfc.cn", "泸州房产"); - SOURCE_MAP.put("luzfc.cn", "泸州房产"); - SOURCE_MAP.put("jiaxing.ccoo.cn", "嘉兴星空在线"); - SOURCE_MAP.put("jiaxing.ccoo.cn", "嘉兴星空在线"); - SOURCE_MAP.put("lsol.com.cn", "丽水房产网"); - SOURCE_MAP.put("baotou.ccoo.cn", "包头之声"); - SOURCE_MAP.put("baotou.ccoo.cn", "包头之声"); - SOURCE_MAP.put("0515bh.com", "今日滨海"); - SOURCE_MAP.put("0515bh.com", "今日滨海"); - SOURCE_MAP.put("zhijin.ccoo.cn", "织金在线"); - SOURCE_MAP.put("zhijin.ccoo.cn", "织金在线"); - SOURCE_MAP.put("hzhuge888.com", "诸葛找房"); - SOURCE_MAP.put("jidahouse.com", "吉大房产"); - SOURCE_MAP.put("lefang.com", "乐房"); - SOURCE_MAP.put("haozhai.com", "世界豪宅网"); - SOURCE_MAP.put("julive.com", "居理新房"); - SOURCE_MAP.put("maitian.cn", "麦田在线"); - SOURCE_MAP.put("rmfysszc.gov.cn", "人民法院诉讼资产网"); - SOURCE_MAP.put("wkzf.com", "悟空找房"); - SOURCE_MAP.put("pinganfang.com", "平安好房"); - SOURCE_MAP.put("daojiale.com", "重庆到家了网"); - SOURCE_MAP.put("daojiale.com", "重庆到家了网"); - SOURCE_MAP.put("house365.com", "365地产家居网"); - SOURCE_MAP.put("jinti.com", "今题网"); - SOURCE_MAP.put("zhenba.ccoo.cn", "镇巴在线"); - SOURCE_MAP.put("pubangwang.com", "铺帮网"); - SOURCE_MAP.put("homelink.com.cn", "链家在线"); - SOURCE_MAP.put("mytophome.com", "满堂红地产网"); - SOURCE_MAP.put("99shangpu.cn", "99商铺网"); - SOURCE_MAP.put("anguo.ccoo.cn", "安国在线"); - SOURCE_MAP.put("arq.ccoo.cn", "阿荣旗在线"); - SOURCE_MAP.put("xzl571.com", "杭州写字楼网"); - SOURCE_MAP.put("baotou.gov.cn", "包头房地产网baotou.gov.cn"); - SOURCE_MAP.put("aqi.ccoo.cn", "阿旗房产网"); - SOURCE_MAP.put("wuhan.gov.cn", "武汉房地产市场信息网"); - SOURCE_MAP.put("hyfc365.com", "衡阳房产政务网"); - SOURCE_MAP.put("xzhouse.com.cn", "徐州房地产信息网"); - SOURCE_MAP.put("hffd.gov.cn", "合肥房地产管理局"); - SOURCE_MAP.put("jzfdcxxw.cn", "焦作房产网"); - SOURCE_MAP.put("lousw.com", "冲浪宜居"); - SOURCE_MAP.put("anxiw.com", "安溪网"); - SOURCE_MAP.put("0483.ccoo.cn", "阿拉善在线"); - SOURCE_MAP.put("bx169.com", "博兴在线"); - SOURCE_MAP.put("tuitui99.com", "推推99房产网"); - SOURCE_MAP.put("0937.com", "嘉峪关在线"); - SOURCE_MAP.put("0311dy.com", "石家庄写字楼信息网"); - SOURCE_MAP.put("anji.ccoo.cn", "今日安吉"); - SOURCE_MAP.put("comwin-sh.com", "广汇上海写字楼租赁"); - SOURCE_MAP.put("360fdc.com", "360中房网"); - SOURCE_MAP.put("01fy.cn", "第一时间"); - SOURCE_MAP.put("laoke.com", "老客"); - SOURCE_MAP.put("0535zy.cn", "招远在线"); - SOURCE_MAP.put("xiansp.com", "西安商铺网"); - SOURCE_MAP.put("yikeso.com", "亿客搜"); - SOURCE_MAP.put("0710111.com", "枣阳在线"); - SOURCE_MAP.put("yszx.ccoo.cn", "沂水在线"); - SOURCE_MAP.put("710089.ccoo.cn", "阎良之窗"); - SOURCE_MAP.put("mytophome.com", "满堂红地产网"); - SOURCE_MAP.put("haozu.com", "好租网"); - SOURCE_MAP.put("0771sp.com", "南宁商铺网"); - SOURCE_MAP.put("360xzl.com", "360写字楼网"); - SOURCE_MAP.put("360xzl.com", "360写字楼网"); - SOURCE_MAP.put("360xzl.com", "360写字楼网"); - SOURCE_MAP.put("0574work.com", "沃克办公"); - SOURCE_MAP.put("518spw.com", "518商铺网"); - SOURCE_MAP.put("518spw.com", "518商铺网"); - SOURCE_MAP.put("caipucn.cn", "财铺网"); - SOURCE_MAP.put("qiaoqian8.com", "乔迁之喜"); - SOURCE_MAP.put("qiaoqian8.com", "乔迁之喜"); - SOURCE_MAP.put("gxsky.com", "时空房产网"); - SOURCE_MAP.put("ma3office.com", "马上办公"); - SOURCE_MAP.put("gxsky.com", "时空房产网"); - SOURCE_MAP.put("gzcc.gov.cn", "广州市住房和城乡建设委员会"); - SOURCE_MAP.put("zhdpb.gov.cn", "珠海市发展和改革局"); - SOURCE_MAP.put("zhaoshang800.com", "中工招商网"); - SOURCE_MAP.put("123.131.127.13", "潍坊房地产信息网"); - SOURCE_MAP.put("jxbuild.gov.cn", "嘉兴市住房保障局"); - SOURCE_MAP.put("zhaoshang800.com", "中工招商网"); - SOURCE_MAP.put("fcxx0898.com", "三亚市房产信息网"); - SOURCE_MAP.put("ljhouse.org", "丽江房产信息网"); - SOURCE_MAP.put("ptjsj.gov.cn", "莆田市住房和城乡建设信息网"); - SOURCE_MAP.put("tangshan.gov.cn", "唐山市住房和城乡建设局"); - SOURCE_MAP.put("0311.com.cn", "新城网"); - SOURCE_MAP.put("ccfdw.gov.cn", "长春市住房保障和房地产管理局"); - SOURCE_MAP.put("pupuwang.com", "铺铺旺"); - SOURCE_MAP.put("comwin-sh.com", "广汇上海写字楼租赁"); - SOURCE_MAP.put("91taoban.com", "淘办"); - SOURCE_MAP.put("222.184.103.50:7700", "淮安住房保障网"); - SOURCE_MAP.put("scybfdc.com", "宜宾市房地产管理局政务公开网"); - SOURCE_MAP.put("zjkzjj.gov.cn", "张家口住房和城乡建设局"); - SOURCE_MAP.put("0797fdc.com.cn", "赣州房地产信息网"); - SOURCE_MAP.put("ddfc.com.cn", "丹东房产交易网"); - SOURCE_MAP.put("whfdcdj.cn", "芜湖房地产交易与不动产登记信息网"); - SOURCE_MAP.put("macheng.ccoo.cn", "麻城信息网"); - SOURCE_MAP.put("mtzx.ccoo.cn", "湄潭在线"); - SOURCE_MAP.put("mhk.ccoo.cn", "梅河口在线"); - SOURCE_MAP.put("minle.ccoo.cn", "民乐信息港"); - SOURCE_MAP.put("mengyin.ccoo.cn", "蒙阴在线"); - SOURCE_MAP.put("168dc.com", "168地产网"); - SOURCE_MAP.put("lffcj.com", "临汾市住房与房地产信息"); - SOURCE_MAP.put("o571.com", "杭州写字楼网o571.com"); - SOURCE_MAP.put("hbczfdc.com", "沧州市房地产信息网"); - SOURCE_MAP.put("huangshan.gov.cn", "黄山市房产事务管理局"); - SOURCE_MAP.put("daji123.com", "大集商铺网"); - SOURCE_MAP.put("thfdc.net", "通化市房产交易信息网"); - SOURCE_MAP.put("fangtoo.com", "房途网"); - SOURCE_MAP.put("fangtoo.com", "房途网"); - SOURCE_MAP.put("lsjs.gov.cn", "丽水市透明售房网"); - SOURCE_MAP.put("diandianzu.com", "点点租"); - SOURCE_MAP.put("fyhouse.net", "阜阳房地产信息网"); - SOURCE_MAP.put("luan.gov.cn", "六安市住房和城乡建设委员会"); - SOURCE_MAP.put("xtfc.gov.cn", "湘潭市房产管理局"); - SOURCE_MAP.put("jmzjj.gov.cn", "江门市住房和城乡建设局"); - SOURCE_MAP.put("58.51.240.121:8503", "黄石市房地产市场信息发布平台"); - SOURCE_MAP.put("yipu88.com", "亿铺网"); - SOURCE_MAP.put("haowangpu.com", "好旺铺"); - SOURCE_MAP.put("puzaixian.com", "铺在线"); - SOURCE_MAP.put("5acbd.com", "5A商用地产"); - SOURCE_MAP.put("5acbd.com", "5A商用地产"); - SOURCE_MAP.put("51banban.com", "51办办网"); - SOURCE_MAP.put("0311.com.cn", "新城网"); - SOURCE_MAP.put("dzfgj.com", "达州市房产管理局"); - SOURCE_MAP.put("hbsfdc.com", "淮北市住宅与房地产信息网"); - SOURCE_MAP.put("91taoban.com", "淘办"); - SOURCE_MAP.put("tcfc365.com", "铜川市房地产市场信息网"); - SOURCE_MAP.put("xcfdc.gov.cn", "宣城市房地产管理局"); - SOURCE_MAP.put("gzfcxx.cn", "安顺市住房和城乡建设网"); - SOURCE_MAP.put("hnhbfgj.cn", "鹤壁市房产管理中心"); - SOURCE_MAP.put("xtsfdc.com", "仙桃市房地产信息网"); - SOURCE_MAP.put("hsfdcxx.com", "衡水房地产信息网"); - SOURCE_MAP.put("0937.com", "嘉峪关在线"); - SOURCE_MAP.put("0536qz.com", "青州在线"); - SOURCE_MAP.put("0771sp.com", "南宁商铺网"); - SOURCE_MAP.put("yumen.tv", "玉门在线"); - SOURCE_MAP.put("yuxian.ccoo.cn", "盂县在线"); - SOURCE_MAP.put("yuanyang.ccoo.cn", "原阳在线"); - SOURCE_MAP.put("pulaipuwang.com", "铺来铺往"); - SOURCE_MAP.put("soufang998.com", "998商铺网"); - SOURCE_MAP.put("yipu.com.cn", "易铺网"); - SOURCE_MAP.put("kongjianjia.com", "空间家"); - SOURCE_MAP.put("zupuk.com", "租铺网"); - SOURCE_MAP.put("hc376.com", "潢川在线"); - SOURCE_MAP.put("luzhou.ccoo.cn", "泸州在线"); - SOURCE_MAP.put("zupuk.com", "租铺网"); - SOURCE_MAP.put("shangpusou.com", "商铺搜"); - SOURCE_MAP.put("shangpusou.com", "商铺搜"); - SOURCE_MAP.put("shangpusou.com", "商铺搜"); - SOURCE_MAP.put("shangpusou.com", "商铺搜"); - SOURCE_MAP.put("001zf.com", "第一租房网"); - SOURCE_MAP.put("5sw.com", "五星网"); - SOURCE_MAP.put("0799fdc.com", "萍乡房地产信息网"); - SOURCE_MAP.put("023755.com", "酉阳在线"); - SOURCE_MAP.put("china0796.com", "永丰网"); - SOURCE_MAP.put("746300.net", "舟曲城市在线"); - SOURCE_MAP.put("zhongmou.ccoo.cn", "中牟网"); - SOURCE_MAP.put("hbzjrx.com", "枝江热线"); - SOURCE_MAP.put("zaoqiang.ccoo.cn", "枣强在线"); - SOURCE_MAP.put("officese.com", "中华写字楼网"); - SOURCE_MAP.put("officese.com", "中华写字楼网"); - SOURCE_MAP.put("shenyangoffice.com", "沈阳写字楼"); - SOURCE_MAP.put("0744.ccoo.cn", "张家界门户网"); - SOURCE_MAP.put("bjxzlou.com", "北京写字楼网"); - SOURCE_MAP.put("zyzx.ccoo.cn", "肇源在线"); - SOURCE_MAP.put("zhenan.ccoo.cn", "镇安在线"); - SOURCE_MAP.put("zhenping.ccoo.cn", "镇平在线"); - SOURCE_MAP.put("100loujia.com", "一百楼佳"); - SOURCE_MAP.put("bjxzl.com.cn", "北京写字楼网bjxzl"); - SOURCE_MAP.put("028office.com", "成都写字楼信息网"); - SOURCE_MAP.put("17duu.com", "17度写字楼网"); - SOURCE_MAP.put("woaipu.com", "我爱铺网"); - SOURCE_MAP.put("zz.ccoo.cn", "郑州网"); - SOURCE_MAP.put("quanhuaoffice.com", "全华网"); - SOURCE_MAP.put("wzzf.cn", "温州租房网"); - SOURCE_MAP.put("0571pu.com", "铺面网"); - SOURCE_MAP.put("sp.dingow.cn", "宁波商铺网"); - SOURCE_MAP.put("zhuanmenmian.com", "转门面网"); - SOURCE_MAP.put("51jam.com", "我要加盟网"); - SOURCE_MAP.put("jzyj.ccoo.cn", "金寨叶集在线"); - SOURCE_MAP.put("yanchang.ccoo.cn", "延长在线"); - SOURCE_MAP.put("yanqing.ccoo.cn", "延庆在线"); - SOURCE_MAP.put("028office.com", "成都写字楼信息网"); - SOURCE_MAP.put("028office.com", "成都写字楼信息网"); - SOURCE_MAP.put("jxxzl.com", "江西写字楼网"); - SOURCE_MAP.put("jxxzl.com", "江西写字楼网"); - SOURCE_MAP.put("soulou365.com", "搜楼网"); - SOURCE_MAP.put("soulou365.com", "搜楼网"); - SOURCE_MAP.put("yzzx.ccoo.cn", "兖州在线"); - SOURCE_MAP.put("yanshi.ccoo.cn", "偃师生活网"); - SOURCE_MAP.put("yanjiao.ccoo.cn", "燕郊大视野"); - SOURCE_MAP.put("zlt.ccoo.cn", "扎鲁特在线"); - SOURCE_MAP.put("zoucheng.cc", "邹城在线"); - SOURCE_MAP.put("zzcszx.com", "枣庄城市在线"); - SOURCE_MAP.put("zhalantun.ccoo.cn", "扎兰屯在线"); - SOURCE_MAP.put("741500.com", "张家川在线"); - SOURCE_MAP.put("zhanhua.ccoo.cn", "沾化在线"); - SOURCE_MAP.put("yanggu.ccoo.cn", "阳谷在线"); - SOURCE_MAP.put("yangxin.ccoo.cn", "阳信在线"); - SOURCE_MAP.put("yangling.ccoo.cn", "杨凌在线"); - SOURCE_MAP.put("0898yp.cn", "洋浦在线"); - SOURCE_MAP.put("soulou365.com", "搜楼网"); - SOURCE_MAP.put("nxfcj.com", "宁乡房产政务信息网"); - SOURCE_MAP.put("001zf.com", "第一租房网"); - SOURCE_MAP.put("18fang.com", "十八房网站"); - SOURCE_MAP.put("18fang.com", "十八房网站"); - SOURCE_MAP.put("dyyscx.com", "德阳房地产"); - SOURCE_MAP.put("fgj.hd.gov.cn", "邯郸市住房保障和房产管理局"); - SOURCE_MAP.put("xxgk.liuzhou.gov.cn", "广西壮族自治区政府信息公开统一平台"); - SOURCE_MAP.put("xyszj.gov.cn", "咸阳市住房和城乡建设规划局"); - SOURCE_MAP.put("fcxx.glzjxx.com", "桂林市房地产信息网"); - SOURCE_MAP.put("028hzcbd.com", "天府写字楼网"); - SOURCE_MAP.put("028hzcbd.com", "天府写字楼网"); - SOURCE_MAP.put("0870.ccoo.cn", "昭通在线"); - SOURCE_MAP.put("028cbd.com", "成都写字楼网028cbd"); - SOURCE_MAP.put("bjxzlou.com", "北京写字楼网"); - SOURCE_MAP.put("100loujia.com", "一百楼佳"); - SOURCE_MAP.put("zhengan.ccoo.cn", "正安在线网"); - SOURCE_MAP.put("zhengding.ccoo.cn", "正定在线"); - SOURCE_MAP.put("zhengyang.ccoo.cn", "正阳网"); - SOURCE_MAP.put("xa.ccoo.cn", "西安之窗"); - SOURCE_MAP.put("guangxinhongye.com", "办公选址网"); - SOURCE_MAP.put("puzaixian.com", "铺在线"); - SOURCE_MAP.put("xichong.ccoo.cn", "西充在线"); - SOURCE_MAP.put("xining.ccoo.cn", "西宁在线"); - SOURCE_MAP.put("xiping.ccoo.cn", "西平在线"); - SOURCE_MAP.put("xwq.ccoo.cn", "西乌旗在线"); - SOURCE_MAP.put("xixia.ccoo.cn", "西峡在线"); - SOURCE_MAP.put("xfzx.ccoo.cn", "息烽在线"); - SOURCE_MAP.put("91souban.com", "搜办"); - SOURCE_MAP.put("loukee.com", "楼客"); - SOURCE_MAP.put("bjxzl.com.cn", "北京写字楼网bjxzl"); - SOURCE_MAP.put("xixian.ccoo.cn", "息县在线"); - SOURCE_MAP.put("0357xx.com", "隰县在线"); - SOURCE_MAP.put("xzlzl.com", "楼嗖嗖"); - SOURCE_MAP.put("rshy-office.com", "北京写字楼租赁网"); - SOURCE_MAP.put("omiaozu.com", "秒租"); - SOURCE_MAP.put("omiaozu.com", "秒租"); - SOURCE_MAP.put("yibaotong.com", "壹报通商业地产"); - SOURCE_MAP.put("cslou.com", "长沙写字楼网"); - SOURCE_MAP.put("cslou.com", "长沙写字楼网"); - SOURCE_MAP.put("bayan.ccoo.cn", "巴彦网"); - SOURCE_MAP.put("bc.ccoo.cn", "白城之窗"); - SOURCE_MAP.put("baoding.ccoo.cn", "保定在线"); - SOURCE_MAP.put("0827.la", "巴中之窗"); - SOURCE_MAP.put("baojing.ccoo.cn", "保靖门户网"); - SOURCE_MAP.put("yes515.com", "515房产网"); - SOURCE_MAP.put("yanjin.ccoo.cn", "延津在线"); - SOURCE_MAP.put("yanshou.ccoo.cn", "延寿在线"); - SOURCE_MAP.put("yanfu.ccoo.cn", "盐阜在线"); - SOURCE_MAP.put("yanting8.com", "盐亭在线"); - SOURCE_MAP.put("yibaotong.com", "壹报通商业地产"); - SOURCE_MAP.put("yibaotong.com", "壹报通商业地产"); + SOURCE_MAP.put("168hs.com", "榛勫北甯傛皯缃�"); + SOURCE_MAP.put("365hf.com", "鍛煎拰娴╃壒鎴垮湴浜х綉"); + SOURCE_MAP.put("beihai365.com", "鍖楁捣365鎴夸骇缃�"); + SOURCE_MAP.put("zhongwei.ccoo.cn", "涓崼鍦ㄧ嚎"); + SOURCE_MAP.put("zhongwei.ccoo.cn", "涓崼鍦ㄧ嚎"); + SOURCE_MAP.put("zhongning.ccoo.cn", "涓畞鍦ㄧ嚎"); + SOURCE_MAP.put("zhongning.ccoo.cn", "涓畞鍦ㄧ嚎"); + SOURCE_MAP.put("shundejia.com", "椤哄痉鐢熸椿缃�"); + SOURCE_MAP.put("aofenglu.com", "瀹e煄鎴夸骇缃�"); + SOURCE_MAP.put("sanxia.net", "涓夊场鐑嚎"); + SOURCE_MAP.put("dcw0550.com", "澶ф粊缃�"); + SOURCE_MAP.put("dcw0550.com", "澶ф粊缃�"); + SOURCE_MAP.put("yanshi.ccoo.cn", "鍋冨笀鐢熸椿缃�"); + SOURCE_MAP.put("yanshi.ccoo.cn", "鍋冨笀鐢熸椿缃�"); + SOURCE_MAP.put("tdzyw.com", "鍦熷湴璧勬簮缃�"); + SOURCE_MAP.put("zpfcw.com", "zpfcw.com閭瑰钩鎴夸骇缃�"); + SOURCE_MAP.put("zpfdc.com", "閭瑰钩鎴夸骇缃�"); + SOURCE_MAP.put("0356f.com", "鏅嬪煄鎴夸骇缃�"); + SOURCE_MAP.put("596fc.com", "596婕冲窞鎴夸骇缃�"); + SOURCE_MAP.put("zhiduo.ccoo.cn", "娌诲鍦ㄧ嚎"); + SOURCE_MAP.put("zhiduo.ccoo.cn", "娌诲鍦ㄧ嚎"); + SOURCE_MAP.put("hnzhijiang.ccoo.cn", "鑺锋睙鍦ㄧ嚎"); + SOURCE_MAP.put("hnzhijiang.ccoo.cn", "鑺锋睙鍦ㄧ嚎"); + SOURCE_MAP.put("yichun0795.com", "瀹滄槬鎴垮湴浜х綉"); + SOURCE_MAP.put("yichun0795.com", "瀹滄槬鎴垮湴浜х綉"); + SOURCE_MAP.put("zgyc.com.cn", "姘告槬缃�"); + SOURCE_MAP.put("zgyc.com.cn", "姘告槬缃�"); + SOURCE_MAP.put("zhenghe.ccoo.cn", "鏀垮拰鍦ㄧ嚎"); + SOURCE_MAP.put("zhenghe.ccoo.cn", "鏀垮拰鍦ㄧ嚎"); + SOURCE_MAP.put("5i5j.com", "鎴戠埍鎴戝"); + SOURCE_MAP.put("sqfcw.com", "瀹胯縼鎵炬埧缃�"); + SOURCE_MAP.put("tengfun.com", "婊曟埧缃�"); + SOURCE_MAP.put("tengfun.com", "婊曟埧缃�"); + SOURCE_MAP.put("cnyw.net", "鐑埧缃�"); + SOURCE_MAP.put("rz0375.com", "姹濆窞鍦ㄧ嚎"); + SOURCE_MAP.put("rz0375.com", "姹濆窞鍦ㄧ嚎"); + SOURCE_MAP.put("745300.ccoo.cn", "姝e畞鐧惧缃�"); + SOURCE_MAP.put("745300.ccoo.cn", "姝e畞鐧惧缃�"); + SOURCE_MAP.put("zy.ccoo.cn", "闀囪繙淇℃伅娓�"); + SOURCE_MAP.put("zy.ccoo.cn", "闀囪繙淇℃伅娓�"); + SOURCE_MAP.put("0744.ccoo.cn", "寮犲鐣岄棬鎴风綉"); + SOURCE_MAP.put("lz520.net", "闃嗕腑鎴夸骇缃�"); + SOURCE_MAP.put("lz520.net", "闃嗕腑鎴夸骇缃�"); + SOURCE_MAP.put("hnfczl.cn", "娌冲崡鎴夸骇绉熻仒缃�"); + SOURCE_MAP.put("zhenyuan.ccoo.cn", "闀囨矃鍦ㄧ嚎"); + SOURCE_MAP.put("taotaoju.vip", "娣樻窐灞�"); + SOURCE_MAP.put("zhenyuan.ccoo.cn", "闀囨矃鍦ㄧ嚎"); + SOURCE_MAP.put("sxzp.ccoo.cn", "闀囧潽鍦ㄧ嚎"); + SOURCE_MAP.put("sxzp.ccoo.cn", "闀囧潽鍦ㄧ嚎"); + SOURCE_MAP.put("f0580.com", "澶ц垷灞辨埧浜�"); + SOURCE_MAP.put("rjtrw.com", "姒曟睙娣樹汉缃�"); + SOURCE_MAP.put("rjtrw.com", "姒曟睙娣樹汉缃�"); + SOURCE_MAP.put("5khouse.com", "鐪嬫埧缃慱C"); + SOURCE_MAP.put("0736.ccoo.cn", "涓浗婢у幙缃�"); + SOURCE_MAP.put("0736.ccoo.cn", "涓浗婢у幙缃�"); + SOURCE_MAP.put("zhenning.ccoo.cn", "闀囧畞淇℃伅娓�"); + SOURCE_MAP.put("zhenning.ccoo.cn", "闀囧畞淇℃伅娓�"); + SOURCE_MAP.put("zhenkang.ccoo.cn", "闀囧悍鍦ㄧ嚎"); + SOURCE_MAP.put("panan.ccoo.cn", "纾愬畨淇℃伅缃�"); + SOURCE_MAP.put("zhenkang.ccoo.cn", "闀囧悍鍦ㄧ嚎"); + SOURCE_MAP.put("2500fang.com", "鑻忔埧缃憂ew"); + SOURCE_MAP.put("gsfcw.com", "濮戣嫃鎴夸骇缃�"); + SOURCE_MAP.put("zj.ccoo.cn", "闀囨睙缃�"); + SOURCE_MAP.put("zhenfeng.ccoo.cn", "璐炰赴鍦ㄧ嚎"); + SOURCE_MAP.put("sqfcww.com", "鍟嗕笜鎴夸骇"); + SOURCE_MAP.put("0370house.com", "鍟嗕笜鎴夸骇缃�1"); + SOURCE_MAP.put("0793114.cn", "閯遍槼涔版埧缃�"); + SOURCE_MAP.put("0598yu.com", "娓旂綉鍒嗙被"); + SOURCE_MAP.put("mfw114.com", "姊︽埧缃�"); + SOURCE_MAP.put("2hainan.com", "娴锋埧缃�"); + SOURCE_MAP.put("wz189.net", "鏄撴墜缃�"); + SOURCE_MAP.put("sxdsw.net", "涓夊场閮藉競缃�"); + SOURCE_MAP.put("tongling.cn", "閾滈櫟缃�"); + SOURCE_MAP.put("tongling.cn", "閾滈櫟缃�"); + SOURCE_MAP.put("shoufc.cn", "瀵垮幙鎴夸骇缃�"); + SOURCE_MAP.put("shoufc.cn", "瀵垮幙鎴夸骇缃�"); + SOURCE_MAP.put("135100.cn", "涓浗杈夊崡缃�"); + SOURCE_MAP.put("luobei.ccoo.cn", "钀濆寳淇℃伅娓�"); + SOURCE_MAP.put("luzfc.cn", "娉稿窞鎴夸骇"); + SOURCE_MAP.put("luzfc.cn", "娉稿窞鎴夸骇"); + SOURCE_MAP.put("jiaxing.ccoo.cn", "鍢夊叴鏄熺┖鍦ㄧ嚎"); + SOURCE_MAP.put("jiaxing.ccoo.cn", "鍢夊叴鏄熺┖鍦ㄧ嚎"); + SOURCE_MAP.put("lsol.com.cn", "涓芥按鎴夸骇缃�"); + SOURCE_MAP.put("baotou.ccoo.cn", "鍖呭ご涔嬪0"); + SOURCE_MAP.put("baotou.ccoo.cn", "鍖呭ご涔嬪0"); + SOURCE_MAP.put("0515bh.com", "浠婃棩婊ㄦ捣"); + SOURCE_MAP.put("0515bh.com", "浠婃棩婊ㄦ捣"); + SOURCE_MAP.put("zhijin.ccoo.cn", "缁囬噾鍦ㄧ嚎"); + SOURCE_MAP.put("zhijin.ccoo.cn", "缁囬噾鍦ㄧ嚎"); + SOURCE_MAP.put("hzhuge888.com", "璇歌憶鎵炬埧"); + SOURCE_MAP.put("jidahouse.com", "鍚夊ぇ鎴夸骇"); + SOURCE_MAP.put("lefang.com", "涔愭埧"); + SOURCE_MAP.put("haozhai.com", "涓栫晫璞畢缃�"); + SOURCE_MAP.put("julive.com", "灞呯悊鏂版埧"); + SOURCE_MAP.put("maitian.cn", "楹︾敯鍦ㄧ嚎"); + SOURCE_MAP.put("rmfysszc.gov.cn", "浜烘皯娉曢櫌璇夎璧勪骇缃�"); + SOURCE_MAP.put("wkzf.com", "鎮熺┖鎵炬埧"); + SOURCE_MAP.put("pinganfang.com", "骞冲畨濂芥埧"); + SOURCE_MAP.put("daojiale.com", "閲嶅簡鍒板浜嗙綉"); + SOURCE_MAP.put("daojiale.com", "閲嶅簡鍒板浜嗙綉"); + SOURCE_MAP.put("house365.com", "365鍦颁骇瀹跺眳缃�"); + SOURCE_MAP.put("jinti.com", "浠婇缃�"); + SOURCE_MAP.put("zhenba.ccoo.cn", "闀囧反鍦ㄧ嚎"); + SOURCE_MAP.put("pubangwang.com", "閾哄府缃�"); + SOURCE_MAP.put("homelink.com.cn", "閾惧鍦ㄧ嚎"); + SOURCE_MAP.put("mytophome.com", "婊″爞绾㈠湴浜х綉"); + SOURCE_MAP.put("99shangpu.cn", "99鍟嗛摵缃�"); + SOURCE_MAP.put("anguo.ccoo.cn", "瀹夊浗鍦ㄧ嚎"); + SOURCE_MAP.put("arq.ccoo.cn", "闃胯崳鏃楀湪绾�"); + SOURCE_MAP.put("xzl571.com", "鏉窞鍐欏瓧妤肩綉"); + SOURCE_MAP.put("baotou.gov.cn", "鍖呭ご鎴垮湴浜х綉baotou.gov.cn"); + SOURCE_MAP.put("aqi.ccoo.cn", "闃挎棗鎴夸骇缃�"); + SOURCE_MAP.put("wuhan.gov.cn", "姝︽眽鎴垮湴浜у競鍦轰俊鎭綉"); + SOURCE_MAP.put("hyfc365.com", "琛¢槼鎴夸骇鏀垮姟缃�"); + SOURCE_MAP.put("xzhouse.com.cn", "寰愬窞鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("hffd.gov.cn", "鍚堣偉鎴垮湴浜х鐞嗗眬"); + SOURCE_MAP.put("jzfdcxxw.cn", "鐒︿綔鎴夸骇缃�"); + SOURCE_MAP.put("lousw.com", "鍐叉氮瀹滃眳"); + SOURCE_MAP.put("anxiw.com", "瀹夋邯缃�"); + SOURCE_MAP.put("0483.ccoo.cn", "闃挎媺鍠勫湪绾�"); + SOURCE_MAP.put("bx169.com", "鍗氬叴鍦ㄧ嚎"); + SOURCE_MAP.put("tuitui99.com", "鎺ㄦ帹99鎴夸骇缃�"); + SOURCE_MAP.put("0937.com", "鍢夊唱鍏冲湪绾�"); + SOURCE_MAP.put("0311dy.com", "鐭冲搴勫啓瀛楁ゼ淇℃伅缃�"); + SOURCE_MAP.put("anji.ccoo.cn", "浠婃棩瀹夊悏"); + SOURCE_MAP.put("comwin-sh.com", "骞挎眹涓婃捣鍐欏瓧妤肩璧�"); + SOURCE_MAP.put("360fdc.com", "360涓埧缃�"); + SOURCE_MAP.put("01fy.cn", "绗竴鏃堕棿"); + SOURCE_MAP.put("laoke.com", "鑰佸"); + SOURCE_MAP.put("0535zy.cn", "鎷涜繙鍦ㄧ嚎"); + SOURCE_MAP.put("xiansp.com", "瑗垮畨鍟嗛摵缃�"); + SOURCE_MAP.put("yikeso.com", "浜垮鎼�"); + SOURCE_MAP.put("0710111.com", "鏋i槼鍦ㄧ嚎"); + SOURCE_MAP.put("yszx.ccoo.cn", "娌傛按鍦ㄧ嚎"); + SOURCE_MAP.put("710089.ccoo.cn", "闃庤壇涔嬬獥"); + SOURCE_MAP.put("mytophome.com", "婊″爞绾㈠湴浜х綉"); + SOURCE_MAP.put("haozu.com", "濂界缃�"); + SOURCE_MAP.put("0771sp.com", "鍗楀畞鍟嗛摵缃�"); + SOURCE_MAP.put("360xzl.com", "360鍐欏瓧妤肩綉"); + SOURCE_MAP.put("360xzl.com", "360鍐欏瓧妤肩綉"); + SOURCE_MAP.put("360xzl.com", "360鍐欏瓧妤肩綉"); + SOURCE_MAP.put("0574work.com", "娌冨厠鍔炲叕"); + SOURCE_MAP.put("518spw.com", "518鍟嗛摵缃�"); + SOURCE_MAP.put("518spw.com", "518鍟嗛摵缃�"); + SOURCE_MAP.put("caipucn.cn", "璐㈤摵缃�"); + SOURCE_MAP.put("qiaoqian8.com", "涔旇縼涔嬪枩"); + SOURCE_MAP.put("qiaoqian8.com", "涔旇縼涔嬪枩"); + SOURCE_MAP.put("gxsky.com", "鏃剁┖鎴夸骇缃�"); + SOURCE_MAP.put("ma3office.com", "椹笂鍔炲叕"); + SOURCE_MAP.put("gxsky.com", "鏃剁┖鎴夸骇缃�"); + SOURCE_MAP.put("gzcc.gov.cn", "骞垮窞甯備綇鎴垮拰鍩庝埂寤鸿濮斿憳浼�"); + SOURCE_MAP.put("zhdpb.gov.cn", "鐝犳捣甯傚彂灞曞拰鏀归潻灞�"); + SOURCE_MAP.put("zhaoshang800.com", "涓伐鎷涘晢缃�"); + SOURCE_MAP.put("123.131.127.13", "娼嶅潑鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("jxbuild.gov.cn", "鍢夊叴甯備綇鎴夸繚闅滃眬"); + SOURCE_MAP.put("zhaoshang800.com", "涓伐鎷涘晢缃�"); + SOURCE_MAP.put("fcxx0898.com", "涓変簹甯傛埧浜т俊鎭綉"); + SOURCE_MAP.put("ljhouse.org", "涓芥睙鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("ptjsj.gov.cn", "鑾嗙敯甯備綇鎴垮拰鍩庝埂寤鸿淇℃伅缃�"); + SOURCE_MAP.put("tangshan.gov.cn", "鍞愬北甯備綇鎴垮拰鍩庝埂寤鸿灞�"); + SOURCE_MAP.put("0311.com.cn", "鏂板煄缃�"); + SOURCE_MAP.put("ccfdw.gov.cn", "闀挎槬甯備綇鎴夸繚闅滃拰鎴垮湴浜х鐞嗗眬"); + SOURCE_MAP.put("pupuwang.com", "閾洪摵鏃�"); + SOURCE_MAP.put("comwin-sh.com", "骞挎眹涓婃捣鍐欏瓧妤肩璧�"); + SOURCE_MAP.put("91taoban.com", "娣樺姙"); + SOURCE_MAP.put("222.184.103.50:7700", "娣畨浣忔埧淇濋殰缃�"); + SOURCE_MAP.put("scybfdc.com", "瀹滃甯傛埧鍦颁骇绠$悊灞�鏀垮姟鍏紑缃�"); + SOURCE_MAP.put("zjkzjj.gov.cn", "寮犲鍙d綇鎴垮拰鍩庝埂寤鸿灞�"); + SOURCE_MAP.put("0797fdc.com.cn", "璧e窞鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("ddfc.com.cn", "涓逛笢鎴夸骇浜ゆ槗缃�"); + SOURCE_MAP.put("whfdcdj.cn", "鑺滄箹鎴垮湴浜т氦鏄撲笌涓嶅姩浜х櫥璁颁俊鎭綉"); + SOURCE_MAP.put("macheng.ccoo.cn", "楹诲煄淇℃伅缃�"); + SOURCE_MAP.put("mtzx.ccoo.cn", "婀勬江鍦ㄧ嚎"); + SOURCE_MAP.put("mhk.ccoo.cn", "姊呮渤鍙e湪绾�"); + SOURCE_MAP.put("minle.ccoo.cn", "姘戜箰淇℃伅娓�"); + SOURCE_MAP.put("mengyin.ccoo.cn", "钂欓槾鍦ㄧ嚎"); + SOURCE_MAP.put("168dc.com", "168鍦颁骇缃�"); + SOURCE_MAP.put("lffcj.com", "涓存本甯備綇鎴夸笌鎴垮湴浜т俊鎭�"); + SOURCE_MAP.put("o571.com", "鏉窞鍐欏瓧妤肩綉o571.com"); + SOURCE_MAP.put("hbczfdc.com", "娌у窞甯傛埧鍦颁骇淇℃伅缃�"); + SOURCE_MAP.put("huangshan.gov.cn", "榛勫北甯傛埧浜т簨鍔$鐞嗗眬"); + SOURCE_MAP.put("daji123.com", "澶ч泦鍟嗛摵缃�"); + SOURCE_MAP.put("thfdc.net", "閫氬寲甯傛埧浜т氦鏄撲俊鎭綉"); + SOURCE_MAP.put("fangtoo.com", "鎴块�旂綉"); + SOURCE_MAP.put("fangtoo.com", "鎴块�旂綉"); + SOURCE_MAP.put("lsjs.gov.cn", "涓芥按甯傞�忔槑鍞埧缃�"); + SOURCE_MAP.put("diandianzu.com", "鐐圭偣绉�"); + SOURCE_MAP.put("fyhouse.net", "闃滈槼鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("luan.gov.cn", "鍏畨甯備綇鎴垮拰鍩庝埂寤鸿濮斿憳浼�"); + SOURCE_MAP.put("xtfc.gov.cn", "婀樻江甯傛埧浜х鐞嗗眬"); + SOURCE_MAP.put("jmzjj.gov.cn", "姹熼棬甯備綇鎴垮拰鍩庝埂寤鸿灞�"); + SOURCE_MAP.put("58.51.240.121:8503", "榛勭煶甯傛埧鍦颁骇甯傚満淇℃伅鍙戝竷骞冲彴"); + SOURCE_MAP.put("yipu88.com", "浜块摵缃�"); + SOURCE_MAP.put("haowangpu.com", "濂芥椇閾�"); + SOURCE_MAP.put("puzaixian.com", "閾哄湪绾�"); + SOURCE_MAP.put("5acbd.com", "5A鍟嗙敤鍦颁骇"); + SOURCE_MAP.put("5acbd.com", "5A鍟嗙敤鍦颁骇"); + SOURCE_MAP.put("51banban.com", "51鍔炲姙缃�"); + SOURCE_MAP.put("0311.com.cn", "鏂板煄缃�"); + SOURCE_MAP.put("dzfgj.com", "杈惧窞甯傛埧浜х鐞嗗眬"); + SOURCE_MAP.put("hbsfdc.com", "娣寳甯備綇瀹呬笌鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("91taoban.com", "娣樺姙"); + SOURCE_MAP.put("tcfc365.com", "閾滃窛甯傛埧鍦颁骇甯傚満淇℃伅缃�"); + SOURCE_MAP.put("xcfdc.gov.cn", "瀹e煄甯傛埧鍦颁骇绠$悊灞�"); + SOURCE_MAP.put("gzfcxx.cn", "瀹夐『甯備綇鎴垮拰鍩庝埂寤鸿缃�"); + SOURCE_MAP.put("hnhbfgj.cn", "楣ゅ甯傛埧浜х鐞嗕腑蹇�"); + SOURCE_MAP.put("xtsfdc.com", "浠欐甯傛埧鍦颁骇淇℃伅缃�"); + SOURCE_MAP.put("hsfdcxx.com", "琛℃按鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("0937.com", "鍢夊唱鍏冲湪绾�"); + SOURCE_MAP.put("0536qz.com", "闈掑窞鍦ㄧ嚎"); + SOURCE_MAP.put("0771sp.com", "鍗楀畞鍟嗛摵缃�"); + SOURCE_MAP.put("yumen.tv", "鐜夐棬鍦ㄧ嚎"); + SOURCE_MAP.put("yuxian.ccoo.cn", "鐩傚幙鍦ㄧ嚎"); + SOURCE_MAP.put("yuanyang.ccoo.cn", "鍘熼槼鍦ㄧ嚎"); + SOURCE_MAP.put("pulaipuwang.com", "閾烘潵閾哄線"); + SOURCE_MAP.put("soufang998.com", "998鍟嗛摵缃�"); + SOURCE_MAP.put("yipu.com.cn", "鏄撻摵缃�"); + SOURCE_MAP.put("kongjianjia.com", "绌洪棿瀹�"); + SOURCE_MAP.put("zupuk.com", "绉熼摵缃�"); + SOURCE_MAP.put("hc376.com", "娼㈠窛鍦ㄧ嚎"); + SOURCE_MAP.put("luzhou.ccoo.cn", "娉稿窞鍦ㄧ嚎"); + SOURCE_MAP.put("zupuk.com", "绉熼摵缃�"); + SOURCE_MAP.put("shangpusou.com", "鍟嗛摵鎼�"); + SOURCE_MAP.put("shangpusou.com", "鍟嗛摵鎼�"); + SOURCE_MAP.put("shangpusou.com", "鍟嗛摵鎼�"); + SOURCE_MAP.put("shangpusou.com", "鍟嗛摵鎼�"); + SOURCE_MAP.put("001zf.com", "绗竴绉熸埧缃�"); + SOURCE_MAP.put("5sw.com", "浜旀槦缃�"); + SOURCE_MAP.put("0799fdc.com", "钀嶄埂鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("023755.com", "閰夐槼鍦ㄧ嚎"); + SOURCE_MAP.put("china0796.com", "姘镐赴缃�"); + SOURCE_MAP.put("746300.net", "鑸熸洸鍩庡競鍦ㄧ嚎"); + SOURCE_MAP.put("zhongmou.ccoo.cn", "涓墴缃�"); + SOURCE_MAP.put("hbzjrx.com", "鏋濇睙鐑嚎"); + SOURCE_MAP.put("zaoqiang.ccoo.cn", "鏋e己鍦ㄧ嚎"); + SOURCE_MAP.put("officese.com", "涓崕鍐欏瓧妤肩綉"); + SOURCE_MAP.put("officese.com", "涓崕鍐欏瓧妤肩綉"); + SOURCE_MAP.put("shenyangoffice.com", "娌堥槼鍐欏瓧妤�"); + SOURCE_MAP.put("0744.ccoo.cn", "寮犲鐣岄棬鎴风綉"); + SOURCE_MAP.put("bjxzlou.com", "鍖椾含鍐欏瓧妤肩綉"); + SOURCE_MAP.put("zyzx.ccoo.cn", "鑲囨簮鍦ㄧ嚎"); + SOURCE_MAP.put("zhenan.ccoo.cn", "闀囧畨鍦ㄧ嚎"); + SOURCE_MAP.put("zhenping.ccoo.cn", "闀囧钩鍦ㄧ嚎"); + SOURCE_MAP.put("100loujia.com", "涓�鐧炬ゼ浣�"); + SOURCE_MAP.put("bjxzl.com.cn", "鍖椾含鍐欏瓧妤肩綉bjxzl"); + SOURCE_MAP.put("028office.com", "鎴愰兘鍐欏瓧妤间俊鎭綉"); + SOURCE_MAP.put("17duu.com", "17搴﹀啓瀛楁ゼ缃�"); + SOURCE_MAP.put("woaipu.com", "鎴戠埍閾虹綉"); + SOURCE_MAP.put("zz.ccoo.cn", "閮戝窞缃�"); + SOURCE_MAP.put("quanhuaoffice.com", "鍏ㄥ崕缃�"); + SOURCE_MAP.put("wzzf.cn", "娓╁窞绉熸埧缃�"); + SOURCE_MAP.put("0571pu.com", "閾洪潰缃�"); + SOURCE_MAP.put("sp.dingow.cn", "瀹佹尝鍟嗛摵缃�"); + SOURCE_MAP.put("zhuanmenmian.com", "杞棬闈㈢綉"); + SOURCE_MAP.put("51jam.com", "鎴戣鍔犵洘缃�"); + SOURCE_MAP.put("jzyj.ccoo.cn", "閲戝鍙堕泦鍦ㄧ嚎"); + SOURCE_MAP.put("yanchang.ccoo.cn", "寤堕暱鍦ㄧ嚎"); + SOURCE_MAP.put("yanqing.ccoo.cn", "寤跺簡鍦ㄧ嚎"); + SOURCE_MAP.put("028office.com", "鎴愰兘鍐欏瓧妤间俊鎭綉"); + SOURCE_MAP.put("028office.com", "鎴愰兘鍐欏瓧妤间俊鎭綉"); + SOURCE_MAP.put("jxxzl.com", "姹熻タ鍐欏瓧妤肩綉"); + SOURCE_MAP.put("jxxzl.com", "姹熻タ鍐欏瓧妤肩綉"); + SOURCE_MAP.put("soulou365.com", "鎼滄ゼ缃�"); + SOURCE_MAP.put("soulou365.com", "鎼滄ゼ缃�"); + SOURCE_MAP.put("yzzx.ccoo.cn", "鍏栧窞鍦ㄧ嚎"); + SOURCE_MAP.put("yanshi.ccoo.cn", "鍋冨笀鐢熸椿缃�"); + SOURCE_MAP.put("yanjiao.ccoo.cn", "鐕曢儕澶ц閲�"); + SOURCE_MAP.put("zlt.ccoo.cn", "鎵庨瞾鐗瑰湪绾�"); + SOURCE_MAP.put("zoucheng.cc", "閭瑰煄鍦ㄧ嚎"); + SOURCE_MAP.put("zzcszx.com", "鏋e簞鍩庡競鍦ㄧ嚎"); + SOURCE_MAP.put("zhalantun.ccoo.cn", "鎵庡叞灞湪绾�"); + SOURCE_MAP.put("741500.com", "寮犲宸濆湪绾�"); + SOURCE_MAP.put("zhanhua.ccoo.cn", "娌惧寲鍦ㄧ嚎"); + SOURCE_MAP.put("yanggu.ccoo.cn", "闃宠胺鍦ㄧ嚎"); + SOURCE_MAP.put("yangxin.ccoo.cn", "闃充俊鍦ㄧ嚎"); + SOURCE_MAP.put("yangling.ccoo.cn", "鏉ㄥ噷鍦ㄧ嚎"); + SOURCE_MAP.put("0898yp.cn", "娲嬫郸鍦ㄧ嚎"); + SOURCE_MAP.put("soulou365.com", "鎼滄ゼ缃�"); + SOURCE_MAP.put("nxfcj.com", "瀹佷埂鎴夸骇鏀垮姟淇℃伅缃�"); + SOURCE_MAP.put("001zf.com", "绗竴绉熸埧缃�"); + SOURCE_MAP.put("18fang.com", "鍗佸叓鎴跨綉绔�"); + SOURCE_MAP.put("18fang.com", "鍗佸叓鎴跨綉绔�"); + SOURCE_MAP.put("dyyscx.com", "寰烽槼鎴垮湴浜�"); + SOURCE_MAP.put("fgj.hd.gov.cn", "閭兏甯備綇鎴夸繚闅滃拰鎴夸骇绠$悊灞�"); + SOURCE_MAP.put("xxgk.liuzhou.gov.cn", "骞胯タ澹棌鑷不鍖烘斂搴滀俊鎭叕寮�缁熶竴骞冲彴"); + SOURCE_MAP.put("xyszj.gov.cn", "鍜搁槼甯備綇鎴垮拰鍩庝埂寤鸿瑙勫垝灞�"); + SOURCE_MAP.put("fcxx.glzjxx.com", "妗傛灄甯傛埧鍦颁骇淇℃伅缃�"); + SOURCE_MAP.put("028hzcbd.com", "澶╁簻鍐欏瓧妤肩綉"); + SOURCE_MAP.put("028hzcbd.com", "澶╁簻鍐欏瓧妤肩綉"); + SOURCE_MAP.put("0870.ccoo.cn", "鏄�氬湪绾�"); + SOURCE_MAP.put("028cbd.com", "鎴愰兘鍐欏瓧妤肩綉028cbd"); + SOURCE_MAP.put("bjxzlou.com", "鍖椾含鍐欏瓧妤肩綉"); + SOURCE_MAP.put("100loujia.com", "涓�鐧炬ゼ浣�"); + SOURCE_MAP.put("zhengan.ccoo.cn", "姝e畨鍦ㄧ嚎缃�"); + SOURCE_MAP.put("zhengding.ccoo.cn", "姝e畾鍦ㄧ嚎"); + SOURCE_MAP.put("zhengyang.ccoo.cn", "姝i槼缃�"); + SOURCE_MAP.put("xa.ccoo.cn", "瑗垮畨涔嬬獥"); + SOURCE_MAP.put("guangxinhongye.com", "鍔炲叕閫夊潃缃�"); + SOURCE_MAP.put("puzaixian.com", "閾哄湪绾�"); + SOURCE_MAP.put("xichong.ccoo.cn", "瑗垮厖鍦ㄧ嚎"); + SOURCE_MAP.put("xining.ccoo.cn", "瑗垮畞鍦ㄧ嚎"); + SOURCE_MAP.put("xiping.ccoo.cn", "瑗垮钩鍦ㄧ嚎"); + SOURCE_MAP.put("xwq.ccoo.cn", "瑗夸箤鏃楀湪绾�"); + SOURCE_MAP.put("xixia.ccoo.cn", "瑗垮场鍦ㄧ嚎"); + SOURCE_MAP.put("xfzx.ccoo.cn", "鎭兘鍦ㄧ嚎"); + SOURCE_MAP.put("91souban.com", "鎼滃姙"); + SOURCE_MAP.put("loukee.com", "妤煎"); + SOURCE_MAP.put("bjxzl.com.cn", "鍖椾含鍐欏瓧妤肩綉bjxzl"); + SOURCE_MAP.put("xixian.ccoo.cn", "鎭幙鍦ㄧ嚎"); + SOURCE_MAP.put("0357xx.com", "闅板幙鍦ㄧ嚎"); + SOURCE_MAP.put("xzlzl.com", "妤煎棖鍡�"); + SOURCE_MAP.put("rshy-office.com", "鍖椾含鍐欏瓧妤肩璧佺綉"); + SOURCE_MAP.put("omiaozu.com", "绉掔"); + SOURCE_MAP.put("omiaozu.com", "绉掔"); + SOURCE_MAP.put("yibaotong.com", "澹规姤閫氬晢涓氬湴浜�"); + SOURCE_MAP.put("cslou.com", "闀挎矙鍐欏瓧妤肩綉"); + SOURCE_MAP.put("cslou.com", "闀挎矙鍐欏瓧妤肩綉"); + SOURCE_MAP.put("bayan.ccoo.cn", "宸村溅缃�"); + SOURCE_MAP.put("bc.ccoo.cn", "鐧藉煄涔嬬獥"); + SOURCE_MAP.put("baoding.ccoo.cn", "淇濆畾鍦ㄧ嚎"); + SOURCE_MAP.put("0827.la", "宸翠腑涔嬬獥"); + SOURCE_MAP.put("baojing.ccoo.cn", "淇濋潠闂ㄦ埛缃�"); + SOURCE_MAP.put("yes515.com", "515鎴夸骇缃�"); + SOURCE_MAP.put("yanjin.ccoo.cn", "寤舵触鍦ㄧ嚎"); + SOURCE_MAP.put("yanshou.ccoo.cn", "寤跺鍦ㄧ嚎"); + SOURCE_MAP.put("yanfu.ccoo.cn", "鐩愰槣鍦ㄧ嚎"); + SOURCE_MAP.put("yanting8.com", "鐩愪涵鍦ㄧ嚎"); + SOURCE_MAP.put("yibaotong.com", "澹规姤閫氬晢涓氬湴浜�"); + SOURCE_MAP.put("yibaotong.com", "澹规姤閫氬晢涓氬湴浜�"); SOURCE_MAP.put("53office.com", "53office"); SOURCE_MAP.put("53office.com", "53office"); - SOURCE_MAP.put("cqoffice.net", "重庆写字楼网cqoffice"); - SOURCE_MAP.put("cqoffice.net", "重庆写字楼网cqoffice"); - SOURCE_MAP.put("izhuanr.com", "爱转让"); - SOURCE_MAP.put("wkban.com", "天使助"); - SOURCE_MAP.put("cangzhou.ccoo.cn", "沧州在线"); - SOURCE_MAP.put("beichuan.ccoo.cn", "北川在线"); - SOURCE_MAP.put("beihai.ccoo.cn", "北海在线"); - SOURCE_MAP.put("beipiao.ccoo.cn", "北票在线"); - SOURCE_MAP.put("binxian.cc", "彬县网"); - SOURCE_MAP.put("www.bh.ccoo.cn", "滨海在线"); - SOURCE_MAP.put("bzonl.com", "滨州在线"); - SOURCE_MAP.put("bobai.ccoo.cn", "博白生活网"); - SOURCE_MAP.put("baisha.ccoo.cn", "白沙网"); - SOURCE_MAP.put("baiquan.ccoo.cn", "拜泉生活网"); - SOURCE_MAP.put("baotou.ccoo.cn", "包头之声"); - SOURCE_MAP.put("baodi.ccoo.cn", "宝坻在线"); - SOURCE_MAP.put("baofeng365.com", "宝丰在线"); - SOURCE_MAP.put("bishan.ccoo.cn", "璧山在线"); - SOURCE_MAP.put("bxzx.ccoo.cn", "宾县在线"); - SOURCE_MAP.put("botou.ccoo.cn", "泊头在线"); - SOURCE_MAP.put("mizhai.com", "米宅"); - SOURCE_MAP.put("mizhai.com", "米宅"); - SOURCE_MAP.put("bx169.com", "博兴在线"); - SOURCE_MAP.put("bx169.com", "博兴在线"); - SOURCE_MAP.put("boye.ccoo.cn", "博野在线"); - SOURCE_MAP.put("gaobeidian.info", "高碑店在线"); - SOURCE_MAP.put("biyang.ccoo.cn", "泌阳在线"); - SOURCE_MAP.put("badong.ccoo.cn", "巴东百姓网"); - SOURCE_MAP.put("blyq.ccoo.cn", "巴林右旗在线"); - SOURCE_MAP.put("0730bl.ccoo.cn", "巴陵在线"); - SOURCE_MAP.put("as.ccoo.cn", "鞍山在线"); - SOURCE_MAP.put("aqi.ccoo.cn", "阿旗信息网"); - SOURCE_MAP.put("anguo.ccoo.cn", "安国在线"); - SOURCE_MAP.put("anhua365.com", "安化在线"); - SOURCE_MAP.put("ankang.ccoo.cn", "安康在线"); - SOURCE_MAP.put("anlu.ccoo.cn", "安陆在线"); - SOURCE_MAP.put("anxinol.cn", "安新在线"); - SOURCE_MAP.put("anyue.ccoo.cn", "安岳在线"); - SOURCE_MAP.put("acheng.ccoo.cn", "阿城网"); - SOURCE_MAP.put("qiaojia.ccoo.cn", "白鹤滩在线"); - SOURCE_MAP.put("fccs.com", "中国房产超市网"); - SOURCE_MAP.put("qfang.com", "Q房网"); - SOURCE_MAP.put("qfang.com", "Q房网"); - SOURCE_MAP.put("fccs.com", "中国房产超市网"); - SOURCE_MAP.put("fccs.com", "中国房产超市网"); - SOURCE_MAP.put("86office.com", "86写字楼网"); - SOURCE_MAP.put("86office.com", "86写字楼网"); - SOURCE_MAP.put("028p.cn", "成都写字楼网"); - SOURCE_MAP.put("028p.cn", "成都写字楼网"); - SOURCE_MAP.put("028p.cn", "成都写字楼网"); - SOURCE_MAP.put("centanet.com", "中原地产"); - SOURCE_MAP.put("centanet.com", "中原地产"); - SOURCE_MAP.put("centanet.com", "中原地产"); - SOURCE_MAP.put("centanet.com", "中原地产"); - SOURCE_MAP.put("657200.cn", "镇雄之窗"); - SOURCE_MAP.put("cangxi.ccoo.cn", "苍溪在线"); - SOURCE_MAP.put("cfd.ccoo.cn", "曹妃甸城市在线"); - SOURCE_MAP.put("changge.cc", "长葛网"); - SOURCE_MAP.put("changning.me", "长宁在线"); - SOURCE_MAP.put("changwu.ccoo.cn", "长武网"); - SOURCE_MAP.put("changxing.ccoo.cn", "长兴在线"); - SOURCE_MAP.put("changyang.ccoo.cn", "长阳在线"); - SOURCE_MAP.put("changyuan.ccoo.cn", "长垣在线"); - SOURCE_MAP.put("cdzx.ccoo.cn", "常德门户网"); - SOURCE_MAP.put("chaohu.ccoo.cn", "巢湖在线"); - SOURCE_MAP.put("chaoyang.ccoo.cn", "朝阳之窗"); - SOURCE_MAP.put("023ck.cn", "城口在线"); - SOURCE_MAP.put("715200.com", "澄城在线"); - SOURCE_MAP.put("0566.ccoo.cn", "池州城市在线"); - SOURCE_MAP.put("chishui.ccoo.cn", "赤水在线"); - SOURCE_MAP.put("360fdc.com", "中房网"); - SOURCE_MAP.put("ke.com", "贝壳"); - SOURCE_MAP.put("ke.com", "贝壳"); - SOURCE_MAP.put("czccoo.com", "崇州在线"); - SOURCE_MAP.put("cili.ccoo.cn", "慈利之窗"); - SOURCE_MAP.put("557400.cn", "从江在线"); - SOURCE_MAP.put("caidian.ccoo.cn", "蔡甸在线"); - SOURCE_MAP.put("sina.com.cn", "新浪乐居"); - SOURCE_MAP.put("sina.com.cn", "新浪乐居"); - SOURCE_MAP.put("lyfce.cn", "龙游房产网"); - SOURCE_MAP.put("sina.com.cn", "新浪乐居"); - SOURCE_MAP.put("house365.com", "365地产家居网"); - SOURCE_MAP.put("house365.com", "365地产家居网"); - SOURCE_MAP.put("youfangw.com", "游房网"); - SOURCE_MAP.put("luobei.ccoo.cn", "萝北信息港"); - SOURCE_MAP.put("135100.cn", "中国辉南网"); - SOURCE_MAP.put("sxcm.net", "万州房产"); - SOURCE_MAP.put("sina.com.cn", "新浪乐居"); - SOURCE_MAP.put("dcw0550.com", "大滁网"); - SOURCE_MAP.put("dg688.com", "大港在线"); - SOURCE_MAP.put("dali.ccoo.cn", "大荔之窗"); - SOURCE_MAP.put("daying.ccoo.cn", "大英在线"); - SOURCE_MAP.put("dazu.ccoo.cn", "大足在线"); - SOURCE_MAP.put("danzhou8.com", "儋州在线"); - SOURCE_MAP.put("dangyang.ccoo.cn", "当阳在线"); - SOURCE_MAP.put("idszx.com", "砀山在线"); - SOURCE_MAP.put("ke.com", "贝壳"); - SOURCE_MAP.put("dehui.ccoo.cn", "德惠在线"); - SOURCE_MAP.put("dexing.ccoo.cn", "德兴生活网"); - SOURCE_MAP.put("dengfeng.ccoo.cn", "登封在线"); - SOURCE_MAP.put("dengzhou.ccoo.cn", "邓州在线"); - SOURCE_MAP.put("djxxw.cn", "垫江信息网"); - SOURCE_MAP.put("jxdn.ccoo.cn", "定南在线"); - SOURCE_MAP.put("dunhuang.ccoo.cn", "敦煌百晓阁"); - SOURCE_MAP.put("dx.ccoo.cn", "定西在线"); - SOURCE_MAP.put("dingzhou.ccoo.cn", "定州在线"); - SOURCE_MAP.put("dongming.ccoo.cn", "东明在线"); - SOURCE_MAP.put("haopoo.com", "好铺网"); - SOURCE_MAP.put("kuyiso.com", "酷易搜"); - SOURCE_MAP.put("xuanzhi371.com", "中原选址网"); - SOURCE_MAP.put("xuanzhi371.com", "中原选址网"); - SOURCE_MAP.put("xuanzhi371.com", "中原选址网"); - SOURCE_MAP.put("xuanzhi371.com", "中原选址网"); - SOURCE_MAP.put("01fy.cn", "第一时间"); - SOURCE_MAP.put("spc365.com", "金山房产"); - SOURCE_MAP.put("spc365.com", "金山房产"); - SOURCE_MAP.put("spc365.com", "金山房产"); - SOURCE_MAP.put("spc365.com", "金山房产"); - SOURCE_MAP.put("myliving.cn", "租售情报网"); - SOURCE_MAP.put("landwg.com", "万购地产网"); - SOURCE_MAP.put("landwg.com", "万购地产网"); - SOURCE_MAP.put("zj.ccoo.cn", "镇江网"); - SOURCE_MAP.put("0515.ccoo.cn", "东台网"); - SOURCE_MAP.put("dxh.ccoo.cn", "东西湖在线"); - SOURCE_MAP.put("dongxiang.ccoo.cn", "东乡之窗"); - SOURCE_MAP.put("duan.ccoo.cn", "都安在线"); - SOURCE_MAP.put("duyun.ccoo.cn", "都匀生活网"); - SOURCE_MAP.put("woaipu.com", "我爱铺网"); - SOURCE_MAP.put("woaipu.com", "我爱铺网"); - SOURCE_MAP.put("dayangfangchan.com", "大洋地产"); - SOURCE_MAP.put("dayangfangchan.com", "大洋地产"); - SOURCE_MAP.put("kongjianjia.com", "空间家"); - SOURCE_MAP.put("kan3721.com", "杭州看房网"); - SOURCE_MAP.put("kongjianjia.com", "空间家"); - SOURCE_MAP.put("zhengez.com", "正e租"); - SOURCE_MAP.put("zhengez.com", "正e租"); - SOURCE_MAP.put("kuaizuyi.com", "快租"); - SOURCE_MAP.put("zhenfeng.ccoo.cn", "贞丰在线"); - SOURCE_MAP.put("aqlife.com", "安庆E网生活"); - SOURCE_MAP.put("xiongqi.net", "巴中房产网"); - SOURCE_MAP.put("xiongqi.net", "巴中房产网"); - SOURCE_MAP.put("qd8.com", "起点8"); - SOURCE_MAP.put("07358.com", "郴房网"); - SOURCE_MAP.put("laoke.com", "老客"); - SOURCE_MAP.put("eaw.cc", "亿艾网"); - SOURCE_MAP.put("eaw.cc", "亿艾网"); - SOURCE_MAP.put("eaw.cc", "亿艾网"); - SOURCE_MAP.put("eaw.cc", "亿艾网"); - SOURCE_MAP.put("fangyi.com", "房一网"); - SOURCE_MAP.put("fangyi.com", "房一网"); - SOURCE_MAP.put("house.mllj.net", "庐江房产信息网"); - SOURCE_MAP.put("jinti.com", "今题网"); - SOURCE_MAP.put("0817.net", "南房网"); - SOURCE_MAP.put("0817.net", "南房网"); - SOURCE_MAP.put("oupye.net", "商业地产"); - SOURCE_MAP.put("etk.ccoo.cn", "鄂托克旗在线"); - SOURCE_MAP.put("duerbote.ccoo.cn", "杜尔伯特在线"); - SOURCE_MAP.put("dqccc.com", "地球城"); - SOURCE_MAP.put("feicheng.ccoo.cn", "肥城在线"); - SOURCE_MAP.put("fczx.ccoo.cn", "丰城在线"); - SOURCE_MAP.put("fengdu.ccoo.cn", "丰都网"); - SOURCE_MAP.put("fnzx.ccoo.cn", "丰南在线"); - SOURCE_MAP.put("dqccc.com", "地球城"); - SOURCE_MAP.put("dqccc.com", "地球城"); - SOURCE_MAP.put("dqccc.com", "地球城"); - SOURCE_MAP.put("edeng.cn", "易登网"); - SOURCE_MAP.put("oupye.net", "商业地产"); - SOURCE_MAP.put("ezzxw.com", "鄂州在线"); - SOURCE_MAP.put("feixian.cc", "费县在线"); - SOURCE_MAP.put("feixian.cc", "费县在线"); - SOURCE_MAP.put("feicheng.ccoo.cn", "肥城在线"); - SOURCE_MAP.put("enping.ccoo.cn", "恩平之窗"); - SOURCE_MAP.put("fx122.com", "范县在线"); - SOURCE_MAP.put("fcpzh.com", "攀枝花房产网"); - SOURCE_MAP.put("028f.com", "成房网"); - SOURCE_MAP.put("88tie.com", "88同城"); - SOURCE_MAP.put("88tie.com", "88同城"); - SOURCE_MAP.put("88tie.com", "88同城"); - SOURCE_MAP.put("ljfw.com.cn", "丽江房网"); - SOURCE_MAP.put("51tie.com", "51同城"); - SOURCE_MAP.put("luanren.com", "六安人"); - SOURCE_MAP.put("51tie.com", "51同城"); - SOURCE_MAP.put("soufy.cn", "搜房源"); - SOURCE_MAP.put("soufy.cn", "搜房源"); - SOURCE_MAP.put("soufy.cn", "搜房源"); - SOURCE_MAP.put("soufy.cn", "搜房源"); - SOURCE_MAP.put("gzfg.ccoo.cn", "凤冈信息网"); - SOURCE_MAP.put("0917888.com", "凤翔在线"); - SOURCE_MAP.put("fengjie.ccoo.cn", "奉节在线"); - SOURCE_MAP.put("fusui.ccoo.cn", "扶绥在线"); - SOURCE_MAP.put("fl.ccoo.cn", "涪陵城市在线"); - SOURCE_MAP.put("fzccoo.com", "福州在线"); - SOURCE_MAP.put("719400.com", "府谷在线"); - SOURCE_MAP.put("0561life.com", "淮北生活网"); - SOURCE_MAP.put("chuanbei.net", "广元房产网"); - SOURCE_MAP.put("chuanbei.net", "广元房产网"); - SOURCE_MAP.put("fucheng.ccoo.cn", "阜城热线"); - SOURCE_MAP.put("funanzx.com", "阜南在线"); - SOURCE_MAP.put("168hs.com", "黄山市民网"); - SOURCE_MAP.put("0831home.com", "三江房产网"); - SOURCE_MAP.put("fuxin1.com", "阜新在线"); - SOURCE_MAP.put("0831home.com", "三江房产网"); - SOURCE_MAP.put("0913ss.com", "富平在线"); - SOURCE_MAP.put("0813fs.com", "富顺在线"); - SOURCE_MAP.put("leju.com", "乐居二手房"); - SOURCE_MAP.put("5sw.com", "五星网"); - SOURCE_MAP.put("5acbd.com", "5A商用地产"); - SOURCE_MAP.put("5acbd.com", "5A商用地产"); - SOURCE_MAP.put("focus.cn", "搜狐焦点"); - SOURCE_MAP.put("0454.com", "佳木斯三江网"); - SOURCE_MAP.put("leju.com", "乐居二手房"); - SOURCE_MAP.put("leju.com", "乐居二手房"); - SOURCE_MAP.put("focus.cn", "搜狐焦点"); - SOURCE_MAP.put("h0758.net", "肇房网"); - SOURCE_MAP.put("zbinfo.net", "淄博信息港"); - SOURCE_MAP.put("zbinfo.net", "淄博信息港"); - SOURCE_MAP.put("zmd100.com", "驻马店100网"); - SOURCE_MAP.put("zmd100.com", "驻马店100网"); - SOURCE_MAP.put("gz.ccoo.cn", "赣州在线"); - SOURCE_MAP.put("gaoan.ccoo.cn", "高安在线"); - SOURCE_MAP.put("gaoqing.ccoo.cn", "高青网"); - SOURCE_MAP.put("saofang.cn", "扫房网"); - SOURCE_MAP.put("saofang.cn", "扫房网"); - SOURCE_MAP.put("saofang.cn", "扫房网"); - SOURCE_MAP.put("saofang.cn", "扫房网"); - SOURCE_MAP.put("cdzfw.com", "成都租房网"); - SOURCE_MAP.put("cdzfw.com", "成都租房网"); - SOURCE_MAP.put("5008.net.cn", "租房在线"); - SOURCE_MAP.put("5008.net.cn", "租房在线"); - SOURCE_MAP.put("qd8.com", "起点8"); - SOURCE_MAP.put("qd8.com", "起点8"); - SOURCE_MAP.put("qd8.com", "起点8"); - SOURCE_MAP.put("qd8.com", "起点8"); - SOURCE_MAP.put("gaotang.org", "高唐在线"); - SOURCE_MAP.put("my0832.com", "资阳大众网"); - SOURCE_MAP.put("my0832.com", "资阳大众网"); - SOURCE_MAP.put("gaoyang.ccoo.cn", "高阳信息网"); - SOURCE_MAP.put("gaoyizaixian.com", "高邑在线"); - SOURCE_MAP.put("zh51home.com", "珠海房产之窗"); - SOURCE_MAP.put("gaozhou.ccoo.cn", "高州在线"); - SOURCE_MAP.put("gcok.cn", "藁城在线"); - SOURCE_MAP.put("hlgnet.com", "回龙观网"); - SOURCE_MAP.put("09office.com", "锦心办公楼网"); - SOURCE_MAP.put("cnyw.net", "热房网"); - SOURCE_MAP.put("fangdushi.com", "房都市"); - SOURCE_MAP.put("anjuke.com", "安居客"); - SOURCE_MAP.put("gongyi.ccoo.cn", "巩义在线"); - SOURCE_MAP.put("gongxian.ccoo.cn", "珙县网"); - SOURCE_MAP.put("gulinw.com", "古蔺在线"); - SOURCE_MAP.put("guan.ccoo.cn", "固安在线"); - SOURCE_MAP.put("gushi.ccoo.cn", "固始在线"); - SOURCE_MAP.put("guzhen.ccoo.cn", "固镇在线"); - SOURCE_MAP.put("guazhou114.com", "瓜州城市在线"); - SOURCE_MAP.put("guanyun.ccoo.cn", "灌云在线"); - SOURCE_MAP.put("guangshan.ccoo.cn", "光山在线"); - SOURCE_MAP.put("xmhouse.com", "厦门房地产联合网"); - SOURCE_MAP.put(".rexian.net.cn", "武汉热线房产网"); - SOURCE_MAP.put("rexian.net.cn", "武汉热线房产网"); - SOURCE_MAP.put("grfy.net", "个人房源网"); - SOURCE_MAP.put("01fy.cn", "第1时间房源网"); - SOURCE_MAP.put("360fdc.com", "中房网"); - SOURCE_MAP.put("917.com", "917房产网"); - SOURCE_MAP.put("917.com", "917房产网"); - SOURCE_MAP.put("0577home.net", "温房网"); - SOURCE_MAP.put("cbdzl.com", "北京写字楼网"); - SOURCE_MAP.put("0577home", "温房网"); - SOURCE_MAP.put("ucnpark.com", "有限公园"); - SOURCE_MAP.put("ucnpark.com", "有限公园"); - SOURCE_MAP.put("yewn.cn", "荣耀渭南网"); - SOURCE_MAP.put("officefinder.com", "北京商务地产网"); - SOURCE_MAP.put("officefinder.com", "北京商务地产网"); - SOURCE_MAP.put("wuzhousky.com", "梧州时空网"); - SOURCE_MAP.put("jiayihouse.com", "甲乙房网"); - SOURCE_MAP.put("wuzhousky.com", "梧州时空网"); - SOURCE_MAP.put("wuzhousky.com", "梧州时空网"); - SOURCE_MAP.put("longcity.net", "住在龙城"); - SOURCE_MAP.put("xuanhaozhi.com", "选好址"); - SOURCE_MAP.put("xuanhaozhi.com", "选好址"); - SOURCE_MAP.put("tzinfo.net", "台州房产主网"); - SOURCE_MAP.put("beijingxiezilou.cn", "北京写字楼信息网"); - SOURCE_MAP.put("bj-officerent.com", "北京写字楼信息大全网"); - SOURCE_MAP.put("bj-officerent.com", "北京写字楼信息大全网"); - SOURCE_MAP.put("u88soufang.cn", "u88搜房"); - SOURCE_MAP.put("917.com", "917房产网"); - SOURCE_MAP.put("917.com", "917房产网"); - SOURCE_MAP.put("917.com", "917房产网"); - SOURCE_MAP.put("gaxxg.net", "广安信息港"); - SOURCE_MAP.put("51xzl.com", "天津写字楼网"); - SOURCE_MAP.put("51xzl.com", "天津写字楼网"); - SOURCE_MAP.put("gh.ccoo.cn", "广汉城市在线"); - SOURCE_MAP.put("022cbd.com", "天津写字楼商业地产网"); - SOURCE_MAP.put("022cbd.com", "天津写字楼商业地产网"); - SOURCE_MAP.put("022cbd.com", "天津写字楼商业地产网"); - SOURCE_MAP.put("022cbd.com", "天津写字楼商业地产网"); - SOURCE_MAP.put("guanghe.ccoo.cn", "广河在线"); - SOURCE_MAP.put("tjxiezilou.com", "天津写字楼信息网"); - SOURCE_MAP.put("grxxw.com", "广饶信息网"); - SOURCE_MAP.put("guangyuan.ccoo.cn", "广元都市网"); - SOURCE_MAP.put("ccoo.cn", "城市中国"); - SOURCE_MAP.put("022zs.com", "天津写字楼"); - SOURCE_MAP.put("guiding.ccoo.cn", "贵定在线"); - SOURCE_MAP.put("022zs.com", "天津写字楼"); - SOURCE_MAP.put("ccoo.cn", "城市中国"); - SOURCE_MAP.put("100jiaju.com", "南京百家居租房网"); - SOURCE_MAP.put("100jiaju.com", "南京百家居租房网"); - SOURCE_MAP.put("gy.ccoo.cn", "贵阳城市网"); - SOURCE_MAP.put("edianban.com", "e点办"); - SOURCE_MAP.put("liebiao.com", "列表网"); - SOURCE_MAP.put("025002.com", "南京在线"); - SOURCE_MAP.put("guiyang.ccoo.cn", "桂阳网"); - SOURCE_MAP.put("edeng.cn", "易登网"); - SOURCE_MAP.put("gy233600.cn", "涡阳在线"); - SOURCE_MAP.put("025002.com", "南京在线"); - SOURCE_MAP.put("025002.com", "南京在线"); - SOURCE_MAP.put("025002.com", "南京在线"); - SOURCE_MAP.put("flosir.com", "楼先生"); - SOURCE_MAP.put("flosir.com", "楼先生"); - SOURCE_MAP.put("haerbin.ccoo.cn", "哈尔滨在线"); - SOURCE_MAP.put("o571.com", "杭州写字楼网"); - SOURCE_MAP.put("tlxxw.com", "通辽信息港"); - SOURCE_MAP.put("kan3721.com", "杭州看房网"); - SOURCE_MAP.put("kan3721.com", "杭州看房网"); - SOURCE_MAP.put("5axzl.com", "5A商用地产网"); - SOURCE_MAP.put("5axzl.com", "5A商用地产网"); - SOURCE_MAP.put("5axzl.com", "5A商用地产网"); - SOURCE_MAP.put("7haikou.com", "海口在线"); - SOURCE_MAP.put("ningbo-office.com", "宁波写字楼网"); - SOURCE_MAP.put("hancheng.ccoo.cn", "韩城之窗"); - SOURCE_MAP.put("hcw.so", "汉川网"); - SOURCE_MAP.put("nthouse.com.cn", "南通房产超市"); - SOURCE_MAP.put("hcw.so", "汉川网"); - SOURCE_MAP.put("nthouse.com.cn", "南通房产超市"); - SOURCE_MAP.put(".jd.com", "京东拍卖"); - SOURCE_MAP.put("chineseoffice.com", "中国写字楼"); - SOURCE_MAP.put("nb-fang.com", "人人办公网"); - SOURCE_MAP.put("jiapai.net.cn", "嘉拍拍卖"); - SOURCE_MAP.put("gpai.net", "公拍网"); - SOURCE_MAP.put("whxiezilou.com", "武汉写字楼网"); - SOURCE_MAP.put("tjspw.cn", "天津厂房商铺网"); - SOURCE_MAP.put("amoyoffice.com", "厦门写字楼网"); - SOURCE_MAP.put("198office.com", "198办公楼网"); - SOURCE_MAP.put("officeing.com", "快搜网"); - SOURCE_MAP.put("001ce.com", "第一商业地产网"); - SOURCE_MAP.put("97hami.com", "九旗网"); - SOURCE_MAP.put("lcxwfc.com", "聊城房网"); - SOURCE_MAP.put("ilinyi.net", "爱临沂"); - SOURCE_MAP.put("goufon.com", "临沂购房网"); - SOURCE_MAP.put("0539zf.com", "临沂找房网"); - SOURCE_MAP.put("lpwww.com", "楼盘在线"); - SOURCE_MAP.put("linyiren.com", "临沂人房产网"); - SOURCE_MAP.put("ly169.cn", "临沂信息港"); - SOURCE_MAP.put("zhufon.com", "临沂住房网"); - SOURCE_MAP.put("lywww.com", "临沂在线房产网"); - SOURCE_MAP.put("jiazhuly.com", "金房网"); - SOURCE_MAP.put("lyzhujia.com", "临沂住家网"); - SOURCE_MAP.put("726000.net", "商洛房产网"); - SOURCE_MAP.put("0355fdc.com", "0355房产网"); - SOURCE_MAP.put("sqloushi.com", "商丘楼市"); - SOURCE_MAP.put("smxhaofang.com", "三门峡好房网"); - SOURCE_MAP.put("smxloushi.com", "三门峡楼市"); - SOURCE_MAP.put("0933f.com", "平凉房产网"); - SOURCE_MAP.put("xnfw.com", "咸宁房网"); - SOURCE_MAP.put("0715fc.com", "咸宁房产网"); - SOURCE_MAP.put("0716fw.com", "荆房网"); - SOURCE_MAP.put("jz6.cc", "荆州第一房产网"); - SOURCE_MAP.put("0738ld.com", "娄底房网"); - SOURCE_MAP.put("0738fdc.com", "娄底房产网"); - SOURCE_MAP.put("ldfdcw.com", "娄房网"); - SOURCE_MAP.put("lcfcw.com", "聊城房产网"); - SOURCE_MAP.put("fdc99.com", "永州房地产信息网"); - SOURCE_MAP.put("0597kk.com", "龙岩KK网"); - SOURCE_MAP.put("0597ok.com", "龙岩房地产联合网"); - SOURCE_MAP.put("luohejie.com", "漯河街"); - SOURCE_MAP.put("fdc0746.com", "0746楼市网"); - SOURCE_MAP.put("0395mf.com", "漯河买房网"); - SOURCE_MAP.put("lhfdc.com", "漯河房产网"); - SOURCE_MAP.put("0395.tv", "漯房网"); - SOURCE_MAP.put("lhloushi.com", "漯河楼市"); - SOURCE_MAP.put("0377fw.com", "南阳房产网"); - SOURCE_MAP.put("0826fang.com", "广安房产网"); - SOURCE_MAP.put("nyfang.cn", "南阳房地产"); - SOURCE_MAP.put("nyloushi.com", "南阳楼市"); - SOURCE_MAP.put("xnjhome.com", "新内江房产网"); - SOURCE_MAP.put("njxinf.com", "内江新房产网"); - SOURCE_MAP.put("fc0832.com", "内江房产"); - SOURCE_MAP.put("qinzf.com", "钦州住房网"); - SOURCE_MAP.put("qzfcw.com", "钦州房产网"); - SOURCE_MAP.put("tl8.com.cn", "铁岭房产网"); - SOURCE_MAP.put("dzcnc.com", "鲁北房产"); - SOURCE_MAP.put("hanshou.ccoo.cn", "汉寿在线"); - SOURCE_MAP.put("hanzhong123.com", "汉中在线"); - SOURCE_MAP.put("srtong.com", "上饶通房产网"); - SOURCE_MAP.put("0719house.com", "车城房产网"); - SOURCE_MAP.put("qingdaofdc.com", "青岛房网"); - SOURCE_MAP.put("0595qz.com", "泉州房地产信息网"); - SOURCE_MAP.put("0595qz.com", "泉州房地产信息网"); - SOURCE_MAP.put("0595qz.com", "泉州房地产信息网"); - SOURCE_MAP.put("595qz.com", "泉州房地产信息网"); - SOURCE_MAP.put("rmfysszc.gov.cn", "人民法院诉讼资产网"); - SOURCE_MAP.put("oncity.cc", "中山同城信息网"); - SOURCE_MAP.put("v007.net", "西江明珠房产网"); - SOURCE_MAP.put("5axzl.com", "5A商用地产网"); - SOURCE_MAP.put("0757fc.com", "佛山房产资讯网"); - SOURCE_MAP.put("sd888.org", "顺德楼市"); - SOURCE_MAP.put("0561life.com", "淮北生活网"); - SOURCE_MAP.put("hhk365.com", "黄河口信息港"); - SOURCE_MAP.put("sojixun.com", "搜即讯"); - SOURCE_MAP.put("z-lou.com", "租楼网"); - SOURCE_MAP.put("fzbm.com", "福州便民网"); - SOURCE_MAP.put("qth8.com", "七台河信息网"); - SOURCE_MAP.put("qth8.com", "七台河信息网"); - SOURCE_MAP.put("ntxx.net", "南通热线"); - SOURCE_MAP.put("fahaola.com", "发好啦"); - SOURCE_MAP.put("sanxia.net", "三峡热线"); + SOURCE_MAP.put("cqoffice.net", "閲嶅簡鍐欏瓧妤肩綉cqoffice"); + SOURCE_MAP.put("cqoffice.net", "閲嶅簡鍐欏瓧妤肩綉cqoffice"); + SOURCE_MAP.put("izhuanr.com", "鐖辫浆璁�"); + SOURCE_MAP.put("wkban.com", "澶╀娇鍔�"); + SOURCE_MAP.put("cangzhou.ccoo.cn", "娌у窞鍦ㄧ嚎"); + SOURCE_MAP.put("beichuan.ccoo.cn", "鍖楀窛鍦ㄧ嚎"); + SOURCE_MAP.put("beihai.ccoo.cn", "鍖楁捣鍦ㄧ嚎"); + SOURCE_MAP.put("beipiao.ccoo.cn", "鍖楃エ鍦ㄧ嚎"); + SOURCE_MAP.put("binxian.cc", "褰幙缃�"); + SOURCE_MAP.put("www.bh.ccoo.cn", "婊ㄦ捣鍦ㄧ嚎"); + SOURCE_MAP.put("bzonl.com", "婊ㄥ窞鍦ㄧ嚎"); + SOURCE_MAP.put("bobai.ccoo.cn", "鍗氱櫧鐢熸椿缃�"); + SOURCE_MAP.put("baisha.ccoo.cn", "鐧芥矙缃�"); + SOURCE_MAP.put("baiquan.ccoo.cn", "鎷滄硥鐢熸椿缃�"); + SOURCE_MAP.put("baotou.ccoo.cn", "鍖呭ご涔嬪0"); + SOURCE_MAP.put("baodi.ccoo.cn", "瀹濆澔鍦ㄧ嚎"); + SOURCE_MAP.put("baofeng365.com", "瀹濅赴鍦ㄧ嚎"); + SOURCE_MAP.put("bishan.ccoo.cn", "鐠у北鍦ㄧ嚎"); + SOURCE_MAP.put("bxzx.ccoo.cn", "瀹惧幙鍦ㄧ嚎"); + SOURCE_MAP.put("botou.ccoo.cn", "娉婂ご鍦ㄧ嚎"); + SOURCE_MAP.put("mizhai.com", "绫冲畢"); + SOURCE_MAP.put("mizhai.com", "绫冲畢"); + SOURCE_MAP.put("bx169.com", "鍗氬叴鍦ㄧ嚎"); + SOURCE_MAP.put("bx169.com", "鍗氬叴鍦ㄧ嚎"); + SOURCE_MAP.put("boye.ccoo.cn", "鍗氶噹鍦ㄧ嚎"); + SOURCE_MAP.put("gaobeidian.info", "楂樼搴楀湪绾�"); + SOURCE_MAP.put("biyang.ccoo.cn", "娉岄槼鍦ㄧ嚎"); + SOURCE_MAP.put("badong.ccoo.cn", "宸翠笢鐧惧缃�"); + SOURCE_MAP.put("blyq.ccoo.cn", "宸存灄鍙虫棗鍦ㄧ嚎"); + SOURCE_MAP.put("0730bl.ccoo.cn", "宸撮櫟鍦ㄧ嚎"); + SOURCE_MAP.put("as.ccoo.cn", "闉嶅北鍦ㄧ嚎"); + SOURCE_MAP.put("aqi.ccoo.cn", "闃挎棗淇℃伅缃�"); + SOURCE_MAP.put("anguo.ccoo.cn", "瀹夊浗鍦ㄧ嚎"); + SOURCE_MAP.put("anhua365.com", "瀹夊寲鍦ㄧ嚎"); + SOURCE_MAP.put("ankang.ccoo.cn", "瀹夊悍鍦ㄧ嚎"); + SOURCE_MAP.put("anlu.ccoo.cn", "瀹夐檰鍦ㄧ嚎"); + SOURCE_MAP.put("anxinol.cn", "瀹夋柊鍦ㄧ嚎"); + SOURCE_MAP.put("anyue.ccoo.cn", "瀹夊渤鍦ㄧ嚎"); + SOURCE_MAP.put("acheng.ccoo.cn", "闃垮煄缃�"); + SOURCE_MAP.put("qiaojia.ccoo.cn", "鐧介工婊╁湪绾�"); + SOURCE_MAP.put("fccs.com", "涓浗鎴夸骇瓒呭競缃�"); + SOURCE_MAP.put("qfang.com", "Q鎴跨綉"); + SOURCE_MAP.put("qfang.com", "Q鎴跨綉"); + SOURCE_MAP.put("fccs.com", "涓浗鎴夸骇瓒呭競缃�"); + SOURCE_MAP.put("fccs.com", "涓浗鎴夸骇瓒呭競缃�"); + SOURCE_MAP.put("86office.com", "86鍐欏瓧妤肩綉"); + SOURCE_MAP.put("86office.com", "86鍐欏瓧妤肩綉"); + SOURCE_MAP.put("028p.cn", "鎴愰兘鍐欏瓧妤肩綉"); + SOURCE_MAP.put("028p.cn", "鎴愰兘鍐欏瓧妤肩綉"); + SOURCE_MAP.put("028p.cn", "鎴愰兘鍐欏瓧妤肩綉"); + SOURCE_MAP.put("centanet.com", "涓師鍦颁骇"); + SOURCE_MAP.put("centanet.com", "涓師鍦颁骇"); + SOURCE_MAP.put("centanet.com", "涓師鍦颁骇"); + SOURCE_MAP.put("centanet.com", "涓師鍦颁骇"); + SOURCE_MAP.put("657200.cn", "闀囬泟涔嬬獥"); + SOURCE_MAP.put("cangxi.ccoo.cn", "鑻嶆邯鍦ㄧ嚎"); + SOURCE_MAP.put("cfd.ccoo.cn", "鏇瑰鐢稿煄甯傚湪绾�"); + SOURCE_MAP.put("changge.cc", "闀胯憶缃�"); + SOURCE_MAP.put("changning.me", "闀垮畞鍦ㄧ嚎"); + SOURCE_MAP.put("changwu.ccoo.cn", "闀挎缃�"); + SOURCE_MAP.put("changxing.ccoo.cn", "闀垮叴鍦ㄧ嚎"); + SOURCE_MAP.put("changyang.ccoo.cn", "闀块槼鍦ㄧ嚎"); + SOURCE_MAP.put("changyuan.ccoo.cn", "闀垮灒鍦ㄧ嚎"); + SOURCE_MAP.put("cdzx.ccoo.cn", "甯稿痉闂ㄦ埛缃�"); + SOURCE_MAP.put("chaohu.ccoo.cn", "宸㈡箹鍦ㄧ嚎"); + SOURCE_MAP.put("chaoyang.ccoo.cn", "鏈濋槼涔嬬獥"); + SOURCE_MAP.put("023ck.cn", "鍩庡彛鍦ㄧ嚎"); + SOURCE_MAP.put("715200.com", "婢勫煄鍦ㄧ嚎"); + SOURCE_MAP.put("0566.ccoo.cn", "姹犲窞鍩庡競鍦ㄧ嚎"); + SOURCE_MAP.put("chishui.ccoo.cn", "璧ゆ按鍦ㄧ嚎"); + SOURCE_MAP.put("360fdc.com", "涓埧缃�"); + SOURCE_MAP.put("ke.com", "璐濆3"); + SOURCE_MAP.put("ke.com", "璐濆3"); + SOURCE_MAP.put("czccoo.com", "宕囧窞鍦ㄧ嚎"); + SOURCE_MAP.put("cili.ccoo.cn", "鎱堝埄涔嬬獥"); + SOURCE_MAP.put("557400.cn", "浠庢睙鍦ㄧ嚎"); + SOURCE_MAP.put("caidian.ccoo.cn", "钄$敻鍦ㄧ嚎"); + SOURCE_MAP.put("sina.com.cn", "鏂版氮涔愬眳"); + SOURCE_MAP.put("sina.com.cn", "鏂版氮涔愬眳"); + SOURCE_MAP.put("lyfce.cn", "榫欐父鎴夸骇缃�"); + SOURCE_MAP.put("sina.com.cn", "鏂版氮涔愬眳"); + SOURCE_MAP.put("house365.com", "365鍦颁骇瀹跺眳缃�"); + SOURCE_MAP.put("house365.com", "365鍦颁骇瀹跺眳缃�"); + SOURCE_MAP.put("youfangw.com", "娓告埧缃�"); + SOURCE_MAP.put("luobei.ccoo.cn", "钀濆寳淇℃伅娓�"); + SOURCE_MAP.put("135100.cn", "涓浗杈夊崡缃�"); + SOURCE_MAP.put("sxcm.net", "涓囧窞鎴夸骇"); + SOURCE_MAP.put("sina.com.cn", "鏂版氮涔愬眳"); + SOURCE_MAP.put("dcw0550.com", "澶ф粊缃�"); + SOURCE_MAP.put("dg688.com", "澶ф腐鍦ㄧ嚎"); + SOURCE_MAP.put("dali.ccoo.cn", "澶ц崝涔嬬獥"); + SOURCE_MAP.put("daying.ccoo.cn", "澶ц嫳鍦ㄧ嚎"); + SOURCE_MAP.put("dazu.ccoo.cn", "澶ц冻鍦ㄧ嚎"); + SOURCE_MAP.put("danzhou8.com", "鍎嬪窞鍦ㄧ嚎"); + SOURCE_MAP.put("dangyang.ccoo.cn", "褰撻槼鍦ㄧ嚎"); + SOURCE_MAP.put("idszx.com", "鐮�灞卞湪绾�"); + SOURCE_MAP.put("ke.com", "璐濆3"); + SOURCE_MAP.put("dehui.ccoo.cn", "寰锋儬鍦ㄧ嚎"); + SOURCE_MAP.put("dexing.ccoo.cn", "寰峰叴鐢熸椿缃�"); + SOURCE_MAP.put("dengfeng.ccoo.cn", "鐧诲皝鍦ㄧ嚎"); + SOURCE_MAP.put("dengzhou.ccoo.cn", "閭撳窞鍦ㄧ嚎"); + SOURCE_MAP.put("djxxw.cn", "鍨睙淇℃伅缃�"); + SOURCE_MAP.put("jxdn.ccoo.cn", "瀹氬崡鍦ㄧ嚎"); + SOURCE_MAP.put("dunhuang.ccoo.cn", "鏁︾厡鐧炬檽闃�"); + SOURCE_MAP.put("dx.ccoo.cn", "瀹氳タ鍦ㄧ嚎"); + SOURCE_MAP.put("dingzhou.ccoo.cn", "瀹氬窞鍦ㄧ嚎"); + SOURCE_MAP.put("dongming.ccoo.cn", "涓滄槑鍦ㄧ嚎"); + SOURCE_MAP.put("haopoo.com", "濂介摵缃�"); + SOURCE_MAP.put("kuyiso.com", "閰锋槗鎼�"); + SOURCE_MAP.put("xuanzhi371.com", "涓師閫夊潃缃�"); + SOURCE_MAP.put("xuanzhi371.com", "涓師閫夊潃缃�"); + SOURCE_MAP.put("xuanzhi371.com", "涓師閫夊潃缃�"); + SOURCE_MAP.put("xuanzhi371.com", "涓師閫夊潃缃�"); + SOURCE_MAP.put("01fy.cn", "绗竴鏃堕棿"); + SOURCE_MAP.put("spc365.com", "閲戝北鎴夸骇"); + SOURCE_MAP.put("spc365.com", "閲戝北鎴夸骇"); + SOURCE_MAP.put("spc365.com", "閲戝北鎴夸骇"); + SOURCE_MAP.put("spc365.com", "閲戝北鎴夸骇"); + SOURCE_MAP.put("myliving.cn", "绉熷敭鎯呮姤缃�"); + SOURCE_MAP.put("landwg.com", "涓囪喘鍦颁骇缃�"); + SOURCE_MAP.put("landwg.com", "涓囪喘鍦颁骇缃�"); + SOURCE_MAP.put("zj.ccoo.cn", "闀囨睙缃�"); + SOURCE_MAP.put("0515.ccoo.cn", "涓滃彴缃�"); + SOURCE_MAP.put("dxh.ccoo.cn", "涓滆タ婀栧湪绾�"); + SOURCE_MAP.put("dongxiang.ccoo.cn", "涓滀埂涔嬬獥"); + SOURCE_MAP.put("duan.ccoo.cn", "閮藉畨鍦ㄧ嚎"); + SOURCE_MAP.put("duyun.ccoo.cn", "閮藉寑鐢熸椿缃�"); + SOURCE_MAP.put("woaipu.com", "鎴戠埍閾虹綉"); + SOURCE_MAP.put("woaipu.com", "鎴戠埍閾虹綉"); + SOURCE_MAP.put("dayangfangchan.com", "澶ф磱鍦颁骇"); + SOURCE_MAP.put("dayangfangchan.com", "澶ф磱鍦颁骇"); + SOURCE_MAP.put("kongjianjia.com", "绌洪棿瀹�"); + SOURCE_MAP.put("kan3721.com", "鏉窞鐪嬫埧缃�"); + SOURCE_MAP.put("kongjianjia.com", "绌洪棿瀹�"); + SOURCE_MAP.put("zhengez.com", "姝绉�"); + SOURCE_MAP.put("zhengez.com", "姝绉�"); + SOURCE_MAP.put("kuaizuyi.com", "蹇"); + SOURCE_MAP.put("zhenfeng.ccoo.cn", "璐炰赴鍦ㄧ嚎"); + SOURCE_MAP.put("aqlife.com", "瀹夊簡E缃戠敓娲�"); + SOURCE_MAP.put("xiongqi.net", "宸翠腑鎴夸骇缃�"); + SOURCE_MAP.put("xiongqi.net", "宸翠腑鎴夸骇缃�"); + SOURCE_MAP.put("qd8.com", "璧风偣8"); + SOURCE_MAP.put("07358.com", "閮存埧缃�"); + SOURCE_MAP.put("laoke.com", "鑰佸"); + SOURCE_MAP.put("eaw.cc", "浜胯壘缃�"); + SOURCE_MAP.put("eaw.cc", "浜胯壘缃�"); + SOURCE_MAP.put("eaw.cc", "浜胯壘缃�"); + SOURCE_MAP.put("eaw.cc", "浜胯壘缃�"); + SOURCE_MAP.put("fangyi.com", "鎴夸竴缃�"); + SOURCE_MAP.put("fangyi.com", "鎴夸竴缃�"); + SOURCE_MAP.put("house.mllj.net", "搴愭睙鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("jinti.com", "浠婇缃�"); + SOURCE_MAP.put("0817.net", "鍗楁埧缃�"); + SOURCE_MAP.put("0817.net", "鍗楁埧缃�"); + SOURCE_MAP.put("oupye.net", "鍟嗕笟鍦颁骇"); + SOURCE_MAP.put("etk.ccoo.cn", "閯傛墭鍏嬫棗鍦ㄧ嚎"); + SOURCE_MAP.put("duerbote.ccoo.cn", "鏉滃皵浼壒鍦ㄧ嚎"); + SOURCE_MAP.put("dqccc.com", "鍦扮悆鍩�"); + SOURCE_MAP.put("feicheng.ccoo.cn", "鑲ュ煄鍦ㄧ嚎"); + SOURCE_MAP.put("fczx.ccoo.cn", "涓板煄鍦ㄧ嚎"); + SOURCE_MAP.put("fengdu.ccoo.cn", "涓伴兘缃�"); + SOURCE_MAP.put("fnzx.ccoo.cn", "涓板崡鍦ㄧ嚎"); + SOURCE_MAP.put("dqccc.com", "鍦扮悆鍩�"); + SOURCE_MAP.put("dqccc.com", "鍦扮悆鍩�"); + SOURCE_MAP.put("dqccc.com", "鍦扮悆鍩�"); + SOURCE_MAP.put("edeng.cn", "鏄撶櫥缃�"); + SOURCE_MAP.put("oupye.net", "鍟嗕笟鍦颁骇"); + SOURCE_MAP.put("ezzxw.com", "閯傚窞鍦ㄧ嚎"); + SOURCE_MAP.put("feixian.cc", "璐瑰幙鍦ㄧ嚎"); + SOURCE_MAP.put("feixian.cc", "璐瑰幙鍦ㄧ嚎"); + SOURCE_MAP.put("feicheng.ccoo.cn", "鑲ュ煄鍦ㄧ嚎"); + SOURCE_MAP.put("enping.ccoo.cn", "鎭╁钩涔嬬獥"); + SOURCE_MAP.put("fx122.com", "鑼冨幙鍦ㄧ嚎"); + SOURCE_MAP.put("fcpzh.com", "鏀�鏋濊姳鎴夸骇缃�"); + SOURCE_MAP.put("028f.com", "鎴愭埧缃�"); + SOURCE_MAP.put("88tie.com", "88鍚屽煄"); + SOURCE_MAP.put("88tie.com", "88鍚屽煄"); + SOURCE_MAP.put("88tie.com", "88鍚屽煄"); + SOURCE_MAP.put("ljfw.com.cn", "涓芥睙鎴跨綉"); + SOURCE_MAP.put("51tie.com", "51鍚屽煄"); + SOURCE_MAP.put("luanren.com", "鍏畨浜�"); + SOURCE_MAP.put("51tie.com", "51鍚屽煄"); + SOURCE_MAP.put("soufy.cn", "鎼滄埧婧�"); + SOURCE_MAP.put("soufy.cn", "鎼滄埧婧�"); + SOURCE_MAP.put("soufy.cn", "鎼滄埧婧�"); + SOURCE_MAP.put("soufy.cn", "鎼滄埧婧�"); + SOURCE_MAP.put("gzfg.ccoo.cn", "鍑ゅ唸淇℃伅缃�"); + SOURCE_MAP.put("0917888.com", "鍑ょ繑鍦ㄧ嚎"); + SOURCE_MAP.put("fengjie.ccoo.cn", "濂夎妭鍦ㄧ嚎"); + SOURCE_MAP.put("fusui.ccoo.cn", "鎵剁互鍦ㄧ嚎"); + SOURCE_MAP.put("fl.ccoo.cn", "娑櫟鍩庡競鍦ㄧ嚎"); + SOURCE_MAP.put("fzccoo.com", "绂忓窞鍦ㄧ嚎"); + SOURCE_MAP.put("719400.com", "搴滆胺鍦ㄧ嚎"); + SOURCE_MAP.put("0561life.com", "娣寳鐢熸椿缃�"); + SOURCE_MAP.put("chuanbei.net", "骞垮厓鎴夸骇缃�"); + SOURCE_MAP.put("chuanbei.net", "骞垮厓鎴夸骇缃�"); + SOURCE_MAP.put("fucheng.ccoo.cn", "闃滃煄鐑嚎"); + SOURCE_MAP.put("funanzx.com", "闃滃崡鍦ㄧ嚎"); + SOURCE_MAP.put("168hs.com", "榛勫北甯傛皯缃�"); + SOURCE_MAP.put("0831home.com", "涓夋睙鎴夸骇缃�"); + SOURCE_MAP.put("fuxin1.com", "闃滄柊鍦ㄧ嚎"); + SOURCE_MAP.put("0831home.com", "涓夋睙鎴夸骇缃�"); + SOURCE_MAP.put("0913ss.com", "瀵屽钩鍦ㄧ嚎"); + SOURCE_MAP.put("0813fs.com", "瀵岄『鍦ㄧ嚎"); + SOURCE_MAP.put("leju.com", "涔愬眳浜屾墜鎴�"); + SOURCE_MAP.put("5sw.com", "浜旀槦缃�"); + SOURCE_MAP.put("5acbd.com", "5A鍟嗙敤鍦颁骇"); + SOURCE_MAP.put("5acbd.com", "5A鍟嗙敤鍦颁骇"); + SOURCE_MAP.put("focus.cn", "鎼滅嫄鐒︾偣"); + SOURCE_MAP.put("0454.com", "浣虫湪鏂笁姹熺綉"); + SOURCE_MAP.put("leju.com", "涔愬眳浜屾墜鎴�"); + SOURCE_MAP.put("leju.com", "涔愬眳浜屾墜鎴�"); + SOURCE_MAP.put("focus.cn", "鎼滅嫄鐒︾偣"); + SOURCE_MAP.put("h0758.net", "鑲囨埧缃�"); + SOURCE_MAP.put("zbinfo.net", "娣勫崥淇℃伅娓�"); + SOURCE_MAP.put("zbinfo.net", "娣勫崥淇℃伅娓�"); + SOURCE_MAP.put("zmd100.com", "椹婚┈搴�100缃�"); + SOURCE_MAP.put("zmd100.com", "椹婚┈搴�100缃�"); + SOURCE_MAP.put("gz.ccoo.cn", "璧e窞鍦ㄧ嚎"); + SOURCE_MAP.put("gaoan.ccoo.cn", "楂樺畨鍦ㄧ嚎"); + SOURCE_MAP.put("gaoqing.ccoo.cn", "楂橀潚缃�"); + SOURCE_MAP.put("saofang.cn", "鎵埧缃�"); + SOURCE_MAP.put("saofang.cn", "鎵埧缃�"); + SOURCE_MAP.put("saofang.cn", "鎵埧缃�"); + SOURCE_MAP.put("saofang.cn", "鎵埧缃�"); + SOURCE_MAP.put("cdzfw.com", "鎴愰兘绉熸埧缃�"); + SOURCE_MAP.put("cdzfw.com", "鎴愰兘绉熸埧缃�"); + SOURCE_MAP.put("5008.net.cn", "绉熸埧鍦ㄧ嚎"); + SOURCE_MAP.put("5008.net.cn", "绉熸埧鍦ㄧ嚎"); + SOURCE_MAP.put("qd8.com", "璧风偣8"); + SOURCE_MAP.put("qd8.com", "璧风偣8"); + SOURCE_MAP.put("qd8.com", "璧风偣8"); + SOURCE_MAP.put("qd8.com", "璧风偣8"); + SOURCE_MAP.put("gaotang.org", "楂樺攼鍦ㄧ嚎"); + SOURCE_MAP.put("my0832.com", "璧勯槼澶т紬缃�"); + SOURCE_MAP.put("my0832.com", "璧勯槼澶т紬缃�"); + SOURCE_MAP.put("gaoyang.ccoo.cn", "楂橀槼淇℃伅缃�"); + SOURCE_MAP.put("gaoyizaixian.com", "楂橀倯鍦ㄧ嚎"); + SOURCE_MAP.put("zh51home.com", "鐝犳捣鎴夸骇涔嬬獥"); + SOURCE_MAP.put("gaozhou.ccoo.cn", "楂樺窞鍦ㄧ嚎"); + SOURCE_MAP.put("gcok.cn", "钘佸煄鍦ㄧ嚎"); + SOURCE_MAP.put("hlgnet.com", "鍥為緳瑙傜綉"); + SOURCE_MAP.put("09office.com", "閿﹀績鍔炲叕妤肩綉"); + SOURCE_MAP.put("cnyw.net", "鐑埧缃�"); + SOURCE_MAP.put("fangdushi.com", "鎴块兘甯�"); + SOURCE_MAP.put("anjuke.com", "瀹夊眳瀹�"); + SOURCE_MAP.put("gongyi.ccoo.cn", "宸╀箟鍦ㄧ嚎"); + SOURCE_MAP.put("gongxian.ccoo.cn", "鐝欏幙缃�"); + SOURCE_MAP.put("gulinw.com", "鍙よ敽鍦ㄧ嚎"); + SOURCE_MAP.put("guan.ccoo.cn", "鍥哄畨鍦ㄧ嚎"); + SOURCE_MAP.put("gushi.ccoo.cn", "鍥哄鍦ㄧ嚎"); + SOURCE_MAP.put("guzhen.ccoo.cn", "鍥洪晣鍦ㄧ嚎"); + SOURCE_MAP.put("guazhou114.com", "鐡滃窞鍩庡競鍦ㄧ嚎"); + SOURCE_MAP.put("guanyun.ccoo.cn", "鐏屼簯鍦ㄧ嚎"); + SOURCE_MAP.put("guangshan.ccoo.cn", "鍏夊北鍦ㄧ嚎"); + SOURCE_MAP.put("xmhouse.com", "鍘﹂棬鎴垮湴浜ц仈鍚堢綉"); + SOURCE_MAP.put(".rexian.net.cn", "姝︽眽鐑嚎鎴夸骇缃�"); + SOURCE_MAP.put("rexian.net.cn", "姝︽眽鐑嚎鎴夸骇缃�"); + SOURCE_MAP.put("grfy.net", "涓汉鎴挎簮缃�"); + SOURCE_MAP.put("01fy.cn", "绗�1鏃堕棿鎴挎簮缃�"); + SOURCE_MAP.put("360fdc.com", "涓埧缃�"); + SOURCE_MAP.put("917.com", "917鎴夸骇缃�"); + SOURCE_MAP.put("917.com", "917鎴夸骇缃�"); + SOURCE_MAP.put("0577home.net", "娓╂埧缃�"); + SOURCE_MAP.put("cbdzl.com", "鍖椾含鍐欏瓧妤肩綉"); + SOURCE_MAP.put("0577home", "娓╂埧缃�"); + SOURCE_MAP.put("ucnpark.com", "鏈夐檺鍏洯"); + SOURCE_MAP.put("ucnpark.com", "鏈夐檺鍏洯"); + SOURCE_MAP.put("yewn.cn", "鑽h��娓崡缃�"); + SOURCE_MAP.put("officefinder.com", "鍖椾含鍟嗗姟鍦颁骇缃�"); + SOURCE_MAP.put("officefinder.com", "鍖椾含鍟嗗姟鍦颁骇缃�"); + SOURCE_MAP.put("wuzhousky.com", "姊у窞鏃剁┖缃�"); + SOURCE_MAP.put("jiayihouse.com", "鐢蹭箼鎴跨綉"); + SOURCE_MAP.put("wuzhousky.com", "姊у窞鏃剁┖缃�"); + SOURCE_MAP.put("wuzhousky.com", "姊у窞鏃剁┖缃�"); + SOURCE_MAP.put("longcity.net", "浣忓湪榫欏煄"); + SOURCE_MAP.put("xuanhaozhi.com", "閫夊ソ鍧�"); + SOURCE_MAP.put("xuanhaozhi.com", "閫夊ソ鍧�"); + SOURCE_MAP.put("tzinfo.net", "鍙板窞鎴夸骇涓荤綉"); + SOURCE_MAP.put("beijingxiezilou.cn", "鍖椾含鍐欏瓧妤间俊鎭綉"); + SOURCE_MAP.put("bj-officerent.com", "鍖椾含鍐欏瓧妤间俊鎭ぇ鍏ㄧ綉"); + SOURCE_MAP.put("bj-officerent.com", "鍖椾含鍐欏瓧妤间俊鎭ぇ鍏ㄧ綉"); + SOURCE_MAP.put("u88soufang.cn", "u88鎼滄埧"); + SOURCE_MAP.put("917.com", "917鎴夸骇缃�"); + SOURCE_MAP.put("917.com", "917鎴夸骇缃�"); + SOURCE_MAP.put("917.com", "917鎴夸骇缃�"); + SOURCE_MAP.put("gaxxg.net", "骞垮畨淇℃伅娓�"); + SOURCE_MAP.put("51xzl.com", "澶╂触鍐欏瓧妤肩綉"); + SOURCE_MAP.put("51xzl.com", "澶╂触鍐欏瓧妤肩綉"); + SOURCE_MAP.put("gh.ccoo.cn", "骞挎眽鍩庡競鍦ㄧ嚎"); + SOURCE_MAP.put("022cbd.com", "澶╂触鍐欏瓧妤煎晢涓氬湴浜х綉"); + SOURCE_MAP.put("022cbd.com", "澶╂触鍐欏瓧妤煎晢涓氬湴浜х綉"); + SOURCE_MAP.put("022cbd.com", "澶╂触鍐欏瓧妤煎晢涓氬湴浜х綉"); + SOURCE_MAP.put("022cbd.com", "澶╂触鍐欏瓧妤煎晢涓氬湴浜х綉"); + SOURCE_MAP.put("guanghe.ccoo.cn", "骞挎渤鍦ㄧ嚎"); + SOURCE_MAP.put("tjxiezilou.com", "澶╂触鍐欏瓧妤间俊鎭綉"); + SOURCE_MAP.put("grxxw.com", "骞块ザ淇℃伅缃�"); + SOURCE_MAP.put("guangyuan.ccoo.cn", "骞垮厓閮藉競缃�"); + SOURCE_MAP.put("ccoo.cn", "鍩庡競涓浗"); + SOURCE_MAP.put("022zs.com", "澶╂触鍐欏瓧妤�"); + SOURCE_MAP.put("guiding.ccoo.cn", "璐靛畾鍦ㄧ嚎"); + SOURCE_MAP.put("022zs.com", "澶╂触鍐欏瓧妤�"); + SOURCE_MAP.put("ccoo.cn", "鍩庡競涓浗"); + SOURCE_MAP.put("100jiaju.com", "鍗椾含鐧惧灞呯鎴跨綉"); + SOURCE_MAP.put("100jiaju.com", "鍗椾含鐧惧灞呯鎴跨綉"); + SOURCE_MAP.put("gy.ccoo.cn", "璐甸槼鍩庡競缃�"); + SOURCE_MAP.put("edianban.com", "e鐐瑰姙"); + SOURCE_MAP.put("liebiao.com", "鍒楄〃缃�"); + SOURCE_MAP.put("025002.com", "鍗椾含鍦ㄧ嚎"); + SOURCE_MAP.put("guiyang.ccoo.cn", "妗傞槼缃�"); + SOURCE_MAP.put("edeng.cn", "鏄撶櫥缃�"); + SOURCE_MAP.put("gy233600.cn", "娑¢槼鍦ㄧ嚎"); + SOURCE_MAP.put("025002.com", "鍗椾含鍦ㄧ嚎"); + SOURCE_MAP.put("025002.com", "鍗椾含鍦ㄧ嚎"); + SOURCE_MAP.put("025002.com", "鍗椾含鍦ㄧ嚎"); + SOURCE_MAP.put("flosir.com", "妤煎厛鐢�"); + SOURCE_MAP.put("flosir.com", "妤煎厛鐢�"); + SOURCE_MAP.put("haerbin.ccoo.cn", "鍝堝皵婊ㄥ湪绾�"); + SOURCE_MAP.put("o571.com", "鏉窞鍐欏瓧妤肩綉"); + SOURCE_MAP.put("tlxxw.com", "閫氳窘淇℃伅娓�"); + SOURCE_MAP.put("kan3721.com", "鏉窞鐪嬫埧缃�"); + SOURCE_MAP.put("kan3721.com", "鏉窞鐪嬫埧缃�"); + SOURCE_MAP.put("5axzl.com", "5A鍟嗙敤鍦颁骇缃�"); + SOURCE_MAP.put("5axzl.com", "5A鍟嗙敤鍦颁骇缃�"); + SOURCE_MAP.put("5axzl.com", "5A鍟嗙敤鍦颁骇缃�"); + SOURCE_MAP.put("7haikou.com", "娴峰彛鍦ㄧ嚎"); + SOURCE_MAP.put("ningbo-office.com", "瀹佹尝鍐欏瓧妤肩綉"); + SOURCE_MAP.put("hancheng.ccoo.cn", "闊╁煄涔嬬獥"); + SOURCE_MAP.put("hcw.so", "姹夊窛缃�"); + SOURCE_MAP.put("nthouse.com.cn", "鍗楅�氭埧浜ц秴甯�"); + SOURCE_MAP.put("hcw.so", "姹夊窛缃�"); + SOURCE_MAP.put("nthouse.com.cn", "鍗楅�氭埧浜ц秴甯�"); + SOURCE_MAP.put(".jd.com", "浜笢鎷嶅崠"); + SOURCE_MAP.put("chineseoffice.com", "涓浗鍐欏瓧妤�"); + SOURCE_MAP.put("nb-fang.com", "浜轰汉鍔炲叕缃�"); + SOURCE_MAP.put("jiapai.net.cn", "鍢夋媿鎷嶅崠"); + SOURCE_MAP.put("gpai.net", "鍏媿缃�"); + SOURCE_MAP.put("whxiezilou.com", "姝︽眽鍐欏瓧妤肩綉"); + SOURCE_MAP.put("tjspw.cn", "澶╂触鍘傛埧鍟嗛摵缃�"); + SOURCE_MAP.put("amoyoffice.com", "鍘﹂棬鍐欏瓧妤肩綉"); + SOURCE_MAP.put("198office.com", "198鍔炲叕妤肩綉"); + SOURCE_MAP.put("officeing.com", "蹇悳缃�"); + SOURCE_MAP.put("001ce.com", "绗竴鍟嗕笟鍦颁骇缃�"); + SOURCE_MAP.put("97hami.com", "涔濇棗缃�"); + SOURCE_MAP.put("lcxwfc.com", "鑱婂煄鎴跨綉"); + SOURCE_MAP.put("ilinyi.net", "鐖变复娌�"); + SOURCE_MAP.put("goufon.com", "涓存矀璐埧缃�"); + SOURCE_MAP.put("0539zf.com", "涓存矀鎵炬埧缃�"); + SOURCE_MAP.put("lpwww.com", "妤肩洏鍦ㄧ嚎"); + SOURCE_MAP.put("linyiren.com", "涓存矀浜烘埧浜х綉"); + SOURCE_MAP.put("ly169.cn", "涓存矀淇℃伅娓�"); + SOURCE_MAP.put("zhufon.com", "涓存矀浣忔埧缃�"); + SOURCE_MAP.put("lywww.com", "涓存矀鍦ㄧ嚎鎴夸骇缃�"); + SOURCE_MAP.put("jiazhuly.com", "閲戞埧缃�"); + SOURCE_MAP.put("lyzhujia.com", "涓存矀浣忓缃�"); + SOURCE_MAP.put("726000.net", "鍟嗘礇鎴夸骇缃�"); + SOURCE_MAP.put("0355fdc.com", "0355鎴夸骇缃�"); + SOURCE_MAP.put("sqloushi.com", "鍟嗕笜妤煎競"); + SOURCE_MAP.put("smxhaofang.com", "涓夐棬宄″ソ鎴跨綉"); + SOURCE_MAP.put("smxloushi.com", "涓夐棬宄℃ゼ甯�"); + SOURCE_MAP.put("0933f.com", "骞冲噳鎴夸骇缃�"); + SOURCE_MAP.put("xnfw.com", "鍜稿畞鎴跨綉"); + SOURCE_MAP.put("0715fc.com", "鍜稿畞鎴夸骇缃�"); + SOURCE_MAP.put("0716fw.com", "鑽嗘埧缃�"); + SOURCE_MAP.put("jz6.cc", "鑽嗗窞绗竴鎴夸骇缃�"); + SOURCE_MAP.put("0738ld.com", "濞勫簳鎴跨綉"); + SOURCE_MAP.put("0738fdc.com", "濞勫簳鎴夸骇缃�"); + SOURCE_MAP.put("ldfdcw.com", "濞勬埧缃�"); + SOURCE_MAP.put("lcfcw.com", "鑱婂煄鎴夸骇缃�"); + SOURCE_MAP.put("fdc99.com", "姘稿窞鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("0597kk.com", "榫欏博KK缃�"); + SOURCE_MAP.put("0597ok.com", "榫欏博鎴垮湴浜ц仈鍚堢綉"); + SOURCE_MAP.put("luohejie.com", "婕渤琛�"); + SOURCE_MAP.put("fdc0746.com", "0746妤煎競缃�"); + SOURCE_MAP.put("0395mf.com", "婕渤涔版埧缃�"); + SOURCE_MAP.put("lhfdc.com", "婕渤鎴夸骇缃�"); + SOURCE_MAP.put("0395.tv", "婕埧缃�"); + SOURCE_MAP.put("lhloushi.com", "婕渤妤煎競"); + SOURCE_MAP.put("0377fw.com", "鍗楅槼鎴夸骇缃�"); + SOURCE_MAP.put("0826fang.com", "骞垮畨鎴夸骇缃�"); + SOURCE_MAP.put("nyfang.cn", "鍗楅槼鎴垮湴浜�"); + SOURCE_MAP.put("nyloushi.com", "鍗楅槼妤煎競"); + SOURCE_MAP.put("xnjhome.com", "鏂板唴姹熸埧浜х綉"); + SOURCE_MAP.put("njxinf.com", "鍐呮睙鏂版埧浜х綉"); + SOURCE_MAP.put("fc0832.com", "鍐呮睙鎴夸骇"); + SOURCE_MAP.put("qinzf.com", "閽﹀窞浣忔埧缃�"); + SOURCE_MAP.put("qzfcw.com", "閽﹀窞鎴夸骇缃�"); + SOURCE_MAP.put("tl8.com.cn", "閾佸箔鎴夸骇缃�"); + SOURCE_MAP.put("dzcnc.com", "椴佸寳鎴夸骇"); + SOURCE_MAP.put("hanshou.ccoo.cn", "姹夊鍦ㄧ嚎"); + SOURCE_MAP.put("hanzhong123.com", "姹変腑鍦ㄧ嚎"); + SOURCE_MAP.put("srtong.com", "涓婇ザ閫氭埧浜х綉"); + SOURCE_MAP.put("0719house.com", "杞﹀煄鎴夸骇缃�"); + SOURCE_MAP.put("qingdaofdc.com", "闈掑矝鎴跨綉"); + SOURCE_MAP.put("0595qz.com", "娉夊窞鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("0595qz.com", "娉夊窞鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("0595qz.com", "娉夊窞鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("595qz.com", "娉夊窞鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("rmfysszc.gov.cn", "浜烘皯娉曢櫌璇夎璧勪骇缃�"); + SOURCE_MAP.put("oncity.cc", "涓北鍚屽煄淇℃伅缃�"); + SOURCE_MAP.put("v007.net", "瑗挎睙鏄庣彔鎴夸骇缃�"); + SOURCE_MAP.put("5axzl.com", "5A鍟嗙敤鍦颁骇缃�"); + SOURCE_MAP.put("0757fc.com", "浣涘北鎴夸骇璧勮缃�"); + SOURCE_MAP.put("sd888.org", "椤哄痉妤煎競"); + SOURCE_MAP.put("0561life.com", "娣寳鐢熸椿缃�"); + SOURCE_MAP.put("hhk365.com", "榛勬渤鍙d俊鎭腐"); + SOURCE_MAP.put("sojixun.com", "鎼滃嵆璁�"); + SOURCE_MAP.put("z-lou.com", "绉熸ゼ缃�"); + SOURCE_MAP.put("fzbm.com", "绂忓窞渚挎皯缃�"); + SOURCE_MAP.put("qth8.com", "涓冨彴娌充俊鎭綉"); + SOURCE_MAP.put("qth8.com", "涓冨彴娌充俊鎭綉"); + SOURCE_MAP.put("ntxx.net", "鍗楅�氱儹绾�"); + SOURCE_MAP.put("fahaola.com", "鍙戝ソ鍟�"); + SOURCE_MAP.put("sanxia.net", "涓夊场鐑嚎"); SOURCE_MAP.put("91office.com", "91office"); - SOURCE_MAP.put("xzxx.com", "苏北信息港"); - SOURCE_MAP.put("dankegongyu.com", "蛋壳公寓"); - SOURCE_MAP.put("917.com", "917房产网"); - SOURCE_MAP.put("zhenfangyuan.com", "真房源"); - SOURCE_MAP.put("woaipu.com", "我爱铺网"); - SOURCE_MAP.put("kongjianjia.com", "空间家"); - SOURCE_MAP.put("zhujianpt.com", "中国住建网"); - SOURCE_MAP.put("linfangwang.com", "临房网"); - SOURCE_MAP.put("ganchang.cn", "赶场网"); - SOURCE_MAP.put("5a5f.com", "租房者网站"); - SOURCE_MAP.put("hualongxiang.com", "化龙巷"); - SOURCE_MAP.put("yzoffice.cc", "北京亦庄写字楼网"); - SOURCE_MAP.put("hotfcw.com", "热点房产网"); - SOURCE_MAP.put("qilinf.com", "麒麟房产"); - SOURCE_MAP.put("ptfcxx.com", "平潭房产网cxx"); - SOURCE_MAP.put("officefinder.com.cn", "北京商务地产网"); - SOURCE_MAP.put("qd8.com.cn", "快点8"); - SOURCE_MAP.put("qth.ccoo.cn", "七台河网"); - SOURCE_MAP.put("0317.so", "沧搜网"); - SOURCE_MAP.put("taian.com", "泰安网房产"); - SOURCE_MAP.put("home0538.com", "泰安房地产网"); - SOURCE_MAP.put("xibuwu.com", "西部屋"); - SOURCE_MAP.put("ohqly.com", "千里眼"); - SOURCE_MAP.put("trfcw.com", "铜仁房产网"); - SOURCE_MAP.put("ok0563.com", "宣城房产交易网"); - SOURCE_MAP.put("fdc.cn", "漳州房地产"); - SOURCE_MAP.put("aofenglu.com", "宣城房产网"); - SOURCE_MAP.put("gxfdcw.com", "赣西房地产网"); + SOURCE_MAP.put("xzxx.com", "鑻忓寳淇℃伅娓�"); + SOURCE_MAP.put("dankegongyu.com", "铔嬪3鍏瘬"); + SOURCE_MAP.put("917.com", "917鎴夸骇缃�"); + SOURCE_MAP.put("zhenfangyuan.com", "鐪熸埧婧�"); + SOURCE_MAP.put("woaipu.com", "鎴戠埍閾虹綉"); + SOURCE_MAP.put("kongjianjia.com", "绌洪棿瀹�"); + SOURCE_MAP.put("zhujianpt.com", "涓浗浣忓缓缃�"); + SOURCE_MAP.put("linfangwang.com", "涓存埧缃�"); + SOURCE_MAP.put("ganchang.cn", "璧跺満缃�"); + SOURCE_MAP.put("5a5f.com", "绉熸埧鑰呯綉绔�"); + SOURCE_MAP.put("hualongxiang.com", "鍖栭緳宸�"); + SOURCE_MAP.put("yzoffice.cc", "鍖椾含浜﹀簞鍐欏瓧妤肩綉"); + SOURCE_MAP.put("hotfcw.com", "鐑偣鎴夸骇缃�"); + SOURCE_MAP.put("qilinf.com", "楹掗簾鎴夸骇"); + SOURCE_MAP.put("ptfcxx.com", "骞虫江鎴夸骇缃慶xx"); + SOURCE_MAP.put("officefinder.com.cn", "鍖椾含鍟嗗姟鍦颁骇缃�"); + SOURCE_MAP.put("qd8.com.cn", "蹇偣8"); + SOURCE_MAP.put("qth.ccoo.cn", "涓冨彴娌崇綉"); + SOURCE_MAP.put("0317.so", "娌ф悳缃�"); + SOURCE_MAP.put("taian.com", "娉板畨缃戞埧浜�"); + SOURCE_MAP.put("home0538.com", "娉板畨鎴垮湴浜х綉"); + SOURCE_MAP.put("xibuwu.com", "瑗块儴灞�"); + SOURCE_MAP.put("ohqly.com", "鍗冮噷鐪�"); + SOURCE_MAP.put("trfcw.com", "閾滀粊鎴夸骇缃�"); + SOURCE_MAP.put("ok0563.com", "瀹e煄鎴夸骇浜ゆ槗缃�"); + SOURCE_MAP.put("fdc.cn", "婕冲窞鎴垮湴浜�"); + SOURCE_MAP.put("aofenglu.com", "瀹e煄鎴夸骇缃�"); + SOURCE_MAP.put("gxfdcw.com", "璧hタ鎴垮湴浜х綉"); SOURCE_MAP.put("house0562.com", "house0562"); - SOURCE_MAP.put("xyanjia.com", "新余房产网"); - SOURCE_MAP.put("hzfc.cc", "菏房网"); - SOURCE_MAP.put("jhanju.com", "江淮安居网"); - SOURCE_MAP.put("hncyfc.com", "淮南朝阳房产"); - SOURCE_MAP.put("hgfc.cc", "黄冈房产网"); - SOURCE_MAP.put("0701fc.com", "鹰潭房产网0701fc"); - SOURCE_MAP.put("juranhouse.com", "张掖房地产网"); - SOURCE_MAP.put("0701.com", "鹰潭房产网"); - SOURCE_MAP.put("dzwww.com", "大众网"); - SOURCE_MAP.put("jnfcw.com.cn", "济房网jnfcw"); - SOURCE_MAP.put("fangguagua.com", "房呱呱"); - SOURCE_MAP.put("f537.com", "济宁房房网"); - SOURCE_MAP.put("tcfcw.net", "铜川房产网"); - SOURCE_MAP.put("hbloushi.com", "鹤壁楼市"); - SOURCE_MAP.put("ccoo.cn", "城市中国网"); - SOURCE_MAP.put("jhhouse.com.cn", "江淮房地产网"); - SOURCE_MAP.put("11353.net", "中国百姓网"); - SOURCE_MAP.put("zmdfdc.com", "驻马店房地产信息网"); - SOURCE_MAP.put("0318ol.com", "衡水在线"); - SOURCE_MAP.put("053000.com", "衡水房产网"); - SOURCE_MAP.put("yinuo1000.com", "一诺房产网"); - SOURCE_MAP.put("xhengshui.com", "衡水易房网"); - SOURCE_MAP.put("dyfc.cn", "德阳房地产网"); - SOURCE_MAP.put("ehuludao.com", "葫芦岛在线"); - SOURCE_MAP.put("yq918.com", "阳泉家园网"); - SOURCE_MAP.put("hldhouse.com", "葫芦岛房地产网"); - SOURCE_MAP.put("hccun.com", "河池生活网"); - SOURCE_MAP.put("0470a.com", "呼伦贝尔火网"); - SOURCE_MAP.put("0470fcw.com", "呼伦贝尔房产网"); - SOURCE_MAP.put("songyuanfang.com", "松原购房网"); - SOURCE_MAP.put("gxbs.net", "百色市房产信息网"); - SOURCE_MAP.put("ezfcw.cn", "鄂州房产网"); - SOURCE_MAP.put("gxwuzhou.com", "鸳江生活网"); - SOURCE_MAP.put("dzloupan.cn", "达州楼盘网"); - SOURCE_MAP.put("0736home", "常德市房地产信息网"); - SOURCE_MAP.put("365kl.net", "快乐房产"); - SOURCE_MAP.put("0917fdc.com", "宝鸡房产网"); - SOURCE_MAP.put("zufang.com", "租房网"); - SOURCE_MAP.put("0827fc.com", "巴中房产网"); - SOURCE_MAP.put("gy-fdc.com", "广元房管处"); - SOURCE_MAP.put("hzfgj.com", "菏泽房管局"); - SOURCE_MAP.put("http://bsfw.cn/", "保山房网"); - SOURCE_MAP.put("0475fang.com", "通辽房地产网"); - SOURCE_MAP.put("ptdfc.com", "平潭房产网"); - SOURCE_MAP.put("haidong360.com", "海东房地产信息网"); - SOURCE_MAP.put("c0798.com", "景德镇买房网"); + SOURCE_MAP.put("xyanjia.com", "鏂颁綑鎴夸骇缃�"); + SOURCE_MAP.put("hzfc.cc", "鑿忔埧缃�"); + SOURCE_MAP.put("jhanju.com", "姹熸樊瀹夊眳缃�"); + SOURCE_MAP.put("hncyfc.com", "娣崡鏈濋槼鎴夸骇"); + SOURCE_MAP.put("hgfc.cc", "榛勫唸鎴夸骇缃�"); + SOURCE_MAP.put("0701fc.com", "楣版江鎴夸骇缃�0701fc"); + SOURCE_MAP.put("juranhouse.com", "寮犳帠鎴垮湴浜х綉"); + SOURCE_MAP.put("0701.com", "楣版江鎴夸骇缃�"); + SOURCE_MAP.put("dzwww.com", "澶т紬缃�"); + SOURCE_MAP.put("jnfcw.com.cn", "娴庢埧缃慾nfcw"); + SOURCE_MAP.put("fangguagua.com", "鎴垮懕鍛�"); + SOURCE_MAP.put("f537.com", "娴庡畞鎴挎埧缃�"); + SOURCE_MAP.put("tcfcw.net", "閾滃窛鎴夸骇缃�"); + SOURCE_MAP.put("hbloushi.com", "楣ゅ妤煎競"); + SOURCE_MAP.put("ccoo.cn", "鍩庡競涓浗缃�"); + SOURCE_MAP.put("jhhouse.com.cn", "姹熸樊鎴垮湴浜х綉"); + SOURCE_MAP.put("11353.net", "涓浗鐧惧缃�"); + SOURCE_MAP.put("zmdfdc.com", "椹婚┈搴楁埧鍦颁骇淇℃伅缃�"); + SOURCE_MAP.put("0318ol.com", "琛℃按鍦ㄧ嚎"); + SOURCE_MAP.put("053000.com", "琛℃按鎴夸骇缃�"); + SOURCE_MAP.put("yinuo1000.com", "涓�璇烘埧浜х綉"); + SOURCE_MAP.put("xhengshui.com", "琛℃按鏄撴埧缃�"); + SOURCE_MAP.put("dyfc.cn", "寰烽槼鎴垮湴浜х綉"); + SOURCE_MAP.put("ehuludao.com", "钁姦宀涘湪绾�"); + SOURCE_MAP.put("yq918.com", "闃虫硥瀹跺洯缃�"); + SOURCE_MAP.put("hldhouse.com", "钁姦宀涙埧鍦颁骇缃�"); + SOURCE_MAP.put("hccun.com", "娌虫睜鐢熸椿缃�"); + SOURCE_MAP.put("0470a.com", "鍛间鸡璐濆皵鐏綉"); + SOURCE_MAP.put("0470fcw.com", "鍛间鸡璐濆皵鎴夸骇缃�"); + SOURCE_MAP.put("songyuanfang.com", "鏉惧師璐埧缃�"); + SOURCE_MAP.put("gxbs.net", "鐧捐壊甯傛埧浜т俊鎭綉"); + SOURCE_MAP.put("ezfcw.cn", "閯傚窞鎴夸骇缃�"); + SOURCE_MAP.put("gxwuzhou.com", "楦虫睙鐢熸椿缃�"); + SOURCE_MAP.put("dzloupan.cn", "杈惧窞妤肩洏缃�"); + SOURCE_MAP.put("0736home", "甯稿痉甯傛埧鍦颁骇淇℃伅缃�"); + SOURCE_MAP.put("365kl.net", "蹇箰鎴夸骇"); + SOURCE_MAP.put("0917fdc.com", "瀹濋浮鎴夸骇缃�"); + SOURCE_MAP.put("zufang.com", "绉熸埧缃�"); + SOURCE_MAP.put("0827fc.com", "宸翠腑鎴夸骇缃�"); + SOURCE_MAP.put("gy-fdc.com", "骞垮厓鎴跨澶�"); + SOURCE_MAP.put("hzfgj.com", "鑿忔辰鎴跨灞�"); + SOURCE_MAP.put("http://bsfw.cn/", "淇濆北鎴跨綉"); + SOURCE_MAP.put("0475fang.com", "閫氳窘鎴垮湴浜х綉"); + SOURCE_MAP.put("ptdfc.com", "骞虫江鎴夸骇缃�"); + SOURCE_MAP.put("haidong360.com", "娴蜂笢鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("c0798.com", "鏅痉闀囦拱鎴跨綉"); SOURCE_MAP.put("bynefc.com", "FIND YOUR HOME"); - SOURCE_MAP.put("jianfc.com", "吉安房产网"); - SOURCE_MAP.put("zmdfcxx.com", "驻马店房产信息网"); - SOURCE_MAP.put("0473fdc.com", "乌海房产网"); - SOURCE_MAP.put("zmdfcw.com", "驻马店房产网"); - SOURCE_MAP.put("xyfdcw.com", "信阳房地产网"); - SOURCE_MAP.put("akfang.com", "安康房地产门户网"); - SOURCE_MAP.put("xyfcw.com", "信阳房产网"); - SOURCE_MAP.put("kaifc.cn", "开封房产网"); - SOURCE_MAP.put("jmfc.com.cn", "荆门房产热线"); - SOURCE_MAP.put("shaofang.cc", "邵房网"); - SOURCE_MAP.put("e0838.com", "住在德阳网"); - SOURCE_MAP.put("dyfcw.com", "德阳房产网"); - SOURCE_MAP.put("0439.com", "白山在线"); - SOURCE_MAP.put("lsfdc.com", "乐房网lsfdc"); - SOURCE_MAP.put("ndfdc.com", "宁德房地产网"); - SOURCE_MAP.put("0853fdc.com", "0853房产网"); - SOURCE_MAP.put("lsol.com.cn", "居家中国"); - SOURCE_MAP.put("365baotou.com", "包头房地产网"); - SOURCE_MAP.put("aqhouse.com", "安庆房地产交易网"); - SOURCE_MAP.put("yyfdcw.com", "岳阳房地产网"); - SOURCE_MAP.put("sdchina.com/", "中国山东网n"); - SOURCE_MAP.put("51258.cn", "亳州房地产信息网"); - SOURCE_MAP.put("591fcw.cn", "我就要房产网"); - SOURCE_MAP.put("goufanggo.net", "岳阳购房网"); - SOURCE_MAP.put("zyhouse.com.cn", "遵义房地产信息网"); - SOURCE_MAP.put("dyfc.net", "东营房产网"); - SOURCE_MAP.put("wuzhousky.com", "梧州时空网"); - SOURCE_MAP.put("jxfcrx.com", "鸡西房产热线"); - SOURCE_MAP.put("520953.com", "吴忠信息港"); - SOURCE_MAP.put("nxfang.com", "宁夏房网"); - SOURCE_MAP.put("h0476.com", "赤峰房地产网"); - SOURCE_MAP.put("hezefc.com", "菏泽房产网"); - SOURCE_MAP.put("bqqm.com", "便民网"); - SOURCE_MAP.put("seezy.com", "遵义房产网"); - SOURCE_MAP.put("jzloushi.com", "焦作楼市"); - SOURCE_MAP.put("0391fc.cn", "焦作房产网"); - SOURCE_MAP.put("ff1.com.cn", "第一房网"); - SOURCE_MAP.put("u0762.com", "河源优房网"); - SOURCE_MAP.put("ykhouse.cn", "营口房产"); - SOURCE_MAP.put("0352fang.com", "大同房产网"); - SOURCE_MAP.put("0932fdc.com", "定西房产网"); - SOURCE_MAP.put("zsxxg.com", "舟山信息港"); - SOURCE_MAP.put("hiputian.com", "莆田新城房产"); - SOURCE_MAP.put("0831f.com", "宜房网"); - SOURCE_MAP.put("dyanan.com", "大延安网"); - SOURCE_MAP.put("fangzhanhui.com", "房展汇"); - SOURCE_MAP.put("fs0762.com", "房视网"); - SOURCE_MAP.put("076299.cn", "99房产网"); - SOURCE_MAP.put("0762home.com", "河源房产信息网"); - SOURCE_MAP.put("0768fcw.com", "潮州房产网"); - SOURCE_MAP.put("373f.com", "新乡信息港"); - SOURCE_MAP.put("houseyw.com", "香居房产"); - SOURCE_MAP.put("ayloushi.com", "安阳楼市"); - SOURCE_MAP.put("tdfcw.com", "陶都房产网"); - SOURCE_MAP.put("wjls.com.cn", "吴江楼市网"); - SOURCE_MAP.put("5khouse.com", "看房网5khouse"); - SOURCE_MAP.put("ycls.cn", "虞城楼市"); - SOURCE_MAP.put("xxgfw.cn", "新乡购房网"); - SOURCE_MAP.put("ynhouse.com", "云南房网"); - SOURCE_MAP.put("yiwufg.com", "义乌市房产信息网"); - SOURCE_MAP.put("0372fdc.com/", "安阳房地产网"); - SOURCE_MAP.put("ayfcw.com", "安阳房产网"); - SOURCE_MAP.put("0372.cn", "安阳信息网"); - SOURCE_MAP.put("yxfc.cc", "宜兴房产网yxfc"); - SOURCE_MAP.put("yxhouse.net", "宜兴房产网"); - SOURCE_MAP.put("house577.com", "乐清爱房网"); - SOURCE_MAP.put("wjfcw.com", "吴江房产网"); - SOURCE_MAP.put("lifang100.com", "荔房网"); - SOURCE_MAP.put("wokanfang.com", "看房网wokanfang"); - SOURCE_MAP.put("wofang.com", "我房网"); - SOURCE_MAP.put("0775fcw.com", "玉林房产网"); - SOURCE_MAP.put("gxfdc.cn", "广西房地产信息网"); - SOURCE_MAP.put("0710hf.com", "襄阳好房网"); - SOURCE_MAP.put("csgfw.cn", "常熟购房网"); - SOURCE_MAP.put("lesohome.com", "乐搜房产网"); - SOURCE_MAP.put("gaogulou.com", "高古楼房产网"); - SOURCE_MAP.put("pzhls.com", "攀枝花楼市网"); - SOURCE_MAP.put("0831home.com", "三江房产网"); - SOURCE_MAP.put("fhainan.com", "海南购房网"); - SOURCE_MAP.put("syfff.com", "三亚房地产信息网"); - SOURCE_MAP.put("http://ylfct.com/", "玉林房地产信息网"); - SOURCE_MAP.put("tangrenju.net", "唐人居"); - SOURCE_MAP.put("tsfcxx.com", "唐山房产信息网"); - SOURCE_MAP.put("xyfc.com", "襄阳房产"); - SOURCE_MAP.put("xiangyang.net", "百腾热线"); - SOURCE_MAP.put("xfsfc.com.cn", "襄阳住宅与房地产信息网"); - SOURCE_MAP.put("xiangyu.cc", "项羽房产网"); - SOURCE_MAP.put("sqanju.com", "安居网"); - SOURCE_MAP.put("0570fc.com", "衢州房产网"); - SOURCE_MAP.put("yuefc.com", "阅房网"); - SOURCE_MAP.put("newhouse.com.cn", "新地产"); - SOURCE_MAP.put("masff.com", "房房网"); - SOURCE_MAP.put("xafc.com", "新安房产网"); - SOURCE_MAP.put("sqfcw.cc", "宿迁房产网"); - SOURCE_MAP.put("sqfcw.com.cn", "西楚房产网"); - SOURCE_MAP.put("bbs0763.com", "清远房产网"); - SOURCE_MAP.put("qybc.cn", "百川房产"); - SOURCE_MAP.put("fun114.com", "114房产网"); - SOURCE_MAP.put("0316.cc", "廊房网"); - SOURCE_MAP.put("qz123.com", "衢州房产频道"); - SOURCE_MAP.put("qzfdc.com", "衢州房地产网"); - SOURCE_MAP.put("zg163.net", "自贡房产网"); - SOURCE_MAP.put("e086.cn", "中华地产网"); - SOURCE_MAP.put("0555yi.com", "易房网"); - SOURCE_MAP.put("mychefang.com", "车房网"); - SOURCE_MAP.put("zzjjw.cn", "住在九江"); - SOURCE_MAP.put("zyloushi.com", "中原楼市"); - SOURCE_MAP.put("pdsloushi.com", "平顶山楼市"); - SOURCE_MAP.put("pdshouse.com", "平顶山房产"); - SOURCE_MAP.put("88zf.com", "芜湖365房产网"); - SOURCE_MAP.put("jjdichan.com", "九江房产网"); - SOURCE_MAP.put("jjxwfc.com", "大九江房产网"); - SOURCE_MAP.put("0797fdc.net", "赣州房产在线"); - SOURCE_MAP.put("0797f.com", "赣州楼市网"); - SOURCE_MAP.put("797sun.com", "赣州晒房网"); - SOURCE_MAP.put("ufangw.com", "优房网"); - SOURCE_MAP.put("pdsfc.net", "平顶山房产信息网"); - SOURCE_MAP.put("yctong.net", "宜昌通"); - SOURCE_MAP.put("yichangfang.com", "宜昌房产网"); - SOURCE_MAP.put("hejia.tv", "合家网"); - SOURCE_MAP.put("haofz.com", "好房子"); - SOURCE_MAP.put("hi0734.com", "你好衡阳网"); - SOURCE_MAP.put("0731fdc.com", "0731房产网"); - SOURCE_MAP.put("szhome.com", "新房在线"); - SOURCE_MAP.put("fz0752.com", "惠民之家"); - SOURCE_MAP.put("ufang.com", "u房网"); - SOURCE_MAP.put("zp365.com", "住朋网"); - SOURCE_MAP.put("guifun.com", "桂房网"); - SOURCE_MAP.put("0579fw.com", "金华房网"); - SOURCE_MAP.put("0734fdc.cn", "衡阳住宅与房地产信息网"); - SOURCE_MAP.put("hyfdcw.com", "衡阳房地产信息网"); - SOURCE_MAP.put("zzzye.com", "株洲置业"); - SOURCE_MAP.put("0750fw.com", "江门房网"); - SOURCE_MAP.put("0759fdc.com", "湛江房产网"); - SOURCE_MAP.put("0759home.com", "湛江购房网"); - SOURCE_MAP.put("hzcom.cn", "惠州门户网"); - SOURCE_MAP.put("qfang.com", "Q房网"); - SOURCE_MAP.put("fj360.com", "房集网"); - SOURCE_MAP.put("yfyc.tv/", "有房有车"); - SOURCE_MAP.put("tzfdc.com.cn", "泰州房地产信息网"); - SOURCE_MAP.put("t56.net", "泰无聊"); - SOURCE_MAP.put("0579fang.com", "金华房产网"); - SOURCE_MAP.put("0579zf.com", "金华找房网"); - SOURCE_MAP.put("yijuhome.com", "宜居家园"); - SOURCE_MAP.put("cnjxol.com", "嘉兴在线"); - SOURCE_MAP.put("ycfcw.cn", "盐城房产网ycfcw.cn"); - SOURCE_MAP.put("0515fc.cn", "盐城房产网"); - SOURCE_MAP.put("my0511.com", "镇江房产网"); - SOURCE_MAP.put("1f.cn", "易房"); - SOURCE_MAP.put("yzkdfcw.com", "扬州宽带房产网"); - SOURCE_MAP.put("99lou.com", "房居网"); - SOURCE_MAP.put("iweihai.cn", "爱威海"); - SOURCE_MAP.put("whhouse.com.cn", "威海房信网"); - SOURCE_MAP.put("whinfo.net.cn", "威海信息港"); - SOURCE_MAP.put("weihaifc.net", "威海房产网"); - SOURCE_MAP.put("yzfyw.com", "扬州房源网"); - SOURCE_MAP.put("yzjia.com", "扬州家园网"); - SOURCE_MAP.put("hutaihu.com", "太湖网"); - SOURCE_MAP.put("hz66.com", "湖州在线"); - SOURCE_MAP.put("0572hu.com", "住在湖州网"); - SOURCE_MAP.put("sdfdc.com", "山房网"); - SOURCE_MAP.put("veryhome.com", "威海房地产网veryhome"); - SOURCE_MAP.put("venfang.com", "问房网"); - SOURCE_MAP.put("fangtx.com", "房天下"); - SOURCE_MAP.put("3650310.net", "今朝网"); - SOURCE_MAP.put("hd3158.cn", "图房网"); - SOURCE_MAP.put("quanguotong.com", "全国通"); - SOURCE_MAP.put("hdxzlw.com", "邯郸写字楼网"); - SOURCE_MAP.put("bdinfo.net", "互动房缘"); - SOURCE_MAP.put("gxhouse.com", "柳州房产街"); - SOURCE_MAP.put("haofang365.com", "好房365"); - SOURCE_MAP.put("aidaqing.com", "爱大庆房产网"); - SOURCE_MAP.put("tzeju.com", "台州易居网"); - SOURCE_MAP.put("zhujia360.com", "筑家易"); - SOURCE_MAP.put("iecity.com", "城市生活网"); - SOURCE_MAP.put("tt5598.com", "汕头雅居网"); - SOURCE_MAP.put("0754fw.com", "汕头房网"); - SOURCE_MAP.put("zhland.com", "珠海房产网"); - SOURCE_MAP.put("yy.cm", "台州房产网0576"); - SOURCE_MAP.put("tzfy.cn", "台州房源网"); - SOURCE_MAP.put("fc0576.com", "台州房产网"); - SOURCE_MAP.put("0575360.com", "绍兴房产网0575360"); - SOURCE_MAP.put("sxhouse.cn", "绍兴房产网"); - SOURCE_MAP.put("0575ls.cn", "绍兴楼市"); - SOURCE_MAP.put("hellozb.com", "淄房网"); - SOURCE_MAP.put("liaoing.com", "聊宅网"); - SOURCE_MAP.put("lyloushi.com", "洛阳楼市"); - SOURCE_MAP.put("lznews.cn", "鲁中网"); - SOURCE_MAP.put("zbzzfdc.gov.cn", "淄博住宅与房地产信息网"); - SOURCE_MAP.put("zbhouse.cn", "淄博房产网"); - SOURCE_MAP.put("0379city.com", "洛城房产"); - SOURCE_MAP.put("lyhome.com", "洛阳房产网"); - SOURCE_MAP.put("wfhouse.com", "潍坊房地产网"); - SOURCE_MAP.put("wf777.com", "潍房网"); - SOURCE_MAP.put("wftzfc.com", "潍坊天泽房产网"); - SOURCE_MAP.put("czfdc.com", "常房网"); - SOURCE_MAP.put("czfdc.com.cn", "常州房地产信息网"); - SOURCE_MAP.put("czfcw.com", "常州房产网"); - SOURCE_MAP.put("hkfdcw.com", "海口房地产网"); - SOURCE_MAP.put("hinews.cn", "南海网"); - SOURCE_MAP.put("0951house.com", "银川房产网"); - SOURCE_MAP.put("nxsq.com", "宁夏仕奇房产网"); - SOURCE_MAP.put("xiadu.com", "夏都网"); - SOURCE_MAP.put("0971fc.com", "西方网"); - SOURCE_MAP.put("xnfcsc.com", "西宁房产市场网"); - SOURCE_MAP.put("0513.org", "濠滨房产"); - SOURCE_MAP.put("dushifang.com", "都市二手房网"); - SOURCE_MAP.put("mnw.cn", "闽南房产网"); - SOURCE_MAP.put("95191.com", "楼市通"); - SOURCE_MAP.put("xaxzl.com", "西安写字楼网"); - SOURCE_MAP.put("xjfc.com.cn", "乌鲁木齐房产网xjfc"); - SOURCE_MAP.put("wlmq.com", "乌鲁木齐房产网"); - SOURCE_MAP.put("zhaoshang.net", "新疆招商网"); - SOURCE_MAP.put("shm.com.cn", "水母房产"); - SOURCE_MAP.put("jiaodong.net", "胶东房产网"); - SOURCE_MAP.put("fang580.com", "好房网"); - SOURCE_MAP.put("jxdcw.com", "江西地产网"); - SOURCE_MAP.put("cnnbfdc.com", "中国宁波住宅与房地产网"); - SOURCE_MAP.put("ala-office.com", "阿拉写字楼网"); - SOURCE_MAP.put("nbmyhome.com", "甬房网"); - SOURCE_MAP.put("wst.cn", "二泉房产"); - SOURCE_MAP.put("fanging.com", "河南房产网"); - SOURCE_MAP.put("179179.cn", "一起购房网"); - SOURCE_MAP.put("house10000.com", "中山万房网"); - SOURCE_MAP.put("fang33.com", "房米网"); - SOURCE_MAP.put("amoyoffice.com", "厦门写字楼网"); - SOURCE_MAP.put("52youju.com", "优居网"); - SOURCE_MAP.put("housoo.com", "山西房地产门户"); - SOURCE_MAP.put("5i5j.com", "我爱我家"); - SOURCE_MAP.put("962013.com", "苏房网"); - SOURCE_MAP.put("officesuzhou.com", "苏州写字楼信息网"); - SOURCE_MAP.put("zhijia.com", "置家网"); - SOURCE_MAP.put("inhe.net", "银河网"); - SOURCE_MAP.put("0311dy.com", "石家庄写字楼信息网"); - SOURCE_MAP.put("024zf.com", "沈阳租房网"); - SOURCE_MAP.put("qingkai.com", "青岛开发区信息港"); - SOURCE_MAP.put("fdc668.com", "青岛房产网"); - SOURCE_MAP.put("km118.com", "昆明房产网km118"); - SOURCE_MAP.put("kmfcw.com", "昆明房产网"); - SOURCE_MAP.put("dllp.cn", "精品楼盘网"); - SOURCE_MAP.put("sdchina.com", "中国山东网"); - SOURCE_MAP.put("hjtfdc.com", "好家庭房地产网"); - SOURCE_MAP.put("fdc668.com", "哈尔滨房地产网"); - SOURCE_MAP.put("ffw.com.cn", "福房网"); - SOURCE_MAP.put("e0757.cn", "佛山房产网"); - SOURCE_MAP.put("fzg360.com", "房掌柜"); - SOURCE_MAP.put("sun0769.com", "阳光房产网"); - SOURCE_MAP.put("cfhome.com", "厂房之家"); - SOURCE_MAP.put("fdc668.com", "东莞房地产网"); - SOURCE_MAP.put("zjol.com.cn", "杭州商业地产网"); - SOURCE_MAP.put("5axzl.com", "5A杭州写字楼网"); - SOURCE_MAP.put("91xzl.com", "91写字楼网"); - SOURCE_MAP.put("o571.com", "杭州写字楼网"); - SOURCE_MAP.put("dadihouse.com", "大地房产网"); - SOURCE_MAP.put("hf086.com", "海非写字楼网"); - SOURCE_MAP.put("zhaoshang.net", "天津招商网"); - SOURCE_MAP.put("tjcbdoffice.com", "中天写字楼网"); - SOURCE_MAP.put("haopoo.com", "好铺网"); - SOURCE_MAP.put("51tie.com", "51同城"); - SOURCE_MAP.put("gzxzlw.com", "广州商铺信息"); - SOURCE_MAP.put("028f.com", "成房网"); - SOURCE_MAP.put("kuyiso.com", "酷易搜"); - SOURCE_MAP.put("114cbd.com", "中国写字楼信息中心"); - SOURCE_MAP.put("52fangzi.com", "北京写字楼网_52fangzi"); - SOURCE_MAP.put("lcxwfc.com", "聊城房网"); - SOURCE_MAP.put("0597kk.com", "龙岩KK网"); - SOURCE_MAP.put("0395mf.com", "漯河买房网"); - SOURCE_MAP.put("qinzf.com", "钦州住房网"); - SOURCE_MAP.put("hzfdc88.com", "贺州房地产信息网"); - SOURCE_MAP.put("ptfcxx.com", "平潭房产网cxx"); - SOURCE_MAP.put("gxfangchan.com", "广西房产网"); - SOURCE_MAP.put("ahhouse.com/", "毫州房地产交易网m"); - SOURCE_MAP.put("wuzhousky.com","梧州时空网"); - SOURCE_MAP.put("csgfw.cn", "常熟购房网"); - SOURCE_MAP.put("gaogulou.com", "高古楼房产网"); - SOURCE_MAP.put("qybc.cn", "百川房产"); - SOURCE_MAP.put("newhouse.com.cn", "新地产交易网"); - SOURCE_MAP.put("guifun.com", "桂房网"); - SOURCE_MAP.put("fangtoo.com", "房途网"); - SOURCE_MAP.put("iecity.com", "城市生活网"); - SOURCE_MAP.put("lyfcw.com", "洛阳房产网"); - SOURCE_MAP.put("mnw.cn", "闽南房产网"); - SOURCE_MAP.put("xinfun.net", "新房网"); - SOURCE_MAP.put("xafc.com", "新安房产网"); - SOURCE_MAP.put("gzmall.com", "广州商铺网"); - SOURCE_MAP.put("51chudui.com", "我要出兑网"); - SOURCE_MAP.put("jpw.cn", "金铺网"); - SOURCE_MAP.put("qj.cc", "潜江在线"); - SOURCE_MAP.put("917.com", "917房产网"); - SOURCE_MAP.put("sd888.org", "顺德楼市"); - SOURCE_MAP.put("0757fc.com", "佛山房产资讯网"); - SOURCE_MAP.put("fahaola.com", "发好啦"); - SOURCE_MAP.put("0598777.net", "三明房产家装网"); - SOURCE_MAP.put("tjspw.cn", "天津厂房商铺网"); - SOURCE_MAP.put("tzinfo.net", "台州房产主网"); - SOURCE_MAP.put("xzxx.com", "苏北信息港"); - SOURCE_MAP.put("yt99.com", "久久信息网"); - SOURCE_MAP.put("sanxia.net", "三峡热线"); - SOURCE_MAP.put("qdcq.net", "青岛产权交易所"); - SOURCE_MAP.put("chinacourt.org", "北京法院网"); - SOURCE_MAP.put("qdauction.com", "青岛市拍卖中心"); - SOURCE_MAP.put("oncity.cc", "中山同城信息网"); - SOURCE_MAP.put("sz68.com", "深圳土地房产交易中心"); - SOURCE_MAP.put("h0758.net", "肇房网"); - SOURCE_MAP.put("v007.net", "西江明珠房产网"); - SOURCE_MAP.put("0555fc.com", "马鞍山房产网"); - SOURCE_MAP.put("qdyh123.com", "青岛益亨拍卖行有限公司"); - SOURCE_MAP.put("weibo.com", "上海司法拍卖"); - SOURCE_MAP.put("ntxx.net", "南通热线"); - SOURCE_MAP.put("0572zbpm.com", "湖州浙北拍卖行有限公司"); - SOURCE_MAP.put("0454.com", "佳木斯三江网"); - SOURCE_MAP.put("zhongpaiwang.com", "众拍"); - SOURCE_MAP.put("05188.com", "港城网"); - SOURCE_MAP.put("linfangwang.com", "临房网"); - SOURCE_MAP.put("ganchang.cn", "赶场网"); - SOURCE_MAP.put("hhk365.com", "黄河口信息港"); - SOURCE_MAP.put("21998.cn", "贵港房产网"); - SOURCE_MAP.put("soufy.cn", "搜房源"); - SOURCE_MAP.put("hualongxiang.com", "化龙巷"); - SOURCE_MAP.put("435000.com", "黄石信息港"); - SOURCE_MAP.put("5a5f.com", "租房者网站"); - SOURCE_MAP.put("028f.com", "成房网"); - SOURCE_MAP.put("laoke.com", "老客"); - SOURCE_MAP.put("grfy.net", "个人房源网"); - SOURCE_MAP.put("zhenfangyuan.com", "真房源网"); - SOURCE_MAP.put("0771sp.com", "南宁商铺网"); - SOURCE_MAP.put("zhuge.com", "诸葛找房"); - SOURCE_MAP.put("zhugefang.com", "诸葛找房"); + SOURCE_MAP.put("jianfc.com", "鍚夊畨鎴夸骇缃�"); + SOURCE_MAP.put("zmdfcxx.com", "椹婚┈搴楁埧浜т俊鎭綉"); + SOURCE_MAP.put("0473fdc.com", "涔屾捣鎴夸骇缃�"); + SOURCE_MAP.put("zmdfcw.com", "椹婚┈搴楁埧浜х綉"); + SOURCE_MAP.put("xyfdcw.com", "淇¢槼鎴垮湴浜х綉"); + SOURCE_MAP.put("akfang.com", "瀹夊悍鎴垮湴浜ч棬鎴风綉"); + SOURCE_MAP.put("xyfcw.com", "淇¢槼鎴夸骇缃�"); + SOURCE_MAP.put("kaifc.cn", "寮�灏佹埧浜х綉"); + SOURCE_MAP.put("jmfc.com.cn", "鑽嗛棬鎴夸骇鐑嚎"); + SOURCE_MAP.put("shaofang.cc", "閭垫埧缃�"); + SOURCE_MAP.put("e0838.com", "浣忓湪寰烽槼缃�"); + SOURCE_MAP.put("dyfcw.com", "寰烽槼鎴夸骇缃�"); + SOURCE_MAP.put("0439.com", "鐧藉北鍦ㄧ嚎"); + SOURCE_MAP.put("lsfdc.com", "涔愭埧缃憀sfdc"); + SOURCE_MAP.put("ndfdc.com", "瀹佸痉鎴垮湴浜х綉"); + SOURCE_MAP.put("0853fdc.com", "0853鎴夸骇缃�"); + SOURCE_MAP.put("lsol.com.cn", "灞呭涓浗"); + SOURCE_MAP.put("365baotou.com", "鍖呭ご鎴垮湴浜х綉"); + SOURCE_MAP.put("aqhouse.com", "瀹夊簡鎴垮湴浜т氦鏄撶綉"); + SOURCE_MAP.put("yyfdcw.com", "宀抽槼鎴垮湴浜х綉"); + SOURCE_MAP.put("sdchina.com/", "涓浗灞变笢缃憂"); + SOURCE_MAP.put("51258.cn", "浜冲窞鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("591fcw.cn", "鎴戝氨瑕佹埧浜х綉"); + SOURCE_MAP.put("goufanggo.net", "宀抽槼璐埧缃�"); + SOURCE_MAP.put("zyhouse.com.cn", "閬典箟鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("dyfc.net", "涓滆惀鎴夸骇缃�"); + SOURCE_MAP.put("wuzhousky.com", "姊у窞鏃剁┖缃�"); + SOURCE_MAP.put("jxfcrx.com", "楦¤タ鎴夸骇鐑嚎"); + SOURCE_MAP.put("520953.com", "鍚村繝淇℃伅娓�"); + SOURCE_MAP.put("nxfang.com", "瀹佸鎴跨綉"); + SOURCE_MAP.put("h0476.com", "璧ゅ嘲鎴垮湴浜х綉"); + SOURCE_MAP.put("hezefc.com", "鑿忔辰鎴夸骇缃�"); + SOURCE_MAP.put("bqqm.com", "渚挎皯缃�"); + SOURCE_MAP.put("seezy.com", "閬典箟鎴夸骇缃�"); + SOURCE_MAP.put("jzloushi.com", "鐒︿綔妤煎競"); + SOURCE_MAP.put("0391fc.cn", "鐒︿綔鎴夸骇缃�"); + SOURCE_MAP.put("ff1.com.cn", "绗竴鎴跨綉"); + SOURCE_MAP.put("u0762.com", "娌虫簮浼樻埧缃�"); + SOURCE_MAP.put("ykhouse.cn", "钀ュ彛鎴夸骇"); + SOURCE_MAP.put("0352fang.com", "澶у悓鎴夸骇缃�"); + SOURCE_MAP.put("0932fdc.com", "瀹氳タ鎴夸骇缃�"); + SOURCE_MAP.put("zsxxg.com", "鑸熷北淇℃伅娓�"); + SOURCE_MAP.put("hiputian.com", "鑾嗙敯鏂板煄鎴夸骇"); + SOURCE_MAP.put("0831f.com", "瀹滄埧缃�"); + SOURCE_MAP.put("dyanan.com", "澶у欢瀹夌綉"); + SOURCE_MAP.put("fangzhanhui.com", "鎴垮睍姹�"); + SOURCE_MAP.put("fs0762.com", "鎴胯缃�"); + SOURCE_MAP.put("076299.cn", "99鎴夸骇缃�"); + SOURCE_MAP.put("0762home.com", "娌虫簮鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("0768fcw.com", "娼窞鎴夸骇缃�"); + SOURCE_MAP.put("373f.com", "鏂颁埂淇℃伅娓�"); + SOURCE_MAP.put("houseyw.com", "棣欏眳鎴夸骇"); + SOURCE_MAP.put("ayloushi.com", "瀹夐槼妤煎競"); + SOURCE_MAP.put("tdfcw.com", "闄堕兘鎴夸骇缃�"); + SOURCE_MAP.put("wjls.com.cn", "鍚存睙妤煎競缃�"); + SOURCE_MAP.put("5khouse.com", "鐪嬫埧缃�5khouse"); + SOURCE_MAP.put("ycls.cn", "铏炲煄妤煎競"); + SOURCE_MAP.put("xxgfw.cn", "鏂颁埂璐埧缃�"); + SOURCE_MAP.put("ynhouse.com", "浜戝崡鎴跨綉"); + SOURCE_MAP.put("yiwufg.com", "涔変箤甯傛埧浜т俊鎭綉"); + SOURCE_MAP.put("0372fdc.com/", "瀹夐槼鎴垮湴浜х綉"); + SOURCE_MAP.put("ayfcw.com", "瀹夐槼鎴夸骇缃�"); + SOURCE_MAP.put("0372.cn", "瀹夐槼淇℃伅缃�"); + SOURCE_MAP.put("yxfc.cc", "瀹滃叴鎴夸骇缃憏xfc"); + SOURCE_MAP.put("yxhouse.net", "瀹滃叴鎴夸骇缃�"); + SOURCE_MAP.put("house577.com", "涔愭竻鐖辨埧缃�"); + SOURCE_MAP.put("wjfcw.com", "鍚存睙鎴夸骇缃�"); + SOURCE_MAP.put("lifang100.com", "鑽旀埧缃�"); + SOURCE_MAP.put("wokanfang.com", "鐪嬫埧缃憌okanfang"); + SOURCE_MAP.put("wofang.com", "鎴戞埧缃�"); + SOURCE_MAP.put("0775fcw.com", "鐜夋灄鎴夸骇缃�"); + SOURCE_MAP.put("gxfdc.cn", "骞胯タ鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("0710hf.com", "瑗勯槼濂芥埧缃�"); + SOURCE_MAP.put("csgfw.cn", "甯哥啛璐埧缃�"); + SOURCE_MAP.put("lesohome.com", "涔愭悳鎴夸骇缃�"); + SOURCE_MAP.put("gaogulou.com", "楂樺彜妤兼埧浜х綉"); + SOURCE_MAP.put("pzhls.com", "鏀�鏋濊姳妤煎競缃�"); + SOURCE_MAP.put("0831home.com", "涓夋睙鎴夸骇缃�"); + SOURCE_MAP.put("fhainan.com", "娴峰崡璐埧缃�"); + SOURCE_MAP.put("syfff.com", "涓変簹鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("http://ylfct.com/", "鐜夋灄鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("tangrenju.net", "鍞愪汉灞�"); + SOURCE_MAP.put("tsfcxx.com", "鍞愬北鎴夸骇淇℃伅缃�"); + SOURCE_MAP.put("xyfc.com", "瑗勯槼鎴夸骇"); + SOURCE_MAP.put("xiangyang.net", "鐧捐吘鐑嚎"); + SOURCE_MAP.put("xfsfc.com.cn", "瑗勯槼浣忓畢涓庢埧鍦颁骇淇℃伅缃�"); + SOURCE_MAP.put("xiangyu.cc", "椤圭窘鎴夸骇缃�"); + SOURCE_MAP.put("sqanju.com", "瀹夊眳缃�"); + SOURCE_MAP.put("0570fc.com", "琛㈠窞鎴夸骇缃�"); + SOURCE_MAP.put("yuefc.com", "闃呮埧缃�"); + SOURCE_MAP.put("newhouse.com.cn", "鏂板湴浜�"); + SOURCE_MAP.put("masff.com", "鎴挎埧缃�"); + SOURCE_MAP.put("xafc.com", "鏂板畨鎴夸骇缃�"); + SOURCE_MAP.put("sqfcw.cc", "瀹胯縼鎴夸骇缃�"); + SOURCE_MAP.put("sqfcw.com.cn", "瑗挎鎴夸骇缃�"); + SOURCE_MAP.put("bbs0763.com", "娓呰繙鎴夸骇缃�"); + SOURCE_MAP.put("qybc.cn", "鐧惧窛鎴夸骇"); + SOURCE_MAP.put("fun114.com", "114鎴夸骇缃�"); + SOURCE_MAP.put("0316.cc", "寤婃埧缃�"); + SOURCE_MAP.put("qz123.com", "琛㈠窞鎴夸骇棰戦亾"); + SOURCE_MAP.put("qzfdc.com", "琛㈠窞鎴垮湴浜х綉"); + SOURCE_MAP.put("zg163.net", "鑷础鎴夸骇缃�"); + SOURCE_MAP.put("e086.cn", "涓崕鍦颁骇缃�"); + SOURCE_MAP.put("0555yi.com", "鏄撴埧缃�"); + SOURCE_MAP.put("mychefang.com", "杞︽埧缃�"); + SOURCE_MAP.put("zzjjw.cn", "浣忓湪涔濇睙"); + SOURCE_MAP.put("zyloushi.com", "涓師妤煎競"); + SOURCE_MAP.put("pdsloushi.com", "骞抽《灞辨ゼ甯�"); + SOURCE_MAP.put("pdshouse.com", "骞抽《灞辨埧浜�"); + SOURCE_MAP.put("88zf.com", "鑺滄箹365鎴夸骇缃�"); + SOURCE_MAP.put("jjdichan.com", "涔濇睙鎴夸骇缃�"); + SOURCE_MAP.put("jjxwfc.com", "澶т節姹熸埧浜х綉"); + SOURCE_MAP.put("0797fdc.net", "璧e窞鎴夸骇鍦ㄧ嚎"); + SOURCE_MAP.put("0797f.com", "璧e窞妤煎競缃�"); + SOURCE_MAP.put("797sun.com", "璧e窞鏅掓埧缃�"); + SOURCE_MAP.put("ufangw.com", "浼樻埧缃�"); + SOURCE_MAP.put("pdsfc.net", "骞抽《灞辨埧浜т俊鎭綉"); + SOURCE_MAP.put("yctong.net", "瀹滄槍閫�"); + SOURCE_MAP.put("yichangfang.com", "瀹滄槍鎴夸骇缃�"); + SOURCE_MAP.put("hejia.tv", "鍚堝缃�"); + SOURCE_MAP.put("haofz.com", "濂芥埧瀛�"); + SOURCE_MAP.put("hi0734.com", "浣犲ソ琛¢槼缃�"); + SOURCE_MAP.put("0731fdc.com", "0731鎴夸骇缃�"); + SOURCE_MAP.put("szhome.com", "鏂版埧鍦ㄧ嚎"); + SOURCE_MAP.put("fz0752.com", "鎯犳皯涔嬪"); + SOURCE_MAP.put("ufang.com", "u鎴跨綉"); + SOURCE_MAP.put("zp365.com", "浣忔湅缃�"); + SOURCE_MAP.put("guifun.com", "妗傛埧缃�"); + SOURCE_MAP.put("0579fw.com", "閲戝崕鎴跨綉"); + SOURCE_MAP.put("0734fdc.cn", "琛¢槼浣忓畢涓庢埧鍦颁骇淇℃伅缃�"); + SOURCE_MAP.put("hyfdcw.com", "琛¢槼鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("zzzye.com", "鏍床缃笟"); + SOURCE_MAP.put("0750fw.com", "姹熼棬鎴跨綉"); + SOURCE_MAP.put("0759fdc.com", "婀涙睙鎴夸骇缃�"); + SOURCE_MAP.put("0759home.com", "婀涙睙璐埧缃�"); + SOURCE_MAP.put("hzcom.cn", "鎯犲窞闂ㄦ埛缃�"); + SOURCE_MAP.put("qfang.com", "Q鎴跨綉"); + SOURCE_MAP.put("fj360.com", "鎴块泦缃�"); + SOURCE_MAP.put("yfyc.tv/", "鏈夋埧鏈夎溅"); + SOURCE_MAP.put("tzfdc.com.cn", "娉板窞鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("t56.net", "娉版棤鑱�"); + SOURCE_MAP.put("0579fang.com", "閲戝崕鎴夸骇缃�"); + SOURCE_MAP.put("0579zf.com", "閲戝崕鎵炬埧缃�"); + SOURCE_MAP.put("yijuhome.com", "瀹滃眳瀹跺洯"); + SOURCE_MAP.put("cnjxol.com", "鍢夊叴鍦ㄧ嚎"); + SOURCE_MAP.put("ycfcw.cn", "鐩愬煄鎴夸骇缃憏cfcw.cn"); + SOURCE_MAP.put("0515fc.cn", "鐩愬煄鎴夸骇缃�"); + SOURCE_MAP.put("my0511.com", "闀囨睙鎴夸骇缃�"); + SOURCE_MAP.put("1f.cn", "鏄撴埧"); + SOURCE_MAP.put("yzkdfcw.com", "鎵窞瀹藉甫鎴夸骇缃�"); + SOURCE_MAP.put("99lou.com", "鎴垮眳缃�"); + SOURCE_MAP.put("iweihai.cn", "鐖卞▉娴�"); + SOURCE_MAP.put("whhouse.com.cn", "濞佹捣鎴夸俊缃�"); + SOURCE_MAP.put("whinfo.net.cn", "濞佹捣淇℃伅娓�"); + SOURCE_MAP.put("weihaifc.net", "濞佹捣鎴夸骇缃�"); + SOURCE_MAP.put("yzfyw.com", "鎵窞鎴挎簮缃�"); + SOURCE_MAP.put("yzjia.com", "鎵窞瀹跺洯缃�"); + SOURCE_MAP.put("hutaihu.com", "澶箹缃�"); + SOURCE_MAP.put("hz66.com", "婀栧窞鍦ㄧ嚎"); + SOURCE_MAP.put("0572hu.com", "浣忓湪婀栧窞缃�"); + SOURCE_MAP.put("sdfdc.com", "灞辨埧缃�"); + SOURCE_MAP.put("veryhome.com", "濞佹捣鎴垮湴浜х綉veryhome"); + SOURCE_MAP.put("venfang.com", "闂埧缃�"); + SOURCE_MAP.put("fangtx.com", "鎴垮ぉ涓�"); + SOURCE_MAP.put("3650310.net", "浠婃湞缃�"); + SOURCE_MAP.put("hd3158.cn", "鍥炬埧缃�"); + SOURCE_MAP.put("quanguotong.com", "鍏ㄥ浗閫�"); + SOURCE_MAP.put("hdxzlw.com", "閭兏鍐欏瓧妤肩綉"); + SOURCE_MAP.put("bdinfo.net", "浜掑姩鎴跨紭"); + SOURCE_MAP.put("gxhouse.com", "鏌冲窞鎴夸骇琛�"); + SOURCE_MAP.put("haofang365.com", "濂芥埧365"); + SOURCE_MAP.put("aidaqing.com", "鐖卞ぇ搴嗘埧浜х綉"); + SOURCE_MAP.put("tzeju.com", "鍙板窞鏄撳眳缃�"); + SOURCE_MAP.put("zhujia360.com", "绛戝鏄�"); + SOURCE_MAP.put("iecity.com", "鍩庡競鐢熸椿缃�"); + SOURCE_MAP.put("tt5598.com", "姹曞ご闆呭眳缃�"); + SOURCE_MAP.put("0754fw.com", "姹曞ご鎴跨綉"); + SOURCE_MAP.put("zhland.com", "鐝犳捣鎴夸骇缃�"); + SOURCE_MAP.put("yy.cm", "鍙板窞鎴夸骇缃�0576"); + SOURCE_MAP.put("tzfy.cn", "鍙板窞鎴挎簮缃�"); + SOURCE_MAP.put("fc0576.com", "鍙板窞鎴夸骇缃�"); + SOURCE_MAP.put("0575360.com", "缁嶅叴鎴夸骇缃�0575360"); + SOURCE_MAP.put("sxhouse.cn", "缁嶅叴鎴夸骇缃�"); + SOURCE_MAP.put("0575ls.cn", "缁嶅叴妤煎競"); + SOURCE_MAP.put("hellozb.com", "娣勬埧缃�"); + SOURCE_MAP.put("liaoing.com", "鑱婂畢缃�"); + SOURCE_MAP.put("lyloushi.com", "娲涢槼妤煎競"); + SOURCE_MAP.put("lznews.cn", "椴佷腑缃�"); + SOURCE_MAP.put("zbzzfdc.gov.cn", "娣勫崥浣忓畢涓庢埧鍦颁骇淇℃伅缃�"); + SOURCE_MAP.put("zbhouse.cn", "娣勫崥鎴夸骇缃�"); + SOURCE_MAP.put("0379city.com", "娲涘煄鎴夸骇"); + SOURCE_MAP.put("lyhome.com", "娲涢槼鎴夸骇缃�"); + SOURCE_MAP.put("wfhouse.com", "娼嶅潑鎴垮湴浜х綉"); + SOURCE_MAP.put("wf777.com", "娼嶆埧缃�"); + SOURCE_MAP.put("wftzfc.com", "娼嶅潑澶╂辰鎴夸骇缃�"); + SOURCE_MAP.put("czfdc.com", "甯告埧缃�"); + SOURCE_MAP.put("czfdc.com.cn", "甯稿窞鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("czfcw.com", "甯稿窞鎴夸骇缃�"); + SOURCE_MAP.put("hkfdcw.com", "娴峰彛鎴垮湴浜х綉"); + SOURCE_MAP.put("hinews.cn", "鍗楁捣缃�"); + SOURCE_MAP.put("0951house.com", "閾跺窛鎴夸骇缃�"); + SOURCE_MAP.put("nxsq.com", "瀹佸浠曞鎴夸骇缃�"); + SOURCE_MAP.put("xiadu.com", "澶忛兘缃�"); + SOURCE_MAP.put("0971fc.com", "瑗挎柟缃�"); + SOURCE_MAP.put("xnfcsc.com", "瑗垮畞鎴夸骇甯傚満缃�"); + SOURCE_MAP.put("0513.org", "婵犳花鎴夸骇"); + SOURCE_MAP.put("dushifang.com", "閮藉競浜屾墜鎴跨綉"); + SOURCE_MAP.put("mnw.cn", "闂藉崡鎴夸骇缃�"); + SOURCE_MAP.put("95191.com", "妤煎競閫�"); + SOURCE_MAP.put("xaxzl.com", "瑗垮畨鍐欏瓧妤肩綉"); + SOURCE_MAP.put("xjfc.com.cn", "涔岄瞾鏈ㄩ綈鎴夸骇缃憍jfc"); + SOURCE_MAP.put("wlmq.com", "涔岄瞾鏈ㄩ綈鎴夸骇缃�"); + SOURCE_MAP.put("zhaoshang.net", "鏂扮枂鎷涘晢缃�"); + SOURCE_MAP.put("shm.com.cn", "姘存瘝鎴夸骇"); + SOURCE_MAP.put("jiaodong.net", "鑳朵笢鎴夸骇缃�"); + SOURCE_MAP.put("fang580.com", "濂芥埧缃�"); + SOURCE_MAP.put("jxdcw.com", "姹熻タ鍦颁骇缃�"); + SOURCE_MAP.put("cnnbfdc.com", "涓浗瀹佹尝浣忓畢涓庢埧鍦颁骇缃�"); + SOURCE_MAP.put("ala-office.com", "闃挎媺鍐欏瓧妤肩綉"); + SOURCE_MAP.put("nbmyhome.com", "鐢埧缃�"); + SOURCE_MAP.put("wst.cn", "浜屾硥鎴夸骇"); + SOURCE_MAP.put("fanging.com", "娌冲崡鎴夸骇缃�"); + SOURCE_MAP.put("179179.cn", "涓�璧疯喘鎴跨綉"); + SOURCE_MAP.put("house10000.com", "涓北涓囨埧缃�"); + SOURCE_MAP.put("fang33.com", "鎴跨背缃�"); + SOURCE_MAP.put("amoyoffice.com", "鍘﹂棬鍐欏瓧妤肩綉"); + SOURCE_MAP.put("52youju.com", "浼樺眳缃�"); + SOURCE_MAP.put("housoo.com", "灞辫タ鎴垮湴浜ч棬鎴�"); + SOURCE_MAP.put("5i5j.com", "鎴戠埍鎴戝"); + SOURCE_MAP.put("962013.com", "鑻忔埧缃�"); + SOURCE_MAP.put("officesuzhou.com", "鑻忓窞鍐欏瓧妤间俊鎭綉"); + SOURCE_MAP.put("zhijia.com", "缃缃�"); + SOURCE_MAP.put("inhe.net", "閾舵渤缃�"); + SOURCE_MAP.put("0311dy.com", "鐭冲搴勫啓瀛楁ゼ淇℃伅缃�"); + SOURCE_MAP.put("024zf.com", "娌堥槼绉熸埧缃�"); + SOURCE_MAP.put("qingkai.com", "闈掑矝寮�鍙戝尯淇℃伅娓�"); + SOURCE_MAP.put("fdc668.com", "闈掑矝鎴夸骇缃�"); + SOURCE_MAP.put("km118.com", "鏄嗘槑鎴夸骇缃慿m118"); + SOURCE_MAP.put("kmfcw.com", "鏄嗘槑鎴夸骇缃�"); + SOURCE_MAP.put("dllp.cn", "绮惧搧妤肩洏缃�"); + SOURCE_MAP.put("sdchina.com", "涓浗灞变笢缃�"); + SOURCE_MAP.put("hjtfdc.com", "濂藉搴埧鍦颁骇缃�"); + SOURCE_MAP.put("fdc668.com", "鍝堝皵婊ㄦ埧鍦颁骇缃�"); + SOURCE_MAP.put("ffw.com.cn", "绂忔埧缃�"); + SOURCE_MAP.put("e0757.cn", "浣涘北鎴夸骇缃�"); + SOURCE_MAP.put("fzg360.com", "鎴挎帉鏌�"); + SOURCE_MAP.put("sun0769.com", "闃冲厜鎴夸骇缃�"); + SOURCE_MAP.put("cfhome.com", "鍘傛埧涔嬪"); + SOURCE_MAP.put("fdc668.com", "涓滆帪鎴垮湴浜х綉"); + SOURCE_MAP.put("zjol.com.cn", "鏉窞鍟嗕笟鍦颁骇缃�"); + SOURCE_MAP.put("5axzl.com", "5A鏉窞鍐欏瓧妤肩綉"); + SOURCE_MAP.put("91xzl.com", "91鍐欏瓧妤肩綉"); + SOURCE_MAP.put("o571.com", "鏉窞鍐欏瓧妤肩綉"); + SOURCE_MAP.put("dadihouse.com", "澶у湴鎴夸骇缃�"); + SOURCE_MAP.put("hf086.com", "娴烽潪鍐欏瓧妤肩綉"); + SOURCE_MAP.put("zhaoshang.net", "澶╂触鎷涘晢缃�"); + SOURCE_MAP.put("tjcbdoffice.com", "涓ぉ鍐欏瓧妤肩綉"); + SOURCE_MAP.put("haopoo.com", "濂介摵缃�"); + SOURCE_MAP.put("51tie.com", "51鍚屽煄"); + SOURCE_MAP.put("gzxzlw.com", "骞垮窞鍟嗛摵淇℃伅"); + SOURCE_MAP.put("028f.com", "鎴愭埧缃�"); + SOURCE_MAP.put("kuyiso.com", "閰锋槗鎼�"); + SOURCE_MAP.put("114cbd.com", "涓浗鍐欏瓧妤间俊鎭腑蹇�"); + SOURCE_MAP.put("52fangzi.com", "鍖椾含鍐欏瓧妤肩綉_52fangzi"); + SOURCE_MAP.put("lcxwfc.com", "鑱婂煄鎴跨綉"); + SOURCE_MAP.put("0597kk.com", "榫欏博KK缃�"); + SOURCE_MAP.put("0395mf.com", "婕渤涔版埧缃�"); + SOURCE_MAP.put("qinzf.com", "閽﹀窞浣忔埧缃�"); + SOURCE_MAP.put("hzfdc88.com", "璐哄窞鎴垮湴浜т俊鎭綉"); + SOURCE_MAP.put("ptfcxx.com", "骞虫江鎴夸骇缃慶xx"); + SOURCE_MAP.put("gxfangchan.com", "骞胯タ鎴夸骇缃�"); + SOURCE_MAP.put("ahhouse.com/", "姣窞鎴垮湴浜т氦鏄撶綉m"); + SOURCE_MAP.put("wuzhousky.com","姊у窞鏃剁┖缃�"); + SOURCE_MAP.put("csgfw.cn", "甯哥啛璐埧缃�"); + SOURCE_MAP.put("gaogulou.com", "楂樺彜妤兼埧浜х綉"); + SOURCE_MAP.put("qybc.cn", "鐧惧窛鎴夸骇"); + SOURCE_MAP.put("newhouse.com.cn", "鏂板湴浜т氦鏄撶綉"); + SOURCE_MAP.put("guifun.com", "妗傛埧缃�"); + SOURCE_MAP.put("fangtoo.com", "鎴块�旂綉"); + SOURCE_MAP.put("iecity.com", "鍩庡競鐢熸椿缃�"); + SOURCE_MAP.put("lyfcw.com", "娲涢槼鎴夸骇缃�"); + SOURCE_MAP.put("mnw.cn", "闂藉崡鎴夸骇缃�"); + SOURCE_MAP.put("xinfun.net", "鏂版埧缃�"); + SOURCE_MAP.put("xafc.com", "鏂板畨鎴夸骇缃�"); + SOURCE_MAP.put("gzmall.com", "骞垮窞鍟嗛摵缃�"); + SOURCE_MAP.put("51chudui.com", "鎴戣鍑哄厬缃�"); + SOURCE_MAP.put("jpw.cn", "閲戦摵缃�"); + SOURCE_MAP.put("qj.cc", "娼滄睙鍦ㄧ嚎"); + SOURCE_MAP.put("917.com", "917鎴夸骇缃�"); + SOURCE_MAP.put("sd888.org", "椤哄痉妤煎競"); + SOURCE_MAP.put("0757fc.com", "浣涘北鎴夸骇璧勮缃�"); + SOURCE_MAP.put("fahaola.com", "鍙戝ソ鍟�"); + SOURCE_MAP.put("0598777.net", "涓夋槑鎴夸骇瀹惰缃�"); + SOURCE_MAP.put("tjspw.cn", "澶╂触鍘傛埧鍟嗛摵缃�"); + SOURCE_MAP.put("tzinfo.net", "鍙板窞鎴夸骇涓荤綉"); + SOURCE_MAP.put("xzxx.com", "鑻忓寳淇℃伅娓�"); + SOURCE_MAP.put("yt99.com", "涔呬箙淇℃伅缃�"); + SOURCE_MAP.put("sanxia.net", "涓夊场鐑嚎"); + SOURCE_MAP.put("qdcq.net", "闈掑矝浜ф潈浜ゆ槗鎵�"); + SOURCE_MAP.put("chinacourt.org", "鍖椾含娉曢櫌缃�"); + SOURCE_MAP.put("qdauction.com", "闈掑矝甯傛媿鍗栦腑蹇�"); + SOURCE_MAP.put("oncity.cc", "涓北鍚屽煄淇℃伅缃�"); + SOURCE_MAP.put("sz68.com", "娣卞湷鍦熷湴鎴夸骇浜ゆ槗涓績"); + SOURCE_MAP.put("h0758.net", "鑲囨埧缃�"); + SOURCE_MAP.put("v007.net", "瑗挎睙鏄庣彔鎴夸骇缃�"); + SOURCE_MAP.put("0555fc.com", "椹瀺灞辨埧浜х綉"); + SOURCE_MAP.put("qdyh123.com", "闈掑矝鐩婁酣鎷嶅崠琛屾湁闄愬叕鍙�"); + SOURCE_MAP.put("weibo.com", "涓婃捣鍙告硶鎷嶅崠"); + SOURCE_MAP.put("ntxx.net", "鍗楅�氱儹绾�"); + SOURCE_MAP.put("0572zbpm.com", "婀栧窞娴欏寳鎷嶅崠琛屾湁闄愬叕鍙�"); + SOURCE_MAP.put("0454.com", "浣虫湪鏂笁姹熺綉"); + SOURCE_MAP.put("zhongpaiwang.com", "浼楁媿"); + SOURCE_MAP.put("05188.com", "娓煄缃�"); + SOURCE_MAP.put("linfangwang.com", "涓存埧缃�"); + SOURCE_MAP.put("ganchang.cn", "璧跺満缃�"); + SOURCE_MAP.put("hhk365.com", "榛勬渤鍙d俊鎭腐"); + SOURCE_MAP.put("21998.cn", "璐垫腐鎴夸骇缃�"); + SOURCE_MAP.put("soufy.cn", "鎼滄埧婧�"); + SOURCE_MAP.put("hualongxiang.com", "鍖栭緳宸�"); + SOURCE_MAP.put("435000.com", "榛勭煶淇℃伅娓�"); + SOURCE_MAP.put("5a5f.com", "绉熸埧鑰呯綉绔�"); + SOURCE_MAP.put("028f.com", "鎴愭埧缃�"); + SOURCE_MAP.put("laoke.com", "鑰佸"); + SOURCE_MAP.put("grfy.net", "涓汉鎴挎簮缃�"); + SOURCE_MAP.put("zhenfangyuan.com", "鐪熸埧婧愮綉"); + SOURCE_MAP.put("0771sp.com", "鍗楀畞鍟嗛摵缃�"); + SOURCE_MAP.put("zhuge.com", "璇歌憶鎵炬埧"); + SOURCE_MAP.put("zhugefang.com", "璇歌憶鎵炬埧"); } public static String getResourceName(String resouce) { diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/StringUtil.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/StringUtil.java index 7b61d15e5..038cd5095 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/StringUtil.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/StringUtil.java @@ -54,7 +54,7 @@ public class StringUtil { } /** - * 截取第一个字符 + * 鎴彇绗竴涓瓧绗� * * @param spell * @return @@ -109,11 +109,11 @@ public class StringUtil { } /** - * 全角字符串转化成半角 + * 鍏ㄨ瀛楃涓茶浆鍖栨垚鍗婅 * * @param value - * 全角字符串 - * @return 转化后的半角字符串 + * 鍏ㄨ瀛楃涓� + * @return 杞寲鍚庣殑鍗婅瀛楃涓� */ public static final String sbcChange(String value) { if (StringUtils.isBlank(value)) { @@ -183,7 +183,7 @@ public class StringUtil { } /** - * 求2个字符串的最大连续子集 + * 姹�2涓瓧绗︿覆鐨勬渶澶ц繛缁瓙闆� * * @param str1 * @param str2 @@ -219,12 +219,12 @@ public class StringUtil { } /** - * 首页输入框中的字符串解析 + * 棣栭〉杈撳叆妗嗕腑鐨勫瓧绗︿覆瑙f瀽 * * @param str - * 需要被解析的字符串 - * @return map对象的key分别为keyword,houseNum,roomNum - * map对象的value对应为解析出的keyword,houseNum,roomNum,如果没有解析到返回为 null; + * 闇�瑕佽瑙f瀽鐨勫瓧绗︿覆 + * @return map瀵硅薄鐨刱ey鍒嗗埆涓簁eyword,houseNum,roomNum + * map瀵硅薄鐨剉alue瀵瑰簲涓鸿В鏋愬嚭鐨刱eyword,houseNum,roomNum,濡傛灉娌℃湁瑙f瀽鍒拌繑鍥炰负 null; */ public static Map shouYeAnalyticsString(String str) { if (StringUtils.isBlank(str)) { @@ -253,17 +253,17 @@ public class StringUtil { if (m != null) { try { - if (tmpKey != null && tmpKey.startsWith("10")) {// 只输入"号" - houseNum = m.group(1).replace("号", "").replace("幢", "").replace("栋", "").replace("座", "").replace("坐", ""); - } else if (tmpKey != null && tmpKey.startsWith("20")) {// 只输入"室" - roomNum = m.group(1).replace("室", "").replace("层", ""); + if (tmpKey != null && tmpKey.startsWith("10")) {// 鍙緭鍏�"鍙�" + houseNum = m.group(1).replace("鍙�", "").replace("骞�", "").replace("鏍�", "").replace("搴�", "").replace("鍧�", ""); + } else if (tmpKey != null && tmpKey.startsWith("20")) {// 鍙緭鍏�"瀹�" + roomNum = m.group(1).replace("瀹�", "").replace("灞�", ""); } else { if (m.group(1) != null) { - houseNum = m.group(1).replace("号", "").replace("幢", "").replace("栋", "").replace("座", "") - .replace("坐", ""); + houseNum = m.group(1).replace("鍙�", "").replace("骞�", "").replace("鏍�", "").replace("搴�", "") + .replace("鍧�", ""); } if (m.group(2) != null) { - roomNum = m.group(2).replace("室", "").replace("层", ""); + roomNum = m.group(2).replace("瀹�", "").replace("灞�", ""); } } } catch (Exception e) { @@ -294,7 +294,7 @@ public class StringUtil { ret.put("roomNum", roomNum); ret.put("houseNum", houseNum); ret.put("keyword", bak.substring(0, index).trim()); - ret.put("rule", rule); // 调试使用 + ret.put("rule", rule); // 璋冭瘯浣跨敤 } } @@ -302,10 +302,10 @@ public class StringUtil { } /** - * 得到匹配规则 map : key小于100的为号,室都输入 100-199的为只输入"号" 200-299的为只输入"室" - * 300-399什么都没有输入 + * 寰楀埌鍖归厤瑙勫垯 map : key灏忎簬100鐨勪负鍙�,瀹ら兘杈撳叆 100-199鐨勪负鍙緭鍏�"鍙�" 200-299鐨勪负鍙緭鍏�"瀹�" + * 300-399浠�涔堥兘娌℃湁杈撳叆 * - * value为对应的匹配规则 + * value涓哄搴旂殑鍖归厤瑙勫垯 * * @return */ @@ -320,30 +320,30 @@ public class StringUtil { map.put("004", Pattern.compile("[^0-9A-Za-z]+\\s([0-9A-Za-z]+)\\s+([0-9A-Za-z]+)$")); // ## // X // X - map.put("005", Pattern.compile("[^0-9A-Za-z\\s]+([0-9A-Za-z]+[号|栋|幢|坐|座])([0-9A-Za-z]+[室|层])$")); // ##X号X室 - map.put("006", Pattern.compile("[^0-9A-Za-z]+\\s([0-9A-Za-z]+[号|栋|幢|坐|座])([0-9A-Za-z]+[室|层])$")); // ## - // X号X室 - map.put("007", Pattern.compile("[^0-9A-Za-z]+\\s([0-9A-Za-z]+[号|栋|幢|坐|座])\\s([0-9A-Za-z]+[室|层])$")); // ## - // X号 - // X室 - map.put("008", Pattern.compile("[^0-9A-Za-z]+\\s([0-9A-Za-z]+[号|栋|幢|坐|座])([0-9A-Za-z]+)$")); // ## - // X号X - map.put("009", Pattern.compile("[^0-9A-Za-z\\s]+([0-9A-Za-z]+[号|栋|幢|坐|座])([0-9A-Za-z]+)$")); // ##X号X - map.put("010", Pattern.compile("[^0-9A-Za-z]+\\s([0-9A-Za-z]+[号|栋|幢|坐|座])\\s([0-9A-Za-z]+)$")); // ## - // X号 + map.put("005", Pattern.compile("[^0-9A-Za-z\\s]+([0-9A-Za-z]+[鍙穦鏍媩骞鍧恷搴)([0-9A-Za-z]+[瀹灞俔)$")); // ##X鍙稾瀹� + map.put("006", Pattern.compile("[^0-9A-Za-z]+\\s([0-9A-Za-z]+[鍙穦鏍媩骞鍧恷搴)([0-9A-Za-z]+[瀹灞俔)$")); // ## + // X鍙稾瀹� + map.put("007", Pattern.compile("[^0-9A-Za-z]+\\s([0-9A-Za-z]+[鍙穦鏍媩骞鍧恷搴)\\s([0-9A-Za-z]+[瀹灞俔)$")); // ## + // X鍙� + // X瀹� + map.put("008", Pattern.compile("[^0-9A-Za-z]+\\s([0-9A-Za-z]+[鍙穦鏍媩骞鍧恷搴)([0-9A-Za-z]+)$")); // ## + // X鍙稾 + map.put("009", Pattern.compile("[^0-9A-Za-z\\s]+([0-9A-Za-z]+[鍙穦鏍媩骞鍧恷搴)([0-9A-Za-z]+)$")); // ##X鍙稾 + map.put("010", Pattern.compile("[^0-9A-Za-z]+\\s([0-9A-Za-z]+[鍙穦鏍媩骞鍧恷搴)\\s([0-9A-Za-z]+)$")); // ## + // X鍙� // X - map.put("011", Pattern.compile("[^0-9A-Za-z]+\\s([0-9A-Za-z]+[号|栋|幢|坐|座])-([0-9A-Za-z]+)$")); // ## - // X号-X - map.put("012", Pattern.compile("[^0-9A-Za-z\\s]+([0-9A-Za-z]+)-([0-9A-Za-z]+[室|层])$")); // ##X-X室 - map.put("013", Pattern.compile("[^0-9A-Za-z]+\\s([0-9A-Za-z]+)-([0-9A-Za-z]+[室|层])$")); // ## - // X-X室 - // map.put("14", Pattern.compile("")); //##X号 X号 X室 - // 只输入一个数字时 - map.put("101", Pattern.compile("[^0-9A-Za-z]+([0-9A-Za-z]+)号$")); - map.put("102", Pattern.compile("[^0-9A-Za-z]+\\s([0-9A-Za-z]+)号$")); + map.put("011", Pattern.compile("[^0-9A-Za-z]+\\s([0-9A-Za-z]+[鍙穦鏍媩骞鍧恷搴)-([0-9A-Za-z]+)$")); // ## + // X鍙�-X + map.put("012", Pattern.compile("[^0-9A-Za-z\\s]+([0-9A-Za-z]+)-([0-9A-Za-z]+[瀹灞俔)$")); // ##X-X瀹� + map.put("013", Pattern.compile("[^0-9A-Za-z]+\\s([0-9A-Za-z]+)-([0-9A-Za-z]+[瀹灞俔)$")); // ## + // X-X瀹� + // map.put("14", Pattern.compile("")); //##X鍙� X鍙� X瀹� + // 鍙緭鍏ヤ竴涓暟瀛楁椂 + map.put("101", Pattern.compile("[^0-9A-Za-z]+([0-9A-Za-z]+)鍙�$")); + map.put("102", Pattern.compile("[^0-9A-Za-z]+\\s([0-9A-Za-z]+)鍙�$")); - map.put("201", Pattern.compile("[^0-9A-Za-z]+([0-9A-Za-z]+)室$")); - map.put("202", Pattern.compile("[^0-9A-Za-z]+\\s([0-9A-Za-z]+)室$")); + map.put("201", Pattern.compile("[^0-9A-Za-z]+([0-9A-Za-z]+)瀹�$")); + map.put("202", Pattern.compile("[^0-9A-Za-z]+\\s([0-9A-Za-z]+)瀹�$")); map.put("301", Pattern.compile("[^0-9A-Za-z]+\\s([0-9A-Za-z]+)$")); @@ -366,7 +366,7 @@ public class StringUtil { } /** - * 是否包含屏蔽字 返回所包含的第一个屏蔽字 如果不是屏蔽字,返回null + * 鏄惁鍖呭惈灞忚斀瀛� 杩斿洖鎵�鍖呭惈鐨勭涓�涓睆钄藉瓧 濡傛灉涓嶆槸灞忚斀瀛楋紝杩斿洖null */ public static String isDirtyWord(String word) { String wd = StringUtils.deleteWhitespace(word); @@ -384,7 +384,7 @@ public class StringUtil { } /** - * 读取fileName.properties文件中属性为name的值 + * 璇诲彇fileName.properties鏂囦欢涓睘鎬т负name鐨勫�� * * @param name * @param fileName @@ -412,7 +412,7 @@ public class StringUtil { } /** - * 把字符串按","或","分隔,返回List + * 鎶婂瓧绗︿覆鎸�","鎴�"锛�"鍒嗛殧锛岃繑鍥濴ist * * @param str * @return @@ -423,7 +423,7 @@ public class StringUtil { if (StringUtils.isEmpty(strWithOutSpace)) { return null; } - String[] arrWithOutSpace = StringUtils.split(strWithOutSpace, ",|,"); + String[] arrWithOutSpace = StringUtils.split(strWithOutSpace, ",|锛�"); List result = Arrays.asList(arrWithOutSpace); return result; } @@ -443,24 +443,24 @@ public class StringUtil { if (bytes.length > length) { nFill = true; } - int n = 0; // 表示当前的字节数 - int i = 2; // 要截取的字节数,从第3个字节开始 + int n = 0; // 琛ㄧず褰撳墠鐨勫瓧鑺傛暟 + int i = 2; // 瑕佹埅鍙栫殑瀛楄妭鏁帮紝浠庣3涓瓧鑺傚紑濮� for (; i < bytes.length && n < length; i++) { - // 奇数位置,如3、5、7等,为UCS2编码中两个字节的第二个字节 + // 濂囨暟浣嶇疆锛屽3銆�5銆�7绛夛紝涓篣CS2缂栫爜涓袱涓瓧鑺傜殑绗簩涓瓧鑺� if (i % 2 == 1) { - n++; // 在UCS2第二个字节时n加1 + n++; // 鍦║CS2绗簩涓瓧鑺傛椂n鍔�1 } else { - // 当UCS2编码的第一个字节不等于0时,该UCS2字符为汉字,一个汉字算两个字节 + // 褰揢CS2缂栫爜鐨勭涓�涓瓧鑺備笉绛変簬0鏃讹紝璇CS2瀛楃涓烘眽瀛楋紝涓�涓眽瀛楃畻涓や釜瀛楄妭 if (bytes[i] != 0) { n++; } } } - // 如果i为奇数时,处理成偶数 + // 濡傛灉i涓哄鏁版椂锛屽鐞嗘垚鍋舵暟 if (i % 2 == 1) { - // 该UCS2字符是汉字时,去掉这个截一半的汉字 + // 璇CS2瀛楃鏄眽瀛楁椂锛屽幓鎺夎繖涓埅涓�鍗婄殑姹夊瓧 if (bytes[i - 1] != 0) { - i = i - 1;// 该UCS2字符是字母或数字,则保留该字符 + i = i - 1;// 璇CS2瀛楃鏄瓧姣嶆垨鏁板瓧锛屽垯淇濈暀璇ュ瓧绗� } else { i = i + 1; } @@ -473,7 +473,7 @@ public class StringUtil { } /** - * 分割字符串 + * 鍒嗗壊瀛楃涓� * * @param str * @return @@ -484,7 +484,7 @@ public class StringUtil { } /** - * 获取字符串中数字 + * 鑾峰彇瀛楃涓蹭腑鏁板瓧 * * @param in * @return diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/SvgUtils.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/SvgUtils.java index 8d3b92739..ce45c16da 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/SvgUtils.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/SvgUtils.java @@ -11,29 +11,29 @@ import java.util.stream.Collectors; /** - * SVG工具类,用于生成价格趋势的SVG图表 + * SVG宸ュ叿绫伙紝鐢ㄤ簬鐢熸垚浠锋牸瓒嬪娍鐨凷VG鍥捐〃 */ public class SvgUtils { - // SVG画布尺寸 + // SVG鐢诲竷灏哄 private static final int WIDTH = 800; private static final int HEIGHT = 500; private static final int PADDING = 60; - // 生成SVG折线图(支持多条线),新增decimalPlaces参数控制Y轴小数位 + // 鐢熸垚SVG鎶樼嚎鍥撅紙鏀寔澶氭潯绾匡級锛屾柊澧瀌ecimalPlaces鍙傛暟鎺у埗Y杞村皬鏁颁綅 public static String generatePriceTrendSvg(List> dataSets, List labels, String title, String subtitle, int decimalPlaces) { if (dataSets.isEmpty() || dataSets.get(0).isEmpty()) { return ""; } - // 过滤为空的数据 + // 杩囨护涓虹┖鐨勬暟鎹� dataSets = dataSets.stream() .map(innerList -> innerList.stream() .filter(priceData -> priceData != null && priceData.getPrice() != null) .collect(Collectors.toList())) .collect(Collectors.toList()); - // 计算价格和时间的范围 + // 璁$畻浠锋牸鍜屾椂闂寸殑鑼冨洿 double minPrice = dataSets.stream() .flatMap(List::stream) .filter((p) -> p != null && p.getPrice() != null) @@ -50,14 +50,14 @@ public class SvgUtils { minPrice = minPrice * (1 - buffer); maxPrice = maxPrice * (1 + buffer); - // 如果decimalPlaces为0,调整minPrice和maxPrice为整数等差 + // 濡傛灉decimalPlaces涓�0锛岃皟鏁磎inPrice鍜宮axPrice涓烘暣鏁扮瓑宸� // if (decimalPlaces == 0) { // long step = calculateStep((long) Math.ceil(maxPrice) - (long) Math.floor(minPrice)); // minPrice = Math.floor(minPrice / step) * step; // maxPrice = Math.ceil(maxPrice / step) * step; // } - // 解析最小和最大日期 + // 瑙f瀽鏈�灏忓拰鏈�澶ф棩鏈� String minYearMonth = dataSets.stream() .flatMap(List::stream) .map(PriceData::getYearmonth) @@ -69,22 +69,22 @@ public class SvgUtils { .max(String::compareTo) .orElse("2025-01"); - // 构建SVG内容 + // 鏋勫缓SVG鍐呭 StringBuilder svg = new StringBuilder(); svg.append(String.format("", WIDTH, HEIGHT)); svg.append(String.format("", WIDTH, HEIGHT)); - // 添加标题和副标题 + // 娣诲姞鏍囬鍜屽壇鏍囬 svg.append(String.format("%s", WIDTH / 2, 30, title)); svg.append(String.format("%s", WIDTH / 2, 50, subtitle)); - // 画虚线网格线和坐标轴 + // 鐢昏櫄绾跨綉鏍肩嚎鍜屽潗鏍囪酱 svg.append(drawGrid(minYearMonth, maxYearMonth, minPrice, maxPrice, decimalPlaces)); svg.append(drawAxis(minYearMonth, maxYearMonth, minPrice, maxPrice, decimalPlaces)); - // 画多条折线和图例 + // 鐢诲鏉℃姌绾垮拰鍥句緥 String[] colors = {"#66B3FF", "#FF6666", "#FFA500", "#8A2BE2"}; for (int i = 0; i < dataSets.size(); i++) { svg.append(drawSmoothLine(dataSets.get(i), minYearMonth, maxYearMonth, minPrice, maxPrice, colors[i % colors.length], decimalPlaces)); @@ -96,14 +96,14 @@ public class SvgUtils { return svg.toString(); } - // 绘制平滑折线 + // 缁樺埗骞虫粦鎶樼嚎 private static String drawSmoothLine(List data, String minYearMonth, String maxYearMonth, double minPrice, double maxPrice, String color, int decimalPlaces) { // if (data.size() < 2) return ""; StringBuilder path = new StringBuilder("", PADDING, HEIGHT - PADDING, WIDTH - PADDING, HEIGHT - PADDING)); axis.append(String.format("", PADDING, PADDING, PADDING, HEIGHT - PADDING)); - // X轴刻度 + // X杞村埢搴� int totalMonths = getMonthIndex(maxYearMonth) - getMonthIndex(minYearMonth) + 1; for (int i = 0; i < totalMonths; i++) { int x; if (totalMonths == 1) { - // 当只有一个月时,将刻度放在中间位置 + // 褰撳彧鏈変竴涓湀鏃讹紝灏嗗埢搴︽斁鍦ㄤ腑闂翠綅缃� x = PADDING + (WIDTH - 2 * PADDING) / 2; } else { x = PADDING + i * (WIDTH - 2 * PADDING) / (totalMonths - 1); @@ -196,7 +196,7 @@ public class SvgUtils { x, HEIGHT - PADDING + 20, monthLabel)); } - // Y轴刻度 + // Y杞村埢搴� double step = calculateYStep(minPrice, maxPrice, decimalPlaces); int numSteps = (int) ((maxPrice - minPrice) / step) + 1; for (int i = 0; i < numSteps; i++) { @@ -211,18 +211,18 @@ public class SvgUtils { return axis.toString(); } - // 计算Y轴步长 + // 璁$畻Y杞存闀� private static double calculateYStep(double minPrice, double maxPrice, int decimalPlaces) { double range = maxPrice - minPrice; if (decimalPlaces == 0) { return calculateStep((long) range); } - double step = range / 10.0; // 默认10个间隔 + double step = range / 10.0; // 榛樿10涓棿闅� double scale = Math.pow(10, decimalPlaces); return Math.round(step * scale) / scale; } - // 计算整数步长 + // 璁$畻鏁存暟姝ラ暱 private static long calculateStep(long range) { long step = (long) Math.pow(10, Math.floor(Math.log10(range))); if (range / step < 4) step /= 2; @@ -230,7 +230,7 @@ public class SvgUtils { return step; } - // 获取月份标签和索引(保持不变) + // 鑾峰彇鏈堜唤鏍囩鍜岀储寮曪紙淇濇寔涓嶅彉锛� private static String getMonthLabel(String minYearMonth, int offset) { int totalMonths = getMonthIndex(minYearMonth); int targetMonthIndex = totalMonths + offset; @@ -255,44 +255,44 @@ public class SvgUtils { } /** - * 对齐已有系列数据与新的时间轴 + * 瀵归綈宸叉湁绯诲垪鏁版嵁涓庢柊鐨勬椂闂磋酱 */ public static void alignSeriesData(List newCategories, List series, PriceDto.PriceTrend rentTrend) { for (PriceDto.DoubleSeries s : series) { List originalData = s.getData(); - List originalCategories = new ArrayList<>(rentTrend.getCategories()); // 假设原始时间轴可从别处获取 + List originalCategories = new ArrayList<>(rentTrend.getCategories()); // 鍋囪鍘熷鏃堕棿杞村彲浠庡埆澶勮幏鍙� List alignedData = new ArrayList<>(); - // 根据新的时间轴对齐数据 + // 鏍规嵁鏂扮殑鏃堕棿杞村榻愭暟鎹� for (String date : newCategories) { int index = originalCategories.indexOf(date); if (index >= 0 && index < originalData.size()) { alignedData.add(originalData.get(index)); } else { - alignedData.add(null); // 日期不存在时补 null + alignedData.add(null); // 鏃ユ湡涓嶅瓨鍦ㄦ椂琛� null } } s.setData(alignedData); } } - // 测试方法 + // 娴嬭瘯鏂规硶 public static void main(String[] args) { List data1 = PriceData.getSampleData(5200); List> dataSets = new ArrayList<>(); dataSets.add(data1); - String name = "新世纪大厦"; + String name = "鏂颁笘绾ぇ鍘�"; List labels = Arrays.asList(name); - String title = "价格走势图"; - String subtitle = "2024-12 至 2025-11"; + String title = "浠锋牸璧板娍鍥�"; + String subtitle = "2024-12 鑷� 2025-11"; -// // 测试小数位为2 +// // 娴嬭瘯灏忔暟浣嶄负2 // String svgWithoutDecimals = generatePriceTrendSvg(dataSets, labels, title, subtitle, 2); // System.out.println("With 2 decimal places:"); // System.out.println(svgWithoutDecimals); - // 测试小数位为0(整数等差) + // 娴嬭瘯灏忔暟浣嶄负0锛堟暣鏁扮瓑宸級 String svgWithoutDecimals = generatePriceTrendSvg(dataSets, labels, title, subtitle, 0); System.out.println("With 0 decimal places (integer steps):"); System.out.println(svgWithoutDecimals); diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/SystemUtils.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/SystemUtils.java index c5b5c5ab7..857d20f79 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/SystemUtils.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/SystemUtils.java @@ -6,23 +6,23 @@ import org.apache.commons.io.IOUtils; import org.apache.commons.lang.StringUtils; /** - * 用来检查浏览器及浏览器所在操作系统工具类 + * 鐢ㄦ潵妫�鏌ユ祻瑙堝櫒鍙婃祻瑙堝櫒鎵�鍦ㄦ搷浣滅郴缁熷伐鍏风被 * * @author liupei */ public final class SystemUtils { /** - * uc开放的固定参数 + * uc寮�鏀剧殑鍥哄畾鍙傛暟 */ public final static String UC_OPEN_PARAM = "uc_param_str"; /** - * uc开放固定的参数对应的值 + * uc寮�鏀惧浐瀹氱殑鍙傛暟瀵瑰簲鐨勫�� */ public final static String UC_OPEN_VALUE = "up"; /** - * 判断是否为UC浏览器 + * 鍒ゆ柇鏄惁涓篣C娴忚鍣� * * @param userAgent * @return @@ -37,18 +37,18 @@ public final class SystemUtils { } /** - * 根据UA检查是否为平板(简单判断) + * 鏍规嵁UA妫�鏌ユ槸鍚︿负骞虫澘(绠�鍗曞垽鏂�) * * @param userAgent * @return */ public final static boolean isTablet(String userAgent) { if (StringUtils.isNotBlank(userAgent)) { - // 是否为ipad + // 鏄惁涓篿pad if (userAgent.toLowerCase().contains("ipad")) { return true; } - // 是否android 3.*系统 + // 鏄惁android 3.*绯荤粺 String info = StringUtils.substringBetween(userAgent.toLowerCase(), "(", ")"); if (StringUtils.isNotBlank(info)) { String system = StringUtils.substringBetween(info.toLowerCase(), "android", ";"); @@ -66,7 +66,7 @@ public final class SystemUtils { } /** - * 根据UA检查是否为移动设备 + * 鏍规嵁UA妫�鏌ユ槸鍚︿负绉诲姩璁惧 * * @param userAgent * @return @@ -80,15 +80,15 @@ public final class SystemUtils { if (StringUtils.isBlank(info)) { return false; } - // 是否为iphone或者ipad + // 鏄惁涓篿phone鎴栬�卛pad if (info.contains("ipad") || info.contains("iphone")) { return true; } - // 是否为android系统 + // 鏄惁涓篴ndroid绯荤粺 if (info.contains("linux") && info.contains("android")) { return true; } - // 是否使用uc浏览器 + // 鏄惁浣跨敤uc娴忚鍣� if (userAgent.contains("ucweb")) { return true; } diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/WordUtil.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/WordUtil.java index bc0b11ddb..0df3eaa30 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/WordUtil.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/WordUtil.java @@ -41,8 +41,8 @@ import org.openxmlformats.schemas.drawingml.x2006.wordprocessingDrawing.CTInline import org.openxmlformats.schemas.wordprocessingml.x2006.main.*; /** - * 适用于word 2007 - * poi 版本 3.7 + * 閫傜敤浜巜ord 2007 + * poi 鐗堟湰 3.7 */ public class WordUtil { @@ -60,7 +60,7 @@ public class WordUtil { } for (XWPFRun run : runs1) { String text = run.getText(0); - System.out.println("text【"+text+"】"); + System.out.println("text銆�"+text+"銆�"); for (Entry entry : param.entrySet()) { String key = entry.getKey(); @@ -93,7 +93,7 @@ public class WordUtil { } for (XWPFRun run : runs1) { String text = run.getText(0); - System.out.println("text【"+text+"】"); + System.out.println("text銆�"+text+"銆�"); for (Entry entry : param.entrySet()) { String key = entry.getKey(); @@ -113,9 +113,9 @@ public class WordUtil { } /** - * 根据指定的参数值、模板,生成 word 文档 - * @param param 需要替换的变量 - * @param template 模板 + * 鏍规嵁鎸囧畾鐨勫弬鏁板�笺�佹ā鏉匡紝鐢熸垚 word 鏂囨。 + * @param param 闇�瑕佹浛鎹㈢殑鍙橀噺 + * @param template 妯℃澘 */ public static XWPFDocument generateWord(Map param, String template) { XWPFDocument doc = null; @@ -125,7 +125,7 @@ public class WordUtil { // doc = new XWPFDocument(is); doc = new XWPFDocument(POIXMLDocument.openPackage(template)); if (param != null && param.size() > 0) { - //处理段落 + //澶勭悊娈佃惤 List paragraphList = doc.getParagraphs(); processParagraphs(paragraphList, param, doc); } @@ -195,7 +195,7 @@ public class WordUtil { return runs; } /** - * 处理段落 + * 澶勭悊娈佃惤 * @param paragraphList * @throws InvalidFormatException * @throws IOException @@ -225,14 +225,14 @@ public class WordUtil { XWPFRun run = uninList.get(i); String text = run.getText(0); - System.out.println("text【"+text+"】"); - if (text != null && text.indexOf("评估表格") > -1) { + System.out.println("text銆�"+text+"銆�"); + if (text != null && text.indexOf("璇勪及琛ㄦ牸") > -1) { addTable(doc, paragraph, param); run.setText("", 0); } if(text != null && text.indexOf("${")>-1) { - if (text.equals("${项目地址}")) { + if (text.equals("${椤圭洰鍦板潃}")) { contentFm = run.getFontFamily(); contentFs = run.getFontSize(); contentTp = run.getTextPosition(); @@ -243,7 +243,7 @@ public class WordUtil { if (text.indexOf(key) != -1) { isSetText = true; Object value = entry.getValue(); - if (value instanceof String) {//文本替换 + if (value instanceof String) {//鏂囨湰鏇挎崲 System.out.println("key==" + key); text = text.replace(key, value.toString()); @@ -267,7 +267,7 @@ public class WordUtil { // paragraph.insertNewRun(i).setText(text); // } - } else if (value instanceof Map) { //图片替换 + } else if (value instanceof Map) { //鍥剧墖鏇挎崲 text = text.replace(key, ""); Map pic = (Map) value; int width = Integer.parseInt(pic.get("width").toString()); @@ -317,7 +317,7 @@ public class WordUtil { public static void addTable(XWPFDocument doc, XWPFParagraph paragraph, Map params){ XmlCursor cursor = paragraph.getCTP().newCursor(); - // 在指定游标位置插入表格 + // 鍦ㄦ寚瀹氭父鏍囦綅缃彃鍏ヨ〃鏍� XWPFTable table = doc.insertNewTbl(cursor); CTTblPr tablePr = table.getCTTbl().getTblPr(); @@ -329,23 +329,23 @@ public class WordUtil { XWPFTableCell cell = row.createCell(); CTTcPr tcpr = cell.getCTTc().addNewTcPr(); - row.getCell(0).setText("评估地址"); + row.getCell(0).setText("璇勪及鍦板潃"); row.getCell(1).setText(params.get("${address}").toString()); XWPFTableRow row1 = table.createRow(); - row1.getCell(0).setText("评估面积"); - row1.getCell(1).setText(params.get("${area}")+"㎡"); + row1.getCell(0).setText("璇勪及闈㈢Н"); + row1.getCell(1).setText(params.get("${area}")+"銕�"); XWPFTableRow row2 = table.createRow(); - row2.getCell(0).setText("评估单价"); - row2.getCell(1).setText(params.get("${avg_price}")+"元/㎡("+params.get("${ch_avg_price}")+"每平方米)"); + row2.getCell(0).setText("璇勪及鍗曚环"); + row2.getCell(1).setText(params.get("${avg_price}")+"鍏�/銕★紙"+params.get("${ch_avg_price}")+"姣忓钩鏂圭背锛�"); XWPFTableRow row3= table.createRow(); - row3.getCell(0).setText("评估总价"); - row3.getCell(1).setText(params.get("${total_price}")+"元("+params.get("${ch_total_price}")+"人民币)"); + row3.getCell(0).setText("璇勪及鎬讳环"); + row3.getCell(1).setText(params.get("${total_price}")+"鍏冿紙"+params.get("${ch_total_price}")+"浜烘皯甯侊級"); XWPFTableRow row4= table.createRow(); - row4.getCell(0).setText("评估时点"); + row4.getCell(0).setText("璇勪及鏃剁偣"); row4.getCell(1).setText(params.get("${date}").toString()); List totalRows = table.getRows(); @@ -362,11 +362,11 @@ public class WordUtil { } /** - * 设置单元格水平位置和垂直位置 + * 璁剧疆鍗曞厓鏍兼按骞充綅缃拰鍨傜洿浣嶇疆 * * @param xwpfTable - * @param verticalLoction 单元格中内容垂直上TOP,下BOTTOM,居中CENTER,BOTH两端对齐 - * @param horizontalLocation 单元格中内容水平居中center,left居左,right居右,both两端对齐 + * @param verticalLoction 鍗曞厓鏍间腑鍐呭鍨傜洿涓奣OP锛屼笅BOTTOM锛屽眳涓瑿ENTER锛孊OTH涓ょ瀵归綈 + * @param horizontalLocation 鍗曞厓鏍间腑鍐呭姘村钩灞呬腑center,left灞呭乏锛宺ight灞呭彸锛宐oth涓ょ瀵归綈 */ public static void setCellLocation(XWPFTable xwpfTable, String verticalLoction, String horizontalLocation) { List rows = xwpfTable.getRows(); @@ -383,17 +383,17 @@ public class WordUtil { // if (ctjc == null) { // ctjc = ctppr.addNewJc(); // } - //ctjc.setVal(STJc.Enum.forString(horizontalLocation)); //水平居中 - cell.setVerticalAlignment(XWPFTableCell.XWPFVertAlign.valueOf(verticalLoction));//垂直居中 + //ctjc.setVal(STJc.Enum.forString(horizontalLocation)); //姘村钩灞呬腑 + cell.setVerticalAlignment(XWPFTableCell.XWPFVertAlign.valueOf(verticalLoction));//鍨傜洿灞呬腑 } } } /** - * 设置表格位置 + * 璁剧疆琛ㄦ牸浣嶇疆 * * @param xwpfTable - * @param location 整个表格居中center,left居左,right居右,both两端对齐 + * @param location 鏁翠釜琛ㄦ牸灞呬腑center,left灞呭乏锛宺ight灞呭彸锛宐oth涓ょ瀵归綈 */ public static void setTableLocation(XWPFTable xwpfTable, String location) { CTTbl cttbl = xwpfTable.getCTTbl(); @@ -402,7 +402,7 @@ public class WordUtil { cTJc.setVal(STJc.Enum.forString(location)); } /** - * 根据图片类型,取得对应的图片类型代码 + * 鏍规嵁鍥剧墖绫诲瀷锛屽彇寰楀搴旂殑鍥剧墖绫诲瀷浠g爜 * @param picType * @return int */ @@ -424,7 +424,7 @@ public class WordUtil { return 0; } /** - * 将输入流中的数据写入字节数组 + * 灏嗚緭鍏ユ祦涓殑鏁版嵁鍐欏叆瀛楄妭鏁扮粍 * @param in * @return */ @@ -441,7 +441,7 @@ public class WordUtil { try { in.close(); } catch (Exception e2) { - System.out.println("关闭流失败"); + System.out.println("鍏抽棴娴佸け璐�"); } } } diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/XCXConstant.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/XCXConstant.java index c683373e2..59d14ee71 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/XCXConstant.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/XCXConstant.java @@ -1,8 +1,8 @@ package com.fangjia.core.util; public class XCXConstant { - public static final String APP_ID = "wx2e8d1c72a7c7c940";//小程序appId - public static final String SECRET = "5696f147a330bbc8543e6d4319984a1a";//小程序开发平台secret + public static final String APP_ID = "wx2e8d1c72a7c7c940";//灏忕▼搴廰ppId + public static final String SECRET = "5696f147a330bbc8543e6d4319984a1a";//灏忕▼搴忓紑鍙戝钩鍙皊ecret public static final String GRANT_TYPE = "authorization_code"; public static final String OPENID_URL = "https://api.weixin.qq.com/sns/jscode2session"; diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/web/view/xml/converter/XStreamDateConverter.java b/projects/fangjia-core/src/main/java/com/fangjia/core/web/view/xml/converter/XStreamDateConverter.java index c2bf944d3..63e62bcde 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/web/view/xml/converter/XStreamDateConverter.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/web/view/xml/converter/XStreamDateConverter.java @@ -6,7 +6,7 @@ import com.thoughtworks.xstream.converters.SingleValueConverter; import java.util.Date; /** - * XStream 日期转换器 + * XStream 鏃ユ湡杞崲鍣� */ public class XStreamDateConverter implements SingleValueConverter { diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/BkoffConfig.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/BkoffConfig.java index 13fc6e7f2..ae8e2af50 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/BkoffConfig.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/BkoffConfig.java @@ -93,7 +93,7 @@ public class BkoffConfig extends BaseConfiguration { } /** - * 得到网站根域名 + * 寰楀埌缃戠珯鏍瑰煙鍚� * * @return */ diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/Test.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/Test.java index 0b220010c..7884ab8ac 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/Test.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/Test.java @@ -18,17 +18,17 @@ import java.util.*; */ public class Test { List CITIES = Arrays.asList( - "广州","深圳","天津","成都","西安","杭州","武汉","南京","沈阳","福州","贵阳","宁波","石家庄","大连","昆明","苏州", - "长沙","太原","厦门","无锡","郑州","呼和浩特","兰州","济南","佛山","长春","青岛","东莞","合肥", - "泉州","包头","常德","哈尔滨","乌鲁木齐","烟台","南昌","大同","温州","银川","西宁","扬州","威海","邯郸","中山","秦皇岛","常州","湛江", - "保定","吉林","绵阳","宜昌","嘉兴","镇江","芜湖","南通","泰州","洛阳","台州","赣州","大庆","徐州","株洲","鞍山","潍坊","惠州","湖州","江门","绍兴","海口","珠海","马鞍山","柳州", - "淄博","汕头","盐城","金华","连云港", "桂林","衡阳","揭阳","茂名","平顶山","安阳","四平","漳州","上饶","宜春","德阳","东营","德州","永州", - "娄底","荆州","商丘","长治","楚雄","凉山州","迪庆州","邵阳","荆门","西双版纳州","九江","许昌","临沂", "咸阳","唐山","三亚","沧州","黔东南", - "岳阳","新余","蚌埠","嘉峪关","周口","益阳","郴州","漯河","鄂州","十堰","晋中","承德","宝鸡","怀化","日照","衡水","景德镇","开封","龙岩", - "滨州","达州","内江","三明","海东","南阳","海西州","济宁","邢台","淮安","泸州","南充","临汾","自贡","安庆","廊坊","张家口","玉林","莆田", - "北海","乌兰察布","黄山","南宁","拉萨","汉中","黄冈","河源","南平","榆林","梧州","乐山","丽水","泰安","韶关","阳江","梅州","焦作","黄石", - "潮州","新乡","肇庆","玉溪","宿迁","衢州","广元","遵义","湘潭", - "清远","丽江","昌吉","大理","襄阳","哈密","鄂尔多斯","赤峰","巴音郭楞" + "骞垮窞","娣卞湷","澶╂触","鎴愰兘","瑗垮畨","鏉窞","姝︽眽","鍗椾含","娌堥槼","绂忓窞","璐甸槼","瀹佹尝","鐭冲搴�","澶ц繛","鏄嗘槑","鑻忓窞", + "闀挎矙","澶師","鍘﹂棬","鏃犻敗","閮戝窞","鍛煎拰娴╃壒","鍏板窞","娴庡崡","浣涘北","闀挎槬","闈掑矝","涓滆帪","鍚堣偉", + "娉夊窞","鍖呭ご","甯稿痉","鍝堝皵婊�","涔岄瞾鏈ㄩ綈","鐑熷彴","鍗楁槍","澶у悓","娓╁窞","閾跺窛","瑗垮畞","鎵窞","濞佹捣","閭兏","涓北","绉︾殗宀�","甯稿窞","婀涙睙", + "淇濆畾","鍚夋灄","缁甸槼","瀹滄槍","鍢夊叴","闀囨睙","鑺滄箹","鍗楅��","娉板窞","娲涢槼","鍙板窞","璧e窞","澶у簡","寰愬窞","鏍床","闉嶅北","娼嶅潑","鎯犲窞","婀栧窞","姹熼棬","缁嶅叴","娴峰彛","鐝犳捣","椹瀺灞�","鏌冲窞", + "娣勫崥","姹曞ご","鐩愬煄","閲戝崕","杩炰簯娓�", "妗傛灄","琛¢槼","鎻槼","鑼傚悕","骞抽《灞�","瀹夐槼","鍥涘钩","婕冲窞","涓婇ザ","瀹滄槬","寰烽槼","涓滆惀","寰峰窞","姘稿窞", + "濞勫簳","鑽嗗窞","鍟嗕笜","闀挎不","妤氶泟","鍑夊北宸�","杩簡宸�","閭甸槼","鑽嗛棬","瑗垮弻鐗堢撼宸�","涔濇睙","璁告槍","涓存矀", "鍜搁槼","鍞愬北","涓変簹","娌у窞","榛斾笢鍗�", + "宀抽槼","鏂颁綑","铓屽煚","鍢夊唱鍏�","鍛ㄥ彛","鐩婇槼","閮村窞","婕渤","閯傚窞","鍗佸牥","鏅嬩腑","鎵垮痉","瀹濋浮","鎬�鍖�","鏃ョ収","琛℃按","鏅痉闀�","寮�灏�","榫欏博", + "婊ㄥ窞","杈惧窞","鍐呮睙","涓夋槑","娴蜂笢","鍗楅槼","娴疯タ宸�","娴庡畞","閭㈠彴","娣畨","娉稿窞","鍗楀厖","涓存本","鑷础","瀹夊簡","寤婂潑","寮犲鍙�","鐜夋灄","鑾嗙敯", + "鍖楁捣","涔屽叞瀵熷竷","榛勫北","鍗楀畞","鎷夎惃","姹変腑","榛勫唸","娌虫簮","鍗楀钩","姒嗘灄","姊у窞","涔愬北","涓芥按","娉板畨","闊跺叧","闃虫睙","姊呭窞","鐒︿綔","榛勭煶", + "娼窞","鏂颁埂","鑲囧簡","鐜夋邯","瀹胯縼","琛㈠窞","骞垮厓","閬典箟","婀樻江", + "娓呰繙","涓芥睙","鏄屽悏","澶х悊","瑗勯槼","鍝堝瘑","閯傚皵澶氭柉","璧ゅ嘲","宸撮煶閮" ); public static void main(String[] args) throws IOException { @@ -104,7 +104,7 @@ public class Test { headRow.createCell(4).setCellValue("City_CH"); headRow.createCell(5).setCellValue("Grid_SW_Lat_WGS84"); headRow.createCell(6).setCellValue("Grid_SW_Lon_WGS84"); - headRow.createCell(7).setCellValue("均价"); + headRow.createCell(7).setCellValue("鍧囦环"); int tc = 0; int fc = 0; @@ -177,7 +177,7 @@ public class Test { } } - String fileName = city + "-价格数据"; + String fileName = city + "-浠锋牸鏁版嵁"; if(skip > 0 || limit > 0) { if(skip == 0) { fileName = fileName + "-part1"; @@ -190,7 +190,7 @@ public class Test { } } fileName = fileName + ".xls"; -// File outFlie = new File("D:\\工作文档\\Exprian\\城市导出\\" + fileName); +// File outFlie = new File("D:\\宸ヤ綔鏂囨。\\Exprian\\鍩庡競瀵煎嚭\\" + fileName); // if(outFlie.exists()) { // outFlie.delete(); // } diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/AddressInfoController.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/AddressInfoController.java index 795666576..c2e3861fd 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/AddressInfoController.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/AddressInfoController.java @@ -25,7 +25,7 @@ public class AddressInfoController { public Object indexAction(AddressInfoModel model) { if(model.getCity()==null){ - model.setCity("全国"); + model.setCity("鍏ㄥ浗"); } if(model.getStype()==null){ model.setStype(1); @@ -88,7 +88,7 @@ public class AddressInfoController { Set set = new HashSet(); if(diss!=null&&diss.size()>0){ for (DistrictStatistics dis : diss) { - if(!dis.getCity().equals("全国")){ + if(!dis.getCity().equals("鍏ㄥ浗")){ if(dis.getCityScore()!=null){ set.add(dis.getCityScore()); map.put(dis.getCity(), dis.getCityScore()); diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/AddressScriptController.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/AddressScriptController.java index 84bd0b14d..275acc95d 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/AddressScriptController.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/AddressScriptController.java @@ -30,7 +30,7 @@ import com.fangjia.coredata.price.util.InvokeShell; import com.mongodb.BasicDBObject; /** - * 地址处理脚本控制器 + * 鍦板潃澶勭悊鑴氭湰鎺у埗鍣� * @author yinjihuan * */ @@ -42,8 +42,8 @@ public class AddressScriptController { /** - * 执行脚本 - * @param id 脚本ID + * 鎵ц鑴氭湰 + * @param id 鑴氭湰ID * @return */ public Object runAction(AddressScript script) { @@ -53,10 +53,10 @@ public class AddressScriptController { content = addressScript.getScript(); } if (StringUtils.isBlank(content)) { - return new JsonResultModel(false, "脚本找不到"); + return new JsonResultModel(false, "鑴氭湰鎵句笉鍒�"); } if (!InvokeShell.precompiler(content)) { - return new JsonResultModel(false, "脚本代码编译有问题,请仔细检查!"); + return new JsonResultModel(false, "鑴氭湰浠g爜缂栬瘧鏈夐棶棰橈紝璇蜂粩缁嗘鏌ワ紒"); } List datas = fileDetailDataService.find(script.getFileId()); for (FileDetailData data : datas) { @@ -65,7 +65,7 @@ public class AddressScriptController { newData = addressScriptService.execScript(script.getId(), data); } catch (Exception e) { } - //有修改需要进行重新评级操作 + //鏈変慨鏀归渶瑕佽繘琛岄噸鏂拌瘎绾ф搷浣� String rating = AddressAnalyUtils.addressRate(newData); newData.setRating(rating); fileDetailDataService.udpate(newData); @@ -74,25 +74,25 @@ public class AddressScriptController { } /** - * 新增脚本 - * @param id 脚本ID + * 鏂板鑴氭湰 + * @param id 鑴氭湰ID * @return */ public Object addOrUpdateScriptAction(HttpServletRequest request,AddressScript addressScript){ String userName = SessionContent.getLoginUsername(request); if(StringUtils.isBlank(addressScript.getName())){ - return new JsonResultModel(false, "脚本名称必须填写!"); + return new JsonResultModel(false, "鑴氭湰鍚嶇О蹇呴』濉啓锛�"); } if(StringUtils.isBlank(addressScript.getScript())){ - return new JsonResultModel(false, "脚本内容必须填写!"); + return new JsonResultModel(false, "鑴氭湰鍐呭蹇呴』濉啓锛�"); } List addressList = addressScriptService.findByName(addressScript.getName()); if (!InvokeShell.precompiler(addressScript.getScript())) { - return new JsonResultModel(false, "脚本代码编译有问题,请仔细检查!"); + return new JsonResultModel(false, "鑴氭湰浠g爜缂栬瘧鏈夐棶棰橈紝璇蜂粩缁嗘鏌ワ紒"); } if(StringUtils.isBlank(addressScript.getId())){ if(addressList.size()>0){ - return new JsonResultModel(false, "该脚本名称已经存在!"); + return new JsonResultModel(false, "璇ヨ剼鏈悕绉板凡缁忓瓨鍦紒"); } addressScript.setId(null); addressScript.setCreateUser(userName); @@ -103,7 +103,7 @@ public class AddressScriptController { return new JsonResultModel(true); }else{ if(addressList.size()>1){ - return new JsonResultModel(false, "该脚本名称已经存在!"); + return new JsonResultModel(false, "璇ヨ剼鏈悕绉板凡缁忓瓨鍦紒"); } BasicDBObject data = new BasicDBObject(); data.append("name", addressScript.getName()); @@ -116,7 +116,7 @@ public class AddressScriptController { } /** - * 根据文件id获取脚本列表 + * 鏍规嵁鏂囦欢id鑾峰彇鑴氭湰鍒楄〃 * @param fileId * @return */ @@ -128,7 +128,7 @@ public class AddressScriptController { } /** - * 根据脚本名称获取脚本内容 + * 鏍规嵁鑴氭湰鍚嶇О鑾峰彇鑴氭湰鍐呭 * @param fileId * @return */ @@ -145,14 +145,14 @@ public class AddressScriptController { } /** - * 删除脚本 - * @param id 脚本ID + * 鍒犻櫎鑴氭湰 + * @param id 鑴氭湰ID * @return */ public Object deleteScriptAction(HttpServletRequest request,AddressScript addressScript){ String userName = SessionContent.getLoginUsername(request); if(StringUtils.isBlank(addressScript.getId())){ - return new JsonResultModel(false, "删除失败!"); + return new JsonResultModel(false, "鍒犻櫎澶辫触!"); } BasicDBObject data = new BasicDBObject(); data.append("status",1); diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/AnalyController.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/AnalyController.java index d4ba31009..30f54412d 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/AnalyController.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/AnalyController.java @@ -92,14 +92,14 @@ public class AnalyController { private MetadataDao metadataDao = MetadataDao.getInstance(); private SeaweedDao seaweedDao = SeaweedDao.getInstance(); private RegExDao regExDao = RegExDao.getInstance(); - static final List SHANG_ZHU = Arrays.asList(new String[]{"商住", "SOHO"}); - static final List BIE_SHU = Arrays.asList(new String[]{"叠联", "叠拼", "叠墅", "叠墅", "花墅", "联排", "联院", "平墅", "独栋", "独院", "别墅", "双拼", "庄园", "MINI墅", "mini墅"}); - static final List ZHU_ZHAI = Arrays.asList(new String[]{"安置房", "板楼", "公房", "公寓", "公租房", "回迁房", "经济适用房", "经适房", "精装房", "居民小区", "老公房", "廉租房", "两限房", - "毛坯房", "民宅", "平房", "商品房", "多层", "高层", "小高层", "塔楼", "租赁房", "自住房", "自住型商品房", "大院","小区", "动迁房", "住宅", "四合院", "四仔屋", "现房", "限价房", "洋房", "洋楼", "大宅"}); + static final List SHANG_ZHU = Arrays.asList(new String[]{"鍟嗕綇", "SOHO"}); + static final List BIE_SHU = Arrays.asList(new String[]{"鍙犺仈", "鍙犳嫾", "鍙犲", "鍙犲", "鑺卞", "鑱旀帓", "鑱旈櫌", "骞冲", "鐙爧", "鐙櫌", "鍒", "鍙屾嫾", "搴勫洯", "MINI澧�", "mini澧�"}); + static final List ZHU_ZHAI = Arrays.asList(new String[]{"瀹夌疆鎴�", "鏉挎ゼ", "鍏埧", "鍏瘬", "鍏鎴�", "鍥炶縼鎴�", "缁忔祹閫傜敤鎴�", "缁忛�傛埧", "绮捐鎴�", "灞呮皯灏忓尯", "鑰佸叕鎴�", "寤夌鎴�", "涓ら檺鎴�", + "姣涘澂鎴�", "姘戝畢", "骞虫埧", "鍟嗗搧鎴�", "澶氬眰", "楂樺眰", "灏忛珮灞�", "濉旀ゼ", "绉熻祦鎴�", "鑷綇鎴�", "鑷綇鍨嬪晢鍝佹埧", "澶ч櫌","灏忓尯", "鍔ㄨ縼鎴�", "浣忓畢", "鍥涘悎闄�", "鍥涗粩灞�", "鐜版埧", "闄愪环鎴�", "娲嬫埧", "娲嬫ゼ", "澶у畢"}); static final Map> ESTYPE_BUILD_TYPE_MAP = new HashMap>(){{ - put("普通住宅", Arrays.asList(new String[]{"多层", "小高层", "高层", "超高层", "花园洋房", "老洋房", "四合院"})); - put("别墅", Arrays.asList(new String[]{"独栋", "双拼", "叠加", "联排"})); - put("商住", Arrays.asList(new String[]{"多层", "小高层", "高层", "超高层", "独栋", "双拼", "叠加", "联排"})); + put("鏅�氫綇瀹�", Arrays.asList(new String[]{"澶氬眰", "灏忛珮灞�", "楂樺眰", "瓒呴珮灞�", "鑺卞洯娲嬫埧", "鑰佹磱鎴�", "鍥涘悎闄�"})); + put("鍒", Arrays.asList(new String[]{"鐙爧", "鍙屾嫾", "鍙犲姞", "鑱旀帓"})); + put("鍟嗕綇", Arrays.asList(new String[]{"澶氬眰", "灏忛珮灞�", "楂樺眰", "瓒呴珮灞�", "鐙爧", "鍙屾嫾", "鍙犲姞", "鑱旀帓"})); }}; @@ -128,14 +128,14 @@ public class AnalyController { resultMap.put("region", region); } resultMap.putAll(Analyzer.getInstance().analy(content, fieldRuleList)); - // 是否有未定义字段 + // 鏄惁鏈夋湭瀹氫箟瀛楁 String undefinedField = Analyzer.getInstance().getUndefinedField(definedFields, resultMap); if (undefinedField != null) { - throw new Exception(undefinedField + "未定义"); + throw new Exception(undefinedField + "鏈畾涔�"); } - // 把字段标准化 + // 鎶婂瓧娈垫爣鍑嗗寲 Analyzer.getInstance().formatToStandardValue(resultMap, city, model.getCategory(), definedFields); - // 根据数据库规则验证字段 + // 鏍规嵁鏁版嵁搴撹鍒欓獙璇佸瓧娈� Map resultExceptionMap = Analyzer.getInstance().validatorAll(resultMap, city, model.getCategory()); model.setAnalyResultMap(resultMap); @@ -159,17 +159,17 @@ public class AnalyController { Map resultMap = new HashMap(); resultMap.put("city", webpage.getCity()); resultMap.putAll(Analyzer.getInstance().analy(webpage.getContent(), fieldRuleList)); - // 是否有未定义字段 + // 鏄惁鏈夋湭瀹氫箟瀛楁 String undefinedField = Analyzer.getInstance().getUndefinedField(definedFields, resultMap); if (undefinedField != null) { - throw new Exception(undefinedField + "未定义"); + throw new Exception(undefinedField + "鏈畾涔�"); } - // 把字段标准化 + // 鎶婂瓧娈垫爣鍑嗗寲 Analyzer.getInstance() .formatToStandardValue(resultMap, webpage.getCity(), model.getCategory(), definedFields); - // 删除无效字段 + // 鍒犻櫎鏃犳晥瀛楁 Analyzer.getInstance().removeInvalidValueField(resultMap, webpage.getCategory()); - // 根据数据库规则验证字段 + // 鏍规嵁鏁版嵁搴撹鍒欓獙璇佸瓧娈� Map resultExceptionMap = Analyzer.getInstance().validatorAll(resultMap, webpage.getCity(), webpage.getCategory()); model.setResultExceptionMap(resultExceptionMap); @@ -194,7 +194,7 @@ public class AnalyController { } /** - * 批量解析测试 + * 鎵归噺瑙f瀽娴嬭瘯 * @param model * @return */ @@ -207,7 +207,7 @@ public class AnalyController { List analyListModels = new ArrayList(); Map> fieldTypeMap = new HashMap>(); - Map fieldTypes = new HashMap();//总的字段map + Map fieldTypes = new HashMap();//鎬荤殑瀛楁map for(String id : ids) { AnalyListModel analyListModel = parsePage(model.getCatType(), id, model.getCategory(), model.getSiteName(), model.getPageName()); String category = analyListModel.getCategory(); @@ -247,15 +247,15 @@ public class AnalyController { Map resultMap = new HashMap(); resultMap.put("city", city); resultMap.putAll(Analyzer.getInstance().analy(content, fieldRuleList)); - // 是否有未定义字段 + // 鏄惁鏈夋湭瀹氫箟瀛楁 String undefinedField = Analyzer.getInstance().getUndefinedField(definedFields, resultMap); if (undefinedField != null) { - throw new Exception(undefinedField + "未定义"); + throw new Exception(undefinedField + "鏈畾涔�"); } - // 把字段标准化 + // 鎶婂瓧娈垫爣鍑嗗寲 Analyzer.getInstance().formatToStandardValue(resultMap, city, category, definedFields); - // 根据数据库规则验证字段 + // 鏍规嵁鏁版嵁搴撹鍒欓獙璇佸瓧娈� Map resultExceptionMap = Analyzer.getInstance().validatorAll(resultMap, city, category); model.setAnalyResultMap(resultMap); model.setResultExceptionMap(resultExceptionMap); @@ -278,17 +278,17 @@ public class AnalyController { Map resultMap = new HashMap(); resultMap.put("city", webpage.getCity()); resultMap.putAll(Analyzer.getInstance().analy(webpage.getContent(), fieldRuleList)); - // 是否有未定义字段 + // 鏄惁鏈夋湭瀹氫箟瀛楁 String undefinedField = Analyzer.getInstance().getUndefinedField(definedFields, resultMap); if (undefinedField != null) { - throw new Exception(undefinedField + "未定义"); + throw new Exception(undefinedField + "鏈畾涔�"); } - // 把字段标准化 + // 鎶婂瓧娈垫爣鍑嗗寲 Analyzer.getInstance() .formatToStandardValue(resultMap, webpage.getCity(), webpage.getCategory(), definedFields); - // 删除无效字段 + // 鍒犻櫎鏃犳晥瀛楁 Analyzer.getInstance().removeInvalidValueField(resultMap, webpage.getCategory()); - // 根据数据库规则验证字段 + // 鏍规嵁鏁版嵁搴撹鍒欓獙璇佸瓧娈� Map resultExceptionMap = Analyzer.getInstance().validatorAll(resultMap, webpage.getCity(), webpage.getCategory()); model.setResultExceptionMap(resultExceptionMap); @@ -370,18 +370,18 @@ public class AnalyController { private void parseData(String url, Map anaMap, List definedFields, AnalyModel model) { try { Map resultMap = new HashMap(); - resultMap.put("city", "测试"); + resultMap.put("city", "娴嬭瘯"); resultMap.putAll(anaMap); - // 是否有未定义字段 + // 鏄惁鏈夋湭瀹氫箟瀛楁 String undefinedField = Analyzer.getInstance().getUndefinedField(definedFields, resultMap); if (undefinedField != null) { - throw new Exception(undefinedField + "未定义"); + throw new Exception(undefinedField + "鏈畾涔�"); } - // 把字段标准化 - Analyzer.getInstance().formatToStandardValue(resultMap, "测试", model.getCategory(), definedFields); - // 根据数据库规则验证字段 - Map resultExceptionMap = Analyzer.getInstance().validatorAll(resultMap, "测试", + // 鎶婂瓧娈垫爣鍑嗗寲 + Analyzer.getInstance().formatToStandardValue(resultMap, "娴嬭瘯", model.getCategory(), definedFields); + // 鏍规嵁鏁版嵁搴撹鍒欓獙璇佸瓧娈� + Map resultExceptionMap = Analyzer.getInstance().validatorAll(resultMap, "娴嬭瘯", model.getCategory()); model.setAnalyResultMap(resultMap); model.setResultExceptionMap(resultExceptionMap); @@ -442,9 +442,9 @@ public class AnalyController { List baiduSearch(String city,String name) { List dbObjects = new ArrayList(); String orgName= name; - name = name.toString().replace("小区","").replace("住宅",""); - if("延边".equals(city)){ - city = "延边朝鲜族自治州"; + name = name.toString().replace("灏忓尯","").replace("浣忓畢",""); + if("寤惰竟".equals(city)){ + city = "寤惰竟鏈濋矞鏃忚嚜娌诲窞"; } JSONObject resp = BaiDuApiUtils.search(city, name, null, 2, 10, 0); boolean isFound = false; @@ -487,7 +487,7 @@ public class AnalyController { dbo.append("tag",detailInfo.get("tag")); dbo.append("detailUrl",detailInfo.get("detail_url")); } - String itemName = dbo.getString("name").replace(".","").replace("·",""); + String itemName = dbo.getString("name").replace(".","").replace("路",""); if(!isFound){ dbObjects.add(dbo); }else if(isFound && name.equals(itemName)){ @@ -592,7 +592,7 @@ public class AnalyController { || StringUtils.isBlank(model.getPageName()) || model.getCities() == null || model.getCities().size() == 0) { - dataMap.put("err", "参数不能为空"); + dataMap.put("err", "鍙傛暟涓嶈兘涓虹┖"); ret.setJsonModel(dataMap); return ret; } @@ -600,14 +600,14 @@ public class AnalyController { Website website = websiteDao.findWebsite(model.getCategory(), model.getSiteName()); if (website == null) { - dataMap.put("err", "没有定义该网站"); + dataMap.put("err", "娌℃湁瀹氫箟璇ョ綉绔�"); ret.setJsonModel(dataMap); return ret; } List> relatedJobs = website.getRelatedJobs(); if (relatedJobs == null) { - dataMap.put("err", "该网站没有与任务页面进行关联"); + dataMap.put("err", "璇ョ綉绔欐病鏈変笌浠诲姟椤甸潰杩涜鍏宠仈"); ret.setJsonModel(dataMap); return ret; } @@ -620,17 +620,17 @@ public class AnalyController { } if (!bool) { - dataMap.put("err", "该网站没有此页面"); + dataMap.put("err", "璇ョ綉绔欐病鏈夋椤甸潰"); ret.setJsonModel(dataMap); return ret; } if (StringUtils.isBlank(model.getSelector()) || TypeEnum.parseType(model.getType()) == null) { - dataMap.put("err", "选择器错误"); + dataMap.put("err", "閫夋嫨鍣ㄩ敊璇�"); ret.setJsonModel(dataMap); return ret; } else if (TypeEnum.ATTR.getType().equals(model.getType()) && StringUtils.isBlank(model.getAttr())) { - dataMap.put("err", "选择器错误"); + dataMap.put("err", "閫夋嫨鍣ㄩ敊璇�"); ret.setJsonModel(dataMap); return ret; } @@ -643,14 +643,14 @@ public class AnalyController { } for (String s : selector.getSelector().split(",")) { if (!JQueryUtil.isValidSeletor(s)) { - dataMap.put("err", s + " 不能被jsoup支持!"); + dataMap.put("err", s + " 涓嶈兘琚玧soup鏀寔!"); ret.setJsonModel(dataMap); return ret; } } if (!InvokeShell.precompiler(model.getScript())) { - dataMap.put("err", "脚本代码编译有问题,请仔细检查!"); + dataMap.put("err", "鑴氭湰浠g爜缂栬瘧鏈夐棶棰橈紝璇蜂粩缁嗘鏌ワ紒"); ret.setJsonModel(dataMap); return ret; } @@ -664,7 +664,7 @@ public class AnalyController { long count = fieldRuleDao.findCount(q); if (count > 0) { - dataMap.put("err", "该字段已存在!"); + dataMap.put("err", "璇ュ瓧娈靛凡瀛樺湪锛�"); ret.setJsonModel(dataMap); return ret; } else { @@ -817,7 +817,7 @@ public class AnalyController { HSSFWorkbook wb = new HSSFWorkbook(); Sheet sheet = wb.createSheet(); Row row = sheet.createRow(0); - String[] headers = new String[]{"序号", "城市", "区域", "名称", "网站量", "CPDB库", "数据状态", "审核状态", "审核时间", "更新时间", "住宅比","地图库对比结果"}; + String[] headers = new String[]{"搴忓彿", "鍩庡競", "鍖哄煙", "鍚嶇О", "缃戠珯閲�", "CPDB搴�", "鏁版嵁鐘舵��", "瀹℃牳鐘舵��", "瀹℃牳鏃堕棿", "鏇存柊鏃堕棿", "浣忓畢姣�","鍦板浘搴撳姣旂粨鏋�"}; for(int i = 0; i < headers.length; i++){ row.createCell(i).setCellValue(headers[i]); } @@ -830,60 +830,60 @@ public class AnalyController { row.createCell(3).setCellValue(analySite.getDistrictName()); row.createCell(4).setCellValue(analySite.getSiteCount()); if(analySite.getExists() == 1){ - row.createCell(5).setCellValue("存在"); + row.createCell(5).setCellValue("瀛樺湪"); }else{ - row.createCell(5).setCellValue("不存在"); + row.createCell(5).setCellValue("涓嶅瓨鍦�"); } String dataStatus; switch (analySite.getDataStatus()){ - case 0:dataStatus = "正常";break; - case 1:dataStatus = "人工删除";break; - case 2:dataStatus = "区域错误";break; - case 3:dataStatus = "被别名关联";break; - case 4:dataStatus = "名称错误";break; - case 5:dataStatus = "百度判定删除";break; - case 6:dataStatus = "CPDB删除";break; - case 7:dataStatus = "物业不匹配删除";break; - default:dataStatus ="未知"; + case 0:dataStatus = "姝e父";break; + case 1:dataStatus = "浜哄伐鍒犻櫎";break; + case 2:dataStatus = "鍖哄煙閿欒";break; + case 3:dataStatus = "琚埆鍚嶅叧鑱�";break; + case 4:dataStatus = "鍚嶇О閿欒";break; + case 5:dataStatus = "鐧惧害鍒ゅ畾鍒犻櫎";break; + case 6:dataStatus = "CPDB鍒犻櫎";break; + case 7:dataStatus = "鐗╀笟涓嶅尮閰嶅垹闄�";break; + default:dataStatus ="鏈煡"; } row.createCell(6).setCellValue(dataStatus); if(analySite.getAuditStatus() == 0){ - row.createCell(7).setCellValue("未审核"); + row.createCell(7).setCellValue("鏈鏍�"); }else if(analySite.getAuditStatus() == 1){ - row.createCell(7).setCellValue("已审核"); + row.createCell(7).setCellValue("宸插鏍�"); }else if(analySite.getAuditStatus() == 4){ - row.createCell(7).setCellValue("已审阅"); + row.createCell(7).setCellValue("宸插闃�"); } if(analySite.getAuditDate() != null){ - row.createCell(8).setCellValue(DateUtil.formatByPattern(analySite.getAuditDate(),"yyyy年MM月dd日")); + row.createCell(8).setCellValue(DateUtil.formatByPattern(analySite.getAuditDate(),"yyyy骞碝M鏈坉d鏃�")); } if(analySite.getModifiedDate() != null){ - row.createCell(9).setCellValue(DateUtil.formatByPattern(analySite.getModifiedDate(),"yyyy年MM月dd日")); + row.createCell(9).setCellValue(DateUtil.formatByPattern(analySite.getModifiedDate(),"yyyy骞碝M鏈坉d鏃�")); } row.createCell(10).setCellValue(analySite.getDistrictRatio() + "%"); if(analySite.getCompareResult() != null){ if("exist".equals(analySite.getCompareResult())){ - row.createCell(11).setCellValue("地图库存在"); + row.createCell(11).setCellValue("鍦板浘搴撳瓨鍦�"); }else if("not_exist".equals(analySite.getCompareResult())){ - row.createCell(11).setCellValue("地图库不存在"); + row.createCell(11).setCellValue("鍦板浘搴撲笉瀛樺湪"); }else if("diff_region".equals(analySite.getCompareResult())){ - row.createCell(11).setCellValue("区域不一致"+ analySite.getDiffRegion()); + row.createCell(11).setCellValue("鍖哄煙涓嶄竴鑷�"+ analySite.getDiffRegion()); }else if("alias_exist".equals(analySite.getCompareResult())){ - row.createCell(11).setCellValue("是"+ analySite.getAliasName() +"的别名"); + row.createCell(11).setCellValue("鏄�"+ analySite.getAliasName() +"鐨勫埆鍚�"); } } } String fileName = DateUtils.formatDate(new Date(), "yyyyMMddHHmmss") + ".xls"; try { response.setCharacterEncoding("UTF-8"); - //response.reset();// 清空输出流 + //response.reset();// 娓呯┖杈撳嚭娴� response.setContentType("application/x-download;charset=UTF-8"); fileName = new String(fileName.getBytes("GBK"),"ISO-8859-1"); - if(fileName.length()>150){//解决IE 6.0 bug + if(fileName.length()>150){//瑙e喅IE 6.0 bug fileName = new String(fileName.getBytes("GBK"),"ISO-8859-1"); } response.setHeader( "Content-Disposition", "attachment;filename=" + fileName); - os = response.getOutputStream();// 取得输出流 + os = response.getOutputStream();// 鍙栧緱杈撳嚭娴� wb.write(os); os.flush(); }catch (Exception e) { @@ -1111,7 +1111,7 @@ public class AnalyController { // map.put(bo.getSiteName(), bo); // analyRoadBoList.add(bo); // } else { - // // 别名网站 + // // 鍒悕缃戠珯 // if (bo.getStatus() == AnalyRoad.StatusEnum.SUC.getValue() && // model.getCategory().equals(bo.getCategory()) // && !bo.getDistrictName().equals(model.getDistrictName())) { @@ -1588,7 +1588,7 @@ public class AnalyController { } } - //整合排序功能 + //鏁村悎鎺掑簭鍔熻兘 List webpages = new ArrayList(); if (StringUtils.isNotBlank(model.getUrl())) { model.setUrl(model.getUrl().trim()); @@ -1645,7 +1645,7 @@ public class AnalyController { if (StringUtils.isBlank(model.getCategory()) || StringUtils.isBlank(model.getSiteName()) || StringUtils.isBlank(model.getPageName()) || CollectionUtils.isEmpty(model.getAnalyFields()) || CollectionUtils.isEmpty(model.getCities())) { - dataMap.put("err", "缺失必填字段"); + dataMap.put("err", "缂哄け蹇呭~瀛楁"); ret.setJsonModel(dataMap); return ret; } @@ -1655,7 +1655,7 @@ public class AnalyController { List fieldRuleList = fieldRuleDao.findAllFieldRule(model.getCategory(), model.getSiteName(), model.getPageName()); if (fieldRuleList.size() == 0) { - dataMap.put("err", "该类型的网站和页面无解析规则"); + dataMap.put("err", "璇ョ被鍨嬬殑缃戠珯鍜岄〉闈㈡棤瑙f瀽瑙勫垯"); ret.setJsonModel(dataMap); return ret; } @@ -1673,7 +1673,7 @@ public class AnalyController { if (errCities.size() > 5) { errCities = errCities.subList(0, 5); } - dataMap.put("err", StringUtils.join(errCities, ",") + "等" + c + "个城市无解析规则"); + dataMap.put("err", StringUtils.join(errCities, ",") + "绛�" + c + "涓煄甯傛棤瑙f瀽瑙勫垯"); ret.setJsonModel(dataMap); return ret; } @@ -1690,7 +1690,7 @@ public class AnalyController { } int ignoreCount = model.getCities().size() - targetCities.size(); - dataMap.put("msg", "忽略" + ignoreCount + "个无网页城市," + targetCities.size() + "个城市的任务加入解析队列"); + dataMap.put("msg", "蹇界暐" + ignoreCount + "涓棤缃戦〉鍩庡競锛�" + targetCities.size() + "涓煄甯傜殑浠诲姟鍔犲叆瑙f瀽闃熷垪"); ret.setJsonModel(dataMap); return ret; } @@ -1795,7 +1795,7 @@ public class AnalyController { udata.put("audit_status", 1); udata.put("data_status", 1); analySiteDao.updateById(udata, id); - // 删除 + // 鍒犻櫎 if (status == 3) { AnalySite analySite = analySiteDao.findById(id); if (analySite.getExists() == 1) { @@ -1823,7 +1823,7 @@ public class AnalyController { Map dataMap = new HashMap(); ret.setJsonModel(dataMap); if(null == model.getIds() || model.getIds().isEmpty()){ - dataMap.put("msg", "请选择数据"); + dataMap.put("msg", "璇烽�夋嫨鏁版嵁"); }else{ int count = 0; List analySiteList = analySiteDao.findAllByIds(model.getIds()); @@ -1837,7 +1837,7 @@ public class AnalyController { } } } - dataMap.put("msg", "入库成功!总共入库" + count + "个小区"); + dataMap.put("msg", "鍏ュ簱鎴愬姛!鎬诲叡鍏ュ簱" + count + "涓皬鍖�"); } return ret; } @@ -1859,11 +1859,11 @@ public class AnalyController { if(estateTypes.size() == 1){ seaweed.setAlias(new ArrayList(Arrays.asList(new String[]{orgName}))); }else{ - if(estateType.contains("商住") && orgName.contains("商住")){ + if(estateType.contains("鍟嗕綇") && orgName.contains("鍟嗕綇")){ seaweed.setAlias(new ArrayList(Arrays.asList(new String[]{orgName}))); - }else if(estateType.contains("别墅") && orgName.contains("别墅")){ + }else if(estateType.contains("鍒") && orgName.contains("鍒")){ seaweed.setAlias(new ArrayList(Arrays.asList(new String[]{orgName}))); - }else if("普通住宅".equals(estateType) && !orgName.contains("别墅") && !orgName.contains("商住")){ + }else if("鏅�氫綇瀹�".equals(estateType) && !orgName.contains("鍒") && !orgName.contains("鍟嗕綇")){ seaweed.setAlias(new ArrayList(Arrays.asList(new String[]{orgName}))); } } @@ -1879,16 +1879,16 @@ public class AnalyController { } seaweed.setAddress(getOptimalAddress(analySite.getCity(), analySite.getRegion(), orgName)); for(String alia : alias){ - if("别墅".equals(estateType)){ - if(alia.contains("别墅") && !seaweed.getAlias().contains(alia)){ + if("鍒".equals(estateType)){ + if(alia.contains("鍒") && !seaweed.getAlias().contains(alia)){ seaweed.getAlias().add(alia); } - }else if("商住".equals(estateType)){ - if(alia.contains("商住") && !seaweed.getAlias().contains(alia)){ + }else if("鍟嗕綇".equals(estateType)){ + if(alia.contains("鍟嗕綇") && !seaweed.getAlias().contains(alia)){ seaweed.getAlias().add(alia); } }else{ - if("普通住宅".equals(estateType) && !seaweed.getAlias().contains(alia) && !alia.contains("商住") && !alia.contains("别墅")){ + if("鏅�氫綇瀹�".equals(estateType) && !seaweed.getAlias().contains(alia) && !alia.contains("鍟嗕綇") && !alia.contains("鍒")){ seaweed.getAlias().add(alia); } } @@ -1903,7 +1903,7 @@ public class AnalyController { return seaweeds; } - static Pattern FULL_ADDRESS = Pattern.compile("^.+(路|街道|街|大道|巷|道|里|((一|二|三|四|五|六|七|八|九|十|东|南|西|北|复)线))(交汇|.*段)?(((\\d+号*(~|-|~|、|,|-))*\\d+(号))|((\\d+弄))).*"); + static Pattern FULL_ADDRESS = Pattern.compile("^.+(璺瘄琛楅亾|琛梶澶ч亾|宸穦閬搢閲寍((涓�|浜寍涓墊鍥泑浜攟鍏瓅涓億鍏珅涔潀鍗亅涓渱鍗梶瑗縷鍖梶澶�)绾�))(浜ゆ眹|.*娈�)?(((\\d+鍙�*(~|-|锝瀨銆亅,|锛�))*\\d+(鍙�))|((\\d+寮�))).*"); boolean isStandardAddress(String addr){ return FULL_ADDRESS.matcher(addr).find(); } @@ -1933,7 +1933,7 @@ public class AnalyController { if (betterAddress == null) { for (Object address : fetchList) { - if (address.toString().contains("交汇") || address.toString().contains("交口") || address.toString().contains("交叉")) { + if (address.toString().contains("浜ゆ眹") || address.toString().contains("浜ゅ彛") || address.toString().contains("浜ゅ弶")) { if (betterAddress == null || address.toString().length() < betterAddress.length()) { betterAddress = address.toString(); } @@ -1950,7 +1950,7 @@ public class AnalyController { } if (betterAddress != null) { - betterAddress = betterAddress.replaceAll("(\\(|().*(\\)|))", ""); + betterAddress = betterAddress.replaceAll("(\\(|锛�).*(\\)|锛�)", ""); betterAddress = DataUtil.removeHtml(betterAddress); betterAddress = OpenApiClient.formateAddress(city, betterAddress); } @@ -1965,9 +1965,9 @@ public class AnalyController { for (Object b : crawlerBuildingTypes) { String bStr = b.toString(); for (String s : standardBuildTypes) { - if ("高层".equals(s) && bStr.contains(s)) { - int idx1 = bStr.indexOf("高层"); - int idx2 = bStr.indexOf("小高层"); + if ("楂樺眰".equals(s) && bStr.contains(s)) { + int idx1 = bStr.indexOf("楂樺眰"); + int idx2 = bStr.indexOf("灏忛珮灞�"); if (idx2 == -1 || idx2 != idx1 - 1) { if(!buildingTypes.contains(s)){ buildingTypes.add(s); @@ -1983,19 +1983,19 @@ public class AnalyController { return buildingTypes; } - static Pattern ROAD_PATTERN = Pattern.compile("^.+(路|街道|街|大道|巷|道|里|((一|二|三|四|五|六|七|八|九|十|东|南|西|北|复)线))(\\d+(号|弄))+$"); + static Pattern ROAD_PATTERN = Pattern.compile("^.+(璺瘄琛楅亾|琛梶澶ч亾|宸穦閬搢閲寍((涓�|浜寍涓墊鍥泑浜攟鍏瓅涓億鍏珅涔潀鍗亅涓渱鍗梶瑗縷鍖梶澶�)绾�))(\\d+(鍙穦寮�))+$"); String formateDistrictName(String city, String region, String name, String estateType){ String formateName = name; - if("别墅".equals(estateType) && !name.contains("别墅")){ - formateName = formateName + "别墅"; + if("鍒".equals(estateType) && !name.contains("鍒")){ + formateName = formateName + "鍒"; } - if("商住".equals(estateType) && !name.contains("商住")){ - formateName = formateName + "商住楼"; + if("鍟嗕綇".equals(estateType) && !name.contains("鍟嗕綇")){ + formateName = formateName + "鍟嗕綇妤�"; } if(ROAD_PATTERN.matcher(name).find()){ - formateName = formateName + "小区"; + formateName = formateName + "灏忓尯"; } if(name.startsWith(city) && name.length() - city.length() > 2){ formateName = name.replaceFirst(city, ""); @@ -2003,7 +2003,7 @@ public class AnalyController { if(formateName.startsWith(region) && formateName.length() - region.length() > 2){ formateName = formateName.replaceFirst(region, ""); } - formateName = formateName.replace("。", "").replace("\"", "").replace("·","").replace(".", ""); + formateName = formateName.replace("銆�", "").replace("\"", "").replace("路","").replace(".", ""); return formateName; } @@ -2012,8 +2012,8 @@ public class AnalyController { List getEstateType(String city, String region, String name) { Set estateTypes = new HashSet(); - if(name.contains("别墅")){ - estateTypes.add("别墅"); + if(name.contains("鍒")){ + estateTypes.add("鍒"); return new ArrayList(estateTypes); } boolean isShangZhu = false; @@ -2024,7 +2024,7 @@ public class AnalyController { } } if(isShangZhu){ - estateTypes.add("商住"); + estateTypes.add("鍟嗕綇"); return new ArrayList(estateTypes); } @@ -2034,25 +2034,25 @@ public class AnalyController { String t = type.toString(); for (String bieShu : BIE_SHU) { if (t.contains(bieShu)) { - estateTypes.add("别墅"); + estateTypes.add("鍒"); break; } } for (String shangZhu : SHANG_ZHU) { if (t.contains(shangZhu)) { - estateTypes.add("商住"); + estateTypes.add("鍟嗕綇"); break; } } for (String zhuZhai : ZHU_ZHAI) { if (t.contains(zhuZhai)) { - estateTypes.add("普通住宅"); + estateTypes.add("鏅�氫綇瀹�"); break; } } } if(estateTypes.isEmpty()){ - estateTypes.add("普通住宅"); + estateTypes.add("鏅�氫綇瀹�"); } return new ArrayList(estateTypes); } @@ -2224,7 +2224,7 @@ public class AnalyController { } Map allFieldsMap = new LinkedHashMap(); - allFieldsMap.put("creationDate", "时间"); + allFieldsMap.put("creationDate", "鏃堕棿"); List fieldTypeList = FieldTypeDao.getInstance().findByCategory(category); for (FieldType ft : fieldTypeList) { allFieldsMap.put(ft.getName(), ft.getDisplay()); @@ -2232,10 +2232,10 @@ public class AnalyController { List> detais = new ArrayList>(); - // 添加第一行 + // 娣诲姞绗竴琛� List fisteRow = new ArrayList(); fisteRow.add(new Info("", false)); - fisteRow.add(new Info("数据库", false)); + fisteRow.add(new Info("鏁版嵁搴�", false)); for (Map.Entry map : scoreMapList) { String key = map.getKey(); @@ -2351,7 +2351,7 @@ public class AnalyController { Pattern pattern = Pattern.compile("^[0-9]*[1-9][0-9]*$"); Map allFieldsMap = new LinkedHashMap(); - allFieldsMap.put("creationDate", "时间"); + allFieldsMap.put("creationDate", "鏃堕棿"); // allFieldsMap.putAll(BkoffConfig.getConfig().getDistrictRequiredFields()); // if (category.equals("shop")) { // allFieldsMap.putAll(BkoffConfig.getConfig().getShopOptionalFields()); @@ -2367,7 +2367,7 @@ public class AnalyController { } List> detais = new ArrayList>(); - // 数据库 + // 鏁版嵁搴� Map ret = new HashMap(); for (String field : allFieldsMap.keySet()) { @@ -2406,7 +2406,7 @@ public class AnalyController { String key = map.getKey(); Float score = map.getValue(); String url = ""; - // 抓取结果 + // 鎶撳彇缁撴灉 for (int i = 0; i < analyRoadBoList.size(); i++) { AnalyRoadBo analyRoadBo = analyRoadBoList.get(i); if (analyRoadBo.getResults() == null || analyRoadBo.getResults().size() == 0) { @@ -2459,7 +2459,7 @@ public class AnalyController { if(StringUtils.isBlank(s)){ String car_site = (String) analyRoadBo.getResults().get("car_site"); if (StringUtils.isNotBlank(car_site)) { - if(car_site.length()>2 && car_site.indexOf("个")==(car_site.length()-1)){ + if(car_site.length()>2 && car_site.indexOf("涓�")==(car_site.length()-1)){ car_site = car_site.substring(0, car_site.length()-1); if(pattern.matcher(car_site).find()){ s = car_site; @@ -2635,7 +2635,7 @@ public class AnalyController { return ret; } - //查询小区方法 + //鏌ヨ灏忓尯鏂规硶 public Object districtSearchAction(AnalyModel model) { if (StringUtils.isBlank(model.getCity()) && StringUtils.isBlank(model.getKeyword())) { return model; @@ -2695,7 +2695,7 @@ public class AnalyController { return model; } - //更新别名 + //鏇存柊鍒悕 public Object updateAliasAction(AnalyModel model){ DBObject obj = new BasicDBObject(); if(StringUtils.isNotBlank(model.getId())){ @@ -2717,7 +2717,7 @@ public class AnalyController { return "success"; } - //更新地址 + //鏇存柊鍦板潃 public Object updateAddressAction(AnalyModel model){ DBObject obj = new BasicDBObject(); if(StringUtils.isNotBlank(model.getId())){ @@ -2731,7 +2731,7 @@ public class AnalyController { return "success"; } - //查询小区 + //鏌ヨ灏忓尯 public Object districtSearchResultAction(AnalyModel model){ if (StringUtils.isBlank(model.getCity()) && StringUtils.isBlank(model.getKeyword())) { return model; @@ -2789,8 +2789,8 @@ public class AnalyController { /* public enum AnaMode { - COMMON("common", "普通模式"), - LIST("list", "列表模式"); + COMMON("common", "鏅�氭ā寮�"), + LIST("list", "鍒楄〃妯″紡"); private String mode; private String desc; diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiController.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiController.java index 56a91fa7a..40aed7e1e 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiController.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiController.java @@ -35,18 +35,18 @@ public class ApiController { private FieldTypeDao fieldTypeDao = FieldTypeDao.getInstance(); public Object analyDistrictsAction(ApiModel model) throws Exception { - //校验参数 + //鏍¢獙鍙傛暟 if(StringUtils.isBlank(model.getVars()) || StringUtils.isBlank(model.getConditions())) { Map exceptionMap = new HashMap(); - exceptionMap.put("exception", "参数不足"); + exceptionMap.put("exception", "鍙傛暟涓嶈冻"); return exceptionMap; } - //拼接请求抓取系统的参数 + //鎷兼帴璇锋眰鎶撳彇绯荤粺鐨勫弬鏁� Map params = new HashMap(); params.put("vars", model.getVars()); params.put("conditions", model.getConditions()); List jobList = new ArrayList(); - //没有传jobId,则抓取所有jobId相关的页面;否则,只抓对应jobId的页面 + //娌℃湁浼爅obId锛屽垯鎶撳彇鎵�鏈塲obId鐩稿叧鐨勯〉闈紱鍚﹀垯锛屽彧鎶撳搴攋obId鐨勯〉闈� if(StringUtils.isBlank(model.getJobId())) { List crawlTemplates = CrawlTemplateDao.getInstance().findWithCategory("sell"); for(CrawlTemplate crawlTemplate : crawlTemplates) { @@ -56,12 +56,12 @@ public class ApiController { jobList.add(model.getJobId()); } params.put("jobList", JSONArray.fromObject(jobList).toString()); - //请求抓取系统,以获取每个jobId所对应的抓取页面 + //璇锋眰鎶撳彇绯荤粺锛屼互鑾峰彇姣忎釜jobId鎵�瀵瑰簲鐨勬姄鍙栭〉闈� HttpRequest httpRequest = new HttpRequest(); String postResp = httpRequest.post(bkoffConfig.getCrawlApiUrl(), params, bkoffConfig.getCrawlApiEncoding()); if(postResp == null) { Map exceptionMap = new HashMap(); - exceptionMap.put("exception", "抓取失败"); + exceptionMap.put("exception", "鎶撳彇澶辫触"); return exceptionMap; } JSONObject jsonObject = JSONObject.fromObject(postResp); @@ -72,7 +72,7 @@ public class ApiController { List> result = new ArrayList>(); for(Object key : metadatas.keySet()) { String jobId = (String)key; - String pageName = "详情"; + String pageName = "璇︽儏"; Website website = websiteDao.findOne(new BasicDBObject("related_jobs.job_id", jobId)); if(website == null) { continue; @@ -112,15 +112,15 @@ public class ApiController { try { resultMap.put("city", city); resultMap.putAll(Analyzer.getInstance().analy(content, fieldRuleList)); - // 是否有未定义字段 + // 鏄惁鏈夋湭瀹氫箟瀛楁 String undefinedField = Analyzer.getInstance().getUndefinedField(definedFields, resultMap); if (undefinedField != null) { - throw new Exception(undefinedField + "未定义"); + throw new Exception(undefinedField + "鏈畾涔�"); } - // 把字段标准化 + // 鎶婂瓧娈垫爣鍑嗗寲 Analyzer.getInstance().formatToStandardValue(resultMap, city, category, definedFields); - // 根据数据库规则验证字段 + // 鏍规嵁鏁版嵁搴撹鍒欓獙璇佸瓧娈� //Map resultExceptionMap = Analyzer.getInstance().validatorAll(resultMap, city, category); // result.put("resultMap", resultMap); diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/AvgPriceAnalyController.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/AvgPriceAnalyController.java index 9e4745ee5..efd1c8992 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/AvgPriceAnalyController.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/AvgPriceAnalyController.java @@ -78,18 +78,18 @@ public class AvgPriceAnalyController { HSSFWorkbook wb = createSimpleExcel(); //Date weekend = DateUtil.getFirstDayOfWeek(new Date()); - String fileName = "样本.xls"; + String fileName = "鏍锋湰.xls"; try { HttpServletResponse response = ActionContext.getContext().getResponse(); response.setCharacterEncoding("UTF-8"); - //response.reset();// 清空输出流 + //response.reset();// 娓呯┖杈撳嚭娴� response.setContentType("application/x-download;charset=UTF-8"); fileName = new String(fileName.getBytes("GBK"),"ISO-8859-1"); - if(fileName.length()>150){//解决IE 6.0 bug + if(fileName.length()>150){//瑙e喅IE 6.0 bug fileName = new String(fileName.getBytes("GBK"),"ISO-8859-1"); } response.setHeader( "Content-Disposition", "attachment;filename=" + fileName); - os = response.getOutputStream();// 取得输出流 + os = response.getOutputStream();// 鍙栧緱杈撳嚭娴� wb.write(os); os.flush(); }catch (Exception e) { @@ -113,14 +113,14 @@ public class AvgPriceAnalyController { if(StringUtils.isBlank(model.getFileName())){ - System.out.println("请选择文件"); + System.out.println("璇烽�夋嫨鏂囦欢"); return null; } Map fileMap = getFileName(request); List fileNames = (List) fileMap.get("fileNames"); if(!fileNames.contains(model.getFileName())){ - System.out.println("上传文件不存在,请重新上传!"); + System.out.println("涓婁紶鏂囦欢涓嶅瓨鍦紝璇烽噸鏂颁笂浼狅紒"); return null; } @@ -148,14 +148,14 @@ public class AvgPriceAnalyController { try { HttpServletResponse response = ActionContext.getContext().getResponse(); response.setCharacterEncoding("UTF-8"); - //response.reset();// 清空输出流 + //response.reset();// 娓呯┖杈撳嚭娴� response.setContentType("application/x-download;charset=UTF-8"); fileName = new String(fileName.getBytes("GBK"),"ISO-8859-1"); - if(fileName.length()>150){//解决IE 6.0 bug + if(fileName.length()>150){//瑙e喅IE 6.0 bug fileName = new String(fileName.getBytes("GBK"),"ISO-8859-1"); } response.setHeader( "Content-Disposition", "attachment;filename=" + fileName); - os = response.getOutputStream();// 取得输出流 + os = response.getOutputStream();// 鍙栧緱杈撳嚭娴� wb.write(os); os.flush(); }catch (Exception e) { @@ -195,7 +195,7 @@ public class AvgPriceAnalyController { JsonModel ret = new JsonModel(); Map data = new HashMap(); if(StringUtils.isBlank(model.getFileName())){ - data.put("info", "请选择文件"); + data.put("info", "璇烽�夋嫨鏂囦欢"); ret.setJsonModel(data); return ret; } @@ -203,7 +203,7 @@ public class AvgPriceAnalyController { Map fileMap = getFileName(request); List fileNames = (List) fileMap.get("fileNames"); if(!fileNames.contains(model.getFileName())){ - data.put("info", "上传文件不存在,请重新上传!"); + data.put("info", "涓婁紶鏂囦欢涓嶅瓨鍦紝璇烽噸鏂颁笂浼狅紒"); ret.setJsonModel(data); return ret; } @@ -235,7 +235,7 @@ public class AvgPriceAnalyController { private Map getFileName(HttpServletRequest request){ String uploadFilePath = request.getSession().getServletContext().getRealPath("/WEB-INF/upload"); System.out.println("controller: "+uploadFilePath); - List fileNames = listfile(new File(uploadFilePath));//File既可以代表一个文件也可以代 + List fileNames = listfile(new File(uploadFilePath));//File鏃㈠彲浠ヤ唬琛ㄤ竴涓枃浠朵篃鍙互浠� Map map = new HashMap(); map.put("uploadPath", uploadFilePath); map.put("fileNames", fileNames); @@ -244,7 +244,7 @@ public class AvgPriceAnalyController { private List> readUploadFile(String uploadPath, String fileName) throws InvalidFormatException, IOException{ - //读取要下载的文件,保存到文件输入流 + //璇诲彇瑕佷笅杞界殑鏂囦欢锛屼繚瀛樺埌鏂囦欢杈撳叆娴� FileInputStream in = new FileInputStream(uploadPath + "/" + fileName); List> lists = parseData(in, fileName); @@ -255,14 +255,14 @@ public class AvgPriceAnalyController { public List listfile(File file){ - //列出该目录下的所有文件和目录 + //鍒楀嚭璇ョ洰褰曚笅鐨勬墍鏈夋枃浠跺拰鐩綍 File files[] = file.listFiles(); if(files == null){ return null; } - //遍历files[]数组 + //閬嶅巻files[]鏁扮粍 List fileNames = new ArrayList(); for(File f : files){ if(f.isFile()){ @@ -278,25 +278,25 @@ public class AvgPriceAnalyController { private HSSFWorkbook createSimpleExcel(){ HSSFWorkbook wb = new HSSFWorkbook(); HSSFSheet s = wb.createSheet(); - wb.setSheetName(0, "样本"); + wb.setSheetName(0, "鏍锋湰"); HSSFRow onerow = s.createRow(0); - onerow.createCell(0).setCellValue("城市"); - onerow.createCell(1).setCellValue("区域"); - onerow.createCell(2).setCellValue("楼盘名称"); - onerow.createCell(3).setCellValue("调查价格"); + onerow.createCell(0).setCellValue("鍩庡競"); + onerow.createCell(1).setCellValue("鍖哄煙"); + onerow.createCell(2).setCellValue("妤肩洏鍚嶇О"); + onerow.createCell(3).setCellValue("璋冩煡浠锋牸"); HSSFRow row1 = s.createRow(1); - row1.createCell(0).setCellValue("上海"); - row1.createCell(1).setCellValue("长宁"); - row1.createCell(2).setCellValue("新泾三村"); + row1.createCell(0).setCellValue("涓婃捣"); + row1.createCell(1).setCellValue("闀垮畞"); + row1.createCell(2).setCellValue("鏂版尘涓夋潙"); row1.createCell(3).setCellValue("45000"); return wb; } private HSSFWorkbook createExcel(List bos){ HSSFWorkbook wb = new HSSFWorkbook(); - Sheet sheet = wb.createSheet("数据"); + Sheet sheet = wb.createSheet("鏁版嵁"); setHeader(sheet, wb); for(PriceAnalyBo bo : bos){ @@ -359,86 +359,86 @@ public class AvgPriceAnalyController { sheet.addMergedRegion(new CellRangeAddress(0, 1, 0, 0)); HSSFCell cell = row.createCell(0); - cell.setCellValue("城市"); + cell.setCellValue("鍩庡競"); cell.setCellStyle(cellStyle); sheet.addMergedRegion(new CellRangeAddress(0, 1, 1, 1)); HSSFCell cell0_1 = row.createCell(1); - cell0_1.setCellValue("区域"); + cell0_1.setCellValue("鍖哄煙"); cell0_1.setCellStyle(cellStyle); sheet.addMergedRegion(new CellRangeAddress(0, 1, 2, 2)); HSSFCell cell0 = row.createCell(2); - cell0.setCellValue("楼盘名称"); + cell0.setCellValue("妤肩洏鍚嶇О"); cell0.setCellStyle(cellStyle); sheet.addMergedRegion(new CellRangeAddress(0, 1, 3, 3)); HSSFCell cell1 = row.createCell(3); - cell1.setCellValue("人工调查价格"); + cell1.setCellValue("浜哄伐璋冩煡浠锋牸"); cell1.setCellStyle(cellStyle); sheet.addMergedRegion(new CellRangeAddress(0, 1, 4, 4)); HSSFCell cell2 = row.createCell(4); - cell2.setCellValue("系统计算价格"); + cell2.setCellValue("绯荤粺璁$畻浠锋牸"); cell2.setCellStyle(cellStyle); sheet.addMergedRegion(new CellRangeAddress(0, 0, 5, 7)); HSSFCell cell3 = row.createCell(5); - cell3.setCellValue("近一个月"); + cell3.setCellValue("杩戜竴涓湀"); cell3.setCellStyle(cellStyle); HSSFRow row1 = (HSSFRow) sheet.createRow(1); HSSFCell cell31 = row1.createCell(5); - cell31.setCellValue("样本量"); + cell31.setCellValue("鏍锋湰閲�"); cell31.setCellStyle(cellStyle); HSSFCell cell32 = row1.createCell(6); - cell32.setCellValue("人工调查分析(%)"); + cell32.setCellValue("浜哄伐璋冩煡鍒嗘瀽(锛�)"); cell32.setCellStyle(cellStyle); HSSFCell cell33 = row1.createCell(7); - cell33.setCellValue("系统计算分析(%)"); + cell33.setCellValue("绯荤粺璁$畻鍒嗘瀽(锛�)"); cell33.setCellStyle(cellStyle); sheet.addMergedRegion(new CellRangeAddress(0, 0, 8, 10)); HSSFCell cell4 = row.createCell(8); - cell4.setCellValue("近6个月"); + cell4.setCellValue("杩�6涓湀"); cell4.setCellStyle(cellStyle); HSSFCell cell41 = row1.createCell(8); - cell41.setCellValue("样本量"); + cell41.setCellValue("鏍锋湰閲�"); cell41.setCellStyle(cellStyle); HSSFCell cell42 = row1.createCell(9); - cell42.setCellValue("人工调查分析(%)"); + cell42.setCellValue("浜哄伐璋冩煡鍒嗘瀽(锛�)"); cell42.setCellStyle(cellStyle); HSSFCell cell43 = row1.createCell(10); - cell43.setCellValue("系统计算分析(%)"); + cell43.setCellValue("绯荤粺璁$畻鍒嗘瀽(锛�)"); cell43.setCellStyle(cellStyle); sheet.addMergedRegion(new CellRangeAddress(0, 0, 11, 13)); HSSFCell cell6 = row.createCell(11); - cell6.setCellValue("历史所有"); + cell6.setCellValue("鍘嗗彶鎵�鏈�"); cell6.setCellStyle(cellStyle); HSSFCell cell61 = row1.createCell(11); - cell61.setCellValue("样本量"); + cell61.setCellValue("鏍锋湰閲�"); cell61.setCellStyle(cellStyle); HSSFCell cell62 = row1.createCell(12); - cell62.setCellValue("人工调查分析(%)"); + cell62.setCellValue("浜哄伐璋冩煡鍒嗘瀽(锛�)"); cell62.setCellStyle(cellStyle); HSSFCell cell63 = row1.createCell(13); - cell63.setCellValue("系统计算分析(%)"); + cell63.setCellValue("绯荤粺璁$畻鍒嗘瀽(锛�)"); cell63.setCellStyle(cellStyle); } @@ -581,7 +581,7 @@ public class AvgPriceAnalyController { if (POIXMLDocument.hasOOXMLHeader(inp)) { return new XSSFWorkbook(OPCPackage.open(inp)); } - throw new IllegalArgumentException("你的excel版本目前poi解析不了"); + throw new IllegalArgumentException("浣犵殑excel鐗堟湰鐩墠poi瑙f瀽涓嶄簡"); } } diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/BkoffRoleController.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/BkoffRoleController.java index 8074ed6eb..67383e589 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/BkoffRoleController.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/BkoffRoleController.java @@ -20,7 +20,7 @@ import com.fangjia.bkoff.service.address.RoleService; import com.fangjia.bkoff.service.address.RoleServiceImpl; import com.fangjia.core.util.PageBean; /** - * 后台角色管理控制器 + * 鍚庡彴瑙掕壊绠$悊鎺у埗鍣� * @author yinjihuan * */ @@ -34,18 +34,18 @@ public class BkoffRoleController { private AuthorityService authorityService = new AuthorityServiceImpl(); /** - * 角色管理页面 + * 瑙掕壊绠$悊椤甸潰 * @param model * @return */ public Object indexAction(RoleModel model) { try { - //角色信息 + //瑙掕壊淇℃伅 PageBean pageBean = roleService.queryRolesByPage(model.getPageBean().getCurrentPage(), 10); List roles = pageBean.getList(); model.setPageBean(new PageBean(pageBean.getStart(), pageBean.getLimit(), roles, pageBean.getTotalRecords())); - //设置权限信息 + //璁剧疆鏉冮檺淇℃伅 List groupInfos = new ArrayList(); List groups = authorityGroupService.queryGroups(); for (AuthorityGroup group : groups) { @@ -56,13 +56,13 @@ public class BkoffRoleController { } model.setGroupInfos(groupInfos); } catch (Exception e) { - LOGGER.error("角色管理页面查询异常", e); + LOGGER.error("瑙掕壊绠$悊椤甸潰鏌ヨ寮傚父", e); } return model; } /** - * 查询角色信息 + * 鏌ヨ瑙掕壊淇℃伅 * @param role * @return */ @@ -71,13 +71,13 @@ public class BkoffRoleController { List roles = roleService.queryAllRole(); return new JsonResultModel(true, roles); } catch (Exception e) { - LOGGER.error("查询的角色信息异常", e); + LOGGER.error("鏌ヨ鐨勮鑹蹭俊鎭紓甯�", e); return new JsonResultModel(false, e.getMessage()); } } /** - * 保存角色 + * 淇濆瓨瑙掕壊 * @param role * @return */ @@ -86,14 +86,14 @@ public class BkoffRoleController { role.setCreateDate(new Date()); roleService.saveRole(role); } catch (Exception e) { - LOGGER.error("保存角色异常", e); + LOGGER.error("淇濆瓨瑙掕壊寮傚父", e); return new JsonResultModel(false, e.getMessage()); } return new JsonResultModel(true); } /** - * 修改角色 + * 淇敼瑙掕壊 * @param role * @return */ @@ -101,19 +101,19 @@ public class BkoffRoleController { try { Role old = roleService.getRole(role.getId()); if (old == null) { - return new JsonResultModel(false, "要修改的角色不存在"); + return new JsonResultModel(false, "瑕佷慨鏀圭殑瑙掕壊涓嶅瓨鍦�"); } role.setCreateDate(old.getCreateDate()); roleService.updateRole(role); } catch (Exception e) { - LOGGER.error("修改角色异常", e); + LOGGER.error("淇敼瑙掕壊寮傚父", e); return new JsonResultModel(false, e.getMessage()); } return new JsonResultModel(true); } /** - * 查询角色下的权限 + * 鏌ヨ瑙掕壊涓嬬殑鏉冮檺 * @param role * @return */ @@ -121,11 +121,11 @@ public class BkoffRoleController { try { Role old = roleService.getRole(role.getId()); if (old == null) { - return new JsonResultModel(false, "角色不存在"); + return new JsonResultModel(false, "瑙掕壊涓嶅瓨鍦�"); } return new JsonResultModel(true, authorityService.queryAuthoritys(old.getAuthoritys())); } catch (Exception e) { - LOGGER.error("查询角色下的权限异常", e); + LOGGER.error("鏌ヨ瑙掕壊涓嬬殑鏉冮檺寮傚父", e); return new JsonResultModel(false, e.getMessage()); } } diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/BkoffUserController.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/BkoffUserController.java index a18b962a5..1c00eb7e8 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/BkoffUserController.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/BkoffUserController.java @@ -20,7 +20,7 @@ import com.fangjia.bkoff.service.address.UserServiceImpl; import com.fangjia.core.util.PageBean; /** - * 后台用户管理控制器 + * 鍚庡彴鐢ㄦ埛绠$悊鎺у埗鍣� * @author yinjihuan * */ @@ -33,7 +33,7 @@ public class BkoffUserController { /** - * 进入登录页面 + * 杩涘叆鐧诲綍椤甸潰 * @return */ public Object loginAction() { @@ -41,16 +41,16 @@ public class BkoffUserController { } /** - * 用户登录后台 + * 鐢ㄦ埛鐧诲綍鍚庡彴 * @param user * @return */ public Object userLoginAction(User user, HttpServletRequest request) { if (StringUtils.isBlank(user.getUsername())) { - return new JsonResultModel(false, "用户名不能为空"); + return new JsonResultModel(false, "鐢ㄦ埛鍚嶄笉鑳戒负绌�"); } if (StringUtils.isBlank(user.getPass())) { - return new JsonResultModel(false, "密码不能为空"); + return new JsonResultModel(false, "瀵嗙爜涓嶈兘涓虹┖"); } //goojia goojia123456 if (user.getUsername().equals("goojia") && user.getPass().equals("9b6a4eb49d1f33c59dc7a3918fc6ef57")) { @@ -58,11 +58,11 @@ public class BkoffUserController { request.getSession().setAttribute("login_name", "goojia"); return new JsonResultModel(true); } - return new JsonResultModel(false, "用户名密码错误"); + return new JsonResultModel(false, "鐢ㄦ埛鍚嶅瘑鐮侀敊璇�"); } /** - * 用户管理页面 + * 鐢ㄦ埛绠$悊椤甸潰 * @param model * @return */ @@ -81,36 +81,36 @@ public class BkoffUserController { model.setRoles(roleService.queryAllRole()); model.setPageBean(new PageBean(pageBean.getStart(), pageBean.getLimit(), list, pageBean.getTotalRecords())); } catch (Exception e) { - LOGGER.error("用户管理页面查询异常", e); + LOGGER.error("鐢ㄦ埛绠$悊椤甸潰鏌ヨ寮傚父", e); } return model; } /** - * 删除用户 + * 鍒犻櫎鐢ㄦ埛 * @param user * @return */ public Object removeAction(User user) { if (StringUtils.isBlank(user.getId())) { - return new JsonResultModel(false, "id不能为空"); + return new JsonResultModel(false, "id涓嶈兘涓虹┖"); } try { User old = userService.getUser(user.getId()); if (old == null) { - return new JsonResultModel(false, "要删除的用户不存在"); + return new JsonResultModel(false, "瑕佸垹闄ょ殑鐢ㄦ埛涓嶅瓨鍦�"); } userService.removeUser(user.getId()); - LOGGER.info("删除用户:" + old.getUsername()); + LOGGER.info("鍒犻櫎鐢ㄦ埛锛�" + old.getUsername()); } catch (Exception e) { - LOGGER.error("删除用户异常", e); + LOGGER.error("鍒犻櫎鐢ㄦ埛寮傚父", e); return new JsonResultModel(false, e.getMessage()); } return new JsonResultModel(true); } /** - * 添加用户 + * 娣诲姞鐢ㄦ埛 * @param user * @return */ @@ -118,26 +118,26 @@ public class BkoffUserController { try { User old = userService.getUserByUsername(user.getUsername()); if (old != null) { - return new JsonResultModel(false, "用户名已存在"); + return new JsonResultModel(false, "鐢ㄦ埛鍚嶅凡瀛樺湪"); } if(user.getRoles() == null) { - return new JsonResultModel(false, "角色不能为空"); + return new JsonResultModel(false, "瑙掕壊涓嶈兘涓虹┖"); } Date date = new Date(); user.setCreateDate(date); user.setUpdateDate(date); - //默认密码为123456 + //榛樿瀵嗙爜涓�123456 user.setPass("e10adc3949ba59abbe56e057f20f883e"); userService.saveUser(user); } catch (Exception e) { - LOGGER.error("添加用户异常", e); + LOGGER.error("娣诲姞鐢ㄦ埛寮傚父", e); return new JsonResultModel(false, e.getMessage()); } return new JsonResultModel(true); } /** - * 修改用户 + * 淇敼鐢ㄦ埛 * @param user * @return */ @@ -145,10 +145,10 @@ public class BkoffUserController { try { User old = userService.getUser(user.getId()); if (old == null) { - return new JsonResultModel(false, "此用户不存在"); + return new JsonResultModel(false, "姝ょ敤鎴蜂笉瀛樺湪"); } if(user.getRoles() == null) { - return new JsonResultModel(false, "角色不能为空"); + return new JsonResultModel(false, "瑙掕壊涓嶈兘涓虹┖"); } Date date = new Date(); user.setUpdateDate(date); @@ -158,14 +158,14 @@ public class BkoffUserController { } userService.updateUser(user); } catch (Exception e) { - LOGGER.error("修改用户异常", e); + LOGGER.error("淇敼鐢ㄦ埛寮傚父", e); return new JsonResultModel(false, e.getMessage()); } return new JsonResultModel(true); } /** - * 退出系统 + * 閫�鍑虹郴缁� * @param request * @param model * @return @@ -177,7 +177,7 @@ public class BkoffUserController { } /** - * 检测城市是否被别人使用中 + * 妫�娴嬪煄甯傛槸鍚﹁鍒汉浣跨敤涓� * @param user * @return */ diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/CalcController.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/CalcController.java index 59d0bda1c..267c42d57 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/CalcController.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/CalcController.java @@ -212,9 +212,9 @@ public class CalcController { } public static void main(String[] args) throws MongoException, IOException { - BasicDBObject q = new BasicDBObject("city", "昆明"); - q.put("region", "盘龙"); - q.put("district_name", "MOMA艺术造城"); + BasicDBObject q = new BasicDBObject("city", "鏄嗘槑"); + q.put("region", "鐩橀緳"); + q.put("district_name", "MOMA鑹烘湳閫犲煄"); DBIterator iter = StorehouseDB.getInstance().iteratorSell(q, DateUtil.parseDate("2011-01-01", "yyyy-MM-dd"), new Date()); while (iter != null && iter.hasNext()) { @@ -225,7 +225,7 @@ public class CalcController { } /** - * 删除样本 + * 鍒犻櫎鏍锋湰 * * @param model * @return @@ -263,7 +263,7 @@ public class CalcController { aliasNames.addAll(district.getAlias()); } Map idDateMap = new LinkedHashMap(); - // 如果是县级市,则不考虑区域 + // 濡傛灉鏄幙绾у競,鍒欎笉鑰冭檻鍖哄煙 if (serverAreaDao.isCountyLevelCity(city)) { for (String districtName : aliasNames) { BasicDBObject q = new BasicDBObject("city", districtKey.getCity()); diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/DistrictController.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/DistrictController.java index 4253a1e02..55cb3874d 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/DistrictController.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/DistrictController.java @@ -90,7 +90,7 @@ public class DistrictController { // districtDao.saveDistrict(udata); seaweedDao.saveData(udata); } else { - dataMap.put("err", "该小区已存在!"); + dataMap.put("err", "璇ュ皬鍖哄凡瀛樺湪锛�"); ret.setJsonModel(dataMap); } @@ -107,19 +107,19 @@ public class DistrictController { BasicDBObject obj = new BasicDBObject(); obj.put("audit_date", new Date()); if("districtFound".equals(model.getFrom())){ - obj.put("audit_status", 2);//状态修改为已审核 小区发现后台 + obj.put("audit_status", 2);//鐘舵�佷慨鏀逛负宸插鏍� 灏忓尯鍙戠幇鍚庡彴 String ip = (String) ThreadLocalData.getInstance().get(ThreadLocalKey.Ip); obj.put("ip",ip); foundDistrictDao.update(Arrays.asList(new String[]{model.getFoundId()}), obj); FoundDistrict foundDistrict = foundDistrictDao.findById(model.getFoundId()); if(foundDistrict != null && foundDistrict.getAnalySiteId() != null){ obj.remove("ip"); - obj.put("audit_status", 1);//状态修改为已审核 对比后台 + obj.put("audit_status", 1);//鐘舵�佷慨鏀逛负宸插鏍� 瀵规瘮鍚庡彴 analySiteDao.updateById(obj, analySite.getId()); } }else if(analySite != null){ - obj.put("audit_status", 1);//状态修改为已审核 + obj.put("audit_status", 1);//鐘舵�佷慨鏀逛负宸插鏍� analySiteDao.updateById(obj, analySite.getId()); } @@ -366,7 +366,7 @@ public class DistrictController { } /** - * name 小区名称 去除首尾空格 + * name 灏忓尯鍚嶇О 鍘婚櫎棣栧熬绌烘牸 */ private String NameValidator(String name) { if (StringUtils.isNotBlank(name)) { diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/DynamicController.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/DynamicController.java index 52824b148..417fdf398 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/DynamicController.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/DynamicController.java @@ -75,7 +75,7 @@ public class DynamicController { }else{ date = DateUtil.formatToYYYYMMDD(model.getQueryDate()); } - //二手房源总体情况 + //浜屾墜鎴挎簮鎬讳綋鎯呭喌 AnalyTotalResult sellResult = analyTotalResultDao.findTotalResult("sell", date); if(sellResult!=null){ model.setSellTotal(sellResult.getTotal()); @@ -87,7 +87,7 @@ public class DynamicController { model.setSellGiveUpNum(sellResult.getGiveupNum()); model.setSellAnalyErrorNum(sellResult.getAnalyErrorNum()); } - //租房总体情况 + //绉熸埧鎬讳綋鎯呭喌 AnalyTotalResult rentResult = analyTotalResultDao.findTotalResult("rent", date); if(rentResult!=null){ model.setRentTotal(rentResult.getTotal()); @@ -210,7 +210,7 @@ public class DynamicController { model.setSiteList(analySiteList); - //二手房 + //浜屾墜鎴� model.setSellTotal(sellTotal); String ratio = "0"; if(sellTotal>0){ @@ -223,7 +223,7 @@ public class DynamicController { model.setSellUpDateNum(sellUpdateNum); model.setSellGiveUpNum(sellGiveUpNum); model.setSellAnalyErrorNum(sellAnalyErrorNum); - //租房总体情况 + //绉熸埧鎬讳綋鎯呭喌 model.setRentTotal(rentTotal); String ratio2 = "0"; if(rentTotal>0){ @@ -240,7 +240,7 @@ public class DynamicController { } /** - * 总的解析结果详细 + * 鎬荤殑瑙f瀽缁撴灉璇︾粏 * @param model * @return */ @@ -270,7 +270,7 @@ public class DynamicController { } /** - * 错误信息详细页面 + * 閿欒淇℃伅璇︾粏椤甸潰 * @param model * @return */ @@ -281,7 +281,7 @@ public class DynamicController { } /** - * 错误信息详细页面 + * 閿欒淇℃伅璇︾粏椤甸潰 * @param model * @return */ @@ -292,7 +292,7 @@ public class DynamicController { } /** - * 获取错误信息的url链接 + * 鑾峰彇閿欒淇℃伅鐨剈rl閾炬帴 * @param model * @return */ @@ -333,7 +333,7 @@ public class DynamicController { } /** - * 获取解析错误的内容 + * 鑾峰彇瑙f瀽閿欒鐨勫唴瀹� * @param model * @return */ diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/ExperianController.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/ExperianController.java index d0d7eae0f..39342dfa3 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/ExperianController.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/ExperianController.java @@ -22,7 +22,7 @@ import java.util.*; /** - * 客户导出数据临时验证使用,数据验证后,可以删除 + * 瀹㈡埛瀵煎嚭鏁版嵁涓存椂楠岃瘉浣跨敤锛屾暟鎹獙璇佸悗锛屽彲浠ュ垹闄� */ public class ExperianController { @@ -166,12 +166,12 @@ public class ExperianController { headRow.createCell(5).setCellValue("Grid_SW_Lat_WGS84"); headRow.createCell(6).setCellValue("Grid_SW_Lon_WGS84"); headRow.createCell(7).setCellValue("format_city"); - headRow.createCell(8).setCellValue("百度经度"); - headRow.createCell(9).setCellValue("百度纬度"); - headRow.createCell(10).setCellValue("格子价格"); - headRow.createCell(11).setCellValue("价格类型"); - headRow.createCell(12).setCellValue("格子内小区"); - headRow.createCell(13).setCellValue("价格小区"); + headRow.createCell(8).setCellValue("鐧惧害缁忓害"); + headRow.createCell(9).setCellValue("鐧惧害绾害"); + headRow.createCell(10).setCellValue("鏍煎瓙浠锋牸"); + headRow.createCell(11).setCellValue("浠锋牸绫诲瀷"); + headRow.createCell(12).setCellValue("鏍煎瓙鍐呭皬鍖�"); + headRow.createCell(13).setCellValue("浠锋牸灏忓尯"); int c = 0; while(cur.hasNext()) { @@ -260,7 +260,7 @@ public class ExperianController { OutputStream os = null; BufferedOutputStream fos = null; - String fileName = model.getCity() + "价格数据"; + String fileName = model.getCity() + "浠锋牸鏁版嵁"; if(model.getSkip() > 0 || model.getLimit() > 0) { if(model.getSkip() == 0) { fileName = fileName + "-part1"; @@ -280,7 +280,7 @@ public class ExperianController { response.setContentType("application/x-download;charset=UTF-8"); fileName = new String(fileName.getBytes("GBK"),"ISO-8859-1"); response.setHeader( "Content-Disposition", "attachment;filename=" + fileName); - os = response.getOutputStream();// 取得输出流 + os = response.getOutputStream();// 鍙栧緱杈撳嚭娴� wb.write(os); os.flush(); }catch (Exception e) { diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/FileReportController.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/FileReportController.java index 914f7c6d8..4607164b3 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/FileReportController.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/FileReportController.java @@ -48,18 +48,18 @@ import java.util.*; public class FileReportController { - private static final String[] columns = {"城市", "区域", "小区名称","地址", "面积"}; + private static final String[] columns = {"鍩庡競", "鍖哄煙", "灏忓尯鍚嶇О","鍦板潃", "闈㈢Н"}; private static final String[] titles = { - "城市", "区域", "小区名称", "地址", "面积", "地址评级", "匹配城市", "匹配区域", "匹配小区名", "小区均价", "均价计算方式", - "周涨跌幅", "是否有经纬度", "物业类型", "总价", "未匹配原因", "小区编号", "均价可信度", - "房估估均价", "云估价均价", "链家均价", "安居客均价", "赶集网均价", "搜房网均价", "兔博士均价", "价格对比","最终价格" + "鍩庡競", "鍖哄煙", "灏忓尯鍚嶇О", "鍦板潃", "闈㈢Н", "鍦板潃璇勭骇", "鍖归厤鍩庡競", "鍖归厤鍖哄煙", "鍖归厤灏忓尯鍚�", "灏忓尯鍧囦环", "鍧囦环璁$畻鏂瑰紡", + "鍛ㄦ定璺屽箙", "鏄惁鏈夌粡绾害", "鐗╀笟绫诲瀷", "鎬讳环", "鏈尮閰嶅師鍥�", "灏忓尯缂栧彿", "鍧囦环鍙俊搴�", + "鎴夸及浼板潎浠�", "浜戜及浠峰潎浠�", "閾惧鍧囦环", "瀹夊眳瀹㈠潎浠�", "璧堕泦缃戝潎浠�", "鎼滄埧缃戝潎浠�", "鍏斿崥澹潎浠�", "浠锋牸瀵规瘮","鏈�缁堜环鏍�" }; private FileDatasTotalityService fileDatasTotalityService = FileDatasTotalityServiceImpl.getInstance(); private UserService userService = new UserServiceImpl(); private FileDetailDataService fileDetailDataService = new FileDetailDataServiceImpl(); private AddressScriptService addressScriptService = new AddressScriptServiceImpl(); - //列表页 + //鍒楄〃椤� public Object indexAction(FileReportModel model){ Pager pager = model.getPager(10); pager.setTotalRows(fileDatasTotalityService.findCountByParams(model.getCategory(), model.getStartDate(), model.getEndDate(), model.getStatus(), model.getFileName(), model.getOldFileName())); @@ -89,7 +89,7 @@ public class FileReportController { return model; } - //详情页 + //璇︽儏椤� public Object showAction(FileReportModel model){ Pager pager = model.getPager(10); FileDatasTotality fileDatasTotality = fileDatasTotalityService.findFileDatasTotalityById(model.getFileId()); @@ -161,7 +161,7 @@ public class FileReportController { } /** - * 人工修改数据 + * 浜哄伐淇敼鏁版嵁 * @param model * @param request * @return @@ -175,28 +175,28 @@ public class FileReportController { public Object analyAction(FileReportModel model){ FileDatasTotality fileDatasTotality = fileDatasTotalityService.findFileDatasTotalityById(model.getId()); - //地址未匹配原因分布数据 + //鍦板潃鏈尮閰嶅師鍥犲垎甯冩暟鎹� Map noMatchReasonData = new HashMap(); for (int i = 1; i < 9; i++) { String desc = FileDetailData.NoMatchReasonEnum.parse(i).getReasonDesc(); noMatchReasonData.put(desc, fileDatasTotalityService.findNoMatchCount(model.getId(), i)); } - //最终匹配率 + //鏈�缁堝尮閰嶇巼 model.setOverMatchRate(fileDatasTotalityService.getOverMatchRate(model.getId())); model.setNoMatchReasonData(noMatchReasonData); - //周涨跌幅区间数据 + //鍛ㄦ定璺屽箙鍖洪棿鏁版嵁 model.setWeekMarkUpData(fileDatasTotalityService.getWeekMarkUpData(model.getId())); model.setFileDatasTotality(fileDatasTotality); - //均价与调查价差比分布 + //鍧囦环涓庤皟鏌ヤ环宸瘮鍒嗗竷 model.setAvgAndRealPriceMarkUp(fileDatasTotalityService.getAvgAndRealPriceMarkUpData(model.getId())); model.setChatTitle(ChatConfig.WEEKTITILE); return model; } /** - * 柱形图详情数据查看 + * 鏌卞舰鍥捐鎯呮暟鎹煡鐪� * @param model * @return */ @@ -214,14 +214,14 @@ public class FileReportController { PageBean page = fileDatasTotalityService.finAvgAndRealPriceDataDetails(model.getId(), model.getQueryIndex(), pager.getStartRow(), pager.getPageSize()); pager.setTotalRows((int)page.getTotalRecords()); datas = page.getList(); - model.setNoMatchReasonText("均价与调查价差比" + ChatConfig.WEEKTITILE.get(model.getQueryIndex())); + model.setNoMatchReasonText("鍧囦环涓庤皟鏌ヤ环宸瘮" + ChatConfig.WEEKTITILE.get(model.getQueryIndex())); } if(model.getQueryType() == 1) { PageBean page = fileDatasTotalityService.findWeekMarkUpFileDataDetails(model.getId(), model.getQueryIndex(), pager.getStartRow(), pager.getPageSize()); pager.setTotalRows((int)page.getTotalRecords()); datas = page.getList(); - model.setNoMatchReasonText("周涨跌幅" + ChatConfig.WEEKTITILE.get(model.getQueryIndex())); + model.setNoMatchReasonText("鍛ㄦ定璺屽箙" + ChatConfig.WEEKTITILE.get(model.getQueryIndex())); } model.setDetailDatas(datas); return model; @@ -236,19 +236,19 @@ public class FileReportController { String fileName = fileDatasTotality.getOldFileName(); Workbook wb = createExcel(datas,fileDatasTotality.getOldFileName()); if(fileDatasTotality.getStatus()!=6){ - fileDatasTotality.setStatus(4);//设置成人工调查 + fileDatasTotality.setStatus(4);//璁剧疆鎴愪汉宸ヨ皟鏌� } fileDatasTotalityService.saveToData(fileDatasTotality); try { response.setCharacterEncoding("UTF-8"); - //response.reset();// 清空输出流 + //response.reset();// 娓呯┖杈撳嚭娴� response.setContentType("application/x-download;charset=UTF-8"); fileName = new String(fileName.getBytes("GBK"),"ISO-8859-1"); - if(fileName.length()>150){//解决IE 6.0 bug + if(fileName.length()>150){//瑙e喅IE 6.0 bug fileName = new String(fileName.getBytes("GBK"),"ISO-8859-1"); } response.setHeader( "Content-Disposition", "attachment;filename=" + fileName); - os = response.getOutputStream();// 取得输出流 + os = response.getOutputStream();// 鍙栧緱杈撳嚭娴� wb.write(os); os.flush(); @@ -275,7 +275,7 @@ public class FileReportController { Map msgMap = new HashMap(); if(StringUtils.isNotBlank(model.getId())){ FileDatasTotality fileDatasTotality = fileDatasTotalityService.findFileDatasTotalityById(model.getId()); - fileDatasTotality.setStatus(4);//设置成人工调查 + fileDatasTotality.setStatus(4);//璁剧疆鎴愪汉宸ヨ皟鏌� fileDatasTotalityService.saveToData(fileDatasTotality); msgMap.put("status", "0"); }else{ @@ -287,7 +287,7 @@ public class FileReportController { public Object updateFileStatusToFinishAction(FileReportModel model,HttpServletRequest request){ FileDatasTotality fileDatasTotality = fileDatasTotalityService.findFileDatasTotalityById(model.getId()); - fileDatasTotality.setStatus(6);//设置成人工调查 + fileDatasTotality.setStatus(6);//璁剧疆鎴愪汉宸ヨ皟鏌� fileDatasTotalityService.saveToData(fileDatasTotality); model.redirect(request.getHeader("Referer")); return model; @@ -313,7 +313,7 @@ public class FileReportController { } - //删除 + //鍒犻櫎 public Object deleteDataAction(FileReportModel model){ if(StringUtils.isNotBlank(model.getId())){ fileDatasTotalityService.deleteFileDatasTotality(model.getId()); @@ -334,8 +334,8 @@ public class FileReportController { CellRangeAddressList addressList = new CellRangeAddressList(firstRow, lastRow, firstCol, lastCol); DataValidationConstraint constraint = helper.createExplicitListConstraint(values); DataValidation dataValidation = helper.createValidation(constraint, addressList); - dataValidation.createErrorBox("输入值有误", "请从下拉框中选择"); - //处理Excel兼容性问题 + dataValidation.createErrorBox("杈撳叆鍊兼湁璇�", "璇蜂粠涓嬫媺妗嗕腑閫夋嫨"); + //澶勭悊Excel鍏煎鎬ч棶棰� if(dataValidation instanceof XSSFDataValidation) { dataValidation.setSuppressDropDownArrow(true); dataValidation.setShowErrorBox(true); @@ -349,15 +349,15 @@ public class FileReportController { private void setDataTypeToExcel(Sheet sheet, int firstRow, int lastRow, int firstCol, int lastCol){ if(sheet instanceof HSSFSheet){ - // 创建一个规则:1-100的数字 + // 鍒涘缓涓�涓鍒欙細1-100鐨勬暟瀛� DVConstraint constraint = DVConstraint.createNumericConstraint( DVConstraint.ValidationType.INTEGER, DVConstraint.OperatorType.GREATER_THAN, "100", null); - // 设定在哪个单元格生效 + // 璁惧畾鍦ㄥ摢涓崟鍏冩牸鐢熸晥 CellRangeAddressList regions = new CellRangeAddressList(firstRow, lastRow, firstCol, lastCol); - // 创建规则对象 + // 鍒涘缓瑙勫垯瀵硅薄 DataValidation dataValidation = new HSSFDataValidation(regions, constraint); - dataValidation.createErrorBox("输入值有误", "请设置合理的值"); + dataValidation.createErrorBox("杈撳叆鍊兼湁璇�", "璇疯缃悎鐞嗙殑鍊�"); sheet.addValidationData(dataValidation); // XSSFDataValidationConstraint constraint = new XSSFDataValidationConstraint() // @@ -377,25 +377,25 @@ public class FileReportController { wb = new XSSFWorkbook(); } Sheet sheet = wb.createSheet(); - wb.setSheetName(0, "数据"); - //创建表头 + wb.setSheetName(0, "鏁版嵁"); + //鍒涘缓琛ㄥご createHeader(sheet); - //是否抽查列值设置 - String[] checkStatuses = {"是","否"}; + //鏄惁鎶芥煡鍒楀�艰缃� + String[] checkStatuses = {"鏄�","鍚�"}; addSelectToExcel(sheet, 1, datas.size(), 16, 16, checkStatuses); - //匹配原因列设置 - String[] errors = {"匹配逻辑问题","原始地址/区域错误","名称/别名错误","库中地址错误","库中区域错误","库中无此小区","无效地址","其他原因"}; + //鍖归厤鍘熷洜鍒楄缃� + String[] errors = {"鍖归厤閫昏緫闂","鍘熷鍦板潃/鍖哄煙閿欒","鍚嶇О/鍒悕閿欒","搴撲腑鍦板潃閿欒","搴撲腑鍖哄煙閿欒","搴撲腑鏃犳灏忓尯","鏃犳晥鍦板潃","鍏朵粬鍘熷洜"}; addSelectToExcel(sheet, 1, datas.size(), 18, 18, errors); setDataTypeToExcel(sheet, 1, datas.size(), 19, 19); - //创建数据 + //鍒涘缓鏁版嵁 if(null != datas && datas.size()>0){ for(FileDetailData datailData : datas){ Row row = sheet.createRow(sheet.getPhysicalNumberOfRows()); row.createCell(0).setCellValue(datailData.getCity()); row.createCell(1).setCellValue(datailData.getRegion()); - row.createCell(2).setCellValue(datailData.getDistrictName());//小区先留着为空 + row.createCell(2).setCellValue(datailData.getDistrictName());//灏忓尯鍏堢暀鐫�涓虹┖ row.createCell(3).setCellValue(datailData.getAddress()); if (datailData.getOriArea() != null) { row.createCell(4).setCellValue(datailData.getOriArea()); @@ -410,17 +410,17 @@ public class FileReportController { if(null != datailData.getValueType()){ if(datailData.getValueType()==1){ - row.createCell(10).setCellValue("指导价"); + row.createCell(10).setCellValue("鎸囧浠�"); }else if(datailData.getValueType()==2){ - row.createCell(10).setCellValue("自身样本"); + row.createCell(10).setCellValue("鑷韩鏍锋湰"); }else if(datailData.getValueType()==3){ - row.createCell(10).setCellValue("第三方"); + row.createCell(10).setCellValue("绗笁鏂�"); }else if(datailData.getValueType()==4){ - row.createCell(10).setCellValue("交易数据"); + row.createCell(10).setCellValue("浜ゆ槗鏁版嵁"); }else if(datailData.getValueType()==5){ - row.createCell(10).setCellValue("周边楼盘"); + row.createCell(10).setCellValue("鍛ㄨ竟妤肩洏"); }else if(datailData.getValueType()==6){ - row.createCell(10).setCellValue("推导"); + row.createCell(10).setCellValue("鎺ㄥ"); } } @@ -429,9 +429,9 @@ public class FileReportController { } if(datailData.getLat()!=null && datailData.getLat()>0){ - row.createCell(12).setCellValue("有"); + row.createCell(12).setCellValue("鏈�"); }else{ - row.createCell(12).setCellValue("无"); + row.createCell(12).setCellValue("鏃�"); } /*if(null != datailData.getAddrCheckLevel()){ @@ -460,9 +460,9 @@ public class FileReportController { /*if(null != datailData.getCheckStatus()){ if(datailData.getCheckStatus() == 0){ - row.createCell(16).setCellValue("否"); + row.createCell(16).setCellValue("鍚�"); }else if(datailData.getCheckStatus() == 1){ - row.createCell(16).setCellValue("是"); + row.createCell(16).setCellValue("鏄�"); } } @@ -534,7 +534,7 @@ public class FileReportController { } } - // excel导入 + // excel瀵煎叆 public Object importExcelAction(FileReportModel model, HttpServletRequest request) { JsonModel ret = new JsonModel(); try { @@ -553,7 +553,7 @@ public class FileReportController { if(null != fileDatasTotalityService.findByFileName(name)){ Map msgMap = new HashMap(); msgMap.put("error", "error"); - msgMap.put("msg", "该文件名已经存在,只能用于更新!"); + msgMap.put("msg", "璇ユ枃浠跺悕宸茬粡瀛樺湪,鍙兘鐢ㄤ簬鏇存柊锛�"); ret.setJsonModel(msgMap); return ret; } @@ -581,20 +581,20 @@ public class FileReportController { } private Map checkDatas(Workbook wb, Integer category, String userId, String oldFileName){ List> resultList = new ArrayList>(); - Sheet sheet = wb.getSheetAt(0); // 获得第一个表单 - Iterator rows = sheet.rowIterator(); //获得第一个表单的迭代器 + Sheet sheet = wb.getSheetAt(0); // 鑾峰緱绗竴涓〃鍗� + Iterator rows = sheet.rowIterator(); //鑾峰緱绗竴涓〃鍗曠殑杩唬鍣� int totalCount = 0; int line = 0; Map msgMap = new HashMap(); while (rows.hasNext()) { - Row row = rows.next(); // 获得行数据 + Row row = rows.next(); // 鑾峰緱琛屾暟鎹� line++; boolean isBlankRow = true; boolean errorFlag = false; String errorFiled = null; List rowDatas = new ArrayList(); - if (row.getRowNum() == 0) {//判断表头 + if (row.getRowNum() == 0) {//鍒ゆ柇琛ㄥご for (int i = 0; i < 5; i++) { Cell cell = row.getCell(i); String value = cell.getStringCellValue(); @@ -605,7 +605,7 @@ public class FileReportController { break; } } - } else {//内容判断 + } else {//鍐呭鍒ゆ柇 for (int i = 0; i < 5; i++) { Cell cell = row.getCell(i); String value = null; @@ -620,7 +620,7 @@ public class FileReportController { } if((i==3) && StringUtils.isBlank(value)){ errorFlag = true; - errorFiled = columns[i] + "不能为空!"; + errorFiled = columns[i] + "涓嶈兘涓虹┖锛�"; break; } if((i==4) && StringUtils.isNotBlank(value)){ @@ -628,7 +628,7 @@ public class FileReportController { Double.parseDouble(value); } catch (NumberFormatException e) { errorFlag = true; - errorFiled = columns[i] + "不能为非数字"; + errorFiled = columns[i] + "涓嶈兘涓洪潪鏁板瓧"; break; } } @@ -642,7 +642,7 @@ public class FileReportController { msgMap.put("msg", errorFiled); break; }else{ - if(!isBlankRow){//不是空白行 + if(!isBlankRow){//涓嶆槸绌虹櫧琛� totalCount++; resultList.add(rowDatas); } @@ -654,7 +654,7 @@ public class FileReportController { if(msgMap.containsKey("error")){ return msgMap; }else{ - //保存总体情况 + //淇濆瓨鎬讳綋鎯呭喌 FileDatasTotality fileDatasTotality = new FileDatasTotality(); fileDatasTotality.setCategory(category); fileDatasTotality.setOldFileName(oldFileName); @@ -668,7 +668,7 @@ public class FileReportController { fileDatasTotalityService.saveToData(fileDatasTotality); String fileId = fileDatasTotality.getId(); - //保存详情 + //淇濆瓨璇︽儏 List datas = new ArrayList(); int serial = 0; String userName = getUserName(userId); @@ -767,14 +767,14 @@ public class FileReportController { private void updateFileDatas(Workbook wb, String fileId){ - Sheet sheet = wb.getSheetAt(0); // 获得第一个表单 - Iterator rows = sheet.rowIterator(); //获得第一个表单的迭代器 + Sheet sheet = wb.getSheetAt(0); // 鑾峰緱绗竴涓〃鍗� + Iterator rows = sheet.rowIterator(); //鑾峰緱绗竴涓〃鍗曠殑杩唬鍣� Map msgMap = new HashMap(); while (rows.hasNext()) { - Row row = rows.next(); // 获得行数据 + Row row = rows.next(); // 鑾峰緱琛屾暟鎹� List rowDatas = new ArrayList(); - if (row.getRowNum() == 0) {//判断表头 + if (row.getRowNum() == 0) {//鍒ゆ柇琛ㄥご for (int i = 0; i < 3; i++) { } @@ -796,9 +796,9 @@ public class FileReportController { udata.put("real_district_name", (String)realName); } if(checkStatus!=null){ - if(checkStatus.equals("是")){ + if(checkStatus.equals("鏄�")){ udata.put("check_status", 1); - }else if(checkStatus.equals("否")){ + }else if(checkStatus.equals("鍚�")){ udata.put("check_status", 0); } @@ -925,17 +925,17 @@ public class FileReportController { } /** - * 获取详情数据 + * 鑾峰彇璇︽儏鏁版嵁 * @param model * @return */ public Object fileDetailAction(FileReportModel model) { if (!ObjectId.isValid(model.getId())) { - return new JsonResultModel(false, "非法ID"); + return new JsonResultModel(false, "闈炴硶ID"); } FileDetailData detail = fileDetailDataService.get(model.getId()); if (detail == null) { - return new JsonResultModel(false, "数据不存在"); + return new JsonResultModel(false, "鏁版嵁涓嶅瓨鍦�"); } return new JsonResultModel(true, detail); } diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/FoundDistrictController.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/FoundDistrictController.java index 4decf1be9..ec7c6c0b9 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/FoundDistrictController.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/FoundDistrictController.java @@ -116,7 +116,7 @@ public class FoundDistrictController { HSSFWorkbook wb = new HSSFWorkbook(); Sheet sheet = wb.createSheet(); Row row = sheet.createRow(0); - String[] headers = new String[]{"序号", "城市", "区域", "名称", "地址", "CPDB库", "网站量","审核状态", "审核时间", "来源", "住宅比","地图库对比结果"}; + String[] headers = new String[]{"搴忓彿", "鍩庡競", "鍖哄煙", "鍚嶇О", "鍦板潃", "CPDB搴�", "缃戠珯閲�","瀹℃牳鐘舵��", "瀹℃牳鏃堕棿", "鏉ユ簮", "浣忓畢姣�","鍦板浘搴撳姣旂粨鏋�"}; for(int i = 0; i < headers.length; i++){ row.createCell(i).setCellValue(headers[i]); } @@ -131,24 +131,24 @@ public class FoundDistrictController { row.createCell(4).setCellValue(foundDistrict.getAddress()); } if(foundDistrict.getExist() == 1){ - row.createCell(5).setCellValue("存在"); + row.createCell(5).setCellValue("瀛樺湪"); }else{ - row.createCell(5).setCellValue("不存在"); + row.createCell(5).setCellValue("涓嶅瓨鍦�"); } if(foundDistrict.getSiteCount() != null){ row.createCell(6).setCellValue(foundDistrict.getSiteCount()); } if(foundDistrict.getAuditStatus() == 0){ - row.createCell(7).setCellValue("未审核"); + row.createCell(7).setCellValue("鏈鏍�"); }else if(foundDistrict.getAuditStatus() == 1){ - row.createCell(7).setCellValue("已审核"); + row.createCell(7).setCellValue("宸插鏍�"); }else if(foundDistrict.getAuditStatus() == 2){ - row.createCell(7).setCellValue("已审阅"); + row.createCell(7).setCellValue("宸插闃�"); }else if(foundDistrict.getAuditStatus() == -1){ - row.createCell(7).setCellValue("已删除"); + row.createCell(7).setCellValue("宸插垹闄�"); } if(foundDistrict.getAuditDate() != null){ - row.createCell(8).setCellValue(DateUtil.formatByPattern(foundDistrict.getAuditDate(),"yyyy年MM月dd日")); + row.createCell(8).setCellValue(DateUtil.formatByPattern(foundDistrict.getAuditDate(),"yyyy骞碝M鏈坉d鏃�")); } if(foundDistrict.getSource() != null){ row.createCell(9).setCellValue(foundDistrict.getSource()); @@ -158,27 +158,27 @@ public class FoundDistrictController { } if(foundDistrict.getCompareResult() != null){ if("exist".equals(foundDistrict.getCompareResult())){ - row.createCell(11).setCellValue("地图库存在"); + row.createCell(11).setCellValue("鍦板浘搴撳瓨鍦�"); }else if("not_exist".equals(foundDistrict.getCompareResult())){ - row.createCell(11).setCellValue("地图库不存在"); + row.createCell(11).setCellValue("鍦板浘搴撲笉瀛樺湪"); }else if("diff_region".equals(foundDistrict.getCompareResult())){ - row.createCell(11).setCellValue("区域不一致"+ foundDistrict.getDiffRegion()); + row.createCell(11).setCellValue("鍖哄煙涓嶄竴鑷�"+ foundDistrict.getDiffRegion()); }else if("alias_exist".equals(foundDistrict.getCompareResult())){ - row.createCell(11).setCellValue("是"+ foundDistrict.getAliasName() +"的别名"); + row.createCell(11).setCellValue("鏄�"+ foundDistrict.getAliasName() +"鐨勫埆鍚�"); } } } String fileName = DateUtils.formatDate(new Date(), "yyyyMMddHHmmss") + ".xls"; try { response.setCharacterEncoding("UTF-8"); - //response.reset();// 清空输出流 + //response.reset();// 娓呯┖杈撳嚭娴� response.setContentType("application/x-download;charset=UTF-8"); fileName = new String(fileName.getBytes("GBK"),"ISO-8859-1"); - if(fileName.length()>150){//解决IE 6.0 bug + if(fileName.length()>150){//瑙e喅IE 6.0 bug fileName = new String(fileName.getBytes("GBK"),"ISO-8859-1"); } response.setHeader( "Content-Disposition", "attachment;filename=" + fileName); - os = response.getOutputStream();// 取得输出流 + os = response.getOutputStream();// 鍙栧緱杈撳嚭娴� wb.write(os); os.flush(); }catch (Exception e) { diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/HouseAnalyController.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/HouseAnalyController.java index 14f586eac..75bb4ce47 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/HouseAnalyController.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/HouseAnalyController.java @@ -19,7 +19,7 @@ import com.fangjia.coredata.mongo.dao.WebpageAnalyLogDao; import com.fangjia.coredata.mongo.model.WebpageAnalyLog; /** - * 房源解析 + * 鎴挎簮瑙f瀽 * @author gaojuan * */ @@ -40,9 +40,9 @@ public class HouseAnalyController { List webpageAnalyLogs = webpageAnalyLogDao.findWebpageAnalyLogs(model.getCity(), model.getCategory(), model.getSiteName(), model.getStartDate(), model.getEndDate()); - //总览及网站统计中按网站选择 + //鎬昏鍙婄綉绔欑粺璁′腑鎸夌綉绔欓�夋嫨 if(StringUtils.isBlank(model.getGroupby()) || (StringUtils.isNotBlank(model.getGroupby()) && model.getGroupby().equals("website") && StringUtils.isNotBlank(model.getSiteName()))){ - //网站总量在所有总量中的占比 + //缃戠珯鎬婚噺鍦ㄦ墍鏈夋�婚噺涓殑鍗犳瘮 if(StringUtils.isNotBlank(model.getMode()) && (model.getMode().equals("websiteAll") || model.getMode().equals("cityAll"))){ Map> retMap = null; Map> oldRetMap = null; @@ -59,7 +59,7 @@ public class HouseAnalyController { model.setFilterChartSeries(toChartString(retMap, "filter_count")); model.setLostChartSeries(toChartString(retMap, "lost_count")); model.setTotalErrorChartSeries(toChartString(retMap, "total_error_count")); - }else{//总览走势 + }else{//鎬昏璧板娍 if(StringUtils.isBlank(model.getGroupby()) && StringUtils.isBlank(model.getMode())){ model.setMode("all"); } @@ -82,7 +82,7 @@ public class HouseAnalyController { model.setTotalErrorChartSeries(createSeriesByCat(retMap, dates, "total_error_count", model.getCity())); }else{ - //按网站或城市统计 + //鎸夌綉绔欐垨鍩庡競缁熻 Map> retMap = null; Map> oldRetMap = null; if(StringUtils.isNotBlank(model.getGroupby()) && model.getGroupby().equals("city")){ @@ -182,43 +182,43 @@ public class HouseAnalyController { } JSONObject jo = new JSONObject(); - jo.put("name", "总量"); + jo.put("name", "鎬婚噺"); jo.put("data", totalDatas); jo.put("visible", true); jo.put("selected", true); JSONObject jo1 = new JSONObject(); - jo1.put("name", "异常量"); + jo1.put("name", "寮傚父閲�"); jo1.put("data", errorDatas); jo1.put("visible", false); jo1.put("selected", false); JSONObject jo2 = new JSONObject(); - jo2.put("name", "保存量"); + jo2.put("name", "淇濆瓨閲�"); jo2.put("data", addDatas); jo2.put("visible", false); jo2.put("selected", false); JSONObject jo3 = new JSONObject(); - jo3.put("name", "更新量"); + jo3.put("name", "鏇存柊閲�"); jo3.put("data", updateDatas); jo3.put("visible", false); jo3.put("selected", false); JSONObject jo4 = new JSONObject(); - jo4.put("name", "过滤量"); + jo4.put("name", "杩囨护閲�"); jo4.put("data", fiterDatas); jo4.put("visible", false); jo4.put("selected", false); JSONObject jo5 = new JSONObject(); - jo5.put("name", "放弃量"); + jo5.put("name", "鏀惧純閲�"); jo5.put("data", lostDatas); jo5.put("visible", false); jo5.put("selected", false); JSONObject jo6 = new JSONObject(); - jo6.put("name", "失败率"); + jo6.put("name", "澶辫触鐜�"); jo6.put("data", failDatas); jo6.put("visible", false); jo6.put("selected", false); diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/LogAnalysisController.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/LogAnalysisController.java index d7837caa3..a297a2198 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/LogAnalysisController.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/LogAnalysisController.java @@ -30,7 +30,7 @@ public class LogAnalysisController { Map regionStatMap = regionStatDao.findAllCityRegionStats(weekend); List> datas = new ArrayList>(); for(ServerArea serverArea : serverAreas) { - if("海南".equals(serverArea.getProvince())) { + if("娴峰崡".equals(serverArea.getProvince())) { continue; } if(serverArea.getLat() > 0 && serverArea.getLng() > 0 && regionStatMap.containsKey(serverArea.getDisplay())) { diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/MapController.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/MapController.java index 5a067195e..29bc67fdb 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/MapController.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/MapController.java @@ -22,20 +22,20 @@ public class MapController { private DynamicAnalyLogDao dynamicAnalyLogDao = DynamicAnalyLogDao.getInstance(); - private static final List CITIES = Arrays.asList("拉萨","那曲地区","日喀则地区","阿里地区","昆明","玉溪","普洱","临沧","保山","丽江","张掖","武威","东莞","三亚","鄂州","乌海","莱芜", - "海口","蚌埠","合肥","阜阳","芜湖","安庆","北京","重庆","南平","泉州","庆阳","定西","韶关","佛山","茂名","珠海","梅州","桂林","河池","崇左","钦州","贵阳","六盘水","秦皇岛", - "沧州","石家庄","邯郸", "新乡","洛阳","商丘","许昌","荆州","长沙","衡阳","镇江","南通","淮安","南昌","新余","通化","锦州","大连","乌兰察布","巴彦淖尔","渭南","宝鸡","枣庄", - "日照","东营","威海","太原","温州","杭州","宁波","中卫","辽源","抚顺","宜宾","中山","亳州","滁州","宣城","廊坊","宁德","龙岩","厦门","莆田","天水","清远","湛江","阳江","河源" - ,"潮州","来宾","百色","防城港","铜仁地区","毕节地区","承德","衡水","濮阳","开封","焦作","三门峡","平顶山","信阳","鹤壁","十堰","荆门","武汉","常德","岳阳","娄底","株洲" - ,"盐城","苏州","景德镇","抚州","本溪","盘锦","包头","阿拉善盟","榆林","铜川","西安","临沂","滨州","青岛","朔州","晋中","巴中","绵阳","广安","资阳","衢州","台州", - "舟山","固原","内江","曲靖","淮南","巢湖","黄山","淮北","三明","漳州","陇南","广州","云浮","揭阳","贺州","南宁","遵义","安顺","张家口","唐山","邢台","安阳","郑州", - "驻马店","宜昌","黄冈","益阳","邵阳","郴州","泰州","宿迁","宜春","鹰潭","朝阳","营口","丹东","鄂尔多斯","延安","商洛","济宁","潍坊","济南","上海","晋城","南充","丽水", - "绍兴","湖州","北海","赤峰","六安","池州","福州","惠州","江门","汕头","梧州","柳州","保定","周口","南阳","孝感","黄石","张家界","湘潭","永州","南京","徐州","无锡","吉安", - "葫芦岛","鞍山","呼和浩特","吴忠","咸阳","安康","泰安","烟台","吕梁","运城","广元","遂宁","泸州","天津","金华","嘉兴","石嘴山","昭通","铜陵","肇庆","汕尾","嘉峪关","深圳", - "贵港","漯河","扬州","连云港","常州","九江","金昌","萍乡","辽阳","汉中","菏泽","淄博","大同","长治","阳泉","马鞍山","平凉","白银","银川","玉林","咸宁","怀化","上饶","赣州", - "聊城","忻州","临汾","达州","兰州","宿州","随州","德州","酒泉","大兴安岭地区","黑河","伊春","齐齐哈尔","佳木斯","鹤岗","绥化","双鸭山","鸡西","七台河","哈尔滨","牡丹江", - "大庆","白城","松原","长春","四平","白山","沈阳","阜新","铁岭","呼伦贝尔","兴安盟","锡林郭勒盟","通辽","西宁","海东地区","德阳","成都","雅安","眉山","自贡","乐山", - "攀枝花","和田地区","喀什地区","阿克苏地区","吐鲁番地区","哈密地区","乌鲁木齐","塔城地区","克拉玛依","阿勒泰地区","山南地区","林芝地区","昌都地区","吉林"); + private static final List CITIES = Arrays.asList("鎷夎惃","閭f洸鍦板尯","鏃ュ杸鍒欏湴鍖�","闃块噷鍦板尯","鏄嗘槑","鐜夋邯","鏅幢","涓存钵","淇濆北","涓芥睙","寮犳帠","姝﹀▉","涓滆帪","涓変簹","閯傚窞","涔屾捣","鑾辫姕", + "娴峰彛","铓屽煚","鍚堣偉","闃滈槼","鑺滄箹","瀹夊簡","鍖椾含","閲嶅簡","鍗楀钩","娉夊窞","搴嗛槼","瀹氳タ","闊跺叧","浣涘北","鑼傚悕","鐝犳捣","姊呭窞","妗傛灄","娌虫睜","宕囧乏","閽﹀窞","璐甸槼","鍏洏姘�","绉︾殗宀�", + "娌у窞","鐭冲搴�","閭兏", "鏂颁埂","娲涢槼","鍟嗕笜","璁告槍","鑽嗗窞","闀挎矙","琛¢槼","闀囨睙","鍗楅��","娣畨","鍗楁槍","鏂颁綑","閫氬寲","閿﹀窞","澶ц繛","涔屽叞瀵熷竷","宸村溅娣栧皵","娓崡","瀹濋浮","鏋e簞", + "鏃ョ収","涓滆惀","濞佹捣","澶師","娓╁窞","鏉窞","瀹佹尝","涓崼","杈芥簮","鎶氶『","瀹滃","涓北","浜冲窞","婊佸窞","瀹e煄","寤婂潑","瀹佸痉","榫欏博","鍘﹂棬","鑾嗙敯","澶╂按","娓呰繙","婀涙睙","闃虫睙","娌虫簮" + ,"娼窞","鏉ュ","鐧捐壊","闃插煄娓�","閾滀粊鍦板尯","姣曡妭鍦板尯","鎵垮痉","琛℃按","婵槼","寮�灏�","鐒︿綔","涓夐棬宄�","骞抽《灞�","淇¢槼","楣ゅ","鍗佸牥","鑽嗛棬","姝︽眽","甯稿痉","宀抽槼","濞勫簳","鏍床" + ,"鐩愬煄","鑻忓窞","鏅痉闀�","鎶氬窞","鏈邯","鐩橀敠","鍖呭ご","闃挎媺鍠勭洘","姒嗘灄","閾滃窛","瑗垮畨","涓存矀","婊ㄥ窞","闈掑矝","鏈斿窞","鏅嬩腑","宸翠腑","缁甸槼","骞垮畨","璧勯槼","琛㈠窞","鍙板窞", + "鑸熷北","鍥哄師","鍐呮睙","鏇查潠","娣崡","宸㈡箹","榛勫北","娣寳","涓夋槑","婕冲窞","闄囧崡","骞垮窞","浜戞诞","鎻槼","璐哄窞","鍗楀畞","閬典箟","瀹夐『","寮犲鍙�","鍞愬北","閭㈠彴","瀹夐槼","閮戝窞", + "椹婚┈搴�","瀹滄槍","榛勫唸","鐩婇槼","閭甸槼","閮村窞","娉板窞","瀹胯縼","瀹滄槬","楣版江","鏈濋槼","钀ュ彛","涓逛笢","閯傚皵澶氭柉","寤跺畨","鍟嗘礇","娴庡畞","娼嶅潑","娴庡崡","涓婃捣","鏅嬪煄","鍗楀厖","涓芥按", + "缁嶅叴","婀栧窞","鍖楁捣","璧ゅ嘲","鍏畨","姹犲窞","绂忓窞","鎯犲窞","姹熼棬","姹曞ご","姊у窞","鏌冲窞","淇濆畾","鍛ㄥ彛","鍗楅槼","瀛濇劅","榛勭煶","寮犲鐣�","婀樻江","姘稿窞","鍗椾含","寰愬窞","鏃犻敗","鍚夊畨", + "钁姦宀�","闉嶅北","鍛煎拰娴╃壒","鍚村繝","鍜搁槼","瀹夊悍","娉板畨","鐑熷彴","鍚曟","杩愬煄","骞垮厓","閬傚畞","娉稿窞","澶╂触","閲戝崕","鍢夊叴","鐭冲槾灞�","鏄��","閾滈櫟","鑲囧簡","姹曞熬","鍢夊唱鍏�","娣卞湷", + "璐垫腐","婕渤","鎵窞","杩炰簯娓�","甯稿窞","涔濇睙","閲戞槍","钀嶄埂","杈介槼","姹変腑","鑿忔辰","娣勫崥","澶у悓","闀挎不","闃虫硥","椹瀺灞�","骞冲噳","鐧介摱","閾跺窛","鐜夋灄","鍜稿畞","鎬�鍖�","涓婇ザ","璧e窞", + "鑱婂煄","蹇诲窞","涓存本","杈惧窞","鍏板窞","瀹垮窞","闅忓窞","寰峰窞","閰掓硥","澶у叴瀹夊箔鍦板尯","榛戞渤","浼婃槬","榻愰綈鍝堝皵","浣虫湪鏂�","楣ゅ矖","缁ュ寲","鍙岄腑灞�","楦¤タ","涓冨彴娌�","鍝堝皵婊�","鐗′腹姹�", + "澶у簡","鐧藉煄","鏉惧師","闀挎槬","鍥涘钩","鐧藉北","娌堥槼","闃滄柊","閾佸箔","鍛间鸡璐濆皵","鍏村畨鐩�","閿℃灄閮嫆鐩�","閫氳窘","瑗垮畞","娴蜂笢鍦板尯","寰烽槼","鎴愰兘","闆呭畨","鐪夊北","鑷础","涔愬北", + "鏀�鏋濊姳","鍜岀敯鍦板尯","鍠�浠�鍦板尯","闃垮厠鑻忓湴鍖�","鍚愰瞾鐣湴鍖�","鍝堝瘑鍦板尯","涔岄瞾鏈ㄩ綈","濉斿煄鍦板尯","鍏嬫媺鐜涗緷","闃垮嫆娉板湴鍖�","灞卞崡鍦板尯","鏋楄姖鍦板尯","鏄岄兘鍦板尯","鍚夋灄"); public Object exampleAction(MapModel model){ String[] fields = new String[1]; @@ -77,7 +77,7 @@ public class MapController { List cityList = new ArrayList(); for(DynamicAnalyLog log : list){ String city = log.getCity(); - if(!cityList.contains(city)&&CITIES.contains(city)&&!"上海".equals(city)){ + if(!cityList.contains(city)&&CITIES.contains(city)&&!"涓婃捣".equals(city)){ cityList.add(city); } Integer data = dataMap.get(city); @@ -113,7 +113,7 @@ public class MapController { JSONObject jo1 = new JSONObject(); jo1.put("name", city); JSONObject jo2 = new JSONObject(); - jo2.put("name", "数据中心"); + jo2.put("name", "鏁版嵁涓績"); jo2.put("value", data); array.add("[" + jo1 + "," + jo2 + "]"); MapBo mapBo = new MapBo(); @@ -124,8 +124,8 @@ public class MapController { } } MapBo mapBo = new MapBo(); - mapBo.setCity("数据中心"); - mapBo.setLatLng(LNG_LAT_MAP.get("上海")); + mapBo.setCity("鏁版嵁涓績"); + mapBo.setLatLng(LNG_LAT_MAP.get("涓婃捣")); mapBoList.add(mapBo); model.setMapBoList(mapBoList); model.setData(JSONArray.fromObject(boList).toString()); @@ -135,585 +135,585 @@ public class MapController { private static final Map CITY_MAP = new HashMap(); static { - CITY_MAP.put("拉萨","西藏"); - CITY_MAP.put("昆明","云南"); - CITY_MAP.put("玉溪","云南"); - CITY_MAP.put("普洱","云南"); - CITY_MAP.put("临沧","云南"); - CITY_MAP.put("保山","云南"); - CITY_MAP.put("丽江","云南"); - CITY_MAP.put("张掖","甘肃"); - CITY_MAP.put("武威","甘肃"); - CITY_MAP.put("东莞","广东"); - CITY_MAP.put("三亚","海南"); - CITY_MAP.put("鄂州","湖北"); - CITY_MAP.put("乌海","内蒙古"); - CITY_MAP.put("莱芜","山东"); - CITY_MAP.put("海口","海南"); - CITY_MAP.put("蚌埠","安徽"); - CITY_MAP.put("合肥","安徽"); - CITY_MAP.put("阜阳","安徽"); - CITY_MAP.put("芜湖","安徽"); - CITY_MAP.put("安庆","安徽"); - CITY_MAP.put("北京","北京"); - CITY_MAP.put("重庆","重庆"); - CITY_MAP.put("南平","福建"); - CITY_MAP.put("泉州","福建"); - CITY_MAP.put("庆阳","甘肃"); - CITY_MAP.put("定西","甘肃"); - CITY_MAP.put("韶关","广东"); - CITY_MAP.put("佛山","广东"); - CITY_MAP.put("茂名","广东"); - CITY_MAP.put("珠海","广东"); - CITY_MAP.put("梅州","广东"); - CITY_MAP.put("桂林","广西"); - CITY_MAP.put("河池","广西"); - CITY_MAP.put("崇左","广西"); - CITY_MAP.put("钦州","广西"); - CITY_MAP.put("贵阳","贵州"); - CITY_MAP.put("六盘水","贵州"); - CITY_MAP.put("秦皇岛","河北"); - CITY_MAP.put("沧州","河北"); - CITY_MAP.put("石家庄","河北"); - CITY_MAP.put("邯郸","河北"); - CITY_MAP.put("新乡","河南"); - CITY_MAP.put("洛阳","河南"); - CITY_MAP.put("商丘","河南"); - CITY_MAP.put("许昌","河南"); - CITY_MAP.put("荆州","湖北"); - CITY_MAP.put("长沙","湖南"); - CITY_MAP.put("衡阳","湖南"); - CITY_MAP.put("镇江","江苏"); - CITY_MAP.put("南通","江苏"); - CITY_MAP.put("淮安","江苏"); - CITY_MAP.put("南昌","江西"); - CITY_MAP.put("新余","江西"); - CITY_MAP.put("通化","吉林"); - CITY_MAP.put("锦州","辽宁"); - CITY_MAP.put("大连","辽宁"); - CITY_MAP.put("乌兰察布","内蒙古"); - CITY_MAP.put("巴彦淖尔","内蒙古"); - CITY_MAP.put("渭南","陕西"); - CITY_MAP.put("宝鸡","陕西"); - CITY_MAP.put("枣庄","山东"); - CITY_MAP.put("日照","山东"); - CITY_MAP.put("东营","山东"); - CITY_MAP.put("威海","山东"); - CITY_MAP.put("太原","山西"); - CITY_MAP.put("温州","浙江"); - CITY_MAP.put("杭州","浙江"); - CITY_MAP.put("宁波","浙江"); - CITY_MAP.put("中卫","宁夏"); - CITY_MAP.put("辽源","吉林"); - CITY_MAP.put("抚顺","辽宁"); - CITY_MAP.put("宜宾","四川"); - CITY_MAP.put("中山","广东"); - CITY_MAP.put("亳州","安徽"); - CITY_MAP.put("滁州","安徽"); - CITY_MAP.put("宣城","安徽"); - CITY_MAP.put("廊坊","河北"); - CITY_MAP.put("宁德","福建"); - CITY_MAP.put("龙岩","福建"); - CITY_MAP.put("厦门","福建"); - CITY_MAP.put("莆田","福建"); - CITY_MAP.put("天水","甘肃"); - CITY_MAP.put("清远","广东"); - CITY_MAP.put("湛江","广东"); - CITY_MAP.put("阳江","广东"); - CITY_MAP.put("河源","广东"); - CITY_MAP.put("潮州","广东"); - CITY_MAP.put("来宾","广西"); - CITY_MAP.put("百色","广西"); - CITY_MAP.put("防城港","广西"); - CITY_MAP.put("承德","河北"); - CITY_MAP.put("衡水","河北"); - CITY_MAP.put("濮阳","河南"); - CITY_MAP.put("开封","河南"); - CITY_MAP.put("焦作","河南"); - CITY_MAP.put("三门峡","河南"); - CITY_MAP.put("平顶山","河南"); - CITY_MAP.put("信阳","河南"); - CITY_MAP.put("鹤壁","河南"); - CITY_MAP.put("十堰","湖北"); - CITY_MAP.put("荆门","湖北"); - CITY_MAP.put("武汉","湖北"); - CITY_MAP.put("常德","湖南"); - CITY_MAP.put("岳阳","湖南"); - CITY_MAP.put("娄底","湖南"); - CITY_MAP.put("株洲","湖南"); - CITY_MAP.put("盐城","江苏"); - CITY_MAP.put("苏州","江苏"); - CITY_MAP.put("景德镇","江西"); - CITY_MAP.put("抚州","江西"); - CITY_MAP.put("本溪","辽宁"); - CITY_MAP.put("盘锦","辽宁"); - CITY_MAP.put("包头","内蒙古"); - CITY_MAP.put("阿拉善盟","内蒙古"); - CITY_MAP.put("榆林","陕西"); - CITY_MAP.put("铜川","陕西"); - CITY_MAP.put("西安","陕西"); - CITY_MAP.put("临沂","山东"); - CITY_MAP.put("滨州","山东"); - CITY_MAP.put("青岛","山东"); - CITY_MAP.put("朔州","山西"); - CITY_MAP.put("晋中","山西"); - CITY_MAP.put("巴中","四川"); - CITY_MAP.put("绵阳","四川"); - CITY_MAP.put("广安","四川"); - CITY_MAP.put("资阳","四川"); - CITY_MAP.put("衢州","浙江"); - CITY_MAP.put("台州","浙江"); - CITY_MAP.put("舟山","浙江"); - CITY_MAP.put("固原","宁夏"); - CITY_MAP.put("内江","四川"); - CITY_MAP.put("曲靖","云南"); - CITY_MAP.put("淮南","安徽"); - CITY_MAP.put("黄山","安徽"); - CITY_MAP.put("淮北","安徽"); - CITY_MAP.put("三明","福建"); - CITY_MAP.put("漳州","福建"); - CITY_MAP.put("陇南","甘肃"); - CITY_MAP.put("广州","广东"); - CITY_MAP.put("云浮","广东"); - CITY_MAP.put("揭阳","广东"); - CITY_MAP.put("贺州","广西"); - CITY_MAP.put("南宁","广西"); - CITY_MAP.put("遵义","贵州"); - CITY_MAP.put("安顺","贵州"); - CITY_MAP.put("张家口","河北"); - CITY_MAP.put("唐山","河北"); - CITY_MAP.put("邢台","河北"); - CITY_MAP.put("安阳","河南"); - CITY_MAP.put("郑州","河南"); - CITY_MAP.put("驻马店","河南"); - CITY_MAP.put("宜昌","湖北"); - CITY_MAP.put("黄冈","湖北"); - CITY_MAP.put("益阳","湖南"); - CITY_MAP.put("邵阳","湖南"); - CITY_MAP.put("郴州","湖南"); - CITY_MAP.put("泰州","江苏"); - CITY_MAP.put("宿迁","江苏"); - CITY_MAP.put("宜春","江西"); - CITY_MAP.put("鹰潭","江西"); - CITY_MAP.put("朝阳","辽宁"); - CITY_MAP.put("营口","辽宁"); - CITY_MAP.put("丹东","辽宁"); - CITY_MAP.put("鄂尔多斯","内蒙古"); - CITY_MAP.put("延安","陕西"); - CITY_MAP.put("商洛","陕西"); - CITY_MAP.put("济宁","山东"); - CITY_MAP.put("潍坊","山东"); - CITY_MAP.put("济南","山东"); - CITY_MAP.put("上海","上海"); - CITY_MAP.put("晋城","山西"); - CITY_MAP.put("南充","四川"); - CITY_MAP.put("丽水","浙江"); - CITY_MAP.put("绍兴","浙江"); - CITY_MAP.put("湖州","浙江"); - CITY_MAP.put("北海","广西"); - CITY_MAP.put("赤峰","内蒙古"); - CITY_MAP.put("六安","安徽"); - CITY_MAP.put("池州","安徽"); - CITY_MAP.put("福州","福建"); - CITY_MAP.put("惠州","广东"); - CITY_MAP.put("江门","广东"); - CITY_MAP.put("汕头","广东"); - CITY_MAP.put("梧州","广西"); - CITY_MAP.put("柳州","广西"); - CITY_MAP.put("保定","河北"); - CITY_MAP.put("周口","河南"); - CITY_MAP.put("南阳","河南"); - CITY_MAP.put("孝感","湖北"); - CITY_MAP.put("黄石","湖北"); - CITY_MAP.put("张家界","湖南"); - CITY_MAP.put("湘潭","湖南"); - CITY_MAP.put("永州","湖南"); - CITY_MAP.put("南京","江苏"); - CITY_MAP.put("徐州","江苏"); - CITY_MAP.put("无锡","江苏"); - CITY_MAP.put("吉安","江西"); - CITY_MAP.put("葫芦岛","辽宁"); - CITY_MAP.put("鞍山","辽宁"); - CITY_MAP.put("呼和浩特","内蒙古"); - CITY_MAP.put("吴忠","宁夏"); - CITY_MAP.put("咸阳","陕西"); - CITY_MAP.put("安康","陕西"); - CITY_MAP.put("泰安","山东"); - CITY_MAP.put("烟台","山东"); - CITY_MAP.put("吕梁","山西"); - CITY_MAP.put("运城","山西"); - CITY_MAP.put("广元","四川"); - CITY_MAP.put("遂宁","四川"); - CITY_MAP.put("泸州","四川"); - CITY_MAP.put("天津","天津"); - CITY_MAP.put("金华","浙江"); - CITY_MAP.put("嘉兴","浙江"); - CITY_MAP.put("石嘴山","宁夏"); - CITY_MAP.put("昭通","云南"); - CITY_MAP.put("铜陵","安徽"); - CITY_MAP.put("肇庆","广东"); - CITY_MAP.put("汕尾","广东"); - CITY_MAP.put("嘉峪关","甘肃"); - CITY_MAP.put("深圳","广东"); - CITY_MAP.put("贵港","广西"); - CITY_MAP.put("漯河","河南"); - CITY_MAP.put("扬州","江苏"); - CITY_MAP.put("连云港","江苏"); - CITY_MAP.put("常州","江苏"); - CITY_MAP.put("九江","江西"); - CITY_MAP.put("金昌","甘肃"); - CITY_MAP.put("萍乡","江西"); - CITY_MAP.put("辽阳","辽宁"); - CITY_MAP.put("汉中","陕西"); - CITY_MAP.put("菏泽","山东"); - CITY_MAP.put("淄博","山东"); - CITY_MAP.put("大同","山西"); - CITY_MAP.put("长治","山西"); - CITY_MAP.put("阳泉","山西"); - CITY_MAP.put("马鞍山","安徽"); - CITY_MAP.put("平凉","甘肃"); - CITY_MAP.put("白银","甘肃"); - CITY_MAP.put("银川","宁夏"); - CITY_MAP.put("玉林","广西"); - CITY_MAP.put("咸宁","湖北"); - CITY_MAP.put("怀化","湖南"); - CITY_MAP.put("上饶","江西"); - CITY_MAP.put("赣州","江西"); - CITY_MAP.put("聊城","山东"); - CITY_MAP.put("忻州","山西"); - CITY_MAP.put("临汾","山西"); - CITY_MAP.put("达州","四川"); - CITY_MAP.put("兰州","甘肃"); - CITY_MAP.put("宿州","安徽"); - CITY_MAP.put("随州","湖北"); - CITY_MAP.put("德州","山东"); - CITY_MAP.put("酒泉","甘肃"); - CITY_MAP.put("黑河","黑龙江"); - CITY_MAP.put("伊春","黑龙江"); - CITY_MAP.put("齐齐哈尔","黑龙江"); - CITY_MAP.put("佳木斯","黑龙江"); - CITY_MAP.put("鹤岗","黑龙江"); - CITY_MAP.put("绥化","黑龙江"); - CITY_MAP.put("双鸭山","黑龙江"); - CITY_MAP.put("鸡西","黑龙江"); - CITY_MAP.put("七台河","黑龙江"); - CITY_MAP.put("哈尔滨","黑龙江"); - CITY_MAP.put("牡丹江","黑龙江"); - CITY_MAP.put("大庆","黑龙江"); - CITY_MAP.put("白城","吉林"); - CITY_MAP.put("松原","吉林"); - CITY_MAP.put("长春","吉林"); - CITY_MAP.put("四平","吉林"); - CITY_MAP.put("白山","吉林"); - CITY_MAP.put("沈阳","辽宁"); - CITY_MAP.put("阜新","辽宁"); - CITY_MAP.put("铁岭","辽宁"); - CITY_MAP.put("呼伦贝尔","内蒙古"); - CITY_MAP.put("兴安盟","内蒙古"); - CITY_MAP.put("锡林郭勒盟","内蒙古"); - CITY_MAP.put("通辽","内蒙古"); - CITY_MAP.put("西宁","青海"); - CITY_MAP.put("德阳","四川"); - CITY_MAP.put("成都","四川"); - CITY_MAP.put("雅安","四川"); - CITY_MAP.put("眉山","四川"); - CITY_MAP.put("自贡","四川"); - CITY_MAP.put("乐山","四川"); - CITY_MAP.put("攀枝花","四川"); - CITY_MAP.put("乌鲁木齐","新疆"); - CITY_MAP.put("克拉玛依","新疆"); - CITY_MAP.put("吉林","吉林"); + CITY_MAP.put("鎷夎惃","瑗胯棌"); + CITY_MAP.put("鏄嗘槑","浜戝崡"); + CITY_MAP.put("鐜夋邯","浜戝崡"); + CITY_MAP.put("鏅幢","浜戝崡"); + CITY_MAP.put("涓存钵","浜戝崡"); + CITY_MAP.put("淇濆北","浜戝崡"); + CITY_MAP.put("涓芥睙","浜戝崡"); + CITY_MAP.put("寮犳帠","鐢樿們"); + CITY_MAP.put("姝﹀▉","鐢樿們"); + CITY_MAP.put("涓滆帪","骞夸笢"); + CITY_MAP.put("涓変簹","娴峰崡"); + CITY_MAP.put("閯傚窞","婀栧寳"); + CITY_MAP.put("涔屾捣","鍐呰挋鍙�"); + CITY_MAP.put("鑾辫姕","灞变笢"); + CITY_MAP.put("娴峰彛","娴峰崡"); + CITY_MAP.put("铓屽煚","瀹夊窘"); + CITY_MAP.put("鍚堣偉","瀹夊窘"); + CITY_MAP.put("闃滈槼","瀹夊窘"); + CITY_MAP.put("鑺滄箹","瀹夊窘"); + CITY_MAP.put("瀹夊簡","瀹夊窘"); + CITY_MAP.put("鍖椾含","鍖椾含"); + CITY_MAP.put("閲嶅簡","閲嶅簡"); + CITY_MAP.put("鍗楀钩","绂忓缓"); + CITY_MAP.put("娉夊窞","绂忓缓"); + CITY_MAP.put("搴嗛槼","鐢樿們"); + CITY_MAP.put("瀹氳タ","鐢樿們"); + CITY_MAP.put("闊跺叧","骞夸笢"); + CITY_MAP.put("浣涘北","骞夸笢"); + CITY_MAP.put("鑼傚悕","骞夸笢"); + CITY_MAP.put("鐝犳捣","骞夸笢"); + CITY_MAP.put("姊呭窞","骞夸笢"); + CITY_MAP.put("妗傛灄","骞胯タ"); + CITY_MAP.put("娌虫睜","骞胯タ"); + CITY_MAP.put("宕囧乏","骞胯タ"); + CITY_MAP.put("閽﹀窞","骞胯タ"); + CITY_MAP.put("璐甸槼","璐靛窞"); + CITY_MAP.put("鍏洏姘�","璐靛窞"); + CITY_MAP.put("绉︾殗宀�","娌冲寳"); + CITY_MAP.put("娌у窞","娌冲寳"); + CITY_MAP.put("鐭冲搴�","娌冲寳"); + CITY_MAP.put("閭兏","娌冲寳"); + CITY_MAP.put("鏂颁埂","娌冲崡"); + CITY_MAP.put("娲涢槼","娌冲崡"); + CITY_MAP.put("鍟嗕笜","娌冲崡"); + CITY_MAP.put("璁告槍","娌冲崡"); + CITY_MAP.put("鑽嗗窞","婀栧寳"); + CITY_MAP.put("闀挎矙","婀栧崡"); + CITY_MAP.put("琛¢槼","婀栧崡"); + CITY_MAP.put("闀囨睙","姹熻嫃"); + CITY_MAP.put("鍗楅��","姹熻嫃"); + CITY_MAP.put("娣畨","姹熻嫃"); + CITY_MAP.put("鍗楁槍","姹熻タ"); + CITY_MAP.put("鏂颁綑","姹熻タ"); + CITY_MAP.put("閫氬寲","鍚夋灄"); + CITY_MAP.put("閿﹀窞","杈藉畞"); + CITY_MAP.put("澶ц繛","杈藉畞"); + CITY_MAP.put("涔屽叞瀵熷竷","鍐呰挋鍙�"); + CITY_MAP.put("宸村溅娣栧皵","鍐呰挋鍙�"); + CITY_MAP.put("娓崡","闄曡タ"); + CITY_MAP.put("瀹濋浮","闄曡タ"); + CITY_MAP.put("鏋e簞","灞变笢"); + CITY_MAP.put("鏃ョ収","灞变笢"); + CITY_MAP.put("涓滆惀","灞变笢"); + CITY_MAP.put("濞佹捣","灞变笢"); + CITY_MAP.put("澶師","灞辫タ"); + CITY_MAP.put("娓╁窞","娴欐睙"); + CITY_MAP.put("鏉窞","娴欐睙"); + CITY_MAP.put("瀹佹尝","娴欐睙"); + CITY_MAP.put("涓崼","瀹佸"); + CITY_MAP.put("杈芥簮","鍚夋灄"); + CITY_MAP.put("鎶氶『","杈藉畞"); + CITY_MAP.put("瀹滃","鍥涘窛"); + CITY_MAP.put("涓北","骞夸笢"); + CITY_MAP.put("浜冲窞","瀹夊窘"); + CITY_MAP.put("婊佸窞","瀹夊窘"); + CITY_MAP.put("瀹e煄","瀹夊窘"); + CITY_MAP.put("寤婂潑","娌冲寳"); + CITY_MAP.put("瀹佸痉","绂忓缓"); + CITY_MAP.put("榫欏博","绂忓缓"); + CITY_MAP.put("鍘﹂棬","绂忓缓"); + CITY_MAP.put("鑾嗙敯","绂忓缓"); + CITY_MAP.put("澶╂按","鐢樿們"); + CITY_MAP.put("娓呰繙","骞夸笢"); + CITY_MAP.put("婀涙睙","骞夸笢"); + CITY_MAP.put("闃虫睙","骞夸笢"); + CITY_MAP.put("娌虫簮","骞夸笢"); + CITY_MAP.put("娼窞","骞夸笢"); + CITY_MAP.put("鏉ュ","骞胯タ"); + CITY_MAP.put("鐧捐壊","骞胯タ"); + CITY_MAP.put("闃插煄娓�","骞胯タ"); + CITY_MAP.put("鎵垮痉","娌冲寳"); + CITY_MAP.put("琛℃按","娌冲寳"); + CITY_MAP.put("婵槼","娌冲崡"); + CITY_MAP.put("寮�灏�","娌冲崡"); + CITY_MAP.put("鐒︿綔","娌冲崡"); + CITY_MAP.put("涓夐棬宄�","娌冲崡"); + CITY_MAP.put("骞抽《灞�","娌冲崡"); + CITY_MAP.put("淇¢槼","娌冲崡"); + CITY_MAP.put("楣ゅ","娌冲崡"); + CITY_MAP.put("鍗佸牥","婀栧寳"); + CITY_MAP.put("鑽嗛棬","婀栧寳"); + CITY_MAP.put("姝︽眽","婀栧寳"); + CITY_MAP.put("甯稿痉","婀栧崡"); + CITY_MAP.put("宀抽槼","婀栧崡"); + CITY_MAP.put("濞勫簳","婀栧崡"); + CITY_MAP.put("鏍床","婀栧崡"); + CITY_MAP.put("鐩愬煄","姹熻嫃"); + CITY_MAP.put("鑻忓窞","姹熻嫃"); + CITY_MAP.put("鏅痉闀�","姹熻タ"); + CITY_MAP.put("鎶氬窞","姹熻タ"); + CITY_MAP.put("鏈邯","杈藉畞"); + CITY_MAP.put("鐩橀敠","杈藉畞"); + CITY_MAP.put("鍖呭ご","鍐呰挋鍙�"); + CITY_MAP.put("闃挎媺鍠勭洘","鍐呰挋鍙�"); + CITY_MAP.put("姒嗘灄","闄曡タ"); + CITY_MAP.put("閾滃窛","闄曡タ"); + CITY_MAP.put("瑗垮畨","闄曡タ"); + CITY_MAP.put("涓存矀","灞变笢"); + CITY_MAP.put("婊ㄥ窞","灞变笢"); + CITY_MAP.put("闈掑矝","灞变笢"); + CITY_MAP.put("鏈斿窞","灞辫タ"); + CITY_MAP.put("鏅嬩腑","灞辫タ"); + CITY_MAP.put("宸翠腑","鍥涘窛"); + CITY_MAP.put("缁甸槼","鍥涘窛"); + CITY_MAP.put("骞垮畨","鍥涘窛"); + CITY_MAP.put("璧勯槼","鍥涘窛"); + CITY_MAP.put("琛㈠窞","娴欐睙"); + CITY_MAP.put("鍙板窞","娴欐睙"); + CITY_MAP.put("鑸熷北","娴欐睙"); + CITY_MAP.put("鍥哄師","瀹佸"); + CITY_MAP.put("鍐呮睙","鍥涘窛"); + CITY_MAP.put("鏇查潠","浜戝崡"); + CITY_MAP.put("娣崡","瀹夊窘"); + CITY_MAP.put("榛勫北","瀹夊窘"); + CITY_MAP.put("娣寳","瀹夊窘"); + CITY_MAP.put("涓夋槑","绂忓缓"); + CITY_MAP.put("婕冲窞","绂忓缓"); + CITY_MAP.put("闄囧崡","鐢樿們"); + CITY_MAP.put("骞垮窞","骞夸笢"); + CITY_MAP.put("浜戞诞","骞夸笢"); + CITY_MAP.put("鎻槼","骞夸笢"); + CITY_MAP.put("璐哄窞","骞胯タ"); + CITY_MAP.put("鍗楀畞","骞胯タ"); + CITY_MAP.put("閬典箟","璐靛窞"); + CITY_MAP.put("瀹夐『","璐靛窞"); + CITY_MAP.put("寮犲鍙�","娌冲寳"); + CITY_MAP.put("鍞愬北","娌冲寳"); + CITY_MAP.put("閭㈠彴","娌冲寳"); + CITY_MAP.put("瀹夐槼","娌冲崡"); + CITY_MAP.put("閮戝窞","娌冲崡"); + CITY_MAP.put("椹婚┈搴�","娌冲崡"); + CITY_MAP.put("瀹滄槍","婀栧寳"); + CITY_MAP.put("榛勫唸","婀栧寳"); + CITY_MAP.put("鐩婇槼","婀栧崡"); + CITY_MAP.put("閭甸槼","婀栧崡"); + CITY_MAP.put("閮村窞","婀栧崡"); + CITY_MAP.put("娉板窞","姹熻嫃"); + CITY_MAP.put("瀹胯縼","姹熻嫃"); + CITY_MAP.put("瀹滄槬","姹熻タ"); + CITY_MAP.put("楣版江","姹熻タ"); + CITY_MAP.put("鏈濋槼","杈藉畞"); + CITY_MAP.put("钀ュ彛","杈藉畞"); + CITY_MAP.put("涓逛笢","杈藉畞"); + CITY_MAP.put("閯傚皵澶氭柉","鍐呰挋鍙�"); + CITY_MAP.put("寤跺畨","闄曡タ"); + CITY_MAP.put("鍟嗘礇","闄曡タ"); + CITY_MAP.put("娴庡畞","灞变笢"); + CITY_MAP.put("娼嶅潑","灞变笢"); + CITY_MAP.put("娴庡崡","灞变笢"); + CITY_MAP.put("涓婃捣","涓婃捣"); + CITY_MAP.put("鏅嬪煄","灞辫タ"); + CITY_MAP.put("鍗楀厖","鍥涘窛"); + CITY_MAP.put("涓芥按","娴欐睙"); + CITY_MAP.put("缁嶅叴","娴欐睙"); + CITY_MAP.put("婀栧窞","娴欐睙"); + CITY_MAP.put("鍖楁捣","骞胯タ"); + CITY_MAP.put("璧ゅ嘲","鍐呰挋鍙�"); + CITY_MAP.put("鍏畨","瀹夊窘"); + CITY_MAP.put("姹犲窞","瀹夊窘"); + CITY_MAP.put("绂忓窞","绂忓缓"); + CITY_MAP.put("鎯犲窞","骞夸笢"); + CITY_MAP.put("姹熼棬","骞夸笢"); + CITY_MAP.put("姹曞ご","骞夸笢"); + CITY_MAP.put("姊у窞","骞胯タ"); + CITY_MAP.put("鏌冲窞","骞胯タ"); + CITY_MAP.put("淇濆畾","娌冲寳"); + CITY_MAP.put("鍛ㄥ彛","娌冲崡"); + CITY_MAP.put("鍗楅槼","娌冲崡"); + CITY_MAP.put("瀛濇劅","婀栧寳"); + CITY_MAP.put("榛勭煶","婀栧寳"); + CITY_MAP.put("寮犲鐣�","婀栧崡"); + CITY_MAP.put("婀樻江","婀栧崡"); + CITY_MAP.put("姘稿窞","婀栧崡"); + CITY_MAP.put("鍗椾含","姹熻嫃"); + CITY_MAP.put("寰愬窞","姹熻嫃"); + CITY_MAP.put("鏃犻敗","姹熻嫃"); + CITY_MAP.put("鍚夊畨","姹熻タ"); + CITY_MAP.put("钁姦宀�","杈藉畞"); + CITY_MAP.put("闉嶅北","杈藉畞"); + CITY_MAP.put("鍛煎拰娴╃壒","鍐呰挋鍙�"); + CITY_MAP.put("鍚村繝","瀹佸"); + CITY_MAP.put("鍜搁槼","闄曡タ"); + CITY_MAP.put("瀹夊悍","闄曡タ"); + CITY_MAP.put("娉板畨","灞变笢"); + CITY_MAP.put("鐑熷彴","灞变笢"); + CITY_MAP.put("鍚曟","灞辫タ"); + CITY_MAP.put("杩愬煄","灞辫タ"); + CITY_MAP.put("骞垮厓","鍥涘窛"); + CITY_MAP.put("閬傚畞","鍥涘窛"); + CITY_MAP.put("娉稿窞","鍥涘窛"); + CITY_MAP.put("澶╂触","澶╂触"); + CITY_MAP.put("閲戝崕","娴欐睙"); + CITY_MAP.put("鍢夊叴","娴欐睙"); + CITY_MAP.put("鐭冲槾灞�","瀹佸"); + CITY_MAP.put("鏄��","浜戝崡"); + CITY_MAP.put("閾滈櫟","瀹夊窘"); + CITY_MAP.put("鑲囧簡","骞夸笢"); + CITY_MAP.put("姹曞熬","骞夸笢"); + CITY_MAP.put("鍢夊唱鍏�","鐢樿們"); + CITY_MAP.put("娣卞湷","骞夸笢"); + CITY_MAP.put("璐垫腐","骞胯タ"); + CITY_MAP.put("婕渤","娌冲崡"); + CITY_MAP.put("鎵窞","姹熻嫃"); + CITY_MAP.put("杩炰簯娓�","姹熻嫃"); + CITY_MAP.put("甯稿窞","姹熻嫃"); + CITY_MAP.put("涔濇睙","姹熻タ"); + CITY_MAP.put("閲戞槍","鐢樿們"); + CITY_MAP.put("钀嶄埂","姹熻タ"); + CITY_MAP.put("杈介槼","杈藉畞"); + CITY_MAP.put("姹変腑","闄曡タ"); + CITY_MAP.put("鑿忔辰","灞变笢"); + CITY_MAP.put("娣勫崥","灞变笢"); + CITY_MAP.put("澶у悓","灞辫タ"); + CITY_MAP.put("闀挎不","灞辫タ"); + CITY_MAP.put("闃虫硥","灞辫タ"); + CITY_MAP.put("椹瀺灞�","瀹夊窘"); + CITY_MAP.put("骞冲噳","鐢樿們"); + CITY_MAP.put("鐧介摱","鐢樿們"); + CITY_MAP.put("閾跺窛","瀹佸"); + CITY_MAP.put("鐜夋灄","骞胯タ"); + CITY_MAP.put("鍜稿畞","婀栧寳"); + CITY_MAP.put("鎬�鍖�","婀栧崡"); + CITY_MAP.put("涓婇ザ","姹熻タ"); + CITY_MAP.put("璧e窞","姹熻タ"); + CITY_MAP.put("鑱婂煄","灞变笢"); + CITY_MAP.put("蹇诲窞","灞辫タ"); + CITY_MAP.put("涓存本","灞辫タ"); + CITY_MAP.put("杈惧窞","鍥涘窛"); + CITY_MAP.put("鍏板窞","鐢樿們"); + CITY_MAP.put("瀹垮窞","瀹夊窘"); + CITY_MAP.put("闅忓窞","婀栧寳"); + CITY_MAP.put("寰峰窞","灞变笢"); + CITY_MAP.put("閰掓硥","鐢樿們"); + CITY_MAP.put("榛戞渤","榛戦緳姹�"); + CITY_MAP.put("浼婃槬","榛戦緳姹�"); + CITY_MAP.put("榻愰綈鍝堝皵","榛戦緳姹�"); + CITY_MAP.put("浣虫湪鏂�","榛戦緳姹�"); + CITY_MAP.put("楣ゅ矖","榛戦緳姹�"); + CITY_MAP.put("缁ュ寲","榛戦緳姹�"); + CITY_MAP.put("鍙岄腑灞�","榛戦緳姹�"); + CITY_MAP.put("楦¤タ","榛戦緳姹�"); + CITY_MAP.put("涓冨彴娌�","榛戦緳姹�"); + CITY_MAP.put("鍝堝皵婊�","榛戦緳姹�"); + CITY_MAP.put("鐗′腹姹�","榛戦緳姹�"); + CITY_MAP.put("澶у簡","榛戦緳姹�"); + CITY_MAP.put("鐧藉煄","鍚夋灄"); + CITY_MAP.put("鏉惧師","鍚夋灄"); + CITY_MAP.put("闀挎槬","鍚夋灄"); + CITY_MAP.put("鍥涘钩","鍚夋灄"); + CITY_MAP.put("鐧藉北","鍚夋灄"); + CITY_MAP.put("娌堥槼","杈藉畞"); + CITY_MAP.put("闃滄柊","杈藉畞"); + CITY_MAP.put("閾佸箔","杈藉畞"); + CITY_MAP.put("鍛间鸡璐濆皵","鍐呰挋鍙�"); + CITY_MAP.put("鍏村畨鐩�","鍐呰挋鍙�"); + CITY_MAP.put("閿℃灄閮嫆鐩�","鍐呰挋鍙�"); + CITY_MAP.put("閫氳窘","鍐呰挋鍙�"); + CITY_MAP.put("瑗垮畞","闈掓捣"); + CITY_MAP.put("寰烽槼","鍥涘窛"); + CITY_MAP.put("鎴愰兘","鍥涘窛"); + CITY_MAP.put("闆呭畨","鍥涘窛"); + CITY_MAP.put("鐪夊北","鍥涘窛"); + CITY_MAP.put("鑷础","鍥涘窛"); + CITY_MAP.put("涔愬北","鍥涘窛"); + CITY_MAP.put("鏀�鏋濊姳","鍥涘窛"); + CITY_MAP.put("涔岄瞾鏈ㄩ綈","鏂扮枂"); + CITY_MAP.put("鍏嬫媺鐜涗緷","鏂扮枂"); + CITY_MAP.put("鍚夋灄","鍚夋灄"); } private static final Map LNG_LAT_MAP = new HashMap(); static { - LNG_LAT_MAP.put("拉萨","91.111891,29.662557"); - LNG_LAT_MAP.put("昆明","102.714601,25.049153"); - LNG_LAT_MAP.put("玉溪","102.545068,24.370447"); - LNG_LAT_MAP.put("普洱","100.980058,22.788778"); - LNG_LAT_MAP.put("临沧","100.092613,23.887806"); - LNG_LAT_MAP.put("保山","99.177996,25.120489"); - LNG_LAT_MAP.put("丽江","100.229628,26.875351"); - LNG_LAT_MAP.put("张掖","100.459892,38.93932"); - LNG_LAT_MAP.put("武威","102.640147,37.933172"); - LNG_LAT_MAP.put("东莞","113.763434,23.043024"); - LNG_LAT_MAP.put("三亚","109.522771,18.257776"); - LNG_LAT_MAP.put("鄂州","114.895594,30.384439"); - LNG_LAT_MAP.put("乌海","106.831999,39.683177"); - LNG_LAT_MAP.put("莱芜","117.684667,36.233654"); - LNG_LAT_MAP.put("海口","110.330802,20.022071"); - LNG_LAT_MAP.put("蚌埠","117.35708,32.929499"); - LNG_LAT_MAP.put("合肥","117.282699,31.866942"); - LNG_LAT_MAP.put("阜阳","115.820932,32.901211"); - LNG_LAT_MAP.put("芜湖","118.384108,31.36602"); - LNG_LAT_MAP.put("安庆","117.058739,30.537898"); - LNG_LAT_MAP.put("北京","116.395645,39.929986"); - LNG_LAT_MAP.put("重庆","106.530635,29.544606"); - LNG_LAT_MAP.put("南平","118.181883,26.643626"); - LNG_LAT_MAP.put("泉州","118.600362,24.901652"); - LNG_LAT_MAP.put("庆阳","107.644227,35.726801"); - LNG_LAT_MAP.put("定西","104.626638,35.586056"); - LNG_LAT_MAP.put("韶关","113.594461,24.80296"); - LNG_LAT_MAP.put("佛山","113.134026,23.035095"); - LNG_LAT_MAP.put("茂名","110.931245,21.668226"); - LNG_LAT_MAP.put("珠海","113.562447,22.256915"); - LNG_LAT_MAP.put("梅州","116.126403,24.304571"); - LNG_LAT_MAP.put("桂林","110.26092,25.262901"); - LNG_LAT_MAP.put("河池","108.069948,24.699521"); - LNG_LAT_MAP.put("崇左","107.357322,22.415455"); - LNG_LAT_MAP.put("钦州","108.638798,21.97335"); - LNG_LAT_MAP.put("贵阳","106.709177,26.629907"); - LNG_LAT_MAP.put("六盘水","104.852087,26.591866"); - LNG_LAT_MAP.put("秦皇岛","119.604368,39.945462"); - LNG_LAT_MAP.put("沧州","116.863806,38.297615"); - LNG_LAT_MAP.put("石家庄","114.522082,38.048958"); - LNG_LAT_MAP.put("邯郸","114.482694,36.609308"); - LNG_LAT_MAP.put("新乡","113.91269,35.307258"); - LNG_LAT_MAP.put("洛阳","112.447525,34.657368"); - LNG_LAT_MAP.put("商丘","115.641886,34.438589"); - LNG_LAT_MAP.put("许昌","113.835312,34.02674"); - LNG_LAT_MAP.put("荆州","112.241866,30.332591"); - LNG_LAT_MAP.put("长沙","112.979353,28.213478"); - LNG_LAT_MAP.put("衡阳","112.583819,26.898164"); - LNG_LAT_MAP.put("镇江","119.455835,32.204409"); - LNG_LAT_MAP.put("南通","120.873801,32.014665"); - LNG_LAT_MAP.put("淮安","119.030186,33.606513"); - LNG_LAT_MAP.put("南昌","115.893528,28.689578"); - LNG_LAT_MAP.put("新余","114.947117,27.822322"); - LNG_LAT_MAP.put("通化","125.94265,41.736397"); - LNG_LAT_MAP.put("锦州","121.147749,41.130879"); - LNG_LAT_MAP.put("大连","121.593478,38.94871"); - LNG_LAT_MAP.put("乌兰察布","113.112846,41.022363"); - LNG_LAT_MAP.put("巴彦淖尔","107.423807,40.76918"); - LNG_LAT_MAP.put("渭南","109.483933,34.502358"); - LNG_LAT_MAP.put("宝鸡","107.170645,34.364081"); - LNG_LAT_MAP.put("枣庄","117.279305,34.807883"); - LNG_LAT_MAP.put("日照","119.50718,35.420225"); - LNG_LAT_MAP.put("东营","118.583926,37.487121"); - LNG_LAT_MAP.put("威海","122.093958,37.528787"); - LNG_LAT_MAP.put("太原","112.550864,37.890277"); - LNG_LAT_MAP.put("温州","120.690635,28.002838"); - LNG_LAT_MAP.put("杭州","120.219375,30.259244"); - LNG_LAT_MAP.put("宁波","121.579006,29.885259"); - LNG_LAT_MAP.put("中卫","105.196754,37.521124"); - LNG_LAT_MAP.put("辽源","125.133686,42.923303"); - LNG_LAT_MAP.put("抚顺","123.92982,41.877304"); - LNG_LAT_MAP.put("宜宾","104.633019,28.769675"); - LNG_LAT_MAP.put("中山","113.42206,22.545178"); - LNG_LAT_MAP.put("亳州","115.787928,33.871211"); - LNG_LAT_MAP.put("滁州","118.32457,32.317351"); - LNG_LAT_MAP.put("宣城","118.752096,30.951642"); - LNG_LAT_MAP.put("廊坊","116.703602,39.518611"); - LNG_LAT_MAP.put("宁德","119.542082,26.656527"); - LNG_LAT_MAP.put("龙岩","117.017997,25.078685"); - LNG_LAT_MAP.put("厦门","118.103886,24.489231"); - LNG_LAT_MAP.put("莆田","119.077731,25.44845"); - LNG_LAT_MAP.put("天水","105.736932,34.584319"); - LNG_LAT_MAP.put("清远","113.040773,23.698469"); - LNG_LAT_MAP.put("湛江","110.365067,21.257463"); - LNG_LAT_MAP.put("阳江","111.97701,21.871517"); - LNG_LAT_MAP.put("河源","114.713721,23.757251"); - LNG_LAT_MAP.put("潮州","116.630076,23.661812"); - LNG_LAT_MAP.put("来宾","109.231817,23.741166"); - LNG_LAT_MAP.put("百色","106.631821,23.901512"); - LNG_LAT_MAP.put("防城港","108.351791,21.617398"); - LNG_LAT_MAP.put("承德","117.933822,40.992521"); - LNG_LAT_MAP.put("衡水","115.686229,37.746929"); - LNG_LAT_MAP.put("濮阳","115.026627,35.753298"); - LNG_LAT_MAP.put("开封","114.351642,34.801854"); - LNG_LAT_MAP.put("焦作","113.211836,35.234608"); - LNG_LAT_MAP.put("三门峡","111.181262,34.78332"); - LNG_LAT_MAP.put("平顶山","113.300849,33.745301"); - LNG_LAT_MAP.put("信阳","114.085491,32.128582"); - LNG_LAT_MAP.put("鹤壁","114.29777,35.755426"); - LNG_LAT_MAP.put("十堰","110.801229,32.636994"); - LNG_LAT_MAP.put("荆门","112.21733,31.042611"); - LNG_LAT_MAP.put("武汉","114.3162,30.581084"); - LNG_LAT_MAP.put("常德","111.653718,29.012149"); - LNG_LAT_MAP.put("岳阳","113.146196,29.378007"); - LNG_LAT_MAP.put("娄底","111.996396,27.741073"); - LNG_LAT_MAP.put("株洲","113.131695,27.827433"); - LNG_LAT_MAP.put("盐城","120.148872,33.379862"); - LNG_LAT_MAP.put("苏州","120.619907,31.317987"); - LNG_LAT_MAP.put("景德镇","117.186523,29.303563"); - LNG_LAT_MAP.put("抚州","116.360919,27.954545"); - LNG_LAT_MAP.put("本溪","123.778062,41.325838"); - LNG_LAT_MAP.put("盘锦","122.073228,41.141248"); - LNG_LAT_MAP.put("包头","109.846239,40.647119"); - LNG_LAT_MAP.put("阿拉善盟","105.695683,38.843075"); - LNG_LAT_MAP.put("榆林","109.745926,38.279439"); - LNG_LAT_MAP.put("铜川","108.968067,34.908368"); - LNG_LAT_MAP.put("西安","108.953098,34.2778"); - LNG_LAT_MAP.put("临沂","118.340768,35.072409"); - LNG_LAT_MAP.put("滨州","117.968292,37.405314"); - LNG_LAT_MAP.put("青岛","120.384428,36.105215"); - LNG_LAT_MAP.put("朔州","112.479928,39.337672"); - LNG_LAT_MAP.put("晋中","112.738514,37.693362"); - LNG_LAT_MAP.put("巴中","106.757916,31.869189"); - LNG_LAT_MAP.put("绵阳","104.705519,31.504701"); - LNG_LAT_MAP.put("广安","106.63572,30.463984"); - LNG_LAT_MAP.put("资阳","104.63593,30.132191"); - LNG_LAT_MAP.put("衢州","118.875842,28.95691"); - LNG_LAT_MAP.put("台州","121.440613,28.668283"); - LNG_LAT_MAP.put("舟山","122.169872,30.03601"); - LNG_LAT_MAP.put("固原","106.285268,36.021523"); - LNG_LAT_MAP.put("内江","105.073056,29.599462"); - LNG_LAT_MAP.put("曲靖","103.782539,25.520758"); - LNG_LAT_MAP.put("淮南","117.018639,32.642812"); - LNG_LAT_MAP.put("黄山","118.29357,29.734435"); - LNG_LAT_MAP.put("淮北","116.791447,33.960023"); - LNG_LAT_MAP.put("三明","117.642194,26.270835"); - LNG_LAT_MAP.put("漳州","117.676205,24.517065"); - LNG_LAT_MAP.put("陇南","104.934573,33.39448"); - LNG_LAT_MAP.put("广州","113.30765,23.120049"); - LNG_LAT_MAP.put("云浮","112.050946,22.937976"); - LNG_LAT_MAP.put("揭阳","116.379501,23.547999"); - LNG_LAT_MAP.put("贺州","111.552594,24.411054"); - LNG_LAT_MAP.put("南宁","108.297234,22.806493"); - LNG_LAT_MAP.put("遵义","106.93126,27.699961"); - LNG_LAT_MAP.put("安顺","105.92827,26.228595"); - LNG_LAT_MAP.put("张家口","114.893782,40.811188"); - LNG_LAT_MAP.put("唐山","118.183451,39.650531"); - LNG_LAT_MAP.put("邢台","114.520487,37.069531"); - LNG_LAT_MAP.put("安阳","114.351807,36.110267"); - LNG_LAT_MAP.put("郑州","113.649644,34.75661"); - LNG_LAT_MAP.put("驻马店","114.049154,32.983158"); - LNG_LAT_MAP.put("宜昌","111.310981,30.732758"); - LNG_LAT_MAP.put("黄冈","114.906618,30.446109"); - LNG_LAT_MAP.put("益阳","112.366547,28.588088"); - LNG_LAT_MAP.put("邵阳","111.461525,27.236811"); - LNG_LAT_MAP.put("郴州","113.037704,25.782264"); - LNG_LAT_MAP.put("泰州","119.919606,32.476053"); - LNG_LAT_MAP.put("宿迁","118.296893,33.95205"); - LNG_LAT_MAP.put("宜春","114.400039,27.81113"); - LNG_LAT_MAP.put("鹰潭","117.03545,28.24131"); - LNG_LAT_MAP.put("朝阳","120.446163,41.571828"); - LNG_LAT_MAP.put("营口","122.233391,40.668651"); - LNG_LAT_MAP.put("丹东","124.338543,40.129023"); - LNG_LAT_MAP.put("鄂尔多斯","109.993706,39.81649"); - LNG_LAT_MAP.put("延安","109.50051,36.60332"); - LNG_LAT_MAP.put("商洛","109.934208,33.873907"); - LNG_LAT_MAP.put("济宁","116.600798,35.402122"); - LNG_LAT_MAP.put("潍坊","119.142634,36.716115"); - LNG_LAT_MAP.put("济南","117.024967,36.682785"); - LNG_LAT_MAP.put("上海","121.487899,31.249162"); - LNG_LAT_MAP.put("晋城","112.867333,35.499834"); - LNG_LAT_MAP.put("南充","106.105554,30.800965"); - LNG_LAT_MAP.put("丽水","119.929576,28.4563"); - LNG_LAT_MAP.put("绍兴","120.592467,30.002365"); - LNG_LAT_MAP.put("湖州","120.137243,30.877925"); - LNG_LAT_MAP.put("北海","109.122628,21.472718"); - LNG_LAT_MAP.put("赤峰","118.930761,42.297112"); - LNG_LAT_MAP.put("六安","116.505253,31.755558"); - LNG_LAT_MAP.put("池州","117.494477,30.660019"); - LNG_LAT_MAP.put("福州","119.330221,26.047125"); - LNG_LAT_MAP.put("惠州","114.410658,23.11354"); - LNG_LAT_MAP.put("江门","113.078125,22.575117"); - LNG_LAT_MAP.put("汕头","116.72865,23.383908"); - LNG_LAT_MAP.put("梧州","111.305472,23.485395"); - LNG_LAT_MAP.put("柳州","109.422402,24.329053"); - LNG_LAT_MAP.put("保定","115.49481,38.886565"); - LNG_LAT_MAP.put("周口","114.654102,33.623741"); - LNG_LAT_MAP.put("南阳","112.542842,33.01142"); - LNG_LAT_MAP.put("孝感","113.935734,30.927955"); - LNG_LAT_MAP.put("黄石","115.050683,30.216127"); - LNG_LAT_MAP.put("张家界","110.48162,29.124889"); - LNG_LAT_MAP.put("湘潭","112.935556,27.835095"); - LNG_LAT_MAP.put("永州","111.614648,26.435972"); - LNG_LAT_MAP.put("南京","118.778074,32.057236"); - LNG_LAT_MAP.put("徐州","117.188107,34.271553"); - LNG_LAT_MAP.put("无锡","120.305456,31.570037"); - LNG_LAT_MAP.put("吉安","114.992039,27.113848"); - LNG_LAT_MAP.put("葫芦岛","120.860758,40.74303"); - LNG_LAT_MAP.put("鞍山","123.007763,41.118744"); - LNG_LAT_MAP.put("呼和浩特","111.660351,40.828319"); - LNG_LAT_MAP.put("吴忠","106.208254,37.993561"); - LNG_LAT_MAP.put("咸阳","108.707509,34.345373"); - LNG_LAT_MAP.put("安康","109.038045,32.70437"); - LNG_LAT_MAP.put("泰安","117.089415,36.188078"); - LNG_LAT_MAP.put("烟台","121.309555,37.536562"); - LNG_LAT_MAP.put("吕梁","111.143157,37.527316"); - LNG_LAT_MAP.put("运城","111.006854,35.038859"); - LNG_LAT_MAP.put("广元","105.819687,32.44104"); - LNG_LAT_MAP.put("遂宁","105.564888,30.557491"); - LNG_LAT_MAP.put("泸州","105.44397,28.89593"); - LNG_LAT_MAP.put("天津","117.210813,39.14393"); - LNG_LAT_MAP.put("金华","119.652576,29.102899"); - LNG_LAT_MAP.put("嘉兴","120.760428,30.773992"); - LNG_LAT_MAP.put("石嘴山","106.379337,39.020223"); - LNG_LAT_MAP.put("昭通","103.725021,27.340633"); - LNG_LAT_MAP.put("铜陵","117.819429,30.94093"); - LNG_LAT_MAP.put("肇庆","112.479653,23.078663"); - LNG_LAT_MAP.put("汕尾","115.372924,22.778731"); - LNG_LAT_MAP.put("嘉峪关","98.281635,39.802397"); - LNG_LAT_MAP.put("深圳","114.025974,22.546054"); - LNG_LAT_MAP.put("贵港","109.613708,23.103373"); - LNG_LAT_MAP.put("漯河","114.046061,33.576279"); - LNG_LAT_MAP.put("扬州","119.427778,32.408505"); - LNG_LAT_MAP.put("连云港","119.173872,34.601549"); - LNG_LAT_MAP.put("常州","119.981861,31.771397"); - LNG_LAT_MAP.put("九江","115.999848,29.71964"); - LNG_LAT_MAP.put("金昌","102.208126,38.516072"); - LNG_LAT_MAP.put("萍乡","113.859917,27.639544"); - LNG_LAT_MAP.put("辽阳","123.172451,41.273339"); - LNG_LAT_MAP.put("汉中","107.045478,33.081569"); - LNG_LAT_MAP.put("菏泽","115.46336,35.26244"); - LNG_LAT_MAP.put("淄博","118.059134,36.804685"); - LNG_LAT_MAP.put("大同","113.290509,40.113744"); - LNG_LAT_MAP.put("长治","113.120292,36.201664"); - LNG_LAT_MAP.put("阳泉","113.569238,37.869529"); - LNG_LAT_MAP.put("马鞍山","118.515882,31.688528"); - LNG_LAT_MAP.put("平凉","106.688911,35.55011"); - LNG_LAT_MAP.put("白银","104.171241,36.546682"); - LNG_LAT_MAP.put("银川","106.206479,38.502621"); - LNG_LAT_MAP.put("玉林","110.151676,22.643974"); - LNG_LAT_MAP.put("咸宁","114.300061,29.880657"); - LNG_LAT_MAP.put("怀化","109.986959,27.557483"); - LNG_LAT_MAP.put("上饶","117.955464,28.457623"); - LNG_LAT_MAP.put("赣州","114.935909,25.845296"); - LNG_LAT_MAP.put("聊城","115.986869,36.455829"); - LNG_LAT_MAP.put("忻州","112.727939,38.461031"); - LNG_LAT_MAP.put("临汾","111.538788,36.099745"); - LNG_LAT_MAP.put("达州","107.494973,31.214199"); - LNG_LAT_MAP.put("兰州","103.823305,36.064226"); - LNG_LAT_MAP.put("宿州","116.988692,33.636772"); - LNG_LAT_MAP.put("随州","113.379358,31.717858"); - LNG_LAT_MAP.put("德州","116.328161,37.460826"); - LNG_LAT_MAP.put("酒泉","98.508415,39.741474"); - LNG_LAT_MAP.put("黑河","127.50083,50.25069"); - LNG_LAT_MAP.put("伊春","128.910766,47.734685"); - LNG_LAT_MAP.put("齐齐哈尔","123.987289,47.3477"); - LNG_LAT_MAP.put("佳木斯","130.284735,46.81378"); - LNG_LAT_MAP.put("鹤岗","130.292472,47.338666"); - LNG_LAT_MAP.put("绥化","126.989095,46.646064"); - LNG_LAT_MAP.put("双鸭山","131.171402,46.655102"); - LNG_LAT_MAP.put("鸡西","130.941767,45.32154"); - LNG_LAT_MAP.put("七台河","131.019048,45.775005"); - LNG_LAT_MAP.put("哈尔滨","126.657717,45.773225"); - LNG_LAT_MAP.put("牡丹江","129.608035,44.588521"); - LNG_LAT_MAP.put("大庆","125.02184,46.596709"); - LNG_LAT_MAP.put("白城","122.840777,45.621086"); - LNG_LAT_MAP.put("松原","124.832995,45.136049"); - LNG_LAT_MAP.put("长春","125.313642,43.898338"); - LNG_LAT_MAP.put("四平","124.391382,43.175525"); - LNG_LAT_MAP.put("白山","126.435798,41.945859"); - LNG_LAT_MAP.put("沈阳","123.432791,41.808645"); - LNG_LAT_MAP.put("阜新","121.660822,42.01925"); - LNG_LAT_MAP.put("铁岭","123.85485,42.299757"); - LNG_LAT_MAP.put("呼伦贝尔","119.760822,49.201636"); - LNG_LAT_MAP.put("兴安盟","122.048167,46.083757"); - LNG_LAT_MAP.put("锡林郭勒盟","116.02734,43.939705"); - LNG_LAT_MAP.put("通辽","122.260363,43.633756"); - LNG_LAT_MAP.put("西宁","101.767921,36.640739"); - LNG_LAT_MAP.put("德阳","104.402398,31.13114"); - LNG_LAT_MAP.put("成都","104.067923,30.679943"); - LNG_LAT_MAP.put("雅安","103.009356,29.999716"); - LNG_LAT_MAP.put("眉山","103.84143,30.061115"); - LNG_LAT_MAP.put("自贡","104.776071,29.359157"); - LNG_LAT_MAP.put("乐山","103.760824,29.600958"); - LNG_LAT_MAP.put("攀枝花","101.722423,26.587571"); - LNG_LAT_MAP.put("乌鲁木齐","87.564988,43.84038"); - LNG_LAT_MAP.put("克拉玛依","84.88118,45.594331"); - LNG_LAT_MAP.put("吉林","126.564544,43.871988"); + LNG_LAT_MAP.put("鎷夎惃","91.111891,29.662557"); + LNG_LAT_MAP.put("鏄嗘槑","102.714601,25.049153"); + LNG_LAT_MAP.put("鐜夋邯","102.545068,24.370447"); + LNG_LAT_MAP.put("鏅幢","100.980058,22.788778"); + LNG_LAT_MAP.put("涓存钵","100.092613,23.887806"); + LNG_LAT_MAP.put("淇濆北","99.177996,25.120489"); + LNG_LAT_MAP.put("涓芥睙","100.229628,26.875351"); + LNG_LAT_MAP.put("寮犳帠","100.459892,38.93932"); + LNG_LAT_MAP.put("姝﹀▉","102.640147,37.933172"); + LNG_LAT_MAP.put("涓滆帪","113.763434,23.043024"); + LNG_LAT_MAP.put("涓変簹","109.522771,18.257776"); + LNG_LAT_MAP.put("閯傚窞","114.895594,30.384439"); + LNG_LAT_MAP.put("涔屾捣","106.831999,39.683177"); + LNG_LAT_MAP.put("鑾辫姕","117.684667,36.233654"); + LNG_LAT_MAP.put("娴峰彛","110.330802,20.022071"); + LNG_LAT_MAP.put("铓屽煚","117.35708,32.929499"); + LNG_LAT_MAP.put("鍚堣偉","117.282699,31.866942"); + LNG_LAT_MAP.put("闃滈槼","115.820932,32.901211"); + LNG_LAT_MAP.put("鑺滄箹","118.384108,31.36602"); + LNG_LAT_MAP.put("瀹夊簡","117.058739,30.537898"); + LNG_LAT_MAP.put("鍖椾含","116.395645,39.929986"); + LNG_LAT_MAP.put("閲嶅簡","106.530635,29.544606"); + LNG_LAT_MAP.put("鍗楀钩","118.181883,26.643626"); + LNG_LAT_MAP.put("娉夊窞","118.600362,24.901652"); + LNG_LAT_MAP.put("搴嗛槼","107.644227,35.726801"); + LNG_LAT_MAP.put("瀹氳タ","104.626638,35.586056"); + LNG_LAT_MAP.put("闊跺叧","113.594461,24.80296"); + LNG_LAT_MAP.put("浣涘北","113.134026,23.035095"); + LNG_LAT_MAP.put("鑼傚悕","110.931245,21.668226"); + LNG_LAT_MAP.put("鐝犳捣","113.562447,22.256915"); + LNG_LAT_MAP.put("姊呭窞","116.126403,24.304571"); + LNG_LAT_MAP.put("妗傛灄","110.26092,25.262901"); + LNG_LAT_MAP.put("娌虫睜","108.069948,24.699521"); + LNG_LAT_MAP.put("宕囧乏","107.357322,22.415455"); + LNG_LAT_MAP.put("閽﹀窞","108.638798,21.97335"); + LNG_LAT_MAP.put("璐甸槼","106.709177,26.629907"); + LNG_LAT_MAP.put("鍏洏姘�","104.852087,26.591866"); + LNG_LAT_MAP.put("绉︾殗宀�","119.604368,39.945462"); + LNG_LAT_MAP.put("娌у窞","116.863806,38.297615"); + LNG_LAT_MAP.put("鐭冲搴�","114.522082,38.048958"); + LNG_LAT_MAP.put("閭兏","114.482694,36.609308"); + LNG_LAT_MAP.put("鏂颁埂","113.91269,35.307258"); + LNG_LAT_MAP.put("娲涢槼","112.447525,34.657368"); + LNG_LAT_MAP.put("鍟嗕笜","115.641886,34.438589"); + LNG_LAT_MAP.put("璁告槍","113.835312,34.02674"); + LNG_LAT_MAP.put("鑽嗗窞","112.241866,30.332591"); + LNG_LAT_MAP.put("闀挎矙","112.979353,28.213478"); + LNG_LAT_MAP.put("琛¢槼","112.583819,26.898164"); + LNG_LAT_MAP.put("闀囨睙","119.455835,32.204409"); + LNG_LAT_MAP.put("鍗楅��","120.873801,32.014665"); + LNG_LAT_MAP.put("娣畨","119.030186,33.606513"); + LNG_LAT_MAP.put("鍗楁槍","115.893528,28.689578"); + LNG_LAT_MAP.put("鏂颁綑","114.947117,27.822322"); + LNG_LAT_MAP.put("閫氬寲","125.94265,41.736397"); + LNG_LAT_MAP.put("閿﹀窞","121.147749,41.130879"); + LNG_LAT_MAP.put("澶ц繛","121.593478,38.94871"); + LNG_LAT_MAP.put("涔屽叞瀵熷竷","113.112846,41.022363"); + LNG_LAT_MAP.put("宸村溅娣栧皵","107.423807,40.76918"); + LNG_LAT_MAP.put("娓崡","109.483933,34.502358"); + LNG_LAT_MAP.put("瀹濋浮","107.170645,34.364081"); + LNG_LAT_MAP.put("鏋e簞","117.279305,34.807883"); + LNG_LAT_MAP.put("鏃ョ収","119.50718,35.420225"); + LNG_LAT_MAP.put("涓滆惀","118.583926,37.487121"); + LNG_LAT_MAP.put("濞佹捣","122.093958,37.528787"); + LNG_LAT_MAP.put("澶師","112.550864,37.890277"); + LNG_LAT_MAP.put("娓╁窞","120.690635,28.002838"); + LNG_LAT_MAP.put("鏉窞","120.219375,30.259244"); + LNG_LAT_MAP.put("瀹佹尝","121.579006,29.885259"); + LNG_LAT_MAP.put("涓崼","105.196754,37.521124"); + LNG_LAT_MAP.put("杈芥簮","125.133686,42.923303"); + LNG_LAT_MAP.put("鎶氶『","123.92982,41.877304"); + LNG_LAT_MAP.put("瀹滃","104.633019,28.769675"); + LNG_LAT_MAP.put("涓北","113.42206,22.545178"); + LNG_LAT_MAP.put("浜冲窞","115.787928,33.871211"); + LNG_LAT_MAP.put("婊佸窞","118.32457,32.317351"); + LNG_LAT_MAP.put("瀹e煄","118.752096,30.951642"); + LNG_LAT_MAP.put("寤婂潑","116.703602,39.518611"); + LNG_LAT_MAP.put("瀹佸痉","119.542082,26.656527"); + LNG_LAT_MAP.put("榫欏博","117.017997,25.078685"); + LNG_LAT_MAP.put("鍘﹂棬","118.103886,24.489231"); + LNG_LAT_MAP.put("鑾嗙敯","119.077731,25.44845"); + LNG_LAT_MAP.put("澶╂按","105.736932,34.584319"); + LNG_LAT_MAP.put("娓呰繙","113.040773,23.698469"); + LNG_LAT_MAP.put("婀涙睙","110.365067,21.257463"); + LNG_LAT_MAP.put("闃虫睙","111.97701,21.871517"); + LNG_LAT_MAP.put("娌虫簮","114.713721,23.757251"); + LNG_LAT_MAP.put("娼窞","116.630076,23.661812"); + LNG_LAT_MAP.put("鏉ュ","109.231817,23.741166"); + LNG_LAT_MAP.put("鐧捐壊","106.631821,23.901512"); + LNG_LAT_MAP.put("闃插煄娓�","108.351791,21.617398"); + LNG_LAT_MAP.put("鎵垮痉","117.933822,40.992521"); + LNG_LAT_MAP.put("琛℃按","115.686229,37.746929"); + LNG_LAT_MAP.put("婵槼","115.026627,35.753298"); + LNG_LAT_MAP.put("寮�灏�","114.351642,34.801854"); + LNG_LAT_MAP.put("鐒︿綔","113.211836,35.234608"); + LNG_LAT_MAP.put("涓夐棬宄�","111.181262,34.78332"); + LNG_LAT_MAP.put("骞抽《灞�","113.300849,33.745301"); + LNG_LAT_MAP.put("淇¢槼","114.085491,32.128582"); + LNG_LAT_MAP.put("楣ゅ","114.29777,35.755426"); + LNG_LAT_MAP.put("鍗佸牥","110.801229,32.636994"); + LNG_LAT_MAP.put("鑽嗛棬","112.21733,31.042611"); + LNG_LAT_MAP.put("姝︽眽","114.3162,30.581084"); + LNG_LAT_MAP.put("甯稿痉","111.653718,29.012149"); + LNG_LAT_MAP.put("宀抽槼","113.146196,29.378007"); + LNG_LAT_MAP.put("濞勫簳","111.996396,27.741073"); + LNG_LAT_MAP.put("鏍床","113.131695,27.827433"); + LNG_LAT_MAP.put("鐩愬煄","120.148872,33.379862"); + LNG_LAT_MAP.put("鑻忓窞","120.619907,31.317987"); + LNG_LAT_MAP.put("鏅痉闀�","117.186523,29.303563"); + LNG_LAT_MAP.put("鎶氬窞","116.360919,27.954545"); + LNG_LAT_MAP.put("鏈邯","123.778062,41.325838"); + LNG_LAT_MAP.put("鐩橀敠","122.073228,41.141248"); + LNG_LAT_MAP.put("鍖呭ご","109.846239,40.647119"); + LNG_LAT_MAP.put("闃挎媺鍠勭洘","105.695683,38.843075"); + LNG_LAT_MAP.put("姒嗘灄","109.745926,38.279439"); + LNG_LAT_MAP.put("閾滃窛","108.968067,34.908368"); + LNG_LAT_MAP.put("瑗垮畨","108.953098,34.2778"); + LNG_LAT_MAP.put("涓存矀","118.340768,35.072409"); + LNG_LAT_MAP.put("婊ㄥ窞","117.968292,37.405314"); + LNG_LAT_MAP.put("闈掑矝","120.384428,36.105215"); + LNG_LAT_MAP.put("鏈斿窞","112.479928,39.337672"); + LNG_LAT_MAP.put("鏅嬩腑","112.738514,37.693362"); + LNG_LAT_MAP.put("宸翠腑","106.757916,31.869189"); + LNG_LAT_MAP.put("缁甸槼","104.705519,31.504701"); + LNG_LAT_MAP.put("骞垮畨","106.63572,30.463984"); + LNG_LAT_MAP.put("璧勯槼","104.63593,30.132191"); + LNG_LAT_MAP.put("琛㈠窞","118.875842,28.95691"); + LNG_LAT_MAP.put("鍙板窞","121.440613,28.668283"); + LNG_LAT_MAP.put("鑸熷北","122.169872,30.03601"); + LNG_LAT_MAP.put("鍥哄師","106.285268,36.021523"); + LNG_LAT_MAP.put("鍐呮睙","105.073056,29.599462"); + LNG_LAT_MAP.put("鏇查潠","103.782539,25.520758"); + LNG_LAT_MAP.put("娣崡","117.018639,32.642812"); + LNG_LAT_MAP.put("榛勫北","118.29357,29.734435"); + LNG_LAT_MAP.put("娣寳","116.791447,33.960023"); + LNG_LAT_MAP.put("涓夋槑","117.642194,26.270835"); + LNG_LAT_MAP.put("婕冲窞","117.676205,24.517065"); + LNG_LAT_MAP.put("闄囧崡","104.934573,33.39448"); + LNG_LAT_MAP.put("骞垮窞","113.30765,23.120049"); + LNG_LAT_MAP.put("浜戞诞","112.050946,22.937976"); + LNG_LAT_MAP.put("鎻槼","116.379501,23.547999"); + LNG_LAT_MAP.put("璐哄窞","111.552594,24.411054"); + LNG_LAT_MAP.put("鍗楀畞","108.297234,22.806493"); + LNG_LAT_MAP.put("閬典箟","106.93126,27.699961"); + LNG_LAT_MAP.put("瀹夐『","105.92827,26.228595"); + LNG_LAT_MAP.put("寮犲鍙�","114.893782,40.811188"); + LNG_LAT_MAP.put("鍞愬北","118.183451,39.650531"); + LNG_LAT_MAP.put("閭㈠彴","114.520487,37.069531"); + LNG_LAT_MAP.put("瀹夐槼","114.351807,36.110267"); + LNG_LAT_MAP.put("閮戝窞","113.649644,34.75661"); + LNG_LAT_MAP.put("椹婚┈搴�","114.049154,32.983158"); + LNG_LAT_MAP.put("瀹滄槍","111.310981,30.732758"); + LNG_LAT_MAP.put("榛勫唸","114.906618,30.446109"); + LNG_LAT_MAP.put("鐩婇槼","112.366547,28.588088"); + LNG_LAT_MAP.put("閭甸槼","111.461525,27.236811"); + LNG_LAT_MAP.put("閮村窞","113.037704,25.782264"); + LNG_LAT_MAP.put("娉板窞","119.919606,32.476053"); + LNG_LAT_MAP.put("瀹胯縼","118.296893,33.95205"); + LNG_LAT_MAP.put("瀹滄槬","114.400039,27.81113"); + LNG_LAT_MAP.put("楣版江","117.03545,28.24131"); + LNG_LAT_MAP.put("鏈濋槼","120.446163,41.571828"); + LNG_LAT_MAP.put("钀ュ彛","122.233391,40.668651"); + LNG_LAT_MAP.put("涓逛笢","124.338543,40.129023"); + LNG_LAT_MAP.put("閯傚皵澶氭柉","109.993706,39.81649"); + LNG_LAT_MAP.put("寤跺畨","109.50051,36.60332"); + LNG_LAT_MAP.put("鍟嗘礇","109.934208,33.873907"); + LNG_LAT_MAP.put("娴庡畞","116.600798,35.402122"); + LNG_LAT_MAP.put("娼嶅潑","119.142634,36.716115"); + LNG_LAT_MAP.put("娴庡崡","117.024967,36.682785"); + LNG_LAT_MAP.put("涓婃捣","121.487899,31.249162"); + LNG_LAT_MAP.put("鏅嬪煄","112.867333,35.499834"); + LNG_LAT_MAP.put("鍗楀厖","106.105554,30.800965"); + LNG_LAT_MAP.put("涓芥按","119.929576,28.4563"); + LNG_LAT_MAP.put("缁嶅叴","120.592467,30.002365"); + LNG_LAT_MAP.put("婀栧窞","120.137243,30.877925"); + LNG_LAT_MAP.put("鍖楁捣","109.122628,21.472718"); + LNG_LAT_MAP.put("璧ゅ嘲","118.930761,42.297112"); + LNG_LAT_MAP.put("鍏畨","116.505253,31.755558"); + LNG_LAT_MAP.put("姹犲窞","117.494477,30.660019"); + LNG_LAT_MAP.put("绂忓窞","119.330221,26.047125"); + LNG_LAT_MAP.put("鎯犲窞","114.410658,23.11354"); + LNG_LAT_MAP.put("姹熼棬","113.078125,22.575117"); + LNG_LAT_MAP.put("姹曞ご","116.72865,23.383908"); + LNG_LAT_MAP.put("姊у窞","111.305472,23.485395"); + LNG_LAT_MAP.put("鏌冲窞","109.422402,24.329053"); + LNG_LAT_MAP.put("淇濆畾","115.49481,38.886565"); + LNG_LAT_MAP.put("鍛ㄥ彛","114.654102,33.623741"); + LNG_LAT_MAP.put("鍗楅槼","112.542842,33.01142"); + LNG_LAT_MAP.put("瀛濇劅","113.935734,30.927955"); + LNG_LAT_MAP.put("榛勭煶","115.050683,30.216127"); + LNG_LAT_MAP.put("寮犲鐣�","110.48162,29.124889"); + LNG_LAT_MAP.put("婀樻江","112.935556,27.835095"); + LNG_LAT_MAP.put("姘稿窞","111.614648,26.435972"); + LNG_LAT_MAP.put("鍗椾含","118.778074,32.057236"); + LNG_LAT_MAP.put("寰愬窞","117.188107,34.271553"); + LNG_LAT_MAP.put("鏃犻敗","120.305456,31.570037"); + LNG_LAT_MAP.put("鍚夊畨","114.992039,27.113848"); + LNG_LAT_MAP.put("钁姦宀�","120.860758,40.74303"); + LNG_LAT_MAP.put("闉嶅北","123.007763,41.118744"); + LNG_LAT_MAP.put("鍛煎拰娴╃壒","111.660351,40.828319"); + LNG_LAT_MAP.put("鍚村繝","106.208254,37.993561"); + LNG_LAT_MAP.put("鍜搁槼","108.707509,34.345373"); + LNG_LAT_MAP.put("瀹夊悍","109.038045,32.70437"); + LNG_LAT_MAP.put("娉板畨","117.089415,36.188078"); + LNG_LAT_MAP.put("鐑熷彴","121.309555,37.536562"); + LNG_LAT_MAP.put("鍚曟","111.143157,37.527316"); + LNG_LAT_MAP.put("杩愬煄","111.006854,35.038859"); + LNG_LAT_MAP.put("骞垮厓","105.819687,32.44104"); + LNG_LAT_MAP.put("閬傚畞","105.564888,30.557491"); + LNG_LAT_MAP.put("娉稿窞","105.44397,28.89593"); + LNG_LAT_MAP.put("澶╂触","117.210813,39.14393"); + LNG_LAT_MAP.put("閲戝崕","119.652576,29.102899"); + LNG_LAT_MAP.put("鍢夊叴","120.760428,30.773992"); + LNG_LAT_MAP.put("鐭冲槾灞�","106.379337,39.020223"); + LNG_LAT_MAP.put("鏄��","103.725021,27.340633"); + LNG_LAT_MAP.put("閾滈櫟","117.819429,30.94093"); + LNG_LAT_MAP.put("鑲囧簡","112.479653,23.078663"); + LNG_LAT_MAP.put("姹曞熬","115.372924,22.778731"); + LNG_LAT_MAP.put("鍢夊唱鍏�","98.281635,39.802397"); + LNG_LAT_MAP.put("娣卞湷","114.025974,22.546054"); + LNG_LAT_MAP.put("璐垫腐","109.613708,23.103373"); + LNG_LAT_MAP.put("婕渤","114.046061,33.576279"); + LNG_LAT_MAP.put("鎵窞","119.427778,32.408505"); + LNG_LAT_MAP.put("杩炰簯娓�","119.173872,34.601549"); + LNG_LAT_MAP.put("甯稿窞","119.981861,31.771397"); + LNG_LAT_MAP.put("涔濇睙","115.999848,29.71964"); + LNG_LAT_MAP.put("閲戞槍","102.208126,38.516072"); + LNG_LAT_MAP.put("钀嶄埂","113.859917,27.639544"); + LNG_LAT_MAP.put("杈介槼","123.172451,41.273339"); + LNG_LAT_MAP.put("姹変腑","107.045478,33.081569"); + LNG_LAT_MAP.put("鑿忔辰","115.46336,35.26244"); + LNG_LAT_MAP.put("娣勫崥","118.059134,36.804685"); + LNG_LAT_MAP.put("澶у悓","113.290509,40.113744"); + LNG_LAT_MAP.put("闀挎不","113.120292,36.201664"); + LNG_LAT_MAP.put("闃虫硥","113.569238,37.869529"); + LNG_LAT_MAP.put("椹瀺灞�","118.515882,31.688528"); + LNG_LAT_MAP.put("骞冲噳","106.688911,35.55011"); + LNG_LAT_MAP.put("鐧介摱","104.171241,36.546682"); + LNG_LAT_MAP.put("閾跺窛","106.206479,38.502621"); + LNG_LAT_MAP.put("鐜夋灄","110.151676,22.643974"); + LNG_LAT_MAP.put("鍜稿畞","114.300061,29.880657"); + LNG_LAT_MAP.put("鎬�鍖�","109.986959,27.557483"); + LNG_LAT_MAP.put("涓婇ザ","117.955464,28.457623"); + LNG_LAT_MAP.put("璧e窞","114.935909,25.845296"); + LNG_LAT_MAP.put("鑱婂煄","115.986869,36.455829"); + LNG_LAT_MAP.put("蹇诲窞","112.727939,38.461031"); + LNG_LAT_MAP.put("涓存本","111.538788,36.099745"); + LNG_LAT_MAP.put("杈惧窞","107.494973,31.214199"); + LNG_LAT_MAP.put("鍏板窞","103.823305,36.064226"); + LNG_LAT_MAP.put("瀹垮窞","116.988692,33.636772"); + LNG_LAT_MAP.put("闅忓窞","113.379358,31.717858"); + LNG_LAT_MAP.put("寰峰窞","116.328161,37.460826"); + LNG_LAT_MAP.put("閰掓硥","98.508415,39.741474"); + LNG_LAT_MAP.put("榛戞渤","127.50083,50.25069"); + LNG_LAT_MAP.put("浼婃槬","128.910766,47.734685"); + LNG_LAT_MAP.put("榻愰綈鍝堝皵","123.987289,47.3477"); + LNG_LAT_MAP.put("浣虫湪鏂�","130.284735,46.81378"); + LNG_LAT_MAP.put("楣ゅ矖","130.292472,47.338666"); + LNG_LAT_MAP.put("缁ュ寲","126.989095,46.646064"); + LNG_LAT_MAP.put("鍙岄腑灞�","131.171402,46.655102"); + LNG_LAT_MAP.put("楦¤タ","130.941767,45.32154"); + LNG_LAT_MAP.put("涓冨彴娌�","131.019048,45.775005"); + LNG_LAT_MAP.put("鍝堝皵婊�","126.657717,45.773225"); + LNG_LAT_MAP.put("鐗′腹姹�","129.608035,44.588521"); + LNG_LAT_MAP.put("澶у簡","125.02184,46.596709"); + LNG_LAT_MAP.put("鐧藉煄","122.840777,45.621086"); + LNG_LAT_MAP.put("鏉惧師","124.832995,45.136049"); + LNG_LAT_MAP.put("闀挎槬","125.313642,43.898338"); + LNG_LAT_MAP.put("鍥涘钩","124.391382,43.175525"); + LNG_LAT_MAP.put("鐧藉北","126.435798,41.945859"); + LNG_LAT_MAP.put("娌堥槼","123.432791,41.808645"); + LNG_LAT_MAP.put("闃滄柊","121.660822,42.01925"); + LNG_LAT_MAP.put("閾佸箔","123.85485,42.299757"); + LNG_LAT_MAP.put("鍛间鸡璐濆皵","119.760822,49.201636"); + LNG_LAT_MAP.put("鍏村畨鐩�","122.048167,46.083757"); + LNG_LAT_MAP.put("閿℃灄閮嫆鐩�","116.02734,43.939705"); + LNG_LAT_MAP.put("閫氳窘","122.260363,43.633756"); + LNG_LAT_MAP.put("瑗垮畞","101.767921,36.640739"); + LNG_LAT_MAP.put("寰烽槼","104.402398,31.13114"); + LNG_LAT_MAP.put("鎴愰兘","104.067923,30.679943"); + LNG_LAT_MAP.put("闆呭畨","103.009356,29.999716"); + LNG_LAT_MAP.put("鐪夊北","103.84143,30.061115"); + LNG_LAT_MAP.put("鑷础","104.776071,29.359157"); + LNG_LAT_MAP.put("涔愬北","103.760824,29.600958"); + LNG_LAT_MAP.put("鏀�鏋濊姳","101.722423,26.587571"); + LNG_LAT_MAP.put("涔岄瞾鏈ㄩ綈","87.564988,43.84038"); + LNG_LAT_MAP.put("鍏嬫媺鐜涗緷","84.88118,45.594331"); + LNG_LAT_MAP.put("鍚夋灄","126.564544,43.871988"); } } diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/ModeAnalyController.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/ModeAnalyController.java index 252ef2ac1..4ce0c1cfa 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/ModeAnalyController.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/ModeAnalyController.java @@ -164,7 +164,7 @@ public class ModeAnalyController { if (null == str) return null; - str = str.replaceAll("^[\\s ]*|[\\s ]*$", ""); + str = str.replaceAll("^[\\s銆�]*|[\\s ]*$", ""); str = str.replaceAll(" ", ""); str = DataUtil.encoding(str).replaceAll("^\\?*|\\?*$", ""); return str; @@ -190,7 +190,7 @@ public class ModeAnalyController { } /** - * 测试房源自动解析 + * 娴嬭瘯鎴挎簮鑷姩瑙f瀽 * @param model * @return * @throws UnsupportedEncodingException @@ -211,7 +211,7 @@ public class ModeAnalyController { } /** - * 保存规则更改 + * 淇濆瓨瑙勫垯鏇存敼 * @param model * @return */ @@ -221,7 +221,7 @@ public class ModeAnalyController { } /** - * 删除规则 + * 鍒犻櫎瑙勫垯 * @param model * @return */ diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/TestReportController.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/TestReportController.java index 619faf611..3be75fa4e 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/TestReportController.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/TestReportController.java @@ -48,7 +48,7 @@ public class TestReportController { } /** - * 测试报告-城市得分排行 + * 娴嬭瘯鎶ュ憡-鍩庡競寰楀垎鎺掕 * @param model * @return */ @@ -58,15 +58,15 @@ public class TestReportController { initDateRange(model); - //城市得分列表 + //鍩庡競寰楀垎鍒楄〃 List districtStatisticses = districtStatisticsService.findByTime(model.getStart(), model.getEnd(), scorePager); model.setDistrictStatisticses(districtStatisticses); - //负责人得分排行 + //璐熻矗浜哄緱鍒嗘帓琛� List personRankingList = districtStatisticsService.personRankingList(model.getStart(), model.getEnd(), personPager); model.setPersonRankings(personRankingList); - //涨幅(城市得分涨幅) + //娑ㄥ箙锛堝煄甯傚緱鍒嗘定骞咃級 List cityScoreUps = districtStatisticsService.getCityScoreUpList(model.getStart(), model.getEnd(), 10); model.setCityScoreUps(cityScoreUps); @@ -77,7 +77,7 @@ public class TestReportController { } public Object exportAction(TestReportModel model, HttpServletResponse response) { - String fileName = "全国城市得分列表.xls"; + String fileName = "鍏ㄥ浗鍩庡競寰楀垎鍒楄〃.xls"; OutputStream os = null; BufferedOutputStream fos = null; @@ -85,14 +85,14 @@ public class TestReportController { HSSFWorkbook wb = createExcel(datas); try { response.setCharacterEncoding("UTF-8"); - //response.reset();// 清空输出流 + //response.reset();// 娓呯┖杈撳嚭娴� response.setContentType("application/x-download;charset=UTF-8"); fileName = new String(fileName.getBytes("GBK"), "ISO-8859-1"); - if(fileName.length()>150){//解决IE 6.0 bug + if(fileName.length()>150){//瑙e喅IE 6.0 bug fileName = new String(fileName.getBytes("GBK"),"ISO-8859-1"); } response.setHeader( "Content-Disposition", "attachment;filename=" + fileName); - os = response.getOutputStream();// 取得输出流 + os = response.getOutputStream();// 鍙栧緱杈撳嚭娴� wb.write(os); os.flush(); }catch (Exception e) { @@ -114,15 +114,15 @@ public class TestReportController { private HSSFWorkbook createExcel(List datas){ HSSFWorkbook wb = new HSSFWorkbook(); HSSFSheet sheet = wb.createSheet(); - wb.setSheetName(0, "数据"); - List headers = ImmutableList.of("城市", "城市等级", "城市得分", "负责人", "负责人得分"); - //创建表头 + wb.setSheetName(0, "鏁版嵁"); + List headers = ImmutableList.of("鍩庡競", "鍩庡競绛夌骇", "鍩庡競寰楀垎", "璐熻矗浜�", "璐熻矗浜哄緱鍒�"); + //鍒涘缓琛ㄥご HSSFRow headerRow = sheet.createRow(0); for(int i = 0; i < headers.size(); ++i) { headerRow.createCell(i).setCellValue(headers.get(i)); } - //创建数据 + //鍒涘缓鏁版嵁 if(CollectionUtils.isNotEmpty(datas)){ for(DistrictStatistics districtStatistics : datas){ HSSFRow row = sheet.createRow(sheet.getPhysicalNumberOfRows()); @@ -150,7 +150,7 @@ public class TestReportController { } /** - * 测试统计报告数据查询 + * 娴嬭瘯缁熻鎶ュ憡鏁版嵁鏌ヨ * @param model * @return */ @@ -167,19 +167,19 @@ public class TestReportController { model.setStart(calendar.getTime()); model.setEnd(DateUtil.getLastDayOfMonth(new Date()));*/ - //测试抽样 + //娴嬭瘯鎶芥牱 List stRestuls = fileDatasTotalityService.findAll(1, model.getStart(), model.getEnd(), 6); List stDetailResults = getDetailResults(stRestuls); removeDuplicateDate(stDetailResults); TestReportModel stResultModel = completeResult(stRestuls, stDetailResults); - //项目数据 + //椤圭洰鏁版嵁 List ptResults = fileDatasTotalityService.findAll(2, model.getStart(), model.getEnd(), 6); List ptDetailResults = getDetailResults(ptResults); removeDuplicateDate(ptDetailResults); TestReportModel ptResultModel = completeResult(ptResults, ptDetailResults); - //总数 + //鎬绘暟 List ttResults = new ArrayList(); List ttDetailResults = new ArrayList(); ttResults.addAll(stRestuls); @@ -189,7 +189,7 @@ public class TestReportController { removeDuplicateDate(ttDetailResults); TestReportModel ttResultModel = completeResult(ttResults, ttDetailResults); - //走势图 + //璧板娍鍥� Map> trendMap = getTrendMap(ttResults, ttDetailResults, model.getStart(), model.getEnd()); Map resultModel = Maps.newHashMap(); @@ -202,7 +202,7 @@ public class TestReportController { } /** - * 根据查询到的文件,获取所有文件数据:只获取抽样过的数据 + * 鏍规嵁鏌ヨ鍒扮殑鏂囦欢锛岃幏鍙栨墍鏈夋枃浠舵暟鎹細鍙幏鍙栨娊鏍疯繃鐨勬暟鎹� * @param stRestuls * @return */ @@ -222,7 +222,7 @@ public class TestReportController { } /** - * 根据城市、区域、小区名去除重复数据 + * 鏍规嵁鍩庡競銆佸尯鍩熴�佸皬鍖哄悕鍘婚櫎閲嶅鏁版嵁 * @param results */ private void removeDuplicateDate(List results) { @@ -241,7 +241,7 @@ public class TestReportController { } /** - * 测试统计报告页走势图 + * 娴嬭瘯缁熻鎶ュ憡椤佃蛋鍔垮浘 * @return * @param datas * @param start @@ -251,9 +251,9 @@ public class TestReportController { long diffDays = (end.getTime() - start.getTime()) / (1000 * 60 * 60 * 24); Map> trendDatas = Maps.newHashMap(); - //周期为【年】 + //鍛ㄦ湡涓恒�愬勾銆� if(diffDays > 31) { - //按月分组 + //鎸夋湀鍒嗙粍 for(FileDatasTotality fileDatasTotality : datas) { String month = DateUtil.formatByPattern(fileDatasTotality.getModificationDate(), "yyyy/MM"); List fileDatasTotalities = trendDatas.get(month); @@ -263,10 +263,10 @@ public class TestReportController { fileDatasTotalities.add(fileDatasTotality); trendDatas.put(month, fileDatasTotalities); } - } else if(diffDays > 7) {//周期为月 - //从1号开始,以7天为单位,显示4个周 + } else if(diffDays > 7) {//鍛ㄦ湡涓烘湀 + //浠�1鍙峰紑濮嬶紝浠�7澶╀负鍗曚綅锛屾樉绀�4涓懆 Map weekMap = getWeekMap(start); - //按7天分组 + //鎸�7澶╁垎缁� for(FileDatasTotality fileDatasTotality : datas) { Date mDate = fileDatasTotality.getModificationDate(); int monthIndex = (int)Math.ceil((mDate.getTime() - start.getTime()) / (1000 * 3600 * 24 * 7 * 1.0)); @@ -278,8 +278,8 @@ public class TestReportController { fileDatasTotalities.add(fileDatasTotality); trendDatas.put(key, fileDatasTotalities); } - } else {//周期为一周,则按天显示 - //周期为周,不显示走势图 + } else {//鍛ㄦ湡涓轰竴鍛紝鍒欐寜澶╂樉绀� + //鍛ㄦ湡涓哄懆锛屼笉鏄剧ず璧板娍鍥� /*for(FileDatasTotality fileDatasTotality : datas) { String key = DateUtil.formatByPattern(fileDatasTotality.getModificationDate(), "MM/dd"); trendDatas.put(key, ImmutableList.of(fileDatasTotality)); @@ -289,7 +289,7 @@ public class TestReportController { } /** - * 填充走势图数据 + * 濉厖璧板娍鍥炬暟鎹� * @param datas * @return */ @@ -317,7 +317,7 @@ public class TestReportController { } /** - * 根据给定时间,得出未来四个周的日期范围。其中key为基于1的下标,value为日期范围 + * 鏍规嵁缁欏畾鏃堕棿锛屽緱鍑烘湭鏉ュ洓涓懆鐨勬棩鏈熻寖鍥淬�傚叾涓璳ey涓哄熀浜�1鐨勪笅鏍囷紝value涓烘棩鏈熻寖鍥� * @param start * @return */ @@ -345,7 +345,7 @@ public class TestReportController { } /** - * 数据填充 + * 鏁版嵁濉厖 * @param results * @param detailResults * @return @@ -360,7 +360,7 @@ public class TestReportController { } if(CollectionUtils.isNotEmpty(detailResults)) { model.setCount(detailResults.size()); - //城市个数 + //鍩庡競涓暟 Set cities = Sets.newHashSet(); int matchCount = 0; int avgPriceMatchCount = 0; @@ -403,7 +403,7 @@ public class TestReportController { /** - * 找出比例最高的原因 + * 鎵惧嚭姣斾緥鏈�楂樼殑鍘熷洜 * @param reasonCountMap * @return */ @@ -421,8 +421,8 @@ public class TestReportController { } /** - * 库中存储的“原因”为数值型,需要转换为对应的字符串描述 - * @param reasonInteger 对应的数字描述 + * 搴撲腑瀛樺偍鐨勨�滃師鍥犫�濅负鏁板�煎瀷锛岄渶瑕佽浆鎹负瀵瑰簲鐨勫瓧绗︿覆鎻忚堪 + * @param reasonInteger 瀵瑰簲鐨勬暟瀛楁弿杩� * @return */ private String getReason(Integer reasonInteger) { @@ -437,7 +437,7 @@ public class TestReportController { initDateRange(model); String cityName = model.getCityName(); - if("全国".equals(cityName)) { + if("鍏ㄥ浗".equals(cityName)) { cityName = null; } /*if(model.getEnd()!=null){ @@ -505,7 +505,7 @@ public class TestReportController { } /** - * 初始化时间范围 + * 鍒濆鍖栨椂闂磋寖鍥� * @param model */ private void initDateRange(TestReportModel model) { @@ -552,7 +552,7 @@ public class TestReportController { if(StringUtils.isNotBlank(model.getCityName()) && StringUtils.isNotBlank(model.getRegion()) && StringUtils.isNotBlank(model.getDistrictName()) && model.getReason() != null) { if(model.getReason()==8&&StringUtils.isBlank(model.getOtherReason())){ - data.put("msg", "请输入问题原因"); + data.put("msg", "璇疯緭鍏ラ棶棰樺師鍥�"); return ret; } String cityName = model.getCityName(); @@ -596,7 +596,7 @@ public class TestReportController { fileDatasTotalityService.updateFileDetailData(model.getId(), udata); } }else { - data.put("msg", "参数输入不完整"); + data.put("msg", "鍙傛暟杈撳叆涓嶅畬鏁�"); } return ret; } diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/UserController.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/UserController.java index 7b70a0782..7b0b45ef7 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/UserController.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/UserController.java @@ -39,16 +39,16 @@ public class UserController { } /** - * 用户登录 + * 鐢ㄦ埛鐧诲綍 * @param user * @return */ public Object userLoginAction(User user, HttpServletRequest request) { if (StringUtils.isBlank(user.getUsername())) { - return new JsonResultModel(false, "用户名不能为空"); + return new JsonResultModel(false, "鐢ㄦ埛鍚嶄笉鑳戒负绌�"); } if (StringUtils.isBlank(user.getPass())) { - return new JsonResultModel(false, "密码不能为空"); + return new JsonResultModel(false, "瀵嗙爜涓嶈兘涓虹┖"); } try { @@ -62,7 +62,7 @@ public class UserController { List authoritys = authorityService.queryAuthoritysByUser(old.getId()); session.setAttribute("authoritys", authoritys); } catch (Exception e) { - LOGGER.error("查询用户权限异常", e); + LOGGER.error("鏌ヨ鐢ㄦ埛鏉冮檺寮傚父", e); } return new JsonResultModel(true); @@ -71,11 +71,11 @@ public class UserController { return new JsonResultModel(false, e.getMessage()); } - return new JsonResultModel(false, "用户名密码错误"); + return new JsonResultModel(false, "鐢ㄦ埛鍚嶅瘑鐮侀敊璇�"); } /** - * 链接请求直接登录(新需求) + * 閾炬帴璇锋眰鐩存帴鐧诲綍锛堟柊闇�姹傦級 * @param model * @param req * @param response @@ -100,7 +100,7 @@ public class UserController { List authoritys = authorityService.queryAuthoritysByUser(old.getId()); session.setAttribute("authoritys", authoritys); } catch (Exception e) { - LOGGER.error("查询用户权限异常", e); + LOGGER.error("鏌ヨ鐢ㄦ埛鏉冮檺寮傚父", e); } return model.redirect("/addressInfo/index"); } @@ -113,7 +113,7 @@ public class UserController { /** - * 退出系统 + * 閫�鍑虹郴缁� * @param request * @param model * @return @@ -125,7 +125,7 @@ public class UserController { } /** - * 修改密码页面 + * 淇敼瀵嗙爜椤甸潰 * @param request * @param model * @return @@ -135,19 +135,19 @@ public class UserController { } /** - * 修改密码 + * 淇敼瀵嗙爜 * @param user * @return */ public Object updatePassAction(HttpServletRequest request, User user) { if (user.getPass() == null) { - return new JsonResultModel(false, "密码不能为空"); + return new JsonResultModel(false, "瀵嗙爜涓嶈兘涓虹┖"); } String userId = SessionContent.getLoginUserId(request); try { userService.updatePass(userId, user.getPass()); } catch (Exception e) { - LOGGER.error("修改密码异常", e); + LOGGER.error("淇敼瀵嗙爜寮傚父", e); return new JsonResultModel(false, e.getMessage()); } return new JsonResultModel(true); diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/WebsiteController.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/WebsiteController.java index db336e64b..c31003fe7 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/WebsiteController.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/controllers/WebsiteController.java @@ -84,7 +84,7 @@ public class WebsiteController { List websites = WebsiteDao.getInstance().findAll(); int c = 0; for (Website website : websites) { - if (!"district".equals(website.getCategory()) || website.getScope().indexOf("全国类") == -1) { + if (!"district".equals(website.getCategory()) || website.getScope().indexOf("鍏ㄥ浗绫�") == -1) { continue; } c++; @@ -128,13 +128,13 @@ public class WebsiteController { model.setViewType("json"); Map dataMap = new HashMap(); if (model.getId() == null || model.getIdList() == null || model.getCategory() == null) { - dataMap.put("err", "信息错误"); + dataMap.put("err", "淇℃伅閿欒"); return model; } Website website = websiteDao.findById(model.getId()); if (website == null) { - dataMap.put("err", "id无效"); + dataMap.put("err", "id鏃犳晥"); return model; } @@ -352,10 +352,10 @@ public class WebsiteController { websiteBo.setScore(seed.getScore()); // websiteBo.setGrabDate(webpageDao.findGrabDate(seed.getCity(), // website.getCategory(), website.getPageName(), - // website.getSiteName()));//获取抓取时间); + // website.getSiteName()));//鑾峰彇鎶撳彇鏃堕棿); // List dates = webpageDao.findGrabDate(seed.getCity(), // website.getCategory(), website.getPageName(), - // website.getSiteName());//获取抓取时间 + // website.getSiteName());//鑾峰彇鎶撳彇鏃堕棿 // if(dates.size() > 0){ // Collections.sort(dates,c); // System.out.println(dates.get(0)); @@ -391,7 +391,7 @@ public class WebsiteController { JsonModel ret = new JsonModel(); Map dataMap = new HashMap(); if (model.getCategory() == null || StringUtils.isBlank(model.getSiteName())) { - dataMap.put("err", "必选参数不能为空"); + dataMap.put("err", "蹇呴�夊弬鏁颁笉鑳戒负绌�"); ret.setJsonModel(dataMap); return ret; } @@ -400,12 +400,12 @@ public class WebsiteController { if (obj != null) { if (model.getId() != null) { if (!obj.getId().equals(model.getId())) { - dataMap.put("err", "已存在同名类型网站"); + dataMap.put("err", "宸插瓨鍦ㄥ悓鍚嶇被鍨嬬綉绔�"); ret.setJsonModel(dataMap); return ret; } } else { - dataMap.put("err", "已存在同名类型网站"); + dataMap.put("err", "宸插瓨鍦ㄥ悓鍚嶇被鍨嬬綉绔�"); ret.setJsonModel(dataMap); return ret; } @@ -414,12 +414,12 @@ public class WebsiteController { if (obj2 != null) { if (model.getId() != null) { if (!obj2.getId().equals(model.getId())) { - dataMap.put("err", "已存在该类型同域名网站"); + dataMap.put("err", "宸插瓨鍦ㄨ绫诲瀷鍚屽煙鍚嶇綉绔�"); ret.setJsonModel(dataMap); return ret; } } else { - dataMap.put("err", "已存在该类型同域名网站"); + dataMap.put("err", "宸插瓨鍦ㄨ绫诲瀷鍚屽煙鍚嶇綉绔�"); ret.setJsonModel(dataMap); return ret; } @@ -428,7 +428,7 @@ public class WebsiteController { if (model.getId() != null) { Website website = websiteDao.findById(model.getId()); if (website == null) { - dataMap.put("err", "对象不存在"); + dataMap.put("err", "瀵硅薄涓嶅瓨鍦�"); ret.setJsonModel(dataMap); return ret; } @@ -445,7 +445,7 @@ public class WebsiteController { if (seedies.size() > 0) { for (Seeds seed : seedies) { if (model.getSeedCity().equals(seed.getCity()) || model.getSeedUrl().equals(seed.getUrl())) { - dataMap.put("err", "链接或城市已经存在"); + dataMap.put("err", "閾炬帴鎴栧煄甯傚凡缁忓瓨鍦�"); ret.setJsonModel(dataMap); return ret; } @@ -480,7 +480,7 @@ public class WebsiteController { } else { Website website = websiteDao.findWebsite(model.getCategory(), model.getSiteName()); if (website != null) { - dataMap.put("err", "该网站已经存在"); + dataMap.put("err", "璇ョ綉绔欏凡缁忓瓨鍦�"); ret.setJsonModel(dataMap); return ret; } @@ -511,7 +511,7 @@ public class WebsiteController { if (seedies.size() > 0) { for (Seeds seed : seedies) { if (model.getSeedCity().equals(seed.getCity()) || model.getSeedUrl().equals(seed.getUrl())) { - dataMap.put("err", "链接或城市已经存在"); + dataMap.put("err", "閾炬帴鎴栧煄甯傚凡缁忓瓨鍦�"); ret.setJsonModel(dataMap); return ret; } @@ -546,7 +546,7 @@ public class WebsiteController { if (model.getId() != null) { Website website = websiteDao.findById(model.getId()); if (website == null) { - dataMap.put("err", "对象不存在"); + dataMap.put("err", "瀵硅薄涓嶅瓨鍦�"); ret.setJsonModel(dataMap); return ret; } @@ -558,7 +558,7 @@ public class WebsiteController { continue; } if (model.getSeedCity().equals(seed.getCity()) || model.getSeedUrl().equals(seed.getUrl())) { - dataMap.put("err", "链接或城市已经存在"); + dataMap.put("err", "閾炬帴鎴栧煄甯傚凡缁忓瓨鍦�"); ret.setJsonModel(dataMap); return ret; } @@ -602,7 +602,7 @@ public class WebsiteController { if (model.getId() != null) { Website website = websiteDao.findById(model.getId()); if (website == null) { - dataMap.put("err", "对象不存在"); + dataMap.put("err", "瀵硅薄涓嶅瓨鍦�"); ret.setJsonModel(dataMap); return ret; } @@ -616,7 +616,7 @@ public class WebsiteController { continue; } if (model.getSeedUrl().equals(seed.getUrl())) { - dataMap.put("err", "该网站已经存在此链接"); + dataMap.put("err", "璇ョ綉绔欏凡缁忓瓨鍦ㄦ閾炬帴"); ret.setJsonModel(dataMap); return ret; } @@ -691,7 +691,7 @@ public class WebsiteController { JsonModel ret = new JsonModel(); if (model.getId() != null) { DBObject udata = new BasicDBObject(); - udata.put("status", 8); //删除 + udata.put("status", 8); //鍒犻櫎 seedsDao.updateById(udata, model.getId()); } return ret; @@ -738,7 +738,7 @@ public class WebsiteController { if (model.getId() != null) { Website website = websiteDao.findById(model.getId()); if (website == null) { - dataMap.put("err", "对象不存在"); + dataMap.put("err", "瀵硅薄涓嶅瓨鍦�"); ret.setJsonModel(dataMap); return ret; } @@ -752,7 +752,7 @@ public class WebsiteController { for (Map relatedJob : website.getRelatedJobs()) { if (StringUtils.isNotBlank(model.getRelatedJobId()) && model.getRelatedJobId().equals(relatedJob.get("job_id"))) { - dataMap.put("err", "任务ID已存在"); + dataMap.put("err", "浠诲姟ID宸插瓨鍦�"); ret.setJsonModel(dataMap); return ret; } diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/customlabel/AuthorityDirective.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/customlabel/AuthorityDirective.java index 5a6776936..726c9f07b 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/customlabel/AuthorityDirective.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/customlabel/AuthorityDirective.java @@ -12,11 +12,11 @@ import freemarker.template.TemplateException; import freemarker.template.TemplateModel; /** - * 自定义A标签,控制权限用 + * 鑷畾涔堿鏍囩锛屾帶鍒舵潈闄愮敤 * @author yinjihuan - * 用法:<@d_a text="设置" href="/user/info" target="_blank" uri="/user" type="disabled" class="btn" style="color:red;" id="saveBtn"/>
- * text:显示的文字
href:链接地址
target:打开方式
uri:权限地址
- * type:取值disabled为禁用操作,无权限点击弹出提示框,取值hidden为隐藏 + * 鐢ㄦ硶锛�<@d_a text="璁剧疆" href="/user/info" target="_blank" uri="/user" type="disabled" class="btn" style="color:red;" id="saveBtn"/>
+ * text:鏄剧ず鐨勬枃瀛�
href:閾炬帴鍦板潃
target锛氭墦寮�鏂瑰紡
uri:鏉冮檺鍦板潃
+ * type:鍙栧�糳isabled涓虹鐢ㄦ搷浣滐紝鏃犳潈闄愮偣鍑诲脊鍑烘彁绀烘锛屽彇鍊糷idden涓洪殣钘� */ public class AuthorityDirective implements TemplateDirectiveModel { @@ -24,11 +24,11 @@ public class AuthorityDirective implements TemplateDirectiveModel { @Override public void execute(Environment env, Map params, TemplateModel[] loopVars, TemplateDirectiveBody body) throws TemplateException, IOException { - //获取HttpSession + //鑾峰彇HttpSession ActionContext actionContext = ActionContext.getContext(); HttpSession session = actionContext.getRequest().getSession(); List authoritys = (List) session.getAttribute("authoritys"); - String message = "无权限访问"; + String message = "鏃犳潈闄愯闂�"; String content = ""; if (authoritys != null) { String uri = params.get("uri").toString(); diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/filter/AnalyticsFilter.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/filter/AnalyticsFilter.java index 6853b691e..2f71c597f 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/filter/AnalyticsFilter.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/filter/AnalyticsFilter.java @@ -66,7 +66,7 @@ public class AnalyticsFilter implements Filter { "error process request: request_url=" + request.getRequestURL().toString() + ", referer=" + request.getHeader("referer"), rootCause); } - // 记录运行超过1秒的请求到日志中 + // 璁板綍杩愯瓒呰繃1绉掔殑璇锋眰鍒版棩蹇椾腑 ThreadLocalData.getInstance().clear(); } } diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/filter/SecurityFilter.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/filter/SecurityFilter.java index 0f9a7a688..02fc259e6 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/filter/SecurityFilter.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/filter/SecurityFilter.java @@ -14,20 +14,20 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; /** - * 权限控制过滤器
- * 需要注意的是目前前台和后台读在一个项目里面
- * 控制的时候需要对前后台分别控制,目前后台所有的链接都以bkoff开头
+ * 鏉冮檺鎺у埗杩囨护鍣�
+ * 闇�瑕佹敞鎰忕殑鏄洰鍓嶅墠鍙板拰鍚庡彴璇诲湪涓�涓」鐩噷闈�
+ * 鎺у埗鐨勬椂鍊欓渶瑕佸鍓嶅悗鍙板垎鍒帶鍒讹紝鐩墠鍚庡彴鎵�鏈夌殑閾炬帴閮戒互bkoff寮�澶�
* @author yinjihuan * */ public class SecurityFilter implements Filter { - //需要拦截的后台URI + //闇�瑕佹嫤鎴殑鍚庡彴URI private List bkoffUris = Arrays.asList("bkoffrole", "bkoffUser", "bkoffIndex"); - //白名单URI,不需要拦截的 + //鐧藉悕鍗昒RI,涓嶉渶瑕佹嫤鎴殑 private List whiteList = Arrays.asList("/static/", "/js/", "login", "/css/", "logout", "/style/", "/images/"); - //需要进行登录拦截,但不需要权限拦截的 + //闇�瑕佽繘琛岀櫥褰曟嫤鎴紝浣嗕笉闇�瑕佹潈闄愭嫤鎴殑 private List noAuthorityList = Arrays.asList("/website/", "/analy/", "/verify/", "/modeAnaly/","/region/", "/data/", "/dynamic/", "/foundDistrict/", "/districtAlias/", "/houseAnaly/", "/addressInfo/", "updatePass", "/fileReport/fileDetail", "addressScript", "fileReport/debugScript"); @@ -95,14 +95,14 @@ public class SecurityFilter implements Filter { @SuppressWarnings("unchecked") List authoritys = (List) session.getAttribute("authoritys"); String loginUrl = basePath + path + "/user/login"; - //进行未登录拦截 + //杩涜鏈櫥褰曟嫤鎴� if (session.getAttribute("login_user_name") == null || !session.getAttribute("login_user_type").toString().equals("web")) { if (req.getHeader("x-requested-with") != null && "XMLHttpRequest".equalsIgnoreCase(req.getHeader("x-requested-with"))) { resp.setHeader("sessionstatus","timeout"); resp.setStatus(401); return ; } - //有参数跳转时带上参数 + //鏈夊弬鏁拌烦杞椂甯︿笂鍙傛暟 if (req.getQueryString() != null) { resp.sendRedirect(loginUrl + "?backUrl="+req.getRequestURL() + "?" + req.getQueryString()); } else { @@ -111,20 +111,20 @@ public class SecurityFilter implements Filter { return ; } - //需要进行权限控制 + //闇�瑕佽繘琛屾潈闄愭帶鍒� if (uri.endsWith("/")) { uri = uri.substring(0, uri.length() - 1); } if (containsBkoff(uri) && authoritys != null && authoritys.contains("bkoffIndex")) { chain.doFilter(request, response); } else if (!uri.equals(path) && authoritys != null && !containsAuthority(uri, authoritys)) { - //ajax请求返回状态码,前端统一处理 + //ajax璇锋眰杩斿洖鐘舵�佺爜锛屽墠绔粺涓�澶勭悊 if (req.getHeader("x-requested-with") != null && "XMLHttpRequest".equalsIgnoreCase(req.getHeader("x-requested-with"))) { resp.setHeader("sessionstatus", "authority"); resp.setStatus(403); return ; } - //普通请求直接跳转到首页面 + //鏅�氳姹傜洿鎺ヨ烦杞埌棣栭〉闈� resp.sendRedirect(basePath + path + "/addressInfo/index"); } else { chain.doFilter(request, response); diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/listeners/ContextLoaderListener.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/listeners/ContextLoaderListener.java index babe8baf7..3fa9be5c5 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/listeners/ContextLoaderListener.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/listeners/ContextLoaderListener.java @@ -9,7 +9,7 @@ import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; /** - * 启动地址分析服务 + * 鍚姩鍦板潃鍒嗘瀽鏈嶅姟 */ public class ContextLoaderListener implements ServletContextListener { @@ -21,7 +21,7 @@ public class ContextLoaderListener implements ServletContextListener { if("pro".equals(System.getProperty("env","dev"))){ AddressAnalyzeService addressAnalyzeService = new AddressAnalyzeServiceImpl(); addressAnalyzeService.start(); - logger.info("启动地址分析服务"); + logger.info("鍚姩鍦板潃鍒嗘瀽鏈嶅姟"); } } diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/model/AnalyListModel.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/model/AnalyListModel.java index 2bebbd8fc..061726865 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/model/AnalyListModel.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/model/AnalyListModel.java @@ -4,22 +4,22 @@ import java.util.HashMap; import java.util.Map; /** - * 批量解析所需的model + * 鎵归噺瑙f瀽鎵�闇�鐨刴odel * Created by ideoj on 2016/4/22. */ public class AnalyListModel { - /**待解析url对应的id*/ + /**寰呰В鏋恥rl瀵瑰簲鐨刬d*/ private String id; - /**待解析的实际url*/ + /**寰呰В鏋愮殑瀹為檯url*/ private String url; private String exception; private String category; - /**解析结果map*/ + /**瑙f瀽缁撴灉map*/ private Map analyResultMap = new HashMap(); - /**解析结果对应的字段描述map*/ + /**瑙f瀽缁撴灉瀵瑰簲鐨勫瓧娈垫弿杩癿ap*/ private Map analyFieldMap = new HashMap(); private Map resultExceptionMap = new HashMap(); diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/model/AnalyModel.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/model/AnalyModel.java index dbbafaf8a..958d241b8 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/model/AnalyModel.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/model/AnalyModel.java @@ -97,7 +97,7 @@ public class AnalyModel extends BaseModel { private String sortWay; private List regionList; - /**解析模式:common:普通 list:列表**/ + /**瑙f瀽妯″紡锛歝ommon:鏅�� list:鍒楄〃**/ private String anaMode; private int anaType; private String anaCat; @@ -146,7 +146,7 @@ public class AnalyModel extends BaseModel { private String houseNum; - /**列表模式解析结果*/ + /**鍒楄〃妯″紡瑙f瀽缁撴灉*/ private List modelList = new ArrayList(); public List getModelList() { diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/model/BaseModel.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/model/BaseModel.java index bb674a556..c79ec6df0 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/model/BaseModel.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/model/BaseModel.java @@ -125,7 +125,7 @@ public class BaseModel extends ModelAndViewSupport { ret = new LinkedHashMap>(); for (ServerArea sa : serverAreas) { - if (sa.getDisplay().equals("全国")) { + if (sa.getDisplay().equals("鍏ㄥ浗")) { continue; } String w = String.valueOf(sa.getSpell().charAt(0)).toUpperCase(); diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/model/ChatConfig.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/model/ChatConfig.java index f0657ccb9..f475c329a 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/model/ChatConfig.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/model/ChatConfig.java @@ -4,5 +4,5 @@ import java.util.Arrays; import java.util.List; public class ChatConfig { - public static final List WEEKTITILE = Arrays.asList("-20%以下", "-20% - 10%", "-10% - 0", "0 - 10%", "10% - 20%", "20%以上"); + public static final List WEEKTITILE = Arrays.asList("-20%浠ヤ笅", "-20% - 10%", "-10% - 0", "0 - 10%", "10% - 20%", "20%浠ヤ笂"); } diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/model/DistrictModel.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/model/DistrictModel.java index 9e58f6a5a..98ee589be 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/model/DistrictModel.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/model/DistrictModel.java @@ -22,8 +22,8 @@ public class DistrictModel extends BaseModel { private String addr_alias; private String description; - private Integer avg_price; // 元/㎡ - private Integer total_price; // 万元/套 + private Integer avg_price; // 鍏�/銕� + private Integer total_price; // 涓囧厓/濂� private String mobile; private String developer; private String estate_company; @@ -88,16 +88,16 @@ public class DistrictModel extends BaseModel { private String foundId; private String property_status; - //居委会 + //灞呭浼� private String committee; - //房屋结构 + //鎴垮眿缁撴瀯 private String house_structure; - //土地使用权证号 + //鍦熷湴浣跨敤鏉冭瘉鍙� private String usage_card; - //楼栋数量 + //妤兼爧鏁伴噺 private String loudong_count; diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/model/DynamicModel.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/model/DynamicModel.java index adc0e06ea..b1f2b83f0 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/model/DynamicModel.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/model/DynamicModel.java @@ -37,8 +37,8 @@ public class DynamicModel extends BaseModel{ private String totalId; - private int sellTotal;//二手房源总量 - private int rentTotal;//租房房源总量 + private int sellTotal;//浜屾墜鎴挎簮鎬婚噺 + private int rentTotal;//绉熸埧鎴挎簮鎬婚噺 private double sellRatio; private double rentRatio; private int sellSuccess; diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/model/FileReportModel.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/model/FileReportModel.java index c74396b91..38ed7a2c5 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/model/FileReportModel.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/model/FileReportModel.java @@ -43,40 +43,40 @@ public class FileReportModel extends BaseModel { private Integer realPrice; private Integer noMatchReason; private FileDatasTotality fileDatasTotality; - //脚本选择列表 + //鑴氭湰閫夋嫨鍒楄〃 private Map scriptMap; - //周涨跌幅区间数据 + //鍛ㄦ定璺屽箙鍖洪棿鏁版嵁 private Map weekMarkUpData; - //地址未匹配原因分布数据 + //鍦板潃鏈尮閰嶅師鍥犲垎甯冩暟鎹� private Map noMatchReasonData; - //均价与调查价差比分布 + //鍧囦环涓庤皟鏌ヤ环宸瘮鍒嗗竷 private Map avgAndRealPriceMarkUp; - //最终匹配率 + //鏈�缁堝尮閰嶇巼 private Integer overMatchRate; - //查询类型(1:周涨跌幅区间数据 2:均价与调查价差比分布 3:未匹配原因) + //鏌ヨ绫诲瀷锛�1:鍛ㄦ定璺屽箙鍖洪棿鏁版嵁 2:鍧囦环涓庤皟鏌ヤ环宸瘮鍒嗗竷 3锛氭湭鍖归厤鍘熷洜锛� private int queryType; - //查询标识(柱形图的柱子索引) + //鏌ヨ鏍囪瘑锛堟煴褰㈠浘鐨勬煴瀛愮储寮曪級 private int queryIndex; - //没匹配到原因文字描述 + //娌″尮閰嶅埌鍘熷洜鏂囧瓧鎻忚堪 private String noMatchReasonText; - //柱形图标题 + //鏌卞舰鍥炬爣棰� private List chatTitle; - private String type;//检索 - private String rating;//评级 - private String show;//需要展示的字段 + private String type;//妫�绱� + private String rating;//璇勭骇 + private String show;//闇�瑕佸睍绀虹殑瀛楁 private Map ratingGroup; private Map typeGroup; - private String matchAddress;//匹配的地址 - private String matchDistrictName;//匹配的小区名 - private String matchHouseNum;//匹配的楼号 - private String matchUnitNum;//匹配的单元号 - private String matchRoomNum;//匹配的室号 - private String otherReason;//其他原因 - private String modifier;//操作人 + private String matchAddress;//鍖归厤鐨勫湴鍧� + private String matchDistrictName;//鍖归厤鐨勫皬鍖哄悕 + private String matchHouseNum;//鍖归厤鐨勬ゼ鍙� + private String matchUnitNum;//鍖归厤鐨勫崟鍏冨彿 + private String matchRoomNum;//鍖归厤鐨勫鍙� + private String otherReason;//鍏朵粬鍘熷洜 + private String modifier;//鎿嶄綔浜� - private String scriptId;//脚本的ID + private String scriptId;//鑴氭湰鐨処D public String getModifier() { diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/model/RankingModel.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/model/RankingModel.java index 1ac4ee484..b5e71d441 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/model/RankingModel.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/model/RankingModel.java @@ -8,28 +8,28 @@ import java.io.Serializable; public class RankingModel implements Serializable { private static final long serialVersionUID = 1463707036567549789L; /** - * 负责人 + * 璐熻矗浜� */ private String dutyName; /** - * 得分最高的城市 + * 寰楀垎鏈�楂樼殑鍩庡競 */ private String topScoreCity; private Double topScore; /** - * 得分最高的城市对应的负责人得分 + * 寰楀垎鏈�楂樼殑鍩庡競瀵瑰簲鐨勮礋璐d汉寰楀垎 */ private Double topPersonScore; /** - * 得分最低的城市 + * 寰楀垎鏈�浣庣殑鍩庡競 */ private String lowestScoreCity; private Double lowestScore; /** - * 得分最低的城市对应的负责人得分 + * 寰楀垎鏈�浣庣殑鍩庡競瀵瑰簲鐨勮礋璐d汉寰楀垎 */ private Double lowestPersonScore; diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/model/RiseRateModel.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/model/RiseRateModel.java index cf2faa729..d2081325a 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/model/RiseRateModel.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/model/RiseRateModel.java @@ -2,37 +2,37 @@ package com.fangjia.bkoff.model; import java.io.Serializable; -/**涨幅 +/**娑ㄥ箙 * Created by linxsh on 2017/2/14. */ public class RiseRateModel implements Serializable { private static final long serialVersionUID = -1805556458198414417L; /** - * 城市 + * 鍩庡競 */ private String city; /** - * 城市等级 + * 鍩庡競绛夌骇 */ private Integer cityLevel; /** - * 城市得分 + * 鍩庡競寰楀垎 */ private Double cityScore; /** - * 城市得分涨幅 + * 鍩庡競寰楀垎娑ㄥ箙 */ private Double cityScoreUpRate; /** - * 责任人 + * 璐d换浜� */ private String dutyName; /** - * 责任人得分 + * 璐d换浜哄緱鍒� */ private Double dutyPersonScore; /** - * 责任人得分涨幅 + * 璐d换浜哄緱鍒嗘定骞� */ private Double dutyPersonScoreUpRate; diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/model/RoleModel.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/model/RoleModel.java index 7e95fa1d5..1e3db53f8 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/model/RoleModel.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/model/RoleModel.java @@ -10,12 +10,12 @@ public class RoleModel extends BaseModel { private static final long serialVersionUID = -5724990326450013316L; /** - * 分页数据对象 + * 鍒嗛〉鏁版嵁瀵硅薄 */ private PageBean pageBean; /** - * 权限信息 + * 鏉冮檺淇℃伅 */ private List groupInfos; diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/model/TestReportModel.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/model/TestReportModel.java index 986e4904f..a33da0cb4 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/model/TestReportModel.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/model/TestReportModel.java @@ -15,42 +15,42 @@ public class TestReportModel extends BaseModel implements Serializable { private static final long serialVersionUID = -5231521087417248919L; /** - * 日期范围-start + * 鏃ユ湡鑼冨洿-start */ private Date start; /** - * 日期范围-end + * 鏃ユ湡鑼冨洿-end */ private Date end; /** - * 测试次数 + * 娴嬭瘯娆℃暟 */ private Integer times; /** - * 测试数据量 + * 娴嬭瘯鏁版嵁閲� */ private Integer count; /** - * 测试城市个数 + * 娴嬭瘯鍩庡競涓暟 */ private Integer citiesCount; /** - * 最终匹配率 + * 鏈�缁堝尮閰嶇巼 */ private String matchRatio; /** - * 均价匹配率 + * 鍧囦环鍖归厤鐜� */ private String pricePrecision; /** - * 未匹配原因 + * 鏈尮閰嶅師鍥� */ private Integer reason; private String otherReason; @@ -59,7 +59,7 @@ public class TestReportModel extends BaseModel implements Serializable { private String reasonDesc; /** - * 未匹配原因占比 + * 鏈尮閰嶅師鍥犲崰姣� */ private String reasonRatio; @@ -76,7 +76,7 @@ public class TestReportModel extends BaseModel implements Serializable { private String userName; private String dutyName; - //城市得分列表 + //鍩庡競寰楀垎鍒楄〃 private List districtStatisticses = new ArrayList(); // private List personRankings = new ArrayList(); diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/model/UserModel.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/model/UserModel.java index dd962aee0..856a1dbf0 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/model/UserModel.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/model/UserModel.java @@ -12,27 +12,27 @@ public class UserModel extends BaseModel { private static final long serialVersionUID = 4899071723202633378L; /** - * 分页数据对象 + * 鍒嗛〉鏁版嵁瀵硅薄 */ private PageBean pageBean; /** - * 公司 + * 鍏徃 */ private String company; /** - * 手机 + * 鎵嬫満 */ private String mobile; /** - * 企业编号 + * 浼佷笟缂栧彿 */ private String enterpriseId; /** - * 角色信息 + * 瑙掕壊淇℃伅 */ private List roles; diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/model/VerifyModel.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/model/VerifyModel.java index d201a3670..d145961dd 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/model/VerifyModel.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/model/VerifyModel.java @@ -21,7 +21,7 @@ public class VerifyModel extends BaseModel { private Integer sequence; List rules; - // 可编辑表格插件的ajax参数 + // 鍙紪杈戣〃鏍兼彃浠剁殑ajax鍙傛暟 private String name; private String pk; private String value; diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/AnalyzerInterface.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/AnalyzerInterface.java index 961f349c3..beb2449ac 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/AnalyzerInterface.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/AnalyzerInterface.java @@ -3,7 +3,7 @@ package com.fangjia.bkoff.service; import java.util.List; /** - * 网页解析接口 + * 缃戦〉瑙f瀽鎺ュ彛 * * @author xiaoyu */ diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/address/AddressAnalyzeService.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/address/AddressAnalyzeService.java index f688e5805..f0d91150f 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/address/AddressAnalyzeService.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/address/AddressAnalyzeService.java @@ -1,7 +1,7 @@ package com.fangjia.bkoff.service.address; /** - * 地址分析服务 + * 鍦板潃鍒嗘瀽鏈嶅姟 */ public interface AddressAnalyzeService { diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/address/AddressAnalyzeServiceImpl.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/address/AddressAnalyzeServiceImpl.java index 4d659d2a0..bf234ad94 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/address/AddressAnalyzeServiceImpl.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/address/AddressAnalyzeServiceImpl.java @@ -35,7 +35,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; /** - * 地址分析服务 + * 鍦板潃鍒嗘瀽鏈嶅姟 */ public class AddressAnalyzeServiceImpl implements AddressAnalyzeService { @@ -68,7 +68,7 @@ public class AddressAnalyzeServiceImpl implements AddressAnalyzeService { try{ process(fileDatasTotality); }catch (Exception e){ - logger.error(fileDatasTotality.getId() + ":分析出现异常"); + logger.error(fileDatasTotality.getId() + ":鍒嗘瀽鍑虹幇寮傚父"); } } sleep(5 *1000); @@ -88,7 +88,7 @@ public class AddressAnalyzeServiceImpl implements AddressAnalyzeService { fileDatasTotality.setStatus(1); fileDatasTotality.setModificationDate(new Date()); fileDatasTotalityDao.save(fileDatasTotality); - logger.info("开始分析:" + fileDatasTotality.getFileName()); + logger.info("寮�濮嬪垎鏋�:" + fileDatasTotality.getFileName()); List fileDetailDataList = fileDetailDataDao.findAll(new BasicDBObject("file_id", fileDatasTotality.getId())); ExecutorService executorService = Executors.newFixedThreadPool(10); for(FileDetailData detailData : fileDetailDataList){ @@ -103,7 +103,7 @@ public class AddressAnalyzeServiceImpl implements AddressAnalyzeService { fileDatasTotality.setStatus(2); fileDatasTotality.setModificationDate(new Date()); fileDatasTotalityDao.save(fileDatasTotality); - logger.info("分析结束:" + fileDatasTotality.getFileName()); + logger.info("鍒嗘瀽缁撴潫:" + fileDatasTotality.getFileName()); } @@ -120,7 +120,7 @@ public class AddressAnalyzeServiceImpl implements AddressAnalyzeService { String region = fileDetailData.getRegion(); String districtName = fileDetailData.getDistrictName(); String address = fileDetailData.getAddress(); - logger.info("开始分析:"+city +" - "+region+" - " + districtName +" - "+address); + logger.info("寮�濮嬪垎鏋�:"+city +" - "+region+" - " + districtName +" - "+address); JSONObject result = null; JSONObject addressMatch = null; @@ -173,7 +173,7 @@ public class AddressAnalyzeServiceImpl implements AddressAnalyzeService { if(searchAddress.containsKey("street")){ fileDetailData.setParseStreet((String) searchAddress.get("street")); } - logger.info("匹配结果:"+fileDetailData.getMatchCity() +" - "+fileDetailData.getMatchRegion()+" - "+fileDetailData.getMatchDistrictName()); + logger.info("鍖归厤缁撴灉:"+fileDetailData.getMatchCity() +" - "+fileDetailData.getMatchRegion()+" - "+fileDetailData.getMatchDistrictName()); } String id = matchResult.getString("id"); Seaweed seaweed = null; @@ -236,7 +236,7 @@ public class AddressAnalyzeServiceImpl implements AddressAnalyzeService { params.put("size", String.valueOf(fileDetailData.getArea())); params.put("scope", "1"); params.put("token", TOKEN); - if("别墅".equals(fileDetailData.getEstateType())){ + if("鍒".equals(fileDetailData.getEstateType())){ params.put("propertyType", "1"); }else{ params.put("propertyType", "0"); @@ -247,13 +247,13 @@ public class AddressAnalyzeServiceImpl implements AddressAnalyzeService { } } - logger.info("开始查询第三方价格....."); + logger.info("寮�濮嬫煡璇㈢涓夋柟浠锋牸....."); if(StringUtils.isNotBlank(fileDetailData.getMatchCity()) && StringUtils.isNotBlank(fileDetailData.getMatchDistrictName())){ Date startDate = DateUtil.parseDate(DateUtil.addMonth(new Date(), -6), "yyyy-MM-dd"); - //第三方价格 + //绗笁鏂逛环鏍� List> otherPriceRets = averageStatisticsDao.findThirdpartsAveragersByDate(fileDetailData.getMatchCity(), fileDetailData.getMatchRegion(), fileDetailData.getMatchDistrictName(), "district", startDate); - //房估估均价 云估价均价 链家均价 安居客均价 赶集网均价 搜房网均价 兔博士均价 + //鎴夸及浼板潎浠� 浜戜及浠峰潎浠� 閾惧鍧囦环 瀹夊眳瀹㈠潎浠� 璧堕泦缃戝潎浠� 鎼滄埧缃戝潎浠� 鍏斿崥澹潎浠� NetworkPrice networkPrice = networkPriceDao.findYungujiaAndPrice(fileDetailData.getMatchCity(), fileDetailData.getMatchRegion(), fileDetailData.getMatchDistrictName()); if(networkPrice!=null){ if(null != networkPrice.getFangguguPrice()){ @@ -264,7 +264,7 @@ public class AddressAnalyzeServiceImpl implements AddressAnalyzeService { } } if(otherPriceRets!=null){ - logger.info("第三方价格结果:"+otherPriceRets.toString()); + logger.info("绗笁鏂逛环鏍肩粨鏋滐細"+otherPriceRets.toString()); for(Map map : otherPriceRets){ if(map.get("name").equals("soufun_esf")){ fileDetailData.setSoufangPrice((Integer) map.get("val")); @@ -279,7 +279,7 @@ public class AddressAnalyzeServiceImpl implements AddressAnalyzeService { } } - //评级 + //璇勭骇 if(null != fileDetailData.getDistrictAvgPrice()){ Map levelMap = getPriceLevel(fileDetailData); if(null != levelMap){ @@ -289,7 +289,7 @@ public class AddressAnalyzeServiceImpl implements AddressAnalyzeService { getLastPrice(levelMap, fileDetailData); } - logger.info("价格评级:"+fileDetailData.getPriceLevel()); + logger.info("浠锋牸璇勭骇锛�"+fileDetailData.getPriceLevel()); } } @@ -498,12 +498,12 @@ public class AddressAnalyzeServiceImpl implements AddressAnalyzeService { /** * - * @param city 城市 - * @param input 地址 - * @param cat 类型:property,office,shop 默认三中都匹配 - * @param useMap 是否匹配地图库 - * @param suggestDistrict 小区所在的区域 - * @param preciseLevel 匹配精度:fuzzy低精度,strict高精度 + * @param city 鍩庡競 + * @param input 鍦板潃 + * @param cat 绫诲瀷:property,office,shop 榛樿涓変腑閮藉尮閰� + * @param useMap 鏄惁鍖归厤鍦板浘搴� + * @param suggestDistrict 灏忓尯鎵�鍦ㄧ殑鍖哄煙 + * @param preciseLevel 鍖归厤绮惧害锛歠uzzy浣庣簿搴︼紝strict楂樼簿搴� * @return */ private JSONObject districtNameMatch(String city, String input, String cat, Boolean useMap, String suggestDistrict, String preciseLevel, boolean verify) { @@ -530,7 +530,7 @@ public class AddressAnalyzeServiceImpl implements AddressAnalyzeService { String content = new HttpRequest().get("http://open.fangjia.com/address/match", params, "utf-8"); while (content == null) { content = new HttpRequest().get("http://open.fangjia.com/address/match", params, "utf-8"); - System.out.println(city+" "+input+" "+cat+" 程序调用异常"); + System.out.println(city+" "+input+" "+cat+" 绋嬪簭璋冪敤寮傚父"); Thread.sleep(6000); } JSONObject result = JSONObject.fromObject(content); @@ -564,7 +564,7 @@ public class AddressAnalyzeServiceImpl implements AddressAnalyzeService { List> values = new ArrayList>(); int fjw_price = avgPrice; - //找出最小差 + //鎵惧嚭鏈�灏忓樊 for(int i=0;i udata); /** - * 查询所有脚本 + * 鏌ヨ鎵�鏈夎剼鏈� * @param fileId * @param name * @return @@ -51,7 +51,7 @@ public interface AddressScriptService { public List findAll(); /** - * 根据脚本名称查询是否存在 + * 鏍规嵁鑴氭湰鍚嶇О鏌ヨ鏄惁瀛樺湪 * @param name * @return */ diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/address/AddressScriptServiceImpl.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/address/AddressScriptServiceImpl.java index fdf27dc79..3ab729361 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/address/AddressScriptServiceImpl.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/address/AddressScriptServiceImpl.java @@ -28,12 +28,12 @@ public class AddressScriptServiceImpl implements AddressScriptService { script = addressScript.getScript(); } if (StringUtils.isBlank(script)) { - throw new Exception("未找到脚本"); + throw new Exception("鏈壘鍒拌剼鏈�"); // return null; } if (!InvokeShell.precompiler(script)) { - throw new Exception("脚本语法错误"); + throw new Exception("鑴氭湰璇硶閿欒"); // return null; } @@ -43,8 +43,8 @@ public class AddressScriptServiceImpl implements AddressScriptService { FileDetailData detail = BeanUtils.dBObjectToEntity(FileDetailData.class, result); return detail; } catch (Exception e) { - logger.error("执行脚本异常", e); - throw new Exception("执行脚本异常"); + logger.error("鎵ц鑴氭湰寮傚父", e); + throw new Exception("鎵ц鑴氭湰寮傚父"); } // return null; } diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/address/AuthorityGroupService.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/address/AuthorityGroupService.java index bbd368060..797d08ca4 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/address/AuthorityGroupService.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/address/AuthorityGroupService.java @@ -5,14 +5,14 @@ import java.util.List; import com.fangjia.address.model.AuthorityGroup; /** - * 权限组业务 + * 鏉冮檺缁勪笟鍔� * @author yinjihuan * */ public interface AuthorityGroupService { /** - * 查询所有权限组信息 + * 鏌ヨ鎵�鏈夋潈闄愮粍淇℃伅 * @return * @throws Exception */ diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/address/AuthorityService.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/address/AuthorityService.java index af0d96559..497101bad 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/address/AuthorityService.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/address/AuthorityService.java @@ -4,14 +4,14 @@ import java.util.List; import com.fangjia.address.model.Authority; /** - * 权限业务 + * 鏉冮檺涓氬姟 * @author yinjihuan * */ public interface AuthorityService { /** - * 批量查询权限信息 + * 鎵归噺鏌ヨ鏉冮檺淇℃伅 * @param ids * @return * @throws Exception @@ -19,7 +19,7 @@ public interface AuthorityService { public List queryAuthoritys(List ids) throws Exception; /** - * 查询用户的权限 + * 鏌ヨ鐢ㄦ埛鐨勬潈闄� * @param userId * @return * @throws Exception diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/address/DistrictStatisticsService.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/address/DistrictStatisticsService.java index 1010c367a..e6f9cc9a5 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/address/DistrictStatisticsService.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/address/DistrictStatisticsService.java @@ -11,20 +11,20 @@ import org.sothis.core.util.Pager; /** - * 小区相关统计 + * 灏忓尯鐩稿叧缁熻 * @author user * */ public interface DistrictStatisticsService { /** - * 查询是某周的数据 + * 鏌ヨ鏄煇鍛ㄧ殑鏁版嵁 * @param date * @return */ public DistrictStatistics getDisStaByTime(int date,String city); /** - * 获取六个星期的数据 + * 鑾峰彇鍏釜鏄熸湡鐨勬暟鎹� */ public List findDisStasByTime(int date,String city); @@ -33,7 +33,7 @@ public interface DistrictStatisticsService { public List findByTime(Date startDate, Date endDate); /** - * 获取某周所有的城市信息 + * 鑾峰彇鏌愬懆鎵�鏈夌殑鍩庡競淇℃伅 * @param date * @param city * @return @@ -44,7 +44,7 @@ public interface DistrictStatisticsService { List personRankingList(Date startDate, Date endDate, Pager pager); /** - * 根据查询条件查询涨幅前 topNumber 的数据 + * 鏍规嵁鏌ヨ鏉′欢鏌ヨ娑ㄥ箙鍓� topNumber 鐨勬暟鎹� * @param startDate * @param endDate * @param topNumber diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/address/DistrictStatisticsServiceImpl.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/address/DistrictStatisticsServiceImpl.java index bdf9648a7..3414bd0ef 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/address/DistrictStatisticsServiceImpl.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/address/DistrictStatisticsServiceImpl.java @@ -52,7 +52,7 @@ public class DistrictStatisticsServiceImpl implements DistrictStatisticsService BasicDBObject query = new BasicDBObject(); query.append("date", new BasicDBObject("$gte", intStartDate).append("$lte", intEndDate)); - query.append("city", new BasicDBObject("$ne", "全国")); + query.append("city", new BasicDBObject("$ne", "鍏ㄥ浗")); pager.setTotalRows((int)districtStatisticsDao.findCount(query)); return districtStatisticsDao.findAll(query, new BasicDBObject("date", -1), pager.getStartRow(), pager.getPageSize()); } @@ -65,7 +65,7 @@ public class DistrictStatisticsServiceImpl implements DistrictStatisticsService BasicDBObject query = new BasicDBObject(); query.append("date", new BasicDBObject("$gte", intStartDate).append("$lte", intEndDate)); - query.append("city", new BasicDBObject("$ne", "全国")); + query.append("city", new BasicDBObject("$ne", "鍏ㄥ浗")); return districtStatisticsDao.findAll(query); } @@ -83,7 +83,7 @@ public class DistrictStatisticsServiceImpl implements DistrictStatisticsService int intStartDate = NumberUtils.toInt(sdf.format(startDate)); int intEndDate = NumberUtils.toInt(sdf.format(endDate)); - //获取所有的负责人 + //鑾峰彇鎵�鏈夌殑璐熻矗浜� List users = userDao.findAll(); Iterator userIt = users.iterator(); while (userIt.hasNext()) { @@ -94,7 +94,7 @@ public class DistrictStatisticsServiceImpl implements DistrictStatisticsService } pager.setTotalRows(users.size()); - //按负责人进行统计 + //鎸夎礋璐d汉杩涜缁熻 List rankingModels = Lists.newArrayList(); for(int i = pager.getStartRow(); i < users.size() && i < pager.getPageSize(); ++i) { BasicDBObject query = new BasicDBObject(); @@ -157,7 +157,7 @@ public class DistrictStatisticsServiceImpl implements DistrictStatisticsService } }); - //删除多余数据 + //鍒犻櫎澶氫綑鏁版嵁 if(cityScoreUpList.size() > topNumber) { return new ArrayList(cityScoreUpList.subList(0, topNumber)); } @@ -170,7 +170,7 @@ public class DistrictStatisticsServiceImpl implements DistrictStatisticsService int intStartDate = NumberUtils.toInt(sdf.format(startDate)); int intEndDate = NumberUtils.toInt(sdf.format(endDate)); - //获取所有的负责人 + //鑾峰彇鎵�鏈夌殑璐熻矗浜� List users = userDao.findAll(); Iterator userIt = users.iterator(); while (userIt.hasNext()) { @@ -210,7 +210,7 @@ public class DistrictStatisticsServiceImpl implements DistrictStatisticsService } }); - //删除多余数据 + //鍒犻櫎澶氫綑鏁版嵁 if(personScoreUpList.size() > topNumber) { return new ArrayList(personScoreUpList.subList(0, topNumber)); } diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/address/FileDatasTotalityService.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/address/FileDatasTotalityService.java index 10cd28a41..d0631c9ea 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/address/FileDatasTotalityService.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/address/FileDatasTotalityService.java @@ -15,7 +15,7 @@ import java.util.Map; public interface FileDatasTotalityService { /** - * 按条件查询所有文件 + * 鎸夋潯浠舵煡璇㈡墍鏈夋枃浠� * * @param category * @param startDate @@ -27,7 +27,7 @@ public interface FileDatasTotalityService { List findAll(Integer category, Date startDate, Date endDate, Integer status); /** - * 按条件查询文件 + * 鎸夋潯浠舵煡璇㈡枃浠� * * @param city * @param category @@ -39,7 +39,7 @@ public interface FileDatasTotalityService { List findFileDatasTotality(String city, Integer category, Date startDate, Date endDate, int limit); /** - * 按条件分页查询文件 + * 鎸夋潯浠跺垎椤垫煡璇㈡枃浠� * * @param city * @param category @@ -52,7 +52,7 @@ public interface FileDatasTotalityService { List findFileDatasTotality(String city, Integer category, Date startDate, Date endDate, int skip, int size); /** - * 查询一个文件的所有记录 + * 鏌ヨ涓�涓枃浠剁殑鎵�鏈夎褰� * * @param fileId * @return @@ -60,7 +60,7 @@ public interface FileDatasTotalityService { List findFileDetailDataByFileId(String fileId); /** - * 分页查询一个文件的记录 + * 鍒嗛〉鏌ヨ涓�涓枃浠剁殑璁板綍 * * @param fileId * @param skip @@ -70,7 +70,7 @@ public interface FileDatasTotalityService { List findFileDetailDataByFileId(String fileId, int skip, int size); /** - * 按条件详细记录 + * 鎸夋潯浠惰缁嗚褰� * * @param city * @param category @@ -84,7 +84,7 @@ public interface FileDatasTotalityService { /** - * 查询未匹配的记录 + * 鏌ヨ鏈尮閰嶇殑璁板綍 * @param city * @param category * @param startDate @@ -96,7 +96,7 @@ public interface FileDatasTotalityService { List findNoMatchFileDetailData(String city, Integer category, Date startDate, Date endDate, int skip, int size); /** - * 查询未匹配的记录 + * 鏌ヨ鏈尮閰嶇殑璁板綍 * @param cityName * @param dutyName * @param category @@ -112,7 +112,7 @@ public interface FileDatasTotalityService { /** - * 按条件详细记录数量 + * 鎸夋潯浠惰缁嗚褰曟暟閲� * * @param city * @param category @@ -124,7 +124,7 @@ public interface FileDatasTotalityService { /** - * 未匹配的记录数量 + * 鏈尮閰嶇殑璁板綍鏁伴噺 * * @param city * @param category @@ -137,19 +137,19 @@ public interface FileDatasTotalityService { int findNoMatchFileDetailDataCount(String city, String dutyName, Integer category, Date startDate, Date endDate); /** - * 保存文件记录 + * 淇濆瓨鏂囦欢璁板綍 * @param fileDatasTotality */ void saveToData(FileDatasTotality fileDatasTotality); /** - * 删除总表数据 + * 鍒犻櫎鎬昏〃鏁版嵁 * @param id */ void deleteFileDatasTotality(String id); /** - * 按条件查找文件记录获取总数 + * 鎸夋潯浠舵煡鎵炬枃浠惰褰曡幏鍙栨�绘暟 * @param category * @param startDate * @param endDate @@ -160,7 +160,7 @@ public interface FileDatasTotalityService { int findCountByParams(Integer category, Date startDate, Date endDate, Integer status, String fileName, String oldFileName); /** - * 按条件查找文件记录 + * 鎸夋潯浠舵煡鎵炬枃浠惰褰� * @param category * @param startDate * @param endDate @@ -173,20 +173,20 @@ public interface FileDatasTotalityService { List findFileDatasTotalityByParams(Integer category, Date startDate, Date endDate, Integer status, String fileName, String oldFileName, int start, int limit); /** - * 保存文件记录详情 + * 淇濆瓨鏂囦欢璁板綍璇︽儏 * @param fileDetailDatas */ void saveFileDetailDatas(List fileDetailDatas); /** - * 查找某上传文件的总记录 + * 鏌ユ壘鏌愪笂浼犳枃浠剁殑鎬昏褰� * @param fileId * @return */ FileDatasTotality findFileDatasTotalityById(String fileId); /** - * 修改 + * 淇敼 * @param model */ void updateFileDetailData(FileReportModel model); @@ -194,14 +194,14 @@ public interface FileDatasTotalityService { /** - * 查询未匹配原因的数量 + * 鏌ヨ鏈尮閰嶅師鍥犵殑鏁伴噺 * @param fileId * @return */ long findNoMatchCount(String fileId, Integer type); /** - * 根据ID更新数据 + * 鏍规嵁ID鏇存柊鏁版嵁 * * @param id * @param udata @@ -209,31 +209,31 @@ public interface FileDatasTotalityService { void updateFileDetailData(String id, Map udata); /** - * 保存 + * 淇濆瓨 * @param fileDetailData */ void saveFileDetailData(FileDetailData fileDetailData); /** - * 获取最终匹配率 + * 鑾峰彇鏈�缁堝尮閰嶇巼 * @return */ Integer getOverMatchRate(String fileId); /** - * 获取最终匹配率修改后 + * 鑾峰彇鏈�缁堝尮閰嶇巼淇敼鍚� * @return */ Integer getOverMatchRateLast(String fileId,Integer mount); /** - * 获取匹配率 + * 鑾峰彇鍖归厤鐜� * @return */ Integer getMatchRato(Integer count, Integer total); /** - * 获取匹配成功或失败的数量 + * 鑾峰彇鍖归厤鎴愬姛鎴栧け璐ョ殑鏁伴噺 * @param fileId * @param status * @return @@ -242,7 +242,7 @@ public interface FileDatasTotalityService { /** - * 获取调查价与均价的差比范围数量 + * 鑾峰彇璋冩煡浠蜂笌鍧囦环鐨勫樊姣旇寖鍥存暟閲� * @param fileId * @return */ @@ -250,20 +250,20 @@ public interface FileDatasTotalityService { /** - * 获取调查价格的数量 + * 鑾峰彇璋冩煡浠锋牸鐨勬暟閲� * @param fileId * @return */ int getCheckAvgPriceCount(String fileId); /** - * 周涨跌幅区间数据 + * 鍛ㄦ定璺屽箙鍖洪棿鏁版嵁 * @param fileId * @return */ Map getWeekMarkUpData(String fileId); /** - * 根据未匹配原因查询未匹配到的数据 + * 鏍规嵁鏈尮閰嶅師鍥犳煡璇㈡湭鍖归厤鍒扮殑鏁版嵁 * @param fileId * @param noMatchReason * @param start @@ -273,20 +273,20 @@ public interface FileDatasTotalityService { List findNoMatchFileDataDetails(String fileId, Integer noMatchReason, int start, int limit); /** - * 删除数据 + * 鍒犻櫎鏁版嵁 * @param id */ void deleteFileDetailData(String id); /** - * 删除数据 + * 鍒犻櫎鏁版嵁 * @param id */ void deleteFileDetailDataByFileId(String fileId); /** - * 根据条件查找详情数据 + * 鏍规嵁鏉′欢鏌ユ壘璇︽儏鏁版嵁 * @param city * @param region * @param address @@ -297,7 +297,7 @@ public interface FileDatasTotalityService { /** * - * 查询周涨跌幅 + * 鏌ヨ鍛ㄦ定璺屽箙 * @param fileId * @param index * @param start @@ -307,7 +307,7 @@ public interface FileDatasTotalityService { PageBean findWeekMarkUpFileDataDetails(String fileId, Integer index, int start, int limit); /** - * 均价与调查价差比分布 + * 鍧囦环涓庤皟鏌ヤ环宸瘮鍒嗗竷 * @param fileId * @return */ @@ -315,7 +315,7 @@ public interface FileDatasTotalityService { /** * - * 查询均价与调查价差比分布 + * 鏌ヨ鍧囦环涓庤皟鏌ヤ环宸瘮鍒嗗竷 * @param fileId * @param index * @param start @@ -325,14 +325,14 @@ public interface FileDatasTotalityService { PageBean finAvgAndRealPriceDataDetails(String fileId, Integer index, int start, int limit); /** - * 查询详情 + * 鏌ヨ璇︽儏 * @param id * @return */ FileDetailData getFileDetailData(String id); /** - * 根据文件名查找文件数据 + * 鏍规嵁鏂囦欢鍚嶆煡鎵炬枃浠舵暟鎹� * @param fileName * @return */ diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/address/FileDetailDataService.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/address/FileDetailDataService.java index 2dc92897f..b0a6ac0d7 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/address/FileDetailDataService.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/address/FileDetailDataService.java @@ -4,28 +4,28 @@ import java.util.List; import com.fangjia.coredata.mongo.model.FileDetailData; /** - * 地址分析结果业务类 + * 鍦板潃鍒嗘瀽缁撴灉涓氬姟绫� * @author yinjihuan * */ public interface FileDetailDataService { /** - * 主键ID查询 + * 涓婚敭ID鏌ヨ * @param id * @return */ public FileDetailData get(String id); /** - * 查询文件下面所有的数据 - * @param fileId 文件ID + * 鏌ヨ鏂囦欢涓嬮潰鎵�鏈夌殑鏁版嵁 + * @param fileId 鏂囦欢ID * @return */ public List find(String fileId); /** - * 修改数据 + * 淇敼鏁版嵁 * @param data */ public void udpate(FileDetailData data); diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/address/RoleService.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/address/RoleService.java index 33b6612d1..220c91184 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/address/RoleService.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/address/RoleService.java @@ -6,51 +6,51 @@ import com.fangjia.address.model.Role; import com.fangjia.core.util.PageBean; /** - * 角色业务接口 + * 瑙掕壊涓氬姟鎺ュ彛 * @author yinjihuan * */ public interface RoleService { /** - * 获取角色信息 - * @param id 角色ID + * 鑾峰彇瑙掕壊淇℃伅 + * @param id 瑙掕壊ID * @return * @throws Exception */ public Role getRole(String id) throws Exception; /** - * 批量获取角色信息 - * @param ids 角色ID集合 + * 鎵归噺鑾峰彇瑙掕壊淇℃伅 + * @param ids 瑙掕壊ID闆嗗悎 * @return * @throws Exception */ public List getRoleByIn(List ids) throws Exception; /** - * 查询所有角色信息 + * 鏌ヨ鎵�鏈夎鑹蹭俊鎭� * @return * @throws Exception */ public List queryAllRole() throws Exception; /** - * 分页查询角色信息 + * 鍒嗛〉鏌ヨ瑙掕壊淇℃伅 * @return * @throws Exception */ public PageBean queryRolesByPage(int page, int limit) throws Exception; /** - * 保存角色 + * 淇濆瓨瑙掕壊 * @param role * @throws Exception */ public void saveRole(Role role) throws Exception; /** - * 修改角色 + * 淇敼瑙掕壊 * @param role * @throws Exception */ diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/address/UserService.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/address/UserService.java index 9677777d7..501902ca1 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/address/UserService.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/address/UserService.java @@ -8,44 +8,44 @@ import com.fangjia.core.util.PageBean; import com.fangjia.mongo.model.ServerArea; /** - * 用户业务接口 + * 鐢ㄦ埛涓氬姟鎺ュ彛 * @author yinjihuan * */ public interface UserService { /** - * 分页查询用户信息 - * @param page 当前查询页数 - * @param limit 页数限制大小 + * 鍒嗛〉鏌ヨ鐢ㄦ埛淇℃伅 + * @param page 褰撳墠鏌ヨ椤垫暟 + * @param limit 椤垫暟闄愬埗澶у皬 * @return * @throws Exception */ public PageBean queryUsersByPage(int page, int limit) throws Exception; /** - * 删除用户 + * 鍒犻櫎鐢ㄦ埛 * @param id * @throws Exception */ public void removeUser(String id) throws Exception; /** - * 保存用户 + * 淇濆瓨鐢ㄦ埛 * @param user * @throws Exception */ public void saveUser(User user) throws Exception; /** - * 修改用户 + * 淇敼鐢ㄦ埛 * @param user * @throws Exception */ public void updateUser(User user) throws Exception; /** - * 查询用户 + * 鏌ヨ鐢ㄦ埛 * @param id * @return * @throws Exception @@ -53,16 +53,16 @@ public interface UserService { public User getUser(String id) throws Exception; /** - * 登录 - * @param username 用户名 - * @param pass 密码 + * 鐧诲綍 + * @param username 鐢ㄦ埛鍚� + * @param pass 瀵嗙爜 * @return * @throws Exception */ public User login(String username, String pass) throws Exception; /** - * 根据用户名查询用户 + * 鏍规嵁鐢ㄦ埛鍚嶆煡璇㈢敤鎴� * @param mobile * @return * @throws Exception @@ -70,7 +70,7 @@ public interface UserService { public User getUserByUsername(String username) throws Exception; /** - * 随机生成验证码 + * 闅忔満鐢熸垚楠岃瘉鐮� * @author yinjihuan * @return * @throws Exception @@ -78,29 +78,29 @@ public interface UserService { public String randomCode(); /** - * 获取拼音城市列表 + * 鑾峰彇鎷奸煶鍩庡競鍒楄〃 * @return * @throws Exception */ public Map> getPinYinGroupedCityMap() throws Exception; /** - * 检查城市是否被使用中 + * 妫�鏌ュ煄甯傛槸鍚﹁浣跨敤涓� * @param citys - * @return 无人使用返回null,有则返回提示信息 + * @return 鏃犱汉浣跨敤杩斿洖null,鏈夊垯杩斿洖鎻愮ず淇℃伅 * @throws Exception */ public String checkCityUse(List citys, String id) throws Exception; /** - * 添加城市之前移除别人中的这些城市 + * 娣诲姞鍩庡競涔嬪墠绉婚櫎鍒汉涓殑杩欎簺鍩庡競 * @param citys * @throws Exception */ public void pullCity(List citys) throws Exception; /** - * 修改密码 + * 淇敼瀵嗙爜 * @param useId * @param newPass * @throws Exception @@ -108,7 +108,7 @@ public interface UserService { public void updatePass(String useId, String newPass) throws Exception; /** - * 根据城市获取责任人名字 + * 鏍规嵁鍩庡競鑾峰彇璐d换浜哄悕瀛� * @throws Exception */ public String getUserName(String city) throws Exception; diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/address/UserServiceImpl.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/address/UserServiceImpl.java index f665f8d8e..1c1ee1928 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/address/UserServiceImpl.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/address/UserServiceImpl.java @@ -96,12 +96,12 @@ public class UserServiceImpl implements UserService { User user = userDao.findOne(new BasicDBObject("citys", city)); if (user != null && !user.getId().equals(id)) { content.append(city); - content.append("目前是:"); + content.append("鐩墠鏄細"); content.append(user.getUsername()); - content.append("在负责。"); + content.append("鍦ㄨ礋璐c��"); } } - return content.length() > 0 ? content.append("确定变更这些城市负责人?").toString() : null; + return content.length() > 0 ? content.append("纭畾鍙樻洿杩欎簺鍩庡競璐熻矗浜猴紵").toString() : null; } @Override diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/analy/AnjukeDistrictDetailAnalyImpl.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/analy/AnjukeDistrictDetailAnalyImpl.java index 4f392d59c..aefb633a8 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/analy/AnjukeDistrictDetailAnalyImpl.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/analy/AnjukeDistrictDetailAnalyImpl.java @@ -17,8 +17,8 @@ import com.fangjia.mongo.dao.RegionBlockDao; @CATEGORY(value = CategoryEnum.DISTRICT) -@SITENAME(value = "安居客") -@PAGENAME(value = "详情页") +@SITENAME(value = "瀹夊眳瀹�") +@PAGENAME(value = "璇︽儏椤�") public class AnjukeDistrictDetailAnalyImpl implements AnalyzerInterface { private RegionBlockDao regionBlockDao = RegionBlockDao.getInstance(); @@ -43,35 +43,35 @@ public class AnjukeDistrictDetailAnalyImpl implements AnalyzerInterface { String address = JQueryUtil .selectText( - new String[] { "#around_search_apf_id_18 table tbody tr:contains(地址)", "#comm-basic li:contains(小区地址)" }, - content).replace("小区地址:", "").replace("地址:", "").trim(); + new String[] { "#around_search_apf_id_18 table tbody tr:contains(鍦板潃)", "#comm-basic li:contains(灏忓尯鍦板潃)" }, + content).replace("灏忓尯鍦板潃锛�", "").replace("鍦板潃锛�", "").trim(); String estateType = JQueryUtil - .selectText(new String[] { ".chamber-infolist li:contains(物业类型)", "#comm-basic li:contains(物业类型)" }, content) - .replace("物业类型:", "").trim(); + .selectText(new String[] { ".chamber-infolist li:contains(鐗╀笟绫诲瀷)", "#comm-basic li:contains(鐗╀笟绫诲瀷)" }, content) + .replace("鐗╀笟绫诲瀷锛�", "").trim(); String finishBuildingDate = JQueryUtil - .selectText(new String[] { ".chamber-infolist li:contains(竣工时间)", "#comm-basic li:contains(竣工时间)" }, content) - .replace("竣工时间:", "").trim(); + .selectText(new String[] { ".chamber-infolist li:contains(绔e伐鏃堕棿)", "#comm-basic li:contains(绔e伐鏃堕棿)" }, content) + .replace("绔e伐鏃堕棿锛�", "").trim(); String developer = trimChar( - JQueryUtil.selectText(new String[] { ".chamber-infolist>li:contains(开)", "#comm-basic li:contains(开)" }, content)) - .replace("开 发 商:", "").trim(); + JQueryUtil.selectText(new String[] { ".chamber-infolist>li:contains(寮�)", "#comm-basic li:contains(寮�)" }, content)) + .replace("寮� 鍙� 鍟嗭細", "").trim(); String estateCharge = trimChar( - JQueryUtil.selectText(new String[] { ".chamber-infolist>li:contains(费)", "#comm-basic li:contains(费)" }, content)) - .replace("物 业 费:", "").trim(); + JQueryUtil.selectText(new String[] { ".chamber-infolist>li:contains(璐�)", "#comm-basic li:contains(璐�)" }, content)) + .replace("鐗� 涓� 璐癸細", "").trim(); - String estateCompany = JQueryUtil.selectText(new String[] { ".brief-list>li:contains(物业公司)" }, content) - .replace("物业公司:", "").trim(); - String householdCount = JQueryUtil.selectText(new String[] { ".brief-list>li:contains(总户数)" }, content) - .replace("总户数:", "").trim(); - String carSite = JQueryUtil.selectText(new String[] { ".brief-list>li:contains(停车位)" }, content).replace("停车位:", "") + String estateCompany = JQueryUtil.selectText(new String[] { ".brief-list>li:contains(鐗╀笟鍏徃)" }, content) + .replace("鐗╀笟鍏徃锛�", "").trim(); + String householdCount = JQueryUtil.selectText(new String[] { ".brief-list>li:contains(鎬绘埛鏁�)" }, content) + .replace("鎬绘埛鏁帮細", "").trim(); + String carSite = JQueryUtil.selectText(new String[] { ".brief-list>li:contains(鍋滆溅浣�)" }, content).replace("鍋滆溅浣嶏細", "") .trim(); - String cubagePercent = JQueryUtil.selectText(new String[] { ".brief-list>li:contains(容积率)" }, content) - .replace("容积率:", "").trim(); - String virescencePercent = JQueryUtil.selectText(new String[] { ".brief-list>li:contains(绿化率)" }, content) - .replace("绿化率:", "").trim(); - String buildArea = JQueryUtil.selectText(new String[] { ".brief-list>li:contains(总建筑面积)" }, content) - .replace("总建筑面积:", "").trim(); + String cubagePercent = JQueryUtil.selectText(new String[] { ".brief-list>li:contains(瀹圭Н鐜�)" }, content) + .replace("瀹圭Н鐜囷細", "").trim(); + String virescencePercent = JQueryUtil.selectText(new String[] { ".brief-list>li:contains(缁垮寲鐜�)" }, content) + .replace("缁垮寲鐜囷細", "").trim(); + String buildArea = JQueryUtil.selectText(new String[] { ".brief-list>li:contains(鎬诲缓绛戦潰绉�)" }, content) + .replace("鎬诲缓绛戦潰绉細", "").trim(); - if (buildArea.equals("平方米")) { + if (buildArea.equals("骞虫柟绫�")) { buildArea = ""; } if (virescencePercent.equals("%")) { @@ -86,7 +86,7 @@ public class AnjukeDistrictDetailAnalyImpl implements AnalyzerInterface { ret.put("city", city); ret.put("name", name); - // 某些城市板块也可能是区域 + // 鏌愪簺鍩庡競鏉垮潡涔熷彲鑳芥槸鍖哄煙 if (regionBlockDao.isRegion(city, region)) { ret.put("region", regionBlockDao.formatRegion(city, region)); } else if (regionBlockDao.isRegion(city, block)) { @@ -114,22 +114,22 @@ public class AnjukeDistrictDetailAnalyImpl implements AnalyzerInterface { otherInfo.put("household_count", householdCount); if (estateType != null) { - if (estateType.indexOf("小区") == -1 && estateType.indexOf("别墅") == -1 && estateType.indexOf("公寓") == -1 - && estateType.indexOf("住宅") == -1) { - if (estateType.indexOf("写字楼") > -1 || estateType.indexOf("商铺") > -1) { - errors.add("类型不正确,不是小区类型"); + if (estateType.indexOf("灏忓尯") == -1 && estateType.indexOf("鍒") == -1 && estateType.indexOf("鍏瘬") == -1 + && estateType.indexOf("浣忓畢") == -1) { + if (estateType.indexOf("鍐欏瓧妤�") > -1 || estateType.indexOf("鍟嗛摵") > -1) { + errors.add("绫诲瀷涓嶆纭�,涓嶆槸灏忓尯绫诲瀷"); return new AnalyResult(errors); } } - if (estateType.indexOf("购物") > -1) { - errors.add("类型不正确,不是小区类型"); + if (estateType.indexOf("璐墿") > -1) { + errors.add("绫诲瀷涓嶆纭�,涓嶆槸灏忓尯绫诲瀷"); return new AnalyResult(errors); } } - if (name.indexOf("写字楼") > -1 || name.indexOf("商铺") > -1 || name.indexOf("商业广场") > -1) { - errors.add("类型不正确,不是小区类型"); + if (name.indexOf("鍐欏瓧妤�") > -1 || name.indexOf("鍟嗛摵") > -1 || name.indexOf("鍟嗕笟骞垮満") > -1) { + errors.add("绫诲瀷涓嶆纭�,涓嶆槸灏忓尯绫诲瀷"); return new AnalyResult(errors); } @@ -152,7 +152,7 @@ public class AnjukeDistrictDetailAnalyImpl implements AnalyzerInterface { List removeKeys = new ArrayList(); for (String key : dbo.keySet()) { Object s = dbo.get(key); - if (s == null || "".equals(s) || s.toString().startsWith("暂无资料") || s.equals("暂无")) { + if (s == null || "".equals(s) || s.toString().startsWith("鏆傛棤璧勬枡") || s.equals("鏆傛棤")) { removeKeys.add(key); } } @@ -167,7 +167,7 @@ public class AnjukeDistrictDetailAnalyImpl implements AnalyzerInterface { List okeys = new ArrayList(); for (String key : otherInfo.keySet()) { Object s = otherInfo.get(key); - if (s == null || "".equals(s) || s.toString().startsWith("暂无资料") || s.equals("暂无")) { + if (s == null || "".equals(s) || s.toString().startsWith("鏆傛棤璧勬枡") || s.equals("鏆傛棤")) { okeys.add(key); } } diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/analy/DaikanDistrictDetailAnalyImpl.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/analy/DaikanDistrictDetailAnalyImpl.java index 40f7dedc3..78036f048 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/analy/DaikanDistrictDetailAnalyImpl.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/analy/DaikanDistrictDetailAnalyImpl.java @@ -20,8 +20,8 @@ import com.fangjia.mongo.dao.RegionBlockDao; import com.mongodb.BasicDBObject; @CATEGORY(value = CategoryEnum.DISTRICT) -@SITENAME(value = "带看网") -@PAGENAME(value = "详情页") +@SITENAME(value = "甯︾湅缃�") +@PAGENAME(value = "璇︽儏椤�") public class DaikanDistrictDetailAnalyImpl implements AnalyzerInterface { private RegionBlockDao regionBlockDao = RegionBlockDao.getInstance(); @@ -31,7 +31,7 @@ public class DaikanDistrictDetailAnalyImpl implements AnalyzerInterface { String region = ""; String block = ""; - String regionBlock = JQueryUtil.selectText(new String[] { ".lp_xq li:contains(区域商圈)" }, content).replace("区域商圈:", ""); + String regionBlock = JQueryUtil.selectText(new String[] { ".lp_xq li:contains(鍖哄煙鍟嗗湀)" }, content).replace("鍖哄煙鍟嗗湀锛�", ""); Map regionBlockMap = getRegionBlocInfo(regionBlock); if (regionBlockMap.size() > 0) { region = regionBlockMap.get("region"); @@ -39,29 +39,29 @@ public class DaikanDistrictDetailAnalyImpl implements AnalyzerInterface { } String name = JQueryUtil.selectText(new String[] { ".lp_xq_tit" }, content); - String address = JQueryUtil.selectText(new String[] { ".lp_xq li:contains(物业地址)" }, content).replace("物业地址:", ""); - String estateType = JQueryUtil.selectText(new String[] { ".lp_x_xq li:contains(物业类型)" }, content).replace("物业类型:", "") - .replace("物业类型:", "").trim(); - String householdCount = JQueryUtil.selectText(new String[] { ".lp_x_xq li:contains(总住户数)" }, content) - .replace("总住户数:", "").replace("总住户数:", "").trim(); - String buildDate = JQueryUtil.selectText(new String[] { ".lp_x_xq li:contains(新建时间)" }, content).replace("新建时间:", "") + String address = JQueryUtil.selectText(new String[] { ".lp_xq li:contains(鐗╀笟鍦板潃)" }, content).replace("鐗╀笟鍦板潃锛�", ""); + String estateType = JQueryUtil.selectText(new String[] { ".lp_x_xq li:contains(鐗╀笟绫诲瀷)" }, content).replace("鐗╀笟绫诲瀷锛�", "") + .replace("鐗╀笟绫诲瀷锛�", "").trim(); + String householdCount = JQueryUtil.selectText(new String[] { ".lp_x_xq li:contains(鎬讳綇鎴锋暟)" }, content) + .replace("鎬讳綇鎴锋暟锛�", "").replace("鎬讳綇鎴锋暟锛�", "").trim(); + String buildDate = JQueryUtil.selectText(new String[] { ".lp_x_xq li:contains(鏂板缓鏃堕棿)" }, content).replace("鏂板缓鏃堕棿锛�", "") .trim(); - String cubagePercent = JQueryUtil.selectText(new String[] { ".lp_x_xq li:contains(容积率)" }, content).replace("容积率:", "") - .replace("容积率:", "").trim(); - String estateCharge = JQueryUtil.selectText(new String[] { ".lp_x_xq li:contains(物业费用)" }, content).replace("物业费用:", "") + String cubagePercent = JQueryUtil.selectText(new String[] { ".lp_x_xq li:contains(瀹圭Н鐜�)" }, content).replace("瀹圭Н鐜囷細", "") + .replace("瀹圭Н鐜囷細", "").trim(); + String estateCharge = JQueryUtil.selectText(new String[] { ".lp_x_xq li:contains(鐗╀笟璐圭敤)" }, content).replace("鐗╀笟璐圭敤锛�", "") .trim(); - String virescencePercent = JQueryUtil.selectText(new String[] { ".lp_x_xq li:contains(绿化率)" }, content) - .replace("绿化率:", "").replace("绿化率", "").trim(); - String carSite = JQueryUtil.selectText(new String[] { ".lp_x_xq li:contains(车位配置)" }, content).replace("车位配置:", "") + String virescencePercent = JQueryUtil.selectText(new String[] { ".lp_x_xq li:contains(缁垮寲鐜�)" }, content) + .replace("缁垮寲鐜囷細", "").replace("缁垮寲鐜�", "").trim(); + String carSite = JQueryUtil.selectText(new String[] { ".lp_x_xq li:contains(杞︿綅閰嶇疆)" }, content).replace("杞︿綅閰嶇疆锛�", "") .trim(); - String estateCompany = JQueryUtil.selectText(new String[] { ".lp_x_xq li:contains(物业公司)" }, content).replace("物业公司:", "") + String estateCompany = JQueryUtil.selectText(new String[] { ".lp_x_xq li:contains(鐗╀笟鍏徃)" }, content).replace("鐗╀笟鍏徃锛�", "") .trim(); if (virescencePercent.equals("%")) { virescencePercent = ""; } - String traffic = JQueryUtil.selectText(new String[] { ".lp_xq li:contains(地铁线路)" }, content).replace("地铁线路:", ""); + String traffic = JQueryUtil.selectText(new String[] { ".lp_xq li:contains(鍦伴搧绾胯矾)" }, content).replace("鍦伴搧绾胯矾锛�", ""); Map ret = new HashMap(); @@ -70,7 +70,7 @@ public class DaikanDistrictDetailAnalyImpl implements AnalyzerInterface { ret.put("city", city); ret.put("name", name); - // 某些城市板块也可能是区域 + // 鏌愪簺鍩庡競鏉垮潡涔熷彲鑳芥槸鍖哄煙 if (regionBlockDao.isRegion(city, region)) { ret.put("region", regionBlockDao.formatRegion(city, region)); } else if (regionBlockDao.isRegion(city, block)) { @@ -131,9 +131,9 @@ public class DaikanDistrictDetailAnalyImpl implements AnalyzerInterface { if (!s.equals("")) { s = leftTrim(s); String arr[] = s.split(" "); - map.put("region", arr[0].replace("【", "").replace("】", "")); + map.put("region", arr[0].replace("銆�", "").replace("銆�", "")); if(arr.length==2){ - map.put("block", arr[1].replace("【", "").replace("】", "")); + map.put("block", arr[1].replace("銆�", "").replace("銆�", "")); } } return map; @@ -150,8 +150,8 @@ public class DaikanDistrictDetailAnalyImpl implements AnalyzerInterface { String ret = ""; for (String s : facilitieSpans) { s = trimChar(s); - if (s.indexOf("·公交") == -1 && s.indexOf("·地铁") == -1) { - s = s.replace("", "").replace("", "").replace("·", ""); + if (s.indexOf("路鍏氦") == -1 && s.indexOf("路鍦伴搧") == -1) { + s = s.replace("", "").replace("", "").replace("路", ""); if (ret.length() == 0) { ret = s; } else { @@ -180,11 +180,11 @@ public class DaikanDistrictDetailAnalyImpl implements AnalyzerInterface { } for (String s : trafficeArr) { s = trimChar(s); - if (s.indexOf("公交") != -1 || s.indexOf("地铁") != -1) { + if (s.indexOf("鍏氦") != -1 || s.indexOf("鍦伴搧") != -1) { if (ret.length() == 0) { - ret = s.replace("·", ""); + ret = s.replace("路", ""); } else { - ret = ret + "\r" + s.replace("·", ""); + ret = ret + "\r" + s.replace("路", ""); } } } @@ -196,7 +196,7 @@ public class DaikanDistrictDetailAnalyImpl implements AnalyzerInterface { List removeKeys = new ArrayList(); for (String key : dbo.keySet()) { Object s = dbo.get(key); - if (s == null || "".equals(s) || s.toString().startsWith("暂无资料") || s.equals("暂无")) { + if (s == null || "".equals(s) || s.toString().startsWith("鏆傛棤璧勬枡") || s.equals("鏆傛棤")) { removeKeys.add(key); } } @@ -210,7 +210,7 @@ public class DaikanDistrictDetailAnalyImpl implements AnalyzerInterface { List okeys = new ArrayList(); for (String key : otherInfo.keySet()) { Object s = otherInfo.get(key); - if (s == null || "".equals(s) || s.toString().startsWith("暂无资料") || s.equals("暂无")) { + if (s == null || "".equals(s) || s.toString().startsWith("鏆傛棤璧勬枡") || s.equals("鏆傛棤")) { okeys.add(key); } } diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/analy/FocusDistrictDetailAnalyImpl.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/analy/FocusDistrictDetailAnalyImpl.java index 671ee7a02..e30c2f42e 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/analy/FocusDistrictDetailAnalyImpl.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/analy/FocusDistrictDetailAnalyImpl.java @@ -21,8 +21,8 @@ import com.fangjia.coredata.util.JQueryUtil; import com.fangjia.mongo.dao.RegionBlockDao; @CATEGORY(value = CategoryEnum.DISTRICT) -@SITENAME(value = "焦点") -@PAGENAME(value = "详情页") +@SITENAME(value = "鐒︾偣") +@PAGENAME(value = "璇︽儏椤�") public class FocusDistrictDetailAnalyImpl implements AnalyzerInterface{ private RegionBlockDao regionBlockDao = RegionBlockDao.getInstance(); @@ -50,15 +50,15 @@ public class FocusDistrictDetailAnalyImpl implements AnalyzerInterface{ String name = JQueryUtil.selectText(new String[] {".main_nav h3" }, content); - String address= JQueryUtil.selectText(new String[] {".house_info li:contains(小区地址)" }, content).replace("小区地址:", "").replace("地图", "").trim(); - String estateType = JQueryUtil.selectText(new String[] {".house_info li:contains(物业类型)" }, content).replace("物业类型:", "").trim(); - String finishBuildingDate = JQueryUtil.selectText(new String[] {".house_info li:contains(建筑年代)" }, content).replace("建筑年代:", "").trim(); - String cubagePercent = JQueryUtil.selectText(new String[] {".house_info li:contains(容积率)" }, content).replace("容积率:", "").trim(); - String householdCount = JQueryUtil.selectText(new String[] {".house_info li:contains(总户数)"}, content).replace("总户数:", "").trim(); - String virescencePercent = JQueryUtil.selectText(new String[] {".house_info li:contains(绿化率:)"}, content).replace("绿化率:", "").trim(); - String estateCharge = JQueryUtil.selectText(new String[] {".house_info li:contains(物业费)"}, content).replace("物业费:", "").trim(); - String estateCompany = JQueryUtil.selectText(new String[] {".house_info li:contains(物业公司)" }, content).replace("物业公司:", "").trim(); - String developer = JQueryUtil.selectText(new String[] {".house_info li:contains(开发商)"}, content).replace("开发商:", "").trim(); + String address= JQueryUtil.selectText(new String[] {".house_info li:contains(灏忓尯鍦板潃)" }, content).replace("灏忓尯鍦板潃锛�", "").replace("鍦板浘", "").trim(); + String estateType = JQueryUtil.selectText(new String[] {".house_info li:contains(鐗╀笟绫诲瀷)" }, content).replace("鐗╀笟绫诲瀷锛�", "").trim(); + String finishBuildingDate = JQueryUtil.selectText(new String[] {".house_info li:contains(寤虹瓚骞翠唬)" }, content).replace("寤虹瓚骞翠唬锛�", "").trim(); + String cubagePercent = JQueryUtil.selectText(new String[] {".house_info li:contains(瀹圭Н鐜�)" }, content).replace("瀹圭Н鐜囷細", "").trim(); + String householdCount = JQueryUtil.selectText(new String[] {".house_info li:contains(鎬绘埛鏁�)"}, content).replace("鎬绘埛鏁帮細", "").trim(); + String virescencePercent = JQueryUtil.selectText(new String[] {".house_info li:contains(缁垮寲鐜囷細)"}, content).replace("缁垮寲鐜囷細", "").trim(); + String estateCharge = JQueryUtil.selectText(new String[] {".house_info li:contains(鐗╀笟璐�)"}, content).replace("鐗╀笟璐癸細", "").trim(); + String estateCompany = JQueryUtil.selectText(new String[] {".house_info li:contains(鐗╀笟鍏徃)" }, content).replace("鐗╀笟鍏徃锛�", "").trim(); + String developer = JQueryUtil.selectText(new String[] {".house_info li:contains(寮�鍙戝晢)"}, content).replace("寮�鍙戝晢锛�", "").trim(); if(virescencePercent.equals("%")||virescencePercent.equals("0%")){ virescencePercent = ""; @@ -66,7 +66,7 @@ public class FocusDistrictDetailAnalyImpl implements AnalyzerInterface{ if(finishBuildingDate.equals("0")){ finishBuildingDate = ""; } - if(estateCharge.equals("元/平米/月")){ + if(estateCharge.equals("鍏�/骞崇背/鏈�")){ estateCharge = ""; } @@ -83,7 +83,7 @@ public class FocusDistrictDetailAnalyImpl implements AnalyzerInterface{ ret.put("city", city); ret.put("name", name); - // 某些城市板块也可能是区域 + // 鏌愪簺鍩庡競鏉垮潡涔熷彲鑳芥槸鍖哄煙 if (regionBlockDao.isRegion(city, region)) { ret.put("region", regionBlockDao.formatRegion(city, region)); } else if (regionBlockDao.isRegion(city, block)) { @@ -112,22 +112,22 @@ public class FocusDistrictDetailAnalyImpl implements AnalyzerInterface{ otherInfo.put("household_count", householdCount); if (estateType != null) { - if (estateType.indexOf("小区") == -1 && estateType.indexOf("别墅") == -1 && estateType.indexOf("公寓") == -1 - && estateType.indexOf("住宅") == -1) { - if (estateType.indexOf("写字楼") > -1 || estateType.indexOf("商铺") > -1) { - errors.add("类型不正确,不是小区类型"); + if (estateType.indexOf("灏忓尯") == -1 && estateType.indexOf("鍒") == -1 && estateType.indexOf("鍏瘬") == -1 + && estateType.indexOf("浣忓畢") == -1) { + if (estateType.indexOf("鍐欏瓧妤�") > -1 || estateType.indexOf("鍟嗛摵") > -1) { + errors.add("绫诲瀷涓嶆纭�,涓嶆槸灏忓尯绫诲瀷"); return new AnalyResult(errors); } } - if (estateType.indexOf("购物") > -1) { - errors.add("类型不正确,不是小区类型"); + if (estateType.indexOf("璐墿") > -1) { + errors.add("绫诲瀷涓嶆纭�,涓嶆槸灏忓尯绫诲瀷"); return new AnalyResult(errors); } } - if (name.indexOf("写字楼") > -1 || name.indexOf("商铺") > -1 || name.indexOf("商业广场") > -1) { - errors.add("类型不正确,不是小区类型"); + if (name.indexOf("鍐欏瓧妤�") > -1 || name.indexOf("鍟嗛摵") > -1 || name.indexOf("鍟嗕笟骞垮満") > -1) { + errors.add("绫诲瀷涓嶆纭�,涓嶆槸灏忓尯绫诲瀷"); return new AnalyResult(errors); } @@ -162,12 +162,12 @@ public class FocusDistrictDetailAnalyImpl implements AnalyzerInterface{ } Map> map = new HashMap>(); for(String s : facilitieSpans){ - String title = s.substring(s.indexOf("【"), s.indexOf("】")+1); + String title = s.substring(s.indexOf("銆�"), s.indexOf("銆�")+1); String content = s.replace(title, ""); content = trimChar(content); content = leftTrim(content); String[] detail = content.split(" "); - title = title.replace("【", "").replace("】", ""); + title = title.replace("銆�", "").replace("銆�", ""); List details = map.get(title); if(null == details){ details = new ArrayList(); @@ -186,9 +186,9 @@ public class FocusDistrictDetailAnalyImpl implements AnalyzerInterface{ String key = (String) it.next(); List values = map.get(key); if(ret.length() >0){ - ret = ret + "\r" + key +" :" + values.toString(); + ret = ret + "\r" + key +" 锛�" + values.toString(); }else{ - ret = key +" :" + values.toString(); + ret = key +" 锛�" + values.toString(); } } } @@ -217,8 +217,8 @@ public class FocusDistrictDetailAnalyImpl implements AnalyzerInterface{ } for(String s : trafficeArr){ s = trimChar(s); - if(s.indexOf("地铁")!=-1){ - s = s.substring(s.indexOf("】")+1, s.length()); + if(s.indexOf("鍦伴搧")!=-1){ + s = s.substring(s.indexOf("銆�")+1, s.length()); if(ret.length()==0){ ret = s; }else{ @@ -235,7 +235,7 @@ public class FocusDistrictDetailAnalyImpl implements AnalyzerInterface{ List removeKeys = new ArrayList(); for (String key : dbo.keySet()) { Object s = dbo.get(key); - if (s == null || "".equals(s) || s.toString().startsWith("暂无资料") || s.equals("暂无")) { + if (s == null || "".equals(s) || s.toString().startsWith("鏆傛棤璧勬枡") || s.equals("鏆傛棤")) { removeKeys.add(key); } } @@ -249,7 +249,7 @@ public class FocusDistrictDetailAnalyImpl implements AnalyzerInterface{ List okeys = new ArrayList(); for (String key : otherInfo.keySet()) { Object s = otherInfo.get(key); - if (s == null || "".equals(s) || s.toString().startsWith("暂无资料") || s.equals("暂无")) { + if (s == null || "".equals(s) || s.toString().startsWith("鏆傛棤璧勬枡") || s.equals("鏆傛棤")) { okeys.add(key); } } diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/analy/Home365DistrictDetailAnalyImpl.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/analy/Home365DistrictDetailAnalyImpl.java index 9bcd1b9a7..0eb6008c2 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/analy/Home365DistrictDetailAnalyImpl.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/analy/Home365DistrictDetailAnalyImpl.java @@ -17,7 +17,7 @@ import com.fangjia.mongo.dao.RegionBlockDao; @CATEGORY(value = CategoryEnum.DISTRICT) @SITENAME(value = "house365") -@PAGENAME(value = "详情页") +@PAGENAME(value = "璇︽儏椤�") public class Home365DistrictDetailAnalyImpl implements AnalyzerInterface { private RegionBlockDao regionBlockDao = RegionBlockDao.getInstance(); @@ -42,36 +42,36 @@ public class Home365DistrictDetailAnalyImpl implements AnalyzerInterface { } String name = JQueryUtil.selectText(new String[] { ".procjet h1" }, content); - String address = JQueryUtil.selectText(new String[] { ".introduce p:contains(小区地址)" }, content).replace("小区地址:", "") - .replace("查看地图", "").trim(); - String estateType = JQueryUtil.selectText(new String[] { ".introduce p:contains(物业类型)" }, content).replace("物业类型:", "") + String address = JQueryUtil.selectText(new String[] { ".introduce p:contains(灏忓尯鍦板潃)" }, content).replace("灏忓尯鍦板潃锛�", "") + .replace("鏌ョ湅鍦板浘", "").trim(); + String estateType = JQueryUtil.selectText(new String[] { ".introduce p:contains(鐗╀笟绫诲瀷)" }, content).replace("鐗╀笟绫诲瀷锛�", "") .trim(); - String estateCharge = JQueryUtil.selectText(new String[] { ".introduce p:contains(费)" }, content).replace("物 业 费 :", "") + String estateCharge = JQueryUtil.selectText(new String[] { ".introduce p:contains(璐�)" }, content).replace("鐗� 涓� 璐� 锛�", "") .trim(); - String estateCompany = JQueryUtil.selectText(new String[] { ".introduce p:contains(物业公司)" }, content) - .replace("物业公司:", "").trim(); - String developer = JQueryUtil.selectText(new String[] { ".introduce p:contains(商)" }, content).replace("开 发 商 :", "") + String estateCompany = JQueryUtil.selectText(new String[] { ".introduce p:contains(鐗╀笟鍏徃)" }, content) + .replace("鐗╀笟鍏徃锛�", "").trim(); + String developer = JQueryUtil.selectText(new String[] { ".introduce p:contains(鍟�)" }, content).replace("寮� 鍙� 鍟� 锛�", "") .trim(); - String virescencePercent = JQueryUtil.selectText(new String[] { ".jbxx_cont li:contains(绿化比例) span:eq(3)" }, content) - .replace("绿化比例", "").trim(); - String buildArea = JQueryUtil.selectText(new String[] { ".jbxx_cont li:contains(建筑面积) span:eq(1)" }, content) - .replace("建筑面积", "").trim(); - String carSite = JQueryUtil.selectText(new String[] { ".jbxx_cont li:contains(停 车 位) span:eq(3)" }, content) - .replace("停 车 位", "").trim(); + String virescencePercent = JQueryUtil.selectText(new String[] { ".jbxx_cont li:contains(缁垮寲姣斾緥) span:eq(3)" }, content) + .replace("缁垮寲姣斾緥", "").trim(); + String buildArea = JQueryUtil.selectText(new String[] { ".jbxx_cont li:contains(寤虹瓚闈㈢Н) span:eq(1)" }, content) + .replace("寤虹瓚闈㈢Н", "").trim(); + String carSite = JQueryUtil.selectText(new String[] { ".jbxx_cont li:contains(鍋� 杞� 浣�) span:eq(3)" }, content) + .replace("鍋� 杞� 浣�", "").trim(); if (virescencePercent.equals("%") || virescencePercent.equals("0%")) { virescencePercent = ""; } - if (estateCharge.equals("元/平米/月")) { + if (estateCharge.equals("鍏�/骞崇背/鏈�")) { estateCharge = ""; } String traffic = JQueryUtil.selectText(new String[] { ".jiaotong" }, content).trim(); List info = JQueryUtil.selectText(".box_c p", content); - String description = info.get(0).replace("..详细>>", "").replace("收起", ""); - String facilities = info.get(1).replace("..详细>>", "").replace("收起", "").trim(); + String description = info.get(0).replace("..璇︾粏>>", "").replace("鏀惰捣", ""); + String facilities = info.get(1).replace("..璇︾粏>>", "").replace("鏀惰捣", "").trim(); Map ret = new HashMap(); @@ -80,7 +80,7 @@ public class Home365DistrictDetailAnalyImpl implements AnalyzerInterface { ret.put("city", city); ret.put("name", name); - // 某些城市板块也可能是区域 + // 鏌愪簺鍩庡競鏉垮潡涔熷彲鑳芥槸鍖哄煙 if (regionBlockDao.isRegion(city, region)) { ret.put("region", regionBlockDao.formatRegion(city, region)); } else if (regionBlockDao.isRegion(city, block)) { @@ -98,7 +98,7 @@ public class Home365DistrictDetailAnalyImpl implements AnalyzerInterface { ret.put("developer", developer); ret.put("estate_type", trimChar(estateType, " ")); ret.put("virescence_percent", virescencePercent); - ret.put("estate_charge", trimChar(estateCharge, "·")); + ret.put("estate_charge", trimChar(estateCharge, "路")); ret.put("estate_company", estateCompany); ret.put("traffic", traffic); ret.put("facilities", facilities); @@ -107,22 +107,22 @@ public class Home365DistrictDetailAnalyImpl implements AnalyzerInterface { ret.put("car_site", carSite); if (estateType != null) { - if (estateType.indexOf("小区") == -1 && estateType.indexOf("别墅") == -1 && estateType.indexOf("公寓") == -1 - && estateType.indexOf("住宅") == -1) { - if (estateType.indexOf("写字楼") > -1 || estateType.indexOf("商铺") > -1) { - errors.add("类型不正确,不是小区类型"); + if (estateType.indexOf("灏忓尯") == -1 && estateType.indexOf("鍒") == -1 && estateType.indexOf("鍏瘬") == -1 + && estateType.indexOf("浣忓畢") == -1) { + if (estateType.indexOf("鍐欏瓧妤�") > -1 || estateType.indexOf("鍟嗛摵") > -1) { + errors.add("绫诲瀷涓嶆纭�,涓嶆槸灏忓尯绫诲瀷"); return new AnalyResult(errors); } } - if (estateType.indexOf("购物") > -1) { - errors.add("类型不正确,不是小区类型"); + if (estateType.indexOf("璐墿") > -1) { + errors.add("绫诲瀷涓嶆纭�,涓嶆槸灏忓尯绫诲瀷"); return new AnalyResult(errors); } } - if (name.indexOf("写字楼") > -1 || name.indexOf("商铺") > -1 || name.indexOf("商业广场") > -1) { - errors.add("类型不正确,不是小区类型"); + if (name.indexOf("鍐欏瓧妤�") > -1 || name.indexOf("鍟嗛摵") > -1 || name.indexOf("鍟嗕笟骞垮満") > -1) { + errors.add("绫诲瀷涓嶆纭�,涓嶆槸灏忓尯绫诲瀷"); return new AnalyResult(errors); } @@ -146,7 +146,7 @@ public class Home365DistrictDetailAnalyImpl implements AnalyzerInterface { List removeKeys = new ArrayList(); for (String key : dbo.keySet()) { Object s = dbo.get(key); - if (s == null || "".equals(s) || s.toString().startsWith("暂无资料") || s.equals("暂无")) { + if (s == null || "".equals(s) || s.toString().startsWith("鏆傛棤璧勬枡") || s.equals("鏆傛棤")) { removeKeys.add(key); } } @@ -160,7 +160,7 @@ public class Home365DistrictDetailAnalyImpl implements AnalyzerInterface { List okeys = new ArrayList(); for (String key : otherInfo.keySet()) { Object s = otherInfo.get(key); - if (s == null || "".equals(s) || s.toString().startsWith("暂无资料") || s.equals("暂无")) { + if (s == null || "".equals(s) || s.toString().startsWith("鏆傛棤璧勬枡") || s.equals("鏆傛棤")) { okeys.add(key); } } diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/analy/HomeLinkDistrictDetailAnalyImpl.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/analy/HomeLinkDistrictDetailAnalyImpl.java index 05392d7aa..23f4846ed 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/analy/HomeLinkDistrictDetailAnalyImpl.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/analy/HomeLinkDistrictDetailAnalyImpl.java @@ -24,8 +24,8 @@ import com.mongodb.BasicDBObject; import com.mongodb.DBObject; @CATEGORY(value = CategoryEnum.DISTRICT) -@SITENAME(value = "链家") -@PAGENAME(value = "详情页") +@SITENAME(value = "閾惧") +@PAGENAME(value = "璇︽儏椤�") public class HomeLinkDistrictDetailAnalyImpl implements AnalyzerInterface { private RegionBlockDao regionBlockDao = RegionBlockDao.getInstance(); @@ -79,10 +79,10 @@ public class HomeLinkDistrictDetailAnalyImpl implements AnalyzerInterface { if (StringUtils.isNotBlank(finish_building_date)) { String city = (String) map.get("city"); String region = (String) map.get("region"); - if (city.equals("北京") && StringUtils.isNotBlank(region)) { + if (city.equals("鍖椾含") && StringUtils.isNotBlank(region)) { String districtName = (String) map.get("name"); - District district = districtDao.findDistrict("北京", region, districtName); + District district = districtDao.findDistrict("鍖椾含", region, districtName); if (null != district) { DBObject obj = new BasicDBObject(); obj.put("finish_building_date", finish_building_date); @@ -102,8 +102,8 @@ public class HomeLinkDistrictDetailAnalyImpl implements AnalyzerInterface { String name = JQueryUtil.selectText(new String[] { ".xtitle h1", ".headline h1" }, content); String address = JQueryUtil - .selectText(new String[] { ".xtitle samp:contains(地址)", ".parti_nei li:contains(小区地址)" }, content) - .replace("小区地址:", "").replace("地址:", ""); + .selectText(new String[] { ".xtitle samp:contains(鍦板潃)", ".parti_nei li:contains(灏忓尯鍦板潃)" }, content) + .replace("灏忓尯鍦板潃锛�", "").replace("鍦板潃锛�", ""); String region = ""; String block = ""; Map map = parseAddress(address); @@ -113,36 +113,36 @@ public class HomeLinkDistrictDetailAnalyImpl implements AnalyzerInterface { address = map.get("address"); } - String estateType = JQueryUtil.selectText(new String[] { ".jiashou .one li:contains(房屋类型)" }, content) - .replace("房屋类型:", "").trim(); - String buildType = JQueryUtil.selectText(new String[] { ".jiashou .one li:contains(建筑类型)" }, content) - .replace("建筑类型:", "").trim(); + String estateType = JQueryUtil.selectText(new String[] { ".jiashou .one li:contains(鎴垮眿绫诲瀷)" }, content) + .replace("鎴垮眿绫诲瀷锛�", "").trim(); + String buildType = JQueryUtil.selectText(new String[] { ".jiashou .one li:contains(寤虹瓚绫诲瀷)" }, content) + .replace("寤虹瓚绫诲瀷锛�", "").trim(); String finishBuildingDate = JQueryUtil - .selectText(new String[] { ".jiashou .one li:contains(建成年代)", ".parti_nei li:contains(竣工时间)" }, content) - .replace("建成年代:", "").replace("竣工时间:", "").trim(); + .selectText(new String[] { ".jiashou .one li:contains(寤烘垚骞翠唬)", ".parti_nei li:contains(绔e伐鏃堕棿)" }, content) + .replace("寤烘垚骞翠唬锛�", "").replace("绔e伐鏃堕棿锛�", "").trim(); String estateCharge = JQueryUtil - .selectText(new String[] { ".jiashou .one li:contains(物 业 费)", ".parti_nei li:contains(物 业 费)" }, content) - .replace("物 业 费:", "").trim(); + .selectText(new String[] { ".jiashou .one li:contains(鐗� 涓� 璐�)", ".parti_nei li:contains(鐗� 涓� 璐�)" }, content) + .replace("鐗� 涓� 璐癸細", "").trim(); String estateCompany = JQueryUtil - .selectText(new String[] { ".jiashou .one li:contains(物业公司)", ".parti_nei li:contains(物业公司)" }, content) - .replace("物业公司:", "").trim(); + .selectText(new String[] { ".jiashou .one li:contains(鐗╀笟鍏徃)", ".parti_nei li:contains(鐗╀笟鍏徃)" }, content) + .replace("鐗╀笟鍏徃锛�", "").trim(); String developer = JQueryUtil - .selectText(new String[] { ".jiashou .one li:contains(商)", ".parti_nei li:contains(开 发 商)" }, content) - .replace("开 发 商:", "").trim(); + .selectText(new String[] { ".jiashou .one li:contains(鍟�)", ".parti_nei li:contains(寮� 鍙� 鍟�)" }, content) + .replace("寮� 鍙� 鍟嗭細", "").trim(); String cubagePercent = JQueryUtil - .selectText(new String[] { ".jiashou .one li:contains(容)", ".jiashou dd:contains(容 积 率)" }, content) - .replace("容 积 率:", "").replace("容 积 率", "").trim(); + .selectText(new String[] { ".jiashou .one li:contains(瀹�)", ".jiashou dd:contains(瀹� 绉� 鐜�)" }, content) + .replace("瀹� 绉� 鐜囷細", "").replace("瀹� 绉� 鐜�", "").trim(); String householdCount = JQueryUtil - .selectText(new String[] { ".jiashou .one li:contains(房屋总数)", ".jiashou dd:contains(房屋总数)" }, content) - .replace("房屋总数:", "").trim(); + .selectText(new String[] { ".jiashou .one li:contains(鎴垮眿鎬绘暟)", ".jiashou dd:contains(鎴垮眿鎬绘暟)" }, content) + .replace("鎴垮眿鎬绘暟锛�", "").trim(); String virescencePercent = JQueryUtil - .selectText(new String[] { ".jiashou .one li:contains(绿 化 率)", ".jiashou dd:contains(绿 化 率)" }, content) - .replace("绿 化 率:", "").replace("绿 化 率", "").trim(); + .selectText(new String[] { ".jiashou .one li:contains(缁� 鍖� 鐜�)", ".jiashou dd:contains(缁� 鍖� 鐜�)" }, content) + .replace("缁� 鍖� 鐜囷細", "").replace("缁� 鍖� 鐜�", "").trim(); String total_building = JQueryUtil - .selectText(new String[] { ".jiashou .one li:contains(楼栋总数)", ".jiashou dd:contains(楼栋总数)" }, content) - .replace("楼栋总数:", "").trim(); + .selectText(new String[] { ".jiashou .one li:contains(妤兼爧鎬绘暟)", ".jiashou dd:contains(妤兼爧鎬绘暟)" }, content) + .replace("妤兼爧鎬绘暟锛�", "").trim(); - if (estateCharge.equals("元/平米/月")) { + if (estateCharge.equals("鍏�/骞崇背/鏈�")) { estateCharge = ""; } List baseInfos = JQueryUtil.selectText(".detailed dd", content); @@ -152,19 +152,19 @@ public class HomeLinkDistrictDetailAnalyImpl implements AnalyzerInterface { for (int i = 0; i < baseInfos.size() - 1; i = i + 2) { // String field = baseInfos.get(i); // String value = baseInfos.get(i + 1); -// if (field.indexOf("建筑面积") != -1) { +// if (field.indexOf("寤虹瓚闈㈢Н") != -1) { // buildArea = trimChar(JQueryUtil.getText(value)).trim(); -// } else if (field.indexOf("占地面积") != -1) { +// } else if (field.indexOf("鍗犲湴闈㈢Н") != -1) { // allArea = trimChar(JQueryUtil.getText(value)).trim(); -// } else if (field.indexOf("车位信息") != -1) { +// } else if (field.indexOf("杞︿綅淇℃伅") != -1) { // carSite = trimChar(JQueryUtil.getText(value)).trim(); -// } else if (field.indexOf("容") != -1) { +// } else if (field.indexOf("瀹�") != -1) { // cubagePercent = trimChar(JQueryUtil.getText(value)).trim(); -// } else if (field.indexOf("绿") != -1) { +// } else if (field.indexOf("缁�") != -1) { // virescencePercent = trimChar(JQueryUtil.getText(value)).trim(); -// } else if (field.indexOf("商") != -1) { +// } else if (field.indexOf("鍟�") != -1) { // developer = trimChar(JQueryUtil.getText(value)).trim(); -// } else if (field.indexOf("费") != -1) { +// } else if (field.indexOf("璐�") != -1) { // estateCharge = trimChar(JQueryUtil.getText(value)).trim(); // } } @@ -181,13 +181,13 @@ public class HomeLinkDistrictDetailAnalyImpl implements AnalyzerInterface { List trafficeArr = JQueryUtil.selectText("#tagContentb0 table .one", content); String traffic = getTraffic(trafficeArr); if (traffic.length() == 0) { - String bus = JQueryUtil.selectText(new String[] { ".ditiae ul:contains(公交)" }, content).trim(); - String subway = JQueryUtil.selectText(new String[] { ".ditiae ul:contains(地铁)" }, content).trim(); - if (!bus.equals("公交:")) { + String bus = JQueryUtil.selectText(new String[] { ".ditiae ul:contains(鍏氦)" }, content).trim(); + String subway = JQueryUtil.selectText(new String[] { ".ditiae ul:contains(鍦伴搧)" }, content).trim(); + if (!bus.equals("鍏氦锛�")) { traffic = bus; } - if (!subway.equals("地铁:")) { + if (!subway.equals("鍦伴搧锛�")) { if (traffic.length() == 0) { traffic = bus; } else { @@ -212,7 +212,7 @@ public class HomeLinkDistrictDetailAnalyImpl implements AnalyzerInterface { ret.put("city", city); ret.put("name", name); - // 某些城市板块也可能是区域 + // 鏌愪簺鍩庡競鏉垮潡涔熷彲鑳芥槸鍖哄煙 if (regionBlockDao.isRegion(city, region)) { ret.put("region", regionBlockDao.formatRegion(city, region)); } else if (regionBlockDao.isRegion(city, block)) { @@ -248,23 +248,23 @@ public class HomeLinkDistrictDetailAnalyImpl implements AnalyzerInterface { ret = removeInValidField(ret); if (estateType != null) { - if (estateType.indexOf("小区") == -1 && estateType.indexOf("别墅") == -1 && estateType.indexOf("公寓") == -1 - && estateType.indexOf("住宅") == -1) { - if (estateType.indexOf("写字楼") > -1 || estateType.indexOf("商铺") > -1) { - errors.add("类型不正确,不是小区类型"); + if (estateType.indexOf("灏忓尯") == -1 && estateType.indexOf("鍒") == -1 && estateType.indexOf("鍏瘬") == -1 + && estateType.indexOf("浣忓畢") == -1) { + if (estateType.indexOf("鍐欏瓧妤�") > -1 || estateType.indexOf("鍟嗛摵") > -1) { + errors.add("绫诲瀷涓嶆纭�,涓嶆槸灏忓尯绫诲瀷"); return new AnalyResult(ret); // return new AnalyResult(errors); } } - if (estateType.indexOf("购物") > -1) { - errors.add("类型不正确,不是小区类型"); + if (estateType.indexOf("璐墿") > -1) { + errors.add("绫诲瀷涓嶆纭�,涓嶆槸灏忓尯绫诲瀷"); return new AnalyResult(errors); } } - if (name.indexOf("写字楼") > -1 || name.indexOf("商铺") > -1 || name.indexOf("商业广场") > -1) { - errors.add("类型不正确,不是小区类型"); + if (name.indexOf("鍐欏瓧妤�") > -1 || name.indexOf("鍟嗛摵") > -1 || name.indexOf("鍟嗕笟骞垮満") > -1) { + errors.add("绫诲瀷涓嶆纭�,涓嶆槸灏忓尯绫诲瀷"); return new AnalyResult(errors); } @@ -296,12 +296,12 @@ public class HomeLinkDistrictDetailAnalyImpl implements AnalyzerInterface { } Map> map = new HashMap>(); for (String s : facilitieSpans) { - String title = s.substring(s.indexOf("【"), s.indexOf("】") + 1); + String title = s.substring(s.indexOf("銆�"), s.indexOf("銆�") + 1); String content = s.replace(title, ""); content = trimChar(content); content = leftTrim(content); String[] detail = content.split(" "); - title = title.replace("【", "").replace("】", ""); + title = title.replace("銆�", "").replace("銆�", ""); List details = map.get(title); if (null == details) { details = new ArrayList(); @@ -320,9 +320,9 @@ public class HomeLinkDistrictDetailAnalyImpl implements AnalyzerInterface { String key = (String) it.next(); List values = map.get(key); if (ret.length() > 0) { - ret = ret + "\r" + key + " :" + values.toString(); + ret = ret + "\r" + key + " 锛�" + values.toString(); } else { - ret = key + " :" + values.toString(); + ret = key + " 锛�" + values.toString(); } } } @@ -336,7 +336,7 @@ public class HomeLinkDistrictDetailAnalyImpl implements AnalyzerInterface { } // for (String s : facilitieSpans) { // s = JQueryUtil.getText(s); -// String prefix = s.substring(0, s.indexOf(":") + 1); +// String prefix = s.substring(0, s.indexOf("锛�") + 1); // if (!s.equals(prefix)) { // s = trimChar(s); // if (ret.length() > 0) { @@ -373,8 +373,8 @@ public class HomeLinkDistrictDetailAnalyImpl implements AnalyzerInterface { } for (String s : trafficeArr) { s = trimChar(s); - if (s.indexOf("地铁") != -1) { - s = s.substring(s.indexOf("】") + 1, s.length()); + if (s.indexOf("鍦伴搧") != -1) { + s = s.substring(s.indexOf("銆�") + 1, s.length()); if (ret.length() == 0) { ret = s; } else { @@ -392,7 +392,7 @@ public class HomeLinkDistrictDetailAnalyImpl implements AnalyzerInterface { List removeKeys = new ArrayList(); for (String key : dbo.keySet()) { Object s = dbo.get(key); - if (s == null || "".equals(s) || s.toString().startsWith("暂无资料") || s.equals("暂无") || "0".equals(s) || "0%".equals(s) + if (s == null || "".equals(s) || s.toString().startsWith("鏆傛棤璧勬枡") || s.equals("鏆傛棤") || "0".equals(s) || "0%".equals(s) || "0.00".equals(s)) { removeKeys.add(key); } @@ -407,7 +407,7 @@ public class HomeLinkDistrictDetailAnalyImpl implements AnalyzerInterface { List okeys = new ArrayList(); for (String key : otherInfo.keySet()) { Object s = otherInfo.get(key); - if (s == null || "".equals(s) || s.toString().startsWith("暂无资料") || s.equals("暂无")) { + if (s == null || "".equals(s) || s.toString().startsWith("鏆傛棤璧勬枡") || s.equals("鏆傛棤")) { okeys.add(key); } } diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/analy/JiwuDistrictDetailAnalyImpl.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/analy/JiwuDistrictDetailAnalyImpl.java index 510ba2ba4..877f5eb62 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/analy/JiwuDistrictDetailAnalyImpl.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/analy/JiwuDistrictDetailAnalyImpl.java @@ -17,8 +17,8 @@ import com.fangjia.coredata.util.JQueryUtil; import com.fangjia.mongo.dao.RegionBlockDao; import com.mongodb.BasicDBObject; @CATEGORY(value = CategoryEnum.DISTRICT) -@SITENAME(value = "吉屋网") -@PAGENAME(value = "详情页") +@SITENAME(value = "鍚夊眿缃�") +@PAGENAME(value = "璇︽儏椤�") public class JiwuDistrictDetailAnalyImpl implements AnalyzerInterface{ private RegionBlockDao regionBlockDao = RegionBlockDao.getInstance(); @@ -29,31 +29,31 @@ public class JiwuDistrictDetailAnalyImpl implements AnalyzerInterface{ List positions = JQueryUtil.selectText("#position a", content); String region = positions.get(1); String block = ""; - if(region.indexOf("二手小区")!=-1){ - region = region.replace("二手小区", ""); + if(region.indexOf("浜屾墜灏忓尯")!=-1){ + region = region.replace("浜屾墜灏忓尯", ""); }else{ region = ""; } String name = JQueryUtil.selectText(new String[] {".zhuti_center h1" }, content); - String address = JQueryUtil.selectText(new String[] {".esfjj div:contains(小区地址)" }, content).replace("小区地址:", ""); - String estateType = JQueryUtil.selectText(new String[] {".esfjj div:contains(物业类型)" }, content).replace("物业类型:", "").trim(); - String finishBuildingDate = JQueryUtil.selectText(new String[] { ".esfjj div:contains(建造年代)" }, content).replace("建造年代:", "").trim(); - String developer = JQueryUtil.selectText(new String[] {".esfjj div:contains(开 发 商)" }, content).replace("开 发 商:", "").trim(); - String estateCharge = JQueryUtil.selectText(new String[] {".esfjj div:contains(物 业 费)" }, content).replace("物 业 费:", "").trim(); + String address = JQueryUtil.selectText(new String[] {".esfjj div:contains(灏忓尯鍦板潃)" }, content).replace("灏忓尯鍦板潃锛�", ""); + String estateType = JQueryUtil.selectText(new String[] {".esfjj div:contains(鐗╀笟绫诲瀷)" }, content).replace("鐗╀笟绫诲瀷锛�", "").trim(); + String finishBuildingDate = JQueryUtil.selectText(new String[] { ".esfjj div:contains(寤洪�犲勾浠�)" }, content).replace("寤洪�犲勾浠o細", "").trim(); + String developer = JQueryUtil.selectText(new String[] {".esfjj div:contains(寮� 鍙� 鍟�)" }, content).replace("寮� 鍙� 鍟嗭細", "").trim(); + String estateCharge = JQueryUtil.selectText(new String[] {".esfjj div:contains(鐗� 涓� 璐�)" }, content).replace("鐗� 涓� 璐癸細", "").trim(); - String buildArea = JQueryUtil.selectText(new String[] {"table tr:contains(建筑面积) td:eq(1)" }, content).replace("建筑面积:", "").trim(); - String cubagePercent = JQueryUtil.selectText(new String[] {"table tr:contains(容 积 率) td:eq(1)" }, content).replace("容 积 率:", "").trim(); - String virescencePercent = JQueryUtil.selectText(new String[] {"table tr:contains( 绿 化 率) td:eq(3)" }, content).replace("绿 化 率:", "").trim(); + String buildArea = JQueryUtil.selectText(new String[] {"table tr:contains(寤虹瓚闈㈢Н) td:eq(1)" }, content).replace("寤虹瓚闈㈢Н锛�", "").trim(); + String cubagePercent = JQueryUtil.selectText(new String[] {"table tr:contains(瀹� 绉� 鐜�) td:eq(1)" }, content).replace("瀹� 绉� 鐜囷細", "").trim(); + String virescencePercent = JQueryUtil.selectText(new String[] {"table tr:contains( 缁� 鍖� 鐜�) td:eq(3)" }, content).replace("缁� 鍖� 鐜囷細", "").trim(); - String householdCount = JQueryUtil.selectText(new String[] {"table tr:contains(总 户 数) td:eq(3)"}, content).replace("总 户 数:", "").trim(); + String householdCount = JQueryUtil.selectText(new String[] {"table tr:contains(鎬� 鎴� 鏁�) td:eq(3)"}, content).replace("鎬� 鎴� 鏁帮細", "").trim(); - String estateCompany = JQueryUtil.selectText(new String[] {"table tr:contains(物业公司) td:eq(1)" }, content).replace("物业公司:", "").trim(); - String carSite = JQueryUtil.selectText(new String[] {"table tr:contains(停车位) td:eq(1)"},content).replace("车位信息:", "").trim(); + String estateCompany = JQueryUtil.selectText(new String[] {"table tr:contains(鐗╀笟鍏徃) td:eq(1)" }, content).replace("鐗╀笟鍏徃锛�", "").trim(); + String carSite = JQueryUtil.selectText(new String[] {"table tr:contains(鍋滆溅浣�) td:eq(1)"},content).replace("杞︿綅淇℃伅锛�", "").trim(); - if(buildArea.equals("平方米")){ + if(buildArea.equals("骞虫柟绫�")){ buildArea = ""; } if(virescencePercent.equals("%")){ @@ -61,7 +61,7 @@ public class JiwuDistrictDetailAnalyImpl implements AnalyzerInterface{ } String description = JQueryUtil.selectText(new String[] {"#remark" }, content); - String traffic = JQueryUtil.selectText(new String[] {".mapstxt .tong:contains(公交)" }, content).replace("公交:", ""); + String traffic = JQueryUtil.selectText(new String[] {".mapstxt .tong:contains(鍏氦)" }, content).replace("鍏氦锛�", ""); Map ret = new HashMap(); Map otherInfo = new HashMap(); @@ -71,7 +71,7 @@ public class JiwuDistrictDetailAnalyImpl implements AnalyzerInterface{ ret.put("city", city); ret.put("name", name); - // 某些城市板块也可能是区域 + // 鏌愪簺鍩庡競鏉垮潡涔熷彲鑳芥槸鍖哄煙 if (regionBlockDao.isRegion(city, region)) { ret.put("region", regionBlockDao.formatRegion(city, region)); } else if (regionBlockDao.isRegion(city, block)) { @@ -100,22 +100,22 @@ public class JiwuDistrictDetailAnalyImpl implements AnalyzerInterface{ otherInfo.put("household_count", householdCount); if (estateType != null) { - if (estateType.indexOf("小区") == -1 && estateType.indexOf("别墅") == -1 && estateType.indexOf("公寓") == -1 - && estateType.indexOf("住宅") == -1) { - if (estateType.indexOf("写字楼") > -1 || estateType.indexOf("商铺") > -1) { - errors.add("类型不正确,不是小区类型"); + if (estateType.indexOf("灏忓尯") == -1 && estateType.indexOf("鍒") == -1 && estateType.indexOf("鍏瘬") == -1 + && estateType.indexOf("浣忓畢") == -1) { + if (estateType.indexOf("鍐欏瓧妤�") > -1 || estateType.indexOf("鍟嗛摵") > -1) { + errors.add("绫诲瀷涓嶆纭�,涓嶆槸灏忓尯绫诲瀷"); return new AnalyResult(errors); } } - if (estateType.indexOf("购物") > -1) { - errors.add("类型不正确,不是小区类型"); + if (estateType.indexOf("璐墿") > -1) { + errors.add("绫诲瀷涓嶆纭�,涓嶆槸灏忓尯绫诲瀷"); return new AnalyResult(errors); } } - if (name.indexOf("写字楼") > -1 || name.indexOf("商铺") > -1 || name.indexOf("商业广场") > -1) { - errors.add("类型不正确,不是小区类型"); + if (name.indexOf("鍐欏瓧妤�") > -1 || name.indexOf("鍟嗛摵") > -1 || name.indexOf("鍟嗕笟骞垮満") > -1) { + errors.add("绫诲瀷涓嶆纭�,涓嶆槸灏忓尯绫诲瀷"); return new AnalyResult(errors); } @@ -129,7 +129,7 @@ public class JiwuDistrictDetailAnalyImpl implements AnalyzerInterface{ List removeKeys = new ArrayList(); for (String key : dbo.keySet()) { Object s = dbo.get(key); - if (s == null || "".equals(s) || s.toString().startsWith("暂无资料") || s.equals("暂无") || "0".equals(s) || "0%".equals(s) + if (s == null || "".equals(s) || s.toString().startsWith("鏆傛棤璧勬枡") || s.equals("鏆傛棤") || "0".equals(s) || "0%".equals(s) || "0.00".equals(s)) { removeKeys.add(key); } @@ -144,7 +144,7 @@ public class JiwuDistrictDetailAnalyImpl implements AnalyzerInterface{ List okeys = new ArrayList(); for (String key : otherInfo.keySet()) { Object s = otherInfo.get(key); - if (s == null || "".equals(s) || s.toString().startsWith("暂无资料") || s.equals("暂无")) { + if (s == null || "".equals(s) || s.toString().startsWith("鏆傛棤璧勬枡") || s.equals("鏆傛棤")) { okeys.add(key); } } diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/analy/LoupanDistrictDetailAnalyImpl.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/analy/LoupanDistrictDetailAnalyImpl.java index 14319b028..ecb3d7312 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/analy/LoupanDistrictDetailAnalyImpl.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/analy/LoupanDistrictDetailAnalyImpl.java @@ -19,8 +19,8 @@ import com.fangjia.coredata.util.JQueryUtil; import com.fangjia.mongo.dao.RegionBlockDao; import com.mongodb.BasicDBObject; @CATEGORY(value = CategoryEnum.DISTRICT) -@SITENAME(value = "楼盘网") -@PAGENAME(value = "详情页") +@SITENAME(value = "妤肩洏缃�") +@PAGENAME(value = "璇︽儏椤�") public class LoupanDistrictDetailAnalyImpl implements AnalyzerInterface{ private RegionBlockDao regionBlockDao = RegionBlockDao.getInstance(); @@ -30,42 +30,42 @@ public class LoupanDistrictDetailAnalyImpl implements AnalyzerInterface{ List analyFields) throws Exception { List errors = new ArrayList(); String block = ""; - String region = JQueryUtil.selectText(new String[]{".ui-box-content dl:contains(所在区域)"}, content).replace("所在区域:", "").trim(); + String region = JQueryUtil.selectText(new String[]{".ui-box-content dl:contains(鎵�鍦ㄥ尯鍩�)"}, content).replace("鎵�鍦ㄥ尯鍩燂細", "").trim(); String name = JQueryUtil.selectText(new String[] {".lp-tit-title" }, content); - String estateType = JQueryUtil.selectText(new String[] {".ui-box-content dl:contains(物业类别)" }, content).replace("物业类别:", "").trim(); - String buildType = JQueryUtil.selectText(new String[] { ".ui-box-content dl:contains(建筑类别)" }, content).replace("建筑类别:", "").trim(); + String estateType = JQueryUtil.selectText(new String[] {".ui-box-content dl:contains(鐗╀笟绫诲埆)" }, content).replace("鐗╀笟绫诲埆锛�", "").trim(); + String buildType = JQueryUtil.selectText(new String[] { ".ui-box-content dl:contains(寤虹瓚绫诲埆)" }, content).replace("寤虹瓚绫诲埆锛�", "").trim(); - String address = JQueryUtil.selectText(new String[] {".ui-box-content dl:contains(物业地址)" }, content).replace("物业地址:", ""); + String address = JQueryUtil.selectText(new String[] {".ui-box-content dl:contains(鐗╀笟鍦板潃)" }, content).replace("鐗╀笟鍦板潃锛�", ""); - String finishBuildingDate = JQueryUtil.selectText(new String[] { ".ui-box-content dl:contains(入住时间)" }, content).replace("入住时间:", "").trim(); - String estateCharge = JQueryUtil.selectText(new String[] {".ui-box-content dl:contains(物 业 费)" }, content).replace("物 业 费:", "").trim(); - String cubagePercent = JQueryUtil.selectText(new String[] {".ui-box-content dl:contains(容 积 率)" }, content).replace("容 积 率:", "").trim(); - String virescencePercent = JQueryUtil.selectText(new String[] {".ui-box-content dl:contains(绿 化 率)" }, content).replace("绿 化 率", "").trim(); - String developer = JQueryUtil.selectText(new String[] {".ui-box-content dl:contains(开 发 商)" }, content).replace("开 发 商:", "").trim(); + String finishBuildingDate = JQueryUtil.selectText(new String[] { ".ui-box-content dl:contains(鍏ヤ綇鏃堕棿)" }, content).replace("鍏ヤ綇鏃堕棿锛�", "").trim(); + String estateCharge = JQueryUtil.selectText(new String[] {".ui-box-content dl:contains(鐗� 涓� 璐�)" }, content).replace("鐗� 涓� 璐癸細", "").trim(); + String cubagePercent = JQueryUtil.selectText(new String[] {".ui-box-content dl:contains(瀹� 绉� 鐜�)" }, content).replace("瀹� 绉� 鐜囷細", "").trim(); + String virescencePercent = JQueryUtil.selectText(new String[] {".ui-box-content dl:contains(缁� 鍖� 鐜�)" }, content).replace("缁� 鍖� 鐜�", "").trim(); + String developer = JQueryUtil.selectText(new String[] {".ui-box-content dl:contains(寮� 鍙� 鍟�)" }, content).replace("寮� 鍙� 鍟嗭細", "").trim(); - String fitment = JQueryUtil.selectText(new String[] {".ui-box-content dl:contains(装修状况)" }, content).replace("装修状况:", "").trim(); - String licence = JQueryUtil.selectText(new String[] {".ui-box-content dl:contains(预售许可证)"}, content).replace("预售许可证:", "").trim(); - String propertyLife = JQueryUtil.selectText(new String[] {".ui-box-content dl:contains(产权年限)"}, content).replace("产权年限:", "").trim(); + String fitment = JQueryUtil.selectText(new String[] {".ui-box-content dl:contains(瑁呬慨鐘跺喌)" }, content).replace("瑁呬慨鐘跺喌锛�", "").trim(); + String licence = JQueryUtil.selectText(new String[] {".ui-box-content dl:contains(棰勫敭璁稿彲璇�)"}, content).replace("棰勫敭璁稿彲璇侊細", "").trim(); + String propertyLife = JQueryUtil.selectText(new String[] {".ui-box-content dl:contains(浜ф潈骞撮檺)"}, content).replace("浜ф潈骞撮檺锛�", "").trim(); - String estateCompany = JQueryUtil.selectText(new String[] {".ui-box-content dl:contains(物业公司)" }, content).replace("物业公司:", "").trim(); - String characteristic = JQueryUtil.selectText(new String[] { ".ui-box-content dl:contains(项目特色)" }, content).replace("项目特色:", "").trim(); - String openDate = JQueryUtil.selectText(new String[] { ".ui-box-content dl:contains(开盘时间)" }, content).replace("开盘时间:", "").trim(); - String floorInfo = JQueryUtil.selectText(new String[] { ".ui-box-content dl:contains(楼层状况)" }, content).replace("楼层状况:", "").trim(); + String estateCompany = JQueryUtil.selectText(new String[] {".ui-box-content dl:contains(鐗╀笟鍏徃)" }, content).replace("鐗╀笟鍏徃锛�", "").trim(); + String characteristic = JQueryUtil.selectText(new String[] { ".ui-box-content dl:contains(椤圭洰鐗硅壊)" }, content).replace("椤圭洰鐗硅壊锛�", "").trim(); + String openDate = JQueryUtil.selectText(new String[] { ".ui-box-content dl:contains(寮�鐩樻椂闂�)" }, content).replace("寮�鐩樻椂闂达細", "").trim(); + String floorInfo = JQueryUtil.selectText(new String[] { ".ui-box-content dl:contains(妤煎眰鐘跺喌)" }, content).replace("妤煎眰鐘跺喌锛�", "").trim(); if(virescencePercent.equals("%")){ virescencePercent = ""; } - String carSite = JQueryUtil.selectText(new String[] {".lp-detailed-box:contains(车位信息)"},content).replace("车位信息:", "").trim(); - String description = JQueryUtil.selectText(new String[] {".lp-detailed-box:contains(项目简介)" }, content).replace("项目简介:", "").trim(); - String traffic = JQueryUtil.selectText(new String[] {".lp-detailed-box:contains(交通状况)" }, content).replace("交通状况:", ""); + String carSite = JQueryUtil.selectText(new String[] {".lp-detailed-box:contains(杞︿綅淇℃伅)"},content).replace("杞︿綅淇℃伅锛�", "").trim(); + String description = JQueryUtil.selectText(new String[] {".lp-detailed-box:contains(椤圭洰绠�浠�)" }, content).replace("椤圭洰绠�浠嬶細", "").trim(); + String traffic = JQueryUtil.selectText(new String[] {".lp-detailed-box:contains(浜ら�氱姸鍐�)" }, content).replace("浜ら�氱姸鍐碉細", ""); String facilities = JQueryUtil.selectText(new String[] {".ui-box-content.fn-clear:eq(2)" }, content); - String payStandard = JQueryUtil.selectText(new String[] {".lp-detailed-box:contains(交付标准)" }, content).replace("交付标准", ""); + String payStandard = JQueryUtil.selectText(new String[] {".lp-detailed-box:contains(浜や粯鏍囧噯)" }, content).replace("浜や粯鏍囧噯", ""); - List otherInfos = JQueryUtil.selectText(".lp-detailed-box:contains(开工时间) dl", content); + List otherInfos = JQueryUtil.selectText(".lp-detailed-box:contains(寮�宸ユ椂闂�) dl", content); Map detail = parseOtherInfo(otherInfos); Map ret = new HashMap(); @@ -76,7 +76,7 @@ public class LoupanDistrictDetailAnalyImpl implements AnalyzerInterface{ ret.put("city", city); ret.put("name", name); - // 某些城市板块也可能是区域 + // 鏌愪簺鍩庡競鏉垮潡涔熷彲鑳芥槸鍖哄煙 if (regionBlockDao.isRegion(city, region)) { ret.put("region", regionBlockDao.formatRegion(city, region)); } else if (regionBlockDao.isRegion(city, block)) { @@ -115,22 +115,22 @@ public class LoupanDistrictDetailAnalyImpl implements AnalyzerInterface{ otherInfo.put("pay_standard", payStandard); if (estateType != null) { - if (estateType.indexOf("小区") == -1 && estateType.indexOf("别墅") == -1 && estateType.indexOf("公寓") == -1 - && estateType.indexOf("住宅") == -1) { - if (estateType.indexOf("写字楼") > -1 || estateType.indexOf("商铺") > -1) { - errors.add("类型不正确,不是小区类型"); + if (estateType.indexOf("灏忓尯") == -1 && estateType.indexOf("鍒") == -1 && estateType.indexOf("鍏瘬") == -1 + && estateType.indexOf("浣忓畢") == -1) { + if (estateType.indexOf("鍐欏瓧妤�") > -1 || estateType.indexOf("鍟嗛摵") > -1) { + errors.add("绫诲瀷涓嶆纭�,涓嶆槸灏忓尯绫诲瀷"); return new AnalyResult(errors); } } - if (estateType.indexOf("购物") > -1) { - errors.add("类型不正确,不是小区类型"); + if (estateType.indexOf("璐墿") > -1) { + errors.add("绫诲瀷涓嶆纭�,涓嶆槸灏忓尯绫诲瀷"); return new AnalyResult(errors); } } - if (name.indexOf("写字楼") > -1 || name.indexOf("商铺") > -1 || name.indexOf("商业广场") > -1) { - errors.add("类型不正确,不是小区类型"); + if (name.indexOf("鍐欏瓧妤�") > -1 || name.indexOf("鍟嗛摵") > -1 || name.indexOf("鍟嗕笟骞垮満") > -1) { + errors.add("绫诲瀷涓嶆纭�,涓嶆槸灏忓尯绫诲瀷"); return new AnalyResult(errors); } @@ -146,27 +146,27 @@ public class LoupanDistrictDetailAnalyImpl implements AnalyzerInterface{ } for(String s : otherInfos){ // s = JQueryUtil.getText(s); -// String[] array = s.split(":"); +// String[] array = s.split("锛�"); // String key = ""; // String value = ""; -// if(array[0].equals("开工时间")){ +// if(array[0].equals("寮�宸ユ椂闂�")){ // key = "start_building_date"; -// }else if(array[0].equals("竣工时间")){ +// }else if(array[0].equals("绔e伐鏃堕棿")){ // key = "finish_building_date"; -// }else if(array[0].equals("代理公司")){ +// }else if(array[0].equals("浠g悊鍏徃")){ // key = "agency_company"; -// }else if(array[0].equals("按揭银行")){ +// }else if(array[0].equals("鎸夋彮閾惰")){ // key = "mortgage_banks"; -// }else if(array[0].equals("用地规划许可证")){ +// }else if(array[0].equals("鐢ㄥ湴瑙勫垝璁稿彲璇�")){ // key = "land_planning_permit"; -// }else if(array[0].equals("工程规划许可证")){ +// }else if(array[0].equals("宸ョ▼瑙勫垝璁稿彲璇�")){ // key = "project_planning_permit"; -// }else if(array[0].equals("国有土地使用证")){ +// }else if(array[0].equals("鍥芥湁鍦熷湴浣跨敤璇�")){ // key = " land_use_permit"; -// }else if(array[0].equals("建设工程开工证")){ +// }else if(array[0].equals("寤鸿宸ョ▼寮�宸ヨ瘉")){ // key = "construction_work_permits"; // } -// if(array.length==2&&array[1].indexOf("暂无")!=-1){ +// if(array.length==2&&array[1].indexOf("鏆傛棤")!=-1){ // value = array[1]; // } // if(StringUtils.isNotBlank(value)){ @@ -182,7 +182,7 @@ public class LoupanDistrictDetailAnalyImpl implements AnalyzerInterface{ List removeKeys = new ArrayList(); for (String key : dbo.keySet()) { Object s = dbo.get(key); - if (s == null || "".equals(s) || s.toString().startsWith("暂无资料") || s.equals("暂无") || "0".equals(s) || "0%".equals(s) + if (s == null || "".equals(s) || s.toString().startsWith("鏆傛棤璧勬枡") || s.equals("鏆傛棤") || "0".equals(s) || "0%".equals(s) || "0.00".equals(s)) { removeKeys.add(key); } @@ -197,7 +197,7 @@ public class LoupanDistrictDetailAnalyImpl implements AnalyzerInterface{ List okeys = new ArrayList(); for (String key : otherInfo.keySet()) { Object s = otherInfo.get(key); - if (s == null || "".equals(s) || s.toString().startsWith("暂无资料") || s.equals("暂无")) { + if (s == null || "".equals(s) || s.toString().startsWith("鏆傛棤璧勬枡") || s.equals("鏆傛棤")) { okeys.add(key); } } diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/analy/SinaDistrictDetailAnalyImpl.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/analy/SinaDistrictDetailAnalyImpl.java index fa28f3c81..099b3fed6 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/analy/SinaDistrictDetailAnalyImpl.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/analy/SinaDistrictDetailAnalyImpl.java @@ -19,8 +19,8 @@ import com.fangjia.coredata.util.JQueryUtil; import com.fangjia.mongo.dao.RegionBlockDao; @CATEGORY(value = CategoryEnum.DISTRICT) -@SITENAME(value = "新浪") -@PAGENAME(value = "详情页") +@SITENAME(value = "鏂版氮") +@PAGENAME(value = "璇︽儏椤�") public class SinaDistrictDetailAnalyImpl implements AnalyzerInterface{ private RegionBlockDao regionBlockDao = RegionBlockDao.getInstance(); @@ -42,31 +42,31 @@ public class SinaDistrictDetailAnalyImpl implements AnalyzerInterface{ String name = JQueryUtil.selectText(new String[] {".title .name",".comutiy-header h1" }, content); - String aliasStr = JQueryUtil.selectText(new String[] {".tuiguang_font_2",".comutiy-header strong:contains(推广名)" }, content).replace("推广名:", ""); + String aliasStr = JQueryUtil.selectText(new String[] {".tuiguang_font_2",".comutiy-header strong:contains(鎺ㄥ箍鍚�)" }, content).replace("鎺ㄥ箍鍚嶏細", ""); List alias = getAlias(aliasStr); - String address = JQueryUtil.selectText(new String[] {"#xiaoqu_intro_table tr:contains(小区地址) td:eq(1)",".comutiy-mod01 li:contains(地址/板块)" }, content); - if(address.indexOf("小区地址")!=-1){ - address = address.replace("小区地址", "").trim(); + String address = JQueryUtil.selectText(new String[] {"#xiaoqu_intro_table tr:contains(灏忓尯鍦板潃) td:eq(1)",".comutiy-mod01 li:contains(鍦板潃/鏉垮潡)" }, content); + if(address.indexOf("灏忓尯鍦板潃")!=-1){ + address = address.replace("灏忓尯鍦板潃", "").trim(); }else{ - address = address.replace("·地址/板块", ""); + address = address.replace("路鍦板潃/鏉垮潡", ""); if(address.length() > 0 && address.indexOf(" ")!=-1){ address = address.substring(0, address.indexOf(" ")); } } - String estateType = JQueryUtil.selectText(new String[] {"#xiaoqu_intro_table tr:contains(物业类型) td:eq(1)",".comutiy-mod01 li:contains(物业类型)" }, content).replace("·物业类型:", "").replace("物业类型", "").trim(); - String buildType = JQueryUtil.selectText(new String[] {".comutiy-mod01 li:contains(建筑类型)" }, content).replace("·建筑类型", "").replace("·建筑类型:", "").trim(); - String buildArea = JQueryUtil.selectText(new String[] {"#xiaoqu_intro_table tr:contains(总建筑面积) td:eq(3)" }, content).replace("总建筑面积", "").trim(); - String finishBuildingDate = JQueryUtil.selectText(new String[] {"#xiaoqu_intro_table tr:contains(竣工日期) td:eq(1)" ,".comutiy-mod01 li:contains(竣工日期)" }, content).replace("·竣工日期:", "").replace("竣工日期", "").trim(); - String householdCount = JQueryUtil.selectText(new String[] {"#xiaoqu_intro_table tr:contains(总户数) td:eq(3)",".comutiy-mod01 li:contains(总 户 数)" }, content).replace("·总 户 数:", "").replace("总户数", "").trim(); - String estateCharge = JQueryUtil.selectText(new String[] {"#xiaoqu_intro_table tr:contains(物业管理费) td:eq(1)" }, content).replace("物业管理费", "").trim(); - String carSite = JQueryUtil.selectText(new String[] {"#xiaoqu_intro_table tr:contains(停车位) td:eq(3)",".comutiy-mod01 li:contains(停 车 位)" }, content).replace("·停 车 位:", "").replace("停车位", "").trim(); - String developer = JQueryUtil.selectText(new String[] {"#xiaoqu_intro_table tr:contains(开发商) td:eq(1)",".comutiy-mod01 li:contains(开 发 商)" }, content).replace("·开 发 商:", "").replace("开发商", "").trim(); - String cubagePercent = JQueryUtil.selectText(new String[] {"#xiaoqu_intro_table tr:contains(容积率) td:eq(3)",".comutiy-mod01 li:contains(容积率)" }, content).replace("·容 积 率:", "").replace("容积率", "").trim(); - String estateCompany = JQueryUtil.selectText(new String[] {"#xiaoqu_intro_table tr:contains(物业公司) td:eq(1)",".comutiy-mod01 li:contains(物业公司)" }, content).replace("·物业公司:", "").replace("物业公司", "").trim(); - String virescencePercent = JQueryUtil.selectText(new String[] {"#xiaoqu_intro_table tr:contains(绿化率) td:eq(3)" ,".comutiy-mod01 li:contains(绿 化 率)"}, content).replace("·绿 化 率:", "").replace("绿化率", "").trim(); + String estateType = JQueryUtil.selectText(new String[] {"#xiaoqu_intro_table tr:contains(鐗╀笟绫诲瀷) td:eq(1)",".comutiy-mod01 li:contains(鐗╀笟绫诲瀷)" }, content).replace("路鐗╀笟绫诲瀷锛�", "").replace("鐗╀笟绫诲瀷", "").trim(); + String buildType = JQueryUtil.selectText(new String[] {".comutiy-mod01 li:contains(寤虹瓚绫诲瀷)" }, content).replace("路寤虹瓚绫诲瀷", "").replace("路寤虹瓚绫诲瀷锛�", "").trim(); + String buildArea = JQueryUtil.selectText(new String[] {"#xiaoqu_intro_table tr:contains(鎬诲缓绛戦潰绉�) td:eq(3)" }, content).replace("鎬诲缓绛戦潰绉�", "").trim(); + String finishBuildingDate = JQueryUtil.selectText(new String[] {"#xiaoqu_intro_table tr:contains(绔e伐鏃ユ湡) td:eq(1)" ,".comutiy-mod01 li:contains(绔e伐鏃ユ湡)" }, content).replace("路绔e伐鏃ユ湡锛�", "").replace("绔e伐鏃ユ湡", "").trim(); + String householdCount = JQueryUtil.selectText(new String[] {"#xiaoqu_intro_table tr:contains(鎬绘埛鏁�) td:eq(3)",".comutiy-mod01 li:contains(鎬� 鎴� 鏁�)" }, content).replace("路鎬� 鎴� 鏁帮細", "").replace("鎬绘埛鏁�", "").trim(); + String estateCharge = JQueryUtil.selectText(new String[] {"#xiaoqu_intro_table tr:contains(鐗╀笟绠$悊璐�) td:eq(1)" }, content).replace("鐗╀笟绠$悊璐�", "").trim(); + String carSite = JQueryUtil.selectText(new String[] {"#xiaoqu_intro_table tr:contains(鍋滆溅浣�) td:eq(3)",".comutiy-mod01 li:contains(鍋� 杞� 浣�)" }, content).replace("路鍋� 杞� 浣嶏細", "").replace("鍋滆溅浣�", "").trim(); + String developer = JQueryUtil.selectText(new String[] {"#xiaoqu_intro_table tr:contains(寮�鍙戝晢) td:eq(1)",".comutiy-mod01 li:contains(寮� 鍙� 鍟�)" }, content).replace("路寮� 鍙� 鍟嗭細", "").replace("寮�鍙戝晢", "").trim(); + String cubagePercent = JQueryUtil.selectText(new String[] {"#xiaoqu_intro_table tr:contains(瀹圭Н鐜�) td:eq(3)",".comutiy-mod01 li:contains(瀹圭Н鐜�)" }, content).replace("路瀹� 绉� 鐜囷細", "").replace("瀹圭Н鐜�", "").trim(); + String estateCompany = JQueryUtil.selectText(new String[] {"#xiaoqu_intro_table tr:contains(鐗╀笟鍏徃) td:eq(1)",".comutiy-mod01 li:contains(鐗╀笟鍏徃)" }, content).replace("路鐗╀笟鍏徃锛�", "").replace("鐗╀笟鍏徃", "").trim(); + String virescencePercent = JQueryUtil.selectText(new String[] {"#xiaoqu_intro_table tr:contains(缁垮寲鐜�) td:eq(3)" ,".comutiy-mod01 li:contains(缁� 鍖� 鐜�)"}, content).replace("路缁� 鍖� 鐜囷細", "").replace("缁垮寲鐜�", "").trim(); - if(buildArea.equals("平方米")){ + if(buildArea.equals("骞虫柟绫�")){ buildArea = ""; } if(virescencePercent.equals("%")){ @@ -75,16 +75,16 @@ public class SinaDistrictDetailAnalyImpl implements AnalyzerInterface{ List trafficeArr = JQueryUtil.selectText(".map_xxdz p", content); if(null == trafficeArr){ - trafficeArr = JQueryUtil.selectText(".comutiy-mod01:contains(周边配套) p", content); + trafficeArr = JQueryUtil.selectText(".comutiy-mod01:contains(鍛ㄨ竟閰嶅) p", content); } String traffic = getTraffic(trafficeArr); - String description = JQueryUtil.selectText(new String[] {"#xiaoqu_baseintro>p",".comutiy-mod01:contains(小区介绍) p" }, content); + String description = JQueryUtil.selectText(new String[] {"#xiaoqu_baseintro>p",".comutiy-mod01:contains(灏忓尯浠嬬粛) p" }, content); List facilitieSpans = JQueryUtil.selectText("#xiaoqu_peitao_info p", content); if(null == facilitieSpans){ - facilitieSpans = JQueryUtil.selectText(".comutiy-mod01:contains(周边配套) p", content); + facilitieSpans = JQueryUtil.selectText(".comutiy-mod01:contains(鍛ㄨ竟閰嶅) p", content); } String facilities = findFacilities(facilitieSpans); @@ -96,7 +96,7 @@ public class SinaDistrictDetailAnalyImpl implements AnalyzerInterface{ ret.put("city", city); ret.put("name", name); - // 某些城市板块也可能是区域 + // 鏌愪簺鍩庡競鏉垮潡涔熷彲鑳芥槸鍖哄煙 if (regionBlockDao.isRegion(city, region)) { ret.put("region", regionBlockDao.formatRegion(city, region)); } else if (regionBlockDao.isRegion(city, block)) { @@ -132,22 +132,22 @@ public class SinaDistrictDetailAnalyImpl implements AnalyzerInterface{ otherInfo.put("household_count", householdCount); if (estateType != null) { - if (estateType.indexOf("小区") == -1 && estateType.indexOf("别墅") == -1 && estateType.indexOf("公寓") == -1 - && estateType.indexOf("住宅") == -1) { - if (estateType.indexOf("写字楼") > -1 || estateType.indexOf("商铺") > -1) { - errors.add("类型不正确,不是小区类型"); + if (estateType.indexOf("灏忓尯") == -1 && estateType.indexOf("鍒") == -1 && estateType.indexOf("鍏瘬") == -1 + && estateType.indexOf("浣忓畢") == -1) { + if (estateType.indexOf("鍐欏瓧妤�") > -1 || estateType.indexOf("鍟嗛摵") > -1) { + errors.add("绫诲瀷涓嶆纭�,涓嶆槸灏忓尯绫诲瀷"); return new AnalyResult(errors); } } - if (estateType.indexOf("购物") > -1) { - errors.add("类型不正确,不是小区类型"); + if (estateType.indexOf("璐墿") > -1) { + errors.add("绫诲瀷涓嶆纭�,涓嶆槸灏忓尯绫诲瀷"); return new AnalyResult(errors); } } - if (name.indexOf("写字楼") > -1 || name.indexOf("商铺") > -1 || name.indexOf("商业广场") > -1) { - errors.add("类型不正确,不是小区类型"); + if (name.indexOf("鍐欏瓧妤�") > -1 || name.indexOf("鍟嗛摵") > -1 || name.indexOf("鍟嗕笟骞垮満") > -1) { + errors.add("绫诲瀷涓嶆纭�,涓嶆槸灏忓尯绫诲瀷"); return new AnalyResult(errors); } @@ -160,8 +160,8 @@ public class SinaDistrictDetailAnalyImpl implements AnalyzerInterface{ String ret = ""; for(String s : facilitieSpans){ s = trimChar(s); - if(s.indexOf("·公交")==-1 && s.indexOf("·地铁")==-1){ - s = s.replace("", "").replace("", "").replace("·", ""); + if(s.indexOf("路鍏氦")==-1 && s.indexOf("路鍦伴搧")==-1){ + s = s.replace("", "").replace("", "").replace("路", ""); if(ret.length() == 0){ ret = s; }else{ @@ -189,11 +189,11 @@ public class SinaDistrictDetailAnalyImpl implements AnalyzerInterface{ } for(String s : trafficeArr){ s = trimChar(s); - if(s.indexOf("公交")!=-1 || s.indexOf("地铁")!=-1){ + if(s.indexOf("鍏氦")!=-1 || s.indexOf("鍦伴搧")!=-1){ if(ret.length()==0){ - ret = s.replace("·", ""); + ret = s.replace("路", ""); }else{ - ret = ret + "\r" + s.replace("·", ""); + ret = ret + "\r" + s.replace("路", ""); } } } @@ -204,7 +204,7 @@ public class SinaDistrictDetailAnalyImpl implements AnalyzerInterface{ List removeKeys = new ArrayList(); for (String key : dbo.keySet()) { Object s = dbo.get(key); - if (s == null || "".equals(s) || s.toString().startsWith("暂无资料") || s.equals("暂无")) { + if (s == null || "".equals(s) || s.toString().startsWith("鏆傛棤璧勬枡") || s.equals("鏆傛棤")) { removeKeys.add(key); } } @@ -218,7 +218,7 @@ public class SinaDistrictDetailAnalyImpl implements AnalyzerInterface{ List okeys = new ArrayList(); for (String key : otherInfo.keySet()) { Object s = otherInfo.get(key); - if (s == null || "".equals(s) || s.toString().startsWith("暂无资料") || s.equals("暂无")) { + if (s == null || "".equals(s) || s.toString().startsWith("鏆傛棤璧勬枡") || s.equals("鏆傛棤")) { okeys.add(key); } } diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/analy/SoufunDistrictDetailAnalyImpl.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/analy/SoufunDistrictDetailAnalyImpl.java index 1a81ce003..37f3546c6 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/analy/SoufunDistrictDetailAnalyImpl.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/analy/SoufunDistrictDetailAnalyImpl.java @@ -19,30 +19,30 @@ import com.fangjia.coredata.util.JQueryUtil; import com.fangjia.mongo.dao.RegionBlockDao; /** - * 搜房小区详情页解析 + * 鎼滄埧灏忓尯璇︽儏椤佃В鏋� * * @author xiaoyu * */ @CATEGORY(value = CategoryEnum.DISTRICT) -@SITENAME(value = "搜房") -@PAGENAME(value = "详情页") +@SITENAME(value = "鎼滄埧") +@PAGENAME(value = "璇︽儏椤�") public class SoufunDistrictDetailAnalyImpl implements AnalyzerInterface { private RegionBlockDao regionBlockDao = RegionBlockDao.getInstance(); @Override public AnalyResult invoke(String city, String content, List analyFields) throws Exception { if (CollectionUtils.isEmpty(analyFields)) { - return new AnalyResult("没有输入解析字段"); + return new AnalyResult("娌℃湁杈撳叆瑙f瀽瀛楁"); } List errors = new ArrayList(); String name = JQueryUtil.selectText(new String[] { ".ewmBoxTitle .floatl", "h1", "#house_6" }, content) - .replace("小区网", ""); + .replace("灏忓尯缃�", ""); String regionBlock = JQueryUtil.selectText( - new String[] { ".leftinfo .lbox dd:contains(所属区域)", ".xiangqing dd:contains(所属区域)", - "#bsif tbody tr:contains(区域) td", "table tbody th:contains(区域)+td" }, content).replace("所属区域:", ""); + new String[] { ".leftinfo .lbox dd:contains(鎵�灞炲尯鍩�)", ".xiangqing dd:contains(鎵�灞炲尯鍩�)", + "#bsif tbody tr:contains(鍖哄煙) td", "table tbody th:contains(鍖哄煙)+td" }, content).replace("鎵�灞炲尯鍩燂細", ""); String[] arrs = regionBlock.split(" "); String region = null; String block = null; @@ -57,129 +57,129 @@ public class SoufunDistrictDetailAnalyImpl implements AnalyzerInterface { String address = JQueryUtil .selectText( - new String[] { ".leftinfo dd:contains(小区地址)", ".leftinfo dt:contains(小区地址)", - ".xiangqing dd:contains(楼盘地址)", "#bsif tr:contains(地址) td", "table tbody th:contains(地址)+td" }, - content).replace("小区地址:", "").replace("楼盘地址:", "").replace("[地图]", "").trim(); + new String[] { ".leftinfo dd:contains(灏忓尯鍦板潃)", ".leftinfo dt:contains(灏忓尯鍦板潃)", + ".xiangqing dd:contains(妤肩洏鍦板潃)", "#bsif tr:contains(鍦板潃) td", "table tbody th:contains(鍦板潃)+td" }, + content).replace("灏忓尯鍦板潃锛�", "").replace("妤肩洏鍦板潃锛�", "").replace("[鍦板浘]", "").trim(); if (StringUtils.isBlank(city) || StringUtils.isBlank(region) || StringUtils.isBlank(name) || StringUtils.isBlank(address)) { - errors.add("city||region||name||address解析不到"); + errors.add("city||region||name||address瑙f瀽涓嶅埌"); return new AnalyResult(errors); } - String aliasStr = JQueryUtil.selectText(new String[] { ".bm_title span" }, content).replace("别名:", "").trim(); + String aliasStr = JQueryUtil.selectText(new String[] { ".bm_title span" }, content).replace("鍒悕锛�", "").trim(); List alias = getAlias(aliasStr); String characteristic = JQueryUtil - .selectText(new String[] { ".leftinfo dd:contains(项目特色)", ".xiangqing dd:contains(项目特色)" }, content) - .replace("项目特色:", "").trim(); + .selectText(new String[] { ".leftinfo dd:contains(椤圭洰鐗硅壊)", ".xiangqing dd:contains(椤圭洰鐗硅壊)" }, content) + .replace("椤圭洰鐗硅壊锛�", "").trim(); String developer = JQueryUtil .selectText( - new String[] { ".leftinfo dd:contains(开 发 商:)", ".xiangqing dd:contains(开 发 商:)", - "#bsif tr:contains(开 发 商:) td" }, content).replace("开 发 商:", "").replace("[相关网站]", "").trim(); + new String[] { ".leftinfo dd:contains(寮� 鍙� 鍟嗭細)", ".xiangqing dd:contains(寮� 鍙� 鍟嗭細)", + "#bsif tr:contains(寮� 鍙� 鍟嗭細) td" }, content).replace("寮� 鍙� 鍟嗭細", "").replace("[鐩稿叧缃戠珯]", "").trim(); String liveDate = JQueryUtil - .selectText(new String[] { ".leftinfo .lbox dd:contains(竣工时间)", ".xiangqing dd:contains(竣工时间)" }, content) - .replace("竣工时间:", "").replace("[相关网站]", "").trim(); + .selectText(new String[] { ".leftinfo .lbox dd:contains(绔e伐鏃堕棿)", ".xiangqing dd:contains(绔e伐鏃堕棿)" }, content) + .replace("绔e伐鏃堕棿锛�", "").replace("[鐩稿叧缃戠珯]", "").trim(); String estateType = JQueryUtil .selectText( - new String[] { ".leftinfo dd:contains(物业类别)", ".xiangqing dd:contains(物业类别)", - "#bsif tr:contains(住宅类别) td:eq(1)" }, content).replace("物业类别:", "").replace("住宅类别:", "").trim(); + new String[] { ".leftinfo dd:contains(鐗╀笟绫诲埆)", ".xiangqing dd:contains(鐗╀笟绫诲埆)", + "#bsif tr:contains(浣忓畢绫诲埆) td:eq(1)" }, content).replace("鐗╀笟绫诲埆锛�", "").replace("浣忓畢绫诲埆锛�", "").trim(); String buildType = JQueryUtil .selectText( - new String[] { ".leftinfo dd:contains(建筑类别)", ".xiangqing dd:contains(建筑类别)", - "#bsif tr:contains(建筑类别) td:eq(3)" }, content).replace("建筑类别:", "").trim(); + new String[] { ".leftinfo dd:contains(寤虹瓚绫诲埆)", ".xiangqing dd:contains(寤虹瓚绫诲埆)", + "#bsif tr:contains(寤虹瓚绫诲埆) td:eq(3)" }, content).replace("寤虹瓚绫诲埆锛�", "").trim(); if (StringUtils.isBlank(buildType)) { - buildType = JQueryUtil.selectText(new String[] { ".xiangxinei th:contains(商铺类型)", ".xiangxinei th:contains(写字楼类型)" }, + buildType = JQueryUtil.selectText(new String[] { ".xiangxinei th:contains(鍟嗛摵绫诲瀷)", ".xiangxinei th:contains(鍐欏瓧妤肩被鍨�)" }, content).trim(); if (StringUtils.isNotBlank(buildType)) { - errors.add("类型不正确,不是小区类型"); + errors.add("绫诲瀷涓嶆纭�,涓嶆槸灏忓尯绫诲瀷"); return new AnalyResult(errors); } } String buildStructure = JQueryUtil - .selectText(new String[] { ".leftinfo dd:contains(建筑结构)", ".xiangqing dd:contains(建筑结构)" }, content) - .replace("建筑结构:", "").trim(); + .selectText(new String[] { ".leftinfo dd:contains(寤虹瓚缁撴瀯)", ".xiangqing dd:contains(寤虹瓚缁撴瀯)" }, content) + .replace("寤虹瓚缁撴瀯锛�", "").trim(); String propertyLife = JQueryUtil - .selectText(new String[] { ".leftinfo dd:contains(产权描述)", ".xiangqing dd:contains(产权描述)" }, content) - .replace("产权描述:", "").trim(); + .selectText(new String[] { ".leftinfo dd:contains(浜ф潈鎻忚堪)", ".xiangqing dd:contains(浜ф潈鎻忚堪)" }, content) + .replace("浜ф潈鎻忚堪锛�", "").trim(); String finishBuildingDate = JQueryUtil - .selectText(new String[] { ".leftinfo .lbox dd:contains(竣工时间)", ".xiangqing dd:contains(竣工时间)" }, content) - .replace("竣工时间:", "").replace("[相关网站]", "").trim(); + .selectText(new String[] { ".leftinfo .lbox dd:contains(绔e伐鏃堕棿)", ".xiangqing dd:contains(绔e伐鏃堕棿)" }, content) + .replace("绔e伐鏃堕棿锛�", "").replace("[鐩稿叧缃戠珯]", "").trim(); String loopLineInfo = JQueryUtil - .selectText(new String[] { ".leftinfo dd:contains(环线位置)", ".xiangqing dd:contains(环线位置)" }, content) - .replace("环线位置:", "").trim(); + .selectText(new String[] { ".leftinfo dd:contains(鐜嚎浣嶇疆)", ".xiangqing dd:contains(鐜嚎浣嶇疆)" }, content) + .replace("鐜嚎浣嶇疆锛�", "").trim(); String cubagePercent = JQueryUtil .selectText( - new String[] { ".leftinfo .lbox dd:contains(容积率)", ".leftinfo .lbox dd:contains(容 积 率:)", - ".xiangqing dd:contains(容积率)", "#bsif tr:contains(容积率) td:eq(1)" }, content) - .replace("容 积 率:", "").replace("[关于容积率]", "").replace("[容积率]", "").trim(); + new String[] { ".leftinfo .lbox dd:contains(瀹圭Н鐜�)", ".leftinfo .lbox dd:contains(瀹� 绉� 鐜囷細)", + ".xiangqing dd:contains(瀹圭Н鐜�)", "#bsif tr:contains(瀹圭Н鐜�) td:eq(1)" }, content) + .replace("瀹� 绉� 鐜囷細", "").replace("[鍏充簬瀹圭Н鐜嘳", "").replace("[瀹圭Н鐜嘳", "").trim(); String virescencePercent = JQueryUtil .selectText( - new String[] { ".leftinfo .lbox dd:contains(绿化率)", ".leftinfo .lbox dd:contains(绿 化 率:)", - ".xiangqing dd:contains(绿化率)", "#bsif tr:contains(绿化率) td:eq(3)" }, content) - .replace("绿 化 率:", "").replace("[关于绿化率]", "").replace("[绿化率]", "").trim(); + new String[] { ".leftinfo .lbox dd:contains(缁垮寲鐜�)", ".leftinfo .lbox dd:contains(缁� 鍖� 鐜囷細)", + ".xiangqing dd:contains(缁垮寲鐜�)", "#bsif tr:contains(缁垮寲鐜�) td:eq(3)" }, content) + .replace("缁� 鍖� 鐜囷細", "").replace("[鍏充簬缁垮寲鐜嘳", "").replace("[缁垮寲鐜嘳", "").trim(); String estateCharge = JQueryUtil .selectText( - new String[] { ".leftinfo dd:contains(物 业 费:)", ".xiangqing dd:contains(费:)", - "#bsif tr:contains(费:) td:eq(1)" }, content).replace("物 业 费:", "").trim(); + new String[] { ".leftinfo dd:contains(鐗� 涓� 璐癸細)", ".xiangqing dd:contains(璐癸細)", + "#bsif tr:contains(璐癸細) td:eq(1)" }, content).replace("鐗� 涓� 璐癸細", "").trim(); String estateCharge2 = JQueryUtil - .selectText(new String[] { ".leftinfo dd:contains(物业管理附加信息:)", ".xiangqing dd:contains(物业管理附加信息:)" }, content) - .replace("物业管理附加信息:", "").trim(); + .selectText(new String[] { ".leftinfo dd:contains(鐗╀笟绠$悊闄勫姞淇℃伅锛�)", ".xiangqing dd:contains(鐗╀笟绠$悊闄勫姞淇℃伅锛�)" }, content) + .replace("鐗╀笟绠$悊闄勫姞淇℃伅锛�", "").trim(); String estateCompany = JQueryUtil .selectText( - new String[] { ".leftinfo dd:contains(物业公司:)", ".xiangqing dd:contains(物业公司:)", - "#bsif tr:contains(物业公司) td:eq(3)" }, content).replace("物业公司:", "").trim(); + new String[] { ".leftinfo dd:contains(鐗╀笟鍏徃锛�)", ".xiangqing dd:contains(鐗╀笟鍏徃锛�)", + "#bsif tr:contains(鐗╀笟鍏徃) td:eq(3)" }, content).replace("鐗╀笟鍏徃锛�", "").trim(); String allArea = JQueryUtil .selectText( - new String[] { ".leftinfo .lbox dd:contains(占地面积:)", ".xiangqing dd:contains(占地面积:)", - "#bsif tr:contains(占地面积) td:eq(1)" }, content).replace("占地面积:", "").trim(); + new String[] { ".leftinfo .lbox dd:contains(鍗犲湴闈㈢Н锛�)", ".xiangqing dd:contains(鍗犲湴闈㈢Н锛�)", + "#bsif tr:contains(鍗犲湴闈㈢Н) td:eq(1)" }, content).replace("鍗犲湴闈㈢Н锛�", "").trim(); String buildArea = JQueryUtil .selectText( - new String[] { ".leftinfo .lbox dd:contains(建筑面积:)", ".xiangqing dd:contains(建筑面积:)", - "#bsif tr:contains(建筑面积) td:eq(3)" }, content).replace("建筑面积:", "").trim(); + new String[] { ".leftinfo .lbox dd:contains(寤虹瓚闈㈢Н锛�)", ".xiangqing dd:contains(寤虹瓚闈㈢Н锛�)", + "#bsif tr:contains(寤虹瓚闈㈢Н) td:eq(3)" }, content).replace("寤虹瓚闈㈢Н锛�", "").trim(); String householdCount = JQueryUtil - .selectText(new String[] { ".leftinfo .lbox dd:contains(总 户 数:)", ".xiangqing dd:contains(总户数:)" }, content) - .replace("总户数:", "").replace("总 户 数:", "").trim(); + .selectText(new String[] { ".leftinfo .lbox dd:contains(鎬� 鎴� 鏁帮細)", ".xiangqing dd:contains(鎬绘埛鏁帮細)" }, content) + .replace("鎬绘埛鏁帮細", "").replace("鎬� 鎴� 鏁帮細", "").trim(); String currHouseholdCount = JQueryUtil - .selectText(new String[] { ".leftinfo .lbox dd:contains(当期户数:)", ".xiangqing dd:contains(当期户数:)" }, content) - .replace("当期户数:", "").trim(); + .selectText(new String[] { ".leftinfo .lbox dd:contains(褰撴湡鎴锋暟锛�)", ".xiangqing dd:contains(褰撴湡鎴锋暟锛�)" }, content) + .replace("褰撴湡鎴锋暟锛�", "").trim(); String carSite = JQueryUtil .selectText( - new String[] { ".leftinfo dt:contains(停车位:)", ".leftinfo dt:contains(停 车 位:)", - ".xiangqing dd:contains(位:)", "#bsif tr:contains(车位信息) td" }, content).replace("停 车 位:", "") - .replace("停车位:", "").trim(); + new String[] { ".leftinfo dt:contains(鍋滆溅浣嶏細)", ".leftinfo dt:contains(鍋� 杞� 浣嶏細)", + ".xiangqing dd:contains(浣嶏細)", "#bsif tr:contains(杞︿綅淇℃伅) td" }, content).replace("鍋� 杞� 浣嶏細", "") + .replace("鍋滆溅浣嶏細", "").trim(); - String description = JQueryUtil.selectText(new String[] { ".leftinfo div:contains(小区简介)+dl", "#dli014" }, content).trim(); + String description = JQueryUtil.selectText(new String[] { ".leftinfo div:contains(灏忓尯绠�浠�)+dl", "#dli014" }, content).trim(); if (StringUtils.isNotBlank(description)) { - description = DataUtil.removeHtml(StringUtils.substringBetween(content, "", "")) - .replace("小区简介编辑本段", "").replace("\n", "").replace("\t", "").trim(); + description = DataUtil.removeHtml(StringUtils.substringBetween(content, "", "")) + .replace("灏忓尯绠�浠嬬紪杈戞湰娈�", "").replace("\n", "").replace("\t", "").trim(); } // String loudongInfo = // DataUtil.removeHtml(StringUtils.substringBetween(content, - // "", "")) - // .replace("楼座信息编辑本段", "").replace("\n", "").replace("\t", "").trim(); - String traffic = JQueryUtil.selectText(new String[] { ".leftinfo div:contains(交通状况)+dl", "#dli013" }, content).trim(); + // "", "")) + // .replace("妤煎骇淇℃伅缂栬緫鏈", "").replace("\n", "").replace("\t", "").trim(); + String traffic = JQueryUtil.selectText(new String[] { ".leftinfo div:contains(浜ら�氱姸鍐�)+dl", "#dli013" }, content).trim(); if (StringUtils.isNotBlank(traffic)) { - traffic = DataUtil.removeHtml(StringUtils.substringBetween(content, "", "")) - .replace("交通状况编辑本段", "").replace("\n", "").replace("\t", "").trim(); + traffic = DataUtil.removeHtml(StringUtils.substringBetween(content, "", "")) + .replace("浜ら�氱姸鍐电紪杈戞湰娈�", "").replace("\n", "").replace("\t", "").trim(); } String facilities = JQueryUtil - .selectHtml(new String[] { ".leftinfo div:contains(周边信息)+dl", "#dli012 table td" }, content).trim(); + .selectHtml(new String[] { ".leftinfo div:contains(鍛ㄨ竟淇℃伅)+dl", "#dli012 table td" }, content).trim(); if (StringUtils.isNotBlank(facilities)) { - facilities = DataUtil.removeHtml(StringUtils.substringBetween(content, "", "")) - .replace("周边信息编辑本段", "").replace("\n", "").replace("\t", "").trim(); - if (facilities.indexOf("本段合作编辑者") > -1) { - facilities = StringUtils.substringBeforeLast(facilities, "本段合作编辑者"); + facilities = DataUtil.removeHtml(StringUtils.substringBetween(content, "", "")) + .replace("鍛ㄨ竟淇℃伅缂栬緫鏈", "").replace("\n", "").replace("\t", "").trim(); + if (facilities.indexOf("鏈鍚堜綔缂栬緫鑰�") > -1) { + facilities = StringUtils.substringBeforeLast(facilities, "鏈鍚堜綔缂栬緫鑰�"); } } @@ -189,7 +189,7 @@ public class SoufunDistrictDetailAnalyImpl implements AnalyzerInterface { ret.put("city", city); ret.put("name", name); - // 某些城市板块也可能是区域 + // 鏌愪簺鍩庡競鏉垮潡涔熷彲鑳芥槸鍖哄煙 if (regionBlockDao.isRegion(city, region)) { ret.put("region", regionBlockDao.formatRegion(city, region)); } else if (regionBlockDao.isRegion(city, block)) { @@ -245,22 +245,22 @@ public class SoufunDistrictDetailAnalyImpl implements AnalyzerInterface { ret.put("other_info", otherInfo); if (estateType != null) { - if (estateType.indexOf("小区") == -1 && estateType.indexOf("别墅") == -1 && estateType.indexOf("公寓") == -1 - && estateType.indexOf("住宅") == -1) { - if (estateType.indexOf("写字楼") > -1 || estateType.indexOf("商铺") > -1) { - errors.add("类型不正确,不是小区类型"); + if (estateType.indexOf("灏忓尯") == -1 && estateType.indexOf("鍒") == -1 && estateType.indexOf("鍏瘬") == -1 + && estateType.indexOf("浣忓畢") == -1) { + if (estateType.indexOf("鍐欏瓧妤�") > -1 || estateType.indexOf("鍟嗛摵") > -1) { + errors.add("绫诲瀷涓嶆纭�,涓嶆槸灏忓尯绫诲瀷"); return new AnalyResult(errors); } } - if (estateType.indexOf("购物") > -1) { - errors.add("类型不正确,不是小区类型"); + if (estateType.indexOf("璐墿") > -1) { + errors.add("绫诲瀷涓嶆纭�,涓嶆槸灏忓尯绫诲瀷"); return new AnalyResult(errors); } } - if (name.indexOf("写字楼") > -1 || name.indexOf("商铺") > -1 || name.indexOf("商业广场") > -1) { - errors.add("类型不正确,不是小区类型"); + if (name.indexOf("鍐欏瓧妤�") > -1 || name.indexOf("鍟嗛摵") > -1 || name.indexOf("鍟嗕笟骞垮満") > -1) { + errors.add("绫诲瀷涓嶆纭�,涓嶆槸灏忓尯绫诲瀷"); return new AnalyResult(errors); } @@ -275,7 +275,7 @@ public class SoufunDistrictDetailAnalyImpl implements AnalyzerInterface { List removeKeys = new ArrayList(); for (String key : dbo.keySet()) { Object s = dbo.get(key); - if (s == null || "".equals(s) || s.toString().startsWith("暂无资料") || s.equals("暂无")) { + if (s == null || "".equals(s) || s.toString().startsWith("鏆傛棤璧勬枡") || s.equals("鏆傛棤")) { removeKeys.add(key); } } @@ -289,7 +289,7 @@ public class SoufunDistrictDetailAnalyImpl implements AnalyzerInterface { List okeys = new ArrayList(); for (String key : otherInfo.keySet()) { Object s = otherInfo.get(key); - if (s == null || "".equals(s) || s.toString().startsWith("暂无资料") || s.equals("暂无")) { + if (s == null || "".equals(s) || s.toString().startsWith("鏆傛棤璧勬枡") || s.equals("鏆傛棤")) { okeys.add(key); } } diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/analy/TaofangDistrictDetailAnalyImpl.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/analy/TaofangDistrictDetailAnalyImpl.java index 90d3ef420..4e2f34904 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/analy/TaofangDistrictDetailAnalyImpl.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/analy/TaofangDistrictDetailAnalyImpl.java @@ -17,7 +17,7 @@ import com.fangjia.coredata.util.JQueryUtil; import com.fangjia.mongo.dao.RegionBlockDao; /** - * 淘房网详情页解析 + * 娣樻埧缃戣鎯呴〉瑙f瀽 * * @author xiaoyu * @@ -25,8 +25,8 @@ import com.fangjia.mongo.dao.RegionBlockDao; @CATEGORY(value = CategoryEnum.DISTRICT) -@SITENAME(value = "淘房网") -@PAGENAME(value = "详情页") +@SITENAME(value = "娣樻埧缃�") +@PAGENAME(value = "璇︽儏椤�") public class TaofangDistrictDetailAnalyImpl implements AnalyzerInterface { private RegionBlockDao regionBlockDao = RegionBlockDao.getInstance(); @@ -35,9 +35,9 @@ public class TaofangDistrictDetailAnalyImpl implements AnalyzerInterface { // TaofangDistrictDetailAnalyImpl sd = new TaofangDistrictDetailAnalyImpl(); // AnalyResult res = sd.analy(webpage.getId(), webpage.getCity(), webpage.getContent()); // -// Map poiMap = AddressPOI.parseAddress((String) res.getResults().get("address"), "广州", 3); +// Map poiMap = AddressPOI.parseAddress((String) res.getResults().get("address"), "骞垮窞", 3); // if (poiMap == null || poiMap.size() == 0) { -// poiMap = AddressPOI.parseAddress((String) res.getResults().get("name"), "北京", 3); +// poiMap = AddressPOI.parseAddress((String) res.getResults().get("name"), "鍖椾含", 3); // } // System.out.println(poiMap); } @@ -47,12 +47,12 @@ public class TaofangDistrictDetailAnalyImpl implements AnalyzerInterface { List errors = new ArrayList(); String name = JQueryUtil.selectText(new String[] { "h1" }, content).trim(); - String region = JQueryUtil.selectText(new String[] { ".crumbs a:eq(4)" }, content).replace("小区", "").trim(); - String address = JQueryUtil.selectText(new String[] { ".main-left p:contains(查看周边地图)" }, content).replace("(查看周边地图)", "") - .replace("地  址:", "").trim(); + String region = JQueryUtil.selectText(new String[] { ".crumbs a:eq(4)" }, content).replace("灏忓尯", "").trim(); + String address = JQueryUtil.selectText(new String[] { ".main-left p:contains(鏌ョ湅鍛ㄨ竟鍦板浘)" }, content).replace("锛堟煡鐪嬪懆杈瑰湴鍥撅級", "") + .replace("鍦般��銆�鍧�锛�", "").trim(); if (StringUtils.isBlank(city) || StringUtils.isBlank(region) || StringUtils.isBlank(name) || StringUtils.isBlank(address)) { - errors.add("city||region||name||address解析不到"); + errors.add("city||region||name||address瑙f瀽涓嶅埌"); return new AnalyResult(errors); } diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/bo/FileDatasTotalityBo.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/bo/FileDatasTotalityBo.java index 19617a487..9053fb949 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/bo/FileDatasTotalityBo.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/bo/FileDatasTotalityBo.java @@ -4,14 +4,14 @@ import java.util.Date; public class FileDatasTotalityBo { private String id; - private Integer category;//类型:1:测试抽样 2:项目数据 3:其它问题 + private Integer category;//绫诲瀷锛�1:娴嬭瘯鎶芥牱 2:椤圭洰鏁版嵁 3:鍏跺畠闂 private String fileName; - private String oldFileName;//原文件名称 - private Date creationDate;// 创建时间 - private Date modificationDate;// 更新时间 - private Integer status;//处理状态 0:上传成功 1:分析中 2:完成 3:失败 4:人工调查 - private Integer total;//总数 - private Integer failTotal;//失败总数 + private String oldFileName;//鍘熸枃浠跺悕绉� + private Date creationDate;// 鍒涘缓鏃堕棿 + private Date modificationDate;// 鏇存柊鏃堕棿 + private Integer status;//澶勭悊鐘舵�� 0:涓婁紶鎴愬姛 1:鍒嗘瀽涓� 2:瀹屾垚 3:澶辫触 4:浜哄伐璋冩煡 + private Integer total;//鎬绘暟 + private Integer failTotal;//澶辫触鎬绘暟 private String userId; private Integer mathcPrecent; diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/bo/PriceAnalyBo.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/bo/PriceAnalyBo.java index e1e0dbae1..adb095892 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/bo/PriceAnalyBo.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/bo/PriceAnalyBo.java @@ -9,15 +9,15 @@ public class PriceAnalyBo { private Integer avgPrice; private Integer peoplePrice; - private Integer halfYearCount;//近半年样本量 - private double halfYearPeoplePricePecent;//近半年符合人工调查分析样本量 - private double halfYearMachinePricePecent;//近半年符合计算分析样本量 + private Integer halfYearCount;//杩戝崐骞存牱鏈噺 + private double halfYearPeoplePricePecent;//杩戝崐骞寸鍚堜汉宸ヨ皟鏌ュ垎鏋愭牱鏈噺 + private double halfYearMachinePricePecent;//杩戝崐骞寸鍚堣绠楀垎鏋愭牱鏈噺 - private Integer historyCount;//历史所有 + private Integer historyCount;//鍘嗗彶鎵�鏈� private double historyPeoplePricePecent; private double historyMachinePricePecent; - private Integer oneMonthCount;//近一个月 + private Integer oneMonthCount;//杩戜竴涓湀 private double oneMonthPeoplePricePecent; private double oneMonthMachinePricePecent; public String getCity() { diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/bo/SeedsBo.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/bo/SeedsBo.java index 681e7704d..9f26412ba 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/bo/SeedsBo.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/bo/SeedsBo.java @@ -7,11 +7,11 @@ public class SeedsBo { private String url; private String city; private int count; - private String parentId;// 关联到website表 + private String parentId;// 鍏宠仈鍒皐ebsite琛� private double score; - private int status;// 网站完成状态 - private Date creationDate;// 创建时间 - private Date modificationDate;// 更新时间 + private int status;// 缃戠珯瀹屾垚鐘舵�� + private Date creationDate;// 鍒涘缓鏃堕棿 + private Date modificationDate;// 鏇存柊鏃堕棿 private String category; private String scope; diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/bo/WebsiteBo.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/bo/WebsiteBo.java index 4ef8c8764..74d4983d9 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/bo/WebsiteBo.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/service/bo/WebsiteBo.java @@ -19,7 +19,7 @@ public class WebsiteBo { private String remark; private String pinyin; private int status; - private double score;//评分 + private double score;//璇勫垎 private int seedTotalCount; private int successCount; private String city; diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/util/AddressAnalyUtils.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/util/AddressAnalyUtils.java index 88365a671..66d5b4a1a 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/util/AddressAnalyUtils.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/util/AddressAnalyUtils.java @@ -10,7 +10,7 @@ import java.util.List; /** - * 地址分析平台相关工具 + * 鍦板潃鍒嗘瀽骞冲彴鐩稿叧宸ュ叿 * Created by hubingliang on 2017/1/4. */ public class AddressAnalyUtils { @@ -31,7 +31,7 @@ public class AddressAnalyUtils { } /** - * 对地址的完整性以及准确性进行评级 + * 瀵瑰湴鍧�鐨勫畬鏁存�т互鍙婂噯纭�ц繘琛岃瘎绾� * @param data * @return */ diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/util/AddressPOI.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/util/AddressPOI.java index 146f8fbb1..d998d9d7f 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/util/AddressPOI.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/util/AddressPOI.java @@ -29,9 +29,9 @@ public class AddressPOI { private static Map CITY_CODE_MAP = new HashMap(); public static void main(String[] args) throws Exception { - // Map ret = parseAddress("中山西路68号", "深圳", 6); + // Map ret = parseAddress("涓北瑗胯矾68鍙�", "娣卞湷", 6); // System.out.println(ret); - Map res = parseDistrictBaidu("香江公馆", "瑞安", 6); + Map res = parseDistrictBaidu("棣欐睙鍏", "鐟炲畨", 6); if (res != null && res.get("lat") != null) { String region = parseRegion((Double) res.get("lat"), (Double) res.get("lng"), 6); System.out.println(region); @@ -95,7 +95,7 @@ public class AddressPOI { return null; } - public static final String[] DISTRICT_TAGS = new String[] { "住宅", "公寓", "别墅", "小区" }; + public static final String[] DISTRICT_TAGS = new String[] { "浣忓畢", "鍏瘬", "鍒", "灏忓尯" }; @SuppressWarnings("unchecked") public static Map parseDistrictBaidu(String address, String city, int retryTimes) throws Exception { @@ -291,389 +291,389 @@ public class AddressPOI { } static { - CITY_CODE_MAP.put("北京", "010"); - CITY_CODE_MAP.put("广州", "020"); - CITY_CODE_MAP.put("重庆", "023"); + CITY_CODE_MAP.put("鍖椾含", "010"); + CITY_CODE_MAP.put("骞垮窞", "020"); + CITY_CODE_MAP.put("閲嶅簡", "023"); - CITY_CODE_MAP.put("南京", "025"); + CITY_CODE_MAP.put("鍗椾含", "025"); - CITY_CODE_MAP.put("武汉", "027"); + CITY_CODE_MAP.put("姝︽眽", "027"); - CITY_CODE_MAP.put("成都", "028"); + CITY_CODE_MAP.put("鎴愰兘", "028"); - CITY_CODE_MAP.put("保定", "0312"); + CITY_CODE_MAP.put("淇濆畾", "0312"); - CITY_CODE_MAP.put("承德", "0314"); + CITY_CODE_MAP.put("鎵垮痉", "0314"); - CITY_CODE_MAP.put("唐山", "0315"); + CITY_CODE_MAP.put("鍞愬北", "0315"); - CITY_CODE_MAP.put("廊坊", "0316"); + CITY_CODE_MAP.put("寤婂潑", "0316"); - CITY_CODE_MAP.put("秦皇岛", "0335"); + CITY_CODE_MAP.put("绉︾殗宀�", "0335"); - CITY_CODE_MAP.put("新乡", "0373"); + CITY_CODE_MAP.put("鏂颁埂", "0373"); - CITY_CODE_MAP.put("洛阳", "0379"); + CITY_CODE_MAP.put("娲涢槼", "0379"); - CITY_CODE_MAP.put("大连", "0411"); + CITY_CODE_MAP.put("澶ц繛", "0411"); - CITY_CODE_MAP.put("鞍山", "0412"); + CITY_CODE_MAP.put("闉嶅北", "0412"); - CITY_CODE_MAP.put("抚顺", "0413"); + CITY_CODE_MAP.put("鎶氶『", "0413"); - CITY_CODE_MAP.put("本溪", "0414"); - CITY_CODE_MAP.put("丹东", "0415"); - CITY_CODE_MAP.put("辽阳", "0419"); - CITY_CODE_MAP.put("葫芦岛", "0429"); - CITY_CODE_MAP.put("长春", "0431"); - CITY_CODE_MAP.put("哈尔滨", "0451"); - CITY_CODE_MAP.put("佳木斯", "0454"); - CITY_CODE_MAP.put("包头", "0472"); - CITY_CODE_MAP.put("镇江", "0511"); - CITY_CODE_MAP.put("苏州", "0512"); - CITY_CODE_MAP.put("昆山", "0512"); - CITY_CODE_MAP.put("南通", "0513"); - CITY_CODE_MAP.put("扬州", "0514"); - CITY_CODE_MAP.put("徐州", "0516"); - CITY_CODE_MAP.put("常州", "0519"); - CITY_CODE_MAP.put("济南", "0531"); - CITY_CODE_MAP.put("青岛", "0532"); - CITY_CODE_MAP.put("蚌埠", "0552"); - CITY_CODE_MAP.put("黄山", "0559"); - CITY_CODE_MAP.put("杭州", "0571"); - CITY_CODE_MAP.put("湖州", "0572"); - CITY_CODE_MAP.put("台州", "0576"); - CITY_CODE_MAP.put("温州", "0577"); - CITY_CODE_MAP.put("福州", "0591"); - CITY_CODE_MAP.put("厦门", "0592"); - CITY_CODE_MAP.put("宁德", "0593"); - CITY_CODE_MAP.put("莆田", "0594"); - CITY_CODE_MAP.put("泉州", "0595"); - CITY_CODE_MAP.put("漳州", "0596"); - CITY_CODE_MAP.put("威海", "0631"); - CITY_CODE_MAP.put("汕尾", "0660"); - CITY_CODE_MAP.put("汕尾岛", "0660"); - CITY_CODE_MAP.put("阳江", "0662"); - CITY_CODE_MAP.put("揭阳", "0663"); - CITY_CODE_MAP.put("茂名", "0668"); - CITY_CODE_MAP.put("襄阳", "0710"); - CITY_CODE_MAP.put("黄石", "0714"); - CITY_CODE_MAP.put("宜昌", "0717"); - CITY_CODE_MAP.put("十堰", "0719"); - CITY_CODE_MAP.put("荆门", "0724"); - CITY_CODE_MAP.put("岳阳", "0730"); - CITY_CODE_MAP.put("长沙", "0731"); - CITY_CODE_MAP.put("湘潭", "0732"); - CITY_CODE_MAP.put("株洲", "0733"); - CITY_CODE_MAP.put("常德", "0736"); - CITY_CODE_MAP.put("江门", "0750"); - CITY_CODE_MAP.put("汕头", "0754"); - CITY_CODE_MAP.put("深圳", "0755"); - CITY_CODE_MAP.put("珠海", "0756"); - CITY_CODE_MAP.put("湛江", "0759"); - CITY_CODE_MAP.put("中山", "0760"); - CITY_CODE_MAP.put("防城港", "0770"); - CITY_CODE_MAP.put("南宁", "0771"); - CITY_CODE_MAP.put("桂林", "0773"); - CITY_CODE_MAP.put("北海", "0779"); - CITY_CODE_MAP.put("南昌", "0791"); - CITY_CODE_MAP.put("九江", "0792"); - CITY_CODE_MAP.put("景德镇", "0798"); - CITY_CODE_MAP.put("自贡", "0813"); - CITY_CODE_MAP.put("泸州", "0830"); - CITY_CODE_MAP.put("宜宾", "0831"); - CITY_CODE_MAP.put("内江", "01832"); - CITY_CODE_MAP.put("眉山", "0833"); - CITY_CODE_MAP.put("贵阳", "0851"); - CITY_CODE_MAP.put("三亚", "0899"); - CITY_CODE_MAP.put("咸阳", "0910"); - CITY_CODE_MAP.put("延安", "0911"); - CITY_CODE_MAP.put("延边朝鲜族自治州", "0433"); - CITY_CODE_MAP.put("七台河", "0464"); - CITY_CODE_MAP.put("三明", "0598"); - CITY_CODE_MAP.put("三门峡", "0398"); - CITY_CODE_MAP.put("上海", "021"); - CITY_CODE_MAP.put("上饶", "0793"); - CITY_CODE_MAP.put("东莞", "0769"); - CITY_CODE_MAP.put("东营", "0546"); - CITY_CODE_MAP.put("中卫", "01953"); - CITY_CODE_MAP.put("临夏回族自治州", "0930"); - CITY_CODE_MAP.put("临汾", "0357"); - CITY_CODE_MAP.put("临沂", "0539"); - CITY_CODE_MAP.put("丽水", "0578"); - CITY_CODE_MAP.put("乌兰察布", "0474"); - CITY_CODE_MAP.put("乌海", "0473"); - CITY_CODE_MAP.put("乌鲁木齐", "0991"); - CITY_CODE_MAP.put("乐山", "0833"); - CITY_CODE_MAP.put("云浮", "0766"); - CITY_CODE_MAP.put("亳州", "0558"); - CITY_CODE_MAP.put("仙桃", "0728"); - CITY_CODE_MAP.put("伊春", "0458"); - CITY_CODE_MAP.put("伊犁哈萨克自治州", "0999"); - CITY_CODE_MAP.put("佛山", "0757"); - CITY_CODE_MAP.put("信阳", "0376"); - CITY_CODE_MAP.put("克拉玛依", "0990"); - CITY_CODE_MAP.put("六安", "0564"); - CITY_CODE_MAP.put("兰州", "0931"); - CITY_CODE_MAP.put("兴安盟", "0482"); - CITY_CODE_MAP.put("凉山彝族自治州", "0834"); - CITY_CODE_MAP.put("南充", "0817"); - CITY_CODE_MAP.put("南平", "0599"); - CITY_CODE_MAP.put("南阳", "0377"); - CITY_CODE_MAP.put("博尔塔拉蒙古自治州", "0909"); - CITY_CODE_MAP.put("双鸭山", "0469"); - CITY_CODE_MAP.put("合肥", "0551"); - CITY_CODE_MAP.put("吉安", "0796"); - CITY_CODE_MAP.put("吉林", "0432"); - CITY_CODE_MAP.put("吐鲁番地区", "0995"); - CITY_CODE_MAP.put("吕梁", "0358"); - CITY_CODE_MAP.put("吴忠", "0953"); - CITY_CODE_MAP.put("周口", "0394"); - CITY_CODE_MAP.put("呼伦贝尔", "0470"); - CITY_CODE_MAP.put("呼和浩特", "0471"); - CITY_CODE_MAP.put("咸宁", "0715"); - CITY_CODE_MAP.put("商丘", "0370"); - CITY_CODE_MAP.put("商洛", "0914"); - CITY_CODE_MAP.put("嘉兴", "0573"); - CITY_CODE_MAP.put("四平", "0434"); - CITY_CODE_MAP.put("塔城地区", "0901"); - CITY_CODE_MAP.put("大兴安岭地区", "0457"); - CITY_CODE_MAP.put("大同", "0352"); - CITY_CODE_MAP.put("大庆", "0459"); - CITY_CODE_MAP.put("大理白族自治州", "0872"); - CITY_CODE_MAP.put("天水", "0938"); - CITY_CODE_MAP.put("天津", "022"); - CITY_CODE_MAP.put("天门", "01728"); - CITY_CODE_MAP.put("太原", "0351"); - CITY_CODE_MAP.put("娄底", "0738"); - CITY_CODE_MAP.put("孝感", "0712"); - CITY_CODE_MAP.put("宁波", "0574"); - CITY_CODE_MAP.put("安庆", "0556"); - CITY_CODE_MAP.put("安康", "0915"); - CITY_CODE_MAP.put("安阳", "0372"); - CITY_CODE_MAP.put("安顺", "0853"); - CITY_CODE_MAP.put("定西", "0932"); - CITY_CODE_MAP.put("宜春", "0795"); - CITY_CODE_MAP.put("宝鸡", "0917"); - CITY_CODE_MAP.put("宣城", "0563"); - CITY_CODE_MAP.put("宿州", "0557"); - CITY_CODE_MAP.put("宿迁", "0527"); - CITY_CODE_MAP.put("山南地区", "0893"); - CITY_CODE_MAP.put("崇左", "01771"); - CITY_CODE_MAP.put("巢湖", "0565"); - CITY_CODE_MAP.put("巴中", "0827"); - CITY_CODE_MAP.put("平凉", "0933"); - CITY_CODE_MAP.put("平顶山", "0375"); - CITY_CODE_MAP.put("广元", "0839"); - CITY_CODE_MAP.put("广安", "0826"); - CITY_CODE_MAP.put("庆阳", "0934"); - CITY_CODE_MAP.put("开封", "0378"); - CITY_CODE_MAP.put("张家口", "0313"); - CITY_CODE_MAP.put("张家界", "0744"); - CITY_CODE_MAP.put("张掖", "0936"); - CITY_CODE_MAP.put("德州", "0534"); - CITY_CODE_MAP.put("德阳", "0838"); - CITY_CODE_MAP.put("忻州", "0350"); - CITY_CODE_MAP.put("怀化", "0745"); - CITY_CODE_MAP.put("恩施土家族苗族自治州", "0718"); - CITY_CODE_MAP.put("惠州", "0752"); - CITY_CODE_MAP.put("抚州", "0794"); - CITY_CODE_MAP.put("拉萨", "0891"); - CITY_CODE_MAP.put("攀枝花", "0812"); - CITY_CODE_MAP.put("新余", "0790"); - CITY_CODE_MAP.put("无锡", "0510"); - CITY_CODE_MAP.put("日喀则地区", "0892"); - CITY_CODE_MAP.put("日照", "0633"); - CITY_CODE_MAP.put("昆明", "0871"); - CITY_CODE_MAP.put("昌吉回族自治州", "0994"); - CITY_CODE_MAP.put("昭通", "0870"); - CITY_CODE_MAP.put("晋中", "0354"); - CITY_CODE_MAP.put("晋城", "0356"); - CITY_CODE_MAP.put("曲靖", "0874"); - CITY_CODE_MAP.put("朔州", "0349"); - CITY_CODE_MAP.put("朝阳", "0421"); - CITY_CODE_MAP.put("来宾", "01772"); - CITY_CODE_MAP.put("松原", "0438"); - CITY_CODE_MAP.put("枣庄", "0632"); - CITY_CODE_MAP.put("柳州", "0772"); - CITY_CODE_MAP.put("梅州", "0753"); - CITY_CODE_MAP.put("梧州", "0774"); - CITY_CODE_MAP.put("楚雄彝族自治州", "0878"); - CITY_CODE_MAP.put("榆林", "0912"); - CITY_CODE_MAP.put("武威", "01935"); - CITY_CODE_MAP.put("毕节地区", "0857"); - CITY_CODE_MAP.put("永州", "0746"); - CITY_CODE_MAP.put("汉中", "0916"); - CITY_CODE_MAP.put("池州", "0566"); - CITY_CODE_MAP.put("沈阳", "024"); - CITY_CODE_MAP.put("沧州", "0317"); - CITY_CODE_MAP.put("河池", "0778"); - CITY_CODE_MAP.put("河源", "0762"); - CITY_CODE_MAP.put("泰安", "0538"); - CITY_CODE_MAP.put("泰州", "0523"); - CITY_CODE_MAP.put("济宁", "0537"); - CITY_CODE_MAP.put("济源", "01391"); - CITY_CODE_MAP.put("海东地区", "0972"); - CITY_CODE_MAP.put("海北藏族自治州", "0970"); - CITY_CODE_MAP.put("海南藏族自治州", "0974"); - CITY_CODE_MAP.put("海口", "0898"); - CITY_CODE_MAP.put("淄博", "0533"); - CITY_CODE_MAP.put("淮北", "0561"); - CITY_CODE_MAP.put("淮南", "0554"); - CITY_CODE_MAP.put("淮安", "0517"); - CITY_CODE_MAP.put("清远", "0763"); - CITY_CODE_MAP.put("渭南", "0913"); - CITY_CODE_MAP.put("湘西土家族苗族自治州", "0743"); - CITY_CODE_MAP.put("滁州", "0550"); - CITY_CODE_MAP.put("滨州", "0543"); - CITY_CODE_MAP.put("漯河", "0395"); - CITY_CODE_MAP.put("潍坊", "0536"); - CITY_CODE_MAP.put("潜江", "02728"); - CITY_CODE_MAP.put("潮州", "0768"); - CITY_CODE_MAP.put("濮阳", "0393"); - CITY_CODE_MAP.put("烟台", "0535"); - CITY_CODE_MAP.put("焦作", "0391"); - CITY_CODE_MAP.put("牡丹江", "0453"); - CITY_CODE_MAP.put("玉林", "0775"); - CITY_CODE_MAP.put("玉溪", "0877"); - CITY_CODE_MAP.put("甘孜藏族自治州", "0836"); - CITY_CODE_MAP.put("白城", "0436"); - CITY_CODE_MAP.put("白山", "0439"); - CITY_CODE_MAP.put("白银", "0943"); - CITY_CODE_MAP.put("益阳", "0737"); - CITY_CODE_MAP.put("盐城", "0515"); - CITY_CODE_MAP.put("盘锦", "0427"); - CITY_CODE_MAP.put("石嘴山", "0952"); - CITY_CODE_MAP.put("石家庄", "0311"); - CITY_CODE_MAP.put("石河子", "0993"); - CITY_CODE_MAP.put("神农架林区", "01719"); - CITY_CODE_MAP.put("红河哈尼族彝族自治州", "0873"); - CITY_CODE_MAP.put("绍兴", "0575"); - CITY_CODE_MAP.put("绥化", "0455"); - CITY_CODE_MAP.put("绵阳", "0816"); - CITY_CODE_MAP.put("聊城", "0635"); - CITY_CODE_MAP.put("肇庆", "0758"); - CITY_CODE_MAP.put("舟山", "0580"); - CITY_CODE_MAP.put("芜湖", "0553"); - CITY_CODE_MAP.put("荆州", "0716"); - CITY_CODE_MAP.put("莱芜", "0634"); - CITY_CODE_MAP.put("菏泽", "0530"); - CITY_CODE_MAP.put("萍乡", "0799"); - CITY_CODE_MAP.put("营口", "0417"); - CITY_CODE_MAP.put("衡水", "0318"); - CITY_CODE_MAP.put("衡阳", "0734"); - CITY_CODE_MAP.put("衢州", "0570"); - CITY_CODE_MAP.put("西双版纳傣族自治州", "0691"); - CITY_CODE_MAP.put("西宁", "0971"); - CITY_CODE_MAP.put("西安", "029"); - CITY_CODE_MAP.put("许昌", "0374"); - CITY_CODE_MAP.put("贵港", "01755"); - CITY_CODE_MAP.put("贺州", "01774"); - CITY_CODE_MAP.put("资阳", "0832"); - CITY_CODE_MAP.put("赣州", "0797"); - CITY_CODE_MAP.put("赤峰", "0476"); - CITY_CODE_MAP.put("辽源", "0437"); - CITY_CODE_MAP.put("达州", "0818"); - CITY_CODE_MAP.put("运城", "0359"); - CITY_CODE_MAP.put("连云港", "0518"); - CITY_CODE_MAP.put("通化", "0435"); - CITY_CODE_MAP.put("通辽", "0475"); - CITY_CODE_MAP.put("遂宁", "0825"); - CITY_CODE_MAP.put("遵义", "0852"); - CITY_CODE_MAP.put("邢台", "0319"); - CITY_CODE_MAP.put("邯郸", "0310"); - CITY_CODE_MAP.put("邵阳", "0739"); - CITY_CODE_MAP.put("郑州", "0371"); - CITY_CODE_MAP.put("郴州", "0735"); - CITY_CODE_MAP.put("鄂尔多斯", "0477"); - CITY_CODE_MAP.put("鄂州", "0711"); - CITY_CODE_MAP.put("酒泉", "0937"); - CITY_CODE_MAP.put("金华", "0579"); - CITY_CODE_MAP.put("金昌", "0935"); - CITY_CODE_MAP.put("钦州", "0777"); - CITY_CODE_MAP.put("铁岭", "0410"); - CITY_CODE_MAP.put("铜仁地区", "0856"); - CITY_CODE_MAP.put("铜川", "0919"); - CITY_CODE_MAP.put("铜陵", "0562"); - CITY_CODE_MAP.put("银川", "0951"); - CITY_CODE_MAP.put("锦州", "0416"); - CITY_CODE_MAP.put("长治", "0355"); - CITY_CODE_MAP.put("阜新", "0418"); - CITY_CODE_MAP.put("阜阳", "01558"); - CITY_CODE_MAP.put("阳泉", "0353"); - CITY_CODE_MAP.put("阿坝藏族羌族自治州", "0837"); - CITY_CODE_MAP.put("陇南", "02935"); - CITY_CODE_MAP.put("随州", "0722"); - CITY_CODE_MAP.put("雅安", "0835"); - CITY_CODE_MAP.put("韶关", "0751"); - CITY_CODE_MAP.put("马鞍山", "0555"); - CITY_CODE_MAP.put("驻马店", "0396"); - CITY_CODE_MAP.put("鸡西", "0467"); - CITY_CODE_MAP.put("鹤壁", "0392"); - CITY_CODE_MAP.put("鹤岗", "0468"); - CITY_CODE_MAP.put("鹰潭", "0701"); - CITY_CODE_MAP.put("黄冈", "0713"); - CITY_CODE_MAP.put("黑河", "0456"); - CITY_CODE_MAP.put("黔东南苗族侗族自治州", "0855"); - CITY_CODE_MAP.put("黔南布依族苗族自治州", "0854"); - CITY_CODE_MAP.put("齐齐哈尔", "0452"); - CITY_CODE_MAP.put("龙岩", "0597"); - CITY_CODE_MAP.put("甘南藏族自治州", "0941"); - CITY_CODE_MAP.put("嘉峪关", "1937"); - CITY_CODE_MAP.put("百色", "0776"); - CITY_CODE_MAP.put("六盘水", "0858"); - CITY_CODE_MAP.put("黔西南布依族苗族自治州", "0859"); - CITY_CODE_MAP.put("白沙黎族自治县", "0802"); - CITY_CODE_MAP.put("保亭黎族苗族自治县", "0801"); - CITY_CODE_MAP.put("昌江黎族自治县", "0803"); - CITY_CODE_MAP.put("澄迈县", "0804"); - CITY_CODE_MAP.put("定安县", "0806"); - CITY_CODE_MAP.put("东方", "0807"); - CITY_CODE_MAP.put("东沙群岛", "0808"); - CITY_CODE_MAP.put("乐东黎族自治县", "2802"); - CITY_CODE_MAP.put("临高县", "1896"); - CITY_CODE_MAP.put("陵水黎族自治县", "0809"); - CITY_CODE_MAP.put("南沙群岛", "1891"); - CITY_CODE_MAP.put("琼海", "1894"); - CITY_CODE_MAP.put("琼中黎族苗族自治县", "1899"); - CITY_CODE_MAP.put("屯昌县", "1892"); - CITY_CODE_MAP.put("万宁", "1898"); - CITY_CODE_MAP.put("文昌", "1893"); - CITY_CODE_MAP.put("五指山", "1897"); - CITY_CODE_MAP.put("西沙群岛", "1895"); - CITY_CODE_MAP.put("中沙群岛", "2801"); - CITY_CODE_MAP.put("儋州", "0805"); - CITY_CODE_MAP.put("阿拉善盟", "0483"); - CITY_CODE_MAP.put("巴彦淖尔市", "0478"); - CITY_CODE_MAP.put("锡林郭勒盟", "0479"); - CITY_CODE_MAP.put("固原", "0954"); - CITY_CODE_MAP.put("果洛藏族自治州", "0975"); - CITY_CODE_MAP.put("海西蒙古族藏族自治州", "0977"); - CITY_CODE_MAP.put("黄南藏族自治州", "0973"); - CITY_CODE_MAP.put("玉树藏族自治州", "0976"); - CITY_CODE_MAP.put("阿里地区", "0897"); - CITY_CODE_MAP.put("昌都地区", "0895"); - CITY_CODE_MAP.put("林芝地区", "0894"); - CITY_CODE_MAP.put("那曲地区", "0896"); - CITY_CODE_MAP.put("阿克苏地区", "0997"); - CITY_CODE_MAP.put("阿勒泰地区", "0906"); - CITY_CODE_MAP.put("巴音郭楞蒙古自治州", "0996"); - CITY_CODE_MAP.put("哈密地区", "0902"); - CITY_CODE_MAP.put("和田地区", "0903"); - CITY_CODE_MAP.put("喀什地区", "0998"); - CITY_CODE_MAP.put("克孜勒苏柯尔克孜自治州", "0908"); - CITY_CODE_MAP.put("保山", "0875"); - CITY_CODE_MAP.put("德宏傣族景颇族自治州", "0692"); - CITY_CODE_MAP.put("迪庆藏族自治州", "0887"); - CITY_CODE_MAP.put("丽江", "0888"); - CITY_CODE_MAP.put("临沧市", "0883"); - CITY_CODE_MAP.put("怒江傈僳族自治州", "0886"); - CITY_CODE_MAP.put("普洱", "0879"); - CITY_CODE_MAP.put("文山壮族苗族自治州", "0876"); - CITY_CODE_MAP.put("香港", "1852"); - CITY_CODE_MAP.put("澳门", "1853"); - CITY_CODE_MAP.put("五家渠市", "652300"); - CITY_CODE_MAP.put("阿拉尔市", "652900"); - CITY_CODE_MAP.put("图木舒克市", "653000"); + CITY_CODE_MAP.put("鏈邯", "0414"); + CITY_CODE_MAP.put("涓逛笢", "0415"); + CITY_CODE_MAP.put("杈介槼", "0419"); + CITY_CODE_MAP.put("钁姦宀�", "0429"); + CITY_CODE_MAP.put("闀挎槬", "0431"); + CITY_CODE_MAP.put("鍝堝皵婊�", "0451"); + CITY_CODE_MAP.put("浣虫湪鏂�", "0454"); + CITY_CODE_MAP.put("鍖呭ご", "0472"); + CITY_CODE_MAP.put("闀囨睙", "0511"); + CITY_CODE_MAP.put("鑻忓窞", "0512"); + CITY_CODE_MAP.put("鏄嗗北", "0512"); + CITY_CODE_MAP.put("鍗楅��", "0513"); + CITY_CODE_MAP.put("鎵窞", "0514"); + CITY_CODE_MAP.put("寰愬窞", "0516"); + CITY_CODE_MAP.put("甯稿窞", "0519"); + CITY_CODE_MAP.put("娴庡崡", "0531"); + CITY_CODE_MAP.put("闈掑矝", "0532"); + CITY_CODE_MAP.put("铓屽煚", "0552"); + CITY_CODE_MAP.put("榛勫北", "0559"); + CITY_CODE_MAP.put("鏉窞", "0571"); + CITY_CODE_MAP.put("婀栧窞", "0572"); + CITY_CODE_MAP.put("鍙板窞", "0576"); + CITY_CODE_MAP.put("娓╁窞", "0577"); + CITY_CODE_MAP.put("绂忓窞", "0591"); + CITY_CODE_MAP.put("鍘﹂棬", "0592"); + CITY_CODE_MAP.put("瀹佸痉", "0593"); + CITY_CODE_MAP.put("鑾嗙敯", "0594"); + CITY_CODE_MAP.put("娉夊窞", "0595"); + CITY_CODE_MAP.put("婕冲窞", "0596"); + CITY_CODE_MAP.put("濞佹捣", "0631"); + CITY_CODE_MAP.put("姹曞熬", "0660"); + CITY_CODE_MAP.put("姹曞熬宀�", "0660"); + CITY_CODE_MAP.put("闃虫睙", "0662"); + CITY_CODE_MAP.put("鎻槼", "0663"); + CITY_CODE_MAP.put("鑼傚悕", "0668"); + CITY_CODE_MAP.put("瑗勯槼", "0710"); + CITY_CODE_MAP.put("榛勭煶", "0714"); + CITY_CODE_MAP.put("瀹滄槍", "0717"); + CITY_CODE_MAP.put("鍗佸牥", "0719"); + CITY_CODE_MAP.put("鑽嗛棬", "0724"); + CITY_CODE_MAP.put("宀抽槼", "0730"); + CITY_CODE_MAP.put("闀挎矙", "0731"); + CITY_CODE_MAP.put("婀樻江", "0732"); + CITY_CODE_MAP.put("鏍床", "0733"); + CITY_CODE_MAP.put("甯稿痉", "0736"); + CITY_CODE_MAP.put("姹熼棬", "0750"); + CITY_CODE_MAP.put("姹曞ご", "0754"); + CITY_CODE_MAP.put("娣卞湷", "0755"); + CITY_CODE_MAP.put("鐝犳捣", "0756"); + CITY_CODE_MAP.put("婀涙睙", "0759"); + CITY_CODE_MAP.put("涓北", "0760"); + CITY_CODE_MAP.put("闃插煄娓�", "0770"); + CITY_CODE_MAP.put("鍗楀畞", "0771"); + CITY_CODE_MAP.put("妗傛灄", "0773"); + CITY_CODE_MAP.put("鍖楁捣", "0779"); + CITY_CODE_MAP.put("鍗楁槍", "0791"); + CITY_CODE_MAP.put("涔濇睙", "0792"); + CITY_CODE_MAP.put("鏅痉闀�", "0798"); + CITY_CODE_MAP.put("鑷础", "0813"); + CITY_CODE_MAP.put("娉稿窞", "0830"); + CITY_CODE_MAP.put("瀹滃", "0831"); + CITY_CODE_MAP.put("鍐呮睙", "01832"); + CITY_CODE_MAP.put("鐪夊北", "0833"); + CITY_CODE_MAP.put("璐甸槼", "0851"); + CITY_CODE_MAP.put("涓変簹", "0899"); + CITY_CODE_MAP.put("鍜搁槼", "0910"); + CITY_CODE_MAP.put("寤跺畨", "0911"); + CITY_CODE_MAP.put("寤惰竟鏈濋矞鏃忚嚜娌诲窞", "0433"); + CITY_CODE_MAP.put("涓冨彴娌�", "0464"); + CITY_CODE_MAP.put("涓夋槑", "0598"); + CITY_CODE_MAP.put("涓夐棬宄�", "0398"); + CITY_CODE_MAP.put("涓婃捣", "021"); + CITY_CODE_MAP.put("涓婇ザ", "0793"); + CITY_CODE_MAP.put("涓滆帪", "0769"); + CITY_CODE_MAP.put("涓滆惀", "0546"); + CITY_CODE_MAP.put("涓崼", "01953"); + CITY_CODE_MAP.put("涓村鍥炴棌鑷不宸�", "0930"); + CITY_CODE_MAP.put("涓存本", "0357"); + CITY_CODE_MAP.put("涓存矀", "0539"); + CITY_CODE_MAP.put("涓芥按", "0578"); + CITY_CODE_MAP.put("涔屽叞瀵熷竷", "0474"); + CITY_CODE_MAP.put("涔屾捣", "0473"); + CITY_CODE_MAP.put("涔岄瞾鏈ㄩ綈", "0991"); + CITY_CODE_MAP.put("涔愬北", "0833"); + CITY_CODE_MAP.put("浜戞诞", "0766"); + CITY_CODE_MAP.put("浜冲窞", "0558"); + CITY_CODE_MAP.put("浠欐", "0728"); + CITY_CODE_MAP.put("浼婃槬", "0458"); + CITY_CODE_MAP.put("浼婄妬鍝堣惃鍏嬭嚜娌诲窞", "0999"); + CITY_CODE_MAP.put("浣涘北", "0757"); + CITY_CODE_MAP.put("淇¢槼", "0376"); + CITY_CODE_MAP.put("鍏嬫媺鐜涗緷", "0990"); + CITY_CODE_MAP.put("鍏畨", "0564"); + CITY_CODE_MAP.put("鍏板窞", "0931"); + CITY_CODE_MAP.put("鍏村畨鐩�", "0482"); + CITY_CODE_MAP.put("鍑夊北褰濇棌鑷不宸�", "0834"); + CITY_CODE_MAP.put("鍗楀厖", "0817"); + CITY_CODE_MAP.put("鍗楀钩", "0599"); + CITY_CODE_MAP.put("鍗楅槼", "0377"); + CITY_CODE_MAP.put("鍗氬皵濉旀媺钂欏彜鑷不宸�", "0909"); + CITY_CODE_MAP.put("鍙岄腑灞�", "0469"); + CITY_CODE_MAP.put("鍚堣偉", "0551"); + CITY_CODE_MAP.put("鍚夊畨", "0796"); + CITY_CODE_MAP.put("鍚夋灄", "0432"); + CITY_CODE_MAP.put("鍚愰瞾鐣湴鍖�", "0995"); + CITY_CODE_MAP.put("鍚曟", "0358"); + CITY_CODE_MAP.put("鍚村繝", "0953"); + CITY_CODE_MAP.put("鍛ㄥ彛", "0394"); + CITY_CODE_MAP.put("鍛间鸡璐濆皵", "0470"); + CITY_CODE_MAP.put("鍛煎拰娴╃壒", "0471"); + CITY_CODE_MAP.put("鍜稿畞", "0715"); + CITY_CODE_MAP.put("鍟嗕笜", "0370"); + CITY_CODE_MAP.put("鍟嗘礇", "0914"); + CITY_CODE_MAP.put("鍢夊叴", "0573"); + CITY_CODE_MAP.put("鍥涘钩", "0434"); + CITY_CODE_MAP.put("濉斿煄鍦板尯", "0901"); + CITY_CODE_MAP.put("澶у叴瀹夊箔鍦板尯", "0457"); + CITY_CODE_MAP.put("澶у悓", "0352"); + CITY_CODE_MAP.put("澶у簡", "0459"); + CITY_CODE_MAP.put("澶х悊鐧芥棌鑷不宸�", "0872"); + CITY_CODE_MAP.put("澶╂按", "0938"); + CITY_CODE_MAP.put("澶╂触", "022"); + CITY_CODE_MAP.put("澶╅棬", "01728"); + CITY_CODE_MAP.put("澶師", "0351"); + CITY_CODE_MAP.put("濞勫簳", "0738"); + CITY_CODE_MAP.put("瀛濇劅", "0712"); + CITY_CODE_MAP.put("瀹佹尝", "0574"); + CITY_CODE_MAP.put("瀹夊簡", "0556"); + CITY_CODE_MAP.put("瀹夊悍", "0915"); + CITY_CODE_MAP.put("瀹夐槼", "0372"); + CITY_CODE_MAP.put("瀹夐『", "0853"); + CITY_CODE_MAP.put("瀹氳タ", "0932"); + CITY_CODE_MAP.put("瀹滄槬", "0795"); + CITY_CODE_MAP.put("瀹濋浮", "0917"); + CITY_CODE_MAP.put("瀹e煄", "0563"); + CITY_CODE_MAP.put("瀹垮窞", "0557"); + CITY_CODE_MAP.put("瀹胯縼", "0527"); + CITY_CODE_MAP.put("灞卞崡鍦板尯", "0893"); + CITY_CODE_MAP.put("宕囧乏", "01771"); + CITY_CODE_MAP.put("宸㈡箹", "0565"); + CITY_CODE_MAP.put("宸翠腑", "0827"); + CITY_CODE_MAP.put("骞冲噳", "0933"); + CITY_CODE_MAP.put("骞抽《灞�", "0375"); + CITY_CODE_MAP.put("骞垮厓", "0839"); + CITY_CODE_MAP.put("骞垮畨", "0826"); + CITY_CODE_MAP.put("搴嗛槼", "0934"); + CITY_CODE_MAP.put("寮�灏�", "0378"); + CITY_CODE_MAP.put("寮犲鍙�", "0313"); + CITY_CODE_MAP.put("寮犲鐣�", "0744"); + CITY_CODE_MAP.put("寮犳帠", "0936"); + CITY_CODE_MAP.put("寰峰窞", "0534"); + CITY_CODE_MAP.put("寰烽槼", "0838"); + CITY_CODE_MAP.put("蹇诲窞", "0350"); + CITY_CODE_MAP.put("鎬�鍖�", "0745"); + CITY_CODE_MAP.put("鎭╂柦鍦熷鏃忚嫍鏃忚嚜娌诲窞", "0718"); + CITY_CODE_MAP.put("鎯犲窞", "0752"); + CITY_CODE_MAP.put("鎶氬窞", "0794"); + CITY_CODE_MAP.put("鎷夎惃", "0891"); + CITY_CODE_MAP.put("鏀�鏋濊姳", "0812"); + CITY_CODE_MAP.put("鏂颁綑", "0790"); + CITY_CODE_MAP.put("鏃犻敗", "0510"); + CITY_CODE_MAP.put("鏃ュ杸鍒欏湴鍖�", "0892"); + CITY_CODE_MAP.put("鏃ョ収", "0633"); + CITY_CODE_MAP.put("鏄嗘槑", "0871"); + CITY_CODE_MAP.put("鏄屽悏鍥炴棌鑷不宸�", "0994"); + CITY_CODE_MAP.put("鏄��", "0870"); + CITY_CODE_MAP.put("鏅嬩腑", "0354"); + CITY_CODE_MAP.put("鏅嬪煄", "0356"); + CITY_CODE_MAP.put("鏇查潠", "0874"); + CITY_CODE_MAP.put("鏈斿窞", "0349"); + CITY_CODE_MAP.put("鏈濋槼", "0421"); + CITY_CODE_MAP.put("鏉ュ", "01772"); + CITY_CODE_MAP.put("鏉惧師", "0438"); + CITY_CODE_MAP.put("鏋e簞", "0632"); + CITY_CODE_MAP.put("鏌冲窞", "0772"); + CITY_CODE_MAP.put("姊呭窞", "0753"); + CITY_CODE_MAP.put("姊у窞", "0774"); + CITY_CODE_MAP.put("妤氶泟褰濇棌鑷不宸�", "0878"); + CITY_CODE_MAP.put("姒嗘灄", "0912"); + CITY_CODE_MAP.put("姝﹀▉", "01935"); + CITY_CODE_MAP.put("姣曡妭鍦板尯", "0857"); + CITY_CODE_MAP.put("姘稿窞", "0746"); + CITY_CODE_MAP.put("姹変腑", "0916"); + CITY_CODE_MAP.put("姹犲窞", "0566"); + CITY_CODE_MAP.put("娌堥槼", "024"); + CITY_CODE_MAP.put("娌у窞", "0317"); + CITY_CODE_MAP.put("娌虫睜", "0778"); + CITY_CODE_MAP.put("娌虫簮", "0762"); + CITY_CODE_MAP.put("娉板畨", "0538"); + CITY_CODE_MAP.put("娉板窞", "0523"); + CITY_CODE_MAP.put("娴庡畞", "0537"); + CITY_CODE_MAP.put("娴庢簮", "01391"); + CITY_CODE_MAP.put("娴蜂笢鍦板尯", "0972"); + CITY_CODE_MAP.put("娴峰寳钘忔棌鑷不宸�", "0970"); + CITY_CODE_MAP.put("娴峰崡钘忔棌鑷不宸�", "0974"); + CITY_CODE_MAP.put("娴峰彛", "0898"); + CITY_CODE_MAP.put("娣勫崥", "0533"); + CITY_CODE_MAP.put("娣寳", "0561"); + CITY_CODE_MAP.put("娣崡", "0554"); + CITY_CODE_MAP.put("娣畨", "0517"); + CITY_CODE_MAP.put("娓呰繙", "0763"); + CITY_CODE_MAP.put("娓崡", "0913"); + CITY_CODE_MAP.put("婀樿タ鍦熷鏃忚嫍鏃忚嚜娌诲窞", "0743"); + CITY_CODE_MAP.put("婊佸窞", "0550"); + CITY_CODE_MAP.put("婊ㄥ窞", "0543"); + CITY_CODE_MAP.put("婕渤", "0395"); + CITY_CODE_MAP.put("娼嶅潑", "0536"); + CITY_CODE_MAP.put("娼滄睙", "02728"); + CITY_CODE_MAP.put("娼窞", "0768"); + CITY_CODE_MAP.put("婵槼", "0393"); + CITY_CODE_MAP.put("鐑熷彴", "0535"); + CITY_CODE_MAP.put("鐒︿綔", "0391"); + CITY_CODE_MAP.put("鐗′腹姹�", "0453"); + CITY_CODE_MAP.put("鐜夋灄", "0775"); + CITY_CODE_MAP.put("鐜夋邯", "0877"); + CITY_CODE_MAP.put("鐢樺瓬钘忔棌鑷不宸�", "0836"); + CITY_CODE_MAP.put("鐧藉煄", "0436"); + CITY_CODE_MAP.put("鐧藉北", "0439"); + CITY_CODE_MAP.put("鐧介摱", "0943"); + CITY_CODE_MAP.put("鐩婇槼", "0737"); + CITY_CODE_MAP.put("鐩愬煄", "0515"); + CITY_CODE_MAP.put("鐩橀敠", "0427"); + CITY_CODE_MAP.put("鐭冲槾灞�", "0952"); + CITY_CODE_MAP.put("鐭冲搴�", "0311"); + CITY_CODE_MAP.put("鐭虫渤瀛�", "0993"); + CITY_CODE_MAP.put("绁炲啘鏋舵灄鍖�", "01719"); + CITY_CODE_MAP.put("绾㈡渤鍝堝凹鏃忓綕鏃忚嚜娌诲窞", "0873"); + CITY_CODE_MAP.put("缁嶅叴", "0575"); + CITY_CODE_MAP.put("缁ュ寲", "0455"); + CITY_CODE_MAP.put("缁甸槼", "0816"); + CITY_CODE_MAP.put("鑱婂煄", "0635"); + CITY_CODE_MAP.put("鑲囧簡", "0758"); + CITY_CODE_MAP.put("鑸熷北", "0580"); + CITY_CODE_MAP.put("鑺滄箹", "0553"); + CITY_CODE_MAP.put("鑽嗗窞", "0716"); + CITY_CODE_MAP.put("鑾辫姕", "0634"); + CITY_CODE_MAP.put("鑿忔辰", "0530"); + CITY_CODE_MAP.put("钀嶄埂", "0799"); + CITY_CODE_MAP.put("钀ュ彛", "0417"); + CITY_CODE_MAP.put("琛℃按", "0318"); + CITY_CODE_MAP.put("琛¢槼", "0734"); + CITY_CODE_MAP.put("琛㈠窞", "0570"); + CITY_CODE_MAP.put("瑗垮弻鐗堢撼鍌f棌鑷不宸�", "0691"); + CITY_CODE_MAP.put("瑗垮畞", "0971"); + CITY_CODE_MAP.put("瑗垮畨", "029"); + CITY_CODE_MAP.put("璁告槍", "0374"); + CITY_CODE_MAP.put("璐垫腐", "01755"); + CITY_CODE_MAP.put("璐哄窞", "01774"); + CITY_CODE_MAP.put("璧勯槼", "0832"); + CITY_CODE_MAP.put("璧e窞", "0797"); + CITY_CODE_MAP.put("璧ゅ嘲", "0476"); + CITY_CODE_MAP.put("杈芥簮", "0437"); + CITY_CODE_MAP.put("杈惧窞", "0818"); + CITY_CODE_MAP.put("杩愬煄", "0359"); + CITY_CODE_MAP.put("杩炰簯娓�", "0518"); + CITY_CODE_MAP.put("閫氬寲", "0435"); + CITY_CODE_MAP.put("閫氳窘", "0475"); + CITY_CODE_MAP.put("閬傚畞", "0825"); + CITY_CODE_MAP.put("閬典箟", "0852"); + CITY_CODE_MAP.put("閭㈠彴", "0319"); + CITY_CODE_MAP.put("閭兏", "0310"); + CITY_CODE_MAP.put("閭甸槼", "0739"); + CITY_CODE_MAP.put("閮戝窞", "0371"); + CITY_CODE_MAP.put("閮村窞", "0735"); + CITY_CODE_MAP.put("閯傚皵澶氭柉", "0477"); + CITY_CODE_MAP.put("閯傚窞", "0711"); + CITY_CODE_MAP.put("閰掓硥", "0937"); + CITY_CODE_MAP.put("閲戝崕", "0579"); + CITY_CODE_MAP.put("閲戞槍", "0935"); + CITY_CODE_MAP.put("閽﹀窞", "0777"); + CITY_CODE_MAP.put("閾佸箔", "0410"); + CITY_CODE_MAP.put("閾滀粊鍦板尯", "0856"); + CITY_CODE_MAP.put("閾滃窛", "0919"); + CITY_CODE_MAP.put("閾滈櫟", "0562"); + CITY_CODE_MAP.put("閾跺窛", "0951"); + CITY_CODE_MAP.put("閿﹀窞", "0416"); + CITY_CODE_MAP.put("闀挎不", "0355"); + CITY_CODE_MAP.put("闃滄柊", "0418"); + CITY_CODE_MAP.put("闃滈槼", "01558"); + CITY_CODE_MAP.put("闃虫硥", "0353"); + CITY_CODE_MAP.put("闃垮潩钘忔棌缇屾棌鑷不宸�", "0837"); + CITY_CODE_MAP.put("闄囧崡", "02935"); + CITY_CODE_MAP.put("闅忓窞", "0722"); + CITY_CODE_MAP.put("闆呭畨", "0835"); + CITY_CODE_MAP.put("闊跺叧", "0751"); + CITY_CODE_MAP.put("椹瀺灞�", "0555"); + CITY_CODE_MAP.put("椹婚┈搴�", "0396"); + CITY_CODE_MAP.put("楦¤タ", "0467"); + CITY_CODE_MAP.put("楣ゅ", "0392"); + CITY_CODE_MAP.put("楣ゅ矖", "0468"); + CITY_CODE_MAP.put("楣版江", "0701"); + CITY_CODE_MAP.put("榛勫唸", "0713"); + CITY_CODE_MAP.put("榛戞渤", "0456"); + CITY_CODE_MAP.put("榛斾笢鍗楄嫍鏃忎緱鏃忚嚜娌诲窞", "0855"); + CITY_CODE_MAP.put("榛斿崡甯冧緷鏃忚嫍鏃忚嚜娌诲窞", "0854"); + CITY_CODE_MAP.put("榻愰綈鍝堝皵", "0452"); + CITY_CODE_MAP.put("榫欏博", "0597"); + CITY_CODE_MAP.put("鐢樺崡钘忔棌鑷不宸�", "0941"); + CITY_CODE_MAP.put("鍢夊唱鍏�", "1937"); + CITY_CODE_MAP.put("鐧捐壊", "0776"); + CITY_CODE_MAP.put("鍏洏姘�", "0858"); + CITY_CODE_MAP.put("榛旇タ鍗楀竷渚濇棌鑻楁棌鑷不宸�", "0859"); + CITY_CODE_MAP.put("鐧芥矙榛庢棌鑷不鍘�", "0802"); + CITY_CODE_MAP.put("淇濅涵榛庢棌鑻楁棌鑷不鍘�", "0801"); + CITY_CODE_MAP.put("鏄屾睙榛庢棌鑷不鍘�", "0803"); + CITY_CODE_MAP.put("婢勮繄鍘�", "0804"); + CITY_CODE_MAP.put("瀹氬畨鍘�", "0806"); + CITY_CODE_MAP.put("涓滄柟", "0807"); + CITY_CODE_MAP.put("涓滄矙缇ゅ矝", "0808"); + CITY_CODE_MAP.put("涔愪笢榛庢棌鑷不鍘�", "2802"); + CITY_CODE_MAP.put("涓撮珮鍘�", "1896"); + CITY_CODE_MAP.put("闄垫按榛庢棌鑷不鍘�", "0809"); + CITY_CODE_MAP.put("鍗楁矙缇ゅ矝", "1891"); + CITY_CODE_MAP.put("鐞兼捣", "1894"); + CITY_CODE_MAP.put("鐞间腑榛庢棌鑻楁棌鑷不鍘�", "1899"); + CITY_CODE_MAP.put("灞槍鍘�", "1892"); + CITY_CODE_MAP.put("涓囧畞", "1898"); + CITY_CODE_MAP.put("鏂囨槍", "1893"); + CITY_CODE_MAP.put("浜旀寚灞�", "1897"); + CITY_CODE_MAP.put("瑗挎矙缇ゅ矝", "1895"); + CITY_CODE_MAP.put("涓矙缇ゅ矝", "2801"); + CITY_CODE_MAP.put("鍎嬪窞", "0805"); + CITY_CODE_MAP.put("闃挎媺鍠勭洘", "0483"); + CITY_CODE_MAP.put("宸村溅娣栧皵甯�", "0478"); + CITY_CODE_MAP.put("閿℃灄閮嫆鐩�", "0479"); + CITY_CODE_MAP.put("鍥哄師", "0954"); + CITY_CODE_MAP.put("鏋滄礇钘忔棌鑷不宸�", "0975"); + CITY_CODE_MAP.put("娴疯タ钂欏彜鏃忚棌鏃忚嚜娌诲窞", "0977"); + CITY_CODE_MAP.put("榛勫崡钘忔棌鑷不宸�", "0973"); + CITY_CODE_MAP.put("鐜夋爲钘忔棌鑷不宸�", "0976"); + CITY_CODE_MAP.put("闃块噷鍦板尯", "0897"); + CITY_CODE_MAP.put("鏄岄兘鍦板尯", "0895"); + CITY_CODE_MAP.put("鏋楄姖鍦板尯", "0894"); + CITY_CODE_MAP.put("閭f洸鍦板尯", "0896"); + CITY_CODE_MAP.put("闃垮厠鑻忓湴鍖�", "0997"); + CITY_CODE_MAP.put("闃垮嫆娉板湴鍖�", "0906"); + CITY_CODE_MAP.put("宸撮煶閮钂欏彜鑷不宸�", "0996"); + CITY_CODE_MAP.put("鍝堝瘑鍦板尯", "0902"); + CITY_CODE_MAP.put("鍜岀敯鍦板尯", "0903"); + CITY_CODE_MAP.put("鍠�浠�鍦板尯", "0998"); + CITY_CODE_MAP.put("鍏嬪瓬鍕掕嫃鏌皵鍏嬪瓬鑷不宸�", "0908"); + CITY_CODE_MAP.put("淇濆北", "0875"); + CITY_CODE_MAP.put("寰峰畯鍌f棌鏅鏃忚嚜娌诲窞", "0692"); + CITY_CODE_MAP.put("杩簡钘忔棌鑷不宸�", "0887"); + CITY_CODE_MAP.put("涓芥睙", "0888"); + CITY_CODE_MAP.put("涓存钵甯�", "0883"); + CITY_CODE_MAP.put("鎬掓睙鍌堝兂鏃忚嚜娌诲窞", "0886"); + CITY_CODE_MAP.put("鏅幢", "0879"); + CITY_CODE_MAP.put("鏂囧北澹棌鑻楁棌鑷不宸�", "0876"); + CITY_CODE_MAP.put("棣欐腐", "1852"); + CITY_CODE_MAP.put("婢抽棬", "1853"); + CITY_CODE_MAP.put("浜斿娓犲競", "652300"); + CITY_CODE_MAP.put("闃挎媺灏斿競", "652900"); + CITY_CODE_MAP.put("鍥炬湪鑸掑厠甯�", "653000"); } } diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/util/BaiDuApiUtils.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/util/BaiDuApiUtils.java index ac85f7e82..0588db6bc 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/util/BaiDuApiUtils.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/util/BaiDuApiUtils.java @@ -7,7 +7,7 @@ import java.util.HashMap; import java.util.Map; /** - * 百度API服务调用工具类 + * 鐧惧害API鏈嶅姟璋冪敤宸ュ叿绫� * Created by wenyan on 2015/4/15. */ public class BaiDuApiUtils { @@ -17,13 +17,13 @@ public class BaiDuApiUtils { private static final String DOMAIN = "http://api.map.baidu.com/place/v2/"; /** - * 区域检索POI服务 - * @param region 城市或者区域 - * @param query 检索关键字 - * @param tag 标签项 例如:住宅区,小区,别墅,别墅,写字楼 - * @param scope 检索结果详细程度 1:基本信息 2:详细信息 - * @param pageSize 每页最大记录数 - * @param pageNum 分页页码 0 1 2 ... + * 鍖哄煙妫�绱OI鏈嶅姟 + * @param region 鍩庡競鎴栬�呭尯鍩� + * @param query 妫�绱㈠叧閿瓧 + * @param tag 鏍囩椤� 渚嬪:浣忓畢鍖�,灏忓尯,鍒,鍒,鍐欏瓧妤� + * @param scope 妫�绱㈢粨鏋滆缁嗙▼搴� 1:鍩烘湰淇℃伅 2:璇︾粏淇℃伅 + * @param pageSize 姣忛〉鏈�澶ц褰曟暟 + * @param pageNum 鍒嗛〉椤电爜 0 1 2 ... * @return */ public static JSONObject search(String region,String query , String tag ,int scope,Integer pageSize,Integer pageNum){ @@ -57,7 +57,7 @@ public class BaiDuApiUtils { return null; } /** - * 获取该城市范围内经纬度所在的区域 + * 鑾峰彇璇ュ煄甯傝寖鍥村唴缁忕含搴︽墍鍦ㄧ殑鍖哄煙 * @param city * @param lng * @param lat @@ -88,7 +88,7 @@ public class BaiDuApiUtils { if(geoResult.containsKey("addressComponent")){ String city = geoResult.getJSONObject("addressComponent").getString("city"); if(StringUtils.isNotBlank(city)) { - if(city.endsWith("市")) { + if(city.endsWith("甯�")) { return city.substring(0, city.length() - 1); }else { return city; @@ -103,7 +103,7 @@ public class BaiDuApiUtils { /** - * 提供从地址到经纬度坐标或者从经纬度坐标到地址的转换服务 + * 鎻愪緵浠庡湴鍧�鍒扮粡绾害鍧愭爣鎴栬�呬粠缁忕含搴﹀潗鏍囧埌鍦板潃鐨勮浆鎹㈡湇鍔� * @param location * @param address * @return @@ -135,7 +135,7 @@ public class BaiDuApiUtils { } public static void changeAK(){ - System.out.println("更换AK"); + System.out.println("鏇存崲AK"); for(int i = 0 ;i < AKS.length; i++){ if(i == AKS.length - 1){ AK = AKS[0]; diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/util/BeanUtils.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/util/BeanUtils.java index 2527f0530..e68ac00f6 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/util/BeanUtils.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/util/BeanUtils.java @@ -14,7 +14,7 @@ import com.mongodb.BasicDBObject; import com.mongodb.DBObject; /** - * 工具类 复制属性 + * 宸ュ叿绫� 澶嶅埗灞炴�� * * @author yinjihuan * diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/util/DesUtils.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/util/DesUtils.java index 69467c73f..1de85385c 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/util/DesUtils.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/util/DesUtils.java @@ -19,9 +19,9 @@ public class DesUtils { private final static String DES = "DES"; /** - * Description 根据键值进行加密 + * Description 鏍规嵁閿�艰繘琛屽姞瀵� * @param data - * @param key 加密键byte数组 + * @param key 鍔犲瘑閿産yte鏁扮粍 * @return * @throws Exception */ @@ -32,9 +32,9 @@ public class DesUtils { } /** - * Description 根据键值进行解密 + * Description 鏍规嵁閿�艰繘琛岃В瀵� * @param data - * @param key 加密键byte数组 + * @param key 鍔犲瘑閿産yte鏁扮粍 * @return * @throws IOException * @throws Exception @@ -50,27 +50,27 @@ public class DesUtils { } /** - * Description 根据键值进行加密 + * Description 鏍规嵁閿�艰繘琛屽姞瀵� * @param data - * @param key 加密键byte数组 + * @param key 鍔犲瘑閿産yte鏁扮粍 * @return * @throws Exception */ private static byte[] encrypt(byte[] data, byte[] key) throws Exception { - // 生成一个可信任的随机数源 + // 鐢熸垚涓�涓彲淇′换鐨勯殢鏈烘暟婧� SecureRandom sr = new SecureRandom(); - // 从原始密钥数据创建DESKeySpec对象 + // 浠庡師濮嬪瘑閽ユ暟鎹垱寤篋ESKeySpec瀵硅薄 DESKeySpec dks = new DESKeySpec(key); - // 创建一个密钥工厂,然后用它把DESKeySpec转换成SecretKey对象 + // 鍒涘缓涓�涓瘑閽ュ伐鍘傦紝鐒跺悗鐢ㄥ畠鎶奃ESKeySpec杞崲鎴怱ecretKey瀵硅薄 SecretKeyFactory keyFactory = SecretKeyFactory.getInstance(DES); SecretKey securekey = keyFactory.generateSecret(dks); - // Cipher对象实际完成加密操作 + // Cipher瀵硅薄瀹為檯瀹屾垚鍔犲瘑鎿嶄綔 Cipher cipher = Cipher.getInstance(DES); - // 用密钥初始化Cipher对象 + // 鐢ㄥ瘑閽ュ垵濮嬪寲Cipher瀵硅薄 cipher.init(Cipher.ENCRYPT_MODE, securekey, sr); return cipher.doFinal(data); @@ -78,27 +78,27 @@ public class DesUtils { /** - * Description 根据键值进行解密 + * Description 鏍规嵁閿�艰繘琛岃В瀵� * @param data - * @param key 加密键byte数组 + * @param key 鍔犲瘑閿産yte鏁扮粍 * @return * @throws Exception */ private static byte[] decrypt(byte[] data, byte[] key) throws Exception { - // 生成一个可信任的随机数源 + // 鐢熸垚涓�涓彲淇′换鐨勯殢鏈烘暟婧� SecureRandom sr = new SecureRandom(); - // 从原始密钥数据创建DESKeySpec对象 + // 浠庡師濮嬪瘑閽ユ暟鎹垱寤篋ESKeySpec瀵硅薄 DESKeySpec dks = new DESKeySpec(key); - // 创建一个密钥工厂,然后用它把DESKeySpec转换成SecretKey对象 + // 鍒涘缓涓�涓瘑閽ュ伐鍘傦紝鐒跺悗鐢ㄥ畠鎶奃ESKeySpec杞崲鎴怱ecretKey瀵硅薄 SecretKeyFactory keyFactory = SecretKeyFactory.getInstance(DES); SecretKey securekey = keyFactory.generateSecret(dks); - // Cipher对象实际完成解密操作 + // Cipher瀵硅薄瀹為檯瀹屾垚瑙e瘑鎿嶄綔 Cipher cipher = Cipher.getInstance(DES); - // 用密钥初始化Cipher对象 + // 鐢ㄥ瘑閽ュ垵濮嬪寲Cipher瀵硅薄 cipher.init(Cipher.DECRYPT_MODE, securekey, sr); return cipher.doFinal(data); @@ -106,7 +106,7 @@ public class DesUtils { /** - * Description 获取字符串MD5值 + * Description 鑾峰彇瀛楃涓睲D5鍊� * @param sourceStr */ private static String MD5(String sourceStr) { @@ -137,12 +137,12 @@ public class DesUtils { public static void main(String[] args) throws Exception { String data = "18616348076_1234561"; - String key = "fangjia_pds_goojia"; //秘钥 + String key = "fangjia_pds_goojia"; //绉橀挜 String encode = encrypt(data, key); - System.err.println("加密:"+encode); - System.err.println("加密encode:"+URLEncoder.encode(encode, "utf-8")); - System.err.println("加密decode:"+URLDecoder.decode(URLEncoder.encode(encode, "utf-8"), "utf-8")); + System.err.println("鍔犲瘑锛�"+encode); + System.err.println("鍔犲瘑encode锛�"+URLEncoder.encode(encode, "utf-8")); + System.err.println("鍔犲瘑decode锛�"+URLDecoder.decode(URLEncoder.encode(encode, "utf-8"), "utf-8")); String dcode = decrypt(encode, key); - System.err.println("解密:"+dcode); + System.err.println("瑙e瘑锛�"+dcode); } } diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/util/FieldUtils.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/util/FieldUtils.java index bf272df3a..33d85b501 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/util/FieldUtils.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/util/FieldUtils.java @@ -10,34 +10,34 @@ public class FieldUtils { if (estateType != null) { - if (estateType.indexOf("购物") > -1) { - map.put("error", "类型不正确,不是小区类型"); + if (estateType.indexOf("璐墿") > -1) { + map.put("error", "绫诲瀷涓嶆纭�,涓嶆槸灏忓尯绫诲瀷"); } - if (estateType.indexOf("小区") == -1 && estateType.indexOf("别墅") == -1 && estateType.indexOf("公寓") == -1 && estateType.indexOf("住宅") == -1) { - if (estateType.indexOf("写字楼") > -1 || estateType.indexOf("商铺") > -1) { - map.put("error", "类型不正确,不是小区类型"); + if (estateType.indexOf("灏忓尯") == -1 && estateType.indexOf("鍒") == -1 && estateType.indexOf("鍏瘬") == -1 && estateType.indexOf("浣忓畢") == -1) { + if (estateType.indexOf("鍐欏瓧妤�") > -1 || estateType.indexOf("鍟嗛摵") > -1) { + map.put("error", "绫诲瀷涓嶆纭�,涓嶆槸灏忓尯绫诲瀷"); } }else{ - if (estateType.indexOf("别墅") != -1){ - map.put("estate_type", "别墅"); - }else if(estateType.indexOf("小区") != -1 || estateType.indexOf("住宅") != -1 || estateType.indexOf("公寓") != -1){ - map.put("estate_type", "住宅"); + if (estateType.indexOf("鍒") != -1){ + map.put("estate_type", "鍒"); + }else if(estateType.indexOf("灏忓尯") != -1 || estateType.indexOf("浣忓畢") != -1 || estateType.indexOf("鍏瘬") != -1){ + map.put("estate_type", "浣忓畢"); }else{ - map.put("estate_type", "其它"); + map.put("estate_type", "鍏跺畠"); } } } - if (name.indexOf("写字楼") > -1 || name.indexOf("商铺") > -1 || name.indexOf("商业广场") > -1) { - map.put("error", "类型不正确,不是小区类型"); + if (name.indexOf("鍐欏瓧妤�") > -1 || name.indexOf("鍟嗛摵") > -1 || name.indexOf("鍟嗕笟骞垮満") > -1) { + map.put("error", "绫诲瀷涓嶆纭�,涓嶆槸灏忓尯绫诲瀷"); } return map; } public static Map getBuildTypeStandard(String buildType){ String s = ""; - String[] buildTypes = {"多层","小高层","高层","超高层","独栋","双拼","联排","叠加"}; + String[] buildTypes = {"澶氬眰","灏忛珮灞�","楂樺眰","瓒呴珮灞�","鐙爧","鍙屾嫾","鑱旀帓","鍙犲姞"}; Map map = new HashMap(); for(String type : buildTypes){ @@ -51,9 +51,9 @@ public class FieldUtils { buildType = buildType.replace(type, ""); } } - buildType = buildType.replace(" ", "").replace(",", ""); + buildType = buildType.replace(" ", "").replace("锛�", ""); if(buildType.length() > 0){ - map.put("error", "建筑类型不匹配"); + map.put("error", "寤虹瓚绫诲瀷涓嶅尮閰�"); } map.put("build_type", s); return map; @@ -62,12 +62,12 @@ public class FieldUtils { public static Map getEstateChargeStandard(String estateCharge){ Map map = new HashMap(); if(isNumeric(estateCharge)){ - estateCharge = estateCharge.trim() + "元/平米/月"; + estateCharge = estateCharge.trim() + "鍏�/骞崇背/鏈�"; }else{ - if(estateCharge.indexOf("元")!=-1){ - estateCharge = estateCharge.substring(0, estateCharge.indexOf("元")).trim() + "元/平米/月"; + if(estateCharge.indexOf("鍏�")!=-1){ + estateCharge = estateCharge.substring(0, estateCharge.indexOf("鍏�")).trim() + "鍏�/骞崇背/鏈�"; }else{ - map.put("error", "物业费用格式不匹配"); + map.put("error", "鐗╀笟璐圭敤鏍煎紡涓嶅尮閰�"); } } @@ -90,16 +90,16 @@ public class FieldUtils { if(isNumeric(area)){ int t_area = Integer.parseInt(area); float tempArea = t_area/10000; - area = tempArea + "万平方"; + area = tempArea + "涓囧钩鏂�"; }else{ - if(area.indexOf("平方")!=-1){ - area = area.substring(0, area.indexOf("万")+1) + "平方"; - }else if(area.indexOf("万")!=-1){ + if(area.indexOf("骞虫柟")!=-1){ + area = area.substring(0, area.indexOf("涓�")+1) + "骞虫柟"; + }else if(area.indexOf("涓�")!=-1){ int t_area = Integer.parseInt(area); float tempArea = t_area/10000; - area = tempArea + "万平方"; + area = tempArea + "涓囧钩鏂�"; }else{ - map.put("error", field.equals("build_area")?"建筑面积":"占地面积" +"格式不匹配"); + map.put("error", field.equals("build_area")?"寤虹瓚闈㈢Н":"鍗犲湴闈㈢Н" +"鏍煎紡涓嶅尮閰�"); } } @@ -113,7 +113,7 @@ public class FieldUtils { float percent = Float.parseFloat(cubagePercent); map.put("cubage_percent", cubagePercent); }catch(Exception e){ - map.put("error", "空积率用格式不匹配"); + map.put("error", "绌虹Н鐜囩敤鏍煎紡涓嶅尮閰�"); } return map; @@ -132,7 +132,7 @@ public class FieldUtils { map.put("virescence_percent", virescencePercent+"%"); } }else{ - map.put("error", "绿化率用格式不匹配"); + map.put("error", "缁垮寲鐜囩敤鏍煎紡涓嶅尮閰�"); } return map; } diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/util/InfoTestUtil.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/util/InfoTestUtil.java index 7276a3d84..1b9a77f6c 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/util/InfoTestUtil.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/util/InfoTestUtil.java @@ -16,40 +16,40 @@ import org.jsoup.nodes.Document; public class InfoTestUtil { private final static List fitment = new ArrayList( - Arrays.asList("装修", "装修情况", "装修程度", "房屋情况")); + Arrays.asList("瑁呬慨", "瑁呬慨鎯呭喌", "瑁呬慨绋嬪害", "鎴垮眿鎯呭喌")); private final static List totalPrice = new ArrayList( - Arrays.asList("总价", "出售价格", "售价", "到手价", "出售总价", "房价", "价格", "房源价格")); + Arrays.asList("鎬讳环", "鍑哄敭浠锋牸", "鍞环", "鍒版墜浠�", "鍑哄敭鎬讳环", "鎴夸环", "浠锋牸", "鎴挎簮浠锋牸")); private final static List roomHallToilet = new ArrayList( - Arrays.asList("户型", "房型", "房型面积")); + Arrays.asList("鎴峰瀷", "鎴垮瀷", "鎴垮瀷闈㈢Н")); private final static List area = new ArrayList( - Arrays.asList("建筑面积", "面积","产权面积","产证面积")); + Arrays.asList("寤虹瓚闈㈢Н", "闈㈢Н","浜ф潈闈㈢Н","浜ц瘉闈㈢Н")); private final static List floorHeight = new ArrayList( - Arrays.asList("楼层", "楼栋", "所在楼层", "所在层数", "房屋楼层")); + Arrays.asList("妤煎眰", "妤兼爧", "鎵�鍦ㄦゼ灞�", "鎵�鍦ㄥ眰鏁�", "鎴垮眿妤煎眰")); private final static List direction = new ArrayList( - Arrays.asList("朝向", "房屋朝向", "概况")); + Arrays.asList("鏈濆悜", "鎴垮眿鏈濆悜", "姒傚喌")); private final static List fitmentcontent = new ArrayList( - Arrays.asList("毛坯", "简装修", "中装修", "精装修", "豪华装修", "精装", "豪装", - "一般装修", "普通装修", "无装修", "中等装修", "毛坯房", "中装")); + Arrays.asList("姣涘澂", "绠�瑁呬慨", "涓淇�", "绮捐淇�", "璞崕瑁呬慨", "绮捐", "璞", + "涓�鑸淇�", "鏅�氳淇�", "鏃犺淇�", "涓瓑瑁呬慨", "姣涘澂鎴�", "涓")); private static Map infoMap; - private static String key = "房型面积"; + private static String key = "鎴垮瀷闈㈢Н"; /** - * 关键字 + * 鍏抽敭瀛� * * @author yk * */ public enum keyword { - fitment("装修"), area("面积"), floorHeight("楼层"), roomHallToilet("户型"), direction( - "朝向"), totalPrice("总价"); + fitment("瑁呬慨"), area("闈㈢Н"), floorHeight("妤煎眰"), roomHallToilet("鎴峰瀷"), direction( + "鏈濆悜"), totalPrice("鎬讳环"); private final String value; @@ -63,13 +63,13 @@ public class InfoTestUtil { } /** - * 室厅卫 + * 瀹ゅ巺鍗� * * @author yk * */ public enum roomHallToiletType { - room("室"), room2("房"), hall("厅"), toilet("卫"); + room("瀹�"), room2("鎴�"), hall("鍘�"), toilet("鍗�"); private final String value; @@ -93,7 +93,7 @@ public class InfoTestUtil { byte bytes[] = { (byte) 0xC2, (byte) 0xA0 }; String UTFSpace = new String(bytes, "utf-8"); arr[i] = arr[i].replaceAll(UTFSpace, ""); - arr[i].replaceAll(" | | ", ""); + arr[i].replaceAll(" | |銆�", ""); if (arr[i].contains("[")) { arr[i] = ""; } @@ -112,7 +112,7 @@ public class InfoTestUtil { } /** - * 最后处理数据 + * 鏈�鍚庡鐞嗘暟鎹� * @param infoMap2 */ private static void dealMap(Map infoMap2) { @@ -175,7 +175,7 @@ public class InfoTestUtil { Matcher matcher = pattern.matcher(text1); while (matcher.find()) { infoMap.put("floor", matcher.group(0)); - System.out.print("所在楼层:" + matcher.group(0) + "\n"); + System.out.print("鎵�鍦ㄦゼ灞傦細" + matcher.group(0) + "\n"); } String text2 = floorHeightStr.substring(i + 1, floorHeightStr.indexOf(")")); @@ -184,7 +184,7 @@ public class InfoTestUtil { while (matcher2.find()) { // list.add(matcher.group(0)); infoMap.put("height", matcher2.group(0)); - System.out.print("总楼层:" + matcher2.group(0) + "\n"); + System.out.print("鎬绘ゼ灞傦細" + matcher2.group(0) + "\n"); } } else { Pattern pattern = Pattern.compile("\\d+"); @@ -194,37 +194,37 @@ public class InfoTestUtil { list.add(matcher.group(0)); } if (list.size() == 1) { - System.out.print("所在楼层" + list.get(0) + "\n"); + System.out.print("鎵�鍦ㄦゼ灞�" + list.get(0) + "\n"); infoMap.put("floor", list.get(0)); } if (list.size() == 2) { - System.out.print("所在楼层" + list.get(0) + "\n"); + System.out.print("鎵�鍦ㄦゼ灞�" + list.get(0) + "\n"); infoMap.put("floor", list.get(0)); - System.out.print("总楼层" + list.get(1) + "\n"); + System.out.print("鎬绘ゼ灞�" + list.get(1) + "\n"); infoMap.put("height", list.get(1)); } } } String area = infoMap.get(keyword.area.value); - if(area.contains("㎡")){ - infoMap.put("area", area.substring(0, area.indexOf("㎡"))); + if(area.contains("銕�")){ + infoMap.put("area", area.substring(0, area.indexOf("銕�"))); } - if(area.contains("平米")){ - infoMap.put("area", area.substring(0, area.indexOf("平米"))); + if(area.contains("骞崇背")){ + infoMap.put("area", area.substring(0, area.indexOf("骞崇背"))); } - if(area.contains("平方米")){ - infoMap.put("area", area.substring(0, area.indexOf("平方米"))); + if(area.contains("骞虫柟绫�")){ + infoMap.put("area", area.substring(0, area.indexOf("骞虫柟绫�"))); } infoMap.remove("roomHallToilet"); } /** - * 判断是否含有特殊字段 + * 鍒ゆ柇鏄惁鍚湁鐗规畩瀛楁 * @param keyContent */ private static void judgeContainKey(String keyContent) { if (keyContent.contains(key)) { - String[] txt = keyContent.split("㎡"); + String[] txt = keyContent.split("銕�"); if (txt.length >= 1) { String content = txt[0]; for (int j = 1; j < content.length() + 1; j++) { @@ -233,9 +233,9 @@ public class InfoTestUtil { String content2 = content.substring(length - j - 1, length); if (content1.matches("^\\d+$|^\\d+\\.\\d+$|-\\d+$") && !content2.matches("^\\d+$|^\\d+\\.\\d+$|-\\d+$")) { - infoMap.put(keyword.area.value, content1 + "㎡"); + infoMap.put(keyword.area.value, content1 + "銕�"); System.out.print(keyword.area.value + ":" + content1 - + "㎡" + "\n"); + + "銕�" + "\n"); infoMap.put(keyword.roomHallToilet.value, content.substring(5, length - j)); System.out.print(keyword.roomHallToilet.value + ":" @@ -248,38 +248,38 @@ public class InfoTestUtil { } /** - * 判断信息是否全 + * 鍒ゆ柇淇℃伅鏄惁鍏� * @param arr */ private static void judgeInfoIsFull(String[] arr) { if (infoMap.get("room") == null) { for (int i = 0; i < arr.length - 1; i++) { - if (arr[i].contains("室")&&!arr[i].contains("厅")) { + if (arr[i].contains("瀹�")&&!arr[i].contains("鍘�")) { infoMap.put("room", arr[i].substring(0, arr[i].length()-1)); - System.out.print("室" + ":"+ arr[i].substring(0, arr[i].length()-1) + "\n"); + System.out.print("瀹�" + ":"+ arr[i].substring(0, arr[i].length()-1) + "\n"); } } } if (infoMap.get("hall") == null) { for (int i = 0; i < arr.length - 1; i++) { - if (arr[i].contains("厅")&&!arr[i].contains("室")) { + if (arr[i].contains("鍘�")&&!arr[i].contains("瀹�")) { infoMap.put("hall", arr[i].substring(0, arr[i].length()-1)); - System.out.print("厅" + ":"+ arr[i].substring(0, arr[i].length()-1) + "\n"); + System.out.print("鍘�" + ":"+ arr[i].substring(0, arr[i].length()-1) + "\n"); } } } if (infoMap.get("toilet") == null) { for (int i = 0; i < arr.length - 1; i++) { - if (arr[i].contains("卫")&&!arr[i].contains("室")) { + if (arr[i].contains("鍗�")&&!arr[i].contains("瀹�")) { infoMap.put("toilet", arr[i].substring(0, arr[i].length()-1)); - System.out.print("卫" + ":"+ arr[i].substring(0, arr[i].length()-1) + "\n"); + System.out.print("鍗�" + ":"+ arr[i].substring(0, arr[i].length()-1) + "\n"); } } } if (infoMap.get(keyword.area.value) == null) { for (int i = 0; i < arr.length - 1; i++) { - if (arr[i].contains("㎡")) { - String[] number = arr[i].split("㎡"); + if (arr[i].contains("銕�")) { + String[] number = arr[i].split("銕�"); if (number.length >= 1) { boolean result = number[0].matches("[0-9]+"); if (result == true) { @@ -291,9 +291,9 @@ public class InfoTestUtil { boolean result = arr[i - 1] .matches("^\\d+$|^\\d+\\.\\d+$|-\\d+$"); if (result == true) { - infoMap.put(keyword.area.value, arr[i - 1] + "㎡"); + infoMap.put(keyword.area.value, arr[i - 1] + "銕�"); System.out.print(keyword.area.value + ":" - + arr[i - 1] + "㎡"); + + arr[i - 1] + "銕�"); } } } @@ -303,13 +303,13 @@ public class InfoTestUtil { } /** - * 根据关键字处理数据 + * 鏍规嵁鍏抽敭瀛楀鐞嗘暟鎹� * @param text * @param nexText */ public static void judgeType(String text, String nexText) { - if (text.contains(":") || text.contains(":")) { - String[] result = text.split(":|:|:"); + if (text.contains(":") || text.contains("锛�")) { + String[] result = text.split(":|锛殀锛�"); if (result.length <= 1) { OutPutResult(result[0], nexText); } else { @@ -324,14 +324,14 @@ public class InfoTestUtil { if (text.contains(vo)) { String[] result = text.split(vo); if (result.length > 1 && hasDigit(result[1])) { - if (result[1].contains("万")) { + if (result[1].contains("涓�")) { result[1] = result[1].substring(0, - result[1].indexOf("万")); + result[1].indexOf("涓�")); } System.out.print(keyword.totalPrice.value + ":" - + result[1] + "万" + "\n"); + + result[1] + "涓�" + "\n"); infoMap.put(keyword.totalPrice.value, result[1] - + "万"); + + "涓�"); return; } } @@ -421,19 +421,19 @@ public class InfoTestUtil { } /** - * 输出 + * 杈撳嚭 * @param text1 * @param text2 */ public static void OutPutResult(String text1, String text2) { if (totalPrice.contains(text1)) { - if (text2.contains("万")) { - text2 = text2.substring(0, text2.indexOf("万")); + if (text2.contains("涓�")) { + text2 = text2.substring(0, text2.indexOf("涓�")); } - System.out.print(keyword.totalPrice.value + ":" + text2 + "万" + System.out.print(keyword.totalPrice.value + ":" + text2 + "涓�" + "\n"); - infoMap.put(keyword.totalPrice.value, text2 + "万"); + infoMap.put(keyword.totalPrice.value, text2 + "涓�"); return; } if (fitment.contains(text1)) { @@ -493,9 +493,9 @@ public class InfoTestUtil { } - public static String fn2(String number)// 方法2 + public static String fn2(String number)// 鏂规硶2 { - String hanzi[] = { "零", "一", "二", "三", "四", "五", "六", "七", "八", "九" ,"两"}; + String hanzi[] = { "闆�", "涓�", "浜�", "涓�", "鍥�", "浜�", "鍏�", "涓�", "鍏�", "涔�" ,"涓�"}; String alabo[] = { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9" ,"2"}; for (int i = 0; i < 11; i++) if (number.equals(hanzi[i])) diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/util/InfoUtil.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/util/InfoUtil.java index 20689d162..e84322dab 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/util/InfoUtil.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/util/InfoUtil.java @@ -33,7 +33,7 @@ public class InfoUtil { private static Map infoMap; - private static String key = "房型面积"; + private static String key = "鎴垮瀷闈㈢Н"; public static Map getInforMation(String content) throws UnsupportedEncodingException{ infoMap = new HashMap(); @@ -46,7 +46,7 @@ public class InfoUtil { byte bytes[] = {(byte) 0xC2,(byte) 0xA0}; String UTFSpace = new String(bytes,"utf-8"); arr[i] = arr[i].replaceAll(UTFSpace, ""); - arr[i].replaceAll(" | | ", ""); + arr[i].replaceAll(" | |銆�", ""); if(arr[i].contains("[")){ arr[i] = ""; } @@ -65,7 +65,7 @@ public class InfoUtil { } /** - * 最后处理数据 + * 鏈�鍚庡鐞嗘暟鎹� * @param infoMap2 */ private static void dealMap(Map infoMap2) { @@ -147,25 +147,25 @@ public class InfoUtil { } } String area = infoMap.get("area"); - if(area.contains("㎡")){ - infoMap.put("area", area.substring(0, area.indexOf("㎡"))); + if(area.contains("銕�")){ + infoMap.put("area", area.substring(0, area.indexOf("銕�"))); } - if(area.contains("平米")){ - infoMap.put("area", area.substring(0, area.indexOf("平米"))); + if(area.contains("骞崇背")){ + infoMap.put("area", area.substring(0, area.indexOf("骞崇背"))); } - if(area.contains("平方米")){ - infoMap.put("area", area.substring(0, area.indexOf("平方米"))); + if(area.contains("骞虫柟绫�")){ + infoMap.put("area", area.substring(0, area.indexOf("骞虫柟绫�"))); } infoMap.remove("roomHallToilet"); } /** - * 判断是否含有特殊字段 + * 鍒ゆ柇鏄惁鍚湁鐗规畩瀛楁 * @param keyContent */ private static void judgeContainKey(String keyContent) { if (keyContent.contains(key)) { - String[] txt = keyContent.split("㎡"); + String[] txt = keyContent.split("銕�"); if (txt.length >= 1) { String content = txt[0]; for (int j = 1; j < content.length() + 1; j++) { @@ -174,9 +174,9 @@ public class InfoUtil { String content2 = content.substring(length - j - 1, length); if (content1.matches("^\\d+$|^\\d+\\.\\d+$|-\\d+$") && !content2.matches("^\\d+$|^\\d+\\.\\d+$|-\\d+$")) { - infoMap.put("area", content1 + "㎡"); + infoMap.put("area", content1 + "銕�"); System.out.print(keyword.area.value + ":" + content1 - + "㎡" + "\n"); + + "銕�" + "\n"); infoMap.put("roomHallToilet", content.substring(5, length - j)); break; @@ -187,35 +187,35 @@ public class InfoUtil { } /** - * 判断信息是否全 + * 鍒ゆ柇淇℃伅鏄惁鍏� * @param arr */ private static void judgeInfoIsFull(String[] arr) { if (infoMap.get("room") == null) { for (int i = 0; i < arr.length - 1; i++) { - if (arr[i].contains("室")&&!arr[i].contains("厅")) { + if (arr[i].contains("瀹�")&&!arr[i].contains("鍘�")) { infoMap.put("room", arr[i].substring(0, arr[i].length()-1)); } } } if (infoMap.get("hall") == null) { for (int i = 0; i < arr.length - 1; i++) { - if (arr[i].contains("厅")&&!arr[i].contains("室")) { + if (arr[i].contains("鍘�")&&!arr[i].contains("瀹�")) { infoMap.put("hall", arr[i].substring(0, arr[i].length()-1)); } } } if (infoMap.get("toilet") == null) { for (int i = 0; i < arr.length - 1; i++) { - if (arr[i].contains("卫")&&!arr[i].contains("室")) { + if (arr[i].contains("鍗�")&&!arr[i].contains("瀹�")) { infoMap.put("toilet", arr[i].substring(0, arr[i].length()-1)); } } } if (infoMap.get("area") == null) { for (int i = 0; i < arr.length - 1; i++) { - if (arr[i].contains("㎡")) { - String[] number = arr[i].split("㎡"); + if (arr[i].contains("銕�")) { + String[] number = arr[i].split("銕�"); if (number.length >= 1) { boolean result = number[0].matches("[0-9]+"); if (result == true) { @@ -225,7 +225,7 @@ public class InfoUtil { boolean result = arr[i - 1] .matches("^\\d+$|^\\d+\\.\\d+$|-\\d+$"); if (result == true) { - infoMap.put("area", arr[i - 1] + "㎡"); + infoMap.put("area", arr[i - 1] + "銕�"); } } } @@ -235,13 +235,13 @@ public class InfoUtil { } /** - * 根据关键字处理数据 + * 鏍规嵁鍏抽敭瀛楀鐞嗘暟鎹� * @param text * @param nexText */ public static void judgeType(String text, String nexText) { - if (text.contains(":") || text.contains(":")) { - String[] result = text.split(":|:|:"); + if (text.contains(":") || text.contains("锛�")) { + String[] result = text.split(":|锛殀锛�"); if (result.length <= 1) { OutPutResult(result[0], nexText); } else { @@ -256,9 +256,9 @@ public class InfoUtil { if (text.contains(vo)) { String[] result = text.split(vo); if (result.length > 1 && hasDigit(result[1])) { - if (result[1].contains("万")) { + if (result[1].contains("涓�")) { result[1] = result[1].substring(0, - result[1].indexOf("万")); + result[1].indexOf("涓�")); } if(isDecimal(result[1])){ if(result[1].contains(".")){ @@ -348,14 +348,14 @@ public class InfoUtil { } /** - * 输出 + * 杈撳嚭 * @param text1 * @param text2 */ public static void OutPutResult(String text1, String text2) { if (totalPrice.contains(text1)) { - if (text2.contains("万")) { - text2 = text2.substring(0, text2.indexOf("万")); + if (text2.contains("涓�")) { + text2 = text2.substring(0, text2.indexOf("涓�")); } if(isDecimal(text2)){ if(text2.contains(".")){ @@ -424,9 +424,9 @@ public class InfoUtil { return Pattern.compile("([1-9]+[0-9]*|0)(\\.[\\d]+)?").matcher(str).matches(); } - public static String fn2(String number)// 方法2 + public static String fn2(String number)// 鏂规硶2 { - String hanzi[] = { "零", "一", "二", "三", "四", "五", "六", "七", "八", "九","两" }; + String hanzi[] = { "闆�", "涓�", "浜�", "涓�", "鍥�", "浜�", "鍏�", "涓�", "鍏�", "涔�","涓�" }; String alabo[] = { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9" ,"2"}; for (int i = 0; i < 11; i++) if (number.equals(hanzi[i])) @@ -435,17 +435,17 @@ public class InfoUtil { } /** - * 关键字 + * 鍏抽敭瀛� * @author yk * */ public enum keyword{ - fitment("装修"), - area("面积"), - floorHeight("楼层"), - roomHallToilet("户型"), - direction("朝向"), - totalPrice("总价"); + fitment("瑁呬慨"), + area("闈㈢Н"), + floorHeight("妤煎眰"), + roomHallToilet("鎴峰瀷"), + direction("鏈濆悜"), + totalPrice("鎬讳环"); public final String value; @@ -459,15 +459,15 @@ public class InfoUtil { } /** - * 室厅卫 + * 瀹ゅ巺鍗� * @author yk * */ public enum roomHallToiletType{ - room("室"), - room2("房"), - hall("厅"), - toilet("卫"); + room("瀹�"), + room2("鎴�"), + hall("鍘�"), + toilet("鍗�"); private final String value; @@ -481,7 +481,7 @@ public class InfoUtil { } /** - * 获取匹配规则 + * 鑾峰彇鍖归厤瑙勫垯 */ private static void getModeList() { List list = autoModeAnalyDao.findAllByType(null); diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/util/NewInfoUtil.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/util/NewInfoUtil.java index e38cc1d0f..27135c557 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/util/NewInfoUtil.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/util/NewInfoUtil.java @@ -25,16 +25,16 @@ public class NewInfoUtil { private static Map infoMap; - private final static List fitmentcontent = new ArrayList(Arrays.asList("毛坯","简装修","中装修","精装修","豪华装修","精装","豪装","一般装修","普通装修","无装修","中等装修","毛坯房","中装")); + private final static List fitmentcontent = new ArrayList(Arrays.asList("姣涘澂","绠�瑁呬慨","涓淇�","绮捐淇�","璞崕瑁呬慨","绮捐","璞","涓�鑸淇�","鏅�氳淇�","鏃犺淇�","涓瓑瑁呬慨","姣涘澂鎴�","涓")); public static Map getInforMation(String content) throws UnsupportedEncodingException { infoMap = new HashMap(); Document doc = Jsoup.parse(content); String links = doc.body().text(); - //获取需要解析的字段信息 + //鑾峰彇闇�瑕佽В鏋愮殑瀛楁淇℃伅 List list = autoModeAnalyDao.findAllByType(null); - //在所有的文字信息中寻找对应信息 + //鍦ㄦ墍鏈夌殑鏂囧瓧淇℃伅涓鎵惧搴斾俊鎭� for (int i = 0; i < list.size(); i++) { String[] text = list.get(i).getDesc().split(","); for (int j = 0; j < text.length; j++) { @@ -92,21 +92,21 @@ public class NewInfoUtil { list.add(matcher.group(0)); } if (list.size() == 1) { - System.out.print("所在楼层" + list.get(0) + "\n"); + System.out.print("鎵�鍦ㄦゼ灞�" + list.get(0) + "\n"); infoMap.put("floor", list.get(0)); } if (list.size() == 2) { - System.out.print("所在楼层" + list.get(0) + "\n"); + System.out.print("鎵�鍦ㄦゼ灞�" + list.get(0) + "\n"); infoMap.put("floor", list.get(0)); - System.out.print("总楼层" + list.get(1) + "\n"); + System.out.print("鎬绘ゼ灞�" + list.get(1) + "\n"); infoMap.put("height", list.get(1)); } } String area = infoMap2.get("area"); if(StringUtils.isNotBlank(area)){ - if(area.contains("㎡")){ - String areaStr = area.substring(0, area.indexOf("㎡")); + if(area.contains("銕�")){ + String areaStr = area.substring(0, area.indexOf("銕�")); int j = 0; for(int i=areaStr.length();i>0;i--){ String txt = areaStr.substring(i-1, i); @@ -116,14 +116,14 @@ public class NewInfoUtil { break; } } - System.out.print("面积为:"+ areaStr.substring(j, areaStr.length()) +"\n"); - infoMap.put("area", areaStr.substring(j, areaStr.length())+"㎡"); + System.out.print("闈㈢Н涓猴細"+ areaStr.substring(j, areaStr.length()) +"\n"); + infoMap.put("area", areaStr.substring(j, areaStr.length())+"銕�"); } } String price = infoMap2.get("total_price"); if(StringUtils.isNotBlank(price)){ - if(price.contains("万")){ - String priceStr = price.substring(0, price.indexOf("万")); + if(price.contains("涓�")){ + String priceStr = price.substring(0, price.indexOf("涓�")); int j = 0; for(int i=priceStr.length();i>0;i--){ String txt = priceStr.substring(i-1, i); @@ -133,8 +133,8 @@ public class NewInfoUtil { break; } } - System.out.print("总价为:"+ priceStr.substring(j, priceStr.length()) +"\n"); - infoMap.put("price", priceStr.substring(j, priceStr.length())+"万"); + System.out.print("鎬讳环涓猴細"+ priceStr.substring(j, priceStr.length()) +"\n"); + infoMap.put("price", priceStr.substring(j, priceStr.length())+"涓�"); } } } @@ -151,9 +151,9 @@ public class NewInfoUtil { String UTFSpace = new String(bytes, "utf-8"); arr[i] = arr[i].replaceAll(UTFSpace, ""); if (!StringUtil.isBlank(arr[i])) { - if (!arr[i].contains("》") && !arr[i].contains("《") + if (!arr[i].contains("銆�") && !arr[i].contains("銆�") && !arr[i].contains("|") && !arr[i].contains(">>") - && !arr[i].contains("<<") && !arr[i].contains("‖")) { + && !arr[i].contains("<<") && !arr[i].contains("鈥�")) { list.add(arr[i]); } } @@ -162,7 +162,7 @@ public class NewInfoUtil { if (list.size() >= 5) { for (int j = 5; j < list.size(); j++) { String text = null; - if (list.get(j).contains(":") || list.get(j).contains(":")) { + if (list.get(j).contains(":") || list.get(j).contains("锛�")) { if (list.get(j - 1).length() == 1) { text = list.get(j - 1) + list.get(j); if (list.get(j - 2).length() == 1) { @@ -206,9 +206,9 @@ public class NewInfoUtil { } } - public static String fn2(String number)// 方法2 + public static String fn2(String number)// 鏂规硶2 { - String hanzi[] = { "零", "一", "二", "三", "四", "五", "六", "七", "八", "九" }; + String hanzi[] = { "闆�", "涓�", "浜�", "涓�", "鍥�", "浜�", "鍏�", "涓�", "鍏�", "涔�" }; String alabo[] = { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9" }; for (int i = 0; i < 10; i++) if (number.equals(hanzi[i])) @@ -217,14 +217,14 @@ public class NewInfoUtil { } /** - * 关键字 + * 鍏抽敭瀛� * * @author yk * */ public enum keyword { - fitment("装修"), area("面积"), floorHeight("楼层"), roomHallToilet("户型"), direction( - "朝向"), totalPrice("总价"); + fitment("瑁呬慨"), area("闈㈢Н"), floorHeight("妤煎眰"), roomHallToilet("鎴峰瀷"), direction( + "鏈濆悜"), totalPrice("鎬讳环"); public final String value; @@ -238,13 +238,13 @@ public class NewInfoUtil { } /** - * 室厅卫 + * 瀹ゅ巺鍗� * * @author yk * */ public enum roomHallToiletType { - room("室"), room2("房"), hall("厅"), toilet("卫"); + room("瀹�"), room2("鎴�"), hall("鍘�"), toilet("鍗�"); private final String value; diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/util/OpenApiClient.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/util/OpenApiClient.java index 8cb5e6aba..88e2e19e8 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/util/OpenApiClient.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/util/OpenApiClient.java @@ -20,8 +20,8 @@ public class OpenApiClient { final String TOKEN = "F54F52381C49BB9EB4A33EB1B65604AE4B71A28AEE53518A94A2F360408B9056D57553931D15CE6DDE765562DAD286BA38E05A4CDAFC51C3D527A4959BF8E75A3B95DB7108FCEA340DDE61925616DB55118E1851E67D83EAD800460D100D6B667A4ED8EE67C8F7FB"; private static String HOST = "http://open.fangjia.com"; private static String MATCH_HOST = "http://open.fangjia.com"; - public static Pattern MULTI_STREET_PATTERN = Pattern.compile(".*(路|街道|大道|街|巷|胡同)(与|和).{2,}(路|街道|大道|街|巷|胡同).*"); - public static Pattern NO_KEYWORD_MULTI_STREET_PATTERN = Pattern.compile(".{2,}(路|街道|大道|巷|胡同).{2,}(路|街道|大道|巷|胡同).*"); + public static Pattern MULTI_STREET_PATTERN = Pattern.compile(".*(璺瘄琛楅亾|澶ч亾|琛梶宸穦鑳″悓)(涓巪鍜�).{2,}(璺瘄琛楅亾|澶ч亾|琛梶宸穦鑳″悓).*"); + public static Pattern NO_KEYWORD_MULTI_STREET_PATTERN = Pattern.compile(".{2,}(璺瘄琛楅亾|澶ч亾|宸穦鑳″悓).{2,}(璺瘄琛楅亾|澶ч亾|宸穦鑳″悓).*"); public static JSONObject addressStandardize(String city, String address) { if (StringUtils.isBlank(city) || StringUtils.isBlank(address)) { @@ -44,9 +44,9 @@ public class OpenApiClient { } /** - * 格式化地址 - * @param city 城市 - * @param addr 地址 + * 鏍煎紡鍖栧湴鍧� + * @param city 鍩庡競 + * @param addr 鍦板潃 * **/ public static String formateAddress(String city, String addr){ @@ -55,7 +55,7 @@ public class OpenApiClient { return null; } String address = null; - addr = addr.replace("~", "-").replace("~", "-"); + addr = addr.replace("~", "-").replace("锝�", "-"); JSONObject result = addressStandardize(city,addr); if(result == null){ return addr; @@ -68,17 +68,17 @@ public class OpenApiClient { }else if(result.containsKey("street")){ String street = result.getString("street"); if(isMultiStreet(street)){ - if(!street.endsWith("交汇") && !street.endsWith("交汇处")){ - address = street + "交汇"; + if(!street.endsWith("浜ゆ眹") && !street.endsWith("浜ゆ眹澶�")){ + address = street + "浜ゆ眹"; }else{ address = street; } }else if(NO_KEYWORD_MULTI_STREET_PATTERN.matcher(street).find()){ address = street; - if(isMatch(address, ".+(路|街道|大道|巷|胡同).*(路|街道|大道|巷|胡同)$") && !(isMatch(address, ".+(路|街道|大道|巷|胡同).*(路|街道|大道|巷|胡同)$"))){ + if(isMatch(address, ".+(璺瘄琛楅亾|澶ч亾|宸穦鑳″悓).*(璺瘄琛楅亾|澶ч亾|宸穦鑳″悓)$") && !(isMatch(address, ".+(璺瘄琛楅亾|澶ч亾|宸穦鑳″悓).*(璺瘄琛楅亾|澶ч亾|宸穦鑳″悓)$"))){ int idx = 0; int kl = 0; - List keywords = Arrays.asList(new String[]{"路","街道","大道","巷","胡同"}); + List keywords = Arrays.asList(new String[]{"璺�","琛楅亾","澶ч亾","宸�","鑳″悓"}); for(String k : keywords){ idx = address.indexOf(k); if(idx + k.length() != address.length()){ @@ -86,9 +86,9 @@ public class OpenApiClient { break; } } - address = address.substring(0, idx + kl) + "与" + address.substring(idx + kl); - if(!isMatch(address, ".*(交汇|交口|交叉口|交汇处)$")){ - address += "交汇"; + address = address.substring(0, idx + kl) + "涓�" + address.substring(idx + kl); + if(!isMatch(address, ".*(浜ゆ眹|浜ゅ彛|浜ゅ弶鍙浜ゆ眹澶�)$")){ + address += "浜ゆ眹"; } } }else{ @@ -96,10 +96,10 @@ public class OpenApiClient { } }else if(result.containsKey("miniAddress")){ address = result.getString("miniAddress"); - if(isMatch(address, ".+(路|街道|大道|巷|胡同).*(路|街道|大道|巷|胡同)$") && !(isMatch(address, ".*(路|街道|大道|巷|胡同)(与|和).{2,}(路|街道|大道|巷|胡同).*"))){ + if(isMatch(address, ".+(璺瘄琛楅亾|澶ч亾|宸穦鑳″悓).*(璺瘄琛楅亾|澶ч亾|宸穦鑳″悓)$") && !(isMatch(address, ".*(璺瘄琛楅亾|澶ч亾|宸穦鑳″悓)(涓巪鍜�).{2,}(璺瘄琛楅亾|澶ч亾|宸穦鑳″悓).*"))){ int idx = 0; int kl = 0; - List keywords = Arrays.asList(new String[]{"路","街道","大道","巷","胡同"}); + List keywords = Arrays.asList(new String[]{"璺�","琛楅亾","澶ч亾","宸�","鑳″悓"}); for(String k : keywords){ idx = address.indexOf(k); if(idx + k.length() != address.length()){ @@ -107,13 +107,13 @@ public class OpenApiClient { break; } } - address = address.substring(0, idx + kl) + "与" + address.substring(idx + kl); - address = address.substring(0, idx + kl) + "与" + address.substring(idx + kl); - if(!isMatch(address, ".*(交汇|交口|交叉口|交汇处)$")){ - address += "交汇"; + address = address.substring(0, idx + kl) + "涓�" + address.substring(idx + kl); + address = address.substring(0, idx + kl) + "涓�" + address.substring(idx + kl); + if(!isMatch(address, ".*(浜ゆ眹|浜ゅ彛|浜ゅ弶鍙浜ゆ眹澶�)$")){ + address += "浜ゆ眹"; } } - address = address.replaceAll("(交汇|交口|交叉口|交汇处).*","交汇"); + address = address.replaceAll("(浜ゆ眹|浜ゅ彛|浜ゅ弶鍙浜ゆ眹澶�).*","浜ゆ眹"); } return address; } diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/util/RegionData.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/util/RegionData.java index a58fbd0f8..fa557edd2 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/util/RegionData.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/util/RegionData.java @@ -43,7 +43,7 @@ public class RegionData implements PriorityOrdered { BasicDBObject dbo; while(cursor.hasNext()){ dbo = (BasicDBObject) cursor.next(); - if(!"全国".equals(dbo.getString("display"))){ + if(!"鍏ㄥ浗".equals(dbo.getString("display"))){ ALL_CITY.add(dbo.getString("display")); } } @@ -120,7 +120,7 @@ public class RegionData implements PriorityOrdered { try { Calendar cal = Calendar.getInstance(); if (nextScheduleHour == cal.get(Calendar.HOUR_OF_DAY)) { - if(cal.get(Calendar.HOUR_OF_DAY) % 8 == 0) {//每8个小时执行一次 + if(cal.get(Calendar.HOUR_OF_DAY) % 8 == 0) {//姣�8涓皬鏃舵墽琛屼竴娆� LOGGER.info("RegionData reload runing"); RegionData.reload(); LOGGER.info("RegionData reload success"); @@ -198,14 +198,14 @@ public class RegionData implements PriorityOrdered { } /** - * 根据别名匹配区域 + * 鏍规嵁鍒悕鍖归厤鍖哄煙 */ private static String format(Map> cityRegionMap, String region) { if (cityRegionMap.containsKey(region)) { return region; } - // 遍历所有区域的别名 + // 閬嶅巻鎵�鏈夊尯鍩熺殑鍒悕 Set nameSet = cityRegionMap.keySet(); for (String key : nameSet) { List alias = cityRegionMap.get(key); diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/util/SessionContent.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/util/SessionContent.java index 689a2d670..f65250b4d 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/util/SessionContent.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/util/SessionContent.java @@ -5,7 +5,7 @@ import javax.servlet.http.HttpServletRequest; public class SessionContent { /** - * 获取登录用户ID + * 鑾峰彇鐧诲綍鐢ㄦ埛ID * @param request * @return */ @@ -18,7 +18,7 @@ public class SessionContent { } /** - * 获取登录用户名 + * 鑾峰彇鐧诲綍鐢ㄦ埛鍚� * @param request * @return */ diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/util/TemplateUtils.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/util/TemplateUtils.java index 243badfa4..e22dc25bb 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/util/TemplateUtils.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/util/TemplateUtils.java @@ -20,13 +20,13 @@ import java.util.List; import java.util.Map; /** - * 模板工具类 + * 妯℃澘宸ュ叿绫� * * @author liupei */ public final class TemplateUtils { /** - * 清理指定字符串中的特殊字符 + * 娓呯悊鎸囧畾瀛楃涓蹭腑鐨勭壒娈婂瓧绗� * * @author liupei */ @@ -35,7 +35,7 @@ public final class TemplateUtils { } /** - * 清理特定的某个字符串 + * 娓呯悊鐗瑰畾鐨勬煇涓瓧绗︿覆 * * @author */ @@ -49,14 +49,14 @@ public final class TemplateUtils { } /** - * 截取字符串 + * 鎴彇瀛楃涓� * - * 若原始字符串的长度小于最大截取长度,则直接返回原始字符串 + * 鑻ュ師濮嬪瓧绗︿覆鐨勯暱搴﹀皬浜庢渶澶ф埅鍙栭暱搴︼紝鍒欑洿鎺ヨ繑鍥炲師濮嬪瓧绗︿覆 * * @param str - * 原始字符串 + * 鍘熷瀛楃涓� * @param targetLength - * 截取长度 + * 鎴彇闀垮害 * @return */ public static String cutString(String str, int targetLength) { @@ -64,12 +64,12 @@ public final class TemplateUtils { } /** - * 按字节截取字符串 + * 鎸夊瓧鑺傛埅鍙栧瓧绗︿覆 * * @param str - * 原始字符串 + * 鍘熷瀛楃涓� * @param targetLength - * 截取长度 + * 鎴彇闀垮害 * @return */ public static String bCutString(String str, int targetLength) { @@ -81,7 +81,7 @@ public final class TemplateUtils { } /** - * 截取字符串 + * 鎴彇瀛楃涓� * * @param str * @param beginIndex @@ -93,7 +93,7 @@ public final class TemplateUtils { } /** - * 截取字符串 + * 鎴彇瀛楃涓� * * @param str * @param targetLength @@ -105,7 +105,7 @@ public final class TemplateUtils { } /** - * 获取字符在字符串中的index + * 鑾峰彇瀛楃鍦ㄥ瓧绗︿覆涓殑index * * @param str * @param strChar @@ -116,7 +116,7 @@ public final class TemplateUtils { } /** - * 加密图片url + * 鍔犲瘑鍥剧墖url * * @param u * @param s @@ -134,9 +134,9 @@ public final class TemplateUtils { } /** - * 格式化均价 + * 鏍煎紡鍖栧潎浠� * - * 将个位和十位直接变为0 + * 灏嗕釜浣嶅拰鍗佷綅鐩存帴鍙樹负0 * * @param avgPirce * @return @@ -146,7 +146,7 @@ public final class TemplateUtils { } /** - * 去掉str中的html标记 + * 鍘绘帀str涓殑html鏍囪 * * @param str * @return @@ -156,7 +156,7 @@ public final class TemplateUtils { } /** - * 移除HTML中的标记 + * 绉婚櫎HTML涓殑鏍囪 * * @param htmlDes * @return @@ -166,7 +166,7 @@ public final class TemplateUtils { } /** - * 全角转半角 + * 鍏ㄨ杞崐瑙� * * @param input * @return @@ -176,7 +176,7 @@ public final class TemplateUtils { } /** - * 转换时间 + * 杞崲鏃堕棿 * * @param input * @return @@ -186,7 +186,7 @@ public final class TemplateUtils { } /** - * 转换时间 + * 杞崲鏃堕棿 * * @param input * @return _tyler @@ -196,7 +196,7 @@ public final class TemplateUtils { } /** - * 去除不支持的编码字符 + * 鍘婚櫎涓嶆敮鎸佺殑缂栫爜瀛楃 * * @param input * @return @@ -206,7 +206,7 @@ public final class TemplateUtils { } /** - * 格式化板块 + * 鏍煎紡鍖栨澘鍧� * * @param block * @return @@ -216,7 +216,7 @@ public final class TemplateUtils { } /** - * 编码 + * 缂栫爜 * * @param s * @return @@ -227,7 +227,7 @@ public final class TemplateUtils { } /** - * 格式化日期 + * 鏍煎紡鍖栨棩鏈� * */ public static String dateFormat(Date date, String pattern) { @@ -238,7 +238,7 @@ public final class TemplateUtils { } /** - * 获取date前days天的日期 + * 鑾峰彇date鍓峝ays澶╃殑鏃ユ湡 * * @param date * @param days @@ -255,16 +255,16 @@ public final class TemplateUtils { return StringUtils.replace(text, searchString, replacement); } - private static final String[] STRONG_KEYS = new String[] { "房价" }; - private static final String[] STRONG_VALUES = new String[] { "房价" }; - private static final String[] STRONG_CLASS_VALUES = new String[] { "房价" }; + private static final String[] STRONG_KEYS = new String[] { "鎴夸环" }; + private static final String[] STRONG_VALUES = new String[] { "鎴夸环" }; + private static final String[] STRONG_CLASS_VALUES = new String[] { "鎴夸环" }; /** - * 关键字加strong格式 + * 鍏抽敭瀛楀姞strong鏍煎紡 * * @param text * @param isNeedClass - * true:带样式yhua;false:不带class + * true:甯︽牱寮弝hua;false:涓嶅甫class * @return */ public static String strong(String text, boolean isNeedClass) { @@ -284,7 +284,7 @@ public final class TemplateUtils { } /** - * 获取1~size的随机数 + * 鑾峰彇1~size鐨勯殢鏈烘暟 * * @param size * @return @@ -303,13 +303,13 @@ public final class TemplateUtils { if (publishDate.after(range[0]) && publishDate.before(range[1])) { int diffHour = DateUtil.getHour(new Date()) - DateUtil.getHour(publishDate); if (diffHour > 0) { - return diffHour + "小时前"; + return diffHour + "灏忔椂鍓�"; } else { int diffMinute = DateUtil.getMinute(new Date()) - DateUtil.getMinute(publishDate); if (diffMinute <= 0) { diffMinute = 1; } - return diffMinute + "分钟前"; + return diffMinute + "鍒嗛挓鍓�"; } } else { diff --git a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/util/UploadHandleServlet.java b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/util/UploadHandleServlet.java index 057667c7c..d31f54d05 100644 --- a/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/util/UploadHandleServlet.java +++ b/projects/fangjia-coredata-bkoff/src/main/java/com/fangjia/bkoff/util/UploadHandleServlet.java @@ -62,40 +62,40 @@ public class UploadHandleServlet extends HttpServlet{ // if(isMultipart){ - //得到上传文件的保存目录,将上传的文件存放于WEB-INF目录下,不允许外界直接访问,保证上传文件的安全 + //寰楀埌涓婁紶鏂囦欢鐨勪繚瀛樼洰褰曪紝灏嗕笂浼犵殑鏂囦欢瀛樻斁浜嶹EB-INF鐩綍涓嬶紝涓嶅厑璁稿鐣岀洿鎺ヨ闂紝淇濊瘉涓婁紶鏂囦欢鐨勫畨鍏� String savePath = this.getServletContext().getRealPath("/WEB-INF/upload/"); System.out.println("servlet:"+savePath); File file = new File(savePath); // if(file.exists()){ -// File[] files = file.listFiles();//声明目录下所有的文件 files[]; -// for (int i = 0;i < files.length;i ++) {//遍历目录下所有的文件 +// File[] files = file.listFiles();//澹版槑鐩綍涓嬫墍鏈夌殑鏂囦欢 files[]; +// for (int i = 0;i < files.length;i ++) {//閬嶅巻鐩綍涓嬫墍鏈夌殑鏂囦欢 // files[i].delete(); // } -// //file.delete();//删除文件夹 +// //file.delete();//鍒犻櫎鏂囦欢澶� // } - //判断上传文件的保存目录是否存在 + //鍒ゆ柇涓婁紶鏂囦欢鐨勪繚瀛樼洰褰曟槸鍚﹀瓨鍦� if (!file.exists() && !file.isDirectory()) { - System.out.println(savePath+"目录不存在,需要创建"); - //创建目录 + System.out.println(savePath+"鐩綍涓嶅瓨鍦紝闇�瑕佸垱寤�"); + //鍒涘缓鐩綍 file.mkdir(); } - //构造一个文件上传处理对象 + //鏋勯�犱竴涓枃浠朵笂浼犲鐞嗗璞� FileItemFactory factory = new DiskFileItemFactory(); ServletFileUpload upload = new ServletFileUpload(factory); Iterator items; try{ - //解析表单中提交的所有文件内容 + //瑙f瀽琛ㄥ崟涓彁浜ょ殑鎵�鏈夋枃浠跺唴瀹� items=upload.parseRequest(request).iterator(); while(items.hasNext()){ FileItem item = (FileItem) items.next(); if(!item.isFormField()){ - //取出上传文件的文件名称 + //鍙栧嚭涓婁紶鏂囦欢鐨勬枃浠跺悕绉� String name = item.getName(); - //取得上传文件以后的存储路径 + //鍙栧緱涓婁紶鏂囦欢浠ュ悗鐨勫瓨鍌ㄨ矾寰� InputStream is =item.getInputStream(); String fileName=name.substring(name.lastIndexOf('\\')+1,name.length()); int index=fileName.lastIndexOf("."); @@ -103,24 +103,24 @@ public class UploadHandleServlet extends HttpServlet{ String fileType=fileName.substring(index); //parseData(is, fileType); - //获取item中的上传文件的输入流 + //鑾峰彇item涓殑涓婁紶鏂囦欢鐨勮緭鍏ユ祦 InputStream in = item.getInputStream(); - //创建一个文件输出流 + //鍒涘缓涓�涓枃浠惰緭鍑烘祦 FileOutputStream out = new FileOutputStream(savePath + "/" + fileName); - //创建一个缓冲区 + //鍒涘缓涓�涓紦鍐插尯 byte buffer[] = new byte[1024]; - //判断输入流中的数据是否已经读完的标识 + //鍒ゆ柇杈撳叆娴佷腑鐨勬暟鎹槸鍚﹀凡缁忚瀹岀殑鏍囪瘑 int len = 0; - //循环将输入流读入到缓冲区当中,(len=in.read(buffer))>0就表示in里面还有数据 + //寰幆灏嗚緭鍏ユ祦璇诲叆鍒扮紦鍐插尯褰撲腑锛�(len=in.read(buffer))>0灏辫〃绀篿n閲岄潰杩樻湁鏁版嵁 while((len=in.read(buffer))>0){ - //使用FileOutputStream输出流将缓冲区的数据写入到指定的目录(savePath + "\\" + filename)当中 + //浣跨敤FileOutputStream杈撳嚭娴佸皢缂撳啿鍖虹殑鏁版嵁鍐欏叆鍒版寚瀹氱殑鐩綍(savePath + "\\" + filename)褰撲腑 out.write(buffer, 0, len); } - //关闭输入流 + //鍏抽棴杈撳叆娴� in.close(); - //关闭输出流 + //鍏抽棴杈撳嚭娴� out.close(); - //删除处理文件上传时生成的临时文件 + //鍒犻櫎澶勭悊鏂囦欢涓婁紶鏃剁敓鎴愮殑涓存椂鏂囦欢 item.delete(); } } diff --git a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/address/model/AddressScript.java b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/address/model/AddressScript.java index 2d73f007e..a3a27d833 100644 --- a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/address/model/AddressScript.java +++ b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/address/model/AddressScript.java @@ -14,42 +14,42 @@ public class AddressScript implements MongoEntity { private String id; /** - * 脚本名称 + * 鑴氭湰鍚嶇О */ private String name; /** - * 脚本内容 + * 鑴氭湰鍐呭 */ private String script; /** - * 属于哪个文件的 + * 灞炰簬鍝釜鏂囦欢鐨� */ private String fileId; /** - * 创建时间 + * 鍒涘缓鏃堕棿 */ private Date createDate; /** - * 创建用户 + * 鍒涘缓鐢ㄦ埛 */ private String createUser; /** - * 修改时间 + * 淇敼鏃堕棿 */ private Date modifyDate; /** - * 修改用户 + * 淇敼鐢ㄦ埛 */ private String modifyUser; /** - * 是否删除(0-正常 1-删除) + * 鏄惁鍒犻櫎(0-姝e父 1-鍒犻櫎) */ private int status; diff --git a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/address/model/Authority.java b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/address/model/Authority.java index 725899823..ec28d8b3e 100644 --- a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/address/model/Authority.java +++ b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/address/model/Authority.java @@ -6,7 +6,7 @@ import javax.persistence.GeneratedValue; import javax.persistence.Id; import com.fangjia.mongo.persistence.MongoEntity; /** - * 权限信息 + * 鏉冮檺淇℃伅 * @author yinjihuan * */ @@ -17,12 +17,12 @@ public class Authority implements MongoEntity { private String id; /** - * 权限名称 + * 鏉冮檺鍚嶇О */ private String authName; /** - * 权限URL + * 鏉冮檺URL */ private String authUrl; diff --git a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/address/model/AuthorityGroup.java b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/address/model/AuthorityGroup.java index 2847dd9b8..e8943bc25 100644 --- a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/address/model/AuthorityGroup.java +++ b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/address/model/AuthorityGroup.java @@ -8,7 +8,7 @@ import javax.persistence.GeneratedValue; import javax.persistence.Id; import com.fangjia.mongo.persistence.MongoEntity; /** - * 权限组信息 + * 鏉冮檺缁勪俊鎭� * @author yinjihuan * */ @@ -19,12 +19,12 @@ public class AuthorityGroup implements MongoEntity { private String id; /** - * 组名称 + * 缁勫悕绉� */ private String groupName; /** - * 权限集合 + * 鏉冮檺闆嗗悎 */ private List authoritys; diff --git a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/address/model/DistrictStatistics.java b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/address/model/DistrictStatistics.java index 1f42365d7..423b01078 100644 --- a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/address/model/DistrictStatistics.java +++ b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/address/model/DistrictStatistics.java @@ -8,7 +8,7 @@ import javax.persistence.Id; import com.fangjia.mongo.persistence.MongoEntity; /** - * 城市相关统计信息 + * 鍩庡競鐩稿叧缁熻淇℃伅 * @author hubingliang * */ diff --git a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/address/model/Role.java b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/address/model/Role.java index 149510e7a..cf20b2daa 100644 --- a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/address/model/Role.java +++ b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/address/model/Role.java @@ -9,7 +9,7 @@ import javax.persistence.Id; import com.fangjia.mongo.persistence.MongoEntity; /** - * 角色信息 + * 瑙掕壊淇℃伅 * @author yinjihuan * */ @@ -21,17 +21,17 @@ public class Role implements MongoEntity { private String id; /** - * 角色名称 + * 瑙掕壊鍚嶇О */ private String roleName; /** - * 权限信息 + * 鏉冮檺淇℃伅 */ private List authoritys; /** - * 创建时间 + * 鍒涘缓鏃堕棿 */ private Date createDate; diff --git a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/address/model/User.java b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/address/model/User.java index ca6debaaf..d3d1b5f16 100644 --- a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/address/model/User.java +++ b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/address/model/User.java @@ -8,7 +8,7 @@ import javax.persistence.GeneratedValue; import javax.persistence.Id; import com.fangjia.mongo.persistence.MongoEntity; /** - * 用户信息 + * 鐢ㄦ埛淇℃伅 * @author yinjihuan * */ @@ -19,32 +19,32 @@ public class User implements MongoEntity { private String id; /** - * 用户名 + * 鐢ㄦ埛鍚� */ private String username; /** - * 密码(md5 32位大写加密) + * 瀵嗙爜(md5 32浣嶅ぇ鍐欏姞瀵�) */ private String pass; /** - * 角色信息 + * 瑙掕壊淇℃伅 */ private List roles; /** - * 数据部人员对应负责的城市列表 + * 鏁版嵁閮ㄤ汉鍛樺搴旇礋璐g殑鍩庡競鍒楄〃 */ private List citys; /** - * 创建时间 + * 鍒涘缓鏃堕棿 */ private Date createDate; /** - * 修改时间 + * 淇敼鏃堕棿 */ private Date updateDate; diff --git a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/dao/CategoryEnum.java b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/dao/CategoryEnum.java index 46e7bdb29..0ca73593a 100644 --- a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/dao/CategoryEnum.java +++ b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/dao/CategoryEnum.java @@ -1,15 +1,15 @@ package com.fangjia.coredata.dao; public enum CategoryEnum { - DISTRICT("district", "住宅"), // - MALL("mall", "商场"), // - SHOP("shop", "商铺"), // - OFFICE("office", "写字楼"), // - INDUSTRY("industry", "厂房"), // - SCHOOL("school", "学校"), // - HOSPITAL("hospital", "医院"), // - HOTEL("hotel", "酒店"), // - BANK("bank", "银行"), // + DISTRICT("district", "浣忓畢"), // + MALL("mall", "鍟嗗満"), // + SHOP("shop", "鍟嗛摵"), // + OFFICE("office", "鍐欏瓧妤�"), // + INDUSTRY("industry", "鍘傛埧"), // + SCHOOL("school", "瀛︽牎"), // + HOSPITAL("hospital", "鍖婚櫌"), // + HOTEL("hotel", "閰掑簵"), // + BANK("bank", "閾惰"), // ; private final String category; diff --git a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/dao/AliasUpdateOperationDao.java b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/dao/AliasUpdateOperationDao.java index d4802522b..5fa1ab0ae 100644 --- a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/dao/AliasUpdateOperationDao.java +++ b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/dao/AliasUpdateOperationDao.java @@ -41,7 +41,7 @@ public class AliasUpdateOperationDao extends MongoDaoImpl opt.setName(name); opt.setCat(cat); opt.setAlia(alias); - opt.setOpt("删除"); + opt.setOpt("鍒犻櫎"); opt.setCreateDate(new Date()); opt.setIp(ip); opts.add(opt); @@ -58,7 +58,7 @@ public class AliasUpdateOperationDao extends MongoDaoImpl opt.setName(name); opt.setCat(cat); opt.setAlia(alias); - opt.setOpt("添加"); + opt.setOpt("娣诲姞"); opt.setCreateDate(new Date()); opt.setIp(ip); opts.add(opt); diff --git a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/dao/AnalyTaskDao.java b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/dao/AnalyTaskDao.java index 990d81b79..dd5df5096 100644 --- a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/dao/AnalyTaskDao.java +++ b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/dao/AnalyTaskDao.java @@ -55,10 +55,10 @@ public class AnalyTaskDao extends MongoDaoImpl implements MongoDao implements MongoDao alias;//别名 -//// private String city;//城市 -//// private String region;//区域 -//// private String address;//商户地址 -//// private List tags;//标签 -//// private List feature;//特色 -//// private String businessScope;//商家业态 -//// private String businessType;//业态分类 -//// private String telephone;//商家电话 -//// private Integer consumption;//人均消费 -//// private Integer commentCount;//点评量 -//// private String businessHours;//营业时间 -//// private String parkingInfo;//停车信息 -//// private String trafficInfo;//交通信息 -//// private String commends;//推荐产品 -//// private Double productScore;//产品评分 -//// private Double environmentScore;//环境评分 -//// private Double serviceScore;//服务评分 -//// private String introduction;//商户简介 -//// private List inPics;//内部实景 +//// private String name;//鍟嗕笟涓績鍚嶇О +//// private List alias;//鍒悕 +//// private String city;//鍩庡競 +//// private String region;//鍖哄煙 +//// private String address;//鍟嗘埛鍦板潃 +//// private List tags;//鏍囩 +//// private List feature;//鐗硅壊 +//// private String businessScope;//鍟嗗涓氭�� +//// private String businessType;//涓氭�佸垎绫� +//// private String telephone;//鍟嗗鐢佃瘽 +//// private Integer consumption;//浜哄潎娑堣垂 +//// private Integer commentCount;//鐐硅瘎閲� +//// private String businessHours;//钀ヤ笟鏃堕棿 +//// private String parkingInfo;//鍋滆溅淇℃伅 +//// private String trafficInfo;//浜ら�氫俊鎭� +//// private String commends;//鎺ㄨ崘浜у搧 +//// private Double productScore;//浜у搧璇勫垎 +//// private Double environmentScore;//鐜璇勫垎 +//// private Double serviceScore;//鏈嶅姟璇勫垎 +//// private String introduction;//鍟嗘埛绠�浠� +//// private List inPics;//鍐呴儴瀹炴櫙 // -// String s1 = "name:名称,city:城市,region:区域,address:地址,business_scope:商家业态,business_type:业态分类,telephone:商家电话,business_hours:营业时间,parking_info:停车信息,traffic_info:交通信息,commends:推荐产品,introduction:商户简介"; -// String s2 = "consumption:人均消费,comment_count:点评量"; -// String s3 = "lat:纬度,lng:经度,product_score:产品评分,environment_score:环境评分,service_score:服务评分"; -// String s4 = "alias:别名,tag:标签,feature:特色,in_pics:内部图片"; +// String s1 = "name:鍚嶇О,city:鍩庡競,region:鍖哄煙,address:鍦板潃,business_scope:鍟嗗涓氭��,business_type:涓氭�佸垎绫�,telephone:鍟嗗鐢佃瘽,business_hours:钀ヤ笟鏃堕棿,parking_info:鍋滆溅淇℃伅,traffic_info:浜ら�氫俊鎭�,commends:鎺ㄨ崘浜у搧,introduction:鍟嗘埛绠�浠�"; +// String s2 = "consumption:浜哄潎娑堣垂,comment_count:鐐硅瘎閲�"; +// String s3 = "lat:绾害,lng:缁忓害,product_score:浜у搧璇勫垎,environment_score:鐜璇勫垎,service_score:鏈嶅姟璇勫垎"; +// String s4 = "alias:鍒悕,tag:鏍囩,feature:鐗硅壊,in_pics:鍐呴儴鍥剧墖"; // // // for(String s : s4.split(",")) { diff --git a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/AnalyRoad.java b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/AnalyRoad.java index d1017ead4..2bb3676b8 100644 --- a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/AnalyRoad.java +++ b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/AnalyRoad.java @@ -37,7 +37,7 @@ public class AnalyRoad implements MongoEntity { private Date creationDate; - private int newFound; // 1:新发现 + private int newFound; // 1锛氭柊鍙戠幇 public enum StatusEnum { NONE(0), SUC(1), ERR(2); diff --git a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/AnalySite.java b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/AnalySite.java index bc95d2365..c8fc9dba6 100644 --- a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/AnalySite.java +++ b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/AnalySite.java @@ -19,22 +19,22 @@ public class AnalySite implements MongoEntity{ private String city; private String region; private String districtName; - private Integer siteCount; //网站数 - private int auditStatus;//审阅状态 0:未审核 1:已审核 4:已审阅 - private Date auditDate;//审阅时间 - private int dataStatus;// 数据状态 0:正常 1:人工删除 2:区域错误 3:被别名关联 - private int exists;//是否在seaweed中存在 0:否 1:是 - private long version;//版本号 - private Date modifiedDate;//修改时间 + private Integer siteCount; //缃戠珯鏁� + private int auditStatus;//瀹¢槄鐘舵�� 0:鏈鏍� 1:宸插鏍� 4:宸插闃� + private Date auditDate;//瀹¢槄鏃堕棿 + private int dataStatus;// 鏁版嵁鐘舵�� 0:姝e父 1:浜哄伐鍒犻櫎 2:鍖哄煙閿欒 3:琚埆鍚嶅叧鑱� + private int exists;//鏄惁鍦╯eaweed涓瓨鍦� 0:鍚� 1锛氭槸 + private long version;//鐗堟湰鍙� + private Date modifiedDate;//淇敼鏃堕棿 private String siteNames; - private int districtRatio;//住宅比 - private String pageType;//新房,旧房 + private int districtRatio;//浣忓畢姣� + private String pageType;//鏂版埧锛屾棫鎴� - private String versonStr;//只做展示用,临时 + private String versonStr;//鍙仛灞曠ず鐢紝涓存椂 - private String compareResult;//对比结果 - private String aliasName;//别名名称 - private String diffRegion;//不同的区域名称 + private String compareResult;//瀵规瘮缁撴灉 + private String aliasName;//鍒悕鍚嶇О + private String diffRegion;//涓嶅悓鐨勫尯鍩熷悕绉� private Long houseNum; @Id diff --git a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/CalcDistrictStat.java b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/CalcDistrictStat.java index 080d2f4f5..7f04a346a 100644 --- a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/CalcDistrictStat.java +++ b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/CalcDistrictStat.java @@ -21,21 +21,21 @@ public class CalcDistrictStat implements MongoEntity { private String city; private String region; private String name; - private String estateType; // 物业类型(普通住宅、别墅、商住楼) + private String estateType; // 鐗╀笟绫诲瀷锛堟櫘閫氫綇瀹呫�佸埆澧呫�佸晢浣忔ゼ锛� private Date weekend; - private int value; // 运算出的值 + private int value; // 杩愮畻鍑虹殑鍊� private double credit; private Integer valueType; - private Integer ownSampleCount; // 自身样本数量 - private Integer aroundObjectCount; // 周边对象数量 - private Integer aroundSampleCount; // 周边样本数量 + private Integer ownSampleCount; // 鑷韩鏍锋湰鏁伴噺 + private Integer aroundObjectCount; // 鍛ㄨ竟瀵硅薄鏁伴噺 + private Integer aroundSampleCount; // 鍛ㄨ竟鏍锋湰鏁伴噺 - private Integer aroundMinDistance; // 最近对象距离 - private Integer aroundMaxDistance; // 最远对象距离 + private Integer aroundMinDistance; // 鏈�杩戝璞¤窛绂� + private Integer aroundMaxDistance; // 鏈�杩滃璞¤窛绂� - private Map guidingMap; // 指导价 - private List> thirdpartDetails; // 第三方价格详细信息 - private Map sampleDetailMap; //样本详细分布情况 + private Map guidingMap; // 鎸囧浠� + private List> thirdpartDetails; // 绗笁鏂逛环鏍艰缁嗕俊鎭� + private Map sampleDetailMap; //鏍锋湰璇︾粏鍒嗗竷鎯呭喌 private Date creationDate; private Date modificationDate; diff --git a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/Command.java b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/Command.java index 84b6a56f8..66a61fed2 100644 --- a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/Command.java +++ b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/Command.java @@ -25,9 +25,9 @@ public class Command implements MongoEntity { private Date creationDate; public enum CommandStatusEnum { - INIT(0), // 等待处理 - QUEUE(1), // 处理中 - SUC(2); // 处理完成 + INIT(0), // 绛夊緟澶勭悊 + QUEUE(1), // 澶勭悊涓� + SUC(2); // 澶勭悊瀹屾垚 private final int value; diff --git a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/DistrictAlias.java b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/DistrictAlias.java index 3415c76d6..b0b70dce8 100644 --- a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/DistrictAlias.java +++ b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/DistrictAlias.java @@ -30,7 +30,7 @@ public class DistrictAlias implements MongoEntity { private List data; /* - * 1:是分期 + * 1:鏄垎鏈� * */ private int flg; diff --git a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/DistrictHousetype.java b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/DistrictHousetype.java index f49f1572e..c73014189 100644 --- a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/DistrictHousetype.java +++ b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/DistrictHousetype.java @@ -10,7 +10,7 @@ import javax.persistence.Id; import com.fangjia.mongo.persistence.MongoEntity; /** - * 小于房型表,用于租金计算使用 + * 灏忎簬鎴垮瀷琛�,鐢ㄤ簬绉熼噾璁$畻浣跨敤 */ @Entity public class DistrictHousetype implements MongoEntity{ @@ -18,12 +18,12 @@ public class DistrictHousetype implements MongoEntity{ private static final long serialVersionUID = 1L; private String id; - private String city;//城市 - private String region;//区域 - private String districtName;//楼盘名称 - private String estateType;//物业类型 - private int houseType;//房型,几室 - private Date creationDate;//创建时间 + private String city;//鍩庡競 + private String region;//鍖哄煙 + private String districtName;//妤肩洏鍚嶇О + private String estateType;//鐗╀笟绫诲瀷 + private int houseType;//鎴垮瀷,鍑犲 + private Date creationDate;//鍒涘缓鏃堕棿 @Id @GeneratedValue diff --git a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/FieldRule.java b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/FieldRule.java index d3ede2c72..d616bef61 100644 --- a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/FieldRule.java +++ b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/FieldRule.java @@ -28,11 +28,11 @@ public class FieldRule implements MongoEntity { private Date creationDate; private Date modificationDate; - /** 解析模式: */ + /** 瑙f瀽妯″紡锛� */ private String anaMode; - private int anaType; // 0 原来的单个字段解析;1新的模式解析 + private int anaType; // 0 鍘熸潵鐨勫崟涓瓧娈佃В鏋愶紱1鏂扮殑妯″紡瑙f瀽 private String anaCat; - private List modeAnaFields; // 模式解析字段 + private List modeAnaFields; // 妯″紡瑙f瀽瀛楁 @Id @GeneratedValue diff --git a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/FileDatasTotality.java b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/FileDatasTotality.java index 129840f95..75d0d8d60 100644 --- a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/FileDatasTotality.java +++ b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/FileDatasTotality.java @@ -15,14 +15,14 @@ public class FileDatasTotality implements MongoEntity{ */ private static final long serialVersionUID = 2491792175743916538L; private String id; - private Integer category;//类型:1:测试抽样 2:项目数据 3:其它问题 + private Integer category;//绫诲瀷锛�1:娴嬭瘯鎶芥牱 2:椤圭洰鏁版嵁 3:鍏跺畠闂 private String fileName; - private String oldFileName;//原文件名称 - private Date creationDate;// 创建时间 - private Date modificationDate;// 更新时间 - private Integer status;//处理状态 -1:Excel解析中,0:上传成功 1:解析中 2:解析完成 3:失败 4:人工调查 5:分析中 6:完成 - private Integer total;//总数 - private Integer failTotal;//失败总数 + private String oldFileName;//鍘熸枃浠跺悕绉� + private Date creationDate;// 鍒涘缓鏃堕棿 + private Date modificationDate;// 鏇存柊鏃堕棿 + private Integer status;//澶勭悊鐘舵�� -1:Excel瑙f瀽涓�,0:涓婁紶鎴愬姛 1:瑙f瀽涓� 2锛氳В鏋愬畬鎴� 3:澶辫触 4:浜哄伐璋冩煡 5:鍒嗘瀽涓� 6:瀹屾垚 + private Integer total;//鎬绘暟 + private Integer failTotal;//澶辫触鎬绘暟 private String userId; diff --git a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/FileDetailData.java b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/FileDetailData.java index 56258064f..ce1eee4a1 100644 --- a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/FileDetailData.java +++ b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/FileDetailData.java @@ -19,38 +19,38 @@ public class FileDetailData implements MongoEntity{ private String region; private String districtName; private String address; - private Double oriArea;//面积:原始输入 + private Double oriArea;//闈㈢Н锛氬師濮嬭緭鍏� private Integer status; - private Integer category;//类型:1:测试抽样 2:项目数据 3:其它问题 + private Integer category;//绫诲瀷锛�1:娴嬭瘯鎶芥牱 2:椤圭洰鏁版嵁 3:鍏跺畠闂 - private String rating;//评级 + private String rating;//璇勭骇 private String matchCity; private String matchRegion; - private String matchAddress;//匹配的地址 - private String matchDistrictName;//匹配的小区名 - private String matchSimilarDistrictName;//匹配时和用户输入最相似的小区名 - private String matchDistrictNumber;//匹配的小区编号 - private String matchHouseNum;//匹配的楼号 - private String matchUnitNum;//匹配的单元号 - private String matchRoomNum;//匹配的室号 - private String matchLevel;//匹配可信度 - private String avgPriceLeval;//均价可信度 - private String parseStreet;//地址中解析出来的路 + private String matchAddress;//鍖归厤鐨勫湴鍧� + private String matchDistrictName;//鍖归厤鐨勫皬鍖哄悕 + private String matchSimilarDistrictName;//鍖归厤鏃跺拰鐢ㄦ埛杈撳叆鏈�鐩镐技鐨勫皬鍖哄悕 + private String matchDistrictNumber;//鍖归厤鐨勫皬鍖虹紪鍙� + private String matchHouseNum;//鍖归厤鐨勬ゼ鍙� + private String matchUnitNum;//鍖归厤鐨勫崟鍏冨彿 + private String matchRoomNum;//鍖归厤鐨勫鍙� + private String matchLevel;//鍖归厤鍙俊搴� + private String avgPriceLeval;//鍧囦环鍙俊搴� + private String parseStreet;//鍦板潃涓В鏋愬嚭鏉ョ殑璺� private Integer districtAvgPrice; private Integer valueType; - private Double weekendMarkup; //周涨跌幅 + private Double weekendMarkup; //鍛ㄦ定璺屽箙 private Double lat; private Double lng; - private String addrCheckLevel; //地址验证级别 - private String estateType; //物业类型 + private String addrCheckLevel; //鍦板潃楠岃瘉绾у埆 + private String estateType; //鐗╀笟绫诲瀷 private Double area; private Long totalPrice; - private Integer historyPrice; //历史价格 + private Integer historyPrice; //鍘嗗彶浠锋牸 private Date latestSurveyDate; - private Integer checkStatus; //人工是否检查 0-未检查 1-已经检查 + private Integer checkStatus; //浜哄伐鏄惁妫�鏌� 0-鏈鏌� 1-宸茬粡妫�鏌� private String realCity; private String realRegion; @@ -59,25 +59,25 @@ public class FileDetailData implements MongoEntity{ private String realUnitNum; private String realRoomNum; - private Integer noMatchReason; //原因枚举(需沟通),0或null代表无原因 - private String otherReason;//其他原因 + private Integer noMatchReason; //鍘熷洜鏋氫妇(闇�娌熼��)锛�0鎴杗ull浠h〃鏃犲師鍥� + private String otherReason;//鍏朵粬鍘熷洜 private Integer realPrice; private Date surveyDate; private Double avgDiffPercent; - private String remark;//描述 + private String remark;//鎻忚堪 - private String userId; //用户ID - private String userName; //用户名 - private String dutyName;//城市所属责任人名字 - private Integer handleState;//问题处理状态 1已处理 0存疑 + private String userId; //鐢ㄦ埛ID + private String userName; //鐢ㄦ埛鍚� + private String dutyName;//鍩庡競鎵�灞炶矗浠讳汉鍚嶅瓧 + private Integer handleState;//闂澶勭悊鐘舵�� 1宸插鐞� 0瀛樼枒 - private Date creationDate;// 创建时间 - private Date modificationDate;// 更新时间 - private String modifier;//操作人 + private Date creationDate;// 鍒涘缓鏃堕棿 + private Date modificationDate;// 鏇存柊鏃堕棿 + private String modifier;//鎿嶄綔浜� private Integer serial; - private String fileName;//文件mingcheng + private String fileName;//鏂囦欢mingcheng - //房估估均价 云估价均价 链家均价 安居客均价 赶集网均价 搜房网均价 兔博士均价 + //鎴夸及浼板潎浠� 浜戜及浠峰潎浠� 閾惧鍧囦环 瀹夊眳瀹㈠潎浠� 璧堕泦缃戝潎浠� 鎼滄埧缃戝潎浠� 鍏斿崥澹潎浠� private Integer fangguguPrice; private Integer yungujiaPrice; private Integer lianjiaPrice; @@ -103,14 +103,14 @@ public class FileDetailData implements MongoEntity{ } public enum NoMatchReasonEnum { - PIPEILUOJI(1, "匹配逻辑问题"), // 匹配逻辑问题 - YUANSHIDIZHIQUYUCUOWU(2, "原始地址/区域错误"), // 原始地址/区域错误 - MINGCHENGBIEMINGCUOWU(3, "名称/别名错误"), // 名称/别名错误 - DIZHICUOWU(4, "库中地址错误"), // 库中地址错误 - QUYUCUOWU(5, "库中区域错误"), // 库中区域错误 - WUXIAOQU(6, "库中无此小区"), // 库中无此小区 - WUXIAODIZHI(7, "无效地址"), // 无效地址 - QITA(8, "其他原因"), // 其他原因 + PIPEILUOJI(1, "鍖归厤閫昏緫闂"), // 鍖归厤閫昏緫闂 + YUANSHIDIZHIQUYUCUOWU(2, "鍘熷鍦板潃/鍖哄煙閿欒"), // 鍘熷鍦板潃/鍖哄煙閿欒 + MINGCHENGBIEMINGCUOWU(3, "鍚嶇О/鍒悕閿欒"), // 鍚嶇О/鍒悕閿欒 + DIZHICUOWU(4, "搴撲腑鍦板潃閿欒"), // 搴撲腑鍦板潃閿欒 + QUYUCUOWU(5, "搴撲腑鍖哄煙閿欒"), // 搴撲腑鍖哄煙閿欒 + WUXIAOQU(6, "搴撲腑鏃犳灏忓尯"), // 搴撲腑鏃犳灏忓尯 + WUXIAODIZHI(7, "鏃犳晥鍦板潃"), // 鏃犳晥鍦板潃 + QITA(8, "鍏朵粬鍘熷洜"), // 鍏朵粬鍘熷洜 ; private final int reason; private final String reasonDesc; @@ -138,14 +138,14 @@ public class FileDetailData implements MongoEntity{ public static String getReasonString(int reason){ String result = null; - if(reason == 1) result = "匹配逻辑问题"; - else if(reason == 2) result = "原始地址/区域错误"; - else if(reason == 3) result = "名称/别名错误"; - else if(reason == 4) result = "库中地址错误"; - else if(reason == 5) result = "库中区域错误"; - else if(reason == 6) result = "库中无此小区"; - else if(reason == 7) result = "无效地址"; - else if(reason == 8) result = "其他原因"; + if(reason == 1) result = "鍖归厤閫昏緫闂"; + else if(reason == 2) result = "鍘熷鍦板潃/鍖哄煙閿欒"; + else if(reason == 3) result = "鍚嶇О/鍒悕閿欒"; + else if(reason == 4) result = "搴撲腑鍦板潃閿欒"; + else if(reason == 5) result = "搴撲腑鍖哄煙閿欒"; + else if(reason == 6) result = "搴撲腑鏃犳灏忓尯"; + else if(reason == 7) result = "鏃犳晥鍦板潃"; + else if(reason == 8) result = "鍏朵粬鍘熷洜"; else result = ""; return result; } diff --git a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/House.java b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/House.java index c98763df2..77af0ff3e 100644 --- a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/House.java +++ b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/House.java @@ -44,7 +44,7 @@ public class House implements MongoEntity { private String road; private String url; - public static final String[] TAGS = {"独栋", "整栋","联排", "叠加", "双拼", "花园面积", "泳池", "别墅", "洋房","带花园","大花园"}; + public static final String[] TAGS = {"鐙爧", "鏁存爧","鑱旀帓", "鍙犲姞", "鍙屾嫾", "鑺卞洯闈㈢Н", "娉虫睜", "鍒", "娲嬫埧","甯﹁姳鍥�","澶ц姳鍥�"}; public String getHouseKey() { @@ -322,7 +322,7 @@ public class House implements MongoEntity { return false; } - String[] typeWords = {"合租", "拼租", "单间", "商铺", "写字楼"}; + String[] typeWords = {"鍚堢", "鎷肩", "鍗曢棿", "鍟嗛摵", "鍐欏瓧妤�"}; if(StringUtils.isNotBlank(rentType) && StringUtils.indexOfAny(rentType, typeWords)>-1){ return false; } @@ -342,11 +342,11 @@ public class House implements MongoEntity { return false; } - String[] words = {"单间","合租","主卧","次卧","隔断","隔间","一间","床位","商铺","写字楼","办公","工作室"}; + String[] words = {"鍗曢棿","鍚堢","涓诲崸","娆″崸","闅旀柇","闅旈棿","涓�闂�","搴婁綅","鍟嗛摵","鍐欏瓧妤�","鍔炲叕","宸ヤ綔瀹�"}; if(StringUtils.isNotBlank(name) && StringUtils.indexOfAny(name, words) > -1){ - if(name.contains("办公") && StringUtils.indexOfAny(name, TAGS) > -1){ + if(name.contains("鍔炲叕") && StringUtils.indexOfAny(name, TAGS) > -1){ return true; }else{ return false; diff --git a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/Seeds.java b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/Seeds.java index 29247ff09..04974de45 100644 --- a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/Seeds.java +++ b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/Seeds.java @@ -23,11 +23,11 @@ public class Seeds implements MongoEntity { private String url; private String city; private int count; - private String parentId;// 关联到website表 + private String parentId;// 鍏宠仈鍒皐ebsite琛� private double score; - private int status;// 网站完成状态 - private Date creationDate;// 创建时间 - private Date modificationDate;// 更新时间 + private int status;// 缃戠珯瀹屾垚鐘舵�� + private Date creationDate;// 鍒涘缓鏃堕棿 + private Date modificationDate;// 鏇存柊鏃堕棿 @Id @GeneratedValue diff --git a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/Snapshot.java b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/Snapshot.java index 0810e280e..d7a7ae953 100644 --- a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/Snapshot.java +++ b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/Snapshot.java @@ -22,23 +22,23 @@ public class Snapshot implements MongoEntity { private String jobId; private String sessionId; /** - * 原metadata的创建时间 + * 鍘焟etadata鐨勫垱寤烘椂闂� */ private Date createMetaDate; /** - * 本数据的创建时间 + * 鏈暟鎹殑鍒涘缓鏃堕棿 */ private Date createDate = new Date(); /** - * 对应的城市 + * 瀵瑰簲鐨勫煄甯� */ private String city; /** - * 网页源码 + * 缃戦〉婧愮爜 */ private String content; /** - * 失败原因 + * 澶辫触鍘熷洜 */ private String reason; diff --git a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/VerifyField.java b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/VerifyField.java index 0133ae59f..4d7b3826b 100644 --- a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/VerifyField.java +++ b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/VerifyField.java @@ -14,8 +14,8 @@ public class VerifyField implements MongoEntity { private static final long serialVersionUID = -7574922668982890694L; private String id; - private String field; // 字段 - private String fieldName; // 字段描述 + private String field; // 瀛楁 + private String fieldName; // 瀛楁鎻忚堪 private Date creationDate; @Id diff --git a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/VerifyRule.java b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/VerifyRule.java index 270f5ac1c..e40edada6 100644 --- a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/VerifyRule.java +++ b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/VerifyRule.java @@ -14,40 +14,40 @@ public class VerifyRule implements MongoEntity { private static final long serialVersionUID = -5669289022913452458L; private String id; - private String fieldId; // 字段Id - private int type; // 匹配类型 + private String fieldId; // 瀛楁Id + private int type; // 鍖归厤绫诲瀷 private String value; // - private Number minValue; // 数值型的最小值 - private Number maxValue; // 数值型的最大值 - private int sequence = 1000; // 序号,小的靠前 - // private int order; // 逻辑命令 0:and;1:or - private double score; // 0-1之间的值 + private Number minValue; // 鏁板�煎瀷鐨勬渶灏忓�� + private Number maxValue; // 鏁板�煎瀷鐨勬渶澶у�� + private int sequence = 1000; // 搴忓彿锛屽皬鐨勯潬鍓� + // private int order; // 閫昏緫鍛戒护 0锛歛nd锛�1锛歰r + private double score; // 0-1涔嬮棿鐨勫�� private Date creationDate; private Date modificationDate; public enum TypeEnum { /** - * 正则 + * 姝e垯 */ REGULAR(0), /** - * 以***开头 + * 浠�***寮�澶� */ STARTSWITH(1), /** - * 以***结尾 + * 浠�***缁撳熬 */ ENDWITH(2), /** - * 包含 + * 鍖呭惈 */ CONTAINS(3), /** - * 全等 + * 鍏ㄧ瓑 */ EQUALS(4), /** - * 数值 + * 鏁板�� */ Numberic(5); diff --git a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/Webpage.java b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/Webpage.java index 1fdcb4171..4060c4f70 100644 --- a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/Webpage.java +++ b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/Webpage.java @@ -18,19 +18,19 @@ public class Webpage implements MongoEntity { */ private static final long serialVersionUID = 4346835732679745566L; private String id; - private String city; // 城市 - private String url; // 原始URL + private String city; // 鍩庡競 + private String url; // 鍘熷URL - private String category; // 类型 district,new_district,shop,office - private String siteName; // 网站名称 - private String pageName; // 页面名称 + private String category; // 绫诲瀷 district,new_district,shop,office + private String siteName; // 缃戠珯鍚嶇О + private String pageName; // 椤甸潰鍚嶇О private byte[] contentBytes; - private Date creationDate;// 创建时间 - private Date modificationDate;// 更新时间 + private Date creationDate;// 鍒涘缓鏃堕棿 + private Date modificationDate;// 鏇存柊鏃堕棿 private Integer status; - private Date analyDate;// 最近更新时间 + private Date analyDate;// 鏈�杩戞洿鏂版椂闂� public enum StatusEnum { NONE(0), SUC(1), ERR(2); diff --git a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/WebpageAnalyLog.java b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/WebpageAnalyLog.java index c15b0d293..db721f0b2 100644 --- a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/WebpageAnalyLog.java +++ b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/WebpageAnalyLog.java @@ -17,17 +17,17 @@ public class WebpageAnalyLog implements MongoEntity{ */ private static final long serialVersionUID = 5279029317964255582L; private String id; - private String siteName; // 网站名称 - private String category; // 类型 + private String siteName; // 缃戠珯鍚嶇О + private String category; // 绫诲瀷 private String city; - private Date statDate;//统计日期 - private Date creationDate;// 创建时间 - private Integer totalCount;//总量 - private Integer addCount;//保存量 - private Integer updateCount;//更新量 - private Integer filterCount;//过滤量 - private Integer errorCount;//异常量 - private Integer lostCount;//放弃量 + private Date statDate;//缁熻鏃ユ湡 + private Date creationDate;// 鍒涘缓鏃堕棿 + private Integer totalCount;//鎬婚噺 + private Integer addCount;//淇濆瓨閲� + private Integer updateCount;//鏇存柊閲� + private Integer filterCount;//杩囨护閲� + private Integer errorCount;//寮傚父閲� + private Integer lostCount;//鏀惧純閲� @Id diff --git a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/Website.java b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/Website.java index 416d9aedd..7f7595c55 100644 --- a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/Website.java +++ b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/Website.java @@ -20,17 +20,17 @@ public class Website implements MongoEntity { private String id; private List> relatedJobs; // private List> seeds; - private String category; // 类型 district,shop,office - private String scope; // 网站规模性质 - private String siteName; // 网站名称 - private String pageName; // 页面名称 - private String root; // 根域名 - private Date creationDate;// 创建时间 - private Date modificationDate;// 更新时间 + private String category; // 绫诲瀷 district,shop,office + private String scope; // 缃戠珯瑙勬ā鎬ц川 + private String siteName; // 缃戠珯鍚嶇О + private String pageName; // 椤甸潰鍚嶇О + private String root; // 鏍瑰煙鍚� + private Date creationDate;// 鍒涘缓鏃堕棿 + private Date modificationDate;// 鏇存柊鏃堕棿 private String remark; private String pinyin; private int status; - private double score;//评分 + private double score;//璇勫垎 public enum UrlEnum { INIT(0), CRAWL_CONFIG(1), CRAWLED(2), ANALY_CONFIG(3), ANALYED(4), DONE(5); diff --git a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/WorkFlow.java b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/WorkFlow.java index ccd1db70d..830b6b856 100644 --- a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/WorkFlow.java +++ b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/coredata/mongo/model/WorkFlow.java @@ -18,14 +18,14 @@ public class WorkFlow implements MongoEntity{ private static final long serialVersionUID = -7344104838607075439L; private String id; - private String url;//抓取url - private int status;//url状态 0:末完成 1:已完成 + private String url;//鎶撳彇url + private int status;//url鐘舵�� 0锛氭湯瀹屾垚 1锛氬凡瀹屾垚 private String city; private String cat; private String siteName; private String remark; - private Date creationDate;// 创建时间 + private Date creationDate;// 鍒涘缓鏃堕棿 @Id @GeneratedValue diff --git a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/datastore/model/District.java b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/datastore/model/District.java index 8bdbda4ff..f0be7c7a9 100644 --- a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/datastore/model/District.java +++ b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/datastore/model/District.java @@ -40,14 +40,14 @@ public class District extends Seaweed { private List addrAlias; private String description; - private Integer avgPrice; // 元/㎡ - private Integer totalPrice; // 万元/套 + private Integer avgPrice; // 鍏�/銕� + private Integer totalPrice; // 涓囧厓/濂� private String mobile; - private List floorplanPics;// 楼层平面图(房型图,户型图)(url列表) + private List floorplanPics;// 妤煎眰骞抽潰鍥撅紙鎴垮瀷鍥�,鎴峰瀷鍥撅級锛坲rl鍒楄〃锛� private List pics; - private List outPics;// 外景图 - private List inPics;// 室内图(实景图) - private List samplePics;// 样板图 + private List outPics;// 澶栨櫙鍥� + private List inPics;// 瀹ゅ唴鍥�(瀹炴櫙鍥�) + private List samplePics;// 鏍锋澘鍥� private List matchingPics; private String videoUrl; private Long lat2; @@ -227,12 +227,12 @@ public class District extends Seaweed { this.addrAlias = addrAlias; } - public static final String[] VILLA_TYPE = new String[] { "别墅", "独栋", "联排", "双拼", "叠加" }; + public static final String[] VILLA_TYPE = new String[] { "鍒", "鐙爧", "鑱旀帓", "鍙屾嫾", "鍙犲姞" }; - public static final String[] DIS_TYPE = new String[] { "住宅", "公寓", "小区", "商住" }; + public static final String[] DIS_TYPE = new String[] { "浣忓畢", "鍏瘬", "灏忓尯", "鍟嗕綇" }; // public enum KindEnum { - // DISTRICT("小区"), VILLA("别墅"), SHOP("商铺"), OFFICE("写字楼"); + // DISTRICT("灏忓尯"), VILLA("鍒"), SHOP("鍟嗛摵"), OFFICE("鍐欏瓧妤�"); // private final String kind; // // KindEnum(String kind) { @@ -246,7 +246,7 @@ public class District extends Seaweed { @Deprecated public enum EstateTypeEnum { - DISTRICT("小区"), VILLA("别墅"); + DISTRICT("灏忓尯"), VILLA("鍒"); private final String estateType; EstateTypeEnum(String estateType) { @@ -268,18 +268,18 @@ public class District extends Seaweed { } /** - * 获取小区类型 + * 鑾峰彇灏忓尯绫诲瀷 */ @Deprecated public String getDistrictType() { Set ret = new HashSet(); if (StringUtils.isNotBlank(estateType)) { if (StringUtils.indexOfAny(estateType, VILLA_TYPE) > -1) { - ret.add("别墅"); + ret.add("鍒"); } if (StringUtils.indexOfAny(estateType, DIS_TYPE) > -1) { - ret.add("小区"); + ret.add("灏忓尯"); } } @@ -293,11 +293,11 @@ public class District extends Seaweed { @Deprecated public boolean isVilla() { // String dt = getDistrictType(); -// if (dt != null && dt.indexOf("别墅") > -1) { +// if (dt != null && dt.indexOf("鍒") > -1) { // return true; // } - if(estateType2 != null && estateType2.indexOf("别墅") > -1) { + if(estateType2 != null && estateType2.indexOf("鍒") > -1) { return true; } @@ -307,7 +307,7 @@ public class District extends Seaweed { @Deprecated public boolean isApartment() { String dt = getDistrictType(); - if (dt != null && dt.indexOf("小区") > -1) { + if (dt != null && dt.indexOf("灏忓尯") > -1) { return true; } return false; diff --git a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/datastore/model/Seabird.java b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/datastore/model/Seabird.java index 5840cef6f..7ee026ca6 100644 --- a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/datastore/model/Seabird.java +++ b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/datastore/model/Seabird.java @@ -48,7 +48,7 @@ public class Seabird implements MongoEntity { private String url; private List floorplanPics; private List pics; - private Long lat;// 经纬度字段,以及最大最小经纬度字段 + private Long lat;// 缁忕含搴﹀瓧娈碉紝浠ュ強鏈�澶ф渶灏忕粡绾害瀛楁 private Long lng; private String cat; private Integer age; diff --git a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/datastore/model/Seawater.java b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/datastore/model/Seawater.java index 0c1e3d461..bcb245bf7 100644 --- a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/datastore/model/Seawater.java +++ b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/datastore/model/Seawater.java @@ -42,12 +42,12 @@ public class Seawater implements MongoEntity { private Integer month; public enum CatEnum { - SELL("sell"), // 二手房 - RENT("rent"), // 租房 - SHOP_SELL("shop_sell"), // 商铺出售房源 - SHOP_RENT("shop_rent"), // 商铺出租房源 - OFFICE_SELL("office_sell"), // 写字楼出售房源 - OFFICE_RENT("office_rent");// 写字楼出租房源 + SELL("sell"), // 浜屾墜鎴� + RENT("rent"), // 绉熸埧 + SHOP_SELL("shop_sell"), // 鍟嗛摵鍑哄敭鎴挎簮 + SHOP_RENT("shop_rent"), // 鍟嗛摵鍑虹鎴挎簮 + OFFICE_SELL("office_sell"), // 鍐欏瓧妤煎嚭鍞埧婧� + OFFICE_RENT("office_rent");// 鍐欏瓧妤煎嚭绉熸埧婧� private final String cat; @@ -280,11 +280,11 @@ public class Seawater implements MongoEntity { return false; } - if (districtName != null && districtName.indexOf("别墅") > -1) { + if (districtName != null && districtName.indexOf("鍒") > -1) { return true; } - if (name != null && name.indexOf("别墅") > -1 && area != null && area > 180) { + if (name != null && name.indexOf("鍒") > -1 && area != null && area > 180) { return true; } @@ -533,7 +533,7 @@ public class Seawater implements MongoEntity { if (totalPrice == null || area == null || StringUtils.isBlank(region) || StringUtils.isBlank(districtName) || room == null) { return false; } - if(StringUtils.isNotBlank(rentType) && (rentType.contains("合租") || rentType.contains("拼租") || rentType.contains("单间"))){ + if(StringUtils.isNotBlank(rentType) && (rentType.contains("鍚堢") || rentType.contains("鎷肩") || rentType.contains("鍗曢棿"))){ return false; } if(area <=30 || area>10000){ @@ -552,11 +552,11 @@ public class Seawater implements MongoEntity { return false; } - if(StringUtils.isNotBlank(estateType) && (estateType.indexOf("商铺")!=-1||estateType.indexOf("写字楼")!=-1)){ + if(StringUtils.isNotBlank(estateType) && (estateType.indexOf("鍟嗛摵")!=-1||estateType.indexOf("鍐欏瓧妤�")!=-1)){ return false; } - String[] words = {"单间","合租","主卧","次卧","隔断","隔间","一间","床位","商铺","写字楼","办公","工作室"}; + String[] words = {"鍗曢棿","鍚堢","涓诲崸","娆″崸","闅旀柇","闅旈棿","涓�闂�","搴婁綅","鍟嗛摵","鍐欏瓧妤�","鍔炲叕","宸ヤ綔瀹�"}; for(String word : words){ if(StringUtils.isNotBlank(name) && name.indexOf(word)!=-1){ diff --git a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/datastore/model/Seaweed.java b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/datastore/model/Seaweed.java index afbb03187..1d2382235 100644 --- a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/datastore/model/Seaweed.java +++ b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/datastore/model/Seaweed.java @@ -16,9 +16,9 @@ import com.fangjia.mongo.persistence.MongoEntity; public class Seaweed implements MongoEntity { public enum CategoryEnum { - DISTRICT("district", "住宅"), // - SHOP("shop", "商铺"), // - OFFICE("office", "写字楼"), // + DISTRICT("district", "浣忓畢"), // + SHOP("shop", "鍟嗛摵"), // + OFFICE("office", "鍐欏瓧妤�"), // ; private final String category; @@ -48,7 +48,7 @@ public class Seaweed implements MongoEntity { } public enum EstateTypeEnum { - DISTRICT("普通住宅"), VILLA("别墅"); + DISTRICT("鏅�氫綇瀹�"), VILLA("鍒"); private final String estateType; EstateTypeEnum(String estateType) { @@ -63,7 +63,7 @@ public class Seaweed implements MongoEntity { if (estateType == null) { return EstateTypeEnum.DISTRICT; } - if (StringUtils.indexOfAny(estateType, new String[] { "别墅" }) > -1) { + if (StringUtils.indexOfAny(estateType, new String[] { "鍒" }) > -1) { return EstateTypeEnum.VILLA; } return EstateTypeEnum.DISTRICT; @@ -94,14 +94,14 @@ public class Seaweed implements MongoEntity { private List addrAlias; private String description; - private Integer avgPrice; // 元/㎡ - private Integer totalPrice; // 万元/套 + private Integer avgPrice; // 鍏�/銕� + private Integer totalPrice; // 涓囧厓/濂� private String mobile; - private List floorplanPics;// 楼层平面图(房型图,户型图)(url列表) + private List floorplanPics;// 妤煎眰骞抽潰鍥撅紙鎴垮瀷鍥�,鎴峰瀷鍥撅級锛坲rl鍒楄〃锛� private List pics; - private List outPics;// 外景图 - private List inPics;// 室内图(实景图) - private List samplePics;// 样板图 + private List outPics;// 澶栨櫙鍥� + private List inPics;// 瀹ゅ唴鍥�(瀹炴櫙鍥�) + private List samplePics;// 鏍锋澘鍥� private List matchingPics; private Long lat2; private Long lng2; diff --git a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/dao/AverageStatisticsDao.java b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/dao/AverageStatisticsDao.java index 4576a2fa4..19e70d89e 100644 --- a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/dao/AverageStatisticsDao.java +++ b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/dao/AverageStatisticsDao.java @@ -28,7 +28,7 @@ public class AverageStatisticsDao extends MongoDaoImpl implem } /** - * 获取最新的一条网络价格 + * 鑾峰彇鏈�鏂扮殑涓�鏉$綉缁滀环鏍� * * @param city * @param region @@ -94,7 +94,7 @@ public class AverageStatisticsDao extends MongoDaoImpl implem } /** - * 找出第三方最近两个月的对比价 + * 鎵惧嚭绗笁鏂规渶杩戜袱涓湀鐨勫姣斾环 * * @param city * @param region @@ -127,7 +127,7 @@ public class AverageStatisticsDao extends MongoDaoImpl implem List> datas = new ArrayList>(); - // 注意:优先使用第三方的二手房价格 + // 娉ㄦ剰锛氫紭鍏堜娇鐢ㄧ涓夋柟鐨勪簩鎵嬫埧浠锋牸 this.addSoufunValue(datas, list); this.addAnjukeValue(datas, list); this.addSinaValue(datas, list); @@ -361,7 +361,7 @@ public class AverageStatisticsDao extends MongoDaoImpl implem } } - //查询某时间范围内的价格 + //鏌ヨ鏌愭椂闂磋寖鍥村唴鐨勪环鏍� public List> findThirdpartsAveragersByDate(String city, String region, String name, String category, Date lineDate) { DBObject q = new BasicDBObject(); @@ -383,7 +383,7 @@ public class AverageStatisticsDao extends MongoDaoImpl implem List> datas = new ArrayList>(); - // 注意:优先使用第三方的二手房价格 + // 娉ㄦ剰锛氫紭鍏堜娇鐢ㄧ涓夋柟鐨勪簩鎵嬫埧浠锋牸 this.addSoufunValue(datas, list); this.addAnjukeValue(datas, list); //this.addSinaValue(datas, list); diff --git a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/dao/BusinessRegionStatDao.java b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/dao/BusinessRegionStatDao.java index c9f85e92e..309a82d45 100644 --- a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/dao/BusinessRegionStatDao.java +++ b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/dao/BusinessRegionStatDao.java @@ -49,7 +49,7 @@ public class BusinessRegionStatDao extends MongoDaoImpl impl } /** - * 保存或者更新 + * 淇濆瓨鎴栬�呮洿鏂� * * @param regionStat */ diff --git a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/dao/DistrictStatDao.java b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/dao/DistrictStatDao.java index 96eba91bc..08b0169bb 100644 --- a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/dao/DistrictStatDao.java +++ b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/dao/DistrictStatDao.java @@ -31,7 +31,7 @@ public class DistrictStatDao extends MongoDaoImpl implements Mongo } /** - * 保存或者更新 + * 淇濆瓨鎴栬�呮洿鏂� * * @param districtStat */ @@ -52,10 +52,10 @@ public class DistrictStatDao extends MongoDaoImpl implements Mongo q.put("region", region); q.put("district_name", districtName); q.put("weekend", weekend); - if (null != estateType && estateType.contains("别墅")) { - q.put("estate_type", "别墅"); + if (null != estateType && estateType.contains("鍒")) { + q.put("estate_type", "鍒"); }else{ - q.put("estate_type", "小区"); + q.put("estate_type", "灏忓尯"); } return this.findOne(q); } @@ -92,8 +92,8 @@ public class DistrictStatDao extends MongoDaoImpl implements Mongo q.put("city", city); q.put("region", region); q.put("district_name", districtName); - if ("普通住宅".equals(estateType)) { - estateType = "小区"; + if ("鏅�氫綇瀹�".equals(estateType)) { + estateType = "灏忓尯"; } q.put("estate_type", estateType); @@ -129,8 +129,8 @@ public class DistrictStatDao extends MongoDaoImpl implements Mongo q.put("region", region); } q.put("district_name", districtName); - if ("普通住宅".equals(estateType)) { - estateType = "小区"; + if ("鏅�氫綇瀹�".equals(estateType)) { + estateType = "灏忓尯"; } q.put("estate_type", estateType); @@ -165,7 +165,7 @@ public class DistrictStatDao extends MongoDaoImpl implements Mongo q.put("city", city); q.put("region", region); q.put("district_name", districtName); - q.put("estate_type", (estateType != null && estateType.indexOf("别墅") > -1 ? "别墅" : "小区")); + q.put("estate_type", (estateType != null && estateType.indexOf("鍒") > -1 ? "鍒" : "灏忓尯")); q.put("weekend", new BasicDBObject("$lte", beforeWeekend)); DBObject sq = new BasicDBObject(); @@ -183,8 +183,8 @@ public class DistrictStatDao extends MongoDaoImpl implements Mongo q.put("city", city); q.put("region", region); q.put("district_name", districtName); - if ("普通住宅".equals(estateType)) { - estateType = "小区"; + if ("鏅�氫綇瀹�".equals(estateType)) { + estateType = "灏忓尯"; } q.put("estate_type", estateType); @@ -203,8 +203,8 @@ public class DistrictStatDao extends MongoDaoImpl implements Mongo q.put("city", city); q.put("region", region); q.put("district_name", name); - if (estateType.indexOf("普通住宅") > -1) { - estateType = "小区"; + if (estateType.indexOf("鏅�氫綇瀹�") > -1) { + estateType = "灏忓尯"; } q.put("estate_type", estateType); this.delete(q); diff --git a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/dao/DistrictStatRentDao.java b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/dao/DistrictStatRentDao.java index 3037faaca..792fd01a8 100644 --- a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/dao/DistrictStatRentDao.java +++ b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/dao/DistrictStatRentDao.java @@ -220,7 +220,7 @@ public class DistrictStatRentDao extends MongoDaoImpl implemen /** - * 保存或者更新 + * 淇濆瓨鎴栬�呮洿鏂� * * @param RentStatDao */ diff --git a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/dao/GuidingPriceDao.java b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/dao/GuidingPriceDao.java index 58e7afee2..5e7c52387 100644 --- a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/dao/GuidingPriceDao.java +++ b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/dao/GuidingPriceDao.java @@ -39,7 +39,7 @@ public class GuidingPriceDao extends MongoDaoImpl implements Mongo q.put("name", name); q.put("category", category); if (estateType != null) { - q.put("estate_type", estateType.indexOf("别墅") > -1 ? Seaweed.EstateTypeEnum.VILLA.getEstateType() : Seaweed.EstateTypeEnum.DISTRICT.getEstateType()); + q.put("estate_type", estateType.indexOf("鍒") > -1 ? Seaweed.EstateTypeEnum.VILLA.getEstateType() : Seaweed.EstateTypeEnum.DISTRICT.getEstateType()); } GuidingPrice gp = this.findOne(q); if (gp != null) { @@ -60,7 +60,7 @@ public class GuidingPriceDao extends MongoDaoImpl implements Mongo q.put("name", name); q.put("category", category); if (estateType != null) { - q.put("estate_type", estateType.indexOf("别墅") > -1 ? Seaweed.EstateTypeEnum.VILLA.getEstateType() : Seaweed.EstateTypeEnum.DISTRICT.getEstateType()); + q.put("estate_type", estateType.indexOf("鍒") > -1 ? Seaweed.EstateTypeEnum.VILLA.getEstateType() : Seaweed.EstateTypeEnum.DISTRICT.getEstateType()); } DBObject sq = new BasicDBObject(); diff --git a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/dao/RegionBlockDao.java b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/dao/RegionBlockDao.java index 270fd64a8..a1b071202 100644 --- a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/dao/RegionBlockDao.java +++ b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/dao/RegionBlockDao.java @@ -120,7 +120,7 @@ public class RegionBlockDao extends MongoDaoImpl implements MongoDa return BLOCKS_MAP.get(city + "-" + region + "-" + block); } - //判断是不是区域 + //鍒ゆ柇鏄笉鏄尯鍩� public boolean isRegion(String city, String orgRegion) { // List regions = findRegions(city); List regions = findRegionsByCity(city); @@ -142,7 +142,7 @@ public class RegionBlockDao extends MongoDaoImpl implements MongoDa return false; } - // 判断是否是板块 + // 鍒ゆ柇鏄惁鏄澘鍧� public boolean isBlock(String city, String orgBlock) { // List blocks = findBlocks(city); List blocks = findBlocksByCity(city); @@ -164,7 +164,7 @@ public class RegionBlockDao extends MongoDaoImpl implements MongoDa return false; } - //标准化板块 + //鏍囧噯鍖栨澘鍧� public String formatRegionFromBlock(String city, String block) { // List blocks = findBlocks(city); @@ -190,7 +190,7 @@ public class RegionBlockDao extends MongoDaoImpl implements MongoDa return block; } - //标准化区域 + //鏍囧噯鍖栧尯鍩� public String formatRegion(String city, String orgRegion) { // List regions = findRegions(city); //modify by shibb diff --git a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/dao/RegionStatDao.java b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/dao/RegionStatDao.java index c1203bd73..f97723a66 100644 --- a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/dao/RegionStatDao.java +++ b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/dao/RegionStatDao.java @@ -64,7 +64,7 @@ public class RegionStatDao extends MongoDaoImpl implements MongoDao< } /** - * 保存或者更新 + * 淇濆瓨鎴栬�呮洿鏂� * * @param regionStat */ @@ -117,7 +117,7 @@ public class RegionStatDao extends MongoDaoImpl implements MongoDao< } /** - * 找指定日期的均价,如果没有就向前或向后推skipWeekends个星期 + * 鎵炬寚瀹氭棩鏈熺殑鍧囦环锛屽鏋滄病鏈夊氨鍚戝墠鎴栧悜鍚庢帹skipWeekends涓槦鏈� * * @param city * @param region diff --git a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/dao/RentStatDao.java b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/dao/RentStatDao.java index a0ad6848f..7da97627d 100644 --- a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/dao/RentStatDao.java +++ b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/dao/RentStatDao.java @@ -34,7 +34,7 @@ public class RentStatDao extends MongoDaoImpl implements MongoDao implements MongoDao< List list = this.findAll(null, sq); List citys = new ArrayList(); for (ServerArea sa : list) { - if(!sa.getDisplay().equals("全国")){ + if(!sa.getDisplay().equals("鍏ㄥ浗")){ citys.add(sa.getDisplay()); } @@ -89,7 +89,7 @@ public class ServerAreaDao extends MongoDaoImpl implements MongoDao< public static void main(String[] args) { ServerAreaDao sd = ServerAreaDao.getInstance(); - ServerArea sa = sd.findServerArea("常熟"); + ServerArea sa = sd.findServerArea("甯哥啛"); System.out.println(sa); } diff --git a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/model/AverageStatistics.java b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/model/AverageStatistics.java index 13def921c..f470fec66 100644 --- a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/model/AverageStatistics.java +++ b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/model/AverageStatistics.java @@ -62,26 +62,26 @@ public class AverageStatistics implements MongoEntity { private Double chineseOfficePriceDiff; private Double chineseOfficeRentDiff; - /**兔博士均价数据*/ + /**鍏斿崥澹潎浠锋暟鎹�*/ private Integer tuboshiNewPrice; private Double tuboshiNewDiff; private Integer tuboshiEsfPrice; private Double tuboshiEsfDiff; - /**链家均价数据*/ + /**閾惧鍧囦环鏁版嵁*/ private Integer lianjiaEsfPrice; private Double lianjiaEsfDiff; private Integer lianjiaNewPrice; private Double lianjiaNewDiff; - /**房估估均价数据*/ + /**鎴夸及浼板潎浠锋暟鎹�*/ private Integer fangguguNewPrice; private Double fangguguNewDiff; private Integer fangguguEsfPrice; private Double fangguguEsfDiff; - /**云估价均价数据*/ + /**浜戜及浠峰潎浠锋暟鎹�*/ private Integer yungujiaNewPrice; private Double yungujiaNewDiff; private Integer yungujiaEsfPrice; diff --git a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/model/AveragerConfig.java b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/model/AveragerConfig.java index 3c120d3bd..66de6ec26 100644 --- a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/model/AveragerConfig.java +++ b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/model/AveragerConfig.java @@ -16,27 +16,27 @@ public class AveragerConfig implements MongoEntity { private String city; private String region; private String name; - private Integer status; // 0-正常 1-禁用 + private Integer status; // 0-姝e父 1-绂佺敤 private Boolean caseRegion; - private Integer sampleFetchCount; // 样本获取数量 - private Integer sampleMaxValue; // 样本允许最大值 - private Integer sampleMinValue; // 样本允许最小值 - private Integer ownTypeLimit; // 自身样本计算的最低要求 - private Integer sampleQueueStart; // 样本队列取值区间最小值 - private Integer sampleQueueEnd; // 样本队列取值区间最大值 - private Integer aroundRadius; // 周边最大半径 - private Integer aroundLimit; // 周边小区最大数量限制 - private Map timeWeights; //时间权重设置{key:value}时间:值 - private Map siteWeights; //网站权重设置{key:value}根域:值 - private Map siteFactors; //网站涨跌系数设置{key:value}根域:值 - private Integer maxThirdDiff; // 与第三方价格允许的最大范围 - private Double hardPercent; //强制价格调整系数 - private Integer valueCluType; //类簇的用值类型 0-默认 1-中位数 2-最大值 3-最小值 - private Integer aroundDiffMinPercent; //样本与周边对比的最小相差比例 - private Integer aroundDiffMaxPercent; //样本与周边对比的最大相差比例 - private Integer guidingPriceExpirationDay; //指导价过期天数 - private Integer uncomforableSampleDay; //样本换算需要间隔时间 - private Integer masterIntervenePercent; //主小区影响从小区可信度衰减比例 + private Integer sampleFetchCount; // 鏍锋湰鑾峰彇鏁伴噺 + private Integer sampleMaxValue; // 鏍锋湰鍏佽鏈�澶у�� + private Integer sampleMinValue; // 鏍锋湰鍏佽鏈�灏忓�� + private Integer ownTypeLimit; // 鑷韩鏍锋湰璁$畻鐨勬渶浣庤姹� + private Integer sampleQueueStart; // 鏍锋湰闃熷垪鍙栧�煎尯闂存渶灏忓�� + private Integer sampleQueueEnd; // 鏍锋湰闃熷垪鍙栧�煎尯闂存渶澶у�� + private Integer aroundRadius; // 鍛ㄨ竟鏈�澶у崐寰� + private Integer aroundLimit; // 鍛ㄨ竟灏忓尯鏈�澶ф暟閲忛檺鍒� + private Map timeWeights; //鏃堕棿鏉冮噸璁剧疆{key:value}鏃堕棿:鍊� + private Map siteWeights; //缃戠珯鏉冮噸璁剧疆{key:value}鏍瑰煙:鍊� + private Map siteFactors; //缃戠珯娑ㄨ穼绯绘暟璁剧疆{key:value}鏍瑰煙:鍊� + private Integer maxThirdDiff; // 涓庣涓夋柟浠锋牸鍏佽鐨勬渶澶ц寖鍥� + private Double hardPercent; //寮哄埗浠锋牸璋冩暣绯绘暟 + private Integer valueCluType; //绫荤皣鐨勭敤鍊肩被鍨� 0-榛樿 1-涓綅鏁� 2-鏈�澶у�� 3-鏈�灏忓�� + private Integer aroundDiffMinPercent; //鏍锋湰涓庡懆杈瑰姣旂殑鏈�灏忕浉宸瘮渚� + private Integer aroundDiffMaxPercent; //鏍锋湰涓庡懆杈瑰姣旂殑鏈�澶х浉宸瘮渚� + private Integer guidingPriceExpirationDay; //鎸囧浠疯繃鏈熷ぉ鏁� + private Integer uncomforableSampleDay; //鏍锋湰鎹㈢畻闇�瑕侀棿闅旀椂闂� + private Integer masterIntervenePercent; //涓诲皬鍖哄奖鍝嶄粠灏忓尯鍙俊搴﹁“鍑忔瘮渚� private Date modificationDate; diff --git a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/model/CalcCommand.java b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/model/CalcCommand.java index d8c3a3235..7bd9f11b4 100644 --- a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/model/CalcCommand.java +++ b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/model/CalcCommand.java @@ -22,27 +22,27 @@ public class CalcCommand implements MongoEntity { private String name; private String block; private String category; - private String estateType; // 物业类型(普通住宅、别墅、商住楼) - private Integer calcType; // 计算类型(0-指定日期计算 1-全部重算 2-全部补充重算) - private Date calcDate; // 计算日期 - private int status; // 命令状态 0-初始状态 1-处理中 2-处理完成 3-处理异常 - private int priority; // 优先级 0-普通(后台人员操作) 1-中(每周算均价的标志) 2-高(预留标志位,特殊情况下使用) + private String estateType; // 鐗╀笟绫诲瀷锛堟櫘閫氫綇瀹呫�佸埆澧呫�佸晢浣忔ゼ锛� + private Integer calcType; // 璁$畻绫诲瀷(0-鎸囧畾鏃ユ湡璁$畻 1-鍏ㄩ儴閲嶇畻 2-鍏ㄩ儴琛ュ厖閲嶇畻) + private Date calcDate; // 璁$畻鏃ユ湡 + private int status; // 鍛戒护鐘舵�� 0-鍒濆鐘舵�� 1-澶勭悊涓� 2-澶勭悊瀹屾垚 3-澶勭悊寮傚父 + private int priority; // 浼樺厛绾� 0-鏅��(鍚庡彴浜哄憳鎿嶄綔) 1-涓紙姣忓懆绠楀潎浠风殑鏍囧織锛� 2-楂橈紙棰勭暀鏍囧織浣嶏紝鐗规畩鎯呭喌涓嬩娇鐢級 private Date creationDate; private String remark; private Map extraMap; private Integer houseType; public enum StatusEnum { - INIT(0), // 等待处理 - CALCING(1), // 正在计算 - CALC_SUC(102), // 计算成功 - REING(103), // 正在回溯 - TRANSFER(104), //数据迁移 - TRANSFERING(105), //迁移完成 - SUC(2), // 完成 - FAIL(3), // 无法计算 - EXCEPTION(4), // 程序异常 - ERR(5); // 指令错误 + INIT(0), // 绛夊緟澶勭悊 + CALCING(1), // 姝e湪璁$畻 + CALC_SUC(102), // 璁$畻鎴愬姛 + REING(103), // 姝e湪鍥炴函 + TRANSFER(104), //鏁版嵁杩佺Щ + TRANSFERING(105), //杩佺Щ瀹屾垚 + SUC(2), // 瀹屾垚 + FAIL(3), // 鏃犳硶璁$畻 + EXCEPTION(4), // 绋嬪簭寮傚父 + ERR(5); // 鎸囦护閿欒 private final int status; @@ -56,9 +56,9 @@ public class CalcCommand implements MongoEntity { } public enum CalcTypeEnum { - CALC_BY_DATE(0), // 计算本周 - CALC_ALL_WEEKS(1), // 全部重算 - CALC_GAP_WEEKS(2); // 全部补充重算 + CALC_BY_DATE(0), // 璁$畻鏈懆 + CALC_ALL_WEEKS(1), // 鍏ㄩ儴閲嶇畻 + CALC_GAP_WEEKS(2); // 鍏ㄩ儴琛ュ厖閲嶇畻 private final int calcType; @@ -210,7 +210,7 @@ public class CalcCommand implements MongoEntity { } /** - * 板块命令 + * 鏉垮潡鍛戒护 * @return */ public boolean isCommandOfBlock() { @@ -221,7 +221,7 @@ public class CalcCommand implements MongoEntity { } /** - * 区域命令 + * 鍖哄煙鍛戒护 * @return */ public boolean isCommandOfRegion() { @@ -232,7 +232,7 @@ public class CalcCommand implements MongoEntity { } /** - * 城市命令 + * 鍩庡競鍛戒护 * @return */ public boolean isCommandOfCity() { @@ -243,7 +243,7 @@ public class CalcCommand implements MongoEntity { } /** - * 小区命令 + * 灏忓尯鍛戒护 * @return */ public boolean isCommandOfDistrict() { diff --git a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/model/CalcConfig.java b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/model/CalcConfig.java index 9b18bebd9..b89165009 100644 --- a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/model/CalcConfig.java +++ b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/model/CalcConfig.java @@ -20,14 +20,14 @@ public class CalcConfig implements MongoEntity { private String region; private String name; private String category; // disrict - private String estateType; // 物业类型(普通住宅、别墅、商住楼) - private Integer repeatCount; //小区名重复数 - private Date statStartDate; // 理论上开始计算价格日期 - private Date calcStartDate; // 均价数据中的开始时间 + private String estateType; // 鐗╀笟绫诲瀷锛堟櫘閫氫綇瀹呫�佸埆澧呫�佸晢浣忔ゼ锛� + private Integer repeatCount; //灏忓尯鍚嶉噸澶嶆暟 + private Date statStartDate; // 鐞嗚涓婂紑濮嬭绠椾环鏍兼棩鏈� + private Date calcStartDate; // 鍧囦环鏁版嵁涓殑寮�濮嬫椂闂� -// private boolean trendSynced; // 历史曲线是否被重画过(calc_value和avg_price保持一致) -// private Date sampleStartDate; // 可供计算的样本开始时间 -// private Integer logicalMaxValue; // 合理的最大最小值 +// private boolean trendSynced; // 鍘嗗彶鏇茬嚎鏄惁琚噸鐢昏繃(calc_value鍜宎vg_price淇濇寔涓�鑷�) +// private Date sampleStartDate; // 鍙緵璁$畻鐨勬牱鏈紑濮嬫椂闂� +// private Integer logicalMaxValue; // 鍚堢悊鐨勬渶澶ф渶灏忓�� // private Integer logicalMinValue; @Id diff --git a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/model/DealPrice.java b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/model/DealPrice.java index dcf7161ef..39137347d 100644 --- a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/model/DealPrice.java +++ b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/model/DealPrice.java @@ -32,12 +32,12 @@ public class DealPrice implements MongoEntity { private Date creationDate; public enum SourceEnum { - JIAOYIZHONGXIN("交易中心"), // - SOUFUN("搜房"), // - SINA("新浪"), // - MYTOPHOME("满堂红"), // - HOMELINK("链家在线"), // - ZHONGJIE("中介成交"), // + JIAOYIZHONGXIN("浜ゆ槗涓績"), // + SOUFUN("鎼滄埧"), // + SINA("鏂版氮"), // + MYTOPHOME("婊″爞绾�"), // + HOMELINK("閾惧鍦ㄧ嚎"), // + ZHONGJIE("涓粙鎴愪氦"), // ; private final String category; diff --git a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/model/DistrictStatRent.java b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/model/DistrictStatRent.java index cb8e34475..cdea17868 100644 --- a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/model/DistrictStatRent.java +++ b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/model/DistrictStatRent.java @@ -10,7 +10,7 @@ import javax.persistence.Id; import com.fangjia.mongo.persistence.MongoEntity; /** - * 小区租金表 + * 灏忓尯绉熼噾琛� */ @Entity public class DistrictStatRent implements MongoEntity{ @@ -19,23 +19,23 @@ public class DistrictStatRent implements MongoEntity{ private static final long serialVersionUID = -916751186255993337L; private String id; - private String city;//城市 - private String region;//区域 - private String block;//板块 - private String districtName;//楼盘名称 - private String estateType;//物业类型 - private int houseType;//房型 - private int markup;//月涨跌幅 - private int avgPrice;//租金 - private int houseCount;//房源量 - private String cluster;//聚类结果 - private Date endMonthDate;//计算时间,月末 - private Date creationDate;//创建时间 - private Date modificationDate;//修改时间 - private String sampleEnum;//计算方式 - private double credit; //可信度 + private String city;//鍩庡競 + private String region;//鍖哄煙 + private String block;//鏉垮潡 + private String districtName;//妤肩洏鍚嶇О + private String estateType;//鐗╀笟绫诲瀷 + private int houseType;//鎴垮瀷 + private int markup;//鏈堟定璺屽箙 + private int avgPrice;//绉熼噾 + private int houseCount;//鎴挎簮閲� + private String cluster;//鑱氱被缁撴灉 + private Date endMonthDate;//璁$畻鏃堕棿,鏈堟湯 + private Date creationDate;//鍒涘缓鏃堕棿 + private Date modificationDate;//淇敼鏃堕棿 + private String sampleEnum;//璁$畻鏂瑰紡 + private double credit; //鍙俊搴� - private String oldSampleEnum;//老计算方式 + private String oldSampleEnum;//鑰佽绠楁柟寮� private int oldValue; diff --git a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/model/DynamicLog.java b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/model/DynamicLog.java index a9c783f54..30009edbf 100644 --- a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/model/DynamicLog.java +++ b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/model/DynamicLog.java @@ -18,25 +18,25 @@ public class DynamicLog implements MongoEntity{ */ private static final long serialVersionUID = -5067684444463333866L; - //int类型字段一律0表示正确,1表示错误 + //int绫诲瀷瀛楁涓�寰�0琛ㄧず姝g‘锛�1琛ㄧず閿欒 private String id; - private String jodId;//抓取任务id + private String jodId;//鎶撳彇浠诲姟id private String category; - private String siteName;//网站名称 - private String pageName;//网页名称 + private String siteName;//缃戠珯鍚嶇О + private String pageName;//缃戦〉鍚嶇О private String city; private String url; - private int content;//解析结果为空 - private int cat;//物业类型错误 - private int cityRegionName;//城市区域小区名错误 - private int area;//面积不存在 - private int areaContent;//面积字段值错误不在合理区间 - private int totalPrice;//总价不存在 - private int totalPriceContent;//总价值错误不在合理区间 - private int name;//标题不存在 - private int publishDate;//发布日期不存在 - private int result;//解析结果 - private Date createDate;//日志记录日期 + private int content;//瑙f瀽缁撴灉涓虹┖ + private int cat;//鐗╀笟绫诲瀷閿欒 + private int cityRegionName;//鍩庡競鍖哄煙灏忓尯鍚嶉敊璇� + private int area;//闈㈢Н涓嶅瓨鍦� + private int areaContent;//闈㈢Н瀛楁鍊奸敊璇笉鍦ㄥ悎鐞嗗尯闂� + private int totalPrice;//鎬讳环涓嶅瓨鍦� + private int totalPriceContent;//鎬讳环鍊奸敊璇笉鍦ㄥ悎鐞嗗尯闂� + private int name;//鏍囬涓嶅瓨鍦� + private int publishDate;//鍙戝竷鏃ユ湡涓嶅瓨鍦� + private int result;//瑙f瀽缁撴灉 + private Date createDate;//鏃ュ織璁板綍鏃ユ湡 private int nameLength;// private int room;// diff --git a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/model/NetworkPrice.java b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/model/NetworkPrice.java index 7c99bbd3f..be959ee05 100644 --- a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/model/NetworkPrice.java +++ b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/model/NetworkPrice.java @@ -17,23 +17,23 @@ public class NetworkPrice implements MongoEntity { */ private static final long serialVersionUID = -7214259622146847276L; private String id; - private String city;// 城市 - private String region;//区域 - private String name;//小区名称 - private String sid;//小区编号 - private String distId;//小区库中自动增涨的id - private Integer avgPrice;//价格 - private Double credit;//价格可信度 + private String city;// 鍩庡競 + private String region;//鍖哄煙 + private String name;//灏忓尯鍚嶇О + private String sid;//灏忓尯缂栧彿 + private String distId;//灏忓尯搴撲腑鑷姩澧炴定鐨刬d + private Integer avgPrice;//浠锋牸 + private Double credit;//浠锋牸鍙俊搴� - private String yungujiaName;//云估价小区名称 - private Integer yungujiaDistrictId;//云估价小区编号 - private Integer yungujiaPrice;//云估价小区价格 + private String yungujiaName;//浜戜及浠峰皬鍖哄悕绉� + private Integer yungujiaDistrictId;//浜戜及浠峰皬鍖虹紪鍙� + private Integer yungujiaPrice;//浜戜及浠峰皬鍖轰环鏍� - private String fangguguName;//房估估小区名称 - private Integer fangguguDistrictId;//房估估小区编号 - private Integer fangguguPrice;//房估估小区价格 + private String fangguguName;//鎴夸及浼板皬鍖哄悕绉� + private Integer fangguguDistrictId;//鎴夸及浼板皬鍖虹紪鍙� + private Integer fangguguPrice;//鎴夸及浼板皬鍖轰环鏍� - private Integer peopleMark;//1:人工操作 + private Integer peopleMark;//1:浜哄伐鎿嶄綔 private Date cDate; diff --git a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/model/RegionBlock.java b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/model/RegionBlock.java index fa296cbe9..63a8d0358 100644 --- a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/model/RegionBlock.java +++ b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/model/RegionBlock.java @@ -29,7 +29,7 @@ public class RegionBlock implements MongoEntity { private Long lng2; private Long lat2; - private Integer sequence;// 显示顺序,从小到大 + private Integer sequence;// 鏄剧ず椤哄簭锛屼粠灏忓埌澶� private Integer show; public RegionBlock() { diff --git a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/model/RegionStat.java b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/model/RegionStat.java index 0d0572b7b..5ff0e0dfe 100644 --- a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/model/RegionStat.java +++ b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/model/RegionStat.java @@ -28,8 +28,8 @@ public class RegionStat implements MongoEntity { private int markup; private int weekendMarkup; private int sampleSize; - private double credit; // 可信度 - private double coverage; // 小区覆盖率 + private double credit; // 鍙俊搴� + private double coverage; // 灏忓尯瑕嗙洊鐜� private Date creationDate; private Date modificationDate; diff --git a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/model/RegionStatRent.java b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/model/RegionStatRent.java index 679d374ba..e5cca6be2 100644 --- a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/model/RegionStatRent.java +++ b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/model/RegionStatRent.java @@ -10,7 +10,7 @@ import javax.persistence.Id; import com.fangjia.mongo.persistence.MongoEntity; /*** - * 区域租金表 + * 鍖哄煙绉熼噾琛� * */ @Entity @@ -21,13 +21,13 @@ public class RegionStatRent implements MongoEntity{ private static final long serialVersionUID = 4584300291549551577L; private String id; - private String city;//城市 - private String region;//区域 - private Date endMonthDate;//计算月份,月末 - private int avgPrice;//租金价格 - private int houseType;//房型 - private int count;//房源量 - private Date creationDate;//创建时间 + private String city;//鍩庡競 + private String region;//鍖哄煙 + private Date endMonthDate;//璁$畻鏈堜唤,鏈堟湯 + private int avgPrice;//绉熼噾浠锋牸 + private int houseType;//鎴垮瀷 + private int count;//鎴挎簮閲� + private Date creationDate;//鍒涘缓鏃堕棿 @Id @GeneratedValue @Column(name = "_id") diff --git a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/model/ServerArea.java b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/model/ServerArea.java index b424d62ce..c2573c78a 100644 --- a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/model/ServerArea.java +++ b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/model/ServerArea.java @@ -17,11 +17,11 @@ public class ServerArea implements MongoEntity { public static enum ServerAreaStatusEnum { /** - * 备用城市 + * 澶囩敤鍩庡競 */ NOT_USED(0), /** - * 线上 + * 绾夸笂 */ PRODUCTION(2); private final int value; @@ -80,7 +80,7 @@ public class ServerArea implements MongoEntity { private int cityGrade; - private Integer sequence; // 显示顺序,从小到大 + private Integer sequence; // 鏄剧ず椤哄簭锛屼粠灏忓埌澶� private Integer falshVersion; @@ -213,7 +213,7 @@ public class ServerArea implements MongoEntity { } /** - * 城市级别 + * 鍩庡競绾у埆 * * @return */ diff --git a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/model/SqmetreRent.java b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/model/SqmetreRent.java index 35f5da172..79da3be46 100644 --- a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/model/SqmetreRent.java +++ b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/model/SqmetreRent.java @@ -18,19 +18,19 @@ public class SqmetreRent implements MongoEntity{ private String id; - private String city;//城市 - private String region;//区域 + private String city;//鍩庡競 + private String region;//鍖哄煙 private String districtName; - private Date weekend;//计算时间 - private double avgPrice;//租金价格 - private double oldValue;//租金价格 - private int count;//房源量 - private Date creationDate;//创建时间 - private int markup;//月涨跌幅 - private double credit; //可信度 - private String cluster;//聚类结果 - private String cat;//类型 - private String sampleEnum;//计算方式 + private Date weekend;//璁$畻鏃堕棿 + private double avgPrice;//绉熼噾浠锋牸 + private double oldValue;//绉熼噾浠锋牸 + private int count;//鎴挎簮閲� + private Date creationDate;//鍒涘缓鏃堕棿 + private int markup;//鏈堟定璺屽箙 + private double credit; //鍙俊搴� + private String cluster;//鑱氱被缁撴灉 + private String cat;//绫诲瀷 + private String sampleEnum;//璁$畻鏂瑰紡 @Id @GeneratedValue diff --git a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/persistence/AbstractJpaCompatibleDao.java b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/persistence/AbstractJpaCompatibleDao.java index 7ca6230ba..dc3dbfcf9 100644 --- a/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/persistence/AbstractJpaCompatibleDao.java +++ b/projects/fangjia-coredata-dal/src/main/java/com/fangjia/mongo/persistence/AbstractJpaCompatibleDao.java @@ -120,7 +120,7 @@ public abstract class AbstractJpaCompatibleDao { /** - * 根据id查找对象 + * 鏍规嵁id鏌ユ壘瀵硅薄 * * @param id * @return @@ -24,14 +24,14 @@ public interface EntityDao { E findById(K id); /** - * 查找所有对象 + * 鏌ユ壘鎵�鏈夊璞� * * @return */ List findAll(); /** - * 根据id列表查找所有对象,返回的列表根据传入的idList排序 + * 鏍规嵁id鍒楄〃鏌ユ壘鎵�鏈夊璞★紝杩斿洖鐨勫垪琛ㄦ牴鎹紶鍏ョ殑idList鎺掑簭 * * @param idList * @return @@ -39,35 +39,35 @@ public interface EntityDao { List findAllByIds(List idList); /** - * 向数据库插入一条数据 + * 鍚戞暟鎹簱鎻掑叆涓�鏉℃暟鎹� * * @param entity */ void save(E entity); /** - * 向数据库插入一批数据 + * 鍚戞暟鎹簱鎻掑叆涓�鎵规暟鎹� * * @param entities */ void saveList(List entities); /** - * 根据id删除一条数据 + * 鏍规嵁id鍒犻櫎涓�鏉℃暟鎹� * * @param id */ void deleteById(K id); /** - * 根据id列表删除一批数据 + * 鏍规嵁id鍒楄〃鍒犻櫎涓�鎵规暟鎹� * * @param idList */ void deleteByIds(List idList); /** - * 得到对应的实体类 + * 寰楀埌瀵瑰簲鐨勫疄浣撶被 * * @return */ diff --git a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/modeana/ModeAnalyze.java b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/modeana/ModeAnalyze.java index 786b91380..d1e1ba7e3 100644 --- a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/modeana/ModeAnalyze.java +++ b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/modeana/ModeAnalyze.java @@ -70,14 +70,14 @@ public class ModeAnalyze { } /** - * 模式解析 + * 妯″紡瑙f瀽 * * @param text - * 输入文本 + * 杈撳叆鏂囨湰 * @param cat - * 所属类型 + * 鎵�灞炵被鍨� * @param fields - * 要解析的字段列表 + * 瑕佽В鏋愮殑瀛楁鍒楄〃 * @return */ public static Map analyze(String text, String cat, List fields) { @@ -91,12 +91,12 @@ public class ModeAnalyze { } } - // 输入文本为空 + // 杈撳叆鏂囨湰涓虹┖ if (StringUtils.isBlank(text)) { return Collections.emptyMap(); } - // 获得所属类型的解析配置 + // 鑾峰緱鎵�灞炵被鍨嬬殑瑙f瀽閰嶇疆 List tmpFields; if (StringUtils.isBlank(cat)) { tmpFields = FIELDS.get("all"); @@ -108,7 +108,7 @@ public class ModeAnalyze { return Collections.emptyMap(); } - // 获取要用的解析配置 + // 鑾峰彇瑕佺敤鐨勮В鏋愰厤缃� List anaFields = new ArrayList(); if (CollectionUtils.isNotEmpty(fields)) { for (ModeAnalyField f : tmpFields) { @@ -124,7 +124,7 @@ public class ModeAnalyze { return Collections.emptyMap(); } - // 开始解析 + // 寮�濮嬭В鏋� Map ret = new HashMap(anaFields.size()); String[] strArr = text.split("\n"); for (int i = 0; i < strArr.length; i++) { @@ -165,7 +165,7 @@ public class ModeAnalyze { if (null == str) return null; - str = str.replaceAll("^[\\s ]*|[\\s ]*$", ""); + str = str.replaceAll("^[\\s銆�]*|[\\s ]*$", ""); str = str.replaceAll(" ", ""); str = DataUtil.encoding(str).replaceAll("^\\?*|\\?*$", ""); return str; @@ -201,7 +201,7 @@ public class ModeAnalyze { public static void main(String[] args) { /*Map ret = analyze( - "装修状况:暂无 预售证:暂无 产权年限:暂无 物业费:0.50元/平 建筑面积:22000平方米 绿化率:37.3% 物业公司:暂无 容积率:0.86 交通状况:主要公交路线8路、2路 停车位:暂无 ", null, + "瑁呬慨鐘跺喌锛氭殏鏃� 棰勫敭璇侊細鏆傛棤 浜ф潈骞撮檺锛氭殏鏃� 鐗╀笟璐癸細0.50鍏�/骞� 寤虹瓚闈㈢Н锛�22000骞虫柟绫� 缁垮寲鐜囷細37.3% 鐗╀笟鍏徃锛氭殏鏃� 瀹圭Н鐜囷細0.86 浜ら�氱姸鍐碉細涓昏鍏氦璺嚎8璺��2璺� 鍋滆溅浣嶏細鏆傛棤 ", null, null); for (String k : ret.keySet()) { System.out.println(k + " : " + ret.get(k)); diff --git a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/ConsumerStarter.java b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/ConsumerStarter.java index 2e833318c..5608b8a6c 100644 --- a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/ConsumerStarter.java +++ b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/ConsumerStarter.java @@ -2,7 +2,7 @@ package com.fangjia.coredata.price; /** - * 后台计算小区均价 + * 鍚庡彴璁$畻灏忓尯鍧囦环 * * @author xiaoyu * @@ -55,7 +55,7 @@ public class ConsumerStarter { // removeDistrictStat(weekends.get(0), command.getCity(), command.getRegion(), command.getDistrictName()); // for (Date weekend : weekends) { // Coredata coredata = new Coredata(CalcDataCategoryEnum.SELL, command.getCity(), weekend, SAMPLE_DAY); -// if (commandDistrict.isVilla() && "别墅".equals(command.getEstateType())) { +// if (commandDistrict.isVilla() && "鍒".equals(command.getEstateType())) { // coredata.calcDistrict(command.getRegion(), command.getDistrictName(), CategoryEnum.DISTRICT, // EstateTypeEnum.VILLA); // isrecalc = true; diff --git a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/Coredata.java b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/Coredata.java index 2aedc3bac..d3f4bc711 100644 --- a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/Coredata.java +++ b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/Coredata.java @@ -97,33 +97,33 @@ public class Coredata { dataHolder = new DataHolder(dataCategory, city, calcDate, sampleDay,enable_memory); - if (CalcDataCategoryEnum.SELL.equals(dataCategory)) {// 二手房均价 + if (CalcDataCategoryEnum.SELL.equals(dataCategory)) {// 浜屾墜鎴垮潎浠� provider = new SellHouseDataProvider(dataHolder); calculator = new SellHouseAverageCalculator(provider); operator = new SellHouseResultOperator(); categoryEnum = CategoryEnum.DISTRICT; - } else if (CalcDataCategoryEnum.SHOP_SELL.equals(dataCategory)) {// 商铺出售均价 + } else if (CalcDataCategoryEnum.SHOP_SELL.equals(dataCategory)) {// 鍟嗛摵鍑哄敭鍧囦环 provider = new SellShopOfficeDataProvider(dataHolder); calculator = new SellShopOfficeAverageCalculator(provider); operator = new SellShopOfficeResultOperator(); categoryEnum = CategoryEnum.SHOP; - } else if (CalcDataCategoryEnum.OFFICE_SELL.equals(dataCategory)) {// 写字楼出售均价 + } else if (CalcDataCategoryEnum.OFFICE_SELL.equals(dataCategory)) {// 鍐欏瓧妤煎嚭鍞潎浠� provider = new SellShopOfficeDataProvider(dataHolder); calculator = new SellShopOfficeAverageCalculator(provider); operator = new SellShopOfficeResultOperator(); categoryEnum = CategoryEnum.OFFICE; - } else if (CalcDataCategoryEnum.SHOP_RENT.equals(dataCategory)) {// 商铺出租均价 + } else if (CalcDataCategoryEnum.SHOP_RENT.equals(dataCategory)) {// 鍟嗛摵鍑虹鍧囦环 provider = new RentShopOfficeDataProvider(dataHolder); calculator = new RentShopOfficeAverageCalculator(provider); operator = new RentShopOfficeResultOperator(); categoryEnum = CategoryEnum.SHOP; - }else if (CalcDataCategoryEnum.OFFICE_RENT.equals(dataCategory)) {// 写字楼出租均价 + }else if (CalcDataCategoryEnum.OFFICE_RENT.equals(dataCategory)) {// 鍐欏瓧妤煎嚭绉熷潎浠� provider = new RentShopOfficeDataProvider(dataHolder); calculator = new RentShopOfficeAverageCalculator(provider); operator = new RentShopOfficeResultOperator(); categoryEnum = CategoryEnum.OFFICE; - }else if (CalcDataCategoryEnum.RENT.equals(dataCategory)) {// 小区租金均价 + }else if (CalcDataCategoryEnum.RENT.equals(dataCategory)) {// 灏忓尯绉熼噾鍧囦环 provider = new RentHouseDataProvider(dataHolder); calculator = new RentHouseAverageCalculator(provider); operator = new RentHouseResultOperator(); @@ -132,7 +132,7 @@ public class Coredata { } /** - * 计算城市均价 + * 璁$畻鍩庡競鍧囦环 * */ public void calcCity() { @@ -141,7 +141,7 @@ public class Coredata { } /** - * 计算城市的区域均价 + * 璁$畻鍩庡競鐨勫尯鍩熷潎浠� * */ public void calcRegion() { @@ -155,7 +155,7 @@ public class Coredata { } /** - * 计算城市的板块均价 + * 璁$畻鍩庡競鐨勬澘鍧楀潎浠� * */ public void calcBlock() { @@ -174,7 +174,7 @@ public class Coredata { } /** - * 计算城市的小区均价 + * 璁$畻鍩庡競鐨勫皬鍖哄潎浠� * */ public void calcDistrict() { @@ -183,7 +183,7 @@ public class Coredata { int c = 0; for (DistrictKey key : districtMap.keySet()) { if(c == 2584){ - System.out.println("怡德苑-闵行-上海"); + System.out.println("鎬″痉鑻�-闂佃-涓婃捣"); } LOGGER.info("calc district " + (++c) + "/" + districtMap.size() + " " + key.getName() + "-" + key.getRegion() + "-" + key.getCity()); @@ -228,7 +228,7 @@ public class Coredata { /** - * 计算城市的小区租金 + * 璁$畻鍩庡競鐨勫皬鍖虹閲� * */ public void calcDistrictRent() { @@ -273,16 +273,16 @@ public class Coredata { Date startDate = DateUtil.truncateDay(DateUtil.add(calcDate, 365*(-1))) ; Date endDate = DateUtil.truncateDay(DateUtil.getLastDayOfMonth(DateUtil.add(DateUtil.add(calcDate, sampleDay*(-1)), -5))); - //区域涨跌幅 + //鍖哄煙娑ㄨ穼骞� final Map>> regionMarkupMap = regionStatRentDao.findRegionMarkup(city, startDate, endDate); System.out.println(regionMarkupMap.size()); - //小区数据 + //灏忓尯鏁版嵁 Map districtMap = districtDao.getDistrictByCity(city, categoryEnum); - System.out.println("小区Map数量: "+districtMap.size()); - //房型数据 + System.out.println("灏忓尯Map鏁伴噺: "+districtMap.size()); + //鎴垮瀷鏁版嵁 final Map> houseTypeMap = DistrictHouseTypeDao.getInstance().findDistrictHouseTypes(city); - System.out.println("房型Map数量: "+houseTypeMap.size()); - //城市房型间跨度比 + System.out.println("鎴垮瀷Map鏁伴噺: "+houseTypeMap.size()); + //鍩庡競鎴垮瀷闂磋法搴︽瘮 final Map ratioMap = districtStatRentDao.findCityRoomSpanRatio(city, DateUtil.truncateDay(DateUtil.getLastDayOfMonth(calcDate, -1))); @@ -297,7 +297,7 @@ public class Coredata { continue; } -// String[] names = {"成功家园"}; +// String[] names = {"鎴愬姛瀹跺洯"}; // if(StringUtils.indexOfAny(district.getName(), names)==-1){ // continue; // } @@ -307,8 +307,8 @@ public class Coredata { public void run() { String estateType = district.getEstateType2(); - if(StringUtils.isNotBlank(estateType) && !estateType.equals("别墅")){ - estateType = "小区"; + if(StringUtils.isNotBlank(estateType) && !estateType.equals("鍒")){ + estateType = "灏忓尯"; } String key = district.getRegion()+"@"+district.getName()+"@"+estateType; List roomList = houseTypeMap.get(key); @@ -349,7 +349,7 @@ public class Coredata { } /** - * 计算小区租金覆盖率 + * 璁$畻灏忓尯绉熼噾瑕嗙洊鐜� */ public void calcDistrictCover(){ LOGGER.info("calc district rent cover of " + city); @@ -386,7 +386,7 @@ public class Coredata { /** - * 小区计算 + * 灏忓尯璁$畻 * * @param districtKey * @param calcDate @@ -491,7 +491,7 @@ public class Coredata { /** - * 从租房房源中提取房型 + * 浠庣鎴挎埧婧愪腑鎻愬彇鎴垮瀷 */ public void calcDistrictHouseType(Map districtMap){ @@ -506,14 +506,14 @@ public class Coredata { if(datas.size() > 0){ List rooms = new ArrayList(); for (Data d : datas) { - if(estateType.equals("小区") && !d.isVilla() && !d.isVilla() && d.getRoom()>5){ + if(estateType.equals("灏忓尯") && !d.isVilla() && !d.isVilla() && d.getRoom()>5){ continue; } if(!rooms.contains(d.getRoom())){ - if(estateType.equals("别墅") && d.isVilla()){ + if(estateType.equals("鍒") && d.isVilla()){ rooms.add(d.getRoom()); - }else if(estateType.equals("小区") && !d.isVilla()){ + }else if(estateType.equals("灏忓尯") && !d.isVilla()){ rooms.add(d.getRoom()); } @@ -546,7 +546,7 @@ public class Coredata { /** - * 计算城市的区域租金 + * 璁$畻鍩庡競鐨勫尯鍩熺閲� * */ public void calcRegionRent() { @@ -572,7 +572,7 @@ public class Coredata { /** - * 计算指定小区的均价 + * 璁$畻鎸囧畾灏忓尯鐨勫潎浠� * * @param region * @param districtName @@ -585,7 +585,7 @@ public class Coredata { } /** - * 小区计算 + * 灏忓尯璁$畻 * * @param districtKey * @param calcDate @@ -647,7 +647,7 @@ public class Coredata { } /** - * 城市计算 + * 鍩庡競璁$畻 * * @param cityKey * @param calcDate @@ -821,16 +821,16 @@ public class Coredata { } public void calcDistrictSqMetreRent(final int sampleDay) throws InterruptedException{ - //查询区域平米均价涨跌幅 + //鏌ヨ鍖哄煙骞崇背鍧囦环娑ㄨ穼骞� Date date = DateUtil.add(calcDate, sampleDay*(-1)); Date startDate = DateUtil.truncateDay(DateUtil.getFirstDayOfLastMonth(DateUtil.add(calcDate, sampleDay*(-1)))) ; final Map> regionMarkupMap = getRegionSqMarkup(city, startDate, calcDate); Map districtMap = districtDao.getDistrictByCity(city, categoryEnum); - System.out.println("小区共:"+districtMap.size()); - //查询最后一次的城市均价 + System.out.println("灏忓尯鍏憋細"+districtMap.size()); + //鏌ヨ鏈�鍚庝竴娆$殑鍩庡競鍧囦环 final RegionStat cityRegion = regionStatDao.findLastRegionStat(city, null, null); - //查询最后一次的城市平米租金 + //鏌ヨ鏈�鍚庝竴娆$殑鍩庡競骞崇背绉熼噾 SqmetreRent cityRegionRent = sqmetreRegionRentDao.findNewestRegionSqmetreStat(city, null, null); final Double rentRatio = getCityRentRatio(cityRegionRent, cityRegion); @@ -839,7 +839,7 @@ public class Coredata { final List ret = Collections.synchronizedList(new ArrayList()); for(final DistrictKey districtKey : districtMap.keySet()){ -// String[] names = {"永陵路36号院"}; +// String[] names = {"姘搁櫟璺�36鍙烽櫌"}; // if(StringUtils.indexOfAny(districtKey.getName(), names)==-1){ // continue; // } diff --git a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/RentHouseCoredata.java b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/RentHouseCoredata.java index 0ecb6c8af..c73ee3325 100644 --- a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/RentHouseCoredata.java +++ b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/RentHouseCoredata.java @@ -15,7 +15,7 @@ import com.fangjia.mongo.dao.ServerAreaDao; import com.fangjia.mongo.model.CalcCommand; /** - * 小区租金计算 + * 灏忓尯绉熼噾璁$畻 * @author gaojuan * */ @@ -48,13 +48,13 @@ public class RentHouseCoredata { LOGGER.info("start month " + DateUtil.formatToTightYYYYMMDDhhmmss(command.getCalcDate()) + " of " + command.getCity()); calcCommandDao.updateToCalcing(command.getId()); Coredata coredata = new Coredata(CalcDataCategoryEnum.RENT, command.getCity(), command.getCalcDate(), SAMPLE_DAY, true, false); - coredata.calcDistrictRent();//计算小区租金 - coredata.calcRegionRent();//计算区域租金 - coredata.calcDistrictCover();//小区租金覆盖率 + coredata.calcDistrictRent();//璁$畻灏忓尯绉熼噾 + coredata.calcRegionRent();//璁$畻鍖哄煙绉熼噾 + coredata.calcDistrictCover();//灏忓尯绉熼噾瑕嗙洊鐜� index ++; calcCommandDao.updateToSuc(command.getId()); - LOGGER.info("-----------【"+index+"/"+commands.size()+"】---------------end calc " + CalcDataCategoryEnum.RENT + "-------------------"); + LOGGER.info("-----------銆�"+index+"/"+commands.size()+"銆�---------------end calc " + CalcDataCategoryEnum.RENT + "-------------------"); } }else{ LOGGER.info("end. invalid calc.start_date!!!"); @@ -71,7 +71,7 @@ public class RentHouseCoredata { return; } - List citys = Arrays.asList("常州");//ServerAreaDao.getInstance().findAllCity(); + List citys = Arrays.asList("甯稿窞");//ServerAreaDao.getInstance().findAllCity(); LOGGER.info("calc total city " + citys.size()); int index = 0; for(String city : citys){ @@ -85,10 +85,10 @@ public class RentHouseCoredata { // continue; // } - coredata.calcDistrictRent();//计算小区租金 - coredata.calcRegionRent();//计算区域租金 - coredata.calcDistrictCover();//小区租金覆盖率 - LOGGER.info("-----------【"+index+"/"+citys.size()+"】---------------end calc " + CalcDataCategoryEnum.RENT + "-------------------"); + coredata.calcDistrictRent();//璁$畻灏忓尯绉熼噾 + coredata.calcRegionRent();//璁$畻鍖哄煙绉熼噾 + coredata.calcDistrictCover();//灏忓尯绉熼噾瑕嗙洊鐜� + LOGGER.info("-----------銆�"+index+"/"+citys.size()+"銆�---------------end calc " + CalcDataCategoryEnum.RENT + "-------------------"); } } @@ -107,8 +107,8 @@ public class RentHouseCoredata { // return; // } - //List citys = Arrays.asList("成都"); - List citys = ServerAreaDao.getInstance().findAllCity();//Arrays.asList("昆明"); + //List citys = Arrays.asList("鎴愰兘"); + List citys = ServerAreaDao.getInstance().findAllCity();//Arrays.asList("鏄嗘槑"); LOGGER.info("calc total city " + citys.size()); int index = 0; int cityIndex = 0; @@ -131,11 +131,11 @@ public class RentHouseCoredata { LOGGER.info("start month " + DateUtil.formatToTightYYYYMMDDhhmmss(calDate) + " of " + city); Coredata coredata = new Coredata(CalcDataCategoryEnum.RENT, city, calDate, SAMPLE_DAY, false, true); - coredata.calcDistrictRent2();//计算小区租金 + coredata.calcDistrictRent2();//璁$畻灏忓尯绉熼噾 coredata.calcCityRent(); - coredata.calcRegionRent();//计算区域租金 - coredata.calcDistrictCover();//小区租金覆盖率 - LOGGER.info("-----------【"+index+"/"+citys.size()+"】---------------end calc " + CalcDataCategoryEnum.RENT + "-------------------"); + coredata.calcRegionRent();//璁$畻鍖哄煙绉熼噾 + coredata.calcDistrictCover();//灏忓尯绉熼噾瑕嗙洊鐜� + LOGGER.info("-----------銆�"+index+"/"+citys.size()+"銆�---------------end calc " + CalcDataCategoryEnum.RENT + "-------------------"); } } diff --git a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/RentShopOfficeCoredata.java b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/RentShopOfficeCoredata.java index bcda66481..9215dad60 100644 --- a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/RentShopOfficeCoredata.java +++ b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/RentShopOfficeCoredata.java @@ -19,7 +19,7 @@ import com.fangjia.mongo.dao.ServerAreaDao; import com.fangjia.mongo.model.CalcCommand; /** - * 商铺、写字楼租金计算 + * 鍟嗛摵銆佸啓瀛楁ゼ绉熼噾璁$畻 * * */ @@ -107,8 +107,8 @@ public class RentShopOfficeCoredata { } List citys = ServerAreaDao.getInstance().findAllCity(); - //List citys = Arrays.asList("上海"); - //String calcCity = "上海"; + //List citys = Arrays.asList("涓婃捣"); + //String calcCity = "涓婃捣"; if (citys==null) { LOGGER.info("end. invalid calc.city!!!"); return; @@ -129,7 +129,7 @@ public class RentShopOfficeCoredata { LOGGER.info("-----------------------------------------------------------------------------------"); for (String city : citys) { - if(city.equals("全国")){ + if(city.equals("鍏ㄥ浗")){ continue; } diff --git a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/RetryDistrictRentOperator.java b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/RetryDistrictRentOperator.java index a1459a9c9..d586f5939 100644 --- a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/RetryDistrictRentOperator.java +++ b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/RetryDistrictRentOperator.java @@ -27,7 +27,7 @@ public class RetryDistrictRentOperator { for(CalcCommand command : commands){ Coredata coredata = new Coredata(CalcDataCategoryEnum.RENT, command.getCity(), command.getCalcDate(), 30, false, false); calcCommandDao.updateToCalcing(command.getId()); - coredata.calcRetryDistrictRent(command);//计算小区租金 + coredata.calcRetryDistrictRent(command);//璁$畻灏忓尯绉熼噾 calcCommandDao.updateToCalcSuc(command.getId()); } diff --git a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/SellHouseCoredata.java b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/SellHouseCoredata.java index 113e59705..51823d3d5 100644 --- a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/SellHouseCoredata.java +++ b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/SellHouseCoredata.java @@ -18,7 +18,7 @@ import com.fangjia.coredata.price.conf.CoredataConfig; import com.fangjia.mongo.dao.ServerAreaDao; /** - * 二手房城市、小区均价计算 + * 浜屾墜鎴垮煄甯傘�佸皬鍖哄潎浠疯绠� * * @author xiaoyu * @@ -100,14 +100,14 @@ public class SellHouseCoredata { } private List getAllCities() { - return Arrays.asList(new String[] { "上海", "北京", "广州", "深圳", "天津", "重庆", "成都", "西安", "杭州", "武汉", "南京", "沈阳", "贵阳", "宁波", - "石家庄", "福州", "大连", "昆明", "苏州", "长沙", "温州", "银川", "太原", "厦门", "无锡", "咸阳", "唐山", "三亚", "西宁", "郑州", "扬州", "呼和浩特", - "兰州", "哈尔滨", "济南", "佛山", "长春", "青岛", "绵阳", "东莞", "威海", "吉林", "宜宾", "自贡", "邯郸", "合肥", "中山", "乌鲁木齐", "湛江", "烟台", - "廊坊", "潍坊", "保定", "攀枝花", "南宁", "秦皇岛", "延安", "常州", "丽江", "宜昌", "鞍山", "嘉兴", "大庆", "大理", "徐州", "镇江", "丹东", "六盘水", - "赣州", "芜湖", "南昌", "南通", "九江", "泰州", "洛阳", "台州", "惠州", "湖州", "泉州", "清远", "衢州", "江门", "绍兴", "宿迁", "海口", "珠海", "金华", - "连云港", "桂林", "马鞍山", "北海", "柳州", "淄博", "莆田", "盐城", "玉林", "玉溪", "本溪", "汕头", "肇庆", "曲靖", "衡阳", "新乡", "营口", "河源", - "黄石", "焦作", "揭阳", "茂名", "牡丹江", "盘锦", "平顶山", "韶关", "阳江", "梅州", "昆山", "襄阳", "株洲", "湘潭", "张家界", "潮州", "常熟", "安阳", - "云浮", "增城", "吴江", "瑞安", "乐清", "慈溪", "宁海", "奉化", "余姚", "温岭", "宜兴", "义乌", "舟山", "淮安" }); + return Arrays.asList(new String[] { "涓婃捣", "鍖椾含", "骞垮窞", "娣卞湷", "澶╂触", "閲嶅簡", "鎴愰兘", "瑗垮畨", "鏉窞", "姝︽眽", "鍗椾含", "娌堥槼", "璐甸槼", "瀹佹尝", + "鐭冲搴�", "绂忓窞", "澶ц繛", "鏄嗘槑", "鑻忓窞", "闀挎矙", "娓╁窞", "閾跺窛", "澶師", "鍘﹂棬", "鏃犻敗", "鍜搁槼", "鍞愬北", "涓変簹", "瑗垮畞", "閮戝窞", "鎵窞", "鍛煎拰娴╃壒", + "鍏板窞", "鍝堝皵婊�", "娴庡崡", "浣涘北", "闀挎槬", "闈掑矝", "缁甸槼", "涓滆帪", "濞佹捣", "鍚夋灄", "瀹滃", "鑷础", "閭兏", "鍚堣偉", "涓北", "涔岄瞾鏈ㄩ綈", "婀涙睙", "鐑熷彴", + "寤婂潑", "娼嶅潑", "淇濆畾", "鏀�鏋濊姳", "鍗楀畞", "绉︾殗宀�", "寤跺畨", "甯稿窞", "涓芥睙", "瀹滄槍", "闉嶅北", "鍢夊叴", "澶у簡", "澶х悊", "寰愬窞", "闀囨睙", "涓逛笢", "鍏洏姘�", + "璧e窞", "鑺滄箹", "鍗楁槍", "鍗楅��", "涔濇睙", "娉板窞", "娲涢槼", "鍙板窞", "鎯犲窞", "婀栧窞", "娉夊窞", "娓呰繙", "琛㈠窞", "姹熼棬", "缁嶅叴", "瀹胯縼", "娴峰彛", "鐝犳捣", "閲戝崕", + "杩炰簯娓�", "妗傛灄", "椹瀺灞�", "鍖楁捣", "鏌冲窞", "娣勫崥", "鑾嗙敯", "鐩愬煄", "鐜夋灄", "鐜夋邯", "鏈邯", "姹曞ご", "鑲囧簡", "鏇查潠", "琛¢槼", "鏂颁埂", "钀ュ彛", "娌虫簮", + "榛勭煶", "鐒︿綔", "鎻槼", "鑼傚悕", "鐗′腹姹�", "鐩橀敠", "骞抽《灞�", "闊跺叧", "闃虫睙", "姊呭窞", "鏄嗗北", "瑗勯槼", "鏍床", "婀樻江", "寮犲鐣�", "娼窞", "甯哥啛", "瀹夐槼", + "浜戞诞", "澧炲煄", "鍚存睙", "鐟炲畨", "涔愭竻", "鎱堟邯", "瀹佹捣", "濂夊寲", "浣欏", "娓╁箔", "瀹滃叴", "涔変箤", "鑸熷北", "娣畨" }); } } diff --git a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/SellShopOfficeCoredata.java b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/SellShopOfficeCoredata.java index 8c323e4cc..8803fba8b 100644 --- a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/SellShopOfficeCoredata.java +++ b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/SellShopOfficeCoredata.java @@ -20,7 +20,7 @@ import com.fangjia.mongo.dao.ServerAreaDao; import com.fangjia.mongo.model.CalcCommand; /** - * 商铺、写字楼出售均价计算 + * 鍟嗛摵銆佸啓瀛楁ゼ鍑哄敭鍧囦环璁$畻 * * @author xiaoyu * @@ -115,7 +115,7 @@ public class SellShopOfficeCoredata { } List citys = ServerAreaDao.getInstance().findAllCity(); - //List citys = Arrays.asList("北京","南京","天津","重庆","成都","大连","沈阳","哈尔滨","牡丹江","大庆","齐齐哈尔","佳木斯","伊春","鸡西","鹤岗","双鸭山","七台河","绥化","黑河"); + //List citys = Arrays.asList("鍖椾含","鍗椾含","澶╂触","閲嶅簡","鎴愰兘","澶ц繛","娌堥槼","鍝堝皵婊�","鐗′腹姹�","澶у簡","榻愰綈鍝堝皵","浣虫湪鏂�","浼婃槬","楦¤タ","楣ゅ矖","鍙岄腑灞�","涓冨彴娌�","缁ュ寲","榛戞渤"); if (citys == null) { LOGGER.info("end. invalid calc.city!!s!"); return; @@ -132,7 +132,7 @@ public class SellShopOfficeCoredata { LOGGER.info("-----------------------------------------------------------------------------------"); for (String city : citys) { - if(city.equals("全国")){ + if(city.equals("鍏ㄥ浗")){ continue; } // LOGGER.info("calc " + weekends.size() + " weekends of " + city); diff --git a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/SquareRentCoredata.java b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/SquareRentCoredata.java index d4ca48e09..f3cf2c022 100644 --- a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/SquareRentCoredata.java +++ b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/SquareRentCoredata.java @@ -54,8 +54,8 @@ public class SquareRentCoredata { List times = DateUtil.getStatMonths("2017-08-31","2017-08-31"); - List citys = Arrays.asList("上海"); - //List citys = ServerAreaDao.getInstance().findAllCity();//Arrays.asList("昆明"); + List citys = Arrays.asList("涓婃捣"); + //List citys = ServerAreaDao.getInstance().findAllCity();//Arrays.asList("鏄嗘槑"); LOGGER.info("calc total city " + citys.size()); int index = 0; @@ -72,9 +72,9 @@ public class SquareRentCoredata { Coredata coredata = new Coredata(CalcDataCategoryEnum.RENT, city, calDate, SAMPLE_DAY, false, false); // coredata.calcCitySqMetreRent(); -// coredata.calcRegionSqMetreRent();//计算区域租金 - coredata.calcDistrictSqMetreRent(30);//计算小区平米租金 - LOGGER.info("-----------【"+index+"/"+citys.size()+"】---------------end calc " + CalcDataCategoryEnum.RENT + "-------------------"); +// coredata.calcRegionSqMetreRent();//璁$畻鍖哄煙绉熼噾 + coredata.calcDistrictSqMetreRent(30);//璁$畻灏忓尯骞崇背绉熼噾 + LOGGER.info("-----------銆�"+index+"/"+citys.size()+"銆�---------------end calc " + CalcDataCategoryEnum.RENT + "-------------------"); System.out.println(new Date().toString()); } diff --git a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/Test.java b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/Test.java index b4b1787d9..1a3e6907e 100644 --- a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/Test.java +++ b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/Test.java @@ -30,7 +30,7 @@ public class Test { public static void main(String[] args) throws Exception { Date calcDate = DateUtil.parseDate("2013-11-10", "yyyy-MM-dd"); - String city = "上海"; + String city = "涓婃捣"; int sampleDay = 365; DataHolder dataHolder = new DataHolder(CalcDataCategoryEnum.SELL, city, calcDate, sampleDay, false); @@ -41,7 +41,7 @@ public class Test { CategoryEnum categoryEnum = CategoryEnum.DISTRICT; - DistrictKey districtKey = new DistrictKey(city, "虹口", "东四小区", categoryEnum, EstateTypeEnum.DISTRICT); + DistrictKey districtKey = new DistrictKey(city, "铏瑰彛", "涓滃洓灏忓尯", categoryEnum, EstateTypeEnum.DISTRICT); Result res = calculator.calculatorDistrict(districtKey, calcDate, sampleDay); operator.applyDistrict(districtKey, res); diff --git a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/calc/RentHouseAverageCalculator.java b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/calc/RentHouseAverageCalculator.java index 4bc491574..4ead7a372 100644 --- a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/calc/RentHouseAverageCalculator.java +++ b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/calc/RentHouseAverageCalculator.java @@ -172,9 +172,9 @@ public class RentHouseAverageCalculator extends AbstractCalculator{ List prices = ret.get(d.getRoom()); if(null == prices){ prices = new ArrayList(); - if((districtKey.getEstateTypeEnum().getEstateType().equals("小区") || districtKey.getEstateTypeEnum().getEstateType().equals("住宅")) && !d.isVilla()){ + if((districtKey.getEstateTypeEnum().getEstateType().equals("灏忓尯") || districtKey.getEstateTypeEnum().getEstateType().equals("浣忓畢")) && !d.isVilla()){ ret.put(d.getRoom(), prices); - }else if(districtKey.getEstateTypeEnum().getEstateType().equals("别墅") && d.isVilla()){ + }else if(districtKey.getEstateTypeEnum().getEstateType().equals("鍒") && d.isVilla()){ ret.put(d.getRoom(), prices); } @@ -233,7 +233,7 @@ public class RentHouseAverageCalculator extends AbstractCalculator{ - //参与周边计算 + //鍙備笌鍛ㄨ竟璁$畻 // Map> resultMap = provider.fetchAroundRoomAvgPriceData(districtKey, DateUtils.addMonths(calcDate, -1)); // // for(int room : rooms){ @@ -314,24 +314,24 @@ public class RentHouseAverageCalculator extends AbstractCalculator{ startDate = DateUtil.add(calcDate, sampleDay * (-1)); } List result = new ArrayList(); - //计算使用自身样本 + //璁$畻浣跨敤鑷韩鏍锋湰 result = calculateByOwn(districtKey, rooms, startDate, calcDate, sampleDay, result, regionMarkupMap); - //如果有自身样本计算出来的,则其它定可通过室与室之间的跨度比推算 + //濡傛灉鏈夎嚜韬牱鏈绠楀嚭鏉ョ殑,鍒欏叾瀹冨畾鍙�氳繃瀹や笌瀹や箣闂寸殑璺ㄥ害姣旀帹绠� if(result.size()>=1 && rooms.size()!=1){ result = calculateByRoomRatio(rooms, result, ratioMap, calcDate); } - //使用周边物业类型,建筑类型 ,建筑年代的小区房源 + //浣跨敤鍛ㄨ竟鐗╀笟绫诲瀷,寤虹瓚绫诲瀷 ,寤虹瓚骞翠唬鐨勫皬鍖烘埧婧� if(result.size() != rooms.size()){ result = calculateByArround(districtKey, rooms, startDate, calcDate, sampleDay, result); } - //使用售价 + //浣跨敤鍞环 if(result.size() != rooms.size()){ result = calculateByRatio(districtKey, rooms, startDate, calcDate, result); } - //为没有计算出来的房型添加默认值 + //涓烘病鏈夎绠楀嚭鏉ョ殑鎴垮瀷娣诲姞榛樿鍊� if(result.size() != rooms.size()){ result = noCalculateRoom(districtKey, rooms, calcDate, result); } @@ -355,9 +355,9 @@ public class RentHouseAverageCalculator extends AbstractCalculator{ Date yearAgo = DateUtil.add(calcDate, sampleDay*(-1)); Integer yearAgoNum = Integer.parseInt(DateUtil.formatToTightYYMMDD(DateUtil.truncateDay(yearAgo))); - String estateType = "小区"; - if(districtKey.getEstateTypeEnum().getEstateType().equals("别墅")){ - estateType = "别墅"; + String estateType = "灏忓尯"; + if(districtKey.getEstateTypeEnum().getEstateType().equals("鍒")){ + estateType = "鍒"; } Integer distAvgPrice = 0; if (datas!=null && datas.size()>0) { @@ -366,9 +366,9 @@ public class RentHouseAverageCalculator extends AbstractCalculator{ List prices = ret.get(d.getRoom()); if(null == prices){ prices = new ArrayList(); - if(estateType.equals("小区") && !d.isVilla()){ + if(estateType.equals("灏忓尯") && !d.isVilla()){ ret.put(d.getRoom(), prices); - }else if(estateType.equals("别墅") && d.isVilla()){ + }else if(estateType.equals("鍒") && d.isVilla()){ ret.put(d.getRoom(), prices); } } @@ -413,7 +413,7 @@ public class RentHouseAverageCalculator extends AbstractCalculator{ clu = DataCluster.cluster(prices); } - //有房源 + //鏈夋埧婧� if(clu != null && clu.getMedian()>0){ @@ -464,7 +464,7 @@ public class RentHouseAverageCalculator extends AbstractCalculator{ private List calculateByRoomRatio(List rooms, List results, Map ratioMap, Date calcDate){ List allRooms = ServiceUtils.getAllRooms(rooms); - //找出最大可能可参照的室 + //鎵惧嚭鏈�澶у彲鑳藉彲鍙傜収鐨勫 int standardRoom = 0; double maxCredit = -1; int maxCount = 0; @@ -497,10 +497,10 @@ public class RentHouseAverageCalculator extends AbstractCalculator{ } Map rentMap = new HashMap(); - //住前推价格 + //浣忓墠鎺ㄤ环鏍� for(int j=standardIndex-1;j>=0;j--){ int room = allRooms.get(j); - if(!calcalatedMap.containsKey(room)){//是否根据房源已计算 + if(!calcalatedMap.containsKey(room)){//鏄惁鏍规嵁鎴挎簮宸茶绠� double ratio = ServiceUtils.getRatioByRoom(room + 1, ratioMap); int knowRent = 0; if(rentMap.containsKey(room+1)){ @@ -530,10 +530,10 @@ public class RentHouseAverageCalculator extends AbstractCalculator{ } } - //向后推价格 + //鍚戝悗鎺ㄤ环鏍� for(int k=standardIndex+1;k calculateByArround(DistrictKey districtKey, List rooms, Date startDate, Date calcDate, int sampleDay, List results){ - //参与周边计算 + //鍙備笌鍛ㄨ竟璁$畻 Map> resultMap = provider.fetchAroundRoomAvgPriceData(districtKey, startDate, calcDate); if(resultMap.size() == 0){ return results; @@ -690,7 +690,7 @@ public class RentHouseAverageCalculator extends AbstractCalculator{ calcuateRooms.add(res.getKey()); } Map rentPriceMaps = provider.fetchRentSellStat(districtKey.getCity(), districtKey.getRegion(), districtKey.getName(), districtKey.getEstateTypeEnum().getEstateType(), startDate, calcDate); - //利用均价及已知租金,算得租售比进行计算 + //鍒╃敤鍧囦环鍙婂凡鐭ョ閲戯紝绠楀緱绉熷敭姣旇繘琛岃绠� for(int room : rooms){ if(!calcuateRooms.contains(room)){ Result res = getRentPriceResult(rentPriceMaps, SampleEnum.RATIO, room, calcDate); @@ -763,12 +763,12 @@ public class RentHouseAverageCalculator extends AbstractCalculator{ @Override public List retryCalculatorDistrictRent(DistrictKey districtKey, int calcType, int houseType) { - //小区均价计算开始日期 + //灏忓尯鍧囦环璁$畻寮�濮嬫棩鏈� @SuppressWarnings("deprecation") Date firstDate = districtStatRentDao.findDistrictRentStatFirstWeekend(districtKey.getCity(), districtKey.getRegion(), districtKey.getName(), districtKey.getEstateTypeEnum().getEstateType()); - //开始到现在所有月份的第一天 + //寮�濮嬪埌鐜板湪鎵�鏈夋湀浠界殑绗竴澶� List dates = DateUtil.getStatMonths(DateUtil.formatByPattern(firstDate, "yyyy-MM-dd"), DateUtil.formatByPattern(DateUtil.getLastDayOfMonth(new Date(),-1),"yyyy-MM-dd")); - //查找指导价 + //鏌ユ壘鎸囧浠� Map guidingPriceMap = guidingPriceDao.findGuidingPrices(districtKey.getCity(), districtKey.getRegion(), districtKey.getName(), "district_rent"); List result = new ArrayList(); @@ -797,9 +797,9 @@ public class RentHouseAverageCalculator extends AbstractCalculator{ if(null == prices){ prices = new ArrayList(); - if((districtKey.getEstateTypeEnum().getEstateType().equals("小区") || districtKey.getEstateTypeEnum().getEstateType().equals("住宅")) && !d.isVilla()){ + if((districtKey.getEstateTypeEnum().getEstateType().equals("灏忓尯") || districtKey.getEstateTypeEnum().getEstateType().equals("浣忓畢")) && !d.isVilla()){ ret.put(d.getRoom(), prices); - }else if(districtKey.getEstateTypeEnum().getEstateType().equals("别墅") && d.isVilla()){ + }else if(districtKey.getEstateTypeEnum().getEstateType().equals("鍒") && d.isVilla()){ ret.put(d.getRoom(), prices); } } @@ -830,7 +830,7 @@ public class RentHouseAverageCalculator extends AbstractCalculator{ Result res = new Result(); res.setKey(room); SampleEnum sampleEnum = SampleEnum.OWN; - //有房源 + //鏈夋埧婧� if(clu != null && clu.getMean()>0){ res.setValue((int)clu.getUpperValue()); @@ -855,7 +855,7 @@ public class RentHouseAverageCalculator extends AbstractCalculator{ result1.add(res); } - //参与周边计算 + //鍙備笌鍛ㄨ竟璁$畻 /*if(res.getValue()==0){ Map> resultMap = provider.fetchAroundRoomAvgPriceData(districtKey, startDate, endDate); sampleEnum = SampleEnum.AROUND; @@ -932,7 +932,7 @@ public class RentHouseAverageCalculator extends AbstractCalculator{ /** - * 数量得分(最高得分0.1) + * 鏁伴噺寰楀垎(鏈�楂樺緱鍒�0.1) * * @param points * @return @@ -941,14 +941,14 @@ public class RentHouseAverageCalculator extends AbstractCalculator{ if (points.size() == 0) { return 0; } - // 每100个样本=0.01 + // 姣�100涓牱鏈�=0.01 double c1 = (double) points.size() / 100.0 / 100.0; c1 = (c1 > 0.1 ? 0.1 : c1); return c1; } /** - * 质量得分(最高得分0.1) + * 璐ㄩ噺寰楀垎(鏈�楂樺緱鍒�0.1) * * @param points * @return @@ -964,21 +964,21 @@ public class RentHouseAverageCalculator extends AbstractCalculator{ for (Data p : points) { int calcTime = Integer.parseInt(DateUtil.formatToTightYYMMDD(DateUtil.truncateDay(calcDate))); long diff = calcTime - p.getDate(); - if (diff <= 30 * 24 * 3600 * 1000L) {// 一个月内 + if (diff <= 30 * 24 * 3600 * 1000L) {// 涓�涓湀鍐� c2 = c2 + perc * 1.00d; - } else if (diff <= 60 * 24 * 3600 * 1000L) {// 两个月内 + } else if (diff <= 60 * 24 * 3600 * 1000L) {// 涓や釜鏈堝唴 c2 = c2 + perc * 0.90d; - } else if (diff <= 90 * 24 * 3600 * 1000L) {// 三个月内 + } else if (diff <= 90 * 24 * 3600 * 1000L) {// 涓変釜鏈堝唴 c2 = c2 + perc * 0.85d; - } else if (diff <= 180 * 24 * 3600 * 1000L) {// 半年内 + } else if (diff <= 180 * 24 * 3600 * 1000L) {// 鍗婂勾鍐� c2 = c2 + perc * 0.80d; - } else if (diff <= 365 * 24 * 3600 * 1000L) {// 一年内 + } else if (diff <= 365 * 24 * 3600 * 1000L) {// 涓�骞村唴 c2 = c2 + perc * 0.70d; - } else if (diff <= 540 * 24 * 3600 * 1000L) {// 一年半内 + } else if (diff <= 540 * 24 * 3600 * 1000L) {// 涓�骞村崐鍐� c2 = c2 + perc * 0.60d; - } else if (diff <= 720 * 24 * 3600 * 1000L) {// 两年内 + } else if (diff <= 720 * 24 * 3600 * 1000L) {// 涓ゅ勾鍐� c2 = c2 + perc * 0.40d; - } else {// 超过两年 + } else {// 瓒呰繃涓ゅ勾 c2 = c2 + perc * 0.10d; } } @@ -1040,7 +1040,7 @@ public class RentHouseAverageCalculator extends AbstractCalculator{ DataManager dataManager = provider.fetchDataByDistrict2(districtKey, startDate, calcDate); List datas = dataManager.applyTimeFactorPoints(dataManager.getDatas(), calcDate); SqRentResult res = calculateByOwn(datas, calcDate, SampleType.OWN, CALC_OWN_BASE_CREDIT, sampleDay); - //根据周边相似均价的小区的租房房源 + //鏍规嵁鍛ㄨ竟鐩镐技鍧囦环鐨勫皬鍖虹殑绉熸埧鎴挎簮 if(res == null){ res = calculateDistrictSqMetreByArround(districtKey, null, calcDate, sampleDay); } @@ -1077,7 +1077,7 @@ public class RentHouseAverageCalculator extends AbstractCalculator{ private SqRentResult calculateDistrictSqMetreByArround(DistrictKey districtKey, Date startDate, Date calcDate, int sampleDay){ - //参与周边计算 + //鍙備笌鍛ㄨ竟璁$畻 List datas = provider.fetchAroundData(districtKey, startDate, calcDate, 500, null); if(null == datas || datas.size()==0){ datas = provider.fetchAroundData(districtKey, startDate, calcDate, 1000, 500); diff --git a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/calc/RentShopOfficeAverageCalculator.java b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/calc/RentShopOfficeAverageCalculator.java index dfee29aed..0fb0551d3 100644 --- a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/calc/RentShopOfficeAverageCalculator.java +++ b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/calc/RentShopOfficeAverageCalculator.java @@ -106,7 +106,7 @@ public class RentShopOfficeAverageCalculator extends AbstractCalculator { // } - //根据周边计算 + //鏍规嵁鍛ㄨ竟璁$畻 // if ((clu == null || clu.getUpperValue() == 0) && res==null) { // // List points = provider.fetchAroundAvgPriceData(districtKey); diff --git a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/calc/SellHouseAverageCalculator.java b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/calc/SellHouseAverageCalculator.java index adeaddebd..21c967309 100644 --- a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/calc/SellHouseAverageCalculator.java +++ b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/calc/SellHouseAverageCalculator.java @@ -18,7 +18,7 @@ import com.fangjia.coredata.price.util.NumberUtils; import com.fangjia.mongo.model.RegionStat; /** - * 小区均价计算实现 + * 灏忓尯鍧囦环璁$畻瀹炵幇 * * @author xiaoyu * @@ -56,7 +56,7 @@ public class SellHouseAverageCalculator extends AbstractCalculator { SampleEnum sampleEnum = SampleEnum.OWN; DataManager dataManager = provider.fetchData(districtKey); - // 这个小区存在指导价 + // 杩欎釜灏忓尯瀛樺湪鎸囧浠� if (dataManager.isExistGuidingPrice(districtKey)) { List points = dataManager.getPointsByFactor(districtKey, calcDate); clu = DataCluster.cluster(points); diff --git a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/calc/SellShopOfficeAverageCalculator.java b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/calc/SellShopOfficeAverageCalculator.java index 00c42741a..5e75d72ee 100644 --- a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/calc/SellShopOfficeAverageCalculator.java +++ b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/calc/SellShopOfficeAverageCalculator.java @@ -54,7 +54,7 @@ public class SellShopOfficeAverageCalculator extends AbstractCalculator { Cluster clu = null; Result res = null; - //房源计算 + //鎴挎簮璁$畻 if (dataManager.getDataSize() > 0) { sampleEnum = SampleEnum.OWN; List points = dataManager.getPoints(); @@ -83,7 +83,7 @@ public class SellShopOfficeAverageCalculator extends AbstractCalculator { } } - //根据路名计算价格 + //鏍规嵁璺悕璁$畻浠锋牸 // if ((clu == null || clu.getUpperValue() == 0) && res==null) { // if(CategoryEnum.SHOP.equals(districtKey.getCategoryEnum())){ // if(null!=districtKey.getAddress()&&StringUtils.isNotBlank(districtKey.getAddress())){ @@ -114,7 +114,7 @@ public class SellShopOfficeAverageCalculator extends AbstractCalculator { // // } - //根据周边计算 + //鏍规嵁鍛ㄨ竟璁$畻 if ((clu == null || clu.getUpperValue() == 0) && res==null) { List points = provider.fetchAroundAvgPriceData(districtKey, calcDate); diff --git a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/conf/CoredataConfig.java b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/conf/CoredataConfig.java index c33140969..c6e259cdf 100644 --- a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/conf/CoredataConfig.java +++ b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/conf/CoredataConfig.java @@ -68,7 +68,7 @@ public class CoredataConfig { } /** - * 是否把数据放入内存中 + * 鏄惁鎶婃暟鎹斁鍏ュ唴瀛樹腑 * * @return */ diff --git a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/core/Calculator.java b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/core/Calculator.java index a97f99985..c3128f0d2 100644 --- a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/core/Calculator.java +++ b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/core/Calculator.java @@ -10,7 +10,7 @@ import com.fangjia.coredata.price.util.CalcException; import com.fangjia.mongo.model.RegionStat; /** - * 均价计算接口 + * 鍧囦环璁$畻鎺ュ彛 * * @author xiaoyu * @@ -18,7 +18,7 @@ import com.fangjia.mongo.model.RegionStat; public interface Calculator { /** - * 计算城市均价 + * 璁$畻鍩庡競鍧囦环 * * @param cityKey * @param calcDate @@ -29,7 +29,7 @@ public interface Calculator { public Result calculatorCity(CityKey cityKey, Date calcDate, int sampleDay) throws CalcException; /** - * 计算城市平米租金 + * 璁$畻鍩庡競骞崇背绉熼噾 * @param cityKey * @param calcDate * @param sampleDay @@ -39,7 +39,7 @@ public interface Calculator { public SqRentResult calculatorRegionSqMetreRent(CityKey cityKey, Date calcDate, int sampleDay); public SqRentResult calculatorDistrictSqMetreRent(DistrictKey districtKey,Date calcDate, int sampleDay, double rentRatio, Map> regionMarkupMap, RegionStat cityRegionStat); /** - * 计算小区均价 + * 璁$畻灏忓尯鍧囦环 * R * @param districtKey * @param calcDate @@ -51,7 +51,7 @@ public interface Calculator { /** - * 计算小区租金 + * 璁$畻灏忓尯绉熼噾 * @param districtKey * @param calcDate * @param sampleDay diff --git a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/core/Cluster.java b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/core/Cluster.java index 9244fce5a..ca760c9c0 100644 --- a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/core/Cluster.java +++ b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/core/Cluster.java @@ -6,20 +6,20 @@ import java.util.List; import com.fangjia.coredata.price.util.NumberUtils; public class Cluster { - // 价格差偏移量 + // 浠锋牸宸亸绉婚噺 public static final double MIN_VALUE_OFFSET = 0.2d; public static final double UPPER_VALUE_OFFSET = 0.2d; public static final double LOWER_VALUE_OFFSET = 0.1d; - private double mean; // 均值 - private double median; // 中位数 - private double upperValue; // 偏大值 - private double lowerValue; // 偏小值 - private double centerValue; // 中心值 + private double mean; // 鍧囧�� + private double median; // 涓綅鏁� + private double upperValue; // 鍋忓ぇ鍊� + private double lowerValue; // 鍋忓皬鍊� + private double centerValue; // 涓績鍊� - private int sampleSize; // 样本数量 + private int sampleSize; // 鏍锋湰鏁伴噺 private double[][] cluters; public Cluster(double[][] cluters) { diff --git a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/core/DataManager.java b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/core/DataManager.java index 98db02151..b01c63dab 100644 --- a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/core/DataManager.java +++ b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/core/DataManager.java @@ -24,7 +24,7 @@ import com.fangjia.mongo.model.GuidingPrice; import com.fangjia.mongo.model.RegionStat; /** - * 数据管理 + * 鏁版嵁绠$悊 * * @author xiaoyu * @@ -100,7 +100,7 @@ public class DataManager { /** *
-	 * 获取可计算的points,加入了时间因素和后台影响因素
+	 * 鑾峰彇鍙绠楃殑points锛屽姞鍏ヤ簡鏃堕棿鍥犵礌鍜屽悗鍙板奖鍝嶅洜绱�
 	 * 
* * @param districtKey @@ -112,13 +112,13 @@ public class DataManager { } /** - * 数据的指导价格影响 越接近计算时间的数据,影响权重越大 + * 鏁版嵁鐨勬寚瀵间环鏍煎奖鍝� 瓒婃帴杩戣绠楁椂闂寸殑鏁版嵁,褰卞搷鏉冮噸瓒婂ぇ * *
-	 * 	1.样本不充足,则使用城市的平均涨跌幅得出计算点
-	 * 	2.样本充足,则影响由两部分数据组成
-	 * 	(1) 样本本身影响因素占(1 - GUIDING_PERCENT) 
-	 * 	(2) 指导价影响因素占GUIDING_PERCENT * y∈[0-1](计算日期离指导价日期越近,指导价的影响权重越大)
+	 * 	1.鏍锋湰涓嶅厖瓒�,鍒欎娇鐢ㄥ煄甯傜殑骞冲潎娑ㄨ穼骞呭緱鍑鸿绠楃偣
+	 * 	2.鏍锋湰鍏呰冻锛屽垯褰卞搷鐢变袱閮ㄥ垎鏁版嵁缁勬垚
+	 * 	(1) 鏍锋湰鏈韩褰卞搷鍥犵礌鍗�(1 - GUIDING_PERCENT) 
+	 * 	(2) 鎸囧浠峰奖鍝嶅洜绱犲崰GUIDING_PERCENT * y鈭圼0-1](璁$畻鏃ユ湡绂绘寚瀵间环鏃ユ湡瓒婅繎锛屾寚瀵间环鐨勫奖鍝嶆潈閲嶈秺澶�)
 	 * 
* * @param dataList @@ -135,13 +135,13 @@ public class DataManager { List guidingPrices = guidingPriceDao.findGuidingPrice(districtKey.getCity(), districtKey.getRegion(), districtKey.getName(), districtKey.getCategoryEnum().getCategory(), districtKey.getEstateTypeEnum() .getEstateType()); - // 如果没有指导价,则直接返回 + // 濡傛灉娌℃湁鎸囧浠凤紝鍒欑洿鎺ヨ繑鍥� if (guidingPrices == null || guidingPrices.size() == 0) { return ret; } /** - * 如果指导价存在并且样本不充足,则使用城市的平均涨跌幅得出计算点 + * 濡傛灉鎸囧浠峰瓨鍦ㄥ苟涓旀牱鏈笉鍏呰冻,鍒欎娇鐢ㄥ煄甯傜殑骞冲潎娑ㄨ穼骞呭緱鍑鸿绠楃偣 */ if (dataList.size() < 10) { int point = getPointByCityTrend(guidingPrices, districtKey, calcDate); @@ -150,18 +150,18 @@ public class DataManager { } } else { /** - * 样本充足,则影响价格由两部分数据组成 + * 鏍锋湰鍏呰冻锛屽垯褰卞搷浠锋牸鐢变袱閮ㄥ垎鏁版嵁缁勬垚 * *
-			 * (1) 样本本身影响因素占(1 - GUIDING_PERCENT) 
-			 * (2) 指导价影响因素占GUIDING_PERCENT * y∈[0-1](计算日期离指导价日期越近,指导价的影响权重越大)
+			 * (1) 鏍锋湰鏈韩褰卞搷鍥犵礌鍗�(1 - GUIDING_PERCENT) 
+			 * (2) 鎸囧浠峰奖鍝嶅洜绱犲崰GUIDING_PERCENT * y鈭圼0-1](璁$畻鏃ユ湡绂绘寚瀵间环鏃ユ湡瓒婅繎锛屾寚瀵间环鐨勫奖鍝嶆潈閲嶈秺澶�)
 			 * 
*/ int c = (int) ((GUIDING_PERCENT * dataList.size()) / (1 - GUIDING_PERCENT)); long calcMills = calcDate.getTime(); for (GuidingPrice gp : guidingPrices) { long diffMills = Math.abs(gp.getGuidingDate().getTime() - calcMills); - // 计算日期离指导价日期越近,指导价的影响权重越大 + // 璁$畻鏃ユ湡绂绘寚瀵间环鏃ユ湡瓒婅繎锛屾寚瀵间环鐨勫奖鍝嶆潈閲嶈秺澶� if (diffMills <= MONTH_MILLS) { c = c * 1; } else if (diffMills <= 2 * MONTH_MILLS) { @@ -191,7 +191,7 @@ public class DataManager { } /** - * 数据的时间影响因素 越接近计算时间的数据,将会复制出更多 + * 鏁版嵁鐨勬椂闂村奖鍝嶅洜绱� 瓒婃帴杩戣绠楁椂闂寸殑鏁版嵁锛屽皢浼氬鍒跺嚭鏇村 * * @param dataList * @param calcDate @@ -218,7 +218,7 @@ public class DataManager { Date publishDate = FORMAT.parse(String.valueOf(d)); long diffMills = calcDate.getTime() - publishDate.getTime(); int repeat = 0; - // 加大最近房源的计算量,以达到提高最近房源权重的目的 + // 鍔犲ぇ鏈�杩戞埧婧愮殑璁$畻閲忥紝浠ヨ揪鍒版彁楂樻渶杩戞埧婧愭潈閲嶇殑鐩殑 if (diffMills <= 3 * WEEK_MILLS) { repeat = 5; } else if (diffMills <= MONTH_MILLS) { @@ -245,7 +245,7 @@ public class DataManager { private int getPointByCityTrend(List guidingPrices, DistrictKey districtKey, Date calcDate) { GuidingPrice guidingPrice = guidingPrices.get(0); - // 选出最接近计算日期的一条指导价 + // 閫夊嚭鏈�鎺ヨ繎璁$畻鏃ユ湡鐨勪竴鏉℃寚瀵间环 for (GuidingPrice gp : guidingPrices) { long diff1 = gp.getGuidingDate().getTime() - calcDate.getTime(); long diff2 = guidingPrice.getGuidingDate().getTime() - calcDate.getTime(); diff --git a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/core/Operator.java b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/core/Operator.java index ad1c84759..75d600653 100644 --- a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/core/Operator.java +++ b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/core/Operator.java @@ -11,7 +11,7 @@ import com.fangjia.coredata.price.util.ApplyException; public interface Operator { /** - * 城市计算结果应用 + * 鍩庡競璁$畻缁撴灉搴旂敤 * * @param cityKey * @param result @@ -20,7 +20,7 @@ public interface Operator { public void applyCity(CityKey cityKey, Result result, String category) throws ApplyException; /** - * 小区计算结果应用 + * 灏忓尯璁$畻缁撴灉搴旂敤 * * @param districtKey * @param result @@ -30,7 +30,7 @@ public interface Operator { /** - * 小区租金计算结果应用 + * 灏忓尯绉熼噾璁$畻缁撴灉搴旂敤 * * @param districtKey * @param result @@ -42,7 +42,7 @@ public interface Operator { /** - * 计算区域租金 + * 璁$畻鍖哄煙绉熼噾 * @param regions * @param calDate */ diff --git a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/core/Provider.java b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/core/Provider.java index d8c2ffaaa..700724acf 100644 --- a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/core/Provider.java +++ b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/core/Provider.java @@ -9,7 +9,7 @@ import com.fangjia.coredata.dao.DistrictKey; import com.fangjia.coredata.price.tree.Data; /** - * 数据提供者 + * 鏁版嵁鎻愪緵鑰� * * @author xiaoyu * @@ -17,7 +17,7 @@ import com.fangjia.coredata.price.tree.Data; public interface Provider { /** - * 获取城市数据 + * 鑾峰彇鍩庡競鏁版嵁 * * @param cityKey * @return @@ -27,7 +27,7 @@ public interface Provider { public DataManager fetchRegionRentData(CityKey cityKey, Date startDate); /** - * 获取小区数据 + * 鑾峰彇灏忓尯鏁版嵁 * * @param districtKey * @return @@ -35,7 +35,7 @@ public interface Provider { public DataManager fetchData(DistrictKey districtKey); /** - * 获取指定小区周边的数据 + * 鑾峰彇鎸囧畾灏忓尯鍛ㄨ竟鐨勬暟鎹� * * @param districtKey * @return @@ -45,7 +45,7 @@ public interface Provider { /** - * 获取周边小区的均价数据 + * 鑾峰彇鍛ㄨ竟灏忓尯鐨勫潎浠锋暟鎹� * @param districtKey * @return */ @@ -53,7 +53,7 @@ public interface Provider { public List fetchAroundAvgPriceData(DistrictKey districtKey, Date calcDate); /** - * 获取周边小区按不同室的均价数据 + * 鑾峰彇鍛ㄨ竟灏忓尯鎸変笉鍚屽鐨勫潎浠锋暟鎹� * @param districtKey * @return */ @@ -64,7 +64,7 @@ public interface Provider { public List fetchAroundData(DistrictKey districtKey, Date startDate, Date endDate, Integer radio, Integer minRadio); public List fetchAroundHouseData(DistrictKey districtKey, Date startDate, Date endDate, Integer radio, Integer minRadio); /** - * 根据小区查询相关数据 + * 鏍规嵁灏忓尯鏌ヨ鐩稿叧鏁版嵁 * @param districtKey * @return */ diff --git a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/core/Result.java b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/core/Result.java index f47e53d0b..43c9f9152 100644 --- a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/core/Result.java +++ b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/core/Result.java @@ -3,13 +3,13 @@ package com.fangjia.coredata.price.core; import java.util.Date; public class Result { - private int sampleSize; // 样本数量 - private SampleEnum sampleEnum; // 样本类型 - private int value; // 运算出的值 + private int sampleSize; // 鏍锋湰鏁伴噺 + private SampleEnum sampleEnum; // 鏍锋湰绫诲瀷 + private int value; // 杩愮畻鍑虹殑鍊� private Date calcDate; - private double credit; // 可信度 - private int mean; // 均值 - private int key;//值对应该的key,非必需。如(租金计算中的room) + private double credit; // 鍙俊搴� + private int mean; // 鍧囧�� + private int key;//鍊煎搴旇鐨刱ey,闈炲繀闇�銆傚锛堢閲戣绠椾腑鐨剅oom锛� private String sampleRange; private int oldValue; @@ -100,14 +100,14 @@ public class Result { public enum SampleEnum { - OWN("own"), // 自身样本 - GUI("gui"), // 指导价 - AROUND("around"), // 周边样本 - MIX("mix"), // 混合 - NONE("none"), // 无样本 - RATIO("ratio"), // 根据均价推算 - ROOMRATIO("room_ratio"), // 根据房型跨度推算 - CORRECTED("corrected"), // 价格修改,根据房型修正 + OWN("own"), // 鑷韩鏍锋湰 + GUI("gui"), // 鎸囧浠� + AROUND("around"), // 鍛ㄨ竟鏍锋湰 + MIX("mix"), // 娣峰悎 + NONE("none"), // 鏃犳牱鏈� + RATIO("ratio"), // 鏍规嵁鍧囦环鎺ㄧ畻 + ROOMRATIO("room_ratio"), // 鏍规嵁鎴垮瀷璺ㄥ害鎺ㄧ畻 + CORRECTED("corrected"), // 浠锋牸淇敼,鏍规嵁鎴垮瀷淇 ; private final String sampleType; diff --git a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/core/SqRentResult.java b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/core/SqRentResult.java index dcc2b0ec9..171564c1a 100644 --- a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/core/SqRentResult.java +++ b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/core/SqRentResult.java @@ -5,13 +5,13 @@ import java.util.Date; import com.fangjia.coredata.price.core.Result.SampleEnum; public class SqRentResult { - private int sampleSize; // 样本数量 - private SampleType sampleEnum; // 样本类型 - private double value; // 运算出的值 + private int sampleSize; // 鏍锋湰鏁伴噺 + private SampleType sampleEnum; // 鏍锋湰绫诲瀷 + private double value; // 杩愮畻鍑虹殑鍊� private Date calcDate; - private double credit; // 可信度 - private double mean; // 均值 - private int key;//值对应该的key,非必需。如(租金计算中的room) + private double credit; // 鍙俊搴� + private double mean; // 鍧囧�� + private int key;//鍊煎搴旇鐨刱ey,闈炲繀闇�銆傚锛堢閲戣绠椾腑鐨剅oom锛� private String sampleRange; private double oldValue; @@ -102,15 +102,15 @@ public class SqRentResult { public enum SampleType { - OWN("own"), // 自身样本 - GUI("gui"), // 指导价 - AROUND("around"), // 周边样本 - MIX("mix"), // 混合 - NONE("none"), // 无样本 - RATIO("ratio"), // 根据均价推算 - HISTORY("history"), // 根据均价推算 - ROOMRATIO("room_ratio"), // 根据房型跨度推算 - CORRECTED("corrected"), // 价格修改,根据房型修正 + OWN("own"), // 鑷韩鏍锋湰 + GUI("gui"), // 鎸囧浠� + AROUND("around"), // 鍛ㄨ竟鏍锋湰 + MIX("mix"), // 娣峰悎 + NONE("none"), // 鏃犳牱鏈� + RATIO("ratio"), // 鏍规嵁鍧囦环鎺ㄧ畻 + HISTORY("history"), // 鏍规嵁鍧囦环鎺ㄧ畻 + ROOMRATIO("room_ratio"), // 鏍规嵁鎴垮瀷璺ㄥ害鎺ㄧ畻 + CORRECTED("corrected"), // 浠锋牸淇敼,鏍规嵁鎴垮瀷淇 ; private final String sampleType; diff --git a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/opt/RentHouseResultOperator.java b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/opt/RentHouseResultOperator.java index 17b43e4d5..8535e44df 100644 --- a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/opt/RentHouseResultOperator.java +++ b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/opt/RentHouseResultOperator.java @@ -52,11 +52,11 @@ public class RentHouseResultOperator implements Operator { private RegionStatDao regionStatDao = RegionStatDao.getInstance(); - public static final double MIN_VALID_MARKUP = 0.003d; // 每月最小有效涨跌幅0.3% + public static final double MIN_VALID_MARKUP = 0.003d; // 姣忔湀鏈�灏忔湁鏁堟定璺屽箙0.3% - public static final double MAX_VALID_MARKUP = 0.02d; // 每月最小有效涨跌幅2% + public static final double MAX_VALID_MARKUP = 0.02d; // 姣忔湀鏈�灏忔湁鏁堟定璺屽箙2% - public static final double INVALID_MARKUP = 0.06d; // 每月大有效涨跌幅6% + public static final double INVALID_MARKUP = 0.06d; // 姣忔湀澶ф湁鏁堟定璺屽箙6% public static final int AVG_MARKUP_WEEKEND = 6; @@ -94,7 +94,7 @@ public class RentHouseResultOperator implements Operator { for (Result res : result) { int curMonthPrice = res.getValue(); - DistrictStatRent rent = lastRentStatMap.get(res.getKey());// 历史房型价格 + DistrictStatRent rent = lastRentStatMap.get(res.getKey());// 鍘嗗彶鎴垮瀷浠锋牸 Integer lastMonthPrice = null; if(rent != null){ lastMonthPrice = rent.getAvgPrice(); @@ -106,7 +106,7 @@ public class RentHouseResultOperator implements Operator { DistrictStatRent districtStatRent = new DistrictStatRent(); districtStatRent.setHouseCount(res.getSampleSize()); - if (null == lastMonthPrice && curMonthPrice > 0) {//没有历史,第一次计算有值 + if (null == lastMonthPrice && curMonthPrice > 0) {//娌℃湁鍘嗗彶锛岀涓�娆¤绠楁湁鍊� districtStatRent.setMarkup(0); districtStatRent.setAvgPrice(curMonthPrice); } else { @@ -148,7 +148,7 @@ public class RentHouseResultOperator implements Operator { + res.getSampleSize() + " markup:" + districtStatRent.getMarkup()+" credit:"+districtStatRent.getCredit()); } - //填充缺失的室 + //濉厖缂哄け鐨勫 //fillRoomPrice(rentStats); rentStats = correctRentPrice(rentStats, lastRentStatMap, ratioMap); @@ -195,7 +195,7 @@ public class RentHouseResultOperator implements Operator { } if(Math.abs(markup) > 1500 || prePrice== null){ - // 随机[-2~1)的涨跌幅 + // 闅忔満[-2~1)鐨勬定璺屽箙 BigDecimal bg = new BigDecimal(Math.random() * -3 + 1); double tempMarkup = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); @@ -282,25 +282,25 @@ public class RentHouseResultOperator implements Operator { } /** - * 检查涨跌幅是否正常 + * 妫�鏌ユ定璺屽箙鏄惁姝e父 * * @param markup * @param avgMarkup * @return */ private boolean isValidMarkup(double markup, double avgMarkup) { - // 每周涨跌1%属于正常 + // 姣忓懆娑ㄨ穼1%灞炰簬姝e父 if (Math.abs(markup) > MIN_VALID_MARKUP && Math.abs(markup) < MAX_VALID_MARKUP) { return true; } - // 每周涨跌7%属于不正常 + // 姣忓懆娑ㄨ穼7%灞炰簬涓嶆甯� if (Math.abs(markup) > INVALID_MARKUP) { return false; } // if (avgMarkup < MIN_VALID_MARKUP) { // return false; // } - // 大于平均涨跌幅的0.35倍属于不正常,这样会造成曲线波动很大 + // 澶т簬骞冲潎娑ㄨ穼骞呯殑0.35鍊嶅睘浜庝笉姝e父,杩欐牱浼氶�犳垚鏇茬嚎娉㈠姩寰堝ぇ // if (Math.abs(markup) > (avgMarkup + avgMarkup * // MAX_AVG_MARKUP_FLOAT)) { // return false; @@ -315,7 +315,7 @@ public class RentHouseResultOperator implements Operator { Map>> regionMap = groupRegionRoom(districtStatRents); int rooms = 5; for (String region : regions) { -// if(!region.equals("双流")){ +// if(!region.equals("鍙屾祦")){ // continue; // } Map> roomMap = regionMap.get(region); @@ -388,7 +388,7 @@ public class RentHouseResultOperator implements Operator { roomMap.put(rentStat.getHouseType(), prices); } - if(StringUtils.isNotBlank(rentStat.getEstateType()) && !rentStat.getEstateType().equals("别墅")){ + if(StringUtils.isNotBlank(rentStat.getEstateType()) && !rentStat.getEstateType().equals("鍒")){ prices.add(rentStat.getAvgPrice()); } @@ -412,7 +412,7 @@ public class RentHouseResultOperator implements Operator { } /** - * 修正租金(户型大租金反而低的、或者户型租金不匹配的) + * 淇绉熼噾锛堟埛鍨嬪ぇ绉熼噾鍙嶈�屼綆鐨勩�佹垨鑰呮埛鍨嬬閲戜笉鍖归厤鐨勶級 */ private List correctRentPrice(List stats, Map lastRentStatMap, Map ratioMap) { if (CollectionUtils.isEmpty(stats) || stats.size() == 1) { @@ -430,7 +430,7 @@ public class RentHouseResultOperator implements Operator { rooms.add(rent.getHouseType()); } List allRooms = ServiceUtils.getAllRooms(rooms); - //找出最大可能可参照的室 + //鎵惧嚭鏈�澶у彲鑳藉彲鍙傜収鐨勫 int standardRoom = 0; double maxCredit = -1; int maxCount = 0; @@ -468,10 +468,10 @@ public class RentHouseResultOperator implements Operator { } Map rentMap = new HashMap(); - //住前推价格 + //浣忓墠鎺ㄤ环鏍� for(int j=standardIndex-1;j>=0;j--){ int room = allRooms.get(j); - if(!calcalatedMap.containsKey(room)){//是否根据房源已计算 + if(!calcalatedMap.containsKey(room)){//鏄惁鏍规嵁鎴挎簮宸茶绠� double ratio = ServiceUtils.getRatioByRoom(room + 1, ratioMap); int knowRent = 0; if(rentMap.containsKey(room+1)){ @@ -501,10 +501,10 @@ public class RentHouseResultOperator implements Operator { } } - //向后推价格 + //鍚戝悗鎺ㄤ环鏍� for(int k=standardIndex+1;k maxRoom) { @@ -667,7 +667,7 @@ public class RentHouseResultOperator implements Operator { } i++; - DistrictStatRent rent = roomPriceMap.get(res.getKey());// 历史房型价格 + DistrictStatRent rent = roomPriceMap.get(res.getKey());// 鍘嗗彶鎴垮瀷浠锋牸 Integer lastMonthPrice = null; if(rent != null){ lastMonthPrice = rent.getAvgPrice(); @@ -680,7 +680,7 @@ public class RentHouseResultOperator implements Operator { DistrictStatRent districtStatRent = new DistrictStatRent(); districtStatRent.setHouseCount(res.getSampleSize()); - if (null == lastMonthPrice && curMonthPrice > 0) {//没有历史,第一次计算有值 + if (null == lastMonthPrice && curMonthPrice > 0) {//娌℃湁鍘嗗彶锛岀涓�娆¤绠楁湁鍊� districtStatRent.setMarkup(0); districtStatRent.setAvgPrice(curMonthPrice); } else { @@ -691,11 +691,11 @@ public class RentHouseResultOperator implements Operator { } else if (null != lastMonthPrice && curMonthPrice > 0) { markup = (double) (curMonthPrice - lastMonthPrice) / lastMonthPrice; - // 最近6周的平均涨跌幅 + // 鏈�杩�6鍛ㄧ殑骞冲潎娑ㄨ穼骞� avgMarkup = districtStatRentDao.findLatestStatAvgMarkup(districtKey.getCity(), districtKey.getRegion(), districtKey.getName(),districtKey.getEstateTypeEnum().getEstateType(), res.getCalcDate(), AVG_MARKUP_WEEKEND); - // 涨跌幅不正常 + // 娑ㄨ穼骞呬笉姝e父 if (!isValidMarkup(markup, avgMarkup)) { int level = checkHouseReliability(districtStatRent.getHouseCount()); @@ -715,7 +715,7 @@ public class RentHouseResultOperator implements Operator { } } - // 如果本周计算的均价与上周的相同 + // 濡傛灉鏈懆璁$畻鐨勫潎浠蜂笌涓婂懆鐨勭浉鍚� if (lastMonthPrice == curMonthPrice) { if (RandomUtil.nextBoolean()) { curMonthPrice = (int) (curMonthPrice - curMonthPrice * (RandomUtil.random(3, 15) / 1000d)); @@ -843,7 +843,7 @@ public class RentHouseResultOperator implements Operator { double curValue = 0; int curMarkup = 0; - if(null == res){//本次无计算结果,但有历史 + if(null == res){//鏈鏃犺绠楃粨鏋�,浣嗘湁鍘嗗彶 //curMarkup = getAvgMarkup(sqmetreRegionRents); double lastMonthPrice = sqmetreRegionRents.get(sqmetreRegionRents.size()-1).getAvgPrice(); @@ -851,8 +851,8 @@ public class RentHouseResultOperator implements Operator { curMarkup = (int) (bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()*100); curValue = (int)(lastMonthPrice + lastMonthPrice*curMarkup/10000); - }else{//本次有计算结果 - if(sqmetreRegionRents.size()==0){//无历史 + }else{//鏈鏈夎绠楃粨鏋� + if(sqmetreRegionRents.size()==0){//鏃犲巻鍙� curValue = res.getValue(); }else{ double lastMonthPrice = sqmetreRegionRents.get(sqmetreRegionRents.size()-1).getAvgPrice(); @@ -860,7 +860,7 @@ public class RentHouseResultOperator implements Operator { if(curMarkup>-500 && curMarkup<500){ curValue = res.getValue(); }else{ - //是否利用均价涨跌幅 + //鏄惁鍒╃敤鍧囦环娑ㄨ穼骞� RegionStat regionStat = regionStatDao.findLastRegionStat(city, region, null); if(null != regionStat){ if(regionStat.getWeekendMarkup()>=0 && curMarkup>0){ @@ -1020,7 +1020,7 @@ public class RentHouseResultOperator implements Operator { } if(Math.abs(markup) > 450 || prePrice== null){ - // 随机[-2~1)的涨跌幅 + // 闅忔満[-2~1)鐨勬定璺屽箙 BigDecimal bg = new BigDecimal(Math.random() * -0.3 +0.3); double tempMarkup = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); diff --git a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/opt/RentShopOfficeResultOperator.java b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/opt/RentShopOfficeResultOperator.java index d0de53988..aa4864661 100644 --- a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/opt/RentShopOfficeResultOperator.java +++ b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/opt/RentShopOfficeResultOperator.java @@ -33,11 +33,11 @@ public class RentShopOfficeResultOperator implements Operator{ private RentStatDao rentStatDao = RentStatDao.getInstance(); - public static final double MIN_VALID_MARKUP = 0.003d; // 每周最小有效涨跌幅0.3% + public static final double MIN_VALID_MARKUP = 0.003d; // 姣忓懆鏈�灏忔湁鏁堟定璺屽箙0.3% - public static final double MAX_VALID_MARKUP = 0.01d; // 每周最小有效涨跌幅1% + public static final double MAX_VALID_MARKUP = 0.01d; // 姣忓懆鏈�灏忔湁鏁堟定璺屽箙1% - public static final double INVALID_MARKUP = 0.06d; // 每周最大有效涨跌幅6% + public static final double INVALID_MARKUP = 0.06d; // 姣忓懆鏈�澶ф湁鏁堟定璺屽箙6% public static final int AVG_MARKUP_WEEKEND = 6; @@ -84,16 +84,16 @@ public class RentShopOfficeResultOperator implements Operator{ if (lastRegionStat != null && lastRegionStat.getAvgPrice() > 0) { double markup = (double) (value - lastRegionStat.getAvgPrice()) / (double) lastRegionStat.getAvgPrice(); - // 最近4周的平均涨跌幅 + // 鏈�杩�4鍛ㄧ殑骞冲潎娑ㄨ穼骞� avgMarkup = businessRegionStatDao.findLatestStatAvgMarkup(city, region, block, category, result.getCalcDate(), AVG_MARKUP_WEEKEND); - // 涨跌幅不正常 + // 娑ㄨ穼骞呬笉姝e父 if (!isValidMarkup(markup, avgMarkup)) { double realMarkup = balanceMarkup(markup, avgMarkup); value = (int) (lastRegionStat.getAvgPrice() + lastRegionStat.getAvgPrice() * realMarkup); } - // 如果本周计算的均价与上周的相同 + // 濡傛灉鏈懆璁$畻鐨勫潎浠蜂笌涓婂懆鐨勭浉鍚� if (lastRegionStat.getAvgPrice() == value) { if (RandomUtil.nextBoolean()) { value = (int) (value - value * (RandomUtil.random(3, 15) / 1000d)); @@ -149,7 +149,7 @@ public class RentShopOfficeResultOperator implements Operator{ } } - // value为0,说明均价计算不出,所以拿前一期的均价进行随机涨跌 + // value涓�0锛岃鏄庡潎浠疯绠椾笉鍑猴紝鎵�浠ユ嬁鍓嶄竴鏈熺殑鍧囦环杩涜闅忔満娑ㄨ穼 if (value == 0 && lastStat != null) { value = lastStat.getWeekendAvgprice(); } @@ -158,11 +158,11 @@ public class RentShopOfficeResultOperator implements Operator{ double avgMarkup = 0; if (lastStat != null && lastStat.getWeekendAvgprice() > 0) { double markup = (double) (value - lastStat.getWeekendAvgprice()) / (double) lastStat.getWeekendAvgprice(); - // 最近6周的平均涨跌幅 + // 鏈�杩�6鍛ㄧ殑骞冲潎娑ㄨ穼骞� avgMarkup = rentStatDao.findLatestStatAvgMarkup(districtKey.getCity(), districtKey.getRegion(), districtKey.getName(), districtKey.getCategoryEnum(), result.getCalcDate(), AVG_MARKUP_WEEKEND); - // 涨跌幅不正常 + // 娑ㄨ穼骞呬笉姝e父 if (!isValidMarkup(markup, avgMarkup)) { int level = checkHouseReliability(result.getSampleSize()); @@ -180,7 +180,7 @@ public class RentShopOfficeResultOperator implements Operator{ } - // 如果本周计算的均价与上周的相同 + // 濡傛灉鏈懆璁$畻鐨勫潎浠蜂笌涓婂懆鐨勭浉鍚� if (lastStat.getWeekendAvgprice() == value) { if (RandomUtil.nextBoolean()) { value = (int) (value - value * (RandomUtil.random(3, 15) / 1000d)); @@ -221,7 +221,7 @@ public class RentShopOfficeResultOperator implements Operator{ if(rentStat.getWeekendAvgprice() > 15){ rentStatDao.saveOrUpdateRentStat(rentStat); }else{ - //删除月平米租金小于60的数据 + //鍒犻櫎鏈堝钩绫崇閲戝皬浜�60鐨勬暟鎹� rentStatDao.deleteRentStatByParams(rentStat.getCity(), rentStat.getRegion(), rentStat.getName(), rentStat.getKind(), 15); } @@ -241,9 +241,9 @@ public class RentShopOfficeResultOperator implements Operator{ private double getOtherWebsitePrice(DistrictKey districtKey){ AverageStatistics averageStatistics = null; - if(districtKey.getCategoryEnum().getDisplay().equals("写字楼")){ + if(districtKey.getCategoryEnum().getDisplay().equals("鍐欏瓧妤�")){ averageStatistics = averageStatisticsDao.findLatestAverageStatistics(districtKey.getCity(), districtKey.getRegion(), districtKey.getName(), CategoryEnum.OFFICE.getCategory()); - }else if(districtKey.getCategoryEnum().getDisplay().equals("商铺")){ + }else if(districtKey.getCategoryEnum().getDisplay().equals("鍟嗛摵")){ averageStatistics = averageStatisticsDao.findLatestAverageStatistics(districtKey.getCity(), districtKey.getRegion(), districtKey.getName(), CategoryEnum.SHOP.getCategory()); } @@ -339,7 +339,7 @@ public class RentShopOfficeResultOperator implements Operator{ } if(Math.abs(tempMarkup)>3){ - // 随机[-0.5~1.5)的涨跌幅 + // 闅忔満[-0.5~1.5)鐨勬定璺屽箙 BigDecimal bg = new BigDecimal(Math.random() * -1+0.5); double markup = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); Integer newPrice = newPrices.get(k+1); @@ -367,7 +367,7 @@ public class RentShopOfficeResultOperator implements Operator{ } if(Math.abs(tempMarkup)>3){ - // 随机[0~2)的涨跌幅 + // 闅忔満[0~2)鐨勬定璺屽箙 BigDecimal bg = new BigDecimal(Math.random() * 2); double markup = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); int avg_price = (int) (newPrices.get(j-1) * (1 + markup / 100)); @@ -381,9 +381,9 @@ public class RentShopOfficeResultOperator implements Operator{ } - //更新价格 + //鏇存柊浠锋牸 if(isUpdate){ - System.out.println(" 修正后: " +newPrices.toString()); + System.out.println(" 淇鍚�: " +newPrices.toString()); for(int m = 0;m < weekends.size(); m++){ String weekend = weekends.get(m); Integer newPrice = newPrices.get(m); @@ -443,25 +443,25 @@ public class RentShopOfficeResultOperator implements Operator{ } /** - * 检查涨跌幅是否正常 + * 妫�鏌ユ定璺屽箙鏄惁姝e父 * * @param markup * @param avgMarkup * @return */ private boolean isValidMarkup(double markup, double avgMarkup) { - // 每周涨跌1%属于正常 + // 姣忓懆娑ㄨ穼1%灞炰簬姝e父 if (Math.abs(markup) > MIN_VALID_MARKUP && Math.abs(markup) < MAX_VALID_MARKUP) { return true; } - // 每周涨跌7%属于不正常 + // 姣忓懆娑ㄨ穼7%灞炰簬涓嶆甯� if (Math.abs(markup) > INVALID_MARKUP) { return false; } // if (avgMarkup < MIN_VALID_MARKUP) { // return false; // } - // 大于平均涨跌幅的0.35倍属于不正常,这样会造成曲线波动很大 + // 澶т簬骞冲潎娑ㄨ穼骞呯殑0.35鍊嶅睘浜庝笉姝e父,杩欐牱浼氶�犳垚鏇茬嚎娉㈠姩寰堝ぇ // if (Math.abs(markup) > (avgMarkup + avgMarkup * MAX_AVG_MARKUP_FLOAT)) { // return false; // } diff --git a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/opt/SellHouseResultOperator.java b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/opt/SellHouseResultOperator.java index 00b9b4be0..205fafc6a 100644 --- a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/opt/SellHouseResultOperator.java +++ b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/opt/SellHouseResultOperator.java @@ -24,11 +24,11 @@ import com.fangjia.mongo.model.DistrictStat; import com.fangjia.mongo.model.RegionStat; public class SellHouseResultOperator implements Operator { - public static final double MIN_VALID_MARKUP = 0.003d; // 每周最小有效涨跌幅0.3% + public static final double MIN_VALID_MARKUP = 0.003d; // 姣忓懆鏈�灏忔湁鏁堟定璺屽箙0.3% - public static final double MAX_VALID_MARKUP = 0.01d; // 每周最小有效涨跌幅1% + public static final double MAX_VALID_MARKUP = 0.01d; // 姣忓懆鏈�灏忔湁鏁堟定璺屽箙1% - public static final double INVALID_MARKUP = 0.07d; // 每周最大有效涨跌幅7% + public static final double INVALID_MARKUP = 0.07d; // 姣忓懆鏈�澶ф湁鏁堟定璺屽箙7% public static final int AVG_MARKUP_WEEKEND = 6; @@ -56,19 +56,19 @@ public class SellHouseResultOperator implements Operator { regionStat.setCity(city); regionStat.setRegion(region); regionStat.setBlock(block); - regionStat.setCat("板块"); + regionStat.setCat("鏉垮潡"); lastRegionStat = regionStatDao.findRegionStat(city, region, block, DateUtil.getLastSunday(result.getCalcDate())); } else if (city != null && region != null && block == null) { regionStat.setCity(city); regionStat.setRegion(region); regionStat.setBlock(null); - regionStat.setCat("区域"); + regionStat.setCat("鍖哄煙"); lastRegionStat = regionStatDao.findRegionStat(city, region, null, DateUtil.getLastSunday(result.getCalcDate())); } else if (city != null && region == null && block == null) { regionStat.setCity(city); regionStat.setRegion(null); regionStat.setBlock(null); - regionStat.setCat("城市"); + regionStat.setCat("鍩庡競"); lastRegionStat = regionStatDao.findRegionStat(city, null, null, DateUtil.getLastSunday(result.getCalcDate())); } else { return; @@ -79,16 +79,16 @@ public class SellHouseResultOperator implements Operator { if (lastRegionStat != null && lastRegionStat.getAvgPrice() > 0) { double markup = (double) (value - lastRegionStat.getAvgPrice()) / (double) lastRegionStat.getAvgPrice(); - // 最近4周的平均涨跌震荡 + // 鏈�杩�4鍛ㄧ殑骞冲潎娑ㄨ穼闇囪崱 avgMarkup = regionStatDao.findLatestStatAvgShake(city, region, block, result.getCalcDate(), AVG_MARKUP_WEEKEND); - // 涨跌幅不正常 + // 娑ㄨ穼骞呬笉姝e父 if (!isValidMarkup(markup, avgMarkup)) { double realMarkup = balanceMarkup(markup, avgMarkup); value = (int) (lastRegionStat.getAvgPrice() + lastRegionStat.getAvgPrice() * realMarkup); } - // 如果本周计算的均价与上周的相同 + // 濡傛灉鏈懆璁$畻鐨勫潎浠蜂笌涓婂懆鐨勭浉鍚� if (lastRegionStat.getAvgPrice() == value) { if (RandomUtil.nextBoolean()) { value = (int) (value - value * (RandomUtil.random(3, 15) / 1000d)); @@ -151,7 +151,7 @@ public class SellHouseResultOperator implements Operator { return; } - // value为0,说明均价计算不出,所以拿前一期的均价进行随机涨跌 + // value涓�0锛岃鏄庡潎浠疯绠椾笉鍑猴紝鎵�浠ユ嬁鍓嶄竴鏈熺殑鍧囦环杩涜闅忔満娑ㄨ穼 if (value == 0) { value = lastStat.getAvgPrice(); } @@ -159,18 +159,18 @@ public class SellHouseResultOperator implements Operator { double avgMarkup = 0; if (lastStat != null && lastStat.getAvgPrice() > 0) { double markup = (double) (value - lastStat.getAvgPrice()) / (double) lastStat.getAvgPrice(); - // 最近6周的平均涨跌幅 + // 鏈�杩�6鍛ㄧ殑骞冲潎娑ㄨ穼骞� avgMarkup = districtStatDao .findLatestStatAvgMarkup(districtKey.getCity(), districtKey.getRegion(), districtKey.getName(), districtKey .getEstateTypeEnum().getEstateType(), res.getCalcDate(), AVG_MARKUP_WEEKEND); - // 涨跌幅不正常 + // 娑ㄨ穼骞呬笉姝e父 if (!isValidMarkup(markup, avgMarkup)) { double realMarkup = balanceMarkup(markup, avgMarkup); value = (int) (lastStat.getAvgPrice() + lastStat.getAvgPrice() * realMarkup); } - // 如果本周计算的均价与上周的相同 + // 濡傛灉鏈懆璁$畻鐨勫潎浠蜂笌涓婂懆鐨勭浉鍚� if (lastStat.getAvgPrice() == value) { if (RandomUtil.nextBoolean()) { value = (int) (value - value * (RandomUtil.random(3, 15) / 1000d)); @@ -212,25 +212,25 @@ public class SellHouseResultOperator implements Operator { } /** - * 检查涨跌幅是否正常 + * 妫�鏌ユ定璺屽箙鏄惁姝e父 * * @param markup * @param avgMarkup * @return */ private boolean isValidMarkup(double markup, double avgMarkup) { - // 每周涨跌1%属于正常 + // 姣忓懆娑ㄨ穼1%灞炰簬姝e父 if (Math.abs(markup) > MIN_VALID_MARKUP && Math.abs(markup) < MAX_VALID_MARKUP) { return true; } - // 每周涨跌7%属于不正常 + // 姣忓懆娑ㄨ穼7%灞炰簬涓嶆甯� if (Math.abs(markup) > INVALID_MARKUP) { return false; } if (avgMarkup < MIN_VALID_MARKUP) { return false; } - // 大于平均涨跌幅的0.35倍属于不正常,这样会造成曲线波动很大 + // 澶т簬骞冲潎娑ㄨ穼骞呯殑0.35鍊嶅睘浜庝笉姝e父,杩欐牱浼氶�犳垚鏇茬嚎娉㈠姩寰堝ぇ if (Math.abs(markup) > (avgMarkup + avgMarkup * MAX_AVG_MARKUP_FLOAT)) { return false; } diff --git a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/opt/SellShopOfficeResultOperator.java b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/opt/SellShopOfficeResultOperator.java index de5b203d3..2c06715e8 100644 --- a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/opt/SellShopOfficeResultOperator.java +++ b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/opt/SellShopOfficeResultOperator.java @@ -43,11 +43,11 @@ public class SellShopOfficeResultOperator implements Operator { private OfficeStatDao officeStatDao = OfficeStatDao.getInstance(); private GuidingPriceDao guidingPriceDao = GuidingPriceDao.getInstance(); - public static final double MIN_VALID_MARKUP = 0.003d; // 每周最小有效涨跌幅0.3% + public static final double MIN_VALID_MARKUP = 0.003d; // 姣忓懆鏈�灏忔湁鏁堟定璺屽箙0.3% - public static final double MAX_VALID_MARKUP = 0.01d; // 每周最小有效涨跌幅1% + public static final double MAX_VALID_MARKUP = 0.01d; // 姣忓懆鏈�灏忔湁鏁堟定璺屽箙1% - public static final double INVALID_MARKUP = 0.07d; // 每周最大有效涨跌幅7% + public static final double INVALID_MARKUP = 0.07d; // 姣忓懆鏈�澶ф湁鏁堟定璺屽箙7% public static final int AVG_MARKUP_WEEKEND = 6; @@ -93,16 +93,16 @@ public class SellShopOfficeResultOperator implements Operator { if (lastRegionStat != null && lastRegionStat.getAvgPrice() > 0) { double markup = (double) (value - lastRegionStat.getAvgPrice()) / (double) lastRegionStat.getAvgPrice(); - // 最近4周的平均涨跌幅 + // 鏈�杩�4鍛ㄧ殑骞冲潎娑ㄨ穼骞� avgMarkup = businessRegionStatDao.findLatestStatAvgMarkup(city, region, block, category, result.getCalcDate(), AVG_MARKUP_WEEKEND); - // 涨跌幅不正常 + // 娑ㄨ穼骞呬笉姝e父 if (!isValidMarkup(markup, avgMarkup)) { double realMarkup = balanceMarkup(markup, avgMarkup); value = (int) (lastRegionStat.getAvgPrice() + lastRegionStat.getAvgPrice() * realMarkup); } - // 如果本周计算的均价与上周的相同 + // 濡傛灉鏈懆璁$畻鐨勫潎浠蜂笌涓婂懆鐨勭浉鍚� if (lastRegionStat.getAvgPrice() == value) { if (RandomUtil.nextBoolean()) { value = (int) (value - value * (RandomUtil.random(3, 15) / 1000d)); @@ -140,11 +140,11 @@ public class SellShopOfficeResultOperator implements Operator { GuidingPrice guidingPrice = null; Date startDate = DateUtil.add(DateUtil.formatByPattern(res.getCalcDate(), "yyyy-MM-dd"), -7); - if(districtKey.getCategoryEnum().getDisplay().equals("商铺")){ + if(districtKey.getCategoryEnum().getDisplay().equals("鍟嗛摵")){ lastStat = shopStatDao.findShopStat(districtKey.getCity(), districtKey.getRegion(), districtKey.getName(), DateUtil.getLastSunday(res.getCalcDate())); guidingPrice = guidingPriceDao.findFirstGuidingPrice(districtKey.getCity(), districtKey.getRegion(), districtKey.getName(), "shop_sell", startDate, res.getCalcDate()); stat = getAvgPrice(new ShopStat(), districtKey, res, lastStat); - //如果有指导价,优先使用指导价 + //濡傛灉鏈夋寚瀵间环锛屼紭鍏堜娇鐢ㄦ寚瀵间环 if(guidingPrice!=null && guidingPrice.getGuidingValue()>0){ stat.setAvgPrice(guidingPrice.getGuidingValue()); if(lastStat != null){ @@ -153,7 +153,7 @@ public class SellShopOfficeResultOperator implements Operator { }else{ stat.setWeekendMarkup(0); } - stat.setSampleSize(1000);//如果有指导价,样本量人为设定 + stat.setSampleSize(1000);//濡傛灉鏈夋寚瀵间环锛屾牱鏈噺浜轰负璁惧畾 } @@ -161,11 +161,11 @@ public class SellShopOfficeResultOperator implements Operator { shopStatDao.saveOrUpdateShopStat((ShopStat) stat); checkUpdateHistoryPrice(stat, stat.getWeekend()); } - }else if(districtKey.getCategoryEnum().getDisplay().equals("写字楼")){ + }else if(districtKey.getCategoryEnum().getDisplay().equals("鍐欏瓧妤�")){ lastStat = officeStatDao.findOfficeStat(districtKey.getCity(), districtKey.getRegion(), districtKey.getName(), DateUtil.getLastSunday(res.getCalcDate())); guidingPrice = guidingPriceDao.findFirstGuidingPrice(districtKey.getCity(), districtKey.getRegion(), districtKey.getName(), "office_sell", startDate, res.getCalcDate()); stat = getAvgPrice(new OfficeStat(), districtKey, res, lastStat); - //如果有指导价,优先使用指导价 + //濡傛灉鏈夋寚瀵间环锛屼紭鍏堜娇鐢ㄦ寚瀵间环 if(guidingPrice!=null && guidingPrice.getGuidingValue()>0){ stat.setAvgPrice(guidingPrice.getGuidingValue()); if(lastStat != null){ @@ -174,7 +174,7 @@ public class SellShopOfficeResultOperator implements Operator { }else{ stat.setWeekendMarkup(0); } - stat.setSampleSize(1000);//如果有指导价,样本量人为设定 + stat.setSampleSize(1000);//濡傛灉鏈夋寚瀵间环锛屾牱鏈噺浜轰负璁惧畾 } if(stat.getAvgPrice() > 0){ @@ -218,7 +218,7 @@ public class SellShopOfficeResultOperator implements Operator { } - // value为0,说明均价计算不出,所以拿前一期的均价进行随机涨跌 + // value涓�0锛岃鏄庡潎浠疯绠椾笉鍑猴紝鎵�浠ユ嬁鍓嶄竴鏈熺殑鍧囦环杩涜闅忔満娑ㄨ穼 if (value == 0) { value = lastStat.getAvgPrice(); } @@ -226,16 +226,16 @@ public class SellShopOfficeResultOperator implements Operator { double avgMarkup = 0; if (lastStat != null && lastStat.getAvgPrice() > 0) { double markup = (double) (value - lastStat.getAvgPrice()) / (double) lastStat.getAvgPrice(); - // 最近6周的平均涨跌幅 + // 鏈�杩�6鍛ㄧ殑骞冲潎娑ㄨ穼骞� - if(districtKey.getCategoryEnum().getDisplay().equals("商铺")){ + if(districtKey.getCategoryEnum().getDisplay().equals("鍟嗛摵")){ avgMarkup = shopStatDao.findLatestStatAvgMarkup(districtKey.getCity(), districtKey.getRegion(), districtKey.getName(), res.getCalcDate(), AVG_MARKUP_WEEKEND); }else{ avgMarkup = officeStatDao.findLatestStatAvgMarkup(districtKey.getCity(), districtKey.getRegion(), districtKey.getName(), res.getCalcDate(), AVG_MARKUP_WEEKEND); } - // 涨跌幅不正常 + // 娑ㄨ穼骞呬笉姝e父 if (!isValidMarkup(markup, avgMarkup)) { int level = checkHouseReliability(res.getSampleSize()); @@ -252,7 +252,7 @@ public class SellShopOfficeResultOperator implements Operator { } } - // 如果本周计算的均价与上周的相同 + // 濡傛灉鏈懆璁$畻鐨勫潎浠蜂笌涓婂懆鐨勭浉鍚� if (lastStat.getAvgPrice() == value) { if (RandomUtil.nextBoolean()) { value = (int) (value - value * (RandomUtil.random(3, 15) / 1000d)); @@ -283,9 +283,9 @@ public class SellShopOfficeResultOperator implements Operator { private Integer getOtherWebsitePrice(DistrictKey districtKey){ AverageStatistics averageStatistics = null; - if(districtKey.getCategoryEnum().getDisplay().equals("写字楼")){ + if(districtKey.getCategoryEnum().getDisplay().equals("鍐欏瓧妤�")){ averageStatistics = averageStatisticsDao.findLatestAverageStatistics(districtKey.getCity(), districtKey.getRegion(), districtKey.getName(), CategoryEnum.OFFICE.getCategory()); - }else if(districtKey.getCategoryEnum().getDisplay().equals("商铺")){ + }else if(districtKey.getCategoryEnum().getDisplay().equals("鍟嗛摵")){ averageStatistics = averageStatisticsDao.findLatestAverageStatistics(districtKey.getCity(), districtKey.getRegion(), districtKey.getName(), CategoryEnum.SHOP.getCategory()); } @@ -327,7 +327,7 @@ public class SellShopOfficeResultOperator implements Operator { avgMarkup = MIN_VALID_MARKUP + ((double) RandomUtil.random(1, 20) / 10000d); return avgMarkup; } else { - // 大于平均涨跌幅的0.35倍,则使用平均涨跌幅控制 + // 澶т簬骞冲潎娑ㄨ穼骞呯殑0.35鍊嶏紝鍒欎娇鐢ㄥ钩鍧囨定璺屽箙鎺у埗 int p = RandomUtil.random((int) (MIN_AVG_MARKUP_FLOAT * 100), (int) (MAX_AVG_MARKUP_FLOAT * 100)); ret = avgMarkup + avgMarkup * ((double) p / 100d); if (markup < 0) { @@ -339,25 +339,25 @@ public class SellShopOfficeResultOperator implements Operator { } /** - * 检查涨跌幅是否正常 + * 妫�鏌ユ定璺屽箙鏄惁姝e父 * * @param markup * @param avgMarkup * @return */ private boolean isValidMarkup(double markup, double avgMarkup) { - // 每周涨跌1%属于正常 + // 姣忓懆娑ㄨ穼1%灞炰簬姝e父 if (Math.abs(markup) > MIN_VALID_MARKUP && Math.abs(markup) < MAX_VALID_MARKUP) { return true; } - // 每周涨跌7%属于不正常 + // 姣忓懆娑ㄨ穼7%灞炰簬涓嶆甯� if (Math.abs(markup) > INVALID_MARKUP) { return false; } if (avgMarkup < MIN_VALID_MARKUP) { return false; } - // 大于平均涨跌幅的0.35倍属于不正常,这样会造成曲线波动很大 + // 澶т簬骞冲潎娑ㄨ穼骞呯殑0.35鍊嶅睘浜庝笉姝e父,杩欐牱浼氶�犳垚鏇茬嚎娉㈠姩寰堝ぇ if (Math.abs(markup) > (avgMarkup + avgMarkup * MAX_AVG_MARKUP_FLOAT)) { return false; } @@ -368,9 +368,9 @@ public class SellShopOfficeResultOperator implements Operator { private Stat getMaxHouseCountStat(Stat stat, Date claDate){ Stat maxStat = null; - if(stat.getEstateType().equals("商铺")){ + if(stat.getEstateType().equals("鍟嗛摵")){ maxStat = shopStatDao.findShopStatMaxHouseCount(stat.getCity(), stat.getRegion(), stat.getDistrictName(),claDate); - }else if(stat.getEstateType().equals("写字楼")){ + }else if(stat.getEstateType().equals("鍐欏瓧妤�")){ maxStat = officeStatDao.findOfficeStatMaxHouseCount(stat.getCity(), stat.getRegion(), stat.getDistrictName(),claDate); } @@ -385,9 +385,9 @@ public class SellShopOfficeResultOperator implements Operator { private Stat getMaxOrMinStat(Stat stat, Date claDate, boolean isAsc){ Stat tempStat = null; - if(stat.getEstateType().equals("商铺")){ + if(stat.getEstateType().equals("鍟嗛摵")){ tempStat = shopStatDao.findShopStatMinPrice(stat.getCity(), stat.getRegion(), stat.getDistrictName(),claDate, isAsc); - }else if(stat.getEstateType().equals("写字楼")){ + }else if(stat.getEstateType().equals("鍐欏瓧妤�")){ tempStat = officeStatDao.findOfficeStatMinPrice(stat.getCity(), stat.getRegion(), stat.getDistrictName(),claDate, isAsc); } return tempStat; @@ -395,9 +395,9 @@ public class SellShopOfficeResultOperator implements Operator { private Date getFirstWeekendFromHistory(Stat stat, Date claDate){ Date firstDate = null; - if(stat.getEstateType().equals("商铺")){ + if(stat.getEstateType().equals("鍟嗛摵")){ firstDate = shopStatDao.findShopStatFirstWeekend(stat.getCity(), stat.getRegion(), stat.getDistrictName()); - }else if(stat.getEstateType().equals("写字楼")){ + }else if(stat.getEstateType().equals("鍐欏瓧妤�")){ firstDate = officeStatDao.findOfficeStatFirstWeekend(stat.getCity(), stat.getRegion(), stat.getDistrictName()); } return firstDate; @@ -406,18 +406,18 @@ public class SellShopOfficeResultOperator implements Operator { private Map getAllHistoryStat(Stat stat, Date claDate){ Map rentMap = null; - if(stat.getEstateType().equals("商铺")){ + if(stat.getEstateType().equals("鍟嗛摵")){ rentMap = shopStatDao.findAllHistoryPrice(stat.getCity(), stat.getRegion(), stat.getDistrictName(), claDate); - }else if(stat.getEstateType().equals("写字楼")){ + }else if(stat.getEstateType().equals("鍐欏瓧妤�")){ rentMap = officeStatDao.findAllHistoryPrice(stat.getCity(), stat.getRegion(), stat.getDistrictName(), claDate); } return rentMap; } private void updateStat(String city,String region, String name, int price, int markup, Date calDate, String type){ - if(type.equals("商铺")){ + if(type.equals("鍟嗛摵")){ shopStatDao.update(city, region, name, price, markup, calDate); - }else if(type.equals("写字楼")){ + }else if(type.equals("鍐欏瓧妤�")){ officeStatDao.update(city, region, name, price, markup, calDate); } @@ -486,7 +486,7 @@ public class SellShopOfficeResultOperator implements Operator { } if(Math.abs(tempMarkup)>3){ - // 随机[-0.5~1.5)的涨跌幅 + // 闅忔満[-0.5~1.5)鐨勬定璺屽箙 BigDecimal bg = new BigDecimal(Math.random() * -1+0.5); double markup = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); @@ -510,7 +510,7 @@ public class SellShopOfficeResultOperator implements Operator { } if(Math.abs(tempMarkup)>3){ - // 随机[0~2)的涨跌幅 + // 闅忔満[0~2)鐨勬定璺屽箙 BigDecimal bg = new BigDecimal(Math.random() * 2); double markup = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); int avg_price = (int) (newPrices.get(j-1) * (1 + markup / 100)); @@ -524,9 +524,9 @@ public class SellShopOfficeResultOperator implements Operator { } - //更新价格 + //鏇存柊浠锋牸 if(isUpdate){ - System.out.println(" 修正后: " +newPrices.toString()); + System.out.println(" 淇鍚�: " +newPrices.toString()); for(int m = 0;m < weekends.size(); m++){ String weekend = weekends.get(m); Integer newPrice = newPrices.get(m); diff --git a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/provider/AbstractProvider.java b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/provider/AbstractProvider.java index 49128a29d..f6fbfb4fd 100644 --- a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/provider/AbstractProvider.java +++ b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/provider/AbstractProvider.java @@ -62,7 +62,7 @@ public abstract class AbstractProvider implements Provider { List dataList = new ArrayList(); - // 如果是县级市,则不考虑区域 + // 濡傛灉鏄幙绾у競,鍒欎笉鑰冭檻鍖哄煙 if (serverAreaDao.isCountyLevelCity(city)) { for (String districtName : aliasNames) { dataList.addAll(dataHolder.getDistrictData(null, districtName)); @@ -168,7 +168,7 @@ public abstract class AbstractProvider implements Provider { List dataList = new ArrayList(); - // 如果是县级市,则不考虑区域 + // 濡傛灉鏄幙绾у競,鍒欎笉鑰冭檻鍖哄煙 if (serverAreaDao.isCountyLevelCity(city)) { for (String districtName : aliasNames) { dataList.addAll(dataHolder.getDistrictHouseData(city, null, districtName, startDate, null)); @@ -231,7 +231,7 @@ public abstract class AbstractProvider implements Provider { List dataList = new ArrayList(); - // 如果是县级市,则不考虑区域 + // 濡傛灉鏄幙绾у競,鍒欎笉鑰冭檻鍖哄煙 if (serverAreaDao.isCountyLevelCity(city)) { for (String districtName : aliasNames) { dataList.addAll(dataHolder.getDistrictHouseData(districtKey.getCity(), null, districtName, startDate, endDate)); @@ -299,7 +299,7 @@ public abstract class AbstractProvider implements Provider { List dataList = new ArrayList(); - // 如果是县级市,则不考虑区域 + // 濡傛灉鏄幙绾у競,鍒欎笉鑰冭檻鍖哄煙 if (serverAreaDao.isCountyLevelCity(city)) { //for (String districtName : aliasNames) { dataList.addAll(dataHolder.getDistrictHouseData2(districtKey.getCity(), null, new ArrayList(aliasNames), startDate, endDate)); diff --git a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/provider/RentHouseDataProvider.java b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/provider/RentHouseDataProvider.java index 0193d1920..dd67e0b59 100644 --- a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/provider/RentHouseDataProvider.java +++ b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/provider/RentHouseDataProvider.java @@ -126,9 +126,9 @@ public class RentHouseDataProvider extends AbstractProvider{ if(district.getRegion().equals(dist.getRegion()) && district.getName().equals(dist.getName())){ continue; } - String estateType = "小区"; - if(district.getEstateType2()!=null && district.getEstateType2().equals("别墅")){ - estateType = "别墅"; + String estateType = "灏忓尯"; + if(district.getEstateType2()!=null && district.getEstateType2().equals("鍒")){ + estateType = "鍒"; } if(!districtKey.getEstateTypeEnum().getEstateType().equals(estateType)){ continue; @@ -264,9 +264,9 @@ public class RentHouseDataProvider extends AbstractProvider{ if(district.getRegion().equals(dist.getRegion()) && district.getName().equals(dist.getName())){ continue; } - String estateType = "小区"; - if(district.getEstateType2()!=null && district.getEstateType2().equals("别墅")){ - estateType = "别墅"; + String estateType = "灏忓尯"; + if(district.getEstateType2()!=null && district.getEstateType2().equals("鍒")){ + estateType = "鍒"; } if(!districtKey.getEstateTypeEnum().getEstateType().equals(estateType)){ continue; @@ -333,7 +333,7 @@ public class RentHouseDataProvider extends AbstractProvider{ Date endDate, Integer radio, Integer minRadio) { List districts = fetchArroundDistrictsByDistance(districtKey, radio, minRadio); - System.out.println("周边小区数:"+districts.size() +" 范围:"+radio); + System.out.println("鍛ㄨ竟灏忓尯鏁�:"+districts.size() +" 鑼冨洿:"+radio); if(districts.size() > 0){ List allDatas = new ArrayList(); for(District district : districts){ @@ -488,7 +488,7 @@ public class RentHouseDataProvider extends AbstractProvider{ public List fetchAroundHouseData(DistrictKey districtKey, Date startDate, Date endDate, Integer radio, Integer minRadio) { List districts = fetchArroundDistrictsByDistance(districtKey, radio, minRadio); - System.out.println("周边小区数:"+districts.size() +" 范围:"+radio); + System.out.println("鍛ㄨ竟灏忓尯鏁�:"+districts.size() +" 鑼冨洿:"+radio); if(districts.size() > 0){ List allDatas = new ArrayList(); for(District district : districts){ diff --git a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/provider/SellHouseDataProvider.java b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/provider/SellHouseDataProvider.java index ef963f3ef..26ca3b850 100644 --- a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/provider/SellHouseDataProvider.java +++ b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/provider/SellHouseDataProvider.java @@ -45,13 +45,13 @@ public class SellHouseDataProvider extends AbstractProvider { List ret = new ArrayList(); if (districtMap != null) { - // 每个小区最大的样本数量 + // 姣忎釜灏忓尯鏈�澶х殑鏍锋湰鏁伴噺 for (DistrictKey key : districtMap.keySet()) { District district = districtMap.get(key); List datas = getData(new DistrictKey(district.getCity(), district.getRegion(), district.getName(), CategoryEnum.DISTRICT, EstateTypeEnum.DISTRICT)); for (int i = 0; i < datas.size() && i <= DISTRICT_SAMPLE_SIZE; i++) { - // 别墅不参与城市均价计算 + // 鍒涓嶅弬涓庡煄甯傚潎浠疯绠� if (!datas.get(i).isVilla()) { ret.add(datas.get(i)); } diff --git a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/provider/SellShopOfficeDataProvider.java b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/provider/SellShopOfficeDataProvider.java index 6fbc0665b..e11a2a792 100644 --- a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/provider/SellShopOfficeDataProvider.java +++ b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/provider/SellShopOfficeDataProvider.java @@ -84,13 +84,13 @@ public class SellShopOfficeDataProvider extends AbstractProvider { if(district.getRegion().equals(districtKey.getRegion()) && district.getName().equals(districtKey.getName())){ continue; } - if(districtKey.getCategoryEnum().getDisplay().equals("商铺")){ + if(districtKey.getCategoryEnum().getDisplay().equals("鍟嗛摵")){ ShopStat lastStat = shopStatDao.findNearShopStat(district.getCity(), district.getRegion(), district.getName(), calcDate); if(lastStat!=null && lastStat.getAvgPrice()>0){ points.add(lastStat.getAvgPrice()); } - }else if(districtKey.getCategoryEnum().getDisplay().equals("写字楼")){ + }else if(districtKey.getCategoryEnum().getDisplay().equals("鍐欏瓧妤�")){ OfficeStat lastStat = officeStatDao.findNearOfficeStat(district.getCity(), district.getRegion(), district.getName(), calcDate); if(lastStat!=null && lastStat.getAvgPrice()>0){ diff --git a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/tree/Data.java b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/tree/Data.java index a6a20f8f4..44c7f616e 100644 --- a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/tree/Data.java +++ b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/tree/Data.java @@ -1,11 +1,11 @@ package com.fangjia.coredata.price.tree; public class Data implements Cloneable { - private boolean villa; // 是否是别墅 - private int val; // 价格 - private int date; // 日期 - private boolean isClone; // 是否是复制的 - private int room;//室 + private boolean villa; // 鏄惁鏄埆澧� + private int val; // 浠锋牸 + private int date; // 鏃ユ湡 + private boolean isClone; // 鏄惁鏄鍒剁殑 + private int room;//瀹� private double area; public Data(int val, int date, boolean villa, int room, double area) { diff --git a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/tree/DataHolder.java b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/tree/DataHolder.java index ce2e5391d..83ef4504e 100644 --- a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/tree/DataHolder.java +++ b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/tree/DataHolder.java @@ -33,7 +33,7 @@ import com.mongodb.BasicDBObject; import com.mongodb.DBObject; /** - * 数据树 + * 鏁版嵁鏍� * * @author xiaoyu * @@ -143,7 +143,7 @@ public class DataHolder { } /** - * 获取小区数据 结果按时间倒序排列 + * 鑾峰彇灏忓尯鏁版嵁 缁撴灉鎸夋椂闂村�掑簭鎺掑垪 * * @param regionName * @param districtName @@ -246,7 +246,7 @@ public class DataHolder { if(!keys.contains(key)){ keys.add(key); if(StringUtils.isNotBlank(house.getFitment())){ - String[] typeWords = {"毛坯", "清水", "无装修", "独栋毛坯"}; + String[] typeWords = {"姣涘澂", "娓呮按", "鏃犺淇�", "鐙爧姣涘澂"}; if(StringUtils.indexOfAny(house.getFitment(), typeWords)>-1){ house.setTotalPrice((int)(house.getTotalPrice()/0.6)); } @@ -301,7 +301,7 @@ public class DataHolder { if(!keys.contains(key)){ keys.add(key); if(StringUtils.isNotBlank(house.getFitment())){ - String[] typeWords = {"毛坯", "清水", "无装修", "独栋毛坯"}; + String[] typeWords = {"姣涘澂", "娓呮按", "鏃犺淇�", "鐙爧姣涘澂"}; if(StringUtils.indexOfAny(house.getFitment(), typeWords)>-1){ house.setTotalPrice((int)(house.getTotalPrice()/0.6)); } @@ -576,7 +576,7 @@ public List getDistrictHouseData(String regionName, String districtName, D } /** - * 需要删除的时间 + * 闇�瑕佸垹闄ょ殑鏃堕棿 * * @param orgStart * @param orgEnd @@ -611,7 +611,7 @@ public List getDistrictHouseData(String regionName, String districtName, D } /** - * 需要补充的时间 + * 闇�瑕佽ˉ鍏呯殑鏃堕棿 * * @param orgStart * @param orgEnd diff --git a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/util/AsyncThread.java b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/util/AsyncThread.java index 06c10ad1e..5e6765510 100644 --- a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/util/AsyncThread.java +++ b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/util/AsyncThread.java @@ -1,7 +1,7 @@ package com.fangjia.coredata.price.util; /** - * 异步运行线程 + * 寮傛杩愯绾跨▼ * * @author xiaoyu * diff --git a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/util/DataCluster.java b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/util/DataCluster.java index 161ab2e7a..b1fe99d08 100644 --- a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/util/DataCluster.java +++ b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/util/DataCluster.java @@ -10,15 +10,15 @@ import com.fangjia.coredata.price.core.Cluster; public class DataCluster { - // 聚类桶宽百分比 + // 鑱氱被妗跺鐧惧垎姣� public static final int CLUSTER_PERCENT = 5; - // 聚类中最小的成员数 + // 鑱氱被涓渶灏忕殑鎴愬憳鏁� public static final int MIN_SUPPORT_COUNT = 3; - // 聚类中最大值与最小值的比差 + // 鑱氱被涓渶澶у�间笌鏈�灏忓�肩殑姣斿樊 public static final double HIGH_DIFFERENCE_PERCENT = 1.2; - // 小区聚类的最小聚类簇个数 + // 灏忓尯鑱氱被鐨勬渶灏忚仛绫荤皣涓暟 public static final int MIN_CLUSTER_COUNT = 1; - // 区域聚类的聚类簇个数 + // 鍖哄煙鑱氱被鐨勮仛绫荤皣涓暟 public static final int REGION_CLUSTER_SIZE = 3; public static final double MIN_EXTREME_VALUE_PERCENT = 0.2d; @@ -30,7 +30,7 @@ public class DataCluster { } /** - * 开始执行聚类算法 + * 寮�濮嬫墽琛岃仛绫荤畻娉� * * @param values * @return List @@ -38,7 +38,7 @@ public class DataCluster { public static Cluster cluster(List values) { if (values != null && values.size() > MIN_SUPPORT_COUNT) { Collections.sort(values); - // 去除20%最小值,3%最大值,使均值整体朝大的一端偏移 + // 鍘婚櫎20%鏈�灏忓�硷紝3%鏈�澶у�硷紝浣垮潎鍊兼暣浣撴湞澶х殑涓�绔亸绉� int l = (int) Math.ceil(values.size() * MIN_EXTREME_VALUE_PERCENT); int h = (int) Math.ceil(values.size() * (1 - MAX_EXTREME_VALUE_PERCENT)); if (values.size() / 10 > 1) { @@ -88,16 +88,16 @@ public class DataCluster { /** * * @param allAvgs - * 数值列表 + * 鏁板�煎垪琛� * @param minCluster - * 最少聚出的类个数 + * 鏈�灏戣仛鍑虹殑绫讳釜鏁� * @param percent - * 聚类间距 + * 鑱氱被闂磋窛 * @param minSize - * 聚类中最小的成员数 + * 鑱氱被涓渶灏忕殑鎴愬憳鏁� * @param heightDifferencePercent - * 如果聚类中最大值与最小值的比差,只在聚出一个类,并且最小聚类大于一的情况下使用 - * @return 聚类列表 + * 濡傛灉鑱氱被涓渶澶у�间笌鏈�灏忓�肩殑姣斿樊,鍙湪鑱氬嚭涓�涓被,骞朵笖鏈�灏忚仛绫诲ぇ浜庝竴鐨勬儏鍐典笅浣跨敤 + * @return 鑱氱被鍒楄〃 */ private static double[][] cluster(List allAvgs, int minCluster, int percent, int minSize, double heightDifferencePercent) { @@ -121,13 +121,13 @@ public class DataCluster { allClusterSep += allAvgs.get(i); } - int clusterSep = NumberUtils.round(allClusterSep * percent * 1.0d / (100 * (allAvgs.size() - startfrom)));// 平均数量大小,总值 - compStep = NumberUtils.round(clusterSep * 0.5);// 增量 + int clusterSep = NumberUtils.round(allClusterSep * percent * 1.0d / (100 * (allAvgs.size() - startfrom)));// 骞冲潎鏁伴噺澶у皬锛屾�诲�� + compStep = NumberUtils.round(clusterSep * 0.5);// 澧為噺 if(compStep == 0){ compStep = 1; } - compAvg = allAvgs.get(startfrom) + compStep;// 初始均价大小 - startfrom_temp = startfrom;// 起始点 + compAvg = allAvgs.get(startfrom) + compStep;// 鍒濆鍧囦环澶у皬 + startfrom_temp = startfrom;// 璧峰鐐� ArrayList clusters = new ArrayList(); ArrayList historyClusters = new ArrayList(); @@ -152,14 +152,14 @@ public class DataCluster { } if (end - start + 1 >= minSize) { historyClusters.add(new int[] { start, end }); - if (clusters.isEmpty()) {// 新加组 + if (clusters.isEmpty()) {// 鏂板姞缁� clusters.add(new int[] { start, end }); } else { int[] before = clusters.get(clusters.size() - 1); - if (start <= before[1]) {// 合并 + if (start <= before[1]) {// 鍚堝苟 before[1] = end; - } else {// 新加组 + } else {// 鏂板姞缁� clusters.add(new int[] { start, end }); } } @@ -224,7 +224,7 @@ public class DataCluster { } /** - * 对大簇进行划分 + * 瀵瑰ぇ绨囪繘琛屽垝鍒� * * @param cluster * @param minCluster @@ -244,7 +244,7 @@ public class DataCluster { int clusterLength = cluster.length; - int compStep = NumberUtils.round(clusterSep * 0.5);// 增量 + int compStep = NumberUtils.round(clusterSep * 0.5);// 澧為噺 int compAvg = allAvgs.get(cluster[0]) + compStep; while (compAvg <= allAvgs.get(cluster[clusterLength - 1])) { @@ -290,7 +290,7 @@ public class DataCluster { int bs = b[1] - b[0]; int cs = c[1] - c[0]; - if (bs > as && bs > cs) {// 波峰 + if (bs > as && bs > cs) {// 娉㈠嘲 int avg = 0; for (int k = b[0]; k <= b[1]; k++) { avg += allAvgs.get(k); @@ -300,17 +300,17 @@ public class DataCluster { topWaveMarkCount++; flag = 0; - } else if (bs < as && bs < cs) {// 波谷 + } else if (bs < as && bs < cs) {// 娉㈣胺 waveMark.add(new int[] { i * -1, 0 }); bottomWaveMarkCount++; flag = 0; - } else if (bs > as && bs == cs) {// 波峰开始 + } else if (bs > as && bs == cs) {// 娉㈠嘲寮�濮� flag = 1; - } else if (bs < as && bs == cs) {// 波谷开始 + } else if (bs < as && bs == cs) {// 娉㈣胺寮�濮� flag = -1; - } else if (flag == 1 && (bs == as && bs > cs)) {// 波峰 - // 下降通道 + } else if (flag == 1 && (bs == as && bs > cs)) {// 娉㈠嘲 + // 涓嬮檷閫氶亾 int avg = 0; for (int k = b[0]; k <= b[1]; k++) { avg += allAvgs.get(k); @@ -320,13 +320,13 @@ public class DataCluster { topWaveMarkCount++; flag = 0; - } else if (flag == -1 && (bs == as && bs < cs)) {// 波谷 - // 上升通道 + } else if (flag == -1 && (bs == as && bs < cs)) {// 娉㈣胺 + // 涓婂崌閫氶亾 waveMark.add(new int[] { i * -1, 0 }); bottomWaveMarkCount++; flag = 0; - } else if (bs == as && bs == cs) {// 平滑区 + } else if (bs == as && bs == cs) {// 骞虫粦鍖� } else { flag = 0; @@ -336,11 +336,11 @@ public class DataCluster { List bottomMark = new ArrayList(); - // 取出(minCluster-1)个波谷,断裂 + // 鍙栧嚭(minCluster-1)涓尝璋�,鏂 if (bottomWaveMarkCount > 0) { clusters.clear(); - if (topWaveMarkCount > minCluster) {// 按波峰之间的距离选取聚类 + if (topWaveMarkCount > minCluster) {// 鎸夋尝宄颁箣闂寸殑璺濈閫夊彇鑱氱被 int startIndex = 2; @@ -352,12 +352,12 @@ public class DataCluster { int count = 0; for (int i = startIndex; i < waveMark.size(); i += 2) { - x[count][0] = waveMark.get(i)[1] - waveMark.get(i - 2)[1]; // 均价间距 - x[count][1] = i - 1; // 记录波谷位置 + x[count][0] = waveMark.get(i)[1] - waveMark.get(i - 2)[1]; // 鍧囦环闂磋窛 + x[count][1] = i - 1; // 璁板綍娉㈣胺浣嶇疆 count++; } - // 按间距排序 + // 鎸夐棿璺濇帓搴� Arrays.sort(x, new Comparator() { public int compare(int[] o1, int[] o2) { @@ -384,14 +384,14 @@ public class DataCluster { Collections.sort(bottomMark); - // 合并 + // 鍚堝苟 int lastIndex = 0; for (int i = 0; i <= bottomMark.size(); i++) { int start = Integer.MAX_VALUE; int end = 0; - // 求峰值的平均值,往两边扩散 + // 姹傚嘲鍊肩殑骞冲潎鍊�,寰�涓よ竟鎵╂暎 int bottomIndex = 0; if (i == bottomMark.size()) bottomIndex = waveMark.size(); diff --git a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/util/DataCluster2.java b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/util/DataCluster2.java index 733969f3b..94724bb3f 100644 --- a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/util/DataCluster2.java +++ b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/util/DataCluster2.java @@ -10,15 +10,15 @@ import com.fangjia.coredata.price.core.Cluster; public class DataCluster2 { - // 聚类桶宽百分比 + // 鑱氱被妗跺鐧惧垎姣� public static final int CLUSTER_PERCENT = 5; - // 聚类中最小的成员数 + // 鑱氱被涓渶灏忕殑鎴愬憳鏁� public static final int MIN_SUPPORT_COUNT = 3; - // 聚类中最大值与最小值的比差 + // 鑱氱被涓渶澶у�间笌鏈�灏忓�肩殑姣斿樊 public static final double HIGH_DIFFERENCE_PERCENT = 1.2; - // 小区聚类的最小聚类簇个数 + // 灏忓尯鑱氱被鐨勬渶灏忚仛绫荤皣涓暟 public static final int MIN_CLUSTER_COUNT = 1; - // 区域聚类的聚类簇个数 + // 鍖哄煙鑱氱被鐨勮仛绫荤皣涓暟 public static final int REGION_CLUSTER_SIZE = 3; public static final double MIN_EXTREME_VALUE_PERCENT = 0.2d; @@ -30,7 +30,7 @@ public class DataCluster2 { } /** - * 开始执行聚类算法 + * 寮�濮嬫墽琛岃仛绫荤畻娉� * * @param values * @return List @@ -38,7 +38,7 @@ public class DataCluster2 { public static Cluster cluster(List values) { if (values != null && values.size() > MIN_SUPPORT_COUNT) { Collections.sort(values); - // 去除20%最小值,3%最大值,使均值整体朝大的一端偏移 + // 鍘婚櫎20%鏈�灏忓�硷紝3%鏈�澶у�硷紝浣垮潎鍊兼暣浣撴湞澶х殑涓�绔亸绉� int l = (int) Math.ceil(values.size() * MIN_EXTREME_VALUE_PERCENT); int h = (int) Math.ceil(values.size() * (1 - MAX_EXTREME_VALUE_PERCENT)); if (values.size() / 10 > 1) { @@ -88,16 +88,16 @@ public class DataCluster2 { /** * * @param allAvgs - * 数值列表 + * 鏁板�煎垪琛� * @param minCluster - * 最少聚出的类个数 + * 鏈�灏戣仛鍑虹殑绫讳釜鏁� * @param percent - * 聚类间距 + * 鑱氱被闂磋窛 * @param minSize - * 聚类中最小的成员数 + * 鑱氱被涓渶灏忕殑鎴愬憳鏁� * @param heightDifferencePercent - * 如果聚类中最大值与最小值的比差,只在聚出一个类,并且最小聚类大于一的情况下使用 - * @return 聚类列表 + * 濡傛灉鑱氱被涓渶澶у�间笌鏈�灏忓�肩殑姣斿樊,鍙湪鑱氬嚭涓�涓被,骞朵笖鏈�灏忚仛绫诲ぇ浜庝竴鐨勬儏鍐典笅浣跨敤 + * @return 鑱氱被鍒楄〃 */ private static double[][] cluster(List allAvgs, int minCluster, int percent, int minSize, double heightDifferencePercent) { @@ -121,13 +121,13 @@ public class DataCluster2 { allClusterSep += allAvgs.get(i); } - int clusterSep = NumberUtils.round(allClusterSep * percent * 1.0d / (100 * (allAvgs.size() - startfrom)));// 平均数量大小,总值 - compStep = NumberUtils.round(clusterSep * 0.5);// 增量 + int clusterSep = NumberUtils.round(allClusterSep * percent * 1.0d / (100 * (allAvgs.size() - startfrom)));// 骞冲潎鏁伴噺澶у皬锛屾�诲�� + compStep = NumberUtils.round(clusterSep * 0.5);// 澧為噺 if(compStep == 0){ compStep = 1; } - compAvg = allAvgs.get(startfrom) + compStep;// 初始均价大小 - startfrom_temp = startfrom;// 起始点 + compAvg = allAvgs.get(startfrom) + compStep;// 鍒濆鍧囦环澶у皬 + startfrom_temp = startfrom;// 璧峰鐐� ArrayList clusters = new ArrayList(); ArrayList historyClusters = new ArrayList(); @@ -152,14 +152,14 @@ public class DataCluster2 { } if (end - start + 1 >= minSize) { historyClusters.add(new int[] { start, end }); - if (clusters.isEmpty()) {// 新加组 + if (clusters.isEmpty()) {// 鏂板姞缁� clusters.add(new int[] { start, end }); } else { int[] before = clusters.get(clusters.size() - 1); - if (start <= before[1]) {// 合并 + if (start <= before[1]) {// 鍚堝苟 before[1] = end; - } else {// 新加组 + } else {// 鏂板姞缁� clusters.add(new int[] { start, end }); } } @@ -224,7 +224,7 @@ public class DataCluster2 { } /** - * 对大簇进行划分 + * 瀵瑰ぇ绨囪繘琛屽垝鍒� * * @param cluster * @param minCluster @@ -244,7 +244,7 @@ public class DataCluster2 { int clusterLength = cluster.length; - int compStep = NumberUtils.round(clusterSep * 0.5);// 增量 + int compStep = NumberUtils.round(clusterSep * 0.5);// 澧為噺 double compAvg = allAvgs.get(cluster[0]) + compStep; while (compAvg <= allAvgs.get(cluster[clusterLength - 1])) { @@ -290,7 +290,7 @@ public class DataCluster2 { int bs = b[1] - b[0]; int cs = c[1] - c[0]; - if (bs > as && bs > cs) {// 波峰 + if (bs > as && bs > cs) {// 娉㈠嘲 int avg = 0; for (int k = b[0]; k <= b[1]; k++) { avg += allAvgs.get(k); @@ -300,17 +300,17 @@ public class DataCluster2 { topWaveMarkCount++; flag = 0; - } else if (bs < as && bs < cs) {// 波谷 + } else if (bs < as && bs < cs) {// 娉㈣胺 waveMark.add(new int[] { i * -1, 0 }); bottomWaveMarkCount++; flag = 0; - } else if (bs > as && bs == cs) {// 波峰开始 + } else if (bs > as && bs == cs) {// 娉㈠嘲寮�濮� flag = 1; - } else if (bs < as && bs == cs) {// 波谷开始 + } else if (bs < as && bs == cs) {// 娉㈣胺寮�濮� flag = -1; - } else if (flag == 1 && (bs == as && bs > cs)) {// 波峰 - // 下降通道 + } else if (flag == 1 && (bs == as && bs > cs)) {// 娉㈠嘲 + // 涓嬮檷閫氶亾 int avg = 0; for (int k = b[0]; k <= b[1]; k++) { avg += allAvgs.get(k); @@ -320,13 +320,13 @@ public class DataCluster2 { topWaveMarkCount++; flag = 0; - } else if (flag == -1 && (bs == as && bs < cs)) {// 波谷 - // 上升通道 + } else if (flag == -1 && (bs == as && bs < cs)) {// 娉㈣胺 + // 涓婂崌閫氶亾 waveMark.add(new int[] { i * -1, 0 }); bottomWaveMarkCount++; flag = 0; - } else if (bs == as && bs == cs) {// 平滑区 + } else if (bs == as && bs == cs) {// 骞虫粦鍖� } else { flag = 0; @@ -336,11 +336,11 @@ public class DataCluster2 { List bottomMark = new ArrayList(); - // 取出(minCluster-1)个波谷,断裂 + // 鍙栧嚭(minCluster-1)涓尝璋�,鏂 if (bottomWaveMarkCount > 0) { clusters.clear(); - if (topWaveMarkCount > minCluster) {// 按波峰之间的距离选取聚类 + if (topWaveMarkCount > minCluster) {// 鎸夋尝宄颁箣闂寸殑璺濈閫夊彇鑱氱被 int startIndex = 2; @@ -352,12 +352,12 @@ public class DataCluster2 { int count = 0; for (int i = startIndex; i < waveMark.size(); i += 2) { - x[count][0] = waveMark.get(i)[1] - waveMark.get(i - 2)[1]; // 均价间距 - x[count][1] = i - 1; // 记录波谷位置 + x[count][0] = waveMark.get(i)[1] - waveMark.get(i - 2)[1]; // 鍧囦环闂磋窛 + x[count][1] = i - 1; // 璁板綍娉㈣胺浣嶇疆 count++; } - // 按间距排序 + // 鎸夐棿璺濇帓搴� Arrays.sort(x, new Comparator() { public int compare(int[] o1, int[] o2) { @@ -384,14 +384,14 @@ public class DataCluster2 { Collections.sort(bottomMark); - // 合并 + // 鍚堝苟 int lastIndex = 0; for (int i = 0; i <= bottomMark.size(); i++) { int start = Integer.MAX_VALUE; int end = 0; - // 求峰值的平均值,往两边扩散 + // 姹傚嘲鍊肩殑骞冲潎鍊�,寰�涓よ竟鎵╂暎 int bottomIndex = 0; if (i == bottomMark.size()) bottomIndex = waveMark.size(); diff --git a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/util/ServiceUtils.java b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/util/ServiceUtils.java index 216b1fe23..749f9547e 100644 --- a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/util/ServiceUtils.java +++ b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/util/ServiceUtils.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.Map; public class ServiceUtils { - //获取完整的房型 + //鑾峰彇瀹屾暣鐨勬埧鍨� public static List getAllRooms(List rooms){ Collections.sort(rooms); int start = rooms.get(0); diff --git a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/ztest/DataCluster3.java b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/ztest/DataCluster3.java index a5434bcdb..77ceb8100 100644 --- a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/ztest/DataCluster3.java +++ b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/ztest/DataCluster3.java @@ -63,105 +63,105 @@ public class DataCluster3 { } /* - * 聚类函数主体。 针对一维 double 数组。指定聚类数目 k。 将数据聚成 k 类。 + * 鑱氱被鍑芥暟涓讳綋銆� 閽堝涓�缁� double 鏁扮粍銆傛寚瀹氳仛绫绘暟鐩� k銆� 灏嗘暟鎹仛鎴� k 绫汇�� */ private static double[][] cluster(double[] p, int k) { - // 存放聚类旧的聚类中心 + // 瀛樻斁鑱氱被鏃х殑鑱氱被涓績 double[] c = new double[k]; - // 存放新计算的聚类中心 + // 瀛樻斁鏂拌绠楃殑鑱氱被涓績 double[] nc = new double[k]; - // 存放放回结果 + // 瀛樻斁鏀惧洖缁撴灉 double[][] ret; - // 初始化聚类中心 - // 经典方法是随机选取 k 个 - // 本例中采用前 k 个作为聚类中心 - // 聚类中心的选取不影响最终结果 + // 鍒濆鍖栬仛绫讳腑蹇� + // 缁忓吀鏂规硶鏄殢鏈洪�夊彇 k 涓� + // 鏈緥涓噰鐢ㄥ墠 k 涓綔涓鸿仛绫讳腑蹇� + // 鑱氱被涓績鐨勯�夊彇涓嶅奖鍝嶆渶缁堢粨鏋� for (int i = 0; i < k; i++) c[i] = p[i]; - // 循环聚类,更新聚类中心 - // 到聚类中心不变为止 + // 寰幆鑱氱被锛屾洿鏂拌仛绫讳腑蹇� + // 鍒拌仛绫讳腑蹇冧笉鍙樹负姝� while (true) { - // 根据聚类中心将元素分类 + // 鏍规嵁鑱氱被涓績灏嗗厓绱犲垎绫� ret = group(p, c); - // 计算分类后的聚类中心 + // 璁$畻鍒嗙被鍚庣殑鑱氱被涓績 for (int i = 0; i < ret.length; i++) { if (ret[i].length > 0) { nc[i] = center(ret[i]); } } - // 如果聚类中心不同 + // 濡傛灉鑱氱被涓績涓嶅悓 if (!equal(nc, c)) { - // 为下一次聚类准备 + // 涓轰笅涓�娆¤仛绫诲噯澶� c = nc; nc = new double[k]; } else - // 聚类结束 + // 鑱氱被缁撴潫 break; } - // 返回聚类结果 + // 杩斿洖鑱氱被缁撴灉 return ret; } /* - * 聚类中心函数 简单的一维聚类返回其算数平均值 可扩展 + * 鑱氱被涓績鍑芥暟 绠�鍗曠殑涓�缁磋仛绫昏繑鍥炲叾绠楁暟骞冲潎鍊� 鍙墿灞� */ private static double center(double[] p) { return sum(p) / p.length; } /* - * 给定 double 型数组 p 和聚类中心 c。 根据 c 将 p 中元素聚类。返回二维数组。 存放各组元素。 + * 缁欏畾 double 鍨嬫暟缁� p 鍜岃仛绫讳腑蹇� c銆� 鏍规嵁 c 灏� p 涓厓绱犺仛绫汇�傝繑鍥炰簩缁存暟缁勩�� 瀛樻斁鍚勭粍鍏冪礌銆� */ private static double[][] group(double[] p, double[] c) { - // 中间变量,用来分组标记 + // 涓棿鍙橀噺锛岀敤鏉ュ垎缁勬爣璁� int[] gi = new int[p.length]; - // 考察每一个元素 pi 同聚类中心 cj 的距离 - // pi 与 cj 的距离最小则归为 j 类 + // 鑰冨療姣忎竴涓厓绱� pi 鍚岃仛绫讳腑蹇� cj 鐨勮窛绂� + // pi 涓� cj 鐨勮窛绂绘渶灏忓垯褰掍负 j 绫� for (int i = 0; i < p.length; i++) { - // 存放距离 + // 瀛樻斁璺濈 double[] d = new double[c.length]; - // 计算到每个聚类中心的距离 + // 璁$畻鍒版瘡涓仛绫讳腑蹇冪殑璺濈 for (int j = 0; j < c.length; j++) { d[j] = distance(p[i], c[j]); } - // 找出最小距离,返回最小值的下标 + // 鎵惧嚭鏈�灏忚窛绂伙紝杩斿洖鏈�灏忓�肩殑涓嬫爣 int ci = min(d); - // 标记属于哪一组 + // 鏍囪灞炰簬鍝竴缁� gi[i] = ci; } - // 存放分组结果 + // 瀛樻斁鍒嗙粍缁撴灉 double[][] g = new double[c.length][]; - // 遍历每个聚类中心,分组 + // 閬嶅巻姣忎釜鑱氱被涓績锛屽垎缁� for (int i = 0; i < c.length; i++) { - // 中间变量,记录聚类后每一组的大小 + // 涓棿鍙橀噺锛岃褰曡仛绫诲悗姣忎竴缁勭殑澶у皬 int s = 0; - // 计算每一组的长度 + // 璁$畻姣忎竴缁勭殑闀垮害 for (int j = 0; j < gi.length; j++) if (gi[j] == i) s++; - // 存储每一组的成员 + // 瀛樺偍姣忎竴缁勭殑鎴愬憳 g[i] = new double[s]; s = 0; - // 根据分组标记将各元素归位 + // 鏍规嵁鍒嗙粍鏍囪灏嗗悇鍏冪礌褰掍綅 for (int j = 0; j < gi.length; j++) if (gi[j] == i) { g[i][s] = p[j]; s++; } } - // 返回分组结果 + // 杩斿洖鍒嗙粍缁撴灉 return g; } /* - * 计算两个点之间的距离, 这里采用最简单得一维欧氏距离, 可扩展。 + * 璁$畻涓や釜鐐逛箣闂寸殑璺濈锛� 杩欓噷閲囩敤鏈�绠�鍗曞緱涓�缁存姘忚窛绂伙紝 鍙墿灞曘�� */ private static double distance(double x, double y) { return Math.abs(x - y); } /* - * 返回给定 double 数组各元素之和。 + * 杩斿洖缁欏畾 double 鏁扮粍鍚勫厓绱犱箣鍜屻�� */ private static double sum(double[] p) { double sum = 0.0; @@ -171,7 +171,7 @@ public class DataCluster3 { } /* - * 给定 double 类型数组,返回最小值得下标。 + * 缁欏畾 double 绫诲瀷鏁扮粍锛岃繑鍥炴渶灏忓�煎緱涓嬫爣銆� */ private static int min(double[] p) { int i = 0; @@ -186,7 +186,7 @@ public class DataCluster3 { } /* - * 判断两个 double 数组是否相等。 长度一样且对应位置值相同返回真。 + * 鍒ゆ柇涓や釜 double 鏁扮粍鏄惁鐩哥瓑銆� 闀垮害涓�鏍蜂笖瀵瑰簲浣嶇疆鍊肩浉鍚岃繑鍥炵湡銆� */ private static boolean equal(double[] a, double[] b) { if (a.length != b.length) diff --git a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/ztest/DistrictCommandMessageSender.java b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/ztest/DistrictCommandMessageSender.java index a99baca32..2bd4f19fa 100644 --- a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/ztest/DistrictCommandMessageSender.java +++ b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/ztest/DistrictCommandMessageSender.java @@ -8,7 +8,7 @@ public class DistrictCommandMessageSender { // private static CommandMessageDao commandMessageDao = CommandMessageDao.getInstance(); // // public static void main(String[] args) { -// calculatorDistrictWeeklyAveragePrice("上海", DateUtil.getThisSunday(new Date()), OperateEnum.CALC); +// calculatorDistrictWeeklyAveragePrice("涓婃捣", DateUtil.getThisSunday(new Date()), OperateEnum.CALC); // calculatorCityWeeklyAverage(DateUtil.getThisSunday(new Date()), OperateEnum.CALC); // } // diff --git a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/ztest/LineCoefficient.java b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/ztest/LineCoefficient.java index faff73198..e09e8a1ca 100644 --- a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/ztest/LineCoefficient.java +++ b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/ztest/LineCoefficient.java @@ -1,7 +1,7 @@ package com.fangjia.coredata.price.ztest; /** - * 最小二乘法 线性回归 + * 鏈�灏忎簩涔樻硶 绾挎�у洖褰� * * @author xiaoyu * @@ -15,7 +15,7 @@ public class LineCoefficient { } /** - * 预测 + * 棰勬祴 * * @param x * @param y @@ -29,7 +29,7 @@ public class LineCoefficient { } /** - * 计算 x 的系数 + * 璁$畻 x 鐨勭郴鏁� * * @param x * @param y @@ -41,7 +41,7 @@ public class LineCoefficient { } /** - * 计算常量系数 + * 璁$畻甯搁噺绯绘暟 * * @param x * @param y @@ -54,7 +54,7 @@ public class LineCoefficient { } /** - * 计算常量系数 + * 璁$畻甯搁噺绯绘暟 * * @param x * @param y diff --git a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/ztest/Node.java b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/ztest/Node.java index 49685ceea..c515507d3 100644 --- a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/ztest/Node.java +++ b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/ztest/Node.java @@ -4,15 +4,15 @@ import java.util.ArrayList; import java.util.List; public class Node { - private String nodeName; // 样本点名 - private double[] dimensioin; // 样本点的维度 - private double kDistance; // k-距离 - private List kNeighbor = new ArrayList();// k-领域 - private double distance; // 到给定点的欧几里得距离 - private double reachDensity;// 可达密度 - private double reachDis;// 可达距离 + private String nodeName; // 鏍锋湰鐐瑰悕 + private double[] dimensioin; // 鏍锋湰鐐圭殑缁村害 + private double kDistance; // k-璺濈 + private List kNeighbor = new ArrayList();// k-棰嗗煙 + private double distance; // 鍒扮粰瀹氱偣鐨勬鍑犻噷寰楄窛绂� + private double reachDensity;// 鍙揪瀵嗗害 + private double reachDis;// 鍙揪璺濈 - private double lof;// 局部离群因子 + private double lof;// 灞�閮ㄧ缇ゅ洜瀛� public Node() { diff --git a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/ztest/OutlierNodeDetect.java b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/ztest/OutlierNodeDetect.java index e79a5cec9..adde22cef 100644 --- a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/ztest/OutlierNodeDetect.java +++ b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/price/ztest/OutlierNodeDetect.java @@ -8,11 +8,11 @@ import java.util.List; public class OutlierNodeDetect { private static int MIN_PTS = 5; - // 1.找到给定点与其他点的欧几里得距离 - // 2.对欧几里得距离进行排序,找到前5位的点,并同时记下k距离 - // 3.计算每个点的可达密度 - // 4.计算每个点的局部离群点因子 - // 5.对每个点的局部离群点因子进行排序,输出。 + // 1.鎵惧埌缁欏畾鐐逛笌鍏朵粬鐐圭殑娆у嚑閲屽緱璺濈 + // 2.瀵规鍑犻噷寰楄窛绂昏繘琛屾帓搴忥紝鎵惧埌鍓�5浣嶇殑鐐癸紝骞跺悓鏃惰涓媖璺濈 + // 3.璁$畻姣忎釜鐐圭殑鍙揪瀵嗗害 + // 4.璁$畻姣忎釜鐐圭殑灞�閮ㄧ缇ょ偣鍥犲瓙 + // 5.瀵规瘡涓偣鐨勫眬閮ㄧ缇ょ偣鍥犲瓙杩涜鎺掑簭锛岃緭鍑恒�� public List getOutlierNode(List allNodes) { List kdAndKnList = getKDAndKN(allNodes); @@ -100,7 +100,7 @@ public class OutlierNodeDetect { tempNodeList.add(nodeB); } - // 对tempNodeList进行排序 + // 瀵箃empNodeList杩涜鎺掑簭 Collections.sort(tempNodeList, new DistComparator()); for (int k = 1; k < MIN_PTS; k++) { nodeA.getkNeighbor().add(tempNodeList.get(k)); @@ -156,7 +156,7 @@ public class OutlierNodeDetect { double[] j = { 1, 6 }; double[] k = { 1, 5 }; - double[] l = { 1, 2 };// 孤立点 + double[] l = { 1, 2 };// 瀛ょ珛鐐� double[] m = { 1, 20 }; double[] n = { 1, 19 }; diff --git a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/util/AddressParser.java b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/util/AddressParser.java index 172d492ea..5e564305c 100644 --- a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/util/AddressParser.java +++ b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/util/AddressParser.java @@ -17,51 +17,51 @@ import java.util.regex.Pattern; public class AddressParser { - static Pattern regExp_checkRoad1=Pattern.compile("^[\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[一二三四五六七八九十\\d]+(\u5F04|\u53F7)$"); - static Pattern regExp_checkRoad2=Pattern.compile("^[\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[一二三四五六七八九十\\d]+(\u5F04|\u53F7)[0-9]+\u652F\u5F04$"); - static Pattern regExp_checkRoad3=Pattern.compile("^[\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[一二三四五六七八九十\\d]+(\u5F04|\u53F7)[0-9]+\u53F7?\\-[0-9]+\u53F7$"); - static Pattern regExp_checkRoad4=Pattern.compile("^[\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[一二三四五六七八九十\\d]+(\u5F04|\u53F7)[0-9]+\u652F\u5F04[0-9]+\u53F7?\\-[0-9]+\u53F7$"); - static Pattern regExp_checkRoad5=Pattern.compile("^[\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[一二三四五六七八九十\\d]+$"); - static Pattern regExp_checkRoad6=Pattern.compile("^[\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[一二三四五六七八九十\\d]+(\u5F04|\u53F7)[0-9]+\u53F7$"); - static Pattern regExp_checkRoad7=Pattern.compile("^[\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[一二三四五六七八九十\\d]+(\u5F04|\u53F7)[0-9]+\u652F\u5F04[0-9]+\u53F7$"); - static Pattern regExp_checkRoad8=Pattern.compile("^[\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[一二三四五六七八九十\\d]+(\u5F04|\u53F7)?\\-[0-9]+(\u5F04|\u53F7)$"); + static Pattern regExp_checkRoad1=Pattern.compile("^[\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[涓�浜屼笁鍥涗簲鍏竷鍏節鍗乗\d]+(\u5F04|\u53F7)$"); + static Pattern regExp_checkRoad2=Pattern.compile("^[\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[涓�浜屼笁鍥涗簲鍏竷鍏節鍗乗\d]+(\u5F04|\u53F7)[0-9]+\u652F\u5F04$"); + static Pattern regExp_checkRoad3=Pattern.compile("^[\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[涓�浜屼笁鍥涗簲鍏竷鍏節鍗乗\d]+(\u5F04|\u53F7)[0-9]+\u53F7?\\-[0-9]+\u53F7$"); + static Pattern regExp_checkRoad4=Pattern.compile("^[\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[涓�浜屼笁鍥涗簲鍏竷鍏節鍗乗\d]+(\u5F04|\u53F7)[0-9]+\u652F\u5F04[0-9]+\u53F7?\\-[0-9]+\u53F7$"); + static Pattern regExp_checkRoad5=Pattern.compile("^[\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[涓�浜屼笁鍥涗簲鍏竷鍏節鍗乗\d]+$"); + static Pattern regExp_checkRoad6=Pattern.compile("^[\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[涓�浜屼笁鍥涗簲鍏竷鍏節鍗乗\d]+(\u5F04|\u53F7)[0-9]+\u53F7$"); + static Pattern regExp_checkRoad7=Pattern.compile("^[\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[涓�浜屼笁鍥涗簲鍏竷鍏節鍗乗\d]+(\u5F04|\u53F7)[0-9]+\u652F\u5F04[0-9]+\u53F7$"); + static Pattern regExp_checkRoad8=Pattern.compile("^[\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[涓�浜屼笁鍥涗簲鍏竷鍏節鍗乗\d]+(\u5F04|\u53F7)?\\-[0-9]+(\u5F04|\u53F7)$"); static Pattern invalidAddrStartRegx=Pattern.compile("^[,\\(\\)\\-\\.\\&\\/\"\']"); - static Pattern invalidAddrNotationRegx=Pattern.compile("[^一-龥\\w#\\/\\-\\\\]+"); + static Pattern invalidAddrNotationRegx=Pattern.compile("[^涓�-榫\w#\\/\\-\\\\]+"); static Pattern regExp_splitAddress1=Pattern.compile("\\s+|\u3000|\u3001|\uFF0C|,|/|;"); - static Pattern regExp_splitAddress2=Pattern.compile("^([\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[一二三四五六七八九十\\d]+(\u5F04|\u53F7)?)"); + static Pattern regExp_splitAddress2=Pattern.compile("^([\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[涓�浜屼笁鍥涗簲鍏竷鍏節鍗乗\d]+(\u5F04|\u53F7)?)"); static Pattern regExp_checkRoadNo1=Pattern.compile("^[0-9]+(\u5F04|\u53F7)$"); static Pattern regExp_replaceRoadNo1=Pattern.compile("[0-9]+(\u53F7)"); static Pattern regExp_replaceRoadNo2=Pattern.compile("[0-9]+(\u5F04)"); static Pattern[] address_regExp_arr=new Pattern[]{ - Pattern.compile("^([\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[一二三四五六七八九十\\d]+(\u5F04|\u53F7)?\\-[0-9]+(\u5F04|\u53F7))") - , Pattern.compile("^([\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[一二三四五六七八九十\\d]+(\u5F04|\u53F7)[0-9]+\u652F\u5F04[0-9]+\u53F7)") - , Pattern.compile("^([\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[一二三四五六七八九十\\d]+(\u5F04|\u53F7)[0-9]+\u652F\u5F04[0-9]+\u53F7?\\-[0-9]+\u53F7)") - , Pattern.compile("^([\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[一二三四五六七八九十\\d]+(\u5F04|\u53F7)[0-9]+\u53F7?\\-[0-9]+\u53F7)") - , Pattern.compile("^([\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[一二三四五六七八九十\\d]+(\u5F04|\u53F7)[0-9]+\u652F\u5F04)") - , Pattern.compile("^([\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[一二三四五六七八九十\\d]+(\u5F04|\u53F7)[0-9]+\u53F7)") - , Pattern.compile("^([\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[一二三四五六七八九十\\d]+(\u5F04|\u53F7))") - , Pattern.compile("^([\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[一二三四五六七八九十\\d]+)") + Pattern.compile("^([\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[涓�浜屼笁鍥涗簲鍏竷鍏節鍗乗\d]+(\u5F04|\u53F7)?\\-[0-9]+(\u5F04|\u53F7))") + , Pattern.compile("^([\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[涓�浜屼笁鍥涗簲鍏竷鍏節鍗乗\d]+(\u5F04|\u53F7)[0-9]+\u652F\u5F04[0-9]+\u53F7)") + , Pattern.compile("^([\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[涓�浜屼笁鍥涗簲鍏竷鍏節鍗乗\d]+(\u5F04|\u53F7)[0-9]+\u652F\u5F04[0-9]+\u53F7?\\-[0-9]+\u53F7)") + , Pattern.compile("^([\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[涓�浜屼笁鍥涗簲鍏竷鍏節鍗乗\d]+(\u5F04|\u53F7)[0-9]+\u53F7?\\-[0-9]+\u53F7)") + , Pattern.compile("^([\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[涓�浜屼笁鍥涗簲鍏竷鍏節鍗乗\d]+(\u5F04|\u53F7)[0-9]+\u652F\u5F04)") + , Pattern.compile("^([\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[涓�浜屼笁鍥涗簲鍏竷鍏節鍗乗\d]+(\u5F04|\u53F7)[0-9]+\u53F7)") + , Pattern.compile("^([\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[涓�浜屼笁鍥涗簲鍏竷鍏節鍗乗\d]+(\u5F04|\u53F7))") + , Pattern.compile("^([\u4e00-\u9fa5]{2,15}(\u9053|\u8DEF|\u8857)[涓�浜屼笁鍥涗簲鍏竷鍏節鍗乗\d]+)") }; - static Pattern address_regExp_1=Pattern.compile("^(([\u4e00-\u9fa5]{2,30}(\u5927\u9053|\u8DEF|街|道)([一二三四五六七八九十\\d]+(\u5F04|\u53F7))?)+)([\u4e00-\u9fa5\\.·]{3,15})([\\w]+.*)"); - static Pattern address_regExp_2=Pattern.compile("^([\u4e00-\u9fa5]{2,30}(\u5927\u9053|\u8DEF|街|道)([一二三四五六七八九十\\d]+(\u5F04|\u53F7)))(.*)"); - static Pattern address_regExp_3=Pattern.compile("^([\u4e00-\u9fa5\\.·]{4,30})([第一二三四五六七八九十\\w东南西北甲乙丙]+(房|单元|侧|区|#|栋|幢|座|号|楼).*)"); - static Pattern address_regExp_4=Pattern.compile("^(([\u4e00-\u9fa5]{4,30}([\\d]+米)?)+)([第一二三四五六七八九十\\w东南西北甲乙丙]+(房|单元|侧|区|#|栋|幢|座|号|楼).*)"); - static Pattern address_regExp_5=Pattern.compile("^([\u4e00-\u9fa5\\.·]{4,30})([\\w\\-]+.*)"); + static Pattern address_regExp_1=Pattern.compile("^(([\u4e00-\u9fa5]{2,30}(\u5927\u9053|\u8DEF|琛梶閬�)([涓�浜屼笁鍥涗簲鍏竷鍏節鍗乗\d]+(\u5F04|\u53F7))?)+)([\u4e00-\u9fa5\\.路]{3,15})([\\w]+.*)"); + static Pattern address_regExp_2=Pattern.compile("^([\u4e00-\u9fa5]{2,30}(\u5927\u9053|\u8DEF|琛梶閬�)([涓�浜屼笁鍥涗簲鍏竷鍏節鍗乗\d]+(\u5F04|\u53F7)))(.*)"); + static Pattern address_regExp_3=Pattern.compile("^([\u4e00-\u9fa5\\.路]{4,30})([绗竴浜屼笁鍥涗簲鍏竷鍏節鍗乗\w涓滃崡瑗垮寳鐢蹭箼涓橾+(鎴縷鍗曞厓|渚鍖簗#|鏍媩骞搴鍙穦妤�).*)"); + static Pattern address_regExp_4=Pattern.compile("^(([\u4e00-\u9fa5]{4,30}([\\d]+绫�)?)+)([绗竴浜屼笁鍥涗簲鍏竷鍏節鍗乗\w涓滃崡瑗垮寳鐢蹭箼涓橾+(鎴縷鍗曞厓|渚鍖簗#|鏍媩骞搴鍙穦妤�).*)"); + static Pattern address_regExp_5=Pattern.compile("^([\u4e00-\u9fa5\\.路]{4,30})([\\w\\-]+.*)"); - static String room_houseSuffix="[幢号座楼栋#]+"; - static String room_unitSuffix="[单元梯座]+"; - static String room_numSuffix="[房室号]{0,2}"; + static String room_houseSuffix="[骞㈠彿搴фゼ鏍�#]+"; + static String room_unitSuffix="[鍗曞厓姊骇]+"; + static String room_numSuffix="[鎴垮鍙穄{0,2}"; static Pattern[] room_regExp_arr2=new Pattern[]{ - Pattern.compile(String.format("([\\w]+)%s([\\w]+)%s[\\d]+层([\\w]+)%s$", room_houseSuffix, room_unitSuffix, room_numSuffix)) + Pattern.compile(String.format("([\\w]+)%s([\\w]+)%s[\\d]+灞�([\\w]+)%s$", room_houseSuffix, room_unitSuffix, room_numSuffix)) , Pattern.compile(String.format("([\\w]+)%s([\\w]+)%s([\\w]+)%s$", room_houseSuffix, room_unitSuffix, room_numSuffix)) , Pattern.compile(String.format("([\\w]+)%s([\\w]+)\\-([\\w]+)%s$", room_houseSuffix, room_numSuffix)) - , Pattern.compile(String.format("([\\w]+)%s()[\\d]+层([\\w]+)%s$", room_houseSuffix, room_numSuffix)) + , Pattern.compile(String.format("([\\w]+)%s()[\\d]+灞�([\\w]+)%s$", room_houseSuffix, room_numSuffix)) , Pattern.compile(String.format("([\\w]+)\\-([\\w]+)\\-([\\w]+)%s$", room_numSuffix)) , Pattern.compile(String.format("([\\w]+)\\\\([\\w]+)\\\\([\\w]+)$")) , Pattern.compile(String.format("()([\\w]+)\\/([\\w]+)$")) @@ -78,9 +78,9 @@ public class AddressParser { }; - //替换重复的镇名或路名: 千灯镇千灯镇黄浦路 + //鏇挎崲閲嶅鐨勯晣鍚嶆垨璺悕锛� 鍗冪伅闀囧崈鐏晣榛勬郸璺� static String replaceRepeatAddr(String address){ - Pattern placeRegx=Pattern.compile("([^镇.]{2,5}镇)"); + Pattern placeRegx=Pattern.compile("([^闀�.]{2,5}闀�)"); Matcher matcher=placeRegx.matcher(address); if(matcher.find()){ String place=matcher.group(1); @@ -94,7 +94,7 @@ public class AddressParser { } } - placeRegx=Pattern.compile("([^路.]{2,5}路)"); + placeRegx=Pattern.compile("([^璺�.]{2,5}璺�)"); matcher=placeRegx.matcher(address); if(matcher.find()){ String place=matcher.group(1); @@ -139,7 +139,7 @@ public class AddressParser { if(cityParents!=null){ for(int k=0; k splitMutilAddr(String city, String address){ @@ -358,7 +358,7 @@ public class AddressParser { addresses.add(address); }else{ /** - * 匹配多个地址 + * 鍖归厤澶氫釜鍦板潃 */ addresses=splitMutilAddr(city, address1); if(addresses.size()==0){ @@ -369,11 +369,11 @@ public class AddressParser { } /** - * result[0]: 城市 - * result[1]: 区域 - * result[2]: 地址 - * result[3]: 小区名 - * result[4]: 楼号室号 + * result[0]: 鍩庡競 + * result[1]: 鍖哄煙 + * result[2]: 鍦板潃 + * result[3]: 灏忓尯鍚� + * result[4]: 妤煎彿瀹ゅ彿 * * @param city * @param origAddress @@ -396,19 +396,19 @@ public class AddressParser { String name=null; String restAddr=null; String city = null; - //提取城市 + //鎻愬彇鍩庡競 String[] rt=parseCity(origAddress); origAddress=rt[1]; if(!isEmpty(rt[0])){ city=rt[0]; } - //去除省名城市名区等 + //鍘婚櫎鐪佸悕鍩庡競鍚嶅尯绛� String[] rt2=doReplaceDistrict(city, origAddress, true); if(rt2!=null){ addressResult.region=rt2[0]; origAddress=rt2[1]; }else if(isEmpty(city)){ - //提取区域 + //鎻愬彇鍖哄煙 rt2=parseRegion(origAddress); if(rt2!=null){ city=rt2[0]; @@ -417,7 +417,7 @@ public class AddressParser { } if(!isEmpty(addressResult.region)){ - Pattern regionRegx=Pattern.compile("^"+addressResult.region+"(区|县|市)?(房价|均价)?$"); + Pattern regionRegx=Pattern.compile("^"+addressResult.region+"(鍖簗鍘縷甯�)?(鎴夸环|鍧囦环)?$"); matcher=regionRegx.matcher(origAddress); if(matcher.find()){ addressResult.city=city; @@ -428,7 +428,7 @@ public class AddressParser { int matchType=0; /** - * 解析室号 + * 瑙f瀽瀹ゅ彿 */ for(int k=0; k city_districts=new LinkedHashMap(); static{ - city_districts.put("上海", new String[]{"闸北", "南汇", "奉贤", "黄浦", "徐汇", "长宁", "静安", "普陀", "虹口", "杨浦", "宝山", "闵行", "浦东", "嘉定", "松江", "金山", "青浦", "崇明" }); - city_districts.put("北京", new String[]{"北京周边", "石景山", "延庆", "通州", "门头沟", "朝阳", "顺义", "平谷", "怀柔", "昌平", "西城", "东城", "海淀", "密云", "大兴", "房山", "丰台" }); - city_districts.put("广州", new String[]{"白云", "清远", "天河", "黄埔", "海珠", "萝岗", "荔湾", "南沙", "番禺", "花都", "越秀", "增城", "从化", "广州周边" }); - city_districts.put("深圳", new String[]{"惠州", "东莞", "福田", "罗湖", "南山", "盐田", "宝安", "龙岗", "坪山新区", "光明新区", "大鹏新区", "龙华新区" }); - city_districts.put("杭州", new String[]{"余杭", "桐庐", "西湖", "建德", "杭州周边", "萧山", "富阳", "临安", "淳安", "江干", "拱墅", "滨江", "下城", "上城" }); - city_districts.put("天津", new String[]{"宁河", "河东", "开发", "和平", "西青", "北辰", "大港", "南开", "河西", "河北", "津南", "红桥", "塘沽", "东丽", "蓟县", "武清", "静海", "汉沽", "宝坻" }); - city_districts.put("绍兴", new String[]{"新昌", "袍江", "嵊州", "越城", "上虞", "诸暨", "绍兴", "镜湖" }); - city_districts.put("南京", new String[]{"建邺", "南京周边", "下关", "玄武", "浦口", "雨花", "栖霞", "白下", "秦淮", "鼓楼", "江宁", "六合", "溧水", "高淳" }); - city_districts.put("西安", new String[]{"高新", "临潼", "城西", "灞桥", "未央", "城内", "城北", "城东", "城南", "咸阳", "浐灞", "周边", "经开", "西咸新区", "长安", "新城", "雁塔", "莲湖", "碑林", "阎良", "蓝田", "周至", "户县", "高陵" }); - city_districts.put("成都", new String[]{"蒲江", "大邑", "金堂", "高新西", "邛崃", "都江堰", "崇州", "新津", "郫县", "双流", "武侯", "金牛", "锦江", "温江", "青羊", "青白江", "龙泉驿", "成华", "新都", "彭州", "高新" }); - city_districts.put("武汉", new String[]{"青山", "阳逻", "硚口", "沌口开发", "黄陂", "汉南", "新洲", "蔡甸", "汉阳", "江岸", "江汉", "东西湖", "洪山", "武昌", "江夏", "东湖高新开发" }); - city_districts.put("宁波", new String[]{"东钱湖旅游渡假", "鄞州", "象山", "杭州湾新", "宁波周边", "高新", "镇海", "江北", "宁海", "江东", "海曙", "余姚", "奉化", "北仑", "慈溪" }); - city_districts.put("青岛", new String[]{"市南", "即墨", "黄岛", "市北", "李沧", "崂山", "城阳", "胶州", "平度", "莱西" }); - city_districts.put("沈阳", new String[]{"法库", "辽中", "沈河", "和平", "皇姑", "大东", "铁西", "苏家屯", "东陵", "沈北", "于洪", "新民", "康平", "浑南" }); - city_districts.put("大连", new String[]{"高新园", "长海", "瓦房店", "长兴岛", "开发", "大连周边", "普湾新区", "西岗", "中山", "沙河口", "甘井子", "旅顺口", "金州", "普兰店", "庄河" }); - city_districts.put("济南", new String[]{"平阴", "章丘", "市中", "天桥", "历下", "槐荫", "历城", "长清", "商河", "济阳", "高新" }); - city_districts.put("福州", new String[]{"仓山", "晋安", "台江", "闽清", "鼓楼", "马尾", "闽侯", "长乐", "福清", "连江", "罗源", "永泰", "平潭" }); - city_districts.put("郑州", new String[]{"管城回族", "金水", "上街", "惠济", "郑东", "高新技术开发", "经济技术开发", "新郑市", "登封市", "新密市", "巩义市", "荥阳市", "中牟县", "中原", "二七" }); - city_districts.put("长沙", new String[]{"宁乡", "星沙", "开福", "雨花", "天心", "岳麓", "芙蓉", "望城", "浏阳" }); - city_districts.put("昆明", new String[]{"西山", "安宁", "呈贡", "官渡", "盘龙", "五华", "东川", "富民", "晋宁", "嵩明", "寻甸", "宜良", "禄劝", "石林" }); - city_districts.put("长春", new String[]{"榆树市", "九台市", "经开", "南关", "朝阳", "二道", "高新", "宽城", "绿园", "汽开", "双阳", "德惠市", "农安县", "净月" }); - city_districts.put("厦门", new String[]{"同安", "翔安", "湖里", "思明", "集美", "海沧" }); - city_districts.put("哈尔滨", new String[]{"阿城", "道里", "道外", "呼兰", "南岗", "平房", "松北", "香坊", "宾县", "巴彦", "依兰", "延寿", "木兰", "通河", "方正", "五常", "双城", "尚志" }); - city_districts.put("苏州", new String[]{"园区", "新区", "苏州周边", "吴江", "太仓", "常熟", "吴中", "相城", "张家港", "昆山", "姑苏" }); - city_districts.put("无锡", new String[]{"宜兴", "新区", "北塘", "滨湖", "南长", "崇安", "锡山", "惠山", "江阴" }); - city_districts.put("合肥", new String[]{"巢湖", "庐阳", "包河", "瑶海", "高新", "新站", "蜀山", "经开", "政务", "滨湖", "长丰县", "肥东县", "肥西县" }); - city_districts.put("太原", new String[]{"榆次", "尖草坪", "杏花岭", "小店", "迎泽", "万柏林", "晋源", "古交", "清徐", "阳曲", "娄烦" }); - city_districts.put("石家庄", new String[]{"矿区", "深泽", "开发", "空港新", "裕华", "新华", "桥西", "平山", "桥东", "正定", "鹿泉", "长安", "藁城", "栾城", "新乐", "辛集", "晋州", "赵县", "赞皇", "灵寿", "高邑", "无极", "行唐", "井陉", "元氏" }); - city_districts.put("南昌", new String[]{"新建", "安义", "湾里", "昌北", "进贤", "南昌县", "东湖", "西湖", "青云谱", "青山湖", "红谷滩", "高新开发", "桑海", "英雄" }); - city_districts.put("呼和浩特", new String[]{"郊区", "新城", "回民", "玉泉", "金川开发", "赛罕", "金桥开发", "如意开发", "金山开发", "土默特左旗", "托克托", "和林格尔", "清水河", "武川" }); - city_districts.put("南宁", new String[]{"江南", "西乡塘", "马山县", "武鸣县", "邕宁", "青秀", "桂林", "钦州", "横县", "隆安县", "兴宁", "北海", "上林县", "良庆", "宾阳县" }); - city_districts.put("烟台", new String[]{"招远", "高新", "栖霞", "芝罘", "福山", "海阳", "开发", "龙口", "莱山", "莱州", "牟平", "蓬莱", "莱阳", "长岛县" }); - city_districts.put("佛山", new String[]{"禅城", "三水", "南海", "顺德", "高明" }); - city_districts.put("唐山", new String[]{"路南", "路北", "古冶", "开平", "丰南", "丰润", "滦县", "滦南", "乐亭", "迁西", "玉田", "唐海", "海港开发", "南堡", "遵化", "迁安", "高新", "曹妃甸", "汉沽", "芦台" }); - city_districts.put("泉州", new String[]{"石狮", "洛江", "惠安", "德化", "永春", "安溪", "晋江", "丰泽", "泉港", "鲤城", "南安" }); - city_districts.put("东莞", new String[]{"凤岗", "石碣", "石龙", "莞城", "长安", "虎门", "东城", "塘厦", "寮步", "常平", "樟木头", "厚街", "黄江", "南城", "石排", "清溪", "沙田", "大朗", "万江", "横沥", "茶山", "大岭山", "道滘", "东坑", "高埗", "洪梅", "麻涌", "企石", "桥头", "望牛墩", "谢岗", "中堂", "松山湖" }); - city_districts.put("海口", new String[]{"龙华", "秀英", "美兰", "琼山" }); - city_districts.put("汕头", new String[]{"金平", "龙湖", "濠江", "澄海", "南澳", "潮南", "潮阳" }); - city_districts.put("徐州", new String[]{"丰县", "鼓楼", "云龙", "贾汪", "泉山", "铜山", "金山桥开发", "睢宁", "新城", "沛县", "新沂", "邳州" }); - city_districts.put("珠海", new String[]{"香洲", "金湾", "斗门", "横琴", "高栏港", "高新", "万山" }); - city_districts.put("温州", new String[]{"瓯海", "鹿城", "龙湾", "瑞安", "乐清", "洞头", "永嘉", "平阳", "苍南", "文成", "泰顺" }); - city_districts.put("常州", new String[]{"溧阳", "戚区", "天宁", "武进", "新北", "金坛", "钟楼" }); - city_districts.put("南通", new String[]{"崇川", "港闸", "通州", "开发", "海安", "如东", "启东", "如皋", "海门" }); - city_districts.put("大庆", new String[]{"龙凤", "高新", "林甸县", "杜尔伯特蒙古族自治县", "肇源县", "红岗", "萨尔图", "肇州县", "让胡路", "大同" }); - city_districts.put("中山", new String[]{"沙溪", "阜沙", "三角", "民众", "五桂山", "三乡", "板芙", "神湾", "坦洲", "古镇", "小榄", "东凤", "南头", "横栏", "大涌", "东升", "黄圃", "南朗", "东区", "南区", "西区", "石岐", "火炬", "港口" }); - city_districts.put("威海", new String[]{"环翠", "荣成", "文登", "经区", "工业", "高区", "乳山" }); - city_districts.put("金华", new String[]{"东阳", "金东", "浦江", "婺城", "兰溪", "磐安", "武义", "永康", "义乌" }); - city_districts.put("嘉兴", new String[]{"市区", "南湖", "秀洲", "嘉善", "海盐", "海宁", "平湖", "桐乡", "经济开发", "中心城", "运河", "国际商务" }); - city_districts.put("湖州", new String[]{"市中心", "织里", "吴兴", "西南新城", "湖东", "仁皇山", "南浔", "南太湖", "凤凰开发", "德清", "长兴", "安吉" }); - city_districts.put("镇江", new String[]{"京口", "润州", "丹徒", "镇江新", "丹阳", "扬中", "句容" }); - city_districts.put("东营", new String[]{"" }); - city_districts.put("惠州", new String[]{"博罗", "惠城", "龙门", "惠东", "仲恺", "大亚湾", "惠阳" }); - city_districts.put("扬州", new String[]{"开发", "广陵", "邗江", "维扬", "宝应", "仪征", "高邮", "江都" }); - city_districts.put("盐城", new String[]{"全盐城", "盐都", "滨海", "响水", "东台", "大丰", "阜宁", "建湖", "亭湖", "射阳" }); - city_districts.put("江门", new String[]{"恩平市", "江海", "开平市", "新会", "台山市", "蓬江", "鹤山市" }); - city_districts.put("常熟", new String[]{"古里镇", "董浜镇", "支塘镇", "王庄镇", "尚湖镇", "虞山镇", "海虞镇", "梅李镇", "新港镇", "沙家浜", "辛庄镇", "练塘镇", "东南开发区" }); - city_districts.put("昆山", new String[]{"巴城", "玉山", "淀山湖", "周庄", "张浦", "周市", "陆家", "周边", "花桥", "开发区", "锦溪", "千灯" }); - city_districts.put("萧山", new String[]{"" }); - city_districts.put("义乌", new String[]{"义乌" }); - city_districts.put("余姚", new String[]{"余姚" }); - city_districts.put("慈溪", new String[]{"慈溪" }); - city_districts.put("云浮", new String[]{"云城", "罗定", "新兴", "郁南", "云安" }); - city_districts.put("本溪", new String[]{"平山", "明山", "溪湖", "南芬", "本溪", "桓仁" }); - city_districts.put("玉溪", new String[]{"红塔", "峨山", "通海", "江川", "华宁", "澄江", "元江", "易门", "新平" }); - city_districts.put("鄂尔多斯", new String[]{"" }); - city_districts.put("贵阳", new String[]{"南明", "小河", "云岩", "花溪", "乌当", "白云", "金阳", "开阳", "修文", "息烽", "清镇" }); - city_districts.put("乌鲁木齐", new String[]{"天山", "沙依巴克", "新市", "水磨沟", "头屯河", "米东", "达坂城", "乌鲁木齐县" }); - city_districts.put("泰州", new String[]{"高港", "姜堰市", "城西", "城南", "城北", "泰兴市", "靖江市", "兴化市", "城中", "城东" }); - city_districts.put("秦皇岛", new String[]{"卢龙县", "青龙县", "海港", "抚宁县", "昌黎县", "山海关", "北戴河" }); - city_districts.put("台州", new String[]{"路桥", "三门", "黄岩", "临海", "椒江", "天台", "仙居", "玉环", "温岭" }); - city_districts.put("清远", new String[]{"新城", "清新", "清城", "阳山", "旧城", "连州", "英德", "佛冈", "连南", "连山" }); - city_districts.put("兰州", new String[]{"永登", "城关", "七里河", "西固", "安宁", "红古", "皋兰", "榆中" }); - city_districts.put("柳州", new String[]{"柳城", "三江", "柳东", "融安", "柳江", "鱼峰", "城中", "柳南", "融水", "柳北", "鹿寨", "高新" }); - city_districts.put("湛江", new String[]{"麻章", "坡头", "霞山", "廉江", "吴川", "雷州", "徐闻", "遂溪", "赤坎", "开发" }); - city_districts.put("赣州", new String[]{"赣县", "信丰", "章贡", "宁都", "瑞金", "南康" }); - city_districts.put("丹东", new String[]{"全丹东", "振安", "元宝", "宽甸", "凤城", "东港", "振兴" }); - city_districts.put("咸阳", new String[]{"兴平市", "武功县", "秦都", "长武县", "旬邑县", "渭城", "杨陵", "礼泉县", "乾县", "泾阳县", "三原县", "永寿县", "彬县", "淳化县" }); - city_districts.put("丽江", new String[]{"全丽江", "古城", "永胜", "玉龙", "宁蒗", "华坪" }); - city_districts.put("张家界", new String[]{"全张家界", "慈利", "永定", "武陵源", "桑植" }); - city_districts.put("银川", new String[]{"西夏", "永宁", "贺兰", "灵武", "金凤", "兴庆" }); - city_districts.put("大理", new String[]{"全大理", "洱源", "剑川", "大理", "漾濞", "巍山", "宾川", "弥渡", "鹤庆", "祥云", "永平", "云龙", "南涧" }); - city_districts.put("宿迁", new String[]{"宿豫", "沭阳", "泗洪", "宿城", "泗阳", "宿城新" }); - city_districts.put("芜湖", new String[]{"镜湖", "芜湖", "繁昌", "南陵", "开发", "弋江", "鸠江", "三山" }); - city_districts.put("马鞍山", new String[]{"当涂县", "花山", "开发", "雨山", "金家庄", "含山县", "佳山", "慈湖", "和县", "向山" }); - city_districts.put("玉林", new String[]{"全玉林", "容县", "北流", "博白", "陆川", "兴业", "玉州" }); - city_districts.put("潍坊", new String[]{"安丘", "高密", "昌邑", "临朐", "昌乐", "奎文", "潍城", "寒亭", "坊子", "经济开发", "高新技术开发", "青州", "诸城", "寿光", "滨海经济开发" }); - city_districts.put("连云港", new String[]{"连云", "开发", "海州", "东海", "赣榆", "灌南", "灌云", "新浦" }); - city_districts.put("延安", new String[]{"富县", "洛川", "黄陵", "甘泉", "全延安", "吴起", "延长", "宝塔", "黄龙", "安塞", "子长", "志丹", "宜川", "延川" }); - city_districts.put("九江", new String[]{"浔阳", "庐山", "彭泽县", "星子县", "德安县", "都昌县", "九江县", "共青城市", "修水县", "永修县", "武宁县", "瑞昌市", "湖口县", "开发" }); - city_districts.put("三亚", new String[]{"陵水", "博鳌", "乐东", "琼海", "万宁", "小东海", "亚龙湾", "保亭", "五指山", "三亚湾", "海棠湾", "崖城", "凤凰", "天涯", "田独", "育才", "河东", "河西", "大东海" }); - city_districts.put("宜昌", new String[]{"五峰土家族自治县", "猇亭", "点军", "伍家岗", "西陵", "夷陵", "秭归县", "宜都", "兴山县", "远安县", "东山开发", "枝江", "当阳", "长阳土家族自治县" }); - city_districts.put("六盘水", new String[]{"全六盘水", "盘县", "六枝特", "钟山", "水城" }); - city_districts.put("吉林", new String[]{"船营", "龙潭", "丰满", "经开", "永吉", "高新", "蛟河", "桦甸", "舒兰", "磐石", "昌邑" }); - city_districts.put("鞍山", new String[]{"高新", "铁西", "海城", "立山", "岫岩满族自治县", "千山", "台安", "铁东" }); - city_districts.put("保定", new String[]{"满城", "安国", "南市", "涿州", "高新技术产业开发", "新市", "定州", "北市", "清苑", "高碑店" }); - city_districts.put("宜宾", new String[]{"珙县", "高县", "江安", "宜宾", "长宁", "南溪", "翠屏", "兴文", "筠连", "屏山", "全宜宾" }); - city_districts.put("莆田", new String[]{"涵江", "仙游", "城厢", "秀屿", "全莆田", "荔城" }); - city_districts.put("西宁", new String[]{"城南", "城东", "城西", "城北", "城南新", "城北生物科技园", "海湖", "城中" }); - city_districts.put("自贡", new String[]{"全自贡", "大安", "贡井", "荣县", "自流井", "富顺", "沿滩" }); - city_districts.put("淄博", new String[]{"淄川", "周村", "高新", "沂源", "桓台", "临淄", "张店", "博山", "高青" }); - city_districts.put("攀枝花", new String[]{"仁和", "米易", "盐边", "西区", "东区", "全攀枝花" }); - city_districts.put("衢州", new String[]{"北区", "双港开发", "南区", "西区", "巨化", "老城", "经济开发", "柯城", "衢江", "江山", "龙游", "常山", "开化" }); - city_districts.put("邯郸", new String[]{"高开", "邱县", "永年", "曲周", "邯郸", "肥乡", "馆陶", "涉县", "广平", "魏县", "磁县", "大名", "丛台", "邯山", "峰峰", "武安", "鸡泽", "成安", "临漳", "复兴" }); - city_districts.put("北海", new String[]{"银海", "铁山港", "海城", "合浦" }); - city_districts.put("廊坊", new String[]{"大城", "安次", "大厂", "永清", "固安", "霸州", "香河", "文安", "三河", "广阳" }); - city_districts.put("洛阳", new String[]{"嵩县", "涧西", "西工", "老城", "瀍河", "洛龙", "吉利", "偃师", "栾川", "孟津", "伊川", "宜阳", "新安", "洛宁", "汝阳" }); - city_districts.put("桂林", new String[]{"叠彩", "象山", "七星", "雁山", "灵川", "兴安", "全州", "灌阳", "资源", "永福", "荔浦", "阳朔", "平乐", "龙胜", "恭城", "秀峰", "西城" }); - city_districts.put("株洲", new String[]{"荷塘", "芦淞", "攸县", "石峰", "株洲", "天元", "全株洲", "茶陵", "醴陵", "炎陵" }); - city_districts.put("湘潭", new String[]{"岳塘", "全湘潭", "湘乡", "湘潭", "雨湖", "韶山" }); - city_districts.put("重庆", new String[]{"铜梁", "开县", "南川", "潼南", "重庆周边", "合川", "永川", "武隆", "江津", "长寿", "万州", "涪陵", "綦江", "璧山", "万盛", "渝中", "江北", "渝北", "南岸", "沙坪坝", "九龙坡", "大渡口", "北碚", "巴南" }); - city_districts.put("绵阳", new String[]{"安县", "江油市", "平武县", "高新", "科创园", "农科", "梓潼县", "涪城", "北川县", "盐亭县", "仙海", "三台县", "经开", "游仙" }); - city_districts.put("岳阳", new String[]{"岳阳楼区" }); - city_districts.put("增城", new String[]{"增城" }); - city_districts.put("吴江", new String[]{"松陵", "盛泽", "同里", "震泽", "平望", "桃源", "横扇", "七都", "黎里", "滨湖新城", "汾湖" }); - city_districts.put("瑞安", new String[]{"碧山", "安阳", "曹村", "东山", "飞云", "湖岭", "锦湖", "龙湖", "马屿", "潘岱", "平阳坑", "上望", "塘下", "陶山", "汀田", "仙降", "莘塍", "玉海", "老城" }); - city_districts.put("乐清", new String[]{"清江", "大荆", "雁荡", "南塘", "芙蓉", "南岳", "蒲岐", "虹桥", "翁垟", "象阳", "仙溪", "七里港", "北白象", "淡溪", "石帆", "湖雾", "白石", "黄华", "磐石", "柳市", "乐成" }); - city_districts.put("奉化", new String[]{"奉化" }); - city_districts.put("温岭", new String[]{"温岭" }); - city_districts.put("宜兴", new String[]{"芳桥", "宜城", "新建", "新庄", "丁蜀", "湖父", "官林", "周铁", "万石", "高塍", "张渚", "西渚", "徐舍", "杨巷", "和桥", "太华", "新街", "环保科技工业园", "宜兴经济开发区", "屺亭" }); - city_districts.put("肇庆", new String[]{"鼎湖", "德庆", "广宁", "大旺", "四会", "高要", "怀集", "封开", "端州" }); - city_districts.put("安阳", new String[]{"安阳新区", "开发区", "安阳县", "滑县", "林州", "龙安", "殷都", "北关", "文峰", "内黄", "汤阴" }); - city_districts.put("曲靖", new String[]{"马龙", "会泽", "罗平", "师宗", "沾益", "陆良", "富源", "宣威", "麒麟" }); - city_districts.put("衡阳", new String[]{"南岳", "珠晖", "雁峰", "石鼓", "蒸湘", "常宁", "耒阳", "衡南", "衡阳县", "衡山", "衡东", "祁东" }); - city_districts.put("新乡", new String[]{"卫滨", "红旗", "牧野", "凤泉", "辉县", "卫辉", "新乡县", "获嘉", "原阳", "延津", "封丘", "长垣" }); - city_districts.put("营口", new String[]{"站前", "西市", "老边", "鲅鱼圈", "大石桥", "盖州" }); - city_districts.put("潮州", new String[]{"湘桥", "枫溪", "潮安", "饶平" }); - city_districts.put("河源", new String[]{"源城", "东源", "和平", "连平", "龙川", "紫金" }); - city_districts.put("黄石", new String[]{"黄石港", "西塞山", "下陆", "铁山", "大冶", "阳新", "黄石经济开发区" }); - city_districts.put("焦作", new String[]{"温县", "解放", "山阳", "中站", "马村", "高新", "沁阳", "孟州", "博爱", "武陟", "修武" }); - city_districts.put("揭阳", new String[]{"榕城", "揭东", "惠来", "揭西", "普宁" }); - city_districts.put("茂名", new String[]{"茂港", "茂南", "信宜", "化州", "高州", "电白" }); - city_districts.put("牡丹江", new String[]{"东安", "西安", "爱民", "阳明", "江南", "绥芬河", "宁安", "海林", "穆棱", "林口", "东宁" }); - city_districts.put("盘锦", new String[]{"大洼", "盘山", "双台子", "兴隆台" }); - city_districts.put("平顶山", new String[]{"郏县", "叶县", "湛河", "石龙", "新华", "卫东", "汝州", "舞钢", "宝丰", "鲁山" }); - city_districts.put("韶关", new String[]{"仁化", "翁源", "新丰", "始兴", "南雄", "乐昌", "浈江", "武江", "曲江", "乳源" }); - city_districts.put("阳江", new String[]{"阳春", "阳东", "阳西", "海陵区", "高新区", "江城" }); - city_districts.put("梅州", new String[]{"梅江", "兴宁", "梅县", "平远", "蕉岭", "大埔", "丰顺", "五华" }); + city_districts.put("涓婃捣", new String[]{"闂稿寳", "鍗楁眹", "濂夎搐", "榛勬郸", "寰愭眹", "闀垮畞", "闈欏畨", "鏅檧", "铏瑰彛", "鏉ㄦ郸", "瀹濆北", "闂佃", "娴︿笢", "鍢夊畾", "鏉炬睙", "閲戝北", "闈掓郸", "宕囨槑" }); + city_districts.put("鍖椾含", new String[]{"鍖椾含鍛ㄨ竟", "鐭虫櫙灞�", "寤跺簡", "閫氬窞", "闂ㄥご娌�", "鏈濋槼", "椤轰箟", "骞宠胺", "鎬�鏌�", "鏄屽钩", "瑗垮煄", "涓滃煄", "娴锋穩", "瀵嗕簯", "澶у叴", "鎴垮北", "涓板彴" }); + city_districts.put("骞垮窞", new String[]{"鐧戒簯", "娓呰繙", "澶╂渤", "榛勫煍", "娴风彔", "钀濆矖", "鑽旀咕", "鍗楁矙", "鐣", "鑺遍兘", "瓒婄", "澧炲煄", "浠庡寲", "骞垮窞鍛ㄨ竟" }); + city_districts.put("娣卞湷", new String[]{"鎯犲窞", "涓滆帪", "绂忕敯", "缃楁箹", "鍗楀北", "鐩愮敯", "瀹濆畨", "榫欏矖", "鍧北鏂板尯", "鍏夋槑鏂板尯", "澶ч箯鏂板尯", "榫欏崕鏂板尯" }); + city_districts.put("鏉窞", new String[]{"浣欐澀", "妗愬簮", "瑗挎箹", "寤哄痉", "鏉窞鍛ㄨ竟", "钀у北", "瀵岄槼", "涓村畨", "娣冲畨", "姹熷共", "鎷卞", "婊ㄦ睙", "涓嬪煄", "涓婂煄" }); + city_districts.put("澶╂触", new String[]{"瀹佹渤", "娌充笢", "寮�鍙�", "鍜屽钩", "瑗块潚", "鍖楄景", "澶ф腐", "鍗楀紑", "娌宠タ", "娌冲寳", "娲ュ崡", "绾㈡ˉ", "濉樻步", "涓滀附", "钃熷幙", "姝︽竻", "闈欐捣", "姹夋步", "瀹濆澔" }); + city_districts.put("缁嶅叴", new String[]{"鏂版槍", "琚嶆睙", "宓婂窞", "瓒婂煄", "涓婅櫈", "璇告毃", "缁嶅叴", "闀滄箹" }); + city_districts.put("鍗椾含", new String[]{"寤洪偤", "鍗椾含鍛ㄨ竟", "涓嬪叧", "鐜勬", "娴﹀彛", "闆ㄨ姳", "鏍栭湠", "鐧戒笅", "绉︽樊", "榧撴ゼ", "姹熷畞", "鍏悎", "婧ф按", "楂樻烦" }); + city_districts.put("瑗垮畨", new String[]{"楂樻柊", "涓存郊", "鍩庤タ", "鐏炴ˉ", "鏈ぎ", "鍩庡唴", "鍩庡寳", "鍩庝笢", "鍩庡崡", "鍜搁槼", "娴愮仦", "鍛ㄨ竟", "缁忓紑", "瑗垮捀鏂板尯", "闀垮畨", "鏂板煄", "闆佸", "鑾叉箹", "纰戞灄", "闃庤壇", "钃濈敯", "鍛ㄨ嚦", "鎴峰幙", "楂橀櫟" }); + city_districts.put("鎴愰兘", new String[]{"钂叉睙", "澶ч倯", "閲戝爞", "楂樻柊瑗�", "閭涘磧", "閮芥睙鍫�", "宕囧窞", "鏂版触", "閮幙", "鍙屾祦", "姝︿警", "閲戠墰", "閿︽睙", "娓╂睙", "闈掔緤", "闈掔櫧姹�", "榫欐硥椹�", "鎴愬崕", "鏂伴兘", "褰窞", "楂樻柊" }); + city_districts.put("姝︽眽", new String[]{"闈掑北", "闃抽��", "纭氬彛", "娌屽彛寮�鍙�", "榛勯檪", "姹夊崡", "鏂版床", "钄$敻", "姹夐槼", "姹熷哺", "姹熸眽", "涓滆タ婀�", "娲北", "姝︽槍", "姹熷", "涓滄箹楂樻柊寮�鍙�" }); + city_districts.put("瀹佹尝", new String[]{"涓滈挶婀栨梾娓告浮鍋�", "閯炲窞", "璞″北", "鏉窞婀炬柊", "瀹佹尝鍛ㄨ竟", "楂樻柊", "闀囨捣", "姹熷寳", "瀹佹捣", "姹熶笢", "娴锋洐", "浣欏", "濂夊寲", "鍖椾粦", "鎱堟邯" }); + city_districts.put("闈掑矝", new String[]{"甯傚崡", "鍗冲ⅷ", "榛勫矝", "甯傚寳", "鏉庢钵", "宕傚北", "鍩庨槼", "鑳跺窞", "骞冲害", "鑾辫タ" }); + city_districts.put("娌堥槼", new String[]{"娉曞簱", "杈戒腑", "娌堟渤", "鍜屽钩", "鐨囧", "澶т笢", "閾佽タ", "鑻忓灞�", "涓滈櫟", "娌堝寳", "浜庢椽", "鏂版皯", "搴峰钩", "娴戝崡" }); + city_districts.put("澶ц繛", new String[]{"楂樻柊鍥�", "闀挎捣", "鐡︽埧搴�", "闀垮叴宀�", "寮�鍙�", "澶ц繛鍛ㄨ竟", "鏅咕鏂板尯", "瑗垮矖", "涓北", "娌欐渤鍙�", "鐢樹簳瀛�", "鏃呴『鍙�", "閲戝窞", "鏅叞搴�", "搴勬渤" }); + city_districts.put("娴庡崡", new String[]{"骞抽槾", "绔犱笜", "甯備腑", "澶╂ˉ", "鍘嗕笅", "妲愯崼", "鍘嗗煄", "闀挎竻", "鍟嗘渤", "娴庨槼", "楂樻柊" }); + city_districts.put("绂忓窞", new String[]{"浠撳北", "鏅嬪畨", "鍙版睙", "闂芥竻", "榧撴ゼ", "椹熬", "闂戒警", "闀夸箰", "绂忔竻", "杩炴睙", "缃楁簮", "姘告嘲", "骞虫江" }); + city_districts.put("閮戝窞", new String[]{"绠″煄鍥炴棌", "閲戞按", "涓婅", "鎯犳祹", "閮戜笢", "楂樻柊鎶�鏈紑鍙�", "缁忔祹鎶�鏈紑鍙�", "鏂伴儜甯�", "鐧诲皝甯�", "鏂板瘑甯�", "宸╀箟甯�", "鑽ラ槼甯�", "涓墴鍘�", "涓師", "浜屼竷" }); + city_districts.put("闀挎矙", new String[]{"瀹佷埂", "鏄熸矙", "寮�绂�", "闆ㄨ姳", "澶╁績", "宀抽簱", "鑺欒搲", "鏈涘煄", "娴忛槼" }); + city_districts.put("鏄嗘槑", new String[]{"瑗垮北", "瀹夊畞", "鍛堣础", "瀹樻浮", "鐩橀緳", "浜斿崕", "涓滃窛", "瀵屾皯", "鏅嬪畞", "宓╂槑", "瀵荤敻", "瀹滆壇", "绂勫姖", "鐭虫灄" }); + city_districts.put("闀挎槬", new String[]{"姒嗘爲甯�", "涔濆彴甯�", "缁忓紑", "鍗楀叧", "鏈濋槼", "浜岄亾", "楂樻柊", "瀹藉煄", "缁垮洯", "姹藉紑", "鍙岄槼", "寰锋儬甯�", "鍐滃畨鍘�", "鍑�鏈�" }); + city_districts.put("鍘﹂棬", new String[]{"鍚屽畨", "缈斿畨", "婀栭噷", "鎬濇槑", "闆嗙編", "娴锋钵" }); + city_districts.put("鍝堝皵婊�", new String[]{"闃垮煄", "閬撻噷", "閬撳", "鍛煎叞", "鍗楀矖", "骞虫埧", "鏉惧寳", "棣欏潑", "瀹惧幙", "宸村溅", "渚濆叞", "寤跺", "鏈ㄥ叞", "閫氭渤", "鏂规", "浜斿父", "鍙屽煄", "灏氬織" }); + city_districts.put("鑻忓窞", new String[]{"鍥尯", "鏂板尯", "鑻忓窞鍛ㄨ竟", "鍚存睙", "澶粨", "甯哥啛", "鍚翠腑", "鐩稿煄", "寮犲娓�", "鏄嗗北", "濮戣嫃" }); + city_districts.put("鏃犻敗", new String[]{"瀹滃叴", "鏂板尯", "鍖楀", "婊ㄦ箹", "鍗楅暱", "宕囧畨", "閿″北", "鎯犲北", "姹熼槾" }); + city_districts.put("鍚堣偉", new String[]{"宸㈡箹", "搴愰槼", "鍖呮渤", "鐟舵捣", "楂樻柊", "鏂扮珯", "铚�灞�", "缁忓紑", "鏀垮姟", "婊ㄦ箹", "闀夸赴鍘�", "鑲ヤ笢鍘�", "鑲ヨタ鍘�" }); + city_districts.put("澶師", new String[]{"姒嗘", "灏栬崏鍧�", "鏉忚姳宀�", "灏忓簵", "杩庢辰", "涓囨煆鏋�", "鏅嬫簮", "鍙や氦", "娓呭緪", "闃虫洸", "濞勭儲" }); + city_districts.put("鐭冲搴�", new String[]{"鐭垮尯", "娣辨辰", "寮�鍙�", "绌烘腐鏂�", "瑁曞崕", "鏂板崕", "妗ヨタ", "骞冲北", "妗ヤ笢", "姝e畾", "楣挎硥", "闀垮畨", "钘佸煄", "鏍惧煄", "鏂颁箰", "杈涢泦", "鏅嬪窞", "璧靛幙", "璧炵殗", "鐏靛", "楂橀倯", "鏃犳瀬", "琛屽攼", "浜曢檳", "鍏冩皬" }); + city_districts.put("鍗楁槍", new String[]{"鏂板缓", "瀹変箟", "婀鹃噷", "鏄屽寳", "杩涜搐", "鍗楁槍鍘�", "涓滄箹", "瑗挎箹", "闈掍簯璋�", "闈掑北婀�", "绾㈣胺婊�", "楂樻柊寮�鍙�", "妗戞捣", "鑻遍泟" }); + city_districts.put("鍛煎拰娴╃壒", new String[]{"閮婂尯", "鏂板煄", "鍥炴皯", "鐜夋硥", "閲戝窛寮�鍙�", "璧涚綍", "閲戞ˉ寮�鍙�", "濡傛剰寮�鍙�", "閲戝北寮�鍙�", "鍦熼粯鐗瑰乏鏃�", "鎵樺厠鎵�", "鍜屾灄鏍煎皵", "娓呮按娌�", "姝﹀窛" }); + city_districts.put("鍗楀畞", new String[]{"姹熷崡", "瑗夸埂濉�", "椹北鍘�", "姝﹂福鍘�", "閭曞畞", "闈掔", "妗傛灄", "閽﹀窞", "妯幙", "闅嗗畨鍘�", "鍏村畞", "鍖楁捣", "涓婃灄鍘�", "鑹簡", "瀹鹃槼鍘�" }); + city_districts.put("鐑熷彴", new String[]{"鎷涜繙", "楂樻柊", "鏍栭湠", "鑺濈綐", "绂忓北", "娴烽槼", "寮�鍙�", "榫欏彛", "鑾卞北", "鑾卞窞", "鐗熷钩", "钃幈", "鑾遍槼", "闀垮矝鍘�" }); + city_districts.put("浣涘北", new String[]{"绂呭煄", "涓夋按", "鍗楁捣", "椤哄痉", "楂樻槑" }); + city_districts.put("鍞愬北", new String[]{"璺崡", "璺寳", "鍙ゅ喍", "寮�骞�", "涓板崡", "涓版鼎", "婊﹀幙", "婊﹀崡", "涔愪涵", "杩佽タ", "鐜夌敯", "鍞愭捣", "娴锋腐寮�鍙�", "鍗楀牎", "閬靛寲", "杩佸畨", "楂樻柊", "鏇瑰鐢�", "姹夋步", "鑺﹀彴" }); + city_districts.put("娉夊窞", new String[]{"鐭崇嫯", "娲涙睙", "鎯犲畨", "寰峰寲", "姘告槬", "瀹夋邯", "鏅嬫睙", "涓版辰", "娉夋腐", "椴ゅ煄", "鍗楀畨" }); + city_districts.put("涓滆帪", new String[]{"鍑ゅ矖", "鐭崇ⅲ", "鐭抽緳", "鑾炲煄", "闀垮畨", "铏庨棬", "涓滃煄", "濉樺帵", "瀵", "甯稿钩", "妯熸湪澶�", "鍘氳", "榛勬睙", "鍗楀煄", "鐭虫帓", "娓呮邯", "娌欑敯", "澶ф湕", "涓囨睙", "妯播", "鑼跺北", "澶у箔灞�", "閬撴粯", "涓滃潙", "楂樺煑", "娲", "楹绘秾", "浼佺煶", "妗ュご", "鏈涚墰澧�", "璋㈠矖", "涓爞", "鏉惧北婀�" }); + city_districts.put("娴峰彛", new String[]{"榫欏崕", "绉�鑻�", "缇庡叞", "鐞煎北" }); + city_districts.put("姹曞ご", new String[]{"閲戝钩", "榫欐箹", "婵犳睙", "婢勬捣", "鍗楁境", "娼崡", "娼槼" }); + city_districts.put("寰愬窞", new String[]{"涓板幙", "榧撴ゼ", "浜戦緳", "璐炬豹", "娉夊北", "閾滃北", "閲戝北妗ュ紑鍙�", "鐫㈠畞", "鏂板煄", "娌涘幙", "鏂版矀", "閭冲窞" }); + city_districts.put("鐝犳捣", new String[]{"棣欐床", "閲戞咕", "鏂楅棬", "妯惔", "楂樻爮娓�", "楂樻柊", "涓囧北" }); + city_districts.put("娓╁窞", new String[]{"鐡捣", "楣垮煄", "榫欐咕", "鐟炲畨", "涔愭竻", "娲炲ご", "姘稿槈", "骞抽槼", "鑻嶅崡", "鏂囨垚", "娉伴『" }); + city_districts.put("甯稿窞", new String[]{"婧ч槼", "鎴氬尯", "澶╁畞", "姝﹁繘", "鏂板寳", "閲戝潧", "閽熸ゼ" }); + city_districts.put("鍗楅��", new String[]{"宕囧窛", "娓椄", "閫氬窞", "寮�鍙�", "娴峰畨", "濡備笢", "鍚笢", "濡傜殝", "娴烽棬" }); + city_districts.put("澶у簡", new String[]{"榫欏嚖", "楂樻柊", "鏋楃敻鍘�", "鏉滃皵浼壒钂欏彜鏃忚嚜娌诲幙", "鑲囨簮鍘�", "绾㈠矖", "钀ㄥ皵鍥�", "鑲囧窞鍘�", "璁╄儭璺�", "澶у悓" }); + city_districts.put("涓北", new String[]{"娌欐邯", "闃滄矙", "涓夎", "姘戜紬", "浜旀灞�", "涓変埂", "鏉胯姍", "绁炴咕", "鍧︽床", "鍙ら晣", "灏忔", "涓滃嚖", "鍗楀ご", "妯爮", "澶ф秾", "涓滃崌", "榛勫渻", "鍗楁湕", "涓滃尯", "鍗楀尯", "瑗垮尯", "鐭冲矏", "鐏偓", "娓彛" }); + city_districts.put("濞佹捣", new String[]{"鐜繝", "鑽f垚", "鏂囩櫥", "缁忓尯", "宸ヤ笟", "楂樺尯", "涔冲北" }); + city_districts.put("閲戝崕", new String[]{"涓滈槼", "閲戜笢", "娴︽睙", "濠哄煄", "鍏版邯", "纾愬畨", "姝︿箟", "姘稿悍", "涔変箤" }); + city_districts.put("鍢夊叴", new String[]{"甯傚尯", "鍗楁箹", "绉�娲�", "鍢夊杽", "娴风洂", "娴峰畞", "骞虫箹", "妗愪埂", "缁忔祹寮�鍙�", "涓績鍩�", "杩愭渤", "鍥介檯鍟嗗姟" }); + city_districts.put("婀栧窞", new String[]{"甯備腑蹇�", "缁囬噷", "鍚村叴", "瑗垮崡鏂板煄", "婀栦笢", "浠佺殗灞�", "鍗楁禂", "鍗楀お婀�", "鍑ゅ嚢寮�鍙�", "寰锋竻", "闀垮叴", "瀹夊悏" }); + city_districts.put("闀囨睙", new String[]{"浜彛", "娑﹀窞", "涓瑰緬", "闀囨睙鏂�", "涓归槼", "鎵腑", "鍙ュ" }); + city_districts.put("涓滆惀", new String[]{"" }); + city_districts.put("鎯犲窞", new String[]{"鍗氱綏", "鎯犲煄", "榫欓棬", "鎯犱笢", "浠叉伜", "澶т簹婀�", "鎯犻槼" }); + city_districts.put("鎵窞", new String[]{"寮�鍙�", "骞块櫟", "閭楁睙", "缁存壃", "瀹濆簲", "浠緛", "楂橀偖", "姹熼兘" }); + city_districts.put("鐩愬煄", new String[]{"鍏ㄧ洂鍩�", "鐩愰兘", "婊ㄦ捣", "鍝嶆按", "涓滃彴", "澶т赴", "闃滃畞", "寤烘箹", "浜箹", "灏勯槼" }); + city_districts.put("姹熼棬", new String[]{"鎭╁钩甯�", "姹熸捣", "寮�骞冲競", "鏂颁細", "鍙板北甯�", "钃睙", "楣ゅ北甯�" }); + city_districts.put("甯哥啛", new String[]{"鍙ら噷闀�", "钁f禍闀�", "鏀闀�", "鐜嬪簞闀�", "灏氭箹闀�", "铏炲北闀�", "娴疯櫈闀�", "姊呮潕闀�", "鏂版腐闀�", "娌欏娴�", "杈涘簞闀�", "缁冨闀�", "涓滃崡寮�鍙戝尯" }); + city_districts.put("鏄嗗北", new String[]{"宸村煄", "鐜夊北", "娣�灞辨箹", "鍛ㄥ簞", "寮犳郸", "鍛ㄥ競", "闄嗗", "鍛ㄨ竟", "鑺辨ˉ", "寮�鍙戝尯", "閿︽邯", "鍗冪伅" }); + city_districts.put("钀у北", new String[]{"" }); + city_districts.put("涔変箤", new String[]{"涔変箤" }); + city_districts.put("浣欏", new String[]{"浣欏" }); + city_districts.put("鎱堟邯", new String[]{"鎱堟邯" }); + city_districts.put("浜戞诞", new String[]{"浜戝煄", "缃楀畾", "鏂板叴", "閮佸崡", "浜戝畨" }); + city_districts.put("鏈邯", new String[]{"骞冲北", "鏄庡北", "婧箹", "鍗楄姮", "鏈邯", "妗撲粊" }); + city_districts.put("鐜夋邯", new String[]{"绾㈠", "宄ㄥ北", "閫氭捣", "姹熷窛", "鍗庡畞", "婢勬睙", "鍏冩睙", "鏄撻棬", "鏂板钩" }); + city_districts.put("閯傚皵澶氭柉", new String[]{"" }); + city_districts.put("璐甸槼", new String[]{"鍗楁槑", "灏忔渤", "浜戝博", "鑺辨邯", "涔屽綋", "鐧戒簯", "閲戦槼", "寮�闃�", "淇枃", "鎭兘", "娓呴晣" }); + city_districts.put("涔岄瞾鏈ㄩ綈", new String[]{"澶╁北", "娌欎緷宸村厠", "鏂板競", "姘寸(娌�", "澶村悲娌�", "绫充笢", "杈惧潅鍩�", "涔岄瞾鏈ㄩ綈鍘�" }); + city_districts.put("娉板窞", new String[]{"楂樻腐", "濮滃牥甯�", "鍩庤タ", "鍩庡崡", "鍩庡寳", "娉板叴甯�", "闈栨睙甯�", "鍏村寲甯�", "鍩庝腑", "鍩庝笢" }); + city_districts.put("绉︾殗宀�", new String[]{"鍗㈤緳鍘�", "闈掗緳鍘�", "娴锋腐", "鎶氬畞鍘�", "鏄岄粠鍘�", "灞辨捣鍏�", "鍖楁埓娌�" }); + city_districts.put("鍙板窞", new String[]{"璺ˉ", "涓夐棬", "榛勫博", "涓存捣", "妞掓睙", "澶╁彴", "浠欏眳", "鐜夌幆", "娓╁箔" }); + city_districts.put("娓呰繙", new String[]{"鏂板煄", "娓呮柊", "娓呭煄", "闃冲北", "鏃у煄", "杩炲窞", "鑻卞痉", "浣涘唸", "杩炲崡", "杩炲北" }); + city_districts.put("鍏板窞", new String[]{"姘哥櫥", "鍩庡叧", "涓冮噷娌�", "瑗垮浐", "瀹夊畞", "绾㈠彜", "鐨嬪叞", "姒嗕腑" }); + city_districts.put("鏌冲窞", new String[]{"鏌冲煄", "涓夋睙", "鏌充笢", "铻嶅畨", "鏌虫睙", "楸煎嘲", "鍩庝腑", "鏌冲崡", "铻嶆按", "鏌冲寳", "楣垮", "楂樻柊" }); + city_districts.put("婀涙睙", new String[]{"楹荤珷", "鍧″ご", "闇炲北", "寤夋睙", "鍚村窛", "闆峰窞", "寰愰椈", "閬傛邯", "璧ゅ潕", "寮�鍙�" }); + city_districts.put("璧e窞", new String[]{"璧e幙", "淇′赴", "绔犺础", "瀹侀兘", "鐟為噾", "鍗楀悍" }); + city_districts.put("涓逛笢", new String[]{"鍏ㄤ腹涓�", "鎸畨", "鍏冨疂", "瀹界敻", "鍑ゅ煄", "涓滄腐", "鎸叴" }); + city_districts.put("鍜搁槼", new String[]{"鍏村钩甯�", "姝﹀姛鍘�", "绉﹂兘", "闀挎鍘�", "鏃倯鍘�", "娓煄", "鏉ㄩ櫟", "绀兼硥鍘�", "涔惧幙", "娉鹃槼鍘�", "涓夊師鍘�", "姘稿鍘�", "褰幙", "娣冲寲鍘�" }); + city_districts.put("涓芥睙", new String[]{"鍏ㄤ附姹�", "鍙ゅ煄", "姘歌儨", "鐜夐緳", "瀹佽挆", "鍗庡潽" }); + city_districts.put("寮犲鐣�", new String[]{"鍏ㄥ紶瀹剁晫", "鎱堝埄", "姘稿畾", "姝﹂櫟婧�", "妗戞" }); + city_districts.put("閾跺窛", new String[]{"瑗垮", "姘稿畞", "璐哄叞", "鐏垫", "閲戝嚖", "鍏村簡" }); + city_districts.put("澶х悊", new String[]{"鍏ㄥぇ鐞�", "娲辨簮", "鍓戝窛", "澶х悊", "婕炬繛", "宸嶅北", "瀹惧窛", "寮ユ浮", "楣ゅ簡", "绁ヤ簯", "姘稿钩", "浜戦緳", "鍗楁锭" }); + city_districts.put("瀹胯縼", new String[]{"瀹胯鲍", "娌槼", "娉楁椽", "瀹垮煄", "娉楅槼", "瀹垮煄鏂�" }); + city_districts.put("鑺滄箹", new String[]{"闀滄箹", "鑺滄箹", "绻佹槍", "鍗楅櫟", "寮�鍙�", "寮嬫睙", "楦犳睙", "涓夊北" }); + city_districts.put("椹瀺灞�", new String[]{"褰撴秱鍘�", "鑺卞北", "寮�鍙�", "闆ㄥ北", "閲戝搴�", "鍚北鍘�", "浣冲北", "鎱堟箹", "鍜屽幙", "鍚戝北" }); + city_districts.put("鐜夋灄", new String[]{"鍏ㄧ帀鏋�", "瀹瑰幙", "鍖楁祦", "鍗氱櫧", "闄嗗窛", "鍏翠笟", "鐜夊窞" }); + city_districts.put("娼嶅潑", new String[]{"瀹変笜", "楂樺瘑", "鏄岄倯", "涓存湊", "鏄屼箰", "濂庢枃", "娼嶅煄", "瀵掍涵", "鍧婂瓙", "缁忔祹寮�鍙�", "楂樻柊鎶�鏈紑鍙�", "闈掑窞", "璇稿煄", "瀵垮厜", "婊ㄦ捣缁忔祹寮�鍙�" }); + city_districts.put("杩炰簯娓�", new String[]{"杩炰簯", "寮�鍙�", "娴峰窞", "涓滄捣", "璧f", "鐏屽崡", "鐏屼簯", "鏂版郸" }); + city_districts.put("寤跺畨", new String[]{"瀵屽幙", "娲涘窛", "榛勯櫟", "鐢樻硥", "鍏ㄥ欢瀹�", "鍚磋捣", "寤堕暱", "瀹濆", "榛勯緳", "瀹夊", "瀛愰暱", "蹇椾腹", "瀹滃窛", "寤跺窛" }); + city_districts.put("涔濇睙", new String[]{"娴旈槼", "搴愬北", "褰辰鍘�", "鏄熷瓙鍘�", "寰峰畨鍘�", "閮芥槍鍘�", "涔濇睙鍘�", "鍏遍潚鍩庡競", "淇按鍘�", "姘镐慨鍘�", "姝﹀畞鍘�", "鐟炴槍甯�", "婀栧彛鍘�", "寮�鍙�" }); + city_districts.put("涓変簹", new String[]{"闄垫按", "鍗氶硨", "涔愪笢", "鐞兼捣", "涓囧畞", "灏忎笢娴�", "浜氶緳婀�", "淇濅涵", "浜旀寚灞�", "涓変簹婀�", "娴锋婀�", "宕栧煄", "鍑ゅ嚢", "澶╂动", "鐢扮嫭", "鑲叉墠", "娌充笢", "娌宠タ", "澶т笢娴�" }); + city_districts.put("瀹滄槍", new String[]{"浜斿嘲鍦熷鏃忚嚜娌诲幙", "鐚囦涵", "鐐瑰啗", "浼嶅宀�", "瑗块櫟", "澶烽櫟", "绉綊鍘�", "瀹滈兘", "鍏村北鍘�", "杩滃畨鍘�", "涓滃北寮�鍙�", "鏋濇睙", "褰撻槼", "闀块槼鍦熷鏃忚嚜娌诲幙" }); + city_districts.put("鍏洏姘�", new String[]{"鍏ㄥ叚鐩樻按", "鐩樺幙", "鍏灊鐗�", "閽熷北", "姘村煄" }); + city_districts.put("鍚夋灄", new String[]{"鑸硅惀", "榫欐江", "涓版弧", "缁忓紑", "姘稿悏", "楂樻柊", "铔熸渤", "妗︾敻", "鑸掑叞", "纾愮煶", "鏄岄倯" }); + city_districts.put("闉嶅北", new String[]{"楂樻柊", "閾佽タ", "娴峰煄", "绔嬪北", "宀博婊℃棌鑷不鍘�", "鍗冨北", "鍙板畨", "閾佷笢" }); + city_districts.put("淇濆畾", new String[]{"婊″煄", "瀹夊浗", "鍗楀競", "娑垮窞", "楂樻柊鎶�鏈骇涓氬紑鍙�", "鏂板競", "瀹氬窞", "鍖楀競", "娓呰嫅", "楂樼搴�" }); + city_districts.put("瀹滃", new String[]{"鐝欏幙", "楂樺幙", "姹熷畨", "瀹滃", "闀垮畞", "鍗楁邯", "缈犲睆", "鍏存枃", "绛犺繛", "灞忓北", "鍏ㄥ疁瀹�" }); + city_districts.put("鑾嗙敯", new String[]{"娑垫睙", "浠欐父", "鍩庡帰", "绉�灞�", "鍏ㄨ巻鐢�", "鑽斿煄" }); + city_districts.put("瑗垮畞", new String[]{"鍩庡崡", "鍩庝笢", "鍩庤タ", "鍩庡寳", "鍩庡崡鏂�", "鍩庡寳鐢熺墿绉戞妧鍥�", "娴锋箹", "鍩庝腑" }); + city_districts.put("鑷础", new String[]{"鍏ㄨ嚜璐�", "澶у畨", "璐′簳", "鑽e幙", "鑷祦浜�", "瀵岄『", "娌挎哗" }); + city_districts.put("娣勫崥", new String[]{"娣勫窛", "鍛ㄦ潙", "楂樻柊", "娌傛簮", "妗撳彴", "涓存穭", "寮犲簵", "鍗氬北", "楂橀潚" }); + city_districts.put("鏀�鏋濊姳", new String[]{"浠佸拰", "绫虫槗", "鐩愯竟", "瑗垮尯", "涓滃尯", "鍏ㄦ攢鏋濊姳" }); + city_districts.put("琛㈠窞", new String[]{"鍖楀尯", "鍙屾腐寮�鍙�", "鍗楀尯", "瑗垮尯", "宸ㄥ寲", "鑰佸煄", "缁忔祹寮�鍙�", "鏌煄", "琛㈡睙", "姹熷北", "榫欐父", "甯稿北", "寮�鍖�" }); + city_districts.put("閭兏", new String[]{"楂樺紑", "閭卞幙", "姘稿勾", "鏇插懆", "閭兏", "鑲ヤ埂", "棣嗛櫠", "娑夊幙", "骞垮钩", "榄忓幙", "纾佸幙", "澶у悕", "涓涘彴", "閭北", "宄板嘲", "姝﹀畨", "楦℃辰", "鎴愬畨", "涓存汲", "澶嶅叴" }); + city_districts.put("鍖楁捣", new String[]{"閾舵捣", "閾佸北娓�", "娴峰煄", "鍚堟郸" }); + city_districts.put("寤婂潑", new String[]{"澶у煄", "瀹夋", "澶у巶", "姘告竻", "鍥哄畨", "闇稿窞", "棣欐渤", "鏂囧畨", "涓夋渤", "骞块槼" }); + city_districts.put("娲涢槼", new String[]{"宓╁幙", "娑цタ", "瑗垮伐", "鑰佸煄", "鐎嶆渤", "娲涢緳", "鍚夊埄", "鍋冨笀", "鏍惧窛", "瀛熸触", "浼婂窛", "瀹滈槼", "鏂板畨", "娲涘畞", "姹濋槼" }); + city_districts.put("妗傛灄", new String[]{"鍙犲僵", "璞″北", "涓冩槦", "闆佸北", "鐏靛窛", "鍏村畨", "鍏ㄥ窞", "鐏岄槼", "璧勬簮", "姘哥", "鑽旀郸", "闃虫湐", "骞充箰", "榫欒儨", "鎭煄", "绉�宄�", "瑗垮煄" }); + city_districts.put("鏍床", new String[]{"鑽峰", "鑺︽窞", "鏀稿幙", "鐭冲嘲", "鏍床", "澶╁厓", "鍏ㄦ牚娲�", "鑼堕櫟", "閱撮櫟", "鐐庨櫟" }); + city_districts.put("婀樻江", new String[]{"宀冲", "鍏ㄦ箻娼�", "婀樹埂", "婀樻江", "闆ㄦ箹", "闊跺北" }); + city_districts.put("閲嶅簡", new String[]{"閾滄", "寮�鍘�", "鍗楀窛", "娼煎崡", "閲嶅簡鍛ㄨ竟", "鍚堝窛", "姘稿窛", "姝﹂殕", "姹熸触", "闀垮", "涓囧窞", "娑櫟", "缍︽睙", "鐠у北", "涓囩洓", "娓濅腑", "姹熷寳", "娓濆寳", "鍗楀哺", "娌欏潽鍧�", "涔濋緳鍧�", "澶ф浮鍙�", "鍖楃", "宸村崡" }); + city_districts.put("缁甸槼", new String[]{"瀹夊幙", "姹熸补甯�", "骞虫鍘�", "楂樻柊", "绉戝垱鍥�", "鍐滅", "姊撴郊鍘�", "娑煄", "鍖楀窛鍘�", "鐩愪涵鍘�", "浠欐捣", "涓夊彴鍘�", "缁忓紑", "娓镐粰" }); + city_districts.put("宀抽槼", new String[]{"宀抽槼妤煎尯" }); + city_districts.put("澧炲煄", new String[]{"澧炲煄" }); + city_districts.put("鍚存睙", new String[]{"鏉鹃櫟", "鐩涙辰", "鍚岄噷", "闇囨辰", "骞虫湜", "妗冩簮", "妯墖", "涓冮兘", "榛庨噷", "婊ㄦ箹鏂板煄", "姹炬箹" }); + city_districts.put("鐟炲畨", new String[]{"纰у北", "瀹夐槼", "鏇规潙", "涓滃北", "椋炰簯", "婀栧箔", "閿︽箹", "榫欐箹", "椹笨", "娼樺脖", "骞抽槼鍧�", "涓婃湜", "濉樹笅", "闄跺北", "姹�鐢�", "浠欓檷", "鑾樺", "鐜夋捣", "鑰佸煄" }); + city_districts.put("涔愭竻", new String[]{"娓呮睙", "澶ц崋", "闆佽崱", "鍗楀", "鑺欒搲", "鍗楀渤", "钂插矏", "铏规ˉ", "缈佸灍", "璞¢槼", "浠欐邯", "涓冮噷娓�", "鍖楃櫧璞�", "娣℃邯", "鐭冲竼", "婀栭浘", "鐧界煶", "榛勫崕", "纾愮煶", "鏌冲競", "涔愭垚" }); + city_districts.put("濂夊寲", new String[]{"濂夊寲" }); + city_districts.put("娓╁箔", new String[]{"娓╁箔" }); + city_districts.put("瀹滃叴", new String[]{"鑺虫ˉ", "瀹滃煄", "鏂板缓", "鏂板簞", "涓佽渶", "婀栫埗", "瀹樻灄", "鍛ㄩ搧", "涓囩煶", "楂樺", "寮犳笟", "瑗挎笟", "寰愯垗", "鏉ㄥ贩", "鍜屾ˉ", "澶崕", "鏂拌", "鐜繚绉戞妧宸ヤ笟鍥�", "瀹滃叴缁忔祹寮�鍙戝尯", "灞轰涵" }); + city_districts.put("鑲囧簡", new String[]{"榧庢箹", "寰峰簡", "骞垮畞", "澶ф椇", "鍥涗細", "楂樿", "鎬�闆�", "灏佸紑", "绔窞" }); + city_districts.put("瀹夐槼", new String[]{"瀹夐槼鏂板尯", "寮�鍙戝尯", "瀹夐槼鍘�", "婊戝幙", "鏋楀窞", "榫欏畨", "娈烽兘", "鍖楀叧", "鏂囧嘲", "鍐呴粍", "姹ら槾" }); + city_districts.put("鏇查潠", new String[]{"椹緳", "浼氭辰", "缃楀钩", "甯堝畻", "娌剧泭", "闄嗚壇", "瀵屾簮", "瀹e▉", "楹掗簾" }); + city_districts.put("琛¢槼", new String[]{"鍗楀渤", "鐝犳櫀", "闆佸嘲", "鐭抽紦", "钂告箻", "甯稿畞", "鑰掗槼", "琛″崡", "琛¢槼鍘�", "琛″北", "琛′笢", "绁佷笢" }); + city_districts.put("鏂颁埂", new String[]{"鍗花", "绾㈡棗", "鐗ч噹", "鍑ゆ硥", "杈夊幙", "鍗緣", "鏂颁埂鍘�", "鑾峰槈", "鍘熼槼", "寤舵触", "灏佷笜", "闀垮灒" }); + city_districts.put("钀ュ彛", new String[]{"绔欏墠", "瑗垮競", "鑰佽竟", "椴呴奔鍦�", "澶х煶妗�", "鐩栧窞" }); + city_districts.put("娼窞", new String[]{"婀樻ˉ", "鏋邯", "娼畨", "楗跺钩" }); + city_districts.put("娌虫簮", new String[]{"婧愬煄", "涓滄簮", "鍜屽钩", "杩炲钩", "榫欏窛", "绱噾" }); + city_districts.put("榛勭煶", new String[]{"榛勭煶娓�", "瑗垮灞�", "涓嬮檰", "閾佸北", "澶у喍", "闃虫柊", "榛勭煶缁忔祹寮�鍙戝尯" }); + city_districts.put("鐒︿綔", new String[]{"娓╁幙", "瑙f斁", "灞遍槼", "涓珯", "椹潙", "楂樻柊", "娌侀槼", "瀛熷窞", "鍗氱埍", "姝﹂櫉", "淇" }); + city_districts.put("鎻槼", new String[]{"姒曞煄", "鎻笢", "鎯犳潵", "鎻タ", "鏅畞" }); + city_districts.put("鑼傚悕", new String[]{"鑼傛腐", "鑼傚崡", "淇″疁", "鍖栧窞", "楂樺窞", "鐢电櫧" }); + city_districts.put("鐗′腹姹�", new String[]{"涓滃畨", "瑗垮畨", "鐖辨皯", "闃虫槑", "姹熷崡", "缁ヨ姮娌�", "瀹佸畨", "娴锋灄", "绌嗘1", "鏋楀彛", "涓滃畞" }); + city_districts.put("鐩橀敠", new String[]{"澶ф醇", "鐩樺北", "鍙屽彴瀛�", "鍏撮殕鍙�" }); + city_districts.put("骞抽《灞�", new String[]{"閮忓幙", "鍙跺幙", "婀涙渤", "鐭抽緳", "鏂板崕", "鍗笢", "姹濆窞", "鑸為挗", "瀹濅赴", "椴佸北" }); + city_districts.put("闊跺叧", new String[]{"浠佸寲", "缈佹簮", "鏂颁赴", "濮嬪叴", "鍗楅泟", "涔愭槍", "娴堟睙", "姝︽睙", "鏇叉睙", "涔虫簮" }); + city_districts.put("闃虫睙", new String[]{"闃虫槬", "闃充笢", "闃宠タ", "娴烽櫟鍖�", "楂樻柊鍖�", "姹熷煄" }); + city_districts.put("姊呭窞", new String[]{"姊呮睙", "鍏村畞", "姊呭幙", "骞宠繙", "钑夊箔", "澶у煍", "涓伴『", "浜斿崕" }); } static Map city_districtRoads=new HashMap(); static{ - city_districtRoads.put("上海", new String[]{"浦东南路", "长宁支路", "浦东北路"}); + city_districtRoads.put("涓婃捣", new String[]{"娴︿笢鍗楄矾", "闀垮畞鏀矾", "娴︿笢鍖楄矾"}); } static Map city_parents=new HashMap(); static{ - city_parents.put("上海", new String[]{"上海"}); - city_parents.put("北京", new String[]{"北京"}); - city_parents.put("天津", new String[]{"天津"}); - city_parents.put("广州", new String[]{"广东", "广州"}); - city_parents.put("深圳", new String[]{"广东", "深圳"}); - city_parents.put("杭州", new String[]{"浙江", "杭州"}); - city_parents.put("南京", new String[]{"江苏", "南京"}); - city_parents.put("西安", new String[]{"陕西", "西安"}); - city_parents.put("成都", new String[]{"四川", "成都"}); - city_parents.put("武汉", new String[]{"湖北", "武汉"}); - city_parents.put("宁波", new String[]{"浙江", "宁波"}); - city_parents.put("青岛", new String[]{"山东", "青岛"}); - city_parents.put("沈阳", new String[]{"辽宁", "沈阳"}); - city_parents.put("大连", new String[]{"辽宁", "大连"}); - city_parents.put("济南", new String[]{"山东", "济南"}); - city_parents.put("福州", new String[]{"福建", "福州"}); - city_parents.put("郑州", new String[]{"河南", "郑州"}); - city_parents.put("长沙", new String[]{"湖南", "长沙"}); - city_parents.put("昆明", new String[]{"云南", "昆明"}); - city_parents.put("长春", new String[]{"吉林", "长春"}); - city_parents.put("厦门", new String[]{"福建", "厦门"}); - city_parents.put("哈尔滨", new String[]{"黑龙江", "哈尔滨"}); - city_parents.put("苏州", new String[]{"江苏", "苏州"}); - city_parents.put("无锡", new String[]{"江苏", "无锡"}); - city_parents.put("合肥", new String[]{"安徽", "合肥"}); - city_parents.put("太原", new String[]{"山西", "太原"}); - city_parents.put("石家庄", new String[]{"河北", "石家庄"}); - city_parents.put("南昌", new String[]{"江西", "南昌"}); - city_parents.put("呼和浩特", new String[]{"内蒙古", "呼和浩特"}); - city_parents.put("南宁", new String[]{"广西", "南宁"}); - city_parents.put("烟台", new String[]{"山东", "烟台"}); - city_parents.put("佛山", new String[]{"广东", "佛山"}); - city_parents.put("唐山", new String[]{"河北", "唐山"}); - city_parents.put("泉州", new String[]{"福建", "泉州"}); - city_parents.put("东莞", new String[]{"广东", "东莞"}); - city_parents.put("海口", new String[]{"海南", "海口"}); - city_parents.put("汕头", new String[]{"广东", "汕头"}); - city_parents.put("徐州", new String[]{"江苏", "徐州"}); - city_parents.put("珠海", new String[]{"广东", "珠海"}); - city_parents.put("温州", new String[]{"浙江", "温州"}); - city_parents.put("绍兴", new String[]{"浙江", "绍兴"}); - city_parents.put("常州", new String[]{"江苏", "常州"}); - city_parents.put("南通", new String[]{"江苏", "南通"}); - city_parents.put("大庆", new String[]{"黑龙江", "大庆"}); - city_parents.put("中山", new String[]{"广东", "中山"}); - city_parents.put("威海", new String[]{"山东", "威海"}); - city_parents.put("金华", new String[]{"浙江", "金华"}); - city_parents.put("嘉兴", new String[]{"浙江", "嘉兴"}); - city_parents.put("湖州", new String[]{"浙江", "湖州"}); - city_parents.put("镇江", new String[]{"江苏", "镇江"}); - city_parents.put("东营", new String[]{"山东", "东营"}); - city_parents.put("惠州", new String[]{"广东", "惠州"}); - city_parents.put("扬州", new String[]{"江苏", "扬州"}); - city_parents.put("盐城", new String[]{"江苏", "盐城"}); - city_parents.put("江门", new String[]{"广东", "江门"}); - city_parents.put("昆山", new String[]{"江苏", "苏州", "昆山"}); - city_parents.put("常熟", new String[]{"江苏", "苏州", "常熟"}); - city_parents.put("萧山", new String[]{"浙江", "杭州", "萧山"}); - city_parents.put("义乌", new String[]{"浙江", "金华", "义乌"}); - city_parents.put("余姚", new String[]{"浙江", "宁波", "余姚"}); - city_parents.put("慈溪", new String[]{"浙江", "宁波", "慈溪"}); + city_parents.put("涓婃捣", new String[]{"涓婃捣"}); + city_parents.put("鍖椾含", new String[]{"鍖椾含"}); + city_parents.put("澶╂触", new String[]{"澶╂触"}); + city_parents.put("骞垮窞", new String[]{"骞夸笢", "骞垮窞"}); + city_parents.put("娣卞湷", new String[]{"骞夸笢", "娣卞湷"}); + city_parents.put("鏉窞", new String[]{"娴欐睙", "鏉窞"}); + city_parents.put("鍗椾含", new String[]{"姹熻嫃", "鍗椾含"}); + city_parents.put("瑗垮畨", new String[]{"闄曡タ", "瑗垮畨"}); + city_parents.put("鎴愰兘", new String[]{"鍥涘窛", "鎴愰兘"}); + city_parents.put("姝︽眽", new String[]{"婀栧寳", "姝︽眽"}); + city_parents.put("瀹佹尝", new String[]{"娴欐睙", "瀹佹尝"}); + city_parents.put("闈掑矝", new String[]{"灞变笢", "闈掑矝"}); + city_parents.put("娌堥槼", new String[]{"杈藉畞", "娌堥槼"}); + city_parents.put("澶ц繛", new String[]{"杈藉畞", "澶ц繛"}); + city_parents.put("娴庡崡", new String[]{"灞变笢", "娴庡崡"}); + city_parents.put("绂忓窞", new String[]{"绂忓缓", "绂忓窞"}); + city_parents.put("閮戝窞", new String[]{"娌冲崡", "閮戝窞"}); + city_parents.put("闀挎矙", new String[]{"婀栧崡", "闀挎矙"}); + city_parents.put("鏄嗘槑", new String[]{"浜戝崡", "鏄嗘槑"}); + city_parents.put("闀挎槬", new String[]{"鍚夋灄", "闀挎槬"}); + city_parents.put("鍘﹂棬", new String[]{"绂忓缓", "鍘﹂棬"}); + city_parents.put("鍝堝皵婊�", new String[]{"榛戦緳姹�", "鍝堝皵婊�"}); + city_parents.put("鑻忓窞", new String[]{"姹熻嫃", "鑻忓窞"}); + city_parents.put("鏃犻敗", new String[]{"姹熻嫃", "鏃犻敗"}); + city_parents.put("鍚堣偉", new String[]{"瀹夊窘", "鍚堣偉"}); + city_parents.put("澶師", new String[]{"灞辫タ", "澶師"}); + city_parents.put("鐭冲搴�", new String[]{"娌冲寳", "鐭冲搴�"}); + city_parents.put("鍗楁槍", new String[]{"姹熻タ", "鍗楁槍"}); + city_parents.put("鍛煎拰娴╃壒", new String[]{"鍐呰挋鍙�", "鍛煎拰娴╃壒"}); + city_parents.put("鍗楀畞", new String[]{"骞胯タ", "鍗楀畞"}); + city_parents.put("鐑熷彴", new String[]{"灞变笢", "鐑熷彴"}); + city_parents.put("浣涘北", new String[]{"骞夸笢", "浣涘北"}); + city_parents.put("鍞愬北", new String[]{"娌冲寳", "鍞愬北"}); + city_parents.put("娉夊窞", new String[]{"绂忓缓", "娉夊窞"}); + city_parents.put("涓滆帪", new String[]{"骞夸笢", "涓滆帪"}); + city_parents.put("娴峰彛", new String[]{"娴峰崡", "娴峰彛"}); + city_parents.put("姹曞ご", new String[]{"骞夸笢", "姹曞ご"}); + city_parents.put("寰愬窞", new String[]{"姹熻嫃", "寰愬窞"}); + city_parents.put("鐝犳捣", new String[]{"骞夸笢", "鐝犳捣"}); + city_parents.put("娓╁窞", new String[]{"娴欐睙", "娓╁窞"}); + city_parents.put("缁嶅叴", new String[]{"娴欐睙", "缁嶅叴"}); + city_parents.put("甯稿窞", new String[]{"姹熻嫃", "甯稿窞"}); + city_parents.put("鍗楅��", new String[]{"姹熻嫃", "鍗楅��"}); + city_parents.put("澶у簡", new String[]{"榛戦緳姹�", "澶у簡"}); + city_parents.put("涓北", new String[]{"骞夸笢", "涓北"}); + city_parents.put("濞佹捣", new String[]{"灞变笢", "濞佹捣"}); + city_parents.put("閲戝崕", new String[]{"娴欐睙", "閲戝崕"}); + city_parents.put("鍢夊叴", new String[]{"娴欐睙", "鍢夊叴"}); + city_parents.put("婀栧窞", new String[]{"娴欐睙", "婀栧窞"}); + city_parents.put("闀囨睙", new String[]{"姹熻嫃", "闀囨睙"}); + city_parents.put("涓滆惀", new String[]{"灞变笢", "涓滆惀"}); + city_parents.put("鎯犲窞", new String[]{"骞夸笢", "鎯犲窞"}); + city_parents.put("鎵窞", new String[]{"姹熻嫃", "鎵窞"}); + city_parents.put("鐩愬煄", new String[]{"姹熻嫃", "鐩愬煄"}); + city_parents.put("姹熼棬", new String[]{"骞夸笢", "姹熼棬"}); + city_parents.put("鏄嗗北", new String[]{"姹熻嫃", "鑻忓窞", "鏄嗗北"}); + city_parents.put("甯哥啛", new String[]{"姹熻嫃", "鑻忓窞", "甯哥啛"}); + city_parents.put("钀у北", new String[]{"娴欐睙", "鏉窞", "钀у北"}); + city_parents.put("涔変箤", new String[]{"娴欐睙", "閲戝崕", "涔変箤"}); + city_parents.put("浣欏", new String[]{"娴欐睙", "瀹佹尝", "浣欏"}); + city_parents.put("鎱堟邯", new String[]{"娴欐睙", "瀹佹尝", "鎱堟邯"}); - city_parents.put("云浮", new String[]{"广东", "云浮"}); - city_parents.put("本溪", new String[]{"辽宁", "本溪"}); - city_parents.put("玉溪", new String[]{"云南", "玉溪"}); - city_parents.put("鄂尔多斯", new String[]{"内蒙古", "鄂尔多斯"}); - city_parents.put("贵阳", new String[]{"贵州", "贵阳"}); - city_parents.put("乌鲁木齐", new String[]{"新疆维吾尔", "乌鲁木齐"}); - city_parents.put("泰州", new String[]{"江苏", "泰州"}); - city_parents.put("秦皇岛", new String[]{"河北", "秦皇岛"}); - city_parents.put("台州", new String[]{"浙江", "台州"}); - city_parents.put("清远", new String[]{"广东", "清远"}); - city_parents.put("兰州", new String[]{"甘肃", "兰州"}); - city_parents.put("柳州", new String[]{"广西壮族", "柳州"}); - city_parents.put("湛江", new String[]{"广东", "湛江"}); - city_parents.put("赣州", new String[]{"江西", "赣州"}); - city_parents.put("丹东", new String[]{"辽宁", "丹东"}); - city_parents.put("咸阳", new String[]{"陕西", "咸阳"}); - city_parents.put("丽江", new String[]{"云南", "丽江"}); - city_parents.put("张家界", new String[]{"湖南", "张家界"}); - city_parents.put("银川", new String[]{"宁夏回族", "银川"}); - city_parents.put("大理", new String[]{"云南", "大理白族自治州", "大理"}); - city_parents.put("宿迁", new String[]{"江苏", "宿迁"}); - city_parents.put("芜湖", new String[]{"安徽", "芜湖"}); - city_parents.put("马鞍山", new String[]{"安徽", "马鞍山"}); - city_parents.put("玉林", new String[]{"广西壮族", "玉林"}); - city_parents.put("潍坊", new String[]{"山东", "潍坊"}); - city_parents.put("连云港", new String[]{"江苏", "连云港"}); - city_parents.put("延安", new String[]{"陕西", "延安"}); - city_parents.put("九江", new String[]{"江西", "九江"}); - city_parents.put("三亚", new String[]{"海南", "三亚"}); - city_parents.put("宜昌", new String[]{"湖北", "宜昌"}); - city_parents.put("六盘水", new String[]{"贵州", "六盘水"}); - city_parents.put("吉林", new String[]{"吉林", "吉林"}); - city_parents.put("鞍山", new String[]{"辽宁", "鞍山"}); - city_parents.put("保定", new String[]{"河北", "保定"}); - city_parents.put("宜宾", new String[]{"四川", "宜宾"}); - city_parents.put("莆田", new String[]{"福建", "莆田"}); - city_parents.put("西宁", new String[]{"青海", "西宁"}); - city_parents.put("自贡", new String[]{"四川", "自贡"}); - city_parents.put("淄博", new String[]{"山东", "淄博"}); - city_parents.put("攀枝花", new String[]{"四川", "攀枝花"}); - city_parents.put("衢州", new String[]{"浙江", "衢州"}); - city_parents.put("邯郸", new String[]{"河北", "邯郸"}); - city_parents.put("北海", new String[]{"广西壮族", "北海"}); - city_parents.put("廊坊", new String[]{"河北", "廊坊"}); - city_parents.put("洛阳", new String[]{"河南", "洛阳"}); - city_parents.put("桂林", new String[]{"广西壮族", "桂林"}); - city_parents.put("株洲", new String[]{"湖南", "株洲"}); - city_parents.put("湘潭", new String[]{"湖南", "湘潭"}); - city_parents.put("重庆", new String[]{"重庆", "重庆"}); - city_parents.put("绵阳", new String[]{"四川", "绵阳"}); - city_parents.put("岳阳", new String[]{"湖南", "岳阳"}); - city_parents.put("增城", new String[]{"广东", "广州", "增城"}); - city_parents.put("吴江", new String[]{"江苏", "苏州", "吴江"}); - city_parents.put("瑞安", new String[]{"浙江", "温州", "瑞安"}); - city_parents.put("乐清", new String[]{"浙江", "温州", "乐清"}); - city_parents.put("奉化", new String[]{"浙江", "宁波", "奉化"}); - city_parents.put("温岭", new String[]{"浙江", "台州", "温岭"}); - city_parents.put("宜兴", new String[]{"江苏", "无锡", "宜兴"}); - city_parents.put("肇庆", new String[]{"广东", "肇庆"}); - city_parents.put("安阳", new String[]{"河南", "安阳"}); - city_parents.put("曲靖", new String[]{"云南", "曲靖"}); - city_parents.put("衡阳", new String[]{"湖南", "衡阳"}); - city_parents.put("新乡", new String[]{"河南", "新乡"}); - city_parents.put("营口", new String[]{"辽宁", "营口"}); - city_parents.put("潮州", new String[]{"广东", "潮州"}); - city_parents.put("河源", new String[]{"广东", "河源"}); - city_parents.put("黄石", new String[]{"湖北", "黄石"}); - city_parents.put("焦作", new String[]{"河南", "焦作"}); - city_parents.put("揭阳", new String[]{"广东", "揭阳"}); - city_parents.put("茂名", new String[]{"广东", "茂名"}); - city_parents.put("牡丹江", new String[]{"黑龙江", "牡丹江"}); - city_parents.put("盘锦", new String[]{"辽宁", "盘锦"}); - city_parents.put("平顶山", new String[]{"河南", "平顶山"}); - city_parents.put("韶关", new String[]{"广东", "韶关"}); - city_parents.put("阳江", new String[]{"广东", "阳江"}); - city_parents.put("梅州", new String[]{"广东", "梅州"}); - city_parents.put("顺德", new String[]{"广东", "佛山"}); + city_parents.put("浜戞诞", new String[]{"骞夸笢", "浜戞诞"}); + city_parents.put("鏈邯", new String[]{"杈藉畞", "鏈邯"}); + city_parents.put("鐜夋邯", new String[]{"浜戝崡", "鐜夋邯"}); + city_parents.put("閯傚皵澶氭柉", new String[]{"鍐呰挋鍙�", "閯傚皵澶氭柉"}); + city_parents.put("璐甸槼", new String[]{"璐靛窞", "璐甸槼"}); + city_parents.put("涔岄瞾鏈ㄩ綈", new String[]{"鏂扮枂缁村惥灏�", "涔岄瞾鏈ㄩ綈"}); + city_parents.put("娉板窞", new String[]{"姹熻嫃", "娉板窞"}); + city_parents.put("绉︾殗宀�", new String[]{"娌冲寳", "绉︾殗宀�"}); + city_parents.put("鍙板窞", new String[]{"娴欐睙", "鍙板窞"}); + city_parents.put("娓呰繙", new String[]{"骞夸笢", "娓呰繙"}); + city_parents.put("鍏板窞", new String[]{"鐢樿們", "鍏板窞"}); + city_parents.put("鏌冲窞", new String[]{"骞胯タ澹棌", "鏌冲窞"}); + city_parents.put("婀涙睙", new String[]{"骞夸笢", "婀涙睙"}); + city_parents.put("璧e窞", new String[]{"姹熻タ", "璧e窞"}); + city_parents.put("涓逛笢", new String[]{"杈藉畞", "涓逛笢"}); + city_parents.put("鍜搁槼", new String[]{"闄曡タ", "鍜搁槼"}); + city_parents.put("涓芥睙", new String[]{"浜戝崡", "涓芥睙"}); + city_parents.put("寮犲鐣�", new String[]{"婀栧崡", "寮犲鐣�"}); + city_parents.put("閾跺窛", new String[]{"瀹佸鍥炴棌", "閾跺窛"}); + city_parents.put("澶х悊", new String[]{"浜戝崡", "澶х悊鐧芥棌鑷不宸�", "澶х悊"}); + city_parents.put("瀹胯縼", new String[]{"姹熻嫃", "瀹胯縼"}); + city_parents.put("鑺滄箹", new String[]{"瀹夊窘", "鑺滄箹"}); + city_parents.put("椹瀺灞�", new String[]{"瀹夊窘", "椹瀺灞�"}); + city_parents.put("鐜夋灄", new String[]{"骞胯タ澹棌", "鐜夋灄"}); + city_parents.put("娼嶅潑", new String[]{"灞变笢", "娼嶅潑"}); + city_parents.put("杩炰簯娓�", new String[]{"姹熻嫃", "杩炰簯娓�"}); + city_parents.put("寤跺畨", new String[]{"闄曡タ", "寤跺畨"}); + city_parents.put("涔濇睙", new String[]{"姹熻タ", "涔濇睙"}); + city_parents.put("涓変簹", new String[]{"娴峰崡", "涓変簹"}); + city_parents.put("瀹滄槍", new String[]{"婀栧寳", "瀹滄槍"}); + city_parents.put("鍏洏姘�", new String[]{"璐靛窞", "鍏洏姘�"}); + city_parents.put("鍚夋灄", new String[]{"鍚夋灄", "鍚夋灄"}); + city_parents.put("闉嶅北", new String[]{"杈藉畞", "闉嶅北"}); + city_parents.put("淇濆畾", new String[]{"娌冲寳", "淇濆畾"}); + city_parents.put("瀹滃", new String[]{"鍥涘窛", "瀹滃"}); + city_parents.put("鑾嗙敯", new String[]{"绂忓缓", "鑾嗙敯"}); + city_parents.put("瑗垮畞", new String[]{"闈掓捣", "瑗垮畞"}); + city_parents.put("鑷础", new String[]{"鍥涘窛", "鑷础"}); + city_parents.put("娣勫崥", new String[]{"灞变笢", "娣勫崥"}); + city_parents.put("鏀�鏋濊姳", new String[]{"鍥涘窛", "鏀�鏋濊姳"}); + city_parents.put("琛㈠窞", new String[]{"娴欐睙", "琛㈠窞"}); + city_parents.put("閭兏", new String[]{"娌冲寳", "閭兏"}); + city_parents.put("鍖楁捣", new String[]{"骞胯タ澹棌", "鍖楁捣"}); + city_parents.put("寤婂潑", new String[]{"娌冲寳", "寤婂潑"}); + city_parents.put("娲涢槼", new String[]{"娌冲崡", "娲涢槼"}); + city_parents.put("妗傛灄", new String[]{"骞胯タ澹棌", "妗傛灄"}); + city_parents.put("鏍床", new String[]{"婀栧崡", "鏍床"}); + city_parents.put("婀樻江", new String[]{"婀栧崡", "婀樻江"}); + city_parents.put("閲嶅簡", new String[]{"閲嶅簡", "閲嶅簡"}); + city_parents.put("缁甸槼", new String[]{"鍥涘窛", "缁甸槼"}); + city_parents.put("宀抽槼", new String[]{"婀栧崡", "宀抽槼"}); + city_parents.put("澧炲煄", new String[]{"骞夸笢", "骞垮窞", "澧炲煄"}); + city_parents.put("鍚存睙", new String[]{"姹熻嫃", "鑻忓窞", "鍚存睙"}); + city_parents.put("鐟炲畨", new String[]{"娴欐睙", "娓╁窞", "鐟炲畨"}); + city_parents.put("涔愭竻", new String[]{"娴欐睙", "娓╁窞", "涔愭竻"}); + city_parents.put("濂夊寲", new String[]{"娴欐睙", "瀹佹尝", "濂夊寲"}); + city_parents.put("娓╁箔", new String[]{"娴欐睙", "鍙板窞", "娓╁箔"}); + city_parents.put("瀹滃叴", new String[]{"姹熻嫃", "鏃犻敗", "瀹滃叴"}); + city_parents.put("鑲囧簡", new String[]{"骞夸笢", "鑲囧簡"}); + city_parents.put("瀹夐槼", new String[]{"娌冲崡", "瀹夐槼"}); + city_parents.put("鏇查潠", new String[]{"浜戝崡", "鏇查潠"}); + city_parents.put("琛¢槼", new String[]{"婀栧崡", "琛¢槼"}); + city_parents.put("鏂颁埂", new String[]{"娌冲崡", "鏂颁埂"}); + city_parents.put("钀ュ彛", new String[]{"杈藉畞", "钀ュ彛"}); + city_parents.put("娼窞", new String[]{"骞夸笢", "娼窞"}); + city_parents.put("娌虫簮", new String[]{"骞夸笢", "娌虫簮"}); + city_parents.put("榛勭煶", new String[]{"婀栧寳", "榛勭煶"}); + city_parents.put("鐒︿綔", new String[]{"娌冲崡", "鐒︿綔"}); + city_parents.put("鎻槼", new String[]{"骞夸笢", "鎻槼"}); + city_parents.put("鑼傚悕", new String[]{"骞夸笢", "鑼傚悕"}); + city_parents.put("鐗′腹姹�", new String[]{"榛戦緳姹�", "鐗′腹姹�"}); + city_parents.put("鐩橀敠", new String[]{"杈藉畞", "鐩橀敠"}); + city_parents.put("骞抽《灞�", new String[]{"娌冲崡", "骞抽《灞�"}); + city_parents.put("闊跺叧", new String[]{"骞夸笢", "闊跺叧"}); + city_parents.put("闃虫睙", new String[]{"骞夸笢", "闃虫睙"}); + city_parents.put("姊呭窞", new String[]{"骞夸笢", "姊呭窞"}); + city_parents.put("椤哄痉", new String[]{"骞夸笢", "浣涘北"}); } static Map province_citys=new HashMap(); @@ -320,4838 +320,4838 @@ public static String[] provinces=new String[]{ " static Map> city_DistrictNames=new HashMap>(); static{ - city_DistrictNames.put("重庆", new ArrayList(){{ - add(new String[]{"重庆森林公寓", "重庆"}); - add(new String[]{"重庆天地雍江艺庭", "重庆"}); - add(new String[]{"重庆大学B区集资楼", "重庆"}); - add(new String[]{"重庆喜来登国际中心", "重庆"}); - add(new String[]{"重庆森林", "重庆"}); - add(new String[]{"重庆村", "重庆"}); - add(new String[]{"重庆师范大学师大园", "重庆"}); - add(new String[]{"重庆宾馆商务大厦", "重庆"}); - add(new String[]{"重庆出版社小区", "重庆"}); - add(new String[]{"重庆戴斯大酒店", "重庆"}); - add(new String[]{"重庆上海中心", "重庆"}); - add(new String[]{"重庆天地雍江翠璟", "重庆"}); - add(new String[]{"重庆天地雍江悦庭", "重庆"}); - add(new String[]{"重庆大学A区松林村", "重庆"}); - add(new String[]{"重庆桃源居国际花园一区", "重庆"}); - add(new String[]{"重庆世界之窗", "重庆"}); - add(new String[]{"重庆公馆", "重庆"}); - add(new String[]{"重庆公寓", "上海"}); - add(new String[]{"重庆大楼", "上海"}); - add(new String[]{"重庆国际家纺城绣色", "重庆"}); - add(new String[]{"重庆万豪国际金融中心", "重庆"}); - add(new String[]{"重庆天地雍江御庭", "重庆"}); - add(new String[]{"重庆广告产业园", "重庆"}); - add(new String[]{"重庆总部城", "重庆"}); - add(new String[]{"重庆棕榈泉国际花园", "重庆"}); - }}); - city_DistrictNames.put("重庆", new ArrayList(){{ - add(new String[]{"重庆森林公寓", "重庆"}); - add(new String[]{"重庆天地雍江艺庭", "重庆"}); - add(new String[]{"重庆大学B区集资楼", "重庆"}); - add(new String[]{"重庆喜来登国际中心", "重庆"}); - add(new String[]{"重庆森林", "重庆"}); - add(new String[]{"重庆村", "重庆"}); - add(new String[]{"重庆师范大学师大园", "重庆"}); - add(new String[]{"重庆宾馆商务大厦", "重庆"}); - add(new String[]{"重庆出版社小区", "重庆"}); - add(new String[]{"重庆戴斯大酒店", "重庆"}); - add(new String[]{"重庆上海中心", "重庆"}); - add(new String[]{"重庆天地雍江翠璟", "重庆"}); - add(new String[]{"重庆天地雍江悦庭", "重庆"}); - add(new String[]{"重庆大学A区松林村", "重庆"}); - add(new String[]{"重庆桃源居国际花园一区", "重庆"}); - add(new String[]{"重庆世界之窗", "重庆"}); - add(new String[]{"重庆公馆", "重庆"}); - add(new String[]{"重庆公寓", "上海"}); - add(new String[]{"重庆大楼", "上海"}); - add(new String[]{"重庆国际家纺城绣色", "重庆"}); - add(new String[]{"重庆万豪国际金融中心", "重庆"}); - add(new String[]{"重庆天地雍江御庭", "重庆"}); - add(new String[]{"重庆广告产业园", "重庆"}); - add(new String[]{"重庆总部城", "重庆"}); - add(new String[]{"重庆棕榈泉国际花园", "重庆"}); - }}); - city_DistrictNames.put("河北", new ArrayList(){{ - add(new String[]{"河北税务学校生活区", "石家庄"}); - add(new String[]{"河北经济日报社宿舍", "石家庄"}); - add(new String[]{"河北美术出版社宿舍", "石家庄"}); - add(new String[]{"河北物资宿舍", "石家庄"}); - add(new String[]{"河北化工医药职业技术学院宿舍", "石家庄"}); - add(new String[]{"河北电机宿舍", "石家庄"}); - add(new String[]{"河北日报社宿舍", "石家庄"}); - add(new String[]{"河北工程造价管理总站宿舍", "石家庄"}); - add(new String[]{"河北康城", "潍坊"}); - add(new String[]{"河北社区", "沈阳"}); - add(new String[]{"河北医科大学宿舍", "石家庄"}); - add(new String[]{"河北省人大宿舍", "石家庄"}); - add(new String[]{"河北新人家", "唐山"}); - add(new String[]{"河北一号", "唐山"}); - add(new String[]{"河北机要局宿舍", "石家庄"}); - add(new String[]{"河北广播电视报宿舍", "石家庄"}); - add(new String[]{"河北商城", "青岛"}); - add(new String[]{"河北长城饭店", "石家庄"}); - add(new String[]{"河北村小区", "北京"}); - add(new String[]{"河北桃江里", "天津"}); - add(new String[]{"河北师大青年公寓楼", "石家庄"}); - add(new String[]{"河北绛", "无锡"}); - add(new String[]{"河北社区", "本溪"}); - add(new String[]{"河北楼", "唐山"}); - }}); - city_DistrictNames.put("唐山", new ArrayList(){{ - add(new String[]{"唐山第三空间综合体", "唐山"}); - add(new String[]{"唐山万达广场", "唐山"}); - add(new String[]{"唐山里", "天津"}); - add(new String[]{"唐山市供电公司古冶分公司住宅楼11号楼12号楼", "唐山"}); - add(new String[]{"唐山国际五金商城", "唐山"}); - add(new String[]{"唐山新苑", "上海"}); - add(new String[]{"唐山义乌小商品城", "唐山"}); - }}); - city_DistrictNames.put("湖南", new ArrayList(){{ - add(new String[]{"湖南大厦", "海口"}); - add(new String[]{"湖南师大张公岭校区宿舍", "长沙"}); - add(new String[]{"湖南省进出口公司宿舍", "长沙"}); - add(new String[]{"湖南广电宿舍", "长沙"}); - add(new String[]{"湖南机床厂宿舍", "长沙"}); - add(new String[]{"湖南制药厂宿舍", "长沙"}); - add(new String[]{"湖南供销大厦", "长沙"}); - add(new String[]{"湖南化工医药设计院宿舍", "长沙"}); - add(new String[]{"湖南工商银行宿舍机关大院", "长沙"}); - add(new String[]{"湖南省国防科公办机关院内宿舍", "长沙"}); - add(new String[]{"湖南报业文化城", "长沙"}); - add(new String[]{"湖南省交通设计院", "长沙"}); - add(new String[]{"湖南联通住宅小区", "长沙"}); - add(new String[]{"湖南电视台单位宿舍", "长沙"}); - add(new String[]{"湖南开关厂宿舍", "长沙"}); - add(new String[]{"湖南小区", "北京"}); - add(new String[]{"湖南邮电新村小区", "鞍山"}); - add(new String[]{"湖南省科学技术厅宿舍", "长沙"}); - add(new String[]{"湖南省国安厅单位房", "长沙"}); - add(new String[]{"湖南省木偶剧团宿舍", "长沙"}); - add(new String[]{"湖南省气象局宿舍", "长沙"}); - add(new String[]{"湖南女子大学教师公寓", "长沙"}); - add(new String[]{"湖南省农业机械研究所", "长沙"}); - add(new String[]{"湖南教育装备综合大楼", "长沙"}); - add(new String[]{"湖南省劳动卫生所", "长沙"}); - add(new String[]{"湖南省质量技术监督局宿舍", "长沙"}); - add(new String[]{"湖南省金属回收公司宿舍", "长沙"}); - add(new String[]{"湖南省塑料研究所", "长沙"}); - add(new String[]{"湖南省高级人民检查院单位房", "长沙"}); - add(new String[]{"湖南交通职院宿舍", "长沙"}); - add(new String[]{"湖南省冶金材料研究所", "长沙"}); - add(new String[]{"湖南金蜂音像出版社", "长沙"}); - add(new String[]{"湖南省物资厅宿舍", "长沙"}); - add(new String[]{"湖南家电商城", "长沙"}); - add(new String[]{"湖南国际商务中心", "长沙"}); - add(new String[]{"湖南财富中心", "长沙"}); - add(new String[]{"湖南国际汽车城", "长沙"}); - add(new String[]{"湖南亚大数码港", "长沙"}); - add(new String[]{"湖南大厦", "南宁"}); - add(new String[]{"湖南大厦", "上海"}); - add(new String[]{"湖南星沙汽配城", "长沙"}); - add(new String[]{"湖南艺校单位房", "长沙"}); - add(new String[]{"湖南财专教职工宿舍", "长沙"}); - add(new String[]{"湖南省机械进出口公司宿舍", "长沙"}); - add(new String[]{"湖南日报单位宿舍", "长沙"}); - add(new String[]{"湖南岸后畈小区", "绍兴"}); - }}); - city_DistrictNames.put("张家界", new ArrayList(){{ - add(new String[]{"张家界天门一号", "张家界"}); - }}); - city_DistrictNames.put("内蒙古", new ArrayList(){{ - add(new String[]{"内蒙古电大小区", "呼和浩特"}); - add(new String[]{"内蒙古日报社安全文明小区", "呼和浩特"}); - add(new String[]{"内蒙古政府住宅小区", "呼和浩特"}); - add(new String[]{"内蒙古自治区国税局住宅区", "呼和浩特"}); - add(new String[]{"内蒙古政协住宅小区", "呼和浩特"}); - add(new String[]{"内蒙古经贸学院家属院", "呼和浩特"}); - add(new String[]{"内蒙古党校南苑小区", "呼和浩特"}); - add(new String[]{"内蒙古医院家属楼", "呼和浩特"}); - add(new String[]{"内蒙古国际商贸城", "呼和浩特"}); - }}); - city_DistrictNames.put("呼和浩特", new ArrayList(){{ - }}); - city_DistrictNames.put("甘肃", new ArrayList(){{ - add(new String[]{"甘肃联合大学家属院", "兰州"}); - add(new String[]{"甘肃省青少年科技活动中心家属院", "兰州"}); - add(new String[]{"甘肃省新闻出版局家属院", "兰州"}); - add(new String[]{"甘肃省邮电建设公司家属院", "兰州"}); - add(new String[]{"甘肃省审计局家属院", "兰州"}); - add(new String[]{"甘肃省体育局家属院", "兰州"}); - add(new String[]{"甘肃省种子公司家属院", "兰州"}); - add(new String[]{"甘肃农业职业技术学院家属院", "兰州"}); - add(new String[]{"甘肃省广电总局家属院", "兰州"}); - add(new String[]{"甘肃中医院", "兰州"}); - add(new String[]{"甘肃省建筑设计研究所家属院", "兰州"}); - add(new String[]{"甘肃省政府家属院(旧大路)", "兰州"}); - add(new String[]{"甘肃省供销社家属院", "兰州"}); - add(new String[]{"甘肃省人事厅家属院", "兰州"}); - add(new String[]{"甘肃会展中心建筑群", "兰州"}); - add(new String[]{"甘肃第一建设集团公司小区", "兰州"}); - add(new String[]{"甘肃省旅游局家属院", "兰州"}); - add(new String[]{"甘肃化工机械厂家属院", "兰州"}); - add(new String[]{"甘肃人防大厦", "兰州"}); - add(new String[]{"甘肃省地矿局高层住宅", "兰州"}); - add(new String[]{"甘肃电视台家属院", "兰州"}); - add(new String[]{"甘肃省疾控中心家属院", "兰州"}); - add(new String[]{"甘肃职工大厦", "兰州"}); - add(new String[]{"甘肃省电子公司家属院", "兰州"}); - }}); - city_DistrictNames.put("兰州", new ArrayList(){{ - add(new String[]{"兰州一中家属院", "兰州"}); - add(new String[]{"兰州军区颜家沟物业小区", "兰州"}); - add(new String[]{"兰州市粮食局家属院(永昌路)", "兰州"}); - add(new String[]{"兰州市政公司家属院", "兰州"}); - add(new String[]{"兰州军区副食品基地", "兰州"}); - add(new String[]{"兰州减速机厂家属院", "兰州"}); - add(new String[]{"兰州军区家属院", "兰州"}); - add(new String[]{"兰州公交万众住宅小区", "兰州"}); - add(new String[]{"兰州钢厂家属院", "兰州"}); - add(new String[]{"兰州市女子职业技术学校家属楼", "兰州"}); - add(new String[]{"兰州市印刷厂家属院", "兰州"}); - add(new String[]{"兰州晟佳公司家属院南一门", "兰州"}); - add(new String[]{"兰州建筑段家属院", "兰州"}); - add(new String[]{"兰州炼油总厂家属院", "兰州"}); - add(new String[]{"兰州国资物业第二家园", "兰州"}); - add(new String[]{"兰州雁滩市公安局家属院", "兰州"}); - add(new String[]{"兰州高新开发区大学科技园", "兰州"}); - add(new String[]{"兰州银行科技支行家属院", "兰州"}); - add(new String[]{"兰州市城管区何家庄财政家属院", "兰州"}); - add(new String[]{"兰州市七里河区林家庄铁路小区", "兰州"}); - add(new String[]{"兰州市火车站乘警大队家属院", "兰州"}); - add(new String[]{"兰州新村", "上海"}); - add(new String[]{"兰州市国税局家属院", "兰州"}); - add(new String[]{"兰州剧院家属院", "兰州"}); - add(new String[]{"兰州电子工业学校家属院", "兰州"}); - add(new String[]{"兰州市人大家属院", "兰州"}); - add(new String[]{"兰州军区副食品基地家属院", "兰州"}); - add(new String[]{"兰州市教育局家属院", "兰州"}); - }}); - city_DistrictNames.put("山东", new ArrayList(){{ - add(new String[]{"山东里", "秦皇岛"}); - add(new String[]{"山东经济学院宿舍", "济南"}); - add(new String[]{"山东省卫生厅宿舍", "济南"}); - add(new String[]{"山东省民政厅宿舍", "济南"}); - add(new String[]{"山东省商业集团总公司宿舍", "济南"}); - add(new String[]{"山东医科大学教师宿舍", "济南"}); - add(new String[]{"山东外贸大厦", "青岛"}); - add(new String[]{"山东大厦", "深圳"}); - add(new String[]{"山东堡社区", "沈阳"}); - add(new String[]{"山东艺术学院宿舍", "济南"}); - add(new String[]{"山东黄金崮云湖高尔夫别墅", "济南"}); - add(new String[]{"山东司法警官学院宿舍", "济南"}); - add(new String[]{"山东省科学院高新技术研究分院", "青岛"}); - add(new String[]{"山东建工学院宿舍", "济南"}); - add(new String[]{"山东庙小区", "沈阳"}); - add(new String[]{"山东乳山银滩海景房", "威海"}); - add(new String[]{"山东头村", "青岛"}); - add(new String[]{"山东省畜牧局宿舍", "济南"}); - }}); - city_DistrictNames.put("青岛", new ArrayList(){{ - add(new String[]{"青岛嘉园", "北京"}); - add(new String[]{"青岛天山华庭", "青岛"}); - add(new String[]{"青岛太平洋中心", "青岛"}); - add(new String[]{"青岛裕龙大厦", "青岛"}); - add(new String[]{"青岛通信花园", "青岛"}); - add(new String[]{"青岛维多利亚广场", "青岛"}); - add(new String[]{"青岛山花园", "青岛"}); - add(new String[]{"青岛启阳国际", "青岛"}); - add(new String[]{"青岛世界贸易中心", "青岛"}); - add(new String[]{"青岛正商红河谷", "青岛"}); - add(new String[]{"青岛花园二期 (顺安馨城)", "连云港"}); - add(new String[]{"青岛家园A区", "乌鲁木齐"}); - add(new String[]{"青岛花苑", "乌鲁木齐"}); - add(new String[]{"青岛家园B区", "乌鲁木齐"}); - add(new String[]{"青岛花园一期", "连云港"}); - add(new String[]{"青岛阳光嘉园", "青岛"}); - add(new String[]{"青岛御景峰", "青岛"}); - add(new String[]{"青岛东方美景", "青岛"}); - add(new String[]{"青岛阳光馨苑", "青岛"}); - add(new String[]{"青岛公馆", "青岛"}); - add(new String[]{"青岛公寓", "洛阳"}); - add(new String[]{"青岛盐业小区", "青岛"}); - add(new String[]{"青岛山公寓", "青岛"}); - add(new String[]{"青岛景苑", "潍坊"}); - add(new String[]{"青岛台湾创新工业园", "青岛"}); - add(new String[]{"青岛印象山", "青岛"}); - add(new String[]{"青岛宝门公寓", "青岛"}); - add(new String[]{"青岛数码科技中心", "青岛"}); - add(new String[]{"青岛龙湖原山", "青岛"}); - add(new String[]{"青岛印象金沙滩", "青岛"}); - add(new String[]{"青岛万德丰观景苑", "青岛"}); - add(new String[]{"青岛鲁中家居城", "青岛"}); - add(new String[]{"青岛红树林度假世界", "青岛"}); - add(new String[]{"青岛凤凰城", "青岛"}); - add(new String[]{"青岛海上嘉年华", "青岛"}); - add(new String[]{"青岛开发区国际贸易中心", "青岛"}); - add(new String[]{"青岛珠山天鹅湖生态旅游度假区", "青岛"}); - }}); - city_DistrictNames.put("江西", new ArrayList(){{ - add(new String[]{"江西省建工集团", "南昌"}); - add(new String[]{"江西财经大学邮政宿舍", "南昌"}); - add(new String[]{"江西省图书馆宿舍", "南昌"}); - add(new String[]{"江西宾馆旁边", "南昌"}); - add(new String[]{"江西行政学院宿舍", "南昌"}); - add(new String[]{"江西财经大学宿舍", "南昌"}); - add(new String[]{"江西科技师范学院宿舍", "南昌"}); - add(new String[]{"江西省广播电台宿舍", "南昌"}); - add(new String[]{"江西东华计量研究所宿舍", "南昌"}); - add(new String[]{"江西客车厂宿舍", "南昌"}); - add(new String[]{"江西仪器厂宿舍", "南昌"}); - add(new String[]{"江西昌东汽车交易广场", "南昌"}); - add(new String[]{"江西旧货大世界", "南昌"}); - add(new String[]{"江西日报宿舍", "南昌"}); - }}); - city_DistrictNames.put("南昌", new ArrayList(){{ - add(new String[]{"南昌大桥管理处宿舍", "南昌"}); - add(new String[]{"南昌公交总公司宿舍", "南昌"}); - add(new String[]{"南昌市经济大楼", "南昌"}); - add(new String[]{"南昌居住主题公园别墅", "南昌"}); - add(new String[]{"南昌市委党校宿舍", "南昌"}); - add(new String[]{"南昌市建设路", "南昌"}); - add(new String[]{"南昌县公安局宿舍", "南昌"}); - add(new String[]{"南昌三十中宿舍", "南昌"}); - add(new String[]{"南昌博泰生态商务园", "南昌"}); - add(new String[]{"南昌衡机厂宿舍", "南昌"}); - add(new String[]{"南昌居住主题公园", "南昌"}); - add(new String[]{"南昌花苑", "上海"}); - add(new String[]{"南昌中央香榭", "南昌"}); - }}); - city_DistrictNames.put("江苏", new ArrayList(){{ - add(new String[]{"江苏省农科院", "南京"}); - add(new String[]{"江苏油田石油山庄", "扬州"}); - add(new String[]{"江苏警官学院", "南京"}); - add(new String[]{"江苏省高级专家园", "南京"}); - add(new String[]{"江苏油田石油山庄", "扬州"}); - add(new String[]{"江苏议事园", "南京"}); - add(new String[]{"江苏国际塑化城", "常州"}); - add(new String[]{"江苏万和国际商贸城", "常州"}); - }}); - city_DistrictNames.put("连云港", new ArrayList(){{ - add(new String[]{"连云港光伸", "连云港"}); - }}); - city_DistrictNames.put("山东", new ArrayList(){{ - add(new String[]{"山东里", "秦皇岛"}); - add(new String[]{"山东经济学院宿舍", "济南"}); - add(new String[]{"山东省卫生厅宿舍", "济南"}); - add(new String[]{"山东省民政厅宿舍", "济南"}); - add(new String[]{"山东省商业集团总公司宿舍", "济南"}); - add(new String[]{"山东医科大学教师宿舍", "济南"}); - add(new String[]{"山东外贸大厦", "青岛"}); - add(new String[]{"山东大厦", "深圳"}); - add(new String[]{"山东堡社区", "沈阳"}); - add(new String[]{"山东艺术学院宿舍", "济南"}); - add(new String[]{"山东黄金崮云湖高尔夫别墅", "济南"}); - add(new String[]{"山东司法警官学院宿舍", "济南"}); - add(new String[]{"山东省科学院高新技术研究分院", "青岛"}); - add(new String[]{"山东建工学院宿舍", "济南"}); - add(new String[]{"山东庙小区", "沈阳"}); - add(new String[]{"山东乳山银滩海景房", "威海"}); - add(new String[]{"山东头村", "青岛"}); - add(new String[]{"山东省畜牧局宿舍", "济南"}); - }}); - city_DistrictNames.put("淄博", new ArrayList(){{ - add(new String[]{"淄博奥林匹克花园", "淄博"}); - }}); - city_DistrictNames.put("广东", new ArrayList(){{ - add(new String[]{"广东外贸广场", "广州"}); - add(new String[]{"广东外语艺术学院教师宿舍", "广州"}); - add(new String[]{"广东建科院宿舍", "广州"}); - add(new String[]{"广东司法警官职业学院宿舍", "广州"}); - add(new String[]{"广东环保大厦", "广州"}); - add(new String[]{"广东商业大厦", "广州"}); - add(new String[]{"广东医学院教师宿舍楼", "东莞"}); - add(new String[]{"广东国际大厦", "广州"}); - add(new String[]{"广东省技术监督局宿舍", "广州"}); - add(new String[]{"广东工业大学宿舍", "广州"}); - add(new String[]{"广东教育学院宿舍", "广州"}); - add(new String[]{"广东省银行大厦", "深圳"}); - add(new String[]{"广东大厦", "天津"}); - add(new String[]{"广东山庄", "镇江"}); - add(new String[]{"广东红盾大厦", "广州"}); - add(new String[]{"广东药学院宿舍", "广州"}); - add(new String[]{"广东青年干部学院宿舍", "广州"}); - add(new String[]{"广东基础楼", "深圳"}); - add(new String[]{"广东省科技干部学院宿舍", "广州"}); - add(new String[]{"广东省农业管理干部学院社区", "广州"}); - add(new String[]{"广东芭蕾雨·逸景", "佛山"}); - }}); - city_DistrictNames.put("肇庆", new ArrayList(){{ - add(new String[]{"肇庆碧桂园", "肇庆"}); - add(new String[]{"肇庆蓝领公寓", "肇庆"}); - add(new String[]{"肇庆·景德尚都", "肇庆"}); - add(new String[]{"肇庆碧桂园·山湖城", "肇庆"}); - }}); - city_DistrictNames.put("江苏", new ArrayList(){{ - add(new String[]{"江苏省农科院", "南京"}); - add(new String[]{"江苏油田石油山庄", "扬州"}); - add(new String[]{"江苏警官学院", "南京"}); - add(new String[]{"江苏省高级专家园", "南京"}); - add(new String[]{"江苏油田石油山庄", "扬州"}); - add(new String[]{"江苏议事园", "南京"}); - add(new String[]{"江苏国际塑化城", "常州"}); - add(new String[]{"江苏万和国际商贸城", "常州"}); - }}); - city_DistrictNames.put("徐州", new ArrayList(){{ - add(new String[]{"徐州人家", "徐州"}); - add(new String[]{"徐州金达小区", "徐州"}); - add(new String[]{"徐州礼品城", "徐州"}); - add(new String[]{"徐州里", "天津"}); - }}); - city_DistrictNames.put("新疆维吾尔", new ArrayList(){{ - add(new String[]{"新疆维吾尔医院家属院", "乌鲁木齐"}); - }}); - city_DistrictNames.put("乌鲁木齐", new ArrayList(){{ - add(new String[]{"乌鲁木齐卫生防疫站家属院", "乌鲁木齐"}); - add(new String[]{"乌鲁木齐仓房沟农工商贸公司", "乌鲁木齐"}); - add(new String[]{"乌鲁木齐排水管理处住宅", "乌鲁木齐"}); - add(new String[]{"乌鲁木齐市第一人民医院家属院", "乌鲁木齐"}); - add(new String[]{"乌鲁木齐成人教育家属院", "乌鲁木齐"}); - add(new String[]{"乌鲁木齐卫生局家属院", "乌鲁木齐"}); - add(new String[]{"乌鲁木齐市文物局家属院", "乌鲁木齐"}); - add(new String[]{"乌鲁木齐第一干休所", "乌鲁木齐"}); - }}); - city_DistrictNames.put("湖南", new ArrayList(){{ - add(new String[]{"湖南大厦", "海口"}); - add(new String[]{"湖南师大张公岭校区宿舍", "长沙"}); - add(new String[]{"湖南省进出口公司宿舍", "长沙"}); - add(new String[]{"湖南广电宿舍", "长沙"}); - add(new String[]{"湖南机床厂宿舍", "长沙"}); - add(new String[]{"湖南制药厂宿舍", "长沙"}); - add(new String[]{"湖南供销大厦", "长沙"}); - add(new String[]{"湖南化工医药设计院宿舍", "长沙"}); - add(new String[]{"湖南工商银行宿舍机关大院", "长沙"}); - add(new String[]{"湖南省国防科公办机关院内宿舍", "长沙"}); - add(new String[]{"湖南报业文化城", "长沙"}); - add(new String[]{"湖南省交通设计院", "长沙"}); - add(new String[]{"湖南联通住宅小区", "长沙"}); - add(new String[]{"湖南电视台单位宿舍", "长沙"}); - add(new String[]{"湖南开关厂宿舍", "长沙"}); - add(new String[]{"湖南小区", "北京"}); - add(new String[]{"湖南邮电新村小区", "鞍山"}); - add(new String[]{"湖南省科学技术厅宿舍", "长沙"}); - add(new String[]{"湖南省国安厅单位房", "长沙"}); - add(new String[]{"湖南省木偶剧团宿舍", "长沙"}); - add(new String[]{"湖南省气象局宿舍", "长沙"}); - add(new String[]{"湖南女子大学教师公寓", "长沙"}); - add(new String[]{"湖南省农业机械研究所", "长沙"}); - add(new String[]{"湖南教育装备综合大楼", "长沙"}); - add(new String[]{"湖南省劳动卫生所", "长沙"}); - add(new String[]{"湖南省质量技术监督局宿舍", "长沙"}); - add(new String[]{"湖南省金属回收公司宿舍", "长沙"}); - add(new String[]{"湖南省塑料研究所", "长沙"}); - add(new String[]{"湖南省高级人民检查院单位房", "长沙"}); - add(new String[]{"湖南交通职院宿舍", "长沙"}); - add(new String[]{"湖南省冶金材料研究所", "长沙"}); - add(new String[]{"湖南金蜂音像出版社", "长沙"}); - add(new String[]{"湖南省物资厅宿舍", "长沙"}); - add(new String[]{"湖南家电商城", "长沙"}); - add(new String[]{"湖南国际商务中心", "长沙"}); - add(new String[]{"湖南财富中心", "长沙"}); - add(new String[]{"湖南国际汽车城", "长沙"}); - add(new String[]{"湖南亚大数码港", "长沙"}); - add(new String[]{"湖南大厦", "南宁"}); - add(new String[]{"湖南大厦", "上海"}); - add(new String[]{"湖南星沙汽配城", "长沙"}); - add(new String[]{"湖南艺校单位房", "长沙"}); - add(new String[]{"湖南财专教职工宿舍", "长沙"}); - add(new String[]{"湖南省机械进出口公司宿舍", "长沙"}); - add(new String[]{"湖南日报单位宿舍", "长沙"}); - add(new String[]{"湖南岸后畈小区", "绍兴"}); - }}); - city_DistrictNames.put("株洲", new ArrayList(){{ - }}); - city_DistrictNames.put("江苏", new ArrayList(){{ - add(new String[]{"江苏省农科院", "南京"}); - add(new String[]{"江苏油田石油山庄", "扬州"}); - add(new String[]{"江苏警官学院", "南京"}); - add(new String[]{"江苏省高级专家园", "南京"}); - add(new String[]{"江苏油田石油山庄", "扬州"}); - add(new String[]{"江苏议事园", "南京"}); - add(new String[]{"江苏国际塑化城", "常州"}); - add(new String[]{"江苏万和国际商贸城", "常州"}); - }}); - city_DistrictNames.put("扬州", new ArrayList(){{ - add(new String[]{"扬州水乡", "北京"}); - add(new String[]{"扬州花园", "泰州"}); - add(new String[]{"扬州念香苑", "扬州"}); - add(new String[]{"扬州天下别墅", "扬州"}); - add(new String[]{"扬州念香苑", "扬州"}); - add(new String[]{"扬州市教工宿舍", "扬州"}); - add(new String[]{"扬州师范学院宿舍", "扬州"}); - add(new String[]{"扬州京剧团宿舍", "扬州"}); - add(new String[]{"扬州大世界国际广场", "扬州"}); - add(new String[]{"扬州印象花园", "扬州"}); - add(new String[]{"扬州里", "天津"}); - add(new String[]{"扬州花园", "泰州"}); - add(new String[]{"扬州印象花园", "扬州"}); - add(new String[]{"扬州画舫", "扬州"}); - add(new String[]{"扬州工学院宿舍", "扬州"}); - add(new String[]{"扬州天下花园", "扬州"}); - add(new String[]{"扬州天下别墅", "扬州"}); - add(new String[]{"扬州水乡别墅", "北京"}); - add(new String[]{"扬州天下花园", "扬州"}); - add(new String[]{"扬州城", "丹东"}); - add(new String[]{"扬州高力汽车汽配城", "扬州"}); - add(new String[]{"扬州人家", "扬州"}); - add(new String[]{"扬州市双子星国际广场", "扬州"}); - }}); - city_DistrictNames.put("广西壮族", new ArrayList(){{ - add(new String[]{"广西壮族自治区司法厅宿舍", "南宁"}); - add(new String[]{"广西壮族自治区农业厅宿舍", "南宁"}); - }}); - city_DistrictNames.put("柳州", new ArrayList(){{ - add(new String[]{"柳州·温州商贸城", "柳州"}); - }}); - city_DistrictNames.put("宁夏回族", new ArrayList(){{ - }}); - city_DistrictNames.put("银川", new ArrayList(){{ - add(new String[]{"银川美居", "青岛"}); - add(new String[]{"银川国际贸易中心", "银川"}); - add(new String[]{"银川山苑", "青岛"}); - add(new String[]{"银川小区", "沈阳"}); - }}); - city_DistrictNames.put("浙江", new ArrayList(){{ - add(new String[]{"浙江工业大学教师宿舍", "杭州"}); - add(new String[]{"浙江大厦", "太原"}); - add(new String[]{"浙江办事处宿舍", "太原"}); - add(new String[]{"浙江仁和居老年养生公寓", "湖州"}); - add(new String[]{"浙江交运大厦", "杭州"}); - add(new String[]{"浙江工商大学宿舍", "杭州"}); - add(new String[]{"浙江商贸城", "合肥"}); - add(new String[]{"浙江工业大学之江学院", "杭州"}); - }}); - city_DistrictNames.put("温州", new ArrayList(){{ - add(new String[]{"温州大厦", "海口"}); - add(new String[]{"温州城", "贵阳"}); - add(new String[]{"温州公寓", "贵阳"}); - add(new String[]{"温州商城", "湖州"}); - add(new String[]{"温州商城", "唐山"}); - add(new String[]{"温州世贸中心大厦", "温州"}); - add(new String[]{"温州世贸中心广场", "温州"}); - add(new String[]{"温州人才大厦", "温州"}); - add(new String[]{"温州龙湾万达广场", "温州"}); - add(new String[]{"温州城·都乐汇", "沈阳"}); - add(new String[]{"温州商城", "金华"}); - }}); - city_DistrictNames.put("辽宁", new ArrayList(){{ - add(new String[]{"辽宁中医家属楼", "沈阳"}); - add(new String[]{"辽宁里", "天津"}); - }}); - city_DistrictNames.put("大连", new ArrayList(){{ - add(new String[]{"大连万科天麓", "大连"}); - add(new String[]{"大连门小区", "大连"}); - add(new String[]{"大连门广场", "大连"}); - add(new String[]{"大连明珠", "大连"}); - add(new String[]{"大连中心裕景", "大连"}); - add(new String[]{"大连新村", "上海"}); - add(new String[]{"大连小区", "上海"}); - add(new String[]{"大连天地悦翠台", "大连"}); - add(new String[]{"大连安波国际温泉新城", "大连"}); - add(new String[]{"大连金州区福佳新天地", "丹东"}); - }}); - city_DistrictNames.put("浙江", new ArrayList(){{ - add(new String[]{"浙江工业大学教师宿舍", "杭州"}); - add(new String[]{"浙江大厦", "太原"}); - add(new String[]{"浙江办事处宿舍", "太原"}); - add(new String[]{"浙江仁和居老年养生公寓", "湖州"}); - add(new String[]{"浙江交运大厦", "杭州"}); - add(new String[]{"浙江工商大学宿舍", "杭州"}); - add(new String[]{"浙江商贸城", "合肥"}); - add(new String[]{"浙江工业大学之江学院", "杭州"}); - }}); - city_DistrictNames.put("宁波", new ArrayList(){{ - add(new String[]{"宁波里", "天津"}); - add(new String[]{"宁波里", "武汉"}); - add(new String[]{"宁波商会大厦", "宁波"}); - add(new String[]{"宁波外代大厦", "宁波"}); - add(new String[]{"宁波小区", "上海"}); - }}); - city_DistrictNames.put("辽宁", new ArrayList(){{ - add(new String[]{"辽宁中医家属楼", "沈阳"}); - add(new String[]{"辽宁里", "天津"}); - }}); - city_DistrictNames.put("本溪", new ArrayList(){{ - add(new String[]{"本溪楼", "天津"}); - add(new String[]{"本溪花园", "天津"}); - add(new String[]{"本溪西芬城建", "本溪"}); - }}); - city_DistrictNames.put("广东", new ArrayList(){{ - add(new String[]{"广东外贸广场", "广州"}); - add(new String[]{"广东外语艺术学院教师宿舍", "广州"}); - add(new String[]{"广东建科院宿舍", "广州"}); - add(new String[]{"广东司法警官职业学院宿舍", "广州"}); - add(new String[]{"广东环保大厦", "广州"}); - add(new String[]{"广东商业大厦", "广州"}); - add(new String[]{"广东医学院教师宿舍楼", "东莞"}); - add(new String[]{"广东国际大厦", "广州"}); - add(new String[]{"广东省技术监督局宿舍", "广州"}); - add(new String[]{"广东工业大学宿舍", "广州"}); - add(new String[]{"广东教育学院宿舍", "广州"}); - add(new String[]{"广东省银行大厦", "深圳"}); - add(new String[]{"广东大厦", "天津"}); - add(new String[]{"广东山庄", "镇江"}); - add(new String[]{"广东红盾大厦", "广州"}); - add(new String[]{"广东药学院宿舍", "广州"}); - add(new String[]{"广东青年干部学院宿舍", "广州"}); - add(new String[]{"广东基础楼", "深圳"}); - add(new String[]{"广东省科技干部学院宿舍", "广州"}); - add(new String[]{"广东省农业管理干部学院社区", "广州"}); - add(new String[]{"广东芭蕾雨·逸景", "佛山"}); - }}); - city_DistrictNames.put("茂名", new ArrayList(){{ - add(new String[]{"茂名大厦", "广州"}); - add(new String[]{"茂名大楼", "上海"}); - add(new String[]{"茂名大厦", "上海"}); - add(new String[]{"茂名坊", "上海"}); - add(new String[]{"茂名公寓", "上海"}); - add(new String[]{"茂名亿城名苑", "茂名"}); - add(new String[]{"茂名碧桂园", "茂名"}); - add(new String[]{"茂名石油化工学院", "茂名"}); - }}); - city_DistrictNames.put("浙江", new ArrayList(){{ - add(new String[]{"浙江工业大学教师宿舍", "杭州"}); - add(new String[]{"浙江大厦", "太原"}); - add(new String[]{"浙江办事处宿舍", "太原"}); - add(new String[]{"浙江仁和居老年养生公寓", "湖州"}); - add(new String[]{"浙江交运大厦", "杭州"}); - add(new String[]{"浙江工商大学宿舍", "杭州"}); - add(new String[]{"浙江商贸城", "合肥"}); - add(new String[]{"浙江工业大学之江学院", "杭州"}); - }}); - city_DistrictNames.put("台州", new ArrayList(){{ - add(new String[]{"台州香格里拉花园 (香格里拉,香格里拉花园)", "台州"}); - add(new String[]{"台州国际塑料城 (国际塑料城)", "台州"}); - add(new String[]{"台州世贸中心 (世贸中心)", "台州"}); - add(new String[]{"台州汽配城 (汽配城)", "台州"}); - add(new String[]{"台州海洋广场", "台州"}); - add(new String[]{"台州耀江广场", "台州"}); - }}); - city_DistrictNames.put("温岭", new ArrayList(){{ - add(new String[]{"温岭锦都花园", "台州"}); - add(new String[]{"温岭东方花园", "温岭"}); - }}); - city_DistrictNames.put("浙江", new ArrayList(){{ - add(new String[]{"浙江工业大学教师宿舍", "杭州"}); - add(new String[]{"浙江大厦", "太原"}); - add(new String[]{"浙江办事处宿舍", "太原"}); - add(new String[]{"浙江仁和居老年养生公寓", "湖州"}); - add(new String[]{"浙江交运大厦", "杭州"}); - add(new String[]{"浙江工商大学宿舍", "杭州"}); - add(new String[]{"浙江商贸城", "合肥"}); - add(new String[]{"浙江工业大学之江学院", "杭州"}); - }}); - city_DistrictNames.put("绍兴", new ArrayList(){{ - add(new String[]{"绍兴天下", "绍兴"}); - add(new String[]{"绍兴新村", "杭州"}); - add(new String[]{"绍兴颐景园", "杭州"}); - add(new String[]{"绍兴社区", "武汉"}); - add(new String[]{"绍兴东方花园", "绍兴"}); - add(new String[]{"绍兴轻纺贸易中心", "绍兴"}); - }}); - city_DistrictNames.put("山东", new ArrayList(){{ - add(new String[]{"山东里", "秦皇岛"}); - add(new String[]{"山东经济学院宿舍", "济南"}); - add(new String[]{"山东省卫生厅宿舍", "济南"}); - add(new String[]{"山东省民政厅宿舍", "济南"}); - add(new String[]{"山东省商业集团总公司宿舍", "济南"}); - add(new String[]{"山东医科大学教师宿舍", "济南"}); - add(new String[]{"山东外贸大厦", "青岛"}); - add(new String[]{"山东大厦", "深圳"}); - add(new String[]{"山东堡社区", "沈阳"}); - add(new String[]{"山东艺术学院宿舍", "济南"}); - add(new String[]{"山东黄金崮云湖高尔夫别墅", "济南"}); - add(new String[]{"山东司法警官学院宿舍", "济南"}); - add(new String[]{"山东省科学院高新技术研究分院", "青岛"}); - add(new String[]{"山东建工学院宿舍", "济南"}); - add(new String[]{"山东庙小区", "沈阳"}); - add(new String[]{"山东乳山银滩海景房", "威海"}); - add(new String[]{"山东头村", "青岛"}); - add(new String[]{"山东省畜牧局宿舍", "济南"}); - }}); - city_DistrictNames.put("烟台", new ArrayList(){{ - add(new String[]{"烟台数码港", "烟台"}); - }}); - city_DistrictNames.put("贵州", new ArrayList(){{ - add(new String[]{"贵州大厦", "海口"}); - add(new String[]{"贵州科技大厦", "贵阳"}); - add(new String[]{"贵州日报社糖果厂宿舍", "贵阳"}); - add(new String[]{"贵州驴友人家酒店式连锁家庭公寓", "贵阳"}); - add(new String[]{"贵州日报社糖果厂宿舍", "贵阳"}); - add(new String[]{"贵州商贸物流港", "贵阳"}); - }}); - city_DistrictNames.put("贵阳", new ArrayList(){{ - add(new String[]{"贵阳市遵义路遵义巷", "贵阳"}); - add(new String[]{"贵阳医学院附属医院宿舍", "贵阳"}); - add(new String[]{"贵阳建筑设计院宿舍", "贵阳"}); - add(new String[]{"贵阳花苑", "北海"}); - add(new String[]{"贵阳里", "天津"}); - add(new String[]{"贵阳公寓", "天津"}); - add(new String[]{"贵阳市科研所宿舍", "贵阳"}); - add(new String[]{"贵阳观山湖一号", "贵阳"}); - add(new String[]{"贵阳恒大绿洲", "贵阳"}); - add(new String[]{"贵阳恒大城", "贵阳"}); - add(new String[]{"贵阳经济开发区", "贵阳"}); - add(new String[]{"贵阳中医学院教师宿舍", "贵阳"}); - add(new String[]{"贵阳饭店", "贵阳"}); - add(new String[]{"贵阳小区", "长春"}); - add(new String[]{"贵阳市遵义路遵义巷小区", "贵阳"}); - }}); - city_DistrictNames.put("河南", new ArrayList(){{ - add(new String[]{"河南庄小区", "青岛"}); - add(new String[]{"河南财专家属院", "郑州"}); - add(new String[]{"河南省新华书店家属院", "郑州"}); - add(new String[]{"河南省商业科学研究所家属院", "郑州"}); - add(new String[]{"河南省日报社家属院", "郑州"}); - add(new String[]{"河南女子高中家属院", "郑州"}); - add(new String[]{"河南外贸大院", "深圳"}); - add(new String[]{"河南里", "天津"}); - add(new String[]{"河南新村", "福州"}); - add(new String[]{"河南财经学院家属院", "郑州"}); - add(new String[]{"河南岸公园小区", "惠州"}); - add(new String[]{"河南岸新村", "惠州"}); - add(new String[]{"河南村", "北京"}); - add(new String[]{"河南理工学校家属院", "郑州"}); - add(new String[]{"河南省人事厅家属院", "郑州"}); - add(new String[]{"河南岸中心小区", "惠州"}); - add(new String[]{"河南省外贸学校家属院", "郑州"}); - add(new String[]{"河南村", "上海"}); - add(new String[]{"河南新村", "上海"}); - add(new String[]{"河南工业大学家属院", "郑州"}); - }}); - city_DistrictNames.put("焦作", new ArrayList(){{ - add(new String[]{"焦作群英家苑", "焦作"}); - add(new String[]{"焦作中海丽江", "焦作"}); - add(new String[]{"焦作白云苑", "焦作"}); - add(new String[]{"焦作滨河小区", "焦作"}); - }}); - city_DistrictNames.put("湖南", new ArrayList(){{ - add(new String[]{"湖南大厦", "海口"}); - add(new String[]{"湖南师大张公岭校区宿舍", "长沙"}); - add(new String[]{"湖南省进出口公司宿舍", "长沙"}); - add(new String[]{"湖南广电宿舍", "长沙"}); - add(new String[]{"湖南机床厂宿舍", "长沙"}); - add(new String[]{"湖南制药厂宿舍", "长沙"}); - add(new String[]{"湖南供销大厦", "长沙"}); - add(new String[]{"湖南化工医药设计院宿舍", "长沙"}); - add(new String[]{"湖南工商银行宿舍机关大院", "长沙"}); - add(new String[]{"湖南省国防科公办机关院内宿舍", "长沙"}); - add(new String[]{"湖南报业文化城", "长沙"}); - add(new String[]{"湖南省交通设计院", "长沙"}); - add(new String[]{"湖南联通住宅小区", "长沙"}); - add(new String[]{"湖南电视台单位宿舍", "长沙"}); - add(new String[]{"湖南开关厂宿舍", "长沙"}); - add(new String[]{"湖南小区", "北京"}); - add(new String[]{"湖南邮电新村小区", "鞍山"}); - add(new String[]{"湖南省科学技术厅宿舍", "长沙"}); - add(new String[]{"湖南省国安厅单位房", "长沙"}); - add(new String[]{"湖南省木偶剧团宿舍", "长沙"}); - add(new String[]{"湖南省气象局宿舍", "长沙"}); - add(new String[]{"湖南女子大学教师公寓", "长沙"}); - add(new String[]{"湖南省农业机械研究所", "长沙"}); - add(new String[]{"湖南教育装备综合大楼", "长沙"}); - add(new String[]{"湖南省劳动卫生所", "长沙"}); - add(new String[]{"湖南省质量技术监督局宿舍", "长沙"}); - add(new String[]{"湖南省金属回收公司宿舍", "长沙"}); - add(new String[]{"湖南省塑料研究所", "长沙"}); - add(new String[]{"湖南省高级人民检查院单位房", "长沙"}); - add(new String[]{"湖南交通职院宿舍", "长沙"}); - add(new String[]{"湖南省冶金材料研究所", "长沙"}); - add(new String[]{"湖南金蜂音像出版社", "长沙"}); - add(new String[]{"湖南省物资厅宿舍", "长沙"}); - add(new String[]{"湖南家电商城", "长沙"}); - add(new String[]{"湖南国际商务中心", "长沙"}); - add(new String[]{"湖南财富中心", "长沙"}); - add(new String[]{"湖南国际汽车城", "长沙"}); - add(new String[]{"湖南亚大数码港", "长沙"}); - add(new String[]{"湖南大厦", "南宁"}); - add(new String[]{"湖南大厦", "上海"}); - add(new String[]{"湖南星沙汽配城", "长沙"}); - add(new String[]{"湖南艺校单位房", "长沙"}); - add(new String[]{"湖南财专教职工宿舍", "长沙"}); - add(new String[]{"湖南省机械进出口公司宿舍", "长沙"}); - add(new String[]{"湖南日报单位宿舍", "长沙"}); - add(new String[]{"湖南岸后畈小区", "绍兴"}); - }}); - city_DistrictNames.put("岳阳", new ArrayList(){{ - add(new String[]{"岳阳小区", "厦门"}); - add(new String[]{"岳阳舒苑", "天津"}); - add(new String[]{"岳阳里", "天津"}); - add(new String[]{"岳阳西里", "厦门"}); - add(new String[]{"岳阳里·和平区", "天津"}); - add(new String[]{"岳阳小区", "上海"}); - add(new String[]{"岳阳大楼", "上海"}); - add(new String[]{"岳阳花苑", "上海"}); - }}); - city_DistrictNames.put("江苏", new ArrayList(){{ - add(new String[]{"江苏省农科院", "南京"}); - add(new String[]{"江苏油田石油山庄", "扬州"}); - add(new String[]{"江苏警官学院", "南京"}); - add(new String[]{"江苏省高级专家园", "南京"}); - add(new String[]{"江苏油田石油山庄", "扬州"}); - add(new String[]{"江苏议事园", "南京"}); - add(new String[]{"江苏国际塑化城", "常州"}); - add(new String[]{"江苏万和国际商贸城", "常州"}); - }}); - city_DistrictNames.put("南通", new ArrayList(){{ - add(new String[]{"南通花园", "珠海"}); - add(new String[]{"南通电信宿舍", "长沙"}); - add(new String[]{"南通里", "天津"}); - add(new String[]{"南通大厦", "南通"}); - add(new String[]{"南通紫竹苑", "南通"}); - add(new String[]{"南通中央商务区", "南通"}); - add(new String[]{"南通壹城水木清华", "南通"}); - add(new String[]{"南通国际贸易中心", "南通"}); - add(new String[]{"南通星光耀广场", "南通"}); - add(new String[]{"南通现代生活广场", "南通"}); - add(new String[]{"南通·金游城", "南通"}); - }}); - city_DistrictNames.put("江苏", new ArrayList(){{ - add(new String[]{"江苏省农科院", "南京"}); - add(new String[]{"江苏油田石油山庄", "扬州"}); - add(new String[]{"江苏警官学院", "南京"}); - add(new String[]{"江苏省高级专家园", "南京"}); - add(new String[]{"江苏油田石油山庄", "扬州"}); - add(new String[]{"江苏议事园", "南京"}); - add(new String[]{"江苏国际塑化城", "常州"}); - add(new String[]{"江苏万和国际商贸城", "常州"}); - }}); - city_DistrictNames.put("南京", new ArrayList(){{ - add(new String[]{"南京花园", "哈尔滨"}); - add(new String[]{"南京艺术学院家属区", "南京"}); - add(new String[]{"南京国际广场", "南京"}); - add(new String[]{"南京财经大学教师宿舍楼", "南京"}); - add(new String[]{"南京炼油厂小区", "南京"}); - add(new String[]{"南京南社区", "沈阳"}); - add(new String[]{"南京江天花园", "连云港"}); - add(new String[]{"南京世界村", "南京"}); - add(new String[]{"南京万达广场", "南京"}); - add(new String[]{"南京沪江商贸城", "南京"}); - add(new String[]{"南京理工大学", "南京"}); - add(new String[]{"南京海峡城", "南京"}); - add(new String[]{"南京小区", "上海"}); - add(new String[]{"南京湾锦绣香江", "南京"}); - }}); - city_DistrictNames.put("黑龙江", new ArrayList(){{ - }}); - city_DistrictNames.put("牡丹江", new ArrayList(){{ - add(new String[]{"牡丹江社区", "沈阳"}); - }}); - city_DistrictNames.put("安徽", new ArrayList(){{ - add(new String[]{"安徽师范大学教师公寓", "芜湖"}); - add(new String[]{"安徽电视台宿舍", "合肥"}); - add(new String[]{"安徽日报社宿舍", "合肥"}); - add(new String[]{"安徽大厦", "珠海"}); - add(new String[]{"安徽杂技团宿舍", "合肥"}); - add(new String[]{"安徽警官职业学院宿舍", "合肥"}); - add(new String[]{"安徽税务学校宿舍", "合肥"}); - add(new String[]{"安徽汽配城", "合肥"}); - add(new String[]{"安徽国强钢材交易中心", "合肥"}); - add(new String[]{"安徽国际购物广场", "合肥"}); - add(new String[]{"安徽大市场", "合肥"}); - }}); - city_DistrictNames.put("马鞍山", new ArrayList(){{ - add(new String[]{"马鞍山小区", "成都"}); - add(new String[]{"马鞍山一号", "广州"}); - }}); - city_DistrictNames.put("浙江", new ArrayList(){{ - add(new String[]{"浙江工业大学教师宿舍", "杭州"}); - add(new String[]{"浙江大厦", "太原"}); - add(new String[]{"浙江办事处宿舍", "太原"}); - add(new String[]{"浙江仁和居老年养生公寓", "湖州"}); - add(new String[]{"浙江交运大厦", "杭州"}); - add(new String[]{"浙江工商大学宿舍", "杭州"}); - add(new String[]{"浙江商贸城", "合肥"}); - add(new String[]{"浙江工业大学之江学院", "杭州"}); - }}); - city_DistrictNames.put("台州", new ArrayList(){{ - add(new String[]{"台州香格里拉花园 (香格里拉,香格里拉花园)", "台州"}); - add(new String[]{"台州国际塑料城 (国际塑料城)", "台州"}); - add(new String[]{"台州世贸中心 (世贸中心)", "台州"}); - add(new String[]{"台州汽配城 (汽配城)", "台州"}); - add(new String[]{"台州海洋广场", "台州"}); - add(new String[]{"台州耀江广场", "台州"}); - }}); - city_DistrictNames.put("广东", new ArrayList(){{ - add(new String[]{"广东外贸广场", "广州"}); - add(new String[]{"广东外语艺术学院教师宿舍", "广州"}); - add(new String[]{"广东建科院宿舍", "广州"}); - add(new String[]{"广东司法警官职业学院宿舍", "广州"}); - add(new String[]{"广东环保大厦", "广州"}); - add(new String[]{"广东商业大厦", "广州"}); - add(new String[]{"广东医学院教师宿舍楼", "东莞"}); - add(new String[]{"广东国际大厦", "广州"}); - add(new String[]{"广东省技术监督局宿舍", "广州"}); - add(new String[]{"广东工业大学宿舍", "广州"}); - add(new String[]{"广东教育学院宿舍", "广州"}); - add(new String[]{"广东省银行大厦", "深圳"}); - add(new String[]{"广东大厦", "天津"}); - add(new String[]{"广东山庄", "镇江"}); - add(new String[]{"广东红盾大厦", "广州"}); - add(new String[]{"广东药学院宿舍", "广州"}); - add(new String[]{"广东青年干部学院宿舍", "广州"}); - add(new String[]{"广东基础楼", "深圳"}); - add(new String[]{"广东省科技干部学院宿舍", "广州"}); - add(new String[]{"广东省农业管理干部学院社区", "广州"}); - add(new String[]{"广东芭蕾雨·逸景", "佛山"}); - }}); - city_DistrictNames.put("汕头", new ArrayList(){{ - add(new String[]{"汕头新城", "汕头"}); - }}); - city_DistrictNames.put("浙江", new ArrayList(){{ - add(new String[]{"浙江工业大学教师宿舍", "杭州"}); - add(new String[]{"浙江大厦", "太原"}); - add(new String[]{"浙江办事处宿舍", "太原"}); - add(new String[]{"浙江仁和居老年养生公寓", "湖州"}); - add(new String[]{"浙江交运大厦", "杭州"}); - add(new String[]{"浙江工商大学宿舍", "杭州"}); - add(new String[]{"浙江商贸城", "合肥"}); - add(new String[]{"浙江工业大学之江学院", "杭州"}); - }}); - city_DistrictNames.put("宁波", new ArrayList(){{ - add(new String[]{"宁波里", "天津"}); - add(new String[]{"宁波里", "武汉"}); - add(new String[]{"宁波商会大厦", "宁波"}); - add(new String[]{"宁波外代大厦", "宁波"}); - add(new String[]{"宁波小区", "上海"}); - }}); - city_DistrictNames.put("奉化", new ArrayList(){{ - add(new String[]{"奉化亲亲家园", "宁波"}); - add(new String[]{"奉化亲亲家园", "奉化"}); - add(new String[]{"奉化中央花园", "宁波"}); - }}); - city_DistrictNames.put("广西壮族", new ArrayList(){{ - add(new String[]{"广西壮族自治区司法厅宿舍", "南宁"}); - add(new String[]{"广西壮族自治区农业厅宿舍", "南宁"}); - }}); - city_DistrictNames.put("桂林", new ArrayList(){{ - add(new String[]{"桂林国际旅游商品批发城", "桂林"}); - add(new String[]{"桂林小区", "长春"}); - add(new String[]{"桂林小区", "沈阳"}); - add(new String[]{"桂林小区", "大连"}); - add(new String[]{"桂林苑", "大连"}); - add(new String[]{"桂林公馆原乡墅", "桂林"}); - add(new String[]{"桂林润园", "桂林"}); - add(new String[]{"桂林奥林匹克花园", "桂林"}); - add(new String[]{"桂林大世界", "桂林"}); - add(new String[]{"桂林万灵润园", "桂林"}); - add(new String[]{"桂林新苑", "上海"}); - add(new String[]{"桂林苑", "上海"}); - add(new String[]{"桂林花苑", "上海"}); - add(new String[]{"桂林坊", "嘉兴"}); - }}); - city_DistrictNames.put("广东", new ArrayList(){{ - add(new String[]{"广东外贸广场", "广州"}); - add(new String[]{"广东外语艺术学院教师宿舍", "广州"}); - add(new String[]{"广东建科院宿舍", "广州"}); - add(new String[]{"广东司法警官职业学院宿舍", "广州"}); - add(new String[]{"广东环保大厦", "广州"}); - add(new String[]{"广东商业大厦", "广州"}); - add(new String[]{"广东医学院教师宿舍楼", "东莞"}); - add(new String[]{"广东国际大厦", "广州"}); - add(new String[]{"广东省技术监督局宿舍", "广州"}); - add(new String[]{"广东工业大学宿舍", "广州"}); - add(new String[]{"广东教育学院宿舍", "广州"}); - add(new String[]{"广东省银行大厦", "深圳"}); - add(new String[]{"广东大厦", "天津"}); - add(new String[]{"广东山庄", "镇江"}); - add(new String[]{"广东红盾大厦", "广州"}); - add(new String[]{"广东药学院宿舍", "广州"}); - add(new String[]{"广东青年干部学院宿舍", "广州"}); - add(new String[]{"广东基础楼", "深圳"}); - add(new String[]{"广东省科技干部学院宿舍", "广州"}); - add(new String[]{"广东省农业管理干部学院社区", "广州"}); - add(new String[]{"广东芭蕾雨·逸景", "佛山"}); - }}); - city_DistrictNames.put("广州", new ArrayList(){{ - add(new String[]{"广州卫生厅大院", "广州"}); - add(new String[]{"广州雅居乐花园雅逸庭", "广州"}); - add(new String[]{"广州客车厂宿舍", "广州"}); - add(new String[]{"广州后花园", "清远"}); - add(new String[]{"广州后花园", "清远"}); - add(new String[]{"广州雅居乐花园浅山小筑", "广州"}); - add(new String[]{"广州雅居乐花园雅悦庭", "广州"}); - add(new String[]{"广州雅居乐花园雅翠庭", "广州"}); - add(new String[]{"广州奥林匹克花园", "广州"}); - add(new String[]{"广州雅居乐花园邻居", "广州"}); - add(new String[]{"广州雅居乐花园逸心园", "广州"}); - add(new String[]{"广州大学教师楼", "广州"}); - add(new String[]{"广州市社会福利院宿舍", "广州"}); - add(new String[]{"广州体育学院宿舍", "广州"}); - add(new String[]{"广州市食品宿舍", "广州"}); - add(new String[]{"广州湾时代广场", "湛江"}); - add(new String[]{"广州军区房管所宿舍", "武汉"}); - add(new String[]{"广州新塘新世界花园", "广州"}); - add(new String[]{"广州空港假日别墅酒店", "广州"}); - add(new String[]{"广州星河丹堤", "广州"}); - add(new String[]{"广州雅居乐花园十年小雅", "广州"}); - add(new String[]{"广州雅居乐花园花巷", "广州"}); - add(new String[]{"广州雅居乐花园峰会", "广州"}); - add(new String[]{"广州雅居乐花园御景峰别墅", "广州"}); - add(new String[]{"广州碧桂园福苑", "广州"}); - add(new String[]{"广州碧桂园华苑", "广州"}); - add(new String[]{"广州碧桂园雅苑", "广州"}); - add(new String[]{"广州碧桂园美苑", "广州"}); - add(new String[]{"广州碧桂园乐苑", "广州"}); - add(new String[]{"广州碧桂园锦苑", "广州"}); - add(new String[]{"广州雅居乐花园·欧洲故事", "广州"}); - add(new String[]{"广州雅居乐花园灏湖居", "广州"}); - add(new String[]{"广州雅居乐花园雅湖居", "广州"}); - add(new String[]{"广州雅居乐花园", "广州"}); - add(new String[]{"广州雅居乐花园一尺山居", "广州"}); - add(new String[]{"广州雅居乐花园·新地", "广州"}); - add(new String[]{"广州雅居乐花园·天域", "广州"}); - add(new String[]{"广州雅居乐花园·挪威森林", "广州"}); - add(new String[]{"广州雅居乐花园雕刻时光", "广州"}); - add(new String[]{"广州碧桂园秀苑", "广州"}); - add(new String[]{"广州雅居乐花园上善若水", "广州"}); - add(new String[]{"广州港瑞酒店公寓", "广州"}); - add(new String[]{"广州亚运城·天誉", "广州"}); - add(new String[]{"广州白天鹅花园", "广州"}); - add(new String[]{"广州碧桂园绿茵苑", "广州"}); - add(new String[]{"广州雅居乐花园时光九篇", "广州"}); - add(new String[]{"广州碧桂园康苑", "广州"}); - add(new String[]{"广州海运大厦", "广州"}); - add(new String[]{"广州有色金属研究院", "广州"}); - add(new String[]{"广州碧桂园丽苑", "广州"}); - add(new String[]{"广州碧桂园翠苑", "广州"}); - add(new String[]{"广州富力城", "广州"}); - add(new String[]{"广州碧桂园", "广州"}); - add(new String[]{"广州新塘新世界花园", "增城"}); - }}); - city_DistrictNames.put("增城", new ArrayList(){{ - add(new String[]{"增城富丽花园", "广州"}); - add(new String[]{"增城时代倾城", "广州"}); - add(new String[]{"增城雅居乐御宾府", "广州"}); - add(new String[]{"增城沙园中路小区", "广州"}); - add(new String[]{"增城群星大厦", "广州"}); - add(new String[]{"增城怡康花园", "广州"}); - add(new String[]{"增城富景居", "广州"}); - add(new String[]{"增城金田花园", "广州"}); - add(new String[]{"增城通园花园", "广州"}); - add(new String[]{"增城顺景楼", "广州"}); - add(new String[]{"增城翠景苑", "广州"}); - add(new String[]{"增城农行宿舍", "广州"}); - add(new String[]{"增城阳光家园", "广州"}); - add(new String[]{"增城锦城花园", "广州"}); - add(new String[]{"增城万达广场", "广州"}); - add(new String[]{"增城金田花园", "增城"}); - add(new String[]{"增城时代倾城", "增城"}); - add(new String[]{"增城沙园中路小区", "增城"}); - add(new String[]{"增城富丽花园", "增城"}); - add(new String[]{"增城雅居乐御宾府", "增城"}); - add(new String[]{"增城富景居", "增城"}); - add(new String[]{"增城通园花园", "增城"}); - add(new String[]{"增城农行宿舍", "增城"}); - add(new String[]{"增城翠景苑", "增城"}); - add(new String[]{"增城群星大厦", "增城"}); - add(new String[]{"增城锦城花园", "增城"}); - add(new String[]{"增城顺景楼", "增城"}); - add(new String[]{"增城阳光家园", "增城"}); - add(new String[]{"增城怡康花园", "增城"}); - }}); - city_DistrictNames.put("广东", new ArrayList(){{ - add(new String[]{"广东外贸广场", "广州"}); - add(new String[]{"广东外语艺术学院教师宿舍", "广州"}); - add(new String[]{"广东建科院宿舍", "广州"}); - add(new String[]{"广东司法警官职业学院宿舍", "广州"}); - add(new String[]{"广东环保大厦", "广州"}); - add(new String[]{"广东商业大厦", "广州"}); - add(new String[]{"广东医学院教师宿舍楼", "东莞"}); - add(new String[]{"广东国际大厦", "广州"}); - add(new String[]{"广东省技术监督局宿舍", "广州"}); - add(new String[]{"广东工业大学宿舍", "广州"}); - add(new String[]{"广东教育学院宿舍", "广州"}); - add(new String[]{"广东省银行大厦", "深圳"}); - add(new String[]{"广东大厦", "天津"}); - add(new String[]{"广东山庄", "镇江"}); - add(new String[]{"广东红盾大厦", "广州"}); - add(new String[]{"广东药学院宿舍", "广州"}); - add(new String[]{"广东青年干部学院宿舍", "广州"}); - add(new String[]{"广东基础楼", "深圳"}); - add(new String[]{"广东省科技干部学院宿舍", "广州"}); - add(new String[]{"广东省农业管理干部学院社区", "广州"}); - add(new String[]{"广东芭蕾雨·逸景", "佛山"}); - }}); - city_DistrictNames.put("阳江", new ArrayList(){{ - add(new String[]{"阳江碧湖雅苑", "阳江"}); - add(new String[]{"阳江山庄别墅", "阳江"}); - }}); - city_DistrictNames.put("天津", new ArrayList(){{ - add(new String[]{"天津湾海景雅苑", "天津"}); - add(new String[]{"天津新村", "南京"}); - add(new String[]{"天津富力桃园", "天津"}); - add(new String[]{"天津中心", "天津"}); - add(new String[]{"天津园艺工程研究所", "天津"}); - add(new String[]{"天津宾馆温泉公寓", "天津"}); - add(new String[]{"天津湾海河国际花园", "天津"}); - add(new String[]{"天津奥式商务公园", "天津"}); - add(new String[]{"天津倍儿幸福", "天津"}); - add(new String[]{"天津华侨城", "天津"}); - add(new String[]{"天津大都会", "天津"}); - add(new String[]{"天津雅颂居", "天津"}); - add(new String[]{"天津碧桂园", "天津"}); - add(new String[]{"天津未来城", "天津"}); - add(new String[]{"天津科技广场", "天津"}); - add(new String[]{"天津大院", "武汉"}); - add(new String[]{"天津大悦城悦府", "天津"}); - add(new String[]{"天津大悦城大悦公寓", "天津"}); - add(new String[]{"天津富力湾", "天津"}); - add(new String[]{"天津津南新城别墅", "天津"}); - add(new String[]{"天津公馆", "天津"}); - add(new String[]{"天津津南新城", "天津"}); - add(new String[]{"天津富力中心", "天津"}); - add(new String[]{"天津环球金融中心", "天津"}); - add(new String[]{"天津港湾中心", "天津"}); - }}); - city_DistrictNames.put("广东", new ArrayList(){{ - add(new String[]{"广东外贸广场", "广州"}); - add(new String[]{"广东外语艺术学院教师宿舍", "广州"}); - add(new String[]{"广东建科院宿舍", "广州"}); - add(new String[]{"广东司法警官职业学院宿舍", "广州"}); - add(new String[]{"广东环保大厦", "广州"}); - add(new String[]{"广东商业大厦", "广州"}); - add(new String[]{"广东医学院教师宿舍楼", "东莞"}); - add(new String[]{"广东国际大厦", "广州"}); - add(new String[]{"广东省技术监督局宿舍", "广州"}); - add(new String[]{"广东工业大学宿舍", "广州"}); - add(new String[]{"广东教育学院宿舍", "广州"}); - add(new String[]{"广东省银行大厦", "深圳"}); - add(new String[]{"广东大厦", "天津"}); - add(new String[]{"广东山庄", "镇江"}); - add(new String[]{"广东红盾大厦", "广州"}); - add(new String[]{"广东药学院宿舍", "广州"}); - add(new String[]{"广东青年干部学院宿舍", "广州"}); - add(new String[]{"广东基础楼", "深圳"}); - add(new String[]{"广东省科技干部学院宿舍", "广州"}); - add(new String[]{"广东省农业管理干部学院社区", "广州"}); - add(new String[]{"广东芭蕾雨·逸景", "佛山"}); - }}); - city_DistrictNames.put("清远", new ArrayList(){{ - add(new String[]{"清远维港尚城", "清远"}); - add(new String[]{"清远奥园", "清远"}); - add(new String[]{"清远里", "杭州"}); - add(new String[]{"清远维港尚城", "清远"}); - add(new String[]{"清远一区", "乐清"}); - }}); - city_DistrictNames.put("河北", new ArrayList(){{ - add(new String[]{"河北税务学校生活区", "石家庄"}); - add(new String[]{"河北经济日报社宿舍", "石家庄"}); - add(new String[]{"河北美术出版社宿舍", "石家庄"}); - add(new String[]{"河北物资宿舍", "石家庄"}); - add(new String[]{"河北化工医药职业技术学院宿舍", "石家庄"}); - add(new String[]{"河北电机宿舍", "石家庄"}); - add(new String[]{"河北日报社宿舍", "石家庄"}); - add(new String[]{"河北工程造价管理总站宿舍", "石家庄"}); - add(new String[]{"河北康城", "潍坊"}); - add(new String[]{"河北社区", "沈阳"}); - add(new String[]{"河北医科大学宿舍", "石家庄"}); - add(new String[]{"河北省人大宿舍", "石家庄"}); - add(new String[]{"河北新人家", "唐山"}); - add(new String[]{"河北一号", "唐山"}); - add(new String[]{"河北机要局宿舍", "石家庄"}); - add(new String[]{"河北广播电视报宿舍", "石家庄"}); - add(new String[]{"河北商城", "青岛"}); - add(new String[]{"河北长城饭店", "石家庄"}); - add(new String[]{"河北村小区", "北京"}); - add(new String[]{"河北桃江里", "天津"}); - add(new String[]{"河北师大青年公寓楼", "石家庄"}); - add(new String[]{"河北绛", "无锡"}); - add(new String[]{"河北社区", "本溪"}); - add(new String[]{"河北楼", "唐山"}); - }}); - city_DistrictNames.put("秦皇岛", new ArrayList(){{ - add(new String[]{"秦皇岛恒大城", "秦皇岛"}); - }}); - city_DistrictNames.put("浙江", new ArrayList(){{ - add(new String[]{"浙江工业大学教师宿舍", "杭州"}); - add(new String[]{"浙江大厦", "太原"}); - add(new String[]{"浙江办事处宿舍", "太原"}); - add(new String[]{"浙江仁和居老年养生公寓", "湖州"}); - add(new String[]{"浙江交运大厦", "杭州"}); - add(new String[]{"浙江工商大学宿舍", "杭州"}); - add(new String[]{"浙江商贸城", "合肥"}); - add(new String[]{"浙江工业大学之江学院", "杭州"}); - }}); - city_DistrictNames.put("湖州", new ArrayList(){{ - add(new String[]{"湖州东苑", "杭州"}); - add(new String[]{"湖州竹翠园小区", "湖州"}); - }}); - city_DistrictNames.put("浙江", new ArrayList(){{ - add(new String[]{"浙江工业大学教师宿舍", "杭州"}); - add(new String[]{"浙江大厦", "太原"}); - add(new String[]{"浙江办事处宿舍", "太原"}); - add(new String[]{"浙江仁和居老年养生公寓", "湖州"}); - add(new String[]{"浙江交运大厦", "杭州"}); - add(new String[]{"浙江工商大学宿舍", "杭州"}); - add(new String[]{"浙江商贸城", "合肥"}); - add(new String[]{"浙江工业大学之江学院", "杭州"}); - }}); - city_DistrictNames.put("杭州", new ArrayList(){{ - add(new String[]{"杭州赛码城", "杭州"}); - add(new String[]{"杭州天清岛度假别墅", "杭州"}); - add(new String[]{"杭州湾公寓", "杭州"}); - add(new String[]{"杭州里", "天津"}); - add(new String[]{"杭州大厦", "台州"}); - add(new String[]{"杭州香港城", "杭州"}); - add(new String[]{"杭州休斯顿高科技园", "杭州"}); - add(new String[]{"杭州宏丰家居城宏丰公寓", "杭州"}); - add(new String[]{"杭州大润城", "杭州"}); - add(new String[]{"杭州乐园风情街", "杭州"}); - add(new String[]{"杭州乔司商城", "杭州"}); - add(new String[]{"杭州碧桂园", "杭州"}); - add(new String[]{"杭州市交警复兴中队宿舍", "杭州"}); - }}); - city_DistrictNames.put("萧山", new ArrayList(){{ - add(new String[]{"萧山金城花园", "杭州"}); - add(new String[]{"萧山家景园", "杭州"}); - add(new String[]{"萧山时代广场", "杭州"}); - add(new String[]{"萧山众安服务楼", "杭州"}); - }}); - city_DistrictNames.put("福建", new ArrayList(){{ - add(new String[]{"福建园", "南宁"}); - add(new String[]{"福建省四建宿舍北门", "厦门"}); - add(new String[]{"福建联通花园", "福州"}); - add(new String[]{"福建日报社宿舍", "福州"}); - add(new String[]{"福建省中心检验所单位宿舍", "福州"}); - add(new String[]{"福建电影制片厂单位宿舍", "福州"}); - add(new String[]{"福建省女子监狱宿舍", "福州"}); - add(new String[]{"福建省医药公司大王里单位宿舍", "福州"}); - add(new String[]{"福建省第二公路工程公司宿舍", "福州"}); - add(new String[]{"福建省蚕桑研究所单位宿舍", "福州"}); - add(new String[]{"福建新村", "南京"}); - add(new String[]{"福建里", "天津"}); - add(new String[]{"福建社区", "武汉"}); - add(new String[]{"福建大厦", "贵阳"}); - add(new String[]{"福建巷小区", "成都"}); - add(new String[]{"福建大厦", "深圳"}); - add(new String[]{"福建生态工程学校单位宿舍", "福州"}); - add(new String[]{"福建医科大学教工宿舍", "福州"}); - }}); - city_DistrictNames.put("泉州", new ArrayList(){{ - add(new String[]{"泉州奥林匹克花园", "泉州"}); - add(new String[]{"泉州商城", "泉州"}); - }}); - city_DistrictNames.put("河北", new ArrayList(){{ - add(new String[]{"河北税务学校生活区", "石家庄"}); - add(new String[]{"河北经济日报社宿舍", "石家庄"}); - add(new String[]{"河北美术出版社宿舍", "石家庄"}); - add(new String[]{"河北物资宿舍", "石家庄"}); - add(new String[]{"河北化工医药职业技术学院宿舍", "石家庄"}); - add(new String[]{"河北电机宿舍", "石家庄"}); - add(new String[]{"河北日报社宿舍", "石家庄"}); - add(new String[]{"河北工程造价管理总站宿舍", "石家庄"}); - add(new String[]{"河北康城", "潍坊"}); - add(new String[]{"河北社区", "沈阳"}); - add(new String[]{"河北医科大学宿舍", "石家庄"}); - add(new String[]{"河北省人大宿舍", "石家庄"}); - add(new String[]{"河北新人家", "唐山"}); - add(new String[]{"河北一号", "唐山"}); - add(new String[]{"河北机要局宿舍", "石家庄"}); - add(new String[]{"河北广播电视报宿舍", "石家庄"}); - add(new String[]{"河北商城", "青岛"}); - add(new String[]{"河北长城饭店", "石家庄"}); - add(new String[]{"河北村小区", "北京"}); - add(new String[]{"河北桃江里", "天津"}); - add(new String[]{"河北师大青年公寓楼", "石家庄"}); - add(new String[]{"河北绛", "无锡"}); - add(new String[]{"河北社区", "本溪"}); - add(new String[]{"河北楼", "唐山"}); - }}); - city_DistrictNames.put("邯郸", new ArrayList(){{ - }}); - city_DistrictNames.put("广东", new ArrayList(){{ - add(new String[]{"广东外贸广场", "广州"}); - add(new String[]{"广东外语艺术学院教师宿舍", "广州"}); - add(new String[]{"广东建科院宿舍", "广州"}); - add(new String[]{"广东司法警官职业学院宿舍", "广州"}); - add(new String[]{"广东环保大厦", "广州"}); - add(new String[]{"广东商业大厦", "广州"}); - add(new String[]{"广东医学院教师宿舍楼", "东莞"}); - add(new String[]{"广东国际大厦", "广州"}); - add(new String[]{"广东省技术监督局宿舍", "广州"}); - add(new String[]{"广东工业大学宿舍", "广州"}); - add(new String[]{"广东教育学院宿舍", "广州"}); - add(new String[]{"广东省银行大厦", "深圳"}); - add(new String[]{"广东大厦", "天津"}); - add(new String[]{"广东山庄", "镇江"}); - add(new String[]{"广东红盾大厦", "广州"}); - add(new String[]{"广东药学院宿舍", "广州"}); - add(new String[]{"广东青年干部学院宿舍", "广州"}); - add(new String[]{"广东基础楼", "深圳"}); - add(new String[]{"广东省科技干部学院宿舍", "广州"}); - add(new String[]{"广东省农业管理干部学院社区", "广州"}); - add(new String[]{"广东芭蕾雨·逸景", "佛山"}); - }}); - city_DistrictNames.put("河源", new ArrayList(){{ - add(new String[]{"河源小区", "哈尔滨"}); - add(new String[]{"河源大厦", "广州"}); - add(new String[]{"河源碧水湾花园", "河源"}); - }}); - city_DistrictNames.put("浙江", new ArrayList(){{ - add(new String[]{"浙江工业大学教师宿舍", "杭州"}); - add(new String[]{"浙江大厦", "太原"}); - add(new String[]{"浙江办事处宿舍", "太原"}); - add(new String[]{"浙江仁和居老年养生公寓", "湖州"}); - add(new String[]{"浙江交运大厦", "杭州"}); - add(new String[]{"浙江工商大学宿舍", "杭州"}); - add(new String[]{"浙江商贸城", "合肥"}); - add(new String[]{"浙江工业大学之江学院", "杭州"}); - }}); - city_DistrictNames.put("杭州", new ArrayList(){{ - add(new String[]{"杭州赛码城", "杭州"}); - add(new String[]{"杭州天清岛度假别墅", "杭州"}); - add(new String[]{"杭州湾公寓", "杭州"}); - add(new String[]{"杭州里", "天津"}); - add(new String[]{"杭州大厦", "台州"}); - add(new String[]{"杭州香港城", "杭州"}); - add(new String[]{"杭州休斯顿高科技园", "杭州"}); - add(new String[]{"杭州宏丰家居城宏丰公寓", "杭州"}); - add(new String[]{"杭州大润城", "杭州"}); - add(new String[]{"杭州乐园风情街", "杭州"}); - add(new String[]{"杭州乔司商城", "杭州"}); - add(new String[]{"杭州碧桂园", "杭州"}); - add(new String[]{"杭州市交警复兴中队宿舍", "杭州"}); - }}); - city_DistrictNames.put("湖南", new ArrayList(){{ - add(new String[]{"湖南大厦", "海口"}); - add(new String[]{"湖南师大张公岭校区宿舍", "长沙"}); - add(new String[]{"湖南省进出口公司宿舍", "长沙"}); - add(new String[]{"湖南广电宿舍", "长沙"}); - add(new String[]{"湖南机床厂宿舍", "长沙"}); - add(new String[]{"湖南制药厂宿舍", "长沙"}); - add(new String[]{"湖南供销大厦", "长沙"}); - add(new String[]{"湖南化工医药设计院宿舍", "长沙"}); - add(new String[]{"湖南工商银行宿舍机关大院", "长沙"}); - add(new String[]{"湖南省国防科公办机关院内宿舍", "长沙"}); - add(new String[]{"湖南报业文化城", "长沙"}); - add(new String[]{"湖南省交通设计院", "长沙"}); - add(new String[]{"湖南联通住宅小区", "长沙"}); - add(new String[]{"湖南电视台单位宿舍", "长沙"}); - add(new String[]{"湖南开关厂宿舍", "长沙"}); - add(new String[]{"湖南小区", "北京"}); - add(new String[]{"湖南邮电新村小区", "鞍山"}); - add(new String[]{"湖南省科学技术厅宿舍", "长沙"}); - add(new String[]{"湖南省国安厅单位房", "长沙"}); - add(new String[]{"湖南省木偶剧团宿舍", "长沙"}); - add(new String[]{"湖南省气象局宿舍", "长沙"}); - add(new String[]{"湖南女子大学教师公寓", "长沙"}); - add(new String[]{"湖南省农业机械研究所", "长沙"}); - add(new String[]{"湖南教育装备综合大楼", "长沙"}); - add(new String[]{"湖南省劳动卫生所", "长沙"}); - add(new String[]{"湖南省质量技术监督局宿舍", "长沙"}); - add(new String[]{"湖南省金属回收公司宿舍", "长沙"}); - add(new String[]{"湖南省塑料研究所", "长沙"}); - add(new String[]{"湖南省高级人民检查院单位房", "长沙"}); - add(new String[]{"湖南交通职院宿舍", "长沙"}); - add(new String[]{"湖南省冶金材料研究所", "长沙"}); - add(new String[]{"湖南金蜂音像出版社", "长沙"}); - add(new String[]{"湖南省物资厅宿舍", "长沙"}); - add(new String[]{"湖南家电商城", "长沙"}); - add(new String[]{"湖南国际商务中心", "长沙"}); - add(new String[]{"湖南财富中心", "长沙"}); - add(new String[]{"湖南国际汽车城", "长沙"}); - add(new String[]{"湖南亚大数码港", "长沙"}); - add(new String[]{"湖南大厦", "南宁"}); - add(new String[]{"湖南大厦", "上海"}); - add(new String[]{"湖南星沙汽配城", "长沙"}); - add(new String[]{"湖南艺校单位房", "长沙"}); - add(new String[]{"湖南财专教职工宿舍", "长沙"}); - add(new String[]{"湖南省机械进出口公司宿舍", "长沙"}); - add(new String[]{"湖南日报单位宿舍", "长沙"}); - add(new String[]{"湖南岸后畈小区", "绍兴"}); - }}); - city_DistrictNames.put("衡阳", new ArrayList(){{ - add(new String[]{"衡阳新居(住宅)", "南宁"}); - add(new String[]{"衡阳名郡", "衡阳"}); - }}); - city_DistrictNames.put("广西壮族", new ArrayList(){{ - add(new String[]{"广西壮族自治区司法厅宿舍", "南宁"}); - add(new String[]{"广西壮族自治区农业厅宿舍", "南宁"}); - }}); - city_DistrictNames.put("玉林", new ArrayList(){{ - add(new String[]{"玉林东里", "北京"}); - add(new String[]{"玉林里小区", "北京"}); - add(new String[]{"玉林小区", "北京"}); - add(new String[]{"玉林八巷社区", "成都"}); - add(new String[]{"玉林六巷6号院", "成都"}); - add(new String[]{"玉林玉通巷8号院", "成都"}); - add(new String[]{"玉林苑二期", "成都"}); - add(new String[]{"玉林蓓蕾社区", "成都"}); - add(new String[]{"玉林七巷", "成都"}); - add(new String[]{"玉林西里小区", "北京"}); - add(new String[]{"玉林小区", "重庆"}); - add(new String[]{"玉林苑", "成都"}); - add(new String[]{"玉林小区", "成都"}); - add(new String[]{"玉林嘉苑", "成都"}); - add(new String[]{"玉林人家", "成都"}); - add(new String[]{"玉林祥和苑", "成都"}); - add(new String[]{"玉林大厦", "武汉"}); - add(new String[]{"玉林品上", "成都"}); - add(new String[]{"玉林都市金岸", "成都"}); - add(new String[]{"玉林名居", "成都"}); - add(new String[]{"玉林九巷4号院", "成都"}); - add(new String[]{"玉林六巷2号院", "成都"}); - add(new String[]{"玉林北巷8号院", "成都"}); - add(new String[]{"玉林二里", "北京"}); - add(new String[]{"玉林倍特科技园", "成都"}); - add(new String[]{"玉林苑", "昆山"}); - add(new String[]{"玉林公安厅宿舍", "成都"}); - add(new String[]{"玉林新天地", "成都"}); - add(new String[]{"玉林芳华", "成都"}); - add(new String[]{"玉林山水", "曲靖"}); - add(new String[]{"玉林小区(沾益)", "曲靖"}); - add(new String[]{"玉林小区", "曲靖"}); - add(new String[]{"玉林园小区", "丽江"}); - add(new String[]{"玉林花园", "丽江"}); - add(new String[]{"玉林大新社区", "玉林"}); - add(new String[]{"玉林东盛华府", "玉林"}); - add(new String[]{"玉林华商国际", "玉林"}); - }}); - city_DistrictNames.put("辽宁", new ArrayList(){{ - add(new String[]{"辽宁中医家属楼", "沈阳"}); - add(new String[]{"辽宁里", "天津"}); - }}); - city_DistrictNames.put("丹东", new ArrayList(){{ - add(new String[]{"丹东里", "天津"}); - }}); - city_DistrictNames.put("湖北", new ArrayList(){{ - add(new String[]{"湖北小区", "北京"}); - add(new String[]{"湖北宝丰花园", "深圳"}); - add(new String[]{"湖北经济学院宿舍", "武汉"}); - add(new String[]{"湖北大学宿舍", "武汉"}); - add(new String[]{"湖北日报宿舍", "武汉"}); - add(new String[]{"湖北省文联宿舍", "武汉"}); - add(new String[]{"湖北现代五金电器城", "武汉"}); - add(new String[]{"湖北饭店宿舍", "武汉"}); - add(new String[]{"湖北保险公司家属楼", "武汉"}); - add(new String[]{"湖北林业勘察院小区", "武汉"}); - add(new String[]{"湖北交通职业技术学院宿舍", "武汉"}); - add(new String[]{"湖北省艺术学校宿舍", "武汉"}); - add(new String[]{"湖北大厦", "厦门"}); - add(new String[]{"湖北质量监督局宿舍", "武汉"}); - add(new String[]{"湖北省医药监督管理局宿舍", "武汉"}); - add(new String[]{"湖北教育出版社宿舍", "武汉"}); - add(new String[]{"湖北省药材公司宿舍", "武汉"}); - add(new String[]{"湖北二师宿舍", "武汉"}); - add(new String[]{"湖北中医学院宿舍", "武汉"}); - add(new String[]{"湖北省生活资料公司居民小区", "武汉"}); - add(new String[]{"湖北商务广场", "武汉"}); - add(new String[]{"湖北教育学院宿舍", "武汉"}); - add(new String[]{"湖北省监狱管理局宿舍", "武汉"}); - add(new String[]{"湖北省安全监察局宿舍", "武汉"}); - }}); - city_DistrictNames.put("宜昌", new ArrayList(){{ - add(new String[]{"宜昌公寓", "天津"}); - add(new String[]{"宜昌CBD中心商务区", "宜昌"}); - add(new String[]{"宜昌小区", "沈阳"}); - add(new String[]{"宜昌里", "天津"}); - add(new String[]{"宜昌万达广场", "宜昌"}); - add(new String[]{"宜昌商业步行街紫晶城", "宜昌"}); - add(new String[]{"宜昌商业步行街", "宜昌"}); - add(new String[]{"宜昌花园二期", "珠海"}); - add(new String[]{"宜昌南里", "天津"}); - add(new String[]{"宜昌北里", "天津"}); - add(new String[]{"宜昌馨园", "青岛"}); - add(new String[]{"宜昌家园", "青岛"}); - add(new String[]{"宜昌南里·塘沽区", "天津"}); - add(new String[]{"宜昌商业步行街小区", "宜昌"}); - }}); - city_DistrictNames.put("浙江", new ArrayList(){{ - add(new String[]{"浙江工业大学教师宿舍", "杭州"}); - add(new String[]{"浙江大厦", "太原"}); - add(new String[]{"浙江办事处宿舍", "太原"}); - add(new String[]{"浙江仁和居老年养生公寓", "湖州"}); - add(new String[]{"浙江交运大厦", "杭州"}); - add(new String[]{"浙江工商大学宿舍", "杭州"}); - add(new String[]{"浙江商贸城", "合肥"}); - add(new String[]{"浙江工业大学之江学院", "杭州"}); - }}); - city_DistrictNames.put("温州", new ArrayList(){{ - add(new String[]{"温州大厦", "海口"}); - add(new String[]{"温州城", "贵阳"}); - add(new String[]{"温州公寓", "贵阳"}); - add(new String[]{"温州商城", "湖州"}); - add(new String[]{"温州商城", "唐山"}); - add(new String[]{"温州世贸中心大厦", "温州"}); - add(new String[]{"温州世贸中心广场", "温州"}); - add(new String[]{"温州人才大厦", "温州"}); - add(new String[]{"温州龙湾万达广场", "温州"}); - add(new String[]{"温州城·都乐汇", "沈阳"}); - add(new String[]{"温州商城", "金华"}); - }}); - city_DistrictNames.put("乐清", new ArrayList(){{ - add(new String[]{"乐清小区", "深圳"}); - add(new String[]{"乐清·中央公馆", "乐清"}); - add(new String[]{"乐清财富新天地", "乐清"}); - add(new String[]{"乐清雁荡小镇", "乐清"}); - add(new String[]{"乐清花园", "绍兴"}); - add(new String[]{"乐清雁荡小镇", "温州"}); - add(new String[]{"乐清·中央公馆", "温州"}); - add(new String[]{"乐清财富新天地", "温州"}); - }}); - city_DistrictNames.put("吉林", new ArrayList(){{ - add(new String[]{"吉林大厦", "海口"}); - add(new String[]{"吉林花园", "贵阳"}); - add(new String[]{"吉林社区", "武汉"}); - add(new String[]{"吉林省团校家属楼", "长春"}); - add(new String[]{"吉林里", "天津"}); - }}); - city_DistrictNames.put("吉林", new ArrayList(){{ - add(new String[]{"吉林大厦", "海口"}); - add(new String[]{"吉林花园", "贵阳"}); - add(new String[]{"吉林社区", "武汉"}); - add(new String[]{"吉林省团校家属楼", "长春"}); - add(new String[]{"吉林里", "天津"}); - }}); - city_DistrictNames.put("黑龙江", new ArrayList(){{ - }}); - city_DistrictNames.put("大庆", new ArrayList(){{ - add(new String[]{"大庆一区", "威海"}); - add(new String[]{"大庆村石油小区", "重庆"}); - add(new String[]{"大庆蜀苑", "成都"}); - add(new String[]{"大庆里", "天津"}); - add(new String[]{"大庆新村", "宁波"}); - add(new String[]{"大庆新村", "湘潭"}); - add(new String[]{"大庆新村", "盐城"}); - }}); - city_DistrictNames.put("广西", new ArrayList(){{ - add(new String[]{"广西电视台宿舍", "南宁"}); - add(new String[]{"广西气象局新竹路生活小区", "南宁"}); - add(new String[]{"广西木材公司宿舍", "南宁"}); - add(new String[]{"广西壮族自治区司法厅宿舍", "南宁"}); - add(new String[]{"广西新闻出版局生活区", "南宁"}); - add(new String[]{"广西出入境检验检疫局宿舍", "南宁"}); - add(new String[]{"广西南宁白沙大道麻纺厂宿舍", "南宁"}); - add(new String[]{"广西区粮食局宿舍", "南宁"}); - add(new String[]{"广西电网公司生活区", "南宁"}); - add(new String[]{"广西超大公司宿舍", "南宁"}); - add(new String[]{"广西电力有限公司琅东生活区", "南宁"}); - add(new String[]{"广西二建一分公司宿舍", "南宁"}); - add(new String[]{"广西壮族自治区农业厅宿舍", "南宁"}); - add(new String[]{"广西二建宿舍", "南宁"}); - add(new String[]{"广西一建职工生活区", "南宁"}); - add(new String[]{"广西区丝绸公司宿舍", "南宁"}); - add(new String[]{"广西水电工程局科园基地", "南宁"}); - add(new String[]{"广西电网公司宿舍", "南宁"}); - add(new String[]{"广西六建生活区", "南宁"}); - add(new String[]{"广西重阳老年公寓", "南宁"}); - add(new String[]{"广西农业厅值保总站宿舍", "南宁"}); - add(new String[]{"广西地凯科技公司宿舍", "南宁"}); - add(new String[]{"广西机电设备公司宿舍", "南宁"}); - add(new String[]{"广西丰林林业集团", "南宁"}); - add(new String[]{"广西聚福隆灯饰广场", "南宁"}); - add(new String[]{"广西兴桂大厦", "南宁"}); - add(new String[]{"广西女子劳动教育改造宿舍", "南宁"}); - add(new String[]{"广西出版总社商住楼", "南宁"}); - add(new String[]{"广西第一安装公司生活区", "南宁"}); - add(new String[]{"广西器械厂宿舍", "南宁"}); - add(new String[]{"广西机械进出口公司宿舍", "南宁"}); - add(new String[]{"广西区档案局宿舍", "南宁"}); - add(new String[]{"广西发展大厦东楼", "南宁"}); - add(new String[]{"广西冶建一公司宿舍", "南宁"}); - add(new String[]{"广西外贸大院小区", "深圳"}); - add(new String[]{"广西日报社宿舍", "南宁"}); - add(new String[]{"广西农业机械研究院", "南宁"}); - add(new String[]{"广西招生考试院", "南宁"}); - add(new String[]{"广西兽医大院", "南宁"}); - add(new String[]{"广西华南烹饪专业学校宿舍", "南宁"}); - add(new String[]{"广西南宁南风机器总厂", "南宁"}); - add(new String[]{"广西区审计厅宿舍", "南宁"}); - add(new String[]{"广西卫生厅单位房", "南宁"}); - add(new String[]{"广西发展大厦", "南宁"}); - }}); - city_DistrictNames.put("南宁", new ArrayList(){{ - add(new String[]{"南宁奥园", "南宁"}); - add(new String[]{"南宁海事局宿舍", "南宁"}); - add(new String[]{"南宁市蔬菜研究所宿舍", "南宁"}); - add(new String[]{"南宁市电网公司宿舍", "南宁"}); - add(new String[]{"南宁市金融小区", "南宁"}); - add(new String[]{"南宁地区行政公署衡阳生活区", "南宁"}); - add(new String[]{"南宁供电局白沙生活区", "南宁"}); - add(new String[]{"南宁第四职业中学", "南宁"}); - add(new String[]{"南宁针织厂宿舍", "南宁"}); - add(new String[]{"南宁市橡胶厂宿舍", "南宁"}); - add(new String[]{"南宁监狱局宿舍", "南宁"}); - add(new String[]{"南宁建宁供用电工程宿舍", "南宁"}); - add(new String[]{"南宁荷花味精厂宿舍", "南宁"}); - add(new String[]{"南宁铝厂宿舍", "南宁"}); - add(new String[]{"南宁经济技术合作公司", "南宁"}); - add(new String[]{"南宁制糖造纸厂", "南宁"}); - add(new String[]{"南宁恒大绿洲", "南宁"}); - add(new String[]{"南宁市面粉厂宿舍", "南宁"}); - add(new String[]{"南宁市整治朝阳溪管理处宿舍", "南宁"}); - add(new String[]{"南宁市新环球橱柜广场", "南宁"}); - add(new String[]{"南宁机械厂宿舍(南区)", "南宁"}); - add(new String[]{"南宁市二建公司宿舍", "南宁"}); - add(new String[]{"南宁市聚秀园", "南宁"}); - add(new String[]{"南宁二轻宿舍", "南宁"}); - add(new String[]{"南宁边检站", "南宁"}); - add(new String[]{"南宁电信大楼", "南宁"}); - add(new String[]{"南宁重型机器厂生活区", "南宁"}); - add(new String[]{"南宁供电局祥宾路生活区", "南宁"}); - add(new String[]{"南宁材料厂", "南宁"}); - add(new String[]{"南宁被服厂宿舍", "南宁"}); - add(new String[]{"南宁市自来水公司宿舍", "南宁"}); - add(new String[]{"南宁嘉士摩根国际", "南宁"}); - add(new String[]{"南宁银杉电线电缆小区", "南宁"}); - add(new String[]{"南宁市机电公司宿舍", "南宁"}); - add(new String[]{"南宁市管理局宿舍", "南宁"}); - add(new String[]{"南宁市自来水公司河南水厂宿舍", "南宁"}); - add(new String[]{"南宁小区", "沈阳"}); - add(new String[]{"南宁馨苑", "沈阳"}); - add(new String[]{"南宁小区", "成都"}); - add(new String[]{"南宁市勘测院北湖住宅小区", "南宁"}); - add(new String[]{"南宁市机关车队宿舍", "南宁"}); - add(new String[]{"南宁市供电局", "南宁"}); - add(new String[]{"南宁毛纺厂宿舍", "南宁"}); - add(new String[]{"南宁日报社单位宿舍区", "南宁"}); - add(new String[]{"南宁职业技术学院四分院", "南宁"}); - add(new String[]{"南宁吉玛特", "曲靖"}); - add(new String[]{"南宁小区", "曲靖"}); - }}); - city_DistrictNames.put("广东", new ArrayList(){{ - add(new String[]{"广东外贸广场", "广州"}); - add(new String[]{"广东外语艺术学院教师宿舍", "广州"}); - add(new String[]{"广东建科院宿舍", "广州"}); - add(new String[]{"广东司法警官职业学院宿舍", "广州"}); - add(new String[]{"广东环保大厦", "广州"}); - add(new String[]{"广东商业大厦", "广州"}); - add(new String[]{"广东医学院教师宿舍楼", "东莞"}); - add(new String[]{"广东国际大厦", "广州"}); - add(new String[]{"广东省技术监督局宿舍", "广州"}); - add(new String[]{"广东工业大学宿舍", "广州"}); - add(new String[]{"广东教育学院宿舍", "广州"}); - add(new String[]{"广东省银行大厦", "深圳"}); - add(new String[]{"广东大厦", "天津"}); - add(new String[]{"广东山庄", "镇江"}); - add(new String[]{"广东红盾大厦", "广州"}); - add(new String[]{"广东药学院宿舍", "广州"}); - add(new String[]{"广东青年干部学院宿舍", "广州"}); - add(new String[]{"广东基础楼", "深圳"}); - add(new String[]{"广东省科技干部学院宿舍", "广州"}); - add(new String[]{"广东省农业管理干部学院社区", "广州"}); - add(new String[]{"广东芭蕾雨·逸景", "佛山"}); - }}); - city_DistrictNames.put("梅州", new ArrayList(){{ - add(new String[]{"梅州大厦", "广州"}); - add(new String[]{"梅州大楼", "上海"}); - add(new String[]{"梅州新村", "上海"}); - add(new String[]{"梅州大厦", "深圳"}); - }}); - city_DistrictNames.put("山东", new ArrayList(){{ - add(new String[]{"山东里", "秦皇岛"}); - add(new String[]{"山东经济学院宿舍", "济南"}); - add(new String[]{"山东省卫生厅宿舍", "济南"}); - add(new String[]{"山东省民政厅宿舍", "济南"}); - add(new String[]{"山东省商业集团总公司宿舍", "济南"}); - add(new String[]{"山东医科大学教师宿舍", "济南"}); - add(new String[]{"山东外贸大厦", "青岛"}); - add(new String[]{"山东大厦", "深圳"}); - add(new String[]{"山东堡社区", "沈阳"}); - add(new String[]{"山东艺术学院宿舍", "济南"}); - add(new String[]{"山东黄金崮云湖高尔夫别墅", "济南"}); - add(new String[]{"山东司法警官学院宿舍", "济南"}); - add(new String[]{"山东省科学院高新技术研究分院", "青岛"}); - add(new String[]{"山东建工学院宿舍", "济南"}); - add(new String[]{"山东庙小区", "沈阳"}); - add(new String[]{"山东乳山银滩海景房", "威海"}); - add(new String[]{"山东头村", "青岛"}); - add(new String[]{"山东省畜牧局宿舍", "济南"}); - }}); - city_DistrictNames.put("东营", new ArrayList(){{ - add(new String[]{"东营里5号院", "北京"}); - add(new String[]{"东营里1号院", "北京"}); - add(new String[]{"东营里2号院", "北京"}); - add(new String[]{"东营里3号院", "北京"}); - add(new String[]{"东营里", "北京"}); - add(new String[]{"东营房小区", "北京"}); - add(new String[]{"东营房八条", "北京"}); - }}); - city_DistrictNames.put("四川", new ArrayList(){{ - add(new String[]{"四川省直机关工委宿舍", "成都"}); - add(new String[]{"四川省林业厅宿舍", "成都"}); - add(new String[]{"四川音乐学院宿舍", "成都"}); - add(new String[]{"四川省闽中市驻疆办事处小区", "乌鲁木齐"}); - add(new String[]{"四川大厦", "厦门"}); - add(new String[]{"四川省科技厅宿舍", "成都"}); - add(new String[]{"四川专用汽车厂宿舍", "成都"}); - add(new String[]{"四川日报宿舍", "成都"}); - add(new String[]{"四川艺术职业学院家属楼", "成都"}); - add(new String[]{"四川营胡同", "北京"}); - add(new String[]{"四川小区", "上海"}); - add(new String[]{"四川幼师宿舍", "成都"}); - add(new String[]{"四川大学农林村", "成都"}); - }}); - city_DistrictNames.put("自贡", new ArrayList(){{ - add(new String[]{"自贡市塞纳河畔", "自贡"}); - }}); - city_DistrictNames.put("湖北", new ArrayList(){{ - add(new String[]{"湖北小区", "北京"}); - add(new String[]{"湖北宝丰花园", "深圳"}); - add(new String[]{"湖北经济学院宿舍", "武汉"}); - add(new String[]{"湖北大学宿舍", "武汉"}); - add(new String[]{"湖北日报宿舍", "武汉"}); - add(new String[]{"湖北省文联宿舍", "武汉"}); - add(new String[]{"湖北现代五金电器城", "武汉"}); - add(new String[]{"湖北饭店宿舍", "武汉"}); - add(new String[]{"湖北保险公司家属楼", "武汉"}); - add(new String[]{"湖北林业勘察院小区", "武汉"}); - add(new String[]{"湖北交通职业技术学院宿舍", "武汉"}); - add(new String[]{"湖北省艺术学校宿舍", "武汉"}); - add(new String[]{"湖北大厦", "厦门"}); - add(new String[]{"湖北质量监督局宿舍", "武汉"}); - add(new String[]{"湖北省医药监督管理局宿舍", "武汉"}); - add(new String[]{"湖北教育出版社宿舍", "武汉"}); - add(new String[]{"湖北省药材公司宿舍", "武汉"}); - add(new String[]{"湖北二师宿舍", "武汉"}); - add(new String[]{"湖北中医学院宿舍", "武汉"}); - add(new String[]{"湖北省生活资料公司居民小区", "武汉"}); - add(new String[]{"湖北商务广场", "武汉"}); - add(new String[]{"湖北教育学院宿舍", "武汉"}); - add(new String[]{"湖北省监狱管理局宿舍", "武汉"}); - add(new String[]{"湖北省安全监察局宿舍", "武汉"}); - }}); - city_DistrictNames.put("武汉", new ArrayList(){{ - add(new String[]{"武汉社区", "大连"}); - add(new String[]{"武汉小学单位宿舍", "武汉"}); - add(new String[]{"武汉中学书香苑", "武汉"}); - add(new String[]{"武汉雄楚楼社区", "武汉"}); - add(new String[]{"武汉话剧院宿舍", "武汉"}); - add(new String[]{"武汉楚剧团宿舍", "武汉"}); - add(new String[]{"武汉恒大城", "武汉"}); - add(new String[]{"武汉市委党委宿舍", "武汉"}); - add(new String[]{"武汉铁塔厂宿舍", "武汉"}); - add(new String[]{"武汉大学珞桂教师小区", "武汉"}); - add(new String[]{"武汉市老干部宿舍", "武汉"}); - add(new String[]{"武汉汉剧院宿舍", "武汉"}); - add(new String[]{"武汉汽车锁厂宿舍", "武汉"}); - add(new String[]{"武汉制药厂小区", "武汉"}); - add(new String[]{"武汉第一职教中心公寓", "武汉"}); - add(new String[]{"武汉市第一技术学校宿舍", "武汉"}); - add(new String[]{"武汉广场", "武汉"}); - add(new String[]{"武汉天地御江苑", "武汉"}); - add(new String[]{"武汉四中小区", "武汉"}); - add(new String[]{"武汉大厦", "厦门"}); - add(new String[]{"武汉机床厂宿舍", "武汉"}); - add(new String[]{"武汉长岛", "武汉"}); - add(new String[]{"武汉国信城", "武汉"}); - add(new String[]{"武汉生物研究所宿舍", "武汉"}); - add(new String[]{"武汉万锦江城", "武汉"}); - add(new String[]{"武汉晚报宿舍", "武汉"}); - add(new String[]{"武汉科技学院阳光校区宿舍", "武汉"}); - add(new String[]{"武汉博物馆宿舍", "武汉"}); - add(new String[]{"武汉公安局交警宿舍", "武汉"}); - add(new String[]{"武汉剧院村", "武汉"}); - add(new String[]{"武汉科技学院教师小区", "武汉"}); - add(new String[]{"武汉工程大学教工宿舍", "武汉"}); - add(new String[]{"武汉缝纫机厂宿舍", "武汉"}); - add(new String[]{"武汉交通学校家属区", "武汉"}); - add(new String[]{"武汉二建小区", "武汉"}); - add(new String[]{"武汉天润工业园", "武汉"}); - add(new String[]{"武汉恒丰上河图", "武汉"}); - add(new String[]{"武汉国际大厦", "武汉"}); - add(new String[]{"武汉国际会展中心", "武汉"}); - add(new String[]{"武汉大学宿舍", "武汉"}); - add(new String[]{"武汉科技大学教工宿舍", "武汉"}); - add(new String[]{"武汉纺织大学宿舍", "武汉"}); - add(new String[]{"武汉数码港", "武汉"}); - add(new String[]{"武汉新航城星城街区", "武汉"}); - add(new String[]{"武汉时代广场", "武汉"}); - add(new String[]{"武汉碧桂园别墅", "武汉"}); - }}); - city_DistrictNames.put("浙江", new ArrayList(){{ - add(new String[]{"浙江工业大学教师宿舍", "杭州"}); - add(new String[]{"浙江大厦", "太原"}); - add(new String[]{"浙江办事处宿舍", "太原"}); - add(new String[]{"浙江仁和居老年养生公寓", "湖州"}); - add(new String[]{"浙江交运大厦", "杭州"}); - add(new String[]{"浙江工商大学宿舍", "杭州"}); - add(new String[]{"浙江商贸城", "合肥"}); - add(new String[]{"浙江工业大学之江学院", "杭州"}); - }}); - city_DistrictNames.put("衢州", new ArrayList(){{ - add(new String[]{"衢州花园", "衢州"}); - add(new String[]{"衢州人家", "衢州"}); - add(new String[]{"衢州远景城", "衢州"}); - add(new String[]{"衢州·君悦东方", "衢州"}); - add(new String[]{"衢州广场西苑", "衢州"}); - }}); - city_DistrictNames.put("河北", new ArrayList(){{ - add(new String[]{"河北税务学校生活区", "石家庄"}); - add(new String[]{"河北经济日报社宿舍", "石家庄"}); - add(new String[]{"河北美术出版社宿舍", "石家庄"}); - add(new String[]{"河北物资宿舍", "石家庄"}); - add(new String[]{"河北化工医药职业技术学院宿舍", "石家庄"}); - add(new String[]{"河北电机宿舍", "石家庄"}); - add(new String[]{"河北日报社宿舍", "石家庄"}); - add(new String[]{"河北工程造价管理总站宿舍", "石家庄"}); - add(new String[]{"河北康城", "潍坊"}); - add(new String[]{"河北社区", "沈阳"}); - add(new String[]{"河北医科大学宿舍", "石家庄"}); - add(new String[]{"河北省人大宿舍", "石家庄"}); - add(new String[]{"河北新人家", "唐山"}); - add(new String[]{"河北一号", "唐山"}); - add(new String[]{"河北机要局宿舍", "石家庄"}); - add(new String[]{"河北广播电视报宿舍", "石家庄"}); - add(new String[]{"河北商城", "青岛"}); - add(new String[]{"河北长城饭店", "石家庄"}); - add(new String[]{"河北村小区", "北京"}); - add(new String[]{"河北桃江里", "天津"}); - add(new String[]{"河北师大青年公寓楼", "石家庄"}); - add(new String[]{"河北绛", "无锡"}); - add(new String[]{"河北社区", "本溪"}); - add(new String[]{"河北楼", "唐山"}); - }}); - city_DistrictNames.put("石家庄", new ArrayList(){{ - add(new String[]{"石家庄大学宿舍", "石家庄"}); - add(new String[]{"石家庄经济学院宿舍", "石家庄"}); - add(new String[]{"石家庄日报社宿舍", "石家庄"}); - add(new String[]{"石家庄饮食公司宿舍", "石家庄"}); - add(new String[]{"石家庄炼油厂二区", "石家庄"}); - add(new String[]{"石家庄学院宿舍", "石家庄"}); - }}); - city_DistrictNames.put("江西", new ArrayList(){{ - add(new String[]{"江西省建工集团", "南昌"}); - add(new String[]{"江西财经大学邮政宿舍", "南昌"}); - add(new String[]{"江西省图书馆宿舍", "南昌"}); - add(new String[]{"江西宾馆旁边", "南昌"}); - add(new String[]{"江西行政学院宿舍", "南昌"}); - add(new String[]{"江西财经大学宿舍", "南昌"}); - add(new String[]{"江西科技师范学院宿舍", "南昌"}); - add(new String[]{"江西省广播电台宿舍", "南昌"}); - add(new String[]{"江西东华计量研究所宿舍", "南昌"}); - add(new String[]{"江西客车厂宿舍", "南昌"}); - add(new String[]{"江西仪器厂宿舍", "南昌"}); - add(new String[]{"江西昌东汽车交易广场", "南昌"}); - add(new String[]{"江西旧货大世界", "南昌"}); - add(new String[]{"江西日报宿舍", "南昌"}); - }}); - city_DistrictNames.put("九江", new ArrayList(){{ - add(new String[]{"九江里", "天津"}); - add(new String[]{"九江小区", "丹东"}); - add(new String[]{"九江丽都", "丹东"}); - add(new String[]{"九江公寓", "丹东"}); - }}); - city_DistrictNames.put("广东", new ArrayList(){{ - add(new String[]{"广东外贸广场", "广州"}); - add(new String[]{"广东外语艺术学院教师宿舍", "广州"}); - add(new String[]{"广东建科院宿舍", "广州"}); - add(new String[]{"广东司法警官职业学院宿舍", "广州"}); - add(new String[]{"广东环保大厦", "广州"}); - add(new String[]{"广东商业大厦", "广州"}); - add(new String[]{"广东医学院教师宿舍楼", "东莞"}); - add(new String[]{"广东国际大厦", "广州"}); - add(new String[]{"广东省技术监督局宿舍", "广州"}); - add(new String[]{"广东工业大学宿舍", "广州"}); - add(new String[]{"广东教育学院宿舍", "广州"}); - add(new String[]{"广东省银行大厦", "深圳"}); - add(new String[]{"广东大厦", "天津"}); - add(new String[]{"广东山庄", "镇江"}); - add(new String[]{"广东红盾大厦", "广州"}); - add(new String[]{"广东药学院宿舍", "广州"}); - add(new String[]{"广东青年干部学院宿舍", "广州"}); - add(new String[]{"广东基础楼", "深圳"}); - add(new String[]{"广东省科技干部学院宿舍", "广州"}); - add(new String[]{"广东省农业管理干部学院社区", "广州"}); - add(new String[]{"广东芭蕾雨·逸景", "佛山"}); - }}); - city_DistrictNames.put("揭阳", new ArrayList(){{ - add(new String[]{"揭阳岭南明珠二期", "揭阳"}); - }}); - city_DistrictNames.put("北京", new ArrayList(){{ - add(new String[]{"北京GOLF公寓", "北京"}); - add(new String[]{"北京汇", "北京"}); - add(new String[]{"北京花园", "北京"}); - add(new String[]{"北京VISA", "北京"}); - add(new String[]{"北京科技大学家属楼", "北京"}); - add(new String[]{"北京ONE", "北京"}); - add(new String[]{"北京奥林匹克花园", "北京"}); - add(new String[]{"北京高尔夫公寓", "北京"}); - add(new String[]{"北京上舍", "北京"}); - add(new String[]{"北京湾", "北京"}); - add(new String[]{"北京华侨城", "北京"}); - add(new String[]{"北京青年城", "北京"}); - add(new String[]{"北京人家", "北京"}); - add(new String[]{"北京印象", "北京"}); - add(new String[]{"北京玫瑰园", "北京"}); - add(new String[]{"北京随园公寓", "北京"}); - add(new String[]{"北京尊府", "北京"}); - add(new String[]{"北京太阳城", "北京"}); - add(new String[]{"北京大厦", "海口"}); - add(new String[]{"北京第九区", "廊坊"}); - add(new String[]{"北京公园", "大连"}); - add(new String[]{"北京太阳城三期", "北京"}); - add(new String[]{"北京半岛", "北京"}); - add(new String[]{"北京好漾", "北京"}); - add(new String[]{"北京北", "北京"}); - add(new String[]{"北京公馆", "北京"}); - add(new String[]{"北京乡村高尔夫别墅", "北京"}); - add(new String[]{"北京农学院家属院", "北京"}); - add(new String[]{"北京广播学院家属院", "北京"}); - add(new String[]{"北京工商大学职工宿舍", "北京"}); - add(new String[]{"北京外国语大学家属院", "北京"}); - add(new String[]{"北京石油大院家属楼", "北京"}); - add(new String[]{"北京舞蹈学院小区", "北京"}); - add(new String[]{"北京城建熙城", "重庆"}); - add(new String[]{"北京公馆", "保定"}); - add(new String[]{"北京花园", "宜昌"}); - add(new String[]{"北京城花园小区", "乌鲁木齐"}); - add(new String[]{"北京城", "乌鲁木齐"}); - add(new String[]{"北京金山", "福州"}); - add(new String[]{"北京国际花园温泉别墅", "北京"}); - add(new String[]{"北京北辰高级花园别墅", "北京"}); - add(new String[]{"北京温溪山庄", "北京"}); - add(new String[]{"北京气象局宿舍", "北京"}); - add(new String[]{"北京城建·筑华年", "北京"}); - add(new String[]{"北京银泰中心", "北京"}); - add(new String[]{"北京龙脉温泉花园", "北京"}); - add(new String[]{"北京绿都源中心", "北京"}); - add(new String[]{"北京颐泉汇", "北京"}); - add(new String[]{"北京联合大学广告学院老师宿舍楼", "北京"}); - add(new String[]{"北京长毛绒厂宿舍", "北京"}); - add(new String[]{"北京嘉里中心", "北京"}); - add(new String[]{"北京辉盛阁国际公寓", "北京"}); - add(new String[]{"北京理想城", "保定"}); - add(new String[]{"北京国际航空俱乐部别墅", "北京"}); - add(new String[]{"北京香颂", "北京"}); - add(new String[]{"北京国际中心", "北京"}); - add(new String[]{"北京太阳城二期金色池塘", "北京"}); - add(new String[]{"北京南站车站路小区", "北京"}); - add(new String[]{"北京机械工业学院宿舍", "北京"}); - add(new String[]{"北京科技会展中心公寓", "北京"}); - add(new String[]{"北京太阳城别墅", "北京"}); - add(new String[]{"北京城建龙樾湾", "成都"}); - add(new String[]{"北京公馆", "唐山"}); - add(new String[]{"北京壹号公馆", "南通"}); - add(new String[]{"北京洋房", "北京"}); - add(new String[]{"北京城建·世华泊郡", "北京"}); - add(new String[]{"北京国立福利老年公寓", "北京"}); - add(new String[]{"北京四季世家", "北京"}); - add(new String[]{"北京耀辉国际城", "北京"}); - add(new String[]{"北京INN", "北京"}); - add(new String[]{"北京苏活", "北京"}); - add(new String[]{"北京城建·红木林", "北京"}); - add(new String[]{"北京城建·N次方", "北京"}); - add(new String[]{"北京新天地", "北京"}); - add(new String[]{"北京华贸城", "北京"}); - add(new String[]{"北京夏都湾", "北京"}); - add(new String[]{"北京风景", "北京"}); - add(new String[]{"北京第九区", "北京"}); - add(new String[]{"北京新邨", "上海"}); - add(new String[]{"北京大厦", "广州"}); - add(new String[]{"北京青果", "北京"}); - add(new String[]{"北京方糖", "北京"}); - add(new String[]{"北京自在城", "北京"}); - add(new String[]{"北京城建龙樾湾", "重庆"}); - }}); - city_DistrictNames.put("广东", new ArrayList(){{ - add(new String[]{"广东外贸广场", "广州"}); - add(new String[]{"广东外语艺术学院教师宿舍", "广州"}); - add(new String[]{"广东建科院宿舍", "广州"}); - add(new String[]{"广东司法警官职业学院宿舍", "广州"}); - add(new String[]{"广东环保大厦", "广州"}); - add(new String[]{"广东商业大厦", "广州"}); - add(new String[]{"广东医学院教师宿舍楼", "东莞"}); - add(new String[]{"广东国际大厦", "广州"}); - add(new String[]{"广东省技术监督局宿舍", "广州"}); - add(new String[]{"广东工业大学宿舍", "广州"}); - add(new String[]{"广东教育学院宿舍", "广州"}); - add(new String[]{"广东省银行大厦", "深圳"}); - add(new String[]{"广东大厦", "天津"}); - add(new String[]{"广东山庄", "镇江"}); - add(new String[]{"广东红盾大厦", "广州"}); - add(new String[]{"广东药学院宿舍", "广州"}); - add(new String[]{"广东青年干部学院宿舍", "广州"}); - add(new String[]{"广东基础楼", "深圳"}); - add(new String[]{"广东省科技干部学院宿舍", "广州"}); - add(new String[]{"广东省农业管理干部学院社区", "广州"}); - add(new String[]{"广东芭蕾雨·逸景", "佛山"}); - }}); - city_DistrictNames.put("江门", new ArrayList(){{ - add(new String[]{"江门奥园", "江门"}); - add(new String[]{"江门都市豪庭", "江门"}); - add(new String[]{"江门嘉悦名都", "江门"}); - add(new String[]{"江门里", "天津"}); - }}); - city_DistrictNames.put("云南", new ArrayList(){{ - add(new String[]{"云南大厦", "广州"}); - add(new String[]{"云南省杂技团家属院", "昆明"}); - add(new String[]{"云南华侨城", "昆明"}); - add(new String[]{"云南艺术家园区", "昆明"}); - add(new String[]{"云南农业大学教工住宅区", "昆明"}); - add(new String[]{"云南财经大学住宅", "昆明"}); - add(new String[]{"云南大学龙泉路小区", "昆明"}); - add(new String[]{"云南工业职业技术学院", "昆明"}); - add(new String[]{"云南印象城", "昆明"}); - add(new String[]{"云南映象", "昆明"}); - add(new String[]{"云南省畜牧局宿舍", "昆明"}); - add(new String[]{"云南省建筑材料学研究设计院", "昆明"}); - add(new String[]{"云南测绘工程院", "昆明"}); - add(new String[]{"云南省第一轻工机械厂", "昆明"}); - add(new String[]{"云南日报社单位房", "昆明"}); - add(new String[]{"云南白药厂单位福利房", "昆明"}); - add(new String[]{"云南大学东二院", "昆明"}); - add(new String[]{"云南省委党校生活区", "昆明"}); - add(new String[]{"云南印象城别墅", "昆明"}); - add(new String[]{"云南白药福利房", "昆明"}); - }}); - city_DistrictNames.put("大理白族自治州", new ArrayList(){{ - }}); - city_DistrictNames.put("大理", new ArrayList(){{ - add(new String[]{"大理小区", "贵阳"}); - add(new String[]{"大理小区17组团", "贵阳"}); - add(new String[]{"大理感通别墅", "昆明"}); - add(new String[]{"大理观音塘白族民居", "大理"}); - add(new String[]{"大理州环科院宿舍", "大理"}); - add(new String[]{"大理古城绿玉小区", "大理"}); - add(new String[]{"大理公馆", "大理"}); - add(new String[]{"大理春天广场", "昆明"}); - add(new String[]{"大理金港", "昆明"}); - add(new String[]{"大理学府商家", "昆明"}); - add(new String[]{"大理红龙井", "昆明"}); - add(new String[]{"大理南国城", "昆明"}); - add(new String[]{"大理洱海国际生态城", "大理"}); - }}); - city_DistrictNames.put("云南", new ArrayList(){{ - add(new String[]{"云南大厦", "广州"}); - add(new String[]{"云南省杂技团家属院", "昆明"}); - add(new String[]{"云南华侨城", "昆明"}); - add(new String[]{"云南艺术家园区", "昆明"}); - add(new String[]{"云南农业大学教工住宅区", "昆明"}); - add(new String[]{"云南财经大学住宅", "昆明"}); - add(new String[]{"云南大学龙泉路小区", "昆明"}); - add(new String[]{"云南工业职业技术学院", "昆明"}); - add(new String[]{"云南印象城", "昆明"}); - add(new String[]{"云南映象", "昆明"}); - add(new String[]{"云南省畜牧局宿舍", "昆明"}); - add(new String[]{"云南省建筑材料学研究设计院", "昆明"}); - add(new String[]{"云南测绘工程院", "昆明"}); - add(new String[]{"云南省第一轻工机械厂", "昆明"}); - add(new String[]{"云南日报社单位房", "昆明"}); - add(new String[]{"云南白药厂单位福利房", "昆明"}); - add(new String[]{"云南大学东二院", "昆明"}); - add(new String[]{"云南省委党校生活区", "昆明"}); - add(new String[]{"云南印象城别墅", "昆明"}); - add(new String[]{"云南白药福利房", "昆明"}); - }}); - city_DistrictNames.put("昆明", new ArrayList(){{ - add(new String[]{"昆明花园项目", "西安"}); - add(new String[]{"昆明社区", "大连"}); - add(new String[]{"昆明湖花园别墅", "北京"}); - add(new String[]{"昆明公寓", "天津"}); - add(new String[]{"昆明雅居", "沈阳"}); - add(new String[]{"昆明花园", "大连"}); - add(new String[]{"昆明大厦春苑", "西安"}); - add(new String[]{"昆明天湖岛温泉旅游渡假村酒店", "昆明"}); - add(new String[]{"昆明化油器厂", "昆明"}); - add(new String[]{"昆明卷烟厂田坝区", "昆明"}); - add(new String[]{"昆明医学院职工楼", "昆明"}); - add(new String[]{"昆明大学西二院", "昆明"}); - add(new String[]{"昆明人家", "昆明"}); - add(new String[]{"昆明傲城", "昆明"}); - add(new String[]{"昆明小区", "上海"}); - add(new String[]{"昆明公寓", "上海"}); - add(new String[]{"昆明玉器城翡翠花园", "昆明"}); - add(new String[]{"昆明机床厂", "昆明"}); - add(new String[]{"昆明档案局", "昆明"}); - add(new String[]{"昆明水泥厂", "昆明"}); - add(new String[]{"昆明日报社单位福利房", "昆明"}); - add(new String[]{"昆明灯具总厂", "昆明"}); - add(new String[]{"昆明机床厂宿舍", "昆明"}); - }}); - city_DistrictNames.put("广东", new ArrayList(){{ - add(new String[]{"广东外贸广场", "广州"}); - add(new String[]{"广东外语艺术学院教师宿舍", "广州"}); - add(new String[]{"广东建科院宿舍", "广州"}); - add(new String[]{"广东司法警官职业学院宿舍", "广州"}); - add(new String[]{"广东环保大厦", "广州"}); - add(new String[]{"广东商业大厦", "广州"}); - add(new String[]{"广东医学院教师宿舍楼", "东莞"}); - add(new String[]{"广东国际大厦", "广州"}); - add(new String[]{"广东省技术监督局宿舍", "广州"}); - add(new String[]{"广东工业大学宿舍", "广州"}); - add(new String[]{"广东教育学院宿舍", "广州"}); - add(new String[]{"广东省银行大厦", "深圳"}); - add(new String[]{"广东大厦", "天津"}); - add(new String[]{"广东山庄", "镇江"}); - add(new String[]{"广东红盾大厦", "广州"}); - add(new String[]{"广东药学院宿舍", "广州"}); - add(new String[]{"广东青年干部学院宿舍", "广州"}); - add(new String[]{"广东基础楼", "深圳"}); - add(new String[]{"广东省科技干部学院宿舍", "广州"}); - add(new String[]{"广东省农业管理干部学院社区", "广州"}); - add(new String[]{"广东芭蕾雨·逸景", "佛山"}); - }}); - city_DistrictNames.put("云浮", new ArrayList(){{ - add(new String[]{"云浮碧桂园", "肇庆"}); - add(new String[]{"云浮恒大城", "云浮"}); - }}); - city_DistrictNames.put("浙江", new ArrayList(){{ - add(new String[]{"浙江工业大学教师宿舍", "杭州"}); - add(new String[]{"浙江大厦", "太原"}); - add(new String[]{"浙江办事处宿舍", "太原"}); - add(new String[]{"浙江仁和居老年养生公寓", "湖州"}); - add(new String[]{"浙江交运大厦", "杭州"}); - add(new String[]{"浙江工商大学宿舍", "杭州"}); - add(new String[]{"浙江商贸城", "合肥"}); - add(new String[]{"浙江工业大学之江学院", "杭州"}); - }}); - city_DistrictNames.put("宁波", new ArrayList(){{ - add(new String[]{"宁波里", "天津"}); - add(new String[]{"宁波里", "武汉"}); - add(new String[]{"宁波商会大厦", "宁波"}); - add(new String[]{"宁波外代大厦", "宁波"}); - add(new String[]{"宁波小区", "上海"}); - }}); - city_DistrictNames.put("余姚", new ArrayList(){{ - add(new String[]{"余姚泰和家园", "宁波"}); - add(new String[]{"余姚小区", "上海"}); - add(new String[]{"余姚泰和家园", "余姚"}); - }}); - city_DistrictNames.put("广东", new ArrayList(){{ - add(new String[]{"广东外贸广场", "广州"}); - add(new String[]{"广东外语艺术学院教师宿舍", "广州"}); - add(new String[]{"广东建科院宿舍", "广州"}); - add(new String[]{"广东司法警官职业学院宿舍", "广州"}); - add(new String[]{"广东环保大厦", "广州"}); - add(new String[]{"广东商业大厦", "广州"}); - add(new String[]{"广东医学院教师宿舍楼", "东莞"}); - add(new String[]{"广东国际大厦", "广州"}); - add(new String[]{"广东省技术监督局宿舍", "广州"}); - add(new String[]{"广东工业大学宿舍", "广州"}); - add(new String[]{"广东教育学院宿舍", "广州"}); - add(new String[]{"广东省银行大厦", "深圳"}); - add(new String[]{"广东大厦", "天津"}); - add(new String[]{"广东山庄", "镇江"}); - add(new String[]{"广东红盾大厦", "广州"}); - add(new String[]{"广东药学院宿舍", "广州"}); - add(new String[]{"广东青年干部学院宿舍", "广州"}); - add(new String[]{"广东基础楼", "深圳"}); - add(new String[]{"广东省科技干部学院宿舍", "广州"}); - add(new String[]{"广东省农业管理干部学院社区", "广州"}); - add(new String[]{"广东芭蕾雨·逸景", "佛山"}); - }}); - city_DistrictNames.put("深圳", new ArrayList(){{ - add(new String[]{"深圳湾畔花园", "深圳"}); - add(new String[]{"深圳花园", "吉林"}); - add(new String[]{"深圳花园", "合肥"}); - add(new String[]{"深圳湾花园", "深圳"}); - add(new String[]{"深圳湾1号", "深圳"}); - add(new String[]{"深圳高尔夫别墅", "深圳"}); - add(new String[]{"深圳工业园", "襄阳"}); - add(new String[]{"深圳印象", "西宁"}); - add(new String[]{"深圳君临天下", "深圳"}); - add(new String[]{"深圳房地产大厦", "深圳"}); - add(new String[]{"深圳电子技术学校住宅", "深圳"}); - add(new String[]{"深圳发展银行宿舍", "深圳"}); - add(new String[]{"深圳来福士广场", "深圳"}); - add(new String[]{"深圳城市春天项目", "深圳"}); - }}); - city_DistrictNames.put("广东", new ArrayList(){{ - add(new String[]{"广东外贸广场", "广州"}); - add(new String[]{"广东外语艺术学院教师宿舍", "广州"}); - add(new String[]{"广东建科院宿舍", "广州"}); - add(new String[]{"广东司法警官职业学院宿舍", "广州"}); - add(new String[]{"广东环保大厦", "广州"}); - add(new String[]{"广东商业大厦", "广州"}); - add(new String[]{"广东医学院教师宿舍楼", "东莞"}); - add(new String[]{"广东国际大厦", "广州"}); - add(new String[]{"广东省技术监督局宿舍", "广州"}); - add(new String[]{"广东工业大学宿舍", "广州"}); - add(new String[]{"广东教育学院宿舍", "广州"}); - add(new String[]{"广东省银行大厦", "深圳"}); - add(new String[]{"广东大厦", "天津"}); - add(new String[]{"广东山庄", "镇江"}); - add(new String[]{"广东红盾大厦", "广州"}); - add(new String[]{"广东药学院宿舍", "广州"}); - add(new String[]{"广东青年干部学院宿舍", "广州"}); - add(new String[]{"广东基础楼", "深圳"}); - add(new String[]{"广东省科技干部学院宿舍", "广州"}); - add(new String[]{"广东省农业管理干部学院社区", "广州"}); - add(new String[]{"广东芭蕾雨·逸景", "佛山"}); - }}); - city_DistrictNames.put("惠州", new ArrayList(){{ - add(new String[]{"惠州星河丹堤", "惠州"}); - add(new String[]{"惠州里", "天津"}); - add(new String[]{"惠州海伦堡", "惠州"}); - add(new String[]{"惠州星河丹堤别墅", "惠州"}); - add(new String[]{"惠州凯悦华庭", "惠州"}); - add(new String[]{"惠州星河丹堤别墅", "深圳"}); - add(new String[]{"惠州蓝湾半岛", "惠州"}); - }}); - city_DistrictNames.put("河北", new ArrayList(){{ - add(new String[]{"河北税务学校生活区", "石家庄"}); - add(new String[]{"河北经济日报社宿舍", "石家庄"}); - add(new String[]{"河北美术出版社宿舍", "石家庄"}); - add(new String[]{"河北物资宿舍", "石家庄"}); - add(new String[]{"河北化工医药职业技术学院宿舍", "石家庄"}); - add(new String[]{"河北电机宿舍", "石家庄"}); - add(new String[]{"河北日报社宿舍", "石家庄"}); - add(new String[]{"河北工程造价管理总站宿舍", "石家庄"}); - add(new String[]{"河北康城", "潍坊"}); - add(new String[]{"河北社区", "沈阳"}); - add(new String[]{"河北医科大学宿舍", "石家庄"}); - add(new String[]{"河北省人大宿舍", "石家庄"}); - add(new String[]{"河北新人家", "唐山"}); - add(new String[]{"河北一号", "唐山"}); - add(new String[]{"河北机要局宿舍", "石家庄"}); - add(new String[]{"河北广播电视报宿舍", "石家庄"}); - add(new String[]{"河北商城", "青岛"}); - add(new String[]{"河北长城饭店", "石家庄"}); - add(new String[]{"河北村小区", "北京"}); - add(new String[]{"河北桃江里", "天津"}); - add(new String[]{"河北师大青年公寓楼", "石家庄"}); - add(new String[]{"河北绛", "无锡"}); - add(new String[]{"河北社区", "本溪"}); - add(new String[]{"河北楼", "唐山"}); - }}); - city_DistrictNames.put("保定", new ArrayList(){{ - add(new String[]{"保定里", "天津"}); - add(new String[]{"保定新村", "福州"}); - add(new String[]{"保定小区", "福州"}); - }}); - city_DistrictNames.put("云南", new ArrayList(){{ - add(new String[]{"云南大厦", "广州"}); - add(new String[]{"云南省杂技团家属院", "昆明"}); - add(new String[]{"云南华侨城", "昆明"}); - add(new String[]{"云南艺术家园区", "昆明"}); - add(new String[]{"云南农业大学教工住宅区", "昆明"}); - add(new String[]{"云南财经大学住宅", "昆明"}); - add(new String[]{"云南大学龙泉路小区", "昆明"}); - add(new String[]{"云南工业职业技术学院", "昆明"}); - add(new String[]{"云南印象城", "昆明"}); - add(new String[]{"云南映象", "昆明"}); - add(new String[]{"云南省畜牧局宿舍", "昆明"}); - add(new String[]{"云南省建筑材料学研究设计院", "昆明"}); - add(new String[]{"云南测绘工程院", "昆明"}); - add(new String[]{"云南省第一轻工机械厂", "昆明"}); - add(new String[]{"云南日报社单位房", "昆明"}); - add(new String[]{"云南白药厂单位福利房", "昆明"}); - add(new String[]{"云南大学东二院", "昆明"}); - add(new String[]{"云南省委党校生活区", "昆明"}); - add(new String[]{"云南印象城别墅", "昆明"}); - add(new String[]{"云南白药福利房", "昆明"}); - }}); - city_DistrictNames.put("曲靖", new ArrayList(){{ - add(new String[]{"曲靖供电局一生活区", "曲靖"}); - add(new String[]{"曲靖圣庭花园", "曲靖"}); - add(new String[]{"曲靖工行康桥生活区", "曲靖"}); - add(new String[]{"曲靖都市印象", "曲靖"}); - add(new String[]{"曲靖市水务小区", "曲靖"}); - }}); - city_DistrictNames.put("河南", new ArrayList(){{ - add(new String[]{"河南庄小区", "青岛"}); - add(new String[]{"河南财专家属院", "郑州"}); - add(new String[]{"河南省新华书店家属院", "郑州"}); - add(new String[]{"河南省商业科学研究所家属院", "郑州"}); - add(new String[]{"河南省日报社家属院", "郑州"}); - add(new String[]{"河南女子高中家属院", "郑州"}); - add(new String[]{"河南外贸大院", "深圳"}); - add(new String[]{"河南里", "天津"}); - add(new String[]{"河南新村", "福州"}); - add(new String[]{"河南财经学院家属院", "郑州"}); - add(new String[]{"河南岸公园小区", "惠州"}); - add(new String[]{"河南岸新村", "惠州"}); - add(new String[]{"河南村", "北京"}); - add(new String[]{"河南理工学校家属院", "郑州"}); - add(new String[]{"河南省人事厅家属院", "郑州"}); - add(new String[]{"河南岸中心小区", "惠州"}); - add(new String[]{"河南省外贸学校家属院", "郑州"}); - add(new String[]{"河南村", "上海"}); - add(new String[]{"河南新村", "上海"}); - add(new String[]{"河南工业大学家属院", "郑州"}); - }}); - city_DistrictNames.put("安阳", new ArrayList(){{ - add(new String[]{"安阳花苑", "常州"}); - add(new String[]{"安阳里", "天津"}); - add(new String[]{"安阳小区", "大连"}); - add(new String[]{"安阳小区", "上海"}); - }}); - city_DistrictNames.put("广东", new ArrayList(){{ - add(new String[]{"广东外贸广场", "广州"}); - add(new String[]{"广东外语艺术学院教师宿舍", "广州"}); - add(new String[]{"广东建科院宿舍", "广州"}); - add(new String[]{"广东司法警官职业学院宿舍", "广州"}); - add(new String[]{"广东环保大厦", "广州"}); - add(new String[]{"广东商业大厦", "广州"}); - add(new String[]{"广东医学院教师宿舍楼", "东莞"}); - add(new String[]{"广东国际大厦", "广州"}); - add(new String[]{"广东省技术监督局宿舍", "广州"}); - add(new String[]{"广东工业大学宿舍", "广州"}); - add(new String[]{"广东教育学院宿舍", "广州"}); - add(new String[]{"广东省银行大厦", "深圳"}); - add(new String[]{"广东大厦", "天津"}); - add(new String[]{"广东山庄", "镇江"}); - add(new String[]{"广东红盾大厦", "广州"}); - add(new String[]{"广东药学院宿舍", "广州"}); - add(new String[]{"广东青年干部学院宿舍", "广州"}); - add(new String[]{"广东基础楼", "深圳"}); - add(new String[]{"广东省科技干部学院宿舍", "广州"}); - add(new String[]{"广东省农业管理干部学院社区", "广州"}); - add(new String[]{"广东芭蕾雨·逸景", "佛山"}); - }}); - city_DistrictNames.put("佛山", new ArrayList(){{ - add(new String[]{"佛山奥园凯茵苑", "佛山"}); - add(new String[]{"佛山奥园灏景峰", "佛山"}); - add(new String[]{"佛山雅居乐", "佛山"}); - add(new String[]{"佛山雅居乐花园", "佛山"}); - add(new String[]{"佛山奥园凯旋湾", "佛山"}); - add(new String[]{"佛山里", "天津"}); - add(new String[]{"佛山苑", "济南"}); - add(new String[]{"佛山奥园", "佛山"}); - add(new String[]{"佛山力迅上筑", "佛山"}); - add(new String[]{"佛山大学教师住宅", "佛山"}); - add(new String[]{"佛山奥园威尼水岸", "佛山"}); - add(new String[]{"佛山奥园美林水岸", "佛山"}); - add(new String[]{"佛山奥园贝沙轩", "佛山"}); - add(new String[]{"佛山奥园美林水岸", "顺德"}); - add(new String[]{"佛山奥园灏景峰", "顺德"}); - add(new String[]{"佛山奥园", "顺德"}); - add(new String[]{"佛山奥园凯茵苑", "顺德"}); - add(new String[]{"佛山奥园贝沙轩", "顺德"}); - add(new String[]{"佛山万科广场", "佛山"}); - add(new String[]{"佛山万科城", "佛山"}); - add(new String[]{"佛山雅居乐花园别墅", "佛山"}); - }}); - city_DistrictNames.put("四川", new ArrayList(){{ - add(new String[]{"四川省直机关工委宿舍", "成都"}); - add(new String[]{"四川省林业厅宿舍", "成都"}); - add(new String[]{"四川音乐学院宿舍", "成都"}); - add(new String[]{"四川省闽中市驻疆办事处小区", "乌鲁木齐"}); - add(new String[]{"四川大厦", "厦门"}); - add(new String[]{"四川省科技厅宿舍", "成都"}); - add(new String[]{"四川专用汽车厂宿舍", "成都"}); - add(new String[]{"四川日报宿舍", "成都"}); - add(new String[]{"四川艺术职业学院家属楼", "成都"}); - add(new String[]{"四川营胡同", "北京"}); - add(new String[]{"四川小区", "上海"}); - add(new String[]{"四川幼师宿舍", "成都"}); - add(new String[]{"四川大学农林村", "成都"}); - }}); - city_DistrictNames.put("绵阳", new ArrayList(){{ - add(new String[]{"绵阳电力小区", "绵阳"}); - add(new String[]{"绵阳电力小区", "绵阳"}); - }}); - city_DistrictNames.put("广东", new ArrayList(){{ - add(new String[]{"广东外贸广场", "广州"}); - add(new String[]{"广东外语艺术学院教师宿舍", "广州"}); - add(new String[]{"广东建科院宿舍", "广州"}); - add(new String[]{"广东司法警官职业学院宿舍", "广州"}); - add(new String[]{"广东环保大厦", "广州"}); - add(new String[]{"广东商业大厦", "广州"}); - add(new String[]{"广东医学院教师宿舍楼", "东莞"}); - add(new String[]{"广东国际大厦", "广州"}); - add(new String[]{"广东省技术监督局宿舍", "广州"}); - add(new String[]{"广东工业大学宿舍", "广州"}); - add(new String[]{"广东教育学院宿舍", "广州"}); - add(new String[]{"广东省银行大厦", "深圳"}); - add(new String[]{"广东大厦", "天津"}); - add(new String[]{"广东山庄", "镇江"}); - add(new String[]{"广东红盾大厦", "广州"}); - add(new String[]{"广东药学院宿舍", "广州"}); - add(new String[]{"广东青年干部学院宿舍", "广州"}); - add(new String[]{"广东基础楼", "深圳"}); - add(new String[]{"广东省科技干部学院宿舍", "广州"}); - add(new String[]{"广东省农业管理干部学院社区", "广州"}); - add(new String[]{"广东芭蕾雨·逸景", "佛山"}); - }}); - city_DistrictNames.put("潮州", new ArrayList(){{ - add(new String[]{"潮州恒大城", "潮州"}); - }}); - city_DistrictNames.put("浙江", new ArrayList(){{ - add(new String[]{"浙江工业大学教师宿舍", "杭州"}); - add(new String[]{"浙江大厦", "太原"}); - add(new String[]{"浙江办事处宿舍", "太原"}); - add(new String[]{"浙江仁和居老年养生公寓", "湖州"}); - add(new String[]{"浙江交运大厦", "杭州"}); - add(new String[]{"浙江工商大学宿舍", "杭州"}); - add(new String[]{"浙江商贸城", "合肥"}); - add(new String[]{"浙江工业大学之江学院", "杭州"}); - }}); - city_DistrictNames.put("嘉兴", new ArrayList(){{ - add(new String[]{"嘉兴小区", "海口"}); - add(new String[]{"嘉兴花园", "嘉兴"}); - add(new String[]{"嘉兴-青年新城", "保定"}); - add(new String[]{"嘉兴花园", "太原"}); - add(new String[]{"嘉兴国际中港城购物中心公寓", "嘉兴"}); - add(new String[]{"嘉兴花园", "威海"}); - add(new String[]{"嘉兴花园", "东莞"}); - add(new String[]{"嘉兴小区", "佛山"}); - add(new String[]{"嘉兴楼", "东莞"}); - add(new String[]{"嘉兴苑", "太原"}); - add(new String[]{"嘉兴总部商务花园", "嘉兴"}); - add(new String[]{"嘉兴苑", "深圳"}); - add(new String[]{"嘉兴社区", "沈阳"}); - add(new String[]{"嘉兴青年新城", "保定"}); - add(new String[]{"嘉兴逸园", "绵阳"}); - add(new String[]{"嘉兴青年新城", "保定"}); - add(new String[]{"嘉兴小区", "福州"}); - add(new String[]{"嘉兴园", "厦门"}); - add(new String[]{"嘉兴苑", "合肥"}); - add(new String[]{"嘉兴园", "西安"}); - add(new String[]{"嘉兴苑别墅区", "太原"}); - add(new String[]{"嘉兴国际", "沈阳"}); - add(new String[]{"嘉兴东苑", "杭州"}); - add(new String[]{"嘉兴花园", "重庆"}); - add(new String[]{"嘉兴园", "武汉"}); - add(new String[]{"嘉兴东方巴黎城", "嘉兴"}); - add(new String[]{"嘉兴东方巴黎城别墅", "嘉兴"}); - add(new String[]{"嘉兴中安市场", "嘉兴"}); - add(new String[]{"嘉兴南湖投资养老房", "嘉兴"}); - add(new String[]{"嘉兴苑", "昆山"}); - add(new String[]{"嘉兴国际电气城", "上海"}); - add(new String[]{"嘉兴国际中港城购物中心公寓", "上海"}); - add(new String[]{"嘉兴南湖投资养老房", "上海"}); - add(new String[]{"嘉兴东方巴黎城", "上海"}); - add(new String[]{"嘉兴国际大厦", "沈阳"}); - add(new String[]{"嘉兴商城", "嘉兴"}); - }}); - city_DistrictNames.put("湖南", new ArrayList(){{ - add(new String[]{"湖南大厦", "海口"}); - add(new String[]{"湖南师大张公岭校区宿舍", "长沙"}); - add(new String[]{"湖南省进出口公司宿舍", "长沙"}); - add(new String[]{"湖南广电宿舍", "长沙"}); - add(new String[]{"湖南机床厂宿舍", "长沙"}); - add(new String[]{"湖南制药厂宿舍", "长沙"}); - add(new String[]{"湖南供销大厦", "长沙"}); - add(new String[]{"湖南化工医药设计院宿舍", "长沙"}); - add(new String[]{"湖南工商银行宿舍机关大院", "长沙"}); - add(new String[]{"湖南省国防科公办机关院内宿舍", "长沙"}); - add(new String[]{"湖南报业文化城", "长沙"}); - add(new String[]{"湖南省交通设计院", "长沙"}); - add(new String[]{"湖南联通住宅小区", "长沙"}); - add(new String[]{"湖南电视台单位宿舍", "长沙"}); - add(new String[]{"湖南开关厂宿舍", "长沙"}); - add(new String[]{"湖南小区", "北京"}); - add(new String[]{"湖南邮电新村小区", "鞍山"}); - add(new String[]{"湖南省科学技术厅宿舍", "长沙"}); - add(new String[]{"湖南省国安厅单位房", "长沙"}); - add(new String[]{"湖南省木偶剧团宿舍", "长沙"}); - add(new String[]{"湖南省气象局宿舍", "长沙"}); - add(new String[]{"湖南女子大学教师公寓", "长沙"}); - add(new String[]{"湖南省农业机械研究所", "长沙"}); - add(new String[]{"湖南教育装备综合大楼", "长沙"}); - add(new String[]{"湖南省劳动卫生所", "长沙"}); - add(new String[]{"湖南省质量技术监督局宿舍", "长沙"}); - add(new String[]{"湖南省金属回收公司宿舍", "长沙"}); - add(new String[]{"湖南省塑料研究所", "长沙"}); - add(new String[]{"湖南省高级人民检查院单位房", "长沙"}); - add(new String[]{"湖南交通职院宿舍", "长沙"}); - add(new String[]{"湖南省冶金材料研究所", "长沙"}); - add(new String[]{"湖南金蜂音像出版社", "长沙"}); - add(new String[]{"湖南省物资厅宿舍", "长沙"}); - add(new String[]{"湖南家电商城", "长沙"}); - add(new String[]{"湖南国际商务中心", "长沙"}); - add(new String[]{"湖南财富中心", "长沙"}); - add(new String[]{"湖南国际汽车城", "长沙"}); - add(new String[]{"湖南亚大数码港", "长沙"}); - add(new String[]{"湖南大厦", "南宁"}); - add(new String[]{"湖南大厦", "上海"}); - add(new String[]{"湖南星沙汽配城", "长沙"}); - add(new String[]{"湖南艺校单位房", "长沙"}); - add(new String[]{"湖南财专教职工宿舍", "长沙"}); - add(new String[]{"湖南省机械进出口公司宿舍", "长沙"}); - add(new String[]{"湖南日报单位宿舍", "长沙"}); - add(new String[]{"湖南岸后畈小区", "绍兴"}); - }}); - city_DistrictNames.put("湘潭", new ArrayList(){{ - add(new String[]{"湘潭花园小区", "吉林"}); - add(new String[]{"湘潭小区", "吉林"}); - add(new String[]{"湘潭社区", "吉林"}); - add(new String[]{"湘潭东里", "天津"}); - add(new String[]{"湘潭里", "天津"}); - }}); - city_DistrictNames.put("福建", new ArrayList(){{ - add(new String[]{"福建园", "南宁"}); - add(new String[]{"福建省四建宿舍北门", "厦门"}); - add(new String[]{"福建联通花园", "福州"}); - add(new String[]{"福建日报社宿舍", "福州"}); - add(new String[]{"福建省中心检验所单位宿舍", "福州"}); - add(new String[]{"福建电影制片厂单位宿舍", "福州"}); - add(new String[]{"福建省女子监狱宿舍", "福州"}); - add(new String[]{"福建省医药公司大王里单位宿舍", "福州"}); - add(new String[]{"福建省第二公路工程公司宿舍", "福州"}); - add(new String[]{"福建省蚕桑研究所单位宿舍", "福州"}); - add(new String[]{"福建新村", "南京"}); - add(new String[]{"福建里", "天津"}); - add(new String[]{"福建社区", "武汉"}); - add(new String[]{"福建大厦", "贵阳"}); - add(new String[]{"福建巷小区", "成都"}); - add(new String[]{"福建大厦", "深圳"}); - add(new String[]{"福建生态工程学校单位宿舍", "福州"}); - add(new String[]{"福建医科大学教工宿舍", "福州"}); - }}); - city_DistrictNames.put("莆田", new ArrayList(){{ - add(new String[]{"莆田万科城", "莆田"}); - add(new String[]{"莆田学园花园", "莆田"}); - }}); - city_DistrictNames.put("河南", new ArrayList(){{ - add(new String[]{"河南庄小区", "青岛"}); - add(new String[]{"河南财专家属院", "郑州"}); - add(new String[]{"河南省新华书店家属院", "郑州"}); - add(new String[]{"河南省商业科学研究所家属院", "郑州"}); - add(new String[]{"河南省日报社家属院", "郑州"}); - add(new String[]{"河南女子高中家属院", "郑州"}); - add(new String[]{"河南外贸大院", "深圳"}); - add(new String[]{"河南里", "天津"}); - add(new String[]{"河南新村", "福州"}); - add(new String[]{"河南财经学院家属院", "郑州"}); - add(new String[]{"河南岸公园小区", "惠州"}); - add(new String[]{"河南岸新村", "惠州"}); - add(new String[]{"河南村", "北京"}); - add(new String[]{"河南理工学校家属院", "郑州"}); - add(new String[]{"河南省人事厅家属院", "郑州"}); - add(new String[]{"河南岸中心小区", "惠州"}); - add(new String[]{"河南省外贸学校家属院", "郑州"}); - add(new String[]{"河南村", "上海"}); - add(new String[]{"河南新村", "上海"}); - add(new String[]{"河南工业大学家属院", "郑州"}); - }}); - city_DistrictNames.put("郑州", new ArrayList(){{ - add(new String[]{"郑州图书城家属院", "郑州"}); - add(new String[]{"郑州西四环建材市场", "郑州"}); - add(new String[]{"郑州国际城", "郑州"}); - add(new String[]{"郑州轻工业学院家属院", "郑州"}); - add(new String[]{"郑州箱包城", "郑州"}); - add(new String[]{"郑州晚报社家属院", "郑州"}); - add(new String[]{"郑州核五院家属院", "郑州"}); - add(new String[]{"郑州市政法委家属院", "郑州"}); - add(new String[]{"郑州日报社家属院", "郑州"}); - add(new String[]{"郑州欧丽公司家属院", "郑州"}); - add(new String[]{"郑州恒大名都", "郑州"}); - add(new String[]{"郑州大酒店", "郑州"}); - add(new String[]{"郑州劳动服务公司家属院", "郑州"}); - add(new String[]{"郑州大厨房农副产品物流港", "郑州"}); - add(new String[]{"郑州国际美食娱乐广场", "郑州"}); - add(new String[]{"郑州国贸中心", "郑州"}); - }}); - city_DistrictNames.put("福建", new ArrayList(){{ - add(new String[]{"福建园", "南宁"}); - add(new String[]{"福建省四建宿舍北门", "厦门"}); - add(new String[]{"福建联通花园", "福州"}); - add(new String[]{"福建日报社宿舍", "福州"}); - add(new String[]{"福建省中心检验所单位宿舍", "福州"}); - add(new String[]{"福建电影制片厂单位宿舍", "福州"}); - add(new String[]{"福建省女子监狱宿舍", "福州"}); - add(new String[]{"福建省医药公司大王里单位宿舍", "福州"}); - add(new String[]{"福建省第二公路工程公司宿舍", "福州"}); - add(new String[]{"福建省蚕桑研究所单位宿舍", "福州"}); - add(new String[]{"福建新村", "南京"}); - add(new String[]{"福建里", "天津"}); - add(new String[]{"福建社区", "武汉"}); - add(new String[]{"福建大厦", "贵阳"}); - add(new String[]{"福建巷小区", "成都"}); - add(new String[]{"福建大厦", "深圳"}); - add(new String[]{"福建生态工程学校单位宿舍", "福州"}); - add(new String[]{"福建医科大学教工宿舍", "福州"}); - }}); - city_DistrictNames.put("福州", new ArrayList(){{ - add(new String[]{"福州一中三牧坊单位宿舍", "福州"}); - add(new String[]{"福州公安公寓", "福州"}); - add(new String[]{"福州春天", "福州"}); - add(new String[]{"福州市公安局小柳单位宿舍", "福州"}); - add(new String[]{"福州奥林匹克花园", "福州"}); - add(new String[]{"福州人民日报社印务中心单位宿舍", "福州"}); - add(new String[]{"福州发展和改革委员会单位宿舍", "福州"}); - add(new String[]{"福州星势力", "福州"}); - add(new String[]{"福州豪庭", "福州"}); - add(new String[]{"福州豪廷", "福州"}); - add(new String[]{"福州大楼", "上海"}); - }}); - city_DistrictNames.put("湖南", new ArrayList(){{ - add(new String[]{"湖南大厦", "海口"}); - add(new String[]{"湖南师大张公岭校区宿舍", "长沙"}); - add(new String[]{"湖南省进出口公司宿舍", "长沙"}); - add(new String[]{"湖南广电宿舍", "长沙"}); - add(new String[]{"湖南机床厂宿舍", "长沙"}); - add(new String[]{"湖南制药厂宿舍", "长沙"}); - add(new String[]{"湖南供销大厦", "长沙"}); - add(new String[]{"湖南化工医药设计院宿舍", "长沙"}); - add(new String[]{"湖南工商银行宿舍机关大院", "长沙"}); - add(new String[]{"湖南省国防科公办机关院内宿舍", "长沙"}); - add(new String[]{"湖南报业文化城", "长沙"}); - add(new String[]{"湖南省交通设计院", "长沙"}); - add(new String[]{"湖南联通住宅小区", "长沙"}); - add(new String[]{"湖南电视台单位宿舍", "长沙"}); - add(new String[]{"湖南开关厂宿舍", "长沙"}); - add(new String[]{"湖南小区", "北京"}); - add(new String[]{"湖南邮电新村小区", "鞍山"}); - add(new String[]{"湖南省科学技术厅宿舍", "长沙"}); - add(new String[]{"湖南省国安厅单位房", "长沙"}); - add(new String[]{"湖南省木偶剧团宿舍", "长沙"}); - add(new String[]{"湖南省气象局宿舍", "长沙"}); - add(new String[]{"湖南女子大学教师公寓", "长沙"}); - add(new String[]{"湖南省农业机械研究所", "长沙"}); - add(new String[]{"湖南教育装备综合大楼", "长沙"}); - add(new String[]{"湖南省劳动卫生所", "长沙"}); - add(new String[]{"湖南省质量技术监督局宿舍", "长沙"}); - add(new String[]{"湖南省金属回收公司宿舍", "长沙"}); - add(new String[]{"湖南省塑料研究所", "长沙"}); - add(new String[]{"湖南省高级人民检查院单位房", "长沙"}); - add(new String[]{"湖南交通职院宿舍", "长沙"}); - add(new String[]{"湖南省冶金材料研究所", "长沙"}); - add(new String[]{"湖南金蜂音像出版社", "长沙"}); - add(new String[]{"湖南省物资厅宿舍", "长沙"}); - add(new String[]{"湖南家电商城", "长沙"}); - add(new String[]{"湖南国际商务中心", "长沙"}); - add(new String[]{"湖南财富中心", "长沙"}); - add(new String[]{"湖南国际汽车城", "长沙"}); - add(new String[]{"湖南亚大数码港", "长沙"}); - add(new String[]{"湖南大厦", "南宁"}); - add(new String[]{"湖南大厦", "上海"}); - add(new String[]{"湖南星沙汽配城", "长沙"}); - add(new String[]{"湖南艺校单位房", "长沙"}); - add(new String[]{"湖南财专教职工宿舍", "长沙"}); - add(new String[]{"湖南省机械进出口公司宿舍", "长沙"}); - add(new String[]{"湖南日报单位宿舍", "长沙"}); - add(new String[]{"湖南岸后畈小区", "绍兴"}); - }}); - city_DistrictNames.put("长沙", new ArrayList(){{ - add(new String[]{"长沙市长堪设计院", "长沙"}); - add(new String[]{"长沙银行单位房", "长沙"}); - add(new String[]{"长沙恒大绿洲", "长沙"}); - add(new String[]{"长沙南苑小区", "长沙"}); - add(new String[]{"长沙市烟草专卖局单位宿舍", "长沙"}); - add(new String[]{"长沙理工大学教职工住宅区", "长沙"}); - add(new String[]{"长沙烟草局宿舍", "长沙"}); - add(new String[]{"长沙晚报宿舍", "长沙"}); - add(new String[]{"长沙市委党校宿舍", "长沙"}); - add(new String[]{"长沙标准件厂宿舍", "长沙"}); - add(new String[]{"长沙冶金厂宿舍", "长沙"}); - add(new String[]{"长沙市一中宿舍", "长沙"}); - add(new String[]{"长沙白沙啤酒公寓", "长沙"}); - add(new String[]{"长沙恒大城", "长沙"}); - add(new String[]{"长沙世茂铂翠湾", "长沙"}); - add(new String[]{"长沙第二十六中宿舍", "长沙"}); - add(new String[]{"长沙市九中宿舍", "长沙"}); - add(new String[]{"长沙市美术公司宿舍", "长沙"}); - add(new String[]{"长沙勘察设计院宿舍单位房", "长沙"}); - add(new String[]{"长沙市规划设计院宿舍", "长沙"}); - add(new String[]{"长沙污水处理厂宿舍", "长沙"}); - add(new String[]{"长沙商贸旅游教师宿舍", "长沙"}); - add(new String[]{"长沙伍家岭生活广场", "长沙"}); - add(new String[]{"长沙新大新大厦", "长沙"}); - add(new String[]{"长沙新苑", "珠海"}); - add(new String[]{"长沙卷烟厂宿舍", "长沙"}); - add(new String[]{"长沙市雨花区工贸学院", "长沙"}); - add(new String[]{"长沙生态动物园宠物馆门面", "长沙"}); - add(new String[]{"长沙监狱宿舍", "长沙"}); - add(new String[]{"长沙市营山巷52", "长沙"}); - add(new String[]{"长沙市外运宿舍", "长沙"}); - add(new String[]{"长沙理工金盆岭小区宿舍", "长沙"}); - add(new String[]{"长沙市质量技术监督局住宅小区", "长沙"}); - add(new String[]{"长沙二十一中宿舍", "长沙"}); - add(new String[]{"长沙茶市", "长沙"}); - add(new String[]{"长沙轴承厂宿舍", "长沙"}); - add(new String[]{"长沙冷柜厂宿舍", "长沙"}); - add(new String[]{"长沙玫瑰园别墅", "长沙"}); - add(new String[]{"长沙市国土局宿舍", "长沙"}); - add(new String[]{"长沙文化广场", "长沙"}); - add(new String[]{"长沙玫瑰园", "长沙"}); - add(new String[]{"长沙开福万达广场", "长沙"}); - add(new String[]{"长沙欧洲城", "长沙"}); - add(new String[]{"长沙深国投", "长沙"}); - add(new String[]{"长沙小区", "青岛"}); - add(new String[]{"长沙县财政局", "长沙"}); - add(new String[]{"长沙县林业局单位房", "长沙"}); - add(new String[]{"长沙县农机局宿舍", "长沙"}); - add(new String[]{"长沙县公安局单位房", "长沙"}); - add(new String[]{"长沙玻璃纤维厂宿舍", "长沙"}); - add(new String[]{"长沙奥林匹克花园", "长沙"}); - add(new String[]{"长沙嘉华城", "长沙"}); - add(new String[]{"长沙之芯", "长沙"}); - add(new String[]{"长沙港小区", "长沙"}); - }}); - city_DistrictNames.put("河南", new ArrayList(){{ - add(new String[]{"河南庄小区", "青岛"}); - add(new String[]{"河南财专家属院", "郑州"}); - add(new String[]{"河南省新华书店家属院", "郑州"}); - add(new String[]{"河南省商业科学研究所家属院", "郑州"}); - add(new String[]{"河南省日报社家属院", "郑州"}); - add(new String[]{"河南女子高中家属院", "郑州"}); - add(new String[]{"河南外贸大院", "深圳"}); - add(new String[]{"河南里", "天津"}); - add(new String[]{"河南新村", "福州"}); - add(new String[]{"河南财经学院家属院", "郑州"}); - add(new String[]{"河南岸公园小区", "惠州"}); - add(new String[]{"河南岸新村", "惠州"}); - add(new String[]{"河南村", "北京"}); - add(new String[]{"河南理工学校家属院", "郑州"}); - add(new String[]{"河南省人事厅家属院", "郑州"}); - add(new String[]{"河南岸中心小区", "惠州"}); - add(new String[]{"河南省外贸学校家属院", "郑州"}); - add(new String[]{"河南村", "上海"}); - add(new String[]{"河南新村", "上海"}); - add(new String[]{"河南工业大学家属院", "郑州"}); - }}); - city_DistrictNames.put("新乡", new ArrayList(){{ - add(new String[]{"新乡县安居小区", "新乡"}); - }}); - city_DistrictNames.put("江苏", new ArrayList(){{ - add(new String[]{"江苏省农科院", "南京"}); - add(new String[]{"江苏油田石油山庄", "扬州"}); - add(new String[]{"江苏警官学院", "南京"}); - add(new String[]{"江苏省高级专家园", "南京"}); - add(new String[]{"江苏油田石油山庄", "扬州"}); - add(new String[]{"江苏议事园", "南京"}); - add(new String[]{"江苏国际塑化城", "常州"}); - add(new String[]{"江苏万和国际商贸城", "常州"}); - }}); - city_DistrictNames.put("无锡", new ArrayList(){{ - add(new String[]{"无锡大厦", "上海"}); - add(new String[]{"无锡滨湖万达广场", "无锡"}); - add(new String[]{"无锡碧桂园", "无锡"}); - add(new String[]{"无锡世界贸易中心一期世贸公寓", "无锡"}); - add(new String[]{"无锡洛城橙郡", "无锡"}); - add(new String[]{"无锡塞纳庄园", "宜兴"}); - add(new String[]{"无锡玉兰花园", "宜兴"}); - }}); - city_DistrictNames.put("宜兴", new ArrayList(){{ - add(new String[]{"宜兴南里", "天津"}); - add(new String[]{"宜兴阳光花苑", "宜兴"}); - add(new String[]{"宜兴太滆花苑", "宜兴"}); - }}); - city_DistrictNames.put("辽宁", new ArrayList(){{ - add(new String[]{"辽宁中医家属楼", "沈阳"}); - add(new String[]{"辽宁里", "天津"}); - }}); - city_DistrictNames.put("沈阳", new ArrayList(){{ - add(new String[]{"沈阳中体奥林匹克花园·花园一号", "沈阳"}); - add(new String[]{"沈阳恒大城", "沈阳"}); - add(new String[]{"沈阳恒大绿洲", "沈阳"}); - add(new String[]{"沈阳奥林匹克花园三期", "沈阳"}); - add(new String[]{"沈阳市炮兵学院小区", "沈阳"}); - add(new String[]{"沈阳恒大名都", "沈阳"}); - add(new String[]{"沈阳海韵广场(锦江大酒店B座)", "沈阳"}); - add(new String[]{"沈阳站小区", "沈阳"}); - add(new String[]{"沈阳财富中心", "沈阳"}); - add(new String[]{"沈阳城市立方新居", "沈阳"}); - add(new String[]{"沈阳中体奥林匹克花园·花园新城", "沈阳"}); - add(new String[]{"沈阳中体奥林匹克花园·福城", "沈阳"}); - add(new String[]{"沈阳中国女人街", "沈阳"}); - add(new String[]{"沈阳社区", "武汉"}); - add(new String[]{"沈阳天地", "沈阳"}); - add(new String[]{"沈阳恒大江湾", "沈阳"}); - add(new String[]{"沈阳恒大华府", "沈阳"}); - add(new String[]{"沈阳万达公馆", "沈阳"}); - add(new String[]{"沈阳国际品牌总部大厦", "沈阳"}); - add(new String[]{"沈阳国际品牌总部大厦(国际鞋城)", "沈阳"}); - add(new String[]{"沈阳五金机电城", "沈阳"}); - add(new String[]{"沈阳商业城(西区)", "沈阳"}); - }}); - city_DistrictNames.put("辽宁", new ArrayList(){{ - add(new String[]{"辽宁中医家属楼", "沈阳"}); - add(new String[]{"辽宁里", "天津"}); - }}); - city_DistrictNames.put("营口", new ArrayList(){{ - add(new String[]{"营口大厦", "上海"}); - }}); - city_DistrictNames.put("浙江", new ArrayList(){{ - add(new String[]{"浙江工业大学教师宿舍", "杭州"}); - add(new String[]{"浙江大厦", "太原"}); - add(new String[]{"浙江办事处宿舍", "太原"}); - add(new String[]{"浙江仁和居老年养生公寓", "湖州"}); - add(new String[]{"浙江交运大厦", "杭州"}); - add(new String[]{"浙江工商大学宿舍", "杭州"}); - add(new String[]{"浙江商贸城", "合肥"}); - add(new String[]{"浙江工业大学之江学院", "杭州"}); - }}); - city_DistrictNames.put("宁波", new ArrayList(){{ - add(new String[]{"宁波里", "天津"}); - add(new String[]{"宁波里", "武汉"}); - add(new String[]{"宁波商会大厦", "宁波"}); - add(new String[]{"宁波外代大厦", "宁波"}); - add(new String[]{"宁波小区", "上海"}); - }}); - city_DistrictNames.put("慈溪", new ArrayList(){{ - add(new String[]{"慈溪金水湾", "宁波"}); - add(new String[]{"慈溪中央大厦", "宁波"}); - add(new String[]{"慈溪一品空间", "宁波"}); - add(new String[]{"慈溪财富中心", "宁波"}); - add(new String[]{"慈溪中央大厦", "慈溪"}); - add(new String[]{"慈溪一品空间", "慈溪"}); - add(new String[]{"慈溪金水湾", "慈溪"}); - }}); - city_DistrictNames.put("安徽", new ArrayList(){{ - add(new String[]{"安徽师范大学教师公寓", "芜湖"}); - add(new String[]{"安徽电视台宿舍", "合肥"}); - add(new String[]{"安徽日报社宿舍", "合肥"}); - add(new String[]{"安徽大厦", "珠海"}); - add(new String[]{"安徽杂技团宿舍", "合肥"}); - add(new String[]{"安徽警官职业学院宿舍", "合肥"}); - add(new String[]{"安徽税务学校宿舍", "合肥"}); - add(new String[]{"安徽汽配城", "合肥"}); - add(new String[]{"安徽国强钢材交易中心", "合肥"}); - add(new String[]{"安徽国际购物广场", "合肥"}); - add(new String[]{"安徽大市场", "合肥"}); - }}); - city_DistrictNames.put("芜湖", new ArrayList(){{ - add(new String[]{"芜湖文化公园", "芜湖"}); - add(new String[]{"芜湖碧桂园", "芜湖"}); - }}); - city_DistrictNames.put("贵州", new ArrayList(){{ - add(new String[]{"贵州大厦", "海口"}); - add(new String[]{"贵州科技大厦", "贵阳"}); - add(new String[]{"贵州日报社糖果厂宿舍", "贵阳"}); - add(new String[]{"贵州驴友人家酒店式连锁家庭公寓", "贵阳"}); - add(new String[]{"贵州日报社糖果厂宿舍", "贵阳"}); - add(new String[]{"贵州商贸物流港", "贵阳"}); - }}); - city_DistrictNames.put("六盘水", new ArrayList(){{ - }}); - city_DistrictNames.put("广东", new ArrayList(){{ - add(new String[]{"广东外贸广场", "广州"}); - add(new String[]{"广东外语艺术学院教师宿舍", "广州"}); - add(new String[]{"广东建科院宿舍", "广州"}); - add(new String[]{"广东司法警官职业学院宿舍", "广州"}); - add(new String[]{"广东环保大厦", "广州"}); - add(new String[]{"广东商业大厦", "广州"}); - add(new String[]{"广东医学院教师宿舍楼", "东莞"}); - add(new String[]{"广东国际大厦", "广州"}); - add(new String[]{"广东省技术监督局宿舍", "广州"}); - add(new String[]{"广东工业大学宿舍", "广州"}); - add(new String[]{"广东教育学院宿舍", "广州"}); - add(new String[]{"广东省银行大厦", "深圳"}); - add(new String[]{"广东大厦", "天津"}); - add(new String[]{"广东山庄", "镇江"}); - add(new String[]{"广东红盾大厦", "广州"}); - add(new String[]{"广东药学院宿舍", "广州"}); - add(new String[]{"广东青年干部学院宿舍", "广州"}); - add(new String[]{"广东基础楼", "深圳"}); - add(new String[]{"广东省科技干部学院宿舍", "广州"}); - add(new String[]{"广东省农业管理干部学院社区", "广州"}); - add(new String[]{"广东芭蕾雨·逸景", "佛山"}); - }}); - city_DistrictNames.put("湛江", new ArrayList(){{ - add(new String[]{"湛江里", "天津"}); - add(new String[]{"湛江数码大厦", "湛江"}); - add(new String[]{"湛江世贸大厦", "湛江"}); - add(new String[]{"湛江国贸大厦", "湛江"}); - }}); - city_DistrictNames.put("河南", new ArrayList(){{ - add(new String[]{"河南庄小区", "青岛"}); - add(new String[]{"河南财专家属院", "郑州"}); - add(new String[]{"河南省新华书店家属院", "郑州"}); - add(new String[]{"河南省商业科学研究所家属院", "郑州"}); - add(new String[]{"河南省日报社家属院", "郑州"}); - add(new String[]{"河南女子高中家属院", "郑州"}); - add(new String[]{"河南外贸大院", "深圳"}); - add(new String[]{"河南里", "天津"}); - add(new String[]{"河南新村", "福州"}); - add(new String[]{"河南财经学院家属院", "郑州"}); - add(new String[]{"河南岸公园小区", "惠州"}); - add(new String[]{"河南岸新村", "惠州"}); - add(new String[]{"河南村", "北京"}); - add(new String[]{"河南理工学校家属院", "郑州"}); - add(new String[]{"河南省人事厅家属院", "郑州"}); - add(new String[]{"河南岸中心小区", "惠州"}); - add(new String[]{"河南省外贸学校家属院", "郑州"}); - add(new String[]{"河南村", "上海"}); - add(new String[]{"河南新村", "上海"}); - add(new String[]{"河南工业大学家属院", "郑州"}); - }}); - city_DistrictNames.put("平顶山", new ArrayList(){{ - add(new String[]{"平顶山小区", "乌鲁木齐"}); - add(new String[]{"平顶山运输公司家属院", "乌鲁木齐"}); - }}); - city_DistrictNames.put("云南", new ArrayList(){{ - add(new String[]{"云南大厦", "广州"}); - add(new String[]{"云南省杂技团家属院", "昆明"}); - add(new String[]{"云南华侨城", "昆明"}); - add(new String[]{"云南艺术家园区", "昆明"}); - add(new String[]{"云南农业大学教工住宅区", "昆明"}); - add(new String[]{"云南财经大学住宅", "昆明"}); - add(new String[]{"云南大学龙泉路小区", "昆明"}); - add(new String[]{"云南工业职业技术学院", "昆明"}); - add(new String[]{"云南印象城", "昆明"}); - add(new String[]{"云南映象", "昆明"}); - add(new String[]{"云南省畜牧局宿舍", "昆明"}); - add(new String[]{"云南省建筑材料学研究设计院", "昆明"}); - add(new String[]{"云南测绘工程院", "昆明"}); - add(new String[]{"云南省第一轻工机械厂", "昆明"}); - add(new String[]{"云南日报社单位房", "昆明"}); - add(new String[]{"云南白药厂单位福利房", "昆明"}); - add(new String[]{"云南大学东二院", "昆明"}); - add(new String[]{"云南省委党校生活区", "昆明"}); - add(new String[]{"云南印象城别墅", "昆明"}); - add(new String[]{"云南白药福利房", "昆明"}); - }}); - city_DistrictNames.put("玉溪", new ArrayList(){{ - add(new String[]{"玉溪高仓时代明珠", "玉溪"}); - add(new String[]{"玉溪一小区", "玉溪"}); - }}); - city_DistrictNames.put("吉林", new ArrayList(){{ - add(new String[]{"吉林大厦", "海口"}); - add(new String[]{"吉林花园", "贵阳"}); - add(new String[]{"吉林社区", "武汉"}); - add(new String[]{"吉林省团校家属楼", "长春"}); - add(new String[]{"吉林里", "天津"}); - }}); - city_DistrictNames.put("长春", new ArrayList(){{ - add(new String[]{"长春明珠", "长春"}); - add(new String[]{"长春经济开发区经开六区", "长春"}); - add(new String[]{"长春万科城市花园", "长春"}); - add(new String[]{"长春银座", "长春"}); - add(new String[]{"长春豪园", "长春"}); - add(new String[]{"长春理工大学家属楼", "长春"}); - add(new String[]{"长春工程学院宿舍", "长春"}); - add(new String[]{"长春工业大学公寓", "长春"}); - add(new String[]{"长春工大住宅", "长春"}); - add(new String[]{"长春市双阳区客运综合服务区", "长春"}); - add(new String[]{"长春市东苑15号楼", "长春"}); - add(new String[]{"长春昆仑", "长春"}); - add(new String[]{"长春村", "南昌"}); - add(new String[]{"长春小区", "武汉"}); - add(new String[]{"长春西里", "天津"}); - add(new String[]{"长春小区", "襄阳"}); - add(new String[]{"长春小区电气化", "襄阳"}); - add(new String[]{"长春苑小区", "乌鲁木齐"}); - add(new String[]{"长春花园 (长春花苑)", "乌鲁木齐"}); - add(new String[]{"长春花园", "深圳"}); - add(new String[]{"长春花园", "福州"}); - add(new String[]{"长春花园", "大连"}); - add(new String[]{"长春花园城", "温州"}); - add(new String[]{"长春里", "天津"}); - add(new String[]{"长春观社区", "武汉"}); - add(new String[]{"长春小区二期", "武汉"}); - add(new String[]{"长春钻石城", "长春"}); - add(new String[]{"长春市德阳购物中心", "长春"}); - add(new String[]{"长春都市豪庭", "合肥"}); - add(new String[]{"长春花园", "昆明"}); - add(new String[]{"长春都市花园", "合肥"}); - add(new String[]{"长春苑", "上海"}); - add(new String[]{"长春新苑", "上海"}); - add(new String[]{"长春小区", "上海"}); - add(new String[]{"长春公寓", "上海"}); - add(new String[]{"长春花园城", "瑞安"}); - add(new String[]{"长春二区", "义乌"}); - add(new String[]{"长春三区", "义乌"}); - add(new String[]{"长春小区", "义乌"}); - add(new String[]{"长春三区", "金华"}); - add(new String[]{"长春小区", "金华"}); - add(new String[]{"长春二区", "金华"}); - add(new String[]{"长春红星美凯龙全球家居生活广场", "长春"}); - add(new String[]{"长春明珠二期", "长春"}); - }}); - city_DistrictNames.put("山东", new ArrayList(){{ - add(new String[]{"山东里", "秦皇岛"}); - add(new String[]{"山东经济学院宿舍", "济南"}); - add(new String[]{"山东省卫生厅宿舍", "济南"}); - add(new String[]{"山东省民政厅宿舍", "济南"}); - add(new String[]{"山东省商业集团总公司宿舍", "济南"}); - add(new String[]{"山东医科大学教师宿舍", "济南"}); - add(new String[]{"山东外贸大厦", "青岛"}); - add(new String[]{"山东大厦", "深圳"}); - add(new String[]{"山东堡社区", "沈阳"}); - add(new String[]{"山东艺术学院宿舍", "济南"}); - add(new String[]{"山东黄金崮云湖高尔夫别墅", "济南"}); - add(new String[]{"山东司法警官学院宿舍", "济南"}); - add(new String[]{"山东省科学院高新技术研究分院", "青岛"}); - add(new String[]{"山东建工学院宿舍", "济南"}); - add(new String[]{"山东庙小区", "沈阳"}); - add(new String[]{"山东乳山银滩海景房", "威海"}); - add(new String[]{"山东头村", "青岛"}); - add(new String[]{"山东省畜牧局宿舍", "济南"}); - }}); - city_DistrictNames.put("威海", new ArrayList(){{ - add(new String[]{"威海仁柳庄别墅", "威海"}); - add(new String[]{"威海华新园", "威海"}); - add(new String[]{"威海中医院", "威海"}); - add(new String[]{"威海西御康", "威海"}); - add(new String[]{"威海石岛碧海鹏城", "威海"}); - add(new String[]{"威海天鹅湖畔", "威海"}); - add(new String[]{"威海洲际休闲旅游度假区", "威海"}); - add(new String[]{"威海苑", "上海"}); - add(new String[]{"威海别墅", "上海"}); - add(new String[]{"威海大楼", "上海"}); - }}); - city_DistrictNames.put("浙江", new ArrayList(){{ - add(new String[]{"浙江工业大学教师宿舍", "杭州"}); - add(new String[]{"浙江大厦", "太原"}); - add(new String[]{"浙江办事处宿舍", "太原"}); - add(new String[]{"浙江仁和居老年养生公寓", "湖州"}); - add(new String[]{"浙江交运大厦", "杭州"}); - add(new String[]{"浙江工商大学宿舍", "杭州"}); - add(new String[]{"浙江商贸城", "合肥"}); - add(new String[]{"浙江工业大学之江学院", "杭州"}); - }}); - city_DistrictNames.put("金华", new ArrayList(){{ - add(new String[]{"金华里", "北京"}); - add(new String[]{"金华苑", "海口"}); - add(new String[]{"金华新村", "大连"}); - add(new String[]{"金华公寓", "青岛"}); - add(new String[]{"金华园", "中山"}); - add(new String[]{"金华花园", "东莞"}); - add(new String[]{"金华世家", "贵阳"}); - add(new String[]{"金华园", "贵阳"}); - add(new String[]{"金华花园", "广州"}); - add(new String[]{"金华新村", "杭州"}); - add(new String[]{"金华苑", "潍坊"}); - add(new String[]{"金华丽小区", "潍坊"}); - add(new String[]{"金华花园", "重庆"}); - add(new String[]{"金华阁", "深圳"}); - add(new String[]{"金华大厦大渡口", "重庆"}); - add(new String[]{"金华苑小区", "重庆"}); - add(new String[]{"金华里", "天津"}); - add(new String[]{"金华小区", "石家庄"}); - add(new String[]{"金华大厦", "重庆"}); - add(new String[]{"金华园", "重庆"}); - add(new String[]{"金华云鼎", "重庆"}); - add(new String[]{"金华园", "沈阳"}); - add(new String[]{"金华公寓", "成都"}); - add(new String[]{"金华苑", "成都"}); - add(new String[]{"金华大厦", "武汉"}); - add(new String[]{"金华学府", "呼和浩特"}); - add(new String[]{"金华世家别墅", "贵阳"}); - add(new String[]{"金华公寓", "福州"}); - add(new String[]{"金华小区", "大连"}); - add(new String[]{"金华里(西青)", "天津"}); - add(new String[]{"金华楼", "厦门"}); - add(new String[]{"金华苑", "兰州"}); - add(new String[]{"金华园别墅", "北京"}); - add(new String[]{"金华小区三期", "大连"}); - add(new String[]{"金华花园", "中山"}); - add(new String[]{"金华园", "佛山"}); - add(new String[]{"金华苑", "青岛"}); - add(new String[]{"金华小区二期", "大连"}); - add(new String[]{"金华园", "昆明"}); - add(new String[]{"金华苑", "上海"}); - add(new String[]{"金华园", "北京"}); - add(new String[]{"金华新村", "上海"}); - add(new String[]{"金华公司宿舍", "昆明"}); - add(new String[]{"金华苑", "平顶山"}); - add(new String[]{"金华家园 ", "盘锦"}); - add(new String[]{"金华家园", "盘锦"}); - add(new String[]{"金华万达广场", "金华"}); - add(new String[]{"金华世贸中心", "金华"}); - add(new String[]{"金华汽配城二期", "金华"}); - add(new String[]{"金华巷一号", "攀枝花"}); - }}); - city_DistrictNames.put("义乌", new ArrayList(){{ - add(new String[]{"义乌批发市场", "重庆"}); - add(new String[]{"义乌小商品批发城", "惠州"}); - add(new String[]{"义乌公寓", "惠州"}); - add(new String[]{"义乌金茂大厦", "义乌"}); - add(new String[]{"义乌世纪商城", "义乌"}); - add(new String[]{"义乌欧景名城", "义乌"}); - add(new String[]{"义乌现代城", "义乌"}); - add(new String[]{"义乌时代花园", "义乌"}); - add(new String[]{"义乌金茂大厦", "金华"}); - add(new String[]{"义乌世纪商城", "金华"}); - add(new String[]{"义乌时代花园", "金华"}); - add(new String[]{"义乌西城广场", "金华"}); - add(new String[]{"义乌现代城", "金华"}); - add(new String[]{"义乌欧景名城", "金华"}); - }}); - city_DistrictNames.put("江苏", new ArrayList(){{ - add(new String[]{"江苏省农科院", "南京"}); - add(new String[]{"江苏油田石油山庄", "扬州"}); - add(new String[]{"江苏警官学院", "南京"}); - add(new String[]{"江苏省高级专家园", "南京"}); - add(new String[]{"江苏油田石油山庄", "扬州"}); - add(new String[]{"江苏议事园", "南京"}); - add(new String[]{"江苏国际塑化城", "常州"}); - add(new String[]{"江苏万和国际商贸城", "常州"}); - }}); - city_DistrictNames.put("宿迁", new ArrayList(){{ - }}); - city_DistrictNames.put("辽宁", new ArrayList(){{ - add(new String[]{"辽宁中医家属楼", "沈阳"}); - add(new String[]{"辽宁里", "天津"}); - }}); - city_DistrictNames.put("鞍山", new ArrayList(){{ - add(new String[]{"鞍山恒基兆业园林路地块", "鞍山"}); - add(new String[]{"鞍山恒大绿洲", "鞍山"}); - add(new String[]{"鞍山三村", "上海"}); - add(new String[]{"鞍山四村", "上海"}); - add(new String[]{"鞍山六村", "上海"}); - add(new String[]{"鞍山七村", "上海"}); - add(new String[]{"鞍山八村", "上海"}); - add(new String[]{"鞍山一村", "上海"}); - add(new String[]{"鞍山五村", "上海"}); - }}); - city_DistrictNames.put("福建", new ArrayList(){{ - add(new String[]{"福建园", "南宁"}); - add(new String[]{"福建省四建宿舍北门", "厦门"}); - add(new String[]{"福建联通花园", "福州"}); - add(new String[]{"福建日报社宿舍", "福州"}); - add(new String[]{"福建省中心检验所单位宿舍", "福州"}); - add(new String[]{"福建电影制片厂单位宿舍", "福州"}); - add(new String[]{"福建省女子监狱宿舍", "福州"}); - add(new String[]{"福建省医药公司大王里单位宿舍", "福州"}); - add(new String[]{"福建省第二公路工程公司宿舍", "福州"}); - add(new String[]{"福建省蚕桑研究所单位宿舍", "福州"}); - add(new String[]{"福建新村", "南京"}); - add(new String[]{"福建里", "天津"}); - add(new String[]{"福建社区", "武汉"}); - add(new String[]{"福建大厦", "贵阳"}); - add(new String[]{"福建巷小区", "成都"}); - add(new String[]{"福建大厦", "深圳"}); - add(new String[]{"福建生态工程学校单位宿舍", "福州"}); - add(new String[]{"福建医科大学教工宿舍", "福州"}); - }}); - city_DistrictNames.put("厦门", new ArrayList(){{ - add(new String[]{"厦门国际广场", "厦门"}); - add(new String[]{"厦门大学城", "厦门"}); - add(new String[]{"厦门千禧园", "厦门"}); - add(new String[]{"厦门罐头厂宿舍", "厦门"}); - add(new String[]{"厦门民防", "厦门"}); - add(new String[]{"厦门莲坂新小区", "厦门"}); - add(new String[]{"厦门钢窗厂宿舍", "厦门"}); - add(new String[]{"厦门造船厂宿舍", "厦门"}); - add(new String[]{"厦门航空宿舍", "福州"}); - add(new String[]{"厦门市中心血站宿舍楼", "厦门"}); - add(new String[]{"厦门医药站宿舍", "厦门"}); - add(new String[]{"厦门行车公寓", "厦门"}); - add(new String[]{"厦门国际文化大厦", "厦门"}); - add(new String[]{"厦门华苑", "盐城"}); - add(new String[]{"厦门电机厂宿舍", "厦门"}); - }}); - city_DistrictNames.put("海南", new ArrayList(){{ - add(new String[]{"海南之心", "海口"}); - add(new String[]{"海南大学南希科技苑", "海口"}); - add(new String[]{"海南日报社宿舍", "海口"}); - add(new String[]{"海南省审计机关美舍住宅区", "海口"}); - add(new String[]{"海南社保", "海口"}); - add(new String[]{"海南省人大常委会机关住宅小区", "海口"}); - add(new String[]{"海南大学教师宿舍", "海口"}); - add(new String[]{"海南燃化公司宿舍", "海口"}); - add(new String[]{"海南省体校宿舍", "海口"}); - add(new String[]{"海南统计局宿舍", "海口"}); - add(new String[]{"海南省工商银行宿舍", "海口"}); - add(new String[]{"海南工商大厦", "海口"}); - add(new String[]{"海南时代广场", "海口"}); - add(new String[]{"海南师范学院金花园", "海口"}); - add(new String[]{"海南大厦", "海口"}); - add(new String[]{"海南电力厂宿舍", "海口"}); - add(new String[]{"海南省三亚六建单位", "三亚"}); - add(new String[]{"海南陵水富力湾", "三亚"}); - add(new String[]{"海南大公馆", "海口"}); - add(new String[]{"海南美林湖国际度假社区", "三亚"}); - add(new String[]{"海南家园", "北京"}); - add(new String[]{"海南干休所", "广州"}); - add(new String[]{"海南绿城清水湾", "三亚"}); - add(new String[]{"海南·三亚·美亚之心", "三亚"}); - add(new String[]{"海南西弄51弄", "上海"}); - add(new String[]{"海南干休所(天河)", "广州"}); - add(new String[]{"海南后海温泉小镇", "重庆"}); - }}); - city_DistrictNames.put("三亚", new ArrayList(){{ - add(new String[]{"三亚金蓝湾小区", "三亚"}); - add(new String[]{"三亚远洋公馆", "三亚"}); - add(new String[]{"三亚海岳半岛成邦", "三亚"}); - add(new String[]{"三亚北京公馆", "三亚"}); - add(new String[]{"三亚荣德苑", "三亚"}); - add(new String[]{"三亚椰岛阳光花园", "三亚"}); - add(new String[]{"三亚芭堤雅度假酒店", "三亚"}); - add(new String[]{"三亚爱琴海岸康年套房度假酒店", "三亚"}); - add(new String[]{"三亚湾红树林", "三亚"}); - add(new String[]{"三亚印象", "三亚"}); - add(new String[]{"三亚金中海蓝钻", "三亚"}); - add(new String[]{"三亚东岸假日", "三亚"}); - add(new String[]{"三亚椰河湾", "三亚"}); - add(new String[]{"三亚湾红树林", "三亚"}); - add(new String[]{"三亚花开四季", "三亚"}); - add(new String[]{"三亚印象", "三亚"}); - add(new String[]{"三亚鸿洲佳园", "三亚"}); - add(new String[]{"三亚魅力之冠", "三亚"}); - add(new String[]{"三亚海楼云月", "三亚"}); - add(new String[]{"三亚湾蓝色海岸", "三亚"}); - add(new String[]{"三亚心天地", "三亚"}); - add(new String[]{"三亚时代海岸", "三亚"}); - add(new String[]{"三亚星海度假公寓", "三亚"}); - add(new String[]{"三亚椰景南岸", "三亚"}); - add(new String[]{"三亚民航局小区", "三亚"}); - add(new String[]{"三亚凤凰水城", "三亚"}); - add(new String[]{"三亚丽苑", "三亚"}); - add(new String[]{"三亚国光滨海花园", "三亚"}); - add(new String[]{"三亚榆林湾(金色年华海景小区)", "三亚"}); - add(new String[]{"三亚泰和花园", "三亚"}); - add(new String[]{"三亚新大洲印象", "三亚"}); - add(new String[]{"三亚监狱小区", "三亚"}); - add(new String[]{"三亚三永凤凰城", "三亚"}); - add(new String[]{"三亚凤凰水城凤凰湾", "三亚"}); - add(new String[]{"三亚鲁能游艇二区", "三亚"}); - add(new String[]{"三亚鲁能美丽三区", "三亚"}); - add(new String[]{"三亚海之韵", "三亚"}); - add(new String[]{"三亚环卫局宿舍", "三亚"}); - add(new String[]{"三亚国际饭店", "三亚"}); - add(new String[]{"三亚美丽之苑", "三亚"}); - add(new String[]{"三亚鸿洲国际公馆", "三亚"}); - add(new String[]{"三亚汇凯花园", "三亚"}); - add(new String[]{"三亚南新职工住宅楼", "三亚"}); - add(new String[]{"三亚同心家园", "三亚"}); - add(new String[]{"三亚南海佳园", "三亚"}); - add(new String[]{"三亚紫豪海景酒店", "三亚"}); - add(new String[]{"三亚腾涛公寓", "三亚"}); - add(new String[]{"三亚市建筑工程总公司住宅小区", "三亚"}); - add(new String[]{"三亚湾鸿运楼", "三亚"}); - add(new String[]{"三亚海航小区一期二期", "三亚"}); - add(new String[]{"三亚绿岛公寓", "三亚"}); - add(new String[]{"三亚湾我释海", "三亚"}); - add(new String[]{"三亚交通小区", "三亚"}); - add(new String[]{"三亚阳光家园", "三亚"}); - add(new String[]{"三亚海滨假日别墅", "三亚"}); - add(new String[]{"三亚圣煜花园", "三亚"}); - add(new String[]{"三亚金茂海景公寓", "三亚"}); - add(new String[]{"三亚清平乐", "三亚"}); - add(new String[]{"三亚市黄金广场", "三亚"}); - add(new String[]{"三亚馨海湾", "三亚"}); - add(new String[]{"三亚福瑞国际公馆", "三亚"}); - add(new String[]{"三亚市食品厂职工安置房", "三亚"}); - add(new String[]{"三亚湾国际公馆", "三亚"}); - add(new String[]{"三亚山", "三亚"}); - add(new String[]{"三亚富春山居", "三亚"}); - add(new String[]{"三亚高级知识分子住宅园", "三亚"}); - add(new String[]{"三亚环卫局宿舍", "三亚"}); - add(new String[]{"三亚奇林生态花园小区", "三亚"}); - add(new String[]{"三亚嶺海", "三亚"}); - add(new String[]{"三亚美丽春天温泉度假酒店公寓", "三亚"}); - add(new String[]{"三亚丽景温泉", "三亚"}); - add(new String[]{"三亚广友花园", "三亚"}); - add(new String[]{"三亚花冠渔歌海韵", "三亚"}); - add(new String[]{"三亚·山水国际", "三亚"}); - add(new String[]{"三亚卓达季风苑", "三亚"}); - add(new String[]{"三亚塘小区", "惠州"}); - add(new String[]{"三亚中体奥林匹克湾", "三亚"}); - add(new String[]{"三亚湾鲁能高尔夫三区别墅", "三亚"}); - add(new String[]{"三亚市我是一只鱼", "三亚"}); - add(new String[]{"三亚辰光假日酒店", "三亚"}); - add(new String[]{"三亚海悦台", "三亚"}); - add(new String[]{"三亚高级知识分子住宅园", "三亚"}); - add(new String[]{"三亚湾蓝波湾", "三亚"}); - add(new String[]{"三亚凤凰岛", "三亚"}); - add(new String[]{"三亚爱琴海岸", "三亚"}); - add(new String[]{"三亚湾蓝色海岸", "三亚"}); - add(new String[]{"三亚湾碧海蓝天", "三亚"}); - add(new String[]{"三亚海楼云月", "三亚"}); - }}); - city_DistrictNames.put("安徽", new ArrayList(){{ - add(new String[]{"安徽师范大学教师公寓", "芜湖"}); - add(new String[]{"安徽电视台宿舍", "合肥"}); - add(new String[]{"安徽日报社宿舍", "合肥"}); - add(new String[]{"安徽大厦", "珠海"}); - add(new String[]{"安徽杂技团宿舍", "合肥"}); - add(new String[]{"安徽警官职业学院宿舍", "合肥"}); - add(new String[]{"安徽税务学校宿舍", "合肥"}); - add(new String[]{"安徽汽配城", "合肥"}); - add(new String[]{"安徽国强钢材交易中心", "合肥"}); - add(new String[]{"安徽国际购物广场", "合肥"}); - add(new String[]{"安徽大市场", "合肥"}); - }}); - city_DistrictNames.put("合肥", new ArrayList(){{ - add(new String[]{"合肥晚报社宿舍", "合肥"}); - add(new String[]{"合肥铝厂宿舍", "合肥"}); - add(new String[]{"合肥学院教师宿舍楼", "合肥"}); - add(new String[]{"合肥锁厂宿舍", "合肥"}); - add(new String[]{"合肥万达广场", "合肥"}); - add(new String[]{"合肥恒大城", "合肥"}); - add(new String[]{"合肥合作经济广场", "合肥"}); - add(new String[]{"合肥恒通食品批发市场", "合肥"}); - }}); - city_DistrictNames.put("江苏", new ArrayList(){{ - add(new String[]{"江苏省农科院", "南京"}); - add(new String[]{"江苏油田石油山庄", "扬州"}); - add(new String[]{"江苏警官学院", "南京"}); - add(new String[]{"江苏省高级专家园", "南京"}); - add(new String[]{"江苏油田石油山庄", "扬州"}); - add(new String[]{"江苏议事园", "南京"}); - add(new String[]{"江苏国际塑化城", "常州"}); - add(new String[]{"江苏万和国际商贸城", "常州"}); - }}); - city_DistrictNames.put("盐城", new ArrayList(){{ - add(new String[]{"盐城大桥东", "盐城"}); - add(new String[]{"盐城市月湖花城", "盐城"}); - }}); - city_DistrictNames.put("广西壮族", new ArrayList(){{ - add(new String[]{"广西壮族自治区司法厅宿舍", "南宁"}); - add(new String[]{"广西壮族自治区农业厅宿舍", "南宁"}); - }}); - city_DistrictNames.put("北海", new ArrayList(){{ - add(new String[]{"北海庄园", "邯郸"}); - add(new String[]{"北海岸88号", "海口"}); - add(new String[]{"北海新城", "烟台"}); - add(new String[]{"北海银滩之家客栈", "南宁"}); - add(new String[]{"北海新居", "长春"}); - add(new String[]{"北海分局家属院", "青岛"}); - add(new String[]{"北海新城", "威海"}); - add(new String[]{"北海四合院", "北京"}); - add(new String[]{"北海公寓", "潍坊"}); - add(new String[]{"北海宿舍小区", "潍坊"}); - add(new String[]{"北海凯旋国际商住大厦", "北海"}); - add(new String[]{"北海花园", "北海"}); - add(new String[]{"北海社区", "沈阳"}); - add(new String[]{"北海嘉园", "沈阳"}); - add(new String[]{"北海华美财富广场", "北海"}); - add(new String[]{"北海佳苑", "青岛"}); - add(new String[]{"北海胜利公社别墅", "大连"}); - add(new String[]{"北海花园", "青岛"}); - add(new String[]{"北海胜利公社", "大连"}); - add(new String[]{"北海明珠", "潍坊"}); - add(new String[]{"北海花园", "哈尔滨"}); - add(new String[]{"北海里", "天津"}); - add(new String[]{"北海花园", "潍坊"}); - add(new String[]{"北海苑", "绍兴"}); - add(new String[]{"北海花园", "绍兴"}); - add(new String[]{"北海大厦公寓", "上海"}); - add(new String[]{"北海新苑", "上海"}); - add(new String[]{"北海岸一品阁", "青岛"}); - add(new String[]{"北海苑", "青岛"}); - add(new String[]{"北海花园", "盐城"}); - add(new String[]{"北海四期", "盐城"}); - }}); - city_DistrictNames.put("江苏", new ArrayList(){{ - add(new String[]{"江苏省农科院", "南京"}); - add(new String[]{"江苏油田石油山庄", "扬州"}); - add(new String[]{"江苏警官学院", "南京"}); - add(new String[]{"江苏省高级专家园", "南京"}); - add(new String[]{"江苏油田石油山庄", "扬州"}); - add(new String[]{"江苏议事园", "南京"}); - add(new String[]{"江苏国际塑化城", "常州"}); - add(new String[]{"江苏万和国际商贸城", "常州"}); - }}); - city_DistrictNames.put("苏州", new ArrayList(){{ - add(new String[]{"苏州北巷", "大连"}); - add(new String[]{"苏州里", "天津"}); - add(new String[]{"苏州花园一期", "乌鲁木齐"}); - add(new String[]{"苏州花园二期", "乌鲁木齐"}); - add(new String[]{"苏州花园", "宿迁"}); - add(new String[]{"苏州小区", "北京"}); - add(new String[]{"苏州公寓", "北京"}); - add(new String[]{"苏州幻象", "济南"}); - add(new String[]{"苏州凤凰文化广场", "苏州"}); - add(new String[]{"苏州国际轻纺城", "苏州"}); - add(new String[]{"苏州世茂运河城", "苏州"}); - add(new String[]{"苏州市沧浪科技创业园", "苏州"}); - add(new String[]{"苏州高新区人力资源大厦", "苏州"}); - add(new String[]{"苏州新东方汽配城", "苏州"}); - add(new String[]{"苏州礼品商品城", "苏州"}); - add(new String[]{"苏州沿海国际中心", "苏州"}); - add(new String[]{"苏州机电五金城", "苏州"}); - add(new String[]{"苏州市沧浪科技创业园东区", "苏州"}); - add(new String[]{"苏州世茂广场公寓", "苏州"}); - }}); - city_DistrictNames.put("常熟", new ArrayList(){{ - add(new String[]{"常熟北里", "天津"}); - add(new String[]{"常熟南里", "天津"}); - add(new String[]{"常熟中关村科技城", "常熟"}); - add(new String[]{"常熟花园", "常熟"}); - add(new String[]{"常熟滨江花园", "常熟"}); - }}); - city_DistrictNames.put("四川", new ArrayList(){{ - add(new String[]{"四川省直机关工委宿舍", "成都"}); - add(new String[]{"四川省林业厅宿舍", "成都"}); - add(new String[]{"四川音乐学院宿舍", "成都"}); - add(new String[]{"四川省闽中市驻疆办事处小区", "乌鲁木齐"}); - add(new String[]{"四川大厦", "厦门"}); - add(new String[]{"四川省科技厅宿舍", "成都"}); - add(new String[]{"四川专用汽车厂宿舍", "成都"}); - add(new String[]{"四川日报宿舍", "成都"}); - add(new String[]{"四川艺术职业学院家属楼", "成都"}); - add(new String[]{"四川营胡同", "北京"}); - add(new String[]{"四川小区", "上海"}); - add(new String[]{"四川幼师宿舍", "成都"}); - add(new String[]{"四川大学农林村", "成都"}); - }}); - city_DistrictNames.put("宜宾", new ArrayList(){{ - add(new String[]{"宜宾北里", "天津"}); - add(new String[]{"宜宾东里", "天津"}); - add(new String[]{"宜宾西里", "天津"}); - add(new String[]{"宜宾楼", "天津"}); - add(new String[]{"宜宾学院A区", "宜宾"}); - }}); - city_DistrictNames.put("云南", new ArrayList(){{ - add(new String[]{"云南大厦", "广州"}); - add(new String[]{"云南省杂技团家属院", "昆明"}); - add(new String[]{"云南华侨城", "昆明"}); - add(new String[]{"云南艺术家园区", "昆明"}); - add(new String[]{"云南农业大学教工住宅区", "昆明"}); - add(new String[]{"云南财经大学住宅", "昆明"}); - add(new String[]{"云南大学龙泉路小区", "昆明"}); - add(new String[]{"云南工业职业技术学院", "昆明"}); - add(new String[]{"云南印象城", "昆明"}); - add(new String[]{"云南映象", "昆明"}); - add(new String[]{"云南省畜牧局宿舍", "昆明"}); - add(new String[]{"云南省建筑材料学研究设计院", "昆明"}); - add(new String[]{"云南测绘工程院", "昆明"}); - add(new String[]{"云南省第一轻工机械厂", "昆明"}); - add(new String[]{"云南日报社单位房", "昆明"}); - add(new String[]{"云南白药厂单位福利房", "昆明"}); - add(new String[]{"云南大学东二院", "昆明"}); - add(new String[]{"云南省委党校生活区", "昆明"}); - add(new String[]{"云南印象城别墅", "昆明"}); - add(new String[]{"云南白药福利房", "昆明"}); - }}); - city_DistrictNames.put("丽江", new ArrayList(){{ - add(new String[]{"丽江花园", "广州"}); - add(new String[]{"丽江花园左岸", "广州"}); - add(new String[]{"丽江花园玉树别院", "广州"}); - add(new String[]{"丽江花园丽字楼", "广州"}); - add(new String[]{"丽江花园九如通津", "广州"}); - add(new String[]{"丽江花园丽岛翠堤", "广州"}); - add(new String[]{"丽江蓝湾", "长春"}); - add(new String[]{"丽江花园", "长春"}); - add(new String[]{"丽江茗园", "常州"}); - add(new String[]{"丽江区", "南宁"}); - add(new String[]{"丽江花园丽荃楼", "广州"}); - add(new String[]{"丽江花园丽波楼", "广州"}); - add(new String[]{"丽江新都", "宁波"}); - add(new String[]{"丽江花园", "中山"}); - add(new String[]{"丽江名庭", "宁波"}); - add(new String[]{"丽江公寓", "三亚"}); - add(new String[]{"丽江花园", "温州"}); - add(new String[]{"丽江翠园", "长沙"}); - add(new String[]{"丽江水花园", "郑州"}); - add(new String[]{"丽江度假公寓", "三亚"}); - add(new String[]{"丽江新村", "广州"}); - add(new String[]{"丽江花园王台别墅", "广州"}); - add(new String[]{"丽江花园康城居", "广州"}); - add(new String[]{"丽江花园萃锦苑", "广州"}); - add(new String[]{"丽江花园星海洲", "广州"}); - add(new String[]{"丽江花园德字楼", "广州"}); - add(new String[]{"丽江花园棕榈滩", "广州"}); - add(new String[]{"丽江花园华林居", "广州"}); - add(new String[]{"丽江半岛花园", "石家庄"}); - add(new String[]{"丽江新居", "武汉"}); - add(new String[]{"丽江苑", "武汉"}); - add(new String[]{"丽江豪庭", "赣州"}); - add(new String[]{"丽江公馆", "赣州"}); - add(new String[]{"丽江豪庭", "佛山"}); - add(new String[]{"丽江村", "南宁"}); - add(new String[]{"丽江花苑", "温州"}); - add(new String[]{"丽江花园4期丽园盛景", "中山"}); - add(new String[]{"丽江花园", "南宁"}); - add(new String[]{"丽江花园萃锦苑别墅", "广州"}); - add(new String[]{"丽江花园二期", "中山"}); - add(new String[]{"丽江花园一期", "中山"}); - add(new String[]{"丽江花园四期", "中山"}); - add(new String[]{"丽江一期", "中山"}); - add(new String[]{"丽江花园", "惠州"}); - add(new String[]{"丽江花园丽彦楼", "广州"}); - add(new String[]{"丽江花园丽茵楼", "广州"}); - add(new String[]{"丽江花园丽影楼", "广州"}); - add(new String[]{"丽江翠园山水郡", "长沙"}); - add(new String[]{"丽江锦庭", "上海"}); - add(new String[]{"丽江村小区", "南宁"}); - add(new String[]{"丽江苑", "上海"}); - add(new String[]{"丽江佳苑", "上海"}); - add(new String[]{"丽江豪庭", "顺德"}); - add(new String[]{"丽江苑", "肇庆"}); - add(new String[]{"丽江名庭", "奉化"}); - add(new String[]{"丽江小区", "重庆"}); - add(new String[]{"丽江天下", "丽江"}); - add(new String[]{"丽江万隆花园", "丽江"}); - add(new String[]{"丽江古城狮子山", "丽江"}); - add(new String[]{"丽江北门坡", "丽江"}); - add(new String[]{"丽江古城", "丽江"}); - add(new String[]{"丽江假日", "丽江"}); - add(new String[]{"丽江人家3期", "丽江"}); - add(new String[]{"丽江人家第三期", "丽江"}); - add(new String[]{"丽江人家文笔园", "丽江"}); - add(new String[]{"丽江民居", "丽江"}); - add(new String[]{"丽江人家文笔苑", "丽江"}); - add(new String[]{"丽江人家片区玉龙园", "丽江"}); - add(new String[]{"丽江古城高尔夫别墅", "丽江"}); - add(new String[]{"丽江1号别墅", "丽江"}); - add(new String[]{"丽江人家", "丽江"}); - add(new String[]{"丽江映像", "丽江"}); - add(new String[]{"丽江人家三期", "丽江"}); - add(new String[]{"丽江人家文泽园", "丽江"}); - add(new String[]{"丽江印象", "丽江"}); - add(new String[]{"丽江1号", "丽江"}); - add(new String[]{"丽江家园", "丽江"}); - add(new String[]{"丽江名居", "丽江"}); - add(new String[]{"丽江一号", "丽江"}); - add(new String[]{"丽江人家玉龙园", "丽江"}); - add(new String[]{"丽江花园", "玉林"}); - add(new String[]{"丽江城", "河源"}); - add(new String[]{"丽江豪庭", "河源"}); - add(new String[]{"丽江雅苑", "阳江"}); - add(new String[]{"丽江阳天下", "丽江"}); - add(new String[]{"丽江人家白玉园", "丽江"}); - add(new String[]{"丽江苑", "六盘水"}); - add(new String[]{"丽江鱼米河", "丽江"}); - add(new String[]{"丽江古城民居", "丽江"}); - }}); - city_DistrictNames.put("黑龙江", new ArrayList(){{ - }}); - city_DistrictNames.put("哈尔滨", new ArrayList(){{ - add(new String[]{"哈尔滨星光耀广场", "哈尔滨"}); - }}); - city_DistrictNames.put("辽宁", new ArrayList(){{ - add(new String[]{"辽宁中医家属楼", "沈阳"}); - add(new String[]{"辽宁里", "天津"}); - }}); - city_DistrictNames.put("盘锦", new ArrayList(){{ - add(new String[]{"盘锦花园", "南京"}); - add(new String[]{"盘锦华府", "南京"}); - add(new String[]{"盘锦漫步中海", "盘锦"}); - add(new String[]{"盘锦馨悦小区", "盘锦"}); - }}); - city_DistrictNames.put("浙江", new ArrayList(){{ - add(new String[]{"浙江工业大学教师宿舍", "杭州"}); - add(new String[]{"浙江大厦", "太原"}); - add(new String[]{"浙江办事处宿舍", "太原"}); - add(new String[]{"浙江仁和居老年养生公寓", "湖州"}); - add(new String[]{"浙江交运大厦", "杭州"}); - add(new String[]{"浙江工商大学宿舍", "杭州"}); - add(new String[]{"浙江商贸城", "合肥"}); - add(new String[]{"浙江工业大学之江学院", "杭州"}); - }}); - city_DistrictNames.put("温州", new ArrayList(){{ - add(new String[]{"温州大厦", "海口"}); - add(new String[]{"温州城", "贵阳"}); - add(new String[]{"温州公寓", "贵阳"}); - add(new String[]{"温州商城", "湖州"}); - add(new String[]{"温州商城", "唐山"}); - add(new String[]{"温州世贸中心大厦", "温州"}); - add(new String[]{"温州世贸中心广场", "温州"}); - add(new String[]{"温州人才大厦", "温州"}); - add(new String[]{"温州龙湾万达广场", "温州"}); - add(new String[]{"温州城·都乐汇", "沈阳"}); - add(new String[]{"温州商城", "金华"}); - }}); - city_DistrictNames.put("瑞安", new ArrayList(){{ - add(new String[]{"瑞安创逸", "广州"}); - add(new String[]{"瑞安花园", "佛山"}); - add(new String[]{"瑞安花园", "广州"}); - add(new String[]{"瑞安重庆天地", "重庆"}); - add(new String[]{"瑞安小区", "重庆"}); - add(new String[]{"瑞安花园", "中山"}); - add(new String[]{"瑞安名邸", "南通"}); - add(new String[]{"瑞安大厦", "温州"}); - add(new String[]{"瑞安苑", "成都"}); - add(new String[]{"瑞安家园", "大连"}); - add(new String[]{"瑞安大厦", "长沙"}); - add(new String[]{"瑞安·君汇", "北京"}); - add(new String[]{"瑞安雅景苑", "瑞安"}); - add(new String[]{"瑞安大厦", "瑞安"}); - add(new String[]{"瑞安宏瑞大厦", "瑞安"}); - add(new String[]{"瑞安市兴隆家园", "瑞安"}); - add(new String[]{"瑞安花园", "衡阳"}); - add(new String[]{"瑞安楼", "河源"}); - add(new String[]{"瑞安时代大厦", "温州"}); - add(new String[]{"瑞安雅景苑", "温州"}); - add(new String[]{"瑞安新世纪大厦", "温州"}); - }}); - city_DistrictNames.put("河北", new ArrayList(){{ - add(new String[]{"河北税务学校生活区", "石家庄"}); - add(new String[]{"河北经济日报社宿舍", "石家庄"}); - add(new String[]{"河北美术出版社宿舍", "石家庄"}); - add(new String[]{"河北物资宿舍", "石家庄"}); - add(new String[]{"河北化工医药职业技术学院宿舍", "石家庄"}); - add(new String[]{"河北电机宿舍", "石家庄"}); - add(new String[]{"河北日报社宿舍", "石家庄"}); - add(new String[]{"河北工程造价管理总站宿舍", "石家庄"}); - add(new String[]{"河北康城", "潍坊"}); - add(new String[]{"河北社区", "沈阳"}); - add(new String[]{"河北医科大学宿舍", "石家庄"}); - add(new String[]{"河北省人大宿舍", "石家庄"}); - add(new String[]{"河北新人家", "唐山"}); - add(new String[]{"河北一号", "唐山"}); - add(new String[]{"河北机要局宿舍", "石家庄"}); - add(new String[]{"河北广播电视报宿舍", "石家庄"}); - add(new String[]{"河北商城", "青岛"}); - add(new String[]{"河北长城饭店", "石家庄"}); - add(new String[]{"河北村小区", "北京"}); - add(new String[]{"河北桃江里", "天津"}); - add(new String[]{"河北师大青年公寓楼", "石家庄"}); - add(new String[]{"河北绛", "无锡"}); - add(new String[]{"河北社区", "本溪"}); - add(new String[]{"河北楼", "唐山"}); - }}); - city_DistrictNames.put("廊坊", new ArrayList(){{ - add(new String[]{"廊坊万达广场", "廊坊"}); - }}); - city_DistrictNames.put("四川", new ArrayList(){{ - add(new String[]{"四川省直机关工委宿舍", "成都"}); - add(new String[]{"四川省林业厅宿舍", "成都"}); - add(new String[]{"四川音乐学院宿舍", "成都"}); - add(new String[]{"四川省闽中市驻疆办事处小区", "乌鲁木齐"}); - add(new String[]{"四川大厦", "厦门"}); - add(new String[]{"四川省科技厅宿舍", "成都"}); - add(new String[]{"四川专用汽车厂宿舍", "成都"}); - add(new String[]{"四川日报宿舍", "成都"}); - add(new String[]{"四川艺术职业学院家属楼", "成都"}); - add(new String[]{"四川营胡同", "北京"}); - add(new String[]{"四川小区", "上海"}); - add(new String[]{"四川幼师宿舍", "成都"}); - add(new String[]{"四川大学农林村", "成都"}); - }}); - city_DistrictNames.put("成都", new ArrayList(){{ - add(new String[]{"成都国际公寓", "成都"}); - add(new String[]{"成都高速大厦", "成都"}); - add(new String[]{"成都血液中心小区", "成都"}); - add(new String[]{"成都花园别墅", "成都"}); - add(new String[]{"成都花园", "成都"}); - add(new String[]{"成都民航宿舍", "成都"}); - add(new String[]{"成都卷烟厂宿舍", "成都"}); - add(new String[]{"成都华侨城纯水岸", "成都"}); - add(new String[]{"成都花园", "三亚"}); - add(new String[]{"成都新天地", "成都"}); - add(new String[]{"成都ICC", "成都"}); - add(new String[]{"成都雅居乐花园", "成都"}); - add(new String[]{"成都华侨城东岸", "成都"}); - add(new String[]{"成都后花园二期", "成都"}); - add(new String[]{"成都绿地中心468公馆", "成都"}); - add(new String[]{"成都花园上城", "成都"}); - add(new String[]{"成都森林", "成都"}); - add(new String[]{"成都后花园", "成都"}); - add(new String[]{"成都金牛万达广场", "成都"}); - add(new String[]{"成都电力局宿舍", "成都"}); - add(new String[]{"成都玉园", "成都"}); - add(new String[]{"成都国奥村", "成都"}); - add(new String[]{"成都花园翠雍华庭", "成都"}); - add(new String[]{"成都早晨", "成都"}); - add(new String[]{"成都合院", "成都"}); - add(new String[]{"成都后花园国宾红葉", "成都"}); - add(new String[]{"成都合院之学院壹品", "成都"}); - add(new String[]{"成都后花园二期别墅", "成都"}); - add(new String[]{"成都棕榈泉国际中心", "成都"}); - add(new String[]{"成都大魔方", "成都"}); - add(new String[]{"成都A区", "成都"}); - add(new String[]{"成都大学教师公寓", "成都"}); - }}); - city_DistrictNames.put("江苏", new ArrayList(){{ - add(new String[]{"江苏省农科院", "南京"}); - add(new String[]{"江苏油田石油山庄", "扬州"}); - add(new String[]{"江苏警官学院", "南京"}); - add(new String[]{"江苏省高级专家园", "南京"}); - add(new String[]{"江苏油田石油山庄", "扬州"}); - add(new String[]{"江苏议事园", "南京"}); - add(new String[]{"江苏国际塑化城", "常州"}); - add(new String[]{"江苏万和国际商贸城", "常州"}); - }}); - city_DistrictNames.put("泰州", new ArrayList(){{ - add(new String[]{"泰州碧桂园", "泰州"}); - add(new String[]{"泰州华侨城纯水岸", "泰州"}); - add(new String[]{"泰州美好家园", "泰州"}); - }}); - city_DistrictNames.put("山西", new ArrayList(){{ - add(new String[]{"山西教育出版局宿舍", "太原"}); - add(new String[]{"山西政府家属院", "天津"}); - add(new String[]{"山西省电力堪测设计院宿舍", "太原"}); - add(new String[]{"山西煤炭职工培训中心宿舍", "太原"}); - add(new String[]{"山西医科大学家属楼", "太原"}); - add(new String[]{"山西电力杏花岭小区", "太原"}); - add(new String[]{"山西报社宿舍楼", "太原"}); - add(new String[]{"山西省医药公司住宅小区", "太原"}); - add(new String[]{"山西省文物局宿舍", "太原"}); - add(new String[]{"山西汽运集团东岗路宿舍", "太原"}); - add(new String[]{"山西省地质科研所地矿小区", "太原"}); - add(new String[]{"山西省供销学校宿舍", "太原"}); - add(new String[]{"山西省汾河水库管理局宿舍", "太原"}); - add(new String[]{"山西广播电视大学宿舍", "太原"}); - add(new String[]{"山西省体育局宿舍", "太原"}); - add(new String[]{"山西省水产科学研究院宿舍", "太原"}); - add(new String[]{"山西社会主义学院宿舍", "太原"}); - add(new String[]{"山西省经济信息中心宿舍", "太原"}); - add(new String[]{"山西省气象台宿舍", "太原"}); - add(new String[]{"山西省电力公司宿舍", "太原"}); - add(new String[]{"山西省农机局宿舍", "太原"}); - add(new String[]{"山西省机电设计研究院宿舍", "太原"}); - add(new String[]{"山西医科大学家属楼北院", "太原"}); - add(new String[]{"山西省歌舞剧院宿舍", "太原"}); - add(new String[]{"山西省轻工宿舍", "太原"}); - add(new String[]{"山西煤炭职业技术学院宿舍", "太原"}); - add(new String[]{"山西省交通监理公司宿舍", "太原"}); - add(new String[]{"山西交通职业技术学院家属楼", "太原"}); - add(new String[]{"山西大学宿舍", "太原"}); - add(new String[]{"山西省轻工建设公司宿舍", "太原"}); - add(new String[]{"山西省送变电宿舍", "太原"}); - add(new String[]{"山西省建筑科学研究院公房", "太原"}); - add(new String[]{"山西省物资管理储备局并州北路家属院小区", "太原"}); - add(new String[]{"山西省盐业储运公司宿舍", "太原"}); - add(new String[]{"山西省地震局宿舍", "太原"}); - add(new String[]{"山西省展览馆宿舍", "太原"}); - add(new String[]{"山西无线电厂宿舍", "太原"}); - add(new String[]{"山西无线电厂小区", "太原"}); - add(new String[]{"山西金金业集团宿舍", "太原"}); - add(new String[]{"山西省自动化研究所宿舍", "太原"}); - add(new String[]{"山西煤矿厅局宿舍", "太原"}); - add(new String[]{"山西高速管理局宿舍", "太原"}); - add(new String[]{"山西省木材公司宿舍", "太原"}); - add(new String[]{"山西省医药与生命科学研究院", "太原"}); - add(new String[]{"山西纸张公司宿舍", "太原"}); - add(new String[]{"山西焦煤集团滨河小区", "太原"}); - add(new String[]{"山西宏安国际大厦", "太原"}); - add(new String[]{"山西园", "杭州"}); - add(new String[]{"山西南村", "南京"}); - add(new String[]{"山西证券大厦", "西安"}); - add(new String[]{"山西职业技术学院宿舍", "太原"}); - add(new String[]{"山西建筑职业技术学院宿舍", "太原"}); - add(new String[]{"山西省少管所宿舍", "太原"}); - add(new String[]{"山西日报宿舍", "太原"}); - add(new String[]{"山西建筑学院", "太原"}); - add(new String[]{"山西世贸中心", "太原"}); - add(new String[]{"山西国际贸易中心", "太原"}); - add(new String[]{"山西小区", "上海"}); - add(new String[]{"山西新村", "金华"}); - }}); - city_DistrictNames.put("太原", new ArrayList(){{ - add(new String[]{"太原卫校长风小区", "太原"}); - add(new String[]{"太原刚玉生活区", "太原"}); - add(new String[]{"太原富力现代广场", "太原"}); - add(new String[]{"太原恒大绿洲", "太原"}); - add(new String[]{"太原市政建设开发处宿舍", "太原"}); - add(new String[]{"太原师范学院宿舍", "太原"}); - add(new String[]{"太原理工大社区住宅小区东院", "太原"}); - add(new String[]{"太原大学师范学院宿舍", "太原"}); - add(new String[]{"太原长城光电子工业公司宿舍", "太原"}); - add(new String[]{"太原警备区家属院", "太原"}); - add(new String[]{"太原电视台宿舍小区", "太原"}); - add(new String[]{"太原理工大社区住宅小区西院", "太原"}); - add(new String[]{"太原市园林局宿舍", "太原"}); - add(new String[]{"太原大学小区", "太原"}); - add(new String[]{"太原理工大学西区宿舍", "太原"}); - add(new String[]{"太原市中心医院宿舍", "太原"}); - add(new String[]{"太原新华印刷厂宿舍", "太原"}); - add(new String[]{"太原市机电公司宿舍", "太原"}); - add(new String[]{"太原市实验中学宿舍", "太原"}); - add(new String[]{"太原市公司宿舍", "太原"}); - add(new String[]{"太原市地方税务局直属分局宿舍", "太原"}); - add(new String[]{"太原刚玉砂轮小区", "太原"}); - add(new String[]{"太原市中医院宿舍", "太原"}); - add(new String[]{"太原中药厂宿舍", "太原"}); - add(new String[]{"太原市第四军区干休所", "太原"}); - add(new String[]{"太原市塑料四厂宿舍", "太原"}); - add(new String[]{"太原市疾病预防控制中心宿舍", "太原"}); - add(new String[]{"太原日报社宿舍", "太原"}); - add(new String[]{"太原农牧场宿舍", "太原"}); - add(new String[]{"太原市园林绿化工程队宿舍", "太原"}); - add(new String[]{"太原市交通局宿舍", "太原"}); - add(new String[]{"太原市木材公司宿舍", "太原"}); - add(new String[]{"太原市燕科公司宿舍", "太原"}); - add(new String[]{"太原理工大学长风住宅小区", "太原"}); - add(new String[]{"太原市第一建筑公司宿舍", "太原"}); - add(new String[]{"太原燃料公司宿舍", "太原"}); - add(new String[]{"太原通信分公司小新城住宅小区", "太原"}); - add(new String[]{"太原市国税局宿舍", "太原"}); - add(new String[]{"太原时代", "沈阳"}); - add(new String[]{"太原小区", "沈阳"}); - add(new String[]{"太原佳园", "沈阳"}); - add(new String[]{"太原柳巷铜锣湾宝地小区", "太原"}); - add(new String[]{"太原工程职业技术学院宿舍", "太原"}); - add(new String[]{"太原钢丝厂宿舍", "太原"}); - add(new String[]{"太原金鼎国际商务中心", "太原"}); - add(new String[]{"太原万达公馆", "太原"}); - add(new String[]{"太原奥林匹克花园", "太原"}); - add(new String[]{"太原别墅", "上海"}); - add(new String[]{"太原邸", "上海"}); - add(new String[]{"太原星河湾三期", "太原"}); - }}); - city_DistrictNames.put("四川", new ArrayList(){{ - add(new String[]{"四川省直机关工委宿舍", "成都"}); - add(new String[]{"四川省林业厅宿舍", "成都"}); - add(new String[]{"四川音乐学院宿舍", "成都"}); - add(new String[]{"四川省闽中市驻疆办事处小区", "乌鲁木齐"}); - add(new String[]{"四川大厦", "厦门"}); - add(new String[]{"四川省科技厅宿舍", "成都"}); - add(new String[]{"四川专用汽车厂宿舍", "成都"}); - add(new String[]{"四川日报宿舍", "成都"}); - add(new String[]{"四川艺术职业学院家属楼", "成都"}); - add(new String[]{"四川营胡同", "北京"}); - add(new String[]{"四川小区", "上海"}); - add(new String[]{"四川幼师宿舍", "成都"}); - add(new String[]{"四川大学农林村", "成都"}); - }}); - city_DistrictNames.put("攀枝花", new ArrayList(){{ - add(new String[]{"攀枝花苑", "海口"}); - }}); - city_DistrictNames.put("广东", new ArrayList(){{ - add(new String[]{"广东外贸广场", "广州"}); - add(new String[]{"广东外语艺术学院教师宿舍", "广州"}); - add(new String[]{"广东建科院宿舍", "广州"}); - add(new String[]{"广东司法警官职业学院宿舍", "广州"}); - add(new String[]{"广东环保大厦", "广州"}); - add(new String[]{"广东商业大厦", "广州"}); - add(new String[]{"广东医学院教师宿舍楼", "东莞"}); - add(new String[]{"广东国际大厦", "广州"}); - add(new String[]{"广东省技术监督局宿舍", "广州"}); - add(new String[]{"广东工业大学宿舍", "广州"}); - add(new String[]{"广东教育学院宿舍", "广州"}); - add(new String[]{"广东省银行大厦", "深圳"}); - add(new String[]{"广东大厦", "天津"}); - add(new String[]{"广东山庄", "镇江"}); - add(new String[]{"广东红盾大厦", "广州"}); - add(new String[]{"广东药学院宿舍", "广州"}); - add(new String[]{"广东青年干部学院宿舍", "广州"}); - add(new String[]{"广东基础楼", "深圳"}); - add(new String[]{"广东省科技干部学院宿舍", "广州"}); - add(new String[]{"广东省农业管理干部学院社区", "广州"}); - add(new String[]{"广东芭蕾雨·逸景", "佛山"}); - }}); - city_DistrictNames.put("珠海", new ArrayList(){{ - add(new String[]{"珠海市吉大九洲蓝湾花园", "珠海"}); - add(new String[]{"珠海里", "天津"}); - add(new String[]{"珠海新村", "昆山"}); - add(new String[]{"珠海二区", "青岛"}); - add(new String[]{"珠海雅苑", "青岛"}); - add(new String[]{"珠海都市花园", "大理"}); - add(new String[]{"珠海锦绣阳光花园", "温州"}); - }}); - city_DistrictNames.put("江苏", new ArrayList(){{ - add(new String[]{"江苏省农科院", "南京"}); - add(new String[]{"江苏油田石油山庄", "扬州"}); - add(new String[]{"江苏警官学院", "南京"}); - add(new String[]{"江苏省高级专家园", "南京"}); - add(new String[]{"江苏油田石油山庄", "扬州"}); - add(new String[]{"江苏议事园", "南京"}); - add(new String[]{"江苏国际塑化城", "常州"}); - add(new String[]{"江苏万和国际商贸城", "常州"}); - }}); - city_DistrictNames.put("镇江", new ArrayList(){{ - add(new String[]{"镇江里", "天津"}); - add(new String[]{"镇江新区国际会议中心", "镇江"}); - add(new String[]{"镇江亿都家居建材城", "镇江"}); - add(new String[]{"镇江旭辉朗香郡", "镇江"}); - add(new String[]{"镇江万达广场", "镇江"}); - }}); - city_DistrictNames.put("江苏", new ArrayList(){{ - add(new String[]{"江苏省农科院", "南京"}); - add(new String[]{"江苏油田石油山庄", "扬州"}); - add(new String[]{"江苏警官学院", "南京"}); - add(new String[]{"江苏省高级专家园", "南京"}); - add(new String[]{"江苏油田石油山庄", "扬州"}); - add(new String[]{"江苏议事园", "南京"}); - add(new String[]{"江苏国际塑化城", "常州"}); - add(new String[]{"江苏万和国际商贸城", "常州"}); - }}); - city_DistrictNames.put("苏州", new ArrayList(){{ - add(new String[]{"苏州北巷", "大连"}); - add(new String[]{"苏州里", "天津"}); - add(new String[]{"苏州花园一期", "乌鲁木齐"}); - add(new String[]{"苏州花园二期", "乌鲁木齐"}); - add(new String[]{"苏州花园", "宿迁"}); - add(new String[]{"苏州小区", "北京"}); - add(new String[]{"苏州公寓", "北京"}); - add(new String[]{"苏州幻象", "济南"}); - add(new String[]{"苏州凤凰文化广场", "苏州"}); - add(new String[]{"苏州国际轻纺城", "苏州"}); - add(new String[]{"苏州世茂运河城", "苏州"}); - add(new String[]{"苏州市沧浪科技创业园", "苏州"}); - add(new String[]{"苏州高新区人力资源大厦", "苏州"}); - add(new String[]{"苏州新东方汽配城", "苏州"}); - add(new String[]{"苏州礼品商品城", "苏州"}); - add(new String[]{"苏州沿海国际中心", "苏州"}); - add(new String[]{"苏州机电五金城", "苏州"}); - add(new String[]{"苏州市沧浪科技创业园东区", "苏州"}); - add(new String[]{"苏州世茂广场公寓", "苏州"}); - }}); - city_DistrictNames.put("江苏", new ArrayList(){{ - add(new String[]{"江苏省农科院", "南京"}); - add(new String[]{"江苏油田石油山庄", "扬州"}); - add(new String[]{"江苏警官学院", "南京"}); - add(new String[]{"江苏省高级专家园", "南京"}); - add(new String[]{"江苏油田石油山庄", "扬州"}); - add(new String[]{"江苏议事园", "南京"}); - add(new String[]{"江苏国际塑化城", "常州"}); - add(new String[]{"江苏万和国际商贸城", "常州"}); - }}); - city_DistrictNames.put("苏州", new ArrayList(){{ - add(new String[]{"苏州北巷", "大连"}); - add(new String[]{"苏州里", "天津"}); - add(new String[]{"苏州花园一期", "乌鲁木齐"}); - add(new String[]{"苏州花园二期", "乌鲁木齐"}); - add(new String[]{"苏州花园", "宿迁"}); - add(new String[]{"苏州小区", "北京"}); - add(new String[]{"苏州公寓", "北京"}); - add(new String[]{"苏州幻象", "济南"}); - add(new String[]{"苏州凤凰文化广场", "苏州"}); - add(new String[]{"苏州国际轻纺城", "苏州"}); - add(new String[]{"苏州世茂运河城", "苏州"}); - add(new String[]{"苏州市沧浪科技创业园", "苏州"}); - add(new String[]{"苏州高新区人力资源大厦", "苏州"}); - add(new String[]{"苏州新东方汽配城", "苏州"}); - add(new String[]{"苏州礼品商品城", "苏州"}); - add(new String[]{"苏州沿海国际中心", "苏州"}); - add(new String[]{"苏州机电五金城", "苏州"}); - add(new String[]{"苏州市沧浪科技创业园东区", "苏州"}); - add(new String[]{"苏州世茂广场公寓", "苏州"}); - }}); - city_DistrictNames.put("吴江", new ArrayList(){{ - add(new String[]{"吴江振泰小区", "苏州"}); - add(new String[]{"吴江时代家园", "苏州"}); - add(new String[]{"吴江凤凰花园", "苏州"}); - add(new String[]{"吴江中央花园", "苏州"}); - add(new String[]{"吴江湖滨花园", "苏州"}); - add(new String[]{"吴江名城花园", "苏州"}); - add(new String[]{"吴江供电小区", "苏州"}); - add(new String[]{"吴江公安新村", "苏州"}); - add(new String[]{"吴江湖滨花园", "吴江"}); - add(new String[]{"吴江名城花园", "吴江"}); - add(new String[]{"吴江时代家园", "吴江"}); - add(new String[]{"吴江凤凰花园", "吴江"}); - add(new String[]{"吴江中央花园", "吴江"}); - add(new String[]{"吴江丽都国际", "吴江"}); - add(new String[]{"吴江公安新村", "吴江"}); - add(new String[]{"吴江供电小区", "吴江"}); - add(new String[]{"吴江振泰小区", "吴江"}); - add(new String[]{"吴江绿地中心", "苏州"}); - add(new String[]{"吴江赛格广场", "苏州"}); - }}); - city_DistrictNames.put("浙江", new ArrayList(){{ - add(new String[]{"浙江工业大学教师宿舍", "杭州"}); - add(new String[]{"浙江大厦", "太原"}); - add(new String[]{"浙江办事处宿舍", "太原"}); - add(new String[]{"浙江仁和居老年养生公寓", "湖州"}); - add(new String[]{"浙江交运大厦", "杭州"}); - add(new String[]{"浙江工商大学宿舍", "杭州"}); - add(new String[]{"浙江商贸城", "合肥"}); - add(new String[]{"浙江工业大学之江学院", "杭州"}); - }}); - city_DistrictNames.put("金华", new ArrayList(){{ - add(new String[]{"金华里", "北京"}); - add(new String[]{"金华苑", "海口"}); - add(new String[]{"金华新村", "大连"}); - add(new String[]{"金华公寓", "青岛"}); - add(new String[]{"金华园", "中山"}); - add(new String[]{"金华花园", "东莞"}); - add(new String[]{"金华世家", "贵阳"}); - add(new String[]{"金华园", "贵阳"}); - add(new String[]{"金华花园", "广州"}); - add(new String[]{"金华新村", "杭州"}); - add(new String[]{"金华苑", "潍坊"}); - add(new String[]{"金华丽小区", "潍坊"}); - add(new String[]{"金华花园", "重庆"}); - add(new String[]{"金华阁", "深圳"}); - add(new String[]{"金华大厦大渡口", "重庆"}); - add(new String[]{"金华苑小区", "重庆"}); - add(new String[]{"金华里", "天津"}); - add(new String[]{"金华小区", "石家庄"}); - add(new String[]{"金华大厦", "重庆"}); - add(new String[]{"金华园", "重庆"}); - add(new String[]{"金华云鼎", "重庆"}); - add(new String[]{"金华园", "沈阳"}); - add(new String[]{"金华公寓", "成都"}); - add(new String[]{"金华苑", "成都"}); - add(new String[]{"金华大厦", "武汉"}); - add(new String[]{"金华学府", "呼和浩特"}); - add(new String[]{"金华世家别墅", "贵阳"}); - add(new String[]{"金华公寓", "福州"}); - add(new String[]{"金华小区", "大连"}); - add(new String[]{"金华里(西青)", "天津"}); - add(new String[]{"金华楼", "厦门"}); - add(new String[]{"金华苑", "兰州"}); - add(new String[]{"金华园别墅", "北京"}); - add(new String[]{"金华小区三期", "大连"}); - add(new String[]{"金华花园", "中山"}); - add(new String[]{"金华园", "佛山"}); - add(new String[]{"金华苑", "青岛"}); - add(new String[]{"金华小区二期", "大连"}); - add(new String[]{"金华园", "昆明"}); - add(new String[]{"金华苑", "上海"}); - add(new String[]{"金华园", "北京"}); - add(new String[]{"金华新村", "上海"}); - add(new String[]{"金华公司宿舍", "昆明"}); - add(new String[]{"金华苑", "平顶山"}); - add(new String[]{"金华家园 ", "盘锦"}); - add(new String[]{"金华家园", "盘锦"}); - add(new String[]{"金华万达广场", "金华"}); - add(new String[]{"金华世贸中心", "金华"}); - add(new String[]{"金华汽配城二期", "金华"}); - add(new String[]{"金华巷一号", "攀枝花"}); - }}); - city_DistrictNames.put("江苏", new ArrayList(){{ - add(new String[]{"江苏省农科院", "南京"}); - add(new String[]{"江苏油田石油山庄", "扬州"}); - add(new String[]{"江苏警官学院", "南京"}); - add(new String[]{"江苏省高级专家园", "南京"}); - add(new String[]{"江苏油田石油山庄", "扬州"}); - add(new String[]{"江苏议事园", "南京"}); - add(new String[]{"江苏国际塑化城", "常州"}); - add(new String[]{"江苏万和国际商贸城", "常州"}); - }}); - city_DistrictNames.put("无锡", new ArrayList(){{ - add(new String[]{"无锡大厦", "上海"}); - add(new String[]{"无锡滨湖万达广场", "无锡"}); - add(new String[]{"无锡碧桂园", "无锡"}); - add(new String[]{"无锡世界贸易中心一期世贸公寓", "无锡"}); - add(new String[]{"无锡洛城橙郡", "无锡"}); - add(new String[]{"无锡塞纳庄园", "宜兴"}); - add(new String[]{"无锡玉兰花园", "宜兴"}); - }}); - city_DistrictNames.put("广东", new ArrayList(){{ - add(new String[]{"广东外贸广场", "广州"}); - add(new String[]{"广东外语艺术学院教师宿舍", "广州"}); - add(new String[]{"广东建科院宿舍", "广州"}); - add(new String[]{"广东司法警官职业学院宿舍", "广州"}); - add(new String[]{"广东环保大厦", "广州"}); - add(new String[]{"广东商业大厦", "广州"}); - add(new String[]{"广东医学院教师宿舍楼", "东莞"}); - add(new String[]{"广东国际大厦", "广州"}); - add(new String[]{"广东省技术监督局宿舍", "广州"}); - add(new String[]{"广东工业大学宿舍", "广州"}); - add(new String[]{"广东教育学院宿舍", "广州"}); - add(new String[]{"广东省银行大厦", "深圳"}); - add(new String[]{"广东大厦", "天津"}); - add(new String[]{"广东山庄", "镇江"}); - add(new String[]{"广东红盾大厦", "广州"}); - add(new String[]{"广东药学院宿舍", "广州"}); - add(new String[]{"广东青年干部学院宿舍", "广州"}); - add(new String[]{"广东基础楼", "深圳"}); - add(new String[]{"广东省科技干部学院宿舍", "广州"}); - add(new String[]{"广东省农业管理干部学院社区", "广州"}); - add(new String[]{"广东芭蕾雨·逸景", "佛山"}); - }}); - city_DistrictNames.put("广州", new ArrayList(){{ - add(new String[]{"广州卫生厅大院", "广州"}); - add(new String[]{"广州雅居乐花园雅逸庭", "广州"}); - add(new String[]{"广州客车厂宿舍", "广州"}); - add(new String[]{"广州后花园", "清远"}); - add(new String[]{"广州后花园", "清远"}); - add(new String[]{"广州雅居乐花园浅山小筑", "广州"}); - add(new String[]{"广州雅居乐花园雅悦庭", "广州"}); - add(new String[]{"广州雅居乐花园雅翠庭", "广州"}); - add(new String[]{"广州奥林匹克花园", "广州"}); - add(new String[]{"广州雅居乐花园邻居", "广州"}); - add(new String[]{"广州雅居乐花园逸心园", "广州"}); - add(new String[]{"广州大学教师楼", "广州"}); - add(new String[]{"广州市社会福利院宿舍", "广州"}); - add(new String[]{"广州体育学院宿舍", "广州"}); - add(new String[]{"广州市食品宿舍", "广州"}); - add(new String[]{"广州湾时代广场", "湛江"}); - add(new String[]{"广州军区房管所宿舍", "武汉"}); - add(new String[]{"广州新塘新世界花园", "广州"}); - add(new String[]{"广州空港假日别墅酒店", "广州"}); - add(new String[]{"广州星河丹堤", "广州"}); - add(new String[]{"广州雅居乐花园十年小雅", "广州"}); - add(new String[]{"广州雅居乐花园花巷", "广州"}); - add(new String[]{"广州雅居乐花园峰会", "广州"}); - add(new String[]{"广州雅居乐花园御景峰别墅", "广州"}); - add(new String[]{"广州碧桂园福苑", "广州"}); - add(new String[]{"广州碧桂园华苑", "广州"}); - add(new String[]{"广州碧桂园雅苑", "广州"}); - add(new String[]{"广州碧桂园美苑", "广州"}); - add(new String[]{"广州碧桂园乐苑", "广州"}); - add(new String[]{"广州碧桂园锦苑", "广州"}); - add(new String[]{"广州雅居乐花园·欧洲故事", "广州"}); - add(new String[]{"广州雅居乐花园灏湖居", "广州"}); - add(new String[]{"广州雅居乐花园雅湖居", "广州"}); - add(new String[]{"广州雅居乐花园", "广州"}); - add(new String[]{"广州雅居乐花园一尺山居", "广州"}); - add(new String[]{"广州雅居乐花园·新地", "广州"}); - add(new String[]{"广州雅居乐花园·天域", "广州"}); - add(new String[]{"广州雅居乐花园·挪威森林", "广州"}); - add(new String[]{"广州雅居乐花园雕刻时光", "广州"}); - add(new String[]{"广州碧桂园秀苑", "广州"}); - add(new String[]{"广州雅居乐花园上善若水", "广州"}); - add(new String[]{"广州港瑞酒店公寓", "广州"}); - add(new String[]{"广州亚运城·天誉", "广州"}); - add(new String[]{"广州白天鹅花园", "广州"}); - add(new String[]{"广州碧桂园绿茵苑", "广州"}); - add(new String[]{"广州雅居乐花园时光九篇", "广州"}); - add(new String[]{"广州碧桂园康苑", "广州"}); - add(new String[]{"广州海运大厦", "广州"}); - add(new String[]{"广州有色金属研究院", "广州"}); - add(new String[]{"广州碧桂园丽苑", "广州"}); - add(new String[]{"广州碧桂园翠苑", "广州"}); - add(new String[]{"广州富力城", "广州"}); - add(new String[]{"广州碧桂园", "广州"}); - add(new String[]{"广州新塘新世界花园", "增城"}); - }}); - city_DistrictNames.put("海南", new ArrayList(){{ - add(new String[]{"海南之心", "海口"}); - add(new String[]{"海南大学南希科技苑", "海口"}); - add(new String[]{"海南日报社宿舍", "海口"}); - add(new String[]{"海南省审计机关美舍住宅区", "海口"}); - add(new String[]{"海南社保", "海口"}); - add(new String[]{"海南省人大常委会机关住宅小区", "海口"}); - add(new String[]{"海南大学教师宿舍", "海口"}); - add(new String[]{"海南燃化公司宿舍", "海口"}); - add(new String[]{"海南省体校宿舍", "海口"}); - add(new String[]{"海南统计局宿舍", "海口"}); - add(new String[]{"海南省工商银行宿舍", "海口"}); - add(new String[]{"海南工商大厦", "海口"}); - add(new String[]{"海南时代广场", "海口"}); - add(new String[]{"海南师范学院金花园", "海口"}); - add(new String[]{"海南大厦", "海口"}); - add(new String[]{"海南电力厂宿舍", "海口"}); - add(new String[]{"海南省三亚六建单位", "三亚"}); - add(new String[]{"海南陵水富力湾", "三亚"}); - add(new String[]{"海南大公馆", "海口"}); - add(new String[]{"海南美林湖国际度假社区", "三亚"}); - add(new String[]{"海南家园", "北京"}); - add(new String[]{"海南干休所", "广州"}); - add(new String[]{"海南绿城清水湾", "三亚"}); - add(new String[]{"海南·三亚·美亚之心", "三亚"}); - add(new String[]{"海南西弄51弄", "上海"}); - add(new String[]{"海南干休所(天河)", "广州"}); - add(new String[]{"海南后海温泉小镇", "重庆"}); - }}); - city_DistrictNames.put("海口", new ArrayList(){{ - add(new String[]{"海口鸿洲新城", "海口"}); - add(new String[]{"海口电信小区", "海口"}); - add(new String[]{"海口电视台宿舍", "海口"}); - add(new String[]{"海口经贸大厦", "海口"}); - add(new String[]{"海口科技大厦", "海口"}); - add(new String[]{"海口晚报社宿舍", "海口"}); - add(new String[]{"海口港大厦", "海口"}); - add(new String[]{"海口市人民医院宿舍", "海口"}); - add(new String[]{"海口花园", "长春"}); - add(new String[]{"海口市首力大厦", "海口"}); - }}); - city_DistrictNames.put("陕西", new ArrayList(){{ - add(new String[]{"陕西电力公司家属院", "西安"}); - add(new String[]{"陕西国际会展中心", "西安"}); - add(new String[]{"陕西巷", "北京"}); - add(new String[]{"陕西省委机关联建小区", "西安"}); - add(new String[]{"陕西省疾控中心家属院", "西安"}); - add(new String[]{"陕西歌舞剧院家属院", "西安"}); - add(new String[]{"陕西戏曲研究院", "西安"}); - add(new String[]{"陕西交通职业技术家属院", "西安"}); - add(new String[]{"陕西广播电视大学家属院", "西安"}); - add(new String[]{"陕西鹏豪园", "西安"}); - add(new String[]{"陕西物产集团公司家属院", "西安"}); - add(new String[]{"陕西金霖商住小区", "西安"}); - }}); - city_DistrictNames.put("延安", new ArrayList(){{ - add(new String[]{"延安中学单位宿舍", "福州"}); - add(new String[]{"延安小区", "贵阳"}); - add(new String[]{"延安新村", "杭州"}); - add(new String[]{"延安里", "天津"}); - add(new String[]{"延安楼", "天津"}); - add(new String[]{"延安里社区", "沈阳"}); - add(new String[]{"延安小区", "大连"}); - add(new String[]{"延安小区", "芜湖"}); - add(new String[]{"延安嘉苑", "上海"}); - add(new String[]{"延安新村", "上海"}); - add(new String[]{"延安小区", "上海"}); - add(new String[]{"延安公寓", "上海"}); - add(new String[]{"延安新村", "无锡"}); - add(new String[]{"延安岭社区", "黄石"}); - add(new String[]{"延安桃源小区", "延安"}); - add(new String[]{"延安北龙大厦", "延安"}); - add(new String[]{"延安绽小区", "延安"}); - }}); - city_DistrictNames.put("广东", new ArrayList(){{ - add(new String[]{"广东外贸广场", "广州"}); - add(new String[]{"广东外语艺术学院教师宿舍", "广州"}); - add(new String[]{"广东建科院宿舍", "广州"}); - add(new String[]{"广东司法警官职业学院宿舍", "广州"}); - add(new String[]{"广东环保大厦", "广州"}); - add(new String[]{"广东商业大厦", "广州"}); - add(new String[]{"广东医学院教师宿舍楼", "东莞"}); - add(new String[]{"广东国际大厦", "广州"}); - add(new String[]{"广东省技术监督局宿舍", "广州"}); - add(new String[]{"广东工业大学宿舍", "广州"}); - add(new String[]{"广东教育学院宿舍", "广州"}); - add(new String[]{"广东省银行大厦", "深圳"}); - add(new String[]{"广东大厦", "天津"}); - add(new String[]{"广东山庄", "镇江"}); - add(new String[]{"广东红盾大厦", "广州"}); - add(new String[]{"广东药学院宿舍", "广州"}); - add(new String[]{"广东青年干部学院宿舍", "广州"}); - add(new String[]{"广东基础楼", "深圳"}); - add(new String[]{"广东省科技干部学院宿舍", "广州"}); - add(new String[]{"广东省农业管理干部学院社区", "广州"}); - add(new String[]{"广东芭蕾雨·逸景", "佛山"}); - }}); - city_DistrictNames.put("中山", new ArrayList(){{ - add(new String[]{"中山三院宿舍", "广州"}); - add(new String[]{"中山二院宿舍", "广州"}); - add(new String[]{"中山花园", "长春"}); - add(new String[]{"中山小区", "郑州"}); - add(new String[]{"中山村", "南昌"}); - add(new String[]{"中山城", "南昌"}); - add(new String[]{"中山桥工商银行宿舍", "南昌"}); - add(new String[]{"中山桥地税局宿舍", "南昌"}); - add(new String[]{"中山壹品", "南昌"}); - add(new String[]{"中山佳苑", "南昌"}); - add(new String[]{"中山名座", "南昌"}); - add(new String[]{"中山桥人民银行宿舍", "南昌"}); - add(new String[]{"中山名苑", "哈尔滨"}); - add(new String[]{"中山国际", "哈尔滨"}); - add(new String[]{"中山福苑", "哈尔滨"}); - add(new String[]{"中山苑", "常州"}); - add(new String[]{"中山门公寓", "常州"}); - add(new String[]{"中山大学西区", "广州"}); - add(new String[]{"中山凯旋门", "石家庄"}); - add(new String[]{"中山宾馆宿舍", "石家庄"}); - add(new String[]{"中山公园附近宿舍", "济南"}); - add(new String[]{"中山门小区", "南京"}); - add(new String[]{"中山城市花园", "柳州"}); - add(new String[]{"中山公寓", "大连"}); - add(new String[]{"中山鸿景苑", "福州"}); - add(new String[]{"中山花园", "泉州"}); - add(new String[]{"中山家园", "宁波"}); - add(new String[]{"中山首府", "宁波"}); - add(new String[]{"中山名都", "宁波"}); - add(new String[]{"中山雅园", "宁波"}); - add(new String[]{"中山小区", "宁波"}); - add(new String[]{"中山帝景苑", "中山"}); - add(new String[]{"中山华庭", "宁波"}); - add(new String[]{"中山·怡和园", "嘉兴"}); - add(new String[]{"中山花园", "嘉兴"}); - add(new String[]{"中山名府", "嘉兴"}); - add(new String[]{"中山大厦商务楼", "嘉兴"}); - add(new String[]{"中山建校小区", "呼和浩特"}); - add(new String[]{"中山大厦", "贵阳"}); - add(new String[]{"中山御庭", "杭州"}); - add(new String[]{"中山花苑", "杭州"}); - add(new String[]{"中山北园", "杭州"}); - add(new String[]{"中山苑", "杭州"}); - add(new String[]{"中山花园", "杭州"}); - add(new String[]{"中山国际", "天津"}); - add(new String[]{"中山苑", "深圳"}); - add(new String[]{"中山颐景花园", "深圳"}); - add(new String[]{"中山花园", "深圳"}); - add(new String[]{"中山门丹尼尔小区", "西安"}); - add(new String[]{"中山小区", "西安"}); - add(new String[]{"中山北里", "天津"}); - add(new String[]{"中山门南里", "天津"}); - add(new String[]{"中山门东里", "天津"}); - add(new String[]{"中山大厦", "天津"}); - add(new String[]{"中山门四号路小区", "天津"}); - add(new String[]{"中山秀景", "沈阳"}); - add(new String[]{"中山南社区", "沈阳"}); - add(new String[]{"中山花园", "武汉"}); - add(new String[]{"中山社区", "武汉"}); - add(new String[]{"中山大厦", "台州"}); - add(new String[]{"中山花园", "马鞍山"}); - add(new String[]{"中山花园", "连云港"}); - add(new String[]{"中山公园小区", "武汉"}); - add(new String[]{"中山桥社区", "武汉"}); - add(new String[]{"中山东升乐意居花园", "中山"}); - add(new String[]{"中山东升丽城花园", "中山"}); - add(new String[]{"中山泮庐别墅", "中山"}); - add(new String[]{"中山花园", "哈尔滨"}); - add(new String[]{"中山蓝色水岸", "哈尔滨"}); - add(new String[]{"中山花园", "贵阳"}); - add(new String[]{"中山大厦", "福州"}); - add(new String[]{"中山艾菲堡", "中山"}); - add(new String[]{"中山九号", "大连"}); - add(new String[]{"中山南苑", "大连"}); - add(new String[]{"中山西苑", "镇江"}); - add(new String[]{"中山门西里", "天津"}); - add(new String[]{"中山门北里", "天津"}); - add(new String[]{"中山东里", "天津"}); - add(new String[]{"中山亭纺织品公司宿舍", "长沙"}); - add(new String[]{"中山大厦", "武汉"}); - add(new String[]{"中山西苑", "宁波"}); - add(new String[]{"中山大学东区", "广州"}); - add(new String[]{"中山二院南院宿舍", "广州"}); - add(new String[]{"中山林建筑公司家属院", "兰州"}); - add(new String[]{"中山SOHO公寓", "宁波"}); - add(new String[]{"中山医学院宿舍", "广州"}); - add(new String[]{"中山城区商铺", "中山"}); - add(new String[]{"中山小区", "重庆"}); - add(new String[]{"中山佳苑", "重庆"}); - add(new String[]{"中山二桥侧", "中山"}); - add(new String[]{"中山海景广场", "厦门"}); - add(new String[]{"中山广场", "佛山"}); - add(new String[]{"中山大院", "福州"}); - add(new String[]{"中山广场", "武汉"}); - add(new String[]{"中山大厦", "贵阳"}); - add(new String[]{"中山豪源", "佛山"}); - add(new String[]{"中山颐景花园二期", "深圳"}); - add(new String[]{"中山广场", "大连"}); - add(new String[]{"中山大学蒲园区", "广州"}); - add(new String[]{"中山新村", "昆山"}); - add(new String[]{"中山苑", "上海"}); - add(new String[]{"中山中信大楼", "上海"}); - add(new String[]{"中山新村", "上海"}); - add(new String[]{"中山广场", "上海"}); - add(new String[]{"中山大楼", "上海"}); - add(new String[]{"中山大厦", "上海"}); - add(new String[]{"中山元一新苑", "上海"}); - add(new String[]{"中山公寓", "上海"}); - add(new String[]{"中山大楼(长宁)", "上海"}); - add(new String[]{"中山医院家属区", "南京"}); - add(new String[]{"中山商务楼", "南京"}); - add(new String[]{"中山大厦", "衡阳"}); - add(new String[]{"中山小区", "宜宾"}); - add(new String[]{"中山国际大厦", "长沙"}); - add(new String[]{"中山西苑景泰里", "宁波"}); - add(new String[]{"中山西苑广安里", "宁波"}); - add(new String[]{"中山社区升平路住宅", "厦门"}); - add(new String[]{"中山名都", "嘉兴"}); - add(new String[]{"中山新村", "苏州"}); - add(new String[]{"中山奥园", "中山"}); - add(new String[]{"中山林二十七中家属院", "兰州"}); - }}); - city_DistrictNames.put("江西", new ArrayList(){{ - add(new String[]{"江西省建工集团", "南昌"}); - add(new String[]{"江西财经大学邮政宿舍", "南昌"}); - add(new String[]{"江西省图书馆宿舍", "南昌"}); - add(new String[]{"江西宾馆旁边", "南昌"}); - add(new String[]{"江西行政学院宿舍", "南昌"}); - add(new String[]{"江西财经大学宿舍", "南昌"}); - add(new String[]{"江西科技师范学院宿舍", "南昌"}); - add(new String[]{"江西省广播电台宿舍", "南昌"}); - add(new String[]{"江西东华计量研究所宿舍", "南昌"}); - add(new String[]{"江西客车厂宿舍", "南昌"}); - add(new String[]{"江西仪器厂宿舍", "南昌"}); - add(new String[]{"江西昌东汽车交易广场", "南昌"}); - add(new String[]{"江西旧货大世界", "南昌"}); - add(new String[]{"江西日报宿舍", "南昌"}); - }}); - city_DistrictNames.put("赣州", new ArrayList(){{ - add(new String[]{"赣州府", "赣州"}); - add(new String[]{"赣州家具大市场", "赣州"}); - add(new String[]{"赣州粮食城", "赣州"}); - }}); - city_DistrictNames.put("陕西", new ArrayList(){{ - add(new String[]{"陕西电力公司家属院", "西安"}); - add(new String[]{"陕西国际会展中心", "西安"}); - add(new String[]{"陕西巷", "北京"}); - add(new String[]{"陕西省委机关联建小区", "西安"}); - add(new String[]{"陕西省疾控中心家属院", "西安"}); - add(new String[]{"陕西歌舞剧院家属院", "西安"}); - add(new String[]{"陕西戏曲研究院", "西安"}); - add(new String[]{"陕西交通职业技术家属院", "西安"}); - add(new String[]{"陕西广播电视大学家属院", "西安"}); - add(new String[]{"陕西鹏豪园", "西安"}); - add(new String[]{"陕西物产集团公司家属院", "西安"}); - add(new String[]{"陕西金霖商住小区", "西安"}); - }}); - city_DistrictNames.put("咸阳", new ArrayList(){{ - add(new String[]{"咸阳里", "天津"}); - add(new String[]{"咸阳南里", "天津"}); - add(new String[]{"咸阳北里", "天津"}); - }}); - city_DistrictNames.put("上海", new ArrayList(){{ - add(new String[]{"上海沙龙", "北京"}); - add(new String[]{"上海滩花园", "烟台"}); - add(new String[]{"上海新城", "南昌"}); - add(new String[]{"上海故事", "南昌"}); - add(new String[]{"上海嘉园", "哈尔滨"}); - add(new String[]{"上海大花园二期", "泰州"}); - add(new String[]{"上海城", "中山"}); - add(new String[]{"上海花园", "温州"}); - add(new String[]{"上海城", "长沙"}); - add(new String[]{"上海年华", "郑州"}); - add(new String[]{"上海公寓", "贵阳"}); - add(new String[]{"上海城市", "合肥"}); - add(new String[]{"上海明珠花园", "南京"}); - add(new String[]{"上海城二期", "重庆"}); - add(new String[]{"上海国际服饰城", "徐州"}); - add(new String[]{"上海大厦", "重庆"}); - add(new String[]{"上海城公馆", "西安"}); - add(new String[]{"上海城", "重庆"}); - add(new String[]{"上海滩大华国际公馆", "天津"}); - add(new String[]{"上海新城", "南通"}); - add(new String[]{"上海城名人苑", "绵阳"}); - add(new String[]{"上海嘉苑", "南通"}); - add(new String[]{"上海公馆", "襄阳"}); - add(new String[]{"上海家园", "台州"}); - add(new String[]{"上海花园", "台州"}); - add(new String[]{"上海豪苑一期", "连云港"}); - add(new String[]{"上海之春二期", "连云港"}); - add(new String[]{"上海之春一期", "连云港"}); - add(new String[]{"上海豪苑二期", "连云港"}); - add(new String[]{"上海豪苑16#楼", "连云港"}); - add(new String[]{"上海城", "苏州"}); - add(new String[]{"上海市场步行街1号院", "洛阳"}); - add(new String[]{"上海滩华府", "洛阳"}); - add(new String[]{"上海市场2号院", "洛阳"}); - add(new String[]{"上海新村", "银川"}); - add(new String[]{"上海西新村", "福州"}); - add(new String[]{"上海花园", "济南"}); - add(new String[]{"上海公寓", "镇江"}); - add(new String[]{"上海豪庭", "威海"}); - add(new String[]{"上海花苑", "青岛"}); - add(new String[]{"上海花园南邻宿舍", "济南"}); - add(new String[]{"上海村", "武汉"}); - add(new String[]{"上海国际花园", "威海"}); - add(new String[]{"上海大花园一期", "泰州"}); - add(new String[]{"上海城繁华纪", "重庆"}); - add(new String[]{"上海城", "绍兴"}); - add(new String[]{"上海东方花苑", "重庆"}); - add(new String[]{"上海城三期天域", "重庆"}); - add(new String[]{"上海城LOMO公寓", "重庆"}); - add(new String[]{"上海城", "威海"}); - add(new String[]{"上海东韵", "成都"}); - add(new String[]{"上海恒联新天地花园", "昆明"}); - add(new String[]{"上海沙龙二期", "昆明"}); - add(new String[]{"上海沙龙三期", "昆明"}); - add(new String[]{"上海公馆", "昆山"}); - add(new String[]{"上海裕花园", "昆山"}); - add(new String[]{"上海后花园", "昆山"}); - add(new String[]{"上海捷座", "昆山"}); - add(new String[]{"上海星城别墅", "昆山"}); - add(new String[]{"上海万科第五园", "上海"}); - add(new String[]{"上海绿城三期", "上海"}); - add(new String[]{"上海滩花园洋房", "上海"}); - add(new String[]{"上海绿城二期", "上海"}); - add(new String[]{"上海绿城", "上海"}); - add(new String[]{"上海滩花园洋房别墅", "上海"}); - add(new String[]{"上海未来", "上海"}); - add(new String[]{"上海未来黄山新城", "上海"}); - add(new String[]{"上海蓝堡", "上海"}); - add(new String[]{"上海第一八佰伴", "上海"}); - add(new String[]{"上海两港装饰材料城", "上海"}); - add(new String[]{"上海鼎城", "上海"}); - add(new String[]{"上海桥梓湾购物中心", "上海"}); - add(new String[]{"上海世博东湖公寓酒店", "上海"}); - add(new String[]{"上海建筑", "北京"}); - add(new String[]{"上海六百", "上海"}); - add(new String[]{"上海梦想", "上海"}); - add(new String[]{"上海关港工业园区", "上海"}); - add(new String[]{"上海电子艺术创意产业基地", "上海"}); - add(new String[]{"上海大花园", "上海"}); - add(new String[]{"上海捷克住宅小区", "上海"}); - add(new String[]{"上海国际摩尔城", "上海"}); - add(new String[]{"上海皇家花园", "上海"}); - add(new String[]{"上海国际中小企业城", "上海"}); - add(new String[]{"上海五月天", "上海"}); - add(new String[]{"上海北竿山国际艺术中心", "上海"}); - add(new String[]{"上海本色", "上海"}); - add(new String[]{"上海漕河泾开发区松江高科技园一期", "上海"}); - add(new String[]{"上海松江万达广场", "上海"}); - add(new String[]{"上海诗林别墅", "上海"}); - add(new String[]{"上海合生国际花园", "上海"}); - add(new String[]{"上海公馆", "上海"}); - add(new String[]{"上海紫园二期", "上海"}); - add(new String[]{"上海裕花园", "上海"}); - add(new String[]{"上海葡萄城科技产业生产大楼", "上海"}); - add(new String[]{"上海两港装饰城公寓", "上海"}); - add(new String[]{"上海白马大厦", "上海"}); - add(new String[]{"上海新村", "上海"}); - add(new String[]{"上海大悦城", "上海"}); - add(new String[]{"上海国际时尚中心", "上海"}); - add(new String[]{"上海商务中心", "上海"}); - add(new String[]{"上海理工大学国家大学科技园", "上海"}); - add(new String[]{"上海财经大学国家大学科技园", "上海"}); - add(new String[]{"上海滩大宁城", "上海"}); - add(new String[]{"上海师大科技园", "上海"}); - add(new String[]{"上海豪都国际花园别墅", "上海"}); - add(new String[]{"上海诗林", "上海"}); - add(new String[]{"上海家天下花园别墅", "上海"}); - add(new String[]{"上海源花城", "上海"}); - add(new String[]{"上海青年城", "上海"}); - add(new String[]{"上海威尼斯花园", "上海"}); - add(new String[]{"上海晶碧产业园", "上海"}); - add(new String[]{"上海天地软件园", "上海"}); - add(new String[]{"上海银座", "上海"}); - add(new String[]{"上海豪都国际花园", "上海"}); - add(new String[]{"上海豪园", "上海"}); - add(new String[]{"上海汇力得电子商务产业园", "上海"}); - add(new String[]{"上海利比富文具礼品商厦", "上海"}); - add(new String[]{"上海之春公寓", "上海"}); - add(new String[]{"上海香溢花城", "上海"}); - add(new String[]{"上海星河湾", "上海"}); - add(new String[]{"上海年华", "上海"}); - add(new String[]{"上海知音", "上海"}); - add(new String[]{"上海知音二期", "上海"}); - add(new String[]{"上海莘城牡丹阁", "上海"}); - add(new String[]{"上海紫旺城", "上海"}); - add(new String[]{"上海星港", "上海"}); - add(new String[]{"上海春天", "上海"}); - add(new String[]{"上海家园", "上海"}); - add(new String[]{"上海莘城都市情园", "上海"}); - add(new String[]{"上海漕河泾开发区闵行高科技园", "上海"}); - add(new String[]{"上海莘城", "上海"}); - add(new String[]{"上海康城三期", "上海"}); - add(new String[]{"上海·绿城玫瑰园", "上海"}); - add(new String[]{"上海花园别墅", "上海"}); - add(new String[]{"上海康城四期", "上海"}); - add(new String[]{"上海别墅", "上海"}); - add(new String[]{"上海共富园", "上海"}); - add(new String[]{"上海滩花园", "上海"}); - add(new String[]{"上海花园", "上海"}); - add(new String[]{"上海侨园天宝财富创意园区", "上海"}); - add(new String[]{"上海风景", "上海"}); - add(new String[]{"上海滩新昌城", "上海"}); - add(new String[]{"上海商城", "上海"}); - add(new String[]{"上海康城二期", "上海"}); - add(new String[]{"上海阳城", "上海"}); - add(new String[]{"上海金鹰购物中心", "上海"}); - add(new String[]{"上海春城", "上海"}); - add(new String[]{"上海康城", "上海"}); - add(new String[]{"上海上实南洋广场", "上海"}); - add(new String[]{"上海绿地香颂公寓", "上海"}); - add(new String[]{"上海花城", "上海"}); - add(new String[]{"上海绿地香颂别墅", "上海"}); - add(new String[]{"上海金山义乌小商品城", "上海"}); - add(new String[]{"上海捷座", "上海"}); - add(new String[]{"上海花园广场", "上海"}); - add(new String[]{"上海新天鸿名人高尔夫别墅社区", "上海"}); - add(new String[]{"上海唐朝酒店", "上海"}); - add(new String[]{"上海加州花园", "上海"}); - add(new String[]{"上海花园", "青岛"}); - add(new String[]{"上海景园", "青岛"}); - add(new String[]{"上海沙龙一期", "昆明"}); - add(new String[]{"上海花园", "成都"}); - add(new String[]{"上海城", "肇庆"}); - add(new String[]{"上海花园", "乐清"}); - add(new String[]{"上海城", "吴江"}); - add(new String[]{"上海城", "新乡"}); - add(new String[]{"上海印象", "牡丹江"}); - add(new String[]{"上海丽苑", "盐城"}); - add(new String[]{"上海九久青年城二期", "上海"}); - add(new String[]{"上海电影广场", "上海"}); - add(new String[]{"上海三湘海尚", "上海"}); - add(new String[]{"上海三湘海尚别墅", "上海"}); - add(new String[]{"上海国际钢铁服务业中心", "上海"}); - add(new String[]{"上海海港国际贸易中心", "上海"}); - add(new String[]{"上海锦珂国际塑胶中心", "上海"}); - add(new String[]{"上海西郊商务区", "上海"}); - add(new String[]{"上海锦江国际购物中心", "上海"}); - add(new String[]{"上海新体育广场", "上海"}); - add(new String[]{"上海青年城公寓", "上海"}); - add(new String[]{"上海博伦综合市场", "上海"}); - add(new String[]{"上海兴力达国际装饰城", "上海"}); - add(new String[]{"上海花园", "攀枝花"}); - add(new String[]{"上海星城", "苏州"}); - add(new String[]{"上海滩商厦", "上海"}); - add(new String[]{"上海国际鞋城", "上海"}); - add(new String[]{"上海装饰市场", "上海"}); - add(new String[]{"上海周浦万达广场公寓", "上海"}); - add(new String[]{"上海城新天地家园", "苏州"}); - add(new String[]{"上海裕花园", "苏州"}); - add(new String[]{"上海之春", "连云港"}); - }}); - city_DistrictNames.put("江苏", new ArrayList(){{ - add(new String[]{"江苏省农科院", "南京"}); - add(new String[]{"江苏油田石油山庄", "扬州"}); - add(new String[]{"江苏警官学院", "南京"}); - add(new String[]{"江苏省高级专家园", "南京"}); - add(new String[]{"江苏油田石油山庄", "扬州"}); - add(new String[]{"江苏议事园", "南京"}); - add(new String[]{"江苏国际塑化城", "常州"}); - add(new String[]{"江苏万和国际商贸城", "常州"}); - }}); - city_DistrictNames.put("苏州", new ArrayList(){{ - add(new String[]{"苏州北巷", "大连"}); - add(new String[]{"苏州里", "天津"}); - add(new String[]{"苏州花园一期", "乌鲁木齐"}); - add(new String[]{"苏州花园二期", "乌鲁木齐"}); - add(new String[]{"苏州花园", "宿迁"}); - add(new String[]{"苏州小区", "北京"}); - add(new String[]{"苏州公寓", "北京"}); - add(new String[]{"苏州幻象", "济南"}); - add(new String[]{"苏州凤凰文化广场", "苏州"}); - add(new String[]{"苏州国际轻纺城", "苏州"}); - add(new String[]{"苏州世茂运河城", "苏州"}); - add(new String[]{"苏州市沧浪科技创业园", "苏州"}); - add(new String[]{"苏州高新区人力资源大厦", "苏州"}); - add(new String[]{"苏州新东方汽配城", "苏州"}); - add(new String[]{"苏州礼品商品城", "苏州"}); - add(new String[]{"苏州沿海国际中心", "苏州"}); - add(new String[]{"苏州机电五金城", "苏州"}); - add(new String[]{"苏州市沧浪科技创业园东区", "苏州"}); - add(new String[]{"苏州世茂广场公寓", "苏州"}); - }}); - city_DistrictNames.put("昆山", new ArrayList(){{ - add(new String[]{"昆山小区", "沈阳"}); - add(new String[]{"昆山南小区", "沈阳"}); - add(new String[]{"昆山里", "天津"}); - add(new String[]{"昆山花园", "昆山"}); - add(new String[]{"昆山亿丰机电城", "昆山"}); - add(new String[]{"昆山柏悦商务大厦", "昆山"}); - add(new String[]{"昆山国际模具城", "昆山"}); - add(new String[]{"昆山绿城玫瑰园", "昆山"}); - add(new String[]{"昆山亿丰广场", "昆山"}); - add(new String[]{"昆山香溢紫郡", "昆山"}); - add(new String[]{"昆山中宇广场", "上海"}); - add(new String[]{"昆山赛格电子", "上海"}); - add(new String[]{"昆山云山诗意", "苏州"}); - add(new String[]{"昆山柏悦商务大厦", "苏州"}); - }}); - city_DistrictNames.put("内蒙古", new ArrayList(){{ - add(new String[]{"内蒙古电大小区", "呼和浩特"}); - add(new String[]{"内蒙古日报社安全文明小区", "呼和浩特"}); - add(new String[]{"内蒙古政府住宅小区", "呼和浩特"}); - add(new String[]{"内蒙古自治区国税局住宅区", "呼和浩特"}); - add(new String[]{"内蒙古政协住宅小区", "呼和浩特"}); - add(new String[]{"内蒙古经贸学院家属院", "呼和浩特"}); - add(new String[]{"内蒙古党校南苑小区", "呼和浩特"}); - add(new String[]{"内蒙古医院家属楼", "呼和浩特"}); - add(new String[]{"内蒙古国际商贸城", "呼和浩特"}); - }}); - city_DistrictNames.put("鄂尔多斯", new ArrayList(){{ - }}); - city_DistrictNames.put("广东", new ArrayList(){{ - add(new String[]{"广东外贸广场", "广州"}); - add(new String[]{"广东外语艺术学院教师宿舍", "广州"}); - add(new String[]{"广东建科院宿舍", "广州"}); - add(new String[]{"广东司法警官职业学院宿舍", "广州"}); - add(new String[]{"广东环保大厦", "广州"}); - add(new String[]{"广东商业大厦", "广州"}); - add(new String[]{"广东医学院教师宿舍楼", "东莞"}); - add(new String[]{"广东国际大厦", "广州"}); - add(new String[]{"广东省技术监督局宿舍", "广州"}); - add(new String[]{"广东工业大学宿舍", "广州"}); - add(new String[]{"广东教育学院宿舍", "广州"}); - add(new String[]{"广东省银行大厦", "深圳"}); - add(new String[]{"广东大厦", "天津"}); - add(new String[]{"广东山庄", "镇江"}); - add(new String[]{"广东红盾大厦", "广州"}); - add(new String[]{"广东药学院宿舍", "广州"}); - add(new String[]{"广东青年干部学院宿舍", "广州"}); - add(new String[]{"广东基础楼", "深圳"}); - add(new String[]{"广东省科技干部学院宿舍", "广州"}); - add(new String[]{"广东省农业管理干部学院社区", "广州"}); - add(new String[]{"广东芭蕾雨·逸景", "佛山"}); - }}); - city_DistrictNames.put("韶关", new ArrayList(){{ - add(new String[]{"韶关碧桂园", "韶关"}); - }}); - city_DistrictNames.put("陕西", new ArrayList(){{ - add(new String[]{"陕西电力公司家属院", "西安"}); - add(new String[]{"陕西国际会展中心", "西安"}); - add(new String[]{"陕西巷", "北京"}); - add(new String[]{"陕西省委机关联建小区", "西安"}); - add(new String[]{"陕西省疾控中心家属院", "西安"}); - add(new String[]{"陕西歌舞剧院家属院", "西安"}); - add(new String[]{"陕西戏曲研究院", "西安"}); - add(new String[]{"陕西交通职业技术家属院", "西安"}); - add(new String[]{"陕西广播电视大学家属院", "西安"}); - add(new String[]{"陕西鹏豪园", "西安"}); - add(new String[]{"陕西物产集团公司家属院", "西安"}); - add(new String[]{"陕西金霖商住小区", "西安"}); - }}); - city_DistrictNames.put("西安", new ArrayList(){{ - add(new String[]{"西安花园", "长春"}); - add(new String[]{"西安苑", "厦门"}); - add(new String[]{"西安福胡同", "北京"}); - add(new String[]{"西安门小区", "北京"}); - add(new String[]{"西安印象", "西安"}); - add(new String[]{"西安朝阳小区", "西安"}); - add(new String[]{"西安锦都", "西安"}); - add(new String[]{"西安市政府小区", "西安"}); - add(new String[]{"西安锦园", "西安"}); - add(new String[]{"西安阳光里", "西安"}); - add(new String[]{"西安市人民检察院家属院", "西安"}); - add(new String[]{"西安恒立苑", "西安"}); - add(new String[]{"西安市建行家属院", "西安"}); - add(new String[]{"西安仪表厂101社区", "西安"}); - add(new String[]{"西安高新区创业研发院", "西安"}); - add(new String[]{"西安广场", "厦门"}); - add(new String[]{"西安市劳动局家属院", "西安"}); - add(new String[]{"西安大洋商厦", "西安"}); - add(new String[]{"西安市商业银行城东支行家属院", "西安"}); - add(new String[]{"西安外运小区", "西安"}); - add(new String[]{"西安日报社家属院", "西安"}); - add(new String[]{"西安院子", "西安"}); - add(new String[]{"西安电缆公司家属院", "西安"}); - add(new String[]{"西安盛世广场", "西安"}); - add(new String[]{"西安民乐园万达广场", "西安"}); - add(new String[]{"西安首创国际城/首创漫香郡", "西安"}); - add(new String[]{"西安交通大学扬州科技园", "扬州"}); - }}); - city_DistrictNames.put("山东", new ArrayList(){{ - add(new String[]{"山东里", "秦皇岛"}); - add(new String[]{"山东经济学院宿舍", "济南"}); - add(new String[]{"山东省卫生厅宿舍", "济南"}); - add(new String[]{"山东省民政厅宿舍", "济南"}); - add(new String[]{"山东省商业集团总公司宿舍", "济南"}); - add(new String[]{"山东医科大学教师宿舍", "济南"}); - add(new String[]{"山东外贸大厦", "青岛"}); - add(new String[]{"山东大厦", "深圳"}); - add(new String[]{"山东堡社区", "沈阳"}); - add(new String[]{"山东艺术学院宿舍", "济南"}); - add(new String[]{"山东黄金崮云湖高尔夫别墅", "济南"}); - add(new String[]{"山东司法警官学院宿舍", "济南"}); - add(new String[]{"山东省科学院高新技术研究分院", "青岛"}); - add(new String[]{"山东建工学院宿舍", "济南"}); - add(new String[]{"山东庙小区", "沈阳"}); - add(new String[]{"山东乳山银滩海景房", "威海"}); - add(new String[]{"山东头村", "青岛"}); - add(new String[]{"山东省畜牧局宿舍", "济南"}); - }}); - city_DistrictNames.put("潍坊", new ArrayList(){{ - add(new String[]{"潍坊二建宿舍", "潍坊"}); - add(new String[]{"潍坊烟草公司宿舍", "潍坊"}); - add(new String[]{"潍坊市教育局", "潍坊"}); - add(new String[]{"潍坊大酒店宿舍", "潍坊"}); - add(new String[]{"潍坊东方家园", "潍坊"}); - add(new String[]{"潍坊供销社宿舍", "潍坊"}); - add(new String[]{"潍坊建工局宿舍", "潍坊"}); - add(new String[]{"潍坊学院宿舍(沃尔玛后)", "潍坊"}); - add(new String[]{"潍坊中学家属院", "潍坊"}); - add(new String[]{"潍坊动配宿舍", "潍坊"}); - add(new String[]{"潍坊银行宿舍(樱前街)", "潍坊"}); - add(new String[]{"潍坊银行宿舍", "潍坊"}); - add(new String[]{"潍坊十村", "上海"}); - add(new String[]{"潍坊二村", "上海"}); - add(new String[]{"潍坊九村", "上海"}); - add(new String[]{"潍坊六村", "上海"}); - add(new String[]{"潍坊大楼", "上海"}); - add(new String[]{"潍坊四村", "上海"}); - add(new String[]{"潍坊一村", "上海"}); - add(new String[]{"潍坊八村", "上海"}); - add(new String[]{"潍坊五村", "上海"}); - add(new String[]{"潍坊七村", "上海"}); - add(new String[]{"潍坊三村", "上海"}); - }}); - city_DistrictNames.put("河南", new ArrayList(){{ - add(new String[]{"河南庄小区", "青岛"}); - add(new String[]{"河南财专家属院", "郑州"}); - add(new String[]{"河南省新华书店家属院", "郑州"}); - add(new String[]{"河南省商业科学研究所家属院", "郑州"}); - add(new String[]{"河南省日报社家属院", "郑州"}); - add(new String[]{"河南女子高中家属院", "郑州"}); - add(new String[]{"河南外贸大院", "深圳"}); - add(new String[]{"河南里", "天津"}); - add(new String[]{"河南新村", "福州"}); - add(new String[]{"河南财经学院家属院", "郑州"}); - add(new String[]{"河南岸公园小区", "惠州"}); - add(new String[]{"河南岸新村", "惠州"}); - add(new String[]{"河南村", "北京"}); - add(new String[]{"河南理工学校家属院", "郑州"}); - add(new String[]{"河南省人事厅家属院", "郑州"}); - add(new String[]{"河南岸中心小区", "惠州"}); - add(new String[]{"河南省外贸学校家属院", "郑州"}); - add(new String[]{"河南村", "上海"}); - add(new String[]{"河南新村", "上海"}); - add(new String[]{"河南工业大学家属院", "郑州"}); - }}); - city_DistrictNames.put("洛阳", new ArrayList(){{ - add(new String[]{"洛阳花园", "长春"}); - add(new String[]{"洛阳嘉汇城", "洛阳"}); - add(new String[]{"洛阳市高质人才居住区", "洛阳"}); - add(new String[]{"洛阳新城", "泉州"}); - add(new String[]{"洛阳银行家属院", "洛阳"}); - add(new String[]{"洛阳嘉汇城", "洛阳"}); - add(new String[]{"洛阳饭店家属院", "洛阳"}); - add(new String[]{"洛阳泊林绿洲", "洛阳"}); - add(new String[]{"洛阳新村", "上海"}); - add(new String[]{"洛阳升龙广场", "洛阳"}); - add(new String[]{"洛阳信息科技城", "洛阳"}); - add(new String[]{"洛阳升龙城", "洛阳"}); - }}); - city_DistrictNames.put("江苏", new ArrayList(){{ - add(new String[]{"江苏省农科院", "南京"}); - add(new String[]{"江苏油田石油山庄", "扬州"}); - add(new String[]{"江苏警官学院", "南京"}); - add(new String[]{"江苏省高级专家园", "南京"}); - add(new String[]{"江苏油田石油山庄", "扬州"}); - add(new String[]{"江苏议事园", "南京"}); - add(new String[]{"江苏国际塑化城", "常州"}); - add(new String[]{"江苏万和国际商贸城", "常州"}); - }}); - city_DistrictNames.put("常州", new ArrayList(){{ - add(new String[]{"常州里", "天津"}); - }}); - city_DistrictNames.put("广东", new ArrayList(){{ - add(new String[]{"广东外贸广场", "广州"}); - add(new String[]{"广东外语艺术学院教师宿舍", "广州"}); - add(new String[]{"广东建科院宿舍", "广州"}); - add(new String[]{"广东司法警官职业学院宿舍", "广州"}); - add(new String[]{"广东环保大厦", "广州"}); - add(new String[]{"广东商业大厦", "广州"}); - add(new String[]{"广东医学院教师宿舍楼", "东莞"}); - add(new String[]{"广东国际大厦", "广州"}); - add(new String[]{"广东省技术监督局宿舍", "广州"}); - add(new String[]{"广东工业大学宿舍", "广州"}); - add(new String[]{"广东教育学院宿舍", "广州"}); - add(new String[]{"广东省银行大厦", "深圳"}); - add(new String[]{"广东大厦", "天津"}); - add(new String[]{"广东山庄", "镇江"}); - add(new String[]{"广东红盾大厦", "广州"}); - add(new String[]{"广东药学院宿舍", "广州"}); - add(new String[]{"广东青年干部学院宿舍", "广州"}); - add(new String[]{"广东基础楼", "深圳"}); - add(new String[]{"广东省科技干部学院宿舍", "广州"}); - add(new String[]{"广东省农业管理干部学院社区", "广州"}); - add(new String[]{"广东芭蕾雨·逸景", "佛山"}); - }}); - city_DistrictNames.put("东莞", new ArrayList(){{ - add(new String[]{"东莞庄工商局宿舍", "广州"}); - add(new String[]{"东莞市家居装饰城", "东莞"}); - add(new String[]{"东莞长安万达广场", "东莞"}); - add(new String[]{"东莞华南国际汽配城", "东莞"}); - add(new String[]{"东莞外贸大厦", "深圳"}); - add(new String[]{"东莞家私城", "黄石"}); - }}); - city_DistrictNames.put("湖北", new ArrayList(){{ - add(new String[]{"湖北小区", "北京"}); - add(new String[]{"湖北宝丰花园", "深圳"}); - add(new String[]{"湖北经济学院宿舍", "武汉"}); - add(new String[]{"湖北大学宿舍", "武汉"}); - add(new String[]{"湖北日报宿舍", "武汉"}); - add(new String[]{"湖北省文联宿舍", "武汉"}); - add(new String[]{"湖北现代五金电器城", "武汉"}); - add(new String[]{"湖北饭店宿舍", "武汉"}); - add(new String[]{"湖北保险公司家属楼", "武汉"}); - add(new String[]{"湖北林业勘察院小区", "武汉"}); - add(new String[]{"湖北交通职业技术学院宿舍", "武汉"}); - add(new String[]{"湖北省艺术学校宿舍", "武汉"}); - add(new String[]{"湖北大厦", "厦门"}); - add(new String[]{"湖北质量监督局宿舍", "武汉"}); - add(new String[]{"湖北省医药监督管理局宿舍", "武汉"}); - add(new String[]{"湖北教育出版社宿舍", "武汉"}); - add(new String[]{"湖北省药材公司宿舍", "武汉"}); - add(new String[]{"湖北二师宿舍", "武汉"}); - add(new String[]{"湖北中医学院宿舍", "武汉"}); - add(new String[]{"湖北省生活资料公司居民小区", "武汉"}); - add(new String[]{"湖北商务广场", "武汉"}); - add(new String[]{"湖北教育学院宿舍", "武汉"}); - add(new String[]{"湖北省监狱管理局宿舍", "武汉"}); - add(new String[]{"湖北省安全监察局宿舍", "武汉"}); - }}); - city_DistrictNames.put("黄石", new ArrayList(){{ - add(new String[]{"黄石大厦", "广州"}); - add(new String[]{"黄石花园", "广州"}); - add(new String[]{"黄石司法学校宿舍", "广州"}); - add(new String[]{"黄石岭小区", "河源"}); - add(new String[]{"黄石港亚光新村", "黄石"}); - add(new String[]{"黄石公园", "黄石"}); - add(new String[]{"黄石港迎宾御园", "黄石"}); - }}); - city_DistrictNames.put("青海", new ArrayList(){{ - add(new String[]{"青海湖花园", "西宁"}); - add(new String[]{"青海园丁园", "西宁"}); - add(new String[]{"青海园", "天津"}); - add(new String[]{"青海大厦", "深圳"}); - add(new String[]{"青海干休所", "无锡"}); - add(new String[]{"青海新村", "南通"}); - }}); - city_DistrictNames.put("西宁", new ArrayList(){{ - }}); - city_DistrictNames.put("山东", new ArrayList(){{ - add(new String[]{"山东里", "秦皇岛"}); - add(new String[]{"山东经济学院宿舍", "济南"}); - add(new String[]{"山东省卫生厅宿舍", "济南"}); - add(new String[]{"山东省民政厅宿舍", "济南"}); - add(new String[]{"山东省商业集团总公司宿舍", "济南"}); - add(new String[]{"山东医科大学教师宿舍", "济南"}); - add(new String[]{"山东外贸大厦", "青岛"}); - add(new String[]{"山东大厦", "深圳"}); - add(new String[]{"山东堡社区", "沈阳"}); - add(new String[]{"山东艺术学院宿舍", "济南"}); - add(new String[]{"山东黄金崮云湖高尔夫别墅", "济南"}); - add(new String[]{"山东司法警官学院宿舍", "济南"}); - add(new String[]{"山东省科学院高新技术研究分院", "青岛"}); - add(new String[]{"山东建工学院宿舍", "济南"}); - add(new String[]{"山东庙小区", "沈阳"}); - add(new String[]{"山东乳山银滩海景房", "威海"}); - add(new String[]{"山东头村", "青岛"}); - add(new String[]{"山东省畜牧局宿舍", "济南"}); - }}); - city_DistrictNames.put("济南", new ArrayList(){{ - add(new String[]{"济南一中宿舍", "济南"}); - add(new String[]{"济南四建宿舍", "济南"}); - add(new String[]{"济南饭店宿舍", "济南"}); - add(new String[]{"济南中学附近宿舍", "济南"}); - add(new String[]{"济南灯泡厂宿舍", "济南"}); - add(new String[]{"济南普利商务中心", "济南"}); - add(new String[]{"济南大学宿舍", "济南"}); - add(new String[]{"济南三中教师宿舍", "济南"}); - add(new String[]{"济南三建宿舍", "济南"}); - add(new String[]{"济南十四中宿舍", "济南"}); - add(new String[]{"济南市房管局宿舍", "济南"}); - add(new String[]{"济南鲁能领秀城", "济南"}); - add(new String[]{"济南大学西校区附近宿舍", "济南"}); - add(new String[]{"济南第九中学宿舍", "济南"}); - add(new String[]{"济南军区总医院宿舍", "济南"}); - add(new String[]{"济南黄金花园", "济南"}); - add(new String[]{"济南恒大名都", "济南"}); - add(new String[]{"济南恒大绿洲", "济南"}); - add(new String[]{"济南一中对面宿舍", "济南"}); - add(new String[]{"济南汇苑家园", "济南"}); - add(new String[]{"济南电视广播大学东校区宿舍", "济南"}); - add(new String[]{"济南玫瑰园新城", "济南"}); - add(new String[]{"济南农信联社宿舍", "济南"}); - add(new String[]{"济南韩国产业城", "济南"}); - add(new String[]{"济南天马相城", "济南"}); - add(new String[]{"济南恒大帝景", "济南"}); - add(new String[]{"济南华强广场", "济南"}); + city_DistrictNames.put("閲嶅簡", new ArrayList(){{ + add(new String[]{"閲嶅簡妫灄鍏瘬", "閲嶅簡"}); + add(new String[]{"閲嶅簡澶╁湴闆嶆睙鑹哄涵", "閲嶅簡"}); + add(new String[]{"閲嶅簡澶уB鍖洪泦璧勬ゼ", "閲嶅簡"}); + add(new String[]{"閲嶅簡鍠滄潵鐧诲浗闄呬腑蹇�", "閲嶅簡"}); + add(new String[]{"閲嶅簡妫灄", "閲嶅簡"}); + add(new String[]{"閲嶅簡鏉�", "閲嶅簡"}); + add(new String[]{"閲嶅簡甯堣寖澶у甯堝ぇ鍥�", "閲嶅簡"}); + add(new String[]{"閲嶅簡瀹鹃鍟嗗姟澶у帵", "閲嶅簡"}); + add(new String[]{"閲嶅簡鍑虹増绀惧皬鍖�", "閲嶅簡"}); + add(new String[]{"閲嶅簡鎴存柉澶ч厭搴�", "閲嶅簡"}); + add(new String[]{"閲嶅簡涓婃捣涓績", "閲嶅簡"}); + add(new String[]{"閲嶅簡澶╁湴闆嶆睙缈犵挓", "閲嶅簡"}); + add(new String[]{"閲嶅簡澶╁湴闆嶆睙鎮﹀涵", "閲嶅簡"}); + add(new String[]{"閲嶅簡澶уA鍖烘澗鏋楁潙", "閲嶅簡"}); + add(new String[]{"閲嶅簡妗冩簮灞呭浗闄呰姳鍥竴鍖�", "閲嶅簡"}); + add(new String[]{"閲嶅簡涓栫晫涔嬬獥", "閲嶅簡"}); + add(new String[]{"閲嶅簡鍏", "閲嶅簡"}); + add(new String[]{"閲嶅簡鍏瘬", "涓婃捣"}); + add(new String[]{"閲嶅簡澶фゼ", "涓婃捣"}); + add(new String[]{"閲嶅簡鍥介檯瀹剁汉鍩庣唬鑹�", "閲嶅簡"}); + add(new String[]{"閲嶅簡涓囪豹鍥介檯閲戣瀺涓績", "閲嶅簡"}); + add(new String[]{"閲嶅簡澶╁湴闆嶆睙寰″涵", "閲嶅簡"}); + add(new String[]{"閲嶅簡骞垮憡浜т笟鍥�", "閲嶅簡"}); + add(new String[]{"閲嶅簡鎬婚儴鍩�", "閲嶅簡"}); + add(new String[]{"閲嶅簡妫曟娉夊浗闄呰姳鍥�", "閲嶅簡"}); + }}); + city_DistrictNames.put("閲嶅簡", new ArrayList(){{ + add(new String[]{"閲嶅簡妫灄鍏瘬", "閲嶅簡"}); + add(new String[]{"閲嶅簡澶╁湴闆嶆睙鑹哄涵", "閲嶅簡"}); + add(new String[]{"閲嶅簡澶уB鍖洪泦璧勬ゼ", "閲嶅簡"}); + add(new String[]{"閲嶅簡鍠滄潵鐧诲浗闄呬腑蹇�", "閲嶅簡"}); + add(new String[]{"閲嶅簡妫灄", "閲嶅簡"}); + add(new String[]{"閲嶅簡鏉�", "閲嶅簡"}); + add(new String[]{"閲嶅簡甯堣寖澶у甯堝ぇ鍥�", "閲嶅簡"}); + add(new String[]{"閲嶅簡瀹鹃鍟嗗姟澶у帵", "閲嶅簡"}); + add(new String[]{"閲嶅簡鍑虹増绀惧皬鍖�", "閲嶅簡"}); + add(new String[]{"閲嶅簡鎴存柉澶ч厭搴�", "閲嶅簡"}); + add(new String[]{"閲嶅簡涓婃捣涓績", "閲嶅簡"}); + add(new String[]{"閲嶅簡澶╁湴闆嶆睙缈犵挓", "閲嶅簡"}); + add(new String[]{"閲嶅簡澶╁湴闆嶆睙鎮﹀涵", "閲嶅簡"}); + add(new String[]{"閲嶅簡澶уA鍖烘澗鏋楁潙", "閲嶅簡"}); + add(new String[]{"閲嶅簡妗冩簮灞呭浗闄呰姳鍥竴鍖�", "閲嶅簡"}); + add(new String[]{"閲嶅簡涓栫晫涔嬬獥", "閲嶅簡"}); + add(new String[]{"閲嶅簡鍏", "閲嶅簡"}); + add(new String[]{"閲嶅簡鍏瘬", "涓婃捣"}); + add(new String[]{"閲嶅簡澶фゼ", "涓婃捣"}); + add(new String[]{"閲嶅簡鍥介檯瀹剁汉鍩庣唬鑹�", "閲嶅簡"}); + add(new String[]{"閲嶅簡涓囪豹鍥介檯閲戣瀺涓績", "閲嶅簡"}); + add(new String[]{"閲嶅簡澶╁湴闆嶆睙寰″涵", "閲嶅簡"}); + add(new String[]{"閲嶅簡骞垮憡浜т笟鍥�", "閲嶅簡"}); + add(new String[]{"閲嶅簡鎬婚儴鍩�", "閲嶅簡"}); + add(new String[]{"閲嶅簡妫曟娉夊浗闄呰姳鍥�", "閲嶅簡"}); + }}); + city_DistrictNames.put("娌冲寳", new ArrayList(){{ + add(new String[]{"娌冲寳绋庡姟瀛︽牎鐢熸椿鍖�", "鐭冲搴�"}); + add(new String[]{"娌冲寳缁忔祹鏃ユ姤绀惧鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳缇庢湳鍑虹増绀惧鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳鐗╄祫瀹胯垗", "鐭冲搴�"}); + add(new String[]{"娌冲寳鍖栧伐鍖昏嵂鑱屼笟鎶�鏈闄㈠鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳鐢垫満瀹胯垗", "鐭冲搴�"}); + add(new String[]{"娌冲寳鏃ユ姤绀惧鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳宸ョ▼閫犱环绠$悊鎬荤珯瀹胯垗", "鐭冲搴�"}); + add(new String[]{"娌冲寳搴峰煄", "娼嶅潑"}); + add(new String[]{"娌冲寳绀惧尯", "娌堥槼"}); + add(new String[]{"娌冲寳鍖荤澶у瀹胯垗", "鐭冲搴�"}); + add(new String[]{"娌冲寳鐪佷汉澶у鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳鏂颁汉瀹�", "鍞愬北"}); + add(new String[]{"娌冲寳涓�鍙�", "鍞愬北"}); + add(new String[]{"娌冲寳鏈鸿灞�瀹胯垗", "鐭冲搴�"}); + add(new String[]{"娌冲寳骞挎挱鐢佃鎶ュ鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳鍟嗗煄", "闈掑矝"}); + add(new String[]{"娌冲寳闀垮煄楗簵", "鐭冲搴�"}); + add(new String[]{"娌冲寳鏉戝皬鍖�", "鍖椾含"}); + add(new String[]{"娌冲寳妗冩睙閲�", "澶╂触"}); + add(new String[]{"娌冲寳甯堝ぇ闈掑勾鍏瘬妤�", "鐭冲搴�"}); + add(new String[]{"娌冲寳缁�", "鏃犻敗"}); + add(new String[]{"娌冲寳绀惧尯", "鏈邯"}); + add(new String[]{"娌冲寳妤�", "鍞愬北"}); + }}); + city_DistrictNames.put("鍞愬北", new ArrayList(){{ + add(new String[]{"鍞愬北绗笁绌洪棿缁煎悎浣�", "鍞愬北"}); + add(new String[]{"鍞愬北涓囪揪骞垮満", "鍞愬北"}); + add(new String[]{"鍞愬北閲�", "澶╂触"}); + add(new String[]{"鍞愬北甯備緵鐢靛叕鍙稿彜鍐跺垎鍏徃浣忓畢妤�11鍙锋ゼ12鍙锋ゼ", "鍞愬北"}); + add(new String[]{"鍞愬北鍥介檯浜旈噾鍟嗗煄", "鍞愬北"}); + add(new String[]{"鍞愬北鏂拌嫅", "涓婃捣"}); + add(new String[]{"鍞愬北涔変箤灏忓晢鍝佸煄", "鍞愬北"}); + }}); + city_DistrictNames.put("婀栧崡", new ArrayList(){{ + add(new String[]{"婀栧崡澶у帵", "娴峰彛"}); + add(new String[]{"婀栧崡甯堝ぇ寮犲叕宀牎鍖哄鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佽繘鍑哄彛鍏徃瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡骞跨數瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡鏈哄簥鍘傚鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鍒惰嵂鍘傚鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡渚涢攢澶у帵", "闀挎矙"}); + add(new String[]{"婀栧崡鍖栧伐鍖昏嵂璁捐闄㈠鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡宸ュ晢閾惰瀹胯垗鏈哄叧澶ч櫌", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸浗闃茬鍏姙鏈哄叧闄㈠唴瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡鎶ヤ笟鏂囧寲鍩�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佷氦閫氳璁¢櫌", "闀挎矙"}); + add(new String[]{"婀栧崡鑱旈�氫綇瀹呭皬鍖�", "闀挎矙"}); + add(new String[]{"婀栧崡鐢佃鍙板崟浣嶅鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡寮�鍏冲巶瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡灏忓尯", "鍖椾含"}); + add(new String[]{"婀栧崡閭數鏂版潙灏忓尯", "闉嶅北"}); + add(new String[]{"婀栧崡鐪佺瀛︽妧鏈巺瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸浗瀹夊巺鍗曚綅鎴�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佹湪鍋跺墽鍥㈠鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佹皵璞″眬瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡濂冲瓙澶у鏁欏笀鍏瘬", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸啘涓氭満姊扮爺绌舵墍", "闀挎矙"}); + add(new String[]{"婀栧崡鏁欒偛瑁呭缁煎悎澶фゼ", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸姵鍔ㄥ崼鐢熸墍", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佽川閲忔妧鏈洃鐫e眬瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡鐪侀噾灞炲洖鏀跺叕鍙稿鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸鏂欑爺绌舵墍", "闀挎矙"}); + add(new String[]{"婀栧崡鐪侀珮绾т汉姘戞鏌ラ櫌鍗曚綅鎴�", "闀挎矙"}); + add(new String[]{"婀栧崡浜ら�氳亴闄㈠鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸喍閲戞潗鏂欑爺绌舵墍", "闀挎矙"}); + add(new String[]{"婀栧崡閲戣渹闊冲儚鍑虹増绀�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佺墿璧勫巺瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡瀹剁數鍟嗗煄", "闀挎矙"}); + add(new String[]{"婀栧崡鍥介檯鍟嗗姟涓績", "闀挎矙"}); + add(new String[]{"婀栧崡璐㈠瘜涓績", "闀挎矙"}); + add(new String[]{"婀栧崡鍥介檯姹借溅鍩�", "闀挎矙"}); + add(new String[]{"婀栧崡浜氬ぇ鏁扮爜娓�", "闀挎矙"}); + add(new String[]{"婀栧崡澶у帵", "鍗楀畞"}); + add(new String[]{"婀栧崡澶у帵", "涓婃捣"}); + add(new String[]{"婀栧崡鏄熸矙姹介厤鍩�", "闀挎矙"}); + add(new String[]{"婀栧崡鑹烘牎鍗曚綅鎴�", "闀挎矙"}); + add(new String[]{"婀栧崡璐笓鏁欒亴宸ュ鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佹満姊拌繘鍑哄彛鍏徃瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡鏃ユ姤鍗曚綅瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡宀稿悗鐣堝皬鍖�", "缁嶅叴"}); + }}); + city_DistrictNames.put("寮犲鐣�", new ArrayList(){{ + add(new String[]{"寮犲鐣屽ぉ闂ㄤ竴鍙�", "寮犲鐣�"}); + }}); + city_DistrictNames.put("鍐呰挋鍙�", new ArrayList(){{ + add(new String[]{"鍐呰挋鍙ょ數澶у皬鍖�", "鍛煎拰娴╃壒"}); + add(new String[]{"鍐呰挋鍙ゆ棩鎶ョぞ瀹夊叏鏂囨槑灏忓尯", "鍛煎拰娴╃壒"}); + add(new String[]{"鍐呰挋鍙ゆ斂搴滀綇瀹呭皬鍖�", "鍛煎拰娴╃壒"}); + add(new String[]{"鍐呰挋鍙よ嚜娌诲尯鍥界◣灞�浣忓畢鍖�", "鍛煎拰娴╃壒"}); + add(new String[]{"鍐呰挋鍙ゆ斂鍗忎綇瀹呭皬鍖�", "鍛煎拰娴╃壒"}); + add(new String[]{"鍐呰挋鍙ょ粡璐稿闄㈠灞為櫌", "鍛煎拰娴╃壒"}); + add(new String[]{"鍐呰挋鍙ゅ厷鏍″崡鑻戝皬鍖�", "鍛煎拰娴╃壒"}); + add(new String[]{"鍐呰挋鍙ゅ尰闄㈠灞炴ゼ", "鍛煎拰娴╃壒"}); + add(new String[]{"鍐呰挋鍙ゅ浗闄呭晢璐稿煄", "鍛煎拰娴╃壒"}); + }}); + city_DistrictNames.put("鍛煎拰娴╃壒", new ArrayList(){{ + }}); + city_DistrictNames.put("鐢樿們", new ArrayList(){{ + add(new String[]{"鐢樿們鑱斿悎澶у瀹跺睘闄�", "鍏板窞"}); + add(new String[]{"鐢樿們鐪侀潚灏戝勾绉戞妧娲诲姩涓績瀹跺睘闄�", "鍏板窞"}); + add(new String[]{"鐢樿們鐪佹柊闂诲嚭鐗堝眬瀹跺睘闄�", "鍏板窞"}); + add(new String[]{"鐢樿們鐪侀偖鐢靛缓璁惧叕鍙稿灞為櫌", "鍏板窞"}); + add(new String[]{"鐢樿們鐪佸璁″眬瀹跺睘闄�", "鍏板窞"}); + add(new String[]{"鐢樿們鐪佷綋鑲插眬瀹跺睘闄�", "鍏板窞"}); + add(new String[]{"鐢樿們鐪佺瀛愬叕鍙稿灞為櫌", "鍏板窞"}); + add(new String[]{"鐢樿們鍐滀笟鑱屼笟鎶�鏈闄㈠灞為櫌", "鍏板窞"}); + add(new String[]{"鐢樿們鐪佸箍鐢垫�诲眬瀹跺睘闄�", "鍏板窞"}); + add(new String[]{"鐢樿們涓尰闄�", "鍏板窞"}); + add(new String[]{"鐢樿們鐪佸缓绛戣璁$爺绌舵墍瀹跺睘闄�", "鍏板窞"}); + add(new String[]{"鐢樿們鐪佹斂搴滃灞為櫌锛堟棫澶ц矾锛�", "鍏板窞"}); + add(new String[]{"鐢樿們鐪佷緵閿�绀惧灞為櫌", "鍏板窞"}); + add(new String[]{"鐢樿們鐪佷汉浜嬪巺瀹跺睘闄�", "鍏板窞"}); + add(new String[]{"鐢樿們浼氬睍涓績寤虹瓚缇�", "鍏板窞"}); + add(new String[]{"鐢樿們绗竴寤鸿闆嗗洟鍏徃灏忓尯", "鍏板窞"}); + add(new String[]{"鐢樿們鐪佹梾娓稿眬瀹跺睘闄�", "鍏板窞"}); + add(new String[]{"鐢樿們鍖栧伐鏈烘鍘傚灞為櫌", "鍏板窞"}); + add(new String[]{"鐢樿們浜洪槻澶у帵", "鍏板窞"}); + add(new String[]{"鐢樿們鐪佸湴鐭垮眬楂樺眰浣忓畢", "鍏板窞"}); + add(new String[]{"鐢樿們鐢佃鍙板灞為櫌", "鍏板窞"}); + add(new String[]{"鐢樿們鐪佺柧鎺т腑蹇冨灞為櫌", "鍏板窞"}); + add(new String[]{"鐢樿們鑱屽伐澶у帵", "鍏板窞"}); + add(new String[]{"鐢樿們鐪佺數瀛愬叕鍙稿灞為櫌", "鍏板窞"}); + }}); + city_DistrictNames.put("鍏板窞", new ArrayList(){{ + add(new String[]{"鍏板窞涓�涓灞為櫌", "鍏板窞"}); + add(new String[]{"鍏板窞鍐涘尯棰滃娌熺墿涓氬皬鍖�", "鍏板窞"}); + add(new String[]{"鍏板窞甯傜伯椋熷眬瀹跺睘闄紙姘告槍璺級", "鍏板窞"}); + add(new String[]{"鍏板窞甯傛斂鍏徃瀹跺睘闄�", "鍏板窞"}); + add(new String[]{"鍏板窞鍐涘尯鍓鍝佸熀鍦�", "鍏板窞"}); + add(new String[]{"鍏板窞鍑忛�熸満鍘傚灞為櫌", "鍏板窞"}); + add(new String[]{"鍏板窞鍐涘尯瀹跺睘闄�", "鍏板窞"}); + add(new String[]{"鍏板窞鍏氦涓囦紬浣忓畢灏忓尯", "鍏板窞"}); + add(new String[]{"鍏板窞閽㈠巶瀹跺睘闄�", "鍏板窞"}); + add(new String[]{"鍏板窞甯傚コ瀛愯亴涓氭妧鏈鏍″灞炴ゼ", "鍏板窞"}); + add(new String[]{"鍏板窞甯傚嵃鍒峰巶瀹跺睘闄�", "鍏板窞"}); + add(new String[]{"鍏板窞鏅熶匠鍏徃瀹跺睘闄㈠崡涓�闂�", "鍏板窞"}); + add(new String[]{"鍏板窞寤虹瓚娈靛灞為櫌", "鍏板窞"}); + add(new String[]{"鍏板窞鐐兼补鎬诲巶瀹跺睘闄�", "鍏板窞"}); + add(new String[]{"鍏板窞鍥借祫鐗╀笟绗簩瀹跺洯", "鍏板窞"}); + add(new String[]{"鍏板窞闆佹哗甯傚叕瀹夊眬瀹跺睘闄�", "鍏板窞"}); + add(new String[]{"鍏板窞楂樻柊寮�鍙戝尯澶у绉戞妧鍥�", "鍏板窞"}); + add(new String[]{"鍏板窞閾惰绉戞妧鏀瀹跺睘闄�", "鍏板窞"}); + add(new String[]{"鍏板窞甯傚煄绠″尯浣曞搴勮储鏀垮灞為櫌", "鍏板窞"}); + add(new String[]{"鍏板窞甯備竷閲屾渤鍖烘灄瀹跺簞閾佽矾灏忓尯", "鍏板窞"}); + add(new String[]{"鍏板窞甯傜伀杞︾珯涔樿澶ч槦瀹跺睘闄�", "鍏板窞"}); + add(new String[]{"鍏板窞鏂版潙", "涓婃捣"}); + add(new String[]{"鍏板窞甯傚浗绋庡眬瀹跺睘闄�", "鍏板窞"}); + add(new String[]{"鍏板窞鍓ч櫌瀹跺睘闄�", "鍏板窞"}); + add(new String[]{"鍏板窞鐢靛瓙宸ヤ笟瀛︽牎瀹跺睘闄�", "鍏板窞"}); + add(new String[]{"鍏板窞甯備汉澶у灞為櫌", "鍏板窞"}); + add(new String[]{"鍏板窞鍐涘尯鍓鍝佸熀鍦板灞為櫌", "鍏板窞"}); + add(new String[]{"鍏板窞甯傛暀鑲插眬瀹跺睘闄�", "鍏板窞"}); + }}); + city_DistrictNames.put("灞变笢", new ArrayList(){{ + add(new String[]{"灞变笢閲�", "绉︾殗宀�"}); + add(new String[]{"灞变笢缁忔祹瀛﹂櫌瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢鐪佸崼鐢熷巺瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢鐪佹皯鏀垮巺瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢鐪佸晢涓氶泦鍥㈡�诲叕鍙稿鑸�", "娴庡崡"}); + add(new String[]{"灞变笢鍖荤澶у鏁欏笀瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢澶栬锤澶у帵", "闈掑矝"}); + add(new String[]{"灞变笢澶у帵", "娣卞湷"}); + add(new String[]{"灞变笢鍫$ぞ鍖�", "娌堥槼"}); + add(new String[]{"灞变笢鑹烘湳瀛﹂櫌瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢榛勯噾宕簯婀栭珮灏斿か鍒", "娴庡崡"}); + add(new String[]{"灞变笢鍙告硶璀﹀畼瀛﹂櫌瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢鐪佺瀛﹂櫌楂樻柊鎶�鏈爺绌跺垎闄�", "闈掑矝"}); + add(new String[]{"灞变笢寤哄伐瀛﹂櫌瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢搴欏皬鍖�", "娌堥槼"}); + add(new String[]{"灞变笢涔冲北閾舵哗娴锋櫙鎴�", "濞佹捣"}); + add(new String[]{"灞变笢澶存潙", "闈掑矝"}); + add(new String[]{"灞变笢鐪佺暅鐗у眬瀹胯垗", "娴庡崡"}); + }}); + city_DistrictNames.put("闈掑矝", new ArrayList(){{ + add(new String[]{"闈掑矝鍢夊洯", "鍖椾含"}); + add(new String[]{"闈掑矝澶╁北鍗庡涵", "闈掑矝"}); + add(new String[]{"闈掑矝澶钩娲嬩腑蹇�", "闈掑矝"}); + add(new String[]{"闈掑矝瑁曢緳澶у帵", "闈掑矝"}); + add(new String[]{"闈掑矝閫氫俊鑺卞洯", "闈掑矝"}); + add(new String[]{"闈掑矝缁村鍒╀簹骞垮満", "闈掑矝"}); + add(new String[]{"闈掑矝灞辫姳鍥�", "闈掑矝"}); + add(new String[]{"闈掑矝鍚槼鍥介檯", "闈掑矝"}); + add(new String[]{"闈掑矝涓栫晫璐告槗涓績", "闈掑矝"}); + add(new String[]{"闈掑矝姝e晢绾㈡渤璋�", "闈掑矝"}); + add(new String[]{"闈掑矝鑺卞洯浜屾湡 (椤哄畨棣ㄥ煄)", "杩炰簯娓�"}); + add(new String[]{"闈掑矝瀹跺洯A鍖�", "涔岄瞾鏈ㄩ綈"}); + add(new String[]{"闈掑矝鑺辫嫅", "涔岄瞾鏈ㄩ綈"}); + add(new String[]{"闈掑矝瀹跺洯B鍖�", "涔岄瞾鏈ㄩ綈"}); + add(new String[]{"闈掑矝鑺卞洯涓�鏈�", "杩炰簯娓�"}); + add(new String[]{"闈掑矝闃冲厜鍢夊洯", "闈掑矝"}); + add(new String[]{"闈掑矝寰℃櫙宄�", "闈掑矝"}); + add(new String[]{"闈掑矝涓滄柟缇庢櫙", "闈掑矝"}); + add(new String[]{"闈掑矝闃冲厜棣ㄨ嫅", "闈掑矝"}); + add(new String[]{"闈掑矝鍏", "闈掑矝"}); + add(new String[]{"闈掑矝鍏瘬", "娲涢槼"}); + add(new String[]{"闈掑矝鐩愪笟灏忓尯", "闈掑矝"}); + add(new String[]{"闈掑矝灞卞叕瀵�", "闈掑矝"}); + add(new String[]{"闈掑矝鏅嫅", "娼嶅潑"}); + add(new String[]{"闈掑矝鍙版咕鍒涙柊宸ヤ笟鍥�", "闈掑矝"}); + add(new String[]{"闈掑矝鍗拌薄灞�", "闈掑矝"}); + add(new String[]{"闈掑矝瀹濋棬鍏瘬", "闈掑矝"}); + add(new String[]{"闈掑矝鏁扮爜绉戞妧涓績", "闈掑矝"}); + add(new String[]{"闈掑矝榫欐箹鍘熷北", "闈掑矝"}); + add(new String[]{"闈掑矝鍗拌薄閲戞矙婊�", "闈掑矝"}); + add(new String[]{"闈掑矝涓囧痉涓拌鏅嫅", "闈掑矝"}); + add(new String[]{"闈掑矝椴佷腑瀹跺眳鍩�", "闈掑矝"}); + add(new String[]{"闈掑矝绾㈡爲鏋楀害鍋囦笘鐣�", "闈掑矝"}); + add(new String[]{"闈掑矝鍑ゅ嚢鍩�", "闈掑矝"}); + add(new String[]{"闈掑矝娴蜂笂鍢夊勾鍗�", "闈掑矝"}); + add(new String[]{"闈掑矝寮�鍙戝尯鍥介檯璐告槗涓績", "闈掑矝"}); + add(new String[]{"闈掑矝鐝犲北澶╅箙婀栫敓鎬佹梾娓稿害鍋囧尯", "闈掑矝"}); + }}); + city_DistrictNames.put("姹熻タ", new ArrayList(){{ + add(new String[]{"姹熻タ鐪佸缓宸ラ泦鍥�", "鍗楁槍"}); + add(new String[]{"姹熻タ璐㈢粡澶у閭斂瀹胯垗", "鍗楁槍"}); + add(new String[]{"姹熻タ鐪佸浘涔﹂瀹胯垗", "鍗楁槍"}); + add(new String[]{"姹熻タ瀹鹃鏃佽竟", "鍗楁槍"}); + add(new String[]{"姹熻タ琛屾斂瀛﹂櫌瀹胯垗", "鍗楁槍"}); + add(new String[]{"姹熻タ璐㈢粡澶у瀹胯垗", "鍗楁槍"}); + add(new String[]{"姹熻タ绉戞妧甯堣寖瀛﹂櫌瀹胯垗", "鍗楁槍"}); + add(new String[]{"姹熻タ鐪佸箍鎾數鍙板鑸�", "鍗楁槍"}); + add(new String[]{"姹熻タ涓滃崕璁¢噺鐮旂┒鎵�瀹胯垗", "鍗楁槍"}); + add(new String[]{"姹熻タ瀹㈣溅鍘傚鑸�", "鍗楁槍"}); + add(new String[]{"姹熻タ浠櫒鍘傚鑸�", "鍗楁槍"}); + add(new String[]{"姹熻タ鏄屼笢姹借溅浜ゆ槗骞垮満", "鍗楁槍"}); + add(new String[]{"姹熻タ鏃ц揣澶т笘鐣�", "鍗楁槍"}); + add(new String[]{"姹熻タ鏃ユ姤瀹胯垗", "鍗楁槍"}); + }}); + city_DistrictNames.put("鍗楁槍", new ArrayList(){{ + add(new String[]{"鍗楁槍澶фˉ绠$悊澶勫鑸�", "鍗楁槍"}); + add(new String[]{"鍗楁槍鍏氦鎬诲叕鍙稿鑸�", "鍗楁槍"}); + add(new String[]{"鍗楁槍甯傜粡娴庡ぇ妤�", "鍗楁槍"}); + add(new String[]{"鍗楁槍灞呬綇涓婚鍏洯鍒", "鍗楁槍"}); + add(new String[]{"鍗楁槍甯傚鍏氭牎瀹胯垗", "鍗楁槍"}); + add(new String[]{"鍗楁槍甯傚缓璁捐矾", "鍗楁槍"}); + add(new String[]{"鍗楁槍鍘垮叕瀹夊眬瀹胯垗", "鍗楁槍"}); + add(new String[]{"鍗楁槍涓夊崄涓鑸�", "鍗楁槍"}); + add(new String[]{"鍗楁槍鍗氭嘲鐢熸�佸晢鍔″洯", "鍗楁槍"}); + add(new String[]{"鍗楁槍琛℃満鍘傚鑸�", "鍗楁槍"}); + add(new String[]{"鍗楁槍灞呬綇涓婚鍏洯", "鍗楁槍"}); + add(new String[]{"鍗楁槍鑺辫嫅", "涓婃捣"}); + add(new String[]{"鍗楁槍涓ぎ棣欐Ν", "鍗楁槍"}); + }}); + city_DistrictNames.put("姹熻嫃", new ArrayList(){{ + add(new String[]{"姹熻嫃鐪佸啘绉戦櫌", "鍗椾含"}); + add(new String[]{"姹熻嫃娌圭敯鐭虫补灞卞簞", "鎵窞"}); + add(new String[]{"姹熻嫃璀﹀畼瀛﹂櫌", "鍗椾含"}); + add(new String[]{"姹熻嫃鐪侀珮绾т笓瀹跺洯", "鍗椾含"}); + add(new String[]{"姹熻嫃娌圭敯鐭虫补灞卞簞", "鎵窞"}); + add(new String[]{"姹熻嫃璁簨鍥�", "鍗椾含"}); + add(new String[]{"姹熻嫃鍥介檯濉戝寲鍩�", "甯稿窞"}); + add(new String[]{"姹熻嫃涓囧拰鍥介檯鍟嗚锤鍩�", "甯稿窞"}); + }}); + city_DistrictNames.put("杩炰簯娓�", new ArrayList(){{ + add(new String[]{"杩炰簯娓厜浼�", "杩炰簯娓�"}); + }}); + city_DistrictNames.put("灞变笢", new ArrayList(){{ + add(new String[]{"灞变笢閲�", "绉︾殗宀�"}); + add(new String[]{"灞变笢缁忔祹瀛﹂櫌瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢鐪佸崼鐢熷巺瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢鐪佹皯鏀垮巺瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢鐪佸晢涓氶泦鍥㈡�诲叕鍙稿鑸�", "娴庡崡"}); + add(new String[]{"灞变笢鍖荤澶у鏁欏笀瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢澶栬锤澶у帵", "闈掑矝"}); + add(new String[]{"灞变笢澶у帵", "娣卞湷"}); + add(new String[]{"灞变笢鍫$ぞ鍖�", "娌堥槼"}); + add(new String[]{"灞变笢鑹烘湳瀛﹂櫌瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢榛勯噾宕簯婀栭珮灏斿か鍒", "娴庡崡"}); + add(new String[]{"灞变笢鍙告硶璀﹀畼瀛﹂櫌瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢鐪佺瀛﹂櫌楂樻柊鎶�鏈爺绌跺垎闄�", "闈掑矝"}); + add(new String[]{"灞变笢寤哄伐瀛﹂櫌瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢搴欏皬鍖�", "娌堥槼"}); + add(new String[]{"灞变笢涔冲北閾舵哗娴锋櫙鎴�", "濞佹捣"}); + add(new String[]{"灞变笢澶存潙", "闈掑矝"}); + add(new String[]{"灞变笢鐪佺暅鐗у眬瀹胯垗", "娴庡崡"}); + }}); + city_DistrictNames.put("娣勫崥", new ArrayList(){{ + add(new String[]{"娣勫崥濂ユ灄鍖瑰厠鑺卞洯", "娣勫崥"}); + }}); + city_DistrictNames.put("骞夸笢", new ArrayList(){{ + add(new String[]{"骞夸笢澶栬锤骞垮満", "骞垮窞"}); + add(new String[]{"骞夸笢澶栬鑹烘湳瀛﹂櫌鏁欏笀瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢寤虹闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢鍙告硶璀﹀畼鑱屼笟瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐜繚澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍟嗕笟澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍖诲闄㈡暀甯堝鑸嶆ゼ", "涓滆帪"}); + add(new String[]{"骞夸笢鍥介檯澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佹妧鏈洃鐫e眬瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢宸ヤ笟澶у瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鏁欒偛瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪侀摱琛屽ぇ鍘�", "娣卞湷"}); + add(new String[]{"骞夸笢澶у帵", "澶╂触"}); + add(new String[]{"骞夸笢灞卞簞", "闀囨睙"}); + add(new String[]{"骞夸笢绾㈢浘澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鑽闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢闈掑勾骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鍩虹妤�", "娣卞湷"}); + add(new String[]{"骞夸笢鐪佺鎶�骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佸啘涓氱鐞嗗共閮ㄥ闄㈢ぞ鍖�", "骞垮窞"}); + add(new String[]{"骞夸笢鑺暰闆烽�告櫙", "浣涘北"}); + }}); + city_DistrictNames.put("鑲囧簡", new ArrayList(){{ + add(new String[]{"鑲囧簡纰ф鍥�", "鑲囧簡"}); + add(new String[]{"鑲囧簡钃濋鍏瘬", "鑲囧簡"}); + add(new String[]{"鑲囧簡路鏅痉灏氶兘", "鑲囧簡"}); + add(new String[]{"鑲囧簡纰ф鍥峰北婀栧煄", "鑲囧簡"}); + }}); + city_DistrictNames.put("姹熻嫃", new ArrayList(){{ + add(new String[]{"姹熻嫃鐪佸啘绉戦櫌", "鍗椾含"}); + add(new String[]{"姹熻嫃娌圭敯鐭虫补灞卞簞", "鎵窞"}); + add(new String[]{"姹熻嫃璀﹀畼瀛﹂櫌", "鍗椾含"}); + add(new String[]{"姹熻嫃鐪侀珮绾т笓瀹跺洯", "鍗椾含"}); + add(new String[]{"姹熻嫃娌圭敯鐭虫补灞卞簞", "鎵窞"}); + add(new String[]{"姹熻嫃璁簨鍥�", "鍗椾含"}); + add(new String[]{"姹熻嫃鍥介檯濉戝寲鍩�", "甯稿窞"}); + add(new String[]{"姹熻嫃涓囧拰鍥介檯鍟嗚锤鍩�", "甯稿窞"}); + }}); + city_DistrictNames.put("寰愬窞", new ArrayList(){{ + add(new String[]{"寰愬窞浜哄", "寰愬窞"}); + add(new String[]{"寰愬窞閲戣揪灏忓尯", "寰愬窞"}); + add(new String[]{"寰愬窞绀煎搧鍩�", "寰愬窞"}); + add(new String[]{"寰愬窞閲�", "澶╂触"}); + }}); + city_DistrictNames.put("鏂扮枂缁村惥灏�", new ArrayList(){{ + add(new String[]{"鏂扮枂缁村惥灏斿尰闄㈠灞為櫌", "涔岄瞾鏈ㄩ綈"}); + }}); + city_DistrictNames.put("涔岄瞾鏈ㄩ綈", new ArrayList(){{ + add(new String[]{"涔岄瞾鏈ㄩ綈鍗敓闃茬柅绔欏灞為櫌", "涔岄瞾鏈ㄩ綈"}); + add(new String[]{"涔岄瞾鏈ㄩ綈浠撴埧娌熷啘宸ュ晢璐稿叕鍙�", "涔岄瞾鏈ㄩ綈"}); + add(new String[]{"涔岄瞾鏈ㄩ綈鎺掓按绠$悊澶勪綇瀹�", "涔岄瞾鏈ㄩ綈"}); + add(new String[]{"涔岄瞾鏈ㄩ綈甯傜涓�浜烘皯鍖婚櫌瀹跺睘闄�", "涔岄瞾鏈ㄩ綈"}); + add(new String[]{"涔岄瞾鏈ㄩ綈鎴愪汉鏁欒偛瀹跺睘闄�", "涔岄瞾鏈ㄩ綈"}); + add(new String[]{"涔岄瞾鏈ㄩ綈鍗敓灞�瀹跺睘闄�", "涔岄瞾鏈ㄩ綈"}); + add(new String[]{"涔岄瞾鏈ㄩ綈甯傛枃鐗╁眬瀹跺睘闄�", "涔岄瞾鏈ㄩ綈"}); + add(new String[]{"涔岄瞾鏈ㄩ綈绗竴骞蹭紤鎵�", "涔岄瞾鏈ㄩ綈"}); + }}); + city_DistrictNames.put("婀栧崡", new ArrayList(){{ + add(new String[]{"婀栧崡澶у帵", "娴峰彛"}); + add(new String[]{"婀栧崡甯堝ぇ寮犲叕宀牎鍖哄鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佽繘鍑哄彛鍏徃瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡骞跨數瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡鏈哄簥鍘傚鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鍒惰嵂鍘傚鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡渚涢攢澶у帵", "闀挎矙"}); + add(new String[]{"婀栧崡鍖栧伐鍖昏嵂璁捐闄㈠鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡宸ュ晢閾惰瀹胯垗鏈哄叧澶ч櫌", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸浗闃茬鍏姙鏈哄叧闄㈠唴瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡鎶ヤ笟鏂囧寲鍩�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佷氦閫氳璁¢櫌", "闀挎矙"}); + add(new String[]{"婀栧崡鑱旈�氫綇瀹呭皬鍖�", "闀挎矙"}); + add(new String[]{"婀栧崡鐢佃鍙板崟浣嶅鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡寮�鍏冲巶瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡灏忓尯", "鍖椾含"}); + add(new String[]{"婀栧崡閭數鏂版潙灏忓尯", "闉嶅北"}); + add(new String[]{"婀栧崡鐪佺瀛︽妧鏈巺瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸浗瀹夊巺鍗曚綅鎴�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佹湪鍋跺墽鍥㈠鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佹皵璞″眬瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡濂冲瓙澶у鏁欏笀鍏瘬", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸啘涓氭満姊扮爺绌舵墍", "闀挎矙"}); + add(new String[]{"婀栧崡鏁欒偛瑁呭缁煎悎澶фゼ", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸姵鍔ㄥ崼鐢熸墍", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佽川閲忔妧鏈洃鐫e眬瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡鐪侀噾灞炲洖鏀跺叕鍙稿鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸鏂欑爺绌舵墍", "闀挎矙"}); + add(new String[]{"婀栧崡鐪侀珮绾т汉姘戞鏌ラ櫌鍗曚綅鎴�", "闀挎矙"}); + add(new String[]{"婀栧崡浜ら�氳亴闄㈠鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸喍閲戞潗鏂欑爺绌舵墍", "闀挎矙"}); + add(new String[]{"婀栧崡閲戣渹闊冲儚鍑虹増绀�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佺墿璧勫巺瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡瀹剁數鍟嗗煄", "闀挎矙"}); + add(new String[]{"婀栧崡鍥介檯鍟嗗姟涓績", "闀挎矙"}); + add(new String[]{"婀栧崡璐㈠瘜涓績", "闀挎矙"}); + add(new String[]{"婀栧崡鍥介檯姹借溅鍩�", "闀挎矙"}); + add(new String[]{"婀栧崡浜氬ぇ鏁扮爜娓�", "闀挎矙"}); + add(new String[]{"婀栧崡澶у帵", "鍗楀畞"}); + add(new String[]{"婀栧崡澶у帵", "涓婃捣"}); + add(new String[]{"婀栧崡鏄熸矙姹介厤鍩�", "闀挎矙"}); + add(new String[]{"婀栧崡鑹烘牎鍗曚綅鎴�", "闀挎矙"}); + add(new String[]{"婀栧崡璐笓鏁欒亴宸ュ鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佹満姊拌繘鍑哄彛鍏徃瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡鏃ユ姤鍗曚綅瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡宀稿悗鐣堝皬鍖�", "缁嶅叴"}); + }}); + city_DistrictNames.put("鏍床", new ArrayList(){{ + }}); + city_DistrictNames.put("姹熻嫃", new ArrayList(){{ + add(new String[]{"姹熻嫃鐪佸啘绉戦櫌", "鍗椾含"}); + add(new String[]{"姹熻嫃娌圭敯鐭虫补灞卞簞", "鎵窞"}); + add(new String[]{"姹熻嫃璀﹀畼瀛﹂櫌", "鍗椾含"}); + add(new String[]{"姹熻嫃鐪侀珮绾т笓瀹跺洯", "鍗椾含"}); + add(new String[]{"姹熻嫃娌圭敯鐭虫补灞卞簞", "鎵窞"}); + add(new String[]{"姹熻嫃璁簨鍥�", "鍗椾含"}); + add(new String[]{"姹熻嫃鍥介檯濉戝寲鍩�", "甯稿窞"}); + add(new String[]{"姹熻嫃涓囧拰鍥介檯鍟嗚锤鍩�", "甯稿窞"}); + }}); + city_DistrictNames.put("鎵窞", new ArrayList(){{ + add(new String[]{"鎵窞姘翠埂", "鍖椾含"}); + add(new String[]{"鎵窞鑺卞洯", "娉板窞"}); + add(new String[]{"鎵窞蹇甸鑻�", "鎵窞"}); + add(new String[]{"鎵窞澶╀笅鍒", "鎵窞"}); + add(new String[]{"鎵窞蹇甸鑻�", "鎵窞"}); + add(new String[]{"鎵窞甯傛暀宸ュ鑸�", "鎵窞"}); + add(new String[]{"鎵窞甯堣寖瀛﹂櫌瀹胯垗", "鎵窞"}); + add(new String[]{"鎵窞浜墽鍥㈠鑸�", "鎵窞"}); + add(new String[]{"鎵窞澶т笘鐣屽浗闄呭箍鍦�", "鎵窞"}); + add(new String[]{"鎵窞鍗拌薄鑺卞洯", "鎵窞"}); + add(new String[]{"鎵窞閲�", "澶╂触"}); + add(new String[]{"鎵窞鑺卞洯", "娉板窞"}); + add(new String[]{"鎵窞鍗拌薄鑺卞洯", "鎵窞"}); + add(new String[]{"鎵窞鐢昏埆", "鎵窞"}); + add(new String[]{"鎵窞宸ュ闄㈠鑸�", "鎵窞"}); + add(new String[]{"鎵窞澶╀笅鑺卞洯", "鎵窞"}); + add(new String[]{"鎵窞澶╀笅鍒", "鎵窞"}); + add(new String[]{"鎵窞姘翠埂鍒", "鍖椾含"}); + add(new String[]{"鎵窞澶╀笅鑺卞洯", "鎵窞"}); + add(new String[]{"鎵窞鍩�", "涓逛笢"}); + add(new String[]{"鎵窞楂樺姏姹借溅姹介厤鍩�", "鎵窞"}); + add(new String[]{"鎵窞浜哄", "鎵窞"}); + add(new String[]{"鎵窞甯傚弻瀛愭槦鍥介檯骞垮満", "鎵窞"}); + }}); + city_DistrictNames.put("骞胯タ澹棌", new ArrayList(){{ + add(new String[]{"骞胯タ澹棌鑷不鍖哄徃娉曞巺瀹胯垗", "鍗楀畞"}); + add(new String[]{"骞胯タ澹棌鑷不鍖哄啘涓氬巺瀹胯垗", "鍗楀畞"}); + }}); + city_DistrictNames.put("鏌冲窞", new ArrayList(){{ + add(new String[]{"鏌冲窞路娓╁窞鍟嗚锤鍩�", "鏌冲窞"}); + }}); + city_DistrictNames.put("瀹佸鍥炴棌", new ArrayList(){{ + }}); + city_DistrictNames.put("閾跺窛", new ArrayList(){{ + add(new String[]{"閾跺窛缇庡眳", "闈掑矝"}); + add(new String[]{"閾跺窛鍥介檯璐告槗涓績", "閾跺窛"}); + add(new String[]{"閾跺窛灞辫嫅", "闈掑矝"}); + add(new String[]{"閾跺窛灏忓尯", "娌堥槼"}); + }}); + city_DistrictNames.put("娴欐睙", new ArrayList(){{ + add(new String[]{"娴欐睙宸ヤ笟澶у鏁欏笀瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙澶у帵", "澶師"}); + add(new String[]{"娴欐睙鍔炰簨澶勫鑸�", "澶師"}); + add(new String[]{"娴欐睙浠佸拰灞呰�佸勾鍏荤敓鍏瘬", "婀栧窞"}); + add(new String[]{"娴欐睙浜よ繍澶у帵", "鏉窞"}); + add(new String[]{"娴欐睙宸ュ晢澶у瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙鍟嗚锤鍩�", "鍚堣偉"}); + add(new String[]{"娴欐睙宸ヤ笟澶у涔嬫睙瀛﹂櫌", "鏉窞"}); + }}); + city_DistrictNames.put("娓╁窞", new ArrayList(){{ + add(new String[]{"娓╁窞澶у帵", "娴峰彛"}); + add(new String[]{"娓╁窞鍩�", "璐甸槼"}); + add(new String[]{"娓╁窞鍏瘬", "璐甸槼"}); + add(new String[]{"娓╁窞鍟嗗煄", "婀栧窞"}); + add(new String[]{"娓╁窞鍟嗗煄", "鍞愬北"}); + add(new String[]{"娓╁窞涓栬锤涓績澶у帵", "娓╁窞"}); + add(new String[]{"娓╁窞涓栬锤涓績骞垮満", "娓╁窞"}); + add(new String[]{"娓╁窞浜烘墠澶у帵", "娓╁窞"}); + add(new String[]{"娓╁窞榫欐咕涓囪揪骞垮満", "娓╁窞"}); + add(new String[]{"娓╁窞鍩幝烽兘涔愭眹", "娌堥槼"}); + add(new String[]{"娓╁窞鍟嗗煄", "閲戝崕"}); + }}); + city_DistrictNames.put("杈藉畞", new ArrayList(){{ + add(new String[]{"杈藉畞涓尰瀹跺睘妤�", "娌堥槼"}); + add(new String[]{"杈藉畞閲�", "澶╂触"}); + }}); + city_DistrictNames.put("澶ц繛", new ArrayList(){{ + add(new String[]{"澶ц繛涓囩澶╅簱", "澶ц繛"}); + add(new String[]{"澶ц繛闂ㄥ皬鍖�", "澶ц繛"}); + add(new String[]{"澶ц繛闂ㄥ箍鍦�", "澶ц繛"}); + add(new String[]{"澶ц繛鏄庣彔", "澶ц繛"}); + add(new String[]{"澶ц繛涓績瑁曟櫙", "澶ц繛"}); + add(new String[]{"澶ц繛鏂版潙", "涓婃捣"}); + add(new String[]{"澶ц繛灏忓尯", "涓婃捣"}); + add(new String[]{"澶ц繛澶╁湴鎮︾繝鍙�", "澶ц繛"}); + add(new String[]{"澶ц繛瀹夋尝鍥介檯娓╂硥鏂板煄", "澶ц繛"}); + add(new String[]{"澶ц繛閲戝窞鍖虹浣虫柊澶╁湴", "涓逛笢"}); + }}); + city_DistrictNames.put("娴欐睙", new ArrayList(){{ + add(new String[]{"娴欐睙宸ヤ笟澶у鏁欏笀瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙澶у帵", "澶師"}); + add(new String[]{"娴欐睙鍔炰簨澶勫鑸�", "澶師"}); + add(new String[]{"娴欐睙浠佸拰灞呰�佸勾鍏荤敓鍏瘬", "婀栧窞"}); + add(new String[]{"娴欐睙浜よ繍澶у帵", "鏉窞"}); + add(new String[]{"娴欐睙宸ュ晢澶у瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙鍟嗚锤鍩�", "鍚堣偉"}); + add(new String[]{"娴欐睙宸ヤ笟澶у涔嬫睙瀛﹂櫌", "鏉窞"}); + }}); + city_DistrictNames.put("瀹佹尝", new ArrayList(){{ + add(new String[]{"瀹佹尝閲�", "澶╂触"}); + add(new String[]{"瀹佹尝閲�", "姝︽眽"}); + add(new String[]{"瀹佹尝鍟嗕細澶у帵", "瀹佹尝"}); + add(new String[]{"瀹佹尝澶栦唬澶у帵", "瀹佹尝"}); + add(new String[]{"瀹佹尝灏忓尯", "涓婃捣"}); + }}); + city_DistrictNames.put("杈藉畞", new ArrayList(){{ + add(new String[]{"杈藉畞涓尰瀹跺睘妤�", "娌堥槼"}); + add(new String[]{"杈藉畞閲�", "澶╂触"}); + }}); + city_DistrictNames.put("鏈邯", new ArrayList(){{ + add(new String[]{"鏈邯妤�", "澶╂触"}); + add(new String[]{"鏈邯鑺卞洯", "澶╂触"}); + add(new String[]{"鏈邯瑗胯姮鍩庡缓", "鏈邯"}); + }}); + city_DistrictNames.put("骞夸笢", new ArrayList(){{ + add(new String[]{"骞夸笢澶栬锤骞垮満", "骞垮窞"}); + add(new String[]{"骞夸笢澶栬鑹烘湳瀛﹂櫌鏁欏笀瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢寤虹闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢鍙告硶璀﹀畼鑱屼笟瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐜繚澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍟嗕笟澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍖诲闄㈡暀甯堝鑸嶆ゼ", "涓滆帪"}); + add(new String[]{"骞夸笢鍥介檯澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佹妧鏈洃鐫e眬瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢宸ヤ笟澶у瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鏁欒偛瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪侀摱琛屽ぇ鍘�", "娣卞湷"}); + add(new String[]{"骞夸笢澶у帵", "澶╂触"}); + add(new String[]{"骞夸笢灞卞簞", "闀囨睙"}); + add(new String[]{"骞夸笢绾㈢浘澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鑽闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢闈掑勾骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鍩虹妤�", "娣卞湷"}); + add(new String[]{"骞夸笢鐪佺鎶�骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佸啘涓氱鐞嗗共閮ㄥ闄㈢ぞ鍖�", "骞垮窞"}); + add(new String[]{"骞夸笢鑺暰闆烽�告櫙", "浣涘北"}); + }}); + city_DistrictNames.put("鑼傚悕", new ArrayList(){{ + add(new String[]{"鑼傚悕澶у帵", "骞垮窞"}); + add(new String[]{"鑼傚悕澶фゼ", "涓婃捣"}); + add(new String[]{"鑼傚悕澶у帵", "涓婃捣"}); + add(new String[]{"鑼傚悕鍧�", "涓婃捣"}); + add(new String[]{"鑼傚悕鍏瘬", "涓婃捣"}); + add(new String[]{"鑼傚悕浜垮煄鍚嶈嫅", "鑼傚悕"}); + add(new String[]{"鑼傚悕纰ф鍥�", "鑼傚悕"}); + add(new String[]{"鑼傚悕鐭虫补鍖栧伐瀛﹂櫌", "鑼傚悕"}); + }}); + city_DistrictNames.put("娴欐睙", new ArrayList(){{ + add(new String[]{"娴欐睙宸ヤ笟澶у鏁欏笀瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙澶у帵", "澶師"}); + add(new String[]{"娴欐睙鍔炰簨澶勫鑸�", "澶師"}); + add(new String[]{"娴欐睙浠佸拰灞呰�佸勾鍏荤敓鍏瘬", "婀栧窞"}); + add(new String[]{"娴欐睙浜よ繍澶у帵", "鏉窞"}); + add(new String[]{"娴欐睙宸ュ晢澶у瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙鍟嗚锤鍩�", "鍚堣偉"}); + add(new String[]{"娴欐睙宸ヤ笟澶у涔嬫睙瀛﹂櫌", "鏉窞"}); + }}); + city_DistrictNames.put("鍙板窞", new ArrayList(){{ + add(new String[]{"鍙板窞棣欐牸閲屾媺鑺卞洯 (棣欐牸閲屾媺,棣欐牸閲屾媺鑺卞洯)", "鍙板窞"}); + add(new String[]{"鍙板窞鍥介檯濉戞枡鍩� (鍥介檯濉戞枡鍩�)", "鍙板窞"}); + add(new String[]{"鍙板窞涓栬锤涓績 (涓栬锤涓績)", "鍙板窞"}); + add(new String[]{"鍙板窞姹介厤鍩� (姹介厤鍩�)", "鍙板窞"}); + add(new String[]{"鍙板窞娴锋磱骞垮満", "鍙板窞"}); + add(new String[]{"鍙板窞鑰�姹熷箍鍦�", "鍙板窞"}); + }}); + city_DistrictNames.put("娓╁箔", new ArrayList(){{ + add(new String[]{"娓╁箔閿﹂兘鑺卞洯", "鍙板窞"}); + add(new String[]{"娓╁箔涓滄柟鑺卞洯", "娓╁箔"}); + }}); + city_DistrictNames.put("娴欐睙", new ArrayList(){{ + add(new String[]{"娴欐睙宸ヤ笟澶у鏁欏笀瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙澶у帵", "澶師"}); + add(new String[]{"娴欐睙鍔炰簨澶勫鑸�", "澶師"}); + add(new String[]{"娴欐睙浠佸拰灞呰�佸勾鍏荤敓鍏瘬", "婀栧窞"}); + add(new String[]{"娴欐睙浜よ繍澶у帵", "鏉窞"}); + add(new String[]{"娴欐睙宸ュ晢澶у瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙鍟嗚锤鍩�", "鍚堣偉"}); + add(new String[]{"娴欐睙宸ヤ笟澶у涔嬫睙瀛﹂櫌", "鏉窞"}); + }}); + city_DistrictNames.put("缁嶅叴", new ArrayList(){{ + add(new String[]{"缁嶅叴澶╀笅", "缁嶅叴"}); + add(new String[]{"缁嶅叴鏂版潙", "鏉窞"}); + add(new String[]{"缁嶅叴棰愭櫙鍥�", "鏉窞"}); + add(new String[]{"缁嶅叴绀惧尯", "姝︽眽"}); + add(new String[]{"缁嶅叴涓滄柟鑺卞洯", "缁嶅叴"}); + add(new String[]{"缁嶅叴杞荤汉璐告槗涓績", "缁嶅叴"}); + }}); + city_DistrictNames.put("灞变笢", new ArrayList(){{ + add(new String[]{"灞变笢閲�", "绉︾殗宀�"}); + add(new String[]{"灞变笢缁忔祹瀛﹂櫌瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢鐪佸崼鐢熷巺瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢鐪佹皯鏀垮巺瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢鐪佸晢涓氶泦鍥㈡�诲叕鍙稿鑸�", "娴庡崡"}); + add(new String[]{"灞变笢鍖荤澶у鏁欏笀瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢澶栬锤澶у帵", "闈掑矝"}); + add(new String[]{"灞变笢澶у帵", "娣卞湷"}); + add(new String[]{"灞变笢鍫$ぞ鍖�", "娌堥槼"}); + add(new String[]{"灞变笢鑹烘湳瀛﹂櫌瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢榛勯噾宕簯婀栭珮灏斿か鍒", "娴庡崡"}); + add(new String[]{"灞变笢鍙告硶璀﹀畼瀛﹂櫌瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢鐪佺瀛﹂櫌楂樻柊鎶�鏈爺绌跺垎闄�", "闈掑矝"}); + add(new String[]{"灞变笢寤哄伐瀛﹂櫌瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢搴欏皬鍖�", "娌堥槼"}); + add(new String[]{"灞变笢涔冲北閾舵哗娴锋櫙鎴�", "濞佹捣"}); + add(new String[]{"灞变笢澶存潙", "闈掑矝"}); + add(new String[]{"灞变笢鐪佺暅鐗у眬瀹胯垗", "娴庡崡"}); + }}); + city_DistrictNames.put("鐑熷彴", new ArrayList(){{ + add(new String[]{"鐑熷彴鏁扮爜娓�", "鐑熷彴"}); + }}); + city_DistrictNames.put("璐靛窞", new ArrayList(){{ + add(new String[]{"璐靛窞澶у帵", "娴峰彛"}); + add(new String[]{"璐靛窞绉戞妧澶у帵", "璐甸槼"}); + add(new String[]{"璐靛窞鏃ユ姤绀剧硸鏋滃巶瀹胯垗", "璐甸槼"}); + add(new String[]{"璐靛窞椹村弸浜哄閰掑簵寮忚繛閿佸搴叕瀵�", "璐甸槼"}); + add(new String[]{"璐靛窞鏃ユ姤绀剧硸鏋滃巶瀹胯垗", "璐甸槼"}); + add(new String[]{"璐靛窞鍟嗚锤鐗╂祦娓�", "璐甸槼"}); + }}); + city_DistrictNames.put("璐甸槼", new ArrayList(){{ + add(new String[]{"璐甸槼甯傞伒涔夎矾閬典箟宸�", "璐甸槼"}); + add(new String[]{"璐甸槼鍖诲闄㈤檮灞炲尰闄㈠鑸�", "璐甸槼"}); + add(new String[]{"璐甸槼寤虹瓚璁捐闄㈠鑸�", "璐甸槼"}); + add(new String[]{"璐甸槼鑺辫嫅", "鍖楁捣"}); + add(new String[]{"璐甸槼閲�", "澶╂触"}); + add(new String[]{"璐甸槼鍏瘬", "澶╂触"}); + add(new String[]{"璐甸槼甯傜鐮旀墍瀹胯垗", "璐甸槼"}); + add(new String[]{"璐甸槼瑙傚北婀栦竴鍙�", "璐甸槼"}); + add(new String[]{"璐甸槼鎭掑ぇ缁挎床", "璐甸槼"}); + add(new String[]{"璐甸槼鎭掑ぇ鍩�", "璐甸槼"}); + add(new String[]{"璐甸槼缁忔祹寮�鍙戝尯", "璐甸槼"}); + add(new String[]{"璐甸槼涓尰瀛﹂櫌鏁欏笀瀹胯垗", "璐甸槼"}); + add(new String[]{"璐甸槼楗簵", "璐甸槼"}); + add(new String[]{"璐甸槼灏忓尯", "闀挎槬"}); + add(new String[]{"璐甸槼甯傞伒涔夎矾閬典箟宸峰皬鍖�", "璐甸槼"}); + }}); + city_DistrictNames.put("娌冲崡", new ArrayList(){{ + add(new String[]{"娌冲崡搴勫皬鍖�", "闈掑矝"}); + add(new String[]{"娌冲崡璐笓瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡鐪佹柊鍗庝功搴楀灞為櫌", "閮戝窞"}); + add(new String[]{"娌冲崡鐪佸晢涓氱瀛︾爺绌舵墍瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡鐪佹棩鎶ョぞ瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡濂冲瓙楂樹腑瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡澶栬锤澶ч櫌", "娣卞湷"}); + add(new String[]{"娌冲崡閲�", "澶╂触"}); + add(new String[]{"娌冲崡鏂版潙", "绂忓窞"}); + add(new String[]{"娌冲崡璐㈢粡瀛﹂櫌瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡宀稿叕鍥皬鍖�", "鎯犲窞"}); + add(new String[]{"娌冲崡宀告柊鏉�", "鎯犲窞"}); + add(new String[]{"娌冲崡鏉�", "鍖椾含"}); + add(new String[]{"娌冲崡鐞嗗伐瀛︽牎瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡鐪佷汉浜嬪巺瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡宀镐腑蹇冨皬鍖�", "鎯犲窞"}); + add(new String[]{"娌冲崡鐪佸璐稿鏍″灞為櫌", "閮戝窞"}); + add(new String[]{"娌冲崡鏉�", "涓婃捣"}); + add(new String[]{"娌冲崡鏂版潙", "涓婃捣"}); + add(new String[]{"娌冲崡宸ヤ笟澶у瀹跺睘闄�", "閮戝窞"}); + }}); + city_DistrictNames.put("鐒︿綔", new ArrayList(){{ + add(new String[]{"鐒︿綔缇よ嫳瀹惰嫅", "鐒︿綔"}); + add(new String[]{"鐒︿綔涓捣涓芥睙", "鐒︿綔"}); + add(new String[]{"鐒︿綔鐧戒簯鑻�", "鐒︿綔"}); + add(new String[]{"鐒︿綔婊ㄦ渤灏忓尯", "鐒︿綔"}); + }}); + city_DistrictNames.put("婀栧崡", new ArrayList(){{ + add(new String[]{"婀栧崡澶у帵", "娴峰彛"}); + add(new String[]{"婀栧崡甯堝ぇ寮犲叕宀牎鍖哄鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佽繘鍑哄彛鍏徃瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡骞跨數瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡鏈哄簥鍘傚鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鍒惰嵂鍘傚鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡渚涢攢澶у帵", "闀挎矙"}); + add(new String[]{"婀栧崡鍖栧伐鍖昏嵂璁捐闄㈠鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡宸ュ晢閾惰瀹胯垗鏈哄叧澶ч櫌", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸浗闃茬鍏姙鏈哄叧闄㈠唴瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡鎶ヤ笟鏂囧寲鍩�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佷氦閫氳璁¢櫌", "闀挎矙"}); + add(new String[]{"婀栧崡鑱旈�氫綇瀹呭皬鍖�", "闀挎矙"}); + add(new String[]{"婀栧崡鐢佃鍙板崟浣嶅鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡寮�鍏冲巶瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡灏忓尯", "鍖椾含"}); + add(new String[]{"婀栧崡閭數鏂版潙灏忓尯", "闉嶅北"}); + add(new String[]{"婀栧崡鐪佺瀛︽妧鏈巺瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸浗瀹夊巺鍗曚綅鎴�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佹湪鍋跺墽鍥㈠鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佹皵璞″眬瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡濂冲瓙澶у鏁欏笀鍏瘬", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸啘涓氭満姊扮爺绌舵墍", "闀挎矙"}); + add(new String[]{"婀栧崡鏁欒偛瑁呭缁煎悎澶фゼ", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸姵鍔ㄥ崼鐢熸墍", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佽川閲忔妧鏈洃鐫e眬瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡鐪侀噾灞炲洖鏀跺叕鍙稿鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸鏂欑爺绌舵墍", "闀挎矙"}); + add(new String[]{"婀栧崡鐪侀珮绾т汉姘戞鏌ラ櫌鍗曚綅鎴�", "闀挎矙"}); + add(new String[]{"婀栧崡浜ら�氳亴闄㈠鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸喍閲戞潗鏂欑爺绌舵墍", "闀挎矙"}); + add(new String[]{"婀栧崡閲戣渹闊冲儚鍑虹増绀�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佺墿璧勫巺瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡瀹剁數鍟嗗煄", "闀挎矙"}); + add(new String[]{"婀栧崡鍥介檯鍟嗗姟涓績", "闀挎矙"}); + add(new String[]{"婀栧崡璐㈠瘜涓績", "闀挎矙"}); + add(new String[]{"婀栧崡鍥介檯姹借溅鍩�", "闀挎矙"}); + add(new String[]{"婀栧崡浜氬ぇ鏁扮爜娓�", "闀挎矙"}); + add(new String[]{"婀栧崡澶у帵", "鍗楀畞"}); + add(new String[]{"婀栧崡澶у帵", "涓婃捣"}); + add(new String[]{"婀栧崡鏄熸矙姹介厤鍩�", "闀挎矙"}); + add(new String[]{"婀栧崡鑹烘牎鍗曚綅鎴�", "闀挎矙"}); + add(new String[]{"婀栧崡璐笓鏁欒亴宸ュ鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佹満姊拌繘鍑哄彛鍏徃瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡鏃ユ姤鍗曚綅瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡宀稿悗鐣堝皬鍖�", "缁嶅叴"}); + }}); + city_DistrictNames.put("宀抽槼", new ArrayList(){{ + add(new String[]{"宀抽槼灏忓尯", "鍘﹂棬"}); + add(new String[]{"宀抽槼鑸掕嫅", "澶╂触"}); + add(new String[]{"宀抽槼閲�", "澶╂触"}); + add(new String[]{"宀抽槼瑗块噷", "鍘﹂棬"}); + add(new String[]{"宀抽槼閲屄峰拰骞冲尯", "澶╂触"}); + add(new String[]{"宀抽槼灏忓尯", "涓婃捣"}); + add(new String[]{"宀抽槼澶фゼ", "涓婃捣"}); + add(new String[]{"宀抽槼鑺辫嫅", "涓婃捣"}); + }}); + city_DistrictNames.put("姹熻嫃", new ArrayList(){{ + add(new String[]{"姹熻嫃鐪佸啘绉戦櫌", "鍗椾含"}); + add(new String[]{"姹熻嫃娌圭敯鐭虫补灞卞簞", "鎵窞"}); + add(new String[]{"姹熻嫃璀﹀畼瀛﹂櫌", "鍗椾含"}); + add(new String[]{"姹熻嫃鐪侀珮绾т笓瀹跺洯", "鍗椾含"}); + add(new String[]{"姹熻嫃娌圭敯鐭虫补灞卞簞", "鎵窞"}); + add(new String[]{"姹熻嫃璁簨鍥�", "鍗椾含"}); + add(new String[]{"姹熻嫃鍥介檯濉戝寲鍩�", "甯稿窞"}); + add(new String[]{"姹熻嫃涓囧拰鍥介檯鍟嗚锤鍩�", "甯稿窞"}); + }}); + city_DistrictNames.put("鍗楅��", new ArrayList(){{ + add(new String[]{"鍗楅�氳姳鍥�", "鐝犳捣"}); + add(new String[]{"鍗楅�氱數淇″鑸�", "闀挎矙"}); + add(new String[]{"鍗楅�氶噷", "澶╂触"}); + add(new String[]{"鍗楅�氬ぇ鍘�", "鍗楅��"}); + add(new String[]{"鍗楅�氱传绔硅嫅", "鍗楅��"}); + add(new String[]{"鍗楅�氫腑澶晢鍔″尯", "鍗楅��"}); + add(new String[]{"鍗楅�氬9鍩庢按鏈ㄦ竻鍗�", "鍗楅��"}); + add(new String[]{"鍗楅�氬浗闄呰锤鏄撲腑蹇�", "鍗楅��"}); + add(new String[]{"鍗楅�氭槦鍏夎��骞垮満", "鍗楅��"}); + add(new String[]{"鍗楅�氱幇浠g敓娲诲箍鍦�", "鍗楅��"}); + add(new String[]{"鍗楅�毬烽噾娓稿煄", "鍗楅��"}); + }}); + city_DistrictNames.put("姹熻嫃", new ArrayList(){{ + add(new String[]{"姹熻嫃鐪佸啘绉戦櫌", "鍗椾含"}); + add(new String[]{"姹熻嫃娌圭敯鐭虫补灞卞簞", "鎵窞"}); + add(new String[]{"姹熻嫃璀﹀畼瀛﹂櫌", "鍗椾含"}); + add(new String[]{"姹熻嫃鐪侀珮绾т笓瀹跺洯", "鍗椾含"}); + add(new String[]{"姹熻嫃娌圭敯鐭虫补灞卞簞", "鎵窞"}); + add(new String[]{"姹熻嫃璁簨鍥�", "鍗椾含"}); + add(new String[]{"姹熻嫃鍥介檯濉戝寲鍩�", "甯稿窞"}); + add(new String[]{"姹熻嫃涓囧拰鍥介檯鍟嗚锤鍩�", "甯稿窞"}); + }}); + city_DistrictNames.put("鍗椾含", new ArrayList(){{ + add(new String[]{"鍗椾含鑺卞洯", "鍝堝皵婊�"}); + add(new String[]{"鍗椾含鑹烘湳瀛﹂櫌瀹跺睘鍖�", "鍗椾含"}); + add(new String[]{"鍗椾含鍥介檯骞垮満", "鍗椾含"}); + add(new String[]{"鍗椾含璐㈢粡澶у鏁欏笀瀹胯垗妤�", "鍗椾含"}); + add(new String[]{"鍗椾含鐐兼补鍘傚皬鍖�", "鍗椾含"}); + add(new String[]{"鍗椾含鍗楃ぞ鍖�", "娌堥槼"}); + add(new String[]{"鍗椾含姹熷ぉ鑺卞洯", "杩炰簯娓�"}); + add(new String[]{"鍗椾含涓栫晫鏉�", "鍗椾含"}); + add(new String[]{"鍗椾含涓囪揪骞垮満", "鍗椾含"}); + add(new String[]{"鍗椾含娌睙鍟嗚锤鍩�", "鍗椾含"}); + add(new String[]{"鍗椾含鐞嗗伐澶у", "鍗椾含"}); + add(new String[]{"鍗椾含娴峰场鍩�", "鍗椾含"}); + add(new String[]{"鍗椾含灏忓尯", "涓婃捣"}); + add(new String[]{"鍗椾含婀鹃敠缁i姹�", "鍗椾含"}); + }}); + city_DistrictNames.put("榛戦緳姹�", new ArrayList(){{ + }}); + city_DistrictNames.put("鐗′腹姹�", new ArrayList(){{ + add(new String[]{"鐗′腹姹熺ぞ鍖�", "娌堥槼"}); + }}); + city_DistrictNames.put("瀹夊窘", new ArrayList(){{ + add(new String[]{"瀹夊窘甯堣寖澶у鏁欏笀鍏瘬", "鑺滄箹"}); + add(new String[]{"瀹夊窘鐢佃鍙板鑸�", "鍚堣偉"}); + add(new String[]{"瀹夊窘鏃ユ姤绀惧鑸�", "鍚堣偉"}); + add(new String[]{"瀹夊窘澶у帵", "鐝犳捣"}); + add(new String[]{"瀹夊窘鏉傛妧鍥㈠鑸�", "鍚堣偉"}); + add(new String[]{"瀹夊窘璀﹀畼鑱屼笟瀛﹂櫌瀹胯垗", "鍚堣偉"}); + add(new String[]{"瀹夊窘绋庡姟瀛︽牎瀹胯垗", "鍚堣偉"}); + add(new String[]{"瀹夊窘姹介厤鍩�", "鍚堣偉"}); + add(new String[]{"瀹夊窘鍥藉己閽㈡潗浜ゆ槗涓績", "鍚堣偉"}); + add(new String[]{"瀹夊窘鍥介檯璐墿骞垮満", "鍚堣偉"}); + add(new String[]{"瀹夊窘澶у競鍦�", "鍚堣偉"}); + }}); + city_DistrictNames.put("椹瀺灞�", new ArrayList(){{ + add(new String[]{"椹瀺灞卞皬鍖�", "鎴愰兘"}); + add(new String[]{"椹瀺灞变竴鍙�", "骞垮窞"}); + }}); + city_DistrictNames.put("娴欐睙", new ArrayList(){{ + add(new String[]{"娴欐睙宸ヤ笟澶у鏁欏笀瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙澶у帵", "澶師"}); + add(new String[]{"娴欐睙鍔炰簨澶勫鑸�", "澶師"}); + add(new String[]{"娴欐睙浠佸拰灞呰�佸勾鍏荤敓鍏瘬", "婀栧窞"}); + add(new String[]{"娴欐睙浜よ繍澶у帵", "鏉窞"}); + add(new String[]{"娴欐睙宸ュ晢澶у瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙鍟嗚锤鍩�", "鍚堣偉"}); + add(new String[]{"娴欐睙宸ヤ笟澶у涔嬫睙瀛﹂櫌", "鏉窞"}); + }}); + city_DistrictNames.put("鍙板窞", new ArrayList(){{ + add(new String[]{"鍙板窞棣欐牸閲屾媺鑺卞洯 (棣欐牸閲屾媺,棣欐牸閲屾媺鑺卞洯)", "鍙板窞"}); + add(new String[]{"鍙板窞鍥介檯濉戞枡鍩� (鍥介檯濉戞枡鍩�)", "鍙板窞"}); + add(new String[]{"鍙板窞涓栬锤涓績 (涓栬锤涓績)", "鍙板窞"}); + add(new String[]{"鍙板窞姹介厤鍩� (姹介厤鍩�)", "鍙板窞"}); + add(new String[]{"鍙板窞娴锋磱骞垮満", "鍙板窞"}); + add(new String[]{"鍙板窞鑰�姹熷箍鍦�", "鍙板窞"}); + }}); + city_DistrictNames.put("骞夸笢", new ArrayList(){{ + add(new String[]{"骞夸笢澶栬锤骞垮満", "骞垮窞"}); + add(new String[]{"骞夸笢澶栬鑹烘湳瀛﹂櫌鏁欏笀瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢寤虹闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢鍙告硶璀﹀畼鑱屼笟瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐜繚澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍟嗕笟澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍖诲闄㈡暀甯堝鑸嶆ゼ", "涓滆帪"}); + add(new String[]{"骞夸笢鍥介檯澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佹妧鏈洃鐫e眬瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢宸ヤ笟澶у瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鏁欒偛瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪侀摱琛屽ぇ鍘�", "娣卞湷"}); + add(new String[]{"骞夸笢澶у帵", "澶╂触"}); + add(new String[]{"骞夸笢灞卞簞", "闀囨睙"}); + add(new String[]{"骞夸笢绾㈢浘澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鑽闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢闈掑勾骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鍩虹妤�", "娣卞湷"}); + add(new String[]{"骞夸笢鐪佺鎶�骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佸啘涓氱鐞嗗共閮ㄥ闄㈢ぞ鍖�", "骞垮窞"}); + add(new String[]{"骞夸笢鑺暰闆烽�告櫙", "浣涘北"}); + }}); + city_DistrictNames.put("姹曞ご", new ArrayList(){{ + add(new String[]{"姹曞ご鏂板煄", "姹曞ご"}); + }}); + city_DistrictNames.put("娴欐睙", new ArrayList(){{ + add(new String[]{"娴欐睙宸ヤ笟澶у鏁欏笀瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙澶у帵", "澶師"}); + add(new String[]{"娴欐睙鍔炰簨澶勫鑸�", "澶師"}); + add(new String[]{"娴欐睙浠佸拰灞呰�佸勾鍏荤敓鍏瘬", "婀栧窞"}); + add(new String[]{"娴欐睙浜よ繍澶у帵", "鏉窞"}); + add(new String[]{"娴欐睙宸ュ晢澶у瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙鍟嗚锤鍩�", "鍚堣偉"}); + add(new String[]{"娴欐睙宸ヤ笟澶у涔嬫睙瀛﹂櫌", "鏉窞"}); + }}); + city_DistrictNames.put("瀹佹尝", new ArrayList(){{ + add(new String[]{"瀹佹尝閲�", "澶╂触"}); + add(new String[]{"瀹佹尝閲�", "姝︽眽"}); + add(new String[]{"瀹佹尝鍟嗕細澶у帵", "瀹佹尝"}); + add(new String[]{"瀹佹尝澶栦唬澶у帵", "瀹佹尝"}); + add(new String[]{"瀹佹尝灏忓尯", "涓婃捣"}); + }}); + city_DistrictNames.put("濂夊寲", new ArrayList(){{ + add(new String[]{"濂夊寲浜蹭翰瀹跺洯", "瀹佹尝"}); + add(new String[]{"濂夊寲浜蹭翰瀹跺洯", "濂夊寲"}); + add(new String[]{"濂夊寲涓ぎ鑺卞洯", "瀹佹尝"}); + }}); + city_DistrictNames.put("骞胯タ澹棌", new ArrayList(){{ + add(new String[]{"骞胯タ澹棌鑷不鍖哄徃娉曞巺瀹胯垗", "鍗楀畞"}); + add(new String[]{"骞胯タ澹棌鑷不鍖哄啘涓氬巺瀹胯垗", "鍗楀畞"}); + }}); + city_DistrictNames.put("妗傛灄", new ArrayList(){{ + add(new String[]{"妗傛灄鍥介檯鏃呮父鍟嗗搧鎵瑰彂鍩�", "妗傛灄"}); + add(new String[]{"妗傛灄灏忓尯", "闀挎槬"}); + add(new String[]{"妗傛灄灏忓尯", "娌堥槼"}); + add(new String[]{"妗傛灄灏忓尯", "澶ц繛"}); + add(new String[]{"妗傛灄鑻�", "澶ц繛"}); + add(new String[]{"妗傛灄鍏鍘熶埂澧�", "妗傛灄"}); + add(new String[]{"妗傛灄娑﹀洯", "妗傛灄"}); + add(new String[]{"妗傛灄濂ユ灄鍖瑰厠鑺卞洯", "妗傛灄"}); + add(new String[]{"妗傛灄澶т笘鐣�", "妗傛灄"}); + add(new String[]{"妗傛灄涓囩伒娑﹀洯", "妗傛灄"}); + add(new String[]{"妗傛灄鏂拌嫅", "涓婃捣"}); + add(new String[]{"妗傛灄鑻�", "涓婃捣"}); + add(new String[]{"妗傛灄鑺辫嫅", "涓婃捣"}); + add(new String[]{"妗傛灄鍧�", "鍢夊叴"}); + }}); + city_DistrictNames.put("骞夸笢", new ArrayList(){{ + add(new String[]{"骞夸笢澶栬锤骞垮満", "骞垮窞"}); + add(new String[]{"骞夸笢澶栬鑹烘湳瀛﹂櫌鏁欏笀瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢寤虹闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢鍙告硶璀﹀畼鑱屼笟瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐜繚澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍟嗕笟澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍖诲闄㈡暀甯堝鑸嶆ゼ", "涓滆帪"}); + add(new String[]{"骞夸笢鍥介檯澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佹妧鏈洃鐫e眬瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢宸ヤ笟澶у瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鏁欒偛瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪侀摱琛屽ぇ鍘�", "娣卞湷"}); + add(new String[]{"骞夸笢澶у帵", "澶╂触"}); + add(new String[]{"骞夸笢灞卞簞", "闀囨睙"}); + add(new String[]{"骞夸笢绾㈢浘澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鑽闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢闈掑勾骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鍩虹妤�", "娣卞湷"}); + add(new String[]{"骞夸笢鐪佺鎶�骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佸啘涓氱鐞嗗共閮ㄥ闄㈢ぞ鍖�", "骞垮窞"}); + add(new String[]{"骞夸笢鑺暰闆烽�告櫙", "浣涘北"}); + }}); + city_DistrictNames.put("骞垮窞", new ArrayList(){{ + add(new String[]{"骞垮窞鍗敓鍘呭ぇ闄�", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥泤閫稿涵", "骞垮窞"}); + add(new String[]{"骞垮窞瀹㈣溅鍘傚鑸�", "骞垮窞"}); + add(new String[]{"骞垮窞鍚庤姳鍥�", "娓呰繙"}); + add(new String[]{"骞垮窞鍚庤姳鍥�", "娓呰繙"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥祬灞卞皬绛�", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥泤鎮﹀涵", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥泤缈犲涵", "骞垮窞"}); + add(new String[]{"骞垮窞濂ユ灄鍖瑰厠鑺卞洯", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥偦灞�", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥�稿績鍥�", "骞垮窞"}); + add(new String[]{"骞垮窞澶у鏁欏笀妤�", "骞垮窞"}); + add(new String[]{"骞垮窞甯傜ぞ浼氱鍒╅櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞垮窞浣撹偛瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞垮窞甯傞鍝佸鑸�", "骞垮窞"}); + add(new String[]{"骞垮窞婀炬椂浠e箍鍦�", "婀涙睙"}); + add(new String[]{"骞垮窞鍐涘尯鎴跨鎵�瀹胯垗", "姝︽眽"}); + add(new String[]{"骞垮窞鏂板鏂颁笘鐣岃姳鍥�", "骞垮窞"}); + add(new String[]{"骞垮窞绌烘腐鍋囨棩鍒閰掑簵", "骞垮窞"}); + add(new String[]{"骞垮窞鏄熸渤涓瑰牑", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥崄骞村皬闆�", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥姳宸�", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥嘲浼�", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥尽鏅嘲鍒", "骞垮窞"}); + add(new String[]{"骞垮窞纰ф鍥鑻�", "骞垮窞"}); + add(new String[]{"骞垮窞纰ф鍥崕鑻�", "骞垮窞"}); + add(new String[]{"骞垮窞纰ф鍥泤鑻�", "骞垮窞"}); + add(new String[]{"骞垮窞纰ф鍥編鑻�", "骞垮窞"}); + add(new String[]{"骞垮窞纰ф鍥箰鑻�", "骞垮窞"}); + add(new String[]{"骞垮窞纰ф鍥敠鑻�", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥锋娲叉晠浜�", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥亸婀栧眳", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥泤婀栧眳", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥�", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥竴灏哄北灞�", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥锋柊鍦�", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥峰ぉ鍩�", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥锋尓濞佹.鏋�", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥洉鍒绘椂鍏�", "骞垮窞"}); + add(new String[]{"骞垮窞纰ф鍥鑻�", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥笂鍠勮嫢姘�", "骞垮窞"}); + add(new String[]{"骞垮窞娓憺閰掑簵鍏瘬", "骞垮窞"}); + add(new String[]{"骞垮窞浜氳繍鍩幝峰ぉ瑾�", "骞垮窞"}); + add(new String[]{"骞垮窞鐧藉ぉ楣呰姳鍥�", "骞垮窞"}); + add(new String[]{"骞垮窞纰ф鍥豢鑼佃嫅", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥椂鍏変節绡�", "骞垮窞"}); + add(new String[]{"骞垮窞纰ф鍥悍鑻�", "骞垮窞"}); + add(new String[]{"骞垮窞娴疯繍澶у帵", "骞垮窞"}); + add(new String[]{"骞垮窞鏈夎壊閲戝睘鐮旂┒闄�", "骞垮窞"}); + add(new String[]{"骞垮窞纰ф鍥附鑻�", "骞垮窞"}); + add(new String[]{"骞垮窞纰ф鍥繝鑻�", "骞垮窞"}); + add(new String[]{"骞垮窞瀵屽姏鍩�", "骞垮窞"}); + add(new String[]{"骞垮窞纰ф鍥�", "骞垮窞"}); + add(new String[]{"骞垮窞鏂板鏂颁笘鐣岃姳鍥�", "澧炲煄"}); + }}); + city_DistrictNames.put("澧炲煄", new ArrayList(){{ + add(new String[]{"澧炲煄瀵屼附鑺卞洯", "骞垮窞"}); + add(new String[]{"澧炲煄鏃朵唬鍊惧煄", "骞垮窞"}); + add(new String[]{"澧炲煄闆呭眳涔愬尽瀹惧簻", "骞垮窞"}); + add(new String[]{"澧炲煄娌欏洯涓矾灏忓尯", "骞垮窞"}); + add(new String[]{"澧炲煄缇ゆ槦澶у帵", "骞垮窞"}); + add(new String[]{"澧炲煄鎬″悍鑺卞洯", "骞垮窞"}); + add(new String[]{"澧炲煄瀵屾櫙灞�", "骞垮窞"}); + add(new String[]{"澧炲煄閲戠敯鑺卞洯", "骞垮窞"}); + add(new String[]{"澧炲煄閫氬洯鑺卞洯", "骞垮窞"}); + add(new String[]{"澧炲煄椤烘櫙妤�", "骞垮窞"}); + add(new String[]{"澧炲煄缈犳櫙鑻�", "骞垮窞"}); + add(new String[]{"澧炲煄鍐滆瀹胯垗", "骞垮窞"}); + add(new String[]{"澧炲煄闃冲厜瀹跺洯", "骞垮窞"}); + add(new String[]{"澧炲煄閿﹀煄鑺卞洯", "骞垮窞"}); + add(new String[]{"澧炲煄涓囪揪骞垮満", "骞垮窞"}); + add(new String[]{"澧炲煄閲戠敯鑺卞洯", "澧炲煄"}); + add(new String[]{"澧炲煄鏃朵唬鍊惧煄", "澧炲煄"}); + add(new String[]{"澧炲煄娌欏洯涓矾灏忓尯", "澧炲煄"}); + add(new String[]{"澧炲煄瀵屼附鑺卞洯", "澧炲煄"}); + add(new String[]{"澧炲煄闆呭眳涔愬尽瀹惧簻", "澧炲煄"}); + add(new String[]{"澧炲煄瀵屾櫙灞�", "澧炲煄"}); + add(new String[]{"澧炲煄閫氬洯鑺卞洯", "澧炲煄"}); + add(new String[]{"澧炲煄鍐滆瀹胯垗", "澧炲煄"}); + add(new String[]{"澧炲煄缈犳櫙鑻�", "澧炲煄"}); + add(new String[]{"澧炲煄缇ゆ槦澶у帵", "澧炲煄"}); + add(new String[]{"澧炲煄閿﹀煄鑺卞洯", "澧炲煄"}); + add(new String[]{"澧炲煄椤烘櫙妤�", "澧炲煄"}); + add(new String[]{"澧炲煄闃冲厜瀹跺洯", "澧炲煄"}); + add(new String[]{"澧炲煄鎬″悍鑺卞洯", "澧炲煄"}); + }}); + city_DistrictNames.put("骞夸笢", new ArrayList(){{ + add(new String[]{"骞夸笢澶栬锤骞垮満", "骞垮窞"}); + add(new String[]{"骞夸笢澶栬鑹烘湳瀛﹂櫌鏁欏笀瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢寤虹闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢鍙告硶璀﹀畼鑱屼笟瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐜繚澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍟嗕笟澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍖诲闄㈡暀甯堝鑸嶆ゼ", "涓滆帪"}); + add(new String[]{"骞夸笢鍥介檯澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佹妧鏈洃鐫e眬瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢宸ヤ笟澶у瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鏁欒偛瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪侀摱琛屽ぇ鍘�", "娣卞湷"}); + add(new String[]{"骞夸笢澶у帵", "澶╂触"}); + add(new String[]{"骞夸笢灞卞簞", "闀囨睙"}); + add(new String[]{"骞夸笢绾㈢浘澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鑽闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢闈掑勾骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鍩虹妤�", "娣卞湷"}); + add(new String[]{"骞夸笢鐪佺鎶�骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佸啘涓氱鐞嗗共閮ㄥ闄㈢ぞ鍖�", "骞垮窞"}); + add(new String[]{"骞夸笢鑺暰闆烽�告櫙", "浣涘北"}); + }}); + city_DistrictNames.put("闃虫睙", new ArrayList(){{ + add(new String[]{"闃虫睙纰ф箹闆呰嫅", "闃虫睙"}); + add(new String[]{"闃虫睙灞卞簞鍒", "闃虫睙"}); + }}); + city_DistrictNames.put("澶╂触", new ArrayList(){{ + add(new String[]{"澶╂触婀炬捣鏅泤鑻�", "澶╂触"}); + add(new String[]{"澶╂触鏂版潙", "鍗椾含"}); + add(new String[]{"澶╂触瀵屽姏妗冨洯", "澶╂触"}); + add(new String[]{"澶╂触涓績", "澶╂触"}); + add(new String[]{"澶╂触鍥壓宸ョ▼鐮旂┒鎵�", "澶╂触"}); + add(new String[]{"澶╂触瀹鹃娓╂硥鍏瘬", "澶╂触"}); + add(new String[]{"澶╂触婀炬捣娌冲浗闄呰姳鍥�", "澶╂触"}); + add(new String[]{"澶╂触濂ュ紡鍟嗗姟鍏洯", "澶╂触"}); + add(new String[]{"澶╂触鍊嶅効骞哥", "澶╂触"}); + add(new String[]{"澶╂触鍗庝鲸鍩�", "澶╂触"}); + add(new String[]{"澶╂触澶ч兘浼�", "澶╂触"}); + add(new String[]{"澶╂触闆呴灞�", "澶╂触"}); + add(new String[]{"澶╂触纰ф鍥�", "澶╂触"}); + add(new String[]{"澶╂触鏈潵鍩�", "澶╂触"}); + add(new String[]{"澶╂触绉戞妧骞垮満", "澶╂触"}); + add(new String[]{"澶╂触澶ч櫌", "姝︽眽"}); + add(new String[]{"澶╂触澶ф偊鍩庢偊搴�", "澶╂触"}); + add(new String[]{"澶╂触澶ф偊鍩庡ぇ鎮﹀叕瀵�", "澶╂触"}); + add(new String[]{"澶╂触瀵屽姏婀�", "澶╂触"}); + add(new String[]{"澶╂触娲ュ崡鏂板煄鍒", "澶╂触"}); + add(new String[]{"澶╂触鍏", "澶╂触"}); + add(new String[]{"澶╂触娲ュ崡鏂板煄", "澶╂触"}); + add(new String[]{"澶╂触瀵屽姏涓績", "澶╂触"}); + add(new String[]{"澶╂触鐜悆閲戣瀺涓績", "澶╂触"}); + add(new String[]{"澶╂触娓咕涓績", "澶╂触"}); + }}); + city_DistrictNames.put("骞夸笢", new ArrayList(){{ + add(new String[]{"骞夸笢澶栬锤骞垮満", "骞垮窞"}); + add(new String[]{"骞夸笢澶栬鑹烘湳瀛﹂櫌鏁欏笀瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢寤虹闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢鍙告硶璀﹀畼鑱屼笟瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐜繚澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍟嗕笟澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍖诲闄㈡暀甯堝鑸嶆ゼ", "涓滆帪"}); + add(new String[]{"骞夸笢鍥介檯澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佹妧鏈洃鐫e眬瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢宸ヤ笟澶у瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鏁欒偛瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪侀摱琛屽ぇ鍘�", "娣卞湷"}); + add(new String[]{"骞夸笢澶у帵", "澶╂触"}); + add(new String[]{"骞夸笢灞卞簞", "闀囨睙"}); + add(new String[]{"骞夸笢绾㈢浘澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鑽闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢闈掑勾骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鍩虹妤�", "娣卞湷"}); + add(new String[]{"骞夸笢鐪佺鎶�骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佸啘涓氱鐞嗗共閮ㄥ闄㈢ぞ鍖�", "骞垮窞"}); + add(new String[]{"骞夸笢鑺暰闆烽�告櫙", "浣涘北"}); + }}); + city_DistrictNames.put("娓呰繙", new ArrayList(){{ + add(new String[]{"娓呰繙缁存腐灏氬煄", "娓呰繙"}); + add(new String[]{"娓呰繙濂ュ洯", "娓呰繙"}); + add(new String[]{"娓呰繙閲�", "鏉窞"}); + add(new String[]{"娓呰繙缁存腐灏氬煄", "娓呰繙"}); + add(new String[]{"娓呰繙涓�鍖�", "涔愭竻"}); + }}); + city_DistrictNames.put("娌冲寳", new ArrayList(){{ + add(new String[]{"娌冲寳绋庡姟瀛︽牎鐢熸椿鍖�", "鐭冲搴�"}); + add(new String[]{"娌冲寳缁忔祹鏃ユ姤绀惧鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳缇庢湳鍑虹増绀惧鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳鐗╄祫瀹胯垗", "鐭冲搴�"}); + add(new String[]{"娌冲寳鍖栧伐鍖昏嵂鑱屼笟鎶�鏈闄㈠鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳鐢垫満瀹胯垗", "鐭冲搴�"}); + add(new String[]{"娌冲寳鏃ユ姤绀惧鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳宸ョ▼閫犱环绠$悊鎬荤珯瀹胯垗", "鐭冲搴�"}); + add(new String[]{"娌冲寳搴峰煄", "娼嶅潑"}); + add(new String[]{"娌冲寳绀惧尯", "娌堥槼"}); + add(new String[]{"娌冲寳鍖荤澶у瀹胯垗", "鐭冲搴�"}); + add(new String[]{"娌冲寳鐪佷汉澶у鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳鏂颁汉瀹�", "鍞愬北"}); + add(new String[]{"娌冲寳涓�鍙�", "鍞愬北"}); + add(new String[]{"娌冲寳鏈鸿灞�瀹胯垗", "鐭冲搴�"}); + add(new String[]{"娌冲寳骞挎挱鐢佃鎶ュ鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳鍟嗗煄", "闈掑矝"}); + add(new String[]{"娌冲寳闀垮煄楗簵", "鐭冲搴�"}); + add(new String[]{"娌冲寳鏉戝皬鍖�", "鍖椾含"}); + add(new String[]{"娌冲寳妗冩睙閲�", "澶╂触"}); + add(new String[]{"娌冲寳甯堝ぇ闈掑勾鍏瘬妤�", "鐭冲搴�"}); + add(new String[]{"娌冲寳缁�", "鏃犻敗"}); + add(new String[]{"娌冲寳绀惧尯", "鏈邯"}); + add(new String[]{"娌冲寳妤�", "鍞愬北"}); + }}); + city_DistrictNames.put("绉︾殗宀�", new ArrayList(){{ + add(new String[]{"绉︾殗宀涙亽澶у煄", "绉︾殗宀�"}); + }}); + city_DistrictNames.put("娴欐睙", new ArrayList(){{ + add(new String[]{"娴欐睙宸ヤ笟澶у鏁欏笀瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙澶у帵", "澶師"}); + add(new String[]{"娴欐睙鍔炰簨澶勫鑸�", "澶師"}); + add(new String[]{"娴欐睙浠佸拰灞呰�佸勾鍏荤敓鍏瘬", "婀栧窞"}); + add(new String[]{"娴欐睙浜よ繍澶у帵", "鏉窞"}); + add(new String[]{"娴欐睙宸ュ晢澶у瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙鍟嗚锤鍩�", "鍚堣偉"}); + add(new String[]{"娴欐睙宸ヤ笟澶у涔嬫睙瀛﹂櫌", "鏉窞"}); + }}); + city_DistrictNames.put("婀栧窞", new ArrayList(){{ + add(new String[]{"婀栧窞涓滆嫅", "鏉窞"}); + add(new String[]{"婀栧窞绔圭繝鍥皬鍖�", "婀栧窞"}); + }}); + city_DistrictNames.put("娴欐睙", new ArrayList(){{ + add(new String[]{"娴欐睙宸ヤ笟澶у鏁欏笀瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙澶у帵", "澶師"}); + add(new String[]{"娴欐睙鍔炰簨澶勫鑸�", "澶師"}); + add(new String[]{"娴欐睙浠佸拰灞呰�佸勾鍏荤敓鍏瘬", "婀栧窞"}); + add(new String[]{"娴欐睙浜よ繍澶у帵", "鏉窞"}); + add(new String[]{"娴欐睙宸ュ晢澶у瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙鍟嗚锤鍩�", "鍚堣偉"}); + add(new String[]{"娴欐睙宸ヤ笟澶у涔嬫睙瀛﹂櫌", "鏉窞"}); + }}); + city_DistrictNames.put("鏉窞", new ArrayList(){{ + add(new String[]{"鏉窞璧涚爜鍩�", "鏉窞"}); + add(new String[]{"鏉窞澶╂竻宀涘害鍋囧埆澧�", "鏉窞"}); + add(new String[]{"鏉窞婀惧叕瀵�", "鏉窞"}); + add(new String[]{"鏉窞閲�", "澶╂触"}); + add(new String[]{"鏉窞澶у帵", "鍙板窞"}); + add(new String[]{"鏉窞棣欐腐鍩�", "鏉窞"}); + add(new String[]{"鏉窞浼戞柉椤块珮绉戞妧鍥�", "鏉窞"}); + add(new String[]{"鏉窞瀹忎赴瀹跺眳鍩庡畯涓板叕瀵�", "鏉窞"}); + add(new String[]{"鏉窞澶ф鼎鍩�", "鏉窞"}); + add(new String[]{"鏉窞涔愬洯椋庢儏琛�", "鏉窞"}); + add(new String[]{"鏉窞涔斿徃鍟嗗煄", "鏉窞"}); + add(new String[]{"鏉窞纰ф鍥�", "鏉窞"}); + add(new String[]{"鏉窞甯備氦璀﹀鍏翠腑闃熷鑸�", "鏉窞"}); + }}); + city_DistrictNames.put("钀у北", new ArrayList(){{ + add(new String[]{"钀у北閲戝煄鑺卞洯", "鏉窞"}); + add(new String[]{"钀у北瀹舵櫙鍥�", "鏉窞"}); + add(new String[]{"钀у北鏃朵唬骞垮満", "鏉窞"}); + add(new String[]{"钀у北浼楀畨鏈嶅姟妤�", "鏉窞"}); + }}); + city_DistrictNames.put("绂忓缓", new ArrayList(){{ + add(new String[]{"绂忓缓鍥�", "鍗楀畞"}); + add(new String[]{"绂忓缓鐪佸洓寤哄鑸嶅寳闂�", "鍘﹂棬"}); + add(new String[]{"绂忓缓鑱旈�氳姳鍥�", "绂忓窞"}); + add(new String[]{"绂忓缓鏃ユ姤绀惧鑸�", "绂忓窞"}); + add(new String[]{"绂忓缓鐪佷腑蹇冩楠屾墍鍗曚綅瀹胯垗", "绂忓窞"}); + add(new String[]{"绂忓缓鐢靛奖鍒剁墖鍘傚崟浣嶅鑸�", "绂忓窞"}); + add(new String[]{"绂忓缓鐪佸コ瀛愮洃鐙卞鑸�", "绂忓窞"}); + add(new String[]{"绂忓缓鐪佸尰鑽叕鍙稿ぇ鐜嬮噷鍗曚綅瀹胯垗", "绂忓窞"}); + add(new String[]{"绂忓缓鐪佺浜屽叕璺伐绋嬪叕鍙稿鑸�", "绂忓窞"}); + add(new String[]{"绂忓缓鐪佽殨妗戠爺绌舵墍鍗曚綅瀹胯垗", "绂忓窞"}); + add(new String[]{"绂忓缓鏂版潙", "鍗椾含"}); + add(new String[]{"绂忓缓閲�", "澶╂触"}); + add(new String[]{"绂忓缓绀惧尯", "姝︽眽"}); + add(new String[]{"绂忓缓澶у帵", "璐甸槼"}); + add(new String[]{"绂忓缓宸峰皬鍖�", "鎴愰兘"}); + add(new String[]{"绂忓缓澶у帵", "娣卞湷"}); + add(new String[]{"绂忓缓鐢熸�佸伐绋嬪鏍″崟浣嶅鑸�", "绂忓窞"}); + add(new String[]{"绂忓缓鍖荤澶у鏁欏伐瀹胯垗", "绂忓窞"}); + }}); + city_DistrictNames.put("娉夊窞", new ArrayList(){{ + add(new String[]{"娉夊窞濂ユ灄鍖瑰厠鑺卞洯", "娉夊窞"}); + add(new String[]{"娉夊窞鍟嗗煄", "娉夊窞"}); + }}); + city_DistrictNames.put("娌冲寳", new ArrayList(){{ + add(new String[]{"娌冲寳绋庡姟瀛︽牎鐢熸椿鍖�", "鐭冲搴�"}); + add(new String[]{"娌冲寳缁忔祹鏃ユ姤绀惧鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳缇庢湳鍑虹増绀惧鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳鐗╄祫瀹胯垗", "鐭冲搴�"}); + add(new String[]{"娌冲寳鍖栧伐鍖昏嵂鑱屼笟鎶�鏈闄㈠鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳鐢垫満瀹胯垗", "鐭冲搴�"}); + add(new String[]{"娌冲寳鏃ユ姤绀惧鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳宸ョ▼閫犱环绠$悊鎬荤珯瀹胯垗", "鐭冲搴�"}); + add(new String[]{"娌冲寳搴峰煄", "娼嶅潑"}); + add(new String[]{"娌冲寳绀惧尯", "娌堥槼"}); + add(new String[]{"娌冲寳鍖荤澶у瀹胯垗", "鐭冲搴�"}); + add(new String[]{"娌冲寳鐪佷汉澶у鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳鏂颁汉瀹�", "鍞愬北"}); + add(new String[]{"娌冲寳涓�鍙�", "鍞愬北"}); + add(new String[]{"娌冲寳鏈鸿灞�瀹胯垗", "鐭冲搴�"}); + add(new String[]{"娌冲寳骞挎挱鐢佃鎶ュ鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳鍟嗗煄", "闈掑矝"}); + add(new String[]{"娌冲寳闀垮煄楗簵", "鐭冲搴�"}); + add(new String[]{"娌冲寳鏉戝皬鍖�", "鍖椾含"}); + add(new String[]{"娌冲寳妗冩睙閲�", "澶╂触"}); + add(new String[]{"娌冲寳甯堝ぇ闈掑勾鍏瘬妤�", "鐭冲搴�"}); + add(new String[]{"娌冲寳缁�", "鏃犻敗"}); + add(new String[]{"娌冲寳绀惧尯", "鏈邯"}); + add(new String[]{"娌冲寳妤�", "鍞愬北"}); + }}); + city_DistrictNames.put("閭兏", new ArrayList(){{ + }}); + city_DistrictNames.put("骞夸笢", new ArrayList(){{ + add(new String[]{"骞夸笢澶栬锤骞垮満", "骞垮窞"}); + add(new String[]{"骞夸笢澶栬鑹烘湳瀛﹂櫌鏁欏笀瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢寤虹闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢鍙告硶璀﹀畼鑱屼笟瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐜繚澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍟嗕笟澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍖诲闄㈡暀甯堝鑸嶆ゼ", "涓滆帪"}); + add(new String[]{"骞夸笢鍥介檯澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佹妧鏈洃鐫e眬瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢宸ヤ笟澶у瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鏁欒偛瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪侀摱琛屽ぇ鍘�", "娣卞湷"}); + add(new String[]{"骞夸笢澶у帵", "澶╂触"}); + add(new String[]{"骞夸笢灞卞簞", "闀囨睙"}); + add(new String[]{"骞夸笢绾㈢浘澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鑽闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢闈掑勾骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鍩虹妤�", "娣卞湷"}); + add(new String[]{"骞夸笢鐪佺鎶�骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佸啘涓氱鐞嗗共閮ㄥ闄㈢ぞ鍖�", "骞垮窞"}); + add(new String[]{"骞夸笢鑺暰闆烽�告櫙", "浣涘北"}); + }}); + city_DistrictNames.put("娌虫簮", new ArrayList(){{ + add(new String[]{"娌虫簮灏忓尯", "鍝堝皵婊�"}); + add(new String[]{"娌虫簮澶у帵", "骞垮窞"}); + add(new String[]{"娌虫簮纰ф按婀捐姳鍥�", "娌虫簮"}); + }}); + city_DistrictNames.put("娴欐睙", new ArrayList(){{ + add(new String[]{"娴欐睙宸ヤ笟澶у鏁欏笀瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙澶у帵", "澶師"}); + add(new String[]{"娴欐睙鍔炰簨澶勫鑸�", "澶師"}); + add(new String[]{"娴欐睙浠佸拰灞呰�佸勾鍏荤敓鍏瘬", "婀栧窞"}); + add(new String[]{"娴欐睙浜よ繍澶у帵", "鏉窞"}); + add(new String[]{"娴欐睙宸ュ晢澶у瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙鍟嗚锤鍩�", "鍚堣偉"}); + add(new String[]{"娴欐睙宸ヤ笟澶у涔嬫睙瀛﹂櫌", "鏉窞"}); + }}); + city_DistrictNames.put("鏉窞", new ArrayList(){{ + add(new String[]{"鏉窞璧涚爜鍩�", "鏉窞"}); + add(new String[]{"鏉窞澶╂竻宀涘害鍋囧埆澧�", "鏉窞"}); + add(new String[]{"鏉窞婀惧叕瀵�", "鏉窞"}); + add(new String[]{"鏉窞閲�", "澶╂触"}); + add(new String[]{"鏉窞澶у帵", "鍙板窞"}); + add(new String[]{"鏉窞棣欐腐鍩�", "鏉窞"}); + add(new String[]{"鏉窞浼戞柉椤块珮绉戞妧鍥�", "鏉窞"}); + add(new String[]{"鏉窞瀹忎赴瀹跺眳鍩庡畯涓板叕瀵�", "鏉窞"}); + add(new String[]{"鏉窞澶ф鼎鍩�", "鏉窞"}); + add(new String[]{"鏉窞涔愬洯椋庢儏琛�", "鏉窞"}); + add(new String[]{"鏉窞涔斿徃鍟嗗煄", "鏉窞"}); + add(new String[]{"鏉窞纰ф鍥�", "鏉窞"}); + add(new String[]{"鏉窞甯備氦璀﹀鍏翠腑闃熷鑸�", "鏉窞"}); + }}); + city_DistrictNames.put("婀栧崡", new ArrayList(){{ + add(new String[]{"婀栧崡澶у帵", "娴峰彛"}); + add(new String[]{"婀栧崡甯堝ぇ寮犲叕宀牎鍖哄鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佽繘鍑哄彛鍏徃瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡骞跨數瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡鏈哄簥鍘傚鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鍒惰嵂鍘傚鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡渚涢攢澶у帵", "闀挎矙"}); + add(new String[]{"婀栧崡鍖栧伐鍖昏嵂璁捐闄㈠鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡宸ュ晢閾惰瀹胯垗鏈哄叧澶ч櫌", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸浗闃茬鍏姙鏈哄叧闄㈠唴瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡鎶ヤ笟鏂囧寲鍩�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佷氦閫氳璁¢櫌", "闀挎矙"}); + add(new String[]{"婀栧崡鑱旈�氫綇瀹呭皬鍖�", "闀挎矙"}); + add(new String[]{"婀栧崡鐢佃鍙板崟浣嶅鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡寮�鍏冲巶瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡灏忓尯", "鍖椾含"}); + add(new String[]{"婀栧崡閭數鏂版潙灏忓尯", "闉嶅北"}); + add(new String[]{"婀栧崡鐪佺瀛︽妧鏈巺瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸浗瀹夊巺鍗曚綅鎴�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佹湪鍋跺墽鍥㈠鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佹皵璞″眬瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡濂冲瓙澶у鏁欏笀鍏瘬", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸啘涓氭満姊扮爺绌舵墍", "闀挎矙"}); + add(new String[]{"婀栧崡鏁欒偛瑁呭缁煎悎澶фゼ", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸姵鍔ㄥ崼鐢熸墍", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佽川閲忔妧鏈洃鐫e眬瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡鐪侀噾灞炲洖鏀跺叕鍙稿鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸鏂欑爺绌舵墍", "闀挎矙"}); + add(new String[]{"婀栧崡鐪侀珮绾т汉姘戞鏌ラ櫌鍗曚綅鎴�", "闀挎矙"}); + add(new String[]{"婀栧崡浜ら�氳亴闄㈠鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸喍閲戞潗鏂欑爺绌舵墍", "闀挎矙"}); + add(new String[]{"婀栧崡閲戣渹闊冲儚鍑虹増绀�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佺墿璧勫巺瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡瀹剁數鍟嗗煄", "闀挎矙"}); + add(new String[]{"婀栧崡鍥介檯鍟嗗姟涓績", "闀挎矙"}); + add(new String[]{"婀栧崡璐㈠瘜涓績", "闀挎矙"}); + add(new String[]{"婀栧崡鍥介檯姹借溅鍩�", "闀挎矙"}); + add(new String[]{"婀栧崡浜氬ぇ鏁扮爜娓�", "闀挎矙"}); + add(new String[]{"婀栧崡澶у帵", "鍗楀畞"}); + add(new String[]{"婀栧崡澶у帵", "涓婃捣"}); + add(new String[]{"婀栧崡鏄熸矙姹介厤鍩�", "闀挎矙"}); + add(new String[]{"婀栧崡鑹烘牎鍗曚綅鎴�", "闀挎矙"}); + add(new String[]{"婀栧崡璐笓鏁欒亴宸ュ鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佹満姊拌繘鍑哄彛鍏徃瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡鏃ユ姤鍗曚綅瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡宀稿悗鐣堝皬鍖�", "缁嶅叴"}); + }}); + city_DistrictNames.put("琛¢槼", new ArrayList(){{ + add(new String[]{"琛¢槼鏂板眳锛堜綇瀹咃級", "鍗楀畞"}); + add(new String[]{"琛¢槼鍚嶉儭", "琛¢槼"}); + }}); + city_DistrictNames.put("骞胯タ澹棌", new ArrayList(){{ + add(new String[]{"骞胯タ澹棌鑷不鍖哄徃娉曞巺瀹胯垗", "鍗楀畞"}); + add(new String[]{"骞胯タ澹棌鑷不鍖哄啘涓氬巺瀹胯垗", "鍗楀畞"}); + }}); + city_DistrictNames.put("鐜夋灄", new ArrayList(){{ + add(new String[]{"鐜夋灄涓滈噷", "鍖椾含"}); + add(new String[]{"鐜夋灄閲屽皬鍖�", "鍖椾含"}); + add(new String[]{"鐜夋灄灏忓尯", "鍖椾含"}); + add(new String[]{"鐜夋灄鍏贩绀惧尯", "鎴愰兘"}); + add(new String[]{"鐜夋灄鍏贩6鍙烽櫌", "鎴愰兘"}); + add(new String[]{"鐜夋灄鐜夐�氬贩8鍙烽櫌", "鎴愰兘"}); + add(new String[]{"鐜夋灄鑻戜簩鏈�", "鎴愰兘"}); + add(new String[]{"鐜夋灄钃撹暰绀惧尯", "鎴愰兘"}); + add(new String[]{"鐜夋灄涓冨贩", "鎴愰兘"}); + add(new String[]{"鐜夋灄瑗块噷灏忓尯", "鍖椾含"}); + add(new String[]{"鐜夋灄灏忓尯", "閲嶅簡"}); + add(new String[]{"鐜夋灄鑻�", "鎴愰兘"}); + add(new String[]{"鐜夋灄灏忓尯", "鎴愰兘"}); + add(new String[]{"鐜夋灄鍢夎嫅", "鎴愰兘"}); + add(new String[]{"鐜夋灄浜哄", "鎴愰兘"}); + add(new String[]{"鐜夋灄绁ュ拰鑻�", "鎴愰兘"}); + add(new String[]{"鐜夋灄澶у帵", "姝︽眽"}); + add(new String[]{"鐜夋灄鍝佷笂", "鎴愰兘"}); + add(new String[]{"鐜夋灄閮藉競閲戝哺", "鎴愰兘"}); + add(new String[]{"鐜夋灄鍚嶅眳", "鎴愰兘"}); + add(new String[]{"鐜夋灄涔濆贩4鍙烽櫌", "鎴愰兘"}); + add(new String[]{"鐜夋灄鍏贩2鍙烽櫌", "鎴愰兘"}); + add(new String[]{"鐜夋灄鍖楀贩8鍙烽櫌", "鎴愰兘"}); + add(new String[]{"鐜夋灄浜岄噷", "鍖椾含"}); + add(new String[]{"鐜夋灄鍊嶇壒绉戞妧鍥�", "鎴愰兘"}); + add(new String[]{"鐜夋灄鑻�", "鏄嗗北"}); + add(new String[]{"鐜夋灄鍏畨鍘呭鑸�", "鎴愰兘"}); + add(new String[]{"鐜夋灄鏂板ぉ鍦�", "鎴愰兘"}); + add(new String[]{"鐜夋灄鑺冲崕", "鎴愰兘"}); + add(new String[]{"鐜夋灄灞辨按", "鏇查潠"}); + add(new String[]{"鐜夋灄灏忓尯(娌剧泭)", "鏇查潠"}); + add(new String[]{"鐜夋灄灏忓尯", "鏇查潠"}); + add(new String[]{"鐜夋灄鍥皬鍖�", "涓芥睙"}); + add(new String[]{"鐜夋灄鑺卞洯", "涓芥睙"}); + add(new String[]{"鐜夋灄澶ф柊绀惧尯", "鐜夋灄"}); + add(new String[]{"鐜夋灄涓滅洓鍗庡簻", "鐜夋灄"}); + add(new String[]{"鐜夋灄鍗庡晢鍥介檯", "鐜夋灄"}); + }}); + city_DistrictNames.put("杈藉畞", new ArrayList(){{ + add(new String[]{"杈藉畞涓尰瀹跺睘妤�", "娌堥槼"}); + add(new String[]{"杈藉畞閲�", "澶╂触"}); + }}); + city_DistrictNames.put("涓逛笢", new ArrayList(){{ + add(new String[]{"涓逛笢閲�", "澶╂触"}); + }}); + city_DistrictNames.put("婀栧寳", new ArrayList(){{ + add(new String[]{"婀栧寳灏忓尯", "鍖椾含"}); + add(new String[]{"婀栧寳瀹濅赴鑺卞洯", "娣卞湷"}); + add(new String[]{"婀栧寳缁忔祹瀛﹂櫌瀹胯垗", "姝︽眽"}); + add(new String[]{"婀栧寳澶у瀹胯垗", "姝︽眽"}); + add(new String[]{"婀栧寳鏃ユ姤瀹胯垗", "姝︽眽"}); + add(new String[]{"婀栧寳鐪佹枃鑱斿鑸�", "姝︽眽"}); + add(new String[]{"婀栧寳鐜颁唬浜旈噾鐢靛櫒鍩�", "姝︽眽"}); + add(new String[]{"婀栧寳楗簵瀹胯垗", "姝︽眽"}); + add(new String[]{"婀栧寳淇濋櫓鍏徃瀹跺睘妤�", "姝︽眽"}); + add(new String[]{"婀栧寳鏋椾笟鍕樺療闄㈠皬鍖�", "姝︽眽"}); + add(new String[]{"婀栧寳浜ら�氳亴涓氭妧鏈闄㈠鑸�", "姝︽眽"}); + add(new String[]{"婀栧寳鐪佽壓鏈鏍″鑸�", "姝︽眽"}); + add(new String[]{"婀栧寳澶у帵", "鍘﹂棬"}); + add(new String[]{"婀栧寳璐ㄩ噺鐩戠潱灞�瀹胯垗", "姝︽眽"}); + add(new String[]{"婀栧寳鐪佸尰鑽洃鐫g鐞嗗眬瀹胯垗", "姝︽眽"}); + add(new String[]{"婀栧寳鏁欒偛鍑虹増绀惧鑸�", "姝︽眽"}); + add(new String[]{"婀栧寳鐪佽嵂鏉愬叕鍙稿鑸�", "姝︽眽"}); + add(new String[]{"婀栧寳浜屽笀瀹胯垗", "姝︽眽"}); + add(new String[]{"婀栧寳涓尰瀛﹂櫌瀹胯垗", "姝︽眽"}); + add(new String[]{"婀栧寳鐪佺敓娲昏祫鏂欏叕鍙稿眳姘戝皬鍖�", "姝︽眽"}); + add(new String[]{"婀栧寳鍟嗗姟骞垮満", "姝︽眽"}); + add(new String[]{"婀栧寳鏁欒偛瀛﹂櫌瀹胯垗", "姝︽眽"}); + add(new String[]{"婀栧寳鐪佺洃鐙辩鐞嗗眬瀹胯垗", "姝︽眽"}); + add(new String[]{"婀栧寳鐪佸畨鍏ㄧ洃瀵熷眬瀹胯垗", "姝︽眽"}); + }}); + city_DistrictNames.put("瀹滄槍", new ArrayList(){{ + add(new String[]{"瀹滄槍鍏瘬", "澶╂触"}); + add(new String[]{"瀹滄槍CBD涓績鍟嗗姟鍖�", "瀹滄槍"}); + add(new String[]{"瀹滄槍灏忓尯", "娌堥槼"}); + add(new String[]{"瀹滄槍閲�", "澶╂触"}); + add(new String[]{"瀹滄槍涓囪揪骞垮満", "瀹滄槍"}); + add(new String[]{"瀹滄槍鍟嗕笟姝ヨ琛楃传鏅跺煄", "瀹滄槍"}); + add(new String[]{"瀹滄槍鍟嗕笟姝ヨ琛�", "瀹滄槍"}); + add(new String[]{"瀹滄槍鑺卞洯浜屾湡", "鐝犳捣"}); + add(new String[]{"瀹滄槍鍗楅噷", "澶╂触"}); + add(new String[]{"瀹滄槍鍖楅噷", "澶╂触"}); + add(new String[]{"瀹滄槍棣ㄥ洯", "闈掑矝"}); + add(new String[]{"瀹滄槍瀹跺洯", "闈掑矝"}); + add(new String[]{"瀹滄槍鍗楅噷路濉樻步鍖�", "澶╂触"}); + add(new String[]{"瀹滄槍鍟嗕笟姝ヨ琛楀皬鍖�", "瀹滄槍"}); + }}); + city_DistrictNames.put("娴欐睙", new ArrayList(){{ + add(new String[]{"娴欐睙宸ヤ笟澶у鏁欏笀瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙澶у帵", "澶師"}); + add(new String[]{"娴欐睙鍔炰簨澶勫鑸�", "澶師"}); + add(new String[]{"娴欐睙浠佸拰灞呰�佸勾鍏荤敓鍏瘬", "婀栧窞"}); + add(new String[]{"娴欐睙浜よ繍澶у帵", "鏉窞"}); + add(new String[]{"娴欐睙宸ュ晢澶у瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙鍟嗚锤鍩�", "鍚堣偉"}); + add(new String[]{"娴欐睙宸ヤ笟澶у涔嬫睙瀛﹂櫌", "鏉窞"}); + }}); + city_DistrictNames.put("娓╁窞", new ArrayList(){{ + add(new String[]{"娓╁窞澶у帵", "娴峰彛"}); + add(new String[]{"娓╁窞鍩�", "璐甸槼"}); + add(new String[]{"娓╁窞鍏瘬", "璐甸槼"}); + add(new String[]{"娓╁窞鍟嗗煄", "婀栧窞"}); + add(new String[]{"娓╁窞鍟嗗煄", "鍞愬北"}); + add(new String[]{"娓╁窞涓栬锤涓績澶у帵", "娓╁窞"}); + add(new String[]{"娓╁窞涓栬锤涓績骞垮満", "娓╁窞"}); + add(new String[]{"娓╁窞浜烘墠澶у帵", "娓╁窞"}); + add(new String[]{"娓╁窞榫欐咕涓囪揪骞垮満", "娓╁窞"}); + add(new String[]{"娓╁窞鍩幝烽兘涔愭眹", "娌堥槼"}); + add(new String[]{"娓╁窞鍟嗗煄", "閲戝崕"}); + }}); + city_DistrictNames.put("涔愭竻", new ArrayList(){{ + add(new String[]{"涔愭竻灏忓尯", "娣卞湷"}); + add(new String[]{"涔愭竻路涓ぎ鍏", "涔愭竻"}); + add(new String[]{"涔愭竻璐㈠瘜鏂板ぉ鍦�", "涔愭竻"}); + add(new String[]{"涔愭竻闆佽崱灏忛晣", "涔愭竻"}); + add(new String[]{"涔愭竻鑺卞洯", "缁嶅叴"}); + add(new String[]{"涔愭竻闆佽崱灏忛晣", "娓╁窞"}); + add(new String[]{"涔愭竻路涓ぎ鍏", "娓╁窞"}); + add(new String[]{"涔愭竻璐㈠瘜鏂板ぉ鍦�", "娓╁窞"}); + }}); + city_DistrictNames.put("鍚夋灄", new ArrayList(){{ + add(new String[]{"鍚夋灄澶у帵", "娴峰彛"}); + add(new String[]{"鍚夋灄鑺卞洯", "璐甸槼"}); + add(new String[]{"鍚夋灄绀惧尯", "姝︽眽"}); + add(new String[]{"鍚夋灄鐪佸洟鏍″灞炴ゼ", "闀挎槬"}); + add(new String[]{"鍚夋灄閲�", "澶╂触"}); + }}); + city_DistrictNames.put("鍚夋灄", new ArrayList(){{ + add(new String[]{"鍚夋灄澶у帵", "娴峰彛"}); + add(new String[]{"鍚夋灄鑺卞洯", "璐甸槼"}); + add(new String[]{"鍚夋灄绀惧尯", "姝︽眽"}); + add(new String[]{"鍚夋灄鐪佸洟鏍″灞炴ゼ", "闀挎槬"}); + add(new String[]{"鍚夋灄閲�", "澶╂触"}); + }}); + city_DistrictNames.put("榛戦緳姹�", new ArrayList(){{ + }}); + city_DistrictNames.put("澶у簡", new ArrayList(){{ + add(new String[]{"澶у簡涓�鍖�", "濞佹捣"}); + add(new String[]{"澶у簡鏉戠煶娌瑰皬鍖�", "閲嶅簡"}); + add(new String[]{"澶у簡铚�鑻�", "鎴愰兘"}); + add(new String[]{"澶у簡閲�", "澶╂触"}); + add(new String[]{"澶у簡鏂版潙", "瀹佹尝"}); + add(new String[]{"澶у簡鏂版潙", "婀樻江"}); + add(new String[]{"澶у簡鏂版潙", "鐩愬煄"}); + }}); + city_DistrictNames.put("骞胯タ", new ArrayList(){{ + add(new String[]{"骞胯タ鐢佃鍙板鑸�", "鍗楀畞"}); + add(new String[]{"骞胯タ姘旇薄灞�鏂扮璺敓娲诲皬鍖�", "鍗楀畞"}); + add(new String[]{"骞胯タ鏈ㄦ潗鍏徃瀹胯垗", "鍗楀畞"}); + add(new String[]{"骞胯タ澹棌鑷不鍖哄徃娉曞巺瀹胯垗", "鍗楀畞"}); + add(new String[]{"骞胯タ鏂伴椈鍑虹増灞�鐢熸椿鍖�", "鍗楀畞"}); + add(new String[]{"骞胯タ鍑哄叆澧冩楠屾鐤眬瀹胯垗", "鍗楀畞"}); + add(new String[]{"骞胯タ鍗楀畞鐧芥矙澶ч亾楹荤汉鍘傚鑸�", "鍗楀畞"}); + add(new String[]{"骞胯タ鍖虹伯椋熷眬瀹胯垗", "鍗楀畞"}); + add(new String[]{"骞胯タ鐢电綉鍏徃鐢熸椿鍖�", "鍗楀畞"}); + add(new String[]{"骞胯タ瓒呭ぇ鍏徃瀹胯垗", "鍗楀畞"}); + add(new String[]{"骞胯タ鐢靛姏鏈夐檺鍏徃鐞呬笢鐢熸椿鍖�", "鍗楀畞"}); + add(new String[]{"骞胯タ浜屽缓涓�鍒嗗叕鍙稿鑸�", "鍗楀畞"}); + add(new String[]{"骞胯タ澹棌鑷不鍖哄啘涓氬巺瀹胯垗", "鍗楀畞"}); + add(new String[]{"骞胯タ浜屽缓瀹胯垗", "鍗楀畞"}); + add(new String[]{"骞胯タ涓�寤鸿亴宸ョ敓娲诲尯", "鍗楀畞"}); + add(new String[]{"骞胯タ鍖轰笣缁稿叕鍙稿鑸�", "鍗楀畞"}); + add(new String[]{"骞胯タ姘寸數宸ョ▼灞�绉戝洯鍩哄湴", "鍗楀畞"}); + add(new String[]{"骞胯タ鐢电綉鍏徃瀹胯垗", "鍗楀畞"}); + add(new String[]{"骞胯タ鍏缓鐢熸椿鍖�", "鍗楀畞"}); + add(new String[]{"骞胯タ閲嶉槼鑰佸勾鍏瘬", "鍗楀畞"}); + add(new String[]{"骞胯タ鍐滀笟鍘呭�间繚鎬荤珯瀹胯垗", "鍗楀畞"}); + add(new String[]{"骞胯タ鍦板嚡绉戞妧鍏徃瀹胯垗", "鍗楀畞"}); + add(new String[]{"骞胯タ鏈虹數璁惧鍏徃瀹胯垗", "鍗楀畞"}); + add(new String[]{"骞胯タ涓版灄鏋椾笟闆嗗洟", "鍗楀畞"}); + add(new String[]{"骞胯タ鑱氱闅嗙伅楗板箍鍦�", "鍗楀畞"}); + add(new String[]{"骞胯タ鍏存澶у帵", "鍗楀畞"}); + add(new String[]{"骞胯タ濂冲瓙鍔冲姩鏁欒偛鏀归�犲鑸�", "鍗楀畞"}); + add(new String[]{"骞胯タ鍑虹増鎬荤ぞ鍟嗕綇妤�", "鍗楀畞"}); + add(new String[]{"骞胯タ绗竴瀹夎鍏徃鐢熸椿鍖�", "鍗楀畞"}); + add(new String[]{"骞胯タ鍣ㄦ鍘傚鑸�", "鍗楀畞"}); + add(new String[]{"骞胯タ鏈烘杩涘嚭鍙e叕鍙稿鑸�", "鍗楀畞"}); + add(new String[]{"骞胯タ鍖烘。妗堝眬瀹胯垗", "鍗楀畞"}); + add(new String[]{"骞胯タ鍙戝睍澶у帵涓滄ゼ", "鍗楀畞"}); + add(new String[]{"骞胯タ鍐跺缓涓�鍏徃瀹胯垗", "鍗楀畞"}); + add(new String[]{"骞胯タ澶栬锤澶ч櫌灏忓尯", "娣卞湷"}); + add(new String[]{"骞胯タ鏃ユ姤绀惧鑸�", "鍗楀畞"}); + add(new String[]{"骞胯タ鍐滀笟鏈烘鐮旂┒闄�", "鍗楀畞"}); + add(new String[]{"骞胯タ鎷涚敓鑰冭瘯闄�", "鍗楀畞"}); + add(new String[]{"骞胯タ鍏藉尰澶ч櫌", "鍗楀畞"}); + add(new String[]{"骞胯タ鍗庡崡鐑归オ涓撲笟瀛︽牎瀹胯垗", "鍗楀畞"}); + add(new String[]{"骞胯タ鍗楀畞鍗楅鏈哄櫒鎬诲巶", "鍗楀畞"}); + add(new String[]{"骞胯タ鍖哄璁″巺瀹胯垗", "鍗楀畞"}); + add(new String[]{"骞胯タ鍗敓鍘呭崟浣嶆埧", "鍗楀畞"}); + add(new String[]{"骞胯タ鍙戝睍澶у帵", "鍗楀畞"}); + }}); + city_DistrictNames.put("鍗楀畞", new ArrayList(){{ + add(new String[]{"鍗楀畞濂ュ洯", "鍗楀畞"}); + add(new String[]{"鍗楀畞娴蜂簨灞�瀹胯垗", "鍗楀畞"}); + add(new String[]{"鍗楀畞甯傝敩鑿滅爺绌舵墍瀹胯垗", "鍗楀畞"}); + add(new String[]{"鍗楀畞甯傜數缃戝叕鍙稿鑸�", "鍗楀畞"}); + add(new String[]{"鍗楀畞甯傞噾铻嶅皬鍖�", "鍗楀畞"}); + add(new String[]{"鍗楀畞鍦板尯琛屾斂鍏讲琛¢槼鐢熸椿鍖�", "鍗楀畞"}); + add(new String[]{"鍗楀畞渚涚數灞�鐧芥矙鐢熸椿鍖�", "鍗楀畞"}); + add(new String[]{"鍗楀畞绗洓鑱屼笟涓", "鍗楀畞"}); + add(new String[]{"鍗楀畞閽堢粐鍘傚鑸�", "鍗楀畞"}); + add(new String[]{"鍗楀畞甯傛鑳跺巶瀹胯垗", "鍗楀畞"}); + add(new String[]{"鍗楀畞鐩戠嫳灞�瀹胯垗", "鍗楀畞"}); + add(new String[]{"鍗楀畞寤哄畞渚涚敤鐢靛伐绋嬪鑸�", "鍗楀畞"}); + add(new String[]{"鍗楀畞鑽疯姳鍛崇簿鍘傚鑸�", "鍗楀畞"}); + add(new String[]{"鍗楀畞閾濆巶瀹胯垗", "鍗楀畞"}); + add(new String[]{"鍗楀畞缁忔祹鎶�鏈悎浣滃叕鍙�", "鍗楀畞"}); + add(new String[]{"鍗楀畞鍒剁硸閫犵焊鍘�", "鍗楀畞"}); + add(new String[]{"鍗楀畞鎭掑ぇ缁挎床", "鍗楀畞"}); + add(new String[]{"鍗楀畞甯傞潰绮夊巶瀹胯垗", "鍗楀畞"}); + add(new String[]{"鍗楀畞甯傛暣娌绘湞闃虫邯绠$悊澶勫鑸�", "鍗楀畞"}); + add(new String[]{"鍗楀畞甯傛柊鐜悆姗辨煖骞垮満", "鍗楀畞"}); + add(new String[]{"鍗楀畞鏈烘鍘傚鑸嶏紙鍗楀尯锛�", "鍗楀畞"}); + add(new String[]{"鍗楀畞甯備簩寤哄叕鍙稿鑸�", "鍗楀畞"}); + add(new String[]{"鍗楀畞甯傝仛绉�鍥�", "鍗楀畞"}); + add(new String[]{"鍗楀畞浜岃交瀹胯垗", "鍗楀畞"}); + add(new String[]{"鍗楀畞杈规绔�", "鍗楀畞"}); + add(new String[]{"鍗楀畞鐢典俊澶фゼ", "鍗楀畞"}); + add(new String[]{"鍗楀畞閲嶅瀷鏈哄櫒鍘傜敓娲诲尯", "鍗楀畞"}); + add(new String[]{"鍗楀畞渚涚數灞�绁ュ璺敓娲诲尯", "鍗楀畞"}); + add(new String[]{"鍗楀畞鏉愭枡鍘�", "鍗楀畞"}); + add(new String[]{"鍗楀畞琚湇鍘傚鑸�", "鍗楀畞"}); + add(new String[]{"鍗楀畞甯傝嚜鏉ユ按鍏徃瀹胯垗", "鍗楀畞"}); + add(new String[]{"鍗楀畞鍢夊+鎽╂牴鍥介檯", "鍗楀畞"}); + add(new String[]{"鍗楀畞閾舵潐鐢电嚎鐢电紗灏忓尯", "鍗楀畞"}); + add(new String[]{"鍗楀畞甯傛満鐢靛叕鍙稿鑸�", "鍗楀畞"}); + add(new String[]{"鍗楀畞甯傜鐞嗗眬瀹胯垗", "鍗楀畞"}); + add(new String[]{"鍗楀畞甯傝嚜鏉ユ按鍏徃娌冲崡姘村巶瀹胯垗", "鍗楀畞"}); + add(new String[]{"鍗楀畞灏忓尯", "娌堥槼"}); + add(new String[]{"鍗楀畞棣ㄨ嫅", "娌堥槼"}); + add(new String[]{"鍗楀畞灏忓尯", "鎴愰兘"}); + add(new String[]{"鍗楀畞甯傚嫎娴嬮櫌鍖楁箹浣忓畢灏忓尯", "鍗楀畞"}); + add(new String[]{"鍗楀畞甯傛満鍏宠溅闃熷鑸�", "鍗楀畞"}); + add(new String[]{"鍗楀畞甯備緵鐢靛眬", "鍗楀畞"}); + add(new String[]{"鍗楀畞姣涚汉鍘傚鑸�", "鍗楀畞"}); + add(new String[]{"鍗楀畞鏃ユ姤绀惧崟浣嶅鑸嶅尯", "鍗楀畞"}); + add(new String[]{"鍗楀畞鑱屼笟鎶�鏈闄㈠洓鍒嗛櫌", "鍗楀畞"}); + add(new String[]{"鍗楀畞鍚夌帥鐗�", "鏇查潠"}); + add(new String[]{"鍗楀畞灏忓尯", "鏇查潠"}); + }}); + city_DistrictNames.put("骞夸笢", new ArrayList(){{ + add(new String[]{"骞夸笢澶栬锤骞垮満", "骞垮窞"}); + add(new String[]{"骞夸笢澶栬鑹烘湳瀛﹂櫌鏁欏笀瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢寤虹闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢鍙告硶璀﹀畼鑱屼笟瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐜繚澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍟嗕笟澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍖诲闄㈡暀甯堝鑸嶆ゼ", "涓滆帪"}); + add(new String[]{"骞夸笢鍥介檯澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佹妧鏈洃鐫e眬瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢宸ヤ笟澶у瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鏁欒偛瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪侀摱琛屽ぇ鍘�", "娣卞湷"}); + add(new String[]{"骞夸笢澶у帵", "澶╂触"}); + add(new String[]{"骞夸笢灞卞簞", "闀囨睙"}); + add(new String[]{"骞夸笢绾㈢浘澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鑽闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢闈掑勾骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鍩虹妤�", "娣卞湷"}); + add(new String[]{"骞夸笢鐪佺鎶�骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佸啘涓氱鐞嗗共閮ㄥ闄㈢ぞ鍖�", "骞垮窞"}); + add(new String[]{"骞夸笢鑺暰闆烽�告櫙", "浣涘北"}); + }}); + city_DistrictNames.put("姊呭窞", new ArrayList(){{ + add(new String[]{"姊呭窞澶у帵", "骞垮窞"}); + add(new String[]{"姊呭窞澶фゼ", "涓婃捣"}); + add(new String[]{"姊呭窞鏂版潙", "涓婃捣"}); + add(new String[]{"姊呭窞澶у帵", "娣卞湷"}); + }}); + city_DistrictNames.put("灞变笢", new ArrayList(){{ + add(new String[]{"灞变笢閲�", "绉︾殗宀�"}); + add(new String[]{"灞变笢缁忔祹瀛﹂櫌瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢鐪佸崼鐢熷巺瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢鐪佹皯鏀垮巺瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢鐪佸晢涓氶泦鍥㈡�诲叕鍙稿鑸�", "娴庡崡"}); + add(new String[]{"灞变笢鍖荤澶у鏁欏笀瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢澶栬锤澶у帵", "闈掑矝"}); + add(new String[]{"灞变笢澶у帵", "娣卞湷"}); + add(new String[]{"灞变笢鍫$ぞ鍖�", "娌堥槼"}); + add(new String[]{"灞变笢鑹烘湳瀛﹂櫌瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢榛勯噾宕簯婀栭珮灏斿か鍒", "娴庡崡"}); + add(new String[]{"灞变笢鍙告硶璀﹀畼瀛﹂櫌瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢鐪佺瀛﹂櫌楂樻柊鎶�鏈爺绌跺垎闄�", "闈掑矝"}); + add(new String[]{"灞变笢寤哄伐瀛﹂櫌瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢搴欏皬鍖�", "娌堥槼"}); + add(new String[]{"灞变笢涔冲北閾舵哗娴锋櫙鎴�", "濞佹捣"}); + add(new String[]{"灞变笢澶存潙", "闈掑矝"}); + add(new String[]{"灞变笢鐪佺暅鐗у眬瀹胯垗", "娴庡崡"}); + }}); + city_DistrictNames.put("涓滆惀", new ArrayList(){{ + add(new String[]{"涓滆惀閲�5鍙烽櫌", "鍖椾含"}); + add(new String[]{"涓滆惀閲�1鍙烽櫌", "鍖椾含"}); + add(new String[]{"涓滆惀閲�2鍙烽櫌", "鍖椾含"}); + add(new String[]{"涓滆惀閲�3鍙烽櫌", "鍖椾含"}); + add(new String[]{"涓滆惀閲�", "鍖椾含"}); + add(new String[]{"涓滆惀鎴垮皬鍖�", "鍖椾含"}); + add(new String[]{"涓滆惀鎴垮叓鏉�", "鍖椾含"}); + }}); + city_DistrictNames.put("鍥涘窛", new ArrayList(){{ + add(new String[]{"鍥涘窛鐪佺洿鏈哄叧宸ュ瀹胯垗", "鎴愰兘"}); + add(new String[]{"鍥涘窛鐪佹灄涓氬巺瀹胯垗", "鎴愰兘"}); + add(new String[]{"鍥涘窛闊充箰瀛﹂櫌瀹胯垗", "鎴愰兘"}); + add(new String[]{"鍥涘窛鐪侀椊涓競椹荤枂鍔炰簨澶勫皬鍖�", "涔岄瞾鏈ㄩ綈"}); + add(new String[]{"鍥涘窛澶у帵", "鍘﹂棬"}); + add(new String[]{"鍥涘窛鐪佺鎶�鍘呭鑸�", "鎴愰兘"}); + add(new String[]{"鍥涘窛涓撶敤姹借溅鍘傚鑸�", "鎴愰兘"}); + add(new String[]{"鍥涘窛鏃ユ姤瀹胯垗", "鎴愰兘"}); + add(new String[]{"鍥涘窛鑹烘湳鑱屼笟瀛﹂櫌瀹跺睘妤�", "鎴愰兘"}); + add(new String[]{"鍥涘窛钀ヨ儭鍚�", "鍖椾含"}); + add(new String[]{"鍥涘窛灏忓尯", "涓婃捣"}); + add(new String[]{"鍥涘窛骞煎笀瀹胯垗", "鎴愰兘"}); + add(new String[]{"鍥涘窛澶у鍐滄灄鏉�", "鎴愰兘"}); + }}); + city_DistrictNames.put("鑷础", new ArrayList(){{ + add(new String[]{"鑷础甯傚绾虫渤鐣�", "鑷础"}); + }}); + city_DistrictNames.put("婀栧寳", new ArrayList(){{ + add(new String[]{"婀栧寳灏忓尯", "鍖椾含"}); + add(new String[]{"婀栧寳瀹濅赴鑺卞洯", "娣卞湷"}); + add(new String[]{"婀栧寳缁忔祹瀛﹂櫌瀹胯垗", "姝︽眽"}); + add(new String[]{"婀栧寳澶у瀹胯垗", "姝︽眽"}); + add(new String[]{"婀栧寳鏃ユ姤瀹胯垗", "姝︽眽"}); + add(new String[]{"婀栧寳鐪佹枃鑱斿鑸�", "姝︽眽"}); + add(new String[]{"婀栧寳鐜颁唬浜旈噾鐢靛櫒鍩�", "姝︽眽"}); + add(new String[]{"婀栧寳楗簵瀹胯垗", "姝︽眽"}); + add(new String[]{"婀栧寳淇濋櫓鍏徃瀹跺睘妤�", "姝︽眽"}); + add(new String[]{"婀栧寳鏋椾笟鍕樺療闄㈠皬鍖�", "姝︽眽"}); + add(new String[]{"婀栧寳浜ら�氳亴涓氭妧鏈闄㈠鑸�", "姝︽眽"}); + add(new String[]{"婀栧寳鐪佽壓鏈鏍″鑸�", "姝︽眽"}); + add(new String[]{"婀栧寳澶у帵", "鍘﹂棬"}); + add(new String[]{"婀栧寳璐ㄩ噺鐩戠潱灞�瀹胯垗", "姝︽眽"}); + add(new String[]{"婀栧寳鐪佸尰鑽洃鐫g鐞嗗眬瀹胯垗", "姝︽眽"}); + add(new String[]{"婀栧寳鏁欒偛鍑虹増绀惧鑸�", "姝︽眽"}); + add(new String[]{"婀栧寳鐪佽嵂鏉愬叕鍙稿鑸�", "姝︽眽"}); + add(new String[]{"婀栧寳浜屽笀瀹胯垗", "姝︽眽"}); + add(new String[]{"婀栧寳涓尰瀛﹂櫌瀹胯垗", "姝︽眽"}); + add(new String[]{"婀栧寳鐪佺敓娲昏祫鏂欏叕鍙稿眳姘戝皬鍖�", "姝︽眽"}); + add(new String[]{"婀栧寳鍟嗗姟骞垮満", "姝︽眽"}); + add(new String[]{"婀栧寳鏁欒偛瀛﹂櫌瀹胯垗", "姝︽眽"}); + add(new String[]{"婀栧寳鐪佺洃鐙辩鐞嗗眬瀹胯垗", "姝︽眽"}); + add(new String[]{"婀栧寳鐪佸畨鍏ㄧ洃瀵熷眬瀹胯垗", "姝︽眽"}); + }}); + city_DistrictNames.put("姝︽眽", new ArrayList(){{ + add(new String[]{"姝︽眽绀惧尯", "澶ц繛"}); + add(new String[]{"姝︽眽灏忓鍗曚綅瀹胯垗", "姝︽眽"}); + add(new String[]{"姝︽眽涓涔﹂鑻�", "姝︽眽"}); + add(new String[]{"姝︽眽闆勬妤肩ぞ鍖�", "姝︽眽"}); + add(new String[]{"姝︽眽璇濆墽闄㈠鑸�", "姝︽眽"}); + add(new String[]{"姝︽眽妤氬墽鍥㈠鑸�", "姝︽眽"}); + add(new String[]{"姝︽眽鎭掑ぇ鍩�", "姝︽眽"}); + add(new String[]{"姝︽眽甯傚鍏氬瀹胯垗", "姝︽眽"}); + add(new String[]{"姝︽眽閾佸鍘傚鑸�", "姝︽眽"}); + add(new String[]{"姝︽眽澶у鐝炴鏁欏笀灏忓尯", "姝︽眽"}); + add(new String[]{"姝︽眽甯傝�佸共閮ㄥ鑸�", "姝︽眽"}); + add(new String[]{"姝︽眽姹夊墽闄㈠鑸�", "姝︽眽"}); + add(new String[]{"姝︽眽姹借溅閿佸巶瀹胯垗", "姝︽眽"}); + add(new String[]{"姝︽眽鍒惰嵂鍘傚皬鍖�", "姝︽眽"}); + add(new String[]{"姝︽眽绗竴鑱屾暀涓績鍏瘬", "姝︽眽"}); + add(new String[]{"姝︽眽甯傜涓�鎶�鏈鏍″鑸�", "姝︽眽"}); + add(new String[]{"姝︽眽骞垮満", "姝︽眽"}); + add(new String[]{"姝︽眽澶╁湴寰℃睙鑻�", "姝︽眽"}); + add(new String[]{"姝︽眽鍥涗腑灏忓尯", "姝︽眽"}); + add(new String[]{"姝︽眽澶у帵", "鍘﹂棬"}); + add(new String[]{"姝︽眽鏈哄簥鍘傚鑸�", "姝︽眽"}); + add(new String[]{"姝︽眽闀垮矝", "姝︽眽"}); + add(new String[]{"姝︽眽鍥戒俊鍩�", "姝︽眽"}); + add(new String[]{"姝︽眽鐢熺墿鐮旂┒鎵�瀹胯垗", "姝︽眽"}); + add(new String[]{"姝︽眽涓囬敠姹熷煄", "姝︽眽"}); + add(new String[]{"姝︽眽鏅氭姤瀹胯垗", "姝︽眽"}); + add(new String[]{"姝︽眽绉戞妧瀛﹂櫌闃冲厜鏍″尯瀹胯垗", "姝︽眽"}); + add(new String[]{"姝︽眽鍗氱墿棣嗗鑸�", "姝︽眽"}); + add(new String[]{"姝︽眽鍏畨灞�浜よ瀹胯垗", "姝︽眽"}); + add(new String[]{"姝︽眽鍓ч櫌鏉�", "姝︽眽"}); + add(new String[]{"姝︽眽绉戞妧瀛﹂櫌鏁欏笀灏忓尯", "姝︽眽"}); + add(new String[]{"姝︽眽宸ョ▼澶у鏁欏伐瀹胯垗", "姝︽眽"}); + add(new String[]{"姝︽眽缂濈韩鏈哄巶瀹胯垗", "姝︽眽"}); + add(new String[]{"姝︽眽浜ら�氬鏍″灞炲尯", "姝︽眽"}); + add(new String[]{"姝︽眽浜屽缓灏忓尯", "姝︽眽"}); + add(new String[]{"姝︽眽澶╂鼎宸ヤ笟鍥�", "姝︽眽"}); + add(new String[]{"姝︽眽鎭掍赴涓婃渤鍥�", "姝︽眽"}); + add(new String[]{"姝︽眽鍥介檯澶у帵", "姝︽眽"}); + add(new String[]{"姝︽眽鍥介檯浼氬睍涓績", "姝︽眽"}); + add(new String[]{"姝︽眽澶у瀹胯垗", "姝︽眽"}); + add(new String[]{"姝︽眽绉戞妧澶у鏁欏伐瀹胯垗", "姝︽眽"}); + add(new String[]{"姝︽眽绾虹粐澶у瀹胯垗", "姝︽眽"}); + add(new String[]{"姝︽眽鏁扮爜娓�", "姝︽眽"}); + add(new String[]{"姝︽眽鏂拌埅鍩庢槦鍩庤鍖�", "姝︽眽"}); + add(new String[]{"姝︽眽鏃朵唬骞垮満", "姝︽眽"}); + add(new String[]{"姝︽眽纰ф鍥埆澧�", "姝︽眽"}); + }}); + city_DistrictNames.put("娴欐睙", new ArrayList(){{ + add(new String[]{"娴欐睙宸ヤ笟澶у鏁欏笀瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙澶у帵", "澶師"}); + add(new String[]{"娴欐睙鍔炰簨澶勫鑸�", "澶師"}); + add(new String[]{"娴欐睙浠佸拰灞呰�佸勾鍏荤敓鍏瘬", "婀栧窞"}); + add(new String[]{"娴欐睙浜よ繍澶у帵", "鏉窞"}); + add(new String[]{"娴欐睙宸ュ晢澶у瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙鍟嗚锤鍩�", "鍚堣偉"}); + add(new String[]{"娴欐睙宸ヤ笟澶у涔嬫睙瀛﹂櫌", "鏉窞"}); + }}); + city_DistrictNames.put("琛㈠窞", new ArrayList(){{ + add(new String[]{"琛㈠窞鑺卞洯", "琛㈠窞"}); + add(new String[]{"琛㈠窞浜哄", "琛㈠窞"}); + add(new String[]{"琛㈠窞杩滄櫙鍩�", "琛㈠窞"}); + add(new String[]{"琛㈠窞路鍚涙偊涓滄柟", "琛㈠窞"}); + add(new String[]{"琛㈠窞骞垮満瑗胯嫅", "琛㈠窞"}); + }}); + city_DistrictNames.put("娌冲寳", new ArrayList(){{ + add(new String[]{"娌冲寳绋庡姟瀛︽牎鐢熸椿鍖�", "鐭冲搴�"}); + add(new String[]{"娌冲寳缁忔祹鏃ユ姤绀惧鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳缇庢湳鍑虹増绀惧鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳鐗╄祫瀹胯垗", "鐭冲搴�"}); + add(new String[]{"娌冲寳鍖栧伐鍖昏嵂鑱屼笟鎶�鏈闄㈠鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳鐢垫満瀹胯垗", "鐭冲搴�"}); + add(new String[]{"娌冲寳鏃ユ姤绀惧鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳宸ョ▼閫犱环绠$悊鎬荤珯瀹胯垗", "鐭冲搴�"}); + add(new String[]{"娌冲寳搴峰煄", "娼嶅潑"}); + add(new String[]{"娌冲寳绀惧尯", "娌堥槼"}); + add(new String[]{"娌冲寳鍖荤澶у瀹胯垗", "鐭冲搴�"}); + add(new String[]{"娌冲寳鐪佷汉澶у鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳鏂颁汉瀹�", "鍞愬北"}); + add(new String[]{"娌冲寳涓�鍙�", "鍞愬北"}); + add(new String[]{"娌冲寳鏈鸿灞�瀹胯垗", "鐭冲搴�"}); + add(new String[]{"娌冲寳骞挎挱鐢佃鎶ュ鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳鍟嗗煄", "闈掑矝"}); + add(new String[]{"娌冲寳闀垮煄楗簵", "鐭冲搴�"}); + add(new String[]{"娌冲寳鏉戝皬鍖�", "鍖椾含"}); + add(new String[]{"娌冲寳妗冩睙閲�", "澶╂触"}); + add(new String[]{"娌冲寳甯堝ぇ闈掑勾鍏瘬妤�", "鐭冲搴�"}); + add(new String[]{"娌冲寳缁�", "鏃犻敗"}); + add(new String[]{"娌冲寳绀惧尯", "鏈邯"}); + add(new String[]{"娌冲寳妤�", "鍞愬北"}); + }}); + city_DistrictNames.put("鐭冲搴�", new ArrayList(){{ + add(new String[]{"鐭冲搴勫ぇ瀛﹀鑸�", "鐭冲搴�"}); + add(new String[]{"鐭冲搴勭粡娴庡闄㈠鑸�", "鐭冲搴�"}); + add(new String[]{"鐭冲搴勬棩鎶ョぞ瀹胯垗", "鐭冲搴�"}); + add(new String[]{"鐭冲搴勯ギ椋熷叕鍙稿鑸�", "鐭冲搴�"}); + add(new String[]{"鐭冲搴勭偧娌瑰巶浜屽尯", "鐭冲搴�"}); + add(new String[]{"鐭冲搴勫闄㈠鑸�", "鐭冲搴�"}); + }}); + city_DistrictNames.put("姹熻タ", new ArrayList(){{ + add(new String[]{"姹熻タ鐪佸缓宸ラ泦鍥�", "鍗楁槍"}); + add(new String[]{"姹熻タ璐㈢粡澶у閭斂瀹胯垗", "鍗楁槍"}); + add(new String[]{"姹熻タ鐪佸浘涔﹂瀹胯垗", "鍗楁槍"}); + add(new String[]{"姹熻タ瀹鹃鏃佽竟", "鍗楁槍"}); + add(new String[]{"姹熻タ琛屾斂瀛﹂櫌瀹胯垗", "鍗楁槍"}); + add(new String[]{"姹熻タ璐㈢粡澶у瀹胯垗", "鍗楁槍"}); + add(new String[]{"姹熻タ绉戞妧甯堣寖瀛﹂櫌瀹胯垗", "鍗楁槍"}); + add(new String[]{"姹熻タ鐪佸箍鎾數鍙板鑸�", "鍗楁槍"}); + add(new String[]{"姹熻タ涓滃崕璁¢噺鐮旂┒鎵�瀹胯垗", "鍗楁槍"}); + add(new String[]{"姹熻タ瀹㈣溅鍘傚鑸�", "鍗楁槍"}); + add(new String[]{"姹熻タ浠櫒鍘傚鑸�", "鍗楁槍"}); + add(new String[]{"姹熻タ鏄屼笢姹借溅浜ゆ槗骞垮満", "鍗楁槍"}); + add(new String[]{"姹熻タ鏃ц揣澶т笘鐣�", "鍗楁槍"}); + add(new String[]{"姹熻タ鏃ユ姤瀹胯垗", "鍗楁槍"}); + }}); + city_DistrictNames.put("涔濇睙", new ArrayList(){{ + add(new String[]{"涔濇睙閲�", "澶╂触"}); + add(new String[]{"涔濇睙灏忓尯", "涓逛笢"}); + add(new String[]{"涔濇睙涓介兘", "涓逛笢"}); + add(new String[]{"涔濇睙鍏瘬", "涓逛笢"}); + }}); + city_DistrictNames.put("骞夸笢", new ArrayList(){{ + add(new String[]{"骞夸笢澶栬锤骞垮満", "骞垮窞"}); + add(new String[]{"骞夸笢澶栬鑹烘湳瀛﹂櫌鏁欏笀瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢寤虹闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢鍙告硶璀﹀畼鑱屼笟瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐜繚澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍟嗕笟澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍖诲闄㈡暀甯堝鑸嶆ゼ", "涓滆帪"}); + add(new String[]{"骞夸笢鍥介檯澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佹妧鏈洃鐫e眬瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢宸ヤ笟澶у瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鏁欒偛瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪侀摱琛屽ぇ鍘�", "娣卞湷"}); + add(new String[]{"骞夸笢澶у帵", "澶╂触"}); + add(new String[]{"骞夸笢灞卞簞", "闀囨睙"}); + add(new String[]{"骞夸笢绾㈢浘澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鑽闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢闈掑勾骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鍩虹妤�", "娣卞湷"}); + add(new String[]{"骞夸笢鐪佺鎶�骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佸啘涓氱鐞嗗共閮ㄥ闄㈢ぞ鍖�", "骞垮窞"}); + add(new String[]{"骞夸笢鑺暰闆烽�告櫙", "浣涘北"}); + }}); + city_DistrictNames.put("鎻槼", new ArrayList(){{ + add(new String[]{"鎻槼宀崡鏄庣彔浜屾湡", "鎻槼"}); + }}); + city_DistrictNames.put("鍖椾含", new ArrayList(){{ + add(new String[]{"鍖椾含GOLF鍏瘬", "鍖椾含"}); + add(new String[]{"鍖椾含姹�", "鍖椾含"}); + add(new String[]{"鍖椾含鑺卞洯", "鍖椾含"}); + add(new String[]{"鍖椾含VISA", "鍖椾含"}); + add(new String[]{"鍖椾含绉戞妧澶у瀹跺睘妤�", "鍖椾含"}); + add(new String[]{"鍖椾含ONE", "鍖椾含"}); + add(new String[]{"鍖椾含濂ユ灄鍖瑰厠鑺卞洯", "鍖椾含"}); + add(new String[]{"鍖椾含楂樺皵澶叕瀵�", "鍖椾含"}); + add(new String[]{"鍖椾含涓婅垗", "鍖椾含"}); + add(new String[]{"鍖椾含婀�", "鍖椾含"}); + add(new String[]{"鍖椾含鍗庝鲸鍩�", "鍖椾含"}); + add(new String[]{"鍖椾含闈掑勾鍩�", "鍖椾含"}); + add(new String[]{"鍖椾含浜哄", "鍖椾含"}); + add(new String[]{"鍖椾含鍗拌薄", "鍖椾含"}); + add(new String[]{"鍖椾含鐜懓鍥�", "鍖椾含"}); + add(new String[]{"鍖椾含闅忓洯鍏瘬", "鍖椾含"}); + add(new String[]{"鍖椾含灏婂簻", "鍖椾含"}); + add(new String[]{"鍖椾含澶槼鍩�", "鍖椾含"}); + add(new String[]{"鍖椾含澶у帵", "娴峰彛"}); + add(new String[]{"鍖椾含绗節鍖�", "寤婂潑"}); + add(new String[]{"鍖椾含鍏洯", "澶ц繛"}); + add(new String[]{"鍖椾含澶槼鍩庝笁鏈�", "鍖椾含"}); + add(new String[]{"鍖椾含鍗婂矝", "鍖椾含"}); + add(new String[]{"鍖椾含濂芥季", "鍖椾含"}); + add(new String[]{"鍖椾含鍖�", "鍖椾含"}); + add(new String[]{"鍖椾含鍏", "鍖椾含"}); + add(new String[]{"鍖椾含涔℃潙楂樺皵澶埆澧�", "鍖椾含"}); + add(new String[]{"鍖椾含鍐滃闄㈠灞為櫌", "鍖椾含"}); + add(new String[]{"鍖椾含骞挎挱瀛﹂櫌瀹跺睘闄�", "鍖椾含"}); + add(new String[]{"鍖椾含宸ュ晢澶у鑱屽伐瀹胯垗", "鍖椾含"}); + add(new String[]{"鍖椾含澶栧浗璇ぇ瀛﹀灞為櫌", "鍖椾含"}); + add(new String[]{"鍖椾含鐭虫补澶ч櫌瀹跺睘妤�", "鍖椾含"}); + add(new String[]{"鍖椾含鑸炶箞瀛﹂櫌灏忓尯", "鍖椾含"}); + add(new String[]{"鍖椾含鍩庡缓鐔欏煄", "閲嶅簡"}); + add(new String[]{"鍖椾含鍏", "淇濆畾"}); + add(new String[]{"鍖椾含鑺卞洯", "瀹滄槍"}); + add(new String[]{"鍖椾含鍩庤姳鍥皬鍖�", "涔岄瞾鏈ㄩ綈"}); + add(new String[]{"鍖椾含鍩�", "涔岄瞾鏈ㄩ綈"}); + add(new String[]{"鍖椾含閲戝北", "绂忓窞"}); + add(new String[]{"鍖椾含鍥介檯鑺卞洯娓╂硥鍒", "鍖椾含"}); + add(new String[]{"鍖椾含鍖楄景楂樼骇鑺卞洯鍒", "鍖椾含"}); + add(new String[]{"鍖椾含娓╂邯灞卞簞", "鍖椾含"}); + add(new String[]{"鍖椾含姘旇薄灞�瀹胯垗", "鍖椾含"}); + add(new String[]{"鍖椾含鍩庡缓路绛戝崕骞�", "鍖椾含"}); + add(new String[]{"鍖椾含閾舵嘲涓績", "鍖椾含"}); + add(new String[]{"鍖椾含榫欒剦娓╂硥鑺卞洯", "鍖椾含"}); + add(new String[]{"鍖椾含缁块兘婧愪腑蹇�", "鍖椾含"}); + add(new String[]{"鍖椾含棰愭硥姹�", "鍖椾含"}); + add(new String[]{"鍖椾含鑱斿悎澶у骞垮憡瀛﹂櫌鑰佸笀瀹胯垗妤�", "鍖椾含"}); + add(new String[]{"鍖椾含闀挎瘺缁掑巶瀹胯垗", "鍖椾含"}); + add(new String[]{"鍖椾含鍢夐噷涓績", "鍖椾含"}); + add(new String[]{"鍖椾含杈夌洓闃佸浗闄呭叕瀵�", "鍖椾含"}); + add(new String[]{"鍖椾含鐞嗘兂鍩�", "淇濆畾"}); + add(new String[]{"鍖椾含鍥介檯鑸┖淇变箰閮ㄥ埆澧�", "鍖椾含"}); + add(new String[]{"鍖椾含棣欓", "鍖椾含"}); + add(new String[]{"鍖椾含鍥介檯涓績", "鍖椾含"}); + add(new String[]{"鍖椾含澶槼鍩庝簩鏈熼噾鑹叉睜濉�", "鍖椾含"}); + add(new String[]{"鍖椾含鍗楃珯杞︾珯璺皬鍖�", "鍖椾含"}); + add(new String[]{"鍖椾含鏈烘宸ヤ笟瀛﹂櫌瀹胯垗", "鍖椾含"}); + add(new String[]{"鍖椾含绉戞妧浼氬睍涓績鍏瘬", "鍖椾含"}); + add(new String[]{"鍖椾含澶槼鍩庡埆澧�", "鍖椾含"}); + add(new String[]{"鍖椾含鍩庡缓榫欐ň婀�", "鎴愰兘"}); + add(new String[]{"鍖椾含鍏", "鍞愬北"}); + add(new String[]{"鍖椾含澹瑰彿鍏", "鍗楅��"}); + add(new String[]{"鍖椾含娲嬫埧", "鍖椾含"}); + add(new String[]{"鍖椾含鍩庡缓路涓栧崕娉婇儭", "鍖椾含"}); + add(new String[]{"鍖椾含鍥界珛绂忓埄鑰佸勾鍏瘬", "鍖椾含"}); + add(new String[]{"鍖椾含鍥涘涓栧", "鍖椾含"}); + add(new String[]{"鍖椾含鑰�杈夊浗闄呭煄", "鍖椾含"}); + add(new String[]{"鍖椾含INN", "鍖椾含"}); + add(new String[]{"鍖椾含鑻忔椿", "鍖椾含"}); + add(new String[]{"鍖椾含鍩庡缓路绾㈡湪鏋�", "鍖椾含"}); + add(new String[]{"鍖椾含鍩庡缓路N娆℃柟", "鍖椾含"}); + add(new String[]{"鍖椾含鏂板ぉ鍦�", "鍖椾含"}); + add(new String[]{"鍖椾含鍗庤锤鍩�", "鍖椾含"}); + add(new String[]{"鍖椾含澶忛兘婀�", "鍖椾含"}); + add(new String[]{"鍖椾含椋庢櫙", "鍖椾含"}); + add(new String[]{"鍖椾含绗節鍖�", "鍖椾含"}); + add(new String[]{"鍖椾含鏂伴偍", "涓婃捣"}); + add(new String[]{"鍖椾含澶у帵", "骞垮窞"}); + add(new String[]{"鍖椾含闈掓灉", "鍖椾含"}); + add(new String[]{"鍖椾含鏂圭硸", "鍖椾含"}); + add(new String[]{"鍖椾含鑷湪鍩�", "鍖椾含"}); + add(new String[]{"鍖椾含鍩庡缓榫欐ň婀�", "閲嶅簡"}); + }}); + city_DistrictNames.put("骞夸笢", new ArrayList(){{ + add(new String[]{"骞夸笢澶栬锤骞垮満", "骞垮窞"}); + add(new String[]{"骞夸笢澶栬鑹烘湳瀛﹂櫌鏁欏笀瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢寤虹闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢鍙告硶璀﹀畼鑱屼笟瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐜繚澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍟嗕笟澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍖诲闄㈡暀甯堝鑸嶆ゼ", "涓滆帪"}); + add(new String[]{"骞夸笢鍥介檯澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佹妧鏈洃鐫e眬瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢宸ヤ笟澶у瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鏁欒偛瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪侀摱琛屽ぇ鍘�", "娣卞湷"}); + add(new String[]{"骞夸笢澶у帵", "澶╂触"}); + add(new String[]{"骞夸笢灞卞簞", "闀囨睙"}); + add(new String[]{"骞夸笢绾㈢浘澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鑽闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢闈掑勾骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鍩虹妤�", "娣卞湷"}); + add(new String[]{"骞夸笢鐪佺鎶�骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佸啘涓氱鐞嗗共閮ㄥ闄㈢ぞ鍖�", "骞垮窞"}); + add(new String[]{"骞夸笢鑺暰闆烽�告櫙", "浣涘北"}); + }}); + city_DistrictNames.put("姹熼棬", new ArrayList(){{ + add(new String[]{"姹熼棬濂ュ洯", "姹熼棬"}); + add(new String[]{"姹熼棬閮藉競璞涵", "姹熼棬"}); + add(new String[]{"姹熼棬鍢夋偊鍚嶉兘", "姹熼棬"}); + add(new String[]{"姹熼棬閲�", "澶╂触"}); + }}); + city_DistrictNames.put("浜戝崡", new ArrayList(){{ + add(new String[]{"浜戝崡澶у帵", "骞垮窞"}); + add(new String[]{"浜戝崡鐪佹潅鎶�鍥㈠灞為櫌", "鏄嗘槑"}); + add(new String[]{"浜戝崡鍗庝鲸鍩�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鑹烘湳瀹跺洯鍖�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鍐滀笟澶у鏁欏伐浣忓畢鍖�", "鏄嗘槑"}); + add(new String[]{"浜戝崡璐㈢粡澶у浣忓畢", "鏄嗘槑"}); + add(new String[]{"浜戝崡澶у榫欐硥璺皬鍖�", "鏄嗘槑"}); + add(new String[]{"浜戝崡宸ヤ笟鑱屼笟鎶�鏈闄�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鍗拌薄鍩�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鏄犺薄", "鏄嗘槑"}); + add(new String[]{"浜戝崡鐪佺暅鐗у眬瀹胯垗", "鏄嗘槑"}); + add(new String[]{"浜戝崡鐪佸缓绛戞潗鏂欏鐮旂┒璁捐闄�", "鏄嗘槑"}); + add(new String[]{"浜戝崡娴嬬粯宸ョ▼闄�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鐪佺涓�杞诲伐鏈烘鍘�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鏃ユ姤绀惧崟浣嶆埧", "鏄嗘槑"}); + add(new String[]{"浜戝崡鐧借嵂鍘傚崟浣嶇鍒╂埧", "鏄嗘槑"}); + add(new String[]{"浜戝崡澶у涓滀簩闄�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鐪佸鍏氭牎鐢熸椿鍖�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鍗拌薄鍩庡埆澧�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鐧借嵂绂忓埄鎴�", "鏄嗘槑"}); + }}); + city_DistrictNames.put("澶х悊鐧芥棌鑷不宸�", new ArrayList(){{ + }}); + city_DistrictNames.put("澶х悊", new ArrayList(){{ + add(new String[]{"澶х悊灏忓尯", "璐甸槼"}); + add(new String[]{"澶х悊灏忓尯17缁勫洟", "璐甸槼"}); + add(new String[]{"澶х悊鎰熼�氬埆澧�", "鏄嗘槑"}); + add(new String[]{"澶х悊瑙傞煶濉樼櫧鏃忔皯灞�", "澶х悊"}); + add(new String[]{"澶х悊宸炵幆绉戦櫌瀹胯垗", "澶х悊"}); + add(new String[]{"澶х悊鍙ゅ煄缁跨帀灏忓尯", "澶х悊"}); + add(new String[]{"澶х悊鍏", "澶х悊"}); + add(new String[]{"澶х悊鏄ュぉ骞垮満", "鏄嗘槑"}); + add(new String[]{"澶х悊閲戞腐", "鏄嗘槑"}); + add(new String[]{"澶х悊瀛﹀簻鍟嗗", "鏄嗘槑"}); + add(new String[]{"澶х悊绾㈤緳浜�", "鏄嗘槑"}); + add(new String[]{"澶х悊鍗楀浗鍩�", "鏄嗘槑"}); + add(new String[]{"澶х悊娲辨捣鍥介檯鐢熸�佸煄", "澶х悊"}); + }}); + city_DistrictNames.put("浜戝崡", new ArrayList(){{ + add(new String[]{"浜戝崡澶у帵", "骞垮窞"}); + add(new String[]{"浜戝崡鐪佹潅鎶�鍥㈠灞為櫌", "鏄嗘槑"}); + add(new String[]{"浜戝崡鍗庝鲸鍩�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鑹烘湳瀹跺洯鍖�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鍐滀笟澶у鏁欏伐浣忓畢鍖�", "鏄嗘槑"}); + add(new String[]{"浜戝崡璐㈢粡澶у浣忓畢", "鏄嗘槑"}); + add(new String[]{"浜戝崡澶у榫欐硥璺皬鍖�", "鏄嗘槑"}); + add(new String[]{"浜戝崡宸ヤ笟鑱屼笟鎶�鏈闄�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鍗拌薄鍩�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鏄犺薄", "鏄嗘槑"}); + add(new String[]{"浜戝崡鐪佺暅鐗у眬瀹胯垗", "鏄嗘槑"}); + add(new String[]{"浜戝崡鐪佸缓绛戞潗鏂欏鐮旂┒璁捐闄�", "鏄嗘槑"}); + add(new String[]{"浜戝崡娴嬬粯宸ョ▼闄�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鐪佺涓�杞诲伐鏈烘鍘�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鏃ユ姤绀惧崟浣嶆埧", "鏄嗘槑"}); + add(new String[]{"浜戝崡鐧借嵂鍘傚崟浣嶇鍒╂埧", "鏄嗘槑"}); + add(new String[]{"浜戝崡澶у涓滀簩闄�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鐪佸鍏氭牎鐢熸椿鍖�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鍗拌薄鍩庡埆澧�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鐧借嵂绂忓埄鎴�", "鏄嗘槑"}); + }}); + city_DistrictNames.put("鏄嗘槑", new ArrayList(){{ + add(new String[]{"鏄嗘槑鑺卞洯椤圭洰", "瑗垮畨"}); + add(new String[]{"鏄嗘槑绀惧尯", "澶ц繛"}); + add(new String[]{"鏄嗘槑婀栬姳鍥埆澧�", "鍖椾含"}); + add(new String[]{"鏄嗘槑鍏瘬", "澶╂触"}); + add(new String[]{"鏄嗘槑闆呭眳", "娌堥槼"}); + add(new String[]{"鏄嗘槑鑺卞洯", "澶ц繛"}); + add(new String[]{"鏄嗘槑澶у帵鏄ヨ嫅", "瑗垮畨"}); + add(new String[]{"鏄嗘槑澶╂箹宀涙俯娉夋梾娓告浮鍋囨潙閰掑簵", "鏄嗘槑"}); + add(new String[]{"鏄嗘槑鍖栨补鍣ㄥ巶", "鏄嗘槑"}); + add(new String[]{"鏄嗘槑鍗风儫鍘傜敯鍧濆尯", "鏄嗘槑"}); + add(new String[]{"鏄嗘槑鍖诲闄㈣亴宸ユゼ", "鏄嗘槑"}); + add(new String[]{"鏄嗘槑澶у瑗夸簩闄�", "鏄嗘槑"}); + add(new String[]{"鏄嗘槑浜哄", "鏄嗘槑"}); + add(new String[]{"鏄嗘槑鍌插煄", "鏄嗘槑"}); + add(new String[]{"鏄嗘槑灏忓尯", "涓婃捣"}); + add(new String[]{"鏄嗘槑鍏瘬", "涓婃捣"}); + add(new String[]{"鏄嗘槑鐜夊櫒鍩庣俊缈犺姳鍥�", "鏄嗘槑"}); + add(new String[]{"鏄嗘槑鏈哄簥鍘�", "鏄嗘槑"}); + add(new String[]{"鏄嗘槑妗f灞�", "鏄嗘槑"}); + add(new String[]{"鏄嗘槑姘存偿鍘�", "鏄嗘槑"}); + add(new String[]{"鏄嗘槑鏃ユ姤绀惧崟浣嶇鍒╂埧", "鏄嗘槑"}); + add(new String[]{"鏄嗘槑鐏叿鎬诲巶", "鏄嗘槑"}); + add(new String[]{"鏄嗘槑鏈哄簥鍘傚鑸�", "鏄嗘槑"}); + }}); + city_DistrictNames.put("骞夸笢", new ArrayList(){{ + add(new String[]{"骞夸笢澶栬锤骞垮満", "骞垮窞"}); + add(new String[]{"骞夸笢澶栬鑹烘湳瀛﹂櫌鏁欏笀瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢寤虹闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢鍙告硶璀﹀畼鑱屼笟瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐜繚澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍟嗕笟澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍖诲闄㈡暀甯堝鑸嶆ゼ", "涓滆帪"}); + add(new String[]{"骞夸笢鍥介檯澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佹妧鏈洃鐫e眬瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢宸ヤ笟澶у瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鏁欒偛瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪侀摱琛屽ぇ鍘�", "娣卞湷"}); + add(new String[]{"骞夸笢澶у帵", "澶╂触"}); + add(new String[]{"骞夸笢灞卞簞", "闀囨睙"}); + add(new String[]{"骞夸笢绾㈢浘澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鑽闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢闈掑勾骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鍩虹妤�", "娣卞湷"}); + add(new String[]{"骞夸笢鐪佺鎶�骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佸啘涓氱鐞嗗共閮ㄥ闄㈢ぞ鍖�", "骞垮窞"}); + add(new String[]{"骞夸笢鑺暰闆烽�告櫙", "浣涘北"}); + }}); + city_DistrictNames.put("浜戞诞", new ArrayList(){{ + add(new String[]{"浜戞诞纰ф鍥�", "鑲囧簡"}); + add(new String[]{"浜戞诞鎭掑ぇ鍩�", "浜戞诞"}); + }}); + city_DistrictNames.put("娴欐睙", new ArrayList(){{ + add(new String[]{"娴欐睙宸ヤ笟澶у鏁欏笀瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙澶у帵", "澶師"}); + add(new String[]{"娴欐睙鍔炰簨澶勫鑸�", "澶師"}); + add(new String[]{"娴欐睙浠佸拰灞呰�佸勾鍏荤敓鍏瘬", "婀栧窞"}); + add(new String[]{"娴欐睙浜よ繍澶у帵", "鏉窞"}); + add(new String[]{"娴欐睙宸ュ晢澶у瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙鍟嗚锤鍩�", "鍚堣偉"}); + add(new String[]{"娴欐睙宸ヤ笟澶у涔嬫睙瀛﹂櫌", "鏉窞"}); + }}); + city_DistrictNames.put("瀹佹尝", new ArrayList(){{ + add(new String[]{"瀹佹尝閲�", "澶╂触"}); + add(new String[]{"瀹佹尝閲�", "姝︽眽"}); + add(new String[]{"瀹佹尝鍟嗕細澶у帵", "瀹佹尝"}); + add(new String[]{"瀹佹尝澶栦唬澶у帵", "瀹佹尝"}); + add(new String[]{"瀹佹尝灏忓尯", "涓婃捣"}); + }}); + city_DistrictNames.put("浣欏", new ArrayList(){{ + add(new String[]{"浣欏娉板拰瀹跺洯", "瀹佹尝"}); + add(new String[]{"浣欏灏忓尯", "涓婃捣"}); + add(new String[]{"浣欏娉板拰瀹跺洯", "浣欏"}); + }}); + city_DistrictNames.put("骞夸笢", new ArrayList(){{ + add(new String[]{"骞夸笢澶栬锤骞垮満", "骞垮窞"}); + add(new String[]{"骞夸笢澶栬鑹烘湳瀛﹂櫌鏁欏笀瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢寤虹闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢鍙告硶璀﹀畼鑱屼笟瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐜繚澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍟嗕笟澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍖诲闄㈡暀甯堝鑸嶆ゼ", "涓滆帪"}); + add(new String[]{"骞夸笢鍥介檯澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佹妧鏈洃鐫e眬瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢宸ヤ笟澶у瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鏁欒偛瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪侀摱琛屽ぇ鍘�", "娣卞湷"}); + add(new String[]{"骞夸笢澶у帵", "澶╂触"}); + add(new String[]{"骞夸笢灞卞簞", "闀囨睙"}); + add(new String[]{"骞夸笢绾㈢浘澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鑽闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢闈掑勾骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鍩虹妤�", "娣卞湷"}); + add(new String[]{"骞夸笢鐪佺鎶�骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佸啘涓氱鐞嗗共閮ㄥ闄㈢ぞ鍖�", "骞垮窞"}); + add(new String[]{"骞夸笢鑺暰闆烽�告櫙", "浣涘北"}); + }}); + city_DistrictNames.put("娣卞湷", new ArrayList(){{ + add(new String[]{"娣卞湷婀剧晹鑺卞洯", "娣卞湷"}); + add(new String[]{"娣卞湷鑺卞洯", "鍚夋灄"}); + add(new String[]{"娣卞湷鑺卞洯", "鍚堣偉"}); + add(new String[]{"娣卞湷婀捐姳鍥�", "娣卞湷"}); + add(new String[]{"娣卞湷婀�1鍙�", "娣卞湷"}); + add(new String[]{"娣卞湷楂樺皵澶埆澧�", "娣卞湷"}); + add(new String[]{"娣卞湷宸ヤ笟鍥�", "瑗勯槼"}); + add(new String[]{"娣卞湷鍗拌薄", "瑗垮畞"}); + add(new String[]{"娣卞湷鍚涗复澶╀笅", "娣卞湷"}); + add(new String[]{"娣卞湷鎴垮湴浜уぇ鍘�", "娣卞湷"}); + add(new String[]{"娣卞湷鐢靛瓙鎶�鏈鏍′綇瀹�", "娣卞湷"}); + add(new String[]{"娣卞湷鍙戝睍閾惰瀹胯垗", "娣卞湷"}); + add(new String[]{"娣卞湷鏉ョ澹箍鍦�", "娣卞湷"}); + add(new String[]{"娣卞湷鍩庡競鏄ュぉ椤圭洰", "娣卞湷"}); + }}); + city_DistrictNames.put("骞夸笢", new ArrayList(){{ + add(new String[]{"骞夸笢澶栬锤骞垮満", "骞垮窞"}); + add(new String[]{"骞夸笢澶栬鑹烘湳瀛﹂櫌鏁欏笀瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢寤虹闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢鍙告硶璀﹀畼鑱屼笟瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐜繚澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍟嗕笟澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍖诲闄㈡暀甯堝鑸嶆ゼ", "涓滆帪"}); + add(new String[]{"骞夸笢鍥介檯澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佹妧鏈洃鐫e眬瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢宸ヤ笟澶у瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鏁欒偛瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪侀摱琛屽ぇ鍘�", "娣卞湷"}); + add(new String[]{"骞夸笢澶у帵", "澶╂触"}); + add(new String[]{"骞夸笢灞卞簞", "闀囨睙"}); + add(new String[]{"骞夸笢绾㈢浘澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鑽闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢闈掑勾骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鍩虹妤�", "娣卞湷"}); + add(new String[]{"骞夸笢鐪佺鎶�骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佸啘涓氱鐞嗗共閮ㄥ闄㈢ぞ鍖�", "骞垮窞"}); + add(new String[]{"骞夸笢鑺暰闆烽�告櫙", "浣涘北"}); + }}); + city_DistrictNames.put("鎯犲窞", new ArrayList(){{ + add(new String[]{"鎯犲窞鏄熸渤涓瑰牑", "鎯犲窞"}); + add(new String[]{"鎯犲窞閲�", "澶╂触"}); + add(new String[]{"鎯犲窞娴蜂鸡鍫�", "鎯犲窞"}); + add(new String[]{"鎯犲窞鏄熸渤涓瑰牑鍒", "鎯犲窞"}); + add(new String[]{"鎯犲窞鍑偊鍗庡涵", "鎯犲窞"}); + add(new String[]{"鎯犲窞鏄熸渤涓瑰牑鍒", "娣卞湷"}); + add(new String[]{"鎯犲窞钃濇咕鍗婂矝", "鎯犲窞"}); + }}); + city_DistrictNames.put("娌冲寳", new ArrayList(){{ + add(new String[]{"娌冲寳绋庡姟瀛︽牎鐢熸椿鍖�", "鐭冲搴�"}); + add(new String[]{"娌冲寳缁忔祹鏃ユ姤绀惧鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳缇庢湳鍑虹増绀惧鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳鐗╄祫瀹胯垗", "鐭冲搴�"}); + add(new String[]{"娌冲寳鍖栧伐鍖昏嵂鑱屼笟鎶�鏈闄㈠鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳鐢垫満瀹胯垗", "鐭冲搴�"}); + add(new String[]{"娌冲寳鏃ユ姤绀惧鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳宸ョ▼閫犱环绠$悊鎬荤珯瀹胯垗", "鐭冲搴�"}); + add(new String[]{"娌冲寳搴峰煄", "娼嶅潑"}); + add(new String[]{"娌冲寳绀惧尯", "娌堥槼"}); + add(new String[]{"娌冲寳鍖荤澶у瀹胯垗", "鐭冲搴�"}); + add(new String[]{"娌冲寳鐪佷汉澶у鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳鏂颁汉瀹�", "鍞愬北"}); + add(new String[]{"娌冲寳涓�鍙�", "鍞愬北"}); + add(new String[]{"娌冲寳鏈鸿灞�瀹胯垗", "鐭冲搴�"}); + add(new String[]{"娌冲寳骞挎挱鐢佃鎶ュ鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳鍟嗗煄", "闈掑矝"}); + add(new String[]{"娌冲寳闀垮煄楗簵", "鐭冲搴�"}); + add(new String[]{"娌冲寳鏉戝皬鍖�", "鍖椾含"}); + add(new String[]{"娌冲寳妗冩睙閲�", "澶╂触"}); + add(new String[]{"娌冲寳甯堝ぇ闈掑勾鍏瘬妤�", "鐭冲搴�"}); + add(new String[]{"娌冲寳缁�", "鏃犻敗"}); + add(new String[]{"娌冲寳绀惧尯", "鏈邯"}); + add(new String[]{"娌冲寳妤�", "鍞愬北"}); + }}); + city_DistrictNames.put("淇濆畾", new ArrayList(){{ + add(new String[]{"淇濆畾閲�", "澶╂触"}); + add(new String[]{"淇濆畾鏂版潙", "绂忓窞"}); + add(new String[]{"淇濆畾灏忓尯", "绂忓窞"}); + }}); + city_DistrictNames.put("浜戝崡", new ArrayList(){{ + add(new String[]{"浜戝崡澶у帵", "骞垮窞"}); + add(new String[]{"浜戝崡鐪佹潅鎶�鍥㈠灞為櫌", "鏄嗘槑"}); + add(new String[]{"浜戝崡鍗庝鲸鍩�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鑹烘湳瀹跺洯鍖�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鍐滀笟澶у鏁欏伐浣忓畢鍖�", "鏄嗘槑"}); + add(new String[]{"浜戝崡璐㈢粡澶у浣忓畢", "鏄嗘槑"}); + add(new String[]{"浜戝崡澶у榫欐硥璺皬鍖�", "鏄嗘槑"}); + add(new String[]{"浜戝崡宸ヤ笟鑱屼笟鎶�鏈闄�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鍗拌薄鍩�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鏄犺薄", "鏄嗘槑"}); + add(new String[]{"浜戝崡鐪佺暅鐗у眬瀹胯垗", "鏄嗘槑"}); + add(new String[]{"浜戝崡鐪佸缓绛戞潗鏂欏鐮旂┒璁捐闄�", "鏄嗘槑"}); + add(new String[]{"浜戝崡娴嬬粯宸ョ▼闄�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鐪佺涓�杞诲伐鏈烘鍘�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鏃ユ姤绀惧崟浣嶆埧", "鏄嗘槑"}); + add(new String[]{"浜戝崡鐧借嵂鍘傚崟浣嶇鍒╂埧", "鏄嗘槑"}); + add(new String[]{"浜戝崡澶у涓滀簩闄�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鐪佸鍏氭牎鐢熸椿鍖�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鍗拌薄鍩庡埆澧�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鐧借嵂绂忓埄鎴�", "鏄嗘槑"}); + }}); + city_DistrictNames.put("鏇查潠", new ArrayList(){{ + add(new String[]{"鏇查潠渚涚數灞�涓�鐢熸椿鍖�", "鏇查潠"}); + add(new String[]{"鏇查潠鍦e涵鑺卞洯", "鏇查潠"}); + add(new String[]{"鏇查潠宸ヨ搴锋ˉ鐢熸椿鍖�", "鏇查潠"}); + add(new String[]{"鏇查潠閮藉競鍗拌薄", "鏇查潠"}); + add(new String[]{"鏇查潠甯傛按鍔″皬鍖�", "鏇查潠"}); + }}); + city_DistrictNames.put("娌冲崡", new ArrayList(){{ + add(new String[]{"娌冲崡搴勫皬鍖�", "闈掑矝"}); + add(new String[]{"娌冲崡璐笓瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡鐪佹柊鍗庝功搴楀灞為櫌", "閮戝窞"}); + add(new String[]{"娌冲崡鐪佸晢涓氱瀛︾爺绌舵墍瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡鐪佹棩鎶ョぞ瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡濂冲瓙楂樹腑瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡澶栬锤澶ч櫌", "娣卞湷"}); + add(new String[]{"娌冲崡閲�", "澶╂触"}); + add(new String[]{"娌冲崡鏂版潙", "绂忓窞"}); + add(new String[]{"娌冲崡璐㈢粡瀛﹂櫌瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡宀稿叕鍥皬鍖�", "鎯犲窞"}); + add(new String[]{"娌冲崡宀告柊鏉�", "鎯犲窞"}); + add(new String[]{"娌冲崡鏉�", "鍖椾含"}); + add(new String[]{"娌冲崡鐞嗗伐瀛︽牎瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡鐪佷汉浜嬪巺瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡宀镐腑蹇冨皬鍖�", "鎯犲窞"}); + add(new String[]{"娌冲崡鐪佸璐稿鏍″灞為櫌", "閮戝窞"}); + add(new String[]{"娌冲崡鏉�", "涓婃捣"}); + add(new String[]{"娌冲崡鏂版潙", "涓婃捣"}); + add(new String[]{"娌冲崡宸ヤ笟澶у瀹跺睘闄�", "閮戝窞"}); + }}); + city_DistrictNames.put("瀹夐槼", new ArrayList(){{ + add(new String[]{"瀹夐槼鑺辫嫅", "甯稿窞"}); + add(new String[]{"瀹夐槼閲�", "澶╂触"}); + add(new String[]{"瀹夐槼灏忓尯", "澶ц繛"}); + add(new String[]{"瀹夐槼灏忓尯", "涓婃捣"}); + }}); + city_DistrictNames.put("骞夸笢", new ArrayList(){{ + add(new String[]{"骞夸笢澶栬锤骞垮満", "骞垮窞"}); + add(new String[]{"骞夸笢澶栬鑹烘湳瀛﹂櫌鏁欏笀瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢寤虹闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢鍙告硶璀﹀畼鑱屼笟瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐜繚澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍟嗕笟澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍖诲闄㈡暀甯堝鑸嶆ゼ", "涓滆帪"}); + add(new String[]{"骞夸笢鍥介檯澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佹妧鏈洃鐫e眬瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢宸ヤ笟澶у瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鏁欒偛瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪侀摱琛屽ぇ鍘�", "娣卞湷"}); + add(new String[]{"骞夸笢澶у帵", "澶╂触"}); + add(new String[]{"骞夸笢灞卞簞", "闀囨睙"}); + add(new String[]{"骞夸笢绾㈢浘澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鑽闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢闈掑勾骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鍩虹妤�", "娣卞湷"}); + add(new String[]{"骞夸笢鐪佺鎶�骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佸啘涓氱鐞嗗共閮ㄥ闄㈢ぞ鍖�", "骞垮窞"}); + add(new String[]{"骞夸笢鑺暰闆烽�告櫙", "浣涘北"}); + }}); + city_DistrictNames.put("浣涘北", new ArrayList(){{ + add(new String[]{"浣涘北濂ュ洯鍑尩鑻�", "浣涘北"}); + add(new String[]{"浣涘北濂ュ洯鐏忔櫙宄�", "浣涘北"}); + add(new String[]{"浣涘北闆呭眳涔�", "浣涘北"}); + add(new String[]{"浣涘北闆呭眳涔愯姳鍥�", "浣涘北"}); + add(new String[]{"浣涘北濂ュ洯鍑棆婀�", "浣涘北"}); + add(new String[]{"浣涘北閲�", "澶╂触"}); + add(new String[]{"浣涘北鑻�", "娴庡崡"}); + add(new String[]{"浣涘北濂ュ洯", "浣涘北"}); + add(new String[]{"浣涘北鍔涜繀涓婄瓚", "浣涘北"}); + add(new String[]{"浣涘北澶у鏁欏笀浣忓畢", "浣涘北"}); + add(new String[]{"浣涘北濂ュ洯濞佸凹姘村哺", "浣涘北"}); + add(new String[]{"浣涘北濂ュ洯缇庢灄姘村哺", "浣涘北"}); + add(new String[]{"浣涘北濂ュ洯璐濇矙杞�", "浣涘北"}); + add(new String[]{"浣涘北濂ュ洯缇庢灄姘村哺", "椤哄痉"}); + add(new String[]{"浣涘北濂ュ洯鐏忔櫙宄�", "椤哄痉"}); + add(new String[]{"浣涘北濂ュ洯", "椤哄痉"}); + add(new String[]{"浣涘北濂ュ洯鍑尩鑻�", "椤哄痉"}); + add(new String[]{"浣涘北濂ュ洯璐濇矙杞�", "椤哄痉"}); + add(new String[]{"浣涘北涓囩骞垮満", "浣涘北"}); + add(new String[]{"浣涘北涓囩鍩�", "浣涘北"}); + add(new String[]{"浣涘北闆呭眳涔愯姳鍥埆澧�", "浣涘北"}); + }}); + city_DistrictNames.put("鍥涘窛", new ArrayList(){{ + add(new String[]{"鍥涘窛鐪佺洿鏈哄叧宸ュ瀹胯垗", "鎴愰兘"}); + add(new String[]{"鍥涘窛鐪佹灄涓氬巺瀹胯垗", "鎴愰兘"}); + add(new String[]{"鍥涘窛闊充箰瀛﹂櫌瀹胯垗", "鎴愰兘"}); + add(new String[]{"鍥涘窛鐪侀椊涓競椹荤枂鍔炰簨澶勫皬鍖�", "涔岄瞾鏈ㄩ綈"}); + add(new String[]{"鍥涘窛澶у帵", "鍘﹂棬"}); + add(new String[]{"鍥涘窛鐪佺鎶�鍘呭鑸�", "鎴愰兘"}); + add(new String[]{"鍥涘窛涓撶敤姹借溅鍘傚鑸�", "鎴愰兘"}); + add(new String[]{"鍥涘窛鏃ユ姤瀹胯垗", "鎴愰兘"}); + add(new String[]{"鍥涘窛鑹烘湳鑱屼笟瀛﹂櫌瀹跺睘妤�", "鎴愰兘"}); + add(new String[]{"鍥涘窛钀ヨ儭鍚�", "鍖椾含"}); + add(new String[]{"鍥涘窛灏忓尯", "涓婃捣"}); + add(new String[]{"鍥涘窛骞煎笀瀹胯垗", "鎴愰兘"}); + add(new String[]{"鍥涘窛澶у鍐滄灄鏉�", "鎴愰兘"}); + }}); + city_DistrictNames.put("缁甸槼", new ArrayList(){{ + add(new String[]{"缁甸槼鐢靛姏灏忓尯", "缁甸槼"}); + add(new String[]{"缁甸槼鐢靛姏灏忓尯", "缁甸槼"}); + }}); + city_DistrictNames.put("骞夸笢", new ArrayList(){{ + add(new String[]{"骞夸笢澶栬锤骞垮満", "骞垮窞"}); + add(new String[]{"骞夸笢澶栬鑹烘湳瀛﹂櫌鏁欏笀瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢寤虹闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢鍙告硶璀﹀畼鑱屼笟瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐜繚澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍟嗕笟澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍖诲闄㈡暀甯堝鑸嶆ゼ", "涓滆帪"}); + add(new String[]{"骞夸笢鍥介檯澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佹妧鏈洃鐫e眬瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢宸ヤ笟澶у瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鏁欒偛瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪侀摱琛屽ぇ鍘�", "娣卞湷"}); + add(new String[]{"骞夸笢澶у帵", "澶╂触"}); + add(new String[]{"骞夸笢灞卞簞", "闀囨睙"}); + add(new String[]{"骞夸笢绾㈢浘澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鑽闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢闈掑勾骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鍩虹妤�", "娣卞湷"}); + add(new String[]{"骞夸笢鐪佺鎶�骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佸啘涓氱鐞嗗共閮ㄥ闄㈢ぞ鍖�", "骞垮窞"}); + add(new String[]{"骞夸笢鑺暰闆烽�告櫙", "浣涘北"}); + }}); + city_DistrictNames.put("娼窞", new ArrayList(){{ + add(new String[]{"娼窞鎭掑ぇ鍩�", "娼窞"}); + }}); + city_DistrictNames.put("娴欐睙", new ArrayList(){{ + add(new String[]{"娴欐睙宸ヤ笟澶у鏁欏笀瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙澶у帵", "澶師"}); + add(new String[]{"娴欐睙鍔炰簨澶勫鑸�", "澶師"}); + add(new String[]{"娴欐睙浠佸拰灞呰�佸勾鍏荤敓鍏瘬", "婀栧窞"}); + add(new String[]{"娴欐睙浜よ繍澶у帵", "鏉窞"}); + add(new String[]{"娴欐睙宸ュ晢澶у瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙鍟嗚锤鍩�", "鍚堣偉"}); + add(new String[]{"娴欐睙宸ヤ笟澶у涔嬫睙瀛﹂櫌", "鏉窞"}); + }}); + city_DistrictNames.put("鍢夊叴", new ArrayList(){{ + add(new String[]{"鍢夊叴灏忓尯", "娴峰彛"}); + add(new String[]{"鍢夊叴鑺卞洯", "鍢夊叴"}); + add(new String[]{"鍢夊叴-闈掑勾鏂板煄", "淇濆畾"}); + add(new String[]{"鍢夊叴鑺卞洯", "澶師"}); + add(new String[]{"鍢夊叴鍥介檯涓腐鍩庤喘鐗╀腑蹇冨叕瀵�", "鍢夊叴"}); + add(new String[]{"鍢夊叴鑺卞洯", "濞佹捣"}); + add(new String[]{"鍢夊叴鑺卞洯", "涓滆帪"}); + add(new String[]{"鍢夊叴灏忓尯", "浣涘北"}); + add(new String[]{"鍢夊叴妤�", "涓滆帪"}); + add(new String[]{"鍢夊叴鑻�", "澶師"}); + add(new String[]{"鍢夊叴鎬婚儴鍟嗗姟鑺卞洯", "鍢夊叴"}); + add(new String[]{"鍢夊叴鑻�", "娣卞湷"}); + add(new String[]{"鍢夊叴绀惧尯", "娌堥槼"}); + add(new String[]{"鍢夊叴闈掑勾鏂板煄", "淇濆畾"}); + add(new String[]{"鍢夊叴閫稿洯", "缁甸槼"}); + add(new String[]{"鍢夊叴闈掑勾鏂板煄", "淇濆畾"}); + add(new String[]{"鍢夊叴灏忓尯", "绂忓窞"}); + add(new String[]{"鍢夊叴鍥�", "鍘﹂棬"}); + add(new String[]{"鍢夊叴鑻�", "鍚堣偉"}); + add(new String[]{"鍢夊叴鍥�", "瑗垮畨"}); + add(new String[]{"鍢夊叴鑻戝埆澧呭尯", "澶師"}); + add(new String[]{"鍢夊叴鍥介檯", "娌堥槼"}); + add(new String[]{"鍢夊叴涓滆嫅", "鏉窞"}); + add(new String[]{"鍢夊叴鑺卞洯", "閲嶅簡"}); + add(new String[]{"鍢夊叴鍥�", "姝︽眽"}); + add(new String[]{"鍢夊叴涓滄柟宸撮粠鍩�", "鍢夊叴"}); + add(new String[]{"鍢夊叴涓滄柟宸撮粠鍩庡埆澧�", "鍢夊叴"}); + add(new String[]{"鍢夊叴涓畨甯傚満", "鍢夊叴"}); + add(new String[]{"鍢夊叴鍗楁箹鎶曡祫鍏昏�佹埧", "鍢夊叴"}); + add(new String[]{"鍢夊叴鑻�", "鏄嗗北"}); + add(new String[]{"鍢夊叴鍥介檯鐢垫皵鍩�", "涓婃捣"}); + add(new String[]{"鍢夊叴鍥介檯涓腐鍩庤喘鐗╀腑蹇冨叕瀵�", "涓婃捣"}); + add(new String[]{"鍢夊叴鍗楁箹鎶曡祫鍏昏�佹埧", "涓婃捣"}); + add(new String[]{"鍢夊叴涓滄柟宸撮粠鍩�", "涓婃捣"}); + add(new String[]{"鍢夊叴鍥介檯澶у帵", "娌堥槼"}); + add(new String[]{"鍢夊叴鍟嗗煄", "鍢夊叴"}); + }}); + city_DistrictNames.put("婀栧崡", new ArrayList(){{ + add(new String[]{"婀栧崡澶у帵", "娴峰彛"}); + add(new String[]{"婀栧崡甯堝ぇ寮犲叕宀牎鍖哄鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佽繘鍑哄彛鍏徃瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡骞跨數瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡鏈哄簥鍘傚鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鍒惰嵂鍘傚鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡渚涢攢澶у帵", "闀挎矙"}); + add(new String[]{"婀栧崡鍖栧伐鍖昏嵂璁捐闄㈠鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡宸ュ晢閾惰瀹胯垗鏈哄叧澶ч櫌", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸浗闃茬鍏姙鏈哄叧闄㈠唴瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡鎶ヤ笟鏂囧寲鍩�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佷氦閫氳璁¢櫌", "闀挎矙"}); + add(new String[]{"婀栧崡鑱旈�氫綇瀹呭皬鍖�", "闀挎矙"}); + add(new String[]{"婀栧崡鐢佃鍙板崟浣嶅鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡寮�鍏冲巶瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡灏忓尯", "鍖椾含"}); + add(new String[]{"婀栧崡閭數鏂版潙灏忓尯", "闉嶅北"}); + add(new String[]{"婀栧崡鐪佺瀛︽妧鏈巺瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸浗瀹夊巺鍗曚綅鎴�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佹湪鍋跺墽鍥㈠鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佹皵璞″眬瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡濂冲瓙澶у鏁欏笀鍏瘬", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸啘涓氭満姊扮爺绌舵墍", "闀挎矙"}); + add(new String[]{"婀栧崡鏁欒偛瑁呭缁煎悎澶фゼ", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸姵鍔ㄥ崼鐢熸墍", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佽川閲忔妧鏈洃鐫e眬瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡鐪侀噾灞炲洖鏀跺叕鍙稿鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸鏂欑爺绌舵墍", "闀挎矙"}); + add(new String[]{"婀栧崡鐪侀珮绾т汉姘戞鏌ラ櫌鍗曚綅鎴�", "闀挎矙"}); + add(new String[]{"婀栧崡浜ら�氳亴闄㈠鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸喍閲戞潗鏂欑爺绌舵墍", "闀挎矙"}); + add(new String[]{"婀栧崡閲戣渹闊冲儚鍑虹増绀�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佺墿璧勫巺瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡瀹剁數鍟嗗煄", "闀挎矙"}); + add(new String[]{"婀栧崡鍥介檯鍟嗗姟涓績", "闀挎矙"}); + add(new String[]{"婀栧崡璐㈠瘜涓績", "闀挎矙"}); + add(new String[]{"婀栧崡鍥介檯姹借溅鍩�", "闀挎矙"}); + add(new String[]{"婀栧崡浜氬ぇ鏁扮爜娓�", "闀挎矙"}); + add(new String[]{"婀栧崡澶у帵", "鍗楀畞"}); + add(new String[]{"婀栧崡澶у帵", "涓婃捣"}); + add(new String[]{"婀栧崡鏄熸矙姹介厤鍩�", "闀挎矙"}); + add(new String[]{"婀栧崡鑹烘牎鍗曚綅鎴�", "闀挎矙"}); + add(new String[]{"婀栧崡璐笓鏁欒亴宸ュ鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佹満姊拌繘鍑哄彛鍏徃瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡鏃ユ姤鍗曚綅瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡宀稿悗鐣堝皬鍖�", "缁嶅叴"}); + }}); + city_DistrictNames.put("婀樻江", new ArrayList(){{ + add(new String[]{"婀樻江鑺卞洯灏忓尯", "鍚夋灄"}); + add(new String[]{"婀樻江灏忓尯", "鍚夋灄"}); + add(new String[]{"婀樻江绀惧尯", "鍚夋灄"}); + add(new String[]{"婀樻江涓滈噷", "澶╂触"}); + add(new String[]{"婀樻江閲�", "澶╂触"}); + }}); + city_DistrictNames.put("绂忓缓", new ArrayList(){{ + add(new String[]{"绂忓缓鍥�", "鍗楀畞"}); + add(new String[]{"绂忓缓鐪佸洓寤哄鑸嶅寳闂�", "鍘﹂棬"}); + add(new String[]{"绂忓缓鑱旈�氳姳鍥�", "绂忓窞"}); + add(new String[]{"绂忓缓鏃ユ姤绀惧鑸�", "绂忓窞"}); + add(new String[]{"绂忓缓鐪佷腑蹇冩楠屾墍鍗曚綅瀹胯垗", "绂忓窞"}); + add(new String[]{"绂忓缓鐢靛奖鍒剁墖鍘傚崟浣嶅鑸�", "绂忓窞"}); + add(new String[]{"绂忓缓鐪佸コ瀛愮洃鐙卞鑸�", "绂忓窞"}); + add(new String[]{"绂忓缓鐪佸尰鑽叕鍙稿ぇ鐜嬮噷鍗曚綅瀹胯垗", "绂忓窞"}); + add(new String[]{"绂忓缓鐪佺浜屽叕璺伐绋嬪叕鍙稿鑸�", "绂忓窞"}); + add(new String[]{"绂忓缓鐪佽殨妗戠爺绌舵墍鍗曚綅瀹胯垗", "绂忓窞"}); + add(new String[]{"绂忓缓鏂版潙", "鍗椾含"}); + add(new String[]{"绂忓缓閲�", "澶╂触"}); + add(new String[]{"绂忓缓绀惧尯", "姝︽眽"}); + add(new String[]{"绂忓缓澶у帵", "璐甸槼"}); + add(new String[]{"绂忓缓宸峰皬鍖�", "鎴愰兘"}); + add(new String[]{"绂忓缓澶у帵", "娣卞湷"}); + add(new String[]{"绂忓缓鐢熸�佸伐绋嬪鏍″崟浣嶅鑸�", "绂忓窞"}); + add(new String[]{"绂忓缓鍖荤澶у鏁欏伐瀹胯垗", "绂忓窞"}); + }}); + city_DistrictNames.put("鑾嗙敯", new ArrayList(){{ + add(new String[]{"鑾嗙敯涓囩鍩�", "鑾嗙敯"}); + add(new String[]{"鑾嗙敯瀛﹀洯鑺卞洯", "鑾嗙敯"}); + }}); + city_DistrictNames.put("娌冲崡", new ArrayList(){{ + add(new String[]{"娌冲崡搴勫皬鍖�", "闈掑矝"}); + add(new String[]{"娌冲崡璐笓瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡鐪佹柊鍗庝功搴楀灞為櫌", "閮戝窞"}); + add(new String[]{"娌冲崡鐪佸晢涓氱瀛︾爺绌舵墍瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡鐪佹棩鎶ョぞ瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡濂冲瓙楂樹腑瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡澶栬锤澶ч櫌", "娣卞湷"}); + add(new String[]{"娌冲崡閲�", "澶╂触"}); + add(new String[]{"娌冲崡鏂版潙", "绂忓窞"}); + add(new String[]{"娌冲崡璐㈢粡瀛﹂櫌瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡宀稿叕鍥皬鍖�", "鎯犲窞"}); + add(new String[]{"娌冲崡宀告柊鏉�", "鎯犲窞"}); + add(new String[]{"娌冲崡鏉�", "鍖椾含"}); + add(new String[]{"娌冲崡鐞嗗伐瀛︽牎瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡鐪佷汉浜嬪巺瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡宀镐腑蹇冨皬鍖�", "鎯犲窞"}); + add(new String[]{"娌冲崡鐪佸璐稿鏍″灞為櫌", "閮戝窞"}); + add(new String[]{"娌冲崡鏉�", "涓婃捣"}); + add(new String[]{"娌冲崡鏂版潙", "涓婃捣"}); + add(new String[]{"娌冲崡宸ヤ笟澶у瀹跺睘闄�", "閮戝窞"}); + }}); + city_DistrictNames.put("閮戝窞", new ArrayList(){{ + add(new String[]{"閮戝窞鍥句功鍩庡灞為櫌", "閮戝窞"}); + add(new String[]{"閮戝窞瑗垮洓鐜缓鏉愬競鍦�", "閮戝窞"}); + add(new String[]{"閮戝窞鍥介檯鍩�", "閮戝窞"}); + add(new String[]{"閮戝窞杞诲伐涓氬闄㈠灞為櫌", "閮戝窞"}); + add(new String[]{"閮戝窞绠卞寘鍩�", "閮戝窞"}); + add(new String[]{"閮戝窞鏅氭姤绀惧灞為櫌", "閮戝窞"}); + add(new String[]{"閮戝窞鏍镐簲闄㈠灞為櫌", "閮戝窞"}); + add(new String[]{"閮戝窞甯傛斂娉曞瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"閮戝窞鏃ユ姤绀惧灞為櫌", "閮戝窞"}); + add(new String[]{"閮戝窞娆т附鍏徃瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"閮戝窞鎭掑ぇ鍚嶉兘", "閮戝窞"}); + add(new String[]{"閮戝窞澶ч厭搴�", "閮戝窞"}); + add(new String[]{"閮戝窞鍔冲姩鏈嶅姟鍏徃瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"閮戝窞澶у帹鎴垮啘鍓骇鍝佺墿娴佹腐", "閮戝窞"}); + add(new String[]{"閮戝窞鍥介檯缇庨濞变箰骞垮満", "閮戝窞"}); + add(new String[]{"閮戝窞鍥借锤涓績", "閮戝窞"}); + }}); + city_DistrictNames.put("绂忓缓", new ArrayList(){{ + add(new String[]{"绂忓缓鍥�", "鍗楀畞"}); + add(new String[]{"绂忓缓鐪佸洓寤哄鑸嶅寳闂�", "鍘﹂棬"}); + add(new String[]{"绂忓缓鑱旈�氳姳鍥�", "绂忓窞"}); + add(new String[]{"绂忓缓鏃ユ姤绀惧鑸�", "绂忓窞"}); + add(new String[]{"绂忓缓鐪佷腑蹇冩楠屾墍鍗曚綅瀹胯垗", "绂忓窞"}); + add(new String[]{"绂忓缓鐢靛奖鍒剁墖鍘傚崟浣嶅鑸�", "绂忓窞"}); + add(new String[]{"绂忓缓鐪佸コ瀛愮洃鐙卞鑸�", "绂忓窞"}); + add(new String[]{"绂忓缓鐪佸尰鑽叕鍙稿ぇ鐜嬮噷鍗曚綅瀹胯垗", "绂忓窞"}); + add(new String[]{"绂忓缓鐪佺浜屽叕璺伐绋嬪叕鍙稿鑸�", "绂忓窞"}); + add(new String[]{"绂忓缓鐪佽殨妗戠爺绌舵墍鍗曚綅瀹胯垗", "绂忓窞"}); + add(new String[]{"绂忓缓鏂版潙", "鍗椾含"}); + add(new String[]{"绂忓缓閲�", "澶╂触"}); + add(new String[]{"绂忓缓绀惧尯", "姝︽眽"}); + add(new String[]{"绂忓缓澶у帵", "璐甸槼"}); + add(new String[]{"绂忓缓宸峰皬鍖�", "鎴愰兘"}); + add(new String[]{"绂忓缓澶у帵", "娣卞湷"}); + add(new String[]{"绂忓缓鐢熸�佸伐绋嬪鏍″崟浣嶅鑸�", "绂忓窞"}); + add(new String[]{"绂忓缓鍖荤澶у鏁欏伐瀹胯垗", "绂忓窞"}); + }}); + city_DistrictNames.put("绂忓窞", new ArrayList(){{ + add(new String[]{"绂忓窞涓�涓笁鐗у潑鍗曚綅瀹胯垗", "绂忓窞"}); + add(new String[]{"绂忓窞鍏畨鍏瘬", "绂忓窞"}); + add(new String[]{"绂忓窞鏄ュぉ", "绂忓窞"}); + add(new String[]{"绂忓窞甯傚叕瀹夊眬灏忔煶鍗曚綅瀹胯垗", "绂忓窞"}); + add(new String[]{"绂忓窞濂ユ灄鍖瑰厠鑺卞洯", "绂忓窞"}); + add(new String[]{"绂忓窞浜烘皯鏃ユ姤绀惧嵃鍔′腑蹇冨崟浣嶅鑸�", "绂忓窞"}); + add(new String[]{"绂忓窞鍙戝睍鍜屾敼闈╁鍛樹細鍗曚綅瀹胯垗", "绂忓窞"}); + add(new String[]{"绂忓窞鏄熷娍鍔�", "绂忓窞"}); + add(new String[]{"绂忓窞璞涵", "绂忓窞"}); + add(new String[]{"绂忓窞璞环", "绂忓窞"}); + add(new String[]{"绂忓窞澶фゼ", "涓婃捣"}); + }}); + city_DistrictNames.put("婀栧崡", new ArrayList(){{ + add(new String[]{"婀栧崡澶у帵", "娴峰彛"}); + add(new String[]{"婀栧崡甯堝ぇ寮犲叕宀牎鍖哄鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佽繘鍑哄彛鍏徃瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡骞跨數瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡鏈哄簥鍘傚鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鍒惰嵂鍘傚鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡渚涢攢澶у帵", "闀挎矙"}); + add(new String[]{"婀栧崡鍖栧伐鍖昏嵂璁捐闄㈠鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡宸ュ晢閾惰瀹胯垗鏈哄叧澶ч櫌", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸浗闃茬鍏姙鏈哄叧闄㈠唴瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡鎶ヤ笟鏂囧寲鍩�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佷氦閫氳璁¢櫌", "闀挎矙"}); + add(new String[]{"婀栧崡鑱旈�氫綇瀹呭皬鍖�", "闀挎矙"}); + add(new String[]{"婀栧崡鐢佃鍙板崟浣嶅鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡寮�鍏冲巶瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡灏忓尯", "鍖椾含"}); + add(new String[]{"婀栧崡閭數鏂版潙灏忓尯", "闉嶅北"}); + add(new String[]{"婀栧崡鐪佺瀛︽妧鏈巺瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸浗瀹夊巺鍗曚綅鎴�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佹湪鍋跺墽鍥㈠鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佹皵璞″眬瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡濂冲瓙澶у鏁欏笀鍏瘬", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸啘涓氭満姊扮爺绌舵墍", "闀挎矙"}); + add(new String[]{"婀栧崡鏁欒偛瑁呭缁煎悎澶фゼ", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸姵鍔ㄥ崼鐢熸墍", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佽川閲忔妧鏈洃鐫e眬瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡鐪侀噾灞炲洖鏀跺叕鍙稿鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸鏂欑爺绌舵墍", "闀挎矙"}); + add(new String[]{"婀栧崡鐪侀珮绾т汉姘戞鏌ラ櫌鍗曚綅鎴�", "闀挎矙"}); + add(new String[]{"婀栧崡浜ら�氳亴闄㈠鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佸喍閲戞潗鏂欑爺绌舵墍", "闀挎矙"}); + add(new String[]{"婀栧崡閲戣渹闊冲儚鍑虹増绀�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佺墿璧勫巺瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡瀹剁數鍟嗗煄", "闀挎矙"}); + add(new String[]{"婀栧崡鍥介檯鍟嗗姟涓績", "闀挎矙"}); + add(new String[]{"婀栧崡璐㈠瘜涓績", "闀挎矙"}); + add(new String[]{"婀栧崡鍥介檯姹借溅鍩�", "闀挎矙"}); + add(new String[]{"婀栧崡浜氬ぇ鏁扮爜娓�", "闀挎矙"}); + add(new String[]{"婀栧崡澶у帵", "鍗楀畞"}); + add(new String[]{"婀栧崡澶у帵", "涓婃捣"}); + add(new String[]{"婀栧崡鏄熸矙姹介厤鍩�", "闀挎矙"}); + add(new String[]{"婀栧崡鑹烘牎鍗曚綅鎴�", "闀挎矙"}); + add(new String[]{"婀栧崡璐笓鏁欒亴宸ュ鑸�", "闀挎矙"}); + add(new String[]{"婀栧崡鐪佹満姊拌繘鍑哄彛鍏徃瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡鏃ユ姤鍗曚綅瀹胯垗", "闀挎矙"}); + add(new String[]{"婀栧崡宀稿悗鐣堝皬鍖�", "缁嶅叴"}); + }}); + city_DistrictNames.put("闀挎矙", new ArrayList(){{ + add(new String[]{"闀挎矙甯傞暱鍫璁¢櫌", "闀挎矙"}); + add(new String[]{"闀挎矙閾惰鍗曚綅鎴�", "闀挎矙"}); + add(new String[]{"闀挎矙鎭掑ぇ缁挎床", "闀挎矙"}); + add(new String[]{"闀挎矙鍗楄嫅灏忓尯", "闀挎矙"}); + add(new String[]{"闀挎矙甯傜儫鑽変笓鍗栧眬鍗曚綅瀹胯垗", "闀挎矙"}); + add(new String[]{"闀挎矙鐞嗗伐澶у鏁欒亴宸ヤ綇瀹呭尯", "闀挎矙"}); + add(new String[]{"闀挎矙鐑熻崏灞�瀹胯垗", "闀挎矙"}); + add(new String[]{"闀挎矙鏅氭姤瀹胯垗", "闀挎矙"}); + add(new String[]{"闀挎矙甯傚鍏氭牎瀹胯垗", "闀挎矙"}); + add(new String[]{"闀挎矙鏍囧噯浠跺巶瀹胯垗", "闀挎矙"}); + add(new String[]{"闀挎矙鍐堕噾鍘傚鑸�", "闀挎矙"}); + add(new String[]{"闀挎矙甯備竴涓鑸�", "闀挎矙"}); + add(new String[]{"闀挎矙鐧芥矙鍟ら厭鍏瘬", "闀挎矙"}); + add(new String[]{"闀挎矙鎭掑ぇ鍩�", "闀挎矙"}); + add(new String[]{"闀挎矙涓栬寕閾傜繝婀�", "闀挎矙"}); + add(new String[]{"闀挎矙绗簩鍗佸叚涓鑸�", "闀挎矙"}); + add(new String[]{"闀挎矙甯備節涓鑸�", "闀挎矙"}); + add(new String[]{"闀挎矙甯傜編鏈叕鍙稿鑸�", "闀挎矙"}); + add(new String[]{"闀挎矙鍕樺療璁捐闄㈠鑸嶅崟浣嶆埧", "闀挎矙"}); + add(new String[]{"闀挎矙甯傝鍒掕璁¢櫌瀹胯垗", "闀挎矙"}); + add(new String[]{"闀挎矙姹℃按澶勭悊鍘傚鑸�", "闀挎矙"}); + add(new String[]{"闀挎矙鍟嗚锤鏃呮父鏁欏笀瀹胯垗", "闀挎矙"}); + add(new String[]{"闀挎矙浼嶅宀敓娲诲箍鍦�", "闀挎矙"}); + add(new String[]{"闀挎矙鏂板ぇ鏂板ぇ鍘�", "闀挎矙"}); + add(new String[]{"闀挎矙鏂拌嫅", "鐝犳捣"}); + add(new String[]{"闀挎矙鍗风儫鍘傚鑸�", "闀挎矙"}); + add(new String[]{"闀挎矙甯傞洦鑺卞尯宸ヨ锤瀛﹂櫌", "闀挎矙"}); + add(new String[]{"闀挎矙鐢熸�佸姩鐗╁洯瀹犵墿棣嗛棬闈�", "闀挎矙"}); + add(new String[]{"闀挎矙鐩戠嫳瀹胯垗", "闀挎矙"}); + add(new String[]{"闀挎矙甯傝惀灞卞贩52", "闀挎矙"}); + add(new String[]{"闀挎矙甯傚杩愬鑸�", "闀挎矙"}); + add(new String[]{"闀挎矙鐞嗗伐閲戠泦宀皬鍖哄鑸�", "闀挎矙"}); + add(new String[]{"闀挎矙甯傝川閲忔妧鏈洃鐫e眬浣忓畢灏忓尯", "闀挎矙"}); + add(new String[]{"闀挎矙浜屽崄涓�涓鑸�", "闀挎矙"}); + add(new String[]{"闀挎矙鑼跺競", "闀挎矙"}); + add(new String[]{"闀挎矙杞存壙鍘傚鑸�", "闀挎矙"}); + add(new String[]{"闀挎矙鍐锋煖鍘傚鑸�", "闀挎矙"}); + add(new String[]{"闀挎矙鐜懓鍥埆澧�", "闀挎矙"}); + add(new String[]{"闀挎矙甯傚浗鍦熷眬瀹胯垗", "闀挎矙"}); + add(new String[]{"闀挎矙鏂囧寲骞垮満", "闀挎矙"}); + add(new String[]{"闀挎矙鐜懓鍥�", "闀挎矙"}); + add(new String[]{"闀挎矙寮�绂忎竾杈惧箍鍦�", "闀挎矙"}); + add(new String[]{"闀挎矙娆ф床鍩�", "闀挎矙"}); + add(new String[]{"闀挎矙娣卞浗鎶�", "闀挎矙"}); + add(new String[]{"闀挎矙灏忓尯", "闈掑矝"}); + add(new String[]{"闀挎矙鍘胯储鏀垮眬", "闀挎矙"}); + add(new String[]{"闀挎矙鍘挎灄涓氬眬鍗曚綅鎴�", "闀挎矙"}); + add(new String[]{"闀挎矙鍘垮啘鏈哄眬瀹胯垗", "闀挎矙"}); + add(new String[]{"闀挎矙鍘垮叕瀹夊眬鍗曚綅鎴�", "闀挎矙"}); + add(new String[]{"闀挎矙鐜荤拑绾ょ淮鍘傚鑸�", "闀挎矙"}); + add(new String[]{"闀挎矙濂ユ灄鍖瑰厠鑺卞洯", "闀挎矙"}); + add(new String[]{"闀挎矙鍢夊崕鍩�", "闀挎矙"}); + add(new String[]{"闀挎矙涔嬭姱", "闀挎矙"}); + add(new String[]{"闀挎矙娓皬鍖�", "闀挎矙"}); + }}); + city_DistrictNames.put("娌冲崡", new ArrayList(){{ + add(new String[]{"娌冲崡搴勫皬鍖�", "闈掑矝"}); + add(new String[]{"娌冲崡璐笓瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡鐪佹柊鍗庝功搴楀灞為櫌", "閮戝窞"}); + add(new String[]{"娌冲崡鐪佸晢涓氱瀛︾爺绌舵墍瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡鐪佹棩鎶ョぞ瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡濂冲瓙楂樹腑瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡澶栬锤澶ч櫌", "娣卞湷"}); + add(new String[]{"娌冲崡閲�", "澶╂触"}); + add(new String[]{"娌冲崡鏂版潙", "绂忓窞"}); + add(new String[]{"娌冲崡璐㈢粡瀛﹂櫌瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡宀稿叕鍥皬鍖�", "鎯犲窞"}); + add(new String[]{"娌冲崡宀告柊鏉�", "鎯犲窞"}); + add(new String[]{"娌冲崡鏉�", "鍖椾含"}); + add(new String[]{"娌冲崡鐞嗗伐瀛︽牎瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡鐪佷汉浜嬪巺瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡宀镐腑蹇冨皬鍖�", "鎯犲窞"}); + add(new String[]{"娌冲崡鐪佸璐稿鏍″灞為櫌", "閮戝窞"}); + add(new String[]{"娌冲崡鏉�", "涓婃捣"}); + add(new String[]{"娌冲崡鏂版潙", "涓婃捣"}); + add(new String[]{"娌冲崡宸ヤ笟澶у瀹跺睘闄�", "閮戝窞"}); + }}); + city_DistrictNames.put("鏂颁埂", new ArrayList(){{ + add(new String[]{"鏂颁埂鍘垮畨灞呭皬鍖�", "鏂颁埂"}); + }}); + city_DistrictNames.put("姹熻嫃", new ArrayList(){{ + add(new String[]{"姹熻嫃鐪佸啘绉戦櫌", "鍗椾含"}); + add(new String[]{"姹熻嫃娌圭敯鐭虫补灞卞簞", "鎵窞"}); + add(new String[]{"姹熻嫃璀﹀畼瀛﹂櫌", "鍗椾含"}); + add(new String[]{"姹熻嫃鐪侀珮绾т笓瀹跺洯", "鍗椾含"}); + add(new String[]{"姹熻嫃娌圭敯鐭虫补灞卞簞", "鎵窞"}); + add(new String[]{"姹熻嫃璁簨鍥�", "鍗椾含"}); + add(new String[]{"姹熻嫃鍥介檯濉戝寲鍩�", "甯稿窞"}); + add(new String[]{"姹熻嫃涓囧拰鍥介檯鍟嗚锤鍩�", "甯稿窞"}); + }}); + city_DistrictNames.put("鏃犻敗", new ArrayList(){{ + add(new String[]{"鏃犻敗澶у帵", "涓婃捣"}); + add(new String[]{"鏃犻敗婊ㄦ箹涓囪揪骞垮満", "鏃犻敗"}); + add(new String[]{"鏃犻敗纰ф鍥�", "鏃犻敗"}); + add(new String[]{"鏃犻敗涓栫晫璐告槗涓績涓�鏈熶笘璐稿叕瀵�", "鏃犻敗"}); + add(new String[]{"鏃犻敗娲涘煄姗欓儭", "鏃犻敗"}); + add(new String[]{"鏃犻敗濉炵撼搴勫洯", "瀹滃叴"}); + add(new String[]{"鏃犻敗鐜夊叞鑺卞洯", "瀹滃叴"}); + }}); + city_DistrictNames.put("瀹滃叴", new ArrayList(){{ + add(new String[]{"瀹滃叴鍗楅噷", "澶╂触"}); + add(new String[]{"瀹滃叴闃冲厜鑺辫嫅", "瀹滃叴"}); + add(new String[]{"瀹滃叴澶粏鑺辫嫅", "瀹滃叴"}); + }}); + city_DistrictNames.put("杈藉畞", new ArrayList(){{ + add(new String[]{"杈藉畞涓尰瀹跺睘妤�", "娌堥槼"}); + add(new String[]{"杈藉畞閲�", "澶╂触"}); + }}); + city_DistrictNames.put("娌堥槼", new ArrayList(){{ + add(new String[]{"娌堥槼涓綋濂ユ灄鍖瑰厠鑺卞洯路鑺卞洯涓�鍙�", "娌堥槼"}); + add(new String[]{"娌堥槼鎭掑ぇ鍩�", "娌堥槼"}); + add(new String[]{"娌堥槼鎭掑ぇ缁挎床", "娌堥槼"}); + add(new String[]{"娌堥槼濂ユ灄鍖瑰厠鑺卞洯涓夋湡", "娌堥槼"}); + add(new String[]{"娌堥槼甯傜偖鍏靛闄㈠皬鍖�", "娌堥槼"}); + add(new String[]{"娌堥槼鎭掑ぇ鍚嶉兘", "娌堥槼"}); + add(new String[]{"娌堥槼娴烽煹骞垮満锛堥敠姹熷ぇ閰掑簵B搴э級", "娌堥槼"}); + add(new String[]{"娌堥槼绔欏皬鍖�", "娌堥槼"}); + add(new String[]{"娌堥槼璐㈠瘜涓績", "娌堥槼"}); + add(new String[]{"娌堥槼鍩庡競绔嬫柟鏂板眳", "娌堥槼"}); + add(new String[]{"娌堥槼涓綋濂ユ灄鍖瑰厠鑺卞洯路鑺卞洯鏂板煄", "娌堥槼"}); + add(new String[]{"娌堥槼涓綋濂ユ灄鍖瑰厠鑺卞洯路绂忓煄", "娌堥槼"}); + add(new String[]{"娌堥槼涓浗濂充汉琛�", "娌堥槼"}); + add(new String[]{"娌堥槼绀惧尯", "姝︽眽"}); + add(new String[]{"娌堥槼澶╁湴", "娌堥槼"}); + add(new String[]{"娌堥槼鎭掑ぇ姹熸咕", "娌堥槼"}); + add(new String[]{"娌堥槼鎭掑ぇ鍗庡簻", "娌堥槼"}); + add(new String[]{"娌堥槼涓囪揪鍏", "娌堥槼"}); + add(new String[]{"娌堥槼鍥介檯鍝佺墝鎬婚儴澶у帵", "娌堥槼"}); + add(new String[]{"娌堥槼鍥介檯鍝佺墝鎬婚儴澶у帵锛堝浗闄呴瀷鍩庯級", "娌堥槼"}); + add(new String[]{"娌堥槼浜旈噾鏈虹數鍩�", "娌堥槼"}); + add(new String[]{"娌堥槼鍟嗕笟鍩庯紙瑗垮尯锛�", "娌堥槼"}); + }}); + city_DistrictNames.put("杈藉畞", new ArrayList(){{ + add(new String[]{"杈藉畞涓尰瀹跺睘妤�", "娌堥槼"}); + add(new String[]{"杈藉畞閲�", "澶╂触"}); + }}); + city_DistrictNames.put("钀ュ彛", new ArrayList(){{ + add(new String[]{"钀ュ彛澶у帵", "涓婃捣"}); + }}); + city_DistrictNames.put("娴欐睙", new ArrayList(){{ + add(new String[]{"娴欐睙宸ヤ笟澶у鏁欏笀瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙澶у帵", "澶師"}); + add(new String[]{"娴欐睙鍔炰簨澶勫鑸�", "澶師"}); + add(new String[]{"娴欐睙浠佸拰灞呰�佸勾鍏荤敓鍏瘬", "婀栧窞"}); + add(new String[]{"娴欐睙浜よ繍澶у帵", "鏉窞"}); + add(new String[]{"娴欐睙宸ュ晢澶у瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙鍟嗚锤鍩�", "鍚堣偉"}); + add(new String[]{"娴欐睙宸ヤ笟澶у涔嬫睙瀛﹂櫌", "鏉窞"}); + }}); + city_DistrictNames.put("瀹佹尝", new ArrayList(){{ + add(new String[]{"瀹佹尝閲�", "澶╂触"}); + add(new String[]{"瀹佹尝閲�", "姝︽眽"}); + add(new String[]{"瀹佹尝鍟嗕細澶у帵", "瀹佹尝"}); + add(new String[]{"瀹佹尝澶栦唬澶у帵", "瀹佹尝"}); + add(new String[]{"瀹佹尝灏忓尯", "涓婃捣"}); + }}); + city_DistrictNames.put("鎱堟邯", new ArrayList(){{ + add(new String[]{"鎱堟邯閲戞按婀�", "瀹佹尝"}); + add(new String[]{"鎱堟邯涓ぎ澶у帵", "瀹佹尝"}); + add(new String[]{"鎱堟邯涓�鍝佺┖闂�", "瀹佹尝"}); + add(new String[]{"鎱堟邯璐㈠瘜涓績", "瀹佹尝"}); + add(new String[]{"鎱堟邯涓ぎ澶у帵", "鎱堟邯"}); + add(new String[]{"鎱堟邯涓�鍝佺┖闂�", "鎱堟邯"}); + add(new String[]{"鎱堟邯閲戞按婀�", "鎱堟邯"}); + }}); + city_DistrictNames.put("瀹夊窘", new ArrayList(){{ + add(new String[]{"瀹夊窘甯堣寖澶у鏁欏笀鍏瘬", "鑺滄箹"}); + add(new String[]{"瀹夊窘鐢佃鍙板鑸�", "鍚堣偉"}); + add(new String[]{"瀹夊窘鏃ユ姤绀惧鑸�", "鍚堣偉"}); + add(new String[]{"瀹夊窘澶у帵", "鐝犳捣"}); + add(new String[]{"瀹夊窘鏉傛妧鍥㈠鑸�", "鍚堣偉"}); + add(new String[]{"瀹夊窘璀﹀畼鑱屼笟瀛﹂櫌瀹胯垗", "鍚堣偉"}); + add(new String[]{"瀹夊窘绋庡姟瀛︽牎瀹胯垗", "鍚堣偉"}); + add(new String[]{"瀹夊窘姹介厤鍩�", "鍚堣偉"}); + add(new String[]{"瀹夊窘鍥藉己閽㈡潗浜ゆ槗涓績", "鍚堣偉"}); + add(new String[]{"瀹夊窘鍥介檯璐墿骞垮満", "鍚堣偉"}); + add(new String[]{"瀹夊窘澶у競鍦�", "鍚堣偉"}); + }}); + city_DistrictNames.put("鑺滄箹", new ArrayList(){{ + add(new String[]{"鑺滄箹鏂囧寲鍏洯", "鑺滄箹"}); + add(new String[]{"鑺滄箹纰ф鍥�", "鑺滄箹"}); + }}); + city_DistrictNames.put("璐靛窞", new ArrayList(){{ + add(new String[]{"璐靛窞澶у帵", "娴峰彛"}); + add(new String[]{"璐靛窞绉戞妧澶у帵", "璐甸槼"}); + add(new String[]{"璐靛窞鏃ユ姤绀剧硸鏋滃巶瀹胯垗", "璐甸槼"}); + add(new String[]{"璐靛窞椹村弸浜哄閰掑簵寮忚繛閿佸搴叕瀵�", "璐甸槼"}); + add(new String[]{"璐靛窞鏃ユ姤绀剧硸鏋滃巶瀹胯垗", "璐甸槼"}); + add(new String[]{"璐靛窞鍟嗚锤鐗╂祦娓�", "璐甸槼"}); + }}); + city_DistrictNames.put("鍏洏姘�", new ArrayList(){{ + }}); + city_DistrictNames.put("骞夸笢", new ArrayList(){{ + add(new String[]{"骞夸笢澶栬锤骞垮満", "骞垮窞"}); + add(new String[]{"骞夸笢澶栬鑹烘湳瀛﹂櫌鏁欏笀瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢寤虹闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢鍙告硶璀﹀畼鑱屼笟瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐜繚澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍟嗕笟澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍖诲闄㈡暀甯堝鑸嶆ゼ", "涓滆帪"}); + add(new String[]{"骞夸笢鍥介檯澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佹妧鏈洃鐫e眬瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢宸ヤ笟澶у瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鏁欒偛瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪侀摱琛屽ぇ鍘�", "娣卞湷"}); + add(new String[]{"骞夸笢澶у帵", "澶╂触"}); + add(new String[]{"骞夸笢灞卞簞", "闀囨睙"}); + add(new String[]{"骞夸笢绾㈢浘澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鑽闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢闈掑勾骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鍩虹妤�", "娣卞湷"}); + add(new String[]{"骞夸笢鐪佺鎶�骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佸啘涓氱鐞嗗共閮ㄥ闄㈢ぞ鍖�", "骞垮窞"}); + add(new String[]{"骞夸笢鑺暰闆烽�告櫙", "浣涘北"}); + }}); + city_DistrictNames.put("婀涙睙", new ArrayList(){{ + add(new String[]{"婀涙睙閲�", "澶╂触"}); + add(new String[]{"婀涙睙鏁扮爜澶у帵", "婀涙睙"}); + add(new String[]{"婀涙睙涓栬锤澶у帵", "婀涙睙"}); + add(new String[]{"婀涙睙鍥借锤澶у帵", "婀涙睙"}); + }}); + city_DistrictNames.put("娌冲崡", new ArrayList(){{ + add(new String[]{"娌冲崡搴勫皬鍖�", "闈掑矝"}); + add(new String[]{"娌冲崡璐笓瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡鐪佹柊鍗庝功搴楀灞為櫌", "閮戝窞"}); + add(new String[]{"娌冲崡鐪佸晢涓氱瀛︾爺绌舵墍瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡鐪佹棩鎶ョぞ瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡濂冲瓙楂樹腑瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡澶栬锤澶ч櫌", "娣卞湷"}); + add(new String[]{"娌冲崡閲�", "澶╂触"}); + add(new String[]{"娌冲崡鏂版潙", "绂忓窞"}); + add(new String[]{"娌冲崡璐㈢粡瀛﹂櫌瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡宀稿叕鍥皬鍖�", "鎯犲窞"}); + add(new String[]{"娌冲崡宀告柊鏉�", "鎯犲窞"}); + add(new String[]{"娌冲崡鏉�", "鍖椾含"}); + add(new String[]{"娌冲崡鐞嗗伐瀛︽牎瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡鐪佷汉浜嬪巺瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡宀镐腑蹇冨皬鍖�", "鎯犲窞"}); + add(new String[]{"娌冲崡鐪佸璐稿鏍″灞為櫌", "閮戝窞"}); + add(new String[]{"娌冲崡鏉�", "涓婃捣"}); + add(new String[]{"娌冲崡鏂版潙", "涓婃捣"}); + add(new String[]{"娌冲崡宸ヤ笟澶у瀹跺睘闄�", "閮戝窞"}); + }}); + city_DistrictNames.put("骞抽《灞�", new ArrayList(){{ + add(new String[]{"骞抽《灞卞皬鍖�", "涔岄瞾鏈ㄩ綈"}); + add(new String[]{"骞抽《灞辫繍杈撳叕鍙稿灞為櫌", "涔岄瞾鏈ㄩ綈"}); + }}); + city_DistrictNames.put("浜戝崡", new ArrayList(){{ + add(new String[]{"浜戝崡澶у帵", "骞垮窞"}); + add(new String[]{"浜戝崡鐪佹潅鎶�鍥㈠灞為櫌", "鏄嗘槑"}); + add(new String[]{"浜戝崡鍗庝鲸鍩�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鑹烘湳瀹跺洯鍖�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鍐滀笟澶у鏁欏伐浣忓畢鍖�", "鏄嗘槑"}); + add(new String[]{"浜戝崡璐㈢粡澶у浣忓畢", "鏄嗘槑"}); + add(new String[]{"浜戝崡澶у榫欐硥璺皬鍖�", "鏄嗘槑"}); + add(new String[]{"浜戝崡宸ヤ笟鑱屼笟鎶�鏈闄�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鍗拌薄鍩�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鏄犺薄", "鏄嗘槑"}); + add(new String[]{"浜戝崡鐪佺暅鐗у眬瀹胯垗", "鏄嗘槑"}); + add(new String[]{"浜戝崡鐪佸缓绛戞潗鏂欏鐮旂┒璁捐闄�", "鏄嗘槑"}); + add(new String[]{"浜戝崡娴嬬粯宸ョ▼闄�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鐪佺涓�杞诲伐鏈烘鍘�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鏃ユ姤绀惧崟浣嶆埧", "鏄嗘槑"}); + add(new String[]{"浜戝崡鐧借嵂鍘傚崟浣嶇鍒╂埧", "鏄嗘槑"}); + add(new String[]{"浜戝崡澶у涓滀簩闄�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鐪佸鍏氭牎鐢熸椿鍖�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鍗拌薄鍩庡埆澧�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鐧借嵂绂忓埄鎴�", "鏄嗘槑"}); + }}); + city_DistrictNames.put("鐜夋邯", new ArrayList(){{ + add(new String[]{"鐜夋邯楂樹粨鏃朵唬鏄庣彔", "鐜夋邯"}); + add(new String[]{"鐜夋邯涓�灏忓尯", "鐜夋邯"}); + }}); + city_DistrictNames.put("鍚夋灄", new ArrayList(){{ + add(new String[]{"鍚夋灄澶у帵", "娴峰彛"}); + add(new String[]{"鍚夋灄鑺卞洯", "璐甸槼"}); + add(new String[]{"鍚夋灄绀惧尯", "姝︽眽"}); + add(new String[]{"鍚夋灄鐪佸洟鏍″灞炴ゼ", "闀挎槬"}); + add(new String[]{"鍚夋灄閲�", "澶╂触"}); + }}); + city_DistrictNames.put("闀挎槬", new ArrayList(){{ + add(new String[]{"闀挎槬鏄庣彔", "闀挎槬"}); + add(new String[]{"闀挎槬缁忔祹寮�鍙戝尯缁忓紑鍏尯", "闀挎槬"}); + add(new String[]{"闀挎槬涓囩鍩庡競鑺卞洯", "闀挎槬"}); + add(new String[]{"闀挎槬閾跺骇", "闀挎槬"}); + add(new String[]{"闀挎槬璞洯", "闀挎槬"}); + add(new String[]{"闀挎槬鐞嗗伐澶у瀹跺睘妤�", "闀挎槬"}); + add(new String[]{"闀挎槬宸ョ▼瀛﹂櫌瀹胯垗", "闀挎槬"}); + add(new String[]{"闀挎槬宸ヤ笟澶у鍏瘬", "闀挎槬"}); + add(new String[]{"闀挎槬宸ュぇ浣忓畢", "闀挎槬"}); + add(new String[]{"闀挎槬甯傚弻闃冲尯瀹㈣繍缁煎悎鏈嶅姟鍖�", "闀挎槬"}); + add(new String[]{"闀挎槬甯備笢鑻�15鍙锋ゼ", "闀挎槬"}); + add(new String[]{"闀挎槬鏄嗕粦", "闀挎槬"}); + add(new String[]{"闀挎槬鏉�", "鍗楁槍"}); + add(new String[]{"闀挎槬灏忓尯", "姝︽眽"}); + add(new String[]{"闀挎槬瑗块噷", "澶╂触"}); + add(new String[]{"闀挎槬灏忓尯", "瑗勯槼"}); + add(new String[]{"闀挎槬灏忓尯鐢垫皵鍖�", "瑗勯槼"}); + add(new String[]{"闀挎槬鑻戝皬鍖�", "涔岄瞾鏈ㄩ綈"}); + add(new String[]{"闀挎槬鑺卞洯 (闀挎槬鑺辫嫅)", "涔岄瞾鏈ㄩ綈"}); + add(new String[]{"闀挎槬鑺卞洯", "娣卞湷"}); + add(new String[]{"闀挎槬鑺卞洯", "绂忓窞"}); + add(new String[]{"闀挎槬鑺卞洯", "澶ц繛"}); + add(new String[]{"闀挎槬鑺卞洯鍩�", "娓╁窞"}); + add(new String[]{"闀挎槬閲�", "澶╂触"}); + add(new String[]{"闀挎槬瑙傜ぞ鍖�", "姝︽眽"}); + add(new String[]{"闀挎槬灏忓尯浜屾湡", "姝︽眽"}); + add(new String[]{"闀挎槬閽荤煶鍩�", "闀挎槬"}); + add(new String[]{"闀挎槬甯傚痉闃宠喘鐗╀腑蹇�", "闀挎槬"}); + add(new String[]{"闀挎槬閮藉競璞涵", "鍚堣偉"}); + add(new String[]{"闀挎槬鑺卞洯", "鏄嗘槑"}); + add(new String[]{"闀挎槬閮藉競鑺卞洯", "鍚堣偉"}); + add(new String[]{"闀挎槬鑻�", "涓婃捣"}); + add(new String[]{"闀挎槬鏂拌嫅", "涓婃捣"}); + add(new String[]{"闀挎槬灏忓尯", "涓婃捣"}); + add(new String[]{"闀挎槬鍏瘬", "涓婃捣"}); + add(new String[]{"闀挎槬鑺卞洯鍩�", "鐟炲畨"}); + add(new String[]{"闀挎槬浜屽尯", "涔変箤"}); + add(new String[]{"闀挎槬涓夊尯", "涔変箤"}); + add(new String[]{"闀挎槬灏忓尯", "涔変箤"}); + add(new String[]{"闀挎槬涓夊尯", "閲戝崕"}); + add(new String[]{"闀挎槬灏忓尯", "閲戝崕"}); + add(new String[]{"闀挎槬浜屽尯", "閲戝崕"}); + add(new String[]{"闀挎槬绾㈡槦缇庡嚡榫欏叏鐞冨灞呯敓娲诲箍鍦�", "闀挎槬"}); + add(new String[]{"闀挎槬鏄庣彔浜屾湡", "闀挎槬"}); + }}); + city_DistrictNames.put("灞变笢", new ArrayList(){{ + add(new String[]{"灞变笢閲�", "绉︾殗宀�"}); + add(new String[]{"灞变笢缁忔祹瀛﹂櫌瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢鐪佸崼鐢熷巺瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢鐪佹皯鏀垮巺瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢鐪佸晢涓氶泦鍥㈡�诲叕鍙稿鑸�", "娴庡崡"}); + add(new String[]{"灞变笢鍖荤澶у鏁欏笀瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢澶栬锤澶у帵", "闈掑矝"}); + add(new String[]{"灞变笢澶у帵", "娣卞湷"}); + add(new String[]{"灞变笢鍫$ぞ鍖�", "娌堥槼"}); + add(new String[]{"灞变笢鑹烘湳瀛﹂櫌瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢榛勯噾宕簯婀栭珮灏斿か鍒", "娴庡崡"}); + add(new String[]{"灞变笢鍙告硶璀﹀畼瀛﹂櫌瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢鐪佺瀛﹂櫌楂樻柊鎶�鏈爺绌跺垎闄�", "闈掑矝"}); + add(new String[]{"灞变笢寤哄伐瀛﹂櫌瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢搴欏皬鍖�", "娌堥槼"}); + add(new String[]{"灞变笢涔冲北閾舵哗娴锋櫙鎴�", "濞佹捣"}); + add(new String[]{"灞变笢澶存潙", "闈掑矝"}); + add(new String[]{"灞变笢鐪佺暅鐗у眬瀹胯垗", "娴庡崡"}); + }}); + city_DistrictNames.put("濞佹捣", new ArrayList(){{ + add(new String[]{"濞佹捣浠佹煶搴勫埆澧�", "濞佹捣"}); + add(new String[]{"濞佹捣鍗庢柊鍥�", "濞佹捣"}); + add(new String[]{"濞佹捣涓尰闄�", "濞佹捣"}); + add(new String[]{"濞佹捣瑗垮尽搴�", "濞佹捣"}); + add(new String[]{"濞佹捣鐭冲矝纰ф捣楣忓煄", "濞佹捣"}); + add(new String[]{"濞佹捣澶╅箙婀栫晹", "濞佹捣"}); + add(new String[]{"濞佹捣娲查檯浼戦棽鏃呮父搴﹀亣鍖�", "濞佹捣"}); + add(new String[]{"濞佹捣鑻�", "涓婃捣"}); + add(new String[]{"濞佹捣鍒", "涓婃捣"}); + add(new String[]{"濞佹捣澶фゼ", "涓婃捣"}); + }}); + city_DistrictNames.put("娴欐睙", new ArrayList(){{ + add(new String[]{"娴欐睙宸ヤ笟澶у鏁欏笀瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙澶у帵", "澶師"}); + add(new String[]{"娴欐睙鍔炰簨澶勫鑸�", "澶師"}); + add(new String[]{"娴欐睙浠佸拰灞呰�佸勾鍏荤敓鍏瘬", "婀栧窞"}); + add(new String[]{"娴欐睙浜よ繍澶у帵", "鏉窞"}); + add(new String[]{"娴欐睙宸ュ晢澶у瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙鍟嗚锤鍩�", "鍚堣偉"}); + add(new String[]{"娴欐睙宸ヤ笟澶у涔嬫睙瀛﹂櫌", "鏉窞"}); + }}); + city_DistrictNames.put("閲戝崕", new ArrayList(){{ + add(new String[]{"閲戝崕閲�", "鍖椾含"}); + add(new String[]{"閲戝崕鑻�", "娴峰彛"}); + add(new String[]{"閲戝崕鏂版潙", "澶ц繛"}); + add(new String[]{"閲戝崕鍏瘬", "闈掑矝"}); + add(new String[]{"閲戝崕鍥�", "涓北"}); + add(new String[]{"閲戝崕鑺卞洯", "涓滆帪"}); + add(new String[]{"閲戝崕涓栧", "璐甸槼"}); + add(new String[]{"閲戝崕鍥�", "璐甸槼"}); + add(new String[]{"閲戝崕鑺卞洯", "骞垮窞"}); + add(new String[]{"閲戝崕鏂版潙", "鏉窞"}); + add(new String[]{"閲戝崕鑻�", "娼嶅潑"}); + add(new String[]{"閲戝崕涓藉皬鍖�", "娼嶅潑"}); + add(new String[]{"閲戝崕鑺卞洯", "閲嶅簡"}); + add(new String[]{"閲戝崕闃�", "娣卞湷"}); + add(new String[]{"閲戝崕澶у帵澶ф浮鍙�", "閲嶅簡"}); + add(new String[]{"閲戝崕鑻戝皬鍖�", "閲嶅簡"}); + add(new String[]{"閲戝崕閲�", "澶╂触"}); + add(new String[]{"閲戝崕灏忓尯", "鐭冲搴�"}); + add(new String[]{"閲戝崕澶у帵", "閲嶅簡"}); + add(new String[]{"閲戝崕鍥�", "閲嶅簡"}); + add(new String[]{"閲戝崕浜戦紟", "閲嶅簡"}); + add(new String[]{"閲戝崕鍥�", "娌堥槼"}); + add(new String[]{"閲戝崕鍏瘬", "鎴愰兘"}); + add(new String[]{"閲戝崕鑻�", "鎴愰兘"}); + add(new String[]{"閲戝崕澶у帵", "姝︽眽"}); + add(new String[]{"閲戝崕瀛﹀簻", "鍛煎拰娴╃壒"}); + add(new String[]{"閲戝崕涓栧鍒", "璐甸槼"}); + add(new String[]{"閲戝崕鍏瘬", "绂忓窞"}); + add(new String[]{"閲戝崕灏忓尯", "澶ц繛"}); + add(new String[]{"閲戝崕閲岋紙瑗块潚锛�", "澶╂触"}); + add(new String[]{"閲戝崕妤�", "鍘﹂棬"}); + add(new String[]{"閲戝崕鑻�", "鍏板窞"}); + add(new String[]{"閲戝崕鍥埆澧�", "鍖椾含"}); + add(new String[]{"閲戝崕灏忓尯涓夋湡", "澶ц繛"}); + add(new String[]{"閲戝崕鑺卞洯", "涓北"}); + add(new String[]{"閲戝崕鍥�", "浣涘北"}); + add(new String[]{"閲戝崕鑻�", "闈掑矝"}); + add(new String[]{"閲戝崕灏忓尯浜屾湡", "澶ц繛"}); + add(new String[]{"閲戝崕鍥�", "鏄嗘槑"}); + add(new String[]{"閲戝崕鑻�", "涓婃捣"}); + add(new String[]{"閲戝崕鍥�", "鍖椾含"}); + add(new String[]{"閲戝崕鏂版潙", "涓婃捣"}); + add(new String[]{"閲戝崕鍏徃瀹胯垗", "鏄嗘槑"}); + add(new String[]{"閲戝崕鑻�", "骞抽《灞�"}); + add(new String[]{"閲戝崕瀹跺洯 ", "鐩橀敠"}); + add(new String[]{"閲戝崕瀹跺洯", "鐩橀敠"}); + add(new String[]{"閲戝崕涓囪揪骞垮満", "閲戝崕"}); + add(new String[]{"閲戝崕涓栬锤涓績", "閲戝崕"}); + add(new String[]{"閲戝崕姹介厤鍩庝簩鏈�", "閲戝崕"}); + add(new String[]{"閲戝崕宸蜂竴鍙�", "鏀�鏋濊姳"}); + }}); + city_DistrictNames.put("涔変箤", new ArrayList(){{ + add(new String[]{"涔変箤鎵瑰彂甯傚満", "閲嶅簡"}); + add(new String[]{"涔変箤灏忓晢鍝佹壒鍙戝煄", "鎯犲窞"}); + add(new String[]{"涔変箤鍏瘬", "鎯犲窞"}); + add(new String[]{"涔変箤閲戣寕澶у帵", "涔変箤"}); + add(new String[]{"涔変箤涓栫邯鍟嗗煄", "涔変箤"}); + add(new String[]{"涔変箤娆ф櫙鍚嶅煄", "涔変箤"}); + add(new String[]{"涔変箤鐜颁唬鍩�", "涔変箤"}); + add(new String[]{"涔変箤鏃朵唬鑺卞洯", "涔変箤"}); + add(new String[]{"涔変箤閲戣寕澶у帵", "閲戝崕"}); + add(new String[]{"涔変箤涓栫邯鍟嗗煄", "閲戝崕"}); + add(new String[]{"涔変箤鏃朵唬鑺卞洯", "閲戝崕"}); + add(new String[]{"涔変箤瑗垮煄骞垮満", "閲戝崕"}); + add(new String[]{"涔変箤鐜颁唬鍩�", "閲戝崕"}); + add(new String[]{"涔変箤娆ф櫙鍚嶅煄", "閲戝崕"}); + }}); + city_DistrictNames.put("姹熻嫃", new ArrayList(){{ + add(new String[]{"姹熻嫃鐪佸啘绉戦櫌", "鍗椾含"}); + add(new String[]{"姹熻嫃娌圭敯鐭虫补灞卞簞", "鎵窞"}); + add(new String[]{"姹熻嫃璀﹀畼瀛﹂櫌", "鍗椾含"}); + add(new String[]{"姹熻嫃鐪侀珮绾т笓瀹跺洯", "鍗椾含"}); + add(new String[]{"姹熻嫃娌圭敯鐭虫补灞卞簞", "鎵窞"}); + add(new String[]{"姹熻嫃璁簨鍥�", "鍗椾含"}); + add(new String[]{"姹熻嫃鍥介檯濉戝寲鍩�", "甯稿窞"}); + add(new String[]{"姹熻嫃涓囧拰鍥介檯鍟嗚锤鍩�", "甯稿窞"}); + }}); + city_DistrictNames.put("瀹胯縼", new ArrayList(){{ + }}); + city_DistrictNames.put("杈藉畞", new ArrayList(){{ + add(new String[]{"杈藉畞涓尰瀹跺睘妤�", "娌堥槼"}); + add(new String[]{"杈藉畞閲�", "澶╂触"}); + }}); + city_DistrictNames.put("闉嶅北", new ArrayList(){{ + add(new String[]{"闉嶅北鎭掑熀鍏嗕笟鍥灄璺湴鍧�", "闉嶅北"}); + add(new String[]{"闉嶅北鎭掑ぇ缁挎床", "闉嶅北"}); + add(new String[]{"闉嶅北涓夋潙", "涓婃捣"}); + add(new String[]{"闉嶅北鍥涙潙", "涓婃捣"}); + add(new String[]{"闉嶅北鍏潙", "涓婃捣"}); + add(new String[]{"闉嶅北涓冩潙", "涓婃捣"}); + add(new String[]{"闉嶅北鍏潙", "涓婃捣"}); + add(new String[]{"闉嶅北涓�鏉�", "涓婃捣"}); + add(new String[]{"闉嶅北浜旀潙", "涓婃捣"}); + }}); + city_DistrictNames.put("绂忓缓", new ArrayList(){{ + add(new String[]{"绂忓缓鍥�", "鍗楀畞"}); + add(new String[]{"绂忓缓鐪佸洓寤哄鑸嶅寳闂�", "鍘﹂棬"}); + add(new String[]{"绂忓缓鑱旈�氳姳鍥�", "绂忓窞"}); + add(new String[]{"绂忓缓鏃ユ姤绀惧鑸�", "绂忓窞"}); + add(new String[]{"绂忓缓鐪佷腑蹇冩楠屾墍鍗曚綅瀹胯垗", "绂忓窞"}); + add(new String[]{"绂忓缓鐢靛奖鍒剁墖鍘傚崟浣嶅鑸�", "绂忓窞"}); + add(new String[]{"绂忓缓鐪佸コ瀛愮洃鐙卞鑸�", "绂忓窞"}); + add(new String[]{"绂忓缓鐪佸尰鑽叕鍙稿ぇ鐜嬮噷鍗曚綅瀹胯垗", "绂忓窞"}); + add(new String[]{"绂忓缓鐪佺浜屽叕璺伐绋嬪叕鍙稿鑸�", "绂忓窞"}); + add(new String[]{"绂忓缓鐪佽殨妗戠爺绌舵墍鍗曚綅瀹胯垗", "绂忓窞"}); + add(new String[]{"绂忓缓鏂版潙", "鍗椾含"}); + add(new String[]{"绂忓缓閲�", "澶╂触"}); + add(new String[]{"绂忓缓绀惧尯", "姝︽眽"}); + add(new String[]{"绂忓缓澶у帵", "璐甸槼"}); + add(new String[]{"绂忓缓宸峰皬鍖�", "鎴愰兘"}); + add(new String[]{"绂忓缓澶у帵", "娣卞湷"}); + add(new String[]{"绂忓缓鐢熸�佸伐绋嬪鏍″崟浣嶅鑸�", "绂忓窞"}); + add(new String[]{"绂忓缓鍖荤澶у鏁欏伐瀹胯垗", "绂忓窞"}); + }}); + city_DistrictNames.put("鍘﹂棬", new ArrayList(){{ + add(new String[]{"鍘﹂棬鍥介檯骞垮満", "鍘﹂棬"}); + add(new String[]{"鍘﹂棬澶у鍩�", "鍘﹂棬"}); + add(new String[]{"鍘﹂棬鍗冪Η鍥�", "鍘﹂棬"}); + add(new String[]{"鍘﹂棬缃愬ご鍘傚鑸�", "鍘﹂棬"}); + add(new String[]{"鍘﹂棬姘戦槻", "鍘﹂棬"}); + add(new String[]{"鍘﹂棬鑾插潅鏂板皬鍖�", "鍘﹂棬"}); + add(new String[]{"鍘﹂棬閽㈢獥鍘傚鑸�", "鍘﹂棬"}); + add(new String[]{"鍘﹂棬閫犺埞鍘傚鑸�", "鍘﹂棬"}); + add(new String[]{"鍘﹂棬鑸┖瀹胯垗", "绂忓窞"}); + add(new String[]{"鍘﹂棬甯備腑蹇冭绔欏鑸嶆ゼ", "鍘﹂棬"}); + add(new String[]{"鍘﹂棬鍖昏嵂绔欏鑸�", "鍘﹂棬"}); + add(new String[]{"鍘﹂棬琛岃溅鍏瘬", "鍘﹂棬"}); + add(new String[]{"鍘﹂棬鍥介檯鏂囧寲澶у帵", "鍘﹂棬"}); + add(new String[]{"鍘﹂棬鍗庤嫅", "鐩愬煄"}); + add(new String[]{"鍘﹂棬鐢垫満鍘傚鑸�", "鍘﹂棬"}); + }}); + city_DistrictNames.put("娴峰崡", new ArrayList(){{ + add(new String[]{"娴峰崡涔嬪績", "娴峰彛"}); + add(new String[]{"娴峰崡澶у鍗楀笇绉戞妧鑻�", "娴峰彛"}); + add(new String[]{"娴峰崡鏃ユ姤绀惧鑸�", "娴峰彛"}); + add(new String[]{"娴峰崡鐪佸璁℃満鍏崇編鑸嶄綇瀹呭尯", "娴峰彛"}); + add(new String[]{"娴峰崡绀句繚", "娴峰彛"}); + add(new String[]{"娴峰崡鐪佷汉澶у父濮斾細鏈哄叧浣忓畢灏忓尯", "娴峰彛"}); + add(new String[]{"娴峰崡澶у鏁欏笀瀹胯垗", "娴峰彛"}); + add(new String[]{"娴峰崡鐕冨寲鍏徃瀹胯垗", "娴峰彛"}); + add(new String[]{"娴峰崡鐪佷綋鏍″鑸�", "娴峰彛"}); + add(new String[]{"娴峰崡缁熻灞�瀹胯垗", "娴峰彛"}); + add(new String[]{"娴峰崡鐪佸伐鍟嗛摱琛屽鑸�", "娴峰彛"}); + add(new String[]{"娴峰崡宸ュ晢澶у帵", "娴峰彛"}); + add(new String[]{"娴峰崡鏃朵唬骞垮満", "娴峰彛"}); + add(new String[]{"娴峰崡甯堣寖瀛﹂櫌閲戣姳鍥�", "娴峰彛"}); + add(new String[]{"娴峰崡澶у帵", "娴峰彛"}); + add(new String[]{"娴峰崡鐢靛姏鍘傚鑸�", "娴峰彛"}); + add(new String[]{"娴峰崡鐪佷笁浜氬叚寤哄崟浣�", "涓変簹"}); + add(new String[]{"娴峰崡闄垫按瀵屽姏婀�", "涓変簹"}); + add(new String[]{"娴峰崡澶у叕棣�", "娴峰彛"}); + add(new String[]{"娴峰崡缇庢灄婀栧浗闄呭害鍋囩ぞ鍖�", "涓変簹"}); + add(new String[]{"娴峰崡瀹跺洯", "鍖椾含"}); + add(new String[]{"娴峰崡骞蹭紤鎵�", "骞垮窞"}); + add(new String[]{"娴峰崡缁垮煄娓呮按婀�", "涓変簹"}); + add(new String[]{"娴峰崡路涓変簹路缇庝簹涔嬪績", "涓変簹"}); + add(new String[]{"娴峰崡瑗垮紕51寮�", "涓婃捣"}); + add(new String[]{"娴峰崡骞蹭紤鎵�锛堝ぉ娌筹級", "骞垮窞"}); + add(new String[]{"娴峰崡鍚庢捣娓╂硥灏忛晣", "閲嶅簡"}); + }}); + city_DistrictNames.put("涓変簹", new ArrayList(){{ + add(new String[]{"涓変簹閲戣摑婀惧皬鍖�", "涓変簹"}); + add(new String[]{"涓変簹杩滄磱鍏", "涓変簹"}); + add(new String[]{"涓変簹娴峰渤鍗婂矝鎴愰偊", "涓変簹"}); + add(new String[]{"涓変簹鍖椾含鍏", "涓変簹"}); + add(new String[]{"涓変簹鑽e痉鑻�", "涓変簹"}); + add(new String[]{"涓変簹妞板矝闃冲厜鑺卞洯", "涓変簹"}); + add(new String[]{"涓変簹鑺牑闆呭害鍋囬厭搴�", "涓変簹"}); + add(new String[]{"涓変簹鐖辩惔娴峰哺搴峰勾濂楁埧搴﹀亣閰掑簵", "涓変簹"}); + add(new String[]{"涓変簹婀剧孩鏍戞灄", "涓変簹"}); + add(new String[]{"涓変簹鍗拌薄", "涓変簹"}); + add(new String[]{"涓変簹閲戜腑娴疯摑閽�", "涓変簹"}); + add(new String[]{"涓変簹涓滃哺鍋囨棩", "涓変簹"}); + add(new String[]{"涓変簹妞版渤婀�", "涓変簹"}); + add(new String[]{"涓変簹婀剧孩鏍戞灄", "涓変簹"}); + add(new String[]{"涓変簹鑺卞紑鍥涘", "涓変簹"}); + add(new String[]{"涓変簹鍗拌薄", "涓変簹"}); + add(new String[]{"涓変簹楦挎床浣冲洯", "涓変簹"}); + add(new String[]{"涓変簹榄呭姏涔嬪啝", "涓変簹"}); + add(new String[]{"涓変簹娴锋ゼ浜戞湀", "涓変簹"}); + add(new String[]{"涓変簹婀捐摑鑹叉捣宀�", "涓変簹"}); + add(new String[]{"涓変簹蹇冨ぉ鍦�", "涓変簹"}); + add(new String[]{"涓変簹鏃朵唬娴峰哺", "涓変簹"}); + add(new String[]{"涓変簹鏄熸捣搴﹀亣鍏瘬", "涓変簹"}); + add(new String[]{"涓変簹妞版櫙鍗楀哺", "涓変簹"}); + add(new String[]{"涓変簹姘戣埅灞�灏忓尯", "涓変簹"}); + add(new String[]{"涓変簹鍑ゅ嚢姘村煄", "涓変簹"}); + add(new String[]{"涓変簹涓借嫅", "涓変簹"}); + add(new String[]{"涓変簹鍥藉厜婊ㄦ捣鑺卞洯", "涓変簹"}); + add(new String[]{"涓変簹姒嗘灄婀撅紙閲戣壊骞村崕娴锋櫙灏忓尯锛�", "涓変簹"}); + add(new String[]{"涓変簹娉板拰鑺卞洯", "涓変簹"}); + add(new String[]{"涓変簹鏂板ぇ娲插嵃璞�", "涓変簹"}); + add(new String[]{"涓変簹鐩戠嫳灏忓尯", "涓変簹"}); + add(new String[]{"涓変簹涓夋案鍑ゅ嚢鍩�", "涓変簹"}); + add(new String[]{"涓変簹鍑ゅ嚢姘村煄鍑ゅ嚢婀�", "涓変簹"}); + add(new String[]{"涓変簹椴佽兘娓歌墖浜屽尯", "涓変簹"}); + add(new String[]{"涓変簹椴佽兘缇庝附涓夊尯", "涓変簹"}); + add(new String[]{"涓変簹娴蜂箣闊�", "涓変簹"}); + add(new String[]{"涓変簹鐜崼灞�瀹胯垗", "涓変簹"}); + add(new String[]{"涓変簹鍥介檯楗簵", "涓変簹"}); + add(new String[]{"涓変簹缇庝附涔嬭嫅", "涓変簹"}); + add(new String[]{"涓変簹楦挎床鍥介檯鍏", "涓変簹"}); + add(new String[]{"涓変簹姹囧嚡鑺卞洯", "涓変簹"}); + add(new String[]{"涓変簹鍗楁柊鑱屽伐浣忓畢妤�", "涓変簹"}); + add(new String[]{"涓変簹鍚屽績瀹跺洯", "涓変簹"}); + add(new String[]{"涓変簹鍗楁捣浣冲洯", "涓変簹"}); + add(new String[]{"涓変簹绱豹娴锋櫙閰掑簵", "涓変簹"}); + add(new String[]{"涓変簹鑵炬稕鍏瘬", "涓変簹"}); + add(new String[]{"涓変簹甯傚缓绛戝伐绋嬫�诲叕鍙镐綇瀹呭皬鍖�", "涓変簹"}); + add(new String[]{"涓変簹婀鹃缚杩愭ゼ", "涓変簹"}); + add(new String[]{"涓変簹娴疯埅灏忓尯涓�鏈熶簩鏈�", "涓変簹"}); + add(new String[]{"涓変簹缁垮矝鍏瘬", "涓変簹"}); + add(new String[]{"涓変簹婀炬垜閲婃捣", "涓変簹"}); + add(new String[]{"涓変簹浜ら�氬皬鍖�", "涓変簹"}); + add(new String[]{"涓変簹闃冲厜瀹跺洯", "涓変簹"}); + add(new String[]{"涓変簹娴锋花鍋囨棩鍒", "涓変簹"}); + add(new String[]{"涓変簹鍦g厹鑺卞洯", "涓変簹"}); + add(new String[]{"涓変簹閲戣寕娴锋櫙鍏瘬", "涓変簹"}); + add(new String[]{"涓変簹娓呭钩涔�", "涓変簹"}); + add(new String[]{"涓変簹甯傞粍閲戝箍鍦�", "涓変簹"}); + add(new String[]{"涓変簹棣ㄦ捣婀�", "涓変簹"}); + add(new String[]{"涓変簹绂忕憺鍥介檯鍏", "涓変簹"}); + add(new String[]{"涓変簹甯傞鍝佸巶鑱屽伐瀹夌疆鎴�", "涓変簹"}); + add(new String[]{"涓変簹婀惧浗闄呭叕棣�", "涓変簹"}); + add(new String[]{"涓変簹灞�", "涓変簹"}); + add(new String[]{"涓変簹瀵屾槬灞卞眳", "涓変簹"}); + add(new String[]{"涓変簹楂樼骇鐭ヨ瘑鍒嗗瓙浣忓畢鍥�", "涓変簹"}); + add(new String[]{"涓変簹鐜崼灞�瀹胯垗", "涓変簹"}); + add(new String[]{"涓変簹濂囨灄鐢熸�佽姳鍥皬鍖�", "涓変簹"}); + add(new String[]{"涓変簹宥烘捣", "涓変簹"}); + add(new String[]{"涓変簹缇庝附鏄ュぉ娓╂硥搴﹀亣閰掑簵鍏瘬", "涓変簹"}); + add(new String[]{"涓変簹涓芥櫙娓╂硥", "涓変簹"}); + add(new String[]{"涓変簹骞垮弸鑺卞洯", "涓変簹"}); + add(new String[]{"涓変簹鑺卞啝娓旀瓕娴烽煹", "涓変簹"}); + add(new String[]{"涓変簹路灞辨按鍥介檯", "涓変簹"}); + add(new String[]{"涓変簹鍗撹揪瀛i鑻�", "涓変簹"}); + add(new String[]{"涓変簹濉樺皬鍖�", "鎯犲窞"}); + add(new String[]{"涓変簹涓綋濂ユ灄鍖瑰厠婀�", "涓変簹"}); + add(new String[]{"涓変簹婀鹃瞾鑳介珮灏斿か涓夊尯鍒", "涓変簹"}); + add(new String[]{"涓変簹甯傛垜鏄竴鍙奔", "涓変簹"}); + add(new String[]{"涓変簹杈板厜鍋囨棩閰掑簵", "涓変簹"}); + add(new String[]{"涓変簹娴锋偊鍙�", "涓変簹"}); + add(new String[]{"涓変簹楂樼骇鐭ヨ瘑鍒嗗瓙浣忓畢鍥�", "涓変簹"}); + add(new String[]{"涓変簹婀捐摑娉㈡咕", "涓変簹"}); + add(new String[]{"涓変簹鍑ゅ嚢宀�", "涓変簹"}); + add(new String[]{"涓変簹鐖辩惔娴峰哺", "涓変簹"}); + add(new String[]{"涓変簹婀捐摑鑹叉捣宀�", "涓変簹"}); + add(new String[]{"涓変簹婀剧ⅶ娴疯摑澶�", "涓変簹"}); + add(new String[]{"涓変簹娴锋ゼ浜戞湀", "涓変簹"}); + }}); + city_DistrictNames.put("瀹夊窘", new ArrayList(){{ + add(new String[]{"瀹夊窘甯堣寖澶у鏁欏笀鍏瘬", "鑺滄箹"}); + add(new String[]{"瀹夊窘鐢佃鍙板鑸�", "鍚堣偉"}); + add(new String[]{"瀹夊窘鏃ユ姤绀惧鑸�", "鍚堣偉"}); + add(new String[]{"瀹夊窘澶у帵", "鐝犳捣"}); + add(new String[]{"瀹夊窘鏉傛妧鍥㈠鑸�", "鍚堣偉"}); + add(new String[]{"瀹夊窘璀﹀畼鑱屼笟瀛﹂櫌瀹胯垗", "鍚堣偉"}); + add(new String[]{"瀹夊窘绋庡姟瀛︽牎瀹胯垗", "鍚堣偉"}); + add(new String[]{"瀹夊窘姹介厤鍩�", "鍚堣偉"}); + add(new String[]{"瀹夊窘鍥藉己閽㈡潗浜ゆ槗涓績", "鍚堣偉"}); + add(new String[]{"瀹夊窘鍥介檯璐墿骞垮満", "鍚堣偉"}); + add(new String[]{"瀹夊窘澶у競鍦�", "鍚堣偉"}); + }}); + city_DistrictNames.put("鍚堣偉", new ArrayList(){{ + add(new String[]{"鍚堣偉鏅氭姤绀惧鑸�", "鍚堣偉"}); + add(new String[]{"鍚堣偉閾濆巶瀹胯垗", "鍚堣偉"}); + add(new String[]{"鍚堣偉瀛﹂櫌鏁欏笀瀹胯垗妤�", "鍚堣偉"}); + add(new String[]{"鍚堣偉閿佸巶瀹胯垗", "鍚堣偉"}); + add(new String[]{"鍚堣偉涓囪揪骞垮満", "鍚堣偉"}); + add(new String[]{"鍚堣偉鎭掑ぇ鍩�", "鍚堣偉"}); + add(new String[]{"鍚堣偉鍚堜綔缁忔祹骞垮満", "鍚堣偉"}); + add(new String[]{"鍚堣偉鎭掗�氶鍝佹壒鍙戝競鍦�", "鍚堣偉"}); + }}); + city_DistrictNames.put("姹熻嫃", new ArrayList(){{ + add(new String[]{"姹熻嫃鐪佸啘绉戦櫌", "鍗椾含"}); + add(new String[]{"姹熻嫃娌圭敯鐭虫补灞卞簞", "鎵窞"}); + add(new String[]{"姹熻嫃璀﹀畼瀛﹂櫌", "鍗椾含"}); + add(new String[]{"姹熻嫃鐪侀珮绾т笓瀹跺洯", "鍗椾含"}); + add(new String[]{"姹熻嫃娌圭敯鐭虫补灞卞簞", "鎵窞"}); + add(new String[]{"姹熻嫃璁簨鍥�", "鍗椾含"}); + add(new String[]{"姹熻嫃鍥介檯濉戝寲鍩�", "甯稿窞"}); + add(new String[]{"姹熻嫃涓囧拰鍥介檯鍟嗚锤鍩�", "甯稿窞"}); + }}); + city_DistrictNames.put("鐩愬煄", new ArrayList(){{ + add(new String[]{"鐩愬煄澶фˉ涓�", "鐩愬煄"}); + add(new String[]{"鐩愬煄甯傛湀婀栬姳鍩�", "鐩愬煄"}); + }}); + city_DistrictNames.put("骞胯タ澹棌", new ArrayList(){{ + add(new String[]{"骞胯タ澹棌鑷不鍖哄徃娉曞巺瀹胯垗", "鍗楀畞"}); + add(new String[]{"骞胯タ澹棌鑷不鍖哄啘涓氬巺瀹胯垗", "鍗楀畞"}); + }}); + city_DistrictNames.put("鍖楁捣", new ArrayList(){{ + add(new String[]{"鍖楁捣搴勫洯", "閭兏"}); + add(new String[]{"鍖楁捣宀�88鍙�", "娴峰彛"}); + add(new String[]{"鍖楁捣鏂板煄", "鐑熷彴"}); + add(new String[]{"鍖楁捣閾舵哗涔嬪瀹㈡爤", "鍗楀畞"}); + add(new String[]{"鍖楁捣鏂板眳", "闀挎槬"}); + add(new String[]{"鍖楁捣鍒嗗眬瀹跺睘闄�", "闈掑矝"}); + add(new String[]{"鍖楁捣鏂板煄", "濞佹捣"}); + add(new String[]{"鍖楁捣鍥涘悎闄�", "鍖椾含"}); + add(new String[]{"鍖楁捣鍏瘬", "娼嶅潑"}); + add(new String[]{"鍖楁捣瀹胯垗灏忓尯", "娼嶅潑"}); + add(new String[]{"鍖楁捣鍑棆鍥介檯鍟嗕綇澶у帵", "鍖楁捣"}); + add(new String[]{"鍖楁捣鑺卞洯", "鍖楁捣"}); + add(new String[]{"鍖楁捣绀惧尯", "娌堥槼"}); + add(new String[]{"鍖楁捣鍢夊洯", "娌堥槼"}); + add(new String[]{"鍖楁捣鍗庣編璐㈠瘜骞垮満", "鍖楁捣"}); + add(new String[]{"鍖楁捣浣宠嫅", "闈掑矝"}); + add(new String[]{"鍖楁捣鑳滃埄鍏ぞ鍒", "澶ц繛"}); + add(new String[]{"鍖楁捣鑺卞洯", "闈掑矝"}); + add(new String[]{"鍖楁捣鑳滃埄鍏ぞ", "澶ц繛"}); + add(new String[]{"鍖楁捣鏄庣彔", "娼嶅潑"}); + add(new String[]{"鍖楁捣鑺卞洯", "鍝堝皵婊�"}); + add(new String[]{"鍖楁捣閲�", "澶╂触"}); + add(new String[]{"鍖楁捣鑺卞洯", "娼嶅潑"}); + add(new String[]{"鍖楁捣鑻�", "缁嶅叴"}); + add(new String[]{"鍖楁捣鑺卞洯", "缁嶅叴"}); + add(new String[]{"鍖楁捣澶у帵鍏瘬", "涓婃捣"}); + add(new String[]{"鍖楁捣鏂拌嫅", "涓婃捣"}); + add(new String[]{"鍖楁捣宀镐竴鍝侀榿", "闈掑矝"}); + add(new String[]{"鍖楁捣鑻�", "闈掑矝"}); + add(new String[]{"鍖楁捣鑺卞洯", "鐩愬煄"}); + add(new String[]{"鍖楁捣鍥涙湡", "鐩愬煄"}); + }}); + city_DistrictNames.put("姹熻嫃", new ArrayList(){{ + add(new String[]{"姹熻嫃鐪佸啘绉戦櫌", "鍗椾含"}); + add(new String[]{"姹熻嫃娌圭敯鐭虫补灞卞簞", "鎵窞"}); + add(new String[]{"姹熻嫃璀﹀畼瀛﹂櫌", "鍗椾含"}); + add(new String[]{"姹熻嫃鐪侀珮绾т笓瀹跺洯", "鍗椾含"}); + add(new String[]{"姹熻嫃娌圭敯鐭虫补灞卞簞", "鎵窞"}); + add(new String[]{"姹熻嫃璁簨鍥�", "鍗椾含"}); + add(new String[]{"姹熻嫃鍥介檯濉戝寲鍩�", "甯稿窞"}); + add(new String[]{"姹熻嫃涓囧拰鍥介檯鍟嗚锤鍩�", "甯稿窞"}); + }}); + city_DistrictNames.put("鑻忓窞", new ArrayList(){{ + add(new String[]{"鑻忓窞鍖楀贩", "澶ц繛"}); + add(new String[]{"鑻忓窞閲�", "澶╂触"}); + add(new String[]{"鑻忓窞鑺卞洯涓�鏈�", "涔岄瞾鏈ㄩ綈"}); + add(new String[]{"鑻忓窞鑺卞洯浜屾湡", "涔岄瞾鏈ㄩ綈"}); + add(new String[]{"鑻忓窞鑺卞洯", "瀹胯縼"}); + add(new String[]{"鑻忓窞灏忓尯", "鍖椾含"}); + add(new String[]{"鑻忓窞鍏瘬", "鍖椾含"}); + add(new String[]{"鑻忓窞骞昏薄", "娴庡崡"}); + add(new String[]{"鑻忓窞鍑ゅ嚢鏂囧寲骞垮満", "鑻忓窞"}); + add(new String[]{"鑻忓窞鍥介檯杞荤汉鍩�", "鑻忓窞"}); + add(new String[]{"鑻忓窞涓栬寕杩愭渤鍩�", "鑻忓窞"}); + add(new String[]{"鑻忓窞甯傛钵娴鎶�鍒涗笟鍥�", "鑻忓窞"}); + add(new String[]{"鑻忓窞楂樻柊鍖轰汉鍔涜祫婧愬ぇ鍘�", "鑻忓窞"}); + add(new String[]{"鑻忓窞鏂颁笢鏂规苯閰嶅煄", "鑻忓窞"}); + add(new String[]{"鑻忓窞绀煎搧鍟嗗搧鍩�", "鑻忓窞"}); + add(new String[]{"鑻忓窞娌挎捣鍥介檯涓績", "鑻忓窞"}); + add(new String[]{"鑻忓窞鏈虹數浜旈噾鍩�", "鑻忓窞"}); + add(new String[]{"鑻忓窞甯傛钵娴鎶�鍒涗笟鍥笢鍖�", "鑻忓窞"}); + add(new String[]{"鑻忓窞涓栬寕骞垮満鍏瘬", "鑻忓窞"}); + }}); + city_DistrictNames.put("甯哥啛", new ArrayList(){{ + add(new String[]{"甯哥啛鍖楅噷", "澶╂触"}); + add(new String[]{"甯哥啛鍗楅噷", "澶╂触"}); + add(new String[]{"甯哥啛涓叧鏉戠鎶�鍩�", "甯哥啛"}); + add(new String[]{"甯哥啛鑺卞洯", "甯哥啛"}); + add(new String[]{"甯哥啛婊ㄦ睙鑺卞洯", "甯哥啛"}); + }}); + city_DistrictNames.put("鍥涘窛", new ArrayList(){{ + add(new String[]{"鍥涘窛鐪佺洿鏈哄叧宸ュ瀹胯垗", "鎴愰兘"}); + add(new String[]{"鍥涘窛鐪佹灄涓氬巺瀹胯垗", "鎴愰兘"}); + add(new String[]{"鍥涘窛闊充箰瀛﹂櫌瀹胯垗", "鎴愰兘"}); + add(new String[]{"鍥涘窛鐪侀椊涓競椹荤枂鍔炰簨澶勫皬鍖�", "涔岄瞾鏈ㄩ綈"}); + add(new String[]{"鍥涘窛澶у帵", "鍘﹂棬"}); + add(new String[]{"鍥涘窛鐪佺鎶�鍘呭鑸�", "鎴愰兘"}); + add(new String[]{"鍥涘窛涓撶敤姹借溅鍘傚鑸�", "鎴愰兘"}); + add(new String[]{"鍥涘窛鏃ユ姤瀹胯垗", "鎴愰兘"}); + add(new String[]{"鍥涘窛鑹烘湳鑱屼笟瀛﹂櫌瀹跺睘妤�", "鎴愰兘"}); + add(new String[]{"鍥涘窛钀ヨ儭鍚�", "鍖椾含"}); + add(new String[]{"鍥涘窛灏忓尯", "涓婃捣"}); + add(new String[]{"鍥涘窛骞煎笀瀹胯垗", "鎴愰兘"}); + add(new String[]{"鍥涘窛澶у鍐滄灄鏉�", "鎴愰兘"}); + }}); + city_DistrictNames.put("瀹滃", new ArrayList(){{ + add(new String[]{"瀹滃鍖楅噷", "澶╂触"}); + add(new String[]{"瀹滃涓滈噷", "澶╂触"}); + add(new String[]{"瀹滃瑗块噷", "澶╂触"}); + add(new String[]{"瀹滃妤�", "澶╂触"}); + add(new String[]{"瀹滃瀛﹂櫌A鍖�", "瀹滃"}); + }}); + city_DistrictNames.put("浜戝崡", new ArrayList(){{ + add(new String[]{"浜戝崡澶у帵", "骞垮窞"}); + add(new String[]{"浜戝崡鐪佹潅鎶�鍥㈠灞為櫌", "鏄嗘槑"}); + add(new String[]{"浜戝崡鍗庝鲸鍩�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鑹烘湳瀹跺洯鍖�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鍐滀笟澶у鏁欏伐浣忓畢鍖�", "鏄嗘槑"}); + add(new String[]{"浜戝崡璐㈢粡澶у浣忓畢", "鏄嗘槑"}); + add(new String[]{"浜戝崡澶у榫欐硥璺皬鍖�", "鏄嗘槑"}); + add(new String[]{"浜戝崡宸ヤ笟鑱屼笟鎶�鏈闄�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鍗拌薄鍩�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鏄犺薄", "鏄嗘槑"}); + add(new String[]{"浜戝崡鐪佺暅鐗у眬瀹胯垗", "鏄嗘槑"}); + add(new String[]{"浜戝崡鐪佸缓绛戞潗鏂欏鐮旂┒璁捐闄�", "鏄嗘槑"}); + add(new String[]{"浜戝崡娴嬬粯宸ョ▼闄�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鐪佺涓�杞诲伐鏈烘鍘�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鏃ユ姤绀惧崟浣嶆埧", "鏄嗘槑"}); + add(new String[]{"浜戝崡鐧借嵂鍘傚崟浣嶇鍒╂埧", "鏄嗘槑"}); + add(new String[]{"浜戝崡澶у涓滀簩闄�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鐪佸鍏氭牎鐢熸椿鍖�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鍗拌薄鍩庡埆澧�", "鏄嗘槑"}); + add(new String[]{"浜戝崡鐧借嵂绂忓埄鎴�", "鏄嗘槑"}); + }}); + city_DistrictNames.put("涓芥睙", new ArrayList(){{ + add(new String[]{"涓芥睙鑺卞洯", "骞垮窞"}); + add(new String[]{"涓芥睙鑺卞洯宸﹀哺", "骞垮窞"}); + add(new String[]{"涓芥睙鑺卞洯鐜夋爲鍒櫌", "骞垮窞"}); + add(new String[]{"涓芥睙鑺卞洯涓藉瓧妤�", "骞垮窞"}); + add(new String[]{"涓芥睙鑺卞洯涔濆閫氭触", "骞垮窞"}); + add(new String[]{"涓芥睙鑺卞洯涓藉矝缈犲牑", "骞垮窞"}); + add(new String[]{"涓芥睙钃濇咕", "闀挎槬"}); + add(new String[]{"涓芥睙鑺卞洯", "闀挎槬"}); + add(new String[]{"涓芥睙鑼楀洯", "甯稿窞"}); + add(new String[]{"涓芥睙鍖�", "鍗楀畞"}); + add(new String[]{"涓芥睙鑺卞洯涓借崈妤�", "骞垮窞"}); + add(new String[]{"涓芥睙鑺卞洯涓芥尝妤�", "骞垮窞"}); + add(new String[]{"涓芥睙鏂伴兘", "瀹佹尝"}); + add(new String[]{"涓芥睙鑺卞洯", "涓北"}); + add(new String[]{"涓芥睙鍚嶅涵", "瀹佹尝"}); + add(new String[]{"涓芥睙鍏瘬", "涓変簹"}); + add(new String[]{"涓芥睙鑺卞洯", "娓╁窞"}); + add(new String[]{"涓芥睙缈犲洯", "闀挎矙"}); + add(new String[]{"涓芥睙姘磋姳鍥�", "閮戝窞"}); + add(new String[]{"涓芥睙搴﹀亣鍏瘬", "涓変簹"}); + add(new String[]{"涓芥睙鏂版潙", "骞垮窞"}); + add(new String[]{"涓芥睙鑺卞洯鐜嬪彴鍒", "骞垮窞"}); + add(new String[]{"涓芥睙鑺卞洯搴峰煄灞�", "骞垮窞"}); + add(new String[]{"涓芥睙鑺卞洯钀冮敠鑻�", "骞垮窞"}); + add(new String[]{"涓芥睙鑺卞洯鏄熸捣娲�", "骞垮窞"}); + add(new String[]{"涓芥睙鑺卞洯寰峰瓧妤�", "骞垮窞"}); + add(new String[]{"涓芥睙鑺卞洯妫曟婊�", "骞垮窞"}); + add(new String[]{"涓芥睙鑺卞洯鍗庢灄灞�", "骞垮窞"}); + add(new String[]{"涓芥睙鍗婂矝鑺卞洯", "鐭冲搴�"}); + add(new String[]{"涓芥睙鏂板眳", "姝︽眽"}); + add(new String[]{"涓芥睙鑻�", "姝︽眽"}); + add(new String[]{"涓芥睙璞涵", "璧e窞"}); + add(new String[]{"涓芥睙鍏", "璧e窞"}); + add(new String[]{"涓芥睙璞涵", "浣涘北"}); + add(new String[]{"涓芥睙鏉�", "鍗楀畞"}); + add(new String[]{"涓芥睙鑺辫嫅", "娓╁窞"}); + add(new String[]{"涓芥睙鑺卞洯4鏈熶附鍥洓鏅�", "涓北"}); + add(new String[]{"涓芥睙鑺卞洯", "鍗楀畞"}); + add(new String[]{"涓芥睙鑺卞洯钀冮敠鑻戝埆澧�", "骞垮窞"}); + add(new String[]{"涓芥睙鑺卞洯浜屾湡", "涓北"}); + add(new String[]{"涓芥睙鑺卞洯涓�鏈�", "涓北"}); + add(new String[]{"涓芥睙鑺卞洯鍥涙湡", "涓北"}); + add(new String[]{"涓芥睙涓�鏈�", "涓北"}); + add(new String[]{"涓芥睙鑺卞洯", "鎯犲窞"}); + add(new String[]{"涓芥睙鑺卞洯涓藉溅妤�", "骞垮窞"}); + add(new String[]{"涓芥睙鑺卞洯涓借尩妤�", "骞垮窞"}); + add(new String[]{"涓芥睙鑺卞洯涓藉奖妤�", "骞垮窞"}); + add(new String[]{"涓芥睙缈犲洯灞辨按閮�", "闀挎矙"}); + add(new String[]{"涓芥睙閿﹀涵", "涓婃捣"}); + add(new String[]{"涓芥睙鏉戝皬鍖�", "鍗楀畞"}); + add(new String[]{"涓芥睙鑻�", "涓婃捣"}); + add(new String[]{"涓芥睙浣宠嫅", "涓婃捣"}); + add(new String[]{"涓芥睙璞涵", "椤哄痉"}); + add(new String[]{"涓芥睙鑻�", "鑲囧簡"}); + add(new String[]{"涓芥睙鍚嶅涵", "濂夊寲"}); + add(new String[]{"涓芥睙灏忓尯", "閲嶅簡"}); + add(new String[]{"涓芥睙澶╀笅", "涓芥睙"}); + add(new String[]{"涓芥睙涓囬殕鑺卞洯", "涓芥睙"}); + add(new String[]{"涓芥睙鍙ゅ煄鐙瓙灞�", "涓芥睙"}); + add(new String[]{"涓芥睙鍖楅棬鍧�", "涓芥睙"}); + add(new String[]{"涓芥睙鍙ゅ煄", "涓芥睙"}); + add(new String[]{"涓芥睙鍋囨棩", "涓芥睙"}); + add(new String[]{"涓芥睙浜哄3鏈�", "涓芥睙"}); + add(new String[]{"涓芥睙浜哄绗笁鏈�", "涓芥睙"}); + add(new String[]{"涓芥睙浜哄鏂囩瑪鍥�", "涓芥睙"}); + add(new String[]{"涓芥睙姘戝眳", "涓芥睙"}); + add(new String[]{"涓芥睙浜哄鏂囩瑪鑻�", "涓芥睙"}); + add(new String[]{"涓芥睙浜哄鐗囧尯鐜夐緳鍥�", "涓芥睙"}); + add(new String[]{"涓芥睙鍙ゅ煄楂樺皵澶埆澧�", "涓芥睙"}); + add(new String[]{"涓芥睙1鍙峰埆澧�", "涓芥睙"}); + add(new String[]{"涓芥睙浜哄", "涓芥睙"}); + add(new String[]{"涓芥睙鏄犲儚", "涓芥睙"}); + add(new String[]{"涓芥睙浜哄涓夋湡", "涓芥睙"}); + add(new String[]{"涓芥睙浜哄鏂囨辰鍥�", "涓芥睙"}); + add(new String[]{"涓芥睙鍗拌薄", "涓芥睙"}); + add(new String[]{"涓芥睙1鍙�", "涓芥睙"}); + add(new String[]{"涓芥睙瀹跺洯", "涓芥睙"}); + add(new String[]{"涓芥睙鍚嶅眳", "涓芥睙"}); + add(new String[]{"涓芥睙涓�鍙�", "涓芥睙"}); + add(new String[]{"涓芥睙浜哄鐜夐緳鍥�", "涓芥睙"}); + add(new String[]{"涓芥睙鑺卞洯", "鐜夋灄"}); + add(new String[]{"涓芥睙鍩�", "娌虫簮"}); + add(new String[]{"涓芥睙璞涵", "娌虫簮"}); + add(new String[]{"涓芥睙闆呰嫅", "闃虫睙"}); + add(new String[]{"涓芥睙闃冲ぉ涓�", "涓芥睙"}); + add(new String[]{"涓芥睙浜哄鐧界帀鍥�", "涓芥睙"}); + add(new String[]{"涓芥睙鑻�", "鍏洏姘�"}); + add(new String[]{"涓芥睙楸肩背娌�", "涓芥睙"}); + add(new String[]{"涓芥睙鍙ゅ煄姘戝眳", "涓芥睙"}); + }}); + city_DistrictNames.put("榛戦緳姹�", new ArrayList(){{ + }}); + city_DistrictNames.put("鍝堝皵婊�", new ArrayList(){{ + add(new String[]{"鍝堝皵婊ㄦ槦鍏夎��骞垮満", "鍝堝皵婊�"}); + }}); + city_DistrictNames.put("杈藉畞", new ArrayList(){{ + add(new String[]{"杈藉畞涓尰瀹跺睘妤�", "娌堥槼"}); + add(new String[]{"杈藉畞閲�", "澶╂触"}); + }}); + city_DistrictNames.put("鐩橀敠", new ArrayList(){{ + add(new String[]{"鐩橀敠鑺卞洯", "鍗椾含"}); + add(new String[]{"鐩橀敠鍗庡簻", "鍗椾含"}); + add(new String[]{"鐩橀敠婕涓捣", "鐩橀敠"}); + add(new String[]{"鐩橀敠棣ㄦ偊灏忓尯", "鐩橀敠"}); + }}); + city_DistrictNames.put("娴欐睙", new ArrayList(){{ + add(new String[]{"娴欐睙宸ヤ笟澶у鏁欏笀瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙澶у帵", "澶師"}); + add(new String[]{"娴欐睙鍔炰簨澶勫鑸�", "澶師"}); + add(new String[]{"娴欐睙浠佸拰灞呰�佸勾鍏荤敓鍏瘬", "婀栧窞"}); + add(new String[]{"娴欐睙浜よ繍澶у帵", "鏉窞"}); + add(new String[]{"娴欐睙宸ュ晢澶у瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙鍟嗚锤鍩�", "鍚堣偉"}); + add(new String[]{"娴欐睙宸ヤ笟澶у涔嬫睙瀛﹂櫌", "鏉窞"}); + }}); + city_DistrictNames.put("娓╁窞", new ArrayList(){{ + add(new String[]{"娓╁窞澶у帵", "娴峰彛"}); + add(new String[]{"娓╁窞鍩�", "璐甸槼"}); + add(new String[]{"娓╁窞鍏瘬", "璐甸槼"}); + add(new String[]{"娓╁窞鍟嗗煄", "婀栧窞"}); + add(new String[]{"娓╁窞鍟嗗煄", "鍞愬北"}); + add(new String[]{"娓╁窞涓栬锤涓績澶у帵", "娓╁窞"}); + add(new String[]{"娓╁窞涓栬锤涓績骞垮満", "娓╁窞"}); + add(new String[]{"娓╁窞浜烘墠澶у帵", "娓╁窞"}); + add(new String[]{"娓╁窞榫欐咕涓囪揪骞垮満", "娓╁窞"}); + add(new String[]{"娓╁窞鍩幝烽兘涔愭眹", "娌堥槼"}); + add(new String[]{"娓╁窞鍟嗗煄", "閲戝崕"}); + }}); + city_DistrictNames.put("鐟炲畨", new ArrayList(){{ + add(new String[]{"鐟炲畨鍒涢��", "骞垮窞"}); + add(new String[]{"鐟炲畨鑺卞洯", "浣涘北"}); + add(new String[]{"鐟炲畨鑺卞洯", "骞垮窞"}); + add(new String[]{"鐟炲畨閲嶅簡澶╁湴", "閲嶅簡"}); + add(new String[]{"鐟炲畨灏忓尯", "閲嶅簡"}); + add(new String[]{"鐟炲畨鑺卞洯", "涓北"}); + add(new String[]{"鐟炲畨鍚嶉偢", "鍗楅��"}); + add(new String[]{"鐟炲畨澶у帵", "娓╁窞"}); + add(new String[]{"鐟炲畨鑻�", "鎴愰兘"}); + add(new String[]{"鐟炲畨瀹跺洯", "澶ц繛"}); + add(new String[]{"鐟炲畨澶у帵", "闀挎矙"}); + add(new String[]{"鐟炲畨路鍚涙眹", "鍖椾含"}); + add(new String[]{"鐟炲畨闆呮櫙鑻�", "鐟炲畨"}); + add(new String[]{"鐟炲畨澶у帵", "鐟炲畨"}); + add(new String[]{"鐟炲畨瀹忕憺澶у帵", "鐟炲畨"}); + add(new String[]{"鐟炲畨甯傚叴闅嗗鍥�", "鐟炲畨"}); + add(new String[]{"鐟炲畨鑺卞洯", "琛¢槼"}); + add(new String[]{"鐟炲畨妤�", "娌虫簮"}); + add(new String[]{"鐟炲畨鏃朵唬澶у帵", "娓╁窞"}); + add(new String[]{"鐟炲畨闆呮櫙鑻�", "娓╁窞"}); + add(new String[]{"鐟炲畨鏂颁笘绾ぇ鍘�", "娓╁窞"}); + }}); + city_DistrictNames.put("娌冲寳", new ArrayList(){{ + add(new String[]{"娌冲寳绋庡姟瀛︽牎鐢熸椿鍖�", "鐭冲搴�"}); + add(new String[]{"娌冲寳缁忔祹鏃ユ姤绀惧鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳缇庢湳鍑虹増绀惧鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳鐗╄祫瀹胯垗", "鐭冲搴�"}); + add(new String[]{"娌冲寳鍖栧伐鍖昏嵂鑱屼笟鎶�鏈闄㈠鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳鐢垫満瀹胯垗", "鐭冲搴�"}); + add(new String[]{"娌冲寳鏃ユ姤绀惧鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳宸ョ▼閫犱环绠$悊鎬荤珯瀹胯垗", "鐭冲搴�"}); + add(new String[]{"娌冲寳搴峰煄", "娼嶅潑"}); + add(new String[]{"娌冲寳绀惧尯", "娌堥槼"}); + add(new String[]{"娌冲寳鍖荤澶у瀹胯垗", "鐭冲搴�"}); + add(new String[]{"娌冲寳鐪佷汉澶у鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳鏂颁汉瀹�", "鍞愬北"}); + add(new String[]{"娌冲寳涓�鍙�", "鍞愬北"}); + add(new String[]{"娌冲寳鏈鸿灞�瀹胯垗", "鐭冲搴�"}); + add(new String[]{"娌冲寳骞挎挱鐢佃鎶ュ鑸�", "鐭冲搴�"}); + add(new String[]{"娌冲寳鍟嗗煄", "闈掑矝"}); + add(new String[]{"娌冲寳闀垮煄楗簵", "鐭冲搴�"}); + add(new String[]{"娌冲寳鏉戝皬鍖�", "鍖椾含"}); + add(new String[]{"娌冲寳妗冩睙閲�", "澶╂触"}); + add(new String[]{"娌冲寳甯堝ぇ闈掑勾鍏瘬妤�", "鐭冲搴�"}); + add(new String[]{"娌冲寳缁�", "鏃犻敗"}); + add(new String[]{"娌冲寳绀惧尯", "鏈邯"}); + add(new String[]{"娌冲寳妤�", "鍞愬北"}); + }}); + city_DistrictNames.put("寤婂潑", new ArrayList(){{ + add(new String[]{"寤婂潑涓囪揪骞垮満", "寤婂潑"}); + }}); + city_DistrictNames.put("鍥涘窛", new ArrayList(){{ + add(new String[]{"鍥涘窛鐪佺洿鏈哄叧宸ュ瀹胯垗", "鎴愰兘"}); + add(new String[]{"鍥涘窛鐪佹灄涓氬巺瀹胯垗", "鎴愰兘"}); + add(new String[]{"鍥涘窛闊充箰瀛﹂櫌瀹胯垗", "鎴愰兘"}); + add(new String[]{"鍥涘窛鐪侀椊涓競椹荤枂鍔炰簨澶勫皬鍖�", "涔岄瞾鏈ㄩ綈"}); + add(new String[]{"鍥涘窛澶у帵", "鍘﹂棬"}); + add(new String[]{"鍥涘窛鐪佺鎶�鍘呭鑸�", "鎴愰兘"}); + add(new String[]{"鍥涘窛涓撶敤姹借溅鍘傚鑸�", "鎴愰兘"}); + add(new String[]{"鍥涘窛鏃ユ姤瀹胯垗", "鎴愰兘"}); + add(new String[]{"鍥涘窛鑹烘湳鑱屼笟瀛﹂櫌瀹跺睘妤�", "鎴愰兘"}); + add(new String[]{"鍥涘窛钀ヨ儭鍚�", "鍖椾含"}); + add(new String[]{"鍥涘窛灏忓尯", "涓婃捣"}); + add(new String[]{"鍥涘窛骞煎笀瀹胯垗", "鎴愰兘"}); + add(new String[]{"鍥涘窛澶у鍐滄灄鏉�", "鎴愰兘"}); + }}); + city_DistrictNames.put("鎴愰兘", new ArrayList(){{ + add(new String[]{"鎴愰兘鍥介檯鍏瘬", "鎴愰兘"}); + add(new String[]{"鎴愰兘楂橀�熷ぇ鍘�", "鎴愰兘"}); + add(new String[]{"鎴愰兘琛�娑蹭腑蹇冨皬鍖�", "鎴愰兘"}); + add(new String[]{"鎴愰兘鑺卞洯鍒", "鎴愰兘"}); + add(new String[]{"鎴愰兘鑺卞洯", "鎴愰兘"}); + add(new String[]{"鎴愰兘姘戣埅瀹胯垗", "鎴愰兘"}); + add(new String[]{"鎴愰兘鍗风儫鍘傚鑸�", "鎴愰兘"}); + add(new String[]{"鎴愰兘鍗庝鲸鍩庣函姘村哺", "鎴愰兘"}); + add(new String[]{"鎴愰兘鑺卞洯", "涓変簹"}); + add(new String[]{"鎴愰兘鏂板ぉ鍦�", "鎴愰兘"}); + add(new String[]{"鎴愰兘ICC", "鎴愰兘"}); + add(new String[]{"鎴愰兘闆呭眳涔愯姳鍥�", "鎴愰兘"}); + add(new String[]{"鎴愰兘鍗庝鲸鍩庝笢宀�", "鎴愰兘"}); + add(new String[]{"鎴愰兘鍚庤姳鍥簩鏈�", "鎴愰兘"}); + add(new String[]{"鎴愰兘缁垮湴涓績468鍏", "鎴愰兘"}); + add(new String[]{"鎴愰兘鑺卞洯涓婂煄", "鎴愰兘"}); + add(new String[]{"鎴愰兘妫灄", "鎴愰兘"}); + add(new String[]{"鎴愰兘鍚庤姳鍥�", "鎴愰兘"}); + add(new String[]{"鎴愰兘閲戠墰涓囪揪骞垮満", "鎴愰兘"}); + add(new String[]{"鎴愰兘鐢靛姏灞�瀹胯垗", "鎴愰兘"}); + add(new String[]{"鎴愰兘鐜夊洯", "鎴愰兘"}); + add(new String[]{"鎴愰兘鍥藉ゥ鏉�", "鎴愰兘"}); + add(new String[]{"鎴愰兘鑺卞洯缈犻泹鍗庡涵", "鎴愰兘"}); + add(new String[]{"鎴愰兘鏃╂櫒", "鎴愰兘"}); + add(new String[]{"鎴愰兘鍚堥櫌", "鎴愰兘"}); + add(new String[]{"鎴愰兘鍚庤姳鍥浗瀹剧孩钁�", "鎴愰兘"}); + add(new String[]{"鎴愰兘鍚堥櫌涔嬪闄㈠9鍝�", "鎴愰兘"}); + add(new String[]{"鎴愰兘鍚庤姳鍥簩鏈熷埆澧�", "鎴愰兘"}); + add(new String[]{"鎴愰兘妫曟娉夊浗闄呬腑蹇�", "鎴愰兘"}); + add(new String[]{"鎴愰兘澶ч瓟鏂�", "鎴愰兘"}); + add(new String[]{"鎴愰兘A鍖�", "鎴愰兘"}); + add(new String[]{"鎴愰兘澶у鏁欏笀鍏瘬", "鎴愰兘"}); + }}); + city_DistrictNames.put("姹熻嫃", new ArrayList(){{ + add(new String[]{"姹熻嫃鐪佸啘绉戦櫌", "鍗椾含"}); + add(new String[]{"姹熻嫃娌圭敯鐭虫补灞卞簞", "鎵窞"}); + add(new String[]{"姹熻嫃璀﹀畼瀛﹂櫌", "鍗椾含"}); + add(new String[]{"姹熻嫃鐪侀珮绾т笓瀹跺洯", "鍗椾含"}); + add(new String[]{"姹熻嫃娌圭敯鐭虫补灞卞簞", "鎵窞"}); + add(new String[]{"姹熻嫃璁簨鍥�", "鍗椾含"}); + add(new String[]{"姹熻嫃鍥介檯濉戝寲鍩�", "甯稿窞"}); + add(new String[]{"姹熻嫃涓囧拰鍥介檯鍟嗚锤鍩�", "甯稿窞"}); + }}); + city_DistrictNames.put("娉板窞", new ArrayList(){{ + add(new String[]{"娉板窞纰ф鍥�", "娉板窞"}); + add(new String[]{"娉板窞鍗庝鲸鍩庣函姘村哺", "娉板窞"}); + add(new String[]{"娉板窞缇庡ソ瀹跺洯", "娉板窞"}); + }}); + city_DistrictNames.put("灞辫タ", new ArrayList(){{ + add(new String[]{"灞辫タ鏁欒偛鍑虹増灞�瀹胯垗", "澶師"}); + add(new String[]{"灞辫タ鏀垮簻瀹跺睘闄�", "澶╂触"}); + add(new String[]{"灞辫タ鐪佺數鍔涘牚娴嬭璁¢櫌瀹胯垗", "澶師"}); + add(new String[]{"灞辫タ鐓ょ偔鑱屽伐鍩硅涓績瀹胯垗", "澶師"}); + add(new String[]{"灞辫タ鍖荤澶у瀹跺睘妤�", "澶師"}); + add(new String[]{"灞辫タ鐢靛姏鏉忚姳宀皬鍖�", "澶師"}); + add(new String[]{"灞辫タ鎶ョぞ瀹胯垗妤�", "澶師"}); + add(new String[]{"灞辫タ鐪佸尰鑽叕鍙镐綇瀹呭皬鍖�", "澶師"}); + add(new String[]{"灞辫タ鐪佹枃鐗╁眬瀹胯垗", "澶師"}); + add(new String[]{"灞辫タ姹借繍闆嗗洟涓滃矖璺鑸�", "澶師"}); + add(new String[]{"灞辫タ鐪佸湴璐ㄧ鐮旀墍鍦扮熆灏忓尯", "澶師"}); + add(new String[]{"灞辫タ鐪佷緵閿�瀛︽牎瀹胯垗", "澶師"}); + add(new String[]{"灞辫タ鐪佹本娌虫按搴撶鐞嗗眬瀹胯垗", "澶師"}); + add(new String[]{"灞辫タ骞挎挱鐢佃澶у瀹胯垗", "澶師"}); + add(new String[]{"灞辫タ鐪佷綋鑲插眬瀹胯垗", "澶師"}); + add(new String[]{"灞辫タ鐪佹按浜х瀛︾爺绌堕櫌瀹胯垗", "澶師"}); + add(new String[]{"灞辫タ绀句細涓讳箟瀛﹂櫌瀹胯垗", "澶師"}); + add(new String[]{"灞辫タ鐪佺粡娴庝俊鎭腑蹇冨鑸�", "澶師"}); + add(new String[]{"灞辫タ鐪佹皵璞″彴瀹胯垗", "澶師"}); + add(new String[]{"灞辫タ鐪佺數鍔涘叕鍙稿鑸�", "澶師"}); + add(new String[]{"灞辫タ鐪佸啘鏈哄眬瀹胯垗", "澶師"}); + add(new String[]{"灞辫タ鐪佹満鐢佃璁$爺绌堕櫌瀹胯垗", "澶師"}); + add(new String[]{"灞辫タ鍖荤澶у瀹跺睘妤煎寳闄�", "澶師"}); + add(new String[]{"灞辫タ鐪佹瓕鑸炲墽闄㈠鑸�", "澶師"}); + add(new String[]{"灞辫タ鐪佽交宸ュ鑸�", "澶師"}); + add(new String[]{"灞辫タ鐓ょ偔鑱屼笟鎶�鏈闄㈠鑸�", "澶師"}); + add(new String[]{"灞辫タ鐪佷氦閫氱洃鐞嗗叕鍙稿鑸�", "澶師"}); + add(new String[]{"灞辫タ浜ら�氳亴涓氭妧鏈闄㈠灞炴ゼ", "澶師"}); + add(new String[]{"灞辫タ澶у瀹胯垗", "澶師"}); + add(new String[]{"灞辫タ鐪佽交宸ュ缓璁惧叕鍙稿鑸�", "澶師"}); + add(new String[]{"灞辫タ鐪侀�佸彉鐢靛鑸�", "澶師"}); + add(new String[]{"灞辫タ鐪佸缓绛戠瀛︾爺绌堕櫌鍏埧", "澶師"}); + add(new String[]{"灞辫タ鐪佺墿璧勭鐞嗗偍澶囧眬骞跺窞鍖楄矾瀹跺睘闄㈠皬鍖�", "澶師"}); + add(new String[]{"灞辫タ鐪佺洂涓氬偍杩愬叕鍙稿鑸�", "澶師"}); + add(new String[]{"灞辫タ鐪佸湴闇囧眬瀹胯垗", "澶師"}); + add(new String[]{"灞辫タ鐪佸睍瑙堥瀹胯垗", "澶師"}); + add(new String[]{"灞辫タ鏃犵嚎鐢靛巶瀹胯垗", "澶師"}); + add(new String[]{"灞辫タ鏃犵嚎鐢靛巶灏忓尯", "澶師"}); + add(new String[]{"灞辫タ閲戦噾涓氶泦鍥㈠鑸�", "澶師"}); + add(new String[]{"灞辫タ鐪佽嚜鍔ㄥ寲鐮旂┒鎵�瀹胯垗", "澶師"}); + add(new String[]{"灞辫タ鐓ょ熆鍘呭眬瀹胯垗", "澶師"}); + add(new String[]{"灞辫タ楂橀�熺鐞嗗眬瀹胯垗", "澶師"}); + add(new String[]{"灞辫タ鐪佹湪鏉愬叕鍙稿鑸�", "澶師"}); + add(new String[]{"灞辫タ鐪佸尰鑽笌鐢熷懡绉戝鐮旂┒闄�", "澶師"}); + add(new String[]{"灞辫タ绾稿紶鍏徃瀹胯垗", "澶師"}); + add(new String[]{"灞辫タ鐒︾叅闆嗗洟婊ㄦ渤灏忓尯", "澶師"}); + add(new String[]{"灞辫タ瀹忓畨鍥介檯澶у帵", "澶師"}); + add(new String[]{"灞辫タ鍥�", "鏉窞"}); + add(new String[]{"灞辫タ鍗楁潙", "鍗椾含"}); + add(new String[]{"灞辫タ璇佸埜澶у帵", "瑗垮畨"}); + add(new String[]{"灞辫タ鑱屼笟鎶�鏈闄㈠鑸�", "澶師"}); + add(new String[]{"灞辫タ寤虹瓚鑱屼笟鎶�鏈闄㈠鑸�", "澶師"}); + add(new String[]{"灞辫タ鐪佸皯绠℃墍瀹胯垗", "澶師"}); + add(new String[]{"灞辫タ鏃ユ姤瀹胯垗", "澶師"}); + add(new String[]{"灞辫タ寤虹瓚瀛﹂櫌", "澶師"}); + add(new String[]{"灞辫タ涓栬锤涓績", "澶師"}); + add(new String[]{"灞辫タ鍥介檯璐告槗涓績", "澶師"}); + add(new String[]{"灞辫タ灏忓尯", "涓婃捣"}); + add(new String[]{"灞辫タ鏂版潙", "閲戝崕"}); + }}); + city_DistrictNames.put("澶師", new ArrayList(){{ + add(new String[]{"澶師鍗牎闀块灏忓尯", "澶師"}); + add(new String[]{"澶師鍒氱帀鐢熸椿鍖�", "澶師"}); + add(new String[]{"澶師瀵屽姏鐜颁唬骞垮満", "澶師"}); + add(new String[]{"澶師鎭掑ぇ缁挎床", "澶師"}); + add(new String[]{"澶師甯傛斂寤鸿寮�鍙戝瀹胯垗", "澶師"}); + add(new String[]{"澶師甯堣寖瀛﹂櫌瀹胯垗", "澶師"}); + add(new String[]{"澶師鐞嗗伐澶хぞ鍖轰綇瀹呭皬鍖轰笢闄�", "澶師"}); + add(new String[]{"澶師澶у甯堣寖瀛﹂櫌瀹胯垗", "澶師"}); + add(new String[]{"澶師闀垮煄鍏夌數瀛愬伐涓氬叕鍙稿鑸�", "澶師"}); + add(new String[]{"澶師璀﹀鍖哄灞為櫌", "澶師"}); + add(new String[]{"澶師鐢佃鍙板鑸嶅皬鍖�", "澶師"}); + add(new String[]{"澶師鐞嗗伐澶хぞ鍖轰綇瀹呭皬鍖鸿タ闄�", "澶師"}); + add(new String[]{"澶師甯傚洯鏋楀眬瀹胯垗", "澶師"}); + add(new String[]{"澶師澶у灏忓尯", "澶師"}); + add(new String[]{"澶師鐞嗗伐澶у瑗垮尯瀹胯垗", "澶師"}); + add(new String[]{"澶師甯備腑蹇冨尰闄㈠鑸�", "澶師"}); + add(new String[]{"澶師鏂板崕鍗板埛鍘傚鑸�", "澶師"}); + add(new String[]{"澶師甯傛満鐢靛叕鍙稿鑸�", "澶師"}); + add(new String[]{"澶師甯傚疄楠屼腑瀛﹀鑸�", "澶師"}); + add(new String[]{"澶師甯傚叕鍙稿鑸�", "澶師"}); + add(new String[]{"澶師甯傚湴鏂圭◣鍔″眬鐩村睘鍒嗗眬瀹胯垗", "澶師"}); + add(new String[]{"澶師鍒氱帀鐮傝疆灏忓尯", "澶師"}); + add(new String[]{"澶師甯備腑鍖婚櫌瀹胯垗", "澶師"}); + add(new String[]{"澶師涓嵂鍘傚鑸�", "澶師"}); + add(new String[]{"澶師甯傜鍥涘啗鍖哄共浼戞墍", "澶師"}); + add(new String[]{"澶師甯傚鏂欏洓鍘傚鑸�", "澶師"}); + add(new String[]{"澶師甯傜柧鐥呴闃叉帶鍒朵腑蹇冨鑸�", "澶師"}); + add(new String[]{"澶師鏃ユ姤绀惧鑸�", "澶師"}); + add(new String[]{"澶師鍐滅墽鍦哄鑸�", "澶師"}); + add(new String[]{"澶師甯傚洯鏋楃豢鍖栧伐绋嬮槦瀹胯垗", "澶師"}); + add(new String[]{"澶師甯備氦閫氬眬瀹胯垗", "澶師"}); + add(new String[]{"澶師甯傛湪鏉愬叕鍙稿鑸�", "澶師"}); + add(new String[]{"澶師甯傜嚂绉戝叕鍙稿鑸�", "澶師"}); + add(new String[]{"澶師鐞嗗伐澶у闀块浣忓畢灏忓尯", "澶師"}); + add(new String[]{"澶師甯傜涓�寤虹瓚鍏徃瀹胯垗", "澶師"}); + add(new String[]{"澶師鐕冩枡鍏徃瀹胯垗", "澶師"}); + add(new String[]{"澶師閫氫俊鍒嗗叕鍙稿皬鏂板煄浣忓畢灏忓尯", "澶師"}); + add(new String[]{"澶師甯傚浗绋庡眬瀹胯垗", "澶師"}); + add(new String[]{"澶師鏃朵唬", "娌堥槼"}); + add(new String[]{"澶師灏忓尯", "娌堥槼"}); + add(new String[]{"澶師浣冲洯", "娌堥槼"}); + add(new String[]{"澶師鏌冲贩閾滈敚婀惧疂鍦板皬鍖�", "澶師"}); + add(new String[]{"澶師宸ョ▼鑱屼笟鎶�鏈闄㈠鑸�", "澶師"}); + add(new String[]{"澶師閽笣鍘傚鑸�", "澶師"}); + add(new String[]{"澶師閲戦紟鍥介檯鍟嗗姟涓績", "澶師"}); + add(new String[]{"澶師涓囪揪鍏", "澶師"}); + add(new String[]{"澶師濂ユ灄鍖瑰厠鑺卞洯", "澶師"}); + add(new String[]{"澶師鍒", "涓婃捣"}); + add(new String[]{"澶師閭�", "涓婃捣"}); + add(new String[]{"澶師鏄熸渤婀句笁鏈�", "澶師"}); + }}); + city_DistrictNames.put("鍥涘窛", new ArrayList(){{ + add(new String[]{"鍥涘窛鐪佺洿鏈哄叧宸ュ瀹胯垗", "鎴愰兘"}); + add(new String[]{"鍥涘窛鐪佹灄涓氬巺瀹胯垗", "鎴愰兘"}); + add(new String[]{"鍥涘窛闊充箰瀛﹂櫌瀹胯垗", "鎴愰兘"}); + add(new String[]{"鍥涘窛鐪侀椊涓競椹荤枂鍔炰簨澶勫皬鍖�", "涔岄瞾鏈ㄩ綈"}); + add(new String[]{"鍥涘窛澶у帵", "鍘﹂棬"}); + add(new String[]{"鍥涘窛鐪佺鎶�鍘呭鑸�", "鎴愰兘"}); + add(new String[]{"鍥涘窛涓撶敤姹借溅鍘傚鑸�", "鎴愰兘"}); + add(new String[]{"鍥涘窛鏃ユ姤瀹胯垗", "鎴愰兘"}); + add(new String[]{"鍥涘窛鑹烘湳鑱屼笟瀛﹂櫌瀹跺睘妤�", "鎴愰兘"}); + add(new String[]{"鍥涘窛钀ヨ儭鍚�", "鍖椾含"}); + add(new String[]{"鍥涘窛灏忓尯", "涓婃捣"}); + add(new String[]{"鍥涘窛骞煎笀瀹胯垗", "鎴愰兘"}); + add(new String[]{"鍥涘窛澶у鍐滄灄鏉�", "鎴愰兘"}); + }}); + city_DistrictNames.put("鏀�鏋濊姳", new ArrayList(){{ + add(new String[]{"鏀�鏋濊姳鑻�", "娴峰彛"}); + }}); + city_DistrictNames.put("骞夸笢", new ArrayList(){{ + add(new String[]{"骞夸笢澶栬锤骞垮満", "骞垮窞"}); + add(new String[]{"骞夸笢澶栬鑹烘湳瀛﹂櫌鏁欏笀瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢寤虹闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢鍙告硶璀﹀畼鑱屼笟瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐜繚澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍟嗕笟澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍖诲闄㈡暀甯堝鑸嶆ゼ", "涓滆帪"}); + add(new String[]{"骞夸笢鍥介檯澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佹妧鏈洃鐫e眬瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢宸ヤ笟澶у瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鏁欒偛瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪侀摱琛屽ぇ鍘�", "娣卞湷"}); + add(new String[]{"骞夸笢澶у帵", "澶╂触"}); + add(new String[]{"骞夸笢灞卞簞", "闀囨睙"}); + add(new String[]{"骞夸笢绾㈢浘澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鑽闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢闈掑勾骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鍩虹妤�", "娣卞湷"}); + add(new String[]{"骞夸笢鐪佺鎶�骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佸啘涓氱鐞嗗共閮ㄥ闄㈢ぞ鍖�", "骞垮窞"}); + add(new String[]{"骞夸笢鑺暰闆烽�告櫙", "浣涘北"}); + }}); + city_DistrictNames.put("鐝犳捣", new ArrayList(){{ + add(new String[]{"鐝犳捣甯傚悏澶т節娲茶摑婀捐姳鍥�", "鐝犳捣"}); + add(new String[]{"鐝犳捣閲�", "澶╂触"}); + add(new String[]{"鐝犳捣鏂版潙", "鏄嗗北"}); + add(new String[]{"鐝犳捣浜屽尯", "闈掑矝"}); + add(new String[]{"鐝犳捣闆呰嫅", "闈掑矝"}); + add(new String[]{"鐝犳捣閮藉競鑺卞洯", "澶х悊"}); + add(new String[]{"鐝犳捣閿︾唬闃冲厜鑺卞洯", "娓╁窞"}); + }}); + city_DistrictNames.put("姹熻嫃", new ArrayList(){{ + add(new String[]{"姹熻嫃鐪佸啘绉戦櫌", "鍗椾含"}); + add(new String[]{"姹熻嫃娌圭敯鐭虫补灞卞簞", "鎵窞"}); + add(new String[]{"姹熻嫃璀﹀畼瀛﹂櫌", "鍗椾含"}); + add(new String[]{"姹熻嫃鐪侀珮绾т笓瀹跺洯", "鍗椾含"}); + add(new String[]{"姹熻嫃娌圭敯鐭虫补灞卞簞", "鎵窞"}); + add(new String[]{"姹熻嫃璁簨鍥�", "鍗椾含"}); + add(new String[]{"姹熻嫃鍥介檯濉戝寲鍩�", "甯稿窞"}); + add(new String[]{"姹熻嫃涓囧拰鍥介檯鍟嗚锤鍩�", "甯稿窞"}); + }}); + city_DistrictNames.put("闀囨睙", new ArrayList(){{ + add(new String[]{"闀囨睙閲�", "澶╂触"}); + add(new String[]{"闀囨睙鏂板尯鍥介檯浼氳涓績", "闀囨睙"}); + add(new String[]{"闀囨睙浜块兘瀹跺眳寤烘潗鍩�", "闀囨睙"}); + add(new String[]{"闀囨睙鏃緣鏈楅閮�", "闀囨睙"}); + add(new String[]{"闀囨睙涓囪揪骞垮満", "闀囨睙"}); + }}); + city_DistrictNames.put("姹熻嫃", new ArrayList(){{ + add(new String[]{"姹熻嫃鐪佸啘绉戦櫌", "鍗椾含"}); + add(new String[]{"姹熻嫃娌圭敯鐭虫补灞卞簞", "鎵窞"}); + add(new String[]{"姹熻嫃璀﹀畼瀛﹂櫌", "鍗椾含"}); + add(new String[]{"姹熻嫃鐪侀珮绾т笓瀹跺洯", "鍗椾含"}); + add(new String[]{"姹熻嫃娌圭敯鐭虫补灞卞簞", "鎵窞"}); + add(new String[]{"姹熻嫃璁簨鍥�", "鍗椾含"}); + add(new String[]{"姹熻嫃鍥介檯濉戝寲鍩�", "甯稿窞"}); + add(new String[]{"姹熻嫃涓囧拰鍥介檯鍟嗚锤鍩�", "甯稿窞"}); + }}); + city_DistrictNames.put("鑻忓窞", new ArrayList(){{ + add(new String[]{"鑻忓窞鍖楀贩", "澶ц繛"}); + add(new String[]{"鑻忓窞閲�", "澶╂触"}); + add(new String[]{"鑻忓窞鑺卞洯涓�鏈�", "涔岄瞾鏈ㄩ綈"}); + add(new String[]{"鑻忓窞鑺卞洯浜屾湡", "涔岄瞾鏈ㄩ綈"}); + add(new String[]{"鑻忓窞鑺卞洯", "瀹胯縼"}); + add(new String[]{"鑻忓窞灏忓尯", "鍖椾含"}); + add(new String[]{"鑻忓窞鍏瘬", "鍖椾含"}); + add(new String[]{"鑻忓窞骞昏薄", "娴庡崡"}); + add(new String[]{"鑻忓窞鍑ゅ嚢鏂囧寲骞垮満", "鑻忓窞"}); + add(new String[]{"鑻忓窞鍥介檯杞荤汉鍩�", "鑻忓窞"}); + add(new String[]{"鑻忓窞涓栬寕杩愭渤鍩�", "鑻忓窞"}); + add(new String[]{"鑻忓窞甯傛钵娴鎶�鍒涗笟鍥�", "鑻忓窞"}); + add(new String[]{"鑻忓窞楂樻柊鍖轰汉鍔涜祫婧愬ぇ鍘�", "鑻忓窞"}); + add(new String[]{"鑻忓窞鏂颁笢鏂规苯閰嶅煄", "鑻忓窞"}); + add(new String[]{"鑻忓窞绀煎搧鍟嗗搧鍩�", "鑻忓窞"}); + add(new String[]{"鑻忓窞娌挎捣鍥介檯涓績", "鑻忓窞"}); + add(new String[]{"鑻忓窞鏈虹數浜旈噾鍩�", "鑻忓窞"}); + add(new String[]{"鑻忓窞甯傛钵娴鎶�鍒涗笟鍥笢鍖�", "鑻忓窞"}); + add(new String[]{"鑻忓窞涓栬寕骞垮満鍏瘬", "鑻忓窞"}); + }}); + city_DistrictNames.put("姹熻嫃", new ArrayList(){{ + add(new String[]{"姹熻嫃鐪佸啘绉戦櫌", "鍗椾含"}); + add(new String[]{"姹熻嫃娌圭敯鐭虫补灞卞簞", "鎵窞"}); + add(new String[]{"姹熻嫃璀﹀畼瀛﹂櫌", "鍗椾含"}); + add(new String[]{"姹熻嫃鐪侀珮绾т笓瀹跺洯", "鍗椾含"}); + add(new String[]{"姹熻嫃娌圭敯鐭虫补灞卞簞", "鎵窞"}); + add(new String[]{"姹熻嫃璁簨鍥�", "鍗椾含"}); + add(new String[]{"姹熻嫃鍥介檯濉戝寲鍩�", "甯稿窞"}); + add(new String[]{"姹熻嫃涓囧拰鍥介檯鍟嗚锤鍩�", "甯稿窞"}); + }}); + city_DistrictNames.put("鑻忓窞", new ArrayList(){{ + add(new String[]{"鑻忓窞鍖楀贩", "澶ц繛"}); + add(new String[]{"鑻忓窞閲�", "澶╂触"}); + add(new String[]{"鑻忓窞鑺卞洯涓�鏈�", "涔岄瞾鏈ㄩ綈"}); + add(new String[]{"鑻忓窞鑺卞洯浜屾湡", "涔岄瞾鏈ㄩ綈"}); + add(new String[]{"鑻忓窞鑺卞洯", "瀹胯縼"}); + add(new String[]{"鑻忓窞灏忓尯", "鍖椾含"}); + add(new String[]{"鑻忓窞鍏瘬", "鍖椾含"}); + add(new String[]{"鑻忓窞骞昏薄", "娴庡崡"}); + add(new String[]{"鑻忓窞鍑ゅ嚢鏂囧寲骞垮満", "鑻忓窞"}); + add(new String[]{"鑻忓窞鍥介檯杞荤汉鍩�", "鑻忓窞"}); + add(new String[]{"鑻忓窞涓栬寕杩愭渤鍩�", "鑻忓窞"}); + add(new String[]{"鑻忓窞甯傛钵娴鎶�鍒涗笟鍥�", "鑻忓窞"}); + add(new String[]{"鑻忓窞楂樻柊鍖轰汉鍔涜祫婧愬ぇ鍘�", "鑻忓窞"}); + add(new String[]{"鑻忓窞鏂颁笢鏂规苯閰嶅煄", "鑻忓窞"}); + add(new String[]{"鑻忓窞绀煎搧鍟嗗搧鍩�", "鑻忓窞"}); + add(new String[]{"鑻忓窞娌挎捣鍥介檯涓績", "鑻忓窞"}); + add(new String[]{"鑻忓窞鏈虹數浜旈噾鍩�", "鑻忓窞"}); + add(new String[]{"鑻忓窞甯傛钵娴鎶�鍒涗笟鍥笢鍖�", "鑻忓窞"}); + add(new String[]{"鑻忓窞涓栬寕骞垮満鍏瘬", "鑻忓窞"}); + }}); + city_DistrictNames.put("鍚存睙", new ArrayList(){{ + add(new String[]{"鍚存睙鎸嘲灏忓尯", "鑻忓窞"}); + add(new String[]{"鍚存睙鏃朵唬瀹跺洯", "鑻忓窞"}); + add(new String[]{"鍚存睙鍑ゅ嚢鑺卞洯", "鑻忓窞"}); + add(new String[]{"鍚存睙涓ぎ鑺卞洯", "鑻忓窞"}); + add(new String[]{"鍚存睙婀栨花鑺卞洯", "鑻忓窞"}); + add(new String[]{"鍚存睙鍚嶅煄鑺卞洯", "鑻忓窞"}); + add(new String[]{"鍚存睙渚涚數灏忓尯", "鑻忓窞"}); + add(new String[]{"鍚存睙鍏畨鏂版潙", "鑻忓窞"}); + add(new String[]{"鍚存睙婀栨花鑺卞洯", "鍚存睙"}); + add(new String[]{"鍚存睙鍚嶅煄鑺卞洯", "鍚存睙"}); + add(new String[]{"鍚存睙鏃朵唬瀹跺洯", "鍚存睙"}); + add(new String[]{"鍚存睙鍑ゅ嚢鑺卞洯", "鍚存睙"}); + add(new String[]{"鍚存睙涓ぎ鑺卞洯", "鍚存睙"}); + add(new String[]{"鍚存睙涓介兘鍥介檯", "鍚存睙"}); + add(new String[]{"鍚存睙鍏畨鏂版潙", "鍚存睙"}); + add(new String[]{"鍚存睙渚涚數灏忓尯", "鍚存睙"}); + add(new String[]{"鍚存睙鎸嘲灏忓尯", "鍚存睙"}); + add(new String[]{"鍚存睙缁垮湴涓績", "鑻忓窞"}); + add(new String[]{"鍚存睙璧涙牸骞垮満", "鑻忓窞"}); + }}); + city_DistrictNames.put("娴欐睙", new ArrayList(){{ + add(new String[]{"娴欐睙宸ヤ笟澶у鏁欏笀瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙澶у帵", "澶師"}); + add(new String[]{"娴欐睙鍔炰簨澶勫鑸�", "澶師"}); + add(new String[]{"娴欐睙浠佸拰灞呰�佸勾鍏荤敓鍏瘬", "婀栧窞"}); + add(new String[]{"娴欐睙浜よ繍澶у帵", "鏉窞"}); + add(new String[]{"娴欐睙宸ュ晢澶у瀹胯垗", "鏉窞"}); + add(new String[]{"娴欐睙鍟嗚锤鍩�", "鍚堣偉"}); + add(new String[]{"娴欐睙宸ヤ笟澶у涔嬫睙瀛﹂櫌", "鏉窞"}); + }}); + city_DistrictNames.put("閲戝崕", new ArrayList(){{ + add(new String[]{"閲戝崕閲�", "鍖椾含"}); + add(new String[]{"閲戝崕鑻�", "娴峰彛"}); + add(new String[]{"閲戝崕鏂版潙", "澶ц繛"}); + add(new String[]{"閲戝崕鍏瘬", "闈掑矝"}); + add(new String[]{"閲戝崕鍥�", "涓北"}); + add(new String[]{"閲戝崕鑺卞洯", "涓滆帪"}); + add(new String[]{"閲戝崕涓栧", "璐甸槼"}); + add(new String[]{"閲戝崕鍥�", "璐甸槼"}); + add(new String[]{"閲戝崕鑺卞洯", "骞垮窞"}); + add(new String[]{"閲戝崕鏂版潙", "鏉窞"}); + add(new String[]{"閲戝崕鑻�", "娼嶅潑"}); + add(new String[]{"閲戝崕涓藉皬鍖�", "娼嶅潑"}); + add(new String[]{"閲戝崕鑺卞洯", "閲嶅簡"}); + add(new String[]{"閲戝崕闃�", "娣卞湷"}); + add(new String[]{"閲戝崕澶у帵澶ф浮鍙�", "閲嶅簡"}); + add(new String[]{"閲戝崕鑻戝皬鍖�", "閲嶅簡"}); + add(new String[]{"閲戝崕閲�", "澶╂触"}); + add(new String[]{"閲戝崕灏忓尯", "鐭冲搴�"}); + add(new String[]{"閲戝崕澶у帵", "閲嶅簡"}); + add(new String[]{"閲戝崕鍥�", "閲嶅簡"}); + add(new String[]{"閲戝崕浜戦紟", "閲嶅簡"}); + add(new String[]{"閲戝崕鍥�", "娌堥槼"}); + add(new String[]{"閲戝崕鍏瘬", "鎴愰兘"}); + add(new String[]{"閲戝崕鑻�", "鎴愰兘"}); + add(new String[]{"閲戝崕澶у帵", "姝︽眽"}); + add(new String[]{"閲戝崕瀛﹀簻", "鍛煎拰娴╃壒"}); + add(new String[]{"閲戝崕涓栧鍒", "璐甸槼"}); + add(new String[]{"閲戝崕鍏瘬", "绂忓窞"}); + add(new String[]{"閲戝崕灏忓尯", "澶ц繛"}); + add(new String[]{"閲戝崕閲岋紙瑗块潚锛�", "澶╂触"}); + add(new String[]{"閲戝崕妤�", "鍘﹂棬"}); + add(new String[]{"閲戝崕鑻�", "鍏板窞"}); + add(new String[]{"閲戝崕鍥埆澧�", "鍖椾含"}); + add(new String[]{"閲戝崕灏忓尯涓夋湡", "澶ц繛"}); + add(new String[]{"閲戝崕鑺卞洯", "涓北"}); + add(new String[]{"閲戝崕鍥�", "浣涘北"}); + add(new String[]{"閲戝崕鑻�", "闈掑矝"}); + add(new String[]{"閲戝崕灏忓尯浜屾湡", "澶ц繛"}); + add(new String[]{"閲戝崕鍥�", "鏄嗘槑"}); + add(new String[]{"閲戝崕鑻�", "涓婃捣"}); + add(new String[]{"閲戝崕鍥�", "鍖椾含"}); + add(new String[]{"閲戝崕鏂版潙", "涓婃捣"}); + add(new String[]{"閲戝崕鍏徃瀹胯垗", "鏄嗘槑"}); + add(new String[]{"閲戝崕鑻�", "骞抽《灞�"}); + add(new String[]{"閲戝崕瀹跺洯 ", "鐩橀敠"}); + add(new String[]{"閲戝崕瀹跺洯", "鐩橀敠"}); + add(new String[]{"閲戝崕涓囪揪骞垮満", "閲戝崕"}); + add(new String[]{"閲戝崕涓栬锤涓績", "閲戝崕"}); + add(new String[]{"閲戝崕姹介厤鍩庝簩鏈�", "閲戝崕"}); + add(new String[]{"閲戝崕宸蜂竴鍙�", "鏀�鏋濊姳"}); + }}); + city_DistrictNames.put("姹熻嫃", new ArrayList(){{ + add(new String[]{"姹熻嫃鐪佸啘绉戦櫌", "鍗椾含"}); + add(new String[]{"姹熻嫃娌圭敯鐭虫补灞卞簞", "鎵窞"}); + add(new String[]{"姹熻嫃璀﹀畼瀛﹂櫌", "鍗椾含"}); + add(new String[]{"姹熻嫃鐪侀珮绾т笓瀹跺洯", "鍗椾含"}); + add(new String[]{"姹熻嫃娌圭敯鐭虫补灞卞簞", "鎵窞"}); + add(new String[]{"姹熻嫃璁簨鍥�", "鍗椾含"}); + add(new String[]{"姹熻嫃鍥介檯濉戝寲鍩�", "甯稿窞"}); + add(new String[]{"姹熻嫃涓囧拰鍥介檯鍟嗚锤鍩�", "甯稿窞"}); + }}); + city_DistrictNames.put("鏃犻敗", new ArrayList(){{ + add(new String[]{"鏃犻敗澶у帵", "涓婃捣"}); + add(new String[]{"鏃犻敗婊ㄦ箹涓囪揪骞垮満", "鏃犻敗"}); + add(new String[]{"鏃犻敗纰ф鍥�", "鏃犻敗"}); + add(new String[]{"鏃犻敗涓栫晫璐告槗涓績涓�鏈熶笘璐稿叕瀵�", "鏃犻敗"}); + add(new String[]{"鏃犻敗娲涘煄姗欓儭", "鏃犻敗"}); + add(new String[]{"鏃犻敗濉炵撼搴勫洯", "瀹滃叴"}); + add(new String[]{"鏃犻敗鐜夊叞鑺卞洯", "瀹滃叴"}); + }}); + city_DistrictNames.put("骞夸笢", new ArrayList(){{ + add(new String[]{"骞夸笢澶栬锤骞垮満", "骞垮窞"}); + add(new String[]{"骞夸笢澶栬鑹烘湳瀛﹂櫌鏁欏笀瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢寤虹闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢鍙告硶璀﹀畼鑱屼笟瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐜繚澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍟嗕笟澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍖诲闄㈡暀甯堝鑸嶆ゼ", "涓滆帪"}); + add(new String[]{"骞夸笢鍥介檯澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佹妧鏈洃鐫e眬瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢宸ヤ笟澶у瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鏁欒偛瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪侀摱琛屽ぇ鍘�", "娣卞湷"}); + add(new String[]{"骞夸笢澶у帵", "澶╂触"}); + add(new String[]{"骞夸笢灞卞簞", "闀囨睙"}); + add(new String[]{"骞夸笢绾㈢浘澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鑽闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢闈掑勾骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鍩虹妤�", "娣卞湷"}); + add(new String[]{"骞夸笢鐪佺鎶�骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佸啘涓氱鐞嗗共閮ㄥ闄㈢ぞ鍖�", "骞垮窞"}); + add(new String[]{"骞夸笢鑺暰闆烽�告櫙", "浣涘北"}); + }}); + city_DistrictNames.put("骞垮窞", new ArrayList(){{ + add(new String[]{"骞垮窞鍗敓鍘呭ぇ闄�", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥泤閫稿涵", "骞垮窞"}); + add(new String[]{"骞垮窞瀹㈣溅鍘傚鑸�", "骞垮窞"}); + add(new String[]{"骞垮窞鍚庤姳鍥�", "娓呰繙"}); + add(new String[]{"骞垮窞鍚庤姳鍥�", "娓呰繙"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥祬灞卞皬绛�", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥泤鎮﹀涵", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥泤缈犲涵", "骞垮窞"}); + add(new String[]{"骞垮窞濂ユ灄鍖瑰厠鑺卞洯", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥偦灞�", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥�稿績鍥�", "骞垮窞"}); + add(new String[]{"骞垮窞澶у鏁欏笀妤�", "骞垮窞"}); + add(new String[]{"骞垮窞甯傜ぞ浼氱鍒╅櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞垮窞浣撹偛瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞垮窞甯傞鍝佸鑸�", "骞垮窞"}); + add(new String[]{"骞垮窞婀炬椂浠e箍鍦�", "婀涙睙"}); + add(new String[]{"骞垮窞鍐涘尯鎴跨鎵�瀹胯垗", "姝︽眽"}); + add(new String[]{"骞垮窞鏂板鏂颁笘鐣岃姳鍥�", "骞垮窞"}); + add(new String[]{"骞垮窞绌烘腐鍋囨棩鍒閰掑簵", "骞垮窞"}); + add(new String[]{"骞垮窞鏄熸渤涓瑰牑", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥崄骞村皬闆�", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥姳宸�", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥嘲浼�", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥尽鏅嘲鍒", "骞垮窞"}); + add(new String[]{"骞垮窞纰ф鍥鑻�", "骞垮窞"}); + add(new String[]{"骞垮窞纰ф鍥崕鑻�", "骞垮窞"}); + add(new String[]{"骞垮窞纰ф鍥泤鑻�", "骞垮窞"}); + add(new String[]{"骞垮窞纰ф鍥編鑻�", "骞垮窞"}); + add(new String[]{"骞垮窞纰ф鍥箰鑻�", "骞垮窞"}); + add(new String[]{"骞垮窞纰ф鍥敠鑻�", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥锋娲叉晠浜�", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥亸婀栧眳", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥泤婀栧眳", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥�", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥竴灏哄北灞�", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥锋柊鍦�", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥峰ぉ鍩�", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥锋尓濞佹.鏋�", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥洉鍒绘椂鍏�", "骞垮窞"}); + add(new String[]{"骞垮窞纰ф鍥鑻�", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥笂鍠勮嫢姘�", "骞垮窞"}); + add(new String[]{"骞垮窞娓憺閰掑簵鍏瘬", "骞垮窞"}); + add(new String[]{"骞垮窞浜氳繍鍩幝峰ぉ瑾�", "骞垮窞"}); + add(new String[]{"骞垮窞鐧藉ぉ楣呰姳鍥�", "骞垮窞"}); + add(new String[]{"骞垮窞纰ф鍥豢鑼佃嫅", "骞垮窞"}); + add(new String[]{"骞垮窞闆呭眳涔愯姳鍥椂鍏変節绡�", "骞垮窞"}); + add(new String[]{"骞垮窞纰ф鍥悍鑻�", "骞垮窞"}); + add(new String[]{"骞垮窞娴疯繍澶у帵", "骞垮窞"}); + add(new String[]{"骞垮窞鏈夎壊閲戝睘鐮旂┒闄�", "骞垮窞"}); + add(new String[]{"骞垮窞纰ф鍥附鑻�", "骞垮窞"}); + add(new String[]{"骞垮窞纰ф鍥繝鑻�", "骞垮窞"}); + add(new String[]{"骞垮窞瀵屽姏鍩�", "骞垮窞"}); + add(new String[]{"骞垮窞纰ф鍥�", "骞垮窞"}); + add(new String[]{"骞垮窞鏂板鏂颁笘鐣岃姳鍥�", "澧炲煄"}); + }}); + city_DistrictNames.put("娴峰崡", new ArrayList(){{ + add(new String[]{"娴峰崡涔嬪績", "娴峰彛"}); + add(new String[]{"娴峰崡澶у鍗楀笇绉戞妧鑻�", "娴峰彛"}); + add(new String[]{"娴峰崡鏃ユ姤绀惧鑸�", "娴峰彛"}); + add(new String[]{"娴峰崡鐪佸璁℃満鍏崇編鑸嶄綇瀹呭尯", "娴峰彛"}); + add(new String[]{"娴峰崡绀句繚", "娴峰彛"}); + add(new String[]{"娴峰崡鐪佷汉澶у父濮斾細鏈哄叧浣忓畢灏忓尯", "娴峰彛"}); + add(new String[]{"娴峰崡澶у鏁欏笀瀹胯垗", "娴峰彛"}); + add(new String[]{"娴峰崡鐕冨寲鍏徃瀹胯垗", "娴峰彛"}); + add(new String[]{"娴峰崡鐪佷綋鏍″鑸�", "娴峰彛"}); + add(new String[]{"娴峰崡缁熻灞�瀹胯垗", "娴峰彛"}); + add(new String[]{"娴峰崡鐪佸伐鍟嗛摱琛屽鑸�", "娴峰彛"}); + add(new String[]{"娴峰崡宸ュ晢澶у帵", "娴峰彛"}); + add(new String[]{"娴峰崡鏃朵唬骞垮満", "娴峰彛"}); + add(new String[]{"娴峰崡甯堣寖瀛﹂櫌閲戣姳鍥�", "娴峰彛"}); + add(new String[]{"娴峰崡澶у帵", "娴峰彛"}); + add(new String[]{"娴峰崡鐢靛姏鍘傚鑸�", "娴峰彛"}); + add(new String[]{"娴峰崡鐪佷笁浜氬叚寤哄崟浣�", "涓変簹"}); + add(new String[]{"娴峰崡闄垫按瀵屽姏婀�", "涓変簹"}); + add(new String[]{"娴峰崡澶у叕棣�", "娴峰彛"}); + add(new String[]{"娴峰崡缇庢灄婀栧浗闄呭害鍋囩ぞ鍖�", "涓変簹"}); + add(new String[]{"娴峰崡瀹跺洯", "鍖椾含"}); + add(new String[]{"娴峰崡骞蹭紤鎵�", "骞垮窞"}); + add(new String[]{"娴峰崡缁垮煄娓呮按婀�", "涓変簹"}); + add(new String[]{"娴峰崡路涓変簹路缇庝簹涔嬪績", "涓変簹"}); + add(new String[]{"娴峰崡瑗垮紕51寮�", "涓婃捣"}); + add(new String[]{"娴峰崡骞蹭紤鎵�锛堝ぉ娌筹級", "骞垮窞"}); + add(new String[]{"娴峰崡鍚庢捣娓╂硥灏忛晣", "閲嶅簡"}); + }}); + city_DistrictNames.put("娴峰彛", new ArrayList(){{ + add(new String[]{"娴峰彛楦挎床鏂板煄", "娴峰彛"}); + add(new String[]{"娴峰彛鐢典俊灏忓尯", "娴峰彛"}); + add(new String[]{"娴峰彛鐢佃鍙板鑸�", "娴峰彛"}); + add(new String[]{"娴峰彛缁忚锤澶у帵", "娴峰彛"}); + add(new String[]{"娴峰彛绉戞妧澶у帵", "娴峰彛"}); + add(new String[]{"娴峰彛鏅氭姤绀惧鑸�", "娴峰彛"}); + add(new String[]{"娴峰彛娓ぇ鍘�", "娴峰彛"}); + add(new String[]{"娴峰彛甯備汉姘戝尰闄㈠鑸�", "娴峰彛"}); + add(new String[]{"娴峰彛鑺卞洯", "闀挎槬"}); + add(new String[]{"娴峰彛甯傞鍔涘ぇ鍘�", "娴峰彛"}); + }}); + city_DistrictNames.put("闄曡タ", new ArrayList(){{ + add(new String[]{"闄曡タ鐢靛姏鍏徃瀹跺睘闄�", "瑗垮畨"}); + add(new String[]{"闄曡タ鍥介檯浼氬睍涓績", "瑗垮畨"}); + add(new String[]{"闄曡タ宸�", "鍖椾含"}); + add(new String[]{"闄曡タ鐪佸鏈哄叧鑱斿缓灏忓尯", "瑗垮畨"}); + add(new String[]{"闄曡タ鐪佺柧鎺т腑蹇冨灞為櫌", "瑗垮畨"}); + add(new String[]{"闄曡タ姝岃垶鍓ч櫌瀹跺睘闄�", "瑗垮畨"}); + add(new String[]{"闄曡タ鎴忔洸鐮旂┒闄�", "瑗垮畨"}); + add(new String[]{"闄曡タ浜ら�氳亴涓氭妧鏈灞為櫌", "瑗垮畨"}); + add(new String[]{"闄曡タ骞挎挱鐢佃澶у瀹跺睘闄�", "瑗垮畨"}); + add(new String[]{"闄曡タ楣忚豹鍥�", "瑗垮畨"}); + add(new String[]{"闄曡タ鐗╀骇闆嗗洟鍏徃瀹跺睘闄�", "瑗垮畨"}); + add(new String[]{"闄曡タ閲戦湒鍟嗕綇灏忓尯", "瑗垮畨"}); + }}); + city_DistrictNames.put("寤跺畨", new ArrayList(){{ + add(new String[]{"寤跺畨涓鍗曚綅瀹胯垗", "绂忓窞"}); + add(new String[]{"寤跺畨灏忓尯", "璐甸槼"}); + add(new String[]{"寤跺畨鏂版潙", "鏉窞"}); + add(new String[]{"寤跺畨閲�", "澶╂触"}); + add(new String[]{"寤跺畨妤�", "澶╂触"}); + add(new String[]{"寤跺畨閲岀ぞ鍖�", "娌堥槼"}); + add(new String[]{"寤跺畨灏忓尯", "澶ц繛"}); + add(new String[]{"寤跺畨灏忓尯", "鑺滄箹"}); + add(new String[]{"寤跺畨鍢夎嫅", "涓婃捣"}); + add(new String[]{"寤跺畨鏂版潙", "涓婃捣"}); + add(new String[]{"寤跺畨灏忓尯", "涓婃捣"}); + add(new String[]{"寤跺畨鍏瘬", "涓婃捣"}); + add(new String[]{"寤跺畨鏂版潙", "鏃犻敗"}); + add(new String[]{"寤跺畨宀ぞ鍖�", "榛勭煶"}); + add(new String[]{"寤跺畨妗冩簮灏忓尯", "寤跺畨"}); + add(new String[]{"寤跺畨鍖楅緳澶у帵", "寤跺畨"}); + add(new String[]{"寤跺畨缁藉皬鍖�", "寤跺畨"}); + }}); + city_DistrictNames.put("骞夸笢", new ArrayList(){{ + add(new String[]{"骞夸笢澶栬锤骞垮満", "骞垮窞"}); + add(new String[]{"骞夸笢澶栬鑹烘湳瀛﹂櫌鏁欏笀瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢寤虹闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢鍙告硶璀﹀畼鑱屼笟瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐜繚澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍟嗕笟澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍖诲闄㈡暀甯堝鑸嶆ゼ", "涓滆帪"}); + add(new String[]{"骞夸笢鍥介檯澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佹妧鏈洃鐫e眬瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢宸ヤ笟澶у瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鏁欒偛瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪侀摱琛屽ぇ鍘�", "娣卞湷"}); + add(new String[]{"骞夸笢澶у帵", "澶╂触"}); + add(new String[]{"骞夸笢灞卞簞", "闀囨睙"}); + add(new String[]{"骞夸笢绾㈢浘澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鑽闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢闈掑勾骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鍩虹妤�", "娣卞湷"}); + add(new String[]{"骞夸笢鐪佺鎶�骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佸啘涓氱鐞嗗共閮ㄥ闄㈢ぞ鍖�", "骞垮窞"}); + add(new String[]{"骞夸笢鑺暰闆烽�告櫙", "浣涘北"}); + }}); + city_DistrictNames.put("涓北", new ArrayList(){{ + add(new String[]{"涓北涓夐櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"涓北浜岄櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"涓北鑺卞洯", "闀挎槬"}); + add(new String[]{"涓北灏忓尯", "閮戝窞"}); + add(new String[]{"涓北鏉�", "鍗楁槍"}); + add(new String[]{"涓北鍩�", "鍗楁槍"}); + add(new String[]{"涓北妗ュ伐鍟嗛摱琛屽鑸�", "鍗楁槍"}); + add(new String[]{"涓北妗ュ湴绋庡眬瀹胯垗", "鍗楁槍"}); + add(new String[]{"涓北澹瑰搧", "鍗楁槍"}); + add(new String[]{"涓北浣宠嫅", "鍗楁槍"}); + add(new String[]{"涓北鍚嶅骇", "鍗楁槍"}); + add(new String[]{"涓北妗ヤ汉姘戦摱琛屽鑸�", "鍗楁槍"}); + add(new String[]{"涓北鍚嶈嫅", "鍝堝皵婊�"}); + add(new String[]{"涓北鍥介檯", "鍝堝皵婊�"}); + add(new String[]{"涓北绂忚嫅", "鍝堝皵婊�"}); + add(new String[]{"涓北鑻�", "甯稿窞"}); + add(new String[]{"涓北闂ㄥ叕瀵�", "甯稿窞"}); + add(new String[]{"涓北澶у瑗垮尯", "骞垮窞"}); + add(new String[]{"涓北鍑棆闂�", "鐭冲搴�"}); + add(new String[]{"涓北瀹鹃瀹胯垗", "鐭冲搴�"}); + add(new String[]{"涓北鍏洯闄勮繎瀹胯垗", "娴庡崡"}); + add(new String[]{"涓北闂ㄥ皬鍖�", "鍗椾含"}); + add(new String[]{"涓北鍩庡競鑺卞洯", "鏌冲窞"}); + add(new String[]{"涓北鍏瘬", "澶ц繛"}); + add(new String[]{"涓北楦挎櫙鑻�", "绂忓窞"}); + add(new String[]{"涓北鑺卞洯", "娉夊窞"}); + add(new String[]{"涓北瀹跺洯", "瀹佹尝"}); + add(new String[]{"涓北棣栧簻", "瀹佹尝"}); + add(new String[]{"涓北鍚嶉兘", "瀹佹尝"}); + add(new String[]{"涓北闆呭洯", "瀹佹尝"}); + add(new String[]{"涓北灏忓尯", "瀹佹尝"}); + add(new String[]{"涓北甯濇櫙鑻�", "涓北"}); + add(new String[]{"涓北鍗庡涵", "瀹佹尝"}); + add(new String[]{"涓北路鎬″拰鍥�", "鍢夊叴"}); + add(new String[]{"涓北鑺卞洯", "鍢夊叴"}); + add(new String[]{"涓北鍚嶅簻", "鍢夊叴"}); + add(new String[]{"涓北澶у帵鍟嗗姟妤�", "鍢夊叴"}); + add(new String[]{"涓北寤烘牎灏忓尯", "鍛煎拰娴╃壒"}); + add(new String[]{"涓北澶у帵", "璐甸槼"}); + add(new String[]{"涓北寰″涵", "鏉窞"}); + add(new String[]{"涓北鑺辫嫅", "鏉窞"}); + add(new String[]{"涓北鍖楀洯", "鏉窞"}); + add(new String[]{"涓北鑻�", "鏉窞"}); + add(new String[]{"涓北鑺卞洯", "鏉窞"}); + add(new String[]{"涓北鍥介檯", "澶╂触"}); + add(new String[]{"涓北鑻�", "娣卞湷"}); + add(new String[]{"涓北棰愭櫙鑺卞洯", "娣卞湷"}); + add(new String[]{"涓北鑺卞洯", "娣卞湷"}); + add(new String[]{"涓北闂ㄤ腹灏煎皵灏忓尯", "瑗垮畨"}); + add(new String[]{"涓北灏忓尯", "瑗垮畨"}); + add(new String[]{"涓北鍖楅噷", "澶╂触"}); + add(new String[]{"涓北闂ㄥ崡閲�", "澶╂触"}); + add(new String[]{"涓北闂ㄤ笢閲�", "澶╂触"}); + add(new String[]{"涓北澶у帵", "澶╂触"}); + add(new String[]{"涓北闂ㄥ洓鍙疯矾灏忓尯", "澶╂触"}); + add(new String[]{"涓北绉�鏅�", "娌堥槼"}); + add(new String[]{"涓北鍗楃ぞ鍖�", "娌堥槼"}); + add(new String[]{"涓北鑺卞洯", "姝︽眽"}); + add(new String[]{"涓北绀惧尯", "姝︽眽"}); + add(new String[]{"涓北澶у帵", "鍙板窞"}); + add(new String[]{"涓北鑺卞洯", "椹瀺灞�"}); + add(new String[]{"涓北鑺卞洯", "杩炰簯娓�"}); + add(new String[]{"涓北鍏洯灏忓尯", "姝︽眽"}); + add(new String[]{"涓北妗ョぞ鍖�", "姝︽眽"}); + add(new String[]{"涓北涓滃崌涔愭剰灞呰姳鍥�", "涓北"}); + add(new String[]{"涓北涓滃崌涓藉煄鑺卞洯", "涓北"}); + add(new String[]{"涓北娉簮鍒", "涓北"}); + add(new String[]{"涓北鑺卞洯", "鍝堝皵婊�"}); + add(new String[]{"涓北钃濊壊姘村哺", "鍝堝皵婊�"}); + add(new String[]{"涓北鑺卞洯", "璐甸槼"}); + add(new String[]{"涓北澶у帵", "绂忓窞"}); + add(new String[]{"涓北鑹捐彶鍫�", "涓北"}); + add(new String[]{"涓北涔濆彿", "澶ц繛"}); + add(new String[]{"涓北鍗楄嫅", "澶ц繛"}); + add(new String[]{"涓北瑗胯嫅", "闀囨睙"}); + add(new String[]{"涓北闂ㄨタ閲�", "澶╂触"}); + add(new String[]{"涓北闂ㄥ寳閲�", "澶╂触"}); + add(new String[]{"涓北涓滈噷", "澶╂触"}); + add(new String[]{"涓北浜汉缁囧搧鍏徃瀹胯垗", "闀挎矙"}); + add(new String[]{"涓北澶у帵", "姝︽眽"}); + add(new String[]{"涓北瑗胯嫅", "瀹佹尝"}); + add(new String[]{"涓北澶у涓滃尯", "骞垮窞"}); + add(new String[]{"涓北浜岄櫌鍗楅櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"涓北鏋楀缓绛戝叕鍙稿灞為櫌", "鍏板窞"}); + add(new String[]{"涓北SOHO鍏瘬", "瀹佹尝"}); + add(new String[]{"涓北鍖诲闄㈠鑸�", "骞垮窞"}); + add(new String[]{"涓北鍩庡尯鍟嗛摵", "涓北"}); + add(new String[]{"涓北灏忓尯", "閲嶅簡"}); + add(new String[]{"涓北浣宠嫅", "閲嶅簡"}); + add(new String[]{"涓北浜屾ˉ渚�", "涓北"}); + add(new String[]{"涓北娴锋櫙骞垮満", "鍘﹂棬"}); + add(new String[]{"涓北骞垮満", "浣涘北"}); + add(new String[]{"涓北澶ч櫌", "绂忓窞"}); + add(new String[]{"涓北骞垮満", "姝︽眽"}); + add(new String[]{"涓北澶у帵", "璐甸槼"}); + add(new String[]{"涓北璞簮", "浣涘北"}); + add(new String[]{"涓北棰愭櫙鑺卞洯浜屾湡", "娣卞湷"}); + add(new String[]{"涓北骞垮満", "澶ц繛"}); + add(new String[]{"涓北澶у钂插洯鍖�", "骞垮窞"}); + add(new String[]{"涓北鏂版潙", "鏄嗗北"}); + add(new String[]{"涓北鑻�", "涓婃捣"}); + add(new String[]{"涓北涓俊澶фゼ", "涓婃捣"}); + add(new String[]{"涓北鏂版潙", "涓婃捣"}); + add(new String[]{"涓北骞垮満", "涓婃捣"}); + add(new String[]{"涓北澶фゼ", "涓婃捣"}); + add(new String[]{"涓北澶у帵", "涓婃捣"}); + add(new String[]{"涓北鍏冧竴鏂拌嫅", "涓婃捣"}); + add(new String[]{"涓北鍏瘬", "涓婃捣"}); + add(new String[]{"涓北澶фゼ锛堥暱瀹侊級", "涓婃捣"}); + add(new String[]{"涓北鍖婚櫌瀹跺睘鍖�", "鍗椾含"}); + add(new String[]{"涓北鍟嗗姟妤�", "鍗椾含"}); + add(new String[]{"涓北澶у帵", "琛¢槼"}); + add(new String[]{"涓北灏忓尯", "瀹滃"}); + add(new String[]{"涓北鍥介檯澶у帵", "闀挎矙"}); + add(new String[]{"涓北瑗胯嫅鏅嘲閲�", "瀹佹尝"}); + add(new String[]{"涓北瑗胯嫅骞垮畨閲�", "瀹佹尝"}); + add(new String[]{"涓北绀惧尯鍗囧钩璺綇瀹�", "鍘﹂棬"}); + add(new String[]{"涓北鍚嶉兘", "鍢夊叴"}); + add(new String[]{"涓北鏂版潙", "鑻忓窞"}); + add(new String[]{"涓北濂ュ洯", "涓北"}); + add(new String[]{"涓北鏋椾簩鍗佷竷涓灞為櫌", "鍏板窞"}); + }}); + city_DistrictNames.put("姹熻タ", new ArrayList(){{ + add(new String[]{"姹熻タ鐪佸缓宸ラ泦鍥�", "鍗楁槍"}); + add(new String[]{"姹熻タ璐㈢粡澶у閭斂瀹胯垗", "鍗楁槍"}); + add(new String[]{"姹熻タ鐪佸浘涔﹂瀹胯垗", "鍗楁槍"}); + add(new String[]{"姹熻タ瀹鹃鏃佽竟", "鍗楁槍"}); + add(new String[]{"姹熻タ琛屾斂瀛﹂櫌瀹胯垗", "鍗楁槍"}); + add(new String[]{"姹熻タ璐㈢粡澶у瀹胯垗", "鍗楁槍"}); + add(new String[]{"姹熻タ绉戞妧甯堣寖瀛﹂櫌瀹胯垗", "鍗楁槍"}); + add(new String[]{"姹熻タ鐪佸箍鎾數鍙板鑸�", "鍗楁槍"}); + add(new String[]{"姹熻タ涓滃崕璁¢噺鐮旂┒鎵�瀹胯垗", "鍗楁槍"}); + add(new String[]{"姹熻タ瀹㈣溅鍘傚鑸�", "鍗楁槍"}); + add(new String[]{"姹熻タ浠櫒鍘傚鑸�", "鍗楁槍"}); + add(new String[]{"姹熻タ鏄屼笢姹借溅浜ゆ槗骞垮満", "鍗楁槍"}); + add(new String[]{"姹熻タ鏃ц揣澶т笘鐣�", "鍗楁槍"}); + add(new String[]{"姹熻タ鏃ユ姤瀹胯垗", "鍗楁槍"}); + }}); + city_DistrictNames.put("璧e窞", new ArrayList(){{ + add(new String[]{"璧e窞搴�", "璧e窞"}); + add(new String[]{"璧e窞瀹跺叿澶у競鍦�", "璧e窞"}); + add(new String[]{"璧e窞绮鍩�", "璧e窞"}); + }}); + city_DistrictNames.put("闄曡タ", new ArrayList(){{ + add(new String[]{"闄曡タ鐢靛姏鍏徃瀹跺睘闄�", "瑗垮畨"}); + add(new String[]{"闄曡タ鍥介檯浼氬睍涓績", "瑗垮畨"}); + add(new String[]{"闄曡タ宸�", "鍖椾含"}); + add(new String[]{"闄曡タ鐪佸鏈哄叧鑱斿缓灏忓尯", "瑗垮畨"}); + add(new String[]{"闄曡タ鐪佺柧鎺т腑蹇冨灞為櫌", "瑗垮畨"}); + add(new String[]{"闄曡タ姝岃垶鍓ч櫌瀹跺睘闄�", "瑗垮畨"}); + add(new String[]{"闄曡タ鎴忔洸鐮旂┒闄�", "瑗垮畨"}); + add(new String[]{"闄曡タ浜ら�氳亴涓氭妧鏈灞為櫌", "瑗垮畨"}); + add(new String[]{"闄曡タ骞挎挱鐢佃澶у瀹跺睘闄�", "瑗垮畨"}); + add(new String[]{"闄曡タ楣忚豹鍥�", "瑗垮畨"}); + add(new String[]{"闄曡タ鐗╀骇闆嗗洟鍏徃瀹跺睘闄�", "瑗垮畨"}); + add(new String[]{"闄曡タ閲戦湒鍟嗕綇灏忓尯", "瑗垮畨"}); + }}); + city_DistrictNames.put("鍜搁槼", new ArrayList(){{ + add(new String[]{"鍜搁槼閲�", "澶╂触"}); + add(new String[]{"鍜搁槼鍗楅噷", "澶╂触"}); + add(new String[]{"鍜搁槼鍖楅噷", "澶╂触"}); + }}); + city_DistrictNames.put("涓婃捣", new ArrayList(){{ + add(new String[]{"涓婃捣娌欓緳", "鍖椾含"}); + add(new String[]{"涓婃捣婊╄姳鍥�", "鐑熷彴"}); + add(new String[]{"涓婃捣鏂板煄", "鍗楁槍"}); + add(new String[]{"涓婃捣鏁呬簨", "鍗楁槍"}); + add(new String[]{"涓婃捣鍢夊洯", "鍝堝皵婊�"}); + add(new String[]{"涓婃捣澶ц姳鍥簩鏈�", "娉板窞"}); + add(new String[]{"涓婃捣鍩�", "涓北"}); + add(new String[]{"涓婃捣鑺卞洯", "娓╁窞"}); + add(new String[]{"涓婃捣鍩�", "闀挎矙"}); + add(new String[]{"涓婃捣骞村崕", "閮戝窞"}); + add(new String[]{"涓婃捣鍏瘬", "璐甸槼"}); + add(new String[]{"涓婃捣鍩庡競", "鍚堣偉"}); + add(new String[]{"涓婃捣鏄庣彔鑺卞洯", "鍗椾含"}); + add(new String[]{"涓婃捣鍩庝簩鏈�", "閲嶅簡"}); + add(new String[]{"涓婃捣鍥介檯鏈嶉グ鍩�", "寰愬窞"}); + add(new String[]{"涓婃捣澶у帵", "閲嶅簡"}); + add(new String[]{"涓婃捣鍩庡叕棣�", "瑗垮畨"}); + add(new String[]{"涓婃捣鍩�", "閲嶅簡"}); + add(new String[]{"涓婃捣婊╁ぇ鍗庡浗闄呭叕棣�", "澶╂触"}); + add(new String[]{"涓婃捣鏂板煄", "鍗楅��"}); + add(new String[]{"涓婃捣鍩庡悕浜鸿嫅", "缁甸槼"}); + add(new String[]{"涓婃捣鍢夎嫅", "鍗楅��"}); + add(new String[]{"涓婃捣鍏", "瑗勯槼"}); + add(new String[]{"涓婃捣瀹跺洯", "鍙板窞"}); + add(new String[]{"涓婃捣鑺卞洯", "鍙板窞"}); + add(new String[]{"涓婃捣璞嫅涓�鏈�", "杩炰簯娓�"}); + add(new String[]{"涓婃捣涔嬫槬浜屾湡", "杩炰簯娓�"}); + add(new String[]{"涓婃捣涔嬫槬涓�鏈�", "杩炰簯娓�"}); + add(new String[]{"涓婃捣璞嫅浜屾湡", "杩炰簯娓�"}); + add(new String[]{"涓婃捣璞嫅16#妤�", "杩炰簯娓�"}); + add(new String[]{"涓婃捣鍩�", "鑻忓窞"}); + add(new String[]{"涓婃捣甯傚満姝ヨ琛�1鍙烽櫌", "娲涢槼"}); + add(new String[]{"涓婃捣婊╁崕搴�", "娲涢槼"}); + add(new String[]{"涓婃捣甯傚満2鍙烽櫌", "娲涢槼"}); + add(new String[]{"涓婃捣鏂版潙", "閾跺窛"}); + add(new String[]{"涓婃捣瑗挎柊鏉�", "绂忓窞"}); + add(new String[]{"涓婃捣鑺卞洯", "娴庡崡"}); + add(new String[]{"涓婃捣鍏瘬", "闀囨睙"}); + add(new String[]{"涓婃捣璞涵", "濞佹捣"}); + add(new String[]{"涓婃捣鑺辫嫅", "闈掑矝"}); + add(new String[]{"涓婃捣鑺卞洯鍗楅偦瀹胯垗", "娴庡崡"}); + add(new String[]{"涓婃捣鏉�", "姝︽眽"}); + add(new String[]{"涓婃捣鍥介檯鑺卞洯", "濞佹捣"}); + add(new String[]{"涓婃捣澶ц姳鍥竴鏈�", "娉板窞"}); + add(new String[]{"涓婃捣鍩庣箒鍗庣邯", "閲嶅簡"}); + add(new String[]{"涓婃捣鍩�", "缁嶅叴"}); + add(new String[]{"涓婃捣涓滄柟鑺辫嫅", "閲嶅簡"}); + add(new String[]{"涓婃捣鍩庝笁鏈熷ぉ鍩�", "閲嶅簡"}); + add(new String[]{"涓婃捣鍩嶭OMO鍏瘬", "閲嶅簡"}); + add(new String[]{"涓婃捣鍩�", "濞佹捣"}); + add(new String[]{"涓婃捣涓滈煹", "鎴愰兘"}); + add(new String[]{"涓婃捣鎭掕仈鏂板ぉ鍦拌姳鍥�", "鏄嗘槑"}); + add(new String[]{"涓婃捣娌欓緳浜屾湡", "鏄嗘槑"}); + add(new String[]{"涓婃捣娌欓緳涓夋湡", "鏄嗘槑"}); + add(new String[]{"涓婃捣鍏", "鏄嗗北"}); + add(new String[]{"涓婃捣瑁曡姳鍥�", "鏄嗗北"}); + add(new String[]{"涓婃捣鍚庤姳鍥�", "鏄嗗北"}); + add(new String[]{"涓婃捣鎹峰骇", "鏄嗗北"}); + add(new String[]{"涓婃捣鏄熷煄鍒", "鏄嗗北"}); + add(new String[]{"涓婃捣涓囩绗簲鍥�", "涓婃捣"}); + add(new String[]{"涓婃捣缁垮煄涓夋湡", "涓婃捣"}); + add(new String[]{"涓婃捣婊╄姳鍥磱鎴�", "涓婃捣"}); + add(new String[]{"涓婃捣缁垮煄浜屾湡", "涓婃捣"}); + add(new String[]{"涓婃捣缁垮煄", "涓婃捣"}); + add(new String[]{"涓婃捣婊╄姳鍥磱鎴垮埆澧�", "涓婃捣"}); + add(new String[]{"涓婃捣鏈潵", "涓婃捣"}); + add(new String[]{"涓婃捣鏈潵榛勫北鏂板煄", "涓婃捣"}); + add(new String[]{"涓婃捣钃濆牎", "涓婃捣"}); + add(new String[]{"涓婃捣绗竴鍏桨浼�", "涓婃捣"}); + add(new String[]{"涓婃捣涓ゆ腐瑁呴グ鏉愭枡鍩�", "涓婃捣"}); + add(new String[]{"涓婃捣榧庡煄", "涓婃捣"}); + add(new String[]{"涓婃捣妗ユ婀捐喘鐗╀腑蹇�", "涓婃捣"}); + add(new String[]{"涓婃捣涓栧崥涓滄箹鍏瘬閰掑簵", "涓婃捣"}); + add(new String[]{"涓婃捣寤虹瓚", "鍖椾含"}); + add(new String[]{"涓婃捣鍏櫨", "涓婃捣"}); + add(new String[]{"涓婃捣姊︽兂", "涓婃捣"}); + add(new String[]{"涓婃捣鍏虫腐宸ヤ笟鍥尯", "涓婃捣"}); + add(new String[]{"涓婃捣鐢靛瓙鑹烘湳鍒涙剰浜т笟鍩哄湴", "涓婃捣"}); + add(new String[]{"涓婃捣澶ц姳鍥�", "涓婃捣"}); + add(new String[]{"涓婃捣鎹峰厠浣忓畢灏忓尯", "涓婃捣"}); + add(new String[]{"涓婃捣鍥介檯鎽╁皵鍩�", "涓婃捣"}); + add(new String[]{"涓婃捣鐨囧鑺卞洯", "涓婃捣"}); + add(new String[]{"涓婃捣鍥介檯涓皬浼佷笟鍩�", "涓婃捣"}); + add(new String[]{"涓婃捣浜旀湀澶�", "涓婃捣"}); + add(new String[]{"涓婃捣鍖楃灞卞浗闄呰壓鏈腑蹇�", "涓婃捣"}); + add(new String[]{"涓婃捣鏈壊", "涓婃捣"}); + add(new String[]{"涓婃捣婕曟渤娉惧紑鍙戝尯鏉炬睙楂樼鎶�鍥竴鏈�", "涓婃捣"}); + add(new String[]{"涓婃捣鏉炬睙涓囪揪骞垮満", "涓婃捣"}); + add(new String[]{"涓婃捣璇楁灄鍒", "涓婃捣"}); + add(new String[]{"涓婃捣鍚堢敓鍥介檯鑺卞洯", "涓婃捣"}); + add(new String[]{"涓婃捣鍏", "涓婃捣"}); + add(new String[]{"涓婃捣绱洯浜屾湡", "涓婃捣"}); + add(new String[]{"涓婃捣瑁曡姳鍥�", "涓婃捣"}); + add(new String[]{"涓婃捣钁¤悇鍩庣鎶�浜т笟鐢熶骇澶фゼ", "涓婃捣"}); + add(new String[]{"涓婃捣涓ゆ腐瑁呴グ鍩庡叕瀵�", "涓婃捣"}); + add(new String[]{"涓婃捣鐧介┈澶у帵", "涓婃捣"}); + add(new String[]{"涓婃捣鏂版潙", "涓婃捣"}); + add(new String[]{"涓婃捣澶ф偊鍩�", "涓婃捣"}); + add(new String[]{"涓婃捣鍥介檯鏃跺皻涓績", "涓婃捣"}); + add(new String[]{"涓婃捣鍟嗗姟涓績", "涓婃捣"}); + add(new String[]{"涓婃捣鐞嗗伐澶у鍥藉澶у绉戞妧鍥�", "涓婃捣"}); + add(new String[]{"涓婃捣璐㈢粡澶у鍥藉澶у绉戞妧鍥�", "涓婃捣"}); + add(new String[]{"涓婃捣婊╁ぇ瀹佸煄", "涓婃捣"}); + add(new String[]{"涓婃捣甯堝ぇ绉戞妧鍥�", "涓婃捣"}); + add(new String[]{"涓婃捣璞兘鍥介檯鑺卞洯鍒", "涓婃捣"}); + add(new String[]{"涓婃捣璇楁灄", "涓婃捣"}); + add(new String[]{"涓婃捣瀹跺ぉ涓嬭姳鍥埆澧�", "涓婃捣"}); + add(new String[]{"涓婃捣婧愯姳鍩�", "涓婃捣"}); + add(new String[]{"涓婃捣闈掑勾鍩�", "涓婃捣"}); + add(new String[]{"涓婃捣濞佸凹鏂姳鍥�", "涓婃捣"}); + add(new String[]{"涓婃捣鏅剁ⅶ浜т笟鍥�", "涓婃捣"}); + add(new String[]{"涓婃捣澶╁湴杞欢鍥�", "涓婃捣"}); + add(new String[]{"涓婃捣閾跺骇", "涓婃捣"}); + add(new String[]{"涓婃捣璞兘鍥介檯鑺卞洯", "涓婃捣"}); + add(new String[]{"涓婃捣璞洯", "涓婃捣"}); + add(new String[]{"涓婃捣姹囧姏寰楃數瀛愬晢鍔′骇涓氬洯", "涓婃捣"}); + add(new String[]{"涓婃捣鍒╂瘮瀵屾枃鍏风ぜ鍝佸晢鍘�", "涓婃捣"}); + add(new String[]{"涓婃捣涔嬫槬鍏瘬", "涓婃捣"}); + add(new String[]{"涓婃捣棣欐孩鑺卞煄", "涓婃捣"}); + add(new String[]{"涓婃捣鏄熸渤婀�", "涓婃捣"}); + add(new String[]{"涓婃捣骞村崕", "涓婃捣"}); + add(new String[]{"涓婃捣鐭ラ煶", "涓婃捣"}); + add(new String[]{"涓婃捣鐭ラ煶浜屾湡", "涓婃捣"}); + add(new String[]{"涓婃捣鑾樺煄鐗′腹闃�", "涓婃捣"}); + add(new String[]{"涓婃捣绱椇鍩�", "涓婃捣"}); + add(new String[]{"涓婃捣鏄熸腐", "涓婃捣"}); + add(new String[]{"涓婃捣鏄ュぉ", "涓婃捣"}); + add(new String[]{"涓婃捣瀹跺洯", "涓婃捣"}); + add(new String[]{"涓婃捣鑾樺煄閮藉競鎯呭洯", "涓婃捣"}); + add(new String[]{"涓婃捣婕曟渤娉惧紑鍙戝尯闂佃楂樼鎶�鍥�", "涓婃捣"}); + add(new String[]{"涓婃捣鑾樺煄", "涓婃捣"}); + add(new String[]{"涓婃捣搴峰煄涓夋湡", "涓婃捣"}); + add(new String[]{"涓婃捣路缁垮煄鐜懓鍥�", "涓婃捣"}); + add(new String[]{"涓婃捣鑺卞洯鍒", "涓婃捣"}); + add(new String[]{"涓婃捣搴峰煄鍥涙湡", "涓婃捣"}); + add(new String[]{"涓婃捣鍒", "涓婃捣"}); + add(new String[]{"涓婃捣鍏卞瘜鍥�", "涓婃捣"}); + add(new String[]{"涓婃捣婊╄姳鍥�", "涓婃捣"}); + add(new String[]{"涓婃捣鑺卞洯", "涓婃捣"}); + add(new String[]{"涓婃捣渚ㄥ洯澶╁疂璐㈠瘜鍒涙剰鍥尯", "涓婃捣"}); + add(new String[]{"涓婃捣椋庢櫙", "涓婃捣"}); + add(new String[]{"涓婃捣婊╂柊鏄屽煄", "涓婃捣"}); + add(new String[]{"涓婃捣鍟嗗煄", "涓婃捣"}); + add(new String[]{"涓婃捣搴峰煄浜屾湡", "涓婃捣"}); + add(new String[]{"涓婃捣闃冲煄", "涓婃捣"}); + add(new String[]{"涓婃捣閲戦拱璐墿涓績", "涓婃捣"}); + add(new String[]{"涓婃捣鏄ュ煄", "涓婃捣"}); + add(new String[]{"涓婃捣搴峰煄", "涓婃捣"}); + add(new String[]{"涓婃捣涓婂疄鍗楁磱骞垮満", "涓婃捣"}); + add(new String[]{"涓婃捣缁垮湴棣欓鍏瘬", "涓婃捣"}); + add(new String[]{"涓婃捣鑺卞煄", "涓婃捣"}); + add(new String[]{"涓婃捣缁垮湴棣欓鍒", "涓婃捣"}); + add(new String[]{"涓婃捣閲戝北涔変箤灏忓晢鍝佸煄", "涓婃捣"}); + add(new String[]{"涓婃捣鎹峰骇", "涓婃捣"}); + add(new String[]{"涓婃捣鑺卞洯骞垮満", "涓婃捣"}); + add(new String[]{"涓婃捣鏂板ぉ楦垮悕浜洪珮灏斿か鍒绀惧尯", "涓婃捣"}); + add(new String[]{"涓婃捣鍞愭湞閰掑簵", "涓婃捣"}); + add(new String[]{"涓婃捣鍔犲窞鑺卞洯", "涓婃捣"}); + add(new String[]{"涓婃捣鑺卞洯", "闈掑矝"}); + add(new String[]{"涓婃捣鏅洯", "闈掑矝"}); + add(new String[]{"涓婃捣娌欓緳涓�鏈�", "鏄嗘槑"}); + add(new String[]{"涓婃捣鑺卞洯", "鎴愰兘"}); + add(new String[]{"涓婃捣鍩�", "鑲囧簡"}); + add(new String[]{"涓婃捣鑺卞洯", "涔愭竻"}); + add(new String[]{"涓婃捣鍩�", "鍚存睙"}); + add(new String[]{"涓婃捣鍩�", "鏂颁埂"}); + add(new String[]{"涓婃捣鍗拌薄", "鐗′腹姹�"}); + add(new String[]{"涓婃捣涓借嫅", "鐩愬煄"}); + add(new String[]{"涓婃捣涔濅箙闈掑勾鍩庝簩鏈�", "涓婃捣"}); + add(new String[]{"涓婃捣鐢靛奖骞垮満", "涓婃捣"}); + add(new String[]{"涓婃捣涓夋箻娴峰皻", "涓婃捣"}); + add(new String[]{"涓婃捣涓夋箻娴峰皻鍒", "涓婃捣"}); + add(new String[]{"涓婃捣鍥介檯閽㈤搧鏈嶅姟涓氫腑蹇�", "涓婃捣"}); + add(new String[]{"涓婃捣娴锋腐鍥介檯璐告槗涓績", "涓婃捣"}); + add(new String[]{"涓婃捣閿︾弬鍥介檯濉戣兌涓績", "涓婃捣"}); + add(new String[]{"涓婃捣瑗块儕鍟嗗姟鍖�", "涓婃捣"}); + add(new String[]{"涓婃捣閿︽睙鍥介檯璐墿涓績", "涓婃捣"}); + add(new String[]{"涓婃捣鏂颁綋鑲插箍鍦�", "涓婃捣"}); + add(new String[]{"涓婃捣闈掑勾鍩庡叕瀵�", "涓婃捣"}); + add(new String[]{"涓婃捣鍗氫鸡缁煎悎甯傚満", "涓婃捣"}); + add(new String[]{"涓婃捣鍏村姏杈惧浗闄呰楗板煄", "涓婃捣"}); + add(new String[]{"涓婃捣鑺卞洯", "鏀�鏋濊姳"}); + add(new String[]{"涓婃捣鏄熷煄", "鑻忓窞"}); + add(new String[]{"涓婃捣婊╁晢鍘�", "涓婃捣"}); + add(new String[]{"涓婃捣鍥介檯闉嬪煄", "涓婃捣"}); + add(new String[]{"涓婃捣瑁呴グ甯傚満", "涓婃捣"}); + add(new String[]{"涓婃捣鍛ㄦ郸涓囪揪骞垮満鍏瘬", "涓婃捣"}); + add(new String[]{"涓婃捣鍩庢柊澶╁湴瀹跺洯", "鑻忓窞"}); + add(new String[]{"涓婃捣瑁曡姳鍥�", "鑻忓窞"}); + add(new String[]{"涓婃捣涔嬫槬", "杩炰簯娓�"}); + }}); + city_DistrictNames.put("姹熻嫃", new ArrayList(){{ + add(new String[]{"姹熻嫃鐪佸啘绉戦櫌", "鍗椾含"}); + add(new String[]{"姹熻嫃娌圭敯鐭虫补灞卞簞", "鎵窞"}); + add(new String[]{"姹熻嫃璀﹀畼瀛﹂櫌", "鍗椾含"}); + add(new String[]{"姹熻嫃鐪侀珮绾т笓瀹跺洯", "鍗椾含"}); + add(new String[]{"姹熻嫃娌圭敯鐭虫补灞卞簞", "鎵窞"}); + add(new String[]{"姹熻嫃璁簨鍥�", "鍗椾含"}); + add(new String[]{"姹熻嫃鍥介檯濉戝寲鍩�", "甯稿窞"}); + add(new String[]{"姹熻嫃涓囧拰鍥介檯鍟嗚锤鍩�", "甯稿窞"}); + }}); + city_DistrictNames.put("鑻忓窞", new ArrayList(){{ + add(new String[]{"鑻忓窞鍖楀贩", "澶ц繛"}); + add(new String[]{"鑻忓窞閲�", "澶╂触"}); + add(new String[]{"鑻忓窞鑺卞洯涓�鏈�", "涔岄瞾鏈ㄩ綈"}); + add(new String[]{"鑻忓窞鑺卞洯浜屾湡", "涔岄瞾鏈ㄩ綈"}); + add(new String[]{"鑻忓窞鑺卞洯", "瀹胯縼"}); + add(new String[]{"鑻忓窞灏忓尯", "鍖椾含"}); + add(new String[]{"鑻忓窞鍏瘬", "鍖椾含"}); + add(new String[]{"鑻忓窞骞昏薄", "娴庡崡"}); + add(new String[]{"鑻忓窞鍑ゅ嚢鏂囧寲骞垮満", "鑻忓窞"}); + add(new String[]{"鑻忓窞鍥介檯杞荤汉鍩�", "鑻忓窞"}); + add(new String[]{"鑻忓窞涓栬寕杩愭渤鍩�", "鑻忓窞"}); + add(new String[]{"鑻忓窞甯傛钵娴鎶�鍒涗笟鍥�", "鑻忓窞"}); + add(new String[]{"鑻忓窞楂樻柊鍖轰汉鍔涜祫婧愬ぇ鍘�", "鑻忓窞"}); + add(new String[]{"鑻忓窞鏂颁笢鏂规苯閰嶅煄", "鑻忓窞"}); + add(new String[]{"鑻忓窞绀煎搧鍟嗗搧鍩�", "鑻忓窞"}); + add(new String[]{"鑻忓窞娌挎捣鍥介檯涓績", "鑻忓窞"}); + add(new String[]{"鑻忓窞鏈虹數浜旈噾鍩�", "鑻忓窞"}); + add(new String[]{"鑻忓窞甯傛钵娴鎶�鍒涗笟鍥笢鍖�", "鑻忓窞"}); + add(new String[]{"鑻忓窞涓栬寕骞垮満鍏瘬", "鑻忓窞"}); + }}); + city_DistrictNames.put("鏄嗗北", new ArrayList(){{ + add(new String[]{"鏄嗗北灏忓尯", "娌堥槼"}); + add(new String[]{"鏄嗗北鍗楀皬鍖�", "娌堥槼"}); + add(new String[]{"鏄嗗北閲�", "澶╂触"}); + add(new String[]{"鏄嗗北鑺卞洯", "鏄嗗北"}); + add(new String[]{"鏄嗗北浜夸赴鏈虹數鍩�", "鏄嗗北"}); + add(new String[]{"鏄嗗北鏌忔偊鍟嗗姟澶у帵", "鏄嗗北"}); + add(new String[]{"鏄嗗北鍥介檯妯″叿鍩�", "鏄嗗北"}); + add(new String[]{"鏄嗗北缁垮煄鐜懓鍥�", "鏄嗗北"}); + add(new String[]{"鏄嗗北浜夸赴骞垮満", "鏄嗗北"}); + add(new String[]{"鏄嗗北棣欐孩绱儭", "鏄嗗北"}); + add(new String[]{"鏄嗗北涓畤骞垮満", "涓婃捣"}); + add(new String[]{"鏄嗗北璧涙牸鐢靛瓙", "涓婃捣"}); + add(new String[]{"鏄嗗北浜戝北璇楁剰", "鑻忓窞"}); + add(new String[]{"鏄嗗北鏌忔偊鍟嗗姟澶у帵", "鑻忓窞"}); + }}); + city_DistrictNames.put("鍐呰挋鍙�", new ArrayList(){{ + add(new String[]{"鍐呰挋鍙ょ數澶у皬鍖�", "鍛煎拰娴╃壒"}); + add(new String[]{"鍐呰挋鍙ゆ棩鎶ョぞ瀹夊叏鏂囨槑灏忓尯", "鍛煎拰娴╃壒"}); + add(new String[]{"鍐呰挋鍙ゆ斂搴滀綇瀹呭皬鍖�", "鍛煎拰娴╃壒"}); + add(new String[]{"鍐呰挋鍙よ嚜娌诲尯鍥界◣灞�浣忓畢鍖�", "鍛煎拰娴╃壒"}); + add(new String[]{"鍐呰挋鍙ゆ斂鍗忎綇瀹呭皬鍖�", "鍛煎拰娴╃壒"}); + add(new String[]{"鍐呰挋鍙ょ粡璐稿闄㈠灞為櫌", "鍛煎拰娴╃壒"}); + add(new String[]{"鍐呰挋鍙ゅ厷鏍″崡鑻戝皬鍖�", "鍛煎拰娴╃壒"}); + add(new String[]{"鍐呰挋鍙ゅ尰闄㈠灞炴ゼ", "鍛煎拰娴╃壒"}); + add(new String[]{"鍐呰挋鍙ゅ浗闄呭晢璐稿煄", "鍛煎拰娴╃壒"}); + }}); + city_DistrictNames.put("閯傚皵澶氭柉", new ArrayList(){{ + }}); + city_DistrictNames.put("骞夸笢", new ArrayList(){{ + add(new String[]{"骞夸笢澶栬锤骞垮満", "骞垮窞"}); + add(new String[]{"骞夸笢澶栬鑹烘湳瀛﹂櫌鏁欏笀瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢寤虹闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢鍙告硶璀﹀畼鑱屼笟瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐜繚澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍟嗕笟澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍖诲闄㈡暀甯堝鑸嶆ゼ", "涓滆帪"}); + add(new String[]{"骞夸笢鍥介檯澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佹妧鏈洃鐫e眬瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢宸ヤ笟澶у瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鏁欒偛瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪侀摱琛屽ぇ鍘�", "娣卞湷"}); + add(new String[]{"骞夸笢澶у帵", "澶╂触"}); + add(new String[]{"骞夸笢灞卞簞", "闀囨睙"}); + add(new String[]{"骞夸笢绾㈢浘澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鑽闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢闈掑勾骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鍩虹妤�", "娣卞湷"}); + add(new String[]{"骞夸笢鐪佺鎶�骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佸啘涓氱鐞嗗共閮ㄥ闄㈢ぞ鍖�", "骞垮窞"}); + add(new String[]{"骞夸笢鑺暰闆烽�告櫙", "浣涘北"}); + }}); + city_DistrictNames.put("闊跺叧", new ArrayList(){{ + add(new String[]{"闊跺叧纰ф鍥�", "闊跺叧"}); + }}); + city_DistrictNames.put("闄曡タ", new ArrayList(){{ + add(new String[]{"闄曡タ鐢靛姏鍏徃瀹跺睘闄�", "瑗垮畨"}); + add(new String[]{"闄曡タ鍥介檯浼氬睍涓績", "瑗垮畨"}); + add(new String[]{"闄曡タ宸�", "鍖椾含"}); + add(new String[]{"闄曡タ鐪佸鏈哄叧鑱斿缓灏忓尯", "瑗垮畨"}); + add(new String[]{"闄曡タ鐪佺柧鎺т腑蹇冨灞為櫌", "瑗垮畨"}); + add(new String[]{"闄曡タ姝岃垶鍓ч櫌瀹跺睘闄�", "瑗垮畨"}); + add(new String[]{"闄曡タ鎴忔洸鐮旂┒闄�", "瑗垮畨"}); + add(new String[]{"闄曡タ浜ら�氳亴涓氭妧鏈灞為櫌", "瑗垮畨"}); + add(new String[]{"闄曡タ骞挎挱鐢佃澶у瀹跺睘闄�", "瑗垮畨"}); + add(new String[]{"闄曡タ楣忚豹鍥�", "瑗垮畨"}); + add(new String[]{"闄曡タ鐗╀骇闆嗗洟鍏徃瀹跺睘闄�", "瑗垮畨"}); + add(new String[]{"闄曡タ閲戦湒鍟嗕綇灏忓尯", "瑗垮畨"}); + }}); + city_DistrictNames.put("瑗垮畨", new ArrayList(){{ + add(new String[]{"瑗垮畨鑺卞洯", "闀挎槬"}); + add(new String[]{"瑗垮畨鑻�", "鍘﹂棬"}); + add(new String[]{"瑗垮畨绂忚儭鍚�", "鍖椾含"}); + add(new String[]{"瑗垮畨闂ㄥ皬鍖�", "鍖椾含"}); + add(new String[]{"瑗垮畨鍗拌薄", "瑗垮畨"}); + add(new String[]{"瑗垮畨鏈濋槼灏忓尯", "瑗垮畨"}); + add(new String[]{"瑗垮畨閿﹂兘", "瑗垮畨"}); + add(new String[]{"瑗垮畨甯傛斂搴滃皬鍖�", "瑗垮畨"}); + add(new String[]{"瑗垮畨閿﹀洯", "瑗垮畨"}); + add(new String[]{"瑗垮畨闃冲厜閲�", "瑗垮畨"}); + add(new String[]{"瑗垮畨甯備汉姘戞瀵熼櫌瀹跺睘闄�", "瑗垮畨"}); + add(new String[]{"瑗垮畨鎭掔珛鑻�", "瑗垮畨"}); + add(new String[]{"瑗垮畨甯傚缓琛屽灞為櫌", "瑗垮畨"}); + add(new String[]{"瑗垮畨浠〃鍘�101绀惧尯", "瑗垮畨"}); + add(new String[]{"瑗垮畨楂樻柊鍖哄垱涓氱爺鍙戦櫌", "瑗垮畨"}); + add(new String[]{"瑗垮畨骞垮満", "鍘﹂棬"}); + add(new String[]{"瑗垮畨甯傚姵鍔ㄥ眬瀹跺睘闄�", "瑗垮畨"}); + add(new String[]{"瑗垮畨澶ф磱鍟嗗帵", "瑗垮畨"}); + add(new String[]{"瑗垮畨甯傚晢涓氶摱琛屽煄涓滄敮琛屽灞為櫌", "瑗垮畨"}); + add(new String[]{"瑗垮畨澶栬繍灏忓尯", "瑗垮畨"}); + add(new String[]{"瑗垮畨鏃ユ姤绀惧灞為櫌", "瑗垮畨"}); + add(new String[]{"瑗垮畨闄㈠瓙", "瑗垮畨"}); + add(new String[]{"瑗垮畨鐢电紗鍏徃瀹跺睘闄�", "瑗垮畨"}); + add(new String[]{"瑗垮畨鐩涗笘骞垮満", "瑗垮畨"}); + add(new String[]{"瑗垮畨姘戜箰鍥竾杈惧箍鍦�", "瑗垮畨"}); + add(new String[]{"瑗垮畨棣栧垱鍥介檯鍩�/棣栧垱婕閮�", "瑗垮畨"}); + add(new String[]{"瑗垮畨浜ら�氬ぇ瀛︽壃宸炵鎶�鍥�", "鎵窞"}); + }}); + city_DistrictNames.put("灞变笢", new ArrayList(){{ + add(new String[]{"灞变笢閲�", "绉︾殗宀�"}); + add(new String[]{"灞变笢缁忔祹瀛﹂櫌瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢鐪佸崼鐢熷巺瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢鐪佹皯鏀垮巺瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢鐪佸晢涓氶泦鍥㈡�诲叕鍙稿鑸�", "娴庡崡"}); + add(new String[]{"灞变笢鍖荤澶у鏁欏笀瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢澶栬锤澶у帵", "闈掑矝"}); + add(new String[]{"灞变笢澶у帵", "娣卞湷"}); + add(new String[]{"灞变笢鍫$ぞ鍖�", "娌堥槼"}); + add(new String[]{"灞变笢鑹烘湳瀛﹂櫌瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢榛勯噾宕簯婀栭珮灏斿か鍒", "娴庡崡"}); + add(new String[]{"灞变笢鍙告硶璀﹀畼瀛﹂櫌瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢鐪佺瀛﹂櫌楂樻柊鎶�鏈爺绌跺垎闄�", "闈掑矝"}); + add(new String[]{"灞变笢寤哄伐瀛﹂櫌瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢搴欏皬鍖�", "娌堥槼"}); + add(new String[]{"灞变笢涔冲北閾舵哗娴锋櫙鎴�", "濞佹捣"}); + add(new String[]{"灞变笢澶存潙", "闈掑矝"}); + add(new String[]{"灞变笢鐪佺暅鐗у眬瀹胯垗", "娴庡崡"}); + }}); + city_DistrictNames.put("娼嶅潑", new ArrayList(){{ + add(new String[]{"娼嶅潑浜屽缓瀹胯垗", "娼嶅潑"}); + add(new String[]{"娼嶅潑鐑熻崏鍏徃瀹胯垗", "娼嶅潑"}); + add(new String[]{"娼嶅潑甯傛暀鑲插眬", "娼嶅潑"}); + add(new String[]{"娼嶅潑澶ч厭搴楀鑸�", "娼嶅潑"}); + add(new String[]{"娼嶅潑涓滄柟瀹跺洯", "娼嶅潑"}); + add(new String[]{"娼嶅潑渚涢攢绀惧鑸�", "娼嶅潑"}); + add(new String[]{"娼嶅潑寤哄伐灞�瀹胯垗", "娼嶅潑"}); + add(new String[]{"娼嶅潑瀛﹂櫌瀹胯垗锛堟矁灏旂帥鍚庯級", "娼嶅潑"}); + add(new String[]{"娼嶅潑涓瀹跺睘闄�", "娼嶅潑"}); + add(new String[]{"娼嶅潑鍔ㄩ厤瀹胯垗", "娼嶅潑"}); + add(new String[]{"娼嶅潑閾惰瀹胯垗锛堟ū鍓嶈锛�", "娼嶅潑"}); + add(new String[]{"娼嶅潑閾惰瀹胯垗", "娼嶅潑"}); + add(new String[]{"娼嶅潑鍗佹潙", "涓婃捣"}); + add(new String[]{"娼嶅潑浜屾潙", "涓婃捣"}); + add(new String[]{"娼嶅潑涔濇潙", "涓婃捣"}); + add(new String[]{"娼嶅潑鍏潙", "涓婃捣"}); + add(new String[]{"娼嶅潑澶фゼ", "涓婃捣"}); + add(new String[]{"娼嶅潑鍥涙潙", "涓婃捣"}); + add(new String[]{"娼嶅潑涓�鏉�", "涓婃捣"}); + add(new String[]{"娼嶅潑鍏潙", "涓婃捣"}); + add(new String[]{"娼嶅潑浜旀潙", "涓婃捣"}); + add(new String[]{"娼嶅潑涓冩潙", "涓婃捣"}); + add(new String[]{"娼嶅潑涓夋潙", "涓婃捣"}); + }}); + city_DistrictNames.put("娌冲崡", new ArrayList(){{ + add(new String[]{"娌冲崡搴勫皬鍖�", "闈掑矝"}); + add(new String[]{"娌冲崡璐笓瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡鐪佹柊鍗庝功搴楀灞為櫌", "閮戝窞"}); + add(new String[]{"娌冲崡鐪佸晢涓氱瀛︾爺绌舵墍瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡鐪佹棩鎶ョぞ瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡濂冲瓙楂樹腑瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡澶栬锤澶ч櫌", "娣卞湷"}); + add(new String[]{"娌冲崡閲�", "澶╂触"}); + add(new String[]{"娌冲崡鏂版潙", "绂忓窞"}); + add(new String[]{"娌冲崡璐㈢粡瀛﹂櫌瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡宀稿叕鍥皬鍖�", "鎯犲窞"}); + add(new String[]{"娌冲崡宀告柊鏉�", "鎯犲窞"}); + add(new String[]{"娌冲崡鏉�", "鍖椾含"}); + add(new String[]{"娌冲崡鐞嗗伐瀛︽牎瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡鐪佷汉浜嬪巺瀹跺睘闄�", "閮戝窞"}); + add(new String[]{"娌冲崡宀镐腑蹇冨皬鍖�", "鎯犲窞"}); + add(new String[]{"娌冲崡鐪佸璐稿鏍″灞為櫌", "閮戝窞"}); + add(new String[]{"娌冲崡鏉�", "涓婃捣"}); + add(new String[]{"娌冲崡鏂版潙", "涓婃捣"}); + add(new String[]{"娌冲崡宸ヤ笟澶у瀹跺睘闄�", "閮戝窞"}); + }}); + city_DistrictNames.put("娲涢槼", new ArrayList(){{ + add(new String[]{"娲涢槼鑺卞洯", "闀挎槬"}); + add(new String[]{"娲涢槼鍢夋眹鍩�", "娲涢槼"}); + add(new String[]{"娲涢槼甯傞珮璐ㄤ汉鎵嶅眳浣忓尯", "娲涢槼"}); + add(new String[]{"娲涢槼鏂板煄", "娉夊窞"}); + add(new String[]{"娲涢槼閾惰瀹跺睘闄�", "娲涢槼"}); + add(new String[]{"娲涢槼鍢夋眹鍩�", "娲涢槼"}); + add(new String[]{"娲涢槼楗簵瀹跺睘闄�", "娲涢槼"}); + add(new String[]{"娲涢槼娉婃灄缁挎床", "娲涢槼"}); + add(new String[]{"娲涢槼鏂版潙", "涓婃捣"}); + add(new String[]{"娲涢槼鍗囬緳骞垮満", "娲涢槼"}); + add(new String[]{"娲涢槼淇℃伅绉戞妧鍩�", "娲涢槼"}); + add(new String[]{"娲涢槼鍗囬緳鍩�", "娲涢槼"}); + }}); + city_DistrictNames.put("姹熻嫃", new ArrayList(){{ + add(new String[]{"姹熻嫃鐪佸啘绉戦櫌", "鍗椾含"}); + add(new String[]{"姹熻嫃娌圭敯鐭虫补灞卞簞", "鎵窞"}); + add(new String[]{"姹熻嫃璀﹀畼瀛﹂櫌", "鍗椾含"}); + add(new String[]{"姹熻嫃鐪侀珮绾т笓瀹跺洯", "鍗椾含"}); + add(new String[]{"姹熻嫃娌圭敯鐭虫补灞卞簞", "鎵窞"}); + add(new String[]{"姹熻嫃璁簨鍥�", "鍗椾含"}); + add(new String[]{"姹熻嫃鍥介檯濉戝寲鍩�", "甯稿窞"}); + add(new String[]{"姹熻嫃涓囧拰鍥介檯鍟嗚锤鍩�", "甯稿窞"}); + }}); + city_DistrictNames.put("甯稿窞", new ArrayList(){{ + add(new String[]{"甯稿窞閲�", "澶╂触"}); + }}); + city_DistrictNames.put("骞夸笢", new ArrayList(){{ + add(new String[]{"骞夸笢澶栬锤骞垮満", "骞垮窞"}); + add(new String[]{"骞夸笢澶栬鑹烘湳瀛﹂櫌鏁欏笀瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢寤虹闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢鍙告硶璀﹀畼鑱屼笟瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐜繚澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍟嗕笟澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鍖诲闄㈡暀甯堝鑸嶆ゼ", "涓滆帪"}); + add(new String[]{"骞夸笢鍥介檯澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佹妧鏈洃鐫e眬瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢宸ヤ笟澶у瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鏁欒偛瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪侀摱琛屽ぇ鍘�", "娣卞湷"}); + add(new String[]{"骞夸笢澶у帵", "澶╂触"}); + add(new String[]{"骞夸笢灞卞簞", "闀囨睙"}); + add(new String[]{"骞夸笢绾㈢浘澶у帵", "骞垮窞"}); + add(new String[]{"骞夸笢鑽闄㈠鑸�", "骞垮窞"}); + add(new String[]{"骞夸笢闈掑勾骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鍩虹妤�", "娣卞湷"}); + add(new String[]{"骞夸笢鐪佺鎶�骞查儴瀛﹂櫌瀹胯垗", "骞垮窞"}); + add(new String[]{"骞夸笢鐪佸啘涓氱鐞嗗共閮ㄥ闄㈢ぞ鍖�", "骞垮窞"}); + add(new String[]{"骞夸笢鑺暰闆烽�告櫙", "浣涘北"}); + }}); + city_DistrictNames.put("涓滆帪", new ArrayList(){{ + add(new String[]{"涓滆帪搴勫伐鍟嗗眬瀹胯垗", "骞垮窞"}); + add(new String[]{"涓滆帪甯傚灞呰楗板煄", "涓滆帪"}); + add(new String[]{"涓滆帪闀垮畨涓囪揪骞垮満", "涓滆帪"}); + add(new String[]{"涓滆帪鍗庡崡鍥介檯姹介厤鍩�", "涓滆帪"}); + add(new String[]{"涓滆帪澶栬锤澶у帵", "娣卞湷"}); + add(new String[]{"涓滆帪瀹剁鍩�", "榛勭煶"}); + }}); + city_DistrictNames.put("婀栧寳", new ArrayList(){{ + add(new String[]{"婀栧寳灏忓尯", "鍖椾含"}); + add(new String[]{"婀栧寳瀹濅赴鑺卞洯", "娣卞湷"}); + add(new String[]{"婀栧寳缁忔祹瀛﹂櫌瀹胯垗", "姝︽眽"}); + add(new String[]{"婀栧寳澶у瀹胯垗", "姝︽眽"}); + add(new String[]{"婀栧寳鏃ユ姤瀹胯垗", "姝︽眽"}); + add(new String[]{"婀栧寳鐪佹枃鑱斿鑸�", "姝︽眽"}); + add(new String[]{"婀栧寳鐜颁唬浜旈噾鐢靛櫒鍩�", "姝︽眽"}); + add(new String[]{"婀栧寳楗簵瀹胯垗", "姝︽眽"}); + add(new String[]{"婀栧寳淇濋櫓鍏徃瀹跺睘妤�", "姝︽眽"}); + add(new String[]{"婀栧寳鏋椾笟鍕樺療闄㈠皬鍖�", "姝︽眽"}); + add(new String[]{"婀栧寳浜ら�氳亴涓氭妧鏈闄㈠鑸�", "姝︽眽"}); + add(new String[]{"婀栧寳鐪佽壓鏈鏍″鑸�", "姝︽眽"}); + add(new String[]{"婀栧寳澶у帵", "鍘﹂棬"}); + add(new String[]{"婀栧寳璐ㄩ噺鐩戠潱灞�瀹胯垗", "姝︽眽"}); + add(new String[]{"婀栧寳鐪佸尰鑽洃鐫g鐞嗗眬瀹胯垗", "姝︽眽"}); + add(new String[]{"婀栧寳鏁欒偛鍑虹増绀惧鑸�", "姝︽眽"}); + add(new String[]{"婀栧寳鐪佽嵂鏉愬叕鍙稿鑸�", "姝︽眽"}); + add(new String[]{"婀栧寳浜屽笀瀹胯垗", "姝︽眽"}); + add(new String[]{"婀栧寳涓尰瀛﹂櫌瀹胯垗", "姝︽眽"}); + add(new String[]{"婀栧寳鐪佺敓娲昏祫鏂欏叕鍙稿眳姘戝皬鍖�", "姝︽眽"}); + add(new String[]{"婀栧寳鍟嗗姟骞垮満", "姝︽眽"}); + add(new String[]{"婀栧寳鏁欒偛瀛﹂櫌瀹胯垗", "姝︽眽"}); + add(new String[]{"婀栧寳鐪佺洃鐙辩鐞嗗眬瀹胯垗", "姝︽眽"}); + add(new String[]{"婀栧寳鐪佸畨鍏ㄧ洃瀵熷眬瀹胯垗", "姝︽眽"}); + }}); + city_DistrictNames.put("榛勭煶", new ArrayList(){{ + add(new String[]{"榛勭煶澶у帵", "骞垮窞"}); + add(new String[]{"榛勭煶鑺卞洯", "骞垮窞"}); + add(new String[]{"榛勭煶鍙告硶瀛︽牎瀹胯垗", "骞垮窞"}); + add(new String[]{"榛勭煶宀皬鍖�", "娌虫簮"}); + add(new String[]{"榛勭煶娓簹鍏夋柊鏉�", "榛勭煶"}); + add(new String[]{"榛勭煶鍏洯", "榛勭煶"}); + add(new String[]{"榛勭煶娓繋瀹惧尽鍥�", "榛勭煶"}); + }}); + city_DistrictNames.put("闈掓捣", new ArrayList(){{ + add(new String[]{"闈掓捣婀栬姳鍥�", "瑗垮畞"}); + add(new String[]{"闈掓捣鍥竵鍥�", "瑗垮畞"}); + add(new String[]{"闈掓捣鍥�", "澶╂触"}); + add(new String[]{"闈掓捣澶у帵", "娣卞湷"}); + add(new String[]{"闈掓捣骞蹭紤鎵�", "鏃犻敗"}); + add(new String[]{"闈掓捣鏂版潙", "鍗楅��"}); + }}); + city_DistrictNames.put("瑗垮畞", new ArrayList(){{ + }}); + city_DistrictNames.put("灞变笢", new ArrayList(){{ + add(new String[]{"灞变笢閲�", "绉︾殗宀�"}); + add(new String[]{"灞变笢缁忔祹瀛﹂櫌瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢鐪佸崼鐢熷巺瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢鐪佹皯鏀垮巺瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢鐪佸晢涓氶泦鍥㈡�诲叕鍙稿鑸�", "娴庡崡"}); + add(new String[]{"灞变笢鍖荤澶у鏁欏笀瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢澶栬锤澶у帵", "闈掑矝"}); + add(new String[]{"灞变笢澶у帵", "娣卞湷"}); + add(new String[]{"灞变笢鍫$ぞ鍖�", "娌堥槼"}); + add(new String[]{"灞变笢鑹烘湳瀛﹂櫌瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢榛勯噾宕簯婀栭珮灏斿か鍒", "娴庡崡"}); + add(new String[]{"灞变笢鍙告硶璀﹀畼瀛﹂櫌瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢鐪佺瀛﹂櫌楂樻柊鎶�鏈爺绌跺垎闄�", "闈掑矝"}); + add(new String[]{"灞变笢寤哄伐瀛﹂櫌瀹胯垗", "娴庡崡"}); + add(new String[]{"灞变笢搴欏皬鍖�", "娌堥槼"}); + add(new String[]{"灞变笢涔冲北閾舵哗娴锋櫙鎴�", "濞佹捣"}); + add(new String[]{"灞变笢澶存潙", "闈掑矝"}); + add(new String[]{"灞变笢鐪佺暅鐗у眬瀹胯垗", "娴庡崡"}); + }}); + city_DistrictNames.put("娴庡崡", new ArrayList(){{ + add(new String[]{"娴庡崡涓�涓鑸�", "娴庡崡"}); + add(new String[]{"娴庡崡鍥涘缓瀹胯垗", "娴庡崡"}); + add(new String[]{"娴庡崡楗簵瀹胯垗", "娴庡崡"}); + add(new String[]{"娴庡崡涓闄勮繎瀹胯垗", "娴庡崡"}); + add(new String[]{"娴庡崡鐏场鍘傚鑸�", "娴庡崡"}); + add(new String[]{"娴庡崡鏅埄鍟嗗姟涓績", "娴庡崡"}); + add(new String[]{"娴庡崡澶у瀹胯垗", "娴庡崡"}); + add(new String[]{"娴庡崡涓変腑鏁欏笀瀹胯垗", "娴庡崡"}); + add(new String[]{"娴庡崡涓夊缓瀹胯垗", "娴庡崡"}); + add(new String[]{"娴庡崡鍗佸洓涓鑸�", "娴庡崡"}); + add(new String[]{"娴庡崡甯傛埧绠″眬瀹胯垗", "娴庡崡"}); + add(new String[]{"娴庡崡椴佽兘棰嗙鍩�", "娴庡崡"}); + add(new String[]{"娴庡崡澶у瑗挎牎鍖洪檮杩戝鑸�", "娴庡崡"}); + add(new String[]{"娴庡崡绗節涓瀹胯垗", "娴庡崡"}); + add(new String[]{"娴庡崡鍐涘尯鎬诲尰闄㈠鑸�", "娴庡崡"}); + add(new String[]{"娴庡崡榛勯噾鑺卞洯", "娴庡崡"}); + add(new String[]{"娴庡崡鎭掑ぇ鍚嶉兘", "娴庡崡"}); + add(new String[]{"娴庡崡鎭掑ぇ缁挎床", "娴庡崡"}); + add(new String[]{"娴庡崡涓�涓闈㈠鑸�", "娴庡崡"}); + add(new String[]{"娴庡崡姹囪嫅瀹跺洯", "娴庡崡"}); + add(new String[]{"娴庡崡鐢佃骞挎挱澶у涓滄牎鍖哄鑸�", "娴庡崡"}); + add(new String[]{"娴庡崡鐜懓鍥柊鍩�", "娴庡崡"}); + add(new String[]{"娴庡崡鍐滀俊鑱旂ぞ瀹胯垗", "娴庡崡"}); + add(new String[]{"娴庡崡闊╁浗浜т笟鍩�", "娴庡崡"}); + add(new String[]{"娴庡崡澶╅┈鐩稿煄", "娴庡崡"}); + add(new String[]{"娴庡崡鎭掑ぇ甯濇櫙", "娴庡崡"}); + add(new String[]{"娴庡崡鍗庡己骞垮満", "娴庡崡"}); }}); } diff --git a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/util/AddressUtils.java b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/util/AddressUtils.java index e7adb27d9..4810791b8 100644 --- a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/util/AddressUtils.java +++ b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/util/AddressUtils.java @@ -17,11 +17,11 @@ public class AddressUtils { */ public static void main(String[] args) { AddressUtils task = new AddressUtils(); - System.out.println(task.getRoadNameBySplitWord("上海市长宁区天山西路267弄")); + System.out.println(task.getRoadNameBySplitWord("涓婃捣甯傞暱瀹佸尯澶╁北瑗胯矾267寮�")); } - //分词获取路名 + //鍒嗚瘝鑾峰彇璺悕 public static String getRoadNameBySplitWord(String key) { String url = ""; try { diff --git a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/util/BaiduAddressParser.java b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/util/BaiduAddressParser.java index 09ebc8c0b..973890bd4 100644 --- a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/util/BaiduAddressParser.java +++ b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/util/BaiduAddressParser.java @@ -74,23 +74,23 @@ public class BaiduAddressParser { String result = ""; try { URL realUrl = new URL(url); - // 打开和URL之间的连接 + // 鎵撳紑鍜孶RL涔嬮棿鐨勮繛鎺� URLConnection conn = realUrl.openConnection(); - // 设置通用的请求属性 + // 璁剧疆閫氱敤鐨勮姹傚睘鎬� conn.setRequestProperty("accept", "*/*"); conn.setRequestProperty("connection", "Keep-Alive"); conn.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)"); - // 发送POST请求必须设置如下两行 + // 鍙戦�丳OST璇锋眰蹇呴』璁剧疆濡備笅涓よ conn.setDoOutput(true); conn.setDoInput(true); - // 获取URLConnection对象对应的输出流 + // 鑾峰彇URLConnection瀵硅薄瀵瑰簲鐨勮緭鍑烘祦 out = new PrintWriter(conn.getOutputStream()); - // 发送请求参数 + // 鍙戦�佽姹傚弬鏁� out.print(param); - // flush输出流的缓冲 + // flush杈撳嚭娴佺殑缂撳啿 out.flush(); - // 定义BufferedReader输入流来读取URL的响应 + // 瀹氫箟BufferedReader杈撳叆娴佹潵璇诲彇URL鐨勫搷搴� in = new BufferedReader( new InputStreamReader(conn.getInputStream(),"utf-8")); String line; @@ -98,10 +98,10 @@ public class BaiduAddressParser { result += line; } } catch (Exception e) { - System.out.println("发送 POST 请求出现异常!"+e); + System.out.println("鍙戦�� POST 璇锋眰鍑虹幇寮傚父锛�"+e); e.printStackTrace(); } - //使用finally块来关闭输出流、输入流 + //浣跨敤finally鍧楁潵鍏抽棴杈撳嚭娴併�佽緭鍏ユ祦 finally{ try{ if(out!=null){ @@ -127,7 +127,7 @@ public class BaiduAddressParser { } public static void main(String[] args){ - System.out.println(BaiduAddressParser.getRegionByAddress("","广东深圳深圳市龙华汽车站建成路")); + System.out.println(BaiduAddressParser.getRegionByAddress("","骞夸笢娣卞湷娣卞湷甯傞緳鍗庢苯杞︾珯寤烘垚璺�")); } } diff --git a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/util/CollectionUtils.java b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/util/CollectionUtils.java index f18f697a0..527447bba 100644 --- a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/util/CollectionUtils.java +++ b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/util/CollectionUtils.java @@ -12,7 +12,7 @@ import java.util.Set; public class CollectionUtils extends org.apache.commons.collections.CollectionUtils { /** - * 对一个列表进行分组 + * 瀵逛竴涓垪琛ㄨ繘琛屽垎缁� * * @param * @param @@ -38,7 +38,7 @@ public class CollectionUtils extends org.apache.commons.collections.CollectionUt } /** - * 对一个列表进行分组 + * 瀵逛竴涓垪琛ㄨ繘琛屽垎缁� * * @param * @param @@ -61,7 +61,7 @@ public class CollectionUtils extends org.apache.commons.collections.CollectionUt } /** - * 将一个列表转换成另一个列表 + * 灏嗕竴涓垪琛ㄨ浆鎹㈡垚鍙︿竴涓垪琛� * * @param * @param @@ -84,7 +84,7 @@ public class CollectionUtils extends org.apache.commons.collections.CollectionUt } /** - * 将一个列表转换成另一个列表。如果closure的execute方法返回null则丢弃当前结果 + * 灏嗕竴涓垪琛ㄨ浆鎹㈡垚鍙︿竴涓垪琛ㄣ�傚鏋渃losure鐨別xecute鏂规硶杩斿洖null鍒欎涪寮冨綋鍓嶇粨鏋� * * @param * @param diff --git a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/util/InfoAnalyUtil.java b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/util/InfoAnalyUtil.java index 7306491b8..aa094768a 100644 --- a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/util/InfoAnalyUtil.java +++ b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/util/InfoAnalyUtil.java @@ -9,7 +9,7 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; /** - * 自动解析老版备份(已废弃) + * 鑷姩瑙f瀽鑰佺増澶囦唤锛堝凡搴熷純锛� * @author yk * */ @@ -30,26 +30,26 @@ public class InfoAnalyUtil { // private final static List direction = new ArrayList(); private final static List fitment = new ArrayList( - Arrays.asList("装修", "装修情况", "装修程度", "房屋情况")); + Arrays.asList("瑁呬慨", "瑁呬慨鎯呭喌", "瑁呬慨绋嬪害", "鎴垮眿鎯呭喌")); private final static List totalPrice = new ArrayList( - Arrays.asList("总价", "出售价格", "售价", "到手价", "出售总价", "房价", "价格", "房源价格")); + Arrays.asList("鎬讳环", "鍑哄敭浠锋牸", "鍞环", "鍒版墜浠�", "鍑哄敭鎬讳环", "鎴夸环", "浠锋牸", "鎴挎簮浠锋牸")); private final static List roomHallToilet = new ArrayList( - Arrays.asList("户型", "房型", "房型面积")); + Arrays.asList("鎴峰瀷", "鎴垮瀷", "鎴垮瀷闈㈢Н")); private final static List area = new ArrayList( - Arrays.asList("建筑面积", "面积","产权面积","产证面积","房型面积")); + Arrays.asList("寤虹瓚闈㈢Н", "闈㈢Н","浜ф潈闈㈢Н","浜ц瘉闈㈢Н","鎴垮瀷闈㈢Н")); private final static List floorHeight = new ArrayList( - Arrays.asList("楼层", "楼栋", "所在楼层", "所在层数", "房屋楼层")); + Arrays.asList("妤煎眰", "妤兼爧", "鎵�鍦ㄦゼ灞�", "鎵�鍦ㄥ眰鏁�", "鎴垮眿妤煎眰")); private final static List direction = new ArrayList( - Arrays.asList("朝向", "房屋朝向", "概况")); + Arrays.asList("鏈濆悜", "鎴垮眿鏈濆悜", "姒傚喌")); private static Map infoMap; - private static String key = "房型面积"; + private static String key = "鎴垮瀷闈㈢Н"; public static Map getInforMation(String links) throws UnsupportedEncodingException{ infoMap = new HashMap(); @@ -62,7 +62,7 @@ public class InfoAnalyUtil { byte bytes[] = {(byte) 0xC2,(byte) 0xA0}; String UTFSpace = new String(bytes,"utf-8"); arr[i] = arr[i].replaceAll(UTFSpace, ""); - arr[i].replaceAll(" | | ", ""); + arr[i].replaceAll(" | |銆�", ""); if(arr[i].contains("[")){ arr[i] = ""; } @@ -81,7 +81,7 @@ public class InfoAnalyUtil { } /** - * 最后规范化输出数据 + * 鏈�鍚庤鑼冨寲杈撳嚭鏁版嵁 * @param infoMap2 */ private static void dealMap(Map infoMap2) { @@ -162,25 +162,25 @@ public class InfoAnalyUtil { } } String area = infoMap.get("area"); - if(area.contains("㎡")){ - infoMap.put("area", area.substring(0, area.indexOf("㎡"))); + if(area.contains("銕�")){ + infoMap.put("area", area.substring(0, area.indexOf("銕�"))); } - if(area.contains("平米")){ - infoMap.put("area", area.substring(0, area.indexOf("平米"))); + if(area.contains("骞崇背")){ + infoMap.put("area", area.substring(0, area.indexOf("骞崇背"))); } - if(area.contains("平方米")){ - infoMap.put("area", area.substring(0, area.indexOf("平方米"))); + if(area.contains("骞虫柟绫�")){ + infoMap.put("area", area.substring(0, area.indexOf("骞虫柟绫�"))); } infoMap.remove("roomHallToilet"); } /** - * 判断是否含有特殊字段 + * 鍒ゆ柇鏄惁鍚湁鐗规畩瀛楁 * @param keyContent */ private static void judgeContainKey(String keyContent) { if (keyContent.contains(key)) { - String[] txt = keyContent.split("㎡"); + String[] txt = keyContent.split("銕�"); if (txt.length >= 1) { String content = txt[0]; for (int j = 1; j < content.length() + 1; j++) { @@ -189,7 +189,7 @@ public class InfoAnalyUtil { String content2 = content.substring(length - j - 1, length); if (content1.matches("^\\d+$|^\\d+\\.\\d+$|-\\d+$") && !content2.matches("^\\d+$|^\\d+\\.\\d+$|-\\d+$")) { - infoMap.put("area", content1 + "㎡"); + infoMap.put("area", content1 + "銕�"); infoMap.put("roomHallToilet", content.substring(5, length - j)); break; @@ -200,35 +200,35 @@ public class InfoAnalyUtil { } /** - * 判断信息是否全 + * 鍒ゆ柇淇℃伅鏄惁鍏� * @param arr */ private static void judgeInfoIsFull(String[] arr) { if (infoMap.get("room") == null) { for (int i = 0; i < arr.length - 1; i++) { - if (arr[i].contains("室")&&!arr[i].contains("厅")) { + if (arr[i].contains("瀹�")&&!arr[i].contains("鍘�")) { infoMap.put("room", arr[i].substring(0, arr[i].length()-1)); } } } if (infoMap.get("hall") == null) { for (int i = 0; i < arr.length - 1; i++) { - if (arr[i].contains("厅")&&!arr[i].contains("室")) { + if (arr[i].contains("鍘�")&&!arr[i].contains("瀹�")) { infoMap.put("hall", arr[i].substring(0, arr[i].length()-1)); } } } if (infoMap.get("toilet") == null) { for (int i = 0; i < arr.length - 1; i++) { - if (arr[i].contains("卫")&&!arr[i].contains("室")) { + if (arr[i].contains("鍗�")&&!arr[i].contains("瀹�")) { infoMap.put("toilet", arr[i].substring(0, arr[i].length()-1)); } } } if (infoMap.get("area") == null) { for (int i = 0; i < arr.length - 1; i++) { - if (arr[i].contains("㎡")) { - String[] number = arr[i].split("㎡"); + if (arr[i].contains("銕�")) { + String[] number = arr[i].split("銕�"); if (number.length >= 1) { boolean result = number[0].matches("[0-9]+"); if (result == true) { @@ -238,7 +238,7 @@ public class InfoAnalyUtil { boolean result = arr[i - 1] .matches("^\\d+$|^\\d+\\.\\d+$|-\\d+$"); if (result == true) { - infoMap.put("area", arr[i - 1] + "㎡"); + infoMap.put("area", arr[i - 1] + "銕�"); } } } @@ -248,13 +248,13 @@ public class InfoAnalyUtil { } /** - * 根据关键字处理数据 + * 鏍规嵁鍏抽敭瀛楀鐞嗘暟鎹� * @param text * @param nexText */ public static void judgeType(String text, String nexText) { - if (text.contains(":") || text.contains(":")) { - String[] result = text.split(":|:|:"); + if (text.contains(":") || text.contains("锛�")) { + String[] result = text.split(":|锛殀锛�"); if (result.length <= 1) { OutPutResult(result[0], nexText); } else { @@ -269,9 +269,9 @@ public class InfoAnalyUtil { if (text.contains(vo)) { String[] result = text.split(vo); if (result.length > 1 && hasDigit(result[1])) { - if (result[1].contains("万")) { + if (result[1].contains("涓�")) { result[1] = result[1].substring(0, - result[1].indexOf("万")); + result[1].indexOf("涓�")); } if(isDecimal(result[1])){ if(result[1].contains(".")){ @@ -361,14 +361,14 @@ public class InfoAnalyUtil { } /** - * 输出 + * 杈撳嚭 * @param text1 * @param text2 */ public static void OutPutResult(String text1, String text2) { if (totalPrice.contains(text1)) { - if (text2.contains("万")) { - text2 = text2.substring(0, text2.indexOf("万")); + if (text2.contains("涓�")) { + text2 = text2.substring(0, text2.indexOf("涓�")); } if(isDecimal(text2)){ if(text2.contains(".")){ @@ -437,10 +437,10 @@ public class InfoAnalyUtil { return Pattern.compile("([1-9]+[0-9]*|0)(\\.[\\d]+)?").matcher(str).matches(); } - //中文和阿拉伯数字转换 + //涓枃鍜岄樋鎷変集鏁板瓧杞崲 public static String fn2(String number) { - String hanzi[] = { "零", "一", "二", "三", "四", "五", "六", "七", "八", "九" ,"两"}; + String hanzi[] = { "闆�", "涓�", "浜�", "涓�", "鍥�", "浜�", "鍏�", "涓�", "鍏�", "涔�" ,"涓�"}; String alabo[] = { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9" ,"2"}; for (int i = 0; i < 11; i++) if (number.equals(hanzi[i])) @@ -449,17 +449,17 @@ public class InfoAnalyUtil { } // /** -// * 关键字 +// * 鍏抽敭瀛� // * @author yk // * // */ // public enum keyword{ -// fitment("装修"), -// area("面积"), -// floorHeight("楼层"), -// roomHallToilet("户型"), -// direction("朝向"), -// totalPrice("总价"); +// fitment("瑁呬慨"), +// area("闈㈢Н"), +// floorHeight("妤煎眰"), +// roomHallToilet("鎴峰瀷"), +// direction("鏈濆悜"), +// totalPrice("鎬讳环"); // // public final String value; // @@ -473,15 +473,15 @@ public class InfoAnalyUtil { // } /** - * 室厅卫 + * 瀹ゅ巺鍗� * @author yk * */ public enum roomHallToiletType{ - room("室"), - room2("房"), - hall("厅"), - toilet("卫"); + room("瀹�"), + room2("鎴�"), + hall("鍘�"), + toilet("鍗�"); private final String value; @@ -495,7 +495,7 @@ public class InfoAnalyUtil { } /** - * 获取匹配规则 + * 鑾峰彇鍖归厤瑙勫垯 */ // private static void getModeList() { // List list = autoModeAnalyDao.findAllByType(null); diff --git a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/util/JQueryUtil.java b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/util/JQueryUtil.java index 9e1de9984..a3a8ef0c5 100644 --- a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/util/JQueryUtil.java +++ b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/util/JQueryUtil.java @@ -218,10 +218,10 @@ public class JQueryUtil { for(Element child : element.children()) { if(child.tagName().matches("(?:table|tbody|tr|td)")) { for(Element td : child.select("td")) { - childList.add(td.text().replaceAll("\\s| ", "")); + childList.add(td.text().replaceAll("\\s|銆�", "")); } } else { - childList.add(child.text().replaceAll("\\s| ", "")); + childList.add(child.text().replaceAll("\\s|銆�", "")); } } list.add(childList); diff --git a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/util/MatcherResult.java b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/util/MatcherResult.java index c5da664bc..798d918bf 100644 --- a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/util/MatcherResult.java +++ b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/util/MatcherResult.java @@ -4,19 +4,19 @@ import java.util.List; import java.util.Map; /** - * 正则匹配的结果 + * 姝e垯鍖归厤鐨勭粨鏋� * * @author Administrator * */ public class MatcherResult { /** - * 匹配结果 + * 鍖归厤缁撴灉 */ private boolean found = false; /** - * 原始正则 + * 鍘熷姝e垯 */ private String orgPattern; @@ -36,9 +36,9 @@ public class MatcherResult { this.found = found; } - // 匹配的参数映射 + // 鍖归厤鐨勫弬鏁版槧灏� private Map params; - // 正则原始值 + // 姝e垯鍘熷鍊� private List groups; public Map getParams() { @@ -62,7 +62,7 @@ public class MatcherResult { } /** - * 获得参数值 + * 鑾峰緱鍙傛暟鍊� * * @param key * @return @@ -75,7 +75,7 @@ public class MatcherResult { } /** - * 得到匹配上的正则字符串 + * 寰楀埌鍖归厤涓婄殑姝e垯瀛楃涓� * * @return */ diff --git a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/util/RegexMatcher.java b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/util/RegexMatcher.java index f4888332c..7e21e467c 100644 --- a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/util/RegexMatcher.java +++ b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/util/RegexMatcher.java @@ -8,14 +8,14 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; /** - * 正则表达式匹配,主要增强的功能是可以使用变量名进行匹配 变量名比如: [$mod(\d)] + * 姝e垯琛ㄨ揪寮忓尮閰嶏紝涓昏澧炲己鐨勫姛鑳芥槸鍙互浣跨敤鍙橀噺鍚嶈繘琛屽尮閰� 鍙橀噺鍚嶆瘮濡傦細 [$mod(\d)] * * @author Administrator * */ public class RegexMatcher { /** - * 匹配字符串与伪正则表达式的关系,并返回想要取得的值 需要获得原始正则匹配到的结果 + * 鍖归厤瀛楃涓蹭笌浼鍒欒〃杈惧紡鐨勫叧绯伙紝骞惰繑鍥炴兂瑕佸彇寰楃殑鍊� 闇�瑕佽幏寰楀師濮嬫鍒欏尮閰嶅埌鐨勭粨鏋� * * @param s * @param regex @@ -30,11 +30,11 @@ public class RegexMatcher { Pattern p = Pattern.compile(newRegex); Matcher matcher = p.matcher(s); if (!matcher.find()) { - // 没找到 + // 娌℃壘鍒� matcherResult.setFound(false); return matcherResult; } - // 找到了 + // 鎵惧埌浜� matcherResult.setFound(true); Map params = new HashMap(); for (Map.Entry entry : paramsMap.entrySet()) { @@ -55,9 +55,9 @@ public class RegexMatcher { } /** - * 根据原始正则,重写正则规则,返回出新的正则表达式,同时会返回变量名和group位置的对应关系 比如输入的正则为: - * "http://[$city].anjuke.com/sale/(\w*)/a2-m[$mod(\d)]-t3" 则返回的正则表达式为: - * "http://(\w*).anjuke.com/sale/(\w*)/a2-m(\d)-t3" 同时返回的变量映射为: city:1 mod:3 + * 鏍规嵁鍘熷姝e垯锛岄噸鍐欐鍒欒鍒欙紝杩斿洖鍑烘柊鐨勬鍒欒〃杈惧紡锛屽悓鏃朵細杩斿洖鍙橀噺鍚嶅拰group浣嶇疆鐨勫搴斿叧绯� 姣斿杈撳叆鐨勬鍒欎负锛� + * "http://[$city].anjuke.com/sale/(\w*)/a2-m[$mod(\d)]-t3" 鍒欒繑鍥炵殑姝e垯琛ㄨ揪寮忎负锛� + * "http://(\w*).anjuke.com/sale/(\w*)/a2-m(\d)-t3" 鍚屾椂杩斿洖鐨勫彉閲忔槧灏勪负锛� city:1 mod:3 * */ private static String rewriteRegex(String regex, Map paramsMap) { @@ -66,21 +66,21 @@ public class RegexMatcher { int len = regex.length(); Integer group = 1; while (true) { - // 首先查找[$开头的,因为我们是用这样的标识符进行标识的 + // 棣栧厛鏌ユ壘[$寮�澶寸殑锛屽洜涓烘垜浠槸鐢ㄨ繖鏍风殑鏍囪瘑绗﹁繘琛屾爣璇嗙殑 int index = regex.indexOf("[$", fromIndex); if (index >= 0) { // int endIndex = regex.indexOf("]", index); int endIndex = findRightBracket(regex, index); if (endIndex > 0) { - // 找到了$[和]部分 - // 取出fromIndex和index之间的内容,这部分内容是没有变量定义的 + // 鎵惧埌浜�$[鍜宂閮ㄥ垎 + // 鍙栧嚭fromIndex鍜宨ndex涔嬮棿鐨勫唴瀹癸紝杩欓儴鍒嗗唴瀹规槸娌℃湁鍙橀噺瀹氫箟鐨� String noParamValue = regex.substring(fromIndex, index); ret.append(noParamValue); group += countGroup(noParamValue); - // 变量部分,+2为跳过$[ + // 鍙橀噺閮ㄥ垎,+2涓鸿烦杩�$[ String param = regex.substring(index + 2, endIndex); - // 转换变量部分,如果变量部分有(则取出()中内容,否则用\w*代替 + // 杞崲鍙橀噺閮ㄥ垎锛屽鏋滃彉閲忛儴鍒嗘湁(鍒欏彇鍑�()涓唴瀹癸紝鍚﹀垯鐢╘w*浠f浛 String paramName = getParamName(param); String paramRegex = getParamRegex(param); ret.append(paramRegex); @@ -88,16 +88,16 @@ public class RegexMatcher { paramsMap.put(paramName, group); group++; - // +1为跳过已经找到的结束符号] + // +1涓鸿烦杩囧凡缁忔壘鍒扮殑缁撴潫绗﹀彿] fromIndex = endIndex + 1; } else { - // 只有$[,没有结束的] + // 鍙湁$[锛屾病鏈夌粨鏉熺殑] System.out.println("Error: No ] in parsing regex " + regex); paramsMap.clear(); return regex; } } else { - // 没有找到[$部分了 + // 娌℃湁鎵惧埌[$閮ㄥ垎浜� String noParamValue = regex.substring(fromIndex, len); ret.append(noParamValue); break; @@ -107,8 +107,8 @@ public class RegexMatcher { } /** - * 在字符串中找右中括号,如果没找到返回-1 如果中间碰到[则会跳过一个] - * 类似的输入如:http://esf.sh.soufun.com/house/i32-[$kw([a-zA-Z0-9%]*)] 替换掉int + * 鍦ㄥ瓧绗︿覆涓壘鍙充腑鎷彿,濡傛灉娌℃壘鍒拌繑鍥�-1 濡傛灉涓棿纰板埌[鍒欎細璺宠繃涓�涓猐 + * 绫讳技鐨勮緭鍏ュ锛歨ttp://esf.sh.soufun.com/house/i32-[$kw([a-zA-Z0-9%]*)] 鏇挎崲鎺塱nt * endIndex = regex.indexOf("]", index); * * @param s @@ -142,7 +142,7 @@ public class RegexMatcher { } /** - * 统计在没有正则变量时分组的个数 分组是用()来进行的 + * 缁熻鍦ㄦ病鏈夋鍒欏彉閲忔椂鍒嗙粍鐨勪釜鏁� 鍒嗙粍鏄敤()鏉ヨ繘琛岀殑 * * @param noParamValue * @return @@ -154,7 +154,7 @@ public class RegexMatcher { int index = noParamValue.indexOf("(", fromIndex); if (index >= 0) { ret++; - // +1为跳过( + // +1涓鸿烦杩�( fromIndex = index + 1; } else { break; @@ -164,7 +164,7 @@ public class RegexMatcher { } /** - * 获得变量名字 比如输入为: city => city mod(\d) => mod + * 鑾峰緱鍙橀噺鍚嶅瓧 姣斿杈撳叆涓猴細 city => city mod(\d) => mod * * @param s * @return @@ -172,14 +172,14 @@ public class RegexMatcher { private static String getParamName(String s) { int index = s.indexOf("("); if (index > 0) { - // 有(,则返回(之前的内容 + // 鏈�(锛屽垯杩斿洖(涔嬪墠鐨勫唴瀹� return s.substring(0, index); } return s; } /** - * 获得变量正则部分 比如: city => (\w*) mod(\d) => (\d) + * 鑾峰緱鍙橀噺姝e垯閮ㄥ垎 姣斿锛� city => (\w*) mod(\d) => (\d) * * @param s * @return diff --git a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/util/SellInfoUtil.java b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/util/SellInfoUtil.java index 2399fe937..4ce9d90c4 100644 --- a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/util/SellInfoUtil.java +++ b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/util/SellInfoUtil.java @@ -14,32 +14,32 @@ import org.jsoup.helper.StringUtil; public class SellInfoUtil { private final static List totalPrice = new ArrayList( - Arrays.asList("价格", "总价", "出售价格", "售价", "到手价", "出售总价", "房价", "房源价格")); + Arrays.asList("浠锋牸", "鎬讳环", "鍑哄敭浠锋牸", "鍞环", "鍒版墜浠�", "鍑哄敭鎬讳环", "鎴夸环", "鎴挎簮浠锋牸")); private final static List area = new ArrayList( - Arrays.asList("面积", "建筑面积","产权面积","产证面积")); + Arrays.asList("闈㈢Н", "寤虹瓚闈㈢Н","浜ф潈闈㈢Н","浜ц瘉闈㈢Н")); private final static List floorHeight = new ArrayList( - Arrays.asList("楼层", "楼栋", "所在楼层", "所在层数", "房屋楼层")); + Arrays.asList("妤煎眰", "妤兼爧", "鎵�鍦ㄦゼ灞�", "鎵�鍦ㄥ眰鏁�", "鎴垮眿妤煎眰")); private final static List direction = new ArrayList( - Arrays.asList("朝向", "房屋朝向", "概况")); + Arrays.asList("鏈濆悜", "鎴垮眿鏈濆悜", "姒傚喌")); private final static List fitmentcontent = new ArrayList( - Arrays.asList("毛坯", "简装修", "中装修", "精装修", "豪华装修", "精装", "豪装", - "一般装修", "普通装修", "无装修", "中等装修", "毛坯房", "中装","简单装修")); + Arrays.asList("姣涘澂", "绠�瑁呬慨", "涓淇�", "绮捐淇�", "璞崕瑁呬慨", "绮捐", "璞", + "涓�鑸淇�", "鏅�氳淇�", "鏃犺淇�", "涓瓑瑁呬慨", "姣涘澂鎴�", "涓","绠�鍗曡淇�")); private final static List key_direction = new ArrayList( - Arrays.asList("南北","东西","东南","东北","西南","西北","东","南","西","北")); + Arrays.asList("鍗楀寳","涓滆タ","涓滃崡","涓滃寳","瑗垮崡","瑗垮寳","涓�","鍗�","瑗�","鍖�")); public static Map getInforMation(String links) throws UnsupportedEncodingException{ Map infoMap = new HashMap(); - //总价 + //鎬讳环 for(int i=0;i0){ @@ -129,7 +129,7 @@ public class FieldProcess { value=""; } if(!value.equals(district.getVirescencePercent())){ - System.out.println("[修改]"+district.getVirescencePercent() + ":"+value); + System.out.println("[淇敼]"+district.getVirescencePercent() + ":"+value); obj.put("virescence_percent", value); } if(score>0){ @@ -142,7 +142,7 @@ public class FieldProcess { public DBObject getDeveloperValue(District district, DBObject obj){ if(null!=district.getDeveloper()){ String value = delCommonValue(district.getDeveloper()); - String[] keys = {"集团","公司","置业","地产","房产","开发商","股份"}; + String[] keys = {"闆嗗洟","鍏徃","缃笟","鍦颁骇","鎴夸骇","寮�鍙戝晢","鑲′唤"}; boolean flag = false; for(String key : keys){ if(value.indexOf(key)!=-1){ @@ -151,10 +151,10 @@ public class FieldProcess { } } if(!flag){ - System.out.println("无关键字:"+value); + System.out.println("鏃犲叧閿瓧锛�"+value); } if(!value.equals(district.getDeveloper())){ - System.out.println("[修改]"+district.getDeveloper() + ":"+value); + System.out.println("[淇敼]"+district.getDeveloper() + ":"+value); obj.put("developer", value); } @@ -166,7 +166,7 @@ public class FieldProcess { public DBObject getEstateCompanyValue(District district, DBObject obj){ if(null!=district.getEstateCompany()){ String value = delCommonValue(district.getEstateCompany()); - String[] keys = {"集团","物业","公司","物管","置业"}; + String[] keys = {"闆嗗洟","鐗╀笟","鍏徃","鐗╃","缃笟"}; boolean flag = false; for(String key : keys){ if(value.indexOf(key)!=-1){ @@ -175,10 +175,10 @@ public class FieldProcess { } } if(!flag){ - if(value.indexOf("参考价")!=-1){ + if(value.indexOf("鍙傝�冧环")!=-1){ value=""; } - System.out.println(district.getName()+" 无关键字:"+district.getEstateCompany()); + System.out.println(district.getName()+" 鏃犲叧閿瓧锛�"+district.getEstateCompany()); } if(isInteger(value)){ @@ -187,7 +187,7 @@ public class FieldProcess { if(!value.equals(district.getEstateCompany())){ obj.put("estate_company", value); - System.out.println("[修改]"+district.getEstateCompany() + ":"+value); + System.out.println("[淇敼]"+district.getEstateCompany() + ":"+value); } } @@ -197,13 +197,13 @@ public class FieldProcess { public DBObject getBuildAreaValue(District district, DBObject obj){ if(null!=district.getBuildArea()){ String value = delCommonValue(district.getBuildArea()); - if(value.indexOf("万平方米")!=-1){ - String val = value.substring(0, value.indexOf("万平方米")); + if(value.indexOf("涓囧钩鏂圭背")!=-1){ + String val = value.substring(0, value.indexOf("涓囧钩鏂圭背")); if(isDouble(val)){ int v = (int) (Double.parseDouble(val)*10000); - value = String.valueOf(v) + "平方米"; + value = String.valueOf(v) + "骞虫柟绫�"; }else{ - System.out.println("不是double且长度小于20:"+value+" ["+district.getName()+"]"); + System.out.println("涓嶆槸double涓旈暱搴﹀皬浜�20锛�"+value+" ["+district.getName()+"]"); } } @@ -213,7 +213,7 @@ public class FieldProcess { //double score = FieldValidator.score("build_area", value); if(!value.equals(district.getBuildArea())){ obj.put("build_area", value); - System.out.println("[修改]"+district.getBuildArea() + ":"+value); + System.out.println("[淇敼]"+district.getBuildArea() + ":"+value); } } return obj; @@ -222,13 +222,13 @@ public class FieldProcess { public DBObject getAllAreaValue(District district, DBObject obj){ if(null!=district.getAllArea()){ String value = delCommonValue(district.getAllArea()); - if(value.indexOf("万平方米")!=-1){ - String val = value.substring(0, value.indexOf("万平方米")); + if(value.indexOf("涓囧钩鏂圭背")!=-1){ + String val = value.substring(0, value.indexOf("涓囧钩鏂圭背")); if(isDouble(val)){ int v = (int) (Double.parseDouble(val)*10000); - value = String.valueOf(v) + "平方米"; + value = String.valueOf(v) + "骞虫柟绫�"; }else{ - System.out.println("不是double且长度小于20:"+value+" ["+district.getName()+"]"); + System.out.println("涓嶆槸double涓旈暱搴﹀皬浜�20锛�"+value+" ["+district.getName()+"]"); } } @@ -238,7 +238,7 @@ public class FieldProcess { //double score = FieldValidator.score("build_area", value); if(!value.equals(district.getAllArea())){ obj.put("all_area", value); - System.out.println("[修改]"+district.getAllArea() + ":"+value); + System.out.println("[淇敼]"+district.getAllArea() + ":"+value); } } return obj; @@ -249,7 +249,7 @@ public class FieldProcess { if(null!=district.getCarSite()){ String value = delCommonValue(district.getCarSite()); - if(value.equals("0个")){ + if(value.equals("0涓�")){ value = ""; } if(value.equals("-")){ @@ -261,7 +261,7 @@ public class FieldProcess { value = value.replace("", ""); if(!value.equals(district.getCarSite())){ obj.put("car_site", value); - System.out.println("[修改]"+district.getCarSite() + ":"+value); + System.out.println("[淇敼]"+district.getCarSite() + ":"+value); } } diff --git a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/verify/FieldValidator.java b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/verify/FieldValidator.java index 0afcf20f1..3effed201 100644 --- a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/verify/FieldValidator.java +++ b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/verify/FieldValidator.java @@ -69,13 +69,13 @@ public class FieldValidator { } /** - * 字段验证,须先在后台添加字段验证器 + * 瀛楁楠岃瘉锛岄』鍏堝湪鍚庡彴娣诲姞瀛楁楠岃瘉鍣� * * @param field - * 字段名 + * 瀛楁鍚� * @param obj - * 待验证的值 - * @return 验证得分。100:没有该字段的验证规则 + * 寰呴獙璇佺殑鍊� + * @return 楠岃瘉寰楀垎銆�100锛氭病鏈夎瀛楁鐨勯獙璇佽鍒� */ public static double score(String field, Object obj) { while (isloading) { @@ -91,7 +91,7 @@ public class FieldValidator { } String str = obj.toString(); - str = null == str ? "" : str.replaceAll("^[\\s ]*|[\\s ]*$", ""); + str = null == str ? "" : str.replaceAll("^[\\s銆�]*|[\\s ]*$", ""); str = str.trim(); if ("".equals(str)) { return 1; @@ -216,10 +216,10 @@ public class FieldValidator { public static void main(String[] args) { - System.out.println(score("all_area", "49950.00 平米")); - System.out.println(score("build_area", "200000.00 平米")); - System.out.println(score("alias", "别名1")); -// Pattern p = Pattern.compile("^\\d{2,4}(\\-|\\/|\\.|年)?(\\d{1,2}(\\-|\\/|\\.|月))?(\\d{1,2}(日|号)?)?$"); + System.out.println(score("all_area", "49950.00 骞崇背")); + System.out.println(score("build_area", "200000.00 骞崇背")); + System.out.println(score("alias", "鍒悕1")); +// Pattern p = Pattern.compile("^\\d{2,4}(\\-|\\/|\\.|骞�)?(\\d{1,2}(\\-|\\/|\\.|鏈�))?(\\d{1,2}(鏃鍙�)?)?$"); // System.out.println(p.matcher("1999").matches()); } } diff --git a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/webdata/Analyzer.java b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/webdata/Analyzer.java index a5a28734f..f193e8ef0 100644 --- a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/webdata/Analyzer.java +++ b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/webdata/Analyzer.java @@ -90,7 +90,7 @@ public class Analyzer { } /** - * 用script脚本对解析后的数据进行处理 + * 鐢╯cript鑴氭湰瀵硅В鏋愬悗鐨勬暟鎹繘琛屽鐞� * @param obj * @param rule */ @@ -102,12 +102,12 @@ public class Analyzer { // Object res = InvokeShell.invoke(rule.getScript(), obj); if (rule.getAnaType() == 1) { // if (null != res || (res instanceof String)) { -// //modify by shibb 模式解析 -// System.out.print("自动解析"+"\n"); +// //modify by shibb 妯″紡瑙f瀽 +// System.out.print("鑷姩瑙f瀽"+"\n"); // obj = JQueryUtil.selectAnalyHtml(rule.getSelector().get("selector").split(","), document); // ret.putAll(InfoAnalyUtil.getInforMation(obj.toString())); // } -// System.out.print("自动解析"+"\n"); +// System.out.print("鑷姩瑙f瀽"+"\n"); obj = JQueryUtil.selectAnalyHtml(rule.getSelector().get("selector").split(","), document); ret.putAll(SellInfoUtil.getInforMation(obj.toString())); } else { @@ -125,7 +125,7 @@ public class Analyzer { } else if (res != null && res instanceof String) { String s = DataUtil.trim((String) res); s = DataUtil.encoding(s).replaceAll("^\\?*|\\?*$", "").trim(); - if (s.equals("暂无") || s.equals("暂无资料")) { + if (s.equals("鏆傛棤") || s.equals("鏆傛棤璧勬枡")) { ret.put(rule.getField(), null); } else { ret.put(rule.getField(), s); @@ -148,10 +148,10 @@ public class Analyzer { /** - * 用选择器进行解析 - * @param document 待解析文档(页面) - * @param rule 解析规则 - * @return 解析后的数据 + * 鐢ㄩ�夋嫨鍣ㄨ繘琛岃В鏋� + * @param document 寰呰В鏋愭枃妗o紙椤甸潰锛� + * @param rule 瑙f瀽瑙勫垯 + * @return 瑙f瀽鍚庣殑鏁版嵁 */ private Object parseWithSelector(Document document, FieldRule rule) { if (rule.getSelector() == null) { @@ -181,7 +181,7 @@ public class Analyzer { } /** - * 根据数据库验证解析结果 + * 鏍规嵁鏁版嵁搴撻獙璇佽В鏋愮粨鏋� * * @param category * @param city @@ -191,27 +191,27 @@ public class Analyzer { */ public void validator(Map resultMap, String city, String category,List definedFields) throws Exception { if (resultMap == null || resultMap.size() == 0) { - throw new Exception("对象为空"); + throw new Exception("瀵硅薄涓虹┖"); } - // 数据值类型转换 + // 鏁版嵁鍊肩被鍨嬭浆鎹� try { castValueToFieldType(resultMap, definedFields); } catch (Exception e) { throw new Exception(e.toString()); } - // 是否缺失必要值 + // 鏄惁缂哄け蹇呰鍊� List primaryFields = fieldTypeDao.findPrimaryFieldByCategory(category); for (FieldType ft : primaryFields) { if (StringUtils.isBlank((String) resultMap.get(ft.getName()))) { - throw new Exception(ft.getDisplay() + "(" + ft.getName() + ")错误"); + throw new Exception(ft.getDisplay() + "(" + ft.getName() + ")閿欒"); } } } /** - * 根据数据库验证解析结果 + * 鏍规嵁鏁版嵁搴撻獙璇佽В鏋愮粨鏋� * * @param resultMap * @param city @@ -221,30 +221,30 @@ public class Analyzer { */ public Map validatorAll(Map resultMap, String city, String category) throws Exception { if (resultMap == null || resultMap.size() == 0) { - throw new Exception("对象为空"); + throw new Exception("瀵硅薄涓虹┖"); } List definedFields = fieldTypeDao.findByCategory(category); - // 数据值类型转换 + // 鏁版嵁鍊肩被鍨嬭浆鎹� Map resultExceptionMap = castAllValueToFieldType(resultMap, definedFields); if (resultExceptionMap == null) { resultExceptionMap = new HashMap(); } - // 是否缺失必要值 + // 鏄惁缂哄け蹇呰鍊� List primaryFields = fieldTypeDao.findPrimaryFieldByCategory(category); for (FieldType ft : primaryFields) { if (StringUtils.isBlank((String) resultMap.get(ft.getName()))) { resultMap.put(ft.getName(), null); - resultExceptionMap.put(ft.getName(), new Exception(ft.getDisplay() + "(" + ft.getName() + ")错误")); + resultExceptionMap.put(ft.getName(), new Exception(ft.getDisplay() + "(" + ft.getName() + ")閿欒")); } } return resultExceptionMap; } /** - * 是否存在未定义字段 + * 鏄惁瀛樺湪鏈畾涔夊瓧娈� * * @param resultObject * @return @@ -270,7 +270,7 @@ public class Analyzer { /** - * 字段标准化 + * 瀛楁鏍囧噯鍖� * @param resultMap * @param city * @param category @@ -292,7 +292,7 @@ public class Analyzer { try { String value = String.valueOf(resultMap.get(ft.getName())); - if ("区域".equals(ft.getDisplay())) { + if ("鍖哄煙".equals(ft.getDisplay())) { String region = (String) resultMap.get("region"); String block = (String) resultMap.get("block"); if (region != null && regionBlockDao.isRegion(city, region)) { @@ -306,55 +306,55 @@ public class Analyzer { resultMap.put("region", regionBlockDao.formatRegion(city, region)); } - } else if ("建筑面积".equals(ft.getDisplay()) || "占地面积".equals(ft.getDisplay())) { - if (value.endsWith("万平方米")) { + } else if ("寤虹瓚闈㈢Н".equals(ft.getDisplay()) || "鍗犲湴闈㈢Н".equals(ft.getDisplay())) { + if (value.endsWith("涓囧钩鏂圭背")) { resultMap.put(ft.getName(), Double.parseDouble(value.replaceAll("[^0-9\\.]", "")) * 10000); - } else if (value.endsWith("平方米") || value.endsWith("平") || value.endsWith("平米") || value.endsWith("㎡")) { + } else if (value.endsWith("骞虫柟绫�") || value.endsWith("骞�") || value.endsWith("骞崇背") || value.endsWith("銕�")) { resultMap.put(ft.getName(), Double.parseDouble(value.replaceAll("[^0-9\\.]", ""))); - } else if (value.endsWith("亩")) { + } else if (value.endsWith("浜�")) { resultMap.put(ft.getName(), Double.parseDouble(value.replaceAll("[^0-9\\.]", "")) * 666); - } else if (value.endsWith("万")) { + } else if (value.endsWith("涓�")) { resultMap.put(ft.getName(), Double.parseDouble(value.replaceAll("[^0-9\\.]", "")) * 10000); - } else if (value.endsWith("平方公里") || value.endsWith("平方千米")) { + } else if (value.endsWith("骞虫柟鍏噷") || value.endsWith("骞虫柟鍗冪背")) { resultMap.put(ft.getName(), Double.parseDouble(value.replaceAll("[^0-9\\.]", "")) * 1000); } - } else if ("容积率".equals(ft.getDisplay()) || "绿化率".equals(ft.getDisplay())) { + } else if ("瀹圭Н鐜�".equals(ft.getDisplay()) || "缁垮寲鐜�".equals(ft.getDisplay())) { try { Double.parseDouble(value); } catch (Exception e) { resultMap.put(ft.getName(), Double.parseDouble(value.replaceAll("[^0-9\\.]", ""))); } - } else if ("物业费".equals(ft.getDisplay())) { + } else if ("鐗╀笟璐�".equals(ft.getDisplay())) { try { Double.parseDouble(value); } catch (Exception e) { resultMap.put(ft.getName(), Double.parseDouble(value.replaceAll("[^0-9\\.]", ""))); } - } else if ("开盘时间".equals(ft.getDisplay())) { + } else if ("寮�鐩樻椂闂�".equals(ft.getDisplay())) { Date d = DateUtil.parseStringToDate(value); if (d != null) { resultMap.put(ft.getName(), DateUtil.formatToYYYYMMDD(d)); } else { resultMap.remove(ft.getName()); } - } else if ("物业类型".equals(ft.getDisplay())) { + } else if ("鐗╀笟绫诲瀷".equals(ft.getDisplay())) { if ("shop".equals(category)) { - if (StringUtils.indexOfAny(value, new String[] { "商业综合体", "城市综合体", "综合体" }) > -1) { - resultMap.put(ft.getName(), "商业综合体"); - } else if (StringUtils.indexOfAny(value, new String[] { "百货", "百货商场", "购物中心" }) > -1) { - resultMap.put(ft.getName(), "百货购物中心商铺"); - } else if (StringUtils.indexOfAny(value, new String[] { "商业街" }) > -1) { - resultMap.put(ft.getName(), "商业街商铺"); - } else if (StringUtils.indexOfAny(value, new String[] { "主题", "市场" }) > -1) { - resultMap.put(ft.getName(), "市场类商铺"); - } else if (StringUtils.indexOfAny(value, new String[] { "社区" }) > -1) { - resultMap.put(ft.getName(), "社区内铺"); - } else if (StringUtils.indexOfAny(value, new String[] { "住宅底商", "裙楼" }) > -1) { - resultMap.put(ft.getName(), "住宅底商"); - } else if (StringUtils.indexOfAny(value, new String[] { "商务", "酒店", "酒店", "旅游", "写字楼" }) > -1) { - resultMap.put(ft.getName(), "商务区商铺"); - } else if (StringUtils.indexOfAny(value, new String[] { "交通设施", "地铁站", "火车站", "机场" }) > -1) { - resultMap.put(ft.getName(), "交通设施商铺"); + if (StringUtils.indexOfAny(value, new String[] { "鍟嗕笟缁煎悎浣�", "鍩庡競缁煎悎浣�", "缁煎悎浣�" }) > -1) { + resultMap.put(ft.getName(), "鍟嗕笟缁煎悎浣�"); + } else if (StringUtils.indexOfAny(value, new String[] { "鐧捐揣", "鐧捐揣鍟嗗満", "璐墿涓績" }) > -1) { + resultMap.put(ft.getName(), "鐧捐揣璐墿涓績鍟嗛摵"); + } else if (StringUtils.indexOfAny(value, new String[] { "鍟嗕笟琛�" }) > -1) { + resultMap.put(ft.getName(), "鍟嗕笟琛楀晢閾�"); + } else if (StringUtils.indexOfAny(value, new String[] { "涓婚", "甯傚満" }) > -1) { + resultMap.put(ft.getName(), "甯傚満绫诲晢閾�"); + } else if (StringUtils.indexOfAny(value, new String[] { "绀惧尯" }) > -1) { + resultMap.put(ft.getName(), "绀惧尯鍐呴摵"); + } else if (StringUtils.indexOfAny(value, new String[] { "浣忓畢搴曞晢", "瑁欐ゼ" }) > -1) { + resultMap.put(ft.getName(), "浣忓畢搴曞晢"); + } else if (StringUtils.indexOfAny(value, new String[] { "鍟嗗姟", "閰掑簵", "閰掑簵", "鏃呮父", "鍐欏瓧妤�" }) > -1) { + resultMap.put(ft.getName(), "鍟嗗姟鍖哄晢閾�"); + } else if (StringUtils.indexOfAny(value, new String[] { "浜ら�氳鏂�", "鍦伴搧绔�", "鐏溅绔�", "鏈哄満" }) > -1) { + resultMap.put(ft.getName(), "浜ら�氳鏂藉晢閾�"); } } } @@ -370,7 +370,7 @@ public class Analyzer { } /** - * 把输入值转换成定义的类型,如果有转换异常,则按照字段名称存入MAP,如果MAP返回为空,说明这次值转换没有任何异常 + * 鎶婅緭鍏ュ�艰浆鎹㈡垚瀹氫箟鐨勭被鍨嬶紝濡傛灉鏈夎浆鎹㈠紓甯革紝鍒欐寜鐓у瓧娈靛悕绉板瓨鍏AP锛屽鏋淢AP杩斿洖涓虹┖锛岃鏄庤繖娆″�艰浆鎹㈡病鏈変换浣曞紓甯� * * @param resultMap * @param definedFields @@ -447,7 +447,7 @@ public class Analyzer { } /** - * 把数值转换成定义的类型,一旦有转换异常发现,则立即抛出异常 + * 鎶婃暟鍊艰浆鎹㈡垚瀹氫箟鐨勭被鍨嬶紝涓�鏃︽湁杞崲寮傚父鍙戠幇锛屽垯绔嬪嵆鎶涘嚭寮傚父 * * @param resultMap * @param definedFields @@ -538,7 +538,7 @@ public class Analyzer { public void removeInvalidValueField(Map resultObject, String category) { Set removeKeys = new HashSet(); for (String field : resultObject.keySet()) { - // 除了小区名称,其他的名称需要验证 + // 闄や簡灏忓尯鍚嶇О锛屽叾浠栫殑鍚嶇О闇�瑕侀獙璇� if ("name".equals(field)) { continue; } diff --git a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/webdata/AnalyzerConfig.java b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/webdata/AnalyzerConfig.java index 64562a32a..e75cd2505 100644 --- a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/webdata/AnalyzerConfig.java +++ b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/webdata/AnalyzerConfig.java @@ -103,7 +103,7 @@ public class AnalyzerConfig { } /** - * 是否把数据放入内存中 + * 鏄惁鎶婃暟鎹斁鍏ュ唴瀛樹腑 * * @return */ diff --git a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/webdata/DistrictDiscoverer.java b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/webdata/DistrictDiscoverer.java index b4d72c242..7cb186a0c 100644 --- a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/webdata/DistrictDiscoverer.java +++ b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/webdata/DistrictDiscoverer.java @@ -51,13 +51,13 @@ public class DistrictDiscoverer { private Map fieldTypeMap = new HashMap(); - // 数据对象的网站数量最低标准(数据入库) + // 鏁版嵁瀵硅薄鐨勭綉绔欐暟閲忔渶浣庢爣鍑�(鏁版嵁鍏ュ簱) public static final int FOUND_DATA_MIN_COUNT = 1; - // 数据对象的网站得分最低标准(数据入库) + // 鏁版嵁瀵硅薄鐨勭綉绔欏緱鍒嗘渶浣庢爣鍑�(鏁版嵁鍏ュ簱) public static final double FOUND_DATA_MIN_SCORE = 8.0; - // 字段有效的网站得分最低标准 + // 瀛楁鏈夋晥鐨勭綉绔欏緱鍒嗘渶浣庢爣鍑� public static final double FOUND_DATA_FIELD_MIN_SCORE = 6.0; DistrictDiscoverer() { @@ -69,11 +69,11 @@ public class DistrictDiscoverer { } public static void main(String[] args) { - new DistrictDiscoverer().discoverer("淮安", "district"); + new DistrictDiscoverer().discoverer("娣畨", "district"); } /** - * 小区发现 + * 灏忓尯鍙戠幇 * * @param city * @param category @@ -103,7 +103,7 @@ public class DistrictDiscoverer { for (AnalySite analySite : analySites) { String region = analySite.getRegion(); String name = analySite.getDistrictName(); -// if(!analySite.getSiteNames().contains("搜房")){ +// if(!analySite.getSiteNames().contains("鎼滄埧")){ // continue; // } @@ -130,7 +130,7 @@ public class DistrictDiscoverer { continue; } - // 是否有可信任的网站(8分或以上) + // 鏄惁鏈夊彲淇′换鐨勭綉绔�(8鍒嗘垨浠ヤ笂) // if (!validatorWebsite(city, category, analySite.getSiteNames().split(","))) { // continue; // } @@ -160,7 +160,7 @@ public class DistrictDiscoverer { if (newObj.get("estate_type2") != null) { String estateType = (String) newObj.get("estate_type2"); - if (StringUtils.indexOfAny(estateType, new String[] { "小区", "住宅", "商住", "别墅", "公寓", "洋房", "高层", "小高层", "洋楼" }) > -1) { + if (StringUtils.indexOfAny(estateType, new String[] { "灏忓尯", "浣忓畢", "鍟嗕綇", "鍒", "鍏瘬", "娲嬫埧", "楂樺眰", "灏忛珮灞�", "娲嬫ゼ" }) > -1) { districtDao.saveDistrict(newObj); tc++; }else{ @@ -179,15 +179,15 @@ public class DistrictDiscoverer { } } - System.out.println("区域非法未入库数量:"+illegalRegionCount); + System.out.println("鍖哄煙闈炴硶鏈叆搴撴暟閲�:"+illegalRegionCount); for(String s:illegalRegions.keySet()){ System.out.println(" "+s+":"+illegalRegions.get(s)); } - System.out.println("地产类型非法未入库数量:"+illegalEstateTypeCount); + System.out.println("鍦颁骇绫诲瀷闈炴硶鏈叆搴撴暟閲�:"+illegalEstateTypeCount); for(String s:illegalEstateTypes.keySet()){ System.out.println(" "+s+":"+illegalEstateTypes.get(s)); } - System.out.println("地址不存在未入库数量:"+emptyCount); + System.out.println("鍦板潃涓嶅瓨鍦ㄦ湭鍏ュ簱鏁伴噺:"+emptyCount); System.out.println("tc:"+tc); System.out.println("temp:"+temp); } @@ -365,7 +365,7 @@ public class DistrictDiscoverer { } /** - * 8分以上的网站可信任 + * 8鍒嗕互涓婄殑缃戠珯鍙俊浠� * * @param siteNames * @return diff --git a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/webdata/WebpageAnalyzer.java b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/webdata/WebpageAnalyzer.java index 1bf8b9947..d71d14ebe 100644 --- a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/webdata/WebpageAnalyzer.java +++ b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/webdata/WebpageAnalyzer.java @@ -33,7 +33,7 @@ import com.mongodb.Mongo; import com.mongodb.MongoException; /** - * 网页解析控制类 + * 缃戦〉瑙f瀽鎺у埗绫� * * @author xiaoyu * @@ -99,7 +99,7 @@ public class WebpageAnalyzer { @SuppressWarnings("unchecked") public void doAnalyzer(AnalyTask analyTask) { - //获取解析规则 + //鑾峰彇瑙f瀽瑙勫垯 List fieldRuleList = getFieldRules(analyTask.getCategory(), analyTask.getCity(), analyTask.getSiteName(), analyTask.getPageName()); if (fieldRuleList.size() == 0) { @@ -112,24 +112,24 @@ public class WebpageAnalyzer { analyTask.getSiteName(), analyTask.getPageName(), analyTask.getWebpageStatus()); int num=0; - //针对每一个抓取的页面 + //閽堝姣忎竴涓姄鍙栫殑椤甸潰 for (String webpageId : webpageIdList) { if (analyTaskDao.isStopped(analyTask.getId())) { break; } - //获取页面 + //鑾峰彇椤甸潰 Webpage webpage = webpageDao.findById(webpageId); if (webpage == null || analyRoadDao.isExists(webpage.getUrl(), analyTask.getId())) { continue; } - // 原始URL + // 鍘熷URL String url = webpage.getUrl(); String city = webpage.getCity(); - //类型 district,new_district,shop,office + //绫诲瀷 district,new_district,shop,office String category = webpage.getCategory(); - // 是否有该数据类型 + // 鏄惁鏈夎鏁版嵁绫诲瀷 DataType dataType = dataTypeDao.findByCategory(category); if (dataType == null) { continue; @@ -141,14 +141,14 @@ public class WebpageAnalyzer { try { String anaMode = fieldRuleList.get(0).getAnaMode(); if (AnaMode.LIST.getMode().equals(anaMode)) { - //列表页解析 + //鍒楄〃椤佃В鏋� List> list = Analyzer.getInstance().analyListPage(webpage.getContent(), fieldRuleList); int index = 0; for(Map map : list) { parseData(url.concat("#" + ++index), webpage, map, definedFields, primaryFields, dataType, analyTask); } }else { - //普通模式 AnaMode.COMMON + //鏅�氭ā寮� AnaMode.COMMON Map map = Analyzer.getInstance().analy(webpage.getContent(), fieldRuleList); parseData(url, webpage, map, definedFields, primaryFields, dataType, analyTask); continue; @@ -167,28 +167,28 @@ public class WebpageAnalyzer { int valOpt = analyTask.getValueOptType(); int objOpt = analyTask.getObjectOptType(); - //城市 + //鍩庡競 String city = webpage.getCity(); - //类型 district,new_district,shop,office + //绫诲瀷 district,new_district,shop,office String category = webpage.getCategory(); String webpageId = webpage.getId(); Map originalResultMap = new HashMap(); originalResultMap.put("city", city); - // 分析数据 + // 鍒嗘瀽鏁版嵁 originalResultMap.putAll(anaResult); - // 是否有未定义字段 + // 鏄惁鏈夋湭瀹氫箟瀛楁 String undefinedField = Analyzer.getInstance().getUndefinedField(definedFields, originalResultMap); if (undefinedField != null) { - throw new Exception(undefinedField + "未定义"); + throw new Exception(undefinedField + "鏈畾涔�"); } - // 把字段标准化 + // 鎶婂瓧娈垫爣鍑嗗寲 Analyzer.getInstance().formatToStandardValue(originalResultMap, city, analyTask.getCategory(), definedFields); Map resultMap = new HashMap(originalResultMap); - // 删除无效字段 + // 鍒犻櫎鏃犳晥瀛楁 Analyzer.getInstance().removeInvalidValueField(resultMap, analyTask.getCategory()); - // 根据数据库规则验证字段 + // 鏍规嵁鏁版嵁搴撹鍒欓獙璇佸瓧娈� Analyzer.getInstance().validator(resultMap, city, analyTask.getCategory(),definedFields); @@ -203,7 +203,7 @@ public class WebpageAnalyzer { BasicDBObject newData = processUpdateData(primaryQuery, new BasicDBObject(resultMap), analyTask.getAnalyFields(), dataType, valOpt, objOpt, analyTask.getId()); if (newData == null) { - throw new Exception("技术异常"); + throw new Exception("鎶�鏈紓甯�"); } if (newData.size() > 0) { @@ -239,7 +239,7 @@ public class WebpageAnalyzer { }*/ } - // 有值说明操作过数据库 + // 鏈夊�艰鏄庢搷浣滆繃鏁版嵁搴� if (modifyData.size() > 0) { analyTaskDao.increaseAnalyTaskEffectiveCount(analyTask.getId()); analyTaskDao.increaseEffectiveFieldsCount(analyTask.getId(), new ArrayList(modifyData.keySet())); @@ -274,10 +274,10 @@ public class WebpageAnalyzer { } /*private Map buildTypeFormat(Map resultMap, String cat) { - String[] types = {"多层","小高层","超高层","高层","花园洋房","老洋房","四合院","独栋","双拼","联排","叠加"}; - String[] ptypes = {"多层","小高层","超高层","高层","花园洋房","老洋房","四合院"}; - String[] btypes = {"独栋","双拼","联排","叠加"}; - String[] stypes = {"多层","小高层","超高层","高层"}; + String[] types = {"澶氬眰","灏忛珮灞�","瓒呴珮灞�","楂樺眰","鑺卞洯娲嬫埧","鑰佹磱鎴�","鍥涘悎闄�","鐙爧","鍙屾嫾","鑱旀帓","鍙犲姞"}; + String[] ptypes = {"澶氬眰","灏忛珮灞�","瓒呴珮灞�","楂樺眰","鑺卞洯娲嬫埧","鑰佹磱鎴�","鍥涘悎闄�"}; + String[] btypes = {"鐙爧","鍙屾嫾","鑱旀帓","鍙犲姞"}; + String[] stypes = {"澶氬眰","灏忛珮灞�","瓒呴珮灞�","楂樺眰"}; String build_type = ""; String estate = ""; @@ -300,31 +300,31 @@ public class WebpageAnalyzer { build=build_type.split(","); }else if(build_type.indexOf(";")!=-1){ build=build_type.split(";"); - }else if(build_type.indexOf("、")!=-1){ - build=build_type.split("、"); + }else if(build_type.indexOf("銆�")!=-1){ + build=build_type.split("銆�"); }else if(build_type.indexOf("/")!=-1){ build=build_type.split("/"); - }else if(build_type.indexOf(",")!=-1){ - build=build_type.split(","); + }else if(build_type.indexOf("锛�")!=-1){ + build=build_type.split("锛�"); }else{ build=build_type.split("\\s+"); } if(build.length>1){ for(int i=0;i -1) { - resultMap.put("estate_type2", "商业综合体"); - } else if (StringUtils.indexOfAny(value, new String[] { "百货", "百货商场", "购物中心" }) > -1) { - resultMap.put("estate_type2", "百货购物中心商铺"); - } else if (StringUtils.indexOfAny(value, new String[] { "商业街" , "产权式商铺" }) > -1) { - resultMap.put("estate_type2", "商业街商铺"); - } else if (StringUtils.indexOfAny(value, new String[] { "主题", "市场" }) > -1) { - resultMap.put("estate_type2", "市场类商铺"); - } else if (StringUtils.indexOfAny(value, new String[] { "社区" , "住宅底商", "裙楼" , "住宅"}) > -1) { - resultMap.put("estate_type2", "社区商铺"); - } else if (StringUtils.indexOfAny(value, new String[] { "商务", "酒店", "酒店", "旅游", "写字楼" , "旅游" , "甲级" , "创意园区" , "办公"}) > -1) { - resultMap.put("estate_type2", "商务区商铺"); - } else if (StringUtils.indexOfAny(value, new String[] { "交通设施", "地铁站", "火车站", "机场" }) > -1) { - resultMap.put("estate_type2", "交通设施商铺"); + if (StringUtils.indexOfAny(value, new String[] { "鍟嗕笟缁煎悎浣�", "鍩庡競缁煎悎浣�", "缁煎悎浣�" , "鍟嗕笟骞垮満" }) > -1) { + resultMap.put("estate_type2", "鍟嗕笟缁煎悎浣�"); + } else if (StringUtils.indexOfAny(value, new String[] { "鐧捐揣", "鐧捐揣鍟嗗満", "璐墿涓績" }) > -1) { + resultMap.put("estate_type2", "鐧捐揣璐墿涓績鍟嗛摵"); + } else if (StringUtils.indexOfAny(value, new String[] { "鍟嗕笟琛�" , "浜ф潈寮忓晢閾�" }) > -1) { + resultMap.put("estate_type2", "鍟嗕笟琛楀晢閾�"); + } else if (StringUtils.indexOfAny(value, new String[] { "涓婚", "甯傚満" }) > -1) { + resultMap.put("estate_type2", "甯傚満绫诲晢閾�"); + } else if (StringUtils.indexOfAny(value, new String[] { "绀惧尯" , "浣忓畢搴曞晢", "瑁欐ゼ" , "浣忓畢"}) > -1) { + resultMap.put("estate_type2", "绀惧尯鍟嗛摵"); + } else if (StringUtils.indexOfAny(value, new String[] { "鍟嗗姟", "閰掑簵", "閰掑簵", "鏃呮父", "鍐欏瓧妤�" , "鏃呮父" , "鐢茬骇" , "鍒涙剰鍥尯" , "鍔炲叕"}) > -1) { + resultMap.put("estate_type2", "鍟嗗姟鍖哄晢閾�"); + } else if (StringUtils.indexOfAny(value, new String[] { "浜ら�氳鏂�", "鍦伴搧绔�", "鐏溅绔�", "鏈哄満" }) > -1) { + resultMap.put("estate_type2", "浜ら�氳鏂藉晢閾�"); } else { - resultMap.put("estate_type2", "社区商铺"); + resultMap.put("estate_type2", "绀惧尯鍟嗛摵"); } return resultMap; } private Map officeEstateType(Map resultMap) { - String[] bTypes={"写字楼","标准写字楼","甲级","标准写字楼","纯写字楼","乙级","涵盖写字楼","摩天商务","5A级","独栋总部大楼","甲级办公","办公","高端写字间"}; - String[] sTypes={"公寓","商住公寓","商务公寓","住宅","商住楼","住宅","商业综合体","loft","商住两用楼","大型商业"}; - String[] mTypes={"大型商业","建筑综合体","商务中心","商业综合体","综合体","大型商业综合体","大型高端城市综合体"}; - String[] hTypes={"酒店写字楼","酒店及商业","星际公寓","星空会所","酒店式公寓","酒店","星级酒店"}; - String[] yTypes={"创意园区","总部园区","总部园区","创意"}; + String[] bTypes={"鍐欏瓧妤�","鏍囧噯鍐欏瓧妤�","鐢茬骇","鏍囧噯鍐欏瓧妤�","绾啓瀛楁ゼ","涔欑骇","娑电洊鍐欏瓧妤�","鎽╁ぉ鍟嗗姟","5A绾�","鐙爧鎬婚儴澶фゼ","鐢茬骇鍔炲叕","鍔炲叕","楂樼鍐欏瓧闂�"}; + String[] sTypes={"鍏瘬","鍟嗕綇鍏瘬","鍟嗗姟鍏瘬","浣忓畢","鍟嗕綇妤�","浣忓畢","鍟嗕笟缁煎悎浣�","loft","鍟嗕綇涓ょ敤妤�","澶у瀷鍟嗕笟"}; + String[] mTypes={"澶у瀷鍟嗕笟","寤虹瓚缁煎悎浣�","鍟嗗姟涓績","鍟嗕笟缁煎悎浣�","缁煎悎浣�","澶у瀷鍟嗕笟缁煎悎浣�","澶у瀷楂樼鍩庡競缁煎悎浣�"}; + String[] hTypes={"閰掑簵鍐欏瓧妤�","閰掑簵鍙婂晢涓�","鏄熼檯鍏瘬","鏄熺┖浼氭墍","閰掑簵寮忓叕瀵�","閰掑簵","鏄熺骇閰掑簵"}; + String[] yTypes={"鍒涙剰鍥尯","鎬婚儴鍥尯","鎬婚儴鍥尯","鍒涙剰"}; String name = resultMap.get("name").toString().trim(); String estate_type2 = ""; if(resultMap.get("estate_type2") != null){ estate_type2 = resultMap.get("estate_type2").toString().trim(); } else { - resultMap.put("estate_type2", "标准写字楼"); + resultMap.put("estate_type2", "鏍囧噯鍐欏瓧妤�"); } boolean flag=false; if(StringUtils.isNotBlank(estate_type2)){ - String[] types = {"标准写字楼","商住两用楼 ","商业综合楼","酒店商务楼","园区写字楼"}; + String[] types = {"鏍囧噯鍐欏瓧妤�","鍟嗕綇涓ょ敤妤� ","鍟嗕笟缁煎悎妤�","閰掑簵鍟嗗姟妤�","鍥尯鍐欏瓧妤�"}; for(String type:types){ if(estate_type2.indexOf(type)!=-1){ estate_type2=type; @@ -452,53 +452,53 @@ public class WebpageAnalyzer { if(flag==false){ for(String type:bTypes){ if(estate_type2.indexOf(type)!=-1){ - resultMap.put("estate_type2", "标准写字楼"); - estate_type2 = "标准写字楼"; + resultMap.put("estate_type2", "鏍囧噯鍐欏瓧妤�"); + estate_type2 = "鏍囧噯鍐欏瓧妤�"; flag=true; } } for(String type:sTypes){ if(estate_type2.indexOf(type)!=-1){ - resultMap.put("estate_type2", "商住两用楼"); - estate_type2 = "商住两用楼"; + resultMap.put("estate_type2", "鍟嗕綇涓ょ敤妤�"); + estate_type2 = "鍟嗕綇涓ょ敤妤�"; flag=true; } } for(String type:mTypes){ if(estate_type2.indexOf(type)!=-1){ - resultMap.put("estate_type2", "商业综合楼"); - estate_type2 = "商业综合楼"; + resultMap.put("estate_type2", "鍟嗕笟缁煎悎妤�"); + estate_type2 = "鍟嗕笟缁煎悎妤�"; flag=true; } } for(String type:hTypes){ if(estate_type2.indexOf(type)!=-1){ - resultMap.put("estate_type2", "酒店商务楼"); - estate_type2 = "酒店商务楼"; + resultMap.put("estate_type2", "閰掑簵鍟嗗姟妤�"); + estate_type2 = "閰掑簵鍟嗗姟妤�"; flag=true; } } for(String type:yTypes){ if(estate_type2.indexOf(type)!=-1){ - resultMap.put("estate_type2", "园区写字楼"); - estate_type2 = "园区写字楼"; + resultMap.put("estate_type2", "鍥尯鍐欏瓧妤�"); + estate_type2 = "鍥尯鍐欏瓧妤�"; flag=true; } } if(flag==false){ - resultMap.put("estate_type2", "标准写字楼"); + resultMap.put("estate_type2", "鏍囧噯鍐欏瓧妤�"); } } } else { - resultMap.put("estate_type2", "标准写字楼"); + resultMap.put("estate_type2", "鏍囧噯鍐欏瓧妤�"); } return resultMap; } private Map districtEstateType(Map resultMap) { - String[] types = {"普通住宅","别墅","商住"}; + String[] types = {"鏅�氫綇瀹�","鍒","鍟嗕綇"}; String name = resultMap.get("name").toString().trim(); boolean flag=false; @@ -514,17 +514,17 @@ public class WebpageAnalyzer { } } if(flag == false){ - if(name.indexOf("别墅") != -1){ - resultMap.put("estate_type2", "别墅"); + if(name.indexOf("鍒") != -1){ + resultMap.put("estate_type2", "鍒"); }else { - resultMap.put("estate_type2", "普通住宅"); + resultMap.put("estate_type2", "鏅�氫綇瀹�"); } } } else { - if(name.indexOf("别墅") != -1){ - resultMap.put("estate_type2", "别墅"); + if(name.indexOf("鍒") != -1){ + resultMap.put("estate_type2", "鍒"); }else { - resultMap.put("estate_type2", "普通住宅"); + resultMap.put("estate_type2", "鏅�氫綇瀹�"); } } return resultMap; @@ -552,11 +552,11 @@ public class WebpageAnalyzer { if (dbObject != null) { for (String f : resultObject.keySet()) { - if (valueOptType == 0) {// 空值补充 + if (valueOptType == 0) {// 绌哄�艰ˉ鍏� if (dbObject.get(f) == null || StringUtils.isBlank(String.valueOf(dbObject.get(f)))) { newObject.put(f, resultObject.get(f)); } - } else if (valueOptType == 1) {// 强制信任 + } else if (valueOptType == 1) {// 寮哄埗淇′换 Map markMap = (Map) dbObject.get("mark_map"); if (markMap == null || markMap.size() == 0) { newObject.put(f, resultObject.get(f)); @@ -565,9 +565,9 @@ public class WebpageAnalyzer { newObject.put(f, resultObject.get(f)); } } - } else if (valueOptType == 2) {// 强制替换 + } else if (valueOptType == 2) {// 寮哄埗鏇挎崲 newObject.put(f, resultObject.get(f)); - } else if (valueOptType == 3){// 不做更新 + } else if (valueOptType == 3){// 涓嶅仛鏇存柊 } } diff --git a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/webdata/e/AnaMode.java b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/webdata/e/AnaMode.java index a219e9efc..1b7d19440 100644 --- a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/webdata/e/AnaMode.java +++ b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/webdata/e/AnaMode.java @@ -1,12 +1,12 @@ package com.fangjia.coredata.webdata.e; /** - * 解析模式 + * 瑙f瀽妯″紡 * Created by linxiaoshuai on 2016/4/6. */ public enum AnaMode { - COMMON("common", "普通模式"), - LIST("list", "列表模式"); + COMMON("common", "鏅�氭ā寮�"), + LIST("list", "鍒楄〃妯″紡"); private String mode; private String desc; diff --git a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/webpage/DynamicWebpageAnalyzer.java b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/webpage/DynamicWebpageAnalyzer.java index f4b6bc47c..c4e901bde 100644 --- a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/webpage/DynamicWebpageAnalyzer.java +++ b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/webpage/DynamicWebpageAnalyzer.java @@ -87,7 +87,7 @@ public class DynamicWebpageAnalyzer { /** - * 数据解析 + * 鏁版嵁瑙f瀽 * * @param collector * @param executor @@ -117,13 +117,13 @@ public class DynamicWebpageAnalyzer { executor.invoke(page); } catch (InterruptedException ex) { - LOG.info("opt:异常\tcat:" + page.getCategory() + "\tjob:" + page.getMetadata().getJobId() + "\tcode:-\turl:" + page.getMetadata().getUrl() + "\textra_data:" + extraData.toString() + "\texception:" + page.getMetadata().getId() + " " + ex.toString()); - loggerToMongo("异常", page.getCategory(), page.getMetadata().getJobId(), page.getMetadata().getSessionId(), -1, page.getMetadata().getUrl(), page.getMetadata().getReferer(), extraData, ex.toString()); + LOG.info("opt:寮傚父\tcat:" + page.getCategory() + "\tjob:" + page.getMetadata().getJobId() + "\tcode:-\turl:" + page.getMetadata().getUrl() + "\textra_data:" + extraData.toString() + "\texception:" + page.getMetadata().getId() + " " + ex.toString()); + loggerToMongo("寮傚父", page.getCategory(), page.getMetadata().getJobId(), page.getMetadata().getSessionId(), -1, page.getMetadata().getUrl(), page.getMetadata().getReferer(), extraData, ex.toString()); putToMetaQueue(page.getMetadata().getId()); saveToSnapshotDB(page, ex.toString()); } catch (Exception ex) { - LOG.info("opt:异常\tcat:" + page.getCategory() + "\tjob:" + page.getMetadata().getJobId() + "\tcode:-\turl:" + page.getMetadata().getUrl() + "\textra_data:" + extraData.toString() + "\texception:" + page.getMetadata().getId() + " " + ex.toString()); - loggerToMongo("异常", page.getCategory(), page.getMetadata().getJobId(), page.getMetadata().getSessionId(), -1, page.getMetadata().getUrl(), page.getMetadata().getReferer(), extraData, ex.toString()); + LOG.info("opt:寮傚父\tcat:" + page.getCategory() + "\tjob:" + page.getMetadata().getJobId() + "\tcode:-\turl:" + page.getMetadata().getUrl() + "\textra_data:" + extraData.toString() + "\texception:" + page.getMetadata().getId() + " " + ex.toString()); + loggerToMongo("寮傚父", page.getCategory(), page.getMetadata().getJobId(), page.getMetadata().getSessionId(), -1, page.getMetadata().getUrl(), page.getMetadata().getReferer(), extraData, ex.toString()); putToMetaQueue(page.getMetadata().getId()); saveToSnapshotDB(page, ex.toString()); } @@ -137,7 +137,7 @@ public class DynamicWebpageAnalyzer { } /** - * 保存到临时的快照库,方便排错 + * 淇濆瓨鍒颁复鏃剁殑蹇収搴擄紝鏂逛究鎺掗敊 * @param page */ private void saveToSnapshotDB(Page page, String reason) { @@ -167,7 +167,7 @@ public class DynamicWebpageAnalyzer { } /** - * 数据发布 + * 鏁版嵁鍙戝竷 */ public void doPublish(final Executor executor) { for(int i=0;i < 20;i++) { @@ -200,7 +200,7 @@ public class DynamicWebpageAnalyzer { } /** - * 删除metadata + * 鍒犻櫎metadata */ public void doDeleteMetadata() { Thread publishThread = new Thread(new Runnable() { @@ -261,11 +261,11 @@ public class DynamicWebpageAnalyzer { if (seabirdEntity != null) { if (seabirdEntity.getPublishDate().before((Date) resultMap.get("publish_date"))) { seabirdDao.updateById(new BasicDBObject(resultMap), seabirdEntity.getId()); - LOG.info("opt:更新\tcat:" + category + "\tjob:" + jobId + "\tcode:" + code + "\turl:" + url + "\textra_data:" + extraData.toString()); - loggerToMongo("更新", category, jobId, sessionId, code, url, referer, extraData); + LOG.info("opt:鏇存柊\tcat:" + category + "\tjob:" + jobId + "\tcode:" + code + "\turl:" + url + "\textra_data:" + extraData.toString()); + loggerToMongo("鏇存柊", category, jobId, sessionId, code, url, referer, extraData); } else { - LOG.info("opt:放弃\tcat:" + category + "\tjob:" + jobId + "\tcode:" + code + "\turl:" + url + "\textra_data:" + extraData.toString()); - loggerToMongo("放弃", category, jobId, sessionId, code, url, referer, extraData); + LOG.info("opt:鏀惧純\tcat:" + category + "\tjob:" + jobId + "\tcode:" + code + "\turl:" + url + "\textra_data:" + extraData.toString()); + loggerToMongo("鏀惧純", category, jobId, sessionId, code, url, referer, extraData); saveToSnapshotDB(page, ""); } doCappedLogger((String)extraData.get("city"), (String)extraData.get("site_name"), (String)extraData.get("page_name"), category, jobId); @@ -274,12 +274,12 @@ public class DynamicWebpageAnalyzer { seabirdDao.save(obj); saveToDatabackup(obj); doCappedLogger((String) extraData.get("city"), (String) extraData.get("site_name"), (String) extraData.get("page_name"), category, jobId); - LOG.info("opt:保存\tcat:" + category + "\tjob:" + jobId + "\tcode:" + code + "\turl:" + url + "\textra_data:" + extraData.toString()); - loggerToMongo("保存", category, jobId, sessionId, code, url, referer, extraData); + LOG.info("opt:淇濆瓨\tcat:" + category + "\tjob:" + jobId + "\tcode:" + code + "\turl:" + url + "\textra_data:" + extraData.toString()); + loggerToMongo("淇濆瓨", category, jobId, sessionId, code, url, referer, extraData); } } else { - LOG.info("opt:过滤\tcat:" + category + "\tjob:" + jobId + "\tcode:" + code + "\turl:" + url + "\textra_data:" + extraData.toString()); - loggerToMongo("过滤", category, jobId, sessionId, code, url, referer, extraData); + LOG.info("opt:杩囨护\tcat:" + category + "\tjob:" + jobId + "\tcode:" + code + "\turl:" + url + "\textra_data:" + extraData.toString()); + loggerToMongo("杩囨护", category, jobId, sessionId, code, url, referer, extraData); saveToSnapshotDB(page, ""); } } @@ -306,7 +306,7 @@ public class DynamicWebpageAnalyzer { } private void loggerToMongo(String opt, String cat, String jobId, String sessionId, int code, String url, String referer, Map extraMap) { - loggerToMongo("过滤", cat, jobId, sessionId, code, url, referer, extraMap, null); + loggerToMongo("杩囨护", cat, jobId, sessionId, code, url, referer, extraMap, null); } private void loggerToMongo(String opt, String cat, String jobId, String sessionId, int code, String url, String referer, Map extraMap, String exceptions) { @@ -380,42 +380,42 @@ public class DynamicWebpageAnalyzer { return 1; } - //区域 + //鍖哄煙 if (StringUtils.isBlank((String) object.get("region"))) { return 3; } - //总价不存在 + //鎬讳环涓嶅瓨鍦� if (object.get("total_price") == null) { return 6; } - //标题不存在 + //鏍囬涓嶅瓨鍦� if (object.get("name") == null || StringUtils.isBlank((String) object.get("name"))) { return 13; } - //发布日期不存在 + //鍙戝竷鏃ユ湡涓嶅瓨鍦� if (object.get("publish_date") == null) { return 7; } if("sell".equals(object.get("cat")) || "rent".equals(object.get("cat"))){ - //小区名 + //灏忓尯鍚� if (StringUtils.isBlank((String) object.get("district_name"))) { return 4; } if ("rent".equals(object.get("cat"))) { - //面积不存在 + //闈㈢Н涓嶅瓨鍦� if (object.get("area") == null && (object.get("room") == null || (Integer) object.get("room") <= 0 || (Integer) object.get("room") > 10)) { return 15; } if (object.get("estate_type") != null) { String estate_type = (String) object.get("estate_type"); - if (estate_type.indexOf("写字楼")!=-1||estate_type.indexOf("商铺")!=-1) { + if (estate_type.indexOf("鍐欏瓧妤�")!=-1||estate_type.indexOf("鍟嗛摵")!=-1) { return 8; } } @@ -425,12 +425,12 @@ public class DynamicWebpageAnalyzer { // } } else if ("sell".equals(object.get("cat"))) { - //面积不存在 + //闈㈢Н涓嶅瓨鍦� if (object.get("area") == null) { return 5; } - //面积大小不在规定范围内 + //闈㈢Н澶у皬涓嶅湪瑙勫畾鑼冨洿鍐� try { if (object.get("area") instanceof String) { if (Double.parseDouble((String) object.get("area")) < 10 @@ -446,7 +446,7 @@ public class DynamicWebpageAnalyzer { } - //价格不在规定的区间内 + //浠锋牸涓嶅湪瑙勫畾鐨勫尯闂村唴 if ((Integer) object.get("total_price") <= 50000) { return 12; } @@ -479,10 +479,10 @@ public class DynamicWebpageAnalyzer { /** - * 定时打印处理速度 + * 瀹氭椂鎵撳嵃澶勭悊閫熷害 */ private static void calculateSpeed(final Collector collector, final Executor executor) { - //打印日志时间间隔(单位:秒) + //鎵撳嵃鏃ュ織鏃堕棿闂撮殧锛堝崟浣嶏細绉掞級 final int gapSecs = 10; Timer timer = new Timer("counter"); timer.scheduleAtFixedRate(new TimerTask() { @@ -495,10 +495,10 @@ public class DynamicWebpageAnalyzer { } /** - * 定时清理快照中的数据,默认只保存一周的数据,删除昨天以前的 + * 瀹氭椂娓呯悊蹇収涓殑鏁版嵁锛岄粯璁ゅ彧淇濆瓨涓�鍛ㄧ殑鏁版嵁锛屽垹闄ゆ槰澶╀互鍓嶇殑 */ private void monitorSnapshot() { - //扫描快照间隔时间(单位:小时) + //鎵弿蹇収闂撮殧鏃堕棿锛堝崟浣嶏細灏忔椂锛� final int gapHours = 12; Timer timer = new Timer("snapshotScanner"); timer.scheduleAtFixedRate(new TimerTask() { diff --git a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/webpage/PageCollector.java b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/webpage/PageCollector.java index ddd04fc84..3686caef9 100644 --- a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/webpage/PageCollector.java +++ b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/webpage/PageCollector.java @@ -22,7 +22,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; /** - * 待处理网页收集器 + * 寰呭鐞嗙綉椤垫敹闆嗗櫒 * Created by dxy on 2015/7/23. */ @@ -146,22 +146,22 @@ public class PageCollector implements Collector { jedis.close(); } if(metadatas.size() > 0){ - LOGGER.error("[Redis] job:" + job.getJobId() + ", 获取数据量:" + metadatas.size() + " ,耗时:" + (System.currentTimeMillis() - start)); + LOGGER.error("[Redis] job:" + job.getJobId() + ", 鑾峰彇鏁版嵁閲�:" + metadatas.size() + " ,鑰楁椂:" + (System.currentTimeMillis() - start)); return metadatas.size(); } - //这个任务在metadata库中的数据量为0 + //杩欎釜浠诲姟鍦╩etadata搴撲腑鐨勬暟鎹噺涓�0 if(JOB_METADATA_COUNT_MAP.get(job.getJobId()) == 0) { return 0; } - LOGGER.error("查找Metadata:" + DateUtil.formatToTightYYYYMMDDhhmmss(new Date())); - //为了避免重复收集metadata数据,所以利用c_date进行分时间段提取 + LOGGER.error("鏌ユ壘Metadata:" + DateUtil.formatToTightYYYYMMDDhhmmss(new Date())); + //涓轰簡閬垮厤閲嶅鏀堕泦metadata鏁版嵁锛屾墍浠ュ埄鐢╟_date杩涜鍒嗘椂闂存鎻愬彇 if (!JOB_EARLIEST_DATE.containsKey(job.getJobId())) { Date earliestDate = metadataDao.findEarliestMetadata(job.getJobId()); if (earliestDate == null) { return 0; } - //减去1毫秒,确保最早的一条数据可以被查询到 + //鍑忓幓1姣,纭繚鏈�鏃╃殑涓�鏉℃暟鎹彲浠ヨ鏌ヨ鍒� JOB_EARLIEST_DATE.put(job.getJobId(), new Date(earliestDate.getTime() - 1)); } @@ -176,7 +176,7 @@ public class PageCollector implements Collector { int metaDataCount = JOB_METADATA_COUNT_MAP.get(job.getJobId()); if(metaDataCount < 1000){ metadatas = metadataDao.findMetadataByJobId(job.getJobId(), null, metaDataCount); - }else if(RandomUtils.nextInt(2) == 1){//50%的概率会处理数量较少的任务 + }else if(RandomUtils.nextInt(2) == 1){//50%鐨勬鐜囦細澶勭悊鏁伴噺杈冨皯鐨勪换鍔� metadatas = metadataDao.findMetadataByJobId(job.getJobId(), null, BATCH_LIMIT); }else{ return 0; @@ -188,7 +188,7 @@ public class PageCollector implements Collector { return 0; } - //重复动作,按时间正序(数据库中已进行asc=true的排序) + //閲嶅鍔ㄤ綔,鎸夋椂闂存搴�(鏁版嵁搴撲腑宸茶繘琛宎sc=true鐨勬帓搴�) Collections.sort(metadatas, new Comparator() { @Override public int compare(Metadata o1, Metadata o2) { @@ -211,7 +211,7 @@ public class PageCollector implements Collector { JOB_EARLIEST_DATE.put(job.getJobId(), earliestDate); } } - LOGGER.error("job:" + job.getJobId() + ", 获取数据量:" + metadatas.size() + " ,耗时:" + (System.currentTimeMillis() - start)); + LOGGER.error("job:" + job.getJobId() + ", 鑾峰彇鏁版嵁閲�:" + metadatas.size() + " ,鑰楁椂:" + (System.currentTimeMillis() - start)); return metadatas.size(); } diff --git a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/webpage/PageExecutor.java b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/webpage/PageExecutor.java index 6db914a39..6c868ae1d 100644 --- a/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/webpage/PageExecutor.java +++ b/projects/fangjia-coredata/src/main/java/com/fangjia/coredata/webpage/PageExecutor.java @@ -64,7 +64,7 @@ public class PageExecutor implements Executor { List fieldRules = fieldRuleContainer.getPageFieldRule(category, page.getSiteName(), page.getPageName()); if(fieldRules == null || fieldRules.size() == 0) { - throw new Exception("category:" + page.getCategory() + ",siteName:" + page.getSiteName() + ",pageName:" + page.getPageName() + ":无解析规则"); + throw new Exception("category:" + page.getCategory() + ",siteName:" + page.getSiteName() + ",pageName:" + page.getPageName() + ":鏃犺В鏋愯鍒�"); } String url = metadata.getUrl(); @@ -76,18 +76,18 @@ public class PageExecutor implements Executor { Map originalResultMap = new HashMap(); originalResultMap.put("city", city); - // 分析数据 + // 鍒嗘瀽鏁版嵁 originalResultMap.putAll(Analyzer.getInstance().analy(content, fieldRules)); - // 是否有未定义字段 + // 鏄惁鏈夋湭瀹氫箟瀛楁 String undefinedField = Analyzer.getInstance().getUndefinedField(definedFields, originalResultMap); if (undefinedField != null) { - throw new Exception(undefinedField + "未定义"); + throw new Exception(undefinedField + "鏈畾涔�"); } - // 把字段标准化 + // 鎶婂瓧娈垫爣鍑嗗寲 Analyzer.getInstance().formatToStandardValue(originalResultMap, city, category, definedFields); Map resultMap = new HashMap(originalResultMap); - // 根据数据库规则验证字段 + // 鏍规嵁鏁版嵁搴撹鍒欓獙璇佸瓧娈� Analyzer.getInstance().validator(resultMap, city, category, definedFields); DBObject primaryQuery = new BasicDBObject(); diff --git a/projects/fangjia-coresite/pom.xml b/projects/fangjia-coresite/pom.xml index 05fa7f275..464dcbd46 100644 --- a/projects/fangjia-coresite/pom.xml +++ b/projects/fangjia-coresite/pom.xml @@ -7,7 +7,7 @@ 0.0.1-SNAPSHOT fangjia-coresite - GBK + UTF-8 fangjia-coresite @@ -19,7 +19,7 @@ 1.6 1.6 - GBK + UTF-8 diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/CheckLoginInterceptor.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/CheckLoginInterceptor.java index 747e2296b..416a3fcb1 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/CheckLoginInterceptor.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/CheckLoginInterceptor.java @@ -38,19 +38,19 @@ public class CheckLoginInterceptor implements Interceptor { return ret; } - // 验证时间戳 + // 楠岃瘉鏃堕棿鎴� Calendar ca = Calendar.getInstance(); ca.setTimeInMillis(Long.parseLong(userInfo[2])); Date cookieDate = ca.getTime(); - // cookie超过2天默认失效 + // cookie瓒呰繃2澶╅粯璁ゅけ鏁� ca.setTime(new Date()); ca.add(Calendar.DAY_OF_MONTH, -2); if (cookieDate.before(ca.getTime())) { return ret; } - // 数据库验证用户是否有记录 + // 鏁版嵁搴撻獙璇佺敤鎴锋槸鍚︽湁璁板綍 int userId = Integer.parseInt(userInfo[0]); if (!userService.checkMediaUser(userId, userInfo[1])) { return ret; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/CoresiteContextLoaderListener.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/CoresiteContextLoaderListener.java index f93e6c5e9..50547de90 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/CoresiteContextLoaderListener.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/CoresiteContextLoaderListener.java @@ -36,7 +36,7 @@ public class CoresiteContextLoaderListener extends ContextLoaderListener { } super.contextInitialized(event); -// // 预热 +// // 棰勭儹 // if (LOGGER.isInfoEnabled()) { // LOGGER.info("warm up keyword links..."); // } @@ -57,8 +57,8 @@ public class CoresiteContextLoaderListener extends ContextLoaderListener { } LOGGER.info("warm up city,region"); - ServerAreaData.getServerAreaByDisplay("上海"); - RegionData.formatRegion("重庆", "江北"); + ServerAreaData.getServerAreaByDisplay("涓婃捣"); + RegionData.formatRegion("閲嶅簡", "姹熷寳"); if (LOGGER.isInfoEnabled()) { LOGGER.info("warm up ip seeker..."); diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/FangjiaConfig.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/FangjiaConfig.java index b0927d2ce..291a89cf3 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/FangjiaConfig.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/FangjiaConfig.java @@ -130,7 +130,7 @@ public class FangjiaConfig extends Configuration { } /** - * 是否启用页面静态缓存,默认为false + * 鏄惁鍚敤椤甸潰闈欐�佺紦瀛橈紝榛樿涓篺alse * * @return */ @@ -139,7 +139,7 @@ public class FangjiaConfig extends Configuration { } /** - * 得到页面静态缓存的存放路径 + * 寰楀埌椤甸潰闈欐�佺紦瀛樼殑瀛樻斁璺緞 * * @return */ @@ -148,7 +148,7 @@ public class FangjiaConfig extends Configuration { } /** - * 得到fangjia网spider的user agent,默认为goojiaSpider + * 寰楀埌fangjia缃憇pider鐨剈ser agent锛岄粯璁や负goojiaSpider * * @return */ @@ -157,7 +157,7 @@ public class FangjiaConfig extends Configuration { } /** - * 得到网站根域名 + * 寰楀埌缃戠珯鏍瑰煙鍚� * * @return */ @@ -240,7 +240,7 @@ public class FangjiaConfig extends Configuration { } /** - * 是否开启google 统计 + * 鏄惁寮�鍚痝oogle 缁熻 * * @return */ @@ -249,7 +249,7 @@ public class FangjiaConfig extends Configuration { } /** - * 全站检索列表分页最大页码 + * 鍏ㄧ珯妫�绱㈠垪琛ㄥ垎椤垫渶澶ч〉鐮� * * @return */ @@ -258,7 +258,7 @@ public class FangjiaConfig extends Configuration { } /** - * 内部链接关键字 + * 鍐呴儴閾炬帴鍏抽敭瀛� * * @return */ @@ -267,7 +267,7 @@ public class FangjiaConfig extends Configuration { } /** - * 上海的推荐学校 + * 涓婃捣鐨勬帹鑽愬鏍� * * @return */ diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/FangjiaRudder.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/FangjiaRudder.java index 1add0a479..9568791f9 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/FangjiaRudder.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/FangjiaRudder.java @@ -24,7 +24,7 @@ import com.fangjia.service.cnAnalyzer.Token; public class FangjiaRudder { /** - * 全部首页跳转控制 + * 鍏ㄩ儴棣栭〉璺宠浆鎺у埗 * * @param keyword * @return @@ -40,12 +40,12 @@ public class FangjiaRudder { } if (tokens.get(0).containsType(KeywordEnum.city)) { - ServerArea sa = ServerAreaData.getServerAreaByDisplayDefaultNull(tokens.get(0).getName().replace("市", "")); + ServerArea sa = ServerAreaData.getServerAreaByDisplayDefaultNull(tokens.get(0).getName().replace("甯�", "")); if (sa == null) { return null; } if (!isCurrentCity(tokens.get(0).getName())) { - sa = ServerAreaData.getServerAreaByDisplay(tokens.get(0).getName().replace("市", "")); + sa = ServerAreaData.getServerAreaByDisplay(tokens.get(0).getName().replace("甯�", "")); return switchCity(sa.getName(), keyword); } } @@ -82,7 +82,7 @@ public class FangjiaRudder { } /** - * 列表页跳转控制 + * 鍒楄〃椤佃烦杞帶鍒� * * @param keyword * @return @@ -98,13 +98,13 @@ public class FangjiaRudder { } if (tokens.get(0).containsType(KeywordEnum.city)) { - ServerArea sa = ServerAreaData.getServerAreaByDisplayDefaultNull(tokens.get(0).getName().replace("市", "")); + ServerArea sa = ServerAreaData.getServerAreaByDisplayDefaultNull(tokens.get(0).getName().replace("甯�", "")); if (sa == null) { return null; } if (!isCurrentCity(tokens.get(0).getName())) { - sa = ServerAreaData.getServerAreaByDisplay(tokens.get(0).getName().replace("市", "")); + sa = ServerAreaData.getServerAreaByDisplay(tokens.get(0).getName().replace("甯�", "")); return switchCity(sa.getName(), keyword); } } @@ -234,16 +234,16 @@ public class FangjiaRudder { private static Map WORD_CAT_MAP = new HashMap(); static { - WORD_CAT_MAP.put("二手房", "ershoufang"); - WORD_CAT_MAP.put("房子", "ershoufang"); - WORD_CAT_MAP.put("租房", "zufang"); - WORD_CAT_MAP.put("出租房", "zufang"); - WORD_CAT_MAP.put("小区", "xiaoqu"); - WORD_CAT_MAP.put("新房", "xinfang"); - WORD_CAT_MAP.put("新盘", "xinfang"); - WORD_CAT_MAP.put("地图", "map/list"); - WORD_CAT_MAP.put("新闻", "zixun"); - WORD_CAT_MAP.put("估价", "evaluation/report"); - WORD_CAT_MAP.put("评估", "evaluation/report"); + WORD_CAT_MAP.put("浜屾墜鎴�", "ershoufang"); + WORD_CAT_MAP.put("鎴垮瓙", "ershoufang"); + WORD_CAT_MAP.put("绉熸埧", "zufang"); + WORD_CAT_MAP.put("鍑虹鎴�", "zufang"); + WORD_CAT_MAP.put("灏忓尯", "xiaoqu"); + WORD_CAT_MAP.put("鏂版埧", "xinfang"); + WORD_CAT_MAP.put("鏂扮洏", "xinfang"); + WORD_CAT_MAP.put("鍦板浘", "map/list"); + WORD_CAT_MAP.put("鏂伴椈", "zixun"); + WORD_CAT_MAP.put("浼颁环", "evaluation/report"); + WORD_CAT_MAP.put("璇勪及", "evaluation/report"); } } diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/FangjiaUrlMapper.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/FangjiaUrlMapper.java index 22335d07f..2df2e481e 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/FangjiaUrlMapper.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/FangjiaUrlMapper.java @@ -45,7 +45,7 @@ import com.fangjia.service.mongo.fangjia.RegionBlockService; import com.fangjia.service.web.IdMapService; /** - * fangjia-coresite的URL映射 + * fangjia-coresite鐨刄RL鏄犲皠 * * @author dxy * @@ -83,7 +83,7 @@ public class FangjiaUrlMapper extends org.sothis.web.mvc.urlrewrite.AbstractUrlR } } - // 老网站的url跳转 + // 鑰佺綉绔欑殑url璺宠浆 try { return processGoojiaUrl(uri, request, response); } catch (IOException e) { @@ -136,7 +136,7 @@ public class FangjiaUrlMapper extends org.sothis.web.mvc.urlrewrite.AbstractUrlR Pattern seopagePattern = Pattern.compile(".*--z-(\\d+)$"); /** - * 处理老网站的URL + * 澶勭悊鑰佺綉绔欑殑URL * * @param uri * @param request @@ -150,7 +150,7 @@ public class FangjiaUrlMapper extends org.sothis.web.mvc.urlrewrite.AbstractUrlR return uri; } - //2015-08-11注释了,已经过了好几年了 + //2015-08-11娉ㄩ噴浜嗭紝宸茬粡杩囦簡濂藉嚑骞翠簡 List pairList = null;//GoojiaUrlParser.getInstance().getUrlPairs(); if (CollectionUtils.isEmpty(pairList)) { return uri; @@ -219,10 +219,10 @@ public class FangjiaUrlMapper extends org.sothis.web.mvc.urlrewrite.AbstractUrlR newUrl = StringUtils.substringBeforeLast(newUrl, "/"); - // 没有找到对应小区,把小区名替换为空 + // 娌℃湁鎵惧埌瀵瑰簲灏忓尯锛屾妸灏忓尯鍚嶆浛鎹负绌� newUrl = newUrl.replace("${districtName}", ""); if (newUrl.indexOf("$") > 0) { - // 如还有别的变量,返回到小区列表 + // 濡傝繕鏈夊埆鐨勫彉閲忥紝杩斿洖鍒板皬鍖哄垪琛� newUrl = "xiaoqu/" + getKeyword(request); } @@ -249,7 +249,7 @@ public class FangjiaUrlMapper extends org.sothis.web.mvc.urlrewrite.AbstractUrlR newUrl = newUrl.replace("${id}", newId); } else { if (newUrl.indexOf("$") < 0) { - // newUrl不变 + // newUrl涓嶅彉 } else if (CategoryEnum.sell.name().equals(pair.getCat())) { newUrl = "ershoufang/" + getKeyword(request); } else if (CategoryEnum.rent.name().equals(pair.getCat())) { @@ -346,7 +346,7 @@ public class FangjiaUrlMapper extends org.sothis.web.mvc.urlrewrite.AbstractUrlR String tmpCity = StringUtils.substringBefore(url, "."); if ("www".equalsIgnoreCase(tmpCity)) { - // 用IP判断用户城市,无结果则用默认城市 + // 鐢↖P鍒ゆ柇鐢ㄦ埛鍩庡競锛屾棤缁撴灉鍒欑敤榛樿鍩庡競 // IpAddress ipAddress = // ipAddressService.findByIp(AnalyticsUtil.getIpAddress(request)); // ServerArea ipCity = null; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/AboutController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/AboutController.java index f35ec85d8..346949e39 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/AboutController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/AboutController.java @@ -3,7 +3,7 @@ package com.fangjia.coresite.controllers; import com.fangjia.coresite.model.FangjiaModel; /** - * 联系我们 + * 鑱旂郴鎴戜滑 * Created by wenyan on 2016/5/9. */ public class AboutController { diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/AdController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/AdController.java index 4789b94e6..19f2746fa 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/AdController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/AdController.java @@ -65,13 +65,13 @@ public class AdController { private CustomerConsultService customerConsultService; private static List NOTICE_MOBILES = new ArrayList(); static { - NOTICE_MOBILES.add("13916992399"); // 蒋 - NOTICE_MOBILES.add("13681915777"); // 钟 - NOTICE_MOBILES.add("15201904147");//姚嘉毅 + NOTICE_MOBILES.add("13916992399"); // 钂� + NOTICE_MOBILES.add("13681915777"); // 閽� + NOTICE_MOBILES.add("15201904147");//濮氬槈姣� } /** - * 显示一个具体的广告 + * 鏄剧ず涓�涓叿浣撶殑骞垮憡 * * @param id * @return @@ -85,7 +85,7 @@ public class AdController { } /** - * 显示一个默认广告 + * 鏄剧ず涓�涓粯璁ゅ箍鍛� * * @param model * @return @@ -123,7 +123,7 @@ public class AdController { } public Object sendCodeAction(AdModel model) { - // 验证一下是否从页面发起的请求,防止攻击 + // 楠岃瘉涓�涓嬫槸鍚︿粠椤甸潰鍙戣捣鐨勮姹傦紝闃叉鏀诲嚮 String refererUrl = model.getRefererUrl(); if (!"fangjia.com".equals(DataUtil.urlToSiteName(refererUrl))) { return Models.NOT_FOUNT; @@ -132,43 +132,43 @@ public class AdController { AdJsonModel ret = new AdJsonModel(); String mobile = model.getMobile(); if (StringUtils.isBlank(mobile)) { - ret.setMsg("请输入联系手机号码"); + ret.setMsg("璇疯緭鍏ヨ仈绯绘墜鏈哄彿鐮�"); return ret; } Pattern pattern = Pattern.compile("^1[3|4|5|8][0-9]\\d{4,8}$"); Matcher matcher = pattern.matcher(mobile); if (!matcher.matches()) { - ret.setMsg("手机号码不正确"); + ret.setMsg("鎵嬫満鍙风爜涓嶆纭�"); return ret; } if ("taste".equals(model.getType())) { ReportTaste sendedTaste = reportTasteService.findSendedByMobile(mobile); if (null != sendedTaste) { - ret.setMsg("该手机用户已获得了免费体验,
请付费购买《房调报告》,谢谢!"); + ret.setMsg("璇ユ墜鏈虹敤鎴峰凡鑾峰緱浜嗗厤璐逛綋楠岋紝
璇蜂粯璐硅喘涔般�婃埧璋冩姤鍛娿�嬶紝璋㈣阿锛�"); return ret; } int todayCount = smsCodeService.findMobileCodesToday(mobile, "taste"); if (todayCount > 1) { - ret.setMsg("该手机号今日已申请过免费体验,
每个手机号每天只能申请1次,谢谢参与!"); + ret.setMsg("璇ユ墜鏈哄彿浠婃棩宸茬敵璇疯繃鍏嶈垂浣撻獙锛�
姣忎釜鎵嬫満鍙锋瘡澶╁彧鑳界敵璇�1娆★紝璋㈣阿鍙備笌锛�"); return ret; } } try { smsCodeService.sendCode(mobile, model.getType()); - ret.setMsg("验证码已发送,请注意查收"); + ret.setMsg("楠岃瘉鐮佸凡鍙戦�侊紝璇锋敞鎰忔煡鏀�"); } catch (SmsException e) { LOGGER.error("fangjiatong2 send sms cod error:", e); - ret.setMsg("发送失败,请稍后重试"); + ret.setMsg("鍙戦�佸け璐ワ紝璇风◢鍚庨噸璇�"); } return ret; } public Object saveFjtAppAction(AdModel model, HttpServletRequest request, HttpServletResponse response) { - // 验证一下是否从页面发起的请求,防止攻击 + // 楠岃瘉涓�涓嬫槸鍚︿粠椤甸潰鍙戣捣鐨勮姹傦紝闃叉鏀诲嚮 String refererUrl = model.getRefererUrl(); if (!"fangjia.com".equals(DataUtil.urlToSiteName(refererUrl))) { return Models.NOT_FOUNT; @@ -184,18 +184,18 @@ public class AdController { String password = getPass(8); if (StringUtils.isBlank(name) || StringUtils.isBlank(company) || StringUtils.isBlank(email) || StringUtils.isBlank(mobile) || StringUtils.isBlank(code)|| StringUtils.isBlank(cityName)) { - ret.setMsg("请将信息输入完整"); + ret.setMsg("璇峰皢淇℃伅杈撳叆瀹屾暣"); return ret; } String dbCode = smsCodeService.findCodeByMobile(mobile, "fjt"); if (null == dbCode) { - // ret.setMsg("验证码已过期,请重新发送"); + // ret.setMsg("楠岃瘉鐮佸凡杩囨湡锛岃閲嶆柊鍙戦��"); ret.setMsg("error"); return ret; } if (!dbCode.equals(code)) { - // ret.setMsg("手机验证码不正确"); + // ret.setMsg("鎵嬫満楠岃瘉鐮佷笉姝g‘"); ret.setMsg("error"); return ret; } @@ -206,14 +206,14 @@ public class AdController { return ret; } - // ret.setMsg("申请成功,请等待客服处理"); + // ret.setMsg("鐢宠鎴愬姛锛岃绛夊緟瀹㈡湇澶勭悊"); CookieContext cookieContext = CoresiteCookieContext.getInstance(); String rgTimes = cookieContext.getCookieValue(request, "rg_times"); String limitTime = cookieContext.getCookieValue(request, "limit_time"); JSONObject login_ret = fjtLoginService.regist(email, password, rgTimes, limitTime, "3", 2); if (null == login_ret || login_ret.isNullObject()) { - ret.setMsg("服务器异常,请稍后注册"); + ret.setMsg("鏈嶅姟鍣ㄥ紓甯革紝璇风◢鍚庢敞鍐�"); } else if (login_ret.getInt("code") == 0) { CpdbApplication entity = new CpdbApplication(); entity.setName(DataUtil.removeHtml(name)); @@ -250,7 +250,7 @@ public class AdController { ret.setMsg("OK"); try { StringBuffer text = new StringBuffer(); - text.append("您申请的房价通试用账号用户名:").append(email).append(",密码:").append(password).append(",两天内有效。客服:021-6239 2522"); + text.append("鎮ㄧ敵璇风殑鎴夸环閫氳瘯鐢ㄨ处鍙风敤鎴峰悕:").append(email).append("锛屽瘑鐮�:").append(password).append("锛屼袱澶╁唴鏈夋晥銆傚鏈�:021-6239 2522"); smsService.send(mobile, text.toString()); } catch (Exception e) { LOGGER.error("fangjiatong2 send sms cod error:", e); @@ -263,11 +263,11 @@ public class AdController { } /** - * 生成随机密码 + * 鐢熸垚闅忔満瀵嗙爜 * * @param passLenth - * 生成的密码长度 - * @return 随机密码 + * 鐢熸垚鐨勫瘑鐮侀暱搴� + * @return 闅忔満瀵嗙爜 */ public static String getPass(int passLenth) { StringBuffer buffer = new StringBuffer("0123456789abcdefghijklmnopqrstuvwxyz"); @@ -275,7 +275,7 @@ public class AdController { Random r = new Random(); int range = buffer.length(); for (int i = 0; i < passLenth; i++) { - // 生成指定范围类的随机数0—字符串长度(包括0、不包括字符串长度) + // 鐢熸垚鎸囧畾鑼冨洿绫荤殑闅忔満鏁�0鈥斿瓧绗︿覆闀垮害(鍖呮嫭0銆佷笉鍖呮嫭瀛楃涓查暱搴�) sb.append(buffer.charAt(r.nextInt(range))); } return sb.toString(); @@ -301,7 +301,7 @@ public class AdController { } public Object saveCustomerConsultAction(AdModel model, HttpServletRequest request, HttpServletResponse response){ - // 验证一下是否从页面发起的请求,防止攻击 + // 楠岃瘉涓�涓嬫槸鍚︿粠椤甸潰鍙戣捣鐨勮姹傦紝闃叉鏀诲嚮 String refererUrl = model.getRefererUrl(); if (!"fangjia.com".equals(DataUtil.urlToSiteName(refererUrl))) { return Models.NOT_FOUNT; @@ -317,21 +317,21 @@ public class AdController { if (StringUtils.isBlank(name) || StringUtils.isBlank(company) || StringUtils.isBlank(mobile) || StringUtils.isBlank(email)) { - ret.setMsg("请将信息输入完整"); + ret.setMsg("璇峰皢淇℃伅杈撳叆瀹屾暣"); return ret; } Pattern p = Pattern.compile("^1[3|4|5|8][0-9]\\d{4,8}$"); Matcher m = p.matcher(mobile); if (!m.matches()) { - ret.setMsg("手机号码不正确"); + ret.setMsg("鎵嬫満鍙风爜涓嶆纭�"); return ret; } p = Pattern.compile("\\w+([-+.]\\w+)*@\\w+([-.]\\w+)*\\.\\w+([-.]\\w+)*"); m = p.matcher(email); if (!m.matches()) { - ret.setMsg("电子邮箱不正确"); + ret.setMsg("鐢靛瓙閭涓嶆纭�"); return ret; } CustomerConsult consult = new CustomerConsult(); @@ -343,7 +343,7 @@ public class AdController { consult.setIp(AnalyticsUtil.getIpAddress(request)); consult.setSource("CPDB"); customerConsultService.save(consult); - String smsContent ="FangJia China(来自CPDB) 收到留言:\n " + "联系人:" + consult.getName() + " \n邮箱:" + consult.getEmail() + " \n联系电话:" +consult.getPhone()+"\n"; + String smsContent ="FangJia China(鏉ヨ嚜CPDB) 鏀跺埌鐣欒█:\n " + "鑱旂郴浜�:" + consult.getName() + " \n閭:" + consult.getEmail() + " \n鑱旂郴鐢佃瘽:" +consult.getPhone()+"\n"; try { for(String mob:NOTICE_MOBILES){ smsService.send(mob, smsContent); @@ -356,7 +356,7 @@ public class AdController { } public Object saveCpdbAppAction(AdModel model, HttpServletRequest request, HttpServletResponse response) { - // 验证一下是否从页面发起的请求,防止攻击 + // 楠岃瘉涓�涓嬫槸鍚︿粠椤甸潰鍙戣捣鐨勮姹傦紝闃叉鏀诲嚮 String refererUrl = model.getRefererUrl(); if (!"fangjia.com".equals(DataUtil.urlToSiteName(refererUrl))) { return Models.NOT_FOUNT; @@ -372,21 +372,21 @@ public class AdController { if (StringUtils.isBlank(name) || StringUtils.isBlank(company) || StringUtils.isBlank(mobile) || StringUtils.isBlank(email)) { - ret.setMsg("请将信息输入完整"); + ret.setMsg("璇峰皢淇℃伅杈撳叆瀹屾暣"); return ret; } Pattern p = Pattern.compile("^1[3|4|5|8][0-9]\\d{4,8}$"); Matcher m = p.matcher(mobile); if (!m.matches()) { - ret.setMsg("手机号码不正确"); + ret.setMsg("鎵嬫満鍙风爜涓嶆纭�"); return ret; } p = Pattern.compile("\\w+([-+.]\\w+)*@\\w+([-.]\\w+)*\\.\\w+([-.]\\w+)*"); m = p.matcher(email); if (!m.matches()) { - ret.setMsg("电子邮箱不正确"); + ret.setMsg("鐢靛瓙閭涓嶆纭�"); return ret; } @@ -411,7 +411,7 @@ public class AdController { String limitTime = cookieContext.getCookieValue(request, "limit_time"); JSONObject login_ret = fjtLoginService.regist(email, password, rgTimes, limitTime, "3", 2); if (null == login_ret || login_ret.isNullObject()) { - ret.setMsg("服务器异常,请稍后注册"); + ret.setMsg("鏈嶅姟鍣ㄥ紓甯革紝璇风◢鍚庢敞鍐�"); } else if (login_ret.getInt("code") == 0) { CpdbApplication entity = new CpdbApplication(); entity.setName(DataUtil.removeHtml(name)); @@ -439,47 +439,47 @@ public class AdController { response.addCookie(cookie); try { - // 发邮件给用户 + // 鍙戦偖浠剁粰鐢ㄦ埛 Mail mail = new Mail(); mail.setReceiver(new MailUser(email)); - mail.setSubject("房价网—中国不动产大数据库CPDB演示"); + mail.setSubject("鎴夸环缃戔�斾腑鍥戒笉鍔ㄤ骇澶ф暟鎹簱CPDB婕旂ず"); StringBuffer emailMsg = new StringBuffer(); - emailMsg.append("尊敬的用户:

") - .append("  感谢您申请房价网的房价数据测试平台免费试用账号!

") - .append("  您现在可以在48小时内免费体验房价数据测试平台的所有功能了!

") - .append("  登陆链接:房价数据测试平台
") - .append("  用户名:") + emailMsg.append("灏婃暚鐨勭敤鎴凤細

") + .append("  鎰熻阿鎮ㄧ敵璇锋埧浠风綉鐨�鎴夸环鏁版嵁娴嬭瘯骞冲彴鍏嶈垂璇曠敤璐﹀彿锛�

") + .append("  鎮ㄧ幇鍦ㄥ彲浠ュ湪48灏忔椂鍐呭厤璐逛綋楠�鎴夸环鏁版嵁娴嬭瘯骞冲彴鐨勬墍鏈夊姛鑳戒簡!

") + .append("  鐧婚檰閾炬帴锛�鎴夸环鏁版嵁娴嬭瘯骞冲彴
") + .append("  鐢ㄦ埛鍚嶏細") .append(email) .append("
") - .append("  密码:") + .append("  瀵嗙爜锛�") .append(password) .append("

") - .append("  由于该账号为限时使用,所以请尽快开始使用。

") - .append("  房价数据测试平台是凭借中国不动产大数据库CPDB的基础上,整合优势力量,推出的测试平台。

") - .append("  CPDB大数据库包括") - .append("  
  • 住宅物业的实时挂牌价格、成交参考、房源、楼盘详情、照片、地图
  • ") - .append("  
  • 商业地产的均价、详情、消费分析、竞争对手情报
  • ") - .append("  
  • 城市行情、历史数据等

") - .append("  CPDB(China Property Data Base)是由房价网通过10年积累和国际领先的专利技术(OLKD),打造的精确到每一户房产微观数据的“中国不动产大数据库”。
") - .append("  CPDB的数据覆盖全国100个城市、15万楼盘,拥有5000万套房产的个性化微观数据,革命性的实现了“一户一信息”,是目前中国最大、最专业、最实时的不动产微观数据库。

") - .append("  关于中国不动产大数据库CPDB的更多相关内容,您可以通过附件中的PPT演示文稿更全面的了解。

") - .append("  您可以将此封邮件转发给其他用到不动产大数据库的伙伴,比如银行、电商平台、贷款公司、评估机构、房地产营销机构、软件公司、金融类网站等等,相信给会他们带来极大帮助。

") - .append("  如有任何疑问,欢迎您致电客服电话:021-6239 2522。

").append("  谢谢您。

") - .append("  祝您生活愉快,工作顺利。"); + .append("  鐢变簬璇ヨ处鍙蜂负闄愭椂浣跨敤锛屾墍浠ヨ灏藉揩寮�濮嬩娇鐢ㄣ��

") + .append("  鎴夸环鏁版嵁娴嬭瘯骞冲彴鏄嚟鍊�涓浗涓嶅姩浜уぇ鏁版嵁搴揅PDB鐨勫熀纭�涓婏紝鏁村悎浼樺娍鍔涢噺锛屾帹鍑虹殑娴嬭瘯骞冲彴銆�

") + .append("  CPDB澶ф暟鎹簱鍖呮嫭") + .append("  
  • 浣忓畢鐗╀笟鐨勫疄鏃舵寕鐗屼环鏍笺�佹垚浜ゅ弬鑰冦�佹埧婧愩�佹ゼ鐩樿鎯呫�佺収鐗囥�佸湴鍥�
  • ") + .append("  
  • 鍟嗕笟鍦颁骇鐨勫潎浠枫�佽鎯呫�佹秷璐瑰垎鏋愩�佺珵浜夊鎵嬫儏鎶�
  • ") + .append("  
  • 鍩庡競琛屾儏銆佸巻鍙叉暟鎹瓑

") + .append("  CPDB锛圕hina Property Data Base锛夋槸鐢辨埧浠风綉閫氳繃10骞寸Н绱�鍜屽浗闄呴鍏堢殑涓撳埄鎶�鏈�锛圤LKD锛夛紝鎵撻�犵殑绮剧‘鍒版瘡涓�鎴锋埧浜у井瑙傛暟鎹殑鈥滀腑鍥戒笉鍔ㄤ骇澶ф暟鎹簱鈥濄��
") + .append("  CPDB鐨勬暟鎹鐩栧叏鍥�100涓�鍩庡競銆�15涓�妤肩洏锛屾嫢鏈�5000涓囧鎴夸骇鐨勪釜鎬у寲寰鏁版嵁锛岄潻鍛芥�х殑瀹炵幇浜嗏��涓�鎴蜂竴淇℃伅鈥濓紝鏄洰鍓嶄腑鍥芥渶澶с�佹渶涓撲笟銆佹渶瀹炴椂鐨勪笉鍔ㄤ骇寰鏁版嵁搴撱��

") + .append("  鍏充簬涓浗涓嶅姩浜уぇ鏁版嵁搴揅PDB鐨勬洿澶氱浉鍏冲唴瀹癸紝鎮ㄥ彲浠ラ�氳繃闄勪欢涓殑PPT婕旂ず鏂囩ǹ鏇村叏闈㈢殑浜嗚В銆�

") + .append("  鎮ㄥ彲浠ュ皢姝ゅ皝閭欢杞彂缁欏叾浠栫敤鍒颁笉鍔ㄤ骇澶ф暟鎹簱鐨勪紮浼达紝姣斿閾惰銆佺數鍟嗗钩鍙般�佽捶娆惧叕鍙搞�佽瘎浼版満鏋勩�佹埧鍦颁骇钀ラ攢鏈烘瀯銆佽蒋浠跺叕鍙搞�侀噾铻嶇被缃戠珯绛夌瓑锛岀浉淇$粰浼氫粬浠甫鏉ユ瀬澶у府鍔┿��

") + .append("  濡傛湁浠讳綍鐤戦棶锛屾杩庢偍鑷寸數瀹㈡湇鐢佃瘽锛�021-6239 2522銆�

").append("  璋㈣阿鎮ㄣ��

") + .append("  绁濇偍鐢熸椿鎰夊揩锛屽伐浣滈『鍒┿��"); mail.setContent(emailMsg.toString()); mail.setImportant(true); mail.setAttachment(true); - mail.setAttachmentDes("CPDB大数据库示例"); - mail.setAttachmentName("CPDB大数据库示例.pptx"); + mail.setAttachmentDes("CPDB澶ф暟鎹簱绀轰緥"); + mail.setAttachmentName("CPDB澶ф暟鎹簱绀轰緥.pptx"); mail.setAttachmentUrl("http://static.fangjia.com/res/static_logo/CPDB.pptx"); emailService.sendHtmlMailWithFile(mail); // smsCodeService.sendNotices("13391219237", email, mobile); } catch (Exception e) { LOGGER.error("fangjiatong2 send sms cod error:", e); - // ret.setMsg("发送失败,请稍后重试"); + // ret.setMsg("鍙戦�佸け璐ワ紝璇风◢鍚庨噸璇�"); } - // ret.setMsg("申请成功,请等待客服处理"); + // ret.setMsg("鐢宠鎴愬姛锛岃绛夊緟瀹㈡湇澶勭悊"); ret.setMsg("OK"); } else { ret.setMsg(login_ret.getString("msg")); diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/AddressAnalyController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/AddressAnalyController.java index 214a941a1..6d8ed26f1 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/AddressAnalyController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/AddressAnalyController.java @@ -54,7 +54,7 @@ import com.fangjia.service.address.analy.AddressRegionCountService; import com.fangjia.service.address.analy.AnalyticsOverviewService; /** - * 批量地址分析 + * 鎵归噺鍦板潃鍒嗘瀽 */ public class AddressAnalyController { @@ -101,7 +101,7 @@ public class AddressAnalyController { } public Object fjindexAction(AddressAnalyModel model, HttpServletRequest request) { - model.setTitle("风控"); + model.setTitle("椋庢帶"); model.setExistsOverTask(isExistsOverTask(LoginUtil.getUserId(request), model.getTitle())); String userId = LoginUtil.getUserId(request); List finishAddressTasks = addressTaskService.findTasksByUserId(userId, 3, 0, model.getTitle(), 5); @@ -158,7 +158,7 @@ public class AddressAnalyController { task.setStatus(1); addressTaskService.update(task); - if(task.getType().equals("营销")){ + if(task.getType().equals("钀ラ攢")){ model.setViewParam("location", "/addressAnaly/yxindex"); }else{ model.setViewParam("location", "/addressAnaly/fjindex"); @@ -178,7 +178,7 @@ public class AddressAnalyController { String userId = LoginUtil.getUserId(request); if(StringUtils.isNotBlank(userId)){ - String type = model.getType().equals("fk")?"风控":"营销"; + String type = model.getType().equals("fk")?"椋庢帶":"钀ラ攢"; List addressTasks = addressTaskService.findAllEffectiveTasksByParams(userId, Arrays.asList(1,2), 0, type, 5); if(addressTasks!=null && addressTasks.size()>0){ @@ -207,7 +207,7 @@ public class AddressAnalyController { String userId = LoginUtil.getUserId(request); if(StringUtils.isNotBlank(userId)){ - String type = model.getType().equals("fk")?"风控":"营销"; + String type = model.getType().equals("fk")?"椋庢帶":"钀ラ攢"; List addressTasks = addressTaskService.findTasksByParams(userId, -1, 0, type, 5); if(addressTasks!=null && addressTasks.size()>0){ for(AddressTask task : addressTasks){ @@ -250,7 +250,7 @@ public class AddressAnalyController { public Object yxindexAction(AddressAnalyModel model, HttpServletRequest request) { - model.setTitle("营销"); + model.setTitle("钀ラ攢"); model.setExistsOverTask(isExistsOverTask(LoginUtil.getUserId(request), model.getTitle())); String userId = LoginUtil.getUserId(request); List finishAddressTasks = addressTaskService.findTasksByUserId(userId, 3, 0,model.getTitle(), 5); @@ -274,21 +274,21 @@ public class AddressAnalyController { BufferedOutputStream fos = null; HSSFWorkbook wb = createSimpleExcel(model.getType()); - String fileName = "抵押品模板.xls"; + String fileName = "鎶垫娂鍝佹ā鏉�.xls"; if(StringUtils.isNotBlank(model.getType()) && model.getType().equals("yx")){ - fileName = "精准营销模板.xls"; + fileName = "绮惧噯钀ラ攢妯℃澘.xls"; } try { HttpServletResponse response = ActionContext.getContext().getResponse(); response.setCharacterEncoding("UTF-8"); - //response.reset();// 清空输出流 + //response.reset();// 娓呯┖杈撳嚭娴� response.setContentType("application/x-download;charset=UTF-8"); fileName = new String(fileName.getBytes("GBK"),"ISO-8859-1"); - if(fileName.length()>150){//解决IE 6.0 bug + if(fileName.length()>150){//瑙e喅IE 6.0 bug fileName = new String(fileName.getBytes("GBK"),"ISO-8859-1"); } response.setHeader( "Content-Disposition", "attachment;filename=" + fileName); - os = response.getOutputStream();// 取得输出流 + os = response.getOutputStream();// 鍙栧緱杈撳嚭娴� wb.write(os); os.flush(); }catch (Exception e) { @@ -312,18 +312,18 @@ public class AddressAnalyController { private HSSFWorkbook createSimpleExcel(String type){ HSSFWorkbook wb = new HSSFWorkbook(); HSSFSheet s = wb.createSheet(); - wb.setSheetName(0, "样本"); + wb.setSheetName(0, "鏍锋湰"); - HSSFCellStyle style = wb.createCellStyle(); // 样式对象 + HSSFCellStyle style = wb.createCellStyle(); // 鏍峰紡瀵硅薄 HSSFFont font=wb.createFont(); - font.setColor(HSSFColor.RED.index);//HSSFColor.VIOLET.index //字体颜色 - //把字体应用到当前的样式 + font.setColor(HSSFColor.RED.index);//HSSFColor.VIOLET.index //瀛椾綋棰滆壊 + //鎶婂瓧浣撳簲鐢ㄥ埌褰撳墠鐨勬牱寮� style.setFont(font); style.setWrapText(true); HSSFRow onerow = s.createRow(0); - onerow.createCell(0).setCellValue("城市(必填)"); - onerow.createCell(1).setCellValue("地址(必填)"); + onerow.createCell(0).setCellValue("鍩庡競(蹇呭~)"); + onerow.createCell(1).setCellValue("鍦板潃(蹇呭~)"); s.setColumnWidth(0, 15 * 256); s.setColumnWidth(1, 50 * 256); @@ -332,30 +332,30 @@ public class AddressAnalyController { s.setColumnWidth(4, 50 * 256); if(type.equals("yx")){ - onerow.createCell(2).setCellValue("面积"); - onerow.createCell(3).setCellValue("客户价值指数"); + onerow.createCell(2).setCellValue("闈㈢Н"); + onerow.createCell(3).setCellValue("瀹㈡埛浠峰�兼寚鏁�"); HSSFCell cell = onerow.createCell(4); - cell.setCellValue("备注:1.表头不可修改\r\n 2.免费试用城市仅支持上海\r\n 3. 在中国,房产资产是用户最大的资产项,房产价值在最大程度上表明了一个中国用户的财富和购买力指数。\r\n 而“客户价值指数”是地址对应客户的价值特征值,可以是指数,可以是账户资产,客单价,访问频率,购买力等衡量客户等级的数值。可以根据该数值和客户资产价值为您进行客户价值分类,挖掘潜在客户。"); + cell.setCellValue("澶囨敞锛�1.琛ㄥご涓嶅彲淇敼\r\n 2.鍏嶈垂璇曠敤鍩庡競浠呮敮鎸佷笂娴穃r\n 3. 鍦ㄤ腑鍥斤紝鎴夸骇璧勪骇鏄敤鎴锋渶澶х殑璧勪骇椤癸紝鎴夸骇浠峰�煎湪鏈�澶х▼搴︿笂琛ㄦ槑浜嗕竴涓腑鍥界敤鎴风殑璐㈠瘜鍜岃喘涔板姏鎸囨暟銆俓r\n 鑰屸�滃鎴蜂环鍊兼寚鏁扳�濇槸鍦板潃瀵瑰簲瀹㈡埛鐨勪环鍊肩壒寰佸�硷紝鍙互鏄寚鏁帮紝鍙互鏄处鎴疯祫浜э紝瀹㈠崟浠凤紝璁块棶棰戠巼锛岃喘涔板姏绛夎 閲忓鎴风瓑绾х殑鏁板�笺�傚彲浠ユ牴鎹鏁板�煎拰瀹㈡埛璧勪骇浠峰�间负鎮ㄨ繘琛屽鎴蜂环鍊煎垎绫伙紝鎸栨帢娼滃湪瀹㈡埛銆�"); cell.setCellStyle(style); }else{ - onerow.createCell(2).setCellValue("面积(必填)"); - onerow.createCell(3).setCellValue("贷款余额"); + onerow.createCell(2).setCellValue("闈㈢Н(蹇呭~)"); + onerow.createCell(3).setCellValue("璐锋浣欓"); HSSFCell cell = onerow.createCell(4); - cell.setCellValue("备注:1.表头不可修改,请按照给出的样例插入数据。\r\n 2.免费试用城市仅支持上海。\r\n 3.输入贷款余额可以算出CLTV(即时抵押率),及时将超过预警的房产导出,有针对性的进行处理。"); + cell.setCellValue("澶囨敞:1.琛ㄥご涓嶅彲淇敼,璇锋寜鐓х粰鍑虹殑鏍蜂緥鎻掑叆鏁版嵁銆俓r\n 2.鍏嶈垂璇曠敤鍩庡競浠呮敮鎸佷笂娴枫�俓r\n 3.杈撳叆璐锋浣欓鍙互绠楀嚭CLTV锛堝嵆鏃舵姷鎶肩巼锛�,鍙婃椂灏嗚秴杩囬璀︾殑鎴夸骇瀵煎嚭锛屾湁閽堝鎬х殑杩涜澶勭悊銆�"); cell.setCellStyle(style); } HSSFRow row1 = s.createRow(1); - row1.createCell(0).setCellValue("上海"); + row1.createCell(0).setCellValue("涓婃捣"); if(type.equals("yx")){ - row1.createCell(1).setCellValue("上海市闵行区中春路8888弄218号102室"); + row1.createCell(1).setCellValue("涓婃捣甯傞椀琛屽尯涓槬璺�8888寮�218鍙�102瀹�"); row1.createCell(2).setCellValue("144"); row1.createCell(3).setCellValue("3600355.43"); }else{ - row1.createCell(1).setCellValue("上海市浦东新区莱阳路301弄17号402室"); + row1.createCell(1).setCellValue("涓婃捣甯傛郸涓滄柊鍖鸿幈闃宠矾301寮�17鍙�402瀹�"); row1.createCell(2).setCellValue("57.49"); row1.createCell(3).setCellValue("501230"); } @@ -376,9 +376,9 @@ public class AddressAnalyController { /** - * 获取地址分析结果 + * 鑾峰彇鍦板潃鍒嗘瀽缁撴灉 * @author yinjihuan - * @date 2016年6月24日 + * @date 2016骞�6鏈�24鏃� * @param model * @return */ @@ -395,9 +395,9 @@ public class AddressAnalyController { result.setFileName(addressTask.getFileName()); result.setFinishDate(DateUtil.formatByPattern(addressTask.getFinishDate(), "yyyy-MM-dd HH:mm")); - //根据任务ID查询分析的结果数据 + //鏍规嵁浠诲姟ID鏌ヨ鍒嗘瀽鐨勭粨鏋滄暟鎹� AnalyticsOverview overview = analyticsOverviewService.getAnalyticsOverview(taskId); - //区域个数信息 + //鍖哄煙涓暟淇℃伅 List regionInfos = new ArrayList(); List addressRegionCountList = addressRegionCountService.queryAddressRegionCountByTaskId(model.getTaskId(), model.getQueryCity()); for (AddressRegionCount addReg : addressRegionCountList) { @@ -405,7 +405,7 @@ public class AddressAnalyController { } result.setRegionInfos(regionInfos); - //价格区间个数信息 + //浠锋牸鍖洪棿涓暟淇℃伅 List priceSectionInfos = new ArrayList(); Map totalPriceMap = overview.getTotalPriceDistribution(); for (String key : totalPriceMap.keySet()) { @@ -413,7 +413,7 @@ public class AddressAnalyController { } result.setPriceSectionInfos(priceSectionInfos); - //房产总价走势信息 + //鎴夸骇鎬讳环璧板娍淇℃伅 List districtTotalPriceInfos = new ArrayList(); Map totalAssetsMap = overview.getTotalAssetsTrend(); for (String key : totalAssetsMap.keySet()) { @@ -422,10 +422,10 @@ public class AddressAnalyController { result.setDistrictTotalPriceInfos(districtTotalPriceInfos); if(districtTotalPriceInfos.size() > 0){ - //房产总价 + //鎴夸骇鎬讳环 result.setDistrictTotalPrice(districtTotalPriceInfos.get(districtTotalPriceInfos.size()-1).getTotalPrice()); if (model.getType().equals("yingxiao")){ - //住宅类型数量信息 + //浣忓畢绫诲瀷鏁伴噺淇℃伅 List districtTypeCountInfos = new ArrayList(); Map estateTypeMap = overview.getEstateTypeDistribution(); for (String key : estateTypeMap.keySet()) { @@ -433,7 +433,7 @@ public class AddressAnalyController { } result.setDistrictTypeCountInfos(districtTypeCountInfos); - //房价客户价值信息 + //鎴夸环瀹㈡埛浠峰�间俊鎭� List> totalPriceAndCustomerValues = new ArrayList>(); List results = addressAnalyticsResultService.queryAddressAnalyticsResults(taskId); @@ -454,7 +454,7 @@ public class AddressAnalyController { } if (model.getType().equals("fengkong")){ - //涨跌幅信息 + //娑ㄨ穼骞呬俊鎭� List> totalPriceAndFloatInfos = new ArrayList>(); List results = addressAnalyticsResultService.queryAddressAnalyticsResults(taskId); for (AddressAnalyticsResult re : results) { @@ -472,7 +472,7 @@ public class AddressAnalyController { dieZhangFuInfos.add(new DistrictFloatInfo("fall", addressAnalyticsResultService.queryDistrictFloatInfo(taskId, "fall"))); result.setDieZhangFuInfos(dieZhangFuInfos); - //贷款余额信息 + //璐锋浣欓淇℃伅 List> totalPriceAndBalanceInfos = new ArrayList>(); for (AddressAnalyticsResult re : results) { if(re.getTotalPrice() != null) { @@ -497,9 +497,9 @@ public class AddressAnalyController { } /** - * 获取贷款余额LVR预警数据 + * 鑾峰彇璐锋浣欓LVR棰勮鏁版嵁 * @author yinjihuan - * @date 2016年6月28日 + * @date 2016骞�6鏈�28鏃� * @param model * @return */ @@ -530,10 +530,10 @@ public class AddressAnalyController { } /** - * 查询解析后的价格数据,百度地图展示用 + * 鏌ヨ瑙f瀽鍚庣殑浠锋牸鏁版嵁锛岀櫨搴﹀湴鍥惧睍绀虹敤 * * @author yinjihuan - * @date 2016年6月27日 + * @date 2016骞�6鏈�27鏃� * @param model * @return */ @@ -541,7 +541,7 @@ public class AddressAnalyController { AddressAnalyJsonModel result = new AddressAnalyJsonModel(); if(model.getCurPage() == null) model.setCurPage(1); if(model.getPageSize() == null) model.setPageSize(100); - //地址解析后的价格信息 地图上显示 + //鍦板潃瑙f瀽鍚庣殑浠锋牸淇℃伅 鍦板浘涓婃樉绀� List addressAnalyPriceInfos = new ArrayList(); //List addressAnalyticList = addressAnalyticsResultService.queryAddressAnalyticsResultByTaskId(model.getTaskId(), model.getCurPage(), model.getPageSize()); List addressAnalyticList = addressAnalyticsResultService.queryAddressAnalyticsResultByTaskId(model.getTaskId(), model.getCurPage(), Integer.MAX_VALUE); @@ -560,9 +560,9 @@ public class AddressAnalyController { } /** - * 导出图表数据 + * 瀵煎嚭鍥捐〃鏁版嵁 * @author yinjihuan - * @date 2016年6月28日 + * @date 2016骞�6鏈�28鏃� * @param model * @return */ @@ -570,30 +570,30 @@ public class AddressAnalyController { OutputStream os = null; BufferedOutputStream fos = null; String[] titles = null; - String fileName = "模板.xls"; + String fileName = "妯℃澘.xls"; List datas = new ArrayList(); List results = addressAnalyticsResultService.queryAddressAnalyticsResults(model.getTaskId()); if(model.getType().equals("diezhanfu")) { - fileName = "房产总价与涨跌幅数据_"+model.getStart()+"-"+model.getEnd()+".xls"; - titles = new String[]{"城市","地址", "面积", "贷款余额", "房价(元)", "涨跌幅"}; + fileName = "鎴夸骇鎬讳环涓庢定璺屽箙鏁版嵁_"+model.getStart()+"-"+model.getEnd()+".xls"; + titles = new String[]{"鍩庡競","鍦板潃", "闈㈢Н", "璐锋浣欓", "鎴夸环(鍏�)", "娑ㄨ穼骞�"}; processDieZhanFu(model, datas, results); } else if(model.getType().equals("daikuan")) { - fileName = "房产总价与贷款余额数据_"+model.getStart()+"-"+model.getEnd()+".xls"; - titles = new String[]{"城市","地址", "面积", "贷款余额", "房价(元)"}; + fileName = "鎴夸骇鎬讳环涓庤捶娆句綑棰濇暟鎹甠"+model.getStart()+"-"+model.getEnd()+".xls"; + titles = new String[]{"鍩庡競","鍦板潃", "闈㈢Н", "璐锋浣欓", "鎴夸环(鍏�)"}; processDaikuan(model, datas, results); } else if(model.getType().equals("jiazhiPrice")) { - fileName = "房产总价数据_"+model.getStart()+"-"+model.getEnd()+".xls"; - titles = new String[]{"城市","地址", "面积", "客户价值指数", "房价(元)"}; + fileName = "鎴夸骇鎬讳环鏁版嵁_"+model.getStart()+"-"+model.getEnd()+".xls"; + titles = new String[]{"鍩庡競","鍦板潃", "闈㈢Н", "瀹㈡埛浠峰�兼寚鏁�", "鎴夸环(鍏�)"}; processJiaZhiPrice(model, datas, results); } else if(model.getType().equals("jiazhiPriceAndValue")) { - fileName = "房产总价与客户价值数据_"+model.getStart()+"-"+model.getEnd()+".xls"; - titles = new String[]{"城市","地址", "面积", "客户价值指数", "房价(元)"}; + fileName = "鎴夸骇鎬讳环涓庡鎴蜂环鍊兼暟鎹甠"+model.getStart()+"-"+model.getEnd()+".xls"; + titles = new String[]{"鍩庡競","鍦板潃", "闈㈢Н", "瀹㈡埛浠峰�兼寚鏁�", "鎴夸环(鍏�)"}; processJiaZhiPriceAndValue(model, datas, results); }else if(model.getType().equals("fengkong")) { AddressTask task = addressTaskService.findTaskById(model.getTaskId()); fileName = task.getFileName().substring(0, task.getFileName().lastIndexOf("."))+".xls"; - titles = new String[]{"城市","地址", "面积", "贷款余额", "房产总价"}; + titles = new String[]{"鍩庡競","鍦板潃", "闈㈢Н", "璐锋浣欓", "鎴夸骇鎬讳环"}; List addressDetails = addressDetailService.findAddressDetailById(model.getTaskId()); Map resultMap = getAnalyticsMap(results); @@ -613,7 +613,7 @@ public class AddressAnalyController { List addressDetails = addressDetailService.findAddressDetailById(model.getTaskId()); Map resultMap = getAnalyticsMap(results); fileName = task.getFileName().substring(0, task.getFileName().lastIndexOf("."))+".xls"; - titles = new String[]{"城市","地址", "面积", "客户价值指数", "房产总价"}; + titles = new String[]{"鍩庡競","鍦板潃", "闈㈢Н", "瀹㈡埛浠峰�兼寚鏁�", "鎴夸骇鎬讳环"}; for (AddressDetail detail : addressDetails) { AddressAnalyticsResult analy = resultMap.get(detail.getNumber()); if(analy == null){ @@ -629,14 +629,14 @@ public class AddressAnalyController { try { HttpServletResponse response = ActionContext.getContext().getResponse(); response.setCharacterEncoding("UTF-8"); - //response.reset();// 清空输出流 + //response.reset();// 娓呯┖杈撳嚭娴� response.setContentType("application/x-download;charset=UTF-8"); fileName = new String(fileName.getBytes("GBK"),"ISO-8859-1"); - if(fileName.length()>150){//解决IE 6.0 bug + if(fileName.length()>150){//瑙e喅IE 6.0 bug fileName = new String(fileName.getBytes("GBK"),"ISO-8859-1"); } response.setHeader( "Content-Disposition", "attachment;filename=" + fileName); - os = response.getOutputStream();// 取得输出流 + os = response.getOutputStream();// 鍙栧緱杈撳嚭娴� wb.write(os); os.flush(); } catch (Exception e) { @@ -708,7 +708,7 @@ public class AddressAnalyController { List datas, List results) { for (AddressAnalyticsResult re : results) { if(re.getTotalPrice() != null && re.getCustomerValue() != null) { - //客户价值判断 + //瀹㈡埛浠峰�煎垽鏂� boolean flag = false; if(model.getOperateType().equals(1)){ if(re.getCustomerValue() >= model.getStart()){ @@ -723,7 +723,7 @@ public class AddressAnalyController { continue; } boolean flag2 = false; - //房产总价判断 + //鎴夸骇鎬讳环鍒ゆ柇 if(model.getOperateType2().equals(1)){ if(re.getTotalPrice() >= model.getEnd() * 10000){ flag2 = true; @@ -786,9 +786,9 @@ public class AddressAnalyController { this.addressAnalyApplyService = addressAnalyApplyService; } /** - * 判断用户是否存在完成的任务 + * 鍒ゆ柇鐢ㄦ埛鏄惁瀛樺湪瀹屾垚鐨勪换鍔� * @author yinjihuan - * @date 2016年6月29日 + * @date 2016骞�6鏈�29鏃� * @param userId * @return */ diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/AddressEvaluationController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/AddressEvaluationController.java index aa1e20b0a..41f19218a 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/AddressEvaluationController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/AddressEvaluationController.java @@ -46,7 +46,7 @@ public class AddressEvaluationController { Date curTime = new Date(); String ip = AnalyticsUtil.getIpAddress(req); - System.out.println("批量估价: "+ip); + System.out.println("鎵归噺浼颁环: "+ip); //if(curTime.getTime() < startTestTime.getTime() && !ip.equals("116.247.70.58")){ // model.setShowFlag("false"); //} @@ -82,22 +82,22 @@ public class AddressEvaluationController { OutputStream os = null; BufferedOutputStream fos = null; - String fileName = "地址估价结果.xls"; + String fileName = "鍦板潃浼颁环缁撴灉.xls"; if(StringUtils.isNotBlank(uploadVerion)){ List addressResults = addressInfoService.findAllAnalyAddress(uploadVerion); - //String[] titles = new String[]{"省","市","区域","小区名称","产证地址","面积","楼层","总楼层","建成年代","匹配名称","匹配可信度","总价","估价类型","最终价格","房价网均价","房估估均价","云估价均价","链家均价","安居客均价","赶集网均价","搜房网均价","兔博士均价","价格对比"}; - String[] titles = new String[]{"省","市","区域","小区名称","产证地址","面积","楼层","总楼层","建成年代","最终价格"}; + //String[] titles = new String[]{"鐪�","甯�","鍖哄煙","灏忓尯鍚嶇О","浜ц瘉鍦板潃","闈㈢Н","妤煎眰","鎬绘ゼ灞�","寤烘垚骞翠唬","鍖归厤鍚嶇О","鍖归厤鍙俊搴�","鎬讳环","浼颁环绫诲瀷","鏈�缁堜环鏍�","鎴夸环缃戝潎浠�","鎴夸及浼板潎浠�","浜戜及浠峰潎浠�","閾惧鍧囦环","瀹夊眳瀹㈠潎浠�","璧堕泦缃戝潎浠�","鎼滄埧缃戝潎浠�","鍏斿崥澹潎浠�","浠锋牸瀵规瘮"}; + String[] titles = new String[]{"鐪�","甯�","鍖哄煙","灏忓尯鍚嶇О","浜ц瘉鍦板潃","闈㈢Н","妤煎眰","鎬绘ゼ灞�","寤烘垚骞翠唬","鏈�缁堜环鏍�"}; List datas = new ArrayList(); for(AddressInfo info : addressResults){ String way = ""; if("house".equals(info.getEvaluateWay())){ - way = "房源估价"; + way = "鎴挎簮浼颁环"; }else if("cpdb".equals(info.getEvaluateWay())){ - way = "小区估价"; + way = "灏忓尯浼颁环"; }else if("geo".equals(info.getEvaluateWay())){ - way = "周边估价"; + way = "鍛ㄨ竟浼颁环"; } //datas.add(new Object[] {info.getProvince(), info.getCity(), info.getRegion(), info.getDistrictName(), info.getAddress(), info.getArea(), info.getFloor(), info.getHeight(), info.getBuildDate(),info.getMatchName(), info.getEvalCredit(), info.getTotalPrice(), way, info.getLastPrice(),info.getFjwPrice(), info.getFggPrice(), info.getYgjPrice(), info.getLianjiaPrice(), info.getAjkPrice(), info.getGanjiPrice(), info.getSoufunPrice(), info.getTbsPrice(), info.getPriceLevel()}); datas.add(new Object[] {info.getProvince(), info.getCity(), info.getRegion(), info.getDistrictName(), info.getAddress(), info.getArea(), info.getFloor(), info.getHeight(), info.getBuildDate(), info.getLastPrice()}); @@ -107,14 +107,14 @@ public class AddressEvaluationController { try { HttpServletResponse response = ActionContext.getContext().getResponse(); response.setCharacterEncoding("UTF-8"); - //response.reset();// 清空输出流 + //response.reset();// 娓呯┖杈撳嚭娴� response.setContentType("application/x-download;charset=UTF-8"); fileName = new String(fileName.getBytes("GBK"),"ISO-8859-1"); - if(fileName.length()>150){//解决IE 6.0 bug + if(fileName.length()>150){//瑙e喅IE 6.0 bug fileName = new String(fileName.getBytes("GBK"),"ISO-8859-1"); } response.setHeader( "Content-Disposition", "attachment;filename=" + fileName); - os = response.getOutputStream();// 取得输出流 + os = response.getOutputStream();// 鍙栧緱杈撳嚭娴� wb.write(os); os.flush(); } catch (Exception e) { diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/AdvisoryMoreController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/AdvisoryMoreController.java index d6353f2eb..ef6ce8b77 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/AdvisoryMoreController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/AdvisoryMoreController.java @@ -8,27 +8,27 @@ import com.fangjia.coresite.model.ContractModel; /** - * 估价 + * 浼颁环 * */ public class AdvisoryMoreController { public Object commAdvisoryAction(ContractModel model) throws Exception { Map map = new HashMap(); - map.put(1, "房产估值"); - map.put(2, "地址分析"); - map.put(3, "反欺诈"); - map.put(4, "精准营销"); - map.put(5, "商业选址"); - map.put(6, "分析报告"); - map.put(7, "面向银行的解决方案"); - map.put(8, "面向互联网金融的解决方案"); - map.put(9, "面向传统金融的解决方案"); - map.put(10, "面向征信机构的解决方案"); - map.put(11, "面向政府职能的解决方案"); - map.put(12, "面向商业连锁的解决方案"); - map.put(13, "面向评估机构的解决方案"); - map.put(14, "面向更多用户的解决方案"); + map.put(1, "鎴夸骇浼板��"); + map.put(2, "鍦板潃鍒嗘瀽"); + map.put(3, "鍙嶆璇�"); + map.put(4, "绮惧噯钀ラ攢"); + map.put(5, "鍟嗕笟閫夊潃"); + map.put(6, "鍒嗘瀽鎶ュ憡"); + map.put(7, "闈㈠悜閾惰鐨勮В鍐虫柟妗�"); + map.put(8, "闈㈠悜浜掕仈缃戦噾铻嶇殑瑙e喅鏂规"); + map.put(9, "闈㈠悜浼犵粺閲戣瀺鐨勮В鍐虫柟妗�"); + map.put(10, "闈㈠悜寰佷俊鏈烘瀯鐨勮В鍐虫柟妗�"); + map.put(11, "闈㈠悜鏀垮簻鑱岃兘鐨勮В鍐虫柟妗�"); + map.put(12, "闈㈠悜鍟嗕笟杩為攣鐨勮В鍐虫柟妗�"); + map.put(13, "闈㈠悜璇勪及鏈烘瀯鐨勮В鍐虫柟妗�"); + map.put(14, "闈㈠悜鏇村鐢ㄦ埛鐨勮В鍐虫柟妗�"); map.put(15, model.getMess()); Integer from = model.getFrom(); if(from!=null){ diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/AgreementController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/AgreementController.java index 714835cc0..afe78c5a8 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/AgreementController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/AgreementController.java @@ -46,7 +46,7 @@ import sun.misc.BASE64Decoder; import sun.misc.BASE64Encoder; /** - * 用户服务协议 + * 鐢ㄦ埛鏈嶅姟鍗忚 */ public class AgreementController { @@ -65,25 +65,25 @@ public class AgreementController { } private Map bankMap = new HashMap(){{ - put("中国工商银行", "ICBC"); - put("中国银行","BOC"); - put("中国建设银行", "CCB"); - put("中国邮政储蓄银行","PSBC"); - put("中信银行","ECITIC"); - put("中国光大银行","CEB"); - put("招商银行","CMBCHINA"); - put("兴业银行","CIB"); - put("浦东发展银行","SPDB"); - put("平安银行","SZPA"); - put("民生银行","CMBC"); - put("广发银行","GDB"); - put("北京银行","BCCB"); - put("中国农业银行", "ABC"); - put("中国交通银行","BOCO"); + put("涓浗宸ュ晢閾惰", "ICBC"); + put("涓浗閾惰","BOC"); + put("涓浗寤鸿閾惰", "CCB"); + put("涓浗閭斂鍌ㄨ搫閾惰","PSBC"); + put("涓俊閾惰","ECITIC"); + put("涓浗鍏夊ぇ閾惰","CEB"); + put("鎷涘晢閾惰","CMBCHINA"); + put("鍏翠笟閾惰","CIB"); + put("娴︿笢鍙戝睍閾惰","SPDB"); + put("骞冲畨閾惰","SZPA"); + put("姘戠敓閾惰","CMBC"); + put("骞垮彂閾惰","GDB"); + put("鍖椾含閾惰","BCCB"); + put("涓浗鍐滀笟閾惰", "ABC"); + put("涓浗浜ら�氶摱琛�","BOCO"); }}; /** - * 用户服务协议页面 + * 鐢ㄦ埛鏈嶅姟鍗忚椤甸潰 * @param model * @return */ @@ -113,7 +113,7 @@ public class AgreementController { if(loanAgreement.getCardStatus()==1){ model.setReload(1); } - if(loanAgreement.getSignStatus()!=0){ //流程已走完(已签约或拒签或失效) + if(loanAgreement.getSignStatus()!=0){ //娴佺▼宸茶蛋瀹岋紙宸茬绾︽垨鎷掔鎴栧け鏁堬級 model.setReload(2); } model.setSignStatus(loanAgreement.getSignStatus()); @@ -127,7 +127,7 @@ public class AgreementController { } /** - * 提交绑定银行卡 + * 鎻愪氦缁戝畾閾惰鍗� * @param model * @return */ @@ -137,7 +137,7 @@ public class AgreementController { Agreement agreement = agreementService.findById(model.getId()); if(agreement.getStatus() == 0){ map.put("success", false); - map.put("msg", "该条协议已废除"); + map.put("msg", "璇ユ潯鍗忚宸插簾闄�"); return JsonUtils.toJson(map); } LoanAgreement loanAgreement = loanAgreementService.findById(model.getLoanAgreementId()); @@ -152,7 +152,7 @@ public class AgreementController { map.put("requestno",model.getRequestno()); if(resultMap.get("errorcode")!=null && "DK8010046".equals(resultMap.get("errorcode").toString())){ map.put("success", false); - map.put("msg", "请一分钟以后再进行操作"); + map.put("msg", "璇蜂竴鍒嗛挓浠ュ悗鍐嶈繘琛屾搷浣�"); return JsonUtils.toJson(map); } if((bankMap.get(model.getBank())).equals(resultMap.get("bankcode"))){ @@ -170,7 +170,7 @@ public class AgreementController { map.put("success", true); }else{ map.put("success", false); - map.put("msg", "银行信息填写错误"); + map.put("msg", "閾惰淇℃伅濉啓閿欒"); } }else{ map.put("success", false); @@ -182,13 +182,13 @@ public class AgreementController { } }else{ map.put("success", false); - map.put("msg", "认证失败"); + map.put("msg", "璁よ瘉澶辫触"); } } catch (Exception e) { map.put("success", false); - map.put("msg", "认证失败"); + map.put("msg", "璁よ瘉澶辫触"); } }else{ @@ -201,7 +201,7 @@ public class AgreementController { } /** - * 重发短信 + * 閲嶅彂鐭俊 * @param model * @return */ @@ -219,10 +219,10 @@ public class AgreementController { yoprequest.addParam(s.getKey(), s.getValue()); } LOGGER.error("yoprequest:"+yoprequest.getParams()); - //向YOP发请求 + //鍚慪OP鍙戣姹� YopResponse yopresponse = YopClient3.postRsa(FangjiaConfig.getConfig().get("authbindcardresend","/rest/v1.0/paperorder/auth/resend"), yoprequest); LOGGER.error("yoprequest result:"+yopresponse.toString()); - //成功则进行相关处理 + //鎴愬姛鍒欒繘琛岀浉鍏冲鐞� Map resultMap = new HashMap(); if (yopresponse.getStringResult() != null) { resultMap = JXMConvertUtil.JsonConvertHashMap(yopresponse.getStringResult()); @@ -243,17 +243,17 @@ public class AgreementController { } }else{ map.put("success", false); - map.put("msg", "认证失败"); + map.put("msg", "璁よ瘉澶辫触"); } } catch (Exception e) { map.put("success", false); - map.put("msg", "认证失败"); + map.put("msg", "璁よ瘉澶辫触"); } return JsonUtils.toJson(map); } /** - * 确认绑卡 + * 纭缁戝崱 * @param model * @return */ @@ -275,10 +275,10 @@ public class AgreementController { yoprequest.addParam(s.getKey(), s.getValue()); } LOGGER.error("yoprequest:"+yoprequest.getParams()); - //向YOP发请求 + //鍚慪OP鍙戣姹� YopResponse yopresponse = YopClient3.postRsa(FangjiaConfig.getConfig().get("authbindcardconfirm","/rest/v1.0/paperorder/auth/confirm"), yoprequest); LOGGER.error("yoprequest result:"+yopresponse.toString()); - //成功则进行相关处理 + //鎴愬姛鍒欒繘琛岀浉鍏冲鐞� Map resultMap = new HashMap(); if (yopresponse.getStringResult() != null) { resultMap = JXMConvertUtil.JsonConvertHashMap(yopresponse.getStringResult()); @@ -301,13 +301,13 @@ public class AgreementController { } }else{ map.put("success", false); - map.put("msg", "认证失败"); + map.put("msg", "璁よ瘉澶辫触"); } } catch (Exception e) { map.put("success", false); - map.put("msg", "认证失败"); + map.put("msg", "璁よ瘉澶辫触"); } }else{ @@ -320,17 +320,17 @@ public class AgreementController { } /** - * 代扣交易接口 + * 浠f墸浜ゆ槗鎺ュ彛 * @param request * @param response * @return * @throws Exception */ private Map checkCard(AgreementModel model,HttpServletResponse response,HttpServletRequest request) throws Exception{ - String acc_no = model.getCardNumber();//银行卡卡号 - String id_card = model.getNumber();//身份证号码 - String id_holder = model.getName();//姓名 - String mobile = model.getMobile();//银行预留手机号 + String acc_no = model.getCardNumber();//閾惰鍗″崱鍙� + String id_card = model.getNumber();//韬唤璇佸彿鐮� + String id_holder = model.getName();//濮撳悕 + String mobile = model.getMobile();//閾惰棰勭暀鎵嬫満鍙� Map paramMap = wrapBindParams(acc_no,id_card,id_holder,mobile); model.setMerchantno(paramMap.get("merchantno")); model.setRequestno(paramMap.get("requestno")); @@ -341,10 +341,10 @@ public class AgreementController { yoprequest.addParam(s.getKey(), s.getValue()); } LOGGER.error("yoprequest:"+yoprequest.getParams()); - //向YOP发请求 + //鍚慪OP鍙戣姹� YopResponse yopresponse = YopClient3.postRsa(FangjiaConfig.getConfig().get("authbindcardreqUri","/rest/v1.0/paperorder/unified/auth/request"), yoprequest); LOGGER.error("yoprequest result:"+yopresponse.toString()); - //成功则进行相关处理 + //鎴愬姛鍒欒繘琛岀浉鍏冲鐞� Map result = new HashMap(); if (yopresponse.getStringResult() != null) { result = JXMConvertUtil.JsonConvertHashMap(yopresponse.getStringResult()); @@ -353,27 +353,27 @@ public class AgreementController { } /** - * 封装绑卡验证参数 - * acc_no 银行卡卡号 - * id_card 身份证号码 - * id_holder 姓名 - * mobile 银行预留手机号 + * 灏佽缁戝崱楠岃瘉鍙傛暟 + * acc_no 閾惰鍗″崱鍙� + * id_card 韬唤璇佸彿鐮� + * id_holder 濮撳悕 + * mobile 閾惰棰勭暀鎵嬫満鍙� */ private Map wrapBindParams(String acc_no,String id_card,String id_holder,String mobile){ - String merchantno = format(FangjiaConfig.getConfig().get("merchantno","10000469946")); //商户编号 - String requestno = UUID.randomUUID().toString().replace("-", ""); //业务请求号 + String merchantno = format(FangjiaConfig.getConfig().get("merchantno","10000469946")); //鍟嗘埛缂栧彿 + String requestno = UUID.randomUUID().toString().replace("-", ""); //涓氬姟璇锋眰鍙� - String identityid = format(id_card); //用户标识 - String identitytype = "ID_CARD"; //用户标识类型 - String cardno = format(acc_no); //卡号 - String idcardno = format(id_card); //证件号 - String idcardtype = "ID"; //证件类型 - String username = format(id_holder); //用户名 - String phone = format(mobile); //手机号 - String issms = "true"; //是否有短信验证码 - //String callbackurl = format(request.getParameter("callbackurl")); //回调地址 + String identityid = format(id_card); //鐢ㄦ埛鏍囪瘑 + String identitytype = "ID_CARD"; //鐢ㄦ埛鏍囪瘑绫诲瀷 + String cardno = format(acc_no); //鍗″彿 + String idcardno = format(id_card); //璇佷欢鍙� + String idcardtype = "ID"; //璇佷欢绫诲瀷 + String username = format(id_holder); //鐢ㄦ埛鍚� + String phone = format(mobile); //鎵嬫満鍙� + String issms = "true"; //鏄惁鏈夌煭淇¢獙璇佺爜 + //String callbackurl = format(request.getParameter("callbackurl")); //鍥炶皟鍦板潃 String requesttime = DateUtil.formatByPattern(new Date(),"yyyy-MM-dd HH:mm:ss");; - String authtype = "COMMON_FOUR"; //鉴权类型 + String authtype = "COMMON_FOUR"; //閴存潈绫诲瀷 Map map = new HashMap(); map.put("merchantno", merchantno); @@ -396,7 +396,7 @@ public class AgreementController { } /** - * 明文参数 + * 鏄庢枃鍙傛暟 * @param Url * @param Parms * @return @@ -412,40 +412,40 @@ public class AgreementController { }*/ /** - * Base64加密 + * Base64鍔犲瘑 */ public static String Base64Encode(String str) throws UnsupportedEncodingException { return new BASE64Encoder().encode(str.getBytes("UTF-8")); } /** - * 解密 + * 瑙e瘑 */ public static String Base64Decode(String str) throws UnsupportedEncodingException, IOException { // str = str.replaceAll(" ", "+"); return new String(new BASE64Decoder().decodeBuffer(str), "UTF-8"); } /** - * 签名保存图片 + * 绛惧悕淇濆瓨鍥剧墖 * @param model * @param request * @return */ public Object uploadImageAction(AgreementModel model,HttpServletRequest request) { Map map = new HashMap(); - // 通过base64来转化图片 + // 閫氳繃base64鏉ヨ浆鍖栧浘鐗� String imageFile = model.getImageFile(); if(StringUtils.isBlank(imageFile)){ map.put("success", false); return JsonUtils.toJson(map); } BASE64Decoder decoder = new BASE64Decoder(); - // Base64解码 + // Base64瑙g爜 byte[] imageByte = null; try { imageByte = decoder.decodeBuffer(imageFile); for (int i = 0; i < imageByte.length; ++i) { - if (imageByte[i] < 0) {// 调整异常数据 + if (imageByte[i] < 0) {// 璋冩暣寮傚父鏁版嵁 imageByte[i] += 256; } } @@ -480,7 +480,7 @@ public class AgreementController { if(agreement != null){ if(agreement.getStatus() == 0){ map.put("success", false); - map.put("msg", "该条协议已废除"); + map.put("msg", "璇ユ潯鍗忚宸插簾闄�"); return JsonUtils.toJson(map); } String link = jsonObj.getJSONObject("result").getString("link"); @@ -506,7 +506,7 @@ public class AgreementController { } /** - * 拒签 + * 鎷掔 * @param model * @return */ @@ -518,7 +518,7 @@ public class AgreementController { Agreement agreement = agreementService.findById(model.getId()); if(agreement.getStatus() == 0){ map.put("success", false); - map.put("msg", "该条协议已废除"); + map.put("msg", "璇ユ潯鍗忚宸插簾闄�"); return JsonUtils.toJson(map); } LoanAgreement loanAgreement = loanAgreementService.findById(model.getLoanAgreementId()); @@ -542,7 +542,7 @@ public class AgreementController { } /** - * 完成签约 + * 瀹屾垚绛剧害 * @param model * @return */ @@ -552,14 +552,14 @@ public class AgreementController { Agreement agreement = agreementService.findById(model.getId()); if(agreement.getStatus() == 0){ map.put("success", false); - map.put("msg", "该条协议已废除"); + map.put("msg", "璇ユ潯鍗忚宸插簾闄�"); return JsonUtils.toJson(map); } LoanAgreement loanAgreement = loanAgreementService.findById(model.getLoanAgreementId()); if(loanAgreement.getCardStatus() != 1){ map.put("cardStatus", -1); map.put("success", false); - map.put("msg", "请先认证卡信息"); + map.put("msg", "璇峰厛璁よ瘉鍗′俊鎭�"); return JsonUtils.toJson(map); } if(loanAgreement != null && agreement!=null){ @@ -581,7 +581,7 @@ public class AgreementController { } /*if (StringUtils.isBlank(model.getMobile()) || StringUtils.isBlank(model.getSmsCode())) { map.put("success", false); - map.put("msg", "信息不完整"); + map.put("msg", "淇℃伅涓嶅畬鏁�"); return JsonUtils.toJson(map); } String smsCacheCode = getCacheCode(model.getMobile(), Message.SMS_CODE_TYPE_REG); @@ -603,10 +603,10 @@ public class AgreementController { } /** - * 获取缓存的验证码 + * 鑾峰彇缂撳瓨鐨勯獙璇佺爜 * @author yinjihuan - * @param mobile 手机 - * @param type 类型 + * @param mobile 鎵嬫満 + * @param type 绫诲瀷 * @return */ private String getCacheCode(String mobile, String type) { diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/ApartmentController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/ApartmentController.java index cebce7af8..76e733606 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/ApartmentController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/ApartmentController.java @@ -46,11 +46,11 @@ import com.fangjia.service.web.FangjiaHighlighter; import com.fangjia.service.web.MenuService; /** - * 精品公寓controller + * 绮惧搧鍏瘬controller * * @author Jenis * - * 2018年6月29日 下午14:28:28 + * 2018骞�6鏈�29鏃� 涓嬪崍14:28:28 */ public class ApartmentController { private final static Logger LOGGER = LoggerFactory.getLogger(ApartmentController.class); @@ -62,7 +62,7 @@ public class ApartmentController { private AdvertisementService advertisementService; /** - * 精品公寓列表 + * 绮惧搧鍏瘬鍒楄〃 * * @param model * @param request @@ -70,34 +70,34 @@ public class ApartmentController { * @throws Exception */ public Object listAction(RentHouseModel model, HttpServletRequest request) throws Exception { - LOGGER.info("精品公寓 listAction(RentHouseModel model, HttpServletRequest request) 请求 开始"); - boolean isBlockFormat = false; // 标记是否有不限作为条件 - boolean isStationFormat = false; // 标记是否有不限作为条件 + LOGGER.info("绮惧搧鍏瘬 listAction(RentHouseModel model, HttpServletRequest request) 璇锋眰 寮�濮�"); + boolean isBlockFormat = false; // 鏍囪鏄惁鏈変笉闄愪綔涓烘潯浠� + boolean isStationFormat = false; // 鏍囪鏄惁鏈変笉闄愪綔涓烘潯浠� Pager pager = model.getPager(); if (pager == null) { pager = new Pager(20, FangjiaConfig.getConfig().getSearchListMaxPageNo()); } else { - model.setIsPageQuery("true");// 代表请求过分页 + model.setIsPageQuery("true");// 浠h〃璇锋眰杩囧垎椤� pager.setPageSize(20); pager.setMaxPage(FangjiaConfig.getConfig().getSearchListMaxPageNo()); } if (StringUtils.isNotBlank(model.getKeyword()) && model.getKeyword().length() > 100) { model.setKeyword(model.getKeyword().substring(0, 100)); } - boolean facetByRegion = false;// 是否按区域,板块分面 - // 格式化参数 + boolean facetByRegion = false;// 鏄惁鎸夊尯鍩燂紝鏉垮潡鍒嗛潰 + // 鏍煎紡鍖栧弬鏁� formatParam(model); - if ("不限".equals(model.getBlock())) { + if ("涓嶉檺".equals(model.getBlock())) { model.setBlock(null); isBlockFormat = true; } - if ("不限".equals(model.getStation())) { + if ("涓嶉檺".equals(model.getStation())) { model.setStation(null); isStationFormat = true; } - // 针对精品公寓数据筛选 + // 閽堝绮惧搧鍏瘬鏁版嵁绛涢�� model.setSiteNames(Arrays.asList("ziroom.com", "mogoroom.com", "dankegongyu.com", "zhuge.com", "zhugefang.com")); - // 构造Menu菜单(Menu有缓存) + // 鏋勯�燤enu鑿滃崟(Menu鏈夌紦瀛�) Menu menu = menuService.menuApartmentMaker(FangjiaServerAreaContextHolder.getServerAreaDefault(), MenuCategoryEnum.zufang, getCurrentParams(), 0); @@ -106,59 +106,59 @@ public class ApartmentController { RentHouseQueryBean queryBean = this.buildHouseQueryBean(model); FacetQueryResult result = null; - // 构造排序 + // 鏋勯�犳帓搴� Sort sort = getSort(model); - // 地铁+站点是通过metro_info sonar索引查找 + // 鍦伴搧+绔欑偣鏄�氳繃metro_info sonar绱㈠紩鏌ユ壘 result = rentHouseService.findWithFacetSearchNoRemoveMenu(menu, pager, queryBean, sort.getFld(), sort.isAsc(), facetByRegion); - // 当result查找为空, 仅用当前城市过滤查出房源为'猜您喜欢' - // 页面Menu参数回显不用处理, 就是让用户知道参数筛选无数据 + // 褰搑esult鏌ユ壘涓虹┖, 浠呯敤褰撳墠鍩庡競杩囨护鏌ュ嚭鎴挎簮涓�'鐚滄偍鍠滄' + // 椤甸潰Menu鍙傛暟鍥炴樉涓嶇敤澶勭悊, 灏辨槸璁╃敤鎴风煡閬撳弬鏁扮瓫閫夋棤鏁版嵁 if (CollectionUtils.isEmpty(result)) { - // 重置筛选条件 + // 閲嶇疆绛涢�夋潯浠� RentHouseModel model_ = new RentHouseModel(); BeanUtils.copyProperties(model, model_); resetParam(model_); - // 重置pager, 猜您喜欢, 只查3条 + // 閲嶇疆pager, 鐚滄偍鍠滄, 鍙煡3鏉� pager = new Pager(3, FangjiaConfig.getConfig().getSearchListMaxPageNo()); Menu menu_similar = menuService.menuApartmentMaker(FangjiaServerAreaContextHolder.getServerAreaDefault(), MenuCategoryEnum.zufang, getCurrentParams(), 0); RentHouseQueryBean queryBean_ = this.buildHouseQueryBean(model_); FacetQueryResult result_ = null; - // 构造排序 + // 鏋勯�犳帓搴� Sort sort_ = getSort(model_); result_ = rentHouseService.findWithFacetSearchNoRemoveMenu(menu_similar, pager, queryBean_, sort_.getFld(), sort_.isAsc(), facetByRegion); - // 构造pager + // 鏋勯�爌ager pager = safeCheckPager(result_.getNumberFound(), pager); model.setPager(pager); - // 精品公寓查询 + // 绮惧搧鍏瘬鏌ヨ model.setSimilarHouseBoList(feedAndFilterHouseBoList(result_, model)); } else { - // 构造pager + // 鏋勯�爌ager pager = safeCheckPager(result.getNumberFound(), pager); model.setPager(pager); - // 精品公寓查询 + // 绮惧搧鍏瘬鏌ヨ model.setHouseBoList(feedAndFilterHouseBoList(result, model)); } model.setMenu(changeMenu(menu, menu_)); - // 房源列表中间的广告 + // 鎴挎簮鍒楄〃涓棿鐨勫箍鍛� List ads1 = getAdvertisements(AdSourceEnum.RENT_HOUSE_M_DETAIL.getId()); - // 房源列表上面广告 + // 鎴挎簮鍒楄〃涓婇潰骞垮憡 List ads2 = getAdvertisements(AdSourceEnum.RENT_HOUSE_T_DETAIL.getId()); model.setMidAdList(ads1); model.setTopAdList(ads2); - LOGGER.info("精品公寓 listAction(RentHouseModel model, HttpServletRequest request) 请求 结束"); + LOGGER.info("绮惧搧鍏瘬 listAction(RentHouseModel model, HttpServletRequest request) 璇锋眰 缁撴潫"); if (isBlockFormat) { - model.setBlock("不限"); + model.setBlock("涓嶉檺"); } if (isStationFormat) { - model.setStation("不限"); + model.setStation("涓嶉檺"); } return model; } /** - * 精品公寓列表 + * 绮惧搧鍏瘬鍒楄〃 * * @param model * @param request @@ -176,26 +176,26 @@ public class ApartmentController { if (StringUtils.isNotBlank(model.getKeyword()) && model.getKeyword().length() > 100) { model.setKeyword(model.getKeyword().substring(0, 100)); } - boolean facetByRegion = false;// 是否按区域,板块分面 - // 格式化参数 + boolean facetByRegion = false;// 鏄惁鎸夊尯鍩燂紝鏉垮潡鍒嗛潰 + // 鏍煎紡鍖栧弬鏁� formatParam(model); - // 针对精品公寓数据筛选 + // 閽堝绮惧搧鍏瘬鏁版嵁绛涢�� model.setSiteNames(Arrays.asList("ziroom.com", "mogoroom.com", "dankegongyu.com")); - // 构造Menu菜单(Menu有缓存) + // 鏋勯�燤enu鑿滃崟(Menu鏈夌紦瀛�) Menu menu = menuService.menuApartmentMaker(FangjiaServerAreaContextHolder.getServerAreaDefault(), MenuCategoryEnum.zufang, getCurrentParams(), 0); RentHouseQueryBean queryBean = this.buildHouseQueryBean(model); FacetQueryResult result = null; - // 构造排序 + // 鏋勯�犳帓搴� Sort sort = getSort(model); - // 地铁+站点是通过metro_info sonar索引查找 + // 鍦伴搧+绔欑偣鏄�氳繃metro_info sonar绱㈠紩鏌ユ壘 result = rentHouseService.findWithFacetSearchNoRemoveMenu(menu, pager, queryBean, sort.getFld(), sort.isAsc(), facetByRegion); - // 构造pager + // 鏋勯�爌ager pager = safeCheckPager(result.getNumberFound(), pager); model.setPager(pager); - // 精品公寓查询 + // 绮惧搧鍏瘬鏌ヨ model.setHouseBoList(feedAndFilterHouseBoList(result, model)); JsonModel ret = new JsonModel(); ret.setJsonModel(result); @@ -203,7 +203,7 @@ public class ApartmentController { } /** - * 首页推荐房源 + * 棣栭〉鎺ㄨ崘鎴挎簮 * * @param model * @return @@ -214,7 +214,7 @@ public class ApartmentController { Pager pager = model.getPager(10); Integer menuType = 1; model.setSiteNames(Arrays.asList("ziroom.com", "mogoroom.com", "dankegongyu.com")); - boolean facetByRegion = false;// 是否按区域,板块分面 + boolean facetByRegion = false;// 鏄惁鎸夊尯鍩燂紝鏉垮潡鍒嗛潰 Menu menu = menuService.menuApartmentMaker(FangjiaServerAreaContextHolder.getServerAreaDefault(), MenuCategoryEnum.zufang, getCurrentParams(), 0); @@ -230,7 +230,7 @@ public class ApartmentController { } /** - * 精品公寓详情 + * 绮惧搧鍏瘬璇︽儏 * * @param model * @return @@ -256,7 +256,7 @@ public class ApartmentController { } /** - * 同步最新的Menu(区域、板块不用处理, 只需要处理地铁和站点) + * 鍚屾鏈�鏂扮殑Menu(鍖哄煙銆佹澘鍧椾笉鐢ㄥ鐞�, 鍙渶瑕佸鐞嗗湴閾佸拰绔欑偣) * * @param menu * @param menu_ @@ -267,24 +267,24 @@ public class ApartmentController { List newGroupList = new ArrayList(); boolean changeFlag = false; for (Group group_ : menu_.getGroupList()) { - if (group_.getCaption().equals("区域") || group_.getCaption().equals("板块") || group_.getCaption().equals("面积") - || group_.getCaption().equals("租金") || group_.getCaption().equals("房型") - || group_.getCaption().equals("类型") || group_.getCaption().equals("发布")) { - // 此类型已最Menu初为准 + if (group_.getCaption().equals("鍖哄煙") || group_.getCaption().equals("鏉垮潡") || group_.getCaption().equals("闈㈢Н") + || group_.getCaption().equals("绉熼噾") || group_.getCaption().equals("鎴垮瀷") + || group_.getCaption().equals("绫诲瀷") || group_.getCaption().equals("鍙戝竷")) { + // 姝ょ被鍨嬪凡鏈�Menu鍒濅负鍑� newGroupList.add(group_); - } else if (group_.getCaption().equals("地铁") || group_.getCaption().equals("站点")) { - // 如果menu查询result后, 本身就没有地铁和站点, 也不用显示 - // 始终以后面的menu同步menu_ + } else if (group_.getCaption().equals("鍦伴搧") || group_.getCaption().equals("绔欑偣")) { + // 濡傛灉menu鏌ヨresult鍚�, 鏈韩灏辨病鏈夊湴閾佸拰绔欑偣, 涔熶笉鐢ㄦ樉绀� + // 濮嬬粓浠ュ悗闈㈢殑menu鍚屾menu_ if (!changeFlag) { for (Group group : menu.getGroupList()) { - if (group.getCaption().equals("地铁") || group.getCaption().equals("站点")) { + if (group.getCaption().equals("鍦伴搧") || group.getCaption().equals("绔欑偣")) { newGroupList.add(group); } } changeFlag = true; } } else { - // 未知类型, 暂时也放入 + // 鏈煡绫诲瀷, 鏆傛椂涔熸斁鍏� newGroupList.add(group_); } } @@ -293,7 +293,7 @@ public class ApartmentController { } /** - * 起始位置比总数大,说明当前页数不对,从第一页开始 + * 璧峰浣嶇疆姣旀�绘暟澶э紝璇存槑褰撳墠椤垫暟涓嶅锛屼粠绗竴椤靛紑濮� * * @param maxRow * @param pager @@ -308,7 +308,7 @@ public class ApartmentController { } /** - * 前端Menu统一通过hidden构造到form中 需要处理参数为“” + * 鍓嶇Menu缁熶竴閫氳繃hidden鏋勯�犲埌form涓� 闇�瑕佸鐞嗗弬鏁颁负鈥溾�� * * @param model */ @@ -337,7 +337,7 @@ public class ApartmentController { } /** - * 推荐房源重置筛选条件, 只用当前城市查询 + * 鎺ㄨ崘鎴挎簮閲嶇疆绛涢�夋潯浠�, 鍙敤褰撳墠鍩庡競鏌ヨ * * @param model */ @@ -405,7 +405,7 @@ public class ApartmentController { } /** - * 构造查询queryBean + * 鏋勯�犳煡璇ueryBean * * @param model * @return @@ -422,7 +422,7 @@ public class ApartmentController { queryBean.setFullTextSearch(true); /** - * 如果是命名查询 + * 濡傛灉鏄懡鍚嶆煡璇� */ if (StringUtils.isNotBlank(model.getCustomQuery())) { Customquery customquery = customqueryService.findByName(model.getCustomQuery()); @@ -455,7 +455,7 @@ public class ApartmentController { } /** - * 构造sort + * 鏋勯�爏ort * * @param model * @return @@ -496,7 +496,7 @@ public class ApartmentController { if ("rentPrice".equalsIgnoreCase(sortField)) { sortField = "totalPrice"; } - if ("totalPrice".equals(sortField) || "area".equals(sortField) || "bscore".equals(sortField)) { // TODO:启用bscore作为默认排序后,去除此处的bscore + if ("totalPrice".equals(sortField) || "area".equals(sortField) || "bscore".equals(sortField)) { // TODO:鍚敤bscore浣滀负榛樿鎺掑簭鍚庯紝鍘婚櫎姝ゅ鐨刡score } else { sortField = null; @@ -507,7 +507,7 @@ public class ApartmentController { } /** - * 构造当前request params + * 鏋勯�犲綋鍓峳equest params * * @return */ @@ -518,7 +518,7 @@ public class ApartmentController { for (String key : paramMap.keySet()) { Object[] obj = paramMap.get(key); if (obj != null && obj.length > 0) { - if (!"不限".equals(obj[0].toString())) { + if (!"涓嶉檺".equals(obj[0].toString())) { ret.put(key, obj[0].toString()); } } @@ -580,7 +580,7 @@ public class ApartmentController { } /** - * 加载右侧广告 + * 鍔犺浇鍙充晶骞垮憡 * * @param model * @return diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/ApiController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/ApiController.java index 99a5e8f90..9a34099f6 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/ApiController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/ApiController.java @@ -107,8 +107,8 @@ public class ApiController { List freeApiDetails = new ArrayList(); for (ApiDetail apiDetail : freeApis) { String name = apiDetail.getName(); - if(name.equals("房屋总价")||name.equals("小区均价")||name.equals("区域住宅均价")||name.equals("城市住宅均价")||name.equals("房屋价格走势")||name.equals("小区价格走势") - ||name.equals("小区名址匹配")||name.equals("公交")||name.equals("商场")||name.equals("学校")||name.equals("银行/ATM")||name.equals("小区周边人口密度")){ + if(name.equals("鎴垮眿鎬讳环")||name.equals("灏忓尯鍧囦环")||name.equals("鍖哄煙浣忓畢鍧囦环")||name.equals("鍩庡競浣忓畢鍧囦环")||name.equals("鎴垮眿浠锋牸璧板娍")||name.equals("灏忓尯浠锋牸璧板娍") + ||name.equals("灏忓尯鍚嶅潃鍖归厤")||name.equals("鍏氦")||name.equals("鍟嗗満")||name.equals("瀛︽牎")||name.equals("閾惰/ATM")||name.equals("灏忓尯鍛ㄨ竟浜哄彛瀵嗗害")){ freeApiDetails.add(apiDetail); } } @@ -128,12 +128,12 @@ public class ApiController { JsonModel ret = new JsonModel(); Map data = new HashMap(); - if(user == null){//没有登录 + if(user == null){//娌℃湁鐧诲綍 data.put("info", "fail"); String backUrl = model.getCityUrl()+"/"+model.getMethodName(); data.put("backUrl", URLEncoder.encode(backUrl,"UTF-8")); }else{ - data.put("info", "success");//已登录 + data.put("info", "success");//宸茬櫥褰� } ret.setJsonModel(data); @@ -150,12 +150,12 @@ public class ApiController { JsonModel ret = new JsonModel(); Map data = new HashMap(); - if(user == null){//没有登录 + if(user == null){//娌℃湁鐧诲綍 data.put("info", "fail"); }else{ - data.put("info", "success");//已登录 + data.put("info", "success");//宸茬櫥褰� } - data.put("user", user);//已登录 + data.put("user", user);//宸茬櫥褰� ret.setJsonModel(data); return ret; } @@ -201,9 +201,9 @@ public class ApiController { } /** - * 进入测试申请页面 + * 杩涘叆娴嬭瘯鐢宠椤甸潰 * @author yinjihuan - * @date 2016年6月7日 + * @date 2016骞�6鏈�7鏃� * @param model * @return */ @@ -212,7 +212,7 @@ public class ApiController { model.setApiDetails(apiDetailService.findFreeTestApiDetails()); String userId = LoginUtil.getUserId(request); model.setTabTitle(apiService.getTabTitle(userId)); - if(model.getTabTitle().equals("我的测试申请")){ + if(model.getTabTitle().equals("鎴戠殑娴嬭瘯鐢宠")){ ApiTestApply apply = apiService.getTestApply(userId); if(apply != null) { model.setTabTitle(apply.getAuditSchedule()); @@ -225,9 +225,9 @@ public class ApiController { } /** - * 添加测试申请 + * 娣诲姞娴嬭瘯鐢宠 * @author yinjihuan - * @date 2016年6月7日 + * @date 2016骞�6鏈�7鏃� * @param model * @param request * @return @@ -240,7 +240,7 @@ public class ApiController { FangJiaUser fjUser = fangJiaUserService.getUserById(userId); if(fjUser == null) return result; if(model.getTestFields().split(",").length > 10){ - result.setMsg("测试字段不能超过10个"); + result.setMsg("娴嬭瘯瀛楁涓嶈兘瓒呰繃10涓�"); return result; } if(apiService.getTestApply(userId) == null){ @@ -249,10 +249,10 @@ public class ApiController { String sendMobile = StringUtil.getProperty("api.test.apply.mobile", "fangjia-coresite.properties"); String[] mobiles = sendMobile.split(","); for (String mobile : mobiles) { - smsService.send(mobile, "【房价网】API免费在线测试申请,申请人:"+model.getName()+",账号:"+fjUser.getMobile()+"。请及时审核。"); + smsService.send(mobile, "銆愭埧浠风綉銆慉PI鍏嶈垂鍦ㄧ嚎娴嬭瘯鐢宠,鐢宠浜猴細"+model.getName()+"锛岃处鍙凤細"+fjUser.getMobile()+"銆傝鍙婃椂瀹℃牳銆�"); } } else { - result.setMsg("您已申请过"); + result.setMsg("鎮ㄥ凡鐢宠杩�"); } result.setResult(Message.RESULT_SUCCESS); return result; @@ -263,9 +263,9 @@ public class ApiController { } /** - * 重新申请 + * 閲嶆柊鐢宠 * @author yinjihuan - * @date 2016年6月7日 + * @date 2016骞�6鏈�7鏃� * @param model * @param request * @return @@ -288,9 +288,9 @@ public class ApiController { } } /** - * 获取测试申请记录 + * 鑾峰彇娴嬭瘯鐢宠璁板綍 * @author yinjihuan - * @date 2016年6月8日 + * @date 2016骞�6鏈�8鏃� * @param request * @return */ @@ -300,7 +300,7 @@ public class ApiController { try { String userId = LoginUtil.getUserId(request); if(userId.equals("")){ - result.setMsg("没有登录"); + result.setMsg("娌℃湁鐧诲綍"); } else { ApiTestApply apply = apiService.getTestApply(userId); if(apply != null) { @@ -334,9 +334,9 @@ public class ApiController { } /** - * 获取接口调用记录 + * 鑾峰彇鎺ュ彛璋冪敤璁板綍 * @author yinjihuan - * @date 2016年6月8日 + * @date 2016骞�6鏈�8鏃� * @param request * @return */ @@ -346,7 +346,7 @@ public class ApiController { try { String userId = LoginUtil.getUserId(request); if(userId.equals("")){ - result.setMsg("没有登录"); + result.setMsg("娌℃湁鐧诲綍"); } else { User u = userService.findByUserId(userId); if(u != null) { @@ -355,7 +355,7 @@ public class ApiController { result.setApiKey(apiUser.getAppKey()); } List apiVisitRecords = new ArrayList(); - //查询调用记录 + //鏌ヨ璋冪敤璁板綍 ApiUserAuthority apiUserAuthority = apiUserAuthorityService.findByUserIdNoChahe(apiUser.getId()); if(apiUserAuthority != null){ Map totalMap = apiUserAuthority.getTotalCountMap(); @@ -406,9 +406,9 @@ public class ApiController { } /** - * 进入所有API页面 + * 杩涘叆鎵�鏈堿PI椤甸潰 * @author yinjihuan - * @date 2016年10月9日 + * @date 2016骞�10鏈�9鏃� * @param model * @return */ @@ -424,9 +424,9 @@ public class ApiController { } /** - * 进入API购买申请页面 + * 杩涘叆API璐拱鐢宠椤甸潰 * @author yinjihuan - * @date 2016年10月13日 + * @date 2016骞�10鏈�13鏃� * @return */ public Object apiBuyApplyAction(ApiQueryModel model, HttpServletRequest req) { @@ -439,9 +439,9 @@ public class ApiController { } /** - * 进入API押品风控页面 + * 杩涘叆API鎶煎搧椋庢帶椤甸潰 * @author yinjihuan - * @date 2016年10月13日 + * @date 2016骞�10鏈�13鏃� * @return */ public Object yapinfengkongAction(ApiQueryModel model) { @@ -451,9 +451,9 @@ public class ApiController { } /** - * 进入API价值分析页面 + * 杩涘叆API浠峰�煎垎鏋愰〉闈� * @author yinjihuan - * @date 2016年10月13日 + * @date 2016骞�10鏈�13鏃� * @return */ public Object jiazhifenxiAction(ApiQueryModel model) { @@ -463,9 +463,9 @@ public class ApiController { } /** - * 进入API店址分析页面 + * 杩涘叆API搴楀潃鍒嗘瀽椤甸潰 * @author yinjihuan - * @date 2016年10月13日 + * @date 2016骞�10鏈�13鏃� * @return */ public Object dianzhifenxiAction(ApiQueryModel model) { @@ -474,9 +474,9 @@ public class ApiController { return model; } /** - * 进入API不动产管理页面 + * 杩涘叆API涓嶅姩浜х鐞嗛〉闈� * @author yinjihuan - * @date 2016年10月13日 + * @date 2016骞�10鏈�13鏃� * @return */ public Object budongchanAction(ApiQueryModel model) { @@ -489,28 +489,28 @@ public class ApiController { String type = ""; switch (id) { case 1: - type = "价格信息"; + type = "浠锋牸淇℃伅"; break; case 2: - type = "价格走势信息"; + type = "浠锋牸璧板娍淇℃伅"; break; case 3: - type = "小区基础信息"; + type = "灏忓尯鍩虹淇℃伅"; break; case 4: - type = "小区配套信息"; + type = "灏忓尯閰嶅淇℃伅"; break; case 5: - type = "小区周边交通状况"; + type = "灏忓尯鍛ㄨ竟浜ら�氱姸鍐�"; break; case 6: - type = "小区周边消费场所"; + type = "灏忓尯鍛ㄨ竟娑堣垂鍦烘墍"; break; case 7: - type = "小区周边配套场所"; + type = "灏忓尯鍛ㄨ竟閰嶅鍦烘墍"; break; case 8: - type = "其他"; + type = "鍏朵粬"; break; default: break; @@ -568,9 +568,9 @@ public class ApiController { } /** - * 查询API字段数据 + * 鏌ヨAPI瀛楁鏁版嵁 * @author yinjihuan - * @date 2016年10月13日 + * @date 2016骞�10鏈�13鏃� * @param model * @return */ diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/ApplyApiController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/ApplyApiController.java index 1a56f1d98..91efa9c99 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/ApplyApiController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/ApplyApiController.java @@ -101,8 +101,8 @@ public class ApplyApiController { List freeApiDetails = new ArrayList(); for (ApiDetail apiDetail : freeApis) { String name = apiDetail.getName(); - if(name.equals("房屋总价")||name.equals("小区均价")||name.equals("区域住宅均价")||name.equals("城市住宅均价")||name.equals("房屋价格走势")||name.equals("小区价格走势") - ||name.equals("小区名址匹配")||name.equals("公交")||name.equals("商场")||name.equals("学校")||name.equals("银行/ATM")||name.equals("小区周边人口密度")){ + if(name.equals("鎴垮眿鎬讳环")||name.equals("灏忓尯鍧囦环")||name.equals("鍖哄煙浣忓畢鍧囦环")||name.equals("鍩庡競浣忓畢鍧囦环")||name.equals("鎴垮眿浠锋牸璧板娍")||name.equals("灏忓尯浠锋牸璧板娍") + ||name.equals("灏忓尯鍚嶅潃鍖归厤")||name.equals("鍏氦")||name.equals("鍟嗗満")||name.equals("瀛︽牎")||name.equals("閾惰/ATM")||name.equals("灏忓尯鍛ㄨ竟浜哄彛瀵嗗害")){ freeApiDetails.add(apiDetail); } } @@ -122,12 +122,12 @@ public class ApplyApiController { JsonModel ret = new JsonModel(); Map data = new HashMap(); - if(user == null){//没有登录 + if(user == null){//娌℃湁鐧诲綍 data.put("info", "fail"); String backUrl = model.getCityUrl()+"/"+model.getMethodName(); data.put("backUrl", URLEncoder.encode(backUrl,"UTF-8")); }else{ - data.put("info", "success");//已登录 + data.put("info", "success");//宸茬櫥褰� } ret.setJsonModel(data); @@ -144,12 +144,12 @@ public class ApplyApiController { JsonModel ret = new JsonModel(); Map data = new HashMap(); - if(user == null){//没有登录 + if(user == null){//娌℃湁鐧诲綍 data.put("info", "fail"); }else{ - data.put("info", "success");//已登录 + data.put("info", "success");//宸茬櫥褰� } - data.put("user", user);//已登录 + data.put("user", user);//宸茬櫥褰� ret.setJsonModel(data); return ret; } @@ -195,9 +195,9 @@ public class ApplyApiController { } /** - * 进入测试申请页面 + * 杩涘叆娴嬭瘯鐢宠椤甸潰 * @author yinjihuan - * @date 2016年6月7日 + * @date 2016骞�6鏈�7鏃� * @param model * @return */ @@ -207,7 +207,7 @@ public class ApplyApiController { String userId = LoginUtil.getUserId(request); model.setTabTitle(apiService.getTabTitle(userId)); - if(model.getTabTitle().equals("我的测试申请")){ + if(model.getTabTitle().equals("鎴戠殑娴嬭瘯鐢宠")){ ApiTestApply apply = apiService.getTestApply(userId); if(apply != null) { model.setTabTitle(apply.getAuditSchedule()); @@ -220,9 +220,9 @@ public class ApplyApiController { } /** - * 重新申请 + * 閲嶆柊鐢宠 * @author yinjihuan - * @date 2016年6月7日 + * @date 2016骞�6鏈�7鏃� * @param model * @param request * @return @@ -245,9 +245,9 @@ public class ApplyApiController { } } /** - * 添加测试申请 + * 娣诲姞娴嬭瘯鐢宠 * @author yinjihuan - * @date 2016年6月7日 + * @date 2016骞�6鏈�7鏃� * @param model * @param request * @return @@ -260,7 +260,7 @@ public class ApplyApiController { FangJiaUser fjUser = fangJiaUserService.getUserById(userId); if(fjUser == null) return result; if(model.getTestFields().split(",").length > 10){ - result.setMsg("测试字段不能超过10个"); + result.setMsg("娴嬭瘯瀛楁涓嶈兘瓒呰繃10涓�"); return result; } if(apiService.getTestApply(userId) == null){ @@ -269,10 +269,10 @@ public class ApplyApiController { String sendMobile = StringUtil.getProperty("api.test.apply.mobile", "fangjia-coresite.properties"); String[] mobiles = sendMobile.split(","); for (String mobile : mobiles) { - smsService.send(mobile, "【房价网】API免费在线测试申请,申请人:"+model.getName()+",账号:"+fjUser.getMobile()+"。请及时审核。"); + smsService.send(mobile, "銆愭埧浠风綉銆慉PI鍏嶈垂鍦ㄧ嚎娴嬭瘯鐢宠,鐢宠浜猴細"+model.getName()+"锛岃处鍙凤細"+fjUser.getMobile()+"銆傝鍙婃椂瀹℃牳銆�"); } } else { - result.setMsg("您已申请过"); + result.setMsg("鎮ㄥ凡鐢宠杩�"); } result.setResult(Message.RESULT_SUCCESS); return result; @@ -283,9 +283,9 @@ public class ApplyApiController { } /** - * 获取测试申请记录 + * 鑾峰彇娴嬭瘯鐢宠璁板綍 * @author yinjihuan - * @date 2016年6月8日 + * @date 2016骞�6鏈�8鏃� * @param request * @return */ @@ -295,7 +295,7 @@ public class ApplyApiController { try { String userId = LoginUtil.getUserId(request); if(userId.equals("")){ - result.setMsg("没有登录"); + result.setMsg("娌℃湁鐧诲綍"); } else { ApiTestApply apply = apiService.getTestApply(userId); if(apply != null) { @@ -329,9 +329,9 @@ public class ApplyApiController { } /** - * 获取接口调用记录 + * 鑾峰彇鎺ュ彛璋冪敤璁板綍 * @author yinjihuan - * @date 2016年6月8日 + * @date 2016骞�6鏈�8鏃� * @param request * @return */ @@ -341,7 +341,7 @@ public class ApplyApiController { try { String userId = LoginUtil.getUserId(request); if(userId.equals("")){ - result.setMsg("没有登录"); + result.setMsg("娌℃湁鐧诲綍"); } else { User u = userService.findByUserId(userId); if(u != null) { @@ -350,7 +350,7 @@ public class ApplyApiController { result.setApiKey(apiUser.getAppKey()); } List apiVisitRecords = new ArrayList(); - //查询调用记录 + //鏌ヨ璋冪敤璁板綍 ApiUserAuthority apiUserAuthority = apiUserAuthorityService.findByUserIdNoChahe(apiUser.getId()); if(apiUserAuthority != null){ Map totalMap = apiUserAuthority.getTotalCountMap(); @@ -401,9 +401,9 @@ public class ApplyApiController { } /** - * 进入所有API页面 + * 杩涘叆鎵�鏈堿PI椤甸潰 * @author yinjihuan - * @date 2016年10月9日 + * @date 2016骞�10鏈�9鏃� * @param model * @return */ @@ -419,9 +419,9 @@ public class ApplyApiController { } /** - * 进入API购买申请页面 + * 杩涘叆API璐拱鐢宠椤甸潰 * @author yinjihuan - * @date 2016年10月13日 + * @date 2016骞�10鏈�13鏃� * @return */ public Object apiBuyApplyAction(ApiQueryModel model, HttpServletRequest req) { @@ -434,9 +434,9 @@ public class ApplyApiController { } /** - * 进入API押品风控页面 + * 杩涘叆API鎶煎搧椋庢帶椤甸潰 * @author yinjihuan - * @date 2016年10月13日 + * @date 2016骞�10鏈�13鏃� * @return */ public Object yapinfengkongAction(ApiQueryModel model) { @@ -446,9 +446,9 @@ public class ApplyApiController { } /** - * 进入API价值分析页面 + * 杩涘叆API浠峰�煎垎鏋愰〉闈� * @author yinjihuan - * @date 2016年10月13日 + * @date 2016骞�10鏈�13鏃� * @return */ public Object jiazhifenxiAction(ApiQueryModel model) { @@ -458,9 +458,9 @@ public class ApplyApiController { } /** - * 进入API店址分析页面 + * 杩涘叆API搴楀潃鍒嗘瀽椤甸潰 * @author yinjihuan - * @date 2016年10月13日 + * @date 2016骞�10鏈�13鏃� * @return */ public Object dianzhifenxiAction(ApiQueryModel model) { @@ -469,9 +469,9 @@ public class ApplyApiController { return model; } /** - * 进入API不动产管理页面 + * 杩涘叆API涓嶅姩浜х鐞嗛〉闈� * @author yinjihuan - * @date 2016年10月13日 + * @date 2016骞�10鏈�13鏃� * @return */ public Object budongchanAction(ApiQueryModel model) { @@ -484,28 +484,28 @@ public class ApplyApiController { String type = ""; switch (id) { case 1: - type = "价格信息"; + type = "浠锋牸淇℃伅"; break; case 2: - type = "价格走势信息"; + type = "浠锋牸璧板娍淇℃伅"; break; case 3: - type = "小区基础信息"; + type = "灏忓尯鍩虹淇℃伅"; break; case 4: - type = "小区配套信息"; + type = "灏忓尯閰嶅淇℃伅"; break; case 5: - type = "小区周边交通状况"; + type = "灏忓尯鍛ㄨ竟浜ら�氱姸鍐�"; break; case 6: - type = "小区周边消费场所"; + type = "灏忓尯鍛ㄨ竟娑堣垂鍦烘墍"; break; case 7: - type = "小区周边配套场所"; + type = "灏忓尯鍛ㄨ竟閰嶅鍦烘墍"; break; case 8: - type = "其他"; + type = "鍏朵粬"; break; default: break; @@ -563,9 +563,9 @@ public class ApplyApiController { } /** - * 查询API字段数据 + * 鏌ヨAPI瀛楁鏁版嵁 * @author yinjihuan - * @date 2016年10月13日 + * @date 2016骞�10鏈�13鏃� * @param model * @return */ diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/AutoCompleteController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/AutoCompleteController.java index c02984578..4bb0ab559 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/AutoCompleteController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/AutoCompleteController.java @@ -41,7 +41,7 @@ public class AutoCompleteController { /********************************************* new start *****************************************************/ /** - * 自动完成新实现 + * 鑷姩瀹屾垚鏂板疄鐜� * * @param cat * @param type @@ -58,7 +58,7 @@ public class AutoCompleteController { if (StringUtils.isBlank(city)) { city = FangjiaServerAreaContextHolder.getServerAreaDefault().getDisplay(); } - //请求auto库数据 + //璇锋眰auto搴撴暟鎹� //List suggestList = autoCompleteService.suggest(cat, type, city, keyword, limit); List suggestList = getDistrictByKeyword(cat, city, keyword, limit); model.setJsonModel(suggestList); @@ -87,7 +87,7 @@ public class AutoCompleteController { //nameQuery.add(new TermQuery(new Term("address", keyword)), Occur.SHOULD); //nameQuery.add(new TermQuery(new Term("addr_alias_std", keyword)), Occur.SHOULD); nameQuery.add(new TermQuery(new Term("keyword", keyword)), Occur.SHOULD); - //nameQuery.add(new TermQuery(new Term("keyword_cjk", keyword)), Occur.SHOULD);//这个重要,因seaweed不支持模糊搜索,当输入"中远两"需用此进行搜索 + //nameQuery.add(new TermQuery(new Term("keyword_cjk", keyword)), Occur.SHOULD);//杩欎釜閲嶈锛屽洜seaweed涓嶆敮鎸佹ā绯婃悳绱紝褰撹緭鍏�"涓繙涓�"闇�鐢ㄦ杩涜鎼滅储 srQuery1.add(nameQuery, Occur.SHOULD); params.add(new QueryParam("$sr", new SrQuery(srQuery1))); List districts = districtService.findAllByParams(params, 0, limit, new String[] { "region", "name","address", "addrAlias" }); @@ -102,7 +102,7 @@ public class AutoCompleteController { bo.setRegion(district.getRegion()); ret.add(bo); } - //对自动完成出来的结果按长短排序 + //瀵硅嚜鍔ㄥ畬鎴愬嚭鏉ョ殑缁撴灉鎸夐暱鐭帓搴� if(ret.size() > 0){ Collections.sort(ret, new Comparator() { public int compare(AutoCompleteBo o1, AutoCompleteBo o2) { @@ -127,7 +127,7 @@ public class AutoCompleteController { /********************************************* new end *****************************************************/ /** - * 小区搜索的自动完成功能(调用goojia-auto实现) + * 灏忓尯鎼滅储鐨勮嚜鍔ㄥ畬鎴愬姛鑳�(璋冪敤goojia-auto瀹炵幇) * * @deprecated * @param key @@ -139,7 +139,7 @@ public class AutoCompleteController { } /** - * 小区搜索的自动完成功能(调用goojia-auto实现) + * 灏忓尯鎼滅储鐨勮嚜鍔ㄥ畬鎴愬姛鑳�(璋冪敤goojia-auto瀹炵幇) * * @deprecated * @param key @@ -151,7 +151,7 @@ public class AutoCompleteController { } /** - * 学区房搜索的自动完成功能(调用fangjia-auto实现) + * 瀛﹀尯鎴挎悳绱㈢殑鑷姩瀹屾垚鍔熻兘(璋冪敤fangjia-auto瀹炵幇) * * @deprecated * @param key @@ -162,7 +162,7 @@ public class AutoCompleteController { } /** - * 苏州房产网移动端自动补全 + * 鑻忓窞鎴夸骇缃戠Щ鍔ㄧ鑷姩琛ュ叏 * @param keyword * @param city * @param limit @@ -173,7 +173,7 @@ public class AutoCompleteController { } /** - * PDS中的获取楼号接口 + * PDS涓殑鑾峰彇妤煎彿鎺ュ彛 * @param model * @return */ @@ -210,7 +210,7 @@ public class AutoCompleteController { } /** - * PDS中的室号获取接口,需要模拟补全 + * PDS涓殑瀹ゅ彿鑾峰彇鎺ュ彛锛岄渶瑕佹ā鎷熻ˉ鍏� * @param model * @return */ @@ -228,7 +228,7 @@ public class AutoCompleteController { } for (Map r : roomNumbers) { RoomDto dto = new RoomDto(); - dto.setDisplay(r.get("rn") + "室"); + dto.setDisplay(r.get("rn") + "瀹�"); dto.setRoom(r.get("rn").toString()); Object floor = r.get("floor"); if (floor != null) { @@ -243,7 +243,7 @@ public class AutoCompleteController { } /** - * 根据当前经纬度附近的小区 + * 鏍规嵁褰撳墠缁忕含搴﹂檮杩戠殑灏忓尯 * @param lat * @param lng * @param radius @@ -262,7 +262,7 @@ public class AutoCompleteController { if (limit == null || limit > 100 || limit <= 0) { limit = 10; } - //通过经纬度搜索对应radius距离小区, 固定查询100条数据, 防止未根据距离排序后, 后面过滤到有效数据 + //閫氳繃缁忕含搴︽悳绱㈠搴攔adius璺濈灏忓尯, 鍥哄畾鏌ヨ100鏉℃暟鎹�, 闃叉鏈牴鎹窛绂绘帓搴忓悗, 鍚庨潰杩囨护鍒版湁鏁堟暟鎹� List districts = districtService.findAllDistrict(lat, lng, radius, null, 100); List result = new ArrayList(); for (District d : districts) { @@ -289,7 +289,7 @@ public class AutoCompleteController { return dis1 - dis2; } }); - //排序后, 只返回limit大小 + //鎺掑簭鍚�, 鍙繑鍥瀕imit澶у皬 if(result.size() >= limit){ result = result.subList(0, limit); } @@ -299,7 +299,7 @@ public class AutoCompleteController { } /** - * 全国最近搜索条件(调用goojia-auto实现) + * 鍏ㄥ浗鏈�杩戞悳绱㈡潯浠讹紙璋冪敤goojia-auto瀹炵幇锛� * * @deprecated * @param key diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/BrokerController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/BrokerController.java index 3ddd34711..fe3d6dcbc 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/BrokerController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/BrokerController.java @@ -15,7 +15,7 @@ public class BrokerController { private RentHouseService rentHouseService; /** - * 异步请求,取得经纪人房源量 + * 寮傛璇锋眰锛屽彇寰楃粡绾汉鎴挎簮閲� * * @param model * @return diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/CompanyController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/CompanyController.java index 69eff3bbd..e3b6addc7 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/CompanyController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/CompanyController.java @@ -3,14 +3,14 @@ package com.fangjia.coresite.controllers; import com.fangjia.coresite.model.FangjiaModel; /** - * 公司介绍控制器 + * 鍏徃浠嬬粛鎺у埗鍣� * @author yinjihuan * */ public class CompanyController { /** - * 关于我们 + * 鍏充簬鎴戜滑 * @param model * @return */ @@ -19,7 +19,7 @@ public class CompanyController { } /** - * 人才招聘 + * 浜烘墠鎷涜仒 * @return */ public Object recruitmentAction(FangjiaModel model) { @@ -27,7 +27,7 @@ public class CompanyController { } /** - * 用户服务协议 + * 鐢ㄦ埛鏈嶅姟鍗忚 * @param model * @return * @throws Exception @@ -37,7 +37,7 @@ public class CompanyController { } /** - * 客户 + * 瀹㈡埛 */ public Object cstmAction(FangjiaModel model){ return model; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/ContactController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/ContactController.java index 5edf448df..5c947784b 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/ContactController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/ContactController.java @@ -51,11 +51,11 @@ public class ContactController { private static List APPLY_BUY_MOBILE = new ArrayList(); static { - NOTICE_MOBILES.add("13916992399"); // 蒋 - NOTICE_MOBILES.add("13681915777"); // 钟 + NOTICE_MOBILES.add("13916992399"); // 钂� + NOTICE_MOBILES.add("13681915777"); // 閽� NOTICE_MOBILES.add("15201904147"); - APPLY_BUY_MOBILE.add("18061756492");//王 + APPLY_BUY_MOBILE.add("18061756492");//鐜� APPLY_BUY_MOBILE.add("13681915777");// APPLY_BUY_MOBILE.add("15201904147");// } @@ -70,7 +70,7 @@ public class ContactController { if(StringUtils.isBlank(baiduType)){ baiduType = ""; } else { - baiduType = "【" + baiduType + "】"; + baiduType = "銆�" + baiduType + "銆�"; } Map data = new HashMap(); @@ -84,28 +84,28 @@ public class ContactController { String mess=request.getParameter("mess"); String from=request.getParameter("from"); if(resPage.equals("0")){ - contact.setSource("房价网API购买" + baiduType); + contact.setSource("鎴夸环缃慉PI璐拱" + baiduType); if(from.equals("15")){ - contact.setContent("登录手机号:"+COOKIE_CONTEXT.getCookieValue(request,"login_username") + ";具体信息:"+"API购买("+mess+"接口)"); + contact.setContent("鐧诲綍鎵嬫満鍙凤細"+COOKIE_CONTEXT.getCookieValue(request,"login_username") + ";鍏蜂綋淇℃伅:"+"API璐拱("+mess+"鎺ュ彛)"); }else { - contact.setContent("登录手机号:" + COOKIE_CONTEXT.getCookieValue(request, "login_username") + ";合作内容:" + contact.getContent()); + contact.setContent("鐧诲綍鎵嬫満鍙凤細" + COOKIE_CONTEXT.getCookieValue(request, "login_username") + ";鍚堜綔鍐呭:" + contact.getContent()); } } else if(resPage.equals("1")){ - contact.setSource("房价网商用数据" + baiduType); - contact.setContent("登录手机号:"+COOKIE_CONTEXT.getCookieValue(request,"login_username") +";具体信息:"+mess); + contact.setSource("鎴夸环缃戝晢鐢ㄦ暟鎹�" + baiduType); + contact.setContent("鐧诲綍鎵嬫満鍙凤細"+COOKIE_CONTEXT.getCookieValue(request,"login_username") +";鍏蜂綋淇℃伅:"+mess); } else if(resPage.equals("2")){ - contact.setSource("房价网联系我们" + baiduType); - contact.setContent("登录手机号:"+COOKIE_CONTEXT.getCookieValue(request,"login_username") + ";合作内容:"+contact.getContent()); + contact.setSource("鎴夸环缃戣仈绯绘垜浠�" + baiduType); + contact.setContent("鐧诲綍鎵嬫満鍙凤細"+COOKIE_CONTEXT.getCookieValue(request,"login_username") + ";鍚堜綔鍐呭:"+contact.getContent()); }*/ - contact.setSource("房价网API购买" + baiduType); - contact.setContent("登录手机号:" + COOKIE_CONTEXT.getCookieValue(request, "login_username") + ";合作内容:" + contact.getContent()); + contact.setSource("鎴夸环缃慉PI璐拱" + baiduType); + contact.setContent("鐧诲綍鎵嬫満鍙凤細" + COOKIE_CONTEXT.getCookieValue(request, "login_username") + ";鍚堜綔鍐呭:" + contact.getContent()); contact.setIp(AnalyticsUtil.getIpAddress(request)); contact.setCreateDate(new Date()); customerConsultService.save(contact); data.put("success", Boolean.TRUE); - //String smsContent = "FangJia China 收到留言:\n " + "联系人:" + contact.getName() + " \n邮箱:" + contact.getEmail() + " \n联系电话:" + contact.getPhone(); + //String smsContent = "FangJia China 鏀跺埌鐣欒█:\n " + "鑱旂郴浜�:" + contact.getName() + " \n閭:" + contact.getEmail() + " \n鑱旂郴鐢佃瘽:" + contact.getPhone(); /* if(StringUtils.isNotBlank(contact.getContent())){ smsContent += "\n" + contact.getContent(); } @@ -116,7 +116,7 @@ public class ContactController { } } catch (SmsException e) { e.printStackTrace(); - logger.error("FangJia China 短信发送失败:", smsContent); + logger.error("FangJia China 鐭俊鍙戦�佸け璐�:", smsContent); }*/ return jsonModel; } @@ -159,13 +159,13 @@ public class ContactController { } public void sendSms(ApiBuyApply apiBuyApply, CustomerModel model, ApiModel apiModel){ - String smsContent = "【房价网】API接口申请:" ; + String smsContent = "銆愭埧浠风綉銆慉PI鎺ュ彛鐢宠:" ; Map serviceMsgMap = apiModel.getServiceIdMsgMap(); if(StringUtils.isNotBlank(apiBuyApply.getServiceId())){ smsContent += serviceMsgMap.get(apiBuyApply.getServiceId()); } - smsContent = smsContent+ " 申请人:" + apiBuyApply.getName() + " 账号:" + apiBuyApply.getMobile()+" ,请及时回复"; + smsContent = smsContent+ " 鐢宠浜�:" + apiBuyApply.getName() + " 璐﹀彿:" + apiBuyApply.getMobile()+" 锛岃鍙婃椂鍥炲"; try { for (String mobile : APPLY_BUY_MOBILE) { smsService.send(mobile, smsContent); @@ -173,7 +173,7 @@ public class ContactController { } } catch (SmsException e) { e.printStackTrace(); - logger.error("【房价网】:", smsContent); + logger.error("銆愭埧浠风綉銆�:", smsContent); } } @@ -213,8 +213,8 @@ public class ContactController { addressAnalyApplyService.save(apply); data.put("success", Boolean.TRUE); - String smsContent = "【房价网】地址分析平台购买申请," ; - smsContent = smsContent+ " 申请人:" + apply.getName() + " 账号:" + apply.getMobile()+" ,请及时回复"; + String smsContent = "銆愭埧浠风綉銆戝湴鍧�鍒嗘瀽骞冲彴璐拱鐢宠锛�" ; + smsContent = smsContent+ " 鐢宠浜�:" + apply.getName() + " 璐﹀彿:" + apply.getMobile()+" 锛岃鍙婃椂鍥炲"; System.out.println(smsContent); try { for (String mobile : APPLY_BUY_MOBILE) { @@ -222,7 +222,7 @@ public class ContactController { } } catch (SmsException e) { e.printStackTrace(); - logger.error("【房价网】:", smsContent); + logger.error("銆愭埧浠风綉銆�:", smsContent); } @@ -230,13 +230,13 @@ public class ContactController { } public void sendEmail(ApiBuyApply apiBuyApply, CustomerModel model, ApiModel apiModel){ try { - // 发邮件给用户 + // 鍙戦偖浠剁粰鐢ㄦ埛 Mail mail = new Mail(); mail.setReceiver(new MailUser(apiBuyApply.getEmail())); - mail.setSubject("线下购买接口"); + mail.setSubject("绾夸笅璐拱鎺ュ彛"); StringBuffer emailMsg = new StringBuffer(); - String smsContent = "【购买线下接口】\n " + "联系人:" + apiBuyApply.getName() + " \n邮箱:" + apiBuyApply.getEmail() + " \n联系电话:" + apiBuyApply.getMobile()+" \n接口服务编码:"+apiBuyApply.getServiceId(); + String smsContent = "銆愯喘涔扮嚎涓嬫帴鍙c�慭n " + "鑱旂郴浜�:" + apiBuyApply.getName() + " \n閭:" + apiBuyApply.getEmail() + " \n鑱旂郴鐢佃瘽:" + apiBuyApply.getMobile()+" \n鎺ュ彛鏈嶅姟缂栫爜:"+apiBuyApply.getServiceId(); Map serviceMsgMap = apiModel.getServiceIdMsgMap(); if(StringUtils.isNotBlank(apiBuyApply.getServiceId())){ smsContent += "\n" + serviceMsgMap.get(apiBuyApply.getServiceId()); @@ -248,9 +248,9 @@ public class ContactController { emailService.sendHtmlMailWithFile(mail); // smsCodeService.sendNotices("13391219237", email, mobile); } catch (Exception e) { - // ret.setMsg("发送失败,请稍后重试"); + // ret.setMsg("鍙戦�佸け璐ワ紝璇风◢鍚庨噸璇�"); } - // ret.setMsg("申请成功,请等待客服处理"); + // ret.setMsg("鐢宠鎴愬姛锛岃绛夊緟瀹㈡湇澶勭悊"); } diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/Controller.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/Controller.java index 2694bc9db..7232a7cb6 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/Controller.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/Controller.java @@ -70,7 +70,7 @@ public class Controller { /** - * 房价网城市首页 + * 鎴夸环缃戝煄甯傞椤� * * @return */ @@ -89,7 +89,7 @@ public class Controller { model.setEvaluateCount(evalCount == null ? 0l : (Long) evalCount.getValue()); int userId = model.getRealUserId(); model.setRole(fjtUsersService.findUsersRole(userId)); - //资产,房源 + //璧勪骇,鎴挎簮 //model.setLatelyNews(getLatelyNews()); if (requestUrl.contains(model.getWwwUrl())) { String ipAddressString = AnalyticsUtil.getIpAddress(request); @@ -99,7 +99,7 @@ public class Controller { } if (userAgent.contains("baidu") || userAgent.contains("google") || userAgent.contains("soso") || (StringUtils.isNotBlank(refererUrl) && refererUrl.contains(model.getDomain()))) { - // 若refererUrl为本站域名,则去往全国首页 + // 鑻efererUrl涓烘湰绔欏煙鍚�,鍒欏幓寰�鍏ㄥ浗棣栭〉 model.setLatelyNews(getLatelyNews()); ServerArea ipCity = findServerAreaByIpAddress(ipAddressString, ServerAreaData.defaultServerArea); @@ -110,20 +110,20 @@ public class Controller { model.setServerAreaMap(model.getSortedServerAreaMapGroupByFirstSpell()); model.setCurrentCity(ipCity.getName()); } else if (null == FangjiaServerAreaContextHolder.getServerArea()) { - // 直接键入wwwUrl,判断是否存在cookie,根据IP判断所在城市,若有城市则去往城市首页,否则,去全国首页 + // 鐩存帴閿叆wwwUrl,鍒ゆ柇鏄惁瀛樺湪cookie,鏍规嵁IP鍒ゆ柇鎵�鍦ㄥ煄甯�,鑻ユ湁鍩庡競鍒欏幓寰�鍩庡競棣栭〉,鍚﹀垯,鍘诲叏鍥介椤� String citySpell = CoresiteCookieContext.getInstance().getCookieValue(request, CookieName.COOKIE_CITY); ServerArea cookieCity = null; - if (StringUtils.isNotBlank(citySpell)) {// 从cookie获取城市信息 + if (StringUtils.isNotBlank(citySpell)) {// 浠巆ookie鑾峰彇鍩庡競淇℃伅 cookieCity = ServerAreaData.getServerAreaByNameOrSpellDefaultNull(citySpell); } - if (null != cookieCity) {// cookie中城市存在,跳转到城市首页 + if (null != cookieCity) {// cookie涓煄甯傚瓨鍦紝璺宠浆鍒板煄甯傞椤� model.setCurrentCity(cookieCity.getName()); - } else {// Cookie城市不存在,从IP获取城市 + } else {// Cookie鍩庡競涓嶅瓨鍦紝浠嶪P鑾峰彇鍩庡競 ServerArea ipCity = findServerAreaByIpAddress(ipAddressString, null); - if (ipCity != null) {// IP城市存在,跳转到城市首页 + if (ipCity != null) {// IP鍩庡競瀛樺湪锛岃烦杞埌鍩庡競棣栭〉 model.setCurrentCity(ipCity.getName()); - } else {// IP城市不存在,到全国首页 + } else {// IP鍩庡競涓嶅瓨鍦紝鍒板叏鍥介椤� model.setIpCity(ServerAreaData.defaultServerArea); if(ServerAreaData.defaultServerArea != null){ model.setCurrentCity(ServerAreaData.defaultServerArea.getName()); @@ -133,7 +133,7 @@ public class Controller { } } } - //公告 + //鍏憡 List newsInfos = newsDynamicService.findNewsByParams("news", null,null, new Date(), 0, 3); if(newsInfos!=null && newsInfos.size()>0){ @@ -150,18 +150,18 @@ public class Controller { String subDomainName = getCitySpell(requestUrl); if ("sou".equalsIgnoreCase(subDomainName)) { - // "sou"转向到咨询列表页 + // "sou"杞悜鍒板挩璇㈠垪琛ㄩ〉 model.setViewType("redirect"); model.setViewParam("statusCode", 301); model.setViewParam("location", "/zixun/"); } else if ("support".equalsIgnoreCase(subDomainName)) { - // "support"转向到关于我们页面 + // "support"杞悜鍒板叧浜庢垜浠〉闈� model.setViewType("redirect"); model.setViewParam("statusCode", 301); model.setViewParam("location", "/help/aboutUs"); } model.setCurrentCity(((ServerArea) FangjiaServerAreaContextHolder.getServerAreaDefault()).getSpell()); - //横排广告 + //妯帓骞垮憡 List ads = getAdvertisements(AdSourceEnum.HOME_NEW_T_DETAIL.getId()); model.setAdsList(ads); return model; @@ -187,7 +187,7 @@ public class Controller { } /** - * 房价网城市首页 + * 鎴夸环缃戝煄甯傞椤� * * @return */ @@ -206,7 +206,7 @@ public class Controller { model.setEvaluateCount(evalCount == null ? 0l : (Long) evalCount.getValue()); int userId = model.getRealUserId(); model.setRole(fjtUsersService.findUsersRole(userId)); - //资产,房源 + //璧勪骇,鎴挎簮 model.setLatelyNews(getLatelyNews()); if (requestUrl.contains(model.getWwwUrl())) { String ipAddressString = AnalyticsUtil.getIpAddress(request); @@ -216,7 +216,7 @@ public class Controller { } if (userAgent.contains("baidu") || userAgent.contains("google") || userAgent.contains("soso") || (StringUtils.isNotBlank(refererUrl) && refererUrl.contains(model.getDomain()))) { - // 若refererUrl为本站域名,则去往全国首页 + // 鑻efererUrl涓烘湰绔欏煙鍚�,鍒欏幓寰�鍏ㄥ浗棣栭〉 model.setLatelyNews(getLatelyNews()); ServerArea ipCity = findServerAreaByIpAddress(ipAddressString, ServerAreaData.defaultServerArea); @@ -227,20 +227,20 @@ public class Controller { model.setServerAreaMap(model.getSortedServerAreaMapGroupByFirstSpell()); model.setCurrentCity(ipCity.getName()); } else if (null == FangjiaServerAreaContextHolder.getServerArea()) { - // 直接键入wwwUrl,判断是否存在cookie,根据IP判断所在城市,若有城市则去往城市首页,否则,去全国首页 + // 鐩存帴閿叆wwwUrl,鍒ゆ柇鏄惁瀛樺湪cookie,鏍规嵁IP鍒ゆ柇鎵�鍦ㄥ煄甯�,鑻ユ湁鍩庡競鍒欏幓寰�鍩庡競棣栭〉,鍚﹀垯,鍘诲叏鍥介椤� String citySpell = CoresiteCookieContext.getInstance().getCookieValue(request, CookieName.COOKIE_CITY); ServerArea cookieCity = null; - if (StringUtils.isNotBlank(citySpell)) {// 从cookie获取城市信息 + if (StringUtils.isNotBlank(citySpell)) {// 浠巆ookie鑾峰彇鍩庡競淇℃伅 cookieCity = ServerAreaData.getServerAreaByNameOrSpellDefaultNull(citySpell); } - if (null != cookieCity) {// cookie中城市存在,跳转到城市首页 + if (null != cookieCity) {// cookie涓煄甯傚瓨鍦紝璺宠浆鍒板煄甯傞椤� model.setCurrentCity(cookieCity.getName()); - } else {// Cookie城市不存在,从IP获取城市 + } else {// Cookie鍩庡競涓嶅瓨鍦紝浠嶪P鑾峰彇鍩庡競 ServerArea ipCity = findServerAreaByIpAddress(ipAddressString, null); - if (ipCity != null) {// IP城市存在,跳转到城市首页 + if (ipCity != null) {// IP鍩庡競瀛樺湪锛岃烦杞埌鍩庡競棣栭〉 model.setCurrentCity(ipCity.getName()); - } else {// IP城市不存在,到全国首页 + } else {// IP鍩庡競涓嶅瓨鍦紝鍒板叏鍥介椤� model.setIpCity(ServerAreaData.defaultServerArea); if(ServerAreaData.defaultServerArea != null){ model.setCurrentCity(ServerAreaData.defaultServerArea.getName()); @@ -250,7 +250,7 @@ public class Controller { } } } - //公告 + //鍏憡 List newsInfos = newsDynamicService.findNewsByParams("news", null,null, new Date(), 0, 3); if(newsInfos!=null && newsInfos.size()>0){ @@ -267,12 +267,12 @@ public class Controller { String subDomainName = getCitySpell(requestUrl); if ("sou".equalsIgnoreCase(subDomainName)) { - // "sou"转向到咨询列表页 + // "sou"杞悜鍒板挩璇㈠垪琛ㄩ〉 model.setViewType("redirect"); model.setViewParam("statusCode", 301); model.setViewParam("location", "/zixun/"); } else if ("support".equalsIgnoreCase(subDomainName)) { - // "support"转向到关于我们页面 + // "support"杞悜鍒板叧浜庢垜浠〉闈� model.setViewType("redirect"); model.setViewParam("statusCode", 301); model.setViewParam("location", "/help/aboutUs"); @@ -282,18 +282,18 @@ public class Controller { } /** - * IP存在,根据IP 获取城市,获取不到或者IP不存在,设置默认城市 + * IP瀛樺湪锛屾牴鎹甀P 鑾峰彇鍩庡競锛岃幏鍙栦笉鍒版垨鑰匢P涓嶅瓨鍦紝璁剧疆榛樿鍩庡競 * * @param ipAddressString - * IP地址 + * IP鍦板潃 * @param defaultServerArea - * 默认城市 + * 榛樿鍩庡競 * @return */ private ServerArea findServerAreaByIpAddress(String ipAddressString, ServerArea defaultServerArea) { // ServerArea ipCity = defaultServerArea; // IpAddress ipAddress = ipAddressService.findByIp(ipAddressString); - // // IP存在,根据IP 获取城市,获取不到,设置默认城市 + // // IP瀛樺湪锛屾牴鎹甀P 鑾峰彇鍩庡競锛岃幏鍙栦笉鍒帮紝璁剧疆榛樿鍩庡競 // if (ipAddress != null) { // ipCity = // ServerAreaData.getServerAreaContainsCity(ipAddress.getCountry(), @@ -319,7 +319,7 @@ public class Controller { } /** - * 统计API和估价记录数 + * 缁熻API鍜屼及浠疯褰曟暟 * @return */ public Object statisticAction(){ @@ -354,7 +354,7 @@ public class Controller { @SuppressWarnings("unchecked") private List getLatelyNews() { /** - * 首页地图底部SEO最新资讯(缓存一小时) + * 棣栭〉鍦板浘搴曢儴SEO鏈�鏂拌祫璁�(缂撳瓨涓�灏忔椂) */ String cacheKey = "latelyNews"; FacetQueryResult newsResultList = (FacetQueryResult) CacheUtils.getValue(this.getClass(), cacheKey); @@ -427,7 +427,7 @@ public class Controller { } /** - * 房价网全国首页 + * 鎴夸环缃戝叏鍥介椤� * * @return */ @@ -462,7 +462,7 @@ public class Controller { } /** - * 错误页面 + * 閿欒椤甸潰 * * @param model * @return diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/CpcClickController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/CpcClickController.java index 949c2a48e..43a463508 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/CpcClickController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/CpcClickController.java @@ -57,21 +57,21 @@ public class CpcClickController { } /** - * CPC 点击日志记录 + * CPC 鐐瑰嚮鏃ュ織璁板綍 * * @param model * @return */ public Object logAction(CpcClickLogModel model) { HttpServletRequest request = ActionContext.getContext().getRequest(); - boolean isFangjiaUser = false; // 是否是房价网内部用户点击 - if (FangjiaConfig.getConfig().isProductionEnvironment()) { // 线上 + boolean isFangjiaUser = false; // 鏄惁鏄埧浠风綉鍐呴儴鐢ㄦ埛鐐瑰嚮 + if (FangjiaConfig.getConfig().isProductionEnvironment()) { // 绾夸笂 String ip = AnalyticsUtil.getIpAddress(request); if (ip.indexOf(" 116.247.70.58") > -1) { isFangjiaUser = true; } } - if (!isFangjiaUser) { // 非房价网内部用户点击 + if (!isFangjiaUser) { // 闈炴埧浠风綉鍐呴儴鐢ㄦ埛鐐瑰嚮 String houseId = model.getId(); String houseType = model.getType(); if (StringUtils.isNotEmpty(houseId) && StringUtils.isNotEmpty(houseType)) { @@ -159,7 +159,7 @@ public class CpcClickController { } /** - * CPC 点击记录for小工具条 + * CPC 鐐瑰嚮璁板綍for灏忓伐鍏锋潯 * * @param model * @return diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/DaikuanController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/DaikuanController.java index e57186d1a..603cadf9b 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/DaikuanController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/DaikuanController.java @@ -58,19 +58,19 @@ public class DaikuanController { private BusinessEstateService businessEstateService; /** - * 频道首页 + * 棰戦亾棣栭〉 */ public Object indexAction(DaikuanModel model) { return model; } /** - * 表单填写页 + * 琛ㄥ崟濉啓椤� */ public Object formAction(DaikuanModel model) { // if (null == model.getEvaluation() || // StringUtils.isBlank(model.getEvaluation().getDistrictName()) - // || "请填写小区名/地址".equals(model.getEvaluation().getDistrictName())) { + // || "璇峰~鍐欏皬鍖哄悕/鍦板潃".equals(model.getEvaluation().getDistrictName())) { // model.setViewType("redirect"); // model.setViewParam("location", "/daikuan/"); // return model; @@ -80,7 +80,7 @@ public class DaikuanController { } /** - * 表单异步提交处理 + * 琛ㄥ崟寮傛鎻愪氦澶勭悊 */ public Object evaluationAction(DaikuanModel model) { Evaluation evaluation = model.getEvaluation(); @@ -98,7 +98,7 @@ public class DaikuanController { String buildType = evaluation.getBuildType(); - if ("公寓".equals(buildType) || "别墅".equals(buildType)) { + if ("鍏瘬".equals(buildType) || "鍒".equals(buildType)) { List districts = districtService.findByKeyword(model.getCityName(), evaluation.getDistrictName(),"district"); List districtKeys = new ArrayList(districts.size()); for(District d:districts){ @@ -109,7 +109,7 @@ public class DaikuanController { } if (CollectionUtils.isNotEmpty(districtKeys)) { for (DistrictKey key : districtKeys) { - // 知识库匹配出的结果需要城市相同、有区域信息、且和表单中提交的区域相同,表单中没有区域则用第一个小区 + // 鐭ヨ瘑搴撳尮閰嶅嚭鐨勭粨鏋滈渶瑕佸煄甯傜浉鍚屻�佹湁鍖哄煙淇℃伅銆佷笖鍜岃〃鍗曚腑鎻愪氦鐨勫尯鍩熺浉鍚岋紝琛ㄥ崟涓病鏈夊尯鍩熷垯鐢ㄧ涓�涓皬鍖� if (!evaluation.getCity().equals(key.getCity())) { continue; } @@ -131,7 +131,7 @@ public class DaikuanController { evaluation.setModificationDate(new Date()); evaluationService.saveEvaluation(evaluation); } - } else if ("商铺".equals(buildType)) { + } else if ("鍟嗛摵".equals(buildType)) { district = businessEstateService.findShop(new DistrictKey(evaluation.getCity(), evaluation.getRegion(), evaluation .getDistrictName())); if (null != district) { @@ -143,7 +143,7 @@ public class DaikuanController { evaluation.setModificationDate(new Date()); evaluation = evaluationService.saveShopEvaluation(evaluation, district); } - } else if ("写字楼".equals(buildType)) { + } else if ("鍐欏瓧妤�".equals(buildType)) { district = businessEstateService.findOffice(new DistrictKey(evaluation.getCity(), evaluation.getRegion(), evaluation .getDistrictName())); if (null != district) { @@ -163,7 +163,7 @@ public class DaikuanController { } /** - * 贷款产品列表 + * 璐锋浜у搧鍒楄〃 */ public Object listAction(DaikuanModel model) { if (StringUtils.isNotBlank(model.getRefererUrl()) @@ -245,7 +245,7 @@ public class DaikuanController { } /** - * 贷款产品详情 + * 璐锋浜у搧璇︽儏 */ public Object showAction(DaikuanModel model) { Integer loanType = model.getLoanType(); @@ -295,20 +295,20 @@ public class DaikuanController { } /** - * 保存申请信息并发送短信 + * 淇濆瓨鐢宠淇℃伅骞跺彂閫佺煭淇� */ public Object saveLoanerInfoAction(DaikuanModel model, HttpServletRequest request) { JsonModel jsonModel = new JsonModel(); Map res = new HashMap(); if (StringUtils.isBlank(model.getSqName())) { - res.put("msg", "用户名不能为空"); + res.put("msg", "鐢ㄦ埛鍚嶄笉鑳戒负绌�"); } else if (StringUtils.isBlank(model.getSqMobile()) || !DataUtil.isCellPhoneNumber(model.getSqMobile())) { - res.put("msg", "手机号码错误"); + res.put("msg", "鎵嬫満鍙风爜閿欒"); } else if (StringUtils.isBlank(model.getId()) || !ObjectId.isValid(model.getId())) { - res.put("msg", "输入错误,请重新选择贷款产品再试!"); + res.put("msg", "杈撳叆閿欒,璇烽噸鏂伴�夋嫨璐锋浜у搧鍐嶈瘯!"); } else if (model.getLoanAmount() <= 0 || model.getLoanMonth() <= 0) { - res.put("msg", "输入错误,请重新选择贷款产品再试!"); + res.put("msg", "杈撳叆閿欒,璇烽噸鏂伴�夋嫨璐锋浜у搧鍐嶈瘯!"); } if (res.size() > 0) { @@ -387,8 +387,8 @@ public class DaikuanController { fjLoanerInfoService.saveUserLoneInfo(loanerInfo); StringBuffer msg = new StringBuffer(); - msg.append(model.getSqName()).append("(手机").append(model.getSqMobile()).append(")申请了:").append(comName).append("的") - .append(prdName).append(",信贷员为").append(allLoanOffers.get(0).getName()).append("。【贷款频道】"); + msg.append(model.getSqName()).append("锛堟墜鏈�").append(model.getSqMobile()).append("锛夌敵璇蜂簡锛�").append(comName).append("鐨�") + .append(prdName).append("锛屼俊璐峰憳涓�").append(allLoanOffers.get(0).getName()).append("銆傘�愯捶娆鹃閬撱��"); try { smsService.sendForRongshidai("15026780660", msg.toString()); @@ -404,7 +404,7 @@ public class DaikuanController { } /** - * 处理给用户和信贷员发送短信通知 + * 澶勭悊缁欑敤鎴峰拰淇¤捶鍛樺彂閫佺煭淇¢�氱煡 */ private void processSendMsg(DaikuanModel model, String cat, String offerId) { FjLoanBo productInfo = null; @@ -444,12 +444,12 @@ public class DaikuanController { } /** - * 给管理员发送通知短信 + * 缁欑鐞嗗憳鍙戦�侀�氱煡鐭俊 */ private void sendAdminMsg(FjLoanBo productInfo, FjBaseLoan loanInfo, DaikuanModel model) { StringBuffer msg = new StringBuffer(); - msg.append("【抵押贷款频道】").append(model.getSqName()).append("(手机").append(model.getSqMobile()).append(")申请了:") - .append(productInfo.getAgencyName()).append("的").append(loanInfo.getProductName()).append("。此条无需转发!"); + msg.append("銆愭姷鎶艰捶娆鹃閬撱��").append(model.getSqName()).append("锛堟墜鏈�").append(model.getSqMobile()).append("锛夌敵璇蜂簡锛�") + .append(productInfo.getAgencyName()).append("鐨�").append(loanInfo.getProductName()).append("銆傛鏉℃棤闇�杞彂锛�"); try { smsService.send("13681915777", msg.toString()); @@ -459,7 +459,7 @@ public class DaikuanController { } /** - * 给用户发送短信 + * 缁欑敤鎴峰彂閫佺煭淇� */ private void sendUserMsg(FjLoanBo productInfo, FjBaseLoan loanInfo, FjLoanOfficer officerInfo, DaikuanModel model) { String callNumber = getOfficerCallNumber(officerInfo); @@ -470,9 +470,9 @@ public class DaikuanController { StringBuffer msg = new StringBuffer(); msg.append(productInfo.getAgencyName()).append(" "); msg.append(loanInfo.getProductName()).append(" "); - msg.append("信贷员 ").append(officerInfo.getName()).append("的联系方式为").append(callNumber); + msg.append("淇¤捶鍛� ").append(officerInfo.getName()).append("鐨勮仈绯绘柟寮忎负").append(callNumber); - msg.append(" 贷款产品尽在sh.fangjia.com"); + msg.append(" 璐锋浜у搧灏藉湪sh.fangjia.com"); try { smsService.send(model.getSqMobile(), msg.toString()); @@ -482,7 +482,7 @@ public class DaikuanController { } /** - * 给信贷员发送短信 + * 缁欎俊璐峰憳鍙戦�佺煭淇� */ private void sendOfficerMsg(FjBaseLoan loanInfo, FjLoanOfficer officerInfo, DaikuanModel model) { String mobile = getOfficerMobile(officerInfo); @@ -491,15 +491,15 @@ public class DaikuanController { } StringBuffer msg = new StringBuffer(); - msg.append(model.getSqName()).append("(手机").append(model.getSqMobile()).append(")选择了您发布的“") - .append(loanInfo.getProductName()).append("”。"); + msg.append(model.getSqName()).append("锛堟墜鏈�").append(model.getSqMobile()).append("锛夐�夋嫨浜嗘偍鍙戝竷鐨勨��") + .append(loanInfo.getProductName()).append("鈥濄��"); Evaluation evaluation = evaluationService.findEvaluationById(model.getEvaId()); if (null != evaluation) { - msg.append("房产信息:").append(evaluation.getRegion()).append(evaluation.getDistrictName()) - .append(evaluation.getHouseNum()).append("号").append(evaluation.getRoomNum()).append("室") - .append(evaluation.getArea()).append("平米,估价").append((int) (evaluation.getTotalPrice() / 10000)) - .append("万,申请").append(model.getLoanAmount()).append("万贷款,期限").append(model.getLoanMonth()).append("个月。"); + msg.append("鎴夸骇淇℃伅锛�").append(evaluation.getRegion()).append(evaluation.getDistrictName()) + .append(evaluation.getHouseNum()).append("鍙�").append(evaluation.getRoomNum()).append("瀹�") + .append(evaluation.getArea()).append("骞崇背锛屼及浠�").append((int) (evaluation.getTotalPrice() / 10000)) + .append("涓囷紝鐢宠").append(model.getLoanAmount()).append("涓囪捶娆撅紝鏈熼檺").append(model.getLoanMonth()).append("涓湀銆�"); } try { @@ -510,7 +510,7 @@ public class DaikuanController { } /** - * 根据信贷员资料取得400轮播电话(手机+固话) + * 鏍规嵁淇¤捶鍛樿祫鏂欏彇寰�400杞挱鐢佃瘽锛堟墜鏈�+鍥鸿瘽锛� */ private String getOfficerCallNumber(FjLoanOfficer info) { if (null == info) { @@ -531,7 +531,7 @@ public class DaikuanController { } /** - * 根据信贷员资料取得对应手机号 + * 鏍规嵁淇¤捶鍛樿祫鏂欏彇寰楀搴旀墜鏈哄彿 */ private String getOfficerMobile(FjLoanOfficer info) { if (null == info) { @@ -553,14 +553,14 @@ public class DaikuanController { } /** - * 无法估价 + * 鏃犳硶浼颁环 */ public Object failAction(DaikuanModel model) { return model; } /** - * 保存无法估价的信息 + * 淇濆瓨鏃犳硶浼颁环鐨勪俊鎭� */ public Object saveFailAction(DaikuanModel model, HttpServletRequest request) { DaikuanFail entity = new DaikuanFail(); diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/DiaoyudaoController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/DiaoyudaoController.java index 73a001284..b7da7b69e 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/DiaoyudaoController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/DiaoyudaoController.java @@ -54,8 +54,8 @@ public class DiaoyudaoController { public String dataAction() { StringBuffer xml = new StringBuffer("\n"); - xml.append("\n\n"); - xml.append("\n"); + xml.append("\n\n"); + xml.append("\n"); xml.append("\t\n"); xml.append("\t\n"); xml.append("\t\n"); @@ -64,7 +64,7 @@ public class DiaoyudaoController { xml.append("\t\n"); xml.append("\n"); - xml.append("\n"); + xml.append("\n"); xml.append("\t\n"); xml.append("\t\n"); xml.append("\t\n"); @@ -73,7 +73,7 @@ public class DiaoyudaoController { xml.append("\t\n"); xml.append("\n"); - xml.append("\n"); + xml.append("\n"); xml.append("\t\n"); xml.append("\t\n"); xml.append("\t\n"); diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/DistrictController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/DistrictController.java index 0e25c9471..a15720fc0 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/DistrictController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/DistrictController.java @@ -124,7 +124,7 @@ public class DistrictController { private AddressMatchLogService addressMatchLogService; /** - * 根据城市 , 或 IP 取得城市的价格走势 + * 鏍规嵁鍩庡競 , 鎴� IP 鍙栧緱鍩庡競鐨勪环鏍艰蛋鍔� * * @param model * @return @@ -227,10 +227,10 @@ public class DistrictController { String parent = "block".equals(keywordMap.get("type")) ? keywordMap.get("region") : city; model.setParent(parent); String name = keywordMap.get("name"); - // 所有区域都要展示均价 + // 鎵�鏈夊尯鍩熼兘瑕佸睍绀哄潎浠� // if // (!this.regionBlockService.isRegionVisi("city".equals(keywordMap.get("type")) - // ? null : parent, name)) { // 如果查询的是城市,parent为null + // ? null : parent, name)) { // 濡傛灉鏌ヨ鐨勬槸鍩庡競锛宲arent涓簄ull // return; // } RegionStat regionStat; @@ -332,7 +332,7 @@ public class DistrictController { // Pager pager = model.getPager(20); // pager.setMaxPage(FangjiaConfig.getConfig().getSearchListMaxPageNo()); // -// // 小区列表支持新盘搜索 +// // 灏忓尯鍒楄〃鏀寔鏂扮洏鎼滅储 // model.setCategory("district"); // Object obj = FangjiaRudder.listMan(model.getKeyword()); // if (obj != null) { @@ -348,7 +348,7 @@ public class DistrictController { // DistrictQueryBean queryBean = modelToBean(model); // queryBean.setCity(city); // -// // 老网站的URL中区域是带“区”的 +// // 鑰佺綉绔欑殑URL涓尯鍩熸槸甯︹�滃尯鈥濈殑 // if (StringUtils.isNotBlank(queryBean.getRegion())) { // List gList = menu.getGroupList(); // for (Group g : gList) { @@ -395,7 +395,7 @@ public class DistrictController { // MenuCategoryEnum.xiaoqu, getCurrentParams())); // //// */ -//// * gasm统计 +//// * gasm缁熻 //// */ // model.addGaMap(Gakey.rc, pager.getTotalRows()); // @@ -410,7 +410,7 @@ public class DistrictController { Pager pager = model.getPager(20); pager.setMaxPage(FangjiaConfig.getConfig().getSearchListMaxPageNo()); - // 小区列表支持新盘搜索 + // 灏忓尯鍒楄〃鏀寔鏂扮洏鎼滅储 model.setCategory("district"); Object obj = FangjiaRudder.listMan(model.getKeyword()); if (obj != null) { @@ -426,7 +426,7 @@ public class DistrictController { DistrictQueryBean queryBean = modelToBean(model); queryBean.setCity(city); - // 老网站的URL中区域是带“区”的 + // 鑰佺綉绔欑殑URL涓尯鍩熸槸甯︹�滃尯鈥濈殑 if (StringUtils.isNotBlank(queryBean.getRegion())) { List gList = menu.getGroupList(); for (Group g : gList) { @@ -481,12 +481,12 @@ public class DistrictController { } /** - * 底部热门推荐 + * 搴曢儴鐑棬鎺ㄨ崘 * * @param model */ private void feedFooter(DistrictModel model) { - // 底部热门推荐其他小区 + // 搴曢儴鐑棬鎺ㄨ崘鍏朵粬灏忓尯 int maxCount = 20; int maxRecommendCount = 7; DistrictQueryBean queryBean = new DistrictQueryBean(); @@ -501,7 +501,7 @@ public class DistrictController { } model.setFooterDistricts(limit(districtList)); - // 底部热门推荐的其他城市 + // 搴曢儴鐑棬鎺ㄨ崘鐨勫叾浠栧煄甯� queryBean = new DistrictQueryBean(); FacetQuery facetQuery = new FacetQuery(); facetQuery.setFields(Arrays.asList("city")); @@ -672,31 +672,31 @@ public class DistrictController { } /** - * 按时间做Seed获取的随机筛选的区域信息 + * 鎸夋椂闂村仛Seed鑾峰彇鐨勯殢鏈虹瓫閫夌殑鍖哄煙淇℃伅 * - * @return 随机筛选的区域信息 + * @return 闅忔満绛涢�夌殑鍖哄煙淇℃伅 */ private List limit(List districts) { - int needCount = 6;// 获取的数据个数7个 + int needCount = 6;// 鑾峰彇鐨勬暟鎹釜鏁�7涓� - int changeDay = 20;// 设置更新频率为20天 + int changeDay = 20;// 璁剧疆鏇存柊棰戠巼涓�20澶� - int currentCount = districts.size();// 当前获取的Region总数 + int currentCount = districts.size();// 褰撳墠鑾峰彇鐨凴egion鎬绘暟 if (currentCount <= needCount) return districts; Calendar oldTime = Calendar.getInstance(); - oldTime.set(2011, 8, 1);// 初始化时间为2011年09月01日 + oldTime.set(2011, 8, 1);// 鍒濆鍖栨椂闂翠负2011骞�09鏈�01鏃� Calendar newTime = Calendar.getInstance(); - int reduceDay = SimRandom.getReduceDay(newTime, oldTime);// 获取日期与初始日期相差天数 + int reduceDay = SimRandom.getReduceDay(newTime, oldTime);// 鑾峰彇鏃ユ湡涓庡垵濮嬫棩鏈熺浉宸ぉ鏁� - int seed = (int) reduceDay / changeDay;// 计算simRandom变化频率,20表示20天更新一次 + int seed = (int) reduceDay / changeDay;// 璁$畻simRandom鍙樺寲棰戠巼,20琛ㄧず20澶╂洿鏂颁竴娆� - List simIndexs = SimRandom.getSimRandom(seed, currentCount, needCount);// 获取随机Index + List simIndexs = SimRandom.getSimRandom(seed, currentCount, needCount);// 鑾峰彇闅忔満Index List ret = new ArrayList(needCount); for (int index : simIndexs) { @@ -705,7 +705,7 @@ public class DistrictController { return ret; } - static final String[] fwords = { "http://t\\.cn/\\w+", "安居客", "赶集", "百姓网", "搜房", "58同城", "(via)" }; + static final String[] fwords = { "http://t\\.cn/\\w+", "瀹夊眳瀹�", "璧堕泦", "鐧惧缃�", "鎼滄埧", "58鍚屽煄", "锛坴ia锛�" }; public Object wshowAction(DistrictModel model) { if (StringUtils.isBlank(model.getDistrictName()) || StringUtils.isBlank(model.getRegion())) { @@ -832,7 +832,7 @@ public class DistrictController { } -// Pager microBlogPager = new Pager(10);// 微博分页,固定,显示前五条 +// Pager microBlogPager = new Pager(10);// 寰崥鍒嗛〉,鍥哄畾锛屾樉绀哄墠浜旀潯 // List microBlogs = microBlogService.findByKeyWord(microBlogPager, district.getName()); // // for (MicroBlog wb : microBlogs) { @@ -867,10 +867,10 @@ public class DistrictController { model.setPicCount(getPicCount(district, "all")); - // 小区是否存在均价,不存在的话不显示小区房价tab + // 灏忓尯鏄惁瀛樺湪鍧囦环锛屼笉瀛樺湪鐨勮瘽涓嶆樉绀哄皬鍖烘埧浠穞ab DistrictStatBo statBo = districtStatService.findDistrictStat(districtKey); - // 拿均价用于页面meta显示(seo) + // 鎷垮潎浠风敤浜庨〉闈eta鏄剧ず(seo) if (null != statBo.getDefaultDistrictStat()) { model.setDistrictStat(statBo.getDefaultDistrictStat()); } else if (null != statBo.getDistrictStat()) { @@ -884,7 +884,7 @@ public class DistrictController { model.setHouseBoList(getDistrictHouses(model)); model.setRentHouseBoList(getDistrictRentHouses(model)); - // 小区经纪人推荐去掉,数据不好 yukai 2011-11-16 + // 灏忓尯缁忕邯浜烘帹鑽愬幓鎺夛紝鏁版嵁涓嶅ソ yukai 2011-11-16 // List brokerBoList = // brokerService.findBrokerTop5(districtKey); // for (BrokerBo brokerBo : brokerBoList) { @@ -975,24 +975,24 @@ public class DistrictController { if (ArrayUtils.contains(kinds, DistrictKindEnum.bieshu.getValue())) { if (null != districtStatBo.getVillaDistrictStat()) { DistrictStat districtStat = districtStatBo.getVillaDistrictStat(); - shareMessage.append("本周别墅均价:").append((districtStat.getAvgPrice() / 100) * 100).append("元/㎡ "); + shareMessage.append("鏈懆鍒鍧囦环锛�").append((districtStat.getAvgPrice() / 100) * 100).append("鍏�/銕� "); if (districtStat.getWeekendMarkup() < 0) { - shareMessage.append("下跌 ").append(districtStat.getWeekendMarkup() / 100.0).append("% "); + shareMessage.append("涓嬭穼 ").append(districtStat.getWeekendMarkup() / 100.0).append("% "); } else if (districtStat.getWeekendMarkup() > 0) { - shareMessage.append("上涨 ").append(districtStat.getWeekendMarkup() / 100.0).append("% "); + shareMessage.append("涓婃定 ").append(districtStat.getWeekendMarkup() / 100.0).append("% "); } else { - shareMessage.append("持平 "); + shareMessage.append("鎸佸钩 "); } } if (kinds.length > 1 && null != districtStatBo.getDistrictStat()) { DistrictStat districtStat = districtStatBo.getDistrictStat(); - shareMessage.append(" 本周公寓均价:").append((districtStat.getAvgPrice() / 100) * 100).append("元/㎡ "); + shareMessage.append(" 鏈懆鍏瘬鍧囦环锛�").append((districtStat.getAvgPrice() / 100) * 100).append("鍏�/銕� "); if (districtStat.getWeekendMarkup() < 0) { - shareMessage.append("下跌 ").append(districtStat.getWeekendMarkup() / 100.0).append("% "); + shareMessage.append("涓嬭穼 ").append(districtStat.getWeekendMarkup() / 100.0).append("% "); } else if (districtStat.getWeekendMarkup() > 0) { - shareMessage.append("上涨 ").append(districtStat.getWeekendMarkup() / 100.0).append("% "); + shareMessage.append("涓婃定 ").append(districtStat.getWeekendMarkup() / 100.0).append("% "); } else { - shareMessage.append("持平 "); + shareMessage.append("鎸佸钩 "); } } } @@ -1001,7 +1001,7 @@ public class DistrictController { } /** - * 小区看房日记 + * 灏忓尯鐪嬫埧鏃ヨ * * @param model * @return @@ -1034,7 +1034,7 @@ public class DistrictController { // filter invalid pictures first. model.setDistrict(district); - // 图片数 + // 鍥剧墖鏁� if (model.getPicCount() == 0) { String showPic = ""; if (!CollectionUtils.isEmpty(district.getOutPics())) { @@ -1085,10 +1085,10 @@ public class DistrictController { DataUtil.removeHtml(DataUtil.balanceTags(news.getName())))); } if (null != news.getPublishDate()) { - // 当天的资讯,时间显示为“**小时前更新” + // 褰撳ぉ鐨勮祫璁紝鏃堕棿鏄剧ず涓衡��**灏忔椂鍓嶆洿鏂扳�� if (news.getPublishDate().after(range[0]) && news.getPublishDate().before(range[1])) { newsBo.setPublishDateStr((DateUtil.getHour(new Date()) - DateUtil.getHour(news.getPublishDate())) - + "小时前更新"); + + "灏忔椂鍓嶆洿鏂�"); } else { newsBo.setPublishDateStr(sdf.format(news.getPublishDate())); } @@ -1115,7 +1115,7 @@ public class DistrictController { } /** - * 小区房价tab页 + * 灏忓尯鎴夸环tab椤� * * @param model * @return @@ -1156,7 +1156,7 @@ public class DistrictController { * * // filter invalid pictures first. model.setDistrict(district); * - * // 图片数 if (model.getPicCount() == 0) { String showPic = ""; if + * // 鍥剧墖鏁� if (model.getPicCount() == 0) { String showPic = ""; if * (!CollectionUtils.isEmpty(district.getOutPics())) { * * if (StringUtils.isBlank(showPic)) { showPic = @@ -1181,14 +1181,14 @@ public class DistrictController { * model.setDistrictStatStr(getDistrictStatToString(model, district, * statBo).toString()); * - * // 周边小区均价 DistrictQueryBean queryBean = new DistrictQueryBean(); + * // 鍛ㄨ竟灏忓尯鍧囦环 DistrictQueryBean queryBean = new DistrictQueryBean(); * queryBean.setLat(district.getLat()); * queryBean.setLng(district.getLng()); queryBean.setRange(3); * queryBean * .setCity(FangjiaServerAreaContextHolder.getServerAreaDefault * ().getDisplay()); * - * // 获取周边10个小区 Pager pager = new Pager(10, + * // 鑾峰彇鍛ㄨ竟10涓皬鍖� Pager pager = new Pager(10, * FangjiaConfig.getConfig().getSearchListMaxPageNo()); * List aroundDistrictList = * districtService.findByQueryBean(pager, queryBean, true); @@ -1334,7 +1334,7 @@ public class DistrictController { } /** - * 小区估价 + * 灏忓尯浼颁环 * * @param model * @return @@ -1408,29 +1408,29 @@ public class DistrictController { } else if (parseMap.containsKey("area")) { evaluation.setArea(Double.parseDouble(parseMap.get("area").toString())); model.setArea(Double.parseDouble(parseMap.get("area").toString())); - builder.append(parseMap.get("area").toString()).append("平米"); + builder.append(parseMap.get("area").toString()).append("骞崇背"); } if (model.getRoom() > 0) { evaluation.setRoom(model.getRoom()); model.setRoom(model.getRoom()); - builder.append(model.getRoom()).append("室").append(","); + builder.append(model.getRoom()).append("瀹�").append(","); } else if (parseMap.get("room") != null) { evaluation.setRoom(Integer.parseInt(parseMap.get("room").toString())); model.setRoom(Integer.parseInt(parseMap.get("room").toString())); - builder.append(parseMap.get("room").toString()).append("室").append(","); + builder.append(parseMap.get("room").toString()).append("瀹�").append(","); } if (parseMap.get("hall") != null) { evaluation.setHall(Integer.parseInt(parseMap.get("hall").toString())); model.setHall(Integer.parseInt(parseMap.get("hall").toString())); - builder.append(parseMap.get("hall").toString()).append("厅").append(","); + builder.append(parseMap.get("hall").toString()).append("鍘�").append(","); } if (parseMap.get("toilet") != null) { evaluation.setToilet(Integer.parseInt(parseMap.get("toilet").toString())); model.setToilet(Integer.parseInt(parseMap.get("toilet").toString())); - builder.append(parseMap.get("toilet").toString()).append("卫").append(","); + builder.append(parseMap.get("toilet").toString()).append("鍗�").append(","); } int avgPrice = 0; @@ -1444,19 +1444,19 @@ public class DistrictController { if (areas.get(0) <= 0) { evaluation.setArea(Double.parseDouble(areas.get(1).toString())); model.setEvaluationPrice(evaluationRateService.evaluation(avgPrice, evaluation) / 10000); - builder.insert(0, areas.get(1).toString() + "平米,"); + builder.insert(0, areas.get(1).toString() + "骞崇背,"); model.setArea(Double.parseDouble(areas.get(1).toString())); } else if (areas.get(1) >= Integer.MAX_VALUE) { evaluation.setArea(Double.parseDouble(areas.get(0).toString())); model.setEvaluationPrice(evaluationRateService.evaluation(avgPrice, evaluation) / 10000); - builder.insert(0, areas.get(0).toString() + "平米,"); + builder.insert(0, areas.get(0).toString() + "骞崇背,"); model.setArea(Double.parseDouble(areas.get(0).toString())); } else { evaluation.setArea(Double.parseDouble(areas.get(0).toString())); model.setMinEvaluationPrice(evaluationRateService.evaluation(avgPrice, evaluation) / 10000); evaluation.setArea(Double.parseDouble(areas.get(1).toString())); model.setMaxEvaluationPrice(evaluationRateService.evaluation(avgPrice, evaluation) / 10000); - builder.insert(0, areas.get(0).toString() + "-" + areas.get(1).toString() + "平米"); + builder.insert(0, areas.get(0).toString() + "-" + areas.get(1).toString() + "骞崇背"); model.setArea(Double.parseDouble(areas.get(0).toString())); } } else { @@ -1472,7 +1472,7 @@ public class DistrictController { } /** - * 小区信息 + * 灏忓尯淇℃伅 * * @param model * @return @@ -1522,7 +1522,7 @@ public class DistrictController { } /** - * 显示小区在租房源5笔 + * 鏄剧ず灏忓尯鍦ㄧ鎴挎簮5绗� * * @param model * @author xingwang @@ -1548,7 +1548,7 @@ public class DistrictController { } /** - * ajax方式展示小区 + * ajax鏂瑰紡灞曠ず灏忓尯 * * @param model * @return @@ -1561,13 +1561,13 @@ public class DistrictController { ((ServerArea) FangjiaServerAreaContextHolder.getServerAreaDefault()).getDisplay(), model.getRegion(), model.getDistrictName()); if (0 != model.getLatMapMax() && 0 != model.getLatMapMin() && 0 != model.getLngMapMax() && 0 != model.getLngMapMin()) { - int radius = 3;// 周边三公里 + int radius = 3;// 鍛ㄨ竟涓夊叕閲� long lnn = (model.getCurLng() - (radius * 100000000)); long lnx = (model.getCurLng() + (radius * 100000000)); long lan = (model.getCurLat() - (radius * 100000000)); long lax = (model.getCurLat() + (radius * 100000000)); - // 用于查询的经纬度 + // 鐢ㄤ簬鏌ヨ鐨勭粡绾害 long lngMax = DataUtil.matchMax(lnx, lnn, model.getLngMapMax()); long lngMin = DataUtil.matchMin(lnx, lnn, model.getLngMapMin()); long latMax = DataUtil.matchMax(lax, lan, model.getLatMapMax()); @@ -1606,7 +1606,7 @@ public class DistrictController { } /** - * ajax方式取得小区信息 + * ajax鏂瑰紡鍙栧緱灏忓尯淇℃伅 * * @param model * @return @@ -1628,7 +1628,7 @@ public class DistrictController { } /** - * 根据小区组装DistrictBo + * 鏍规嵁灏忓尯缁勮DistrictBo * * @param district * @return @@ -1693,7 +1693,7 @@ public class DistrictController { } /** - * 小区最新二手房房源 + * 灏忓尯鏈�鏂颁簩鎵嬫埧鎴挎簮 * * @param model * @return @@ -1718,7 +1718,7 @@ public class DistrictController { } /** - * 小区相关均价(小区均价和小区所在区域均价) + * 灏忓尯鐩稿叧鍧囦环锛堝皬鍖哄潎浠峰拰灏忓尯鎵�鍦ㄥ尯鍩熷潎浠凤級 * * @param model * @return @@ -1814,10 +1814,10 @@ public class DistrictController { // // startRow, // // pageSize, // // totalRow); -// // // 不需要分页 +// // // 涓嶉渶瑕佸垎椤� // model.setDistrictPicMaps(subListPics); // -// // 小区是否存在均价,不存在的话不显示小区房价tab +// // 灏忓尯鏄惁瀛樺湪鍧囦环锛屼笉瀛樺湪鐨勮瘽涓嶆樉绀哄皬鍖烘埧浠穞ab // DistrictStatBo statBo = districtStatService.findDistrictStat(districtKey); // model.setDistrictStatExist(null != statBo.getDefaultDistrictStat()); // model.setDiaryExist(isDistrictDiaryExist(districtKey)); @@ -1830,7 +1830,7 @@ public class DistrictController { /** - * 小区信息 + * 灏忓尯淇℃伅 * * @param model * @return @@ -2029,7 +2029,7 @@ public class DistrictController { } /** - * 根据IP得到城市 + * 鏍规嵁IP寰楀埌鍩庡競 * * @throws Exception */ @@ -2066,7 +2066,7 @@ public class DistrictController { addressMatchLog.setInput(model.getKeyword()); addressMatchLog.setIp(AnalyticsUtil.getIpAddress(request)); addressMatchLog.setUid(cookieContext.getCookieValue(request, CookieName.UID)); - addressMatchLog.setSource("房价网"); + addressMatchLog.setSource("鎴夸环缃�"); addressMatchLog.setCreationDate(new Date()); addressMatchLog.setModificationDate(new Date()); @@ -2078,7 +2078,7 @@ public class DistrictController { addressMatchLog.setStatus(status); } - if(status == 0){//如果open接口返回多个时,此处需要改 + if(status == 0){//濡傛灉open鎺ュ彛杩斿洖澶氫釜鏃讹紝姝ゅ闇�瑕佹敼 List> result = new ArrayList>(); Map map = new HashMap(); map.put("city", (String) resultMap.get("city")); diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/DistrictReportController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/DistrictReportController.java index ca9b0b2de..13a6de8a8 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/DistrictReportController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/DistrictReportController.java @@ -124,10 +124,10 @@ public class DistrictReportController { private static List NOTICE_MOBILES = new ArrayList(); static { - NOTICE_MOBILES.add("13916992399"); // 蒋 - NOTICE_MOBILES.add("13621626685"); // 杜 - NOTICE_MOBILES.add("13681915777"); // 钟 - NOTICE_MOBILES.add("15201904147"); // 姚 + NOTICE_MOBILES.add("13916992399"); // 钂� + NOTICE_MOBILES.add("13621626685"); // 鏉� + NOTICE_MOBILES.add("13681915777"); // 閽� + NOTICE_MOBILES.add("15201904147"); // 濮� NOTICE_MOBILES.add("13641774460"); // * NOTICE_MOBILES.add("15618378208"); // * } @@ -156,7 +156,7 @@ public class DistrictReportController { public Object introAction(DistrictReportModel model) { /* - * // 报告购买人数 int payedCount = CacheUtils.getValue(this.getClass(), + * // 鎶ュ憡璐拱浜烘暟 int payedCount = CacheUtils.getValue(this.getClass(), * "introAction_0422", "introAction_0422", CachePolicyEnum.TODAY, new * Closure() { public Integer execute(String input) { * int evaCounts = evaluationService.getTotalCount() - 49000000; int @@ -202,17 +202,17 @@ public class DistrictReportController { * knowbaseService.matchDistrictKeys(model.getCityName(), * evaluation.getDistrictName()); if * (CollectionUtils.isNotEmpty(districtKeys)) { for (DistrictKey key : - * districtKeys) { // 知识库匹配出的结果需要城市相同、有区域信息、且和表单中提交的区域相同,表单中没有区域则用第一个小区 + * districtKeys) { // 鐭ヨ瘑搴撳尮閰嶅嚭鐨勭粨鏋滈渶瑕佸煄甯傜浉鍚屻�佹湁鍖哄煙淇℃伅銆佷笖鍜岃〃鍗曚腑鎻愪氦鐨勫尯鍩熺浉鍚岋紝琛ㄥ崟涓病鏈夊尯鍩熷垯鐢ㄧ涓�涓皬鍖� * if (!model.getCityName().equals(key.getCity())) { continue; } if * (StringUtils.isBlank(evaluation.getRegion()) || * evaluation.getRegion().equals(key.getRegion())) { district = * districtService.findDistrict(key, false); if (null != district) { * break; } } } } } if (null == district) { district = - * districtService.findDistrict(new DistrictKey("上海", "闵行", "上海康城"), + * districtService.findDistrict(new DistrictKey("涓婃捣", "闂佃", "涓婃捣搴峰煄"), * false); } model.setDistrict(district); * model.setRegionOrg(regionBlockService.getOrgName(district.getCity(), * district.getRegion(), "region")); - * model.setBlockOrg(district.getBlock() + "板块"); + * model.setBlockOrg(district.getBlock() + "鏉垮潡"); * * DistrictKey districtKey = new DistrictKey(district.getCity(), * district.getRegion(), district.getName()); DistrictStatBo statBo = @@ -262,7 +262,7 @@ public class DistrictReportController { data.put("block", district.getBlock()); data.put("districtName", district.getName()); data.put("regionOrg", regionBlockService.getOrgName(district.getCity(), district.getRegion(), "region")); - data.put("blockOrg", district.getBlock() + "板块"); + data.put("blockOrg", district.getBlock() + "鏉垮潡"); data.put("address", TemplateUtils.bCutString(district.getAddress(), 30)); DistrictKey districtKey = new DistrictKey(district.getCity(), district.getRegion(), district.getName()); @@ -292,10 +292,10 @@ public class DistrictReportController { evaluation.setSource("report"); evaluation.setCreationDate(new Date()); - if ("其他优点".equals(evaluation.getAdvantage())) { + if ("鍏朵粬浼樼偣".equals(evaluation.getAdvantage())) { evaluation.setAdvantage(""); } - if ("其他缺点".equals(evaluation.getDefect())) { + if ("鍏朵粬缂虹偣".equals(evaluation.getDefect())) { evaluation.setDefect(""); } @@ -377,7 +377,7 @@ public class DistrictReportController { } model.setRegionOrg(regionBlockService.getOrgName(evaluation.getCity(), evaluation.getRegion(), "region")); - model.setBlockOrg(evaluation.getBlock() + "板块"); + model.setBlockOrg(evaluation.getBlock() + "鏉垮潡"); return model; } @@ -425,7 +425,7 @@ public class DistrictReportController { } model.setRegionOrg(regionBlockService.getOrgName(evaluation.getCity(), evaluation.getRegion(), "region")); - model.setBlockOrg(evaluation.getBlock() + "板块"); + model.setBlockOrg(evaluation.getBlock() + "鏉垮潡"); return model; } @@ -442,7 +442,7 @@ public class DistrictReportController { return Models.NOT_FOUNT; } - Map evaluationRangeMap = evaluationService.findEvaluationRange(evaluation);//评估价格 + Map evaluationRangeMap = evaluationService.findEvaluationRange(evaluation);//璇勪及浠锋牸 if(null != evaluationRangeMap){ model.setMaxTotalPrice(evaluationRangeMap.get("max")); model.setMinTotalPrice(evaluationRangeMap.get("min")); @@ -458,28 +458,28 @@ public class DistrictReportController { model.setEvaluation(evaluation); model.setRegionOrg(regionBlockService.getOrgName(evaluation.getCity(), evaluation.getRegion(), "region")); - model.setBlockOrg(evaluation.getBlock() + "板块"); + model.setBlockOrg(evaluation.getBlock() + "鏉垮潡"); String ip = AnalyticsUtil.getIpAddress(request); FangjiaConfig fangjiaConfig = FangjiaConfig.getConfig(); Double money = fangjiaConfig.getEvaluationReportPrice(); - if ("北京".equals(model.getCityName())) { + if ("鍖椾含".equals(model.getCityName())) { money = fangjiaConfig.getEvaluationReportPriceBj(); } if (ip.equals("116.247.70.58") || FangjiaConfig.getConfig().isTestEnvironment() || FangjiaConfig.getConfig().isDevelopmentEnvironment()) { - money = 0.01;// 公司测试ip + money = 0.01;// 鍏徃娴嬭瘯ip } String partner = AlipayConfig.alipayPartner; String seller_email = AlipayConfig.alipayEmail; String notify_url = model.getCityUrl() + "/districtReport/paySuccess"; String return_url = model.getCityUrl() + "/districtReport/paySuccess";// AlipayConfig.return_url; - String out_trade_no = "";// 请与贵网站订单系统中的唯一订单号匹配 + String out_trade_no = "";// 璇蜂笌璐电綉绔欒鍗曠郴缁熶腑鐨勫敮涓�璁㈠崟鍙峰尮閰� String service = AlipayConfig.service; - String body = "购买《房调报告》"; // 商品描述,推荐格式:商品名称(订单编号:订单编号) - String total_fee = String.valueOf(money); // 订单总价 - String payment_type = "1";// 支付宝类型.1代表商品购买 - String subject = "购买《房调报告》"; // 商品名称 - String paymethod = "bankPay";// 赋值:bankPay(网银);cartoon(卡通); + String body = "璐拱銆婃埧璋冩姤鍛娿��"; // 鍟嗗搧鎻忚堪锛屾帹鑽愭牸寮忥細鍟嗗搧鍚嶇О锛堣鍗曠紪鍙凤細璁㈠崟缂栧彿锛� + String total_fee = String.valueOf(money); // 璁㈠崟鎬讳环 + String payment_type = "1";// 鏀粯瀹濈被鍨�.1浠h〃鍟嗗搧璐拱 + String subject = "璐拱銆婃埧璋冩姤鍛娿��"; // 鍟嗗搧鍚嶇О + String paymethod = "bankPay";// 璧嬪��:bankPay(缃戦摱);cartoon(鍗¢��); String defaultbank = "ICBCB2C";// "ICBCBTB";//"ICBCB2C"; model.setBody(body); model.setNotify_url(notify_url); @@ -542,7 +542,7 @@ public class DistrictReportController { evaluation.setIp(ip); evaluation.setSource("report"); evaluation.setModificationDate(new Date()); - evaluationService.saveEvaluation(evaluation);//评估价格 + evaluationService.saveEvaluation(evaluation);//璇勪及浠锋牸 } EvaluationReport evaluationReport = model.getEvaluationReport(); @@ -563,15 +563,15 @@ public class DistrictReportController { FangjiaConfig fangjiaConfig = FangjiaConfig.getConfig(); Double money = fangjiaConfig.getEvaluationReportPrice(); - if ("北京".equals(model.getCityName())) { + if ("鍖椾含".equals(model.getCityName())) { money = fangjiaConfig.getEvaluationReportPriceBj(); } if (evaluationReport.getFeeType() == 2) { - money = fangjiaConfig.getEvaluationReportPrice2(); // 使用房币抵扣后的价格 + money = fangjiaConfig.getEvaluationReportPrice2(); // 浣跨敤鎴垮竵鎶垫墸鍚庣殑浠锋牸 } String ip = AnalyticsUtil.getIpAddress(request); if (ip.equals("116.247.70.58")) { - money = 0.01;// 公司测试ip + money = 0.01;// 鍏徃娴嬭瘯ip } String input_charset = AlipayConfig.input_charset; String key = AlipayConfig.alipayKey; @@ -579,13 +579,13 @@ public class DistrictReportController { String seller_email = AlipayConfig.alipayEmail; String notify_url = model.getCityUrl() + "/districtReport/paySuccess"; String return_url = model.getCityUrl() + "/districtReport/paySuccess";// AlipayConfig.return_url; - String out_trade_no = evaluationReport.getId();// 请与贵网站订单系统中的唯一订单号匹配 - String service = model.getService();// 快速付款交易服务 - String body = "购买《房调报告》"; // 商品描述,推荐格式:商品名称(订单编号:订单编号) - String total_fee = String.valueOf(money); // 订单总价 - String payment_type = "1";// 支付宝类型.1代表商品购买 - String subject = "购买《房调报告》"; // 商品名称 - String paymethod = "bankPay";// 赋值:bankPay(网银);cartoon(卡通); + String out_trade_no = evaluationReport.getId();// 璇蜂笌璐电綉绔欒鍗曠郴缁熶腑鐨勫敮涓�璁㈠崟鍙峰尮閰� + String service = model.getService();// 蹇�熶粯娆句氦鏄撴湇鍔� + String body = "璐拱銆婃埧璋冩姤鍛娿��"; // 鍟嗗搧鎻忚堪锛屾帹鑽愭牸寮忥細鍟嗗搧鍚嶇О锛堣鍗曠紪鍙凤細璁㈠崟缂栧彿锛� + String total_fee = String.valueOf(money); // 璁㈠崟鎬讳环 + String payment_type = "1";// 鏀粯瀹濈被鍨�.1浠h〃鍟嗗搧璐拱 + String subject = "璐拱銆婃埧璋冩姤鍛娿��"; // 鍟嗗搧鍚嶇О + String paymethod = "bankPay";// 璧嬪��:bankPay(缃戦摱);cartoon(鍗¢��); String defaultbank = model.getDefaultbank(); Map params = new HashMap(); @@ -628,36 +628,36 @@ public class DistrictReportController { ReportTaste taste = model.getTaste(); ReportTaste sendedTaste = reportTasteService.findSendedByMobile(taste.getUserMobile()); if (null != sendedTaste) { - retData.put("result", "该手机用户已获得了免费体验,
请付费购买《房调报告》,谢谢!"); + retData.put("result", "璇ユ墜鏈虹敤鎴峰凡鑾峰緱浜嗗厤璐逛綋楠岋紝
璇蜂粯璐硅喘涔般�婃埧璋冩姤鍛娿�嬶紝璋㈣阿锛�"); ret.setJsonModel(retData); return ret; } int todayCount = smsCodeService.findMobileCodesToday(taste.getUserMobile(), "taste"); if (todayCount > 1) { - retData.put("result", "该手机号今日已申请过免费体验,
每个手机号每天只能申请1次,谢谢参与!"); + retData.put("result", "璇ユ墜鏈哄彿浠婃棩宸茬敵璇疯繃鍏嶈垂浣撻獙锛�
姣忎釜鎵嬫満鍙锋瘡澶╁彧鑳界敵璇�1娆★紝璋㈣阿鍙備笌锛�"); ret.setJsonModel(retData); return ret; } String dbCode = smsCodeService.findCodeByMobile(taste.getUserMobile(), "taste"); if (null == dbCode) { - retData.put("result", "手机验证码不正确"); + retData.put("result", "鎵嬫満楠岃瘉鐮佷笉姝g‘"); ret.setJsonModel(retData); return ret; } if (!dbCode.equals(model.getMobileCode())) { - retData.put("result", "手机验证码不正确"); + retData.put("result", "鎵嬫満楠岃瘉鐮佷笉姝g‘"); ret.setJsonModel(retData); return ret; } if (null == taste.getHousePrice()) { - taste.setHousePriceDes("不清楚"); + taste.setHousePriceDes("涓嶆竻妤�"); } else { taste.setHousePriceDes(null); } - if ("合理".equals(taste.getPriceLev())) { + if ("鍚堢悊".equals(taste.getPriceLev())) { taste.setPriceExpected(null); } taste.setCreationDate(new Date()); @@ -676,9 +676,9 @@ public class DistrictReportController { evaluationReportService.update(data, taste.getReportId()); StringBuffer content = new StringBuffer(); - content.append("《房调报告》用户手机" + taste.getUserMobile()); - content.append(",邮箱" + taste.getUserEmail()); - content.append(",已申请免费体验,请及时审核"); + content.append("銆婃埧璋冩姤鍛娿�嬬敤鎴锋墜鏈�" + taste.getUserMobile()); + content.append("锛岄偖绠�" + taste.getUserEmail()); + content.append("锛屽凡鐢宠鍏嶈垂浣撻獙锛岃鍙婃椂瀹℃牳"); try { for (String mobile : NOTICE_MOBILES) { smsService.send(mobile, content.toString()); @@ -696,14 +696,14 @@ public class DistrictReportController { public Object paySuccessAction(HttpServletRequest request, DistrictReportModel model) { EvaluationReport evaluationReport = model.getEvaluationReport(); if (null != evaluationReport && ObjectId.isValid(evaluationReport.getId())) { - // 申请的货到付款 + // 鐢宠鐨勮揣鍒颁粯娆� evaluationReport = evaluationReportService.findById(evaluationReport.getId()); model.setEvaluationReport(evaluationReport); if (null == evaluationReport || evaluationReport.getFeeType() != 3) { - // 报告不存在,或者不是货到付款 + // 鎶ュ憡涓嶅瓨鍦紝鎴栬�呬笉鏄揣鍒颁粯娆� return Models.NOT_FOUNT; } else if (evaluationReport.getStatus() == 3) { - // 已处理过,属于重复提交表单 + // 宸插鐞嗚繃锛屽睘浜庨噸澶嶆彁浜よ〃鍗� return model; } @@ -712,14 +712,14 @@ public class DistrictReportController { evaluationReportService.update(data, evaluationReport.getId()); StringBuffer content = new StringBuffer(); - content.append("《房调报告》用户手机:" + evaluationReport.getOfflineMobile()); - content.append(",地址:" + evaluationReport.getOfflineAddress()); - content.append(",已申请货到付款,请及时审核"); + content.append("銆婃埧璋冩姤鍛娿�嬬敤鎴锋墜鏈猴細" + evaluationReport.getOfflineMobile()); + content.append("锛屽湴鍧�锛�" + evaluationReport.getOfflineAddress()); + content.append("锛屽凡鐢宠璐у埌浠樻锛岃鍙婃椂瀹℃牳"); try { for (String mobile : NOTICE_MOBILES) { smsService.send(mobile, content.toString()); } - smsService.send(evaluationReport.getOfflineMobile(), "尊敬的用户,感谢您申购《房调报告》,目前正在审核中,请耐心等待,报告发送后我们将短信通知您。谢谢!"); + smsService.send(evaluationReport.getOfflineMobile(), "灏婃暚鐨勭敤鎴凤紝鎰熻阿鎮ㄧ敵璐�婃埧璋冩姤鍛娿�嬶紝鐩墠姝e湪瀹℃牳涓紝璇疯�愬績绛夊緟锛屾姤鍛婂彂閫佸悗鎴戜滑灏嗙煭淇¢�氱煡鎮ㄣ�傝阿璋紒"); } catch (Exception e) { e.printStackTrace(); } @@ -732,7 +732,7 @@ public class DistrictReportController { Set keys = params.keySet(); for (String key : keys) { if (!(key.equals("sign_type") || key.equals("sign"))) { - // 除去sign和sign_type两个参数 + // 闄ゅ幓sign鍜宻ign_type涓や釜鍙傛暟 params_sign.put(key, request.getParameter(key)); } } @@ -752,7 +752,7 @@ public class DistrictReportController { return model; } - // 处理房币扣除 + // 澶勭悊鎴垮竵鎵i櫎 fjtUserGoldFreezeService.deductUsersGold(evaluationReport.getFjtUserEmail(), -100, evaluationReport.getId()); Map data = new HashMap(); @@ -762,14 +762,14 @@ public class DistrictReportController { evaluationReportService.update(data, evaluationReport.getId()); StringBuffer content = new StringBuffer(); - content.append("《房调报告》用户手机" + evaluationReport.getPhone()); - content.append(",邮箱" + evaluationReport.getMail()); - content.append(",已成功付款,请及时审核"); + content.append("銆婃埧璋冩姤鍛娿�嬬敤鎴锋墜鏈�" + evaluationReport.getPhone()); + content.append("锛岄偖绠�" + evaluationReport.getMail()); + content.append("锛屽凡鎴愬姛浠樻锛岃鍙婃椂瀹℃牳"); try { for (String mobile : NOTICE_MOBILES) { smsService.send(mobile, content.toString()); } - smsService.send(evaluationReport.getPhone(), "尊敬的用户,感谢您申购《房调报告》,目前正在审核中,请耐心等待,报告发送后我们将短信通知您。谢谢!"); + smsService.send(evaluationReport.getPhone(), "灏婃暚鐨勭敤鎴凤紝鎰熻阿鎮ㄧ敵璐�婃埧璋冩姤鍛娿�嬶紝鐩墠姝e湪瀹℃牳涓紝璇疯�愬績绛夊緟锛屾姤鍛婂彂閫佸悗鎴戜滑灏嗙煭淇¢�氱煡鎮ㄣ�傝阿璋紒"); } catch (Exception e) { e.printStackTrace(); } @@ -833,7 +833,7 @@ public class DistrictReportController { // List districtKeys = knowbaseService.matchDistrictKeys(model.getCityName(), model.getDistrictName()); // if (CollectionUtils.isNotEmpty(districtKeys)) { // for (DistrictKey key : districtKeys) { -// // 知识库匹配出的结果需要城市相同、有区域信息、且和表单中提交的区域相同,表单中没有区域则用第一个小区 +// // 鐭ヨ瘑搴撳尮閰嶅嚭鐨勭粨鏋滈渶瑕佸煄甯傜浉鍚屻�佹湁鍖哄煙淇℃伅銆佷笖鍜岃〃鍗曚腑鎻愪氦鐨勫尯鍩熺浉鍚岋紝琛ㄥ崟涓病鏈夊尯鍩熷垯鐢ㄧ涓�涓皬鍖� // if (!model.getCityName().equals(key.getCity())) { // continue; // } @@ -881,7 +881,7 @@ public class DistrictReportController { model.setShowPdfLink(true); } - if (null != model.getEvaluation() && "北京".equals(model.getEvaluation().getCity())) { + if (null != model.getEvaluation() && "鍖椾含".equals(model.getEvaluation().getCity())) { return model.forward("report_a"); } return model; @@ -899,7 +899,7 @@ public class DistrictReportController { model.setShowPdfLink(true); } - if (null != model.getEvaluation() && "北京".equals(model.getEvaluation().getCity())) { + if (null != model.getEvaluation() && "鍖椾含".equals(model.getEvaluation().getCity())) { return model.forward("report2_a"); } return model; @@ -953,7 +953,7 @@ public class DistrictReportController { model.setShowId("FD" + sdf.format(evaluation.getCreationDate())); } - // 估价结果 + // 浼颁环缁撴灉 model.setEvaluation(evaluation); model.setTotalPriceCn(CurrencyConverter.toChinese(Integer.toString((int) Math.floor(evaluation.getTotalPrice() / 10000) * 10000))); model.setAvgPriceMicro(CurrencyConverter.toMicrometer(Integer.toString(evaluation.getAvgPrice()))); @@ -961,8 +961,8 @@ public class DistrictReportController { model.setMaxTotalPrice((int) (totalPrice * (1 + Math.random() / 100 + 0.05))); model.setMinTotalPrice((int) (totalPrice * (1 - Math.random() / 100 - 0.05))); - // 估价的类型是否是别墅 - boolean isVilla = StringUtils.contains(evaluation.getBuildType(), "别墅"); + // 浼颁环鐨勭被鍨嬫槸鍚︽槸鍒 + boolean isVilla = StringUtils.contains(evaluation.getBuildType(), "鍒"); String city = evaluation.getCity(); String region = evaluation.getRegion(); String block = BlockData.formatBlock(city, region, evaluation.getBlock()); @@ -971,7 +971,7 @@ public class DistrictReportController { model.setRegionOrg(regionBlockService.getOrgName(city, region, "region")); if (StringUtils.isNotBlank(block)) { - model.setBlockOrg(block + "板块"); + model.setBlockOrg(block + "鏉垮潡"); } DistrictKey districtKey = new DistrictKey(city, region, districtName); @@ -988,14 +988,14 @@ public class DistrictReportController { } else if (District.VILLA_STRING.equals(districtKind)) { isVilla = true; } - // 其他情况为混合小区,采用估价时的类型 + // 鍏朵粬鎯呭喌涓烘贩鍚堝皬鍖猴紝閲囩敤浼颁环鏃剁殑绫诲瀷 } model.setVilla(isVilla); model.setHouseSummary(houseSummaryService.findHouseSummary(city, region, districtName, evaluation.getHouseNum(), evaluation.getRoomNum())); - // 1.1 房产状况 + // 1.1 鎴夸骇鐘跺喌 HouseLoudong houseInfo = realHouseService.findHouseInfo(districtKey, evaluation.getHouseNum(), evaluation.getRoomNum()); model.setHouseInfo(houseInfo); if (houseRoom == 0 && null != houseInfo && houseInfo.getRoom() > 0) { @@ -1003,12 +1003,12 @@ public class DistrictReportController { } model.setHouseRooms(houseRoom); - // 1.2 均价走势 + // 1.2 鍧囦环璧板娍 int weekCounts = 12; model.setStatWeekCounts(weekCounts); Date now = new Date(); - String buildType = isVilla ? "别墅" : "小区"; - // 1.2 小区走势图信息 + String buildType = isVilla ? "鍒" : "灏忓尯"; + // 1.2 灏忓尯璧板娍鍥句俊鎭� int[] districtMinMaxPrice = districtStatService.findMinMaxDistrictStat(districtKey, buildType, now, weekCounts); model.setDistrictMinPrice(CurrencyConverter.toMicrometer(Integer.toString(districtMinMaxPrice[0]))); model.setDistrictMaxPrice(CurrencyConverter.toMicrometer(Integer.toString(districtMinMaxPrice[1]))); @@ -1026,7 +1026,7 @@ public class DistrictReportController { model.setDistrictStatImgUrl(model.getCityUrl() + "/cImg/" + SecurityUtil.encode(urlBuilder.toString()) + (isRefreshCache ? "?__refresh_cache=1" : "")); - // 1.2 板块走势图信息 + // 1.2 鏉垮潡璧板娍鍥句俊鎭� if (StringUtils.isNotBlank(block)) { int[] blockMinMaxPrice = regionStatService.findMinMaxRegionStat(city, region, block, now, weekCounts); if (null != blockMinMaxPrice) { @@ -1038,7 +1038,7 @@ public class DistrictReportController { model.setBlockYearMarkup(null == blockStatBo.getYearMarkup() ? 0 : blockStatBo.getYearMarkup()); model.setBlockMonthMarkup(null == blockStatBo.getMonthMarkup() ? 0 : blockStatBo.getMonthMarkup()); - // 6 预测 + // 6 棰勬祴 Integer blockPricePredict = pricePredictService.findBlockOneYearLaterPrice(city, region, block); if (null != blockPricePredict) { model.setBlockPredictPrice(blockPricePredict); @@ -1054,7 +1054,7 @@ public class DistrictReportController { + (isRefreshCache ? "?__refresh_cache=1" : "")); } - // 1.2 区域走势图信息 + // 1.2 鍖哄煙璧板娍鍥句俊鎭� int[] regionMinMaxPrice = regionStatService.findMinMaxRegionStat(city, region, null, now, weekCounts); model.setRegionMinPrice(CurrencyConverter.toMicrometer(Integer.toString(regionMinMaxPrice[0]))); model.setRegionMaxPrice(CurrencyConverter.toMicrometer(Integer.toString(regionMinMaxPrice[1]))); @@ -1063,7 +1063,7 @@ public class DistrictReportController { model.setRegionYearMarkup(regionStatBo.getYearMarkup()); model.setRegionMonthMarkup(regionStatBo.getMonthMarkup()); - // 6 预测 + // 6 棰勬祴 Integer regionPricePredict = pricePredictService.findRegionOneYearLaterPrice(city, region); if (null != regionPricePredict) { model.setRegionPredictPrice(regionPricePredict); @@ -1077,7 +1077,7 @@ public class DistrictReportController { model.setRegionStatImgUrl(model.getCityUrl() + "/cImg/" + SecurityUtil.encode(urlBuilder.toString()) + (isRefreshCache ? "?__refresh_cache=1" : "")); - // 1.2 城市走势图信息 + // 1.2 鍩庡競璧板娍鍥句俊鎭� int[] cityMinMaxPrice = regionStatService.findMinMaxRegionStat(city, null, null, now, weekCounts); model.setCityMinPrice(CurrencyConverter.toMicrometer(Integer.toString(cityMinMaxPrice[0]))); model.setCityMaxPrice(CurrencyConverter.toMicrometer(Integer.toString(cityMinMaxPrice[1]))); @@ -1086,7 +1086,7 @@ public class DistrictReportController { model.setCityYearMarkup(cityStatBo.getYearMarkup()); model.setCityMonthMarkup(cityStatBo.getMonthMarkup()); - // 6 预测 + // 6 棰勬祴 Integer cityPricePredict = pricePredictService.findCityOneYearLaterPrice(city); if (null != cityPricePredict) { model.setCityPredictPrice(cityPricePredict); @@ -1098,7 +1098,7 @@ public class DistrictReportController { model.setCityStatImgUrl(model.getCityUrl() + "/cImg/" + SecurityUtil.encode(urlBuilder.toString()) + (isRefreshCache ? "?__refresh_cache=1" : "")); - // 1.3 同类成交房源 + // 1.3 鍚岀被鎴愪氦鎴挎簮 List similarTradeHouses = realHouseService.findHouseTradeHistory(districtKey, houseRoom, evaluation.getArea(), 10, isVilla); if (CollectionUtils.isEmpty(similarTradeHouses)) { @@ -1134,7 +1134,7 @@ public class DistrictReportController { // } // model.setSimilarTradeHouses(similarTradeHouses); - // 2 成交分析 + // 2 鎴愪氦鍒嗘瀽 urlBuilder = new StringBuilder(); urlBuilder.append("pt=3&c=").append(city).append("&r=").append(region).append("&dn=").append(districtName).append("&et=") .append(buildType).append("&w=150&h=150&t=0"); @@ -1172,7 +1172,7 @@ public class DistrictReportController { model.setDistrictAttention(districtAttentionRankService.findByDistrictKey(districtKey)); model.setRegionDistrictAttentionTop(districtAttentionRankService.findRegionTopBo(city, region, 7)); - // 3 租金分析 + // 3 绉熼噾鍒嗘瀽 urlBuilder = new StringBuilder(); urlBuilder.append("pt=1&c=").append(city).append("&r=").append(region).append("&dn=").append(districtName).append("&wc=") .append(weekCounts).append("&et=").append(buildType).append("&w=250&h=140"); @@ -1241,7 +1241,7 @@ public class DistrictReportController { + (isRefreshCache ? "?__refresh_cache=1" : "")); model.setRentAreaPropImgMark(jFreeChartImageService.getDistrictRentAreaPieImgMark(city, region, districtName)); - // 4 排行榜 + // 4 鎺掕姒� DistrictTradeAnalyseBo districtTradeStatBo = districtTradeAnalyseService.findLastTrade(districtKey, buildType); model.setDistrictTradeStatBo(districtTradeStatBo); @@ -1272,7 +1272,7 @@ public class DistrictReportController { model.setDistrictStatRank(districtStatRankService.findLastRank(districtKey, block, buildType)); model.setCityRankImgPercent(jFreeChartImageService.getDistrictRankPercent(city, region, block, districtName, buildType, "city")); - // 5 楼市热度 + // 5 妤煎競鐑害 List cityHots = cityHotService.findAll(city, new Date(), 12); int cityMaxSellCount = Integer.MIN_VALUE; int cityMinSellCount = Integer.MAX_VALUE; @@ -1321,7 +1321,7 @@ public class DistrictReportController { model.setCityTradeCountImgUrl(model.getCityUrl() + "/cImg/" + SecurityUtil.encode(urlBuilder.toString()) + (isRefreshCache ? "?__refresh_cache=1" : "")); - // 6 房价预测 + // 6 鎴夸环棰勬祴 Integer districtPricePredict = pricePredictService.findDistrictOneYearLaterPrice(districtKey, buildType); if (null != districtPricePredict) { model.setHousePredictPrice(evaluationRateService.evaluation(districtPricePredict, evaluation)); @@ -1329,7 +1329,7 @@ public class DistrictReportController { / evaluation.getTotalPrice() * 10000)); } - // 7.1 小区成交中介排名 + // 7.1 灏忓尯鎴愪氦涓粙鎺掑悕 List masterBos = new ArrayList(10); AgencyDistrictTradeRank districtAgencys = districtService.findAgencyDistrictTradeRank(districtKey); if (null != districtAgencys) { @@ -1341,14 +1341,14 @@ public class DistrictReportController { break; } - if (!"未知".equals(detail.get("full_name"))) { + if (!"鏈煡".equals(detail.get("full_name"))) { agencys.add(detail); } } model.setDistrictAgencys(agencys); - // 7.2 中介详情 - String maxSellAddress = "暂无"; + // 7.2 涓粙璇︽儏 + String maxSellAddress = "鏆傛棤"; long dLat = district.getLat(); long dLng = district.getLng(); for (int i = 0; i < agencys.size(); i++) { @@ -1421,7 +1421,7 @@ public class DistrictReportController { model.setDistrictAgent(districtAgent); model.setMasterBos(masterBos); - // 10 相似房源 + // 10 鐩镐技鎴挎簮 double area = evaluation.getArea(); model.setSimilarDistrictHouseList(getSimilarDistrictHouse(city, region, districtName, houseRoom, area, 5, model.getFilterHouse())); @@ -1440,7 +1440,7 @@ public class DistrictReportController { model.setShowPdfLink(true); } -// if (null != model.getEvaluation() && "北京".equals(model.getEvaluation().getCity())) { +// if (null != model.getEvaluation() && "鍖椾含".equals(model.getEvaluation().getCity())) { // return model.forward("report3_a"); // } return model; @@ -1494,7 +1494,7 @@ public class DistrictReportController { model.setShowId("FD" + sdf.format(evaluation.getCreationDate())); } - // 估价结果 + // 浼颁环缁撴灉 model.setEvaluation(evaluation); model.setTotalPriceCn(CurrencyConverter.toChinese(Integer.toString((int) Math.floor(evaluation.getTotalPrice() / 10000) * 10000))); model.setAvgPriceMicro(CurrencyConverter.toMicrometer(Integer.toString(evaluation.getAvgPrice()))); @@ -1502,8 +1502,8 @@ public class DistrictReportController { model.setMaxTotalPrice((int) (totalPrice * (1 + Math.random() / 100 + 0.05))); model.setMinTotalPrice((int) (totalPrice * (1 - Math.random() / 100 - 0.05))); - // 估价的类型是否是别墅 - boolean isVilla = StringUtils.contains(evaluation.getBuildType(), "别墅"); + // 浼颁环鐨勭被鍨嬫槸鍚︽槸鍒 + boolean isVilla = StringUtils.contains(evaluation.getBuildType(), "鍒"); String city = evaluation.getCity(); String region = evaluation.getRegion(); String block = BlockData.formatBlock(city, region, evaluation.getBlock()); @@ -1519,7 +1519,7 @@ public class DistrictReportController { } if (StringUtils.isNotBlank(block)) { - model.setBlockOrg(block + "板块"); + model.setBlockOrg(block + "鏉垮潡"); } model.setRegionDistrictCount(districtService.findRegionDistrictCount(city, region)); @@ -1537,14 +1537,14 @@ public class DistrictReportController { } else if (District.VILLA_STRING.equals(districtKind)) { isVilla = true; } - // 其他情况为混合小区,采用估价时的类型 + // 鍏朵粬鎯呭喌涓烘贩鍚堝皬鍖猴紝閲囩敤浼颁环鏃剁殑绫诲瀷 } model.setVilla(isVilla); model.setHouseSummary(houseSummaryService.findHouseSummary(city, region, districtName, evaluation.getHouseNum(), evaluation.getRoomNum())); - // 1.1 房产状况 + // 1.1 鎴夸骇鐘跺喌 HouseLoudong houseInfo = realHouseService.findHouseInfo(districtKey, evaluation.getHouseNum(), evaluation.getRoomNum()); model.setHouseInfo(houseInfo); if (houseRoom == 0 && null != houseInfo && houseInfo.getRoom() > 0) { @@ -1552,12 +1552,12 @@ public class DistrictReportController { } model.setHouseRooms(houseRoom); - // 1.2 均价走势 + // 1.2 鍧囦环璧板娍 int weekCounts = 12; model.setStatWeekCounts(weekCounts); Date now = new Date(); - String buildType = isVilla ? "别墅" : "小区"; - // 1.2 小区走势图信息 + String buildType = isVilla ? "鍒" : "灏忓尯"; + // 1.2 灏忓尯璧板娍鍥句俊鎭� int[] districtMinMaxPrice = districtStatService.findMinMaxDistrictStat(districtKey, buildType, now, weekCounts); model.setDistrictMinPrice(CurrencyConverter.toMicrometer(Integer.toString(districtMinMaxPrice[0]))); model.setDistrictMaxPrice(CurrencyConverter.toMicrometer(Integer.toString(districtMinMaxPrice[1]))); @@ -1575,7 +1575,7 @@ public class DistrictReportController { model.setDistrictStatImgUrl(model.getCityUrl() + "/cImg/" + SecurityUtil.encode(urlBuilder.toString()) + (isRefreshCache ? "?__refresh_cache=1" : "")); - // 1.2 板块走势图信息 + // 1.2 鏉垮潡璧板娍鍥句俊鎭� // if (StringUtils.isNotBlank(block)) { // int[] blockMinMaxPrice = regionStatService.findMinMaxRegionStat(city, region, block, now, weekCounts); // if (null != blockMinMaxPrice) { @@ -1587,7 +1587,7 @@ public class DistrictReportController { // model.setBlockYearMarkup(null == blockStatBo.getYearMarkup() ? 0 : blockStatBo.getYearMarkup()); // model.setBlockMonthMarkup(null == blockStatBo.getMonthMarkup() ? 0 : blockStatBo.getMonthMarkup()); // -// // 6 预测 +// // 6 棰勬祴 // Integer blockPricePredict = pricePredictService.findBlockOneYearLaterPrice(city, region, block); // if (null != blockPricePredict) { // model.setBlockPredictPrice(blockPricePredict); @@ -1603,7 +1603,7 @@ public class DistrictReportController { // + (isRefreshCache ? "?__refresh_cache=1" : "")); // } - // 1.2 区域走势图信息 + // 1.2 鍖哄煙璧板娍鍥句俊鎭� int[] regionMinMaxPrice = regionStatService.findMinMaxRegionStat(city, region, null, now, weekCounts); model.setRegionMinPrice(CurrencyConverter.toMicrometer(Integer.toString(regionMinMaxPrice[0]))); model.setRegionMaxPrice(CurrencyConverter.toMicrometer(Integer.toString(regionMinMaxPrice[1]))); @@ -1612,7 +1612,7 @@ public class DistrictReportController { model.setRegionYearMarkup(regionStatBo.getYearMarkup()); model.setRegionMonthMarkup(regionStatBo.getMonthMarkup()); - // 6 预测 + // 6 棰勬祴 // Integer regionPricePredict = pricePredictService.findRegionOneYearLaterPrice(city, region); // if (null != regionPricePredict) { // model.setRegionPredictPrice(regionPricePredict); @@ -1626,7 +1626,7 @@ public class DistrictReportController { model.setRegionStatImgUrl(model.getCityUrl() + "/cImg/" + SecurityUtil.encode(urlBuilder.toString()) + (isRefreshCache ? "?__refresh_cache=1" : "")); - // 1.2 城市走势图信息 + // 1.2 鍩庡競璧板娍鍥句俊鎭� int[] cityMinMaxPrice = regionStatService.findMinMaxRegionStat(city, null, null, now, weekCounts); model.setCityMinPrice(CurrencyConverter.toMicrometer(Integer.toString(cityMinMaxPrice[0]))); model.setCityMaxPrice(CurrencyConverter.toMicrometer(Integer.toString(cityMinMaxPrice[1]))); @@ -1635,7 +1635,7 @@ public class DistrictReportController { model.setCityYearMarkup(cityStatBo.getYearMarkup()); model.setCityMonthMarkup(cityStatBo.getMonthMarkup()); - // 6 预测 + // 6 棰勬祴 // Integer cityPricePredict = pricePredictService.findCityOneYearLaterPrice(city); // if (null != cityPricePredict) { // model.setCityPredictPrice(cityPricePredict); @@ -1647,12 +1647,12 @@ public class DistrictReportController { model.setCityStatImgUrl(model.getCityUrl() + "/cImg/" + SecurityUtil.encode(urlBuilder.toString()) + (isRefreshCache ? "?__refresh_cache=1" : "")); - // 1.3 同类成交房源 + // 1.3 鍚岀被鎴愪氦鎴挎簮 // List similarTradeHouses = realHouseService.findHouseTradeHistory(districtKey, houseRoom, -// evaluation.getArea(), 10, isVilla);//一年内有面积限制 +// evaluation.getArea(), 10, isVilla);//涓�骞村唴鏈夐潰绉檺鍒� // if (CollectionUtils.isEmpty(similarTradeHouses)) { // similarTradeHouses = realHouseService.findHouseTradeHistory(districtKey, houseRoom, -1, 10, isVilla); -// }//无面积限制 +// }//鏃犻潰绉檺鍒� // if (CollectionUtils.isEmpty(similarTradeHouses)) { // similarTradeHouses = realHouseService.findHouseTradeHistoryLatest(districtKey, 10, isVilla); // }// @@ -1696,7 +1696,7 @@ public class DistrictReportController { } model.setSimilarTradeHouses(similarTradeHouses); - // 2 成交分析 + // 2 鎴愪氦鍒嗘瀽 urlBuilder = new StringBuilder(); urlBuilder.append("pt=3&c=").append(city).append("&r=").append(region).append("&dn=").append(districtName).append("&et=") .append(buildType).append("&w=150&h=150&t=0"); @@ -1737,7 +1737,7 @@ public class DistrictReportController { model.setDistrictAttention(districtAttentionRankService.findByDistrictKey(districtKey)); model.setRegionDistrictAttentionTop(districtAttentionRankService.findRegionTopBo(city, region, 7)); - // 3 租金分析 + // 3 绉熼噾鍒嗘瀽 urlBuilder = new StringBuilder(); urlBuilder.append("pt=1&c=").append(city).append("&r=").append(region).append("&dn=").append(districtName).append("&wc=") .append(weekCounts).append("&et=").append(buildType).append("&w=250&h=140"); @@ -1804,7 +1804,7 @@ public class DistrictReportController { + (isRefreshCache ? "?__refresh_cache=1" : "")); model.setRentAreaPropImgMark(jFreeChartImageService.getDistrictRentAreaPieImgMark(city, region, districtName)); - // 4 排行榜 + // 4 鎺掕姒� DistrictTradeAnalyseBo districtTradeStatBo = districtTradeAnalyseService.findLastTrade(districtKey, buildType); model.setDistrictTradeStatBo(districtTradeStatBo); @@ -1841,7 +1841,7 @@ public class DistrictReportController { //model.setDistrictStatRank(districtStatRankService.findLastRank(districtKey, block, buildType)); // model.setBlockRankImgPercent(jFreeChartImageService.getDistrictRankPercent(city, region, block, districtName, buildType)); model.setCityRankImgPercent(jFreeChartImageService.getDistrictRankPercent(city, region, null, districtName, buildType, "city")); - // 5 楼市热度 + // 5 妤煎競鐑害 List cityHots = cityHotService.findAll(city, new Date(), 12); int cityMaxSellCount = Integer.MIN_VALUE; int cityMinSellCount = Integer.MAX_VALUE; @@ -1890,7 +1890,7 @@ public class DistrictReportController { // model.setCityTradeCountImgUrl(model.getCityUrl() + "/cImg/" + SecurityUtil.encode(urlBuilder.toString()) // + (isRefreshCache ? "?__refresh_cache=1" : "")); - // 6 房价预测 + // 6 鎴夸环棰勬祴 // Integer districtPricePredict = pricePredictService.findDistrictOneYearLaterPrice(districtKey, buildType); // if (null != districtPricePredict) { // model.setHousePredictPrice(evaluationRateService.evaluation(districtPricePredict, evaluation)); @@ -1898,16 +1898,16 @@ public class DistrictReportController { // / evaluation.getTotalPrice() * 10000)); // } - // 7 楼盘情报 - // 3.2 开发商 + // 7 妤肩洏鎯呮姤 + // 3.2 寮�鍙戝晢 model.setDeveloper(developerService.findByName(city, district.getDeveloper())); - // 3.2 物业公司 + // 3.2 鐗╀笟鍏徃 model.setManagementCompany(managementCompanyService.findByName(city, district.getEstateCompany())); - // 3.4房型图 + // 3.4鎴垮瀷鍥� getDistrictImgs(district, model); - // 4.1 3.3 周边配套信息 + // 4.1 3.3 鍛ㄨ竟閰嶅淇℃伅 DistrictFacilitys facilitys = districtService.findDistrictFacilitys(districtKey); if (null != facilitys) { facilitys.setMetro(metroDistanceService.getMetrosNameByDistrict(districtKey)); @@ -1917,7 +1917,7 @@ public class DistrictReportController { model.setDistanceMap(districtService.districtDistanceOfMark(district.getLat(), district.getLng())); - // 10 相似房源 + // 10 鐩镐技鎴挎簮 //double area = evaluation.getArea(); model.setSimilarDistrictHouseList(similarDistrictHouse); return model; @@ -1957,7 +1957,7 @@ public class DistrictReportController { } String token = CoresiteCookieContext.getInstance().getCookieValue(request, CookieName.COOKIE_TOKEN); - // 验证用户房币 + // 楠岃瘉鐢ㄦ埛鎴垮竵 if (StringUtils.isBlank(token)) { retData.put("ret", "0"); return ret; @@ -2033,18 +2033,18 @@ public class DistrictReportController { model.setShowId("FD" + sdf.format(evaluation.getCreationDate())); } - // 1.1估价结果 + // 1.1浼颁环缁撴灉 model.setEvaluation(evaluation); model.setTotalPriceCn(CurrencyConverter.toChinese(Integer.toString((int) Math.floor(evaluation.getTotalPrice() / 10000) * 10000))); model.setAvgPriceMicro(CurrencyConverter.toMicrometer(Integer.toString(evaluation.getAvgPrice()))); int totalPrice = evaluation.getTotalPrice(); model.setMaxTotalPrice((int) (totalPrice * (1 + Math.random() / 100 + 0.05))); model.setMinTotalPrice((int) (totalPrice * (1 - Math.random() / 100 - 0.05))); - // 9月供 + // 9鏈堜緵 processLoan(totalPrice, model); - // 估价的类型是否是别墅 - boolean isVilla = StringUtils.contains(evaluation.getBuildType(), "别墅"); + // 浼颁环鐨勭被鍨嬫槸鍚︽槸鍒 + boolean isVilla = StringUtils.contains(evaluation.getBuildType(), "鍒"); String city = evaluation.getCity(); String region = evaluation.getRegion(); String block = BlockData.formatBlock(city, region, evaluation.getBlock()); @@ -2052,9 +2052,9 @@ public class DistrictReportController { int houseRoom = null == evaluation.getRoom() ? 2 : evaluation.getRoom(); model.setRegionOrg(regionBlockService.getOrgName(city, region, "region")); - // TODO 应该要像region一样做格式化 + // TODO 搴旇瑕佸儚region涓�鏍峰仛鏍煎紡鍖� if (StringUtils.isNotBlank(block)) { - model.setBlockOrg(block + "板块"); + model.setBlockOrg(block + "鏉垮潡"); } DistrictKey districtKey = new DistrictKey(city, region, districtName); @@ -2068,15 +2068,15 @@ public class DistrictReportController { } else if (District.VILLA_STRING.equals(districtKind)) { isVilla = true; } - // 其他情况为混合小区,采用估价时的类型 + // 鍏朵粬鎯呭喌涓烘贩鍚堝皬鍖猴紝閲囩敤浼颁环鏃剁殑绫诲瀷 } model.setVilla(isVilla); - // 各章节的专业评估 + // 鍚勭珷鑺傜殑涓撲笟璇勪及 model.setHouseSummary(houseSummaryService.findHouseSummary(city, region, districtName, evaluation.getHouseNum(), evaluation.getRoomNum())); - // 1.1 房产状况 + // 1.1 鎴夸骇鐘跺喌 HouseLoudong houseInfo = realHouseService.findHouseInfo(districtKey, evaluation.getHouseNum(), evaluation.getRoomNum()); model.setHouseInfo(houseInfo); if (houseRoom == 0 && null != houseInfo && houseInfo.getRoom() > 0) { @@ -2084,12 +2084,12 @@ public class DistrictReportController { } model.setHouseRooms(houseRoom); - // 1.2 均价走势 + // 1.2 鍧囦环璧板娍 int weekCounts = 12; model.setStatWeekCounts(weekCounts); Date now = new Date(); - String buildType = isVilla ? "别墅" : "小区"; - // 1.2 小区走势图信息 + String buildType = isVilla ? "鍒" : "灏忓尯"; + // 1.2 灏忓尯璧板娍鍥句俊鎭� int[] districtMinMaxPrice = districtStatService.findMinMaxDistrictStat(districtKey, buildType, now, weekCounts); model.setDistrictMinPrice(CurrencyConverter.toMicrometer(Integer.toString(districtMinMaxPrice[0]))); model.setDistrictMaxPrice(CurrencyConverter.toMicrometer(Integer.toString(districtMinMaxPrice[1]))); @@ -2107,7 +2107,7 @@ public class DistrictReportController { model.setDistrictStatImgUrl(model.getCityUrl() + "/cImg/" + SecurityUtil.encode(urlBuilder.toString()) + (isRefreshCache ? "?__refresh_cache=1" : "")); - // 1.2 板块走势图信息 + // 1.2 鏉垮潡璧板娍鍥句俊鎭� if (StringUtils.isNotBlank(block)) { int[] blockMinMaxPrice = regionStatService.findMinMaxRegionStat(city, region, block, now, weekCounts); if (null != blockMinMaxPrice) { @@ -2119,7 +2119,7 @@ public class DistrictReportController { model.setBlockYearMarkup(null == blockStatBo.getYearMarkup() ? 0 : blockStatBo.getYearMarkup()); model.setBlockMonthMarkup(null == blockStatBo.getMonthMarkup() ? 0 : blockStatBo.getMonthMarkup()); - // 7 预测 + // 7 棰勬祴 Integer blockPricePredict = pricePredictService.findBlockOneYearLaterPrice(city, region, block); if (null != blockPricePredict) { model.setBlockPredictPrice(blockPricePredict); @@ -2135,7 +2135,7 @@ public class DistrictReportController { + (isRefreshCache ? "?__refresh_cache=1" : "")); } - // 1.2 区域走势图信息 + // 1.2 鍖哄煙璧板娍鍥句俊鎭� int[] regionMinMaxPrice = regionStatService.findMinMaxRegionStat(city, region, null, now, weekCounts); model.setRegionMinPrice(CurrencyConverter.toMicrometer(Integer.toString(regionMinMaxPrice[0]))); model.setRegionMaxPrice(CurrencyConverter.toMicrometer(Integer.toString(regionMinMaxPrice[1]))); @@ -2144,7 +2144,7 @@ public class DistrictReportController { model.setRegionYearMarkup(regionStatBo.getYearMarkup()); model.setRegionMonthMarkup(regionStatBo.getMonthMarkup()); - // 7 预测 + // 7 棰勬祴 Integer regionPricePredict = pricePredictService.findRegionOneYearLaterPrice(city, region); if (null != regionPricePredict) { model.setRegionPredictPrice(regionPricePredict); @@ -2158,7 +2158,7 @@ public class DistrictReportController { model.setRegionStatImgUrl(model.getCityUrl() + "/cImg/" + SecurityUtil.encode(urlBuilder.toString()) + (isRefreshCache ? "?__refresh_cache=1" : "")); - // 1.2 城市走势图信息 + // 1.2 鍩庡競璧板娍鍥句俊鎭� int[] cityMinMaxPrice = regionStatService.findMinMaxRegionStat(city, null, null, now, weekCounts); model.setCityMinPrice(CurrencyConverter.toMicrometer(Integer.toString(cityMinMaxPrice[0]))); model.setCityMaxPrice(CurrencyConverter.toMicrometer(Integer.toString(cityMinMaxPrice[1]))); @@ -2167,7 +2167,7 @@ public class DistrictReportController { model.setCityYearMarkup(cityStatBo.getYearMarkup()); model.setCityMonthMarkup(cityStatBo.getMonthMarkup()); - // 7 预测 + // 7 棰勬祴 Integer cityPricePredict = pricePredictService.findCityOneYearLaterPrice(city); if (null != cityPricePredict) { model.setCityPredictPrice(cityPricePredict); @@ -2179,10 +2179,10 @@ public class DistrictReportController { model.setCityStatImgUrl(model.getCityUrl() + "/cImg/" + SecurityUtil.encode(urlBuilder.toString()) + (isRefreshCache ? "?__refresh_cache=1" : "")); - // 1.3房源成交历史 + // 1.3鎴挎簮鎴愪氦鍘嗗彶 model.setTradeHis(realHouseService.findHouseTradeHistory(districtKey, evaluation.getHouseNum(), evaluation.getRoomNum())); -// // 1.4 同类成交房源 +// // 1.4 鍚岀被鎴愪氦鎴挎簮 // List similarTradeHouses = realHouseService.findHouseTradeHistory(districtKey, houseRoom, evaluation.getArea(), 10, isVilla); // if (CollectionUtils.isEmpty(similarTradeHouses)) { // similarTradeHouses = realHouseService.findHouseTradeHistory(districtKey, houseRoom, -1, 10, isVilla); @@ -2225,13 +2225,13 @@ public class DistrictReportController { // temp++; // } // -// // 1.4 最高最低成交单价 +// // 1.4 鏈�楂樻渶浣庢垚浜ゅ崟浠� // model.setMinAvgPriceIndex(minIndex); // model.setMaxAvgPriceIndex(maxIndex); // } // model.setSimilarTradeHouses(similarTradeHouses); - // 2 租金分析 + // 2 绉熼噾鍒嗘瀽 urlBuilder = new StringBuilder(); urlBuilder.append("pt=1&c=").append(city).append("&r=").append(region).append("&dn=").append(districtName).append("&wc=") .append(weekCounts).append("&et=").append(buildType).append("&w=250&h=140"); @@ -2316,16 +2316,16 @@ public class DistrictReportController { model.setDistrictHot(districtHot); - // 3楼盘情报 - // 3.2 开发商 + // 3妤肩洏鎯呮姤 + // 3.2 寮�鍙戝晢 model.setDeveloper(developerService.findByName(city, district.getDeveloper())); - // 3.2 物业公司 + // 3.2 鐗╀笟鍏徃 model.setManagementCompany(managementCompanyService.findByName(city, district.getEstateCompany())); - // 3.4房型图 + // 3.4鎴垮瀷鍥� getDistrictImgs(district, model); - // 4.1 3.3 5 周边配套信息 + // 4.1 3.3 5 鍛ㄨ竟閰嶅淇℃伅 DistrictFacilitys facilitys = districtService.findDistrictFacilitys(districtKey); if (null != facilitys) { facilitys.setMetro(metroDistanceService.getMetrosNameByDistrict(districtKey)); @@ -2335,7 +2335,7 @@ public class DistrictReportController { model.setDistanceMap(districtService.districtDistanceOfMark(district.getLat(), district.getLng())); - // 6 楼市热度 + // 6 妤煎競鐑害 List cityHots = cityHotService.findAll(city, new Date(), 12); int cityMaxSellCount = Integer.MIN_VALUE; int cityMinSellCount = Integer.MAX_VALUE; @@ -2384,7 +2384,7 @@ public class DistrictReportController { model.setCityTradeCountImgUrl(model.getCityUrl() + "/cImg/" + SecurityUtil.encode(urlBuilder.toString()) + (isRefreshCache ? "?__refresh_cache=1" : "")); - // 7 房价预测 + // 7 鎴夸环棰勬祴 Integer districtPricePredict = pricePredictService.findDistrictOneYearLaterPrice(districtKey, buildType); if (null != districtPricePredict) { model.setHousePredictPrice(evaluationRateService.evaluation(districtPricePredict, evaluation)); @@ -2392,7 +2392,7 @@ public class DistrictReportController { / evaluation.getTotalPrice() * 10000)); } - // 8.1 小区成交中介排名 + // 8.1 灏忓尯鎴愪氦涓粙鎺掑悕 List masterBos = new ArrayList(10); AgencyDistrictTradeRank districtAgencys = districtService.findAgencyDistrictTradeRank(districtKey); if (null != districtAgencys) { @@ -2404,14 +2404,14 @@ public class DistrictReportController { break; } - if (!"未知".equals(detail.get("full_name"))) { + if (!"鏈煡".equals(detail.get("full_name"))) { agencys.add(detail); } } model.setDistrictAgencys(agencys); - // 7.2 中介详情 - String maxSellAddress = "暂无"; + // 7.2 涓粙璇︽儏 + String maxSellAddress = "鏆傛棤"; long dLat = district.getLat(); long dLng = district.getLng(); for (int i = 0; i < agencys.size(); i++) { @@ -2496,24 +2496,24 @@ public class DistrictReportController { List pressureRange1 = new ArrayList(8); List payMonthly1 = new ArrayList(5); - // 30年贷3成的月供 + // 30骞磋捶3鎴愮殑鏈堜緵 double payMonthly11 = getPayMonth(totlaPrice, month, rate, 0.7);//totlaPrice * 0.3 / 360 + totlaPrice * 0.3 * monthRate; payMonthly1.add(df.format((long) payMonthly11)); - // 30年贷4成的月供 + // 30骞磋捶4鎴愮殑鏈堜緵 double payMonthly12 = getPayMonth(totlaPrice, month, rate, 0.6);//totlaPrice * 0.4 / 360 + totlaPrice * 0.4 * monthRate; payMonthly1.add(df.format((long) payMonthly12)); - // 30年贷5成的月供 + // 30骞磋捶5鎴愮殑鏈堜緵 double payMonthly13 = getPayMonth(totlaPrice, month, rate, 0.5);//totlaPrice * 0.5 / 360 + totlaPrice * 0.5 * monthRate; payMonthly1.add(df.format((long) payMonthly13)); - // 30年贷6成的月供 + // 30骞磋捶6鎴愮殑鏈堜緵 double payMonthly14 = getPayMonth(totlaPrice, month, rate, 0.4);//totlaPrice * 0.6 / 360 + totlaPrice * 0.6 * monthRate; payMonthly1.add(df.format((long) payMonthly14)); - // 30年贷7成的月供 + // 30骞磋捶7鎴愮殑鏈堜緵 double payMonthly15 = getPayMonth(totlaPrice, month, rate, 0.3);//totlaPrice * 0.7 / 360 + totlaPrice * 0.7 * monthRate; payMonthly1.add(df.format((long) payMonthly15)); model.setPayMonthly1(payMonthly1); - // 家庭收入动态分档(区间) + // 瀹跺涵鏀跺叆鍔ㄦ�佸垎妗o紙鍖洪棿锛� int rangeStart2 = (int) (payMonthly11 * 2 / 1000) * 1000 + 3000; int rangeEnd2 = (int) (payMonthly15 * 2 / 1000) * 1000 + 3000; int range2 = (int) Math.ceil((rangeEnd2 - rangeStart2) / 7000) * 1000 + 1000; @@ -2527,7 +2527,7 @@ public class DistrictReportController { pressureRange1.add((rangeStart2 + range2 * 7) + "-" + (rangeStart2 + range2 * 8)); model.setPressureRange1(pressureRange1); - // 各种贷款方式对应家庭收入,计算压力值 + // 鍚勭璐锋鏂瑰紡瀵瑰簲瀹跺涵鏀跺叆锛岃绠楀帇鍔涘�� List pressure11 = new ArrayList(5); pressure11.add(getPressure(payMonthly11, rangeStart2 / 2)); pressure11.add(getPressure(payMonthly12, rangeStart2 / 2)); @@ -2660,7 +2660,7 @@ public class DistrictReportController { Calendar ca = Calendar.getInstance(); ca.setTime(endDate); ca.add(Calendar.MONTH, -6); - // 半年前月份第一天 + // 鍗婂勾鍓嶆湀浠界涓�澶� Date halfYearMonth = ca.getTime(); params.add(new QueryParam("publishDate", QueryParam.GREATER_THAN_OPERATOR, halfYearMonth)); params.add(new QueryParam("publishDate", QueryParam.LESS_THAN_OPERATOR, endDate)); @@ -2669,7 +2669,7 @@ public class DistrictReportController { } /** - * 小区里类似房源 + * 灏忓尯閲岀被浼兼埧婧� */ private List getSimilarDistrictHouse(String city, String region, String districtName, int room, double area, int retSize,Boolean filterHouse) { @@ -2777,7 +2777,7 @@ public class DistrictReportController { } /** - * 板块里类似房源 + * 鏉垮潡閲岀被浼兼埧婧� */ private List getSimilarBlockHouse(String city, String region, String block, String districtName, int room, double area) { @@ -2833,36 +2833,36 @@ public class DistrictReportController { } /** - * 获取房型图(1、2、3室的各一张),取4张外景图 + * 鑾峰彇鎴垮瀷鍥撅紙1銆�2銆�3瀹ょ殑鍚勪竴寮狅級锛屽彇4寮犲鏅浘 */ @SuppressWarnings("unchecked") private void getDistrictImgs(District district, DistrictReportModel model) { - // 户型图 + // 鎴峰瀷鍥� /* * if (null != district && * CollectionUtils.isNotEmpty(district.getSrcFloorplanPics())) { - * List srcFloorplanPics = district.getSrcFloorplanPics(); // 1室 + * List srcFloorplanPics = district.getSrcFloorplanPics(); // 1瀹� * for (Object pic : srcFloorplanPics) { if (pic == null || pic * instanceof String) { continue; } else if (pic instanceof Map) { * Map picInfo = (Map) pic; String * description = picInfo.get("description"); if - * (StringUtils.contains(description, "1室1厅") || - * StringUtils.contains(description, "一室一厅")) { - * model.setRoom1Str("1房1厅"); model.setRoom1ImgUrl(picInfo.get("url")); - * srcFloorplanPics.remove(pic); break; } } } // 2室 for (Object pic : + * (StringUtils.contains(description, "1瀹�1鍘�") || + * StringUtils.contains(description, "涓�瀹や竴鍘�")) { + * model.setRoom1Str("1鎴�1鍘�"); model.setRoom1ImgUrl(picInfo.get("url")); + * srcFloorplanPics.remove(pic); break; } } } // 2瀹� for (Object pic : * srcFloorplanPics) { if (pic == null || pic instanceof String) { * continue; } else if (pic instanceof Map) { Map * picInfo = (Map) pic; String description = * picInfo.get("description"); if (StringUtils.contains(description, - * "2室2厅") || StringUtils.contains(description, "两室两厅")) { - * model.setRoom2Str("2房2厅"); model.setRoom2ImgUrl(picInfo.get("url")); - * srcFloorplanPics.remove(pic); break; } } } // 3室 for (Object pic : + * "2瀹�2鍘�") || StringUtils.contains(description, "涓ゅ涓ゅ巺")) { + * model.setRoom2Str("2鎴�2鍘�"); model.setRoom2ImgUrl(picInfo.get("url")); + * srcFloorplanPics.remove(pic); break; } } } // 3瀹� for (Object pic : * srcFloorplanPics) { if (pic == null || pic instanceof String) { * continue; } else if (pic instanceof Map) { Map * picInfo = (Map) pic; String description = * picInfo.get("description"); if (StringUtils.contains(description, - * "3室2厅") || StringUtils.contains(description, "三室两厅")) { - * model.setRoom3Str("3房2厅"); model.setRoom3ImgUrl(picInfo.get("url")); + * "3瀹�2鍘�") || StringUtils.contains(description, "涓夊涓ゅ巺")) { + * model.setRoom3Str("3鎴�2鍘�"); model.setRoom3ImgUrl(picInfo.get("url")); * srcFloorplanPics.remove(pic); break; } } } * * List retUrls = getFloorImgUrl(srcFloorplanPics); if @@ -2920,7 +2920,7 @@ public class DistrictReportController { } } - // 外景图 + // 澶栨櫙鍥� if (null != district && CollectionUtils.isNotEmpty(district.getOutPics())) { List allOutPics = district.getOutPics(); if (CollectionUtils.isNotEmpty(allOutPics)) { @@ -2995,7 +2995,7 @@ public class DistrictReportController { district = districts.get(0); } - //只有一个或是没找到相同的时,取第一个. + //鍙湁涓�涓垨鏄病鎵惧埌鐩稿悓鐨勬椂锛屽彇绗竴涓紟 // if(districts!=null && districts.size()>0 && model.getDistrict() == null){ // model.setDistrict(districts.get(0)); // model.setDistrictName2(model.getDistrict().getName()); @@ -3004,7 +3004,7 @@ public class DistrictReportController { - //将库中查询匹配不到的小区记录下来 + //灏嗗簱涓煡璇㈠尮閰嶄笉鍒扮殑灏忓尯璁板綍涓嬫潵 if(district == null){ HttpServletRequest request = ActionContext.getContext().getRequest(); String ipAddress = AnalyticsUtil.getIpAddress(request); @@ -3013,7 +3013,7 @@ public class DistrictReportController { addressMatchLog.setCity(evaluation.getCity()); addressMatchLog.setInput(keyword); addressMatchLog.setStatus(1); - addressMatchLog.setSource("房价网"); + addressMatchLog.setSource("鎴夸环缃�"); addressMatchLog.setCreationDate(new Date()); addressMatchLog.setSearchCount(0); addressMatchLog.setIp(ipAddress); @@ -3024,9 +3024,9 @@ public class DistrictReportController { } - private final static String[] ROOM_PATTERNS = new String[] { "(一|两|三|四|五|六|七|八|九)室", "(\\d{1})室", "(\\d{1})房", - "(一|两|三|四|五|六|七|八|九)房", "(\\d{1})房\\d{1}厅", "(一|两|三|四|五|六|七|八|九)居", "(\\d{1})居" }; - private final static String[] HALL_PATTERNS = new String[] { "(一|两|二|三|四|五)厅", "(\\d{1})厅" }; + private final static String[] ROOM_PATTERNS = new String[] { "(涓�|涓涓墊鍥泑浜攟鍏瓅涓億鍏珅涔�)瀹�", "(\\d{1})瀹�", "(\\d{1})鎴�", + "(涓�|涓涓墊鍥泑浜攟鍏瓅涓億鍏珅涔�)鎴�", "(\\d{1})鎴縗\d{1}鍘�", "(涓�|涓涓墊鍥泑浜攟鍏瓅涓億鍏珅涔�)灞�", "(\\d{1})灞�" }; + private final static String[] HALL_PATTERNS = new String[] { "(涓�|涓浜寍涓墊鍥泑浜�)鍘�", "(\\d{1})鍘�" }; private String getFloorDes(String des) { if (StringUtils.isBlank(des)) { @@ -3044,7 +3044,7 @@ public class DistrictReportController { if ("0".equals(room)) { continue; } - roomStr += room + "房"; + roomStr += room + "鎴�"; break; } } @@ -3052,7 +3052,7 @@ public class DistrictReportController { p = Pattern.compile(HALL_PATTERNS[i]); m = p.matcher(des); if (m.find()) { - roomStr += DataUtil.convertHanziToNumber2(m.group(1)) + "厅"; + roomStr += DataUtil.convertHanziToNumber2(m.group(1)) + "鍘�"; break; } } diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/ElevateWordController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/ElevateWordController.java index cd34726d1..ee59012d8 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/ElevateWordController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/ElevateWordController.java @@ -64,7 +64,7 @@ public class ElevateWordController { private FriendLinkService friendLinkService; /** - * 竞品词页面 + * 绔炲搧璇嶉〉闈� * * @param model * @param request @@ -105,7 +105,7 @@ public class ElevateWordController { model.setCurrentHouseCity(ServerAreaData.getServerAreaByDisplay(currentArea.getDisplay()).getName()); model.setCurrentHouseCityName(currentArea.getDisplay()); - // 变量替换 + // 鍙橀噺鏇挎崲 elevateWord = placeHolderReplacer(elevateWord, currentArea.getDisplay()); if (StringUtils.isBlank(model.getHouseType())) { @@ -135,9 +135,9 @@ public class ElevateWordController { } queryBean.setCity(currentArea.getDisplay()); FacetQueryResult rentHouseResult = rentHouseResult(queryBean, model, 14); - // 推荐租房 + // 鎺ㄨ崘绉熸埧 List recommendRentHouseList = Collections.emptyList(); - // 租房列表 + // 绉熸埧鍒楄〃 List rentHouseList = Collections.emptyList(); if (CollectionUtils.isNotEmpty(rentHouseResult)) { if (rentHouseResult.size() >= 10) { @@ -172,9 +172,9 @@ public class ElevateWordController { } queryBean.setCity(currentArea.getDisplay()); FacetQueryResult houseResultList = houseResult(queryBean, model, 14); - // 推荐二手房 + // 鎺ㄨ崘浜屾墜鎴� List recommendHouseList = Collections.emptyList(); - // 二手房列表 + // 浜屾墜鎴垮垪琛� List houseList = Collections.emptyList(); if (CollectionUtils.isNotEmpty(houseResultList)) { if (houseResultList.size() >= 10) { @@ -242,7 +242,7 @@ public class ElevateWordController { } /** - * 当前城市4套推荐租房 + * 褰撳墠鍩庡競4濂楁帹鑽愮鎴� * * @param elevateWord * @param currentArea @@ -263,7 +263,7 @@ public class ElevateWordController { } /** - * 当前竞品词有房源的城市列表 + * 褰撳墠绔炲搧璇嶆湁鎴挎簮鐨勫煄甯傚垪琛� * * @param elevateWord * @param model @@ -315,7 +315,7 @@ public class ElevateWordController { } /** - * 随即资讯 + * 闅忓嵆璧勮 * * @param elevateWord * @param model @@ -363,7 +363,7 @@ public class ElevateWordController { model.redirectPermanently(model.getCityUrl()); return model; - // 更新域名 + // 鏇存柊鍩熷悕 // fangjiaDomainHandler.update(); // List list = elevateWordService.findElevateWords(); // List list = elevateWordService.findAdjustElevateWordsByCity(model.getElevateWordShowCity()); @@ -385,7 +385,7 @@ public class ElevateWordController { } private void feedFooter(ElevateWordModel model) { - // 最新上线的城市 + // 鏈�鏂颁笂绾跨殑鍩庡競 List newCitys = new ArrayList(); List serverAreaList = ServerAreaData.getServerAreaList(15); List cityNames = CollectionUtils.collect(serverAreaList, new Closure() { @@ -405,10 +405,10 @@ public class ElevateWordController { } /** - * 获取当前城市 + * 鑾峰彇褰撳墠鍩庡競 * * @param request - * @return 当前城市 + * @return 褰撳墠鍩庡競 */ private ServerArea getSuggestCity(HttpServletRequest request) { String ip = AnalyticsUtil.getIpAddress(request); @@ -427,7 +427,7 @@ public class ElevateWordController { } /** - * 城市首页 底部竞品词列表 + * 鍩庡競棣栭〉 搴曢儴绔炲搧璇嶅垪琛� * * @param model * @return @@ -436,11 +436,11 @@ public class ElevateWordController { return model.redirectPermanently(model.getCityUrl()); // List boList = new ArrayList(); // List elevateWords = null; -// // 城市列表 +// // 鍩庡競鍒楄〃 // /*if (StringUtils.isNotBlank(model.getElevateWordShowCity())) { // elevateWords = elevateWordService.findElevateWordsByCity(model.getElevateWordShowCity()); // } else { -// // 全国首页 +// // 鍏ㄥ浗棣栭〉 // elevateWords = elevateWordService.findElevateWords(model.getPlacement()); // }*/ // elevateWords = elevateWordService.findAdjustElevateWordsByCity(model.getElevateWordShowCity()); @@ -562,7 +562,7 @@ public class ElevateWordController { } /** - * 当前竞品词 的房源 如果当前城市 没有,显示推荐城市二手房房源 + * 褰撳墠绔炲搧璇� 鐨勬埧婧� 濡傛灉褰撳墠鍩庡競 娌℃湁锛屾樉绀烘帹鑽愬煄甯備簩鎵嬫埧鎴挎簮 * * @param elevateWord * @param model @@ -618,7 +618,7 @@ public class ElevateWordController { } /** - * 当前竞品词 的房源 如果当前城市 没有,显示推荐城市租房房源 + * 褰撳墠绔炲搧璇� 鐨勬埧婧� 濡傛灉褰撳墠鍩庡競 娌℃湁锛屾樉绀烘帹鑽愬煄甯傜鎴挎埧婧� * * @param elevateWord * @param model @@ -679,7 +679,7 @@ public class ElevateWordController { } /** - * 友情链接 + * 鍙嬫儏閾炬帴 * * @return */ diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/EvaluationController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/EvaluationController.java index 36af6dfbc..aef32a54c 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/EvaluationController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/EvaluationController.java @@ -167,7 +167,7 @@ import com.fangjia.service.web.MenuService; import com.ibm.icu.math.BigDecimal; /** - * 估价 + * 浼颁环 * */ @SuppressWarnings("all") @@ -198,7 +198,7 @@ public class EvaluationController { private AddressService addressService; private AddressMatchProxyService addressMatchProxyService; private GoldLogsService goldLogsService; - private final Pattern addressPattern = Pattern.compile("(\\w+)[号楼幢橦](\\w+||\\d{3,4})室?"); + private final Pattern addressPattern = Pattern.compile("(\\w+)[鍙锋ゼ骞㈡│](\\w+||\\d{3,4})瀹�?"); private final Pattern floorPattern = Pattern.compile("(\\d{1,2})0\\d"); private final Pattern houseNumPattern = Pattern.compile("(\\d+||\\w+)"); private AddressMatchLogService addressMatchLogService; @@ -217,7 +217,7 @@ public class EvaluationController { private AdLogService adLogService; private static int QUARTER_WEEK = 13; private static int MONTH_OF_YEAR = 12; - private static String CHANNEL_NAME_DEFAULT = "广点通1"; + private static String CHANNEL_NAME_DEFAULT = "骞跨偣閫�1"; private static String CHANNEL_NAME_DEFAULT_SECONDHOUSE = "secondHouse"; private static String CHANNEL_NAME_DEFAULT_NEWHOUSE = "newHouse"; private AlgorithmRuleService algorithmRuleService; @@ -301,7 +301,7 @@ public class EvaluationController { } /** - * 估价结果 + * 浼颁环缁撴灉 * @param model * @return */ @@ -309,7 +309,7 @@ public class EvaluationController { model.setReportTitle(model.getDistrictName()); Map> demoList = new HashMap>(); DistrictKey districtKey = new DistrictKey(model.getCityName(),model.getRegion(),model.getDistrictName()); - //五年前 + //浜斿勾鍓� Date date = DateUtil.getDateOfLastMonth(new Date(), -60); date = DateUtil.getFirstDayOfWeek(date); @@ -334,17 +334,17 @@ public class EvaluationController { demoList.put(weekend, list); } Map> treemap = new HashMap>(); - //处理开盘价,收盘价,峰值,谷值 + //澶勭悊寮�鐩樹环锛屾敹鐩樹环锛屽嘲鍊硷紝璋峰�� for(String key:demoList.keySet()){ List valueList = new ArrayList(); List values = demoList.get(key); - if(values.size()<2){ //只有一个数据的跳过 + if(values.size()<2){ //鍙湁涓�涓暟鎹殑璺宠繃 continue; } - valueList.add(values.get(0)); //开盘价 - valueList.add(values.get(values.size()-1)); //收盘价 - valueList.add(Collections.min(values)); //谷值 - valueList.add(Collections.max(values)); //峰值 + valueList.add(values.get(0)); //寮�鐩樹环 + valueList.add(values.get(values.size()-1)); //鏀剁洏浠� + valueList.add(Collections.min(values)); //璋峰�� + valueList.add(Collections.max(values)); //宄板�� treemap.put(key, valueList); } TreeMap demos = new TreeMap(treemap); @@ -381,13 +381,13 @@ public class EvaluationController { } /** - * 估价 + * 浼颁环 * * @return * @throws Exception */ public Object evaluationAction(EvaluationModel model) throws Exception { - // 老的估价首页action,301跳转到估价页面 + // 鑰佺殑浼颁环棣栭〉action锛�301璺宠浆鍒颁及浠烽〉闈� model.setViewType("redirect"); model.setViewParam("statusCode", 301); model.setViewParam("location", "/evaluation/report"); @@ -395,7 +395,7 @@ public class EvaluationController { } /** - * 列表页过来的请求 + * 鍒楄〃椤佃繃鏉ョ殑璇锋眰 * * @param model * @return @@ -407,7 +407,7 @@ public class EvaluationController { } /** - * 估价历史模块 + * 浼颁环鍘嗗彶妯″潡 * * @param model * @return @@ -468,15 +468,15 @@ public class EvaluationController { StringBuilder sb = new StringBuilder(); if (null == model.getDistrict()) { - sb.append("小区不存在!
"); + sb.append("灏忓尯涓嶅瓨鍦紒
"); } else if (null != eva) { if (null == eva.getAvgPrice()) { - sb.append("该小区暂不能估价!
"); + sb.append("璇ュ皬鍖烘殏涓嶈兘浼颁环锛�
"); } if (null == eva.getArea()) { - sb.append("请输入面积!"); + sb.append("璇疯緭鍏ラ潰绉紒"); } else if (eva.getArea() <= 0) { - sb.append("面积不正确!"); + sb.append("闈㈢Н涓嶆纭紒"); } } model.setErrMsg(sb.toString()); @@ -485,7 +485,7 @@ public class EvaluationController { /** - * 首页评估页面 + * 棣栭〉璇勪及椤甸潰 * @param model * @return * @throws Exception @@ -498,7 +498,7 @@ public class EvaluationController { evaluation.setCity(model.getCityName()); model.setEvaluation(evaluation); - //以下处理从首页过来,找到小区的情况 + //浠ヤ笅澶勭悊浠庨椤佃繃鏉ワ紝鎵惧埌灏忓尯鐨勬儏鍐� if(StringUtils.isNotBlank(model.getDistrictName())){ Map dataMap = evaluationService.parseAddressInfo(model.getDistrictName(), model.getCityName(),model.getRegion()); @@ -528,7 +528,7 @@ public class EvaluationController { if(null != searchMap.get("roomNumber")){ Integer floor = parseFloorInfo((String)searchMap.get("roomNumber")); if(floor!=null){ - model.setRoomNum(((String)searchMap.get("roomNumber")).replace("室", "")); + model.setRoomNum(((String)searchMap.get("roomNumber")).replace("瀹�", "")); model.setFloor(floor); } } @@ -547,7 +547,7 @@ public class EvaluationController { } } } - //走势图数据 + //璧板娍鍥炬暟鎹� Date startDate = DateUtil.getBeforeDate(new Date(), -12); EvaluationJsonModel json = getAvgPriceData(model.getCityName(),model.getRegion(),model.getDistrictName(),startDate, false); model.setDistrictMap(json.getDistrictMap()); @@ -555,8 +555,8 @@ public class EvaluationController { model.setCityMap(json.getCityMap()); model.setTimeList(json.getTimeList()); - //图表的标题 - SimpleDateFormat format = new SimpleDateFormat("yyyy年MM月"); + //鍥捐〃鐨勬爣棰� + SimpleDateFormat format = new SimpleDateFormat("yyyy骞碝M鏈�"); model.setTitle(format.format(startDate)+"-"+format.format(new Date())); SimpleDateFormat sf1 = new SimpleDateFormat("yyyy"); @@ -569,8 +569,8 @@ public class EvaluationController { /*DistrictStatBo statBo = getNearestDistrictStat(new DistrictKey(model.getCityName(),model.getRegion(),model.getDistrictName())); if(statBo!=null && statBo.getDistrictStat().getAvgPrice()!=0){ - int weekAvgPrice = statBo.getDistrictStat().getAvgPrice(); //上周均价 - int weekendMarkup = statBo.getDistrictStat().getWeekendMarkup(); //涨跌幅 + int weekAvgPrice = statBo.getDistrictStat().getAvgPrice(); //涓婂懆鍧囦环 + int weekendMarkup = statBo.getDistrictStat().getWeekendMarkup(); //娑ㄨ穼骞� model.setWeekAvgPrice(weekAvgPrice); model.setWeekendMarkup(weekendMarkup); }else{ @@ -604,9 +604,9 @@ public class EvaluationController { } } - //PC端轮播广告如果为两个时循环两遍(添加重复的两条) + //PC绔疆鎾箍鍛婂鏋滀负涓や釜鏃跺惊鐜袱閬嶏紙娣诲姞閲嶅鐨勪袱鏉★級 if(carouselAdvertisementList!=null){ - //有两张以上轮播图片时适应前端排序(把最后一张图片移到最前面) + //鏈変袱寮犱互涓婅疆鎾浘鐗囨椂閫傚簲鍓嶇鎺掑簭锛堟妸鏈�鍚庝竴寮犲浘鐗囩Щ鍒版渶鍓嶉潰锛� if(carouselAdvertisementList.size() > 1){ carouselAdvertisementList.add(0, carouselAdvertisementList.get(carouselAdvertisementList.size()-1)); carouselAdvertisementList.remove(carouselAdvertisementList.size()-1); @@ -623,7 +623,7 @@ public class EvaluationController { } /** - * 评估 + * 璇勪及 * @param model * @return * @throws Exception @@ -704,7 +704,7 @@ public class EvaluationController { evaluation.setHeight(model.getHeight()); evaluation.setArea(model.getHouseArea()); - //对于Map嵌套Map这种类型,jsonLib在转成成bean的时候有问题,需要重新赋值 + //瀵逛簬Map宓屽Map杩欑绫诲瀷锛宩sonLib鍦ㄨ浆鎴愭垚bean鐨勬椂鍊欐湁闂锛岄渶瑕侀噸鏂拌祴鍊� /*if (loan.getAvgPriceNearby() != null && result != null) { Map> avgPriceNearby = (Map>) result.get("avgPriceNearby"); loan.setAvgPriceNearby(avgPriceNearby); @@ -718,7 +718,7 @@ public class EvaluationController { loan.setHouses(houses); } - //将城市价格走势直接从json中取出来,然后赋值到bean是为了保证map的有序性 + //灏嗗煄甯備环鏍艰蛋鍔跨洿鎺ヤ粠json涓彇鍑烘潵锛岀劧鍚庤祴鍊煎埌bean鏄负浜嗕繚璇乵ap鐨勬湁搴忔�� if (loan.getCityAvgZouShi() != null) { Map cityAvgZouShi = (Map) result.get("cityAvgZouShi"); loan.setCityAvgZouShi(cityAvgZouShi); @@ -737,7 +737,7 @@ public class EvaluationController { goldLogs.setUserId(user.getId()); goldLogs.setStatus(2); goldLogs.setGoldCount(1); - goldLogs.setContent("房产评估"); + goldLogs.setContent("鎴夸骇璇勪及"); goldLogs.setActionType(0); goldLogs.setDateCreated(new Date()); goldLogs.setLastUpdated(new Date()); @@ -747,7 +747,7 @@ public class EvaluationController { /** - * 估价报告 + * 浼颁环鎶ュ憡 * * @return * @throws Exception @@ -760,10 +760,10 @@ public class EvaluationController { // if (null != model) { // if (StringUtils.isNotBlank(model.getId()) && // (!model.getIsReEvaluation())) { - // // 有估价报告且不是重新评估 + // // 鏈変及浠锋姤鍛婁笖涓嶆槸閲嶆柊璇勪及 // } else if (StringUtils.isNotBlank(model.getHouseId())) { - // // 根据房源估价 - // } else {// 重新评估:按照旧Id,按照新信息 评估 + // // 鏍规嵁鎴挎簮浼颁环 + // } else {// 閲嶆柊璇勪及锛氭寜鐓ф棫Id锛屾寜鐓ф柊淇℃伅 璇勪及 // if (model.getIsReEvaluation() && StringUtils.isNotBlank(model.getId())) { // evaluation = evaluationService.findEvaluationById(model.getId()); // if (null != evaluation) { @@ -773,8 +773,8 @@ public class EvaluationController { // AnalyticsUtil.getIpAddress(ActionContext.getContext().getRequest()); // evaluation.setIp(ip); // evaluation.setSource("site"); - // evaluation.setId(null);// 重新估价 - // evaluation.setAvgPrice(null);// 无均价 + // evaluation.setId(null);// 閲嶆柊浼颁环 + // evaluation.setAvgPrice(null);// 鏃犲潎浠� // } // } else { // evaluation = model.getEvaluation(); @@ -793,7 +793,7 @@ public class EvaluationController { // model.setEvaluation(evaluation); // model.setHintMap(evaluationCheck(evaluation)); // if (MapUtils.isEmpty(model.getHintMap())) { - // // 待估价的小区可能存在同名小区 + // // 寰呬及浠风殑灏忓尯鍙兘瀛樺湪鍚屽悕灏忓尯 // Map konwbase = // knowbaseService.parseWord(evaluation.getDistrictName()); // List> districts = (null != konwbase && null != @@ -839,11 +839,11 @@ public class EvaluationController { // e.setId(null); // HouseQueryBean queryBean = buildQuery(model.getKeyword(), district, e); // List houseBoList = findSimilarHouse(queryBean); - // // 处理类似房源信息 + // // 澶勭悊绫讳技鎴挎簮淇℃伅 // // setSimilarInfoToList(houseBoList); // model.setHouseBoList(houseBoList); // int avgPrice = getDistrictAvgPrice(model, district, e); - // // 没有均价 根据关键词重新取小区均价 + // // 娌℃湁鍧囦环 鏍规嵁鍏抽敭璇嶉噸鏂板彇灏忓尯鍧囦环 // if (avgPrice == 0) { // if (StringUtils.isNotBlank(model.getKeyword())) { // paraseEvaluationModelByKnowbase(model, model.getKeyword()); @@ -855,7 +855,7 @@ public class EvaluationController { // model.setDistrictName(district.getName()); // } // } - // // 还没有均价 + // // 杩樻病鏈夊潎浠� // if (avgPrice == 0 && StringUtils.isNotBlank(model.getDistrictName())) { // avgPrice = getHouseAvgPrice(model); // } @@ -875,7 +875,7 @@ public class EvaluationController { // e.setCreationDate(new Date()); // e.setModificationDate(new Date()); // e.setAvgPrice(avgPrice); - // // 房型存在,面积不存在 + // // 鎴垮瀷瀛樺湪锛岄潰绉笉瀛樺湪 // if (null != e.getRoom() && null == e.getArea()) { // HousePrice housePrice = housePriceService.findHousePrice(e.getCity(), // e.getRegion(), @@ -884,7 +884,7 @@ public class EvaluationController { // e.setArea(housePrice.getHouseArea()); // } // } - // // 面积存在 估价 + // // 闈㈢Н瀛樺湪 浼颁环 // if (null != e.getArea() && 0 != e.getArea()) { // long totalPrice = evaluationRateService.evaluation(avgPrice, e); // e.setTotalPrice(((Number) (totalPrice)).intValue()); @@ -906,14 +906,14 @@ public class EvaluationController { // HouseQueryBean queryBean = buildQuery(model.getKeyword(), null, // evaluation); // List houseBoList = findSimilarHouse(queryBean); - // // 处理类似房源信息 + // // 澶勭悊绫讳技鎴挎簮淇℃伅 // // setSimilarInfoToList(houseBoList); // model.setHouseBoList(houseBoList); // } // } // } // /** - // * 估价结果 + // * 浼颁环缁撴灉 // */ // if (null == evaluation || null == evaluation.getAvgPrice() || // evaluation.getAvgPrice() == 0) { @@ -925,7 +925,7 @@ public class EvaluationController { // evaluation.getTotalPrice()) ? evaluation.getTotalPrice() / 10000 // : 0L); // /** - // * 是否有小区均价 判断是否显示走势图 + // * 鏄惁鏈夊皬鍖哄潎浠� 鍒ゆ柇鏄惁鏄剧ず璧板娍鍥� // */ // List dss = districtStatService.findDistrictStat( // new DistrictKey(evaluation.getCity(), evaluation.getRegion(), @@ -953,7 +953,7 @@ public class EvaluationController { // if (null != evaluation) { // model.setRegion(evaluation.getRegion()); // model.setDistrictName(evaluation.getDistrictName()); - // // 下面参数为更多链接所用 + // // 涓嬮潰鍙傛暟涓烘洿澶氶摼鎺ユ墍鐢� // if (null != evaluation.getArea() && 0 != evaluation.getArea()) { // String areaRange = ((Number) (evaluation.getArea() * 0.85)).intValue() + // "_" @@ -972,13 +972,13 @@ public class EvaluationController { // return model; // } /** - * 获取估价报告页中股价及小区均价走势数据 + * 鑾峰彇浼颁环鎶ュ憡椤典腑鑲′环鍙婂皬鍖哄潎浠疯蛋鍔挎暟鎹� * * @param model * @return */ public String evaluationOfcAction(OfcConfigModel model) { - // 获取估价 + // 鑾峰彇浼颁环 Evaluation evaluation = this.evaluationService.findEvaluationById(model.getId()); if (null == evaluation) { evaluation = this.evaluationService.findEvaluationById(model.getId()); @@ -987,26 +987,26 @@ public class EvaluationController { int height = model.getChartHeight(); com.fangjia.service.chart.ofc.bean.OfcStyleConfig config = new com.fangjia.service.chart.ofc.bean.OfcStyleConfig(); config.setBackgroundImage(model.getBackgroundImage()); - config.setToolTip("#x_label#
#val#万"); - config.setyFormat("#val#万"); + config.setToolTip("#x_label#
#val#涓�"); + config.setyFormat("#val#涓�"); config.setHeight(height); config.setWidth(model.getWidth()); config.setXStep(OfcChartUtils.getStepNew(model.getWeekCount(), config.getWidth(), model.getDatePattern())); config.setXAxisGridSteps(7); - // 不展示走势说明 + // 涓嶅睍绀鸿蛋鍔胯鏄� config.setShowText(model.isShowText()); List dss = Collections.emptyList(); - // 查不到,没走势数据 + // 鏌ヤ笉鍒帮紝娌¤蛋鍔挎暟鎹� if (null != evaluation) { - // 判断是否展示所有历史数据,若weekCount为0则展示所有历史数据 + // 鍒ゆ柇鏄惁灞曠ず鎵�鏈夊巻鍙叉暟鎹�,鑻eekCount涓�0鍒欏睍绀烘墍鏈夊巻鍙叉暟鎹� if (0 == model.getWeekCount()) { - // 获取最早的小区均价weekend时间 + // 鑾峰彇鏈�鏃╃殑灏忓尯鍧囦环weekend鏃堕棿 Date endDate = this.districtStatService.findMinWeekEnd(evaluation.getDistrictName(), evaluation.getCity(), null, evaluation.getBuildType()); - // 获取从endDate至今的周数 + // 鑾峰彇浠巈ndDate鑷充粖鐨勫懆鏁� List weekendList = DateUtil.getWeekendListFromStartDateToEndDate(new Date(), endDate == null ? new Date() : endDate); - // 设置周数 + // 璁剧疆鍛ㄦ暟 if (CollectionUtils.isNotEmpty(weekendList)) { model.setWeekCount(weekendList.size()); } @@ -1021,7 +1021,7 @@ public class EvaluationController { } /** - * 估价二手房走势 = (版块|区域|城市 走势) + 本次估价结果 + * 浼颁环浜屾墜鎴胯蛋鍔� = (鐗堝潡|鍖哄煙|鍩庡競 璧板娍) + 鏈浼颁环缁撴灉 * * @param model * @return @@ -1033,26 +1033,26 @@ public class EvaluationController { OfcStyleConfig config = new OfcStyleConfig(); config.setHeight(model.getHeight()); config.setWidth(model.getWidth()); - config.setToolTip("#x_label#
#val#万"); - config.setyFormat("#val#万"); + config.setToolTip("#x_label#
#val#涓�"); + config.setyFormat("#val#涓�"); config.setXStep(OfcChartUtils.getStepNew(model.getWeekCount(), config.getWidth(), model.getDatePattern())); config.setXAxisGridSteps(7); - // 不展示走势说明 + // 涓嶅睍绀鸿蛋鍔胯鏄� config.setShowText(model.isShowText()); if (null != evaluation) { List statList = null; String block = evaluation.getBlock(); String region = evaluation.getRegion(); String city = evaluation.getCity(); - if (StringUtils.isNotBlank(block)) {// 板块均价 + if (StringUtils.isNotBlank(block)) {// 鏉垮潡鍧囦环 statList = regionStatService.findRegionStat(city, region, DataUtil.formatBlock(block), new Date(), model.getWeekCount()); - } else if (StringUtils.isNotBlank(region) && CollectionUtils.isEmpty(statList)) {// 区域均价 + } else if (StringUtils.isNotBlank(region) && CollectionUtils.isEmpty(statList)) {// 鍖哄煙鍧囦环 statList = regionStatService.findRegionStat(city, region, null, new Date(), model.getWeekCount()); - } else if (StringUtils.isNotBlank(city) && CollectionUtils.isEmpty(statList)) {// 城市均价 + } else if (StringUtils.isNotBlank(city) && CollectionUtils.isEmpty(statList)) {// 鍩庡競鍧囦环 statList = regionStatService.findRegionStat(city, null, null, new Date(), model.getWeekCount()); } - // 不展示走势说明 + // 涓嶅睍绀鸿蛋鍔胯鏄� config.setShowText(model.isShowText()); LineChartDataProvider lineChartDataProvider = new GujiaTrendDataProvider(date, model.getWeekCount(), model.getDatePattern(), evaluation, statList); @@ -1076,7 +1076,7 @@ public class EvaluationController { // } /** - * 估价输入框内信息自动填充 + * 浼颁环杈撳叆妗嗗唴淇℃伅鑷姩濉厖 * * @return */ @@ -1099,7 +1099,7 @@ public class EvaluationController { if (CollectionUtils.isNotEmpty(districtKeys)) { for (DistrictKey key : districtKeys) { - // 知识库匹配出的结果需要城市相同、有区域信息、且和表单中提交的区域相同,表单中没有区域则用第一个小区 + // 鐭ヨ瘑搴撳尮閰嶅嚭鐨勭粨鏋滈渶瑕佸煄甯傜浉鍚屻�佹湁鍖哄煙淇℃伅銆佷笖鍜岃〃鍗曚腑鎻愪氦鐨勫尯鍩熺浉鍚岋紝琛ㄥ崟涓病鏈夊尯鍩熷垯鐢ㄧ涓�涓皬鍖� if (!model.getCityName().equals(key.getCity())) { continue; } @@ -1190,15 +1190,15 @@ public class EvaluationController { model.setViewType("json"); model.setViewParam("config", null); model = getDistrictByKeyword(model.getCityName(), model.getDistrictName(), model); - //判断是否有均价 + //鍒ゆ柇鏄惁鏈夊潎浠� return model; } /** - * 检查小区是否有均价以及当前用户当天只能评估20次
- * 无均价则不能估价,超过20次也提示
- * 没登录当天只能评估一次 + * 妫�鏌ュ皬鍖烘槸鍚︽湁鍧囦环浠ュ強褰撳墠鐢ㄦ埛褰撳ぉ鍙兘璇勪及20娆�
+ * 鏃犲潎浠峰垯涓嶈兘浼颁环锛岃秴杩�20娆′篃鎻愮ず
+ * 娌$櫥褰曞綋澶╁彧鑳借瘎浼颁竴娆� * @param model * @return */ @@ -1218,7 +1218,7 @@ public class EvaluationController { return model; }*/ if (StringUtils.isBlank(userId)) { - //没登录3次 + //娌$櫥褰�3娆� userId = CoresiteCookieContext.getInstance().getCookieValue(req, CookieName.UID); int count = evaluationService.getCountToday(userId); if (count > 2) { @@ -1227,7 +1227,7 @@ public class EvaluationController { return model; } }else{ - //登录5次 + //鐧诲綍5娆� int count = evaluationService.getCountToday(userId); if (count > 4) { model.setPermissionEvaluation(false); @@ -1236,15 +1236,15 @@ public class EvaluationController { } } - // 根据IP限制评估次数 + // 鏍规嵁IP闄愬埗璇勪及娆℃暟 String ip = AnalyticsUtil.getIpAddress(req); if ("116.247.70.58".equals(ip) || ip.startsWith("192.168")) { - LOGGER.info("自动化测试,不做验证码认证:"+ip); + LOGGER.info("鑷姩鍖栨祴璇曪紝涓嶅仛楠岃瘉鐮佽璇�:"+ip); }else{ IpCount ipCount = ipCountService.getTodayByIp(ip); if (ipCount!=null && ipCount.getCount() > 7) { model.setPermissionEvaluation(false); - model.setErrMsg("若要评估更多房产,请下载有房APP继续评估。http://www.fangjia.com/app"); + model.setErrMsg("鑻ヨ璇勪及鏇村鎴夸骇锛岃涓嬭浇鏈夋埧APP缁х画璇勪及銆俬ttp://www.fangjia.com/app"); return model; } } @@ -1258,13 +1258,13 @@ public class EvaluationController { if(districtStatBo == null){ model.setPermissionEvaluation(false); - model.setErrMsg("您的小区暂不支持估价!"); + model.setErrMsg("鎮ㄧ殑灏忓尯鏆備笉鏀寔浼颁环锛�"); } return model; } /** - * 检查小区是否有均价以及当前用户每天可评估3次,每月可评估20次
+ * 妫�鏌ュ皬鍖烘槸鍚︽湁鍧囦环浠ュ強褰撳墠鐢ㄦ埛姣忓ぉ鍙瘎浼�3娆★紝姣忔湀鍙瘎浼�20娆�
* @param model * @return */ @@ -1274,14 +1274,14 @@ public class EvaluationController { model.setPermissionEvaluation(true); String userId = LoginUtil.getUserId(req); - //登录+每天可评估3次 + //鐧诲綍+姣忓ぉ鍙瘎浼�3娆� int count = evaluationService.getCountToday(userId); if (count >= 3) { model.setPermissionEvaluation(false); model.setErrMsg("1"); return model; } - //登录+每月可评估20次 + //鐧诲綍+姣忔湀鍙瘎浼�20娆� int count_ = evaluationService.getCountCurrentMonth(userId); if (count_ >= 20) { model.setPermissionEvaluation(false); @@ -1297,13 +1297,13 @@ public class EvaluationController { } if(districtStatBo == null){ model.setPermissionEvaluation(false); - model.setErrMsg("您的小区暂不支持估价!"); + model.setErrMsg("鎮ㄧ殑灏忓尯鏆備笉鏀寔浼颁环锛�"); } return model; } /** - * 检查小区是否有均价 + * 妫�鏌ュ皬鍖烘槸鍚︽湁鍧囦环 * @param model * @return */ @@ -1321,7 +1321,7 @@ public class EvaluationController { if(districtStatBo == null){ model.setPermissionEvaluation(false); - model.setErrMsg("您的小区暂不支持估价!"); + model.setErrMsg("鎮ㄧ殑灏忓尯鏆備笉鏀寔浼颁环锛�"); } return model; } @@ -1407,7 +1407,7 @@ public class EvaluationController { model.setDistrictName2(model.getDistrict().getName()); } - //只有一个或是没找到相同的时,取第一个. + //鍙湁涓�涓垨鏄病鎵惧埌鐩稿悓鐨勬椂锛屽彇绗竴涓紟 // if(districts!=null && districts.size()>0 && model.getDistrict() == null){ // model.setDistrict(districts.get(0)); // model.setDistrictName2(model.getDistrict().getName()); @@ -1422,7 +1422,7 @@ public class EvaluationController { } })); } - //将库中查询匹配不到的小区记录下来 + //灏嗗簱涓煡璇㈠尮閰嶄笉鍒扮殑灏忓尯璁板綍涓嬫潵 if(model.getRegions()==null||!(model.getRegions().size()>0)){ HttpServletRequest request = ActionContext.getContext().getRequest(); String ipAddress = AnalyticsUtil.getIpAddress(request); @@ -1431,7 +1431,7 @@ public class EvaluationController { addressMatchLog.setCity(city); addressMatchLog.setInput(keyword); addressMatchLog.setStatus(1); - addressMatchLog.setSource("房价网"); + addressMatchLog.setSource("鎴夸环缃�"); addressMatchLog.setCreationDate(new Date()); addressMatchLog.setSearchCount(0); addressMatchLog.setIp(ipAddress); @@ -1442,7 +1442,7 @@ public class EvaluationController { } /** - * 估价小区名纠错(例如:sanjiangxiaoqu 提示:三江小区) + * 浼颁环灏忓尯鍚嶇籂閿欙紙渚嬪锛歴anjiangxiaoqu 鎻愮ず锛氫笁姹熷皬鍖猴級 * * @return */ @@ -1459,7 +1459,7 @@ public class EvaluationController { * (t.containsType(KeywordEnum.district)) { isDistrictName = true; } * } * - * if (isDistrictName) { return model; } // 小区存在 District district = + * if (isDistrictName) { return model; } // 灏忓尯瀛樺湪 District district = * districtService.findDistrict( new DistrictKey(((ServerArea) * FangjiaServerAreaContextHolder * .getServerAreaDefault()).getDisplay(), null, @@ -1565,13 +1565,13 @@ public class EvaluationController { } /** - * 近期估价记录 + * 杩戞湡浼颁环璁板綍 * * @param mode * @return */ /* - * public Object recentEvaluation(EvaluationModel model) { // 保存估价记录 String + * public Object recentEvaluation(EvaluationModel model) { // 淇濆瓨浼颁环璁板綍 String * uid = * CoresiteCookieContext.getInstance().getCookieValue(ActionContext.getContext * ().getRequest(), AnalyticsFilter.UID); FacetQueryResult sds = @@ -1593,7 +1593,7 @@ public class EvaluationController { */ /** - * 估计报告结果页 + * 浼拌鎶ュ憡缁撴灉椤� * * @param model * @return @@ -1617,7 +1617,7 @@ public class EvaluationController { } HouseQueryBean queryBean = buildQuery(model.getKeyword(), district, evaluation); List houseBoList = findSimilarHouse(queryBean); - // 处理类似房源信息 + // 澶勭悊绫讳技鎴挎簮淇℃伅 // setSimilarInfoToList(houseBoList); model.setHouseBoList(houseBoList); } else if (StringUtils.isNotBlank(model.getHouseId())) { @@ -1641,7 +1641,7 @@ public class EvaluationController { } } /** - * 估价结果 + * 浼颁环缁撴灉 */ if (null == evaluation || null == evaluation.getAvgPrice() || evaluation.getAvgPrice() == 0) { model.setEvaluation(new Evaluation()); @@ -1651,7 +1651,7 @@ public class EvaluationController { model.setTotalPrice((null != evaluation && null != evaluation.getTotalPrice()) ? evaluation.getTotalPrice() / 10000 : 0L); /** - * 是否有小区均价 判断是否显示走势图 + * 鏄惁鏈夊皬鍖哄潎浠� 鍒ゆ柇鏄惁鏄剧ず璧板娍鍥� */ List dss = districtStatService.findDistrictStat( new DistrictKey(evaluation.getCity(), evaluation.getRegion(), evaluation.getDistrictName()), null, @@ -1663,7 +1663,7 @@ public class EvaluationController { if (null != evaluation) { model.setRegion(evaluation.getRegion()); model.setDistrictName(evaluation.getDistrictName()); - // 下面参数为更多链接所用 + // 涓嬮潰鍙傛暟涓烘洿澶氶摼鎺ユ墍鐢� if (null != evaluation.getArea() && 0 != evaluation.getArea()) { String areaRange = ((Number) (evaluation.getArea() * 0.85)).intValue() + "_" + ((Number) (evaluation.getArea() * 1.15)).intValue(); @@ -1681,7 +1681,7 @@ public class EvaluationController { } /** - * 估价页推荐关键词 + * 浼颁环椤垫帹鑽愬叧閿瘝 * * @param model * @return @@ -1689,7 +1689,7 @@ public class EvaluationController { public Object recommendDistrictAction(DistrictModel model) { /** - * 从当前城市获取20个小区的数据 从20个中随机取10个在页面推荐展示 + * 浠庡綋鍓嶅煄甯傝幏鍙�20涓皬鍖虹殑鏁版嵁 浠�20涓腑闅忔満鍙�10涓湪椤甸潰鎺ㄨ崘灞曠ず */ int maxCount = 20; int maxRecommendCount = 7; @@ -1707,7 +1707,7 @@ public class EvaluationController { } model.setDistrictList(limit(districtList)); - // 底部热门推荐的其他城市 + // 搴曢儴鐑棬鎺ㄨ崘鐨勫叾浠栧煄甯� List footerCitys = new ArrayList(10); List cityNames = ServerAreaData.getServerAreaDisplayList(10); for (String name : cityNames) { @@ -1718,32 +1718,32 @@ public class EvaluationController { } /** - * 按时间做Seed获取的随机筛选的区域信息 + * 鎸夋椂闂村仛Seed鑾峰彇鐨勯殢鏈虹瓫閫夌殑鍖哄煙淇℃伅 * - * @param 区域菜单信息 - * @return 随机筛选的区域信息 + * @param 鍖哄煙鑿滃崟淇℃伅 + * @return 闅忔満绛涢�夌殑鍖哄煙淇℃伅 */ private List limit(List districts) { - int needCount = 6;// 获取的数据个数 7个 + int needCount = 6;// 鑾峰彇鐨勬暟鎹釜鏁� 7涓� - int changeDay = 20;// 设置更新频率为20天 + int changeDay = 20;// 璁剧疆鏇存柊棰戠巼涓�20澶� - int currentCount = districts.size();// 当前获取的Region总数 + int currentCount = districts.size();// 褰撳墠鑾峰彇鐨凴egion鎬绘暟 if (currentCount <= needCount) return districts; Calendar oldTime = Calendar.getInstance(); - oldTime.set(2011, 8, 1);// 初始化时间为2011年09月01日 + oldTime.set(2011, 8, 1);// 鍒濆鍖栨椂闂翠负2011骞�09鏈�01鏃� Calendar newTime = Calendar.getInstance(); - int reduceDay = SimRandom.getReduceDay(newTime, oldTime);// 获取日期与初始日期相差天数 + int reduceDay = SimRandom.getReduceDay(newTime, oldTime);// 鑾峰彇鏃ユ湡涓庡垵濮嬫棩鏈熺浉宸ぉ鏁� - int seed = (int) reduceDay / changeDay;// 计算simRandom变化频率,20表示20天更新一次 + int seed = (int) reduceDay / changeDay;// 璁$畻simRandom鍙樺寲棰戠巼,20琛ㄧず20澶╂洿鏂颁竴娆� - List simIndexs = SimRandom.getSimRandom(seed, currentCount, needCount);// 获取随机Index + List simIndexs = SimRandom.getSimRandom(seed, currentCount, needCount);// 鑾峰彇闅忔満Index List limitedRegions = new ArrayList(needCount); for (int index : simIndexs) { @@ -1753,7 +1753,7 @@ public class EvaluationController { } /** - * 推荐房源 + * 鎺ㄨ崘鎴挎簮 * * @param model * @return @@ -1766,16 +1766,16 @@ public class EvaluationController { Map queryMap = sd.getData().get(sd.getData().size() - 1); if (((ServerArea) FangjiaServerAreaContextHolder.getServerAreaDefault()).getDisplay().equals( queryMap.get(SnapData.DATE_KEY_CITY))) { - // 小区内推荐房源条件 + // 灏忓尯鍐呮帹鑽愭埧婧愭潯浠� HouseQueryBean dhqb = new HouseQueryBean(); for (String key : queryMap.keySet()) { if (SnapData.DATE_KEY_AREARANGE.equals(key) && null != queryMap.get(key)) { String houseAreaRange = queryMap.get(key).toString(); - // 加入面积区间 + // 鍔犲叆闈㈢Н鍖洪棿 dhqb.setHouseAreaRange(houseAreaRange); } else if (SnapData.DATE_KEY_PRICERANGE.equals(key) && null != queryMap.get(key)) { String totalPriceRange = queryMap.get(key).toString(); - // 加入总价区间 + // 鍔犲叆鎬讳环鍖洪棿 dhqb.setTotalPriceRange(totalPriceRange); } else if (SnapData.DATE_KEY_DISTRICTNAME.equals(key) && null != queryMap.get(key)) { String districtName = (String) queryMap.get(key); @@ -1792,10 +1792,10 @@ public class EvaluationController { } dhqb.setPicEnum(HousePicEnum.EXISTS); int count = 5; - // 获取小区内推荐房源 + // 鑾峰彇灏忓尯鍐呮帹鑽愭埧婧� hbs = this.houseService.findByQueryBean(new Pager(count), dhqb); if (hbs.size() < count) { - // 若小区内房源条数不足,用区域内房源补充 + // 鑻ュ皬鍖哄唴鎴挎簮鏉℃暟涓嶈冻锛岀敤鍖哄煙鍐呮埧婧愯ˉ鍏� String districtName = dhqb.getDistrictName(); dhqb.setDistrictName(null); List rhbs = this.houseService.findByQueryBean(new Pager(count), dhqb); @@ -1820,7 +1820,7 @@ public class EvaluationController { } /** - * 用于列表页不刷新页面,估价Action + * 鐢ㄤ簬鍒楄〃椤典笉鍒锋柊椤甸潰,浼颁环Action * * @param model * @return @@ -1874,7 +1874,7 @@ public class EvaluationController { } /** - * 二手户列表页,如果关键字可以匹配到小区 显示小区列表页的小区模块 + * 浜屾墜鎴峰垪琛ㄩ〉锛屽鏋滃叧閿瓧鍙互鍖归厤鍒板皬鍖� 鏄剧ず灏忓尯鍒楄〃椤电殑灏忓尯妯″潡 * * @param model * @return @@ -1888,7 +1888,7 @@ public class EvaluationController { Map konwbase = knowbaseService.parseWord(model.getKeyword()); List> districts = (null != konwbase && null != konwbase.get("district_name")) ? (List>) konwbase .get("district_name") : Collections.EMPTY_LIST; - String matchValue = null; // 匹配到的小区名 + String matchValue = null; // 鍖归厤鍒扮殑灏忓尯鍚� if (CollectionUtils.isNotEmpty(districts)) { List sameNameDistricts = new ArrayList(); for (Map districtData : districts) { @@ -1922,9 +1922,9 @@ public class EvaluationController { } } - // 知识库知道 + // 鐭ヨ瘑搴撶煡閬� if (null != district) { - // 如果匹配的是别名,则显示 + // 濡傛灉鍖归厤鐨勬槸鍒悕锛屽垯鏄剧ず if (!StringUtils.equals(district.getName(), matchValue)) { model.setSearchAlia(matchValue); } @@ -1935,7 +1935,7 @@ public class EvaluationController { evaluation.setCity(currentCity); evaluation.setRegion(district.getRegion()); /** - * 有小区域 别墅的小区均价 则估价 继续 + * 鏈夊皬鍖哄煙 鍒鐨勫皬鍖哄潎浠� 鍒欎及浠� 缁х画 */ if (null != district && null != districtStatBo && (null != districtStatBo.getVillaDistrictStat() || null != districtStatBo.getDistrictStat())) { @@ -1976,7 +1976,7 @@ public class EvaluationController { model.setDistrictStatBo(districtStatBo); model.setPermissionEvaluation(true); } else { - // 是否有房源 + // 鏄惁鏈夋埧婧� Pager pager = new Pager(); pager.setCurrentPage(0); pager.setPageSize(1); @@ -1996,7 +1996,7 @@ public class EvaluationController { model.setDistrictExistHouse(true); List> districtRoomAvgPrice = new ArrayList>(); /** - * 有房源 显示小区房型价格 + * 鏈夋埧婧� 鏄剧ず灏忓尯鎴垮瀷浠锋牸 */ List facetResult = houseBos.getFacetResults(); List counts = Collections.EMPTY_LIST; @@ -2042,7 +2042,7 @@ public class EvaluationController { model.setDistrictRoomAvgPrice(districtRoomAvgPrice); } else { /** - * 无房源 显示区域价格 + * 鏃犳埧婧� 鏄剧ず鍖哄煙浠锋牸 */ RegionStat regionStat = regionStatService.findRegionStat(currentCity, district.getRegion()); model.setRegionStat(regionStat); @@ -2143,7 +2143,7 @@ public class EvaluationController { } } } - StringBuilder re_url = new StringBuilder();// 重定向的url + StringBuilder re_url = new StringBuilder();// 閲嶅畾鍚戠殑url re_url.append("../evaluation/report"); if (StringUtils.isNotEmpty(evaluation.getId())) { re_url.append("?id="); @@ -2163,7 +2163,7 @@ public class EvaluationController { } /** - * 估价小工具 + * 浼颁环灏忓伐鍏� * * @param model * @return @@ -2198,7 +2198,7 @@ public class EvaluationController { /** - * 检查用户是否登录 + * 妫�鏌ョ敤鎴锋槸鍚︾櫥褰� * @throws UnsupportedEncodingException */ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, HttpServletResponse response) throws UnsupportedEncodingException{ @@ -2228,7 +2228,7 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt } } - //测试时用户一直是登录状态 + //娴嬭瘯鏃剁敤鎴蜂竴鐩存槸鐧诲綍鐘舵�� ret.setJsonModel(data); return ret; } @@ -2244,7 +2244,7 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt } /** - * 持久化估价并记录估价历史 + * 鎸佷箙鍖栦及浠峰苟璁板綍浼颁环鍘嗗彶 * * @param evaluation */ @@ -2268,7 +2268,7 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt } /** - * 估价数据检测 + * 浼颁环鏁版嵁妫�娴� * * @param evaluation * @return @@ -2276,18 +2276,18 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt private Map evaluationCheck(Evaluation evaluation, String from) { Map result = new HashMap(); if (StringUtils.isEmpty(evaluation.getDistrictName())) { - result.put("districtName", "您输入的小区名为空!"); + result.put("districtName", "鎮ㄨ緭鍏ョ殑灏忓尯鍚嶄负绌猴紒"); } if (!"sell_detail".equals(from)) { if (StringUtils.isBlank(evaluation.getHouseNum()) || StringUtils.isBlank(evaluation.getRoomNum())) { - result.put("houseroom", "楼栋号不全!"); + result.put("houseroom", "妤兼爧鍙蜂笉鍏紒"); } } return result; } /** - * 搜索式估价功能实现 + * 鎼滅储寮忎及浠峰姛鑳藉疄鐜� * * @param model * @return @@ -2295,7 +2295,7 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt */ // private void evaluationByKeyword(EvaluationModel model, String keyword) // throws Exception { - // // 根据提供keyword,调用分词服务,分析出一个Map类型的结果 + // // 鏍规嵁鎻愪緵keyword锛岃皟鐢ㄥ垎璇嶆湇鍔★紝鍒嗘瀽鍑轰竴涓狹ap绫诲瀷鐨勭粨鏋� // paraseEvaluationModelByKnowbase(model, keyword); // Evaluation evaluation = model.getEvaluation(); // if (null != evaluation && null != evaluation.getDistrictName()) { @@ -2311,10 +2311,10 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt // districtStatService.findDistrictStat(district.getDistrictKey()); // DistrictStat districtStat = null == districtStatBo ? null : // districtStatBo.getDefaultDistrictStat(); - // if (null != districtStat) { // 有均价才能进行估价 + // if (null != districtStat) { // 鏈夊潎浠锋墠鑳借繘琛屼及浠� // evaluation.setAvgPrice(districtStat.getAvgPrice()); // - // // 房型存在,面积不存在 + // // 鎴垮瀷瀛樺湪锛岄潰绉笉瀛樺湪 // if (null != evaluation.getRoom() && null == evaluation.getArea()) { // HousePrice housePrice = // housePriceService.findHousePrice(evaluation.getCity(), @@ -2324,7 +2324,7 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt // evaluation.setArea(housePrice.getHouseArea()); // } // } - // // 面积存在 + // // 闈㈢Н瀛樺湪 // if (null != evaluation.getArea() && 0 != evaluation.getArea()) { // if (null != districtStat) { // evaluation.setTotalPrice(Math.round(((Number) (evaluation.getArea() * @@ -2339,7 +2339,7 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt // && 0 != evaluation.getTotalPrice()) { // this.saveEvaluation(evaluation); // model.setViewType("redirect"); - // StringBuilder re_url = new StringBuilder();// 重定向的url + // StringBuilder re_url = new StringBuilder();// 閲嶅畾鍚戠殑url // re_url.append("../evaluation/report"); // re_url.append("?id="); // re_url.append(evaluation.getId()); @@ -2354,7 +2354,7 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt // model.setEvaluation(evaluation); // } /** - * 解析关键词 将其中的估价数据提取出来 + * 瑙f瀽鍏抽敭璇� 灏嗗叾涓殑浼颁环鏁版嵁鎻愬彇鍑烘潵 * * @param model * @param keyword @@ -2366,7 +2366,7 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt model.setKeyword(keyword); if (StringUtils.isNotBlank(keyword)) { - // 根据提供keyword,调用分词服务,分析出一个Map类型的结果 + // 鏍规嵁鎻愪緵keyword锛岃皟鐢ㄥ垎璇嶆湇鍔★紝鍒嗘瀽鍑轰竴涓狹ap绫诲瀷鐨勭粨鏋� Map keywordParseMap = this.knowbaseService.parseWord(keyword, ((ServerArea) FangjiaServerAreaContextHolder.getServerAreaDefault()).getDisplay()); if (null != keywordParseMap) { @@ -2433,14 +2433,14 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt } /** - * 构建 HouseQueryBean + * 鏋勫缓 HouseQueryBean * * @param keyword - * 用于构建全文检索查询参数 + * 鐢ㄤ簬鏋勫缓鍏ㄦ枃妫�绱㈡煡璇㈠弬鏁� * @param district - * 用于构建经纬度查询参数 来检索周边5公里房源 + * 鐢ㄤ簬鏋勫缓缁忕含搴︽煡璇㈠弬鏁� 鏉ユ绱㈠懆杈�5鍏噷鎴挎簮 * @param evaluation - * 用于构建房源类型 城市 面积范围(正负10%) 室 小区名 查询参数 + * 鐢ㄤ簬鏋勫缓鎴挎簮绫诲瀷 鍩庡競 闈㈢Н鑼冨洿(姝h礋10%) 瀹� 灏忓尯鍚� 鏌ヨ鍙傛暟 * @return */ private HouseQueryBean buildQuery(String keyword, District district, Evaluation evaluation) { @@ -2463,8 +2463,8 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt queryBean.setKeyword(keyword); } if (null != evaluation) { - String kind = StringUtils.isNotBlank(evaluation.getBuildType()) && evaluation.getBuildType().contains("别墅") ? "别墅" - : "小区"; + String kind = StringUtils.isNotBlank(evaluation.getBuildType()) && evaluation.getBuildType().contains("鍒") ? "鍒" + : "灏忓尯"; queryBean.setKind(kind); queryBean.setCity(evaluation.getCity()); queryBean.setFullTextSearch(true); @@ -2489,7 +2489,7 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt } /** - * 查找相似房源 + * 鏌ユ壘鐩镐技鎴挎簮 * * @param keyword * @param district @@ -2539,7 +2539,7 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt } /** - * 取小区均价 + * 鍙栧皬鍖哄潎浠� * * @param model * @param district @@ -2572,7 +2572,7 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt } /** - * 从查询结果中取小区均价 所有房源均价的和 除以 套数 + * 浠庢煡璇㈢粨鏋滀腑鍙栧皬鍖哄潎浠� 鎵�鏈夋埧婧愬潎浠风殑鍜� 闄や互 濂楁暟 * * @param model * @return @@ -2632,13 +2632,13 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt query.setDistrictNameList(alias); - List houseBos = houseService.findSimilarMoreHouseList(query, 20);// 设置要获取的相似房源的数量 + List houseBos = houseService.findSimilarMoreHouseList(query, 20);// 璁剧疆瑕佽幏鍙栫殑鐩镐技鎴挎簮鐨勬暟閲� if(area >0 && (null == houseBos || houseBos.size() == 0)){ minArea = area-10; maxArea = area+10; query.setAreaStart((int)minArea); query.setAreaEnd((int)maxArea); - houseBos = houseService.findSimilarMoreHouseList(query, 20);// 设置要获取的相似房源的数量 + houseBos = houseService.findSimilarMoreHouseList(query, 20);// 璁剧疆瑕佽幏鍙栫殑鐩镐技鎴挎簮鐨勬暟閲� } return houseBos; } @@ -2696,32 +2696,32 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt /** - * 给有经纬度的房源的similarInfo赋值 + * 缁欐湁缁忕含搴︾殑鎴挎簮鐨剆imilarInfo璧嬪�� * * @param houseBoResult */ // private void setSimilarInfoToList(List houseBoResult) { // for (HouseBo houseBo : houseBoResult) { // if (houseBo.isMatchedDistrict()) { - // // "黄浦区_上海康城_2室_98平米_126万_相似房源" + // // "榛勬郸鍖篲涓婃捣搴峰煄_2瀹98骞崇背_126涓嘷鐩镐技鎴挎簮" // String districtName = houseBo.getDistrictName(); - // // 去掉小区的高亮字符,eg:上海康城<%2Ffont>;涓婃捣搴峰煄<%2Ffont>; // if (districtName.contains("") || // districtName.contains("")) { // districtName = DataUtil.removeHtml(districtName); // } // // DataUtil.removeHtml(str) - // String similarInfo = houseBo.getRegion() + "区_" + districtName + "_" + - // houseBo.getHouse().getRoom() + "室_" - // + (int) ((double) houseBo.getHouse().getArea()) + "平米_" + - // getAvgPrice(houseBo.getHouse()) + "元(㎡)_相似房源"; + // String similarInfo = houseBo.getRegion() + "鍖篲" + districtName + "_" + + // houseBo.getHouse().getRoom() + "瀹" + // + (int) ((double) houseBo.getHouse().getArea()) + "骞崇背_" + + // getAvgPrice(houseBo.getHouse()) + "鍏�(銕�)_鐩镐技鎴挎簮"; // houseBo.setSimilarInfo(similarInfo); // } // } // } /** - * 计算房屋单价 + * 璁$畻鎴垮眿鍗曚环 * * @param house * @return @@ -2743,7 +2743,7 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt // } /** - * 获取用户上个月的估价次数 + * 鑾峰彇鐢ㄦ埛涓婁釜鏈堢殑浼颁环娆℃暟 * @author yinjihuan * @param req * @return @@ -2768,7 +2768,7 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt } /** - * 保存用户留的信息 + * 淇濆瓨鐢ㄦ埛鐣欑殑淇℃伅 * @author yinjihuan * @param model * @return @@ -2792,14 +2792,14 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt } /** - * 估价结果 + * 浼颁环缁撴灉 * @param model * @return */ public Object evalResultAction(EvaluationResultModel model, HttpServletRequest req, HttpServletResponse response) { FangJiaUser user = getLoginUser(req); if(!"true".equals(req.getParameter("fangjia"))){ - String token = DigestUtils.md5Hex(model.getTimestramp()+"房价网").substring(10,18).toUpperCase(); + String token = DigestUtils.md5Hex(model.getTimestramp()+"鎴夸环缃�").substring(10,18).toUpperCase(); token = DigestUtils.md5Hex(token+"goojia").toUpperCase(); if(!token.equals(model.getToken())){ model.setViewType("redirect"); @@ -2808,17 +2808,17 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt } } - // 根据IP限制评估次数 + // 鏍规嵁IP闄愬埗璇勪及娆℃暟 String ip = AnalyticsUtil.getIpAddress(req); IpCount ipCount = ipCountService.getTodayByIp(ip); - //快捷评估去掉验证 + //蹇嵎璇勪及鍘绘帀楠岃瘉 // if ("116.247.70.58".equals(ip) || ip.startsWith("192.168")) { -// LOGGER.info("自动化测试,不做验证码认证:"+ip); +// LOGGER.info("鑷姩鍖栨祴璇曪紝涓嶅仛楠岃瘉鐮佽璇�:"+ip); // }else{ // /*if (ipCount!=null && ipCount.getCount() > 7) { // model.setPermissionEvaluation(false); -// model.setErrMsg("若要评估更多房产,请下载有房APP继续评估。http://www.fangjia.com/app"); +// model.setErrMsg("鑻ヨ璇勪及鏇村鎴夸骇锛岃涓嬭浇鏈夋埧APP缁х画璇勪及銆俬ttp://www.fangjia.com/app"); // return model; // }*/ // if (ipCount!=null && ipCount.getCount() > 7) { @@ -2827,7 +2827,7 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt // return model; // } // } - //新增一次估价次数(用户已登录) + //鏂板涓�娆′及浠锋鏁�(鐢ㄦ埛宸茬櫥褰�) CoresiteCookieContext context = CoresiteCookieContext.getInstance(); String userId = context.getCookieValue(req, CookieName.UID); if(user!=null){ @@ -2846,7 +2846,7 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt if(StringUtils.isNotBlank(eid) && !eid.equals("undefined")){ evaluation = evaluationService.findEvaluationById(eid); }else{ - String token = DigestUtils.md5Hex(model.getTimestramp()+"房价网").substring(10,18).toUpperCase(); + String token = DigestUtils.md5Hex(model.getTimestramp()+"鎴夸环缃�").substring(10,18).toUpperCase(); token = DigestUtils.md5Hex(token+"goojia").toUpperCase(); if(!token.equals(model.getToken())){ model.setViewType("redirect"); @@ -2868,7 +2868,7 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt evaluation.setDistrictName(StringUtils.trim(evaluation.getDistrictName())); } evaluation.setCity(model.getCityName()); - //格式化区域 + //鏍煎紡鍖栧尯鍩� String formatRegion = RegionData.formatRegion(evaluation.getCity(),evaluation.getRegion()); evaluation.setRegion(formatRegion); EvaluationBeforeLoanBean bean = evaluationService.evaluate(evaluation); @@ -2886,7 +2886,7 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt return model; } try { - //保存评估信息 + //淇濆瓨璇勪及淇℃伅 evaluationService.save(evaluation); } catch (Exception e) { model.setViewType("redirect"); @@ -2905,12 +2905,12 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt } if(StringUtils.isNotBlank(mobile)) { LoanLeads leads = new LoanLeads(); - leads.setLoanType("房产估值"); + leads.setLoanType("鎴夸骇浼板��"); leads.setMobile(mobile); leads.setCreateDate(new Date()); leads.setModifyDate(new Date()); - leads.setSource("房产评估页"); - leads.setLeads_source("房价网"); + leads.setSource("鎴夸骇璇勪及椤�"); + leads.setLeads_source("鎴夸环缃�"); leads.setName(evaluation.getDistrictName()); leads.setTotalPrice(evaluation.getTotalPrice()); leads.setArea(evaluation.getArea()); @@ -2920,9 +2920,9 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt loanLeadsService.save(leads); } }catch(Exception e) { - LOGGER.error("房价网房产评估页房产估值,添加贷款线索异常",e); + LOGGER.error("鎴夸环缃戞埧浜ц瘎浼伴〉鎴夸骇浼板��,娣诲姞璐锋绾跨储寮傚父",e); } - //保存IP记录查询数 + //淇濆瓨IP璁板綍鏌ヨ鏁� if(ipCount==null || ipCount.getCount() == 0){ IpCount ipcount = new IpCount(); ipcount.setIp(ip); @@ -2933,7 +2933,7 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt ipCount.setCount(ipCount.getCount()+1); ipCountService.update(ipCount); } - //估价结果id存到cookie中 + //浼颁环缁撴灉id瀛樺埌cookie涓� Cookie cookie = context.createCookie(CookieName.EID, evaluation.getId()); cookie.setDomain(context.getDomain()); cookie.setMaxAge(99999); @@ -2944,25 +2944,25 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt model.setEvaluation(evaluation); model.setLatD(bean.getLat()); model.setLngD(bean.getLng()); - //评估时间 + //璇勪及鏃堕棿 SimpleDateFormat sf = new SimpleDateFormat("yyyy/MM/dd HH:mm"); String evalTime = sf.format(evaluation.getCreationDate()); model.setEvalTime(evalTime); - //位置描述 + //浣嶇疆鎻忚堪 model.setAddressDesc(bean.getDesc()); - //小区年涨幅 + //灏忓尯骞存定骞� model.setOneYearUpDownRange(bean.getOneYearUpDownRange()); - //上月参考均价 + //涓婃湀鍙傝�冨潎浠� model.setTopMonthAvgPrice(bean.getTopMonthAvgPrice()); - //当前估价时间的周均价 + //褰撳墠浼颁环鏃堕棿鐨勫懆鍧囦环 model.setWeekAvgPrice(bean.getWeekAvgPrice()); - //于上周相比的涨跌幅(%) + //浜庝笂鍛ㄧ浉姣旂殑娑ㄨ穼骞咃紙%锛� model.setTopWeekUpDownRange((int)bean.getTopWeekUpDownRange()); - //城市涨跌幅排名 + //鍩庡競娑ㄨ穼骞呮帓鍚� model.setUpDownRangecityLevel(bean.getUpDownRangecityLevel()); Calendar calendar = Calendar.getInstance(); @@ -2972,14 +2972,14 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt }else{ model.setTopMonth(calendar.get(Calendar.MONTH)); } - //总价 + //鎬讳环 if(evaluation.getTotalPrice()!=null){ BigDecimal decimal = new BigDecimal(evaluation.getTotalPrice()); String totalPriceStr = String.valueOf(decimal.multiply(new BigDecimal(0.0001)).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()); - //查询走势数据 + //鏌ヨ璧板娍鏁版嵁 model.setTotalPriceStr(totalPriceStr); }else{ - LOGGER.info("总价为空"+evaluation.getId()); + LOGGER.info("鎬讳环涓虹┖"+evaluation.getId()); model.setViewType("redirect"); model.setViewParam("location", "/gujia"); return model; @@ -2998,15 +2998,15 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt Collections.sort(timeList); model.setTimeList(timeList); Date startDate = DateUtil.getBeforeDate(new Date(), -12); - //图表的标题 - SimpleDateFormat format = new SimpleDateFormat("yyyy年MM月"); + //鍥捐〃鐨勬爣棰� + SimpleDateFormat format = new SimpleDateFormat("yyyy骞碝M鏈�"); model.setTitle(format.format(startDate)+"-"+format.format(new Date())); List productList = loanProductService.findProductByType("",LoanProductPositionEnum.STATR_EVAL.getId()); double minMonthInterestRate = -1; int count = 0; for(LoanProduct product:productList){ count++; - //取前三个数据的最小利率 + //鍙栧墠涓変釜鏁版嵁鐨勬渶灏忓埄鐜� if(count==1){ minMonthInterestRate = product.getMinMonthInterestRate(); } @@ -3039,9 +3039,9 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt } } - //PC端轮播广告如果为两个时循环两遍(添加重复的两条) + //PC绔疆鎾箍鍛婂鏋滀负涓や釜鏃跺惊鐜袱閬嶏紙娣诲姞閲嶅鐨勪袱鏉★級 if(carouselAdvertisementList!=null){ - //有两张以上轮播图片时适应前端排序(把最后一张图片移到最前面) + //鏈変袱寮犱互涓婅疆鎾浘鐗囨椂閫傚簲鍓嶇鎺掑簭锛堟妸鏈�鍚庝竴寮犲浘鐗囩Щ鍒版渶鍓嶉潰锛� if(carouselAdvertisementList.size() > 1){ carouselAdvertisementList.add(0, carouselAdvertisementList.get(carouselAdvertisementList.size()-1)); carouselAdvertisementList.remove(carouselAdvertisementList.size()-1); @@ -3060,7 +3060,7 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt /** - * 保存广告点击记录 + * 淇濆瓨骞垮憡鐐瑰嚮璁板綍 * @param model * @param req * @return @@ -3087,7 +3087,7 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt } }else{ result.setResult("false"); - result.setMsg("广告id为空"); + result.setMsg("骞垮憡id涓虹┖"); return result; } result.setResult("true"); @@ -3100,7 +3100,7 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt Evaluation evaluation = new Evaluation(); evaluation.setCity(model.getCityName()); evaluation.setDistrictName(StringUtils.trim(model.getDistrictName())); - //格式化区域 + //鏍煎紡鍖栧尯鍩� String formatRegion = RegionData.formatRegion(model.getCityName(),model.getRegion()); evaluation.setRegion(formatRegion); evaluation.setHouseNum(model.getHouseNum()); @@ -3126,7 +3126,7 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt }else{ return model; } - //保存评估信息 + //淇濆瓨璇勪及淇℃伅 evaluationService.save(evaluation); model.setAddress(bean.getAddress()); model.setAvgPrice(evaluation.getAvgPrice()); @@ -3156,7 +3156,7 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt if((laonAd!=null && laonAd==1) && (youfangDownload!=null && youfangDownload==1)){ model.setLaonAd(laonAd); model.setYoufangDownload(youfangDownload); - //保存IP记录查询数 + //淇濆瓨IP璁板綍鏌ヨ鏁� //String ip = AnalyticsUtil.getIpAddress(req); ThirdIpCount thirdIpCount = thirdIpCountService.getTodayByIp(ip); if(thirdIpCount==null || thirdIpCount.getCount() == 0){ @@ -3177,7 +3177,7 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt } /** - * 苏州房产网判断小区是否有均价 + * 鑻忓窞鎴夸骇缃戝垽鏂皬鍖烘槸鍚︽湁鍧囦环 * @param model * @param req * @return @@ -3188,7 +3188,7 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt Integer laonAd = Integer.valueOf(CookieUtils.getCookieValue(req, "szfc_laonAd")); Integer youfangDownload = Integer.valueOf(CookieUtils.getCookieValue(req, "szfc_youfangDownload")); if((laonAd!=null && laonAd==1) && (youfangDownload!=null && youfangDownload==1)){ - // 根据IP限制评估次数 + // 鏍规嵁IP闄愬埗璇勪及娆℃暟 String ip = AnalyticsUtil.getIpAddress(req); ThirdIpCount thirdIpCount = thirdIpCountService.getTodayByIp(ip); if(thirdIpCount!=null && thirdIpCount.getCount()>1){ @@ -3207,7 +3207,7 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt if(districtStatBo == null){ result.setResult("false"); - result.setMsg("您的小区暂不支持估价!"); + result.setMsg("鎮ㄧ殑灏忓尯鏆備笉鏀寔浼颁环锛�"); return result; } @@ -3216,7 +3216,7 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt } /** - * 苏州房产网申请贷款页 + * 鑻忓窞鎴夸骇缃戠敵璇疯捶娆鹃〉 * @param model * @return */ @@ -3250,9 +3250,9 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt } private String wrapUrlParames(Evaluation evaluation,String userId,String uName,String mobile){ - //&address=房产地址&name=小区名称&hosueNum=楼栋&floor=楼层&area=面积&totalPrice=房产总格&uname=用户姓名&uid=用户ID&mobile=手机号码& - //&channel=fangjiawang&sign=加密串 - //加密 + //&address=鎴夸骇鍦板潃&name=灏忓尯鍚嶇О&hosueNum=妤兼爧&floor=妤煎眰&area=闈㈢Н&totalPrice=鎴夸骇鎬绘牸&uname=鐢ㄦ埛濮撳悕&uid=鐢ㄦ埛ID&mobile=鎵嬫満鍙风爜& + //&channel=fangjiawang&sign=鍔犲瘑涓� + //鍔犲瘑 String key = md5("jindanlicai.callback"); Map params = new LinkedHashMap(); params.put("mobile", mobile); @@ -3313,31 +3313,31 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt return sb.toString(); }*/ /** - * 获取当前日期上个月的最后一个周末 + * 鑾峰彇褰撳墠鏃ユ湡涓婁釜鏈堢殑鏈�鍚庝竴涓懆鏈� * @param date * @return */ private Date getLastWeekendOfMoth(Date date){ Calendar instance = Calendar.getInstance(); instance.setTime(date); - instance.add(Calendar.DAY_OF_MONTH, -1);//本月最后一天 + instance.add(Calendar.DAY_OF_MONTH, -1);//鏈湀鏈�鍚庝竴澶� instance.add(Calendar.DAY_OF_MONTH, - 1 - instance.get(Calendar.DAY_OF_WEEK));//根据月末最后一天是星期几,向前偏移至最近的周日 + 1 - instance.get(Calendar.DAY_OF_WEEK));//鏍规嵁鏈堟湯鏈�鍚庝竴澶╂槸鏄熸湡鍑狅紝鍚戝墠鍋忕Щ鑷虫渶杩戠殑鍛ㄦ棩 return DateUtil.truncateDay(instance.getTime()); } /** - * 估价结果 + * 浼颁环缁撴灉 * @param model * @return */ public Object loanAnalysisAction(HouseReportModel model, HttpServletRequest req) { - model.setReportTitle("房贷分析"); + model.setReportTitle("鎴胯捶鍒嗘瀽"); if(StringUtils.isNotBlank(model.getEid())){ Evaluation evaluation = evaluationService.findEvaluationById(model.getEid()); double totalScore = reportDistrictInfoService.getTotalScore(evaluation.getCity(), evaluation.getRegion(), evaluation.getDistrictName(), evaluation.getTotalPrice()); model.setTotalScore(totalScore); - List creditProductList = loanProductService.findProductByType("信用贷",LoanProductPositionEnum.LOAN_ANALY.getId()); - List houseProductList = loanProductService.findProductByType("房抵贷",LoanProductPositionEnum.LOAN_ANALY.getId()); + List creditProductList = loanProductService.findProductByType("淇$敤璐�",LoanProductPositionEnum.LOAN_ANALY.getId()); + List houseProductList = loanProductService.findProductByType("鎴挎姷璐�",LoanProductPositionEnum.LOAN_ANALY.getId()); if(creditProductList!=null && creditProductList.size()>0){ LoanProduct creditProduct = creditProductList.get(0); List tagList = new ArrayList(); @@ -3373,7 +3373,7 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt } /** - * 提交贷款页 + * 鎻愪氦璐锋椤� * @param model * @return */ @@ -3388,7 +3388,7 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt model.setLoanType(product.getType()); } } - if(!"无抵押".equals(model.getLoanType())){ + if(!"鏃犳姷鎶�".equals(model.getLoanType())){ if(model.getBackUrl() !=null){ model.setBackUrl(model.getBackUrl().replace("?showCode=true","")); } @@ -3397,7 +3397,7 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt } /** - * 我要申请贷款页 + * 鎴戣鐢宠璐锋椤� * @param model * @return */ @@ -3406,7 +3406,7 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt } /** - * 苏州房产网房产评估页 + * 鑻忓窞鎴夸骇缃戞埧浜ц瘎浼伴〉 * @param model * @return */ @@ -3436,7 +3436,7 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt } /** - * 苏州房产网房产评估页(测试) + * 鑻忓窞鎴夸骇缃戞埧浜ц瘎浼伴〉(娴嬭瘯) * @param model * @return */ @@ -3445,7 +3445,7 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt } /** - * 房金所URL处理 + * 鎴块噾鎵�URL澶勭悊 * @param product * @param evaluation */ @@ -3460,7 +3460,7 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt } private void dealProduct(LoanProduct product,Evaluation evaluation, HttpServletRequest req){ - //新增一次估价次数(用户已登录) + //鏂板涓�娆′及浠锋鏁�(鐢ㄦ埛宸茬櫥褰�) FangJiaUser user = getLoginUser(req); CoresiteCookieContext context = CoresiteCookieContext.getInstance(); String userId = context.getCookieValue(req, CookieName.UID); @@ -3481,7 +3481,7 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt List arrList = Arrays.asList(arry); if(arrList.contains(evaluation.getCity())){ if(StringUtils.isNotBlank(product.getUrl())){ - //url做加密处理 + //url鍋氬姞瀵嗗鐞� String url = wrapUrlParames(evaluation,userId,uName,mobile); product.setUrl(product.getUrl()+url); }else{ @@ -3495,7 +3495,7 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt /** - * 添加我要评估信息 + * 娣诲姞鎴戣璇勪及淇℃伅 * @return */ public Object addSuggestAction(EvaluationModel model) { @@ -3516,33 +3516,33 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt return result; } /** - * 均价走势数据集 + * 鍧囦环璧板娍鏁版嵁闆� * @param model * @return */ public Object avgPriceDataAction(EvaluationModel model) { int week = QUARTER_WEEK * 4; - int type = 0; //月份 + int type = 0; //鏈堜唤 Date startDate = null; - if(model.getType() == 1){ //季度 + if(model.getType() == 1){ //瀛e害 week = QUARTER_WEEK; type = -3; startDate = DateUtil.getBeforeDate(new Date(), type); - }else if(model.getType() == 2){ //半年 + }else if(model.getType() == 2){ //鍗婂勾 week = QUARTER_WEEK * 2; type = -6; startDate = DateUtil.getBeforeDate(new Date(), type); - }else if(model.getType() == 3){ //一年 + }else if(model.getType() == 3){ //涓�骞� startDate = DateUtil.parseDate(DateUtil.addMonth(new Date(), -12), "yyyy-MM-dd"); - }else if(model.getType() == 4){ //两年 + }else if(model.getType() == 4){ //涓ゅ勾 startDate = DateUtil.parseDate(DateUtil.addMonth(new Date(), -24), "yyyy-MM-dd"); - }else if(model.getType() == 5){ //三年 + }else if(model.getType() == 5){ //涓夊勾 startDate = DateUtil.parseDate(DateUtil.addMonth(new Date(), -36), "yyyy-MM-dd"); } EvaluationJsonModel json = getAvgPriceData(model.getCityName(),model.getRegion(),model.getDistrictName(),startDate, model.isShowRegion()); - //图表的标题 - SimpleDateFormat format = new SimpleDateFormat("yyyy年MM月"); + //鍥捐〃鐨勬爣棰� + SimpleDateFormat format = new SimpleDateFormat("yyyy骞碝M鏈�"); json.setTitle(format.format(startDate)+"-"+format.format(new Date())); return json; } @@ -3562,7 +3562,7 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt List timeList = new ArrayList(); List days = DateUtil.getLastDayBetweenDates(startDate, new Date()); - //取小区的均价时间轴为准 + //鍙栧皬鍖虹殑鍧囦环鏃堕棿杞翠负鍑� if(days!=null && days.size()>0){ for(Date weekend : days){ String s = DateUtil.formatByPattern(weekend, "yyyy.MM"); @@ -3634,7 +3634,7 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt } private void addDistrictStat(Map districtMap, DistrictKey districtKey, Date startDate) { - List list = Arrays.asList(StringUtils.split(districtService.findDistrictKind(districtKey), ",,")); + List list = Arrays.asList(StringUtils.split(districtService.findDistrictKind(districtKey), ",锛�")); List districtStatBoList = districtStatService.findAllDistrictStatByKind(districtKey, new Date(), startDate, list); @@ -3671,7 +3671,7 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt DistrictStatBo bo = new DistrictStatBo(); if(stats.size()==2){ - DistrictStat lastStat = stats.get(1);//上周 + DistrictStat lastStat = stats.get(1);//涓婂懆 Date lastMonth = DateUtils.addMonths(new Date(), -1); int lastPrice = 0; if(lastStat.getWeekend().getTime()>= lastMonth.getTime()){ @@ -3679,9 +3679,9 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt lastPrice = lastStat.getAvgPrice(); } - DistrictStat curStat = stats.get(0);//本周 + DistrictStat curStat = stats.get(0);//鏈懆 if(curStat.getWeekend().getTime()>= lastMonth.getTime()){ - if(lastPrice>0){//重新计算均价涨跌幅 + if(lastPrice>0){//閲嶆柊璁$畻鍧囦环娑ㄨ穼骞� int markup = (curStat.getAvgPrice()-lastPrice)*10000/lastPrice; curStat.setWeekendMarkup(markup); } @@ -3690,7 +3690,7 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt }else{ Date lastMonth = DateUtils.addMonths(new Date(), -1); - DistrictStat curStat = stats.get(0);//本周 + DistrictStat curStat = stats.get(0);//鏈懆 if(curStat.getWeekend().getTime()>= lastMonth.getTime()){ bo.setDistrictStat(curStat); } @@ -3710,7 +3710,7 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt } /** - * 苏州房产网APP房产评估页 + * 鑻忓窞鎴夸骇缃慉PP鎴夸骇璇勪及椤� * @param model * @return */ @@ -3765,7 +3765,7 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt } /** - * 苏州房产网APP房产结果页 + * 鑻忓窞鎴夸骇缃慉PP鎴夸骇缁撴灉椤� * @param model * @return */ @@ -3861,7 +3861,7 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt } /** - * 苏州房产网APP申请贷款页 + * 鑻忓窞鎴夸骇缃慉PP鐢宠璐锋椤� * @param model * @return */ @@ -3917,7 +3917,7 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt } /** - * 苏州房产网贷款协议页 + * 鑻忓窞鎴夸骇缃戣捶娆惧崗璁〉 * @param model * @return */ @@ -3932,14 +3932,14 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt } /** - * 删除评估历史 + * 鍒犻櫎璇勪及鍘嗗彶 * @return */ public Object doDeleteAction(SuzhouMobileEvalResultModel model, HttpServletRequest req) { UserRegJsonModel result = new UserRegJsonModel(); if (StringUtils.isBlank(model.getId())) { result.setResult(Message.RESULT_FAIL); - result.setMsg("删除失败!"); + result.setMsg("鍒犻櫎澶辫触!"); return result; } Map data = new HashMap(1); @@ -3951,7 +3951,7 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt } /** - * 查找某经纬度半径范围内 最近的几条小区 + * 鏌ユ壘鏌愮粡绾害鍗婂緞鑼冨洿鍐� 鏈�杩戠殑鍑犳潯灏忓尯 * @param districtModel * @return */ @@ -3960,8 +3960,8 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt if (lat == 0 || lng == 0) { return ret; } - Integer radius = 500; //附近500m - Integer limit = 8; //查询8条 + Integer radius = 500; //闄勮繎500m + Integer limit = 8; //鏌ヨ8鏉� List districts = districtService.findAllDistrict(lat, lng, radius, null, limit); //DistrictBaseInfoDto info = new DistrictBaseInfoDto(); for (District d : districts) { @@ -4029,9 +4029,9 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt map.put("success", false); return JsonUtils.toJson(map); } - /*if("贷款".equals(model.getPurpose())){ + /*if("璐锋".equals(model.getPurpose())){ if(!addLeads(model, req)){ - map.put("msg", "估价异常"); + map.put("msg", "浼颁环寮傚父"); map.put("success", false); return JsonUtils.toJson(map); } @@ -4040,7 +4040,7 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt Evaluation evaluation = new Evaluation(); evaluation.setCity(model.getCityName()); evaluation.setDistrictName(StringUtils.trim(model.getDistrictName())); - //格式化区域 + //鏍煎紡鍖栧尯鍩� String formatRegion = RegionData.formatRegion(model.getCityName(),model.getRegion()); evaluation.setRegion(formatRegion); evaluation.setHouseNum(model.getHouseNum()); @@ -4067,13 +4067,13 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt model.setTotalPrice(evaluation.getTotalPrice()); } model.setAddress(evaluation.getAddress()); - //保存评估信息 + //淇濆瓨璇勪及淇℃伅 evaluationService.save(evaluation); if(StringUtils.isNotBlank(CookieUtils.getCookieValue(req, "szfc_laonAd")) && StringUtils.isNotBlank(CookieUtils.getCookieValue(req, "szfc_youfangDownload"))){ Integer laonAd = Integer.valueOf(CookieUtils.getCookieValue(req, "szfc_laonAd")); Integer youfangDownload = Integer.valueOf(CookieUtils.getCookieValue(req, "szfc_youfangDownload")); if((laonAd!=null && laonAd==1) && (youfangDownload!=null && youfangDownload==1)){ - //保存IP记录查询数 + //淇濆瓨IP璁板綍鏌ヨ鏁� //String ip = AnalyticsUtil.getIpAddress(req); ThirdIpCount thirdIpCount = thirdIpCountService.getTodayByIp(ip); if(thirdIpCount==null || thirdIpCount.getCount() == 0){ @@ -4092,9 +4092,9 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt map.put("id", evaluation.getId()); map.put("success", true); model.setEvalId(evaluation.getId()); - if("贷款".equals(model.getPurpose())){ + if("璐锋".equals(model.getPurpose())){ if(!addLeads(model, req)){ - map.put("msg", "估价异常"); + map.put("msg", "浼颁环寮傚父"); map.put("success", false); return JsonUtils.toJson(map); } @@ -4102,7 +4102,7 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt addPurposeAnalysis(model, req); }catch(Exception e){ LOGGER.error("",e); - map.put("msg", "该小区暂不支持估价!"); + map.put("msg", "璇ュ皬鍖烘殏涓嶆敮鎸佷及浠�!"); map.put("success", false); } return JsonUtils.toJson(map); @@ -4112,7 +4112,7 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt Map map = new HashMap(); IdMobile mobile2 = idMobileService.findByParam(model.getMobile(), model.getSource()); if(mobile2!=null && System.currentTimeMillis() - mobile2.getCreationDate().getTime() < 1000 * 60){ - map.put("msg", "该手机使用太频繁,请稍后再发!"); + map.put("msg", "璇ユ墜鏈轰娇鐢ㄥお棰戠箒锛岃绋嶅悗鍐嶅彂!"); map.put("success", false); return JsonUtils.toJson(map); } @@ -4120,7 +4120,7 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt Evaluation evaluation = new Evaluation(); evaluation.setCity(model.getCityName()); evaluation.setDistrictName(StringUtils.trim(model.getDistrictName())); - //格式化区域 + //鏍煎紡鍖栧尯鍩� String formatRegion = RegionData.formatRegion(model.getCityName(),model.getRegion()); evaluation.setRegion(formatRegion); evaluation.setHouseNum(model.getHouseNum()); @@ -4147,7 +4147,7 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt model.setTotalPrice(evaluation.getTotalPrice()); } model.setAddress(evaluation.getAddress()); - //保存评估信息 + //淇濆瓨璇勪及淇℃伅 if(addLeads(model, req)){ evaluationService.save(evaluation); map.put("id", evaluation.getId()); @@ -4160,16 +4160,16 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt idMobile.setIsCreditApply(0); idMobile.setIsFastApply(0); idMobile.setIsLowApply(0); - //新增STYPE,识别页面跳转 + //鏂板STYPE锛岃瘑鍒〉闈㈣烦杞� idMobile.setStype(model.getStype()); idMobile.setLeads_source(model.getLeads_source()); - //区分广点通和SECONDHOUSE和NEWHOUSE的页面来源新增source字段 + //鍖哄垎骞跨偣閫氬拰SECONDHOUSE鍜孨EWHOUSE鐨勯〉闈㈡潵婧愭柊澧瀞ource瀛楁 idMobile.setSource(model.getSource()); idMobileService.save(idMobile); - //查询出id + //鏌ヨ鍑篿d IdMobile mobile = idMobileService.findByParam(model.getMobile(), model.getSource()); if(mobile != null){ - //赋值ID, 跳转 + //璧嬪�糏D, 璺宠浆 map.put("mobileId", mobile.getId()); JSONObject reqBody = new JSONObject(); JSONObject q = new JSONObject(); @@ -4181,7 +4181,7 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt q.put("link", "ev?id="+mobile.getId()); reqBody.put("params", q); reqBody.put("signName", ""); - reqBody.put("source", "房价网"); + reqBody.put("source", "鎴夸环缃�"); reqBody.put("syncSendDingDing", true); reqBody.put("templateCode", "SMS_146610611"); @@ -4193,35 +4193,35 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt System.out.println(response); JSONObject json = JSONObject.fromObject(response); if((Integer) json.get("code")!=200){ - map.put("msg", "保存失败!"); + map.put("msg", "淇濆瓨澶辫触!"); map.put("success", false); } } catch (HttpRequestException e) { e.printStackTrace(); - map.put("msg", "保存失败!"); + map.put("msg", "淇濆瓨澶辫触!"); map.put("success", false); } }else{ - map.put("msg", "保存失败!"); + map.put("msg", "淇濆瓨澶辫触!"); map.put("success", false); } }else{ - map.put("msg", "保存失败!"); + map.put("msg", "淇濆瓨澶辫触!"); map.put("success", false); } }catch(Exception e){ LOGGER.error("",e); - map.put("msg", "该小区暂不支持估价!"); + map.put("msg", "璇ュ皬鍖烘殏涓嶆敮鎸佷及浠�!"); map.put("success", false); } return JsonUtils.toJson(map); } /** - * 获取缓存的验证码 + * 鑾峰彇缂撳瓨鐨勯獙璇佺爜 * @author yinjihuan - * @param mobile 手机 - * @param type 类型 + * @param mobile 鎵嬫満 + * @param type 绫诲瀷 * @return */ private String getCacheCode(String mobile, String type) { @@ -4229,7 +4229,7 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt return cacheCode; } /** - * 添加用户行为分析 + * 娣诲姞鐢ㄦ埛琛屼负鍒嗘瀽 * @return */ private boolean addPurposeAnalysis(suzhouEvalResultModel model, HttpServletRequest req) { @@ -4237,10 +4237,10 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt purposeAnalysis.setUid(LoginUtil.getUserId(req)); purposeAnalysis.setPurpose(model.getPurpose()); purposeAnalysis.setName(model.getName()); - if("贷款".equals(model.getPurpose())){ - purposeAnalysis.setSource(model.getSource()+"(有贷款)"); + if("璐锋".equals(model.getPurpose())){ + purposeAnalysis.setSource(model.getSource()+"(鏈夎捶娆�)"); }else{ - purposeAnalysis.setSource(model.getSource()+"(无贷款)"); + purposeAnalysis.setSource(model.getSource()+"(鏃犺捶娆�)"); } String channelType = SourceUtils.getSampleBaiduSiteType(model.getSource()); purposeAnalysis.setChannelType(channelType); @@ -4248,13 +4248,13 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt purposeAnalysis.setFirstQueryDate(new Date()); purposeAnalysis.setEvalId(model.getEvalId()); int type = 0; - if("卖房".equals(model.getPurpose())){ + if("鍗栨埧".equals(model.getPurpose())){ type = 2; - }else if("贷款".equals(model.getPurpose())){ + }else if("璐锋".equals(model.getPurpose())){ type = 3; - }else if("买房".equals(model.getPurpose())){ + }else if("涔版埧".equals(model.getPurpose())){ type = 1; - }else if("风控".equals(model.getPurpose())){ + }else if("椋庢帶".equals(model.getPurpose())){ type = 7; } purposeAnalysis.setReportType(type); @@ -4273,7 +4273,7 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt } /** - * 添加贷款线索 + * 娣诲姞璐锋绾跨储 * @return */ private boolean addLeads(suzhouEvalResultModel model, HttpServletRequest req) { @@ -4295,7 +4295,7 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt leads.setLoanUserName(model.getName()); //leads.setSex(model.getSex()); leads.setSource(model.getSource()); - // 网站来源 + // 缃戠珯鏉ユ簮 String source = model.getSource(); if(source!=null){ String channelType = SourceUtils.getSampleBaiduSiteType(source); @@ -4390,7 +4390,7 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt } /** - * 渠道估价(广点通广告) + * 娓犻亾浼颁环(骞跨偣閫氬箍鍛�) * @param req * @param model * @return @@ -4401,7 +4401,7 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt /** - * 渠道估价(广点通广告)贷款协议页 + * 娓犻亾浼颁环(骞跨偣閫氬箍鍛�)璐锋鍗忚椤� * @param model * @return */ @@ -4410,7 +4410,7 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt } /** - * 渠道估价(广点通广告-自动匹配) + * 娓犻亾浼颁环(骞跨偣閫氬箍鍛�-鑷姩鍖归厤) * @param req * @param model * @return @@ -4429,7 +4429,7 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt } /** - * 渠道估价(广点通广告-NEWHOUSE) + * 娓犻亾浼颁环(骞跨偣閫氬箍鍛�-NEWHOUSE) * @param req * @param model * @return @@ -4448,27 +4448,27 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt } /** - * 渠道估价结果(广点通广告) + * 娓犻亾浼颁环缁撴灉(骞跨偣閫氬箍鍛�) * @param req * @param model * @return */ public Object reportChannelAction(HttpServletRequest req,EvaluationChannelModel model) { - //先查询idMobile + //鍏堟煡璇dMobile IdMobile idMobile = idMobileService.findById(model.getId()); if(null==idMobile) { - LOGGER.error("查询idMobile失败,id:"+model.getId()); + LOGGER.error("鏌ヨidMobile澶辫触,id:"+model.getId()); return model; } model.setMobile(idMobile.getMobile()); Evaluation evaluation = evaluationService.findEvaluationById(idMobile.getEvalId()); model.setEvaluation(evaluation); BigDecimal decimal = new BigDecimal(evaluation.getTotalPrice()); - // 查询走势数据 + // 鏌ヨ璧板娍鏁版嵁 String totalPriceStr = String .valueOf(decimal.multiply(new BigDecimal(0.0001)).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()); model.setTotalPriceStr(totalPriceStr); - // 评估时间 2900 + // 璇勪及鏃堕棿 2900 SimpleDateFormat sf = new SimpleDateFormat("yyyy/MM/dd HH:mm"); String evalTime = sf.format(evaluation.getCreationDate()); model.setEvalTime(evalTime); @@ -4485,7 +4485,7 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt model.setOneYearUpDownRange(bean.getOneYearUpDownRange()); model.setWeekAvgPrice(bean.getWeekAvgPrice()); model.setTopWeekUpDownRange((int) bean.getTopWeekUpDownRange()); - //区分广点通和SECONDHOUSE的页面来源新增source字段(考虑旧数据SOURCE为空的情况) + //鍖哄垎骞跨偣閫氬拰SECONDHOUSE鐨勯〉闈㈡潵婧愭柊澧瀞ource瀛楁(鑰冭檻鏃ф暟鎹甋OURCE涓虹┖鐨勬儏鍐�) if(StringUtils.isEmpty(idMobile.getSource()) || idMobile.getSource().equals(CHANNEL_NAME_DEFAULT)){ model.setChannelName(CHANNEL_NAME_DEFAULT); }else if(idMobile.getSource().equals(CHANNEL_NAME_DEFAULT_SECONDHOUSE)){ @@ -4495,13 +4495,13 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt } model.setLeads_source(idMobile.getLeads_source()); model.setStype(idMobile.getStype()); - // 记录页面打开日志 + // 璁板綍椤甸潰鎵撳紑鏃ュ織 try { Date curDate = new Date(); LoanBurialPoint log = new LoanBurialPoint(); log.setIntraday(Integer.parseInt(DateUtil.formatByPattern(curDate, "yyyyMMdd"))); log.setTimes(1); - log.setBurialPointName("访问评估结果页"); + log.setBurialPointName("璁块棶璇勪及缁撴灉椤�"); log.setCreateDate(curDate); log.setModifyDate(curDate); log.setSource(idMobile.getSource()); @@ -4509,7 +4509,7 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt log.setMobile(idMobile.getMobile()); loanBurialPointService.save(log); } catch (Exception e) { - LOGGER.error("广点通评估结果页面异常", e); + LOGGER.error("骞跨偣閫氳瘎浼扮粨鏋滈〉闈㈠紓甯�", e); } return model; } @@ -4517,13 +4517,13 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt public Object saveLogAction(EvaluationChannelModel model){ JsonModel ret = new JsonModel(); Map result = new HashMap(); - // 记录点击重新评估日志 + // 璁板綍鐐瑰嚮閲嶆柊璇勪及鏃ュ織 try { Date curDate = new Date(); LoanBurialPoint log = new LoanBurialPoint(); log.setIntraday(Integer.parseInt(DateUtil.formatByPattern(curDate, "yyyyMMdd"))); log.setTimes(1); - log.setBurialPointName("重新评估"); + log.setBurialPointName("閲嶆柊璇勪及"); log.setCreateDate(curDate); log.setModifyDate(curDate); log.setSource(model.getSource()); @@ -4531,7 +4531,7 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt log.setMobile(model.getMobile()); loanBurialPointService.save(log); } catch (Exception e) { - LOGGER.error("广点通评估结果页面异常", e); + LOGGER.error("骞跨偣閫氳瘎浼扮粨鏋滈〉闈㈠紓甯�", e); } ret.setJsonModel(result); return ret; @@ -4548,15 +4548,15 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt IdMobile idMobile = null; if(null == model.getId() || null == model.getApplyType()) { result.put("status", "FAIL"); - result.put("message", "申请失败,非法操作!"); + result.put("message", "鐢宠澶辫触锛岄潪娉曟搷浣滐紒"); ret.setJsonModel(result); return ret; }else { idMobile = idMobileService.findById(model.getId()); if(null == idMobile) { - LOGGER.error("查询idMobile失败,id:"+model.getId()); + LOGGER.error("鏌ヨidMobile澶辫触,id:"+model.getId()); result.put("status", "FAIL"); - result.put("message", "申请失败,已过期!"); + result.put("message", "鐢宠澶辫触锛屽凡杩囨湡锛�"); ret.setJsonModel(result); return ret; }else { @@ -4574,7 +4574,7 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt } if(null != applyNum && applyNum > 0) { result.put("status", "FAIL"); - result.put("message", "申请失败,可申请次数已满!"); + result.put("message", "鐢宠澶辫触锛屽彲鐢宠娆℃暟宸叉弧锛�"); ret.setJsonModel(result); return ret; }else { @@ -4599,29 +4599,29 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt leads.setAvgPrice(evaluation.getAvgPrice()); leads.setTotalPrice(evaluation.getTotalPrice()); }else { - LOGGER.error("saveLoanApply失败----evaluation查询失败,id:"+model.getId()); + LOGGER.error("saveLoanApply澶辫触----evaluation鏌ヨ澶辫触锛宨d:"+model.getId()); result.put("status", "FAIL"); - result.put("message", "申请失败,请刷新后再试!"); + result.put("message", "鐢宠澶辫触,璇峰埛鏂板悗鍐嶈瘯锛�"); ret.setJsonModel(result); return ret; } leads.setMobile(model.getMobile()); - leads.setLoanType(model.getType());//贷款类型 + leads.setLoanType(model.getType());//璐锋绫诲瀷 String loanNum = model.getLoanNum(); if(null != loanNum) { - if(loanNum.contains("万")) { - double loan = Double.valueOf(loanNum.substring(0, loanNum.indexOf("万")))*10000; + if(loanNum.contains("涓�")) { + double loan = Double.valueOf(loanNum.substring(0, loanNum.indexOf("涓�")))*10000; leads.setAmount(loan); }else { leads.setAmount(Double.valueOf(loanNum)); } } - leads.setCity(model.getCityName());//可能无 + leads.setCity(model.getCityName());//鍙兘鏃� leads.setCreateDate(new Date()); leads.setModifyDate(new Date()); leads.setSource(model.getSource()); leads.setLeads_source(model.getLeads_source()); - // 网站来源 + // 缃戠珯鏉ユ簮 String source = model.getSource(); if(source != null){ String channelType = SourceUtils.getSampleBaiduSiteType(source); diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/EvaluationPriceController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/EvaluationPriceController.java index 71a25a083..9f52f2980 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/EvaluationPriceController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/EvaluationPriceController.java @@ -16,7 +16,7 @@ import com.fangjia.service.mongo.fangjia.EvaluationConditionService; import com.fangjia.service.mongo.fangjia.EvaluationFactorService; /** - * 估价 + * 浼颁环 * */ public class EvaluationPriceController { @@ -25,13 +25,13 @@ public class EvaluationPriceController { private EvaluationPriceService evaluationPriceService; public Object saleAction(EvaluationPriceModel model) { - // 根据传入的estateType去查询所有的condition - if (model.getEstateType() == null || model.getEstateType().equals("不限")) { - model.setEstateType("小区"); + // 鏍规嵁浼犲叆鐨別stateType鍘绘煡璇㈡墍鏈夌殑condition + if (model.getEstateType() == null || model.getEstateType().equals("涓嶉檺")) { + model.setEstateType("灏忓尯"); } List evaluationConditions = evaluationConditionService .findEvaluationConditionsByParams(model.getEstateType()); - // 在根据condition去查询所有的factor + // 鍦ㄦ牴鎹甤ondition鍘绘煡璇㈡墍鏈夌殑factor // List evaluationConditions = // evaluationConditionService.findAllEvaluationConditions(); model.setEvaluationConditions(evaluationConditions); @@ -39,7 +39,7 @@ public class EvaluationPriceController { for (EvaluationCondition evaluationCondition : evaluationConditions) { ConditionAndFactorModel conditionAndFactorModel = new ConditionAndFactorModel(); List evaluationFactors = evaluationFactorService - .findEvaluationFactorsByParams("上海", model.getEstateType(), + .findEvaluationFactorsByParams("涓婃捣", model.getEstateType(), evaluationCondition.getCondition()); conditionAndFactorModel.setConditionName(evaluationCondition .getCondition()); @@ -52,27 +52,27 @@ public class EvaluationPriceController { return model; } - // 估算别墅价格 + // 浼扮畻鍒浠锋牸 public Object doEvaluationAction(EvaluationPriceModel model) { - // 根据传入的条件估算价格 - model.getEvaluationPrice().setCity("上海"); - model.getEvaluationPrice().setRegion("浦东"); + // 鏍规嵁浼犲叆鐨勬潯浠朵及绠椾环鏍� + model.getEvaluationPrice().setCity("涓婃捣"); + model.getEvaluationPrice().setRegion("娴︿笢"); model.getEvaluationPrice().setArea(200d); evaluationPriceService.doEvaluation(model.getEvaluationPrice()); return model; } - // 根据物业类型刷新估价条件 + // 鏍规嵁鐗╀笟绫诲瀷鍒锋柊浼颁环鏉′欢 public Object flashConditionAction(EvaluationPriceModel model) { - // 根据传入的estateType去查询所有的condition + // 鏍规嵁浼犲叆鐨別stateType鍘绘煡璇㈡墍鏈夌殑condition JsonModel jsonModel = new JsonModel(); System.out.println(model.getEstateType()); - if (model.getEstateType() == null || model.getEstateType().equals("不限")) { - model.setEstateType("小区"); + if (model.getEstateType() == null || model.getEstateType().equals("涓嶉檺")) { + model.setEstateType("灏忓尯"); } List evaluationConditions = evaluationConditionService .findEvaluationConditionsByParams(model.getEstateType()); - // 在根据condition去查询所有的factor + // 鍦ㄦ牴鎹甤ondition鍘绘煡璇㈡墍鏈夌殑factor model.setEvaluationConditions(evaluationConditions); List conditionAndFactorModels = new ArrayList(); for (EvaluationCondition evaluationCondition : evaluationConditions) { @@ -91,7 +91,7 @@ public class EvaluationPriceController { return jsonModel; } - // 计算房子价格 + // 璁$畻鎴垮瓙浠锋牸 public Object doPriceAction(EvaluationPriceModel model) { JsonModel jsonModel = new JsonModel(); @@ -102,7 +102,7 @@ public class EvaluationPriceController { } catch (UnsupportedEncodingException e) { e.printStackTrace(); } - // 对ajax参数进行解析 + // 瀵筧jax鍙傛暟杩涜瑙f瀽 double totalPrice = evaluationPriceService.doPrice(decodeCondition); Map maxAndMinPriceMap = evaluationPriceService.doMinAndMaxPrice(decodeCondition); model.setTotalPrice(totalPrice); diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/EvaluationPurposeAnalysisController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/EvaluationPurposeAnalysisController.java index 2c7fe7999..a0a3a4f90 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/EvaluationPurposeAnalysisController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/EvaluationPurposeAnalysisController.java @@ -19,7 +19,7 @@ import com.fangjia.service.fangjia.FangJiaUserService; import com.fangjia.service.mongo.fangjia.ServerAreaService; /** - * 用户评估目的分析 + * 鐢ㄦ埛璇勪及鐩殑鍒嗘瀽 * @author yinjihuan * */ @@ -31,7 +31,7 @@ public class EvaluationPurposeAnalysisController { private FangJiaUserService fangJiaUserService; /** - * 估价Service + * 浼颁环Service */ private EvaluationService evaluationService; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/EvaluationReportController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/EvaluationReportController.java index 42b533aff..fe72aa88d 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/EvaluationReportController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/EvaluationReportController.java @@ -129,7 +129,7 @@ public class EvaluationReportController { } /** - * 关闭数据流 + * 鍏抽棴鏁版嵁娴� * * @param inputStream * @param outputStream @@ -150,10 +150,10 @@ public class EvaluationReportController { } /** - * Evaluation Report No.生成规则 + * Evaluation Report No.鐢熸垚瑙勫垯 * * @param evaluationId - * 估价ID + * 浼颁环ID * @return Evaluation Report No */ private String getEvaluationReportNo(String evaluationId) { @@ -161,13 +161,13 @@ public class EvaluationReportController { } /** - * PDF视图设置 + * PDF瑙嗗浘璁剧疆 * * @param inputStream - * 文件流 + * 鏂囦欢娴� * @param evaluationReportId * @param postfix - * URL显示的文件后缀 + * URL鏄剧ず鐨勬枃浠跺悗缂� * @return ReportModelAndView */ private ReportModelAndView getReportModelAndView(InputStream inputStream, String evaluationReportId, String postfix) { @@ -181,7 +181,7 @@ public class EvaluationReportController { } /** - * 获取小区面积20%的房源 + * 鑾峰彇灏忓尯闈㈢Н20%鐨勬埧婧� * * @param evaluation * @param pager @@ -206,7 +206,7 @@ public class EvaluationReportController { } /** - * 获取面积范围 + * 鑾峰彇闈㈢Н鑼冨洿 * * @param area * @param offset @@ -227,7 +227,7 @@ public class EvaluationReportController { } /** - * 获取周边radius公里的查询条件 + * 鑾峰彇鍛ㄨ竟radius鍏噷鐨勬煡璇㈡潯浠� * * @param lat * @param lng @@ -248,7 +248,7 @@ public class EvaluationReportController { } /** - * 获取价格范围 + * 鑾峰彇浠锋牸鑼冨洿 * * @param price * @param offset @@ -263,7 +263,7 @@ public class EvaluationReportController { } /** - * 获取相似房源 + * 鑾峰彇鐩镐技鎴挎簮 * * @param evaluation * @return @@ -272,32 +272,32 @@ public class EvaluationReportController { Pager pager = new Pager(3); - // 面积20% + // 闈㈢Н20% String areaRange = null; if (evaluation.getArea() != null && evaluation.getArea() > 0) { areaRange = getAreaRange(evaluation.getArea(), 0.2); } - // 获取小区内相似房源 + // 鑾峰彇灏忓尯鍐呯浉浼兼埧婧� List houseBoList = districtAreaSimilarHouse(evaluation, pager, areaRange); - // 价格20%范围 + // 浠锋牸20%鑼冨洿 String totalPriceRange = null; if (evaluation.getTotalPrice() != null && evaluation.getTotalPrice() > 0) { totalPriceRange = getTotalPriceRange(evaluation.getTotalPrice(), 0.2); } - // 补充周边房源 + // 琛ュ厖鍛ㄨ竟鎴挎簮 if (isHouseNotEnough(houseBoList, pager)) { - // 获取周边3公里的查询条件 + // 鑾峰彇鍛ㄨ竟3鍏噷鐨勬煡璇㈡潯浠� DistrictQueryBean disQueryBean = getDistrictQueryBean(lat, lng, 3); FacetQueryResult districtResult = districtService.findByQueryBean(new Pager(30), disQueryBean, false); - // 周边房源存在 + // 鍛ㄨ竟鎴挎簮瀛樺湪 if (districtResult.size() > 0) { - // 按Region排序 + // 鎸塕egion鎺掑簭 Map> districtMap = CollectionUtils.groupBy(districtResult, new Closure() { public String execute(District input) { @@ -329,7 +329,7 @@ public class EvaluationReportController { CollectionUtils.addAll(houseBoList, houseService.findByQueryBean(pager, addQueryBean) .iterator()); } else { - // 房源数满足后 ,break + // 鎴挎簮鏁版弧瓒冲悗 ,break break; } } @@ -344,7 +344,7 @@ public class EvaluationReportController { } /** - * 补充房源查询条件 + * 琛ュ厖鎴挎簮鏌ヨ鏉′欢 * * @return */ @@ -364,7 +364,7 @@ public class EvaluationReportController { } /** - * 判断房源是否满足显示条件 + * 鍒ゆ柇鎴挎簮鏄惁婊¤冻鏄剧ず鏉′欢 * * @param result * @return @@ -374,7 +374,7 @@ public class EvaluationReportController { } /** - * 获取_google地图地址 + * 鑾峰彇_google鍦板浘鍦板潃 * * @param orgLat * @param orgLng @@ -389,7 +389,7 @@ public class EvaluationReportController { } /** - * 估价报告数据集 + * 浼颁环鎶ュ憡鏁版嵁闆� * * @param reportId * @param reportNo @@ -410,9 +410,9 @@ public class EvaluationReportController { Report report = new Report(); - // 估价报告 作者信息 - report.setReportAuto("房价网"); - report.setReportDate(DateUtil.formatByPattern(date, "yyyy年MM月dd日")); + // 浼颁环鎶ュ憡 浣滆�呬俊鎭� + report.setReportAuto("鎴夸环缃�"); + report.setReportDate(DateUtil.formatByPattern(date, "yyyy骞碝M鏈坉d鏃�")); report.setReportNo(reportNo); report.setDistrictName(evaluation.getDistrictName()); @@ -440,7 +440,7 @@ public class EvaluationReportController { report.setEvaluationDescription(autoMakeEvaluationDescription(evaluation)); - // 估价报告 相关图片 + // 浼颁环鎶ュ憡 鐩稿叧鍥剧墖 if (district != null) { report.setGoogleMap(getGoogleMap(district.getLat(), district.getLng())); } else { @@ -453,7 +453,7 @@ public class EvaluationReportController { } /** - * 获取走势图 + * 鑾峰彇璧板娍鍥� * * @param evaluation * @return @@ -466,7 +466,7 @@ public class EvaluationReportController { } /** - * 生成_google走势图配置 + * 鐢熸垚_google璧板娍鍥鹃厤缃� * * @param width * @param height @@ -514,7 +514,7 @@ public class EvaluationReportController { } /** - * 获取走势图 + * 鑾峰彇璧板娍鍥� * * @param dss * @param evaluation @@ -542,7 +542,7 @@ public class EvaluationReportController { } /** - * 获取估价显示名称 + * 鑾峰彇浼颁环鏄剧ず鍚嶇О * * @param districtName * @param houseNum @@ -554,56 +554,56 @@ public class EvaluationReportController { if (StringUtils.isNotBlank(districtName)) { evaluationName.append(districtName); } - // 只做字符串处理,不做数字处理,传入的值可能是 中文数字 (例如 :四十等) + // 鍙仛瀛楃涓插鐞嗭紝涓嶅仛鏁板瓧澶勭悊锛屼紶鍏ョ殑鍊煎彲鑳芥槸 涓枃鏁板瓧 锛堜緥濡� 锛氬洓鍗佺瓑锛� if (StringUtils.isNotEmpty(houseNum)) { evaluationName.append(houseNum); - evaluationName.append("号"); + evaluationName.append("鍙�"); } if (StringUtils.isNotBlank(roomNum)) { evaluationName.append(roomNum); - evaluationName.append("室"); + evaluationName.append("瀹�"); } return evaluationName.toString(); } /** - * 获取估价报告描述 + * 鑾峰彇浼颁环鎶ュ憡鎻忚堪 * * @param evaluation * @return */ private String autoMakeEvaluationDescription(final Evaluation evaluation) { - String prefix = "分析对象:";// 没有数据的时候 不显示 prefix + String prefix = "鍒嗘瀽瀵硅薄锛�";// 娌℃湁鏁版嵁鐨勬椂鍊� 涓嶆樉绀� prefix StringBuffer eDesc = new StringBuffer(); - eDesc.append(joinAroundFix("装修情况", null, evaluation.getFitment(), true));// 装修 - eDesc.append(joinAroundFix("小区位置", null, evaluation.getInsidepos(), true));// 小区位置 - eDesc.append(joinAroundFix("朝向", null, evaluation.getDirection(), true));// 朝向 + eDesc.append(joinAroundFix("瑁呬慨鎯呭喌", null, evaluation.getFitment(), true));// 瑁呬慨 + eDesc.append(joinAroundFix("灏忓尯浣嶇疆", null, evaluation.getInsidepos(), true));// 灏忓尯浣嶇疆 + eDesc.append(joinAroundFix("鏈濆悜", null, evaluation.getDirection(), true));// 鏈濆悜 if (evaluation.getFitmentCharge() != null) { - eDesc.append(joinAroundFix("装修价格", null, evaluation.getFitmentCharge() + "元", true));// 装修价格 + eDesc.append(joinAroundFix("瑁呬慨浠锋牸", null, evaluation.getFitmentCharge() + "鍏�", true));// 瑁呬慨浠锋牸 } if (evaluation.getFitmentAge() != null) { - eDesc.append(joinAroundFix("装修年限", null, getFitmentAge(evaluation.getFitmentAge()), true));// 装修年限 + eDesc.append(joinAroundFix("瑁呬慨骞撮檺", null, getFitmentAge(evaluation.getFitmentAge()), true));// 瑁呬慨骞撮檺 } - eDesc.append(joinAroundFix("景观情况", null, evaluation.getSight(), true)); - eDesc.append(joinAroundFix("采光通风", null, evaluation.getLightingVentilation(), true)); - eDesc.append(joinAroundFix("噪音情况", null, evaluation.getNoise(), true)); + eDesc.append(joinAroundFix("鏅鎯呭喌", null, evaluation.getSight(), true)); + eDesc.append(joinAroundFix("閲囧厜閫氶", null, evaluation.getLightingVentilation(), true)); + eDesc.append(joinAroundFix("鍣煶鎯呭喌", null, evaluation.getNoise(), true)); if (evaluation.getGardenArea() != null || evaluation.getBasementArea() != null) { - eDesc.append("赠送面积"); + eDesc.append("璧犻�侀潰绉�"); if (evaluation.getGardenArea() != null) { - eDesc.append(joinAroundFix("花园", null, evaluation.getGardenArea() + "平米", true)); + eDesc.append(joinAroundFix("鑺卞洯", null, evaluation.getGardenArea() + "骞崇背", true)); } if (evaluation.getBasementArea() != null) { - eDesc.append(joinAroundFix("地下室", null, evaluation.getBasementArea() + "平米", true)); + eDesc.append(joinAroundFix("鍦颁笅瀹�", null, evaluation.getBasementArea() + "骞崇背", true)); } } - eDesc.append(joinAroundFix("边套装置", null, evaluation.getSideset(), true)); - eDesc.append(joinAroundFix("厌恶因素", null, evaluation.getWorryFactor(), true)); - eDesc.append(joinAroundFix("建筑质量", null, evaluation.getBuildQuality(), true)); - eDesc.append(joinAroundFix("厌恶设施", null, evaluation.getWorryFacility(), true)); - eDesc.append(joinAroundFix("自有车位", null, evaluation.getCarport(), true)); - eDesc.append(joinAroundFix("小区配套", null, evaluation.getFacilities(), true)); - eDesc.append(joinAroundFix("其他因素", null, evaluation.getOtherFactor(), false)); + eDesc.append(joinAroundFix("杈瑰瑁呯疆", null, evaluation.getSideset(), true)); + eDesc.append(joinAroundFix("鍘屾伓鍥犵礌", null, evaluation.getWorryFactor(), true)); + eDesc.append(joinAroundFix("寤虹瓚璐ㄩ噺", null, evaluation.getBuildQuality(), true)); + eDesc.append(joinAroundFix("鍘屾伓璁炬柦", null, evaluation.getWorryFacility(), true)); + eDesc.append(joinAroundFix("鑷湁杞︿綅", null, evaluation.getCarport(), true)); + eDesc.append(joinAroundFix("灏忓尯閰嶅", null, evaluation.getFacilities(), true)); + eDesc.append(joinAroundFix("鍏朵粬鍥犵礌", null, evaluation.getOtherFactor(), false)); if (eDesc.length() > 0) { return prefix + eDesc.toString(); } @@ -611,20 +611,20 @@ public class EvaluationReportController { } /** - * 获取装修年限的字符串 + * 鑾峰彇瑁呬慨骞撮檺鐨勫瓧绗︿覆 * * @param fitmentAge * @return */ private String getFitmentAge(int fitmentAge) { if (fitmentAge == 5) { - return "4年以上"; + return "4骞翠互涓�"; } - return fitmentAge + "年"; + return fitmentAge + "骞�"; } /** - * 拼接字符串 + * 鎷兼帴瀛楃涓� * * @param prefix * @param postfix @@ -644,12 +644,12 @@ public class EvaluationReportController { if (appendFlag) { return prefix + content + postfix + ","; } else { - return prefix + content + postfix + "。"; + return prefix + content + postfix + "銆�"; } } /** - * 获取文件inputStream + * 鑾峰彇鏂囦欢inputStream * * @param path * @return @@ -659,37 +659,37 @@ public class EvaluationReportController { } /** - * 估价信息表格数据 + * 浼颁环淇℃伅琛ㄦ牸鏁版嵁 * * @param report * @return */ private List getEvaluationTableDatas(Report report) { List evaluationTableDatas = new ArrayList(16); - evaluationTableDatas.add("幢号:"); + evaluationTableDatas.add("骞㈠彿锛�"); evaluationTableDatas.add(report.getHouseNum()); - evaluationTableDatas.add("室号:"); + evaluationTableDatas.add("瀹ゅ彿:"); evaluationTableDatas.add(report.getRoomNum()); - evaluationTableDatas.add("建筑面积:"); + evaluationTableDatas.add("寤虹瓚闈㈢Н锛�"); evaluationTableDatas.add(report.getArea()); - evaluationTableDatas.add("楼层:"); + evaluationTableDatas.add("妤煎眰锛�"); evaluationTableDatas.add(report.getFloor()); - evaluationTableDatas.add("建筑类型:"); + evaluationTableDatas.add("寤虹瓚绫诲瀷锛�"); evaluationTableDatas.add(report.getBuildType()); - evaluationTableDatas.add("用途:"); - evaluationTableDatas.add("住宅"); + evaluationTableDatas.add("鐢ㄩ�旓細"); + evaluationTableDatas.add("浣忓畢"); - evaluationTableDatas.add("房龄:"); + evaluationTableDatas.add("鎴块緞锛�"); evaluationTableDatas.add(report.getAge()); - evaluationTableDatas.add("产权属性:"); + evaluationTableDatas.add("浜ф潈灞炴�э細"); evaluationTableDatas.add(report.getHouseProperty()); return evaluationTableDatas; } /** - * 从_intputstream中获取bytes + * 浠巁intputstream涓幏鍙朾ytes * * @param is * @return @@ -730,7 +730,7 @@ public class EvaluationReportController { } /** - * 忽略NULL值 + * 蹇界暐NULL鍊� * * @param obj * @return diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/EvaluationSearchController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/EvaluationSearchController.java index 8cda33b45..8e6c86932 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/EvaluationSearchController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/EvaluationSearchController.java @@ -27,7 +27,7 @@ import com.fangjia.service.menu.Value; import com.fangjia.service.web.MenuService; /** - * 估价 + * 浼颁环 * */ public class EvaluationSearchController { @@ -35,7 +35,7 @@ public class EvaluationSearchController { private MenuService menuService; /** - * 估价历史 列表页面 + * 浼颁环鍘嗗彶 鍒楄〃椤甸潰 * * @param model * @return @@ -53,7 +53,7 @@ public class EvaluationSearchController { // } // // Menu menu = menuService.menuMaker(FangjiaServerAreaContextHolder.getServerAreaDefault(), MenuCategoryEnum.goojia, -// getCurrentParams(), 1);// 默认用区域菜单 +// getCurrentParams(), 1);// 榛樿鐢ㄥ尯鍩熻彍鍗� // // EvaluationQueryBean queryBean = new EvaluationQueryBean(); // BeanUtils.copyProperties(model, queryBean); @@ -61,20 +61,20 @@ public class EvaluationSearchController { // queryBean.setCity(city); // queryBean.setFullTextSearch(true); // -// // 获取面积范围 +// // 鑾峰彇闈㈢Н鑼冨洿 // if (NumberUtils.isDigits(queryBean.getHouseAreaRange())) { // Value value = menuService.getValue(FangjiaServerAreaContextHolder.getServerAreaDefault(), MenuCategoryEnum.goojia, // "houseAreaRange", queryBean.getHouseAreaRange()); // queryBean.setHouseAreaRange(value.getMin() + "_" + value.getMax()); // } -// // 获取价格范围 +// // 鑾峰彇浠锋牸鑼冨洿 // if (NumberUtils.isDigits(queryBean.getTotalPriceRange())) { // Value value = menuService.getValue(FangjiaServerAreaContextHolder.getServerAreaDefault(), MenuCategoryEnum.goojia, // "totalPriceRange", queryBean.getTotalPriceRange()); // queryBean.setTotalPriceRange(value.getMin() + "_" + value.getMax()); // } // queryBean.setKeyword(null); -// FacetQueryResult evaluationBoResult = findWithFacetSearch(menu, pager, queryBean, "modificationDate", false);// 按创建时间降序creationDate, +// FacetQueryResult evaluationBoResult = findWithFacetSearch(menu, pager, queryBean, "modificationDate", false);// 鎸夊垱寤烘椂闂撮檷搴廲reationDate, // // pager = safeCheckPager(evaluationBoResult.getNumberFound(), pager); // pager.setTotalRows(evaluationBoResult.getNumberFound()); @@ -101,14 +101,14 @@ public class EvaluationSearchController { // // if (queryBean.getRegion() == null && queryBean.getHouseAreaRange() == null && queryBean.getTotalPriceRange() == null // && queryBean.getRoom() == null) { -// // 只输入了关键词(这里是从上一个页面带过来的小区名) +// // 鍙緭鍏ヤ簡鍏抽敭璇�(杩欓噷鏄粠涓婁竴涓〉闈㈠甫杩囨潵鐨勫皬鍖哄悕) // FacetQueryResult evaluationBoResult = facetSearch(pager, queryBean, menu, sortField, asc); // if (evaluationBoResult != null) { // menuService.operationMenuWithFacet(menu, evaluationBoResult.getFacetResults(), evaluationBoResult.size()); // } // return evaluationBoResult; // } else { -// // 关键词 + region + areaRange 等的组合检索 +// // 鍏抽敭璇� + region + areaRange 绛夌殑缁勫悎妫�绱� // FacetQueryResult evaluationBoResult = evaluationService.findBoByQueryBeanSort(pager, queryBean, // sortField, asc); // @@ -165,7 +165,7 @@ public class EvaluationSearchController { // } // // /** -// * 起始位置比总数大,说明当前页数不对,从第一页开始 +// * 璧峰浣嶇疆姣旀�绘暟澶э紝璇存槑褰撳墠椤垫暟涓嶅锛屼粠绗竴椤靛紑濮� // * // * @param maxRow // * @param pager diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/FangjiaController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/FangjiaController.java index ca70aa7bc..ad3b0facb 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/FangjiaController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/FangjiaController.java @@ -98,7 +98,7 @@ public class FangjiaController { private UrlFilterService urlFilterService; /** - * 查询网站过滤的url + * 鏌ヨ缃戠珯杩囨护鐨剈rl * @param model * @return */ @@ -111,14 +111,14 @@ public class FangjiaController { } /** - * 城市首页|二手房列表|租房列表|小区列表 展示的友情链接 根据type查询相应的记录 + * 鍩庡競棣栭〉|浜屾墜鎴垮垪琛▅绉熸埧鍒楄〃|灏忓尯鍒楄〃 灞曠ず鐨勫弸鎯呴摼鎺� 鏍规嵁type鏌ヨ鐩稿簲鐨勮褰� * * @param model * @return */ public Object friendLinkAction(FriendLinkModel model) { String city = ((ServerArea) FangjiaServerAreaContextHolder.getServerAreaDefault()).getDisplay(); - if (model.getType() == 7 || model.getType() == 6) {// 城市首页清空城市 + if (model.getType() == 7 || model.getType() == 6) {// 鍩庡競棣栭〉娓呯┖鍩庡競 city = "all"; } final FriendLinkPlacementEnum placementEnum = FriendLinkPlacementEnum.findByPlacement(model.getType()); @@ -134,7 +134,7 @@ public class FangjiaController { } /** - * 缓存友情链接查询 + * 缂撳瓨鍙嬫儏閾炬帴鏌ヨ * * @param city * @param placementEnum @@ -151,7 +151,7 @@ public class FangjiaController { } /** - * 根据首页输入框中关键字进行频道切换 + * 鏍规嵁棣栭〉杈撳叆妗嗕腑鍏抽敭瀛楄繘琛岄閬撳垏鎹� * * @param model * @return @@ -176,7 +176,7 @@ public class FangjiaController { FangjiaServerAreaContextHolder.setServerArea(serverArea); } - // 判断当前城市是否开通新盘 + // 鍒ゆ柇褰撳墠鍩庡競鏄惁寮�閫氭柊鐩� boolean isSupportXinfang = (null != model.getCity() && model.getCity().isSupportXinfang()) == true ? true : false; CategoryEnum channel = knowbaseService.parseKeyWord(model.getKeyword(), isSupportXinfang); String channelUrl = null; @@ -184,20 +184,20 @@ public class FangjiaController { if (StringUtils.isNotBlank(model.getKeyword())) { s = URLEncoder.encode(model.getKeyword(), "UTF-8") + "--__y-1"; } - if (CategoryEnum.sell == channel) { // 二手房 + if (CategoryEnum.sell == channel) { // 浜屾墜鎴� channelUrl = model.getCityUrl() + "/ershoufang/" + s; - } else if (CategoryEnum.rent == channel) { // 租房 + } else if (CategoryEnum.rent == channel) { // 绉熸埧 channelUrl = model.getCityUrl() + "/zufang/" + s; - } else if (CategoryEnum.district == channel) { // 小区 + } else if (CategoryEnum.district == channel) { // 灏忓尯 channelUrl = model.getCityUrl() + "/xiaoqu/" + s; - } else if (CategoryEnum.evaluation == channel) { // 估价 + } else if (CategoryEnum.evaluation == channel) { // 浼颁环 channelUrl = model.getCityUrl() + "/evaluation/report?keyword=" + URLEncoder.encode(model.getKeyword(), "UTF-8"); - } else if (CategoryEnum.news == channel) { // 资讯 + } else if (CategoryEnum.news == channel) { // 璧勮 channelUrl = model.getSouUrl() + "/xinwen/" + s; - } else if (CategoryEnum.map == channel) { // 地图找房 + } else if (CategoryEnum.map == channel) { // 鍦板浘鎵炬埧 channelUrl = model.getCityUrl() + "/map/list?category=ershoufang&keyword=" + URLEncoder.encode(model.getKeyword(), "UTF-8"); - } else if (CategoryEnum.new_district == channel) {// 新盘 + } else if (CategoryEnum.new_district == channel) {// 鏂扮洏 channelUrl = model.getCityUrl() + "/xinfang/" + s; } else { channelUrl = model.getCityUrl() + "/ershoufang/" + s; @@ -210,7 +210,7 @@ public class FangjiaController { } /** - * 热门区域及小区显示 + * 鐑棬鍖哄煙鍙婂皬鍖烘樉绀� * * @param model * @return @@ -267,7 +267,7 @@ public class FangjiaController { } /** - * 首页相似房源 + * 棣栭〉鐩镐技鎴挎簮 * * @return */ @@ -275,7 +275,7 @@ public class FangjiaController { FangjiaModel model = new FangjiaModel(); String uid = CoresiteCookieContext.getInstance().getCookieValue(ActionContext.getContext().getRequest(), CookieName.UID); SnapData snapData = snapDataService.findHistoryRecord(uid, SnapData.SNAP_CAT_HOUSE); - // 获取首页类似房源 + // 鑾峰彇棣栭〉绫讳技鎴挎簮 getSimilarHouseList(snapData, model); return model; } @@ -289,7 +289,7 @@ public class FangjiaController { } /** - * 获取全国的城市信息 + * 鑾峰彇鍏ㄥ浗鐨勫煄甯備俊鎭� * * @return */ @@ -323,13 +323,13 @@ public class FangjiaController { private void getSimilarHouseList(SnapData snapData, FangjiaModel model) { if (null == snapData || CollectionUtils.isEmpty(snapData.getData())) { - // 默认推荐5套二手房 + // 榛樿鎺ㄨ崘5濂椾簩鎵嬫埧 getDefaultHouseList(model); return; } Map mapData = snapData.getData().get(snapData.getData().size() - 1); - // 当前城市与最后浏览的房源城市不一致 + // 褰撳墠鍩庡競涓庢渶鍚庢祻瑙堢殑鎴挎簮鍩庡競涓嶄竴鑷� if (!FangjiaServerAreaContextHolder.getServerAreaDefault().getDisplay().equals(mapData.get(SnapData.DATE_KEY_CITY))) { // getDefaultHouseList(model); return; @@ -354,7 +354,7 @@ public class FangjiaController { } } - private void getSellHouseList(SnapData snapData, FangjiaModel model) {// 二手房 + private void getSellHouseList(SnapData snapData, FangjiaModel model) {// 浜屾墜鎴� HouseQueryBean query = new HouseQueryBean(); Map queryMap = snapData.getData().get(snapData.getData().size() - 1); @@ -376,7 +376,7 @@ public class FangjiaController { query.setLat(Long.parseLong(queryMap.get(key).toString())); } else if (SnapData.DATE_KEY_LNG.equals(key) && null != queryMap.get(key)) { query.setLng(Long.parseLong(queryMap.get(key).toString())); - } else if (SnapData.DATE_KEY_AREARANGE.equals(key) && null != queryMap.get(key)) {// 面积范围 + } else if (SnapData.DATE_KEY_AREARANGE.equals(key) && null != queryMap.get(key)) {// 闈㈢Н鑼冨洿 query.setHouseAgeRange(queryMap.get(key).toString()); } else if (SnapData.DATE_KEY_CITY.equals(key) && null != queryMap.get(key)) { query.setCity(queryMap.get(SnapData.DATE_KEY_CITY).toString()); @@ -385,7 +385,7 @@ public class FangjiaController { query.setPicEnum(HousePicEnum.EXISTS); // query.setExcludeId(snapData.getObjId()); - List ret = houseService.findSimilarHouseList(query, 6);// 设置要获取的相似房源的数量 + List ret = houseService.findSimilarHouseList(query, 6);// 璁剧疆瑕佽幏鍙栫殑鐩镐技鎴挎簮鐨勬暟閲� if (CollectionUtils.isNotEmpty(ret)) { HouseBo remove = null; for (HouseBo bo : ret) { @@ -403,7 +403,7 @@ public class FangjiaController { } } - private void getRentHouseList(SnapData snapData, FangjiaModel model) {// 出租房 + private void getRentHouseList(SnapData snapData, FangjiaModel model) {// 鍑虹鎴� RentHouseQueryBean query = new RentHouseQueryBean(); Map queryMap = snapData.getData().get(snapData.getData().size() - 1); @@ -420,7 +420,7 @@ public class FangjiaController { query.setLat(Long.parseLong(queryMap.get(key).toString())); } else if (SnapData.DATE_KEY_LNG.equals(key) && null != queryMap.get(key)) { query.setLng(Long.parseLong(queryMap.get(key).toString())); - } else if (SnapData.DATE_KEY_ROOM.equals(key) && null != queryMap.get(key)) {// 出租房按“室”数查询 + } else if (SnapData.DATE_KEY_ROOM.equals(key) && null != queryMap.get(key)) {// 鍑虹鎴挎寜鈥滃鈥濇暟鏌ヨ query.setRoom(Integer.parseInt(queryMap.get(key).toString())); } else if (SnapData.DATE_KEY_AREARANGE.equals(key) && null != queryMap.get(key)) { query.setHouseAreaRange(queryMap.get(key).toString()); @@ -450,7 +450,7 @@ public class FangjiaController { } /** - * 全国flash,地图Action(获取均价分段) + * 鍏ㄥ浗flash锛屽湴鍥続ction锛堣幏鍙栧潎浠峰垎娈碉級 * * @param model * @return @@ -476,7 +476,7 @@ public class FangjiaController { } /** - * 城市首页tab切换页 + * 鍩庡競棣栭〉tab鍒囨崲椤� * * @param model * @return @@ -510,7 +510,7 @@ public class FangjiaController { if (city.isSupportMetro()) { List allMetro = metroService.getAllMetroByCity(city.getDisplay()); - // 最终按地铁线路有序排列的列表 + // 鏈�缁堟寜鍦伴搧绾胯矾鏈夊簭鎺掑垪鐨勫垪琛� List> ret = new ArrayList>(); if (CollectionUtils.isNotEmpty(allMetro)) { String curLine = ""; @@ -598,7 +598,7 @@ public class FangjiaController { } /** - * 获取城市内的区域信息,在城市首页flash不出现时显示 + * 鑾峰彇鍩庡競鍐呯殑鍖哄煙淇℃伅锛屽湪鍩庡競棣栭〉flash涓嶅嚭鐜版椂鏄剧ず * * @param model */ @@ -674,7 +674,7 @@ public class FangjiaController { } /** - * 获取城市均价 + * 鑾峰彇鍩庡競鍧囦环 * * @param model */ @@ -687,7 +687,7 @@ public class FangjiaController { } /** - * 全国flash,获取全国每个城市的情况 + * 鍏ㄥ浗flash锛岃幏鍙栧叏鍥芥瘡涓煄甯傜殑鎯呭喌 * * @param model * @return @@ -708,7 +708,7 @@ public class FangjiaController { } /** - * 获取城市中每个区域的情况 + * 鑾峰彇鍩庡競涓瘡涓尯鍩熺殑鎯呭喌 * * @param model * @return @@ -740,7 +740,7 @@ public class FangjiaController { } /** - * 全国flash,获取全国地图数据 + * 鍏ㄥ浗flash,鑾峰彇鍏ㄥ浗鍦板浘鏁版嵁 * * @param root * @param staticUrl @@ -750,33 +750,33 @@ public class FangjiaController { private String getNationMapData(String root, String staticUrl, Map citys) { StringBuffer xml = new StringBuffer("\n"); xml.append("\n\n"); NumberRange citysNr = getCityStatListMaxMin(citys); xml.append(getNationalSituation(root, staticUrl, citys, citysNr)); - xml.append("\n"); xml.append("" + staticUrl + "/images/bgtu/diaoyudao/dyd.jpg\n"); - xml.append("无价\n"); + xml.append("鏃犱环\n"); xml.append("0\n"); xml.append("0\n"); xml.append("0\n"); xml.append("0\n"); xml.append("\n"); - xml.append("\n"); xml.append("" + staticUrl + "/images/bgtu/diaoyudao/dyd.jpg\n"); - xml.append("无价\n"); + xml.append("鏃犱环\n"); xml.append("0\n"); xml.append("0\n"); xml.append("0\n"); @@ -789,7 +789,7 @@ public class FangjiaController { } /** - * 城市flash,获取城市地图数据 + * 鍩庡競flash,鑾峰彇鍩庡競鍦板浘鏁版嵁 * * @param cityUrl * @param staticUrl @@ -800,13 +800,13 @@ public class FangjiaController { private String getCityMapData(String cityUrl, String staticUrl, ServerArea city) throws UnsupportedEncodingException { StringBuffer xml = new StringBuffer("\n"); xml.append("\n\n"); List regions = this.menuService.getRegionsByCity(city, MenuCategoryEnum.ershoufang); if (CollectionUtils.isNotEmpty(regions)) { @@ -818,7 +818,7 @@ public class FangjiaController { } /** - * 全国flash,获取所有城市的情况 + * 鍏ㄥ浗flash,鑾峰彇鎵�鏈夊煄甯傜殑鎯呭喌 * * @param cityId * @param city @@ -840,7 +840,7 @@ public class FangjiaController { if (null != cityStat) { avgPrice = DataUtil.formatAvgPrice(cityStat.getAvgPrice()); weekendMarkupStatus = cityStat.getWeekendMarkup() > 0 ? 1 : cityStat.getWeekendMarkup() == 0 ? 0 : -1; - weekendMarkup = (weekendMarkupStatus == 0) ? "—" : Math.abs((float) cityStat.getWeekendMarkup() / 100) + "%"; + weekendMarkup = (weekendMarkupStatus == 0) ? "鈥�" : Math.abs((float) cityStat.getWeekendMarkup() / 100) + "%"; } HouseQueryBean houseQueryBean = new HouseQueryBean(); @@ -850,16 +850,16 @@ public class FangjiaController { RentHouseQueryBean rentHouseQueryBean = new RentHouseQueryBean(); rentHouseQueryBean.setCity(cityName); long rentCount = this.rentHouseService.findRentHouseCountByQueryBean(rentHouseQueryBean); - // 是否可用 + // 鏄惁鍙敤 int active = (0 == avgPrice && 0 == sellCount && 0 == rentCount) ? 0 : 1; FlashMapUtil.NationalColorEnum color = FlashMapUtil.getNationalColors(citys.size(), avgPrice, citysNr); /* - * 默认字体不变色 + * 榛樿瀛椾綋涓嶅彉鑹� */ xml.append("\n"); xml.append(staticUrl @@ -880,24 +880,24 @@ public class FangjiaController { + TemplateUtils.encodePicUrl(city.getId() + ((null != city.getIcoVersion()) ? city.getIcoVersion() : "") + "ico", "m", "city_ico")); xml.append("\n"); - String apStatus = (avgPrice == 0) ? "暂无均价" : avgPrice + "元/㎡";// + - // "元/㎡" + String apStatus = (avgPrice == 0) ? "鏆傛棤鍧囦环" : avgPrice + "鍏�/銕�";// + + // "鍏�/銕�" xml.append(apStatus); xml.append("\n"); - xml.append(sellCount + "套"); + xml.append(sellCount + "濂�"); xml.append("\n"); xml.append(weekendMarkupStatus); xml.append("\n"); xml.append(weekendMarkup); xml.append("\n"); - xml.append(rentCount + "套"); + xml.append(rentCount + "濂�"); xml.append("\n\n"); /* - * 给图标(小圆点)变色的 + * 缁欏浘鏍囷紙灏忓渾鐐癸級鍙樿壊鐨� */ xml.append("\n"); xml.append(staticUrl + "/fs/" + TemplateUtils.encodePicUrl(city.getId() + ((null != city.getIcoVersion()) ? city.getIcoVersion() : "") + "ico", "m", "city_ico")); xml.append("\n"); - // String apStatus = (avgPrice == 0) ? "暂无均价" : avgPrice + - // "元/㎡"; + // String apStatus = (avgPrice == 0) ? "鏆傛棤鍧囦环" : avgPrice + + // "鍏�/銕�"; xml.append(apStatus); xml.append("\n"); - xml.append(sellCount + "套"); + xml.append(sellCount + "濂�"); xml.append("\n"); xml.append(weekendMarkupStatus); xml.append("\n"); xml.append(weekendMarkup); xml.append("\n"); - xml.append(rentCount + "套"); + xml.append(rentCount + "濂�"); xml.append("\n\n"); } } @@ -934,7 +934,7 @@ public class FangjiaController { } /** - * 获取全国城市均价范围 + * 鑾峰彇鍏ㄥ浗鍩庡競鍧囦环鑼冨洿 * * @param citys * @return @@ -955,10 +955,10 @@ public class FangjiaController { } /** - * 获取某城市可获得区域内的二手房量、出租房量、二手房均价及涨幅等 + * 鑾峰彇鏌愬煄甯傚彲鑾峰緱鍖哄煙鍐呯殑浜屾墜鎴块噺銆佸嚭绉熸埧閲忋�佷簩鎵嬫埧鍧囦环鍙婃定骞呯瓑 * * @param region - * 区域 + * 鍖哄煙 * @return * @throws UnsupportedEncodingException */ @@ -970,7 +970,7 @@ public class FangjiaController { } } List regionStatList = this.regionStatService.findRegionStatByCity(city.getDisplay(), rs); - Map regionMap = new HashMap();// 均价map + Map regionMap = new HashMap();// 鍧囦环map for (RegionStat regSt : regionStatList) { regionMap.put(regSt.getRegion(), regSt); } @@ -987,7 +987,7 @@ public class FangjiaController { FacetQueryResult houseBoList = houseService.findFacetByQueryBean(queryBean); List facetResult = houseBoList.getFacetResults(); - Map houseMap = new HashMap();// 二手房数量map + Map houseMap = new HashMap();// 浜屾墜鎴挎暟閲弇ap if (null != facetResult && facetResult.size() > 0 && null != facetResult.get(0)) { List countList = facetResult.get(0).getValues(); if (CollectionUtils.isNotEmpty(countList)) { @@ -1004,7 +1004,7 @@ public class FangjiaController { rentQueryBean.setFacetQuery(facetQuery); FacetQueryResult rentHouseBoList = rentHouseService.findFacetByQueryBean(rentQueryBean); List rentFacetResult = rentHouseBoList.getFacetResults(); - Map rentHouseMap = new HashMap();// 租房数量map + Map rentHouseMap = new HashMap();// 绉熸埧鏁伴噺map if (null != rentFacetResult && rentFacetResult.size() > 0 && null != rentFacetResult.get(0)) { List countListRent = rentFacetResult.get(0).getValues(); if (CollectionUtils.isNotEmpty(countListRent)) { @@ -1034,18 +1034,18 @@ public class FangjiaController { avgPrice = DataUtil.formatAvgPrice(regionStat.getAvgPrice()); weekendMarkupStatus = !showAvgPrice ? 0 : regionStat.getWeekendMarkup() > 0 ? 1 : regionStat.getWeekendMarkup() == 0 ? 0 : -1; - weekendMarkup = (weekendMarkupStatus == 0 || !showAvgPrice) ? "—" : Math.abs((float) regionStat + weekendMarkup = (weekendMarkupStatus == 0 || !showAvgPrice) ? "鈥�" : Math.abs((float) regionStat .getWeekendMarkup() / 100) + "%"; } long sellCount = houseMap.get(reg.getName()) == null ? 0 : houseMap.get(reg.getName()).getCount(); long rentCount = rentHouseMap.get(reg.getName()) == null ? 0 : rentHouseMap.get(reg.getName()).getCount(); - // 是否可用 + // 鏄惁鍙敤 int active = 1; FlashMapUtil.ColorEnum color = FlashMapUtil.getColors(rs.size(), avgPrice, nr); xml.append("\n"); @@ -1066,16 +1066,16 @@ public class FangjiaController { + TemplateUtils.encodePicUrl(city.getId() + ((null != city.getIcoVersion()) ? city.getIcoVersion() : "") + "ico", "m", "city_ico")); xml.append("\n"); - String apStatus = (avgPrice == 0 || !showAvgPrice) ? "暂无均价" : avgPrice + "元/㎡"; + String apStatus = (avgPrice == 0 || !showAvgPrice) ? "鏆傛棤鍧囦环" : avgPrice + "鍏�/銕�"; xml.append(apStatus); xml.append("\n"); - xml.append(sellCount != 0 ? (sellCount + "套") : "—"); + xml.append(sellCount != 0 ? (sellCount + "濂�") : "鈥�"); xml.append("\n"); xml.append(weekendMarkupStatus); xml.append("\n"); xml.append(weekendMarkup); xml.append("\n"); - xml.append(rentCount != 0 ? (rentCount + "套") : "—"); + xml.append(rentCount != 0 ? (rentCount + "濂�") : "鈥�"); xml.append("\n\n"); } @@ -1083,10 +1083,10 @@ public class FangjiaController { } /** - * 获取当前城市 + * 鑾峰彇褰撳墠鍩庡競 * * @param request - * @return 当前城市 + * @return 褰撳墠鍩庡競 */ private ServerArea getSuggestCity(HttpServletRequest request) { String ip = AnalyticsUtil.getIpAddress(request); diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/FirstTitleController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/FirstTitleController.java index 94a04ce36..defb9b62f 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/FirstTitleController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/FirstTitleController.java @@ -28,7 +28,7 @@ public class FirstTitleController { } /** - * 贷款申请 + * 璐锋鐢宠 */ public Object registerAction(FirstTitleModel model, HttpServletRequest request) { String ip = AnalyticsUtil.getIpAddress(request); @@ -61,7 +61,7 @@ public class FirstTitleController { } /** - * 联系客服 + * 鑱旂郴瀹㈡湇 */ public Object redirectAction(final FirstTitleModel model, HttpServletRequest request) { String ip = AnalyticsUtil.getIpAddress(request); @@ -72,7 +72,7 @@ public class FirstTitleController { String useIdFinal = cookieContext.getCookieValue(request, CookieName.UID); FTCustomerRed record = new FTCustomerRed(); - record.setKind("中易安"); + record.setKind("涓槗瀹�"); record.setIp(ip); record.setRedirectUrl(model.getUrl()); record.setCity(abbreCity); diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/FjtLoginController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/FjtLoginController.java index 8579ecc46..493831fd6 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/FjtLoginController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/FjtLoginController.java @@ -22,14 +22,14 @@ public class FjtLoginController { public Object loginAction(FjtLoginModel model, HttpServletResponse response) { JSONObject ret = fjtLoginService.login(model.getUserName(), model.getPassword(), model.getAutoLogin()); if (null == ret || ret.isNullObject()) { - model.setMsg("服务器异常,请稍后登录"); + model.setMsg("鏈嶅姟鍣ㄥ紓甯革紝璇风◢鍚庣櫥褰�"); } else if (ret.getInt("code") == 0) { saveFjtCookie(ret.getInt("userId"), ret.getString("email"), ret.getString("token")); if (model.getAutoLogin() == 1) { addCookie(CoresiteCookieContext.getInstance(), response, "autoLogin", "1"); } if(ret.getInt("role") != 1){ - model.setMsg("该账号为企业账号,请在房价通中登录!"); + model.setMsg("璇ヨ处鍙蜂负浼佷笟璐﹀彿锛岃鍦ㄦ埧浠烽�氫腑鐧诲綍锛�"); }else{ model.setMsg("OK"); } @@ -72,7 +72,7 @@ public class FjtLoginController { String limitTime = cookieContext.getCookieValue(request, "limit_time"); JSONObject ret = fjtLoginService.regist(model.getUserName(), model.getPassword(), rgTimes, limitTime); if (null == ret || ret.isNullObject()) { - model.setMsg("服务器异常,请稍后注册"); + model.setMsg("鏈嶅姟鍣ㄥ紓甯革紝璇风◢鍚庢敞鍐�"); } else if (ret.getInt("code") == 0) { saveFjtCookie(ret.getInt("userId"), ret.getString("email"), ret.getString("token")); @@ -104,7 +104,7 @@ public class FjtLoginController { public Object checkEmailAction(FjtLoginModel model) { JSONObject ret = fjtLoginService.checkEmail(model.getEmail()); if (null == ret || ret.isNullObject()) { - model.setMsg("服务器异常,请稍后注册"); + model.setMsg("鏈嶅姟鍣ㄥ紓甯革紝璇风◢鍚庢敞鍐�"); } else { model.setMsg(ret.getString("message")); } diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/FlashChartController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/FlashChartController.java index 86250da9c..ddfbcf0e4 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/FlashChartController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/FlashChartController.java @@ -58,11 +58,11 @@ import com.fangjia.service.menu.MenuCategoryEnum; import com.fangjia.service.web.MenuService; /** - * 走势图 + * 璧板娍鍥� * */ public class FlashChartController { - // 区域均价Service + // 鍖哄煙鍧囦环Service private RegionStatService regionStatService; private DistrictStatService districtStatService; private ChartGenerator ofcLineGenerator; @@ -74,7 +74,7 @@ public class FlashChartController { private KnowbaseService knowbaseService; /** - * 走势图模块 + * 璧板娍鍥炬ā鍧� * * @param model * @return @@ -154,7 +154,7 @@ public class FlashChartController { } /** - * 城市二手房走势 + * 鍩庡競浜屾墜鎴胯蛋鍔� * * @param model * @return @@ -178,7 +178,7 @@ public class FlashChartController { } /** - * 小区和所在区域及所在板块的二手房走势 + * 灏忓尯鍜屾墍鍦ㄥ尯鍩熷強鎵�鍦ㄦ澘鍧楃殑浜屾墜鎴胯蛋鍔� * * @param model * @return @@ -237,13 +237,13 @@ public class FlashChartController { new DistrictKey(district.getCity(), district.getRegion(), district.getName()), DistrictKindEnum.gongyu.getValue(), new Date(), model.getWeekCount()); } - // 区域均价 + // 鍖哄煙鍧囦环 List regionStatList = null; if (model.isShowRegionTrend() && StringUtils.isNotBlank(model.getRegion())) { regionStatList = regionStatService.findRegionStat(model.getCityName(), model.getRegion(), null, new Date(), model.getWeekCount()); } - // 板块均价 + // 鏉垮潡鍧囦环 List blockStatList = null; if (model.isShowBlockTrend() && StringUtils.isNotBlank(model.getBlock())) { ServerArea areaEnum = ServerAreaData.getServerAreaByDisplay(model.getCityName()); @@ -270,14 +270,14 @@ public class FlashChartController { result = ofcLineGenerator.generat(config, districtData); } } else { - // 小区不存在返回板块均价 + // 灏忓尯涓嶅瓨鍦ㄨ繑鍥炴澘鍧楀潎浠� return regionTrendAction(model); } return result; } /** - * 区域,板块走势图 + * 鍖哄煙,鏉垮潡璧板娍鍥� * * @param model * @return @@ -293,7 +293,7 @@ public class FlashChartController { config.setHeight(height); config.setWidth(model.getWidth()); config.setXStep(OfcChartUtils.getStep(model.getWeekCount(), config.getWidth(), model.getDatePattern())); - // 区域均价 + // 鍖哄煙鍧囦环 List regionStatList = regionStatService.findRegionStat(model.getCityName(), model.getRegion(), null, new Date(), model.getWeekCount()); LineChartDataProvider regiondDataProvider = null; @@ -316,7 +316,7 @@ public class FlashChartController { } /** - * 板块走势图 + * 鏉垮潡璧板娍鍥� * * @param model * @return @@ -332,7 +332,7 @@ public class FlashChartController { config.setHeight(height); config.setWidth(model.getWidth()); config.setXStep(OfcChartUtils.getStep(model.getWeekCount(), config.getWidth(), model.getDatePattern())); - // 板块均价 + // 鏉垮潡鍧囦环 List regionStatList = regionStatService.findRegionStat(model.getCityName(), model.getRegion(), DataUtil.formatBlock(model.getBlock()), new Date(), model.getWeekCount()); LineChartDataProvider blockDataProvider = null; @@ -350,7 +350,7 @@ public class FlashChartController { } /** - * 小区信息饼图Action + * 灏忓尯淇℃伅楗煎浘Action * * @param model * @return diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/GetImageController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/GetImageController.java index a81057d65..292c724a7 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/GetImageController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/GetImageController.java @@ -13,7 +13,7 @@ public class GetImageController { public Object getWXImageAction(ImageManagerModel model) { model.setViewType("json"); - ImageManager imageManager = imageManagerService.queryByName("微信群二维码"); + ImageManager imageManager = imageManagerService.queryByName("寰俊缇や簩缁寸爜"); model.setImageManager(imageManager); return model; } diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/GjsController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/GjsController.java index 348509050..8ea56fa0b 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/GjsController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/GjsController.java @@ -82,7 +82,7 @@ public class GjsController { evaluateApplicationService.save(entity); StringBuilder sb = new StringBuilder(); - // sb.append("有房价网").append(name).append("(手机").append(mobile).append(")申请估价师服务,请您立刻回电!"); + // sb.append("鏈夋埧浠风綉").append(name).append("锛堟墜鏈�").append(mobile).append("锛夌敵璇蜂及浠峰笀鏈嶅姟锛岃鎮ㄧ珛鍒诲洖鐢碉紒"); // try { // smsService.sendForRongshidai("15026780660", sb.toString()); // } catch (SmsException e) { @@ -90,7 +90,7 @@ public class GjsController { // } sb = new StringBuilder(); - sb.append("【估价师频道】").append(name).append("(手机").append(mobile).append(")申请了:").append(master.getName()).append("的服务!"); + sb.append("銆愪及浠峰笀棰戦亾銆�").append(name).append("锛堟墜鏈�").append(mobile).append("锛夌敵璇蜂簡锛�").append(master.getName()).append("鐨勬湇鍔★紒"); try { smsService.sendForRongshidai("15026780660", sb.toString()); smsService.sendForRongshidai("13681915777", sb.toString()); diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/GoogleChartController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/GoogleChartController.java index 038a27b5d..5099ab5f7 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/GoogleChartController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/GoogleChartController.java @@ -24,7 +24,7 @@ import com.fangjia.service.district.DistrictStatService; public class GoogleChartController { /** - * 图表generator + * 鍥捐〃generator */ private ChartGenerator gicGenerator; @@ -33,7 +33,7 @@ public class GoogleChartController { private DistrictStatService districtStatService; /** - * 估价走势图 + * 浼颁环璧板娍鍥� * * @return */ diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/HelpController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/HelpController.java index b5850cb65..c84f35035 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/HelpController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/HelpController.java @@ -34,7 +34,7 @@ public class HelpController { private FeedbackService feedbackService; /** - * 友链页面的文字连接和图片连接 + * 鍙嬮摼椤甸潰鐨勬枃瀛楄繛鎺ュ拰鍥剧墖杩炴帴 * * @param model * @return @@ -102,7 +102,7 @@ public class HelpController { return; } - // 最新上线的城市 + // 鏈�鏂颁笂绾跨殑鍩庡競 List newCitys = new ArrayList(); List serverAreaList = ServerAreaData.getServerAreaList(15); List cityNames = CollectionUtils.collect(serverAreaList, new Closure() { @@ -129,10 +129,10 @@ public class HelpController { } /** - * 获取当前城市 + * 鑾峰彇褰撳墠鍩庡競 * * @param request - * @return 当前城市 + * @return 褰撳墠鍩庡競 */ private ServerArea getSuggestCity(HttpServletRequest request) { String ip = AnalyticsUtil.getIpAddress(request); diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/HouseController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/HouseController.java index 8b85e540c..76a40be6b 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/HouseController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/HouseController.java @@ -76,7 +76,7 @@ public class HouseController { private ReportHouseService reportHouseService; /** - * 房源展现 + * 鎴挎簮灞曠幇 * * @param model * @return @@ -92,10 +92,10 @@ public class HouseController { return model.notFound("/error"); } - // 房源不存在时(物理删除)重定向到列表页,如果从搜索引擎过来,带关键字,否直接重定向 + // 鎴挎簮涓嶅瓨鍦ㄦ椂(鐗╃悊鍒犻櫎)閲嶅畾鍚戝埌鍒楄〃椤碉紝濡傛灉浠庢悳绱㈠紩鎿庤繃鏉ワ紝甯﹀叧閿瓧锛屽惁鐩存帴閲嶅畾鍚� if (house == null || StringUtils.isBlank(house.getCity()) || StringUtils.isBlank(house.getMobile()) || StringUtils.isBlank(house.getName())) { - StringBuilder re_url = new StringBuilder();// 重定向的url + StringBuilder re_url = new StringBuilder();// 閲嶅畾鍚戠殑url re_url.append("/sellHouseSearch/list?notfound=1"); String keyword = model.getSearchEngineKeyword(); if (StringUtils.isNotEmpty(keyword)) { @@ -189,7 +189,7 @@ public class HouseController { model.setCpcBo(cpcBo); overdays = 21; } - // 房子的状态不为0或者发布时间超过90天(cpc21天),房源过期,页面显示类似房源链接 + // 鎴垮瓙鐨勭姸鎬佷笉涓�0鎴栬�呭彂甯冩椂闂磋秴杩�90澶�(cpc21澶�)锛屾埧婧愯繃鏈燂紝椤甸潰鏄剧ず绫讳技鎴挎簮閾炬帴 if (house.getPublishDate() != null && (0 != house.getStatus() || house.getPublishDate().before(DateUtil.getBeforeDay(new Date(), overdays)))) { model.setOverdate(house.getPublishDate().before(DateUtil.getBeforeDay(new Date(), overdays))); @@ -201,10 +201,10 @@ public class HouseController { MenuCategoryEnum.ershoufang, "totalPriceRange", house.getTotalPrice())); houseBo.setRoom(house.getRoom()); - // 房源状态不正常,或考期,重定向到列表页,带入参数和上面一致 + // 鎴挎簮鐘舵�佷笉姝e父锛屾垨鑰冩湡锛岄噸瀹氬悜鍒板垪琛ㄩ〉锛屽甫鍏ュ弬鏁板拰涓婇潰涓�鑷� if (0 != house.getStatus() || (model.isOverdate() && model.getOverDays() > overdays + 90)) { String keyword = model.getSearchEngineKeyword(); - StringBuilder re_url = new StringBuilder("/sellHouseSearch/list?");// 重定向的url + StringBuilder re_url = new StringBuilder("/sellHouseSearch/list?");// 閲嶅畾鍚戠殑url if (StringUtils.isEmpty(keyword)) { re_url.append("totalPriceRange="); re_url.append(menuService.getRange(ServerAreaData.getServerAreaByDisplay(house.getCity()), @@ -229,12 +229,12 @@ public class HouseController { // model.getId()); // model.setUserFeeling(userFeeling); - // 底部区域推荐 + // 搴曢儴鍖哄煙鎺ㄨ崘 ServerArea serverArea = FangjiaServerAreaContextHolder.getServerAreaDefault(); List autoRegionRecommends = menuService.getRegionsByCity(serverArea, MenuCategoryEnum.ershoufang); model.setAutoRegionRecommends(limit(autoRegionRecommends)); - // 底部热门推荐的其他城市 + // 搴曢儴鐑棬鎺ㄨ崘鐨勫叾浠栧煄甯� List footerCitys = new ArrayList(10); List cityNames = ServerAreaData.getServerAreaDisplayList(10); for (String name : cityNames) { @@ -246,7 +246,7 @@ public class HouseController { } /** - * 异步获取400号码 + * 寮傛鑾峰彇400鍙风爜 * * @param model * @return @@ -266,7 +266,7 @@ public class HouseController { .getDistrictName()), false); boolean needMap400 = false; - // 链家 为站外跳转 用自己的400号码 + // 閾惧 涓虹珯澶栬烦杞� 鐢ㄨ嚜宸辩殑400鍙风爜 if (StringUtils.isNotBlank(house.getMobile()) && !house.getMobile().trim().startsWith("400")) { house.setMobile(PhoneNormalizer.normalizeContactPhone(ServerAreaData.getServerAreaByDisplay(house.getCity()), false, house.getMobile())); @@ -301,32 +301,32 @@ public class HouseController { } /** - * 按时间做Seed获取的随机筛选的区域信息 + * 鎸夋椂闂村仛Seed鑾峰彇鐨勯殢鏈虹瓫閫夌殑鍖哄煙淇℃伅 * - * @param 区域菜单信息 - * @return 随机筛选的区域信息 + * @param 鍖哄煙鑿滃崟淇℃伅 + * @return 闅忔満绛涢�夌殑鍖哄煙淇℃伅 */ private List limit(List items) { - int needCount = 9;// 获取的数据个数10个 + int needCount = 9;// 鑾峰彇鐨勬暟鎹釜鏁�10涓� - int changeDay = 20;// 设置更新频率为20天 + int changeDay = 20;// 璁剧疆鏇存柊棰戠巼涓�20澶� - int currentCount = items.size();// 当前获取的Region总数 + int currentCount = items.size();// 褰撳墠鑾峰彇鐨凴egion鎬绘暟 if (currentCount <= needCount) return items; Calendar oldTime = Calendar.getInstance(); - oldTime.set(2011, 8, 1);// 初始化时间为2011年09月01日 + oldTime.set(2011, 8, 1);// 鍒濆鍖栨椂闂翠负2011骞�09鏈�01鏃� Calendar newTime = Calendar.getInstance(); - int reduceDay = SimRandom.getReduceDay(newTime, oldTime);// 获取日期与初始日期相差天数 + int reduceDay = SimRandom.getReduceDay(newTime, oldTime);// 鑾峰彇鏃ユ湡涓庡垵濮嬫棩鏈熺浉宸ぉ鏁� - int seed = (int) reduceDay / changeDay;// 计算simRandom变化频率,20表示20天更新一次 + int seed = (int) reduceDay / changeDay;// 璁$畻simRandom鍙樺寲棰戠巼,20琛ㄧず20澶╂洿鏂颁竴娆� - List simIndexs = SimRandom.getSimRandom(seed, currentCount, needCount);// 获取随机Index + List simIndexs = SimRandom.getSimRandom(seed, currentCount, needCount);// 鑾峰彇闅忔満Index List limitedRegions = new ArrayList(needCount); for (int index : simIndexs) { @@ -337,11 +337,11 @@ public class HouseController { /** *

- * 获取同小区内相似房源 + * 鑾峰彇鍚屽皬鍖哄唴鐩镐技鎴挎簮 *

* *

- * 同小区+面积范围+价格范围,显示5套房源,不足5套就用“同小区+价格范围”补上 + * 鍚屽皬鍖�+闈㈢Н鑼冨洿+浠锋牸鑼冨洿锛屾樉绀�5濂楁埧婧愶紝涓嶈冻5濂楀氨鐢ㄢ�滃悓灏忓尯+浠锋牸鑼冨洿鈥濊ˉ涓� *

* * @param model @@ -393,18 +393,18 @@ public class HouseController { } /** - * 根据关键字推荐房源 取 4 条 + * 鏍规嵁鍏抽敭瀛楁帹鑽愭埧婧� 鍙� 4 鏉� * * @param model * @return */ public Object newsSuggestHouseAction(final HouseModel model, HttpServletRequest request) { if (StringUtils.isNotBlank(model.getDistrictName()) && StringUtils.isNotBlank(model.getDiaryCity())) { - // 有小区名的看房日记 + // 鏈夊皬鍖哄悕鐨勭湅鎴挎棩璁� District d = districtService.findDistrict(new DistrictKey(model.getDiaryCity(), model.getRegion(), model .getDistrictName()), true); if (null != d) { - // 匹配不到小区时,按原流程 + // 鍖归厤涓嶅埌灏忓尯鏃讹紝鎸夊師娴佺▼ HouseQueryBean queryBean = new HouseQueryBean(); queryBean.setCity(d.getCity()); queryBean.setDistrictName(d.getName()); @@ -435,7 +435,7 @@ public class HouseController { Pager pager = new Pager(); pager.setPageSize(4); - // 站内搜推荐关键词相关全国房源 + // 绔欏唴鎼滄帹鑽愬叧閿瘝鐩稿叧鍏ㄥ浗鎴挎簮 if (StringUtils.isNotBlank(model.getRecommendCityType()) && model.getRecommendCityType().equals("ALL")) { List houseBoList = houseService.findByQueryBean(pager, queryBean); for (HouseBo houseBo : houseBoList) { @@ -447,7 +447,7 @@ public class HouseController { return model; } - // 推荐关键词当前城市相关房源 + // 鎺ㄨ崘鍏抽敭璇嶅綋鍓嶅煄甯傜浉鍏虫埧婧� ServerArea suggestCity = getSuggestCity(request); if (null != suggestCity) { model.setIpCity(suggestCity); @@ -459,7 +459,7 @@ public class HouseController { } /** - * 获取房源的推荐城市 + * 鑾峰彇鎴挎簮鐨勬帹鑽愬煄甯� * * @param request * @return @@ -469,7 +469,7 @@ public class HouseController { ServerArea suggestCity = ipAddressService.locationByIp(ip, null); if (null == suggestCity) { - // 无结果,从cookie取 + // 鏃犵粨鏋滐紝浠巆ookie鍙� CoresiteCookieContext cookieContext = CoresiteCookieContext.getInstance(); suggestCity = ServerAreaData.getServerAreaByNameOrSpellDefaultNull(cookieContext.getCookieValue(request, CookieName.COOKIE_CITY)); @@ -489,7 +489,7 @@ public class HouseController { } /** - * 小区推荐房源 取 5 条 + * 灏忓尯鎺ㄨ崘鎴挎簮 鍙� 5 鏉� * * @param model * @return @@ -521,11 +521,11 @@ public class HouseController { /** *

- * 区域相似房源 + * 鍖哄煙鐩镐技鎴挎簮 *

* *

- * 规则:同区域+面积范围+价格范围,显示5套,更多:同区域+价格范围 + * 瑙勫垯锛氬悓鍖哄煙+闈㈢Н鑼冨洿+浠锋牸鑼冨洿锛屾樉绀�5濂楋紝鏇村锛氬悓鍖哄煙+浠锋牸鑼冨洿 *

* * @return @@ -561,12 +561,12 @@ public class HouseController { /** * - * 相似房源 + * 鐩镐技鎴挎簮 * - * 规则: 同小区,面积相差15%以内,若房源不足用周边三公里以内, - * 面积价格相差15%以内的房源补上。“更多”带入区域,价格,面积参数到二手房列表页。 + * 瑙勫垯锛� 鍚屽皬鍖猴紝闈㈢Н鐩稿樊15%浠ュ唴,鑻ユ埧婧愪笉瓒崇敤鍛ㄨ竟涓夊叕閲屼互鍐咃紝 + * 闈㈢Н浠锋牸鐩稿樊15%浠ュ唴鐨勬埧婧愯ˉ涓娿�傗�滄洿澶氣�濆甫鍏ュ尯鍩燂紝浠锋牸锛岄潰绉弬鏁板埌浜屾墜鎴垮垪琛ㄩ〉銆� *

- * 估价结果页面过来的相似房源 + * 浼颁环缁撴灉椤甸潰杩囨潵鐨勭浉浼兼埧婧� * * @return * @throws Exception @@ -615,7 +615,7 @@ public class HouseController { } houseBoList = houseService.findByQueryBean(pager, queryBean); - // 下面参数为更多链接所用 + // 涓嬮潰鍙傛暟涓烘洿澶氶摼鎺ユ墍鐢� if (null != evaluation.getArea() && 0 != evaluation.getArea()) { String areaRange = ((Number) (evaluation.getArea() * 0.85)).intValue() + "_" + ((Number) (evaluation.getArea() * 1.15)).intValue(); @@ -653,7 +653,7 @@ public class HouseController { MenuCategoryEnum.ershoufang, "houseAreaRange", (int) (houseBo.getHouse().getArea() * 100) / 100)); } } - // 加入cpc + // 鍔犲叆cpc cpcService.checkCpcUserEnable(houseBoList); schoolService.signShoolHouse(houseBoList, FangjiaServerAreaContextHolder.getServerAreaDefault()); metroService.signMetroHouse(houseBoList); @@ -687,7 +687,7 @@ public class HouseController { } /** - * 去除房源中的空字符串图片链接 + * 鍘婚櫎鎴挎簮涓殑绌哄瓧绗︿覆鍥剧墖閾炬帴 * * @param bo * @return @@ -728,7 +728,7 @@ public class HouseController { /*************************************************************************** * - * 由house取得小区信息* + * 鐢県ouse鍙栧緱灏忓尯淇℃伅* * * */ private void getDistrictSituation(House house, HouseModel model) { diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/HouseReportController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/HouseReportController.java index e13147af5..50b251fd6 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/HouseReportController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/HouseReportController.java @@ -57,14 +57,14 @@ public class HouseReportController { private LoanProductTagService loanProductTagService; private FangJiaUserService fangJiaUserService; - /**买房报告-首页*/ + /**涔版埧鎶ュ憡-棣栭〉*/ public Object buyAction(HouseReportModel model){ - model.setReportTitle("买房报告"); + model.setReportTitle("涔版埧鎶ュ憡"); if(StringUtils.isNotBlank(model.getEid())){ Evaluation evaluation = evaluationService.findEvaluationById(model.getEid()); model.setEvaluation(evaluation); - List creditProductList = loanProductService.findProductByType("信用贷",LoanProductPositionEnum.BUY_REPORT.getId()); - List houseProductList = loanProductService.findProductByType("房抵贷",LoanProductPositionEnum.BUY_REPORT.getId()); + List creditProductList = loanProductService.findProductByType("淇$敤璐�",LoanProductPositionEnum.BUY_REPORT.getId()); + List houseProductList = loanProductService.findProductByType("鎴挎姷璐�",LoanProductPositionEnum.BUY_REPORT.getId()); if(creditProductList!=null && creditProductList.size()>0){ LoanProduct creditProduct = creditProductList.get(0); List tagList = new ArrayList(); @@ -108,19 +108,19 @@ public class HouseReportController { } } - /**房评卡-指数综合得分*/ + /**鎴胯瘎鍗�-鎸囨暟缁煎悎寰楀垎*/ public Object indexScoreAction(HouseReportModel model){ JsonModel ret = new JsonModel(); DistrictKey districtKey = new DistrictKey(model.getCityName(), model.getRegion(), model.getDistrictName()); District district = districtService.findDistrict(districtKey,"district"); - //房价指数 + //鎴夸环鎸囨暟 model.setPriceScore(houseReportService.getPredictIndex(districtKey)); - //潜力指数 + //娼滃姏鎸囨暟 model.setPredictScore(houseReportService.getPredictIndex(districtKey)); - //稀缺指数 + //绋�缂烘寚鏁� model.setRankScore(houseReportService.getRareIndex(districtKey)); - //消费指数 + //娑堣垂鎸囨暟 double lat = 0; double lng = 0; if(null != district.getLat2()){ @@ -130,9 +130,9 @@ public class HouseReportController { lng = district.getLng2()/10000000000d; } model.setConsumScore(houseReportService.getConsumIndex(lat, lng, model.getBaiduMapKey())); - //配套指数 + //閰嶅鎸囨暟 model.setAroundScore(houseReportService.getAroundIndex(districtKey, lat, lng, model.getBaiduMapKey())); - //楼盘指数 + //妤肩洏鎸囨暟 model.setDetailScore(houseReportService.getDetailIndex(district)); double totalScore = 0d; @@ -159,7 +159,7 @@ public class HouseReportController { return ret; } - /**加载小区经纬度*/ + /**鍔犺浇灏忓尯缁忕含搴�*/ public Object loadDistrictLocationAction(HouseReportModel model){ JsonModel ret = new JsonModel(); DistrictKey districtKey = new DistrictKey(model.getCityName(), model.getRegion(), model.getDistrictName()); @@ -188,9 +188,9 @@ public class HouseReportController { return ret; } - /**出租分析*/ + /**鍑虹鍒嗘瀽*/ public Object analysisAction(HouseReportModel model){ - model.setReportTitle("租房分析"); + model.setReportTitle("绉熸埧鍒嗘瀽"); if(StringUtils.isNotBlank(model.getEid())){ Evaluation evaluation = evaluationService.findEvaluationById(model.getEid()); model.setEvaluation(evaluation); @@ -210,7 +210,7 @@ public class HouseReportController { } /** - * 齐家装修 + * 榻愬瑁呬慨 * @param model * @param req * @return @@ -233,7 +233,7 @@ public class HouseReportController { // String url = "http://m.jia.com/new_zhuangxiu/fjApply?city_name="+model.getCityName()+"&area="+model.getArea().toString()+"&mobile=13200000011"; json = JSONObject.fromObject(request.get(url, "UTF-8")); - System.out.println("数据:"+json.toString()); + System.out.println("鏁版嵁锛�"+json.toString()); if(json.getInt("status") == 200){ Map dataMap = new HashMap(); @@ -244,61 +244,61 @@ public class HouseReportController { double v1 = 0,v2 = 0,v3 = 0,v4 = 0,v5 = 0,v6 = 0; if(jsonObj.containsKey("total_price")){ totalPrice = jsonObj.getDouble("total_price"); - dataMap.put("总计", totalPrice); + dataMap.put("鎬昏", totalPrice); } if(jsonObj.containsKey("labour_price")){ Double labourPrice = jsonObj.getDouble("labour_price"); - dataMap.put("人工费", labourPrice); + dataMap.put("浜哄伐璐�", labourPrice); } if(jsonObj.containsKey("material_price")){ Double materialPrice = jsonObj.getDouble("material_price"); - dataMap.put("材料费", materialPrice); + dataMap.put("鏉愭枡璐�", materialPrice); } if(jsonObj.containsKey("parlour_price")){ Double parlourPrice = jsonObj.getDouble("parlour_price"); - priceMap.put("客厅", parlourPrice); + priceMap.put("瀹㈠巺", parlourPrice); v1 = DataUtil.getRound(2, parlourPrice*100.0/totalPrice); - precentMap.put("客厅", v1); + precentMap.put("瀹㈠巺", v1); } if(jsonObj.containsKey("bedroom_price")){ Double bedroomPrice = jsonObj.getDouble("bedroom_price"); - priceMap.put("卧室", bedroomPrice); + priceMap.put("鍗у", bedroomPrice); v2 = DataUtil.getRound(2, bedroomPrice*100.0/totalPrice); - precentMap.put("卧室", v2); + precentMap.put("鍗у", v2); } if(jsonObj.containsKey("kitchen_price")){ Double kitchenPrice = jsonObj.getDouble("kitchen_price"); - priceMap.put("厨房", kitchenPrice); + priceMap.put("鍘ㄦ埧", kitchenPrice); v3 = DataUtil.getRound(2, kitchenPrice*100.0/totalPrice); - precentMap.put("厨房", v3); + precentMap.put("鍘ㄦ埧", v3); } if(jsonObj.containsKey("toilet_price")){ Double toiletPrice = jsonObj.getDouble("toilet_price"); - priceMap.put("卫生间", toiletPrice); + priceMap.put("鍗敓闂�", toiletPrice); v4 = DataUtil.getRound(2, toiletPrice*100.0/totalPrice); - precentMap.put("卫生间", v4); + precentMap.put("鍗敓闂�", v4); } if(jsonObj.containsKey("balcony_price")){ Double balconyPrice = jsonObj.getDouble("balcony_price"); - priceMap.put("阳台/过道", balconyPrice); + priceMap.put("闃冲彴/杩囬亾", balconyPrice); v5 = DataUtil.getRound(2, balconyPrice*100.0/totalPrice); - precentMap.put("阳台/过道", v5); + precentMap.put("闃冲彴/杩囬亾", v5); } if(jsonObj.containsKey("hydropower_price")){ Double hydropowerPrice = jsonObj.getDouble("hydropower_price"); - priceMap.put("水电", hydropowerPrice); + priceMap.put("姘寸數", hydropowerPrice); v6 = 100 - (v1+v2+v3+v4+v5); - precentMap.put("水电", DataUtil.getRound(2, v6)); + precentMap.put("姘寸數", DataUtil.getRound(2, v6)); } dataMap.put("price", priceMap); diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/IndustryController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/IndustryController.java index 71b449f6f..1938ff424 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/IndustryController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/IndustryController.java @@ -3,14 +3,14 @@ package com.fangjia.coresite.controllers; import com.fangjia.coresite.model.FangjiaModel; /** - * 行业应用介绍 + * 琛屼笟搴旂敤浠嬬粛 * @author yinjihuan * */ public class IndustryController { /** - * 银行 + * 閾惰 * @param model * @return */ @@ -19,7 +19,7 @@ public class IndustryController { } /** - * 互联网金融 + * 浜掕仈缃戦噾铻� * @param model * @return */ @@ -28,7 +28,7 @@ public class IndustryController { } /** - * 大数据行业 + * 澶ф暟鎹涓� * @param model * @return */ @@ -37,7 +37,7 @@ public class IndustryController { } /** - * 评估机构 + * 璇勪及鏈烘瀯 * @param model * @return */ @@ -46,7 +46,7 @@ public class IndustryController { } /** - * 政府部门 + * 鏀垮簻閮ㄩ棬 * @param model * @return */ @@ -55,7 +55,7 @@ public class IndustryController { } /** - * 征信机构 + * 寰佷俊鏈烘瀯 * @param model * @return */ @@ -64,7 +64,7 @@ public class IndustryController { } /** - * 行业企业 + * 琛屼笟浼佷笟 * @param model * @return */ @@ -73,7 +73,7 @@ public class IndustryController { } /** - * 咨询研究 + * 鍜ㄨ鐮旂┒ * @param model * @return */ @@ -83,7 +83,7 @@ public class IndustryController { /** - * 证券 + * 璇佸埜 * @param model * @return */ @@ -93,16 +93,16 @@ public class IndustryController { /** - * 金融消费 + * 閲戣瀺娑堣垂 */ public Object costAction(FangjiaModel model){return model;} /** - * 非银金融 + * 闈為摱閲戣瀺 */ public Object notBankAction(FangjiaModel model){return model;} /** - * 零售连锁 + * 闆跺敭杩為攣 */ public Object retailAction(FangjiaModel model){return model;} } diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/InformationController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/InformationController.java index 41a8edd12..62168f56e 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/InformationController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/InformationController.java @@ -95,7 +95,7 @@ public class InformationController { private MenuService menuService; /** - * 处理二手房分面查询 + * 澶勭悊浜屾墜鎴垮垎闈㈡煡璇� * * @param model * @param pager @@ -137,7 +137,7 @@ public class InformationController { } /** - * 识别所有的城市 + * 璇嗗埆鎵�鏈夌殑鍩庡競 * * @param fields * @return @@ -148,7 +148,7 @@ public class InformationController { } /** - * 获取Facet结果中的所有字段列表 + * 鑾峰彇Facet缁撴灉涓殑鎵�鏈夊瓧娈靛垪琛� * * @param results * @return @@ -169,7 +169,7 @@ public class InformationController { } /** - * 处理租房分面查询 + * 澶勭悊绉熸埧鍒嗛潰鏌ヨ * * @param model * @param pager @@ -211,7 +211,7 @@ public class InformationController { } /** - * 处理小区分面检索 + * 澶勭悊灏忓尯鍒嗛潰妫�绱� * * @param model * @param pager @@ -242,7 +242,7 @@ public class InformationController { for (District district : districtList) { DistrictBo districtBo = new DistrictBo(district); districtBo.setStat(statMap.get(district.getDistrictKey())); - districtBo.setCityUrl(model.getCityUrl(district.getCity()));// 设置CityURL + districtBo.setCityUrl(model.getCityUrl(district.getCity()));// 璁剧疆CityURL highlightDistrictKeyword(model, districtBo); districtBoList.add(districtBo); } @@ -257,10 +257,10 @@ public class InformationController { } /** - * 获取当前城市 + * 鑾峰彇褰撳墠鍩庡競 * * @param request - * @return 当前城市 + * @return 褰撳墠鍩庡競 */ private ServerArea getSuggestCity(HttpServletRequest request) { String ip = AnalyticsUtil.getIpAddress(request); @@ -282,7 +282,7 @@ public class InformationController { } /** - * 主体资讯列表 + * 涓讳綋璧勮鍒楄〃 * * @param model * @param pager @@ -310,7 +310,7 @@ public class InformationController { } /** - * 分面检索字段列表 + * 鍒嗛潰妫�绱㈠瓧娈靛垪琛� * * @return */ @@ -328,7 +328,7 @@ public class InformationController { model.setKeyword(keywordBaidu.getKeyName()); Pager pager = model.getPager(20, FangjiaConfig.getConfig().getSearchListMaxPageNo()); - CategoryEnum channel = knowbaseService.parseKeyWord(model.getKeyword(), false);// 默认:SEO列表不给往新盘跳转 + CategoryEnum channel = knowbaseService.parseKeyWord(model.getKeyword(), false);// 榛樿锛歋EO鍒楄〃涓嶇粰寰�鏂扮洏璺宠浆 if (CategoryEnum.sell == channel) { processSellHouseChannel(model, pager); model.setCategory(channel.name()); @@ -348,7 +348,7 @@ public class InformationController { processNewsChannel(model, pager, getFacetFields()); model.setCategory(channel.name()); } else { - // 其他频道归类到二手房 + // 鍏朵粬棰戦亾褰掔被鍒颁簩鎵嬫埧 processSellHouseChannel(model, pager); model.setCategory(CategoryEnum.sell.name()); ServerArea city = getSuggestCity(request); @@ -356,7 +356,7 @@ public class InformationController { model.setAreaGroup(group); } - // 查询相关检索词 + // 鏌ヨ鐩稿叧妫�绱㈣瘝 int offset = 0; if (null == model.getOffset()) { offset = keywordsBaiduService.getOffsetById(model.getWordId()); @@ -373,7 +373,7 @@ public class InformationController { } /** - * 进入SEO列表页面 + * 杩涘叆SEO鍒楄〃椤甸潰 * * @param model * @return @@ -381,7 +381,7 @@ public class InformationController { public Object listAction(final InformationModel model, HttpServletRequest request) { if (StringUtils.isNotBlank(model.getKeyword())) { KeywordsBaidu keywordBaidu = keywordsBaiduService.ifKeyWordVisible(model.getKeyword()); - if (null != keywordBaidu && keywordBaidu.getVisible() == 1) {// 关键词在百度关键词中存在,状态为1(不显示),跳转到404页面 + if (null != keywordBaidu && keywordBaidu.getVisible() == 1) {// 鍏抽敭璇嶅湪鐧惧害鍏抽敭璇嶄腑瀛樺湪锛岀姸鎬佷负1(涓嶆樉绀�)锛岃烦杞埌404椤甸潰 return Models.NOT_FOUNT; } } @@ -391,7 +391,7 @@ public class InformationController { return model.redirectPermanently("/"); } - CategoryEnum channel = knowbaseService.parseKeyWord(model.getKeyword(), false);// 默认:SEO列表不给往新盘跳转 + CategoryEnum channel = knowbaseService.parseKeyWord(model.getKeyword(), false);// 榛樿锛歋EO鍒楄〃涓嶇粰寰�鏂扮洏璺宠浆 if (CategoryEnum.sell == channel) { processSellHouseChannel(model, pager); model.setCategory(channel.name()); @@ -411,7 +411,7 @@ public class InformationController { processNewsChannel(model, pager, getFacetFields()); model.setCategory(channel.name()); } else { - // 其他频道归类到二手房 + // 鍏朵粬棰戦亾褰掔被鍒颁簩鎵嬫埧 processSellHouseChannel(model, pager); model.setCategory(CategoryEnum.sell.name()); ServerArea city = getSuggestCity(request); @@ -419,7 +419,7 @@ public class InformationController { model.setAreaGroup(group); } - // 查询相关检索词 + // 鏌ヨ鐩稿叧妫�绱㈣瘝 int offset = 0; if (null == model.getOffset()) { offset = keywordsBaiduService.getOffset(model.getKeyword()); @@ -434,7 +434,7 @@ public class InformationController { } private void feedFooter(InformationModel model) { - // 最新上线的城市 + // 鏈�鏂颁笂绾跨殑鍩庡競 List newCitys = new ArrayList(); List serverAreaList = ServerAreaData.getServerAreaList(15); List cityNames = org.sothis.core.util.CollectionUtils.collect(serverAreaList, new Closure() { @@ -454,7 +454,7 @@ public class InformationController { } /** - * 根据城市和类型获取面积范围MENU + * 鏍规嵁鍩庡競鍜岀被鍨嬭幏鍙栭潰绉寖鍥碝ENU * * @param city * @return @@ -464,7 +464,7 @@ public class InformationController { } /** - * 根据城市获取所有的CityURL + * 鏍规嵁鍩庡競鑾峰彇鎵�鏈夌殑CityURL * * @param citys * @param model @@ -479,7 +479,7 @@ public class InformationController { } /** - * 查询相关检索词 + * 鏌ヨ鐩稿叧妫�绱㈣瘝 * * @param keyWord * @param offset @@ -503,7 +503,7 @@ public class InformationController { } /** - * 批量获取DistrictKey + * 鎵归噺鑾峰彇DistrictKey * * @param districtList * @return @@ -517,30 +517,30 @@ public class InformationController { } /** - * SEO结果页城市、区域、板块模块 + * SEO缁撴灉椤靛煄甯傘�佸尯鍩熴�佹澘鍧楁ā鍧� * * @param model * @return */ public Object newsRegionFragmentAction(InformationModel model) { - // 先根据IP判断所在城市 + // 鍏堟牴鎹甀P鍒ゆ柇鎵�鍦ㄥ煄甯� ServerArea serverArea = getCityByIp(ActionContext.getContext().getRequest()); if (null == serverArea) { serverArea = FangjiaServerAreaContextHolder.getServerArea(); } - // 关键字为空,显示城市模块 + // 鍏抽敭瀛椾负绌猴紝鏄剧ず鍩庡競妯″潡 if (StringUtils.isBlank(model.getKeyword())) { cityFragment(model, serverArea); } else { Map keywordMap = getKeyword(model, serverArea); if (MapUtils.isEmpty(keywordMap)) { if (keywordMap == null) { - // 知识库匹配无结果,显示城市模块 + // 鐭ヨ瘑搴撳尮閰嶆棤缁撴灉锛屾樉绀哄煄甯傛ā鍧� cityFragment(model, serverArea); } } else { - // 按知识库匹配结果,显示对应模块 + // 鎸夌煡璇嗗簱鍖归厤缁撴灉锛屾樉绀哄搴旀ā鍧� regionFragment(model, keywordMap); } } @@ -548,7 +548,7 @@ public class InformationController { } /** - * SEO结果页小区模块 + * SEO缁撴灉椤靛皬鍖烘ā鍧� * * @param model * @return @@ -569,7 +569,7 @@ public class InformationController { Map konwbase = knowbaseService.parseWord(model.getKeyword()); List> districts = (null != konwbase && null != konwbase.get("district_name")) ? (List>) konwbase .get("district_name") : Collections.EMPTY_LIST; - String matchValue = null; // 匹配到的小区名 + String matchValue = null; // 鍖归厤鍒扮殑灏忓尯鍚� if (CollectionUtils.isNotEmpty(districts)) { List sameNameDistricts = new ArrayList(); for (Map districtData : districts) { @@ -603,9 +603,9 @@ public class InformationController { model.setSameNameDistricts(sameNameDistricts); } } - // 知识库知道 + // 鐭ヨ瘑搴撶煡閬� if (null != district) { - // 如果匹配的是别名,则显示 + // 濡傛灉鍖归厤鐨勬槸鍒悕锛屽垯鏄剧ず if (!StringUtils.equals(district.getName(), matchValue)) { model.setSearchAlia(matchValue); } @@ -618,7 +618,7 @@ public class InformationController { evaluation.setCity(currentCity); evaluation.setRegion(district.getRegion()); /** - * 有小区域 别墅的小区均价 则估价 继续 + * 鏈夊皬鍖哄煙 鍒鐨勫皬鍖哄潎浠� 鍒欎及浠� 缁х画 */ if (null != district && null != districtStatBo && (null != districtStatBo.getVillaDistrictStat() || null != districtStatBo.getDistrictStat())) { @@ -657,7 +657,7 @@ public class InformationController { model.setDistrictStatBo(districtStatBo); model.setPermissionEvaluation(true); } else { - // 是否有房源 + // 鏄惁鏈夋埧婧� Pager pager = new Pager(); pager.setCurrentPage(0); pager.setPageSize(1); @@ -677,7 +677,7 @@ public class InformationController { model.setDistrictExistHouse(true); List> districtRoomAvgPrice = new ArrayList>(); /** - * 有房源 显示小区房型价格 + * 鏈夋埧婧� 鏄剧ず灏忓尯鎴垮瀷浠锋牸 */ List facetResult = houseBos.getFacetResults(); List counts = Collections.emptyList(); @@ -723,7 +723,7 @@ public class InformationController { model.setDistrictRoomAvgPrice(districtRoomAvgPrice); } else { /** - * 无房源 显示区域价格 + * 鏃犳埧婧� 鏄剧ず鍖哄煙浠锋牸 */ RegionStat regionStat = regionStatService.findRegionStat(currentCity, district.getRegion()); model.setRegionStat(regionStat); @@ -755,7 +755,7 @@ public class InformationController { /************************** private Method ********************************************************/ /** - * 处理城市、区域、板块的走势、房源数 + * 澶勭悊鍩庡競銆佸尯鍩熴�佹澘鍧楃殑璧板娍銆佹埧婧愭暟 * * @param model * @param keywordMap @@ -829,11 +829,11 @@ public class InformationController { } /** - * 从关键字解析出要显示那个模块(板块>区域>小区) + * 浠庡叧閿瓧瑙f瀽鍑鸿鏄剧ず閭d釜妯″潡锛堟澘鍧�>鍖哄煙>灏忓尯锛� * * @param model * @param serverArea - * @return null:没有匹配到结果;EmptyMap:匹配到小区 + * @return null:娌℃湁鍖归厤鍒扮粨鏋滐紱EmptyMap:鍖归厤鍒板皬鍖� */ @SuppressWarnings("unchecked") private Map getKeyword(InformationModel model, ServerArea serverArea) { @@ -843,13 +843,13 @@ public class InformationController { Map ret = new HashMap(); - // 匹配出小区名,不处理,有独立模块 + // 鍖归厤鍑哄皬鍖哄悕锛屼笉澶勭悊锛屾湁鐙珛妯″潡 Map konwbase = knowbaseService.parseKeyword(model.getKeyword()); if (konwbase.containsKey("district_name")) { return Collections.emptyMap(); } - // 匹配出板块,用匹配出板块的城市 + // 鍖归厤鍑烘澘鍧楋紝鐢ㄥ尮閰嶅嚭鏉垮潡鐨勫煄甯� if (konwbase.containsKey("block")) { Map blockMap = (Map) konwbase.get("block"); Map extraData = (Map) blockMap.get("extra_data"); @@ -860,7 +860,7 @@ public class InformationController { return ret; } - // 匹配出区域,优先用城市相同的区域,否则取第一个 + // 鍖归厤鍑哄尯鍩燂紝浼樺厛鐢ㄥ煄甯傜浉鍚岀殑鍖哄煙锛屽惁鍒欏彇绗竴涓� if (konwbase.containsKey("region")) { List> list = (List>) konwbase.get("region"); if (CollectionUtils.isNotEmpty(list)) { @@ -887,7 +887,7 @@ public class InformationController { } } - // 匹配出城市,用匹配出的城市 + // 鍖归厤鍑哄煄甯傦紝鐢ㄥ尮閰嶅嚭鐨勫煄甯� if (konwbase.containsKey("city")) { Map cityMap = (Map) konwbase.get("city"); ret.put("city", (String) cityMap.get("value")); @@ -900,7 +900,7 @@ public class InformationController { } /** - * 显示城市模块 + * 鏄剧ず鍩庡競妯″潡 * * @param model * @param serverArea @@ -931,7 +931,7 @@ public class InformationController { } /** - * 根据IP得到城市 + * 鏍规嵁IP寰楀埌鍩庡競 * * @throws Exception */ @@ -986,7 +986,7 @@ public class InformationController { } /** - * 取得 去除html "\n", "\r", "\t", " " 字符的文本 字符串 + * 鍙栧緱 鍘婚櫎html "\n", "\r", "\t", " " 瀛楃鐨勬枃鏈� 瀛楃涓� * * @param string * @return diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/InputErrorController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/InputErrorController.java index 45ec1bbf5..9879bfd74 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/InputErrorController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/InputErrorController.java @@ -15,7 +15,7 @@ import com.fangjia.service.cnAnalyzer.KeywordEnum; import com.fangjia.service.cnAnalyzer.Token; /** - * 小区名纠错 + * 灏忓尯鍚嶇籂閿� * * @author dxy * diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/LoanBurialPointController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/LoanBurialPointController.java index e9621c5a4..f9966332d 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/LoanBurialPointController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/LoanBurialPointController.java @@ -21,8 +21,8 @@ import com.fangjia.dal.mongo.fangjia.model.LoanBurialPoint; import com.fangjia.service.fangjia.LoanBurialPointService; /** - * 新版房价网广点通快速贷款-埋点需求 - * 规则:触发输入框或者点击按钮,每日做一次数量统计 + * 鏂扮増鎴夸环缃戝箍鐐归�氬揩閫熻捶娆�-鍩嬬偣闇�姹� + * 瑙勫垯锛氳Е鍙戣緭鍏ユ鎴栬�呯偣鍑绘寜閽紝姣忔棩鍋氫竴娆℃暟閲忕粺璁� * @author JENIS * */ @@ -32,54 +32,54 @@ public class LoanBurialPointController { private LoanBurialPointService loanBurialPointService; /** - * 埋点保存 + * 鍩嬬偣淇濆瓨 * * @param model * @param req * @return */ public Object saveLoanBurialPointAction(LoanBurialPointModel model, HttpServletRequest req) { - LOG.info("saveLoanBurialPointAction 参数LoanBurialPointModel 为" + JsonUtils.toJson(model)); + LOG.info("saveLoanBurialPointAction 鍙傛暟LoanBurialPointModel 涓�" + JsonUtils.toJson(model)); JsonModel jsonModel = new JsonModel(); Map result = new HashMap(); try{ if(model == null){ result.put("status", false); - result.put("message", "参数‘Model’为空!"); + result.put("message", "鍙傛暟鈥楳odel鈥欎负绌猴紒"); jsonModel.setJsonModel(result); return jsonModel; } if(StringUtils.isEmpty(model.getLoanType())){ result.put("status", false); - result.put("message", "参数‘贷款类型’为空!"); + result.put("message", "鍙傛暟鈥樿捶娆剧被鍨嬧�欎负绌猴紒"); jsonModel.setJsonModel(result); return jsonModel; } if(StringUtils.isEmpty(model.getLeadsSource())){ result.put("status", false); - result.put("message", "参数‘渠道名称’为空!"); + result.put("message", "鍙傛暟鈥樻笭閬撳悕绉扳�欎负绌猴紒"); jsonModel.setJsonModel(result); return jsonModel; } if(StringUtils.isEmpty(model.getSource())){ result.put("status", false); - result.put("message", "参数‘贷款页面来源’为空!"); + result.put("message", "鍙傛暟鈥樿捶娆鹃〉闈㈡潵婧愨�欎负绌猴紒"); jsonModel.setJsonModel(result); return jsonModel; } if(StringUtils.isEmpty(model.getBurialPointType())){ result.put("status", false); - result.put("message", "参数‘埋点源类型’为空!"); + result.put("message", "鍙傛暟鈥樺煁鐐规簮绫诲瀷鈥欎负绌猴紒"); jsonModel.setJsonModel(result); return jsonModel; } if(LoanBurialPointEnum.getByBurialPointType(model.getBurialPointType()) == null){ result.put("status", false); - result.put("message", "参数‘埋点源类型’不正确!"); + result.put("message", "鍙傛暟鈥樺煁鐐规簮绫诲瀷鈥欎笉姝g‘锛�"); jsonModel.setJsonModel(result); return jsonModel; } - //构造QueryParam + //鏋勯�燪ueryParam List params = new ArrayList(); params.add(new QueryParam("burialPointType", model.getBurialPointType())); params.add(new QueryParam("intraday", Integer.parseInt(DateUtil.formatToTightYYYYMMDD(new Date())))); @@ -87,10 +87,10 @@ public class LoanBurialPointController { params.add(new QueryParam("leadsSource", model.getLeadsSource())); params.add(new QueryParam("source", model.getSource())); LoanBurialPoint loanBurialPoint = loanBurialPointService.findByParams(params); - //获取埋点枚举对象 + //鑾峰彇鍩嬬偣鏋氫妇瀵硅薄 LoanBurialPointEnum em = LoanBurialPointEnum.getByBurialPointType(model.getBurialPointType()); if(loanBurialPoint == null){ - //新增数据 + //鏂板鏁版嵁 loanBurialPoint = new LoanBurialPoint(); loanBurialPoint.setIntraday(Integer.parseInt(DateUtil.formatToTightYYYYMMDD(new Date()))); loanBurialPoint.setTimes(1); @@ -105,17 +105,17 @@ public class LoanBurialPointController { loanBurialPoint.setModifyDate(new Date()); loanBurialPointService.save(loanBurialPoint); }else{ - //修改当天统计次数 + //淇敼褰撳ぉ缁熻娆℃暟 loanBurialPoint.setTimes(loanBurialPoint.getTimes()+1); loanBurialPoint.setModifyDate(new Date()); loanBurialPointService.update(loanBurialPoint); } result.put("status", true); - result.put("message", "埋点保存成功!"); + result.put("message", "鍩嬬偣淇濆瓨鎴愬姛锛�"); }catch (Exception e) { - LOG.error("saveLoanBurialPointAction 发生异常, 异常信息为: " + e); + LOG.error("saveLoanBurialPointAction 鍙戠敓寮傚父, 寮傚父淇℃伅涓�: " + e); result.put("status", false); - result.put("message", "服务异常, 请稍后再试!"); + result.put("message", "鏈嶅姟寮傚父, 璇风◢鍚庡啀璇曪紒"); } jsonModel.setJsonModel(result); return jsonModel; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/LoanLeadsController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/LoanLeadsController.java index 4cc1b6daf..b5b79f4dc 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/LoanLeadsController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/LoanLeadsController.java @@ -63,7 +63,7 @@ import com.fangjia.service.pds.PdsApiProxyService.Method; import com.fangjia.service.util.PdsConstants; /** - * 贷款线索控制器 + * 璐锋绾跨储鎺у埗鍣� * @author yinjihuan * */ @@ -115,54 +115,54 @@ public class LoanLeadsController { } /** - * 房金所开通的城市 + * 鎴块噾鎵�寮�閫氱殑鍩庡競 */ private Set FJSSet = new HashSet(){{ - add("北京"); - add("广州"); - add("深圳"); - add("郑州"); - add("杭州"); + add("鍖椾含"); + add("骞垮窞"); + add("娣卞湷"); + add("閮戝窞"); + add("鏉窞"); }}; /** - * 房互网、房金所开通的城市 + * 鎴夸簰缃戙�佹埧閲戞墍寮�閫氱殑鍩庡競 */ private Set CommonSet = new HashSet(){{ - add("北京"); - add("广州"); - add("深圳"); + add("鍖椾含"); + add("骞垮窞"); + add("娣卞湷"); }}; /** - * 房互网开通的城市 + * 鎴夸簰缃戝紑閫氱殑鍩庡競 */ private Set FHWSet = new HashSet(){{ - add("北京"); - add("广州"); - add("深圳"); - add("天津"); - add("南京"); - add("成都"); - add("武汉"); - add("苏州"); - add("东莞"); - add("廊坊"); - add("珠海"); - add("南通"); - add("无锡"); - add("中山"); - add("惠州"); - add("泉州"); - add("扬州"); - add("燕郊"); - add("宜昌"); - add("承德"); - add("绵阳"); + add("鍖椾含"); + add("骞垮窞"); + add("娣卞湷"); + add("澶╂触"); + add("鍗椾含"); + add("鎴愰兘"); + add("姝︽眽"); + add("鑻忓窞"); + add("涓滆帪"); + add("寤婂潑"); + add("鐝犳捣"); + add("鍗楅��"); + add("鏃犻敗"); + add("涓北"); + add("鎯犲窞"); + add("娉夊窞"); + add("鎵窞"); + add("鐕曢儕"); + add("瀹滄槍"); + add("鎵垮痉"); + add("缁甸槼"); }}; /** - * 添加贷款线索 + * 娣诲姞璐锋绾跨储 * @return */ public Object addLeadsAction(LoanLeadsModel model, HttpServletRequest req) { @@ -183,11 +183,11 @@ public class LoanLeadsController { result.setMsg(Message.PARAM_NOT_NULL); return result; } - // 自动化测试使用,只允许公司内部的IP才可以 + // 鑷姩鍖栨祴璇曚娇鐢紝鍙厑璁稿叕鍙稿唴閮ㄧ殑IP鎵嶅彲浠� String ip = AnalyticsUtil.getIpAddress(req); if (("8888".equals(model.getSmsCode()) && "116.247.70.58".equals(ip)) || ("8888".equals(model.getSmsCode()) && ip.startsWith("192.168"))) { - LOGGER.info("自动化测试,不做验证码认证:"+ip); + LOGGER.info("鑷姩鍖栨祴璇曪紝涓嶅仛楠岃瘉鐮佽璇�:"+ip); } else { String smsCacheCode = getCacheCode(model.getMobile(), Message.SMS_CODE_TYPE_REG); if (smsCacheCode == null) { @@ -221,7 +221,7 @@ public class LoanLeadsController { leads.setLoanUserName(model.getLoanName()); leads.setSex(model.getSex()); leads.setSource(model.getSource()); - // 网站来源 + // 缃戠珯鏉ユ簮 String source = COOKIE_CONTEXT.getCookieValue(req, CookieName.SITE_SOURCE); String channelType = SourceUtils.getSampleBaiduSiteType(source); leads.setClueSource(source); @@ -230,37 +230,37 @@ public class LoanLeadsController { if (serverArea != null) { leads.setProvince(serverArea.getProvince()); } - //发送邮件 + //鍙戦�侀偖浠� String loanName = ""; if(StringUtils.isBlank(model.getLoanProductId())){ loanName = model.getLoanType(); leads.setLoanType(loanName); leads.setLoanProductName(loanName); - //评估结果页和我要贷款页逻辑处理 - /*if("评估结果页".equals(model.getSource()) && "无抵押".equals(model.getLoanType())){ - leads.setEnterpriseRemark("线索已给泰隆银行"); + //璇勪及缁撴灉椤靛拰鎴戣璐锋椤甸�昏緫澶勭悊 + /*if("璇勪及缁撴灉椤�".equals(model.getSource()) && "鏃犳姷鎶�".equals(model.getLoanType())){ + leads.setEnterpriseRemark("绾跨储宸茬粰娉伴殕閾惰"); } - if(("评估结果页".equals(model.getSource()) && !"无抵押".equals(model.getLoanType())) || - ("贷款着陆页".equals(model.getSource()) && "房抵贷".equals(model.getLoanType()))){ + if(("璇勪及缁撴灉椤�".equals(model.getSource()) && !"鏃犳姷鎶�".equals(model.getLoanType())) || + ("璐锋鐫�闄嗛〉".equals(model.getSource()) && "鎴挎姷璐�".equals(model.getLoanType()))){ if(CommonSet.contains(model.getDisCity())){ boolean fjsFlag = postFJSParam(model); boolean fhwFlag = postFHWParam(model); if(fjsFlag && !fhwFlag){ - leads.setEnterpriseRemark("线索已给房金所"); + leads.setEnterpriseRemark("绾跨储宸茬粰鎴块噾鎵�"); } if(!fjsFlag && fhwFlag){ - leads.setEnterpriseRemark("线索已给房互网"); + leads.setEnterpriseRemark("绾跨储宸茬粰鎴夸簰缃�"); } if(fjsFlag && fhwFlag){ - leads.setEnterpriseRemark("线索已给房互网和房金所"); + leads.setEnterpriseRemark("绾跨储宸茬粰鎴夸簰缃戝拰鎴块噾鎵�"); } }else if(FHWSet.contains(model.getDisCity())){ if(postFHWParam(model)){ - leads.setEnterpriseRemark("线索已给房互网"); + leads.setEnterpriseRemark("绾跨储宸茬粰鎴夸簰缃�"); } }else if(FJSSet.contains(model.getDisCity())){ if(postFJSParam(model)){ - leads.setEnterpriseRemark("线索已给房金所"); + leads.setEnterpriseRemark("绾跨储宸茬粰鎴块噾鎵�"); } } }*/ @@ -270,33 +270,33 @@ public class LoanLeadsController { leads.setLoanProductName(product.getName()); leads.setLoanProductId(product.getId()); loanName = product.getName(); - /*if("房抵贷".equals(product.getType())){ + /*if("鎴挎姷璐�".equals(product.getType())){ if(CommonSet.contains(model.getDisCity())){ boolean fjsFlag = postFJSParam(model); boolean fhwFlag = postFHWParam(model); if(fjsFlag && !fhwFlag){ - leads.setEnterpriseRemark("线索已给房金所"); + leads.setEnterpriseRemark("绾跨储宸茬粰鎴块噾鎵�"); } if(!fjsFlag && fhwFlag){ - leads.setEnterpriseRemark("线索已给房互网"); + leads.setEnterpriseRemark("绾跨储宸茬粰鎴夸簰缃�"); } if(fjsFlag && fhwFlag){ - leads.setEnterpriseRemark("线索已给房互网和房金所"); + leads.setEnterpriseRemark("绾跨储宸茬粰鎴夸簰缃戝拰鎴块噾鎵�"); } }else if(FHWSet.contains(model.getDisCity())){ if(postFHWParam(model)){ - leads.setEnterpriseRemark("线索已给房互网"); + leads.setEnterpriseRemark("绾跨储宸茬粰鎴夸簰缃�"); } }else if(FJSSet.contains(model.getDisCity())){ if(postFJSParam(model)){ - leads.setEnterpriseRemark("线索已给房金所"); + leads.setEnterpriseRemark("绾跨储宸茬粰鎴块噾鎵�"); } } }*/ - //添加调用次数 + //娣诲姞璋冪敤娆℃暟 int count = 0; - if(product.getClickCount() == 0){ //第一次处理的时候 + if(product.getClickCount() == 0){ //绗竴娆″鐞嗙殑鏃跺�� count = loanLeadsService.countByParam("loanProductId", model.getLoanProductId(), null, null, 0, null); }else{ count = product.getClickCount()+1; @@ -315,15 +315,15 @@ public class LoanLeadsController { //sendEmail("jiangxiaochun@fangjia.com", model, loanName,smsContent); //sendEmail("yanshenbing@fangjia.com", model, loanName,smsContent); //sendEmail("wanglei379@fangjia.com", model, loanName,smsContent); - if(StringUtils.isNotBlank(model.getDisCity()) && model.getDisCity().equals("上海")){ + if(StringUtils.isNotBlank(model.getDisCity()) && model.getDisCity().equals("涓婃捣")){ sendEmail("yaojingmeng@fangjia.com", model, loanName,smsContent); sendEmail("zhaolingzhi@fangjia.com", model, loanName,smsContent); } - //发送钉钉消息 + //鍙戦�侀拤閽夋秷鎭� JSONObject jsonBody = getDingDingContent(loanName, model.getLoanName(), smsContent); - if(StringUtils.isNotBlank(model.getDisCity()) && model.getDisCity().equals("上海")){ + if(StringUtils.isNotBlank(model.getDisCity()) && model.getDisCity().equals("涓婃捣")){ pdsApiProxyService.invoke(PdsConstants.DINGDING_URL_LOANAPPLY, jsonBody, null, "UTF-8", false); } @@ -339,7 +339,7 @@ public class LoanLeadsController { public String getEmailContent(String loanName, String sex, String mobile, String city, String address, String districtName, Double loanAmount, Long totalPrice, Double area, Integer avgPrice, String loanType){ String smsContent = ""; if(StringUtils.isNotBlank(loanName) || StringUtils.isNotBlank(sex)){ - smsContent += "客户名:"; + smsContent += "瀹㈡埛鍚�:"; if(StringUtils.isNotBlank(loanName)){ smsContent += loanName; } @@ -349,31 +349,31 @@ public class LoanLeadsController { smsContent += "
"; } if(StringUtils.isNotBlank(mobile)){ - smsContent += "手机号:" +mobile+"
省份:" + ProvinceData.getProvince(city) - +"
城市:" + city; + smsContent += "鎵嬫満鍙�:" +mobile+"
鐪佷唤:" + ProvinceData.getProvince(city) + +"
鍩庡競:" + city; } if(StringUtils.isNotBlank(address)){ - smsContent += "
地址:" + address; + smsContent += "
鍦板潃:" + address; } if(StringUtils.isNotBlank(districtName)){ - smsContent += "
小区名:" + districtName; + smsContent += "
灏忓尯鍚�:" + districtName; } if(loanAmount!=null && loanAmount>0){ - smsContent += "
贷款金额:" + loanAmount*10000; + smsContent += "
璐锋閲戦:" + loanAmount*10000; } if(totalPrice!=null && totalPrice>0){ - smsContent += "
评估总价:" + totalPrice; + smsContent += "
璇勪及鎬讳环:" + totalPrice; } if(area!=null && area>0){ - smsContent += "
面积:" + area; + smsContent += "
闈㈢Н:" + area; } if(avgPrice!=null && avgPrice>0){ - smsContent += "
评估单价:" + avgPrice; + smsContent += "
璇勪及鍗曚环:" + avgPrice; } SimpleDateFormat sf = new SimpleDateFormat("yyyy/MM/dd HH:mm"); - smsContent += "
申请日期:" + sf.format(new Date()); + smsContent += "
鐢宠鏃ユ湡:" + sf.format(new Date()); if(StringUtils.isNotBlank(loanType)){ - smsContent += "
贷款类型:"+loanType; + smsContent += "
璐锋绫诲瀷:"+loanType; } return smsContent; } @@ -383,9 +383,9 @@ public class LoanLeadsController { jsonBody.put("msgtype", "markdown"); JSONObject markdown = new JSONObject(); if(StringUtils.isBlank(loanName)){ - markdown.put("title", name+"客户申请了贷款"); + markdown.put("title", name+"瀹㈡埛鐢宠浜嗚捶娆�"); }else{ - markdown.put("title", name+"客户申请了"+loanName+"类型的贷款"); + markdown.put("title", name+"瀹㈡埛鐢宠浜�"+loanName+"绫诲瀷鐨勮捶娆�"); } markdown.put("text", smsContent); jsonBody.put("markdown", markdown); @@ -393,7 +393,7 @@ public class LoanLeadsController { } /** - * 快捷添加贷款线索 + * 蹇嵎娣诲姞璐锋绾跨储 * @return */ public Object addFastLeadsAction(LoanLeadsModel model, HttpServletRequest req) { @@ -422,7 +422,7 @@ public class LoanLeadsController { String smsContent = getEmailContent(model.getLoanName(),model.getSex(),model.getMobile(),model.getDisCity(), model.getAddress(), model.getName(),model.getAmount(),model.getTotalPrice(),model.getArea(),model.getAvgPrice(),model.getLoanType()); JSONObject jsonBody = getDingDingContent(model.getLoanType(), model.getLoanName(), smsContent); - if(StringUtils.isNotBlank(model.getDisCity()) && model.getDisCity().equals("上海")){ + if(StringUtils.isNotBlank(model.getDisCity()) && model.getDisCity().equals("涓婃捣")){ sendEmail("yaojingmeng@fangjia.com", model, model.getLoanName(),smsContent); sendEmail("zhaolingzhi@fangjia.com", model, model.getLoanName(),smsContent); sendEmail("gaojuan@fangjia.com", model, model.getLoanName(),smsContent); @@ -436,7 +436,7 @@ public class LoanLeadsController { } /** - * 房互网添加贷款线索 + * 鎴夸簰缃戞坊鍔犺捶娆剧嚎绱� * @return */ public Object addFHWLeadsAction(LoanLeadsModel model, HttpServletRequest req) { @@ -464,7 +464,7 @@ public class LoanLeadsController { leads.setSex(""); leads.setSource(model.getSource()); - // 网站来源 + // 缃戠珯鏉ユ簮 String source = COOKIE_CONTEXT.getCookieValue(req, CookieName.SITE_SOURCE); String channelType = SourceUtils.getSampleBaiduSiteType(source); leads.setClueSource(source); @@ -473,15 +473,15 @@ public class LoanLeadsController { if (serverArea != null) { leads.setProvince(serverArea.getProvince()); } - if("无抵押".equals(model.getLoanType()) && ("评估结果页".equals(model.getSource()))){ + if("鏃犳姷鎶�".equals(model.getLoanType()) && ("璇勪及缁撴灉椤�".equals(model.getSource()))){ leads.setLoanType(model.getLoanType()); leads.setLoanProductName(model.getLoanType()); - //leads.setEnterpriseRemark("线索已给泰隆银行"); + //leads.setEnterpriseRemark("绾跨储宸茬粰娉伴殕閾惰"); }else{ LoanProduct product = loanProductService.findById(model.getLoanProductId()); - //添加调用次数 + //娣诲姞璋冪敤娆℃暟 int count = 0; - if(product.getClickCount() == 0){ //第一次处理的时候 + if(product.getClickCount() == 0){ //绗竴娆″鐞嗙殑鏃跺�� count = loanLeadsService.countByParam("loanProductId", model.getLoanProductId(), null, null, 0, null); }else{ count = product.getClickCount()+1; @@ -502,7 +502,7 @@ public class LoanLeadsController { } /** - * 推送房金所数据 + * 鎺ㄩ�佹埧閲戞墍鏁版嵁 * @param model * @return */ @@ -517,10 +517,10 @@ public class LoanLeadsController { params.put("address", model.getAddress()); params.put("loan_amount", String.valueOf(model.getAmount()*10000)); if(StringUtils.isBlank(model.getLoanName())){ - //截取当前时间戳的后六位 + //鎴彇褰撳墠鏃堕棿鎴崇殑鍚庡叚浣� String timeStr = String.valueOf(new Date().getTime()); timeStr = timeStr.substring(timeStr.length()-7, timeStr.length()-1); - params.put("uname", "客户"+timeStr); + params.put("uname", "瀹㈡埛"+timeStr); }else{ params.put("uname", model.getLoanName()); } @@ -540,7 +540,7 @@ public class LoanLeadsController { } /** - * 推送房互网数据 + * 鎺ㄩ�佹埧浜掔綉鏁版嵁 * @param model * @return */ @@ -602,7 +602,7 @@ public class LoanLeadsController { private String getSign(Map params) { Map sortMap = new TreeMap(); sortMap.putAll(params); - // 以k1=v1&k2=v2...方式拼接参数 + // 浠1=v1&k2=v2...鏂瑰紡鎷兼帴鍙傛暟 StringBuilder builder = new StringBuilder(); for (Map.Entry s : sortMap.entrySet()) { String k = s.getKey(); @@ -619,11 +619,11 @@ public class LoanLeadsController { return builder.toString(); } /** - * 评估结果页房屋网url处理 + * 璇勪及缁撴灉椤垫埧灞嬬綉url澶勭悊 * @param req */ private String dealProduct(LoanLeadsModel model, HttpServletRequest req){ - //新增一次估价次数(用户已登录) + //鏂板涓�娆′及浠锋鏁�(鐢ㄦ埛宸茬櫥褰�) FangJiaUser user = getLoginUser(req); CoresiteCookieContext context = CoresiteCookieContext.getInstance(); String userId = context.getCookieValue(req, CookieName.UID); @@ -644,9 +644,9 @@ public class LoanLeadsController { } private String wrapUrlParames(LoanLeadsModel model,String userId,String uName,String mobile){ - //&address=房产地址&name=小区名称&hosueNum=楼栋&floor=楼层&area=面积&totalPrice=房产总格&uname=用户姓名&uid=用户ID&mobile=手机号码& - //&channel=fangjiawang&sign=加密串 - //加密 + //&address=鎴夸骇鍦板潃&name=灏忓尯鍚嶇О&hosueNum=妤兼爧&floor=妤煎眰&area=闈㈢Н&totalPrice=鎴夸骇鎬绘牸&uname=鐢ㄦ埛濮撳悕&uid=鐢ㄦ埛ID&mobile=鎵嬫満鍙风爜& + //&channel=fangjiawang&sign=鍔犲瘑涓� + //鍔犲瘑 String key = md5("fangjiawang"); Map params = new LinkedHashMap(); params.put("mobile", mobile); @@ -695,10 +695,10 @@ public class LoanLeadsController { public void sendEmail(String eamilAddress,LoanLeadsModel model, String loanName, String smsContent){ try { - // 发邮件给用户 + // 鍙戦偖浠剁粰鐢ㄦ埛 Mail mail = new Mail(); mail.setReceiver(new MailUser(eamilAddress)); - String subject = model.getMobile()+"客户申请了"+loanName+"类型的贷款"; + String subject = model.getMobile()+"瀹㈡埛鐢宠浜�"+loanName+"绫诲瀷鐨勮捶娆�"; mail.setSubject(subject); StringBuffer emailMsg = new StringBuffer(); @@ -708,19 +708,19 @@ public class LoanLeadsController { mail.setAttachment(false); emailService.sendHtmlMailWithFile(mail); } catch (Exception e) { - // ret.setMsg("发送失败,请稍后重试"); + // ret.setMsg("鍙戦�佸け璐ワ紝璇风◢鍚庨噸璇�"); //System.out.println(e); - LOGGER.info("发送失败,请稍后重试"); + LOGGER.info("鍙戦�佸け璐ワ紝璇风◢鍚庨噸璇�"); } - LOGGER.info("发送成功"); - // ret.setMsg("申请成功,请等待客服处理"); + LOGGER.info("鍙戦�佹垚鍔�"); + // ret.setMsg("鐢宠鎴愬姛锛岃绛夊緟瀹㈡湇澶勭悊"); } /** - * 获取缓存的验证码 + * 鑾峰彇缂撳瓨鐨勯獙璇佺爜 * @author yinjihuan - * @param mobile 手机 - * @param type 类型 + * @param mobile 鎵嬫満 + * @param type 绫诲瀷 * @return */ private String getCacheCode(String mobile, String type) { @@ -729,7 +729,7 @@ public class LoanLeadsController { } /** - * 添加成功页面 + * 娣诲姞鎴愬姛椤甸潰 * @param model * @return */ diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/LoginController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/LoginController.java index 4257d3f6b..eb870e3ad 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/LoginController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/LoginController.java @@ -33,9 +33,9 @@ public class LoginController { public Object indexAction(LoginModel model) { String loginUserName = model.getLoginUserName(); if (StringUtils.isBlank(loginUserName)) { - // 未登录 + // 鏈櫥褰� if (StringUtils.isBlank(model.getToken())) { - // 未授权 + // 鏈巿鏉� model.setViewType("redirect"); model.setViewParam("location", model.getCityUrl()); return model; @@ -81,7 +81,7 @@ public class LoginController { String api_key = fangjiaConfig.getDengluApiKey(); try { Denglu denglu = new Denglu(app_id, api_key, null, null); - JSONObject jsonObj = denglu.getUserInfoByToken(token); // 调用获取用户信息接口 + JSONObject jsonObj = denglu.getUserInfoByToken(token); // 璋冪敤鑾峰彇鐢ㄦ埛淇℃伅鎺ュ彛 User dbUser = userService.getDBUserByMediaUserId(jsonObj.getInt("mediaUserID"), jsonObj.getString("screenName"), DengluMediaEnum.getMediaNameByMediaId(jsonObj.getInt("mediaID"))); if (null == dbUser) { diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/LogoutController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/LogoutController.java index b36d46ddd..0835f2e97 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/LogoutController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/LogoutController.java @@ -12,7 +12,7 @@ import com.fangjia.service.common.CookieName; public class LogoutController { /** - * 登出 + * 鐧诲嚭 */ public Object indexAction(LoginModel model) { removeLoginCookie(); diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/MallController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/MallController.java index ad4c66c55..ee2a2fb97 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/MallController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/MallController.java @@ -13,7 +13,7 @@ public class MallController { private MallService mallService; /** - * 新盘列表商城推广 + * 鏂扮洏鍒楄〃鍟嗗煄鎺ㄥ箍 * * @param model * @return @@ -36,7 +36,7 @@ public class MallController { } /** - * 二手房、租房、小区、新房列表置顶推广 + * 浜屾墜鎴裤�佺鎴裤�佸皬鍖恒�佹柊鎴垮垪琛ㄧ疆椤舵帹骞� * * @param model * @return @@ -53,7 +53,7 @@ public class MallController { } /** - * 小区、新房列表页菜单下方推广 + * 灏忓尯銆佹柊鎴垮垪琛ㄩ〉鑿滃崟涓嬫柟鎺ㄥ箍 * * @param model * @return @@ -64,7 +64,7 @@ public class MallController { } /** - * 新盘详情页右侧推广 + * 鏂扮洏璇︽儏椤靛彸渚ф帹骞� * * @param model * @return diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/MapController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/MapController.java index 1c1a8453c..d1a56ad5e 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/MapController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/MapController.java @@ -97,7 +97,7 @@ import com.fangjia.service.util.PhoneNormalizer; import com.fangjia.service.web.MenuService; import com.fangjia.core.util.DateUtil; /** - * 地图找房 + * 鍦板浘鎵炬埧 * * */ @@ -123,7 +123,7 @@ public class MapController { /** - * 地图找房 + * 鍦板浘鎵炬埧 * * @param model * @return @@ -135,7 +135,7 @@ public class MapController { model.setLat(new Double(serverAreaEnum.getLat() * 10000000000L).longValue()); model.setLng(new Double(serverAreaEnum.getLng() * 10000000000L).longValue()); - // 底部热门推荐的其他城市 + // 搴曢儴鐑棬鎺ㄨ崘鐨勫叾浠栧煄甯� List footerCitys = new ArrayList(10); List cityNames = ServerAreaData.getServerAreaDisplayList(10); for (String name : cityNames) { @@ -279,7 +279,7 @@ public class MapController { /*** * - * 取得地图中心点位置和新的缩放级别 + * 鍙栧緱鍦板浘涓績鐐逛綅缃拰鏂扮殑缂╂斁绾у埆 * * **/ public Object getMapCenterAction(MapModel model) { @@ -348,7 +348,7 @@ public class MapController { } /** - * 地图找房 + * 鍦板浘鎵炬埧 * * @param model * @return @@ -425,7 +425,7 @@ public class MapController { } /** - * 显示范围内地铁站信息 + * 鏄剧ず鑼冨洿鍐呭湴閾佺珯淇℃伅 * * **/ public Object getMetroInfoAction(MapModel model) { @@ -437,7 +437,7 @@ public class MapController { } /** - * hash参数转换为页面显示值 + * hash鍙傛暟杞崲涓洪〉闈㈡樉绀哄�� * * **/ public Object paramsToDisplayAction(MapModel model) { @@ -457,7 +457,7 @@ public class MapController { model.setTotalPriceRange(priceItem.getCaption()); } } else { - model.setTotalPriceRange(model.getCategory().equals("zufang") ? "租 金" : "总 价"); + model.setTotalPriceRange(model.getCategory().equals("zufang") ? "绉� 閲�" : "鎬� 浠�"); } } if (StringUtils.isNotBlank(model.getHouseAreaRange())) { @@ -466,7 +466,7 @@ public class MapController { model.setHouseAreaRange(areaItem.getCaption()); } } else { - model.setHouseAreaRange("面 积"); + model.setHouseAreaRange("闈� 绉�"); } if (StringUtils.isNotBlank(model.getAvgPriceRange())) { @@ -475,7 +475,7 @@ public class MapController { model.setAveragePriceRange(avgPriceItem.getCaption()); } } else { - model.setAveragePriceRange("均价"); + model.setAveragePriceRange("鍧囦环"); } if (StringUtils.isNotBlank(model.getMetro())) { @@ -489,7 +489,7 @@ public class MapController { } /** - * 显示区域信息 + * 鏄剧ず鍖哄煙淇℃伅 * * **/ public Object getRegionInfoAction(MapModel model) { @@ -501,7 +501,7 @@ public class MapController { } /** - * 地图找房小区模块,小区房源列表 + * 鍦板浘鎵炬埧灏忓尯妯″潡锛屽皬鍖烘埧婧愬垪琛� * * **/ public Object districtFragmentAction(MapModel model) { @@ -611,7 +611,7 @@ public class MapController { } /** - * 小区房源 + * 灏忓尯鎴挎簮 * * @param model * @return @@ -644,7 +644,7 @@ public class MapController { pager.setTotalRows(houseBoResult.getNumberFound()); if (CollectionUtils.isNotEmpty(houseBoResult)) { - // 加入cpc + // 鍔犲叆cpc cpcService.checkCpcUserEnable(houseBoResult); for (HouseBo bo : houseBoResult) { bo.setTitle(CommonUtil.getShowTitle(bo.getHouse())); @@ -677,7 +677,7 @@ public class MapController { pager.setTotalRows(houseBoResult.getNumberFound()); if (CollectionUtils.isNotEmpty(houseBoResult)) { - // 加入cpc + // 鍔犲叆cpc cpcService.checkCpcUserEnable(houseBoResult); for (RentHouseBo bo : houseBoResult) { bo.setTitle(CommonUtil.getShowTitle(bo.getHouse())); @@ -730,7 +730,7 @@ public class MapController { Map ret = new HashMap(); Object obj = parseMap.get("district_name"); List list = (List) obj; - if (CollectionUtils.isEmpty(list)) {// 小区没配备上,去匹配关键字,区域等 + if (CollectionUtils.isEmpty(list)) {// 灏忓尯娌¢厤澶囦笂锛屽幓鍖归厤鍏抽敭瀛楋紝鍖哄煙绛� Map konwbase = knowbaseService.parseKeyword(keyword); if (konwbase.containsKey("district_name")) { return null; @@ -818,7 +818,7 @@ public class MapController { } /** - * 地图中概况模块Action + * 鍦板浘涓鍐垫ā鍧桝ction * * @param model * @return @@ -838,7 +838,7 @@ public class MapController { } /** - * 小区概况 + * 灏忓尯姒傚喌 * * @param model * @return @@ -870,7 +870,7 @@ public class MapController { } /** - * 板块、区域、城市概况 + * 鏉垮潡銆佸尯鍩熴�佸煄甯傛鍐� * * @param model * @return @@ -909,7 +909,7 @@ public class MapController { } /** - * 解析关键字中的小区或板块或区域 + * 瑙f瀽鍏抽敭瀛椾腑鐨勫皬鍖烘垨鏉垮潡鎴栧尯鍩� * * @param model */ @@ -918,7 +918,7 @@ public class MapController { String currentCity = ((ServerArea) FangjiaServerAreaContextHolder.getServerAreaDefault()).getDisplay(); Map konwbase = knowbaseService.parseWord(model.getKeyword()); if (MapUtils.isNotEmpty(konwbase)) { - // 判断是否存在小区 + // 鍒ゆ柇鏄惁瀛樺湪灏忓尯 if (konwbase.containsKey("district_name")) { List> districts = (List>) konwbase.get("district_name"); if (CollectionUtils.isNotEmpty(districts)) { @@ -1059,7 +1059,7 @@ public class MapController { districts.addAll(newDistricts); districts = getDistrictCommDataInfo(districts, model); - //排序 + //鎺掑簭 NameComparator comparator = new NameComparator(); Collections.sort(offices,comparator); Collections.sort(districts,comparator); @@ -1152,7 +1152,7 @@ public class MapController { in_districts = getDistrictCommDataInfo(in_districts, model); setValue(model, "in"); - //排序 + //鎺掑簭 NameComparator comparator = new NameComparator(); Collections.sort(in_offices,comparator); Collections.sort(in_districts,comparator); @@ -1195,12 +1195,12 @@ public class MapController { model.setCommonDistrictHouseCountOut(model.getCommonDistrictHouseCount()); model.setHightDistrictHouseCountOut(model.getHightDistrictHouseCount()); - model.setTotalDistrictCountOut(model.getTotalDistrictCount());//总小区数 - model.setCommonDistrictCountOut(model.getCommonDistrictCount());//高级小区数 - model.setHightDistrictCountOut(model.getHightDistrictCount());//普通小区数 + model.setTotalDistrictCountOut(model.getTotalDistrictCount());//鎬诲皬鍖烘暟 + model.setCommonDistrictCountOut(model.getCommonDistrictCount());//楂樼骇灏忓尯鏁� + model.setHightDistrictCountOut(model.getHightDistrictCount());//鏅�氬皬鍖烘暟 - model.setOldHouseCountOut(model.getOldHouseCount());//老工房 户数 - model.setOldDistrictCountOut(model.getOldDistrictCount());//老工户 小区数 + model.setOldHouseCountOut(model.getOldHouseCount());//鑰佸伐鎴� 鎴锋暟 + model.setOldDistrictCountOut(model.getOldDistrictCount());//鑰佸伐鎴� 灏忓尯鏁� }else{ model.setTotalHouseCountIn(model.getTotalHouseCount()); model.setCommonDistrictHouseCountIn(model.getCommonDistrictHouseCount()); @@ -1256,18 +1256,18 @@ public class MapController { OutputStream os = null; BufferedOutputStream fos = null; HSSFWorkbook wb = writeExcel(model.getResult(), model.getInResult(), model.getOutResult()); - String fileName = "概况统计.xls"; + String fileName = "姒傚喌缁熻.xls"; try { HttpServletResponse response = ActionContext.getContext().getResponse(); response.setCharacterEncoding("UTF-8"); - //response.reset();// 清空输出流 + //response.reset();// 娓呯┖杈撳嚭娴� response.setContentType("application/x-download;charset=UTF-8"); fileName = new String(fileName.getBytes("GBK"),"ISO-8859-1"); - if(fileName.length()>150){//解决IE 6.0 bug + if(fileName.length()>150){//瑙e喅IE 6.0 bug fileName = new String(fileName.getBytes("GBK"),"ISO-8859-1"); } response.setHeader( "Content-Disposition", "attachment;filename=" + fileName); - os = response.getOutputStream();// 取得输出流 + os = response.getOutputStream();// 鍙栧緱杈撳嚭娴� wb.write(os); os.flush(); }catch (Exception e) { @@ -1306,13 +1306,13 @@ public class MapController { private HSSFWorkbook createComplexExcel(String result, String inResult, String outResult){ HSSFWorkbook wb = new HSSFWorkbook(); HSSFSheet s = wb.createSheet(); - wb.setSheetName(0, "概况"); - s = createExcelData(result, s, "内圆"); + wb.setSheetName(0, "姒傚喌"); + s = createExcelData(result, s, "鍐呭渾"); if(StringUtils.isNotBlank(outResult)){ - s = createExcelData(inResult, s, "内环"); - s = createExcelData(outResult, s, "外环"); + s = createExcelData(inResult, s, "鍐呯幆"); + s = createExcelData(outResult, s, "澶栫幆"); }else{ - s = createExcelData(inResult, s, "外环"); + s = createExcelData(inResult, s, "澶栫幆"); } @@ -1323,31 +1323,31 @@ public class MapController { private HSSFSheet createExcelData(String result, HSSFSheet s, String keyword){ String[] array = result.split("-"); HSSFRow row = s.createRow(s.getPhysicalNumberOfRows()+1 ); - row.createCell((short)0).setCellValue(keyword+ "总户数"); - row.createCell((short)1).setCellValue(array[0] + "户"); + row.createCell((short)0).setCellValue(keyword+ "鎬绘埛鏁�"); + row.createCell((short)1).setCellValue(array[0] + "鎴�"); HSSFRow row1 = s.createRow(s.getPhysicalNumberOfRows()+1 ); - row1.createCell((short)1).setCellValue(keyword + "半径:"+array[1]+"米"); + row1.createCell((short)1).setCellValue(keyword + "鍗婂緞锛�"+array[1]+"绫�"); if(Integer.parseInt(array[2])!=0 || Integer.parseInt(array[3])!=0){ HSSFRow row2 = s.createRow(s.getPhysicalNumberOfRows()+1 ); - row2.createCell((short)1).setCellValue("老工房:"+array[2]+"户("+array[3]+"小区)"); + row2.createCell((short)1).setCellValue("鑰佸伐鎴匡細"+array[2]+"鎴凤紙"+array[3]+"灏忓尯锛�"); } if(Integer.parseInt(array[4])!=0 || Integer.parseInt(array[5])!=0){ HSSFRow row3 = s.createRow(s.getPhysicalNumberOfRows()+1 ); - row3.createCell((short)1).setCellValue("高级商品房:"+array[4]+"户("+array[5]+"小区)"); + row3.createCell((short)1).setCellValue("楂樼骇鍟嗗搧鎴匡細"+array[4]+"鎴凤紙"+array[5]+"灏忓尯锛�"); } if(Integer.parseInt(array[6])!=0 || Integer.parseInt(array[7])!=0){ HSSFRow row4 = s.createRow(s.getPhysicalNumberOfRows()+1 ); - row4.createCell((short)1).setCellValue("普通商品房:"+array[6]+"户("+array[7]+"小区)"); + row4.createCell((short)1).setCellValue("鏅�氬晢鍝佹埧锛�"+array[6]+"鎴凤紙"+array[7]+"灏忓尯锛�"); } if(Integer.parseInt(array[8])!=0 || Integer.parseInt(array[9])!=0){ HSSFRow row5 = s.createRow(s.getPhysicalNumberOfRows() +1); - row5.createCell((short)1).setCellValue("写字楼人数" + array[8]+"人("+array[9]+"个)"); + row5.createCell((short)1).setCellValue("鍐欏瓧妤间汉鏁�" + array[8]+"浜猴紙"+array[9]+"涓級"); } s.createRow(s.getPhysicalNumberOfRows() + 1); @@ -1360,38 +1360,38 @@ public class MapController { HSSFWorkbook wb = new HSSFWorkbook(); HSSFSheet s = wb.createSheet(); - wb.setSheetName(0, "概况"); + wb.setSheetName(0, "姒傚喌"); if(Integer.parseInt(array[0]) > 0){ HSSFRow row = s.createRow(s.getPhysicalNumberOfRows() ); HSSFCell cell = row.createCell(0); - row.createCell((short)0).setCellValue("查询半径"); - row.createCell((short)1).setCellValue(array[0] + "米"); + row.createCell((short)0).setCellValue("鏌ヨ鍗婂緞"); + row.createCell((short)1).setCellValue(array[0] + "绫�"); s.createRow(s.getPhysicalNumberOfRows()); } HSSFRow row2 = s.createRow(s.getPhysicalNumberOfRows() ); - row2.createCell((short)0).setCellValue("商品房人数"); - row2.createCell((short)1).setCellValue(array[1]+"户"); + row2.createCell((short)0).setCellValue("鍟嗗搧鎴夸汉鏁�"); + row2.createCell((short)1).setCellValue(array[1]+"鎴�"); HSSFRow row3 = s.createRow(s.getPhysicalNumberOfRows() ); - row3.createCell((short)1).setCellValue("老工房:"+array[2]+"户("+array[3]+"小区)"); + row3.createCell((short)1).setCellValue("鑰佸伐鎴匡細"+array[2]+"鎴凤紙"+array[3]+"灏忓尯锛�"); HSSFRow row4 = s.createRow(s.getPhysicalNumberOfRows() ); - row4.createCell((short)1).setCellValue("高级商品房:"+array[4]+"户("+array[5]+"小区)"); + row4.createCell((short)1).setCellValue("楂樼骇鍟嗗搧鎴匡細"+array[4]+"鎴凤紙"+array[5]+"灏忓尯锛�"); HSSFRow row5 = s.createRow(s.getPhysicalNumberOfRows() ); - row5.createCell((short)1).setCellValue("普通商品房:"+array[6]+"户("+array[7]+"小区)"); + row5.createCell((short)1).setCellValue("鏅�氬晢鍝佹埧锛�"+array[6]+"鎴凤紙"+array[7]+"灏忓尯锛�"); s.createRow(s.getPhysicalNumberOfRows()); HSSFRow row6 = s.createRow(s.getPhysicalNumberOfRows() ); - row6.createCell((short)0).setCellValue("写字楼人数"); - row6.createCell((short)1).setCellValue(array[8]+"人("+array[9]+"个)"); + row6.createCell((short)0).setCellValue("鍐欏瓧妤间汉鏁�"); + row6.createCell((short)1).setCellValue(array[8]+"浜猴紙"+array[9]+"涓級"); return wb; } @@ -1444,7 +1444,7 @@ public class MapController { district.setHouseholdCount(count); district.setAvgPrice(avgPrice); - if(district.getName().endsWith("村")){ + if(district.getName().endsWith("鏉�")){ oldHouseCount += count; oldDistrictCount ++; }else{ @@ -1460,26 +1460,26 @@ public class MapController { } - model.setTotalHouseCount(oldHouseCount + hightLevelDistrictHouseCount + commonDistrictHouseCount);//总户数 - model.setCommonDistrictHouseCount(commonDistrictHouseCount);//高级商品房户数 - model.setHightDistrictHouseCount(hightLevelDistrictHouseCount);//普通户数 + model.setTotalHouseCount(oldHouseCount + hightLevelDistrictHouseCount + commonDistrictHouseCount);//鎬绘埛鏁� + model.setCommonDistrictHouseCount(commonDistrictHouseCount);//楂樼骇鍟嗗搧鎴挎埛鏁� + model.setHightDistrictHouseCount(hightLevelDistrictHouseCount);//鏅�氭埛鏁� - model.setTotalDistrictCount(oldDistrictCount + commonDistrictCount + hightLevelDistrictCount);//总小区数 - model.setCommonDistrictCount(commonDistrictCount);//高级小区数 - model.setHightDistrictCount(hightLevelDistrictCount);//普通小区数 + model.setTotalDistrictCount(oldDistrictCount + commonDistrictCount + hightLevelDistrictCount);//鎬诲皬鍖烘暟 + model.setCommonDistrictCount(commonDistrictCount);//楂樼骇灏忓尯鏁� + model.setHightDistrictCount(hightLevelDistrictCount);//鏅�氬皬鍖烘暟 - model.setOldHouseCount(oldHouseCount);//老工房 户数 - model.setOldDistrictCount(oldDistrictCount);//老工户 小区数 + model.setOldHouseCount(oldHouseCount);//鑰佸伐鎴� 鎴锋暟 + model.setOldDistrictCount(oldDistrictCount);//鑰佸伐鎴� 灏忓尯鏁� } return model; } private List districtNameByStages(List districts){ - //移除有分期的 + //绉婚櫎鏈夊垎鏈熺殑 for(int i=districts.size()-1;i>=0;i--){ DistrictInfoBo district = districts.get(i); boolean flag = false; - String tempName = district.getName().replace("一期", "").replace("二期", "").replace("三期", "").replace("四期", "").replace("五期", ""); + String tempName = district.getName().replace("涓�鏈�", "").replace("浜屾湡", "").replace("涓夋湡", "").replace("鍥涙湡", "").replace("浜旀湡", ""); if(!district.getName().equals(tempName)){ for(DistrictInfoBo tempDistrict : districts){ @@ -1523,7 +1523,7 @@ public class MapController { // } // } // -// if(districtKey.getName().endsWith("村")){ +// if(districtKey.getName().endsWith("鏉�")){ // oldHouseCount += count; // oldDistrictCount ++; // }else{ @@ -1606,7 +1606,7 @@ public class MapController { private int calLivePecent(String liveDate){ if(StringUtils.isNotBlank(liveDate)){ - if(liveDate.equals("暂无资料")){ + if(liveDate.equals("鏆傛棤璧勬枡")){ return 0; }else{ String start = ""; @@ -1639,9 +1639,9 @@ public class MapController { private DistrictInfoBo handleOfficeBuildArea(DistrictInfoBo district){ if(StringUtils.isNotBlank(district.getBuildArea())){ - String buildArea = district.getBuildArea().replace("暂无资料", ""); + String buildArea = district.getBuildArea().replace("鏆傛棤璧勬枡", ""); if(StringUtils.isNotBlank(buildArea)){ - buildArea = patternParse(buildArea, "([0-9\\.]+)[万平方米|平方米|平方|平米|㎡]"); + buildArea = patternParse(buildArea, "([0-9\\.]+)[涓囧钩鏂圭背|骞虫柟绫硘骞虫柟|骞崇背|銕"); int buildAreaNum = isNumber(buildArea); if(buildAreaNum > 0){ int houseCount = buildAreaNum/15; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/MobileController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/MobileController.java index f1560ab81..e3e3b7b3a 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/MobileController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/MobileController.java @@ -4,7 +4,7 @@ import com.fangjia.coresite.model.BaseModel; public class MobileController { /** - * 手机客户端下载页面 + * 鎵嬫満瀹㈡埛绔笅杞介〉闈� * * @param model * @return diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/NewDistrictController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/NewDistrictController.java index 2194000bb..8c1013ee6 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/NewDistrictController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/NewDistrictController.java @@ -201,11 +201,11 @@ public class NewDistrictController { // // feedFooter(model); // -// // "在售"、"打折"搜索 +// // "鍦ㄥ敭"銆�"鎵撴姌"鎼滅储 // processUserConditions(model); // // /** -// * gasm统计 +// * gasm缁熻 // */ // model.addGaMap(Gakey.rc, pager.getTotalRows()); // return model; @@ -233,13 +233,13 @@ public class NewDistrictController { } if (null != model.getIfSale() && model.getIfSale() == 1) { - cons.add("在售"); - consMap.add(new Item("1", "在售", new Group("ifSale"))); + cons.add("鍦ㄥ敭"); + consMap.add(new Item("1", "鍦ㄥ敭", new Group("ifSale"))); } if (null != model.getIfDiscount() && model.getIfDiscount() == 1) { - cons.add("打折"); - consMap.add(new Item("1", "打折", new Group("ifDiscount"))); + cons.add("鎵撴姌"); + consMap.add(new Item("1", "鎵撴姌", new Group("ifDiscount"))); } model.setConditions(cons); @@ -247,12 +247,12 @@ public class NewDistrictController { } /** - * 底部热门推荐 + * 搴曢儴鐑棬鎺ㄨ崘 * * @param model */ private void feedFooter(NewDistrictModel model) { - // 底部热门推荐其他小区 + // 搴曢儴鐑棬鎺ㄨ崘鍏朵粬灏忓尯 int maxCount = 20; int maxRecommendCount = 7; DistrictQueryBean queryBean = new DistrictQueryBean(); @@ -267,7 +267,7 @@ public class NewDistrictController { } model.setFooterDistricts(limit(districtList)); - // 底部热门推荐的其他城市 + // 搴曢儴鐑棬鎺ㄨ崘鐨勫叾浠栧煄甯� queryBean = new DistrictQueryBean(); FacetQuery facetQuery = new FacetQuery(); facetQuery.setFields(Arrays.asList("city")); @@ -301,32 +301,32 @@ public class NewDistrictController { } /** - * 按时间做Seed获取的随机筛选的区域信息 + * 鎸夋椂闂村仛Seed鑾峰彇鐨勯殢鏈虹瓫閫夌殑鍖哄煙淇℃伅 * - * @param 区域菜单信息 - * @return 随机筛选的区域信息 + * @param 鍖哄煙鑿滃崟淇℃伅 + * @return 闅忔満绛涢�夌殑鍖哄煙淇℃伅 */ private List limit(List districts) { - int needCount = 6;// 获取的数据个数7个 + int needCount = 6;// 鑾峰彇鐨勬暟鎹釜鏁�7涓� - int changeDay = 20;// 设置更新频率为20天 + int changeDay = 20;// 璁剧疆鏇存柊棰戠巼涓�20澶� - int currentCount = districts.size();// 当前获取的Region总数 + int currentCount = districts.size();// 褰撳墠鑾峰彇鐨凴egion鎬绘暟 if (currentCount <= needCount) return districts; Calendar oldTime = Calendar.getInstance(); - oldTime.set(2011, 8, 1);// 初始化时间为2011年09月01日 + oldTime.set(2011, 8, 1);// 鍒濆鍖栨椂闂翠负2011骞�09鏈�01鏃� Calendar newTime = Calendar.getInstance(); - int reduceDay = SimRandom.getReduceDay(newTime, oldTime);// 获取日期与初始日期相差天数 + int reduceDay = SimRandom.getReduceDay(newTime, oldTime);// 鑾峰彇鏃ユ湡涓庡垵濮嬫棩鏈熺浉宸ぉ鏁� - int seed = (int) reduceDay / changeDay;// 计算simRandom变化频率,20表示20天更新一次 + int seed = (int) reduceDay / changeDay;// 璁$畻simRandom鍙樺寲棰戠巼,20琛ㄧず20澶╂洿鏂颁竴娆� - List simIndexs = SimRandom.getSimRandom(seed, currentCount, needCount);// 获取随机Index + List simIndexs = SimRandom.getSimRandom(seed, currentCount, needCount);// 鑾峰彇闅忔満Index List ret = new ArrayList(needCount); for (int index : simIndexs) { @@ -336,32 +336,32 @@ public class NewDistrictController { } /** - * 按时间做Seed获取的随机筛选的区域信息 + * 鎸夋椂闂村仛Seed鑾峰彇鐨勯殢鏈虹瓫閫夌殑鍖哄煙淇℃伅 * - * @param 区域菜单信息 - * @return 随机筛选的区域信息 + * @param 鍖哄煙鑿滃崟淇℃伅 + * @return 闅忔満绛涢�夌殑鍖哄煙淇℃伅 */ private List getRandomSubList(List items) { - int needCount = 7;// 获取的数据个数8个 + int needCount = 7;// 鑾峰彇鐨勬暟鎹釜鏁�8涓� - int changeDay = 20;// 设置更新频率为20天 + int changeDay = 20;// 璁剧疆鏇存柊棰戠巼涓�20澶� - int currentCount = items.size();// 当前获取的Region总数 + int currentCount = items.size();// 褰撳墠鑾峰彇鐨凴egion鎬绘暟 if (currentCount <= needCount) return items; Calendar oldTime = Calendar.getInstance(); - oldTime.set(2011, 8, 1);// 初始化时间为2011年09月01日 + oldTime.set(2011, 8, 1);// 鍒濆鍖栨椂闂翠负2011骞�09鏈�01鏃� Calendar newTime = Calendar.getInstance(); - int reduceDay = SimRandom.getReduceDay(newTime, oldTime);// 获取日期与初始日期相差天数 + int reduceDay = SimRandom.getReduceDay(newTime, oldTime);// 鑾峰彇鏃ユ湡涓庡垵濮嬫棩鏈熺浉宸ぉ鏁� - int seed = (int) reduceDay / changeDay;// 计算simRandom变化频率,20表示20天更新一次 + int seed = (int) reduceDay / changeDay;// 璁$畻simRandom鍙樺寲棰戠巼,20琛ㄧず20澶╂洿鏂颁竴娆� - List simIndexs = SimRandom.getSimRandom(seed, currentCount, needCount);// 获取随机Index + List simIndexs = SimRandom.getSimRandom(seed, currentCount, needCount);// 鑾峰彇闅忔満Index List limitedRegions = new ArrayList(needCount); for (int index : simIndexs) { @@ -435,7 +435,7 @@ public class NewDistrictController { } /** - * 新房详情页面 + * 鏂版埧璇︽儏椤甸潰 * * @param model * @return @@ -460,14 +460,14 @@ public class NewDistrictController { String city = model.getCity().getDisplay(); - // 新盘评论,动态 + // 鏂扮洏璇勮锛屽姩鎬� Pager pager = model.getPager(4); pager.setStartRow(0); - // 新盘评论模块数据 + // 鏂扮洏璇勮妯″潡鏁版嵁 List comments = findDistrictComment(pager, city, district.getName(), district.getRegion()); model.setDistrictComments(comments); - // 新盘动态模块数据 + // 鏂扮洏鍔ㄦ�佹ā鍧楁暟鎹� List dynamics = findDistrictDynamics(pager, city, district.getName(), district.getRegion()); model.setDistrictDynamics(dynamics); @@ -478,7 +478,7 @@ public class NewDistrictController { } /** - * 异步获取400号码 + * 寮傛鑾峰彇400鍙风爜 * * @param model * @return @@ -523,7 +523,7 @@ public class NewDistrictController { } /** - * 查询新盘动态数据 + * 鏌ヨ鏂扮洏鍔ㄦ�佹暟鎹� * * @return */ @@ -536,7 +536,7 @@ public class NewDistrictController { } /** - * 查询新盘评论数据 + * 鏌ヨ鏂扮洏璇勮鏁版嵁 * * @return */ @@ -546,7 +546,7 @@ public class NewDistrictController { queryBean.setDistrictName(districtName); queryBean.setRegion(region); List resultList = districtCommentService.findByQueryBeanAndSort(pager, queryBean, "publishDate", false); - // 如果加区域查询出来的楼评为空,去掉区域再查一次 + // 濡傛灉鍔犲尯鍩熸煡璇㈠嚭鏉ョ殑妤艰瘎涓虹┖锛屽幓鎺夊尯鍩熷啀鏌ヤ竴娆� if (resultList.size() == 0) { queryBean.setRegion(null); resultList = districtCommentService.findByQueryBeanAndSort(pager, queryBean, "publishDate", false); @@ -612,10 +612,10 @@ public class NewDistrictController { // model.setDistrictPics(subListPics); } - // 新盘评论是否存在 + // 鏂扮洏璇勮鏄惁瀛樺湪 model.setIfCommentExist(ifCommentExist(district)); - // 新盘动态是否存在 + // 鏂扮洏鍔ㄦ�佹槸鍚﹀瓨鍦� DistrictDynamicsQueryBean dynamicsQuery = new DistrictDynamicsQueryBean(); dynamicsQuery.setCategory("district_dynamics"); dynamicsQuery.setCity(district.getCity()); @@ -676,7 +676,7 @@ public class NewDistrictController { } /** - * 新盘动态 + * 鏂扮洏鍔ㄦ�� * * @param model * @return @@ -701,7 +701,7 @@ public class NewDistrictController { // // Pager pager = model.getPager(20, FangjiaConfig.getConfig().getSearchListMaxPageNo()); // -// // 新盘动态模块数据 +// // 鏂扮洏鍔ㄦ�佹ā鍧楁暟鎹� // DistrictDynamicsQueryBean dynamicsQuery = new DistrictDynamicsQueryBean(); // dynamicsQuery.setCategory("district_dynamics"); // dynamicsQuery.setCity(district.getCity()); @@ -719,14 +719,14 @@ public class NewDistrictController { // .balanceTags(dynamics.getName())))); // } // -// newsBo.setPublishDateStr(DateUtil.getHourDateRangeStr(dynamics.getPublishDate(), "yyyy-MM-dd")); // +"更新" +// newsBo.setPublishDateStr(DateUtil.getHourDateRangeStr(dynamics.getPublishDate(), "yyyy-MM-dd")); // +"鏇存柊" // newsBo.setCategory(dynamics.getCategory()); // newsBo.setSummary(NewsServiceImpl.getListSummary(model.getKeyword(), newsBo.getDescription())); // newsBo.setSummaryNoHtml(DataUtil.removeHtml(DataUtil.balanceTags(newsBo.getSummary()))); // newsBoList.add(newsBo); // } // -// // 新盘评论是否存在 +// // 鏂扮洏璇勮鏄惁瀛樺湪 // model.setIfCommentExist(ifCommentExist(district)); // // pager.setTotalRows(resultList.size()); @@ -741,7 +741,7 @@ public class NewDistrictController { } /** - * 判断新盘评论是否存在,先按区域查找,没有再去掉区域查询 + * 鍒ゆ柇鏂扮洏璇勮鏄惁瀛樺湪锛屽厛鎸夊尯鍩熸煡鎵撅紝娌℃湁鍐嶅幓鎺夊尯鍩熸煡璇� * * @param district * @return @@ -762,7 +762,7 @@ public class NewDistrictController { } /** - * 新盘评论 + * 鏂扮洏璇勮 * * @param model * @return @@ -783,7 +783,7 @@ public class NewDistrictController { Pager pager = model.getPager(20, FangjiaConfig.getConfig().getSearchListMaxPageNo()); - // 新盘评论模块数据 + // 鏂扮洏璇勮妯″潡鏁版嵁 DistrictCommentQueryBean commentQuery = new DistrictCommentQueryBean(); commentQuery.setCategory("louping"); commentQuery.setCity(district.getCity()); @@ -792,7 +792,7 @@ public class NewDistrictController { List resultList = districtCommentService.findByQueryBeanAndSort(pager, commentQuery, "publishDate", false); - // 如果加区域查询出来的楼评为空,去掉区域再查一次 + // 濡傛灉鍔犲尯鍩熸煡璇㈠嚭鏉ョ殑妤艰瘎涓虹┖锛屽幓鎺夊尯鍩熷啀鏌ヤ竴娆� if (resultList.size() == 0) { commentQuery.setRegion(null); resultList = districtCommentService.findByQueryBeanAndSort(pager, commentQuery, "publishDate", false); @@ -807,14 +807,14 @@ public class NewDistrictController { .balanceTags(comment.getName())))); } - newsBo.setPublishDateStr(DateUtil.getHourDateRangeStr(comment.getPublishDate(), "yyyy-MM-dd")); // +"更新" + newsBo.setPublishDateStr(DateUtil.getHourDateRangeStr(comment.getPublishDate(), "yyyy-MM-dd")); // +"鏇存柊" newsBo.setCategory(comment.getCategory()); newsBo.setSummary(NewsServiceImpl.getListSummary(model.getKeyword(), newsBo.getDescription())); newsBo.setSummaryNoHtml(DataUtil.removeHtml(DataUtil.balanceTags(newsBo.getSummary()))); newsBoList.add(newsBo); } - // 新盘动态 数据 是否存在 + // 鏂扮洏鍔ㄦ�� 鏁版嵁 鏄惁瀛樺湪 DistrictDynamicsQueryBean dynamicsQuery = new DistrictDynamicsQueryBean(); dynamicsQuery.setCategory("district_dynamics"); dynamicsQuery.setCity(district.getCity()); diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/NewsController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/NewsController.java index 531881a52..f8b179e27 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/NewsController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/NewsController.java @@ -204,7 +204,7 @@ public class NewsController { Pattern p = Pattern.compile(".*", Pattern.DOTALL); s = p.matcher(s).replaceAll(""); s = s.replaceAll(" ", " ").replaceAll("[ ]+", " ").replaceAll("\\s

\\r*\\n*", "").replaceAll( - "\\s\\r*\\n*", "").replaceAll("]*>", "").replaceAll("

", "

  "); + "\\s\\r*\\n*", "").replaceAll("]*>", "").replaceAll("

", "

銆�銆�"); StringBuffer sb = new StringBuffer(); boolean isInTag = false; @@ -254,7 +254,7 @@ public class NewsController { } /** - * 进入资讯详情 + * 杩涘叆璧勮璇︽儏 * * @param model * @return @@ -277,16 +277,16 @@ public class NewsController { // model.setNewsBo(newsBo); // // /** -// * 用户顶踩信息 +// * 鐢ㄦ埛椤惰俯淇℃伅 // */ // UserFeeling userFeeling = this.userFeelingService.findUserFeeling("news", model.getId()); // model.setUserFeeling(userFeeling); // -// Pager microBlogPager = new Pager(5);// 微博分页,固定,显示前五条 +// Pager microBlogPager = new Pager(5);// 寰崥鍒嗛〉,鍥哄畾锛屾樉绀哄墠浜旀潯 // List microBlogs = microBlogService.findByKeyWord(microBlogPager, newsBo.getKeywords()); -// // sortMicroBlogsByPublishDate(microBlogs);// 按PUBLISHDATE排序微博列表 +// // sortMicroBlogsByPublishDate(microBlogs);// 鎸塒UBLISHDATE鎺掑簭寰崥鍒楄〃 // model.setMicroBlogs(microBlogs); -// // 最新上线的城市 +// // 鏈�鏂颁笂绾跨殑鍩庡競 // List newCitys = new ArrayList(); // List serverAreaList = ServerAreaData.getServerAreaList(10); // List cityNames = CollectionUtils.collect(serverAreaList, new Closure() { @@ -306,7 +306,7 @@ public class NewsController { } // /** - // * 按PUBLISHDATE排序微博列表 + // * 鎸塒UBLISHDATE鎺掑簭寰崥鍒楄〃 // * // * @param microBlogs // */ @@ -317,7 +317,7 @@ public class NewsController { // public int compare(Object firstObj, Object secObj) { // MicroBlog firstBlog = (MicroBlog) firstObj; // MicroBlog secBlog = (MicroBlog) secObj; - // // 按时间由近到远排序 + // // 鎸夋椂闂寸敱杩戝埌杩滄帓搴� // long diff = firstBlog.getPublishDate().getTime() - // secBlog.getPublishDate().getTime(); // if (diff > 0) { @@ -332,7 +332,7 @@ public class NewsController { // } /** - * 进入看房日记详情 + * 杩涘叆鐪嬫埧鏃ヨ璇︽儏 * * @param model * @return @@ -371,11 +371,11 @@ public class NewsController { // } // // model.setNewsBo(newsBo); -// // 用户顶踩信息 +// // 鐢ㄦ埛椤惰俯淇℃伅 // UserFeeling userFeeling = this.userFeelingService.findUserFeeling("news", model.getId()); // model.setUserFeeling(userFeeling); // -// // 最新上线的城市 +// // 鏈�鏂颁笂绾跨殑鍩庡競 // List newCitys = new ArrayList(); // List serverAreaList = ServerAreaData.getServerAreaList(10); // List cityNames = CollectionUtils.collect(serverAreaList, new Closure() { @@ -397,7 +397,7 @@ public class NewsController { } /** - * 进入新盘评论 + * 杩涘叆鏂扮洏璇勮 * * @param model * @return @@ -422,7 +422,7 @@ public class NewsController { } /** - * 进入新盘动态 + * 杩涘叆鏂扮洏鍔ㄦ�� * * @param model * @return @@ -436,7 +436,7 @@ public class NewsController { // // String sortField = null; // // if (isOrderByTime(model.getKeyword(), model.getSort())) { -// // 排序条件不存在时按时间排序 +// // 鎺掑簭鏉′欢涓嶅瓨鍦ㄦ椂鎸夋椂闂存帓搴� // if (StringUtils.isBlank(model.getSort()) || "1".equals(model.getSort())) { // sortField = "publishDate"; // model.setSort("1"); @@ -471,17 +471,17 @@ public class NewsController { // newsBo.setName(news.getName()); // } // if (null != news.getPublishDate()) { -// // 当天的资讯,时间显示为“**小时前更新” +// // 褰撳ぉ鐨勮祫璁紝鏃堕棿鏄剧ず涓衡��**灏忔椂鍓嶆洿鏂扳�� // if (news.getPublishDate().after(range[0]) && news.getPublishDate().before(range[1])) { // int diffHour = DateUtil.getHour(new Date()) - DateUtil.getHour(news.getPublishDate()); // if (diffHour > 0) { -// newsBo.setPublishDateStr(diffHour + "小时前更新"); +// newsBo.setPublishDateStr(diffHour + "灏忔椂鍓嶆洿鏂�"); // } else { // int diffMinute = DateUtil.getMinute(new Date()) - DateUtil.getMinute(news.getPublishDate()); // if (diffMinute <= 0) { // diffMinute = 1; // } -// newsBo.setPublishDateStr(diffMinute + "分钟前更新"); +// newsBo.setPublishDateStr(diffMinute + "鍒嗛挓鍓嶆洿鏂�"); // } // // } else { @@ -496,7 +496,7 @@ public class NewsController { // model.setNewsBoList(newsBoList); // model.setPager(pager); // -// // 最新上线的城市 +// // 鏈�鏂颁笂绾跨殑鍩庡競 // List newCitys = new ArrayList(); // List serverAreaList = ServerAreaData.getServerAreaList(10); // List cityNames = CollectionUtils.collect(serverAreaList, new Closure() { @@ -515,14 +515,14 @@ public class NewsController { // model.setIpCityUrl(model.getCityUrl(model.getIpCity().getDisplay())); // // /** -// * gasm统计 +// * gasm缁熻 // */ // model.addGaMap(Gakey.rc, pager.getTotalRows()); return model.redirectPermanently("/"); } /** - * 新闻列表 + * 鏂伴椈鍒楄〃 * * @param model * @return @@ -533,10 +533,10 @@ public class NewsController { } /** - * 获取当前城市 + * 鑾峰彇褰撳墠鍩庡競 * * @param request - * @return 当前城市 + * @return 褰撳墠鍩庡競 */ private ServerArea getSuggestCity(HttpServletRequest request) { String ip = AnalyticsUtil.getIpAddress(request); @@ -553,7 +553,7 @@ public class NewsController { } /** - * 新闻列表 + * 鏂伴椈鍒楄〃 * * @param model * @return @@ -564,7 +564,7 @@ public class NewsController { } /** - * 新闻预览 + * 鏂伴椈棰勮 * * @param model * @return @@ -575,7 +575,7 @@ public class NewsController { } /** - * 新闻预览测试页面 + * 鏂伴椈棰勮娴嬭瘯椤甸潰 * * @param model * @return @@ -593,7 +593,7 @@ public class NewsController { } /** - * 根据关键字显示走势 + * 鏍规嵁鍏抽敭瀛楁樉绀鸿蛋鍔� * * @param model * @param request @@ -605,7 +605,7 @@ public class NewsController { } /** - * 取得板块的信息 + * 鍙栧緱鏉垮潡鐨勪俊鎭� * * @param suggestCity * @param blockList @@ -616,8 +616,8 @@ public class NewsController { if (CollectionUtils.isEmpty(blockList)) { return null; } - // {block={_matcher_value=田林, pattern=[田林], value=田林, - // extra_data={region=徐汇, city=上海}}} + // {block={_matcher_value=鐢版灄, pattern=[鐢版灄], value=鐢版灄, + // extra_data={region=寰愭眹, city=涓婃捣}}} Map blockMap = new HashMap(); boolean ipFindCity = false; if (null != suggestCity) { @@ -654,7 +654,7 @@ public class NewsController { } /** - * 取得区域的信息 + * 鍙栧緱鍖哄煙鐨勪俊鎭� * * @param suggestCity * @return @@ -664,8 +664,8 @@ public class NewsController { if (CollectionUtils.isEmpty(regionList)) { return null; } - // {region=[{_matcher_value=徐汇, pattern=[徐汇], value=徐汇, - // extra_data={city=上海}}]} + // {region=[{_matcher_value=寰愭眹, pattern=[寰愭眹], value=寰愭眹, + // extra_data={city=涓婃捣}}]} boolean ipFindCity = false; Map region = new HashMap(); if (null != suggestCity) { @@ -699,7 +699,7 @@ public class NewsController { } /** - * 取得小区信息 + * 鍙栧緱灏忓尯淇℃伅 * * @param suggestCity * @param districtList diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/PersonalcenterController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/PersonalcenterController.java index f073048a6..5ad3fcd2c 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/PersonalcenterController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/PersonalcenterController.java @@ -56,11 +56,11 @@ public class PersonalcenterController { private ApiUserAccountService apiUserAccountService; public Object indexAction(PersonalcenterModel model, HttpServletRequest req) { - //判断是否登录 + //鍒ゆ柇鏄惁鐧诲綍 // long userId = 211108; String userId = LoginUtil.getUserId(req); FangJiaUser fangJiaUser = fangJiaUserService.getUserById(userId); - //未登录或无此用户 + //鏈櫥褰曟垨鏃犳鐢ㄦ埛 if(fangJiaUser == null) { return model; } @@ -70,7 +70,7 @@ public class PersonalcenterController { model.setAmount(amount); PaymentModel paymentModel = new PaymentModel(); - paymentModel.setBody("购买房豆"); + paymentModel.setBody("璐拱鎴胯眴"); paymentModel.setReturn_url(model.getCityUrl()+"/personalcenter/paySuccess"); paymentModel.setOut_trade_no(""); @@ -78,7 +78,7 @@ public class PersonalcenterController { paymentModel.setPayment_type("1"); paymentModel.setSeller_email(AlipayConfig.alipayEmail); paymentModel.setService(AlipayConfig.service); - paymentModel.setSubject("购买房豆"); + paymentModel.setSubject("璐拱鎴胯眴"); paymentModel.setTotal_fee("0.01"); paymentModel.setShow_url(""); paymentModel.setPaymethod("bankPay"); @@ -96,7 +96,7 @@ public class PersonalcenterController { public Object rechargeHistoryAction(HttpServletRequest req, RechargeHistoryModel model) { long userId = NumberUtils.toLong(LoginUtil.getUserId(req), -1); - //未登录或无此用户 + //鏈櫥褰曟垨鏃犳鐢ㄦ埛 if(!isLogined(userId)) { return model; } @@ -117,11 +117,11 @@ public class PersonalcenterController { for (String key : keys) { sb.append("&"+key+"="+request.getParameter(key)); if (!(key.equals("sign_type") || key.equals("sign"))) { - // 除去sign和sign_type两个参数 + // 闄ゅ幓sign鍜宻ign_type涓や釜鍙傛暟 params_sign.put(key, request.getParameter(key)); } } - LOGGER.info("支付宝回调:" + request.getRequestURL() + "?" + sb.substring(1)); + LOGGER.info("鏀粯瀹濆洖璋冿細" + request.getRequestURL() + "?" + sb.substring(1)); String alipayKey = AlipayConfig.alipayKey; String sign = Alipayment.CreateUrl(params_sign, alipayKey); if (!sign.equals(request.getParameter("sign"))) { @@ -157,10 +157,10 @@ public class PersonalcenterController { data.put("status", "success"); purchaseRecordService.updateById(purchaseRecord.getId(), data); - //增加房豆 - /*fjtUsersService.addGold(purchaseRecord.getUserId(), purchaseRecord.getNumber(), "充值"); + //澧炲姞鎴胯眴 + /*fjtUsersService.addGold(purchaseRecord.getUserId(), purchaseRecord.getNumber(), "鍏呭��"); - //未设置支付密码 + //鏈缃敮浠樺瘑鐮� if(StringUtils.isBlank(usersInfoService.getPayPassword(purchaseRecord.getUserId()))) { return model.redirect("/api/setPassword"); }*/ @@ -175,13 +175,13 @@ public class PersonalcenterController { paymentModel.setViewParam("config", null); DecimalFormat df = new DecimalFormat("0.00"); - //判断是否登录 + //鍒ゆ柇鏄惁鐧诲綍 // long userId = 22L; long userId = NumberUtils.toLong(LoginUtil.getUserId(request), -1); - //未登录或无此用户 + //鏈櫥褰曟垨鏃犳鐢ㄦ埛 if(!isLogined(userId)) { JsonModel resultModel = new JsonModel(); - resultModel.setJsonModel(ImmutableMap.of("status", "not_login", "msg", "未登录")); + resultModel.setJsonModel(ImmutableMap.of("status", "not_login", "msg", "鏈櫥褰�")); return resultModel; } @@ -191,20 +191,20 @@ public class PersonalcenterController { String key = AlipayConfig.alipayKey; String partner = AlipayConfig.alipayPartner; String seller_email = AlipayConfig.alipayEmail; - String out_trade_no = ObjectId.get().toString();//生成订单号 - String service = paymentModel.getService();// 快速付款交易服务 - String payment_type = "1";// 支付宝类型.1代表商品购买 - String paymethod = "bankPay";// 赋值:bankPay(网银);cartoon(卡通); + String out_trade_no = ObjectId.get().toString();//鐢熸垚璁㈠崟鍙� + String service = paymentModel.getService();// 蹇�熶粯娆句氦鏄撴湇鍔� + String payment_type = "1";// 鏀粯瀹濈被鍨�.1浠h〃鍟嗗搧璐拱 + String paymethod = "bankPay";// 璧嬪��:bankPay(缃戦摱);cartoon(鍗¢��); String defaultbank = paymentModel.getDefaultbank(); if("AliPay".equalsIgnoreCase(defaultbank)) { paymethod = ""; } - //计算出购买房豆的总价 + //璁$畻鍑鸿喘涔版埧璞嗙殑鎬讳环 int totalCost = getTotalCost(personalcenterModel); total_fee = df.format(totalCost); - body = "购买房豆"; - subject = "购买房豆"; + body = "璐拱鎴胯眴"; + subject = "璐拱鎴胯眴"; return_url = paymentModel.getCityUrl() + "/personalcenter/paySuccess";// AlipayConfig.return_url; /*notify_url = "http://local153.fangjia.com:4082/fangjia-coresite/recharge/buySuccess";*/ // return_url = "http://local153.fangjia.com:4082/fangjia-coresite/personalcenter/paySuccess"; @@ -217,11 +217,11 @@ public class PersonalcenterController { if (ip.equals("116.247.70.58") || FangjiaConfig.getConfig().isTestEnvironment() || FangjiaConfig.getConfig().isDevelopmentEnvironment()) { total_fee = "0.01"; paymentModel.setTotal_fee("0.01"); - paymentModel.setPrice("0.01");// 公司测试ip + paymentModel.setPrice("0.01");// 鍏徃娴嬭瘯ip } if(StringUtils.isBlank(defaultbank)) { - throw new Exception("请选择支付渠道"); + throw new Exception("璇烽�夋嫨鏀粯娓犻亾"); } // CacheUtils.putValue(CacheUtils.CachePolicyEnum.SHORT, PersonalcenterController.class, out_trade_no, System.currentTimeMillis()); @@ -253,14 +253,14 @@ public class PersonalcenterController { paymentModel.setTotal_fee(total_fee); paymentModel.setOut_trade_no(out_trade_no); - //API购买需要入库,并且状态设置为待支付 + //API璐拱闇�瑕佸叆搴擄紝骞朵笖鐘舵�佽缃负寰呮敮浠� // recordPurchase(userId, new BigDecimal(totalCost), getTotalFd(personalcenterModel), out_trade_no, new Date(), defaultbank, "pending"); return paymentModel; } /** - * 余额支付 + * 浣欓鏀粯 * @param request * @param model * @param personalcenterModel @@ -269,17 +269,17 @@ public class PersonalcenterController { */ public Object buySubmitAction(HttpServletRequest request, RechargeModel model, PersonalcenterModel personalcenterModel) throws Exception { JsonModel resultModel = new JsonModel(); - //1.判断是否登录 + //1.鍒ゆ柇鏄惁鐧诲綍 String userId = LoginUtil.getUserId(request); FangJiaUser fangJiaUser = fangJiaUserService.getUserById(userId); - //未登录或无此用户 or未创建API用户 - //2.判断是否已经创建api_user,没有则创建 + //鏈櫥褰曟垨鏃犳鐢ㄦ埛 or鏈垱寤篈PI鐢ㄦ埛 + //2.鍒ゆ柇鏄惁宸茬粡鍒涘缓api_user锛屾病鏈夊垯鍒涘缓 if(StringUtils.isBlank(userId) || fangJiaUser==null) { resultModel.setJsonModel(ImmutableMap.of("status", "account_not_exists", "msg", Message.ACCOUNT_NOT_EXISTS)); return resultModel; } - //判断验证码的正确性 + //鍒ゆ柇楠岃瘉鐮佺殑姝g‘鎬� String cacheCode = (String) CacheUtils.getValue(UsersInfoService.class, model.getPhone() + "_" + Message.SMS_CODE_TYPE_PAY); if (cacheCode == null) { resultModel.setJsonModel(ImmutableMap.of("status", "not_send", "msg", Message.MOBILE_NOT_SEND_CODE)); @@ -289,69 +289,69 @@ public class PersonalcenterController { resultModel.setJsonModel(ImmutableMap.of("status", "code_error", "msg", Message.CODE_ERROR)); return resultModel; } - //判断支付密码的正确性 + //鍒ゆ柇鏀粯瀵嗙爜鐨勬纭�� String savedPwd = fangJiaUser.getPayPassword(); - //未设置支付密码 + //鏈缃敮浠樺瘑鐮� if (StringUtils.isBlank(savedPwd)) { resultModel.setJsonModel(ImmutableMap.of("status", "no_pay_password", "msg", Message.NOT_SET_PAY_PASSWORD)); return resultModel; } - //支付密码不正确 + //鏀粯瀵嗙爜涓嶆纭� if (!savedPwd.equals(DigestUtils.md5Hex(model.getPassword()))) { resultModel.setJsonModel(ImmutableMap.of("status", "pay_password_error", "msg", Message.PAY_PASSWORD_ERROR)); return resultModel; } - //判断余额 + //鍒ゆ柇浣欓 BigDecimal amount = apiUserAccountService.findAmountByUserId(userId); int totalCost = getTotalCost(personalcenterModel); int totalFd = getTotalFd(personalcenterModel); if(totalCost<=0 || totalFd<=0) { - resultModel.setJsonModel(ImmutableMap.of("status", "fail", "msg", "操作不合法")); + resultModel.setJsonModel(ImmutableMap.of("status", "fail", "msg", "鎿嶄綔涓嶅悎娉�")); return resultModel; } if(amount.compareTo(new BigDecimal(totalCost)) < 0) { - resultModel.setJsonModel(ImmutableMap.of("status", "insufficient_balance", "msg", "余额不足")); + resultModel.setJsonModel(ImmutableMap.of("status", "insufficient_balance", "msg", "浣欓涓嶈冻")); return resultModel; } - //验证完毕,代表购买成功: - //保存购买记录 + //楠岃瘉瀹屾瘯锛屼唬琛ㄨ喘涔版垚鍔燂細 + //淇濆瓨璐拱璁板綍 Date now = new Date(); - recordPurchase(userId, new BigDecimal(totalCost), totalFd, ObjectId.get().toString(), now, "余额", "success"); - //增加房豆 - // fjtUsersService.addGold(userId, totalFd, "充值"); - //扣减余额 + recordPurchase(userId, new BigDecimal(totalCost), totalFd, ObjectId.get().toString(), now, "浣欓", "success"); + //澧炲姞鎴胯眴 + // fjtUsersService.addGold(userId, totalFd, "鍏呭��"); + //鎵e噺浣欓 ApiUserAccount apiUserAccount = new ApiUserAccount(); apiUserAccount.setUserId(userId); apiUserAccount.setChange(new BigDecimal(totalCost).multiply(new BigDecimal("-1"))); apiUserAccount.setAmount(amount.subtract(new BigDecimal(totalCost))); apiUserAccount.setCreateDate(now); - apiUserAccount.setChangeWay("线上"); + apiUserAccount.setChangeWay("绾夸笂"); apiUserAccount.setStatus("success"); apiUserAccountService.saveApiUserAccount(apiUserAccount); - //4.购买成功 - resultModel.setJsonModel(ImmutableMap.of("status", "success", "msg", "操作成功")); + //4.璐拱鎴愬姛 + resultModel.setJsonModel(ImmutableMap.of("status", "success", "msg", "鎿嶄綔鎴愬姛")); return resultModel; } /** - * 发送短信验证码 + * 鍙戦�佺煭淇¢獙璇佺爜 * @param model * @param resultModel * @return */ public Object sendSmsAction(HttpServletRequest request, RechargeModel model, SendCodeJsonModel resultModel) throws Exception { - //判断是否登录 + //鍒ゆ柇鏄惁鐧诲綍 long userId = NumberUtils.toLong(LoginUtil.getUserId(request), -1); - //未登录或无此用户 + //鏈櫥褰曟垨鏃犳鐢ㄦ埛 if(!isLogined(userId)) { resultModel.setResult(Message.RESULT_FAIL); resultModel.setMsg(Message.NOT_LOGIN); return resultModel; } - //检测支付密码是否正确 + //妫�娴嬫敮浠樺瘑鐮佹槸鍚︽纭� String savedPwd = usersInfoService.getPayPassword(userId); if(StringUtils.isBlank(savedPwd)) { resultModel.setResult(Message.RESULT_FAIL); @@ -365,7 +365,7 @@ public class PersonalcenterController { } Long sendCodeTime = (Long) CacheUtils.getValue(UsersInfoService.class, model.getPhone() + "_" + model.getType() + "_time"); - //验证码一分钟只能发一次 + //楠岃瘉鐮佷竴鍒嗛挓鍙兘鍙戜竴娆� if(sendCodeTime != null) { if(new Date().getTime() - sendCodeTime < 60 * 1000) { resultModel.setResult(Message.RESULT_FAIL); @@ -375,7 +375,7 @@ public class PersonalcenterController { } String code = usersInfoService.randomCode(); try { - smsService.send(model.getPhone(), "【房价网】你的验证码是" + code + ",验证码5分钟内有效,请立即验证。"); + smsService.send(model.getPhone(), "銆愭埧浠风綉銆戜綘鐨勯獙璇佺爜鏄�" + code + ",楠岃瘉鐮�5鍒嗛挓鍐呮湁鏁堬紝璇风珛鍗抽獙璇併��"); resultModel.setResult(Message.RESULT_SUCCESS); CacheUtils.putValue(CacheUtils.CachePolicyEnum.TINY, UsersInfoService.class, model.getPhone() + "_" + model.getType(), code); CacheUtils.putValue(CacheUtils.CachePolicyEnum.SMALL, UsersInfoService.class, model.getPhone() + "_" + model.getType() + "_time", new Date().getTime()); @@ -387,10 +387,10 @@ public class PersonalcenterController { } public Object setPasswordAction(HttpServletRequest req, RechargeModel model) throws Exception { - //判断是否登录 + //鍒ゆ柇鏄惁鐧诲綍 long userId = NumberUtils.toLong(LoginUtil.getUserId(req), -1); JsonModel jsonModel = new JsonModel(); - //未登录或无此用户 + //鏈櫥褰曟垨鏃犳鐢ㄦ埛 if(!"post".equalsIgnoreCase(req.getMethod())) { return model; } @@ -406,7 +406,7 @@ public class PersonalcenterController { } /** - * 判断是否登录 + * 鍒ゆ柇鏄惁鐧诲綍 * @param userId * @return */ @@ -418,21 +418,21 @@ public class PersonalcenterController { } /** - * 获取总花费 + * 鑾峰彇鎬昏姳璐� * @return */ private int getTotalCost(PersonalcenterModel model) { int total = 0; - if(model.getTc1() != null) {// 1元/1房豆 + if(model.getTc1() != null) {// 1鍏�/1鎴胯眴 total += model.getTc1() * 1; } - if(model.getTc2() != null) {// 30元/35房豆 + if(model.getTc2() != null) {// 30鍏�/35鎴胯眴 total += model.getTc2() * 30; } - if(model.getTc3() != null) {// 50元/58房豆 + if(model.getTc3() != null) {// 50鍏�/58鎴胯眴 total += model.getTc3() * 50; } - if(model.getTc4() != null) {// 100元/150房豆 + if(model.getTc4() != null) {// 100鍏�/150鎴胯眴 total += model.getTc4() * 100; } @@ -440,22 +440,22 @@ public class PersonalcenterController { } /** - * 获取购买的房豆总数 + * 鑾峰彇璐拱鐨勬埧璞嗘�绘暟 * @param model * @return */ private int getTotalFd(PersonalcenterModel model) { int total = 0; - if(model.getTc1() != null) {// 1元/1房豆 + if(model.getTc1() != null) {// 1鍏�/1鎴胯眴 total += model.getTc1() * 1; } - if(model.getTc2() != null) {// 30元/35房豆 + if(model.getTc2() != null) {// 30鍏�/35鎴胯眴 total += model.getTc2() * 35; } - if(model.getTc3() != null) {// 50元/58房豆 + if(model.getTc3() != null) {// 50鍏�/58鎴胯眴 total += model.getTc3() * 58; } - if(model.getTc4() != null) {// 100元/150房豆 + if(model.getTc4() != null) {// 100鍏�/150鎴胯眴 total += model.getTc4() * 150; } @@ -463,16 +463,16 @@ public class PersonalcenterController { } /** - * 增加购买记录 + * 澧炲姞璐拱璁板綍 */ private void recordPurchase(String userId, BigDecimal totalCost, int totalFd, String orderNumber, Date date, String defaultbank, String status) { PurchaseRecord purchaseRecord = new PurchaseRecord(); purchaseRecord.setCreateTime(date); purchaseRecord.setUserId(userId); purchaseRecord.setStatus(status); - purchaseRecord.setChannel("线上"); - purchaseRecord.setTotalFee(totalCost);//总花费 - purchaseRecord.setNumber(totalFd);//购买的房豆数 + purchaseRecord.setChannel("绾夸笂"); + purchaseRecord.setTotalFee(totalCost);//鎬昏姳璐� + purchaseRecord.setNumber(totalFd);//璐拱鐨勬埧璞嗘暟 purchaseRecord.setOrderNumber(orderNumber); purchaseRecord.setBankCode(defaultbank); purchaseRecord.setCat("fd"); diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/PriceSubscribeController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/PriceSubscribeController.java index a2aed6a0a..14c2611b0 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/PriceSubscribeController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/PriceSubscribeController.java @@ -28,14 +28,14 @@ public class PriceSubscribeController { PriceSubscribe subscribe = new PriceSubscribe(); String email = StringUtils.trimToNull(model.getEmail()); if (StringUtils.isBlank(email)) { - model.setRetMsg("请输入订阅邮箱地址!"); + model.setRetMsg("璇疯緭鍏ヨ闃呴偖绠卞湴鍧�!"); return model; } Pattern p = Pattern.compile("\\w+([-+.]\\w+)*@\\w+([-.]\\w+)*\\.\\w+([-.]\\w+)*"); Matcher m = p.matcher(email); if (!m.matches()) { - model.setRetMsg("邮箱地址不合法!"); + model.setRetMsg("閭鍦板潃涓嶅悎娉�!"); return model; } @@ -61,7 +61,7 @@ public class PriceSubscribeController { subscribe.setUserId(getLoginedUserId(model)); priceSubscribeService.saveSubscribe(subscribe); - model.setRetMsg("订阅成功!"); + model.setRetMsg("璁㈤槄鎴愬姛!"); return model; } diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/ProductController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/ProductController.java index 6eb57845f..54e100b64 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/ProductController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/ProductController.java @@ -5,7 +5,7 @@ import com.fangjia.coresite.model.FangjiaModel; public class ProductController { /** - * PDS介绍 + * PDS浠嬬粛 * @param model * @return */ @@ -14,7 +14,7 @@ public class ProductController { } /** - * AMP介绍 + * AMP浠嬬粛 * @param model * @return */ @@ -23,7 +23,7 @@ public class ProductController { } /** - * 房价通介绍 + * 鎴夸环閫氫粙缁� * @param model * @return */ diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/RechargeController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/RechargeController.java index 1b3a0f6da..070eff5e8 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/RechargeController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/RechargeController.java @@ -52,9 +52,9 @@ import java.util.*; public class RechargeController { private final static Logger LOGGER = LoggerFactory.getLogger(RechargeController.class); - private final static String APIPURCHASE_SUCCESS = "success";//支付成功 - private final static String APIPURCHASE_FAIL = "fail";//支付失败 - private final static String APIPURCHASE_PENDING = "pending";//待支付 + private final static String APIPURCHASE_SUCCESS = "success";//鏀粯鎴愬姛 + private final static String APIPURCHASE_FAIL = "fail";//鏀粯澶辫触 + private final static String APIPURCHASE_PENDING = "pending";//寰呮敮浠� private UsersService usersService; private ApiUserAccountService apiUserAccountService; @@ -69,15 +69,15 @@ public class RechargeController { private ApiDetailService apiDetailService; private FangJiaUserService fangJiaUserService; /** - * 短信Service + * 鐭俊Service */ private SmsService smsService; public Object prechargePayAction(HttpServletRequest req, RechargeModel model) throws Exception { DecimalFormat df = new DecimalFormat("0.00"); - //判断是否登录 + //鍒ゆ柇鏄惁鐧诲綍 String userId = LoginUtil.getUserId(req); - //未登录或无此用户 + //鏈櫥褰曟垨鏃犳鐢ㄦ埛 FangJiaUser fangJiaUser = fangJiaUserService.getUserById(userId); if(fangJiaUser == null) { return model; @@ -85,7 +85,7 @@ public class RechargeController { model.setUserId(userId); model.setLogined(true); model.setTabTitle(apiService.getTabTitle(userId+"")); - //返回账户余额和产品的单价 + //杩斿洖璐︽埛浣欓鍜屼骇鍝佺殑鍗曚环 BigDecimal amount = apiUserAccountService.findAmountByUserId(userId); // List apiProducts = apiProductService.findAllAvailable(); @@ -94,9 +94,9 @@ public class RechargeController { model.setAmount(df.format(amount)); model.setProducts(apiProducts); - String out_trade_no = ObjectId.get().toString();// 请与贵网站订单系统中的唯一订单号匹配 + String out_trade_no = ObjectId.get().toString();// 璇蜂笌璐电綉绔欒鍗曠郴缁熶腑鐨勫敮涓�璁㈠崟鍙峰尮閰� PaymentModel paymentModel = new PaymentModel(); - paymentModel.setBody("API账户充值"); + paymentModel.setBody("API璐︽埛鍏呭��"); paymentModel.setNotify_url(model.getCityUrl()+"/recharge/paySuccess1"); paymentModel.setReturn_url(model.getCityUrl()+"/recharge/paySuccess"); /*paymentModel.setNotify_url("http://local153.fangjia.com:4082/fangjia-coresite/recharge/paySuccess"); @@ -107,7 +107,7 @@ public class RechargeController { paymentModel.setPayment_type("1"); paymentModel.setSeller_email(AlipayConfig.alipayEmail); paymentModel.setService(AlipayConfig.service); - paymentModel.setSubject("API账户充值"); + paymentModel.setSubject("API璐︽埛鍏呭��"); paymentModel.setTotal_fee("0.01"); paymentModel.setShow_url(""); paymentModel.setPaymethod("bankPay"); @@ -128,27 +128,27 @@ public class RechargeController { model.setViewParam("config", null); DecimalFormat df = new DecimalFormat("0.00"); - //判断是否登录 + //鍒ゆ柇鏄惁鐧诲綍 String userId = LoginUtil.getUserId(request); - //未登录或无此用户 + //鏈櫥褰曟垨鏃犳鐢ㄦ埛 if(StringUtils.isBlank(userId)) { JsonModel resultModel = new JsonModel(); - resultModel.setJsonModel(ImmutableMap.of("status", "not_login", "msg", "未登录")); + resultModel.setJsonModel(ImmutableMap.of("status", "not_login", "msg", "鏈櫥褰�")); return resultModel; } - //计算出购买接口的总价 - BigDecimal totalCost = new BigDecimal(0);//购买接口的总花费 + //璁$畻鍑鸿喘涔版帴鍙g殑鎬讳环 + BigDecimal totalCost = new BigDecimal(0);//璐拱鎺ュ彛鐨勬�昏姳璐� List apiPurchaseRecords = Lists.newArrayList(); String total_fee, body, subject, notify_url, return_url; String input_charset = AlipayConfig.input_charset; String key = AlipayConfig.alipayKey; String partner = AlipayConfig.alipayPartner; String seller_email = AlipayConfig.alipayEmail; - String out_trade_no = ObjectId.get().toString();//生成订单号 - String service = model.getService();// 快速付款交易服务 - String payment_type = "1";// 支付宝类型.1代表商品购买 - String paymethod = "bankPay";// 赋值:bankPay(网银);cartoon(卡通); + String out_trade_no = ObjectId.get().toString();//鐢熸垚璁㈠崟鍙� + String service = model.getService();// 蹇�熶粯娆句氦鏄撴湇鍔� + String payment_type = "1";// 鏀粯瀹濈被鍨�.1浠h〃鍟嗗搧璐拱 + String paymethod = "bankPay";// 璧嬪��:bankPay(缃戦摱);cartoon(鍗¢��); String defaultbank = model.getDefaultbank(); if("AliPay".equalsIgnoreCase(defaultbank)) { paymethod = ""; @@ -160,7 +160,7 @@ public class RechargeController { BigDecimal price = apiProductService.getPriceBySubcode(entry.getKey()); if (price == null) { JsonModel resultModel = new JsonModel(); - resultModel.setJsonModel(ImmutableMap.of("status", "not_find_product", "msg", "不存在此产品")); + resultModel.setJsonModel(ImmutableMap.of("status", "not_find_product", "msg", "涓嶅瓨鍦ㄦ浜у搧")); return resultModel; } BigDecimal cost = price.multiply(new BigDecimal(1000)).multiply(new BigDecimal(entry.getValue())); @@ -172,8 +172,8 @@ public class RechargeController { apiPurchaseRecords.add(apiPurchaseRecord); } total_fee = df.format(totalCost); - body = "API购买"; - subject = "API购买"; + body = "API璐拱"; + subject = "API璐拱"; notify_url = model.getCityUrl() + "/recharge/buySuccess1"; return_url = model.getCityUrl() + "/recharge/buySuccess";// AlipayConfig.return_url; /*notify_url = "http://local153.fangjia.com:4082/fangjia-coresite/recharge/buySuccess"; @@ -183,9 +183,9 @@ public class RechargeController { model.setNotify_url(notify_url); model.setReturn_url(return_url); } else { - total_fee = df.format(new BigDecimal(model.getPrice())); // 订单总价 - body = "API账户充值"; // 商品描述,推荐格式:商品名称(订单编号:订单编号) - subject = "API账户充值"; // 商品名称 + total_fee = df.format(new BigDecimal(model.getPrice())); // 璁㈠崟鎬讳环 + body = "API璐︽埛鍏呭��"; // 鍟嗗搧鎻忚堪锛屾帹鑽愭牸寮忥細鍟嗗搧鍚嶇О锛堣鍗曠紪鍙凤細璁㈠崟缂栧彿锛� + subject = "API璐︽埛鍏呭��"; // 鍟嗗搧鍚嶇О notify_url = model.getCityUrl() + "/recharge/paySuccess1"; return_url = model.getCityUrl() + "/recharge/paySuccess";// AlipayConfig.return_url; CacheUtils.putValue(CacheUtils.CachePolicyEnum.MIDDLE, RechargeController.class, out_trade_no, System.currentTimeMillis()); @@ -198,7 +198,7 @@ public class RechargeController { ApiUserAccount apiUserAccount = new ApiUserAccount(); apiUserAccount.setUserId(userId); - apiUserAccount.setChangeWay("线上"); + apiUserAccount.setChangeWay("绾夸笂"); apiUserAccount.setChannel(model.getDefaultbank()); apiUserAccount.setOutTradeNo(out_trade_no); apiUserAccount.setStatus("pending"); @@ -212,21 +212,21 @@ public class RechargeController { if (ip.equals("116.247.70.58") || FangjiaConfig.getConfig().isTestEnvironment() || FangjiaConfig.getConfig().isDevelopmentEnvironment()) { total_fee = "0.01"; model.setTotal_fee("0.01"); - model.setPrice("0.01");// 公司测试ip + model.setPrice("0.01");// 鍏徃娴嬭瘯ip } if(NumberUtils.createBigDecimal(total_fee).compareTo(new BigDecimal(0)) <= 0) { if("charge".equalsIgnoreCase(model.getPayUsage())) { - throw new Exception("充值金额不合法"); + throw new Exception("鍏呭�奸噾棰濅笉鍚堟硶"); } else if("buy".equalsIgnoreCase(model.getPayUsage())) { - throw new Exception("未选择需购买的字段"); + throw new Exception("鏈�夋嫨闇�璐拱鐨勫瓧娈�"); } } if(StringUtils.isBlank(defaultbank)) { - throw new Exception("请选择支付渠道"); + throw new Exception("璇烽�夋嫨鏀粯娓犻亾"); } - /*//首先保存记录到数据库,交易状态设置为待支付,回调成功后修改状态为支付成功或失败 - apiUserAccountService.savePendingRecharge(getLoginedUserId(model), total_fee, "线上", defaultbank);*/ + /*//棣栧厛淇濆瓨璁板綍鍒版暟鎹簱锛屼氦鏄撶姸鎬佽缃负寰呮敮浠橈紝鍥炶皟鎴愬姛鍚庝慨鏀圭姸鎬佷负鏀粯鎴愬姛鎴栧け璐� + apiUserAccountService.savePendingRecharge(getLoginedUserId(model), total_fee, "绾夸笂", defaultbank);*/ Map params = new HashMap(); params.put("service", service); @@ -251,18 +251,18 @@ public class RechargeController { params.put("quantity", "1"); } Map sPara = AlipayFunction.ParaFilter(params); - //生成签名结果 + //鐢熸垚绛惧悕缁撴灉 String ItemUrl = Alipayment.CreateUrl(sPara, key); model.setItemUrl(ItemUrl); model.setTotal_fee(total_fee); model.setOut_trade_no(out_trade_no); - //API购买需要入库,并且状态设置为待支付 + //API璐拱闇�瑕佸叆搴擄紝骞朵笖鐘舵�佽缃负寰呮敮浠� if(apiPurchaseRecords != null && apiPurchaseRecords.size() > 0) { Date purchaseDate = new Date(); for (ApiPurchaseRecord apiPurchaseRecord : apiPurchaseRecords) { apiPurchaseRecord.setOrderDate(purchaseDate); - apiPurchaseRecord.setChannel("线上"); + apiPurchaseRecord.setChannel("绾夸笂"); apiPurchaseRecord.setOrderNumber(out_trade_no); apiPurchaseRecord.setUserId(userId); apiPurchaseRecord.setStatus(APIPURCHASE_PENDING); @@ -275,7 +275,7 @@ public class RechargeController { } /** - * 购买接口回调 + * 璐拱鎺ュ彛鍥炶皟 * @param request * @param model * @return @@ -288,11 +288,11 @@ public class RechargeController { for (String key : keys) { sb.append("&"+key+"="+request.getParameter(key)); if (!(key.equals("sign_type") || key.equals("sign"))) { - // 除去sign和sign_type两个参数 + // 闄ゅ幓sign鍜宻ign_type涓や釜鍙傛暟 params_sign.put(key, request.getParameter(key)); } } - LOGGER.info("支付宝回调:" + request.getRequestURL() + "?" + sb.substring(1)); + LOGGER.info("鏀粯瀹濆洖璋冿細" + request.getRequestURL() + "?" + sb.substring(1)); String alipayKey = AlipayConfig.alipayKey; String sign = Alipayment.CreateUrl(params_sign, alipayKey); if (!sign.equals(request.getParameter("sign"))) { @@ -304,15 +304,15 @@ public class RechargeController { return Models.NOT_FOUNT; } - //修改订单状态 + //淇敼璁㈠崟鐘舵�� apiPurchaseRecordService.updateStatusByTradeNo(request.getParameter("out_trade_no"), APIPURCHASE_SUCCESS); List apiPurchaseRecords = apiPurchaseRecordService.findAllByTradeNo(request.getParameter("out_trade_no")); String clientIP = AnalyticsUtil.getIpAddress(request); - //增加api调用次数 + //澧炲姞api璋冪敤娆℃暟 for(ApiPurchaseRecord apiPurchaseRecord : apiPurchaseRecords) { Long apiUserId = createApiUser(apiPurchaseRecord.getUserId(), ""); - //更新次数 + //鏇存柊娆℃暟 apiUserAuthorityService.increaseVisitCount(apiUserId, "/property/transaction", apiPurchaseRecord.getSubServiceCode(), apiPurchaseRecord.getNumber(), new SimpleDateFormat("yyyy").parse("2099")); } @@ -320,15 +320,15 @@ public class RechargeController { } /** - * 创建APIUser - * @param userId 房价网userId - * @param ip 白名单 - * @return 创建的APIUser的id + * 鍒涘缓APIUser + * @param userId 鎴夸环缃憉serId + * @param ip 鐧藉悕鍗� + * @return 鍒涘缓鐨凙PIUser鐨刬d * @throws Exception */ private Long createApiUser(String userId, String ip) throws Exception { Long apiUserId; - //创建或更改API-USER的状态 + //鍒涘缓鎴栨洿鏀笰PI-USER鐨勭姸鎬� FangJiaUser fjuser = fangJiaUserService.getUserById(userId); User old = userService.findByUserId(userId); if(old == null) { @@ -363,7 +363,7 @@ public class RechargeController { } /** - * 充值回调 + * 鍏呭�煎洖璋� * @param request * @param model * @return @@ -376,11 +376,11 @@ public class RechargeController { for (String key : keys) { sb.append("&"+key+"="+request.getParameter(key)); if (!(key.equals("sign_type") || key.equals("sign"))) { - // 除去sign和sign_type两个参数 + // 闄ゅ幓sign鍜宻ign_type涓や釜鍙傛暟 params_sign.put(key, request.getParameter(key)); } } - LOGGER.info("支付宝回调:" + request.getRequestURL() + "?" + sb.substring(1)); + LOGGER.info("鏀粯瀹濆洖璋冿細" + request.getRequestURL() + "?" + sb.substring(1)); String alipayKey = AlipayConfig.alipayKey; String sign = Alipayment.CreateUrl(params_sign, alipayKey); if (!sign.equals(request.getParameter("sign"))) { @@ -404,7 +404,7 @@ public class RechargeController { userId = LoginUtil.getUserId(request); } else { userId = apiUserAccount.getUserId(); - //订单已经支付 + //璁㈠崟宸茬粡鏀粯 if("success".equalsIgnoreCase(apiUserAccount.getStatus())) { return Models.NOT_FOUNT; } @@ -425,7 +425,7 @@ public class RechargeController { apiUserAccountService.updateByUserId(userId, data); FangJiaUser fangjiaUser = fangJiaUserService.getUserById(userId); - //未设置支付密码 + //鏈缃敮浠樺瘑鐮� if(fangjiaUser == null || StringUtils.isBlank(fangjiaUser.getPassword())) { return model.redirect("/api/setPassword"); } @@ -438,30 +438,30 @@ public class RechargeController { public Object buySubmitAction(HttpServletRequest request, RechargeModel model) throws Exception { JsonModel resultModel = new JsonModel(); Map buyProducts = DataUtil.stringToMap(model.getBuyProducts(), ",", "__"); - //1.判断是否登录 + //1.鍒ゆ柇鏄惁鐧诲綍 String userId = LoginUtil.getUserId(request); - //未登录或无此用户 or未创建API用户 - //2.判断是否已经创建api_user,没有则创建 + //鏈櫥褰曟垨鏃犳鐢ㄦ埛 or鏈垱寤篈PI鐢ㄦ埛 + //2.鍒ゆ柇鏄惁宸茬粡鍒涘缓api_user锛屾病鏈夊垯鍒涘缓 FangJiaUser fangjiaUser = fangJiaUserService.getUserById(userId); if(fangjiaUser==null) { resultModel.setJsonModel(ImmutableMap.of("status", "account_not_exists", "msg", Message.ACCOUNT_NOT_EXISTS)); return resultModel; } // User user = userService.findByUserId(userId); - //3.判断支付类型: - // 如果余额支付 - // 判断验证码是否正确、 - // 判断支付密码是否正确、 - // 判断余额是否充足; - // 否则: - // 直接走调用第三方支付接口 + //3.鍒ゆ柇鏀粯绫诲瀷锛� + // 濡傛灉浣欓鏀粯 + // 鍒ゆ柇楠岃瘉鐮佹槸鍚︽纭�� + // 鍒ゆ柇鏀粯瀵嗙爜鏄惁姝g‘銆� + // 鍒ゆ柇浣欓鏄惁鍏呰冻锛� + // 鍚﹀垯锛� + // 鐩存帴璧拌皟鐢ㄧ涓夋柟鏀粯鎺ュ彛 // String orderNumber = ObjectId.get().toString(); // String ip = AnalyticsUtil.getIpAddress(request); - if("1".equals(model.getPayType())) {//payType==1 支付宝 - } else if("2".equals(model.getPayType())) {//payType==2 银行 - } else if("3".equals(model.getPayType())) {//payType==3 余额 - //判断验证码的正确性 + if("1".equals(model.getPayType())) {//payType==1 鏀粯瀹� + } else if("2".equals(model.getPayType())) {//payType==2 閾惰 + } else if("3".equals(model.getPayType())) {//payType==3 浣欓 + //鍒ゆ柇楠岃瘉鐮佺殑姝g‘鎬� String cacheCode = (String) CacheUtils.getValue(UsersInfoService.class, model.getPhone() + "_" + Message.SMS_CODE_TYPE_PAY); if (cacheCode == null) { resultModel.setJsonModel(ImmutableMap.of("status", "not_send", "msg", Message.MOBILE_NOT_SEND_CODE)); @@ -471,26 +471,26 @@ public class RechargeController { resultModel.setJsonModel(ImmutableMap.of("status", "code_error", "msg", Message.CODE_ERROR)); return resultModel; } - //判断支付密码的正确性 + //鍒ゆ柇鏀粯瀵嗙爜鐨勬纭�� String savedPwd = fangjiaUser.getPayPassword(); - //未设置支付密码 + //鏈缃敮浠樺瘑鐮� if (StringUtils.isBlank(savedPwd)) { resultModel.setJsonModel(ImmutableMap.of("status", "no_pay_password", "msg", Message.NOT_SET_PAY_PASSWORD)); return resultModel; } - //支付密码不正确 + //鏀粯瀵嗙爜涓嶆纭� if (!savedPwd.equals(DigestUtils.md5Hex(model.getPassword()))) { resultModel.setJsonModel(ImmutableMap.of("status", "pay_password_error", "msg", Message.PAY_PASSWORD_ERROR)); return resultModel; } - //判断余额 + //鍒ゆ柇浣欓 BigDecimal amount = apiUserAccountService.findAmountByUserId(userId); - BigDecimal totalCost = new BigDecimal(0);//购买接口的总花费 + BigDecimal totalCost = new BigDecimal(0);//璐拱鎺ュ彛鐨勬�昏姳璐� List apiPurchaseRecords = Lists.newArrayList(); for(Map.Entry entry : buyProducts.entrySet()) { BigDecimal price = apiProductService.getPriceBySubcode(entry.getKey()); if(price==null) { - resultModel.setJsonModel(ImmutableMap.of("status", "not_find_product", "msg", "不存在此产品")); + resultModel.setJsonModel(ImmutableMap.of("status", "not_find_product", "msg", "涓嶅瓨鍦ㄦ浜у搧")); return resultModel; } BigDecimal cost = price.multiply(new BigDecimal(1000)).multiply(new BigDecimal(entry.getValue())); @@ -503,39 +503,39 @@ public class RechargeController { apiPurchaseRecords.add(apiPurchaseRecord); } if(amount.compareTo(totalCost) < 0) { - resultModel.setJsonModel(ImmutableMap.of("status", "insufficient_balance", "msg", "余额不足")); + resultModel.setJsonModel(ImmutableMap.of("status", "insufficient_balance", "msg", "浣欓涓嶈冻")); return resultModel; } - //验证完毕,代表购买成功: - //(1)创建ApiUser,有则不创建 + //楠岃瘉瀹屾瘯锛屼唬琛ㄨ喘涔版垚鍔燂細 + //(1)鍒涘缓ApiUser,鏈夊垯涓嶅垱寤� Long apiUserId = createApiUser(userId, ""); - //(2)保存购买记录 + //(2)淇濆瓨璐拱璁板綍 Date apiPurchaseDate = new Date(); for(ApiPurchaseRecord apiPurchaseRecord : apiPurchaseRecords) { - apiPurchaseRecord.setChannel("线上"); + apiPurchaseRecord.setChannel("绾夸笂"); apiPurchaseRecord.setOrderNumber(orderNumber); apiPurchaseRecord.setUserId(userId); apiPurchaseRecord.setStatus(APIPURCHASE_SUCCESS); - apiPurchaseRecord.setBankCode("余额"); + apiPurchaseRecord.setBankCode("浣欓"); apiPurchaseRecord.setOrderDate(apiPurchaseDate); - //增加可调用次数 + //澧炲姞鍙皟鐢ㄦ鏁� apiUserAuthorityService.increaseVisitCount(apiUserId, "/property/transaction", apiPurchaseRecord.getSubServiceCode(), apiPurchaseRecord.getNumber(), new SimpleDateFormat("yyyy").parse("2099")); } apiPurchaseRecordService.save(apiPurchaseRecords); - //记录改动 + //璁板綍鏀瑰姩 ApiUserAccount apiUserAccount = new ApiUserAccount(); apiUserAccount.setUserId(userId); apiUserAccount.setChange(totalCost.multiply(new BigDecimal("-1"))); apiUserAccount.setAmount(amount.subtract(totalCost)); apiUserAccount.setCreateDate(apiPurchaseDate); - apiUserAccount.setChangeWay("线上"); + apiUserAccount.setChangeWay("绾夸笂"); apiUserAccount.setStatus("success"); apiUserAccountService.saveApiUserAccount(apiUserAccount); } - //4.购买成功,调转到购买记录页 - resultModel.setJsonModel(ImmutableMap.of("status", "success", "msg", "操作成功")); + //4.璐拱鎴愬姛锛岃皟杞埌璐拱璁板綍椤� + resultModel.setJsonModel(ImmutableMap.of("status", "success", "msg", "鎿嶄綔鎴愬姛")); return resultModel; } @@ -544,10 +544,10 @@ public class RechargeController { } public Object setPasswordAction(HttpServletRequest req, RechargeModel model) throws Exception { - //判断是否登录 + //鍒ゆ柇鏄惁鐧诲綍 long userId = NumberUtils.toLong(LoginUtil.getUserId(req), -1); JsonModel jsonModel = new JsonModel(); - //未登录或无此用户 + //鏈櫥褰曟垨鏃犳鐢ㄦ埛 if(!"post".equalsIgnoreCase(req.getMethod())) { return model; } @@ -563,10 +563,10 @@ public class RechargeController { } public Object rechargeListAction(HttpServletRequest request, RechargeModel model) throws Exception { - //判断是否登录 + //鍒ゆ柇鏄惁鐧诲綍 String userId = LoginUtil.getUserId(request); FangJiaUser fangJiaUser = fangJiaUserService.getUserById(userId); - //未登录或无此用户 + //鏈櫥褰曟垨鏃犳鐢ㄦ埛 if(fangJiaUser == null) { return model; } @@ -585,10 +585,10 @@ public class RechargeController { } public Object buyListAction(HttpServletRequest request, RechargeModel model) throws Exception { - //判断是否登录 + //鍒ゆ柇鏄惁鐧诲綍 String userId = LoginUtil.getUserId(request); FangJiaUser fangJiaUser = fangJiaUserService.getUserById(userId); - //未登录或无此用户 + //鏈櫥褰曟垨鏃犳鐢ㄦ埛 if(fangJiaUser == null) { return model; } @@ -604,7 +604,7 @@ public class RechargeController { return model; } Map> apiPurchaseRecordMap = Maps.newLinkedHashMap(); - //合并相同订单号的订单 + //鍚堝苟鐩稿悓璁㈠崟鍙风殑璁㈠崟 for(ApiPurchaseRecord apiPurchaseRecord : apiPurchaseRecords) { String orderNumber = apiPurchaseRecord.getOrderNumber(); if(apiPurchaseRecordMap.containsKey(orderNumber)) { @@ -644,10 +644,10 @@ public class RechargeController { } public Object buyList2Action(HttpServletRequest request, RechargeModel model) throws Exception { - //判断是否登录 + //鍒ゆ柇鏄惁鐧诲綍 String userId = LoginUtil.getUserId(request); FangJiaUser fangJiaUser = fangJiaUserService.getUserById(userId); - //未登录或无此用户 + //鏈櫥褰曟垨鏃犳鐢ㄦ埛 if(fangJiaUser == null) { return model; } @@ -663,7 +663,7 @@ public class RechargeController { return model; } Map> apiPurchaseRecordMap = Maps.newLinkedHashMap(); - //合并相同订单号的订单 + //鍚堝苟鐩稿悓璁㈠崟鍙风殑璁㈠崟 for(ApiPurchaseRecord apiPurchaseRecord : apiPurchaseRecords) { String orderNumber = apiPurchaseRecord.getOrderNumber(); if(apiPurchaseRecordMap.containsKey(orderNumber)) { @@ -703,22 +703,22 @@ public class RechargeController { } /** - * 发送短信验证码 + * 鍙戦�佺煭淇¢獙璇佺爜 * @param model * @param resultModel * @return */ public Object sendSmsAction(HttpServletRequest request, RechargeModel model, SendCodeJsonModel resultModel) throws Exception { - //判断是否登录 + //鍒ゆ柇鏄惁鐧诲綍 long userId = NumberUtils.toLong(LoginUtil.getUserId(request), -1); - //未登录或无此用户 + //鏈櫥褰曟垨鏃犳鐢ㄦ埛 if(!isLogined(userId)) { resultModel.setResult(Message.RESULT_FAIL); resultModel.setMsg(Message.NOT_LOGIN); return resultModel; } - //检测支付密码是否正确 + //妫�娴嬫敮浠樺瘑鐮佹槸鍚︽纭� String savedPwd = usersInfoService.getPayPassword(userId); if(StringUtils.isBlank(savedPwd)) { resultModel.setResult(Message.RESULT_FAIL); @@ -732,7 +732,7 @@ public class RechargeController { } Long sendCodeTime = (Long) CacheUtils.getValue(UsersInfoService.class, model.getPhone() + "_" + model.getType() + "_time"); - //验证码一分钟只能发一次 + //楠岃瘉鐮佷竴鍒嗛挓鍙兘鍙戜竴娆� if(sendCodeTime != null) { if(new Date().getTime() - sendCodeTime < 60 * 1000) { resultModel.setResult(Message.RESULT_FAIL); @@ -742,7 +742,7 @@ public class RechargeController { } String code = usersInfoService.randomCode(); try { - smsService.send(model.getPhone(), "【房价网】你的验证码是" + code + ",验证码5分钟内有效,请立即验证。"); + smsService.send(model.getPhone(), "銆愭埧浠风綉銆戜綘鐨勯獙璇佺爜鏄�" + code + ",楠岃瘉鐮�5鍒嗛挓鍐呮湁鏁堬紝璇风珛鍗抽獙璇併��"); resultModel.setResult(Message.RESULT_SUCCESS); CacheUtils.putValue(CacheUtils.CachePolicyEnum.TINY, UsersInfoService.class, model.getPhone() + "_" + model.getType(), code); CacheUtils.putValue(CacheUtils.CachePolicyEnum.SMALL, UsersInfoService.class, model.getPhone() + "_" + model.getType() + "_time", new Date().getTime()); @@ -767,7 +767,7 @@ public class RechargeController { }*/ /** - * 判断是否登录 + * 鍒ゆ柇鏄惁鐧诲綍 * @param userId * @return */ @@ -779,8 +779,8 @@ public class RechargeController { } static class ProductCodeComparator implements Comparator { - public int compare(Object object1, Object object2) {// 实现接口中的方法 - ApiPurchaseRecord p1 = (ApiPurchaseRecord) object1; // 强制转换 + public int compare(Object object1, Object object2) {// 瀹炵幇鎺ュ彛涓殑鏂规硶 + ApiPurchaseRecord p1 = (ApiPurchaseRecord) object1; // 寮哄埗杞崲 ApiPurchaseRecord p2 = (ApiPurchaseRecord) object2; return p1.getSubServiceCode().compareTo(p2.getSubServiceCode()); } diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/RecommendController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/RecommendController.java index 71d7a1863..abf5baa8c 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/RecommendController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/RecommendController.java @@ -35,7 +35,7 @@ public class RecommendController { private CpcService cpcService; /** - * 二手房详情页推荐房源。优先根据搜索引擎关键字搜索;再推荐“看了还看”房源,无数据则用区域内推荐。 + * 浜屾墜鎴胯鎯呴〉鎺ㄨ崘鎴挎簮銆備紭鍏堟牴鎹悳绱㈠紩鎿庡叧閿瓧鎼滅储锛涘啀鎺ㄨ崘鈥滅湅浜嗚繕鐪嬧�濇埧婧愶紝鏃犳暟鎹垯鐢ㄥ尯鍩熷唴鎺ㄨ崘銆� * * @param model * @return @@ -44,7 +44,7 @@ public class RecommendController { model.setViewParam("path", "recommendHouse"); String keyword = model.getKeyword(); - // 搜索引擎过来的,根据关键字搜索 + // 鎼滅储寮曟搸杩囨潵鐨勶紝鏍规嵁鍏抽敭瀛楁悳绱� if (StringUtils.isNotBlank(keyword)) { HouseQueryBean queryBean = new HouseQueryBean(); queryBean.setCity(model.getCityName()); @@ -57,27 +57,27 @@ public class RecommendController { return model; } - // 没有带房源id,则根据区域推荐 + // 娌℃湁甯︽埧婧恑d锛屽垯鏍规嵁鍖哄煙鎺ㄨ崘 if (StringUtils.isBlank(model.getHouseId()) || !ObjectId.isValid(model.getHouseId())) { getSimilarHouseInRegion(model); return model; } - // 该房源没有看了还看数据,则根据区域推荐 + // 璇ユ埧婧愭病鏈夌湅浜嗚繕鐪嬫暟鎹紝鍒欐牴鎹尯鍩熸帹鑽� List ids = recommendService.findCommendIds(model.getHouseId(), 1, model.getCityName()); if (CollectionUtils.isEmpty(ids)) { getSimilarHouseInRegion(model); return model; } - // 看了还看关联的id查不到房源,则根据区域推荐 + // 鐪嬩簡杩樼湅鍏宠仈鐨刬d鏌ヤ笉鍒版埧婧愶紝鍒欐牴鎹尯鍩熸帹鑽� List houseBoList = houseService.findByIds(ids); if (CollectionUtils.isEmpty(houseBoList)) { getSimilarHouseInRegion(model); return model; } - // 按发布时间,取最新的5套关联房源 + // 鎸夊彂甯冩椂闂达紝鍙栨渶鏂扮殑5濂楀叧鑱旀埧婧� houseBoList = sortHouseBo(houseBoList, 6); for (HouseBo bo : houseBoList) { bo.setShowPic(picService.getShowPic(bo.getHouse(), null)); @@ -97,7 +97,7 @@ public class RecommendController { } /** - * 推荐区域内相似房源 + * 鎺ㄨ崘鍖哄煙鍐呯浉浼兼埧婧� * * @param model */ @@ -136,7 +136,7 @@ public class RecommendController { } /** - * 租房详情页推荐房源。优先根据搜索引擎关键字搜索;再推荐“看了还看”房源,无数据则用区域内推荐。 + * 绉熸埧璇︽儏椤垫帹鑽愭埧婧愩�備紭鍏堟牴鎹悳绱㈠紩鎿庡叧閿瓧鎼滅储锛涘啀鎺ㄨ崘鈥滅湅浜嗚繕鐪嬧�濇埧婧愶紝鏃犳暟鎹垯鐢ㄥ尯鍩熷唴鎺ㄨ崘銆� * * @param model * @return @@ -145,7 +145,7 @@ public class RecommendController { model.setViewParam("path", "recommendHouse"); String keyword = model.getKeyword(); - // 搜索引擎过来的,根据关键字搜索 + // 鎼滅储寮曟搸杩囨潵鐨勶紝鏍规嵁鍏抽敭瀛楁悳绱� if (StringUtils.isNotBlank(keyword)) { RentHouseQueryBean queryBean = new RentHouseQueryBean(); queryBean.setCity(model.getCityName()); @@ -158,27 +158,27 @@ public class RecommendController { return model; } - // 没有带房源id,则根据区域推荐 + // 娌℃湁甯︽埧婧恑d锛屽垯鏍规嵁鍖哄煙鎺ㄨ崘 if (StringUtils.isBlank(model.getHouseId()) || !ObjectId.isValid(model.getHouseId())) { getSimilarRentHouseInRegion(model); return model; } - // 该房源没有看了还看数据,则根据区域推荐 + // 璇ユ埧婧愭病鏈夌湅浜嗚繕鐪嬫暟鎹紝鍒欐牴鎹尯鍩熸帹鑽� List ids = recommendService.findCommendIds(model.getHouseId(), 2, model.getCityName()); if (CollectionUtils.isEmpty(ids)) { getSimilarRentHouseInRegion(model); return model; } - // 看了还看关联的id查不到房源,则根据区域推荐 + // 鐪嬩簡杩樼湅鍏宠仈鐨刬d鏌ヤ笉鍒版埧婧愶紝鍒欐牴鎹尯鍩熸帹鑽� List rentHouseBoList = rentHouseService.findByIds(ids); if (CollectionUtils.isEmpty(rentHouseBoList)) { getSimilarRentHouseInRegion(model); return model; } - // 按发布时间,取最新的5套关联房源 + // 鎸夊彂甯冩椂闂达紝鍙栨渶鏂扮殑5濂楀叧鑱旀埧婧� rentHouseBoList = sortRentHouseBo(rentHouseBoList, 6); for (RentHouseBo bo : rentHouseBoList) { bo.setShowPic(picService.getShowPic(bo.getHouse(), null)); @@ -198,7 +198,7 @@ public class RecommendController { } /** - * 推荐区域内相似租房 + * 鎺ㄨ崘鍖哄煙鍐呯浉浼肩鎴� * * @param model */ @@ -238,7 +238,7 @@ public class RecommendController { } /** - * 根据发布日期排序,取前几条记录 + * 鏍规嵁鍙戝竷鏃ユ湡鎺掑簭锛屽彇鍓嶅嚑鏉¤褰� * * @param houseBoList * @param size @@ -254,7 +254,7 @@ public class RecommendController { } /** - * 去除推荐模块房源列表中的当前房源 + * 鍘婚櫎鎺ㄨ崘妯″潡鎴挎簮鍒楄〃涓殑褰撳墠鎴挎簮 * * @param model */ diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/RentHouseController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/RentHouseController.java index 5ced58b35..82ba5ae43 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/RentHouseController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/RentHouseController.java @@ -57,13 +57,13 @@ import com.fangjia.service.web.MenuService; import com.fangjia.service.web.FangjiaInternalLinksUtil.InternalLinksCategoryEnum; /** - * 和出租房相关的controller + * 鍜屽嚭绉熸埧鐩稿叧鐨刢ontroller * * @author liupei */ public class RentHouseController { /** - * 出租信息service + * 鍑虹淇℃伅service */ private RentHouseService rentHouseService; private MenuService menuService; @@ -76,7 +76,7 @@ public class RentHouseController { private IpAddressService ipAddressService; /** - * 显示出租信息详细页 + * 鏄剧ず鍑虹淇℃伅璇︾粏椤� * * @param model * @author liupei @@ -94,9 +94,9 @@ public class RentHouseController { } RentHouseBo houseBo = new RentHouseBo(rent); - // 房源不存在时(物理删除)重定向到列表页,如果从搜索引擎过来,带关键字,否直接重定向 + // 鎴挎簮涓嶅瓨鍦ㄦ椂(鐗╃悊鍒犻櫎)閲嶅畾鍚戝埌鍒楄〃椤碉紝濡傛灉浠庢悳绱㈠紩鎿庤繃鏉ワ紝甯﹀叧閿瓧锛屽惁鐩存帴閲嶅畾鍚� if (rent == null || StringUtils.isBlank(rent.getCity())) { - StringBuilder re_url = new StringBuilder();// 重定向的url + StringBuilder re_url = new StringBuilder();// 閲嶅畾鍚戠殑url re_url.append("/rentHouseSearch/list?notfound=1"); String keyword = model.getSearchEngineKeyword(); if (StringUtils.isNotEmpty(keyword)) { @@ -164,19 +164,19 @@ public class RentHouseController { model.setRegion(rent.getRegion()); model.setHouseBo(formatHouseBo(houseBo)); - // 链家 为站外跳转 用自己的400号码 + // 閾惧 涓虹珯澶栬烦杞� 鐢ㄨ嚜宸辩殑400鍙风爜 if (StringUtils.isNotBlank(rent.getMobile()) && !rent.getMobile().trim().startsWith("400")) { rent.setMobile(PhoneNormalizer.normalizeContactPhone(ServerAreaData.getServerAreaByDisplay(rent.getCity()), false, rent.getMobile())); } else if (StringUtils.isNotBlank(rent.getMobile())) { - // 租房去掉400 + // 绉熸埧鍘绘帀400 // houseBo.setPhone400(PhoneNormalizer.normalizeContact400Phone(rent.getMobile())); } int overdays = 21; CpcBo cpcBo = cpcService.checkCpcUserEnable(rent); if (null != cpcBo) { model.setCpcBo(cpcBo); - // 租房去掉400 + // 绉熸埧鍘绘帀400 // if ((cpcBo.getEnabled400() && // StringUtils.isNotBlank(rent.getMobile()))) { // if (!rent.getMobile().trim().startsWith("400")) { @@ -186,7 +186,7 @@ public class RentHouseController { // } // } } - // 租房去掉400 + // 绉熸埧鍘绘帀400 // if (!needMap400 && StringUtils.isEmpty(houseBo.getPhone400())) { // Setting400 setting400 = // setting400Service.findSetting400ByCityAndCategory(rent.getCity(), @@ -205,7 +205,7 @@ public class RentHouseController { // PpcMapCategoryEnum.RENT_HOUSE, rent.getId(), rent.getMobile()); // houseBo.setPhone400(phone400); // } - // 房子的状态不为0或者发布时间超过一个星期,房源过期,页面显示类似房源链接 + // 鎴垮瓙鐨勭姸鎬佷笉涓�0鎴栬�呭彂甯冩椂闂磋秴杩囦竴涓槦鏈燂紝鎴挎簮杩囨湡锛岄〉闈㈡樉绀虹被浼兼埧婧愰摼鎺� if (0 != rent.getStatus() || rent.getPublishDate().before(DateUtil.getBeforeDay(new Date(), overdays))) { model.setOverdate(rent.getPublishDate().before(DateUtil.getBeforeDay(new Date(), overdays))); model.setOverDays((int) DateUtil.between(new Date(), rent.getPublishDate(), Calendar.DATE)); @@ -216,10 +216,10 @@ public class RentHouseController { houseBo.setTotalPriceRange(menuService.getRange(ServerAreaData.getServerAreaByDisplay(rent.getCity()), MenuCategoryEnum.zufang, "totalPriceRange", rent.getTotalPrice())); - // 房源被逻辑删除时,重定向到列表页,带入参数和上面一致 + // 鎴挎簮琚�昏緫鍒犻櫎鏃讹紝閲嶅畾鍚戝埌鍒楄〃椤碉紝甯﹀叆鍙傛暟鍜屼笂闈竴鑷� if (0 != rent.getStatus() || (model.isOverdate() && model.getOverDays() > overdays + 7)) { String keyword = model.getSearchEngineKeyword(); - StringBuilder re_url = new StringBuilder("/rentHouseSearch/list?");// 重定向的url + StringBuilder re_url = new StringBuilder("/rentHouseSearch/list?");// 閲嶅畾鍚戠殑url if (StringUtils.isEmpty(keyword)) { re_url.append("totalPriceRange="); re_url.append(menuService.getRange(ServerAreaData.getServerAreaByDisplay(rent.getCity()), @@ -244,12 +244,12 @@ public class RentHouseController { // model.getId()); // model.setUserFeeling(userFeeling); - // 底部区域推荐 + // 搴曢儴鍖哄煙鎺ㄨ崘 /*ServerArea serverArea = FangjiaServerAreaContextHolder.getServerAreaDefault(); List autoRegionRecommends = menuService.getRegionsByCity(serverArea, MenuCategoryEnum.zufang); model.setAutoRegionRecommends(limit(autoRegionRecommends));*/ - // 底部热门推荐的其他城市 + // 搴曢儴鐑棬鎺ㄨ崘鐨勫叾浠栧煄甯� /*List footerCitys = new ArrayList(10); List cityNames = ServerAreaData.getServerAreaDisplayList(10); for (String name : cityNames) { @@ -260,32 +260,32 @@ public class RentHouseController { } /** - * 按时间做Seed获取的随机筛选的区域信息 + * 鎸夋椂闂村仛Seed鑾峰彇鐨勯殢鏈虹瓫閫夌殑鍖哄煙淇℃伅 * - * @param 区域菜单信息 - * @return 随机筛选的区域信息 + * @param 鍖哄煙鑿滃崟淇℃伅 + * @return 闅忔満绛涢�夌殑鍖哄煙淇℃伅 */ private List limit(List items) { - int needCount = 9;// 获取的数据个数10个 + int needCount = 9;// 鑾峰彇鐨勬暟鎹釜鏁�10涓� - int changeDay = 20;// 设置更新频率为20天 + int changeDay = 20;// 璁剧疆鏇存柊棰戠巼涓�20澶� - int currentCount = items.size();// 当前获取的Region总数 + int currentCount = items.size();// 褰撳墠鑾峰彇鐨凴egion鎬绘暟 if (currentCount <= needCount) return items; Calendar oldTime = Calendar.getInstance(); - oldTime.set(2011, 8, 1);// 设定初始化时间为2011年09月01日 + oldTime.set(2011, 8, 1);// 璁惧畾鍒濆鍖栨椂闂翠负2011骞�09鏈�01鏃� Calendar newTime = Calendar.getInstance(); - int reduceDay = SimRandom.getReduceDay(newTime, oldTime);// 获取日期与初始日期相差天数 + int reduceDay = SimRandom.getReduceDay(newTime, oldTime);// 鑾峰彇鏃ユ湡涓庡垵濮嬫棩鏈熺浉宸ぉ鏁� - int seed = (int) reduceDay / changeDay;// 计算simRandom变化频率 + int seed = (int) reduceDay / changeDay;// 璁$畻simRandom鍙樺寲棰戠巼 - List simIndexs = SimRandom.getSimRandom(seed, currentCount, needCount);// 获取随机Index + List simIndexs = SimRandom.getSimRandom(seed, currentCount, needCount);// 鑾峰彇闅忔満Index List limitedRegions = new ArrayList(needCount); for (int index : simIndexs) { @@ -295,7 +295,7 @@ public class RentHouseController { } /** - * 显示同小区相似房源,需要除掉当前这套房源 不足5套时去掉面积参数 + * 鏄剧ず鍚屽皬鍖虹浉浼兼埧婧�,闇�瑕侀櫎鎺夊綋鍓嶈繖濂楁埧婧� 涓嶈冻5濂楁椂鍘绘帀闈㈢Н鍙傛暟 * * @param model * @author @@ -349,7 +349,7 @@ public class RentHouseController { } /** - * 显示同区域相同房源,需要去掉当前房源的小区 不足5套时去掉面积参数 + * 鏄剧ず鍚屽尯鍩熺浉鍚屾埧婧愶紝闇�瑕佸幓鎺夊綋鍓嶆埧婧愮殑灏忓尯 涓嶈冻5濂楁椂鍘绘帀闈㈢Н鍙傛暟 * * @param model * @author @@ -388,7 +388,7 @@ public class RentHouseController { } /** - * 根据关键字推荐房源 取 4 条 + * 鏍规嵁鍏抽敭瀛楁帹鑽愭埧婧� 鍙� 4 鏉� * * @param model * @return @@ -402,7 +402,7 @@ public class RentHouseController { queryBean.setKeyword(keyword); Pager pager = new Pager(); pager.setPageSize(4); - // 站内搜推荐关键词相关全国房源 + // 绔欏唴鎼滄帹鑽愬叧閿瘝鐩稿叧鍏ㄥ浗鎴挎簮 if (StringUtils.isNotBlank(model.getRecommendCityType()) && model.getRecommendCityType().equals("ALL")) { FacetQueryResult houseBoList = rentHouseService.findByQueryBean(pager, queryBean); for (RentHouseBo houseBo : houseBoList) { @@ -434,7 +434,7 @@ public class RentHouseController { } /** - * 获取房源的推荐城市 + * 鑾峰彇鎴挎簮鐨勬帹鑽愬煄甯� * * @param request * @return @@ -444,7 +444,7 @@ public class RentHouseController { ServerArea suggestCity = ipAddressService.locationByIp(ip, null); ; if (null == suggestCity) { - // 无结果,从cookie取 + // 鏃犵粨鏋滐紝浠巆ookie鍙� CoresiteCookieContext cookieContext = CoresiteCookieContext.getInstance(); suggestCity = ServerAreaData.getServerAreaByNameOrSpellDefaultNull(cookieContext.getCookieValue(request, CookieName.COOKIE_CITY)); @@ -453,7 +453,7 @@ public class RentHouseController { } /** - * 去除房源中的空字符串图片链接 + * 鍘婚櫎鎴挎簮涓殑绌哄瓧绗︿覆鍥剧墖閾炬帴 * * @param bo * @return @@ -494,7 +494,7 @@ public class RentHouseController { /*** * - * 由house取得小区信息* + * 鐢県ouse鍙栧緱灏忓尯淇℃伅* * * * * */ diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/RentHouseReportController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/RentHouseReportController.java index 19507dc86..5e929a107 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/RentHouseReportController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/RentHouseReportController.java @@ -53,9 +53,9 @@ public class RentHouseReportController { private DistrictService districtService; private DistrictHousetypeService districtHousetypeService; - /**出租报告-首页*/ + /**鍑虹鎶ュ憡-棣栭〉*/ public Object rentAction(HouseReportModel model){ - model.setReportTitle("出租报告"); + model.setReportTitle("鍑虹鎶ュ憡"); if(StringUtils.isNotBlank(model.getEid())){ Evaluation evaluation = evaluationService.findEvaluationById(model.getEid()); model.setEvaluation(evaluation); @@ -75,7 +75,7 @@ public class RentHouseReportController { return model; } - /**租金回报率*/ + /**绉熼噾鍥炴姤鐜�*/ public Object loadRentRateAction(HouseReportModel model){ JsonModel jsonRet = new JsonModel(); @@ -87,16 +87,16 @@ public class RentHouseReportController { return jsonRet; } - /**租金同比*/ + /**绉熼噾鍚屾瘮*/ public Object loadRentYoyAction(HouseReportModel model){ JsonModel jsonRet = new JsonModel(); - //上个月 + //涓婁釜鏈� Date lastMonth = DateUtil.getLastDayOfMonth(new Date(), -1); String lastMonthStr = DateUtil.formatByPattern(lastMonth, "yyyy-MM-dd"); SqmetreRent sqmetreRent1 = sqmetreRentService.findNearestSqmetreRent(model.getCityName(), model.getRegion(), model.getDistrictName(), lastMonthStr, "district"); - //去年 + //鍘诲勾 Date lastYearMonth = DateUtil.getLastDayOfMonth(new Date(), -13); String lastYearMonthStr = DateUtil.formatByPattern(lastYearMonth, "yyyy-MM-dd"); SqmetreRent sqmetreRent2 = sqmetreRentService.findNearestSqmetreRent(model.getCityName(), model.getRegion(), model.getDistrictName(), lastYearMonthStr, "district"); @@ -121,22 +121,22 @@ public class RentHouseReportController { } - /**租金走势*/ + /**绉熼噾璧板娍*/ public Object loadRentTrendAction(HouseReportModel model){ int week = 3; - int type = 0; //月份 + int type = 0; //鏈堜唤 JsonModel jsonRet = new JsonModel(); - if(model.getType() == 1){ //季度 + if(model.getType() == 1){ //瀛e害 week = 3; type = -3; - }else if(model.getType() == 2){ //半年 + }else if(model.getType() == 2){ //鍗婂勾 week = 6; type = -6; - }else if(model.getType() == 3){ //一年 + }else if(model.getType() == 3){ //涓�骞� week = 12; type = -12; - }else if(model.getType() == 4){ //两年 + }else if(model.getType() == 4){ //涓ゅ勾 week = 24; type = -24; } @@ -168,9 +168,9 @@ public class RentHouseReportController { } District district = districtService.findDistrict(districtKey,"district"); - String estateType = "小区"; - if(null != district && district.getEstateType2().contains("别墅")){ - estateType = "别墅"; + String estateType = "灏忓尯"; + if(null != district && district.getEstateType2().contains("鍒")){ + estateType = "鍒"; } List rentBos = districtStatRentService.findDistrictStatRentsByParams(model.getCityName(), model.getRegion(), model.getDistrictName(), model.getRoom(), dates.get(0), null, null, null, 0, week, false); Map distMap = null; @@ -196,7 +196,7 @@ public class RentHouseReportController { } - /**租房挂牌房源*/ + /**绉熸埧鎸傜墝鎴挎簮*/ public Object loadHousesAction(HouseReportModel model){ JsonModel jsonRet = new JsonModel(); @@ -212,7 +212,7 @@ public class RentHouseReportController { } - /**租房挂牌房源-列表*/ + /**绉熸埧鎸傜墝鎴挎簮-鍒楄〃*/ public Object housesAction(HouseReportModel model){ if(StringUtils.isNotBlank(model.getEid())){ Evaluation evaluation = evaluationService.findEvaluationById(model.getEid()); @@ -228,14 +228,14 @@ public class RentHouseReportController { return model; } - /**加载小区的室*/ + /**鍔犺浇灏忓尯鐨勫*/ public Object loadRoomsAction(HouseReportModel model){ JsonModel jsonRet = new JsonModel(); DistrictKey districtKey = new DistrictKey(model.getCityName(), model.getRegion(), model.getDistrictName()); District district = districtService.findDistrict(districtKey,"district"); - String estateType = "小区"; - if(null != district && district.getEstateType2().contains("别墅")){ - estateType = "别墅"; + String estateType = "灏忓尯"; + if(null != district && district.getEstateType2().contains("鍒")){ + estateType = "鍒"; } List bos = districtStatRentService.findByDistrictStatRent(districtKey); diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/RentHouseSearchController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/RentHouseSearchController.java index a3d3a5e04..e4bb2a09d 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/RentHouseSearchController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/RentHouseSearchController.java @@ -107,10 +107,10 @@ public class RentHouseSearchController { throws Exception { if (CollectionUtils.isNotEmpty(result)) { FacetQueryResult houseBoList = new FacetQueryResult(); - // 暂停CPC逻辑 + // 鏆傚仠CPC閫昏緫 // cpcService.checkCpcUserEnable(result); - // 增加最后的CPC房源 13/01/09 + // 澧炲姞鏈�鍚庣殑CPC鎴挎簮 13/01/09 addCpcHouse(result, model); for (RentHouseBo houseBo : result) { @@ -155,7 +155,7 @@ public class RentHouseSearchController { } /** - * 起始位置比总数大,说明当前页数不对,从第一页开始 + * 璧峰浣嶇疆姣旀�绘暟澶э紝璇存槑褰撳墠椤垫暟涓嶅锛屼粠绗竴椤靛紑濮� * * @param maxRow * @param pager @@ -170,7 +170,7 @@ public class RentHouseSearchController { } /** - * 出租信息列表页 + * 鍑虹淇℃伅鍒楄〃椤� * * @param model * @param request @@ -191,7 +191,7 @@ public class RentHouseSearchController { pager.setMaxPage(FangjiaConfig.getConfig().getSearchListMaxPageNo()); } - // 菜单类型,如果城市不支持地铁,或地铁参数不对,则默认用区域菜单 + // 鑿滃崟绫诲瀷锛屽鏋滃煄甯備笉鏀寔鍦伴搧锛屾垨鍦伴搧鍙傛暟涓嶅锛屽垯榛樿鐢ㄥ尯鍩熻彍鍗� Integer menuType = model.getMenuType(); if (!FangjiaServerAreaContextHolder.getServerAreaDefault().isSupportMetro() || null == menuType || menuType > 2 || menuType < 0) { @@ -215,9 +215,9 @@ public class RentHouseSearchController { } // String similarInfo = ""; - boolean facetByRegion = false;// 是否按区域,板块分面 - // 有经纬度的相似房源查询 - // if (StringUtils.isNotBlank(model.getSimilarInfo())) {// 从菜单获取得相似信息 + boolean facetByRegion = false;// 鏄惁鎸夊尯鍩燂紝鏉垮潡鍒嗛潰 + // 鏈夌粡绾害鐨勭浉浼兼埧婧愭煡璇� + // if (StringUtils.isNotBlank(model.getSimilarInfo())) {// 浠庤彍鍗曡幏鍙栧緱鐩镐技淇℃伅 // facetByRegion = true; // queryBean = getQueryBySimilarInfo(model, similarInfo); // } @@ -230,12 +230,12 @@ public class RentHouseSearchController { Menu menu = menuService.menuMaker(FangjiaServerAreaContextHolder.getServerAreaDefault(), MenuCategoryEnum.zufang, getCurrentParams(), 0);// getCurrentParams(); - // 如果获取得出租小区无经纬度 或 选择菜单查找,则按以前的方式查找相似房源 - if (queryBean == null) {// 普通查询 + // 濡傛灉鑾峰彇寰楀嚭绉熷皬鍖烘棤缁忕含搴� 鎴� 閫夋嫨鑿滃崟鏌ユ壘锛屽垯鎸変互鍓嶇殑鏂瑰紡鏌ユ壘鐩镐技鎴挎簮 + if (queryBean == null) {// 鏅�氭煡璇� queryBean = this.buildHouseQueryBean(model); } - // 老网站的URL中区域是带“区”的 + // 鑰佺綉绔欑殑URL涓尯鍩熸槸甯︹�滃尯鈥濈殑 if (StringUtils.isNotBlank(queryBean.getRegion())) { List gList = menu.getGroupList(); for (Group g : gList) { @@ -257,7 +257,7 @@ public class RentHouseSearchController { FacetQueryResult result = null; Sort sort = getSort(model); if (sort == null) { - // 如果是学区房检索 + // 濡傛灉鏄鍖烘埧妫�绱� if (null != model.getIfSchool()) { result = schoolRentHouseSearch(model, pager, menu, queryBean, null, false, facetByRegion); } else { @@ -298,7 +298,7 @@ public class RentHouseSearchController { metroService.signMetroRentHouse(result); } } - setSimilarInfoToList(result);// 处理类似房源信息 + setSimilarInfoToList(result);// 澶勭悊绫讳技鎴挎簮淇℃伅 model.setMenu(menu); List conditions = menuService.getConditions(FangjiaServerAreaContextHolder.getServerAreaDefault(), @@ -314,21 +314,21 @@ public class RentHouseSearchController { model.setConditionItems(conditionItems); /** - * gasm统计 + * gasm缁熻 */ model.addGaMap(Gakey.rc, pager.getTotalRows()); /** - * 租房列表页底部SEO推荐区域 + * 绉熸埧鍒楄〃椤靛簳閮⊿EO鎺ㄨ崘鍖哄煙 */ ServerArea serverArea = FangjiaServerAreaContextHolder.getServerAreaDefault(); List autoRegionRecommends = menuService.getRegionsByCity(serverArea, MenuCategoryEnum.zufang); model.setAutoRegionRecommends(limit(autoRegionRecommends)); - // 自定义面积、价格范围搜索 + // 鑷畾涔夐潰绉�佷环鏍艰寖鍥存悳绱� processUserConditions(model); - // 搜索无结果时,根据关键字推荐其他城市的小区 + // 鎼滅储鏃犵粨鏋滄椂锛屾牴鎹叧閿瓧鎺ㄨ崘鍏朵粬鍩庡競鐨勫皬鍖� if (pager.getTotalRows() == 0 && StringUtils.isNotBlank(model.getKeyword())) { Map konwbase = knowbaseService.parseWord(model.getKeyword()); List> districts = (null != konwbase && null != konwbase.get("district_name")) ? (List>) konwbase @@ -369,7 +369,7 @@ public class RentHouseSearchController { model.setOtherCityDistrictList(otherCitiesDistrict); } - // 底部热门推荐的其他城市 + // 搴曢儴鐑棬鎺ㄨ崘鐨勫叾浠栧煄甯� List footerCitys = new ArrayList(10); List cityNames = ServerAreaData.getServerAreaDisplayList(10); for (String name : cityNames) { @@ -387,10 +387,10 @@ public class RentHouseSearchController { List extraBoList; Pager pager = new Pager(3); - if ("三亚".equals(cityDisplay)) { - extraBoList = getExtraHouses("德佑地产", cityDisplay, true, pager); - } else if ("厦门".equals(cityDisplay)) { - extraBoList = getExtraHouses("黄金屋", cityDisplay, true, pager); + if ("涓変簹".equals(cityDisplay)) { + extraBoList = getExtraHouses("寰蜂綉鍦颁骇", cityDisplay, true, pager); + } else if ("鍘﹂棬".equals(cityDisplay)) { + extraBoList = getExtraHouses("榛勯噾灞�", cityDisplay, true, pager); } else { extraBoList = getExtraHouses("firstvilla.com.cn", cityDisplay, false, pager); } @@ -451,7 +451,7 @@ public class RentHouseSearchController { if ("rentPrice".equalsIgnoreCase(sortField)) { sortField = "totalPrice"; } - if ("totalPrice".equals(sortField) || "area".equals(sortField) || "bscore".equals(sortField)) { // TODO:启用bscore作为默认排序后,去除此处的bscore + if ("totalPrice".equals(sortField) || "area".equals(sortField) || "bscore".equals(sortField)) { // TODO:鍚敤bscore浣滀负榛樿鎺掑簭鍚庯紝鍘婚櫎姝ゅ鐨刡score } else { sortField = null; @@ -463,7 +463,7 @@ public class RentHouseSearchController { } /** - * 处理列表上方的筛选条件 + * 澶勭悊鍒楄〃涓婃柟鐨勭瓫閫夋潯浠� * * @param model */ @@ -500,11 +500,11 @@ public class RentHouseSearchController { String cancelPrice = ""; if (null != model.getMinPrice() && null != model.getMaxPrice()) { - cancelPrice = model.getMinPrice() + "-" + model.getMaxPrice() + "元"; + cancelPrice = model.getMinPrice() + "-" + model.getMaxPrice() + "鍏�"; } else if (null != model.getMinPrice()) { - cancelPrice = model.getMinPrice() + "元以上"; + cancelPrice = model.getMinPrice() + "鍏冧互涓�"; } else if (null != model.getMaxPrice()) { - cancelPrice = model.getMaxPrice() + "元以下"; + cancelPrice = model.getMaxPrice() + "鍏冧互涓�"; } if (StringUtils.isNotBlank(cancelPrice)) { @@ -539,11 +539,11 @@ public class RentHouseSearchController { String cancelArea = ""; if (null != model.getMinArea() && null != model.getMaxArea()) { - cancelArea = model.getMinArea() + "-" + model.getMaxArea() + "平米"; + cancelArea = model.getMinArea() + "-" + model.getMaxArea() + "骞崇背"; } else if (null != model.getMinArea()) { - cancelArea = model.getMinArea() + "平米以上"; + cancelArea = model.getMinArea() + "骞崇背浠ヤ笂"; } else if (null != model.getMaxArea()) { - cancelArea = model.getMaxArea() + "平米以下"; + cancelArea = model.getMaxArea() + "骞崇背浠ヤ笅"; } if (StringUtils.isNotBlank(cancelArea)) { @@ -556,13 +556,13 @@ public class RentHouseSearchController { } if (null != model.getIfSchool() && model.getIfSchool() == 1 && (null == model.getMenuType() || model.getMenuType() != 3)) { - cons.add("学区房"); - consMap.add(new Item("1", "学区房", new Group("ifSchool"))); + cons.add("瀛﹀尯鎴�"); + consMap.add(new Item("1", "瀛﹀尯鎴�", new Group("ifSchool"))); } if (null != model.getIfMetro() && model.getIfMetro() == 1 && (null == model.getMenuType() || model.getMenuType() != 2)) { - cons.add("地铁房"); - consMap.add(new Item("1", "地铁房", new Group("ifMetro"))); + cons.add("鍦伴搧鎴�"); + consMap.add(new Item("1", "鍦伴搧鎴�", new Group("ifMetro"))); } model.setConditions(cons); @@ -570,24 +570,24 @@ public class RentHouseSearchController { } /** - * 给有经纬度的房源的similarInfo赋值 + * 缁欐湁缁忕含搴︾殑鎴挎簮鐨剆imilarInfo璧嬪�� * * @param houseBoResult */ private void setSimilarInfoToList(FacetQueryResult rentHouseBoResult) { for (RentHouseBo rentHouseBo : rentHouseBoResult) { if (null != rentHouseBo.getDistrict()) { - // "黄浦区_上海康城_2室_98平米_126万_相似房源" + // "榛勬郸鍖篲涓婃捣搴峰煄_2瀹98骞崇背_126涓嘷鐩镐技鎴挎簮" String districtName = rentHouseBo.getDistrictName(); - // 去掉小区的高亮字符,eg:上海康城 + // 鍘绘帀灏忓尯鐨勯珮浜瓧绗︼紝eg:涓婃捣搴峰煄 if (districtName.contains("") || districtName.contains("")) { districtName = districtName.substring(18, districtName.length() - 7); } int area = rentHouseBo.getHouse().getArea() == null ? 0 : (int) ((double) rentHouseBo.getHouse().getArea()); - String similarInfo = rentHouseBo.getRegion() + "区_" + districtName + "_" + rentHouseBo.getHouse().getRoom() - + "室_" + area + "平米_月租" + rentHouseBo.getHouse().getTotalPrice() + "元_类似房源"; + String similarInfo = rentHouseBo.getRegion() + "鍖篲" + districtName + "_" + rentHouseBo.getHouse().getRoom() + + "瀹" + area + "骞崇背_鏈堢" + rentHouseBo.getHouse().getTotalPrice() + "鍏僟绫讳技鎴挎簮"; rentHouseBo.setSimilarInfo(similarInfo); } @@ -598,11 +598,11 @@ public class RentHouseSearchController { RentHouseQueryBean queryBean, String sortField, boolean asc, boolean facetByRegion) { /***** schoolQueryResult **********************************************/ FacetQueryResult result = new FacetQueryResult(); - // 输入的关键字 + // 杈撳叆鐨勫叧閿瓧 // if (StringUtils.isNotBlank(queryBean.getSchool())) { result = rentHouseService.findWithFacetSearch(menu, pager, queryBean, sortField, asc, facetByRegion); // } else { - // // 不分面 + // // 涓嶅垎闈� // result = rentHouseService.findByQueryBeanSort(pager, queryBean, // sortField, asc); // } @@ -621,7 +621,7 @@ public class RentHouseSearchController { queryBean.setFullTextSearch(true); /** - * 如果是命名查询 + * 濡傛灉鏄懡鍚嶆煡璇� */ if (StringUtils.isNotBlank(model.getCustomQuery())) { Customquery customquery = customqueryService.findByName(model.getCustomQuery()); @@ -682,32 +682,32 @@ public class RentHouseSearchController { } /** - * 按时间做Seed获取的随机筛选的区域信息 + * 鎸夋椂闂村仛Seed鑾峰彇鐨勯殢鏈虹瓫閫夌殑鍖哄煙淇℃伅 * - * @param 区域菜单信息 - * @return 随机筛选的区域信息 + * @param 鍖哄煙鑿滃崟淇℃伅 + * @return 闅忔満绛涢�夌殑鍖哄煙淇℃伅 */ private List limit(List items) { - int needCount = 9;// 获取的数据个数10个 + int needCount = 9;// 鑾峰彇鐨勬暟鎹釜鏁�10涓� - int changeDay = 20;// 设置更新频率为20天 + int changeDay = 20;// 璁剧疆鏇存柊棰戠巼涓�20澶� - int currentCount = items.size();// 当前获取的Region总数 + int currentCount = items.size();// 褰撳墠鑾峰彇鐨凴egion鎬绘暟 if (currentCount <= needCount) return items; Calendar oldTime = Calendar.getInstance(); - oldTime.set(2011, 8, 1);// 设定初始化时间为2011年09月01日 + oldTime.set(2011, 8, 1);// 璁惧畾鍒濆鍖栨椂闂翠负2011骞�09鏈�01鏃� Calendar newTime = Calendar.getInstance(); - int reduceDay = SimRandom.getReduceDay(newTime, oldTime);// 获取日期与初始日期相差天数 + int reduceDay = SimRandom.getReduceDay(newTime, oldTime);// 鑾峰彇鏃ユ湡涓庡垵濮嬫棩鏈熺浉宸ぉ鏁� - int seed = (int) reduceDay / changeDay;// 计算simRandom变化频率 + int seed = (int) reduceDay / changeDay;// 璁$畻simRandom鍙樺寲棰戠巼 - List simIndexs = SimRandom.getSimRandom(seed, currentCount, needCount);// 获取随机Index + List simIndexs = SimRandom.getSimRandom(seed, currentCount, needCount);// 鑾峰彇闅忔満Index List limitedRegions = new ArrayList(needCount); for (int index : simIndexs) { @@ -722,7 +722,7 @@ public class RentHouseSearchController { // Pager pager = new Pager(10); // FacetQueryResult result = null; // - // // 如果默认搜索为空,解析关键字。如关键字中带小区,则搜索周边3公里内房源;否则拆解关键字再进行搜索。 + // // 濡傛灉榛樿鎼滅储涓虹┖锛岃В鏋愬叧閿瓧銆傚鍏抽敭瀛椾腑甯﹀皬鍖猴紝鍒欐悳绱㈠懆杈�3鍏噷鍐呮埧婧愶紱鍚﹀垯鎷嗚В鍏抽敭瀛楀啀杩涜鎼滅储銆� // Map konwbase = // knowbaseService.parseWord(model.getKeyword()); // List> districts = (null != konwbase && null != @@ -756,10 +756,10 @@ public class RentHouseSearchController { // queryBean.setKeyword(model.getKeyword()); // queryBean.setCity(((ServerArea) // FangjiaServerAreaContextHolder.getServerAreaDefault()).getDisplay()); - // queryBean.setFullTextSearch(true); // 为true,搜索时自动拆分关键字 + // queryBean.setFullTextSearch(true); // 涓簍rue锛屾悳绱㈡椂鑷姩鎷嗗垎鍏抽敭瀛� // result = rentHouseService.findByQueryBean(pager, queryBean); // } else { - // int radius = 3;// 周边三公里 + // int radius = 3;// 鍛ㄨ竟涓夊叕閲� // long lnn = (district.getLng() - (radius * 100000000)); // long lnx = (district.getLng() + (radius * 100000000)); // long lan = (district.getLat() - (radius * 100000000)); @@ -775,7 +775,7 @@ public class RentHouseSearchController { // result = rentHouseService.findByQueryBean(pager, queryBean); // } // - // // 默认列表 + // // 榛樿鍒楄〃 // if (CollectionUtils.isEmpty(result)) { // RentHouseQueryBean queryBean = new RentHouseQueryBean(); // queryBean.setCity(((ServerArea) @@ -840,7 +840,7 @@ public class RentHouseSearchController { } // /** - // * 按房源相似信息获取QueryBean + // * 鎸夋埧婧愮浉浼间俊鎭幏鍙朡ueryBean // * // * @param queryBean // * @param model @@ -859,7 +859,7 @@ public class RentHouseSearchController { // } // if (StringUtils.isNotBlank(similarInfoStr[1]) && // similarInfoStr[1].length() > 0) { - // model.setDistrictName(similarInfoStr[1]);// 这里把小区名放进去了,后面要从model中去掉 + // model.setDistrictName(similarInfoStr[1]);// 杩欓噷鎶婂皬鍖哄悕鏀捐繘鍘讳簡锛屽悗闈㈣浠巑odel涓幓鎺� // } // // String room = similarInfoStr[2].substring(0, similarInfoStr[2].length() - @@ -895,17 +895,17 @@ public class RentHouseSearchController { // queryBean.setRegion(region); // } // - // if (null != model.getRegion()) { // 如果是重新选择了区域,板块,则在经纬度基础上加 区域,板块 - // // 的条件 + // if (null != model.getRegion()) { // 濡傛灉鏄噸鏂伴�夋嫨浜嗗尯鍩燂紝鏉垮潡锛屽垯鍦ㄧ粡绾害鍩虹涓婂姞 鍖哄煙锛屾澘鍧� + // // 鐨勬潯浠� // queryBean.setRegion(model.getRegion()); // if (null != model.getBlock()) { // queryBean.setBlock(model.getBlock()); // } // } else { - // model.setRegion(region);// 按区域分面 + // model.setRegion(region);// 鎸夊尯鍩熷垎闈� // } // - // // 装修,类型,标签 + // // 瑁呬慨锛岀被鍨嬶紝鏍囩 // if (null != model.getFitment()) { // queryBean.setFitment(model.getFitment()); // } @@ -915,7 +915,7 @@ public class RentHouseSearchController { // if (null != model.getHouseTag()) { // queryBean.setHouseTag(model.getHouseTag()); // } - // // 去掉小区 + // // 鍘绘帀灏忓尯 // if (null != model.getDistrictName()) { // model.setDistrictName(null); // } @@ -927,7 +927,7 @@ public class RentHouseSearchController { // } /** - * 地铁房Query + * 鍦伴搧鎴縌uery * * @param model * @return @@ -938,23 +938,23 @@ public class RentHouseSearchController { } /** - * 构建 HouseQueryBean 来检索 条件:有经纬度的,周边五公里以内,面积 价格 相差10%,同室数,从近到远排序。没有经纬度就按原先规则 + * 鏋勫缓 HouseQueryBean 鏉ユ绱� 鏉′欢锛氭湁缁忕含搴︾殑锛屽懆杈逛簲鍏噷浠ュ唴锛岄潰绉� 浠锋牸 鐩稿樊10%锛屽悓瀹ゆ暟锛屼粠杩戝埌杩滄帓搴忋�傛病鏈夌粡绾害灏辨寜鍘熷厛瑙勫垯 * - * 用于构建经纬度查询参数 + * 鐢ㄤ簬鏋勫缓缁忕含搴︽煡璇㈠弬鏁� * @return */ private RentHouseQueryBean buildSimilarQueryByLatLng(RentHouseModel model) { if (null != model) { RentHouseQueryBean queryBean = new RentHouseQueryBean(); - // 构建经纬度条件(有经纬度的才进行) + // 鏋勫缓缁忕含搴︽潯浠讹紙鏈夌粡绾害鐨勬墠杩涜锛� Long lat = Long.parseLong(model.getLat()); Long lng = Long.parseLong(model.getLng()); // double dlat = (double) (lat / 10000000000.0); // double dlng = (double) (lng / 10000000000.0);// - // 纬度必须为正负90,经度为正负180 + // 绾害蹇呴』涓烘璐�90锛岀粡搴︿负姝h礋180 // if (!(dlat >= -90 && dlat <= 90 && dlng >= -180 && dlng <= 180)) - // {// 经纬度不符合规范,按原来的查 + // {// 缁忕含搴︿笉绗﹀悎瑙勮寖锛屾寜鍘熸潵鐨勬煡 // return null; // } // queryBean.setLat(lat); @@ -968,7 +968,7 @@ public class RentHouseSearchController { return null; } - Integer room = model.getRoom();// 租房用相同“室”数找相似房源 + Integer room = model.getRoom();// 绉熸埧鐢ㄧ浉鍚屸�滃鈥濇暟鎵剧浉浼兼埧婧� if (null != room && room > 0) queryBean.setRoom(room); String region = model.getRegion(); diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/ReportController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/ReportController.java index 66b21c983..620ae20de 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/ReportController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/ReportController.java @@ -3,14 +3,14 @@ package com.fangjia.coresite.controllers; import com.fangjia.coresite.model.FangjiaModel; /** - * 房产报告控制器 + * 鎴夸骇鎶ュ憡鎺у埗鍣� * @author yinjihuan * */ public class ReportController { /** - * 进入房调报告页面 + * 杩涘叆鎴胯皟鎶ュ憡椤甸潰 * @param model * @return */ diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/ReportDetailController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/ReportDetailController.java index 7ac659ca9..02b20b4ff 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/ReportDetailController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/ReportDetailController.java @@ -95,7 +95,7 @@ public class ReportDetailController { private final static Logger LOGGER = LoggerFactory.getLogger(ReportDetailController.class); /** - * 单项的样例页 + * 鍗曢」鐨勬牱渚嬮〉 */ public Object sampleAction(ReportDetailModel model, HttpServletRequest request) { int type = model.getType(); @@ -118,31 +118,31 @@ public class ReportDetailController { return Models.NOT_FOUNT; } - String body = "购买《成交参考》"; // 商品描述,推荐格式:商品名称(订单编号:订单编号) + String body = "璐拱銆婃垚浜ゅ弬鑰冦��"; // 鍟嗗搧鎻忚堪锛屾帹鑽愭牸寮忥細鍟嗗搧鍚嶇О锛堣鍗曠紪鍙凤細璁㈠崟缂栧彿锛� switch (type) { case 1: - body = "购买《成交参考》"; + body = "璐拱銆婃垚浜ゅ弬鑰冦��"; break; case 2: - body = "购买《租金/租赁情况》"; + body = "璐拱銆婄閲�/绉熻祦鎯呭喌銆�"; break; case 3: - body = "购买《楼盘情报》"; + body = "璐拱銆婃ゼ鐩樻儏鎶ャ��"; break; case 4: - body = "购买《江湖地位/口碑》"; + body = "璐拱銆婃睙婀栧湴浣�/鍙g銆�"; break; case 5: - body = "购买《中介实力排行》"; + body = "璐拱銆婁腑浠嬪疄鍔涙帓琛屻��"; break; case 6: - body = "购买《房价走势&涨跌幅预测》"; + body = "璐拱銆婃埧浠疯蛋鍔�&娑ㄨ穼骞呴娴嬨��"; break; case 7: - body = "购买《房子稀缺程度》"; + body = "璐拱銆婃埧瀛愮█缂虹▼搴︺��"; break; case 8: - body = "购买《生活便利指数》"; + body = "璐拱銆婄敓娲讳究鍒╂寚鏁般��"; break; } @@ -150,7 +150,7 @@ public class ReportDetailController { String region = evaluation.getRegion(); String districtName = evaluation.getDistrictName(); DistrictKey districtKey = new DistrictKey(city, region, districtName); - boolean isVilla = StringUtils.contains(evaluation.getBuildType(), "别墅"); + boolean isVilla = StringUtils.contains(evaluation.getBuildType(), "鍒"); model.setVilla(isVilla); int houseRoom = null == evaluation.getRoom() ? 2 : evaluation.getRoom(); HouseLoudong houseInfo = realHouseService.findHouseInfo(districtKey, evaluation.getHouseNum(), evaluation.getRoomNum()); @@ -158,9 +158,9 @@ public class ReportDetailController { houseRoom = houseInfo.getRoom(); } model.setHouseRooms(houseRoom); - String buildType = isVilla ? "别墅" : "小区"; + String buildType = isVilla ? "鍒" : "灏忓尯"; - // 判断是否有数据出售 + // 鍒ゆ柇鏄惁鏈夋暟鎹嚭鍞� if (type == 1) { List similarTradeHouses = realHouseService.findHouseTradeHistory(districtKey, houseRoom, evaluation.getArea(), 10, isVilla); @@ -275,7 +275,7 @@ public class ReportDetailController { break; } - if (!"未知".equals(detail.get("full_name"))) { + if (!"鏈煡".equals(detail.get("full_name"))) { agencys.add(detail); } } @@ -345,20 +345,20 @@ public class ReportDetailController { } } - String subject = body; // 商品名称 + String subject = body; // 鍟嗗搧鍚嶇О String notify_url = model.getCityUrl() + "/reportDetail/notify"; String return_url = model.getCityUrl() + "/reportDetail/paySuccess"; String partner = AlipayConfig.alipayPartner; String seller_email = AlipayConfig.alipayEmail; - String payment_type = "1";// 支付宝类型.1代表商品购买 + String payment_type = "1";// 鏀粯瀹濈被鍨�.1浠h〃鍟嗗搧璐拱 String ip = AnalyticsUtil.getIpAddress(request); Double money = 10D; if (ip.equals("116.247.70.58") || ip.startsWith("192.168.0.") || ip.startsWith("192.168.10.")) { - money = 0.01;// 公司测试ip + money = 0.01;// 鍏徃娴嬭瘯ip } - String total_fee = String.valueOf(money); // 订单总价 - String paymethod = "bankPay";// 赋值:bankPay(网银);cartoon(卡通); + String total_fee = String.valueOf(money); // 璁㈠崟鎬讳环 + String paymethod = "bankPay";// 璧嬪��:bankPay(缃戦摱);cartoon(鍗¢��); model.setBody(body); model.setNotify_url(notify_url); @@ -398,13 +398,13 @@ public class ReportDetailController { String region = eva.getRegion(); String block = eva.getBlock(); model.setRegionOrg(regionBlockService.getOrgName(city, region, "region")); - model.setBlockOrg(block + "板块"); + model.setBlockOrg(block + "鏉垮潡"); String districtName = eva.getDistrictName(); DistrictKey districtKey = new DistrictKey(city, region, districtName); - boolean isVilla = StringUtils.contains(eva.getBuildType(), "别墅"); + boolean isVilla = StringUtils.contains(eva.getBuildType(), "鍒"); model.setVilla(isVilla); int houseRoom = null == eva.getRoom() ? 2 : eva.getRoom(); - String buildType = isVilla ? "别墅" : "小区"; + String buildType = isVilla ? "鍒" : "灏忓尯"; int weekCounts = 12; Date now = new Date(); @@ -418,7 +418,7 @@ public class ReportDetailController { model.setDistrict(district); if (type == 1) { - // 同类成交 + // 鍚岀被鎴愪氦 List similarTradeHouses = realHouseService.findHouseTradeHistory(districtKey, houseRoom, eva.getArea(), 10, isVilla); if (CollectionUtils.isEmpty(similarTradeHouses) || similarTradeHouses.size() < 10) { @@ -482,7 +482,7 @@ public class ReportDetailController { } model.setSimilarTradeHouses(similarTradeHouses); } else if (type == 2) { - // 租金情况 + // 绉熼噾鎯呭喌 model.setDistrictHot(districtHotService.findByDistrictKey(districtKey)); StringBuilder urlBuilder = new StringBuilder(); urlBuilder.append("pt=1&c=").append(city).append("&r=").append(region).append("&dn=").append(districtName) @@ -554,11 +554,11 @@ public class ReportDetailController { return Models.NOT_FOUNT; /* - * // 3.2 开发商 model.setDeveloper(developerService.findByName(city, - * district.getDeveloper())); // 3.2 物业公司 + * // 3.2 寮�鍙戝晢 model.setDeveloper(developerService.findByName(city, + * district.getDeveloper())); // 3.2 鐗╀笟鍏徃 * model.setManagementCompany( * managementCompanyService.findByName(city, - * district.getEstateCompany())); // 4.1 3.3 周边配套信息 + * district.getEstateCompany())); // 4.1 3.3 鍛ㄨ竟閰嶅淇℃伅 * DistrictFacilitys facilitys = * districtService.findDistrictFacilitys(districtKey); if (null != * facilitys) { @@ -573,7 +573,7 @@ public class ReportDetailController { return Models.NOT_FOUNT; /* - * // 4 排行榜 + * // 4 鎺掕姒� * model.setRegionDistrictCount(districtService.findRegionDistrictCount * (city, region)); * model.setBlockDistrictCount(districtService.findBlockDistrictCount @@ -629,7 +629,7 @@ public class ReportDetailController { * block, districtName, buildType)); */ } else if (type == 5) { - // 7.1 小区成交中介排名 + // 7.1 灏忓尯鎴愪氦涓粙鎺掑悕 List masterBos = new ArrayList(10); AgencyDistrictTradeRank districtAgencys = districtService.findAgencyDistrictTradeRank(districtKey); if (null != districtAgencys) { @@ -641,14 +641,14 @@ public class ReportDetailController { break; } - if (!"未知".equals(detail.get("full_name"))) { + if (!"鏈煡".equals(detail.get("full_name"))) { agencys.add(detail); } } model.setDistrictAgencys(agencys); - // 7.2 中介详情 - String maxSellAddress = "暂无"; + // 7.2 涓粙璇︽儏 + String maxSellAddress = "鏆傛棤"; long dLat = district.getLat(); long dLng = district.getLng(); for (int i = 0; i < agencys.size(); i++) { @@ -722,8 +722,8 @@ public class ReportDetailController { model.setMasterBos(masterBos); } else if (type == 6) { model.setStatWeekCounts(weekCounts); - model.setBlockOrg(district.getBlock() + "板块"); - // 1.2 小区走势图信息 + model.setBlockOrg(district.getBlock() + "鏉垮潡"); + // 1.2 灏忓尯璧板娍鍥句俊鎭� int[] districtMinMaxPrice = districtStatService.findMinMaxDistrictStat(districtKey, buildType, now, weekCounts); model.setDistrictMinPrice(CurrencyConverter.toMicrometer(Integer.toString(districtMinMaxPrice[0]))); model.setDistrictMaxPrice(CurrencyConverter.toMicrometer(Integer.toString(districtMinMaxPrice[1]))); @@ -741,7 +741,7 @@ public class ReportDetailController { model.setDistrictStatImgUrl(model.getCityUrl() + "/cImg/" + SecurityUtil.encode(urlBuilder.toString()) + "?__refresh_cache=1"); - // 1.2 板块走势图信息 + // 1.2 鏉垮潡璧板娍鍥句俊鎭� if (StringUtils.isNotBlank(block)) { int[] blockMinMaxPrice = regionStatService.findMinMaxRegionStat(city, region, block, now, weekCounts); if (blockMinMaxPrice[0] < Integer.MAX_VALUE && blockMinMaxPrice[1] > Integer.MIN_VALUE) { @@ -752,7 +752,7 @@ public class ReportDetailController { model.setBlockYearMarkup(null == blockStatBo.getYearMarkup() ? 0 : blockStatBo.getYearMarkup()); model.setBlockMonthMarkup(null == blockStatBo.getMonthMarkup() ? 0 : blockStatBo.getMonthMarkup()); - // 6 预测 + // 6 棰勬祴 BigDecimal bg = new BigDecimal((Math.random() + 1) * 3); double markup = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); model.setBlockPredictMarkup((int) (markup * 100)); @@ -767,17 +767,17 @@ public class ReportDetailController { } } - // 1.2 城市走势图信息 + // 1.2 鍩庡競璧板娍鍥句俊鎭� RegionStatBo cityStatBo = regionStatService.findYearPeriodStatBoByCity(city); if (null != cityStatBo) { - // 6 预测 + // 6 棰勬祴 BigDecimal bg = new BigDecimal((Math.random() + 1) * 3); double markup = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); model.setCityPredictMarkup((int) (markup * 100)); model.setCityPredictPrice((int) (cityStatBo.getAvgPrice() * (1 + markup / 100))); } - // 6 房价预测 + // 6 鎴夸环棰勬祴 BigDecimal bg = new BigDecimal((Math.random() + 1) * 3); double markup = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); model.setHousePredictMarkup((int) (markup * 100)); @@ -880,53 +880,53 @@ public class ReportDetailController { return Models.NOT_FOUNT; } - String body = "购买《成交参考》"; // 商品描述,推荐格式:商品名称(订单编号:订单编号) + String body = "璐拱銆婃垚浜ゅ弬鑰冦��"; // 鍟嗗搧鎻忚堪锛屾帹鑽愭牸寮忥細鍟嗗搧鍚嶇О锛堣鍗曠紪鍙凤細璁㈠崟缂栧彿锛� switch (type) { case 1: - body = "购买《成交参考》"; + body = "璐拱銆婃垚浜ゅ弬鑰冦��"; break; case 2: - body = "购买《租金/租赁情况》"; + body = "璐拱銆婄閲�/绉熻祦鎯呭喌銆�"; break; case 3: return Models.NOT_FOUNT; /* - * body = "购买《楼盘情报》"; break; + * body = "璐拱銆婃ゼ鐩樻儏鎶ャ��"; break; */ case 4: return Models.NOT_FOUNT; /* - * body = "购买《江湖地位/口碑》"; break; + * body = "璐拱銆婃睙婀栧湴浣�/鍙g銆�"; break; */ case 5: - body = "购买《中介实力排行》"; + body = "璐拱銆婁腑浠嬪疄鍔涙帓琛屻��"; break; case 6: - body = "购买《房价走势&涨跌幅预测》"; + body = "璐拱銆婃埧浠疯蛋鍔�&娑ㄨ穼骞呴娴嬨��"; break; case 7: - body = "购买《房子稀缺程度》"; + body = "璐拱銆婃埧瀛愮█缂虹▼搴︺��"; break; case 8: - body = "购买《生活便利指数》"; + body = "璐拱銆婄敓娲讳究鍒╂寚鏁般��"; break; } - String subject = body; // 商品名称 + String subject = body; // 鍟嗗搧鍚嶇О String notify_url = model.getCityUrl() + "/reportDetail/notify"; String return_url = model.getCityUrl() + "/reportDetail/paySuccess"; String partner = AlipayConfig.alipayPartner; String seller_email = AlipayConfig.alipayEmail; - String payment_type = "1";// 支付宝类型.1代表商品购买 + String payment_type = "1";// 鏀粯瀹濈被鍨�.1浠h〃鍟嗗搧璐拱 String ip = AnalyticsUtil.getIpAddress(request); Double money = 10D; if (ip.equals("116.247.70.58") || ip.startsWith("192.168.0.") || ip.startsWith("192.168.10.")) { - money = 0.01;// 公司测试ip + money = 0.01;// 鍏徃娴嬭瘯ip } - String total_fee = String.valueOf(money); // 订单总价 - String paymethod = "bankPay";// 赋值:bankPay(网银);cartoon(卡通); + String total_fee = String.valueOf(money); // 璁㈠崟鎬讳环 + String paymethod = "bankPay";// 璧嬪��:bankPay(缃戦摱);cartoon(鍗¢��); String input_charset = AlipayConfig.input_charset; String key = AlipayConfig.alipayKey; @@ -944,7 +944,7 @@ public class ReportDetailController { entity.setType(type); entity.setCity(evaluation.getCity()); entity.setEvaluationId(evaluation.getId()); - entity.setTypeDesc(body.replace("购买", "")); + entity.setTypeDesc(body.replace("璐拱", "")); if (ip.equals("116.247.70.58") || ip.startsWith("192.168.0.") || ip.startsWith("192.168.10.")) { entity.setStatus(1); } else { @@ -952,7 +952,7 @@ public class ReportDetailController { } entity.setTotalFee(money); entity.setBank(model.getDefaultbank()); - entity.setCardType(model.getCardType() == 0 ? "储蓄卡" : "信用卡"); + entity.setCardType(model.getCardType() == 0 ? "鍌ㄨ搫鍗�" : "淇$敤鍗�"); entity.setUid(CoresiteCookieContext.getInstance().getCookieValue(request, CookieName.UID)); entity.setSid(CoresiteCookieContext.getInstance().getCookieValue(request, CookieName.SID)); entity.setIp(ip); @@ -990,7 +990,7 @@ public class ReportDetailController { Set keys = params.keySet(); for (String key : keys) { if (!(key.equals("sign_type") || key.equals("sign"))) { - // 除去sign和sign_type两个参数 + // 闄ゅ幓sign鍜宻ign_type涓や釜鍙傛暟 params_sign.put(key, request.getParameter(key)); } } @@ -1015,7 +1015,7 @@ public class ReportDetailController { LOGGER.warn("----------paySuccess entityId:" + entity.getId()); - // 支付宝交易号 + // 鏀粯瀹濅氦鏄撳彿 String trade_no = request.getParameter("trade_no") == null ? "" : request.getParameter("trade_no"); Map data = new HashMap(); data.put("status", 1); @@ -1052,7 +1052,7 @@ public class ReportDetailController { Calendar ca = Calendar.getInstance(); ca.setTime(endDate); ca.add(Calendar.MONTH, -6); - // 半年前月份第一天 + // 鍗婂勾鍓嶆湀浠界涓�澶� Date halfYearMonth = ca.getTime(); params.add(new QueryParam("publishDate", QueryParam.GREATER_THAN_OPERATOR, halfYearMonth)); params.add(new QueryParam("publishDate", QueryParam.LESS_THAN_OPERATOR, endDate)); diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/ResourceController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/ResourceController.java index dac589808..2eb48be6c 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/ResourceController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/ResourceController.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.Map; /** - * 资源中心Controller + * 璧勬簮涓績Controller */ public class ResourceController { @@ -41,7 +41,7 @@ public class ResourceController { List newsResources = newsResourceService.findNewsResource(null, null, null, pager); model.setNewsResources(newsResources); model.setTotal(total); - //封装广告信息 + //灏佽骞垮憡淇℃伅 wrapAdvertisement(model,AdSourceEnum.SOURCE.getId()); return model; @@ -68,9 +68,9 @@ public class ResourceController { } } - //PC端轮播广告如果为两个时循环两遍(添加重复的两条) + //PC绔疆鎾箍鍛婂鏋滀负涓や釜鏃跺惊鐜袱閬嶏紙娣诲姞閲嶅鐨勪袱鏉★級 if(carouselAdvertisementList!=null){ - //有两张以上轮播图片时适应前端排序(把最后一张图片移到最前面) + //鏈変袱寮犱互涓婅疆鎾浘鐗囨椂閫傚簲鍓嶇鎺掑簭锛堟妸鏈�鍚庝竴寮犲浘鐗囩Щ鍒版渶鍓嶉潰锛� if(carouselAdvertisementList.size() > 1){ carouselAdvertisementList.add(0, carouselAdvertisementList.get(carouselAdvertisementList.size()-1)); carouselAdvertisementList.remove(carouselAdvertisementList.size()-1); @@ -91,7 +91,7 @@ public class ResourceController { List newsResources = newsResourceService.findNewsResource(NewsResourceTypeEnum.getById("case"), null,null, pager); model.setNewsResources(newsResources); model.setTotal(total); - //封装广告信息 + //灏佽骞垮憡淇℃伅 wrapAdvertisement(model,AdSourceEnum.SOURCE.getId()); return model; } @@ -103,7 +103,7 @@ public class ResourceController { List newsResources = newsResourceService.findNewsResource(NewsResourceTypeEnum.getById("industry"), null,null, pager); model.setNewsResources(newsResources); model.setTotal(total); - //封装广告信息 + //灏佽骞垮憡淇℃伅 wrapAdvertisement(model,AdSourceEnum.SOURCE.getId()); return model; } @@ -115,7 +115,7 @@ public class ResourceController { List newsResources = newsResourceService.findNewsResource(NewsResourceTypeEnum.getById("analysis"), null, null,pager); model.setNewsResources(newsResources); model.setTotal(total); - //封装广告信息 + //灏佽骞垮憡淇℃伅 wrapAdvertisement(model,AdSourceEnum.SOURCE.getId()); return model; } @@ -127,7 +127,7 @@ public class ResourceController { List newsResources = newsResourceService.findNewsResource(NewsResourceTypeEnum.getById("company"), null, null,pager); model.setNewsResources(newsResources); model.setTotal(total); - //封装广告信息 + //灏佽骞垮憡淇℃伅 wrapAdvertisement(model,AdSourceEnum.SOURCE.getId()); return model; } @@ -149,7 +149,7 @@ public class ResourceController { List newsResources = newsResourceService.findNewsResource(NewsResourceTypeEnum.getById(newsResource.getType()), null, model.getId(), new Pager(3)); model.setNewsResources(newsResources); model.setNewsResource(newsResource); - //封装广告信息 + //灏佽骞垮憡淇℃伅 wrapAdvertisement(model,AdSourceEnum.SOURCE_DETAIL.getId()); return model; } @@ -162,7 +162,7 @@ public class ResourceController { Pager pager = new Pager(model.getLimit()); List newsResources = newsResourceService.findNewsResource(null, NewResourceRecommendEnum.getById(model.getModule()),null, pager); model.setNewsResources(newsResources); - //封装广告信息 + //灏佽骞垮憡淇℃伅 wrapAdvertisement(model,AdSourceEnum.SOURCE.getId()); return model; } 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 b0bea5a68..4564b0cd1 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 @@ -53,12 +53,12 @@ public class SaleLeadsController { private ServerAreaService serverAreaService; private NewsResourceService newsResourceService; /** - * 短信Service + * 鐭俊Service */ private SmsService smsService; /** - * 用户Service + * 鐢ㄦ埛Service */ private FangJiaUserService fangJiaUserService; @@ -70,7 +70,7 @@ public class SaleLeadsController { } /** - * 地数公众号咨询 + * 鍦版暟鍏紬鍙峰挩璇� * @param model * @return */ @@ -105,17 +105,17 @@ public class SaleLeadsController { model.setViewParam("location", "/saleLeads/apply?mid="+model.getMid()+"&backUrl=" + URLEncoder.encode(refUrl)); return model; } - // 城市所在省 + // 鍩庡競鎵�鍦ㄧ渷 ServerArea serverArea = serverAreaService.findByDisplay(saleLeads .getCity()); if (serverArea != null) { saleLeads.setProvince(serverArea.getProvince()); } - // 用户 + // 鐢ㄦ埛 saleLeads.setTempId(tempId); saleLeads.setUserId(LoginUtil.getUserId(req)); - //第一次进来,没的业务需求时,用mid设置业务需求 + //绗竴娆¤繘鏉ワ紝娌$殑涓氬姟闇�姹傛椂锛岀敤mid璁剧疆涓氬姟闇�姹� if(StringUtils.isBlank(saleLeads.getBusiness())){ saleLeads.setBusiness(SalesLeadEnum.getById(model.getMid()) .getValue()); @@ -129,8 +129,8 @@ public class SaleLeadsController { } - //下载标题 - if(model.getMid().equals(SalesLeadEnum.getByValues("下载申请").getId())){ + //涓嬭浇鏍囬 + if(model.getMid().equals(SalesLeadEnum.getByValues("涓嬭浇鐢宠").getId())){ if(StringUtils.isNotBlank(model.getResourceId())){ NewsResource newsResource = newsResourceService.findById(model.getResourceId()); saleLeads.setDownContent(newsResource.getTitle()); @@ -139,7 +139,7 @@ public class SaleLeadsController { saleLeads.setCreateDate(new Date()); saleLeads.setModifyDate(new Date()); - // 网站来源 + // 缃戠珯鏉ユ簮 String source = COOKIE_CONTEXT.getCookieValue(req, CookieName.SITE_SOURCE); if (StringUtils.isNotBlank(source)) { @@ -172,27 +172,27 @@ public class SaleLeadsController { saleLeads = converValue(saleLeads); String body = - "业务需求:" + saleLeads.getBusiness() + " " + saleLeads.getOtherBusiness() + "\n\n" - + "姓名:" + saleLeads.getUname() + "\n\n" - + "城市:" + saleLeads.getCity() + "\n\n" - + "工作职能:" + saleLeads.getWork() + " " + saleLeads.getOtherWork() + "\n\n" - + "手机:" + saleLeads.getMobile() + "\n\n" - + "邮箱:" + saleLeads.getEmail() + "\n\n" - + "公司名称:" + saleLeads.getCompany() + "\n\n" - + "行业性质:" + saleLeads.getIndustryNature() + " " + saleLeads.getOtherIndustryNature() + "\n\n"; - body = body.replaceAll("null", "").replaceAll("其他,请填写", ""); + "涓氬姟闇�姹傦細" + saleLeads.getBusiness() + " " + saleLeads.getOtherBusiness() + "\n\n" + + "濮撳悕锛�" + saleLeads.getUname() + "\n\n" + + "鍩庡競锛�" + saleLeads.getCity() + "\n\n" + + "宸ヤ綔鑱岃兘锛�" + saleLeads.getWork() + " " + saleLeads.getOtherWork() + "\n\n" + + "鎵嬫満锛�" + saleLeads.getMobile() + "\n\n" + + "閭锛�" + saleLeads.getEmail() + "\n\n" + + "鍏徃鍚嶇О锛�" + saleLeads.getCompany() + "\n\n" + + "琛屼笟鎬ц川锛�" + saleLeads.getIndustryNature() + " " + saleLeads.getOtherIndustryNature() + "\n\n"; + body = body.replaceAll("null", "").replaceAll("鍏朵粬锛岃濉啓", ""); if (StringUtils.isNotBlank(refUrl) && refUrl.contains("bd_vid")) { - body += "线索来源:百度"; + body += "绾跨储鏉ユ簮锛氱櫨搴�"; } else if (StringUtils.isNotBlank(refUrl) && refUrl.contains("didata.wechat")) { - body += "线索来源: 地数公众号"; + body += "绾跨储鏉ユ簮: 鍦版暟鍏紬鍙�"; } else { - body += "线索来源:房价网"; + body += "绾跨储鏉ユ簮锛氭埧浠风綉"; } try { JSONObject requestBody = new JSONObject(); requestBody.put("msgtype", "text"); JSONObject markdown = new JSONObject(); - markdown.put("title", "销售线索"); + markdown.put("title", "閿�鍞嚎绱�"); markdown.put("content", body); requestBody.put("text", markdown); HttpRequest request = new HttpRequest(); @@ -205,7 +205,7 @@ public class SaleLeadsController { } saleLeadsService.save(saleLeads); - // 对于百度广告过来的信息,进行回传 + // 瀵逛簬鐧惧害骞垮憡杩囨潵鐨勪俊鎭紝杩涜鍥炰紶 try { if (StringUtils.isNotBlank(refUrl) && refUrl.contains("bd_vid")) { HttpRequest httpRequest = new HttpRequest(); @@ -223,7 +223,7 @@ public class SaleLeadsController { jsonArray.add(contentJson); requestBody.put("conversionTypes", jsonArray); String result = httpRequest.postWithBody(baiduUrl, requestBody, bdHeaders, "UTF-8"); - LOG.info("百度回传成功:" + result); + LOG.info("鐧惧害鍥炰紶鎴愬姛:" + result); } } catch (HttpRequestException e) { e.printStackTrace(); @@ -238,7 +238,7 @@ public class SaleLeadsController { } } - //是下载,并且是第一次,除了要保存业务需求还需保存下载代码 + //鏄笅杞斤紝骞朵笖鏄涓�娆★紝闄や簡瑕佷繚瀛樹笟鍔¢渶姹傝繕闇�淇濆瓨涓嬭浇浠g爜 if(model.getMid().equals("1016") && !workCode.contains("1016")){ workCode = workCode + "_1016"; } @@ -253,7 +253,7 @@ public class SaleLeadsController { if(StringUtils.isNotBlank(refUrl) && refUrl.contains("/resource/info")){ url = refUrl.substring(refUrl.indexOf("/resource/info"), refUrl.length()); - } else if (StringUtils.isNotBlank(refUrl) && refUrl.contains("didata.wechat")) { // 地数公众号跳转 + } else if (StringUtils.isNotBlank(refUrl) && refUrl.contains("didata.wechat")) { // 鍦版暟鍏紬鍙疯烦杞� url = "/enquire/didataSuccess"; if (StringUtils.isNotBlank(refUrl)) { url = url + "?backUrl=" + URLEncoder.encode(refUrl); @@ -353,31 +353,31 @@ public class SaleLeadsController { // refUrl = req.getScheme() + "//www.fangjia.com"; // } - // 城市所在省 + // 鍩庡競鎵�鍦ㄧ渷 ServerArea serverArea = serverAreaService.findByDisplay(saleLeads .getCity()); if (serverArea != null) { saleLeads.setProvince(serverArea.getProvince()); } - // 用户 + // 鐢ㄦ埛 String tempId = COOKIE_CONTEXT.getCookieValue(req, CookieName.UID); saleLeads.setTempId(tempId); saleLeads.setUserId(LoginUtil.getUserId(req)); - //第一次进来,没的业务需求时,用mid设置业务需求 + //绗竴娆¤繘鏉ワ紝娌$殑涓氬姟闇�姹傛椂锛岀敤mid璁剧疆涓氬姟闇�姹� if(StringUtils.isBlank(saleLeads.getBusiness())){ try{ saleLeads.setBusiness(SalesLeadEnum.getById(model.getMid()) .getValue()); }catch (Exception e){ - System.out.println("无法转换Mid: "+model.getMid()); + System.out.println("鏃犳硶杞崲Mid: "+model.getMid()); } } saleLeads.setCreateDate(new Date()); saleLeads.setModifyDate(new Date()); - // 网站来源 + // 缃戠珯鏉ユ簮 String source = COOKIE_CONTEXT.getCookieValue(req, CookieName.SITE_SOURCE); if (StringUtils.isNotBlank(source)) { @@ -397,40 +397,40 @@ public class SaleLeadsController { String ip = AnalyticsUtil.getIpAddress(req); saleLeads = converValue(saleLeads); String body = - "业务需求:" + saleLeads.getBusiness() + "\n\n" - + "姓名:" + saleLeads.getUname() + "\n\n" - + "手机:" + saleLeads.getMobile() + "\n\n" - + "公司:" + saleLeads.getCompany() + "\n\n" - + "职位:" + saleLeads.getWork()+ "\n\n" - + "咨询内容:" + saleLeads.getRemarks()+ "\n\n" - + "IP:" + ip+ "\n\n" ; - body = body.replaceAll("null", "").replaceAll("其他,请填写", ""); + "涓氬姟闇�姹傦細" + saleLeads.getBusiness() + "\n\n" + + "濮撳悕锛�" + saleLeads.getUname() + "\n\n" + + "鎵嬫満锛�" + saleLeads.getMobile() + "\n\n" + + "鍏徃锛�" + saleLeads.getCompany() + "\n\n" + + "鑱屼綅锛�" + saleLeads.getWork()+ "\n\n" + + "鍜ㄨ鍐呭锛�" + saleLeads.getRemarks()+ "\n\n" + + "IP锛�" + ip+ "\n\n" ; + body = body.replaceAll("null", "").replaceAll("鍏朵粬锛岃濉啓", ""); if (StringUtils.isNotBlank(refUrl) && refUrl.contains("bd_vid")) { - body += "线索来源:百度"; + body += "绾跨储鏉ユ簮锛氱櫨搴�"; } else if (StringUtils.isNotBlank(refUrl) && refUrl.contains("didata.wechat")) { - body += "线索来源: 地数公众号"; + body += "绾跨储鏉ユ簮: 鍦版暟鍏紬鍙�"; } else { - body += "线索来源:房价网"; + body += "绾跨储鏉ユ簮锛氭埧浠风綉"; } System.out.println(body); try { JSONObject requestBody = new JSONObject(); requestBody.put("msgtype", "text"); JSONObject markdown = new JSONObject(); - markdown.put("title", "销售线索"); + markdown.put("title", "閿�鍞嚎绱�"); markdown.put("content", body); requestBody.put("text", markdown); HttpRequest request = new HttpRequest(); final String ding_url = "https://oapi.dingtalk.com/robot/send?access_token=894650a12af9497bed599df1d5f93b21d6da5bbae45f35f18c5825580ebbdf64"; Map headers = new HashMap(); headers.put("Content-Type", "application/json; charset=utf-8"); - request.postWithBody(ding_url, requestBody, headers, "UTF-8"); //测试时先去掉 + request.postWithBody(ding_url, requestBody, headers, "UTF-8"); //娴嬭瘯鏃跺厛鍘绘帀 } catch (Exception e) { e.printStackTrace(); } saleLeadsService.save(saleLeads); - // 对于百度广告过来的信息,进行回传 + // 瀵逛簬鐧惧害骞垮憡杩囨潵鐨勪俊鎭紝杩涜鍥炰紶 try { if (StringUtils.isNotBlank(refUrl) && refUrl.contains("bd_vid")) { HttpRequest httpRequest = new HttpRequest(); @@ -448,7 +448,7 @@ public class SaleLeadsController { jsonArray.add(contentJson); requestBody.put("conversionTypes", jsonArray); String result1 = httpRequest.postWithBody(baiduUrl, requestBody, bdHeaders, "UTF-8"); - LOG.info("百度回传成功:" + result1); + LOG.info("鐧惧害鍥炰紶鎴愬姛:" + result1); } } catch (HttpRequestException e) { e.printStackTrace(); @@ -472,7 +472,7 @@ public class SaleLeadsController { // // if(StringUtils.isNotBlank(refUrl) && refUrl.contains("/resource/info")){ // url = refUrl.substring(refUrl.indexOf("/resource/info"), refUrl.length()); -// } else if (StringUtils.isNotBlank(refUrl) && refUrl.contains("didata.wechat")) { // 地数公众号跳转 +// } else if (StringUtils.isNotBlank(refUrl) && refUrl.contains("didata.wechat")) { // 鍦版暟鍏紬鍙疯烦杞� // url = "/enquire/didataSuccess"; // if (StringUtils.isNotBlank(refUrl)) { // url = url + "?backUrl=" + URLEncoder.encode(refUrl); @@ -518,7 +518,7 @@ public class SaleLeadsController { HttpServletResponse res){ String tempId = COOKIE_CONTEXT.getCookieValue(req, CookieName.UID); - //下载标题 + //涓嬭浇鏍囬 String title = null; if(StringUtils.isNotBlank(model.getResourceId())){ NewsResource newsResource = newsResourceService.findById(model.getResourceId()); @@ -562,7 +562,7 @@ public class SaleLeadsController { Long ipVisitCount = (Long) CacheUtils.getValue(FangJiaUserService.class, ip); if(ipVisitCount != null && ipVisitCount > 3){ resultModel.setResult(Message.RESULT_FAIL); - resultModel.setMsg("该IP短信发送频繁"); + resultModel.setMsg("璇P鐭俊鍙戦�侀绻�"); return resultModel; } if(ipVisitCount == null){ @@ -570,9 +570,9 @@ public class SaleLeadsController { } CacheUtils.putValue(CacheUtils.CachePolicyEnum.TODAY, FangJiaUserService.class, ip, ipVisitCount+1); - System.out.println(mobile + " 验证码 【"+ code+"】"); - //测试先去掉发短信 - smsService.send(model.getMobile(), "【房价网】你的验证码是" + code + ",验证码5分钟内有效,请立即验证。"); + System.out.println(mobile + " 楠岃瘉鐮� 銆�"+ code+"銆�"); + //娴嬭瘯鍏堝幓鎺夊彂鐭俊 + smsService.send(model.getMobile(), "銆愭埧浠风綉銆戜綘鐨勯獙璇佺爜鏄�" + code + ",楠岃瘉鐮�5鍒嗛挓鍐呮湁鏁堬紝璇风珛鍗抽獙璇併��"); resultModel.setResult(Message.RESULT_SUCCESS); CacheUtils.putValue(CacheUtils.CachePolicyEnum.TINY, FangJiaUserService.class, mobile + "_" + type, code); CacheUtils.putValue(CacheUtils.CachePolicyEnum.TINY, FangJiaUserService.class, mobile, new Date().getTime()); @@ -592,10 +592,10 @@ public class SaleLeadsController { } /** - * 获取缓存的验证码 + * 鑾峰彇缂撳瓨鐨勯獙璇佺爜 * @author yinjihuan - * @param mobile 手机 - * @param type 类型 + * @param mobile 鎵嬫満 + * @param type 绫诲瀷 * @return */ private String getCacheCode(String mobile, String type) { @@ -607,7 +607,7 @@ public class SaleLeadsController { /** - * 数据能力 + * 鏁版嵁鑳藉姏 * @param model * @return * @throws Exception diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SchoolController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SchoolController.java index 2463c97b3..46403066b 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SchoolController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SchoolController.java @@ -80,32 +80,32 @@ public class SchoolController { } /** - * 按时间做Seed获取的随机筛选的区域信息 + * 鎸夋椂闂村仛Seed鑾峰彇鐨勯殢鏈虹瓫閫夌殑鍖哄煙淇℃伅 * - * @param 区域菜单信息 - * @return 随机筛选的区域信息 + * @param 鍖哄煙鑿滃崟淇℃伅 + * @return 闅忔満绛涢�夌殑鍖哄煙淇℃伅 */ private List limit(List items) { - int needCount = 7;// 获取的数据个数8个 + int needCount = 7;// 鑾峰彇鐨勬暟鎹釜鏁�8涓� - int changeDay = 20;// 设置更新频率为20天 + int changeDay = 20;// 璁剧疆鏇存柊棰戠巼涓�20澶� - int currentCount = items.size();// 当前获取的Region总数 + int currentCount = items.size();// 褰撳墠鑾峰彇鐨凴egion鎬绘暟 if (currentCount <= needCount) return items; Calendar oldTime = Calendar.getInstance(); - oldTime.set(2011, 8, 1);// 初始化时间为2011年09月01日 + oldTime.set(2011, 8, 1);// 鍒濆鍖栨椂闂翠负2011骞�09鏈�01鏃� Calendar newTime = Calendar.getInstance(); - int reduceDay = SimRandom.getReduceDay(newTime, oldTime);// 获取日期与初始日期相差天数 + int reduceDay = SimRandom.getReduceDay(newTime, oldTime);// 鑾峰彇鏃ユ湡涓庡垵濮嬫棩鏈熺浉宸ぉ鏁� - int seed = (int) reduceDay / changeDay;// 计算simRandom变化频率,20表示20天更新一次 + int seed = (int) reduceDay / changeDay;// 璁$畻simRandom鍙樺寲棰戠巼,20琛ㄧず20澶╂洿鏂颁竴娆� - List simIndexs = SimRandom.getSimRandom(seed, currentCount, needCount);// 获取随机Index + List simIndexs = SimRandom.getSimRandom(seed, currentCount, needCount);// 鑾峰彇闅忔満Index List limitedRegions = new ArrayList(needCount); for (int index : simIndexs) { diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SellHouseReportController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SellHouseReportController.java index 65d456af2..5a753a4ea 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SellHouseReportController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SellHouseReportController.java @@ -52,12 +52,12 @@ public class SellHouseReportController { private final static Logger LOGGER = LoggerFactory.getLogger(SellHouseReportController.class); /** - * 房源挂牌数据列表 + * 鎴挎簮鎸傜墝鏁版嵁鍒楄〃 * @param model * @return */ public Object quoteListAction(HouseReportModel model){ - LOGGER.info("SellHouseReportController.quoteListAction 参数model为" + JsonUtils.toJson(model)); + LOGGER.info("SellHouseReportController.quoteListAction 鍙傛暟model涓�" + JsonUtils.toJson(model)); Evaluation eval = evaluationService.findEvaluationById(model.getEid()); model.setEvaluation(eval); Pager pager = model.getPager(20); @@ -73,12 +73,12 @@ public class SellHouseReportController { } /** - * 成交数据列表 + * 鎴愪氦鏁版嵁鍒楄〃 * @param model * @return */ public Object dealListAction(HouseReportModel model){ - LOGGER.info("SellHouseReportController.dealListAction 参数model为" + JsonUtils.toJson(model)); + LOGGER.info("SellHouseReportController.dealListAction 鍙傛暟model涓�" + JsonUtils.toJson(model)); Evaluation eval = evaluationService.findEvaluationById(model.getEid()); model.setEvaluation(eval); Pager pager = model.getPager(20); @@ -95,12 +95,12 @@ public class SellHouseReportController { } /** - * 简要报告 + * 绠�瑕佹姤鍛� * @param model * @return */ public Object briefAction(HouseReportModel model){ - model.setReportTitle("简要报告"); + model.setReportTitle("绠�瑕佹姤鍛�"); Evaluation eval = evaluationService.findEvaluationById(model.getEid()); model.setEvaluation(eval); SqmetreRent sqmetreRent = sqmetreRentService.findNearestSqmetreRent(eval.getCity(), eval.getRegion(), eval.getDistrictName(), "district"); @@ -108,8 +108,8 @@ public class SellHouseReportController { int rentPrice = (int) (sqmetreRent.getAvgPrice().intValue() * eval.getArea()); model.setRentPrice(rentPrice); } - List creditProductList = loanProductService.findProductByType("信用贷",LoanProductPositionEnum.SIMPLE_REPORT.getId()); - List houseProductList = loanProductService.findProductByType("房抵贷",LoanProductPositionEnum.SIMPLE_REPORT.getId()); + List creditProductList = loanProductService.findProductByType("淇$敤璐�",LoanProductPositionEnum.SIMPLE_REPORT.getId()); + List houseProductList = loanProductService.findProductByType("鎴挎姷璐�",LoanProductPositionEnum.SIMPLE_REPORT.getId()); if(creditProductList!=null && creditProductList.size()>0){ LoanProduct creditProduct = creditProductList.get(0); List tagList = new ArrayList(); @@ -137,16 +137,16 @@ public class SellHouseReportController { } /** - * 卖房报告 + * 鍗栨埧鎶ュ憡 * @param model * @return */ public Object sellAction(HouseReportModel model){ - model.setReportTitle("卖房报告"); + model.setReportTitle("鍗栨埧鎶ュ憡"); Evaluation eval = evaluationService.findEvaluationById(model.getEid()); model.setEvaluation(eval); - List creditProductList = loanProductService.findProductByType("信用贷",LoanProductPositionEnum.SELL_REPORT.getId()); - List houseProductList = loanProductService.findProductByType("房抵贷",LoanProductPositionEnum.SELL_REPORT.getId()); + List creditProductList = loanProductService.findProductByType("淇$敤璐�",LoanProductPositionEnum.SELL_REPORT.getId()); + List houseProductList = loanProductService.findProductByType("鎴挎姷璐�",LoanProductPositionEnum.SELL_REPORT.getId()); if(creditProductList!=null && creditProductList.size()>0){ LoanProduct creditProduct = creditProductList.get(0); List tagList = new ArrayList(); @@ -190,7 +190,7 @@ public class SellHouseReportController { } /** - * 挂牌信息 + * 鎸傜墝淇℃伅 * @param model * @return */ @@ -213,7 +213,7 @@ public class SellHouseReportController { } /** - * 成交信息模块 + * 鎴愪氦淇℃伅妯″潡 * @param model * @return */ diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SellHouseSearchController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SellHouseSearchController.java index a82dc4c39..5ed9fc07b 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SellHouseSearchController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SellHouseSearchController.java @@ -107,7 +107,7 @@ public class SellHouseSearchController { } /** - * 列表页上的估价,异步实现 + * 鍒楄〃椤典笂鐨勪及浠凤紝寮傛瀹炵幇 * * @param model * @return @@ -131,10 +131,10 @@ public class SellHouseSearchController { private FacetQueryResult feedAndFilterHouseBoList(FacetQueryResult houseBoResult, HouseModel model) throws Exception { - // 暂停CPC逻辑 + // 鏆傚仠CPC閫昏緫 // cpcService.checkCpcUserEnable(houseBoResult); - // 增加最后的CPC房源 13/01/09 + // 澧炲姞鏈�鍚庣殑CPC鎴挎簮 13/01/09 // addCpcHouse(houseBoResult, model); for (HouseBo bo : houseBoResult) { @@ -153,7 +153,7 @@ public class SellHouseSearchController { bo.setName(StringUtils.replaceChars(StringUtils.substring(DataUtil.removeHtml(bo.getHouse().getName()), 0, 20), '@', ' ')); - // 关键词高亮 + // 鍏抽敭璇嶉珮浜� if (model != null && (StringUtils.isNotBlank(model.getKeyword()) || StringUtils.isNotBlank(model.getHouseTag()))) { String highLightWord = ""; if (StringUtils.isNotBlank(model.getKeyword())) { @@ -205,7 +205,7 @@ public class SellHouseSearchController { } /** - * 起始位置比总数大,说明当前页数不对,从第一页开始 + * 璧峰浣嶇疆姣旀�绘暟澶э紝璇存槑褰撳墠椤垫暟涓嶅锛屼粠绗竴椤靛紑濮� * * @param maxRow * @param pager @@ -226,7 +226,7 @@ public class SellHouseSearchController { } /** - * 二手房搜索列表页面 + * 浜屾墜鎴挎悳绱㈠垪琛ㄩ〉闈� * * @param model * @return @@ -258,14 +258,14 @@ public class SellHouseSearchController { //// } //// } // -// // 菜单类型,如果城市不支持地铁,或地铁参数不对,则默认用区域菜单(学校使用默认菜单) +// // 鑿滃崟绫诲瀷锛屽鏋滃煄甯備笉鏀寔鍦伴搧锛屾垨鍦伴搧鍙傛暟涓嶅锛屽垯榛樿鐢ㄥ尯鍩熻彍鍗�(瀛︽牎浣跨敤榛樿鑿滃崟) // if (!FangjiaServerAreaContextHolder.getServerAreaDefault().isSupportMetro() || null == menuType || menuType > 2 // || menuType < 0) { // menuType = 1; // } // // HouseQueryBean queryBean = null; -// boolean facetByRegion = false;// 是否按区域,板块分面 +// boolean facetByRegion = false;// 鏄惁鎸夊尯鍩燂紝鏉垮潡鍒嗛潰 // // Menu menu = menuService.menuMaker(FangjiaServerAreaContextHolder.getServerAreaDefault(), MenuCategoryEnum.ershoufang, // getCurrentParams(), 0); @@ -275,13 +275,13 @@ public class SellHouseSearchController { // model.setShowSchool(1); //// queryBean = this.buildSchoolHouseQueryBean(model); // } -// if (queryBean == null) {// 普通查询 +// if (queryBean == null) {// 鏅�氭煡璇� // queryBean = this.buildHouseQueryBean(model); // } // String city = FangjiaServerAreaContextHolder.getServerAreaDefault().getDisplay(); // queryBean.setCity(city); // -// // 老网站的URL中区域是带“区”的 +// // 鑰佺綉绔欑殑URL涓尯鍩熸槸甯︹�滃尯鈥濈殑 // if (StringUtils.isNotBlank(queryBean.getRegion())) { // List gList = menu.getGroupList(); // for (Group g : gList) { @@ -302,8 +302,8 @@ public class SellHouseSearchController { // queryBean.setWebsiteName("fangjia.com"); // FacetQueryResult houseBoResult = new FacetQueryResult(); // Sort sort = getSort(model); -// if (sort == null) {// 没有排序条件 -// // 如果是学区房检索 +// if (sort == null) {// 娌℃湁鎺掑簭鏉′欢 +// // 濡傛灉鏄鍖烘埧妫�绱� //// if (null != model.getIfSchool()) { //// houseBoResult = schoolHouseSearch(model, pager, menu, queryBean, null, false, facetByRegion); //// } else { @@ -347,7 +347,7 @@ public class SellHouseSearchController { // model.setSuggestList(suggestList); // } // -// // 处理类似房源信息 +// // 澶勭悊绫讳技鎴挎簮淇℃伅 // setSimilarInfoToList(houseBoResult);// // model.setMenu(menu); // List conditions = menuService.getConditions(FangjiaServerAreaContextHolder.getServerAreaDefault(), @@ -363,21 +363,21 @@ public class SellHouseSearchController { // model.setConditionItems(conditionItems); // // /** -// * gasm统计 +// * gasm缁熻 // */ // model.addGaMap(Gakey.rc, pager.getTotalRows()); // // /** -// * 二手房列表底部SEO推荐区域 +// * 浜屾墜鎴垮垪琛ㄥ簳閮⊿EO鎺ㄨ崘鍖哄煙 // */ // ServerArea serverArea = FangjiaServerAreaContextHolder.getServerAreaDefault(); // List autoRegionRecommends = menuService.getRegionsByCity(serverArea, MenuCategoryEnum.ershoufang); // model.setAutoRegionRecommends(limit(autoRegionRecommends)); // -// // 自定义面积、价格范围搜索 +// // 鑷畾涔夐潰绉�佷环鏍艰寖鍥存悳绱� // processUserConditions(model); // -// // 搜索无结果时,根据关键字推荐其他城市的小区 +// // 鎼滅储鏃犵粨鏋滄椂锛屾牴鎹叧閿瓧鎺ㄨ崘鍏朵粬鍩庡競鐨勫皬鍖� // if (pager.getTotalRows() == 0 && StringUtils.isNotBlank(model.getKeyword())) { // Map konwbase = knowbaseService.parseWord(model.getKeyword()); // List> districts = (null != konwbase && null != konwbase.get("district_name")) ? (List>) konwbase @@ -419,7 +419,7 @@ public class SellHouseSearchController { // model.setDistrict(district); // } // -// // 底部热门推荐的其他城市 +// // 搴曢儴鐑棬鎺ㄨ崘鐨勫叾浠栧煄甯� // List footerCitys = new ArrayList(10); // List cityNames = ServerAreaData.getServerAreaDisplayList(10); // for (String name : cityNames) { @@ -439,10 +439,10 @@ public class SellHouseSearchController { List extraBoList; Pager pager = new Pager(3); - if ("三亚".equals(cityDisplay)) { - extraBoList = getExtraHouses("德佑地产", cityDisplay, true, pager); - } else if ("厦门".equals(cityDisplay)) { - extraBoList = getExtraHouses("黄金屋", cityDisplay, true, pager); + if ("涓変簹".equals(cityDisplay)) { + extraBoList = getExtraHouses("寰蜂綉鍦颁骇", cityDisplay, true, pager); + } else if ("鍘﹂棬".equals(cityDisplay)) { + extraBoList = getExtraHouses("榛勯噾灞�", cityDisplay, true, pager); } else { extraBoList = getExtraHouses("firstvilla.com.cn", cityDisplay, false, pager); } @@ -511,7 +511,7 @@ public class SellHouseSearchController { } /** - * 处理列表上方的筛选条件 + * 澶勭悊鍒楄〃涓婃柟鐨勭瓫閫夋潯浠� * * @param model */ @@ -527,7 +527,7 @@ public class SellHouseSearchController { String totalPriceRange = model.getTotalPriceRange(); if (NumberUtils.isDigits(totalPriceRange)) { - // 菜单中选择 + // 鑿滃崟涓�夋嫨 Value v = menuService.getValue(FangjiaServerAreaContextHolder.getServerAreaDefault(), MenuCategoryEnum.ershoufang, "totalPriceRange", totalPriceRange); model.setMinPrice(v.getMin() / 10000); @@ -549,11 +549,11 @@ public class SellHouseSearchController { String cancelPrice = ""; if (null != model.getMinPrice() && null != model.getMaxPrice()) { - cancelPrice = model.getMinPrice() + "-" + model.getMaxPrice() + "万"; + cancelPrice = model.getMinPrice() + "-" + model.getMaxPrice() + "涓�"; } else if (null != model.getMinPrice()) { - cancelPrice = model.getMinPrice() + "万以上"; + cancelPrice = model.getMinPrice() + "涓囦互涓�"; } else if (null != model.getMaxPrice()) { - cancelPrice = model.getMaxPrice() + "万以下"; + cancelPrice = model.getMaxPrice() + "涓囦互涓�"; } if (StringUtils.isNotBlank(cancelPrice)) { @@ -588,11 +588,11 @@ public class SellHouseSearchController { String cancelArea = ""; if (null != model.getMinArea() && null != model.getMaxArea()) { - cancelArea = model.getMinArea() + "-" + model.getMaxArea() + "平米"; + cancelArea = model.getMinArea() + "-" + model.getMaxArea() + "骞崇背"; } else if (null != model.getMinArea()) { - cancelArea = model.getMinArea() + "平米以上"; + cancelArea = model.getMinArea() + "骞崇背浠ヤ笂"; } else if (null != model.getMaxArea()) { - cancelArea = model.getMaxArea() + "平米以下"; + cancelArea = model.getMaxArea() + "骞崇背浠ヤ笅"; } if (StringUtils.isNotBlank(cancelArea)) { @@ -605,13 +605,13 @@ public class SellHouseSearchController { } if (null != model.getIfSchool() && model.getIfSchool() == 1 && (null == model.getMenuType() || model.getMenuType() != 3)) { - cons.add("学区房"); - consMap.add(new Item("1", "学区房", new Group("ifSchool"))); + cons.add("瀛﹀尯鎴�"); + consMap.add(new Item("1", "瀛﹀尯鎴�", new Group("ifSchool"))); } if (null != model.getIfMetro() && model.getIfMetro() == 1 && (null == model.getMenuType() || model.getMenuType() != 2)) { - cons.add("地铁房"); - consMap.add(new Item("1", "地铁房", new Group("ifMetro"))); + cons.add("鍦伴搧鎴�"); + consMap.add(new Item("1", "鍦伴搧鎴�", new Group("ifMetro"))); } if (StringUtils.isNotBlank(model.getCompanyStd())) { @@ -624,30 +624,30 @@ public class SellHouseSearchController { } /** - * 给有经纬度的房源的similarInfo赋值 + * 缁欐湁缁忕含搴︾殑鎴挎簮鐨剆imilarInfo璧嬪�� * * @param houseBoResult */ private void setSimilarInfoToList(FacetQueryResult houseBoResult) { for (HouseBo houseBo : houseBoResult) { if (houseBo.isMatchedDistrict()) { - // "黄浦区_上海康城_2室_98平米_126万_相似房源" + // "榛勬郸鍖篲涓婃捣搴峰煄_2瀹98骞崇背_126涓嘷鐩镐技鎴挎簮" String districtName = houseBo.getDistrictName(); - // 去掉小区的高亮字符,eg:上海康城<%2Ffont>;涓婃捣搴峰煄<%2Ffont>; if (districtName.contains("") || districtName.contains("")) { districtName = DataUtil.removeHtml(districtName); } // DataUtil.removeHtml(str) - String similarInfo = houseBo.getRegion() + "区_" + districtName + "_" + houseBo.getHouse().getRoom() + "室_" - + (int) ((double) houseBo.getHouse().getArea()) + "平米_" + getAvgPrice(houseBo.getHouse()) + "元(㎡)_类似房源"; + String similarInfo = houseBo.getRegion() + "鍖篲" + districtName + "_" + houseBo.getHouse().getRoom() + "瀹" + + (int) ((double) houseBo.getHouse().getArea()) + "骞崇背_" + getAvgPrice(houseBo.getHouse()) + "鍏�(銕�)_绫讳技鎴挎簮"; houseBo.setSimilarInfo(similarInfo); } } } /** - * 计算房屋单价 + * 璁$畻鎴垮眿鍗曚环 * * @param house * @return @@ -671,21 +671,21 @@ public class SellHouseSearchController { String sortField, boolean asc, boolean facetByRegion) { /***** schoolQueryResult **********************************************/ FacetQueryResult houseBoResult = new FacetQueryResult(0); - // 输入的关键字 + // 杈撳叆鐨勫叧閿瓧 // if (StringUtils.isNotBlank(queryBean.getSchool())) { houseBoResult = houseService.findWithFacetSearch(menu, pager, queryBean, sortField, asc, facetByRegion); // } else { - // // 不分面 + // // 涓嶅垎闈� // houseBoResult = houseService.findByQueryBeanSort(pager, queryBean, // sortField, asc); - // // 分面 + // // 鍒嗛潰 // } /***** schoolQueryResult **********************************************/ return houseBoResult; } /** - * 地铁房Query + * 鍦伴搧鎴縌uery * * @param model * @return @@ -696,7 +696,7 @@ public class SellHouseSearchController { } /** - * 普通Query构建 + * 鏅�歈uery鏋勫缓 * * @param model * @return @@ -714,7 +714,7 @@ public class SellHouseSearchController { queryBean.setFullTextSearch(true); /** - * 如果是命名查询 + * 濡傛灉鏄懡鍚嶆煡璇� */ if (StringUtils.isNotBlank(model.getCustomQuery())) { Customquery customquery = customqueryService.findByName(model.getCustomQuery()); @@ -746,7 +746,7 @@ public class SellHouseSearchController { } /** - * 学区房Query + * 瀛﹀尯鎴縌uery * * @param model * @return @@ -785,32 +785,32 @@ public class SellHouseSearchController { } /** - * 按时间做Seed获取的随机筛选的区域信息 + * 鎸夋椂闂村仛Seed鑾峰彇鐨勯殢鏈虹瓫閫夌殑鍖哄煙淇℃伅 * * @param items - * @return 随机筛选的区域信息 + * @return 闅忔満绛涢�夌殑鍖哄煙淇℃伅 */ private List limit(List items) { - int needCount = 9;// 获取的数据个数10个 + int needCount = 9;// 鑾峰彇鐨勬暟鎹釜鏁�10涓� - int changeDay = 20;// 设置更新频率为20天 + int changeDay = 20;// 璁剧疆鏇存柊棰戠巼涓�20澶� - int currentCount = items.size();// 当前获取的Region总数 + int currentCount = items.size();// 褰撳墠鑾峰彇鐨凴egion鎬绘暟 if (currentCount <= needCount) return items; Calendar oldTime = Calendar.getInstance(); - oldTime.set(2011, 8, 1);// 初始化时间为2011年09月01日 + oldTime.set(2011, 8, 1);// 鍒濆鍖栨椂闂翠负2011骞�09鏈�01鏃� Calendar newTime = Calendar.getInstance(); - int reduceDay = SimRandom.getReduceDay(newTime, oldTime);// 获取日期与初始日期相差天数 + int reduceDay = SimRandom.getReduceDay(newTime, oldTime);// 鑾峰彇鏃ユ湡涓庡垵濮嬫棩鏈熺浉宸ぉ鏁� - int seed = (int) reduceDay / changeDay;// 计算simRandom变化频率,20表示20天更新一次 + int seed = (int) reduceDay / changeDay;// 璁$畻simRandom鍙樺寲棰戠巼,20琛ㄧず20澶╂洿鏂颁竴娆� - List simIndexs = SimRandom.getSimRandom(seed, currentCount, needCount);// 获取随机Index + List simIndexs = SimRandom.getSimRandom(seed, currentCount, needCount);// 鑾峰彇闅忔満Index List limitedRegions = new ArrayList(needCount); for (int index : simIndexs) { @@ -857,7 +857,7 @@ public class SellHouseSearchController { model.setDistrictName(district.getName()); } - /**---------------------------2015/10/08 舍弃使用知识库 王文艳 + /**---------------------------2015/10/08 鑸嶅純浣跨敤鐭ヨ瘑搴� 鐜嬫枃鑹� Map currentDistrict = null; Map konwbase = knowbaseService.parseWord(model.getKeyword()); List> districts = (null != konwbase && null != konwbase.get("district_name")) ? (List>) konwbase @@ -885,7 +885,7 @@ public class SellHouseSearchController { District district = districtService.findDistrict(new DistrictKey(city, region, district_name), false); model.setDistrict(district); model.setRegion(region); - // 右侧小区地图 + // 鍙充晶灏忓尯鍦板浘 if (null != district && null != district.getLat() && null != district.getLng()) { double lat = (double) (district.getLat()) / 10000000000L; double lng = (double) (district.getLng()) / 10000000000L; @@ -912,7 +912,7 @@ public class SellHouseSearchController { } /** - * 重新评估 + * 閲嶆柊璇勪及 * * @param model * @return @@ -949,7 +949,7 @@ public class SellHouseSearchController { } // /** - // * 按房源相似信息获取QueryBean + // * 鎸夋埧婧愮浉浼间俊鎭幏鍙朡ueryBean // * // * @param queryBean // * @param model @@ -994,13 +994,13 @@ public class SellHouseSearchController { // } // if (similarInfoStr.length >= 5 && // StringUtils.isNotBlank(similarInfoStr[4])) { - // if (similarInfoStr[4].endsWith("元(㎡)")) { + // if (similarInfoStr[4].endsWith("鍏�(銕�)")) { // String avgPrice = similarInfoStr[4].substring(0, // similarInfoStr[4].length() - 4); // if (StringUtils.isNumeric(avgPrice)) { // model.setAvgPrice(Integer.parseInt(avgPrice)); // } - // } else if (similarInfoStr[4].endsWith("万")) { + // } else if (similarInfoStr[4].endsWith("涓�")) { // String totalPrice = similarInfoStr[4].substring(0, // similarInfoStr[4].length() - 1); // if (StringUtils.isNumeric(totalPrice)) { @@ -1014,10 +1014,10 @@ public class SellHouseSearchController { // District district = districtService.findDistrict(key, true); // // if (null != district && (DataUtil.verifyLatLng(district.getLat(), - // district.getLng()))) {// 小区存在,并检验经纬度 + // district.getLng()))) {// 灏忓尯瀛樺湪锛屽苟妫�楠岀粡绾害 // model.setLat(String.valueOf(district.getLat())); // model.setLng(String.valueOf(district.getLng())); - // } else {// 未匹配获得小区,返回,按照普通查询 + // } else {// 鏈尮閰嶈幏寰楀皬鍖猴紝杩斿洖锛屾寜鐓ф櫘閫氭煡璇� // model.setDistrictName(null); // return null; // } @@ -1027,14 +1027,14 @@ public class SellHouseSearchController { // queryBean.setRegion(region); // } // - // if (null != model.getRegion()) { // 如果是重新选择了区域,板块,则在经纬度基础上加 区域,板块 - // // 的条件 + // if (null != model.getRegion()) { // 濡傛灉鏄噸鏂伴�夋嫨浜嗗尯鍩燂紝鏉垮潡锛屽垯鍦ㄧ粡绾害鍩虹涓婂姞 鍖哄煙锛屾澘鍧� + // // 鐨勬潯浠� // queryBean.setRegion(model.getRegion()); // if (null != model.getBlock()) { // queryBean.setBlock(model.getBlock()); // } // } else { - // model.setRegion(region);// 按区域分面 + // model.setRegion(region);// 鎸夊尯鍩熷垎闈� // } // if (null != model.getFloorRange()) { // queryBean.setFloorRange(model.getFloorRange()); @@ -1043,7 +1043,7 @@ public class SellHouseSearchController { // queryBean.setHouseTag(model.getHouseTag()); // } // if (null != model.getDistrictName()) { - // model.setDistrictName(null);// 去掉小区名 + // model.setDistrictName(null);// 鍘绘帀灏忓尯鍚� // } // return queryBean; // } else { @@ -1053,7 +1053,7 @@ public class SellHouseSearchController { // } /** - * 构建 HouseQueryBean 来检索 条件:按经纬度周边5公里,物业类型, 面积,价格 (正负10%),从近到远排序 + * 鏋勫缓 HouseQueryBean 鏉ユ绱� 鏉′欢锛氭寜缁忕含搴﹀懆杈�5鍏噷锛岀墿涓氱被鍨嬶紝 闈㈢Н,浠锋牸 (姝h礋10%)锛屼粠杩戝埌杩滄帓搴� * * @param * @@ -1076,9 +1076,9 @@ public class SellHouseSearchController { } // double dlat = (double) (lat / 10000000000.0); // double dlng = (double) (lng / 10000000000.0);// - // 纬度必须为正负90,经度为正负180 + // 绾害蹇呴』涓烘璐�90锛岀粡搴︿负姝h礋180 // if (!(dlat >= -90 && dlat <= 90 && dlng >= -180 && dlng <= 180)) - // {// 经纬度不符合规范,按原来的查 + // {// 缁忕含搴︿笉绗﹀悎瑙勮寖锛屾寜鍘熸潵鐨勬煡 // return null; // } // queryBean.setLat(lat); diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SitemapController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SitemapController.java index 663cf22f0..138b0629f 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SitemapController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SitemapController.java @@ -79,7 +79,7 @@ public class SitemapController { } /** - * 页码集列表 + * 椤电爜闆嗗垪琛� * * @param model * @return @@ -99,7 +99,7 @@ public class SitemapController { } pager.setTotalRows(NUMBER_FOUND); - // 随机推荐100个有效关键词 + // 闅忔満鎺ㄨ崘100涓湁鏁堝叧閿瘝 Pager randomPager = new Pager(); if (pager.getStartRow() < 100 * 100) { int startRow = RandomUtils.nextInt(100 * 100 * 100 - pager.getPageSize()); @@ -114,7 +114,7 @@ public class SitemapController { if (pager.getStartRow() > 10000) { List links = keywordsBaiduService.getKeywordsList(pager); List showLinks = new ArrayList(); - // 过滤无效的数据 + // 杩囨护鏃犳晥鐨勬暟鎹� for (KeywordsBaidu link : links) { if (link.getVisible() == 0) { showLinks.add(link); @@ -122,7 +122,7 @@ public class SitemapController { } model.setPageLinks(showLinks); } else { - // 页码集页面显示所有数据 + // 椤电爜闆嗛〉闈㈡樉绀烘墍鏈夋暟鎹� model.setPageLinks(keywordsBaiduService.getKeywordsList(pager)); } feedFooter(model); @@ -142,13 +142,13 @@ public class SitemapController { } private String getSiteMapDirType(Pager pager) { - if (pager == null) {// 默认一级目录 + if (pager == null) {// 榛樿涓�绾х洰褰� return "first"; } else { if (pager.getStartRow() > NUMBER_FOUND * 2) { return "first"; } - if (pager.getCurrentPage() <= 100) {// 二级目录 1-100,三级目录>100 + if (pager.getCurrentPage() <= 100) {// 浜岀骇鐩綍 1-100,涓夌骇鐩綍>100 return "second"; } } @@ -156,7 +156,7 @@ public class SitemapController { } /** - * 热点地图2 + * 鐑偣鍦板浘2 * * @param model * @return @@ -164,7 +164,7 @@ public class SitemapController { public Object list2Action(SiteMapModel model) { Pager pager = model.getPager(); String dirType = getSiteMapDirType(pager); - if (pager == null) {// 默认一级目录 + if (pager == null) {// 榛樿涓�绾х洰褰� pager = new Pager(100); } else { pager.setPageSize(100); @@ -174,7 +174,7 @@ public class SitemapController { model.setKeywords(getRandomKeywordsList()); model.setPageLinks(getKeywordsList(pager, false)); } else if (dirType.equals("second")) { - model.setKeywords(getRandomKeywordsList());// 二级目录有随机关键词 ,三级目录没有 + model.setKeywords(getRandomKeywordsList());// 浜岀骇鐩綍鏈夐殢鏈哄叧閿瘝 锛屼笁绾х洰褰曟病鏈� pager.setStartRow((pager.getCurrentPage()) * 100 + NUMBER_FOUND); model.setPageLinks(getKeywordsList(pager, false)); } else { @@ -188,18 +188,18 @@ public class SitemapController { } /** - * 查询关键词 + * 鏌ヨ鍏抽敭璇� * * @param pager * @param filter - * 是否过滤无效关键词 - * @return 关键词列表 + * 鏄惁杩囨护鏃犳晥鍏抽敭璇� + * @return 鍏抽敭璇嶅垪琛� */ private List getKeywordsList(Pager pager, boolean filter) { if (filter) { List links = keywordsBaiduService.getKeywordsList(pager); List showLinks = new ArrayList(); - // 过滤无效的数据 + // 杩囨护鏃犳晥鐨勬暟鎹� for (KeywordsBaidu link : links) { if (link.getVisible() == 0) { showLinks.add(link); @@ -212,7 +212,7 @@ public class SitemapController { } private void feedFooter(SiteMapModel model) { - // 最新上线的城市 + // 鏈�鏂颁笂绾跨殑鍩庡競 List newCitys = new ArrayList(); List serverAreaList = ServerAreaData.getServerAreaList(15); List cityNames = org.sothis.core.util.CollectionUtils.collect(serverAreaList, new Closure() { @@ -232,10 +232,10 @@ public class SitemapController { } /** - * 获取当前城市 + * 鑾峰彇褰撳墠鍩庡競 * * @param request - * @return 当前城市 + * @return 褰撳墠鍩庡競 */ private ServerArea getSuggestCity(HttpServletRequest request) { String ip = AnalyticsUtil.getIpAddress(request); @@ -253,7 +253,7 @@ public class SitemapController { } /** - * 随即上限设定 + * 闅忓嵆涓婇檺璁惧畾 * * @param maxSize * @param visibleMaxSize @@ -268,7 +268,7 @@ public class SitemapController { } /** - * 生成SEO关键词SiteMap索引文件 + * 鐢熸垚SEO鍏抽敭璇峉iteMap绱㈠紩鏂囦欢 * * @param model * @return @@ -295,7 +295,7 @@ public class SitemapController { } /** - * 生成SEO关键词页面SiteMap + * 鐢熸垚SEO鍏抽敭璇嶉〉闈iteMap * * @param model * @return @@ -332,7 +332,7 @@ public class SitemapController { } /** - * 页面siteMap + * 椤甸潰siteMap * * @param model * @return @@ -347,7 +347,7 @@ public class SitemapController { } /** - * 页面siteMap + * 椤甸潰siteMap * * @param model * @return @@ -364,7 +364,7 @@ public class SitemapController { model.setCategory("district"); } - // 默认category是district + // 榛樿category鏄痙istrict if ("district".equals(model.getCategory())) { pager.setPageSize(200); FacetQueryResult result; @@ -422,7 +422,7 @@ public class SitemapController { } /** - * 页面siteMap + * 椤甸潰siteMap * * @param model * @return @@ -441,7 +441,7 @@ public class SitemapController { /** * - * 热门标签 小区 地铁 板块SiteMap索引文件 + * 鐑棬鏍囩 灏忓尯 鍦伴搧 鏉垮潡SiteMap绱㈠紩鏂囦欢 * * @param model * @return @@ -453,12 +453,12 @@ public class SitemapController { ServerArea serverArea = ServerAreaData.getServerAreaByDisplay(display); String cityUrl = model.getCityUrl(display); if (serverArea.isSupportBlock()) { - maps.add(new Sitemap(cityUrl + "/sitemap/block", lastModDate));// 板块 + maps.add(new Sitemap(cityUrl + "/sitemap/block", lastModDate));// 鏉垮潡 } if (serverArea.isSupportMetro()) { - maps.add(new Sitemap(cityUrl + "/sitemap/metro", lastModDate));// 地铁 + maps.add(new Sitemap(cityUrl + "/sitemap/metro", lastModDate));// 鍦伴搧 } - maps.add(new Sitemap(cityUrl + "/sitemap/hotTag", lastModDate));// 热门标签 + maps.add(new Sitemap(cityUrl + "/sitemap/hotTag", lastModDate));// 鐑棬鏍囩 maps.addAll(getDetailLink(model, lastModDate)); } Sitemapindex mapIndex = new Sitemapindex(); @@ -467,7 +467,7 @@ public class SitemapController { } /** - * 按城市获取SiteMap详情链接 + * 鎸夊煄甯傝幏鍙朣iteMap璇︽儏閾炬帴 * * @param cityUrl * @return @@ -476,14 +476,14 @@ public class SitemapController { List urls = new ArrayList(); Map stats = districtService.findFacetDistrictCountByCity(); for (Entry stat : stats.entrySet()) { - int value = (int) (stat.getValue() / 100) + 1;// 分页默认大小 100 + int value = (int) (stat.getValue() / 100) + 1;// 鍒嗛〉榛樿澶у皬 100 urls.addAll(getDistrictUrls(model.getCityUrl(stat.getKey()), value, lastModDate)); } return urls; } /** - * 获取小区_sitemap详细页 + * 鑾峰彇灏忓尯_sitemap璇︾粏椤� * * @param cityUrl * @param city @@ -501,7 +501,7 @@ public class SitemapController { /** * - * 热门标签 _sitemap 详细页 (包括二手房热门标签和租房热门标签) + * 鐑棬鏍囩 _sitemap 璇︾粏椤� (鍖呮嫭浜屾墜鎴跨儹闂ㄦ爣绛惧拰绉熸埧鐑棬鏍囩) * */ public Object hotTagAction(SiteMapModel model, HttpServletResponse response) { @@ -512,7 +512,7 @@ public class SitemapController { } /** - * 区域_Sitemap详细页 + * 鍖哄煙_Sitemap璇︾粏椤� * * @param model * @return @@ -529,7 +529,7 @@ public class SitemapController { } /** - * 获取所有的板块搜索链接 + * 鑾峰彇鎵�鏈夌殑鏉垮潡鎼滅储閾炬帴 * * @param model * @param blocks @@ -544,7 +544,7 @@ public class SitemapController { } /** - * 获取所有的板块搜索链接 + * 鑾峰彇鎵�鏈夌殑鏉垮潡鎼滅储閾炬帴 * * @param tags * @param menus @@ -569,7 +569,7 @@ public class SitemapController { } /** - * 查询当前城市的所有小区 + * 鏌ヨ褰撳墠鍩庡競鐨勬墍鏈夊皬鍖� * * @return */ @@ -582,7 +582,7 @@ public class SitemapController { /** * - * 小区 _sitemap 详细页 包括 小区详情页链接、 二手房列表小区搜索、租房列表小区搜索 + * 灏忓尯 _sitemap 璇︾粏椤� 鍖呮嫭 灏忓尯璇︽儏椤甸摼鎺ャ�� 浜屾墜鎴垮垪琛ㄥ皬鍖烘悳绱€�佺鎴垮垪琛ㄥ皬鍖烘悳绱� */ public Object districtAction(SiteMapModel model, HttpServletResponse response) { @@ -597,14 +597,14 @@ public class SitemapController { List urls = new ArrayList(); FacetQueryResult districts = findAllDistricts(pager); if (CollectionUtils.isNotEmpty(districts)) { - // 添加所有小区详情页的链接 + // 娣诲姞鎵�鏈夊皬鍖鸿鎯呴〉鐨勯摼鎺� for (District district : districts) { if (!StringUtils.isBlank(district.getName())) { urls.add(new Url(model.getCityUrl() + "/xiaoqu-xinxi-" + encode(district.getName()) + "-" + encode(district.getRegion()), Priority.PRIORITY_DETAIL)); } } - // 添加二手房 租房搜索链接 + // 娣诲姞浜屾墜鎴� 绉熸埧鎼滅储閾炬帴 urls.addAll(getDistrictSearchUrls(model, getDistrictNames(districts), response)); } model.setPager(pager); @@ -614,7 +614,7 @@ public class SitemapController { } /** - * 地铁_Sitemap详细页 + * 鍦伴搧_Sitemap璇︾粏椤� * * @param model * @return @@ -633,7 +633,7 @@ public class SitemapController { } /** - * 获取二手房 租房列表 地铁搜索URL + * 鑾峰彇浜屾墜鎴� 绉熸埧鍒楄〃 鍦伴搧鎼滅储URL * * @param model * @return @@ -642,15 +642,15 @@ public class SitemapController { private List getMertorsURI(SiteMapModel model, List districts, HttpServletResponse response) { List sellMenu = getMenuList(model.getCity(), MenuCategoryEnum.ershoufang); List rentMenu = getMenuList(model.getCity(), MenuCategoryEnum.zufang); - // 添加所有的二手房地铁搜索链接 + // 娣诲姞鎵�鏈夌殑浜屾墜鎴垮湴閾佹悳绱㈤摼鎺� List urls = findMetroSearchLinks(districts, sellMenu, getCityDomain(model), "/sellHouseSearch/list", response); - // 添加所有的租房地铁搜索链接 + // 娣诲姞鎵�鏈夌殑绉熸埧鍦伴搧鎼滅储閾炬帴 urls.addAll(findMetroSearchLinks(districts, rentMenu, getCityDomain(model), "/rentHouseSearch/list", response)); return urls; } /** - * 获取城市domain + * 鑾峰彇鍩庡競domain * * @param model * @return @@ -660,7 +660,7 @@ public class SitemapController { } /** - * 获取所有的地铁搜索链接 + * 鑾峰彇鎵�鏈夌殑鍦伴搧鎼滅储閾炬帴 * * @param tags * @param menus @@ -685,7 +685,7 @@ public class SitemapController { } /** - * 获取二手房 租房列表 小区搜索URL + * 鑾峰彇浜屾墜鎴� 绉熸埧鍒楄〃 灏忓尯鎼滅储URL * * @param model * @return @@ -699,7 +699,7 @@ public class SitemapController { } /** - * 获取所有的小区名 + * 鑾峰彇鎵�鏈夌殑灏忓尯鍚� * * @param districts * @return @@ -714,104 +714,104 @@ public class SitemapController { } /** - * 获取初始化标签信息 + * 鑾峰彇鍒濆鍖栨爣绛句俊鎭� * * @return */ private List getHotHouseTag() { List tags = new ArrayList(); - tags.add("小户型"); - tags.add("地热采暖"); - tags.add("地铁沿线"); - tags.add("拎包入住"); - tags.add("带露台"); - tags.add("交通便利"); - tags.add("全朝南"); - tags.add("随时带看"); - tags.add("景观房"); - tags.add("高性价比"); - tags.add("带车位"); - tags.add("学区房"); - tags.add("商住两用"); - tags.add("带地下室"); - tags.add("免佣金"); - tags.add("复式房"); - tags.add("小区环境好"); - tags.add("投资"); - tags.add("家电齐全"); - tags.add("采光好"); - tags.add("豪华装修"); - tags.add("带阁楼"); - tags.add("繁华地段"); - tags.add("带花园"); - tags.add("免税房"); - tags.add("南北通透"); - tags.add("房东急售"); + tags.add("灏忔埛鍨�"); + tags.add("鍦扮儹閲囨殩"); + tags.add("鍦伴搧娌跨嚎"); + tags.add("鎷庡寘鍏ヤ綇"); + tags.add("甯﹂湶鍙�"); + tags.add("浜ら�氫究鍒�"); + tags.add("鍏ㄦ湞鍗�"); + tags.add("闅忔椂甯︾湅"); + tags.add("鏅鎴�"); + tags.add("楂樻�т环姣�"); + tags.add("甯﹁溅浣�"); + tags.add("瀛﹀尯鎴�"); + tags.add("鍟嗕綇涓ょ敤"); + tags.add("甯﹀湴涓嬪"); + tags.add("鍏嶄剑閲�"); + tags.add("澶嶅紡鎴�"); + tags.add("灏忓尯鐜濂�"); + tags.add("鎶曡祫"); + tags.add("瀹剁數榻愬叏"); + tags.add("閲囧厜濂�"); + tags.add("璞崕瑁呬慨"); + tags.add("甯﹂榿妤�"); + tags.add("绻佸崕鍦版"); + tags.add("甯﹁姳鍥�"); + tags.add("鍏嶇◣鎴�"); + tags.add("鍗楀寳閫氶��"); + tags.add("鎴夸笢鎬ュ敭"); return tags; } /** - * 租房标签 + * 绉熸埧鏍囩 * * @return */ private List getRentHouseTag() { List tags = new ArrayList(); - tags.add("小户型"); - tags.add("随时带看"); - tags.add("异性合租"); - tags.add("家电齐全"); - tags.add("带地下室"); - tags.add("地铁沿线"); - tags.add("拎包入住"); - tags.add("小区环境好"); - tags.add("全朝南"); - tags.add("景观房"); - tags.add("交通便利"); - tags.add("高性价比"); - tags.add("采光好"); - tags.add("大学生租房"); - tags.add("商住两用"); - tags.add("带车位"); - tags.add("免佣金"); - tags.add("房东急租"); - tags.add("改底单"); - tags.add("南北通透"); - tags.add("豪华装修"); - tags.add("带露台"); - tags.add("投资"); - tags.add("地热采暖"); - tags.add("带阁楼"); - tags.add("学区房"); - tags.add("带花园"); - tags.add("复式房"); - tags.add("温泉热水"); + tags.add("灏忔埛鍨�"); + tags.add("闅忔椂甯︾湅"); + tags.add("寮傛�у悎绉�"); + tags.add("瀹剁數榻愬叏"); + tags.add("甯﹀湴涓嬪"); + tags.add("鍦伴搧娌跨嚎"); + tags.add("鎷庡寘鍏ヤ綇"); + tags.add("灏忓尯鐜濂�"); + tags.add("鍏ㄦ湞鍗�"); + tags.add("鏅鎴�"); + tags.add("浜ら�氫究鍒�"); + tags.add("楂樻�т环姣�"); + tags.add("閲囧厜濂�"); + tags.add("澶у鐢熺鎴�"); + tags.add("鍟嗕綇涓ょ敤"); + tags.add("甯﹁溅浣�"); + tags.add("鍏嶄剑閲�"); + tags.add("鎴夸笢鎬ョ"); + tags.add("鏀瑰簳鍗�"); + tags.add("鍗楀寳閫氶��"); + tags.add("璞崕瑁呬慨"); + tags.add("甯﹂湶鍙�"); + tags.add("鎶曡祫"); + tags.add("鍦扮儹閲囨殩"); + tags.add("甯﹂榿妤�"); + tags.add("瀛﹀尯鎴�"); + tags.add("甯﹁姳鍥�"); + tags.add("澶嶅紡鎴�"); + tags.add("娓╂硥鐑按"); return tags; } /** - * 获取二手房 租房 热门标签的所有组合链接 + * 鑾峰彇浜屾墜鎴� 绉熸埧 鐑棬鏍囩鐨勬墍鏈夌粍鍚堥摼鎺� * * @param model * @return */ private List getAllHotHouseTagURI(SiteMapModel model, HttpServletResponse response) { ServerArea city = model.getCity(); - // 二手房链接前缀 + // 浜屾墜鎴块摼鎺ュ墠缂� String sellPreUri = "/sellHouseSearch/list"; - // 租房链接前缀 + // 绉熸埧閾炬帴鍓嶇紑 String rentPreUri = "/rentHouseSearch/list"; - // 获取二手房搜索链接 + // 鑾峰彇浜屾墜鎴挎悳绱㈤摼鎺� List urls = getAllLinks(getHotHouseTag(), getMenuList(city, MenuCategoryEnum.ershoufang), getCityDomain(model), sellPreUri, response); - // 获取租房搜索链接 + // 鑾峰彇绉熸埧鎼滅储閾炬帴 urls.addAll(getAllLinks(getRentHouseTag(), getMenuList(city, MenuCategoryEnum.zufang), getCityDomain(model), rentPreUri, response)); return urls; } /** - * 获取Menus对应类型的搜索链接 + * 鑾峰彇Menus瀵瑰簲绫诲瀷鐨勬悳绱㈤摼鎺� * * @param keywords * @param menus @@ -828,7 +828,7 @@ public class SitemapController { } /** - * 获取KeyWord和Menus组合的搜索链接 + * 鑾峰彇KeyWord鍜孧enus缁勫悎鐨勬悳绱㈤摼鎺� * * @param keyword * @param menus @@ -849,7 +849,7 @@ public class SitemapController { } /** - * 获取搜索URL + * 鑾峰彇鎼滅储URL * * @param keyword * @param item @@ -864,7 +864,7 @@ public class SitemapController { } /** - * Encode 编码UTF-8 + * Encode 缂栫爜UTF-8 * * @param value * @return diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SnapDataController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SnapDataController.java index 1c314a622..e051201cd 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SnapDataController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SnapDataController.java @@ -36,7 +36,7 @@ public class SnapDataController { private RentHouseService rentHouseService; /** - * 保存房源浏览记录 + * 淇濆瓨鎴挎簮娴忚璁板綍 * * @param model * @return @@ -74,7 +74,7 @@ public class SnapDataController { } /** - * 保存搜索关键字 + * 淇濆瓨鎼滅储鍏抽敭瀛� * * @param model * @return @@ -85,17 +85,17 @@ public class SnapDataController { // String uid = CoresiteCookieContext.getInstance().getCookieValue(ActionContext.getContext().getRequest(), CookieName.UID); // // String url = ""; -// if ("sell".equals(model.getType())) { // 二手房 +// if ("sell".equals(model.getType())) { // 浜屾墜鎴� // url = model.getCityUrl() + "/ershoufang/" + URLEncoder.encode(model.getKeyword(), "UTF-8"); -// } else if ("rent".equals(model.getType())) { // 租房 +// } else if ("rent".equals(model.getType())) { // 绉熸埧 // url = model.getCityUrl() + "/zufang/" + URLEncoder.encode(model.getKeyword(), "UTF-8"); -// } else if ("district".equals(model.getType())) { // 小区 +// } else if ("district".equals(model.getType())) { // 灏忓尯 // url = model.getCityUrl() + "/xiaoqu/" + URLEncoder.encode(model.getKeyword(), "UTF-8"); -// } else if ("evaluation".equals(model.getType())) { // 估价 +// } else if ("evaluation".equals(model.getType())) { // 浼颁环 // url = model.getCityUrl() + "/evaluation/report?keyword=" + URLEncoder.encode(model.getKeyword(), "UTF-8"); -// } else if ("news".equals(model.getType())) { // 资讯 +// } else if ("news".equals(model.getType())) { // 璧勮 // url = model.getSouUrl() + "/xinwen/" + URLEncoder.encode(model.getKeyword(), "UTF-8"); -// } else if ("newDistrict".equals(model.getType())) { // 新盘 +// } else if ("newDistrict".equals(model.getType())) { // 鏂扮洏 // url = model.getCityUrl() + "/xinfang/" + URLEncoder.encode(model.getKeyword(), "UTF-8"); // } else { // if (model.getKeyword() == null) { @@ -111,7 +111,7 @@ public class SnapDataController { } /** - * 保存估价记录 + * 淇濆瓨浼颁环璁板綍 * * @param model * @return @@ -136,7 +136,7 @@ public class SnapDataController { } /** - * 获取历史记录(房源浏览,搜索,估价记录) + * 鑾峰彇鍘嗗彶璁板綍(鎴挎簮娴忚,鎼滅储,浼颁环璁板綍) * * @param model * @return @@ -147,7 +147,7 @@ public class SnapDataController { List> data = null; if (null != sd && CollectionUtils.isNotEmpty(sd.getData())) { data = sd.getData(); - // 倒排序 + // 鍊掓帓搴� Collections.sort(data, new Comparator>() { public int compare(Map o1, Map o2) { return 1; @@ -180,7 +180,7 @@ public class SnapDataController { } /** - * 给Url标记为来自工具条 + * 缁橴rl鏍囪涓烘潵鑷伐鍏锋潯 * * @param data */ @@ -209,14 +209,14 @@ public class SnapDataController { } /** - * 房源浏览记录加入cpc逻辑判断 + * 鎴挎簮娴忚璁板綍鍔犲叆cpc閫昏緫鍒ゆ柇 * * @param model * @return */ @SuppressWarnings("unchecked") private void addCpcInfoIfexists(List> data) { -// // 加入cpc +// // 鍔犲叆cpc // try { // List idListSell = new ArrayList(); // List idListRent = new ArrayList(); diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SolutionController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SolutionController.java index 1af840ad7..94c6be63b 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SolutionController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SolutionController.java @@ -12,14 +12,14 @@ import java.util.HashMap; import java.util.Map; /** - * 解决方案 控制器 + * 瑙e喅鏂规 鎺у埗鍣� * @author yinjihuan * */ public class SolutionController { /** - * API介绍 + * API浠嬬粛 * @param model * @return */ @@ -28,7 +28,7 @@ public class SolutionController { } /** - * API文档 + * API鏂囨。 * @param model * @return */ @@ -37,7 +37,7 @@ public class SolutionController { } /** - * 贷前估值解决方案 + * 璐峰墠浼板�艰В鍐虫柟妗� * @param model * @return */ @@ -46,7 +46,7 @@ public class SolutionController { } /** - * 银行内屏解决方案 + * 閾惰鍐呭睆瑙e喅鏂规 * @param model * @return */ @@ -55,7 +55,7 @@ public class SolutionController { } /** - * 贷中估值解决方案 + * 璐蜂腑浼板�艰В鍐虫柟妗� * @param model * @return */ @@ -67,7 +67,7 @@ public class SolutionController { return model; } /** - * 贷后管理解决方案 + * 璐峰悗绠$悊瑙e喅鏂规 * @param model * @return */ @@ -76,7 +76,7 @@ public class SolutionController { } /** - * 房生活金融客户端营销解决方案 + * 鎴跨敓娲婚噾铻嶅鎴风钀ラ攢瑙e喅鏂规 * @param model * @return */ @@ -85,7 +85,7 @@ public class SolutionController { } /** - * 房贷业务获客解决方案 + * 鎴胯捶涓氬姟鑾峰瑙e喅鏂规 * @param model * @return */ @@ -94,7 +94,7 @@ public class SolutionController { } /** - * 地址精准营销解决方案 + * 鍦板潃绮惧噯钀ラ攢瑙e喅鏂规 * @param model * @return */ @@ -103,7 +103,7 @@ public class SolutionController { } /** - * 地址标准化解决方案 + * 鍦板潃鏍囧噯鍖栬В鍐虫柟妗� * @param model * @return */ @@ -113,21 +113,21 @@ public class SolutionController { /** - * 法拍房解决方案 + * 娉曟媿鎴胯В鍐虫柟妗� * @param model * @return */ public Object paimaiAction(FangjiaModel model){return model;} /** - * 财力评级解决方案 + * 璐㈠姏璇勭骇瑙e喅鏂规 * @param model * @return */ public Object financialAction(FangjiaModel model){return model;} /** - * 一房一价 + * 涓�鎴夸竴浠� * @param model * @return */ @@ -135,91 +135,91 @@ public class SolutionController { /** - * 楼盘评级 + * 妤肩洏璇勭骇 * @param model * @return */ public Object levelAction(FangjiaModel model){return model;} /** - * 地址治理 + * 鍦板潃娌荤悊 * @param model * @return */ public Object addrProAction(FangjiaModel model){return model;} /** - * 网点布局 + * 缃戠偣甯冨眬 */ public Object outletsAction(FangjiaModel model){return model;} /** - * 信用卡 + * 淇$敤鍗� * @param model * @return */ public Object cardAction(FangjiaModel model){return model;} /** - * 地数 + * 鍦版暟 * @param model * @return */ public Object dishuAction(FangjiaModel model){return model;} /** - * 客户分层 + * 瀹㈡埛鍒嗗眰 * @param model * @return */ public Object layerCustomerAction(FangjiaModel model){return model;} /** - * 高净值客户筛选 + * 楂樺噣鍊煎鎴风瓫閫� * @param model * @return */ public Object filterCustomerAction(FangjiaModel model){return model;} /** - * 睡眠户激活 + * 鐫$湢鎴锋縺娲� * @param model * @return */ public Object activateCustomerAction(FangjiaModel model){return model;} /** - * 贷前获客 + * 璐峰墠鑾峰 * @param model * @return */ public Object preLoanCustomerAction(FangjiaModel model){return model;} /** - * 押品风控 + * 鎶煎搧椋庢帶 * @param model * @return */ public Object yapingAction(FangjiaModel model){return model;} /** - * 调额增信 + * 璋冮澧炰俊 * @param model * @return */ public Object creditAction(FangjiaModel model){return model;} /** - * 房产基础数据库建设 + * 鎴夸骇鍩虹鏁版嵁搴撳缓璁� * @param model * @return */ public Object buildingDatabaseAction(FangjiaModel model){return model;} /** - * 网周营销 + * 缃戝懆钀ラ攢 * @param model * @return */ public Object networkMarketingAction(FangjiaModel model){return model;} /** - * 专家服务 + * 涓撳鏈嶅姟 * @param model * @return */ diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/TaskController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/TaskController.java index 522dc9caf..773325681 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/TaskController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/TaskController.java @@ -73,13 +73,13 @@ public class TaskController { } model.setTokens(StringUtils.join(tokenList, ",")); model.setDetails(StringUtils.join(tokens, ", ")); - if ("二手房".equals(model.getChannel())) { + if ("浜屾墜鎴�".equals(model.getChannel())) { model.setQuerys(boostQuerySellPolicy.create(model.getK()).toString()); - } else if ("租房".equals(model.getChannel())) { + } else if ("绉熸埧".equals(model.getChannel())) { model.setQuerys(boostQueryRentPolicy.create(model.getK()).toString()); - } else if ("小区".equals(model.getChannel())) { + } else if ("灏忓尯".equals(model.getChannel())) { model.setQuerys(boostQueryDistrictPolicy.create(model.getK()).toString()); - } else if ("新闻".equals(model.getChannel())) { + } else if ("鏂伴椈".equals(model.getChannel())) { model.setQuerys(boostQueryNewsPolicy.create(model.getK()).toString()); } return model; @@ -111,7 +111,7 @@ public class TaskController { } /** - * 词典重新加载 + * 璇嶅吀閲嶆柊鍔犺浇 * * @param model * @return diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/TermsController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/TermsController.java index f40b4700a..d3ad3f018 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/TermsController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/TermsController.java @@ -6,7 +6,7 @@ import com.fangjia.coresite.model.ResourceModel; public class TermsController { /** - * 用户协议 + * 鐢ㄦ埛鍗忚 * @return */ public Object agreementAction(FangjiaModel model) { @@ -14,7 +14,7 @@ public class TermsController { } /** - * 版权声明 + * 鐗堟潈澹版槑 * @return */ public Object copyrightAction(FangjiaModel model) { @@ -22,7 +22,7 @@ public class TermsController { } /** - * 免责条款 + * 鍏嶈矗鏉℃ * @return */ public Object disclaimerAction(FangjiaModel model) { @@ -30,7 +30,7 @@ public class TermsController { } /** - * 友达介绍 + * 鍙嬭揪浠嬬粛 * @param model * @return */ diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/TrendController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/TrendController.java index 92f546ee6..490db99d6 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/TrendController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/TrendController.java @@ -106,7 +106,7 @@ public class TrendController { } /** - * 走势图小模块 + * 璧板娍鍥惧皬妯″潡 * * @param model * @param request @@ -122,7 +122,7 @@ public class TrendController { return model; } /** - * 房产评估次数 + * 鎴夸骇璇勪及娆℃暟 * * @param model * @return @@ -140,7 +140,7 @@ public class TrendController { } /** - * 走势图 + * 璧板娍鍥� * * @param model * @return @@ -248,7 +248,7 @@ public class TrendController { }*/ - //由于有针对本次均价有导常进行拟合的机制,造成district_stat与district_new_price以前的价格不一致问题,所以还是查district_stat表 + //鐢变簬鏈夐拡瀵规湰娆″潎浠锋湁瀵煎父杩涜鎷熷悎鐨勬満鍒讹紝閫犳垚district_stat涓巇istrict_new_price浠ュ墠鐨勪环鏍间笉涓�鑷撮棶棰橈紝鎵�浠ヨ繕鏄煡district_stat琛� //DistrictNewPrice lastStat = districtNewPriceService.findDistrictStatByWeekend(new DistrictKey(district.getCity(), district.getRegion(), district.getDistrictName()), DateUtil.getFirstDayOfWeek(DateUtil.add(new Date(),-7))); //DistrictStat lastStat = districtStatService.findDistrictStatByWeekend(new DistrictKey(district.getCity(), district.getRegion(), district.getDistrictName()), DateUtil.getFirstDayOfWeek(DateUtil.add(new Date(),-7))); Date agoMonth = DateUtil.addMonthToDate(lastMonth, -1); @@ -297,14 +297,14 @@ public class TrendController { /** - * 城市房价排行 + * 鍩庡競鎴夸环鎺掕 */ private List findCitysAvgPrice(int limit){ List cityStatInfoBos = new ArrayList(); Date date = new Date(); - //当前城市均价 + //褰撳墠鍩庡競鍧囦环 Date weekend = DateUtil.getFirstDayOfWeek(date); List regionStats = regionStatService.findCityStatByWeekend(weekend,limit); @@ -312,11 +312,11 @@ public class TrendController { for(RegionStat regionStat : regionStats){ cityNames.add(regionStat.getCity()); } - //上个月城市均价 + //涓婁釜鏈堝煄甯傚潎浠� Date lastMonthDate = DateUtil.getThisWeekInLastMonth(-1); Date lastWeekend = DateUtil.getFirstDayOfWeek(lastMonthDate); List lastMonthRegionStats = regionStatService.findCityStatByWeekend(lastWeekend,cityNames,limit); - //去年城市均价 + //鍘诲勾鍩庡競鍧囦环 Date lastYearDate = DateUtil.getThisWeekInLastYear(); Date lastYearWeekend = DateUtil.getFirstDayOfWeek(lastYearDate); List lastYearRegionStats = regionStatService.findCityStatByWeekend(lastYearWeekend,cityNames,limit); @@ -358,7 +358,7 @@ public class TrendController { } /** - * 移动页面走势图 + * 绉诲姩椤甸潰璧板娍鍥� */ public Object wtrendAction(TrendModel model) { // Object mav = FangjiaRudder.listMan(model.getKeyword()); @@ -450,7 +450,7 @@ public class TrendController { } /** - * 获取相关城市的行情 + * 鑾峰彇鐩稿叧鍩庡競鐨勮鎯� * * @return */ @@ -504,7 +504,7 @@ public class TrendController { } } - String[] defaultCitys = { "北京", "上海", "广州", "深圳", "天津" }; + String[] defaultCitys = { "鍖椾含", "涓婃捣", "骞垮窞", "娣卞湷", "澶╂触" }; for (int i = 0; i < 5; i++) { if (ret.size() >= 5) { break; @@ -528,7 +528,7 @@ public class TrendController { } /** - * 季度数据集 + * 瀛e害鏁版嵁闆� * * @param model * @return @@ -541,7 +541,7 @@ public class TrendController { } /** - * 半年数据集 + * 鍗婂勾鏁版嵁闆� * * @param model * @return @@ -554,7 +554,7 @@ public class TrendController { } /** - * 一年数据集 + * 涓�骞存暟鎹泦 * * @param model * @return @@ -566,7 +566,7 @@ public class TrendController { return mav; } /** - * 两年数据集 + * 涓ゅ勾鏁版嵁闆� * * @param model * @return @@ -579,7 +579,7 @@ public class TrendController { } /** - * 历史所有数据集 + * 鍘嗗彶鎵�鏈夋暟鎹泦 * * @param model * @return @@ -609,7 +609,7 @@ public class TrendController { addBlockStat(seriesOptions, trendView.getCityName(), trendView.getRegion(), trendView.getBlock(), weeks); } } else if (ViewType.block.equals(trendView.getType())) { - //title = trendView.getRegion() + trendView.getBlock() + "板块"; + //title = trendView.getRegion() + trendView.getBlock() + "鏉垮潡"; addCityColumnStat(seriesOptions, trendView.getCityName(), trendView.getRegion(), trendView.getBlock(), weeks); addRegionStat(seriesOptions, trendView.getCityName(), trendView.getRegion(), weeks); addBlockStat(seriesOptions, trendView.getCityName(), trendView.getRegion(), trendView.getBlock(), weeks); @@ -627,16 +627,16 @@ public class TrendController { List datas = (List) seriesOptions.get(0).get("data"); List firsList = (List) datas.get(0); List lastList = (List) datas.get(datas.size()-1); - title = DateUtil.formatByPattern(new Date((Long) firsList.get(0)), "yyyy年MM月")+"-"+DateUtil.formatByPattern(new Date((Long) lastList.get(0)), "yyyy年MM月"); + title = DateUtil.formatByPattern(new Date((Long) firsList.get(0)), "yyyy骞碝M鏈�")+"-"+DateUtil.formatByPattern(new Date((Long) lastList.get(0)), "yyyy骞碝M鏈�"); } // if (weeks <= QUARTER_WEEK) { -// title += "二手房房价走势"; +// title += "浜屾墜鎴挎埧浠疯蛋鍔�"; // } else if (weeks <= QUARTER_WEEK * 2) { -// title += "二手房房价走势(近半年)"; +// title += "浜屾墜鎴挎埧浠疯蛋鍔�(杩戝崐骞�)"; // } else if (weeks <= QUARTER_WEEK * 4) { -// title += "二手房房价走势(最近一年)"; +// title += "浜屾墜鎴挎埧浠疯蛋鍔�(鏈�杩戜竴骞�)"; // } else { -// title += "二手房房价两年走势"; +// title += "浜屾墜鎴挎埧浠蜂袱骞磋蛋鍔�"; // } HighchartsModel highchartsModel = new HighchartsModel(); @@ -646,7 +646,7 @@ public class TrendController { } private void addDistrictStat(List seriesOptions, DistrictKey districtKey, int weeks) { - List list = Arrays.asList(StringUtils.split(districtService.findDistrictKind(districtKey), ",,")); + List list = Arrays.asList(StringUtils.split(districtService.findDistrictKind(districtKey), ",锛�")); List districtStatBoList = districtStatService.findAllDistrictStatByKind(districtKey, new Date(), weeks, list); JSONArray districtJa = new JSONArray(); @@ -688,7 +688,7 @@ public class TrendController { if (villaJa.length() > 0) { JSONObject jo2 = new JSONObject(); - jo2.put("name", districtKey.getName() + "(别墅)"); + jo2.put("name", districtKey.getName() + "(鍒)"); jo2.put("data", villaJa.toString()); jo2.put("yAxis", 0); seriesOptions.add(jo2); @@ -703,7 +703,7 @@ public class TrendController { Date currentDate = new Date(); if (city != null && region != null && block != null) { regionStatList = regionStatService.findRegionStat(city, region, block, currentDate, weeks); - oprions.put("name", block + "板块"); + oprions.put("name", block + "鏉垮潡"); } else if (city != null && region != null) { //regionStatList = regionStatService.findRegionStat(city, region, null, currentDate, weeks); int month = weeks / 4; @@ -790,7 +790,7 @@ public class TrendController { if (columnJa.length() > 0) { JSONObject jo = new JSONObject(); - jo.put("name", "成交量"); + jo.put("name", "鎴愪氦閲�"); jo.put("data", columnJa.toString()); jo.put("type", "column"); jo.put("yAxis", 1); @@ -802,7 +802,7 @@ public class TrendController { } private void addCityColumnStat(List seriesOptions, String city, String region, String block, int weeks) { - if (!"上海".equals(city)) { + if (!"涓婃捣".equals(city)) { return; } if (weeks > QUARTER_WEEK * 4 || weeks <= QUARTER_WEEK) { @@ -814,10 +814,10 @@ public class TrendController { List fromDates = DateUtil.getSundayListOfWeek(currentDate, weeks); if (city != null && region != null && block != null) { cityTradeStats = this.tradeStatService.findCityTradeStats(fromDates.get(0), currentDate, city, region, block); - oprions.put("name", block + "板块"); + oprions.put("name", block + "鏉垮潡"); } else if (city != null && region != null) { cityTradeStats = this.tradeStatService.findCityTradeStats(fromDates.get(0), currentDate, city, region); - oprions.put("name", "成交量"); + oprions.put("name", "鎴愪氦閲�"); } else if (city != null) { cityTradeStats = this.tradeStatService.findCityTradeStats(fromDates.get(0), currentDate, city); oprions.put("name", city); @@ -837,7 +837,7 @@ public class TrendController { if (columnJa.length() > 0) { JSONObject jo = new JSONObject(); - jo.put("name", "成交量"); + jo.put("name", "鎴愪氦閲�"); jo.put("data", columnJa.toString()); jo.put("type", "column"); jo.put("yAxis", 1); @@ -894,7 +894,7 @@ public class TrendController { } /** - * 区域均价 + * 鍖哄煙鍧囦环 * * @param city * @return @@ -1012,7 +1012,7 @@ public class TrendController { DistrictStatBo bo = new DistrictStatBo(); if(stats.size()==2){ - DistrictStat lastStat = stats.get(1);//上周 + DistrictStat lastStat = stats.get(1);//涓婂懆 Date lastMonth = DateUtils.addMonths(new Date(), -1); int lastPrice = 0; if(lastStat.getWeekend().getTime()>= lastMonth.getTime()){ @@ -1020,9 +1020,9 @@ public class TrendController { lastPrice = lastStat.getAvgPrice(); } - DistrictStat curStat = stats.get(0);//本周 + DistrictStat curStat = stats.get(0);//鏈懆 if(curStat.getWeekend().getTime()>= lastMonth.getTime()){ - if(lastPrice>0){//重新计算均价涨跌幅 + if(lastPrice>0){//閲嶆柊璁$畻鍧囦环娑ㄨ穼骞� int markup = (curStat.getAvgPrice()-lastPrice)*10000/lastPrice; curStat.setWeekendMarkup(markup); } @@ -1031,7 +1031,7 @@ public class TrendController { }else{ Date lastMonth = DateUtils.addMonths(new Date(), -1); - DistrictStat curStat = stats.get(0);//本周 + DistrictStat curStat = stats.get(0);//鏈懆 if(curStat.getWeekend().getTime()>= lastMonth.getTime()){ bo.setDistrictStat(curStat); } @@ -1064,7 +1064,7 @@ public class TrendController { statBo = null; } - // 同比数据 + // 鍚屾瘮鏁版嵁 if (statBo != null) { Date date = DateUtil.getThisWeekInLastYear(); diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/UserController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/UserController.java index 03f3a1d99..f9f71f738 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/UserController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/UserController.java @@ -56,17 +56,17 @@ public class UserController { private final static Logger LOGGER = LoggerFactory.getLogger(UserController.class); /** - * 用户Service + * 鐢ㄦ埛Service */ private FangJiaUserService fangJiaUserService; /** - * 短信Service + * 鐭俊Service */ private SmsService smsService; /** - * 估价Service + * 浼颁环Service */ private EvaluationService evaluationService; @@ -85,7 +85,7 @@ public class UserController { } /** - * 进入用户注册页面 + * 杩涘叆鐢ㄦ埛娉ㄥ唽椤甸潰 * @author yinjihuan * @return */ @@ -94,7 +94,7 @@ public class UserController { } /** - * 进入用户登录页面 + * 杩涘叆鐢ㄦ埛鐧诲綍椤甸潰 * @author yinjihuan * @param model * @return @@ -104,7 +104,7 @@ public class UserController { } /** - * 进入重置密码页面 + * 杩涘叆閲嶇疆瀵嗙爜椤甸潰 * @author yinjihuan * @param model * @return @@ -114,7 +114,7 @@ public class UserController { } /** - * 发送验证码到指定的手机上 + * 鍙戦�侀獙璇佺爜鍒版寚瀹氱殑鎵嬫満涓� * @author yinjihuan * @param model * @return @@ -140,7 +140,7 @@ public class UserController { } /** - * 发送验证码(贷款) + * 鍙戦�侀獙璇佺爜(璐锋) * @author yinjihuan * @param model * @param resultModel @@ -152,7 +152,7 @@ public class UserController { SmsSendLog smsSendLog = smsService.findLastSmsSendLog(model.getMobile()); if(smsSendLog != null && System.currentTimeMillis() - smsSendLog.getCreateDate().getTime() < 1000 * 60){ resultModel.setResult(Message.RESULT_FAIL); - resultModel.setMsg("该手机号短信发送频繁"); + resultModel.setMsg("璇ユ墜鏈哄彿鐭俊鍙戦�侀绻�"); return resultModel; } @@ -161,19 +161,19 @@ public class UserController { long count = smsService.countSmsSendLog(ip, calendar.getTime()); if(count > 100){ resultModel.setResult(Message.RESULT_FAIL); - resultModel.setMsg("该IP短信发送频繁"); + resultModel.setMsg("璇P鐭俊鍙戦�侀绻�"); return resultModel; } String code = fangJiaUserService.randomCode(); try { - smsService.send(model.getMobile(), "【房价网】你的验证码是" + code + ",验证码5分钟内有效,请立即验证。"); + smsService.send(model.getMobile(), "銆愭埧浠风綉銆戜綘鐨勯獙璇佺爜鏄�" + code + ",楠岃瘉鐮�5鍒嗛挓鍐呮湁鏁堬紝璇风珛鍗抽獙璇併��"); smsSendLog = new SmsSendLog(); - smsSendLog.setContent("【房价网】你的验证码是" + code + ",验证码5分钟内有效,请立即验证。"); + smsSendLog.setContent("銆愭埧浠风綉銆戜綘鐨勯獙璇佺爜鏄�" + code + ",楠岃瘉鐮�5鍒嗛挓鍐呮湁鏁堬紝璇风珛鍗抽獙璇併��"); smsSendLog.setMobile(model.getMobile()); smsSendLog.setCreateDate(new Date()); smsSendLog.setIp(ip); - smsSendLog.setPurpose("房价网"); + smsSendLog.setPurpose("鎴夸环缃�"); smsService.saveSmsSendLog(smsSendLog); resultModel.setResult(Message.RESULT_SUCCESS); @@ -187,7 +187,7 @@ public class UserController { } /** - * 发送验证码到指定的手机上 + * 鍙戦�侀獙璇佺爜鍒版寚瀹氱殑鎵嬫満涓� * @author yinjihuan * @param model * @return @@ -241,8 +241,8 @@ public class UserController { } /** - * 非登录状态发送验证码到指定的手机上(不需要图形验证码) - * 用户不存在, 直接注册 + * 闈炵櫥褰曠姸鎬佸彂閫侀獙璇佺爜鍒版寚瀹氱殑鎵嬫満涓�(涓嶉渶瑕佸浘褰㈤獙璇佺爜) + * 鐢ㄦ埛涓嶅瓨鍦�, 鐩存帴娉ㄥ唽 * @author JENIS * @param model * @return @@ -259,10 +259,10 @@ public class UserController { try { FangJiaUser users = fangJiaUserService.getUser(mobile); if (users == null) { - fangJiaUserService.addUser(ObjectId.get().toStringMongod(), mobile, null, "房价网", "房价网"); + fangJiaUserService.addUser(ObjectId.get().toStringMongod(), mobile, null, "鎴夸环缃�", "鎴夸环缃�"); } } catch (Exception e) { - LOGGER.error("非登录状态发送验证码到指定的手机上(不需要图形验证码), 判断用户是否存在异常, 异常信息为:" + e); + LOGGER.error("闈炵櫥褰曠姸鎬佸彂閫侀獙璇佺爜鍒版寚瀹氱殑鎵嬫満涓�(涓嶉渶瑕佸浘褰㈤獙璇佺爜), 鍒ゆ柇鐢ㄦ埛鏄惁瀛樺湪寮傚父, 寮傚父淇℃伅涓�:" + e); resultModel.setResult(Message.RESULT_FAIL); resultModel.setMsg(Message.ACCOUNT_SAVE_FAIL); return resultModel; @@ -272,7 +272,7 @@ public class UserController { } /** - * 发送验证码到指定的手机上(不需要图形验证码) + * 鍙戦�侀獙璇佺爜鍒版寚瀹氱殑鎵嬫満涓�(涓嶉渶瑕佸浘褰㈤獙璇佺爜) * @author yinjihuan * @param model * @return @@ -299,7 +299,7 @@ public class UserController { } /** - * 用户注册 + * 鐢ㄦ埛娉ㄥ唽 * @author yinjihuan * @param model * @return @@ -329,10 +329,10 @@ public class UserController { return result; } - // 自动化测试使用,只允许公司内部的IP才可以 + // 鑷姩鍖栨祴璇曚娇鐢紝鍙厑璁稿叕鍙稿唴閮ㄧ殑IP鎵嶅彲浠� String ip = AnalyticsUtil.getIpAddress(req); if (("8888".equals(code) && "116.247.70.58".equals(ip)) || ("8888".equals(code) && ip.startsWith("192.168"))) { - LOGGER.info("自动化测试,不做验证码认证:"+ip); + LOGGER.info("鑷姩鍖栨祴璇曪紝涓嶅仛楠岃瘉鐮佽璇�:"+ip); } else { String cacheCode = getCacheCode(mobile, Message.SMS_CODE_TYPE_REG); if (cacheCode == null) { @@ -352,7 +352,7 @@ public class UserController { /** - * 用户登录 + * 鐢ㄦ埛鐧诲綍 * @author yinjihuan * @param model * @return @@ -369,7 +369,7 @@ public class UserController { result.setMsg(Message.PARAM_NOT_NULL); return result; } - // 密码为空表示短信验证码登录,否则账号密码登录 + // 瀵嗙爜涓虹┖琛ㄧず鐭俊楠岃瘉鐮佺櫥褰�,鍚﹀垯璐﹀彿瀵嗙爜鐧诲綍 if (StringUtils.isBlank(pass)) { return smsCodeLogin(response, req, result, username, code); } else { @@ -379,7 +379,7 @@ public class UserController { } /** - * 检查账号是否存在库中 + * 妫�鏌ヨ处鍙锋槸鍚﹀瓨鍦ㄥ簱涓� * @author yinjihuan * @param model * @return @@ -399,7 +399,7 @@ public class UserController { } /** - * 找回密码 + * 鎵惧洖瀵嗙爜 * @author yinjihuan * @return */ @@ -459,7 +459,7 @@ public class UserController { } /** - * 检查用户是否登录 + * 妫�鏌ョ敤鎴锋槸鍚︾櫥褰� * @author yinjihuan * @param model * @param request @@ -481,7 +481,7 @@ public class UserController { } /** - * 发送验证码 + * 鍙戦�侀獙璇佺爜 * @author yinjihuan * @param model * @param resultModel @@ -508,7 +508,7 @@ public class UserController { Long ipVisitCount = (Long) CacheUtils.getValue(FangJiaUserService.class, ip); if(ipVisitCount != null && ipVisitCount > 2){ resultModel.setResult(Message.RESULT_FAIL); - resultModel.setMsg("该IP短信发送频繁"); + resultModel.setMsg("璇P鐭俊鍙戦�侀绻�"); return resultModel; } if(ipVisitCount == null){ @@ -516,7 +516,7 @@ public class UserController { } CacheUtils.putValue(CachePolicyEnum.TODAY, FangJiaUserService.class, ip, ipVisitCount+1); - smsService.send(model.getMobile(), "【房价网】你的验证码是" + code + ",验证码5分钟内有效,请立即验证。"); + smsService.send(model.getMobile(), "銆愭埧浠风綉銆戜綘鐨勯獙璇佺爜鏄�" + code + ",楠岃瘉鐮�5鍒嗛挓鍐呮湁鏁堬紝璇风珛鍗抽獙璇併��"); resultModel.setResult(Message.RESULT_SUCCESS); CacheUtils.putValue(CachePolicyEnum.TINY, FangJiaUserService.class, mobile + "_" + type, code); CacheUtils.putValue(CachePolicyEnum.TINY, FangJiaUserService.class, mobile, new Date().getTime()); @@ -530,7 +530,7 @@ public class UserController { } /** - * 账号登录 + * 璐﹀彿鐧诲綍 * @author yinjihuan * @param req * @param result @@ -540,10 +540,10 @@ public class UserController { * @return */ private Object accountLogin(HttpServletRequest req, UserRegJsonModel result, String username, String pass, String code, String codeToken) { - // 自动化测试使用,只允许公司内部的IP才可以 + // 鑷姩鍖栨祴璇曚娇鐢紝鍙厑璁稿叕鍙稿唴閮ㄧ殑IP鎵嶅彲浠� String ip = AnalyticsUtil.getIpAddress(req); if (("FJWT".equals(code) && "116.247.70.58".equals(ip)) || ("FJWT".equals(code) && ip.startsWith("192.168"))) { - LOGGER.info("自动化测试,不做验证码认证:"+ip); + LOGGER.info("鑷姩鍖栨祴璇曪紝涓嶅仛楠岃瘉鐮佽璇�:"+ip); } else { String cacheCode = getCacheCode(codeToken, Message.SMS_CODE_TYPE_LOGIN); if (cacheCode == null) { @@ -557,7 +557,7 @@ public class UserController { } - // 查询数据库看账号是否存在 + // 鏌ヨ鏁版嵁搴撶湅璐﹀彿鏄惁瀛樺湪 try { String usernameType = "email"; if (checkIsMobile(username)) { @@ -577,7 +577,7 @@ public class UserController { String login_uid = LoginUtil.generateRandomAuthCode(users.getId()+""); result.setMsg(login_uid); } catch (Exception e) { - result.setMsg("网络异常请重试"); + result.setMsg("缃戠粶寮傚父璇烽噸璇�"); return result; } result.setResult(Message.RESULT_SUCCESS); @@ -585,7 +585,7 @@ public class UserController { } /** - * 短信验证码登录 + * 鐭俊楠岃瘉鐮佺櫥褰� * @author yinjihuan * @param req * @param result @@ -613,7 +613,7 @@ public class UserController { result.setMsg(login_uid); removeCacheCode(username, Message.SMS_CODE_TYPE_LOGIN); } catch (Exception e) { - result.setMsg("网络异常请重试"); + result.setMsg("缃戠粶寮傚父璇烽噸璇�"); return result; } result.setResult(Message.RESULT_SUCCESS); @@ -621,7 +621,7 @@ public class UserController { } /** - * 用户注册 + * 鐢ㄦ埛娉ㄥ唽 * @author yinjihuan * @param result * @param mobile @@ -636,7 +636,7 @@ public class UserController { result.setMsg(Message.ACCOUNT_EXISTS); return result; } - // 网站来源 + // 缃戠珯鏉ユ簮 String source = CoresiteCookieContext.getInstance().getCookieValue(req, CookieName.SITE_SOURCE); String channelType = SourceUtils.getSampleBaiduSiteType(source); fangJiaUserService.addUser(oid, mobile, uPass, source, channelType); @@ -654,9 +654,9 @@ public class UserController { /** - * 检测是不是正确的手机号码 + * 妫�娴嬫槸涓嶆槸姝g‘鐨勬墜鏈哄彿鐮� * @author yinjihuan - * @param mobile 手机 + * @param mobile 鎵嬫満 * @return */ private boolean checkIsMobile(String mobile) { @@ -666,10 +666,10 @@ public class UserController { } /** - * 获取缓存的验证码 + * 鑾峰彇缂撳瓨鐨勯獙璇佺爜 * @author yinjihuan - * @param mobile 手机 - * @param type 类型 + * @param mobile 鎵嬫満 + * @param type 绫诲瀷 * @return */ private String getCacheCode(String mobile, String type) { @@ -679,10 +679,10 @@ public class UserController { /** - * 清除缓存的验证码 + * 娓呴櫎缂撳瓨鐨勯獙璇佺爜 * @author yinjihuan - * @param mobile 手机 - * @param type 类型 + * @param mobile 鎵嬫満 + * @param type 绫诲瀷 * @return */ private void removeCacheCode(String mobile, String type) { @@ -715,7 +715,7 @@ public class UserController { } /** - * 获取引用页面地址返回到页面,操作成功跳转用 + * 鑾峰彇寮曠敤椤甸潰鍦板潃杩斿洖鍒伴〉闈紝鎿嶄綔鎴愬姛璺宠浆鐢� * @author yinjihuan * @param model * @param req @@ -732,7 +732,7 @@ public class UserController { } /** - * 注册成功页面 + * 娉ㄥ唽鎴愬姛椤甸潰 * @param model * @return */ @@ -741,7 +741,7 @@ public class UserController { } /** - * 个人资料 + * 涓汉璧勬枡 * @param model * @return */ @@ -753,7 +753,7 @@ public class UserController { } /** - * 修改个人信息 + * 淇敼涓汉淇℃伅 * @param model * @return */ @@ -801,7 +801,7 @@ public class UserController { } /** - * 评估历史 + * 璇勪及鍘嗗彶 * @param model * @return */ @@ -816,7 +816,7 @@ public class UserController { } /** - * 链接请求直接登录(新需求) + * 閾炬帴璇锋眰鐩存帴鐧诲綍锛堟柊闇�姹傦級 * @param model * @param req * @param response diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/UserFeelingController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/UserFeelingController.java index 63dd2092b..f29a4cdfa 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/UserFeelingController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/UserFeelingController.java @@ -14,7 +14,7 @@ import com.fangjia.service.mongo.fangjia.UserClickService; import com.fangjia.service.mongo.fangjia.UserFeelingService; /** - * "顶"和"踩"的处理(二手房,租房,资讯) + * "椤�"鍜�"韪�"鐨勫鐞嗭紙浜屾墜鎴匡紝绉熸埧锛岃祫璁級 * * @author * @@ -26,7 +26,7 @@ public class UserFeelingController { private UserClickService userClickService; /** - * 用户顶踩信息 + * 鐢ㄦ埛椤惰俯淇℃伅 * * @param model */ @@ -34,27 +34,27 @@ public class UserFeelingController { String uid = getCookieUid();// // model.getRelateId()); model.setViewType("json"); - // 根据Id查询,看是否有评论记录 + // 鏍规嵁Id鏌ヨ锛岀湅鏄惁鏈夎瘎璁鸿褰� UserClick userClick = this.userClickService.findUserClick(uid, model.getRelateId()); - if (userClick != null) {// 用户已评论过了 + if (userClick != null) {// 鐢ㄦ埛宸茶瘎璁鸿繃浜� model.setResult(false); return model; - } else {// 添加新纪录,并更新计数 + } else {// 娣诲姞鏂扮邯褰曪紝骞舵洿鏂拌鏁� userClick = new UserClick(); UserFeeling userFeeling = new UserFeeling(); userFeeling.setCategory(model.getCategory());// sell - // 资讯新闻页面不记录城市信息 + // 璧勮鏂伴椈椤甸潰涓嶈褰曞煄甯備俊鎭� if (StringUtils.isNotBlank(model.getCategory()) && !model.getCategory().equals("news")) { userFeeling.setCity(model.getCityName()); } userFeeling.setRelateId(model.getRelateId()); - String incField = "like";// 类型 - String category = "tip";//顶:踩,给用户点击表记录点击类型 + String incField = "like";// 绫诲瀷 + String category = "tip";//椤讹細韪╋紝缁欑敤鎴风偣鍑昏〃璁板綍鐐瑰嚮绫诲瀷 if(StringUtils.isNotBlank(model.getType())){ - incField = "ding".equalsIgnoreCase( model.getType()) ? "like" : "unlike";// 类型 - category= "ding".equalsIgnoreCase( model.getType()) ? "tip" : "trample"; //顶:踩,给用户点击表记录点击类型 + incField = "ding".equalsIgnoreCase( model.getType()) ? "like" : "unlike";// 绫诲瀷 + category= "ding".equalsIgnoreCase( model.getType()) ? "tip" : "trample"; //椤讹細韪╋紝缁欑敤鎴风偣鍑昏〃璁板綍鐐瑰嚮绫诲瀷 }else{ return model; } diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/WapController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/WapController.java index f34bdbd55..de6329d5a 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/WapController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/WapController.java @@ -8,7 +8,7 @@ import com.fangjia.coresite.model.WapModel; */ public class WapController { /** - * iphone页面 + * iphone椤甸潰 * * @param model * @return @@ -18,7 +18,7 @@ public class WapController { } /** - * andriod页面 + * andriod椤甸潰 * * @param model * @return @@ -28,7 +28,7 @@ public class WapController { } /** - * 转到iphone应用下载页面 + * 杞埌iphone搴旂敤涓嬭浇椤甸潰 * * @param model * @return @@ -40,7 +40,7 @@ public class WapController { } /** - * 转向到android应用下载地址 + * 杞悜鍒癮ndroid搴旂敤涓嬭浇鍦板潃 * * @param model * @return diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/WithHoldController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/WithHoldController.java index e47b2d0a4..9e89d9e81 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/WithHoldController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/WithHoldController.java @@ -39,7 +39,7 @@ public class WithHoldController { } /** - * 易宝代扣回调接口 + * 鏄撳疂浠f墸鍥炶皟鎺ュ彛 * @author xuhe * @param model * @param request @@ -52,7 +52,7 @@ public class WithHoldController { } Map jsonMap=null; try { - //开始解密 + //寮�濮嬭В瀵� DigitalEnvelopeDTO dto = new DigitalEnvelopeDTO(); dto.setCipherText(responseMsg); PrivateKey privateKey = InternalConfig.getISVPrivateKey(CertTypeEnum.RSA2048); @@ -74,7 +74,7 @@ public class WithHoldController { if(StringUtils.isNotBlank(yborderid)){ LoanWithHold loanWithHold = loanWithHoldService.findByParam(null,yborderid,null); if(loanWithHold!=null){ - //订单状态 0-等待代扣,1-代扣成功,2-代扣失败,3-处理中,4-超时失败,5-系统异常 + //璁㈠崟鐘舵�� 0-绛夊緟浠f墸,1-浠f墸鎴愬姛,2-浠f墸澶辫触,3-澶勭悊涓�,4-瓒呮椂澶辫触,5-绯荤粺寮傚父 if("PAY_SUCCESS".equals(status)){ loanWithHold.setStatus(1); loanWithHold.setFinishTime(new Date()); @@ -82,7 +82,7 @@ public class WithHoldController { loanWithHold.setStatus(2); }else if("TIME_OUT".equals(status)){ loanWithHold.setStatus(4); - }else{ //默认代扣失败 + }else{ //榛樿浠f墸澶辫触 loanWithHold.setStatus(2); } loanWithHold.setErrorMsg(errormsg);; @@ -115,7 +115,7 @@ public class WithHoldController { private Map parseResponse(String yopresponse){ Map jsonMap = new HashMap(); jsonMap = JSON.parseObject(yopresponse, new TypeReference>() {}); - System.out.println("将结果yopresponse转化为map格式之后: "+jsonMap); + System.out.println("灏嗙粨鏋測opresponse杞寲涓簃ap鏍煎紡涔嬪悗: "+jsonMap); return jsonMap; } diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/WordMapController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/WordMapController.java index 45cf62465..36d9f9dd1 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/WordMapController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/WordMapController.java @@ -161,7 +161,7 @@ public class WordMapController { bo.setName(StringUtils.replaceChars(StringUtils.substring(DataUtil.removeHtml(bo.getHouse().getName()), 0, 20), '@', ' ')); - // 关键词高亮 + // 鍏抽敭璇嶉珮浜� if (StringUtils.isNotBlank(keyword)) { bo.setDistrictName(bo.getHouse().getDistrictName()); bo.setRegion(bo.getHouse().getRegion()); @@ -213,7 +213,7 @@ public class WordMapController { List tokens = CnTokenizer.tokenizer(wordMap.getName()); for (Token token : tokens) { if (token.containsType(KeywordEnum.city)) { - if (token.getName().endsWith("市")) { + if (token.getName().endsWith("甯�")) { return token.getName().substring(0, token.getName().length() - 1); } return token.getName(); diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/YinLianEvaluationController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/YinLianEvaluationController.java index 4fb8b218b..8cee5005d 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/YinLianEvaluationController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/YinLianEvaluationController.java @@ -57,8 +57,8 @@ import com.fangjia.service.util.PdsConstants; import com.fangjia.service.web.AddressService; /** - * 银联公众号需求 - * 公众号跳转+评估+结果页 + * 閾惰仈鍏紬鍙烽渶姹� + * 鍏紬鍙疯烦杞�+璇勪及+缁撴灉椤� * * @author JENIS */ @@ -104,7 +104,7 @@ public class YinLianEvaluationController { } /** - * 银联公众号跳转评估 + * 閾惰仈鍏紬鍙疯烦杞瘎浼� * * @param model * @param req @@ -112,28 +112,28 @@ public class YinLianEvaluationController { */ public Object homePageAction(YinLianEvaluationModel model, HttpServletRequest req) { try{ - LOG.info("YinLianEvaluationController.homePageAction 参数model为" + JsonUtils.toJson(model)); + LOG.info("YinLianEvaluationController.homePageAction 鍙傛暟model涓�" + JsonUtils.toJson(model)); if(StringUtils.isEmpty(model.getUserId()) || StringUtils.isEmpty(model.getToken())){ - LOG.info("YinLianEvaluationController.homePageAction 参数userid 或 token为空"); + LOG.info("YinLianEvaluationController.homePageAction 鍙傛暟userid 鎴� token涓虹┖"); model.setViewType("redirect"); model.setViewParam("location", "/"); return model; } String tokenKey = FangjiaConfig.getConfig().get("yinlian.jumppage.tokenKey", TOKENKEY); if(StringUtils.isEmpty(tokenKey)){ - LOG.info("YinLianEvaluationController.homePageAction 配置变量yinlian.jumppage.tokenKey为空"); + LOG.info("YinLianEvaluationController.homePageAction 閰嶇疆鍙橀噺yinlian.jumppage.tokenKey涓虹┖"); model.setViewType("redirect"); model.setViewParam("location", "/"); return model; } boolean flag = yinLianUserInfoService.verifyTokenAndTimestamp(model.getUserId(), model.getTimestamp(), model.getToken(), tokenKey); if(!flag){ - LOG.info("YinLianEvaluationController.homePageAction token验证失败"); + LOG.info("YinLianEvaluationController.homePageAction token楠岃瘉澶辫触"); model.setViewType("redirect"); model.setViewParam("location", "/"); return model; } - //构造QueryParam + //鏋勯�燪ueryParam List params = new ArrayList(); params.add(new QueryParam("userId", model.getUserId())); YinLianUserInfo userInfo = yinLianUserInfoService.findByParams(params); @@ -147,7 +147,7 @@ public class YinLianEvaluationController { model.setViewParam("location", "/yinLianEvaluation/index?id=" + userInfo.getId()); return model; }catch (Exception e) { - LOG.error("YinLianEvaluationController.homePageAction 发生异常, 异常信息为:" + e); + LOG.error("YinLianEvaluationController.homePageAction 鍙戠敓寮傚父, 寮傚父淇℃伅涓�:" + e); model.setViewType("redirect"); model.setViewParam("location", "/"); return model; @@ -155,13 +155,13 @@ public class YinLianEvaluationController { } /** - * 首页 + * 棣栭〉 * @param model * @param req * @return */ public Object indexAction(TrendModel model, HttpServletRequest req) { - LOG.info("YinLianEvaluationController 参数indexAction 为" + JsonUtils.toJson(model)); + LOG.info("YinLianEvaluationController 鍙傛暟indexAction 涓�" + JsonUtils.toJson(model)); String city = null; if(StringUtils.isNotBlank(model.getCityName())){ city = model.getCityName(); @@ -193,15 +193,15 @@ public class YinLianEvaluationController { } /** - * 检查小区是否有均价以及当前用户当天只能评估10次
- * 无均价则不能估价,超过10次也提示
+ * 妫�鏌ュ皬鍖烘槸鍚︽湁鍧囦环浠ュ強褰撳墠鐢ㄦ埛褰撳ぉ鍙兘璇勪及10娆�
+ * 鏃犲潎浠峰垯涓嶈兘浼颁环锛岃秴杩�10娆′篃鎻愮ず
* @param model * @return */ public Object checkPriceAction(TrendModel model, HttpServletRequest req){ model.setViewType("json"); model.setViewParam("config", null); - //判断userId + //鍒ゆ柇userId YinLianUserInfo userInfo = yinLianUserInfoService.findById(model.getId()); if(userInfo == null){ model.setCode(2); @@ -211,12 +211,12 @@ public class YinLianEvaluationController { DistrictKey districtKey = new DistrictKey(model.getCityName(), model.getRegion(), model.getDistrictName()); District district = districtService.findDistrict(districtKey, "district"); if(district==null){ - model.setErrMsg("未找到该小区"); + model.setErrMsg("鏈壘鍒拌灏忓尯"); model.setCode(-1); return model; } - //获取地址评分 + //鑾峰彇鍦板潃璇勫垎 Map resultMap = null; if(StringUtils.isNotBlank(district.getAddress())){ resultMap = getDistrictScore(model.getCityName(), district.getAddress()); @@ -226,7 +226,7 @@ public class YinLianEvaluationController { } if(resultMap==null){ - model.setErrMsg("未找到数据"); + model.setErrMsg("鏈壘鍒版暟鎹�"); model.setCode(3); return model; } @@ -234,11 +234,11 @@ public class YinLianEvaluationController { String userId = userInfo.getUserId(); if (StringUtils.isNotBlank(userId)) { - //最多评估10次 + //鏈�澶氳瘎浼�10娆� int count = yinLianEvaluationService.getCountToday(userId); //if (count > 9) { if (count > evaluationlimit) { - model.setErrMsg("单日查询超过上限"); + model.setErrMsg("鍗曟棩鏌ヨ瓒呰繃涓婇檺"); model.setCode(-1); return model; }else{ @@ -251,7 +251,7 @@ public class YinLianEvaluationController { } if(districtStatBo == null){ model.setCode(-1); - model.setErrMsg("您的小区暂不支持估价"); + model.setErrMsg("鎮ㄧ殑灏忓尯鏆備笉鏀寔浼颁环"); return model; } YinLianEvaluation yinLianEvaluation = new YinLianEvaluation(); @@ -274,7 +274,7 @@ public class YinLianEvaluationController { if(stats.size() > 0){ DistrictStatBo bo = new DistrictStatBo(); if(stats.size()==2){ - DistrictStat lastStat = stats.get(1);//上周 + DistrictStat lastStat = stats.get(1);//涓婂懆 Date lastMonth = DateUtils.addMonths(new Date(), -1); int lastPrice = 0; if(lastStat.getWeekend().getTime()>= lastMonth.getTime()){ @@ -282,9 +282,9 @@ public class YinLianEvaluationController { lastPrice = lastStat.getAvgPrice(); } - DistrictStat curStat = stats.get(0);//本周 + DistrictStat curStat = stats.get(0);//鏈懆 if(curStat.getWeekend().getTime()>= lastMonth.getTime()){ - if(lastPrice>0){//重新计算均价涨跌幅 + if(lastPrice>0){//閲嶆柊璁$畻鍧囦环娑ㄨ穼骞� int markup = (curStat.getAvgPrice()-lastPrice)*10000/lastPrice; curStat.setWeekendMarkup(markup); } @@ -293,7 +293,7 @@ public class YinLianEvaluationController { }else{ Date lastMonth = DateUtils.addMonths(new Date(), -1); - DistrictStat curStat = stats.get(0);//本周 + DistrictStat curStat = stats.get(0);//鏈懆 if(curStat.getWeekend().getTime()>= lastMonth.getTime()){ bo.setDistrictStat(curStat); } @@ -342,7 +342,7 @@ public class YinLianEvaluationController { /** - * 评估结果页 + * 璇勪及缁撴灉椤� * @param model * @param req * @return @@ -355,7 +355,7 @@ public class YinLianEvaluationController { model.setViewParam("location", "/yinLianEvaluation/index?id=" + model.getId()); return model; }else{ - //最多评估10次 + //鏈�澶氳瘎浼�10娆� int count = yinLianEvaluationService.getCountToday(userInfo.getUserId()); //if (count > 10) { if (count > evaluationlimit) { @@ -365,13 +365,13 @@ public class YinLianEvaluationController { } } - //获取小区基本信息 + //鑾峰彇灏忓尯鍩烘湰淇℃伅 District district = null; if(StringUtils.isNotBlank(model.getCityName()) && StringUtils.isNotBlank(model.getRegion()) && StringUtils.isNotBlank(model.getName())){ DistrictKey districtKey = new DistrictKey(model.getCityName(), model.getRegion(), model.getName()); district = districtService.findDistrict(districtKey, "district"); model.setDistrict(district); - //小区均价 + //灏忓尯鍧囦环 if(district!=null){ if(StringUtils.isNotBlank(district.getDescription())){ district.setDescription(DataUtil.removeHtml(district.getDescription())); @@ -380,7 +380,7 @@ public class YinLianEvaluationController { DistrictStatBo statBo = getNearestDistrictStat(districtKey); model.setDistrictStatBo(statBo); - //附近小区 + //闄勮繎灏忓尯 List nearDistricts = getNearestDistricts(district); model.setNearDistricts(nearDistricts); @@ -392,7 +392,7 @@ public class YinLianEvaluationController { } - //获取地址评分 + //鑾峰彇鍦板潃璇勫垎 Map resultMap = null; if(StringUtils.isNotBlank(model.getAddress())){ resultMap = getDistrictScore(model.getCityName(), model.getAddress()); @@ -452,7 +452,7 @@ public class YinLianEvaluationController { dto.setName(d.getName()); dto.setDistance((int) dis); if(stats.size()>0){ - DistrictStat curStat = stats.get(0);//本周 + DistrictStat curStat = stats.get(0);//鏈懆 dto.setAvgPrice(curStat.getAvgPrice()); } result.add(dto); diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/user/DingyueController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/user/DingyueController.java index 0f43d75de..5cdb86eba 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/user/DingyueController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/user/DingyueController.java @@ -91,12 +91,12 @@ public class DingyueController { return model; } - // 验证时间戳 + // 楠岃瘉鏃堕棿鎴� Calendar ca = Calendar.getInstance(); ca.setTimeInMillis(Long.parseLong(cancelInfo[3])); Date cookieDate = ca.getTime(); - // cookie超过2天默认失效 + // cookie瓒呰繃2澶╅粯璁ゅけ鏁� ca.setTime(new Date()); ca.add(Calendar.DAY_OF_MONTH, -2); if (cookieDate.before(ca.getTime())) { diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/user/UserController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/user/UserController.java index 60dfb45c7..b70adaaab 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/user/UserController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/user/UserController.java @@ -54,7 +54,7 @@ public class UserController { private static long MAX_PIC_SIZE = 2 * 1024 * 1024; /** - * 用户登录页 + * 鐢ㄦ埛鐧诲綍椤� * * @param model * @return @@ -62,7 +62,7 @@ public class UserController { @Sothis(stack = "default", defaultView = "ftl") public Object indexAction(UserModel model) { if (getLoginedUserId(model) > 0) { - // 已登录直接到用户房源列表 + // 宸茬櫥褰曠洿鎺ュ埌鐢ㄦ埛鎴挎簮鍒楄〃 model.setViewType("redirect"); model.setViewParam("location", "/user/user/houseList"); return model; @@ -73,7 +73,7 @@ public class UserController { } /** - * 用户房源列表 + * 鐢ㄦ埛鎴挎簮鍒楄〃 * * @param model * @return @@ -101,7 +101,7 @@ public class UserController { } /** - * 处理房源城市url + * 澶勭悊鎴挎簮鍩庡競url * * @param model */ @@ -120,7 +120,7 @@ public class UserController { } /** - * 进入编辑页面 + * 杩涘叆缂栬緫椤甸潰 * * @param model * @return @@ -129,7 +129,7 @@ public class UserController { int userId = getLoginedUserId(model); String houseCity = ""; - // 编辑二手房 + // 缂栬緫浜屾墜鎴� if (ObjectId.isValid(model.getHouseId())) { House house = houseService.findHouseById(model.getHouseId()); if (null != house && userId == house.getUserId()) { @@ -138,7 +138,7 @@ public class UserController { } } - // 编辑租房 + // 缂栬緫绉熸埧 if (ObjectId.isValid(model.getRentHouseId())) { RentHouse rentHouse = rentHouseService.findRentHouseById(model.getRentHouseId()); if (null != rentHouse && userId == rentHouse.getUserId()) { @@ -160,7 +160,7 @@ public class UserController { } /** - * 保存修改 + * 淇濆瓨淇敼 * * @param model * @return @@ -182,7 +182,7 @@ public class UserController { } /** - * 删除房源 + * 鍒犻櫎鎴挎簮 * * @param model * @return @@ -213,7 +213,7 @@ public class UserController { } /** - * 刷新房源 + * 鍒锋柊鎴挎簮 * * @param model * @return @@ -247,7 +247,7 @@ public class UserController { } /** - * 验证用户是否登录 + * 楠岃瘉鐢ㄦ埛鏄惁鐧诲綍 * * @param model * @return @@ -269,7 +269,7 @@ public class UserController { } /** - * 验证房源表单信息是否完成 + * 楠岃瘉鎴挎簮琛ㄥ崟淇℃伅鏄惁瀹屾垚 * * @param model * @return @@ -281,58 +281,58 @@ public class UserController { return false; } - // 类型 + // 绫诲瀷 if (!"sell".equals(model.getCategory()) && !"rent".equals(model.getCategory())) { return false; } - // 区域、板块、小区 + // 鍖哄煙銆佹澘鍧椼�佸皬鍖� if (StringUtils.isBlank(model.getRegion()) || StringUtils.isBlank(model.getDistrictName()) || model.getDistrictName().length() < 1 || model.getDistrictName().length() > 10) { return false; } - // 房型 + // 鎴垮瀷 if (null == model.getRoom() || null == model.getHall() || null == model.getToilet()) { return false; } - // 面积 + // 闈㈢Н if (null == model.getArea()) { return false; } - // 售价/租金 + // 鍞环/绉熼噾 if (null == model.getTotalPrice()) { return false; } - // 楼层 + // 妤煎眰 if (null == model.getHeight() || null == model.getFloor() || model.getFloor() > model.getHeight()) { return false; } - // 房龄 + // 鎴块緞 if (null == model.getAge() || model.getAge() < 1900 || model.getAge() > Calendar.getInstance().get(Calendar.YEAR)) { return false; } - // 朝向 + // 鏈濆悜 if (StringUtils.isBlank(model.getDirection())) { return false; } - // 装修 + // 瑁呬慨 if (StringUtils.isBlank(model.getFitment())) { return false; } - // 标题 + // 鏍囬 if (StringUtils.isBlank(model.getName()) || model.getName().length() < 6 || model.getName().length() > 25) { return false; } - // 描述 + // 鎻忚堪 if (StringUtils.isBlank(model.getDescription())) { return false; } else { @@ -342,13 +342,13 @@ public class UserController { } } - // 联系人 + // 鑱旂郴浜� if (StringUtils.isBlank(model.getContactPeople()) || model.getContactPeople().length() < 2 || model.getContactPeople().length() > 4) { return false; } - // 手机/电话 + // 鎵嬫満/鐢佃瘽 String phone = model.getMobile(); if (StringUtils.isBlank(phone)) { return false; @@ -364,7 +364,7 @@ public class UserController { } /** - * 处理保存 + * 澶勭悊淇濆瓨 * * @param model */ @@ -385,7 +385,7 @@ public class UserController { house.setStatus(0); house.setModificationDate(now); - house.setBuildDate(model.getAge() + "年"); + house.setBuildDate(model.getAge() + "骞�"); house.setTotalPrice(model.getTotalPrice() * 10000); if (ObjectId.isValid(model.getId())) { houseService.updateHouse(house); @@ -408,7 +408,7 @@ public class UserController { rentHouse.setStatus(0); rentHouse.setModificationDate(now); - rentHouse.setBuildDate(model.getAge() + "年"); + rentHouse.setBuildDate(model.getAge() + "骞�"); rentHouse.setFacilities(getFacilities(model.getFacilityArr())); if (ObjectId.isValid(model.getId())) { rentHouseService.updateRentHouse(rentHouse); @@ -447,14 +447,14 @@ public class UserController { } /** - * 处理图片,包括删除、新增图片,最后返回图片ID列表 + * 澶勭悊鍥剧墖锛屽寘鎷垹闄ゃ�佹柊澧炲浘鐗囷紝鏈�鍚庤繑鍥炲浘鐗嘔D鍒楄〃 * * @param houseId * @param model * @return */ private List processPics(String houseId, UserModel model, int userId) { - // 删除图片 + // 鍒犻櫎鍥剧墖 fileService.delPics(model.getDelPics(), FileServiceImpl.SIZE_ORIGINAL); List ret = new ArrayList(); @@ -491,7 +491,7 @@ public class UserController { } /** - * 处理重名图片 + * 澶勭悊閲嶅悕鍥剧墖 * * @param orgName * @param nameList @@ -512,7 +512,7 @@ public class UserController { } /** - * 验证图片文件类型,目前支持gif、jpg + * 楠岃瘉鍥剧墖鏂囦欢绫诲瀷锛岀洰鍓嶆敮鎸乬if銆乯pg * * @param pic * @return @@ -550,12 +550,12 @@ public class UserController { } /** - * 底部信息 + * 搴曢儴淇℃伅 * * @param model */ private void feedFooter(UserModel model) { - // 最新上线的城市 + // 鏈�鏂颁笂绾跨殑鍩庡競 List newCitys = new ArrayList(); List serverAreaList = ServerAreaData.getServerAreaList(15); List cityNames = CollectionUtils.collect(serverAreaList, new Closure() { @@ -574,10 +574,10 @@ public class UserController { } /** - * 获取当前城市 + * 鑾峰彇褰撳墠鍩庡競 * * @param request - * @return 当前城市 + * @return 褰撳墠鍩庡競 */ private ServerArea getSuggestCity(HttpServletRequest request) { String ip = AnalyticsUtil.getIpAddress(request); diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/filters/AccessLogFilter.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/filters/AccessLogFilter.java index 373a0daa9..f3ac0f6df 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/filters/AccessLogFilter.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/filters/AccessLogFilter.java @@ -57,7 +57,7 @@ public class AccessLogFilter implements Filter { request.setAttribute("scheme", request.getScheme()); String source = CookieUtils.getCookieValue(request, CookieName.SITE_SOURCE); if(StringUtils.isBlank(source)){ - //添加百度sem推广标识 + //娣诲姞鐧惧害sem鎺ㄥ箍鏍囪瘑 StringBuilder sb = new StringBuilder(); String referer = request.getHeader("Referer"); if(StringUtils.isNotBlank(referer)){ @@ -121,7 +121,7 @@ public class AccessLogFilter implements Filter { LOGGER.error("error process request: request_url=" + analyticsBean.requestUrl + ", referer=" + analyticsBean.refererUrl, rootCause); } - // 记录运行超过1秒的请求到日志中 + // 璁板綍杩愯瓒呰繃1绉掔殑璇锋眰鍒版棩蹇椾腑 final long time = System.currentTimeMillis() - start; final String actionUri = (String) request.getAttribute(ActionContext.ACTION_URI); if (time > 1000 || (!FangjiaConfig.getConfig().isProductionEnvironment() && executeCounter.getTotalCount() > 0)) { @@ -142,7 +142,7 @@ public class AccessLogFilter implements Filter { private void writeAccessLog(AnalyticsBean analyticsBean, long duration, String actionUri, int statusCode, String method) { StringBuilder logStr = new StringBuilder(); - // 不要改变顺序 + // 涓嶈鏀瑰彉椤哄簭 logStr.append(DATE_FORMAT.format(analyticsBean.startTime));// 1 logStr.append(SPLIT).append(StringUtils.defaultString(analyticsBean.connectionIp));// 2 logStr.append(SPLIT).append(StringUtils.defaultString(analyticsBean.ip));// 3 diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/filters/AnalyticsBean.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/filters/AnalyticsBean.java index 2c6e69133..f23bbe32c 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/filters/AnalyticsBean.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/filters/AnalyticsBean.java @@ -105,7 +105,7 @@ public class AnalyticsBean { } /** - * 获得连接客户端的IP(部署环境下一般都设有nginx等http服务器) + * 鑾峰緱杩炴帴瀹㈡埛绔殑IP锛堥儴缃茬幆澧冧笅涓�鑸兘璁炬湁nginx绛塰ttp鏈嶅姟鍣級 * * @param request * @return @@ -123,7 +123,7 @@ public class AnalyticsBean { String citySpell = getCitySpell(request.getRequestURL().toString(),request); ServerArea city = ServerAreaData.getServerAreaByNameOrSpellDefaultNull(citySpell); if (null != city) { - // 保存至cookie + // 淇濆瓨鑷砪ookie Cookie cityCookie = cookieContext.createCookie(CookieName.COOKIE_CITY, citySpell); cityCookie.setMaxAge(Integer.MAX_VALUE); response.addCookie(cityCookie); @@ -137,7 +137,7 @@ public class AnalyticsBean { } private String createUID(HttpServletRequest request, HttpServletResponse response) { - // 设置UUID + // 璁剧疆UUID String uuid = new ObjectId().toString(); Cookie uuidCookie = cookieContext.createCookie(CookieName.UID, uuid); uuidCookie.setMaxAge(Integer.MAX_VALUE); @@ -152,7 +152,7 @@ public class AnalyticsBean { } private String createSID(HttpServletRequest request, HttpServletResponse response) { - // 设置session id + // 璁剧疆session id String sid = new ObjectId().toString(); Cookie uuidCookie = cookieContext.createCookie(CookieName.SID, sid); uuidCookie.setMaxAge(-1); @@ -165,7 +165,7 @@ public class AnalyticsBean { } /** - * 请求url,不包括query string + * 璇锋眰url锛屼笉鍖呮嫭query string * * @return */ @@ -174,7 +174,7 @@ public class AnalyticsBean { } /** - * 请求url后的请求参数,如果参数不为空则包括问号在内 + * 璇锋眰url鍚庣殑璇锋眰鍙傛暟锛屽鏋滃弬鏁颁笉涓虹┖鍒欏寘鎷棶鍙峰湪鍐� * * @return */ @@ -183,7 +183,7 @@ public class AnalyticsBean { } /** - * 请求uri + * 璇锋眰uri * * @return */ @@ -192,7 +192,7 @@ public class AnalyticsBean { } /** - * 来源url + * 鏉ユ簮url * * @return */ @@ -201,7 +201,7 @@ public class AnalyticsBean { } /** - * 完整的请求url,包括query string + * 瀹屾暣鐨勮姹倁rl锛屽寘鎷琿uery string * * @return */ @@ -210,7 +210,7 @@ public class AnalyticsBean { } /** - * 是否刷新缓存 + * 鏄惁鍒锋柊缂撳瓨 * * @return */ @@ -219,7 +219,7 @@ public class AnalyticsBean { } /** - * 当前城市,可能为null + * 褰撳墠鍩庡競锛屽彲鑳戒负null * * @return */ @@ -228,7 +228,7 @@ public class AnalyticsBean { } /** - * 当前城市,不会为null + * 褰撳墠鍩庡競锛屼笉浼氫负null * * @return */ @@ -237,7 +237,7 @@ public class AnalyticsBean { } /** - * cookie中的uid,如果没有则生成新的uid + * cookie涓殑uid锛屽鏋滄病鏈夊垯鐢熸垚鏂扮殑uid * * @return */ @@ -246,7 +246,7 @@ public class AnalyticsBean { } /** - * 全局的请求id + * 鍏ㄥ眬鐨勮姹俰d * * @return */ @@ -255,7 +255,7 @@ public class AnalyticsBean { } /** - * cookie中的会话id,如果没有则生成新的sid + * cookie涓殑浼氳瘽id锛屽鏋滄病鏈夊垯鐢熸垚鏂扮殑sid * * @return */ @@ -264,7 +264,7 @@ public class AnalyticsBean { } /** - * 是否为ajax请求 + * 鏄惁涓篴jax璇锋眰 * * @return */ @@ -273,7 +273,7 @@ public class AnalyticsBean { } /** - * 访问者的真实ip + * 璁块棶鑰呯殑鐪熷疄ip * * @return */ @@ -282,7 +282,7 @@ public class AnalyticsBean { } /** - * 访问者标识,可能为null + * 璁块棶鑰呮爣璇嗭紝鍙兘涓簄ull * * @return */ @@ -291,7 +291,7 @@ public class AnalyticsBean { } /** - * 连接ip + * 杩炴帴ip * * @return */ @@ -300,7 +300,7 @@ public class AnalyticsBean { } /** - * cookie中的uid,如果没有则为空字符串 + * cookie涓殑uid锛屽鏋滄病鏈夊垯涓虹┖瀛楃涓� * * @return */ @@ -309,7 +309,7 @@ public class AnalyticsBean { } /** - * cookie中的会话id,如果没有则为空字符串 + * cookie涓殑浼氳瘽id锛屽鏋滄病鏈夊垯涓虹┖瀛楃涓� * * @return */ @@ -318,7 +318,7 @@ public class AnalyticsBean { } /** - * 请求开始时间 + * 璇锋眰寮�濮嬫椂闂� * * @return */ diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/filters/AnalyticsFilter.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/filters/AnalyticsFilter.java index 44b5fec7f..475e12f86 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/filters/AnalyticsFilter.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/filters/AnalyticsFilter.java @@ -70,7 +70,7 @@ public class AnalyticsFilter implements Filter { private void realDoFilter(HttpServletRequest request, HttpServletResponse response, FilterChain chain) throws IOException, ServletException { - //登录判断 + //鐧诲綍鍒ゆ柇 String uri = request.getRequestURI(); String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort(); if (request.getRequestURI().contains("fangjia-coresite")) { @@ -100,7 +100,7 @@ public class AnalyticsFilter implements Filter { final AnalyticsBean analyticsBean = AnalyticsBean.get(request, response); - // 点击日志 + // 鐐瑰嚮鏃ュ織 if (analyticsBean.requestUrl.indexOf("/__utm.gif") > -1) { processUtmGifLog(request, response, analyticsBean); return; @@ -113,16 +113,16 @@ public class AnalyticsFilter implements Filter { }*/ - // 判断URL是否合法,不合法则重定向 + // 鍒ゆ柇URL鏄惁鍚堟硶锛屼笉鍚堟硶鍒欓噸瀹氬悜 String redirectUrl = checkUrlFormat(analyticsBean, request); // if (null == redirectUrl) { // redirectUrl = checkPhone(analyticsBean, request, response); // } - // 默认的需要走这个重定向逻辑,官网需要以城市开头的二级域名,目前有个需求是贷款页面投放,需要套用别人的域名,解析到我们的程序中,如果有跳转会有问题 - // 这个做一个开关,默认是没有redirectStatus,这样就还是会跳转,套户的那个节点加上这个参数就表示不重定向 + // 榛樿鐨勯渶瑕佽蛋杩欎釜閲嶅畾鍚戦�昏緫锛屽畼缃戦渶瑕佷互鍩庡競寮�澶寸殑浜岀骇鍩熷悕锛岀洰鍓嶆湁涓渶姹傛槸璐锋椤甸潰鎶曟斁锛岄渶瑕佸鐢ㄥ埆浜虹殑鍩熷悕锛岃В鏋愬埌鎴戜滑鐨勭▼搴忎腑锛屽鏋滄湁璺宠浆浼氭湁闂 + // 杩欎釜鍋氫竴涓紑鍏筹紝榛樿鏄病鏈塺edirectStatus锛岃繖鏍峰氨杩樻槸浼氳烦杞紝濂楁埛鐨勯偅涓妭鐐瑰姞涓婅繖涓弬鏁板氨琛ㄧず涓嶉噸瀹氬悜 if (System.getProperty("redirectStatus") == null) { - //如果是需要过滤的url则跳转到首页,防爬虫抓取之前报错的页面 + //濡傛灉鏄渶瑕佽繃婊ょ殑url鍒欒烦杞埌棣栭〉锛岄槻鐖櫕鎶撳彇涔嬪墠鎶ラ敊鐨勯〉闈� if(null == redirectUrl){ redirectUrl = checkNoUseUrl(analyticsBean, request, response); } @@ -148,7 +148,7 @@ public class AnalyticsFilter implements Filter { threadLocalData.put(ThreadLocalKey.DisableCache, "1"); } - // 切换城市 + // 鍒囨崲鍩庡競 FangjiaServerAreaContextHolder.setServerArea(analyticsBean.city); threadLocalData.put(ThreadLocalKey.FromSpider, analyticsBean.isSpider()); @@ -178,7 +178,7 @@ public class AnalyticsFilter implements Filter { /** - * 检查是否为手机浏览,若是跳往wap页面 + * 妫�鏌ユ槸鍚︿负鎵嬫満娴忚,鑻ユ槸璺冲線wap椤甸潰 * * @param analyticsBean * @author liupei @@ -216,7 +216,7 @@ public class AnalyticsFilter implements Filter { responseOutputStream.close(); String userAgent = analyticsBean.userAgent; if (userAgent != null && (userAgent.indexOf("Googlebot-Image") >= 0 || userAgent.indexOf("Baidu") >= 0)) { - // 过滤爬虫的访问 + // 杩囨护鐖櫕鐨勮闂� return; } jmsTemplate.send(utmgifDestination, new MessageCreator() { @@ -262,7 +262,7 @@ public class AnalyticsFilter implements Filter { } /** - * 判断URL是否合法,合法则返回null,否则返回重定向URL + * 鍒ゆ柇URL鏄惁鍚堟硶锛屽悎娉曞垯杩斿洖null锛屽惁鍒欒繑鍥為噸瀹氬悜URL * * @param analyticsBean * @param request @@ -283,7 +283,7 @@ public class AnalyticsFilter implements Filter { return "http://user.fangjia.com/fangjiatong2/users/fjtLogin"; } String schemePrefix = request.getScheme() + "://"; - // 如果hostName中有端口号,则把端口号去掉 + // 濡傛灉hostName涓湁绔彛鍙凤紝鍒欐妸绔彛鍙峰幓鎺� int index = hostName.indexOf(":"); if (index > 0) { hostName = hostName.substring(0, index); @@ -305,21 +305,21 @@ public class AnalyticsFilter implements Filter { return fangjiaConfig.getCityDomainName(city) + analyticsBean.requestUri + analyticsBean.queryString; } if (city != null || secondLevelDomains().contains(prefixSplit[0])) { - // 找到对应的城市,或者是一个有效的二级域名 + // 鎵惧埌瀵瑰簲鐨勫煄甯傦紝鎴栬�呮槸涓�涓湁鏁堢殑浜岀骇鍩熷悕 return null; } if (prefixSplit[0].equalsIgnoreCase("www")) { // return null; String s = StringUtils.substringAfter(analyticsBean.getRequestUri(), contextPath); // if (analyticsBean.getRequestUri().equals(contextPath + "/") || analyticsBean.getRequestUri().equals(contextPath)) { -// // 访问全国首页 +// // 璁块棶鍏ㄥ浗棣栭〉 // return null; // } else if (s != null && (s.startsWith("/s/") || s.startsWith("/r/"))) { - // 访问全国首页 + // 璁块棶鍏ㄥ浗棣栭〉 return null; } else { - // 以www开头的内页,转到对应的城市内页 + // 浠ww寮�澶寸殑鍐呴〉锛岃浆鍒板搴旂殑鍩庡競鍐呴〉 if(analyticsBean.getRequestUri().contains("gujia")||analyticsBean.getRequestUri().contains("zouzhi")||analyticsBean.getRequestUri().equals(contextPath + "/") || analyticsBean.getRequestUri().equals(contextPath)){ city = guessCity(analyticsBean); if (city != null) { diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/filters/AntiSpiderFilter.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/filters/AntiSpiderFilter.java index db4f0a4db..c248a8a89 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/filters/AntiSpiderFilter.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/filters/AntiSpiderFilter.java @@ -21,8 +21,8 @@ import java.util.List; import java.util.Map; /** - * 反爬虫Filter - * @author 王文艳 + * 鍙嶇埇铏獸ilter + * @author 鐜嬫枃鑹� * @create 2016-10-17 **/ public class AntiSpiderFilter implements Filter { @@ -48,7 +48,7 @@ public class AntiSpiderFilter implements Filter { HttpServletRequest request = (HttpServletRequest) req; HttpServletResponse response = (HttpServletResponse) resp; - // 放开首页不做爬虫验证 + // 鏀惧紑棣栭〉涓嶅仛鐖櫕楠岃瘉 if (request.getRequestURL().toString().endsWith("fangjia.com") || request.getRequestURL().toString().endsWith("fangjia.com/")) { chain.doFilter(req, resp); return; @@ -87,7 +87,7 @@ public class AntiSpiderFilter implements Filter { String key = "spider_blacklist_" + snapshoot.getIp(); CacheUtils.putValue(CacheUtils.CachePolicyEnum.MIDDLE, Spider.class,key, spider, true); spiderService.upsertByIp(spider); - LOGGER.info("发现疑似爬虫:" + spider); + LOGGER.info("鍙戠幇鐤戜技鐖櫕:" + spider); if(StringUtils.isNotBlank(url)){ response.sendRedirect(request.getContextPath() + "/validate?backUrl=" + DataUtil.urlEncode(url)); }else{ diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/filters/SpiderValidateFilter.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/filters/SpiderValidateFilter.java index 2110297bd..f3080bccf 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/filters/SpiderValidateFilter.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/filters/SpiderValidateFilter.java @@ -53,7 +53,7 @@ public class SpiderValidateFilter implements Filter { private void checkReload() { if (this.reloading.compareAndSet(false, true)) { try { - // 5分钟reload一次 + // 5鍒嗛挓reload涓�娆� if (System.currentTimeMillis() - lastReloadTimestamp < 300000) { return; } @@ -87,13 +87,13 @@ public class SpiderValidateFilter implements Filter { if (isValidUserAgent(ua)) { for (String spiderName : spiderDomains.keySet()) { if (!ua.contains(spiderName)) { - // 未声明自己为spider则跳过 + // 鏈0鏄庤嚜宸变负spider鍒欒烦杩� continue; } if (null == ip) { spider = new Spider(spiderName, ip, ua); spider.setFake(true); - // 对ip为null的蜘蛛暂时不入数据库 + // 瀵筰p涓簄ull鐨勮湗铔涙殏鏃朵笉鍏ユ暟鎹簱 } else { spider = spiders.get(ip); if (null == spider) { @@ -106,7 +106,7 @@ public class SpiderValidateFilter implements Filter { } else { spider = new Spider("unkown", ip, ua); spider.setFake(true); - // 对userAgent为null的蜘蛛暂时不入数据库 + // 瀵箄serAgent涓簄ull鐨勮湗铔涙殏鏃朵笉鍏ユ暟鎹簱 } } if (spider != null && spider.isFake()) { @@ -145,7 +145,7 @@ public class SpiderValidateFilter implements Filter { private void validateSpider(Spider spider) { if (null == spider.getId()) { - // 新发现的蜘蛛 + // 鏂板彂鐜扮殑铚樿洓 checkSpider(spider); spiderService.upsertByIp(spider); spiders.put(spider.getIp(), spider); @@ -153,23 +153,23 @@ public class SpiderValidateFilter implements Filter { LOGGER.info("find new spider: " + spider); } } else if (spider.isVerified()) { - // 已人工验证的蜘蛛 + // 宸蹭汉宸ラ獙璇佺殑铚樿洓 spiders.put(spider.getIp(), spider); } else if (spider.isFake()) { - // 已发现的假蜘蛛 + // 宸插彂鐜扮殑鍋囪湗铔� Date yestoday = DateUtils.addDays(new Date(), -1); if (spider.getModificationDate().before(yestoday)) { - // 删除超过1天的假蜘蛛信息 + // 鍒犻櫎瓒呰繃1澶╃殑鍋囪湗铔涗俊鎭� spiderService.deleteByIp(spider.getIp()); spiders.remove(spider.getIp()); } else { spiders.put(spider.getIp(), spider); } } else { - // 已发现的真蜘蛛 + // 宸插彂鐜扮殑鐪熻湗铔� Date lastWeek = DateUtils.addDays(new Date(), -7); if (spider.getModificationDate().before(lastWeek)) { - // 重新验证超过7天的真蜘蛛 + // 閲嶆柊楠岃瘉瓒呰繃7澶╃殑鐪熻湗铔� checkSpider(spider); if (spider.isFake()) { spiderService.deleteByIp(spider.getIp()); @@ -191,10 +191,10 @@ public class SpiderValidateFilter implements Filter { String host = nslookup(spider.getIp()); if (null != host) { spider.setHost(host); - // 不是相同域的为假蜘蛛 + // 涓嶆槸鐩稿悓鍩熺殑涓哄亣铚樿洓 spider.setFake(!isSameDomain(host, spiderDomains.get(spider.getName()))); } else { - // 反向解析失败,则默认为真蜘蛛 + // 鍙嶅悜瑙f瀽澶辫触锛屽垯榛樿涓虹湡铚樿洓 spider.setHost(spider.getIp()); spider.setFake(false); } diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/filters/XSSFilter.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/filters/XSSFilter.java index 49024e75d..23b7b64e9 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/filters/XSSFilter.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/filters/XSSFilter.java @@ -12,7 +12,7 @@ import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; /** - * 防止xss攻击 过滤器(顺便过滤了 sql攻击) + * 闃叉xss鏀诲嚮 杩囨护鍣紙椤轰究杩囨护浜� sql鏀诲嚮锛� */ public class XSSFilter implements Filter { @Override @@ -22,15 +22,15 @@ public class XSSFilter implements Filter { @Override public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException { - // 初始化自定义HttpServletRequestWrapper + // 鍒濆鍖栬嚜瀹氫箟HttpServletRequestWrapper XssFilterWrapper xssFilterWrapper = new XssFilterWrapper((HttpServletRequest) servletRequest); - // 获取所有参数集合 + // 鑾峰彇鎵�鏈夊弬鏁伴泦鍚� Map parameterMap = new HashMap(xssFilterWrapper.getParameterMap()); - // 将集合存到自定义HttpServletRequestWrapper + // 灏嗛泦鍚堝瓨鍒拌嚜瀹氫箟HttpServletRequestWrapper xssFilterWrapper.setParameterMap(parameterMap); - //使用包装器 + //浣跨敤鍖呰鍣� filterChain.doFilter(xssFilterWrapper,servletResponse); } diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/filters/XssFilterWrapper.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/filters/XssFilterWrapper.java index 19664643f..95b2b30e3 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/filters/XssFilterWrapper.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/filters/XssFilterWrapper.java @@ -12,23 +12,23 @@ import java.util.regex.Pattern; public class XssFilterWrapper extends HttpServletRequestWrapper { - private Map parameterMap; // 所有参数的Map集合 + private Map parameterMap; // 鎵�鏈夊弬鏁扮殑Map闆嗗悎 /** - * ChangeRequestWrapper构造函数 + * ChangeRequestWrapper鏋勯�犲嚱鏁� * @param request */ public XssFilterWrapper(HttpServletRequest request) { super(request); - // 给参数集合赋值 + // 缁欏弬鏁伴泦鍚堣祴鍊� parameterMap = request.getParameterMap(); } /** - * 获取所有参数名 + * 鑾峰彇鎵�鏈夊弬鏁板悕 * - * @return 返回所有参数名 + * @return 杩斿洖鎵�鏈夊弬鏁板悕 */ @Override public Enumeration getParameterNames() { @@ -37,10 +37,10 @@ public class XssFilterWrapper extends HttpServletRequestWrapper { } /** - * 获取指定参数名的值,如果有重复的参数名,则返回第一个的值 接收一般变量 ,如text类型 + * 鑾峰彇鎸囧畾鍙傛暟鍚嶇殑鍊硷紝濡傛灉鏈夐噸澶嶇殑鍙傛暟鍚嶏紝鍒欒繑鍥炵涓�涓殑鍊� 鎺ユ敹涓�鑸彉閲� 锛屽text绫诲瀷 * - * @param name 指定参数名 - * @return 指定参数名的值 + * @param name 鎸囧畾鍙傛暟鍚� + * @return 鎸囧畾鍙傛暟鍚嶇殑鍊� */ @Override public String getParameter(String name) { @@ -50,8 +50,8 @@ public class XssFilterWrapper extends HttpServletRequestWrapper { /** - * 获取指定参数名的所有值的数组,如:checkbox的所有数据 - * 接收数组变量 ,如checkobx类型 + * 鑾峰彇鎸囧畾鍙傛暟鍚嶇殑鎵�鏈夊�肩殑鏁扮粍锛屽锛歝heckbox鐨勬墍鏈夋暟鎹� + * 鎺ユ敹鏁扮粍鍙橀噺 锛屽checkobx绫诲瀷 */ @Override public String[] getParameterValues(String name) { @@ -102,7 +102,7 @@ public class XssFilterWrapper extends HttpServletRequestWrapper { Pattern.compile("vbscript:", Pattern.CASE_INSENSITIVE), // onload(...)=... Pattern.compile("onload(.*?)=", Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL), - //现场安全测试增加校验 + //鐜板満瀹夊叏娴嬭瘯澧炲姞鏍¢獙 Pattern.compile("alert(.*?)", Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL), Pattern.compile("<", Pattern.MULTILINE | Pattern.DOTALL), Pattern.compile(">", Pattern.MULTILINE | Pattern.DOTALL), diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/filters/spider/UserBehaviorSnapshoot.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/filters/spider/UserBehaviorSnapshoot.java index e973e1c37..a44aa02b5 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/filters/spider/UserBehaviorSnapshoot.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/filters/spider/UserBehaviorSnapshoot.java @@ -6,8 +6,8 @@ import java.util.Map; import java.util.TreeMap; /** - * 用户行为快照 - * @author 王文艳 + * 鐢ㄦ埛琛屼负蹇収 + * @author 鐜嬫枃鑹� * @create 2016-10-18 **/ public class UserBehaviorSnapshoot implements Serializable{ diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/http/CharSet.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/http/CharSet.java index e8ad0a28a..066784ce0 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/http/CharSet.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/http/CharSet.java @@ -1,8 +1,8 @@ package com.fangjia.coresite.http; /** - * 类名称:CharSet - * 类描述: + * 绫诲悕绉帮細CharSet + * 绫绘弿杩帮細 * @version */ public class CharSet { diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/http/HttpFormParameter.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/http/HttpFormParameter.java index c042da1b4..0ad007922 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/http/HttpFormParameter.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/http/HttpFormParameter.java @@ -7,8 +7,8 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; /** - * 类名称:表单参数 - * 类描述: + * 绫诲悕绉帮細琛ㄥ崟鍙傛暟 + * 绫绘弿杩帮細 * @version */ @XmlRootElement diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/http/HttpSendModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/http/HttpSendModel.java index d3d389e0d..0e95d0c1b 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/http/HttpSendModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/http/HttpSendModel.java @@ -14,7 +14,7 @@ import org.apache.http.client.utils.URLEncodedUtils; import org.apache.http.message.BasicNameValuePair; /** - * 类名称:表单参数 + * 绫诲悕绉帮細琛ㄥ崟鍙傛暟 * @version */ @XmlRootElement @@ -58,16 +58,16 @@ public class HttpSendModel implements Serializable { } /** - * 注意:
- * 比如招行的提交地址https://netpay.cmbchina.com/netpayment/BaseHttp.dll?PrePayC1
- * 用get拼好的url串https://netpay.cmbchina.com/netpayment/BaseHttp.dll?PrePayC1? - * a=1 这种情况适用
+ * 娉ㄦ剰锛�
+ * 姣斿鎷涜鐨勬彁浜ゅ湴鍧�https://netpay.cmbchina.com/netpayment/BaseHttp.dll?PrePayC1
+ * 鐢╣et鎷煎ソ鐨剈rl涓瞙ttps://netpay.cmbchina.com/netpayment/BaseHttp.dll?PrePayC1? + * a=1 杩欑鎯呭喌閫傜敤
*
- * 同时,需要非常注意的是:如果参数中有中文并且你已经url编码过了,那么,请保证url和urlPath保持一致,并使用get方式! + * 鍚屾椂锛岄渶瑕侀潪甯告敞鎰忕殑鏄細濡傛灉鍙傛暟涓湁涓枃骞朵笖浣犲凡缁弖rl缂栫爜杩囦簡锛岄偅涔堬紝璇蜂繚璇乽rl鍜寀rlPath淇濇寔涓�鑷达紝骞朵娇鐢╣et鏂瑰紡锛� * * @param url * @param urlPath - * 不带参数的纯地址 + * 涓嶅甫鍙傛暟鐨勭函鍦板潃 * @throws Exception */ public HttpSendModel(String url, String urlPath) throws Exception { @@ -79,7 +79,7 @@ public class HttpSendModel implements Serializable { this.url = url; } else { if (!url.startsWith(urlPath)) { - throw new Exception("地址不匹配"); + throw new Exception("鍦板潃涓嶅尮閰�"); } if (url.length() == urlPath.length()) { @@ -88,7 +88,7 @@ public class HttpSendModel implements Serializable { } if (url.charAt(urlPath.length()) != '?') { - throw new Exception("地址不匹配"); + throw new Exception("鍦板潃涓嶅尮閰�"); } this.url = urlPath; @@ -125,7 +125,7 @@ public class HttpSendModel implements Serializable { } /** - * 生成get模式的请求地址 + * 鐢熸垚get妯″紡鐨勮姹傚湴鍧� * * @return */ @@ -149,11 +149,11 @@ public class HttpSendModel implements Serializable { * 20140512 yfj modify * requestUrl += "?" + appender; */ - // 用于url不存在参数的情况 + // 鐢ㄤ簬url涓嶅瓨鍦ㄥ弬鏁扮殑鎯呭喌 if (url.indexOf("?") == -1) { requestUrl += "?" + appender; } - // 用于url已存在参数的情况 + // 鐢ㄤ簬url宸插瓨鍦ㄥ弬鏁扮殑鎯呭喌 else { requestUrl += "&" + appender; } diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/http/SimpleHttpClient.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/http/SimpleHttpClient.java index 7996c19b8..198a447e6 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/http/SimpleHttpClient.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/http/SimpleHttpClient.java @@ -20,26 +20,26 @@ public class SimpleHttpClient { private HttpClient httpclient; /** - * 请求超时 + * 璇锋眰瓒呮椂 */ private int connectionTimeout; /** - * 读取超时 + * 璇诲彇瓒呮椂 */ private int soTimeout; /** - * 默认请求超时(单位:毫秒) + * 榛樿璇锋眰瓒呮椂锛堝崟浣嶏細姣锛� */ private static final int DEFAULT_CONNECTION_TIMEOUT = 30000; /** - * 默认读取超时(单位:毫秒) + * 榛樿璇诲彇瓒呮椂锛堝崟浣嶏細姣锛� */ private static final int DEFAULT_SO_TIMEOUT = 90000; /** - * 按默认请求超时,读取超时设置 + * 鎸夐粯璁よ姹傝秴鏃讹紝璇诲彇瓒呮椂璁剧疆 */ public SimpleHttpClient() { this.connectionTimeout = DEFAULT_CONNECTION_TIMEOUT; @@ -55,9 +55,9 @@ public class SimpleHttpClient { /** * @param connectionTimeout - * 请求超时 + * 璇锋眰瓒呮椂 * @param soTimeout - * 读取超时 + * 璇诲彇瓒呮椂 */ public SimpleHttpClient(int connectionTimeout, int soTimeout) { this.connectionTimeout = connectionTimeout; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/http/SimpleHttpResponse.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/http/SimpleHttpResponse.java index b095483f9..08a9304da 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/http/SimpleHttpResponse.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/http/SimpleHttpResponse.java @@ -5,7 +5,7 @@ import java.io.Serializable; import com.fangjia.coresite.util.HttpUtil; /** - * 类名称:表单参数 + * 绫诲悕绉帮細琛ㄥ崟鍙傛暟 * @version */ public class SimpleHttpResponse implements Serializable { @@ -32,7 +32,7 @@ public class SimpleHttpResponse implements Serializable { } /** - * 是否成功 + * 鏄惁鎴愬姛 * * @return */ diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/AdviceLeadsModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/AdviceLeadsModel.java index 4564000f0..5b59eadf6 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/AdviceLeadsModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/AdviceLeadsModel.java @@ -5,36 +5,36 @@ public class AdviceLeadsModel extends BaseModel{ private static final long serialVersionUID = -5664116886759283515L; /** - * 姓名 + * 濮撳悕 */ private String name; /** - * 手机 + * 鎵嬫満 */ private String mobile; /** - * 邮箱 + * 閭 */ private String email; /** - * 公司 + * 鍏徃 */ private String company; /** - * 部门 + * 閮ㄩ棬 */ private String department; /** - * 职位 + * 鑱屼綅 */ private String position; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/AgreementModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/AgreementModel.java index 33224da9d..7878d6213 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/AgreementModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/AgreementModel.java @@ -6,67 +6,67 @@ public class AgreementModel extends BaseModel { private static final long serialVersionUID = 1L; /** - * 编号 + * 缂栧彿 */ private String id; /** - * 协议编号 + * 鍗忚缂栧彿 */ private String loanAgreementId; /** - * 账户名 + * 璐︽埛鍚� */ private String name; /** - * 手机号 + * 鎵嬫満鍙� */ private String mobile; /** - * 贷款金额 + * 璐锋閲戦 */ private double loanAmount; /** - * 服务费比率 + * 鏈嶅姟璐规瘮鐜� */ private double serviceRate; /** - * 协议编号 + * 鍗忚缂栧彿 */ private String agreementId; /** - * 证件类型 + * 璇佷欢绫诲瀷 */ private String certificate; /** - * 证件号码 + * 璇佷欢鍙风爜 */ private String number; /** - * 银行卡号 + * 閾惰鍗″彿 */ private String cardNumber; /** - * 开户行 + * 寮�鎴疯 */ private String bank; /** - * 签名图片Url + * 绛惧悕鍥剧墖Url */ private String signatureUrl; /** - * 是否有效 1:有效 0:无效 + * 鏄惁鏈夋晥 1:鏈夋晥 0锛氭棤鏁� */ private int status; /** - * 添加时间 + * 娣诲姞鏃堕棿 */ private Date addTime; /** - * 修改时间 + * 淇敼鏃堕棿 */ private Date modTime; @@ -76,52 +76,52 @@ public class AgreementModel extends BaseModel { private String msg; /** - * 当前年份 + * 褰撳墠骞翠唤 */ private String nowYear; /** - * 当前月份 + * 褰撳墠鏈堜唤 */ private String nowMonth; /** - * 当天 + * 褰撳ぉ */ private String nowDay; /** - * 64位加密后图片 + * 64浣嶅姞瀵嗗悗鍥剧墖 */ private String imageFile; /** - * 是否重新加载 + * 鏄惁閲嶆柊鍔犺浇 */ private int reload; /** - * 贷款金额(中文大写) + * 璐锋閲戦(涓枃澶у啓) */ private String amountToChinese; /** - * 短信验证码 + * 鐭俊楠岃瘉鐮� */ private String smsCode; /** - * 签约状态 0:未签约 1:已签约 2:已失效 3:已拒绝 + * 绛剧害鐘舵�� 0锛氭湭绛剧害 1锛氬凡绛剧害 2锛氬凡澶辨晥 3锛氬凡鎷掔粷 */ private int signStatus; /** - * 商户编号 + * 鍟嗘埛缂栧彿 */ private String merchantno; /** - * 绑卡请求号 + * 缁戝崱璇锋眰鍙� */ private String requestno; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/ApartmentModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/ApartmentModel.java index ad5a208ac..e71dd4b91 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/ApartmentModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/ApartmentModel.java @@ -4,53 +4,53 @@ import java.util.Date; import java.util.List; /** - * 精品公寓Model + * 绮惧搧鍏瘬Model * * @author Jenis * - * 2018年6月29日 下午15:14:28 + * 2018骞�6鏈�29鏃� 涓嬪崍15:14:28 */ public class ApartmentModel extends BaseModel { private static final long serialVersionUID = 4803131874204818108L; private String id; - private String region; // 区域 - private String block; // 板块 + private String region; // 鍖哄煙 + private String block; // 鏉垮潡 private String station; private Integer walktime; - private Integer room; // 室 + private Integer room; // 瀹� private String totalPriceRange; private String houseAreaRange; private String houseAgeRange; private String creationDateRange; private String keyword; - private String districtName; // 小区名 - private String name; // 标题 - private String city2; // 城市 - private List pics; // 图片 - private Integer totalPrice; // 租金 - private Double area; // 面积 - private Integer hall; // 厅 - private Integer toilet; // 卫 - private String address; // 地址 + private String districtName; // 灏忓尯鍚� + private String name; // 鏍囬 + private String city2; // 鍩庡競 + private List pics; // 鍥剧墖 + private Integer totalPrice; // 绉熼噾 + private Double area; // 闈㈢Н + private Integer hall; // 鍘� + private Integer toilet; // 鍗� + private String address; // 鍦板潃 private String mobile; // mobile - private Date publishDate; // 发布时间 - private Integer floor; // 所在楼层 - private Integer height; // 楼高 - private String contactPeople; // 联系人 - private String fitment; // 装修情况 - private String direction; // 朝向 - private String buildDate; // 建筑年代 - private String estateType; // 物业类型 - private String description; // 描述 - private String rentType; // 出租类型 - private String checkInTime; // 可入住时间 - private String houseAllocation;// 房屋配置,分割 - private String houseRequire;// 房屋要求 - private String houseAdvantage;// 房屋亮点 - private String payType; // 付款方式 - private String metro; // 地铁 - private String line; // 线路 - private String subject; // 来源(交易主体个人或者中介等) + private Date publishDate; // 鍙戝竷鏃堕棿 + private Integer floor; // 鎵�鍦ㄦゼ灞� + private Integer height; // 妤奸珮 + private String contactPeople; // 鑱旂郴浜� + private String fitment; // 瑁呬慨鎯呭喌 + private String direction; // 鏈濆悜 + private String buildDate; // 寤虹瓚骞翠唬 + private String estateType; // 鐗╀笟绫诲瀷 + private String description; // 鎻忚堪 + private String rentType; // 鍑虹绫诲瀷 + private String checkInTime; // 鍙叆浣忔椂闂� + private String houseAllocation;// 鎴垮眿閰嶇疆,鍒嗗壊 + private String houseRequire;// 鎴垮眿瑕佹眰 + private String houseAdvantage;// 鎴垮眿浜偣 + private String payType; // 浠樻鏂瑰紡 + private String metro; // 鍦伴搧 + private String line; // 绾胯矾 + private String subject; // 鏉ユ簮锛堜氦鏄撲富浣撲釜浜烘垨鑰呬腑浠嬬瓑锛� private Double lat; private Double lng; private String defaultPic; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/ApiModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/ApiModel.java index b3014213b..004eedf39 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/ApiModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/ApiModel.java @@ -23,17 +23,17 @@ public class ApiModel extends BaseModel { /** - * 区域 + * 鍖哄煙 */ private String region; /** - * 小区 + * 灏忓尯 */ private String districtName; /** - * 均价 + * 鍧囦环 */ private JSONObject stat; private Map serviceIdMap; @@ -144,30 +144,30 @@ public class ApiModel extends BaseModel { public final Map getServiceIdMsgMap(){ serviceIdMsgMap = new HashMap(); - serviceIdMsgMap.put("S001", "房屋总价"); - serviceIdMsgMap.put("S002", "房屋租金"); - serviceIdMsgMap.put("S003", "房屋总价月涨跌幅"); - serviceIdMsgMap.put("S004", "房屋租金月涨跌幅"); - serviceIdMsgMap.put("S005", "周边相似挂牌房源"); - serviceIdMsgMap.put("S006", "周边相似挂牌量"); - serviceIdMsgMap.put("S007", "小区名址匹配"); - serviceIdMsgMap.put("S008", "小区均价"); - serviceIdMsgMap.put("S009", "小区平均租金"); - serviceIdMsgMap.put("S010", "小区均价月涨跌幅"); - serviceIdMsgMap.put("S011", "小区平均租金月涨跌幅"); - serviceIdMsgMap.put("S012", "小区周边交通状况"); - serviceIdMsgMap.put("S013", "小区周边居住人口密度"); - serviceIdMsgMap.put("S014", "小区物业类型"); - serviceIdMsgMap.put("S015", "小区挂牌量"); - serviceIdMsgMap.put("S016", "小区周边均价"); - serviceIdMsgMap.put("S017", "小区周边平均租金"); - serviceIdMsgMap.put("S018", "小区周边平均餐饮消费"); - serviceIdMsgMap.put("S019", "区域住宅均价"); - serviceIdMsgMap.put("S020", "区域住宅均价月涨跌幅"); - serviceIdMsgMap.put("S021", "区域餐饮平均消费"); - serviceIdMsgMap.put("S022", "城市住宅均价"); - serviceIdMsgMap.put("S023", "城市住宅均价月涨跌幅"); - serviceIdMsgMap.put("S024", "城市餐饮平均消费"); + serviceIdMsgMap.put("S001", "鎴垮眿鎬讳环"); + serviceIdMsgMap.put("S002", "鎴垮眿绉熼噾"); + serviceIdMsgMap.put("S003", "鎴垮眿鎬讳环鏈堟定璺屽箙"); + serviceIdMsgMap.put("S004", "鎴垮眿绉熼噾鏈堟定璺屽箙"); + serviceIdMsgMap.put("S005", "鍛ㄨ竟鐩镐技鎸傜墝鎴挎簮"); + serviceIdMsgMap.put("S006", "鍛ㄨ竟鐩镐技鎸傜墝閲�"); + serviceIdMsgMap.put("S007", "灏忓尯鍚嶅潃鍖归厤"); + serviceIdMsgMap.put("S008", "灏忓尯鍧囦环"); + serviceIdMsgMap.put("S009", "灏忓尯骞冲潎绉熼噾"); + serviceIdMsgMap.put("S010", "灏忓尯鍧囦环鏈堟定璺屽箙"); + serviceIdMsgMap.put("S011", "灏忓尯骞冲潎绉熼噾鏈堟定璺屽箙"); + serviceIdMsgMap.put("S012", "灏忓尯鍛ㄨ竟浜ら�氱姸鍐�"); + serviceIdMsgMap.put("S013", "灏忓尯鍛ㄨ竟灞呬綇浜哄彛瀵嗗害"); + serviceIdMsgMap.put("S014", "灏忓尯鐗╀笟绫诲瀷"); + serviceIdMsgMap.put("S015", "灏忓尯鎸傜墝閲�"); + serviceIdMsgMap.put("S016", "灏忓尯鍛ㄨ竟鍧囦环"); + serviceIdMsgMap.put("S017", "灏忓尯鍛ㄨ竟骞冲潎绉熼噾"); + serviceIdMsgMap.put("S018", "灏忓尯鍛ㄨ竟骞冲潎椁愰ギ娑堣垂"); + serviceIdMsgMap.put("S019", "鍖哄煙浣忓畢鍧囦环"); + serviceIdMsgMap.put("S020", "鍖哄煙浣忓畢鍧囦环鏈堟定璺屽箙"); + serviceIdMsgMap.put("S021", "鍖哄煙椁愰ギ骞冲潎娑堣垂"); + serviceIdMsgMap.put("S022", "鍩庡競浣忓畢鍧囦环"); + serviceIdMsgMap.put("S023", "鍩庡競浣忓畢鍧囦环鏈堟定璺屽箙"); + serviceIdMsgMap.put("S024", "鍩庡競椁愰ギ骞冲潎娑堣垂"); return serviceIdMsgMap; } diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/ApplyLoanModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/ApplyLoanModel.java index 20136ad46..6286f5aea 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/ApplyLoanModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/ApplyLoanModel.java @@ -4,34 +4,34 @@ public class ApplyLoanModel extends BaseModel{ private static final long serialVersionUID = 1L; - //小区名 + //灏忓尯鍚� private String name; - //地址 + //鍦板潃 private String address; - //总价 + //鎬讳环 private long totalPrice; - //面积 + //闈㈢Н private Double area; - //均价 + //鍧囦环 private Integer avgPrice; - //贷款id + //璐锋id private String productId; - //申请贷款页面来源 + //鐢宠璐锋椤甸潰鏉ユ簮 private String source; - //贷款类型 + //璐锋绫诲瀷 private String loanType; - //上一页面链接 + //涓婁竴椤甸潰閾炬帴 private String backUrl; - //手机号 + //鎵嬫満鍙� private String mobile; public String getProductId() { diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/BaseModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/BaseModel.java index 6ecda65d3..e83379257 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/BaseModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/BaseModel.java @@ -54,13 +54,13 @@ public class BaseModel extends ModelAndViewSupport { private final static String PIC_TEMP_PATH = CONFIG.isDevelopmentEnvironment() ? "d:\\" : "/home/goojia/webapps/fangjia-coresite/temppic/"; - // 默认房源小图 + // 榛樿鎴挎簮灏忓浘 private final static String DEFAULT_S_PIC = STATIC_URL + "/images/common/no-s.gif"; - // 默认房源大图 + // 榛樿鎴挎簮澶у浘 private final static String DEFAULT_B_PIC = STATIC_URL + "/images/common/no-b.gif"; - // 默认经纪人头像 + // 榛樿缁忕邯浜哄ご鍍� private final static String DEFAULT_BROKER_PIC = STATIC_URL + "/images/common/no-broker.gif"; private String queryString; private Pager pager; @@ -412,7 +412,7 @@ public class BaseModel extends ModelAndViewSupport { } /** - * 如果queryString不为空则在前面加上问号"?",否则不加 + * 濡傛灉queryString涓嶄负绌哄垯鍦ㄥ墠闈㈠姞涓婇棶鍙�"?"锛屽惁鍒欎笉鍔� * * @return */ @@ -471,7 +471,7 @@ public class BaseModel extends ModelAndViewSupport { private String getSearchKeyword(String refererUrl) throws UnsupportedEncodingException { String root = getRoot(); - // 估价的URL特殊处理 + // 浼颁环鐨刄RL鐗规畩澶勭悊 if (refererUrl.indexOf("evaluation/report") > 0 || refererUrl.indexOf("/gujia") > 0) { Map params = ActionContext.getContext().getParameters(); if (params.containsKey("keyword") && params.get("keyword") != null && params.get("keyword").length > 0) { diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/BeansModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/BeansModel.java index d7bda51e6..4db369a7c 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/BeansModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/BeansModel.java @@ -16,14 +16,14 @@ public class BeansModel extends BaseModel { private String taskId; - private Integer floors; // 层数 - private Integer buildings; // 楼栋数 - private Integer stairs; // 梯 - private Integer houses; // 户 + private Integer floors; // 灞傛暟 + private Integer buildings; // 妤兼爧鏁� + private Integer stairs; // 姊� + private Integer houses; // 鎴� private String developer; private String estateCompany; private Double estateCharge; - private String underGarage; // 地下车库 + private String underGarage; // 鍦颁笅杞﹀簱 private String carSite; private String finishBuildingDate; private Double buildArea; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/ConditionAndFactorModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/ConditionAndFactorModel.java index 0f82bbd24..e5bcf586e 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/ConditionAndFactorModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/ConditionAndFactorModel.java @@ -9,8 +9,8 @@ public class ConditionAndFactorModel extends BaseModel { private static final long serialVersionUID = 1L; private String conditionName; - private String conditionEnglishName;//影响条件英文名称 - private List evaluationFactors; //影响因子集合 + private String conditionEnglishName;//褰卞搷鏉′欢鑻辨枃鍚嶇О + private List evaluationFactors; //褰卞搷鍥犲瓙闆嗗悎 public String getConditionName() { return conditionName; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/DaikuanModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/DaikuanModel.java index fee00fac2..91399c31d 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/DaikuanModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/DaikuanModel.java @@ -21,7 +21,7 @@ public class DaikuanModel extends BaseModel { private Double loanAmount; private Integer loanMonth; - private Integer loanType; // 0:房贷;1:消费贷;2:车贷;3:经营贷 + private Integer loanType; // 0:鎴胯捶;1:娑堣垂璐�;2:杞﹁捶;3:缁忚惀璐� private List houseLoanBoList; private List consumptionLoanBoList; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/DistrictModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/DistrictModel.java index 2e5f579d3..91be3be16 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/DistrictModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/DistrictModel.java @@ -62,10 +62,10 @@ public class DistrictModel extends BaseModel { private List rentHouseBoList; - private DistrictStat districtStat; // 小区均价 - private DistrictStat villaStat; // 别墅均价 - private RegionStat blockStat; // 板块均价 - private RegionStat regionStat; // 小区所在区域均价 + private DistrictStat districtStat; // 灏忓尯鍧囦环 + private DistrictStat villaStat; // 鍒鍧囦环 + private RegionStat blockStat; // 鏉垮潡鍧囦环 + private RegionStat regionStat; // 灏忓尯鎵�鍦ㄥ尯鍩熷潎浠� private DistrictStatBo districtStatBo; private List districtStatRentBoList; @@ -74,13 +74,13 @@ public class DistrictModel extends BaseModel { private long sellCount; private long rentCount; private DistrictBo districtBo; - private List withinDistrictBos; // 近距离房源 - private long curLat; // 当前小区经度 - private long curLng; // 当前小区纬度 - private long latMapMax; // 地图中的最大展示经度 - private long latMapMin; // 地图中的最小展示经度 - private long lngMapMax; // 地图中的最大展示纬度 - private long lngMapMin; // 地图中的最小展示纬度 + private List withinDistrictBos; // 杩戣窛绂绘埧婧� + private long curLat; // 褰撳墠灏忓尯缁忓害 + private long curLng; // 褰撳墠灏忓尯绾害 + private long latMapMax; // 鍦板浘涓殑鏈�澶у睍绀虹粡搴� + private long latMapMin; // 鍦板浘涓殑鏈�灏忓睍绀虹粡搴� + private long lngMapMax; // 鍦板浘涓殑鏈�澶у睍绀虹含搴� + private long lngMapMin; // 鍦板浘涓殑鏈�灏忓睍绀虹含搴� private String chartType; private String picShowType; private String feature; @@ -109,7 +109,7 @@ public class DistrictModel extends BaseModel { private List brokerBoList; private List aroundDistrictBoList; - private List autoRegionRecommends;// 自动热点推荐区域 + private List autoRegionRecommends;// 鑷姩鐑偣鎺ㄨ崘鍖哄煙 private List conditions; private List conditionItems; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/DistrictReportModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/DistrictReportModel.java index 509e9f0cb..a1724016c 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/DistrictReportModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/DistrictReportModel.java @@ -31,123 +31,123 @@ import com.fangjia.service.chart.jfreechart.JFreeChartImageService; public class DistrictReportModel extends BaseModel { private static final long serialVersionUID = -5593787992583646582L; - private List similarDistrictHouseList; // 小区内相似房源 - private List similarBlockHouseList; // 版块内相似房源 + private List similarDistrictHouseList; // 灏忓尯鍐呯浉浼兼埧婧� + private List similarBlockHouseList; // 鐗堝潡鍐呯浉浼兼埧婧� - private int rc; // 默认0:买家版;1:房东版 - private String evaluationId; // 估价报告ID - private String out_trade_no; // 估价ID - private Evaluation evaluation; // 估价报告 - private EvaluationReport evaluationReport; // 申请估价报告的用户等信息 - private String totalPriceCn; // 估价总价的中文 - private String avgPriceMicro; // 均价带千分位符号 - private District district; // 小区 + private int rc; // 榛樿0锛氫拱瀹剁増锛�1锛氭埧涓滅増 + private String evaluationId; // 浼颁环鎶ュ憡ID + private String out_trade_no; // 浼颁环ID + private Evaluation evaluation; // 浼颁环鎶ュ憡 + private EvaluationReport evaluationReport; // 鐢宠浼颁环鎶ュ憡鐨勭敤鎴风瓑淇℃伅 + private String totalPriceCn; // 浼颁环鎬讳环鐨勪腑鏂� + private String avgPriceMicro; // 鍧囦环甯﹀崈鍒嗕綅绗﹀彿 + private District district; // 灏忓尯 private DistrictStat districtStat; private String districtName; - private int houseRooms; // 房型(几室) + private int houseRooms; // 鎴垮瀷锛堝嚑瀹わ級 private boolean isVilla; private long regionDistrictCounts; private long blockDistrictCounts; private int minTotalPrice; private int maxTotalPrice; - private int statWeekCounts; // 查询的均价走势图的周数 - private String districtStatImgUrl; // 小区均价走势图URL - private String districtMinPrice; // 小区最低均价(所查周数内) - private String districtMaxPrice; // 小区最高均价(所查周数内) - private int districtMonthMarkup; // 小区均价环比 - private int districtYearMarkup; // 小区均价同比 + private int statWeekCounts; // 鏌ヨ鐨勫潎浠疯蛋鍔垮浘鐨勫懆鏁� + private String districtStatImgUrl; // 灏忓尯鍧囦环璧板娍鍥綰RL + private String districtMinPrice; // 灏忓尯鏈�浣庡潎浠凤紙鎵�鏌ュ懆鏁板唴锛� + private String districtMaxPrice; // 灏忓尯鏈�楂樺潎浠凤紙鎵�鏌ュ懆鏁板唴锛� + private int districtMonthMarkup; // 灏忓尯鍧囦环鐜瘮 + private int districtYearMarkup; // 灏忓尯鍧囦环鍚屾瘮 - private String regionStatImgUrl; // 区域均价走势图URL - private String regionMinPrice; // 区域最低均价(所查周数内) - private String regionMaxPrice; // 区域最高均价(所查周数内) - private int regionMonthMarkup; // 区域均价环比 - private int regionYearMarkup; // 区域均价同比 + private String regionStatImgUrl; // 鍖哄煙鍧囦环璧板娍鍥綰RL + private String regionMinPrice; // 鍖哄煙鏈�浣庡潎浠凤紙鎵�鏌ュ懆鏁板唴锛� + private String regionMaxPrice; // 鍖哄煙鏈�楂樺潎浠凤紙鎵�鏌ュ懆鏁板唴锛� + private int regionMonthMarkup; // 鍖哄煙鍧囦环鐜瘮 + private int regionYearMarkup; // 鍖哄煙鍧囦环鍚屾瘮 - private String blockStatImgUrl; // 板块均价走势图URL - private String blockMinPrice; // 板块最低均价(所查周数内) - private String blockMaxPrice; // 板块最高均价(所查周数内) - private int blockMonthMarkup; // 板块均价环比 - private int blockYearMarkup; // 板块均价同比 + private String blockStatImgUrl; // 鏉垮潡鍧囦环璧板娍鍥綰RL + private String blockMinPrice; // 鏉垮潡鏈�浣庡潎浠凤紙鎵�鏌ュ懆鏁板唴锛� + private String blockMaxPrice; // 鏉垮潡鏈�楂樺潎浠凤紙鎵�鏌ュ懆鏁板唴锛� + private int blockMonthMarkup; // 鏉垮潡鍧囦环鐜瘮 + private int blockYearMarkup; // 鏉垮潡鍧囦环鍚屾瘮 - private String cityStatImgUrl; // 城市均价走势图URL - private String cityMinPrice; // 城市最低均价(所查周数内) - private String cityMaxPrice; // 城市最高均价(所查周数内) - private int cityMonthMarkup; // 城市均价环比 - private int cityYearMarkup; // 城市均价同比 + private String cityStatImgUrl; // 鍩庡競鍧囦环璧板娍鍥綰RL + private String cityMinPrice; // 鍩庡競鏈�浣庡潎浠凤紙鎵�鏌ュ懆鏁板唴锛� + private String cityMaxPrice; // 鍩庡競鏈�楂樺潎浠凤紙鎵�鏌ュ懆鏁板唴锛� + private int cityMonthMarkup; // 鍩庡競鍧囦环鐜瘮 + private int cityYearMarkup; // 鍩庡競鍧囦环鍚屾瘮 - private String districtRentStatImgUrl; // 小区租金均价走势图URL(所查周数同statWeekCounts) - private List districtRentStatImgMark; // 小区租金均价走势图中的线条颜色意义 + private String districtRentStatImgUrl; // 灏忓尯绉熼噾鍧囦环璧板娍鍥綰RL锛堟墍鏌ュ懆鏁板悓statWeekCounts锛� + private List districtRentStatImgMark; // 灏忓尯绉熼噾鍧囦环璧板娍鍥句腑鐨勭嚎鏉¢鑹叉剰涔� private List districtRoomRentStatBos; - private List tradeHis; // 房子成交记录 - private String districtTradeStatImgUrl; // 成交均价走势图URL(包含小区、板块、区域的成交均价走势) - private List districtTradeStatImgMark; // 成交均价走势图的线条颜色意义 - private DistrictTradeAnalyseBo districtTradeStatBo; // 小区的成交记录分析 - private DistrictStatRankBo districtStatRank; // 小区的挂牌价排行 - private int tradeLevel; // 成交热度指数(半年内) - private int rentalRatio; // 租售比 + private List tradeHis; // 鎴垮瓙鎴愪氦璁板綍 + private String districtTradeStatImgUrl; // 鎴愪氦鍧囦环璧板娍鍥綰RL锛堝寘鍚皬鍖恒�佹澘鍧椼�佸尯鍩熺殑鎴愪氦鍧囦环璧板娍锛� + private List districtTradeStatImgMark; // 鎴愪氦鍧囦环璧板娍鍥剧殑绾挎潯棰滆壊鎰忎箟 + private DistrictTradeAnalyseBo districtTradeStatBo; // 灏忓尯鐨勬垚浜よ褰曞垎鏋� + private DistrictStatRankBo districtStatRank; // 灏忓尯鐨勬寕鐗屼环鎺掕 + private int tradeLevel; // 鎴愪氦鐑害鎸囨暟锛堝崐骞村唴锛� + private int rentalRatio; // 绉熷敭姣� - private String tradeAreaPropImgUrl; // 小区成交面积占比饼图URL - private List tradeAreaPropImgMark; // 小区成交面积占比饼图中的颜色意义 - private String tradePricePropImgUrl; // 小区成交价格占比饼图URL - private List tradePricePropImgMark; // 小区成交价格占比饼图中的颜色意义 - private String tradeAreaPropMaxStr; // 小区成交面积占比最大的类型 - private double tradeAreaPropMaxValue; // 小区成交面积占比最大的值 - private String tradePricePropMaxStr; // 小区成交价格占比最大的类型 - private double tradePricePropMaxValue; // 小区成交价格占比最大的值 + private String tradeAreaPropImgUrl; // 灏忓尯鎴愪氦闈㈢Н鍗犳瘮楗煎浘URL + private List tradeAreaPropImgMark; // 灏忓尯鎴愪氦闈㈢Н鍗犳瘮楗煎浘涓殑棰滆壊鎰忎箟 + private String tradePricePropImgUrl; // 灏忓尯鎴愪氦浠锋牸鍗犳瘮楗煎浘URL + private List tradePricePropImgMark; // 灏忓尯鎴愪氦浠锋牸鍗犳瘮楗煎浘涓殑棰滆壊鎰忎箟 + private String tradeAreaPropMaxStr; // 灏忓尯鎴愪氦闈㈢Н鍗犳瘮鏈�澶х殑绫诲瀷 + private double tradeAreaPropMaxValue; // 灏忓尯鎴愪氦闈㈢Н鍗犳瘮鏈�澶х殑鍊� + private String tradePricePropMaxStr; // 灏忓尯鎴愪氦浠锋牸鍗犳瘮鏈�澶х殑绫诲瀷 + private double tradePricePropMaxValue; // 灏忓尯鎴愪氦浠锋牸鍗犳瘮鏈�澶х殑鍊� - private List similarTradeHouses; // 同类成交房源 - private int minAvgPriceIndex; // 同类成交房源中单价最小的序号 - private int maxAvgPriceIndex; // 同类成交房源中单价最大的序号 + private List similarTradeHouses; // 鍚岀被鎴愪氦鎴挎簮 + private int minAvgPriceIndex; // 鍚岀被鎴愪氦鎴挎簮涓崟浠锋渶灏忕殑搴忓彿 + private int maxAvgPriceIndex; // 鍚岀被鎴愪氦鎴挎簮涓崟浠锋渶澶х殑搴忓彿 - private String room1Str; // 一室户户型描述 - private String room1ImgUrl; // 一室户户型图片URL - private String room2Str; // 二室户户型描述 - private String room2ImgUrl; // 二室户户型图片URL - private String room3Str; // 三室户户型描述 - private String room3ImgUrl; // 三室户户型图片URL - private List outPics; // 外景图(最多4张) + private String room1Str; // 涓�瀹ゆ埛鎴峰瀷鎻忚堪 + private String room1ImgUrl; // 涓�瀹ゆ埛鎴峰瀷鍥剧墖URL + private String room2Str; // 浜屽鎴锋埛鍨嬫弿杩� + private String room2ImgUrl; // 浜屽鎴锋埛鍨嬪浘鐗嘦RL + private String room3Str; // 涓夊鎴锋埛鍨嬫弿杩� + private String room3ImgUrl; // 涓夊鎴锋埛鍨嬪浘鐗嘦RL + private List outPics; // 澶栨櫙鍥�(鏈�澶�4寮�) - private List regionStatTop5; // 区域内挂牌均价排名前5的小区 - private List blockStatTop5; // 板块内挂牌均价排名前5的小区 + private List regionStatTop5; // 鍖哄煙鍐呮寕鐗屽潎浠锋帓鍚嶅墠5鐨勫皬鍖� + private List blockStatTop5; // 鏉垮潡鍐呮寕鐗屽潎浠锋帓鍚嶅墠5鐨勫皬鍖� - private List cityPriceTop5;//城市内均价排名前5的小区 - private List regionPriceTop5;//区域内均价排名前5的小区 + private List cityPriceTop5;//鍩庡競鍐呭潎浠锋帓鍚嶅墠5鐨勫皬鍖� + private List regionPriceTop5;//鍖哄煙鍐呭潎浠锋帓鍚嶅墠5鐨勫皬鍖� - private List cityTradeStatTop5; // 城市内成交均价排名前5的小区 - private List regionTradeStatTop5; // 区域内成交均价排名前5的小区 - private List blockTradeStatTop5; // 板块内成交均价排名前5的小区 - private String regionRankImgUrl; // 小区在区域内的均价排行柱形图URL - private String blockRankImgUrl; // 小区在板块内的均价排行柱形图URL - private String cityRankImgUrl; // 小区在板块内的均价排行柱形图URL - private double[] regionRankImgPercent; // 小区在区域内的均价排行柱形图中各色块高度占比 - private double[] blockRankImgPercent; // 小区在板块内的均价排行柱形图中各色块高度占比 - private double[] cityRankImgPercent; // 小区在城市内的均价排行柱形图中各色块高度占比 + private List cityTradeStatTop5; // 鍩庡競鍐呮垚浜ゅ潎浠锋帓鍚嶅墠5鐨勫皬鍖� + private List regionTradeStatTop5; // 鍖哄煙鍐呮垚浜ゅ潎浠锋帓鍚嶅墠5鐨勫皬鍖� + private List blockTradeStatTop5; // 鏉垮潡鍐呮垚浜ゅ潎浠锋帓鍚嶅墠5鐨勫皬鍖� + private String regionRankImgUrl; // 灏忓尯鍦ㄥ尯鍩熷唴鐨勫潎浠锋帓琛屾煴褰㈠浘URL + private String blockRankImgUrl; // 灏忓尯鍦ㄦ澘鍧楀唴鐨勫潎浠锋帓琛屾煴褰㈠浘URL + private String cityRankImgUrl; // 灏忓尯鍦ㄦ澘鍧楀唴鐨勫潎浠锋帓琛屾煴褰㈠浘URL + private double[] regionRankImgPercent; // 灏忓尯鍦ㄥ尯鍩熷唴鐨勫潎浠锋帓琛屾煴褰㈠浘涓悇鑹插潡楂樺害鍗犳瘮 + private double[] blockRankImgPercent; // 灏忓尯鍦ㄦ澘鍧楀唴鐨勫潎浠锋帓琛屾煴褰㈠浘涓悇鑹插潡楂樺害鍗犳瘮 + private double[] cityRankImgPercent; // 灏忓尯鍦ㄥ煄甯傚唴鐨勫潎浠锋帓琛屾煴褰㈠浘涓悇鑹插潡楂樺害鍗犳瘮 - private List> districtAgencys; // 小区成交中介排名,同AgencyDistrictTradeRank.details - private String maxSellAddress; // 最大成交中介地址 + private List> districtAgencys; // 灏忓尯鎴愪氦涓粙鎺掑悕锛屽悓AgencyDistrictTradeRank.details + private String maxSellAddress; // 鏈�澶ф垚浜や腑浠嬪湴鍧� - private String districtPredictImgUrl; // 小区均价预测走势图URL - private String cityPredictImgUrl; // 城市均价预测走势图URL + private String districtPredictImgUrl; // 灏忓尯鍧囦环棰勬祴璧板娍鍥綰RL + private String cityPredictImgUrl; // 鍩庡競鍧囦环棰勬祴璧板娍鍥綰RL - private DistrictFacilitys facilitys; // 周边配套信息 - private Map distanceMap; // 小区到几个景点的距离(人民广场等) + private DistrictFacilitys facilitys; // 鍛ㄨ竟閰嶅淇℃伅 + private Map distanceMap; // 灏忓尯鍒板嚑涓櫙鐐圭殑璺濈锛堜汉姘戝箍鍦虹瓑锛� - private HouseLoudong houseInfo; // 房子楼栋信息 + private HouseLoudong houseInfo; // 鎴垮瓙妤兼爧淇℃伅 - private String[] lineColorRgbs; // 走势图中各线条颜色代表的意义 + private String[] lineColorRgbs; // 璧板娍鍥句腑鍚勭嚎鏉¢鑹蹭唬琛ㄧ殑鎰忎箟 private String[] pieColorRgbs; - private Long housePredictPrice; // 该房子的1年后价格预测 - private Integer housePredictMarkup; // 该房子的1年后价格涨跌幅 - private Integer blockPredictPrice; // 板块的1年后价格预测 - private Integer blockPredictMarkup; // 板块的1年后价格涨跌幅 - private Integer regionPredictPrice; // 区域的1年后价格预测 - private Integer regionPredictMarkup; // 区域的1年后价格涨跌幅 - private Integer cityPredictPrice; // 城市的1年后价格预测 - private Integer cityPredictMarkup; // 城市的1年后价格涨跌幅 + private Long housePredictPrice; // 璇ユ埧瀛愮殑1骞村悗浠锋牸棰勬祴 + private Integer housePredictMarkup; // 璇ユ埧瀛愮殑1骞村悗浠锋牸娑ㄨ穼骞� + private Integer blockPredictPrice; // 鏉垮潡鐨�1骞村悗浠锋牸棰勬祴 + private Integer blockPredictMarkup; // 鏉垮潡鐨�1骞村悗浠锋牸娑ㄨ穼骞� + private Integer regionPredictPrice; // 鍖哄煙鐨�1骞村悗浠锋牸棰勬祴 + private Integer regionPredictMarkup; // 鍖哄煙鐨�1骞村悗浠锋牸娑ㄨ穼骞� + private Integer cityPredictPrice; // 鍩庡競鐨�1骞村悗浠锋牸棰勬祴 + private Integer cityPredictMarkup; // 鍩庡競鐨�1骞村悗浠锋牸娑ㄨ穼骞� private String userName; private String showFeedBack; private String showId; @@ -155,55 +155,55 @@ public class DistrictReportModel extends BaseModel { private String blockOrg; private boolean isBrowerView; - private List hospitals; // 周边医院 - private List hospitalLevs; // 周边医院等级 - private List hospitalFeas; // 周边医院特色 + private List hospitals; // 鍛ㄨ竟鍖婚櫌 + private List hospitalLevs; // 鍛ㄨ竟鍖婚櫌绛夌骇 + private List hospitalFeas; // 鍛ㄨ竟鍖婚櫌鐗硅壊 - private String activity; // 点击日志 + private String activity; // 鐐瑰嚮鏃ュ織 private String cat; private int payedCount; - private List payMonthly1; // 30年的每月还贷额 - private List pressureRange1; // 30年的压力分段区间 - private List pressure11; // 30年的每月还贷压力1 - private List pressure12; // 30年的每月还贷压力2 - private List pressure13; // 30年的每月还贷压力3 - private List pressure14; // 30年的每月还贷压力4 - private List pressure15; // 30年的每月还贷压力5 - private List pressure16; // 30年的每月还贷压力6 - private List pressure17; // 30年的每月还贷压力7 - private List pressure18; // 30年的每月还贷压力8 + private List payMonthly1; // 30骞寸殑姣忔湀杩樿捶棰� + private List pressureRange1; // 30骞寸殑鍘嬪姏鍒嗘鍖洪棿 + private List pressure11; // 30骞寸殑姣忔湀杩樿捶鍘嬪姏1 + private List pressure12; // 30骞寸殑姣忔湀杩樿捶鍘嬪姏2 + private List pressure13; // 30骞寸殑姣忔湀杩樿捶鍘嬪姏3 + private List pressure14; // 30骞寸殑姣忔湀杩樿捶鍘嬪姏4 + private List pressure15; // 30骞寸殑姣忔湀杩樿捶鍘嬪姏5 + private List pressure16; // 30骞寸殑姣忔湀杩樿捶鍘嬪姏6 + private List pressure17; // 30骞寸殑姣忔湀杩樿捶鍘嬪姏7 + private List pressure18; // 30骞寸殑姣忔湀杩樿捶鍘嬪姏8 private DistrictTradeCount districtTradeCount; - private Developer developer; // 开发商信息 - private ManagementCompany managementCompany; // 物业公司信息 - private List masterBos; // 中介详情 + private Developer developer; // 寮�鍙戝晢淇℃伅 + private ManagementCompany managementCompany; // 鐗╀笟鍏徃淇℃伅 + private List masterBos; // 涓粙璇︽儏 private boolean showPdfLink; - private DistrictHot districtHot; // 小区挂牌量、成交量、租房占比等信息 - private String rentRoomPropImgUrl; // 小区租房房型占比饼图URL - private String rentAreaPropImgUrl; // 小区租房面积占比饼图URL - private List rentAreaPropImgMark; // 小区租房面积占比饼图中的颜色意义 + private DistrictHot districtHot; // 灏忓尯鎸傜墝閲忋�佹垚浜ら噺銆佺鎴垮崰姣旂瓑淇℃伅 + private String rentRoomPropImgUrl; // 灏忓尯绉熸埧鎴垮瀷鍗犳瘮楗煎浘URL + private String rentAreaPropImgUrl; // 灏忓尯绉熸埧闈㈢Н鍗犳瘮楗煎浘URL + private List rentAreaPropImgMark; // 灏忓尯绉熸埧闈㈢Н鍗犳瘮楗煎浘涓殑棰滆壊鎰忎箟 private CityHot cityHot; - private String citySellCountImgUrl; // 城市挂牌量走势图URL - private String cityTradeCountImgUrl; // 城市成交量走势图URL - private String cityMaxSellCount; // 每月最大挂牌量(所查月数内) - private String cityMinSellCount; // 每月最小挂牌量(所查月数内) - private String cityMaxTradeCount; // 每月最大成交量(所查月数内) - private String cityMinTradeCount; // 每月最小成交量(所查月数内) + private String citySellCountImgUrl; // 鍩庡競鎸傜墝閲忚蛋鍔垮浘URL + private String cityTradeCountImgUrl; // 鍩庡競鎴愪氦閲忚蛋鍔垮浘URL + private String cityMaxSellCount; // 姣忔湀鏈�澶ф寕鐗岄噺锛堟墍鏌ユ湀鏁板唴锛� + private String cityMinSellCount; // 姣忔湀鏈�灏忔寕鐗岄噺锛堟墍鏌ユ湀鏁板唴锛� + private String cityMaxTradeCount; // 姣忔湀鏈�澶ф垚浜ら噺锛堟墍鏌ユ湀鏁板唴锛� + private String cityMinTradeCount; // 姣忔湀鏈�灏忔垚浜ら噺锛堟墍鏌ユ湀鏁板唴锛� - private int regionDistrictCount; // 区域内小区数 - private int blockDistrictCount; // 板块内小区数 - private int cityDistrictCount; // 城市内小区数 - private DistrictAnalyData districtAnalyData;//城市区域排名 - private DistrictAttentionRank districtAttention; // 小区关注度 - private List regionDistrictAttentionTop; // 区域内小区关注度前10 + private int regionDistrictCount; // 鍖哄煙鍐呭皬鍖烘暟 + private int blockDistrictCount; // 鏉垮潡鍐呭皬鍖烘暟 + private int cityDistrictCount; // 鍩庡競鍐呭皬鍖烘暟 + private DistrictAnalyData districtAnalyData;//鍩庡競鍖哄煙鎺掑悕 + private DistrictAttentionRank districtAttention; // 灏忓尯鍏虫敞搴� + private List regionDistrictAttentionTop; // 鍖哄煙鍐呭皬鍖哄叧娉ㄥ害鍓�10 - private HouseSummary houseSummary; // 专业分析. + private HouseSummary houseSummary; // 涓撲笟鍒嗘瀽. private DistrictAgent districtAgent; private Boolean filterHouse; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/ElevateWordModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/ElevateWordModel.java index b36295b30..151d91e98 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/ElevateWordModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/ElevateWordModel.java @@ -41,14 +41,14 @@ public class ElevateWordModel extends BaseModel { private String currentHouseCityName; private List elevateWordList; private List elevateWordBoList; - private String placement;// 竞品词显示位置 - private String elevateWordShowCity;// 竞品词显示城市 + private String placement;// 绔炲搧璇嶆樉绀轰綅缃� + private String elevateWordShowCity;// 绔炲搧璇嶆樉绀哄煄甯� private Map> sectionMap; private String houseType; private List serverAreas; private List friendLinkList; - private List newCitys;// 最新上线的城市 + private List newCitys;// 鏈�鏂颁笂绾跨殑鍩庡競 private ServerArea ipCity; private String ipCityUrl; private String showHouseType; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/EvaluationChannelModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/EvaluationChannelModel.java index 52664cbdc..74aa94a39 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/EvaluationChannelModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/EvaluationChannelModel.java @@ -30,23 +30,23 @@ public class EvaluationChannelModel extends BaseModel { private Integer topWeekUpDownRange; - // 贷款类型 + // 璐锋绫诲瀷 private String type; - // 贷款金额(万元) + // 璐锋閲戦(涓囧厓) private String loanNum; private String token; private Integer applyType; - //渠道名称 + //娓犻亾鍚嶇О private String leads_source; - //来源 + //鏉ユ簮 private String source; - // 区分投放来源 + // 鍖哄垎鎶曟斁鏉ユ簮 private String stype; public String getStype() { diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/EvaluationJsonModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/EvaluationJsonModel.java index 51d7e35bc..c4b29a426 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/EvaluationJsonModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/EvaluationJsonModel.java @@ -12,52 +12,52 @@ public class EvaluationJsonModel extends ModelAndViewSupport { super(); this.setViewType("json"); } - // 上个月评估次数 + // 涓婁釜鏈堣瘎浼版鏁� private long topMonthEvalCount; - //小区均价走势数据 + //灏忓尯鍧囦环璧板娍鏁版嵁 private Map districtMap; - //区域均价走势数据 + //鍖哄煙鍧囦环璧板娍鏁版嵁 private Map regionMap; - //城市均价走势数据 + //鍩庡競鍧囦环璧板娍鏁版嵁 private Map cityMap; - //走势数据时间轴 + //璧板娍鏁版嵁鏃堕棿杞� private List timeList; - //走势图标题 + //璧板娍鍥炬爣棰� private String title; private Integer totalPrice; private Integer avgPrice; - //贷款来源 + //璐锋鏉ユ簮 private String source; /** - * 当前估价时间的周均价 + * 褰撳墠浼颁环鏃堕棿鐨勫懆鍧囦环 */ private Integer weekAvgPrice; /** - * 于上周相比的涨跌幅(%) + * 浜庝笂鍛ㄧ浉姣旂殑娑ㄨ穼骞咃紙%锛� */ private double topWeekUpDownRange; /** - * 上个月的月份 + * 涓婁釜鏈堢殑鏈堜唤 */ private Integer topMonth; /** - * 上月参考均价 + * 涓婃湀鍙傝�冨潎浠� */ private Integer topMonthAvgPrice; /** - * 近1年涨跌幅(%) + * 杩�1骞存定璺屽箙锛�%锛� */ private Double oneYearUpDownRange; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/EvaluationModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/EvaluationModel.java index 7fea28492..7178f6392 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/EvaluationModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/EvaluationModel.java @@ -38,9 +38,9 @@ public class EvaluationModel extends BaseModel { private Map hintMap; private Evaluation evaluation; List districtList; - private List evaluationBoList = Collections.emptyList();// 房源估价列表 - private Menu menu;// 估价列表菜单 - private List regions; // 待估价小区可能有同名小区 + private List evaluationBoList = Collections.emptyList();// 鎴挎簮浼颁环鍒楄〃 + private Menu menu;// 浼颁环鍒楄〃鑿滃崟 + private List regions; // 寰呬及浠峰皬鍖哄彲鑳芥湁鍚屽悕灏忓尯 private String buildType; private String region; @@ -50,10 +50,10 @@ public class EvaluationModel extends BaseModel { private String houseId; private List conditions; private List conditionItems; - private String encodeId; // 加密后的估价报告id,用于新的报告 + private String encodeId; // 鍔犲瘑鍚庣殑浼颁环鎶ュ憡id锛岀敤浜庢柊鐨勬姤鍛� private DistrictStatBo districtStatBo; - private String lat;// 经纬度字段 + private String lat;// 缁忕含搴﹀瓧娈� private String lng; private Double latD; private Double lngD; @@ -62,101 +62,101 @@ public class EvaluationModel extends BaseModel { private List houseBoList; private List districtStatRentBoList; private String from; - //新版房价网判断是跳转评估页面还是价格趋势页面 + //鏂扮増鎴夸环缃戝垽鏂槸璺宠浆璇勪及椤甸潰杩樻槸浠锋牸瓒嬪娍椤甸潰 private String evaluationType; - private boolean isReEvaluation;// true:按照以前的参数,重新估价 + private boolean isReEvaluation;// true:鎸夌収浠ュ墠鐨勫弬鏁帮紝閲嶆柊浼颁环 - private FacetQueryResult latelyNews;// 最新资讯(6条) + private FacetQueryResult latelyNews;// 鏈�鏂拌祫璁紙6鏉★級 /** - * 估价小区 + * 浼颁环灏忓尯 */ private District district; private District newDistrict; private List sameNameDistricts; /** - * 小区是否存在房源 + * 灏忓尯鏄惁瀛樺湪鎴挎簮 */ private boolean districtExistHouse; /** - * 小区房型价格 + * 灏忓尯鎴垮瀷浠锋牸 */ private List> districtRoomAvgPrice; /** - * 区域 板块 均价 涨跌 + * 鍖哄煙 鏉垮潡 鍧囦环 娑ㄨ穼 */ private RegionStat regionStat; /** - * 是否可以估价 + * 鏄惁鍙互浼颁环 */ private boolean permissionEvaluation; /** - * 是否存在走势图数据 + * 鏄惁瀛樺湪璧板娍鍥炬暟鎹� */ private boolean existOfcData; /** - * 是否存在估价结果 + * 鏄惁瀛樺湪浼颁环缁撴灉 */ private boolean existEvaluationData; /** - * 小区名 + * 灏忓尯鍚� */ private String districtName; private String districtName2; /** - * 室 + * 瀹� */ private Integer room; /** - * 面积 + * 闈㈢Н */ private Double houseArea; /** - * 所在楼层 + * 鎵�鍦ㄦゼ灞� */ private Integer floor; - //单元 + //鍗曞厓 private String unitNum; /** - * 总楼层 + * 鎬绘ゼ灞� */ private Integer height; /** - * 符合keyword的其他小区 + * 绗﹀悎keyword鐨勫叾浠栧皬鍖� */ private List> otherDistricts; /** - * 关键词 + * 鍏抽敭璇� */ private String keyword; /** - * 获取近期估价记录条数 + * 鑾峰彇杩戞湡浼颁环璁板綍鏉℃暟 */ private int count; /** - * 近期的估价记录 + * 杩戞湡鐨勪及浠疯褰� */ private List ebs; /** - * 推荐房源 + * 鎺ㄨ崘鎴挎簮 */ private List houseBos; private String roomShow; private String houseAreaRange; - private String searchAlia; // 搜索的小区别名 + private String searchAlia; // 鎼滅储鐨勫皬鍖哄埆鍚� private String citySpell; @@ -164,7 +164,7 @@ public class EvaluationModel extends BaseModel { private int fjtRandom; - // 估价三部曲日志 + // 浼颁环涓夐儴鏇叉棩蹇� private String activity; private boolean fromIndex; @@ -175,98 +175,98 @@ public class EvaluationModel extends BaseModel { private String loginFlag = "T"; private String backUrl; - private String stopEvaluation = "F";//是否停止评估 - private String eliminatedFlag = "F";//消除标志 + private String stopEvaluation = "F";//鏄惁鍋滄璇勪及 + private String eliminatedFlag = "F";//娑堥櫎鏍囧織 - //新版房价网页面展示字段 - //评估时间 2017/08/01 12:04 + //鏂扮増鎴夸环缃戦〉闈㈠睍绀哄瓧娈� + //璇勪及鏃堕棿 2017/08/01 12:04 private String evalTime; - //房产总值 单位万 + //鎴夸骇鎬诲�� 鍗曚綅涓� private String totalPriceStr; - //位置描述 + //浣嶇疆鎻忚堪 private String addressDesc; - //小区年涨幅 + //灏忓尯骞存定骞� private Double oneYearUpDownRange; - //上月参考均价 + //涓婃湀鍙傝�冨潎浠� private Integer topMonthAvgPrice; - //当前估价时间的周均价 + //褰撳墠浼颁环鏃堕棿鐨勫懆鍧囦环 private Integer weekAvgPrice; - //于上周相比的涨跌幅(%) + //浜庝笂鍛ㄧ浉姣旂殑娑ㄨ穼骞咃紙%锛� private int topWeekUpDownRange; - //上个月月份 + //涓婁釜鏈堟湀浠� private Integer topMonth; - //涨跌幅在城市排名(%) + //娑ㄨ穼骞呭湪鍩庡競鎺掑悕锛�%锛� private Double upDownRangecityLevel; - //小区均价走势数据 + //灏忓尯鍧囦环璧板娍鏁版嵁 private Map districtMap; - //区域均价走势数据 + //鍖哄煙鍧囦环璧板娍鏁版嵁 private Map regionMap; - //城市均价走势数据 + //鍩庡競鍧囦环璧板娍鏁版嵁 private Map cityMap; - //走势数据时间轴 + //璧板娍鏁版嵁鏃堕棿杞� private List timeList; - //走势类型 + //璧板娍绫诲瀷 private int type; - //走势图标题 + //璧板娍鍥炬爣棰� private String title; - //当前年 + //褰撳墠骞� private String nowYear; - //当前年月日 + //褰撳墠骞存湀鏃� private String nowYearMoth; - //本周涨跌幅 + //鏈懆娑ㄨ穼骞� private int weekendMarkup; - //产品列表 + //浜у搧鍒楄〃 private List productList; - //我要评估 + //鎴戣璇勪及 private String suggest; - //贷款id + //璐锋id private String productId; - //申请贷款页面来源 + //鐢宠璐锋椤甸潰鏉ユ簮 private String source; - //信用贷 + //淇$敤璐� private LoanProduct creditLoanProduct; - //房抵贷 + //鎴挎姷璐� private LoanProduct houseLoanProduct; - //信用贷 + //淇$敤璐� private List creditLoanProductTags; - //房抵贷 + //鎴挎姷璐� private List houseLoanProductTags; - //是否显示二维码 + //鏄惁鏄剧ず浜岀淮鐮� private boolean isShowCode; - //时间戳 + //鏃堕棿鎴� private long timestramp; - //验证秘钥 + //楠岃瘉绉橀挜 private String token; - //验证秘钥 + //楠岃瘉绉橀挜 private Integer avgPrice; private boolean isShowRegion; @@ -281,25 +281,25 @@ public class EvaluationModel extends BaseModel { this.minMonthInterestRate = minMonthInterestRate; } - //贷款最小利率 + //璐锋鏈�灏忓埄鐜� private double minMonthInterestRate; - //PC端右侧广告 + //PC绔彸渚у箍鍛� private List rightAdvertisementList; - //PC端轮播广告 + //PC绔疆鎾箍鍛� private List carouselAdvertisementList; - //mobile端轮播广告 + //mobile绔疆鎾箍鍛� private List mobileAdvertisementList; - //渠道名称 + //娓犻亾鍚嶇О private String leads_source; - //版权配置信息编号 + //鐗堟潈閰嶇疆淇℃伅缂栧彿 private String s; - //版权信息对象 + //鐗堟潈淇℃伅瀵硅薄 private CopyrightConfig copyrightConfig; public void setCopyrightConfig(CopyrightConfig copyrightConfig) { diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/EvaluationPriceModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/EvaluationPriceModel.java index e8970251d..a9dda5fd0 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/EvaluationPriceModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/EvaluationPriceModel.java @@ -12,10 +12,10 @@ public class EvaluationPriceModel extends BaseModel { private static final long serialVersionUID = 1L; private String id; private String cityDisplay; - //别墅 - private String estateType;//物业类型 - private List evaluationFactors; //影响因子集合 - private List evaluationConditions;//影响因数 + //鍒 + private String estateType;//鐗╀笟绫诲瀷 + private List evaluationFactors; //褰卞搷鍥犲瓙闆嗗悎 + private List evaluationConditions;//褰卞搷鍥犳暟 private List conditionAndFactorModels; private EvaluationPrice evaluationPrice; private String conditionStr; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/EvaluationPurposeAnalysisModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/EvaluationPurposeAnalysisModel.java index 726e15a38..de292d43c 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/EvaluationPurposeAnalysisModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/EvaluationPurposeAnalysisModel.java @@ -3,27 +3,27 @@ package com.fangjia.coresite.model; public class EvaluationPurposeAnalysisModel extends BaseModel { /** - * 查看报告类型 参考:ReportTypeEnum + * 鏌ョ湅鎶ュ憡绫诲瀷 鍙傝�冿細ReportTypeEnum */ private int reportType; /** - * 首次查看时间 + * 棣栨鏌ョ湅鏃堕棿 */ private String firstQueryDate; /** - * 最后查看时间 + * 鏈�鍚庢煡鐪嬫椂闂� */ private String lastQueryDate; /** - * 查看报告停留时间(秒) + * 鏌ョ湅鎶ュ憡鍋滅暀鏃堕棿(绉�) */ private int visitTime; /** - * 评估ID + * 璇勪及ID */ private String evalId; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/EvaluationResultModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/EvaluationResultModel.java index 604ebda3d..2761e8f95 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/EvaluationResultModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/EvaluationResultModel.java @@ -31,114 +31,114 @@ public class EvaluationResultModel extends BaseModel { private static final long serialVersionUID = 1L; - //时间戳 + //鏃堕棿鎴� private long timestramp; - //验证秘钥 + //楠岃瘉绉橀挜 private String token; /** - * 是否可以估价 + * 鏄惁鍙互浼颁环 */ private boolean permissionEvaluation; private String errMsg; private Evaluation evaluation; /** - * 小区名 + * 灏忓尯鍚� */ private String districtName; private String districtName2; private String houseNum; private String roomNum; - private Double area; // 建筑面积 + private Double area; // 寤虹瓚闈㈢Н /** - * 城市 + * 鍩庡競 */ private String city; /** - * 所在楼层 + * 鎵�鍦ㄦゼ灞� */ private Integer floor; - //单元 + //鍗曞厓 private String unitNum; private String region; /** - * 总楼层 + * 鎬绘ゼ灞� */ private Integer height; - private String lat;// 经纬度字段 + private String lat;// 缁忕含搴﹀瓧娈� private String lng; private Double latD; private Double lngD; - //新版房价网页面展示字段 - //评估时间 2017/08/01 12:04 + //鏂扮増鎴夸环缃戦〉闈㈠睍绀哄瓧娈� + //璇勪及鏃堕棿 2017/08/01 12:04 private String evalTime; - //房产总值 单位万 + //鎴夸骇鎬诲�� 鍗曚綅涓� private String totalPriceStr; - //位置描述 + //浣嶇疆鎻忚堪 private String addressDesc; - //小区年涨幅 + //灏忓尯骞存定骞� private Double oneYearUpDownRange; - //上月参考均价 + //涓婃湀鍙傝�冨潎浠� private Integer topMonthAvgPrice; - //当前估价时间的周均价 + //褰撳墠浼颁环鏃堕棿鐨勫懆鍧囦环 private Integer weekAvgPrice; - //于上周相比的涨跌幅(%) + //浜庝笂鍛ㄧ浉姣旂殑娑ㄨ穼骞咃紙%锛� private int topWeekUpDownRange; - //上个月月份 + //涓婁釜鏈堟湀浠� private Integer topMonth; - //涨跌幅在城市排名(%) + //娑ㄨ穼骞呭湪鍩庡競鎺掑悕锛�%锛� private Double upDownRangecityLevel; - //小区均价走势数据 + //灏忓尯鍧囦环璧板娍鏁版嵁 private Map districtMap; - //区域均价走势数据 + //鍖哄煙鍧囦环璧板娍鏁版嵁 private Map regionMap; - //城市均价走势数据 + //鍩庡競鍧囦环璧板娍鏁版嵁 private Map cityMap; - //走势数据时间轴 + //璧板娍鏁版嵁鏃堕棿杞� private List timeList; - //走势类型 + //璧板娍绫诲瀷 private int type; - //走势图标题 + //璧板娍鍥炬爣棰� private String title; - //产品列表 + //浜у搧鍒楄〃 private List productList; - //贷款最小利率 + //璐锋鏈�灏忓埄鐜� private double minMonthInterestRate; - //是否显示二维码 + //鏄惁鏄剧ず浜岀淮鐮� private boolean isShowCode; - //PC端右侧广告 + //PC绔彸渚у箍鍛� private List rightAdvertisementList; - //PC端轮播广告 + //PC绔疆鎾箍鍛� private List carouselAdvertisementList; - //mobile端轮播广告 + //mobile绔疆鎾箍鍛� private List mobileAdvertisementList; public long getTimestramp() { diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/FangjiaModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/FangjiaModel.java index c6e1a18b8..2dbe1fdc8 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/FangjiaModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/FangjiaModel.java @@ -33,16 +33,16 @@ public class FangjiaModel extends BaseModel { private List sellCustomquerys; private List rentCustomquerys; - private List similarHouses; // 相似二手房 - private List similarRentHouses; // 相似租房 - private List newCitys;// 最新上线的城市 - private List latelyNews;// 最新资讯(6条) - private List latelyHouse;// 最新资讯(6条) - private List latelyRentHouse;// 最新资讯(6条) + private List similarHouses; // 鐩镐技浜屾墜鎴� + private List similarRentHouses; // 鐩镐技绉熸埧 + private List newCitys;// 鏈�鏂颁笂绾跨殑鍩庡競 + private List latelyNews;// 鏈�鏂拌祫璁紙6鏉★級 + private List latelyHouse;// 鏈�鏂拌祫璁紙6鏉★級 + private List latelyRentHouse;// 鏈�鏂拌祫璁紙6鏉★級 private List> allMetro; private Map> indexSchools; private Map> serverAreaMap; - private boolean refererLocal;// 是否本地referer + private boolean refererLocal;// 鏄惁鏈湴referer private Group group; private RegionStatBo regionStatBo; private int role; @@ -53,13 +53,13 @@ public class FangjiaModel extends BaseModel { private String methodName; - // flash地图使用参数 + // flash鍦板浘浣跨敤鍙傛暟 /** - * 价格分布情况 + * 浠锋牸鍒嗗竷鎯呭喌 */ - // 全国的城市 + // 鍏ㄥ浗鐨勫煄甯� private List avgPriceCity; - // 城市的区域 + // 鍩庡競鐨勫尯鍩� private List avgPriceDis; private List regionInfoList; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/FriendLinkModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/FriendLinkModel.java index 428e3d11b..1701a16d6 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/FriendLinkModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/FriendLinkModel.java @@ -10,21 +10,21 @@ public class FriendLinkModel extends BaseModel { private static final long serialVersionUID = -253171361289092569L; /** - * 文字连接 + * 鏂囧瓧杩炴帴 */ private List characterLinks; /** - * 图片链接 + * 鍥剧墖閾炬帴 */ private List picLinks; /** - * 标识友情链接类型 + * 鏍囪瘑鍙嬫儏閾炬帴绫诲瀷 */ private int type; - private List newCitys;// 最新上线的城市 + private List newCitys;// 鏈�鏂颁笂绾跨殑鍩庡競 private ServerArea ipCity; private String ipCityUrl; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/Gakey.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/Gakey.java index 5a6e13d3f..48a7fb507 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/Gakey.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/Gakey.java @@ -2,23 +2,23 @@ package com.fangjia.coresite.model; public enum Gakey { /** - * 结果集数量 + * 缁撴灉闆嗘暟閲� */ rc, /** - * 页码 + * 椤电爜 */ pn, /** - * 页码大小 + * 椤电爜澶у皬 */ ps, /** - * 估价提交 + * 浼颁环鎻愪氦 */ isGujia, /** - * 估价关键词 + * 浼颁环鍏抽敭璇� */ keywords diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/HelpModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/HelpModel.java index ebd7f7785..e66250be4 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/HelpModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/HelpModel.java @@ -8,7 +8,7 @@ import com.fangjia.dal.mongo.fangjia.model.ServerArea; public class HelpModel extends BaseModel { private static final long serialVersionUID = 1871809721874896979L; - private List newCitys;// 最新上线的城市 + private List newCitys;// 鏈�鏂颁笂绾跨殑鍩庡競 private ServerArea ipCity; private String ipCityUrl; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/HouseModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/HouseModel.java index 3d3c06782..7c6087eac 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/HouseModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/HouseModel.java @@ -46,40 +46,40 @@ public class HouseModel extends BaseModel { private Integer ifCpc; private String houseKind; /** - * 是否是cpc测试用户 + * 鏄惁鏄痗pc娴嬭瘯鐢ㄦ埛 */ private Integer ifTestCpc; /** - * 是否是学区房 + * 鏄惁鏄鍖烘埧 */ private Integer ifSchool; /** - * 是否是地铁房 + * 鏄惁鏄湴閾佹埧 */ private Integer ifMetro; private List autoList; private Menu menu; - private UserFeeling userFeeling;// 用户顶踩信息 - private List autoRegionRecommends;// 自动热点推荐区域 + private UserFeeling userFeeling;// 鐢ㄦ埛椤惰俯淇℃伅 + private List autoRegionRecommends;// 鑷姩鐑偣鎺ㄨ崘鍖哄煙 private District district; private List conditions; private List conditionItems; - private boolean overdate;// 房源是否过期判断用 - private int overDays = -1;// publish_date距离当前时间的天数 + private boolean overdate;// 鎴挎簮鏄惁杩囨湡鍒ゆ柇鐢� + private int overDays = -1;// publish_date璺濈褰撳墠鏃堕棿鐨勫ぉ鏁� private List houseList; private String category; - // private List facetResults;facet多字段实现页面model自定义去接 + // private List facetResults;facet澶氬瓧娈靛疄鐜伴〉闈odel鑷畾涔夊幓鎺� private List hotDistrict; private List hotRegion; - // private String totalPrice; // 详情页右侧相似房源条件 private String area; - // private String area;类型错误,改用下面 + // private String totalPrice; // 璇︽儏椤靛彸渚х浉浼兼埧婧愭潯浠� private String area; + // private String area;绫诲瀷閿欒锛屾敼鐢ㄤ笅闈� private Integer totalPrice; private Integer avgPrice; private Double area; - private String lat;// 经纬度字段 + private String lat;// 缁忕含搴﹀瓧娈� private String lng; private Long latMax; private Long latMin; @@ -87,8 +87,8 @@ public class HouseModel extends BaseModel { private Long lngMin; private String address; - private String kind;// 小区类型 - private DistrictStat districtStat; // 小区均价 + private String kind;// 灏忓尯绫诲瀷 + private DistrictStat districtStat; // 灏忓尯鍧囦环 private DistrictStat villaDistrictStat; private long sellCount; private long rentCount; @@ -105,9 +105,9 @@ public class HouseModel extends BaseModel { private String cpc; private CpcBo cpcBo; - private String houseTag; // 房源标签 - private Integer menuType;// 菜单类型 1:区域;2:地铁 - private String recommendCityType;// 推荐房源类别 + private String houseTag; // 鎴挎簮鏍囩 + private Integer menuType;// 鑿滃崟绫诲瀷 1锛氬尯鍩燂紱2锛氬湴閾� + private String recommendCityType;// 鎺ㄨ崘鎴挎簮绫诲埆 private SchoolBo schoolBo; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/HouseReportModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/HouseReportModel.java index 9a7b261a8..44eb41753 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/HouseReportModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/HouseReportModel.java @@ -18,50 +18,50 @@ public class HouseReportModel extends BaseModel { private String region; private String districtName; - double totalScore;//综合评分 - double detailScore;//楼盘指数 - double priceScore;//价格指数 - double consumScore;//消费指数 - double aroundScore;//周边指数 - double predictScore;//潜力指数 - double rankScore;//稀缺指数 + double totalScore;//缁煎悎璇勫垎 + double detailScore;//妤肩洏鎸囨暟 + double priceScore;//浠锋牸鎸囨暟 + double consumScore;//娑堣垂鎸囨暟 + double aroundScore;//鍛ㄨ竟鎸囨暟 + double predictScore;//娼滃姏鎸囨暟 + double rankScore;//绋�缂烘寚鏁� List remarks; - private ReportDistrictInfoBean rdb;//小区基本信息模块相关 - Evaluation evaluation;//评估记录 + private ReportDistrictInfoBean rdb;//灏忓尯鍩烘湰淇℃伅妯″潡鐩稿叧 + Evaluation evaluation;//璇勪及璁板綍 DistrictAnalyData da; LevelInfoBo quoteBo; LevelInfoBo agencyBo; String buildYear; /** - * 估价信息id + * 浼颁环淇℃伅id */ private String eid; /** - * 报告第一行的标题(买房报告,卖房报告等等) + * 鎶ュ憡绗竴琛岀殑鏍囬锛堜拱鎴挎姤鍛婏紝鍗栨埧鎶ュ憡绛夌瓑锛� */ private String reportTitle; - private Integer rentPrice;//租金 - private int type;//季度,半年,一年,二年 - private String category;//类型 - private List houses;//房源列表 + private Integer rentPrice;//绉熼噾 + private int type;//瀛e害锛屽崐骞达紝涓�骞达紝浜屽勾 + private String category;//绫诲瀷 + private List houses;//鎴挎簮鍒楄〃 private Integer room; private List dealPrices; private Double yoyIncrease; - //信用贷 + //淇$敤璐� private LoanProduct creditLoanProduct; - //房抵贷 + //鎴挎姷璐� private LoanProduct houseLoanProduct; - //信用贷 + //淇$敤璐� private List creditLoanProductTags; - //房抵贷 + //鎴挎姷璐� private List houseLoanProductTags; - //demo数据(字符串) + //demo鏁版嵁(瀛楃涓�) private String demos; private Double area; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/ImageManagerModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/ImageManagerModel.java index 03f72eeff..fa956c479 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/ImageManagerModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/ImageManagerModel.java @@ -9,17 +9,17 @@ public class ImageManagerModel extends ModelAndViewSupport { private String id; /** - * 图片类型 + * 鍥剧墖绫诲瀷 */ private String type; /** - * 图片url + * 鍥剧墖url */ private String url; /** - * 名称 + * 鍚嶇О */ private String name; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/InformationModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/InformationModel.java index 606324aca..f71fd0273 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/InformationModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/InformationModel.java @@ -26,7 +26,7 @@ public class InformationModel extends BaseModel { private Integer offset; private List keywordsBaiduList; - // 估价模块 + // 浼颁环妯″潡 private ServerArea ipCity; private String name; private String region; @@ -36,13 +36,13 @@ public class InformationModel extends BaseModel { private long sellCount; private long rentCount; private String chartType; - private RegionStat regionStat; // 小区所在区域均价 + private RegionStat regionStat; // 灏忓尯鎵�鍦ㄥ尯鍩熷潎浠� private List houseBoList; private List rentHouseBoList; private List districtBoList; private List newList; private Menu menu; - private String category;// 类别 + private String category;// 绫诲埆 private List cityList; private HouseBo houseBo; private RentHouseBo rentHouseBo; @@ -50,7 +50,7 @@ public class InformationModel extends BaseModel { private NewsBo newsBo; private Group areaGroup; - private List newCitys;// 最新上线的城市 + private List newCitys;// 鏈�鏂颁笂绾跨殑鍩庡競 private String ipCityUrl; private long wordId; @@ -63,7 +63,7 @@ public class InformationModel extends BaseModel { this.cityList = cityList; } - private Map cityMap;// 城市列表 + private Map cityMap;// 鍩庡競鍒楄〃 public Map getCityMap() { return cityMap; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/InputUserInfoModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/InputUserInfoModel.java index c646ea611..1e937bab3 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/InputUserInfoModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/InputUserInfoModel.java @@ -2,19 +2,19 @@ package com.fangjia.coresite.model; public class InputUserInfoModel { private String id; - //姓名 + //濮撳悕 private String name; - //公司 + //鍏徃 private String company; - //职位 + //鑱屼綅 private String job; - //城市 + //鍩庡競 private String city; - //手机 + //鎵嬫満 private String mobile; - //邮箱 + //閭 private String email; - //评论 + //璇勮 private String comment; public String getId() { return id; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/LoanBurialPointModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/LoanBurialPointModel.java index a2a006c08..db6eefd47 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/LoanBurialPointModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/LoanBurialPointModel.java @@ -1,8 +1,8 @@ package com.fangjia.coresite.model; /** - * 新版房价网广点通快速贷款-埋点需求 - * 规则:触发输入框或者点击按钮,每日做一次数量统计 + * 鏂扮増鎴夸环缃戝箍鐐归�氬揩閫熻捶娆�-鍩嬬偣闇�姹� + * 瑙勫垯锛氳Е鍙戣緭鍏ユ鎴栬�呯偣鍑绘寜閽紝姣忔棩鍋氫竴娆℃暟閲忕粺璁� * @author JENIS * */ @@ -11,22 +11,22 @@ public class LoanBurialPointModel extends BaseModel { private static final long serialVersionUID = 4307772368666636840L; /** - * 埋点源类型(埋点事件类型) + * 鍩嬬偣婧愮被鍨�(鍩嬬偣浜嬩欢绫诲瀷) */ private String burialPointType; /** - * 贷款类型 + * 璐锋绫诲瀷 */ private String loanType; /** - * 渠道名称 + * 娓犻亾鍚嶇О */ private String leadsSource; /** - * 贷款页面来源 + * 璐锋椤甸潰鏉ユ簮 */ private String source; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/LoanLeadsModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/LoanLeadsModel.java index e0157b63f..ded3b9d3f 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/LoanLeadsModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/LoanLeadsModel.java @@ -5,102 +5,102 @@ public class LoanLeadsModel extends BaseModel { private static final long serialVersionUID = 1L; /** - * 小区所在城市 + * 灏忓尯鎵�鍦ㄥ煄甯� */ private String disCity; /** - * 贷款人姓名 + * 璐锋浜哄鍚� */ private String loanName; /** - * 贷款人性别 + * 璐锋浜烘�у埆 */ private String sex; /** - * 手机 + * 鎵嬫満 */ private String mobile; /** - * 图形验证码 + * 鍥惧舰楠岃瘉鐮� */ private String imgCode; /** - * 图形验证码对应的token + * 鍥惧舰楠岃瘉鐮佸搴旂殑token */ private String codeToken; /** - * 短信验证码 + * 鐭俊楠岃瘉鐮� */ private String smsCode; /** - * 估值房屋地址 + * 浼板�兼埧灞嬪湴鍧� */ private String address; /** - * 小区名称 + * 灏忓尯鍚嶇О */ private String name; /** - * 房屋估值价格 + * 鎴垮眿浼板�间环鏍� */ private long totalPrice; /** - * 房屋面积 + * 鎴垮眿闈㈢Н */ private double area; /** - * 室号 + * 瀹ゅ彿 */ private String houseNum; /** - * 楼层 + * 妤煎眰 */ private Integer floor; /** - * 房屋单价 + * 鎴垮眿鍗曚环 */ private int avgPrice; /** - * 申请贷款类型 + * 鐢宠璐锋绫诲瀷 */ private String loanType; /** - * 申请贷款类型id + * 鐢宠璐锋绫诲瀷id */ private String loanProductId; /** - * 贷款申请页来源 + * 璐锋鐢宠椤垫潵婧� */ private String source; /** - * 上一页面url + * 涓婁竴椤甸潰url */ private String backUrl; /** - * 贷款金额 + * 璐锋閲戦 */ private double amount; /** - * 渠道名称 + * 娓犻亾鍚嶇О */ private String channelName; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/MapModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/MapModel.java index f37357847..5cc2bf00b 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/MapModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/MapModel.java @@ -22,19 +22,19 @@ public class MapModel extends BaseModel { private List districtBoList; /** - * 西南 southWestX + * 瑗垮崡 southWestX */ private String swx; /** - * 东北 northEastX + * 涓滃寳 northEastX */ private String nex; /** - * 西南 southWestY + * 瑗垮崡 southWestY */ private String swy; /** - * 东北 northEastY + * 涓滃寳 northEastY */ private String ney; @@ -43,25 +43,25 @@ public class MapModel extends BaseModel { private Long latMin; private Long latMax; private String category; - private String hash;// 地图页面的hash参数控制 + private String hash;// 鍦板浘椤甸潰鐨刪ash鍙傛暟鎺у埗 private String averagePriceRange; /** - * 小区名 + * 灏忓尯鍚� */ private String name; /** - * 小区所在区域 + * 灏忓尯鎵�鍦ㄥ尯鍩� */ private String region; /** - * 小区所在板块 + * 灏忓尯鎵�鍦ㄦ澘鍧� */ private String block; /** - * 关键字 + * 鍏抽敭瀛� */ private String keyword; private Long lat; @@ -76,15 +76,15 @@ public class MapModel extends BaseModel { private List openDateList; private List newdistrictDynamicList; - private String metro;// 地铁和站名 + private String metro;// 鍦伴搧鍜岀珯鍚� private String subName; - private Integer zoom;// 地图缩放级别 + private Integer zoom;// 鍦板浘缂╂斁绾у埆 private Integer room; private String houseAreaRange; private String totalPriceRange; private String avgPriceRange; - private String houseAreaRangeDisplay;// 范围的显示值 + private String houseAreaRangeDisplay;// 鑼冨洿鐨勬樉绀哄�� private String totalPriceRangeDisplay; private List regionBlockList; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/Models.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/Models.java index f195d99e2..d79828ad4 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/Models.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/Models.java @@ -3,17 +3,17 @@ package com.fangjia.coresite.model; public final class Models { /** - * 404错误面页的model + * 404閿欒闈㈤〉鐨刴odel */ public static final BaseModel NOT_FOUNT = createModel(404, "/error"); /** - * 一般错误面页的model + * 涓�鑸敊璇潰椤电殑model */ public static final BaseModel ERROR = createModel(200, "/error"); /** - * 500错误面页的model + * 500閿欒闈㈤〉鐨刴odel */ public static final BaseModel SERVER_INTERNAL_ERROR = createModel(500, "/error"); diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/NewDistrictModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/NewDistrictModel.java index 7417e40c4..c8f58fc14 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/NewDistrictModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/NewDistrictModel.java @@ -21,7 +21,7 @@ public class NewDistrictModel extends BaseModel { private String districtName; private String keyword; private Menu menu; - private List autoRegionRecommends;// 自动热点推荐区域 + private List autoRegionRecommends;// 鑷姩鐑偣鎺ㄨ崘鍖哄煙 private List conditions; private List conditionItems; private List districtList; @@ -44,9 +44,9 @@ public class NewDistrictModel extends BaseModel { private List districtComments; private List districtDynamics; - private boolean ifDynamicsExist; // 动态是否存在 - private boolean ifCommentExist; // 动态是否存在 - private List dynamicsOrCommentsList;// 动态或评论集合 + private boolean ifDynamicsExist; // 鍔ㄦ�佹槸鍚﹀瓨鍦� + private boolean ifCommentExist; // 鍔ㄦ�佹槸鍚﹀瓨鍦� + private List dynamicsOrCommentsList;// 鍔ㄦ�佹垨璇勮闆嗗悎 private List footerCitys; private List footerDistricts; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/NewsModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/NewsModel.java index 69f7a7616..e2a3af62f 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/NewsModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/NewsModel.java @@ -22,7 +22,7 @@ public class NewsModel extends BaseModel { private String block; /** - * 用于新闻预览 + * 鐢ㄤ簬鏂伴椈棰勮 */ private String summary; private String summaryNoHtml; @@ -31,19 +31,19 @@ public class NewsModel extends BaseModel { private Date publishDate; private String source; - private UserFeeling userFeeling;// 用户顶踩信息 + private UserFeeling userFeeling;// 鐢ㄦ埛椤惰俯淇℃伅 private String diaryCity; private String diaryCitySpell; private String seat; private Integer currentPage; - private Integer pageSize;// 页大小 + private Integer pageSize;// 椤靛ぇ灏� - private String kind; // 资讯的具体类型 - private String kindName; // 面包屑名 + private String kind; // 璧勮鐨勫叿浣撶被鍨� + private String kindName; // 闈㈠寘灞戝悕 - private List newCitys;// 最新上线的城市 + private List newCitys;// 鏈�鏂颁笂绾跨殑鍩庡競 private ServerArea ipCity; private String ipCityUrl; @@ -52,7 +52,7 @@ public class NewsModel extends BaseModel { private List titleTokens; /** - * 1 按时间排序,0 默认排序 + * 1 鎸夋椂闂存帓搴忥紝0 榛樿鎺掑簭 */ private String sort; private String category; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/OfcConfigModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/OfcConfigModel.java index 6c25a90fc..939abf9ce 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/OfcConfigModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/OfcConfigModel.java @@ -29,16 +29,16 @@ public class OfcConfigModel extends BaseModel { private String block; private String districtName; /** - * 是否展示每条走势线的说明 + * 鏄惁灞曠ず姣忔潯璧板娍绾跨殑璇存槑 */ private boolean showText = true; /** - * 展示小区走势图时,是否展示板块走势 + * 灞曠ず灏忓尯璧板娍鍥炬椂锛屾槸鍚﹀睍绀烘澘鍧楄蛋鍔� */ private boolean showBlockTrend = false; /** - * 展示小区走势图时,是否展示区域走势 + * 灞曠ず灏忓尯璧板娍鍥炬椂锛屾槸鍚﹀睍绀哄尯鍩熻蛋鍔� */ private boolean showRegionTrend = false; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/PaymentModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/PaymentModel.java index 2c403438f..e18f7da21 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/PaymentModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/PaymentModel.java @@ -13,11 +13,11 @@ public class PaymentModel extends BaseModel { */ private static final long serialVersionUID = 4176184253775373266L; - private Evaluation evaluation; // 估价报告 + private Evaluation evaluation; // 浼颁环鎶ュ憡 private EvaluationReport evaluationReport; private Long maxTotalPrice; private Long minTotalPrice; - private String payUsage;//API交易接口会用到:charge,充值;buy,购买 + private String payUsage;//API浜ゆ槗鎺ュ彛浼氱敤鍒帮細charge,鍏呭�硷紱buy锛岃喘涔� private String body; private String notify_url; @@ -46,30 +46,30 @@ public class PaymentModel extends BaseModel { private String regionOrg; private String blockOrg; - private int reportCat; // 默认0:买家版;1:房东版 + private int reportCat; // 榛樿0锛氫拱瀹剁増锛�1锛氭埧涓滅増 private ReportTaste taste; private String mobileCode; - // private String sign_alipay;//支付宝担保交易 - // private String sign_BOCB2C;//中国银行 - // private String sign_ICBCB2C;//中国工商银行 - // private String sign_CMB;//招商银行 - // private String sign_CCB;//中国建设银行 - // private String sign_ABC;//中国农业银行 - // private String sign_SPDB;//上海浦东发展银行 - // private String sign_CIB;//兴业银行 - // private String sign_GDB;//广东发展银行 - // private String sign_CMBC;//中国民生银行 - // private String sign_COMM;//交通银行 - // private String sign_CITIC;//中信银行 - // private String sign_HZCBB2C;//杭州银行 - // private String sign_CEBBANK;//中国光大银行 - // private String sign_SHBANK;//上海银行 - // private String sign_NBBANK;//宁波银行 - // private String sign_SPABANK;//平安银行 - // private String sign_BJRCB;//北京农村商业银行 - // private String sign_FDB;//富滇银行 - // private String sign_POSTGC;//中国邮政储蓄银行 + // private String sign_alipay;//鏀粯瀹濇媴淇濅氦鏄� + // private String sign_BOCB2C;//涓浗閾惰 + // private String sign_ICBCB2C;//涓浗宸ュ晢閾惰 + // private String sign_CMB;//鎷涘晢閾惰 + // private String sign_CCB;//涓浗寤鸿閾惰 + // private String sign_ABC;//涓浗鍐滀笟閾惰 + // private String sign_SPDB;//涓婃捣娴︿笢鍙戝睍閾惰 + // private String sign_CIB;//鍏翠笟閾惰 + // private String sign_GDB;//骞夸笢鍙戝睍閾惰 + // private String sign_CMBC;//涓浗姘戠敓閾惰 + // private String sign_COMM;//浜ら�氶摱琛� + // private String sign_CITIC;//涓俊閾惰 + // private String sign_HZCBB2C;//鏉窞閾惰 + // private String sign_CEBBANK;//涓浗鍏夊ぇ閾惰 + // private String sign_SHBANK;//涓婃捣閾惰 + // private String sign_NBBANK;//瀹佹尝閾惰 + // private String sign_SPABANK;//骞冲畨閾惰 + // private String sign_BJRCB;//鍖椾含鍐滄潙鍟嗕笟閾惰 + // private String sign_FDB;//瀵屾粐閾惰 + // private String sign_POSTGC;//涓浗閭斂鍌ㄨ搫閾惰 public String getPayUsage() { diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/PersonalcenterModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/PersonalcenterModel.java index 1d18de9de..5e5d4eb17 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/PersonalcenterModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/PersonalcenterModel.java @@ -8,16 +8,16 @@ import java.math.BigDecimal; public class PersonalcenterModel extends BaseModel { private static final long serialVersionUID = -7716021826222669645L; - /**房价网用户id*/ + /**鎴夸环缃戠敤鎴穒d*/ private String userId; - private String payType;//购买方式:ye:余额;dsf:第三方渠道(支付宝、银行等) + private String payType;//璐拱鏂瑰紡锛歽e:浣欓锛沝sf:绗笁鏂规笭閬擄紙鏀粯瀹濄�侀摱琛岀瓑锛� private PaymentModel payment; private BigDecimal amount; - private Integer tc1;//套餐1份数 - private Integer tc2;//套餐2份数 - private Integer tc3;//套餐3份数 - private Integer tc4;//套餐4份数 + private Integer tc1;//濂楅1浠芥暟 + private Integer tc2;//濂楅2浠芥暟 + private Integer tc3;//濂楅3浠芥暟 + private Integer tc4;//濂楅4浠芥暟 public Integer getTc1() { return tc1; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/RechargeHistoryModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/RechargeHistoryModel.java index e59c9b12d..5bda57855 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/RechargeHistoryModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/RechargeHistoryModel.java @@ -11,14 +11,14 @@ import java.util.List; public class RechargeHistoryModel extends BaseModel { private static final long serialVersionUID = -4909518151414554372L; - /**房价网用户id*/ + /**鎴夸环缃戠敤鎴穒d*/ private long userId; /** - * 页号 + * 椤靛彿 */ private int pageNum; /** - * 每页的条数 + * 姣忛〉鐨勬潯鏁� */ private int pageSize; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/RentHouseModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/RentHouseModel.java index a156a9a43..2fd8bed5f 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/RentHouseModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/RentHouseModel.java @@ -43,33 +43,33 @@ public class RentHouseModel extends BaseModel { private RentHouse rentHouse; private String sort; private boolean asc; - private boolean overdate;// 房源是否过期判断用 - private int overDays = -1;// publish_date距离当前时间的天数 + private boolean overdate;// 鎴挎簮鏄惁杩囨湡鍒ゆ柇鐢� + private int overDays = -1;// publish_date璺濈褰撳墠鏃堕棿鐨勫ぉ鏁� private String nehouseAreaRange; - private String lat;// 经纬度字段 + private String lat;// 缁忕含搴﹀瓧娈� private String lng; - private DistrictStat districtStat; // 小区均价 + private DistrictStat districtStat; // 灏忓尯鍧囦环 private DistrictStat villaDistrictStat; private long sellCount; private long rentCount; - private DistrictStatRentBo districtStatRentBo;// 租房详情均价 + private DistrictStatRentBo districtStatRentBo;// 绉熸埧璇︽儏鍧囦环 private String cpc; private CpcBo cpcBo; - private UserFeeling userFeeling;// 用户顶踩信息 + private UserFeeling userFeeling;// 鐢ㄦ埛椤惰俯淇℃伅 - private String houseTag; // 房源标签 - private Integer menuType;// 菜单类型 1:区域;2:地铁 + private String houseTag; // 鎴挎簮鏍囩 + private Integer menuType;// 鑿滃崟绫诲瀷 1锛氬尯鍩燂紱2锛氬湴閾� private ServerArea ipCity; /** - * 是否是学区房 + * 鏄惁鏄鍖烘埧 */ private Integer ifSchool; /** - * 是否是地铁房 + * 鏄惁鏄湴閾佹埧 */ private Integer ifMetro; @@ -102,8 +102,8 @@ public class RentHouseModel extends BaseModel { return cpc; } - private List autoRegionRecommends;// 自动热点推荐区域 - private String recommendCityType;// 推荐房源类别 + private List autoRegionRecommends;// 鑷姩鐑偣鎺ㄨ崘鍖哄煙 + private String recommendCityType;// 鎺ㄨ崘鎴挎簮绫诲埆 public Integer getPublisherType() { return publisherType; @@ -114,17 +114,17 @@ public class RentHouseModel extends BaseModel { } /** - * 0:未知 1:中介 2:个人 3:经纪人 11:管理后台 + * 0锛氭湭鐭� 1锛氫腑浠� 2锛氫釜浜� 3锛氱粡绾汉 11锛氱鐞嗗悗鍙� */ private Integer publisherType; /** - * 出租类型 + * 鍑虹绫诲瀷 */ private String rentType; /** - * 装修情况 + * 瑁呬慨鎯呭喌 */ private String fitment; @@ -149,7 +149,7 @@ public class RentHouseModel extends BaseModel { private List otherCityDistrictList; - private String isPageQuery;//H5需求,判断有没有点过分页请求 + private String isPageQuery;//H5闇�姹傦紝鍒ゆ柇鏈夋病鏈夌偣杩囧垎椤佃姹� public void setCpc(String cpc) { diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/ReportDetailModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/ReportDetailModel.java index 579dcf2cb..edbcf9efc 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/ReportDetailModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/ReportDetailModel.java @@ -24,13 +24,13 @@ import com.fangjia.service.chart.jfreechart.JFreeChartImageService; public class ReportDetailModel extends BaseModel { private static final long serialVersionUID = 1848627899577087076L; - private String evaluationId; // 估价报告id + private String evaluationId; // 浼颁环鎶ュ憡id private String splitId; private String encryptId; private String houseId; - private int type; // 1:成交参考;2:租金租赁情况;3:楼盘情报;4:江湖地位、口碑;5:中介排行;6:价格预测; - private boolean enabledPay; // 是否有数据可供付款购买。没有数据时为false - private int houseRooms; // 房型(几室) + private int type; // 1:鎴愪氦鍙傝��;2:绉熼噾绉熻祦鎯呭喌;3:妤肩洏鎯呮姤;4:姹熸箹鍦颁綅銆佸彛纰�;5:涓粙鎺掕;6:浠锋牸棰勬祴; + private boolean enabledPay; // 鏄惁鏈夋暟鎹彲渚涗粯娆捐喘涔般�傛病鏈夋暟鎹椂涓篺alse + private int houseRooms; // 鎴垮瀷锛堝嚑瀹わ級 private District district; private Evaluation evaluation; private boolean isVilla; @@ -54,70 +54,70 @@ public class ReportDetailModel extends BaseModel { private String defaultbank; private String out_trade_no; - private List similarTradeHouses; // 同类成交房源 - private int minAvgPriceIndex; // 同类成交房源中单价最小的序号 - private int maxAvgPriceIndex; // 同类成交房源中单价最大的序号 + private List similarTradeHouses; // 鍚岀被鎴愪氦鎴挎簮 + private int minAvgPriceIndex; // 鍚岀被鎴愪氦鎴挎簮涓崟浠锋渶灏忕殑搴忓彿 + private int maxAvgPriceIndex; // 鍚岀被鎴愪氦鎴挎簮涓崟浠锋渶澶х殑搴忓彿 - private String districtRentStatImgUrl; // 小区租金均价走势图URL(所查周数同statWeekCounts) - private List districtRentStatImgMark; // 小区租金均价走势图中的线条颜色意义 + private String districtRentStatImgUrl; // 灏忓尯绉熼噾鍧囦环璧板娍鍥綰RL锛堟墍鏌ュ懆鏁板悓statWeekCounts锛� + private List districtRentStatImgMark; // 灏忓尯绉熼噾鍧囦环璧板娍鍥句腑鐨勭嚎鏉¢鑹叉剰涔� private List districtRoomRentStatBos; - private String rentRoomPropImgUrl; // 小区租房房型占比饼图URL - private String rentAreaPropImgUrl; // 小区租房面积占比饼图URL - private List rentAreaPropImgMark; // 小区租房面积占比饼图中的颜色意义 + private String rentRoomPropImgUrl; // 灏忓尯绉熸埧鎴垮瀷鍗犳瘮楗煎浘URL + private String rentAreaPropImgUrl; // 灏忓尯绉熸埧闈㈢Н鍗犳瘮楗煎浘URL + private List rentAreaPropImgMark; // 灏忓尯绉熸埧闈㈢Н鍗犳瘮楗煎浘涓殑棰滆壊鎰忎箟 - private String[] lineColorRgbs; // 走势图中各线条颜色代表的意义 + private String[] lineColorRgbs; // 璧板娍鍥句腑鍚勭嚎鏉¢鑹蹭唬琛ㄧ殑鎰忎箟 private String[] pieColorRgbs; - private DistrictHot districtHot; // 小区挂牌量、成交量、租房占比等信息 - private Developer developer; // 开发商信息 - private ManagementCompany managementCompany; // 物业公司信息 - private DistrictFacilitys facilitys; // 周边配套信息 - private Map distanceMap; // 小区到几个景点的距离(人民广场等) - private List hospitals; // 周边医院 - private List hospitalLevs; // 周边医院等级 - private List hospitalFeas; // 周边医院特色 + private DistrictHot districtHot; // 灏忓尯鎸傜墝閲忋�佹垚浜ら噺銆佺鎴垮崰姣旂瓑淇℃伅 + private Developer developer; // 寮�鍙戝晢淇℃伅 + private ManagementCompany managementCompany; // 鐗╀笟鍏徃淇℃伅 + private DistrictFacilitys facilitys; // 鍛ㄨ竟閰嶅淇℃伅 + private Map distanceMap; // 灏忓尯鍒板嚑涓櫙鐐圭殑璺濈锛堜汉姘戝箍鍦虹瓑锛� + private List hospitals; // 鍛ㄨ竟鍖婚櫌 + private List hospitalLevs; // 鍛ㄨ竟鍖婚櫌绛夌骇 + private List hospitalFeas; // 鍛ㄨ竟鍖婚櫌鐗硅壊 - private DistrictTradeAnalyseBo districtTradeStatBo; // 小区的成交记录分析 - private DistrictStatRankBo districtStatRank; // 小区的挂牌价排行 - private List regionStatTop5; // 区域内挂牌均价排名前5的小区 - private List blockStatTop5; // 板块内挂牌均价排名前5的小区 - private List regionTradeStatTop5; // 区域内成交均价排名前5的小区 - private List blockTradeStatTop5; // 板块内成交均价排名前5的小区 - private String regionRankImgUrl; // 小区在区域内的均价排行柱形图URL - private String blockRankImgUrl; // 小区在板块内的均价排行柱形图URL - private double[] regionRankImgPercent; // 小区在区域内的均价排行柱形图中各色块高度占比 - private double[] blockRankImgPercent; // 小区在板块内的均价排行柱形图中各色块高度占比 - private int regionDistrictCount; // 区域内小区数 - private int blockDistrictCount; // 板块内小区数 + private DistrictTradeAnalyseBo districtTradeStatBo; // 灏忓尯鐨勬垚浜よ褰曞垎鏋� + private DistrictStatRankBo districtStatRank; // 灏忓尯鐨勬寕鐗屼环鎺掕 + private List regionStatTop5; // 鍖哄煙鍐呮寕鐗屽潎浠锋帓鍚嶅墠5鐨勫皬鍖� + private List blockStatTop5; // 鏉垮潡鍐呮寕鐗屽潎浠锋帓鍚嶅墠5鐨勫皬鍖� + private List regionTradeStatTop5; // 鍖哄煙鍐呮垚浜ゅ潎浠锋帓鍚嶅墠5鐨勫皬鍖� + private List blockTradeStatTop5; // 鏉垮潡鍐呮垚浜ゅ潎浠锋帓鍚嶅墠5鐨勫皬鍖� + private String regionRankImgUrl; // 灏忓尯鍦ㄥ尯鍩熷唴鐨勫潎浠锋帓琛屾煴褰㈠浘URL + private String blockRankImgUrl; // 灏忓尯鍦ㄦ澘鍧楀唴鐨勫潎浠锋帓琛屾煴褰㈠浘URL + private double[] regionRankImgPercent; // 灏忓尯鍦ㄥ尯鍩熷唴鐨勫潎浠锋帓琛屾煴褰㈠浘涓悇鑹插潡楂樺害鍗犳瘮 + private double[] blockRankImgPercent; // 灏忓尯鍦ㄦ澘鍧楀唴鐨勫潎浠锋帓琛屾煴褰㈠浘涓悇鑹插潡楂樺害鍗犳瘮 + private int regionDistrictCount; // 鍖哄煙鍐呭皬鍖烘暟 + private int blockDistrictCount; // 鏉垮潡鍐呭皬鍖烘暟 private DistrictAgent districtAgent; - private List masterBos; // 中介详情 - private List> districtAgencys; // 小区成交中介排名,同AgencyDistrictTradeRank.details - private String maxSellAddress; // 最大成交中介地址 + private List masterBos; // 涓粙璇︽儏 + private List> districtAgencys; // 灏忓尯鎴愪氦涓粙鎺掑悕锛屽悓AgencyDistrictTradeRank.details + private String maxSellAddress; // 鏈�澶ф垚浜や腑浠嬪湴鍧� - private int statWeekCounts; // 查询的均价走势图的周数 - private String districtStatImgUrl; // 小区均价走势图URL - private String districtMinPrice; // 小区最低均价(所查周数内) - private String districtMaxPrice; // 小区最高均价(所查周数内) - private int districtMonthMarkup; // 小区均价环比 - private int districtYearMarkup; // 小区均价同比 + private int statWeekCounts; // 鏌ヨ鐨勫潎浠疯蛋鍔垮浘鐨勫懆鏁� + private String districtStatImgUrl; // 灏忓尯鍧囦环璧板娍鍥綰RL + private String districtMinPrice; // 灏忓尯鏈�浣庡潎浠凤紙鎵�鏌ュ懆鏁板唴锛� + private String districtMaxPrice; // 灏忓尯鏈�楂樺潎浠凤紙鎵�鏌ュ懆鏁板唴锛� + private int districtMonthMarkup; // 灏忓尯鍧囦环鐜瘮 + private int districtYearMarkup; // 灏忓尯鍧囦环鍚屾瘮 - private String blockStatImgUrl; // 板块均价走势图URL - private String blockMinPrice; // 板块最低均价(所查周数内) - private String blockMaxPrice; // 板块最高均价(所查周数内) - private int blockMonthMarkup; // 板块均价环比 - private int blockYearMarkup; // 板块均价同比 + private String blockStatImgUrl; // 鏉垮潡鍧囦环璧板娍鍥綰RL + private String blockMinPrice; // 鏉垮潡鏈�浣庡潎浠凤紙鎵�鏌ュ懆鏁板唴锛� + private String blockMaxPrice; // 鏉垮潡鏈�楂樺潎浠凤紙鎵�鏌ュ懆鏁板唴锛� + private int blockMonthMarkup; // 鏉垮潡鍧囦环鐜瘮 + private int blockYearMarkup; // 鏉垮潡鍧囦环鍚屾瘮 - private Long housePredictPrice; // 该房子的1年后价格预测 - private Integer housePredictMarkup; // 该房子的1年后价格涨跌幅 - private Integer blockPredictPrice; // 板块的1年后价格预测 - private Integer blockPredictMarkup; // 板块的1年后价格涨跌幅 - private Integer cityPredictPrice; // 城市的1年后价格预测 - private Integer cityPredictMarkup; // 城市的1年后价格涨跌幅 + private Long housePredictPrice; // 璇ユ埧瀛愮殑1骞村悗浠锋牸棰勬祴 + private Integer housePredictMarkup; // 璇ユ埧瀛愮殑1骞村悗浠锋牸娑ㄨ穼骞� + private Integer blockPredictPrice; // 鏉垮潡鐨�1骞村悗浠锋牸棰勬祴 + private Integer blockPredictMarkup; // 鏉垮潡鐨�1骞村悗浠锋牸娑ㄨ穼骞� + private Integer cityPredictPrice; // 鍩庡競鐨�1骞村悗浠锋牸棰勬祴 + private Integer cityPredictMarkup; // 鍩庡競鐨�1骞村悗浠锋牸娑ㄨ穼骞� private CityHot cityHot; - private DistrictAttentionRank districtAttention; // 小区关注度 - private List regionDistrictAttentionTop; // 区域内小区关注度前10 + private DistrictAttentionRank districtAttention; // 灏忓尯鍏虫敞搴� + private List regionDistrictAttentionTop; // 鍖哄煙鍐呭皬鍖哄叧娉ㄥ害鍓�10 public String getEvaluationId() { return evaluationId; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/ResourceModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/ResourceModel.java index 71e123791..0878adad8 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/ResourceModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/ResourceModel.java @@ -23,17 +23,17 @@ public class ResourceModel extends FangjiaModel { private String downUrl; - //总条数 + //鎬绘潯鏁� private int total; - //PC端右侧广告 + //PC绔彸渚у箍鍛� private List rightAdvertisementList; - //PC端轮播广告 + //PC绔疆鎾箍鍛� private List carouselAdvertisementList; - //mobile端轮播广告 + //mobile绔疆鎾箍鍛� private List mobileAdvertisementList; public String getType() { diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/RestfulModelAndView.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/RestfulModelAndView.java index 733dd3e3f..8bd2d89d2 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/RestfulModelAndView.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/RestfulModelAndView.java @@ -3,7 +3,7 @@ package com.fangjia.coresite.model; import org.sothis.web.mvc.ModelAndViewSupport; /** - * 用于restAPI的ModelAndView + * 鐢ㄤ簬restAPI鐨凪odelAndView * * @author velna * diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/SchoolModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/SchoolModel.java index 5b9a82f09..87c36b1fb 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/SchoolModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/SchoolModel.java @@ -50,7 +50,7 @@ public class SchoolModel extends BaseModel { private Integer totalPrice; private Double area; - private String lat;// 经纬度字段 + private String lat;// 缁忕含搴﹀瓧娈� private String lng; private Long latMax; private Long latMin; @@ -58,12 +58,12 @@ public class SchoolModel extends BaseModel { private Long lngMin; private String address; - private String kind;// 小区类型 - private DistrictStat districtStat; // 小区均价 + private String kind;// 灏忓尯绫诲瀷 + private DistrictStat districtStat; // 灏忓尯鍧囦环 private DistrictStat villaDistrictStat; private long sellCount; private long rentCount; - private List autoRegionRecommends;// 自动热点推荐区域 + private List autoRegionRecommends;// 鑷姩鐑偣鎺ㄨ崘鍖哄煙 private ServerArea ipCity; private int suggest_house_hide_keyword; @@ -77,9 +77,9 @@ public class SchoolModel extends BaseModel { private String cpc; private CpcBo cpcBo; - private String houseTag; // 房源标签 - private Integer menuType;// 菜单类型 1:区域;2:地铁 - private String recommendCityType;// 推荐房源类别 + private String houseTag; // 鎴挎簮鏍囩 + private Integer menuType;// 鑿滃崟绫诲瀷 1锛氬尯鍩燂紱2锛氬湴閾� + private String recommendCityType;// 鎺ㄨ崘鎴挎簮绫诲埆 private SchoolBo schoolBo; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/SiteMapModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/SiteMapModel.java index 1b151c2a3..17e725895 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/SiteMapModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/SiteMapModel.java @@ -42,7 +42,7 @@ public class SiteMapModel extends BaseModel { private String houseKind; private String fitment; - private List newCitys;// 最新上线的城市 + private List newCitys;// 鏈�鏂颁笂绾跨殑鍩庡競 private ServerArea ipCity; private String ipCityUrl; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/SuzhouHistoryModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/SuzhouHistoryModel.java index 1bbf26585..3991eb33d 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/SuzhouHistoryModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/SuzhouHistoryModel.java @@ -6,16 +6,16 @@ import com.fangjia.coresite.model.api.EvaluationVo; public class SuzhouHistoryModel extends BaseModel { private static final long serialVersionUID = 1L; - //贷款来源 + //璐锋鏉ユ簮 private String source; //appid private String appId; - //用户id + //鐢ㄦ埛id private String uid; - //跳转链接url + //璺宠浆閾炬帴url private String url; private List evaluationList; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/SuzhouMobileEvalResultModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/SuzhouMobileEvalResultModel.java index 43cd1ce2a..0a6562f71 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/SuzhouMobileEvalResultModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/SuzhouMobileEvalResultModel.java @@ -9,7 +9,7 @@ public class SuzhouMobileEvalResultModel extends BaseModel { private String uid; private String region; - private String lat;// 经纬度字段 + private String lat;// 缁忕含搴﹀瓧娈� private String lng; private Double latD; private Double lngD; @@ -18,10 +18,10 @@ public class SuzhouMobileEvalResultModel extends BaseModel { private Integer avgPrice; private String sourceStr; - //贷款广告 + //璐锋骞垮憡 private Integer laonAd; - //结果页贷款广告 + //缁撴灉椤佃捶娆惧箍鍛� private Integer laonAd2; public Integer getLaonAd() { @@ -56,92 +56,92 @@ public class SuzhouMobileEvalResultModel extends BaseModel { this.showHistory = showHistory; } - //有房下载 + //鏈夋埧涓嬭浇 private Integer youfangDownload; - //有房文字标识 + //鏈夋埧鏂囧瓧鏍囪瘑 private Integer youfangRemark; - //显示评估历史 + //鏄剧ず璇勪及鍘嗗彶 private Integer showHistory; /** - * 小区名 + * 灏忓尯鍚� */ private String districtName; /** - * 室 + * 瀹� */ private Integer room; /** - * 面积 + * 闈㈢Н */ private Double houseArea; /** - * 所在楼层 + * 鎵�鍦ㄦゼ灞� */ private Integer floor; - //单元 + //鍗曞厓 private String unitNum; /** - * 总楼层 + * 鎬绘ゼ灞� */ private Integer height; - //小区年涨幅 + //灏忓尯骞存定骞� private Double oneYearUpDownRange; - //上月参考均价 + //涓婃湀鍙傝�冨潎浠� private Integer topMonthAvgPrice; - //当前估价时间的周均价 + //褰撳墠浼颁环鏃堕棿鐨勫懆鍧囦环 private Integer weekAvgPrice; - //于上周相比的涨跌幅(%) + //浜庝笂鍛ㄧ浉姣旂殑娑ㄨ穼骞咃紙%锛� private int topWeekUpDownRange; - //上个月月份 + //涓婁釜鏈堟湀浠� private Integer topMonth; - //涨跌幅在城市排名(%) + //娑ㄨ穼骞呭湪鍩庡競鎺掑悕锛�%锛� private Double upDownRangecityLevel; - //当前年 + //褰撳墠骞� private String nowYear; - //当前年月日 + //褰撳墠骞存湀鏃� private String nowYearMoth; - //本周涨跌幅 + //鏈懆娑ㄨ穼骞� private int weekendMarkup; /** - * 建筑年代 + * 寤虹瓚骞翠唬 */ private String buildYear; /** - * 城市月涨跌幅 + * 鍩庡競鏈堟定璺屽箙 */ private Double markup; /** - * 链接来源 + * 閾炬帴鏉ユ簮 */ private String source; /** - * 城市均价 + * 鍩庡競鍧囦环 */ private Integer cityPrice; private String appId; /** - * 跳转链接 + * 璺宠浆閾炬帴 */ private String url; @@ -153,7 +153,7 @@ public class SuzhouMobileEvalResultModel extends BaseModel { this.minMonthInterestRate = minMonthInterestRate; } - //贷款最小利率 + //璐锋鏈�灏忓埄鐜� private double minMonthInterestRate; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/SuzhouMobileReportModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/SuzhouMobileReportModel.java index 15125efbd..6ec847e2f 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/SuzhouMobileReportModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/SuzhouMobileReportModel.java @@ -4,25 +4,25 @@ public class SuzhouMobileReportModel extends BaseModel{ private static final long serialVersionUID = 1L; - //贷款来源 + //璐锋鏉ユ簮 private String source; //appid private String appId; - //用户id + //鐢ㄦ埛id private String udid; - //用户id + //鐢ㄦ埛id private String uid; - //跳转链接url + //璺宠浆閾炬帴url private String url; - //贷款广告 + //璐锋骞垮憡 private Integer laonAd; - //结果页贷款广告 + //缁撴灉椤佃捶娆惧箍鍛� private Integer laonAd2; public Integer getLaonAd() { @@ -57,13 +57,13 @@ public class SuzhouMobileReportModel extends BaseModel{ this.showHistory = showHistory; } - //有房下载 + //鏈夋埧涓嬭浇 private Integer youfangDownload; - //有房文字标识 + //鏈夋埧鏂囧瓧鏍囪瘑 private Integer youfangRemark; - //显示评估历史 + //鏄剧ず璇勪及鍘嗗彶 private Integer showHistory; public String getSource() { diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/SuzhouReportModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/SuzhouReportModel.java index 9dc1eb9da..161e19724 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/SuzhouReportModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/SuzhouReportModel.java @@ -4,13 +4,13 @@ public class SuzhouReportModel extends BaseModel{ private static final long serialVersionUID = 1L; - //贷款来源 + //璐锋鏉ユ簮 private String source; - //贷款广告 + //璐锋骞垮憡 private Integer laonAd; - //结果页面贷款广告 + //缁撴灉椤甸潰璐锋骞垮憡 private Integer laonAd2; public Integer getLaonAd() { @@ -45,13 +45,13 @@ public class SuzhouReportModel extends BaseModel{ this.showHistory = showHistory; } - //有房下载 + //鏈夋埧涓嬭浇 private Integer youfangDownload; - //有房文字标识 + //鏈夋埧鏂囧瓧鏍囪瘑 private Integer youfangRemark; - //显示评估历史 + //鏄剧ず璇勪及鍘嗗彶 private Integer showHistory; public String getSource() { diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/TrendModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/TrendModel.java index 1e9c64f0f..1c9db288c 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/TrendModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/TrendModel.java @@ -49,9 +49,9 @@ public class TrendModel extends BaseModel implements TrendViewModel { private List upTop5; private List downTop5; private int width; - private int showBlock; // 小区走势图里显示板块线,不为0时显示 - private String errMsg; //错误信息 - private int code; //错误code 1成功 -1失败 + private int showBlock; // 灏忓尯璧板娍鍥鹃噷鏄剧ず鏉垮潡绾匡紝涓嶄负0鏃舵樉绀� + private String errMsg; //閿欒淇℃伅 + private int code; //閿欒code 1鎴愬姛 -1澶辫触 private int count; public String getKeyword() { return keyword; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/UserModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/UserModel.java index 4d3e07d0a..69f6210af 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/UserModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/UserModel.java @@ -12,7 +12,7 @@ import com.fangjia.service.bo.RentHouseBo; public class UserModel extends BaseModel { private static final long serialVersionUID = 6356273626810600697L; - private List newCitys;// 最新上线的城市 + private List newCitys;// 鏈�鏂颁笂绾跨殑鍩庡競 private ServerArea ipCity; private String ipCityUrl; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/UsersModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/UsersModel.java index 41d13cb70..d55ddc469 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/UsersModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/UsersModel.java @@ -18,14 +18,14 @@ public class UsersModel extends BaseModel { private String room; private Integer houseArea; - // 测试用字段 Start + // 娴嬭瘯鐢ㄥ瓧娈� Start private int status; private String zbcId; private String houseId; private String category; - // 测试用字段 End + // 娴嬭瘯鐢ㄥ瓧娈� End public Integer getHouseArea() { return houseArea; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/WithHoldInfoModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/WithHoldInfoModel.java index 425bacc18..a26a447bb 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/WithHoldInfoModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/WithHoldInfoModel.java @@ -4,7 +4,7 @@ public class WithHoldInfoModel extends BaseModel{ private static final long serialVersionUID = 1L; /** - * 回调返回加密密文 + * 鍥炶皟杩斿洖鍔犲瘑瀵嗘枃 */ private String response; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/YinLianEvaluationModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/YinLianEvaluationModel.java index 3b48356b2..989c4d29f 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/YinLianEvaluationModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/YinLianEvaluationModel.java @@ -1,7 +1,7 @@ package com.fangjia.coresite.model; /** - * 银联公众号需求 公众号跳转Model + * 閾惰仈鍏紬鍙烽渶姹� 鍏紬鍙疯烦杞琈odel * * @author JENIS */ @@ -10,12 +10,12 @@ public class YinLianEvaluationModel extends BaseModel { private static final long serialVersionUID = -17536810363704809L; /** - * 跳转传入的用户ID 对应用户唯一识别号(银联需要控制) + * 璺宠浆浼犲叆鐨勭敤鎴稩D 瀵瑰簲鐢ㄦ埛鍞竴璇嗗埆鍙�(閾惰仈闇�瑕佹帶鍒�) */ private String userId; /** - * 请求时间戳 + * 璇锋眰鏃堕棿鎴� */ private long timestamp; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/address/AddressAnalyJsonModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/address/AddressAnalyJsonModel.java index 47d6b4ff8..e5c5910eb 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/address/AddressAnalyJsonModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/address/AddressAnalyJsonModel.java @@ -18,55 +18,55 @@ public class AddressAnalyJsonModel extends ModelAndViewSupport { private String result; private String msg; /** - * 区域住宅个数信息 + * 鍖哄煙浣忓畢涓暟淇℃伅 */ private List regionInfos; /** - * 价格区间个数信息 + * 浠锋牸鍖洪棿涓暟淇℃伅 */ private List priceSectionInfos; /** - * 房产总价走势信息 + * 鎴夸骇鎬讳环璧板娍淇℃伅 */ private List districtTotalPriceInfos; /** - * 房产总价 + * 鎴夸骇鎬讳环 */ private Long districtTotalPrice; /** - * 住宅类型数量信息 + * 浣忓畢绫诲瀷鏁伴噺淇℃伅 */ private List districtTypeCountInfos; /** - * 地址解析后的 价格信息 + * 鍦板潃瑙f瀽鍚庣殑 浠锋牸淇℃伅 */ private List addressAnalyPriceInfos; /** - * 总页数 + * 鎬婚〉鏁� */ private Integer pages; /** - * 跌涨幅信息 + * 璺屾定骞呬俊鎭� */ private List dieZhangFuInfos; /** - * 贷款余额正常,超警戒信息 + * 璐锋浣欓姝e父锛岃秴璀︽垝淇℃伅 */ private List balanceInfos; /** - * 房产总价与涨跌幅信息 + * 鎴夸骇鎬讳环涓庢定璺屽箙淇℃伅 */ private List> totalPriceAndFloatInfos; /** - * 房产总价与客户价值信息 + * 鎴夸骇鎬讳环涓庡鎴蜂环鍊间俊鎭� */ private List> totalPriceAndCustomerValues; /** - * 房产总价与贷款余额信息 + * 鎴夸骇鎬讳环涓庤捶娆句綑棰濅俊鎭� */ private List> totalPriceAndbalances; /** - * 客户价值类型(priceAndValue:价格和价值都有,price:只有价格) + * 瀹㈡埛浠峰�肩被鍨嬶紙priceAndValue:浠锋牸鍜屼环鍊奸兘鏈�,price锛氬彧鏈変环鏍硷級 */ private String customerValueType = "price"; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/address/AddressAnalyModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/address/AddressAnalyModel.java index 6e7e00713..33347852b 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/address/AddressAnalyModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/address/AddressAnalyModel.java @@ -9,13 +9,13 @@ import com.fangjia.dal.mongo.model.AddressTask; public class AddressAnalyModel extends BaseModel{ /** - * 页面显示标题(风控还是营销) + * 椤甸潰鏄剧ず鏍囬锛堥鎺ц繕鏄惀閿�锛� */ private static final long serialVersionUID = 4234671176811376909L; private String type; - //标题(风控还是营销) + //鏍囬锛堥鎺ц繕鏄惀閿�锛� private String title; private String email; @@ -24,40 +24,40 @@ public class AddressAnalyModel extends BaseModel{ private List addressTasks; /** - * 任务ID + * 浠诲姟ID */ private String taskId; /** - * 当前页数 + * 褰撳墠椤垫暟 */ private Integer curPage; /** - * 页数大小 + * 椤垫暟澶у皬 */ private Integer pageSize; /** - * 请求类型,风控和营销(yingxiao,fengkong) + * 璇锋眰绫诲瀷锛岄鎺у拰钀ラ攢锛坹ingxiao,fengkong锛� */ private String queryCity; /** - * LVR预警默认值 + * LVR棰勮榛樿鍊� */ private Integer lvrNumber; /** - * 导出数据起始范围 + * 瀵煎嚭鏁版嵁璧峰鑼冨洿 */ private Double start; private Double end; /** - * 是否存在分析完成的任务 + * 鏄惁瀛樺湪鍒嗘瀽瀹屾垚鐨勪换鍔� */ private String existsOverTask; /** - * 操作类型 1:大于等于 2小于等于 + * 鎿嶄綔绫诲瀷 1锛氬ぇ浜庣瓑浜� 2灏忎簬绛変簬 */ private Integer operateType; /** - * 操作类型 1:大于等于 2小于等于 + * 鎿嶄綔绫诲瀷 1锛氬ぇ浜庣瓑浜� 2灏忎簬绛変簬 */ private Integer operateType2; private String backAction; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/address/AddressAnalyPriceInfo.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/address/AddressAnalyPriceInfo.java index c9a2d3f3f..14fd91ce7 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/address/AddressAnalyPriceInfo.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/address/AddressAnalyPriceInfo.java @@ -1,8 +1,8 @@ package com.fangjia.coresite.model.address; /** - * 地址解析后的价格信息 + * 鍦板潃瑙f瀽鍚庣殑浠锋牸淇℃伅 * @author yinjihuan - * @date 2016年6月24日 + * @date 2016骞�6鏈�24鏃� * */ public class AddressAnalyPriceInfo { diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/address/DistrictFloatInfo.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/address/DistrictFloatInfo.java index 8106954af..c6b28da40 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/address/DistrictFloatInfo.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/address/DistrictFloatInfo.java @@ -1,8 +1,8 @@ package com.fangjia.coresite.model.address; /** - * 住宅浮动信息 + * 浣忓畢娴姩淇℃伅 * @author yinjihuan - * @date 2016年6月24日 + * @date 2016骞�6鏈�24鏃� * */ public class DistrictFloatInfo { diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/address/DistrictTotalPriceInfo.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/address/DistrictTotalPriceInfo.java index 95c15d920..31f270801 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/address/DistrictTotalPriceInfo.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/address/DistrictTotalPriceInfo.java @@ -1,17 +1,17 @@ package com.fangjia.coresite.model.address; /** - * 房产总价走势信息 + * 鎴夸骇鎬讳环璧板娍淇℃伅 * @author yinjihuan - * @date 2016年6月24日 + * @date 2016骞�6鏈�24鏃� * */ public class DistrictTotalPriceInfo { /** - * 年月 + * 骞存湀 */ private String yearMonth; /** - * 总价 + * 鎬讳环 */ private Long totalPrice; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/address/DistrictTypeCountInfo.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/address/DistrictTypeCountInfo.java index ed476918d..8235a56d2 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/address/DistrictTypeCountInfo.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/address/DistrictTypeCountInfo.java @@ -1,8 +1,8 @@ package com.fangjia.coresite.model.address; /** - * 住宅类型数量信息 + * 浣忓畢绫诲瀷鏁伴噺淇℃伅 * @author yinjihuan - * @date 2016年6月24日 + * @date 2016骞�6鏈�24鏃� * */ public class DistrictTypeCountInfo { @@ -29,9 +29,9 @@ public class DistrictTypeCountInfo { } public static class DistrictType { - public static final String VILLA = "别墅"; - public static final String COMMERCIAL = "商用"; - public static final String ORDINARY = "普通住宅"; + public static final String VILLA = "鍒"; + public static final String COMMERCIAL = "鍟嗙敤"; + public static final String ORDINARY = "鏅�氫綇瀹�"; } } diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/address/PriceSectionInfo.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/address/PriceSectionInfo.java index 3fadcf317..f534cacb5 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/address/PriceSectionInfo.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/address/PriceSectionInfo.java @@ -1,17 +1,17 @@ package com.fangjia.coresite.model.address; /** - * 价格区间信息 + * 浠锋牸鍖洪棿淇℃伅 * @author yinjihuan - * @date 2016年6月24日 + * @date 2016骞�6鏈�24鏃� * */ public class PriceSectionInfo { /** - * 价格区间 + * 浠锋牸鍖洪棿 */ private String priceSection; /** - * 数量 + * 鏁伴噺 */ private Integer count; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/address/RegionInfo.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/address/RegionInfo.java index ce18808e2..2b16cb9cd 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/address/RegionInfo.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/address/RegionInfo.java @@ -1,17 +1,17 @@ package com.fangjia.coresite.model.address; /** - * 区域数量信息 + * 鍖哄煙鏁伴噺淇℃伅 * @author yinjihuan - * @date 2016年6月24日 + * @date 2016骞�6鏈�24鏃� * */ public class RegionInfo { /** - * 区域 + * 鍖哄煙 */ private String region; /** - * 住宅数量 + * 浣忓畢鏁伴噺 */ private Integer count; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/api/ApiDetailVo.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/api/ApiDetailVo.java index be29e6439..fcdb1b3ab 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/api/ApiDetailVo.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/api/ApiDetailVo.java @@ -3,7 +3,7 @@ package com.fangjia.coresite.model.api; public class ApiDetailVo { private String serviceId; private String name; - private String iconClass; //图标样式 + private String iconClass; //鍥炬爣鏍峰紡 private Integer callCount; private String type; private String typeCls; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/api/ApiJsonModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/api/ApiJsonModel.java index 4b5fe7eda..388d0777d 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/api/ApiJsonModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/api/ApiJsonModel.java @@ -17,7 +17,7 @@ public class ApiJsonModel extends ModelAndViewSupport { private String auditSchedule; private String apiKey; private List apiVisitRecords; - //是否购买过 + //鏄惁璐拱杩� private Boolean purchaseRecords; public void setPurchaseRecords(Boolean purchaseRecords) { this.purchaseRecords = purchaseRecords; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/api/ApiTestApplyModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/api/ApiTestApplyModel.java index b1a9de6b1..c0e2bf844 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/api/ApiTestApplyModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/api/ApiTestApplyModel.java @@ -5,35 +5,35 @@ import java.util.List; import com.fangjia.coresite.model.BaseModel; import com.fangjia.dal.mongo.model.ApiDetail; /** - * API测试申请数据 + * API娴嬭瘯鐢宠鏁版嵁 * @author yinjihuan - * @date 2016年6月7日 + * @date 2016骞�6鏈�7鏃� * */ public class ApiTestApplyModel extends BaseModel { private static final long serialVersionUID = -5748607198648816918L; /** - * 姓名 + * 濮撳悕 */ private String name; /** - * 公司 + * 鍏徃 */ private String company; /** - * 邮箱 + * 閭 */ private String email; /** - * 行业 + * 琛屼笟 */ private String industry; /** - * 测试字段(多个,逗号隔开) + * 娴嬭瘯瀛楁锛堝涓紝閫楀彿闅斿紑锛� */ private String testFields; /** - * 调用接口列表 + * 璋冪敤鎺ュ彛鍒楄〃 */ private List apiDetails; /** diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/api/ApiVisitRecord.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/api/ApiVisitRecord.java index 306d6682d..14b553f1b 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/api/ApiVisitRecord.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/api/ApiVisitRecord.java @@ -2,19 +2,19 @@ package com.fangjia.coresite.model.api; public class ApiVisitRecord { /** - * 接口名称 + * 鎺ュ彛鍚嶇О */ private String interName; /** - * 已调用次数 + * 宸茶皟鐢ㄦ鏁� */ private Long visitCount = 0L; /** - * 剩余次数 + * 鍓╀綑娆℃暟 */ private Long surplusCount = 0L; /** - * 截止时间 + * 鎴鏃堕棿 */ private String endTime; public String getInterName() { diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/api/EvaluationVo.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/api/EvaluationVo.java index 4136efe1f..d3d963980 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/api/EvaluationVo.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/api/EvaluationVo.java @@ -9,16 +9,16 @@ public class EvaluationVo { private String address; private Integer totalPrice; private Integer avgPrice; - private Integer floor;// 所在楼层 - private Integer height;// 总楼层 - private Double area; // 建筑面积 + private Integer floor;// 鎵�鍦ㄦゼ灞� + private Integer height;// 鎬绘ゼ灞� + private Double area; // 寤虹瓚闈㈢Н private Integer room; private Integer hall; private String houseNum; private String roomNum; private String estateType; - private String source;// 估价来源,site和api接口 + private String source;// 浼颁环鏉ユ簮锛宻ite鍜宎pi鎺ュ彛 private double markup; public String getId() { return id; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/recharge/ApiPurchaseRecordModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/recharge/ApiPurchaseRecordModel.java index b0c2731a7..f189ea48e 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/recharge/ApiPurchaseRecordModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/recharge/ApiPurchaseRecordModel.java @@ -7,17 +7,17 @@ import com.google.common.collect.Lists; import java.util.List; /** - * 购买记录model + * 璐拱璁板綍model * Created by ideoj on 2016/6/13. */ public class ApiPurchaseRecordModel extends BaseModel { private static final long serialVersionUID = -6094577483292771776L; - /**用户ID*/ + /**鐢ㄦ埛ID*/ private long userId; - /**订单号*/ + /**璁㈠崟鍙�*/ private String orderNumber; - /**购买途径*/ + /**璐拱閫斿緞*/ private String channel; private List records = Lists.newArrayList(); diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/recharge/RechargeModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/recharge/RechargeModel.java index 3561cd630..61bd903e8 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/recharge/RechargeModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/recharge/RechargeModel.java @@ -13,29 +13,29 @@ import java.util.List; */ public class RechargeModel extends BaseModel { private static final long serialVersionUID = -9094978643052715224L; - /**用户ID*/ + /**鐢ㄦ埛ID*/ private String userId; - /**账户余额*/ + /**璐︽埛浣欓*/ private String amount; - /**产品(接口、字段)列表*/ + /**浜у搧锛堟帴鍙c�佸瓧娈碉級鍒楄〃*/ private List products = Lists.newArrayList(); private String buyProducts; - //支付密码 + //鏀粯瀵嗙爜 private String password; - //用户手机号 + //鐢ㄦ埛鎵嬫満鍙� private String phone; - //手机验证码 + //鎵嬫満楠岃瘉鐮� private String code; - //支付类型 + //鏀粯绫诲瀷 private String payType; private PaymentModel payment; - //是否登录 + //鏄惁鐧诲綍 private boolean logined; private String tabTitle; - //发短信时的type + //鍙戠煭淇℃椂鐨則ype private String type; private List userAccounts; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/report/Fonts.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/report/Fonts.java index 21198d74d..b78ceea75 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/report/Fonts.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/report/Fonts.java @@ -9,7 +9,7 @@ import com.itextpdf.text.pdf.BaseFont; /** * - * PDF估价报告自定义字体库 + * PDF浼颁环鎶ュ憡鑷畾涔夊瓧浣撳簱 * */ public class Fonts { diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/report/PdfBlock.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/report/PdfBlock.java index de26c6c7b..a72b14f56 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/report/PdfBlock.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/report/PdfBlock.java @@ -6,7 +6,7 @@ import com.itextpdf.text.pdf.PdfPTable; /** * - * PDF块排版数据 + * PDF鍧楁帓鐗堟暟鎹� * */ public class PdfBlock { diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/report/Report.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/report/Report.java index 5366ec1eb..b528da5da 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/report/Report.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/report/Report.java @@ -10,7 +10,7 @@ public class Report { private String reportNo; private String reportAuto; - private String reportDate;// 2011年10月10日 + private String reportDate;// 2011骞�10鏈�10鏃� private String districtName; private String totalPrice; private String price; @@ -26,15 +26,15 @@ public class Report { private String url; private String houseNum; private String roomNum; - private byte[] stamp;// 印章logo - private byte[] engine;// 搜索引擎介绍 - private List eTableDatas;// 估价信息表格数据 + private byte[] stamp;// 鍗扮珷logo + private byte[] engine;// 鎼滅储寮曟搸浠嬬粛 + private List eTableDatas;// 浼颁环淇℃伅琛ㄦ牸鏁版嵁 - private String trends;//走势图 + private String trends;//璧板娍鍥� - private String houseProperty;//产权信息 + private String houseProperty;//浜ф潈淇℃伅 - private String evaluationDescription;//估价描述 + private String evaluationDescription;//浼颁环鎻忚堪 private String googleMap; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/report/ReportCreator.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/report/ReportCreator.java index 9ef5f25d5..b9d517636 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/report/ReportCreator.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/report/ReportCreator.java @@ -59,10 +59,10 @@ public class ReportCreator { } private void addCompanyInfo(Document document) { - document.addTitle("房价网分析报告"); - document.addAuthor("房价网"); - document.addSubject("房价网分析报告内容"); - document.addKeywords("房价网分析报告"); + document.addTitle("鎴夸环缃戝垎鏋愭姤鍛�"); + document.addAuthor("鎴夸环缃�"); + document.addSubject("鎴夸环缃戝垎鏋愭姤鍛婂唴瀹�"); + document.addKeywords("鎴夸环缃戝垎鏋愭姤鍛�"); document.addCreator("www.fangjia.com"); } @@ -80,18 +80,18 @@ public class ReportCreator { private List getSixPage(Report report) throws DocumentException, IOException { List datas = new ArrayList(); - datas.add(new PdfBlock("房价网房地产询价分析报告", Fonts.getFont(Fonts.BASIC), Paragraph.ALIGN_LEFT)); - datas.add(new PdfBlock("房价网—全国首家在线免费估价网站", Fonts.getFont(Fonts.TITLE_BOLD), Paragraph.ALIGN_CENTER, 20)); - datas.add(new PdfBlock("房价网是如何估价的?", Fonts.getFont(Fonts.TITLE), Paragraph.ALIGN_LEFT, 20)); + datas.add(new PdfBlock("鎴夸环缃戞埧鍦颁骇璇环鍒嗘瀽鎶ュ憡", Fonts.getFont(Fonts.BASIC), Paragraph.ALIGN_LEFT)); + datas.add(new PdfBlock("鎴夸环缃戔�斿叏鍥介瀹跺湪绾垮厤璐逛及浠风綉绔�", Fonts.getFont(Fonts.TITLE_BOLD), Paragraph.ALIGN_CENTER, 20)); + datas.add(new PdfBlock("鎴夸环缃戞槸濡備綍浼颁环鐨�?", Fonts.getFont(Fonts.TITLE), Paragraph.ALIGN_LEFT, 20)); PdfPTable descTable = getTable(2, 20); descTable.setTotalWidth(400); PdfPCell cell = new PdfPCell(); cell.setBorderWidth(0); cell.setFixedHeight(300); - cell.addElement(new PdfBlock("房价网依据全国100,000多个小区的真实房价动态进行精准科学的估价算法,结合线下评估机构校验数据,真实客观反映楼市房市变化。\n" - + "房价网的估价算法是一个集成了搜索领域数据抓取,数据挖掘领域的数据清洗和异常数据自动检测,以及各种机器学习算法的集成性智能估价系统。\n" - + "下图展示了估价系统的整体算法流程。整个系统根据计算性质的不同可以分为房源数据收集与整理,智能估价系统以及效果评估与改进体系。三者互动形成了一个智能估价的循环计算系统。", Fonts + cell.addElement(new PdfBlock("鎴夸环缃戜緷鎹叏鍥�100,000澶氫釜灏忓尯鐨勭湡瀹炴埧浠峰姩鎬佽繘琛岀簿鍑嗙瀛︾殑浼颁环绠楁硶锛岀粨鍚堢嚎涓嬭瘎浼版満鏋勬牎楠屾暟鎹紝鐪熷疄瀹㈣鍙嶆槧妤煎競鎴垮競鍙樺寲銆俓n" + + "鎴夸环缃戠殑浼颁环绠楁硶鏄竴涓泦鎴愪簡鎼滅储棰嗗煙鏁版嵁鎶撳彇锛屾暟鎹寲鎺橀鍩熺殑鏁版嵁娓呮礂鍜屽紓甯告暟鎹嚜鍔ㄦ娴嬶紝浠ュ強鍚勭鏈哄櫒瀛︿範绠楁硶鐨勯泦鎴愭�ф櫤鑳戒及浠风郴缁熴�俓n" + + "涓嬪浘灞曠ず浜嗕及浠风郴缁熺殑鏁翠綋绠楁硶娴佺▼銆傛暣涓郴缁熸牴鎹绠楁�ц川鐨勪笉鍚屽彲浠ュ垎涓烘埧婧愭暟鎹敹闆嗕笌鏁寸悊锛屾櫤鑳戒及浠风郴缁熶互鍙婃晥鏋滆瘎浼颁笌鏀硅繘浣撶郴銆備笁鑰呬簰鍔ㄥ舰鎴愪簡涓�涓櫤鑳戒及浠风殑寰幆璁$畻绯荤粺銆�", Fonts .getFont(Fonts.TEXT), Paragraph.ALIGN_LEFT, 10).toParagraph()); descTable.addCell(cell); @@ -103,14 +103,14 @@ public class ReportCreator { descTable.addCell(cell); datas.add(new PdfBlock(descTable)); - datas.add(new PdfBlock("为什么选择房价网在线估价 ?", Fonts.getFont(Fonts.TITLE), Paragraph.ALIGN_LEFT, 10)); - datas.add(new PdfBlock("全国首家提供免费在线估价的专业房产网站", Fonts.getFont(Fonts.TEXT_BOLD), Paragraph.ALIGN_LEFT, 20)); + datas.add(new PdfBlock("涓轰粈涔堥�夋嫨鎴夸环缃戝湪绾夸及浠� 锛�", Fonts.getFont(Fonts.TITLE), Paragraph.ALIGN_LEFT, 10)); + datas.add(new PdfBlock("鍏ㄥ浗棣栧鎻愪緵鍏嶈垂鍦ㄧ嚎浼颁环鐨勪笓涓氭埧浜х綉绔�", Fonts.getFont(Fonts.TEXT_BOLD), Paragraph.ALIGN_LEFT, 20)); datas .add(new PdfBlock( - "房价网是一家专注于房地产行业的互联网高科技网站,凭借自主研发的定向搜索及数据挖掘专利技术,成为中国首家提供免费在线房地产估价的专业地产网站,也是唯一能全国范围提供独立于政府统计机构和行业监管机构外的第三方行业数据分析的网站。", + "鎴夸环缃戞槸涓�瀹朵笓娉ㄤ簬鎴垮湴浜ц涓氱殑浜掕仈缃戦珮绉戞妧缃戠珯锛屽嚟鍊熻嚜涓荤爺鍙戠殑瀹氬悜鎼滅储鍙婃暟鎹寲鎺樹笓鍒╂妧鏈紝鎴愪负涓浗棣栧鎻愪緵鍏嶈垂鍦ㄧ嚎鎴垮湴浜т及浠风殑涓撲笟鍦颁骇缃戠珯锛屼篃鏄敮涓�鑳藉叏鍥借寖鍥存彁渚涚嫭绔嬩簬鏀垮簻缁熻鏈烘瀯鍜岃涓氱洃绠℃満鏋勫鐨勭涓夋柟琛屼笟鏁版嵁鍒嗘瀽鐨勭綉绔欍��", Fonts.getFont(Fonts.TEXT), Paragraph.ALIGN_LEFT, 10)); - datas.add(new PdfBlock("已有400万人次在房价网上估价", Fonts.getFont(Fonts.TEXT_BOLD), Paragraph.ALIGN_LEFT, 10)); - datas.add(new PdfBlock("每天约1.5W人次在房价网进行估价。至2011年3月止,估价人次达到400万次。", Fonts.getFont(Fonts.TEXT), Paragraph.ALIGN_LEFT, 10)); + datas.add(new PdfBlock("宸叉湁400涓囦汉娆″湪鎴夸环缃戜笂浼颁环", Fonts.getFont(Fonts.TEXT_BOLD), Paragraph.ALIGN_LEFT, 10)); + datas.add(new PdfBlock("姣忓ぉ绾�1.5W浜烘鍦ㄦ埧浠风綉杩涜浼颁环銆傝嚦2011骞�3鏈堟锛屼及浠蜂汉娆¤揪鍒�400涓囨銆�", Fonts.getFont(Fonts.TEXT), Paragraph.ALIGN_LEFT, 10)); return datas; } @@ -118,22 +118,22 @@ public class ReportCreator { private List getFivePage(Report report) throws DocumentException, IOException { List datas = new ArrayList(6); - datas.add(new PdfBlock("房价网房地产询价分析报告", Fonts.getFont(Fonts.BASIC), Paragraph.ALIGN_LEFT)); - datas.add(new PdfBlock("附 件", Fonts.getFont(Fonts.TITLE_BOLD), Paragraph.ALIGN_CENTER, 20)); + datas.add(new PdfBlock("鎴夸环缃戞埧鍦颁骇璇环鍒嗘瀽鎶ュ憡", Fonts.getFont(Fonts.BASIC), Paragraph.ALIGN_LEFT)); + datas.add(new PdfBlock("闄� 浠�", Fonts.getFont(Fonts.TITLE_BOLD), Paragraph.ALIGN_CENTER, 20)); - // 添加走势图 + // 娣诲姞璧板娍鍥� datas.addAll(getTrendsImage(report.getTrends())); - // 类似挂牌房源参考 + // 绫讳技鎸傜墝鎴挎簮鍙傝�� if (report.getHouseBos().size() > 0) { - datas.add(new PdfBlock("类似挂牌房源参考 ", Fonts.getFont(Fonts.TITLE_BOLD), Paragraph.ALIGN_LEFT, 20)); + datas.add(new PdfBlock("绫讳技鎸傜墝鎴挎簮鍙傝�� ", Fonts.getFont(Fonts.TITLE_BOLD), Paragraph.ALIGN_LEFT, 20)); datas.add(new PdfBlock(getSimlarHouseTable(report))); } - // 获取google地图 + // 鑾峰彇google鍦板浘 try { Image image = getImageFromUrl(report.getGoogleMap()); - datas.add(new PdfBlock("分析对象地理位置", Fonts.getFont(Fonts.TITLE_BOLD), Paragraph.ALIGN_LEFT, 20)); + datas.add(new PdfBlock("鍒嗘瀽瀵硅薄鍦扮悊浣嶇疆", Fonts.getFont(Fonts.TITLE_BOLD), Paragraph.ALIGN_LEFT, 20)); datas.add(new PdfBlock(getMapTable(image, 600, 200))); } catch (MalformedURLException e) { e.printStackTrace(); @@ -144,7 +144,7 @@ public class ReportCreator { } /** - * 走势图 + * 璧板娍鍥� * * @param trends * @throws DocumentException @@ -155,7 +155,7 @@ public class ReportCreator { Image image; try { image = getImageFromUrl(trends); - datas.add(new PdfBlock("分析对象房价走势(单位:元)", Fonts.getFont(Fonts.TITLE_BOLD), Paragraph.ALIGN_LEFT, 20)); + datas.add(new PdfBlock("鍒嗘瀽瀵硅薄鎴夸环璧板娍(鍗曚綅锛氬厓)", Fonts.getFont(Fonts.TITLE_BOLD), Paragraph.ALIGN_LEFT, 20)); datas.add(new PdfBlock(getMapTable(image, 500, 200))); return datas; } catch (BadElementException e) { @@ -168,7 +168,7 @@ public class ReportCreator { } /** - * 获取地图表格配置 + * 鑾峰彇鍦板浘琛ㄦ牸閰嶇疆 * * @param image * @return @@ -189,15 +189,15 @@ public class ReportCreator { int[] widths = { 20, 15, 20, 20, 25 }; PdfPTable tab = getTable(5, 10, widths); - PdfBlock subFirst3 = new PdfBlock("小区名", textFont, Paragraph.ALIGN_LEFT, 10); + PdfBlock subFirst3 = new PdfBlock("灏忓尯鍚�", textFont, Paragraph.ALIGN_LEFT, 10); PdfPCell cell = new PdfPCell(subFirst3.toParagraph()); cell.setColspan(1); cell.setRowspan(1); tab.addCell(cell); - tab.addCell(new Phrase("房型", textFont)); - tab.addCell(new Phrase("面积(平米)", textFont)); - tab.addCell(new Phrase("挂牌单价(元)", textFont)); - tab.addCell(new Phrase("挂牌总价(万元)", textFont)); + tab.addCell(new Phrase("鎴垮瀷", textFont)); + tab.addCell(new Phrase("闈㈢Н(骞崇背)", textFont)); + tab.addCell(new Phrase("鎸傜墝鍗曚环(鍏�)", textFont)); + tab.addCell(new Phrase("鎸傜墝鎬讳环(涓囧厓)", textFont)); for (HouseBo houseBo : report.getHouseBos()) { PdfPCell houseCell = new PdfPCell(new Phrase(houseBo.getHouse().getDistrictName(), textFont)); cell.setRowspan(1); @@ -212,7 +212,7 @@ public class ReportCreator { int price = (int) Math.floor((houseBo.getHouse().getTotalPrice() / houseBo.getHouse().getArea())); if (room + hall > 0) { - tab.addCell(new PdfPCell(new Phrase(room + "室" + hall + "厅", textFont))); + tab.addCell(new PdfPCell(new Phrase(room + "瀹�" + hall + "鍘�", textFont))); } else { tab.addCell(new PdfPCell(new Phrase("", textFont))); } @@ -251,33 +251,33 @@ public class ReportCreator { private List getHomePage(Report report) throws IOException, DocumentException { List datas = new ArrayList(6); - datas.add(new PdfBlock("房价网房地产询价分析报告", Fonts.getFont(Fonts.BASIC), Paragraph.ALIGN_LEFT)); - datas.add(new PdfBlock("房价网专业房产分析报告", Fonts.getFont(Fonts.MAIN_TITLE), Paragraph.ALIGN_CENTER, 100)); - datas.add(new PdfBlock(report.getEvaluationName() + " 住宅房地产", Fonts.getFont(Fonts.TITLE), Paragraph.ALIGN_CENTER, 10)); - datas.add(new PdfBlock("询价服务提供方:" + report.getReportAuto(), Fonts.getFont(Fonts.TEXT), Paragraph.ALIGN_LEFT, 250, 150)); - datas.add(new PdfBlock("询价分析日期:" + report.getReportDate(), Fonts.getFont(Fonts.TEXT), Paragraph.ALIGN_LEFT, 10, 150)); - datas.add(new PdfBlock("询价报告编号:" + report.getReportNo(), Fonts.getFont(Fonts.TEXT), Paragraph.ALIGN_LEFT, 10, 150)); + datas.add(new PdfBlock("鎴夸环缃戞埧鍦颁骇璇环鍒嗘瀽鎶ュ憡", Fonts.getFont(Fonts.BASIC), Paragraph.ALIGN_LEFT)); + datas.add(new PdfBlock("鎴夸环缃戜笓涓氭埧浜у垎鏋愭姤鍛�", Fonts.getFont(Fonts.MAIN_TITLE), Paragraph.ALIGN_CENTER, 100)); + datas.add(new PdfBlock(report.getEvaluationName() + " 浣忓畢鎴垮湴浜�", Fonts.getFont(Fonts.TITLE), Paragraph.ALIGN_CENTER, 10)); + datas.add(new PdfBlock("璇环鏈嶅姟鎻愪緵鏂癸細" + report.getReportAuto(), Fonts.getFont(Fonts.TEXT), Paragraph.ALIGN_LEFT, 250, 150)); + datas.add(new PdfBlock("璇环鍒嗘瀽鏃ユ湡锛�" + report.getReportDate(), Fonts.getFont(Fonts.TEXT), Paragraph.ALIGN_LEFT, 10, 150)); + datas.add(new PdfBlock("璇环鎶ュ憡缂栧彿锛�" + report.getReportNo(), Fonts.getFont(Fonts.TEXT), Paragraph.ALIGN_LEFT, 10, 150)); return datas; } private List getSecondPage(Report report) throws DocumentException, IOException { List datas = new ArrayList(12); - datas.add(new PdfBlock("房价网房地产询价分析报告", Fonts.getFont(Fonts.BASIC), Paragraph.ALIGN_LEFT)); - datas.add(new PdfBlock("房价网专业房产分析报告", Fonts.getFont(Fonts.MAIN_TITLE), Paragraph.ALIGN_CENTER, 10)); - PdfBlock text1 = new PdfBlock("根据您的询价申请,本网站利用专有技术对", Fonts.getFont(Fonts.TEXT), Paragraph.ALIGN_LEFT, 10, 20); + datas.add(new PdfBlock("鎴夸环缃戞埧鍦颁骇璇环鍒嗘瀽鎶ュ憡", Fonts.getFont(Fonts.BASIC), Paragraph.ALIGN_LEFT)); + datas.add(new PdfBlock("鎴夸环缃戜笓涓氭埧浜у垎鏋愭姤鍛�", Fonts.getFont(Fonts.MAIN_TITLE), Paragraph.ALIGN_CENTER, 10)); + PdfBlock text1 = new PdfBlock("鏍规嵁鎮ㄧ殑璇环鐢宠锛屾湰缃戠珯鍒╃敤涓撴湁鎶�鏈", Fonts.getFont(Fonts.TEXT), Paragraph.ALIGN_LEFT, 10, 20); PdfBlock text2 = new PdfBlock(" " + report.getEvaluationName(), Fonts.getFont(Fonts.TEXT_BOLD), Paragraph.ALIGN_LEFT); - PdfBlock text3 = new PdfBlock("房地产之价格和相关信息进行了分析和测算,最终确定本询价分析结果。", Fonts.getFont(Fonts.TEXT), Paragraph.ALIGN_LEFT); - datas.add(new PdfBlock("尊敬的用户:", Fonts.getFont(Fonts.TITLE_BOLD), Paragraph.ALIGN_LEFT, 30)); + PdfBlock text3 = new PdfBlock("鎴垮湴浜т箣浠锋牸鍜岀浉鍏充俊鎭繘琛屼簡鍒嗘瀽鍜屾祴绠楋紝鏈�缁堢‘瀹氭湰璇环鍒嗘瀽缁撴灉銆�", Fonts.getFont(Fonts.TEXT), Paragraph.ALIGN_LEFT); + datas.add(new PdfBlock("灏婃暚鐨勭敤鎴凤細", Fonts.getFont(Fonts.TITLE_BOLD), Paragraph.ALIGN_LEFT, 30)); datas.add(text1.append(text2).append(text3)); - datas.add(new PdfBlock("分析对象:" + report.getEvaluationName(), Fonts.getFont(Fonts.TEXT), Paragraph.ALIGN_LEFT, 20)); - datas.add(new PdfBlock("房价网测算总价:人民币 " + report.getTotalPiceCn() + "整 (RMB " + report.getTotalPrice() + "万元)", Fonts + datas.add(new PdfBlock("鍒嗘瀽瀵硅薄锛�" + report.getEvaluationName(), Fonts.getFont(Fonts.TEXT), Paragraph.ALIGN_LEFT, 20)); + datas.add(new PdfBlock("鎴夸环缃戞祴绠楁�讳环锛氫汉姘戝竵 " + report.getTotalPiceCn() + "鏁� (RMB " + report.getTotalPrice() + "涓囧厓)", Fonts .getFont(Fonts.TEXT), Paragraph.ALIGN_LEFT, 10)); - datas.add(new PdfBlock("房价网测算单价:人民币 " + report.getPriceCn() + "整 (RMB " + report.getPrice() + "元/平方米)", Fonts + datas.add(new PdfBlock("鎴夸环缃戞祴绠楀崟浠凤細浜烘皯甯� " + report.getPriceCn() + "鏁� (RMB " + report.getPrice() + "鍏�/骞虫柟绫�)", Fonts .getFont(Fonts.TEXT), Paragraph.ALIGN_LEFT, 10)); - datas.add(new PdfBlock("以" + report.getReportDate() + " 为询价时点,分析对象各项分析测算数据如下: ", Fonts.getFont(Fonts.TEXT), + datas.add(new PdfBlock("浠�" + report.getReportDate() + " 涓鸿浠锋椂鐐癸紝鍒嗘瀽瀵硅薄鍚勯」鍒嗘瀽娴嬬畻鏁版嵁濡備笅锛� ", Fonts.getFont(Fonts.TEXT), Paragraph.ALIGN_LEFT, 10)); - datas.add(new PdfBlock("分析对象座落:" + report.getDistrictName(), Fonts.getFont(Fonts.TEXT), Paragraph.ALIGN_LEFT, 10)); - datas.add(new PdfBlock("分析对象状况:", Fonts.getFont(Fonts.TEXT), Paragraph.ALIGN_LEFT)); + datas.add(new PdfBlock("鍒嗘瀽瀵硅薄搴ц惤锛�" + report.getDistrictName(), Fonts.getFont(Fonts.TEXT), Paragraph.ALIGN_LEFT, 10)); + datas.add(new PdfBlock("鍒嗘瀽瀵硅薄鐘跺喌锛�", Fonts.getFont(Fonts.TEXT), Paragraph.ALIGN_LEFT)); datas.add(new PdfBlock(getEvaluationInfoTable(report))); datas.add(new PdfBlock(report.getEvaluationDescription(), Fonts.getFont(Fonts.TEXT), Paragraph.ALIGN_LEFT, 10, 20)); return datas; @@ -285,18 +285,18 @@ public class ReportCreator { private List getThirdPage(Report report) throws DocumentException, IOException { List datas = new ArrayList(2); - datas.add(new PdfBlock("房价网房地产询价分析报告", Fonts.getFont(Fonts.BASIC), Paragraph.ALIGN_LEFT)); + datas.add(new PdfBlock("鎴夸环缃戞埧鍦颁骇璇环鍒嗘瀽鎶ュ憡", Fonts.getFont(Fonts.BASIC), Paragraph.ALIGN_LEFT)); datas .add(new PdfBlock( - "特别说明\n" - + "1、 本报告分析结果是根据您提交的分析对象实际情况,包括面积、楼层、朝向、装修状况等各种可能影响房价的因素,结合对同一楼盘在售房源的挂牌价格以及同类型楼盘的近期实际成交价格,用科学的统计理论和数学模型算法,最终确定的技术产品,因此区别于传统意义和法律意义上的“房产评估报告。\n" - + "2、 本报告分析结果遵循合法原则、最高最佳使用原则、替代原则、估价时点原则,站在中立的立场上对影响分析对象价格或价值的因素进行客观的介绍、分析和评论,是本网站专有技术运用的结果,与分析对象及有关当事人没有利害关系,也不持任何偏见。\n" - + "3、 本网站强调:受到本报告已说明的假设和限制条件的限制,其分析结果只是或然的,仅是关于目前同类标的物市场平均价格的研究分析,仅用于参考和学术研究之目的,不具有法律效力,且不鼓励使用于商业用途。任何需要具有法律效力之房产评估结论的用户,可与专业评估机构联系或通过本网站有关窗口由本网站代为联系处理。\n" - + "4、 本网站可能对打印本报告的用户收取一定的网络服务成本费用。从询价报告本身价值而言,其具有较高的学术研究和经济价值,因此,本网站和用户之间不具有等价交换关系,本报告的出具仅为本网站提高用户体验之功能。\n\n\n" - + "假设和限制条件\n" - + "1、 本网站没有对分析对象进行现场勘察。也未要求询价用户提供分析对象的权属、面积和用途等书面资料。本报告显示的分析对象的座落、面积、朝向、楼层等详细信息均由询价用户自行输入提供,本网站不对该些信息资料的真实性、合法性和完整性负责。\n" - + "2、 在本网站进行的这种由一些关键因素形成房产估值的过程中,存在着大量的可变因素,任何可变因素的变化,均可能对分析对象的分析测算结果产生巨大影响,因此,本网站提请询价用户使用本分析报告时需要对这些因素加以关注。\n" - + "3、 本网站享有本分析报告的知识产权,用户应在其使用的显著位置标明其具体出处。未经本网站许可,本报告不得向第三人提供或用于其它用途,也不得将报告的全部或部分内容不得发表于任何公开媒体上。\n", + "鐗瑰埆璇存槑\n" + + "1銆� 鏈姤鍛婂垎鏋愮粨鏋滄槸鏍规嵁鎮ㄦ彁浜ょ殑鍒嗘瀽瀵硅薄瀹為檯鎯呭喌锛屽寘鎷潰绉�佹ゼ灞傘�佹湞鍚戙�佽淇姸鍐电瓑鍚勭鍙兘褰卞搷鎴夸环鐨勫洜绱狅紝缁撳悎瀵瑰悓涓�妤肩洏鍦ㄥ敭鎴挎簮鐨勬寕鐗屼环鏍间互鍙婂悓绫诲瀷妤肩洏鐨勮繎鏈熷疄闄呮垚浜や环鏍硷紝鐢ㄧ瀛︾殑缁熻鐞嗚鍜屾暟瀛︽ā鍨嬬畻娉曪紝鏈�缁堢‘瀹氱殑鎶�鏈骇鍝侊紝鍥犳鍖哄埆浜庝紶缁熸剰涔夊拰娉曞緥鎰忎箟涓婄殑鈥滄埧浜ц瘎浼版姤鍛娿�俓n" + + "2銆� 鏈姤鍛婂垎鏋愮粨鏋滈伒寰悎娉曞師鍒欍�佹渶楂樻渶浣充娇鐢ㄥ師鍒欍�佹浛浠e師鍒欍�佷及浠锋椂鐐瑰師鍒欙紝绔欏湪涓珛鐨勭珛鍦轰笂瀵瑰奖鍝嶅垎鏋愬璞′环鏍兼垨浠峰�肩殑鍥犵礌杩涜瀹㈣鐨勪粙缁嶃�佸垎鏋愬拰璇勮锛屾槸鏈綉绔欎笓鏈夋妧鏈繍鐢ㄧ殑缁撴灉锛屼笌鍒嗘瀽瀵硅薄鍙婃湁鍏冲綋浜嬩汉娌℃湁鍒╁鍏崇郴锛屼篃涓嶆寔浠讳綍鍋忚銆俓n" + + "3銆� 鏈綉绔欏己璋冿細鍙楀埌鏈姤鍛婂凡璇存槑鐨勫亣璁惧拰闄愬埗鏉′欢鐨勯檺鍒讹紝鍏跺垎鏋愮粨鏋滃彧鏄垨鐒剁殑锛屼粎鏄叧浜庣洰鍓嶅悓绫绘爣鐨勭墿甯傚満骞冲潎浠锋牸鐨勭爺绌跺垎鏋愶紝浠呯敤浜庡弬鑰冨拰瀛︽湳鐮旂┒涔嬬洰鐨勶紝涓嶅叿鏈夋硶寰嬫晥鍔涳紝涓斾笉榧撳姳浣跨敤浜庡晢涓氱敤閫斻�備换浣曢渶瑕佸叿鏈夋硶寰嬫晥鍔涗箣鎴夸骇璇勪及缁撹鐨勭敤鎴凤紝鍙笌涓撲笟璇勪及鏈烘瀯鑱旂郴鎴栭�氳繃鏈綉绔欐湁鍏崇獥鍙g敱鏈綉绔欎唬涓鸿仈绯诲鐞嗐�俓n" + + "4銆� 鏈綉绔欏彲鑳藉鎵撳嵃鏈姤鍛婄殑鐢ㄦ埛鏀跺彇涓�瀹氱殑缃戠粶鏈嶅姟鎴愭湰璐圭敤銆備粠璇环鎶ュ憡鏈韩浠峰�艰�岃█锛屽叾鍏锋湁杈冮珮鐨勫鏈爺绌跺拰缁忔祹浠峰�硷紝鍥犳锛屾湰缃戠珯鍜岀敤鎴蜂箣闂翠笉鍏锋湁绛変环浜ゆ崲鍏崇郴锛屾湰鎶ュ憡鐨勫嚭鍏蜂粎涓烘湰缃戠珯鎻愰珮鐢ㄦ埛浣撻獙涔嬪姛鑳姐�俓n\n\n" + + "鍋囪鍜岄檺鍒舵潯浠禱n" + + "1銆� 鏈綉绔欐病鏈夊鍒嗘瀽瀵硅薄杩涜鐜板満鍕樺療銆備篃鏈姹傝浠风敤鎴锋彁渚涘垎鏋愬璞$殑鏉冨睘銆侀潰绉拰鐢ㄩ�旂瓑涔﹂潰璧勬枡銆傛湰鎶ュ憡鏄剧ず鐨勫垎鏋愬璞$殑搴ц惤銆侀潰绉�佹湞鍚戙�佹ゼ灞傜瓑璇︾粏淇℃伅鍧囩敱璇环鐢ㄦ埛鑷杈撳叆鎻愪緵锛屾湰缃戠珯涓嶅璇ヤ簺淇℃伅璧勬枡鐨勭湡瀹炴�с�佸悎娉曟�у拰瀹屾暣鎬ц礋璐c�俓n" + + "2銆� 鍦ㄦ湰缃戠珯杩涜鐨勮繖绉嶇敱涓�浜涘叧閿洜绱犲舰鎴愭埧浜т及鍊肩殑杩囩▼涓紝瀛樺湪鐫�澶ч噺鐨勫彲鍙樺洜绱狅紝浠讳綍鍙彉鍥犵礌鐨勫彉鍖栵紝鍧囧彲鑳藉鍒嗘瀽瀵硅薄鐨勫垎鏋愭祴绠楃粨鏋滀骇鐢熷法澶у奖鍝嶏紝鍥犳锛屾湰缃戠珯鎻愯璇环鐢ㄦ埛浣跨敤鏈垎鏋愭姤鍛婃椂闇�瑕佸杩欎簺鍥犵礌鍔犱互鍏虫敞銆俓n" + + "3銆� 鏈綉绔欎韩鏈夋湰鍒嗘瀽鎶ュ憡鐨勭煡璇嗕骇鏉冿紝鐢ㄦ埛搴斿湪鍏朵娇鐢ㄧ殑鏄捐憲浣嶇疆鏍囨槑鍏跺叿浣撳嚭澶勩�傛湭缁忔湰缃戠珯璁稿彲锛屾湰鎶ュ憡涓嶅緱鍚戠涓変汉鎻愪緵鎴栫敤浜庡叾瀹冪敤閫旓紝涔熶笉寰楀皢鎶ュ憡鐨勫叏閮ㄦ垨閮ㄥ垎鍐呭涓嶅緱鍙戣〃浜庝换浣曞叕寮�濯掍綋涓娿�俓n", Fonts.getFont(Fonts.TEXT), Paragraph.ALIGN_LEFT, 20)); return datas; } @@ -304,13 +304,13 @@ public class ReportCreator { private List getFourPage(Report report) throws DocumentException, IOException { List datas = new ArrayList(8); - datas.add(new PdfBlock("房价网房地产询价分析报告", Fonts.getFont(Fonts.BASIC), Paragraph.ALIGN_LEFT)); - datas.add(new PdfBlock("测算结果:", Fonts.getFont(Fonts.TEXT), Paragraph.ALIGN_LEFT, 20)); - datas.add(new PdfBlock("房价网遵循中立、客观、公正的原则,通过周密细致的测算,评估求得分析对象的房地产市场价格如下:", Fonts.getFont(Fonts.TEXT), Paragraph.ALIGN_LEFT, + datas.add(new PdfBlock("鎴夸环缃戞埧鍦颁骇璇环鍒嗘瀽鎶ュ憡", Fonts.getFont(Fonts.BASIC), Paragraph.ALIGN_LEFT)); + datas.add(new PdfBlock("娴嬬畻缁撴灉锛�", Fonts.getFont(Fonts.TEXT), Paragraph.ALIGN_LEFT, 20)); + datas.add(new PdfBlock("鎴夸环缃戦伒寰腑绔嬨�佸瑙傘�佸叕姝g殑鍘熷垯锛岄�氳繃鍛ㄥ瘑缁嗚嚧鐨勬祴绠楋紝璇勪及姹傚緱鍒嗘瀽瀵硅薄鐨勬埧鍦颁骇甯傚満浠锋牸濡備笅锛�", Fonts.getFont(Fonts.TEXT), Paragraph.ALIGN_LEFT, 10)); - datas.add(new PdfBlock("房价网测算总价:人民币 " + report.getTotalPiceCn() + "整(RMB" + report.getTotalPrice() + "万元)", Fonts + datas.add(new PdfBlock("鎴夸环缃戞祴绠楁�讳环锛氫汉姘戝竵 " + report.getTotalPiceCn() + "鏁�(RMB" + report.getTotalPrice() + "涓囧厓)", Fonts .getFont(Fonts.TITLE), Paragraph.ALIGN_LEFT, 10)); - datas.add(new PdfBlock("房价网测算单价:人民币 " + report.getPriceCn() + "整(RMB" + report.getPrice() + "元/平方米)", Fonts + datas.add(new PdfBlock("鎴夸环缃戞祴绠楀崟浠凤細浜烘皯甯� " + report.getPriceCn() + "鏁�(RMB" + report.getPrice() + "鍏�/骞虫柟绫�)", Fonts .getFont(Fonts.TITLE), Paragraph.ALIGN_LEFT, 10)); PdfPTable logoTable = getTable(1, 200); @@ -327,7 +327,7 @@ public class ReportCreator { evaluationDescTable.setTotalWidth(680); PdfPCell cell = new PdfPCell( new PdfBlock( - " 本报告由房价网提供。房价网不保证该询价分析结果绝对正确可靠;对于任何因本报告所作的决定、行动或不行动,以及在信息收集或传达过程中的偏差而引起之损失或损害,本网站概不负责(不论是民事侵权行为责任或合约责任或其他)。版权由本网站全权拥有。", + " 鏈姤鍛婄敱鎴夸环缃戞彁渚涖�傛埧浠风綉涓嶄繚璇佽璇环鍒嗘瀽缁撴灉缁濆姝g‘鍙潬锛涘浜庝换浣曞洜鏈姤鍛婃墍浣滅殑鍐冲畾銆佽鍔ㄦ垨涓嶈鍔紝浠ュ強鍦ㄤ俊鎭敹闆嗘垨浼犺揪杩囩▼涓殑鍋忓樊鑰屽紩璧蜂箣鎹熷け鎴栨崯瀹筹紝鏈綉绔欐涓嶈礋璐o紙涓嶈鏄皯浜嬩镜鏉冭涓鸿矗浠绘垨鍚堢害璐d换鎴栧叾浠栵級銆傜増鏉冪敱鏈綉绔欏叏鏉冩嫢鏈夈��", Fonts.getFont(Fonts.TEXT), Paragraph.ALIGN_LEFT, 10, 20).toParagraph()); cell.setFixedHeight(100); cell.setLeft(10); @@ -340,7 +340,7 @@ public class ReportCreator { } /** - * 从URL中获取图像数据 + * 浠嶶RL涓幏鍙栧浘鍍忔暟鎹� * * @param realPath * @return @@ -358,7 +358,7 @@ public class ReportCreator { } /** - * 从图像bytes中获取Image + * 浠庡浘鍍廱ytes涓幏鍙朓mage * * @param bytes * @return @@ -446,23 +446,23 @@ public class ReportCreator { /** * - * PDF事件处理,动态插入Footer和已经被水印覆盖的文字 + * PDF浜嬩欢澶勭悊锛屽姩鎬佹彃鍏ooter鍜屽凡缁忚姘村嵃瑕嗙洊鐨勬枃瀛� * */ static class HeaderFooter extends PdfPageEventHelper { public void onEndPage(PdfWriter writer, Document document) { try { - // 第4页 水印位置 400px - 500px + // 绗�4椤� 姘村嵃浣嶇疆 400px - 500px if (writer.getPageNumber() == 4) { - ColumnText.showTextAligned(writer.getDirectContent(), Element.ALIGN_LEFT, new Phrase("房价网", Fonts + ColumnText.showTextAligned(writer.getDirectContent(), Element.ALIGN_LEFT, new Phrase("鎴夸环缃�", Fonts .getFont(Fonts.TEXT)), 440, 360, 0); ColumnText.showTextAligned(writer.getDirectContent(), Element.ALIGN_LEFT, new Phrase(DateUtil - .formatByPattern(new Date(), "yyyy年MM月dd日"), Fonts.getFont(Fonts.TEXT)), 420, 340, 0); + .formatByPattern(new Date(), "yyyy骞碝M鏈坉d鏃�"), Fonts.getFont(Fonts.TEXT)), 420, 340, 0); } - ColumnText.showTextAligned(writer.getDirectContent(), Element.ALIGN_CENTER, new Phrase("因为中立,所以公正", Fonts + ColumnText.showTextAligned(writer.getDirectContent(), Element.ALIGN_CENTER, new Phrase("鍥犱负涓珛锛屾墍浠ュ叕姝�", Fonts .getFont(Fonts.FOOTER_BOLD)), 300, 50, 0); - Phrase pFooterOne = new Phrase("若需要注册房产评估机构估价服务,请致电021-62395628(限工作日09:00到18:00) 或登录", Fonts + Phrase pFooterOne = new Phrase("鑻ラ渶瑕佹敞鍐屾埧浜ц瘎浼版満鏋勪及浠锋湇鍔★紝璇疯嚧鐢�021-62395628(闄愬伐浣滄棩09:00鍒�18:00) 鎴栫櫥褰�", Fonts .getFont(Fonts.FOOTER)); pFooterOne.add(new Chunk("http://www.fangjia.com", Fonts.getFont(Fonts.FOOTER))); ColumnText.showTextAligned(writer.getDirectContent(), Element.ALIGN_CENTER, pFooterOne, 300, 38, 0); diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/report/ReportModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/report/ReportModel.java index a1625de28..0b2245fc6 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/report/ReportModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/report/ReportModel.java @@ -4,7 +4,7 @@ import com.fangjia.coresite.model.BaseModel; /** * - * 估价报告Model + * 浼颁环鎶ュ憡Model * */ public class ReportModel extends BaseModel { diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/report/ReportModelAndView.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/report/ReportModelAndView.java index c6838214e..596bfd37d 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/report/ReportModelAndView.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/report/ReportModelAndView.java @@ -4,7 +4,7 @@ import org.sothis.web.mvc.ModelAndViewSupport; /** * - * 估价报告视图 + * 浼颁环鎶ュ憡瑙嗗浘 * */ diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/sitemap/Url.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/sitemap/Url.java index 1edf2e6e7..43856fb35 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/sitemap/Url.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/sitemap/Url.java @@ -8,8 +8,8 @@ public class Url { } - private String loc;// URL链接 - private String priority;// 权重 + private String loc;// URL閾炬帴 + private String priority;// 鏉冮噸 public String getLoc() { return loc; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/suzhouApplyLoanModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/suzhouApplyLoanModel.java index 995281e88..5832c182f 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/suzhouApplyLoanModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/suzhouApplyLoanModel.java @@ -4,54 +4,54 @@ public class suzhouApplyLoanModel extends BaseModel{ private static final long serialVersionUID = 1L; - //小区名 + //灏忓尯鍚� private String name; - //地址 + //鍦板潃 private String address; - //总价 + //鎬讳环 private long totalPrice; - //面积 + //闈㈢Н private Double area; - //均价 + //鍧囦环 private Integer avgPrice; - //贷款id + //璐锋id private String productId; - //申请贷款页面来源 + //鐢宠璐锋椤甸潰鏉ユ簮 private String source; - //贷款类型 + //璐锋绫诲瀷 private String loanType; - //上一页面链接 + //涓婁竴椤甸潰閾炬帴 private String backUrl; - //手机号 + //鎵嬫満鍙� private String mobile; - //最高可贷金额 + //鏈�楂樺彲璐烽噾棰� private long maxLoanMoney; - //楼栋号 + //妤兼爧鍙� private String houseNum; - //室号 + //瀹ゅ彿 private String roomNum; //appId private String appId; - //用户id + //鐢ㄦ埛id private String uid; - //跳转链接url + //璺宠浆閾炬帴url private String url; - //贷款广告 + //璐锋骞垮憡 private Integer laonAd; public Integer getLaonAd() { @@ -86,13 +86,13 @@ public class suzhouApplyLoanModel extends BaseModel{ this.showHistory = showHistory; } - //有房下载 + //鏈夋埧涓嬭浇 private Integer youfangDownload; - //有房文字标识 + //鏈夋埧鏂囧瓧鏍囪瘑 private Integer youfangRemark; - //显示评估历史 + //鏄剧ず璇勪及鍘嗗彶 private Integer showHistory; public String getHouseNum() { diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/suzhouEvalResultModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/suzhouEvalResultModel.java index eb2f9640b..bcd546062 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/suzhouEvalResultModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/suzhouEvalResultModel.java @@ -6,10 +6,10 @@ public class suzhouEvalResultModel extends BaseModel { private String id; private String houseNum; private String roomNum; - private String uid;//用户id + private String uid;//鐢ㄦ埛id private String region; - private String lat;// 经纬度字段 + private String lat;// 缁忕含搴﹀瓧娈� private String lng; private Double latD; private Double lngD; @@ -18,122 +18,122 @@ public class suzhouEvalResultModel extends BaseModel { private Integer avgPrice; private String estateType; /** - * 小区名 + * 灏忓尯鍚� */ private String districtName; /** - * 室 + * 瀹� */ private Integer room; /** - * 面积 + * 闈㈢Н */ private Double houseArea; /** - * 所在楼层 + * 鎵�鍦ㄦゼ灞� */ private Integer floor; - //单元 + //鍗曞厓 private String unitNum; /** - * 总楼层 + * 鎬绘ゼ灞� */ private Integer height; - //小区年涨幅 + //灏忓尯骞存定骞� private Double oneYearUpDownRange; - //上月参考均价 + //涓婃湀鍙傝�冨潎浠� private Integer topMonthAvgPrice; - //当前估价时间的周均价 + //褰撳墠浼颁环鏃堕棿鐨勫懆鍧囦环 private Integer weekAvgPrice; - //于上周相比的涨跌幅(%) + //浜庝笂鍛ㄧ浉姣旂殑娑ㄨ穼骞咃紙%锛� private int topWeekUpDownRange; - //上个月月份 + //涓婁釜鏈堟湀浠� private Integer topMonth; - //涨跌幅在城市排名(%) + //娑ㄨ穼骞呭湪鍩庡競鎺掑悕锛�%锛� private Double upDownRangecityLevel; - //当前年 + //褰撳墠骞� private String nowYear; - //当前年月日 + //褰撳墠骞存湀鏃� private String nowYearMoth; - //本周涨跌幅 + //鏈懆娑ㄨ穼骞� private int weekendMarkup; /** - * 建筑年代 + * 寤虹瓚骞翠唬 */ private String buildYear; /** - * 城市月涨跌幅 + * 鍩庡競鏈堟定璺屽箙 */ private Double markup; /** - * 链接来源 + * 閾炬帴鏉ユ簮 */ private String source; /** - * 跳转url链接 + * 璺宠浆url閾炬帴 */ private String url; - //贷款广告 + //璐锋骞垮憡 private Integer laonAd; - //结果页贷款广告 + //缁撴灉椤佃捶娆惧箍鍛� private Integer laonAd2; /** - * 用户手机 + * 鐢ㄦ埛鎵嬫満 */ private String mobile; /** - * 姓名 + * 濮撳悕 */ private String name; /** - * 评估目的 + * 璇勪及鐩殑 */ private String purpose; /** - * 验证码 + * 楠岃瘉鐮� */ private String smsCode; /** - * 评估id + * 璇勪及id */ private String evalId; /** - * 贷款类型 + * 璐锋绫诲瀷 */ private String loanType; /** - * 渠道名称 + * 娓犻亾鍚嶇О */ private String leads_source; - //版权配置信息编号 + //鐗堟潈閰嶇疆淇℃伅缂栧彿 private String stype; public Integer getLaonAd() { @@ -168,13 +168,13 @@ public class suzhouEvalResultModel extends BaseModel { this.showHistory = showHistory; } - //有房下载 + //鏈夋埧涓嬭浇 private Integer youfangDownload; - //有房文字标识 + //鏈夋埧鏂囧瓧鏍囪瘑 private Integer youfangRemark; - //显示评估历史 + //鏄剧ず璇勪及鍘嗗彶 private Integer showHistory; public double getMinMonthInterestRate() { @@ -185,7 +185,7 @@ public class suzhouEvalResultModel extends BaseModel { this.minMonthInterestRate = minMonthInterestRate; } - //贷款最小利率 + //璐锋鏈�灏忓埄鐜� private double minMonthInterestRate; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/user/BindMobileModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/user/BindMobileModel.java index 5e610a9f3..9832c91f7 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/user/BindMobileModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/user/BindMobileModel.java @@ -2,9 +2,9 @@ package com.fangjia.coresite.model.user; import com.fangjia.coresite.model.BaseModel; /** - * 绑定手机 + * 缁戝畾鎵嬫満 * @author yinjihuan - * @date 2016年5月11日 + * @date 2016骞�5鏈�11鏃� * */ public class BindMobileModel extends BaseModel { diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/user/FangjiaUserModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/user/FangjiaUserModel.java index 6fe18b9b8..3264cf93f 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/user/FangjiaUserModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/user/FangjiaUserModel.java @@ -7,7 +7,7 @@ import com.fangjia.dal.mongo.fangjia.model.FangJiaUser; import com.fangjia.dal.mongo.model.Evaluation; /** - * 房价网用户 + * 鎴夸环缃戠敤鎴� * @author yinjihuan * */ @@ -17,41 +17,41 @@ public class FangjiaUserModel extends BaseModel { private FangJiaUser user; /** - * 估价记录 + * 浼颁环璁板綍 */ private List evalList; /** - * 姓名 + * 濮撳悕 */ private String uname; /** - * 用户类型(0表示个人,1表示企业) + * 鐢ㄦ埛绫诲瀷(0琛ㄧず涓汉锛�1琛ㄧず浼佷笟锛� */ private int type = 0; /** - * 邮箱 + * 閭 */ private String email; /** - * 手机 + * 鎵嬫満 */ private String newMobile; /** - * 短信验证码 + * 鐭俊楠岃瘉鐮� */ private String smsCode; /** - * 新密码 + * 鏂板瘑鐮� */ private String newPass; - //图片验证码或者短信验证码 + //鍥剧墖楠岃瘉鐮佹垨鑰呯煭淇¢獙璇佺爜 private String code; private String codeToken; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/user/Message.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/user/Message.java index f282aed4f..35e42a4ab 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/user/Message.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/user/Message.java @@ -2,7 +2,7 @@ package com.fangjia.coresite.model.user; public class Message { /** - * 短信验证码的使用类型(登录,注册,绑定号码) + * 鐭俊楠岃瘉鐮佺殑浣跨敤绫诲瀷锛堢櫥褰曪紝娉ㄥ唽锛岀粦瀹氬彿鐮侊級 */ public static final String SMS_CODE_TYPE_LOGIN = "login"; public static final String SMS_CODE_TYPE_REG = "register"; @@ -16,37 +16,37 @@ public class Message { public static final String RESULT_SUCCESS = "success"; - public static final String PARAM_NOT_NULL = "请将信息输入完整"; + public static final String PARAM_NOT_NULL = "璇峰皢淇℃伅杈撳叆瀹屾暣"; - public static final String SMS_CODE_SEND_FAIL = "短信验证码发送失败"; + public static final String SMS_CODE_SEND_FAIL = "鐭俊楠岃瘉鐮佸彂閫佸け璐�"; - public static final String SMS_CODE_SEND_FAIL_TIME = "操作太频繁"; + public static final String SMS_CODE_SEND_FAIL_TIME = "鎿嶄綔澶绻�"; - public static final String MIBILE_FORMAT = "手机号码不正确"; + public static final String MIBILE_FORMAT = "鎵嬫満鍙风爜涓嶆纭�"; - public static final String PASS_REPEAT = "2次密码输入不一致"; + public static final String PASS_REPEAT = "2娆″瘑鐮佽緭鍏ヤ笉涓�鑷�"; - public static final String MOBILE_NOT_SEND_CODE = "此号码没发过验证码"; + public static final String MOBILE_NOT_SEND_CODE = "姝ゅ彿鐮佹病鍙戣繃楠岃瘉鐮�"; - public static final String CODE_ERROR = "输入的验证码不正确,请重新输入"; + public static final String CODE_ERROR = "杈撳叆鐨勯獙璇佺爜涓嶆纭紝璇烽噸鏂拌緭鍏�"; - public static final String ACCOUNT_EXISTS = "该账户已存在"; + public static final String ACCOUNT_EXISTS = "璇ヨ处鎴峰凡瀛樺湪"; - public static final String ACCOUNT_NOT_EXISTS = "该账户不存在,请先注册"; + public static final String ACCOUNT_NOT_EXISTS = "璇ヨ处鎴蜂笉瀛樺湪锛岃鍏堟敞鍐�"; - public static final String ACCOUNT_SAVE_FAIL = "用户信息保存失败"; + public static final String ACCOUNT_SAVE_FAIL = "鐢ㄦ埛淇℃伅淇濆瓨澶辫触"; - public static final String LOGIN_FAIL = "账号/密码错误"; + public static final String LOGIN_FAIL = "璐﹀彿/瀵嗙爜閿欒"; - public static final String NOT_BIND_MOBILE = "没有绑定手机"; + public static final String NOT_BIND_MOBILE = "娌℃湁缁戝畾鎵嬫満"; - public static final String IMG_CODE_ERROR = "输入的图形码不正确,请重新输入"; + public static final String IMG_CODE_ERROR = "杈撳叆鐨勫浘褰㈢爜涓嶆纭紝璇烽噸鏂拌緭鍏�"; - public static final String NOT_SET_PAY_PASSWORD = "未设置支付密码"; + public static final String NOT_SET_PAY_PASSWORD = "鏈缃敮浠樺瘑鐮�"; - public static final String PAY_PASSWORD_ERROR = "支付密码错误,请重新输入"; + public static final String PAY_PASSWORD_ERROR = "鏀粯瀵嗙爜閿欒锛岃閲嶆柊杈撳叆"; - public static final String NOT_LOGIN = "请先进行登录"; + public static final String NOT_LOGIN = "璇峰厛杩涜鐧诲綍"; - public static final String MOBILE_EXISTS_ERROR = "该号码已经存在于我们的系统中"; + public static final String MOBILE_EXISTS_ERROR = "璇ュ彿鐮佸凡缁忓瓨鍦ㄤ簬鎴戜滑鐨勭郴缁熶腑"; } diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/user/SendCodeJsonModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/user/SendCodeJsonModel.java index 2e2ca92d8..284b543a6 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/user/SendCodeJsonModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/user/SendCodeJsonModel.java @@ -3,9 +3,9 @@ package com.fangjia.coresite.model.user; import org.sothis.web.mvc.ModelAndViewSupport; /** - * 发送验证码返回JSON数据 + * 鍙戦�侀獙璇佺爜杩斿洖JSON鏁版嵁 * @author yinjihuan - * @date 2016年5月10日 + * @date 2016骞�5鏈�10鏃� * */ public class SendCodeJsonModel extends ModelAndViewSupport { @@ -18,7 +18,7 @@ public class SendCodeJsonModel extends ModelAndViewSupport { } /** - * 发送结果(success:成功 fail:失败) + * 鍙戦�佺粨鏋滐紙success:鎴愬姛 fail:澶辫触锛� */ private String result; private String msg; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/user/SendCodeModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/user/SendCodeModel.java index a2cb83945..de30b7e89 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/user/SendCodeModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/user/SendCodeModel.java @@ -3,20 +3,20 @@ package com.fangjia.coresite.model.user; import com.fangjia.coresite.model.BaseModel; /** - * 发送验证码 + * 鍙戦�侀獙璇佺爜 * @author yinjihuan - * @date 2016年5月10日 + * @date 2016骞�5鏈�10鏃� * */ public class SendCodeModel extends BaseModel { private static final long serialVersionUID = 4443755009679445709L; /** - * 类型(login:登录 register:注册 bindmobile:绑定手机,leaveMessage:联系我们留言) + * 绫诲瀷锛坙ogin:鐧诲綍 register:娉ㄥ唽 bindmobile:缁戝畾鎵嬫満,leaveMessage:鑱旂郴鎴戜滑鐣欒█锛� */ private String type; /** - * 手机号 + * 鎵嬫満鍙� */ private String mobile; private String codeToken; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/user/UserLoginModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/user/UserLoginModel.java index 70c42a263..51688c483 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/user/UserLoginModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/user/UserLoginModel.java @@ -6,13 +6,13 @@ public class UserLoginModel extends BaseModel { private static final long serialVersionUID = -6691753727056036214L; - //手机或者邮箱 + //鎵嬫満鎴栬�呴偖绠� private String username; - //密码 + //瀵嗙爜 private String pass; - //图片验证码或者短信验证码 + //鍥剧墖楠岃瘉鐮佹垨鑰呯煭淇¢獙璇佺爜 private String code; private String codeToken; public void setCodeToken(String codeToken) { diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/user/UserRegJsonModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/user/UserRegJsonModel.java index 6f070a5dc..7b7420862 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/user/UserRegJsonModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/user/UserRegJsonModel.java @@ -2,9 +2,9 @@ package com.fangjia.coresite.model.user; import org.sothis.web.mvc.ModelAndViewSupport; /** - * 用户注册返回JSON + * 鐢ㄦ埛娉ㄥ唽杩斿洖JSON * @author yinjihuan - * @date 2016年3月11日 + * @date 2016骞�3鏈�11鏃� * */ public class UserRegJsonModel extends ModelAndViewSupport { diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/user/UserRegModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/user/UserRegModel.java index 1add03fd1..a0a26996e 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/user/UserRegModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/user/UserRegModel.java @@ -2,32 +2,32 @@ package com.fangjia.coresite.model.user; import com.fangjia.coresite.model.BaseModel; /** - * 用户注册 + * 鐢ㄦ埛娉ㄥ唽 * @author yinjihuan - * @date 2016年3月10日 + * @date 2016骞�3鏈�10鏃� * */ public class UserRegModel extends BaseModel { private static final long serialVersionUID = -1727888008636324544L; /** - * 手机 + * 鎵嬫満 */ private String mobile; /** - * 密码 + * 瀵嗙爜 */ private String pass; /** - * 确认密码 + * 纭瀵嗙爜 */ private String passRepeat; /** - * 验证码 + * 楠岃瘉鐮� */ private String code; /** - * 进入页面生成的ID,防止重复提交 + * 杩涘叆椤甸潰鐢熸垚鐨処D,闃叉閲嶅鎻愪氦 */ private String oid; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/servlet/ChartImgServlet.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/servlet/ChartImgServlet.java index e26a0d42d..d5fbc1437 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/servlet/ChartImgServlet.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/servlet/ChartImgServlet.java @@ -49,7 +49,7 @@ public class ChartImgServlet extends HttpServlet { @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - request.setCharacterEncoding("UTF-8");// 注意编码 + request.setCharacterEncoding("UTF-8");// 娉ㄦ剰缂栫爜 String reqUrl = request.getRequestURI(); String i = reqUrl.substring(reqUrl.indexOf("/cImg/") + 6, reqUrl.length()); @@ -65,7 +65,7 @@ public class ChartImgServlet extends HttpServlet { } Map map = decodeUrl(url); - // 走势图价格类型 0:均价;1:租金;2:成交均价 + // 璧板娍鍥句环鏍肩被鍨� 0锛氬潎浠凤紱1锛氱閲戯紱2锛氭垚浜ゅ潎浠� String priceTypeStr = (String) map.get("pt"); if (StringUtils.isBlank(priceTypeStr) || !StringUtils.isNumeric(priceTypeStr)) { response.sendError(404); @@ -117,7 +117,7 @@ public class ChartImgServlet extends HttpServlet { } /** - * 城市挂牌量、成交量走势图 + * 鍩庡競鎸傜墝閲忋�佹垚浜ら噺璧板娍鍥� * * @throws IOException */ @@ -176,7 +176,7 @@ public class ChartImgServlet extends HttpServlet { } /** - * 租房房型/面积占比饼图 + * 绉熸埧鎴垮瀷/闈㈢Н鍗犳瘮楗煎浘 * * @throws IOException */ @@ -214,10 +214,10 @@ public class ChartImgServlet extends HttpServlet { imgType = "jpg"; } - if (StringUtils.contains(estateType, "别墅")) { - estateType = "别墅"; + if (StringUtils.contains(estateType, "鍒")) { + estateType = "鍒"; } else { - estateType = "小区"; + estateType = "灏忓尯"; } Date now = new Date(); @@ -241,7 +241,7 @@ public class ChartImgServlet extends HttpServlet { } /** - * 均价排行榜柱状图 + * 鍧囦环鎺掕姒滄煴鐘跺浘 * * @throws IOException */ @@ -280,10 +280,10 @@ public class ChartImgServlet extends HttpServlet { imgType = "jpg"; } - if (StringUtils.contains(estateType, "别墅")) { - estateType = "别墅"; + if (StringUtils.contains(estateType, "鍒")) { + estateType = "鍒"; } else { - estateType = "小区"; + estateType = "灏忓尯"; } if(dataType.equals("1")){ @@ -307,7 +307,7 @@ public class ChartImgServlet extends HttpServlet { } /** - * 走势预测 + * 璧板娍棰勬祴 * * @throws IOException */ @@ -344,10 +344,10 @@ public class ChartImgServlet extends HttpServlet { imgType = "jpg"; } - if (StringUtils.contains(estateType, "别墅")) { - estateType = "别墅"; + if (StringUtils.contains(estateType, "鍒")) { + estateType = "鍒"; } else { - estateType = "小区"; + estateType = "灏忓尯"; } Date now = new Date(); @@ -370,7 +370,7 @@ public class ChartImgServlet extends HttpServlet { } /** - * 成交面积/总价占比饼图 + * 鎴愪氦闈㈢Н/鎬讳环鍗犳瘮楗煎浘 * * @throws IOException */ @@ -408,10 +408,10 @@ public class ChartImgServlet extends HttpServlet { imgType = "jpg"; } - if (StringUtils.contains(estateType, "别墅")) { - estateType = "别墅"; + if (StringUtils.contains(estateType, "鍒")) { + estateType = "鍒"; } else { - estateType = "小区"; + estateType = "灏忓尯"; } Date now = new Date(); @@ -435,7 +435,7 @@ public class ChartImgServlet extends HttpServlet { } /** - * 处理成交均价走势图 + * 澶勭悊鎴愪氦鍧囦环璧板娍鍥� * * @throws IOException */ @@ -496,7 +496,7 @@ public class ChartImgServlet extends HttpServlet { } /** - * 处理租金均价走势图 + * 澶勭悊绉熼噾鍧囦环璧板娍鍥� * * @throws IOException */ @@ -540,10 +540,10 @@ public class ChartImgServlet extends HttpServlet { imgType = "jpg"; } - if (StringUtils.contains(estateType, "别墅")) { - estateType = "别墅"; + if (StringUtils.contains(estateType, "鍒")) { + estateType = "鍒"; } else { - estateType = "小区"; + estateType = "灏忓尯"; } Date now = new Date(); @@ -559,7 +559,7 @@ public class ChartImgServlet extends HttpServlet { } /** - * 处理均价类走势图 + * 澶勭悊鍧囦环绫昏蛋鍔垮浘 * * @throws IOException */ @@ -606,10 +606,10 @@ public class ChartImgServlet extends HttpServlet { imgType = "jpg"; } - if (StringUtils.contains(estateType, "别墅")) { - estateType = "别墅"; + if (StringUtils.contains(estateType, "鍒")) { + estateType = "鍒"; } else { - estateType = "小区"; + estateType = "灏忓尯"; } boolean isUpward = "1".equals(isUpwardStr); diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/servlet/Report2Servlet.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/servlet/Report2Servlet.java index fc200708e..ef2815257 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/servlet/Report2Servlet.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/servlet/Report2Servlet.java @@ -96,7 +96,7 @@ public class Report2Servlet extends HttpServlet { String decodeId = SecurityUtil.decode(id); String filterHouse = req.getParameter("filterHouse"); - boolean isNoTrade = "北京".equals(getEvaCity(decodeId)); + boolean isNoTrade = "鍖椾含".equals(getEvaCity(decodeId)); String baseUri = "http://sh." + CONFIG.getDomainName() + ROOT + "/districtReport/report2?evaluationId=" + id + "&__refresh_cache=1"; if(StringUtils.isNotBlank(filterHouse)){ @@ -111,12 +111,12 @@ public class Report2Servlet extends HttpServlet { document.open(); document.newPage(); - // 封面 + // 灏侀潰 PdfReader reader = new PdfReader(FRONTCOVER_DATA); PdfImportedPage coverPage = copy.getImportedPage(reader, 1); copy.addPage(coverPage); - // 目录 + // 鐩綍 if (isNoTrade) { reader = new PdfReader(DIRECTORY_DATA2); } else { @@ -170,7 +170,7 @@ public class Report2Servlet extends HttpServlet { html = html.replaceAll(" ", " "); renderer.setDocumentFromString(html); - // 解决中文支持题目 + // 瑙e喅涓枃鏀寔棰樼洰 ITextFontResolver fontResolver = renderer.getFontResolver(); for (String path : FONT_PATHS) { fontResolver.addFont(path, BaseFont.IDENTITY_H, BaseFont.NOT_EMBEDDED); @@ -216,7 +216,7 @@ public class Report2Servlet extends HttpServlet { ITextRenderer renderer = new ITextRenderer(35, 20); renderer.setDocumentFromString(html); - // 解决中文支持题目 + // 瑙e喅涓枃鏀寔棰樼洰 ITextFontResolver fontResolver = renderer.getFontResolver(); for (String path : FONT_PATHS) { fontResolver.addFont(path, BaseFont.IDENTITY_H, BaseFont.NOT_EMBEDDED); @@ -269,7 +269,7 @@ public class Report2Servlet extends HttpServlet { if (null != obj) { return obj.get("city").toString(); } - obj = EVALUATION_HISTORY_CONN.findOne(query);//从历史记录中查询 + obj = EVALUATION_HISTORY_CONN.findOne(query);//浠庡巻鍙茶褰曚腑鏌ヨ if(null != obj){ return obj.get("city").toString(); } diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/servlet/Report3Servlet.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/servlet/Report3Servlet.java index 1f1db3e5f..7b130ffd4 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/servlet/Report3Servlet.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/servlet/Report3Servlet.java @@ -97,7 +97,7 @@ public class Report3Servlet extends HttpServlet { String filterHouse = req.getParameter("filterHouse"); String decodeId = SecurityUtil.decode(id); - boolean isNoTrade = "北京".equals(getEvaCity(decodeId)); + boolean isNoTrade = "鍖椾含".equals(getEvaCity(decodeId)); String baseUri = "http://sh." + CONFIG.getDomainName() + ROOT + "/districtReport/report3?evaluationId=" + id + "&__refresh_cache=1"; if(StringUtils.isNotBlank(filterHouse)){ @@ -112,12 +112,12 @@ public class Report3Servlet extends HttpServlet { document.open(); document.newPage(); - // 封面 + // 灏侀潰 PdfReader reader = new PdfReader(FRONTCOVER_DATA); PdfImportedPage coverPage = copy.getImportedPage(reader, 1); copy.addPage(coverPage); - // 目录 + // 鐩綍 if (isNoTrade) { reader = new PdfReader(DIRECTORY_DATA2); } else { @@ -171,7 +171,7 @@ public class Report3Servlet extends HttpServlet { html = html.replaceAll(" ", " "); renderer.setDocumentFromString(html); - // 解决中文支持题目 + // 瑙e喅涓枃鏀寔棰樼洰 ITextFontResolver fontResolver = renderer.getFontResolver(); for (String path : FONT_PATHS) { fontResolver.addFont(path, BaseFont.IDENTITY_H, BaseFont.NOT_EMBEDDED); @@ -217,7 +217,7 @@ public class Report3Servlet extends HttpServlet { ITextRenderer renderer = new ITextRenderer(35, 20); renderer.setDocumentFromString(html); - // 解决中文支持题目 + // 瑙e喅涓枃鏀寔棰樼洰 ITextFontResolver fontResolver = renderer.getFontResolver(); for (String path : FONT_PATHS) { fontResolver.addFont(path, BaseFont.IDENTITY_H, BaseFont.NOT_EMBEDDED); @@ -270,7 +270,7 @@ public class Report3Servlet extends HttpServlet { if (null != obj) { return obj.get("city").toString(); } - obj = EVALUATION_HISTORY_CONN.findOne(query);//从历史记录中查询 + obj = EVALUATION_HISTORY_CONN.findOne(query);//浠庡巻鍙茶褰曚腑鏌ヨ if(null != obj){ return obj.get("city").toString(); } diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/servlet/ReportServlet.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/servlet/ReportServlet.java index ae739e3f2..0510346cc 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/servlet/ReportServlet.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/servlet/ReportServlet.java @@ -58,7 +58,7 @@ public class ReportServlet extends HttpServlet { System.setProperty("javax.xml.transform.TransformerFactory", "com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl"); - // 字体文件 + // 瀛椾綋鏂囦欢 ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); FONT_PATHS.add(classLoader.getResource("districtreport/SIMSUN.TTC").toString()); FONT_PATHS.add(classLoader.getResource("districtreport/MSYH.TTC").toString()); @@ -67,14 +67,14 @@ public class ReportServlet extends HttpServlet { FONT_PATHS.add(classLoader.getResource("districtreport/ARIALBD.TTF").toString()); FONT_PATHS.add(classLoader.getResource("districtreport/ARIALI.TTF").toString()); - // 目录页地址 + // 鐩綍椤靛湴鍧� String directoryPath = "http://sh." + CONFIG.getDomainName() + ROOT + "/districtReport/directory"; DIRECTORY_DATA = getPageData(directoryPath, null); String directoryPath2 = "http://sh." + CONFIG.getDomainName() + ROOT + "/districtReport/directory_a"; DIRECTORY_DATA2 = getPageData(directoryPath2, null); - // 封面页地址 + // 灏侀潰椤靛湴鍧� String coverPath = "http://sh." + CONFIG.getDomainName() + ROOT + "/districtReport/frontcover"; FRONTCOVER_DATA = getPageData(coverPath, null); HTML_CONN = MongoUtils.getDbCollection(Constants.FANGJIA_MONGO_URI, "fangjia", "district_report_html"); @@ -94,7 +94,7 @@ public class ReportServlet extends HttpServlet { String decodeId = SecurityUtil.decode(id); String filterHouse = req.getParameter("filterHouse"); - boolean isNoTrade = "北京".equals(getEvaCity(decodeId)); + boolean isNoTrade = "鍖椾含".equals(getEvaCity(decodeId)); String baseUri = "http://sh." + CONFIG.getDomainName() + ROOT + "/districtReport/report?evaluationId=" + id + "&__refresh_cache=1"; if(StringUtils.isNotBlank(filterHouse)){ @@ -109,12 +109,12 @@ public class ReportServlet extends HttpServlet { document.open(); document.newPage(); - // 封面 + // 灏侀潰 PdfReader reader = new PdfReader(FRONTCOVER_DATA); PdfImportedPage coverPage = copy.getImportedPage(reader, 1); copy.addPage(coverPage); - // 目录 + // 鐩綍 if (isNoTrade) { reader = new PdfReader(DIRECTORY_DATA2); } else { @@ -153,7 +153,7 @@ public class ReportServlet extends HttpServlet { } /** - * 根据页面URL获取内容 + * 鏍规嵁椤甸潰URL鑾峰彇鍐呭 */ private byte[] getPageData(String pagePath, String decodeId) { long start = System.currentTimeMillis(); @@ -171,7 +171,7 @@ public class ReportServlet extends HttpServlet { html = html.replaceAll(" ", " "); renderer.setDocumentFromString(html); - // 解决中文支持问题 + // 瑙e喅涓枃鏀寔闂 ITextFontResolver fontResolver = renderer.getFontResolver(); for (String path : FONT_PATHS) { fontResolver.addFont(path, BaseFont.IDENTITY_H, BaseFont.NOT_EMBEDDED); @@ -229,7 +229,7 @@ public class ReportServlet extends HttpServlet { if (null != obj) { return obj.get("city").toString(); } - obj = EVALUATION_HISTORY_CONN.findOne(query);//从历史记录中查询 + obj = EVALUATION_HISTORY_CONN.findOne(query);//浠庡巻鍙茶褰曚腑鏌ヨ if(null != obj){ return obj.get("city").toString(); } diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/servlet/ReportSplitServlet.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/servlet/ReportSplitServlet.java index b51ca01a1..d03304d03 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/servlet/ReportSplitServlet.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/servlet/ReportSplitServlet.java @@ -61,8 +61,8 @@ public class ReportSplitServlet extends HttpServlet { } StringBuffer sb = new StringBuffer(); - sb.append(evaluation.get("district_name")).append(evaluation.get("house_num")).append("号") - .append(evaluation.get("room_num")).append("室-").append(reportSplit.get("type_desc")); + sb.append(evaluation.get("district_name")).append(evaluation.get("house_num")).append("鍙�") + .append(evaluation.get("room_num")).append("瀹�-").append(reportSplit.get("type_desc")); resp.addHeader("Content-Disposition", "attachment; filename=" + new String(sb.toString().getBytes("GB2312"), "ISO8859-1") + ".url"); resp.setContentType("application/octet-stream;charset=UTF-8"); diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/servlet/SafeCode.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/servlet/SafeCode.java index a4c874077..914fc73ed 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/servlet/SafeCode.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/servlet/SafeCode.java @@ -23,7 +23,7 @@ import com.fangjia.service.fangjia.FangJiaUserService; public class SafeCode extends HttpServlet { private static final long serialVersionUID = 8729414662081043987L; - //产生随即的字体 + //浜х敓闅忓嵆鐨勫瓧浣� private Font getFont() { Random random = new Random(); Font font[] = new Font[5]; @@ -37,44 +37,44 @@ public class SafeCode extends HttpServlet { protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { - // 设置响应头 Content-type类型 + // 璁剧疆鍝嶅簲澶� Content-type绫诲瀷 resp.setContentType("image/jpeg"); - // 以下三句是用于设置页面不缓存 + // 浠ヤ笅涓夊彞鏄敤浜庤缃〉闈笉缂撳瓨 resp.setHeader("Pragma", "No-cache"); resp.setHeader("Cache-Control", "No-cache"); resp.setDateHeader("Expires", 0); OutputStream os = resp.getOutputStream(); int width = 72, height = 30; - // 建立指定宽、高和BufferedImage对象 + // 寤虹珛鎸囧畾瀹姐�侀珮鍜孊ufferedImage瀵硅薄 BufferedImage image = new BufferedImage(width, height,BufferedImage.TYPE_INT_RGB); - Graphics g = image.getGraphics(); // 该画笔画在image上 - Color c = g.getColor(); // 保存当前画笔的颜色,用完画笔后要回复现场 + Graphics g = image.getGraphics(); // 璇ョ敾绗旂敾鍦╥mage涓� + Color c = g.getColor(); // 淇濆瓨褰撳墠鐢荤瑪鐨勯鑹诧紝鐢ㄥ畬鐢荤瑪鍚庤鍥炲鐜板満 g.fillRect(0, 0, width, height); - char[] ch = "abcdefghjkmnpqrstuvwxyz23456789".toCharArray(); // 随即产生的字符串 不包括 i l(小写L) o(小写O) 1(数字1)0(数字0) - int length = ch.length; // 随即字符串的长度 - StringBuilder sRand = new StringBuilder(); // 保存随即产生的字符串 + char[] ch = "abcdefghjkmnpqrstuvwxyz23456789".toCharArray(); // 闅忓嵆浜х敓鐨勫瓧绗︿覆 涓嶅寘鎷� i l(灏忓啓L) o锛堝皬鍐橭锛� 1锛堟暟瀛�1锛�0(鏁板瓧0) + int length = ch.length; // 闅忓嵆瀛楃涓茬殑闀垮害 + StringBuilder sRand = new StringBuilder(); // 淇濆瓨闅忓嵆浜х敓鐨勫瓧绗︿覆 Random random = new Random(); for (int i = 0; i < 4; i++) { - // 设置字体 + // 璁剧疆瀛椾綋 g.setFont(getFont()); - // 随即生成0-9的数字 + // 闅忓嵆鐢熸垚0-9鐨勬暟瀛� String rand = new Character(ch[random.nextInt(length)]).toString(); sRand.append(rand); - // 设置随机颜色 + // 璁剧疆闅忔満棰滆壊 g.setColor(new Color(random.nextInt(255), random.nextInt(255), random.nextInt(255))); g.drawString(rand, 18 * i , 22); } - //产生随即干扰点 + //浜х敓闅忓嵆骞叉壈鐐� for (int i = 0; i < 40; i++) { int x1 = random.nextInt(width); int y1 = random.nextInt(height); g.drawOval(x1, y1, 2, 2); } - g.setColor(c); // 将画笔的颜色再设置回去 + g.setColor(c); // 灏嗙敾绗旂殑棰滆壊鍐嶈缃洖鍘� g.dispose(); String codeToken = getCodeToken(req); String type = req.getParameter("type"); @@ -85,7 +85,7 @@ public class SafeCode extends HttpServlet { } - // 输出图像到页面 + // 杈撳嚭鍥惧儚鍒伴〉闈� ImageIO.write(image, "JPEG", os); } diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/servlet/SvgServlet.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/servlet/SvgServlet.java index 9bf095ebb..f43dadb12 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/servlet/SvgServlet.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/servlet/SvgServlet.java @@ -59,12 +59,12 @@ public class SvgServlet extends HttpServlet { if (StringUtils.isBlank(request.getParameter("svg"))) { return; } - request.setCharacterEncoding("UTF-8");// 注意编码 + request.setCharacterEncoding("UTF-8");// 娉ㄦ剰缂栫爜 String svg = URLDecoder.decode(request.getParameter("svg"), "UTF-8"); - String type = request.getParameter("dType"); // 无值为下载图片,否则是获取图片ID + String type = request.getParameter("dType"); // 鏃犲�间负涓嬭浇鍥剧墖锛屽惁鍒欐槸鑾峰彇鍥剧墖ID if (null == svg) { response.addHeader("Content-Type", "text/html"); - response.getOutputStream().println("没有图片生成"); + response.getOutputStream().println("娌℃湁鍥剧墖鐢熸垚"); return; } @@ -75,18 +75,18 @@ public class SvgServlet extends HttpServlet { + DateUtil.formatToYYYYMMDDhhmmss(DateUtil.getFirstDayOfWeek(new Date()))); DBObject image = fileService.find(url, FileServiceImpl.SIZE_ORIGINAL); if (null != image) { - // 数据库有图片 + // 鏁版嵁搴撴湁鍥剧墖 imgData = (byte[]) image.get("data"); isSaved = true; } else { - // 动态生成 + // 鍔ㄦ�佺敓鎴� svg = svg.replaceAll(":rect", "rect"); imgData = getImgData(svg); } if (null == imgData) { response.addHeader("Content-Type", "text/html"); - response.getOutputStream().println("生成图片错误"); + response.getOutputStream().println("鐢熸垚鍥剧墖閿欒"); return; } @@ -95,9 +95,9 @@ public class SvgServlet extends HttpServlet { } if (StringUtils.isBlank(type)) { - // 默认为下载图片 + // 榛樿涓轰笅杞藉浘鐗� String filename = request.getParameter("filename"); - filename = filename == null ? "房价走势图" : filename; + filename = filename == null ? "鎴夸环璧板娍鍥�" : filename; filename = URLDecoder.decode(filename, "UTF-8"); response.addHeader("Content-Disposition", "attachment; filename=" + URLEncoder.encode(filename, "UTF-8") + "." @@ -113,7 +113,7 @@ public class SvgServlet extends HttpServlet { } /** - * 获取图片数据 + * 鑾峰彇鍥剧墖鏁版嵁 */ private byte[] getImgData(String svg) { Transcoder t = new JPEGTranscoder(); diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/servlet/UploadEvaluationServlet.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/servlet/UploadEvaluationServlet.java index 5da382473..61359c8b9 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/servlet/UploadEvaluationServlet.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/servlet/UploadEvaluationServlet.java @@ -70,25 +70,25 @@ public class UploadEvaluationServlet extends HttpServlet{ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - request.setCharacterEncoding("UTF-8"); //转码 + request.setCharacterEncoding("UTF-8"); //杞爜 response.setContentType("text/html;charset=UTF-8"); - //构造一个文件上传处理对象 + //鏋勯�犱竴涓枃浠朵笂浼犲鐞嗗璞� FileItemFactory factory = new DiskFileItemFactory(); ServletFileUpload upload = new ServletFileUpload(factory); Iterator items; try{ - //解析表单中提交的所有文件内容 + //瑙f瀽琛ㄥ崟涓彁浜ょ殑鎵�鏈夋枃浠跺唴瀹� items = upload.parseRequest(request).iterator(); while(items.hasNext()){ FileItem item = (FileItem) items.next(); if(!item.isFormField()){ - //取出上传文件的文件名称 + //鍙栧嚭涓婁紶鏂囦欢鐨勬枃浠跺悕绉� String name = item.getName(); final String fileType = name.substring(name.lastIndexOf(".")); - //取得上传文件以后的存储路径 + //鍙栧緱涓婁紶鏂囦欢浠ュ悗鐨勫瓨鍌ㄨ矾寰� Workbook workbook=null; InputStream in = item.getInputStream(); @@ -105,7 +105,7 @@ public class UploadEvaluationServlet extends HttpServlet{ Map map = new HashMap(); if(workbook == null){ - map.put("error", "上传类型不匹配!"); + map.put("error", "涓婁紶绫诲瀷涓嶅尮閰嶏紒"); String json = JSONObject.fromObject(map).toString(); response.getWriter().write(json.toString()); response.getWriter().flush(); @@ -138,7 +138,7 @@ public class UploadEvaluationServlet extends HttpServlet{ List> ret = new ArrayList>(); Map infoMap = new HashMap(); - System.out.println(" 共:"+sheet.getLastRowNum()); + System.out.println(" 鍏�:"+sheet.getLastRowNum()); int totalNum = sheet.getLastRowNum(); // if(totalNum>1000){ @@ -237,7 +237,7 @@ public class UploadEvaluationServlet extends HttpServlet{ }catch(Exception e){ e.printStackTrace(); - infoMap.put("error", "格式有问题!"); + infoMap.put("error", "鏍煎紡鏈夐棶棰�!"); } return infoMap; @@ -275,7 +275,7 @@ public class UploadEvaluationServlet extends HttpServlet{ } Workbook workbook = WorkbookFactory.create(in); return workbook; - //throw new IllegalArgumentException("你的excel版本目前poi解析不了"); + //throw new IllegalArgumentException("浣犵殑excel鐗堟湰鐩墠poi瑙f瀽涓嶄簡"); } diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/servlet/UploadHandleServlet.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/servlet/UploadHandleServlet.java index daee9f501..fe7023285 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/servlet/UploadHandleServlet.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/servlet/UploadHandleServlet.java @@ -84,26 +84,26 @@ public class UploadHandleServlet extends HttpServlet{ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - request.setCharacterEncoding("UTF-8"); //转码 + request.setCharacterEncoding("UTF-8"); //杞爜 response.setContentType("text/html;charset=UTF-8"); - //构造一个文件上传处理对象 + //鏋勯�犱竴涓枃浠朵笂浼犲鐞嗗璞� FileItemFactory factory = new DiskFileItemFactory(); ServletFileUpload upload = new ServletFileUpload(factory); Iterator items; try{ - //解析表单中提交的所有文件内容 + //瑙f瀽琛ㄥ崟涓彁浜ょ殑鎵�鏈夋枃浠跺唴瀹� items = upload.parseRequest(request).iterator(); while(items.hasNext()){ FileItem item = (FileItem) items.next(); if(!item.isFormField()){ final String type=request.getParameter("type")==null?"":request.getParameter("type"); - //取出上传文件的文件名称 + //鍙栧嚭涓婁紶鏂囦欢鐨勬枃浠跺悕绉� String name = item.getName(); final String fileType = name.substring(name.lastIndexOf(".")); - //取得上传文件以后的存储路径 + //鍙栧緱涓婁紶鏂囦欢浠ュ悗鐨勫瓨鍌ㄨ矾寰� Workbook workbook=null; @@ -120,8 +120,8 @@ public class UploadHandleServlet extends HttpServlet{ Map map = new HashMap(); if(workbook == null){ - //response.getWriter().print("上传类型不匹配!"); - map.put("error", "上传类型不匹配!"); + //response.getWriter().print("涓婁紶绫诲瀷涓嶅尮閰嶏紒"); + map.put("error", "涓婁紶绫诲瀷涓嶅尮閰嶏紒"); String json = JSONObject.fromObject(map).toString(); response.getWriter().write(json.toString()); response.getWriter().flush(); @@ -132,14 +132,14 @@ public class UploadHandleServlet extends HttpServlet{ final Sheet sheet = workbook.getSheetAt(0); int rownum = sheet.getLastRowNum(); // if(rownum>100){ -// response.getWriter().print("上传数据超过100条!"); +// response.getWriter().print("涓婁紶鏁版嵁瓒呰繃100鏉★紒"); // return; // } String userId = LoginUtil.getUserId(request); final String newName = getFileName(userId, name, type); - //保存任务表 + //淇濆瓨浠诲姟琛� final String taskId = saveTask(newName, rownum, type, userId); map.put("taskId", taskId); @@ -152,7 +152,7 @@ public class UploadHandleServlet extends HttpServlet{ Runnable myRunnable = new Runnable(){ public void run(){ try { - //保存原始数据 + //淇濆瓨鍘熷鏁版嵁 Map infoMap = saveSourceData(sheet, fileType, type, taskId); String info = (String) infoMap.get("info"); if(info.equals("fail")){ @@ -161,7 +161,7 @@ public class UploadHandleServlet extends HttpServlet{ updateTaskStatus(taskId, 0, (Integer)infoMap.get("noStrandCount")); } - //将原始文件保存 + //灏嗗師濮嬫枃浠朵繚瀛� //saveFile(newName, FileServiceImpl.SIZE_ORIGINAL, dataByte, "xls", "address_analy"); } catch (Exception e) { @@ -236,9 +236,9 @@ public class UploadHandleServlet extends HttpServlet{ q.put("user_id", userId); q.put("file_name", Pattern.compile(fileName.substring(0, fileName.lastIndexOf(".")))); if(type.equals("yx")){ - q.put("type", "营销"); + q.put("type", "钀ラ攢"); }else{ - q.put("type", "风控"); + q.put("type", "椋庢帶"); } q.put("remove_status", 0); DBCursor dbCursor = TASKS_CONN.find(q); @@ -252,13 +252,13 @@ public class UploadHandleServlet extends HttpServlet{ private String saveTask(String fileName, int total, String type, String userId){ DBObject dbo = new BasicDBObject(); - dbo.put("status", -1);//上传中 + dbo.put("status", -1);//涓婁紶涓� dbo.put("file_name", fileName); dbo.put("user_id", userId); if(type.equals("yx")){ - dbo.put("type", "营销"); + dbo.put("type", "钀ラ攢"); }else{ - dbo.put("type", "风控"); + dbo.put("type", "椋庢帶"); } dbo.put("total_count", total); dbo.put("remove_status", 0); @@ -273,7 +273,7 @@ public class UploadHandleServlet extends HttpServlet{ private void updateTaskStatus(String taskId, int status,int noStrandCount){ DBObject q = new BasicDBObject(); - q.put("_id",new ObjectId(taskId));//上传中 + q.put("_id",new ObjectId(taskId));//涓婁紶涓� DBObject udata = new BasicDBObject(); udata.put("status", status); @@ -370,9 +370,9 @@ public class UploadHandleServlet extends HttpServlet{ } if(type.equals("yx")){ - dbo.put("type", "营销"); + dbo.put("type", "钀ラ攢"); }else{ - dbo.put("type", "风控"); + dbo.put("type", "椋庢帶"); } i++; @@ -413,6 +413,6 @@ public class UploadHandleServlet extends HttpServlet{ } Workbook workbook = WorkbookFactory.create(in); return workbook; - //throw new IllegalArgumentException("你的excel版本目前poi解析不了"); + //throw new IllegalArgumentException("浣犵殑excel鐗堟湰鐩墠poi瑙f瀽涓嶄簡"); } } diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/CommonUtil.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/CommonUtil.java index 3c94aeaba..db0d30c6e 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/CommonUtil.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/CommonUtil.java @@ -6,15 +6,15 @@ import com.fangjia.dal.datastore.model.House; import com.fangjia.dal.datastore.model.RentHouse; /** - * 普通工具类 + * 鏅�氬伐鍏风被 * * @author liupei */ public final class CommonUtil { /** - * 根据房源获取展示标题 + * 鏍规嵁鎴挎簮鑾峰彇灞曠ず鏍囬 * - * 小区名 室数 厅数 面积 + * 灏忓尯鍚� 瀹ゆ暟 鍘呮暟 闈㈢Н * * @param house * @return @@ -26,23 +26,23 @@ public final class CommonUtil { } if (house.getRoom() != null) { - ret.append(" ").append(house.getRoom()).append("室"); + ret.append(" ").append(house.getRoom()).append("瀹�"); } if (house.getHall() != null) { - ret.append(" ").append(house.getHall()).append("厅"); + ret.append(" ").append(house.getHall()).append("鍘�"); } /*if (house.getArea() != null) { - ret.append(" ").append(Math.round(house.getArea())).append("平米"); + ret.append(" ").append(Math.round(house.getArea())).append("骞崇背"); }*/ return ret.toString(); } /** - * 根据租房获取展示标题 + * 鏍规嵁绉熸埧鑾峰彇灞曠ず鏍囬 * - * 小区名 室数 厅数 面积 + * 灏忓尯鍚� 瀹ゆ暟 鍘呮暟 闈㈢Н * * @param house * @return @@ -54,15 +54,15 @@ public final class CommonUtil { } if (house.getRoom() != null) { - ret.append(" ").append(house.getRoom()).append("室"); + ret.append(" ").append(house.getRoom()).append("瀹�"); } if (house.getHall() != null) { - ret.append(" ").append(house.getHall()).append("厅"); + ret.append(" ").append(house.getHall()).append("鍘�"); } /*if (house.getArea() != null) { - ret.append(" ").append(Math.round(house.getArea())).append("平米"); + ret.append(" ").append(Math.round(house.getArea())).append("骞崇背"); }*/ return ret.toString(); diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/DesUtils.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/DesUtils.java index d75165df3..57e5bae50 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/DesUtils.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/DesUtils.java @@ -19,9 +19,9 @@ public class DesUtils { private final static String DES = "DES"; /** - * Description 根据键值进行加密 + * Description 鏍规嵁閿�艰繘琛屽姞瀵� * @param data - * @param key 加密键byte数组 + * @param key 鍔犲瘑閿産yte鏁扮粍 * @return * @throws Exception */ @@ -32,9 +32,9 @@ public class DesUtils { } /** - * Description 根据键值进行解密 + * Description 鏍规嵁閿�艰繘琛岃В瀵� * @param data - * @param key 加密键byte数组 + * @param key 鍔犲瘑閿産yte鏁扮粍 * @return * @throws IOException * @throws Exception @@ -50,27 +50,27 @@ public class DesUtils { } /** - * Description 根据键值进行加密 + * Description 鏍规嵁閿�艰繘琛屽姞瀵� * @param data - * @param key 加密键byte数组 + * @param key 鍔犲瘑閿産yte鏁扮粍 * @return * @throws Exception */ private static byte[] encrypt(byte[] data, byte[] key) throws Exception { - // 生成一个可信任的随机数源 + // 鐢熸垚涓�涓彲淇′换鐨勯殢鏈烘暟婧� SecureRandom sr = new SecureRandom(); - // 从原始密钥数据创建DESKeySpec对象 + // 浠庡師濮嬪瘑閽ユ暟鎹垱寤篋ESKeySpec瀵硅薄 DESKeySpec dks = new DESKeySpec(key); - // 创建一个密钥工厂,然后用它把DESKeySpec转换成SecretKey对象 + // 鍒涘缓涓�涓瘑閽ュ伐鍘傦紝鐒跺悗鐢ㄥ畠鎶奃ESKeySpec杞崲鎴怱ecretKey瀵硅薄 SecretKeyFactory keyFactory = SecretKeyFactory.getInstance(DES); SecretKey securekey = keyFactory.generateSecret(dks); - // Cipher对象实际完成加密操作 + // Cipher瀵硅薄瀹為檯瀹屾垚鍔犲瘑鎿嶄綔 Cipher cipher = Cipher.getInstance(DES); - // 用密钥初始化Cipher对象 + // 鐢ㄥ瘑閽ュ垵濮嬪寲Cipher瀵硅薄 cipher.init(Cipher.ENCRYPT_MODE, securekey, sr); return cipher.doFinal(data); @@ -78,27 +78,27 @@ public class DesUtils { /** - * Description 根据键值进行解密 + * Description 鏍规嵁閿�艰繘琛岃В瀵� * @param data - * @param key 加密键byte数组 + * @param key 鍔犲瘑閿産yte鏁扮粍 * @return * @throws Exception */ private static byte[] decrypt(byte[] data, byte[] key) throws Exception { - // 生成一个可信任的随机数源 + // 鐢熸垚涓�涓彲淇′换鐨勯殢鏈烘暟婧� SecureRandom sr = new SecureRandom(); - // 从原始密钥数据创建DESKeySpec对象 + // 浠庡師濮嬪瘑閽ユ暟鎹垱寤篋ESKeySpec瀵硅薄 DESKeySpec dks = new DESKeySpec(key); - // 创建一个密钥工厂,然后用它把DESKeySpec转换成SecretKey对象 + // 鍒涘缓涓�涓瘑閽ュ伐鍘傦紝鐒跺悗鐢ㄥ畠鎶奃ESKeySpec杞崲鎴怱ecretKey瀵硅薄 SecretKeyFactory keyFactory = SecretKeyFactory.getInstance(DES); SecretKey securekey = keyFactory.generateSecret(dks); - // Cipher对象实际完成解密操作 + // Cipher瀵硅薄瀹為檯瀹屾垚瑙e瘑鎿嶄綔 Cipher cipher = Cipher.getInstance(DES); - // 用密钥初始化Cipher对象 + // 鐢ㄥ瘑閽ュ垵濮嬪寲Cipher瀵硅薄 cipher.init(Cipher.DECRYPT_MODE, securekey, sr); return cipher.doFinal(data); @@ -106,7 +106,7 @@ public class DesUtils { /** - * Description 获取字符串MD5值 + * Description 鑾峰彇瀛楃涓睲D5鍊� * @param sourceStr */ private static String MD5(String sourceStr) { @@ -137,12 +137,12 @@ public class DesUtils { public static void main(String[] args) throws Exception { String data = "18616348076_1234561"; - String key = "fangjia_pds_goojia"; //秘钥 + String key = "fangjia_pds_goojia"; //绉橀挜 String encode = encrypt(data, key); - System.err.println("加密:"+encode); - System.err.println("加密encode:"+URLEncoder.encode(encode, "utf-8")); - System.err.println("加密decode:"+URLDecoder.decode(URLEncoder.encode(encode, "utf-8"), "utf-8")); + System.err.println("鍔犲瘑锛�"+encode); + System.err.println("鍔犲瘑encode锛�"+URLEncoder.encode(encode, "utf-8")); + System.err.println("鍔犲瘑decode锛�"+URLDecoder.decode(URLEncoder.encode(encode, "utf-8"), "utf-8")); String dcode = decrypt(encode, key); - System.err.println("解密:"+dcode); + System.err.println("瑙e瘑锛�"+dcode); } } diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/FlashMapUtil.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/FlashMapUtil.java index 63636a393..b52fbb83f 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/FlashMapUtil.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/FlashMapUtil.java @@ -15,14 +15,14 @@ import org.sothis.core.util.Closure; import com.fangjia.dal.mongo.model.RegionStat; /** - * flash地图工具类 + * flash鍦板浘宸ュ叿绫� * * @author liupei */ public final class FlashMapUtil { /** - * 全国flash,根据城市及均价获取对应的颜色值 + * 鍏ㄥ浗flash,鏍规嵁鍩庡競鍙婂潎浠疯幏鍙栧搴旂殑棰滆壊鍊� * * @param city * @param price @@ -42,78 +42,78 @@ public final class FlashMapUtil { } /** - * 全国flash,地图颜色 + * 鍏ㄥ浗flash,鍦板浘棰滆壊 * */ public static enum NationalColorEnum { - // 注意:颜色要由深入浅排序 - // 对比城市的区域颜色,这里去掉三个浅色,添加三个深色//E40000,E42B00,E44600 + // 娉ㄦ剰锛氶鑹茶鐢辨繁鍏ユ祬鎺掑簭 + // 瀵规瘮鍩庡競鐨勫尯鍩熼鑹诧紝杩欓噷鍘绘帀涓変釜娴呰壊锛屾坊鍔犱笁涓繁鑹�//E40000,E42B00,E44600 /** - * 颜色13 + * 棰滆壊13 */ COLOR_13("0XE40000", "0Xb4d75f", "color13"), /** - * 颜色12 + * 棰滆壊12 */ COLOR_12("0XE42B00", "0Xb4d75f", "color12"), /** - * 颜色11 + * 棰滆壊11 */ COLOR_11("0XE44600", "0Xb4d75f", "color11"), /** - * 颜色10 + * 棰滆壊10 */ COLOR_10("0Xf46627", "0Xb4d75f", "color10"), /** - * 颜色9 + * 棰滆壊9 */ COLOR_9("0Xff822e", "0Xb4d75f", "color09"), /** - * 颜色8 + * 棰滆壊8 */ COLOR_8("0Xffa42e", "0Xb4d75f", "color08"), /** - * 颜色7 + * 棰滆壊7 */ COLOR_7("0Xffc22e", "0Xb4d75f", "color07"), /** - * 颜色6 + * 棰滆壊6 */ COLOR_6("0Xffda2e", "0Xb4d75f", "color06"), /** - * 颜色5 + * 棰滆壊5 */ COLOR_5("0Xffe464", "0Xb4d75f", "color05"), /** - * 无价格颜色 + * 鏃犱环鏍奸鑹� */ COLOR_1("0Xececec", "0Xececec", "color01"), /** - * 正常颜色 + * 姝e父棰滆壊 */ COLOR("0Xffffff", "0Xf4ab00", ""); /** - * 正常颜色 + * 姝e父棰滆壊 */ private final String normalColor; /** - * 鼠标over颜色 + * 榧犳爣over棰滆壊 */ private final String overColor; /** - * 页面展示css class名称 + * 椤甸潰灞曠ずcss class鍚嶇О */ private final String cssClass; @@ -169,7 +169,7 @@ public final class FlashMapUtil { } /** - * 全国flash中,获取城市均价范围 获取集合的 最大值,最小范围 + * 鍏ㄥ浗flash涓紝鑾峰彇鍩庡競鍧囦环鑼冨洿 鑾峰彇闆嗗悎鐨� 鏈�澶у�硷紝鏈�灏忚寖鍥� * * @param citys * @return @@ -197,7 +197,7 @@ public final class FlashMapUtil { } /** - * 全国flash中,根据均价区间获得价格分布情况 + * 鍏ㄥ浗flash涓紝鏍规嵁鍧囦环鍖洪棿鑾峰緱浠锋牸鍒嗗竷鎯呭喌 * * @param count * @param nr @@ -208,7 +208,7 @@ public final class FlashMapUtil { Map map = getNationalNumberRanges(count > 9 ? 9 : count, nr); if (MapUtils.isNotEmpty(map)) { List avgPriceRanges = new ArrayList(map.keySet()); - // 倒序 + // 鍊掑簭 Collections.sort(avgPriceRanges, new Comparator() { public int compare(NumberRange o1, NumberRange o2) { return o2.getMaximumInteger() - o1.getMaximumInteger(); @@ -222,7 +222,7 @@ public final class FlashMapUtil { } /** - * 全国flash中,根据取值段数与均价区间获取count个区间 + * 鍏ㄥ浗flash涓紝鏍规嵁鍙栧�兼鏁颁笌鍧囦环鍖洪棿鑾峰彇count涓尯闂� * * @param count * @param nr @@ -237,7 +237,7 @@ public final class FlashMapUtil { int min = nr.getMinimumInteger(); int colorIndex = 0; int colorNum= count ; - //如果城市数大于9,分出三段:[20000-->无穷大)[15000-->20000)[0-->15000),并把[0-->15000)均分成七个价格段,并给上除了一二段外的连贯颜色 + //濡傛灉鍩庡競鏁板ぇ浜�9锛屽垎鍑轰笁娈碉細[20000-->鏃犵┓澶�)[15000-->20000)[0-->15000),骞舵妸[0-->15000)鍧囧垎鎴愪竷涓环鏍兼锛屽苟缁欎笂闄や簡涓�浜屾澶栫殑杩炶疮棰滆壊 if(count==9){ nrs.put(new NumberRange(max + 1, 20000), NationalColorEnum.values()[0]); nrs.put(new NumberRange(20000+1, 15000), NationalColorEnum.values()[1]); @@ -262,12 +262,12 @@ public final class FlashMapUtil { /* * - * 城市的 + * 鍩庡競鐨� * */ /** - * 根据城市及均价获取对应的颜色值 + * 鏍规嵁鍩庡競鍙婂潎浠疯幏鍙栧搴旂殑棰滆壊鍊� * * @param city * @param price @@ -291,7 +291,7 @@ public final class FlashMapUtil { } /** - * 根据均价区间获得价格分布情况 + * 鏍规嵁鍧囦环鍖洪棿鑾峰緱浠锋牸鍒嗗竷鎯呭喌 * * @param count * @param nr @@ -302,7 +302,7 @@ public final class FlashMapUtil { Map map = getNumberRanges(count > 9 ? 9 : count, nr); if (MapUtils.isNotEmpty(map)) { List avgPriceRanges = new ArrayList(map.keySet()); - // 倒序 + // 鍊掑簭 Collections.sort(avgPriceRanges, new Comparator() { public int compare(NumberRange o1, NumberRange o2) { return o2.getMaximumInteger() - o1.getMaximumInteger(); @@ -316,7 +316,7 @@ public final class FlashMapUtil { } /** - * 获取最大均价和最小均价 + * 鑾峰彇鏈�澶у潎浠峰拰鏈�灏忓潎浠� * * @param regionStatList * @return @@ -332,79 +332,79 @@ public final class FlashMapUtil { } /** - * 颜色 + * 棰滆壊 * * @author liupei */ public static enum ColorEnum { - // 注意:颜色要由深入浅排序 + // 娉ㄦ剰锛氶鑹茶鐢辨繁鍏ユ祬鎺掑簭 /** - * 颜色10 + * 棰滆壊10 */ COLOR_10("0Xf46627", "0Xb4d75f", "color10"), /** - * 颜色 + * 棰滆壊 */ COLOR_9("0Xff822e", "0Xb4d75f", "color09"), /** - * 颜色8 + * 棰滆壊8 */ COLOR_8("0Xffa42e", "0Xb4d75f", "color08"), /** - * 颜色7 + * 棰滆壊7 */ COLOR_7("0Xffc22e", "0Xb4d75f", "color07"), /** - * 颜色6 + * 棰滆壊6 */ COLOR_6("0Xffda2e", "0Xb4d75f", "color06"), /** - * 颜色5 + * 棰滆壊5 */ COLOR_5("0Xffe464", "0Xb4d75f", "color05"), /** - * 颜色4 + * 棰滆壊4 */ COLOR_4("0Xffed9a", "0Xb4d75f", "color04"), /** - * 颜色3 + * 棰滆壊3 */ COLOR_3("0Xfff6ca", "0Xb4d75f", "color03"), /** - * 颜色2 + * 棰滆壊2 */ COLOR_2("0Xfff9dd", "0Xb4d75f", "color02"), /** - * 无价格颜色 + * 鏃犱环鏍奸鑹� */ COLOR_1("0Xececec", "0Xececec", "color01"), /** - * 正常颜色 + * 姝e父棰滆壊 */ COLOR("0Xffffff", "0Xf4ab00", ""); /** - * 正常颜色 + * 姝e父棰滆壊 */ private final String normalColor; /** - * 鼠标over颜色 + * 榧犳爣over棰滆壊 */ private final String overColor; /** - * 页面展示css class名称 + * 椤甸潰灞曠ずcss class鍚嶇О */ private final String cssClass; @@ -460,7 +460,7 @@ public final class FlashMapUtil { } /** - * 根据取值段数与均价区间获取count个区间 + * 鏍规嵁鍙栧�兼鏁颁笌鍧囦环鍖洪棿鑾峰彇count涓尯闂� * * @param count * @param nr diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/HttpUtil.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/HttpUtil.java index 185d204ca..db46b0a06 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/HttpUtil.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/HttpUtil.java @@ -30,7 +30,7 @@ public class HttpUtil{ public static String RequestForm(String Url,Map Parms){ if(Parms.isEmpty()){ - return "参数不能为空!"; + return "鍙傛暟涓嶈兘涓虹┖锛�"; } String PostParms = ""; int PostItemTotal = Parms.keySet().size(); @@ -42,9 +42,9 @@ public class HttpUtil{ PostParms +="&"; } } - System.out.println("【请求参数】:"+PostParms); + System.out.println("銆愯姹傚弬鏁般�戯細"+PostParms); HttpSendModel httpSendModel = new HttpSendModel(Url + "?" + PostParms); - System.out.println("【APP后端请求】:" + Url + "?" + PostParms); + System.out.println("銆怉PP鍚庣璇锋眰銆戯細" + Url + "?" + PostParms); httpSendModel.setMethod(HttpMethod.POST); SimpleHttpResponse response = null; try { @@ -59,7 +59,7 @@ public class HttpUtil{ public static SimpleHttpResponse doRequest(HttpSendModel httpSendModel, String getCharSet) throws Exception { - // 创建默认的httpClient客户端端 + // 鍒涘缓榛樿鐨刪ttpClient瀹㈡埛绔 SimpleHttpClient simpleHttpclient = new SimpleHttpClient(); try { @@ -101,7 +101,7 @@ public class HttpUtil{ } } catch (Exception e) { - throw new Exception("http请求异常", e); + throw new Exception("http璇锋眰寮傚父", e); } } @@ -115,7 +115,7 @@ public class HttpUtil{ HttpSendModel httpSendModel) throws Exception { HttpRequestBase httpRequest; if (httpSendModel.getMethod() == null) { - throw new Exception("请求方式未设定"); + throw new Exception("璇锋眰鏂瑰紡鏈瀹�"); } else if (httpSendModel.getMethod() == HttpMethod.POST) { String url = httpSendModel.getUrl(); @@ -136,7 +136,7 @@ public class HttpUtil{ httppost.setEntity(new UrlEncodedFormEntity(qparams, sendCharSet)); } catch (UnsupportedEncodingException e) { - throw new Exception("构建post请求参数失败", e); + throw new Exception("鏋勫缓post璇锋眰鍙傛暟澶辫触", e); } httpRequest = httppost; @@ -145,14 +145,14 @@ public class HttpUtil{ httpRequest = httpget; } else { - throw new Exception("请求方式不支持:" + httpSendModel.getMethod()); + throw new Exception("璇锋眰鏂瑰紡涓嶆敮鎸侊細" + httpSendModel.getMethod()); } return httpRequest; } /** - * 请求是否成功 + * 璇锋眰鏄惁鎴愬姛 * * @param statusCode * @return diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/InsidePolygon.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/InsidePolygon.java index 21e8c0cb5..4a312cf74 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/InsidePolygon.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/InsidePolygon.java @@ -24,16 +24,16 @@ public class InsidePolygon { } /** - * 判定一个经纬度点与区域的关系 - * @param point 需要判断的经纬度点 - * @return boolean 如果点在区域内,true;如果在区域外,false + * 鍒ゅ畾涓�涓粡绾害鐐逛笌鍖哄煙鐨勫叧绯� + * @param point 闇�瑕佸垽鏂殑缁忕含搴︾偣 + * @return boolean 濡傛灉鐐瑰湪鍖哄煙鍐咃紝true锛涘鏋滃湪鍖哄煙澶栵紝false */ public static boolean aboutZone(Point point, List vPoint) { if(vPoint==null||vPoint.size()==0) return false; int I = 0; - //求出最大值, 得到一个落在矩形外的点, 由该点与point组成的线段, 与多边形求交, 交点为奇数则为 - // 在多边形内 + //姹傚嚭鏈�澶у��, 寰楀埌涓�涓惤鍦ㄧ煩褰㈠鐨勭偣, 鐢辫鐐逛笌point缁勬垚鐨勭嚎娈�, 涓庡杈瑰舰姹備氦, 浜ょ偣涓哄鏁板垯涓� + // 鍦ㄥ杈瑰舰鍐� I = 1; int odd = 0; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/JXMConvertUtil.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/JXMConvertUtil.java index 9a923adff..53362ecae 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/JXMConvertUtil.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/JXMConvertUtil.java @@ -1,5 +1,5 @@ /** - * 将XML转JSON String、将JSON转Map + * 灏哫ML杞琂SON String銆佸皢JSON杞琈ap */ package com.fangjia.coresite.util; import java.util.ArrayList; @@ -16,7 +16,7 @@ import net.sf.json.xml.XMLSerializer; public class JXMConvertUtil{ /** - * 将XML String转成JSON String + * 灏哫ML String杞垚JSON String * * @param XMLString * @return @@ -31,7 +31,7 @@ public class JXMConvertUtil{ } /** - * 将JSON转换成Map + * 灏咼SON杞崲鎴怣ap * @param object * @return * @@ -40,7 +40,7 @@ public class JXMConvertUtil{ public static Map JsonConvertHashMap(Object object) { Map RMap = new HashMap(); - // 将json字符串转换成jsonObject + // 灏唈son瀛楃涓茶浆鎹㈡垚jsonObject JSONObject jsonObject = JSONObject.fromObject(object); RMap=IteratorHash(jsonObject); @@ -49,7 +49,7 @@ public class JXMConvertUtil{ /** - * 递归遍历JSON对象。 + * 閫掑綊閬嶅巻JSON瀵硅薄銆� * * @param JsonToMap * @return @@ -61,9 +61,9 @@ public class JXMConvertUtil{ HashMap RMap = new HashMap(); while(it.hasNext()){ String key = String.valueOf(it.next()); - if(JsonToMap.get(key).getClass() == JSONArray.class){//判是否为列表 + if(JsonToMap.get(key).getClass() == JSONArray.class){//鍒ゆ槸鍚︿负鍒楄〃 - if(JsonToMap.getJSONArray(key).isEmpty()){//判列表是否为空 + if(JsonToMap.getJSONArray(key).isEmpty()){//鍒ゅ垪琛ㄦ槸鍚︿负绌� RMap.put(key,null); }else{ diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/LoginUtil.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/LoginUtil.java index 2de27e8a3..7c1d86d14 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/LoginUtil.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/LoginUtil.java @@ -44,7 +44,7 @@ public class LoginUtil { } /** - * 管理员是否登录 + * 绠$悊鍛樻槸鍚︾櫥褰� * * @param req * @return diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/MapToXml.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/MapToXml.java index f6e91840f..d72bb42ad 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/MapToXml.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/MapToXml.java @@ -7,8 +7,8 @@ import java.util.List; import java.util.Map; /** * - * MAP对象转XML - * 识别数据类型,String、Map、ArrayList、其他数据类型执异常; + * MAP瀵硅薄杞琗ML + * 璇嗗埆鏁版嵁绫诲瀷锛孲tring銆丮ap銆丄rrayList銆佸叾浠栨暟鎹被鍨嬫墽寮傚父; * */ @@ -48,7 +48,7 @@ public class MapToXml{ XMLStr.append(""); } }else{ - throw new Exception("不能识别的数据类型:" + Param.getClass().toString()); + throw new Exception("涓嶈兘璇嗗埆鐨勬暟鎹被鍨嬶細" + Param.getClass().toString()); } return XMLStr.toString(); } diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/Polygon.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/Polygon.java index 304766fa0..a05c2ff9f 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/Polygon.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/Polygon.java @@ -127,24 +127,24 @@ public class Polygon { int nCross = 0; for (int i = 0; i < verticesCount; ++ i) { Mpoint p1 = vertices.get(i); - Mpoint p2 = vertices.get((i + 1) % verticesCount);// 求解 y=p.y 与 p1 p2 的交点 - if ( p1.getMapLoationY() == p2.getMapLoationY() ) { // p1p2 与 y=p0.y平行 + Mpoint p2 = vertices.get((i + 1) % verticesCount);// 姹傝В y=p.y 涓� p1 p2 鐨勪氦鐐� + if ( p1.getMapLoationY() == p2.getMapLoationY() ) { // p1p2 涓� y=p0.y骞宠 continue; } - if ( lat < Math.min(p1.getY(), p2.getY()) ) { // 交点在p1p2延长线上 + if ( lat < Math.min(p1.getY(), p2.getY()) ) { // 浜ょ偣鍦╬1p2寤堕暱绾夸笂 continue; } - if ( lat >= Math.max(p1.getY(), p2.getY()) ) { // 交点在p1p2延长线上 + if ( lat >= Math.max(p1.getY(), p2.getY()) ) { // 浜ょ偣鍦╬1p2寤堕暱绾夸笂 continue; } - // 求交点的 X 坐标 + // 姹備氦鐐圭殑 X 鍧愭爣 double x = (lat - p1.getMapLoationY()) * (p2.getMapLoationX() - p1.getMapLoationX()) / (p2.getMapLoationY() - p1.getMapLoationY()) + p1.getMapLoationX(); - if ( x > lng) { // 只统计单边交点 + if ( x > lng) { // 鍙粺璁″崟杈逛氦鐐� nCross++; } } - // 单边交点为偶数,点在多边形之外 + // 鍗曡竟浜ょ偣涓哄伓鏁帮紝鐐瑰湪澶氳竟褰箣澶� return (nCross%2==1); } diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/RSAUtils.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/RSAUtils.java index 365a34743..e26a270d3 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/RSAUtils.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/RSAUtils.java @@ -28,7 +28,7 @@ import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * RSA算法加密/解密工具类。 + * RSA绠楁硶鍔犲瘑/瑙e瘑宸ュ叿绫汇�� * */ public abstract class RSAUtils { @@ -37,20 +37,20 @@ public abstract class RSAUtils { private static final String MODULUS = "00c198eff1a10930f28edfa1342530833e19c84c0e0eef843a1d86eb9831279ea0473a57698258b06aaeb3f88780ce056b878888bb8f220e1d1e94cfc2917405622bb14b26b844205dffb4780e796709b6808f23bcf70f0de0ba19935ea436e68830617bd1a612c749b127218217b2496fa48e2aa27a41b239c40989d320f728ff"; private static final String PUBLIC_EXPOENT = "010001"; private static final String PRIVATE_EXPOENT = "2aa97326c21fee63654cae8f792a89a163b919d9773d1cdc59a963bd740791132cdf146831cb2d8534de80040c445a3969f2927f1279a4b69208a507f159a9dda7fa3cd4258cd2aa10be4dbe39580d64bce9aee6627b5ab843bd2a436cb2bb8ec08bce43e0c3d6a2d1f2dbebd84c2335332b0185341d1c134cbeba6eafcfc0a1"; - /** 算法名称 */ + /** 绠楁硶鍚嶇О */ private static final String ALGORITHOM = "RSA"; - /** 密钥大小 */ + /** 瀵嗛挜澶у皬 */ private static final int KEY_SIZE = 1024; - /** 默认的安全服务提供者 */ + /** 榛樿鐨勫畨鍏ㄦ湇鍔℃彁渚涜�� */ private static final Provider DEFAULT_PROVIDER = new BouncyCastleProvider(); private static KeyPairGenerator keyPairGen = null; private static KeyFactory keyFactory = null; - /** 缓存的密钥对。 */ + /** 缂撳瓨鐨勫瘑閽ュ銆� */ private static KeyPair oneKeyPair = null; private static File rsaPairFile = null; @@ -68,7 +68,7 @@ public abstract class RSAUtils { } /** - * 生成并返回RSA密钥对。 + * 鐢熸垚骞惰繑鍥濺SA瀵嗛挜瀵广�� */ private static synchronized KeyPair generateKeyPair() { try { @@ -85,7 +85,7 @@ public abstract class RSAUtils { } /** - * 返回RSA密钥对。 + * 杩斿洖RSA瀵嗛挜瀵广�� */ public static KeyPair getKeyPair() { return new KeyPair(getRSAPublidKey(MODULUS, PUBLIC_EXPOENT), getRSAPrivateKey(MODULUS, PRIVATE_EXPOENT)); @@ -93,11 +93,11 @@ public abstract class RSAUtils { } /** - * 根据给定的系数和专用指数构造一个RSA专用的公钥对象。 + * 鏍规嵁缁欏畾鐨勭郴鏁板拰涓撶敤鎸囨暟鏋勯�犱竴涓猂SA涓撶敤鐨勫叕閽ュ璞°�� * - * @param modulus 系数。 - * @param publicExponent 专用指数。 - * @return RSA专用公钥对象。 + * @param modulus 绯绘暟銆� + * @param publicExponent 涓撶敤鎸囨暟銆� + * @return RSA涓撶敤鍏挜瀵硅薄銆� */ public static RSAPublicKey generateRSAPublicKey(byte[] modulus, byte[] publicExponent) { RSAPublicKeySpec publicKeySpec = new RSAPublicKeySpec(new BigInteger(modulus), @@ -113,11 +113,11 @@ public abstract class RSAUtils { } /** - * 根据给定的系数和专用指数构造一个RSA专用的私钥对象。 + * 鏍规嵁缁欏畾鐨勭郴鏁板拰涓撶敤鎸囨暟鏋勯�犱竴涓猂SA涓撶敤鐨勭閽ュ璞°�� * - * @param modulus 系数。 - * @param privateExponent 专用指数。 - * @return RSA专用私钥对象。 + * @param modulus 绯绘暟銆� + * @param privateExponent 涓撶敤鎸囨暟銆� + * @return RSA涓撶敤绉侀挜瀵硅薄銆� */ public static RSAPrivateKey generateRSAPrivateKey(byte[] modulus, byte[] privateExponent) { RSAPrivateKeySpec privateKeySpec = new RSAPrivateKeySpec(new BigInteger(modulus), @@ -133,11 +133,11 @@ public abstract class RSAUtils { } /** - * 根据给定的16进制系数和专用指数字符串构造一个RSA专用的私钥对象。 + * 鏍规嵁缁欏畾鐨�16杩涘埗绯绘暟鍜屼笓鐢ㄦ寚鏁板瓧绗︿覆鏋勯�犱竴涓猂SA涓撶敤鐨勭閽ュ璞°�� * - * @param hexModulus 系数。 - * @param hexPrivateExponent 专用指数。 - * @return RSA专用私钥对象。 + * @param hexModulus 绯绘暟銆� + * @param hexPrivateExponent 涓撶敤鎸囨暟銆� + * @return RSA涓撶敤绉侀挜瀵硅薄銆� */ public static RSAPrivateKey getRSAPrivateKey(String hexModulus, String hexPrivateExponent) { if(StringUtils.isBlank(hexModulus) || StringUtils.isBlank(hexPrivateExponent)) { @@ -161,11 +161,11 @@ public abstract class RSAUtils { } /** - * 根据给定的16进制系数和专用指数字符串构造一个RSA专用的公钥对象。 + * 鏍规嵁缁欏畾鐨�16杩涘埗绯绘暟鍜屼笓鐢ㄦ寚鏁板瓧绗︿覆鏋勯�犱竴涓猂SA涓撶敤鐨勫叕閽ュ璞°�� * - * @param hexModulus 系数。 - * @param hexPublicExponent 专用指数。 - * @return RSA专用公钥对象。 + * @param hexModulus 绯绘暟銆� + * @param hexPublicExponent 涓撶敤鎸囨暟銆� + * @return RSA涓撶敤鍏挜瀵硅薄銆� */ public static RSAPublicKey getRSAPublidKey(String hexModulus, String hexPublicExponent) { if(StringUtils.isBlank(hexModulus) || StringUtils.isBlank(hexPublicExponent)) { @@ -189,11 +189,11 @@ public abstract class RSAUtils { } /** - * 使用指定的公钥加密数据。 + * 浣跨敤鎸囧畾鐨勫叕閽ュ姞瀵嗘暟鎹�� * - * @param publicKey 给定的公钥。 - * @param data 要加密的数据。 - * @return 加密后的数据。 + * @param publicKey 缁欏畾鐨勫叕閽ャ�� + * @param data 瑕佸姞瀵嗙殑鏁版嵁銆� + * @return 鍔犲瘑鍚庣殑鏁版嵁銆� */ public static byte[] encrypt(PublicKey publicKey, byte[] data) throws Exception { Cipher ci = Cipher.getInstance(ALGORITHOM, DEFAULT_PROVIDER); @@ -202,11 +202,11 @@ public abstract class RSAUtils { } /** - * 使用指定的私钥解密数据。 + * 浣跨敤鎸囧畾鐨勭閽ヨВ瀵嗘暟鎹�� * - * @param privateKey 给定的私钥。 - * @param data 要解密的数据。 - * @return 原数据。 + * @param privateKey 缁欏畾鐨勭閽ャ�� + * @param data 瑕佽В瀵嗙殑鏁版嵁銆� + * @return 鍘熸暟鎹�� */ public static byte[] decrypt(PrivateKey privateKey, byte[] data) throws Exception { Cipher ci = Cipher.getInstance(ALGORITHOM, DEFAULT_PROVIDER); @@ -215,14 +215,14 @@ public abstract class RSAUtils { } /** - * 使用给定的公钥加密给定的字符串。 + * 浣跨敤缁欏畾鐨勫叕閽ュ姞瀵嗙粰瀹氱殑瀛楃涓层�� *

- * 若 {@code publicKey} 为 {@code null},或者 {@code plaintext} 为 {@code null} 则返回 {@code - * null}。 + * 鑻� {@code publicKey} 涓� {@code null}锛屾垨鑰� {@code plaintext} 涓� {@code null} 鍒欒繑鍥� {@code + * null}銆� * - * @param publicKey 给定的公钥。 - * @param plaintext 字符串。 - * @return 给定字符串的密文。 + * @param publicKey 缁欏畾鐨勫叕閽ャ�� + * @param plaintext 瀛楃涓层�� + * @return 缁欏畾瀛楃涓茬殑瀵嗘枃銆� */ public static String encryptString(PublicKey publicKey, String plaintext) { if (publicKey == null || plaintext == null) { @@ -239,12 +239,12 @@ public abstract class RSAUtils { } /** - * 使用默认的公钥加密给定的字符串。 + * 浣跨敤榛樿鐨勫叕閽ュ姞瀵嗙粰瀹氱殑瀛楃涓层�� *

- * 若{@code plaintext} 为 {@code null} 则返回 {@code null}。 + * 鑻@code plaintext} 涓� {@code null} 鍒欒繑鍥� {@code null}銆� * - * @param plaintext 字符串。 - * @return 给定字符串的密文。 + * @param plaintext 瀛楃涓层�� + * @return 缁欏畾瀛楃涓茬殑瀵嗘枃銆� */ public static String encryptString(String plaintext) { if(plaintext == null) { @@ -264,14 +264,14 @@ public abstract class RSAUtils { } /** - * 使用给定的私钥解密给定的字符串。 + * 浣跨敤缁欏畾鐨勭閽ヨВ瀵嗙粰瀹氱殑瀛楃涓层�� *

- * 若私钥为 {@code null},或者 {@code encrypttext} 为 {@code null}或空字符串则返回 {@code null}。 - * 私钥不匹配时,返回 {@code null}。 + * 鑻ョ閽ヤ负 {@code null}锛屾垨鑰� {@code encrypttext} 涓� {@code null}鎴栫┖瀛楃涓插垯杩斿洖 {@code null}銆� + * 绉侀挜涓嶅尮閰嶆椂锛岃繑鍥� {@code null}銆� * - * @param privateKey 给定的私钥。 - * @param encrypttext 密文。 - * @return 原文字符串。 + * @param privateKey 缁欏畾鐨勭閽ャ�� + * @param encrypttext 瀵嗘枃銆� + * @return 鍘熸枃瀛楃涓层�� */ public static String decryptString(PrivateKey privateKey, String encrypttext) { if (privateKey == null || StringUtils.isBlank(encrypttext)) { @@ -288,13 +288,13 @@ public abstract class RSAUtils { } /** - * 使用默认的私钥解密给定的字符串。 + * 浣跨敤榛樿鐨勭閽ヨВ瀵嗙粰瀹氱殑瀛楃涓层�� *

- * 若{@code encrypttext} 为 {@code null}或空字符串则返回 {@code null}。 - * 私钥不匹配时,返回 {@code null}。 + * 鑻@code encrypttext} 涓� {@code null}鎴栫┖瀛楃涓插垯杩斿洖 {@code null}銆� + * 绉侀挜涓嶅尮閰嶆椂锛岃繑鍥� {@code null}銆� * - * @param encrypttext 密文。 - * @return 原文字符串。 + * @param encrypttext 瀵嗘枃銆� + * @return 鍘熸枃瀛楃涓层�� */ public static String decryptString(String encrypttext) { if(StringUtils.isBlank(encrypttext)) { @@ -314,10 +314,10 @@ public abstract class RSAUtils { } /** - * 使用默认的私钥解密由JS加密(使用此类提供的公钥加密)的字符串。 + * 浣跨敤榛樿鐨勭閽ヨВ瀵嗙敱JS鍔犲瘑锛堜娇鐢ㄦ绫绘彁渚涚殑鍏挜鍔犲瘑锛夌殑瀛楃涓层�� * - * @param encrypttext 密文。 - * @return {@code encrypttext} 的原文字符串。 + * @param encrypttext 瀵嗘枃銆� + * @return {@code encrypttext} 鐨勫師鏂囧瓧绗︿覆銆� */ public static String decryptStringByJs(String encrypttext) { try { @@ -331,7 +331,7 @@ public abstract class RSAUtils { } } - /** 返回已初始化的默认的公钥。*/ + /** 杩斿洖宸插垵濮嬪寲鐨勯粯璁ょ殑鍏挜銆�*/ public static RSAPublicKey getDefaultPublicKey() { KeyPair keyPair = getKeyPair(); if(keyPair != null) { @@ -340,7 +340,7 @@ public abstract class RSAUtils { return null; } - /** 返回已初始化的默认的私钥。*/ + /** 杩斿洖宸插垵濮嬪寲鐨勯粯璁ょ殑绉侀挜銆�*/ public static RSAPrivateKey getDefaultPrivateKey() { KeyPair keyPair = getKeyPair(); if(keyPair != null) { diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/RegionDirective.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/RegionDirective.java index 41a489d8d..f1637e86d 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/RegionDirective.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/RegionDirective.java @@ -38,11 +38,11 @@ public class RegionDirective implements TemplateDirectiveModel { } String orgRegion = RegionBlockServiceImpl.getOrgRegion(city, region); if (params.containsKey("short") && Boolean.parseBoolean(params.get("short").toString())) { - if (orgRegion.endsWith("开发区") && orgRegion.length() > 4) { + if (orgRegion.endsWith("寮�鍙戝尯") && orgRegion.length() > 4) { orgRegion = orgRegion.substring(0, orgRegion.length() - 2); - } else if (orgRegion.endsWith("新区") && orgRegion.length() > 3) { + } else if (orgRegion.endsWith("鏂板尯") && orgRegion.length() > 3) { orgRegion = orgRegion.substring(0, orgRegion.length() - 2); - } else if (orgRegion.endsWith("区") && orgRegion.length() > 2) { + } else if (orgRegion.endsWith("鍖�") && orgRegion.length() > 2) { orgRegion = orgRegion.substring(0, orgRegion.length() - 1); } } diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/RsaCodingUtil.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/RsaCodingUtil.java index 951eec81c..bb95be886 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/RsaCodingUtil.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/RsaCodingUtil.java @@ -14,26 +14,26 @@ import javax.crypto.NoSuchPaddingException; import org.apache.commons.lang.StringUtils; /** - * Rsa加解密工具
+ * Rsa鍔犺В瀵嗗伐鍏�
*
- * 公钥采用X509,Cer格式的
- * 私钥采用PKCS12加密方式的PFX私钥文件
- * 加密算法为1024位的RSA,填充算法为PKCS1Padding
+ * 鍏挜閲囩敤X509,Cer鏍煎紡鐨�
+ * 绉侀挜閲囩敤PKCS12鍔犲瘑鏂瑰紡鐨凱FX绉侀挜鏂囦欢
+ * 鍔犲瘑绠楁硶涓�1024浣嶇殑RSA锛屽~鍏呯畻娉曚负PKCS1Padding
* */ public final class RsaCodingUtil { // ====================================================================================== - // 公钥加密私钥解密段 + // 鍏挜鍔犲瘑绉侀挜瑙e瘑娈� // ====================================================================================== /** - * 指定Cer公钥路径加密 + * 鎸囧畾Cer鍏挜璺緞鍔犲瘑 * * @param src * @param pubCerPath - * @return hex串 + * @return hex涓� */ public static String encryptByPubCerFile(String src, String pubCerPath) { @@ -45,11 +45,11 @@ public final class RsaCodingUtil { } /** - * 用公钥内容加密 + * 鐢ㄥ叕閽ュ唴瀹瑰姞瀵� * * @param src * @param pubKeyText - * @return hex串 + * @return hex涓� */ public static String encryptByPubCerText(String src, String pubKeyText) { PublicKey publicKey = RsaReadUtil.getPublicKeyByText(pubKeyText); @@ -60,12 +60,12 @@ public final class RsaCodingUtil { } /** - * 公钥加密返回 + * 鍏挜鍔犲瘑杩斿洖 * * @param src * @param publicKey * @param encryptMode - * @return hex串 + * @return hex涓� */ public static String encryptByPublicKey(String src, PublicKey publicKey) { byte[] destBytes = rsaByPublicKey(src.getBytes(), publicKey, Cipher.ENCRYPT_MODE); @@ -79,7 +79,7 @@ public final class RsaCodingUtil { } /** - * 根据私钥文件解密 + * 鏍规嵁绉侀挜鏂囦欢瑙e瘑 * * @param src * @param pfxPath @@ -98,7 +98,7 @@ public final class RsaCodingUtil { } /** - * 根据私钥文件流解密 + * 鏍规嵁绉侀挜鏂囦欢娴佽В瀵� * * @param src * @param pfxPath @@ -117,7 +117,7 @@ public final class RsaCodingUtil { } /** - * 私钥解密 + * 绉侀挜瑙e瘑 * * @param src * @param privateKey @@ -134,20 +134,20 @@ public final class RsaCodingUtil { } return new String(destBytes, RsaConst.ENCODE); } catch (UnsupportedEncodingException e) { -// //log.error("解密内容不是正确的UTF8格式:", e); +// //log.error("瑙e瘑鍐呭涓嶆槸姝g‘鐨刄TF8鏍煎紡:", e); } catch (Exception e) { -// //log.error("解密内容异常", e); +// //log.error("瑙e瘑鍐呭寮傚父", e); } return null; } // ====================================================================================== - // 私钥加密公钥解密 + // 绉侀挜鍔犲瘑鍏挜瑙e瘑 // ====================================================================================== /** - * 根据私钥文件加密 + * 鏍规嵁绉侀挜鏂囦欢鍔犲瘑 * * @param src * @param pfxPath @@ -164,7 +164,7 @@ public final class RsaCodingUtil { } /** - * 根据私钥文件流加密 + * 鏍规嵁绉侀挜鏂囦欢娴佸姞瀵� * * @param src * @param pfxPath @@ -180,7 +180,7 @@ public final class RsaCodingUtil { } /** - * 根据私钥加密 + * 鏍规嵁绉侀挜鍔犲瘑 * * @param src * @param privateKey @@ -197,7 +197,7 @@ public final class RsaCodingUtil { } /** - * 指定Cer公钥路径解密 + * 鎸囧畾Cer鍏挜璺緞瑙e瘑 * * @param src * @param pubCerPath @@ -212,7 +212,7 @@ public final class RsaCodingUtil { } /** - * 根据公钥文本解密 + * 鏍规嵁鍏挜鏂囨湰瑙e瘑 * * @param src * @param pubKeyText @@ -227,7 +227,7 @@ public final class RsaCodingUtil { } /** - * 根据公钥解密 + * 鏍规嵁鍏挜瑙e瘑 * * @param src * @param publicKey @@ -242,69 +242,69 @@ public final class RsaCodingUtil { } return new String(destBytes, RsaConst.ENCODE); } catch (UnsupportedEncodingException e) { -// //log.error("解密内容不是正确的UTF8格式:", e); +// //log.error("瑙e瘑鍐呭涓嶆槸姝g‘鐨刄TF8鏍煎紡:", e); } return null; } // ====================================================================================== - // 公私钥算法 + // 鍏閽ョ畻娉� // ====================================================================================== /** - * 公钥算法 + * 鍏挜绠楁硶 * * @param srcData - * 源字节 + * 婧愬瓧鑺� * @param publicKey - * 公钥 + * 鍏挜 * @param mode - * 加密 OR 解密 + * 鍔犲瘑 OR 瑙e瘑 * @return */ public static byte[] rsaByPublicKey(byte[] srcData, PublicKey publicKey, int mode) { try { Cipher cipher = Cipher.getInstance(RsaConst.RSA_CHIPER); cipher.init(mode, publicKey); - // 分段加密 + // 鍒嗘鍔犲瘑 int blockSize = (mode == Cipher.ENCRYPT_MODE) ? RsaConst.ENCRYPT_KEYSIZE : RsaConst.DECRYPT_KEYSIZE; byte[] encryptedData = null; for (int i = 0; i < srcData.length; i += blockSize) { - // 注意要使用2的倍数,否则会出现加密后的内容再解密时为乱码 + // 娉ㄦ剰瑕佷娇鐢�2鐨勫�嶆暟锛屽惁鍒欎細鍑虹幇鍔犲瘑鍚庣殑鍐呭鍐嶈В瀵嗘椂涓轰贡鐮� byte[] doFinal = cipher.doFinal(subarray(srcData, i, i + blockSize)); encryptedData = addAll(encryptedData, doFinal); } return encryptedData; } catch (NoSuchAlgorithmException e) { -// //log.error("公钥算法-不存在的解密算法:", e); +// //log.error("鍏挜绠楁硶-涓嶅瓨鍦ㄧ殑瑙e瘑绠楁硶:", e); } catch (NoSuchPaddingException e) { -// //log.error("公钥算法-无效的补位算法:", e); +// //log.error("鍏挜绠楁硶-鏃犳晥鐨勮ˉ浣嶇畻娉�:", e); } catch (IllegalBlockSizeException e) { -// //log.error("公钥算法-无效的块大小:", e); +// //log.error("鍏挜绠楁硶-鏃犳晥鐨勫潡澶у皬:", e); } catch (BadPaddingException e) { -// //log.error("公钥算法-补位算法异常:", e); +// //log.error("鍏挜绠楁硶-琛ヤ綅绠楁硶寮傚父:", e); } catch (InvalidKeyException e) { -// //log.error("公钥算法-无效的私钥:", e); +// //log.error("鍏挜绠楁硶-鏃犳晥鐨勭閽�:", e); } return null; } /** - * 私钥算法 + * 绉侀挜绠楁硶 * * @param srcData - * 源字节 + * 婧愬瓧鑺� * @param privateKey - * 私钥 + * 绉侀挜 * @param mode - * 加密 OR 解密 + * 鍔犲瘑 OR 瑙e瘑 * @return */ public static byte[] rsaByPrivateKey(byte[] srcData, PrivateKey privateKey, int mode) { try { Cipher cipher = Cipher.getInstance(RsaConst.RSA_CHIPER); cipher.init(mode, privateKey); - // 分段加密 + // 鍒嗘鍔犲瘑 int blockSize = (mode == Cipher.ENCRYPT_MODE) ? RsaConst.ENCRYPT_KEYSIZE : RsaConst.DECRYPT_KEYSIZE; byte[] decryptData = null; @@ -315,15 +315,15 @@ public final class RsaCodingUtil { } return decryptData; } catch (NoSuchAlgorithmException e) { -// //log.error("私钥算法-不存在的解密算法:", e); +// //log.error("绉侀挜绠楁硶-涓嶅瓨鍦ㄧ殑瑙e瘑绠楁硶:", e); } catch (NoSuchPaddingException e) { - //log.error("私钥算法-无效的补位算法:", e); + //log.error("绉侀挜绠楁硶-鏃犳晥鐨勮ˉ浣嶇畻娉�:", e); } catch (IllegalBlockSizeException e) { - //log.error("私钥算法-无效的块大小:", e); + //log.error("绉侀挜绠楁硶-鏃犳晥鐨勫潡澶у皬:", e); } catch (BadPaddingException e) { - //log.error("私钥算法-补位算法异常:", e); + //log.error("绉侀挜绠楁硶-琛ヤ綅绠楁硶寮傚父:", e); } catch (InvalidKeyException e) { - //log.error("私钥算法-无效的私钥:", e); + //log.error("绉侀挜绠楁硶-鏃犳晥鐨勭閽�:", e); } return null; } @@ -372,7 +372,7 @@ public final class RsaCodingUtil { } /** - * 将byte[] 转换成字符串 + * 灏哹yte[] 杞崲鎴愬瓧绗︿覆 */ public static String byte2Hex(byte[] srcBytes) { StringBuilder hexRetSB = new StringBuilder(); @@ -384,7 +384,7 @@ public final class RsaCodingUtil { } /** - * 将16进制字符串转为转换成字符串 + * 灏�16杩涘埗瀛楃涓茶浆涓鸿浆鎹㈡垚瀛楃涓� */ public static byte[] hex2Bytes(String source) { byte[] sourceBytes = new byte[source.length() / 2]; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/RsaConst.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/RsaConst.java index e1a4e28c7..aec943add 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/RsaConst.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/RsaConst.java @@ -2,7 +2,7 @@ package com.fangjia.coresite.util; public final class RsaConst { - /** 编码 */ + /** 缂栫爜 */ public final static String ENCODE = "UTF-8"; public final static String KEY_X509 = "X509"; @@ -13,8 +13,8 @@ public final class RsaConst { public final static String RSA_CHIPER = "RSA/ECB/PKCS1Padding"; public final static int KEY_SIZE = 1024; - /** 1024bit 加密块 大小 */ + /** 1024bit 鍔犲瘑鍧� 澶у皬 */ public final static int ENCRYPT_KEYSIZE = 117; - /** 1024bit 解密块 大小 */ + /** 1024bit 瑙e瘑鍧� 澶у皬 */ public final static int DECRYPT_KEYSIZE = 128; } diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/RsaReadUtil.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/RsaReadUtil.java index 7eba9fe84..e70850eed 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/RsaReadUtil.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/RsaReadUtil.java @@ -23,14 +23,14 @@ import sun.misc.BASE64Decoder; //import com.jweb.//log.Logger; /** - * 公私钥读取工具
+ * 鍏閽ヨ鍙栧伐鍏�
*
* @version 4.1.0 */ public final class RsaReadUtil { /** - * 根据Cer文件读取公钥 + * 鏍规嵁Cer鏂囦欢璇诲彇鍏挜 * * @param pubCerPath * @return @@ -43,9 +43,9 @@ public final class RsaReadUtil { pubKeyStream.read(reads); return getPublicKeyByText(new String(reads)); } catch (FileNotFoundException e) { - // //log.error("公钥文件不存在:", e); + // //log.error("鍏挜鏂囦欢涓嶅瓨鍦�:", e); } catch (IOException e) { - // log.error("公钥文件读取失败:", e); + // log.error("鍏挜鏂囦欢璇诲彇澶辫触:", e); } finally { if (pubKeyStream != null) { try { @@ -59,7 +59,7 @@ public final class RsaReadUtil { } /** - * 根据公钥Cer文本串读取公钥 + * 鏍规嵁鍏挜Cer鏂囨湰涓茶鍙栧叕閽� * * @param pubKeyText * @return @@ -78,13 +78,13 @@ public final class RsaReadUtil { Certificate certificate = certificateFactory.generateCertificate(new ByteArrayInputStream(new BASE64Decoder().decodeBuffer(keyBuffer.toString()))); return certificate.getPublicKey(); } catch (Exception e) { - // log.error("解析公钥内容失败:", e); + // log.error("瑙f瀽鍏挜鍐呭澶辫触:", e); } return null; } /** - * 根据私钥路径读取私钥 + * 鏍规嵁绉侀挜璺緞璇诲彇绉侀挜 * * @param pfxPath * @param priKeyPass @@ -98,7 +98,7 @@ public final class RsaReadUtil { priKeyStream.read(reads); return getPrivateKeyByStream(reads, priKeyPass); } catch (Exception e) { - // log.error("解析文件,读取私钥失败:", e); + // log.error("瑙f瀽鏂囦欢锛岃鍙栫閽ュけ璐�:", e); } finally { if (priKeyStream != null) { try { @@ -112,7 +112,7 @@ public final class RsaReadUtil { } /** - * 根据PFX私钥字节流读取私钥 + * 鏍规嵁PFX绉侀挜瀛楄妭娴佽鍙栫閽� * * @param pfxBytes * @param priKeyPass @@ -130,16 +130,16 @@ public final class RsaReadUtil { } return (PrivateKey) ks.getKey(keyAlias, charPriKeyPass); } catch (IOException e) { - // 加密失败 - // log.error("解析文件,读取私钥失败:", e); + // 鍔犲瘑澶辫触 + // log.error("瑙f瀽鏂囦欢锛岃鍙栫閽ュけ璐�:", e); } catch (KeyStoreException e) { - // log.error("私钥存储异常:", e); + // log.error("绉侀挜瀛樺偍寮傚父:", e); } catch (NoSuchAlgorithmException e) { - // log.error("不存在的解密算法:", e); + // log.error("涓嶅瓨鍦ㄧ殑瑙e瘑绠楁硶:", e); } catch (CertificateException e) { - // log.error("证书异常:", e); + // log.error("璇佷功寮傚父:", e); } catch (UnrecoverableKeyException e) { - // log.error("不可恢复的秘钥异常", e); + // log.error("涓嶅彲鎭㈠鐨勭閽ュ紓甯�", e); } return null; } diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/SimRandom.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/SimRandom.java index 8ba9031df..ceeb08924 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/SimRandom.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/SimRandom.java @@ -7,9 +7,9 @@ import java.util.Random; /** * - * SimRandom算法 - * 使用相同的种子,返回相同的随机数 数组 - * 返回的随机数 数组经过去重处理 + * SimRandom绠楁硶 + * 浣跨敤鐩稿悓鐨勭瀛�,杩斿洖鐩稿悓鐨勯殢鏈烘暟 鏁扮粍 + * 杩斿洖鐨勯殢鏈烘暟 鏁扮粍缁忚繃鍘婚噸澶勭悊 * @author _tyler * */ @@ -18,15 +18,15 @@ public class SimRandom { /** * * - * 使用相同的Seed,返回相同的随机数 数组 注意:该数组经过去重处理,不包含相同的随机数数值 + * 浣跨敤鐩稿悓鐨凷eed,杩斿洖鐩稿悓鐨勯殢鏈烘暟 鏁扮粍 娉ㄦ剰锛氳鏁扮粍缁忚繃鍘婚噸澶勭悊,涓嶅寘鍚浉鍚岀殑闅忔満鏁版暟鍊� * * @param seed - * SimRandom种子值 + * SimRandom绉嶅瓙鍊� * @param max - * SimRandom最大值 + * SimRandom鏈�澶у�� * @param bits - * 返回的随机数位数,如:bits数值为2,则返回长度为2的List,List内容为生成的2个随机数 - * @return 返回生成的随机数数组,该数组不包含相同的值 + * 杩斿洖鐨勯殢鏈烘暟浣嶆暟,濡傦細bits鏁板�间负2锛屽垯杩斿洖闀垮害涓�2鐨凩ist,List鍐呭涓虹敓鎴愮殑2涓殢鏈烘暟 + * @return 杩斿洖鐢熸垚鐨勯殢鏈烘暟鏁扮粍,璇ユ暟缁勪笉鍖呭惈鐩稿悓鐨勫�� */ public static List getSimRandom(int seed, int max, int bits) { Random rand = new Random(seed); @@ -35,7 +35,7 @@ public class SimRandom { int num = 0; for (int i = 0; i <= bits; i++) { do { - num = rand.nextInt(max); // 如果产生的数相同继续循环 + num = rand.nextInt(max); // 濡傛灉浜х敓鐨勬暟鐩稿悓缁х画寰幆 } while (bool[num]); bool[num] = true; simRandoms.add(num); @@ -44,10 +44,10 @@ public class SimRandom { } /** - * 计算SimRandom的种子值 - * @param newTime 新的日期 - * @param oldTime 旧的日期 - * @return 新旧时间差值单位为天 + * 璁$畻SimRandom鐨勭瀛愬�� + * @param newTime 鏂扮殑鏃ユ湡 + * @param oldTime 鏃х殑鏃ユ湡 + * @return 鏂版棫鏃堕棿宸�煎崟浣嶄负澶� */ public static int getReduceDay(Calendar newTime, Calendar oldTime) { long between = (newTime.getTime().getTime() - oldTime.getTime().getTime()) / 1000; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/SogouConverter.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/SogouConverter.java index 2bbef83fd..cbc29d559 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/SogouConverter.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/SogouConverter.java @@ -34,33 +34,33 @@ public class SogouConverter { if (str[4] == 0x45) { hzPosition = 0x26C4; } - /******************** 字库名称开始 **************************/ + /******************** 瀛楀簱鍚嶇О寮�濮� **************************/ input.getChannel().position(0x130); int lenc = input.read(str, 0, 128); - System.out.println("字库名称:" + toString(str, lenc)); + System.out.println("瀛楀簱鍚嶇О:" + toString(str, lenc)); - /******************** 字库名称结束 *************************/ + /******************** 瀛楀簱鍚嶇О缁撴潫 *************************/ - /******************** 字库类别开始 **************************/ + /******************** 瀛楀簱绫诲埆寮�濮� **************************/ input.getChannel().position(0x338); lenc = input.read(str, 0, 128); - System.out.println("字库类别:" + toString(str, lenc)); + System.out.println("瀛楀簱绫诲埆:" + toString(str, lenc)); - /******************** 字库类别结束 *************************/ + /******************** 瀛楀簱绫诲埆缁撴潫 *************************/ - /******************** 字库信息开始 **************************/ + /******************** 瀛楀簱淇℃伅寮�濮� **************************/ input.getChannel().position(0x540); lenc = input.read(str, 0, 128); - System.out.println("字库信息:" + toString(str, lenc)); + System.out.println("瀛楀簱淇℃伅:" + toString(str, lenc)); - /******************** 字库信息结束 *************************/ + /******************** 瀛楀簱淇℃伅缁撴潫 *************************/ - /******************** 字库示例开始 **************************/ + /******************** 瀛楀簱绀轰緥寮�濮� **************************/ input.getChannel().position(0xd40); lenc = input.read(str, 0, 128); - System.out.println("字库示例:" + toString(str, lenc)); + System.out.println("瀛楀簱绀轰緥:" + toString(str, lenc)); - /******************** 字库示例结束 *************************/ + /******************** 瀛楀簱绀轰緥缁撴潫 *************************/ input.getChannel().position(0x1540); str = new byte[4]; @@ -76,7 +76,7 @@ public class SogouConverter { String py = new String(str, 0, num[2]); py = py.replaceAll("\0", ""); pyDic.put(mark, py); - if (py == "zuo") // 最后一个拼音 + if (py == "zuo") // 鏈�鍚庝竴涓嫾闊� { break; } @@ -91,7 +91,7 @@ public class SogouConverter { input.read(num, 0, 4); samePYcount = num[0] + num[1] * 256; count = num[2] + num[3] * 256; - // 接下来读拼音 + // 鎺ヤ笅鏉ヨ鎷奸煶 str = new byte[256]; for (i = 0; i < count; i++) { str[i] = (byte) input.read(); @@ -101,8 +101,8 @@ public class SogouConverter { int key = str[i * 2] + str[i * 2 + 1] * 256; wordPY += pyDic.get(key) + " "; } - // 接下来读词语 - for (int s = 0; s < samePYcount; s++) // 同音词,使用前面相同的拼音 + // 鎺ヤ笅鏉ヨ璇嶈 + for (int s = 0; s < samePYcount; s++) // 鍚岄煶璇嶏紝浣跨敤鍓嶉潰鐩稿悓鐨勬嫾闊� { num = new byte[2]; input.read(num, 0, 2); @@ -116,7 +116,7 @@ public class SogouConverter { temp[i] = (byte) input.read(); } } - if (file.length() == input.getChannel().position()) // 判断文件结束 + if (file.length() == input.getChannel().position()) // 鍒ゆ柇鏂囦欢缁撴潫 { input.close(); break; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/SourceUtils.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/SourceUtils.java index 170151ce8..8085cc2e0 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/SourceUtils.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/util/SourceUtils.java @@ -28,10 +28,10 @@ public class SourceUtils { }else if(!isContainsSites(s) && !referer.contains("utm_medium")){ value = "Referral"; }else{ - value = "其它"; + value = "鍏跺畠"; } } else{ - value = "其它"; + value = "鍏跺畠"; } return value; diff --git a/projects/fangjia-dal/pom.xml b/projects/fangjia-dal/pom.xml index b5da0436e..36a699406 100644 --- a/projects/fangjia-dal/pom.xml +++ b/projects/fangjia-dal/pom.xml @@ -7,7 +7,7 @@ 0.0.1-SNAPSHOT fangjia-dal - GBK + UTF-8 fangjia-dal @@ -19,7 +19,7 @@ 1.6 1.6 - GBK + UTF-8 diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/AbstractEntityDao.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/AbstractEntityDao.java index 0ccda69a9..1147152d6 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/AbstractEntityDao.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/AbstractEntityDao.java @@ -13,7 +13,7 @@ import java.lang.reflect.Type; import java.util.List; /** - * EntityDao的虚基类,实现了实体类的反射,并定义了findByParams,updateByParams和deleteByParams等方法 + * EntityDao鐨勮櫄鍩虹被锛屽疄鐜颁簡瀹炰綋绫荤殑鍙嶅皠锛屽苟瀹氫箟浜唂indByParams锛寀pdateByParams鍜宒eleteByParams绛夋柟娉� * * @author velna * @@ -84,12 +84,12 @@ public abstract class AbstractEntityDao findAllByParams(List params, List sortParams, int firstResult, int maxResults) { @@ -152,7 +152,7 @@ public abstract class AbstractEntityDao extends AbstractJp protected abstract List find(DBObject query, DBObject fields, DBObject sort, int skip, int limit); protected DBObject internalFindAndModify(DBObject query, DBObject fields, DBObject sort, DBObject update, boolean returnNew){ - throw new UnsupportedOperationException("非法访问"); + throw new UnsupportedOperationException("闈炴硶璁块棶"); } /** - * 根据id查询 + * 鏍规嵁id鏌ヨ * * @param id * @return @@ -88,7 +88,7 @@ public abstract class AbstractMongoDao extends AbstractJp } // /** -// * 根据id查询,将结果转换成一个map +// * 鏍规嵁id鏌ヨ锛屽皢缁撴灉杞崲鎴愪竴涓猰ap // * // * @param id // * @return @@ -189,7 +189,7 @@ public abstract class AbstractMongoDao extends AbstractJp } // /** -// * 参数化查询,将结果转换成一个map list +// * 鍙傛暟鍖栨煡璇紝灏嗙粨鏋滆浆鎹㈡垚涓�涓猰ap list // * // * @param params // * @param sortParams @@ -271,16 +271,16 @@ public abstract class AbstractMongoDao extends AbstractJp } /** - * 参数化更新数据 + * 鍙傛暟鍖栨洿鏂版暟鎹� * * @param data - * 需要更新的字段名和字段值,key为字段名,value为字段值 + * 闇�瑕佹洿鏂扮殑瀛楁鍚嶅拰瀛楁鍊硷紝key涓哄瓧娈靛悕锛寁alue涓哄瓧娈靛�� * @param params - * 查询参数列表 + * 鏌ヨ鍙傛暟鍒楄〃 * @param upsert - * 为true时,查询不存在则插入 + * 涓簍rue鏃讹紝鏌ヨ涓嶅瓨鍦ㄥ垯鎻掑叆 * @param multi - * 为true时更新所有匹配的结果集,否则只更新第一个结果集 + * 涓簍rue鏃舵洿鏂版墍鏈夊尮閰嶇殑缁撴灉闆嗭紝鍚﹀垯鍙洿鏂扮涓�涓粨鏋滈泦 */ public void updateByParams(Map data, List params, boolean upsert, boolean multi) { DBObject dataToUpdate = this.dataToDBObject(data); @@ -374,7 +374,7 @@ public abstract class AbstractMongoDao extends AbstractJp * @see {@link AbstractMongoDao#updateByParams(Map, List, boolean, boolean)} * @param data * @param params - * @param upsert 默认为true + * @param upsert 榛樿涓簍rue */ public void updateByParams(Map data, List params, boolean upsert) { updateByParams(data, params, upsert, true); @@ -382,7 +382,7 @@ public abstract class AbstractMongoDao extends AbstractJp /** * @see {@link AbstractMongoDao#updateByParams(Map, List, boolean, boolean)} - * @param data 需要更新的字段名和字段值,key为字段名,value为字段值 + * @param data 闇�瑕佹洿鏂扮殑瀛楁鍚嶅拰瀛楁鍊硷紝key涓哄瓧娈靛悕锛寁alue涓哄瓧娈靛�� * @param params */ public void updateByParams(Map data, List params) { @@ -562,7 +562,7 @@ public abstract class AbstractMongoDao extends AbstractJp throw new IllegalArgumentException("bracket logic is not supported"); } if (QueryParam.AND_LOGIC.equals(param.getParamLogic())) { - //增加$sr 字符串原始查询方法 + //澧炲姞$sr 瀛楃涓插師濮嬫煡璇㈡柟娉� if (paramName.equals(QueryParam.SR_STR_PARAM_NAME)) { builder.and(QueryParam.SR_PARAM_NAME); } else { @@ -693,7 +693,7 @@ public abstract class AbstractMongoDao extends AbstractJp } public List findByParamsWithDistinct(List params, String field) { - throw new UnsupportedOperationException("非法访问"); + throw new UnsupportedOperationException("闈炴硶璁块棶"); } } \ No newline at end of file diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/AbstractSqlDao.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/AbstractSqlDao.java index 1fc719c78..23041c5f0 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/AbstractSqlDao.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/AbstractSqlDao.java @@ -245,7 +245,7 @@ public abstract class AbstractSqlDao extends AbstractEntity } /** - * 根据参数得到sql中where子句 + * 鏍规嵁鍙傛暟寰楀埌sql涓瓀here瀛愬彞 * * @param params * @return @@ -339,7 +339,7 @@ public abstract class AbstractSqlDao extends AbstractEntity } /** - * 得到排序语句 + * 寰楀埌鎺掑簭璇彞 * * @param sortParams * @return diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/DatastoreDaoImpl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/DatastoreDaoImpl.java index 96262fe73..982027793 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/DatastoreDaoImpl.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/DatastoreDaoImpl.java @@ -43,7 +43,7 @@ public abstract class DatastoreDaoImpl extends Abstra return query; } String[] cat = null; - // 查询条件指定cat,则用条件里的;否则用对象注解里的cat + // 鏌ヨ鏉′欢鎸囧畾cat锛屽垯鐢ㄦ潯浠堕噷鐨勶紱鍚﹀垯鐢ㄥ璞℃敞瑙i噷鐨刢at if (StringUtils.isNotBlank((String) query.get(CATEGORY_KEY))) { cat = StringUtils.split((String) query.get(CATEGORY_KEY), ","); } else { diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/EntityDao.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/EntityDao.java index f7c4b20c9..723ef1503 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/EntityDao.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/EntityDao.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.Map; /** - * 所有DAO的接口 + * 鎵�鏈塂AO鐨勬帴鍙� * * @author velna * @@ -15,7 +15,7 @@ import java.util.Map; public interface EntityDao { /** - * 根据id查找对象 + * 鏍规嵁id鏌ユ壘瀵硅薄 * * @param id * @return @@ -23,14 +23,14 @@ public interface EntityDao { E findById(K id); /** - * 查找所有对象 + * 鏌ユ壘鎵�鏈夊璞� * * @return */ List findAll(); /** - * 根据id列表查找所有对象,返回的列表根据传入的idList排序 + * 鏍规嵁id鍒楄〃鏌ユ壘鎵�鏈夊璞★紝杩斿洖鐨勫垪琛ㄦ牴鎹紶鍏ョ殑idList鎺掑簭 * * @param idList * @return @@ -38,42 +38,42 @@ public interface EntityDao { List findAllByIds(List idList); /** - * 得到所有数量 + * 寰楀埌鎵�鏈夋暟閲� * * @return */ long findCount(); /** - * 向数据库插入一条数据 + * 鍚戞暟鎹簱鎻掑叆涓�鏉℃暟鎹� * * @param entity */ void save(E entity); /** - * 向数据库插入一批数据 + * 鍚戞暟鎹簱鎻掑叆涓�鎵规暟鎹� * * @param entities */ void saveList(List entities); /** - * 根据id删除一条数据 + * 鏍规嵁id鍒犻櫎涓�鏉℃暟鎹� * * @param id */ void deleteById(K id); /** - * 根据id列表删除一批数据 + * 鏍规嵁id鍒楄〃鍒犻櫎涓�鎵规暟鎹� * * @param idList */ void deleteByIds(List idList); /** - * 得到对应的实体类 + * 寰楀埌瀵瑰簲鐨勫疄浣撶被 * * @return */ @@ -82,30 +82,30 @@ public interface EntityDao { /** * * @param params - * 查询参数列表 + * 鏌ヨ鍙傛暟鍒楄〃 * @param sortParams - * 排序参数列表 + * 鎺掑簭鍙傛暟鍒楄〃 * @param firstResult - * 查询偏移 + * 鏌ヨ鍋忕Щ * @param maxResults - * 查询最大结果集数量 + * 鏌ヨ鏈�澶х粨鏋滈泦鏁伴噺 * @param columns - * 需要返回的字段 + * 闇�瑕佽繑鍥炵殑瀛楁 * @return */ List findAllByParams(List params, List sortParams, int firstResult, int maxResults, String[] columns); /** - * 参数化的查询 + * 鍙傛暟鍖栫殑鏌ヨ * * @param params - * 查询参数列表 + * 鏌ヨ鍙傛暟鍒楄〃 * @param sortParams - * 排序参数列表 + * 鎺掑簭鍙傛暟鍒楄〃 * @param firstResult - * 查询偏移 + * 鏌ヨ鍋忕Щ * @param maxResults - * 查询最大结果集数量 + * 鏌ヨ鏈�澶х粨鏋滈泦鏁伴噺 * @return */ List findAllByParams(List params, List sortParams, int firstResult, int maxResults); @@ -146,12 +146,12 @@ public interface EntityDao { List findAllByParams(List params, int firstResult, int maxResults); /** - * 参数化查询,只返回第一条数据 + * 鍙傛暟鍖栨煡璇紝鍙繑鍥炵涓�鏉℃暟鎹� * * @param params - * 查询参数列表 + * 鏌ヨ鍙傛暟鍒楄〃 * @param sortParams - * 排序参数列表 + * 鎺掑簭鍙傛暟鍒楄〃 * @return */ E findFirstByParams(List params, List sortParams); @@ -164,16 +164,16 @@ public interface EntityDao { E findFirstByParams(List params); /** - * 参数化查询数量 + * 鍙傛暟鍖栨煡璇㈡暟閲� * * @param params - * 查询参数列表 + * 鏌ヨ鍙傛暟鍒楄〃 * @return */ long findCountByParams(List params); /** - * 根据id更新实体 + * 鏍规嵁id鏇存柊瀹炰綋 * * @param entity * @@ -181,34 +181,34 @@ public interface EntityDao { void update(E entity); /** - * 根据id更新数据 + * 鏍规嵁id鏇存柊鏁版嵁 * * @param data - * 需要更新的字段名和字段值,key为字段名,value为字段值 + * 闇�瑕佹洿鏂扮殑瀛楁鍚嶅拰瀛楁鍊硷紝key涓哄瓧娈靛悕锛寁alue涓哄瓧娈靛�� * @param id */ void updateById(Map data, K id); /** - * 参数化更新数据 + * 鍙傛暟鍖栨洿鏂版暟鎹� * * @param data - * 需要更新的字段名和字段值,key为字段名,value为字段值 + * 闇�瑕佹洿鏂扮殑瀛楁鍚嶅拰瀛楁鍊硷紝key涓哄瓧娈靛悕锛寁alue涓哄瓧娈靛�� * @param params - * 查询参数列表 + * 鏌ヨ鍙傛暟鍒楄〃 */ void updateByParams(Map data, List params); /** - * 参数化删除数据 + * 鍙傛暟鍖栧垹闄ゆ暟鎹� * * @param params - * 查询参数列表 + * 鏌ヨ鍙傛暟鍒楄〃 */ void deleteByParams(List params); /** - * 删除所有数据 + * 鍒犻櫎鎵�鏈夋暟鎹� */ void deleteAll(); } diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/MongoDao.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/MongoDao.java index a09a8c9bb..10b41cbbb 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/MongoDao.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/MongoDao.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.Map; /** - * mongodb的DAO接口,实体类必须实现MongoEntity接口,id必须是String类型 + * mongodb鐨凞AO鎺ュ彛锛屽疄浣撶被蹇呴』瀹炵幇MongoEntity鎺ュ彛锛宨d蹇呴』鏄疭tring绫诲瀷 * * @author velna * @@ -14,26 +14,26 @@ public interface MongoDao extends EntityDao { /** * @see {@link AbstractMongoDao#updateByParams(Map, List, boolean, boolean)} - * @param upsert 默认为true + * @param upsert 榛樿涓簍rue * @return */ void updateByParams(Map data, List params, boolean upsert); /** - * 参数化更新数据 + * 鍙傛暟鍖栨洿鏂版暟鎹� * * @param data - * 需要更新的字段名和字段值,key为字段名,value为字段值 + * 闇�瑕佹洿鏂扮殑瀛楁鍚嶅拰瀛楁鍊硷紝key涓哄瓧娈靛悕锛寁alue涓哄瓧娈靛�� * @param params - * 查询参数列表 + * 鏌ヨ鍙傛暟鍒楄〃 * @param upsert - * 为true时,查询不存在则插入 + * 涓簍rue鏃讹紝鏌ヨ涓嶅瓨鍦ㄥ垯鎻掑叆 * @param multi - * 为true时更新所有匹配的结果集,否则只更新第一个结果集 + * 涓簍rue鏃舵洿鏂版墍鏈夊尮閰嶇殑缁撴灉闆嗭紝鍚﹀垯鍙洿鏂扮涓�涓粨鏋滈泦 */ public void updateByParams(Map data, List params, boolean upsert, boolean multi); /** - * 对键值进行去重查询 + * 瀵归敭鍊艰繘琛屽幓閲嶆煡璇� * @param params * @param field * @return diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/MongoDaoImpl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/MongoDaoImpl.java index e2ab30b3c..34dfcb27b 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/MongoDaoImpl.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/MongoDaoImpl.java @@ -11,7 +11,7 @@ import org.apache.commons.lang.StringUtils; import org.bson.types.BasicBSONList; /** - * monodb的实现类 + * monodb鐨勫疄鐜扮被 * * @author velna * @@ -35,7 +35,7 @@ public abstract class MongoDaoImpl extends AbstractMongoD } /** - * 得到集合 + * 寰楀埌闆嗗悎 * * @return */ @@ -43,7 +43,7 @@ public abstract class MongoDaoImpl extends AbstractMongoD DBCollection dbCollection = mongo.getDB(dbName).getCollection(collectionName); dbCollection.setWriteConcern(WriteConcern.SAFE); /** - * 通过系统变量控制是否启用读写分离 + * 閫氳繃绯荤粺鍙橀噺鎺у埗鏄惁鍚敤璇诲啓鍒嗙 */ if("true".equals(System.getProperty("rwSeparation", "false"))) { dbCollection.addOption(Bytes.QUERYOPTION_SLAVEOK); @@ -141,12 +141,12 @@ public abstract class MongoDaoImpl extends AbstractMongoD /** - * 求某个数字字段的和 + * 姹傛煇涓暟瀛楀瓧娈电殑鍜� * * @param params - * 查询条件 + * 鏌ヨ鏉′欢 * @param field - * 统计字段 + * 缁熻瀛楁 * @return */ @SuppressWarnings("unchecked") @@ -175,7 +175,7 @@ public abstract class MongoDaoImpl extends AbstractMongoD } /** - * group by 查询 + * group by 鏌ヨ * * @param params * @param groupFields @@ -212,7 +212,7 @@ public abstract class MongoDaoImpl extends AbstractMongoD } } /** - * 对键值进行去重查询 + * 瀵归敭鍊艰繘琛屽幓閲嶆煡璇� * @param params * @param field * @return diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/QueryParam.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/QueryParam.java index 4df7c56c5..b0ca8e871 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/QueryParam.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/QueryParam.java @@ -3,7 +3,7 @@ package com.fangjia.dal; import java.util.List; /** - * query 参数, 比如a>b + * query 鍙傛暟, 姣斿a>b * * @author Administrator * @@ -39,7 +39,7 @@ public class QueryParam { public static final String SR_PARAM_NAME = "$sr"; - //$sr 原始字符串查询 + //$sr 鍘熷瀛楃涓叉煡璇� public static final String SR_STR_PARAM_NAME = "$srByStr"; public static final String SD_PARAM_NAME = "$sd"; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/SeaweedDaoImpl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/SeaweedDaoImpl.java index 076998d9d..35342a759 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/SeaweedDaoImpl.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/SeaweedDaoImpl.java @@ -54,7 +54,7 @@ public abstract class SeaweedDaoImpl extends AbstractMo return query; } String[] cat = null; - // 查询条件指定cat,则用条件里的;否则用对象注解里的cat + // 鏌ヨ鏉′欢鎸囧畾cat锛屽垯鐢ㄦ潯浠堕噷鐨勶紱鍚﹀垯鐢ㄥ璞℃敞瑙i噷鐨刢at if (StringUtils.isNotBlank((String) query.get(CATEGORY_KEY))) { cat = StringUtils.split((String) query.get(CATEGORY_KEY), ","); } else { diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/common/CategoryEnum.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/common/CategoryEnum.java index 2b5704267..68be1aa0b 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/common/CategoryEnum.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/common/CategoryEnum.java @@ -4,7 +4,7 @@ public enum CategoryEnum { SELL, RENT, DISTRICT, EVALUATION, NEWS, SCHOOL, NEW_DISTRICT, DIARY, WEIBO, LOUPING, DISTRICT_DYNAMICS; /** - * 得到实际数据库中的值 + * 寰楀埌瀹為檯鏁版嵁搴撲腑鐨勫�� * * @return */ diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/common/DistrictKey.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/common/DistrictKey.java index c9d678784..7f87ab6d7 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/common/DistrictKey.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/common/DistrictKey.java @@ -10,7 +10,7 @@ import com.fangjia.core.util.DataUtil; import com.fangjia.dal.seaweed.model.District; /** - * 用来表示小区的唯一key,由城市,区域和小区名组成 + * 鐢ㄦ潵琛ㄧず灏忓尯鐨勫敮涓�key锛岀敱鍩庡競锛屽尯鍩熷拰灏忓尯鍚嶇粍鎴� * * @author velna * @@ -45,7 +45,7 @@ public class DistrictKey implements Serializable { } /** - * 如果city, region, name都不为null或空白字符串,则返回true,否则返回false + * 濡傛灉city, region, name閮戒笉涓簄ull鎴栫┖鐧藉瓧绗︿覆锛屽垯杩斿洖true锛屽惁鍒欒繑鍥瀎alse * * @return */ diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/common/RegionKey.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/common/RegionKey.java index 68c100e48..1738b3d4d 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/common/RegionKey.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/common/RegionKey.java @@ -25,7 +25,7 @@ public class RegionKey implements Serializable { } /** - * 如果city, region都不为null或空白字符串,则返回true,否则返回false + * 濡傛灉city, region閮戒笉涓簄ull鎴栫┖鐧藉瓧绗︿覆锛屽垯杩斿洖true锛屽惁鍒欒繑鍥瀎alse * * @return */ diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/common/SchoolKey.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/common/SchoolKey.java index 74688bbce..2f8d1c976 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/common/SchoolKey.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/common/SchoolKey.java @@ -7,7 +7,7 @@ import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; /** - * 用来表示学校的唯一key,由城市,区域和学校名组成 + * 鐢ㄦ潵琛ㄧず瀛︽牎鐨勫敮涓�key锛岀敱鍩庡競锛屽尯鍩熷拰瀛︽牎鍚嶇粍鎴� * * @author dxy * @@ -37,7 +37,7 @@ public class SchoolKey implements Serializable { } /** - * 如果city, region, name都不为null或空白字符串,则返回true,否则返回false + * 濡傛灉city, region, name閮戒笉涓簄ull鎴栫┖鐧藉瓧绗︿覆锛屽垯杩斿洖true锛屽惁鍒欒繑鍥瀎alse * * @return */ diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/common/ServerAreaData.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/common/ServerAreaData.java index a83696b86..15830beea 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/common/ServerAreaData.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/common/ServerAreaData.java @@ -22,7 +22,7 @@ public class ServerAreaData { public static ServerArea defaultServerArea; protected static Map homeMapCities = Collections.emptyMap(); protected static Map> sectionMap = Collections.emptyMap(); - protected static Map> sortedServerAreaMapGroupByFirstSpell = Collections.emptyMap();// 按首字母分组,排序号排序 + protected static Map> sortedServerAreaMapGroupByFirstSpell = Collections.emptyMap();// 鎸夐瀛楁瘝鍒嗙粍,鎺掑簭鍙锋帓搴� protected static Map nameMap = Collections.emptyMap(); protected static Map spellMap = Collections.emptyMap(); protected static Map displayMap = Collections.emptyMap(); @@ -38,10 +38,10 @@ public class ServerAreaData { /*****************************************************************************************************/ /** - * 根据name或spell获取ServerArea对象 + * 鏍规嵁name鎴杝pell鑾峰彇ServerArea瀵硅薄 * *

- * 若name匹配到,则返回ServerArea对象,否则返回spell匹配到的ServerArea对象 + * 鑻ame鍖归厤鍒帮紝鍒欒繑鍥濻erverArea瀵硅薄锛屽惁鍒欒繑鍥瀞pell鍖归厤鍒扮殑ServerArea瀵硅薄 *

* * @param str @@ -61,7 +61,7 @@ public class ServerAreaData { } /** - * 找不到 ,返回NULL + * 鎵句笉鍒� 锛岃繑鍥濶ULL * * @param display * @return @@ -81,7 +81,7 @@ public class ServerAreaData { } /** - * 通过全拼查找城市 + * 閫氳繃鍏ㄦ嫾鏌ユ壘鍩庡競 * * @param spell * @return @@ -97,10 +97,10 @@ public class ServerAreaData { } /** - * 根据name或spell获取ServerArea对象 + * 鏍规嵁name鎴杝pell鑾峰彇ServerArea瀵硅薄 * *

- * 若name匹配到,则返回ServerArea对象,否则返回spell匹配到的ServerArea对象 + * 鑻ame鍖归厤鍒帮紝鍒欒繑鍥濻erverArea瀵硅薄锛屽惁鍒欒繑鍥瀞pell鍖归厤鍒扮殑ServerArea瀵硅薄 *

* * @param str @@ -115,10 +115,10 @@ public class ServerAreaData { } /** - * 根据name或spell获取ServerArea对象 + * 鏍规嵁name鎴杝pell鑾峰彇ServerArea瀵硅薄 * *

- * 若name匹配到,则返回ServerArea对象,否则返回spell匹配到的ServerArea对象 + * 鑻ame鍖归厤鍒帮紝鍒欒繑鍥濻erverArea瀵硅薄锛屽惁鍒欒繑鍥瀞pell鍖归厤鍒扮殑ServerArea瀵硅薄 *

* * @param str @@ -133,7 +133,7 @@ public class ServerAreaData { } /** - * 通过name得到ServerArea对象,找不到返回 defaultServerArea + * 閫氳繃name寰楀埌ServerArea瀵硅薄锛屾壘涓嶅埌杩斿洖 defaultServerArea * * @param spell * @return @@ -152,7 +152,7 @@ public class ServerAreaData { } /** - * 通过spell得到ServerArea对象,找不到返回null + * 閫氳繃spell寰楀埌ServerArea瀵硅薄锛屾壘涓嶅埌杩斿洖null * * @param spell * @return @@ -168,7 +168,7 @@ public class ServerAreaData { } /** - * 根据输入的字符串中包含某个城市名称就认为就是那个城市的 比如输入的字符串为浙江省杭州市就认为是杭州市的 如果没有找到某个城市则返回null + * 鏍规嵁杈撳叆鐨勫瓧绗︿覆涓寘鍚煇涓煄甯傚悕绉板氨璁や负灏辨槸閭d釜鍩庡競鐨� 姣斿杈撳叆鐨勫瓧绗︿覆涓烘禉姹熺渷鏉窞甯傚氨璁や负鏄澀宸炲競鐨� 濡傛灉娌℃湁鎵惧埌鏌愪釜鍩庡競鍒欒繑鍥瀗ull * * @param country * @return @@ -243,7 +243,7 @@ public class ServerAreaData { } /** - * 获取N个城市名 + * 鑾峰彇N涓煄甯傚悕 * * @param size * @return @@ -261,7 +261,7 @@ public class ServerAreaData { } /** - * 获取支持短租的城市列表 + * 鑾峰彇鏀寔鐭鐨勫煄甯傚垪琛� * * @return */ diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/common/ServerAreaDataImpl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/common/ServerAreaDataImpl.java index 9b0e27783..336bb2b45 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/common/ServerAreaDataImpl.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/common/ServerAreaDataImpl.java @@ -133,10 +133,10 @@ public class ServerAreaDataImpl extends ServerAreaData implements PriorityOrdere } /** - * 按首字母分组,Sequence排序 + * 鎸夐瀛楁瘝鍒嗙粍锛孲equence鎺掑簭 * * @param _serverAreaList - * (所有的城市列表,不包含全国) + * (鎵�鏈夌殑鍩庡競鍒楄〃锛屼笉鍖呭惈鍏ㄥ浗) * @return */ @SuppressWarnings("unchecked") diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/common/XcxKey.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/common/XcxKey.java index 3b76a5f0e..4c74b43cb 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/common/XcxKey.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/common/XcxKey.java @@ -3,7 +3,7 @@ package com.fangjia.dal.common; import java.io.Serializable; /** - * 用来表示小区的唯一key,由城市,区域和小区名组成 + * 鐢ㄦ潵琛ㄧず灏忓尯鐨勫敮涓�key锛岀敱鍩庡競锛屽尯鍩熷拰灏忓尯鍚嶇粍鎴� * * @author velna * diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/datastore/model/AddressRepo.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/datastore/model/AddressRepo.java index ae4ac028b..086e14ae5 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/datastore/model/AddressRepo.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/datastore/model/AddressRepo.java @@ -20,9 +20,9 @@ public class AddressRepo extends BaseHouse implements DatastoreEntity { private String region; private String name; private List alias; - private String address; // 地址 + private String address; // 鍦板潃 private List addrAlias; - private Long lat; // 百度经纬度 + private Long lat; // 鐧惧害缁忕含搴� private Long lng; private Date cdate; private Date mdate; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/datastore/model/House.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/datastore/model/House.java index 3f94785b7..f232f5cf5 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/datastore/model/House.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/datastore/model/House.java @@ -20,7 +20,7 @@ import com.fangjia.dal.common.RegionKey; @Entity @Table(name = "fangjia.seabird") /* - * * 字段定义 {@link + * * 瀛楁瀹氫箟 {@link * http://wiki.qa.goojia.com/index.php/Fangjia.seabird%E5%AD%97%E6% * AE%B5%E5%AE%9A%E4%B9%89} */ @@ -76,10 +76,10 @@ public class House extends BaseHouse implements DatastoreEntity, Cloneable { private String keyword; private String partner; private String districtNameKey; - private Long bscore; // 房源基本分 + private Long bscore; // 鎴挎簮鍩烘湰鍒� private Long nscore; private int reason; - private Long lat;// 经纬度字段,以及最大最小经纬度字段 + private Long lat;// 缁忕含搴﹀瓧娈碉紝浠ュ強鏈�澶ф渶灏忕粡绾害瀛楁 private Long lng; private String cat; private Integer age; @@ -101,7 +101,7 @@ public class House extends BaseHouse implements DatastoreEntity, Cloneable { private String roomNum; private String remark; /** - * 是否是地铁房 + * 鏄惁鏄湴閾佹埧 */ private Integer ifMetro; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/datastore/model/Information.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/datastore/model/Information.java index 378a02382..676cec92b 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/datastore/model/Information.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/datastore/model/Information.java @@ -34,21 +34,21 @@ public class Information implements DatastoreEntity { */ private String name; /** - * 类型 + * 绫诲瀷 */ private String category; private int status; /** - * 资讯摘要 + * 璧勮鎽樿 */ private String summary; /** - * 来源 + * 鏉ユ簮 */ private String source; /** - * 房源描述 (正文) + * 鎴挎簮鎻忚堪 (姝f枃) */ private String description; @@ -92,7 +92,7 @@ public class Information implements DatastoreEntity { private String partner; private String districtNameRegion; private int reason; - private Long lat;// 经纬度字段,以及最大最小经纬度字段 + private Long lat;// 缁忕含搴﹀瓧娈碉紝浠ュ強鏈�澶ф渶灏忕粡绾害瀛楁 private Long lng; private String cat; private Integer age; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/datastore/model/News.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/datastore/model/News.java index 5c381f21d..d81011d79 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/datastore/model/News.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/datastore/model/News.java @@ -31,21 +31,21 @@ public class News implements DatastoreEntity { */ private String name; /** - * 类型 + * 绫诲瀷 */ private String category; private int status; /** - * 资讯摘要 + * 璧勮鎽樿 */ private String summary; /** - * 来源 + * 鏉ユ簮 */ private String source; /** - * 房源描述 (正文) + * 鎴挎簮鎻忚堪 (姝f枃) */ private String description; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/datastore/model/OfficeHouseRent.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/datastore/model/OfficeHouseRent.java index 307cc6a04..a0e04caf8 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/datastore/model/OfficeHouseRent.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/datastore/model/OfficeHouseRent.java @@ -40,7 +40,7 @@ public class OfficeHouseRent extends BaseHouse implements DatastoreEntity { private Integer totalPriceRange; private Integer avgPrice; /** - * 出租类型 + * 鍑虹绫诲瀷 */ private String rentType; private Double area; @@ -67,7 +67,7 @@ public class OfficeHouseRent extends BaseHouse implements DatastoreEntity { private List pics; private String keyword; private int ifPic; - private Long bscore; // 房源基本分 + private Long bscore; // 鎴挎簮鍩烘湰鍒� private Long nscore; private Integer age; private Integer visible; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/datastore/model/OfficeHouseSell.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/datastore/model/OfficeHouseSell.java index d2c66b070..333c218fc 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/datastore/model/OfficeHouseSell.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/datastore/model/OfficeHouseSell.java @@ -20,7 +20,7 @@ import com.fangjia.dal.common.RegionKey; @Entity @Table(name = "fangjia.seabird") /* - * * 字段定义 {@link + * * 瀛楁瀹氫箟 {@link * http://wiki.qa.goojia.com/index.php/Fangjia.seabird%E5%AD%97%E6% * AE%B5%E5%AE%9A%E4%B9%89} */ @@ -74,10 +74,10 @@ public class OfficeHouseSell extends BaseHouse implements DatastoreEntity { private String keyword; private String partner; private String districtNameKey; - private Long bscore; // 房源基本分 + private Long bscore; // 鎴挎簮鍩烘湰鍒� private Long nscore; private int reason; - private Long lat;// 经纬度字段,以及最大最小经纬度字段 + private Long lat;// 缁忕含搴﹀瓧娈碉紝浠ュ強鏈�澶ф渶灏忕粡绾害瀛楁 private Long lng; private String cat; private Integer age; @@ -94,7 +94,7 @@ public class OfficeHouseSell extends BaseHouse implements DatastoreEntity { private String station; private String school; /** - * 是否是地铁房 + * 鏄惁鏄湴閾佹埧 */ private Integer ifMetro; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/datastore/model/RentHouse.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/datastore/model/RentHouse.java index 63a13c075..ae6b5f352 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/datastore/model/RentHouse.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/datastore/model/RentHouse.java @@ -41,7 +41,7 @@ public class RentHouse extends BaseHouse implements DatastoreEntity { private Integer avgPrice; /** - * 出租类型 + * 鍑虹绫诲瀷 */ private String rentType; private Double area; @@ -68,7 +68,7 @@ public class RentHouse extends BaseHouse implements DatastoreEntity { private List pics; private String keyword; private int ifPic; - private Long bscore; // 房源基本分 + private Long bscore; // 鎴挎簮鍩烘湰鍒� private Long nscore; private Integer age; private Integer visible; @@ -91,10 +91,10 @@ public class RentHouse extends BaseHouse implements DatastoreEntity { private String remark; private String source; private String paymentPattern; - private String line;// 公交线路 - private String houseAllocation;// 房屋配置,分割 - private String houseAdvantage;// 房屋亮点 - private String houseRequire;// 房源描述 + private String line;// 鍏氦绾胯矾 + private String houseAllocation;// 鎴垮眿閰嶇疆,鍒嗗壊 + private String houseAdvantage;// 鎴垮眿浜偣 + private String houseRequire;// 鎴挎簮鎻忚堪 @Transient @Column(name = "source") diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/datastore/model/ShopHouseRent.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/datastore/model/ShopHouseRent.java index 633aff0b7..ee732ab39 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/datastore/model/ShopHouseRent.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/datastore/model/ShopHouseRent.java @@ -40,7 +40,7 @@ public class ShopHouseRent extends BaseHouse implements DatastoreEntity { private Integer totalPriceRange; private Integer avgPrice; /** - * 出租类型 + * 鍑虹绫诲瀷 */ private String rentType; private Double area; @@ -67,7 +67,7 @@ public class ShopHouseRent extends BaseHouse implements DatastoreEntity { private List pics; private String keyword; private int ifPic; - private Long bscore; // 房源基本分 + private Long bscore; // 鎴挎簮鍩烘湰鍒� private Long nscore; private Integer age; private Integer visible; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/datastore/model/ShopHouseSell.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/datastore/model/ShopHouseSell.java index d0d2f6449..dbfbb106f 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/datastore/model/ShopHouseSell.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/datastore/model/ShopHouseSell.java @@ -20,7 +20,7 @@ import com.fangjia.dal.common.RegionKey; @Entity @Table(name = "fangjia.seabird") /* - * * 字段定义 {@link + * * 瀛楁瀹氫箟 {@link * http://wiki.qa.goojia.com/index.php/Fangjia.seabird%E5%AD%97%E6% * AE%B5%E5%AE%9A%E4%B9%89} */ @@ -74,10 +74,10 @@ public class ShopHouseSell extends BaseHouse implements DatastoreEntity { private String keyword; private String partner; private String districtNameKey; - private Long bscore; // 房源基本分 + private Long bscore; // 鎴挎簮鍩烘湰鍒� private Long nscore; private int reason; - private Long lat;// 经纬度字段,以及最大最小经纬度字段 + private Long lat;// 缁忕含搴﹀瓧娈碉紝浠ュ強鏈�澶ф渶灏忕粡绾害瀛楁 private Long lng; private String cat; private Integer age; @@ -94,7 +94,7 @@ public class ShopHouseSell extends BaseHouse implements DatastoreEntity { private String station; private String school; /** - * 是否是地铁房 + * 鏄惁鏄湴閾佹埧 */ private Integer ifMetro; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/address/model/AMapAddressPOIResult.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/address/model/AMapAddressPOIResult.java index 491517276..da4f08f51 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/address/model/AMapAddressPOIResult.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/address/model/AMapAddressPOIResult.java @@ -45,9 +45,9 @@ public class AMapAddressPOIResult implements MongoEntity { private String level; private int levelcode; private String poiType; - //搜索词 + //鎼滅储璇� private String queryStr; - //搜索词下的顺序 + //鎼滅储璇嶄笅鐨勯『搴� private int order; private double relateRadio; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/cpc/dao/CpcStatDao.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/cpc/dao/CpcStatDao.java index 53601cbbe..f04945885 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/cpc/dao/CpcStatDao.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/cpc/dao/CpcStatDao.java @@ -42,12 +42,12 @@ public interface CpcStatDao extends MongoDao { Date statDate); /** - * 根据 更新现在cpcStat CPC点击消费状态记录 - * @param cpcUserId CPC 用户ID - * @param cpcSiteId 网站 ID - * @param city 城市 sh bj + * 鏍规嵁 鏇存柊鐜板湪cpcStat CPC鐐瑰嚮娑堣垂鐘舵�佽褰� + * @param cpcUserId CPC 鐢ㄦ埛ID + * @param cpcSiteId 缃戠珯 ID + * @param city 鍩庡競 sh bj * @param cpcHouseTypeEnum - * @param date 更新时间 + * @param date 鏇存柊鏃堕棿 * @param i * @param cost */ diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/cpc/dao/CpcStatDaoImpl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/cpc/dao/CpcStatDaoImpl.java index 848111ed1..21b1dfea6 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/cpc/dao/CpcStatDaoImpl.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/cpc/dao/CpcStatDaoImpl.java @@ -34,7 +34,7 @@ public class CpcStatDaoImpl extends MongoDaoImpl implements CpcStatDao data.put("$inc", inc); data.put("modificationDate", new Date()); - // 该付费账户该网站该城市 + // 璇ヤ粯璐硅处鎴疯缃戠珯璇ュ煄甯� List query = new ArrayList(5); query.add(new QueryParam("cpcUserId", cpcUserId)); query.add(new QueryParam("cpcSiteId", cpcSiteId)); @@ -44,7 +44,7 @@ public class CpcStatDaoImpl extends MongoDaoImpl implements CpcStatDao updateByParams(data, query, true); - // 该网站该城市该房源类型 + // 璇ョ綉绔欒鍩庡競璇ユ埧婧愮被鍨� query = new ArrayList(5); query.add(new QueryParam("category", 1)); query.add(new QueryParam("cpcSiteId", cpcSiteId)); @@ -54,7 +54,7 @@ public class CpcStatDaoImpl extends MongoDaoImpl implements CpcStatDao updateByParams(data, query, true); - // 所有网站所有城市 + // 鎵�鏈夌綉绔欐墍鏈夊煄甯� query = new ArrayList(3); query.add(new QueryParam("cpcUserId", cpcUserId)); query.add(new QueryParam("category", 3)); diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/AdministrativeDivisionDaoImpl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/AdministrativeDivisionDaoImpl.java index a737f3157..d987e8663 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/AdministrativeDivisionDaoImpl.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/AdministrativeDivisionDaoImpl.java @@ -17,7 +17,7 @@ public class AdministrativeDivisionDaoImpl extends MongoDaoImpl params = new ArrayList(); params.add(new QueryParam("mcaCityCode", QueryParam.EQUAL_OPERATOR, code)); - params.add(new QueryParam("level", QueryParam.EQUAL_OPERATOR, "城市")); + params.add(new QueryParam("level", QueryParam.EQUAL_OPERATOR, "鍩庡競")); return (AdministrativeDivision) findFirstByParams(params); } } diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/AliasFangDaoImpl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/AliasFangDaoImpl.java index e5fe59202..45a1807d8 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/AliasFangDaoImpl.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/AliasFangDaoImpl.java @@ -27,7 +27,7 @@ public class AliasFangDaoImpl extends MongoDaoImpl implements AliasFa if (StringUtils.isNotBlank(region)) { query.put("region", region); } - // db.alias_fang.find({'city': '重庆', 'region': '渝北', $or: [{'name': '中国摩'}, {'alias': '中国摩'}]}) + // db.alias_fang.find({'city': '閲嶅簡', 'region': '娓濆寳', $or: [{'name': '涓浗鎽�'}, {'alias': '涓浗鎽�'}]}) if(CollectionUtils.isNotEmpty(names)) { BasicDBList dbList = new BasicDBList(); dbList.add(new BasicDBObject("name", new BasicDBObject("$in", names))); diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/ApiUserCfgDaoImpl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/ApiUserCfgDaoImpl.java index 50da54e62..c3a6b36dd 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/ApiUserCfgDaoImpl.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/ApiUserCfgDaoImpl.java @@ -4,7 +4,7 @@ import com.fangjia.dal.MongoDaoImpl; import com.fangjia.dal.mongo.model.ApiUserCfg; /** - * @author 王文艳 + * @author 鐜嬫枃鑹� * @create 2016-11-17 **/ public class ApiUserCfgDaoImpl extends MongoDaoImpl implements ApiUserCfgDao { diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/BizRegionStatDao.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/BizRegionStatDao.java index 07557b80a..014931cb2 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/BizRegionStatDao.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/BizRegionStatDao.java @@ -8,12 +8,12 @@ import com.fangjia.dal.mongo.model.BizRegionStat; public interface BizRegionStatDao extends MongoDao { /** - * 查找或某区域板块的endDate时间前的count条均价数据(售价) + * 鏌ユ壘鎴栨煇鍖哄煙鏉垮潡鐨別ndDate鏃堕棿鍓嶇殑count鏉″潎浠锋暟鎹�(鍞环) */ public List findRegionSellStat(String city, String region, String block, Date endDate, int count); /** - * 查找或某区域板块的endDate时间前的count条均价数据(租金) + * 鏌ユ壘鎴栨煇鍖哄煙鏉垮潡鐨別ndDate鏃堕棿鍓嶇殑count鏉″潎浠锋暟鎹�(绉熼噾) */ public List findRegionRentStat(String city, String region, String block, Date endDate, int count); } diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/CpcClickDetailLogDao.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/CpcClickDetailLogDao.java index c3d6128bf..ea9df0d3f 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/CpcClickDetailLogDao.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/CpcClickDetailLogDao.java @@ -7,39 +7,39 @@ import com.fangjia.dal.mongo.model.CpcClickDetailLog; public interface CpcClickDetailLogDao extends MongoDao { /** - * 保存 cpcClickDetailLog 日志 信息 + * 淇濆瓨 cpcClickDetailLog 鏃ュ織 淇℃伅 * * @param cpcClickDetailLog */ public void saveCpcClickDetailLog(CpcClickDetailLog cpcClickDetailLog); /** - * 根据IP判断 时间间隔内是否有过访问计费记录 + * 鏍规嵁IP鍒ゆ柇 鏃堕棿闂撮殧鍐呮槸鍚︽湁杩囪闂璐硅褰� * * @param houseType - * 房源类型 + * 鎴挎簮绫诲瀷 * @param houseId - * 房源ID + * 鎴挎簮ID * @param ip * IP * @param dateCreated * @param minutes - * @return count > 0 说明在时间间隔内有过访问计费 否则 没有 + * @return count > 0 璇存槑鍦ㄦ椂闂撮棿闅斿唴鏈夎繃璁块棶璁¤垂 鍚﹀垯 娌℃湁 */ public long findLastcpcClickDetailLogByIP(String houseType, String houseId, String ip, Date dateCreated, int minutes); /** - * 根据UID判断 时间间隔内是否有过访问计费记录 + * 鏍规嵁UID鍒ゆ柇 鏃堕棿闂撮殧鍐呮槸鍚︽湁杩囪闂璐硅褰� * * @param houseType - * 房源类型 + * 鎴挎簮绫诲瀷 * @param houseId - * 房源ID + * 鎴挎簮ID * @param uid * UID * @param dateCreated * @param minutes - * @return count > 0 说明在时间间隔内有过访问计费 否则 没有 + * @return count > 0 璇存槑鍦ㄦ椂闂撮棿闅斿唴鏈夎繃璁块棶璁¤垂 鍚﹀垯 娌℃湁 */ public long findLastcpcClickDetailLogByUID(String houseType, String houseId, String uid, Date dateCreated, int minutes); } diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/DistrictCodeDaoImpl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/DistrictCodeDaoImpl.java index 062efa5ce..aceb43e51 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/DistrictCodeDaoImpl.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/DistrictCodeDaoImpl.java @@ -4,7 +4,7 @@ import com.fangjia.dal.MongoDaoImpl; import com.fangjia.dal.mongo.model.DistrictCode; /** - * @author 王文艳 + * @author 鐜嬫枃鑹� * @create 2016-11-14 **/ public class DistrictCodeDaoImpl extends MongoDaoImpl implements DistrictCodeDao { 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 0cbe82863..9f9fdd2f5 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 @@ -6,10 +6,10 @@ import com.fangjia.dal.seaweed.model.District; public interface DistrictUpdateTaskDao extends MongoDao { /** - * 创建一个小区修改任务 - * @param districtId 小区ID - * @param optType 1:删除 2:更新 6:创建迁移小区均价任务 - * @param newName 如果optType为2 需要填写新小区的名称 + * 鍒涘缓涓�涓皬鍖轰慨鏀逛换鍔� + * @param districtId 灏忓尯ID + * @param optType 1:鍒犻櫎 2:鏇存柊 6:鍒涘缓杩佺Щ灏忓尯鍧囦环浠诲姟 + * @param newName 濡傛灉optType涓�2 闇�瑕佸~鍐欐柊灏忓尯鐨勫悕绉� */ void createTask(String districtId,int optType,String newName,String newRegion); /** 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 9da2fa32b..ba64a449b 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 @@ -34,14 +34,14 @@ public class DistrictUpdateTaskDaoImpl extends MongoDaoImpl task.setName(d.getName()); if ("district".equals(d.getCategory())) { if(StringUtils.isNotBlank(d.getEstateType2())){ - if(d.getEstateType2().contains("别墅")){ + if(d.getEstateType2().contains("鍒")){ task.setEstateType("villa"); }else{ task.setEstateType("district"); } }else{ if(StringUtils.isNotBlank(d.getEstateType())){ - if(d.getEstateType().contains("别墅")){ + if(d.getEstateType().contains("鍒")){ task.setEstateType("villa"); }else{ task.setEstateType("district"); @@ -75,7 +75,7 @@ public class DistrictUpdateTaskDaoImpl extends MongoDaoImpl task.setName(district.getName()); if ("district".equals(district.getCategory())) { if(StringUtils.isNotBlank(district.getEstateType2())){ - if(district.getEstateType2().contains("别墅")){ + if(district.getEstateType2().contains("鍒")){ task.setEstateType("villa"); }else{ task.setEstateType("district"); @@ -94,7 +94,7 @@ public class DistrictUpdateTaskDaoImpl extends MongoDaoImpl task.setCreateDate(new Date()); task.setStatus(5); task.setName(district.getName()); - if(district.getEstateType2().contains("别墅")){ + if(district.getEstateType2().contains("鍒")){ task.setEstateType("villa"); }else{ task.setEstateType("district"); diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/PaphEvaluateDaoImpl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/PaphEvaluateDaoImpl.java index 560da6c79..88573ce8d 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/PaphEvaluateDaoImpl.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/PaphEvaluateDaoImpl.java @@ -4,7 +4,7 @@ import com.fangjia.dal.MongoDaoImpl; import com.fangjia.dal.mongo.model.PaphEvaluate; /** - * @author 王文艳 + * @author 鐜嬫枃鑹� * @create 2016-11-14 **/ public class PaphEvaluateDaoImpl extends MongoDaoImpl implements PaphEvaluateDao { diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/RegionMigrateDao.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/RegionMigrateDao.java index c12286d86..93263fd55 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/RegionMigrateDao.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/RegionMigrateDao.java @@ -4,7 +4,7 @@ import com.fangjia.dal.MongoDao; import com.fangjia.dal.mongo.model.RegionMigrate; /** - * @author 王文艳 + * @author 鐜嬫枃鑹� * @create 2016-11-10 **/ public interface RegionMigrateDao extends MongoDao { diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/RegionMigrateDaoImpl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/RegionMigrateDaoImpl.java index 2d2e93aea..b9bf9ecc5 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/RegionMigrateDaoImpl.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/RegionMigrateDaoImpl.java @@ -4,7 +4,7 @@ import com.fangjia.dal.MongoDaoImpl; import com.fangjia.dal.mongo.model.RegionMigrate; /** - * @author 王文艳 + * @author 鐜嬫枃鑹� * @create 2016-11-10 **/ public class RegionMigrateDaoImpl extends MongoDaoImpl implements RegionMigrateDao { diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/RegionStatDao.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/RegionStatDao.java index a0f745e9c..69d32e893 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/RegionStatDao.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/RegionStatDao.java @@ -8,7 +8,7 @@ import com.fangjia.dal.mongo.model.RegionStat; public interface RegionStatDao extends MongoDao { /** - * 查找或某区域板块的endDate时间前的count条均价数据 + * 鏌ユ壘鎴栨煇鍖哄煙鏉垮潡鐨別ndDate鏃堕棿鍓嶇殑count鏉″潎浠锋暟鎹� * * @param city * @param region diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/SearchWordsAnalyticsDaoImpl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/SearchWordsAnalyticsDaoImpl.java index e04a16f6f..742d17fb3 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/SearchWordsAnalyticsDaoImpl.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/SearchWordsAnalyticsDaoImpl.java @@ -4,7 +4,7 @@ import com.fangjia.dal.MongoDaoImpl; import com.fangjia.dal.mongo.model.SearchWordsAnalytics; /** * - * @author 搜索词分析Dao + * @author 鎼滅储璇嶅垎鏋怐ao * */ public class SearchWordsAnalyticsDaoImpl extends MongoDaoImpl implements SearchWordsAnalyticsDao { diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/UserClickDao.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/UserClickDao.java index fdd539471..2293a051b 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/UserClickDao.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/UserClickDao.java @@ -4,7 +4,7 @@ import com.fangjia.dal.MongoDao; import com.fangjia.dal.mongo.model.UserClick; /** - * 用户 顶踩 基本信息DAO + * 鐢ㄦ埛 椤惰俯 鍩烘湰淇℃伅DAO * * @author lixuelian * diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/UserFeelingDao.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/UserFeelingDao.java index ee39f650f..819be0743 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/UserFeelingDao.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/UserFeelingDao.java @@ -5,7 +5,7 @@ import com.fangjia.dal.mongo.model.UserFeeling; /** - * 用户 顶踩信息DAO + * 鐢ㄦ埛 椤惰俯淇℃伅DAO * @author _tyler * */ diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/UserHouseDao.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/UserHouseDao.java index 7852164d6..04f8fcd64 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/UserHouseDao.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/UserHouseDao.java @@ -9,7 +9,7 @@ import com.fangjia.dal.mongo.model.UserHouse; public interface UserHouseDao extends MongoDao { /** - * 根据用户id和类别,获取房源id列表 + * 鏍规嵁鐢ㄦ埛id鍜岀被鍒紝鑾峰彇鎴挎簮id鍒楄〃 * * @param userId * @param cat @@ -18,7 +18,7 @@ public interface UserHouseDao extends MongoDao { List getUserHouseIds(int userId, String cat, Pager pager); /** - * 获取用户有效房源数 + * 鑾峰彇鐢ㄦ埛鏈夋晥鎴挎簮鏁� * * @param userId * @param cat @@ -27,27 +27,27 @@ public interface UserHouseDao extends MongoDao { int getUserHouseNum(int userId, String cat); /** - * 更新房源更新日期 + * 鏇存柊鎴挎簮鏇存柊鏃ユ湡 * * @param houseId * @param userId * @param isRefresh - * 是否是刷新操作 + * 鏄惁鏄埛鏂版搷浣� */ void updateModifyDate(String houseId, int userId, boolean isRefresh); /** - * 更新房源更新日期 + * 鏇存柊鎴挎簮鏇存柊鏃ユ湡 * * @param houseId * @param userId - * @param isRefresh 是否是刷新操作 + * @param isRefresh 鏄惁鏄埛鏂版搷浣� */ void updateModifyDate(String houseId, int userId, boolean isRefresh ,String source); /** - * 逻辑删除用户房源,更新status为1 + * 閫昏緫鍒犻櫎鐢ㄦ埛鎴挎簮锛屾洿鏂皊tatus涓�1 * * @param houseId * @param userId diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/bkoff/ApiMonitorTaskDao.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/bkoff/ApiMonitorTaskDao.java index e600fdc7e..a4c50ecff 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/bkoff/ApiMonitorTaskDao.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/bkoff/ApiMonitorTaskDao.java @@ -4,7 +4,7 @@ import com.fangjia.dal.MongoDao; import com.fangjia.dal.mongo.model.bkoff.ApiMonitorTask; /** - * @author 王文艳 + * @author 鐜嬫枃鑹� * @create 2016-10-27 **/ public interface ApiMonitorTaskDao extends MongoDao { diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/bkoff/ApiMonitorTaskDaoImpl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/bkoff/ApiMonitorTaskDaoImpl.java index ea208ecc0..ca8132830 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/bkoff/ApiMonitorTaskDaoImpl.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/bkoff/ApiMonitorTaskDaoImpl.java @@ -4,7 +4,7 @@ import com.fangjia.dal.MongoDaoImpl; import com.fangjia.dal.mongo.model.bkoff.ApiMonitorTask; /** - * @author 王文艳 + * @author 鐜嬫枃鑹� * @create 2016-10-27 **/ public class ApiMonitorTaskDaoImpl extends MongoDaoImpl implements ApiMonitorTaskDao { diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/bkoff/BkoffUsersDao.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/bkoff/BkoffUsersDao.java index d400a8eeb..864a46bc2 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/bkoff/BkoffUsersDao.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/bkoff/BkoffUsersDao.java @@ -4,7 +4,7 @@ import com.fangjia.dal.MongoDao; import com.fangjia.dal.mongo.model.bkoff.BkoffUsers; /** - * 后台用户信息 + * 鍚庡彴鐢ㄦ埛淇℃伅 * @author lixuelian * */ diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/AdLocationEnum.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/AdLocationEnum.java index 2a17c8dfa..81b447ecc 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/AdLocationEnum.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/AdLocationEnum.java @@ -2,8 +2,8 @@ package com.fangjia.dal.mongo.fangjia.enums; public enum AdLocationEnum { - RIGHT_RANK (1, "右侧竖排广告位"), - EVAL_CAROUSEL(2, "横排轮播位"); + RIGHT_RANK (1, "鍙充晶绔栨帓骞垮憡浣�"), + EVAL_CAROUSEL(2, "妯帓杞挱浣�"); AdLocationEnum(int id, String value) { this.id = id; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/AdSourceEnum.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/AdSourceEnum.java index 332d6cbe3..93ba663e7 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/AdSourceEnum.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/AdSourceEnum.java @@ -2,14 +2,14 @@ package com.fangjia.dal.mongo.fangjia.enums; public enum AdSourceEnum { - REPORT(1, "评估页"), - EVAL_RESULT(2, "评估结果页"), - SOURCE(3, "资讯列表页"), - SOURCE_DETAIL(4, "资讯详情页"), - RENT_HOUSE_R_DETAIL(5, "精品公寓右侧"), - RENT_HOUSE_M_DETAIL(6, "精品公寓列表中间"), - RENT_HOUSE_T_DETAIL(7, "精品公寓列表上面"), - HOME_NEW_T_DETAIL(8, "首页资讯上面"); + REPORT(1, "璇勪及椤�"), + EVAL_RESULT(2, "璇勪及缁撴灉椤�"), + SOURCE(3, "璧勮鍒楄〃椤�"), + SOURCE_DETAIL(4, "璧勮璇︽儏椤�"), + RENT_HOUSE_R_DETAIL(5, "绮惧搧鍏瘬鍙充晶"), + RENT_HOUSE_M_DETAIL(6, "绮惧搧鍏瘬鍒楄〃涓棿"), + RENT_HOUSE_T_DETAIL(7, "绮惧搧鍏瘬鍒楄〃涓婇潰"), + HOME_NEW_T_DETAIL(8, "棣栭〉璧勮涓婇潰"); AdSourceEnum(int id, String value) { this.id = id; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/AdTypeEnum.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/AdTypeEnum.java index 8c3948832..4e77e4678 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/AdTypeEnum.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/AdTypeEnum.java @@ -2,8 +2,8 @@ package com.fangjia.dal.mongo.fangjia.enums; public enum AdTypeEnum { - SINGLE(1, "单独位"), - CAROUSEL(2, "轮播位"); + SINGLE(1, "鍗曠嫭浣�"), + CAROUSEL(2, "杞挱浣�"); AdTypeEnum(int id, String value) { this.id = id; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/ChannelTypeEnum.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/ChannelTypeEnum.java index c656a8ed5..1fa7a9da8 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/ChannelTypeEnum.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/ChannelTypeEnum.java @@ -1,6 +1,6 @@ package com.fangjia.dal.mongo.fangjia.enums; /** - * 渠道类型 + * 娓犻亾绫诲瀷 * @author yinjihuan * */ diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/CustomerSituationEnum.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/CustomerSituationEnum.java index 522548519..74c34d0ed 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/CustomerSituationEnum.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/CustomerSituationEnum.java @@ -3,11 +3,11 @@ package com.fangjia.dal.mongo.fangjia.enums; public enum CustomerSituationEnum { - NOT_NEED(1,"不需要"), - NOT_ONLINE(2,"无人接听/无法接通/关机/停机"), - NULL_NUMBER(3,"空号/无效号码"), - NEED_COOP(4,"寻求合作"), - HAVE_NEED(5,"有需求"); + NOT_NEED(1,"涓嶉渶瑕�"), + NOT_ONLINE(2,"鏃犱汉鎺ュ惉/鏃犳硶鎺ラ��/鍏虫満/鍋滄満"), + NULL_NUMBER(3,"绌哄彿/鏃犳晥鍙风爜"), + NEED_COOP(4,"瀵绘眰鍚堜綔"), + HAVE_NEED(5,"鏈夐渶姹�"); private Integer id; private String value; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/IntentTypeEnum.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/IntentTypeEnum.java index 58860a6c1..264dded4f 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/IntentTypeEnum.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/IntentTypeEnum.java @@ -1,16 +1,16 @@ package com.fangjia.dal.mongo.fangjia.enums; /** - * 意向分类 + * 鎰忓悜鍒嗙被 * @author yinjihuan */ public enum IntentTypeEnum { - RATE_HEIGHT(1, "利率过高"), - LOAN_MONEY_LOW(2, "贷款额太低"), - UNABLE_TO_MEET(3, "现有产品无法满足"), - UNABLE_TO_COVER(4, "业务无法覆盖"), - BE_ON_THE_CARDS(5, "有转化可能"), - SUCCESS(6, "成功转化"), - OTHER(7, "其他"); + RATE_HEIGHT(1, "鍒╃巼杩囬珮"), + LOAN_MONEY_LOW(2, "璐锋棰濆お浣�"), + UNABLE_TO_MEET(3, "鐜版湁浜у搧鏃犳硶婊¤冻"), + UNABLE_TO_COVER(4, "涓氬姟鏃犳硶瑕嗙洊"), + BE_ON_THE_CARDS(5, "鏈夎浆鍖栧彲鑳�"), + SUCCESS(6, "鎴愬姛杞寲"), + OTHER(7, "鍏朵粬"); IntentTypeEnum(int id, String value) { this.id = id; this.value = value; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/LoanBurialPointEnum.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/LoanBurialPointEnum.java index efcbc8f5b..9ab7e99f6 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/LoanBurialPointEnum.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/LoanBurialPointEnum.java @@ -1,41 +1,41 @@ package com.fangjia.dal.mongo.fangjia.enums; /** - * 新版房价网广点通快速贷款-埋点需求 + * 鏂扮増鎴夸环缃戝箍鐐归�氬揩閫熻捶娆�-鍩嬬偣闇�姹� * @author JENIS * */ public enum LoanBurialPointEnum { - SELECT_NEARBY_DISTRICT("SELECT_NEARBY_DISTRICT", 1, "选择附近小区", "选择小区次数"), - RELOCATION_DISTRICT("RELOCATION_DISTRICT", 2, "小区重新定位", "重新定位小区的次数"), - SELECT_CITY("SELECT_CITY", 3, "选择城市", "选择城市次数"), - RELOCATION_CITY("RELOCATION_CITY", 4, "城市重新定位", "重新定位城市的次数"), - SELECT_DISTRICT_SEARCH_RESULT("SELECT_DISTRICT_SEARCH_RESULT", 5, "选择小区搜索结果", "选择小区搜索结果次数"), - BUILDING_NUMBER("BUILDING_NUMBER", 6, "楼栋号", "输入失去焦点有值记录次数"), - BUILDING_ROOM("BUILDING_ROOM", 7, "楼栋室", "输入失去焦点有值记录次数"), - CURRENT_FLOOR("CURRENT_FLOOR", 8, "当前楼层", "输入失去焦点有值记录次数"), - TOTAL_FLOOR("TOTAL_FLOOR", 9, "总楼层", "输入失去焦点有值记录次数"), - AREA("AREA", 10, "面积", "输入失去焦点有值记录次数"), - EVALUATE("EVALUATE", 11, "评估", "点击'评估'按钮的次数"); + SELECT_NEARBY_DISTRICT("SELECT_NEARBY_DISTRICT", 1, "閫夋嫨闄勮繎灏忓尯", "閫夋嫨灏忓尯娆℃暟"), + RELOCATION_DISTRICT("RELOCATION_DISTRICT", 2, "灏忓尯閲嶆柊瀹氫綅", "閲嶆柊瀹氫綅灏忓尯鐨勬鏁�"), + SELECT_CITY("SELECT_CITY", 3, "閫夋嫨鍩庡競", "閫夋嫨鍩庡競娆℃暟"), + RELOCATION_CITY("RELOCATION_CITY", 4, "鍩庡競閲嶆柊瀹氫綅", "閲嶆柊瀹氫綅鍩庡競鐨勬鏁�"), + SELECT_DISTRICT_SEARCH_RESULT("SELECT_DISTRICT_SEARCH_RESULT", 5, "閫夋嫨灏忓尯鎼滅储缁撴灉", "閫夋嫨灏忓尯鎼滅储缁撴灉娆℃暟"), + BUILDING_NUMBER("BUILDING_NUMBER", 6, "妤兼爧鍙�", "杈撳叆澶卞幓鐒︾偣鏈夊�艰褰曟鏁�"), + BUILDING_ROOM("BUILDING_ROOM", 7, "妤兼爧瀹�", "杈撳叆澶卞幓鐒︾偣鏈夊�艰褰曟鏁�"), + CURRENT_FLOOR("CURRENT_FLOOR", 8, "褰撳墠妤煎眰", "杈撳叆澶卞幓鐒︾偣鏈夊�艰褰曟鏁�"), + TOTAL_FLOOR("TOTAL_FLOOR", 9, "鎬绘ゼ灞�", "杈撳叆澶卞幓鐒︾偣鏈夊�艰褰曟鏁�"), + AREA("AREA", 10, "闈㈢Н", "杈撳叆澶卞幓鐒︾偣鏈夊�艰褰曟鏁�"), + EVALUATE("EVALUATE", 11, "璇勪及", "鐐瑰嚮'璇勪及'鎸夐挳鐨勬鏁�"); /** - * 埋点源类型(埋点事件类型) + * 鍩嬬偣婧愮被鍨�(鍩嬬偣浜嬩欢绫诲瀷) */ private String burialPointType; /** - * 埋点源编号(埋点事件编号) + * 鍩嬬偣婧愮紪鍙�(鍩嬬偣浜嬩欢缂栧彿) */ private Integer burialPointNumber; /** - * 埋点源名称(埋点事件名称) + * 鍩嬬偣婧愬悕绉�(鍩嬬偣浜嬩欢鍚嶇О) */ private String burialPointName; /** - * 埋点源描述(埋点事件描述) + * 鍩嬬偣婧愭弿杩�(鍩嬬偣浜嬩欢鎻忚堪) */ private String burialPointDesc; @@ -79,7 +79,7 @@ public enum LoanBurialPointEnum { } /** - * 通过type获取LoanBurialPointEnum + * 閫氳繃type鑾峰彇LoanBurialPointEnum * @param burialPointType * @return */ @@ -93,7 +93,7 @@ public enum LoanBurialPointEnum { } /** - * 通过number获取LoanBurialPointEnum + * 閫氳繃number鑾峰彇LoanBurialPointEnum * @param burialPointType * @return */ diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/LoanProductPositionEnum.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/LoanProductPositionEnum.java index 078c6e875..ff458cd14 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/LoanProductPositionEnum.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/LoanProductPositionEnum.java @@ -1,12 +1,12 @@ package com.fangjia.dal.mongo.fangjia.enums; /** - * 贷款产品显示位置 + * 璐锋浜у搧鏄剧ず浣嶇疆 * @author yinjihuan * */ public enum LoanProductPositionEnum { - STATR_EVAL(1001, "初步评估页"), LOAN_ANALY(1002, "贷款分析"), SIMPLE_REPORT(1003, "简要报告"),BUY_REPORT(1004,"买房报告"),SELL_REPORT(1005,"卖房报告"); + STATR_EVAL(1001, "鍒濇璇勪及椤�"), LOAN_ANALY(1002, "璐锋鍒嗘瀽"), SIMPLE_REPORT(1003, "绠�瑕佹姤鍛�"),BUY_REPORT(1004,"涔版埧鎶ュ憡"),SELL_REPORT(1005,"鍗栨埧鎶ュ憡"); LoanProductPositionEnum(int id, String value) { this.id = id; this.value = value; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/LoanPurposeEnum.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/LoanPurposeEnum.java index 32723674f..dc4a7fc9b 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/LoanPurposeEnum.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/LoanPurposeEnum.java @@ -1,12 +1,12 @@ package com.fangjia.dal.mongo.fangjia.enums; /** - * 贷款用途 + * 璐锋鐢ㄩ�� * @author yinjihuan * */ public enum LoanPurposeEnum { - QIYE_JINGYING("1001", "企业经营"), JIATING_XIAOFEI("1002", "家庭消费"), TOUZI_LICAI("1003", "投资理财"), QI_TA("1004", "其他"); + QIYE_JINGYING("1001", "浼佷笟缁忚惀"), JIATING_XIAOFEI("1002", "瀹跺涵娑堣垂"), TOUZI_LICAI("1003", "鎶曡祫鐞嗚储"), QI_TA("1004", "鍏朵粬"); LoanPurposeEnum(String id, String value) { this.id = id; this.value = value; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/LoanTypeEnum.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/LoanTypeEnum.java index b03b5a615..347634f78 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/LoanTypeEnum.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/LoanTypeEnum.java @@ -1,11 +1,11 @@ package com.fangjia.dal.mongo.fangjia.enums; /** - * 申请贷款类型 + * 鐢宠璐锋绫诲瀷 * @author yinjihuan * */ public enum LoanTypeEnum { - KUAI_SU("1001", "快速"), GAO_E("1002", "高额"), DI_XI("1003", "低息"); + KUAI_SU("1001", "蹇��"), GAO_E("1002", "楂橀"), DI_XI("1003", "浣庢伅"); LoanTypeEnum(String id, String value) { this.id = id; this.value = value; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/NewResourceRecommendEnum.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/NewResourceRecommendEnum.java index e53f9ba4e..c8bba2d66 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/NewResourceRecommendEnum.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/NewResourceRecommendEnum.java @@ -1,50 +1,50 @@ package com.fangjia.dal.mongo.fangjia.enums; /** - * 新闻资源推荐地方 + * 鏂伴椈璧勬簮鎺ㄨ崘鍦版柟 * @author yinjihuan * */ public enum NewResourceRecommendEnum { - SHOU_YE("1001", "首页"), - YIN_HANG("1002", "银行业"), - HULIANWANG_JINRONG("1003", "互联网金融"), - SHUJU_FUWUSHANG("1004", "大数据行业"), - PINGGU_JIGOU("1005", "评估机构"), - ZHENGFU_JIGOU("1006", "政府机构"), - ZHENGXIN_JIGOU("1007", "征信机构"), - HANGYE_QIYE("1008", "行业企业"), - ZIXUN_YANJIU("1009", "咨询研究"), - DAI_QIAN_GU_ZHI("1010", "贷前估值解决方案"), - YIN_HANG_NEI_PING("1011", "银行内评系统解决方案"), - DAI_HOU_GUAN_LI("1012", "贷后管理解决方案"), - FANG_DAI("1013", "房贷业务获客解决方案"), - FANF_SHENG_HUO("1014", "房生活金融客户端解决方案"), - JING_ZHUN_YING_XIAO("1015", "地址精准营销解决方案"), - DI_ZHI_BIAO_ZHUN_HUA("1016", "地址标准化解决方案"), - API("1017", "API数据接口解决方案"), - PDS_BU_DONG_CHAN("1018", "PDS不动产大数据服务平台"), - API_GUZ_HI("1019", "AMP估价管理平台"), - FJT("1020", "房价通"), - FANG_JIA_ZOU_SHI("1021", "房价走势"), - FDANG_DIAO_BAO_GAO("1022", "房调报告"), - FA_PAI_FANG("1023", "法拍房数据解决方案"), - FINANCIAL_LEVEL("1024", "财力评级解决方案"), + SHOU_YE("1001", "棣栭〉"), + YIN_HANG("1002", "閾惰涓�"), + HULIANWANG_JINRONG("1003", "浜掕仈缃戦噾铻�"), + SHUJU_FUWUSHANG("1004", "澶ф暟鎹涓�"), + PINGGU_JIGOU("1005", "璇勪及鏈烘瀯"), + ZHENGFU_JIGOU("1006", "鏀垮簻鏈烘瀯"), + ZHENGXIN_JIGOU("1007", "寰佷俊鏈烘瀯"), + HANGYE_QIYE("1008", "琛屼笟浼佷笟"), + ZIXUN_YANJIU("1009", "鍜ㄨ鐮旂┒"), + DAI_QIAN_GU_ZHI("1010", "璐峰墠浼板�艰В鍐虫柟妗�"), + YIN_HANG_NEI_PING("1011", "閾惰鍐呰瘎绯荤粺瑙e喅鏂规"), + DAI_HOU_GUAN_LI("1012", "璐峰悗绠$悊瑙e喅鏂规"), + FANG_DAI("1013", "鎴胯捶涓氬姟鑾峰瑙e喅鏂规"), + FANF_SHENG_HUO("1014", "鎴跨敓娲婚噾铻嶅鎴风瑙e喅鏂规"), + JING_ZHUN_YING_XIAO("1015", "鍦板潃绮惧噯钀ラ攢瑙e喅鏂规"), + DI_ZHI_BIAO_ZHUN_HUA("1016", "鍦板潃鏍囧噯鍖栬В鍐虫柟妗�"), + API("1017", "API鏁版嵁鎺ュ彛瑙e喅鏂规"), + PDS_BU_DONG_CHAN("1018", "PDS涓嶅姩浜уぇ鏁版嵁鏈嶅姟骞冲彴"), + API_GUZ_HI("1019", "AMP浼颁环绠$悊骞冲彴"), + FJT("1020", "鎴夸环閫�"), + FANG_JIA_ZOU_SHI("1021", "鎴夸环璧板娍"), + FDANG_DIAO_BAO_GAO("1022", "鎴胯皟鎶ュ憡"), + FA_PAI_FANG("1023", "娉曟媿鎴挎暟鎹В鍐虫柟妗�"), + FINANCIAL_LEVEL("1024", "璐㈠姏璇勭骇瑙e喅鏂规"), - ADDRESS_PROCESS("1025", "地址数据治理"), - ONE_HOUSE_ONE_PRICE("1026", "一房一价"), - COMMUNITY_LEVEL("1027", "楼盘评级"), - DATA_POWER("1028", "楼盘评级"), - FUND("1029", "互金"), - COLLATERAL("1030", "押品价值管理"), - CARD("1031", "信用卡"), - NET("1032", "网点布局"), - GOV("1034", "政府机构"), - BOND("1033", "证券"), - COST("1035", "消费金融"), - ZIXUN_APP("1036", "业务咨询app"), - ARTICLE_APP("1037", "公众号推文"), - MENU_APP("1038", "公众号菜单"); + ADDRESS_PROCESS("1025", "鍦板潃鏁版嵁娌荤悊"), + ONE_HOUSE_ONE_PRICE("1026", "涓�鎴夸竴浠�"), + COMMUNITY_LEVEL("1027", "妤肩洏璇勭骇"), + DATA_POWER("1028", "妤肩洏璇勭骇"), + FUND("1029", "浜掗噾"), + COLLATERAL("1030", "鎶煎搧浠峰�肩鐞�"), + CARD("1031", "淇$敤鍗�"), + NET("1032", "缃戠偣甯冨眬"), + GOV("1034", "鏀垮簻鏈烘瀯"), + BOND("1033", "璇佸埜"), + COST("1035", "娑堣垂閲戣瀺"), + ZIXUN_APP("1036", "涓氬姟鍜ㄨapp"), + ARTICLE_APP("1037", "鍏紬鍙锋帹鏂�"), + MENU_APP("1038", "鍏紬鍙疯彍鍗�"); NewResourceRecommendEnum(String id, String value) { this.id = id; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/NewsResourceTypeEnum.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/NewsResourceTypeEnum.java index 95b77e256..d9d28cae5 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/NewsResourceTypeEnum.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/NewsResourceTypeEnum.java @@ -1,17 +1,17 @@ package com.fangjia.dal.mongo.fangjia.enums; /** - * 新闻资源类型 + * 鏂伴椈璧勬簮绫诲瀷 * * @author yinjihuan * */ public enum NewsResourceTypeEnum { - CHENG_GONG_AN_LI("case", "成功案例"), - HANG_YE_DONG_TAI("industry", "行业动态"), - SHU_JU_FEN_XI("analysis", "数据分析"), - GONG_SI_DONG_TAI("company", "公司动态"); + CHENG_GONG_AN_LI("case", "鎴愬姛妗堜緥"), + HANG_YE_DONG_TAI("industry", "琛屼笟鍔ㄦ��"), + SHU_JU_FEN_XI("analysis", "鏁版嵁鍒嗘瀽"), + GONG_SI_DONG_TAI("company", "鍏徃鍔ㄦ��"); NewsResourceTypeEnum(String id, String value) { this.id = id; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/ReportTypeEnum.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/ReportTypeEnum.java index 674de03d5..082e2fdd0 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/ReportTypeEnum.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/ReportTypeEnum.java @@ -1,12 +1,12 @@ package com.fangjia.dal.mongo.fangjia.enums; /** - * 报表类型枚举 + * 鎶ヨ〃绫诲瀷鏋氫妇 * @author yinjihuan * */ public enum ReportTypeEnum { - MAI_FNAG(1, "买房"), MAI_FNAG2(2, "卖房"), DAI_KUAN(3, "贷款"), ZU_FANG(4, "租房"), CHU_ZU(5, "出租"), JIAN_YAO(6, "简要"), FENG_KONG(7, "风控"); + MAI_FNAG(1, "涔版埧"), MAI_FNAG2(2, "鍗栨埧"), DAI_KUAN(3, "璐锋"), ZU_FANG(4, "绉熸埧"), CHU_ZU(5, "鍑虹"), JIAN_YAO(6, "绠�瑕�"), FENG_KONG(7, "椋庢帶"); ReportTypeEnum(int id, String value) { this.id = id; this.value = value; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/SalesLeadEnum.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/SalesLeadEnum.java index 34642ca3b..43ef46a78 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/SalesLeadEnum.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/SalesLeadEnum.java @@ -2,44 +2,44 @@ package com.fangjia.dal.mongo.fangjia.enums; public enum SalesLeadEnum { - SHOU_YE("1001", "首页"), - DIBU("1002", "底部(马上联系)"), - PROC_ADDR("1003", "地理治理"), - PROC_ONEHOUSE("1004", "一房一价"), - PROC_FINANCIAL("1005", "财力评级"), - PROC_LEVEL("1006", "楼盘评级"), + SHOU_YE("1001", "棣栭〉"), + DIBU("1002", "搴曢儴(椹笂鑱旂郴)"), + PROC_ADDR("1003", "鍦扮悊娌荤悊"), + PROC_ONEHOUSE("1004", "涓�鎴夸竴浠�"), + PROC_FINANCIAL("1005", "璐㈠姏璇勭骇"), + PROC_LEVEL("1006", "妤肩洏璇勭骇"), PROC_CPDB("1007", "CPDB"), - PROC_DISHU("1008", "地数"), + PROC_DISHU("1008", "鍦版暟"), PROC_API("1009", "API"), - PROC_FJT("1010", "房价通"), + PROC_FJT("1010", "鎴夸环閫�"), - SOLUTION_ADDR("1011", "解决方案-地址数据治理"), - SOLUTION_YAPING("1012", "解决方案-押品风控"), - SOLUTION_YAPING1("1013", "解决方案-押品风控贷前"), - SOLUTION_YAPING2("1014", "解决方案-押品风控贷中"), - SOLUTION_YAPING3("1015", "解决方案-押品风控贷后"), - SOLUTION_TIAOE("1016", "解决方案-调额增信"), - SOLUTION_CUSTM("1017", "解决方案-客户分层"), + SOLUTION_ADDR("1011", "瑙e喅鏂规-鍦板潃鏁版嵁娌荤悊"), + SOLUTION_YAPING("1012", "瑙e喅鏂规-鎶煎搧椋庢帶"), + SOLUTION_YAPING1("1013", "瑙e喅鏂规-鎶煎搧椋庢帶璐峰墠"), + SOLUTION_YAPING2("1014", "瑙e喅鏂规-鎶煎搧椋庢帶璐蜂腑"), + SOLUTION_YAPING3("1015", "瑙e喅鏂规-鎶煎搧椋庢帶璐峰悗"), + SOLUTION_TIAOE("1016", "瑙e喅鏂规-璋冮澧炰俊"), + SOLUTION_CUSTM("1017", "瑙e喅鏂规-瀹㈡埛鍒嗗眰"), - SOLUTION_CUSTM1("1018", "解决方案-高净值客户筛选"), - SOLUTION_CUSTM2("1019", "解决方案-睡眠户激活"), - SOLUTION_CUSTM3("1020", "解决方案-贷前获客"), - SOLUTION_CUSTM4("1021", "解决方案-网周营销"), - SOLUTION_DATABASE("1022", "解决方案-房产基础数据库建设"), - SOLUTION_EXPERTSERVICE("1023", "解决方案-联合建模"), - SOLUTION_BANK("1024", "解决方案-银行"), - SOLUTION_BOND("1025", "解决方案-证券"), - SOLUTION_NOTBANK("1026", "解决方案-非银金融"), - SOLUTION_GOV("1027", "解决方案-政府机构"), - SOLUTION_RETAIL("1028", "解决方案-零售连锁"), + SOLUTION_CUSTM1("1018", "瑙e喅鏂规-楂樺噣鍊煎鎴风瓫閫�"), + SOLUTION_CUSTM2("1019", "瑙e喅鏂规-鐫$湢鎴锋縺娲�"), + SOLUTION_CUSTM3("1020", "瑙e喅鏂规-璐峰墠鑾峰"), + SOLUTION_CUSTM4("1021", "瑙e喅鏂规-缃戝懆钀ラ攢"), + SOLUTION_DATABASE("1022", "瑙e喅鏂规-鎴夸骇鍩虹鏁版嵁搴撳缓璁�"), + SOLUTION_EXPERTSERVICE("1023", "瑙e喅鏂规-鑱斿悎寤烘ā"), + SOLUTION_BANK("1024", "瑙e喅鏂规-閾惰"), + SOLUTION_BOND("1025", "瑙e喅鏂规-璇佸埜"), + SOLUTION_NOTBANK("1026", "瑙e喅鏂规-闈為摱閲戣瀺"), + SOLUTION_GOV("1027", "瑙e喅鏂规-鏀垮簻鏈烘瀯"), + SOLUTION_RETAIL("1028", "瑙e喅鏂规-闆跺敭杩為攣"), - FLOAT_WID("1029", "侧边框咨询"), - ZIXUN_APP("1036", "业务咨询app"), - ARTICLE_APP("1037", "公众号推文"), - MENU_APP("1038", "公众号菜单"), - TREND("1039", "全国房价在线查询"), - EVALUATION("1040", "全国房价在线估值"), - ABOUT("1041", "关于我们"); + FLOAT_WID("1029", "渚ц竟妗嗗挩璇�"), + ZIXUN_APP("1036", "涓氬姟鍜ㄨapp"), + ARTICLE_APP("1037", "鍏紬鍙锋帹鏂�"), + MENU_APP("1038", "鍏紬鍙疯彍鍗�"), + TREND("1039", "鍏ㄥ浗鎴夸环鍦ㄧ嚎鏌ヨ"), + EVALUATION("1040", "鍏ㄥ浗鎴夸环鍦ㄧ嚎浼板��"), + ABOUT("1041", "鍏充簬鎴戜滑"); SalesLeadEnum(String id, String value) { this.id = id; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/SupplierFeedbackEnum.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/SupplierFeedbackEnum.java index c8f9345f4..5f67990d2 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/SupplierFeedbackEnum.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/SupplierFeedbackEnum.java @@ -2,21 +2,21 @@ package com.fangjia.dal.mongo.fangjia.enums; public enum SupplierFeedbackEnum { - OTHER(1,"已在其他平台贷款"), - TOO_HIGH(2,"利率过高"), - TOO_LOW(3,"贷款额太低"), - NOT_SATISFIED(4,"现有贷款产品无法满足"), - NOT_ENOUGH(5,"业务无法覆盖"), - HAS_POSSIBILITY(6,"有转化可能性"), - NOT_CREDIT(7,"客户资质/信用不达标"), - HAD_LOAN(8,"客户有一押,无法做二押"), - NOT_NEED(9,"不需要"), - NOT_NEED_JUDGE(10,"不需要,仅评估价格"), - NOT_ONLINE(11,"无人接听/无法接通/关机/停机"), - NULL_NUMBER(12,"空号/无效号码"), - NEED_COOR(13,"寻求合作"), - NEED_NEED(14,"有需求"), - OTHERS(15,"其他,见备注"); + OTHER(1,"宸插湪鍏朵粬骞冲彴璐锋"), + TOO_HIGH(2,"鍒╃巼杩囬珮"), + TOO_LOW(3,"璐锋棰濆お浣�"), + NOT_SATISFIED(4,"鐜版湁璐锋浜у搧鏃犳硶婊¤冻"), + NOT_ENOUGH(5,"涓氬姟鏃犳硶瑕嗙洊"), + HAS_POSSIBILITY(6,"鏈夎浆鍖栧彲鑳芥��"), + NOT_CREDIT(7,"瀹㈡埛璧勮川/淇$敤涓嶈揪鏍�"), + HAD_LOAN(8,"瀹㈡埛鏈変竴鎶硷紝鏃犳硶鍋氫簩鎶�"), + NOT_NEED(9,"涓嶉渶瑕�"), + NOT_NEED_JUDGE(10,"涓嶉渶瑕侊紝浠呰瘎浼颁环鏍�"), + NOT_ONLINE(11,"鏃犱汉鎺ュ惉/鏃犳硶鎺ラ��/鍏虫満/鍋滄満"), + NULL_NUMBER(12,"绌哄彿/鏃犳晥鍙风爜"), + NEED_COOR(13,"瀵绘眰鍚堜綔"), + NEED_NEED(14,"鏈夐渶姹�"), + OTHERS(15,"鍏朵粬锛岃澶囨敞"); private Integer id; private String value; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/AdviceLeads.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/AdviceLeads.java index ad2a629a8..b5bba6646 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/AdviceLeads.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/AdviceLeads.java @@ -6,7 +6,7 @@ import javax.persistence.*; import java.util.Date; /** - * 新版房价网咨询线索表 + * 鏂扮増鎴夸环缃戝挩璇㈢嚎绱㈣〃 * */ @Entity @@ -18,56 +18,56 @@ public class AdviceLeads implements MongoEntity { private String id; /** - * 姓名 + * 濮撳悕 */ private String name; /** - * 手机 + * 鎵嬫満 */ private String mobile; /** - * 邮箱 + * 閭 */ private String email; /** - * 公司 + * 鍏徃 */ private String company; /** - * 部门 + * 閮ㄩ棬 */ private String department; /** - * 职位 + * 鑱屼綅 */ private String position; /** - * 创建时间 + * 鍒涘缓鏃堕棿 */ private Date createDate; /** - * 修改时间 + * 淇敼鏃堕棿 */ private Date modifyDate; /** - * 临时用户id + * 涓存椂鐢ㄦ埛id */ private String tempId; /** - * 真实用户id + * 鐪熷疄鐢ㄦ埛id */ private String userId; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/CopyrightConfig.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/CopyrightConfig.java index 284ff05ad..0378296b9 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/CopyrightConfig.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/CopyrightConfig.java @@ -11,8 +11,8 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 版权配置 - * H5贷款页面投放,需要根据不同的投放商显示不同的版权信息 + * 鐗堟潈閰嶇疆 + * H5璐锋椤甸潰鎶曟斁锛岄渶瑕佹牴鎹笉鍚岀殑鎶曟斁鍟嗘樉绀轰笉鍚岀殑鐗堟潈淇℃伅 * @author yinjihuan * */ @@ -25,27 +25,27 @@ public class CopyrightConfig implements MongoEntity { private String id; /** - * 编号,唯一 + * 缂栧彿锛屽敮涓� */ private String number; /** - * 版权内容 + * 鐗堟潈鍐呭 */ private String copyright; /** - * 备案号 + * 澶囨鍙� */ private String recordNumber; /** - * 创建时间 + * 鍒涘缓鏃堕棿 */ private Date createDate; /** - * 修改时间 + * 淇敼鏃堕棿 */ private Date modifyDate; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/EvaluationPurposeAnalysis.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/EvaluationPurposeAnalysis.java index cdce69543..0de2af64f 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/EvaluationPurposeAnalysis.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/EvaluationPurposeAnalysis.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 用户评估目的分析表 + * 鐢ㄦ埛璇勪及鐩殑鍒嗘瀽琛� * @author yinjihuan * */ @@ -23,92 +23,92 @@ public class EvaluationPurposeAnalysis implements MongoEntity { private String id; /** - * 用户ID + * 鐢ㄦ埛ID */ private String uid; /** - * 评估目的 + * 璇勪及鐩殑 */ private String purpose; /** - * 姓名 + * 濮撳悕 */ private String name; /** - * 页面来源 + * 椤甸潰鏉ユ簮 */ private String source; /** - * 渠道名称 + * 娓犻亾鍚嶇О */ private String leadsSource; /** - * 渠道类型 + * 娓犻亾绫诲瀷 */ private String channelType; /** - * 用户手机 + * 鐢ㄦ埛鎵嬫満 */ private String mobile; /** - * 查看报告类型 参考:ReportTypeEnum + * 鏌ョ湅鎶ュ憡绫诲瀷 鍙傝�冿細ReportTypeEnum */ private int reportType; /** - * 首次查看时间 + * 棣栨鏌ョ湅鏃堕棿 */ private Date firstQueryDate; /** - * 最后查看时间 + * 鏈�鍚庢煡鐪嬫椂闂� */ private Date lastQueryDate; /** - * 查看报告停留时间(秒) + * 鏌ョ湅鎶ュ憡鍋滅暀鏃堕棿(绉�) */ private int visitTime; /** - * 省份 + * 鐪佷唤 */ private String province; /** - * 城市 + * 鍩庡競 */ private String city; /** - * 小区 + * 灏忓尯 */ private String districtName; /** - * 小区地址 + * 灏忓尯鍦板潃 */ private String address; /** - * 评估总价 + * 璇勪及鎬讳环 */ private long totalPrice; /** - * 面积 + * 闈㈢Н */ private double area; /** - * 估价ID + * 浼颁环ID */ private String evalId; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/FangJiaUser.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/FangJiaUser.java index f79d79f5e..d9703b871 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/FangJiaUser.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/FangJiaUser.java @@ -9,7 +9,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 新版房价网用户表 + * 鏂扮増鎴夸环缃戠敤鎴疯〃 * @author yinjihuan * */ @@ -20,62 +20,62 @@ public class FangJiaUser implements MongoEntity { private static final long serialVersionUID = 3870919222455475647L; /** - * 用户ID + * 鐢ㄦ埛ID */ private String id; /** - * 手机 + * 鎵嬫満 */ private String mobile; /** - * 邮箱 + * 閭 */ private String email; /** - * 密码 + * 瀵嗙爜 */ private String password; /** - * 姓名 + * 濮撳悕 */ private String uname; /** - * 用户类型(0表示个人,1表示企业) + * 鐢ㄦ埛绫诲瀷(0琛ㄧず涓汉锛�1琛ㄧず浼佷笟锛� */ private int type = 0; /** - * 评估总次数 + * 璇勪及鎬绘鏁� */ private Long evalCount; /** - * 线索来源 + * 绾跨储鏉ユ簮 */ private String clueSource; /** - * 渠道类型 + * 娓犻亾绫诲瀷 */ private String channelType; /** - * 创建时间 + * 鍒涘缓鏃堕棿 */ private Date createDate; /** - * 修改时间 + * 淇敼鏃堕棿 */ private Date modifyDate; /** - * 支付密码 + * 鏀粯瀵嗙爜 */ private String payPassword; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/ImageManager.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/ImageManager.java index 9db78b76a..3fa3c3a26 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/ImageManager.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/ImageManager.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 房价网图片管理 + * 鎴夸环缃戝浘鐗囩鐞� * * @author zongzhimin * @@ -28,27 +28,27 @@ public class ImageManager implements MongoEntity { private String id; /** - * 图片类型 + * 鍥剧墖绫诲瀷 */ private String type; /** - * 图片url + * 鍥剧墖url */ private String url; /** - * 名称 + * 鍚嶇О */ private String name; /** - * 创建时间 + * 鍒涘缓鏃堕棿 */ private Date createDate; /** - * 修改时间 + * 淇敼鏃堕棿 */ private Date modifyDate; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/LoanBurialPoint.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/LoanBurialPoint.java index 1d17192d8..fce8c280e 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/LoanBurialPoint.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/LoanBurialPoint.java @@ -11,8 +11,8 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 新版房价网广点通快速贷款-埋点需求 - * 规则:触发输入框或者点击按钮,每日做一次数量统计 + * 鏂扮増鎴夸环缃戝箍鐐归�氬揩閫熻捶娆�-鍩嬬偣闇�姹� + * 瑙勫垯锛氳Е鍙戣緭鍏ユ鎴栬�呯偣鍑绘寜閽紝姣忔棩鍋氫竴娆℃暟閲忕粺璁� * @author JENIS * */ @@ -24,62 +24,62 @@ public class LoanBurialPoint implements MongoEntity { private String id; /** - * 统计当天 + * 缁熻褰撳ぉ */ private Integer intraday; /** - * 当天统计次数 + * 褰撳ぉ缁熻娆℃暟 */ private Integer times; /** - * 埋点源类型(埋点事件类型) + * 鍩嬬偣婧愮被鍨�(鍩嬬偣浜嬩欢绫诲瀷) */ private String burialPointType; /** - * 埋点源编号(埋点事件编号) + * 鍩嬬偣婧愮紪鍙�(鍩嬬偣浜嬩欢缂栧彿) */ private Integer burialPointNumber; /** - * 埋点源名称(埋点事件名称) + * 鍩嬬偣婧愬悕绉�(鍩嬬偣浜嬩欢鍚嶇О) */ private String burialPointName; /** - * 埋点源描述(埋点事件描述) + * 鍩嬬偣婧愭弿杩�(鍩嬬偣浜嬩欢鎻忚堪) */ private String burialPointDesc; /** - * 贷款类型 + * 璐锋绫诲瀷 */ private String loanType; /** - * 渠道名称 + * 娓犻亾鍚嶇О */ private String leadsSource; /** - * 贷款页面来源 + * 璐锋椤甸潰鏉ユ簮 */ private String source; /** - * 创建时间 + * 鍒涘缓鏃堕棿 */ private Date createDate; /** - * 修改时间 + * 淇敼鏃堕棿 */ private Date modifyDate; /** - * 手机号 + * 鎵嬫満鍙� */ private String mobile; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/LoanLeads.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/LoanLeads.java index 6c5c1d2d3..91f64f71c 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/LoanLeads.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/LoanLeads.java @@ -12,7 +12,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 新版房价网贷款线索表 + * 鏂扮増鎴夸环缃戣捶娆剧嚎绱㈣〃 * @author yinjihuan * */ @@ -24,176 +24,176 @@ public class LoanLeads implements MongoEntity { private String id; /** - * 手机 + * 鎵嬫満 */ private String mobile; /** - * 省份 + * 鐪佷唤 */ private String province; /** - * 城市 + * 鍩庡競 */ private String city; /** - * 估价地址 + * 浼颁环鍦板潃 */ private String address; /** - * 小区名称 + * 灏忓尯鍚嶇О */ private String name; /** - * 房屋估算总价 + * 鎴垮眿浼扮畻鎬讳环 */ private long totalPrice; /** - * 房屋面积 + * 鎴垮眿闈㈢Н */ private double area; /** - * 房屋单价 + * 鎴垮眿鍗曚环 */ private int avgPrice; /** - * 贷款产产品编号 + * 璐锋浜т骇鍝佺紪鍙� */ private String loanProductId; /** - * 贷款产品名称 + * 璐锋浜у搧鍚嶇О */ private String loanProductName; /** - * 申请贷款类型 + * 鐢宠璐锋绫诲瀷 */ private String loanType; /** - * 资产类型 + * 璧勪骇绫诲瀷 */ private String assetType; /** - * 贷款人姓名 + * 璐锋浜哄鍚� */ private String loanUserName; /** - * 贷款人性别 + * 璐锋浜烘�у埆 */ private String sex; /** - * 贷款用途 + * 璐锋鐢ㄩ�� */ private String loanPurpose; /** - * 是否意向客户 + * 鏄惁鎰忓悜瀹㈡埛 */ private Boolean intentCustomer; /** - * 线索来源 + * 绾跨储鏉ユ簮 */ private String clueSource; /** - * 渠道类型 + * 娓犻亾绫诲瀷 */ private String channelType; /** - * 备注 + * 澶囨敞 */ private String remarks; /** - * 创建时间 + * 鍒涘缓鏃堕棿 */ private Date createDate; /** - * 修改时间 + * 淇敼鏃堕棿 */ private Date modifyDate; /** - * 临时用户id + * 涓存椂鐢ㄦ埛id */ private String tempId; /** - * 用户id + * 鐢ㄦ埛id */ private String userId; /** - * 意向分类 参考:IntentTypeEnum + * 鎰忓悜鍒嗙被 鍙傝�冿細IntentTypeEnum */ private int intentType; /** - * 贷款页面来源 + * 璐锋椤甸潰鏉ユ簮 */ private String source; /** - * 回访情况 - * key 无供应商,房互网,复星,房金所,融誉 - * value SupplierFeedbackEnum里的内容 + * 鍥炶鎯呭喌 + * key 鏃犱緵搴斿晢锛屾埧浜掔綉锛屽鏄燂紝鎴块噾鎵�锛岃瀺瑾� + * value SupplierFeedbackEnum閲岀殑鍐呭 */ private Map returnVisit; /** - * 客户情况 + * 瀹㈡埛鎯呭喌 */ private int customerSituation; /** - * 供应商反馈(复星) + * 渚涘簲鍟嗗弽棣堬紙澶嶆槦锛� */ private int supplierFeedback1; /** - * 供应商反馈(融誉) + * 渚涘簲鍟嗗弽棣堬紙铻嶈獕锛� */ private int supplierFeedback2; /** - * 供应商反馈(房互网) + * 渚涘簲鍟嗗弽棣堬紙鎴夸簰缃戯級 */ private int supplierFeedback3; /** - * 备注贷款线索已转发给企业 + * 澶囨敞璐锋绾跨储宸茶浆鍙戠粰浼佷笟 */ private String enterpriseRemark; /** - * 删除标记(0 删除 1 未删除) + * 鍒犻櫎鏍囪(0 鍒犻櫎 1 鏈垹闄�) */ private int flag = 1; /** - * 贷款金额 + * 璐锋閲戦 */ private double amount; - //渠道名称 + //娓犻亾鍚嶇О private String leads_source; - //广告名称 + //骞垮憡鍚嶇О private String campaign; @Id diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/LoanProduct.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/LoanProduct.java index 3a96d7b68..18fa8ae20 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/LoanProduct.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/LoanProduct.java @@ -12,7 +12,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 贷款产品 + * 璐锋浜у搧 * @author yinjihuan * */ @@ -25,114 +25,114 @@ public class LoanProduct implements MongoEntity { private String id; /** - * 产品名称 + * 浜у搧鍚嶇О */ private String name; /** - * 产品类型 + * 浜у搧绫诲瀷 */ private String type; /** - * 合作结构ID + * 鍚堜綔缁撴瀯ID */ private String mechanismId; /** - * 产品logo + * 浜у搧logo */ private String logo; /** - * 贷款额最小(万) + * 璐锋棰濇渶灏忥紙涓囷級 */ private double minLoanMoney; /** - * 贷款额最大(万) + * 璐锋棰濇渶澶э紙涓囷級 */ private double maxLoanMoney; /** - * 贷款期限最小(月) + * 璐锋鏈熼檺鏈�灏忥紙鏈堬級 */ private int minLoanTerm; /** - * 贷款期限最大(月) + * 璐锋鏈熼檺鏈�澶э紙鏈堬級 */ private int maxLoanTerm; /** - * 放款时间最小(天) + * 鏀炬鏃堕棿鏈�灏忥紙澶╋級 */ private int minFkTime; /** - * 放款时间最大(天) + * 鏀炬鏃堕棿鏈�澶э紙澶╋級 */ private int maxFkTime; /** - * 放款时间说明 + * 鏀炬鏃堕棿璇存槑 */ private String fkTimeDesc; /** - * 月利率最小(%) + * 鏈堝埄鐜囨渶灏忥紙%锛� */ private double minMonthInterestRate; /** - * 月利率最大(%) + * 鏈堝埄鐜囨渶澶э紙%锛� */ private double maxMonthInterestRate; /** - * 最小月管理费(%) + * 鏈�灏忔湀绠$悊璐癸紙%锛� */ private double minMonthManagementExpense; /** - * 最大月管理费(%) + * 鏈�澶ф湀绠$悊璐癸紙%锛� */ private double maxMonthManagementExpense; /** - * 产品特色 + * 浜у搧鐗硅壊 */ private String productFeature; /** - * 标签ID集合 对应标签表:LoanProductTag + * 鏍囩ID闆嗗悎 瀵瑰簲鏍囩琛細LoanProductTag */ private List tagIds; /** - * 投放位置 参考:LoanProductPositionEnum + * 鎶曟斁浣嶇疆 鍙傝�冿細LoanProductPositionEnum */ private List positions; /** - * 创建时间 + * 鍒涘缓鏃堕棿 */ private Date createDate; /** - * 修改时间 + * 淇敼鏃堕棿 */ private Date modifyDate; /** - * 合作公司贷款产品的url,当有这个地址时前台贷款申请跳转到该url,不需要填写我们自己的申请 + * 鍚堜綔鍏徃璐锋浜у搧鐨剈rl,褰撴湁杩欎釜鍦板潃鏃跺墠鍙拌捶娆剧敵璇疯烦杞埌璇rl,涓嶉渶瑕佸~鍐欐垜浠嚜宸辩殑鐢宠 */ private String url; private String openCity; /** - * 贷款点击次数 + * 璐锋鐐瑰嚮娆℃暟 */ private int clickCount; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/LoanProductTag.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/LoanProductTag.java index 784a56cd2..facfde06c 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/LoanProductTag.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/LoanProductTag.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 贷款产品标签 + * 璐锋浜у搧鏍囩 * @author yinjihuan * */ @@ -23,22 +23,22 @@ public class LoanProductTag implements MongoEntity { private String id; /** - * 标签名称 + * 鏍囩鍚嶇О */ private String name; /** - * 标签logo + * 鏍囩logo */ private String logo; /** - * 创建时间 + * 鍒涘缓鏃堕棿 */ private Date createDate; /** - * 修改时间 + * 淇敼鏃堕棿 */ private Date modifyDate; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/LoanPush.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/LoanPush.java index 37e1bbbb7..54115aed3 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/LoanPush.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/LoanPush.java @@ -7,7 +7,7 @@ import java.util.Date; /** * Created by luoxf on 2018/12/17. - * 贷款推送 + * 璐锋鎺ㄩ�� */ @Entity @Table(name = "fangjia_coresite.loan_push") @@ -19,61 +19,61 @@ public class LoanPush implements MongoEntity { private String fjsLogId; - //姓名 + //濮撳悕 private String name; - //手机号 + //鎵嬫満鍙� private String phone; - //需求金额 + //闇�姹傞噾棰� private double money; - //城市 + //鍩庡競 private String city; - //贷款期限 + //璐锋鏈熼檺 private int term; - //是否有车(0:未知 1:有 2:无) + //鏄惁鏈夎溅锛�0锛氭湭鐭� 1锛氭湁 2锛氭棤锛� private int isCar; - //是否有房(0:未知 1:有 2:无) + //鏄惁鏈夋埧锛�0锛氭湭鐭� 1锛氭湁 2锛氭棤锛� private int isHouse; - //是否有商业保险(0:未知 1:有 2:无) + //鏄惁鏈夊晢涓氫繚闄╋紙0锛氭湭鐭� 1锛氭湁 2锛氭棤锛� private int isInsurance; - //是否有公积金(0:未知 1:有 2:无) + //鏄惁鏈夊叕绉噾锛�0锛氭湭鐭� 1锛氭湁 2锛氭棤锛� private int isAccumulationFund; - //是否有社保(0:未知 1:有 2:无) + //鏄惁鏈夌ぞ淇濓紙0锛氭湭鐭� 1锛氭湁 2锛氭棤锛� private int isSocialSecurity; - //是否有微粒贷(0:未知 1:有 2:无) + //鏄惁鏈夊井绮掕捶锛�0锛氭湭鐭� 1锛氭湁 2锛氭棤锛� private int isParticulateLoan; - //是否有寿险(0:未知 1:有 2:无) + //鏄惁鏈夊闄╋紙0锛氭湭鐭� 1锛氭湁 2锛氭棤锛� private int isLifeInsurance; - //是否有信用卡(0:未知 1:有 2:无) + //鏄惁鏈変俊鐢ㄥ崱锛�0锛氭湭鐭� 1锛氭湁 2锛氭棤锛� private int isCreditCard; - //收入 + //鏀跺叆 private double income; - //小神鱼(0:未推送 1:推送成功 2推送失败) + //灏忕楸�(0锛氭湭鎺ㄩ�� 1锛氭帹閫佹垚鍔� 2鎺ㄩ�佸け璐�) private int xsyPushFlag; - //房金所(0:未推送 1:推送成功 2推送失败) + //鎴块噾鎵�(0锛氭湭鎺ㄩ�� 1锛氭帹閫佹垚鍔� 2鎺ㄩ�佸け璐�) private int fjsPushFlag; - //是否删除(0:正常 1:删除) + //鏄惁鍒犻櫎(0锛氭甯� 1锛氬垹闄�) private int isDelete; - //创建时间 + //鍒涘缓鏃堕棿 private Date createDate; - //修改时间 + //淇敼鏃堕棿 private Date modifyDate; @Id diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/LoanPushLog.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/LoanPushLog.java index 20f62a398..320a95ed9 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/LoanPushLog.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/LoanPushLog.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 代扣回调日志 + * 浠f墸鍥炶皟鏃ュ織 * */ @Entity @@ -20,27 +20,27 @@ public class LoanPushLog implements MongoEntity { private static final long serialVersionUID = 1L; /** - * 编号 + * 缂栧彿 */ private String id; /** - * 返回状态 + * 杩斿洖鐘舵�� */ private String status; /** - * 返回信息 + * 杩斿洖淇℃伅 */ private String response; /** - * 创建时间 + * 鍒涘缓鏃堕棿 */ private Date addTime; /** - * 日志区别 + * 鏃ュ織鍖哄埆 */ private String type; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/MatchRule.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/MatchRule.java index e61ced8f9..80ef102e0 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/MatchRule.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/MatchRule.java @@ -12,33 +12,33 @@ import java.util.List; public class MatchRule implements MongoEntity { /** - * 匹配规则ID + * 鍖归厤瑙勫垯ID */ private String id; /** - * 商户名称 + * 鍟嗘埛鍚嶇О */ private String shopName; /** - * 线索来源 + * 绾跨储鏉ユ簮 */ private List source; /** - * 贷款类型 + * 璐锋绫诲瀷 */ private List loanTypes; /** - * 城市 + * 鍩庡競 */ private List citys; /** - * 状态 + * 鐘舵�� */ private int status; /** - * 创建时间 + * 鍒涘缓鏃堕棿 */ private Date addTime; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/Mechanism.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/Mechanism.java index 17b233119..183c55625 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/Mechanism.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/Mechanism.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 新版房价网贷款产品合作机构表 + * 鏂扮増鎴夸环缃戣捶娆句骇鍝佸悎浣滄満鏋勮〃 * * @author yinjihuan * @@ -22,25 +22,25 @@ public class Mechanism implements MongoEntity { private static final long serialVersionUID = 2008688727233860772L; /** - * 机构编号 + * 鏈烘瀯缂栧彿 */ private String id; /** - * 机构名称 + * 鏈烘瀯鍚嶇О */ private String name; /** - * 机构简介 + * 鏈烘瀯绠�浠� */ private String introduction; /** - * 创建时间 + * 鍒涘缓鏃堕棿 */ private Date createDate; /** - * 修改时间 + * 淇敼鏃堕棿 */ private Date modifyDate; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/NewsResource.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/NewsResource.java index 102c202d4..d78b1ac9e 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/NewsResource.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/NewsResource.java @@ -5,7 +5,7 @@ import javax.persistence.*; import com.fangjia.dal.MongoEntity; /** - * 新版房价网资源表 + * 鏂扮増鎴夸环缃戣祫婧愯〃 * @author yinjihuan * */ @@ -17,46 +17,46 @@ public class NewsResource implements MongoEntity { private String id; /** - * 标题 + * 鏍囬 */ private String title; /** - * 资源类型 + * 璧勬簮绫诲瀷 */ private String type; /** - * 浏览量 + * 娴忚閲� */ private long visitCount; /** - * 添加用户 + * 娣诲姞鐢ㄦ埛 */ private String addUser; /** - * 更新用户 + * 鏇存柊鐢ㄦ埛 */ private String updateUser; /** - * 是否置顶 + * 鏄惁缃《 */ private boolean topStatus; /** - * 推荐模块 + * 鎺ㄨ崘妯″潡 */ private String recommendModule; /** - * 标题图片 + * 鏍囬鍥剧墖 */ private String titleImg; /** - * 附件 + * 闄勪欢 */ private String attachment; @@ -67,17 +67,17 @@ public class NewsResource implements MongoEntity { private String seoDescription; /** - * 正文内容 + * 姝f枃鍐呭 */ private String content; /** - * 创建时间 + * 鍒涘缓鏃堕棿 */ private Date createDate; /** - * 修改时间 + * 淇敼鏃堕棿 */ private Date modifyDate; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/PaiMai.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/PaiMai.java index 2058cd9aa..c6a8aecce 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/PaiMai.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/PaiMai.java @@ -8,7 +8,7 @@ import java.util.List; import java.util.Map; /** - * 法拍房源存储表 + * 娉曟媿鎴挎簮瀛樺偍琛� * @author wenyan * */ @@ -19,85 +19,85 @@ public class PaiMai implements MongoEntity { private String id; private String title; private String address; - /**城市*/ + /**鍩庡競*/ private String city; - /**匹配的城市*/ + /**鍖归厤鐨勫煄甯�*/ private String matchCity; - /**匹配的区域*/ + /**鍖归厤鐨勫尯鍩�*/ private String matchRegion; - /**匹配的名称*/ + /**鍖归厤鐨勫悕绉�*/ private String matchName; - /**匹配的地址*/ + /**鍖归厤鐨勫湴鍧�*/ private String matchAddress; - /**标地物介绍*/ + /**鏍囧湴鐗╀粙缁�*/ private String introduce; - /**页面url*/ + /**椤甸潰url*/ private String url; - /**图片*/ + /**鍥剧墖*/ private List imgUrls; - /**标地物详细信息*/ + /**鏍囧湴鐗╄缁嗕俊鎭�*/ private Map detailMap; - /**报名人数*/ + /**鎶ュ悕浜烘暟*/ private Integer enrollCount; - /**设置提醒人数*/ + /**璁剧疆鎻愰啋浜烘暟*/ private Integer callCount; - /**围观人数*/ + /**鍥磋浜烘暟*/ private Integer lookCount; - /**起拍价*/ + /**璧锋媿浠�*/ private Integer startPrice; - /**当前价*/ + /**褰撳墠浠�*/ private Integer curPrice; - /**成交均价*/ + /**鎴愪氦鍧囦环*/ private Integer tradeAvgPrice; - /**建筑面积*/ + /**寤虹瓚闈㈢Н*/ private Double area; - /**结束时间*/ + /**缁撴潫鏃堕棿*/ private Date finishDate; - /**状态*/ + /**鐘舵��*/ private String status; - /**拍卖结果描述*/ + /**鎷嶅崠缁撴灉鎻忚堪*/ private String statusDesc; - /**变卖价*/ + /**鍙樺崠浠�*/ private Integer sellOffPrice; - /**加价幅度*/ + /**鍔犱环骞呭害*/ private Integer addPrice; - /**类型*/ + /**绫诲瀷*/ private String type; - /**保证金*/ + /**淇濊瘉閲�*/ private Integer depositPrice; - /**变卖周期 : 60天*/ + /**鍙樺崠鍛ㄦ湡 : 60澶�*/ private String sellOffWeekly; - /**优先购买权人 : 无*/ + /**浼樺厛璐拱鏉冧汉 : 鏃�*/ private String preemptivePerson; - /**变卖预缴款:?2,400,000*/ + /**鍙樺崠棰勭即娆�:?2,400,000*/ private Integer sellOffAdvancePay; - /**评估价?3,650,000*/ + /**璇勪及浠�?3,650,000*/ private Integer evaluationPrice; - /**延时周期 : 5分钟*/ + /**寤舵椂鍛ㄦ湡 : 5鍒嗛挓*/ private String delayWeekly; - /**竞价周期*/ + /**绔炰环鍛ㄦ湡*/ private String pricePkWeekly; - /**竞价规则*/ + /**绔炰环瑙勫垯*/ private String rule; - /**拍卖次数*/ + /**鎷嶅崠娆℃暟*/ private String count; - /**拍卖模式*/ + /**鎷嶅崠妯″紡*/ private String mode; - /**在线拍周期*/ + /**鍦ㄧ嚎鎷嶅懆鏈�*/ private String onlineWeekly; - /**保留价*/ + /**淇濈暀浠�*/ private String retain; - /**市场价*/ + /**甯傚満浠�*/ private Integer marketTotalPrice; - /**预测价*/ + /**棰勬祴浠�*/ private Integer predictPrice; - /**起拍时间*/ + /**璧锋媿鏃堕棿*/ private Date startDate; - /**预测均价/小区均价*/ + /**棰勬祴鍧囦环/灏忓尯鍧囦环*/ private Double ratio; - /**当前小区均价*/ + /**褰撳墠灏忓尯鍧囦环*/ private Integer marketAvgPrice; - /**物业类型*/ + /**鐗╀笟绫诲瀷*/ private String matchEstateType; private String houseNum; private String unitNum; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/SaleLeads.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/SaleLeads.java index 6988b5f48..c5e91ac42 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/SaleLeads.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/SaleLeads.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 新版房价网销售线索表 + * 鏂扮増鎴夸环缃戦攢鍞嚎绱㈣〃 * @author yinjihuan * */ @@ -24,117 +24,117 @@ public class SaleLeads implements MongoEntity { private String id; /** - * 姓名 + * 濮撳悕 */ private String uname; /** - * 公司 + * 鍏徃 */ private String company; /** - * 手机 + * 鎵嬫満 */ private String mobile; /** - * 座机 + * 搴ф満 */ private String telPhone; /** - * 邮箱 + * 閭 */ private String email; /** - * 省份 + * 鐪佷唤 */ private String province; /** - * 城市 + * 鍩庡競 */ private String city; /** - * 行业性质 + * 琛屼笟鎬ц川 */ private String industryNature; /** - * 其他行业性质 + * 鍏朵粬琛屼笟鎬ц川 */ private String otherIndustryNature; /** - * 工作职能 + * 宸ヤ綔鑱岃兘 */ private String work; /** - * 其他工作职能 + * 鍏朵粬宸ヤ綔鑱岃兘 */ private String otherWork; /** - * 业务需求 + * 涓氬姟闇�姹� */ private String business; /** - * 其他业务需求 + * 鍏朵粬涓氬姟闇�姹� */ private String otherBusiness; /** - * 是否接收邮件 + * 鏄惁鎺ユ敹閭欢 */ private boolean emailStatus; /** - * 是否意向客户 + * 鏄惁鎰忓悜瀹㈡埛 */ private Boolean intentionalCustomer; /** - * 下载内容 + * 涓嬭浇鍐呭 */ private String downContent; /** - * 线索来源 + * 绾跨储鏉ユ簮 */ private String clueSource; /** - * 渠道类型 + * 娓犻亾绫诲瀷 */ private String channelType; /** - * 备注 + * 澶囨敞 */ private String remarks; /** - * 创建时间 + * 鍒涘缓鏃堕棿 */ private Date createDate; /** - * 修改时间 + * 淇敼鏃堕棿 */ private Date modifyDate; /** - * 临时用户id + * 涓存椂鐢ㄦ埛id */ private String tempId; /** - * 真实用户id + * 鐪熷疄鐢ㄦ埛id */ private String userId; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/ServerArea.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/ServerArea.java index 716454bf6..8ec9b30ca 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/ServerArea.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/ServerArea.java @@ -17,11 +17,11 @@ public class ServerArea implements MongoEntity { public static enum ServerAreaStatusEnum { /** - * 备用城市 + * 澶囩敤鍩庡競 */ NOT_USED(0), /** - * 线上 + * 绾夸笂 */ PRODUCTION(2); private final int value; @@ -76,9 +76,9 @@ public class ServerArea implements MongoEntity { private int cityGrade; - private String cityLevel; // 行政级别 + private String cityLevel; // 琛屾斂绾у埆 - private Integer sequence; // 显示顺序,从小到大 + private Integer sequence; // 鏄剧ず椤哄簭锛屼粠灏忓埌澶� private Integer falshVersion; @@ -227,7 +227,7 @@ public class ServerArea implements MongoEntity { } /** - * 城市级别 + * 鍩庡競绾у埆 * * @return */ diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/UrlFilter.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/UrlFilter.java index fcf9cf41a..a18b95b11 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/UrlFilter.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/UrlFilter.java @@ -24,7 +24,7 @@ public class UrlFilter implements MongoEntity{ private String uri; /** - * 创建时间 + * 鍒涘缓鏃堕棿 */ private Date createDate; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/YinLianEvaluation.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/YinLianEvaluation.java index 7855974a6..75059037c 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/YinLianEvaluation.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/YinLianEvaluation.java @@ -11,8 +11,8 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 银联公众号需求 - * 公众号跳转存储银联过来的用户信息 + * 閾惰仈鍏紬鍙烽渶姹� + * 鍏紬鍙疯烦杞瓨鍌ㄩ摱鑱旇繃鏉ョ殑鐢ㄦ埛淇℃伅 * * @author JENIS */ @@ -25,27 +25,27 @@ public class YinLianEvaluation implements MongoEntity { private String id; /** - * 银联公众号跳转传入的用户ID + * 閾惰仈鍏紬鍙疯烦杞紶鍏ョ殑鐢ㄦ埛ID */ private String userId; /** - * 城市 + * 鍩庡競 */ private String city; /** - * 区域 + * 鍖哄煙 */ private String region; /** - * 小区名 + * 灏忓尯鍚� */ private String districtName; /** - * 创建时间 + * 鍒涘缓鏃堕棿 */ private Date createDate; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/YinLianUserInfo.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/YinLianUserInfo.java index a18d8cc4e..86c05286d 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/YinLianUserInfo.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/YinLianUserInfo.java @@ -11,8 +11,8 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 银联公众号需求 - * 公众号跳转存储银联过来的用户信息 + * 閾惰仈鍏紬鍙烽渶姹� + * 鍏紬鍙疯烦杞瓨鍌ㄩ摱鑱旇繃鏉ョ殑鐢ㄦ埛淇℃伅 * * @author JENIS */ @@ -25,12 +25,12 @@ public class YinLianUserInfo implements MongoEntity { private String id; /** - * 银联公众号跳转传入的用户ID + * 閾惰仈鍏紬鍙疯烦杞紶鍏ョ殑鐢ㄦ埛ID */ private String userId; /** - * 创建时间 + * 鍒涘缓鏃堕棿 */ private Date createDate; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/mobile/model/DistrictMSG.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/mobile/model/DistrictMSG.java index cafd59500..403bcd1ff 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/mobile/model/DistrictMSG.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/mobile/model/DistrictMSG.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 收藏夹 + * 鏀惰棌澶� * * @author liupei */ @@ -26,32 +26,32 @@ public class DistrictMSG implements MongoEntity { private String id; /** - * 用户唯一标识符 + * 鐢ㄦ埛鍞竴鏍囪瘑绗� */ private String uid; /** - * 城市名 + * 鍩庡競鍚� */ private String city; /** - * 区域名 + * 鍖哄煙鍚� */ private String region; /** - * 小区名 + * 灏忓尯鍚� */ private String district; /** - * 留言 + * 鐣欒█ */ private String msg; /** - * 时间 + * 鏃堕棿 */ private Date creationDate = new Date(); diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/mobile/model/DistrictMSGReply.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/mobile/model/DistrictMSGReply.java index c98af5298..9e0b5ebc5 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/mobile/model/DistrictMSGReply.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/mobile/model/DistrictMSGReply.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 收藏夹 + * 鏀惰棌澶� * * @author liupei */ @@ -26,28 +26,28 @@ public class DistrictMSGReply implements MongoEntity { private String id; /** - * 用户唯一标识符 + * 鐢ㄦ埛鍞竴鏍囪瘑绗� */ private String uid; /** - * 留言id + * 鐣欒█id */ private String msgId; /** - * 回复 + * 鍥炲 */ private String msg; /** - * 父ID + * 鐖禝D */ private String pid; /** - * 时间 + * 鏃堕棿 */ private Date creationDate = new Date(); diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/mobile/model/Favorite.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/mobile/model/Favorite.java index 12a48a4f3..8fc1ad166 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/mobile/model/Favorite.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/mobile/model/Favorite.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 收藏夹 + * 鏀惰棌澶� * * @author liupei */ @@ -26,42 +26,42 @@ public class Favorite implements MongoEntity { private String id; /** - * 用户唯一标识符 + * 鐢ㄦ埛鍞竴鏍囪瘑绗� */ private String uid; /** - * 手机唯一标识符 + * 鎵嬫満鍞竴鏍囪瘑绗� */ private String ime; /** - * 城市 + * 鍩庡競 */ private String city; /** - * 类别:sell=二手房,rent=租房,district=小区,evaluation=评估报告 + * 绫诲埆:sell=浜屾墜鎴�,rent=绉熸埧,district=灏忓尯,evaluation=璇勪及鎶ュ憡 */ private String category; /** - * 收藏的二手房,租房,评估报告id + * 鏀惰棌鐨勪簩鎵嬫埧,绉熸埧,璇勪及鎶ュ憡id */ private String orgId; /** - * 收藏的小区所在区域 + * 鏀惰棌鐨勫皬鍖烘墍鍦ㄥ尯鍩� */ private String region; /** - * 收藏的小区名称 + * 鏀惰棌鐨勫皬鍖哄悕绉� */ private String districtName; /** - * 收藏时间 + * 鏀惰棌鏃堕棿 */ private Date creationDate = new Date(); diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/mobile/model/SearchKeyword.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/mobile/model/SearchKeyword.java index 510575117..c08917a75 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/mobile/model/SearchKeyword.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/mobile/model/SearchKeyword.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 用户搜索关键词 + * 鐢ㄦ埛鎼滅储鍏抽敭璇� * * @author liupei */ @@ -26,27 +26,27 @@ public class SearchKeyword implements MongoEntity { private String id; /** - * 城市 + * 鍩庡競 */ private String city; /** - * 关键词 + * 鍏抽敭璇� */ private String keyword; /** - * 纬度 + * 绾害 */ private Double lat; /** - * 经度 + * 缁忓害 */ private Double lng; /** - * 搜索时间 + * 鎼滅储鏃堕棿 */ private Date creationDate = new Date(); diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/mobile/model/User.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/mobile/model/User.java index 7bc4f2156..0f4bf97bc 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/mobile/model/User.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/mobile/model/User.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 用户记录 + * 鐢ㄦ埛璁板綍 * * @author ruanyadong */ @@ -26,33 +26,33 @@ public class User implements MongoEntity { private Date creationDate = new Date(); /** - * 手机唯一码 + * 鎵嬫満鍞竴鐮� */ private String id; /** - * 手机唯一码 + * 鎵嬫満鍞竴鐮� */ private String ime; /** - * 类型 + * 绫诲瀷 */ private String type = "default"; /** - * 昵称 + * 鏄电О */ private String name; /** - * 描述 + * 鎻忚堪 */ private String description; /** - * 头像 + * 澶村儚 */ private String image; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/mobile/model/UserCallRecord.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/mobile/model/UserCallRecord.java index 98089aae7..44341c373 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/mobile/model/UserCallRecord.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/mobile/model/UserCallRecord.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 用户呼叫记录 + * 鐢ㄦ埛鍛煎彨璁板綍 * * @author liupei */ @@ -30,27 +30,27 @@ public class UserCallRecord implements MongoEntity { private Date creationDate = new Date(); /** - * 手机类型 + * 鎵嬫満绫诲瀷 */ private String phoneType; /** - * 用户id + * 鐢ㄦ埛id */ private String uid; /** - * 手机唯一码 + * 鎵嬫満鍞竴鐮� */ private String ime; /** - * 主叫电话 + * 涓诲彨鐢佃瘽 */ private String caller; /** - * 对应的房源id + * 瀵瑰簲鐨勬埧婧恑d */ private String orgId; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/mobile/model/UserComplaint.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/mobile/model/UserComplaint.java index 644d63379..6bffb7a83 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/mobile/model/UserComplaint.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/mobile/model/UserComplaint.java @@ -12,7 +12,7 @@ import com.fangjia.dal.MongoEntity; /** * - * 用户举报信息 + * 鐢ㄦ埛涓炬姤淇℃伅 * * @author _tyler * @@ -29,52 +29,52 @@ public class UserComplaint implements MongoEntity { private String id; /** - * 用户唯一标识符 + * 鐢ㄦ埛鍞竴鏍囪瘑绗� */ private String uid; /** - * 手机唯一标识符 + * 鎵嬫満鍞竴鏍囪瘑绗� */ private String ime; /** - * 举报问题类别(二手房 租房 小区) + * 涓炬姤闂绫诲埆(浜屾墜鎴� 绉熸埧 灏忓尯) */ private String category; /** - * 举报问题分类 + * 涓炬姤闂鍒嗙被 */ private String type; /** - * 用户举报备注 + * 鐢ㄦ埛涓炬姤澶囨敞 */ private String content; /** - * 手机号码 + * 鎵嬫満鍙风爜 */ private String mobile; /** - * 相关房源ID (二手房或者租房) + * 鐩稿叧鎴挎簮ID (浜屾墜鎴挎垨鑰呯鎴�) */ private String relateId; /** - * 相关小区区域信息 + * 鐩稿叧灏忓尯鍖哄煙淇℃伅 */ private String region; /** - * 相关小区 小区名 + * 鐩稿叧灏忓尯 灏忓尯鍚� */ private String districtName; /** - * 数据接收时间 + * 鏁版嵁鎺ユ敹鏃堕棿 */ private Date creationDate; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/mobile/model/UserFeedback.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/mobile/model/UserFeedback.java index 2631d5df4..8dc76fdc2 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/mobile/model/UserFeedback.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/mobile/model/UserFeedback.java @@ -12,7 +12,7 @@ import com.fangjia.dal.MongoEntity; /** * - * 用户反馈信息 + * 鐢ㄦ埛鍙嶉淇℃伅 * * @author _tyler * @@ -29,32 +29,32 @@ public class UserFeedback implements MongoEntity { private String id; /** - * 用户唯一标识符 + * 鐢ㄦ埛鍞竴鏍囪瘑绗� */ private String uid; /** - * 手机唯一标识符 + * 鎵嬫満鍞竴鏍囪瘑绗� */ private String ime; /** - * 反馈信息内容 + * 鍙嶉淇℃伅鍐呭 */ private String content; /** - * 手机号码 + * 鎵嬫満鍙风爜 */ private String mobile; /** - * 用户邮箱地址 + * 鐢ㄦ埛閭鍦板潃 */ private String email; /** - * 信息接收时间 + * 淇℃伅鎺ユ敹鏃堕棿 */ private Date createionDate; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/mobile/model/UserGeolocation.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/mobile/model/UserGeolocation.java index 29ddf33cc..44c61a1ad 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/mobile/model/UserGeolocation.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/mobile/model/UserGeolocation.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 用户地理位置信息 + * 鐢ㄦ埛鍦扮悊浣嶇疆淇℃伅 * * @author liupei */ @@ -26,32 +26,32 @@ public class UserGeolocation implements MongoEntity { private String id; /** - * 用户唯一身份标识 + * 鐢ㄦ埛鍞竴韬唤鏍囪瘑 */ private String uid; /** - * 手机唯一码 + * 鎵嬫満鍞竴鐮� */ private String ime; /** - * 城市 + * 鍩庡競 */ private String city; /** - * 纬度 + * 绾害 */ private double lat; /** - * 经度 + * 缁忓害 */ private double lng; /** - * 记录创建时间 + * 璁板綍鍒涘缓鏃堕棿 */ private Date creationDate = new Date(); diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/mobile/model/UserHistory.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/mobile/model/UserHistory.java index a0f1fb354..5c2f39e97 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/mobile/model/UserHistory.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/mobile/model/UserHistory.java @@ -12,7 +12,7 @@ import com.fangjia.dal.MongoEntity; /** * - * 用户浏览历史信息 + * 鐢ㄦ埛娴忚鍘嗗彶淇℃伅 * * @author _tyler * @@ -29,37 +29,37 @@ public class UserHistory implements MongoEntity { private String id; /** - * 用户唯一标识符 + * 鐢ㄦ埛鍞竴鏍囪瘑绗� */ private String uid; /** - * 手机唯一标识符 + * 鎵嬫満鍞竴鏍囪瘑绗� */ private String ime; /** - * 用户浏览信息分类(二手房|租房|小区) + * 鐢ㄦ埛娴忚淇℃伅鍒嗙被锛堜簩鎵嬫埧|绉熸埧|灏忓尯锛� */ private String category; /** - * 相关ID + * 鐩稿叧ID */ private String relateId; /** - * 相关小区区域 + * 鐩稿叧灏忓尯鍖哄煙 */ private String region; /** - * 相关小区 小区名 + * 鐩稿叧灏忓尯 灏忓尯鍚� */ private String districtName; /** - * 信息接收时间 + * 淇℃伅鎺ユ敹鏃堕棿 */ private Date createionDate; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/mobile/model/UserSign.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/mobile/model/UserSign.java index 7e04f53ca..1529a5264 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/mobile/model/UserSign.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/mobile/model/UserSign.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 签到 + * 绛惧埌 * * @author liupei */ @@ -26,27 +26,27 @@ public class UserSign implements MongoEntity { private String id; /** - * 用户唯一标识符 + * 鐢ㄦ埛鍞竴鏍囪瘑绗� */ private String uid; /** - * 城市名 + * 鍩庡競鍚� */ private String city; /** - * 区域名 + * 鍖哄煙鍚� */ private String region; /** - * 小区名 + * 灏忓尯鍚� */ private String district; /** - * 时间 + * 鏃堕棿 */ private Date creationDate = new Date(); diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AdSpace.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AdSpace.java index dccbd4af9..9b7de05a2 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AdSpace.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AdSpace.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 广告位实体类 + * 骞垮憡浣嶅疄浣撶被 */ @Entity @Table(name = "fangjia.ad_space") @@ -19,18 +19,18 @@ public class AdSpace implements MongoEntity { private static final long serialVersionUID = -7371402332275732686L; private String id; - private String materialType; // 素材类型 - private String materialURL; // 素材路径 - private String materialURLSmall; // 素材路径,收缩形态时用 - private double width; // 广告位宽度 - private double height; // 广告位高度 - private String links; // 链接 - private String pageId; // 页面ID - private String position; // 位置 - private double sequenceNumber; // 序号 - private String city; // 城市 - private String materialContent; // 素材内容 - private String remark; // 素材内容 + private String materialType; // 绱犳潗绫诲瀷 + private String materialURL; // 绱犳潗璺緞 + private String materialURLSmall; // 绱犳潗璺緞锛屾敹缂╁舰鎬佹椂鐢� + private double width; // 骞垮憡浣嶅搴� + private double height; // 骞垮憡浣嶉珮搴� + private String links; // 閾炬帴 + private String pageId; // 椤甸潰ID + private String position; // 浣嶇疆 + private double sequenceNumber; // 搴忓彿 + private String city; // 鍩庡競 + private String materialContent; // 绱犳潗鍐呭 + private String remark; // 绱犳潗鍐呭 private Date creationDate; private Date modificationDate; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AddressCheck.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AddressCheck.java index 92a4e18aa..73a25e4b1 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AddressCheck.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AddressCheck.java @@ -35,30 +35,30 @@ public class AddressCheck implements MongoEntity { private Double lng; - // 城市 poi名称 地址 md5加密的id + // 鍩庡競 poi鍚嶇О 鍦板潃 md5鍔犲瘑鐨刬d private String addressId; private String keyWords; private String keyWordsUse; - private Double score;// 地址评分 + private Double score;// 鍦板潃璇勫垎 - private String scoreErrorMsg;// 评分异常后提示 + private String scoreErrorMsg;// 璇勫垎寮傚父鍚庢彁绀� - private List poiList;// 周边poi + private List poiList;// 鍛ㄨ竟poi - private String antiFraudErrorMsg;// 地址反欺诈异常提示 + private String antiFraudErrorMsg;// 鍦板潃鍙嶆璇堝紓甯告彁绀� private Map poiMap; - private List districtName; // 评分所匹配的小区 + private List districtName; // 璇勫垎鎵�鍖归厤鐨勫皬鍖� - private String provionce;// 省份 + private String provionce;// 鐪佷唤 - private String addressUse;// 实际使用的,高德返回的地址 + private String addressUse;// 瀹為檯浣跨敤鐨�,楂樺痉杩斿洖鐨勫湴鍧� - private String nameUse;// 实际使用,高德返回的poiName + private String nameUse;// 瀹為檯浣跨敤锛岄珮寰疯繑鍥炵殑poiName private String formatAddress; @@ -72,7 +72,7 @@ public class AddressCheck implements MongoEntity { private Double estateScore; - private Double regionScore;//消费的区域评分 + private Double regionScore;//娑堣垂鐨勫尯鍩熻瘎鍒� @Id @GeneratedValue @@ -265,7 +265,7 @@ public class AddressCheck implements MongoEntity { this.formatAddress = formatAddress; } - //高德地理编码的相关信息 + //楂樺痉鍦扮悊缂栫爜鐨勭浉鍏充俊鎭� private String name2; private String address2; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AddressInfo.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AddressInfo.java index 687632442..886d653eb 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AddressInfo.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AddressInfo.java @@ -33,7 +33,7 @@ public class AddressInfo implements MongoEntity{ private String buildDate; private String version; private Long totalPrice; - private Integer finishMark;//0:末完成 1:进行中 2:完成 + private Integer finishMark;//0:鏈畬鎴� 1:杩涜涓� 2:瀹屾垚 private Date finishDate; private String matchName; @@ -51,7 +51,7 @@ public class AddressInfo implements MongoEntity{ private String priceLevel; private Long lastPrice; - private Integer seq;//顺序 + private Integer seq;//椤哄簭 @Id diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AddressMatch.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AddressMatch.java index b1c806b0c..e504ce04e 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AddressMatch.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AddressMatch.java @@ -11,7 +11,7 @@ import java.util.Date; import java.util.Map; /** - * 记录房价网,房价通,房评卡及成交数据 地址匹配小区商铺写字楼的结果 + * 璁板綍鎴夸环缃戯紝鎴夸环閫氾紝鎴胯瘎鍗″強鎴愪氦鏁版嵁 鍦板潃鍖归厤灏忓尯鍟嗛摵鍐欏瓧妤肩殑缁撴灉 * @author gaojuan * */ diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AddressMatchLog.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AddressMatchLog.java index bb0512fdf..74deef066 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AddressMatchLog.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AddressMatchLog.java @@ -12,7 +12,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 记录房价网,房价通,房评卡及成交数据 地址匹配小区商铺写字楼的结果 + * 璁板綍鎴夸环缃戯紝鎴夸环閫氾紝鎴胯瘎鍗″強鎴愪氦鏁版嵁 鍦板潃鍖归厤灏忓尯鍟嗛摵鍐欏瓧妤肩殑缁撴灉 * @author gaojuan * */ @@ -28,17 +28,17 @@ public class AddressMatchLog implements MongoEntity { private String city; private String input; private String userName; - private int status;//0:成功 1:失败 - private String source;//来源 + private int status;//0:鎴愬姛 1:澶辫触 + private String source;//鏉ユ簮 private Date creationDate; private Date modificationDate; - private String artificialMatch;//人工匹配结果 + private String artificialMatch;//浜哄伐鍖归厤缁撴灉 private String operateName; - private String artificialMatchType;//人工匹配类型 - private String artificialMatchStatus;//人工匹配状态 - private Integer artificialWay;//人工操作选项 1:名称别名 2:地址别名 3:入库编辑 + private String artificialMatchType;//浜哄伐鍖归厤绫诲瀷 + private String artificialMatchStatus;//浜哄伐鍖归厤鐘舵�� + private Integer artificialWay;//浜哄伐鎿嶄綔閫夐」 1锛氬悕绉板埆鍚� 2锛氬湴鍧�鍒悕 3锛氬叆搴撶紪杈� private int searchCount; - private List> result;//等接口能返回多个值时,返回List>; + private List> result;//绛夋帴鍙h兘杩斿洖澶氫釜鍊兼椂锛岃繑鍥濴ist>; private String ip; private String uid; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AddressTask.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AddressTask.java index 1795d5de3..a46466d82 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AddressTask.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AddressTask.java @@ -19,7 +19,7 @@ public class AddressTask implements MongoEntity { */ private static final long serialVersionUID = 4987351593258594074L; private String id; - private Integer status;//0:初始化 1:待分析 2:分析中  3:完成 99:失败 100:删除 + private Integer status;//0:鍒濆鍖栥��1锛氬緟鍒嗘瀽銆�2锛氬垎鏋愪腑銆�銆�3:瀹屾垚銆�99:澶辫触 100:鍒犻櫎 private String fileName; private String userId; private String type; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AgencyTradeRank.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AgencyTradeRank.java index 3a5e0cc17..4dcbaec55 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AgencyTradeRank.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AgencyTradeRank.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 记录中介的成交量排名(小区和别墅,不包括工厂,车库之类) + * 璁板綍涓粙鐨勬垚浜ら噺鎺掑悕锛堝皬鍖哄拰鍒锛屼笉鍖呮嫭宸ュ巶锛岃溅搴撲箣绫伙級 */ @Entity @Table(name = "fangjia.agency_trade_rank") @@ -20,12 +20,12 @@ public class AgencyTradeRank implements MongoEntity { private String id; private String city; - private Date statDate; // 统计日期(如统计12月份,统计日期为月初,如:2012-12-01) + private Date statDate; // 缁熻鏃ユ湡(濡傜粺璁�12鏈堜唤锛岀粺璁℃棩鏈熶负鏈堝垵锛屽锛�2012-12-01) private Date creationDate; - private String agencyKey; // 成交中介的关键字 - private String fullName; // 中介全称 - private double marketStat; // 成交量当月占比 - private int rank; // 成交量排名 + private String agencyKey; // 鎴愪氦涓粙鐨勫叧閿瓧 + private String fullName; // 涓粙鍏ㄧО + private double marketStat; // 鎴愪氦閲忓綋鏈堝崰姣� + private int rank; // 鎴愪氦閲忔帓鍚� @Id @GeneratedValue diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AgentCompany.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AgentCompany.java index a2d199601..e7a511d92 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AgentCompany.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AgentCompany.java @@ -10,7 +10,7 @@ import com.fangjia.dal.MongoEntity; /** * - * CPC中介公司 + * CPC涓粙鍏徃 * * @author _tyler * @@ -27,37 +27,37 @@ public class AgentCompany implements MongoEntity { private String id; /** - * 中介公司域名 + * 涓粙鍏徃鍩熷悕 */ private String siteName; /** - * 城市ID + * 鍩庡競ID */ private String cityId; /** - * 统计状态 0:正常,1:CPC不正常 + * 缁熻鐘舵�� 0锛氭甯革紝1锛欳PC涓嶆甯� */ private Integer status; /** - * 类别:Sell:二手房 Rent:租房 + * 绫诲埆锛歋ell锛氫簩鎵嬫埧 Rent:绉熸埧 */ private String category; /** - * 最后一次统计房源数量 + * 鏈�鍚庝竴娆$粺璁℃埧婧愭暟閲� */ private Integer lastActualCount; /** - * 最后一次统计限制数量 + * 鏈�鍚庝竴娆$粺璁¢檺鍒舵暟閲� */ private Integer lastLimitedCount; /** - * 最后一次统计时间 + * 鏈�鍚庝竴娆$粺璁℃椂闂� */ private Date lastModifyDate; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AgentMaster.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AgentMaster.java index 02925542e..16b37aba0 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AgentMaster.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AgentMaster.java @@ -12,7 +12,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 全国所有中介公司 + * 鍏ㄥ浗鎵�鏈変腑浠嬪叕鍙� * * @author xiaoyu * @@ -32,9 +32,9 @@ public class AgentMaster implements MongoEntity { private String logoUrl; private List honors; private Date creationDate; - private String representative; // 法人代表 - private String enterpriseAptitude; // 企业资质 - private String managementClass; // 经营类型 + private String representative; // 娉曚汉浠h〃 + private String enterpriseAptitude; // 浼佷笟璧勮川 + private String managementClass; // 缁忚惀绫诲瀷 @Id @GeneratedValue diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Agreement.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Agreement.java index dad3e58b3..4f2b3c9bd 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Agreement.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Agreement.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 协议 + * 鍗忚 * @author zongzhimin * */ @@ -24,66 +24,66 @@ public class Agreement implements MongoEntity { */ private static final long serialVersionUID = 1L; /** - * 编号 + * 缂栧彿 */ private String id; /** - * 账户名 + * 璐︽埛鍚� */ private String name; /** - * 手机号 + * 鎵嬫満鍙� */ private String mobile; /** - * 贷款金额 + * 璐锋閲戦 */ private double loanAmount; /** - * 服务费比率 + * 鏈嶅姟璐规瘮鐜� */ private double serviceRate; /** - * 协议编号 + * 鍗忚缂栧彿 */ private String agreementId; /** - * 证件类型 + * 璇佷欢绫诲瀷 */ private String certificate; /** - * 证件号码 + * 璇佷欢鍙风爜 */ private String number; /** - * 银行卡号 + * 閾惰鍗″彿 */ private String cardNumber; /** - * 开户行 + * 寮�鎴疯 */ private String bank; /** - * 签名图片Url + * 绛惧悕鍥剧墖Url */ private String signatureUrl; /** - * 签约完成时间 + * 绛剧害瀹屾垚鏃堕棿 */ private Date finishTime; /** - * 是否有效 1:有效 0:无效 + * 鏄惁鏈夋晥 1:鏈夋晥 0锛氭棤鏁� */ private int status; /** - * 添加时间 + * 娣诲姞鏃堕棿 */ private Date addTime; /** - * 修改时间 + * 淇敼鏃堕棿 */ private Date modTime; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AliasFang.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AliasFang.java index c4027ecc3..874b17380 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AliasFang.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AliasFang.java @@ -5,7 +5,7 @@ import com.fangjia.dal.MongoEntity; import javax.persistence.*; /** - * 搜房名称与别名关系 + * 鎼滄埧鍚嶇О涓庡埆鍚嶅叧绯� */ @Entity @Table(name = "business.alias_fang") diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AmapPoi.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AmapPoi.java index dfa58a478..74f7ae600 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AmapPoi.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AmapPoi.java @@ -33,7 +33,7 @@ public class AmapPoi implements MongoEntity { private String text; private String city; /** - * 反欺诈接口,标示欺诈点字段 + * 鍙嶆璇堟帴鍙o紝鏍囩ず娆鸿瘓鐐瑰瓧娈� */ private Boolean fraud; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/ApiBuyApply.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/ApiBuyApply.java index e2f492e7e..10ae48782 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/ApiBuyApply.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/ApiBuyApply.java @@ -29,9 +29,9 @@ public class ApiBuyApply implements MongoEntity { private String ip; private Integer status; private String remarks; - private Integer apiCount;//api调用次数 - private Double cost;//总花费 - private String tradeNo;//订单号 + private Integer apiCount;//api璋冪敤娆℃暟 + private Double cost;//鎬昏姳璐� + private String tradeNo;//璁㈠崟鍙� @Column(name = "api_count") public Integer getApiCount() { diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/ApiCountLog.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/ApiCountLog.java index 00b512da9..16177ccc8 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/ApiCountLog.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/ApiCountLog.java @@ -28,9 +28,9 @@ public class ApiCountLog implements MongoEntity { private Date operateTime; - // 修改次数前总次数 + // 淇敼娆℃暟鍓嶆�绘鏁� private Integer oldCount; - // 修改次数后的次数 + // 淇敼娆℃暟鍚庣殑娆℃暟 private Integer newCount; @Id diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/ApiDetail.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/ApiDetail.java index b41ea6d62..eec84baf4 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/ApiDetail.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/ApiDetail.java @@ -27,11 +27,11 @@ public class ApiDetail implements MongoEntity { private Integer callCount; private Date creationDate; private String page; - private Boolean hot;//是否热门 - private List scenes;//应用场景(1:押品风控 2:客户价值分析 3:店址分析 4:个人不动产管理) - private Integer type;//类型(1:价格信息 2:价格走势信息 3:小区基础信息 4:小区配套信息 5:小区周边交通状况 6:小区周边消费场所 7:小区周边配套场所 8:其他) - private Boolean freeTest;//是否可免费测试 - private String iconClass; //图标样式 + private Boolean hot;//鏄惁鐑棬 + private List scenes;//搴旂敤鍦烘櫙锛�1锛氭娂鍝侀鎺� 2锛氬鎴蜂环鍊煎垎鏋� 3锛氬簵鍧�鍒嗘瀽 4锛氫釜浜轰笉鍔ㄤ骇绠$悊锛� + private Integer type;//绫诲瀷锛�1锛氫环鏍间俊鎭� 2锛氫环鏍艰蛋鍔夸俊鎭� 3锛氬皬鍖哄熀纭�淇℃伅 4锛氬皬鍖洪厤濂椾俊鎭� 5锛氬皬鍖哄懆杈逛氦閫氱姸鍐� 6锛氬皬鍖哄懆杈规秷璐瑰満鎵� 7锛氬皬鍖哄懆杈归厤濂楀満鎵� 8锛氬叾浠栵級 + private Boolean freeTest;//鏄惁鍙厤璐规祴璇� + private String iconClass; //鍥炬爣鏍峰紡 private String name; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/ApiInvokeStatistical.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/ApiInvokeStatistical.java index d568dddd6..3f41c5309 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/ApiInvokeStatistical.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/ApiInvokeStatistical.java @@ -16,14 +16,14 @@ public class ApiInvokeStatistical implements MongoEntity { private static final long serialVersionUID = -5492231659545511142L; private String id; - private String userId;//用户id - private String userName;//用户名称 - private String requestURI;//请求的方法 - private Integer successEffectiveTime;// 有效的成功次数 - private Integer successInvalidTime;// 无效的成功次数 - private Integer defeatTime;//错误次数 - private Integer totalTime;//总次数 - private Date statisticalDate;//统计日期 + private String userId;//鐢ㄦ埛id + private String userName;//鐢ㄦ埛鍚嶇О + private String requestURI;//璇锋眰鐨勬柟娉� + private Integer successEffectiveTime;// 鏈夋晥鐨勬垚鍔熸鏁� + private Integer successInvalidTime;// 鏃犳晥鐨勬垚鍔熸鏁� + private Integer defeatTime;//閿欒娆℃暟 + private Integer totalTime;//鎬绘鏁� + private Date statisticalDate;//缁熻鏃ユ湡 @Id @GeneratedValue diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/ApiParam.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/ApiParam.java index 4716c5299..47af211cb 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/ApiParam.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/ApiParam.java @@ -20,11 +20,11 @@ public class ApiParam implements MongoEntity{ */ private static final long serialVersionUID = -5492231659545511142L; private String id; - private String name;//参数名称 - private String type;//参数类型(String, int ....) - private Integer fill;//是否必填 - private String description;//描述 - private Integer paramType;//输入参数,响应参数 + private String name;//鍙傛暟鍚嶇О + private String type;//鍙傛暟绫诲瀷(String, int ....) + private Integer fill;//鏄惁蹇呭~ + private String description;//鎻忚堪 + private Integer paramType;//杈撳叆鍙傛暟锛屽搷搴斿弬鏁� private List> examples; private String responseContent; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/ApiUserCfg.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/ApiUserCfg.java index e38a29775..39fecf554 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/ApiUserCfg.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/ApiUserCfg.java @@ -6,8 +6,8 @@ import javax.persistence.*; import java.util.Date; /** - * api用户配置表 - * @author 王文艳 + * api鐢ㄦ埛閰嶇疆琛� + * @author 鐜嬫枃鑹� * @create 2016-11-17 **/ @Entity diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AverageAnalysis.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AverageAnalysis.java index 67de6bf5d..9d8809764 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AverageAnalysis.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AverageAnalysis.java @@ -9,7 +9,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; import com.mongodb.BasicDBObject; /** - * 均价分析 + * 鍧囦环鍒嗘瀽 * @author user * */ diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AverageStatistics.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AverageStatistics.java index da498918c..78a3844ff 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AverageStatistics.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AverageStatistics.java @@ -58,7 +58,7 @@ public class AverageStatistics implements MongoEntity { private Double fangPriceDiff; private Double fangRentDiff; - /**安居客均价数据*/ + /**瀹夊眳瀹㈠潎浠锋暟鎹�*/ private Integer anjukePrice; private Double anjukeRent; private Double anjukePriceDiff; @@ -69,32 +69,32 @@ public class AverageStatistics implements MongoEntity { private Double chineseOfficePriceDiff; private Double chineseOfficeRentDiff; - /**链家均价数据*/ + /**閾惧鍧囦环鏁版嵁*/ private Integer lianjiaEsfPrice; private Double lianjiaEsfDiff; private Integer lianjiaNewPrice; private Double lianjiaNewDiff; - /**房估估均价数据*/ + /**鎴夸及浼板潎浠锋暟鎹�*/ private Integer fangguguNewPrice; private Double fangguguNewDiff; private Integer fangguguEsfPrice; private Double fangguguEsfDiff; - /**云估价均价数据*/ + /**浜戜及浠峰潎浠锋暟鎹�*/ private Integer yungujiaNewPrice; private Double yungujiaNewDiff; private Integer yungujiaEsfPrice; private Double yungujiaEsfDiff; - /**兔博士均价数据*/ + /**鍏斿崥澹潎浠锋暟鎹�*/ private Integer tuboshiNewPrice; private Double tuboshiNewDiff; private Integer tuboshiEsfPrice; private Double tuboshiEsfDiff; - /**中原地产二手房均价*/ + /**涓師鍦颁骇浜屾墜鎴垮潎浠�*/ private Integer zhongyuanNewPrice; private Double zhongyuanNewDiff; private Integer zhongyuanEsfPrice; @@ -108,40 +108,40 @@ public class AverageStatistics implements MongoEntity { private Integer cityhouseNewPrice; private Double cityhouseNewDiff; - /**贝壳*/ + /**璐濆3*/ private Integer beikeEsfPrice; private Double beikeEsfDiff; private Integer beikeNewPrice; private Double beikeNewDiff; - /**Q房*/ + /**Q鎴�*/ private Integer qfangEsfPrice; private Double qfangEsfDiff; private Integer qfangNewPrice; private Double qfangNewDiff; - /**小资家*/ + /**灏忚祫瀹�*/ private Integer xiaozijiaEsfPrice; private Double xiaozijiaEsfDiff; private Integer xiaozijiaNewPrice; private Double xiaozijiaNewDiff; - /**乐有家*/ + /**涔愭湁瀹�*/ private Integer leyoujiaNewPrice; private Double leyoujiaNewDiff; private Integer leyoujiaEsfPrice; private Double leyoujiaEsfDiff; - /**房兜兜*/ + /**鎴垮厹鍏�*/ private Integer fangdoudouNewPrice; private Double fangdoudouNewDiff; private Integer fangdoudouEsfPrice; private Double fangdoudouEsfDiff; - /**房探*/ + /**鎴挎帰*/ private Integer fangtanNewPrice; private Double fangtanNewDiff; private Integer fangtanEsfPrice; @@ -149,13 +149,13 @@ public class AverageStatistics implements MongoEntity { - /**诸葛找房*/ + /**璇歌憶鎵炬埧*/ private Integer zhugezhaofangEsfPrice; private Double zhugezhaofangEsfDiff; private Integer zhugezhaofangNewPrice; private Double zhugezhaofangNewDiff; - /**吉屋*/ + /**鍚夊眿*/ private Integer jiwuEsfPrice; private Double jiwuEsfDiff; private Integer jiwuNewPrice; @@ -166,13 +166,13 @@ public class AverageStatistics implements MongoEntity { private Double tsfhouseEsfDiff; private Integer tsfhouseNewPrice; private Double tsfhouseNewDiff; - /**国信达*/ + /**鍥戒俊杈�*/ private Integer gxdEsfPrice; - private String level;//价格评级 - private Integer lastAvgPrice;//最终价 - private String maxDeviate;//偏离度最大的网站,房价网-云估价-房估估 - private Integer artificialPrice;//人工价格 + private String level;//浠锋牸璇勭骇 + private Integer lastAvgPrice;//鏈�缁堜环 + private String maxDeviate;//鍋忕搴︽渶澶х殑缃戠珯锛屾埧浠风綉-浜戜及浠�-鎴夸及浼� + private Integer artificialPrice;//浜哄伐浠锋牸 @Id @GeneratedValue diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AvgSearch.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AvgSearch.java index c3dabd778..6527dc3eb 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AvgSearch.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AvgSearch.java @@ -23,23 +23,23 @@ public class AvgSearch implements MongoEntity { private String city; private String region; private String name; - private Integer avgPrice;//房价网均价 - private String priceDate;//生成时间 + private Integer avgPrice;//鎴夸环缃戝潎浠� + private String priceDate;//鐢熸垚鏃堕棿 private Date creationDate; - private Float credit;//可信度 - private Integer guidingPrice;//指导价 - private Integer houseCount;//房源数 - private String lastHouseDate;//房源最后发布时间 - private Integer dealCount;//成交数据量 - private String lastDealDate;//成交数据最后日期 - private Integer soufangEsfPrice;//搜房二手房价格 - private Integer soufangNewPrice;//搜房新房价格 - private Integer anjukeEsfPrice;//安居客二手房价格 - private Integer anjukeNewPrice;//安居客新房价格 - private Integer sinaEsfPrice;//新浪二手房价格 - private Integer sinaNewPrice;//新浪新房价格 - private Integer ganjiEsfPrice;//赶集二手房价格 - private String valueType;//计算方式 + private Float credit;//鍙俊搴� + private Integer guidingPrice;//鎸囧浠� + private Integer houseCount;//鎴挎簮鏁� + private String lastHouseDate;//鎴挎簮鏈�鍚庡彂甯冩椂闂� + private Integer dealCount;//鎴愪氦鏁版嵁閲� + private String lastDealDate;//鎴愪氦鏁版嵁鏈�鍚庢棩鏈� + private Integer soufangEsfPrice;//鎼滄埧浜屾墜鎴夸环鏍� + private Integer soufangNewPrice;//鎼滄埧鏂版埧浠锋牸 + private Integer anjukeEsfPrice;//瀹夊眳瀹簩鎵嬫埧浠锋牸 + private Integer anjukeNewPrice;//瀹夊眳瀹㈡柊鎴夸环鏍� + private Integer sinaEsfPrice;//鏂版氮浜屾墜鎴夸环鏍� + private Integer sinaNewPrice;//鏂版氮鏂版埧浠锋牸 + private Integer ganjiEsfPrice;//璧堕泦浜屾墜鎴夸环鏍� + private String valueType;//璁$畻鏂瑰紡 @Id @GeneratedValue diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/BaiduPlacePoi.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/BaiduPlacePoi.java index 2c9773785..e503a9ece 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/BaiduPlacePoi.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/BaiduPlacePoi.java @@ -15,16 +15,16 @@ import com.fangjia.dal.MongoEntity; public class BaiduPlacePoi implements MongoEntity { private static final long serialVersionUID = 1840436549012703563L; private String id; - private String city;//城市 - private String keyword;//类型关键字 - private String name;//标点名称 - private String address;//地址 - private String streetId;//街道ID - private String telephone;//电话 - private Double lat;//维度 - private Double lng;//经度 - private Date creationDate;//创建时间 - private Integer version;//版本号 + private String city;//鍩庡競 + private String keyword;//绫诲瀷鍏抽敭瀛� + private String name;//鏍囩偣鍚嶇О + private String address;//鍦板潃 + private String streetId;//琛楅亾ID + private String telephone;//鐢佃瘽 + private Double lat;//缁村害 + private Double lng;//缁忓害 + private Date creationDate;//鍒涘缓鏃堕棿 + private Integer version;//鐗堟湰鍙� private Integer status; @Column(name = "keyword") diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/BasicScore.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/BasicScore.java index 8e48950b6..a95a6e45d 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/BasicScore.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/BasicScore.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 基本分 + * 鍩烘湰鍒� * * @author liupei */ @@ -21,97 +21,97 @@ public class BasicScore implements MongoEntity { private static final long serialVersionUID = 7257806356358855044L; /** - * 得分详细 + * 寰楀垎璇︾粏 */ /** - * 单价与小区均价差异得分 + * 鍗曚环涓庡皬鍖哄潎浠峰樊寮傚緱鍒� */ public static final String AVG_PRICE_DIF_SCORE = "avg_price_dif_score"; /** - * 创建时间得分 + * 鍒涘缓鏃堕棿寰楀垎 */ public static final String CREATION_DATE_SCORE = "creation_date_score"; /** - * 房源标题得分 + * 鎴挎簮鏍囬寰楀垎 */ public static final String TITLE_SCORE = "title_score"; /** - * 房源描述得分 + * 鎴挎簮鎻忚堪寰楀垎 */ public static final String DIRECTION_SCORE = "direction_score"; /** - * 房源图片得分 + * 鎴挎簮鍥剧墖寰楀垎 */ public static final String PIC_SCORE = "pic_score"; /** - * 用户姓名得分 + * 鐢ㄦ埛濮撳悕寰楀垎 */ public static final String CONTACT_PEOPLE_SCORE = "contact_people_score"; /** - * 电话号码得分 + * 鐢佃瘽鍙风爜寰楀垎 */ public static final String PHONE_SCORE = "phone_score"; /** - * 公司门店得分 + * 鍏徃闂ㄥ簵寰楀垎 */ public static final String COMPANY_SCORE = "company_score"; /** - * 用户头像得分 + * 鐢ㄦ埛澶村儚寰楀垎 */ public static final String AVATAR_SCORE = "avatar_score"; /** - * 用户发布的房源 + * 鐢ㄦ埛鍙戝竷鐨勬埧婧� */ public static final String USER_PUBLISH_SCORE = "user_pulisher_score"; /** - * 室厅卫得分 + * 瀹ゅ巺鍗緱鍒� */ public static final String RHT_SCORE = "rht_score"; /** - * 刷新时间得分 + * 鍒锋柊鏃堕棿寰楀垎 */ public static final String PUBLISH_DATE_SCORE = "publish_date_score"; /** - * 房型得分 + * 鎴垮瀷寰楀垎 */ public static final String ROOM_SCORE = "room_score"; /** - * 面积得分 + * 闈㈢Н寰楀垎 */ public static final String AREA_SCORE = "price_score"; /** - * 总价得分 + * 鎬讳环寰楀垎 */ public static final String PRICE_SCORE = "price_score"; private String id; /** - * 对应房源id + * 瀵瑰簲鎴挎簮id */ private String relateId; /** - * 总得分 + * 鎬诲緱鍒� */ private Long score; /** - * 得分详细 + * 寰楀垎璇︾粏 */ private Map detail; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/BatchEvaluateLog.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/BatchEvaluateLog.java index a7d7cc17b..3d99ea9cc 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/BatchEvaluateLog.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/BatchEvaluateLog.java @@ -6,7 +6,7 @@ import javax.persistence.*; import java.util.Map; /** - * 批量估价日志 + * 鎵归噺浼颁环鏃ュ織 */ @Entity @Table(name = "business.batch_evaluate_log") diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/BatchEvaluateTask.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/BatchEvaluateTask.java index 31885fb4c..6a05544cc 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/BatchEvaluateTask.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/BatchEvaluateTask.java @@ -6,7 +6,7 @@ import javax.persistence.*; import java.util.Date; /** - * 批量重估任務 + * 鎵归噺閲嶄及浠诲嫏 * @author wenyan * */ @@ -27,10 +27,10 @@ public class BatchEvaluateTask implements MongoEntity { private String charset; public enum StatusEnum { - INIT(0), // 等待处理 - DOING(1), // 处理中 - SUC(2),// 处理完成 - ERROR(3); //处理失败 + INIT(0), // 绛夊緟澶勭悊 + DOING(1), // 澶勭悊涓� + SUC(2),// 澶勭悊瀹屾垚 + ERROR(3); //澶勭悊澶辫触 private final int status; StatusEnum(int status) { diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/BeansTask.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/BeansTask.java index 0ae6550c3..8ad058900 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/BeansTask.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/BeansTask.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 房豆任务 + * 鎴胯眴浠诲姟 */ @Entity @Table(name = "fangjia.beans_task") diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/BeansTaskSubmit.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/BeansTaskSubmit.java index 06899e5a2..0e7c9273c 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/BeansTaskSubmit.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/BeansTaskSubmit.java @@ -13,7 +13,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 房豆任务用户提交 + * 鎴胯眴浠诲姟鐢ㄦ埛鎻愪氦 */ @Entity @Table(name = "fangjia.beans_task_submit") @@ -33,14 +33,14 @@ public class BeansTaskSubmit implements MongoEntity { private Date creationDate; private Date modificationDate; - private Integer floors; // 层数 - private Integer buildings; // 楼栋数 - private Integer stairs; // 梯 - private Integer houses; // 户 + private Integer floors; // 灞傛暟 + private Integer buildings; // 妤兼爧鏁� + private Integer stairs; // 姊� + private Integer houses; // 鎴� private String developer; private String estateCompany; private Double estateCharge; - private String underGarage; // 地下车库 + private String underGarage; // 鍦颁笅杞﹀簱 private String carSite; private String finishBuildingDate; private Double buildArea; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/BizRegionStat.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/BizRegionStat.java index c852d95a0..e36ad9480 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/BizRegionStat.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/BizRegionStat.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 商场城市区域均价(租金) + * 鍟嗗満鍩庡競鍖哄煙鍧囦环锛堢閲戯級 */ @Entity @Table(name = "fangjia.business_region_stat") diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/BizShop.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/BizShop.java index c04dd343a..c88ce0a87 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/BizShop.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/BizShop.java @@ -25,21 +25,21 @@ public class BizShop implements MongoEntity { private Double lng; private String telephone; private List alias; - private List inPics; // 内景照 - private List tags; // 标签 - private Integer consumption; // 人均消费 - private List feature; // 特色 - private String introduction; // 商户简介 - private String businessType; // 业态分类 - private String businessHours; // 营业时间 - private String businessScope; // 商家业态 - private String commends; // 推荐产品 - private Integer commentCount; // 点评量 - private Double productScore; // 产品评分 - private Double environmentScore; // 环境评分 - private Double serviceScore; // 服务评分 - private String parkingInfo; // 停车信息 - private String trafficInfo; // 交通信息 + private List inPics; // 鍐呮櫙鐓� + private List tags; // 鏍囩 + private Integer consumption; // 浜哄潎娑堣垂 + private List feature; // 鐗硅壊 + private String introduction; // 鍟嗘埛绠�浠� + private String businessType; // 涓氭�佸垎绫� + private String businessHours; // 钀ヤ笟鏃堕棿 + private String businessScope; // 鍟嗗涓氭�� + private String commends; // 鎺ㄨ崘浜у搧 + private Integer commentCount; // 鐐硅瘎閲� + private Double productScore; // 浜у搧璇勫垎 + private Double environmentScore; // 鐜璇勫垎 + private Double serviceScore; // 鏈嶅姟璇勫垎 + private String parkingInfo; // 鍋滆溅淇℃伅 + private String trafficInfo; // 浜ら�氫俊鎭� private String from; private String fromUrl; private Date creationDate; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/BsEvaluation.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/BsEvaluation.java index d3b1b28f0..dd3e7c2df 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/BsEvaluation.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/BsEvaluation.java @@ -20,7 +20,7 @@ public class BsEvaluation implements MongoEntity { private Integer floorcnt; private Integer roomcnt; private Integer livingroomcnt; - private String houseaspect;//南 + private String houseaspect;//鍗� private String fitment; private Date cDate; private Integer unitPrice; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/BusStation.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/BusStation.java index 2040635ee..b89b74329 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/BusStation.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/BusStation.java @@ -13,9 +13,9 @@ import com.fangjia.dal.MongoEntity; public class BusStation implements MongoEntity { private static final long serialVersionUID = -3159563765276146156L; private String id; - private String city;//城市 - private String lineId;//线路名 - private String station;//站名 + private String city;//鍩庡競 + private String lineId;//绾胯矾鍚� + private String station;//绔欏悕 private String kind; private Double lat; private Double lng; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/BusinessShop.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/BusinessShop.java index a2c71da3c..efe0bee53 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/BusinessShop.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/BusinessShop.java @@ -21,27 +21,27 @@ public class BusinessShop implements MongoEntity { private String id; private Double lat; private Double lng; - private String name;// 商业中心名称 - private List alias;// 别名 - private String city;// 城市 - private String region;// 区域 - private String address;// 商户地址 - private List tags;// 标签 - private List feature;// 特色 - private String businessScope;// 商家业态 - private String businessType;// 业态分类 - private String telephone;// 商家电话 - private Integer consumption;// 人均消费 - private Integer commentCount;// 点评量 - private String businessHours;// 营业时间 - private String parkingInfo;// 停车信息 - private String trafficInfo;// 交通信息 - private String commends;// 推荐产品 - private Double productScore;// 产品评分 - private Double environmentScore;// 环境评分 - private Double serviceScore;// 服务评分 - private String introduction;// 商户简介 - private List inPics;// 内部实景 + private String name;// 鍟嗕笟涓績鍚嶇О + private List alias;// 鍒悕 + private String city;// 鍩庡競 + private String region;// 鍖哄煙 + private String address;// 鍟嗘埛鍦板潃 + private List tags;// 鏍囩 + private List feature;// 鐗硅壊 + private String businessScope;// 鍟嗗涓氭�� + private String businessType;// 涓氭�佸垎绫� + private String telephone;// 鍟嗗鐢佃瘽 + private Integer consumption;// 浜哄潎娑堣垂 + private Integer commentCount;// 鐐硅瘎閲� + private String businessHours;// 钀ヤ笟鏃堕棿 + private String parkingInfo;// 鍋滆溅淇℃伅 + private String trafficInfo;// 浜ら�氫俊鎭� + private String commends;// 鎺ㄨ崘浜у搧 + private Double productScore;// 浜у搧璇勫垎 + private Double environmentScore;// 鐜璇勫垎 + private Double serviceScore;// 鏈嶅姟璇勫垎 + private String introduction;// 鍟嗘埛绠�浠� + private List inPics;// 鍐呴儴瀹炴櫙 private Object mallId; private String mallName; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/CalcDistrictStat.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/CalcDistrictStat.java index 6c12e3050..0ff41c131 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/CalcDistrictStat.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/CalcDistrictStat.java @@ -23,20 +23,20 @@ public class CalcDistrictStat implements MongoEntity { private String city; private String region; private String name; - private String estateType; // 物业类型(普通住宅、别墅、商住楼) + private String estateType; // 鐗╀笟绫诲瀷锛堟櫘閫氫綇瀹呫�佸埆澧呫�佸晢浣忔ゼ锛� private Date weekend; - private int value; // 运算出的值 + private int value; // 杩愮畻鍑虹殑鍊� private double credit; private Integer valueType; - private Integer ownSampleCount; // 自身样本数量 - private Integer aroundObjectCount; // 周边对象数量 - private Integer aroundSampleCount; // 周边样本数量 + private Integer ownSampleCount; // 鑷韩鏍锋湰鏁伴噺 + private Integer aroundObjectCount; // 鍛ㄨ竟瀵硅薄鏁伴噺 + private Integer aroundSampleCount; // 鍛ㄨ竟鏍锋湰鏁伴噺 - private Integer aroundMinDistance; // 最近对象距离 - private Integer aroundMaxDistance; // 最远对象距离 + private Integer aroundMinDistance; // 鏈�杩戝璞¤窛绂� + private Integer aroundMaxDistance; // 鏈�杩滃璞¤窛绂� - private Map guidingMap; // 指导价 - private List> thirdpartDetails; // 第三方价格详细信息 + private Map guidingMap; // 鎸囧浠� + private List> thirdpartDetails; // 绗笁鏂逛环鏍艰缁嗕俊鎭� private Date creationDate; private Date modificationDate; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/CityHot.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/CityHot.java index f37cb6bac..a8c00606d 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/CityHot.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/CityHot.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 城市挂牌量、成交量信息 + * 鍩庡競鎸傜墝閲忋�佹垚浜ら噺淇℃伅 */ @Entity @Table(name = "fangjia.city_hot") @@ -26,11 +26,11 @@ public class CityHot implements MongoEntity { private Integer sellMarkupYear; private Integer tradeMarkupMonth; private Integer tradeMarkupYear; - private Date monthly; // 统计月份,每月最后一天的0点 + private Date monthly; // 缁熻鏈堜唤锛屾瘡鏈堟渶鍚庝竴澶╃殑0鐐� - private Integer hotIndex; // 城市楼市热度指数 - private Integer sellerIndex; // 卖家指数 - private Integer buyerIndex; // 买家指数 + private Integer hotIndex; // 鍩庡競妤煎競鐑害鎸囨暟 + private Integer sellerIndex; // 鍗栧鎸囨暟 + private Integer buyerIndex; // 涔板鎸囨暟 private Date creationDate; private Date modificationDate; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/CityNewPrice.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/CityNewPrice.java index 1b49fbe93..23ca51432 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/CityNewPrice.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/CityNewPrice.java @@ -20,35 +20,35 @@ public class CityNewPrice implements MongoEntity{ private static final long serialVersionUID = -3370027268789242190L; private String id; /** - * 城市 + * 鍩庡競 */ private String city; /** - * 统计时间 + * 缁熻鏃堕棿 */ private Integer statDate; /** - * 城市月均价 + * 鍩庡競鏈堝潎浠� */ private Integer avgPrice; /** - * 城市潜力指数 + * 鍩庡競娼滃姏鎸囨暟 */ private Integer index; /** - * 城市月涨跌幅 + * 鍩庡競鏈堟定璺屽箙 */ private Double markup; /** - * 租金回报率 + * 绉熼噾鍥炴姤鐜� */ private Double rentRate; /** - * 城市年涨跌幅 + * 鍩庡競骞存定璺屽箙 */ private Double yoyMarkup; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/CityPriceInterval.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/CityPriceInterval.java index 937f347e2..595d48fb0 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/CityPriceInterval.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/CityPriceInterval.java @@ -9,7 +9,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 有房App首页--城市查询价格 + * 鏈夋埧App棣栭〉--鍩庡競鏌ヨ浠锋牸 */ @Entity @Table(name = "fangjia.city_price_interval") @@ -19,31 +19,31 @@ public class CityPriceInterval implements MongoEntity{ private String id; - //城市 + //鍩庡競 private String city; - //区间1 + //鍖洪棿1 private String level1; - //区间2 + //鍖洪棿2 private String level2; - //区间3 + //鍖洪棿3 private String level3; - //区间4 + //鍖洪棿4 private String level4; - //区间5 + //鍖洪棿5 private String level5; - //区间6 + //鍖洪棿6 private String level6; - //区间7 + //鍖洪棿7 private String level7; - //区间8 + //鍖洪棿8 private String level8; @Id diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/CitySellStat.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/CitySellStat.java index a148afdf9..31ba3069d 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/CitySellStat.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/CitySellStat.java @@ -14,17 +14,17 @@ public class CitySellStat implements MongoEntity { private static final long serialVersionUID = 5893254780505860965L; private String id; - /**城市*/ + /**鍩庡競*/ private String city; - /**均价*/ + /**鍧囦环*/ private Integer avgPrice; - /**均价对应的时间(月份)*/ + /**鍧囦环瀵瑰簲鐨勬椂闂达紙鏈堜唤锛�*/ private Integer date; - /**数据更新时间*/ + /**鏁版嵁鏇存柊鏃堕棿*/ private Date updateDate; - /**均价月涨幅*/ + /**鍧囦环鏈堟定骞�*/ private Double mom; - /**均价年涨幅*/ + /**鍧囦环骞存定骞�*/ private Double yoy; @Id diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/CollateralEvaluationInfo.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/CollateralEvaluationInfo.java index fa464f863..624c43b5f 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/CollateralEvaluationInfo.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/CollateralEvaluationInfo.java @@ -12,7 +12,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * PDS 抵押品信息 + * PDS 鎶垫娂鍝佷俊鎭� * * @author hubingliang * @@ -24,49 +24,49 @@ public class CollateralEvaluationInfo implements MongoEntity { private String id; - /** 城市*/ + /** 鍩庡競*/ private String city; - /** 区域*/ + /** 鍖哄煙*/ private String region; - /** 楼盘、地址*/ + /** 妤肩洏銆佸湴鍧�*/ private String districtName; - /** 所在楼层*/ + /** 鎵�鍦ㄦゼ灞�*/ private Integer floor; - /** 总楼层*/ + /** 鎬绘ゼ灞�*/ private Integer height; - /** 楼栋号 */ + /** 妤兼爧鍙� */ private String houseNumber; - /** 房号 */ + /** 鎴垮彿 */ private String roomNumber; - /** 物业类型 */ + /** 鐗╀笟绫诲瀷 */ private String estateType; - /** 面积 */ + /** 闈㈢Н */ private Double area; - /** 主贷款人身份证号 */ + /** 涓昏捶娆句汉韬唤璇佸彿 */ private String mainLenderIdCode; - /** 共同贷款人身份证号 */ + /** 鍏卞悓璐锋浜鸿韩浠借瘉鍙� */ private List deputyLenderIdCodes; - /** 均价 */ + /** 鍧囦环 */ private Double avgPrice; - /** 总价 */ + /** 鎬讳环 */ private Double totalPrice; - /** 价格平稳度 */ + /** 浠锋牸骞崇ǔ搴� */ private Double priceStability; - /** 处置难易度 */ + /** 澶勭疆闅炬槗搴� */ private Double handleLevel; - /** 总得分*/ + /** 鎬诲緱鍒�*/ private Double totalScore; - /** cpdb库排名 */ + /** cpdb搴撴帓鍚� */ private Integer cpdbRank; - /** 当前城市排名 */ + /** 褰撳墠鍩庡競鎺掑悕 */ private Integer cityRank; - /** 购置时间 */ + /** 璐疆鏃堕棿 */ private Date purchaseDate; - /** 用途 */ + /** 鐢ㄩ�� */ private String usage; - /** 估价状态(1成功0失败) */ + /** 浼颁环鐘舵��(1鎴愬姛0澶辫触) */ private Integer status; - /** 创建时间*/ + /** 鍒涘缓鏃堕棿*/ private Date createDate; @Id diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/CommData.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/CommData.java index 14e83dd33..a2704de76 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/CommData.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/CommData.java @@ -23,14 +23,14 @@ public class CommData implements MongoEntity { private String districtName; private String cat; private Integer avgPrice; - private int houseCount; // 造房子数 - private int officeRent; // 写字楼租金 - private int peopleCount; // 写字楼人数 - private int livePecent; // 入住率 + private int houseCount; // 閫犳埧瀛愭暟 + private int officeRent; // 鍐欏瓧妤肩閲� + private int peopleCount; // 鍐欏瓧妤间汉鏁� + private int livePecent; // 鍏ヤ綇鐜� - private int searchCount; // 抓取其它网站房子数 - private int areaCount; // 面积计算房子数 - private int lastCount; // 最终确实房子数 + private int searchCount; // 鎶撳彇鍏跺畠缃戠珯鎴垮瓙鏁� + private int areaCount; // 闈㈢Н璁$畻鎴垮瓙鏁� + private int lastCount; // 鏈�缁堢‘瀹炴埧瀛愭暟 private String kind; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/CompanyScoreRank.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/CompanyScoreRank.java index 0044a55b3..98032f3fe 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/CompanyScoreRank.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/CompanyScoreRank.java @@ -9,7 +9,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 公司得分排名情况 + * 鍏徃寰楀垎鎺掑悕鎯呭喌 * * @author liupei */ diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/CompareDataStat.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/CompareDataStat.java index 9d416e235..c0ff404ec 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/CompareDataStat.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/CompareDataStat.java @@ -9,7 +9,7 @@ import java.util.Calendar; import java.util.Date; /** - * 65后台对比数据未处理数据量统计 @see ComparisonDataStatistics + * 65鍚庡彴瀵规瘮鏁版嵁鏈鐞嗘暟鎹噺缁熻 @see ComparisonDataStatistics * @author wenyan */ @Entity @@ -144,9 +144,9 @@ public class CompareDataStat implements MongoEntity { } int days = daysBetween(new Date(),getBaiduLatestCreatedDate()); if(days < 30){ - return days + "天"; + return days + "澶�"; } - return days / 30 + "月"; + return days / 30 + "鏈�"; } public String getCpdbBUpdateTime(){ @@ -155,9 +155,9 @@ public class CompareDataStat implements MongoEntity { } int days = daysBetween(new Date(),getCpdbLatestCreatedDate()); if(days < 30){ - return days + "天"; + return days + "澶�"; } - return days / 30 + "月"; + return days / 30 + "鏈�"; } public String getDataCompareUpdateTime(){ @@ -166,9 +166,9 @@ public class CompareDataStat implements MongoEntity { } int days = daysBetween(new Date(),getDataCompareLatestCreatedDate()); if(days < 30){ - return days + "天"; + return days + "澶�"; } - return days / 30 + "月"; + return days / 30 + "鏈�"; } public String getBaiDuDealUpdateTime(){ @@ -177,9 +177,9 @@ public class CompareDataStat implements MongoEntity { } int days = daysBetween(new Date(),getBaiduLatestDealDate()); if(days < 30){ - return days + "天"; + return days + "澶�"; } - return days / 30 + "月"; + return days / 30 + "鏈�"; } @Column(name = "category") diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/ConsumerAddress.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/ConsumerAddress.java index a49dd76f5..570af6be4 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/ConsumerAddress.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/ConsumerAddress.java @@ -12,23 +12,23 @@ import javax.persistence.*; public class ConsumerAddress implements MongoEntity { private static final long serialVersionUID = 4972641078968689813L; - /**mongodb数据id*/ + /**mongodb鏁版嵁id*/ private String id; - /**名称*/ + /**鍚嶇О*/ private String name; - /**地址*/ + /**鍦板潃*/ private String address; - /**联系方式*/ + /**鑱旂郴鏂瑰紡*/ private String contact; - /**邮箱*/ + /**閭*/ private String email; - /**行业*/ + /**琛屼笟*/ private String cat; private Double lat; private Double lng; - /**城市*/ + /**鍩庡競*/ private String city; @Id diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/CpcSiteWhiteList.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/CpcSiteWhiteList.java index a8a65ff5a..3b172d34e 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/CpcSiteWhiteList.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/CpcSiteWhiteList.java @@ -12,7 +12,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 中介通网站白名单 + * 涓粙閫氱綉绔欑櫧鍚嶅崟 * * @author Administrator * diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/CpdbApplication.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/CpdbApplication.java index 4185d0ec0..31e1907fe 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/CpdbApplication.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/CpdbApplication.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * CPDB、房价通的免费申请记录 + * CPDB銆佹埧浠烽�氱殑鍏嶈垂鐢宠璁板綍 */ @Entity @Table(name = "fangjia.cpdb_application") diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/CustomerConsult.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/CustomerConsult.java index a7d0a0572..c83cba014 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/CustomerConsult.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/CustomerConsult.java @@ -11,8 +11,8 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** * - * 说明:客户咨询 - * @author 王文艳 + * 璇存槑:瀹㈡埛鍜ㄨ + * @author 鐜嬫枃鑹� * */ @Entity @@ -40,11 +40,11 @@ public class CustomerConsult implements MongoEntity { private String content; /** - * 登录手机号 + * 鐧诲綍鎵嬫満鍙� */ private String loginId; /** - * 具体信息 + * 鍏蜂綋淇℃伅 */ private String detailInfo; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/CzbankSampleLog.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/CzbankSampleLog.java index a92185a05..10a1e1fa9 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/CzbankSampleLog.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/CzbankSampleLog.java @@ -9,9 +9,9 @@ import java.util.Date; import java.util.List; /** - * 浙商银行样本缓释接口日志记录实体 + * 娴欏晢閾惰鏍锋湰缂撻噴鎺ュ彛鏃ュ織璁板綍瀹炰綋 * - * @author 王文艳 + * @author 鐜嬫枃鑹� * @create 2016-11-14 **/ @Entity diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DaikuanFail.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DaikuanFail.java index 5a6cf5643..36552721f 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DaikuanFail.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DaikuanFail.java @@ -10,7 +10,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 广告位实体类 + * 骞垮憡浣嶅疄浣撶被 */ @Entity @Table(name = "fangjia.daikuan_fail") diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Developer.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Developer.java index 2e5db4072..0e2dc48aa 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Developer.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Developer.java @@ -12,7 +12,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 开发商信息 + * 寮�鍙戝晢淇℃伅 */ @Entity @Table(name = "fangjia.developer") @@ -21,10 +21,10 @@ public class Developer implements MongoEntity { private String id; private String name; - private String level; // 资质等级 - private String companyType; // 注册类型 - private String businessScope; // 经营范围 - private String honor; // 荣誉 + private String level; // 璧勮川绛夌骇 + private String companyType; // 娉ㄥ唽绫诲瀷 + private String businessScope; // 缁忚惀鑼冨洿 + private String honor; // 鑽h獕 private String simpleName; private String city; private List alias; @@ -40,8 +40,8 @@ public class Developer implements MongoEntity { } private String region; - private String representative;//法人代表 - private int status;//1:已处理 + private String representative;//娉曚汉浠h〃 + private int status;//1:宸插鐞� private Date mDate; @Id diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DevelopmentZone.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DevelopmentZone.java index b548c6c0f..32ab21eca 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DevelopmentZone.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DevelopmentZone.java @@ -25,9 +25,9 @@ public class DevelopmentZone implements MongoEntity { private String province; private String type; private String url; - // 高德经纬度 + // 楂樺痉缁忕含搴� private Map shape; - // 百度经纬度 + // 鐧惧害缁忕含搴� private Map bdShape; private String block; @@ -35,7 +35,7 @@ public class DevelopmentZone implements MongoEntity { private String cityName1; private String district; - //增加别名字段 + //澧炲姞鍒悕瀛楁 private List alias; private String imgUrl; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Diaoyudao.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Diaoyudao.java index 7c82a6e96..9ae6a73df 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Diaoyudao.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Diaoyudao.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 钓鱼岛专题支持人数 + * 閽撻奔宀涗笓棰樻敮鎸佷汉鏁� */ @Entity @Table(name = "fangjia.diaoyudao") diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DingMeetingRobot.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DingMeetingRobot.java index 536e6656d..503fd5fd7 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DingMeetingRobot.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DingMeetingRobot.java @@ -6,7 +6,7 @@ import javax.persistence.*; import java.util.Date; /** - * 钉钉会话机器人 + * 閽夐拤浼氳瘽鏈哄櫒浜� */ @Entity @Table(name = "business.ding_meeting_robot") diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictAnalyData.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictAnalyData.java index 32c207540..e53b17ddb 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictAnalyData.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictAnalyData.java @@ -9,7 +9,7 @@ import java.util.Map; /** * @author wenyan - * 小区分析数据表 + * 灏忓尯鍒嗘瀽鏁版嵁琛� */ @Entity @Table(name = "fangjia_stat.district_analy_data") @@ -24,7 +24,7 @@ public class DistrictAnalyData implements MongoEntity { private Integer peopleDensity; private Map aroundAvgRent; private Integer aroundCateringConsumption; - /**均价排名 名次/总名次*/ + /**鍧囦环鎺掑悕 鍚嶆/鎬诲悕娆�*/ private String rank; private Integer cityRank; @@ -33,48 +33,48 @@ public class DistrictAnalyData implements MongoEntity { private Integer regionRankTotal; private Integer avgPrice; - //房源排名 + //鎴挎簮鎺掑悕 private Integer sellCountRank; private Integer sellRankTotal; private Integer sellCount; private Integer monthSellCount; - //成交数据排名 + //鎴愪氦鏁版嵁鎺掑悕 private Integer dealCountRank; private Integer dealRankTotal; private Integer dealCount; - //户数排名 + //鎴锋暟鎺掑悕 private Integer householdsRank; private Integer householdsTotal; private Integer households; - //带看排名 + //甯︾湅鎺掑悕 private Integer seeCountRank; private Integer seeRankTotal; private Integer seeCount; - //按照城市月区域涨幅排名 + //鎸夌収鍩庡競鏈堝尯鍩熸定骞呮帓鍚� private Integer momCityRank; private Integer momCityTotal; private Integer momRegionRank; private Integer momRegionTotal; private Double mom; - //按照城市区域年涨幅排名 + //鎸夌収鍩庡競鍖哄煙骞存定骞呮帓鍚� private Integer yoyCityRank; private Integer yoyCityTotal; private Integer yoyRegionRank; private Integer yoyRegionTotal; private Double yoy; - private Double halfYoy;//半年涨幅 - private Double seasonYoy;//季度涨幅 - //小区密度相关排名 + private Double halfYoy;//鍗婂勾娑ㄥ箙 + private Double seasonYoy;//瀛e害娑ㄥ箙 + //灏忓尯瀵嗗害鐩稿叧鎺掑悕 private Integer districtCount; private Integer densityRank; private Integer densityTotal; - //附近的POI列表 + //闄勮繎鐨凱OI鍒楄〃 private List nearestClassicPois; /** - * 小区均价计算样本统计 + * 灏忓尯鍧囦环璁$畻鏍锋湰缁熻 */ private BasicDBObject sampleStat; private String tag; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictAttentionRank.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictAttentionRank.java index 9da7e8e72..5780f040f 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictAttentionRank.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictAttentionRank.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 小区关注度(点击量)排名 + * 灏忓尯鍏虫敞搴︼紙鐐瑰嚮閲忥級鎺掑悕 */ @Entity @Table(name = "fangjia.district_attention_rank") diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictCode.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictCode.java index c72c15821..a083da497 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictCode.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictCode.java @@ -6,8 +6,8 @@ import javax.persistence.*; import java.util.Date; /** - * 行政区划编码表 - * @author 王文艳 + * 琛屾斂鍖哄垝缂栫爜琛� + * @author 鐜嬫枃鑹� * @create 2016-11-14 **/ @Entity diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictFacilitys.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictFacilitys.java index 65ab159a8..c35c44e8f 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictFacilitys.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictFacilitys.java @@ -47,13 +47,13 @@ public class DistrictFacilitys implements MongoEntity { private Date creationDate; - private List positives; // 正面 - private List negatives; // 负面 - private List appraisalNegative; // 负面 - private List appraisalPositive; // 正面 + private List positives; // 姝i潰 + private List negatives; // 璐熼潰 + private List appraisalNegative; // 璐熼潰 + private List appraisalPositive; // 姝i潰 /** - * 鏍囩寰楀垎 + * 閺嶅洨顒峰妤�鍨� */ private Double traScore; private Double virScore; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictHot.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictHot.java index 77253bfaf..ecca61557 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictHot.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictHot.java @@ -12,7 +12,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 小区挂牌量、成交量、租房占比信息 + * 灏忓尯鎸傜墝閲忋�佹垚浜ら噺銆佺鎴垮崰姣斾俊鎭� */ @Entity @Table(name = "fangjia.district_hot") @@ -23,18 +23,18 @@ public class DistrictHot implements MongoEntity { private String city; private String region; private String districtName; - private Integer houseLastMonth; // 上月挂牌房源量 - private Integer houseHalfYear; // 半年内挂牌房源量 - private Integer tradeLastMonth; // 上月成交量 - private Integer tradeHalfYear; // 半年内成交量 - private List rentRooms; // 小区内的租房房型,升序 - private List rentRoomCounts; // 小区内租房的各房型房源数,顺序同rentRooms - private List rentRoomPercent; // 小区内租房的各房型占比,顺序同rentRooms - private List rentAreaPercent; // 小区内租房的各面积占比,顺序为<50,50~90,90~130,130~150,>150 - private Integer rentCountMinRoom; // 租房房源量最少的房型 - private Date monthly; // 统计月份,每月最后一天的0点 - private Integer rentIndex; // 租房稀缺指数 - private Integer sellIndex; // 二手房房稀缺指数 + private Integer houseLastMonth; // 涓婃湀鎸傜墝鎴挎簮閲� + private Integer houseHalfYear; // 鍗婂勾鍐呮寕鐗屾埧婧愰噺 + private Integer tradeLastMonth; // 涓婃湀鎴愪氦閲� + private Integer tradeHalfYear; // 鍗婂勾鍐呮垚浜ら噺 + private List rentRooms; // 灏忓尯鍐呯殑绉熸埧鎴垮瀷锛屽崌搴� + private List rentRoomCounts; // 灏忓尯鍐呯鎴跨殑鍚勬埧鍨嬫埧婧愭暟锛岄『搴忓悓rentRooms + private List rentRoomPercent; // 灏忓尯鍐呯鎴跨殑鍚勬埧鍨嬪崰姣旓紝椤哄簭鍚宺entRooms + private List rentAreaPercent; // 灏忓尯鍐呯鎴跨殑鍚勯潰绉崰姣旓紝椤哄簭涓�<50锛�50~90,90~130,130~150锛�>150 + private Integer rentCountMinRoom; // 绉熸埧鎴挎簮閲忔渶灏戠殑鎴垮瀷 + private Date monthly; // 缁熻鏈堜唤锛屾瘡鏈堟渶鍚庝竴澶╃殑0鐐� + private Integer rentIndex; // 绉熸埧绋�缂烘寚鏁� + private Integer sellIndex; // 浜屾墜鎴挎埧绋�缂烘寚鏁� private Date creationDate; private Date modificationDate; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictHouse.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictHouse.java index 0f9ffa103..6338ba89a 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictHouse.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictHouse.java @@ -9,7 +9,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 小区房源量 + * 灏忓尯鎴挎簮閲� * @author dxy * */ diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictHouseResourceStat.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictHouseResourceStat.java index e005c9fd9..bad5bdc71 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictHouseResourceStat.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictHouseResourceStat.java @@ -4,9 +4,9 @@ import com.fangjia.dal.MongoEntity; import javax.persistence.*; import java.util.Map; /** - * 小区房源按月统计 + * 灏忓尯鎴挎簮鎸夋湀缁熻 * @author yinjihuan - * @date 2016年9月6日 + * @date 2016骞�9鏈�6鏃� * */ @Entity @@ -15,27 +15,27 @@ public class DistrictHouseResourceStat implements MongoEntity { private static final long serialVersionUID = 7656904075824492080L; private String id; /** - * 小区ID + * 灏忓尯ID */ private String districtId; /** - * 城市 + * 鍩庡競 */ private String city; /** - * 区域 + * 鍖哄煙 */ private String region; /** - * 名称 + * 鍚嶇О */ private String name; /** - * 年月(201608) + * 骞存湀锛�201608锛� */ private Integer month; /** - * 房源数量 + * 鎴挎簮鏁伴噺 * {80:5, 50:6,110:12} */ private Map area_map; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictNearby.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictNearby.java index 33a11c2f2..0101240d2 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictNearby.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictNearby.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 周边配套--百度地图获得 + * 鍛ㄨ竟閰嶅--鐧惧害鍦板浘鑾峰緱 */ @Entity @Table(name = "fangjia.district_nearby") diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictNewPrice.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictNewPrice.java index 484e08a9a..2336fc986 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictNewPrice.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictNewPrice.java @@ -13,8 +13,8 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 只存储最新一个月的小区均价信息,提高性能使用,目前首次在房生活中使用
- * 为了提高查询性能,后面需要把小区的其他信息也扩展进来 + * 鍙瓨鍌ㄦ渶鏂颁竴涓湀鐨勫皬鍖哄潎浠蜂俊鎭紝鎻愰珮鎬ц兘浣跨敤锛岀洰鍓嶉娆″湪鎴跨敓娲讳腑浣跨敤
+ * 涓轰簡鎻愰珮鏌ヨ鎬ц兘锛屽悗闈㈤渶瑕佹妸灏忓尯鐨勫叾浠栦俊鎭篃鎵╁睍杩涙潵 * @author yinjihuan */ @Entity @@ -26,22 +26,22 @@ public class DistrictNewPrice implements MongoEntity { private static final long serialVersionUID = -4300876206008276471L; private String id; /** - * 小区名 + * 灏忓尯鍚� */ private String districtName; /** - * 城市 + * 鍩庡競 */ private String city; /** - * 区域 + * 鍖哄煙 */ private String region; /** - * 板块 + * 鏉垮潡 */ private String block; private String estateType; @@ -56,22 +56,22 @@ public class DistrictNewPrice implements MongoEntity { private int sampleSize; - /********小区扩展信息*******/ - private double lng2; //百度经度 - private double lat2; //百度纬度 - private String disId; //小区ID + /********灏忓尯鎵╁睍淇℃伅*******/ + private double lng2; //鐧惧害缁忓害 + private double lat2; //鐧惧害绾害 + private String disId; //灏忓尯ID private String address; - private Integer index;//小区潜力指数 - private Double rentRate;//租房回报率 - /********来源于DistrictTag*******/ - private List poiTags; //小区地图标签 - private Integer purpose; //小区用途 - private List areaTags;//编辑标签 - private Integer poiSize; //地图标签大小 + private Integer index;//灏忓尯娼滃姏鎸囨暟 + private Double rentRate;//绉熸埧鍥炴姤鐜� + /********鏉ユ簮浜嶥istrictTag*******/ + private List poiTags; //灏忓尯鍦板浘鏍囩 + private Integer purpose; //灏忓尯鐢ㄩ�� + private List areaTags;//缂栬緫鏍囩 + private Integer poiSize; //鍦板浘鏍囩澶у皬 private Map avgArea; - private double distance;//距离 + private double distance;//璺濈 @Column(name = "dis_id") public String getDisId() { @@ -137,19 +137,19 @@ public class DistrictNewPrice implements MongoEntity { } /** - * 均价计算类型 + * 鍧囦环璁$畻绫诲瀷 * * @author dxy * */ public enum ValueTypeEnum { - GUIDING(1, "指导价"), // - OWN(2, "自身样本"), // - THIRD(3, "第三方"), // - DEAL(4, "交易数据"), // - AROUND(5, "周边楼盘"), // - DERI(6, "推导"), // - NOWAY(10, "无方式") + GUIDING(1, "鎸囧浠�"), // + OWN(2, "鑷韩鏍锋湰"), // + THIRD(3, "绗笁鏂�"), // + DEAL(4, "浜ゆ槗鏁版嵁"), // + AROUND(5, "鍛ㄨ竟妤肩洏"), // + DERI(6, "鎺ㄥ"), // + NOWAY(10, "鏃犳柟寮�") ; private final int type; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictPriceLevel.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictPriceLevel.java index f8ad59b74..473d8a442 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictPriceLevel.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictPriceLevel.java @@ -14,24 +14,24 @@ public class DistrictPriceLevel implements MongoEntity { private static final long serialVersionUID = 5893254780505860965L; private String id; - /**城市*/ + /**鍩庡競*/ private String city; private String region; private String name; - /**均价*/ + /**鍧囦环*/ private Integer avgPrice; - /**均价对应的时间(月份)*/ + /**鍧囦环瀵瑰簲鐨勬椂闂达紙鏈堜唤锛�*/ private Integer date; - /**均价月涨幅*/ + /**鍧囦环鏈堟定骞�*/ private Integer momCityLevel; - /**均价年涨幅*/ + /**鍧囦环骞存定骞�*/ private Integer yoyCityLevel; private Integer citySize; - /**均价月涨幅*/ + /**鍧囦环鏈堟定骞�*/ private Integer momRegionLevel; - /**均价年涨幅*/ + /**鍧囦环骞存定骞�*/ private Integer yoyRegionLevel; private Integer regionSize; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictRelation.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictRelation.java index f434efede..88cecec19 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictRelation.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictRelation.java @@ -12,7 +12,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; import com.mongodb.BasicDBObject; /** - * 小区关联 + * 灏忓尯鍏宠仈 * @author user * */ diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictSellStat.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictSellStat.java index d399d3f9e..30dacaefc 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictSellStat.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictSellStat.java @@ -14,23 +14,23 @@ public class DistrictSellStat implements MongoEntity { private static final long serialVersionUID = 5893254780505860965L; private String id; - /**城市*/ + /**鍩庡競*/ private String city; - /**区域*/ + /**鍖哄煙*/ private String region; - /**小区名*/ + /**灏忓尯鍚�*/ private String districtName; - /**均价*/ + /**鍧囦环*/ private Integer avgPrice; - /**均价对应的时间(月份)*/ + /**鍧囦环瀵瑰簲鐨勬椂闂达紙鏈堜唤锛�*/ private Integer date; - /**数据更新时间*/ + /**鏁版嵁鏇存柊鏃堕棿*/ private Date updateDate; - /**均价月涨幅*/ + /**鍧囦环鏈堟定骞�*/ private Double mom; - /**均价年涨幅*/ + /**鍧囦环骞存定骞�*/ private Double yoy; - /**均价可信度*/ + /**鍧囦环鍙俊搴�*/ private Double credit; @Id diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictStat.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictStat.java index de26ab0cd..73abe30a1 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictStat.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictStat.java @@ -19,22 +19,22 @@ public class DistrictStat implements MongoEntity { private static final long serialVersionUID = -4300876206008276471L; private String id; /** - * 小区名 + * 灏忓尯鍚� */ private String districtName; /** - * 城市 + * 鍩庡競 */ private String city; /** - * 区域 + * 鍖哄煙 */ private String region; /** - * 板块 + * 鏉垮潡 */ private String block; private String estateType; @@ -53,20 +53,20 @@ public class DistrictStat implements MongoEntity { /** - * 均价计算类型 + * 鍧囦环璁$畻绫诲瀷 * * @author dxy * */ public enum ValueTypeEnum { - GUIDING(1, "指导价"), // - OWN(2, "自身样本"), // - THIRD(3, "第三方"), // - DEAL(4, "交易数据"), // - AROUND(5, "周边楼盘"), // - DERI(6, "推导"), // - NOWAY(10, "无方式"), - DLALGO(9,"神经网络"), + GUIDING(1, "鎸囧浠�"), // + OWN(2, "鑷韩鏍锋湰"), // + THIRD(3, "绗笁鏂�"), // + DEAL(4, "浜ゆ槗鏁版嵁"), // + AROUND(5, "鍛ㄨ竟妤肩洏"), // + DERI(6, "鎺ㄥ"), // + NOWAY(10, "鏃犳柟寮�"), + DLALGO(9,"绁炵粡缃戠粶"), ; private final int type; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictStatRent.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictStatRent.java index d6c01d723..d597ef6cd 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictStatRent.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictStatRent.java @@ -27,7 +27,7 @@ public class DistrictStatRent implements MongoEntity { private Integer houseType; private int markup; private Date endMonthDate; - private int type; // 为1时表示程序生成 + private int type; // 涓�1鏃惰〃绀虹▼搴忕敓鎴� private Date creationDate; private Date modificationDate; private String sampleEnum; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictTradeAnalyse.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictTradeAnalyse.java index 46e0ca43a..256827004 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictTradeAnalyse.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictTradeAnalyse.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 记录小区成交均价(用中位数产生的均价mid_price),各面积区间段的数量占比及总量,各总价区间段的数量占比及总量,小区成交价在区域及板块中的排名 + * 璁板綍灏忓尯鎴愪氦鍧囦环锛堢敤涓綅鏁颁骇鐢熺殑鍧囦环mid_price锛�,鍚勯潰绉尯闂存鐨勬暟閲忓崰姣斿強鎬婚噺锛屽悇鎬讳环鍖洪棿娈电殑鏁伴噺鍗犳瘮鍙婃�婚噺锛屽皬鍖烘垚浜や环鍦ㄥ尯鍩熷強鏉垮潡涓殑鎺掑悕 */ @Entity @Table(name = "fangjia.district_trade_analyse") @@ -24,40 +24,40 @@ public class DistrictTradeAnalyse implements MongoEntity { private String block; private String estateType; private String districtName; - private int total; // 成交量(统计时间1年) - private int avgPrice; // 成交均价 - private int midPrice; // 成交中位数(用这个价格好些) - private Integer cityRank; // 成交价在城市中的排名 - private Integer regionRank; // 成交价在区域中的排名 - private Integer blockRank; // 成交价在板块中的排名 - private Date statDate; // 统计日期(如统计12月份,统计日期为月初,如:2012-12-01) - private Date creationDate; // 创建时间 - private double a1; // 面积在50平米以下 - private double a2; // 面积在50~90 - private double a3; // 面积90~130 - private double a4; // 面积130~150 - private double a5; // 面积150平米以上 - private int a1Count; // 面积在50平米房源量 - private int a2Count; // 面积在50~90房源量 - private int a3Count; // 面积90~130房源量 - private int a4Count; // 面积130~150房源量 - private int a5Count; // 面积150平米以上房源量 - private double p1; // 总价小于60w - private double p2; // 总价60~90w - private double p3; // 总价90~130w - private double p4; // 总价130~180w - private double p5; // 总价180~250w - private double p6; // 总价250~500w - private double p7; // 总价500~800w - private double p8; // 总价大于800w - private int p1Count; // 小于60w房源量 - private int p2Count; // 60~90w房源量 - private int p3Count; // 90~130w房源量 - private int p4Count; // 130~180w房源量 - private int p5Count; // 180~250w房源量 - private int p6Count; // 250~500w房源量 - private int p7Count; // 总价500~800w房源量 - private int p8Count; // 总价大于800w房源量 + private int total; // 鎴愪氦閲忥紙缁熻鏃堕棿1骞达級 + private int avgPrice; // 鎴愪氦鍧囦环 + private int midPrice; // 鎴愪氦涓綅鏁�(鐢ㄨ繖涓环鏍煎ソ浜�) + private Integer cityRank; // 鎴愪氦浠峰湪鍩庡競涓殑鎺掑悕 + private Integer regionRank; // 鎴愪氦浠峰湪鍖哄煙涓殑鎺掑悕 + private Integer blockRank; // 鎴愪氦浠峰湪鏉垮潡涓殑鎺掑悕 + private Date statDate; // 缁熻鏃ユ湡(濡傜粺璁�12鏈堜唤锛岀粺璁℃棩鏈熶负鏈堝垵锛屽锛�2012-12-01) + private Date creationDate; // 鍒涘缓鏃堕棿 + private double a1; // 闈㈢Н鍦�50骞崇背浠ヤ笅 + private double a2; // 闈㈢Н鍦�50~90 + private double a3; // 闈㈢Н90~130 + private double a4; // 闈㈢Н130~150 + private double a5; // 闈㈢Н150骞崇背浠ヤ笂 + private int a1Count; // 闈㈢Н鍦�50骞崇背鎴挎簮閲� + private int a2Count; // 闈㈢Н鍦�50~90鎴挎簮閲� + private int a3Count; // 闈㈢Н90~130鎴挎簮閲� + private int a4Count; // 闈㈢Н130~150鎴挎簮閲� + private int a5Count; // 闈㈢Н150骞崇背浠ヤ笂鎴挎簮閲� + private double p1; // 鎬讳环灏忎簬60w + private double p2; // 鎬讳环60~90w + private double p3; // 鎬讳环90~130w + private double p4; // 鎬讳环130~180w + private double p5; // 鎬讳环180~250w + private double p6; // 鎬讳环250~500w + private double p7; // 鎬讳环500~800w + private double p8; // 鎬讳环澶т簬800w + private int p1Count; // 灏忎簬60w鎴挎簮閲� + private int p2Count; // 60~90w鎴挎簮閲� + private int p3Count; // 90~130w鎴挎簮閲� + private int p4Count; // 130~180w鎴挎簮閲� + private int p5Count; // 180~250w鎴挎簮閲� + private int p6Count; // 250~500w鎴挎簮閲� + private int p7Count; // 鎬讳环500~800w鎴挎簮閲� + private int p8Count; // 鎬讳环澶т簬800w鎴挎簮閲� @Id @GeneratedValue diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictTradeCount.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictTradeCount.java index d31bdaee5..1576a42f5 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictTradeCount.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictTradeCount.java @@ -25,8 +25,8 @@ public class DistrictTradeCount implements MongoEntity { private int regionRank; private int blockRank; - private Date statDate; // 统计日期(如统计12月份,统计日期为月初,如:2012-12-01) - private Date creationDate; // 创建时间 + private Date statDate; // 缁熻鏃ユ湡(濡傜粺璁�12鏈堜唤锛岀粺璁℃棩鏈熶负鏈堝垵锛屽锛�2012-12-01) + private Date creationDate; // 鍒涘缓鏃堕棿 @Id @GeneratedValue 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 268ec1aa3..e392e920a 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 @@ -24,7 +24,7 @@ public class DistrictUpdateTask implements MongoEntity { private Integer type; private Date createDate; private Date processingTime; - private Integer status; // 1:删除 2:区域,各称修改 3.关联删除 4.物业类型修改 5:新增小区 + private Integer status; // 1锛氬垹闄� 2锛氬尯鍩燂紝鍚勭О淇敼 3.鍏宠仈鍒犻櫎 4.鐗╀笟绫诲瀷淇敼 5:鏂板灏忓尯 private String msg; private String estateType; private String commId; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/ElevateWord.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/ElevateWord.java index 023af6222..840ea3064 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/ElevateWord.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/ElevateWord.java @@ -26,34 +26,34 @@ public class ElevateWord implements MongoEntity { private String recommendCity; /** - * 公司简介 + * 鍏徃绠�浠� */ private String description; /** - * 公司详细介绍 + * 鍏徃璇︾粏浠嬬粛 */ private String detailDescription; private Date creationDate; /** - * 二级域名 + * 浜岀骇鍩熷悕 */ private String secondLevelDomain; /** - * 标识是否在首页显示 1 显示 0 隐藏 + * 鏍囪瘑鏄惁鍦ㄩ椤垫樉绀� 1 鏄剧ず 0 闅愯棌 */ private Integer showInHome; /** - * 标识是否在全国首页显示 1 显示 0 隐藏 + * 鏍囪瘑鏄惁鍦ㄥ叏鍥介椤垫樉绀� 1 鏄剧ず 0 闅愯棌 */ private Integer showInIndexHome; /** - * 城市首页显示标识 + * 鍩庡競棣栭〉鏄剧ず鏍囪瘑 */ private String showCities; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/EntityClassObj.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/EntityClassObj.java index 765ee354c..73d06d1b0 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/EntityClassObj.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/EntityClassObj.java @@ -14,7 +14,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 实体类 + * 瀹炰綋绫� */ @Entity @Table(name = "fangjia.entity_class") diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/EvaluateApplication.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/EvaluateApplication.java index 10575bf7c..698ea334e 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/EvaluateApplication.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/EvaluateApplication.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 估价师频道申请实体类 + * 浼颁环甯堥閬撶敵璇峰疄浣撶被 */ @Entity @Table(name = "fangjia.evaluate_application") diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/EvaluateCompany.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/EvaluateCompany.java index 6faad6c18..5cf2f71ca 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/EvaluateCompany.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/EvaluateCompany.java @@ -12,7 +12,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 评估公司实体类 + * 璇勪及鍏徃瀹炰綋绫� */ @Entity @Table(name = "fangjia.evaluate_company") @@ -22,7 +22,7 @@ public class EvaluateCompany implements MongoEntity { private int status; private String fullName; private String logoUrl; - private List qualifications; // 企业资质 + private List qualifications; // 浼佷笟璧勮川 private Date creationDate; private Date modificationDate; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/EvaluateMaster.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/EvaluateMaster.java index 388d6883f..2565a6460 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/EvaluateMaster.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/EvaluateMaster.java @@ -12,7 +12,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 评估师实体类 + * 璇勪及甯堝疄浣撶被 */ @Entity @Table(name = "fangjia.evaluate_master") @@ -30,17 +30,17 @@ public class EvaluateMaster implements MongoEntity { private String city; private List regions; private List expertRegions; - private int jobExperience; // 执业年限 - private List mainCategory; // 擅长类型 - private int experienceLevel; // 经验指数 - private List qualifications; // 资质 - private String position; // 职位 - private String title; // 头衔 - private Integer sequence;// 显示顺序,从小到大 - private Integer sequence0;// 住宅 显示顺序,从小到大 - private Integer sequence1;// 办公楼 显示顺序,从小到大 - private Integer sequence2;// 商铺 显示顺序,从小到大 - private Integer sequence3;// 厂房 显示顺序,从小到大 + private int jobExperience; // 鎵т笟骞撮檺 + private List mainCategory; // 鎿呴暱绫诲瀷 + private int experienceLevel; // 缁忛獙鎸囨暟 + private List qualifications; // 璧勮川 + private String position; // 鑱屼綅 + private String title; // 澶磋 + private Integer sequence;// 鏄剧ず椤哄簭锛屼粠灏忓埌澶� + private Integer sequence0;// 浣忓畢 鏄剧ず椤哄簭锛屼粠灏忓埌澶� + private Integer sequence1;// 鍔炲叕妤� 鏄剧ず椤哄簭锛屼粠灏忓埌澶� + private Integer sequence2;// 鍟嗛摵 鏄剧ず椤哄簭锛屼粠灏忓埌澶� + private Integer sequence3;// 鍘傛埧 鏄剧ず椤哄簭锛屼粠灏忓埌澶� private Date creationDate; private Date modificationDate; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Evaluation.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Evaluation.java index 8bea1a0c3..3614db97b 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Evaluation.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Evaluation.java @@ -16,7 +16,7 @@ public class Evaluation implements MongoEntity { private String id; private String category; private int status; - private int reportCat; // 0:买家版;1:房东版 4:表示数据来自房价通 + private int reportCat; // 0锛氫拱瀹剁増锛�1锛氭埧涓滅増 4锛氳〃绀烘暟鎹潵鑷埧浠烽�� private String districtName; private String city; private String region; @@ -25,42 +25,42 @@ public class Evaluation implements MongoEntity { private Integer totalPrice; private Integer avgPrice; private Integer avgPrice2b; - private Integer floor;// 所在楼层 - private Integer height;// 总楼层 - private Double area; // 建筑面积 + private Integer floor;// 鎵�鍦ㄦゼ灞� + private Integer height;// 鎬绘ゼ灞� + private Double area; // 寤虹瓚闈㈢Н private Integer room; private Integer hall; private Integer toilet; private Date weekend; private Integer age; - private String houseProperty; // 产权属性 + private String houseProperty; // 浜ф潈灞炴�� private String buildType; private String direction; - private String fitment; // 装修情况 + private String fitment; // 瑁呬慨鎯呭喌 private Integer cost; private Integer fitmentAge; - private Integer fitmentCharge;// 装修价格 + private Integer fitmentCharge;// 瑁呬慨浠锋牸 - private String insidepos;// 小区位置 - private String sight;// 景观情况 - private String lightingVentilation;// 采光通风 - private String sideset;// 边套装置 + private String insidepos;// 灏忓尯浣嶇疆 + private String sight;// 鏅鎯呭喌 + private String lightingVentilation;// 閲囧厜閫氶 + private String sideset;// 杈瑰瑁呯疆 - private String noise; // 噪音 + private String noise; // 鍣煶 private String houseNum; private String roomNum; private String estateType; private String buildQuality; private String worryFacility; - private Double gardenArea; // 花园面积 - private Double basementArea; // 地下室面积 - private String carport; // 自有车位 + private Double gardenArea; // 鑺卞洯闈㈢Н + private Double basementArea; // 鍦颁笅瀹ら潰绉� + private String carport; // 鑷湁杞︿綅 private String otherFactor; private Integer userHouse; private String ip; - private String source;// 估价来源,site和api接口 - private String facilities; // 内部配套 - private String worryFactor; // 厌恶因素 + private String source;// 浼颁环鏉ユ簮锛宻ite鍜宎pi鎺ュ彛 + private String facilities; // 鍐呴儴閰嶅 + private String worryFactor; // 鍘屾伓鍥犵礌 private Date creationDate; private Date modificationDate; private Integer houseAreaRange; @@ -68,39 +68,39 @@ public class Evaluation implements MongoEntity { private Integer visible; private Integer unitNum; - private String facade; // 门面开间 - private String traffice; // 公共交通 - private String shape; // 形状 - private String obstacle; // 障碍物 - private String industry; // 经营性质 - private String supportDevice; // 配套设备 - private String leftPosition; // 距离扶梯位置 - private String shopType;// 商铺类型 - private String shopUnique; // 商铺唯一性 - private String location; // 商铺位置 + private String facade; // 闂ㄩ潰寮�闂� + private String traffice; // 鍏叡浜ら�� + private String shape; // 褰㈢姸 + private String obstacle; // 闅滅鐗� + private String industry; // 缁忚惀鎬ц川 + private String supportDevice; // 閰嶅璁惧 + private String leftPosition; // 璺濈鎵舵浣嶇疆 + private String shopType;// 鍟嗛摵绫诲瀷 + private String shopUnique; // 鍟嗛摵鍞竴鎬� + private String location; // 鍟嗛摵浣嶇疆 - private Integer stairs; // 梯 - private Integer doors; // 户 - private Double floorHeight; // 层高 - private String floorSpace; // 楼间距 - private String buildTroubles; // 建筑问题 - private String carportSaturation; // 车位饱和度 - private Integer parkingFee; // 停车费 - private String parkingFeeUnit; // 停车费单位 - private String greenArea; // 绿化覆盖面 - private String property; // 物业综合水平 - private String propertyFee; // 物业管理费 - private String security; // 治安环境 - private String rentalRates; // 出租率 - private Double terraceArea; // 露台面积 - private Double atticArea; // 阁楼面积 - private String giftArea; // 所赠面积 - private String around; // 周边环境 + private Integer stairs; // 姊� + private Integer doors; // 鎴� + private Double floorHeight; // 灞傞珮 + private String floorSpace; // 妤奸棿璺� + private String buildTroubles; // 寤虹瓚闂 + private String carportSaturation; // 杞︿綅楗卞拰搴� + private Integer parkingFee; // 鍋滆溅璐� + private String parkingFeeUnit; // 鍋滆溅璐瑰崟浣� + private String greenArea; // 缁垮寲瑕嗙洊闈� + private String property; // 鐗╀笟缁煎悎姘村钩 + private String propertyFee; // 鐗╀笟绠$悊璐� + private String security; // 娌诲畨鐜 + private String rentalRates; // 鍑虹鐜� + private Double terraceArea; // 闇插彴闈㈢Н + private Double atticArea; // 闃佹ゼ闈㈢Н + private String giftArea; // 鎵�璧犻潰绉� + private String around; // 鍛ㄨ竟鐜 private boolean isNewDistrict; - private String advantage; // 优点 - private String defect; // 缺点 + private String advantage; // 浼樼偣 + private String defect; // 缂虹偣 private Integer houseRoom; private Integer houseHall; private Integer carportPrice; @@ -115,47 +115,47 @@ public class Evaluation implements MongoEntity { private Integer myProperty; private String fromUserId; private String clientNo; - //我要评估 + //鎴戣璇勪及 private String suggest; - //我查查状态字段 + //鎴戞煡鏌ョ姸鎬佸瓧娈� private int statusCha; private Double unitPrice; /** - * 写字楼类型:1:标准写字楼;2:创意园区;3:商住两用;4:综合体 + * 鍐欏瓧妤肩被鍨嬶細1锛氭爣鍑嗗啓瀛楁ゼ锛�2锛氬垱鎰忓洯鍖猴紱3锛氬晢浣忎袱鐢紱4锛氱患鍚堜綋 */ private Integer type; /** - * 写字楼等级 1:甲级;2:乙级;3:丙级 + * 鍐欏瓧妤肩瓑绾� 1锛氱敳绾э紱2锛氫箼绾э紱3锛氫笝绾� */ private Integer level; /** - * 免租期(月) + * 鍏嶇鏈燂紙鏈堬級 */ private Integer rentFreePeriod; /** - * 物业费(元/m?/月) + * 鐗╀笟璐�(鍏�/m?/鏈�) */ private Double propertyManagementFee; /** - * 楼层描述 + * 妤煎眰鎻忚堪 */ private String floorDesc; /** - * 查询范围 + * 鏌ヨ鑼冨洿 */ private Integer radius; /** - * 样本IDS + * 鏍锋湰IDS */ private String sampleIds; /** - * 商铺标签 + * 鍟嗛摵鏍囩 */ private String tags; @Id diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/EvaluationCondition.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/EvaluationCondition.java index 217610b63..85d6c26c9 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/EvaluationCondition.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/EvaluationCondition.java @@ -17,11 +17,11 @@ public class EvaluationCondition implements MongoEntity { private static final long serialVersionUID = -5492231659545511142L; private String id; - private String estateType;// 参数名称 - private String condition;// 朝向等 - private Integer seq;// 序列号 - private String showType;// 前台页面显示类型 - private String conditionEN;//估价条件英文名 + private String estateType;// 鍙傛暟鍚嶇О + private String condition;// 鏈濆悜绛� + private Integer seq;// 搴忓垪鍙� + private String showType;// 鍓嶅彴椤甸潰鏄剧ず绫诲瀷 + private String conditionEN;//浼颁环鏉′欢鑻辨枃鍚� @Id diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/EvaluationFactor.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/EvaluationFactor.java index 12ac82f1a..a7dd03e85 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/EvaluationFactor.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/EvaluationFactor.java @@ -15,11 +15,11 @@ public class EvaluationFactor implements MongoEntity{ private static final long serialVersionUID = -5492231659545511142L; private String id; private String city; - private String condition;//估价条件 - private String rankMark;//条件具体值 - private Double factor;//该值得估价因子 - private Integer rank;//该值的在该挑中的id - private String estateType;//物业类型 + private String condition;//浼颁环鏉′欢 + private String rankMark;//鏉′欢鍏蜂綋鍊� + private Double factor;//璇ュ�煎緱浼颁环鍥犲瓙 + private Integer rank;//璇ュ�肩殑鍦ㄨ鎸戜腑鐨刬d + private String estateType;//鐗╀笟绫诲瀷 @Id diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/EvaluationHistory.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/EvaluationHistory.java index 0a1f71160..fa48bfc48 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/EvaluationHistory.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/EvaluationHistory.java @@ -23,88 +23,88 @@ public class EvaluationHistory implements MongoEntity { private String id; private String category; private int status; - private int reportCat; // 0:买家版;1:房东版 4:表示数据来自房价通 + private int reportCat; // 0锛氫拱瀹剁増锛�1锛氭埧涓滅増 4锛氳〃绀烘暟鎹潵鑷埧浠烽�� private String districtName; private String city; private String region; private String block; private Integer totalPrice; private Integer avgPrice; - private Integer floor;// 所在楼层 - private Integer height;// 总楼层 - private Double area; // 建筑面积 + private Integer floor;// 鎵�鍦ㄦゼ灞� + private Integer height;// 鎬绘ゼ灞� + private Double area; // 寤虹瓚闈㈢Н private Integer room; private Integer hall; private Integer toilet; private Date weekend; private Integer age; - private String houseProperty; // 产权属性 + private String houseProperty; // 浜ф潈灞炴�� private String buildType; private String direction; - private String fitment; // 装修情况 + private String fitment; // 瑁呬慨鎯呭喌 private Integer cost; private Integer fitmentAge; - private Integer fitmentCharge;// 装修价格 + private Integer fitmentCharge;// 瑁呬慨浠锋牸 - private String insidepos;// 小区位置 - private String sight;// 景观情况 - private String lightingVentilation;// 采光通风 - private String sideset;// 边套装置 + private String insidepos;// 灏忓尯浣嶇疆 + private String sight;// 鏅鎯呭喌 + private String lightingVentilation;// 閲囧厜閫氶 + private String sideset;// 杈瑰瑁呯疆 - private String noise; // 噪音 + private String noise; // 鍣煶 private String houseNum; private String roomNum; private String estateType; private String buildQuality; private String worryFacility; - private Double gardenArea; // 花园面积 - private Double basementArea; // 地下室面积 - private String carport; // 自有车位 + private Double gardenArea; // 鑺卞洯闈㈢Н + private Double basementArea; // 鍦颁笅瀹ら潰绉� + private String carport; // 鑷湁杞︿綅 private String otherFactor; private Integer userHouse; private String ip; - private String source;// 估价来源,site和api接口 - private String facilities; // 内部配套 - private String worryFactor; // 厌恶因素 + private String source;// 浼颁环鏉ユ簮锛宻ite鍜宎pi鎺ュ彛 + private String facilities; // 鍐呴儴閰嶅 + private String worryFactor; // 鍘屾伓鍥犵礌 private Date creationDate; private Date modificationDate; private Integer houseAreaRange; private Integer totalPriceRange; private Integer visible; - private String facade; // 门面开间 - private String traffice; // 公共交通 - private String shape; // 形状 - private String obstacle; // 障碍物 - private String industry; // 经营性质 - private String supportDevice; // 配套设备 - private String leftPosition; // 距离扶梯位置 - private String shopType;// 商铺类型 - private String shopUnique; // 商铺唯一性 - private String location; // 商铺位置 + private String facade; // 闂ㄩ潰寮�闂� + private String traffice; // 鍏叡浜ら�� + private String shape; // 褰㈢姸 + private String obstacle; // 闅滅鐗� + private String industry; // 缁忚惀鎬ц川 + private String supportDevice; // 閰嶅璁惧 + private String leftPosition; // 璺濈鎵舵浣嶇疆 + private String shopType;// 鍟嗛摵绫诲瀷 + private String shopUnique; // 鍟嗛摵鍞竴鎬� + private String location; // 鍟嗛摵浣嶇疆 - private Integer stairs; // 梯 - private Integer doors; // 户 - private Double floorHeight; // 层高 - private String floorSpace; // 楼间距 - private String buildTroubles; // 建筑问题 - private String carportSaturation; // 车位饱和度 - private Integer parkingFee; // 停车费 - private String parkingFeeUnit; // 停车费单位 - private String greenArea; // 绿化覆盖面 - private String property; // 物业综合水平 - private String propertyFee; // 物业管理费 - private String security; // 治安环境 - private String rentalRates; // 出租率 - private Double terraceArea; // 露台面积 - private Double atticArea; // 阁楼面积 - private String giftArea; // 所赠面积 - private String around; // 周边环境 + private Integer stairs; // 姊� + private Integer doors; // 鎴� + private Double floorHeight; // 灞傞珮 + private String floorSpace; // 妤奸棿璺� + private String buildTroubles; // 寤虹瓚闂 + private String carportSaturation; // 杞︿綅楗卞拰搴� + private Integer parkingFee; // 鍋滆溅璐� + private String parkingFeeUnit; // 鍋滆溅璐瑰崟浣� + private String greenArea; // 缁垮寲瑕嗙洊闈� + private String property; // 鐗╀笟缁煎悎姘村钩 + private String propertyFee; // 鐗╀笟绠$悊璐� + private String security; // 娌诲畨鐜 + private String rentalRates; // 鍑虹鐜� + private Double terraceArea; // 闇插彴闈㈢Н + private Double atticArea; // 闃佹ゼ闈㈢Н + private String giftArea; // 鎵�璧犻潰绉� + private String around; // 鍛ㄨ竟鐜 private boolean isNewDistrict; - private String advantage; // 优点 - private String defect; // 缺点 + private String advantage; // 浼樼偣 + private String defect; // 缂虹偣 @Id @GeneratedValue(strategy = GenerationType.AUTO) diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/EvaluationPrice.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/EvaluationPrice.java index d6350a574..61a84177c 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/EvaluationPrice.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/EvaluationPrice.java @@ -28,23 +28,23 @@ public class EvaluationPrice implements MongoEntity { private String address; private Double totalPrice; private Double avgPrice; - private String estateType;//物业类型 - private Double area; // 建筑面积 - private String buildType; // 建筑类型 - private String orientation;// 朝向 - private String areaType;// 面积类型 - private String fitment; // 装修状况 - private String carport; // 车库 - private String insidepos;// 小区位置 - private String sight;// 景观情况 - private String lightingVentilation;// 采光通风 - private String noise; // 噪音 - private String sideset;// 边套装置 - private String worryFactor; // 厌恶因素 - private String balcony;// 阳台露台 - private Double gardenArea; // 花园面积 - private String Swimming;// 泳池 - private String fishpond;// 景观鱼塘 + private String estateType;//鐗╀笟绫诲瀷 + private Double area; // 寤虹瓚闈㈢Н + private String buildType; // 寤虹瓚绫诲瀷 + private String orientation;// 鏈濆悜 + private String areaType;// 闈㈢Н绫诲瀷 + private String fitment; // 瑁呬慨鐘跺喌 + private String carport; // 杞﹀簱 + private String insidepos;// 灏忓尯浣嶇疆 + private String sight;// 鏅鎯呭喌 + private String lightingVentilation;// 閲囧厜閫氶 + private String noise; // 鍣煶 + private String sideset;// 杈瑰瑁呯疆 + private String worryFactor; // 鍘屾伓鍥犵礌 + private String balcony;// 闃冲彴闇插彴 + private Double gardenArea; // 鑺卞洯闈㈢Н + private String Swimming;// 娉虫睜 + private String fishpond;// 鏅楸煎 @Id diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/EvaluationReport.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/EvaluationReport.java index 7b5306987..c134dc6a6 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/EvaluationReport.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/EvaluationReport.java @@ -31,16 +31,16 @@ public class EvaluationReport implements MongoEntity { private String offlineCity; private String offlineRegion; private String offlineAddress; - private int status; // 0:初始状态;1:已付款未发送;2:已发送;3:线下付款待发货状态;4:免费体验;10:open接口生成的; 5:房价通生成 - private int payType; // 1: 支付宝;2:网银;;0:房价通生成 - private int feeType; // 1:全额现金;2:房币+现金 0:房价通生成 + private int status; // 0锛氬垵濮嬬姸鎬侊紱1锛氬凡浠樻鏈彂閫侊紱2锛氬凡鍙戦�侊紱3锛氱嚎涓嬩粯娆惧緟鍙戣揣鐘舵�侊紱4锛氬厤璐逛綋楠岋紱10锛歰pen鎺ュ彛鐢熸垚鐨�; 5:鎴夸环閫氱敓鎴� + private int payType; // 1: 鏀粯瀹濓紱2锛氱綉閾讹紱;0:鎴夸环閫氱敓鎴� + private int feeType; // 1锛氬叏棰濈幇閲戯紱2锛氭埧甯�+鐜伴噾 0锛氭埧浠烽�氱敓鎴� private String evaluationId; - private String tradeNo; // 支付宝交易号 - private Date creationDate; // 创建时间 - private Date payDate; // 完成支付的时间 - private Date confirmDate; // 报告发送时间 - private Date finishDate; // 交易完成时间,目前没用 - private int cat; // 0:买家版;1:房东版;2、3:机构版 4:表示数据来自房价通 + private String tradeNo; // 鏀粯瀹濅氦鏄撳彿 + private Date creationDate; // 鍒涘缓鏃堕棿 + private Date payDate; // 瀹屾垚鏀粯鐨勬椂闂� + private Date confirmDate; // 鎶ュ憡鍙戦�佹椂闂� + private Date finishDate; // 浜ゆ槗瀹屾垚鏃堕棿锛岀洰鍓嶆病鐢� + private int cat; // 0锛氫拱瀹剁増锛�1锛氭埧涓滅増锛�2銆�3锛氭満鏋勭増 4锛氳〃绀烘暟鎹潵鑷埧浠烽�� private String city; private String orgName; private int verifyStatus; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/FSHAlgorithmRule.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/FSHAlgorithmRule.java index a0421b895..4be152f11 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/FSHAlgorithmRule.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/FSHAlgorithmRule.java @@ -26,36 +26,36 @@ public class FSHAlgorithmRule implements MongoEntity { private List activeCity; public enum FieldEnum { - AGENCY_COUNT(0.2, "中介数量权重"), - AGENCY_COUNT_MAX(90.0, "中介数量max值"), - AGENCY_COUNT_MIN(0, "中介数量min值"), - AGENCY_RADIUS(1.0, "中介数取值半径范围"), - PUBLISH_COUNT_FACTOR(0.3, "发布量权重"), - PUBLISH_COUNT_MAX(900.0, "发布量max值"), - PUBLISH_COUNT_MIN(0, "发布量min值"), - TRAFFIC_FACROR(0.2, "交通权重"), - BUS_FACTOR(0.6, "公交权重"), - METRO_FACTOR(0.4, "地铁权重"), - BUS_COUNT_MAX(48, "公交数量max值"), - BUS_COUNT_MIN(0, "公交数量min值"), - METRO_COUNT_MAX(5, "地铁数量max值"), - METRO_COUNT_MIN(0, "地铁数量min值"), - BUS_RADIUS(1.0, "公交数取值半径范围"), - METRO_RADIUS(1.0, "地铁数取值半径范围"), - PROPERTY_DENSITY_FACTOR(0.1, "小区密度权重"), - PROPERTY_DENSITY_MAX(400, "小区密度max值"), - PROPERTY_DENSITY_MIN(10, "小区密度min值"), - PUBLISH_A(850, "发布量A值"), - PUBLISH_B(200, "发布量B值"), - PROPERTY_DENSITY_RADIUS(1.0, "小区密度取值半径范围"), - TOTAL_PRICE_FACTOR(0.2, "房屋总价权重"), - TOTAL_PRICE_A(270, "总价A值"), - TOTAL_PRICE_B(18, "总价B值"), - TOTAL_PRICE_E(54, "总价E值"), - TOTAL_PRICE_F(72, "总价F值"), - YOY_FACTOR(0.2, "年涨跌幅权重"), - YOY_D(2, "年涨跌幅D值"), - YOY_C(1, "年涨跌幅C值"), + AGENCY_COUNT(0.2, "涓粙鏁伴噺鏉冮噸"), + AGENCY_COUNT_MAX(90.0, "涓粙鏁伴噺max鍊�"), + AGENCY_COUNT_MIN(0, "涓粙鏁伴噺min鍊�"), + AGENCY_RADIUS(1.0, "涓粙鏁板彇鍊煎崐寰勮寖鍥�"), + PUBLISH_COUNT_FACTOR(0.3, "鍙戝竷閲忔潈閲�"), + PUBLISH_COUNT_MAX(900.0, "鍙戝竷閲弇ax鍊�"), + PUBLISH_COUNT_MIN(0, "鍙戝竷閲弇in鍊�"), + TRAFFIC_FACROR(0.2, "浜ら�氭潈閲�"), + BUS_FACTOR(0.6, "鍏氦鏉冮噸"), + METRO_FACTOR(0.4, "鍦伴搧鏉冮噸"), + BUS_COUNT_MAX(48, "鍏氦鏁伴噺max鍊�"), + BUS_COUNT_MIN(0, "鍏氦鏁伴噺min鍊�"), + METRO_COUNT_MAX(5, "鍦伴搧鏁伴噺max鍊�"), + METRO_COUNT_MIN(0, "鍦伴搧鏁伴噺min鍊�"), + BUS_RADIUS(1.0, "鍏氦鏁板彇鍊煎崐寰勮寖鍥�"), + METRO_RADIUS(1.0, "鍦伴搧鏁板彇鍊煎崐寰勮寖鍥�"), + PROPERTY_DENSITY_FACTOR(0.1, "灏忓尯瀵嗗害鏉冮噸"), + PROPERTY_DENSITY_MAX(400, "灏忓尯瀵嗗害max鍊�"), + PROPERTY_DENSITY_MIN(10, "灏忓尯瀵嗗害min鍊�"), + PUBLISH_A(850, "鍙戝竷閲廇鍊�"), + PUBLISH_B(200, "鍙戝竷閲廈鍊�"), + PROPERTY_DENSITY_RADIUS(1.0, "灏忓尯瀵嗗害鍙栧�煎崐寰勮寖鍥�"), + TOTAL_PRICE_FACTOR(0.2, "鎴垮眿鎬讳环鏉冮噸"), + TOTAL_PRICE_A(270, "鎬讳环A鍊�"), + TOTAL_PRICE_B(18, "鎬讳环B鍊�"), + TOTAL_PRICE_E(54, "鎬讳环E鍊�"), + TOTAL_PRICE_F(72, "鎬讳环F鍊�"), + YOY_FACTOR(0.2, "骞存定璺屽箙鏉冮噸"), + YOY_D(2, "骞存定璺屽箙D鍊�"), + YOY_C(1, "骞存定璺屽箙C鍊�"), ; private final double defaultValue; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/FTCustomerRed.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/FTCustomerRed.java index 3c80c75bd..ee36a4b48 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/FTCustomerRed.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/FTCustomerRed.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 联系客服记录 + * 鑱旂郴瀹㈡湇璁板綍 */ @Entity @Table(name = "business.first_title.customer_record") diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/FTLoanRed.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/FTLoanRed.java index 8be6d158d..f521fc805 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/FTLoanRed.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/FTLoanRed.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 中易安贷款申请记录实体类 + * 涓槗瀹夎捶娆剧敵璇疯褰曞疄浣撶被 */ @Entity @Table(name = "business.first_title.loan_record") diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/FangjiaCommonLog.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/FangjiaCommonLog.java index f3e94f903..dbfd18b03 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/FangjiaCommonLog.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/FangjiaCommonLog.java @@ -12,7 +12,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 房价网通用log + * 鎴夸环缃戦�氱敤log * * @author yukai * diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/FangjiaOfficialAreaMap.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/FangjiaOfficialAreaMap.java index bc27f5ca4..e933c98e2 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/FangjiaOfficialAreaMap.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/FangjiaOfficialAreaMap.java @@ -5,7 +5,7 @@ import com.fangjia.dal.MongoEntity; import javax.persistence.*; /** - * 房价网和民政局的区划信息映射表 + * 鎴夸环缃戝拰姘戞斂灞�鐨勫尯鍒掍俊鎭槧灏勮〃 */ @Entity @Table(name = "business.fangjia_official_area_map") diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Feedback.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Feedback.java index ff23ebe8b..198c67b82 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Feedback.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Feedback.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 用户意见反馈 + * 鐢ㄦ埛鎰忚鍙嶉 */ @Entity @Table(name = "fangjia.feedback") diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/FieldRole.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/FieldRole.java index 032e59123..25100dff8 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/FieldRole.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/FieldRole.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 属性 + * 灞炴�� */ @Entity @Table(name = "fangjia.field_role") diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/FjtUserGoldFreeze.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/FjtUserGoldFreeze.java index b1a0bba0e..865f15c3b 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/FjtUserGoldFreeze.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/FjtUserGoldFreeze.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 房价通用户房币临时冻结表(购买房调报告时用) + * 鎴夸环閫氱敤鎴锋埧甯佷复鏃跺喕缁撹〃锛堣喘涔版埧璋冩姤鍛婃椂鐢級 */ @Entity @Table(name = "fangjia.fjt_user_gold_freeze") @@ -20,8 +20,8 @@ public class FjtUserGoldFreeze implements MongoEntity { private String id; private String fjtUserName; private String reportId; - private int gold; // 一般为负数,表示扣除 - private int status; // 0:入库初始化状态,冻结;1:已付款,房币扣除;2:未付款,已由batch处理后归还房价通账户;9:其他无法处理的状况 + private int gold; // 涓�鑸负璐熸暟锛岃〃绀烘墸闄� + private int status; // 0锛氬叆搴撳垵濮嬪寲鐘舵�侊紝鍐荤粨锛�1锛氬凡浠樻锛屾埧甯佹墸闄わ紱2锛氭湭浠樻锛屽凡鐢眀atch澶勭悊鍚庡綊杩樻埧浠烽�氳处鎴凤紱9锛氬叾浠栨棤娉曞鐞嗙殑鐘跺喌 private Date creationDate; private Date modificationDate; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/FriendLink.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/FriendLink.java index 40a16f654..8106491d4 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/FriendLink.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/FriendLink.java @@ -32,7 +32,7 @@ public class FriendLink implements MongoEntity { private String url; /** - * 描述 + * 鎻忚堪 */ private String text; @@ -44,22 +44,22 @@ public class FriendLink implements MongoEntity { private String outUrl; /** - * 城市 + * 鍩庡競 */ private String city; /** - * 类别 图片链接 or 文字连接 + * 绫诲埆 鍥剧墖閾炬帴 or 鏂囧瓧杩炴帴 */ private Integer type; // /** -// * 展示位置 +// * 灞曠ず浣嶇疆 // */ // private Integer placement; /** - * 展示序号 + * 灞曠ず搴忓彿 */ private Integer sequence; @@ -72,12 +72,12 @@ public class FriendLink implements MongoEntity { private Integer toName; private List elevateWords; /** - * 全国首页页面显示标识 1 显示 0 隐藏 + * 鍏ㄥ浗棣栭〉椤甸潰鏄剧ず鏍囪瘑 1 鏄剧ず 0 闅愯棌 */ private Integer inIndexHome; /** - * 竞品词页面显示标识 1 显示 0 隐藏 + * 绔炲搧璇嶉〉闈㈡樉绀烘爣璇� 1 鏄剧ず 0 闅愯棌 */ private Integer inElevateWord; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Guzhi.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Guzhi.java index 11bf5ea8b..7a000f95e 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Guzhi.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Guzhi.java @@ -6,9 +6,9 @@ import javax.persistence.*; import java.util.Date; /** - * 人工估值实体 + * 浜哄伐浼板�煎疄浣� * - * @author 王文艳 + * @author 鐜嬫枃鑹� * @create 2016-11-14 **/ @Entity diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/HouseData.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/HouseData.java index 47bad7ddd..4e3a54065 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/HouseData.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/HouseData.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 房子数据 + * 鎴垮瓙鏁版嵁 */ @Entity @Table(name = "fangjia.real_house") diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/HouseLoudong.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/HouseLoudong.java index 2c4b93475..ca7883cd2 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/HouseLoudong.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/HouseLoudong.java @@ -9,7 +9,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 房号信息 + * 鎴垮彿淇℃伅 */ @Entity @Table(name = "fangjia.house_loudong") @@ -26,10 +26,10 @@ public class HouseLoudong implements MongoEntity { private String roomInfo; private String worryFacility; private String sideset; - private String carport; // 自由车位 + private String carport; // 鑷敱杞︿綅 private String noise; private String sight; - private String fitmentRank; // 装修情况 + private String fitmentRank; // 瑁呬慨鎯呭喌 private String direction; private String buildType; private String insidepos; @@ -38,42 +38,42 @@ public class HouseLoudong implements MongoEntity { private int hall; private int toilet; private int houseFloor; - private int fitmentAge; // 装修年限 + private int fitmentAge; // 瑁呬慨骞撮檺 private int houseHeight; - private double houseArea;//房屋面积 - private double basementArea;//地下室面积 - private double outerArea;//公摊面积 - private double gardenArea;//花园面积 - private double atticArea;//阁楼面积 - private double fitmentCost;//装修成本 - private double dwellingSpaceArea;//套内建筑面积 + private double houseArea;//鎴垮眿闈㈢Н + private double basementArea;//鍦颁笅瀹ら潰绉� + private double outerArea;//鍏憡闈㈢Н + private double gardenArea;//鑺卞洯闈㈢Н + private double atticArea;//闃佹ゼ闈㈢Н + private double fitmentCost;//瑁呬慨鎴愭湰 + private double dwellingSpaceArea;//濂楀唴寤虹瓚闈㈢Н - private String houseProperty; // 产权属性 - private String lightingVentilation;// 采光通风 + private String houseProperty; // 浜ф潈灞炴�� + private String lightingVentilation;// 閲囧厜閫氶 - private Integer stairs; // 梯 - private Integer doors; // 户 - private Double floorHeight; // 层高 - private String floorSpace; // 楼间距 - private String buildTroubles; // 建筑问题 - private String giftArea; // 所赠面积 - private String carportSaturation; // 车位饱和度 - private Integer parkingFee; // 停车费 - private String parkingFeeUnit; // 停车费单位 - private String property; // 物业综合水平 - private String propertyFee; // 物业管理费 - private String security; // 治安环境 - private String rentalRates; // 出租率 - private String greenArea; // 绿化覆盖面 - private String around; // 周边环境 - private String facilities; // 内部配套 + private Integer stairs; // 姊� + private Integer doors; // 鎴� + private Double floorHeight; // 灞傞珮 + private String floorSpace; // 妤奸棿璺� + private String buildTroubles; // 寤虹瓚闂 + private String giftArea; // 鎵�璧犻潰绉� + private String carportSaturation; // 杞︿綅楗卞拰搴� + private Integer parkingFee; // 鍋滆溅璐� + private String parkingFeeUnit; // 鍋滆溅璐瑰崟浣� + private String property; // 鐗╀笟缁煎悎姘村钩 + private String propertyFee; // 鐗╀笟绠$悊璐� + private String security; // 娌诲畨鐜 + private String rentalRates; // 鍑虹鐜� + private String greenArea; // 缁垮寲瑕嗙洊闈� + private String around; // 鍛ㄨ竟鐜 + private String facilities; // 鍐呴儴閰嶅 String houseNumUnit; - private String hourseStructure; //户型结构 例:平层、跃层、复式、错层等 - private Integer actualFloor; //实际层 - private Integer nominalFloor; //名义层 + private String hourseStructure; //鎴峰瀷缁撴瀯 渚嬶細骞冲眰銆佽穬灞傘�佸寮忋�侀敊灞傜瓑 + private Integer actualFloor; //瀹為檯灞� + private Integer nominalFloor; //鍚嶄箟灞� @Column(name = "dwelling_space_area") public double getDwellingSpaceArea() { diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/HousePrice.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/HousePrice.java index a85e9d31b..0474559a1 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/HousePrice.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/HousePrice.java @@ -26,24 +26,24 @@ public class HousePrice implements MongoEntity { private String districtName; /** - * 城市 + * 鍩庡競 */ private String city; private String region; private String block; /** - * 户型 + * 鎴峰瀷 */ private Integer room; /** - * 面积 + * 闈㈢Н */ private Double houseArea; /** - * 估价 + * 浼颁环 */ private Integer price; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/HouseProperty.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/HouseProperty.java index a40eea5b8..03edf625e 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/HouseProperty.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/HouseProperty.java @@ -19,23 +19,23 @@ public class HouseProperty implements MongoEntity { */ private static final long serialVersionUID = 7348058851947672288L; private String id; - private int userId; // 用户ID + private int userId; // 鐢ㄦ埛ID - private String city; // 城市 - private String region; // 区域 - private String districtName; // 小区名 + private String city; // 鍩庡競 + private String region; // 鍖哄煙 + private String districtName; // 灏忓尯鍚� private String block; - private String houseNum; // 室 - private String roomNum; // 号 - private Integer totalPrice; // 房屋总价值 + private String houseNum; // 瀹� + private String roomNum; // 鍙� + private Integer totalPrice; // 鎴垮眿鎬讳环鍊� - private Integer buyingPrice; // 买入价格 - private Integer income; // 月收入 - private Integer totalLoan; // 贷款总额(万元) - private Integer monthPay; // 每月还款(元) - private Integer loanTime;//还款年限 + private Integer buyingPrice; // 涔板叆浠锋牸 + private Integer income; // 鏈堟敹鍏� + private Integer totalLoan; // 璐锋鎬婚锛堜竾鍏冿級 + private Integer monthPay; // 姣忔湀杩樻锛堝厓锛� + private Integer loanTime;//杩樻骞撮檺 - private int status; // 资产状态 0-正常(默认) 1-取消 + private int status; // 璧勪骇鐘舵�� 0-姝e父(榛樿) 1-鍙栨秷 private Integer floor; private Integer height; @@ -50,10 +50,10 @@ public class HouseProperty implements MongoEntity { private Integer fitmentAge; private Integer fitmentCharge; - private String insidepos;// 小区位置 - private String sight;// 景观情况 - private String lightingVentilation;// 采光通风 - private String sideset;// 边套装置 + private String insidepos;// 灏忓尯浣嶇疆 + private String sight;// 鏅鎯呭喌 + private String lightingVentilation;// 閲囧厜閫氶 + private String sideset;// 杈瑰瑁呯疆 private String estateType; private String noise; private String buildQuality; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/HouseQuoteLevel.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/HouseQuoteLevel.java index 6a672ca21..ff95eae76 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/HouseQuoteLevel.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/HouseQuoteLevel.java @@ -18,7 +18,7 @@ public class HouseQuoteLevel implements MongoEntity { private String region; private String name; private Integer quotedMount; - private int sizeType;//50,70,90,110,140,160,200,300,300以上(400) + private int sizeType;//50,70,90,110,140,160,200,300,300浠ヤ笂(400) private int momCityLevel; private int citySize; private Integer date; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/HouseStat.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/HouseStat.java index a87e20c4c..8fdc9f486 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/HouseStat.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/HouseStat.java @@ -25,7 +25,7 @@ public class HouseStat implements MongoEntity { private int houseCount; private int peopleCount; private int standardPeopleCount; - private int districtAvgPopulation; // 小区平均人口数 + private int districtAvgPopulation; // 灏忓尯骞冲潎浜哄彛鏁� private double rate; @Id diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/HouseSummary.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/HouseSummary.java index 13f8ab5b3..9a86b298d 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/HouseSummary.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/HouseSummary.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 报告中的专业分析 + * 鎶ュ憡涓殑涓撲笟鍒嗘瀽 */ @Entity @Table(name = "fangjia.house_summary") diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/HouseTradeHistory.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/HouseTradeHistory.java index 58056a27c..7fdf6338f 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/HouseTradeHistory.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/HouseTradeHistory.java @@ -23,7 +23,7 @@ public class HouseTradeHistory implements MongoEntity { private Double area; private Integer totalPrice; private Integer avgPrice; - private String agency;// 中介 + private String agency;// 涓粙 private String estateType; private Date contractDate; private Date creationDate; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/IndexScore.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/IndexScore.java index 8108a3413..3c425734a 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/IndexScore.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/IndexScore.java @@ -9,7 +9,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 房源得分表 + * 鎴挎簮寰楀垎琛� */ @Entity @Table(name = "fangjia.index_score") diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/InputUserInfo.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/InputUserInfo.java index ffc16ee3c..e4f07954b 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/InputUserInfo.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/InputUserInfo.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 房价网评估时收集用户信息看能不能从C端用户发现B端用户 + * 鎴夸环缃戣瘎浼版椂鏀堕泦鐢ㄦ埛淇℃伅鐪嬭兘涓嶈兘浠嶤绔敤鎴峰彂鐜癇绔敤鎴� * @author yinjihuan * */ @@ -19,23 +19,23 @@ import com.fangjia.dal.MongoEntity; @Table(name = "fangjia.user_info_c2b") public class InputUserInfo implements MongoEntity { private String id; - //姓名 + //濮撳悕 private String name; - //公司 + //鍏徃 private String company; - //职位 + //鑱屼綅 private String job; - //城市 + //鍩庡競 private String city; - //手机 + //鎵嬫満 private String mobile; - //邮箱 + //閭 private String email; - //评论 + //璇勮 private String comment; - //用户ID + //鐢ㄦ埛ID private int userId; - //创建时间 + //鍒涘缓鏃堕棿 private Date createDate; @Column(name = "c_date") diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/LandPrice.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/LandPrice.java index 861045561..0c6febb44 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/LandPrice.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/LandPrice.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 基准地价 + * 鍩哄噯鍦颁环 */ @Entity @Table(name = "fangjia.land_price") diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/LandPriceIndex.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/LandPriceIndex.java index 365838600..4d77f3dfe 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/LandPriceIndex.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/LandPriceIndex.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 价格指数 + * 浠锋牸鎸囨暟 */ @Entity @Table(name = "fangjia.land_price_index") diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/LatlngPolygon.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/LatlngPolygon.java index 5cee8f161..817b0c9bb 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/LatlngPolygon.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/LatlngPolygon.java @@ -19,12 +19,12 @@ public class LatlngPolygon implements MongoEntity { private Date creationDate; public enum CategoryEnum { - CITY("city", "城市图形"), - REGION("region", "区域图形"), - DISTRICT("district", "小区图形"), - BLOCK("block", "板块图形"), - ECONOMIC("economic", "经济带"), - LOOP("loop", "城市环线"); + CITY("city", "鍩庡競鍥惧舰"), + REGION("region", "鍖哄煙鍥惧舰"), + DISTRICT("district", "灏忓尯鍥惧舰"), + BLOCK("block", "鏉垮潡鍥惧舰"), + ECONOMIC("economic", "缁忔祹甯�"), + LOOP("loop", "鍩庡競鐜嚎"); private final String cat; private final String display; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/LoanAgreement.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/LoanAgreement.java index 9a665363d..a2d7a70ff 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/LoanAgreement.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/LoanAgreement.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 贷款协议 + * 璐锋鍗忚 * @author zongzhimin * */ @@ -21,49 +21,49 @@ public class LoanAgreement implements MongoEntity { private static final long serialVersionUID = 1L; /** - * 编号 + * 缂栧彿 */ private String id; /** - * 账户名 对应最新的账户名 + * 璐︽埛鍚� 瀵瑰簲鏈�鏂扮殑璐︽埛鍚� */ private String name ; /** - * 多个协议的id仅一个有效 + * 澶氫釜鍗忚鐨刬d浠呬竴涓湁鏁� */ private List agreementIds; /** - * 签约状态 0:未签约 1:已签约 2:已失效 3:已拒绝 + * 绛剧害鐘舵�� 0锛氭湭绛剧害 1锛氬凡绛剧害 2锛氬凡澶辨晥 3锛氬凡鎷掔粷 */ private int signStatus; /** - * 银行卡认证状态 0:未认证 1:已认证 2:已失效 + * 閾惰鍗¤璇佺姸鎬� 0:鏈璇� 1锛氬凡璁よ瘉 2锛氬凡澶辨晥 */ private int cardStatus; /** - * 贷款编号 + * 璐锋缂栧彿 */ private String loanId; /** - * 代扣编号 + * 浠f墸缂栧彿 */ private String withHoldId; /** - * 最新的协议Id + * 鏈�鏂扮殑鍗忚Id */ private String agreementId; /** - * 确认时间(记录判断是否过期) + * 纭鏃堕棿锛堣褰曞垽鏂槸鍚﹁繃鏈燂級 */ private Date confirmTime; /** - * 添加时间 对应最新的协议 + * 娣诲姞鏃堕棿 瀵瑰簲鏈�鏂扮殑鍗忚 */ private Date addTime; /** - * 修改时间 对应最新的协议 + * 淇敼鏃堕棿 瀵瑰簲鏈�鏂扮殑鍗忚 */ private Date modTime; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/LoanWithHold.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/LoanWithHold.java index 8468549cf..02539df40 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/LoanWithHold.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/LoanWithHold.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 代扣 + * 浠f墸 * */ @Entity @@ -20,71 +20,71 @@ public class LoanWithHold implements MongoEntity { private static final long serialVersionUID = 1L; /** - * 代扣订单编号 + * 浠f墸璁㈠崟缂栧彿 */ private String id; /** - * 协议编号 + * 鍗忚缂栧彿 */ private String agreementId; /** - * 代扣编号id + * 浠f墸缂栧彿id */ private String withHoldId; /** - * 贷款编号 + * 璐锋缂栧彿 */ private String loanId; /** - * 手机号 + * 鎵嬫満鍙� */ private String mobile; /** - * 实际贷款金额 + * 瀹為檯璐锋閲戦 */ private double loanAmount; /** - * 服务费比率 + * 鏈嶅姟璐规瘮鐜� */ private double serviceRate; /** - * 代扣金额 + * 浠f墸閲戦 */ private double amount; /** - * 订单状态 0-等待代扣,1-代扣成功,2-代扣失败,3-处理中,4-超时失败,5-系统异常 + * 璁㈠崟鐘舵�� 0-绛夊緟浠f墸,1-浠f墸鎴愬姛,2-浠f墸澶辫触,3-澶勭悊涓�,4-瓒呮椂澶辫触,5-绯荤粺寮傚父 */ private int status; /** - * 订单创建时间 + * 璁㈠崟鍒涘缓鏃堕棿 */ private Date addTime; /** - * 扣款时间 + * 鎵f鏃堕棿 */ private Date finishTime; /** - * 修改时间 + * 淇敼鏃堕棿 */ private Date updateTime; /** - * 易宝支付流水号 + * 鏄撳疂鏀粯娴佹按鍙� */ private String yborderid; /** - * 易宝支付错误详情 + * 鏄撳疂鏀粯閿欒璇︽儏 */ private String errorMsg; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/LoanWithHoldLog.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/LoanWithHoldLog.java index 6a79282d7..65e594307 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/LoanWithHoldLog.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/LoanWithHoldLog.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 代扣回调日志 + * 浠f墸鍥炶皟鏃ュ織 * */ @Entity @@ -20,62 +20,62 @@ public class LoanWithHoldLog implements MongoEntity { private static final long serialVersionUID = 1L; /** - * 编号 + * 缂栧彿 */ private String id; /** - * 商户编号 + * 鍟嗘埛缂栧彿 */ private String merchantno; /** - * 还款请求号 + * 杩樻璇锋眰鍙� */ private String requestno; /** - * 易宝流水号 + * 鏄撳疂娴佹按鍙� */ private String yborderid; /** - * 扣款状态 + * 鎵f鐘舵�� */ private String status; /** - * 扣款金额 + * 鎵f閲戦 */ private String amount; /** - * 卡前六位 + * 鍗″墠鍏綅 */ private String cardtop; /** - * 卡后四位 + * 鍗″悗鍥涗綅 */ private String cardlast; /** - * 银行编码 + * 閾惰缂栫爜 */ private String bankcode; /** - * 错误编码 + * 閿欒缂栫爜 */ private String errorcode; /** - * 错误信息 + * 閿欒淇℃伅 */ private String errormsg; /** - * 订单创建时间 + * 璁㈠崟鍒涘缓鏃堕棿 */ private Date addTime; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/ManagementCompany.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/ManagementCompany.java index 2629843e5..e5c500337 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/ManagementCompany.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/ManagementCompany.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 物业公司信息 + * 鐗╀笟鍏徃淇℃伅 */ @Entity @Table(name = "fangjia.management_company") @@ -20,10 +20,10 @@ public class ManagementCompany implements MongoEntity { private String id; private String name; - private String level; // 资质等级 - private String companyType; // 注册类型 - private List projects; // 在管项目 - private String honor; // 荣誉 + private String level; // 璧勮川绛夌骇 + private String companyType; // 娉ㄥ唽绫诲瀷 + private List projects; // 鍦ㄧ椤圭洰 + private String honor; // 鑽h獕 @Id @GeneratedValue diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/MappingUrl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/MappingUrl.java index 14d58691b..a969e82dd 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/MappingUrl.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/MappingUrl.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - *url映射表 + *url鏄犲皠琛� */ @Entity @Table(name = "fangjia.mapping_url") diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Messenger.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Messenger.java index ae30d6c07..1680fd9bd 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Messenger.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Messenger.java @@ -9,7 +9,7 @@ import javax.persistence.Table; import java.util.*; /** - *url映射表 + *url鏄犲皠琛� */ @javax.persistence.Entity @Table(name = "fangjia.messenger") @@ -23,7 +23,7 @@ public class Messenger implements MongoEntity { private List receivers; private List readers; /** - * 0: 未读 1:已读 2:忽略 + * 0: 鏈 1锛氬凡璇� 2锛氬拷鐣� */ private int status; private Date createTime; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Metro.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Metro.java index 959e5b9bf..7a3fa8394 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Metro.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Metro.java @@ -23,7 +23,7 @@ public class Metro implements MongoEntity { private String subName; private Long lng; private Long lat; - private Integer sequence;// 站点显示顺序,从小到大 + private Integer sequence;// 绔欑偣鏄剧ず椤哄簭锛屼粠灏忓埌澶� @Id @GeneratedValue diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/MetroLine.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/MetroLine.java index a1db7cbfa..b74d5d652 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/MetroLine.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/MetroLine.java @@ -16,7 +16,7 @@ public class MetroLine implements MongoEntity { private String id; private String city; private String name; - private Integer sequence;// 线路显示顺序,从小到大 + private Integer sequence;// 绾胯矾鏄剧ず椤哄簭锛屼粠灏忓埌澶� @Id @GeneratedValue diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/MortgageInfo.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/MortgageInfo.java index cddaf7ec9..523ea706d 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/MortgageInfo.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/MortgageInfo.java @@ -16,19 +16,19 @@ public class MortgageInfo implements MongoEntity { private static final long serialVersionUID = -5492231659545511142L; private String id; - private String city;// 城市 - private String region;//区域 - private String originalAddress;//原始地址 - private Double area;//面积 - private String origin;//来源 - private String originalDistrictName;//原始小区名称 - private String matchCity;//匹配城市 - private String matchRegion;//匹配区域 - private String matchDistrict;//匹配小区 - private Integer avgPrice;//均价 - private String estateType;//物业类型 - private Date time;//项目时间 - private Date creatTime;//创建时间 + private String city;// 鍩庡競 + private String region;//鍖哄煙 + private String originalAddress;//鍘熷鍦板潃 + private Double area;//闈㈢Н + private String origin;//鏉ユ簮 + private String originalDistrictName;//鍘熷灏忓尯鍚嶇О + private String matchCity;//鍖归厤鍩庡競 + private String matchRegion;//鍖归厤鍖哄煙 + private String matchDistrict;//鍖归厤灏忓尯 + private Integer avgPrice;//鍧囦环 + private String estateType;//鐗╀笟绫诲瀷 + private Date time;//椤圭洰鏃堕棿 + private Date creatTime;//鍒涘缓鏃堕棿 @Id diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/NetworkPrice.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/NetworkPrice.java index 335fc9048..f03aa9ba8 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/NetworkPrice.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/NetworkPrice.java @@ -19,23 +19,23 @@ public class NetworkPrice implements MongoEntity { */ private static final long serialVersionUID = -7214259622146847276L; private String id; - private String city;// 城市 - private String region;//区域 - private String name;//小区名称 - private String sid;//小区编号 - private String distId;//小区库中自动增涨的id - private Integer avgPrice;//价格 - private Double credit;//价格可信度 + private String city;// 鍩庡競 + private String region;//鍖哄煙 + private String name;//灏忓尯鍚嶇О + private String sid;//灏忓尯缂栧彿 + private String distId;//灏忓尯搴撲腑鑷姩澧炴定鐨刬d + private Integer avgPrice;//浠锋牸 + private Double credit;//浠锋牸鍙俊搴� - private String yungujiaName;//云估价小区名称 - private Integer yungujiaDistrictId;//云估价小区编号 - private Integer yungujiaPrice;//云估价小区价格 + private String yungujiaName;//浜戜及浠峰皬鍖哄悕绉� + private Integer yungujiaDistrictId;//浜戜及浠峰皬鍖虹紪鍙� + private Integer yungujiaPrice;//浜戜及浠峰皬鍖轰环鏍� - private String fangguguName;//房估估小区名称 - private Integer fangguguDistrictId;//房估估小区编号 - private Integer fangguguPrice;//房估估小区价格 + private String fangguguName;//鎴夸及浼板皬鍖哄悕绉� + private Integer fangguguDistrictId;//鎴夸及浼板皬鍖虹紪鍙� + private Integer fangguguPrice;//鎴夸及浼板皬鍖轰环鏍� - private Integer peopleMark;//1:人工操作 + private Integer peopleMark;//1:浜哄伐鎿嶄綔 private Date cDate; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/NetworkPriceTask.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/NetworkPriceTask.java index cb77bbd18..4a9826c93 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/NetworkPriceTask.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/NetworkPriceTask.java @@ -21,7 +21,7 @@ public class NetworkPriceTask implements MongoEntity{ private String id; private String city; - private String rid;//对应district_network_price表中的id + private String rid;//瀵瑰簲district_network_price琛ㄤ腑鐨刬d private Integer fangguguDistId; private Integer yungujiaDistId; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/NewsInfo.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/NewsInfo.java index 4aca5f4ac..c7e132567 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/NewsInfo.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/NewsInfo.java @@ -25,11 +25,11 @@ public class NewsInfo implements MongoEntity{ private String name; /** - * 类型 + * 绫诲瀷 */ private String category; /** - * 房源描述 (正文) + * 鎴挎簮鎻忚堪 (姝f枃) */ private String description; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/NoHouseDistrict.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/NoHouseDistrict.java index 1fb26f2c8..309cfe901 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/NoHouseDistrict.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/NoHouseDistrict.java @@ -20,13 +20,13 @@ public class NoHouseDistrict implements MongoEntity{ */ private static final long serialVersionUID = -6765839679665715647L; private String id; - private String category;//类型(sell, rent, shop_sell, shop_rent, office_sell, office_rent) + private String category;//绫诲瀷(sell, rent, shop_sell, shop_rent, office_sell, office_rent) private String city; private String region; - private String name;//小区,商铺,写字楼名称 - private String source;//来源(安硕,房价网) - private Integer level;//抓取优先级 - private Integer crawlCount;//抓取次数 + private String name;//灏忓尯锛屽晢閾猴紝鍐欏瓧妤煎悕绉� + private String source;//鏉ユ簮(瀹夌锛屾埧浠风綉) + private Integer level;//鎶撳彇浼樺厛绾� + private Integer crawlCount;//鎶撳彇娆℃暟 private Date creationDate; private Date modificationDate; private Date selectHouseDate; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/NoLatlngDistrict.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/NoLatlngDistrict.java index eb444a013..df5507136 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/NoLatlngDistrict.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/NoLatlngDistrict.java @@ -26,9 +26,9 @@ public class NoLatlngDistrict implements MongoEntity{ private String category; private String name; private String address; - private Integer status;//记录状态 0:初始化 1:成功 + private Integer status;//璁板綍鐘舵�� 0锛氬垵濮嬪寲 1锛氭垚鍔� private Date creationDate; - private Integer processStatus;//处理状态 0:未处理 1:已处理 + private Integer processStatus;//澶勭悊鐘舵�� 0:鏈鐞� 1锛氬凡澶勭悊 @Id @GeneratedValue diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/OpenUriLog.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/OpenUriLog.java index 2a50662f0..4f9837841 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/OpenUriLog.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/OpenUriLog.java @@ -15,16 +15,16 @@ import java.util.List; public class OpenUriLog implements MongoEntity { private String id; - private String userId;//用户id - private String userName;//用户名称 + private String userId;//鐢ㄦ埛id + private String userName;//鐢ㄦ埛鍚嶇О private Integer code;//code - private Integer successTime;// 成功次数 - private Integer defeatTime;//错误次数 - private Integer totalTime;//总次数 - private Date statisticalDate;//统计日期 - private String requestUri;//访问url - private String ip;//用户ip - private Long time;//访问次数 + private Integer successTime;// 鎴愬姛娆℃暟 + private Integer defeatTime;//閿欒娆℃暟 + private Integer totalTime;//鎬绘鏁� + private Date statisticalDate;//缁熻鏃ユ湡 + private String requestUri;//璁块棶url + private String ip;//鐢ㄦ埛ip + private Long time;//璁块棶娆℃暟 private String msg; private Integer dataStatus; private Object parameterMap; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/OperationLog.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/OperationLog.java index 279ca367e..1d2eff10e 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/OperationLog.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/OperationLog.java @@ -8,7 +8,7 @@ import java.util.Date; /** * @author wenyan - * seaweed 操作日志记录表 + * seaweed 鎿嶄綔鏃ュ織璁板綍琛� */ @Entity @Table(name = "fangjia.operation_log") diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/PaphEvaluate.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/PaphEvaluate.java index 7d747280d..a78c863f8 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/PaphEvaluate.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/PaphEvaluate.java @@ -6,9 +6,9 @@ import javax.persistence.*; import java.util.Date; /** - * 平安普惠估价接口,估价实体 + * 骞冲畨鏅儬浼颁环鎺ュ彛锛屼及浠峰疄浣� * - * @author 王文艳 + * @author 鐜嬫枃鑹� * @create 2016-11-14 **/ @Entity @@ -57,8 +57,8 @@ public class PaphEvaluate implements MongoEntity { /** - * 0:未处理 - * 1: + * 0锛氭湭澶勭悊 + * 1锛� */ private int status; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/PdsRatio.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/PdsRatio.java index a311dfad6..f338ed847 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/PdsRatio.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/PdsRatio.java @@ -3,7 +3,7 @@ package com.fangjia.dal.mongo.model; /** * @author hubingliang - * pds相关 + * pds鐩稿叧 */ public class PdsRatio{ @@ -35,14 +35,14 @@ public class PdsRatio{ private Double busMin; private Double trafficScale; - private Double densityScale;//小区密度权重 - private Double densityMax;//小区密度max值 - private Double densityMin;//小区密度min值 - private Double densityRadius;//小区密度取值半径范围 - private Double quoteA;//发布量A值 - private Double quoteB;//发布量B值 + private Double densityScale;//灏忓尯瀵嗗害鏉冮噸 + private Double densityMax;//灏忓尯瀵嗗害max鍊� + private Double densityMin;//灏忓尯瀵嗗害min鍊� + private Double densityRadius;//灏忓尯瀵嗗害鍙栧�煎崐寰勮寖鍥� + private Double quoteA;//鍙戝竷閲廇鍊� + private Double quoteB;//鍙戝竷閲廈鍊� - private Double priceStabilityScale;//价格波动指数权重 + private Double priceStabilityScale;//浠锋牸娉㈠姩鎸囨暟鏉冮噸 public String getId() { return id; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/PriceJiucuo.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/PriceJiucuo.java index 14d20919a..cbe3130de 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/PriceJiucuo.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/PriceJiucuo.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 价格纠错 + * 浠锋牸绾犻敊 */ @Entity @Table(name = "fangjia.price_jiucuo") @@ -20,13 +20,13 @@ public class PriceJiucuo implements MongoEntity { private String id; private String cat; - private int status; // 0:初始状态 + private int status; // 0锛氬垵濮嬬姸鎬� private String city; private String region; private String block; private String districtName; - private Integer curAvgPrice; // 公寓、二手房均价 - private Integer curVillaPrice; // 别墅均价 + private Integer curAvgPrice; // 鍏瘬銆佷簩鎵嬫埧鍧囦环 + private Integer curVillaPrice; // 鍒鍧囦环 private String priceLev; private Integer expPrice; private String uid; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/PricePredict.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/PricePredict.java index 087153754..86c5c3efd 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/PricePredict.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/PricePredict.java @@ -12,7 +12,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 均价预测表 + * 鍧囦环棰勬祴琛� */ @Entity @Table(name = "fangjia.price_predict") diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/PricePredictFactor.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/PricePredictFactor.java index 97ca976a7..09e862449 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/PricePredictFactor.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/PricePredictFactor.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 价格预测影响因素表 + * 浠锋牸棰勬祴褰卞搷鍥犵礌琛� * @author gaojuan * */ diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/PriceSubscribe.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/PriceSubscribe.java index 10720eb0b..d561aa24b 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/PriceSubscribe.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/PriceSubscribe.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 房价变动订阅实体类 + * 鎴夸环鍙樺姩璁㈤槄瀹炰綋绫� * * @author yukai * diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/PropertyRegisterInfo.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/PropertyRegisterInfo.java index f61f0f759..4af02fbaa 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/PropertyRegisterInfo.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/PropertyRegisterInfo.java @@ -8,7 +8,7 @@ import java.util.Date; import java.util.List; /** - * 登记注册信息 + * 鐧昏娉ㄥ唽淇℃伅 * Created by wenyan on 2015/3/19. */ @Entity @@ -22,15 +22,15 @@ public class PropertyRegisterInfo implements MongoEntity { private String propertyAddress; private String propertyNumber; /** - * 任务处理状态 - * 1:待处理 - * 2:处理中 - * 3:处理失败 - * 4:成功处理 + * 浠诲姟澶勭悊鐘舵�� + * 1:寰呭鐞� + * 2:澶勭悊涓� + * 3:澶勭悊澶辫触 + * 4锛氭垚鍔熷鐞� */ private int status; /** - * 任务处理描述 + * 浠诲姟澶勭悊鎻忚堪 */ private String msg; @@ -39,48 +39,48 @@ public class PropertyRegisterInfo implements MongoEntity { private String unitNumber; private Double size; private Double undergroundSize; - private Integer maxFloor;//总楼层 + private Integer maxFloor;//鎬绘ゼ灞� private Integer floor; - private String propertyType;//房屋类型 + private String propertyType;//鎴垮眿绫诲瀷 private String buildingStructure; private String finishBuildTime; - private String landNo;//地号 + private String landNo;//鍦板彿 private Date beginUseDate; private Date endUseDate; - private String rightFrom;//使用权来源 + private String rightFrom;//浣跨敤鏉冩潵婧� private String permittedPurpose; private Double totalUsedSize; private Double totalSize; - private String obligee;//权利人 - private String coparcener;//共有人以及情况 + private String obligee;//鏉冨埄浜� + private String coparcener;//鍏辨湁浜轰互鍙婃儏鍐� private String address; private String acceptedDate; private String checkDate; private String propertyRemark; /** - * 其他信息 - * rightType:权利种类 - * loadAmount:债权金额 - * address:房屋坐落 - * certificateNo:权证或证明号 - * setDate:设定日期 - * checkDate:核准日期 - * endDate: 结束日期 - * acceptDate:受理日期 - * obligee :他项权利人 - * remark:备注 + * 鍏朵粬淇℃伅 + * rightType:鏉冨埄绉嶇被 + * loadAmount:鍊烘潈閲戦 + * address:鎴垮眿鍧愯惤 + * certificateNo:鏉冭瘉鎴栬瘉鏄庡彿 + * setDate:璁惧畾鏃ユ湡 + * checkDate:鏍稿噯鏃ユ湡 + * endDate: 缁撴潫鏃ユ湡 + * acceptDate:鍙楃悊鏃ユ湡 + * obligee :浠栭」鏉冨埄浜� + * remark:澶囨敞 */ private List othersInfo; private String receiptNo; - private String registrationSmallCategory;//登记小类 + private String registrationSmallCategory;//鐧昏灏忕被 private String proposer; - private String handAddress;//坐落 + private String handAddress;//鍧愯惤 private String userName; private Date createDate; private Date mDate; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/PropertyStatsIndex.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/PropertyStatsIndex.java index 923e94247..d3ebdac78 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/PropertyStatsIndex.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/PropertyStatsIndex.java @@ -6,7 +6,7 @@ import javax.persistence.*; import java.util.Date; /** - * 价格指数 + * 浠锋牸鎸囨暟 */ @Entity @Table(name = "fangjia_stat.property_stats_index") diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Recommend.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Recommend.java index 38658956a..ae5715e75 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Recommend.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Recommend.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * “看过...还看过”的推荐 + * 鈥滅湅杩�...杩樼湅杩団�濈殑鎺ㄨ崘 * * @author yukai * diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/RegTimeAndEvaTime.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/RegTimeAndEvaTime.java index 1c2dba04b..06a197abd 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/RegTimeAndEvaTime.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/RegTimeAndEvaTime.java @@ -16,8 +16,8 @@ public class RegTimeAndEvaTime implements MongoEntity { private static final long serialVersionUID = -5492231659545511142L; private String id; - private Integer evaluationTime;// 估价次数 - private Integer registerTime;//注册人数 + private Integer evaluationTime;// 浼颁环娆℃暟 + private Integer registerTime;//娉ㄥ唽浜烘暟 private Date createdDate; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/RegionBlock.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/RegionBlock.java index ef6ea400b..c43b5ed47 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/RegionBlock.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/RegionBlock.java @@ -36,8 +36,8 @@ public class RegionBlock implements MongoEntity { private Long lng2; private Long lat2; - private Integer mapId; // 对应flash的mapId - private Integer sequence;// 显示顺序,从小到大 + private Integer mapId; // 瀵瑰簲flash鐨刴apId + private Integer sequence;// 鏄剧ず椤哄簭锛屼粠灏忓埌澶� private Integer show; private List pattern; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/RegionMigrate.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/RegionMigrate.java index 17bfac7ec..3c1f4dae0 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/RegionMigrate.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/RegionMigrate.java @@ -5,7 +5,7 @@ import com.fangjia.dal.MongoEntity; import javax.persistence.*; /** - * @author 王文艳 + * @author 鐜嬫枃鑹� * @create 2016-11-10 **/ @Entity diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/RegionSellStat.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/RegionSellStat.java index dbfc87660..a6586f1d6 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/RegionSellStat.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/RegionSellStat.java @@ -20,20 +20,20 @@ public class RegionSellStat implements MongoEntity{ private static final long serialVersionUID = -5086091895406164026L; private String id; - /**城市*/ + /**鍩庡競*/ private String city; - /**区域*/ + /**鍖哄煙*/ private String region; - /**均价*/ + /**鍧囦环*/ private Integer avgPrice; - /**均价对应的时间(月份)*/ + /**鍧囦环瀵瑰簲鐨勬椂闂达紙鏈堜唤锛�*/ private Integer date; - /**数据更新时间*/ + /**鏁版嵁鏇存柊鏃堕棿*/ private Date updateDate; - /**均价月涨幅*/ + /**鍧囦环鏈堟定骞�*/ private Double mom; - /**均价年涨幅*/ + /**鍧囦环骞存定骞�*/ private Double yoy; @Id diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/RegionStat.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/RegionStat.java index c1808e8fa..40687fae1 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/RegionStat.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/RegionStat.java @@ -24,8 +24,8 @@ public class RegionStat implements MongoEntity { private int avgPrice; private int markup; private int weekendMarkup; - private double credit; // 可信度 - private double coverage; // 小区覆盖率 + private double credit; // 鍙俊搴� + private double coverage; // 灏忓尯瑕嗙洊鐜� private int calcValue; @Id diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/RegionStatRank.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/RegionStatRank.java index 49ef8da99..6810a50cf 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/RegionStatRank.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/RegionStatRank.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 区域板块挂牌均价排名 + * 鍖哄煙鏉垮潡鎸傜墝鍧囦环鎺掑悕 */ @Entity @Table(name = "fangjia.region_stat_rank") @@ -22,9 +22,9 @@ public class RegionStatRank implements MongoEntity { private String city; private String region; private String block; - private Date statDate; // 统计日期(如统计12月份,统计日期为月初,如:2012-12-01) + private Date statDate; // 缁熻鏃ユ湡(濡傜粺璁�12鏈堜唤锛岀粺璁℃棩鏈熶负鏈堝垵锛屽锛�2012-12-01) private Date creationDate; - private int rank; // 区域或板块的均价排名 + private int rank; // 鍖哄煙鎴栨澘鍧楃殑鍧囦环鎺掑悕 @Id @GeneratedValue diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/RegionStatTrend.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/RegionStatTrend.java index 7c3259c75..120a5d2e2 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/RegionStatTrend.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/RegionStatTrend.java @@ -10,9 +10,9 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 城市区域均价 + * 鍩庡競鍖哄煙鍧囦环 * @author yinjihuan - * @date 2016年9月1日 + * @date 2016骞�9鏈�1鏃� * */ @Entity @@ -24,16 +24,16 @@ public class RegionStatTrend implements MongoEntity { private String city; private String region; /** - * 时间 + * 鏃堕棿 */ private Integer date; private Integer avgPrice; /** - * 环比涨幅(单位%) + * 鐜瘮娑ㄥ箙(鍗曚綅%) */ private Double mom; /** - * 月涨价(单位元 + * 鏈堟定浠凤紙鍗曚綅鍏� */ private Double yoy; private Date updatedDate; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/RegionTradeStat.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/RegionTradeStat.java index c82ae655d..18032bd34 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/RegionTradeStat.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/RegionTradeStat.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 记录区域板块成交均价及均价排名 + * 璁板綍鍖哄煙鏉垮潡鎴愪氦鍧囦环鍙婂潎浠锋帓鍚� */ @Entity @Table(name = "fangjia.region_trade_stat") @@ -22,11 +22,11 @@ public class RegionTradeStat implements MongoEntity { private String city; private String region; private String block; - private Date statDate; // 统计日期(如统计12月份,统计日期为月初,如:2012-12-01) + private Date statDate; // 缁熻鏃ユ湡(濡傜粺璁�12鏈堜唤锛岀粺璁℃棩鏈熶负鏈堝垵锛屽锛�2012-12-01) private Date creationDate; - private int avgPrice; // 均价 - private int markup; // 月涨跌幅 - private int rank; // 成交均价排名 + private int avgPrice; // 鍧囦环 + private int markup; // 鏈堟定璺屽箙 + private int rank; // 鎴愪氦鍧囦环鎺掑悕 @Id @GeneratedValue diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/ReportSplit.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/ReportSplit.java index 0ea47e63f..00ab1bf18 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/ReportSplit.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/ReportSplit.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 报告拆分实体类 + * 鎶ュ憡鎷嗗垎瀹炰綋绫� */ @Entity @Table(name = "fangjia.report_split") @@ -20,14 +20,14 @@ public class ReportSplit implements MongoEntity { private String id; private String evaluationId; private String city; - private int type; // 购买内容 - private String typeDesc; // 购买内容描述 - private int status; // 0:初始状态;1:付款完成 - private double totalFee; // 花费 - private String bank; // 付款银行 - private String cardType; // 付款卡种类 - private String tradeNo; // 支付宝交易号 - private Date payDate; // 付款日期 + private int type; // 璐拱鍐呭 + private String typeDesc; // 璐拱鍐呭鎻忚堪 + private int status; // 0:鍒濆鐘舵��;1:浠樻瀹屾垚 + private double totalFee; // 鑺辫垂 + private String bank; // 浠樻閾惰 + private String cardType; // 浠樻鍗$绫� + private String tradeNo; // 鏀粯瀹濅氦鏄撳彿 + private Date payDate; // 浠樻鏃ユ湡 private String uid; private String sid; private String ip; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/ReportTaste.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/ReportTaste.java index 40d4b7e8f..e8b9e9de6 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/ReportTaste.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/ReportTaste.java @@ -13,7 +13,7 @@ import com.fangjia.dal.MongoEntity; /** * - * 房调报告免费体验 + * 鎴胯皟鎶ュ憡鍏嶈垂浣撻獙 * * @author yukai * @@ -25,15 +25,15 @@ public class ReportTaste implements MongoEntity { private String id; private String reportId; - private int status; // 0:初始状态;1:通过审核,等待报告发送;2:报告已发送 - private String identity; // 用户角色 - private String identityDes; // 其他角色的描述 - private String priceLev; // 价格合理性 - private Integer priceExpected; // 预期价格 + private int status; // 0锛氬垵濮嬬姸鎬侊紱1锛氶�氳繃瀹℃牳锛岀瓑寰呮姤鍛婂彂閫侊紱2锛氭姤鍛婂凡鍙戦�� + private String identity; // 鐢ㄦ埛瑙掕壊 + private String identityDes; // 鍏朵粬瑙掕壊鐨勬弿杩� + private String priceLev; // 浠锋牸鍚堢悊鎬� + private Integer priceExpected; // 棰勬湡浠锋牸 private String housePriceDes; // - private Integer housePrice; // 对房子的预期价格 - private List wonder; // 想了解的内容 - private String suggestion; // 建议 + private Integer housePrice; // 瀵规埧瀛愮殑棰勬湡浠锋牸 + private List wonder; // 鎯充簡瑙g殑鍐呭 + private String suggestion; // 寤鸿 private String userEmail; private String userName; private String userMobile; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/SchoolRelateDistrict.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/SchoolRelateDistrict.java index 8398633c9..eaec25dc5 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/SchoolRelateDistrict.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/SchoolRelateDistrict.java @@ -30,7 +30,7 @@ public class SchoolRelateDistrict implements MongoEntity { private int relateRentCount; /** - * { "浦东_汇佳苑" : { "rent" : 7, "sell" : 44 }, "浦东_寿光小区" : { "rent" : 1, + * { "娴︿笢_姹囦匠鑻�" : { "rent" : 7, "sell" : 44 }, "娴︿笢_瀵垮厜灏忓尯" : { "rent" : 1, * "sell" :19 } } */ private Map> relateDistricts; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/SearchWordsAnalytics.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/SearchWordsAnalytics.java index 4da3508a6..01096d431 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/SearchWordsAnalytics.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/SearchWordsAnalytics.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 搜索词分析 + * 鎼滅储璇嶅垎鏋� * @author user * */ diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/SixSellMountLevel.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/SixSellMountLevel.java index 9b3c76e88..e32d3d479 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/SixSellMountLevel.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/SixSellMountLevel.java @@ -22,9 +22,9 @@ public class SixSellMountLevel implements MongoEntity { private String name; private int sixSellMount=0; private int sixQuoteMount=0; - private int sixSellCityLevel;//六个月成交量排名 + private int sixSellCityLevel;//鍏釜鏈堟垚浜ら噺鎺掑悕 private int sixSellCitySize;// - private int sixQuoteCityLevel;//六个月挂牌量排名 + private int sixQuoteCityLevel;//鍏釜鏈堟寕鐗岄噺鎺掑悕 private int sixQuoteCitySize; private Integer date; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/SmsCode.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/SmsCode.java index 37a794b0f..d5d9244f9 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/SmsCode.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/SmsCode.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 手机验证码 + * 鎵嬫満楠岃瘉鐮� */ @Entity @Table(name = "fangjia.sms_code") diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/SnapData.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/SnapData.java index 0fc2366f0..8e1d8129e 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/SnapData.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/SnapData.java @@ -32,7 +32,7 @@ public class SnapData implements MongoEntity { public static final String DATE_KEY_ROOM = "room"; public static final String DATE_KEY_HALL = "hall"; - public static final String DATE_KEY_LAT = "lat";// 经纬度字段 + public static final String DATE_KEY_LAT = "lat";// 缁忕含搴﹀瓧娈� public static final String DATE_KEY_LNG = "lng"; public static final String SNAP_CAT_HOUSE = "house"; @@ -44,11 +44,11 @@ public class SnapData implements MongoEntity { public static final String SNAP_CAT_SEARCHWORD_V2 = "searchword_v2"; private String id; - private String uid; // 用户UID - private String category; // 对象类别 - private Date creationDate; // 创建日期 - private Date modificationDate; // 修改日期 - private List> data; // 数据 + private String uid; // 鐢ㄦ埛UID + private String category; // 瀵硅薄绫诲埆 + private Date creationDate; // 鍒涘缓鏃ユ湡 + private Date modificationDate; // 淇敼鏃ユ湡 + private List> data; // 鏁版嵁 @Id @GeneratedValue diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/StatsIndex.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/StatsIndex.java index d117a1bf6..d1f88c119 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/StatsIndex.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/StatsIndex.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 价格指数 + * 浠锋牸鎸囨暟 */ @Entity @Table(name = "fangjia_stat.stats_index") diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Task.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Task.java index d39c933cf..ca333fa5c 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Task.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Task.java @@ -12,7 +12,7 @@ import com.fangjia.dal.MongoEntity; import com.mongodb.BasicDBObject; /** - * 任务模型 + * 浠诲姟妯″瀷 */ @Entity @Table(name = "fangjia.task") @@ -23,30 +23,30 @@ public class Task implements MongoEntity { private String address; private String keywords; /** - * 任务参数 + * 浠诲姟鍙傛暟 */ private BasicDBObject taskParams; /** - * 任务结果 + * 浠诲姟缁撴灉 */ private BasicDBObject taskResult; /** - * 任务处理状态 - * -1:被删除 - * 1:待处理 - * 2:待审核 - * 3:处理失败 - * 4:处理完成 + * 浠诲姟澶勭悊鐘舵�� + * -1:琚垹闄� + * 1:寰呭鐞� + * 2:寰呭鏍� + * 3:澶勭悊澶辫触 + * 4:澶勭悊瀹屾垚 */ private int status; public enum TaskStatusEnum { - DELETE(-1),//已删除 - INIT(1), // 等待处理 - DOING(2), // 处理中 - ERR(3), // 处理错误 - SUC(4); // 处理完成 + DELETE(-1),//宸插垹闄� + INIT(1), // 绛夊緟澶勭悊 + DOING(2), // 澶勭悊涓� + ERR(3), // 澶勭悊閿欒 + SUC(4); // 澶勭悊瀹屾垚 private final int value; @@ -60,15 +60,15 @@ public class Task implements MongoEntity { } /** - * 任务类型的枚举 + * 浠诲姟绫诲瀷鐨勬灇涓� * @author shibb * */ public enum writeEnum{ - ALL("全部"), - WRITE("已填写"), - UNWRITE("未填写"); + ALL("鍏ㄩ儴"), + WRITE("宸插~鍐�"), + UNWRITE("鏈~鍐�"); private final String value; @@ -82,7 +82,7 @@ public class Task implements MongoEntity { } /** - * 任务处理描述 + * 浠诲姟澶勭悊鎻忚堪 */ private String msg; @@ -94,18 +94,18 @@ public class Task implements MongoEntity { private String userName; /** - * 取值:"房产登记" "小区调查" + * 鍙栧�硷細"鎴夸骇鐧昏" "灏忓尯璋冩煡" */ private String taskType; /** - * 任务类型的枚举 + * 浠诲姟绫诲瀷鐨勬灇涓� * @author shibb * */ public enum taskTypeEnum{ - PROPERTY("小区调查"), - REGISTRATION("房产登记"); + PROPERTY("灏忓尯璋冩煡"), + REGISTRATION("鎴夸骇鐧昏"); private final String value; @@ -119,23 +119,23 @@ public class Task implements MongoEntity { } /** - * 任务报酬 + * 浠诲姟鎶ラ叕 */ private Double reward; /** - * 任务截止时间 + * 浠诲姟鎴鏃堕棿 */ private Date deadline; private String verifier; /** - * 状态描述 + * 鐘舵�佹弿杩� */ private String statusDescription; /** - * 截止日期剩余天数 + * 鎴鏃ユ湡鍓╀綑澶╂暟 */ private String leaveDays; @@ -290,11 +290,11 @@ public class Task implements MongoEntity { public String getStatusDescription() { switch (this.getStatus()) { case 1: - return "待处理"; + return "寰呭鐞�"; case 2: - return "待审核"; + return "寰呭鏍�"; case 4: - return "处理完成"; + return "澶勭悊瀹屾垚"; default: return null; } diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/TaskResult.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/TaskResult.java index 755b4819c..ed4d49592 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/TaskResult.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/TaskResult.java @@ -12,7 +12,7 @@ import com.fangjia.dal.MongoEntity; import com.mongodb.BasicDBObject; /** - * 任务处理结果 + * 浠诲姟澶勭悊缁撴灉 */ @Entity @Table(name = "fangjia.task_result") @@ -31,9 +31,9 @@ public class TaskResult implements MongoEntity { private BasicDBObject result; public enum StatusEnum { - UNVERIFY(1), // 待审核 - UNADOPT(2), // 未采纳 - ADOPT(3); // 已采纳 + UNVERIFY(1), // 寰呭鏍� + UNADOPT(2), // 鏈噰绾� + ADOPT(3); // 宸查噰绾� private final int value; @@ -47,23 +47,23 @@ public class TaskResult implements MongoEntity { } /** - * 用户提交结果审核状态 1:待处理 2:未采纳 3:被采纳 + * 鐢ㄦ埛鎻愪氦缁撴灉瀹℃牳鐘舵�� 1:寰呭鐞� 2:鏈噰绾� 3:琚噰绾� */ private int status; /** - * 用户提交结果审核结果描述 + * 鐢ㄦ埛鎻愪氦缁撴灉瀹℃牳缁撴灉鎻忚堪 * * @return */ private String desc; /** - * 报酬 + * 鎶ラ叕 */ private Float reward; /** - * 审核人 + * 瀹℃牳浜� */ private String verifier; @@ -168,11 +168,11 @@ public class TaskResult implements MongoEntity { public String getStatusDestription() { switch (this.getStatus()) { case 1: - return "待审核"; + return "寰呭鏍�"; case 2: - return "未采纳"; + return "鏈噰绾�"; case 3: - return "已采纳"; + return "宸查噰绾�"; default: return null; } diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Township.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Township.java index 7f302cd8c..f5d27e108 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Township.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Township.java @@ -59,12 +59,12 @@ public class Township implements MongoEntity { @JSONField(name = "street_pinyin") private String streetPinyin; - //民政部区域和统计局区域是否相同,1为相同,0为不同,为了解决2条的问题 + //姘戞斂閮ㄥ尯鍩熷拰缁熻灞�鍖哄煙鏄惁鐩稿悓锛�1涓虹浉鍚岋紝0涓轰笉鍚岋紝涓轰簡瑙e喅2鏉$殑闂 @JSONField(name = "district_diff") private Integer districtDiff; - //乡镇街道是否输出 0:不输出 1:输出 + //涔¢晣琛楅亾鏄惁杈撳嚭 0锛氫笉杈撳嚭 1锛氳緭鍑� @JSONField(name = "street_output") private Integer streetOutput; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/UnRelation.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/UnRelation.java index 2e326fa1f..f95a0fe3c 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/UnRelation.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/UnRelation.java @@ -9,7 +9,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 小区关联 + * 灏忓尯鍏宠仈 * @author user * */ diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/UserClick.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/UserClick.java index e92bb1f68..673967bee 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/UserClick.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/UserClick.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 用户 顶踩信息 + * 鐢ㄦ埛 椤惰俯淇℃伅 * @author _tyler * */ @@ -24,22 +24,22 @@ public class UserClick implements MongoEntity{ private String id; /** - * 用户Id + * 鐢ㄦ埛Id */ private String uid; /** - * 相关ID(文章/二手房,租房 房源Id) + * 鐩稿叧ID(鏂囩珷/浜屾墜鎴匡紝绉熸埧 鎴挎簮Id) */ private String relateId; /** - * 类别:tip,trample + * 绫诲埆锛歵ip,trample */ private String category; /** - * 用户 评论(“顶”或“踩”) 文章的时间 + * 鐢ㄦ埛 璇勮锛堚�滈《鈥濇垨鈥滆俯鈥濓級 鏂囩珷鐨勬椂闂� */ private Date creationDate; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/UserFeeling.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/UserFeeling.java index dcbb22623..7c8cac62a 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/UserFeeling.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/UserFeeling.java @@ -9,7 +9,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 用户 顶踩信息 + * 鐢ㄦ埛 椤惰俯淇℃伅 * @author _tyler * */ @@ -22,29 +22,29 @@ public class UserFeeling implements MongoEntity{ private String id; /** - * 类别:Sell,Rent,News + * 绫诲埆锛歋ell,Rent,News */ private String category; /** - * 城市信息:如:上海 - * 新闻类别无城市 + * 鍩庡競淇℃伅:濡�:涓婃捣 + * 鏂伴椈绫诲埆鏃犲煄甯� */ private String city; /** - * 相关ID + * 鐩稿叧ID */ private String relateId; /** - * 用户 顶 文章次数 + * 鐢ㄦ埛 椤� 鏂囩珷娆℃暟 */ private Integer like; /** - * 用户 踩 文章次数 + * 鐢ㄦ埛 韪� 鏂囩珷娆℃暟 */ private Integer unlike; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/UserHouse.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/UserHouse.java index d5dffadc7..da4010f97 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/UserHouse.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/UserHouse.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 用户 房源ID表 + * 鐢ㄦ埛 鎴挎簮ID琛� * * @author _tyler * diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/VillageIdentify.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/VillageIdentify.java index 05ac1f766..a4942aca5 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/VillageIdentify.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/VillageIdentify.java @@ -45,22 +45,22 @@ public class VillageIdentify implements MongoEntity { @JSONField(name = "type_name") private String typeName; @JSONField(name = "verify_flag") - private String verifyFlag;//涉农标识 + private String verifyFlag;//娑夊啘鏍囪瘑 @JSONField(name = "addr_verify") - private String addrVerify;//地址是否有效信息 + private String addrVerify;//鍦板潃鏄惁鏈夋晥淇℃伅 @JSONField(name = "county_level_city") - private String countyLevelCity;//是否为县级市 + private String countyLevelCity;//鏄惁涓哄幙绾у競 @JSONField(name = "administrative_towns") - private String administrativeTowns;//是否市辖建制镇 + private String administrativeTowns;//鏄惁甯傝緰寤哄埗闀� @JSONField(name = "county_gov") - private String countyGov;//是否为县政府 + private String countyGov;//鏄惁涓哄幙鏀垮簻 @JSONField(name = "dev_district") - private String devDistrict;//是否为开发区 + private String devDistrict;//鏄惁涓哄紑鍙戝尯 @JSONField(name = "dev_district_name") - private String devDistrictName;//开发区 + private String devDistrictName;//寮�鍙戝尯 @JSONField(name = "dev_level") - private String devLevel;//开发区等级 + private String devLevel;//寮�鍙戝尯绛夌骇 @JSONField(name = "lat") @@ -71,7 +71,7 @@ public class VillageIdentify implements MongoEntity { @JSONField(name = "addr_area") private String addrArea; - //测试时使用 + //娴嬭瘯鏃朵娇鐢� @JSONField(name = "split_committee") private String splitCommittee; @JSONField(name = "split_street") @@ -83,11 +83,11 @@ public class VillageIdentify implements MongoEntity { @JSONField(name = "dev") private String dev; @JSONField(name = "community_source") - private String communitySource;//居委来源 + private String communitySource;//灞呭鏉ユ簮 @JSONField(name = "match_poi_name") - private String matchPoiName;//匹配poi的名称 + private String matchPoiName;//鍖归厤poi鐨勫悕绉� @JSONField(name = "region_info") - private String regionInfo;//围栏区域信息 + private String regionInfo;//鍥存爮鍖哄煙淇℃伅 @JSONField(name = "tjj_district_name") private String tjjDistrictName; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/WeixinTaskUser.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/WeixinTaskUser.java index ba35572d5..de4f0e0cf 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/WeixinTaskUser.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/WeixinTaskUser.java @@ -29,7 +29,7 @@ public class WeixinTaskUser implements MongoEntity{ private String city; - private String belongAgentCompany;//所属中介公司 + private String belongAgentCompany;//鎵�灞炰腑浠嬪叕鍙� private Date dateCreated; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/YdDealPrice.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/YdDealPrice.java index e1506fdbf..c8280791c 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/YdDealPrice.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/YdDealPrice.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 友达均价实体类 + * 鍙嬭揪鍧囦环瀹炰綋绫� * @author xuhe * */ @@ -24,27 +24,27 @@ public class YdDealPrice implements MongoEntity { private String id; /** - * 城市 + * 鍩庡競 */ private String city; /** - * 区域 + * 鍖哄煙 */ private String region; /** - * 小区名 + * 灏忓尯鍚� */ private String districtName; /** - * 均价时间 + * 鍧囦环鏃堕棿 */ private Date weekend; /** - * 均价 + * 鍧囦环 */ private int price; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/AdLog.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/AdLog.java index ff48e5ac1..a89f31ba9 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/AdLog.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/AdLog.java @@ -19,31 +19,31 @@ public class AdLog implements MongoEntity{ //id private String id; - //广告位id + //骞垮憡浣峣d private String adId; - //广告位id + //骞垮憡浣峣d private String userId; - //设备类型(PC、mobile) + //璁惧绫诲瀷(PC銆乵obile) private String model; - //页面(前端页面固定) + //椤甸潰(鍓嶇椤甸潰鍥哄畾) private String source; - //广告位位置 + //骞垮憡浣嶄綅缃� private String location; - //广告位类型(不同页面的类型不相同) + //骞垮憡浣嶇被鍨�(涓嶅悓椤甸潰鐨勭被鍨嬩笉鐩稿悓) private String type; - //链接 + //閾炬帴 private String url; - //广告商 + //骞垮憡鍟� private String advertiser; - //创建时(点击时间) + //鍒涘缓鏃�(鐐瑰嚮鏃堕棿) private Date createDate; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/Advertisement.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/Advertisement.java index 4ea2cf6c3..4108bb1ec 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/Advertisement.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/Advertisement.java @@ -16,61 +16,61 @@ public class Advertisement implements MongoEntity{ private static final long serialVersionUID = 1L; - //广告位id + //骞垮憡浣峣d private String id; - //设备类型(PC、mobile) + //璁惧绫诲瀷(PC銆乵obile) private String model; - //页面(前端页面固定) 1-评估页,2-评估结果页,3-资讯列表页,4-资讯详情页 + //椤甸潰(鍓嶇椤甸潰鍥哄畾) 1-璇勪及椤�,2-璇勪及缁撴灉椤�,3-璧勮鍒楄〃椤�,4-璧勮璇︽儏椤� private int source; - //广告位位置 1-右侧竖排广告位,2-横排轮播位 + //骞垮憡浣嶄綅缃� 1-鍙充晶绔栨帓骞垮憡浣�,2-妯帓杞挱浣� private int location; - //广告位类型(不同页面的类型不相同) 1-单独位,2-轮播位 + //骞垮憡浣嶇被鍨�(涓嶅悓椤甸潰鐨勭被鍨嬩笉鐩稿悓) 1-鍗曠嫭浣�,2-杞挱浣� private int type; - //排序(页面、位置、类型的广告排序不能相同) + //鎺掑簭锛堥〉闈€�佷綅缃�佺被鍨嬬殑骞垮憡鎺掑簭涓嶈兘鐩稿悓锛� private int sort; - //图片 + //鍥剧墖 private String image; - //图片高 + //鍥剧墖楂� private int height; - //图片宽 + //鍥剧墖瀹� private int width; - //链接 + //閾炬帴 private String url; - //广告商 + //骞垮憡鍟� private String advertiser; - //标题(广告类型为轮播位时无此字段) + //鏍囬锛堝箍鍛婄被鍨嬩负杞挱浣嶆椂鏃犳瀛楁锛� private String title; - //副标题(广告类型为轮播位时无此字段) + //鍓爣棰橈紙骞垮憡绫诲瀷涓鸿疆鎾綅鏃舵棤姝ゅ瓧娈碉級 private String subTitle; - //开始时间 + //寮�濮嬫椂闂� private Date startDate; - //结束时间 + //缁撴潫鏃堕棿 private Date endDate; - //状态(0 - 开启、1 - 关闭) + //鐘舵�侊紙0 - 寮�鍚��1 - 鍏抽棴锛� private Integer status; - //是否有效(删除)(0 - 有效、1 - 无效) + //鏄惁鏈夋晥锛堝垹闄わ級锛�0 - 鏈夋晥銆�1 - 鏃犳晥锛� private int isValid; - //创建时间 + //鍒涘缓鏃堕棿 private Date createDate; - //修改时间 + //淇敼鏃堕棿 private Date updateDate; @Id diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/ApiMonitorTask.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/ApiMonitorTask.java index 5c609bd78..51e169824 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/ApiMonitorTask.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/ApiMonitorTask.java @@ -7,7 +7,7 @@ import java.util.Date; import java.util.Map; /** - * @author 王文艳 + * @author 鐜嬫枃鑹� * @create 2016-10-27 **/ @Entity diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/ApiSearchKeyword.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/ApiSearchKeyword.java index b4869095f..711783088 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/ApiSearchKeyword.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/ApiSearchKeyword.java @@ -7,10 +7,10 @@ import java.util.Date; import java.util.List; /** - * API 搜索接口,搜索关键字处理对象 + * API 鎼滅储鎺ュ彛锛屾悳绱㈠叧閿瓧澶勭悊瀵硅薄 * Created by wenyan on 2015/3/30. * @see com.fangjia.dal.mongo.tool.model.OpenLog - * 处理脚本:PingAnSearchAnalysis + * 澶勭悊鑴氭湰锛歅ingAnSearchAnalysis */ @Entity @Table(name = "fangjia.api_search_keyword") diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/AuctionRecord.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/AuctionRecord.java index 633444d22..b97e8e0bf 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/AuctionRecord.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/AuctionRecord.java @@ -7,7 +7,7 @@ import java.util.Date; /** * @author wenyan - * 淘宝竞拍记录表 + * 娣樺疂绔炴媿璁板綍琛� * @see https://sf.taobao.com/sf_item/545096332373.htm */ @Entity diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/AveragerConfig.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/AveragerConfig.java index 479982b03..14409f0ed 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/AveragerConfig.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/AveragerConfig.java @@ -22,27 +22,27 @@ public class AveragerConfig implements MongoEntity { private String city; private String region; private String name; - private Integer status; // 0-正常 1-禁用 + private Integer status; // 0-姝e父 1-绂佺敤 private Boolean caseRegion; - private Integer sampleFetchCount; // 样本获取数量 - private Integer sampleMaxValue; // 样本允许最大值 - private Integer sampleMinValue; // 样本允许最小值 - private Integer ownTypeLimit; // 自身样本计算的最低要求 - private Integer sampleQueueStart; // 样本队列取值区间最小值 - private Integer sampleQueueEnd; // 样本队列取值区间最大值 - private Map timeWeights; //时间权重设置{key:value}时间:值 - private Map siteWeights; //来源权重设置{key:value}根域名:值 - private Map siteFactors; //来源值涨跌设置{key:value}根域名:值 + private Integer sampleFetchCount; // 鏍锋湰鑾峰彇鏁伴噺 + private Integer sampleMaxValue; // 鏍锋湰鍏佽鏈�澶у�� + private Integer sampleMinValue; // 鏍锋湰鍏佽鏈�灏忓�� + private Integer ownTypeLimit; // 鑷韩鏍锋湰璁$畻鐨勬渶浣庤姹� + private Integer sampleQueueStart; // 鏍锋湰闃熷垪鍙栧�煎尯闂存渶灏忓�� + private Integer sampleQueueEnd; // 鏍锋湰闃熷垪鍙栧�煎尯闂存渶澶у�� + private Map timeWeights; //鏃堕棿鏉冮噸璁剧疆{key:value}鏃堕棿:鍊� + private Map siteWeights; //鏉ユ簮鏉冮噸璁剧疆{key:value}鏍瑰煙鍚�:鍊� + private Map siteFactors; //鏉ユ簮鍊兼定璺岃缃畕key:value}鏍瑰煙鍚�:鍊� - private Integer aroundRadius; // 周边最大半径 - private Integer aroundLimit; // 周边小区最大数量限制 - private Double hardPercent; //强制价格调整系数 - private Integer valueCluType; //类簇的用值类型 0-默认 1-中位数 2-最大值 3-最小值 - private Integer aroundDiffMinPercent; //样本与周边对比的最小相差比例 - private Integer aroundDiffMaxPercent; //样本与周边对比的最大相差比例 - private Integer guidingPriceExpirationDay; //指导价过期天数 - private Integer uncomforableSampleDay; //样本换算需要间隔时间 - private Integer masterIntervenePercent; //主小区影响从小区可信度衰减比例 + private Integer aroundRadius; // 鍛ㄨ竟鏈�澶у崐寰� + private Integer aroundLimit; // 鍛ㄨ竟灏忓尯鏈�澶ф暟閲忛檺鍒� + private Double hardPercent; //寮哄埗浠锋牸璋冩暣绯绘暟 + private Integer valueCluType; //绫荤皣鐨勭敤鍊肩被鍨� 0-榛樿 1-涓綅鏁� 2-鏈�澶у�� 3-鏈�灏忓�� + private Integer aroundDiffMinPercent; //鏍锋湰涓庡懆杈瑰姣旂殑鏈�灏忕浉宸瘮渚� + private Integer aroundDiffMaxPercent; //鏍锋湰涓庡懆杈瑰姣旂殑鏈�澶х浉宸瘮渚� + private Integer guidingPriceExpirationDay; //鎸囧浠疯繃鏈熷ぉ鏁� + private Integer uncomforableSampleDay; //鏍锋湰鎹㈢畻闇�瑕侀棿闅旀椂闂� + private Integer masterIntervenePercent; //涓诲皬鍖哄奖鍝嶄粠灏忓尯鍙俊搴﹁“鍑忔瘮渚� private Date modificationDate; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/AveragerQualityReport.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/AveragerQualityReport.java index 6ee78ec32..8986f1bbc 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/AveragerQualityReport.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/AveragerQualityReport.java @@ -20,12 +20,12 @@ public class AveragerQualityReport implements MongoEntity { private Integer districtCount; private Double avgCredit; - //样本数量 + //鏍锋湰鏁伴噺 private Integer sampleCount1; private Integer sampleCount2; private Integer sampleCount3; - //无法计算 + //鏃犳硶璁$畻 private Integer noneCount; private Double noneCredit; private Integer noneTest; @@ -33,7 +33,7 @@ public class AveragerQualityReport implements MongoEntity { private Integer noneAccu2; private Integer noneAccu3; - //指导价计算 + //鎸囧浠疯绠� private Integer guidingCount; private Double guidingCredit; private Integer guidingTest; @@ -41,7 +41,7 @@ public class AveragerQualityReport implements MongoEntity { private Integer guidingAccu2; private Integer guidingAccu3; - //自身样本 + //鑷韩鏍锋湰 private Integer ownCount; private Double ownCredit; private Integer ownTest; @@ -49,7 +49,7 @@ public class AveragerQualityReport implements MongoEntity { private Integer ownAccu2; private Integer ownAccu3; - //第三方计算 + //绗笁鏂硅绠� private Integer thirdCount; private Double thirdCredit; private Integer thirdTest; @@ -57,7 +57,7 @@ public class AveragerQualityReport implements MongoEntity { private Integer thirdAccu2; private Integer thirdAccu3; - //成交价计算 + //鎴愪氦浠疯绠� private Integer dealCount; private Double dealCredit; private Integer dealTest; @@ -65,7 +65,7 @@ public class AveragerQualityReport implements MongoEntity { private Integer dealAccu2; private Integer dealAccu3; - //周边计算 + //鍛ㄨ竟璁$畻 private Integer aroundCount; private Double aroundCredit; private Integer aroundTest; @@ -73,7 +73,7 @@ public class AveragerQualityReport implements MongoEntity { private Integer aroundAccu2; private Integer aroundAccu3; - //推算 + //鎺ㄧ畻 private Integer deriCount; private Double deriCredit; private Integer deriTest; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/BidRecord.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/BidRecord.java index 437884c11..63977fc16 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/BidRecord.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/BidRecord.java @@ -8,7 +8,7 @@ import java.util.List; /** * @author wenyan - * 淘宝拍卖物存储对象 + * 娣樺疂鎷嶅崠鐗╁瓨鍌ㄥ璞� * @see https://sf.taobao.com/sf_item/545096332373.htm */ @Entity @@ -18,89 +18,89 @@ public class BidRecord implements MongoEntity { private String id; /** - * 标的物原始网页url + * 鏍囩殑鐗╁師濮嬬綉椤祏rl */ private String source; private String city; /** - * 标的物标题 + * 鏍囩殑鐗╂爣棰� */ private String title; /** - * 拍卖物ID + * 鎷嶅崠鐗㊣D */ private String bidId; /** - * 起拍价 + * 璧锋媿浠� */ private Double startingPrice; /** - * 加价幅度 + * 鍔犱环骞呭害 */ private Integer markUp; /** - * 保证金 + * 淇濊瘉閲� */ private Double assure; /** - * 竞价周期 + * 绔炰环鍛ㄦ湡 */ private String biddingCycle; /** - * 评估价 + * 璇勪及浠� */ private Double evaluatingPrice; /** - * 延迟周期 + * 寤惰繜鍛ㄦ湡 */ private String delayPeriod; /** - * 资产处置单位 + * 璧勪骇澶勭疆鍗曚綅 */ private String disposalUnit; /** - * 联系咨询方式 + * 鑱旂郴鍜ㄨ鏂瑰紡 */ private String contact; /** - * 拍卖开始时间 + * 鎷嶅崠寮�濮嬫椂闂� */ private Date noticeDetailStartTime; /** - * 拍卖结束时间 + * 鎷嶅崠缁撴潫鏃堕棿 */ private Date noticeDetailEndTime; /** - * 标的物介绍 + * 鏍囩殑鐗╀粙缁� */ private String desc; /** - * 标的物介绍图片 + * 鏍囩殑鐗╀粙缁嶅浘鐗� */ private List imgSrcs; /** - * 拍卖次数 + * 鎷嶅崠娆℃暟 */ private Integer auctionSerial; private Integer auctionRecordCount; /** - *报名数 + *鎶ュ悕鏁� **/ private Integer applyerCount; /** - *设置提醒人数 + *璁剧疆鎻愰啋浜烘暟 **/ private Integer reminderCount; /** - * 围观人数 + * 鍥磋浜烘暟 **/ private Integer lookerCount; /** - * 延时次数 + * 寤舵椂娆℃暟 **/ private Integer delayCount; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/BkoffUsers.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/BkoffUsers.java index cb0f05124..5c128a27f 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/BkoffUsers.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/BkoffUsers.java @@ -24,14 +24,14 @@ public class BkoffUsers implements MongoEntity { private String username; private String password; private String realName; - private Number status;// 状态是否正常,0,正常,1,不正常(不可用); + private Number status;// 鐘舵�佹槸鍚︽甯革紝0锛屾甯革紝1锛屼笉姝e父锛堜笉鍙敤锛夛紱 private Date creationDate; private Date modificationDate; - private List citys; // 开通城市 + private List citys; // 寮�閫氬煄甯� private String email; private String cellnumber; - private Number supportFjtTask;//有没有对房价通人工处理流程自动分配任务的权限 0:没有 1:有 - private Number supportInquiryTask;//有没有对房价通人工询价流程自动分配任务的权限 0:没有 1:有 + private Number supportFjtTask;//鏈夋病鏈夊鎴夸环閫氫汉宸ュ鐞嗘祦绋嬭嚜鍔ㄥ垎閰嶄换鍔$殑鏉冮檺 0锛氭病鏈� 1锛氭湁 + private Number supportInquiryTask;//鏈夋病鏈夊鎴夸环閫氫汉宸ヨ浠锋祦绋嬭嚜鍔ㄥ垎閰嶄换鍔$殑鏉冮檺 0锛氭病鏈� 1锛氭湁 @Id @GeneratedValue diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/CalcCommand.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/CalcCommand.java index 10ff57f6d..1b5aaefc9 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/CalcCommand.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/CalcCommand.java @@ -15,29 +15,29 @@ import com.fangjia.dal.MongoEntity; public class CalcCommand implements MongoEntity { public static enum FangjiaCalcEnum { /** - * 住宅二手房均价 + * 浣忓畢浜屾墜鎴垮潎浠� */ - SELL("sell", "住宅二手房均价"), + SELL("sell", "浣忓畢浜屾墜鎴垮潎浠�"), /** - * 住宅租金均价 + * 浣忓畢绉熼噾鍧囦环 */ - RENT("rent", "住宅租金均价"), + RENT("rent", "浣忓畢绉熼噾鍧囦环"), /** - * 商铺出租均价 + * 鍟嗛摵鍑虹鍧囦环 */ - SHOP_RENT("shop_rent", "商铺出租均价"), + SHOP_RENT("shop_rent", "鍟嗛摵鍑虹鍧囦环"), /** - * 商铺出售均价 + * 鍟嗛摵鍑哄敭鍧囦环 */ - SHOP_SELL("shop_sell", "商铺出售均价"), + SHOP_SELL("shop_sell", "鍟嗛摵鍑哄敭鍧囦环"), /** - * 写字楼出租均价 + * 鍐欏瓧妤煎嚭绉熷潎浠� */ - OFFICE_RENT("office_rent", "写字楼出租均价"), + OFFICE_RENT("office_rent", "鍐欏瓧妤煎嚭绉熷潎浠�"), /** - * 写字楼出售均价 + * 鍐欏瓧妤煎嚭鍞潎浠� */ - OFFICE_SELL("office_sell", "写字楼出售均价"), ; + OFFICE_SELL("office_sell", "鍐欏瓧妤煎嚭鍞潎浠�"), ; private final String category; private final String display; @@ -74,12 +74,12 @@ public class CalcCommand implements MongoEntity { private String name; private String block; private String category; // district,shop,office - private String estateType; // 物业类型(普通住宅、别墅、商住楼) - private Integer houseType;//房型 - private Integer calcType; // 计算类型(0-指定日期计算 1-全部重算 2-全部补充重算) - private Date calcDate; // 计算日期 - private int status; // 命令状态 0-初始状态 1-处理中 2-处理完成 3-处理异常 - private int priority; // 优先级 0-普通(后台人员操作) 1-中(每周算均价的标志) 2-高(预留标志位,特殊情况下使用) + private String estateType; // 鐗╀笟绫诲瀷锛堟櫘閫氫綇瀹呫�佸埆澧呫�佸晢浣忔ゼ锛� + private Integer houseType;//鎴垮瀷 + private Integer calcType; // 璁$畻绫诲瀷(0-鎸囧畾鏃ユ湡璁$畻 1-鍏ㄩ儴閲嶇畻 2-鍏ㄩ儴琛ュ厖閲嶇畻) + private Date calcDate; // 璁$畻鏃ユ湡 + private int status; // 鍛戒护鐘舵�� 0-鍒濆鐘舵�� 1-澶勭悊涓� 2-澶勭悊瀹屾垚 3-澶勭悊寮傚父 + private int priority; // 浼樺厛绾� 0-鏅��(鍚庡彴浜哄憳鎿嶄綔) 1-涓紙姣忓懆绠楀潎浠风殑鏍囧織锛� 2-楂橈紙棰勭暀鏍囧織浣嶏紝鐗规畩鎯呭喌涓嬩娇鐢級 private Date creationDate; private Date startDate; private Date endDate; @@ -87,10 +87,10 @@ public class CalcCommand implements MongoEntity { private String ip; private int calcName; public enum StatusEnum { - INIT(0), // 等待处理 - DOING(1), // 处理中 - SUC(2), // 处理完成 - ERR(3); // 处理错误 + INIT(0), // 绛夊緟澶勭悊 + DOING(1), // 澶勭悊涓� + SUC(2), // 澶勭悊瀹屾垚 + ERR(3); // 澶勭悊閿欒 private final int status; @@ -104,9 +104,9 @@ public class CalcCommand implements MongoEntity { } public enum CalcTypeEnum { - CALC_BY_DATE(0), // 计算本周 - CALC_ALL_WEEKS(1), // 全部重算 - CALC_GAP_WEEKS(2); // 全部补充重算 + CALC_BY_DATE(0), // 璁$畻鏈懆 + CALC_ALL_WEEKS(1), // 鍏ㄩ儴閲嶇畻 + CALC_GAP_WEEKS(2); // 鍏ㄩ儴琛ュ厖閲嶇畻 private final int calcType; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/CalcConfig.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/CalcConfig.java index 5158be5ab..9a5b39269 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/CalcConfig.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/CalcConfig.java @@ -24,11 +24,11 @@ public class CalcConfig implements MongoEntity { private String region; private String name; private String category; //sell - private String estateType; // 物业类型(普通住宅、别墅、商住楼) - private Date statStartDate; // 理论上开始计算价格日期 - private Date calcStartDate; // 均价数据中的开始时间 - private Date sampleStartDate; // 可供计算的样本开始时间 - private Integer logicalMaxValue; // 合理的最大最小值 + private String estateType; // 鐗╀笟绫诲瀷锛堟櫘閫氫綇瀹呫�佸埆澧呫�佸晢浣忔ゼ锛� + private Date statStartDate; // 鐞嗚涓婂紑濮嬭绠椾环鏍兼棩鏈� + private Date calcStartDate; // 鍧囦环鏁版嵁涓殑寮�濮嬫椂闂� + private Date sampleStartDate; // 鍙緵璁$畻鐨勬牱鏈紑濮嬫椂闂� + private Integer logicalMaxValue; // 鍚堢悊鐨勬渶澶ф渶灏忓�� private Integer logicalMinValue; private Date creationDate; private Map markMap = new HashMap(0); diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/CityInfo.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/CityInfo.java index 0270b441c..4d9e27fc9 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/CityInfo.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/CityInfo.java @@ -19,32 +19,32 @@ public class CityInfo implements MongoEntity { private String cityId; public String city; public String cityLevel; - private Integer officialPopulation; // 官方城市人口数 - private Integer districtAvgPopulation; // 小区平均人口数 - private Integer predictionDistrictCount; // 预估小区总数 - public Integer existingDistrictCount; // 现有小区总数 - public Integer existingOfficeCount; // 现有小区总数 - public Integer existingShopCount; // 现有小区总数 - private Double districtCoverage; // 小区覆盖率 - private Integer avgPrice; // 城市均价 - private Integer evaluationCount; // 本周估价数 - private Integer priceHighCount; // 均价偏高的反馈数 - private Integer priceLowCount; // 均价偏低的反馈数 - private Integer priceTotalCount; // 均价总体反馈数 - private Double priceToEva; // 总体反馈率 反馈数/估价数 - private Double lowToHigh; // 反馈的偏低数/偏高数 - public Double priceCoverage; // 均价覆盖率 - private Double webAverage; // 小区网络均价准确率 - private Integer districtsHasLoudong; //有楼栋的小区数 - private Integer districtsHasFanghao; //有房号的小区数 + private Integer officialPopulation; // 瀹樻柟鍩庡競浜哄彛鏁� + private Integer districtAvgPopulation; // 灏忓尯骞冲潎浜哄彛鏁� + private Integer predictionDistrictCount; // 棰勪及灏忓尯鎬绘暟 + public Integer existingDistrictCount; // 鐜版湁灏忓尯鎬绘暟 + public Integer existingOfficeCount; // 鐜版湁灏忓尯鎬绘暟 + public Integer existingShopCount; // 鐜版湁灏忓尯鎬绘暟 + private Double districtCoverage; // 灏忓尯瑕嗙洊鐜� + private Integer avgPrice; // 鍩庡競鍧囦环 + private Integer evaluationCount; // 鏈懆浼颁环鏁� + private Integer priceHighCount; // 鍧囦环鍋忛珮鐨勫弽棣堟暟 + private Integer priceLowCount; // 鍧囦环鍋忎綆鐨勫弽棣堟暟 + private Integer priceTotalCount; // 鍧囦环鎬讳綋鍙嶉鏁� + private Double priceToEva; // 鎬讳綋鍙嶉鐜� 鍙嶉鏁�/浼颁环鏁� + private Double lowToHigh; // 鍙嶉鐨勫亸浣庢暟/鍋忛珮鏁� + public Double priceCoverage; // 鍧囦环瑕嗙洊鐜� + private Double webAverage; // 灏忓尯缃戠粶鍧囦环鍑嗙‘鐜� + private Integer districtsHasLoudong; //鏈夋ゼ鏍嬬殑灏忓尯鏁� + private Integer districtsHasFanghao; //鏈夋埧鍙风殑灏忓尯鏁� public Map districtDetail; private Map newDistrictDetail; private Map officeDetail; - private Map loudongDetail;//楼栋 - private Map houseLoudongDetail;//房号 + private Map loudongDetail;//妤兼爧 + private Map houseLoudongDetail;//鎴垮彿 private Map agencyDetail; private Map shopDetail; - private Double rate; // 每户人口系数 + private Double rate; // 姣忔埛浜哄彛绯绘暟 private Date weekend; private Date creationDate; private Double priceCreditGte80Coverage; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/DealCountStat.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/DealCountStat.java index c7985a607..5fb0fa798 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/DealCountStat.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/DealCountStat.java @@ -13,55 +13,55 @@ public class DealCountStat implements MongoEntity { private String id; private String city; /** - * 交易时间:年月 + * 浜ゆ槗鏃堕棿锛氬勾鏈� */ private Integer tradeMonth; /** - * 成交套数 + * 鎴愪氦濂楁暟 */ private Integer tradeCount; /** - * 成交套数同比 + * 鎴愪氦濂楁暟鍚屾瘮 */ private Double tradeCountYoy; /** - * 成交套数环比 + * 鎴愪氦濂楁暟鐜瘮 */ private Double tradeCountQoq; /** - * 成交面积(万平方米) + * 鎴愪氦闈㈢Н锛堜竾骞虫柟绫筹級 */ private Double tradeArea; /** - * 成交面积同比 + * 鎴愪氦闈㈢Н鍚屾瘮 */ private Double tradeAreaYoy; /** - * 成交面积环比 + * 鎴愪氦闈㈢Н鐜瘮 */ private Double tradeAreaQoq; /** - * 成交均价(元/平方米) + * 鎴愪氦鍧囦环锛堝厓/骞虫柟绫筹級 */ private Double tradeAvgPrice; /** - * 成交均价同比 + * 鎴愪氦鍧囦环鍚屾瘮 */ private Double tradeAvgPriceYoy; /** - * 成交均价环比 + * 鎴愪氦鍧囦环鐜瘮 */ private Double tradeAvgPriceQoq; /** - * 类型 + * 绫诲瀷 */ private String type; /** - * 来源 + * 鏉ユ簮 */ private String source; /** - * 创建时间 + * 鍒涘缓鏃堕棿 */ private Date createDate; @@ -204,23 +204,23 @@ public class DealCountStat implements MongoEntity { public enum DealCountType { /** - * 二手房 + * 浜屾墜鎴� */ OLD_HOUSE(1), /** - * 新房 + * 鏂版埧 */ NEW_HOUSE(2), /** - * 土地 + * 鍦熷湴 */ LAND(3), /** - * 办公 + * 鍔炲叕 */ OFFICE(4), /** - * 商业 + * 鍟嗕笟 */ BUSINESS(5); diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/DealPrice.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/DealPrice.java index a46cd7de0..200fb3c1f 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/DealPrice.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/DealPrice.java @@ -21,15 +21,15 @@ public class DealPrice implements MongoEntity { private Integer avgPrice; private String districtName; /** - * 楼栋号 + * 妤兼爧鍙� */ private String houseNumber; /** - * 单元号 + * 鍗曞厓鍙� */ private String unitNumber; /** - * 室号 + * 瀹ゅ彿 */ private String roomNumber; private String type; @@ -44,8 +44,8 @@ public class DealPrice implements MongoEntity { private Integer room; private Integer hall; private Integer toilet; - private Integer height;//总楼层 - private Integer floor;//当前楼层 + private Integer height;//鎬绘ゼ灞� + private Integer floor;//褰撳墠妤煎眰 private Long score; private String matchId; @@ -257,10 +257,10 @@ public class DealPrice implements MongoEntity { } public boolean sigleEquals (Object obj){ - if(!(obj instanceof DealPrice)){ //如果不是Person类型,直接返回false + if(!(obj instanceof DealPrice)){ //濡傛灉涓嶆槸Person绫诲瀷,鐩存帴杩斿洖false return false; } - DealPrice oHouse = (DealPrice)obj; //由于访问person特有的成员,需要把obj装换成person类. + DealPrice oHouse = (DealPrice)obj; //鐢变簬璁块棶person鐗规湁鐨勬垚鍛�,闇�瑕佹妸obj瑁呮崲鎴恜erson绫�. if(oHouse==null){ return false; } diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/DealPriceStat.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/DealPriceStat.java index c29246e8a..e2012341e 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/DealPriceStat.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/DealPriceStat.java @@ -16,7 +16,7 @@ public class DealPriceStat implements MongoEntity { private String region; private String districtName; /** - * 交易时间:年月 + * 浜ゆ槗鏃堕棿锛氬勾鏈� */ private Integer tradeMonth; private Long avgPrice; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/DealSample.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/DealSample.java index 463b47bcd..a7054d765 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/DealSample.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/DealSample.java @@ -19,7 +19,7 @@ public class DealSample implements MongoEntity { private Integer floor; private Date caseDate; private String decoration; - private String direction;//朝向 + private String direction;//鏈濆悜 private Integer maxFloor; private Integer room; private Integer hall; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/DiKuai.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/DiKuai.java index faeffc1a4..f7dd0cb90 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/DiKuai.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/DiKuai.java @@ -13,45 +13,45 @@ import com.fangjia.dal.MongoEntity; @Table(name = "fangjia.dikuai_data") public class DiKuai implements MongoEntity { private String id; - private String did; //地块编号 - private String from; //来源 - private String pageUrl;//网页地址 - private Date createDate;//插入时间 - private String city; //城市 - private String region; //区域 - private String name; //地块名称 - private String location; //地块位置 - private String purpose; //规划用途 - private String level; //土地级别 - private String useLife;//使用年限 - private String range; //四至范围 - private Double area; //土地面积 - private Double buildLandArea;//建设用地面积 - private Double netLandArea;//净用地面积 - private Double plannArea;//规划建筑面积 - private Double generSignArea;//代征面积 - private String buildDensity;//建筑密度 - private String heightLimit;//限制高度 - private String volumeRate;//容积率 - private String greenRate;//绿化率 - private String greenSpaceRate;//绿地率 - private Double startPrice;//起始价 - private Double bond; //保证金 - private Double rateOfIncrease;//增价幅度 - private Double transactionPrice;//成交价 - private String startDate;//起始日期 - private String endDate;//截止日期 - private String dealDate;//成交日期 - private String competitiveUnit;//竞得单位 - private String assignmentForm;//出让形式 - private String commercialRate;//商业比率 - private String premiumRate;//溢价率 - private Double floorPrice;//楼面地价 - private String approvedUnit;//批准单位 - private String controlNumber;//电子监管号 - private String tradingPlace;//交易地点 - private String approvalNumber;//批准文号 - private String status; //成交状态 + private String did; //鍦板潡缂栧彿 + private String from; //鏉ユ簮 + private String pageUrl;//缃戦〉鍦板潃 + private Date createDate;//鎻掑叆鏃堕棿 + private String city; //鍩庡競 + private String region; //鍖哄煙 + private String name; //鍦板潡鍚嶇О + private String location; //鍦板潡浣嶇疆 + private String purpose; //瑙勫垝鐢ㄩ�� + private String level; //鍦熷湴绾у埆 + private String useLife;//浣跨敤骞撮檺 + private String range; //鍥涜嚦鑼冨洿 + private Double area; //鍦熷湴闈㈢Н + private Double buildLandArea;//寤鸿鐢ㄥ湴闈㈢Н + private Double netLandArea;//鍑�鐢ㄥ湴闈㈢Н + private Double plannArea;//瑙勫垝寤虹瓚闈㈢Н + private Double generSignArea;//浠e緛闈㈢Н + private String buildDensity;//寤虹瓚瀵嗗害 + private String heightLimit;//闄愬埗楂樺害 + private String volumeRate;//瀹圭Н鐜� + private String greenRate;//缁垮寲鐜� + private String greenSpaceRate;//缁垮湴鐜� + private Double startPrice;//璧峰浠� + private Double bond; //淇濊瘉閲� + private Double rateOfIncrease;//澧炰环骞呭害 + private Double transactionPrice;//鎴愪氦浠� + private String startDate;//璧峰鏃ユ湡 + private String endDate;//鎴鏃ユ湡 + private String dealDate;//鎴愪氦鏃ユ湡 + private String competitiveUnit;//绔炲緱鍗曚綅 + private String assignmentForm;//鍑鸿褰㈠紡 + private String commercialRate;//鍟嗕笟姣旂巼 + private String premiumRate;//婧环鐜� + private Double floorPrice;//妤奸潰鍦颁环 + private String approvedUnit;//鎵瑰噯鍗曚綅 + private String controlNumber;//鐢靛瓙鐩戠鍙� + private String tradingPlace;//浜ゆ槗鍦扮偣 + private String approvalNumber;//鎵瑰噯鏂囧彿 + private String status; //鎴愪氦鐘舵�� @Id @GeneratedValue diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/DistrictInfo.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/DistrictInfo.java index 4cda1ac02..bd67d2f3a 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/DistrictInfo.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/DistrictInfo.java @@ -20,16 +20,16 @@ public class DistrictInfo implements MongoEntity { private String region; private String block; private String name; - private Integer avgPrice; // 小区均价 - private Integer villaAvgPrice; // 别墅均价 - private Integer rentAvgPrice; // 小区租金均价(各户型均价的平均值) - private Integer villaRentAvgPrice; // 别墅租金均价(各户型均价的平均值) - private Integer buildingCount; // 楼栋数 - private Integer houseCount; // 户数 - private Integer livePecent; // 入住率 - private Integer allArea; // 占地面积 - private Integer buildArea; // 建筑面积 - private Double fieldCoverage; // 字段覆盖率 + private Integer avgPrice; // 灏忓尯鍧囦环 + private Integer villaAvgPrice; // 鍒鍧囦环 + private Integer rentAvgPrice; // 灏忓尯绉熼噾鍧囦环锛堝悇鎴峰瀷鍧囦环鐨勫钩鍧囧�硷級 + private Integer villaRentAvgPrice; // 鍒绉熼噾鍧囦环锛堝悇鎴峰瀷鍧囦环鐨勫钩鍧囧�硷級 + private Integer buildingCount; // 妤兼爧鏁� + private Integer houseCount; // 鎴锋暟 + private Integer livePecent; // 鍏ヤ綇鐜� + private Integer allArea; // 鍗犲湴闈㈢Н + private Integer buildArea; // 寤虹瓚闈㈢Н + private Double fieldCoverage; // 瀛楁瑕嗙洊鐜� private Date weekend; private Date creationDate; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/GuidingPrice.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/GuidingPrice.java index 00c5f2eeb..f52a14d34 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/GuidingPrice.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/GuidingPrice.java @@ -16,29 +16,29 @@ public class GuidingPrice implements MongoEntity { public static enum FangjiaGuidingPriceEnum { /** - * 住宅二手房均价 + * 浣忓畢浜屾墜鎴垮潎浠� */ - SELL("sell", "住宅二手房均价"), + SELL("sell", "浣忓畢浜屾墜鎴垮潎浠�"), /** - * 住宅租金均价 + * 浣忓畢绉熼噾鍧囦环 */ - RENT("rent", "住宅租金均价"), + RENT("rent", "浣忓畢绉熼噾鍧囦环"), /** - * 商铺出租均价 + * 鍟嗛摵鍑虹鍧囦环 */ - SHOP_RENT("shop_rent", "商铺出租均价"), + SHOP_RENT("shop_rent", "鍟嗛摵鍑虹鍧囦环"), /** - * 商铺出售均价 + * 鍟嗛摵鍑哄敭鍧囦环 */ - SHOP_SELL("shop_sell", "商铺出售均价"), + SHOP_SELL("shop_sell", "鍟嗛摵鍑哄敭鍧囦环"), /** - * 写字楼出租均价 + * 鍐欏瓧妤煎嚭绉熷潎浠� */ - OFFICE_RENT("office_rent", "写字楼出租均价"), + OFFICE_RENT("office_rent", "鍐欏瓧妤煎嚭绉熷潎浠�"), /** - * 写字楼出售均价 + * 鍐欏瓧妤煎嚭鍞潎浠� */ - OFFICE_SELL("office_sell", "写字楼出售均价"), ; + OFFICE_SELL("office_sell", "鍐欏瓧妤煎嚭鍞潎浠�"), ; private final String category; private final String display; @@ -67,19 +67,19 @@ public class GuidingPrice implements MongoEntity { } /** - * 价格指导,开发人工指导价格的编辑后台(fangjia-bkoff),具备按月份修改指导价格的功能 + * 浠锋牸鎸囧,寮�鍙戜汉宸ユ寚瀵间环鏍肩殑缂栬緫鍚庡彴(fangjia-bkoff)锛屽叿澶囨寜鏈堜唤淇敼鎸囧浠锋牸鐨勫姛鑳� */ private static final long serialVersionUID = 631353390713571557L; private String id; private String city; private String region; /*** - * district_sell 住宅售价 - * district_rent 住宅租金 - * office_sell 写字楼售价 - * office_rent 写字楼租金 - * shop_sell 商铺售价 - * shop_rent 商铺租金 + * district_sell 浣忓畢鍞环 + * district_rent 浣忓畢绉熼噾 + * office_sell 鍐欏瓧妤煎敭浠� + * office_rent 鍐欏瓧妤肩閲� + * shop_sell 鍟嗛摵鍞环 + * shop_rent 鍟嗛摵绉熼噾 */ private String cat; private String name; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/HouseAuction.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/HouseAuction.java index a34f0cb51..892b3ab9e 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/HouseAuction.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/HouseAuction.java @@ -10,7 +10,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 拍卖数据 + * 鎷嶅崠鏁版嵁 * @author user * */ diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/HouseCountStat.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/HouseCountStat.java index 8b865b28e..f7a3da091 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/HouseCountStat.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/HouseCountStat.java @@ -26,12 +26,12 @@ public class HouseCountStat implements MongoEntity{ private String cat; private Date statDate; private Date creationDate; - private Integer lessDistCount;//房源量少于10个的小区数 - private Integer distCount;//小区数量 - private Integer houseTotalCount;//城市房源总量 - private Integer matchHouseCount;//匹配成功的房源量 - private Integer roomCount;//房型数量 - private double lessPercent;//房源量少于10个的小区占比 + private Integer lessDistCount;//鎴挎簮閲忓皯浜�10涓殑灏忓尯鏁� + private Integer distCount;//灏忓尯鏁伴噺 + private Integer houseTotalCount;//鍩庡競鎴挎簮鎬婚噺 + private Integer matchHouseCount;//鍖归厤鎴愬姛鐨勬埧婧愰噺 + private Integer roomCount;//鎴垮瀷鏁伴噺 + private double lessPercent;//鎴挎簮閲忓皯浜�10涓殑灏忓尯鍗犳瘮 private Date weekend; private Integer total; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/HouseLoudong.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/HouseLoudong.java index d41b400ee..4e709a666 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/HouseLoudong.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/HouseLoudong.java @@ -31,13 +31,13 @@ public class HouseLoudong extends com.fangjia.dal.mongo.model.HouseLoudong{ String houseNum; String houseNumUnit; String roomNum; - int room=-1; //几室 - int hall=-1; //厅 - int toilet=-1; //卫 - String direction;//朝向 + int room=-1; //鍑犲 + int hall=-1; //鍘� + int toilet=-1; //鍗� + String direction;//鏈濆悜 private Date creationDate; private Date modificationDate; - String buildType; //建筑类型 + String buildType; //寤虹瓚绫诲瀷 double basementArea=-1; double gardenArea=-1; double outerArea=-1; @@ -56,55 +56,55 @@ public class HouseLoudong extends com.fangjia.dal.mongo.model.HouseLoudong{ String url; String lightingVentilation; /** - * 备注 + * 澶囨敞 */ String remark; /** - * 小区性质:限价房。经济适用房。。。 + * 灏忓尯鎬ц川锛氶檺浠锋埧銆傜粡娴庨�傜敤鎴裤�傘�傘�� */ String districtType; int status; int[] roomRt; /** - * 小区编号 + * 灏忓尯缂栧彿 */ private String districtNo; /** - * 小区id 数据库中没有,为了能关联查询到 + * 灏忓尯id 鏁版嵁搴撲腑娌℃湁锛屼负浜嗚兘鍏宠仈鏌ヨ鍒� */ private String districtId; /** - * seaweed中的小区名 + * seaweed涓殑灏忓尯鍚� */ private String nameInSeaweed; /** - * 得房率 + * 寰楁埧鐜� */ private Double constructionRatio; /** - * 设别设施 + * 璁惧埆璁炬柦 */ private String facility; /** - * 地址 + * 鍦板潃 */ private String address; /** - * 开盘单价 + * 寮�鐩樺崟浠� */ private Integer openAvgPrice; /** - * 开盘总价 + * 寮�鐩樻�讳环 */ private Integer openTotalPrice; /** - * 房号类型 + * 鎴垮彿绫诲瀷 */ private String houseNumType; /** - * 总楼层 + * 鎬绘ゼ灞� */ private Integer totalFloor; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/InquiryUsers.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/InquiryUsers.java index e9f4dfd4c..7afa0d621 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/InquiryUsers.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/InquiryUsers.java @@ -23,11 +23,11 @@ public class InquiryUsers implements MongoEntity{ private String name; - private Integer status;//0未选中,1选中 + private Integer status;//0鏈�変腑锛�1閫変腑 private Date creationDate; - private Integer visible;//0有效,1无效 + private Integer visible;//0鏈夋晥,1鏃犳晥 private Date modifyDate; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/Loudong.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/Loudong.java index ffb9f957f..7223cb8fe 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/Loudong.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/Loudong.java @@ -18,93 +18,93 @@ public class Loudong implements MongoEntity { private String id; private String city; - /**区域*/ + /**鍖哄煙*/ private String region; - /**小区名*/ + /**灏忓尯鍚�*/ private String name; - /**小区名别名*/ + /**灏忓尯鍚嶅埆鍚�*/ private List alias = Lists.newArrayList(); - /**楼栋号*/ + /**妤兼爧鍙�*/ private String houseNumber; - /**单元号,默认值为 1*/ + /**鍗曞厓鍙凤紝榛樿鍊间负 1*/ private String unitNumber; - /**楼栋的总楼层(这里指地上楼层数)*/ + /**妤兼爧鐨勬�绘ゼ灞傦紙杩欓噷鎸囧湴涓婃ゼ灞傛暟锛�*/ private int floors; - /**楼栋所在的小区地址*/ + /**妤兼爧鎵�鍦ㄧ殑灏忓尯鍦板潃*/ private String address; - /**地址别名,也可认为是备用地址*/ + /**鍦板潃鍒悕锛屼篃鍙涓烘槸澶囩敤鍦板潃*/ private List addressAlias; - /**建筑结构:钢混等*/ + /**寤虹瓚缁撴瀯锛氶挗娣风瓑*/ private String structure; - /**建筑年代*/ + /**寤虹瓚骞翠唬*/ private int buildYear; - /**数据来源*/ + /**鏁版嵁鏉ユ簮*/ private List from = Lists.newArrayList(); /** - * 面积 + * 闈㈢Н */ private List areas = Lists.newArrayList(); /** - * 楼栋用途:
- * 住宅、办公、商业金融、教育医疗卫生科研、文化娱乐体育、工业交通仓储、军事、其他
+ * 妤兼爧鐢ㄩ��锛�
+ * 浣忓畢銆佸姙鍏�佸晢涓氶噾铻嶃�佹暀鑲插尰鐤楀崼鐢熺鐮斻�佹枃鍖栧ū涔愪綋鑲层�佸伐涓氫氦閫氫粨鍌ㄣ�佸啗浜嬨�佸叾浠�
*/ private String usage; /** - * 楼栋类型:
- * 居民自检、廉租房、经济适用房、房改房(已购公房)、集资房、商住两用房、国有资产房、集体资产房、其他 + * 妤兼爧绫诲瀷锛�
+ * 灞呮皯鑷銆佸粔绉熸埧銆佺粡娴庨�傜敤鎴裤�佹埧鏀规埧锛堝凡璐叕鎴匡級銆侀泦璧勬埧銆佸晢浣忎袱鐢ㄦ埧銆佸浗鏈夎祫浜ф埧銆侀泦浣撹祫浜ф埧銆佸叾浠� */ private String type; /** - * 建筑类型(按楼层数划分):低层建筑(1-3)、中层建筑(4-6)、高层建筑(7-12)、超高层建筑(12-)、其他 + * 寤虹瓚绫诲瀷锛堟寜妤煎眰鏁板垝鍒嗭級锛氫綆灞傚缓绛戯紙1-3锛夈�佷腑灞傚缓绛戯紙4-6锛夈�侀珮灞傚缓绛戯紙7-12锛夈�佽秴楂樺眰寤虹瓚锛�12-锛夈�佸叾浠� */ private String floorType; /** - * 建筑性质:永久、临时、违章、危房 + * 寤虹瓚鎬ц川锛氭案涔呫�佷复鏃躲�佽繚绔犮�佸嵄鎴� */ private String archiNature; /** - * 电梯数 + * 鐢垫鏁� */ private Integer elevatorNumber; - /**腾讯地图坐标*/ + /**鑵捐鍦板浘鍧愭爣*/ private double latQQ; private double lngQQ; - /**百度地图坐标*/ + /**鐧惧害鍦板浘鍧愭爣*/ private double latBaidu; private double lngBaidu; - /**高德地图坐标*/ + /**楂樺痉鍦板浘鍧愭爣*/ private double latGaode; private double lngGaode; - /**数据状态*/ + /**鏁版嵁鐘舵��*/ private Integer status; - /**创建时间*/ + /**鍒涘缓鏃堕棿*/ private Date createDate; - /**修改时间*/ + /**淇敼鏃堕棿*/ private Date modifyDate; - /**户数*/ + /**鎴锋暟*/ private Integer households; - /**一梯几户的户*/ + /**涓�姊嚑鎴风殑鎴�*/ private Integer roomCount; - /** 总建筑面积 */ + /** 鎬诲缓绛戦潰绉� */ private Double totalAreas; - /** 开盘时间 */ + /** 寮�鐩樻椂闂� */ private Date openDate; - /**入住时间*/ + /**鍏ヤ綇鏃堕棿*/ private Date checkInDate; - /** 预售证 */ + /** 棰勫敭璇� */ private String preSellNo; - //备注 + //澶囨敞 private String remark; /** - * 小区编号 + * 灏忓尯缂栧彿 */ private String districtNo; /** - * seaweed中的小区名 + * seaweed涓殑灏忓尯鍚� */ private String nameInSeaweed; /** - * seaweed中的小区id + * seaweed涓殑灏忓尯id */ private String idInSeaweed; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/NewHouse.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/NewHouse.java index 442bc655d..9b187839b 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/NewHouse.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/NewHouse.java @@ -21,11 +21,11 @@ public class NewHouse implements MongoEntity { private Integer avgPrice; private Integer tradeDate; /** - * 历史成交数量 + * 鍘嗗彶鎴愪氦鏁伴噺 */ private Integer historyNumber; /** - * 历史成交面积 + * 鍘嗗彶鎴愪氦闈㈢Н */ private Integer historySize; private Integer notSaleNumber; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/OfficeInfo.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/OfficeInfo.java index 7ef30e32f..4a3702693 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/OfficeInfo.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/OfficeInfo.java @@ -20,11 +20,11 @@ public class OfficeInfo implements MongoEntity { private String region; private String block; private String name; - private Integer avgPrice; // 出售均价 - private Integer rentAvgPrice; // 出租均价 - private Integer buildArea; // 建筑面积 - private String bedKind; // 等级 - private Integer peopleCount; // 人数 + private Integer avgPrice; // 鍑哄敭鍧囦环 + private Integer rentAvgPrice; // 鍑虹鍧囦环 + private Integer buildArea; // 寤虹瓚闈㈢Н + private String bedKind; // 绛夌骇 + private Integer peopleCount; // 浜烘暟 private Date weekend; private Date creationDate; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/RegionInfo.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/RegionInfo.java index 053a70683..ebb28519b 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/RegionInfo.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/RegionInfo.java @@ -18,15 +18,15 @@ public class RegionInfo implements MongoEntity { private String regionId; private String city; private String region; - private Integer officialPopulation; // 官方区域人口数 - private Integer districtAvgPopulation; // 小区平均人口数 - private Integer predictionDistrictCount; // 预估小区总数 - private Integer existingDistrictCount; // 现有小区总数 - private Double districtCoverage; // 小区覆盖率 - private Integer avgPrice; // 区域均价 - private Double priceCoverage; // 均价覆盖率 - private Double webAverage; // 小区网络均价准确率 - private Integer houseCount; // 户数 + private Integer officialPopulation; // 瀹樻柟鍖哄煙浜哄彛鏁� + private Integer districtAvgPopulation; // 灏忓尯骞冲潎浜哄彛鏁� + private Integer predictionDistrictCount; // 棰勪及灏忓尯鎬绘暟 + private Integer existingDistrictCount; // 鐜版湁灏忓尯鎬绘暟 + private Double districtCoverage; // 灏忓尯瑕嗙洊鐜� + private Integer avgPrice; // 鍖哄煙鍧囦环 + private Double priceCoverage; // 鍧囦环瑕嗙洊鐜� + private Double webAverage; // 灏忓尯缃戠粶鍧囦环鍑嗙‘鐜� + private Integer houseCount; // 鎴锋暟 private Date weekend; private Date creationDate; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/SampleQualityReport.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/SampleQualityReport.java index 20d8a25f8..6940b4867 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/SampleQualityReport.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/SampleQualityReport.java @@ -16,25 +16,25 @@ public class SampleQualityReport implements MongoEntity { private Integer weekend; private Date creationDate; - //小区数量 + //灏忓尯鏁伴噺 private Integer districtCount; - //每月数量统计 + //姣忔湀鏁伴噺缁熻 private Integer monthCount1; private Integer monthCount2; private Integer monthCount3; - //季度 + //瀛e害 private Integer quarCount1; private Integer quarCount2; private Integer quarCount3; - //半年 + //鍗婂勾 private Integer halfCount1; private Integer halfCount2; private Integer halfCount3; - //一年 + //涓�骞� private Integer yearCount1; private Integer yearCount2; private Integer yearCount3; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/TestHouse.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/TestHouse.java index ee5657445..4bde1bf73 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/TestHouse.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/TestHouse.java @@ -67,10 +67,10 @@ public class TestHouse implements MongoEntity { private String keyword; private String partner; private String districtNameKey; - private Long bscore; // 房源基本分 + private Long bscore; // 鎴挎簮鍩烘湰鍒� private Long nscore; private int reason; - private Long lat;// 经纬度字段,以及最大最小经纬度字段 + private Long lat;// 缁忕含搴﹀瓧娈碉紝浠ュ強鏈�澶ф渶灏忕粡绾害瀛楁 private Long lng; private String cat; private Integer age; @@ -86,7 +86,7 @@ public class TestHouse implements MongoEntity { private String metro; private String school; /** - * 是否是地铁房 + * 鏄惁鏄湴閾佹埧 */ private Integer ifMetro; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/UserAgentStat.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/UserAgentStat.java index c881067cd..026ae7ebb 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/UserAgentStat.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/UserAgentStat.java @@ -5,7 +5,7 @@ import com.fangjia.dal.MongoEntity; import javax.persistence.*; /** - * User-Agent 统计数据实体 + * User-Agent 缁熻鏁版嵁瀹炰綋 * Created by wenyan on 2016/7/4. */ @Entity diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/WeixinMsg.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/WeixinMsg.java index 0d178afcc..5fac9b670 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/WeixinMsg.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/WeixinMsg.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 微信用户消息 + * 寰俊鐢ㄦ埛娑堟伅 */ @Entity @Table(name = "weixin.weixin_msg") @@ -20,17 +20,17 @@ public class WeixinMsg implements MongoEntity { private String id; - /** 原始信息里的数据 */ + /** 鍘熷淇℃伅閲岀殑鏁版嵁 */ private long msgId; - private String toUserName; // 开发者微信号 - private String fromUserName; // 发送方帐号(一个OpenID) - private String msgType; // 消息类型 - private String createTime; // 消息创建时间 (整型) + private String toUserName; // 寮�鍙戣�呭井淇″彿 + private String fromUserName; // 鍙戦�佹柟甯愬彿锛堜竴涓狾penID锛� + private String msgType; // 娑堟伅绫诲瀷 + private String createTime; // 娑堟伅鍒涘缓鏃堕棿 锛堟暣鍨嬶級 private String content; private String reply; - private int status; // 0:初始状态;1:已回复 - private Date creationDate; // 入库时间。createTime这是微信服务器发来的时间戳 + private int status; // 0锛氬垵濮嬬姸鎬�;1:宸插洖澶� + private Date creationDate; // 鍏ュ簱鏃堕棿銆俢reateTime杩欐槸寰俊鏈嶅姟鍣ㄥ彂鏉ョ殑鏃堕棿鎴� private Date modificationDate; @Id diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/WeixinReply.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/WeixinReply.java index 349fe5093..e08042eb6 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/WeixinReply.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/WeixinReply.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 微信模式回复关键字 + * 寰俊妯″紡鍥炲鍏抽敭瀛� */ @Entity @Table(name = "weixin.weixin_reply") @@ -20,9 +20,9 @@ public class WeixinReply implements MongoEntity { private String id; private String keyWord; - private int type; // 0:包含;1:全等 + private int type; // 0锛氬寘鍚�;1:鍏ㄧ瓑 private String replyWord; - private Integer sequence; // 越小优先级越高 + private Integer sequence; // 瓒婂皬浼樺厛绾ц秺楂� private Date creationDate; private Date modificationDate; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/WeixinUserLocation.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/WeixinUserLocation.java index 91a5bd63c..34c8cc8a8 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/WeixinUserLocation.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/WeixinUserLocation.java @@ -10,14 +10,14 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 微信用户最近的位置记录 + * 寰俊鐢ㄦ埛鏈�杩戠殑浣嶇疆璁板綍 */ @Entity @Table(name = "weixin.weixin_user_location") public class WeixinUserLocation implements MongoEntity { private static final long serialVersionUID = 5643702000413022782L; - private String id; // 用微信用户的openId + private String id; // 鐢ㄥ井淇$敤鎴风殑openId private String city; private String region; private Double lat; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/XcxActivityInfo.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/XcxActivityInfo.java index c362a3cf7..b66c0fab6 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/XcxActivityInfo.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/XcxActivityInfo.java @@ -16,40 +16,40 @@ public class XcxActivityInfo implements MongoEntity { private static final long serialVersionUID = -6285426800220290052L; private String id; /** - * 用户对应的唯一id + * 鐢ㄦ埛瀵瑰簲鐨勫敮涓�id */ private String openId; /** - * 小区城市 + * 灏忓尯鍩庡競 */ private String city; /** - * 小区区域 + * 灏忓尯鍖哄煙 */ private String region; /** - * 小区地址 + * 灏忓尯鍦板潃 */ private String address; /** - * 小区名称 + * 灏忓尯鍚嶇О */ private String name; /** - * 住房类型(0(自住),1(租房)) + * 浣忔埧绫诲瀷(0锛堣嚜浣忥級锛�1锛堢鎴匡級) */ private Integer type; /** - * 小区评级等级 + * 灏忓尯璇勭骇绛夌骇 */ private Integer level; /** - * 小区对应的故事图片1(),2(),3(),4(),5(),6(),7(), + * 灏忓尯瀵瑰簲鐨勬晠浜嬪浘鐗�1(),2(),3(),4(),5(),6(),7(), */ private Integer picId; /** - * 创建日期 + * 鍒涘缓鏃ユ湡 */ private Date cDate; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/XcxEvaluation.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/XcxEvaluation.java index 71d6a1f7c..8c0faf78d 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/XcxEvaluation.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/XcxEvaluation.java @@ -15,7 +15,7 @@ import com.fangjia.dal.MongoEntity; public class XcxEvaluation implements MongoEntity { private static final long serialVersionUID = -6285426800220290052L; private String id; - private String openId; //微信的openId + private String openId; //寰俊鐨刼penId private String city; private String region; private String name; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/XcxLoanInfo.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/XcxLoanInfo.java index a4ad3b6a4..9c0e5d7d0 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/XcxLoanInfo.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/XcxLoanInfo.java @@ -15,8 +15,8 @@ import com.fangjia.dal.MongoEntity; public class XcxLoanInfo implements MongoEntity { private static final long serialVersionUID = -6285426800220290052L; private String id; - private String openId; //微信的openId - private String evalId; //估价的估价id + private String openId; //寰俊鐨刼penId + private String evalId; //浼颁环鐨勪及浠穒d private String phone; private Date cDate; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/XcxUserInfo.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/XcxUserInfo.java index f7ee7c694..4a2e85ed4 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/XcxUserInfo.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/XcxUserInfo.java @@ -15,9 +15,9 @@ import com.fangjia.dal.MongoEntity; public class XcxUserInfo implements MongoEntity { private static final long serialVersionUID = -6285426800220290052L; private String id; - private String openId; //微信返回的openId - private String nickName;//微信昵称 - private String logoUrl;//微信昵称 + private String openId; //寰俊杩斿洖鐨刼penId + private String nickName;//寰俊鏄电О + private String logoUrl;//寰俊鏄电О private Date cDate; @Id diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/loan/FjBaseLoan.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/loan/FjBaseLoan.java index 98d5f4252..b1efbb330 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/loan/FjBaseLoan.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/loan/FjBaseLoan.java @@ -13,7 +13,7 @@ import org.apache.commons.lang.StringUtils; import com.fangjia.dal.MongoEntity; /** - * 贷款产品基础类(通用字段) + * 璐锋浜у搧鍩虹绫伙紙閫氱敤瀛楁锛� * * @author yukai * @@ -22,78 +22,78 @@ public abstract class FjBaseLoan implements MongoEntity { private static final long serialVersionUID = 6938657759077911947L; private String id; private int status; - private String productName; // 贷款产品名称 - private String agencyId; // 机构信息Id - private int angecyType; // 机构类型 + private String productName; // 璐锋浜у搧鍚嶇О + private String agencyId; // 鏈烘瀯淇℃伅Id + private int angecyType; // 鏈烘瀯绫诲瀷 - private double creditRangeLow; // 额度范围(万元) + private double creditRangeLow; // 棰濆害鑼冨洿锛堜竾鍏冿級 private double creditRangeHigh; - private String creditDesc; // 额度说明 + private String creditDesc; // 棰濆害璇存槑 - private int creditTimeLow; // 贷款期限(月) + private int creditTimeLow; // 璐锋鏈熼檺锛堟湀锛� private int creditTimeHigh; - private String creditTimeDesc; // 期限说明 + private String creditTimeDesc; // 鏈熼檺璇存槑 - private String guarantyWay; // 担保方式 + private String guarantyWay; // 鎷呬繚鏂瑰紡 - private int loanTime; // 放款时间(天) + private int loanTime; // 鏀炬鏃堕棿锛堝ぉ锛� private String loanTimeDesc; - private int applyTime; // 审批时间 + private int applyTime; // 瀹℃壒鏃堕棿 private String applyTimeDesc; - private double monthCost; // 月管理费率 + private double monthCost; // 鏈堢鐞嗚垂鐜� private String monthCostDesc; - private double otherCost; // 其他费用费率 + private double otherCost; // 鍏朵粬璐圭敤璐圭巼 private String otherCostDesc; - private List citys; // 产品适用城市 + private List citys; // 浜у搧閫傜敤鍩庡競 private String city; - private String feature; // 产品特点 + private String feature; // 浜у搧鐗圭偣 - private String appCondition; // 申请条件描述 - private String introduction; // 简介 + private String appCondition; // 鐢宠鏉′欢鎻忚堪 + private String introduction; // 绠�浠� - private String material; // 所需材料 - private String rateDesc; // 利率说明 - private String other; // 其他 + private String material; // 鎵�闇�鏉愭枡 + private String rateDesc; // 鍒╃巼璇存槑 + private String other; // 鍏朵粬 private Date creationDate; private Date modificationDate; - private int badCreditStatus; // 有无不良信用记录 0-无 1-有 2-不限 - private int creditRecord; // 有无信用记录 0-无 1-有 2-不限 + private int badCreditStatus; // 鏈夋棤涓嶈壇淇$敤璁板綍 0-鏃� 1-鏈� 2-涓嶉檺 + private int creditRecord; // 鏈夋棤淇$敤璁板綍 0-鏃� 1-鏈� 2-涓嶉檺 private String creditRecordDesc; - private int nativeHouseStatus; // 是否需要本地房产 0-否 1-是 + private int nativeHouseStatus; // 鏄惁闇�瑕佹湰鍦版埧浜� 0-鍚� 1-鏄� private String nativeHouseDesc; - private String repaymentWay; // 还款方式(分期还款、随借随还、一次性还本付息, 分期还款,随借随还) - private String repaymentWayDesc; // 还款方式说明 + private String repaymentWay; // 杩樻鏂瑰紡(鍒嗘湡杩樻銆侀殢鍊熼殢杩樸�佷竴娆℃�ц繕鏈粯鎭�, 鍒嗘湡杩樻,闅忓�熼殢杩�) + private String repaymentWayDesc; // 杩樻鏂瑰紡璇存槑 - private int professionLimitStatus; // 是否职业限制 0-否 1-是 - private String profession; // 职业(多种职业以逗号分隔) - private String professionDesc; // 职业身份说明 + private int professionLimitStatus; // 鏄惁鑱屼笟闄愬埗 0-鍚� 1-鏄� + private String profession; // 鑱屼笟(澶氱鑱屼笟浠ラ�楀彿鍒嗛殧) + private String professionDesc; // 鑱屼笟韬唤璇存槑 - private int guarantyStatus; // 是否需要抵押物 0-否 1-是 - private String guaranty; // 抵押物 - private String guarantyDesc; // 抵押物说明 + private int guarantyStatus; // 鏄惁闇�瑕佹姷鎶肩墿 0-鍚� 1-鏄� + private String guaranty; // 鎶垫娂鐗� + private String guarantyDesc; // 鎶垫娂鐗╄鏄� - private int incomeStatus; // 是否收入限制 0-否 1-是 + private int incomeStatus; // 鏄惁鏀跺叆闄愬埗 0-鍚� 1-鏄� private int income; private String incomeDesc; - private int workinkLifeStatus; // 是否工作年限限制 0-否 1-是 - private int workingLife; // 月 + private int workinkLifeStatus; // 鏄惁宸ヤ綔骞撮檺闄愬埗 0-鍚� 1-鏄� + private int workingLife; // 鏈� private String workingLifeDesc; - private int companyLifeStatus; // 是否企业成立年限限制 0-否 1-是 - private int companyLife; // 月 + private int companyLifeStatus; // 鏄惁浼佷笟鎴愮珛骞撮檺闄愬埗 0-鍚� 1-鏄� + private int companyLife; // 鏈� private String companyLifeDesc; - private int sequence; // 序号,用于人工控制列表排序 + private int sequence; // 搴忓彿锛岀敤浜庝汉宸ユ帶鍒跺垪琛ㄦ帓搴� @Id @GeneratedValue diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/loan/FjBusinessLoan.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/loan/FjBusinessLoan.java index 0b263f4aa..b9dcc6618 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/loan/FjBusinessLoan.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/loan/FjBusinessLoan.java @@ -4,7 +4,7 @@ import javax.persistence.Entity; import javax.persistence.Table; /** - * 经营型贷款产品表 + * 缁忚惀鍨嬭捶娆句骇鍝佽〃 * * @author yukai * diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/loan/FjCarLoan.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/loan/FjCarLoan.java index 36ddc76e1..c6c36f241 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/loan/FjCarLoan.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/loan/FjCarLoan.java @@ -5,7 +5,7 @@ import javax.persistence.Entity; import javax.persistence.Table; /** - * 汽车贷款产品表 + * 姹借溅璐锋浜у搧琛� * * @author yukai * diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/loan/FjConsumptionLoan.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/loan/FjConsumptionLoan.java index bd3f0074a..71580394f 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/loan/FjConsumptionLoan.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/loan/FjConsumptionLoan.java @@ -4,7 +4,7 @@ import javax.persistence.Entity; import javax.persistence.Table; /** - * 消费型贷款产品表 + * 娑堣垂鍨嬭捶娆句骇鍝佽〃 * * @author yukai * diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/loan/FjHouseLoan.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/loan/FjHouseLoan.java index 801f875a0..0ff1aca73 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/loan/FjHouseLoan.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/loan/FjHouseLoan.java @@ -5,7 +5,7 @@ import javax.persistence.Entity; import javax.persistence.Table; /** - * 房贷型贷款产品表 + * 鎴胯捶鍨嬭捶娆句骇鍝佽〃 * * @author yukai * @@ -14,8 +14,8 @@ import javax.persistence.Table; @Table(name = "fangjia.house_loan") public class FjHouseLoan extends FjBaseLoan { private static final long serialVersionUID = -7980178834522692364L; - private int houseType; // 0:首套;1:二套;2:商业 - private int houseFundStatus; // 是否支持公积金贷款0:不限;1:提供;2:不提供 + private int houseType; // 0锛氶濂楋紱1锛氫簩濂楋紱2锛氬晢涓� + private int houseFundStatus; // 鏄惁鏀寔鍏Н閲戣捶娆�0:涓嶉檺;1:鎻愪緵;2:涓嶆彁渚� @Column(name = "house_type") public int getHouseType() { diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/loan/FjLoanAgency.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/loan/FjLoanAgency.java index 73e250084..ac1776158 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/loan/FjLoanAgency.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/loan/FjLoanAgency.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 放贷机构信息表 + * 鏀捐捶鏈烘瀯淇℃伅琛� */ @Entity @Table(name = "rongshidai.loan_agency") diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/loan/FjLoanRate.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/loan/FjLoanRate.java index 718cd1c54..aab6cb7f4 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/loan/FjLoanRate.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/loan/FjLoanRate.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 贷款产品详细利率 + * 璐锋浜у搧璇︾粏鍒╃巼 * * @author yukai * @@ -23,7 +23,7 @@ public class FjLoanRate implements MongoEntity { private String id; private String productId; private String productType; - private int rateType; // 利率类型。0:实际利率;1:相对基准利率的倍率 + private int rateType; // 鍒╃巼绫诲瀷銆�0锛氬疄闄呭埄鐜囷紱1锛氱浉瀵瑰熀鍑嗗埄鐜囩殑鍊嶇巼 private double rate0to05; private double rate05to1; private double rate1to2; @@ -32,8 +32,8 @@ public class FjLoanRate implements MongoEntity { private double rate4to5; private double rate5to; - private boolean useMonthRate; // 是否以月息计算 - private double monthRate; // 月利率 + private boolean useMonthRate; // 鏄惁浠ユ湀鎭绠� + private double monthRate; // 鏈堝埄鐜� private Date creationDate; private Date modificationDate; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/loan/FjLoanUser.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/loan/FjLoanUser.java index def863757..82757d81c 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/loan/FjLoanUser.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/loan/FjLoanUser.java @@ -12,7 +12,7 @@ import com.fangjia.dal.MongoEntity; /** * - * 信贷员的前台用户表 + * 淇¤捶鍛樼殑鍓嶅彴鐢ㄦ埛琛� * */ @Entity @@ -26,7 +26,7 @@ public class FjLoanUser implements MongoEntity { private Date creationDate; private Date modificationDate; private Date lastLoginTime; - private int status = 1;// 未激活 + private int status = 1;// 鏈縺娲� @Column(name = "password") public String getPassword() { diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/open/model/ApiJsonViewConfig.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/open/model/ApiJsonViewConfig.java index 80f3c598e..78b9272c8 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/open/model/ApiJsonViewConfig.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/open/model/ApiJsonViewConfig.java @@ -7,7 +7,7 @@ import java.util.List; /** * - * api用户返回字段控制 + * api鐢ㄦ埛杩斿洖瀛楁鎺у埗 * @author wangwenyan */ @Entity @@ -17,7 +17,7 @@ public class ApiJsonViewConfig implements MongoEntity { private String id; /** - * 配置类型:0:排除指定字段,2:保留指定字段 + * 閰嶇疆绫诲瀷:0:鎺掗櫎鎸囧畾瀛楁锛�2锛氫繚鐣欐寚瀹氬瓧娈� */ private int configType; @@ -25,7 +25,7 @@ public class ApiJsonViewConfig implements MongoEntity { private String uri; /** - * 配置字段 + * 閰嶇疆瀛楁 * */ private List fields; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/open/model/ApiUserAuthority.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/open/model/ApiUserAuthority.java index 74d5348c0..20495ae13 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/open/model/ApiUserAuthority.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/open/model/ApiUserAuthority.java @@ -14,7 +14,7 @@ import com.fangjia.dal.MongoEntity; import com.mongodb.BasicDBObject; /** - * api用户权限对应 + * api鐢ㄦ埛鏉冮檺瀵瑰簲 * * @author liupei */ @@ -38,14 +38,14 @@ public class ApiUserAuthority implements MongoEntity { private Map deadlineMap; private List openResourseUris; - //有无权限 + //鏈夋棤鏉冮檺 private boolean supportLatLng; private Map cityCreditMap; private Map openResourseUrisMap; - //FJW1.1 ApiUser-价格评级 + //FJW1.1 ApiUser-浠锋牸璇勭骇 private Integer creditLevelStatus; private Map priceRatingMap; private String key; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/open/model/CommunityBasePrice.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/open/model/CommunityBasePrice.java index 9321bd542..8a1dce21a 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/open/model/CommunityBasePrice.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/open/model/CommunityBasePrice.java @@ -8,7 +8,7 @@ import javax.persistence.Id; import javax.persistence.Table; /** - * 小区建行置信度信息 + * 灏忓尯寤鸿缃俊搴︿俊鎭� * * @author shenjian@fangjia.com */ diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/open/model/CommunityPoi.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/open/model/CommunityPoi.java index 8427b5aa7..e22e52d28 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/open/model/CommunityPoi.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/open/model/CommunityPoi.java @@ -6,7 +6,7 @@ import javax.persistence.*; import java.util.Date; /** - * 小区周边配套统计信息 + * 灏忓尯鍛ㄨ竟閰嶅缁熻淇℃伅 * * @author shenjian@fangjia.com */ @@ -27,7 +27,7 @@ public class CommunityPoi implements MongoEntity { private Integer junior; private Integer hospital; /** - * 不利设施,丧葬 + * 涓嶅埄璁炬柦,涓ц懍 */ private Integer funeral; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/open/model/EvaluateRatio.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/open/model/EvaluateRatio.java index b91857b30..650ef7449 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/open/model/EvaluateRatio.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/open/model/EvaluateRatio.java @@ -5,7 +5,7 @@ import com.fangjia.dal.MongoEntity; import javax.persistence.*; /** - * 估价系数 + * 浼颁环绯绘暟 * * @author shenjian * @since 2022/7/27 diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/open/model/OffSet.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/open/model/OffSet.java index c66ed3ddf..5de2e9b5c 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/open/model/OffSet.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/open/model/OffSet.java @@ -9,7 +9,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 手机地图偏移数据库 + * 鎵嬫満鍦板浘鍋忕Щ鏁版嵁搴� * * @author */ diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/open/model/OpenResource.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/open/model/OpenResource.java index e0f519223..9825473e9 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/open/model/OpenResource.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/open/model/OpenResource.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * open中公开出的接口资源 + * open涓叕寮�鍑虹殑鎺ュ彛璧勬簮 * * @author liupei */ diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/open/model/PoiAmap.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/open/model/PoiAmap.java index c139037f9..0670c56e0 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/open/model/PoiAmap.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/open/model/PoiAmap.java @@ -1,7 +1,7 @@ package com.fangjia.dal.mongo.open.model; /** - * 高德的POI相关 + * 楂樺痉鐨凱OI鐩稿叧 * * @author user * diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/open/model/RegionPotential.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/open/model/RegionPotential.java index f88a2229f..e34f2173e 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/open/model/RegionPotential.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/open/model/RegionPotential.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 区域潜力指数 + * 鍖哄煙娼滃姏鎸囨暟 * * @author yinjihuan * diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/AlgorithmRule.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/AlgorithmRule.java index e7790dd26..482cc4eb1 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/AlgorithmRule.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/AlgorithmRule.java @@ -22,36 +22,36 @@ public class AlgorithmRule implements MongoEntity { private List activeCity; public enum FieldEnum { - AGENCY_COUNT(0.2, "中介数量权重"), - AGENCY_COUNT_MAX(90.0, "中介数量max值"), - AGENCY_COUNT_MIN(0, "中介数量min值"), - AGENCY_RADIUS(1.0, "中介数取值半径范围"), - PUBLISH_COUNT_FACTOR(0.3, "发布量权重"), - PUBLISH_COUNT_MAX(900.0, "发布量max值"), - PUBLISH_COUNT_MIN(0, "发布量min值"), - TRAFFIC_FACROR(0.2, "交通权重"), - BUS_FACTOR(0.6, "公交权重"), - METRO_FACTOR(0.4, "地铁权重"), - BUS_COUNT_MAX(48, "公交数量max值"), - BUS_COUNT_MIN(0, "公交数量min值"), - METRO_COUNT_MAX(5, "地铁数量max值"), - METRO_COUNT_MIN(0, "地铁数量min值"), - BUS_RADIUS(1.0, "公交数取值半径范围"), - METRO_RADIUS(1.0, "地铁数取值半径范围"), - PROPERTY_DENSITY_FACTOR(0.1, "小区密度权重"), - PROPERTY_DENSITY_MAX(400, "小区密度max值"), - PROPERTY_DENSITY_MIN(10, "小区密度min值"), - PUBLISH_A(850, "发布量A值"), - PUBLISH_B(200, "发布量B值"), - PROPERTY_DENSITY_RADIUS(1.0, "小区密度取值半径范围"), - TOTAL_PRICE_FACTOR(0.2, "房屋总价权重"), - TOTAL_PRICE_A(270, "总价A值"), - TOTAL_PRICE_B(18, "总价B值"), - TOTAL_PRICE_E(54, "总价E值"), - TOTAL_PRICE_F(72, "总价F值"), - YOY_FACTOR(0.2, "年涨跌幅权重"), - YOY_D(2, "年涨跌幅D值"), - YOY_C(1, "年涨跌幅C值"), + AGENCY_COUNT(0.2, "涓粙鏁伴噺鏉冮噸"), + AGENCY_COUNT_MAX(90.0, "涓粙鏁伴噺max鍊�"), + AGENCY_COUNT_MIN(0, "涓粙鏁伴噺min鍊�"), + AGENCY_RADIUS(1.0, "涓粙鏁板彇鍊煎崐寰勮寖鍥�"), + PUBLISH_COUNT_FACTOR(0.3, "鍙戝竷閲忔潈閲�"), + PUBLISH_COUNT_MAX(900.0, "鍙戝竷閲弇ax鍊�"), + PUBLISH_COUNT_MIN(0, "鍙戝竷閲弇in鍊�"), + TRAFFIC_FACROR(0.2, "浜ら�氭潈閲�"), + BUS_FACTOR(0.6, "鍏氦鏉冮噸"), + METRO_FACTOR(0.4, "鍦伴搧鏉冮噸"), + BUS_COUNT_MAX(48, "鍏氦鏁伴噺max鍊�"), + BUS_COUNT_MIN(0, "鍏氦鏁伴噺min鍊�"), + METRO_COUNT_MAX(5, "鍦伴搧鏁伴噺max鍊�"), + METRO_COUNT_MIN(0, "鍦伴搧鏁伴噺min鍊�"), + BUS_RADIUS(1.0, "鍏氦鏁板彇鍊煎崐寰勮寖鍥�"), + METRO_RADIUS(1.0, "鍦伴搧鏁板彇鍊煎崐寰勮寖鍥�"), + PROPERTY_DENSITY_FACTOR(0.1, "灏忓尯瀵嗗害鏉冮噸"), + PROPERTY_DENSITY_MAX(400, "灏忓尯瀵嗗害max鍊�"), + PROPERTY_DENSITY_MIN(10, "灏忓尯瀵嗗害min鍊�"), + PUBLISH_A(850, "鍙戝竷閲廇鍊�"), + PUBLISH_B(200, "鍙戝竷閲廈鍊�"), + PROPERTY_DENSITY_RADIUS(1.0, "灏忓尯瀵嗗害鍙栧�煎崐寰勮寖鍥�"), + TOTAL_PRICE_FACTOR(0.2, "鎴垮眿鎬讳环鏉冮噸"), + TOTAL_PRICE_A(270, "鎬讳环A鍊�"), + TOTAL_PRICE_B(18, "鎬讳环B鍊�"), + TOTAL_PRICE_E(54, "鎬讳环E鍊�"), + TOTAL_PRICE_F(72, "鎬讳环F鍊�"), + YOY_FACTOR(0.2, "骞存定璺屽箙鏉冮噸"), + YOY_D(2, "骞存定璺屽箙D鍊�"), + YOY_C(1, "骞存定璺屽箙C鍊�"), ; private final double defaultValue; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/ApiCallLimit.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/ApiCallLimit.java index 01080b2ff..b2f0f303d 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/ApiCallLimit.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/ApiCallLimit.java @@ -9,7 +9,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 临时的功能使用用次数记录存储 + * 涓存椂鐨勫姛鑳戒娇鐢ㄧ敤娆℃暟璁板綍瀛樺偍 * @author yinjihuan * */ @@ -23,7 +23,7 @@ public class ApiCallLimit implements MongoEntity { private String eid; /** - * 充值总数 + * 鍏呭�兼�绘暟 */ private long sumCount; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/ApiCallLimitDetail.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/ApiCallLimitDetail.java index efba5cd48..4da4b8fe8 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/ApiCallLimitDetail.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/ApiCallLimitDetail.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 使用次数充值详情 + * 浣跨敤娆℃暟鍏呭�艰鎯� */ @Entity @Table(name = "fangjia_pds.api_call_limit_detail") @@ -25,32 +25,32 @@ public class ApiCallLimitDetail implements MongoEntity { private String id; /** - * 充值类别uri + * 鍏呭�肩被鍒玼ri */ private String uri; /** - * 充值数量 + * 鍏呭�兼暟閲� */ private int count; /** - * 企业id + * 浼佷笟id */ private String eid; /** - * 充值人 + * 鍏呭�间汉 */ private String userName; /** - * 充值时间 + * 鍏呭�兼椂闂� */ private Date createDate; /** - * 充值方式 0-赠送 1-购买 + * 鍏呭�兼柟寮� 0-璧犻�� 1-璐拱 */ private int rechargeWay; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/Authority.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/Authority.java index b9902da69..721b1827c 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/Authority.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/Authority.java @@ -7,7 +7,7 @@ import javax.persistence.Id; import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * PDS 权限信息 + * PDS 鏉冮檺淇℃伅 * @author yinjihuan * */ @@ -19,12 +19,12 @@ public class Authority implements MongoEntity { private String id; /** - * 权限名称 + * 鏉冮檺鍚嶇О */ private String authName; /** - * 权限URL + * 鏉冮檺URL */ private String authUrl; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/AuthorityGroup.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/AuthorityGroup.java index d14135ea6..9a54f01ad 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/AuthorityGroup.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/AuthorityGroup.java @@ -8,7 +8,7 @@ import javax.persistence.Id; import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * PDS 权限组信息 + * PDS 鏉冮檺缁勪俊鎭� * @author yinjihuan * */ @@ -20,12 +20,12 @@ public class AuthorityGroup implements MongoEntity { private String id; /** - * 组名称 + * 缁勫悕绉� */ private String groupName; /** - * 权限集合 + * 鏉冮檺闆嗗悎 */ private List authoritys; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/BankLoanRate.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/BankLoanRate.java index 133a822a9..1d12c15c8 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/BankLoanRate.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/BankLoanRate.java @@ -8,7 +8,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * PDS央行标准贷款利率 + * PDS澶鏍囧噯璐锋鍒╃巼 * @author yinjihuan * */ @@ -21,17 +21,17 @@ public class BankLoanRate implements MongoEntity { private String id; /** - * 利率标识 + * 鍒╃巼鏍囪瘑 */ private Integer index; /** - * 银行利率 + * 閾惰鍒╃巼 */ private Double bankRate; /** - * 时间范围 + * 鏃堕棿鑼冨洿 */ private String time; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/Borrower.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/Borrower.java index 9aad73a4b..9f47de8ab 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/Borrower.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/Borrower.java @@ -21,141 +21,141 @@ public class Borrower implements MongoEntity { private static final long serialVersionUID = -9135842376337334618L; private String id; - /**当前登录用户ID,方便查找当前押品所属的公司机构*/ + /**褰撳墠鐧诲綍鐢ㄦ埛ID锛屾柟渚挎煡鎵惧綋鍓嶆娂鍝佹墍灞炵殑鍏徃鏈烘瀯*/ private String userId; - /**和房屋信息对应的sid*/ + /**鍜屾埧灞嬩俊鎭搴旂殑sid*/ private String sid; - /**姓名*/ + /**濮撳悕*/ private String name; - /**身份证号*/ + /**韬唤璇佸彿*/ private String idcode; - /** 婚姻状况 */ + /** 濠氬Щ鐘跺喌 */ private String maritalStatus; - /** 手机号码1 */ + /** 鎵嬫満鍙风爜1 */ private String phoneNumber; - /** 手机号码2,可选 */ + /** 鎵嬫満鍙风爜2锛屽彲閫� */ private String phoneNumber2; - /** 现居住地-市 */ + /** 鐜板眳浣忓湴-甯� */ private String residentialCity; - /** 现居住地-区县 */ + /** 鐜板眳浣忓湴-鍖哄幙 */ private String residentialRegion; - /** 现居住地-详细地址 */ + /** 鐜板眳浣忓湴-璇︾粏鍦板潃 */ private String residentialAddress; - /** 工作地址-市 */ + /** 宸ヤ綔鍦板潃-甯� */ private String workCity; - /** 工作地址-区县 */ + /** 宸ヤ綔鍦板潃-鍖哄幙 */ private String workRegion; - /** 工作地址-详细地址 */ + /** 宸ヤ綔鍦板潃-璇︾粏鍦板潃 */ private String workAddress; - /**是否是主贷人*/ + /**鏄惁鏄富璐蜂汉*/ private Boolean isMainBorrower; private String checkName; private String photo; private Date createDate = new Date(); - /*来源*/ + /*鏉ユ簮*/ private String from; /** * @WescrApiService#getAccuratePersonJudicialList - * 失信公告列表 null 无数据 Empty 无数据失信 失信被执行人 + * 澶变俊鍏憡鍒楄〃 null 鏃犳暟鎹� Empty 鏃犳暟鎹け淇� 澶变俊琚墽琛屼汉 */ private BasicDBList loseCreditJudicialList; /** * @WescrApiService#getAccuratePersonJudicialList - * 被执行人列表 null 无数据 Empty 没有法院被执行人数据 + * 琚墽琛屼汉鍒楄〃 null 鏃犳暟鎹� Empty 娌℃湁娉曢櫌琚墽琛屼汉鏁版嵁 */ private BasicDBList defendantJudicialList; /** * @WescrApiService#getBlackListByIdentityCard - * 有无被加入黑名单 null 无数据 Empty 没有被加入黑名单 + * 鏈夋棤琚姞鍏ラ粦鍚嶅崟 null 鏃犳暟鎹� Empty 娌℃湁琚姞鍏ラ粦鍚嶅崟 */ private BasicDBList blackList; /** - * 逾期的贷款数 + * 閫炬湡鐨勮捶娆炬暟 * @WescrApiService#getBeOverduePlatformDetail - * 有无逾期贷款 + * 鏈夋棤閫炬湡璐锋 */ private BasicDBList beOverduePlatformDetail; /** - * 网贷黑名单 + * 缃戣捶榛戝悕鍗� */ private Boolean leakBlack; /** - * 拥有的的企业 + * 鎷ユ湁鐨勭殑浼佷笟 * SuanhuaApiService#getBusinessInfo */ private BasicDBObject enterpriseInfo; /** - * 借记卡12月收入 + * 鍊熻鍗�12鏈堟敹鍏� */ private Integer debit12mIncome; /** - * 借记卡12月消费 + * 鍊熻鍗�12鏈堟秷璐� */ private Integer debit12mConsume; /** - * 借记卡12月消费 + * 鍊熻鍗�12鏈堟秷璐� */ private Integer debit12mInvest; /** - * 信用卡12月消费 + * 淇$敤鍗�12鏈堟秷璐� */ private Integer credit12mConsume; /** - * 对外投资企业不良情况 + * 瀵瑰鎶曡祫浼佷笟涓嶈壇鎯呭喌 */ private Boolean enterpriseInvestStatus; /** - * 身份证,电话号码,姓名三要素校验结果 + * 韬唤璇侊紝鐢佃瘽鍙风爜锛屽鍚嶄笁瑕佺礌鏍¢獙缁撴灉 * */ private Integer compareResult; /** - * 手机入网时长查询结果 - * key:inTimesDesc 手机入网 - * key:type 运营商 + * 鎵嬫満鍏ョ綉鏃堕暱鏌ヨ缁撴灉 + * key:inTimesDesc 鎵嬫満鍏ョ綉 + * key:type 杩愯惀鍟� */ private BasicDBObject phoneOnlineTimes; /** - * 借款平台数 + * 鍊熸骞冲彴鏁� */ private Integer borrowPlatCount; /** - * 任务总得分 + * 浠诲姟鎬诲緱鍒� */ private Integer score; /** - * 欺诈风险 + * 娆鸿瘓椋庨櫓 */ private Integer cheatRisk; /** - * 违约风险 + * 杩濈害椋庨櫓 */ private Integer bleakRisk; /** - * 是否 被评估了 1代表是已经被评估了的 null代表是没有评估的 + * 鏄惁 琚瘎浼颁簡 1浠h〃鏄凡缁忚璇勪及浜嗙殑 null浠h〃鏄病鏈夎瘎浼扮殑 */ private Integer personIsColl; /** - * 评估当时后台状态 + * 璇勪及褰撴椂鍚庡彴鐘舵�� */ private Boolean currentNeedPerson; /** - * 评估时候的评估次数是否允许评估 true 可以评估 false 不可以评估 + * 璇勪及鏃跺�欑殑璇勪及娆℃暟鏄惁鍏佽璇勪及 true 鍙互璇勪及 false 涓嶅彲浠ヨ瘎浼� */ private Boolean currentLendQueryCount; /** - * 个人金融消费信息 + * 涓汉閲戣瀺娑堣垂淇℃伅 */ private BasicDBObject umpaydc; @@ -577,24 +577,24 @@ public class Borrower implements MongoEntity { return PDSConstant.NO_DATA_MSG; } if(result.length == 1){ - return ">" + result[0]/10000 + "万"; + return ">" + result[0]/10000 + "涓�"; }else if(result.length == 2){ Integer min = result[0]; Integer max = result[1]; String minDesc,maxDesc; if(min < 10000){ - minDesc = min/1000 + "千"; + minDesc = min/1000 + "鍗�"; }else{ - minDesc = min/10000 + "万"; + minDesc = min/10000 + "涓�"; } if(max < 10000){ - maxDesc = max/1000 + "千"; + maxDesc = max/1000 + "鍗�"; }else{ - maxDesc = max/10000 + "万"; + maxDesc = max/10000 + "涓�"; } return minDesc + "-" + maxDesc; } - return "未知"; + return "鏈煡"; } @@ -604,24 +604,24 @@ public class Borrower implements MongoEntity { return PDSConstant.NO_DATA_MSG; } if(result.length == 1){ - return ">" + result[0]/10000 + "万"; + return ">" + result[0]/10000 + "涓�"; }else if(result.length == 2){ Integer min = result[0]; Integer max = result[1]; String minDesc,maxDesc; if(min < 10000){ - minDesc = min/1000 + "千"; + minDesc = min/1000 + "鍗�"; }else{ - minDesc = min/10000 + "万"; + minDesc = min/10000 + "涓�"; } if(max < 10000){ - maxDesc = max/1000 + "千"; + maxDesc = max/1000 + "鍗�"; }else{ - maxDesc = max/10000 + "万"; + maxDesc = max/10000 + "涓�"; } return minDesc + "-" + maxDesc; } - return "未知"; + return "鏈煡"; } diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/BorrowerInfo.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/BorrowerInfo.java index 3a4a52456..04afb298d 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/BorrowerInfo.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/BorrowerInfo.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * PDS 抵押品信息 + * PDS 鎶垫娂鍝佷俊鎭� * * @author hubingliang * @@ -23,39 +23,39 @@ public class BorrowerInfo implements MongoEntity { private String id; - /** 姓名*/ + /** 濮撳悕*/ private String name; - /** 省份证号码*/ + /** 鐪佷唤璇佸彿鐮�*/ private String idCode; - /** 婚姻状况*/ + /** 濠氬Щ鐘跺喌*/ private String maritalStatus; - /** 电话号码1*/ + /** 鐢佃瘽鍙风爜1*/ private String telePhone1; - /** 电话号码2*/ + /** 鐢佃瘽鍙风爜2*/ private String telePhone2; - /** 居住城市*/ + /** 灞呬綇鍩庡競*/ private String residentialCity; - /** 居住区域*/ + /** 灞呬綇鍖哄煙*/ private String residentialRegion; - /** 居住地址*/ + /** 灞呬綇鍦板潃*/ private String residentialAddress; - /** 还款能力*/ + /** 杩樻鑳藉姏*/ private Double repayAbility; - /** 信用得分*/ + /** 淇$敤寰楀垎*/ private Double creditScore; - /** cpdb库中排名*/ + /** cpdb搴撲腑鎺掑悕*/ private Integer cpdbLevel; - /** 总得分*/ + /** 鎬诲緱鍒�*/ private Double totalScore; - /** 工作城市*/ + /** 宸ヤ綔鍩庡競*/ private String workCity; - /** 工作区域*/ + /** 宸ヤ綔鍖哄煙*/ private String workRegion; - /** 工作地址*/ + /** 宸ヤ綔鍦板潃*/ private String workAddress; - /** 是不是住借款人*/ + /** 鏄笉鏄綇鍊熸浜�*/ private boolean isMainBorrower; - /** 创建日期*/ + /** 鍒涘缓鏃ユ湡*/ private Date createDate; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/BorrowerInfoMonitor.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/BorrowerInfoMonitor.java index a68767886..fdcea4fa7 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/BorrowerInfoMonitor.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/BorrowerInfoMonitor.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 押品房产信息 + * 鎶煎搧鎴夸骇淇℃伅 * Created by hubingliang on 2017/3/29. */ @Entity @@ -20,20 +20,20 @@ public class BorrowerInfoMonitor implements MongoEntity { private static final long serialVersionUID = -4209088172091549241L; private String id; - /**当前登录用户ID,方便查找当前押品所属的公司机构*/ + /**褰撳墠鐧诲綍鐢ㄦ埛ID锛屾柟渚挎煡鎵惧綋鍓嶆娂鍝佹墍灞炵殑鍏徃鏈烘瀯*/ private String userId; private String enterpriseId; - private Date createDate;//输入时间 + private Date createDate;//杈撳叆鏃堕棿 - private Integer resource;//来源 1、pds 2、hk 3、资产管理 + private Integer resource;//鏉ユ簮 1銆乸ds 2銆乭k 3銆佽祫浜х鐞� - private Integer noIncome;//贷款人信息查询 输入未返回:1 + private Integer noIncome;//璐锋浜轰俊鎭煡璇� 杈撳叆鏈繑鍥烇細1 - private Integer noConsume;//贷款人信息查询 支出未返回:1 + private Integer noConsume;//璐锋浜轰俊鎭煡璇� 鏀嚭鏈繑鍥烇細1 - private String sid;//正常评估时候的和库中数据的链接(只有当reason为4的时候此字段才会存在) + private String sid;//姝e父璇勪及鏃跺�欑殑鍜屽簱涓暟鎹殑閾炬帴锛堝彧鏈夊綋reason涓�4鐨勬椂鍊欐瀛楁鎵嶄細瀛樺湪锛� @Id @GeneratedValue diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/CollRate.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/CollRate.java index 33da8903a..e4c2b8ca5 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/CollRate.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/CollRate.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * PDS 抵押品信息 + * PDS 鎶垫娂鍝佷俊鎭� * * @author hubingliang * @@ -22,7 +22,7 @@ public class CollRate implements MongoEntity { private static final long serialVersionUID = 2787328470517909863L; private String id; - private String enterpriseId;//企业id + private String enterpriseId;//浼佷笟id private String usage; private Double usageRate; private Double scoreMax; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/CollateralEvaluationInfo.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/CollateralEvaluationInfo.java index 52e96869d..53c35bc66 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/CollateralEvaluationInfo.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/CollateralEvaluationInfo.java @@ -14,7 +14,7 @@ import com.fangjia.dal.MongoEntity; import com.mongodb.BasicDBObject; /** - * PDS 抵押品信息 + * PDS 鎶垫娂鍝佷俊鎭� * * @author hubingliang * @@ -25,128 +25,128 @@ public class CollateralEvaluationInfo implements MongoEntity { private static final long serialVersionUID = 2787328470517909863L; private String id; - /**当前登录用户ID,方便查找当前押品所属的公司机构*/ + /**褰撳墠鐧诲綍鐢ㄦ埛ID锛屾柟渚挎煡鎵惧綋鍓嶆娂鍝佹墍灞炵殑鍏徃鏈烘瀯*/ private String userId; - /**当前用户所属的企业ID*/ + /**褰撳墠鐢ㄦ埛鎵�灞炵殑浼佷笟ID*/ private String enterpriseId; - /** 城市*/ + /** 鍩庡競*/ private String city; - /** 区域*/ + /** 鍖哄煙*/ private String region; - /** 楼盘、地址*/ + /** 妤肩洏銆佸湴鍧�*/ private String districtName; - // 页面选中的原始名称(包含别名) + // 椤甸潰閫変腑鐨勫師濮嬪悕绉帮紙鍖呭惈鍒悕锛� private String oriDistrictName; - /** 地址 */ + /** 鍦板潃 */ private String address; - /**经度*/ + /**缁忓害*/ private Double lng; - /**纬度*/ + /**绾害*/ private Double lat; - /** 所在楼层*/ + /** 鎵�鍦ㄦゼ灞�*/ private Integer floor; - /** 总楼层*/ + /** 鎬绘ゼ灞�*/ private Integer height; - /** 楼栋号 */ + /** 妤兼爧鍙� */ private String houseNumber; - /** 房号 */ + /** 鎴垮彿 */ private String roomNumber; - /** 单元号 */ + /** 鍗曞厓鍙� */ private String unitNumber; - /** 物业类型 */ + /** 鐗╀笟绫诲瀷 */ private String estateType; - /** 面积 */ + /** 闈㈢Н */ private Double area; - /** 主贷款人身份证号 */ + /** 涓昏捶娆句汉韬唤璇佸彿 */ private String mainLenderIdCode; - /** 共同贷款人身份证号 */ + /** 鍏卞悓璐锋浜鸿韩浠借瘉鍙� */ private List deputyLenderIdCodes; - /** 均价 */ + /** 鍧囦环 */ private Integer avgPrice; - /** 评估后单价*/ + /** 璇勪及鍚庡崟浠�*/ private Integer resultAvgPrice; - /** 总价 */ + /** 鎬讳环 */ private Integer totalPrice; - /** 购置时总价 */ + /** 璐疆鏃舵�讳环 */ private Integer purchasePrice; - /** 市场法总价*/ + /** 甯傚満娉曟�讳环*/ private Integer marketPrice; - /** 价格平稳度 */ + /** 浠锋牸骞崇ǔ搴� */ private Double priceStability; - /** 处置难易度 */ + /** 澶勭疆闅炬槗搴� */ private Double handleLevel; - /** 押品综合得分*/ + /** 鎶煎搧缁煎悎寰楀垎*/ private Double totalScore; - /** 最高抵押率*/ + /** 鏈�楂樻姷鎶肩巼*/ private Double maxCollateralRate; - /** 可贷款金额*/ + /** 鍙捶娆鹃噾棰�*/ private int lendingTotalPrice; - /** 6个月挂牌量*/ + /** 6涓湀鎸傜墝閲�*/ private int quoteHouseSix; - /** 1个月挂牌量*/ + /** 1涓湀鎸傜墝閲�*/ private int quoteHouseOne; - /** 6个月成交量*/ + /** 6涓湀鎴愪氦閲�*/ private int houseSellSix; - /** 一个月成交量*/ + /** 涓�涓湀鎴愪氦閲�*/ private int houseSellOne; - /** 知名中介*/ + /** 鐭ュ悕涓粙*/ private int famousAgency; - /** 其他中介*/ + /** 鍏朵粬涓粙*/ private int otherAgency; - /** 最大中介数*/ + /** 鏈�澶т腑浠嬫暟*/ private int maxAgencyMount; - /** 中介数在当前城市排名比*/ + /** 涓粙鏁板湪褰撳墠鍩庡競鎺掑悕姣�*/ private Double agencyLevelRate; - /** 小区在城市中六个月挂牌量排名比*/ + /** 灏忓尯鍦ㄥ煄甯備腑鍏釜鏈堟寕鐗岄噺鎺掑悕姣�*/ private Double sixQuoteLevelRate; - /** 小区在城市中六个月成交量排名比*/ + /** 灏忓尯鍦ㄥ煄甯備腑鍏釜鏈堟垚浜ら噺鎺掑悕姣�*/ private Double sixSellHouseLevelRate; - /** 近六个月最大挂牌量*/ + /** 杩戝叚涓湀鏈�澶ф寕鐗岄噺*/ private int sixMaxQuoteMount; - /** 近六个月最大成交量*/ + /** 杩戝叚涓湀鏈�澶ф垚浜ら噺*/ private int sixMaxSellMount; private int houseHold; - /** 户数排名比*/ + /** 鎴锋暟鎺掑悕姣�*/ private Double houseHoldRate; - /** 最大户数*/ + /** 鏈�澶ф埛鏁�*/ private int maxHouseHold; - /** 均价在城市排名*/ + /** 鍧囦环鍦ㄥ煄甯傛帓鍚�*/ private Double priceRate; - /** cpdb库排名 */ + /** cpdb搴撴帓鍚� */ private Double priceCPDBRankRate; - /**综合评分在cpdb库排名*/ + /**缁煎悎璇勫垎鍦╟pdb搴撴帓鍚�*/ private Double scoreCPDBRankRate; - /**综合评分在城市库排名*/ + /**缁煎悎璇勫垎鍦ㄥ煄甯傚簱鎺掑悕*/ private Double scoreCityRankRate; - /** 平均增长率排名*/ + /** 骞冲潎澧為暱鐜囨帓鍚�*/ private Double increaseRate; private Double cpdbIncreaseRate; private Double yoyIncrease; - /** 购置时间 */ + /** 璐疆鏃堕棿 */ private Date purchaseDate; - /** 用途 */ + /** 鐢ㄩ�� */ private String usage; - /** 估价状态(1成功0失败) */ + /** 浼颁环鐘舵��(1鎴愬姛0澶辫触) */ private Integer status; - /** 创建时间*/ + /** 鍒涘缓鏃堕棿*/ private Date createDate; - /**是否添加到抵押品库 0:不添加 1:添加*/ + /**鏄惁娣诲姞鍒版姷鎶煎搧搴� 0:涓嶆坊鍔� 1:娣诲姞*/ private Integer addStatus; - /** 小区近12个月涨幅*/ + /** 灏忓尯杩�12涓湀娑ㄥ箙*/ private Map districtSellStats; - /** 城市近12个月涨幅*/ + /** 鍩庡競杩�12涓湀娑ㄥ箙*/ private Map citySellStats; - /** 区域近12个月涨幅*/ + /** 鍖哄煙杩�12涓湀娑ㄥ箙*/ private Map regionSellStats; - /**押品年限*/ + /**鎶煎搧骞撮檺*/ private Integer houseAge; - /** 小区图片*/ + /** 灏忓尯鍥剧墖*/ private List disPics; private List> houses; private BasicDBObject averageStatistics; @@ -155,36 +155,36 @@ public class CollateralEvaluationInfo implements MongoEntity { private Double regionPriceStability; private Double cityPriceStability; - /**一年以内的价格稳定指数*/ + /**涓�骞翠互鍐呯殑浠锋牸绋冲畾鎸囨暟*/ private Double priceStabilityLess; - /**装修*/ + /**瑁呬慨*/ private String direction; - /**朝向*/ + /**鏈濆悜*/ private String fitment; - /**周围地铁数量*/ - private Integer metroCount;//周围地铁数量 + /**鍛ㄥ洿鍦伴搧鏁伴噺*/ + private Integer metroCount;//鍛ㄥ洿鍦伴搧鏁伴噺 - /**周围公交数量*/ - private Integer busCount;//周围公交数量 + /**鍛ㄥ洿鍏氦鏁伴噺*/ + private Integer busCount;//鍛ㄥ洿鍏氦鏁伴噺 - /**周围交通数量数量*/ - private Integer trafficCount;//周围公交数量 + /**鍛ㄥ洿浜ら�氭暟閲忔暟閲�*/ + private Integer trafficCount;//鍛ㄥ洿鍏氦鏁伴噺 - /**周围交通数量数量*/ - private Integer maxTrafficCount;//周围公交数量 + /**鍛ㄥ洿浜ら�氭暟閲忔暟閲�*/ + private Integer maxTrafficCount;//鍛ㄥ洿鍏氦鏁伴噺 - /**周围交通城市排名*/ - private Double trafficLevelRate;//交通城市排名 + /**鍛ㄥ洿浜ら�氬煄甯傛帓鍚�*/ + private Double trafficLevelRate;//浜ら�氬煄甯傛帓鍚� - /**周围小区数量*/ + /**鍛ㄥ洿灏忓尯鏁伴噺*/ private Integer districtCount; - /**周围最大小区数*/ + /**鍛ㄥ洿鏈�澶у皬鍖烘暟*/ private Integer maxDistrictCount; - /**周围小区数量城市排名*/ + /**鍛ㄥ洿灏忓尯鏁伴噺鍩庡競鎺掑悕*/ private Double districtCountLevel; - /**导入文件时填的小区名/地址*/ + /**瀵煎叆鏂囦欢鏃跺~鐨勫皬鍖哄悕/鍦板潃*/ private String oldAddress; private Double totalPriceB; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/DistrictHouseNumber.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/DistrictHouseNumber.java index 8f4e5f5ad..1ecd23995 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/DistrictHouseNumber.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/DistrictHouseNumber.java @@ -7,22 +7,22 @@ import java.util.List; import java.util.Map; /** - * 小区的楼栋信息,脚本跑好的 + * 灏忓尯鐨勬ゼ鏍嬩俊鎭紝鑴氭湰璺戝ソ鐨� */ @Entity @Table(name = "fangjia_stat.district_house_number") public class DistrictHouseNumber implements MongoEntity { - // 小区ID + // 灏忓尯ID private String id; - // 城市 + // 鍩庡競 private String city; - // 区域 + // 鍖哄煙 private String region; - // 小区名 + // 灏忓尯鍚� private String name; - // 楼栋列表 + // 妤兼爧鍒楄〃 private List> houseNumbers; - // 楼高 + // 妤奸珮 private Integer height; @Id diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/DistrictRoomNumber.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/DistrictRoomNumber.java index cb74c61fe..4980e59d0 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/DistrictRoomNumber.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/DistrictRoomNumber.java @@ -6,22 +6,22 @@ import java.util.List; import java.util.Map; /** - * 小区的房号信息,脚本跑好的 + * 灏忓尯鐨勬埧鍙蜂俊鎭紝鑴氭湰璺戝ソ鐨� */ @Entity @Table(name = "fangjia_stat.district_room_number") public class DistrictRoomNumber implements MongoEntity { - // 小区ID + // 灏忓尯ID private String id; - // 城市 + // 鍩庡競 private String city; - // 区域 + // 鍖哄煙 private String region; - // 小区名 + // 灏忓尯鍚� private String name; - // 楼栋号 + // 妤兼爧鍙� private String houseNumber; - // 楼栋下的房号列表 + // 妤兼爧涓嬬殑鎴垮彿鍒楄〃 private List> roomNumbers; @Id diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/EamUser.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/EamUser.java index 1f29eed1b..587fce390 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/EamUser.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/EamUser.java @@ -6,7 +6,7 @@ import javax.persistence.*; import java.util.Date; /** - *PDS资产管理用户 + *PDS璧勪骇绠$悊鐢ㄦ埛 */ @Entity @Table(name = "fangjia_pds.eam_user") diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/Employee.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/Employee.java index 3de312cc5..127bc3d32 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/Employee.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/Employee.java @@ -10,7 +10,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 员工表 + * 鍛樺伐琛� * @author yinjihuan * */ @@ -21,39 +21,39 @@ public class Employee implements MongoEntity { private String id; /** - * 姓名 + * 濮撳悕 */ private String name; /** - * 密码 + * 瀵嗙爜 */ private String pass; /** - * 手机 + * 鎵嬫満 */ private String mobile; /** - * 邮箱 + * 閭 */ private String email; /** - * 角色 + * 瑙掕壊 */ private List roles; /** - * 状态(true启用false禁用) + * 鐘舵�侊紙true鍚敤false绂佺敤锛� */ private Boolean status; /** - * 创建时间 + * 鍒涘缓鏃堕棿 */ private Date createDate; /** - * 修改时间 + * 淇敼鏃堕棿 */ private Date modifyDate; /** - * 最后登录时间 + * 鏈�鍚庣櫥褰曟椂闂� */ private Date lastLoginDate; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/Enterprise.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/Enterprise.java index a4ec152fc..efea43174 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/Enterprise.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/Enterprise.java @@ -12,7 +12,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * PDS 企业信息 + * PDS 浼佷笟淇℃伅 * @author yinjihuan * */ @@ -24,152 +24,152 @@ public class Enterprise implements MongoEntity { private String id; /** - * 企业名称 + * 浼佷笟鍚嶇О */ private String enterpriseName; /** - * 企业简称 + * 浼佷笟绠�绉� */ private String simpleName; /** - * 企业状态(true启用 false停用) + * 浼佷笟鐘舵��(true鍚敤 false鍋滅敤) */ private Boolean enterpriseStatus; /** - * 企业信息描述 + * 浼佷笟淇℃伅鎻忚堪 */ private String enterpriseDesc; /** - * 办公地址 + * 鍔炲叕鍦板潃 */ private String address; /** - * 官网 + * 瀹樼綉 */ private String website; /** - * 企业负责人 + * 浼佷笟璐熻矗浜� */ private String enterprisePerson; /** - * 联系手机 + * 鑱旂郴鎵嬫満 */ private String enterprisePersonPhone; /** - * 办公座机 + * 鍔炲叕搴ф満 */ private String enterprisePersonTelephone; /** - * 邮箱 + * 閭 */ private String enterprisePersonEmail; /** - * 销售负责人 + * 閿�鍞礋璐d汉 */ private String salesPerson; /** - * 期限限制-开始日期 + * 鏈熼檺闄愬埗-寮�濮嬫棩鏈� */ private Date startDateLimit; /** - * 期限限制-结束日期 + * 鏈熼檺闄愬埗-缁撴潫鏃ユ湡 */ private Date endDateLimit; /** - * 贷款人查询(true启用 false停用) + * 璐锋浜烘煡璇�(true鍚敤 false鍋滅敤) */ private Boolean lenderQueryStatus = false; /** - * 企业开通的城市 + * 浼佷笟寮�閫氱殑鍩庡競 */ private List enterpriseCitys; /** - * 货客开通的城市 + * 璐у寮�閫氱殑鍩庡競 */ private List huoKeCitys; /** - * 房龄超龄提醒状态 + * 鎴块緞瓒呴緞鎻愰啋鐘舵�� */ private Boolean houseYearLimitStatus = false; /** - * 房龄超龄提醒 + * 鎴块緞瓒呴緞鎻愰啋 */ private Integer houseYearLimit; /** - * 访问IP白名单 + * 璁块棶IP鐧藉悕鍗� */ private List whiteIps; /** - * 创建时间 + * 鍒涘缓鏃堕棿 */ private Date createDate; /** - * 修改时间 + * 淇敼鏃堕棿 */ private Date modifyDate; /** - * 我要评估状态(true启用 false停用) + * 鎴戣璇勪及鐘舵��(true鍚敤 false鍋滅敤) */ private Boolean evaluatingStatus = false; /** - * 货客状态(true启用 false停用) + * 璐у鐘舵��(true鍚敤 false鍋滅敤) */ private Boolean huoKeStatus = false; /** - * 客户评级状态(true启用 false停用) + * 瀹㈡埛璇勭骇鐘舵��(true鍚敤 false鍋滅敤) */ private Boolean customerLevelStatus = false; /** - * 客户分类状态(true启用 false停用) + * 瀹㈡埛鍒嗙被鐘舵��(true鍚敤 false鍋滅敤) */ private Boolean customerTypeStatus = false; /** - * 我的房产状态(true启用 false停用) + * 鎴戠殑鎴夸骇鐘舵��(true鍚敤 false鍋滅敤) */ private Boolean myHouseStatus = false; /** - * 贷前估值状态(true启用 false停用) + * 璐峰墠浼板�肩姸鎬�(true鍚敤 false鍋滅敤) */ private Boolean prevaluationStatus = false; /** - * 批量评估状态(true启用 false停用) + * 鎵归噺璇勪及鐘舵��(true鍚敤 false鍋滅敤) */ private Boolean evaluationBatchStatus = false; /** - * 评估报告状态(true启用 false停用) + * 璇勪及鎶ュ憡鐘舵��(true鍚敤 false鍋滅敤) */ private Boolean reportListStatus = false; /** - * 人房报告标识(0:老的PDS企业 1:人房报告企业(只有报告菜单)) + * 浜烘埧鎶ュ憡鏍囪瘑锛�0锛氳�佺殑PDS浼佷笟 1锛氫汉鎴挎姤鍛婁紒涓氾紙鍙湁鎶ュ憡鑿滃崟锛夛級 */ private int reportFlag = 0; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/EquipmentInfo.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/EquipmentInfo.java index acdc817b8..f84ed0974 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/EquipmentInfo.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/EquipmentInfo.java @@ -9,7 +9,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * pds 获客页面贷款申请 + * pds 鑾峰椤甸潰璐锋鐢宠 * * @author hbl */ @@ -18,20 +18,20 @@ import com.fangjia.dal.MongoEntity; public class EquipmentInfo implements MongoEntity { private String id; /** - * 对应的押品sid + * 瀵瑰簲鐨勬娂鍝乻id */ private String sid; /** - * 浏览器版本 + * 娴忚鍣ㄧ増鏈� */ private String browserEdition; /** - * IP地址 + * IP鍦板潃 */ private String ip; /** - * ip所属城市 + * ip鎵�灞炲煄甯� */ private String ipCity; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/EvaluationBeforeLoan.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/EvaluationBeforeLoan.java index bb596aa09..91ef5cb37 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/EvaluationBeforeLoan.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/EvaluationBeforeLoan.java @@ -18,7 +18,7 @@ import javax.persistence.Table; /** - * 贷前估值评估结果 + * 璐峰墠浼板�艰瘎浼扮粨鏋� * * @author yinjihuan * @@ -28,326 +28,326 @@ import javax.persistence.Table; public class EvaluationBeforeLoan implements MongoEntity { /** - * 主键ID + * 涓婚敭ID */ private String id; /** - * 原始输入数据主键ID + * 鍘熷杈撳叆鏁版嵁涓婚敭ID */ private String eid; /** - * 城市 + * 鍩庡競 */ private String city; /** - * 区域 + * 鍖哄煙 */ private String region; /** - * 小区名 + * 灏忓尯鍚� */ private String name; /** - * 小区地址 + * 灏忓尯鍦板潃 */ private String address; /** - * 楼栋号 + * 妤兼爧鍙� */ private String ldNum; /** - * 室号 + * 瀹ゅ彿 */ private String roomNum; /** - * 总价(元) + * 鎬讳环(鍏�) */ private Long totalPrice; /** - * 均价(元) + * 鍧囦环(鍏�) */ private Integer avgPrice; /** - * 创建时间 + * 鍒涘缓鏃堕棿 */ private Date createDate; /** - * 面积 + * 闈㈢Н */ private Double area; /** - * 朝向 + * 鏈濆悜 */ private String direction; /** - * 赠送面积 + * 璧犻�侀潰绉� */ private Double giveArea; /** - * 所在楼层 + * 鎵�鍦ㄦゼ灞� */ private Integer floor; /** - * 总楼层 + * 鎬绘ゼ灞� */ private Integer height; /** - * 房屋类型 + * 鎴垮眿绫诲瀷 */ private String roomType; /** - * 建筑类型 + * 寤虹瓚绫诲瀷 */ private String buildType; /** - * 资产概述 + * 璧勪骇姒傝堪 */ private String desc; /** - * 小区图片 + * 灏忓尯鍥剧墖 */ private List districtPics; /** - * 板块 + * 鏉垮潡 */ private String block; /** - * 环线 + * 鐜嚎 */ private String loopLineInfo; /** - * 物业类型 + * 鐗╀笟绫诲瀷 */ private String estateType; /** - * 建筑年代 + * 寤虹瓚骞翠唬 */ private String buildYear; /** - * 停车位数量 + * 鍋滆溅浣嶆暟閲� */ private Integer carSiteCount; /** - * 容积率 + * 瀹圭Н鐜� */ private String cubagePercent; /** - * 绿化率 + * 缁垮寲鐜� */ private String virescencePercent; /** - * 户数 + * 鎴锋暟 */ private Integer householdCount; /** - * 物业费 + * 鐗╀笟璐� */ private String estateCharge; /** - * 开发商 + * 寮�鍙戝晢 */ private String developer; /** - * 物业公司 + * 鐗╀笟鍏徃 */ private String estateCompany; /** - * 小区建筑面积 + * 灏忓尯寤虹瓚闈㈢Н */ private String buildArea; /** - * 产权年限 + * 浜ф潈骞撮檺 */ private String propertyLife; /** - * 经度 + * 缁忓害 */ private Double lng; /** - * 纬度 + * 绾害 */ private Double lat; /** - * 上月参考均价 + * 涓婃湀鍙傝�冨潎浠� */ private Integer topMonthAvgPrice; /** - * 近1年涨跌幅(%) + * 杩�1骞存定璺屽箙锛�%锛� */ private Double oneYearUpDownRange; /** - * 当前估价时间的周均价 + * 褰撳墠浼颁环鏃堕棿鐨勫懆鍧囦环 */ private Integer weekAvgPrice; /** - * 于上周相比的涨跌幅(%) + * 浜庝笂鍛ㄧ浉姣旂殑娑ㄨ穼骞咃紙%锛� */ private double topWeekUpDownRange; /** - * 涨跌幅在城市排名(%) + * 娑ㄨ穼骞呭湪鍩庡競鎺掑悕锛�%锛� */ private Double upDownRangecityLevel; /** - * 城市均价走势(2年) + * 鍩庡競鍧囦环璧板娍锛�2骞达級 */ private Map cityAvgZouShi; /** - * 区域均价走势(2年) + * 鍖哄煙鍧囦环璧板娍锛�2骞达級 */ private Map regionAvgZouShi; /** - * 小区均价走势(2年) + * 灏忓尯鍧囦环璧板娍锛�2骞达級 */ private Map districtAvgZouShi; /** - * 房型占比情况 - * 0-其他,1-一室,2-二室,3-三室,4-四室 + * 鎴垮瀷鍗犳瘮鎯呭喌 + * 0-鍏朵粬锛�1-涓�瀹わ紝2-浜屽锛�3-涓夊锛�4-鍥涘 */ private Map hourseTypeProportion; /** - * 面积占比情况 - * 0-其他,1:60平米(含)以下,2:60-90平米(含),3:90-120平米(含),4:120平米以上 + * 闈㈢Н鍗犳瘮鎯呭喌 + * 0-鍏朵粬锛�1:60骞崇背(鍚�)浠ヤ笅锛�2:60-90骞崇背(鍚�)锛�3:90-120骞崇背(鍚�)锛�4:120骞崇背浠ヤ笂 */ private Map hourseAreaProportion; /** - * 临近小区均价 - * 外层 map key 小区名称 - * 内层 map key 距离 value 均价 + * 涓磋繎灏忓尯鍧囦环 + * 澶栧眰 map key 灏忓尯鍚嶇О + * 鍐呭眰 map key 璺濈 value 鍧囦环 */ private Map> avgPriceNearby; /** - * 各大门户小区均价 + * 鍚勫ぇ闂ㄦ埛灏忓尯鍧囦环 */ private BasicDBObject averageStatistics; /** - * 房源近1个月发布量 + * 鎴挎簮杩�1涓湀鍙戝竷閲� */ private int quoteHouseOne; /** - * 房源近6个月发布量 + * 鎴挎簮杩�6涓湀鍙戝竷閲� */ private int quoteHouseSix; /** - * 房源在城市中六个月挂牌量排名比 + * 鎴挎簮鍦ㄥ煄甯備腑鍏釜鏈堟寕鐗岄噺鎺掑悕姣� */ private Double sixQuoteLevelRate; /** - * 周围地铁数量 + * 鍛ㄥ洿鍦伴搧鏁伴噺 */ private Integer metroCount; /** - * 周围公交数量 + * 鍛ㄥ洿鍏氦鏁伴噺 */ private Integer busCount; /** - * 交通城市排名 + * 浜ら�氬煄甯傛帓鍚� */ private Double trafficLevelRate; /** - * 户数在城市中排名比 + * 鎴锋暟鍦ㄥ煄甯備腑鎺掑悕姣� */ private Double houseHoldRate; /** - * 均价在城市中排名比 + * 鍧囦环鍦ㄥ煄甯備腑鎺掑悕姣� */ private Double priceRate; /** - * 处置难易度 + * 澶勭疆闅炬槗搴� */ private Double handleLevel; /** - * 价格平稳度 + * 浠锋牸骞崇ǔ搴� */ private Double priceStability; /** - * 综合评分 + * 缁煎悎璇勫垎 */ private Double totalScore; /** - * 过去6个月的挂牌量以及价格走势 - * key:时间 - * value: key:挂牌量 value:价格 + * 杩囧幓6涓湀鐨勬寕鐗岄噺浠ュ強浠锋牸璧板娍 + * key:鏃堕棿 + * value: key:鎸傜墝閲� value:浠锋牸 */ private Map> quoteLastYear; /** - * 小区房源参考,最多5条 + * 灏忓尯鎴挎簮鍙傝�冿紝鏈�澶�5鏉� */ private List> houses; /** - * 是否评估成功 + * 鏄惁璇勪及鎴愬姛 */ private Boolean status; /** - * 区域近12个月的年涨跌幅 + * 鍖哄煙杩�12涓湀鐨勫勾娑ㄨ穼骞� */ private List regionSellStats; /** - * 城市近12个月的涨幅 + * 鍩庡競杩�12涓湀鐨勬定骞� */ private List citySellStats; /** - * 押品年限 + * 鎶煎搧骞撮檺 */ private Integer houseAge; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/FileDataDetail.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/FileDataDetail.java index 7e5095148..be55b331b 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/FileDataDetail.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/FileDataDetail.java @@ -17,66 +17,66 @@ public class FileDataDetail implements MongoEntity{ private String id; /** - * 匹配城市 + * 鍖归厤鍩庡競 */ private String city; /** - * 匹配区域 + * 鍖归厤鍖哄煙 */ private String region; /** - * 匹配小区名 + * 鍖归厤灏忓尯鍚� */ private String name; /** - * 输入地址 + * 杈撳叆鍦板潃 */ private String address; /** - * 均价 + * 鍧囦环 */ private Integer avgPrice; /** - * 资产等级 + * 璧勪骇绛夌骇 */ private Integer assetLevel; /** - * 均价在当前城市排名 + * 鍧囦环鍦ㄥ綋鍓嶅煄甯傛帓鍚� */ private Integer cityLevel; /** - * 资产排名指数 + * 璧勪骇鎺掑悕鎸囨暟 */ private Double assetIndex; /** - * 创建日期 + * 鍒涘缓鏃ユ湡 */ private Date createDate; /** - * 总表id + * 鎬昏〃id */ private String fileId; /** - * 匹配状态 null(数据还没有进行匹配时候的状态),成功 0,失败1 + * 鍖归厤鐘舵�� null(鏁版嵁杩樻病鏈夎繘琛屽尮閰嶆椂鍊欑殑鐘舵��),鎴愬姛 0,澶辫触1 */ private Integer status; /** - * 均价(用于页面展示) + * 鍧囦环(鐢ㄤ簬椤甸潰灞曠ず) */ private String avgStrPrice; /** - * 资产排名指数(用于页面展示) + * 璧勪骇鎺掑悕鎸囨暟(鐢ㄤ簬椤甸潰灞曠ず) */ private Integer index; /** - * 纬度 + * 绾害 */ private Double lat; /** - * 经度 + * 缁忓害 */ private Double lng; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/FileDataDetailBatch.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/FileDataDetailBatch.java index 2e5ed95ab..1380c9dc6 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/FileDataDetailBatch.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/FileDataDetailBatch.java @@ -10,7 +10,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 批量评估 + * 鎵归噺璇勪及 * */ @Entity @@ -21,85 +21,85 @@ public class FileDataDetailBatch implements MongoEntity{ private String id; /** - * 匹配城市 + * 鍖归厤鍩庡競 */ private String city; /** - * 匹配区域 + * 鍖归厤鍖哄煙 */ private String region; /** - * 匹配小区名 + * 鍖归厤灏忓尯鍚� */ private String name; /** - * 输入城市 + * 杈撳叆鍩庡競 */ private String inputCity; /** - * 输入小区名 + * 杈撳叆灏忓尯鍚� */ private String inputName; /** - * 输入地址 + * 杈撳叆鍦板潃 */ private String address; /** - * 输入面积 + * 杈撳叆闈㈢Н */ private Double area; /** - * 创建日期 + * 鍒涘缓鏃ユ湡 */ private Date createDate; /** - * 总表id + * 鎬昏〃id */ private String fileId; /** - * 匹配状态 null(数据还没有进行匹配时候的状态),成功 0,失败1 + * 鍖归厤鐘舵�� null(鏁版嵁杩樻病鏈夎繘琛屽尮閰嶆椂鍊欑殑鐘舵��),鎴愬姛 0,澶辫触1 */ private Integer status; /** - * 资产排名指数(用于页面展示) + * 璧勪骇鎺掑悕鎸囨暟(鐢ㄤ簬椤甸潰灞曠ず) */ private Integer index; /** - * 序号 + * 搴忓彿 */ private Integer seq; /** - * 房龄 单位:年 + * 鎴块緞 鍗曚綅:骞� */ private Integer houseYear; /** - * 物业类型 + * 鐗╀笟绫诲瀷 */ private String estateType; /** - * 评估总价 单位:元 + * 璇勪及鎬讳环 鍗曚綅锛氬厓 */ private Integer totalPrice; /** - * 评估单价 单位:元 + * 璇勪及鍗曚环 鍗曚綅锛氬厓 */ private Integer price; /** - * 近1年涨跌幅(%) + * 杩�1骞存定璺屽箙锛�%锛� */ private Double oneYearUpDownRange; /** - * 纬度 + * 绾害 */ private Double lat; /** - * 经度 + * 缁忓害 */ private Double lng; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/FileDataTotality.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/FileDataTotality.java index 61ddd5724..39674b0ca 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/FileDataTotality.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/FileDataTotality.java @@ -17,31 +17,31 @@ public class FileDataTotality implements MongoEntity{ private String id; /** - * 用户id + * 鐢ㄦ埛id */ private String userId; /** - * 文件名字 + * 鏂囦欢鍚嶅瓧 */ private String fileName; /** - * 状态 0上传中(fileDataTotality已经保存,而fileDataDetail没有保存完) 1分析中(fileDataDetail创建保存完); 2分析完成(后台匹配完成) + * 鐘舵�� 0涓婁紶涓紙fileDataTotality宸茬粡淇濆瓨锛岃�宖ileDataDetail娌℃湁淇濆瓨瀹岋級 1鍒嗘瀽涓紙fileDataDetail鍒涘缓淇濆瓨瀹岋級; 2鍒嗘瀽瀹屾垚锛堝悗鍙板尮閰嶅畬鎴愶級 */ private Integer status; /** - * 创建日期 + * 鍒涘缓鏃ユ湡 */ private Date createDate; /** - * 成功条数 + * 鎴愬姛鏉℃暟 */ private Integer successCount; /** - * 失败条数 + * 澶辫触鏉℃暟 */ private Integer failCount; /** - * 匹配率 + * 鍖归厤鐜� */ private Double matchRate; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/FileDataTotalityBatch.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/FileDataTotalityBatch.java index d9739571e..f38d4d797 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/FileDataTotalityBatch.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/FileDataTotalityBatch.java @@ -17,31 +17,31 @@ public class FileDataTotalityBatch implements MongoEntity{ private String id; /** - * 用户id + * 鐢ㄦ埛id */ private String userId; /** - * 文件名字 + * 鏂囦欢鍚嶅瓧 */ private String fileName; /** - * 状态 0上传中(fileDataTotality已经保存,而fileDataDetail没有保存完) 1分析中(fileDataDetail创建保存完); 2分析完成(后台匹配完成) + * 鐘舵�� 0涓婁紶涓紙fileDataTotality宸茬粡淇濆瓨锛岃�宖ileDataDetail娌℃湁淇濆瓨瀹岋級 1鍒嗘瀽涓紙fileDataDetail鍒涘缓淇濆瓨瀹岋級; 2鍒嗘瀽瀹屾垚锛堝悗鍙板尮閰嶅畬鎴愶級 */ private Integer status; /** - * 创建日期 + * 鍒涘缓鏃ユ湡 */ private Date createDate; /** - * 成功条数 + * 鎴愬姛鏉℃暟 */ private Integer successCount; /** - * 失败条数 + * 澶辫触鏉℃暟 */ private Integer failCount; /** - * 匹配率 + * 鍖归厤鐜� */ private Double matchRate; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/HourseTypeStat.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/HourseTypeStat.java index f5d2a0f22..df681da1e 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/HourseTypeStat.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/HourseTypeStat.java @@ -10,7 +10,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 小区房型面积统计结果 + * 灏忓尯鎴垮瀷闈㈢Н缁熻缁撴灉 * @author yinjihuan * */ @@ -22,50 +22,50 @@ public class HourseTypeStat implements MongoEntity { private String id; /** - * 城市 + * 鍩庡競 */ private String city; /** - * 区域 + * 鍖哄煙 */ private String region; /** - * 小区名 + * 灏忓尯鍚� */ private String name; /** - * 房型占比情况 - * key: 0-其他,1-一室,2-二室,3-三室,4-四室 - * value: 数量 + * 鎴垮瀷鍗犳瘮鎯呭喌 + * key: 0-鍏朵粬锛�1-涓�瀹わ紝2-浜屽锛�3-涓夊锛�4-鍥涘 + * value: 鏁伴噺 */ private Map hourseTypeProportion; /** - * 面积占比情况 - * 0-其他,1:60平米(含)以下,2:60-90平米(含),3:90-120平米(含),4:120平米以上 + * 闈㈢Н鍗犳瘮鎯呭喌 + * 0-鍏朵粬锛�1:60骞崇背(鍚�)浠ヤ笅锛�2:60-90骞崇背(鍚�)锛�3:90-120骞崇背(鍚�)锛�4:120骞崇背浠ヤ笂 */ private Map hourseAreaProportion; /** - * 统计时间(yyyyMM) + * 缁熻鏃堕棿锛坹yyyMM锛� */ private int date; /** - * 数据创建时间 + * 鏁版嵁鍒涘缓鏃堕棿 */ private Date createDate; /** - * 小区房型中最小面积(贷前估值资产概述中的主力面积用到) + * 灏忓尯鎴垮瀷涓渶灏忛潰绉紙璐峰墠浼板�艰祫浜ф杩颁腑鐨勪富鍔涢潰绉敤鍒帮級 */ private Double minArea; /** - * 小区房型中最大面积(贷前估值资产概述中的主力面积用到) + * 灏忓尯鎴垮瀷涓渶澶ч潰绉紙璐峰墠浼板�艰祫浜ф杩颁腑鐨勪富鍔涢潰绉敤鍒帮級 */ private Double maxArea; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/HouseInfo.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/HouseInfo.java index 808425b89..980d94e92 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/HouseInfo.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/HouseInfo.java @@ -10,7 +10,7 @@ import javax.persistence.criteria.CriteriaBuilder; import java.util.Date; /** - * 押品房产信息 + * 鎶煎搧鎴夸骇淇℃伅 * Created by linxsh on 2016/12/7. */ @Entity @@ -19,74 +19,74 @@ public class HouseInfo implements MongoEntity { private static final long serialVersionUID = -4209088172091549241L; private String id; - /**当前登录用户ID,方便查找当前押品所属的公司机构*/ + /**褰撳墠鐧诲綍鐢ㄦ埛ID锛屾柟渚挎煡鎵惧綋鍓嶆娂鍝佹墍灞炵殑鍏徃鏈烘瀯*/ private String userId; - /**用于和borrower关联的id*/ + /**鐢ㄤ簬鍜宐orrower鍏宠仈鐨刬d*/ private String sid; - /** 房产类型 */ + /** 鎴夸骇绫诲瀷 */ private String estateType; - /**所在城市*/ + /**鎵�鍦ㄥ煄甯�*/ private String cityDisplay; - /**输入的城市*/ + /**杈撳叆鐨勫煄甯�*/ private String cityInput; - /**所在区、县*/ + /**鎵�鍦ㄥ尯銆佸幙*/ private String region; - /**楼盘/地址*/ + /**妤肩洏/鍦板潃*/ private String district; - /**楼号*/ + /**妤煎彿*/ private String houseNumber; - /**单元号*/ + /**鍗曞厓鍙�*/ private String unitNumber; - /**室号*/ + /**瀹ゅ彿*/ private String roomNumber; - /**所在楼层*/ + /**鎵�鍦ㄦゼ灞�*/ private Integer floor; - /**总楼层*/ + /**鎬绘ゼ灞�*/ private Integer height; - /**建筑面积*/ + /**寤虹瓚闈㈢Н*/ private Double area; - /**购置时间*/ + /**璐疆鏃堕棿*/ private Date purchaseDate; - /**购置价格*/ + /**璐疆浠锋牸*/ private Long purchasePrice; private Long totalPrice; private Integer unitPrice; private Double cityRank; private String address; - /**款项用途*/ + /**娆鹃」鐢ㄩ��*/ private String usage; - /**创建时间*/ + /**鍒涘缓鏃堕棿*/ private Date createDate = new Date(); - /*来源*/ + /*鏉ユ簮*/ private String from; - /**匹配到的小区名*/ + /**鍖归厤鍒扮殑灏忓尯鍚�*/ private String oriDistrict; - /**装修*/ + /**瑁呬慨*/ private String direction; - /**朝向*/ + /**鏈濆悜*/ private String fitment; - /**是否精准评估*/ + /**鏄惁绮惧噯璇勪及*/ private Boolean hasDetailInfo; /** - * 是否需要人工询价 + * 鏄惁闇�瑕佷汉宸ヨ浠� */ private Boolean needManualEval = false; /** - * 联系电话 + * 鑱旂郴鐢佃瘽 */ private String contactNumber; /** - * 城市中相对最低价格 + * 鍩庡競涓浉瀵规渶浣庝环鏍� */ private Integer cityDistrictMinSellPrice; /** - * 城市中相对最高价格 + * 鍩庡競涓浉瀵规渶楂樹环鏍� */ private Integer cityDistrictMaxSellPrice; /** - * 楼栋单元室号的拼接(用于移动端) + * 妤兼爧鍗曞厓瀹ゅ彿鐨勬嫾鎺ワ紙鐢ㄤ簬绉诲姩绔級 */ private String loudongName; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/HouseInfoMonitor.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/HouseInfoMonitor.java index a53b25b25..f67b64c12 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/HouseInfoMonitor.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/HouseInfoMonitor.java @@ -10,7 +10,7 @@ import javax.persistence.criteria.CriteriaBuilder; import java.util.Date; /** - * 押品房产信息 + * 鎶煎搧鎴夸骇淇℃伅 * Created by linxsh on 2016/12/7. */ @Entity @@ -19,40 +19,40 @@ public class HouseInfoMonitor implements MongoEntity { private static final long serialVersionUID = -4209088172091549241L; private String id; - /**当前登录用户ID,方便查找当前押品所属的公司机构*/ + /**褰撳墠鐧诲綍鐢ㄦ埛ID锛屾柟渚挎煡鎵惧綋鍓嶆娂鍝佹墍灞炵殑鍏徃鏈烘瀯*/ private String userId; - /**评估的企业Id */ + /**璇勪及鐨勪紒涓欼d */ private String enterpriseId; private String city; - private String region;//区域 + private String region;//鍖哄煙 - private String name;//小区名字或者地址 + private String name;//灏忓尯鍚嶅瓧鎴栬�呭湴鍧� private String address; - private String matchCity;//匹配后的小区名 + private String matchCity;//鍖归厤鍚庣殑灏忓尯鍚� - private String matchRegion;//匹配后的区域名字 + private String matchRegion;//鍖归厤鍚庣殑鍖哄煙鍚嶅瓧 - private String matchName;//匹配后的小区名字 + private String matchName;//鍖归厤鍚庣殑灏忓尯鍚嶅瓧 - private Date createDate;//输入时间 + private Date createDate;//杈撳叆鏃堕棿 - private Integer resource;//来源 1、pds 2、hk 3、资产管理 4、客户评级 5、贷前估值 + private Integer resource;//鏉ユ簮 1銆乸ds 2銆乭k 3銆佽祫浜х鐞� 4銆佸鎴疯瘎绾� 5銆佽捶鍓嶄及鍊� - private Integer reason;//pds进来 1、可以评估的小区 2、小区不知此评估(找不到小区) 3、小区无均价 4、成功评估的小区 (注:客户评级中只有1,3,4)(贷前估值 1,2,3,4) + private Integer reason;//pds杩涙潵 1銆佸彲浠ヨ瘎浼扮殑灏忓尯 2銆佸皬鍖轰笉鐭ユ璇勪及锛堟壘涓嶅埌灏忓尯锛� 3銆佸皬鍖烘棤鍧囦环 4銆佹垚鍔熻瘎浼扮殑灏忓尯 锛堟敞锛氬鎴疯瘎绾т腑鍙湁1,3,4锛夛紙璐峰墠浼板�� 1锛�2锛�3锛�4锛� - private Integer otherAvgPriceMount;//第三方均价小于3个的次数 1代表小于(只有当reason为4的时候此字段才会存在) + private Integer otherAvgPriceMount;//绗笁鏂瑰潎浠峰皬浜�3涓殑娆℃暟 1浠h〃灏忎簬锛堝彧鏈夊綋reason涓�4鐨勬椂鍊欐瀛楁鎵嶄細瀛樺湪锛� - private Integer referHouseMount;//近期房源参考未显示5个及5个以上的次数 1代表大于等于5(只有当reason为4的时候此字段才会存在) + private Integer referHouseMount;//杩戞湡鎴挎簮鍙傝�冩湭鏄剧ず5涓強5涓互涓婄殑娆℃暟 1浠h〃澶т簬绛変簬5锛堝彧鏈夊綋reason涓�4鐨勬椂鍊欐瀛楁鎵嶄細瀛樺湪锛� - private String sid;//正常评估时候的和库中数据的链接(只有当reason为4的时候此字段才会存在)(贷前估值中正常估价后的结果的中的eid) + private String sid;//姝e父璇勪及鏃跺�欑殑鍜屽簱涓暟鎹殑閾炬帴锛堝彧鏈夊綋reason涓�4鐨勬椂鍊欐瀛楁鎵嶄細瀛樺湪锛�(璐峰墠浼板�间腑姝e父浼颁环鍚庣殑缁撴灉鐨勪腑鐨別id) - private String collId;//单套押品的id + private String collId;//鍗曞鎶煎搧鐨刬d - private Integer matchMount;//(贷前估值)输入匹配数量 + private Integer matchMount;//锛堣捶鍓嶄及鍊硷級杈撳叆鍖归厤鏁伴噺 @Id diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/HouseLevelInfo.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/HouseLevelInfo.java index 5839b0eb3..97286af4b 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/HouseLevelInfo.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/HouseLevelInfo.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 押品评级 + * 鎶煎搧璇勭骇 * Created by hbl on 2017/8/8. */ @Entity @@ -20,50 +20,50 @@ public class HouseLevelInfo implements MongoEntity { private static final long serialVersionUID = -4209088172091549241L; private String id; - /**当前登录用户ID,方便查找当前押品所属的公司机构*/ + /**褰撳墠鐧诲綍鐢ㄦ埛ID锛屾柟渚挎煡鎵惧綋鍓嶆娂鍝佹墍灞炵殑鍏徃鏈烘瀯*/ private String userId; /** - * 企业id + * 浼佷笟id */ private String enterPriseId; /** - * 查询输入 + * 鏌ヨ杈撳叆 */ private String inputName; /** - * 匹配城市 + * 鍖归厤鍩庡競 */ private String matchCity; /** - * 匹配区域 + * 鍖归厤鍖哄煙 */ private String matchRegion; /** - * 匹配小区名字 + * 鍖归厤灏忓尯鍚嶅瓧 */ private String matchName; /** - * 匹配小区地址 + * 鍖归厤灏忓尯鍦板潃 */ private String matchAddress; /** - * 匹配时间 + * 鍖归厤鏃堕棿 */ private Date createDate; /** - * 匹配小区均价 + * 鍖归厤灏忓尯鍧囦环 */ private Integer avgPrice; /** - * 城市排名 + * 鍩庡競鎺掑悕 */ private Integer rank; /** - * 排名指数 + * 鎺掑悕鎸囨暟 */ private Double levelRate; /** - * 特殊唯一id + * 鐗规畩鍞竴id */ private String sid; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/LoanApply.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/LoanApply.java index 1d7794461..f2f338d54 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/LoanApply.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/LoanApply.java @@ -7,7 +7,7 @@ import javax.persistence.*; import java.util.Date; /** - * pds 获客页面贷款申请 + * pds 鑾峰椤甸潰璐锋鐢宠 * * @author wenyan */ @@ -39,9 +39,9 @@ public class LoanApply implements MongoEntity { private String source; private String gender; /** - * 0:待处理 - * 1:已接受 - * 2:已放弃 + * 0:寰呭鐞� + * 1:宸叉帴鍙� + * 2:宸叉斁寮� */ private int status; private String operator; @@ -52,7 +52,7 @@ public class LoanApply implements MongoEntity { private String sid; private String from; /** - * 楼栋单元室号的拼接(用于移动端) + * 妤兼爧鍗曞厓瀹ゅ彿鐨勬嫾鎺ワ紙鐢ㄤ簬绉诲姩绔級 */ private String loudongName; @@ -257,10 +257,10 @@ public class LoanApply implements MongoEntity { long minute = minutes % 60; String msg = ""; if(hour != 0){ - msg = hour + "小时"; + msg = hour + "灏忔椂"; } if(minute != 0){ - msg = minute + "分钟"; + msg = minute + "鍒嗛挓"; } return msg; } diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/LoanRate.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/LoanRate.java index ef490be8c..aed3652a4 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/LoanRate.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/LoanRate.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * PDS企业贷款利率 + * PDS浼佷笟璐锋鍒╃巼 * @author yinjihuan * */ @@ -24,22 +24,22 @@ public class LoanRate implements MongoEntity { private String id; /** - * 利率标识(1:6个月内 2:6个月-1年内 3:1年-3年 4:3年-5年 5:5年以上) + * 鍒╃巼鏍囪瘑锛�1锛�6涓湀鍐� 2锛�6涓湀-1骞村唴 3锛�1骞�-3骞� 4锛�3骞�-5骞� 5锛�5骞翠互涓婏級 */ private Integer index; /** - * 自定义利率 + * 鑷畾涔夊埄鐜� */ private Double customRate; /** - * 企业编号 + * 浼佷笟缂栧彿 */ private String enterpriseId; /** - * 修改时间 + * 淇敼鏃堕棿 */ private Date modifyDate; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/ManualInquiry.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/ManualInquiry.java index 27fe32407..39135cd55 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/ManualInquiry.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/ManualInquiry.java @@ -12,7 +12,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 人工询价信息记录表 + * 浜哄伐璇环淇℃伅璁板綍琛� * @author yinjihuan * */ @@ -25,101 +25,101 @@ public class ManualInquiry implements MongoEntity { private String id; /** - * 评估ID + * 璇勪及ID */ private String sid; /** - * 类型(1:人工询价 2:价格纠错) + * 绫诲瀷锛�1:浜哄伐璇环 2:浠锋牸绾犻敊锛� */ private int type; - //============价格纠错才有 start=============// + //============浠锋牸绾犻敊鎵嶆湁 start=============// /** - * 评估均价 + * 璇勪及鍧囦环 */ private int evalPrice; /** - * 原因(1偏低 2偏高 3合理) + * 鍘熷洜锛�1鍋忎綆 2鍋忛珮 3鍚堢悊锛� */ private int reason; /** - * 我认为的均价 + * 鎴戣涓虹殑鍧囦环 */ private int myPrice; - //============价格纠错才有 end =============// + //============浠锋牸绾犻敊鎵嶆湁 end =============// /** - * 回复给客户的价格, 价格纠错就是直接回复的价格, 人工估价,如果能评估,那就是评估之后的价格, 不能评估为空 + * 鍥炲缁欏鎴风殑浠锋牸锛� 浠锋牸绾犻敊灏辨槸鐩存帴鍥炲鐨勪环鏍硷紝 浜哄伐浼颁环锛屽鏋滆兘璇勪及锛岄偅灏辨槸璇勪及涔嬪悗鐨勪环鏍硷紝 涓嶈兘璇勪及涓虹┖ */ private int replyPrice; /** - * 创建时间 + * 鍒涘缓鏃堕棿 */ private Date crateDate; /** - * 提交用户所在企业ID + * 鎻愪氦鐢ㄦ埛鎵�鍦ㄤ紒涓欼D */ private String eid; /** - * 提交用户所在企业名称 + * 鎻愪氦鐢ㄦ埛鎵�鍦ㄤ紒涓氬悕绉� */ private String ename; /** - * 提交用户ID + * 鎻愪氦鐢ㄦ埛ID */ private String uid; /** - * 提交用户姓名 + * 鎻愪氦鐢ㄦ埛濮撳悕 */ private String uname; /** - * 用户手机号 + * 鐢ㄦ埛鎵嬫満鍙� */ private String umobile; /** - * 状态(0 待回价 1已回价) + * 鐘舵�侊紙0 寰呭洖浠� 1宸插洖浠凤級 */ private int status; /** - * 回复时间 + * 鍥炲鏃堕棿 */ private Date replyTime; /** - * 回复用户 + * 鍥炲鐢ㄦ埛 */ private String replyUser; /** - * 回复内容 + * 鍥炲鍐呭 */ private String replyContent; /** - * 回复类型(1 可评估 2不可评估) + * 鍥炲绫诲瀷锛�1 鍙瘎浼� 2涓嶅彲璇勪及锛� */ private int replyType; /** - * 不能评估原因(1小区不存在 2无法获取价格 3非住宅,不支持估价) + * 涓嶈兘璇勪及鍘熷洜锛�1灏忓尯涓嶅瓨鍦� 2鏃犳硶鑾峰彇浠锋牸 3闈炰綇瀹咃紝涓嶆敮鎸佷及浠凤級 */ private int noEvalReason; /** - * 房产证和土地证 + * 鎴夸骇璇佸拰鍦熷湴璇� */ private List certificates; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/MortgageDetail.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/MortgageDetail.java index 9127a2067..bf050e823 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/MortgageDetail.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/MortgageDetail.java @@ -21,18 +21,18 @@ public class MortgageDetail implements MongoEntity{ private String id; - private List cardIds;//贷款人集合 - private List houseIds;//房产集合 - private Integer loanMonth;//贷款期限 - private Double rate;//年化利率 - private Date lendingDate;//放贷时间 - private Integer repaymentWay;//还款方式 1:等额本息 2:等额本金 - private Integer lendingPrice;//放贷金额 + private List cardIds;//璐锋浜洪泦鍚� + private List houseIds;//鎴夸骇闆嗗悎 + private Integer loanMonth;//璐锋鏈熼檺 + private Double rate;//骞村寲鍒╃巼 + private Date lendingDate;//鏀捐捶鏃堕棿 + private Integer repaymentWay;//杩樻鏂瑰紡 1:绛夐鏈伅 2:绛夐鏈噾 + private Integer lendingPrice;//鏀捐捶閲戦 private Date createDate; private String userId; private String enterpriseId; - private String source;//数据来源 - private Long balance; //贷款余额 + private String source;//鏁版嵁鏉ユ簮 + private Long balance; //璐锋浣欓 private Long version; @Id diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/NeedCollateralRate.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/NeedCollateralRate.java index b94ae4599..27c5708da 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/NeedCollateralRate.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/NeedCollateralRate.java @@ -9,7 +9,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * PDS 抵押品信息 + * PDS 鎶垫娂鍝佷俊鎭� * * @author hubingliang * @@ -20,8 +20,8 @@ public class NeedCollateralRate implements MongoEntity { private static final long serialVersionUID = 2787328470517909863L; private String id; - private String enterpriseId;//企业id - private Integer needAdvise;//0为关闭,1为开启 + private String enterpriseId;//浼佷笟id + private Integer needAdvise;//0涓哄叧闂紝1涓哄紑鍚� @Id diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/OnceCollateralEvaluationInfo.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/OnceCollateralEvaluationInfo.java index a22f1b0cb..e0d3d3d64 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/OnceCollateralEvaluationInfo.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/OnceCollateralEvaluationInfo.java @@ -12,7 +12,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * PDS 抵押品信息 + * PDS 鎶垫娂鍝佷俊鎭� * * @author hubingliang * @@ -28,55 +28,55 @@ public class OnceCollateralEvaluationInfo implements MongoEntity { private String sid; private String enterpriseId; - /** 主贷款人 */ + /** 涓昏捶娆句汉 */ private String mianIdCode; - /** 共同贷款人省份证号集合 */ + /** 鍏卞悓璐锋浜虹渷浠借瘉鍙烽泦鍚� */ private List deputyIdCodes; - /** 抵押品id集合 */ + /** 鎶垫娂鍝乮d闆嗗悎 */ private List collateralIds; - /** 抵押品总价 */ + /** 鎶垫娂鍝佹�讳环 */ private Integer totalPrice; - /** 最大抵押率 */ + /** 鏈�澶ф姷鎶肩巼 */ private Double maxCollateralRate; - /** 可以贷款金额 */ + /** 鍙互璐锋閲戦 */ private Integer loneAmount; - /** 创建日期 */ + /** 鍒涘缓鏃ユ湡 */ private Date creatDate; - /**修改时间*/ + /**淇敼鏃堕棿*/ private Date modificationDate; - /** 综合评分*/ + /** 缁煎悎璇勫垎*/ private Double totalScore; - /**价格稳定度*/ + /**浠锋牸绋冲畾搴�*/ private Double priceStability; - /**处置难易度*/ + /**澶勭疆闅炬槗搴�*/ private Double handleLevel; - /**是否添加到抵押品库 0:不添加 1:添加*/ + /**鏄惁娣诲姞鍒版姷鎶煎搧搴� 0:涓嶆坊鍔� 1:娣诲姞*/ private Integer status=0; - /**是否需要建议抵押率*/ + /**鏄惁闇�瑕佸缓璁姷鎶肩巼*/ private Integer needAdvise; - /** 用途 */ + /** 鐢ㄩ�� */ private String usage; /** - *押品来源 eam:资产管理, hk:获客 + *鎶煎搧鏉ユ簮 eam锛氳祫浜х鐞�, hk:鑾峰 */ private String from; /** - * 判断是不是第一次估价,还是直接查询 + * 鍒ゆ柇鏄笉鏄涓�娆′及浠凤紝杩樻槸鐩存帴鏌ヨ */ private Integer isFirst; /** - * 押品的城市 + * 鎶煎搧鐨勫煄甯� */ private String city; /** - * 小区名字 + * 灏忓尯鍚嶅瓧 */ private String name; /** - * 小区地址 + * 灏忓尯鍦板潃 */ private String address; @Id diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/PdsAlgorithmRule.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/PdsAlgorithmRule.java index 00e2bc886..97d803ed7 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/PdsAlgorithmRule.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/PdsAlgorithmRule.java @@ -22,36 +22,36 @@ public class PdsAlgorithmRule implements MongoEntity { private List activeCity; public enum FieldEnum { - AGENCY_COUNT(0.2, "中介数量权重"), - AGENCY_COUNT_MAX(90.0, "中介数量max值"), - AGENCY_COUNT_MIN(0, "中介数量min值"), - AGENCY_RADIUS(1.0, "中介数取值半径范围"), - PUBLISH_COUNT_FACTOR(0.3, "发布量权重"), - PUBLISH_COUNT_MAX(900.0, "发布量max值"), - PUBLISH_COUNT_MIN(0, "发布量min值"), - TRAFFIC_FACROR(0.2, "交通权重"), - BUS_FACTOR(0.6, "公交权重"), - METRO_FACTOR(0.4, "地铁权重"), - BUS_COUNT_MAX(48, "公交数量max值"), - BUS_COUNT_MIN(0, "公交数量min值"), - METRO_COUNT_MAX(5, "地铁数量max值"), - METRO_COUNT_MIN(0, "地铁数量min值"), - BUS_RADIUS(1.0, "公交数取值半径范围"), - METRO_RADIUS(1.0, "地铁数取值半径范围"), - PROPERTY_DENSITY_FACTOR(0.1, "小区密度权重"), - PROPERTY_DENSITY_MAX(400, "小区密度max值"), - PROPERTY_DENSITY_MIN(10, "小区密度min值"), - PUBLISH_A(850, "发布量A值"), - PUBLISH_B(200, "发布量B值"), - PROPERTY_DENSITY_RADIUS(1.0, "小区密度取值半径范围"), - TOTAL_PRICE_FACTOR(0.2, "房屋总价权重"), - TOTAL_PRICE_A(270, "总价A值"), - TOTAL_PRICE_B(18, "总价B值"), - TOTAL_PRICE_E(54, "总价E值"), - TOTAL_PRICE_F(72, "总价F值"), - YOY_FACTOR(0.2, "年涨跌幅权重"), - YOY_D(2, "年涨跌幅D值"), - YOY_C(1, "年涨跌幅C值"), + AGENCY_COUNT(0.2, "涓粙鏁伴噺鏉冮噸"), + AGENCY_COUNT_MAX(90.0, "涓粙鏁伴噺max鍊�"), + AGENCY_COUNT_MIN(0, "涓粙鏁伴噺min鍊�"), + AGENCY_RADIUS(1.0, "涓粙鏁板彇鍊煎崐寰勮寖鍥�"), + PUBLISH_COUNT_FACTOR(0.3, "鍙戝竷閲忔潈閲�"), + PUBLISH_COUNT_MAX(900.0, "鍙戝竷閲弇ax鍊�"), + PUBLISH_COUNT_MIN(0, "鍙戝竷閲弇in鍊�"), + TRAFFIC_FACROR(0.2, "浜ら�氭潈閲�"), + BUS_FACTOR(0.6, "鍏氦鏉冮噸"), + METRO_FACTOR(0.4, "鍦伴搧鏉冮噸"), + BUS_COUNT_MAX(48, "鍏氦鏁伴噺max鍊�"), + BUS_COUNT_MIN(0, "鍏氦鏁伴噺min鍊�"), + METRO_COUNT_MAX(5, "鍦伴搧鏁伴噺max鍊�"), + METRO_COUNT_MIN(0, "鍦伴搧鏁伴噺min鍊�"), + BUS_RADIUS(1.0, "鍏氦鏁板彇鍊煎崐寰勮寖鍥�"), + METRO_RADIUS(1.0, "鍦伴搧鏁板彇鍊煎崐寰勮寖鍥�"), + PROPERTY_DENSITY_FACTOR(0.1, "灏忓尯瀵嗗害鏉冮噸"), + PROPERTY_DENSITY_MAX(400, "灏忓尯瀵嗗害max鍊�"), + PROPERTY_DENSITY_MIN(10, "灏忓尯瀵嗗害min鍊�"), + PUBLISH_A(850, "鍙戝竷閲廇鍊�"), + PUBLISH_B(200, "鍙戝竷閲廈鍊�"), + PROPERTY_DENSITY_RADIUS(1.0, "灏忓尯瀵嗗害鍙栧�煎崐寰勮寖鍥�"), + TOTAL_PRICE_FACTOR(0.2, "鎴垮眿鎬讳环鏉冮噸"), + TOTAL_PRICE_A(270, "鎬讳环A鍊�"), + TOTAL_PRICE_B(18, "鎬讳环B鍊�"), + TOTAL_PRICE_E(54, "鎬讳环E鍊�"), + TOTAL_PRICE_F(72, "鎬讳环F鍊�"), + YOY_FACTOR(0.2, "骞存定璺屽箙鏉冮噸"), + YOY_D(2, "骞存定璺屽箙D鍊�"), + YOY_C(1, "骞存定璺屽箙C鍊�"), ; private final double defaultValue; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/PdsNotice.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/PdsNotice.java index bcd61e16b..047babd46 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/PdsNotice.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/PdsNotice.java @@ -10,7 +10,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * PDS 1.4.7新增首页消息通知 + * PDS 1.4.7鏂板棣栭〉娑堟伅閫氱煡 * @author yinjihuan * */ @@ -23,37 +23,37 @@ public class PdsNotice implements MongoEntity { private String id; /** - * 消息类型(1:人工询价 2:价格纠错 3:系统通知) + * 娑堟伅绫诲瀷锛�1:浜哄伐璇环 2:浠锋牸绾犻敊 3:绯荤粺閫氱煡锛� */ private int type; /** - * 消息内容 + * 娑堟伅鍐呭 */ private String content; /** - * 创建时间 + * 鍒涘缓鏃堕棿 */ private Date createDate; /** - * 转换时间显示 + * 杞崲鏃堕棿鏄剧ず */ private String dateStr; /** - * 扩展字段,比如人工询价中是对哪个房的询价sid:101111 + * 鎵╁睍瀛楁锛屾瘮濡備汉宸ヨ浠蜂腑鏄鍝釜鎴跨殑璇环sid:101111 */ private Map ext; /** - * 通知的用户编号 + * 閫氱煡鐨勭敤鎴风紪鍙� */ private String userId; /** - * 企业编号 + * 浼佷笟缂栧彿 */ private String eid; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/PdsNoticeVo.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/PdsNoticeVo.java index 3bb2e9cc1..1eb5481ab 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/PdsNoticeVo.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/PdsNoticeVo.java @@ -13,33 +13,33 @@ public class PdsNoticeVo { private String id; /** - * 消息类型(1:人工询价 2:价格纠错 3:系统通知) + * 娑堟伅绫诲瀷锛�1:浜哄伐璇环 2:浠锋牸绾犻敊 3:绯荤粺閫氱煡锛� */ private int type; /** - * 消息内容 + * 娑堟伅鍐呭 */ private String content; /** - * 转换时间显示 + * 杞崲鏃堕棿鏄剧ず */ private String dateStr; /** - * 扩展字段,比如人工询价中是对哪个房的询价hid:101111 + * 鎵╁睍瀛楁锛屾瘮濡備汉宸ヨ浠蜂腑鏄鍝釜鎴跨殑璇环hid:101111 */ private Map ext; /** - * 通知的用户编号 + * 閫氱煡鐨勭敤鎴风紪鍙� */ private String userId; /** - * 企业编号 + * 浼佷笟缂栧彿 */ private String eid; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/PdsRiskMap.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/PdsRiskMap.java index dc5d3edbc..4352c3946 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/PdsRiskMap.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/PdsRiskMap.java @@ -19,41 +19,41 @@ public class PdsRiskMap implements MongoEntity { private String id; private String city; private String region; - /**统计日期*/ + /**缁熻鏃ユ湡*/ private String countDate; - /**创建时间*/ + /**鍒涘缓鏃堕棿*/ private Date createDate; - /**放贷时间*/ + /**鏀捐捶鏃堕棿*/ private Date mortgageDate; - /**贷款月数(期数)*/ + /**璐锋鏈堟暟锛堟湡鏁帮級*/ private Integer months; - /**贷款数额*/ + /**璐锋鏁伴*/ private Integer mortgagePrice; - /**年化利率*/ + /**骞村寲鍒╃巼*/ private Double rate; - /**还款方式*/ + /**杩樻鏂瑰紡*/ private Integer repaymentWay; - /**企业ID*/ + /**浼佷笟ID*/ private String enterpriseId; - /**主贷人姓名*/ + /**涓昏捶浜哄鍚�*/ private String name; - /**电话*/ + /**鐢佃瘽*/ private String phone; - /**抵押房产:name:房产名;addr:房产地址*/ + /**鎶垫娂鎴夸骇锛歯ame:鎴夸骇鍚嶏紱addr:鎴夸骇鍦板潃*/ private List> districts; - /**房贷时估价*/ + /**鎴胯捶鏃朵及浠�*/ private Integer oriPrice; -/* *//**当前估价*//* +/* *//**褰撳墠浼颁环*//* private Integer curPrice;*/ - /**抵押率*/ + /**鎶垫娂鐜�*/ private Double mortgageRate; - /**即时抵押率*/ + /**鍗虫椂鎶垫娂鐜�*/ private Double curMortgageRate; - /**风险指数*/ + /**椋庨櫓鎸囨暟*/ private Double riskRate; - /**房产ID*/ + /**鎴夸骇ID*/ private String houseId; - /**经纬度*/ + /**缁忕含搴�*/ private Double lat; private Double lng; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/PeopleInquiry.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/PeopleInquiry.java index 8c2500be8..f4411e377 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/PeopleInquiry.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/PeopleInquiry.java @@ -9,7 +9,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 人工询价 + * 浜哄伐璇环 * * @author yinjihuan * @@ -22,42 +22,42 @@ public class PeopleInquiry implements MongoEntity { private String id; /** - * 询价用户ID + * 璇环鐢ㄦ埛ID */ private String userId; /** - * 询价用户手机 + * 璇环鐢ㄦ埛鎵嬫満 */ private String mobile; /** - * 询价地址 + * 璇环鍦板潃 */ private String address; /** - * 询价时间 + * 璇环鏃堕棿 */ private Date inquiryDate; /** - * 回复时间 + * 鍥炲鏃堕棿 */ private Date replyDate; /** - * 回复价格 + * 鍥炲浠锋牸 */ private Integer replyPrice; /** - * 回复内容 + * 鍥炲鍐呭 */ private String replyContent; /** - * 回复用户 + * 鍥炲鐢ㄦ埛 */ private String replyUsername; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/ReportAuthorizationCode.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/ReportAuthorizationCode.java index 93943dc62..fcdefb331 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/ReportAuthorizationCode.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/ReportAuthorizationCode.java @@ -11,11 +11,11 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 1.4.9版本 报告授权码 + * 1.4.9鐗堟湰 鎶ュ憡鎺堟潈鐮� * * @author JENIS * - * 2018年8月28日 上午11:29:28 + * 2018骞�8鏈�28鏃� 涓婂崍11:29:28 */ @Entity @Table(name = "fangjia_pds.report_authorization_code") @@ -25,42 +25,42 @@ public class ReportAuthorizationCode implements MongoEntity { private String id; /** - * 创建用户ID + * 鍒涘缓鐢ㄦ埛ID */ private String userId; /** - * 所属企业ID + * 鎵�灞炰紒涓欼D */ private String enterpriseId; /** * CODE - * 身份证号 或者 企业注册号 + * 韬唤璇佸彿 鎴栬�� 浼佷笟娉ㄥ唽鍙� */ private String code; /** - * 编号AUTHCODE - * 如果类型是个人 - * CODE为身份证 AUTHCODE为身份证授权码 - * 如果类型 是企业 - * CODE为企业注册号 AUTHCODE为企业授权码 + * 缂栧彿AUTHCODE + * 濡傛灉绫诲瀷鏄釜浜� + * CODE涓鸿韩浠借瘉 AUTHCODE涓鸿韩浠借瘉鎺堟潈鐮� + * 濡傛灉绫诲瀷 鏄紒涓� + * CODE涓轰紒涓氭敞鍐屽彿 AUTHCODE涓轰紒涓氭巿鏉冪爜 */ private String authCode; /** - * 授权类型 - * 1 个人 - * CODE为身份证 AUTHCODE为身份证授权码 - * 2 企业 - * CODE为企业注册号 AUTHCODE为企业授权码 + * 鎺堟潈绫诲瀷 + * 1 涓汉 + * CODE涓鸿韩浠借瘉 AUTHCODE涓鸿韩浠借瘉鎺堟潈鐮� + * 2 浼佷笟 + * CODE涓轰紒涓氭敞鍐屽彿 AUTHCODE涓轰紒涓氭巿鏉冪爜 * */ private Integer authType; /** - * 授权时间 + * 鎺堟潈鏃堕棿 */ private Date authTime; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/ReportCheck.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/ReportCheck.java index a2e8e54da..edc2ec806 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/ReportCheck.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/ReportCheck.java @@ -9,7 +9,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 1.4.9 报告选项 + * 1.4.9 鎶ュ憡閫夐」 * * @author user * @@ -19,51 +19,51 @@ import com.fangjia.dal.MongoEntity; public class ReportCheck implements MongoEntity { private static final long serialVersionUID = 6989184881413944852L; private String id; - // report_input的id + // report_input鐨刬d private String reportInputId; - // 押品成交信息 + // 鎶煎搧鎴愪氦淇℃伅 private Boolean contractTransaction; - // 人房关系 + // 浜烘埧鍏崇郴 private Boolean personHouse; - // 押品处理分析 + // 鎶煎搧澶勭悊鍒嗘瀽 private Boolean collateralTreatment; - // 个人资料核验 + // 涓汉璧勬枡鏍搁獙 private Boolean personCheck; - // 企业信息查询 + // 浼佷笟淇℃伅鏌ヨ private Boolean enterpriseInformation; - // 自雇企业经营状况 + // 鑷泧浼佷笟缁忚惀鐘跺喌 private Boolean enterpriseOperation; - // 个人关联企业 + // 涓汉鍏宠仈浼佷笟 private Boolean personEnterprise; - // 银行交易综合评估 == > 银行账户数据统计分析 + // 閾惰浜ゆ槗缁煎悎璇勪及 == > 閾惰璐︽埛鏁版嵁缁熻鍒嗘瀽 private Boolean bankTransaction; - // 消费画像 + // 娑堣垂鐢诲儚 private Boolean consumePortrait; - // 资产状况 + // 璧勪骇鐘跺喌 private Boolean assetsStatus; - // 名下动产信息 + // 鍚嶄笅鍔ㄤ骇淇℃伅 private Boolean realEstate; - // 借贷情况 + // 鍊熻捶鎯呭喌 private Boolean loanData; - // 逾期信息 + // 閫炬湡淇℃伅 private Boolean overdueData; - // 涉诉风险摘要 + // 娑夎瘔椋庨櫓鎽樿 private Boolean caseRiskAbstract; - // 不良记录 + // 涓嶈壇璁板綍 private Boolean badRecord; - // 个人申请贷款次数 + // 涓汉鐢宠璐锋娆℃暟 private Boolean applyLoanNum; - // 征信信息查询 + // 寰佷俊淇℃伅鏌ヨ private Boolean credit; - // 公积金信息 + // 鍏Н閲戜俊鎭� private Boolean fund; - // 负债状况 + // 璐熷�虹姸鍐� private Boolean liabilities; - // 个人信息最近查询量 + // 涓汉淇℃伅鏈�杩戞煡璇㈤噺 private Boolean personalQueryNum; @Id diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/ReportInput.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/ReportInput.java index 5796d3115..4ec8b8859 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/ReportInput.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/ReportInput.java @@ -12,7 +12,7 @@ import javax.persistence.Transient; import com.fangjia.dal.MongoEntity; /** - * 1.4.9版本 报告输入参数类 + * 1.4.9鐗堟湰 鎶ュ憡杈撳叆鍙傛暟绫� * * @author JENIS * @@ -28,136 +28,136 @@ public class ReportInput implements MongoEntity { private long startSecond; /** - * 用户ID + * 鐢ㄦ埛ID */ private String userId; /** - * 企业ID + * 浼佷笟ID */ private String enterpriseId; - // 姓名 + // 濮撳悕 private String username; - // 手机号码 + // 鎵嬫満鍙风爜 private String mobile; - // 身份证 + // 韬唤璇� private String identityCard; - // 房产所在城市 + // 鎴夸骇鎵�鍦ㄥ煄甯� private String houseCity; - // 房产区域 + // 鎴夸骇鍖哄煙 private String houseRegion; - // 房产名称(小区名称) + // 鎴夸骇鍚嶇О(灏忓尯鍚嶇О) private String houseName; - // 房产地址 + // 鎴夸骇鍦板潃 private String houseAddress; - // 房产面积 + // 鎴夸骇闈㈢Н private Double houseArea; - // 居住城市 + // 灞呬綇鍩庡競 private String liveCity; - // 居住区域 + // 灞呬綇鍖哄煙 private String liveRegion; - // 居住名称(小区名称) + // 灞呬綇鍚嶇О(灏忓尯鍚嶇О) private String liveName; - // 居住地址 + // 灞呬綇鍦板潃 private String liveAddress; - // 实际居住房产面积 + // 瀹為檯灞呬綇鎴夸骇闈㈢Н private Double liveArea; - // 添加时间 + // 娣诲姞鏃堕棿 private Date addTime; - // 状态(0-生成中 1-成功 2-失败) + // 鐘舵�侊紙0-鐢熸垚涓� 1-鎴愬姛 2-澶辫触锛� private int status; - // 物业类型 + // 鐗╀笟绫诲瀷 private String estateType; - // 用途(押品综合情况,仪表盘数据调用需要传入款项用途:消费 or 经营) + // 鐢ㄩ��(鎶煎搧缁煎悎鎯呭喌,浠〃鐩樻暟鎹皟鐢ㄩ渶瑕佷紶鍏ユ椤圭敤閫�:娑堣垂 or 缁忚惀) private String usage; - // 报告编号 + // 鎶ュ憡缂栧彿 private String reportNumber; - // 修改时间 + // 淇敼鏃堕棿 private Date updateTime; - // 工作地址 + // 宸ヤ綔鍦板潃 private String workAddress; - // 工作地址坐标 + // 宸ヤ綔鍦板潃鍧愭爣 private Long workAddressLat; private Long workAddressLng; - // 文化程度 + // 鏂囧寲绋嬪害 private String educationLevels; - // 企业注册号 + // 浼佷笟娉ㄥ唽鍙� private String enterpriseRegisterNumber; - // 自雇企业注册号 + // 鑷泧浼佷笟娉ㄥ唽鍙� private String selfEnterpriseRegisterNumber; - // 车架号 + // 杞︽灦鍙� private String carNumber; - // 最后一次修改的userId + // 鏈�鍚庝竴娆′慨鏀圭殑userId private String lastUpdateUserId; - // 评估次数 + // 璇勪及娆℃暟 private Integer evaluateNum; - // 添加评估项目的更新时间 + // 娣诲姞璇勪及椤圭洰鐨勬洿鏂版椂闂� private Date lastAddOptionTime; - // 抵押物楼栋号和室号 + // 鎶垫娂鐗╂ゼ鏍嬪彿鍜屽鍙� private String houseNum; private String roomNum; - // 抵押物经纬度 + // 鎶垫娂鐗╃粡绾害 private Long houseLat; private Long houseLng; - // 居住地址经纬度 + // 灞呬綇鍦板潃缁忕含搴� private Long liveLat; private Long liveLng; - // 总户数 + // 鎬绘埛鏁� private Integer houseSum; - // 个人身份证对应授权码 + // 涓汉韬唤璇佸搴旀巿鏉冪爜 private String identityCardAuthCode; - // 个人身份证对应授权时间 + // 涓汉韬唤璇佸搴旀巿鏉冩椂闂� private Date identityCardAuthTime; - // 企业注册号证对应授权码 + // 浼佷笟娉ㄥ唽鍙疯瘉瀵瑰簲鎺堟潈鐮� private String enterpriseRegisterAuthCode; - // 企业注册号对应授权时间 + // 浼佷笟娉ㄥ唽鍙峰搴旀巿鏉冩椂闂� private Date enterpriseRegisterAuthTime; - // 自雇企业注册号对应授权码 + // 鑷泧浼佷笟娉ㄥ唽鍙峰搴旀巿鏉冪爜 private String selfEnterpriseRegisterAuthCode; - // 自雇企业注册号对应授权时间 + // 鑷泧浼佷笟娉ㄥ唽鍙峰搴旀巿鏉冩椂闂� private Date selfEnterpriseRegisterAuthTime; - // 认证状态 0.待认证 1.认证中 2.认证成功 3.认证失败 + // 璁よ瘉鐘舵�� 0.寰呰璇� 1.璁よ瘉涓� 2.璁よ瘉鎴愬姛 3.璁よ瘉澶辫触 private Integer creditCertification; - // 认证状态 0.待认证 1.认证中 2.认证成功 3.认证失败 + // 璁よ瘉鐘舵�� 0.寰呰璇� 1.璁よ瘉涓� 2.璁よ瘉鎴愬姛 3.璁よ瘉澶辫触 private Integer fundCertification; - //银行卡 + //閾惰鍗� private String card1; private String card2; private String card3; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/ReportPreAuthCheck.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/ReportPreAuthCheck.java index ffc2a1798..a88ff4ae8 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/ReportPreAuthCheck.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/ReportPreAuthCheck.java @@ -11,11 +11,11 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 1.4.12版本 前置性授权校验 + * 1.4.12鐗堟湰 鍓嶇疆鎬ф巿鏉冩牎楠� * * @author JENIS * - * 2018年10月31日 上午10:29:28 + * 2018骞�10鏈�31鏃� 涓婂崍10:29:28 */ @Entity @Table(name = "fangjia_pds.report_pre_auth_check") @@ -26,68 +26,68 @@ public class ReportPreAuthCheck implements MongoEntity { private String id; /** - * 创建用户ID + * 鍒涘缓鐢ㄦ埛ID */ private String userId; /** - * 所属企业ID + * 鎵�灞炰紒涓欼D */ private String enterpriseId; /** - * 姓名 + * 濮撳悕 */ private String name; /** - * 身份证 + * 韬唤璇� */ private String identityCard; /** - * 银行卡 + * 閾惰鍗� */ private String card; /** - * 前置性授权校验级别 1 OR 2 - * 参考枚举类YinLianApiPreAuthLimitEnum + * 鍓嶇疆鎬ф巿鏉冩牎楠岀骇鍒� 1 OR 2 + * 鍙傝�冩灇涓剧被YinLianApiPreAuthLimitEnum */ private String authType; /** - * 前置性授权校验级别描述 - * 参考枚举类YinLianApiPreAuthLimitEnum - * 1:卡号+姓名 2:卡号+姓名+身份证号 + * 鍓嶇疆鎬ф巿鏉冩牎楠岀骇鍒弿杩� + * 鍙傝�冩灇涓剧被YinLianApiPreAuthLimitEnum + * 1:鍗″彿+濮撳悕 2:鍗″彿+濮撳悕+韬唤璇佸彿 */ private String authTypeDesc; /** - * 前置性授权校验接口返回CODE - * 只存储响应码为200数据 + * 鍓嶇疆鎬ф巿鏉冩牎楠屾帴鍙h繑鍥濩ODE + * 鍙瓨鍌ㄥ搷搴旂爜涓�200鏁版嵁 */ private String authCode; /** - * 前置性授权校验接口返回STATUS - * 只存储状态码为1000(验证成功)或1001(验证不一致) + * 鍓嶇疆鎬ф巿鏉冩牎楠屾帴鍙h繑鍥濻TATUS + * 鍙瓨鍌ㄧ姸鎬佺爜涓�1000(楠岃瘉鎴愬姛)鎴�1001(楠岃瘉涓嶄竴鑷�) */ private String authStatus; /** - * 前置性授权校验接口返回MESSAGE - * 只存储状态信息为'验证成功'或 '验证不一致' + * 鍓嶇疆鎬ф巿鏉冩牎楠屾帴鍙h繑鍥濵ESSAGE + * 鍙瓨鍌ㄧ姸鎬佷俊鎭负'楠岃瘉鎴愬姛'鎴� '楠岃瘉涓嶄竴鑷�' */ private String authMessage; /** - * 验证时间 + * 楠岃瘉鏃堕棿 */ private Date authTime; /** - * 1. 全一致 , 2.姓名一致 ,身份证不一致 3.姓名不一致,身份证未知 + * 1. 鍏ㄤ竴鑷� , 2.濮撳悕涓�鑷� ,韬唤璇佷笉涓�鑷� 3.濮撳悕涓嶄竴鑷达紝韬唤璇佹湭鐭� */ private Integer status; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/ReportRequestApiLogs.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/ReportRequestApiLogs.java index 9459146aa..ff06c7002 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/ReportRequestApiLogs.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/ReportRequestApiLogs.java @@ -12,11 +12,11 @@ import com.fangjia.dal.MongoEntity; import com.mongodb.BasicDBObject; /** - * 1.4.9版本 报告调用三方接口日志类 + * 1.4.9鐗堟湰 鎶ュ憡璋冪敤涓夋柟鎺ュ彛鏃ュ織绫� * * @author JENIS * - * 2018年8月25日 下午14:29:28 + * 2018骞�8鏈�25鏃� 涓嬪崍14:29:28 */ @Entity @Table(name = "fangjia_pds.report_request_api_logs") @@ -26,42 +26,42 @@ public class ReportRequestApiLogs implements MongoEntity { private String id; /** - * 用户ID + * 鐢ㄦ埛ID */ private String userId; /** - * 企业ID + * 浼佷笟ID */ private String enterpriseId; /** - * report_input的id + * report_input鐨刬d */ private String reportInputId; /** - * 三方接口 + * 涓夋柟鎺ュ彛 */ private String apiType; /** - * 请求URL + * 璇锋眰URL */ private String apiUrl; /** - * 请求参数 + * 璇锋眰鍙傛暟 */ private BasicDBObject requestData; /** - * 响应结果 + * 鍝嶅簲缁撴灉 */ private BasicDBObject responseData; /** - * 添加时间 + * 娣诲姞鏃堕棿 */ private Date addTime; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/ReportResult.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/ReportResult.java index d7df4da75..9e93d04ab 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/ReportResult.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/ReportResult.java @@ -13,7 +13,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 1.4.9版本 报告结果类 所有的报告生成需要保存, 如果调整后会影响的内容, 重新生成 + * 1.4.9鐗堟湰 鎶ュ憡缁撴灉绫� 鎵�鏈夌殑鎶ュ憡鐢熸垚闇�瑕佷繚瀛�, 濡傛灉璋冩暣鍚庝細褰卞搷鐨勫唴瀹�, 閲嶆柊鐢熸垚 * * @author JENIS * @@ -26,491 +26,491 @@ public class ReportResult implements MongoEntity { private String id; /** - * 用户ID + * 鐢ㄦ埛ID */ private String userId; /** - * 企业ID + * 浼佷笟ID */ private String enterpriseId; /** - * report_input的id + * report_input鐨刬d */ private String reportInputId; /** - * 报告编号 + * 鎶ュ憡缂栧彿 */ private String reportNumber; /** - * 报告生成时间 + * 鎶ュ憡鐢熸垚鏃堕棿 */ private Date addTime; /** - * 报告修改时间 + * 鎶ュ憡淇敼鏃堕棿 */ private Date updateTime; - /************************** 押品分析大类 begin **************************/ - /************************** 押品分析大类 begin **************************/ - /************************** 押品分析大类 begin **************************/ - /******** 押品基本信息 ********/ + /************************** 鎶煎搧鍒嗘瀽澶х被 begin **************************/ + /************************** 鎶煎搧鍒嗘瀽澶х被 begin **************************/ + /************************** 鎶煎搧鍒嗘瀽澶х被 begin **************************/ + /******** 鎶煎搧鍩烘湰淇℃伅 ********/ /** - * 小区名称(resultInput中houseName一致) + * 灏忓尯鍚嶇О(resultInput涓環ouseName涓�鑷�) */ private String houseName; /** - * (resultInput中houseAddress一致) //所在地址 + * (resultInput涓環ouseAddress涓�鑷�) //鎵�鍦ㄥ湴鍧� */ private String houseAddress; /** - * (resultInput中houseArea一致) //建筑面积 + * (resultInput涓環ouseArea涓�鑷�) //寤虹瓚闈㈢Н */ private Double houseArea; /** - * 押品概述 + * 鎶煎搧姒傝堪 */ private String houseDesc; /** - * 朝向情况 + * 鏈濆悜鎯呭喌 */ private String direction; /** - * 附赠面积 + * 闄勮禒闈㈢Н */ private Double giveArea; /** - * 押品单价 + * 鎶煎搧鍗曚环 */ private Integer collateralUnitPrice; /** - * 所在楼层 + * 鎵�鍦ㄦゼ灞� */ private Integer floor; /** - * 总楼层 + * 鎬绘ゼ灞� */ private Integer height; /** - * 房型类型 + * 鎴垮瀷绫诲瀷 */ private String houseType; /** - * 建筑类型 + * 寤虹瓚绫诲瀷 */ private String buildType; /** - * 资产概述 + * 璧勪骇姒傝堪 */ private String assetDescription; - /******** 押品综合情况-仪表盘 ********/ + /******** 鎶煎搧缁煎悎鎯呭喌-浠〃鐩� ********/ /** - * 综合评分 + * 缁煎悎璇勫垎 */ private Double totalScore; /** - * 抵押品总价 + * 鎶垫娂鍝佹�讳环 */ private Integer totalPrice; /** - * 最大抵押率 + * 鏈�澶ф姷鎶肩巼 */ private Double maxCollateralRate; /** - * 可以贷款金额 + * 鍙互璐锋閲戦 */ private Integer loanAmount; /** - * 价格波动风险 + * 浠锋牸娉㈠姩椋庨櫓 */ private Double priceStability; /** - * 押品处置风险 + * 鎶煎搧澶勭疆椋庨櫓 */ private Double handleLevel; - /******** 押品综合情况-金字塔 ********/ + /******** 鎶煎搧缁煎悎鎯呭喌-閲戝瓧濉� ********/ /** - * 均价 + * 鍧囦环 */ private String avePrice; /** - * 排名 + * 鎺掑悕 */ private String num; /** - * 指数 + * 鎸囨暟 */ private int index; /** - * 等级 + * 绛夌骇 */ private int rank; /** - * 查询时间 2017/06/14格式 + * 鏌ヨ鏃堕棿 2017/06/14鏍煎紡 */ private String searchTime; /** - * 匹配到的详细地址 + * 鍖归厤鍒扮殑璇︾粏鍦板潃 */ private String detailAddress; /** - * 房产所在城市 + * 鎴夸骇鎵�鍦ㄥ煄甯� */ private String houseCity; /** - * 房产所在区域 + * 鎴夸骇鎵�鍦ㄥ尯鍩� */ private String houseRegion; - /******** 押品信息 ********/ - /******** 房屋交易记录 数据字段参考下面注释内容 ********/ + /******** 鎶煎搧淇℃伅 ********/ + /******** 鎴垮眿浜ゆ槗璁板綍 鏁版嵁瀛楁鍙傝�冧笅闈㈡敞閲婂唴瀹� ********/ private List> dealRecords; /** - * private String dealTime; //时间 private Long price; //价格 + * private String dealTime; //鏃堕棿 private Long price; //浠锋牸 */ - /******** 房屋拍卖记录 数据字段参考下面注释内容 ********/ + /******** 鎴垮眿鎷嶅崠璁板綍 鏁版嵁瀛楁鍙傝�冧笅闈㈡敞閲婂唴瀹� ********/ private List> auctionRecords; /** - * private String auctionTime; //时间 private String auctionMechanism; //拍卖机构 + * private String auctionTime; //鏃堕棿 private String auctionMechanism; //鎷嶅崠鏈烘瀯 */ /** - * 小区1年内成交占比 + * 灏忓尯1骞村唴鎴愪氦鍗犳瘮 */ private String oneYearTransacteRate; /** - * 小区1年内拍卖数量 + * 灏忓尯1骞村唴鎷嶅崠鏁伴噺 */ private Integer oneYearSaleNumber; - /******** 人房关系 ********/ + /******** 浜烘埧鍏崇郴 ********/ /** - * 房屋近期评估次数-房屋近30天评估次数 + * 鎴垮眿杩戞湡璇勪及娆℃暟-鎴垮眿杩�30澶╄瘎浼版鏁� */ private int houseMonthEvalCount; /** - * 房屋近期评估次数-房屋近90天评估次数 + * 鎴垮眿杩戞湡璇勪及娆℃暟-鎴垮眿杩�90澶╄瘎浼版鏁� */ private int houseQuarterEvalCount; - /******** 人房关系 数据字段参考下面注释内容 ********/ + /******** 浜烘埧鍏崇郴 鏁版嵁瀛楁鍙傝�冧笅闈㈡敞閲婂唴瀹� ********/ private List> peopleHouseRelation; /** - * private String peopleHouseRelationType; //关系类型 private String - * peopleHouseRelationDistance; //关系距离, 单位KM private String - * peopleHouseRelationTips; //提示信息 + * private String peopleHouseRelationType; //鍏崇郴绫诲瀷 private String + * peopleHouseRelationDistance; //鍏崇郴璺濈, 鍗曚綅KM private String + * peopleHouseRelationTips; //鎻愮ず淇℃伅 */ - /******** 押品详细分析 (开发时候在定义对应字段) ********/ - /** 均价在城市排名 */ + /******** 鎶煎搧璇︾粏鍒嗘瀽 (寮�鍙戞椂鍊欏湪瀹氫箟瀵瑰簲瀛楁) ********/ + /** 鍧囦环鍦ㄥ煄甯傛帓鍚� */ private Double priceRate; - /** 城市均价相对最低 */ + /** 鍩庡競鍧囦环鐩稿鏈�浣� */ private Integer cityDistrictMinSellPrice; - /** 城市均价相对最高 */ + /** 鍩庡競鍧囦环鐩稿鏈�楂� */ private Integer cityDistrictMaxSellPrice; - /** 小区附近房源参考 */ + /** 灏忓尯闄勮繎鎴挎簮鍙傝�� */ private List> houses; - /**一年以内的价格稳定指数*/ + /**涓�骞翠互鍐呯殑浠锋牸绋冲畾鎸囨暟*/ private Double priceStabilityLess; - /** 小区近12个月涨幅*/ + /** 灏忓尯杩�12涓湀娑ㄥ箙*/ private Map districtSellStats; - /** 城市近12个月涨幅*/ + /** 鍩庡競杩�12涓湀娑ㄥ箙*/ private Map citySellStats; - /** 区域近12个月涨幅*/ + /** 鍖哄煙杩�12涓湀娑ㄥ箙*/ private Map regionSellStats; - /** 近一年涨跌幅*/ + /** 杩戜竴骞存定璺屽箙*/ private Double yoyIncrease; - /** 平均增长率排名*/ + /** 骞冲潎澧為暱鐜囨帓鍚�*/ private Double increaseRate; - /** 1个月挂牌量*/ + /** 1涓湀鎸傜墝閲�*/ private int quoteHouseOne; - /** 6个月挂牌量*/ + /** 6涓湀鎸傜墝閲�*/ private int quoteHouseSix; - /** 小区在城市中六个月挂牌量排名比*/ + /** 灏忓尯鍦ㄥ煄甯備腑鍏釜鏈堟寕鐗岄噺鎺掑悕姣�*/ private Double sixQuoteLevelRate; - /** 近六个月最大挂牌量*/ + /** 杩戝叚涓湀鏈�澶ф寕鐗岄噺*/ private int sixMaxQuoteMount; - /**周围地铁数量*/ - private Integer metroCount;//周围地铁数量 + /**鍛ㄥ洿鍦伴搧鏁伴噺*/ + private Integer metroCount;//鍛ㄥ洿鍦伴搧鏁伴噺 - /**周围公交数量*/ - private Integer busCount;//周围公交数量 + /**鍛ㄥ洿鍏氦鏁伴噺*/ + private Integer busCount;//鍛ㄥ洿鍏氦鏁伴噺 - /**周围交通数量数量*/ - private Integer trafficCount;//周围公交数量 + /**鍛ㄥ洿浜ら�氭暟閲忔暟閲�*/ + private Integer trafficCount;//鍛ㄥ洿鍏氦鏁伴噺 - /**周围交通数量数量*/ - private Integer maxTrafficCount;//周围公交数量 - /** 中介数在当前城市排名比*/ + /**鍛ㄥ洿浜ら�氭暟閲忔暟閲�*/ + private Integer maxTrafficCount;//鍛ㄥ洿鍏氦鏁伴噺 + /** 涓粙鏁板湪褰撳墠鍩庡競鎺掑悕姣�*/ private Double agencyLevelRate; - /** 知名中介*/ + /** 鐭ュ悕涓粙*/ private int famousAgency; - /** 其他中介*/ + /** 鍏朵粬涓粙*/ private int otherAgency; - /** 最大中介数*/ + /** 鏈�澶т腑浠嬫暟*/ private int maxAgencyMount; private int houseHold; - /** 户数排名比*/ + /** 鎴锋暟鎺掑悕姣�*/ private Double houseHoldRate; - /** 最大户数*/ + /** 鏈�澶ф埛鏁�*/ private int maxHouseHold; - /**周围小区数量*/ + /**鍛ㄥ洿灏忓尯鏁伴噺*/ private Integer districtCount; - /**周围最大小区数*/ + /**鍛ㄥ洿鏈�澶у皬鍖烘暟*/ private Integer maxDistrictCount; - /**周围小区数量城市排名*/ + /**鍛ㄥ洿灏忓尯鏁伴噺鍩庡競鎺掑悕*/ private Double districtCountLevel; - /**周围交通城市排名*/ - private Double trafficLevelRate;//交通城市排名 - /************************** 押品分析大类 end **************************/ - /************************** 押品分析大类 end **************************/ - /************************** 押品分析大类 end **************************/ + /**鍛ㄥ洿浜ら�氬煄甯傛帓鍚�*/ + private Double trafficLevelRate;//浜ら�氬煄甯傛帓鍚� + /************************** 鎶煎搧鍒嗘瀽澶х被 end **************************/ + /************************** 鎶煎搧鍒嗘瀽澶х被 end **************************/ + /************************** 鎶煎搧鍒嗘瀽澶х被 end **************************/ - /************************** 用户分析 begin **************************/ - /************************** 用户分析 begin **************************/ - /************************** 用户分析 begin **************************/ - /******** 个人基本信息 ********/ + /************************** 鐢ㄦ埛鍒嗘瀽 begin **************************/ + /************************** 鐢ㄦ埛鍒嗘瀽 begin **************************/ + /************************** 鐢ㄦ埛鍒嗘瀽 begin **************************/ + /******** 涓汉鍩烘湰淇℃伅 ********/ /** - * 姓名 + * 濮撳悕 */ private String username; /** - * 手机号码 + * 鎵嬫満鍙风爜 */ private String mobile; /** - * 身份证 + * 韬唤璇� */ private String identityCard; /** - * 人物长居城市 + * 浜虹墿闀垮眳鍩庡競 */ private List liveCitys; /** - * 号码归属城市 + * 鍙风爜褰掑睘鍩庡競 */ private String mobileAscriptionCity; /** - * 是否常用手机号 + * 鏄惁甯哥敤鎵嬫満鍙� */ private Boolean commonlyUsedMobile; /** - * 在网时长 + * 鍦ㄧ綉鏃堕暱 */ private String inUseTime; /** - * 在网时长返回code + * 鍦ㄧ綉鏃堕暱杩斿洖code */ private Integer inUseTimeNum; /** - * 学历 + * 瀛﹀巻 */ private String education; - /******** 职业信息/企业信息 数据字段参考下面注释内容 ********/ + /******** 鑱屼笟淇℃伅/浼佷笟淇℃伅 鏁版嵁瀛楁鍙傝�冧笅闈㈡敞閲婂唴瀹� ********/ private Map enterpriseInfo; - /******** 自雇企业经营状况 数据字段参考下面注释内容 ********/ + /******** 鑷泧浼佷笟缁忚惀鐘跺喌 鏁版嵁瀛楁鍙傝�冧笅闈㈡敞閲婂唴瀹� ********/ private Map selfEmployedEnterpriseInfo; /** - * private String enterpriseName; //企业名称 private String enterpriseType;//企业类型 - * private Integer enterpriseRegistCapital;//注册资本 private String - * enterpriseStatus;// 企业状态 private String enterprisePersonPosition;//被查询人职务 - * private String enterpriseLegalPerson;//公司法人 private String - * enterpriseRegistNumber;//公司注册号 private String enterpriseAddress; //公司地址 + * private String enterpriseName; //浼佷笟鍚嶇О private String enterpriseType;//浼佷笟绫诲瀷 + * private Integer enterpriseRegistCapital;//娉ㄥ唽璧勬湰 private String + * enterpriseStatus;// 浼佷笟鐘舵�� private String enterprisePersonPosition;//琚煡璇汉鑱屽姟 + * private String enterpriseLegalPerson;//鍏徃娉曚汉 private String + * enterpriseRegistNumber;//鍏徃娉ㄥ唽鍙� private String enterpriseAddress; //鍏徃鍦板潃 */ - /*********** 个人关联企业 ************/ + /*********** 涓汉鍏宠仈浼佷笟 ************/ private List> myEnterpriseInfos; /** - * company 公司 job 职务 share 股份 + * company 鍏徃 job 鑱屽姟 share 鑲′唤 */ - /******** 综合评估 数据字段参考下面注释内容 ********/ + /******** 缁煎悎璇勪及 鏁版嵁瀛楁鍙傝�冧笅闈㈡敞閲婂唴瀹� ********/ private Map comprehensiveEvaluation; /** - * private Integer relatedBankcardsNumber; //关联银行卡数 private String - * oneYearTransacteTotalAmount; //近12个月关联卡交易总额:20000-25000元 private String - * oneYearTransacteAvgAmount; //近12个月关联卡单笔2万及以上笔均金额:20000-25000元 + * private Integer relatedBankcardsNumber; //鍏宠仈閾惰鍗℃暟 private String + * oneYearTransacteTotalAmount; //杩�12涓湀鍏宠仈鍗′氦鏄撴�婚锛�20000-25000鍏� private String + * oneYearTransacteAvgAmount; //杩�12涓湀鍏宠仈鍗″崟绗�2涓囧強浠ヤ笂绗斿潎閲戦锛�20000-25000鍏� */ - /******** 消费能力 数据字段参考下面注释内容 ********/ + /******** 娑堣垂鑳藉姏 鏁版嵁瀛楁鍙傝�冧笅闈㈡敞閲婂唴瀹� ********/ private Map consumptionAbility; /** - * private String consumptionLevel; //消费档次:不活跃用户;低端用户;普通用户;高端用户;非典型用户 private - * String historyConsumptionTotalAmount; //历史关联卡消费总金额:50000-100000元 private - * String sixMonthsGambleConsumptionTotalAmount; //近6个月关联卡博彩消费总金额:500-1000元 + * private String consumptionLevel; //娑堣垂妗f锛氫笉娲昏穬鐢ㄦ埛锛涗綆绔敤鎴凤紱鏅�氱敤鎴凤紱楂樼鐢ㄦ埛锛涢潪鍏稿瀷鐢ㄦ埛 private + * String historyConsumptionTotalAmount; //鍘嗗彶鍏宠仈鍗℃秷璐规�婚噾棰濓細50000-100000鍏� private + * String sixMonthsGambleConsumptionTotalAmount; //杩�6涓湀鍏宠仈鍗″崥褰╂秷璐规�婚噾棰濓細500-1000鍏� * private String sixMonthsNightConsumptionTotalAmount; - * //近6个月关联卡夜消费总金额:500-1000元 private String - * sixMonthsMaxSingleDayConsumptionTotalAmount; //近6个月关联卡最大单日消费总金额:5000-10000元 + * //杩�6涓湀鍏宠仈鍗″娑堣垂鎬婚噾棰濓細500-1000鍏� private String + * sixMonthsMaxSingleDayConsumptionTotalAmount; //杩�6涓湀鍏宠仈鍗℃渶澶у崟鏃ユ秷璐规�婚噾棰濓細5000-10000鍏� * private String oneYearMaxMonthConsumptionTotalAmount; - * //近12个月关联卡最大月消费金额:5000-10000元 + * //杩�12涓湀鍏宠仈鍗℃渶澶ф湀娑堣垂閲戦锛�5000-10000鍏� */ - /******** 消费类目占比 ********/ + /******** 娑堣垂绫荤洰鍗犳瘮 ********/ /** - * 博彩类 + * 鍗氬僵绫� */ private Double gambleConsumptionRate; /** - * 夜消类 + * 澶滄秷绫� */ private Double nightConsumptionRate; /** - * 其他 + * 鍏朵粬 */ private Double otherConsumptionRate; - /******** 资产状况 数据字段参考下面注释内容 ********/ + /******** 璧勪骇鐘跺喌 鏁版嵁瀛楁鍙傝�冧笅闈㈡敞閲婂唴瀹� ********/ private Map assetCondition; /** - * //private Boolean hasCar; //是否有车 //private Boolean hasHouse; //是否有房 //private - * Boolean hasFinance; //是否理财 //private String sixMonthsFinanceTotalAmount; - * //近6个月关联卡理财总金额 50000-100000元 //private Integer sixMonthsFinanceTotalNumber; - * //近6个月关联卡理财总笔数 1 //private String oneYearMaxSingleNumberInAccountAmount; - * //近12个月关联卡1万及以上大额单笔入账金额 10000-20000元 //private String - * oneYearInAccountTotalAmount; //近12个月关联卡入账总金额 10000-20000元 //private String - * oneYearTransacteTotalAmount; //近12个月关联卡银行交易总金额 10000-20000元 //private Double - * assetLiabilityRate; //当前关联卡资产负债比 1.55 //private Double - * sixMonthsAssetLiabilityRate; //近6个月关联卡资产负债比 1.55 + * //private Boolean hasCar; //鏄惁鏈夎溅 //private Boolean hasHouse; //鏄惁鏈夋埧 //private + * Boolean hasFinance; //鏄惁鐞嗚储 //private String sixMonthsFinanceTotalAmount; + * //杩�6涓湀鍏宠仈鍗$悊璐㈡�婚噾棰� 50000-100000鍏� //private Integer sixMonthsFinanceTotalNumber; + * //杩�6涓湀鍏宠仈鍗$悊璐㈡�荤瑪鏁� 1 //private String oneYearMaxSingleNumberInAccountAmount; + * //杩�12涓湀鍏宠仈鍗�1涓囧強浠ヤ笂澶ч鍗曠瑪鍏ヨ处閲戦 10000-20000鍏� //private String + * oneYearInAccountTotalAmount; //杩�12涓湀鍏宠仈鍗″叆璐︽�婚噾棰� 10000-20000鍏� //private String + * oneYearTransacteTotalAmount; //杩�12涓湀鍏宠仈鍗¢摱琛屼氦鏄撴�婚噾棰� 10000-20000鍏� //private Double + * assetLiabilityRate; //褰撳墠鍏宠仈鍗¤祫浜ц礋鍊烘瘮 1.55 //private Double + * sixMonthsAssetLiabilityRate; //杩�6涓湀鍏宠仈鍗¤祫浜ц礋鍊烘瘮 1.55 */ - /******** 名下动产信息 数据字段参考下面注释内容 ********/ + /******** 鍚嶄笅鍔ㄤ骇淇℃伅 鏁版嵁瀛楁鍙傝�冧笅闈㈡敞閲婂唴瀹� ********/ private List> realEstateInfos; /** - * private String realEstateType; //类型 private String realEstateBrand; //品牌 - * private String realEstateModel; //型号 private String realEstatePurchaseYear; - * //购买年限 + * private String realEstateType; //绫诲瀷 private String realEstateBrand; //鍝佺墝 + * private String realEstateModel; //鍨嬪彿 private String realEstatePurchaseYear; + * //璐拱骞撮檺 */ - /******** 负债状况 ********/ + /******** 璐熷�虹姸鍐� ********/ /** - * 购房贷款 + * 璐埧璐锋 */ private Long purchaseLoan; /** - * 信用贷款 + * 淇$敤璐锋 */ private Long creditLoan; /** - * 其他贷款 + * 鍏朵粬璐锋 */ private Long otherLoan; - /******** 借贷情况 数据字段参考下面注释内容 ********/ + /******** 鍊熻捶鎯呭喌 鏁版嵁瀛楁鍙傝�冧笅闈㈡敞閲婂唴瀹� ********/ private Map loanSituation; /** - * private String monthMaxRepaymentAmount; //关联卡每月最大可还贷金额:5000-10000元 private - * String oneYearMaxMonthLoanTotalAmount; //近12个月关联卡最大单月借贷总金额:0-1000元 private - * String loanInformation; //手机号查得贷款信息 + * private String monthMaxRepaymentAmount; //鍏宠仈鍗℃瘡鏈堟渶澶у彲杩樿捶閲戦锛�5000-10000鍏� private + * String oneYearMaxMonthLoanTotalAmount; //杩�12涓湀鍏宠仈鍗℃渶澶у崟鏈堝�熻捶鎬婚噾棰濓細0-1000鍏� private + * String loanInformation; //鎵嬫満鍙锋煡寰楄捶娆句俊鎭� */ - /******** 逾期信息 数据字段参考下面注释内容 ********/ + /******** 閫炬湡淇℃伅 鏁版嵁瀛楁鍙傝�冧笅闈㈡敞閲婂唴瀹� ********/ private Map overdueInformation; /** - * private String mobileBlacklist; //手机黑名单 private String - * mobileOverdueInformation; //手机号查得逾期信息 private Integer - * fiveTimesAverageOverdueDays; //近5次关联卡借贷平均逾期天数 + * private String mobileBlacklist; //鎵嬫満榛戝悕鍗� private String + * mobileOverdueInformation; //鎵嬫満鍙锋煡寰楅�炬湡淇℃伅 private Integer + * fiveTimesAverageOverdueDays; //杩�5娆″叧鑱斿崱鍊熻捶骞冲潎閫炬湡澶╂暟 */ - /******** 涉诉风险摘要 数据字段参考下面注释内容 ********/ + /******** 娑夎瘔椋庨櫓鎽樿 鏁版嵁瀛楁鍙傝�冧笅闈㈡敞閲婂唴瀹� ********/ private List> risksRemarks; /** - * private String remarks; //风险摘要信息 + * private String remarks; //椋庨櫓鎽樿淇℃伅 */ - /******** 不良记录 数据字段参考下面注释内容 ********/ + /******** 涓嶈壇璁板綍 鏁版嵁瀛楁鍙傝�冧笅闈㈡敞閲婂唴瀹� ********/ private Map badRecord; /** - * private String badInformation; //不良信息 private Boolean hasGamble; //是否涉嫌黄赌毒 + * private String badInformation; //涓嶈壇淇℃伅 private Boolean hasGamble; //鏄惁娑夊珜榛勮祵姣� */ - /******** 个人信息最近查询次数 数据字段参考下面注释内容 ********/ + /******** 涓汉淇℃伅鏈�杩戞煡璇㈡鏁� 鏁版嵁瀛楁鍙傝�冧笅闈㈡敞閲婂唴瀹� ********/ private Map queryTimesMyInfo; /** - * private Integer weekQueryTimesMyInfo; //最近7天 private Integer - * monthQueryTimesMyInfo; //最近30天 private Integer quarterQueryTimesMyInfo; - * //最近90天 + * private Integer weekQueryTimesMyInfo; //鏈�杩�7澶� private Integer + * monthQueryTimesMyInfo; //鏈�杩�30澶� private Integer quarterQueryTimesMyInfo; + * //鏈�杩�90澶� */ - /******** 个人申请贷款次数 数据字段参考下面注释内容 ********/ + /******** 涓汉鐢宠璐锋娆℃暟 鏁版嵁瀛楁鍙傝�冧笅闈㈡敞閲婂唴瀹� ********/ private Map applyLoanTimesMyInfo; /** - * private Integer weekApplyLoanTimesMyInfo; //最近7天 private Integer - * monthApplyLoanTimesMyInfo; //最近30天 + * private Integer weekApplyLoanTimesMyInfo; //鏈�杩�7澶� private Integer + * monthApplyLoanTimesMyInfo; //鏈�杩�30澶� */ - /******** 银行账户数据统计分析 ********/ - /** 账户出入账情况 **/ + /******** 閾惰璐︽埛鏁版嵁缁熻鍒嗘瀽 ********/ + /** 璐︽埛鍑哄叆璐︽儏鍐� **/ private Map accountEntryAndExit; - /** 账户大额入账情况 **/ + /** 璐︽埛澶ч鍏ヨ处鎯呭喌 **/ private Map accountLargeEntry; - /** 境外交易和港澳台交易 **/ + /** 澧冨浜ゆ槗鍜屾腐婢冲彴浜ゆ槗 **/ private Map overseasAndGATTransactions; - /** 消费综合情况 **/ + /** 娑堣垂缁煎悎鎯呭喌 **/ private Map comprehensiveConsumption; - /** 近12个月消费类目分布 **/ + /** 杩�12涓湀娑堣垂绫荤洰鍒嗗竷 **/ private Map oneYearConsumerCategoryDistribution; - /** 消费金额统计 **/ + /** 娑堣垂閲戦缁熻 **/ private Map consumptionAmountTotal; - /** 消费金额同城排名 **/ + /** 娑堣垂閲戦鍚屽煄鎺掑悕 **/ private Map consumptionAmountRank; - /** 夜消费金额 **/ + /** 澶滄秷璐归噾棰� **/ private Map nightConsumptionAmount; - /** 博彩类消费金额 **/ + /** 鍗氬僵绫绘秷璐归噾棰� **/ private Map gamblingConsumptionAmount; - /** 饮酒场所夜消费 **/ + /** 楗厭鍦烘墍澶滄秷璐� **/ private Map drinkNightConsumptionAmount; - /************************** 用户分析 end **************************/ - /************************** 用户分析 end **************************/ - /************************** 用户分析 end **************************/ + /************************** 鐢ㄦ埛鍒嗘瀽 end **************************/ + /************************** 鐢ㄦ埛鍒嗘瀽 end **************************/ + /************************** 鐢ㄦ埛鍒嗘瀽 end **************************/ - /************************** 风险提示 begin **************************/ - /************************** 风险提示 begin **************************/ - /************************** 风险提示 begin **************************/ - /******** 风险提示 数据字段参考下面注释内容 ********/ + /************************** 椋庨櫓鎻愮ず begin **************************/ + /************************** 椋庨櫓鎻愮ず begin **************************/ + /************************** 椋庨櫓鎻愮ず begin **************************/ + /******** 椋庨櫓鎻愮ず 鏁版嵁瀛楁鍙傝�冧笅闈㈡敞閲婂唴瀹� ********/ private List>>> riskTips; /** - * key == > private String riskKey; //风险类型 + * key == > private String riskKey; //椋庨櫓绫诲瀷 * riskValue == > List> - * private String riskType; //类型 - * private String riskSeverity; //严重程度 - * private String riskDescription; //描述 - * private String riskSuggest; //建议 + * private String riskType; //绫诲瀷 + * private String riskSeverity; //涓ラ噸绋嬪害 + * private String riskDescription; //鎻忚堪 + * private String riskSuggest; //寤鸿 */ /** - * 居住地单价 + * 灞呬綇鍦板崟浠� */ private Integer liveUnitPrice; - /************************** 风险提示 end **************************/ - /************************** 风险提示 end **************************/ - /************************** 风险提示 end **************************/ + /************************** 椋庨櫓鎻愮ず end **************************/ + /************************** 椋庨櫓鎻愮ず end **************************/ + /************************** 椋庨櫓鎻愮ず end **************************/ - /**周边配套情况**/ + /**鍛ㄨ竟閰嶅鎯呭喌**/ private Map arroundPois; - /**银联风险评估报告接口**/ + /**閾惰仈椋庨櫓璇勪及鎶ュ憡鎺ュ彛**/ private Map riskAssessData; - /**银联消费画像产品接口(多张卡结果)**/ + /**閾惰仈娑堣垂鐢诲儚浜у搧鎺ュ彛(澶氬紶鍗$粨鏋�)**/ private List> consumerPortraitData; private Boolean wrapNotEmpty; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/RiskControl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/RiskControl.java index e4c146c39..1b65d528a 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/RiskControl.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/RiskControl.java @@ -17,42 +17,42 @@ public class RiskControl implements MongoEntity { private static final long serialVersionUID = -8648240178643431827L; private String id; - /**企业ID*/ + /**浼佷笟ID*/ private String enterpriseId; - /**存量押品总市值*/ + /**瀛橀噺鎶煎搧鎬诲競鍊�*/ private Long stockHousePrice; - /**贷款余额*/ + /**璐锋浣欓*/ private Long totalLoanBalance; - /**原始抵押率LTV*/ + /**鍘熷鎶垫娂鐜嘗TV*/ private Double oriMortgageRate; - /**即时抵押率*/ + /**鍗虫椂鎶垫娂鐜�*/ private Double curMortgageRate; - /**存量押品平均涨幅*/ + /**瀛橀噺鎶煎搧骞冲潎娑ㄥ箙*/ private Double stockHouseAvgRate; - /**CPDB 押品平均涨幅*/ + /**CPDB 鎶煎搧骞冲潎娑ㄥ箙*/ private Double cpdbHouseAvgRate; - /**CPDB 押品总市值*/ + /**CPDB 鎶煎搧鎬诲競鍊�*/ private Long cpdbHousePrice; - /**存量押品库涨跌比率及对应的增长率*/ + /**瀛橀噺鎶煎搧搴撴定璺屾瘮鐜囧強瀵瑰簲鐨勫闀跨巼*/ private Double stockUpRate; private Double stockDownRate; private Double totalUpAvgRate; private Double totalDownAvgRate; - /**CPDB库涨跌比率及对应的增长率*/ + /**CPDB搴撴定璺屾瘮鐜囧強瀵瑰簲鐨勫闀跨巼*/ private Double cpdbUpRate; private Double cpdbDownRate; private Double cpdbUpAvgRate; private Double cpdbDownAvgRate; private Date createDate; - /**统计数据截至时间*/ + /**缁熻鏁版嵁鎴嚦鏃堕棿*/ private String countDate; /** - * CPDB 年度走势 + * CPDB 骞村害璧板娍 */ private Map monthlyCpdbTotalPrice = new LinkedHashMap(); /** - * 押品市值走势 + * 鎶煎搧甯傚�艰蛋鍔� */ private Map monthlyTotalPrice = new LinkedHashMap(); diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/RiskControlDetail.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/RiskControlDetail.java index d9e8d15f2..79345a5eb 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/RiskControlDetail.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/RiskControlDetail.java @@ -6,7 +6,7 @@ import javax.persistence.*; import java.util.Date; /** - * 单套押品的统计结果 + * 鍗曞鎶煎搧鐨勭粺璁$粨鏋� * Created by linxsh on 2017/1/16. */ @Entity @@ -16,48 +16,48 @@ public class RiskControlDetail implements MongoEntity { private static final long serialVersionUID = -2621808192958420259L; private String id; - /**城市*/ + /**鍩庡競*/ private String city; - /**区域*/ + /**鍖哄煙*/ private String region; - /**小区名*/ + /**灏忓尯鍚�*/ private String name; - /**贷款金额(元)*/ + /**璐锋閲戦锛堝厓锛�*/ private Integer lendingPrice; - /**放贷日期*/ + /**鏀捐捶鏃ユ湡*/ private Date lendingDate; - /**贷款期限(期)*/ + /**璐锋鏈熼檺锛堟湡锛�*/ private Integer loanMonth; - /** 贷款利率 */ + /** 璐锋鍒╃巼 */ private Double rate; - /**贷款余额(元)*/ + /**璐锋浣欓锛堝厓锛�*/ private Double loanBalance; - /**当前估价(元)*/ + /**褰撳墠浼颁环锛堝厓锛�*/ private Integer curPrice; - /**原始抵押率*/ + /**鍘熷鎶垫娂鐜�*/ private Double ltv; - /**即时抵押率*/ + /**鍗虫椂鎶垫娂鐜�*/ private Double cltv; - /**风险指数*/ + /**椋庨櫓鎸囨暟*/ private Double riskRate; - /**数据来源*/ + /**鏁版嵁鏉ユ簮*/ private String source; - /**详情中展示的小区名:小区名+ 楼栋号+ 室号*/ + /**璇︽儏涓睍绀虹殑灏忓尯鍚嶏細灏忓尯鍚�+ 妤兼爧鍙�+ 瀹ゅ彿*/ private String displayName; - /**小区地址*/ + /**灏忓尯鍦板潃*/ private String address; - /**贷款人姓名*/ + /**璐锋浜哄鍚�*/ private String personName; - /**贷款人手机号*/ + /**璐锋浜烘墜鏈哄彿*/ private String phone; - /**还款方式*/ + /**杩樻鏂瑰紡*/ private String repayWay; - /**放贷时估价*/ + /**鏀捐捶鏃朵及浠�*/ private Integer oriPrice; - /**统计时间*/ + /**缁熻鏃堕棿*/ private Date countDate; /** - * 经纬度 + * 缁忕含搴� */ private Double lat; private Double lng; @@ -66,7 +66,7 @@ public class RiskControlDetail implements MongoEntity { private String userId; /** * @see CollateralEvaluationInfo - * 对应的 CollateralEvaluationInfo中的id + * 瀵瑰簲鐨� CollateralEvaluationInfo涓殑id */ private String houseId; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/RiskWarn.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/RiskWarn.java index 7bad92398..ed0ece03a 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/RiskWarn.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/RiskWarn.java @@ -10,7 +10,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * PDS风险警告 + * PDS椋庨櫓璀﹀憡 * @author yinjihuan * */ @@ -22,27 +22,27 @@ public class RiskWarn implements MongoEntity { private String id; /** - * 企业编号 + * 浼佷笟缂栧彿 */ private String enterpriseId; /** - * 规则名 + * 瑙勫垯鍚� */ private String name; /** - * 风险值(高于此值触发) + * 椋庨櫓鍊硷紙楂樹簬姝ゅ�艰Е鍙戯級 */ private Integer number; /** - * 接收邮件的邮箱 + * 鎺ユ敹閭欢鐨勯偖绠� */ private List emails; /** - * 修改时间 + * 淇敼鏃堕棿 */ private Date modifyDate; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/Role.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/Role.java index 2bc277635..d760d6ad0 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/Role.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/Role.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * PDS角色信息 + * PDS瑙掕壊淇℃伅 * @author yinjihuan * */ @@ -24,22 +24,22 @@ public class Role implements MongoEntity { private String id; /** - * 角色名称 + * 瑙掕壊鍚嶇О */ private String roleName; /** - * 企业编号 + * 浼佷笟缂栧彿 */ private String enterpriseId; /** - * 权限信息 + * 鏉冮檺淇℃伅 */ private List authoritys; /** - * 创建时间 + * 鍒涘缓鏃堕棿 */ private Date createDate; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/SmartInput.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/SmartInput.java index 267e700b9..4048159df 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/SmartInput.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/SmartInput.java @@ -5,7 +5,7 @@ import com.fangjia.dal.MongoEntity; import javax.persistence.*; /** - * 智能输入model + * 鏅鸿兘杈撳叆model * Created by linxsh on 2017/6/30. */ @Entity @@ -20,75 +20,75 @@ public class SmartInput implements MongoEntity { private String input; /** - * 城市 + * 鍩庡競 */ private String city; /** - * 区域 + * 鍖哄煙 */ private String region; /** - * 小区名 + * 灏忓尯鍚� */ private String districtName; /** - * 地址 + * 鍦板潃 */ private String address; /** - * 物业类型 + * 鐗╀笟绫诲瀷 */ private String estateType; /** - * 楼号 + * 妤煎彿 */ private String houseNumber; /** - * 单元号 + * 鍗曞厓鍙� */ private String unitNumber; /** - * 面积 + * 闈㈢Н */ private Double area; /** - * 室号 + * 瀹ゅ彿 */ private String roomNumber; /** - * 所在楼层 + * 鎵�鍦ㄦゼ灞� */ private Integer floor; /** - * 总楼层 + * 鎬绘ゼ灞� */ private Integer height; /** - * 朝向 + * 鏈濆悜 */ private String direction; /** - * 地下室面积 + * 鍦颁笅瀹ら潰绉� */ private Double basementArea; /** - * 阁楼面积 + * 闃佹ゼ闈㈢Н */ private Double atticArea; /** - * 露台面积 + * 闇插彴闈㈢Н */ private Double terraceArea; /** - * 采光通风 + * 閲囧厜閫氶 */ private String lighting; /** - * 车位情况 + * 杞︿綅鎯呭喌 */ private String carport; /** - * 需要人工评估时填写的联系电话 + * 闇�瑕佷汉宸ヨ瘎浼版椂濉啓鐨勮仈绯荤數璇� */ private String contactNumber; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/UploadDataTotality.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/UploadDataTotality.java index d89efec98..dd9d0dc69 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/UploadDataTotality.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/UploadDataTotality.java @@ -26,7 +26,7 @@ public class UploadDataTotality implements MongoEntity{ private long version; private Date createDate; private String fileName; - private Integer status;//1:上传成功 2:上传失败 + private Integer status;//1:涓婁紶鎴愬姛 2:涓婁紶澶辫触 diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/UsageRate.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/UsageRate.java index 414410b87..3906c1d61 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/UsageRate.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/UsageRate.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * PDS 抵押品信息 + * PDS 鎶垫娂鍝佷俊鎭� * * @author hubingliang * @@ -22,7 +22,7 @@ public class UsageRate implements MongoEntity { private static final long serialVersionUID = 2787328470517909863L; private String id; - private String enterpriseId;//企业id + private String enterpriseId;//浼佷笟id private Double manageRate; private Double consumeRate; private Date date; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/User.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/User.java index 575b4c34b..c772b2ed0 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/User.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/pds/model/User.java @@ -9,7 +9,7 @@ import javax.persistence.Id; import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * PDS用户信息 + * PDS鐢ㄦ埛淇℃伅 * @author yinjihuan * */ @@ -21,91 +21,91 @@ public class User implements MongoEntity { private String id; /** - * 企业ID + * 浼佷笟ID */ private String enterpriseId; /** - * 企业名称 + * 浼佷笟鍚嶇О */ private String enterpriseName; /** - * 手机 + * 鎵嬫満 */ private String mobile; /** - * 邮箱 + * 閭 */ private String email; /** - * 密码(md5 32位小写加密) + * 瀵嗙爜(md5 32浣嶅皬鍐欏姞瀵�) */ private String pass; /** - * 姓名 + * 濮撳悕 */ private String name; /** - * 部门 + * 閮ㄩ棬 */ private String department; /** - * 角色信息 + * 瑙掕壊淇℃伅 */ private List roles; /** - * 创建时间 + * 鍒涘缓鏃堕棿 */ private Date createDate; /** - * 修改时间 + * 淇敼鏃堕棿 */ private Date updateDate; /** - * 风险指数地图-默认城市 + * 椋庨櫓鎸囨暟鍦板浘-榛樿鍩庡競 */ private String riskMapCity; /** - * CLTV地图-默认城市 + * CLTV鍦板浘-榛樿鍩庡競 */ private String cltvMapCity; /** - * 客户分类-地图默认城市 + * 瀹㈡埛鍒嗙被-鍦板浘榛樿鍩庡競 */ private String classifyMapCity; /** - * 状态(true为启用,false为禁用) + * 鐘舵�侊紙true涓哄惎鐢紝false涓虹鐢級 */ private Boolean status; /** - * 开通的城市 + * 寮�閫氱殑鍩庡競 */ private List citys; /** - * 最后登录时间 + * 鏈�鍚庣櫥褰曟椂闂� */ private Date lastLoginDate; /** - * 用户类型(0管理员 1普通用户) + * 鐢ㄦ埛绫诲瀷锛�0绠$悊鍛� 1鏅�氱敤鎴凤級 */ private Integer userType; /** - * 子用户 + * 瀛愮敤鎴� */ private List sonUers; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/dao/BrokerDisplayAnalysisDao.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/dao/BrokerDisplayAnalysisDao.java index efae66f75..8e49ce742 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/dao/BrokerDisplayAnalysisDao.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/dao/BrokerDisplayAnalysisDao.java @@ -9,7 +9,7 @@ import com.fangjia.dal.mongo.reda.model.BrokerDisplayAnalysis; public interface BrokerDisplayAnalysisDao extends MongoDao { /** - * 根据基础条件查询 + * 鏍规嵁鍩虹鏉′欢鏌ヨ * * @param city * @param companyList @@ -25,7 +25,7 @@ public interface BrokerDisplayAnalysisDao extends MongoDao districtList, String statType, Date startDate, Date endDate, String pageName); /** - * 根据提供的columns进行查询 + * 鏍规嵁鎻愪緵鐨刢olumns杩涜鏌ヨ * * @param city * @param companyList diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/dao/CacheKeyDaoImpl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/dao/CacheKeyDaoImpl.java index 979c3ee87..9c64ec275 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/dao/CacheKeyDaoImpl.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/dao/CacheKeyDaoImpl.java @@ -17,7 +17,7 @@ public class CacheKeyDaoImpl extends MongoDaoImpl implements CacheKeyD // TODO Auto-generated method stub if (StringUtils.isNotBlank(cacheKey)) { - if (!"HOUR".equals(type)) { // 目前时的数据不用记录cacheKey + if (!"HOUR".equals(type)) { // 鐩墠鏃剁殑鏁版嵁涓嶇敤璁板綍cacheKey CacheKey cache = new CacheKey(); cache.setCacheKey(cacheKey); cache.setCacheDate(cacheDate); diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/dao/HouseAnalysisDaoImpl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/dao/HouseAnalysisDaoImpl.java index 68d6a5cc1..10fe7fa1e 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/dao/HouseAnalysisDaoImpl.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/dao/HouseAnalysisDaoImpl.java @@ -18,7 +18,7 @@ public class HouseAnalysisDaoImpl extends MongoDaoImpl implements if (StringUtils.isNotBlank(city)) { params.add(new QueryParam("city", city)); } - // region为null或"",有特殊意义 + // region涓簄ull鎴�""锛屾湁鐗规畩鎰忎箟 params.add(new QueryParam("region", region)); if (null != type) { params.add(new QueryParam("type", type.name())); diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/dao/ZjtBrokerCompanyDao.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/dao/ZjtBrokerCompanyDao.java index 31699eff9..f70cda98e 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/dao/ZjtBrokerCompanyDao.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/dao/ZjtBrokerCompanyDao.java @@ -13,7 +13,7 @@ public interface ZjtBrokerCompanyDao extends MongoDao { public ZjtBrokerCompany getStatusOfCompanyAndBroker(String companyId, String brokerId); /** - * 根据公司id和经纪人ids返回状态map:[brokerId:status] + * 鏍规嵁鍏徃id鍜岀粡绾汉ids杩斿洖鐘舵�乵ap锛歔brokerId:status] * * @param companyId * @param idList @@ -28,7 +28,7 @@ public interface ZjtBrokerCompanyDao extends MongoDao { public List findBrokerIdsByStatusNotInIds(Integer status, String companyId, List idList); /** - * 修改经纪人状态,测试用 + * 淇敼缁忕邯浜虹姸鎬侊紝娴嬭瘯鐢� * * @param status * @param id diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/dao/ZjtBrokerDao.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/dao/ZjtBrokerDao.java index 8c83c33c9..a7391da9d 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/dao/ZjtBrokerDao.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/dao/ZjtBrokerDao.java @@ -13,7 +13,7 @@ public interface ZjtBrokerDao extends MongoDao { public ZjtBroker findByBrokerNameAndMobile(String brokerName, String brokerMobile); /** - * 根据经纪人ids返回map:[brokerId:ZjtBroker] + * 鏍规嵁缁忕邯浜篿ds杩斿洖map锛歔brokerId:ZjtBroker] * * @param companyId * @param idList diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/dao/ZjtDeleteHouseLogDao.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/dao/ZjtDeleteHouseLogDao.java index 15be5ae7c..ef450c8f7 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/dao/ZjtDeleteHouseLogDao.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/dao/ZjtDeleteHouseLogDao.java @@ -10,14 +10,14 @@ public interface ZjtDeleteHouseLogDao extends MongoDao { public ZjtDeleteHouseLog findByCategoryAndRelateId(String city, String category, String relateId); /** - * 根据经纪人id删除日志表中该经纪人所有的房源 + * 鏍规嵁缁忕邯浜篿d鍒犻櫎鏃ュ織琛ㄤ腑璇ョ粡绾汉鎵�鏈夌殑鎴挎簮 * * @param brokerIds */ public void deleteByBrokerIds(List brokerIds); /** - * 删除房源,测试用 + * 鍒犻櫎鎴挎簮锛屾祴璇曠敤 * * @param houseId * @param category diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/model/BatchAnalysis.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/model/BatchAnalysis.java index 2ee00bdd2..a09f2cba0 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/model/BatchAnalysis.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/model/BatchAnalysis.java @@ -26,7 +26,7 @@ public class BatchAnalysis implements MongoEntity { private String project; private Date startTime; private Date endTime; - private int reality; // 实际完成的时间(分钟) + private int reality; // 瀹為檯瀹屾垚鐨勬椂闂�(鍒嗛挓) @Id @GeneratedValue diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/model/CompanyDisplayAnalysis.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/model/CompanyDisplayAnalysis.java index 7b1458649..b4e66cfe8 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/model/CompanyDisplayAnalysis.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/model/CompanyDisplayAnalysis.java @@ -22,16 +22,16 @@ public class CompanyDisplayAnalysis implements MongoEntity { private static final long serialVersionUID = 8318970558169176243L; public static List UNKNOWN_COMPANY_LIST = new ArrayList(); static { - UNKNOWN_COMPANY_LIST.add("公司未知"); + UNKNOWN_COMPANY_LIST.add("鍏徃鏈煡"); UNKNOWN_COMPANY_LIST.add("unknown"); - UNKNOWN_COMPANY_LIST.add("未知"); - UNKNOWN_COMPANY_LIST.add("未知公司"); - UNKNOWN_COMPANY_LIST.add("网站不规范数据"); + UNKNOWN_COMPANY_LIST.add("鏈煡"); + UNKNOWN_COMPANY_LIST.add("鏈煡鍏徃"); + UNKNOWN_COMPANY_LIST.add("缃戠珯涓嶈鑼冩暟鎹�"); UNKNOWN_COMPANY_LIST.add(null); - UNKNOWN_COMPANY_LIST.add("客户直接成交"); + UNKNOWN_COMPANY_LIST.add("瀹㈡埛鐩存帴鎴愪氦"); } - public static String UNKNOWN_COMPANY_IN_DB = "unknown"; // 未知公司在数据库中的存在方式 + public static String UNKNOWN_COMPANY_IN_DB = "unknown"; // 鏈煡鍏徃鍦ㄦ暟鎹簱涓殑瀛樺湪鏂瑰紡 public static String DISTRICT_ALL = "ALL"; private String id; @@ -178,7 +178,7 @@ public class CompanyDisplayAnalysis implements MongoEntity { } /** - * 获取房源展示占比 + * 鑾峰彇鎴挎簮灞曠ず鍗犳瘮 * * @return */ @@ -188,7 +188,7 @@ public class CompanyDisplayAnalysis implements MongoEntity { } /** - * 是否是异常公司名 + * 鏄惁鏄紓甯稿叕鍙稿悕 * * @param companyName * @return diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/model/HouseAnalysis.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/model/HouseAnalysis.java index 1350c21aa..f49a914b3 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/model/HouseAnalysis.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/model/HouseAnalysis.java @@ -29,7 +29,7 @@ public class HouseAnalysis implements MongoEntity { private Date creationDate; public enum HouseAnalysisType { - REGION("区域"), BLOCK("板块"), TOTAL_PRICE("总价"), AREA("面积"), HOUSE_TYPE("房型"); + REGION("鍖哄煙"), BLOCK("鏉垮潡"), TOTAL_PRICE("鎬讳环"), AREA("闈㈢Н"), HOUSE_TYPE("鎴垮瀷"); private HouseAnalysisType(String description) { this.description = description; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/model/RedaBroker.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/model/RedaBroker.java index b31aeb53a..305e50a8f 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/model/RedaBroker.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/model/RedaBroker.java @@ -23,8 +23,8 @@ public class RedaBroker implements MongoEntity { private String mobile; private String company; private String city; - private long operatorId; // 操作者ID - private long userId; //所属总账户ID + private long operatorId; // 鎿嶄綔鑰匢D + private long userId; //鎵�灞炴�昏处鎴稩D private Date creationDate; private Date modificationDate; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/model/RedaGroup.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/model/RedaGroup.java index 2c510b6b3..1025e22f8 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/model/RedaGroup.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/model/RedaGroup.java @@ -19,8 +19,8 @@ public class RedaGroup implements MongoEntity { */ private static final long serialVersionUID = -9217623034432495059L; private String id; - private String brokerId; //经纪人id - private long userId; //所属分账户id + private String brokerId; //缁忕邯浜篿d + private long userId; //鎵�灞炲垎璐︽埛id private Date creationDate; private Date modificationDate; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/model/RedaHomeData.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/model/RedaHomeData.java index 8069068a9..dbb32db3a 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/model/RedaHomeData.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/model/RedaHomeData.java @@ -28,7 +28,7 @@ public class RedaHomeData implements MongoEntity { private Date creationDate; public enum HomeDataStatTypeEnum { - DEAL("成交"), SELL("挂牌"); + DEAL("鎴愪氦"), SELL("鎸傜墝"); private HomeDataStatTypeEnum(String description) { this.description = description; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/model/ZjtBroker.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/model/ZjtBroker.java index 791ae8c1d..9bd5aee73 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/model/ZjtBroker.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/model/ZjtBroker.java @@ -16,7 +16,7 @@ public class ZjtBroker implements MongoEntity { private static final long serialVersionUID = -7067034507862037360L; /** * - * "_id" : ObjectId("4dc89a1923f575916feb59bd"), "broker_name" : "张女士", + * "_id" : ObjectId("4dc89a1923f575916feb59bd"), "broker_name" : "寮犲コ澹�", * "broker_mobile" : "", "city" : "sh", "creation_date" : * "Tue May 10 2011 09:51:21 GMT+0800 (CST)", "modification_date" : * "Tue May 10 2011 09:51:21 GMT+0800 (CST)" } diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/model/ZjtBrokerCompany.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/model/ZjtBrokerCompany.java index 3be730e5c..bb622b451 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/model/ZjtBrokerCompany.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/model/ZjtBrokerCompany.java @@ -24,7 +24,7 @@ public class ZjtBrokerCompany implements MongoEntity { private String id; private String brokerId; private String companyId; - private Integer status; // 1-删除,0-正常 + private Integer status; // 1-鍒犻櫎锛�0-姝e父 private Date creationDate; private Date modificationDate; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/model/ZjtCompanyNameAlias.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/model/ZjtCompanyNameAlias.java index 80a7e6d0a..e247ae75a 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/model/ZjtCompanyNameAlias.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/model/ZjtCompanyNameAlias.java @@ -23,7 +23,7 @@ public class ZjtCompanyNameAlias implements MongoEntity { private String aliasName; private Date creationDate; private Date modificationDate; - private Integer status; // 1 - 已忽略 + private Integer status; // 1 - 宸插拷鐣� @Id @GeneratedValue diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/model/ZjtDeleteHouseLog.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/model/ZjtDeleteHouseLog.java index 06256567b..9be7444c4 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/model/ZjtDeleteHouseLog.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/model/ZjtDeleteHouseLog.java @@ -15,7 +15,7 @@ import com.fangjia.dal.MongoEntity; public class ZjtDeleteHouseLog implements MongoEntity { private static final long serialVersionUID = 482008169364534550L; /** - * 日志表: city 中介公司账号ID relate_id, 类型 操作时间 sh 123 9812368 ershoufang sh 123 + * 鏃ュ織琛�: city 涓粙鍏徃璐﹀彿ID relate_id, 绫诲瀷 鎿嶄綔鏃堕棿 sh 123 9812368 ershoufang sh 123 * 8812368 zufang * * diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/model/ZjtSettings.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/model/ZjtSettings.java index 51cef0dae..53c82ee51 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/model/ZjtSettings.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/reda/model/ZjtSettings.java @@ -15,7 +15,7 @@ import com.fangjia.dal.MongoEntity; public class ZjtSettings implements MongoEntity { private static final long serialVersionUID = 734622498963633319L; - public static String DEFAULT_WEBSITE = "soufun.com"; //未设置网站参数时首选该网站 + public static String DEFAULT_WEBSITE = "soufun.com"; //鏈缃綉绔欏弬鏁版椂棣栭�夎缃戠珯 private String id; private String city; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/tool/model/GainDataDetailLog.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/tool/model/GainDataDetailLog.java index cdf099682..fa9e421b0 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/tool/model/GainDataDetailLog.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/tool/model/GainDataDetailLog.java @@ -12,7 +12,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * app用户获取数据(小区、房源、估价等)日志 + * app鐢ㄦ埛鑾峰彇鏁版嵁(灏忓尯銆佹埧婧愩�佷及浠风瓑)鏃ュ織 * * @author liupei */ @@ -24,19 +24,19 @@ public class GainDataDetailLog implements MongoEntity { private String id; /** - * 用户的appKey + * 鐢ㄦ埛鐨刟ppKey */ private String appKey; /** - * 互联网用户ip + * 浜掕仈缃戠敤鎴穒p */ private String ip; private String refererUrl; /** - * cookie中的uid + * cookie涓殑uid */ private String uid; @@ -46,17 +46,17 @@ public class GainDataDetailLog implements MongoEntity { private String sid; /** - * 获取时间 + * 鑾峰彇鏃堕棿 */ private Date creationDate; /** - * 获取到的数据列表(房源ids,小区key(城市_区域_小区名)) + * 鑾峰彇鍒扮殑鏁版嵁鍒楄〃(鎴挎簮ids,灏忓尯key(鍩庡競_鍖哄煙_灏忓尯鍚�)) */ private List orgIds; /** - * 数据类别 + * 鏁版嵁绫诲埆 */ private String category; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/tool/model/OpenResourceCount.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/tool/model/OpenResourceCount.java index 2d4f8cbbe..8a553b850 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/tool/model/OpenResourceCount.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/tool/model/OpenResourceCount.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 互联网用户点击开放给app用户的房源、小区、估价等日志 + * 浜掕仈缃戠敤鎴风偣鍑诲紑鏀剧粰app鐢ㄦ埛鐨勬埧婧愩�佸皬鍖恒�佷及浠风瓑鏃ュ織 * * @author liupei */ diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/tool/model/OpenUriLog.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/tool/model/OpenUriLog.java index 907fee553..a02e38bb9 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/tool/model/OpenUriLog.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/tool/model/OpenUriLog.java @@ -14,7 +14,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 互联网用户点击开放给app用户的房源、小区、估价等日志 + * 浜掕仈缃戠敤鎴风偣鍑诲紑鏀剧粰app鐢ㄦ埛鐨勬埧婧愩�佸皬鍖恒�佷及浠风瓑鏃ュ織 * * @author liupei */ @@ -30,25 +30,25 @@ public class OpenUriLog implements MongoEntity { private String id; /** - * 用户的appKey + * 鐢ㄦ埛鐨刟ppKey */ private String appKey; /** - * 互联网用户ip + * 浜掕仈缃戠敤鎴穒p */ private String ip; /** - * 目标url + * 鐩爣url */ private String requestUrl; /** - * 目标url + * 鐩爣url */ private String requestUri; /** - * 获取时间 + * 鑾峰彇鏃堕棿 */ private Date creationDate; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/tool/model/ToolClickDetail.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/tool/model/ToolClickDetail.java index 6fcf407f9..64ce941b7 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/tool/model/ToolClickDetail.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/tool/model/ToolClickDetail.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 互联网用户点击开放给app用户的房源、小区、估价等 + * 浜掕仈缃戠敤鎴风偣鍑诲紑鏀剧粰app鐢ㄦ埛鐨勬埧婧愩�佸皬鍖恒�佷及浠风瓑 * * @author liupei */ @@ -23,17 +23,17 @@ public class ToolClickDetail implements MongoEntity { private String id; /** - * 用户的appKey + * 鐢ㄦ埛鐨刟ppKey */ private String appKey; /** - * 互联网用户ip + * 浜掕仈缃戠敤鎴穒p */ private String ip; /** - * cookie中的uid + * cookie涓殑uid */ private String uid; @@ -45,27 +45,27 @@ public class ToolClickDetail implements MongoEntity { private String refererUrl; /** - * 目标url + * 鐩爣url */ private String requestUrl; /** - * 获取时间 + * 鑾峰彇鏃堕棿 */ private Date creationDate; /** - * 类别 + * 绫诲埆 */ private String category; /** - * 城市 + * 鍩庡競 */ private String city; /** - * 点击的关联id(房源id、小区key(城市名_区域_小区名)等) + * 鐐瑰嚮鐨勫叧鑱攊d(鎴挎簮id銆佸皬鍖簁ey(鍩庡競鍚峗鍖哄煙_灏忓尯鍚�)绛�) */ private String orgId; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/tool/model/ToolClickDetailLog.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/tool/model/ToolClickDetailLog.java index f28494c35..f2d8f365f 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/tool/model/ToolClickDetailLog.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/tool/model/ToolClickDetailLog.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 互联网用户点击开放给app用户的房源、小区、估价等日志 + * 浜掕仈缃戠敤鎴风偣鍑诲紑鏀剧粰app鐢ㄦ埛鐨勬埧婧愩�佸皬鍖恒�佷及浠风瓑鏃ュ織 * * @author liupei */ @@ -23,17 +23,17 @@ public class ToolClickDetailLog implements MongoEntity { private String id; /** - * 用户的appKey + * 鐢ㄦ埛鐨刟ppKey */ private String appKey; /** - * 互联网用户ip + * 浜掕仈缃戠敤鎴穒p */ private String ip; /** - * cookie中的uid + * cookie涓殑uid */ private String uid; @@ -45,27 +45,27 @@ public class ToolClickDetailLog implements MongoEntity { private String refererUrl; /** - * 目标url + * 鐩爣url */ private String requestUrl; /** - * 获取时间 + * 鑾峰彇鏃堕棿 */ private Date creationDate; /** - * 类别 + * 绫诲埆 */ private String category; /** - * 城市 + * 鍩庡競 */ private String city; /** - * 点击的关联id(房源id、小区key(城市名_区域_小区名)等) + * 鐐瑰嚮鐨勫叧鑱攊d(鎴挎簮id銆佸皬鍖簁ey(鍩庡競鍚峗鍖哄煙_灏忓尯鍚�)绛�) */ private String orgId; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/reda/common/Role.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/reda/common/Role.java index bf9f8da59..a31f62577 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/reda/common/Role.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/reda/common/Role.java @@ -1,20 +1,20 @@ package com.fangjia.dal.reda.common; /** - * reda用户类型 + * reda鐢ㄦ埛绫诲瀷 * * @author anglee * */ public enum Role { - NORMAL, // 销售试用总账户,0 - PAID, // 付费总账户,1 - CHILD, // 子账户,2 - TRY, // 网络试用账户,3 - ADMIN, // 管理员账户,4 - SELLER, // 销售账户,5 - NONE; // 未登录用户,6 + NORMAL, // 閿�鍞瘯鐢ㄦ�昏处鎴�,0 + PAID, // 浠樿垂鎬昏处鎴�,1 + CHILD, // 瀛愯处鎴�,2 + TRY, // 缃戠粶璇曠敤璐︽埛,3 + ADMIN, // 绠$悊鍛樿处鎴�,4 + SELLER, // 閿�鍞处鎴�,5 + NONE; // 鏈櫥褰曠敤鎴�,6 public static Role valueOfRole(String level) { for (Role l : Role.values()) { diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java index 824d8cf80..372d766eb 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java @@ -565,7 +565,7 @@ public class SeawaterDaoImpl extends com.fangjia.dal.SeawaterDaoImpl i reqBody.put("size", limit); } - // 不展示删除 + // 涓嶅睍绀哄垹闄� // JSONObject param = new JSONObject(); // param.put("status", 0); // JSONObject temp = new JSONObject(); @@ -575,7 +575,7 @@ public class SeawaterDaoImpl extends com.fangjia.dal.SeawaterDaoImpl i query.put("must", jsonList); q.put("bool", query); reqBody.put("query", q); - //用户名:密码 + //鐢ㄦ埛鍚�:瀵嗙爜 Base64 token = new Base64(); String authenticationEncoding = token.encodeAsString(new String("" + ES_USER + ":" + ES_PASSWORD + "").getBytes()); HttpRequest request = new HttpRequest(); @@ -604,25 +604,25 @@ public class SeawaterDaoImpl extends com.fangjia.dal.SeawaterDaoImpl i Double lng = query.getLng(); Integer radius = query.getRadius(); JSONObject filter = new JSONObject(); - // 添加地理位置过滤器和排序 + // 娣诲姞鍦扮悊浣嶇疆杩囨护鍣ㄥ拰鎺掑簭 if (lat != null && lng != null && radius != null) { - // 1. 设置地理位置参数 + // 1. 璁剧疆鍦扮悊浣嶇疆鍙傛暟 JSONObject geoDistanceParam = new JSONObject(); geoDistanceParam.put("lat", lat); geoDistanceParam.put("lon", lng); - // 2. 设置 geo_distance 过滤器,限制结果在指定的半径范围内 + // 2. 璁剧疆 geo_distance 杩囨护鍣紝闄愬埗缁撴灉鍦ㄦ寚瀹氱殑鍗婂緞鑼冨洿鍐� JSONObject geoDistance = new JSONObject(); - geoDistance.put("distance", radius + "m"); // 半径设置为 3000km - geoDistance.put("location", geoDistanceParam); // 使用给定的经纬度 + geoDistance.put("distance", radius + "m"); // 鍗婂緞璁剧疆涓� 3000km + geoDistance.put("location", geoDistanceParam); // 浣跨敤缁欏畾鐨勭粡绾害 filter.put("geo_distance", geoDistance); - // 3. 构建查询体 + // 3. 鏋勫缓鏌ヨ浣� // filter.put("filter", geoDistanceFilter); // jsonList.add(filter); // reqBody.put("query", filter); - // 4. 添加按距离排序的部分 + // 4. 娣诲姞鎸夎窛绂绘帓搴忕殑閮ㄥ垎 JSONObject geoDistanceSort = new JSONObject(); JSONObject jsonObject = new JSONObject(); jsonObject.put("order", "asc"); @@ -630,7 +630,7 @@ public class SeawaterDaoImpl extends com.fangjia.dal.SeawaterDaoImpl i jsonObject.put("unit", "m"); jsonObject.put("distance_type", "arc"); geoDistanceSort.put("_geo_distance", jsonObject); - // 5. 将排序部分添加到请求体 + // 5. 灏嗘帓搴忛儴鍒嗘坊鍔犲埌璇锋眰浣� List sortJsonList = new ArrayList(); sortJsonList.add(geoDistanceSort); reqBody.put("sort", sortJsonList); @@ -824,7 +824,7 @@ public class SeawaterDaoImpl extends com.fangjia.dal.SeawaterDaoImpl i } q.put("bool", queryJson); reqBody.put("query", q); - //用户名:密码 + //鐢ㄦ埛鍚�:瀵嗙爜 Base64 token = new Base64(); String authenticationEncoding = token.encodeAsString(new String("" + ES_USER + ":" + ES_PASSWORD + "").getBytes()); HttpRequest request = new HttpRequest(); @@ -1054,7 +1054,7 @@ public class SeawaterDaoImpl extends com.fangjia.dal.SeawaterDaoImpl i JSONObject reqBody = new JSONObject(); reqBody.put("size", 0); - // 1. 构建 bool.must 查询条件 + // 1. 鏋勫缓 bool.must 鏌ヨ鏉′欢 List mustList = new ArrayList(); if (StringUtils.isNotBlank(city)) { @@ -1087,7 +1087,7 @@ public class SeawaterDaoImpl extends com.fangjia.dal.SeawaterDaoImpl i termWrapper.put("term", term); mustList.add(termWrapper); } - // 日期范围条件 + // 鏃ユ湡鑼冨洿鏉′欢 JSONObject dateRange = new JSONObject(); dateRange.put("gte", startPDate); dateRange.put("lte", endPDate); @@ -1097,14 +1097,14 @@ public class SeawaterDaoImpl extends com.fangjia.dal.SeawaterDaoImpl i rangeWrapper.put("range", range); mustList.add(rangeWrapper); - // 组合 bool 查询 + // 缁勫悎 bool 鏌ヨ JSONObject boolQuery = new JSONObject(); boolQuery.put("must", mustList); JSONObject query = new JSONObject(); query.put("bool", boolQuery); reqBody.put("query", query); - // 2. 构建聚合 monthly_histogram + // 2. 鏋勫缓鑱氬悎 monthly_histogram JSONObject dateHistogram = new JSONObject(); dateHistogram.put("field", "publish_date"); dateHistogram.put("calendar_interval", "month"); @@ -1113,13 +1113,13 @@ public class SeawaterDaoImpl extends com.fangjia.dal.SeawaterDaoImpl i orderJson.put("_key", "asc"); dateHistogram.put("order",orderJson); - // avg_price 子聚合 + // avg_price 瀛愯仛鍚� JSONObject avgPriceAgg = new JSONObject(); JSONObject avgJson = new JSONObject(); avgJson.put("field", "avg_price"); avgPriceAgg.put("avg", avgJson); - // moving_avg 子聚合 + // moving_avg 瀛愯仛鍚� JSONObject movingFn = new JSONObject(); movingFn.put("buckets_path", "avg_price"); movingFn.put("window", 3); @@ -1128,12 +1128,12 @@ public class SeawaterDaoImpl extends com.fangjia.dal.SeawaterDaoImpl i JSONObject movingAvgAgg = new JSONObject(); movingAvgAgg.put("moving_fn", movingFn); - // 子聚合集合 + // 瀛愯仛鍚堥泦鍚� JSONObject subAggs = new JSONObject(); subAggs.put("avg_price", avgPriceAgg); subAggs.put("moving_avg", movingAvgAgg); - // 整体聚合 + // 鏁翠綋鑱氬悎 JSONObject monthlyHistogramAgg = new JSONObject(); monthlyHistogramAgg.put("date_histogram", dateHistogram); monthlyHistogramAgg.put("aggs", subAggs); @@ -1143,7 +1143,7 @@ public class SeawaterDaoImpl extends com.fangjia.dal.SeawaterDaoImpl i reqBody.put("aggs", aggs); - // 3. 发送请求 + // 3. 鍙戦�佽姹� HttpRequest request = new HttpRequest(); Map headers = new HashMap(); headers.put("Content-Type", "application/json"); diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/model/Seawater.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/model/Seawater.java index 3bb471310..0d3a6c16d 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/model/Seawater.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/model/Seawater.java @@ -72,11 +72,11 @@ public class Seawater implements SeawaterEntity { private String buildType; private Integer lift; private Integer liftHousehold; - private String roomStructure;//户型结构 - private String tradeProperty; //交易权属 - private String propertyOwnership; //房权所属 非共有 - private String housingAge; //房屋年限 满二年 - private String elevator; //配备电梯 有/无 + private String roomStructure;//鎴峰瀷缁撴瀯 + private String tradeProperty; //浜ゆ槗鏉冨睘 + private String propertyOwnership; //鎴挎潈鎵�灞� 闈炲叡鏈� + private String housingAge; //鎴垮眿骞撮檺 婊′簩骞� + private String elevator; //閰嶅鐢垫 鏈�/鏃� private String decoration; @@ -86,14 +86,14 @@ public class Seawater implements SeawaterEntity { private String title; - // 商铺经营范围 + // 鍟嗛摵缁忚惀鑼冨洿 private String businessScope; private String businessRange; - //商铺类型 + //鍟嗛摵绫诲瀷 private String shopType; - // 写字楼等级 + // 鍐欏瓧妤肩瓑绾� private String level; private Double dayUnitPrice; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seaweed/dao/DistrictDao.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seaweed/dao/DistrictDao.java index a42f6740e..ed7186bc6 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seaweed/dao/DistrictDao.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seaweed/dao/DistrictDao.java @@ -9,7 +9,7 @@ import com.mongodb.DBObject; public interface DistrictDao extends SeaweedDao { /** - * 获取指定字段的小区信息 + * 鑾峰彇鎸囧畾瀛楁鐨勫皬鍖轰俊鎭� * * @param query * @return diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seaweed/dao/DistrictDaoImpl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seaweed/dao/DistrictDaoImpl.java index ffdac9ab4..54970148f 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seaweed/dao/DistrictDaoImpl.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seaweed/dao/DistrictDaoImpl.java @@ -13,7 +13,7 @@ import com.mongodb.DBObject; public class DistrictDaoImpl extends SeaweedDaoImpl implements DistrictDao { /** - * 获取指定字段的小区信息 + * 鑾峰彇鎸囧畾瀛楁鐨勫皬鍖轰俊鎭� * * @param query * @return diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seaweed/model/District.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seaweed/model/District.java index 00d35fa46..17bc9f7c0 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seaweed/model/District.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seaweed/model/District.java @@ -41,29 +41,29 @@ public class District implements SeaweedEntity { private String description; private String address; private List addrAlias; - private List schools;//对口学校 - private List kindergartens;//对口幼儿园 + private List schools;//瀵瑰彛瀛︽牎 + private List kindergartens;//瀵瑰彛骞煎効鍥� private String region; private String block; private String kind; - private Integer avgPrice; // 元/㎡ - private Integer totalPrice; // 万元/套 + private Integer avgPrice; // 鍏�/銕� + private Integer totalPrice; // 涓囧厓/濂� private String fitment; private String estateType; private String estateType2; private String mobile; private String url; - private List floorplanPics;// 楼层平面图(房型图,户型图)(url列表) - private List srcFloorplanPics;// 楼层平面图(房型图,户型图)(原数据) + private List floorplanPics;// 妤煎眰骞抽潰鍥撅紙鎴垮瀷鍥�,鎴峰瀷鍥撅級锛坲rl鍒楄〃锛� + private List srcFloorplanPics;// 妤煎眰骞抽潰鍥撅紙鎴垮瀷鍥�,鎴峰瀷鍥撅級锛堝師鏁版嵁锛� private List pics; - private List outPics;// 外景图 - private List inPics;// 室内图(实景图) - private List samplePics;// 样板图 + private List outPics;// 澶栨櫙鍥� + private List inPics;// 瀹ゅ唴鍥�(瀹炴櫙鍥�) + private List samplePics;// 鏍锋澘鍥� private List matchingPics; private String videoUrl; - private Long lat;//高德 + private Long lat;//楂樺痉 private Long lng; - private Long lat2;//百度 + private Long lat2;//鐧惧害 private Long lng2; private String developer; private String estateCompany; @@ -71,7 +71,7 @@ public class District implements SeaweedEntity { private String buildArea; private String cubagePercent; private String virescencePercent; - private String estateCharge;// 物业费 + private String estateCharge;// 鐗╀笟璐� private String liveDate; private String buildDate; private String carSite; @@ -82,7 +82,7 @@ public class District implements SeaweedEntity { private String loopLineInfo; // private String businessQuarter; private String traffic; - private Date openDate;// 开盘时间 + private Date openDate;// 寮�鐩樻椂闂� private Integer householdCount; private String sellAddress; private String discount; @@ -114,124 +114,124 @@ public class District implements SeaweedEntity { private String sideset; private String finishBuildingDate; - private String startBuildingDate;// 开工时间 + private String startBuildingDate;// 寮�宸ユ椂闂� private String houseProperty; private String buildStructure; - private String houseStructure; //房屋结构 + private String houseStructure; //鎴垮眿缁撴瀯 private String source; private String propertyLife; - //乡镇街道 + //涔¢晣琛楅亾 private String township; private String pinyin; - private String propertyStatus;// 商铺建筑状态 - private String leaseTerm;// 租赁年限 - private String paymentPattern;// 付款方式 - private String rentType;// 租售类型 - private Double rentPrice;// 出租价格 - private Integer sellPrice;// 出售价格 + private String propertyStatus;// 鍟嗛摵寤虹瓚鐘舵�� + private String leaseTerm;// 绉熻祦骞撮檺 + private String paymentPattern;// 浠樻鏂瑰紡 + private String rentType;// 绉熷敭绫诲瀷 + private Double rentPrice;// 鍑虹浠锋牸 + private Integer sellPrice;// 鍑哄敭浠锋牸 - private String bayArea;// 开间面积 - private Integer divisible;// 可分割 - private Integer unifiedManage;// 是否统一管理 - private String metroInfo;// 地铁沿线 - private String metroNames;// 地铁站名 - private String propertyInfo;// 物业概况 - private String surrounding;// 周边情况 - private String businessStatus;// 经营业态 + private String bayArea;// 寮�闂撮潰绉� + private Integer divisible;// 鍙垎鍓� + private Integer unifiedManage;// 鏄惁缁熶竴绠$悊 + private String metroInfo;// 鍦伴搧娌跨嚎 + private String metroNames;// 鍦伴搧绔欏悕 + private String propertyInfo;// 鐗╀笟姒傚喌 + private String surrounding;// 鍛ㄨ竟鎯呭喌 + private String businessStatus;// 缁忚惀涓氭�� private int dataStatus; - private String streetCommunity;//街道社区 + private String streetCommunity;//琛楅亾绀惧尯 - private String workBus;// 是否班车 - private String workBusTime; // 班车时间 - private String enterCompany; // 入驻企业 - private String safeSystem; // 安防系统 - private String networkWay; // 网络通讯 - private String enterpriseType; // 企业类型 - private String industryName;// 行业类型 - private String fitmentLevel;// 装修标准 - private String conditionerTimeLag;// 空调延时 + private String workBus;// 鏄惁鐝溅 + private String workBusTime; // 鐝溅鏃堕棿 + private String enterCompany; // 鍏ラ┗浼佷笟 + private String safeSystem; // 瀹夐槻绯荤粺 + private String networkWay; // 缃戠粶閫氳 + private String enterpriseType; // 浼佷笟绫诲瀷 + private String industryName;// 琛屼笟绫诲瀷 + private String fitmentLevel;// 瑁呬慨鏍囧噯 + private String conditionerTimeLag;// 绌鸿皟寤舵椂 private String districtName; - private String rentPriceRange;// 租金价格范围 - private String parkingFee;// 停车费 + private String rentPriceRange;// 绉熼噾浠锋牸鑼冨洿 + private String parkingFee;// 鍋滆溅璐� - private String landCarSite;// 地上车位数 - private String undergroundCarSite;// 地下车位数 + private String landCarSite;// 鍦颁笂杞︿綅鏁� + private String undergroundCarSite;// 鍦颁笅杞︿綅鏁� - private String landFloor;// 地上层数 - private String undergroundFloor;// 地下层数 + private String landFloor;// 鍦颁笂灞傛暟 + private String undergroundFloor;// 鍦颁笅灞傛暟 - private String clearHeight;// 净高 - private String standardHeight;// 标准层高 - private String standardArea;// 标准层面积 - private String lobbyHeight;// 大堂层高 - private String foreign;// 是否涉外 - private String register;// 是否可注册 - private String conditionerTime;// 空调开放时间 + private String clearHeight;// 鍑�楂� + private String standardHeight;// 鏍囧噯灞傞珮 + private String standardArea;// 鏍囧噯灞傞潰绉� + private String lobbyHeight;// 澶у爞灞傞珮 + private String foreign;// 鏄惁娑夊 + private String register;// 鏄惁鍙敞鍐� + private String conditionerTime;// 绌鸿皟寮�鏀炬椂闂� - private String elevatorsCount;// 电梯数量 - private String elevatorBrand;// 电梯品牌 - private String personElevatorsCount;// 客梯数 - private String goodsElevatorCount;// 货梯数 - private String buildFacilities;// 楼内配套 - private String realUsePercent;// 实用率 + private String elevatorsCount;// 鐢垫鏁伴噺 + private String elevatorBrand;// 鐢垫鍝佺墝 + private String personElevatorsCount;// 瀹㈡鏁� + private String goodsElevatorCount;// 璐ф鏁� + private String buildFacilities;// 妤煎唴閰嶅 + private String realUsePercent;// 瀹炵敤鐜� private Integer ifSell; private Integer ifDeal; private Integer ifSellStat; private Integer ifThirdStat; private Integer weekendMarkup; private Integer changedMarkup; - /**是否有电梯*/ + /**鏄惁鏈夌數姊�*/ private Boolean isElevator; private double score; - // 小区性质 + // 灏忓尯鎬ц川 private String landProperty; private String masterDistrictName; private String ip; private String addrType; private boolean selected; - /**交房标准*/ + /**浜ゆ埧鏍囧噯*/ private String deliveryLevel; - /**写字楼--智能水平*/ + /**鍐欏瓧妤�--鏅鸿兘姘村钩*/ private String intelligenceLevel; - /**写字楼--总楼层*/ + /**鍐欏瓧妤�--鎬绘ゼ灞�*/ private String totalFloor; - /**写字楼--会议室*/ + /**鍐欏瓧妤�--浼氳瀹�*/ private String meetingRoom; private String buildDesigner; private String consCompany; - //土地使用权证号 + //鍦熷湴浣跨敤鏉冭瘉鍙� private String usageCard; - //土地使用年限起 + //鍦熷湴浣跨敤骞撮檺璧� private String landUsageStart; - //土地使用年限止 + //鍦熷湴浣跨敤骞撮檺姝� private String landUsageEnd; - //百度地图边框 + //鐧惧害鍦板浘杈规 private String baiduBorder; - //小区的唯一编码 + //灏忓尯鐨勫敮涓�缂栫爜 private String sid; - //楼栋总数 + //妤兼爧鎬绘暟 private Integer loudongCount; - //楼栋图片集合 + //妤兼爧鍥剧墖闆嗗悎 private List loudongImgs; - //居委会 + //灞呭浼� private String committee; - //商铺二级分类 + //鍟嗛摵浜岀骇鍒嗙被 private List shopEstateType2; - //标签 + //鏍囩 private String tag; private String sourceWeb; - //入住率 + //鍏ヤ綇鐜� private String occupancyRate; - //主力户型 + //涓诲姏鎴峰瀷 private String mainType; - //主力户型面积 + //涓诲姏鎴峰瀷闈㈢Н private String mainTypeArea; private String createYear; @@ -645,7 +645,7 @@ public class District implements SeaweedEntity { } if (Character.isDigit(charge.charAt(charge.length() - 1))) { - return charge + "元/平米·月"; + return charge + "鍏�/骞崇背路鏈�"; } else { return charge; } @@ -964,7 +964,7 @@ public class District implements SeaweedEntity { } /** - * 房型图列表转换为string列表 + * 鎴垮瀷鍥惧垪琛ㄨ浆鎹负string鍒楄〃 * * @param srcs * @return @@ -1264,16 +1264,16 @@ public class District implements SeaweedEntity { this.businessStatus = businessStatus; } - public static final String[] FILTER_HOUSE_ESTATE_TYPES = new String[] { "写字楼", "商铺", "厂房", "工厂", "车库", "写字楼", "汽车位", "店面房", - "车位" }; - public static final String[] VILLA_TYPE = new String[] { "别墅", "独栋", "联排", "双拼", "叠加" }; - /* 别墅标识 */ - public static final String VILLA_STRING = "别墅"; - /* 小区标识 */ - public static final String DIS_STRING = "小区"; + public static final String[] FILTER_HOUSE_ESTATE_TYPES = new String[] { "鍐欏瓧妤�", "鍟嗛摵", "鍘傛埧", "宸ュ巶", "杞﹀簱", "鍐欏瓧妤�", "姹借溅浣�", "搴楅潰鎴�", + "杞︿綅" }; + public static final String[] VILLA_TYPE = new String[] { "鍒", "鐙爧", "鑱旀帓", "鍙屾嫾", "鍙犲姞" }; + /* 鍒鏍囪瘑 */ + public static final String VILLA_STRING = "鍒"; + /* 灏忓尯鏍囪瘑 */ + public static final String DIS_STRING = "灏忓尯"; /** - * 获取小区类型 + * 鑾峰彇灏忓尯绫诲瀷 */ public String getDistrictType() { if (StringUtils.isBlank(this.kind)) { @@ -1281,7 +1281,7 @@ public class District implements SeaweedEntity { } String tempKind = null; - Set estateTypes = new HashSet(Arrays.asList(StringUtils.split(kind, ",,"))); + Set estateTypes = new HashSet(Arrays.asList(StringUtils.split(kind, ",锛�"))); Set tempKinds = new HashSet(); for (String string : estateTypes) { if (StringUtils.indexOfAny(string, FILTER_HOUSE_ESTATE_TYPES) >= 0) { diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seaweed/model/Shop.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seaweed/model/Shop.java index 08c63afae..b78a8de8e 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seaweed/model/Shop.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seaweed/model/Shop.java @@ -32,41 +32,41 @@ public class Shop extends District { private Long lng; private Long lat2; private Long lng2; - private String businessQuarter; // 商圈 - private String loopLineInfo; // 环线位置 + private String businessQuarter; // 鍟嗗湀 + private String loopLineInfo; // 鐜嚎浣嶇疆 private String address; - private String estateType; // 物业类型 - private String estateType2; // 物业类型 - private String propertyStatus; // 建筑状态 - private String rentType; // 租赁类型 - private String leaseTerm; // 租赁年限 - private String paymentPattern; // 付款方式 - private Double rentPrice; // 出租价格 - private Integer sellPrice; // 出售价格 - private Integer householdCount; // 总户数 - private String mobile; // 电话 - private Integer floor; // 所在楼层 - private String floorInfo; // 楼层状况 - private String bayArea; // 开间面积 - private String finishBuildingDate; // 竣工时间 - private String liveDate; // 开业时间 - private Integer divisible; // 是否可分割 0:是;1:不是 - private Integer unifiedManage; // 是否统一管理 0:是;1:不是 - private Integer carSiteCount; // 车位数 - private String carSite; // 车位描述 - private String allArea; // 占地面积 - private String buildArea; // 建筑面积 - private String estateCharge; // 物业费 - private String developer; // 开发商 - private String estateCompany; // 物业公司 - private String metroInfo; // 地铁沿线 - private String metroNames; // 地铁站名 - private String facilities; // 配套设施 - private String propertyInfo; // 物业概况 - private String traffic; // 交通情况 - private String surrounding; // 周边情况 - private String businessStatus; // 经营业态 - private String url; // 来源url + private String estateType; // 鐗╀笟绫诲瀷 + private String estateType2; // 鐗╀笟绫诲瀷 + private String propertyStatus; // 寤虹瓚鐘舵�� + private String rentType; // 绉熻祦绫诲瀷 + private String leaseTerm; // 绉熻祦骞撮檺 + private String paymentPattern; // 浠樻鏂瑰紡 + private Double rentPrice; // 鍑虹浠锋牸 + private Integer sellPrice; // 鍑哄敭浠锋牸 + private Integer householdCount; // 鎬绘埛鏁� + private String mobile; // 鐢佃瘽 + private Integer floor; // 鎵�鍦ㄦゼ灞� + private String floorInfo; // 妤煎眰鐘跺喌 + private String bayArea; // 寮�闂撮潰绉� + private String finishBuildingDate; // 绔e伐鏃堕棿 + private String liveDate; // 寮�涓氭椂闂� + private Integer divisible; // 鏄惁鍙垎鍓� 0锛氭槸锛�1锛氫笉鏄� + private Integer unifiedManage; // 鏄惁缁熶竴绠$悊 0锛氭槸锛�1锛氫笉鏄� + private Integer carSiteCount; // 杞︿綅鏁� + private String carSite; // 杞︿綅鎻忚堪 + private String allArea; // 鍗犲湴闈㈢Н + private String buildArea; // 寤虹瓚闈㈢Н + private String estateCharge; // 鐗╀笟璐� + private String developer; // 寮�鍙戝晢 + private String estateCompany; // 鐗╀笟鍏徃 + private String metroInfo; // 鍦伴搧娌跨嚎 + private String metroNames; // 鍦伴搧绔欏悕 + private String facilities; // 閰嶅璁炬柦 + private String propertyInfo; // 鐗╀笟姒傚喌 + private String traffic; // 浜ら�氭儏鍐� + private String surrounding; // 鍛ㄨ竟鎯呭喌 + private String businessStatus; // 缁忚惀涓氭�� + private String url; // 鏉ユ簮url private Date creationDate; private Date modificationDate; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/cpc/dao/CpcFeeSettingDao.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/cpc/dao/CpcFeeSettingDao.java index 8dc9658b9..05da15894 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/cpc/dao/CpcFeeSettingDao.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/cpc/dao/CpcFeeSettingDao.java @@ -11,7 +11,7 @@ public interface CpcFeeSettingDao extends SqlDao { CpcFeeSetting findBySiteIdCityHouseType(long cpcSiteId, ServerArea city, CpcHouseTypeEnum houseType); /** - * 查找推广的城市集合 + * 鏌ユ壘鎺ㄥ箍鐨勫煄甯傞泦鍚� * * @param cpcUserId * @return @@ -19,19 +19,19 @@ public interface CpcFeeSettingDao extends SqlDao { List findDistinctCityByCpcUserId(long cpcUserId); /** - * 判断公司是否开通了该房屋类型的推广 + * 鍒ゆ柇鍏徃鏄惁寮�閫氫簡璇ユ埧灞嬬被鍨嬬殑鎺ㄥ箍 * * @param cpcUserId * @param city * @param type - * 0:租房;1:二手房 + * 0锛氱鎴匡紱1锛氫簩鎵嬫埧 * @return */ boolean isVaildHouseType(long cpcUserId, ServerArea city, int type); /** - * 根据cpcUserId,城市,房源类型,获取网站配置 + * 鏍规嵁cpcUserId锛屽煄甯傦紝鎴挎簮绫诲瀷锛岃幏鍙栫綉绔欓厤缃� * @param cpcUserId * @param city * @param houseType diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/cpc/dao/CpcRegionPublicityDao.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/cpc/dao/CpcRegionPublicityDao.java index 2cc648752..2f85a8132 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/cpc/dao/CpcRegionPublicityDao.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/cpc/dao/CpcRegionPublicityDao.java @@ -9,79 +9,79 @@ import com.fangjia.dal.sql.cpc.model.CpcRegionPublicity; public interface CpcRegionPublicityDao extends SqlDao { /** - * 新增 + * 鏂板 * * @param companyKeyword - * 公司keyword + * 鍏徃keyword * @param city - * 城市 sh + * 鍩庡競 sh * @param region - * 区域名 + * 鍖哄煙鍚� * @param type - * 类型 0:租房;1:二手房 + * 绫诲瀷 0锛氱鎴匡紱1锛氫簩鎵嬫埧 */ void saveRegion(String companyKeyword, ServerArea city, String region, int type); /** - * 删除 + * 鍒犻櫎 * * @param companyKeyword - * 公司keyword + * 鍏徃keyword * @param city - * 城市 sh + * 鍩庡競 sh * @param region - * 区域名 + * 鍖哄煙鍚� * @param type - * 类型 0:租房;1:二手房 + * 绫诲瀷 0锛氱鎴匡紱1锛氫簩鎵嬫埧 */ void deleteRegion(String companyKeyword, ServerArea city, String region, int type); /** - * 批量删除 + * 鎵归噺鍒犻櫎 * * @param companyKeyword - * 公司keyword + * 鍏徃keyword * @param city - * 城市 sh + * 鍩庡競 sh * @param regions - * 区域名集合 + * 鍖哄煙鍚嶉泦鍚� * @param type - * 类型 0:租房;1:二手房 + * 绫诲瀷 0锛氱鎴匡紱1锛氫簩鎵嬫埧 */ void deleteRegions(String companyKeyword, ServerArea city, Collection regions, int type); /** - * 查询推广的区域名 + * 鏌ヨ鎺ㄥ箍鐨勫尯鍩熷悕 * * @param companyKeyword - * 公司keyword + * 鍏徃keyword * @return */ List findRegionList(String companyKeyword); /** - * 查询 + * 鏌ヨ * * @param companyKeyword - * 公司keyword + * 鍏徃keyword * @param city - * 城市 sh + * 鍩庡競 sh * @param region - * 区域名 + * 鍖哄煙鍚� * @param type - * 类型 0:租房;1:二手房 + * 绫诲瀷 0锛氱鎴匡紱1锛氫簩鎵嬫埧 */ CpcRegionPublicity findRegion(String companyKeyword, ServerArea city, String region, int type); /** - * 查询 + * 鏌ヨ * * @param companyKeyword - * 公司keyword + * 鍏徃keyword * @param city - * 城市 sh + * 鍩庡競 sh * @param type - * 类型 0:租房;1:二手房 + * 绫诲瀷 0锛氱鎴匡紱1锛氫簩鎵嬫埧 */ CpcRegionPublicity findRegion(String companyKeyword, ServerArea city, int type); diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/cpc/dao/CpcSettingsDao.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/cpc/dao/CpcSettingsDao.java index 85189817d..a574ee328 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/cpc/dao/CpcSettingsDao.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/cpc/dao/CpcSettingsDao.java @@ -9,7 +9,7 @@ import com.fangjia.dal.sql.cpc.model.CpcSettings; public interface CpcSettingsDao extends SqlDao { /** - * 查找分类推广设置,category=2 + * 鏌ユ壘鍒嗙被鎺ㄥ箍璁剧疆锛宑ategory=2 * * @param cpcSiteId * @param city @@ -19,7 +19,7 @@ public interface CpcSettingsDao extends SqlDao { CpcSettings findBySiteIdCityHouseType(long cpcSiteId, ServerArea city, CpcHouseTypeEnum houseType); /** - * 查找城市推广设置,category=1 + * 鏌ユ壘鍩庡競鎺ㄥ箍璁剧疆锛宑ategory=1 * * @param cpcUserId * @param city @@ -28,7 +28,7 @@ public interface CpcSettingsDao extends SqlDao { CpcSettings findByCpcUserIdSiteIdAndCity(long cpcUserId, long cpcSiteId, ServerArea city); /** - * 查找推广的城市集合 + * 鏌ユ壘鎺ㄥ箍鐨勫煄甯傞泦鍚� * * @param cpcUserId * @return @@ -36,12 +36,12 @@ public interface CpcSettingsDao extends SqlDao { List findDistinctCityByCpcUserId(long cpcUserId); /** - * 判断公司是否开通了该房屋类型的推广 + * 鍒ゆ柇鍏徃鏄惁寮�閫氫簡璇ユ埧灞嬬被鍨嬬殑鎺ㄥ箍 * * @param cpcUserId * @param city * @param type - * 0:租房;1:二手房 + * 0锛氱鎴匡紱1锛氫簩鎵嬫埧 * @return */ boolean isVaildHouseType(long cpcUserId, ServerArea city, int type); diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/cpc/model/CpcFeeSetting.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/cpc/model/CpcFeeSetting.java index bc99b84d7..f03e3ff16 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/cpc/model/CpcFeeSetting.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/cpc/model/CpcFeeSetting.java @@ -46,8 +46,8 @@ public class CpcFeeSetting implements SqlEntity { private String score; private Double qualityScore; private Integer enabled400; - private Double offset; // 公司偏移得分 - private Double density; // 公司排序密度 + private Double offset; // 鍏徃鍋忕Щ寰楀垎 + private Double density; // 鍏徃鎺掑簭瀵嗗害 @Id @Column(name = "ID") diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/cpc/model/CpcRegionPublicity.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/cpc/model/CpcRegionPublicity.java index 56c990cf6..502a4ccc7 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/cpc/model/CpcRegionPublicity.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/cpc/model/CpcRegionPublicity.java @@ -19,7 +19,7 @@ public class CpcRegionPublicity implements SqlEntity { private String companyKeyword; private String region; private String city; - private int type; // 0:租房;1:二手房 + private int type; // 0:绉熸埧锛�1锛氫簩鎵嬫埧 private Date creationDate; private Date modificationDate; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/cpc/model/CpcUserAccount.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/cpc/model/CpcUserAccount.java index b526e54fd..ceab330f5 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/cpc/model/CpcUserAccount.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/cpc/model/CpcUserAccount.java @@ -19,9 +19,9 @@ public class CpcUserAccount implements SqlEntity { private static final long serialVersionUID = -2122277404406016571L; public static enum AccountTypeEnum { - CASH_ACCOUNT, // 现金账户 - PRESENT_ACCOUNT, // 赠送账户 - TEST_ACCOUNT, // 测试账户 + CASH_ACCOUNT, // 鐜伴噾璐︽埛 + PRESENT_ACCOUNT, // 璧犻�佽处鎴� + TEST_ACCOUNT, // 娴嬭瘯璐︽埛 } private long id; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/cpc/model/CpcUsers.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/cpc/model/CpcUsers.java index d5c768067..5acf446ed 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/cpc/model/CpcUsers.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/cpc/model/CpcUsers.java @@ -49,10 +49,10 @@ public class CpcUsers implements SqlEntity { private String zjtCity; // -end - // 是否区域推广用户 + // 鏄惁鍖哄煙鎺ㄥ箍鐢ㄦ埛 private int isRegion; - // 是否启用白名单 + // 鏄惁鍚敤鐧藉悕鍗� private int isAllowedWL; @Id diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/ApiTestApply.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/ApiTestApply.java index e02460e2c..06672748f 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/ApiTestApply.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/ApiTestApply.java @@ -17,39 +17,39 @@ public class ApiTestApply implements SqlEntity { */ private long id; /** - * 用户ID + * 鐢ㄦ埛ID */ private String userId; /** - * 姓名 + * 濮撳悕 */ private String name; /** - * 公司 + * 鍏徃 */ private String company; /** - * 邮箱 + * 閭 */ private String email; /** - * 行业 + * 琛屼笟 */ private String industry; /** - * 审核进度 + * 瀹℃牳杩涘害 */ private String auditSchedule; /** - * 申请时间 + * 鐢宠鏃堕棿 */ private Date applyTime; /** - * 审核时间 + * 瀹℃牳鏃堕棿 */ private Date auditTime; /** - * 测试字段(多个,逗号隔开) + * 娴嬭瘯瀛楁锛堝涓紝閫楀彿闅斿紑锛� */ private String testFields; 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 216e0d6cb..5ffe68a88 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 @@ -19,25 +19,25 @@ public class ApiUser implements SqlEntity { private String email; private String qq; private String appKey; - private String city;// 全拼 + private String city;// 鍏ㄦ嫾 private String siteName; private String ip; - private int status; //0-正常 1-禁用 + private int status; //0-姝e父 1-绂佺敤 private Date creationDate; private Date modificationDate; private String company; - private int isTest; //0-正式客戶 1-测试用户 2-内部测试用户 + private int isTest; //0-姝e紡瀹㈡埗 1-娴嬭瘯鐢ㄦ埛 2-鍐呴儴娴嬭瘯鐢ㄦ埛 private Date deadTime; - private String contact; //联系人 + private String contact; //鑱旂郴浜� - private String phone; //联系人手机号 + private String phone; //鑱旂郴浜烘墜鏈哄彿 /** - * 账户用途 - * 1:Open APi - * 2:PDS - * 4:房生活 - * 8:AMP + * 璐︽埛鐢ㄩ�� + * 1锛歄pen APi + * 2锛歅DS + * 4锛氭埧鐢熸椿 + * 8锛欰MP */ private Integer purpose; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/ApiUserAccount.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/ApiUserAccount.java index bf5f12ea3..7ea97ec7e 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/ApiUserAccount.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/ApiUserAccount.java @@ -19,34 +19,34 @@ public class ApiUserAccount implements SqlEntity { @Id @Column(name = "id") private long id; - //用户ID + //鐢ㄦ埛ID @Column(name = "user_id") private String userId; - //资金变动情况 + //璧勯噾鍙樺姩鎯呭喌 @Column(name = "amount_change") private BigDecimal change; - //余额 + //浣欓 @Column(name = "amount") private BigDecimal amount; - //创建日期 + //鍒涘缓鏃ユ湡 @Column(name = "create_date") private Date createDate; - //修改日期 + //淇敼鏃ユ湡 @Column(name = "update_date") private Date updateDate; - //方式 + //鏂瑰紡 @Column(name = "change_way") private String changeWay; - //渠道 + //娓犻亾 @Column(name = "channel") private String channel; - //状态 + //鐘舵�� @Column(name = "status") private String status; - //自己生成的订单号 + //鑷繁鐢熸垚鐨勮鍗曞彿 @Column(name = "out_trade_no") private String outTradeNo; - //支付宝返回的订单号 + //鏀粯瀹濊繑鍥炵殑璁㈠崟鍙� @Column(name = "trade_no") private String tradeNo; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/Comments.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/Comments.java index b473d5e08..ebbd63435 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/Comments.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/Comments.java @@ -29,8 +29,8 @@ public class Comments implements SqlEntity { private Date modificationDate; public enum StatusEnum { - INVALID(0), // 删除 - VALID(1);// 正常 + INVALID(0), // 鍒犻櫎 + VALID(1);// 姝e父 final private int value; StatusEnum(int value) { diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/EFang.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/EFang.java index 146056968..c20b75ed4 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/EFang.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/EFang.java @@ -43,8 +43,8 @@ public class EFang implements SqlEntity { private int keeped; public enum StatusEnum { - SELL_OUT(0), // 已售 - SELL(1); // 在售 + SELL_OUT(0), // 宸插敭 + SELL(1); // 鍦ㄥ敭 private final int value; StatusEnum(int value) { diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/EvaluationTask.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/EvaluationTask.java index c6f2a16c1..661871495 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/EvaluationTask.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/EvaluationTask.java @@ -29,9 +29,9 @@ public class EvaluationTask implements SqlEntity { private Integer userRole; private String city; private long evaluationId; - private int status;//任务状态 0:待认领 1:处理中 2:已完成 3.暂不处理(原因:地址查不到) - private String claimName;//任务认领人 - private Date claimDate;//认领时间 + private int status;//浠诲姟鐘舵�� 0:寰呰棰� 1:澶勭悊涓� 2锛氬凡瀹屾垚 3.鏆備笉澶勭悊锛堝師鍥狅細鍦板潃鏌ヤ笉鍒帮級 + private String claimName;//浠诲姟璁ら浜� + private Date claimDate;//璁ら鏃堕棿 private Date creationDate; private Date modificationDate; private String districtName; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/FjtEvaluation.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/FjtEvaluation.java index 90af3ec7e..7d12a0167 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/FjtEvaluation.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/FjtEvaluation.java @@ -53,20 +53,20 @@ public class FjtEvaluation implements SqlEntity{ private Double atticArea; private int flag; - private int facade; //门面开间 - private int traffice;// 公共交通 - private int shape; // 形状 - private int obstacle; // 障碍物 - private int industry; //经营性质 - private int supportDevice; // 配套设备 - private int leftPosition; //距离扶梯位置 - private int shopType;//商铺类型 - private int shopUnique; //商铺唯一性 - private int location; //商铺位置 + private int facade; //闂ㄩ潰寮�闂� + private int traffice;// 鍏叡浜ら�� + private int shape; // 褰㈢姸 + private int obstacle; // 闅滅鐗� + private int industry; //缁忚惀鎬ц川 + private int supportDevice; // 閰嶅璁惧 + private int leftPosition; //璺濈鎵舵浣嶇疆 + private int shopType;//鍟嗛摵绫诲瀷 + private int shopUnique; //鍟嗛摵鍞竴鎬� + private int location; //鍟嗛摵浣嶇疆 - //估价均价 + //浼颁环鍧囦环 private int averagePrice; - //估价总价 + //浼颁环鎬讳环 private int totalPrice; private int myProperty; @@ -75,9 +75,9 @@ public class FjtEvaluation implements SqlEntity{ private Date dateCreated; private Date lastUpdated; - private int peopleEdit;//是否人工修改 - private Date peopleEditDate;//人工修改时间 - private Integer peopleEditPrice;//人工修改价格 + private int peopleEdit;//鏄惁浜哄伐淇敼 + private Date peopleEditDate;//浜哄伐淇敼鏃堕棿 + private Integer peopleEditPrice;//浜哄伐淇敼浠锋牸 private Double lat; private Double lng; @@ -93,21 +93,21 @@ public class FjtEvaluation implements SqlEntity{ private String reportNum; private Double carSiteArea; - private Integer carSitePrice; // 车位价 + private Integer carSitePrice; // 杞︿綅浠� private String source; private String accountChecker; - private String floorDesc; //别墅楼层描述 + private String floorDesc; //鍒妤煎眰鎻忚堪 - private Integer buyYear; //是否满五 - private Integer onlyOne; //是否唯一 - private Double registerPrice; //深圳 登记价 + private Integer buyYear; //鏄惁婊′簲 + private Integer onlyOne; //鏄惁鍞竴 + private Double registerPrice; //娣卞湷 鐧昏浠� - private String finishDateStr;//竣工时间 - private String useType;//房屋用途 - private String certificateAddress; //产证地址 + private String finishDateStr;//绔e伐鏃堕棿 + private String useType;//鎴垮眿鐢ㄩ�� + private String certificateAddress; //浜ц瘉鍦板潃 - private Date downPdfDate;//下载报告时间 - private Integer loan ;//是否续贷 1:是 0:否 + private Date downPdfDate;//涓嬭浇鎶ュ憡鏃堕棿 + private Integer loan ;//鏄惁缁捶 1:鏄� 0:鍚� @GeneratedValue(strategy = GenerationType.AUTO) @Id diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/FjtUsers.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/FjtUsers.java index 754456613..26993f745 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/FjtUsers.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/FjtUsers.java @@ -38,15 +38,15 @@ public class FjtUsers implements SqlEntity { private String payPassword; private Integer evaluationCount; - private String weixinId;//微信号 - private String comeFrom;//来源(微信,房价网) + private String weixinId;//寰俊鍙� + private String comeFrom;//鏉ユ簮锛堝井淇�,鎴夸环缃戯級 /** - * 是否管理员(1是0否) + * 鏄惁绠$悊鍛�(1鏄�0鍚�) */ private Integer manager; /** - * 管理能才查看统计的用户 + * 绠$悊鑳芥墠鏌ョ湅缁熻鐨勭敤鎴� */ private String roleUsers; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/IdMobile.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/IdMobile.java index 2be64cc56..b3518f558 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/IdMobile.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/IdMobile.java @@ -18,33 +18,33 @@ public class IdMobile implements SqlEntity { private long id; - //评估记录id + //璇勪及璁板綍id private String evalId; - //手机号 + //鎵嬫満鍙� private String mobile; private Date creationDate; - //快速 + //蹇�� private Integer isFastApply; - //低息 + //浣庢伅 private Integer isLowApply; - //无抵押 + //鏃犳姷鎶� private Integer isCreditApply; - //测身价 + //娴嬭韩浠� private Integer isOwnPrice; - //版权配置信息编号 + //鐗堟潈閰嶇疆淇℃伅缂栧彿 private String stype; - //渠道名称 + //娓犻亾鍚嶇О private String leads_source; - //页面来源 + //椤甸潰鏉ユ簮 private String source; @Id diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/InquiryPrice.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/InquiryPrice.java index 1d1af4f37..6bc857c90 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/InquiryPrice.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/InquiryPrice.java @@ -37,7 +37,7 @@ public class InquiryPrice implements SqlEntity { private Date lastUpdated; private String finishDate; private String evaluationId; - private String accountChecker;//对账老师 + private String accountChecker;//瀵硅处鑰佸笀 private String houseNum; private String roomNum; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/KeywordsBaidu.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/KeywordsBaidu.java index c9d624f9a..9da78d0c8 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/KeywordsBaidu.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/KeywordsBaidu.java @@ -22,7 +22,7 @@ public class KeywordsBaidu implements SqlEntity { private String relatedScore; private int status; private String keyName; - private int visible;// 关键词过滤标识 0有效 1 无效 + private int visible;// 鍏抽敭璇嶈繃婊ゆ爣璇� 0鏈夋晥 1 鏃犳晥 public KeywordsBaidu() { diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/Payment.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/Payment.java index 7f19ed19c..2c2819c12 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/Payment.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/Payment.java @@ -34,7 +34,7 @@ public class Payment implements SqlEntity { private String phoneNumber; public enum FlatformEnum { - ALIPAY("支付宝"), UNDER_LINE("线下"); + ALIPAY("鏀粯瀹�"), UNDER_LINE("绾夸笅"); private final String value; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/RedaUser.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/RedaUser.java index e7210f9a8..8a01781f9 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/RedaUser.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/RedaUser.java @@ -30,8 +30,8 @@ public class RedaUser implements SqlEntity { } public static enum StatusEnum { - NORMAL, //正常 - DISABLED; //禁用 + NORMAL, //姝e父 + DISABLED; //绂佺敤 } diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/ReportFileAttach.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/ReportFileAttach.java index 34eb3efd6..dbeff0ea5 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/ReportFileAttach.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/ReportFileAttach.java @@ -12,7 +12,7 @@ public class ReportFileAttach implements SqlEntity { private Integer userId; private Integer evaluationId; private String queryId; - private Integer fileClass;//1:询价单 2:产证 3:房屋照片 4:其它附件 5:产调报告或权籍 + private Integer fileClass;//1:璇环鍗� 2:浜ц瘉 3:鎴垮眿鐓х墖 4:鍏跺畠闄勪欢 5:浜ц皟鎶ュ憡鎴栨潈绫� private String fileName; private String fileId; private Date dateCreated; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/TransactionLog.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/TransactionLog.java index f5fbfb294..24bd065bf 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/TransactionLog.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/TransactionLog.java @@ -28,12 +28,12 @@ public class TransactionLog implements SqlEntity { public enum ActionTypeEnum { - HOUSE_RUSH_SUCCESS, // 房源抢购成功 - HOUSE_RUSH_FAIL, // 房源抢购失败 - BACK_OFF_RECHARGE, // 后台充值 - ZHIFUBAO_RECHARGE, // 支付宝充值 - ORDER_CANCEL,//管理员取消订单 - REFUND;//管理员退款 + HOUSE_RUSH_SUCCESS, // 鎴挎簮鎶㈣喘鎴愬姛 + HOUSE_RUSH_FAIL, // 鎴挎簮鎶㈣喘澶辫触 + BACK_OFF_RECHARGE, // 鍚庡彴鍏呭�� + ZHIFUBAO_RECHARGE, // 鏀粯瀹濆厖鍊� + ORDER_CANCEL,//绠$悊鍛樺彇娑堣鍗� + REFUND;//绠$悊鍛橀��娆� } diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/User.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/User.java index d637d7e6c..bff749838 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/User.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/User.java @@ -26,7 +26,7 @@ public class User implements SqlEntity { private Date creationDate; private Date modificationDate; private Date loginDate; - private String userId;//goojia_fangjia中的userId + private String userId;//goojia_fangjia涓殑userId @Column(name = "userId") public void setUserId(String userId) { this.userId = userId; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/UserTrades.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/UserTrades.java index ae9f57e9c..813b10095 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/UserTrades.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/UserTrades.java @@ -32,14 +32,14 @@ public class UserTrades implements SqlEntity { private Date dateCreated; private Date dateFinished; private Date createDate; - private int valid; //0:有效 1:无效 + private int valid; //0锛氭湁鏁� 1锛氭棤鏁� private String evaluationId; private Integer charge; - private String reconcile;//对帐情况 - private String original;//出原件情况 + private String reconcile;//瀵瑰笎鎯呭喌 + private String original;//鍑哄師浠舵儏鍐� private Integer send; private String sendEmail; - private Date closeAccountDate;//结账时间 + private Date closeAccountDate;//缁撹处鏃堕棿 @Id @Column(name = "id") diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/Users.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/Users.java index a3457c0a2..15ddf0b58 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/Users.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/Users.java @@ -21,16 +21,16 @@ public class Users implements SqlEntity { private String realName; private String password; private String email; - private int cardType; // 证件类型 0-无 1-身份证 2-护照 3-港澳台通信证 4-其他 + private int cardType; // 璇佷欢绫诲瀷 0-鏃� 1-韬唤璇� 2-鎶ょ収 3-娓境鍙伴�氫俊璇� 4-鍏朵粬 private String cardNumber; private String telephone; private String mobilephone; private String city; private Date creationDate; private Date modificationDate; - private int status; // 状态 0-正常 1-无效 + private int status; // 鐘舵�� 0-姝e父 1-鏃犳晥 private int wrapped; - private String referrer; // 推荐人 + private String referrer; // 鎺ㄨ崘浜� @GeneratedValue(strategy = GenerationType.AUTO) @Id diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/UsersDetail.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/UsersDetail.java index e145af6ac..bba306295 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/UsersDetail.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/UsersDetail.java @@ -31,10 +31,10 @@ public class UsersDetail implements SqlEntity{ private String company; private Date creationDate; private Date modificationDate; - /*IP 白名单*/ + /*IP 鐧藉悕鍗�*/ private String ipList; - private String saleName;//销售负责人 + private String saleName;//閿�鍞礋璐d汉 @Id @Column(name = "ID") diff --git a/projects/fangjia-dataanalysis/src/main/java/com/fangjia/bkoff/controllers/SeaweedController.java b/projects/fangjia-dataanalysis/src/main/java/com/fangjia/bkoff/controllers/SeaweedController.java index 3aac4334b..c105741ec 100644 --- a/projects/fangjia-dataanalysis/src/main/java/com/fangjia/bkoff/controllers/SeaweedController.java +++ b/projects/fangjia-dataanalysis/src/main/java/com/fangjia/bkoff/controllers/SeaweedController.java @@ -77,11 +77,11 @@ public class SeaweedController { JSONArray ja = new JSONArray(); boolean bool = false; for(ServerArea sa : serverAreas) { - if(sa.getDisplay().equals("郑州")) { + if(sa.getDisplay().equals("閮戝窞")) { bool = true; } - if(sa.getDisplay().equals("全国") && bool) { + if(sa.getDisplay().equals("鍏ㄥ浗") && bool) { continue; } diff --git a/projects/fangjia-dataanalysis/src/main/java/com/fangjia/bkoff/controllers/SpidersLogController.java b/projects/fangjia-dataanalysis/src/main/java/com/fangjia/bkoff/controllers/SpidersLogController.java index cc84c6b8a..4ebfb7799 100644 --- a/projects/fangjia-dataanalysis/src/main/java/com/fangjia/bkoff/controllers/SpidersLogController.java +++ b/projects/fangjia-dataanalysis/src/main/java/com/fangjia/bkoff/controllers/SpidersLogController.java @@ -43,7 +43,7 @@ public class SpidersLogController { public Object ipLogDataAction(SpiderLogModel model) { JsonModel ret = new JsonModel(); Map> spidersIpLogsMap = spidersLogService.findSpidersIpLog(model.getIp(), model.getStartDate(), model.getEndDate(), SpidersLogService.ZoomEnum.DAY); - Highchart highchart = new Highchart("代理IP监控", DateUtil.formatToYYYYMMDD(model.getStartDate()) + "至" + DateUtil.formatToYYYYMMDD(model.getEndDate()), "spline"); + Highchart highchart = new Highchart("浠g悊IP鐩戞帶", DateUtil.formatToYYYYMMDD(model.getStartDate()) + "鑷�" + DateUtil.formatToYYYYMMDD(model.getEndDate()), "spline"); for(String ip : spidersIpLogsMap.keySet()) { List ipLogs = spidersIpLogsMap.get(ip); for(SpidersIpLog ipLog : ipLogs) { diff --git a/projects/fangjia-datastore-driver/src/main/java/com/fangjia/datastore/driver/DSCollection.java b/projects/fangjia-datastore-driver/src/main/java/com/fangjia/datastore/driver/DSCollection.java index 0fe9a196b..1934e62d5 100644 --- a/projects/fangjia-datastore-driver/src/main/java/com/fangjia/datastore/driver/DSCollection.java +++ b/projects/fangjia-datastore-driver/src/main/java/com/fangjia/datastore/driver/DSCollection.java @@ -6,61 +6,61 @@ import com.mongodb.DBObject; public interface DSCollection { /** - * 查询 + * 鏌ヨ * * @return */ DSCursor find(); /** - * 查询 + * 鏌ヨ * * @param query - * 查询条件 + * 鏌ヨ鏉′欢 * @return */ DSCursor find(DBObject query); /** - * 查询 + * 鏌ヨ * * @param query - * 查询条件 + * 鏌ヨ鏉′欢 * @param fields - * 需要返回的字段,例:{title:1, name:1} + * 闇�瑕佽繑鍥炵殑瀛楁锛屼緥锛歿title:1, name:1} * @return */ DSCursor find(DBObject query, DBObject fields); /** - * 查询第一个结果 + * 鏌ヨ绗竴涓粨鏋� * * @return */ DBObject findOne(); /** - * 查询第一个结果 + * 鏌ヨ绗竴涓粨鏋� * * @param query - * 查询条件 + * 鏌ヨ鏉′欢 * @return */ DBObject findOne(DBObject query); /** - * 查询第一个结果 + * 鏌ヨ绗竴涓粨鏋� * * @param query - * 查询条件 + * 鏌ヨ鏉′欢 * @param fields - * 需要返回的字段,例:{title:1, name:1} + * 闇�瑕佽繑鍥炵殑瀛楁锛屼緥锛歿title:1, name:1} * @return */ DBObject findOne(DBObject query, DBObject fields); /** - * 根据id查询 + * 鏍规嵁id鏌ヨ * * @param id * @return @@ -68,103 +68,103 @@ public interface DSCollection { DBObject findById(String id); /** - * 根据id查询 + * 鏍规嵁id鏌ヨ * * @param id * @param fields - * 需要返回的字段,例:{title:1, name:1} + * 闇�瑕佽繑鍥炵殑瀛楁锛屼緥锛歿title:1, name:1} * @return */ DBObject findById(String id, DBObject fields); /** - * 删除 + * 鍒犻櫎 * * @param query - * 删除的条件,为null则删除所有 + * 鍒犻櫎鐨勬潯浠讹紝涓簄ull鍒欏垹闄ゆ墍鏈� */ void remove(DBObject query); /** - * 保存 + * 淇濆瓨 * * @param dbObjects */ void save(DBObject... dbObjects); /** - * 保存 + * 淇濆瓨 * * @param isSafe - * 是否同步保存 + * 鏄惁鍚屾淇濆瓨 * @param dbObjects */ void save(boolean isSafe, DBObject... dbObjects); /** - * 保存 + * 淇濆瓨 * * @param dbObjects */ void save(List dbObjects); /** - * 保存 + * 淇濆瓨 * * @param isSafe - * 是否同步保存 + * 鏄惁鍚屾淇濆瓨 * @param dbObjects */ void save(boolean isSafe, List dbObjects); /** - * 更新(默认异步) + * 鏇存柊(榛樿寮傛) * * @param query - * 更新的条件 + * 鏇存柊鐨勬潯浠� * @param data - * 要更新的数据 + * 瑕佹洿鏂扮殑鏁版嵁 */ void update(DBObject query, DBObject data); /** - * 更新 + * 鏇存柊 * * @param query - * 更新的条件 + * 鏇存柊鐨勬潯浠� * @param data - * 要更新的数据 + * 瑕佹洿鏂扮殑鏁版嵁 * @param isSync - * 是否同步更新 + * 鏄惁鍚屾鏇存柊 */ void update(DBObject query, DBObject data, boolean isSync); /** - * 查询所有结果集数量 + * 鏌ヨ鎵�鏈夌粨鏋滈泦鏁伴噺 * * @return */ int count(); /** - * 查询结果集数据 + * 鏌ヨ缁撴灉闆嗘暟鎹� * * @param query - * 查询条件 + * 鏌ヨ鏉′欢 * @return */ int count(DBObject query); /** - * 重建索引 + * 閲嶅缓绱㈠紩 * * @param query - * 重建的条件 + * 閲嶅缓鐨勬潯浠� */ void reIndex(DBObject query); /** - * facet 查询 + * facet 鏌ヨ * * @param facetQuery * @return diff --git a/projects/fangjia-datastore-driver/src/main/java/com/fangjia/datastore/driver/DSCursor.java b/projects/fangjia-datastore-driver/src/main/java/com/fangjia/datastore/driver/DSCursor.java index b969cad53..2f70f01aa 100644 --- a/projects/fangjia-datastore-driver/src/main/java/com/fangjia/datastore/driver/DSCursor.java +++ b/projects/fangjia-datastore-driver/src/main/java/com/fangjia/datastore/driver/DSCursor.java @@ -18,7 +18,7 @@ public interface DSCursor extends Iterable { DSCursor skip(int skip); /** - * findAll的limit为0,只要facet结果的limit为-1,其他正常 + * findAll鐨刲imit涓�0锛屽彧瑕乫acet缁撴灉鐨刲imit涓�-1锛屽叾浠栨甯� * * @param limit * @return @@ -30,8 +30,8 @@ public interface DSCursor extends Iterable { DSCursor sort(DBObject sort); /** - * 是否为大批量数据遍历, 默认为true,如果设置为false,查询的数据量将会受到限制,超过限制后会有异常抛出
- * bulk查询模式下,设置skip参数可能并不能达到预期的效果 + * 鏄惁涓哄ぇ鎵归噺鏁版嵁閬嶅巻, 榛樿涓簍rue锛屽鏋滆缃负false锛屾煡璇㈢殑鏁版嵁閲忓皢浼氬彈鍒伴檺鍒讹紝瓒呰繃闄愬埗鍚庝細鏈夊紓甯告姏鍑�
+ * bulk鏌ヨ妯″紡涓嬶紝璁剧疆skip鍙傛暟鍙兘骞朵笉鑳借揪鍒伴鏈熺殑鏁堟灉 * * @param bulk * @return diff --git a/projects/fangjia-datastore-driver/src/test/java/com/fangjia/datastore/MongoDbTest.java b/projects/fangjia-datastore-driver/src/test/java/com/fangjia/datastore/MongoDbTest.java index 961a06df8..511b6d318 100644 --- a/projects/fangjia-datastore-driver/src/test/java/com/fangjia/datastore/MongoDbTest.java +++ b/projects/fangjia-datastore-driver/src/test/java/com/fangjia/datastore/MongoDbTest.java @@ -31,14 +31,14 @@ public class MongoDbTest { // DBCollection collection = db.getCollection("house"); // DBObject obj = new BasicDBObject(); // obj.put("city", "sh"); - // obj.put("house_name", "房源标题"); - // obj.put("district_name", "沪亭苑"); - // obj.put("district_address", "沪亭路168弄"); + // obj.put("house_name", "鎴挎簮鏍囬"); + // obj.put("district_name", "娌涵鑻�"); + // obj.put("district_address", "娌涵璺�168寮�"); // obj.put("room", 1); // obj.put("house_area", 93); // collection.save(obj); DSCollection seawater = new DataStore("192.168.0.65", 27777).getCollection("fangjia.seawater"); - Iterator cursor = seawater.find(new BasicDBObject("city","上海").append("district_name","风伟二村").append("cat","sell")).batchSize(30).sort(new BasicDBObject("p_date",-1)).iterator(); + Iterator cursor = seawater.find(new BasicDBObject("city","涓婃捣").append("district_name","椋庝紵浜屾潙").append("cat","sell")).batchSize(30).sort(new BasicDBObject("p_date",-1)).iterator(); Set ids = new HashSet(); while(cursor.hasNext()){ String id = cursor.next().get("_id").toString(); diff --git a/projects/fangjia-datastore2/src/main/java/com/fangjia/datastore/DataStore.java b/projects/fangjia-datastore2/src/main/java/com/fangjia/datastore/DataStore.java index 5906c3b4a..67518fcb6 100644 --- a/projects/fangjia-datastore2/src/main/java/com/fangjia/datastore/DataStore.java +++ b/projects/fangjia-datastore2/src/main/java/com/fangjia/datastore/DataStore.java @@ -22,7 +22,7 @@ public interface DataStore extends Reloadable { Collection getIndexes() throws DataStoreException; /** - * 按查询条件重建索引 + * 鎸夋煡璇㈡潯浠堕噸寤虹储寮� * * @param query * @throws DataStoreException diff --git a/projects/fangjia-datastore2/src/main/java/com/fangjia/datastore/DataStoreImpl.java b/projects/fangjia-datastore2/src/main/java/com/fangjia/datastore/DataStoreImpl.java index 3b2f1a084..ae53db548 100644 --- a/projects/fangjia-datastore2/src/main/java/com/fangjia/datastore/DataStoreImpl.java +++ b/projects/fangjia-datastore2/src/main/java/com/fangjia/datastore/DataStoreImpl.java @@ -117,13 +117,13 @@ public class DataStoreImpl implements DataStore { for(Field field : storeConfig.getFields()) { caseFields.put(field.getName(), 1); } - // 如没有查询条件,则全部重建 + // 濡傛病鏈夋煡璇㈡潯浠讹紝鍒欏叏閮ㄩ噸寤� if (null == query || CollectionUtils.isEmpty(query.keySet())) { if (indexing.compareAndSet(false, true)) { - String currentVersion = Core.VERSION_DATE_FORMAT.format(new Date()); // 操作发起的时间戳 + String currentVersion = Core.VERSION_DATE_FORMAT.format(new Date()); // 鎿嶄綔鍙戣捣鐨勬椂闂存埑 Iterator i = this.getMongoCollection().find(new BasicDBObject(), caseFields).addOption(Bytes.QUERYOPTION_NOTIMEOUT); core.reIndex(null, i); - // 删除重建之前的索引 + // 鍒犻櫎閲嶅缓涔嬪墠鐨勭储寮� query = new BasicBSONObject(); BSONObject versionObj = new BasicBSONObject(); versionObj.put("$lte", currentVersion); @@ -146,7 +146,7 @@ public class DataStoreImpl implements DataStore { private interface Closure { /** - * 返回false则跳出遍历 + * 杩斿洖false鍒欒烦鍑洪亶鍘� * * @param input * @return @@ -157,7 +157,7 @@ public class DataStoreImpl implements DataStore { } /** - * 根据查询条件重建索引 + * 鏍规嵁鏌ヨ鏉′欢閲嶅缓绱㈠紩 * * @param query * @throws DataStoreException @@ -189,8 +189,8 @@ public class DataStoreImpl implements DataStore { } /** - * 根据query遍历。
- * 这个方法只适用于reIndex, update, remove等会重建索引的操作, 不能简单的用来遍历 + * 鏍规嵁query閬嶅巻銆�
+ * 杩欎釜鏂规硶鍙�傜敤浜巖eIndex, update, remove绛変細閲嶅缓绱㈠紩鐨勬搷浣�, 涓嶈兘绠�鍗曠殑鐢ㄦ潵閬嶅巻 * * @param operationName * @param query @@ -202,14 +202,14 @@ public class DataStoreImpl implements DataStore { private void iterateSolrQuery(String operationName, BSONObject query, int batchSize, Closure closure) throws SolrException, DataStoreException { if (null == query.get(SolrSchema.VERTION)) { - String currentVersion = Core.VERSION_DATE_FORMAT.format(new Date()); // 操作发起的时间戳 + String currentVersion = Core.VERSION_DATE_FORMAT.format(new Date()); // 鎿嶄綔鍙戣捣鐨勬椂闂存埑 BSONObject versionObj = new BasicBSONObject(); versionObj.put("$lte", currentVersion); - query.put(SolrSchema.VERTION, versionObj); // 只遍历时间戳之前的数据 + query.put(SolrSchema.VERTION, versionObj); // 鍙亶鍘嗘椂闂存埑涔嬪墠鐨勬暟鎹� } long startTime = System.currentTimeMillis(); - int currentPage = 0; // 当前遍历页面 + int currentPage = 0; // 褰撳墠閬嶅巻椤甸潰 long c = 0; long lastC = c; int round = 0; @@ -218,9 +218,9 @@ public class DataStoreImpl implements DataStore { int lastNumFound = -1; while (true) { response = findInSolr(query, null, null, currentPage * batchSize, batchSize, true, true); - if (currentPage == 0) {// 每轮第一次迭代 + if (currentPage == 0) {// 姣忚疆绗竴娆¤凯浠� if (lastNumFound == -1) { - // 第一轮 + // 绗竴杞� lastNumFound = response.getNumFound(); } else if (response.getNumFound() > 0 && lastNumFound == response.getNumFound()) { long sleep = 20000; @@ -234,7 +234,7 @@ public class DataStoreImpl implements DataStore { } response = findInSolr(query, null, null, 0, 1, true, true); if (response.getNumFound() > 0 && lastNumFound == response.getNumFound()) { - // TODO: 可能需要删除solr中有但mongodb中没有的索引数据 + // TODO: 鍙兘闇�瑕佸垹闄olr涓湁浣唌ongodb涓病鏈夌殑绱㈠紩鏁版嵁 // core.deleteByQuery(query); break; } @@ -247,11 +247,11 @@ public class DataStoreImpl implements DataStore { int returnedSize = response.getNumReturned(); List idList = response.getIdList(); - // 有可能为空 + // 鏈夊彲鑳戒负绌� if (null != idList && idList.size() > 0) { - // 执行重建 + // 鎵ц閲嶅缓 if (!closure.execute(idList)) { - // 返回false则不再遍历 + // 杩斿洖false鍒欎笉鍐嶉亶鍘� break; } } @@ -263,18 +263,18 @@ public class DataStoreImpl implements DataStore { lastC = c; } - // 因为重建后的索引已不在query条件内,所以query条件的整个集合大小随着遍历的往前进行,一直在变动 - // 而分页是顺序向前的,所以一次执行,不能保证全部遍历到,所以要多次执行 + // 鍥犱负閲嶅缓鍚庣殑绱㈠紩宸蹭笉鍦╭uery鏉′欢鍐咃紝鎵�浠uery鏉′欢鐨勬暣涓泦鍚堝ぇ灏忛殢鐫�閬嶅巻鐨勫線鍓嶈繘琛岋紝涓�鐩村湪鍙樺姩 + // 鑰屽垎椤垫槸椤哄簭鍚戝墠鐨勶紝鎵�浠ヤ竴娆℃墽琛岋紝涓嶈兘淇濊瘉鍏ㄩ儴閬嶅巻鍒帮紝鎵�浠ヨ澶氭鎵ц if (currentPage == 0 && returnedSize >= lastNumFound) { - // 第一页数量就小于BATCH_SIZE,则不用往下遍历 + // 绗竴椤垫暟閲忓氨灏忎簬BATCH_SIZE锛屽垯涓嶇敤寰�涓嬮亶鍘� break; } else if (returnedSize == 0 || roundIndexCount >= lastNumFound) { - // 本轮重建数量大于总数量,从头再来过 + // 鏈疆閲嶅缓鏁伴噺澶т簬鎬绘暟閲忥紝浠庡ご鍐嶆潵杩� currentPage = 0; round++; roundIndexCount = 0; } else { - // 当前页数量跟BATCH_SIZE一致,向前翻页 + // 褰撳墠椤垫暟閲忚窡BATCH_SIZE涓�鑷达紝鍚戝墠缈婚〉 currentPage++; } } @@ -519,11 +519,11 @@ public class DataStoreImpl implements DataStore { final DBObject update = new BasicDBObject(); update.putAll(data); - // 更新大字段关联文件 + // 鏇存柊澶у瓧娈靛叧鑱旀枃浠� if (storeConfig.isTextFieldToGridFS()) { fileStore.update(objIdList, update); - // 把要更新的大字段数据,置为null,不需要把数据插入主表 + // 鎶婅鏇存柊鐨勫ぇ瀛楁鏁版嵁锛岀疆涓簄ull锛屼笉闇�瑕佹妸鏁版嵁鎻掑叆涓昏〃 BSONObject realData = (BSONObject) update.get("$set"); if (null != realData) { Set removeField = new HashSet(); @@ -545,7 +545,7 @@ public class DataStoreImpl implements DataStore { } getMongoCollection().update(seletor, update, false, true, WriteConcern.NORMAL); - // 重建索引 + // 閲嶅缓绱㈠紩 core.save(getMongoCollection().find(seletor).addOption(Bytes.QUERYOPTION_NOTIMEOUT)); return true; } @@ -591,7 +591,7 @@ public class DataStoreImpl implements DataStore { } getMongoCollection().remove(seletor, WriteConcern.NORMAL); - // 删除大字段的关联文件 + // 鍒犻櫎澶у瓧娈电殑鍏宠仈鏂囦欢 if (storeConfig.isTextFieldToGridFS()) { fileStore.remove(objIdList); } @@ -618,13 +618,13 @@ public class DataStoreImpl implements DataStore { throw new DataStoreException("invalid value: " + bson.get(field) + " of field '" + field + "'!"); } - // 若是大字段,将内容保存至fileObj后存入fileList + // 鑻ユ槸澶у瓧娈碉紝灏嗗唴瀹逛繚瀛樿嚦fileObj鍚庡瓨鍏ileList if (storeConfig.isBigField(field)) { hasBigField = true; fileObj.put(field, bson.get(field)); - // 主表中不保存该字段内容 + // 涓昏〃涓笉淇濆瓨璇ュ瓧娈靛唴瀹� bson.put(field, null); } } @@ -636,7 +636,7 @@ public class DataStoreImpl implements DataStore { this.getMongoCollection().save(dbObj, WriteConcern.NORMAL); } - // 保存大字段 + // 淇濆瓨澶у瓧娈� if (hasBigField) fileStore.save(fileList, insertList); } else { diff --git a/projects/fangjia-datastore2/src/main/java/com/fangjia/datastore/FileStore.java b/projects/fangjia-datastore2/src/main/java/com/fangjia/datastore/FileStore.java index 684b77519..a087c1083 100644 --- a/projects/fangjia-datastore2/src/main/java/com/fangjia/datastore/FileStore.java +++ b/projects/fangjia-datastore2/src/main/java/com/fangjia/datastore/FileStore.java @@ -16,26 +16,26 @@ public interface FileStore { /** * * @param fileList - * 仅包含大字段的文档列表 + * 浠呭寘鍚ぇ瀛楁鐨勬枃妗e垪琛� * @param dbObjList - * 已经保存到数据库的主对象列表 + * 宸茬粡淇濆瓨鍒版暟鎹簱鐨勪富瀵硅薄鍒楄〃 * @throws IllegalArgumentException - * 大字段数据不支持默认编码时抛出 + * 澶у瓧娈垫暟鎹笉鏀寔榛樿缂栫爜鏃舵姏鍑� */ void save(List fileList, List dbObjList) throws DataStoreException; /** - * 删除指定的大字段内容 + * 鍒犻櫎鎸囧畾鐨勫ぇ瀛楁鍐呭 * * @param objIdList - * 删除的主对象的id列表 + * 鍒犻櫎鐨勪富瀵硅薄鐨刬d鍒楄〃 * @param removeFields - * 需要删除的大字段名集合 + * 闇�瑕佸垹闄ょ殑澶у瓧娈靛悕闆嗗悎 */ public void remove(List objIdList, Set removeFields); /** - * 删除所有大字段内容 + * 鍒犻櫎鎵�鏈夊ぇ瀛楁鍐呭 * * @param objIdList */ @@ -43,22 +43,22 @@ public interface FileStore { /** * @param objIdList - * 待更新的主对象id列表 + * 寰呮洿鏂扮殑涓诲璞d鍒楄〃 * @param data - * 更新文档 + * 鏇存柊鏂囨。 * @throws UnsupportedEncodingException - * 大字段数据不支持默认编码时抛出 + * 澶у瓧娈垫暟鎹笉鏀寔榛樿缂栫爜鏃舵姏鍑� */ public void update(List objIdList, BSONObject data) throws DataStoreException; /** * @param docList - * 查询的结果文档 + * 鏌ヨ鐨勭粨鏋滄枃妗� * @param fields - * 查询字段对象 + * 鏌ヨ瀛楁瀵硅薄 * @return * @throws IOException - * 读取大字段数据异常时、大字段数据不支持默认编码时抛出 + * 璇诲彇澶у瓧娈垫暟鎹紓甯告椂銆佸ぇ瀛楁鏁版嵁涓嶆敮鎸侀粯璁ょ紪鐮佹椂鎶涘嚭 */ public List find(List docList, BSONObject fields) throws DataStoreException; } diff --git a/projects/fangjia-datastore2/src/main/java/com/fangjia/datastore/FileStoreImpl.java b/projects/fangjia-datastore2/src/main/java/com/fangjia/datastore/FileStoreImpl.java index 80066351b..7cfdd403d 100644 --- a/projects/fangjia-datastore2/src/main/java/com/fangjia/datastore/FileStoreImpl.java +++ b/projects/fangjia-datastore2/src/main/java/com/fangjia/datastore/FileStoreImpl.java @@ -34,7 +34,7 @@ public class FileStoreImpl implements FileStore { public FileStoreImpl(GridFS gridFS, Collection fields) { this.gridFS = gridFS; - // 把大字段的字段名放入set + // 鎶婂ぇ瀛楁鐨勫瓧娈靛悕鏀惧叆set bigFieldSet = new HashMap(); for (Field field : fields) { if (field.isBigField()) { @@ -49,7 +49,7 @@ public class FileStoreImpl implements FileStore { Iterator dbObjIt = dbObjList.iterator(); for (Iterator fileIt = fileList.iterator(); fileIt.hasNext();) { - // 取得已保存主对象的id + // 鍙栧緱宸蹭繚瀛樹富瀵硅薄鐨刬d String id = ((ObjectId) dbObjIt.next().get("_id")).toString(); BSONObject file = fileIt.next(); @@ -95,11 +95,11 @@ public class FileStoreImpl implements FileStore { } public void remove(List objIdList, Set removeFields) { - // 删除表的所有大字段 + // 鍒犻櫎琛ㄧ殑鎵�鏈夊ぇ瀛楁 if (null == removeFields) removeFields = bigFieldSet.keySet(); - // 若到删除的字段中没有大字段,直接返回 + // 鑻ュ埌鍒犻櫎鐨勫瓧娈典腑娌℃湁澶у瓧娈碉紝鐩存帴杩斿洖 if (removeFields.size() == 0) return; @@ -108,7 +108,7 @@ public class FileStoreImpl implements FileStore { idList.add(objId); } - // 删除大字段关联的GridFS + // 鍒犻櫎澶у瓧娈靛叧鑱旂殑GridFS DBObject fileSeletor = new BasicDBObject(); fileSeletor.put("filename", new BasicDBObject("$in", idList)); fileSeletor.put("contentType", new BasicDBObject("$in", removeFields)); @@ -116,10 +116,10 @@ public class FileStoreImpl implements FileStore { } public void update(List objIdList, BSONObject data) throws DataStoreException { - // 待删除的字段 + // 寰呭垹闄ょ殑瀛楁 BSONObject unset = (BSONObject) data.get("$unset"); if (null != unset) { - // 待删除的大字段set + // 寰呭垹闄ょ殑澶у瓧娈祍et Set removeSet = new HashSet(); for (String field : unset.keySet()) { if (bigFieldSet.containsKey(field)) @@ -130,7 +130,7 @@ public class FileStoreImpl implements FileStore { remove(objIdList, removeSet); } - // 更新数据 + // 鏇存柊鏁版嵁 BSONObject set = (BSONObject) data.get("$set"); if (null == set) return; @@ -142,14 +142,14 @@ public class FileStoreImpl implements FileStore { } } - // 更新数据中没有大字段 + // 鏇存柊鏁版嵁涓病鏈夊ぇ瀛楁 if (fileMap.size() == 0) return; - // 删除大字段关联的GridFS + // 鍒犻櫎澶у瓧娈靛叧鑱旂殑GridFS remove(objIdList, fileMap.keySet()); - // 将新的内容存入GridFS + // 灏嗘柊鐨勫唴瀹瑰瓨鍏ridFS for (String objId : objIdList) { String id = objId; for (String fieldName : fileMap.keySet()) { @@ -184,7 +184,7 @@ public class FileStoreImpl implements FileStore { } public List find(List docList, BSONObject fields) throws DataStoreException { - // 判断查询的字段中有没有大字段 + // 鍒ゆ柇鏌ヨ鐨勫瓧娈典腑鏈夋病鏈夊ぇ瀛楁 Set queryBigField = new HashSet(); if (null == fields) { queryBigField = bigFieldSet.keySet(); @@ -196,7 +196,7 @@ public class FileStoreImpl implements FileStore { } } - // 没有大字段,则返回原结果文档 + // 娌℃湁澶у瓧娈碉紝鍒欒繑鍥炲師缁撴灉鏂囨。 if (queryBigField.size() == 0) return docList; @@ -217,9 +217,9 @@ public class FileStoreImpl implements FileStore { List fileList = gridFS.find(fileSeletor); for (GridFSDBFile file : fileList) { - // 对应主记录id + // 瀵瑰簲涓昏褰昳d String id = file.getFilename(); - // 对应主记录大字段名 + // 瀵瑰簲涓昏褰曞ぇ瀛楁鍚� String fieldName = file.getContentType(); DBObject obj = docMap.get(id); diff --git a/projects/fangjia-datastore2/src/main/java/com/fangjia/datastore/config/Field.java b/projects/fangjia-datastore2/src/main/java/com/fangjia/datastore/config/Field.java index 00c58cb2a..a5ae81216 100644 --- a/projects/fangjia-datastore2/src/main/java/com/fangjia/datastore/config/Field.java +++ b/projects/fangjia-datastore2/src/main/java/com/fangjia/datastore/config/Field.java @@ -53,10 +53,10 @@ public class Field { } /** - * 验证一个值是否匹配其对应的类型 + * 楠岃瘉涓�涓�兼槸鍚﹀尮閰嶅叾瀵瑰簲鐨勭被鍨� * * @param value - * @return 匹配则返回true,不匹配返回false + * @return 鍖归厤鍒欒繑鍥瀟rue锛屼笉鍖归厤杩斿洖false */ public boolean validate(Object value) { if (this.required && value == null) { diff --git a/projects/fangjia-datastore2/src/main/java/com/fangjia/datastore/handler/MessageHandler.java b/projects/fangjia-datastore2/src/main/java/com/fangjia/datastore/handler/MessageHandler.java index c9194aa1b..05053b28c 100644 --- a/projects/fangjia-datastore2/src/main/java/com/fangjia/datastore/handler/MessageHandler.java +++ b/projects/fangjia-datastore2/src/main/java/com/fangjia/datastore/handler/MessageHandler.java @@ -39,7 +39,7 @@ public abstract class MessageHandler { } /** - * 处理特定的消息 + * 澶勭悊鐗瑰畾鐨勬秷鎭� * * @param message */ diff --git a/projects/fangjia-datastore2/src/main/java/com/fangjia/datastore/handler/QueryMessageHandler.java b/projects/fangjia-datastore2/src/main/java/com/fangjia/datastore/handler/QueryMessageHandler.java index a29ee0fcd..49da7844e 100644 --- a/projects/fangjia-datastore2/src/main/java/com/fangjia/datastore/handler/QueryMessageHandler.java +++ b/projects/fangjia-datastore2/src/main/java/com/fangjia/datastore/handler/QueryMessageHandler.java @@ -269,11 +269,11 @@ public class QueryMessageHandler extends MessageHandler { /** *

- * 不带参数重建:db.foo.reIndex() 或 db.foo.runCommand('reIndex') + * 涓嶅甫鍙傛暟閲嶅缓锛歞b.foo.reIndex() 鎴� db.foo.runCommand('reIndex') *

* *

- * 带参数重建:db.foo.runCommand('reIndex',{query:{cat:'sell',city:'上海'}}) + * 甯﹀弬鏁伴噸寤猴細db.foo.runCommand('reIndex',{query:{cat:'sell',city:'涓婃捣'}}) *

* * @param message @@ -285,7 +285,7 @@ public class QueryMessageHandler extends MessageHandler { BSONObject query = message.getQuery(); String collectionName = (String) query.get("reIndex"); DataStore dataStore = this.dataStoreContext.getDataStore(dbName + "." + collectionName); - // 新增查询条件 add by yukai 2011/07/14 + // 鏂板鏌ヨ鏉′欢 add by yukai 2011/07/14 BSONObject doc = new BasicBSONObject(); Object realQuery = query.get("query"); if (null == realQuery) diff --git a/projects/fangjia-datastore2/src/main/java/com/fangjia/datastore/solr/Core.java b/projects/fangjia-datastore2/src/main/java/com/fangjia/datastore/solr/Core.java index 37fa78ea4..01804a74b 100644 --- a/projects/fangjia-datastore2/src/main/java/com/fangjia/datastore/solr/Core.java +++ b/projects/fangjia-datastore2/src/main/java/com/fangjia/datastore/solr/Core.java @@ -12,7 +12,7 @@ import com.fangjia.datastore.QueryResponse; import com.fangjia.datastore.config.Reloadable; /** - * 一个Core对应一个solr索引 + * 涓�涓狢ore瀵瑰簲涓�涓猻olr绱㈠紩 * * @author velna * @@ -23,14 +23,14 @@ public interface Core extends Reloadable { public final static FastDateFormat VERSION_DATE_FORMAT = FastDateFormat.getInstance("yyMMddHHmmssSSS"); /** - * 得到索引名称 + * 寰楀埌绱㈠紩鍚嶇О * * @return */ public String getName(); /** - * 得到所有索引字段 + * 寰楀埌鎵�鏈夌储寮曞瓧娈� * * @return * @throws SolrException @@ -38,53 +38,53 @@ public interface Core extends Reloadable { Collection getIndexes() throws SolrException; /** - * 添加索引字段,必要的话重建索引 + * 娣诲姞绱㈠紩瀛楁锛屽繀瑕佺殑璇濋噸寤虹储寮� * * @param indexes - * 添加的索引字段列表 + * 娣诲姞鐨勭储寮曞瓧娈靛垪琛� * @param iterator - * 用于遍历数据 + * 鐢ㄤ簬閬嶅巻鏁版嵁 * @throws SolrException */ void ensureIndex(Collection indexes, Iterator iterator) throws SolrException; /** - * 添加索引字段,必要的话重建索引 + * 娣诲姞绱㈠紩瀛楁锛屽繀瑕佺殑璇濋噸寤虹储寮� * * @param index - * 添加的索引字段列表 + * 娣诲姞鐨勭储寮曞瓧娈靛垪琛� * @param iterator - * 用于遍历数据 + * 鐢ㄤ簬閬嶅巻鏁版嵁 * @throws SolrException */ void ensureIndex(Index index, Iterator iterator) throws SolrException; /** - * 重建索引 + * 閲嶅缓绱㈠紩 * * @param objIdList - * 待重建的ObjIdList,全部重建时为null + * 寰呴噸寤虹殑ObjIdList锛屽叏閮ㄩ噸寤烘椂涓簄ull * @param iterator - * 用于遍历数据 + * 鐢ㄤ簬閬嶅巻鏁版嵁 */ void reIndex(List objIdList, Iterator iterator) throws SolrException; /** - * 保存索引文档 + * 淇濆瓨绱㈠紩鏂囨。 * * @param doc * @throws SolrException */ // void save(BSONObject doc) throws SolrException; /** - * 保存多个索引文档 + * 淇濆瓨澶氫釜绱㈠紩鏂囨。 * * @param docList * @throws SolrException */ // void save(List docList) throws SolrException; /** - * 保存多个索引文档 + * 淇濆瓨澶氫釜绱㈠紩鏂囨。 * * @param iterator * @throws SolrException @@ -92,21 +92,21 @@ public interface Core extends Reloadable { void save(Iterator iterator) throws SolrException; /** - * 根据ID删除索引文档 + * 鏍规嵁ID鍒犻櫎绱㈠紩鏂囨。 * * @param id * @throws SolrException */ // void deleteById(String id) throws SolrException; /** - * 根据ID列表删除索引文档 + * 鏍规嵁ID鍒楄〃鍒犻櫎绱㈠紩鏂囨。 * * @param ids * @throws SolrException */ // void deleteById(List ids) throws SolrException; /** - * 根据查询删除索引文档 + * 鏍规嵁鏌ヨ鍒犻櫎绱㈠紩鏂囨。 * * @param query * @throws SolrException @@ -114,22 +114,22 @@ public interface Core extends Reloadable { void deleteByQuery(BSONObject query) throws SolrException; /** - * 查询索引 + * 鏌ヨ绱㈠紩 * * @param query - * 查询条件 + * 鏌ヨ鏉′欢 * @param sort - * 排序条件 + * 鎺掑簭鏉′欢 * @param facet - * facet查询条件 + * facet鏌ヨ鏉′欢 * @param skip - * 从第skip条开始返回结果 + * 浠庣skip鏉″紑濮嬭繑鍥炵粨鏋� * @param limit - * 返回limit条结果 + * 杩斿洖limit鏉$粨鏋� * @param fromMaster - * 是否从主索引中读取数据 + * 鏄惁浠庝富绱㈠紩涓鍙栨暟鎹� * @param bulk - * 是否使用bulk查询 + * 鏄惁浣跨敤bulk鏌ヨ * @return * @throws SolrException */ diff --git a/projects/fangjia-datastore2/src/main/java/com/fangjia/datastore/solr/SolrQueryBuilder.java b/projects/fangjia-datastore2/src/main/java/com/fangjia/datastore/solr/SolrQueryBuilder.java index 48242f8e4..10cb5044e 100644 --- a/projects/fangjia-datastore2/src/main/java/com/fangjia/datastore/solr/SolrQueryBuilder.java +++ b/projects/fangjia-datastore2/src/main/java/com/fangjia/datastore/solr/SolrQueryBuilder.java @@ -22,7 +22,7 @@ public class SolrQueryBuilder { public final static FastDateFormat DATE_FORMAT = FastDateFormat.getInstance("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", TimeZone .getTimeZone("UTC")); /** - * 约定:以$$开头的字符串不需要特殊字符转义 + * 绾﹀畾锛氫互$$寮�澶寸殑瀛楃涓蹭笉闇�瑕佺壒娈婂瓧绗﹁浆涔� */ public final static String NO_ESCAPSE = "$$"; @@ -150,9 +150,9 @@ public class SolrQueryBuilder { } /** - * 获取真实value
- * 如果是非string的value,返回转义后的原值
- * 如果是string型,如果以$$开头,则截取$$后面的字符且不需要转义 + * 鑾峰彇鐪熷疄value
+ * 濡傛灉鏄潪string鐨剉alue锛岃繑鍥炶浆涔夊悗鐨勫師鍊�
+ * 濡傛灉鏄痵tring鍨嬶紝濡傛灉浠�$$寮�澶达紝鍒欐埅鍙�$$鍚庨潰鐨勫瓧绗︿笖涓嶉渶瑕佽浆涔� * * @param value * @return diff --git a/projects/fangjia-datastore2/src/main/java/com/fangjia/datastore/solr/SolrServerImpl.java b/projects/fangjia-datastore2/src/main/java/com/fangjia/datastore/solr/SolrServerImpl.java index a84106a68..4a009655e 100644 --- a/projects/fangjia-datastore2/src/main/java/com/fangjia/datastore/solr/SolrServerImpl.java +++ b/projects/fangjia-datastore2/src/main/java/com/fangjia/datastore/solr/SolrServerImpl.java @@ -277,7 +277,7 @@ public class SolrServerImpl implements SolrServer { } private void checkFilter() { - // 5分钟一次 + // 5鍒嗛挓涓�娆� if (System.currentTimeMillis() - lastFilterTime < 300000) { return; } diff --git a/projects/fangjia-knowbase/src/main/java/com/fangjia/knowbase/servlet/DeveloperServlet.java b/projects/fangjia-knowbase/src/main/java/com/fangjia/knowbase/servlet/DeveloperServlet.java index d5c0d367b..097972de0 100644 --- a/projects/fangjia-knowbase/src/main/java/com/fangjia/knowbase/servlet/DeveloperServlet.java +++ b/projects/fangjia-knowbase/src/main/java/com/fangjia/knowbase/servlet/DeveloperServlet.java @@ -25,21 +25,21 @@ public class DeveloperServlet extends BaseServlet { DBCollection developerDb; private ObjectMapper objectMapper = new ObjectMapper(); - String[] prefix_excludes={"市政"}; + String[] prefix_excludes={"甯傛斂"}; String[] suffix_words={ - "股份有限公司" - , "股份有限责任公司" - , "股份公司" - , "集团有限责任公司" - , "集团有限公司" - , "集团总公司" - , "集团公司" - , "集团" - , "有限责任公司" - , "有限公司" - , "总公司" - , "公司"}; + "鑲′唤鏈夐檺鍏徃" + , "鑲′唤鏈夐檺璐d换鍏徃" + , "鑲′唤鍏徃" + , "闆嗗洟鏈夐檺璐d换鍏徃" + , "闆嗗洟鏈夐檺鍏徃" + , "闆嗗洟鎬诲叕鍙�" + , "闆嗗洟鍏徃" + , "闆嗗洟" + , "鏈夐檺璐d换鍏徃" + , "鏈夐檺鍏徃" + , "鎬诲叕鍙�" + , "鍏徃"}; public DeveloperServlet(){ try { @@ -109,11 +109,11 @@ public class DeveloperServlet extends BaseServlet { } String procDeveloperSimpleName(String origi_developer, String city){ - Pattern pa=Pattern.compile("^"+city+"市?"); + Pattern pa=Pattern.compile("^"+city+"甯�?"); String developer=origi_developer; if(developer==null || developer.length()==0)return null; - developer=developer.replaceAll("\\(.*\\)", "").replaceAll("(.*)", ""); - developer=developer.replaceAll("[()\\(\\)\\s\\-\\.]+", ""); + developer=developer.replaceAll("\\(.*\\)", "").replaceAll("锛�.*锛�", ""); + developer=developer.replaceAll("[锛堬級\\(\\)\\s\\-\\.]+", ""); Matcher ma=pa.matcher(developer); if(ma.find()){ boolean trimed=false; diff --git a/projects/fangjia-knowbase/src/main/java/com/fangjia/knowbase/servlet/MatchServlet.java b/projects/fangjia-knowbase/src/main/java/com/fangjia/knowbase/servlet/MatchServlet.java index 17dc77732..4f11163b8 100644 --- a/projects/fangjia-knowbase/src/main/java/com/fangjia/knowbase/servlet/MatchServlet.java +++ b/projects/fangjia-knowbase/src/main/java/com/fangjia/knowbase/servlet/MatchServlet.java @@ -19,7 +19,7 @@ import org.apache.commons.lang.StringUtils; import org.codehaus.jackson.map.ObjectMapper; /** - * 区域/小区名匹配服务,支持批量处理 + * 鍖哄煙/灏忓尯鍚嶅尮閰嶆湇鍔★紝鏀寔鎵归噺澶勭悊 * * @author yukai * @@ -31,9 +31,9 @@ public class MatchServlet extends ParseServlet { @Override protected void process(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { -// String rs = StringUtils.trimToEmpty(req.getParameter("rs")); // 待匹配的区域关键字 -// String ds = StringUtils.trimToEmpty(req.getParameter("ds")); // 待匹配的小区关键字 -// String city = req.getParameter("c"); // 指定的城市 +// String rs = StringUtils.trimToEmpty(req.getParameter("rs")); // 寰呭尮閰嶇殑鍖哄煙鍏抽敭瀛� +// String ds = StringUtils.trimToEmpty(req.getParameter("ds")); // 寰呭尮閰嶇殑灏忓尯鍏抽敭瀛� +// String city = req.getParameter("c"); // 鎸囧畾鐨勫煄甯� // // Map parseRet = matching(ds, rs, city); // @@ -45,42 +45,42 @@ public class MatchServlet extends ParseServlet { } /** - * 匹配 + * 鍖归厤 * * @param ds - * 小区关键字 + * 灏忓尯鍏抽敭瀛� * @param rs - * 区域关键字 + * 鍖哄煙鍏抽敭瀛� * @param city - * 要匹配的城市 + * 瑕佸尮閰嶇殑鍩庡競 * @return */ @SuppressWarnings("unchecked") private Map matching(String ds, String rs, String city) { - // 由process处理后,参数必定是非null的string + // 鐢眕rocess澶勭悊鍚庯紝鍙傛暟蹇呭畾鏄潪null鐨剆tring if ("".equals(ds) && "".equals(rs)) { return Collections.emptyMap(); } - // 知识库匹配 + // 鐭ヨ瘑搴撳尮閰� Map parseRet = server.parse(ds + rs, new String[] { KEY_DISTRICT, KEY_SHOP, KEY_OFFICE, KEY_REGION }, false, null); - // 没有匹配到结果 + // 娌℃湁鍖归厤鍒扮粨鏋� if (MapUtils.isEmpty(parseRet)) { return Collections.emptyMap(); } - // 最后返回结果,原始值:匹配到的列表 + // 鏈�鍚庤繑鍥炵粨鏋滐紝鍘熷鍊硷細鍖归厤鍒扮殑鍒楄〃 Map resultMap = new HashMap(2); - // 匹配到的全部列表 + // 鍖归厤鍒扮殑鍏ㄩ儴鍒楄〃 List> districtParseList = (List>) parseRet.get(KEY_DISTRICT); List> shopParseList = (List>) parseRet.get(KEY_SHOP); List> officeParseList = (List>) parseRet.get(KEY_OFFICE); List> regionParseList = (List>) parseRet.get(KEY_REGION); - // 处理小区的匹配结果 + // 澶勭悊灏忓尯鐨勫尮閰嶇粨鏋� if (CollectionUtils.isNotEmpty(districtParseList)) { Map>> ret = parseData(ds, KEY_DISTRICT, districtParseList, city); if (MapUtils.isNotEmpty(ret)) { @@ -88,7 +88,7 @@ public class MatchServlet extends ParseServlet { } } - // 处理商铺的匹配结果 + // 澶勭悊鍟嗛摵鐨勫尮閰嶇粨鏋� if (CollectionUtils.isNotEmpty(shopParseList)) { Map>> ret = parseData(ds, KEY_SHOP, shopParseList, city); if (MapUtils.isNotEmpty(ret)) { @@ -96,7 +96,7 @@ public class MatchServlet extends ParseServlet { } } - // 处理写字楼的匹配结果 + // 澶勭悊鍐欏瓧妤肩殑鍖归厤缁撴灉 if (CollectionUtils.isNotEmpty(officeParseList)) { Map>> ret = parseData(ds, KEY_OFFICE, officeParseList, city); if (MapUtils.isNotEmpty(ret)) { @@ -104,7 +104,7 @@ public class MatchServlet extends ParseServlet { } } - // 处理区域的匹配结果 + // 澶勭悊鍖哄煙鐨勫尮閰嶇粨鏋� if (CollectionUtils.isNotEmpty(regionParseList)) { Map>> ret = parseData(rs, KEY_REGION, regionParseList, city); if (MapUtils.isNotEmpty(ret)) { @@ -116,24 +116,24 @@ public class MatchServlet extends ParseServlet { } /** - * 解析匹配结果 + * 瑙f瀽鍖归厤缁撴灉 * * @param keywords - * 关键字 + * 鍏抽敭瀛� * @param type - * 类型 + * 绫诲瀷 * @param parseList - * 知识库匹配结果集 + * 鐭ヨ瘑搴撳尮閰嶇粨鏋滈泦 * @param city - * 指定的城市 + * 鎸囧畾鐨勫煄甯� * @return */ @SuppressWarnings("unchecked") private Map>> parseData(String keywords, String type, List> parseList, String city) { - String[] keywordArr = keywords.split("\\|"); // 关键字数组 - Map>> parseRet = new HashMap>>(keywordArr.length); // 待返回的结果集 - Set keySet = new HashSet(parseList.size()); // 已处理过的key,用于判断相同区域或小区 + String[] keywordArr = keywords.split("\\|"); // 鍏抽敭瀛楁暟缁� + Map>> parseRet = new HashMap>>(keywordArr.length); // 寰呰繑鍥炵殑缁撴灉闆� + Set keySet = new HashSet(parseList.size()); // 宸插鐞嗚繃鐨刱ey锛岀敤浜庡垽鏂浉鍚屽尯鍩熸垨灏忓尯 for (int n = 0; n < keywordArr.length; n++) { String key = keywordArr[n]; @@ -169,7 +169,7 @@ public class MatchServlet extends ParseServlet { for (String key : parseRet.keySet()) { List> unitList = parseRet.get(key); - // 把关键字匹配到的结果集进行排序。如果关键字等于匹配值value,排序靠前;否则按matchvalue长度排序。 + // 鎶婂叧閿瓧鍖归厤鍒扮殑缁撴灉闆嗚繘琛屾帓搴忋�傚鏋滃叧閿瓧绛変簬鍖归厤鍊紇alue锛屾帓搴忛潬鍓嶏紱鍚﹀垯鎸塵atchvalue闀垮害鎺掑簭銆� sortByMatchValue(key, unitList); parseRet.put(key, unitList); } @@ -178,13 +178,13 @@ public class MatchServlet extends ParseServlet { } /** - * 关键字是否在别名列表内 + * 鍏抽敭瀛楁槸鍚﹀湪鍒悕鍒楄〃鍐� * * @param key - * 关键字 + * 鍏抽敭瀛� * @param patternList - * 小区别名列表 - * @return null:关键字不是别名;String:关键字中的match_value + * 灏忓尯鍒悕鍒楄〃 + * @return null:鍏抽敭瀛椾笉鏄埆鍚嶏紱String:鍏抽敭瀛椾腑鐨刴atch_value */ private String getMatchValue(String key, List patternList) { for (int i = 0, k = patternList.size(); i < k; i++) { diff --git a/projects/fangjia-knowbase/src/main/java/com/fangjia/knowbase/servlet/ParseKeywordServlet.java b/projects/fangjia-knowbase/src/main/java/com/fangjia/knowbase/servlet/ParseKeywordServlet.java index 9c6454188..8c495d070 100644 --- a/projects/fangjia-knowbase/src/main/java/com/fangjia/knowbase/servlet/ParseKeywordServlet.java +++ b/projects/fangjia-knowbase/src/main/java/com/fangjia/knowbase/servlet/ParseKeywordServlet.java @@ -12,7 +12,7 @@ import org.apache.commons.lang.StringUtils; import org.codehaus.jackson.map.ObjectMapper; /** - * 解析首页“全部”的关键字对应的知识库的类别 + * 瑙f瀽棣栭〉鈥滃叏閮ㄢ�濈殑鍏抽敭瀛楀搴旂殑鐭ヨ瘑搴撶殑绫诲埆 * * @author liupei */ diff --git a/projects/fangjia-knowbase/src/main/java/com/fangjia/knowbase/servlet/ParseSchoolServlet.java b/projects/fangjia-knowbase/src/main/java/com/fangjia/knowbase/servlet/ParseSchoolServlet.java index a21070af6..922434fc5 100644 --- a/projects/fangjia-knowbase/src/main/java/com/fangjia/knowbase/servlet/ParseSchoolServlet.java +++ b/projects/fangjia-knowbase/src/main/java/com/fangjia/knowbase/servlet/ParseSchoolServlet.java @@ -21,7 +21,7 @@ import com.mongodb.DBObject; import com.poseidon.knowbase.KnowbaseService; /** - * 从知识库里取出学校 + * 浠庣煡璇嗗簱閲屽彇鍑哄鏍� * */ public class ParseSchoolServlet extends BaseServlet { @@ -37,7 +37,7 @@ public class ParseSchoolServlet extends BaseServlet { // final String city = req.getParameter("city"); // if (StringUtils.isNotBlank(match) && "true".equals(match)) { // resp.setContentType("text/json;charset=UTF-8"); -// resp.getWriter().write("{\"info\":\"学校匹配没实现\"}"); +// resp.getWriter().write("{\"info\":\"瀛︽牎鍖归厤娌″疄鐜癨"}"); // } else { // List dBObjectList = KnowbaseService.getInstance().getKnowBasesByCat("school"); // List> schoolInfo = CollectionUtils.collect(dBObjectList, diff --git a/projects/fangjia-knowbase/src/main/java/com/fangjia/knowbase/servlet/ParseServlet.java b/projects/fangjia-knowbase/src/main/java/com/fangjia/knowbase/servlet/ParseServlet.java index e8070fe41..de1b12bea 100644 --- a/projects/fangjia-knowbase/src/main/java/com/fangjia/knowbase/servlet/ParseServlet.java +++ b/projects/fangjia-knowbase/src/main/java/com/fangjia/knowbase/servlet/ParseServlet.java @@ -45,13 +45,13 @@ public abstract class ParseServlet extends BaseServlet { private static final Set NUMBERIC_KEY_SET = new HashSet(6); /** - * 关键字解析 + * 鍏抽敭瀛楄В鏋� * * @param keyword * @param types - * 需要解析的类型 + * 闇�瑕佽В鏋愮殑绫诲瀷 * @param isAllCat - * 是否需要全部信息,用于数值字段 + * 鏄惁闇�瑕佸叏閮ㄤ俊鎭紝鐢ㄤ簬鏁板�煎瓧娈� * @return */ @SuppressWarnings("unchecked") @@ -60,7 +60,7 @@ public abstract class ParseServlet extends BaseServlet { return Collections.emptyMap(); } - // 知识库匹配时,有些正则对空格敏感,此处去掉所有空格 + // 鐭ヨ瘑搴撳尮閰嶆椂锛屾湁浜涙鍒欏绌烘牸鏁忔劅锛屾澶勫幓鎺夋墍鏈夌┖鏍� Map parseRet = server.parse(ToolUtils.removeSpace(keyword), types, false, null); if (MapUtils.isEmpty(parseRet)) { return Collections.emptyMap(); @@ -87,7 +87,7 @@ public abstract class ParseServlet extends BaseServlet { } /** - * 判断是否是数值型字段 + * 鍒ゆ柇鏄惁鏄暟鍊煎瀷瀛楁 * * @param key * @return @@ -106,7 +106,7 @@ public abstract class ParseServlet extends BaseServlet { } /** - * 从解析的列表里获取有用的数据,并进行排序和相同数据的过滤 + * 浠庤В鏋愮殑鍒楄〃閲岃幏鍙栨湁鐢ㄧ殑鏁版嵁锛屽苟杩涜鎺掑簭鍜岀浉鍚屾暟鎹殑杩囨护 * * @param parseList * @param type @@ -118,7 +118,7 @@ public abstract class ParseServlet extends BaseServlet { } List> ret = new ArrayList>(parseList.size()); - Set keySet = new HashSet(parseList.size()); // 已处理过的key,用于判断相同区域或小区 + Set keySet = new HashSet(parseList.size()); // 宸插鐞嗚繃鐨刱ey锛岀敤浜庡垽鏂浉鍚屽尯鍩熸垨灏忓尯 for (int i = 0, k = parseList.size(); i < k; i++) { Map unitRet = parseList.get(i); @@ -135,14 +135,14 @@ public abstract class ParseServlet extends BaseServlet { } /** - * 从知识库返回的数据中拾取需要返回的数据 + * 浠庣煡璇嗗簱杩斿洖鐨勬暟鎹腑鎷惧彇闇�瑕佽繑鍥炵殑鏁版嵁 * * @param unitRet - * 知识库数据 + * 鐭ヨ瘑搴撴暟鎹� * @param matchValue - * 匹配值 + * 鍖归厤鍊� * @param type - * 类型(小区/区域) + * 绫诲瀷(灏忓尯/鍖哄煙) * @return */ @SuppressWarnings("unchecked") @@ -174,7 +174,7 @@ public abstract class ParseServlet extends BaseServlet { } /** - * 根据matchValue排序结果集 + * 鏍规嵁matchValue鎺掑簭缁撴灉闆� * * @param key * @param list @@ -199,7 +199,7 @@ public abstract class ParseServlet extends BaseServlet { } /** - * 小区的板块可能有多个,取最后一个 + * 灏忓尯鐨勬澘鍧楀彲鑳芥湁澶氫釜锛屽彇鏈�鍚庝竴涓� * * @param unitList */ @@ -218,15 +218,15 @@ public abstract class ParseServlet extends BaseServlet { } /** - * 验证小区是否需要处理。
- * 如果指定了城市,非城市内的小区返回false。已处理过的小区key返回false。 + * 楠岃瘉灏忓尯鏄惁闇�瑕佸鐞嗐��
+ * 濡傛灉鎸囧畾浜嗗煄甯傦紝闈炲煄甯傚唴鐨勫皬鍖鸿繑鍥瀎alse銆傚凡澶勭悊杩囩殑灏忓尯key杩斿洖false銆� * * @param districtKeySet - * 已处理过的小区key + * 宸插鐞嗚繃鐨勫皬鍖簁ey * @param unitRet - * 知识库解析出的小区数据 + * 鐭ヨ瘑搴撹В鏋愬嚭鐨勫皬鍖烘暟鎹� * @param city - * 指定的城市 + * 鎸囧畾鐨勫煄甯� * @return */ @SuppressWarnings("unchecked") @@ -247,15 +247,15 @@ public abstract class ParseServlet extends BaseServlet { } /** - * 验证区域是否需要处理。
- * 如果指定了城市,非城市内的区域返回false。已处理过的区域key返回false。 + * 楠岃瘉鍖哄煙鏄惁闇�瑕佸鐞嗐��
+ * 濡傛灉鎸囧畾浜嗗煄甯傦紝闈炲煄甯傚唴鐨勫尯鍩熻繑鍥瀎alse銆傚凡澶勭悊杩囩殑鍖哄煙key杩斿洖false銆� * * @param regionKeySet - * 已处理过的区域key + * 宸插鐞嗚繃鐨勫尯鍩焝ey * @param unitRet - * 知识库解析出的区域数据 + * 鐭ヨ瘑搴撹В鏋愬嚭鐨勫尯鍩熸暟鎹� * @param city - * 指定的城市 + * 鎸囧畾鐨勫煄甯� * @return */ @SuppressWarnings("unchecked") diff --git a/projects/fangjia-knowbase/src/main/java/com/fangjia/knowbase/utils/ToolUtils.java b/projects/fangjia-knowbase/src/main/java/com/fangjia/knowbase/utils/ToolUtils.java index 26b5eda92..2f7fc8a02 100644 --- a/projects/fangjia-knowbase/src/main/java/com/fangjia/knowbase/utils/ToolUtils.java +++ b/projects/fangjia-knowbase/src/main/java/com/fangjia/knowbase/utils/ToolUtils.java @@ -5,7 +5,7 @@ import org.apache.commons.lang.StringUtils; public class ToolUtils { /** - * 去除所有空格,数字间如有空格,保留1个 + * 鍘婚櫎鎵�鏈夌┖鏍硷紝鏁板瓧闂村鏈夌┖鏍硷紝淇濈暀1涓� * * @param s * @return diff --git a/projects/fangjia-loan-dal/pom.xml b/projects/fangjia-loan-dal/pom.xml index 98c2b24d0..f96b677c6 100644 --- a/projects/fangjia-loan-dal/pom.xml +++ b/projects/fangjia-loan-dal/pom.xml @@ -7,7 +7,7 @@ 0.0.1-SNAPSHOT fangjia-loan-dal - GBK + UTF-8 fangjia-loan-dal @@ -19,7 +19,7 @@ 1.6 1.6 - GBK + UTF-8 diff --git a/projects/fangjia-loan-dal/src/main/java/com/fangjia/loan/dal/mongo/model/BaseLoan.java b/projects/fangjia-loan-dal/src/main/java/com/fangjia/loan/dal/mongo/model/BaseLoan.java index 65e6c3b44..07bda94ca 100644 --- a/projects/fangjia-loan-dal/src/main/java/com/fangjia/loan/dal/mongo/model/BaseLoan.java +++ b/projects/fangjia-loan-dal/src/main/java/com/fangjia/loan/dal/mongo/model/BaseLoan.java @@ -13,7 +13,7 @@ import org.apache.commons.lang.StringUtils; import com.fangjia.dal.MongoEntity; /** - * 贷款产品基础类(通用字段) + * 璐锋浜у搧鍩虹绫伙紙閫氱敤瀛楁锛� * * @author yukai * @@ -22,78 +22,78 @@ public abstract class BaseLoan implements MongoEntity { private static final long serialVersionUID = 2101795858775773961L; private String id; private int status; - private String productName; // 贷款产品名称 - private String agencyId; // 机构信息Id - private int angecyType; // 机构类型 + private String productName; // 璐锋浜у搧鍚嶇О + private String agencyId; // 鏈烘瀯淇℃伅Id + private int angecyType; // 鏈烘瀯绫诲瀷 - private double creditRangeLow; // 额度范围(万元) + private double creditRangeLow; // 棰濆害鑼冨洿锛堜竾鍏冿級 private double creditRangeHigh; - private String creditDesc; // 额度说明 + private String creditDesc; // 棰濆害璇存槑 - private int creditTimeLow; // 贷款期限(月) + private int creditTimeLow; // 璐锋鏈熼檺锛堟湀锛� private int creditTimeHigh; - private String creditTimeDesc; // 期限说明 + private String creditTimeDesc; // 鏈熼檺璇存槑 - private String guarantyWay; // 担保方式 + private String guarantyWay; // 鎷呬繚鏂瑰紡 - private int loanTime; // 放款时间(天) + private int loanTime; // 鏀炬鏃堕棿锛堝ぉ锛� private String loanTimeDesc; - private int applyTime; // 审批时间 + private int applyTime; // 瀹℃壒鏃堕棿 private String applyTimeDesc; - private double monthCost; // 月管理费率 + private double monthCost; // 鏈堢鐞嗚垂鐜� private String monthCostDesc; - private double otherCost; // 其他费用费率 + private double otherCost; // 鍏朵粬璐圭敤璐圭巼 private String otherCostDesc; - private List citys; // 产品适用城市 + private List citys; // 浜у搧閫傜敤鍩庡競 private String city; - private String feature; // 产品特点 + private String feature; // 浜у搧鐗圭偣 - private String appCondition; // 申请条件描述 - private String introduction; // 简介 + private String appCondition; // 鐢宠鏉′欢鎻忚堪 + private String introduction; // 绠�浠� - private String material; // 所需材料 - private String rateDesc; // 利率说明 - private String other; // 其他 + private String material; // 鎵�闇�鏉愭枡 + private String rateDesc; // 鍒╃巼璇存槑 + private String other; // 鍏朵粬 private Date creationDate; private Date modificationDate; - private int badCreditStatus; // 有无不良信用记录 0-无 1-有 2-不限 - private int creditRecord; // 有无信用记录 0-无 1-有 2-不限 + private int badCreditStatus; // 鏈夋棤涓嶈壇淇$敤璁板綍 0-鏃� 1-鏈� 2-涓嶉檺 + private int creditRecord; // 鏈夋棤淇$敤璁板綍 0-鏃� 1-鏈� 2-涓嶉檺 private String creditRecordDesc; - private int nativeHouseStatus; // 是否需要本地房产 0-否 1-是 + private int nativeHouseStatus; // 鏄惁闇�瑕佹湰鍦版埧浜� 0-鍚� 1-鏄� private String nativeHouseDesc; - private String repaymentWay; // 还款方式(分期还款、随借随还、一次性还本付息, 分期还款,随借随还) - private String repaymentWayDesc; // 还款方式说明 + private String repaymentWay; // 杩樻鏂瑰紡(鍒嗘湡杩樻銆侀殢鍊熼殢杩樸�佷竴娆℃�ц繕鏈粯鎭�, 鍒嗘湡杩樻,闅忓�熼殢杩�) + private String repaymentWayDesc; // 杩樻鏂瑰紡璇存槑 - private int professionLimitStatus; // 是否职业限制 0-否 1-是 - private String profession; // 职业(多种职业以逗号分隔) - private String professionDesc; // 职业身份说明 + private int professionLimitStatus; // 鏄惁鑱屼笟闄愬埗 0-鍚� 1-鏄� + private String profession; // 鑱屼笟(澶氱鑱屼笟浠ラ�楀彿鍒嗛殧) + private String professionDesc; // 鑱屼笟韬唤璇存槑 - private int guarantyStatus; // 是否需要抵押物 0-否 1-是 - private String guaranty; // 抵押物 - private String guarantyDesc; // 抵押物说明 + private int guarantyStatus; // 鏄惁闇�瑕佹姷鎶肩墿 0-鍚� 1-鏄� + private String guaranty; // 鎶垫娂鐗� + private String guarantyDesc; // 鎶垫娂鐗╄鏄� - private int incomeStatus; // 是否收入限制 0-否 1-是 + private int incomeStatus; // 鏄惁鏀跺叆闄愬埗 0-鍚� 1-鏄� private int income; private String incomeDesc; - private int workinkLifeStatus; // 是否工作年限限制 0-否 1-是 - private int workingLife; // 月 + private int workinkLifeStatus; // 鏄惁宸ヤ綔骞撮檺闄愬埗 0-鍚� 1-鏄� + private int workingLife; // 鏈� private String workingLifeDesc; - private int companyLifeStatus; // 是否企业成立年限限制 0-否 1-是 - private int companyLife; // 月 + private int companyLifeStatus; // 鏄惁浼佷笟鎴愮珛骞撮檺闄愬埗 0-鍚� 1-鏄� + private int companyLife; // 鏈� private String companyLifeDesc; - private int sequence; // 序号,用于人工控制列表排序 + private int sequence; // 搴忓彿锛岀敤浜庝汉宸ユ帶鍒跺垪琛ㄦ帓搴� @Id @GeneratedValue diff --git a/projects/fangjia-loan-dal/src/main/java/com/fangjia/loan/dal/mongo/model/BusinessLoan.java b/projects/fangjia-loan-dal/src/main/java/com/fangjia/loan/dal/mongo/model/BusinessLoan.java index 34304bb8d..9a53c1fe7 100644 --- a/projects/fangjia-loan-dal/src/main/java/com/fangjia/loan/dal/mongo/model/BusinessLoan.java +++ b/projects/fangjia-loan-dal/src/main/java/com/fangjia/loan/dal/mongo/model/BusinessLoan.java @@ -4,7 +4,7 @@ import javax.persistence.Entity; import javax.persistence.Table; /** - * 经营型贷款产品表 + * 缁忚惀鍨嬭捶娆句骇鍝佽〃 * * @author yukai * diff --git a/projects/fangjia-loan-dal/src/main/java/com/fangjia/loan/dal/mongo/model/CarLoan.java b/projects/fangjia-loan-dal/src/main/java/com/fangjia/loan/dal/mongo/model/CarLoan.java index 47bf43b37..504a74202 100644 --- a/projects/fangjia-loan-dal/src/main/java/com/fangjia/loan/dal/mongo/model/CarLoan.java +++ b/projects/fangjia-loan-dal/src/main/java/com/fangjia/loan/dal/mongo/model/CarLoan.java @@ -5,7 +5,7 @@ import javax.persistence.Entity; import javax.persistence.Table; /** - * 汽车贷款产品表 + * 姹借溅璐锋浜у搧琛� * * @author yukai * diff --git a/projects/fangjia-loan-dal/src/main/java/com/fangjia/loan/dal/mongo/model/ConsumptionLoan.java b/projects/fangjia-loan-dal/src/main/java/com/fangjia/loan/dal/mongo/model/ConsumptionLoan.java index 24fc8b9e8..d589a7804 100644 --- a/projects/fangjia-loan-dal/src/main/java/com/fangjia/loan/dal/mongo/model/ConsumptionLoan.java +++ b/projects/fangjia-loan-dal/src/main/java/com/fangjia/loan/dal/mongo/model/ConsumptionLoan.java @@ -4,7 +4,7 @@ import javax.persistence.Entity; import javax.persistence.Table; /** - * 消费型贷款产品表 + * 娑堣垂鍨嬭捶娆句骇鍝佽〃 * * @author yukai * diff --git a/projects/fangjia-loan-dal/src/main/java/com/fangjia/loan/dal/mongo/model/Feedback2.java b/projects/fangjia-loan-dal/src/main/java/com/fangjia/loan/dal/mongo/model/Feedback2.java index 7ba684b43..c5dccd3d6 100644 --- a/projects/fangjia-loan-dal/src/main/java/com/fangjia/loan/dal/mongo/model/Feedback2.java +++ b/projects/fangjia-loan-dal/src/main/java/com/fangjia/loan/dal/mongo/model/Feedback2.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 用户意见反馈 + * 鐢ㄦ埛鎰忚鍙嶉 */ @Entity @Table(name = "rongshidai.feedback") diff --git a/projects/fangjia-loan-dal/src/main/java/com/fangjia/loan/dal/mongo/model/HouseLoan.java b/projects/fangjia-loan-dal/src/main/java/com/fangjia/loan/dal/mongo/model/HouseLoan.java index a7dcc1e9c..ab7c5c740 100644 --- a/projects/fangjia-loan-dal/src/main/java/com/fangjia/loan/dal/mongo/model/HouseLoan.java +++ b/projects/fangjia-loan-dal/src/main/java/com/fangjia/loan/dal/mongo/model/HouseLoan.java @@ -5,7 +5,7 @@ import javax.persistence.Entity; import javax.persistence.Table; /** - * 房贷型贷款产品表 + * 鎴胯捶鍨嬭捶娆句骇鍝佽〃 * * @author yukai * @@ -15,8 +15,8 @@ import javax.persistence.Table; public class HouseLoan extends BaseLoan { private static final long serialVersionUID = 4464781647461568037L; - private int houseType; // 0:首套;1:二套;2:商业 - private int houseFundStatus; // 是否支持公积金贷款0:不限;1:提供;2:不提供 + private int houseType; // 0锛氶濂楋紱1锛氫簩濂楋紱2锛氬晢涓� + private int houseFundStatus; // 鏄惁鏀寔鍏Н閲戣捶娆�0:涓嶉檺;1:鎻愪緵;2:涓嶆彁渚� @Column(name = "house_type") public int getHouseType() { diff --git a/projects/fangjia-loan-dal/src/main/java/com/fangjia/loan/dal/mongo/model/LoanAgency.java b/projects/fangjia-loan-dal/src/main/java/com/fangjia/loan/dal/mongo/model/LoanAgency.java index c5524403e..36fe5fd28 100644 --- a/projects/fangjia-loan-dal/src/main/java/com/fangjia/loan/dal/mongo/model/LoanAgency.java +++ b/projects/fangjia-loan-dal/src/main/java/com/fangjia/loan/dal/mongo/model/LoanAgency.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 放贷机构信息表 + * 鏀捐捶鏈烘瀯淇℃伅琛� */ @Entity @Table(name = "rongshidai.loan_agency") diff --git a/projects/fangjia-loan-dal/src/main/java/com/fangjia/loan/dal/mongo/model/LoanAssessStep1.java b/projects/fangjia-loan-dal/src/main/java/com/fangjia/loan/dal/mongo/model/LoanAssessStep1.java index 96244eba2..06d6b579a 100644 --- a/projects/fangjia-loan-dal/src/main/java/com/fangjia/loan/dal/mongo/model/LoanAssessStep1.java +++ b/projects/fangjia-loan-dal/src/main/java/com/fangjia/loan/dal/mongo/model/LoanAssessStep1.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 评估信息-第一步 + * 璇勪及淇℃伅-绗竴姝� */ @Entity @Table(name = "rongshidai.loan_assess_step1") @@ -23,15 +23,15 @@ public class LoanAssessStep1 implements MongoEntity { private Integer userType; private Double loanAmount; private Integer loanMonth; - private Integer census; // 户籍 - private Integer marriage; // 婚姻 - private Integer credit; // 信用记录 - private Double salary; // 流水 - private Double otherSalary; // 其他收入 - private Integer companyType; // 单位类型 - private Integer job; // 职位 - private Double entryTime; // 入职时间 - private Integer taxTime; // 缴税时间 + private Integer census; // 鎴风睄 + private Integer marriage; // 濠氬Щ + private Integer credit; // 淇$敤璁板綍 + private Double salary; // 娴佹按 + private Double otherSalary; // 鍏朵粬鏀跺叆 + private Integer companyType; // 鍗曚綅绫诲瀷 + private Integer job; // 鑱屼綅 + private Double entryTime; // 鍏ヨ亴鏃堕棿 + private Integer taxTime; // 缂寸◣鏃堕棿 private Date creationDate; private Date modificationDate; diff --git a/projects/fangjia-loan-dal/src/main/java/com/fangjia/loan/dal/mongo/model/LoanAssessStep2.java b/projects/fangjia-loan-dal/src/main/java/com/fangjia/loan/dal/mongo/model/LoanAssessStep2.java index 443823eef..676f6cdbb 100644 --- a/projects/fangjia-loan-dal/src/main/java/com/fangjia/loan/dal/mongo/model/LoanAssessStep2.java +++ b/projects/fangjia-loan-dal/src/main/java/com/fangjia/loan/dal/mongo/model/LoanAssessStep2.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 评估信息-二步 + * 璇勪及淇℃伅-浜屾 */ @Entity @Table(name = "rongshidai.loan_assess_step2") @@ -20,11 +20,11 @@ public class LoanAssessStep2 implements MongoEntity { private String id; private String step1Id; - private Integer estate; // 房产 - private Double assets; // 总资产 - private Double liabilities; // 总负债 - private Double repayments; // 每月还款额 - private Integer mortgage; // 抵押物 + private Integer estate; // 鎴夸骇 + private Double assets; // 鎬昏祫浜� + private Double liabilities; // 鎬昏礋鍊� + private Double repayments; // 姣忔湀杩樻棰� + private Integer mortgage; // 鎶垫娂鐗� private Date creationDate; private Date modificationDate; diff --git a/projects/fangjia-loan-dal/src/main/java/com/fangjia/loan/dal/mongo/model/LoanKnowledge.java b/projects/fangjia-loan-dal/src/main/java/com/fangjia/loan/dal/mongo/model/LoanKnowledge.java index 7e63d7867..3b9a35689 100644 --- a/projects/fangjia-loan-dal/src/main/java/com/fangjia/loan/dal/mongo/model/LoanKnowledge.java +++ b/projects/fangjia-loan-dal/src/main/java/com/fangjia/loan/dal/mongo/model/LoanKnowledge.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 贷款知识表 + * 璐锋鐭ヨ瘑琛� */ @Entity @Table(name = "rongshidai.loan_knowledge") diff --git a/projects/fangjia-loan-dal/src/main/java/com/fangjia/loan/dal/mongo/model/LoanRate.java b/projects/fangjia-loan-dal/src/main/java/com/fangjia/loan/dal/mongo/model/LoanRate.java index 8b501769a..197976c14 100644 --- a/projects/fangjia-loan-dal/src/main/java/com/fangjia/loan/dal/mongo/model/LoanRate.java +++ b/projects/fangjia-loan-dal/src/main/java/com/fangjia/loan/dal/mongo/model/LoanRate.java @@ -11,7 +11,7 @@ import javax.persistence.Table; import com.fangjia.dal.MongoEntity; /** - * 贷款产品详细利率 + * 璐锋浜у搧璇︾粏鍒╃巼 * * @author yukai * @@ -24,7 +24,7 @@ public class LoanRate implements MongoEntity { private String id; private String productId; private String productType; - private int rateType; // 利率类型。0:实际利率;1:相对基准利率的倍率 + private int rateType; // 鍒╃巼绫诲瀷銆�0锛氬疄闄呭埄鐜囷紱1锛氱浉瀵瑰熀鍑嗗埄鐜囩殑鍊嶇巼 private double rate0to05; private double rate05to1; private double rate1to2; @@ -33,8 +33,8 @@ public class LoanRate implements MongoEntity { private double rate4to5; private double rate5to; - private boolean useMonthRate; // 是否以月息计算 - private double monthRate; // 月利率 + private boolean useMonthRate; // 鏄惁浠ユ湀鎭绠� + private double monthRate; // 鏈堝埄鐜� private Date creationDate; private Date modificationDate; diff --git a/projects/fangjia-loan-dal/src/main/java/com/fangjia/loan/dal/mongo/model/LoanUser.java b/projects/fangjia-loan-dal/src/main/java/com/fangjia/loan/dal/mongo/model/LoanUser.java index 5fc255ea9..40eb318ee 100644 --- a/projects/fangjia-loan-dal/src/main/java/com/fangjia/loan/dal/mongo/model/LoanUser.java +++ b/projects/fangjia-loan-dal/src/main/java/com/fangjia/loan/dal/mongo/model/LoanUser.java @@ -12,7 +12,7 @@ import com.fangjia.dal.MongoEntity; /** * - * 信贷员的前台用户表 + * 淇¤捶鍛樼殑鍓嶅彴鐢ㄦ埛琛� * */ @Entity @@ -28,7 +28,7 @@ public class LoanUser implements MongoEntity { private Date creationDate; private Date modificationDate; private Date lastLoginTime; - private int status = 1;//未激活 + private int status = 1;//鏈縺娲� @Column(name = "password") public String getPassword() { diff --git a/projects/fangjia-loan-service/pom.xml b/projects/fangjia-loan-service/pom.xml index 338f96da7..d4666fba4 100644 --- a/projects/fangjia-loan-service/pom.xml +++ b/projects/fangjia-loan-service/pom.xml @@ -7,7 +7,7 @@ 0.0.1-SNAPSHOT fangjia-loan-service - GBK + UTF-8 fangjia-loan-service @@ -19,7 +19,7 @@ 1.6 1.6 - GBK + UTF-8 diff --git a/projects/fangjia-loan-service/src/main/java/com/fangjia/loan/service/LoanOfficerServiceImpl.java b/projects/fangjia-loan-service/src/main/java/com/fangjia/loan/service/LoanOfficerServiceImpl.java index f48f5806b..f57105777 100644 --- a/projects/fangjia-loan-service/src/main/java/com/fangjia/loan/service/LoanOfficerServiceImpl.java +++ b/projects/fangjia-loan-service/src/main/java/com/fangjia/loan/service/LoanOfficerServiceImpl.java @@ -122,7 +122,7 @@ public class LoanOfficerServiceImpl implements LoanOfficerService { } /** - * 激活用户账户 + * 婵�娲荤敤鎴疯处鎴� */ @Override public void activeLoanOfficer(String id) { @@ -140,7 +140,7 @@ public class LoanOfficerServiceImpl implements LoanOfficerService { } loanUser.setName(loanOfficer.getMobile()); loanUser.setOfficerId(loanOfficer.getId()); - loanUser.setPassword(DigestUtils.md5Hex("888888"));// 默认密码 + loanUser.setPassword(DigestUtils.md5Hex("888888"));// 榛樿瀵嗙爜 loanUser.setStatus(0); loanUserDao.save(loanUser); } else { @@ -154,7 +154,7 @@ public class LoanOfficerServiceImpl implements LoanOfficerService { } /** - * 取消用户账户的激活状态 + * 鍙栨秷鐢ㄦ埛璐︽埛鐨勬縺娲荤姸鎬� */ @Override public void unActiveLoanOfficer(String id) { @@ -173,8 +173,8 @@ public class LoanOfficerServiceImpl implements LoanOfficerService { } loanUser.setName(loanOfficer.getMobile()); loanUser.setOfficerId(loanOfficer.getId()); - loanUser.setPassword(DigestUtils.md5Hex("888888"));// 默认密码 - loanUser.setStatus(1);// 取消激活状态 + loanUser.setPassword(DigestUtils.md5Hex("888888"));// 榛樿瀵嗙爜 + loanUser.setStatus(1);// 鍙栨秷婵�娲荤姸鎬� loanUserDao.save(loanUser); } else { Map data = new HashMap(); diff --git a/projects/fangjia-loan-service/src/main/java/com/fangjia/loan/service/LoanService.java b/projects/fangjia-loan-service/src/main/java/com/fangjia/loan/service/LoanService.java index 44c00c7dc..3b38fe995 100644 --- a/projects/fangjia-loan-service/src/main/java/com/fangjia/loan/service/LoanService.java +++ b/projects/fangjia-loan-service/src/main/java/com/fangjia/loan/service/LoanService.java @@ -21,7 +21,7 @@ import com.fangjia.loan.service.model.HouseLoanForm; public interface LoanService { /** - * 按ID查找购房贷款产品 + * 鎸塈D鏌ユ壘璐埧璐锋浜у搧 * * @param id * @return @@ -29,7 +29,7 @@ public interface LoanService { HouseLoan findHouseLoanById(String id); /** - * 消费贷款 + * 娑堣垂璐锋 * * @param id * @return @@ -37,7 +37,7 @@ public interface LoanService { ConsumptionLoan findConsumptionLoanById(String id); /** - * 购车贷款 + * 璐溅璐锋 * * @param id * @return @@ -45,7 +45,7 @@ public interface LoanService { CarLoan findCarLoanById(String id); /** - * 经营贷款 + * 缁忚惀璐锋 * * @param id * @return @@ -53,7 +53,7 @@ public interface LoanService { BusinessLoan findBusinessLoanById(String id); /** - * 按ID查找购房贷款产品 + * 鎸塈D鏌ユ壘璐埧璐锋浜у搧 * * @param id * @param loanForm @@ -62,7 +62,7 @@ public interface LoanService { HouseLoanBo findHouseLoanBoById(String id, double amount, int loanMonth); /** - * 经营贷款 + * 缁忚惀璐锋 * * @param id * @param amount @@ -72,7 +72,7 @@ public interface LoanService { BusinessLoanBo findBusinessLoanBoById(String id, double amount, int loanMonth); /** - * 消费贷款 + * 娑堣垂璐锋 * * @param id * @param amount @@ -82,7 +82,7 @@ public interface LoanService { ConsumptionLoanBo findConsumptionLoanBoById(String id, double amount, int loanMonth); /** - * 购车贷款 + * 璐溅璐锋 * * @param id * @param amount @@ -92,7 +92,7 @@ public interface LoanService { CarLoanBo findCarLoanBoById(String id, double amount, int loanMonth); /** - * 购房贷款 + * 璐埧璐锋 * * @param loanForm * @return @@ -100,7 +100,7 @@ public interface LoanService { List findHouseLoan(HouseLoanForm loanForm); /** - * 经营性贷款 + * 缁忚惀鎬ц捶娆� * * @param loanForm * @return @@ -108,7 +108,7 @@ public interface LoanService { List findBusinessLoan(BusinessLoanForm loanForm); /** - * 购车贷款 + * 璐溅璐锋 * * @param loanForm * @return @@ -116,7 +116,7 @@ public interface LoanService { List findCarLoan(CarLoanForm loanForm); /** - * 消费贷款 + * 娑堣垂璐锋 * * @param loanForm * @return @@ -124,7 +124,7 @@ public interface LoanService { List findConsumptionLoan(ConsumptionLoanForm loanForm); /** - * 根据贷款月份份计算真实利率 + * 鏍规嵁璐锋鏈堜唤浠借绠楃湡瀹炲埄鐜� * * @param loanMonth * @param loanRate @@ -133,7 +133,7 @@ public interface LoanService { double calculateRealRate(int loanMonth, LoanRate loanRate); /** - * 计算总利息 + * 璁$畻鎬诲埄鎭� * * @param loanAmount * @param monthPay @@ -143,7 +143,7 @@ public interface LoanService { double calculateTotalInterest(double loanAmount, double monthPay, int loanMonth); /** - * 计算月供 + * 璁$畻鏈堜緵 * * @param loanAmount * @param rate @@ -153,7 +153,7 @@ public interface LoanService { double calculateMonthPay(double loanAmount, double rate, int loanMonth); /** - * 计算其他费用 + * 璁$畻鍏朵粬璐圭敤 * * @param loanAmount * @param otherCost diff --git a/projects/fangjia-loan-service/src/main/java/com/fangjia/loan/service/LoanServiceImpl.java b/projects/fangjia-loan-service/src/main/java/com/fangjia/loan/service/LoanServiceImpl.java index ae34c323f..b531efe08 100644 --- a/projects/fangjia-loan-service/src/main/java/com/fangjia/loan/service/LoanServiceImpl.java +++ b/projects/fangjia-loan-service/src/main/java/com/fangjia/loan/service/LoanServiceImpl.java @@ -156,7 +156,7 @@ public class LoanServiceImpl implements LoanService { ret.add(convertToBo(businessLoan, loanForm.getAmount(), loanForm.getLoanMonth())); } - // 条件过滤 + // 鏉′欢杩囨护 ret = CollectionUtils.collectSome(ret, new Closure() { @Override public BusinessLoanBo execute(BusinessLoanBo o) { @@ -220,7 +220,7 @@ public class LoanServiceImpl implements LoanService { ret.add(convertToBo(carLoan, loanForm.getAmount(), loanForm.getLoanMonth())); } - // 条件过滤 + // 鏉′欢杩囨护 ret = CollectionUtils.collectSome(ret, new Closure() { @Override public CarLoanBo execute(CarLoanBo o) { @@ -301,7 +301,7 @@ public class LoanServiceImpl implements LoanService { ret.add(convertToBo(consumptionLoan, loanForm.getAmount(), loanForm.getLoanMonth())); } - // 条件过滤 + // 鏉′欢杩囨护 ret = CollectionUtils.collectSome(ret, new Closure() { @Override public ConsumptionLoanBo execute(ConsumptionLoanBo o) { @@ -398,12 +398,12 @@ public class LoanServiceImpl implements LoanService { } /** - * 根据实际利率,计算利率的浮动值 + * 鏍规嵁瀹為檯鍒╃巼锛岃绠楀埄鐜囩殑娴姩鍊� * * @param realRate - * 实际利率 + * 瀹為檯鍒╃巼 * @param loanMonth - * 贷款月数 + * 璐锋鏈堟暟 * @return */ private double calculateFloatRate(double realRate, int loanMonth, LoanRate loanRate) { @@ -527,7 +527,7 @@ public class LoanServiceImpl implements LoanService { } private void fillMonthlyPay(LoanBo bo, LoanRate loanRate, BaseLoan loan, Double loanAmount, Integer loanMonth) { - // 每月还息算法 + // 姣忔湀杩樻伅绠楁硶 if (loanRate.isUseMonthRate()) { bo.setUseMonthRate(loanRate.isUseMonthRate()); bo.setMonthRate(loanRate.getMonthRate()); diff --git a/projects/fangjia-loan-service/src/main/java/com/fangjia/loan/service/bo/HouseLoanBo.java b/projects/fangjia-loan-service/src/main/java/com/fangjia/loan/service/bo/HouseLoanBo.java index f8f8ff6a6..acdb6d4d2 100644 --- a/projects/fangjia-loan-service/src/main/java/com/fangjia/loan/service/bo/HouseLoanBo.java +++ b/projects/fangjia-loan-service/src/main/java/com/fangjia/loan/service/bo/HouseLoanBo.java @@ -8,7 +8,7 @@ public class HouseLoanBo extends LoanBo { */ private static final long serialVersionUID = 3256088172271086913L; private HouseLoan houseLoan; - private double floatRate; // 浮动利率 + private double floatRate; // 娴姩鍒╃巼 public HouseLoanBo(HouseLoan houseLoan) { this.houseLoan = houseLoan; diff --git a/projects/fangjia-loan-service/src/main/java/com/fangjia/loan/service/bo/LoanBo.java b/projects/fangjia-loan-service/src/main/java/com/fangjia/loan/service/bo/LoanBo.java index 9976cea1d..ca302fbab 100644 --- a/projects/fangjia-loan-service/src/main/java/com/fangjia/loan/service/bo/LoanBo.java +++ b/projects/fangjia-loan-service/src/main/java/com/fangjia/loan/service/bo/LoanBo.java @@ -10,9 +10,9 @@ public class LoanBo implements Serializable { * */ private static final long serialVersionUID = -7136849361899629291L; - private double rate; // 实际利率 - private double interest; // 总利息 - private double payMonth; // 月供 + private double rate; // 瀹為檯鍒╃巼 + private double interest; // 鎬诲埄鎭� + private double payMonth; // 鏈堜緵 private String smallLogo; private String largeLogo; @@ -24,10 +24,10 @@ public class LoanBo implements Serializable { private List loanOfficers; - private boolean useMonthRate; // 是否以月息计算 - private double monthRate; // 月利率 - private double monthInterest; // 月息 - private double monthlyTotalInterest; // 月息计算的总费用 + private boolean useMonthRate; // 鏄惁浠ユ湀鎭绠� + private double monthRate; // 鏈堝埄鐜� + private double monthInterest; // 鏈堟伅 + private double monthlyTotalInterest; // 鏈堟伅璁$畻鐨勬�昏垂鐢� public List getLoanOfficers() { return loanOfficers; diff --git a/projects/fangjia-loan-service/src/main/java/com/fangjia/loan/service/bo/LoanerInfoItem.java b/projects/fangjia-loan-service/src/main/java/com/fangjia/loan/service/bo/LoanerInfoItem.java index 58269d0c4..f5762faf1 100644 --- a/projects/fangjia-loan-service/src/main/java/com/fangjia/loan/service/bo/LoanerInfoItem.java +++ b/projects/fangjia-loan-service/src/main/java/com/fangjia/loan/service/bo/LoanerInfoItem.java @@ -58,13 +58,13 @@ public class LoanerInfoItem implements Serializable { public void setProductType(String productType) { this.productType = productType; if("business".equals(productType)){ - productTypeDes = "商业贷款"; + productTypeDes = "鍟嗕笟璐锋"; }else if ("car".equals(productType)) { - productTypeDes = "购车贷款"; + productTypeDes = "璐溅璐锋"; }else if ("consumption".equals(productType)) { - productTypeDes = "消费贷款"; + productTypeDes = "娑堣垂璐锋"; }else { - productTypeDes = "购房贷款"; + productTypeDes = "璐埧璐锋"; } } public String getCompanyName() { @@ -127,13 +127,13 @@ public class LoanerInfoItem implements Serializable { public void setLoanStatus(int loanStatus) { this.loanStatus = loanStatus; if(loanStatus == 0){ - statusDes="申请中"; + statusDes="鐢宠涓�"; }else if (loanStatus == 1) { - statusDes = "审核中"; + statusDes = "瀹℃牳涓�"; }else if (loanStatus == 2) { - statusDes = "审核通过"; + statusDes = "瀹℃牳閫氳繃"; }else if (loanStatus == 4) { - statusDes = "审核失败"; + statusDes = "瀹℃牳澶辫触"; } } public int getOriginalSite() { @@ -142,9 +142,9 @@ public class LoanerInfoItem implements Serializable { public void setOriginalSite(int originalSite) { this.originalSite = originalSite; if(originalSite == 0){ - oriSiteDes = "融时代"; + oriSiteDes = "铻嶆椂浠�"; }else if (originalSite == 1) { - oriSiteDes = "房价通"; + oriSiteDes = "鎴夸环閫�"; } } public String getStatusDes() { diff --git a/projects/fangjia-loan-service/src/main/java/com/fangjia/loan/service/model/HouseLoanForm.java b/projects/fangjia-loan-service/src/main/java/com/fangjia/loan/service/model/HouseLoanForm.java index 220f11eff..581590a72 100644 --- a/projects/fangjia-loan-service/src/main/java/com/fangjia/loan/service/model/HouseLoanForm.java +++ b/projects/fangjia-loan-service/src/main/java/com/fangjia/loan/service/model/HouseLoanForm.java @@ -8,7 +8,7 @@ public class HouseLoanForm extends LoanForm { */ private static final long serialVersionUID = -192832634135719233L; private LoanHouseTypeEnum houseType; - private int houseFundStatus; // 是否提供公积金贷款 0:不限;1:提供;2:不提供 + private int houseFundStatus; // 鏄惁鎻愪緵鍏Н閲戣捶娆� 0:涓嶉檺;1:鎻愪緵;2:涓嶆彁渚� public LoanHouseTypeEnum getHouseType() { return houseType; diff --git a/projects/fangjia-loan-service/src/main/java/com/fangjia/loan/service/model/LoanForm.java b/projects/fangjia-loan-service/src/main/java/com/fangjia/loan/service/model/LoanForm.java index 0edb11249..f0eef38e2 100644 --- a/projects/fangjia-loan-service/src/main/java/com/fangjia/loan/service/model/LoanForm.java +++ b/projects/fangjia-loan-service/src/main/java/com/fangjia/loan/service/model/LoanForm.java @@ -8,8 +8,8 @@ public class LoanForm implements Serializable { */ private static final long serialVersionUID = 4935695705741389402L; private String city; - private Double amount; // 贷款金额(万元) - private Integer loanMonth; // 贷款期限(月) + private Double amount; // 璐锋閲戦锛堜竾鍏冿級 + private Integer loanMonth; // 璐锋鏈熼檺锛堟湀锛� private String sort; private Integer status; diff --git a/projects/fangjia-loan-service/src/main/java/com/fangjia/loan/service/mongo/Feedback2ServiceImpl.java b/projects/fangjia-loan-service/src/main/java/com/fangjia/loan/service/mongo/Feedback2ServiceImpl.java index a7f5e5fbc..90407de7b 100644 --- a/projects/fangjia-loan-service/src/main/java/com/fangjia/loan/service/mongo/Feedback2ServiceImpl.java +++ b/projects/fangjia-loan-service/src/main/java/com/fangjia/loan/service/mongo/Feedback2ServiceImpl.java @@ -57,11 +57,11 @@ public class Feedback2ServiceImpl implements Feedback2Service { private void sendMail(Feedback2 fb) { Mail mail = new Mail(); mail.setReceiver(new MailUser(fb.getContact())); - mail.setSubject("【回复】融时代反馈"); + mail.setSubject("銆愬洖澶嶃�戣瀺鏃朵唬鍙嶉"); StringBuffer emailMsg = new StringBuffer(); - emailMsg.append("尊敬的" + fb.getName() + ",您好!首先感谢您对我们提出的宝贵建议!
") - .append("  根据您在" + new SimpleDateFormat("yyyy年MM月dd日").format(fb.getCreationDate()) + "的反馈,我们客服已为您做出相关解答,内容如下:
") - .append("    ").append(fb.getResponse()).append("

  希望我们的回复能够令您满意,我们将竭力为您提供更优质的服务!您还可拨打客服热线400-816-8815转888进行咨询和建议。"); + emailMsg.append("灏婃暚鐨�" + fb.getName() + "锛屾偍濂�!棣栧厛鎰熻阿鎮ㄥ鎴戜滑鎻愬嚭鐨勫疂璐靛缓璁�!
") + .append("  鏍规嵁鎮ㄥ湪" + new SimpleDateFormat("yyyy骞碝M鏈坉d鏃�").format(fb.getCreationDate()) + "鐨勫弽棣堬紝鎴戜滑瀹㈡湇宸蹭负鎮ㄥ仛鍑虹浉鍏宠В绛旓紝鍐呭濡備笅:
") + .append("    ").append(fb.getResponse()).append("

  甯屾湜鎴戜滑鐨勫洖澶嶈兘澶熶护鎮ㄦ弧鎰忥紝鎴戜滑灏嗙鍔涗负鎮ㄦ彁渚涙洿浼樿川鐨勬湇鍔★紒鎮ㄨ繕鍙嫧鎵撳鏈嶇儹绾�400-816-8815杞�888杩涜鍜ㄨ鍜屽缓璁��"); mail.setContent(emailMsg.toString()); mail.setImportant(true); try { diff --git a/projects/fangjia-loan/src/main/java/com/fangjia/loan/CheckLoginInterceptor.java b/projects/fangjia-loan/src/main/java/com/fangjia/loan/CheckLoginInterceptor.java index abfd6a742..5314d030d 100644 --- a/projects/fangjia-loan/src/main/java/com/fangjia/loan/CheckLoginInterceptor.java +++ b/projects/fangjia-loan/src/main/java/com/fangjia/loan/CheckLoginInterceptor.java @@ -40,19 +40,19 @@ public class CheckLoginInterceptor implements Interceptor { return ret; } - // 验证时间戳 + // 楠岃瘉鏃堕棿鎴� Calendar ca = Calendar.getInstance(); ca.setTimeInMillis(Long.parseLong(userInfo[2])); Date cookieDate = ca.getTime(); - // cookie超过2天默认失效 + // cookie瓒呰繃2澶╅粯璁ゅけ鏁� ca.setTime(new Date()); ca.add(Calendar.DAY_OF_MONTH, -2); if (cookieDate.before(ca.getTime())) { return ret; } - // 数据库验证用户是否有记录 + // 鏁版嵁搴撻獙璇佺敤鎴锋槸鍚︽湁璁板綍 LoanUser user = loanUserService.findById(userInfo[0]); if (null == user || !userInfo[1].equals(user.getName())) { return ret; diff --git a/projects/fangjia-loan/src/main/java/com/fangjia/loan/FangjiaConfig.java b/projects/fangjia-loan/src/main/java/com/fangjia/loan/FangjiaConfig.java index be01eb1a0..b7baed6a6 100644 --- a/projects/fangjia-loan/src/main/java/com/fangjia/loan/FangjiaConfig.java +++ b/projects/fangjia-loan/src/main/java/com/fangjia/loan/FangjiaConfig.java @@ -105,7 +105,7 @@ public class FangjiaConfig extends Configuration { } /** - * 是否启用页面静态缓存,默认为false + * 鏄惁鍚敤椤甸潰闈欐�佺紦瀛橈紝榛樿涓篺alse * * @return */ @@ -114,7 +114,7 @@ public class FangjiaConfig extends Configuration { } /** - * 得到页面静态缓存的存放路径 + * 寰楀埌椤甸潰闈欐�佺紦瀛樼殑瀛樻斁璺緞 * * @return */ @@ -123,7 +123,7 @@ public class FangjiaConfig extends Configuration { } /** - * 得到fangjia网spider的user agent,默认为goojiaSpider + * 寰楀埌fangjia缃憇pider鐨剈ser agent锛岄粯璁や负goojiaSpider * * @return */ @@ -132,7 +132,7 @@ public class FangjiaConfig extends Configuration { } /** - * 得到网站根域名 + * 寰楀埌缃戠珯鏍瑰煙鍚� * * @return */ @@ -201,7 +201,7 @@ public class FangjiaConfig extends Configuration { } /** - * 是否开启google 统计 + * 鏄惁寮�鍚痝oogle 缁熻 * * @return */ @@ -210,7 +210,7 @@ public class FangjiaConfig extends Configuration { } /** - * 全站检索列表分页最大页码 + * 鍏ㄧ珯妫�绱㈠垪琛ㄥ垎椤垫渶澶ч〉鐮� * * @return */ @@ -219,7 +219,7 @@ public class FangjiaConfig extends Configuration { } /** - * 内部链接关键字 + * 鍐呴儴閾炬帴鍏抽敭瀛� * * @return */ diff --git a/projects/fangjia-loan/src/main/java/com/fangjia/loan/controllers/AssessController.java b/projects/fangjia-loan/src/main/java/com/fangjia/loan/controllers/AssessController.java index bf27cf7a9..17668699c 100644 --- a/projects/fangjia-loan/src/main/java/com/fangjia/loan/controllers/AssessController.java +++ b/projects/fangjia-loan/src/main/java/com/fangjia/loan/controllers/AssessController.java @@ -79,16 +79,16 @@ public class AssessController { private void fillLoanBoList(AssessModel model, LoanAssessStep1 step1Entity, LoanAssessStep2 step2Entity) { if (1 == step1Entity.getLoanType()) { - // 经营 + // 缁忚惀 fillBussiness(model, step1Entity, step2Entity); } else if (2 == step1Entity.getLoanType()) { - // 消费 + // 娑堣垂 fillConsumption(model, step1Entity, step2Entity); } else if (3 == step1Entity.getLoanType()) { - // 车贷 + // 杞﹁捶 fillCar(model, step1Entity, step2Entity); } else if (4 == step1Entity.getLoanType()) { - // 房贷 + // 鎴胯捶 fillHouse(model, step1Entity, step2Entity); } } @@ -110,7 +110,7 @@ public class AssessController { form.setLoanMonth(step1Entity.getLoanMonth()); form.setCity(model.getCityName()); if (0 != step2Entity.getMortgage()) { - form.setGuarantyWay("抵押"); + form.setGuarantyWay("鎶垫娂"); } form.setSort(model.getSort()); form.setStatus(0); @@ -124,7 +124,7 @@ public class AssessController { form.setLoanMonth(step1Entity.getLoanMonth()); form.setCity(model.getCityName()); if (0 != step2Entity.getMortgage()) { - form.setGuarantyWay("抵押"); + form.setGuarantyWay("鎶垫娂"); } form.setSort(model.getSort()); form.setStatus(0); @@ -138,7 +138,7 @@ public class AssessController { form.setCity(model.getCityName()); form.setLoanMonth(step1Entity.getLoanMonth()); if (0 != step2Entity.getMortgage()) { - form.setGuarantyWay("抵押"); + form.setGuarantyWay("鎶垫娂"); } form.setSort(model.getSort()); form.setStatus(0); diff --git a/projects/fangjia-loan/src/main/java/com/fangjia/loan/controllers/BusinessLoanController.java b/projects/fangjia-loan/src/main/java/com/fangjia/loan/controllers/BusinessLoanController.java index 00c4d3545..6003ccf9b 100644 --- a/projects/fangjia-loan/src/main/java/com/fangjia/loan/controllers/BusinessLoanController.java +++ b/projects/fangjia-loan/src/main/java/com/fangjia/loan/controllers/BusinessLoanController.java @@ -53,46 +53,46 @@ public class BusinessLoanController { JsonModel jsonModel = new JsonModel(); Map res = new HashMap(); if (businessLoan == null) { - res.put("msg", "页面错误"); + res.put("msg", "椤甸潰閿欒"); jsonModel.setJsonModel(res); return jsonModel; } if (model.getLoanAmount() < businessLoan.getCreditRangeLow() || model.getLoanAmount() > businessLoan.getCreditRangeHigh()) { - res.put("msg", "最高贷款额度范围在" + businessLoan.getCreditRangeLow() + "万元~" + businessLoan.getCreditRangeHigh() + "万元"); + res.put("msg", "鏈�楂樿捶娆鹃搴﹁寖鍥村湪" + businessLoan.getCreditRangeLow() + "涓囧厓锝�" + businessLoan.getCreditRangeHigh() + "涓囧厓"); jsonModel.setJsonModel(res); return jsonModel; } if (model.getLoanMonth() < businessLoan.getCreditTimeLow() || model.getLoanMonth() > businessLoan.getCreditTimeHigh()) { - res.put("msg", "贷款期限范围在" + businessLoan.getCreditTimeLow() + "个月~" + businessLoan.getCreditTimeHigh() + "个月"); + res.put("msg", "璐锋鏈熼檺鑼冨洿鍦�" + businessLoan.getCreditTimeLow() + "涓湀锝�" + businessLoan.getCreditTimeHigh() + "涓湀"); jsonModel.setJsonModel(res); return jsonModel; } if (model.getRate() < 0 || model.getRate() > 100 || model.getmRate() < 0 || model.getmRate() > 100) { - res.put("msg", "利率错误"); + res.put("msg", "鍒╃巼閿欒"); jsonModel.setJsonModel(res); return jsonModel; } if (model.getManagerFee() < 0) { - res.put("msg", "月管理费错误"); + res.put("msg", "鏈堢鐞嗚垂閿欒"); jsonModel.setJsonModel(res); return jsonModel; } if (model.getOnceFee() < 0) { - res.put("msg", "一次收费错误"); + res.put("msg", "涓�娆℃敹璐归敊璇�"); jsonModel.setJsonModel(res); return jsonModel; } if (model.getmRate() > 0) { res.put("msg", "0"); - double monthPay = model.getLoanAmount() * 10000 * model.getmRate() / 100; // 月息 - monthPay += model.getLoanAmount() * 10000 * model.getManagerFee() * 1 / 100; // 月息+月管理费 - double totalInterest = monthPay * model.getLoanMonth() / 10000 + model.getLoanAmount() * model.getOnceFee() / 100; // 总费用 + double monthPay = model.getLoanAmount() * 10000 * model.getmRate() / 100; // 鏈堟伅 + monthPay += model.getLoanAmount() * 10000 * model.getManagerFee() * 1 / 100; // 鏈堟伅+鏈堢鐞嗚垂 + double totalInterest = monthPay * model.getLoanMonth() / 10000 + model.getLoanAmount() * model.getOnceFee() / 100; // 鎬昏垂鐢� res.put("totalInterest", valueOf(totalInterest)); res.put("payMonth", valueOf(monthPay)); res.put("dayInterest", valueOf(monthPay / 30)); @@ -100,12 +100,12 @@ public class BusinessLoanController { } else { double monthPay = loanService.calculateMonthPay(model.getLoanAmount(), model.getRate(), model.getLoanMonth()); double totalInterest = loanService.calculateTotalInterest(model.getLoanAmount(), monthPay, model.getLoanMonth()); - // 一次性收费 + // 涓�娆℃�ф敹璐� if (model.getOnceFee() > 0) { totalInterest += loanService.calculateOtherCost(model.getLoanAmount(), model.getOnceFee()); } - // 月管理费 + // 鏈堢鐞嗚垂 if (model.getManagerFee() > 0) { totalInterest += model.getLoanAmount() * model.getManagerFee() * 1 / 100 * model.getLoanMonth(); monthPay += model.getLoanAmount() * 10000 * model.getManagerFee() * 1 / 100; diff --git a/projects/fangjia-loan/src/main/java/com/fangjia/loan/controllers/CarLoanController.java b/projects/fangjia-loan/src/main/java/com/fangjia/loan/controllers/CarLoanController.java index cc64c7bed..e73856812 100644 --- a/projects/fangjia-loan/src/main/java/com/fangjia/loan/controllers/CarLoanController.java +++ b/projects/fangjia-loan/src/main/java/com/fangjia/loan/controllers/CarLoanController.java @@ -50,46 +50,46 @@ public class CarLoanController { JsonModel jsonModel = new JsonModel(); Map res = new HashMap(); if (carLoan == null) { - res.put("msg", "页面错误"); + res.put("msg", "椤甸潰閿欒"); jsonModel.setJsonModel(res); return jsonModel; } if (model.getLoanAmount() < carLoan.getCreditRangeLow() || model.getLoanAmount() > carLoan.getCreditRangeHigh()) { - res.put("msg", "最高贷款额度范围在" + carLoan.getCreditRangeLow() + "万元~" + carLoan.getCreditRangeHigh() + "万元"); + res.put("msg", "鏈�楂樿捶娆鹃搴﹁寖鍥村湪" + carLoan.getCreditRangeLow() + "涓囧厓锝�" + carLoan.getCreditRangeHigh() + "涓囧厓"); jsonModel.setJsonModel(res); return jsonModel; } if (model.getLoanMonth() < carLoan.getCreditTimeLow() || model.getLoanMonth() > carLoan.getCreditTimeHigh()) { - res.put("msg", "贷款期限范围在" + carLoan.getCreditTimeLow() + "个月~" + carLoan.getCreditTimeHigh() + "个月"); + res.put("msg", "璐锋鏈熼檺鑼冨洿鍦�" + carLoan.getCreditTimeLow() + "涓湀锝�" + carLoan.getCreditTimeHigh() + "涓湀"); jsonModel.setJsonModel(res); return jsonModel; } if (model.getRate() < 0 || model.getRate() > 100 || model.getmRate() < 0 || model.getmRate() > 100) { - res.put("msg", "利率错误"); + res.put("msg", "鍒╃巼閿欒"); jsonModel.setJsonModel(res); return jsonModel; } if (model.getManagerFee() < 0) { - res.put("msg", "月管理费错误"); + res.put("msg", "鏈堢鐞嗚垂閿欒"); jsonModel.setJsonModel(res); return jsonModel; } if (model.getOnceFee() < 0) { - res.put("msg", "一次收费错误"); + res.put("msg", "涓�娆℃敹璐归敊璇�"); jsonModel.setJsonModel(res); return jsonModel; } if (model.getmRate() > 0) { res.put("msg", "0"); - double monthPay = model.getLoanAmount() * 10000 * model.getmRate() / 100; // 月息 - monthPay += model.getLoanAmount() * 10000 * model.getManagerFee() * 1 / 100; // 月息+月管理费 - double totalInterest = monthPay * model.getLoanMonth() / 10000 + model.getLoanAmount() * model.getOnceFee() / 100; // 总费用 + double monthPay = model.getLoanAmount() * 10000 * model.getmRate() / 100; // 鏈堟伅 + monthPay += model.getLoanAmount() * 10000 * model.getManagerFee() * 1 / 100; // 鏈堟伅+鏈堢鐞嗚垂 + double totalInterest = monthPay * model.getLoanMonth() / 10000 + model.getLoanAmount() * model.getOnceFee() / 100; // 鎬昏垂鐢� res.put("totalInterest", valueOf(totalInterest)); res.put("payMonth", valueOf(monthPay)); res.put("dayInterest", valueOf(monthPay / 30)); @@ -97,12 +97,12 @@ public class CarLoanController { } else { double monthPay = loanService.calculateMonthPay(model.getLoanAmount(), model.getRate(), model.getLoanMonth()); double totalInterest = loanService.calculateTotalInterest(model.getLoanAmount(), monthPay, model.getLoanMonth()); - // 一次性收费 + // 涓�娆℃�ф敹璐� if (model.getOnceFee() > 0) { totalInterest += loanService.calculateOtherCost(model.getLoanAmount(), model.getOnceFee()); } - // 月管理费 + // 鏈堢鐞嗚垂 if (model.getManagerFee() > 0) { totalInterest += model.getLoanAmount() * model.getManagerFee() * 1 / 100 * model.getLoanMonth(); monthPay += model.getLoanAmount() * 10000 * model.getManagerFee() * 1 / 100; diff --git a/projects/fangjia-loan/src/main/java/com/fangjia/loan/controllers/ConsumptionLoanController.java b/projects/fangjia-loan/src/main/java/com/fangjia/loan/controllers/ConsumptionLoanController.java index 5518e7005..246104a7d 100644 --- a/projects/fangjia-loan/src/main/java/com/fangjia/loan/controllers/ConsumptionLoanController.java +++ b/projects/fangjia-loan/src/main/java/com/fangjia/loan/controllers/ConsumptionLoanController.java @@ -61,49 +61,49 @@ public class ConsumptionLoanController { JsonModel jsonModel = new JsonModel(); Map res = new HashMap(); if (consumptionLoan == null) { - res.put("msg", "页面错误"); + res.put("msg", "椤甸潰閿欒"); jsonModel.setJsonModel(res); return jsonModel; } if (model.getLoanAmount() < consumptionLoan.getCreditRangeLow() || model.getLoanAmount() > consumptionLoan.getCreditRangeHigh()) { - res.put("msg", "最高贷款额度范围在" + consumptionLoan.getCreditRangeLow() + "万元~" + consumptionLoan.getCreditRangeHigh() - + "万元"); + res.put("msg", "鏈�楂樿捶娆鹃搴﹁寖鍥村湪" + consumptionLoan.getCreditRangeLow() + "涓囧厓锝�" + consumptionLoan.getCreditRangeHigh() + + "涓囧厓"); jsonModel.setJsonModel(res); return jsonModel; } if (model.getLoanMonth() < consumptionLoan.getCreditTimeLow() || model.getLoanMonth() > consumptionLoan.getCreditTimeHigh()) { - res.put("msg", "贷款期限范围在" + consumptionLoan.getCreditTimeLow() + "个月~" + consumptionLoan.getCreditTimeHigh() + "个月"); + res.put("msg", "璐锋鏈熼檺鑼冨洿鍦�" + consumptionLoan.getCreditTimeLow() + "涓湀锝�" + consumptionLoan.getCreditTimeHigh() + "涓湀"); jsonModel.setJsonModel(res); return jsonModel; } if (model.getRate() < 0 || model.getRate() > 100 || model.getmRate() < 0 || model.getmRate() > 100) { - res.put("msg", "利率错误"); + res.put("msg", "鍒╃巼閿欒"); jsonModel.setJsonModel(res); return jsonModel; } if (model.getManagerFee() < 0) { - res.put("msg", "月管理费错误"); + res.put("msg", "鏈堢鐞嗚垂閿欒"); jsonModel.setJsonModel(res); return jsonModel; } if (model.getOnceFee() < 0) { - res.put("msg", "一次收费错误"); + res.put("msg", "涓�娆℃敹璐归敊璇�"); jsonModel.setJsonModel(res); return jsonModel; } if (model.getmRate() > 0) { res.put("msg", "0"); - double monthPay = model.getLoanAmount() * 10000 * model.getmRate() / 100; // 月息 - monthPay += model.getLoanAmount() * 10000 * model.getManagerFee() * 1 / 100; // 月息+月管理费 - double totalInterest = monthPay * model.getLoanMonth() / 10000 + model.getLoanAmount() * model.getOnceFee() / 100; // 总费用 + double monthPay = model.getLoanAmount() * 10000 * model.getmRate() / 100; // 鏈堟伅 + monthPay += model.getLoanAmount() * 10000 * model.getManagerFee() * 1 / 100; // 鏈堟伅+鏈堢鐞嗚垂 + double totalInterest = monthPay * model.getLoanMonth() / 10000 + model.getLoanAmount() * model.getOnceFee() / 100; // 鎬昏垂鐢� res.put("totalInterest", valueOf(totalInterest)); res.put("payMonth", valueOf(monthPay)); res.put("dayInterest", valueOf(monthPay / 30)); @@ -111,12 +111,12 @@ public class ConsumptionLoanController { } else { double monthPay = loanService.calculateMonthPay(model.getLoanAmount(), model.getRate(), model.getLoanMonth()); double totalInterest = loanService.calculateTotalInterest(model.getLoanAmount(), monthPay, model.getLoanMonth()); - // 一次性收费 + // 涓�娆℃�ф敹璐� if (model.getOnceFee() > 0) { totalInterest += loanService.calculateOtherCost(model.getLoanAmount(), model.getOnceFee()); } - // 月管理费 + // 鏈堢鐞嗚垂 if (model.getManagerFee() > 0) { totalInterest += model.getLoanAmount() * model.getManagerFee() * 1 / 100 * model.getLoanMonth(); monthPay += model.getLoanAmount() * 10000 * model.getManagerFee() * 1 / 100; diff --git a/projects/fangjia-loan/src/main/java/com/fangjia/loan/controllers/HouseLoanController.java b/projects/fangjia-loan/src/main/java/com/fangjia/loan/controllers/HouseLoanController.java index 18cc5eb4b..f5a675c1a 100644 --- a/projects/fangjia-loan/src/main/java/com/fangjia/loan/controllers/HouseLoanController.java +++ b/projects/fangjia-loan/src/main/java/com/fangjia/loan/controllers/HouseLoanController.java @@ -50,46 +50,46 @@ public class HouseLoanController { JsonModel jsonModel = new JsonModel(); Map res = new HashMap(); if (houseLoan == null) { - res.put("msg", "页面错误"); + res.put("msg", "椤甸潰閿欒"); jsonModel.setJsonModel(res); return jsonModel; } if (model.getLoanAmount() < houseLoan.getCreditRangeLow() || model.getLoanAmount() > houseLoan.getCreditRangeHigh()) { - res.put("msg", "最高贷款额度范围在" + houseLoan.getCreditRangeLow() + "万元~" + houseLoan.getCreditRangeHigh() + "万元"); + res.put("msg", "鏈�楂樿捶娆鹃搴﹁寖鍥村湪" + houseLoan.getCreditRangeLow() + "涓囧厓锝�" + houseLoan.getCreditRangeHigh() + "涓囧厓"); jsonModel.setJsonModel(res); return jsonModel; } if (model.getLoanMonth() < houseLoan.getCreditTimeLow() || model.getLoanMonth() > houseLoan.getCreditTimeHigh()) { - res.put("msg", "贷款期限范围在" + houseLoan.getCreditTimeLow() + "个月~" + houseLoan.getCreditTimeHigh() + "个月"); + res.put("msg", "璐锋鏈熼檺鑼冨洿鍦�" + houseLoan.getCreditTimeLow() + "涓湀锝�" + houseLoan.getCreditTimeHigh() + "涓湀"); jsonModel.setJsonModel(res); return jsonModel; } if (model.getRate() < 0 || model.getRate() > 100 || model.getmRate() < 0 || model.getmRate() > 100) { - res.put("msg", "利率错误"); + res.put("msg", "鍒╃巼閿欒"); jsonModel.setJsonModel(res); return jsonModel; } if (model.getManagerFee() < 0) { - res.put("msg", "月管理费错误"); + res.put("msg", "鏈堢鐞嗚垂閿欒"); jsonModel.setJsonModel(res); return jsonModel; } if (model.getOnceFee() < 0) { - res.put("msg", "一次收费错误"); + res.put("msg", "涓�娆℃敹璐归敊璇�"); jsonModel.setJsonModel(res); return jsonModel; } if (model.getmRate() > 0) { res.put("msg", "0"); - double monthPay = model.getLoanAmount() * 10000 * model.getmRate() / 100; // 月息 - monthPay += model.getLoanAmount() * 10000 * model.getManagerFee() * 1 / 100; // 月息+月管理费 - double totalInterest = monthPay * model.getLoanMonth() / 10000 + model.getLoanAmount() * model.getOnceFee() / 100; // 总费用 + double monthPay = model.getLoanAmount() * 10000 * model.getmRate() / 100; // 鏈堟伅 + monthPay += model.getLoanAmount() * 10000 * model.getManagerFee() * 1 / 100; // 鏈堟伅+鏈堢鐞嗚垂 + double totalInterest = monthPay * model.getLoanMonth() / 10000 + model.getLoanAmount() * model.getOnceFee() / 100; // 鎬昏垂鐢� res.put("totalInterest", valueOf(totalInterest)); res.put("payMonth", valueOf(monthPay)); res.put("dayInterest", valueOf(monthPay / 30)); @@ -97,12 +97,12 @@ public class HouseLoanController { } else { double monthPay = loanService.calculateMonthPay(model.getLoanAmount(), model.getRate(), model.getLoanMonth()); double totalInterest = loanService.calculateTotalInterest(model.getLoanAmount(), monthPay, model.getLoanMonth()); - // 一次性收费 + // 涓�娆℃�ф敹璐� if (model.getOnceFee() > 0) { totalInterest += loanService.calculateOtherCost(model.getLoanAmount(), model.getOnceFee()); } - // 月管理费 + // 鏈堢鐞嗚垂 if (model.getManagerFee() > 0) { totalInterest += model.getLoanAmount() * model.getManagerFee() * 1 / 100 * model.getLoanMonth(); monthPay += model.getLoanAmount() * 10000 * model.getManagerFee() * 1 / 100; diff --git a/projects/fangjia-loan/src/main/java/com/fangjia/loan/controllers/LoanLeadsController.java b/projects/fangjia-loan/src/main/java/com/fangjia/loan/controllers/LoanLeadsController.java index 75ecac178..f4c2eadac 100644 --- a/projects/fangjia-loan/src/main/java/com/fangjia/loan/controllers/LoanLeadsController.java +++ b/projects/fangjia-loan/src/main/java/com/fangjia/loan/controllers/LoanLeadsController.java @@ -42,7 +42,7 @@ import com.fangjia.service.sms.SmsService; import com.fangjia.service.util.PdsConstants; /** - * 贷款线索控制器 + * 璐锋绾跨储鎺у埗鍣� * @author yinjihuan * */ @@ -82,7 +82,7 @@ public class LoanLeadsController { } /** - * 贷款页 + * 璐锋椤� * @param model * @return */ @@ -91,7 +91,7 @@ public class LoanLeadsController { } /** - * 贷款页 + * 璐锋椤� * @param model * @return */ @@ -100,7 +100,7 @@ public class LoanLeadsController { } /** - * 贷款页 + * 璐锋椤� * @param model * @return */ @@ -109,7 +109,7 @@ public class LoanLeadsController { } /** - * 提交贷款页 + * 鎻愪氦璐锋椤� * @param model * @return */ @@ -129,7 +129,7 @@ public class LoanLeadsController { for(Cookie cookie : cookies){ if(cookie.getName().equals("backPage")){ cookie.setValue(null); - cookie.setMaxAge(0);// 立即销毁cookie + cookie.setMaxAge(0);// 绔嬪嵆閿�姣乧ookie cookie.setPath("/"); res.addCookie(cookie); break; @@ -142,7 +142,7 @@ public class LoanLeadsController { } /** - * 信用贷贷款页 + * 淇$敤璐疯捶娆鹃〉 * @param model * @return */ @@ -151,7 +151,7 @@ public class LoanLeadsController { } /** - * 房抵贷贷款页 + * 鎴挎姷璐疯捶娆鹃〉 * @param model * @return */ @@ -160,7 +160,7 @@ public class LoanLeadsController { } /** - * 贷款协议页 + * 璐锋鍗忚椤� * @param model * @return */ @@ -168,7 +168,7 @@ public class LoanLeadsController { return model; } /** - * 贷款协议页 + * 璐锋鍗忚椤� * @param model * @return */ @@ -176,7 +176,7 @@ public class LoanLeadsController { return model; } /** - * 添加贷款线索 + * 娣诲姞璐锋绾跨储 * @return */ public Object addLeadsAction(LoanLeadsModel model, HttpServletRequest req) { @@ -186,11 +186,11 @@ public class LoanLeadsController { result.setMsg(Message.PARAM_NOT_NULL); return result; } - // 自动化测试使用,只允许公司内部的IP才可以 + // 鑷姩鍖栨祴璇曚娇鐢紝鍙厑璁稿叕鍙稿唴閮ㄧ殑IP鎵嶅彲浠� String ip = AnalyticsUtil.getIpAddress(req); if (("8888".equals(model.getSmsCode()) && "116.247.70.58".equals(ip)) || ("8888".equals(model.getSmsCode()) && ip.startsWith("192.168"))) { - LOGGER.info("自动化测试,不做验证码认证:"+ip); + LOGGER.info("鑷姩鍖栨祴璇曪紝涓嶅仛楠岃瘉鐮佽璇�:"+ip); } else { String smsCacheCode = getCacheCode(model.getMobile(), Message.SMS_CODE_TYPE_LOAN); if (smsCacheCode == null) { @@ -212,7 +212,7 @@ public class LoanLeadsController { String loanType = ""; for(String loan:loanTypeArry){ if(StringUtils.isNotBlank(loan)){ - loanType += "、"+ loan; + loanType += "銆�"+ loan; } } if(StringUtils.isNotBlank(loanType)){ @@ -226,7 +226,7 @@ public class LoanLeadsController { String assetType = ""; for(String asset:assetTypeArry){ if(StringUtils.isNotBlank(asset)){ - assetType += "、" + asset; + assetType += "銆�" + asset; } } if(StringUtils.isNotBlank(assetType)){ @@ -251,7 +251,7 @@ public class LoanLeadsController { leads.setSource(model.getSource()); leads.setLeads_source(model.getLeads_source()); if(StringUtils.isNotBlank(model.getComefrom()) && ("1".equals(model.getComefrom())||"2".equals(model.getComefrom()))){ - if(model.getLeads_source()!=null && model.getLeads_source().indexOf("搜索")!=-1){ + if(model.getLeads_source()!=null && model.getLeads_source().indexOf("鎼滅储")!=-1){ leads.setChannelType("Organic"); }else{ leads.setChannelType("Referral"); @@ -260,17 +260,17 @@ public class LoanLeadsController { leads.setChannelType(model.getLeads_type()); } leads.setCampaign(model.getCampaign()); - // 网站来源 + // 缃戠珯鏉ユ簮 String source = COOKIE_CONTEXT.getCookieValue(req, CookieName.SITE_SOURCE); //String channelType = SourceUtils.getSampleBaiduSiteType(source); leads.setClueSource(source); - //发送邮件 + //鍙戦�侀偖浠� leads.setLoanProductName(model.getLoanType()); loanLeadsService.save(leads); SimpleDateFormat sf = new SimpleDateFormat("yyyy/MM/dd HH:mm"); String smsContent = ""; if(StringUtils.isNotBlank(model.getLoanName()) || StringUtils.isNotBlank(model.getSex())){ - smsContent += "客户名:"; + smsContent += "瀹㈡埛鍚�:"; if(StringUtils.isNotBlank(model.getLoanName())){ smsContent += model.getLoanName(); } @@ -280,24 +280,24 @@ public class LoanLeadsController { smsContent += "
"; } if(StringUtils.isNotBlank(model.getMobile())){ - smsContent += "手机号:" + model.getMobile(); + smsContent += "鎵嬫満鍙�:" + model.getMobile(); } if(model.getAmount()!=0){ - smsContent += "
贷款金额:" + model.getAmount()*10000; + smsContent += "
璐锋閲戦:" + model.getAmount()*10000; } - smsContent += "
申请日期:" + sf.format(new Date()); + smsContent += "
鐢宠鏃ユ湡:" + sf.format(new Date()); if(StringUtils.isNotBlank(leads.getLoanType())){ - smsContent += "
贷款类型:"+leads.getLoanType(); + smsContent += "
璐锋绫诲瀷:"+leads.getLoanType(); } //sendEmail("sunwei@fangjia.com", model, model.getLoanType(),smsContent); - //发送钉钉消息 + //鍙戦�侀拤閽夋秷鎭� JSONObject jsonBody = new JSONObject(); jsonBody.put("msgtype", "markdown"); JSONObject markdown = new JSONObject(); if(StringUtils.isBlank(model.getLoanType())){ - markdown.put("title", model.getLoanName()+"客户申请了贷款"); + markdown.put("title", model.getLoanName()+"瀹㈡埛鐢宠浜嗚捶娆�"); }else{ - markdown.put("title", model.getLoanName()+"客户申请了"+model.getLoanType()+"类型的贷款"); + markdown.put("title", model.getLoanName()+"瀹㈡埛鐢宠浜�"+model.getLoanType()+"绫诲瀷鐨勮捶娆�"); } markdown.put("text", smsContent); jsonBody.put("markdown", markdown); @@ -333,7 +333,7 @@ public class LoanLeadsController { } /** - * 添加贷款线索(无短信验证码) + * 娣诲姞璐锋绾跨储(鏃犵煭淇¢獙璇佺爜) * @return */ public Object addLeadsNoSmsAction(LoanLeadsModel model, HttpServletRequest req) { @@ -350,7 +350,7 @@ public class LoanLeadsController { String loanType = ""; for(String loan:loanTypeArry){ if(StringUtils.isNotBlank(loan)){ - loanType += "、"+ loan; + loanType += "銆�"+ loan; } } if(StringUtils.isNotBlank(loanType)){ @@ -364,7 +364,7 @@ public class LoanLeadsController { String assetType = ""; for(String asset:assetTypeArry){ if(StringUtils.isNotBlank(asset)){ - assetType += "、" + asset; + assetType += "銆�" + asset; } } if(StringUtils.isNotBlank(assetType)){ @@ -389,7 +389,7 @@ public class LoanLeadsController { leads.setSource(model.getSource()); leads.setLeads_source(model.getLeads_source()); if(StringUtils.isNotBlank(model.getComefrom()) && ("1".equals(model.getComefrom())||"2".equals(model.getComefrom()))){ - if(model.getLeads_source()!=null && model.getLeads_source().indexOf("搜索")!=-1){ + if(model.getLeads_source()!=null && model.getLeads_source().indexOf("鎼滅储")!=-1){ leads.setChannelType("Organic"); }else{ leads.setChannelType("Referral"); @@ -398,17 +398,17 @@ public class LoanLeadsController { leads.setChannelType(model.getLeads_type()); } leads.setCampaign(model.getCampaign()); - // 网站来源 + // 缃戠珯鏉ユ簮 String source = COOKIE_CONTEXT.getCookieValue(req, CookieName.SITE_SOURCE); //String channelType = SourceUtils.getSampleBaiduSiteType(source); leads.setClueSource(source); - //发送邮件 + //鍙戦�侀偖浠� leads.setLoanProductName(model.getLoanType()); loanLeadsService.save(leads); SimpleDateFormat sf = new SimpleDateFormat("yyyy/MM/dd HH:mm"); String smsContent = ""; if(StringUtils.isNotBlank(model.getLoanName()) || StringUtils.isNotBlank(model.getSex())){ - smsContent += "客户名:"; + smsContent += "瀹㈡埛鍚�:"; if(StringUtils.isNotBlank(model.getLoanName())){ smsContent += model.getLoanName(); } @@ -418,24 +418,24 @@ public class LoanLeadsController { smsContent += "
"; } if(StringUtils.isNotBlank(model.getMobile())){ - smsContent += "手机号:" + model.getMobile(); + smsContent += "鎵嬫満鍙�:" + model.getMobile(); } if(model.getAmount()!=0){ - smsContent += "
贷款金额:" + model.getAmount()*10000; + smsContent += "
璐锋閲戦:" + model.getAmount()*10000; } - smsContent += "
申请日期:" + sf.format(new Date()); + smsContent += "
鐢宠鏃ユ湡:" + sf.format(new Date()); if(StringUtils.isNotBlank(leads.getLoanType())){ - smsContent += "
贷款类型:"+leads.getLoanType(); + smsContent += "
璐锋绫诲瀷:"+leads.getLoanType(); } //sendEmail("sunwei@fangjia.com", model, model.getLoanType(),smsContent); - //发送钉钉消息 + //鍙戦�侀拤閽夋秷鎭� JSONObject jsonBody = new JSONObject(); jsonBody.put("msgtype", "markdown"); JSONObject markdown = new JSONObject(); if(StringUtils.isBlank(model.getLoanType())){ - markdown.put("title", model.getLoanName()+"客户申请了贷款"); + markdown.put("title", model.getLoanName()+"瀹㈡埛鐢宠浜嗚捶娆�"); }else{ - markdown.put("title", model.getLoanName()+"客户申请了"+model.getLoanType()+"类型的贷款"); + markdown.put("title", model.getLoanName()+"瀹㈡埛鐢宠浜�"+model.getLoanType()+"绫诲瀷鐨勮捶娆�"); } markdown.put("text", smsContent); jsonBody.put("markdown", markdown); @@ -470,7 +470,7 @@ public class LoanLeadsController { return result; } /** - * 发送验证码到指定的手机上 + * 鍙戦�侀獙璇佺爜鍒版寚瀹氱殑鎵嬫満涓� * @author yinjihuan * @param model * @return @@ -496,7 +496,7 @@ public class LoanLeadsController { } /** - * 发送验证码(贷款) + * 鍙戦�侀獙璇佺爜(璐锋) * @author yinjihuan * @param model * @param resultModel @@ -508,7 +508,7 @@ public class LoanLeadsController { SmsSendLog smsSendLog = smsService.findLastSmsSendLog(mobile); if(smsSendLog != null && System.currentTimeMillis() - smsSendLog.getCreateDate().getTime() < 1000 * 60){ resultModel.setResult(Message.RESULT_FAIL); - resultModel.setMsg("该手机号短信发送频繁"); + resultModel.setMsg("璇ユ墜鏈哄彿鐭俊鍙戦�侀绻�"); return resultModel; } @@ -517,28 +517,28 @@ public class LoanLeadsController { long count = smsService.countSmsSendLog(ip, calendar.getTime()); if(count > 100){ resultModel.setResult(Message.RESULT_FAIL); - resultModel.setMsg("该IP短信发送频繁"); + resultModel.setMsg("璇P鐭俊鍙戦�侀绻�"); return resultModel; } String code = fangJiaUserService.randomCode(); try { - smsService.send(mobile, "【融时代】你的验证码是" + code + ",验证码5分钟内有效,请立即验证。"); + smsService.send(mobile, "銆愯瀺鏃朵唬銆戜綘鐨勯獙璇佺爜鏄�" + code + ",楠岃瘉鐮�5鍒嗛挓鍐呮湁鏁堬紝璇风珛鍗抽獙璇併��"); /*if(FangjiaConfig.getConfig().isTestEnvironment()){ }*/ smsSendLog = new SmsSendLog(); - smsSendLog.setContent("【融时代】你的验证码是" + code + ",验证码5分钟内有效,请立即验证。"); + smsSendLog.setContent("銆愯瀺鏃朵唬銆戜綘鐨勯獙璇佺爜鏄�" + code + ",楠岃瘉鐮�5鍒嗛挓鍐呮湁鏁堬紝璇风珛鍗抽獙璇併��"); smsSendLog.setMobile(mobile); smsSendLog.setCreateDate(new Date()); smsSendLog.setIp(ip); - smsSendLog.setPurpose("融时代"); + smsSendLog.setPurpose("铻嶆椂浠�"); smsService.saveSmsSendLog(smsSendLog); resultModel.setResult(Message.RESULT_SUCCESS); CacheUtils.putValue(CachePolicyEnum.TINY, FangJiaUserService.class, mobile + "_" + type, code); CacheUtils.putValue(CachePolicyEnum.TINY, FangJiaUserService.class, mobile, new Date().getTime()); } catch (SmsException e) { - LOGGER.info("异常:"+e); + LOGGER.info("寮傚父:"+e); resultModel.setResult(Message.RESULT_FAIL); resultModel.setMsg(Message.SMS_CODE_SEND_FAIL); } @@ -582,14 +582,14 @@ public class LoanLeadsController { public void sendEmail(String eamilAddress,LoanLeadsModel model, String loanName, String smsContent){ try { - // 发邮件给用户 + // 鍙戦偖浠剁粰鐢ㄦ埛 Mail mail = new Mail(); mail.setReceiver(new MailUser(eamilAddress)); String subject = ""; if(StringUtils.isNotBlank(loanName)){ - subject = model.getMobile()+"客户申请了"+loanName+"类型的贷款"; + subject = model.getMobile()+"瀹㈡埛鐢宠浜�"+loanName+"绫诲瀷鐨勮捶娆�"; }else{ - subject = model.getMobile()+"客户申请了贷款"; + subject = model.getMobile()+"瀹㈡埛鐢宠浜嗚捶娆�"; } mail.setSubject(subject); @@ -604,10 +604,10 @@ public class LoanLeadsController { } /** - * 获取缓存的验证码 + * 鑾峰彇缂撳瓨鐨勯獙璇佺爜 * @author yinjihuan - * @param mobile 手机 - * @param type 类型 + * @param mobile 鎵嬫満 + * @param type 绫诲瀷 * @return */ private String getCacheCode(String mobile, String type) { diff --git a/projects/fangjia-loan/src/main/java/com/fangjia/loan/controllers/LoanerInfoController.java b/projects/fangjia-loan/src/main/java/com/fangjia/loan/controllers/LoanerInfoController.java index 99f4dbaba..0a200bdbc 100644 --- a/projects/fangjia-loan/src/main/java/com/fangjia/loan/controllers/LoanerInfoController.java +++ b/projects/fangjia-loan/src/main/java/com/fangjia/loan/controllers/LoanerInfoController.java @@ -42,15 +42,15 @@ public class LoanerInfoController { Map res = new HashMap(); if (StringUtils.isBlank(model.getUserName())) { - res.put("msg", "用户名不能为空"); + res.put("msg", "鐢ㄦ埛鍚嶄笉鑳戒负绌�"); } else if (StringUtils.isBlank(model.getMobile()) || !DataUtil.isCellPhoneNumber(model.getMobile())) { - res.put("msg", "手机号码错误"); + res.put("msg", "鎵嬫満鍙风爜閿欒"); } else if (StringUtils.isBlank(model.getCurrentCity())) { - res.put("msg", "输入错误,请重新选择贷款产品再试!"); + res.put("msg", "杈撳叆閿欒,璇烽噸鏂伴�夋嫨璐锋浜у搧鍐嶈瘯!"); } else if (!ObjectId.isValid(model.getProductId()) || !ObjectId.isValid(model.getOfficerId())) { - res.put("msg", "输入错误,请重新选择贷款产品再试!"); + res.put("msg", "杈撳叆閿欒,璇烽噸鏂伴�夋嫨璐锋浜у搧鍐嶈瘯!"); } else if (model.getLoanAmount() <= 0 || model.getLoanMonth() <= 0) { - res.put("msg", "输入错误,请重新选择贷款产品再试!"); + res.put("msg", "杈撳叆閿欒,璇烽噸鏂伴�夋嫨璐锋浜у搧鍐嶈瘯!"); } if (res.size() > 0) { @@ -80,7 +80,7 @@ public class LoanerInfoController { } /** - * 处理给用户和信贷员发送短信通知 + * 澶勭悊缁欑敤鎴峰拰淇¤捶鍛樺彂閫佺煭淇¢�氱煡 * * @param model */ @@ -122,13 +122,13 @@ public class LoanerInfoController { } /** - * 给管理员发送通知短信 + * 缁欑鐞嗗憳鍙戦�侀�氱煡鐭俊 */ private void sendAdminMsg(LoanBo productInfo, BaseLoan loanInfo, LoanOfficer officerInfo, LoanerInfoModel model) { StringBuffer msg = new StringBuffer(); - msg.append(model.getUserName()).append("(手机").append(model.getMobile()).append(")申请了:") - .append(productInfo.getAgencyName()).append("的").append(loanInfo.getProductName()).append(",信贷员为") - .append(officerInfo.getName()).append("。此条无需转发!"); + msg.append(model.getUserName()).append("锛堟墜鏈�").append(model.getMobile()).append("锛夌敵璇蜂簡锛�") + .append(productInfo.getAgencyName()).append("鐨�").append(loanInfo.getProductName()).append("锛屼俊璐峰憳涓�") + .append(officerInfo.getName()).append("銆傛鏉℃棤闇�杞彂锛�"); try { smsService.sendForRongshidai("15026780660", msg.toString()); @@ -138,7 +138,7 @@ public class LoanerInfoController { } /** - * 给用户发送短信 + * 缁欑敤鎴峰彂閫佺煭淇� */ private void sendUserMsg(LoanBo productInfo, BaseLoan loanInfo, LoanOfficer officerInfo, LoanerInfoModel model) { String callNumber = getOfficerCallNumber(officerInfo); @@ -161,18 +161,18 @@ public class LoanerInfoController { StringBuffer msg = new StringBuffer(); msg.append(productInfo.getAgencyName()).append(" "); msg.append(loanInfo.getProductName()).append(" "); - msg.append("信贷员 ").append(officerInfo.getName()).append("的联系方式为"); + msg.append("淇¤捶鍛� ").append(officerInfo.getName()).append("鐨勮仈绯绘柟寮忎负"); if ("".equals(bigCode) || "".equals(extCode)) { msg.append(phone400); } else { - msg.append(bigCode).append(" 转 ").append(extCode); + msg.append(bigCode).append(" 杞� ").append(extCode); } - msg.append(" 贷款产品尽在www.rongshidai.com"); + msg.append(" 璐锋浜у搧灏藉湪www.rongshidai.com"); try { smsService.sendForRongshidai(model.getMobile(), msg.toString()); - // msg.append("\r\nTo 用户号码:").append(model.getMobile()); + // msg.append("\r\nTo 鐢ㄦ埛鍙风爜锛�").append(model.getMobile()); // smsService.sendForRongshidai("15026780660", msg.toString()); } catch (SmsException e) { LOGGER.error("Send SMS Error:", e); @@ -180,7 +180,7 @@ public class LoanerInfoController { } /** - * 给信贷员发送短信 + * 缁欎俊璐峰憳鍙戦�佺煭淇� */ private void sendOfficerMsg(BaseLoan loanInfo, LoanOfficer officerInfo, LoanerInfoModel model) { String mobile = getOfficerMobile(officerInfo); @@ -189,13 +189,13 @@ public class LoanerInfoController { } StringBuffer msg = new StringBuffer(); - msg.append(model.getUserName()).append("(手机").append(model.getMobile()).append(")选择了您发布的“") - .append(loanInfo.getProductName()).append("”,请速回电接洽,并提供优质服务,谢谢配合! 客户查询请登陆www.rongshidai.com"); + msg.append(model.getUserName()).append("锛堟墜鏈�").append(model.getMobile()).append("锛夐�夋嫨浜嗘偍鍙戝竷鐨勨��") + .append(loanInfo.getProductName()).append("鈥濓紝璇烽�熷洖鐢垫帴娲斤紝骞舵彁渚涗紭璐ㄦ湇鍔★紝璋㈣阿閰嶅悎! 瀹㈡埛鏌ヨ璇风櫥闄唚ww.rongshidai.com"); try { smsService.sendForRongshidai(mobile, msg.toString()); - // msg.append("\r\nTo 信贷员号码:").append(mobile); + // msg.append("\r\nTo 淇¤捶鍛樺彿鐮侊細").append(mobile); // smsService.sendForRongshidai("15026780660", msg.toString()); } catch (SmsException e) { LOGGER.error("Send SMS Error:", e); @@ -203,7 +203,7 @@ public class LoanerInfoController { } /** - * 根据信贷员资料取得400轮播电话(手机+固话) + * 鏍规嵁淇¤捶鍛樿祫鏂欏彇寰�400杞挱鐢佃瘽锛堟墜鏈�+鍥鸿瘽锛� * * @param info * @return @@ -227,7 +227,7 @@ public class LoanerInfoController { } /** - * 根据信贷员资料取得对应手机号 + * 鏍规嵁淇¤捶鍛樿祫鏂欏彇寰楀搴旀墜鏈哄彿 * * @param info * @return diff --git a/projects/fangjia-loan/src/main/java/com/fangjia/loan/controllers/user/AgController.java b/projects/fangjia-loan/src/main/java/com/fangjia/loan/controllers/user/AgController.java index 3be737f0d..9f6052b3a 100644 --- a/projects/fangjia-loan/src/main/java/com/fangjia/loan/controllers/user/AgController.java +++ b/projects/fangjia-loan/src/main/java/com/fangjia/loan/controllers/user/AgController.java @@ -36,7 +36,7 @@ public class AgController { return model; } - // 数据库验证用户名密码 + // 鏁版嵁搴撻獙璇佺敤鎴峰悕瀵嗙爜 LoanUser user = loanUserService.checkin(model.getUserName(), DigestUtils.md5Hex(model.getPassword())); if (null != user) { CookieContext cookieContext = CoresiteCookieContext.getInstance(); diff --git a/projects/fangjia-loan/src/main/java/com/fangjia/loan/filters/AccessLogFilter.java b/projects/fangjia-loan/src/main/java/com/fangjia/loan/filters/AccessLogFilter.java index a5a71377f..84d5afb9a 100644 --- a/projects/fangjia-loan/src/main/java/com/fangjia/loan/filters/AccessLogFilter.java +++ b/projects/fangjia-loan/src/main/java/com/fangjia/loan/filters/AccessLogFilter.java @@ -74,7 +74,7 @@ public class AccessLogFilter implements Filter { LOGGER.error("error process request: request_url=" + analyticsBean.requestUrl + ", referer=" + analyticsBean.refererUrl, rootCause); } - // 记录运行超过1秒的请求到日志中 + // 璁板綍杩愯瓒呰繃1绉掔殑璇锋眰鍒版棩蹇椾腑 final long time = System.currentTimeMillis() - start; final String actionUri = (String) request.getAttribute(ActionContext.ACTION_URI); if (time > 1000 || (!FangjiaConfig.getConfig().isProductionEnvironment() && executeCounter.getTotalCount() > 0)) { @@ -95,7 +95,7 @@ public class AccessLogFilter implements Filter { private void writeAccessLog(AnalyticsBean analyticsBean, long duration, String actionUri, int statusCode, String method) { StringBuilder logStr = new StringBuilder(); - // 不要改变顺序 + // 涓嶈鏀瑰彉椤哄簭 logStr.append(DATE_FORMAT.format(analyticsBean.startTime));// 1 logStr.append(SPLIT).append(StringUtils.defaultString(analyticsBean.connectionIp));// 2 logStr.append(SPLIT).append(StringUtils.defaultString(analyticsBean.ip));// 3 diff --git a/projects/fangjia-loan/src/main/java/com/fangjia/loan/filters/AnalyticsBean.java b/projects/fangjia-loan/src/main/java/com/fangjia/loan/filters/AnalyticsBean.java index b07f13534..2cd43597f 100644 --- a/projects/fangjia-loan/src/main/java/com/fangjia/loan/filters/AnalyticsBean.java +++ b/projects/fangjia-loan/src/main/java/com/fangjia/loan/filters/AnalyticsBean.java @@ -105,7 +105,7 @@ public class AnalyticsBean { } /** - * 获得连接客户端的IP(部署环境下一般都设有nginx等http服务器) + * 鑾峰緱杩炴帴瀹㈡埛绔殑IP锛堥儴缃茬幆澧冧笅涓�鑸兘璁炬湁nginx绛塰ttp鏈嶅姟鍣級 * * @param request * @return @@ -123,7 +123,7 @@ public class AnalyticsBean { String citySpell = getCitySpell(request.getRequestURL().toString()); ServerArea city = ServerAreaData.getServerAreaByNameOrSpellDefaultNull(citySpell); if (null != city) { - // 保存至cookie + // 淇濆瓨鑷砪ookie Cookie cityCookie = cookieContext.createCookie(CookieName.COOKIE_CITY, citySpell); cityCookie.setMaxAge(Integer.MAX_VALUE); response.addCookie(cityCookie); @@ -137,7 +137,7 @@ public class AnalyticsBean { } private String createUID(HttpServletRequest request, HttpServletResponse response) { - // 设置UUID + // 璁剧疆UUID String uuid = new ObjectId().toString(); Cookie uuidCookie = cookieContext.createCookie(CookieName.UID, uuid); uuidCookie.setMaxAge(Integer.MAX_VALUE); @@ -152,7 +152,7 @@ public class AnalyticsBean { } private String createSID(HttpServletRequest request, HttpServletResponse response) { - // 设置session id + // 璁剧疆session id String sid = new ObjectId().toString(); Cookie uuidCookie = cookieContext.createCookie(CookieName.SID, sid); uuidCookie.setMaxAge(-1); @@ -165,7 +165,7 @@ public class AnalyticsBean { } /** - * 请求url,不包括query string + * 璇锋眰url锛屼笉鍖呮嫭query string * * @return */ @@ -174,7 +174,7 @@ public class AnalyticsBean { } /** - * 请求url后的请求参数,如果参数不为空则包括问号在内 + * 璇锋眰url鍚庣殑璇锋眰鍙傛暟锛屽鏋滃弬鏁颁笉涓虹┖鍒欏寘鎷棶鍙峰湪鍐� * * @return */ @@ -183,7 +183,7 @@ public class AnalyticsBean { } /** - * 请求uri + * 璇锋眰uri * * @return */ @@ -192,7 +192,7 @@ public class AnalyticsBean { } /** - * 来源url + * 鏉ユ簮url * * @return */ @@ -201,7 +201,7 @@ public class AnalyticsBean { } /** - * 完整的请求url,包括query string + * 瀹屾暣鐨勮姹倁rl锛屽寘鎷琿uery string * * @return */ @@ -210,7 +210,7 @@ public class AnalyticsBean { } /** - * 是否刷新缓存 + * 鏄惁鍒锋柊缂撳瓨 * * @return */ @@ -219,7 +219,7 @@ public class AnalyticsBean { } /** - * 当前城市,可能为null + * 褰撳墠鍩庡競锛屽彲鑳戒负null * * @return */ @@ -228,7 +228,7 @@ public class AnalyticsBean { } /** - * 当前城市,不会为null + * 褰撳墠鍩庡競锛屼笉浼氫负null * * @return */ @@ -237,7 +237,7 @@ public class AnalyticsBean { } /** - * cookie中的uid,如果没有则生成新的uid + * cookie涓殑uid锛屽鏋滄病鏈夊垯鐢熸垚鏂扮殑uid * * @return */ @@ -246,7 +246,7 @@ public class AnalyticsBean { } /** - * 全局的请求id + * 鍏ㄥ眬鐨勮姹俰d * * @return */ @@ -255,7 +255,7 @@ public class AnalyticsBean { } /** - * cookie中的会话id,如果没有则生成新的sid + * cookie涓殑浼氳瘽id锛屽鏋滄病鏈夊垯鐢熸垚鏂扮殑sid * * @return */ @@ -264,7 +264,7 @@ public class AnalyticsBean { } /** - * 是否为ajax请求 + * 鏄惁涓篴jax璇锋眰 * * @return */ @@ -273,7 +273,7 @@ public class AnalyticsBean { } /** - * 访问者的真实ip + * 璁块棶鑰呯殑鐪熷疄ip * * @return */ @@ -282,7 +282,7 @@ public class AnalyticsBean { } /** - * 访问者标识,可能为null + * 璁块棶鑰呮爣璇嗭紝鍙兘涓簄ull * * @return */ @@ -291,7 +291,7 @@ public class AnalyticsBean { } /** - * 连接ip + * 杩炴帴ip * * @return */ @@ -300,7 +300,7 @@ public class AnalyticsBean { } /** - * cookie中的uid,如果没有则为空字符串 + * cookie涓殑uid锛屽鏋滄病鏈夊垯涓虹┖瀛楃涓� * * @return */ @@ -309,7 +309,7 @@ public class AnalyticsBean { } /** - * cookie中的会话id,如果没有则为空字符串 + * cookie涓殑浼氳瘽id锛屽鏋滄病鏈夊垯涓虹┖瀛楃涓� * * @return */ @@ -318,7 +318,7 @@ public class AnalyticsBean { } /** - * 请求开始时间 + * 璇锋眰寮�濮嬫椂闂� * * @return */ diff --git a/projects/fangjia-loan/src/main/java/com/fangjia/loan/filters/AnalyticsFilter.java b/projects/fangjia-loan/src/main/java/com/fangjia/loan/filters/AnalyticsFilter.java index 48f2f3d85..229abc797 100644 --- a/projects/fangjia-loan/src/main/java/com/fangjia/loan/filters/AnalyticsFilter.java +++ b/projects/fangjia-loan/src/main/java/com/fangjia/loan/filters/AnalyticsFilter.java @@ -66,12 +66,12 @@ public class AnalyticsFilter implements Filter { ServletException { final AnalyticsBean analyticsBean = AnalyticsBean.get(request, response); - // 点击日志 + // 鐐瑰嚮鏃ュ織 if (analyticsBean.requestUrl.indexOf("/__utm.gif") > -1) { processUtmGifLog(request, response, analyticsBean); return; } - // 判断URL是否合法,不合法则重定向 + // 鍒ゆ柇URL鏄惁鍚堟硶锛屼笉鍚堟硶鍒欓噸瀹氬悜 if (!System.getProperty("os.name").toLowerCase().contains("window")){ String redirectUrl = checkUrlFormat(analyticsBean); LOGGER.error("redirectUrl:", redirectUrl); @@ -95,7 +95,7 @@ public class AnalyticsFilter implements Filter { threadLocalData.put(ThreadLocalKey.DisableCache, "1"); } - // 切换城市 + // 鍒囨崲鍩庡競 FangjiaServerAreaContextHolder.setServerArea(analyticsBean.city); threadLocalData.put(ThreadLocalKey.FromSpider, analyticsBean.isSpider()); chain.doFilter(request, response); @@ -116,7 +116,7 @@ public class AnalyticsFilter implements Filter { responseOutputStream.close(); String userAgent = analyticsBean.userAgent; if (userAgent != null && (userAgent.indexOf("Googlebot-Image") >= 0 || userAgent.indexOf("Baidu") >= 0)) { - // 过滤爬虫的访问 + // 杩囨护鐖櫕鐨勮闂� return; } jmsTemplate.send(utmgifDestination, new MessageCreator() { @@ -156,7 +156,7 @@ public class AnalyticsFilter implements Filter { } /** - * 判断URL是否合法,合法则返回null,否则返回重定向URL + * 鍒ゆ柇URL鏄惁鍚堟硶锛屽悎娉曞垯杩斿洖null锛屽惁鍒欒繑鍥為噸瀹氬悜URL * * @param requestUrl * @param requestUri @@ -166,7 +166,7 @@ public class AnalyticsFilter implements Filter { private String checkUrlFormat(AnalyticsBean analyticsBean) { FangjiaConfig fangjiaConfig = FangjiaConfig.getConfig(); String hostName = StringUtils.substringBetween(analyticsBean.requestUrl, "http://", "/"); - // 如果hostName中有端口号,则把端口号去掉 + // 濡傛灉hostName涓湁绔彛鍙凤紝鍒欐妸绔彛鍙峰幓鎺� int index = hostName.indexOf(":"); if (index > 0) { hostName = hostName.substring(0, index); @@ -187,7 +187,7 @@ public class AnalyticsFilter implements Filter { return fangjiaConfig.getCityDomainName(city) + analyticsBean.requestUri + analyticsBean.queryString; } if (city != null || secondLevelDomains().contains(prefixSplit[0])) { - // 找到对应的城市,或者是一个有效的二级域名 + // 鎵惧埌瀵瑰簲鐨勫煄甯傦紝鎴栬�呮槸涓�涓湁鏁堢殑浜岀骇鍩熷悕 return null; } if (prefixSplit[0].equalsIgnoreCase("www")) { diff --git a/projects/fangjia-loan/src/main/java/com/fangjia/loan/filters/SpiderValidateFilter.java b/projects/fangjia-loan/src/main/java/com/fangjia/loan/filters/SpiderValidateFilter.java index b4504b530..2997f9a86 100644 --- a/projects/fangjia-loan/src/main/java/com/fangjia/loan/filters/SpiderValidateFilter.java +++ b/projects/fangjia-loan/src/main/java/com/fangjia/loan/filters/SpiderValidateFilter.java @@ -53,7 +53,7 @@ public class SpiderValidateFilter implements Filter { private void checkReload() { if (this.reloading.compareAndSet(false, true)) { try { - // 5分钟reload一次 + // 5鍒嗛挓reload涓�娆� if (System.currentTimeMillis() - lastReloadTimestamp < 300000) { return; } @@ -87,13 +87,13 @@ public class SpiderValidateFilter implements Filter { if (isValidUserAgent(ua)) { for (String spiderName : spiderDomains.keySet()) { if (!ua.contains(spiderName)) { - // 未声明自己为spider则跳过 + // 鏈0鏄庤嚜宸变负spider鍒欒烦杩� continue; } if (null == ip) { spider = new Spider(spiderName, ip, ua); spider.setFake(true); - // 对ip为null的蜘蛛暂时不入数据库 + // 瀵筰p涓簄ull鐨勮湗铔涙殏鏃朵笉鍏ユ暟鎹簱 } else { spider = spiders.get(ip); if (null == spider) { @@ -106,7 +106,7 @@ public class SpiderValidateFilter implements Filter { } else { spider = new Spider("unkown", ip, ua); spider.setFake(true); - // 对userAgent为null的蜘蛛暂时不入数据库 + // 瀵箄serAgent涓簄ull鐨勮湗铔涙殏鏃朵笉鍏ユ暟鎹簱 } } if (spider != null && spider.isFake()) { @@ -145,7 +145,7 @@ public class SpiderValidateFilter implements Filter { private void validateSpider(Spider spider) { if (null == spider.getId()) { - // 新发现的蜘蛛 + // 鏂板彂鐜扮殑铚樿洓 checkSpider(spider); spiderService.upsertByIp(spider); spiders.put(spider.getIp(), spider); @@ -153,23 +153,23 @@ public class SpiderValidateFilter implements Filter { LOGGER.info("find new spider: " + spider); } } else if (spider.isVerified()) { - // 已人工验证的蜘蛛 + // 宸蹭汉宸ラ獙璇佺殑铚樿洓 spiders.put(spider.getIp(), spider); } else if (spider.isFake()) { - // 已发现的假蜘蛛 + // 宸插彂鐜扮殑鍋囪湗铔� Date yestoday = DateUtils.addDays(new Date(), -1); if (spider.getModificationDate().before(yestoday)) { - // 删除超过1天的假蜘蛛信息 + // 鍒犻櫎瓒呰繃1澶╃殑鍋囪湗铔涗俊鎭� spiderService.deleteByIp(spider.getIp()); spiders.remove(spider.getIp()); } else { spiders.put(spider.getIp(), spider); } } else { - // 已发现的真蜘蛛 + // 宸插彂鐜扮殑鐪熻湗铔� Date lastWeek = DateUtils.addDays(new Date(), -7); if (spider.getModificationDate().before(lastWeek)) { - // 重新验证超过7天的真蜘蛛 + // 閲嶆柊楠岃瘉瓒呰繃7澶╃殑鐪熻湗铔� checkSpider(spider); if (spider.isFake()) { spiderService.deleteByIp(spider.getIp()); @@ -191,10 +191,10 @@ public class SpiderValidateFilter implements Filter { String host = nslookup(spider.getIp()); if (null != host) { spider.setHost(host); - // 不是相同域的为假蜘蛛 + // 涓嶆槸鐩稿悓鍩熺殑涓哄亣铚樿洓 spider.setFake(!isSameDomain(host, spiderDomains.get(spider.getName()))); } else { - // 反向解析失败,则默认为真蜘蛛 + // 鍙嶅悜瑙f瀽澶辫触锛屽垯榛樿涓虹湡铚樿洓 spider.setHost(spider.getIp()); spider.setFake(false); } diff --git a/projects/fangjia-loan/src/main/java/com/fangjia/loan/model/ApplyLoanModel.java b/projects/fangjia-loan/src/main/java/com/fangjia/loan/model/ApplyLoanModel.java index b9d7962a4..ba2f173c4 100644 --- a/projects/fangjia-loan/src/main/java/com/fangjia/loan/model/ApplyLoanModel.java +++ b/projects/fangjia-loan/src/main/java/com/fangjia/loan/model/ApplyLoanModel.java @@ -4,51 +4,51 @@ public class ApplyLoanModel extends BaseModel{ private static final long serialVersionUID = 1L; - //小区名 + //灏忓尯鍚� private String name; - //地址 + //鍦板潃 private String address; - //总价 + //鎬讳环 private long totalPrice; - //面积 + //闈㈢Н private Double area; - //均价 + //鍧囦环 private Integer avgPrice; - //贷款id + //璐锋id private String productId; - //申请贷款页面来源 + //鐢宠璐锋椤甸潰鏉ユ簮 private String source; - //贷款类型 + //璐锋绫诲瀷 private String loanType; - //上一页面链接 + //涓婁竴椤甸潰閾炬帴 private String backUrl; - //需要返回页面链接 + //闇�瑕佽繑鍥為〉闈㈤摼鎺� private String lastUrl; - //手机号 + //鎵嬫満鍙� private String mobile; - //渠道名称 + //娓犻亾鍚嶇О private String leads_source; - //广告名称 + //骞垮憡鍚嶇О private String campaign; - //渠道类型 + //娓犻亾绫诲瀷 private String leads_type; private String loan_type; - //是否显示返回按钮 1:是 + //鏄惁鏄剧ず杩斿洖鎸夐挳 1锛氭槸 private String back; public String getProductId() { diff --git a/projects/fangjia-loan/src/main/java/com/fangjia/loan/model/AssessModel.java b/projects/fangjia-loan/src/main/java/com/fangjia/loan/model/AssessModel.java index 4e6b07f60..046ebec9e 100644 --- a/projects/fangjia-loan/src/main/java/com/fangjia/loan/model/AssessModel.java +++ b/projects/fangjia-loan/src/main/java/com/fangjia/loan/model/AssessModel.java @@ -16,24 +16,24 @@ public class AssessModel extends BaseModel { private Integer userType; private Double loanAmount; private Integer loanMonth; - private Integer census; // 户籍 - private Integer marriage; // 婚姻 - private Integer credit; // 信用记录 - private Double salary; // 流水 - private Double otherSalary; // 其他收入 - private Integer companyType; // 单位类型 - private Integer job; // 职位 - private Double entryTime; // 入职时间 - private Integer taxTime; // 缴税时间 + private Integer census; // 鎴风睄 + private Integer marriage; // 濠氬Щ + private Integer credit; // 淇$敤璁板綍 + private Double salary; // 娴佹按 + private Double otherSalary; // 鍏朵粬鏀跺叆 + private Integer companyType; // 鍗曚綅绫诲瀷 + private Integer job; // 鑱屼綅 + private Double entryTime; // 鍏ヨ亴鏃堕棿 + private Integer taxTime; // 缂寸◣鏃堕棿 private String step1Id; private LoanAssessStep1 step1Entity; - private Integer estate; // 房产 - private Double assets; // 总资产 - private Double liabilities; // 总负债 - private Double repayments; // 每月还款额 - private Integer mortgage; // 抵押物 + private Integer estate; // 鎴夸骇 + private Double assets; // 鎬昏祫浜� + private Double liabilities; // 鎬昏礋鍊� + private Double repayments; // 姣忔湀杩樻棰� + private Integer mortgage; // 鎶垫娂鐗� private String step2Id; private LoanAssessStep2 step2Entity; diff --git a/projects/fangjia-loan/src/main/java/com/fangjia/loan/model/BaseModel.java b/projects/fangjia-loan/src/main/java/com/fangjia/loan/model/BaseModel.java index 6e2847661..17d8880e9 100644 --- a/projects/fangjia-loan/src/main/java/com/fangjia/loan/model/BaseModel.java +++ b/projects/fangjia-loan/src/main/java/com/fangjia/loan/model/BaseModel.java @@ -40,13 +40,13 @@ public class BaseModel extends ModelAndViewSupport { + (CONFIG.isDevelopmentEnvironment() ? "/fangjia-loan" : ""); private final static String PIC_URL = STATIC_URL + "/fs/";// fs?i= /fs- - // 默认房源小图 + // 榛樿鎴挎簮灏忓浘 private final static String DEFAULT_S_PIC = STATIC_URL + "/images/common/no-s.gif"; - // 默认房源大图 + // 榛樿鎴挎簮澶у浘 private final static String DEFAULT_B_PIC = STATIC_URL + "/images/common/no-b.gif"; - // 默认经纪人头像 + // 榛樿缁忕邯浜哄ご鍍� private final static String DEFAULT_BROKER_PIC = STATIC_URL + "/images/common/no-broker.gif"; private String queryString; private Pager pager; @@ -369,7 +369,7 @@ public class BaseModel extends ModelAndViewSupport { } /** - * 如果queryString不为空则在前面加上问号"?",否则不加 + * 濡傛灉queryString涓嶄负绌哄垯鍦ㄥ墠闈㈠姞涓婇棶鍙�"?"锛屽惁鍒欎笉鍔� * * @return */ diff --git a/projects/fangjia-loan/src/main/java/com/fangjia/loan/model/BusinessLoanModel.java b/projects/fangjia-loan/src/main/java/com/fangjia/loan/model/BusinessLoanModel.java index 379a00d3a..a2b1cbaa9 100644 --- a/projects/fangjia-loan/src/main/java/com/fangjia/loan/model/BusinessLoanModel.java +++ b/projects/fangjia-loan/src/main/java/com/fangjia/loan/model/BusinessLoanModel.java @@ -10,8 +10,8 @@ public class BusinessLoanModel extends LoanModel { private static final long serialVersionUID = -4421660548708608854L; private String id; - private int loanAmount; // 万元 - private int loanMonth; // 月 + private int loanAmount; // 涓囧厓 + private int loanMonth; // 鏈� private BusinessLoanBo businessLoanBo; private List businessLoanBoList; private String sort; @@ -33,13 +33,13 @@ public class BusinessLoanModel extends LoanModel { List ret = new ArrayList(); if (agencyType > 0) { if (agencyType == 1) { - ret.add(new Condition("agencyType", "机构类型", "银行", String.valueOf(agencyType))); + ret.add(new Condition("agencyType", "鏈烘瀯绫诲瀷", "閾惰", String.valueOf(agencyType))); } else if (agencyType == 2) { - ret.add(new Condition("agencyType", "机构类型", "小贷公司", String.valueOf(agencyType))); + ret.add(new Condition("agencyType", "鏈烘瀯绫诲瀷", "灏忚捶鍏徃", String.valueOf(agencyType))); } else if (agencyType == 3) { - ret.add(new Condition("agencyType", "机构类型", "汽车金融公司", String.valueOf(agencyType))); + ret.add(new Condition("agencyType", "鏈烘瀯绫诲瀷", "姹借溅閲戣瀺鍏徃", String.valueOf(agencyType))); } else { - ret.add(new Condition("agencyType", "机构类型", "其他", String.valueOf(agencyType))); + ret.add(new Condition("agencyType", "鏈烘瀯绫诲瀷", "鍏朵粬", String.valueOf(agencyType))); } } diff --git a/projects/fangjia-loan/src/main/java/com/fangjia/loan/model/CarLoanModel.java b/projects/fangjia-loan/src/main/java/com/fangjia/loan/model/CarLoanModel.java index e85863ec7..f1745d0cb 100644 --- a/projects/fangjia-loan/src/main/java/com/fangjia/loan/model/CarLoanModel.java +++ b/projects/fangjia-loan/src/main/java/com/fangjia/loan/model/CarLoanModel.java @@ -33,13 +33,13 @@ public class CarLoanModel extends LoanModel { List ret = new ArrayList(); if (agencyType > 0) { if (agencyType == 1) { - ret.add(new Condition("agencyType", "机构类型", "银行", String.valueOf(agencyType))); + ret.add(new Condition("agencyType", "鏈烘瀯绫诲瀷", "閾惰", String.valueOf(agencyType))); } else if (agencyType == 2) { - ret.add(new Condition("agencyType", "机构类型", "小贷公司", String.valueOf(agencyType))); + ret.add(new Condition("agencyType", "鏈烘瀯绫诲瀷", "灏忚捶鍏徃", String.valueOf(agencyType))); } else if (agencyType == 3) { - ret.add(new Condition("agencyType", "机构类型", "汽车金融公司", String.valueOf(agencyType))); + ret.add(new Condition("agencyType", "鏈烘瀯绫诲瀷", "姹借溅閲戣瀺鍏徃", String.valueOf(agencyType))); } else { - ret.add(new Condition("agencyType", "机构类型", "其他", String.valueOf(agencyType))); + ret.add(new Condition("agencyType", "鏈烘瀯绫诲瀷", "鍏朵粬", String.valueOf(agencyType))); } } diff --git a/projects/fangjia-loan/src/main/java/com/fangjia/loan/model/ConsumptionLoanModel.java b/projects/fangjia-loan/src/main/java/com/fangjia/loan/model/ConsumptionLoanModel.java index 8d3980ea9..11feb4a5b 100644 --- a/projects/fangjia-loan/src/main/java/com/fangjia/loan/model/ConsumptionLoanModel.java +++ b/projects/fangjia-loan/src/main/java/com/fangjia/loan/model/ConsumptionLoanModel.java @@ -30,13 +30,13 @@ public class ConsumptionLoanModel extends LoanModel { List ret = new ArrayList(); if (agencyType > 0) { if (agencyType == 1) { - ret.add(new Condition("agencyType", "机构类型", "银行", String.valueOf(agencyType))); + ret.add(new Condition("agencyType", "鏈烘瀯绫诲瀷", "閾惰", String.valueOf(agencyType))); } else if (agencyType == 2) { - ret.add(new Condition("agencyType", "机构类型", "小贷公司", String.valueOf(agencyType))); + ret.add(new Condition("agencyType", "鏈烘瀯绫诲瀷", "灏忚捶鍏徃", String.valueOf(agencyType))); } else if (agencyType == 3) { - ret.add(new Condition("agencyType", "机构类型", "汽车金融公司", String.valueOf(agencyType))); + ret.add(new Condition("agencyType", "鏈烘瀯绫诲瀷", "姹借溅閲戣瀺鍏徃", String.valueOf(agencyType))); } else { - ret.add(new Condition("agencyType", "机构类型", "其他", String.valueOf(agencyType))); + ret.add(new Condition("agencyType", "鏈烘瀯绫诲瀷", "鍏朵粬", String.valueOf(agencyType))); } } diff --git a/projects/fangjia-loan/src/main/java/com/fangjia/loan/model/Gakey.java b/projects/fangjia-loan/src/main/java/com/fangjia/loan/model/Gakey.java index cac5c7cc2..27d7f9344 100644 --- a/projects/fangjia-loan/src/main/java/com/fangjia/loan/model/Gakey.java +++ b/projects/fangjia-loan/src/main/java/com/fangjia/loan/model/Gakey.java @@ -2,15 +2,15 @@ package com.fangjia.loan.model; public enum Gakey { /** - * 结果集数量 + * 缁撴灉闆嗘暟閲� */ rc, /** - * 页码 + * 椤电爜 */ pn, /** - * 页码大小 + * 椤电爜澶у皬 */ ps, } diff --git a/projects/fangjia-loan/src/main/java/com/fangjia/loan/model/LoanLeadsModel.java b/projects/fangjia-loan/src/main/java/com/fangjia/loan/model/LoanLeadsModel.java index feba996bb..72f9a0d23 100644 --- a/projects/fangjia-loan/src/main/java/com/fangjia/loan/model/LoanLeadsModel.java +++ b/projects/fangjia-loan/src/main/java/com/fangjia/loan/model/LoanLeadsModel.java @@ -5,129 +5,129 @@ public class LoanLeadsModel extends BaseModel { private static final long serialVersionUID = 1L; /** - * 小区所在城市 + * 灏忓尯鎵�鍦ㄥ煄甯� */ private String disCity; /** - * 贷款人姓名 + * 璐锋浜哄鍚� */ private String loanName; /** - * 贷款人性别 + * 璐锋浜烘�у埆 */ private String sex; /** - * 手机 + * 鎵嬫満 */ private String mobile; /** - * 图形验证码 + * 鍥惧舰楠岃瘉鐮� */ private String imgCode; /** - * 图形验证码对应的token + * 鍥惧舰楠岃瘉鐮佸搴旂殑token */ private String codeToken; /** - * 短信验证码 + * 鐭俊楠岃瘉鐮� */ private String smsCode; /** - * 估值房屋地址 + * 浼板�兼埧灞嬪湴鍧� */ private String address; /** - * 小区名称 + * 灏忓尯鍚嶇О */ private String name; /** - * 房屋估值价格 + * 鎴垮眿浼板�间环鏍� */ private long totalPrice; /** - * 房屋面积 + * 鎴垮眿闈㈢Н */ private double area; /** - * 室号 + * 瀹ゅ彿 */ private String houseNum; /** - * 楼层 + * 妤煎眰 */ private Integer floor; /** - * 房屋单价 + * 鎴垮眿鍗曚环 */ private int avgPrice; /** - * 申请贷款类型 + * 鐢宠璐锋绫诲瀷 */ private String loanType; /** - * 申请贷款类型id + * 鐢宠璐锋绫诲瀷id */ private String loanProductId; /** - * 贷款申请页来源 + * 璐锋鐢宠椤垫潵婧� */ private String source; /** - * 上一页面url + * 涓婁竴椤甸潰url */ private String backUrl; - //需要返回页面链接 + //闇�瑕佽繑鍥為〉闈㈤摼鎺� private String lastUrl; /** - * 贷款金额 + * 璐锋閲戦 */ private double amount; /** - * 资产类型 + * 璧勪骇绫诲瀷 */ private String assetType; /** - * 短信类型 + * 鐭俊绫诲瀷 */ private String type; - //渠道名称 + //娓犻亾鍚嶇О private String leads_source; - //广告名称 + //骞垮憡鍚嶇О private String campaign; - //渠道类型 + //娓犻亾绫诲瀷 private String leads_type; private String loanCity; - //来源 + //鏉ユ簮 private String comefrom; - //是否返回 + //鏄惁杩斿洖 private String back; public String getLoanType() { diff --git a/projects/fangjia-loan/src/main/java/com/fangjia/loan/model/Message.java b/projects/fangjia-loan/src/main/java/com/fangjia/loan/model/Message.java index 5f72fba07..2921a1ffc 100644 --- a/projects/fangjia-loan/src/main/java/com/fangjia/loan/model/Message.java +++ b/projects/fangjia-loan/src/main/java/com/fangjia/loan/model/Message.java @@ -2,7 +2,7 @@ package com.fangjia.loan.model; public class Message { /** - * 短信验证码的使用类型(登录,注册,绑定号码) + * 鐭俊楠岃瘉鐮佺殑浣跨敤绫诲瀷锛堢櫥褰曪紝娉ㄥ唽锛岀粦瀹氬彿鐮侊級 */ public static final String SMS_CODE_TYPE_LOGIN = "login"; public static final String SMS_CODE_TYPE_REG = "register"; @@ -17,37 +17,37 @@ public class Message { public static final String RESULT_SUCCESS = "success"; - public static final String PARAM_NOT_NULL = "请将信息输入完整"; + public static final String PARAM_NOT_NULL = "璇峰皢淇℃伅杈撳叆瀹屾暣"; - public static final String SMS_CODE_SEND_FAIL = "短信验证码发送失败"; + public static final String SMS_CODE_SEND_FAIL = "鐭俊楠岃瘉鐮佸彂閫佸け璐�"; - public static final String SMS_CODE_SEND_FAIL_TIME = "操作太频繁"; + public static final String SMS_CODE_SEND_FAIL_TIME = "鎿嶄綔澶绻�"; - public static final String MIBILE_FORMAT = "手机号码不正确"; + public static final String MIBILE_FORMAT = "鎵嬫満鍙风爜涓嶆纭�"; - public static final String PASS_REPEAT = "2次密码输入不一致"; + public static final String PASS_REPEAT = "2娆″瘑鐮佽緭鍏ヤ笉涓�鑷�"; - public static final String MOBILE_NOT_SEND_CODE = "此号码没发过验证码"; + public static final String MOBILE_NOT_SEND_CODE = "姝ゅ彿鐮佹病鍙戣繃楠岃瘉鐮�"; - public static final String CODE_ERROR = "输入的验证码不正确,请重新输入"; + public static final String CODE_ERROR = "杈撳叆鐨勯獙璇佺爜涓嶆纭紝璇烽噸鏂拌緭鍏�"; - public static final String ACCOUNT_EXISTS = "该账户已存在"; + public static final String ACCOUNT_EXISTS = "璇ヨ处鎴峰凡瀛樺湪"; - public static final String ACCOUNT_NOT_EXISTS = "该账户不存在,请先注册"; + public static final String ACCOUNT_NOT_EXISTS = "璇ヨ处鎴蜂笉瀛樺湪锛岃鍏堟敞鍐�"; - public static final String ACCOUNT_SAVE_FAIL = "用户信息保存失败"; + public static final String ACCOUNT_SAVE_FAIL = "鐢ㄦ埛淇℃伅淇濆瓨澶辫触"; - public static final String LOGIN_FAIL = "账号/密码错误"; + public static final String LOGIN_FAIL = "璐﹀彿/瀵嗙爜閿欒"; - public static final String NOT_BIND_MOBILE = "没有绑定手机"; + public static final String NOT_BIND_MOBILE = "娌℃湁缁戝畾鎵嬫満"; - public static final String IMG_CODE_ERROR = "输入的图形码不正确,请重新输入"; + public static final String IMG_CODE_ERROR = "杈撳叆鐨勫浘褰㈢爜涓嶆纭紝璇烽噸鏂拌緭鍏�"; - public static final String NOT_SET_PAY_PASSWORD = "未设置支付密码"; + public static final String NOT_SET_PAY_PASSWORD = "鏈缃敮浠樺瘑鐮�"; - public static final String PAY_PASSWORD_ERROR = "支付密码错误,请重新输入"; + public static final String PAY_PASSWORD_ERROR = "鏀粯瀵嗙爜閿欒锛岃閲嶆柊杈撳叆"; - public static final String NOT_LOGIN = "请先进行登录"; + public static final String NOT_LOGIN = "璇峰厛杩涜鐧诲綍"; - public static final String MOBILE_EXISTS_ERROR = "该号码已经存在于我们的系统中"; + public static final String MOBILE_EXISTS_ERROR = "璇ュ彿鐮佸凡缁忓瓨鍦ㄤ簬鎴戜滑鐨勭郴缁熶腑"; } diff --git a/projects/fangjia-loan/src/main/java/com/fangjia/loan/model/UserRegJsonModel.java b/projects/fangjia-loan/src/main/java/com/fangjia/loan/model/UserRegJsonModel.java index f54018bfc..03a562387 100644 --- a/projects/fangjia-loan/src/main/java/com/fangjia/loan/model/UserRegJsonModel.java +++ b/projects/fangjia-loan/src/main/java/com/fangjia/loan/model/UserRegJsonModel.java @@ -2,9 +2,9 @@ package com.fangjia.loan.model; import org.sothis.web.mvc.ModelAndViewSupport; /** - * 用户注册返回JSON + * 鐢ㄦ埛娉ㄥ唽杩斿洖JSON * @author yinjihuan - * @date 2016年3月11日 + * @date 2016骞�3鏈�11鏃� * */ public class UserRegJsonModel extends ModelAndViewSupport { diff --git a/projects/fangjia-loan/src/main/java/com/fangjia/loan/util/LoginUtil.java b/projects/fangjia-loan/src/main/java/com/fangjia/loan/util/LoginUtil.java index bd36b1d81..94f732255 100644 --- a/projects/fangjia-loan/src/main/java/com/fangjia/loan/util/LoginUtil.java +++ b/projects/fangjia-loan/src/main/java/com/fangjia/loan/util/LoginUtil.java @@ -44,7 +44,7 @@ public class LoginUtil { } /** - * 管理员是否登录 + * 绠$悊鍛樻槸鍚︾櫥褰� * * @param req * @return diff --git a/projects/fangjia-loan/src/main/java/com/fangjia/loan/util/SourceUtils.java b/projects/fangjia-loan/src/main/java/com/fangjia/loan/util/SourceUtils.java index cc30f2a41..80d65e399 100644 --- a/projects/fangjia-loan/src/main/java/com/fangjia/loan/util/SourceUtils.java +++ b/projects/fangjia-loan/src/main/java/com/fangjia/loan/util/SourceUtils.java @@ -28,10 +28,10 @@ public class SourceUtils { }else if(!isContainsSites(s) && !referer.contains("utm_medium")){ value = "Referral"; }else{ - value = "其它"; + value = "鍏跺畠"; } } else{ - value = "其它"; + value = "鍏跺畠"; } return value; diff --git a/projects/fangjia-open/pom.xml b/projects/fangjia-open/pom.xml index ee70766d4..1bdc6962f 100644 --- a/projects/fangjia-open/pom.xml +++ b/projects/fangjia-open/pom.xml @@ -8,7 +8,7 @@ 0.0.1-SNAPSHOT fangjia-open - GBK + UTF-8 2.2.3 @@ -21,7 +21,7 @@ 1.6 1.6 - GBK + UTF-8 diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/APIConstant.java b/projects/fangjia-open/src/main/java/com/fangjia/open/APIConstant.java index efff4e63f..2f6f15c34 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/APIConstant.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/APIConstant.java @@ -6,74 +6,74 @@ import java.util.Map; import java.util.Set; /** - * GoojiaAPi常量池 + * GoojiaAPi甯搁噺姹� * * @author * */ public class APIConstant { - public static final String OLD_IMPORT_ADDRESS = "/fangjiaApi.html"; // 旧版导入地址 - public static final String ADDHOUSE = "addHouse"; // 添加二手房房源 - public static final String DELETEHOUSE = "deleteHouse"; // 删除二手房房源 - public static final String EDITHOUSE = "editHouse"; // 更新二手房房源 - public static final String REFRESHHOUSE = "refreshHouse"; // 刷新二手房房源 - public static final String ADDRENTHOUSE = "addRentHouse"; // 添加租房房源 - public static final String DELETERENTHOUSE = "deleteRentHouse"; // 删除租房房源 - public static final String EDITRENTHOUSE = "editRentHouse"; // 更新租房房源 - public static final String REFRESRENTHHOUSE = "refreshRentHouse"; // 刷新租房房源 - public static final String FETCHTOKEN = "fetchToken"; // 获取token - public static final Set DIRECTIONS = new HashSet(); // 朝向 - public static final Set FITMENTS = new HashSet(); // 装修 - public static final Set ESTATE_TYPES = new HashSet(); // 建筑类型 - public static final Map DIRECTIONS_ALIAS = new HashMap(); // 朝向别名 - public static final Map FITMENTS_ALIAS = new HashMap(); // 装修别名 - public static final Map ESTATE_TYPES_ALIAS = new HashMap(); // 房源类型别名 - public static final String VALID_MSG_DISTRICT_NOT_FOUND = "该小区不存在"; - /** OpenApi测试账户生成的超级Token*/ + public static final String OLD_IMPORT_ADDRESS = "/fangjiaApi.html"; // 鏃х増瀵煎叆鍦板潃 + public static final String ADDHOUSE = "addHouse"; // 娣诲姞浜屾墜鎴挎埧婧� + public static final String DELETEHOUSE = "deleteHouse"; // 鍒犻櫎浜屾墜鎴挎埧婧� + public static final String EDITHOUSE = "editHouse"; // 鏇存柊浜屾墜鎴挎埧婧� + public static final String REFRESHHOUSE = "refreshHouse"; // 鍒锋柊浜屾墜鎴挎埧婧� + public static final String ADDRENTHOUSE = "addRentHouse"; // 娣诲姞绉熸埧鎴挎簮 + public static final String DELETERENTHOUSE = "deleteRentHouse"; // 鍒犻櫎绉熸埧鎴挎簮 + public static final String EDITRENTHOUSE = "editRentHouse"; // 鏇存柊绉熸埧鎴挎簮 + public static final String REFRESRENTHHOUSE = "refreshRentHouse"; // 鍒锋柊绉熸埧鎴挎簮 + public static final String FETCHTOKEN = "fetchToken"; // 鑾峰彇token + public static final Set DIRECTIONS = new HashSet(); // 鏈濆悜 + public static final Set FITMENTS = new HashSet(); // 瑁呬慨 + public static final Set ESTATE_TYPES = new HashSet(); // 寤虹瓚绫诲瀷 + public static final Map DIRECTIONS_ALIAS = new HashMap(); // 鏈濆悜鍒悕 + public static final Map FITMENTS_ALIAS = new HashMap(); // 瑁呬慨鍒悕 + public static final Map ESTATE_TYPES_ALIAS = new HashMap(); // 鎴挎簮绫诲瀷鍒悕 + public static final String VALID_MSG_DISTRICT_NOT_FOUND = "璇ュ皬鍖轰笉瀛樺湪"; + /** OpenApi娴嬭瘯璐︽埛鐢熸垚鐨勮秴绾oken*/ public static final String SUPER_USER_TOKEN = "F54F52381C49BB9EB4A33EB1B65604AE4B71A28AEE53518A94A2F360408B9056D57553931D15CE6DDE765562DAD286BA38E05A4CDAFC51C3D527A4959BF8E75A3B95DB7108FCEA340DDE61925616DB55118E1851E67D83EAD800460D100D6B667A4ED8EE67C8F7FB"; public static final long SUPER_USER_ID = 1007497l; public static final String IS_RETURN_DATA = "IS_RETURN_DATA"; public static final String API_COST_KEY = "api_cost_key"; - static { // 初始化变量 + static { // 鍒濆鍖栧彉閲� - DIRECTIONS.add("南"); - DIRECTIONS.add("南北"); - DIRECTIONS.add("东南"); - DIRECTIONS.add("西南"); - DIRECTIONS.add("西北"); - DIRECTIONS.add("东北"); - DIRECTIONS.add("东西"); - DIRECTIONS.add("东"); - DIRECTIONS.add("西"); - DIRECTIONS.add("北"); + DIRECTIONS.add("鍗�"); + DIRECTIONS.add("鍗楀寳"); + DIRECTIONS.add("涓滃崡"); + DIRECTIONS.add("瑗垮崡"); + DIRECTIONS.add("瑗垮寳"); + DIRECTIONS.add("涓滃寳"); + DIRECTIONS.add("涓滆タ"); + DIRECTIONS.add("涓�"); + DIRECTIONS.add("瑗�"); + DIRECTIONS.add("鍖�"); - FITMENTS.add("毛坯"); - FITMENTS.add("普通装修"); - FITMENTS.add("精装修"); - FITMENTS.add("豪华装修"); + FITMENTS.add("姣涘澂"); + FITMENTS.add("鏅�氳淇�"); + FITMENTS.add("绮捐淇�"); + FITMENTS.add("璞崕瑁呬慨"); - ESTATE_TYPES.add("多层"); - ESTATE_TYPES.add("小高层"); - ESTATE_TYPES.add("高层"); - ESTATE_TYPES.add("独立别墅"); - ESTATE_TYPES.add("双拼别墅"); - ESTATE_TYPES.add("联体别墅"); - ESTATE_TYPES.add("叠加别墅"); + ESTATE_TYPES.add("澶氬眰"); + ESTATE_TYPES.add("灏忛珮灞�"); + ESTATE_TYPES.add("楂樺眰"); + ESTATE_TYPES.add("鐙珛鍒"); + ESTATE_TYPES.add("鍙屾嫾鍒"); + ESTATE_TYPES.add("鑱斾綋鍒"); + ESTATE_TYPES.add("鍙犲姞鍒"); - DIRECTIONS_ALIAS.put("全朝南", "南"); - DIRECTIONS_ALIAS.put("南北通", "南北"); + DIRECTIONS_ALIAS.put("鍏ㄦ湞鍗�", "鍗�"); + DIRECTIONS_ALIAS.put("鍗楀寳閫�", "鍗楀寳"); - FITMENTS_ALIAS.put("精装", "精装修"); - FITMENTS_ALIAS.put("中装", "普通装修"); - FITMENTS_ALIAS.put("简装", "普通装修"); - FITMENTS_ALIAS.put("普装", "普通装修"); - FITMENTS_ALIAS.put("豪装", "豪华装修"); + FITMENTS_ALIAS.put("绮捐", "绮捐淇�"); + FITMENTS_ALIAS.put("涓", "鏅�氳淇�"); + FITMENTS_ALIAS.put("绠�瑁�", "鏅�氳淇�"); + FITMENTS_ALIAS.put("鏅", "鏅�氳淇�"); + FITMENTS_ALIAS.put("璞", "璞崕瑁呬慨"); - ESTATE_TYPES_ALIAS.put("别墅", "独立别墅"); - ESTATE_TYPES_ALIAS.put("联排别墅", "联体别墅"); - ESTATE_TYPES_ALIAS.put("独立式别墅", "独立别墅"); + ESTATE_TYPES_ALIAS.put("鍒", "鐙珛鍒"); + ESTATE_TYPES_ALIAS.put("鑱旀帓鍒", "鑱斾綋鍒"); + ESTATE_TYPES_ALIAS.put("鐙珛寮忓埆澧�", "鐙珛鍒"); } } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/FangjiaApiUtil.java b/projects/fangjia-open/src/main/java/com/fangjia/open/FangjiaApiUtil.java index 350fb3c38..bd03240f2 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/FangjiaApiUtil.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/FangjiaApiUtil.java @@ -20,8 +20,8 @@ import java.util.Map; public class FangjiaApiUtil { - private static String SECRETKEY_EXTRA = "I LOVE FANGJIA"; // 房价API密钥附加码 - private static int MD5_LENGTH = 32; // MD5字符串长度 + private static String SECRETKEY_EXTRA = "I LOVE FANGJIA"; // 鎴夸环API瀵嗛挜闄勫姞鐮� + private static int MD5_LENGTH = 32; // MD5瀛楃涓查暱搴� private static final String MODE = "AES"; private static String DEFAULT_CHARSET = "UTF-8"; @@ -41,13 +41,13 @@ public class FangjiaApiUtil { } public static String decrypt(String key, String encrypt){ - //解密 - Cipher cp; //创建密码器 + //瑙e瘑 + Cipher cp; //鍒涘缓瀵嗙爜鍣� try { cp = Cipher.getInstance(MODE); Key k = new SecretKeySpec(Base64.decodeBase64(key), "AES"); - cp.init(Cipher.DECRYPT_MODE, k); //初始化 - byte [] ptext = cp.doFinal(Base64.decodeBase64(encrypt)); //解密 + cp.init(Cipher.DECRYPT_MODE, k); //鍒濆鍖� + byte [] ptext = cp.doFinal(Base64.decodeBase64(encrypt)); //瑙e瘑 return new String(ptext, "UTF-8"); } catch (NoSuchAlgorithmException e) { e.printStackTrace(); @@ -67,20 +67,20 @@ public class FangjiaApiUtil { /** - * 通过秘钥对明文加密 - * @param key 秘钥 - * @param text 待加密字符串 + * 閫氳繃绉橀挜瀵规槑鏂囧姞瀵� + * @param key 绉橀挜 + * @param text 寰呭姞瀵嗗瓧绗︿覆 * @return */ public static String encrypt(String key, String text){ Cipher cp; try { cp = Cipher.getInstance(MODE); - //创建密码器 + //鍒涘缓瀵嗙爜鍣� Key k = new SecretKeySpec(Base64.decodeBase64(key), "AES"); - cp.init(Cipher.ENCRYPT_MODE, k); //初始化 + cp.init(Cipher.ENCRYPT_MODE, k); //鍒濆鍖� byte [] ptext = text.getBytes("UTF-8"); - byte [] ctext = cp.doFinal(ptext); //加密 + byte [] ctext = cp.doFinal(ptext); //鍔犲瘑 return URLEncoder.encode(Base64.encodeBase64String(ctext), "UTF-8"); } catch (NoSuchAlgorithmException e) { e.printStackTrace(); @@ -98,7 +98,7 @@ public class FangjiaApiUtil { return null; } /** - * 生成用户的token + * 鐢熸垚鐢ㄦ埛鐨則oken * * @param userid * @param appKey @@ -121,7 +121,7 @@ public class FangjiaApiUtil { } /** - * 解析token + * 瑙f瀽token * * @param token * @return @@ -130,15 +130,15 @@ public class FangjiaApiUtil { int postfix_length = MD5_LENGTH; Map tokenMap = new HashMap(); if (StringUtils.isBlank(token) || token.length() <= postfix_length) { - return null;// token为空或长度小于md5验证码长度 + return null;// token涓虹┖鎴栭暱搴﹀皬浜巑d5楠岃瘉鐮侀暱搴� } - String validate = token.substring(token.length() - postfix_length, token.length());// 后面加上的验证md5字段 + String validate = token.substring(token.length() - postfix_length, token.length());// 鍚庨潰鍔犱笂鐨勯獙璇乵d5瀛楁 token = token.substring(0, token.length() - postfix_length); - String md5_validate = DigestUtils.md5Hex(token + SECRETKEY_EXTRA).toUpperCase();// 转为大写后验证 + String md5_validate = DigestUtils.md5Hex(token + SECRETKEY_EXTRA).toUpperCase();// 杞负澶у啓鍚庨獙璇� if (!validate.equals(md5_validate)) { - return null;// 后面的md5附加验证码验证未通过 + return null;// 鍚庨潰鐨刴d5闄勫姞楠岃瘉鐮侀獙璇佹湭閫氳繃 } String decodeString = SecurityUtil.decode(token); @@ -154,7 +154,7 @@ public class FangjiaApiUtil { } /** - * token 字符串转换成Token对象 + * token 瀛楃涓茶浆鎹㈡垚Token瀵硅薄 * * @param token * @return @@ -178,7 +178,7 @@ public class FangjiaApiUtil { } /** - * 解析旧版token + * 瑙f瀽鏃х増token * * @param token * @return @@ -207,7 +207,7 @@ public class FangjiaApiUtil { // String key = generatorKey(); String key = "ICtJ7pnddIiN6iDDdYAi7mUXVkPK5ZhZwPBR+Ng8vGo="; - String encrypt = encrypt(key, "city=杭州&district=富阳&name=迎宾花园"); + String encrypt = encrypt(key, "city=鏉窞&district=瀵岄槼&name=杩庡鑺卞洯"); System.out.println("key:" + key); System.out.println("encrypt:" + encrypt); System.out.println(decrypt(key, URLDecoder.decode(encrypt, "UTF-8"))); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/HttpCode.java b/projects/fangjia-open/src/main/java/com/fangjia/open/HttpCode.java index 62da1560b..c0bc21fb8 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/HttpCode.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/HttpCode.java @@ -21,7 +21,7 @@ public class HttpCode { } /** - * 判断错误代码是否相同 + * 鍒ゆ柇閿欒浠g爜鏄惁鐩稿悓 * * @param httpCode * @return diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/HttpStatusCodeEnum.java b/projects/fangjia-open/src/main/java/com/fangjia/open/HttpStatusCodeEnum.java index a20704090..de906a9f7 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/HttpStatusCodeEnum.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/HttpStatusCodeEnum.java @@ -3,13 +3,13 @@ package com.fangjia.open; public enum HttpStatusCodeEnum { OK(200,"ok"), - BAD_REQUEST(400,"请求参数错误"), - BAD_REQUEST_ERROR_KEY(4001,"没有申请私钥"), - BAD_REQUEST_DECRYPT_ERROR(4002,"加密参数解密失败"), - UN_AUTHORIZED(401,"请求未被授权"), - SERVER_ERROR(500,"服务器内部错误"), - SERVER_FORBID(403,"请求频繁"), - UPGRADE(503,"服务升级中"); + BAD_REQUEST(400,"璇锋眰鍙傛暟閿欒"), + BAD_REQUEST_ERROR_KEY(4001,"娌℃湁鐢宠绉侀挜"), + BAD_REQUEST_DECRYPT_ERROR(4002,"鍔犲瘑鍙傛暟瑙e瘑澶辫触"), + UN_AUTHORIZED(401,"璇锋眰鏈鎺堟潈"), + SERVER_ERROR(500,"鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�"), + SERVER_FORBID(403,"璇锋眰棰戠箒"), + UPGRADE(503,"鏈嶅姟鍗囩骇涓�"); private final int code; private final String msg; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/OpenConfig.java b/projects/fangjia-open/src/main/java/com/fangjia/open/OpenConfig.java index c13a28b36..401e7c165 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/OpenConfig.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/OpenConfig.java @@ -18,19 +18,19 @@ public class OpenConfig extends Configuration { private final String staticDomainName; private final String openDomainName; /** - * 房源点击过滤ip + * 鎴挎簮鐐瑰嚮杩囨护ip */ private final String houseClickFilterIps; /** - * 估价点击日志过滤ip + * 浼颁环鐐瑰嚮鏃ュ織杩囨护ip */ private final String gujiaClickFilterIps; /** - * 最大页数 + * 鏈�澶ч〉鏁� */ private final int searchListMaxPageNo; /** - * 每页最大条数 + * 姣忛〉鏈�澶ф潯鏁� */ private final int searchListMaxPageSize; @@ -125,7 +125,7 @@ public class OpenConfig extends Configuration { } /** - * 是否开放所有权限 + * 鏄惁寮�鏀炬墍鏈夋潈闄� * @return */ public boolean isOpenAllAuthority() { diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/OpenHttpCodeEnum.java b/projects/fangjia-open/src/main/java/com/fangjia/open/OpenHttpCodeEnum.java index 6f4462ab6..610e2c34f 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/OpenHttpCodeEnum.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/OpenHttpCodeEnum.java @@ -4,44 +4,44 @@ public enum OpenHttpCodeEnum { /** * 200 */ - OK(200, "OK", 200, "执行成功"), + OK(200, "OK", 200, "鎵ц鎴愬姛"), /** * 300 */ - UPPER_LIMIT(306, "已达到配额上限", 3006, "已达到配额上限"), + UPPER_LIMIT(306, "宸茶揪鍒伴厤棰濅笂闄�", 3006, "宸茶揪鍒伴厤棰濅笂闄�"), /** * 400 */ - TARGET_DATA_NOT_EXIST(400, "请求数据不合法", 4001, "目标数据不存在"), - ARGUMENT_LOSE(400, "请求数据不合法", 4002, "请求参数缺失"), - ARGUMENT_INVALID(400, "请求数据不合法", 4003, "请求参数不符合规范"), + TARGET_DATA_NOT_EXIST(400, "璇锋眰鏁版嵁涓嶅悎娉�", 4001, "鐩爣鏁版嵁涓嶅瓨鍦�"), + ARGUMENT_LOSE(400, "璇锋眰鏁版嵁涓嶅悎娉�", 4002, "璇锋眰鍙傛暟缂哄け"), + ARGUMENT_INVALID(400, "璇锋眰鏁版嵁涓嶅悎娉�", 4003, "璇锋眰鍙傛暟涓嶇鍚堣鑼�"), /** * 404 */ - NOT_FOUND(404, "请求的接口不存在", 404, "请求的接口不存在"), + NOT_FOUND(404, "璇锋眰鐨勬帴鍙d笉瀛樺湪", 404, "璇锋眰鐨勬帴鍙d笉瀛樺湪"), /** * 500 */ - SERVER_ERROR(500, "服务器内部错误", 500, "服务器内部错误"), REQUEST_ERROR(5001, "请求方式错误", 5001, "请求方式错误"), + SERVER_ERROR(500, "鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�", 500, "鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�"), REQUEST_ERROR(5001, "璇锋眰鏂瑰紡閿欒", 5001, "璇锋眰鏂瑰紡閿欒"), /** * 502 */ - BAD_GATEWAY(502, "接口关闭或正在升级", 502, "接口关闭或正在升级"), + BAD_GATEWAY(502, "鎺ュ彛鍏抽棴鎴栨鍦ㄥ崌绾�", 502, "鎺ュ彛鍏抽棴鎴栨鍦ㄥ崌绾�"), /** * 503 */ - SERVICE_UNAVAILABLE(503, "服务端资源不可用", 503, "服务端资源不可用"), + SERVICE_UNAVAILABLE(503, "鏈嶅姟绔祫婧愪笉鍙敤", 503, "鏈嶅姟绔祫婧愪笉鍙敤"), /** * 403 */ - AUTH_FAILD(403, "没有权限访问对应的资源", 40302, "认证失败"), - PASSWORD_ERROR(403, "没有权限访问对应的资源", 40309, "密码不正确"), - PERMISSION_DENIED(403, "没有权限访问对应的资源", 40314, "该资源需要拥有更高级的授权"), - TOKEN_EXPIRED(403, "token过期,请重新获取token", 40315, "认证失败"), - SERVICE_EXPIRED(403, "服务已过期", 40316, "认证失败"), - USER_EXPIRED(403, "账号已过期", 40316, "认证失败"); + AUTH_FAILD(403, "娌℃湁鏉冮檺璁块棶瀵瑰簲鐨勮祫婧�", 40302, "璁よ瘉澶辫触"), + PASSWORD_ERROR(403, "娌℃湁鏉冮檺璁块棶瀵瑰簲鐨勮祫婧�", 40309, "瀵嗙爜涓嶆纭�"), + PERMISSION_DENIED(403, "娌℃湁鏉冮檺璁块棶瀵瑰簲鐨勮祫婧�", 40314, "璇ヨ祫婧愰渶瑕佹嫢鏈夋洿楂樼骇鐨勬巿鏉�"), + TOKEN_EXPIRED(403, "token杩囨湡,璇烽噸鏂拌幏鍙杢oken", 40315, "璁よ瘉澶辫触"), + SERVICE_EXPIRED(403, "鏈嶅姟宸茶繃鏈�", 40316, "璁よ瘉澶辫触"), + USER_EXPIRED(403, "璐﹀彿宸茶繃鏈�", 40316, "璁よ瘉澶辫触"); private final int code; private final String message; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/OpenUrlMapper.java b/projects/fangjia-open/src/main/java/com/fangjia/open/OpenUrlMapper.java index 9b9977b2a..73b897cad 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/OpenUrlMapper.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/OpenUrlMapper.java @@ -55,7 +55,7 @@ public class OpenUrlMapper extends DefaultActionMapper { } /** - * 判断url是否为旧版房源导入url,若是则返回对应的处理Action链接 + * 鍒ゆ柇url鏄惁涓烘棫鐗堟埧婧愬鍏rl,鑻ユ槸鍒欒繑鍥炲搴旂殑澶勭悊Action閾炬帴 * * @param url * @param request @@ -68,25 +68,25 @@ public class OpenUrlMapper extends DefaultActionMapper { String method = request.getParameter("method"); if (StringUtils.isNotBlank(method)) { if (method.equals(APIConstant.ADDHOUSE) || method.equals(APIConstant.EDITHOUSE)) { - // 添加或更新二手房 + // 娣诲姞鎴栨洿鏂颁簩鎵嬫埧 return "/sellHouse/" + APIConstant.ADDHOUSE; } else if (method.equals(APIConstant.DELETEHOUSE)) { - // 删除二手房 + // 鍒犻櫎浜屾墜鎴� return "/sellHouse/" + APIConstant.DELETEHOUSE; } else if (method.equals(APIConstant.REFRESHHOUSE)) { - // 删除二手房 + // 鍒犻櫎浜屾墜鎴� return "/sellHouse/" + APIConstant.REFRESHHOUSE; } else if (method.equals(APIConstant.ADDRENTHOUSE) || method.equals(APIConstant.EDITRENTHOUSE)) { - // 添加或更新租房 + // 娣诲姞鎴栨洿鏂扮鎴� return "/rentHouse/" + APIConstant.ADDRENTHOUSE; } else if (method.equals(APIConstant.DELETERENTHOUSE)) { - // 删除租房 + // 鍒犻櫎绉熸埧 return "/rentHouse/" + APIConstant.DELETERENTHOUSE; } else if (method.equals(APIConstant.REFRESRENTHHOUSE)) { - // 删除租房 + // 鍒犻櫎绉熸埧 return "/rentHouse/" + APIConstant.REFRESRENTHHOUSE; } else if (method.equals(APIConstant.FETCHTOKEN)) { - // 获取token + // 鑾峰彇token return "/" + APIConstant.FETCHTOKEN + "Old"; } } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AaController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AaController.java index d83085e01..ce11d95e3 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AaController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AaController.java @@ -22,16 +22,16 @@ public class AaController { private AddressModeParserChain addressModeParserChain; public Object pickAction() throws Exception { - File file = new File("C:\\Users\\yk\\Desktop\\yongjia\\test\\上海-0730.txt"); - File file2 = new File("C:\\Users\\yk\\Desktop\\yongjia\\test\\上海-0730_picker.txt"); + File file = new File("C:\\Users\\yk\\Desktop\\yongjia\\test\\涓婃捣-0730.txt"); + File file2 = new File("C:\\Users\\yk\\Desktop\\yongjia\\test\\涓婃捣-0730_picker.txt"); if (file2.exists()) { file2.delete(); } - BufferedWriter fw = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file2, true), "GBK")); // 指定编码格式,以免读取时中文字符异常 + BufferedWriter fw = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file2, true), "GBK")); // 鎸囧畾缂栫爜鏍煎紡锛屼互鍏嶈鍙栨椂涓枃瀛楃寮傚父 - // 全部写入缓存中的内容 + // 鍏ㄩ儴鍐欏叆缂撳瓨涓殑鍐呭 - InputStreamReader read = new InputStreamReader(new FileInputStream(file), "utf-8");// 考虑到编码格式 + InputStreamReader read = new InputStreamReader(new FileInputStream(file), "utf-8");// 鑰冭檻鍒扮紪鐮佹牸寮� BufferedReader bufferedReader = new BufferedReader(read); String lineTxt = null; while ((lineTxt = bufferedReader.readLine()) != null) { @@ -42,7 +42,7 @@ public class AaController { List tokens = CnAddressTokenizer.tokenizer(lineTxt); addressPickerChain.doPick(tokens, ret); - // parserChain.doParse("上海", lineTxt, ret); + // parserChain.doParse("涓婃捣", lineTxt, ret); ret.remove(AddressAnalyseResultKeyEnum.orgAddress.name()); // ret.remove(AddressAnalyseResultKeyEnum.shortAddress.name()); @@ -64,16 +64,16 @@ public class AaController { } public Object parseAction() throws Exception { - File file = new File("C:\\Users\\yk\\Desktop\\yongjia\\test\\上海-0730.txt"); - File file2 = new File("C:\\Users\\yk\\Desktop\\yongjia\\test\\上海-0730_parser.txt"); + File file = new File("C:\\Users\\yk\\Desktop\\yongjia\\test\\涓婃捣-0730.txt"); + File file2 = new File("C:\\Users\\yk\\Desktop\\yongjia\\test\\涓婃捣-0730_parser.txt"); if (file2.exists()) { file2.delete(); } - BufferedWriter fw = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file2, true), "GBK")); // 指定编码格式,以免读取时中文字符异常 + BufferedWriter fw = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file2, true), "GBK")); // 鎸囧畾缂栫爜鏍煎紡锛屼互鍏嶈鍙栨椂涓枃瀛楃寮傚父 - // 全部写入缓存中的内容 + // 鍏ㄩ儴鍐欏叆缂撳瓨涓殑鍐呭 - InputStreamReader read = new InputStreamReader(new FileInputStream(file), "utf-8");// 考虑到编码格式 + InputStreamReader read = new InputStreamReader(new FileInputStream(file), "utf-8");// 鑰冭檻鍒扮紪鐮佹牸寮� BufferedReader bufferedReader = new BufferedReader(read); String lineTxt = null; while ((lineTxt = bufferedReader.readLine()) != null) { @@ -81,7 +81,7 @@ public class AaController { ret.put(AddressAnalyseResultKeyEnum.orgAddress.name(), lineTxt); System.out.println(lineTxt); - addressModeParserChain.doParse("上海", lineTxt, ret); + addressModeParserChain.doParse("涓婃捣", lineTxt, ret); ret.remove(AddressAnalyseResultKeyEnum.orgAddress.name()); ret.remove(AddressAnalyseResultKeyEnum.shortAddress.name()); 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 3174945c7..807eb81c8 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 @@ -51,7 +51,7 @@ import java.nio.charset.Charset; import java.util.*; /** - * 地址治理 + * 鍦板潃娌荤悊 * * @author shenjian * @since 2023/5/25 @@ -66,7 +66,7 @@ public class AddrSvcController { private TownshipService townshipService; /** - * 地址结构化 + * 鍦板潃缁撴瀯鍖� * * @param model * @return @@ -75,7 +75,7 @@ public class AddrSvcController { RestfulModelAndView mav = new RestfulModelAndView(); if (StringUtils.isBlank(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍦板潃涓嶈兘涓虹┖")); return mav; } @@ -98,17 +98,17 @@ public class AddrSvcController { } mav.setModel(basicModel); } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("鏈嶅姟鍗囩骇涓�...")); } } catch (Exception e) { e.printStackTrace(); - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("鏈嶅姟鍗囩骇涓�...")); } return mav; } /** - * 区划识别接口 + * 鍖哄垝璇嗗埆鎺ュ彛 * * @param model * @return @@ -117,7 +117,7 @@ public class AddrSvcController { RestfulModelAndView mav = new RestfulModelAndView(); if (StringUtils.isBlank(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍦板潃涓嶈兘涓虹┖")); return mav; } @@ -151,11 +151,11 @@ public class AddrSvcController { } mav.setModel(basicModel); } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("鏈嶅姟鍗囩骇涓�...")); } } catch (Exception e) { e.printStackTrace(); - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("鏈嶅姟鍗囩骇涓�...")); } @@ -163,13 +163,13 @@ public class AddrSvcController { } /** - * 地址补全 + * 鍦板潃琛ュ叏 */ public Object completeAction(AddesssMatchModel model) { RestfulModelAndView mav = new RestfulModelAndView(); if (StringUtils.isBlank(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍦板潃涓嶈兘涓虹┖")); return mav; } @@ -209,23 +209,23 @@ public class AddrSvcController { } mav.setModel(basicModel); } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("鏈嶅姟鍗囩骇涓�...")); } } catch (Exception e) { e.printStackTrace(); - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("鏈嶅姟鍗囩骇涓�...")); } return mav; } /** - * 地址验证 + * 鍦板潃楠岃瘉 */ public Object addrVerifyAction(AddesssMatchModel model) { RestfulModelAndView mav = new RestfulModelAndView(); if (StringUtils.isBlank(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍦板潃涓嶈兘涓虹┖")); return mav; } @@ -245,23 +245,23 @@ public class AddrSvcController { } mav.setModel(basicModel); } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("鏈嶅姟鍗囩骇涓�...")); } } catch (Exception e) { e.printStackTrace(); - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("鏈嶅姟鍗囩骇涓�...")); } return mav; } /** - * 地址匹配 + * 鍦板潃鍖归厤 */ public Object matchAction(AddesssMatchModel model) throws Exception { RestfulModelAndView mav = new RestfulModelAndView(); if (StringUtils.isBlank(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍦板潃涓嶈兘涓虹┖")); return mav; } @@ -273,11 +273,11 @@ public class AddrSvcController { params.put("category", model.getCategory()); params.put("district", model.getSuggestDistrict()); try { - //新匹配接口 + //鏂板尮閰嶆帴鍙� json = request.getJsonContent("http://192.168.0.100:32080/FangJiaNlpService/match", params, "UTF-8"); BasicModel basicModel = new BasicModel(200, "ok"); if (json != null && json.size() > 0) { - // 非超级用户不返回置信度 + // 闈炶秴绾х敤鎴蜂笉杩斿洖缃俊搴� if (json.containsKey("credit") && !APIConstant.SUPER_USER_TOKEN.equals(model.getToken())) { json.remove("credit"); } @@ -286,7 +286,7 @@ public class AddrSvcController { mav.setModel(basicModel); } catch (Exception e) { e.printStackTrace(); - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("鏈嶅姟鍗囩骇涓�...")); } @@ -294,18 +294,18 @@ public class AddrSvcController { } /** - * 地址联想 + * 鍦板潃鑱旀兂 */ public Object suggestionAction(AddressModel model) { RestfulModelAndView mav = new RestfulModelAndView(); - // 城市改为非必填 + // 鍩庡競鏀逛负闈炲繀濉� // if (StringUtils.isBlank(model.getCity())) { -// mav.setModel(BasicModel.buildBadRequestModel("城市不能为空")); +// mav.setModel(BasicModel.buildBadRequestModel("鍩庡競涓嶈兘涓虹┖")); // return mav; // } if (StringUtils.isBlank(model.getKeywords())) { - mav.setModel(BasicModel.buildBadRequestModel("关键字不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍏抽敭瀛椾笉鑳戒负绌�")); return mav; } @@ -331,23 +331,23 @@ public class AddrSvcController { } mav.setModel(basicModel); } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("鏈嶅姟鍗囩骇涓�...")); } } catch (Exception e) { e.printStackTrace(); - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("鏈嶅姟鍗囩骇涓�...")); } return mav; } /** - * 地址联想 + * 鍦板潃鑱旀兂 */ public Object tipsAction(AddressModel model) { RestfulModelAndView mav = new RestfulModelAndView(); if (StringUtils.isBlank(model.getKeywords())) { - mav.setModel(BasicModel.buildBadRequestModel("搜索关键字不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鎼滅储鍏抽敭瀛椾笉鑳戒负绌�")); return mav; } @@ -371,11 +371,11 @@ public class AddrSvcController { } mav.setModel(basicModel); } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("鏈嶅姟鍗囩骇涓�...")); } } catch (Exception e) { e.printStackTrace(); - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("鏈嶅姟鍗囩骇涓�...")); } return mav; } @@ -383,7 +383,7 @@ public class AddrSvcController { public Object avgPriceAction(AddressModel model) { RestfulModelAndView mav = new RestfulModelAndView(); if (StringUtils.isBlank(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍦板潃涓嶈兘涓虹┖")); return mav; } @@ -394,9 +394,9 @@ public class AddrSvcController { params.put("address", model.getAddress()); params.put("category", model.getCategory()); params.put("useMap", String.valueOf(model.isUseMap())); -// params.put("district", model.getSuggestDistrict());//接口没有此参数 +// params.put("district", model.getSuggestDistrict());//鎺ュ彛娌℃湁姝ゅ弬鏁� try { - //新匹配接口 + //鏂板尮閰嶆帴鍙� json = request.getJsonContent("http://192.168.0.100:32080/FangJiaNlpService/match", params, "UTF-8"); BasicModel basicModel = new BasicModel(200, "ok"); if (json != null && json.size() > 0) { @@ -427,14 +427,14 @@ public class AddrSvcController { mav.setModel(basicModel); } catch (Exception e) { e.printStackTrace(); - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("鏈嶅姟鍗囩骇涓�...")); } return mav; } /** - * 五级地址标准化 + * 浜旂骇鍦板潃鏍囧噯鍖� * * @param model * @return @@ -443,7 +443,7 @@ public class AddrSvcController { RestfulModelAndView mav = new RestfulModelAndView(); if (StringUtils.isBlank(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍦板潃涓嶈兘涓虹┖")); return mav; } @@ -453,7 +453,7 @@ public class AddrSvcController { params.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : null); params.put("refCity", StringUtils.isNotBlank(model.getRefCity()) ? model.getRefCity() : null); params.put("address", model.getAddress()); - // 默认不输出省市区的代码 + // 榛樿涓嶈緭鍑虹渷甯傚尯鐨勪唬鐮� params.put("showCode", StringUtils.isNotBlank(model.getShowCode()) ? model.getShowCode() : "0"); params.put("complete", "true"); params.put("addressAssessment", "true"); @@ -476,13 +476,13 @@ public class AddrSvcController { } mav.setModel(basicModel); } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("鏈嶅姟鍗囩骇涓�...")); } return mav; } /** - * 楼盘价值识别接口 + * 妤肩洏浠峰�艰瘑鍒帴鍙� * * @param model * @return @@ -490,7 +490,7 @@ public class AddrSvcController { public Object valueRateAction(AddesssMatchModel model) { RestfulModelAndView mav = new RestfulModelAndView(); if (StringUtils.isBlank(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍦板潃涓嶈兘涓虹┖")); return mav; } @@ -518,7 +518,7 @@ public class AddrSvcController { } mav.setModel(basicModel); } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("鏈嶅姟鍗囩骇涓�...")); } return mav; @@ -526,19 +526,19 @@ public class AddrSvcController { private static final Map areaMap = new HashMap() { { - // 添加键值对到 Map 中 - put("111", "主城区"); - put("112", "城乡结合区"); - put("121", "镇中心区"); - put("122", "镇乡结合区"); - put("123", "特殊区域"); - put("210", "乡中心区"); - put("220", "村庄"); + // 娣诲姞閿�煎鍒� Map 涓� + put("111", "涓诲煄鍖�"); + put("112", "鍩庝埂缁撳悎鍖�"); + put("121", "闀囦腑蹇冨尯"); + put("122", "闀囦埂缁撳悎鍖�"); + put("123", "鐗规畩鍖哄煙"); + put("210", "涔′腑蹇冨尯"); + put("220", "鏉戝簞"); } }; /** - * 涉农识别-新规则-南京银行 + * 娑夊啘璇嗗埆-鏂拌鍒�-鍗椾含閾惰 * * @param model * @return @@ -547,7 +547,7 @@ public class AddrSvcController { RestfulModelAndView mav = new RestfulModelAndView(); if (StringUtils.isBlank(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍦板潃涓嶈兘涓虹┖")); return mav; } @@ -574,7 +574,7 @@ public class AddrSvcController { String msg = json.getString("msg"); BasicModel basicModel = new BasicModel(code, msg); if (json.containsKey("result")) { - //我们的结果 + //鎴戜滑鐨勭粨鏋� JSONObject result = json.getJSONObject("result"); if (result.containsKey("devDistrictName") && StringUtils.isNotBlank(result.get("devDistrictName").toString())) { // basicModel.setResult(result); @@ -585,41 +585,41 @@ public class AddrSvcController { basicModel.setResult(result); - //我们省级及以上有开发区,直接用我们的结果 + //鎴戜滑鐪佺骇鍙婁互涓婃湁寮�鍙戝尯锛岀洿鎺ョ敤鎴戜滑鐨勭粨鏋� /*if (result.containsKey("devDistrictName")) { basicModel.setResult(result); - } else if (!"2".equals(type)) { // 对私的不用齐梁 + } else if (!"2".equals(type)) { // 瀵圭鐨勪笉鐢ㄩ綈姊� basicModel.setResult(result); }else { try { - //如果是江苏省或者浙江省 调用齐梁的结果 - if (result.containsKey("province") && ("中国".equals(result.getString("province")))) { - //结果比较,如果涉农结果不一致 - //调用齐梁 type :1 对公 0 对私 - //我们 type :1 对私 2 对共 + //濡傛灉鏄睙鑻忕渷鎴栬�呮禉姹熺渷 璋冪敤榻愭鐨勭粨鏋� + if (result.containsKey("province") && ("涓浗".equals(result.getString("province")))) { + //缁撴灉姣旇緝锛屽鏋滄秹鍐滅粨鏋滀笉涓�鑷� + //璋冪敤榻愭 type 锛�1 瀵瑰叕 0 瀵圭 + //鎴戜滑 type 锛�1 瀵圭 2 瀵瑰叡 String qltype = "2".equals(type) ? "1" : "0"; Map map = senRequest(address, qltype); - // 涉农结果不一样 + // 娑夊啘缁撴灉涓嶄竴鏍� if (!map.get("verifyFlag").equals(result.get("verifyFlag"))) { - // 齐梁县政府但是涉农为农,取我们的结果 扬中市三茅街道中华村永固河路1号 - if ("是".equals(map.get("countyGov")) && "农".equals(map.get("verifyFlag"))) { + // 榻愭鍘挎斂搴滀絾鏄秹鍐滀负鍐滐紝鍙栨垜浠殑缁撴灉 鎵腑甯備笁鑼呰閬撲腑鍗庢潙姘稿浐娌宠矾1鍙� + if ("鏄�".equals(map.get("countyGov")) && "鍐�".equals(map.get("verifyFlag"))) { basicModel.setResult(result); mav.setModel(basicModel); return mav; } - //城市不一样 用我们 + //鍩庡競涓嶄竴鏍� 鐢ㄦ垜浠� if (result.containsKey("city")) { if ((!result.get("city").equals(map.get("city")) && StringUtils.isNotBlank(result.getString("city")))) { basicModel.setResult(result); } else { - map.put("addrVerify", "地址有效"); + map.put("addrVerify", "鍦板潃鏈夋晥"); map.put("typeName", areaMap.get(map.get("typeCode"))); map.put("addrArea", addrArea(map, type)); map.put("countyLevelCity", countyLevelCity(map)); basicModel.setResult(map); } } else { - map.put("addrVerify", "地址有效"); + map.put("addrVerify", "鍦板潃鏈夋晥"); map.put("typeName", areaMap.get(map.get("typeCode"))); map.put("addrArea", addrArea(map, type)); map.put("countyLevelCity", countyLevelCity(map)); @@ -645,29 +645,29 @@ public class AddrSvcController { } mav.setModel(basicModel); } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("鏈嶅姟鍗囩骇涓�...")); } return mav; } /** - * 判断县级市 + * 鍒ゆ柇鍘跨骇甯� */ public String countyLevelCity(Map map) { if (map.get("city") == null) { return ""; } - if (map.get("city").endsWith("区")) { - return "否"; + if (map.get("city").endsWith("鍖�")) { + return "鍚�"; } - if (map.get("city").equals("东莞市") || map.get("city").equals("嘉峪关市") || map.get("city").equals("中山市") || map.get("city").equals("儋州市")) { - return "否"; + if (map.get("city").equals("涓滆帪甯�") || map.get("city").equals("鍢夊唱鍏冲競") || map.get("city").equals("涓北甯�") || map.get("city").equals("鍎嬪窞甯�")) { + return "鍚�"; } - return "是"; + return "鏄�"; } /** - * 判断所属区域 + * 鍒ゆ柇鎵�灞炲尯鍩� * * @param map * @return @@ -676,20 +676,20 @@ public class AddrSvcController { if (map.get("verifyFlag") == null) { return ""; } - if (map.get("verifyFlag").equals("非农")) { - return "城市区域"; + if (map.get("verifyFlag").equals("闈炲啘")) { + return "鍩庡競鍖哄煙"; } - if (map.get("verifyFlag").equals("农")) { - return "农村区域"; + if (map.get("verifyFlag").equals("鍐�")) { + return "鍐滄潙鍖哄煙"; } - if ("2".equals(type) && "是".equals(map.get("countyGov"))) { - return "县城城区"; + if ("2".equals(type) && "鏄�".equals(map.get("countyGov"))) { + return "鍘垮煄鍩庡尯"; } return ""; } /** - * 涉农识别-新规则-上海征信 + * 娑夊啘璇嗗埆-鏂拌鍒�-涓婃捣寰佷俊 * * @param model * @return @@ -698,7 +698,7 @@ public class AddrSvcController { RestfulModelAndView mav = new RestfulModelAndView(); if (StringUtils.isBlank(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍦板潃涓嶈兘涓虹┖")); return mav; } @@ -725,44 +725,44 @@ public class AddrSvcController { String msg = json.getString("msg"); BasicModel basicModel = new BasicModel(code, msg); if (json.containsKey("result")) { - //我们的结果 + //鎴戜滑鐨勭粨鏋� JSONObject result = json.getJSONObject("result"); - //我们省级及以上有开发区,直接用我们的结果 + //鎴戜滑鐪佺骇鍙婁互涓婃湁寮�鍙戝尯锛岀洿鎺ョ敤鎴戜滑鐨勭粨鏋� if (result.containsKey("devDistrictName")) { basicModel.setResult(result); - } else if (!"2".equals(type)) { // 对私的不用齐梁 + } else if (!"2".equals(type)) { // 瀵圭鐨勪笉鐢ㄩ綈姊� basicModel.setResult(result); } else { try { - //如果是江苏省或者浙江省 调用齐梁的结果 -// if ("江苏省".equals(result.getString("province")) || "浙江省".equals(result.getString("province"))) { - if (result.containsKey("province") && ("中国".equals(result.getString("province")))) { - //结果比较,如果涉农结果不一致 - //调用齐梁 type :1 对公 0 对私 - //我们 type :1 对私 2 对共 + //濡傛灉鏄睙鑻忕渷鎴栬�呮禉姹熺渷 璋冪敤榻愭鐨勭粨鏋� +// if ("姹熻嫃鐪�".equals(result.getString("province")) || "娴欐睙鐪�".equals(result.getString("province"))) { + if (result.containsKey("province") && ("涓浗".equals(result.getString("province")))) { + //缁撴灉姣旇緝锛屽鏋滄秹鍐滅粨鏋滀笉涓�鑷� + //璋冪敤榻愭 type 锛�1 瀵瑰叕 0 瀵圭 + //鎴戜滑 type 锛�1 瀵圭 2 瀵瑰叡 String qltype = "2".equals(type) ? "1" : "0"; Map map = senRequest(address, qltype); - // 涉农结果不一样 + // 娑夊啘缁撴灉涓嶄竴鏍� if (!map.get("verifyFlag").equals(result.get("verifyFlag"))) { - // 齐梁县政府但是涉农为农,取我们的结果 扬中市三茅街道中华村永固河路1号 - if ("是".equals(map.get("countyGov")) && "农".equals(map.get("verifyFlag"))) { + // 榻愭鍘挎斂搴滀絾鏄秹鍐滀负鍐滐紝鍙栨垜浠殑缁撴灉 鎵腑甯備笁鑼呰閬撲腑鍗庢潙姘稿浐娌宠矾1鍙� + if ("鏄�".equals(map.get("countyGov")) && "鍐�".equals(map.get("verifyFlag"))) { basicModel.setResult(result); mav.setModel(basicModel); return mav; } - //城市不一样 用我们 + //鍩庡競涓嶄竴鏍� 鐢ㄦ垜浠� if (result.containsKey("city")) { if ((!result.get("city").equals(map.get("city")) && StringUtils.isNotBlank(result.getString("city")))) { basicModel.setResult(result); } else { - map.put("addrVerify", "地址有效"); + map.put("addrVerify", "鍦板潃鏈夋晥"); map.put("addrArea", addrArea(map, type)); map.put("countyLevelCity", countyLevelCity(map)); map.put("typeName", areaMap.get(map.get("typeCode"))); basicModel.setResult(map); } } else { - map.put("addrVerify", "地址有效"); + map.put("addrVerify", "鍦板潃鏈夋晥"); map.put("addrArea", addrArea(map, type)); map.put("countyLevelCity", countyLevelCity(map)); map.put("typeName", areaMap.get(map.get("typeCode"))); @@ -788,13 +788,13 @@ public class AddrSvcController { } mav.setModel(basicModel); } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("鏈嶅姟鍗囩骇涓�...")); } return mav; } /** - * 对公涉农识别-新规则-上海银行 + * 瀵瑰叕娑夊啘璇嗗埆-鏂拌鍒�-涓婃捣閾惰 * * @param model * @return @@ -802,7 +802,7 @@ public class AddrSvcController { public Object boscEnterpriseVillageIdentifyAction(AddressModel model) { RestfulModelAndView mav = new RestfulModelAndView(); if (StringUtils.isBlank(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍦板潃涓嶈兘涓虹┖")); return mav; } @@ -828,29 +828,29 @@ public class AddrSvcController { String msg = json.getString("msg"); BasicModel basicModel = new BasicModel(code, msg); HashMap map = new LinkedHashMap(); - //我们的结果 -// "province": "江苏省", -// "city": "苏州市", -// "district": "昆山市", -// "town": "玉山镇", -// "committee": "南星渎村委会", + //鎴戜滑鐨勭粨鏋� +// "province": "姹熻嫃鐪�", +// "city": "鑻忓窞甯�", +// "district": "鏄嗗北甯�", +// "town": "鐜夊北闀�", +// "committee": "鍗楁槦娓庢潙濮斾細", // "provinceCode": "320000000000", // "cityCode": "320500000000", // "districtCode": "320583000000", // "townCode": "320583100000", // "committeeCode": "320583100222", // "typeCode": "220", -// "typeName": "村庄", -// "verifyFlag": "非农", -// "addrVerify": "地址有效", -// "countyLevelCity": "是", -// "administrativeTowns": "否", -// "countyGov": "否", -// "devDistrict": "是", -// "devDistrictName": "昆山高新技术产业开发区", -// "devLevel": "国家级", -// "addrArea": "开发区", -// "countyGovTown": "昆山开发区" +// "typeName": "鏉戝簞", +// "verifyFlag": "闈炲啘", +// "addrVerify": "鍦板潃鏈夋晥", +// "countyLevelCity": "鏄�", +// "administrativeTowns": "鍚�", +// "countyGov": "鍚�", +// "devDistrict": "鏄�", +// "devDistrictName": "鏄嗗北楂樻柊鎶�鏈骇涓氬紑鍙戝尯", +// "devLevel": "鍥藉绾�", +// "addrArea": "寮�鍙戝尯", +// "countyGovTown": "鏄嗗北寮�鍙戝尯" JSONObject result = json.getJSONObject("result"); if (result.containsKey("province")) { map.put("province", result.getString("province")); @@ -927,19 +927,19 @@ public class AddrSvcController { basicModel.setResult(map); mav.setModel(basicModel); } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("鏈嶅姟鍗囩骇涓�...")); } } return mav; } /** - * 对私涉农识别 + * 瀵圭娑夊啘璇嗗埆 */ public Object residentialVillageIdentifyAction(AddressModel model) { RestfulModelAndView mav = new RestfulModelAndView(); if (StringUtils.isBlank(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍦板潃涓嶈兘涓虹┖")); return mav; } @@ -950,9 +950,9 @@ public class AddrSvcController { String address = model.getAddress(); params.put("address", address); String type = StringUtils.isNotBlank(model.getType()) ? model.getType() : null; - // 对公 + // 瀵瑰叕 model.setType("1"); - String villageType = "2".equals(model.getType()) ? "对公" : "对私"; + String villageType = "2".equals(model.getType()) ? "瀵瑰叕" : "瀵圭"; params.put("type", type); params.put("showFullValue", "2"); Pager pager = new Pager(1, 1); @@ -1006,33 +1006,33 @@ public class AddrSvcController { String msg = json.getString("msg"); BasicModel basicModel = new BasicModel(code, msg); if (json.containsKey("result")) { - //我们的结果 + //鎴戜滑鐨勭粨鏋� JSONObject result = json.getJSONObject("result"); String userId = FangjiaApiUtil.parseUserId(model.getToken()); - if("对私".equals(villageType) && ("1007801".equals(userId) || "1007497".equals(userId))){ + if("瀵圭".equals(villageType) && ("1007801".equals(userId) || "1007497".equals(userId))){ result.remove("verifyFlag"); if(result.containsKey("district")){ String district = result.getString("district"); if(district != null){ - if(district.endsWith("区")){ - result.put("verifyFlag", "非农"); + if(district.endsWith("鍖�")){ + result.put("verifyFlag", "闈炲啘"); }else if(result.containsKey("countyGov") && StringUtils.isNotBlank(result.getString("countyGov"))){ String countyGov = result.getString("countyGov"); - if("是".equals(countyGov)){ - result.put("verifyFlag", "非农"); - } else if ("否".equals(countyGov)) { - result.put("verifyFlag", "农"); + if("鏄�".equals(countyGov)){ + result.put("verifyFlag", "闈炲啘"); + } else if ("鍚�".equals(countyGov)) { + result.put("verifyFlag", "鍐�"); } }else if(result.containsKey("townCode")){ String townCode = result.getString("townCode"); Township township = townshipService.findTownshipByCode(townCode); if(township != null){ - String countyGov = "是".equals(township.getHasGov())?"是":"否"; + String countyGov = "鏄�".equals(township.getHasGov())?"鏄�":"鍚�"; result.put("countyGov", countyGov); - if("是".equals(countyGov)){ - result.put("verifyFlag", "非农"); + if("鏄�".equals(countyGov)){ + result.put("verifyFlag", "闈炲啘"); } else { - result.put("verifyFlag", "农"); + result.put("verifyFlag", "鍐�"); } } } @@ -1046,19 +1046,19 @@ public class AddrSvcController { } mav.setModel(basicModel); } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("鏈嶅姟鍗囩骇涓�...")); } } return mav; } /** - * 对公涉农识别 + * 瀵瑰叕娑夊啘璇嗗埆 */ public Object enterpriseVillageIdentifyAction(AddressModel model) { RestfulModelAndView mav = new RestfulModelAndView(); if (StringUtils.isBlank(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍦板潃涓嶈兘涓虹┖")); return mav; } @@ -1069,9 +1069,9 @@ public class AddrSvcController { String address = model.getAddress(); params.put("address", address); String type = StringUtils.isNotBlank(model.getType()) ? model.getType() : null; - // 对公 + // 瀵瑰叕 model.setType("2"); - String villageType = "2".equals(model.getType()) ? "对公" : "对私"; + String villageType = "2".equals(model.getType()) ? "瀵瑰叕" : "瀵圭"; params.put("type", type); params.put("showFullValue", "2"); Pager pager = new Pager(1, 1); @@ -1100,10 +1100,10 @@ public class AddrSvcController { resultMap.put("devDistrictName", villageResult.getDevDistrictName()); resultMap.put("devLevel", villageResult.getDevLevel()); resultMap.put("addrArea", villageResult.getAddrArea()); - if (StringUtils.isNotBlank(villageResult.getDistrict()) && villageResult.getDistrict().endsWith("区")) { - resultMap.put("prefectureLevelOrAbove ", "是"); + if (StringUtils.isNotBlank(villageResult.getDistrict()) && villageResult.getDistrict().endsWith("鍖�")) { + resultMap.put("prefectureLevelOrAbove ", "鏄�"); }else { - resultMap.put("prefectureLevelOrAbove ", "否"); + resultMap.put("prefectureLevelOrAbove ", "鍚�"); } BasicModel basicModel = new BasicModel(200, "OK"); if (StringUtils.isBlank(resultMap.get("verifyFlag"))) { @@ -1128,7 +1128,7 @@ public class AddrSvcController { String msg = json.getString("msg"); BasicModel basicModel = new BasicModel(code, msg); if (json.containsKey("result")) { - //我们的结果 + //鎴戜滑鐨勭粨鏋� JSONObject result = json.getJSONObject("result"); if (!result.containsKey("verifyFlag") || StringUtils.isBlank(result.getString("verifyFlag"))) { basicModel.markNoData(); @@ -1137,14 +1137,14 @@ public class AddrSvcController { } mav.setModel(basicModel); } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("鏈嶅姟鍗囩骇涓�...")); } } return mav; } /** - * 涉农识别-新规则-基础版本 + * 娑夊啘璇嗗埆-鏂拌鍒�-鍩虹鐗堟湰 * * @param model * @return @@ -1153,7 +1153,7 @@ public class AddrSvcController { RestfulModelAndView mav = new RestfulModelAndView(); if (StringUtils.isBlank(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍦板潃涓嶈兘涓虹┖")); return mav; } @@ -1164,7 +1164,7 @@ public class AddrSvcController { String address = model.getAddress(); params.put("address", address); String type = StringUtils.isNotBlank(model.getType()) ? model.getType() : null; - String villageType = "2".equals(model.getType()) ? "对公" : "对私"; + String villageType = "2".equals(model.getType()) ? "瀵瑰叕" : "瀵圭"; params.put("type", type); params.put("showFullValue", "2"); Pager pager = new Pager(1, 1); @@ -1217,7 +1217,7 @@ public class AddrSvcController { String msg = json.getString("msg"); BasicModel basicModel = new BasicModel(code, msg); if (json.containsKey("result")) { - //我们的结果 + //鎴戜滑鐨勭粨鏋� JSONObject result = json.getJSONObject("result"); if (!result.containsKey("verifyFlag") || StringUtils.isBlank(result.getString("verifyFlag"))) { basicModel.markNoData(); @@ -1226,7 +1226,7 @@ public class AddrSvcController { } mav.setModel(basicModel); } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("鏈嶅姟鍗囩骇涓�...")); } } return mav; @@ -1263,8 +1263,8 @@ public class AddrSvcController { httpPost.setEntity(stringEntity); CloseableHttpResponse httpResponse = null; - int retryCount = 2; // 设置重试次数 - int retryDelay = 10; // 设置重试延迟时间(毫秒) + int retryCount = 2; // 璁剧疆閲嶈瘯娆℃暟 + int retryDelay = 10; // 璁剧疆閲嶈瘯寤惰繜鏃堕棿锛堟绉掞級 boolean success = false; for (int i = 0; i < retryCount; i++) { try { @@ -1272,7 +1272,7 @@ public class AddrSvcController { success = true; break; } catch (IOException e) { - System.err.println("代理请求失败,进行重试..."); + System.err.println("浠g悊璇锋眰澶辫触锛岃繘琛岄噸璇�..."); try { Thread.sleep(retryDelay); } catch (InterruptedException ex) { @@ -1285,21 +1285,21 @@ public class AddrSvcController { HttpEntity responseEntity = httpResponse.getEntity(); String responseString = EntityUtils.toString(responseEntity); - // 使用 Gson 解析 JSON 字符串 + // 浣跨敤 Gson 瑙f瀽 JSON 瀛楃涓� Gson gson = new Gson(); JsonObject jsonObject = gson.fromJson(responseString, JsonObject.class); - // 创建 Map 存储各个值 + // 鍒涘缓 Map 瀛樺偍鍚勪釜鍊� Map dataMap = new HashMap(); - // 获取各个值并放入 Map + // 鑾峰彇鍚勪釜鍊煎苟鏀惧叆 Map // dataMap.put("code", jsonObject.get("code").getAsString()); // dataMap.put("msg", jsonObject.get("msg").getAsString()); JsonElement dataElement = jsonObject.get("data"); if (dataElement != null && !dataElement.isJsonNull() && dataElement.isJsonObject()) { JsonObject data = dataElement.getAsJsonObject(); - // 在这里继续处理 data 对象 + // 鍦ㄨ繖閲岀户缁鐞� data 瀵硅薄 if (data != null && !data.isJsonNull()) { @@ -1315,16 +1315,16 @@ public class AddrSvcController { dataMap.put("townCode", data.get("townCode").getAsString()); dataMap.put("committeeCode", data.get("villageCode").getAsString()); dataMap.put("typeCode", data.get("areaCode").getAsString()); - dataMap.put("verifyFlag", "0".equals(data.get("farmer").getAsString()) ? "非农" : "农"); - dataMap.put("countyGov", "0".equals(data.get("isGovt").getAsString()) ? "否" : "是"); -// dataMap.put("govtAddr", data.get("govtAddr").isJsonNull() ? null : data.get("govtAddr").getAsString()); // 对于可能为 null 的值,需要判断是否为空 + dataMap.put("verifyFlag", "0".equals(data.get("farmer").getAsString()) ? "闈炲啘" : "鍐�"); + dataMap.put("countyGov", "0".equals(data.get("isGovt").getAsString()) ? "鍚�" : "鏄�"); +// dataMap.put("govtAddr", data.get("govtAddr").isJsonNull() ? null : data.get("govtAddr").getAsString()); // 瀵逛簬鍙兘涓� null 鐨勫�硷紝闇�瑕佸垽鏂槸鍚︿负绌� JsonArray indusParkList = data.get("indusParkList").isJsonNull() ? null : data.get("indusParkList").getAsJsonArray(); if (indusParkList != null) { JsonObject jsonObject1 = gson.fromJson(indusParkList.get(0), JsonObject.class); dataMap.put("devDistrictName", jsonObject1.get("indusParkName").getAsString()); dataMap.put("devLevel", jsonObject1.get("indusParkLevel").getAsString()); - dataMap.put("devDistrict", "是"); + dataMap.put("devDistrict", "鏄�"); } } } @@ -1332,7 +1332,7 @@ public class AddrSvcController { httpResponse.close(); return dataMap; } else { - System.err.println("重试次数已用完,请求失败。"); + System.err.println("閲嶈瘯娆℃暟宸茬敤瀹岋紝璇锋眰澶辫触銆�"); } httpClient.close(); @@ -1340,7 +1340,7 @@ public class AddrSvcController { } /** - * 涉农识别-新规则-标准版 + * 娑夊啘璇嗗埆-鏂拌鍒�-鏍囧噯鐗� * * @param model * @return @@ -1349,7 +1349,7 @@ public class AddrSvcController { RestfulModelAndView mav = new RestfulModelAndView(); if (StringUtils.isBlank(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍦板潃涓嶈兘涓虹┖")); return mav; } @@ -1382,14 +1382,14 @@ public class AddrSvcController { } mav.setModel(basicModel); } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("鏈嶅姟鍗囩骇涓�...")); } return mav; } /** - * 地址联想-PRO + * 鍦板潃鑱旀兂-PRO * * @param model * @return @@ -1399,7 +1399,7 @@ public class AddrSvcController { RestfulModelAndView mav = new RestfulModelAndView(); if (StringUtils.isBlank(model.getKeywords()) && (StringUtils.isBlank(model.getLat()) && StringUtils.isBlank(model.getLng()))) { - mav.setModel(BasicModel.buildBadRequestModel("关键字或经纬度必填一个")); + mav.setModel(BasicModel.buildBadRequestModel("鍏抽敭瀛楁垨缁忕含搴﹀繀濉竴涓�")); return mav; } @@ -1434,13 +1434,13 @@ public class AddrSvcController { } mav.setModel(basicModel); } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("鏈嶅姟鍗囩骇涓�...")); } return mav; } /** - * 市级行政区划查询接口 + * 甯傜骇琛屾斂鍖哄垝鏌ヨ鎺ュ彛 * * @param model * @return @@ -1494,13 +1494,13 @@ public class AddrSvcController { basicModel.setResult(list); mav.setModel(basicModel); } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("鏈嶅姟鍗囩骇涓�...")); } return mav; } /** - * 省级行政区划查询接口 + * 鐪佺骇琛屾斂鍖哄垝鏌ヨ鎺ュ彛 * * @param model * @return @@ -1546,13 +1546,13 @@ public class AddrSvcController { basicModel.setResult(list); mav.setModel(basicModel); } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("鏈嶅姟鍗囩骇涓�...")); } return mav; } /** - * 区域级行政区划查询接口 + * 鍖哄煙绾ц鏀垮尯鍒掓煡璇㈡帴鍙� * * @param model * @return @@ -1613,7 +1613,7 @@ public class AddrSvcController { basicModel.setResult(list); mav.setModel(basicModel); } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("鏈嶅姟鍗囩骇涓�...")); } return mav; } @@ -1681,7 +1681,7 @@ public class AddrSvcController { basicModel.setResult(list); mav.setModel(basicModel); } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("鏈嶅姟鍗囩骇涓�...")); } return mav; } @@ -1714,7 +1714,7 @@ public class AddrSvcController { } mav.setModel(basicModel); } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("鏈嶅姟鍗囩骇涓�...")); } return mav; } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddrepoController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddrepoController.java index 62d82ffc9..5337cc718 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddrepoController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddrepoController.java @@ -20,7 +20,7 @@ public class AddrepoController { private TriggerService addrepoTriggerService; /** - * 建索引的trigger切入点 + * 寤虹储寮曠殑trigger鍒囧叆鐐� * * @param model * @return diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java index a157c2604..023cdbdf6 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java @@ -104,10 +104,10 @@ public class AddressController { private static Map> districts_cache = new HashMap>(); private static final String FJW_LEVEL = "5CAE1FAC646CB2D8"; - private static final String GRADE_AREA = "区域评分"; - private static final String GRADE_CITY = "城市评分"; - private static final String GRADE_NATION = "全国评分"; - private static final String GRADE_CONSUME = "消费评分"; + private static final String GRADE_AREA = "鍖哄煙璇勫垎"; + private static final String GRADE_CITY = "鍩庡競璇勫垎"; + private static final String GRADE_NATION = "鍏ㄥ浗璇勫垎"; + private static final String GRADE_CONSUME = "娑堣垂璇勫垎"; public final static OpenConfig CONFIG = OpenConfig.getConfig(); private static final String ES_USER = "developer"; @@ -141,8 +141,8 @@ public class AddressController { } /** - * 解析地址,能够返回多个结果 参数有:city 城市 address 地址 includeMaps - * 匹配的结果是否包含来自地图的数据,true表示结果包含来自地图的数据 max 返回的结果集中最多条数 + * 瑙f瀽鍦板潃锛岃兘澶熻繑鍥炲涓粨鏋� 鍙傛暟鏈夛細city 鍩庡競 address 鍦板潃 includeMaps + * 鍖归厤鐨勭粨鏋滄槸鍚﹀寘鍚潵鑷湴鍥剧殑鏁版嵁,true琛ㄧず缁撴灉鍖呭惈鏉ヨ嚜鍦板浘鐨勬暟鎹� max 杩斿洖鐨勭粨鏋滈泦涓渶澶氭潯鏁� * * @param model * @return @@ -167,11 +167,11 @@ public class AddressController { public Object analyzeAction(AddressModel model) { RestfulModelAndView mav = new RestfulModelAndView(); if (StringUtils.isBlank(model.getCity())) { - mav.setModel(BasicModel.buildBadRequestModel("城市不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍩庡競涓嶈兘涓虹┖")); return mav; } if (StringUtils.isBlank(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍦板潃涓嶈兘涓虹┖")); return mav; } HttpRequest request = new HttpRequest(); @@ -194,7 +194,7 @@ public class AddressController { try { dataList = JSONArray.fromObject(model.getData()); } catch (Exception e) { - mav.setModel(BasicModel.buildBadRequestModel("数据格式错误")); + mav.setModel(BasicModel.buildBadRequestModel("鏁版嵁鏍煎紡閿欒")); return mav; } List metaDatas = new ArrayList(dataList.size()); @@ -259,18 +259,18 @@ public class AddressController { String street = addr.getStreet(); List streets = new ArrayList(); streets.add(street); - if (street.endsWith("弄")) { + if (street.endsWith("寮�")) { addrWeightMap.put(street, MatchText.MAIN_ADDR_PRIORITY); - addrWeightMap.put(street.replaceAll("弄$", "号"), MatchText.GEN_ADDR_PRIORITY); - streets.add(street.replaceAll("弄$", "号")); + addrWeightMap.put(street.replaceAll("寮�$", "鍙�"), MatchText.GEN_ADDR_PRIORITY); + streets.add(street.replaceAll("寮�$", "鍙�")); } if (StringUtils.isNotBlank(addr.getStreetNumber())) { for (String s : streets) { - if (addr.getStreetNumber().endsWith("号")) { - addrWeightMap.put(s + addr.getStreetNumber().replaceAll("号$", "弄"), + if (addr.getStreetNumber().endsWith("鍙�")) { + addrWeightMap.put(s + addr.getStreetNumber().replaceAll("鍙�$", "寮�"), MatchText.GEN_ADDR_PRIORITY); - } else if (street.endsWith("弄")) { - addrWeightMap.put(s + addr.getStreetNumber().replaceAll("弄$", "号"), + } else if (street.endsWith("寮�")) { + addrWeightMap.put(s + addr.getStreetNumber().replaceAll("寮�$", "鍙�"), MatchText.GEN_ADDR_PRIORITY); } } @@ -280,10 +280,10 @@ public class AddressController { addrWeightMap.put(street + addr.getStreetNumber(), MatchText.MAIN_ADDR_PRIORITY); for (String s : streets) { for (String streetNumber : addr.getStreetNumbers()) { - if (streetNumber.endsWith("号")) { - addrWeightMap.put(s + streetNumber.replaceAll("号$", "弄"), MatchText.GEN_ADDR_PRIORITY); - } else if (street.endsWith("弄")) { - addrWeightMap.put(s + streetNumber.replaceAll("弄$", "号"), MatchText.GEN_ADDR_PRIORITY); + if (streetNumber.endsWith("鍙�")) { + addrWeightMap.put(s + streetNumber.replaceAll("鍙�$", "寮�"), MatchText.GEN_ADDR_PRIORITY); + } else if (street.endsWith("寮�")) { + addrWeightMap.put(s + streetNumber.replaceAll("寮�$", "鍙�"), MatchText.GEN_ADDR_PRIORITY); } } } @@ -304,7 +304,7 @@ public class AddressController { RestfulModelAndView mav = new RestfulModelAndView(); if (StringUtils.isBlank(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍦板潃涓嶈兘涓虹┖")); return mav; } Address address = addressParserService.standardize(model.getCity(), model.getAddress()); @@ -316,11 +316,11 @@ public class AddressController { RestfulModelAndView mav = new RestfulModelAndView(); if (!OpenConfig.getConfig().addressMatchEnabled()) { - mav.setModel(BasicModel.buildBadRequestModel("不支持该服务")); + mav.setModel(BasicModel.buildBadRequestModel("涓嶆敮鎸佽鏈嶅姟")); return mav; } if (StringUtils.isBlank(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍦板潃涓嶈兘涓虹┖")); return mav; } MatchParams matchParams = new MatchParams(); @@ -360,7 +360,7 @@ public class AddressController { if (result != null) { mav.setModel(result); } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("鏈嶅姟鍗囩骇涓�...")); } return mav; } @@ -372,7 +372,7 @@ public class AddressController { if (result != null) { mav.setModel(result); } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("鏈嶅姟鍗囩骇涓�...")); } return mav; } @@ -380,11 +380,11 @@ public class AddressController { public Object realAuthAction(AddressModel model) { RestfulModelAndView mav = new RestfulModelAndView(); if (StringUtils.isBlank(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍦板潃涓嶈兘涓虹┖")); return mav; } if (!OpenConfig.getConfig().addressMatchEnabled()) { - mav.setModel(BasicModel.buildBadRequestModel("不支持该服务")); + mav.setModel(BasicModel.buildBadRequestModel("涓嶆敮鎸佽鏈嶅姟")); return mav; } MatchParams matchParams = new MatchParams(); @@ -444,11 +444,11 @@ public class AddressController { if (address.startsWith(p.getKey())) { ret.put("province", p.getKey()); List cities = p.getValue(); - if (cities.size() == 1 && cities.contains(p.getKey())) {// 直辖市 + if (cities.size() == 1 && cities.contains(p.getKey())) {// 鐩磋緰甯� ret.put("city", p.getKey()); } else { - String temp = address.substring(p.getKey().length());// 移除省份 - if (temp.startsWith("省") || temp.startsWith("市") || temp.startsWith("县") || temp.startsWith("区")) { + String temp = address.substring(p.getKey().length());// 绉婚櫎鐪佷唤 + if (temp.startsWith("鐪�") || temp.startsWith("甯�") || temp.startsWith("鍘�") || temp.startsWith("鍖�")) { temp = temp.substring(1); } for (String c : cities) { @@ -475,13 +475,13 @@ public class AddressController { resultModel.setResult(json.get("result")); mav.setModel(resultModel); } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("鏈嶅姟鍗囩骇涓�...")); } return mav; } /** - * 地址匹配第二个版本,基于第一个版本的逻辑,对匹配出的结果进行正确性的判断 + * 鍦板潃鍖归厤绗簩涓増鏈紝鍩轰簬绗竴涓増鏈殑閫昏緫锛屽鍖归厤鍑虹殑缁撴灉杩涜姝g‘鎬х殑鍒ゆ柇 * * @param model * @return @@ -520,13 +520,13 @@ public class AddressController { jsonResult.put("matchResult", matchResult); if (jsonResult.containsKey("category")) { if ("office".equals(jsonResult.getString("category"))) { - jsonResult.put("propertyType", "写字楼"); + jsonResult.put("propertyType", "鍐欏瓧妤�"); } else if ("shop".equals(jsonResult.getString("category"))) { - jsonResult.put("propertyType", "商铺"); + jsonResult.put("propertyType", "鍟嗛摵"); } } } else if (jsonResult != null) { - // 判断是否为自然村 + // 鍒ゆ柇鏄惁涓鸿嚜鐒舵潙 boolean matchedVillage = false; try { if (jsonResult.get("searchAddress") != null) { @@ -548,7 +548,7 @@ public class AddressController { jsonResult.put("name", village.getString("name")); jsonResult.put("lng", village.getJSONObject("location").getDouble("lon")); jsonResult.put("lat", village.getJSONObject("location").getDouble("lat")); - jsonResult.put("propertyType", "自然村"); + jsonResult.put("propertyType", "鑷劧鏉�"); matchedVillage = true; } else { for (JSONObject source : villages) { @@ -562,7 +562,7 @@ public class AddressController { jsonResult.put("name", village.getString("name")); jsonResult.put("lng", village.getJSONObject("location").getDouble("lon")); jsonResult.put("lat", village.getJSONObject("location").getDouble("lat")); - jsonResult.put("propertyType", "自然村"); + jsonResult.put("propertyType", "鑷劧鏉�"); matchedVillage = true; break; } @@ -581,7 +581,7 @@ public class AddressController { resultModel.setResult(json.get("result")); mav.setModel(resultModel); } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("鏈嶅姟鍗囩骇涓�...")); } return mav; } @@ -590,11 +590,11 @@ public class AddressController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (!OpenConfig.getConfig().addressMatchEnabled()) { - mav.setModel(BasicModel.buildBadRequestModel("不支持该服务")); + mav.setModel(BasicModel.buildBadRequestModel("涓嶆敮鎸佽鏈嶅姟")); return mav; } String address = model.getAddress(); - address = address.replaceAll("@@", "#");// 框架无法处理参数带有#的Buge 用@@代替 + address = address.replaceAll("@@", "#");// 妗嗘灦鏃犳硶澶勭悊鍙傛暟甯︽湁#鐨凚uge 鐢ˊ@浠f浛 BuildingType buildingType = null; if (StringUtils.isNotBlank(model.getCategory())) { if ("property".equals(model.getCategory())) { @@ -625,7 +625,7 @@ public class AddressController { Building building = addressParserService.parser(params); long end = System.currentTimeMillis(); if (end - start > 200) { - LOGGER.warn("匹配parser耗时:\t" + (end - start) + "ms"); + LOGGER.warn("鍖归厤parser鑰楁椂:\t" + (end - start) + "ms"); } if ("true".equalsIgnoreCase(model.getVerify())) { verify(building); @@ -677,7 +677,7 @@ public class AddressController { RestfulModelAndView mav = new RestfulModelAndView(); if (!OpenConfig.getConfig().addressMatchEnabled()) { - mav.setModel(BasicModel.buildBadRequestModel("不支持该服务")); + mav.setModel(BasicModel.buildBadRequestModel("涓嶆敮鎸佽鏈嶅姟")); return mav; } new Thread() { @@ -686,7 +686,7 @@ public class AddressController { addressParserService.clearCache(model.getCity()); } }.start(); - mav.setModel(BasicModel.buildOKModel().setMsg("开始刷新缓存")); + mav.setModel(BasicModel.buildOKModel().setMsg("寮�濮嬪埛鏂扮紦瀛�")); return mav; } @@ -696,11 +696,11 @@ public class AddressController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (!OpenConfig.getConfig().addressMatchEnabled()) { - mav.setModel(BasicModel.buildBadRequestModel("不支持该服务")); + mav.setModel(BasicModel.buildBadRequestModel("涓嶆敮鎸佽鏈嶅姟")); return mav; } String address = model.getAddress(); - address = address.replaceAll("@@", "#");// 框架无法处理参数带有#的Buge 用@@代替 + address = address.replaceAll("@@", "#");// 妗嗘灦鏃犳硶澶勭悊鍙傛暟甯︽湁#鐨凚uge 鐢ˊ@浠f浛 BuildingType buildingType = null; if (StringUtils.isNotBlank(model.getCategory())) { if ("property".equals(model.getCategory())) { @@ -741,7 +741,7 @@ public class AddressController { if (result != null) { mav.setModel(result); } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("鏈嶅姟鍗囩骇涓�...")); } return mav; } @@ -823,7 +823,7 @@ public class AddressController { Address address = building.getSearchAddress(); if (StringUtils.isNotBlank(address.getKeywords()) && address.getKeywords().length() > 2) { keywords.add(address.getKeywords()); - } else if (address.getOrgAddress().length() > 2 && address.getOrgAddress().length() < 10) {// 一般小区名不会超过10个字 + } else if (address.getOrgAddress().length() > 2 && address.getOrgAddress().length() < 10) {// 涓�鑸皬鍖哄悕涓嶄細瓒呰繃10涓瓧 keywords.add(address.getOrgAddress()); } if (address.isStandardAddress()) { @@ -848,7 +848,7 @@ public class AddressController { } /** - * 从Excel表中加载测试数据 + * 浠嶦xcel琛ㄤ腑鍔犺浇娴嬭瘯鏁版嵁 * * @return */ @@ -859,28 +859,28 @@ public class AddressController { fileInputStream = new FileInputStream(excelFileName); HSSFWorkbook workbook = new HSSFWorkbook(fileInputStream); HSSFSheet sheet = workbook.getSheetAt(0); - // 行号 + // 琛屽彿 boolean isFirstRow = true; for (Row row : sheet) { if (isFirstRow) { - // 第一行,过掉 + // 绗竴琛岋紝杩囨帀 isFirstRow = false; continue; } - // 得到列数 + // 寰楀埌鍒楁暟 // row.getPhysicalNumberOfCells(); String in_name = row.getCell(1).toString(); if (in_name.equals("")) { - // 跳过空内容 + // 璺宠繃绌哄唴瀹� continue; } Map data = new HashMap(); - // 第0列:城市 + // 绗�0鍒楋細鍩庡競 data.put("city", row.getCell(0).toString()); - // 第一列:输入地址 + // 绗竴鍒楋細杈撳叆鍦板潃 data.put("in_name", in_name); - // 第二列:期望名称,用于验证 + // 绗簩鍒楋細鏈熸湜鍚嶇О锛岀敤浜庨獙璇� Cell cell = row.getCell(2); if (cell != null) { data.put("out_name", cell.toString()); @@ -902,7 +902,7 @@ public class AddressController { } /** - * 从Excel表中加载测试数据 + * 浠嶦xcel琛ㄤ腑鍔犺浇娴嬭瘯鏁版嵁 * * @return */ @@ -914,17 +914,17 @@ public class AddressController { fileInputStream = new FileInputStream(excelFileName); HSSFWorkbook workbook = new HSSFWorkbook(fileInputStream); HSSFSheet sheet = workbook.getSheetAt(0); - // 行号 + // 琛屽彿 boolean isFirstRow = true; for (Row row : sheet) { - if (isFirstRow) {// 第一行,过掉 + if (isFirstRow) {// 绗竴琛岋紝杩囨帀 isFirstRow = false; continue; } String province = row.getCell(0).toString(); String city = row.getCell(1).toString(); String in_address = row.getCell(2).toString(); - if (StringUtils.isBlank(in_address) || StringUtils.isBlank(city) || StringUtils.isBlank(province)) { // 跳过空内容 + if (StringUtils.isBlank(in_address) || StringUtils.isBlank(city) || StringUtils.isBlank(province)) { // 璺宠繃绌哄唴瀹� System.out.println("-->" + row.getRowNum()); continue; } @@ -934,10 +934,10 @@ public class AddressController { data.put("in_address", in_address); data.put("city", city); String formattedAddress = new String(in_address); - List huanxian = Arrays.asList("中环外环之间", "内环以内", "内环中环之间", "中环以内", "外环以外", "(内环高速以里)", "外环外其它地区", - "五环以外", "六环以内", "内环到三环里", "内环到二环里", "二环里", "三环到四环之间", "二环到三环", "四环到五环之间", "二环到三环", "五环至六环之间", - "五环到六环之间", "五环到六环之间", "三环以内", "四环到五环内", "六环以外(其他地区)", "六环以外(张家湾镇、台湖镇、漷县镇)", "六环以外(宋庄镇)", - "一环到二环", "六环以外", "四环至五环之间", "六环外(马驹桥镇)"); + List huanxian = Arrays.asList("涓幆澶栫幆涔嬮棿", "鍐呯幆浠ュ唴", "鍐呯幆涓幆涔嬮棿", "涓幆浠ュ唴", "澶栫幆浠ュ", "锛堝唴鐜珮閫熶互閲岋級", "澶栫幆澶栧叾瀹冨湴鍖�", + "浜旂幆浠ュ", "鍏幆浠ュ唴", "鍐呯幆鍒颁笁鐜噷", "鍐呯幆鍒颁簩鐜噷", "浜岀幆閲�", "涓夌幆鍒板洓鐜箣闂�", "浜岀幆鍒颁笁鐜�", "鍥涚幆鍒颁簲鐜箣闂�", "浜岀幆鍒颁笁鐜�", "浜旂幆鑷冲叚鐜箣闂�", + "浜旂幆鍒板叚鐜箣闂�", "浜旂幆鍒板叚鐜箣闂�", "涓夌幆浠ュ唴", "鍥涚幆鍒颁簲鐜唴", "鍏幆浠ュ锛堝叾浠栧湴鍖猴級", "鍏幆浠ュ锛堝紶瀹舵咕闀囥�佸彴婀栭晣銆佹挤鍘块晣锛�", "鍏幆浠ュ锛堝畫搴勯晣锛�", + "涓�鐜埌浜岀幆", "鍏幆浠ュ", "鍥涚幆鑷充簲鐜箣闂�", "鍏幆澶栵紙椹┕妗ラ晣锛�"); for (String a : huanxian) { formattedAddress = formattedAddress.replace(a, ""); } @@ -946,10 +946,10 @@ public class AddressController { if (formate.get("city") != null) { data.put("formatedCity", formate.get("city")); } else { - if (city.endsWith("市") || city.endsWith("县")) { + if (city.endsWith("甯�") || city.endsWith("鍘�")) { city = city.substring(0, city.length() - 1); } else { - if (province.endsWith("市")) { + if (province.endsWith("甯�")) { city = province.substring(0, province.length() - 1); } else { city = province; @@ -990,7 +990,7 @@ public class AddressController { } /*** - * 获取自然村 + * 鑾峰彇鑷劧鏉� * @param city * @param region * @param name @@ -1036,7 +1036,7 @@ public class AddressController { } /** - * 加载测试数据 + * 鍔犺浇娴嬭瘯鏁版嵁 * * @return */ @@ -1056,7 +1056,7 @@ public class AddressController { isFirst = false; int c = line.charAt(0); if (c == 65279) { - // 去掉UTF-8中头标示 + // 鍘绘帀UTF-8涓ご鏍囩ず line = line.substring(1); } } @@ -1077,7 +1077,7 @@ public class AddressController { } /** - * 解析测试数据,其中输入字符串为以TAB分隔的字符串,例如: in_name:经济技术开发区贵园北里丁区 out_name:贵园北里 + * 瑙f瀽娴嬭瘯鏁版嵁锛屽叾涓緭鍏ュ瓧绗︿覆涓轰互TAB鍒嗛殧鐨勫瓧绗︿覆锛屼緥濡傦細 in_name:缁忔祹鎶�鏈紑鍙戝尯璐靛洯鍖楅噷涓佸尯 out_name:璐靛洯鍖楅噷 * * @param s * @return @@ -1280,15 +1280,15 @@ public class AddressController { } District district = null; - // 根据地址查找小区 + // 鏍规嵁鍦板潃鏌ユ壘灏忓尯 if (resMap.get("address") != null) { district = addressService.parseAddress(resMap.get("city").toString(), resMap.get("address").toString()); } - // 根据地址中提取出的小区名称查小区 - String oldName = resMap.get("oldName") != null ? resMap.get("oldName").toString() : null;// 地址中疑似小区 + // 鏍规嵁鍦板潃涓彁鍙栧嚭鐨勫皬鍖哄悕绉版煡灏忓尯 + String oldName = resMap.get("oldName") != null ? resMap.get("oldName").toString() : null;// 鍦板潃涓枒浼煎皬鍖� if (district == null && null != oldName) { district = addressService.parseAddress(resMap.get("city").toString(), oldName); - // 百度查小区 + // 鐧惧害鏌ュ皬鍖� if (district == null && null != oldName) { Map ret = baiduApiService.mapSearchSimple(resMap.get("city").toString(), oldName, AK); List rets = (List) ret.get("content"); @@ -1301,7 +1301,7 @@ public class AddressController { } for (List list : vs) { String s = list.get(1); - if (s.indexOf("小区") != -1 || s.indexOf("楼盘") != -1) { + if (s.indexOf("灏忓尯") != -1 || s.indexOf("妤肩洏") != -1) { flag = true; resMap.put("name", oldName); String baiduAddress = (String) vo.get("addr"); @@ -1336,7 +1336,7 @@ public class AddressController { resMap.put("status", "1"); } - // 当businessMatch=1,并且进行小区匹配没有成功的情况下,进行商铺写字楼匹配 通过keyword查找 + // 褰揵usinessMatch=1锛屽苟涓旇繘琛屽皬鍖哄尮閰嶆病鏈夋垚鍔熺殑鎯呭喌涓嬶紝杩涜鍟嗛摵鍐欏瓧妤煎尮閰� 閫氳繃keyword鏌ユ壘 if (null != model.getBusinessMatch() && model.getBusinessMatch() == 1 && resMap.get("status").equals("1") && StringUtils.isNotBlank((String) resMap.get("city"))) { if (StringUtils.isNotBlank(oldName)) { @@ -1361,8 +1361,8 @@ public class AddressController { if (StringUtils.isBlank(tempAddress)) { resMap.put("address", district.getAddress()); } else { - if (tempAddress.indexOf("弄") == -1 && tempAddress.indexOf("号") == -1 || tempAddress.indexOf("街") == -1 - || tempAddress.indexOf("路") == -1) { + if (tempAddress.indexOf("寮�") == -1 && tempAddress.indexOf("鍙�") == -1 || tempAddress.indexOf("琛�") == -1 + || tempAddress.indexOf("璺�") == -1) { resMap.put("address", district.getAddress()); } } @@ -1402,10 +1402,10 @@ public class AddressController { String city = (String) resMap.get("city"); District district = null; - // 小区库匹配 + // 灏忓尯搴撳尮閰� String address = (String) resMap.get("address"); if (StringUtils.isNotBlank(address)) { - // 地址、小区名、别名匹配 + // 鍦板潃銆佸皬鍖哄悕銆佸埆鍚嶅尮閰� List params = new ArrayList(4); params.add(new QueryParam("city", city)); params.add(new QueryParam("category", "district")); @@ -1426,10 +1426,10 @@ public class AddressController { } } - // 根据地址中提取出的小区名称查小区 + // 鏍规嵁鍦板潃涓彁鍙栧嚭鐨勫皬鍖哄悕绉版煡灏忓尯 String oldName = StringUtils.trim((String) resMap.get("oldName")); if (null == district && StringUtils.isNotBlank(oldName)) { - // 小区名、别名匹配 + // 灏忓尯鍚嶃�佸埆鍚嶅尮閰� List params = new ArrayList(4); params.add(new QueryParam("city", city)); params.add(new QueryParam("category", "district")); @@ -1448,7 +1448,7 @@ public class AddressController { } } - // 地址库匹配 + // 鍦板潃搴撳尮閰� if (null == district) { // todo } @@ -1467,8 +1467,8 @@ public class AddressController { if (StringUtils.isBlank(tempAddress)) { resMap.put("address", district.getAddress()); } else { - if (tempAddress.indexOf("弄") == -1 && tempAddress.indexOf("号") == -1 || tempAddress.indexOf("街") == -1 - || tempAddress.indexOf("路") == -1) { + if (tempAddress.indexOf("寮�") == -1 && tempAddress.indexOf("鍙�") == -1 || tempAddress.indexOf("琛�") == -1 + || tempAddress.indexOf("璺�") == -1) { resMap.put("address", district.getAddress()); } } @@ -1511,8 +1511,8 @@ public class AddressController { } /** - * 地址联想提示 (高德官方) /address/su 参数:address city - * 返回:[{"id":"XXXXXXXXX","city":"上海",region:"长宁","name":"xxx","address":"协和路"}] + * 鍦板潃鑱旀兂鎻愮ず (楂樺痉瀹樻柟) /address/su 鍙傛暟锛歛ddress city + * 杩斿洖锛歔{"id":"XXXXXXXXX","city":"涓婃捣",region:"闀垮畞","name":"xxx","address":"鍗忓拰璺�"}] * * @return */ @@ -1520,25 +1520,25 @@ public class AddressController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟閿欒锛屽煄甯傚拰鍦板潃涓嶈兘涓虹┖锛�")); return mav; } try { - List list = addressService.suAmap(model.getCity().trim(), model.getAddress().trim());// su()是走代理 + List list = addressService.suAmap(model.getCity().trim(), model.getAddress().trim());// su()鏄蛋浠g悊 BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); model1.setResult(list); mav.setModel(model1); } catch (Exception e) { LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + mav.setModel(BasicModel.buildBadRequestModel("缃戠粶寮傚父锛屽缓璁啀娆¤姹傦紒")); } return mav; } /** - * 地址真实性检查 (高德官方) /address/check 参数:chooseId address city - * 返回:{type:"存在|不存在|存疑",data:{"id":"XXXXXXXXX","city":"上海",region:"长宁","name":"xxx","address":"协和路"}} - * 存疑的时候才有data返回,返回高德搜索的第一条数据 (超过的时候,找到最大号码返回) + * 鍦板潃鐪熷疄鎬ф鏌� (楂樺痉瀹樻柟) /address/check 鍙傛暟锛歝hooseId address city + * 杩斿洖锛歿type:"瀛樺湪|涓嶅瓨鍦▅瀛樼枒",data:{"id":"XXXXXXXXX","city":"涓婃捣",region:"闀垮畞","name":"xxx","address":"鍗忓拰璺�"}} + * 瀛樼枒鐨勬椂鍊欐墠鏈塪ata杩斿洖锛岃繑鍥為珮寰锋悳绱㈢殑绗竴鏉℃暟鎹� 锛堣秴杩囩殑鏃跺�欙紝鎵惧埌鏈�澶у彿鐮佽繑鍥烇級 * * @return */ @@ -1546,28 +1546,28 @@ public class AddressController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟閿欒锛屽煄甯傚拰鍦板潃涓嶈兘涓虹┖锛�")); return mav; } String city = addressService.findCityAmap(model.getCity().trim()); if (StringUtils.isEmpty(city)) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟閿欒锛屽煄甯傝緭鍏ヤ笉鏍囧噯锛�")); return mav; } try { - AddressCheckBo bo = addressService.checkAmap(model.getChooseId(), city, model.getAddress().trim());// check是走代理 + AddressCheckBo bo = addressService.checkAmap(model.getChooseId(), city, model.getAddress().trim());// check鏄蛋浠g悊 BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); model1.setResult(formatAddressCheckBo(bo, city, model)); mav.setModel(model1); } catch (Exception e) { LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + mav.setModel(BasicModel.buildBadRequestModel("缃戠粶寮傚父锛屽缓璁啀娆¤姹傦紒")); } return mav; } /** - * 为返回值格式化掉cityCode和AddressId,用于评级和反欺诈 + * 涓鸿繑鍥炲�兼牸寮忓寲鎺塩ityCode鍜孉ddressId锛岀敤浜庤瘎绾у拰鍙嶆璇� * * @param bo * @return @@ -1583,7 +1583,7 @@ public class AddressController { // "[]".equals(check.getAddress())) { // check.setAddress(check.getName()); // } - // 检查相关参数 + // 妫�鏌ョ浉鍏冲弬鏁� if (FJW_LEVEL.equals(model.getDataLevel())) { bo.setData(check); } else { @@ -1609,14 +1609,14 @@ public class AddressController { bo.setData(check); } } - if ("不存在".equals(bo.getType())) { - bo.setType("地址未找到:抱歉,在" + city + "没有找到与'" + model.getAddress() + "'相关的地点"); + if ("涓嶅瓨鍦�".equals(bo.getType())) { + bo.setType("鍦板潃鏈壘鍒帮細鎶辨瓑,鍦�" + city + "娌℃湁鎵惧埌涓�'" + model.getAddress() + "'鐩稿叧鐨勫湴鐐�"); } return bo; } /** - * 查询高德城市及城市编码 + * 鏌ヨ楂樺痉鍩庡競鍙婂煄甯傜紪鐮� * * @return */ @@ -1631,7 +1631,7 @@ public class AddressController { } /** - * 地址联想提示 (代理) + * 鍦板潃鑱旀兂鎻愮ず 锛堜唬鐞嗭級 * * @return */ @@ -1639,7 +1639,7 @@ public class AddressController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟閿欒锛屽煄甯傚拰鍦板潃涓嶈兘涓虹┖锛�")); return mav; } try { @@ -1649,13 +1649,13 @@ public class AddressController { mav.setModel(model1); } catch (Exception e) { LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + mav.setModel(BasicModel.buildBadRequestModel("缃戠粶寮傚父锛屽缓璁啀娆¤姹傦紒")); } return mav; } /** - * 地址真实性检查 (代理) + * 鍦板潃鐪熷疄鎬ф鏌� (浠g悊) * * @return */ @@ -1663,12 +1663,12 @@ public class AddressController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟閿欒锛屽煄甯傚拰鍦板潃涓嶈兘涓虹┖锛�")); return mav; } String city = addressService.findCityAmap(model.getCity().trim()); if (StringUtils.isEmpty(city)) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟閿欒锛屽煄甯傝緭鍏ヤ笉鏍囧噯锛�")); return mav; } try { @@ -1678,120 +1678,120 @@ public class AddressController { mav.setModel(model1); } catch (Exception e) { LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + mav.setModel(BasicModel.buildBadRequestModel("缃戠粶寮傚父锛屽缓璁啀娆¤姹傦紒")); } return mav; } /** - * 地址评级 + * 鍦板潃璇勭骇 * * @param model (city+address)+addressId - * @return { "code": 200, "msg": "ok", "result": { "data": { "address": "匹配地址", - * "city": "城市", "keyWords": "用户输入", "keyWordsUse": "用户输入格式化", "lat": - * 经纬度, "lng": 经纬度, "name": "匹配POIName", "score": 评分 }, "type": "可能存在" } + * @return { "code": 200, "msg": "ok", "result": { "data": { "address": "鍖归厤鍦板潃", + * "city": "鍩庡競", "keyWords": "鐢ㄦ埛杈撳叆", "keyWordsUse": "鐢ㄦ埛杈撳叆鏍煎紡鍖�", "lat": + * 缁忕含搴�, "lng": 缁忕含搴�, "name": "鍖归厤POIName", "score": 璇勫垎 }, "type": "鍙兘瀛樺湪" } * } */ public Object gradeAction(AddressModel model) { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟閿欒锛屽煄甯傚拰鍦板潃涓嶈兘涓虹┖锛�")); return mav; } - // 查询城市是否高德支持 + // 鏌ヨ鍩庡競鏄惁楂樺痉鏀寔 String city = addressService.findCityAmap(model.getCity().trim()); if (StringUtils.isEmpty(city)) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟閿欒锛屽煄甯傝緭鍏ヤ笉鏍囧噯锛�")); return mav; } try { - AddressCheckBo bo = addressService.gradeAmap(model.getChooseId(), city, model.getAddress().trim());// check是走代理 + AddressCheckBo bo = addressService.gradeAmap(model.getChooseId(), city, model.getAddress().trim());// check鏄蛋浠g悊 BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); model1.setResult(formatAddressCheckBo2(bo, city, model)); mav.setModel(model1); } catch (Exception e) { LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + mav.setModel(BasicModel.buildBadRequestModel("缃戠粶寮傚父锛屽缓璁啀娆¤姹傦紒")); } return mav; } /** - * 地址反欺诈 (地址验真+周边查询) + * 鍦板潃鍙嶆璇� (鍦板潃楠岀湡+鍛ㄨ竟鏌ヨ) * * @param model (city+address)+addressId - * @return { "code": 200, "msg": "ok", "result": { "data": { "address": "匹配地址", - * "city": "城市", "keyWords": "用户输入", "keyWordsUse": "用户输入格式化", "lat": - * 纬度, "lng": 经度, "name": "匹配POIName", "poiList":[ { "name" : - * "文洋大厦停车场(协和路)", "type" : "类型", "address" : "协和路1033号", "lat": 纬度, - * "lng": 经度, "distance":距离 },... ] }, "type": "存在" } } + * @return { "code": 200, "msg": "ok", "result": { "data": { "address": "鍖归厤鍦板潃", + * "city": "鍩庡競", "keyWords": "鐢ㄦ埛杈撳叆", "keyWordsUse": "鐢ㄦ埛杈撳叆鏍煎紡鍖�", "lat": + * 绾害, "lng": 缁忓害, "name": "鍖归厤POIName", "poiList":[ { "name" : + * "鏂囨磱澶у帵鍋滆溅鍦�(鍗忓拰璺�)", "type" : "绫诲瀷", "address" : "鍗忓拰璺�1033鍙�", "lat": 绾害, + * "lng": 缁忓害, "distance":璺濈 },... ] }, "type": "瀛樺湪" } } */ public Object antiFraudAction(AddressModel model) { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟閿欒锛屽煄甯傚拰鍦板潃涓嶈兘涓虹┖锛�")); return mav; } - // 查询城市是否高德支持 + // 鏌ヨ鍩庡競鏄惁楂樺痉鏀寔 String city = addressService.findCityAmap(model.getCity().trim()); if (StringUtils.isEmpty(city)) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟閿欒锛屽煄甯傝緭鍏ヤ笉鏍囧噯锛�")); return mav; } try { AddressCheckBo bo = addressService.antiFraudAmap(model.getChooseId(), city, model.getAddress().trim(), - model.getType(), model.getRadius(), model.getNumber(), model.getPageNo());// check是走代理 + model.getType(), model.getRadius(), model.getNumber(), model.getPageNo());// check鏄蛋浠g悊 BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); model1.setResult(formatAddressCheckBo2(bo, city, model)); mav.setModel(model1); } catch (Exception e) { LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + mav.setModel(BasicModel.buildBadRequestModel("缃戠粶寮傚父锛屽缓璁啀娆¤姹傦紒")); } return mav; } /** - * 地址反欺诈 (地址验真+周边查询) + * 鍦板潃鍙嶆璇� (鍦板潃楠岀湡+鍛ㄨ竟鏌ヨ) * * @param model (city+address)+addressId * @return { "code": 200, "msg": "ok", "result": { "data": { "address": - * "德州路220弄小区", "addressId": "d525e60aab2e84909d2fd998b0af5e8e", "city": - * "上海市", "keyWords": "德州路220弄", "keyWordsUse": "德州路220弄", "lat": - * 31.167814, "lng": 121.495784, "name": "上海后来居上家庭公寓(德州路分店)", "poiMap": - * { "加油站": [ { "address": "杨思路648号", "distance": "642.0m", "lat": - * 31.162078, "lng": 121.496522, "name": "中国石化加油站(杨思路)", "type": "加油站" - * }, { "address": "杨思路2号", "distance": "1.6km", "lat": 31.15627, "lng": - * 121.485031, "name": "中国石油杨思加油站(杨思路)", "type": "加油站" }, ... ] } ... }, - * "type": "存在" } } + * "寰峰窞璺�220寮勫皬鍖�", "addressId": "d525e60aab2e84909d2fd998b0af5e8e", "city": + * "涓婃捣甯�", "keyWords": "寰峰窞璺�220寮�", "keyWordsUse": "寰峰窞璺�220寮�", "lat": + * 31.167814, "lng": 121.495784, "name": "涓婃捣鍚庢潵灞呬笂瀹跺涵鍏瘬(寰峰窞璺垎搴�)", "poiMap": + * { "鍔犳补绔�": [ { "address": "鏉ㄦ�濊矾648鍙�", "distance": "642.0m", "lat": + * 31.162078, "lng": 121.496522, "name": "涓浗鐭冲寲鍔犳补绔�(鏉ㄦ�濊矾)", "type": "鍔犳补绔�" + * }, { "address": "鏉ㄦ�濊矾2鍙�", "distance": "1.6km", "lat": 31.15627, "lng": + * 121.485031, "name": "涓浗鐭虫补鏉ㄦ�濆姞娌圭珯(鏉ㄦ�濊矾)", "type": "鍔犳补绔�" }, ... ] } ... }, + * "type": "瀛樺湪" } } */ public Object antiFraudBAction(AddressModel model) { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟閿欒锛屽煄甯傚拰鍦板潃涓嶈兘涓虹┖锛�")); return mav; } - // 查询城市是否高德支持 + // 鏌ヨ鍩庡競鏄惁楂樺痉鏀寔 String city = addressService.findCityAmap(model.getCity().trim()); if (StringUtils.isEmpty(city)) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟閿欒锛屽煄甯傝緭鍏ヤ笉鏍囧噯锛�")); return mav; } try { AddressCheckBo bo = addressService.antiFraudAmapB(model.getChooseId(), city, model.getAddress().trim(), - model.getType(), model.getRadius(), model.getNumber());// check是走代理 + model.getType(), model.getRadius(), model.getNumber());// check鏄蛋浠g悊 BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); model1.setResult(formatAddressCheckBo2(bo, city, model)); mav.setModel(model1); } catch (Exception e) { LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + mav.setModel(BasicModel.buildBadRequestModel("缃戠粶寮傚父锛屽缓璁啀娆¤姹傦紒")); } return mav; } @@ -1800,7 +1800,7 @@ public class AddressController { RestfulModelAndView mav = new RestfulModelAndView(); if (StringUtils.isBlank(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍦板潃涓嶈兘涓虹┖")); return mav; } String result = addressMatchProxyService.standard(convertModelToMap(model)); @@ -1814,13 +1814,13 @@ public class AddressController { } mav.setModel(basicModel); } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("鏈嶅姟鍗囩骇涓�...")); } return mav; } /** - * 地址标准化接口V2 + * 鍦板潃鏍囧噯鍖栨帴鍙2 * * @param model * @return @@ -1829,7 +1829,7 @@ public class AddressController { RestfulModelAndView mav = new RestfulModelAndView(); if (StringUtils.isBlank(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍦板潃涓嶈兘涓虹┖")); return mav; } @@ -1858,18 +1858,18 @@ public class AddressController { } mav.setModel(basicModel); } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("鏈嶅姟鍗囩骇涓�...")); } return mav; } /** - * 招商证券POC测试接口封装 + * 鎷涘晢璇佸埜POC娴嬭瘯鎺ュ彛灏佽 */ public Object cmbTestAction(AddesssMatchModel model) { RestfulModelAndView mav = new RestfulModelAndView(); if (StringUtils.isBlank(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍦板潃涓嶈兘涓虹┖")); return mav; } HttpRequest request = new HttpRequest(); @@ -1896,13 +1896,13 @@ public class AddressController { } mav.setModel(basicModel); } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("鏈嶅姟鍗囩骇涓�...")); } return mav; } /** - * 五级地址标准化接口 + * 浜旂骇鍦板潃鏍囧噯鍖栨帴鍙� * * @param model * @return @@ -1911,7 +1911,7 @@ public class AddressController { RestfulModelAndView mav = new RestfulModelAndView(); if (StringUtils.isBlank(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍦板潃涓嶈兘涓虹┖")); return mav; } @@ -1920,7 +1920,7 @@ public class AddressController { Map params = new HashMap(); params.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : CONFIG.getDefaultCity()); params.put("address", model.getAddress()); - // 地址验证无效也输出标准化结果 + // 鍦板潃楠岃瘉鏃犳晥涔熻緭鍑烘爣鍑嗗寲缁撴灉 params.put("flag", "true"); try { json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/fiveDivisionStructure", params, "UTF-8"); @@ -1941,13 +1941,13 @@ public class AddressController { } mav.setModel(basicModel); } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("鏈嶅姟鍗囩骇涓�...")); } return mav; } /** - * 五级行政区划V2地址标准化接口 + * 浜旂骇琛屾斂鍖哄垝V2鍦板潃鏍囧噯鍖栨帴鍙� * * @param model * @return @@ -1956,7 +1956,7 @@ public class AddressController { RestfulModelAndView mav = new RestfulModelAndView(); if (StringUtils.isBlank(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍦板潃涓嶈兘涓虹┖")); return mav; } @@ -1965,7 +1965,7 @@ public class AddressController { Map params = new HashMap(); params.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : CONFIG.getDefaultCity()); params.put("address", model.getAddress()); - // 地址验证无效也输出标准化结果 + // 鍦板潃楠岃瘉鏃犳晥涔熻緭鍑烘爣鍑嗗寲缁撴灉 params.put("flag", "true"); try { json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/fiveDivisionStructure/v2", params, "UTF-8"); @@ -1986,14 +1986,14 @@ public class AddressController { } mav.setModel(basicModel); } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("鏈嶅姟鍗囩骇涓�...")); } return mav; } /** - * 详细地址标准化接口 + * 璇︾粏鍦板潃鏍囧噯鍖栨帴鍙� * * @param model * @return @@ -2002,7 +2002,7 @@ public class AddressController { RestfulModelAndView mav = new RestfulModelAndView(); if (StringUtils.isBlank(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍦板潃涓嶈兘涓虹┖")); return mav; } @@ -2011,7 +2011,7 @@ public class AddressController { Map params = new HashMap(); params.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : CONFIG.getDefaultCity()); params.put("address", model.getAddress()); - // 地址验证无效也输出标准化结果 + // 鍦板潃楠岃瘉鏃犳晥涔熻緭鍑烘爣鍑嗗寲缁撴灉 params.put("flag", "true"); try { json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/divisionStructure", params, "UTF-8"); @@ -2032,13 +2032,13 @@ public class AddressController { } mav.setModel(basicModel); } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("鏈嶅姟鍗囩骇涓�...")); } return mav; } /** - * 地址标准化专用测试接口 + * 鍦板潃鏍囧噯鍖栦笓鐢ㄦ祴璇曟帴鍙� * * @param model * @return @@ -2047,7 +2047,7 @@ public class AddressController { RestfulModelAndView mav = new RestfulModelAndView(); if (StringUtils.isBlank(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍦板潃涓嶈兘涓虹┖")); return mav; } @@ -2056,7 +2056,7 @@ public class AddressController { Map params = new HashMap(); params.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : CONFIG.getDefaultCity()); params.put("address", model.getAddress()); - // 地址验证无效也输出标准化结果 + // 鍦板潃楠岃瘉鏃犳晥涔熻緭鍑烘爣鍑嗗寲缁撴灉 params.put("flag", "true"); try { json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/structureAndComplete", params, "UTF-8"); @@ -2077,13 +2077,13 @@ public class AddressController { } mav.setModel(basicModel); } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("鏈嶅姟鍗囩骇涓�...")); } return mav; } /** - * 地址信息分类接口 + * 鍦板潃淇℃伅鍒嗙被鎺ュ彛 * * @param model * @return @@ -2092,7 +2092,7 @@ public class AddressController { RestfulModelAndView mav = new RestfulModelAndView(); if (StringUtils.isBlank(model.getAddress()) && StringUtils.isBlank(model.getId())) { - mav.setModel(BasicModel.buildBadRequestModel("地址和id不能同时为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍦板潃鍜宨d涓嶈兘鍚屾椂涓虹┖")); return mav; } @@ -2132,39 +2132,39 @@ public class AddressController { } mav.setModel(basicModel); } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("鏈嶅姟鍗囩骇涓�...")); } return mav; } /** - * 楼盘评级 + * 妤肩洏璇勭骇 * * @param model * @return */ public Object propertyRatingAction(CommunitySummaryRequestDto model){ - // type:all 输出所有字段,否则只输出文档中的字段 + // type锛歛ll 杈撳嚭鎵�鏈夊瓧娈碉紝鍚﹀垯鍙緭鍑烘枃妗d腑鐨勫瓧娈� RestfulModelAndView mav = new RestfulModelAndView(); BasicModel resultModel = new BasicModel(HttpStatusCodeEnum.OK); String city = model.getCity(); String address = model.getAddress(); String id = model.getId(); - // 借用原有字段 memo :备注 当 memo 为all的时候输出全部字段,默认输出文档中的字段 + // 鍊熺敤鍘熸湁瀛楁 memo 锛氬娉� 褰� memo 涓篴ll鐨勬椂鍊欒緭鍑哄叏閮ㄥ瓧娈�,榛樿杈撳嚭鏂囨。涓殑瀛楁 String memo = model.getMemo(); - //TODO 根据城市和地址查询 + //TODO 鏍规嵁鍩庡競鍜屽湴鍧�鏌ヨ if ((StringUtils.isBlank(city) && StringUtils.isBlank(address) || StringUtils.isBlank(id))) { - mav.setModel(BasicModel.buildBadRequestModel("需要小区ID或者城市+地址参数组合")); + mav.setModel(BasicModel.buildBadRequestModel("闇�瑕佸皬鍖篒D鎴栬�呭煄甯�+鍦板潃鍙傛暟缁勫悎")); } if (StringUtils.isNotBlank(id)) { CommunityRate communityRate = communityRateService.findBySeeweadId(id); if (communityRate != null) { if ("all".equals(memo)) { - // 为all的时候输出全部字段 + // 涓篴ll鐨勬椂鍊欒緭鍑哄叏閮ㄥ瓧娈� resultModel.setResult(communityRate); }else { - // 默认输出文档中的字段 + // 榛樿杈撳嚭鏂囨。涓殑瀛楁 CommunityRate communityRateResult = new CommunityRate(); communityRateResult.setCity(communityRate.getCity()); communityRateResult.setAddress(communityRate.getAddress()); @@ -2190,7 +2190,7 @@ public class AddressController { } mav.setModel(resultModel); }else { - mav.setModel(BasicModel.buildBadRequestModel("未找到该小区")); + mav.setModel(BasicModel.buildBadRequestModel("鏈壘鍒拌灏忓尯")); } } return mav; @@ -2198,7 +2198,7 @@ public class AddressController { } /** - * 楼盘评级 + * 妤肩洏璇勭骇 * * @param model * @return @@ -2207,7 +2207,7 @@ public class AddressController { RestfulModelAndView mav = new RestfulModelAndView(); if (StringUtils.isBlank(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍦板潃涓嶈兘涓虹┖")); return mav; } @@ -2245,13 +2245,13 @@ public class AddressController { } mav.setModel(basicModel); } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("鏈嶅姟鍗囩骇涓�...")); } return mav; } /** - * 财力评级 + * 璐㈠姏璇勭骇 * * @param model * @return @@ -2260,7 +2260,7 @@ public class AddressController { RestfulModelAndView mav = new RestfulModelAndView(); if ((StringUtils.isBlank(model.getAddress()) || "null".equals(model.getAddress())) && StringUtils.isBlank(model.getId())) { - mav.setModel(BasicModel.buildBadRequestModel("地址和id不能同时为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍦板潃鍜宨d涓嶈兘鍚屾椂涓虹┖")); return mav; } @@ -2300,7 +2300,7 @@ public class AddressController { } mav.setModel(basicModel); } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("鏈嶅姟鍗囩骇涓�...")); } return mav; } @@ -2308,7 +2308,7 @@ public class AddressController { public Object similarityAction(AddesssMatchModel model) { RestfulModelAndView mav = new RestfulModelAndView(); if (StringUtils.isBlank(model.getAddress_1()) || StringUtils.isBlank(model.getAddress_2())) { - mav.setModel(BasicModel.buildBadRequestModel("两个地址均不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("涓や釜鍦板潃鍧囦笉鑳戒负绌�")); return mav; } model.setAddress(model.getAddress_1()); @@ -2319,7 +2319,7 @@ public class AddressController { Map resultMap = addressService.addressSimilarity(result1, result2); mav.setModel(BasicModel.buildOKModel().setResult(resultMap)); } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("鏈嶅姟鍗囩骇涓�...")); } return mav; } @@ -2327,11 +2327,11 @@ public class AddressController { public Object parseCityAction(AddressModel model) { RestfulModelAndView mav = new RestfulModelAndView(); if (StringUtils.isBlank(model.getProvince())) { - mav.setModel(BasicModel.buildBadRequestModel("province不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("province涓嶈兘涓虹┖")); return mav; } if (StringUtils.isBlank(model.getDistrict())) { - mav.setModel(BasicModel.buildBadRequestModel("district不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("district涓嶈兘涓虹┖")); return mav; } CityParseBo bo = addressService.cityParse(model.getProvince(), model.getDistrict()); @@ -2349,15 +2349,15 @@ public class AddressController { RestfulModelAndView mav = new RestfulModelAndView(); if (!OpenConfig.getConfig().addressMatchEnabled()) { - mav.setModel(BasicModel.buildBadRequestModel("不支持该服务")); + mav.setModel(BasicModel.buildBadRequestModel("涓嶆敮鎸佽鏈嶅姟")); return mav; } if (StringUtils.isBlank(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍦板潃涓嶈兘涓虹┖")); return mav; } /*if (StringUtils.isBlank(model.getCity())) { - mav.setModel(BasicModel.buildBadRequestModel("城市不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍩庡競涓嶈兘涓虹┖")); return mav; }*/ MatchParams matchParams = new MatchParams(); @@ -2423,7 +2423,7 @@ public class AddressController { } /** - * 进行地址的取舍 + * 杩涜鍦板潃鐨勫彇鑸� * * @param bo * @return @@ -2435,11 +2435,11 @@ public class AddressController { if (StringUtils.isEmpty(check.getCity()) || "[]".equals(check.getCity())) { check.setCity(city); } - // 检查相关参数 + // 妫�鏌ョ浉鍏冲弬鏁� if (FJW_LEVEL.equals(model.getDataLevel())) { bo.setData(check); } else { - // 添加地址和address的取舍 + // 娣诲姞鍦板潃鍜宎ddress鐨勫彇鑸� chooseAddressAndName(check); formatAddressAndName(check); @@ -2460,8 +2460,8 @@ public class AddressController { bo.setData(check); } } - if ("不存在".equals(bo.getType())) { - bo.setType("地址未找到:抱歉,在" + city + "没有找到与'" + model.getAddress() + "'相关的地点"); + if ("涓嶅瓨鍦�".equals(bo.getType())) { + bo.setType("鍦板潃鏈壘鍒帮細鎶辨瓑,鍦�" + city + "娌℃湁鎵惧埌涓�'" + model.getAddress() + "'鐩稿叧鐨勫湴鐐�"); } return bo; } @@ -2470,7 +2470,7 @@ public class AddressController { boolean isNameOk = false; boolean isAddressOk = false; String keyWords = check.getKeyWords(); - // 再我方拆词接口 + // 鍐嶆垜鏂规媶璇嶆帴鍙� String name = check.getName(); String address = check.getAddress(); if (!isNameOk && isCorrectName(name)) { @@ -2484,7 +2484,7 @@ public class AddressController { if (isNameOk && isAddressOk) { return; } - // 优先级先高德POI + // 浼樺厛绾у厛楂樺痉POI String namePoi = check.getNameUse(); String addressPoi = check.getAddressUse(); if (!isNameOk && isCorrectNamePoi(namePoi, keyWords)) { @@ -2498,7 +2498,7 @@ public class AddressController { if (isNameOk && isAddressOk) { return; } - // 再高德地址编码 + // 鍐嶉珮寰峰湴鍧�缂栫爜 String namePoi2 = check.getName2(); String addressPoi2 = check.getAddress2(); if (!isNameOk && isCorrectNamePoi(namePoi2, keyWords)) { @@ -2512,7 +2512,7 @@ public class AddressController { if (isNameOk && isAddressOk) { return; } - // 最后高德标准化地址拆分 + // 鏈�鍚庨珮寰锋爣鍑嗗寲鍦板潃鎷嗗垎 String formateAddress = check.getFormatAddress(); if (StringUtils.isNotEmpty(formateAddress)) { Map resultMap = addressService.splitAddress(check.getCity(), formateAddress); @@ -2540,42 +2540,42 @@ public class AddressController { private void formatAddressAndName(AddressCheck check) { String nameEnd = check.getName(); String addressEnd = check.getAddress(); - // name处理 + // name澶勭悊 if (StringUtils.isNotEmpty(nameEnd)) { if (isStartWithNum(nameEnd) || isEndWithNum(nameEnd)) { nameEnd = null; } else { - // 去掉楼结尾的 + // 鍘绘帀妤肩粨灏剧殑 nameEnd = check.getName(); - // 先去头部楼层 + // 鍏堝幓澶撮儴妤煎眰 String floorNum = isContainsFloorNum(nameEnd); if (StringUtils.isNotEmpty(floorNum) && nameEnd.startsWith(floorNum)) { nameEnd = nameEnd.substring(floorNum.length(), nameEnd.length()); } - // 再去尾部楼层 + // 鍐嶅幓灏鹃儴妤煎眰 String floorNum2 = isContainsFloorNum(nameEnd); if (StringUtils.isNotEmpty(floorNum2) && nameEnd.endsWith(floorNum2)) { nameEnd = nameEnd.substring(0, nameEnd.lastIndexOf(floorNum2)); } - // 再判断是否带数字- + // 鍐嶅垽鏂槸鍚﹀甫鏁板瓧- String numData = isContainsNumData(nameEnd); if (StringUtils.isNotEmpty(numData) && nameEnd.endsWith(numData)) { nameEnd = nameEnd.substring(0, nameEnd.lastIndexOf(numData)); } - // 处理后是否超过三个字符 + // 澶勭悊鍚庢槸鍚﹁秴杩囦笁涓瓧绗� if (nameEnd.length() < 3) { nameEnd = null; - } else if (nameEnd.endsWith("旁")) { - nameEnd = nameEnd.substring(0, nameEnd.lastIndexOf("旁")); + } else if (nameEnd.endsWith("鏃�")) { + nameEnd = nameEnd.substring(0, nameEnd.lastIndexOf("鏃�")); } } check.setName(nameEnd); } - // 地址处理 + // 鍦板潃澶勭悊 if (StringUtils.isNotEmpty(addressEnd)) { - // 检查是否路结尾,以及关键字中是否带路号 - if (addressEnd.endsWith("路")) { + // 妫�鏌ユ槸鍚﹁矾缁撳熬锛屼互鍙婂叧閿瓧涓槸鍚﹀甫璺彿 + if (addressEnd.endsWith("璺�")) { String streetNum = isContainsAddressNum(check.getKeyWords()); if (StringUtils.isNotEmpty(streetNum)) { check.setAddress(addressEnd + streetNum); @@ -2604,7 +2604,7 @@ public class AddressController { private String isContainsAddressNum(String keyWords) { String num = null; - Pattern p = Pattern.compile("路[0-9]+-{1}[0-9]+号"); + Pattern p = Pattern.compile("璺痆0-9]+-{1}[0-9]+鍙�"); Matcher m = p.matcher(keyWords); if (m.find()) { num = m.group(0); @@ -2613,24 +2613,24 @@ public class AddressController { return num; } - private static final String ERROR_NAME = "工业区&商住楼&开发区&金融街&汽配城&商贸中心&发展中心&公寓楼&商贸城&国际大厦&开发区&综合楼&商贸中心&综合大楼&创业园"; + private static final String ERROR_NAME = "宸ヤ笟鍖�&鍟嗕綇妤�&寮�鍙戝尯&閲戣瀺琛�&姹介厤鍩�&鍟嗚锤涓績&鍙戝睍涓績&鍏瘬妤�&鍟嗚锤鍩�&鍥介檯澶у帵&寮�鍙戝尯&缁煎悎妤�&鍟嗚锤涓績&缁煎悎澶фゼ&鍒涗笟鍥�"; private boolean isCorrectName(String name) { - if (StringUtils.isEmpty(name)) {// 为空 + if (StringUtils.isEmpty(name)) {// 涓虹┖ return false; - } else if (name.length() < 3) {// 字符少于三个 + } else if (name.length() < 3) {// 瀛楃灏戜簬涓変釜 return false; - } else if (StringUtils.isNumeric(name) || isDigit(name)) {// 字符为数字 + } else if (StringUtils.isNumeric(name) || isDigit(name)) {// 瀛楃涓烘暟瀛� return false; - } else if (!isContainsChineseWord(name)) { // 不包含汉字 + } else if (!isContainsChineseWord(name)) { // 涓嶅寘鍚眽瀛� return false; - } else if (name.startsWith("之")) {// 以之开头,带数字的 - String c = name.substring(1, 2);// 取之后一个字符 - // 判断是否为数字或字母 + } else if (name.startsWith("涔�")) {// 浠ヤ箣寮�澶达紝甯︽暟瀛楃殑 + String c = name.substring(1, 2);// 鍙栦箣鍚庝竴涓瓧绗� + // 鍒ゆ柇鏄惁涓烘暟瀛楁垨瀛楁瘝 if (StringUtils.isNumeric(c) || isDigit(c) || c.matches("[a-zA-Z]+")) { return false; } - } else if (name.endsWith("路")) { + } else if (name.endsWith("璺�")) { return false; } else if (ERROR_NAME.contains(name)) { return false; @@ -2641,7 +2641,7 @@ public class AddressController { private String isContainsFloorNum(String keyWords) { String num = null; Pattern p = Pattern.compile( - "[0-9]+楼|[一|二|三|四|五|六|七|八|九|十]+楼|[a-zA-Z]+楼|[0-9]+幢|[一|二|三|四|五|六|七|八|九|十]+幢|[a-zA-Z]+幢|[0-9]+号|[一|二|三|四|五|六|七|八|九|十]+号|[a-zA-Z]+号"); + "[0-9]+妤紎[涓�|浜寍涓墊鍥泑浜攟鍏瓅涓億鍏珅涔潀鍗乚+妤紎[a-zA-Z]+妤紎[0-9]+骞[涓�|浜寍涓墊鍥泑浜攟鍏瓅涓億鍏珅涔潀鍗乚+骞[a-zA-Z]+骞[0-9]+鍙穦[涓�|浜寍涓墊鍥泑浜攟鍏瓅涓億鍏珅涔潀鍗乚+鍙穦[a-zA-Z]+鍙�"); Matcher m = p.matcher(keyWords); if (m.find()) { num = m.group(0); @@ -2651,7 +2651,7 @@ public class AddressController { private String isContainsNumData(String keyWords) { String num = null; - Pattern p = Pattern.compile("[0-9]+-|[一|二|三|四|五|六|七|八|九|十]+-|[a-zA-Z]+-"); + Pattern p = Pattern.compile("[0-9]+-|[涓�|浜寍涓墊鍥泑浜攟鍏瓅涓億鍏珅涔潀鍗乚+-|[a-zA-Z]+-"); Matcher m = p.matcher(keyWords); if (m.find()) { num = m.group(0); @@ -2660,23 +2660,23 @@ public class AddressController { } private boolean isCorrectNamePoi(String name, String keyWords) { - if (StringUtils.isEmpty(name)) {// 为空 + if (StringUtils.isEmpty(name)) {// 涓虹┖ return false; - } else if (name.length() < 3) {// 字符少于三个 + } else if (name.length() < 3) {// 瀛楃灏戜簬涓変釜 return false; } else if (!keyWords.contains(name)) { return false; - } else if (StringUtils.isNumeric(name) || isDigit(name)) {// 字符为数字 + } else if (StringUtils.isNumeric(name) || isDigit(name)) {// 瀛楃涓烘暟瀛� return false; - } else if (!isContainsChineseWord(name)) { // 不包含汉字 + } else if (!isContainsChineseWord(name)) { // 涓嶅寘鍚眽瀛� return false; - } else if (name.startsWith("之")) {// 以之开头,带数字的 - String c = name.substring(1, 2);// 取楼前一个字符 - // 判断是否为数字或字母 + } else if (name.startsWith("涔�")) {// 浠ヤ箣寮�澶达紝甯︽暟瀛楃殑 + String c = name.substring(1, 2);// 鍙栨ゼ鍓嶄竴涓瓧绗� + // 鍒ゆ柇鏄惁涓烘暟瀛楁垨瀛楁瘝 if (StringUtils.isNumeric(c) || isDigit(c) || c.matches("[a-zA-Z]+")) { return false; } - } else if (name.endsWith("路")) { + } else if (name.endsWith("璺�")) { return false; } else if (ERROR_NAME.contains(name)) { return false; @@ -2684,35 +2684,35 @@ public class AddressController { return true; } - private boolean isCorrectAddress(String address) { // 市区镇县省结尾 - if (StringUtils.isEmpty(address)) {// 为空 + private boolean isCorrectAddress(String address) { // 甯傚尯闀囧幙鐪佺粨灏� + if (StringUtils.isEmpty(address)) {// 涓虹┖ return false; - } else if (address.length() < 3) {// 字符少于三个 + } else if (address.length() < 3) {// 瀛楃灏戜簬涓変釜 return false; - } else if (StringUtils.isNumeric(address) || isDigit(address)) {// 字符为数字 + } else if (StringUtils.isNumeric(address) || isDigit(address)) {// 瀛楃涓烘暟瀛� return false; - } else if (!isContainsChineseWord(address)) { // 不包含汉字 + } else if (!isContainsChineseWord(address)) { // 涓嶅寘鍚眽瀛� return false; - } else if (address.endsWith("省") || address.endsWith("市") || address.endsWith("区") || address.endsWith("县") - || address.endsWith("乡") || address.endsWith("镇") || address.endsWith("村") || address.endsWith("街道")) { // 带数字/字母的楼结尾 + } else if (address.endsWith("鐪�") || address.endsWith("甯�") || address.endsWith("鍖�") || address.endsWith("鍘�") + || address.endsWith("涔�") || address.endsWith("闀�") || address.endsWith("鏉�") || address.endsWith("琛楅亾")) { // 甯︽暟瀛�/瀛楁瘝鐨勬ゼ缁撳熬 return false; } return true; } - private boolean isCorrectAddressPoi(String address, String keyWords) { // 市区镇县省结尾 - if (StringUtils.isEmpty(address)) {// 为空 + private boolean isCorrectAddressPoi(String address, String keyWords) { // 甯傚尯闀囧幙鐪佺粨灏� + if (StringUtils.isEmpty(address)) {// 涓虹┖ return false; - } else if (address.length() < 3) {// 字符少于三个 + } else if (address.length() < 3) {// 瀛楃灏戜簬涓変釜 return false; } else if (!keyWords.contains(address)) { return false; - } else if (StringUtils.isNumeric(address) || isDigit(address)) {// 字符为数字 + } else if (StringUtils.isNumeric(address) || isDigit(address)) {// 瀛楃涓烘暟瀛� return false; - } else if (!isContainsChineseWord(address)) { // 不包含汉字 + } else if (!isContainsChineseWord(address)) { // 涓嶅寘鍚眽瀛� return false; - } else if (address.endsWith("省") || address.endsWith("市") || address.endsWith("区") || address.endsWith("县") - || address.endsWith("乡") || address.endsWith("镇") || address.endsWith("村") || address.endsWith("街道")) { // 带数字/字母的楼结尾 + } else if (address.endsWith("鐪�") || address.endsWith("甯�") || address.endsWith("鍖�") || address.endsWith("鍘�") + || address.endsWith("涔�") || address.endsWith("闀�") || address.endsWith("鏉�") || address.endsWith("琛楅亾")) { // 甯︽暟瀛�/瀛楁瘝鐨勬ゼ缁撳熬 return false; } return true; @@ -2720,7 +2720,7 @@ public class AddressController { private static boolean isDigit(String content) { boolean flag = false; - Pattern p = Pattern.compile("^[一|二|三|四|五|六|七|八|九|十]+$"); + Pattern p = Pattern.compile("^[涓�|浜寍涓墊鍥泑浜攟鍏瓅涓億鍏珅涔潀鍗乚+$"); Matcher m = p.matcher(content); if (m.matches()) { flag = true; @@ -2739,7 +2739,7 @@ public class AddressController { } /** - * 地址真实性检查 (高德官方)(非银联) + * 鍦板潃鐪熷疄鎬ф鏌� (楂樺痉瀹樻柟)(闈為摱鑱�) * * @return */ @@ -2747,28 +2747,28 @@ public class AddressController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟閿欒锛屽煄甯傚拰鍦板潃涓嶈兘涓虹┖锛�")); return mav; } String city = addressService.findCityAmap(model.getCity().trim()); if (StringUtils.isEmpty(city)) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟閿欒锛屽煄甯傝緭鍏ヤ笉鏍囧噯锛�")); return mav; } try { - AddressCheckBo bo = addressService.checkAmapAddress(model.getChooseId(), city, model.getAddress().trim());// check是走代理 + AddressCheckBo bo = addressService.checkAmapAddress(model.getChooseId(), city, model.getAddress().trim());// check鏄蛋浠g悊 BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); model1.setResult(formatAddressCheckBo3(bo, city, model)); mav.setModel(model1); } catch (Exception e) { LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + mav.setModel(BasicModel.buildBadRequestModel("缃戠粶寮傚父锛屽缓璁啀娆¤姹傦紒")); } return mav; } /** - * 为返回值格式化掉cityCode和AddressId,用于地址验真(非银联版) + * 涓鸿繑鍥炲�兼牸寮忓寲鎺塩ityCode鍜孉ddressId锛岀敤浜庡湴鍧�楠岀湡锛堥潪閾惰仈鐗堬級 * * @param bo * @return @@ -2780,21 +2780,21 @@ public class AddressController { if (StringUtils.isEmpty(check.getCity()) || "[]".equals(check.getCity())) { check.setCity(city); } - // 检查相关参数 + // 妫�鏌ョ浉鍏冲弬鏁� if (FJW_LEVEL.equals(model.getDataLevel())) { bo.setData(check); } else { bo.setData(null); } } - if ("不存在".equals(bo.getType())) { - bo.setType("地址未找到:抱歉,在" + city + "没有找到与'" + model.getAddress() + "'相关的地点"); + if ("涓嶅瓨鍦�".equals(bo.getType())) { + bo.setType("鍦板潃鏈壘鍒帮細鎶辨瓑,鍦�" + city + "娌℃湁鎵惧埌涓�'" + model.getAddress() + "'鐩稿叧鐨勫湴鐐�"); } return bo; } /** - * 为返回值格式化掉cityCode和AddressId,用于评级和反欺诈(非银联版) + * 涓鸿繑鍥炲�兼牸寮忓寲鎺塩ityCode鍜孉ddressId锛岀敤浜庤瘎绾у拰鍙嶆璇堬紙闈為摱鑱旂増锛� * * @param bo * @return @@ -2806,7 +2806,7 @@ public class AddressController { if (StringUtils.isEmpty(check.getCity()) || "[]".equals(check.getCity())) { check.setCity(city); } - // 检查相关参数 + // 妫�鏌ョ浉鍏冲弬鏁� if (FJW_LEVEL.equals(model.getDataLevel())) { bo.setData(check); } else { @@ -2850,162 +2850,162 @@ public class AddressController { bo.setData(check); } } - if ("不存在".equals(bo.getType())) { - bo.setType("地址未找到:抱歉,在" + city + "没有找到与'" + model.getAddress() + "'相关的地点"); + if ("涓嶅瓨鍦�".equals(bo.getType())) { + bo.setType("鍦板潃鏈壘鍒帮細鎶辨瓑,鍦�" + city + "娌℃湁鎵惧埌涓�'" + model.getAddress() + "'鐩稿叧鐨勫湴鐐�"); } return bo; } /** - * 地址评级(非银联) + * 鍦板潃璇勭骇(闈為摱鑱�) */ public Object gradeAddressAction(AddressModel model) { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟閿欒锛屽煄甯傚拰鍦板潃涓嶈兘涓虹┖锛�")); return mav; } - // 查询城市是否高德支持 + // 鏌ヨ鍩庡競鏄惁楂樺痉鏀寔 String city = addressService.findCityAmap(model.getCity().trim()); if (StringUtils.isEmpty(city)) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟閿欒锛屽煄甯傝緭鍏ヤ笉鏍囧噯锛�")); return mav; } try { - AddressCheckBo bo = addressService.gradeAmapAddress(model.getChooseId(), city, model.getAddress().trim());// check是走代理 + AddressCheckBo bo = addressService.gradeAmapAddress(model.getChooseId(), city, model.getAddress().trim());// check鏄蛋浠g悊 BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); model1.setResult(formatAddressCheckBo4(bo, city, model, GRADE_AREA)); mav.setModel(model1); } catch (Exception e) { LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + mav.setModel(BasicModel.buildBadRequestModel("缃戠粶寮傚父锛屽缓璁啀娆¤姹傦紒")); } return mav; } /** - * 地址评级(非银联)(城市评分) + * 鍦板潃璇勭骇(闈為摱鑱�)(鍩庡競璇勫垎) */ public Object gradeCityAction(AddressModel model) { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟閿欒锛屽煄甯傚拰鍦板潃涓嶈兘涓虹┖锛�")); return mav; } - // 查询城市是否高德支持 + // 鏌ヨ鍩庡競鏄惁楂樺痉鏀寔 String city = addressService.findCityAmap(model.getCity().trim()); if (StringUtils.isEmpty(city)) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟閿欒锛屽煄甯傝緭鍏ヤ笉鏍囧噯锛�")); return mav; } try { - AddressCheckBo bo = addressService.gradeAmapAddress(model.getChooseId(), city, model.getAddress().trim());// check是走代理 + AddressCheckBo bo = addressService.gradeAmapAddress(model.getChooseId(), city, model.getAddress().trim());// check鏄蛋浠g悊 BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); model1.setResult(formatAddressCheckBo4(bo, city, model, GRADE_CITY)); mav.setModel(model1); } catch (Exception e) { LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + mav.setModel(BasicModel.buildBadRequestModel("缃戠粶寮傚父锛屽缓璁啀娆¤姹傦紒")); } return mav; } /** - * 地址评级(非银联)(国家评分) + * 鍦板潃璇勭骇(闈為摱鑱�)(鍥藉璇勫垎) */ public Object gradeNationAction(AddressModel model) { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟閿欒锛屽煄甯傚拰鍦板潃涓嶈兘涓虹┖锛�")); return mav; } - // 查询城市是否高德支持 + // 鏌ヨ鍩庡競鏄惁楂樺痉鏀寔 String city = addressService.findCityAmap(model.getCity().trim()); if (StringUtils.isEmpty(city)) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟閿欒锛屽煄甯傝緭鍏ヤ笉鏍囧噯锛�")); return mav; } try { - AddressCheckBo bo = addressService.gradeAmapAddress(model.getChooseId(), city, model.getAddress().trim());// check是走代理 + AddressCheckBo bo = addressService.gradeAmapAddress(model.getChooseId(), city, model.getAddress().trim());// check鏄蛋浠g悊 BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); model1.setResult(formatAddressCheckBo4(bo, city, model, GRADE_NATION)); mav.setModel(model1); } catch (Exception e) { LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + mav.setModel(BasicModel.buildBadRequestModel("缃戠粶寮傚父锛屽缓璁啀娆¤姹傦紒")); } return mav; } /** - * 地址反欺诈 (地址验真+周边查询)(非银联) + * 鍦板潃鍙嶆璇� (鍦板潃楠岀湡+鍛ㄨ竟鏌ヨ)(闈為摱鑱�) */ public Object antiFraudAddressAction(AddressModel model) { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟閿欒锛屽煄甯傚拰鍦板潃涓嶈兘涓虹┖锛�")); return mav; } - // 查询城市是否高德支持 + // 鏌ヨ鍩庡競鏄惁楂樺痉鏀寔 String city = addressService.findCityAmap(model.getCity().trim()); if (StringUtils.isEmpty(city)) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟閿欒锛屽煄甯傝緭鍏ヤ笉鏍囧噯锛�")); return mav; } try { AddressCheckBo bo = addressService.antiFraudAmapAddress(model.getChooseId(), city, model.getAddress().trim(), model.getType(), model.getRadius(), model.getNumber(), - model.getPageNo());// check是走代理 + model.getPageNo());// check鏄蛋浠g悊 BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); model1.setResult(formatAddressCheckBo4(bo, city, model, null)); mav.setModel(model1); } catch (Exception e) { LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + mav.setModel(BasicModel.buildBadRequestModel("缃戠粶寮傚父锛屽缓璁啀娆¤姹傦紒")); } return mav; } /** - * 地址反欺诈 (地址验真+周边查询)(非银联) + * 鍦板潃鍙嶆璇� (鍦板潃楠岀湡+鍛ㄨ竟鏌ヨ)(闈為摱鑱�) */ public Object antiFraudAddressBAction(AddressModel model) { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟閿欒锛屽煄甯傚拰鍦板潃涓嶈兘涓虹┖锛�")); return mav; } - // 查询城市是否高德支持 + // 鏌ヨ鍩庡競鏄惁楂樺痉鏀寔 String city = addressService.findCityAmap(model.getCity().trim()); if (StringUtils.isEmpty(city)) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟閿欒锛屽煄甯傝緭鍏ヤ笉鏍囧噯锛�")); return mav; } try { AddressCheckBo bo = addressService.antiFraudAmapAddressB(model.getChooseId(), city, - model.getAddress().trim(), model.getType(), model.getRadius(), model.getNumber());// check是走代理 + model.getAddress().trim(), model.getType(), model.getRadius(), model.getNumber());// check鏄蛋浠g悊 BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); model1.setResult(formatAddressCheckBo4(bo, city, model, null)); mav.setModel(model1); } catch (Exception e) { LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + mav.setModel(BasicModel.buildBadRequestModel("缃戠粶寮傚父锛屽缓璁啀娆¤姹傦紒")); } return mav; } /** - * 地址真实性检查 (v10版) + * 鍦板潃鐪熷疄鎬ф鏌� (v10鐗�) * * @return */ @@ -3013,22 +3013,22 @@ public class AddressController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟閿欒锛屽煄甯傚拰鍦板潃涓嶈兘涓虹┖锛�")); return mav; } String city = addressService.findCityAmap(model.getCity().trim()); if (StringUtils.isEmpty(city)) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟閿欒锛屽煄甯傝緭鍏ヤ笉鏍囧噯锛�")); return mav; } try { - AddressCheckTruth tr = addressService.checkTruth(model.getChooseId(), city, model.getAddress().trim());// check是走代理 + AddressCheckTruth tr = addressService.checkTruth(model.getChooseId(), city, model.getAddress().trim());// check鏄蛋浠g悊 BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); model1.setResult(formatCheckTruth(tr, city, model)); mav.setModel(model1); } catch (Exception e) { LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + mav.setModel(BasicModel.buildBadRequestModel("缃戠粶寮傚父锛屽缓璁啀娆¤姹傦紒")); } return mav; } @@ -3038,7 +3038,7 @@ public class AddressController { if (StringUtils.isEmpty(tr.getCity()) || "[]".equals(tr.getCity())) { tr.setCity(city); } - // 检查相关参数 + // 妫�鏌ョ浉鍏冲弬鏁� if (!FJW_LEVEL.equals(model.getDataLevel())) { tr.setKeyWords(null); tr.setKeyWordsUse(null); @@ -3049,94 +3049,94 @@ public class AddressController { } /** - * 地址评级(v10) + * 鍦板潃璇勭骇(v10) */ public Object gradeTruthAction(AddressModel model) { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟閿欒锛屽煄甯傚拰鍦板潃涓嶈兘涓虹┖锛�")); return mav; } - // 查询城市是否高德支持 + // 鏌ヨ鍩庡競鏄惁楂樺痉鏀寔 String city = addressService.findCityAmap(model.getCity().trim()); if (StringUtils.isEmpty(city)) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟閿欒锛屽煄甯傝緭鍏ヤ笉鏍囧噯锛�")); return mav; } try { - AddressCheckTruth bo = addressService.gradeTruth(model.getChooseId(), city, model.getAddress().trim());// check是走代理 + AddressCheckTruth bo = addressService.gradeTruth(model.getChooseId(), city, model.getAddress().trim());// check鏄蛋浠g悊 BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); model1.setResult(formatGradeTruth(bo, city, model, GRADE_AREA)); mav.setModel(model1); } catch (Exception e) { LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + mav.setModel(BasicModel.buildBadRequestModel("缃戠粶寮傚父锛屽缓璁啀娆¤姹傦紒")); } return mav; } /** - * 地址评级(v10)(城市评分) + * 鍦板潃璇勭骇(v10)(鍩庡競璇勫垎) */ public Object gradeTruthCityAction(AddressModel model) { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟閿欒锛屽煄甯傚拰鍦板潃涓嶈兘涓虹┖锛�")); return mav; } - // 查询城市是否高德支持 + // 鏌ヨ鍩庡競鏄惁楂樺痉鏀寔 String city = addressService.findCityAmap(model.getCity().trim()); if (StringUtils.isEmpty(city)) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟閿欒锛屽煄甯傝緭鍏ヤ笉鏍囧噯锛�")); return mav; } try { - AddressCheckTruth bo = addressService.gradeTruth(model.getChooseId(), city, model.getAddress().trim());// check是走代理 + AddressCheckTruth bo = addressService.gradeTruth(model.getChooseId(), city, model.getAddress().trim());// check鏄蛋浠g悊 BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); model1.setResult(formatGradeTruth(bo, city, model, GRADE_CITY)); mav.setModel(model1); } catch (Exception e) { LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + mav.setModel(BasicModel.buildBadRequestModel("缃戠粶寮傚父锛屽缓璁啀娆¤姹傦紒")); } return mav; } /** - * 地址评级(v10)(国家评分) + * 鍦板潃璇勭骇(v10)(鍥藉璇勫垎) */ public Object gradeTruthNationAction(AddressModel model) { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟閿欒锛屽煄甯傚拰鍦板潃涓嶈兘涓虹┖锛�")); return mav; } - // 查询城市是否高德支持 + // 鏌ヨ鍩庡競鏄惁楂樺痉鏀寔 String city = addressService.findCityAmap(model.getCity().trim()); if (StringUtils.isEmpty(city)) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟閿欒锛屽煄甯傝緭鍏ヤ笉鏍囧噯锛�")); return mav; } try { - AddressCheckTruth bo = addressService.gradeTruth(model.getChooseId(), city, model.getAddress().trim());// check是走代理 + AddressCheckTruth bo = addressService.gradeTruth(model.getChooseId(), city, model.getAddress().trim());// check鏄蛋浠g悊 BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); model1.setResult(formatGradeTruth(bo, city, model, GRADE_NATION)); mav.setModel(model1); } catch (Exception e) { LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + mav.setModel(BasicModel.buildBadRequestModel("缃戠粶寮傚父锛屽缓璁啀娆¤姹傦紒")); } return mav; } /** - * 为返回值格式化掉cityCode和AddressId,用于评级和反欺诈(非银联版) + * 涓鸿繑鍥炲�兼牸寮忓寲鎺塩ityCode鍜孉ddressId锛岀敤浜庤瘎绾у拰鍙嶆璇堬紙闈為摱鑱旂増锛� * * @param tr * @param city @@ -3149,7 +3149,7 @@ public class AddressController { if (StringUtils.isEmpty(tr.getCity()) || "[]".equals(tr.getCity())) { tr.setCity(city); } - // 检查相关参数 + // 妫�鏌ョ浉鍏冲弬鏁� if (!FJW_LEVEL.equals(model.getDataLevel())) { tr.setKeyWords(null); tr.setKeyWordsUse(null); @@ -3180,67 +3180,67 @@ public class AddressController { } /** - * 地址反欺诈 (地址验真+周边查询)(v10) + * 鍦板潃鍙嶆璇� (鍦板潃楠岀湡+鍛ㄨ竟鏌ヨ)(v10) */ public Object antiFraudTruthAction(AddressModel model) { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟閿欒锛屽煄甯傚拰鍦板潃涓嶈兘涓虹┖锛�")); return mav; } - // 查询城市是否高德支持 + // 鏌ヨ鍩庡競鏄惁楂樺痉鏀寔 String city = addressService.findCityAmap(model.getCity().trim()); if (StringUtils.isEmpty(city)) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟閿欒锛屽煄甯傝緭鍏ヤ笉鏍囧噯锛�")); return mav; } try { AddressCheckTruth tr = addressService.antiFraudTruth(model.getChooseId(), city, model.getAddress().trim(), - model.getType(), model.getRadius(), model.getNumber(), model.getPageNo());// check是走代理 + model.getType(), model.getRadius(), model.getNumber(), model.getPageNo());// check鏄蛋浠g悊 BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); model1.setResult(formatCheckTruth(tr, city, model)); mav.setModel(model1); } catch (Exception e) { LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + mav.setModel(BasicModel.buildBadRequestModel("缃戠粶寮傚父锛屽缓璁啀娆¤姹傦紒")); } return mav; } /** - * 地址反欺诈 (地址验真+周边查询)(v10) + * 鍦板潃鍙嶆璇� (鍦板潃楠岀湡+鍛ㄨ竟鏌ヨ)(v10) */ public Object antiFraudTruthBAction(AddressModel model) { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟閿欒锛屽煄甯傚拰鍦板潃涓嶈兘涓虹┖锛�")); return mav; } - // 查询城市是否高德支持 + // 鏌ヨ鍩庡競鏄惁楂樺痉鏀寔 String city = addressService.findCityAmap(model.getCity().trim()); if (StringUtils.isEmpty(city)) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟閿欒锛屽煄甯傝緭鍏ヤ笉鏍囧噯锛�")); return mav; } try { AddressCheckTruth tr = addressService.antiFraudTruthB(model.getChooseId(), city, model.getAddress().trim(), - model.getType(), model.getRadius(), model.getNumber());// check是走代理 + model.getType(), model.getRadius(), model.getNumber());// check鏄蛋浠g悊 BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); model1.setResult(formatCheckTruth(tr, city, model)); mav.setModel(model1); } catch (Exception e) { LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + mav.setModel(BasicModel.buildBadRequestModel("缃戠粶寮傚父锛屽缓璁啀娆¤姹傦紒")); } return mav; } /** - * 地址线下消费评级 + * 鍦板潃绾夸笅娑堣垂璇勭骇 * * @param model * @return @@ -3250,61 +3250,61 @@ public class AddressController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟閿欒锛屽煄甯傚拰鍦板潃涓嶈兘涓虹┖锛�")); return mav; } - // 查询城市是否高德支持 + // 鏌ヨ鍩庡競鏄惁楂樺痉鏀寔 String city = addressService.findCityAmap(model.getCity().trim()); if (StringUtils.isEmpty(city)) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟閿欒锛屽煄甯傝緭鍏ヤ笉鏍囧噯锛�")); return mav; } try { - AddressCheckBo bo = addressService.gradeConsumeOffline(model.getChooseId(), city, model.getAddress().trim());// check是走代理 + AddressCheckBo bo = addressService.gradeConsumeOffline(model.getChooseId(), city, model.getAddress().trim());// check鏄蛋浠g悊 BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); model1.setResult(formatAddressCheckBo4(bo, city, model, GRADE_CONSUME)); mav.setModel(model1); } catch (Exception e) { LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + mav.setModel(BasicModel.buildBadRequestModel("缃戠粶寮傚父锛屽缓璁啀娆¤姹傦紒")); } return mav; } /** - * 地址消费评级(v10) + * 鍦板潃娑堣垂璇勭骇(v10) */ @Deprecated public Object gradeConsumeTruthAction(AddressModel model) { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟閿欒锛屽煄甯傚拰鍦板潃涓嶈兘涓虹┖锛�")); return mav; } - // 查询城市是否高德支持 + // 鏌ヨ鍩庡競鏄惁楂樺痉鏀寔 String city = addressService.findCityAmap(model.getCity().trim()); if (StringUtils.isEmpty(city)) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟閿欒锛屽煄甯傝緭鍏ヤ笉鏍囧噯锛�")); return mav; } try { - AddressCheckTruth bo = addressService.gradeConsumeTruth(model.getChooseId(), city, model.getAddress().trim());// check是走代理 + AddressCheckTruth bo = addressService.gradeConsumeTruth(model.getChooseId(), city, model.getAddress().trim());// check鏄蛋浠g悊 BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); model1.setResult(formatGradeTruth(bo, city, model, GRADE_CONSUME)); mav.setModel(model1); } catch (Exception e) { LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + mav.setModel(BasicModel.buildBadRequestModel("缃戠粶寮傚父锛屽缓璁啀娆¤姹傦紒")); } return mav; } /** - * 地址周边消费评级接口 - *

通过用户输入的地址,得到该地址的经纬度,找到该地址附近的三个非商住小区的小区消费评级评分,取一个平均分。

+ * 鍦板潃鍛ㄨ竟娑堣垂璇勭骇鎺ュ彛 + *

閫氳繃鐢ㄦ埛杈撳叆鐨勫湴鍧�锛屽緱鍒拌鍦板潃鐨勭粡绾害锛屾壘鍒拌鍦板潃闄勮繎鐨勪笁涓潪鍟嗕綇灏忓尯鐨勫皬鍖烘秷璐硅瘎绾ц瘎鍒嗭紝鍙栦竴涓钩鍧囧垎銆�

* * @param model * @return @@ -3314,13 +3314,13 @@ public class AddressController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟閿欒锛屽煄甯傚拰鍦板潃涓嶈兘涓虹┖锛�")); return mav; } - // 查询城市是否高德支持 + // 鏌ヨ鍩庡競鏄惁楂樺痉鏀寔 String city = addressService.findCityAmap(model.getCity().trim()); if (StringUtils.isEmpty(city)) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟閿欒锛屽煄甯傝緭鍏ヤ笉鏍囧噯锛�")); return mav; } @@ -3345,7 +3345,7 @@ public class AddressController { mav.setModel(model1); } catch (Exception e) { LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + mav.setModel(BasicModel.buildBadRequestModel("缃戠粶寮傚父锛屽缓璁啀娆¤姹傦紒")); } return mav; } @@ -3354,11 +3354,11 @@ public class AddressController { public Object riskAction(AddesssMatchModel model) { RestfulModelAndView mav = new RestfulModelAndView(); // if (StringUtils.isEmpty(model.getCity())) { -// mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市不能为空!")); +// mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟閿欒锛屽煄甯備笉鑳戒负绌猴紒")); // return mav; // } if (StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,地址不能为空!")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟閿欒锛屽湴鍧�涓嶈兘涓虹┖锛�")); return mav; } BasicModel resultModel = new BasicModel(HttpStatusCodeEnum.OK); @@ -3420,7 +3420,7 @@ public class AddressController { } } } catch (Exception ex) { - LOGGER.error("风险识别出错:" + ex.getMessage(), ex); + LOGGER.error("椋庨櫓璇嗗埆鍑洪敊锛�" + ex.getMessage(), ex); } resultMap.put("riskLevel", "C"); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AmpController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AmpController.java index 83537e5b7..c8df7ac42 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AmpController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AmpController.java @@ -13,7 +13,7 @@ import com.fangjia.service.datastore.HouseService; public class AmpController { private HouseService houseService; /** - * 获取相似房源 + * 鑾峰彇鐩镐技鎴挎簮 * @param model * @return */ diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ApiUserController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ApiUserController.java index bb8d5735b..ecca83629 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ApiUserController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ApiUserController.java @@ -16,7 +16,7 @@ import org.apache.commons.lang.StringUtils; import java.util.*; /** - * API用户 + * API鐢ㄦ埛 */ @Authority(role = Role.USER) public class ApiUserController { @@ -36,7 +36,7 @@ public class ApiUserController { } RestfulModelAndView mv = new RestfulModelAndView(); if(startDate.after(endDate)){ - mv.setModel(BasicModel.buildBadRequestModel("startDate不能在endDate之后")); + mv.setModel(BasicModel.buildBadRequestModel("startDate涓嶈兘鍦╡ndDate涔嬪悗")); return mv; } String userId = FangjiaApiUtil.parseUserId(apiUserModel.getToken()); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AuctionController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AuctionController.java index 3668027a7..efde95346 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AuctionController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AuctionController.java @@ -23,7 +23,7 @@ import java.util.*; import java.util.regex.Pattern; /** - * 法拍数据提供接口 + * 娉曟媿鏁版嵁鎻愪緵鎺ュ彛 */ //@Authority(role = Role.USER) public class AuctionController { @@ -77,20 +77,20 @@ public class AuctionController { } if(model.getStatus() != null){ if(model.getStatus() == 1){ - params.add(new QueryParam("status", "即将开始")); + params.add(new QueryParam("status", "鍗冲皢寮�濮�")); }else if(model.getStatus() == 2){ - params.add(new QueryParam("status", "进行中")); + params.add(new QueryParam("status", "杩涜涓�")); }else if(model.getStatus() == 3){ - params.add(new QueryParam("status", "已完成")); + params.add(new QueryParam("status", "宸插畬鎴�")); } } if(model.getPropertyType() != null){ if(model.getPropertyType() == 1){ - params.add(new QueryParam("matchEstateType", "普通住宅")); + params.add(new QueryParam("matchEstateType", "鏅�氫綇瀹�")); }else if(model.getPropertyType() == 2){ - params.add(new QueryParam("matchEstateType", "别墅")); + params.add(new QueryParam("matchEstateType", "鍒")); }else if(model.getPropertyType() == 3){ - params.add(new QueryParam("matchEstateType", "商住")); + params.add(new QueryParam("matchEstateType", "鍟嗕綇")); } } params.add(new QueryParam("marketTotalPrice", QueryParam.GREATER_THAN_OPERATOR, 0)); @@ -133,16 +133,16 @@ public class AuctionController { public Object detailAction(AuctionModel model){ RestfulModelAndView mav = new RestfulModelAndView(); if(StringUtils.isBlank(model.getId())){ - mav.setModel(BasicModel.buildBadRequestModel("id不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("id涓嶈兘涓虹┖")); return mav; } if(!ObjectId.isValid(model.getId())){ - mav.setModel(BasicModel.buildBadRequestModel("id非法")); + mav.setModel(BasicModel.buildBadRequestModel("id闈炴硶")); return mav; } PaiMai paiMai = paiMaiService.findById(model.getId()); if(paiMai == null){ - mav.setModel(BasicModel.buildBadRequestModel("房源未找到:" + model.getId())); + mav.setModel(BasicModel.buildBadRequestModel("鎴挎簮鏈壘鍒�:" + model.getId())); return mav; } UniversalDto dto = UniversalDto.newDto(); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AvgPriceController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AvgPriceController.java index ee93a6693..1c34a95ed 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AvgPriceController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AvgPriceController.java @@ -50,10 +50,10 @@ public class AvgPriceController { aroundModel.setMax(Integer.MAX_VALUE); } if(aroundModel.getWeekend() != null && !DateUtil.isSunday(aroundModel.getWeekend())){ - mav.setModel(BasicModel.buildBadRequestModel("weekend不是周末")); + mav.setModel(BasicModel.buildBadRequestModel("weekend涓嶆槸鍛ㄦ湯")); return mav; } - List districts = districtService.findNearestDistrict("普通住宅", aroundModel.getLng(), aroundModel.getLat(), aroundModel.getRadius(), aroundModel.getMax(), FIELDS); + List districts = districtService.findNearestDistrict("鏅�氫綇瀹�", aroundModel.getLng(), aroundModel.getLat(), aroundModel.getRadius(), aroundModel.getMax(), FIELDS); long total = 0l; int count = 0; List stats = new ArrayList(); @@ -89,24 +89,24 @@ public class AvgPriceController { if (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getRegion()) || StringUtils.isBlank(model.getName()) || StringUtils.isBlank(model.getWeekend())) { - mav.setModel(BasicModel.buildBadRequestModel("参数缺失:city(城市),region(区域),name(名称),weekend(时间)是必须参数")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟缂哄け:city(鍩庡競),region(鍖哄煙),name(鍚嶇О),weekend(鏃堕棿)鏄繀椤诲弬鏁�")); return mav; } Date date = DateUtil.parseDate(model.getWeekend(), "yyyy-MM-dd"); if (date == null) { - mav.setModel(BasicModel.buildBadRequestModel("weekend(时间)格式必须是yyyy-MM-dd")); + mav.setModel(BasicModel.buildBadRequestModel("weekend(鏃堕棿)鏍煎紡蹇呴』鏄痽yyy-MM-dd")); return mav; } if (!isWeekend(date)) { - mav.setModel(BasicModel.buildBadRequestModel("weekend(时间)必须是周日")); + mav.setModel(BasicModel.buildBadRequestModel("weekend(鏃堕棿)蹇呴』鏄懆鏃�")); return mav; } District district = districtService .findDistrict(new DistrictKey(model.getCity(), model.getRegion(), model.getName()), model.getCat()); if (district == null) { - mav.setModel(BasicModel.buildBadRequestModel("小区不存在")); + mav.setModel(BasicModel.buildBadRequestModel("灏忓尯涓嶅瓨鍦�")); return mav; } model.set_id(district.getId()); @@ -129,12 +129,12 @@ public class AvgPriceController { } int count = calcCommandService.findAllCalcutingCommondCount(); - mav.setModel(BasicModel.buildOKModel().setResult(count).setMsg("开始重算均价")); + mav.setModel(BasicModel.buildOKModel().setResult(count).setMsg("寮�濮嬮噸绠楀潎浠�")); return mav; } /** - * 判断是否周末 + * 鍒ゆ柇鏄惁鍛ㄦ湯 * * @param date * @return @@ -156,11 +156,11 @@ public class AvgPriceController { try { if (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getRegion()) || StringUtils.isBlank(model.getName()) || StringUtils.isBlank(model.getUsername())) { - mav.setModel(BasicModel.buildBadRequestModel("参数缺失:city(城市),region(区域),name(名称),usename(用户名)是必须参数")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟缂哄け:city(鍩庡競),region(鍖哄煙),name(鍚嶇О),usename(鐢ㄦ埛鍚�)鏄繀椤诲弬鏁�")); return mav; } if (model.getGuidePrice() <= 0) { - mav.setModel(BasicModel.buildBadRequestModel("参数缺失:guidePrice(指导价)必须大于0")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟缂哄け:guidePrice(鎸囧浠�)蹇呴』澶т簬0")); return mav; } @@ -172,7 +172,7 @@ public class AvgPriceController { }else { date_weekend = DateUtil.parseDate(model.getWeekend(), "yyyy-MM-dd"); if(date_weekend == null) { - mav.setModel(BasicModel.buildBadRequestModel("参数:weekend(时间)格式必须是yyyy-MM-dd")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟:weekend(鏃堕棿)鏍煎紡蹇呴』鏄痽yyy-MM-dd")); return mav; } date_weekend = DateUtil.getThisSunday(date_weekend); @@ -192,11 +192,11 @@ public class AvgPriceController { District district = districtService .findDistrict(new DistrictKey(model.getCity(), model.getRegion(), model.getName()), "district"); if (district == null) { - mav.setModel(BasicModel.buildBadRequestModel("小区不存在")); + mav.setModel(BasicModel.buildBadRequestModel("灏忓尯涓嶅瓨鍦�")); return mav; } if (StringUtils.isEmpty(district.getEstateType2())) { - mav.setModel(BasicModel.buildBadRequestModel("小区estateType2不存在")); + mav.setModel(BasicModel.buildBadRequestModel("灏忓尯estateType2涓嶅瓨鍦�")); return mav; } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/BlockController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/BlockController.java index e553064b5..a47cf7652 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/BlockController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/BlockController.java @@ -27,13 +27,13 @@ public class BlockController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getDistrict()) || StringUtils.isBlank(model.getBlock())) { - mav.setModel(BasicModel.buildBadRequestModel("参数缺失:city(城市),district(区域),block(版块名称)是必须参数")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟缂哄け:city(鍩庡競),district(鍖哄煙),block(鐗堝潡鍚嶇О)鏄繀椤诲弬鏁�")); return mav; } if(!RegionData.isCity(model.getCity())){ String city = RegionData.formatCity(model.getCity()); if(null == city){ - mav.setModel(BasicModel.buildBadRequestModel("非法城市:" + model.getCity())); + mav.setModel(BasicModel.buildBadRequestModel("闈炴硶鍩庡競:" + model.getCity())); return mav; }else{ model.setCity(city); @@ -46,7 +46,7 @@ public class BlockController { model.setPeriodCount(1); } if(model.getPeriodCount()< 1 || model.getPeriodCount()>156){ - mav.setModel(BasicModel.buildBadRequestModel("periodCount值不合法,取值范围是:[1-156]")); + mav.setModel(BasicModel.buildBadRequestModel("periodCount鍊间笉鍚堟硶,鍙栧�艰寖鍥存槸锛歔1-156]")); return mav; } @@ -54,7 +54,7 @@ public class BlockController { model.setPeriodType("weekly"); }else{ if(!"weekly".equals(model.getPeriodType()) && !"monthly".equals(model.getPeriodType())){ - mav.setModel(BasicModel.buildBadRequestModel("periodModel值非法,合法值为:weekly,monthly")); + mav.setModel(BasicModel.buildBadRequestModel("periodModel鍊奸潪娉曪紝鍚堟硶鍊间负:weekly,monthly")); return mav; } } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/BusinessEstateController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/BusinessEstateController.java index 615e47880..d44d1a5d8 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/BusinessEstateController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/BusinessEstateController.java @@ -60,11 +60,11 @@ public class BusinessEstateController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "小区所在城市必须输入")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "灏忓尯鎵�鍦ㄥ煄甯傚繀椤昏緭鍏�")); return mav; } if (!"shop".equals(model.getKind()) && !"office".equals(model.getKind())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "kind必须输入")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "kind蹇呴』杈撳叆")); return mav; } @@ -79,7 +79,7 @@ public class BusinessEstateController { } /** - * 取得分页参数 + * 鍙栧緱鍒嗛〉鍙傛暟 */ private Pager getPager(BusinessEstateModel model) { Pager pager = new Pager(); @@ -99,10 +99,10 @@ public class BusinessEstateController { } /** - * 取得经纬度参数 + * 鍙栧緱缁忕含搴﹀弬鏁� */ private BusinessEstateModel processlatLng(BusinessEstateModel model) { - // 是否输入半径查询,其他情况直接moedel查询即可 + // 鏄惁杈撳叆鍗婂緞鏌ヨ锛屽叾浠栨儏鍐电洿鎺oedel鏌ヨ鍗冲彲 if (isRadiusSearch(model)) { Long lng = model.getLng(); Long lat = model.getLat(); @@ -136,7 +136,7 @@ public class BusinessEstateController { } /** - * 获取小区具体信息 + * 鑾峰彇灏忓尯鍏蜂綋淇℃伅 */ private FacetQueryResult getDistrictDtos(Menu menu, Pager pager, BusinessEstateModel model, HttpServletRequest request, String kind) { @@ -152,13 +152,13 @@ public class BusinessEstateController { Map statMap; Map rentStatMap=null; if ("shop".equals(kind)) { - //statMap = districtStatService.findBusinessEstateStat(districtService.getDistrictKeys(result), "商铺"); + //statMap = districtStatService.findBusinessEstateStat(districtService.getDistrictKeys(result), "鍟嗛摵"); statMap = shopStatService.findShopStatByParams(districtService.getDistrictKeys(result)); - rentStatMap = businessStatRentService.findBusinessStat(districtService.getDistrictKeys(result), "商铺"); + rentStatMap = businessStatRentService.findBusinessStat(districtService.getDistrictKeys(result), "鍟嗛摵"); } else if ("office".equals(kind)) { - //statMap = districtStatService.findBusinessEstateStat(districtService.getDistrictKeys(result), "写字楼"); + //statMap = districtStatService.findBusinessEstateStat(districtService.getDistrictKeys(result), "鍐欏瓧妤�"); statMap = officeStatService.findOfficeStatByParams(districtService.getDistrictKeys(result)); - rentStatMap = businessStatRentService.findBusinessStat(districtService.getDistrictKeys(result), "写字楼"); + rentStatMap = businessStatRentService.findBusinessStat(districtService.getDistrictKeys(result), "鍐欏瓧妤�"); } else { statMap = districtStatService.findDistrictStat(districtService.getDistrictKeys(result)); } @@ -190,13 +190,13 @@ public class BusinessEstateController { districtDto.setRentStat(Arrays.asList(rentstatDto)); } } - // 若存在外景图则只考虑外景图 + // 鑻ュ瓨鍦ㄥ鏅浘鍒欏彧鑰冭檻澶栨櫙鍥� List outPics = bo.getOutPics(); if (CollectionUtils.isEmpty(outPics)) { outPics = floorplanPics2Strs(bo.getPics()); } if (CollectionUtils.isNotEmpty(outPics)) { - // 标志图取第一张 + // 鏍囧織鍥惧彇绗竴寮� districtDto.setPic(outPics.get(0)); if (outPics.size() <= 5) { districtDto.setPics(outPics); @@ -219,7 +219,7 @@ public class BusinessEstateController { } /** - * 房型图列表转换为string列表 + * 鎴垮瀷鍥惧垪琛ㄨ浆鎹负string鍒楄〃 * * @param srcs * @return @@ -242,13 +242,13 @@ public class BusinessEstateController { } /** - * 估价小区、商铺、写字楼查询 + * 浼颁环灏忓尯銆佸晢閾恒�佸啓瀛楁ゼ鏌ヨ */ public Object evaListAction(BusinessEstateModel model, HttpServletRequest request) { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "小区所在城市必须输入")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "灏忓尯鎵�鍦ㄥ煄甯傚繀椤昏緭鍏�")); return mav; } @@ -294,7 +294,7 @@ public class BusinessEstateController { } /** - * 是否可以提供经纬度 + * 鏄惁鍙互鎻愪緵缁忕含搴� * * @param request * @return diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ChartController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ChartController.java index 9cebb98fc..2a9769377 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ChartController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ChartController.java @@ -38,29 +38,29 @@ public class ChartController { private final static SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss"); /** - * 小区Service + * 灏忓尯Service */ private DistrictService districtService; /** - * 小区均价Service + * 灏忓尯鍧囦环Service */ private DistrictStatService districtStatService; /** - * 城市区域板块均价Service + * 鍩庡競鍖哄煙鏉垮潡鍧囦环Service */ private RegionStatService regionStatService; /** - * 图表generator + * 鍥捐〃generator */ private ChartGenerator gicGenerator; private String datePattern = "MM-dd"; /** - * 获取小区走势图Action + * 鑾峰彇灏忓尯璧板娍鍥続ction * * @param model * @return @@ -70,13 +70,13 @@ public class ChartController { mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getRegion()) || StringUtils.isBlank(model.getName()) || 0 == model.getHeight() || 0 == model.getWidth()) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "小区所在城市,所在区域,小区名,走势图高度,走势图宽度为必填项")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "灏忓尯鎵�鍦ㄥ煄甯�,鎵�鍦ㄥ尯鍩�,灏忓尯鍚�,璧板娍鍥鹃珮搴�,璧板娍鍥惧搴︿负蹇呭~椤�")); return mav; } DistrictBo districtBo = this.districtService.findByFullMode(new DistrictKey(model.getCity(), model.getRegion(), model .getName())); if (null == districtBo) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "小区不存在,请检查城市名,区域,小区名")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "灏忓尯涓嶅瓨鍦紝璇锋鏌ュ煄甯傚悕,鍖哄煙,灏忓尯鍚�")); return mav; } if (StringUtils.isEmpty(districtBo.getKind())) { @@ -100,7 +100,7 @@ public class ChartController { .getRegion(), districtBo.getName()), DistrictKindEnum.gongyu.getValue(), date, count); } if (CollectionUtils.isEmpty(districtStatList) && CollectionUtils.isEmpty(villaStatList)) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "对应的小区无均价数据")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "瀵瑰簲鐨勫皬鍖烘棤鍧囦环鏁版嵁")); return mav; } GoogleImageChartStyleConfig config = new GoogleImageChartStyleConfig("lxy", model.getWidth(), model.getHeight()); @@ -118,7 +118,7 @@ public class ChartController { villaStatList, ChartTransformer.AVGPRICE4SHOW_TRANSFORMER) : null; NumberRange n = GoogleImageChartUtils.getNumberRange(districtStats, villaStats); if (null == n) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "对应的小区无均价数据")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "瀵瑰簲鐨勫皬鍖烘棤鍧囦环鏁版嵁")); return mav; } int min = n.getMinimumInteger(); @@ -145,7 +145,7 @@ public class ChartController { } /** - * 获取小区走势数据Action + * 鑾峰彇灏忓尯璧板娍鏁版嵁Action * * @param model * @return @@ -155,13 +155,13 @@ public class ChartController { mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getRegion()) || StringUtils.isBlank(model.getName())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "小区所在城市,所在区域,小区名为必填项")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "灏忓尯鎵�鍦ㄥ煄甯�,鎵�鍦ㄥ尯鍩�,灏忓尯鍚嶄负蹇呭~椤�")); return mav; } DistrictBo districtBo = this.districtService.findByFullMode(new DistrictKey(model.getCity(), model.getRegion(), model .getName())); if (null == districtBo) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "小区不存在,请检查城市名,区域,小区名")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "灏忓尯涓嶅瓨鍦紝璇锋鏌ュ煄甯傚悕,鍖哄煙,灏忓尯鍚�")); return mav; } if (StringUtils.isEmpty(districtBo.getKind())) { @@ -185,7 +185,7 @@ public class ChartController { .getRegion(), districtBo.getName()), DistrictKindEnum.gongyu.getValue(), date, count); } if (CollectionUtils.isEmpty(districtStatList) && CollectionUtils.isEmpty(villaStatList)) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "对应的小区无均价数据")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "瀵瑰簲鐨勫皬鍖烘棤鍧囦环鏁版嵁")); return mav; } @@ -230,7 +230,7 @@ public class ChartController { } /** - * 区域走势图Action + * 鍖哄煙璧板娍鍥続ction * * @param model * @return @@ -240,15 +240,15 @@ public class ChartController { mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getRegion()) || 0 == model.getHeight() || 0 == model.getWidth()) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "城市名,区域,走势图高度,走势图宽度为必填项")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鍩庡競鍚�,鍖哄煙,璧板娍鍥鹃珮搴�,璧板娍鍥惧搴︿负蹇呭~椤�")); return mav; } - // 区域均价 + // 鍖哄煙鍧囦环 Date date = new Date(); List regionStatList = regionStatService.findRegionStat(model.getCity(), model.getRegion(), null, date, model .getWeekCount()); if (CollectionUtils.isEmpty(regionStatList)) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "该区域无均价数据")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "璇ュ尯鍩熸棤鍧囦环鏁版嵁")); return mav; } GoogleImageChartStyleConfig config = new GoogleImageChartStyleConfig("lxy", model.getWidth(), model.getHeight()); @@ -264,7 +264,7 @@ public class ChartController { ChartTransformer.AVGPRICE4SHOW_TRANSFORMER); NumberRange n = GoogleImageChartUtils.getNumberRange(regionStats); if(null == n) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "该区域无均价数据")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "璇ュ尯鍩熸棤鍧囦环鏁版嵁")); return mav; } int min = n.getMinimumInteger(); @@ -291,7 +291,7 @@ public class ChartController { } /** - * 区域走势数据Action + * 鍖哄煙璧板娍鏁版嵁Action * * @param model * @return @@ -300,15 +300,15 @@ public class ChartController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getRegion())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "城市名,区域为必填项")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鍩庡競鍚�,鍖哄煙涓哄繀濉」")); return mav; } - // 区域均价 + // 鍖哄煙鍧囦环 Date date = new Date(); List regionStatList = regionStatService.findRegionStat(model.getCity(), model.getRegion(), null, date, model .getWeekCount()); if (CollectionUtils.isEmpty(regionStatList)) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "该区域无均价数据")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "璇ュ尯鍩熸棤鍧囦环鏁版嵁")); return mav; } Map regionStatMap = new HashMap(); @@ -330,7 +330,7 @@ public class ChartController { } /** - * 板块走势图Action + * 鏉垮潡璧板娍鍥続ction * * @param model * @return @@ -340,15 +340,15 @@ public class ChartController { mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getRegion()) || StringUtils.isBlank(model.getBlock())|| 0 == model.getHeight() || 0 == model.getWidth()) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "城市名,区域,板块,走势图高度,走势图宽度为必填项")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鍩庡競鍚�,鍖哄煙,鏉垮潡,璧板娍鍥鹃珮搴�,璧板娍鍥惧搴︿负蹇呭~椤�")); return mav; } - // 区域均价 + // 鍖哄煙鍧囦环 Date date = new Date(); List blockStatList = regionStatService.findRegionStat(model.getCity(), model.getRegion(), model.getBlock(), date, model .getWeekCount()); if (CollectionUtils.isEmpty(blockStatList)) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "该板块无均价数据")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "璇ユ澘鍧楁棤鍧囦环鏁版嵁")); return mav; } GoogleImageChartStyleConfig config = new GoogleImageChartStyleConfig("lxy", model.getWidth(), model.getHeight()); @@ -364,7 +364,7 @@ public class ChartController { ChartTransformer.AVGPRICE4SHOW_TRANSFORMER); NumberRange n = GoogleImageChartUtils.getNumberRange(regionStats); if(null == n) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "该板块无均价数据")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "璇ユ澘鍧楁棤鍧囦环鏁版嵁")); return mav; } int min = n.getMinimumInteger(); @@ -391,7 +391,7 @@ public class ChartController { } /** - * 板块走势数据Action + * 鏉垮潡璧板娍鏁版嵁Action * * @param model * @return @@ -400,15 +400,15 @@ public class ChartController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getRegion()) || StringUtils.isBlank(model.getBlock())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "城市名,区域,板块为必填项")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鍩庡競鍚�,鍖哄煙,鏉垮潡涓哄繀濉」")); return mav; } - // 区域均价 + // 鍖哄煙鍧囦环 Date date = new Date(); List blockStatList = regionStatService.findRegionStat(model.getCity(), model.getRegion(), model.getBlock(), date, model .getWeekCount()); if (CollectionUtils.isEmpty(blockStatList)) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "该板块无均价数据")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "璇ユ澘鍧楁棤鍧囦环鏁版嵁")); return mav; } Map blockStatMap = new HashMap(); @@ -430,7 +430,7 @@ public class ChartController { } /** - * 城市走势图Action + * 鍩庡競璧板娍鍥続ction * * @param model * @return @@ -439,15 +439,15 @@ public class ChartController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity()) || 0 == model.getHeight() || 0 == model.getWidth()) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "城市名,走势图高度,走势图宽度为必填项")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鍩庡競鍚�,璧板娍鍥鹃珮搴�,璧板娍鍥惧搴︿负蹇呭~椤�")); return mav; } - // 城市均价 + // 鍩庡競鍧囦环 Date date = new Date(); List cityStatList = regionStatService.findRegionStat(model.getCity(), null, null, date, model .getWeekCount()); if (CollectionUtils.isEmpty(cityStatList)) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "该城市无均价数据")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "璇ュ煄甯傛棤鍧囦环鏁版嵁")); return mav; } GoogleImageChartStyleConfig config = new GoogleImageChartStyleConfig("lxy", model.getWidth(), model.getHeight()); @@ -463,7 +463,7 @@ public class ChartController { ChartTransformer.AVGPRICE4SHOW_TRANSFORMER); NumberRange n = GoogleImageChartUtils.getNumberRange(regionStats); if(null == n) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "该城市无均价数据")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "璇ュ煄甯傛棤鍧囦环鏁版嵁")); return mav; } int min = n.getMinimumInteger(); @@ -491,7 +491,7 @@ public class ChartController { /** - * 城市走势数据Action + * 鍩庡競璧板娍鏁版嵁Action * * @param model * @return @@ -500,15 +500,15 @@ public class ChartController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "城市名为必填项")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鍩庡競鍚嶄负蹇呭~椤�")); return mav; } - // 城市均价 + // 鍩庡競鍧囦环 Date date = new Date(); List cityStatList = regionStatService.findRegionStat(model.getCity(), null, null, date, model .getWeekCount()); if (CollectionUtils.isEmpty(cityStatList)) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "该城市无均价数据")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "璇ュ煄甯傛棤鍧囦环鏁版嵁")); return mav; } Map cityStatMap = new HashMap(); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CityController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CityController.java index e39e0958f..dd95fab31 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CityController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CityController.java @@ -61,19 +61,19 @@ import com.fangjia.service.web.MenuService; import javax.validation.Valid; /** - * 城市相关接口 + * 鍩庡競鐩稿叧鎺ュ彛 * * @author liupei */ @Authority(role = Role.USER) public class CityController { /** - * 菜单Service + * 鑿滃崟Service */ private MenuService menuService; /** - * 城市区域板块均价Service + * 鍩庡競鍖哄煙鏉垮潡鍧囦环Service */ private RegionStatService regionStatService; private RegionBlockService regionBlockService; @@ -98,10 +98,10 @@ public class CityController { } /** - * 城市列表 + * 鍩庡競鍒楄〃 * @param geoType - * @param keyword 查询关键词 - * @param fetchAlias 是否返回别名数据 + * @param keyword 鏌ヨ鍏抽敭璇� + * @param fetchAlias 鏄惁杩斿洖鍒悕鏁版嵁 * @return */ public Object listAction(@Param(name = "geoType") String geoType, @Param(name = "keyword") String keyword, @@ -142,7 +142,7 @@ public class CityController { } Collections.sort(cities, new Comparator() { - // 下面这个实现,返回正数时city1往后移动,city2往前 + // 涓嬮潰杩欎釜瀹炵幇锛岃繑鍥炴鏁版椂city1寰�鍚庣Щ鍔紝city2寰�鍓� public int compare(CityDto city1, CityDto city2) { if (city1.getFirstLetter().compareToIgnoreCase(city2.getFirstLetter()) == 0) { ServerArea serverArea1 = ServerAreaData.getServerAreaBySpellDefaultNull(city1.getSpell()); @@ -186,7 +186,7 @@ public class CityController { } } Collections.sort(cities, new Comparator() { - // 下面这个实现,返回正数时city1往后移动,city2往前 + // 涓嬮潰杩欎釜瀹炵幇锛岃繑鍥炴鏁版椂city1寰�鍚庣Щ鍔紝city2寰�鍓� public int compare(CityDto city1, CityDto city2) { if (city1.getFirstLetter().compareToIgnoreCase(city2.getFirstLetter()) == 0) { ServerArea serverArea1 = ServerAreaData.getServerAreaBySpellDefaultNull(city1.getSpell()); @@ -215,7 +215,7 @@ public class CityController { } /** - * 新版token验证 + * 鏂扮増token楠岃瘉 * * @param token * @return @@ -225,7 +225,7 @@ public class CityController { if (tokenMap == null) { return null; } - // token验证后,拿取出的字段再去数据库验证一遍 + // token楠岃瘉鍚庯紝鎷垮彇鍑虹殑瀛楁鍐嶅幓鏁版嵁搴撻獙璇佷竴閬� if (StringUtils.isNotBlank(tokenMap.get("userid")) && !"null".equals(tokenMap.get("userid"))) { List params = new ArrayList(); params.add(new QueryParam("ID", tokenMap.get("userid"))); @@ -240,13 +240,13 @@ public class CityController { } /** - * 获取指定城市下的所有区域 + * 鑾峰彇鎸囧畾鍩庡競涓嬬殑鎵�鏈夊尯鍩� */ public Object regionsAction(@Param(name = "city") String city ,@Param(name="scope") String scope) { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(city)) { - mav.setModel(BasicModel.buildBadRequestModel("城市名为必填项")); + mav.setModel(BasicModel.buildBadRequestModel("鍩庡競鍚嶄负蹇呭~椤�")); return mav; } if(!RegionData.isCity(city)){ @@ -254,13 +254,13 @@ public class CityController { if(StringUtils.isNotBlank(formatCity)){ city = formatCity; }else{ - mav.setModel(BasicModel.buildBadRequestModel("city非法")); + mav.setModel(BasicModel.buildBadRequestModel("city闈炴硶")); return mav; } } ServerArea serverArea = ServerAreaData.getServerAreaByCity(city); if (null == serverArea) { - mav.setModel(BasicModel.buildBadRequestModel("对应城市不存在")); + mav.setModel(BasicModel.buildBadRequestModel("瀵瑰簲鍩庡競涓嶅瓨鍦�")); return mav; } List regions = regionBlockService.getRegionBlockListByCity(city, 1); @@ -280,7 +280,7 @@ public class CityController { } /** - * 获取经纬度偏移值 + * 鑾峰彇缁忕含搴﹀亸绉诲�� */ public Object offsetAction(@Param(name = "lng") Double lng, @Param(name = "lat") Double lat) { RestfulModelAndView mav = new RestfulModelAndView(); @@ -303,18 +303,18 @@ public class CityController { } /** - * 获取某城市的筛选条件Action + * 鑾峰彇鏌愬煄甯傜殑绛涢�夋潯浠禔ction */ public Object conditionAction(@Param(name = "city") String city) { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(city)) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "城市名为必填项")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鍩庡競鍚嶄负蹇呭~椤�")); return mav; } ServerArea serverArea = ServerAreaData.getServerAreaByDisplayDefaultNull(city); if (null == serverArea) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "对应的城市不存在")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "瀵瑰簲鐨勫煄甯備笉瀛樺湪")); return mav; } List regions = this.menuService.getRegionsByCity(serverArea, MenuCategoryEnum.ershoufang); @@ -359,19 +359,19 @@ public class CityController { } /** - * 获取某城市的筛选条件Action + * 鑾峰彇鏌愬煄甯傜殑绛涢�夋潯浠禔ction */ public Object condition2Action(@Param(name = "city") String city) { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(city)) { - mav.setModel(BasicModel.buildBadRequestModel("城市名为必填项")); + mav.setModel(BasicModel.buildBadRequestModel("鍩庡競鍚嶄负蹇呭~椤�")); return mav; } ServerArea serverArea = ServerAreaData.getServerAreaByDisplayDefaultNull(city); if (null == serverArea) { - mav.setModel(BasicModel.buildBadRequestModel("对应的城市不存在")); + mav.setModel(BasicModel.buildBadRequestModel("瀵瑰簲鐨勫煄甯備笉瀛樺湪")); return mav; } List regions = this.menuService.getRegionsByCity(serverArea, MenuCategoryEnum.ershoufang); @@ -416,7 +416,7 @@ public class CityController { } /** - * 城市均价Action + * 鍩庡競鍧囦环Action * * @return */ @@ -424,12 +424,12 @@ public class CityController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(city)) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "城市名为必填项")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鍩庡競鍚嶄负蹇呭~椤�")); return mav; } ServerArea serverArea = ServerAreaData.getServerAreaByCity(city); if (null == serverArea) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "对应的城市不存在")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "瀵瑰簲鐨勫煄甯備笉瀛樺湪")); return mav; } if (null == weekCount || 0 == weekCount) { @@ -437,7 +437,7 @@ public class CityController { } List cityStatList = regionStatService.findRegionStat(city, null, null, new Date(), weekCount); if (CollectionUtils.isEmpty(cityStatList)) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "该城市没有均价数据")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "璇ュ煄甯傛病鏈夊潎浠锋暟鎹�")); return mav; } Map map = new HashMap(1); @@ -448,7 +448,7 @@ public class CityController { /** - * 城市均价Action + * 鍩庡競鍧囦环Action * * @return */ @@ -456,7 +456,7 @@ public class CityController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(city)) { - mav.setModel(BasicModel.buildBadRequestModel("city不能为null")); + mav.setModel(BasicModel.buildBadRequestModel("city涓嶈兘涓簄ull")); return mav; } if (!RegionData.isCity(city)) { @@ -464,20 +464,20 @@ public class CityController { if (StringUtils.isNotBlank(formatCity)) { city = formatCity; } else { - mav.setModel(BasicModel.buildBadRequestModel("city非法")); + mav.setModel(BasicModel.buildBadRequestModel("city闈炴硶")); return mav; } } ServerArea serverArea = ServerAreaData.getServerAreaByCity(city); if (null == serverArea) { - mav.setModel(BasicModel.buildBadRequestModel("city非法")); + mav.setModel(BasicModel.buildBadRequestModel("city闈炴硶")); return mav; } if (null == periodCount || 0 == periodCount) { periodCount = 1; } if (periodCount < 1 || periodCount > 36) { - mav.setModel(BasicModel.buildBadRequestModel("periodCount值不合法,取值范围是:[1-36]")); + mav.setModel(BasicModel.buildBadRequestModel("periodCount鍊间笉鍚堟硶,鍙栧�艰寖鍥存槸锛歔1-36]")); return mav; } @@ -485,11 +485,11 @@ public class CityController { calendar.add(Calendar.MONTH, -periodCount); int year = calendar.get(Calendar.YEAR); - int month = calendar.get(Calendar.MONTH) + 1; // 注意:月份从 0 开始,需要加 1 + int month = calendar.get(Calendar.MONTH) + 1; // 娉ㄦ剰锛氭湀浠戒粠 0 寮�濮嬶紝闇�瑕佸姞 1 int montyInt = year * 100 + month; List cityStats = citySellStatService.findNearCityStat(city, montyInt, periodCount); if (CollectionUtils.isEmpty(cityStats)) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "该城市没有均价数据")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "璇ュ煄甯傛病鏈夊潎浠锋暟鎹�")); return mav; } @@ -509,7 +509,7 @@ public class CityController { return mav; } /** - * 城市均价范围Action + * 鍩庡競鍧囦环鑼冨洿Action * * @return */ @@ -517,12 +517,12 @@ public class CityController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(city)) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "城市名为必填项")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鍩庡競鍚嶄负蹇呭~椤�")); return mav; } ServerArea serverArea = ServerAreaData.getServerAreaByDisplayDefaultNull(city); if (null == serverArea) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "对应的城市不存在")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "瀵瑰簲鐨勫煄甯備笉瀛樺湪")); return mav; } DistrictStat sellMax = districtStatService.findMaxDistrictStatInCity(city); @@ -550,7 +550,7 @@ public class CityController { } /** - * 城市均价范围Action + * 鍩庡競鍧囦环鑼冨洿Action * @version V2 * * @return @@ -560,12 +560,12 @@ public class CityController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(city)) { - mav.setModel(BasicModel.buildBadRequestModel("城市名为必填项")); + mav.setModel(BasicModel.buildBadRequestModel("鍩庡競鍚嶄负蹇呭~椤�")); return mav; } ServerArea serverArea = ServerAreaData.getServerAreaByDisplayDefaultNull(city); if (null == serverArea) { - mav.setModel(BasicModel.buildBadRequestModel("对应的城市不存在")); + mav.setModel(BasicModel.buildBadRequestModel("瀵瑰簲鐨勫煄甯備笉瀛樺湪")); return mav; } DistrictStat sellMax = districtStatService.findMaxDistrictStatInCity(city); @@ -593,7 +593,7 @@ public class CityController { } /** - * 城市均价范围Action + * 鍩庡競鍧囦环鑼冨洿Action * * @return */ @@ -601,12 +601,12 @@ public class CityController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(city)) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "城市名为必填项")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鍩庡競鍚嶄负蹇呭~椤�")); return mav; } ServerArea serverArea = ServerAreaData.getServerAreaByDisplayDefaultNull(city); if (null == serverArea) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "对应的城市不存在")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "瀵瑰簲鐨勫煄甯備笉瀛樺湪")); return mav; } if (offset == null) { @@ -641,10 +641,10 @@ public class CityController { } /** - * 城市区域均价接口
- * 获得该城市所有区域的价格数据 + * 鍩庡競鍖哄煙鍧囦环鎺ュ彛
+ * 鑾峰緱璇ュ煄甯傛墍鏈夊尯鍩熺殑浠锋牸鏁版嵁 * @author yinjihuan - * @date 2016年9月1日 + * @date 2016骞�9鏈�1鏃� * @param city * @return */ @@ -653,7 +653,7 @@ public class CityController { mav.setViewType("rest"); if (StringUtils.isBlank(city)) { - mav.setModel(BasicModel.buildBadRequestModel("城市名为必填项")); + mav.setModel(BasicModel.buildBadRequestModel("鍩庡競鍚嶄负蹇呭~椤�")); return mav; } if(!RegionData.isCity(city)){ @@ -661,13 +661,13 @@ public class CityController { if(StringUtils.isNotBlank(formatCity)){ city = formatCity; }else{ - mav.setModel(BasicModel.buildBadRequestModel("city非法")); + mav.setModel(BasicModel.buildBadRequestModel("city闈炴硶")); return mav; } } ServerArea serverArea = ServerAreaData.getServerAreaByDisplayDefaultNull(city); if (null == serverArea) { - mav.setModel(BasicModel.buildBadRequestModel("对应的城市不存在")); + mav.setModel(BasicModel.buildBadRequestModel("瀵瑰簲鐨勫煄甯備笉瀛樺湪")); return mav; } @@ -698,7 +698,7 @@ public class CityController { mav.setViewType("rest"); List citys = serverAreaService.findAllCitysString(); if(!citys.contains(city)){ - mav.setModel(BasicModel.buildBadRequestModel("该城市不存在")); + mav.setModel(BasicModel.buildBadRequestModel("璇ュ煄甯備笉瀛樺湪")); return mav; } List citySellStats = citySellStatService.getAllWithMonths(city, monthCount+1); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CmbController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CmbController.java index 2855315c6..9e72ae99f 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CmbController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CmbController.java @@ -26,7 +26,7 @@ import java.util.Iterator; import java.util.List; /** - * 招商银行地址分析接口 + * 鎷涘晢閾惰鍦板潃鍒嗘瀽鎺ュ彛 */ @Authority(role = Role.USER) public class CmbController { @@ -59,7 +59,7 @@ public class CmbController { } } if(city == null || region == null){ - mav.setModel(BasicModel.buildBadRequestModel("city或者region非法!")); + mav.setModel(BasicModel.buildBadRequestModel("city鎴栬�卹egion闈炴硶!")); return mav; } model.setAddress(DataUtil.toDBCcase(model.getAddress())); @@ -201,7 +201,7 @@ public class CmbController { str = str.replaceFirst("^" + province, ""); province = ProvinceData.getDisplay(province); str = str.replaceFirst("^" + province, ""); - str = str.replaceFirst("^" + city + "(市|县)?", ""); + str = str.replaceFirst("^" + city + "(甯倈鍘�)?", ""); for(String region : RegionData.getRegionByCity(city)){ str = str.replaceFirst(RegionData.getOrgName(city, region), ""); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java index 715bf5ae8..964599c0d 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java @@ -24,14 +24,14 @@ import java.math.BigDecimal; import java.util.*; /** - * 商业地产 + * 鍟嗕笟鍦颁骇 * * @since 2025/9/16 */ @Authority(role = Role.USER) public class CommercialController { - private static final List GAODE_LEVEL = Arrays.asList("兴趣点", "门牌号", "单元号", "楼层", "房间", "门址", "住宅区","村庄"); + private static final List GAODE_LEVEL = Arrays.asList("鍏磋叮鐐�", "闂ㄧ墝鍙�", "鍗曞厓鍙�", "妤煎眰", "鎴块棿", "闂ㄥ潃", "浣忓畢鍖�","鏉戝簞"); private ApiUserCfgService apiUserCfgService; private DealSampleService dealSampleService; @@ -48,7 +48,7 @@ public class CommercialController { Double ratio = getUserPriceRatio(request); JSONObject json = locationEvaluateApi(model, AvmUrls.SHOPSELL_EVALUATE); if (json != null) { - if (json.containsKey("msg") && "成功".equals(json.getString("msg"))) { + if (json.containsKey("msg") && "鎴愬姛".equals(json.getString("msg"))) { HashMap resultMap = new HashMap(); long totalPrice = getRatioPrice(request, Long.valueOf(json.getString("totalPrice"))); @@ -63,10 +63,10 @@ public class CommercialController { mav.setModel(BasicModel.buildOKModel().setResult(resultMap)); } else { - mav.setModel(BasicModel.buildBadRequestModel("该地址不支持估价!")); + mav.setModel(BasicModel.buildBadRequestModel("璇ュ湴鍧�涓嶆敮鎸佷及浠凤紒")); } } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("鏈嶅姟鍗囩骇涓�...")); } return mav; @@ -84,7 +84,7 @@ public class CommercialController { JSONObject json = locationEvaluateApi(model, AvmUrls.SHOPSELL_EVALUATE); if (json != null) { - if (json.containsKey("msg") && "成功".equals(json.getString("msg"))) { + if (json.containsKey("msg") && "鎴愬姛".equals(json.getString("msg"))) { if (json.containsKey("case")) { List dtos = createBusiness((JSONArray) json.get("case"), "sell", ratio); mav.setModel(BasicModel.buildOKModel().setResult(dtos)); @@ -96,14 +96,14 @@ public class CommercialController { mav.setModel(BasicModel.buildServerErrorModel().setMsg(json.getString("msg"))); } } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("鏈嶅姟鍗囩骇涓�...")); } return mav; } /** - * 湖北征信定制接口 + * 婀栧寳寰佷俊瀹氬埗鎺ュ彛 * @param model * @param request * @return @@ -120,7 +120,7 @@ public class CommercialController { JSONObject json = locationEvaluateApi(model, AvmUrls.SHOPSELL_EVALUATE); if (json != null) { - if (json.containsKey("msg") && "成功".equals(json.getString("msg"))) { + if (json.containsKey("msg") && "鎴愬姛".equals(json.getString("msg"))) { if (json.containsKey("unitPrice") && json.containsKey("location")) { Double unitPrice = null; if(json.get("unitPrice") != null){ @@ -160,14 +160,14 @@ public class CommercialController { mav.setModel(BasicModel.buildOKModel().setResult(null)); } } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("鏈嶅姟鍗囩骇涓�...")); } return mav; } /** - * 商铺出租 + * 鍟嗛摵鍑虹 * @param model * @return */ @@ -183,7 +183,7 @@ public class CommercialController { Double ratio = getUserPriceRatio(request); JSONObject json = locationEvaluateApi(model, AvmUrls.SHOPRENT_EVALUATE); if (json != null) { - if (json.containsKey("msg") && "成功".equals(json.getString("msg"))) { + if (json.containsKey("msg") && "鎴愬姛".equals(json.getString("msg"))) { HashMap resultMap = new HashMap(); long totalPrice = getRatioPrice(request, Long.valueOf(json.getString("totalPrice"))); @@ -202,7 +202,7 @@ public class CommercialController { mav.setModel(BasicModel.buildServerErrorModel().setMsg(json.getString("msg"))); } } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("鏈嶅姟鍗囩骇涓�...")); } return mav; @@ -358,7 +358,7 @@ public class CommercialController { Double ratio = getUserPriceRatio(request); JSONObject json = locationEvaluateApi(model, AvmUrls.SHOPRENT_EVALUATE); if (json != null) { - if (json.containsKey("msg") && "成功".equals(json.getString("msg"))) { + if (json.containsKey("msg") && "鎴愬姛".equals(json.getString("msg"))) { if (json.containsKey("case")) { List dtos = createBusiness((JSONArray) json.get("case"), "rent", ratio); mav.setModel(BasicModel.buildOKModel().setResult(dtos)); @@ -370,7 +370,7 @@ public class CommercialController { mav.setModel(BasicModel.buildServerErrorModel().setMsg(json.getString("msg"))); } } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("鏈嶅姟鍗囩骇涓�...")); } return mav; @@ -378,7 +378,7 @@ public class CommercialController { /** - * 湖北征信定制出租案例接口 + * 婀栧寳寰佷俊瀹氬埗鍑虹妗堜緥鎺ュ彛 * @param model * @param request * @return @@ -394,7 +394,7 @@ public class CommercialController { Double ratio = getUserPriceRatio(request); JSONObject json = locationEvaluateApi(model, AvmUrls.SHOPRENT_EVALUATE); if (json != null) { - if (json.containsKey("msg") && "成功".equals(json.getString("msg"))) { + if (json.containsKey("msg") && "鎴愬姛".equals(json.getString("msg"))) { if (json.containsKey("unitPrice") && json.containsKey("location")) { Double minPrice = null; @@ -435,7 +435,7 @@ public class CommercialController { mav.setModel(BasicModel.buildOKModel().setResult(null)); } } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("鏈嶅姟鍗囩骇涓�...")); } return mav; @@ -445,55 +445,55 @@ public class CommercialController { private RestfulModelAndView checkParmas(CommercialModel model, RestfulModelAndView mav){ if (StringUtils.isBlank(model.getAddress()) && StringUtils.isBlank(model.getLocation())) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:地址或经纬度不为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:鍦板潃鎴栫粡绾害涓嶄负绌�")); return mav; } if (model.getSize()==null || model.getEstateType()==null ) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:面积,商铺类型为必填项")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:闈㈢Н,鍟嗛摵绫诲瀷涓哄繀濉」")); return mav; } if (model.getMaxFloor() != null && (model.getMaxFloor() <= 0 || model.getMaxFloor() > 59)) { - mav.setModel(BasicModel.buildBadRequestModel("maxFloor取值非法,正确范围[1,60)")); + mav.setModel(BasicModel.buildBadRequestModel("maxFloor鍙栧�奸潪娉�,姝g‘鑼冨洿[1,60)")); return mav; } if (model.getFloor() != null && (model.getFloor() <= 0 || model.getFloor() > 59)) { - mav.setModel(BasicModel.buildBadRequestModel("floor取值非法,正确范围[1,60)")); + mav.setModel(BasicModel.buildBadRequestModel("floor鍙栧�奸潪娉�,姝g‘鑼冨洿[1,60)")); return mav; } if (model.getMaxFloor() != null && model.getFloor() != null && model.getFloor() > model.getMaxFloor()) { - mav.setModel(BasicModel.buildBadRequestModel("所在楼层不能大于总楼层")); + mav.setModel(BasicModel.buildBadRequestModel("鎵�鍦ㄦゼ灞備笉鑳藉ぇ浜庢�绘ゼ灞�")); return mav; } if (model.getPassengerFlow() != null && (model.getPassengerFlow() <0 || model.getPassengerFlow() > 2)) { - mav.setModel(BasicModel.buildBadRequestModel("客流量取值非法,正确范围[0,2]")); + mav.setModel(BasicModel.buildBadRequestModel("瀹㈡祦閲忓彇鍊奸潪娉�,姝g‘鑼冨洿[0,2]")); return mav; } if (model.getLeaseStability() != null && (model.getLeaseStability() <0 || model.getLeaseStability() > 3)) { - mav.setModel(BasicModel.buildBadRequestModel("租约稳定性取值非法,正确范围[0,3]")); + mav.setModel(BasicModel.buildBadRequestModel("绉熺害绋冲畾鎬у彇鍊奸潪娉�,姝g‘鑼冨洿[0,3]")); return mav; } if (model.getSellType()!= null && (model.getSellType() <0 || model.getSellType() > 1)) { - mav.setModel(BasicModel.buildBadRequestModel("出售方式取值非法,正确范围[0,1]")); + mav.setModel(BasicModel.buildBadRequestModel("鍑哄敭鏂瑰紡鍙栧�奸潪娉�,姝g‘鑼冨洿[0,1]")); return mav; } if (model.getEstateType()!= null && (model.getEstateType() <0 || model.getEstateType() > 7)) { - mav.setModel(BasicModel.buildBadRequestModel("商铺类型取值非法,正确范围[0,7]")); + mav.setModel(BasicModel.buildBadRequestModel("鍟嗛摵绫诲瀷鍙栧�奸潪娉�,姝g‘鑼冨洿[0,7]")); return mav; } if (model.getDecorationCost()!=null && (model.getDecorationCost() <0 || model.getDecorationCost() > 1000)) { - mav.setModel(BasicModel.buildBadRequestModel("商铺装修费用取值非法,正确范围[0,1000]")); + mav.setModel(BasicModel.buildBadRequestModel("鍟嗛摵瑁呬慨璐圭敤鍙栧�奸潪娉�,姝g‘鑼冨洿[0,1000]")); return mav; } if (model.getDecorationYear()!=null && (model.getDecorationYear() <0 || model.getDecorationYear() > 50)) { - mav.setModel(BasicModel.buildBadRequestModel("商铺装修年限取值非法,正确范围[0,50]")); + mav.setModel(BasicModel.buildBadRequestModel("鍟嗛摵瑁呬慨骞撮檺鍙栧�奸潪娉�,姝g‘鑼冨洿[0,50]")); return mav; } return mav; @@ -501,7 +501,7 @@ public class CommercialController { private JSONObject locationEvaluateApi(CommercialModel model, String uri){ - //商铺类型---0:临街商铺 1:住宅底商 2:购物百货中心 3:写字楼商铺 4:档口摊位 5:市场类商铺 6:交通设施商铺 7:旅游商铺 + //鍟嗛摵绫诲瀷---0:涓磋鍟嗛摵 1:浣忓畢搴曞晢 2:璐墿鐧捐揣涓績 3:鍐欏瓧妤煎晢閾� 4:妗e彛鎽婁綅 5:甯傚満绫诲晢閾� 6:浜ら�氳鏂藉晢閾� 7:鏃呮父鍟嗛摵 HttpRequest request = new HttpRequest(); JSONObject json = null; Map params = new HashMap(); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommunityRatingController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommunityRatingController.java index 99b7aa389..4baaab4e5 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommunityRatingController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommunityRatingController.java @@ -18,7 +18,7 @@ import com.fangjia.service.mongo.fangjia.CommunityRatingService; import net.sf.json.JSONObject; /** - * 小区评级 + * 灏忓尯璇勭骇 * @author Administrator * */ @@ -30,7 +30,7 @@ public class CommunityRatingController { /** - * 专业版 + * 涓撲笟鐗� * @param city * @param address * @param request @@ -41,12 +41,12 @@ public class CommunityRatingController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if(StringUtils.isBlank(city)){ - mav.setModel(BasicModel.buildBadRequestModel("城市不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍩庡競涓嶈兘涓虹┖")); return mav; } if(StringUtils.isBlank(address)){ - mav.setModel(BasicModel.buildBadRequestModel("关键字不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍏抽敭瀛椾笉鑳戒负绌�")); return mav; } JSONObject resp = OpenApiClient.addressMatch(city, address, "property"); @@ -58,14 +58,14 @@ public class CommunityRatingController { CommunityRatingMajorBo communityRatingMajorBo = communityRatingService.findMajoRating(city, region, name); if(communityRatingMajorBo==null) { - mav.setModel(BasicModel.buildBadRequestModel("未找到数据")); + mav.setModel(BasicModel.buildBadRequestModel("鏈壘鍒版暟鎹�")); return mav; } mav.setModel(BasicModel.buildOKModel().setResult(communityRatingMajorBo)); return mav; }else { - mav.setModel(BasicModel.buildBadRequestModel("未找到数据")); + mav.setModel(BasicModel.buildBadRequestModel("鏈壘鍒版暟鎹�")); return mav; } @@ -78,7 +78,7 @@ public class CommunityRatingController { /** - * 普通版 + * 鏅�氱増 * @param city * @param address * @param request @@ -89,12 +89,12 @@ public class CommunityRatingController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if(StringUtils.isBlank(city)){ - mav.setModel(BasicModel.buildBadRequestModel("城市不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍩庡競涓嶈兘涓虹┖")); return mav; } if(StringUtils.isBlank(address)){ - mav.setModel(BasicModel.buildBadRequestModel("关键字不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍏抽敭瀛椾笉鑳戒负绌�")); return mav; } JSONObject resp = OpenApiClient.addressMatch(city, address, "property"); @@ -106,14 +106,14 @@ public class CommunityRatingController { CommunityRatingBasicBo communityRatingMajorBo = communityRatingService.findBasicRating(city, region, name); if(communityRatingMajorBo==null) { - mav.setModel(BasicModel.buildBadRequestModel("未找到数据")); + mav.setModel(BasicModel.buildBadRequestModel("鏈壘鍒版暟鎹�")); return mav; } mav.setModel(BasicModel.buildOKModel().setResult(communityRatingMajorBo)); return mav; }else { - mav.setModel(BasicModel.buildBadRequestModel("未找到数据")); + mav.setModel(BasicModel.buildBadRequestModel("鏈壘鍒版暟鎹�")); return mav; } @@ -123,7 +123,7 @@ public class CommunityRatingController { /** - * 对外版 + * 瀵瑰鐗� * @param city * @param address * @param request @@ -134,12 +134,12 @@ public class CommunityRatingController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if(StringUtils.isBlank(city)){ - mav.setModel(BasicModel.buildBadRequestModel("城市不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍩庡競涓嶈兘涓虹┖")); return mav; } if(StringUtils.isBlank(address)){ - mav.setModel(BasicModel.buildBadRequestModel("关键字不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍏抽敭瀛椾笉鑳戒负绌�")); return mav; } JSONObject resp = OpenApiClient.addressMatch(city, address, "property"); @@ -151,14 +151,14 @@ public class CommunityRatingController { CommunityRatingForeignBo communityRatingForeignBo = communityRatingService.findForeignRating(city, region, name); if(communityRatingForeignBo==null) { - mav.setModel(BasicModel.buildBadRequestModel("未找到数据")); + mav.setModel(BasicModel.buildBadRequestModel("鏈壘鍒版暟鎹�")); return mav; } mav.setModel(BasicModel.buildOKModel().setResult(communityRatingForeignBo)); return mav; }else { - mav.setModel(BasicModel.buildBadRequestModel("未找到数据")); + mav.setModel(BasicModel.buildBadRequestModel("鏈壘鍒版暟鎹�")); return mav; } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ComprehensiveQueryController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ComprehensiveQueryController.java index 52ee0ac44..76ac03f34 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ComprehensiveQueryController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ComprehensiveQueryController.java @@ -86,10 +86,10 @@ public class ComprehensiveQueryController { private static final int DEFAULT_PAGE_SIZE = 20; private static final String[] PROPERTY_SEARCH_API_FIELDS = {"address", "city", "region", "name", "lat2", "lng2", "lat", "lng", "block", "estateType2", "addrAlias"}; - private static final List GAODE_LEVEL = Arrays.asList("兴趣点", "门牌号", "单元号", "楼层", "房间", "门址", "住宅区"); + private static final List GAODE_LEVEL = Arrays.asList("鍏磋叮鐐�", "闂ㄧ墝鍙�", "鍗曞厓鍙�", "妤煎眰", "鎴块棿", "闂ㄥ潃", "浣忓畢鍖�"); - static final int BAI_DU_GEO = 1;// 百度系坐标 - static final int GAO_DE_GEO = 2;// 高德系坐标 + static final int BAI_DU_GEO = 1;// 鐧惧害绯诲潗鏍� + static final int GAO_DE_GEO = 2;// 楂樺痉绯诲潗鏍� private AdministrativeDivisionService administrativeDivisionService; @@ -101,87 +101,87 @@ public class ComprehensiveQueryController { private static final int EVALUATE_SHOW_DETAIL = 1; private static final Map PROPERTY_TYPES = new HashMap() { { - put(null, "普通住宅"); - put("0", "普通住宅"); - put("1", "别墅"); - put("2", "商住"); + put(null, "鏅�氫綇瀹�"); + put("0", "鏅�氫綇瀹�"); + put("1", "鍒"); + put("2", "鍟嗕綇"); } }; private static final Map DIRECTION = new HashMap() { { - put(null, "南"); - put("1", "西南"); - put("2", "东南"); - put("3", "南"); - put("4", "西北"); - put("5", "东北"); - put("6", "东"); - put("7", "西"); - put("8", "北"); - put("9", "东西"); - put("10", "南北"); + put(null, "鍗�"); + put("1", "瑗垮崡"); + put("2", "涓滃崡"); + put("3", "鍗�"); + put("4", "瑗垮寳"); + put("5", "涓滃寳"); + put("6", "涓�"); + put("7", "瑗�"); + put("8", "鍖�"); + put("9", "涓滆タ"); + put("10", "鍗楀寳"); } }; private static final Map FITMENT = new HashMap() { { - put(null, "简装"); - put("1", "毛坯"); - put("2", "简装"); - put("3", "精装"); - put("4", "豪装"); + put(null, "绠�瑁�"); + put("1", "姣涘澂"); + put("2", "绠�瑁�"); + put("3", "绮捐"); + put("4", "璞"); } }; private static final Map EVALUATION_MODEL_FITMENT = new HashMap() { { - put(null, "简单装修"); - put("简装", "简单装修"); - put("毛坯", "毛坯"); - put("精装", "精装修"); - put("豪装", "豪华装修"); + put(null, "绠�鍗曡淇�"); + put("绠�瑁�", "绠�鍗曡淇�"); + put("姣涘澂", "姣涘澂"); + put("绮捐", "绮捐淇�"); + put("璞", "璞崕瑁呬慨"); } }; private static final Map SIGHT = new HashMap() { { - put(null, "一般"); - put("1", "景观房"); - put("2", "侧景观房"); - put("3", "一般"); - put("4", "差"); + put(null, "涓�鑸�"); + put("1", "鏅鎴�"); + put("2", "渚ф櫙瑙傛埧"); + put("3", "涓�鑸�"); + put("4", "宸�"); } }; private static final Map NOISE = new HashMap() { { - put(null, "无噪音"); - put("0", "无噪音"); - put("1", "噪音较小"); - put("2", "噪音大"); + put(null, "鏃犲櫔闊�"); + put("0", "鏃犲櫔闊�"); + put("1", "鍣煶杈冨皬"); + put("2", "鍣煶澶�"); } }; private static final Map FACILITIES = new HashMap() { { - put("0", "健身房"); - put("1", "游泳池"); - put("2", "会所"); - put("3", "网球场"); - put("4", "球场"); - put("5", "棋牌室"); - put("6", "停车场"); - put("7", "图书馆"); - put("8", "活动中心"); + put("0", "鍋ヨ韩鎴�"); + put("1", "娓告吵姹�"); + put("2", "浼氭墍"); + put("3", "缃戠悆鍦�"); + put("4", "鐞冨満"); + put("5", "妫嬬墝瀹�"); + put("6", "鍋滆溅鍦�"); + put("7", "鍥句功棣�"); + put("8", "娲诲姩涓績"); } }; private static final Map NEGATIVE_FACTOR = new HashMap() { { - put(null, "无"); - put("1", "很近"); - put("2", "较近"); - put("3", "无"); + put(null, "鏃�"); + put("1", "寰堣繎"); + put("2", "杈冭繎"); + put("3", "鏃�"); } }; @@ -208,28 +208,28 @@ public class ComprehensiveQueryController { private static final Map CITYLEVEL_MAP = new HashMap() { { - put("1000", "one");// 一线 - put("1500", "newOne");// 新一线 - put("2000", "two");// 二线 - put("3000", "three");// 三线 - put("4000", "four");// 四线 - put("5000", "five");// 五线 + put("1000", "one");// 涓�绾� + put("1500", "newOne");// 鏂颁竴绾� + put("2000", "two");// 浜岀嚎 + put("3000", "three");// 涓夌嚎 + put("4000", "four");// 鍥涚嚎 + put("5000", "five");// 浜旂嚎 } }; public Object houseValueInformationAction(HouseInfomationModel model, HttpServletRequest httpServletRequest) { - // 原小区均价 + // 鍘熷皬鍖哄潎浠� HouseValueInformationDto houseValueInformation = new HouseValueInformationDto(); RestfulModelAndView mav = new RestfulModelAndView(); if (StringUtils.isBlank(model.getAddress()) || model.getSize() == null) { - mav.setModel(BasicModel.buildBadRequestModel("地址(address),面积(size)为必填字段")); + mav.setModel(BasicModel.buildBadRequestModel("鍦板潃(address),闈㈢Н(size)涓哄繀濉瓧娈�")); return mav; } - // 不支持车位等估价 - if (model.getAddress().contains("车位")) { - mav.setModel(BasicModel.buildBadRequestModel("非住宅无法估值")); + // 涓嶆敮鎸佽溅浣嶇瓑浼颁环 + if (model.getAddress().contains("杞︿綅")) { + mav.setModel(BasicModel.buildBadRequestModel("闈炰綇瀹呮棤娉曚及鍊�")); return mav; } @@ -239,13 +239,13 @@ public class ComprehensiveQueryController { if (StringUtils.isNotBlank(cityStr) && cityStr.matches("\\d+") && StringUtils.isBlank(districtStr)) { cityShort = administrativeMappingService.findCityShortByCityCode(cityStr); if (StringUtils.isBlank(cityShort)) { - mav.setModel(BasicModel.buildBadRequestModel("城市代码错误")); + mav.setModel(BasicModel.buildBadRequestModel("鍩庡競浠g爜閿欒")); return mav; } } else if (StringUtils.isNotBlank(districtStr) && districtStr.matches("\\d+")) { cityShort = administrativeMappingService.findDistrictShortByDistrictCode(cityStr, districtStr); if (StringUtils.isBlank(cityShort)) { - mav.setModel(BasicModel.buildBadRequestModel("区县代码错误")); + mav.setModel(BasicModel.buildBadRequestModel("鍖哄幙浠g爜閿欒")); return mav; } } @@ -271,9 +271,9 @@ public class ComprehensiveQueryController { } - // 去掉经纬度解析 + // 鍘绘帀缁忕含搴﹁В鏋� // if (matchResponse == null || !matchResponse.containsKey("result") || !matchResponse.getJSONObject("result").containsKey("id")) { -// //加上高德获取经纬度 和 根据经纬度估值 +// //鍔犱笂楂樺痉鑾峰彇缁忕含搴� 鍜� 鏍规嵁缁忕含搴︿及鍊� // Map map = GeoUtils.parserByGaode(model.getCity(), model.getAddress()); // if (map.containsKey("level") && GAODE_LEVEL.contains(map.get("level")) // && map.containsKey("lng") && map.containsKey("lat")) { @@ -284,33 +284,33 @@ public class ComprehensiveQueryController { // param.put("area", String.valueOf(model.getSize())); // try { // jsonResult = httpRequest.getJsonContent("http://192.168.0.100:30020/avmWeb/avmAnn", param, "UTF-8"); -// if (jsonResult.containsKey("msg") && "成功".equals(jsonResult.getString("msg"))) { +// if (jsonResult.containsKey("msg") && "鎴愬姛".equals(jsonResult.getString("msg"))) { // HashMap resultMap = new HashMap(); // resultMap.put("avgPrice", jsonResult.getString("unitPrice")); // resultMap.put("totalPrice", jsonResult.getString("totalPrice")); // houseValueInformation.setAddressValue(resultMap); // mav.setModel(BasicModel.buildOKModel().setResult(houseValueInformation)); // } else { -// mav.setModel(BasicModel.buildBadRequestModel("该地址不支持估价!")); +// mav.setModel(BasicModel.buildBadRequestModel("璇ュ湴鍧�涓嶆敮鎸佷及浠凤紒")); // } // } catch (HttpRequestException e) { // throw new RuntimeException(e); // } // } else { -// mav.setModel(BasicModel.buildBadRequestModel("该地址不支持估价!")); +// mav.setModel(BasicModel.buildBadRequestModel("璇ュ湴鍧�涓嶆敮鎸佷及浠凤紒")); // } // return mav; // } JSONObject result = matchResponse.getJSONObject("result"); if (!result.containsKey("id")) { - mav.setModel(BasicModel.buildBadRequestModel("该地址不支持估价!")); + mav.setModel(BasicModel.buildBadRequestModel("璇ュ湴鍧�涓嶆敮鎸佷及浠凤紒")); return mav; } String id = matchResponse.getJSONObject("result").getString("id"); District district = districtService.findById(id); if (district == null) { - mav.setModel(BasicModel.buildBadRequestModel("该地址不支持估价!")); + mav.setModel(BasicModel.buildBadRequestModel("璇ュ湴鍧�涓嶆敮鎸佷及浠凤紒")); return mav; } @@ -318,7 +318,7 @@ public class ComprehensiveQueryController { DistrictStatBo statBo = districtStatService.findCurrentDistrictStat(new DistrictKey(district)); if (null != statBo) { if (statBo.getDistrictStat() != null) { - // 有2B价格,使用2B价格 + // 鏈�2B浠锋牸锛屼娇鐢�2B浠锋牸 Integer avgPrice2b = statBo.getDistrictStat().getAvg_price_2b(); if (avgPrice2b != null && avgPrice2b > 0) { dto.setAvgPrice(avgPrice2b); @@ -326,7 +326,7 @@ public class ComprehensiveQueryController { dto.setAvgPrice(statBo.getDistrictStat().getAvgPrice()); } } else if (statBo.getVillaDistrictStat() != null) { - // 有2B价格,使用2B价格 + // 鏈�2B浠锋牸锛屼娇鐢�2B浠锋牸 Integer avgPrice2b = statBo.getVillaDistrictStat().getAvg_price_2b(); if (avgPrice2b != null && avgPrice2b > 0) { dto.setAvgPrice(avgPrice2b); @@ -336,30 +336,30 @@ public class ComprehensiveQueryController { } } - // 价格下调10% + // 浠锋牸涓嬭皟10% // if (dto.getAvgPrice() != null) { // int avgPrice = new BigDecimal(dto.getAvgPrice()).multiply(new BigDecimal(0.9)).intValue(); // dto.setAvgPrice(avgPrice); // } - // 非住宅无法估值 + // 闈炰綇瀹呮棤娉曚及鍊� - // 保存小区均价的返回结果 + // 淇濆瓨灏忓尯鍧囦环鐨勮繑鍥炵粨鏋� dto.setCredit(null); houseValueInformation.setCommunityAvgPrice(dto); - //原房屋价值评估 - //根据model给PropertyEvaluationModel赋值 + //鍘熸埧灞嬩环鍊艰瘎浼� + //鏍规嵁model缁橮ropertyEvaluationModel璧嬪�� PropertyEvaluationModel propertyEvaluationModel = createPropertyEvaluationModelFromHouseInfomationModel(model); boolean villaFlag = DataUtil.isVilla(propertyEvaluationModel.getSize(), propertyEvaluationModel.getName(), propertyEvaluationModel.getHeight(), propertyEvaluationModel.getRoom()); String propertyType = district.getEstateType2(); - // 已添加物业类型,先注释 -// if (villaFlag && StringUtils.isNotBlank(propertyType) && !propertyType.equals("别墅")) { -// District bieShuDistrict = districtService.findByNameAndAlias(district.getCity(), district.getRegion(), district.getName() + "别墅", "district"); + // 宸叉坊鍔犵墿涓氱被鍨嬶紝鍏堟敞閲� +// if (villaFlag && StringUtils.isNotBlank(propertyType) && !propertyType.equals("鍒")) { +// District bieShuDistrict = districtService.findByNameAndAlias(district.getCity(), district.getRegion(), district.getName() + "鍒", "district"); // if (bieShuDistrict != null) { // district = bieShuDistrict; // } // } - //添加城市 + //娣诲姞鍩庡競 propertyEvaluationModel.setCity(district.getCity()); propertyEvaluationModel.setDistrict(district.getRegion()); propertyEvaluationModel.setName(district.getName()); @@ -369,7 +369,7 @@ public class ComprehensiveQueryController { IllegalAccessException e) { } - // 价格下调10% + // 浠锋牸涓嬭皟10% // Map addressValue = houseValueInformation.getAddressValue(); // if (addressValue != null && addressValue.get("totalPrice") != null && addressValue.get("avgPrice") != null) { // int evaluatePrice = new BigDecimal((Integer) addressValue.get("avgPrice")).multiply(new BigDecimal(0.9)).intValue(); @@ -378,9 +378,9 @@ public class ComprehensiveQueryController { // } // houseValueInformation.setAddressValue(modelAndView); - //房源样本 + //鎴挎簮鏍锋湰 - //构造sampleQuery对象 + //鏋勯�爏ampleQuery瀵硅薄 SampleQuery sampleQuery = new SampleQuery(); sampleQuery.setCity(model.getCity()); sampleQuery.setStrctureArea(model.getSize()); @@ -399,11 +399,11 @@ public class ComprehensiveQueryController { sampleQuery.setMax(10); } - // 此处慢 + // 姝ゅ鎱� long start = System.currentTimeMillis(); List collaterals = czbankSampleService.findSampleForBse(querys, sampleQuery.getMax()); long end = System.currentTimeMillis(); - System.out.println("用时:" + (end - start)); + System.out.println("鐢ㄦ椂:" + (end - start)); Collateral collateral = collaterals.get(0); List samples = collateral.getSample(); UniversalDto houseCaseDto = UniversalDto.newDto(); @@ -429,17 +429,17 @@ public class ComprehensiveQueryController { // houseCaseMav.setModel(BasicModel.buildOKModel().setResult(dto)); // return houseCaseMav; - //将房源数据放到结果集 + //灏嗘埧婧愭暟鎹斁鍒扮粨鏋滈泦 houseValueInformation.setHouseCase(houseCaseDto); - // 原周边POI + // 鍘熷懆杈筆OI DistrictFacilitys facilitys = districtFacilitysService.findByDistrict(district); if (facilitys != null) { List hospitalList = facilitys.getHospital(); List hospitals = new ArrayList(); if (hospitalList != null && !hospitalList.isEmpty()) { for (String hospital : hospitalList) { - if (hospital.endsWith("医院")) { + if (hospital.endsWith("鍖婚櫌")) { hospitals.add(hospital); } } @@ -448,7 +448,7 @@ public class ComprehensiveQueryController { } else { facilitys = new DistrictFacilitys(); } - // 将周边POI数据放到结果集 + // 灏嗗懆杈筆OI鏁版嵁鏀惧埌缁撴灉闆� houseValueInformation.setSurroundingPoi(facilitys); mav.setModel(BasicModel.buildOKModel(). @@ -557,11 +557,11 @@ public class ComprehensiveQueryController { String estateType = queryBean.getProperty().getEstateType2(); queryBean.setPropertyTypeCode("01"); if (StringUtils.isNotBlank(estateType)) { - if (estateType.equals("普通住宅")) { + if (estateType.equals("鏅�氫綇瀹�")) { queryBean.setPropertyTypeCode("01"); - } else if (estateType.equals("别墅")) { + } else if (estateType.equals("鍒")) { queryBean.setPropertyTypeCode("02"); - } else if (estateType.equals("商住")) { + } else if (estateType.equals("鍟嗕綇")) { queryBean.setPropertyTypeCode("03"); } } @@ -571,14 +571,14 @@ public class ComprehensiveQueryController { decrCondCode = 2; } if (decrCondCode > 5 || decrCondCode < 1) { - throw new Exception("decrCondCode取值非法"); + throw new Exception("decrCondCode鍙栧�奸潪娉�"); } Integer towardDirectCode = queryBean.getTowardDirectCode(); if (towardDirectCode == null) { towardDirectCode = 3; } if (towardDirectCode > 10 || towardDirectCode < 1) { - throw new Exception("towardDirectCode取值非法"); + throw new Exception("towardDirectCode鍙栧�奸潪娉�"); } queryBeans.add(queryBean); } @@ -591,7 +591,7 @@ public class ComprehensiveQueryController { ApiUserCfg apiUserCfg_pt = apiUserCfgService.findByUserId(Long.valueOf(evaluation.getFromUserId()), ApiUserCfg.ApiUserCfgKey.PRICE_TYPE); if (apiUserCfg_pt != null && apiUserCfg_pt.getCfgValue() != null) { String priceType = apiUserCfg_pt.getCfgValue().toString(); - // 评估价则系数调整 + // 璇勪及浠峰垯绯绘暟璋冩暣 if (StringUtils.isNotBlank(priceType) && "evaluate".equals(priceType)) { EvaluateRatio evaluateRatio = null; if (StringUtils.isNotBlank(district.getRegion())) { @@ -601,7 +601,7 @@ public class ComprehensiveQueryController { evaluateRatio = evaluateRatioService.findByCity(district.getCity()); } if (evaluateRatio != null) { - // 系数添加 + // 绯绘暟娣诲姞 long totalPrice = evaluation.getBigTotalPrice(); totalPrice = (long) (totalPrice * (1 + evaluateRatio.getRatio())); evaluation.setBigTotalPrice(totalPrice); @@ -610,7 +610,7 @@ public class ComprehensiveQueryController { } } } catch (Exception ex) { - LOGGER.error("系数下调异常{}", ex.getMessage()); + LOGGER.error("绯绘暟涓嬭皟寮傚父{}", ex.getMessage()); } } @@ -620,11 +620,11 @@ public class ComprehensiveQueryController { // mav.setViewType("rest"); if (StringUtils.isBlank(model.getName()) || StringUtils.isBlank(model.getDistrict()) || model.getSize() <= 0) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:区域,小区名,面积(size)为必填项")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:鍖哄煙,灏忓尯鍚�,闈㈢Н(size)涓哄繀濉」")); // return mav; } - if (model.getCity().endsWith("市")) { - model.setCity(model.getCity().replaceAll("市$", "")); + if (model.getCity().endsWith("甯�")) { + model.setCity(model.getCity().replaceAll("甯�$", "")); } if (StringUtils.isNotBlank(request.getParameter("calDate"))) { Date calDate = null; @@ -634,41 +634,41 @@ public class ComprehensiveQueryController { } if (calDate == null) { - mav.setModel(BasicModel.buildBadRequestModel("calDate:数据类型不合法")); + mav.setModel(BasicModel.buildBadRequestModel("calDate:鏁版嵁绫诲瀷涓嶅悎娉�")); return mav; } else { model.setCalDate(calDate); } } - /* 先到CPDB库中查找小区 */ + /* 鍏堝埌CPDB搴撲腑鏌ユ壘灏忓尯 */ District district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(), "district"); if (district == null) { - if (model.getDistrict().contains("市辖区") || model.getDistrict().contains(model.getCity())) { + if (model.getDistrict().contains("甯傝緰鍖�") || model.getDistrict().contains(model.getCity())) { district = districtService.findByNameAndAlias(model.getCity(), null, model.getName(), "district"); } if (district == null) { - mav.setModel(BasicModel.buildBadRequestModel("该小区不存在")); + mav.setModel(BasicModel.buildBadRequestModel("璇ュ皬鍖轰笉瀛樺湪")); return mav; } } model.setName(district.getName()); if (model.getCarportPrice() != null && (model.getCarportPrice() < 0 || model.getCarportPrice() > 1000000)) { - mav.setModel(BasicModel.buildBadRequestModel("carportPrice(车位)取值不合法")); + mav.setModel(BasicModel.buildBadRequestModel("carportPrice(杞︿綅)鍙栧�间笉鍚堟硶")); return mav; } if (model.getMaxFloor() != null && (model.getMaxFloor() <= 0 || model.getMaxFloor() > 59)) { - mav.setModel(BasicModel.buildBadRequestModel("maxFloor取值非法,正确范围[1,60)")); + mav.setModel(BasicModel.buildBadRequestModel("maxFloor鍙栧�奸潪娉�,姝g‘鑼冨洿[1,60)")); return mav; } if (model.getFloor() != null && (model.getFloor() <= 0 || model.getFloor() > 59)) { - mav.setModel(BasicModel.buildBadRequestModel("floor取值非法,正确范围[1,60)")); + mav.setModel(BasicModel.buildBadRequestModel("floor鍙栧�奸潪娉�,姝g‘鑼冨洿[1,60)")); return mav; } if (model.getMaxFloor() != null && model.getFloor() != null && model.getFloor() > model.getMaxFloor()) { - mav.setModel(BasicModel.buildBadRequestModel("所在楼层不能大于总楼层")); + mav.setModel(BasicModel.buildBadRequestModel("鎵�鍦ㄦゼ灞備笉鑳藉ぇ浜庢�绘ゼ灞�")); return mav; } @@ -696,7 +696,7 @@ public class ComprehensiveQueryController { model.setRegion(district.getRegion()); model.setDistrictName(district.getName()); if (StringUtils.isBlank(model.getPropertyType())) { - if (district.getEstateType2() != null && district.getEstateType2().contains("别墅")) { + if (district.getEstateType2() != null && district.getEstateType2().contains("鍒")) { model.setPropertyType("1"); } } @@ -733,12 +733,12 @@ public class ComprehensiveQueryController { this.adjustPriceByRatio(district, evaluation); } - // 调整面积不同面积价格 + // 璋冩暣闈㈢Н涓嶅悓闈㈢Н浠锋牸 try { DistrictStatBo districtStatBo = districtStatService.findDistrictStat(new DistrictKey(district)); int orgAvgPrice = 0; if (districtStatBo != null) { - if (StringUtils.isNotBlank(district.getEstateType2()) && district.getEstateType2().contains("别墅") && districtStatBo.getVillaDistrictStat() != null) { + if (StringUtils.isNotBlank(district.getEstateType2()) && district.getEstateType2().contains("鍒") && districtStatBo.getVillaDistrictStat() != null) { orgAvgPrice = districtStatBo.getVillaDistrictStat().getAvgPrice(); } else if (districtStatBo.getDistrictStat() != null) { orgAvgPrice = districtStatBo.getDistrictStat().getAvgPrice(); @@ -747,7 +747,7 @@ public class ComprehensiveQueryController { if (evaluation != null && evaluation.getAvgPrice() != null && evaluation.getAvgPrice() > 0) { int factorPrice = evaluation.getAvgPrice(); int avgPrice = evaluateFactorService.recompose(district.getCity(), district.getRegion(), evaluation.getArea(), factorPrice, orgAvgPrice); - // 有2B价格用2B价格,没有用2C + // 鏈�2B浠锋牸鐢�2B浠锋牸锛屾病鏈夌敤2C Integer minPrice = 0; Integer maxPrice = 0; if (evaluation.getAvgPrice2b() != null && evaluation.getAvgPrice2b() > 0) { @@ -757,14 +757,14 @@ public class ComprehensiveQueryController { minPrice = (int) (evaluation.getAvgPrice() * 0.95); maxPrice = (int) (evaluation.getAvgPrice() * 1.05); } - // 偏离度超过5%不进行调整 + // 鍋忕搴﹁秴杩�5%涓嶈繘琛岃皟鏁� if (minPrice != 0 && maxPrice != 0 && minPrice <= avgPrice && avgPrice <= maxPrice) { evaluation.setAvgPrice(avgPrice); evaluation.setBigTotalPrice((long) (avgPrice * evaluation.getArea())); } } } catch (Exception ex) { - LOGGER.error("调整面积不同面积价格异常{}", ex.getMessage()); + LOGGER.error("璋冩暣闈㈢Н涓嶅悓闈㈢Н浠锋牸寮傚父{}", ex.getMessage()); } if (evaluation.getTotalPrice() != null && evaluation.getTotalPrice() != 0 @@ -773,7 +773,7 @@ public class ComprehensiveQueryController { districtPriceMap.put("city", district.getCity()); districtPriceMap.put("district", district.getRegion()); districtPriceMap.put("name", district.getName()); - // 估值中已经取过评估2B价格,且经过系数调整,不能在覆盖 + // 浼板�间腑宸茬粡鍙栬繃璇勪及2B浠锋牸锛屼笖缁忚繃绯绘暟璋冩暣锛屼笉鑳藉湪瑕嗙洊 districtPriceMap.put("avgPrice", evaluation.getAvgPrice()); Long totalPrice = new BigDecimal((Integer) districtPriceMap.get("avgPrice")).multiply(new BigDecimal(evaluation.getArea())).longValue(); districtPriceMap.put("totalPrice", totalPrice); @@ -783,7 +783,7 @@ public class ComprehensiveQueryController { districtPriceMap.put("credit", evaluation.getCredit()); districtPriceMap.put("id", evaluation.getId()); } - // 将评估价放到结果集 + // 灏嗚瘎浼颁环鏀惧埌缁撴灉闆� houseValueInformation.setAddressValue(districtPriceMap); // mav.setModel(BasicModel.buildOKModel().setResult(districtPriceMap)); try { @@ -794,14 +794,14 @@ public class ComprehensiveQueryController { } catch (Exception e) { e.printStackTrace(); } - // 根据单价重新计算总价 + // 鏍规嵁鍗曚环閲嶆柊璁$畻鎬讳环 Integer avgPrice = (Integer) districtPriceMap.get("avgPrice"); totalPrice = new BigDecimal(avgPrice).multiply(new BigDecimal(evaluation.getArea())).longValue(); districtPriceMap.put("totalPrice", totalPrice); return mav; } else { evaluationService.remove(evaluation.getId()); - mav.setModel(BasicModel.buildOKModel().setMsg("暂时不支持该小区的估价").markNoData()); + mav.setModel(BasicModel.buildOKModel().setMsg("鏆傛椂涓嶆敮鎸佽灏忓尯鐨勪及浠�").markNoData()); return mav; } } @@ -955,7 +955,7 @@ public class ComprehensiveQueryController { private Map getLastEvaluationPrice(District district, Evaluation evaluation, double dCredit) throws NumberFormatException, IllegalAccessException { Date startDate = DateUtil.parseDate(DateUtil.addMonth(new Date(), -6), "yyyy-MM-dd"); - // 第三方价格 + // 绗笁鏂逛环鏍� Map otherPriceRets = averageStatisticsService.findFirstAverageStatictics(district.getCity(), district.getRegion(), district.getName(), district.getCategory(), startDate); if (null == otherPriceRets) { @@ -1165,7 +1165,7 @@ public class ComprehensiveQueryController { if (prices != null) { avgPrice = findNewPrice(prices, evaluation.getAvgPrice()); } - // 在 dCredit与0.65之间 + // 鍦� dCredit涓�0.65涔嬮棿 if (evaluation.getCredit() >= dCredit && dCredit < 0.65) { if (avgPrice > 0) { Double newTotalPrice = avgPrice * evaluation.getArea(); @@ -1191,7 +1191,7 @@ public class ComprehensiveQueryController { lastPrice = evaluation.getBigTotalPrice(); } } - } else if (evaluation.getCredit() < dCredit) {// 在dCredit以下 + } else if (evaluation.getCredit() < dCredit) {// 鍦╠Credit浠ヤ笅 if (avgPrice > 0) { Double newTotalPrice = avgPrice * evaluation.getArea(); lastPrice = newTotalPrice.longValue(); @@ -1277,7 +1277,7 @@ public class ComprehensiveQueryController { List> values = new ArrayList>(); int fjw_price = avgPrice; - // 找出最小差 + // 鎵惧嚭鏈�灏忓樊 for (int i = 0; i < prices.size() - 1; i++) { int a = prices.get(i); for (int j = i + 1; j < prices.size(); j++) { @@ -1289,7 +1289,7 @@ public class ComprehensiveQueryController { } } - // 根据最小差找出结果 + // 鏍规嵁鏈�灏忓樊鎵惧嚭缁撴灉 for (int i = 0; i < prices.size() - 1; i++) { int a = prices.get(i); for (int j = i + 1; j < prices.size(); j++) { diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ConsumptionGradeController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ConsumptionGradeController.java index 8cf5d50f2..e439851e2 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ConsumptionGradeController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ConsumptionGradeController.java @@ -19,7 +19,7 @@ import com.fangjia.service.mongo.fangjia.ConsumptiongGradeService; import net.sf.json.JSONObject; /** - * 地址消费评级 + * 鍦板潃娑堣垂璇勭骇 * @author Administrator * */ @@ -33,7 +33,7 @@ public class ConsumptionGradeController { /** - * 普通版 + * 鏅�氱増 * @param city * @param address * @param request @@ -44,12 +44,12 @@ public class ConsumptionGradeController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if(StringUtils.isBlank(city)){ - mav.setModel(BasicModel.buildBadRequestModel("城市不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍩庡競涓嶈兘涓虹┖")); return mav; } if(StringUtils.isBlank(address)){ - mav.setModel(BasicModel.buildBadRequestModel("关键字不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍏抽敭瀛椾笉鑳戒负绌�")); return mav; } JSONObject resp = OpenApiClient.addressMatch(city, address, "property"); @@ -61,14 +61,14 @@ public class ConsumptionGradeController { ConsumptionGradeBo communityRatingMajorBo = consumptiongGradeService.findRating(city, region, name); if(communityRatingMajorBo==null) { - mav.setModel(BasicModel.buildBadRequestModel("未找到数据")); + mav.setModel(BasicModel.buildBadRequestModel("鏈壘鍒版暟鎹�")); return mav; } mav.setModel(BasicModel.buildOKModel().setResult(communityRatingMajorBo)); return mav; }else { - mav.setModel(BasicModel.buildBadRequestModel("未找到数据")); + mav.setModel(BasicModel.buildBadRequestModel("鏈壘鍒版暟鎹�")); return mav; } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/Controller.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/Controller.java index 87ee92f6b..b14dea10d 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/Controller.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/Controller.java @@ -36,12 +36,12 @@ public class Controller { private UserService userService; /** - * api用户service + * api鐢ㄦ埛service */ private ApiUserService apiUserService; private ApiUserAuthorityService apiUserAuthorityService; /** - * token过期时间 单位:s + * token杩囨湡鏃堕棿 鍗曚綅:s */ private static final long TOKEN_EXPIRED_TIME = 60 * 60 * 2; @@ -53,7 +53,7 @@ public class Controller { public Object indexAction(BaseModel model) { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); - mav.setModel(BasicModel.buildOKModel().setMsg("欢迎使用房价网开发平台!")); + mav.setModel(BasicModel.buildOKModel().setMsg("娆㈣繋浣跨敤鎴夸环缃戝紑鍙戝钩鍙帮紒")); return mav; } @@ -65,7 +65,7 @@ public class Controller { } /** - * 缓存刷新接口 + * 缂撳瓨鍒锋柊鎺ュ彛 * * @return */ @@ -75,19 +75,19 @@ public class Controller { mav.setViewType("rest"); Token token = FangjiaApiUtil.parse2Token(model.getToken()); if (token == null) { - mav.setModel(BasicModel.buildUnAuthorizedModel().setMsg("非法的Token")); + mav.setModel(BasicModel.buildUnAuthorizedModel().setMsg("闈炴硶鐨凾oken")); return mav; } final ThreadLocalData threadLocalData = ThreadLocalData.getInstance(); threadLocalData.put(ThreadLocalKey.DisableCache, "1"); - // 在验证appKey + // 鍦ㄩ獙璇乤ppKey ApiUser apiUser = this.apiUserService.findApiUserById(token.getUserId()); if (apiUser == null) { - mav.setModel(BasicModel.buildUnAuthorizedModel().setMsg("非法的Token")); + mav.setModel(BasicModel.buildUnAuthorizedModel().setMsg("闈炴硶鐨凾oken")); return mav; } try { - // 获取用户 + // 鑾峰彇鐢ㄦ埛 User user = userService.findById(apiUser.getId()); if (null != user && StringUtils.isNotBlank(user.getUserName())) { userService.findByUserName(user.getUserName()); @@ -99,7 +99,7 @@ public class Controller { } catch (IllegalAccessException e) { e.printStackTrace(); } - mav.setModel(BasicModel.buildOKModel().setMsg("缓存刷新成功")); + mav.setModel(BasicModel.buildOKModel().setMsg("缂撳瓨鍒锋柊鎴愬姛")); return mav; } @@ -107,7 +107,7 @@ public class Controller { /** - * 获取tokenAction + * 鑾峰彇tokenAction * * @param username * @param password @@ -119,12 +119,12 @@ public class Controller { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(username) || StringUtils.isBlank(password) || StringUtils.isBlank(appKey)) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "用户名,密码,appKey为必填项")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鐢ㄦ埛鍚�,瀵嗙爜,appKey涓哄繀濉」")); return mav; } Long userId = this.getUserId(username, password, appKey); if (null == userId) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "用户名,密码,appKey未验证通过")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "鐢ㄦ埛鍚�,瀵嗙爜,appKey鏈獙璇侀�氳繃")); return mav; } Map map = new HashMap(1); @@ -134,7 +134,7 @@ public class Controller { } /** - * 获取访问Token + * 鑾峰彇璁块棶Token * @param username * @param password * @param appKey @@ -145,12 +145,12 @@ public class Controller { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(username) || StringUtils.isBlank(password) || StringUtils.isBlank(appKey)) { - mav.setModel(BasicModel.buildBadRequestModel("用户名,密码,appKey为必填项")); + mav.setModel(BasicModel.buildBadRequestModel("鐢ㄦ埛鍚�,瀵嗙爜,appKey涓哄繀濉」")); return mav; } Long userId = this.getUserId(username, password, appKey); if (null == userId) { - mav.setModel(BasicModel.buildBadRequestModel("用户名,密码,appKey未验证通过")); + mav.setModel(BasicModel.buildBadRequestModel("鐢ㄦ埛鍚�,瀵嗙爜,appKey鏈獙璇侀�氳繃")); return mav; } BasicModel model = BasicModel.buildOKModel(); @@ -166,21 +166,21 @@ public class Controller { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(token)) { - mav.setModel(BasicModel.buildBadRequestModel("token不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("token涓嶈兘涓虹┖")); return mav; } Token tokenObj = FangjiaApiUtil.parse2Token(token); ApiUser apiUser = parseApiUserByToken(tokenObj); if(apiUser == null){ - mav.setModel(BasicModel.buildModel(OpenHttpCodeEnum.AUTH_FAILD.getCode(), "没有权限访问对应的资源(认证失败)" )); + mav.setModel(BasicModel.buildModel(OpenHttpCodeEnum.AUTH_FAILD.getCode(), "娌℃湁鏉冮檺璁块棶瀵瑰簲鐨勮祫婧�(璁よ瘉澶辫触)" )); return mav; } if(isExpired(tokenObj)){ - mav.setModel(BasicModel.buildModel(OpenHttpCodeEnum.TOKEN_EXPIRED.getCode(), "token过期,请重新获取token(认证失败)" )); + mav.setModel(BasicModel.buildModel(OpenHttpCodeEnum.TOKEN_EXPIRED.getCode(), "token杩囨湡,璇烽噸鏂拌幏鍙杢oken(璁よ瘉澶辫触)" )); return mav; } if (1 == apiUser.getStatus()) { - mav.setModel(BasicModel.buildModel(OpenHttpCodeEnum.TOKEN_EXPIRED.getCode(), "你的账户已失效(认证失败)" )); + mav.setModel(BasicModel.buildModel(OpenHttpCodeEnum.TOKEN_EXPIRED.getCode(), "浣犵殑璐︽埛宸插け鏁�(璁よ瘉澶辫触)" )); return mav; } try { @@ -199,7 +199,7 @@ public class Controller { } /** - * 判断Token是否过期 + * 鍒ゆ柇Token鏄惁杩囨湡 * @param token * @return */ @@ -224,7 +224,7 @@ public class Controller { /** - * 获得app的最新版本号 + * 鑾峰緱app鐨勬渶鏂扮増鏈彿 * * @param platform * @return @@ -235,10 +235,10 @@ public class Controller { mav.setViewType("rest"); Map map = new HashMap(1); if (StringUtils.isNotBlank(platform) && platform.equals("ios")) { - // ios端 + // ios绔� map.put("version", "1.1.3"); } else { - // android端 + // android绔� map.put("version", "1.1.3"); } mav.setModel(map); @@ -246,7 +246,7 @@ public class Controller { } /** - * 根据用户名,密码,appKey获取对应用户的id + * 鏍规嵁鐢ㄦ埛鍚�,瀵嗙爜,appKey鑾峰彇瀵瑰簲鐢ㄦ埛鐨刬d * * @param username * @param password @@ -254,7 +254,7 @@ public class Controller { * @return */ private Long getUserId(String username, String password, String appKey) { - // 先验证用户名,密码 + // 鍏堥獙璇佺敤鎴峰悕,瀵嗙爜 User user = this.userService.findByUserName(username); if (null == user) { return null; @@ -263,7 +263,7 @@ public class Controller { if (!user.getPassword().equals(password)) { return null; } - // 在验证appKey + // 鍦ㄩ獙璇乤ppKey ApiUser apiUser = this.apiUserService.findApiUserById(user.getId()); if (null == apiUser) { return null; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CrowdsourceController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CrowdsourceController.java index 024b94328..44b71acf2 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CrowdsourceController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CrowdsourceController.java @@ -20,7 +20,7 @@ import org.bson.types.ObjectId; import java.util.*; /** - * 众包任务提交与查询Api + * 浼楀寘浠诲姟鎻愪氦涓庢煡璇pi * @author wenyan */ @Authority(role = Role.USER) @@ -37,31 +37,31 @@ public class CrowdsourceController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if(StringUtils.isBlank(model.getCity())){ - mav.setModel(BasicModel.buildBadRequestModel("城市不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍩庡競涓嶈兘涓虹┖")); return mav; } if(StringUtils.isBlank(model.getAddress())){ - mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍦板潃涓嶈兘涓虹┖")); return mav; } if(StringUtils.isBlank(model.getDeadline())){ - mav.setModel(BasicModel.buildBadRequestModel("截止日期不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鎴鏃ユ湡涓嶈兘涓虹┖")); return mav; } Date deadline = DateUtil.parseDate(model.getDeadline() ,"yyyy-MM-dd"); if(deadline == null){ - mav.setModel(BasicModel.buildBadRequestModel("截止日期不合法,正确格式:'yyyy-MM-dd'")); + mav.setModel(BasicModel.buildBadRequestModel("鎴鏃ユ湡涓嶅悎娉�,姝g‘鏍煎紡:'yyyy-MM-dd'")); return mav; } if(deadline.before(DateUtil.truncateDay(new Date()))){ - mav.setModel(BasicModel.buildBadRequestModel("请输入正确的截止时间")); + mav.setModel(BasicModel.buildBadRequestModel("璇疯緭鍏ユ纭殑鎴鏃堕棿")); return mav; } Map tokenMap = FangjiaApiUtil.parseToken(model.getToken()); String userName = null; - // token验证后,拿取出的字段再去数据库验证一遍 + // token楠岃瘉鍚庯紝鎷垮彇鍑虹殑瀛楁鍐嶅幓鏁版嵁搴撻獙璇佷竴閬� if (tokenMap != null && StringUtils.isNotBlank(tokenMap.get("userid"))&& !"null".equals(tokenMap.get("userid"))) { User user = userService.findById(Long.parseLong(tokenMap.get("userid"))); if(user != null){ @@ -75,7 +75,7 @@ public class CrowdsourceController { task.setStatus(1); task.setDateCreated(new Date()); task.setCity(model.getCity()); - task.setTaskType("小区调查"); + task.setTaskType("灏忓尯璋冩煡"); task.setDeadline(deadline); BasicDBObject params = new BasicDBObject(); @@ -86,12 +86,12 @@ public class CrowdsourceController { task.setTaskParams(params); taskService.saveTask(task); Map data = new HashMap(); - data.put("taskMsg","任务提交成功"); + data.put("taskMsg","浠诲姟鎻愪氦鎴愬姛"); data.put("taskId",task.getId()); List receivers = new ArrayList(); - receivers.add("曹艺曦"); - receivers.add("王文艳"); - messengerService.sendMessage("登记注册任务", "有新的登记注册任务", "ApiSystem", receivers, "../registerInfo/editproperty?id=" + task.getId()); + receivers.add("鏇硅壓鏇�"); + receivers.add("鐜嬫枃鑹�"); + messengerService.sendMessage("鐧昏娉ㄥ唽浠诲姟", "鏈夋柊鐨勭櫥璁版敞鍐屼换鍔�", "ApiSystem", receivers, "../registerInfo/editproperty?id=" + task.getId()); BasicModel okModel = BasicModel.buildOKModel(); okModel.setResult(data); mav.setModel(okModel); @@ -104,22 +104,22 @@ public class CrowdsourceController { mav.setViewType("rest"); if(StringUtils.isBlank(model.getId())){ - mav.setModel(BasicModel.buildBadRequestModel("小区调查任务编码(id)不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("灏忓尯璋冩煡浠诲姟缂栫爜(id)涓嶈兘涓虹┖")); return mav; } if(StringUtils.isBlank(model.getId()) || !ObjectId.isValid(model.getId())){ - mav.setModel(BasicModel.buildBadRequestModel("小区调查任务编码(id)不合法")); + mav.setModel(BasicModel.buildBadRequestModel("灏忓尯璋冩煡浠诲姟缂栫爜(id)涓嶅悎娉�")); return mav; } Task task = taskService.findTaskById(model.getId()); if(task == null){ - mav.setModel(BasicModel.buildBadRequestModel("没有找到对应的小区调查任务")); + mav.setModel(BasicModel.buildBadRequestModel("娌℃湁鎵惧埌瀵瑰簲鐨勫皬鍖鸿皟鏌ヤ换鍔�")); return mav; } Map tokenMap = FangjiaApiUtil.parseToken(model.getToken()); String userName = null; - // token验证后,拿取出的字段再去数据库验证一遍 + // token楠岃瘉鍚庯紝鎷垮彇鍑虹殑瀛楁鍐嶅幓鏁版嵁搴撻獙璇佷竴閬� if (tokenMap != null && StringUtils.isNotBlank(tokenMap.get("userid"))&& !"null".equals(tokenMap.get("userid"))) { User user = userService.findById(Long.parseLong(tokenMap.get("userid"))); if(user != null){ @@ -127,7 +127,7 @@ public class CrowdsourceController { } } if(task.getUserName() != null &&!task.getUserName().equals(userName)){ - mav.setModel(BasicModel.buildUnAuthorizedModel().setMsg("你无权查看该房产登记信息")); + mav.setModel(BasicModel.buildUnAuthorizedModel().setMsg("浣犳棤鏉冩煡鐪嬭鎴夸骇鐧昏淇℃伅")); return mav; } @@ -137,14 +137,14 @@ public class CrowdsourceController { okModel.setResult(result); if(task.getStatus() == 1 || task.getStatus() == 2){ result.put("status",1); - result.put("msg","小区信息正在调查中"); + result.put("msg","灏忓尯淇℃伅姝e湪璋冩煡涓�"); }else if(task.getStatus() ==3){ result.put("status",2); - result.put("msg","小区信息调查失败"); + result.put("msg","灏忓尯淇℃伅璋冩煡澶辫触"); }else if(task.getStatus() == 4){ result.putAll(task.getTaskResult()); result.put("status", 0); - result.put("msg", "小区信息调查完成"); + result.put("msg", "灏忓尯淇℃伅璋冩煡瀹屾垚"); okModel.setResult(result); } return mav; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CzbankController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CzbankController.java index 9649eff7b..2e32b9901 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CzbankController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CzbankController.java @@ -44,7 +44,7 @@ import java.io.IOException; import java.util.*; /** - * 浙商银行风险缓释项目接口 + * 娴欏晢閾惰椋庨櫓缂撻噴椤圭洰鎺ュ彛 */ @Authority(role = Role.USER) public class CzbankController { @@ -61,7 +61,7 @@ public class CzbankController { /** - * 样本查询接口 + * 鏍锋湰鏌ヨ鎺ュ彛 * @param model * @return */ @@ -71,13 +71,13 @@ public class CzbankController { long start = System.currentTimeMillis(); if(StringUtils.isBlank(model.getCltNo())){ - mav.setModel(BasicModel.buildBadRequestModel("cltNo押品编号不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("cltNo鎶煎搧缂栧彿涓嶈兘涓虹┖")); return mav; } if (StringUtils.isBlank(model.getProvince()) ||StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getDistrict()) || StringUtils.isBlank(model.getBuildingName()) || StringUtils.isBlank(model.getPropertyTypeCode())) { - mav.setModel(BasicModel.buildBadRequestModel("参数缺失:province(省),city(城市),district(区域),buildingName(名称),propertyTypeCode(物业类型编码)是必须参数")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟缂哄け:province(鐪�),city(鍩庡競),district(鍖哄煙),buildingName(鍚嶇О),propertyTypeCode(鐗╀笟绫诲瀷缂栫爜)鏄繀椤诲弬鏁�")); return mav; } @@ -86,7 +86,7 @@ public class CzbankController { fangjiaOfficialAreaMap = fangjiaOfficialAreaService.convertOfficialCodeToFangjiaCity(model.getDistrict()); } if(fangjiaOfficialAreaMap == null){ - mav.setModel(BasicModel.buildBadRequestModel("地区信息无法映射到房价网的地区信息->(province:" + model.getProvince() + " ,city: " + model.getCity() + " ,district: " + model.getDistrict() + ")")); + mav.setModel(BasicModel.buildBadRequestModel("鍦板尯淇℃伅鏃犳硶鏄犲皠鍒版埧浠风綉鐨勫湴鍖轰俊鎭�->(province:" + model.getProvince() + " ,city: " + model.getCity() + " ,district: " + model.getDistrict() + ")")); return mav; } @@ -97,26 +97,26 @@ public class CzbankController { propertyTypeCode = "01"; } if(!PROPERTY_TYPE_CODE_LIST.contains(propertyTypeCode)){ - mav.setModel(BasicModel.buildBadRequestModel("propertyTypeCode取值非法")); + mav.setModel(BasicModel.buildBadRequestModel("propertyTypeCode鍙栧�奸潪娉�")); return mav; } if(model.getStrctureArea() <= 0){ - mav.setModel(BasicModel.buildBadRequestModel("strctureArea取值非法")); + mav.setModel(BasicModel.buildBadRequestModel("strctureArea鍙栧�奸潪娉�")); return mav; } if (model.getFloorNumber() != null && (model.getFloorNumber() <= 0 || model.getFloorNumber() > 59)) { - mav.setModel(BasicModel.buildBadRequestModel("floorNumber,正确范围[1,60)")); + mav.setModel(BasicModel.buildBadRequestModel("floorNumber,姝g‘鑼冨洿[1,60)")); return mav; } if (model.getAboveFloorAmount() != null && (model.getAboveFloorAmount() <= 0 || model.getAboveFloorAmount() > 59)) { - mav.setModel(BasicModel.buildBadRequestModel("floorAmount,正确范围[1,60)")); + mav.setModel(BasicModel.buildBadRequestModel("floorAmount,姝g‘鑼冨洿[1,60)")); return mav; } if (model.getAboveFloorAmount() != null && model.getAboveFloorAmount() != null && model.getFloorNumber()> model.getAboveFloorAmount()) { - mav.setModel(BasicModel.buildBadRequestModel("所在楼层不能大于总楼层")); + mav.setModel(BasicModel.buildBadRequestModel("鎵�鍦ㄦゼ灞備笉鑳藉ぇ浜庢�绘ゼ灞�")); return mav; } @@ -127,7 +127,7 @@ public class CzbankController { decrCondCode = 2; } if(decrCondCode > 5 || decrCondCode < 1){ - mav.setModel(BasicModel.buildBadRequestModel("decrCondCode取值非法")); + mav.setModel(BasicModel.buildBadRequestModel("decrCondCode鍙栧�奸潪娉�")); return mav; } @@ -136,7 +136,7 @@ public class CzbankController { towardDirectCode = 3; } if(towardDirectCode > 10 || towardDirectCode < 1){ - mav.setModel(BasicModel.buildBadRequestModel("towardDirectCode取值非法")); + mav.setModel(BasicModel.buildBadRequestModel("towardDirectCode鍙栧�奸潪娉�")); return mav; } CollateralSampleQueryBean queryBean = new CollateralSampleQueryBean(); @@ -167,7 +167,7 @@ public class CzbankController { } } if(property == null){ - mav.setModel(BasicModel.buildBadRequestModel("该楼盘不存在 city:" + queryBean.getFangjiaCity() + " region:" + queryBean.getFangjiaDistrict() + " name:" + model.getBuildingName())); + mav.setModel(BasicModel.buildBadRequestModel("璇ユゼ鐩樹笉瀛樺湪 city:" + queryBean.getFangjiaCity() + " region:" + queryBean.getFangjiaDistrict() + " name:" + model.getBuildingName())); return mav; } } @@ -215,31 +215,31 @@ public class CzbankController { District property = null; try { if (StringUtils.isBlank(evaluationQuery.getCity()) || StringUtils.isBlank(evaluationQuery.getDistrict()) || StringUtils.isBlank(evaluationQuery.getName())) { - mav.setModel(BasicModel.buildBadRequestModel("参数缺失:city(城市),district(区域),buildingName(名称)是必须参数")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟缂哄け:city(鍩庡競),district(鍖哄煙),buildingName(鍚嶇О)鏄繀椤诲弬鏁�")); return mav; } if(evaluationQuery.getSize() <= 0){ - mav.setModel(BasicModel.buildBadRequestModel("size不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("size涓嶈兘涓虹┖")); return mav; } if (evaluationQuery.getCarportPrice() != null && (evaluationQuery.getCarportPrice() < 0 || evaluationQuery.getCarportPrice() > 1000000)) { - mav.setModel(BasicModel.buildBadRequestModel("carportPrice(车位)取值不合法")); + mav.setModel(BasicModel.buildBadRequestModel("carportPrice(杞︿綅)鍙栧�间笉鍚堟硶")); return mav; } if (evaluationQuery.getMaxFloor() != null && (evaluationQuery.getMaxFloor() <= 0 || evaluationQuery.getMaxFloor() > 59)) { - mav.setModel(BasicModel.buildBadRequestModel("maxFloor取值非法,正确范围[1,60)")); + mav.setModel(BasicModel.buildBadRequestModel("maxFloor鍙栧�奸潪娉�,姝g‘鑼冨洿[1,60)")); return mav; } if (evaluationQuery.getFloor() != null && (evaluationQuery.getFloor() <= 0 || evaluationQuery.getFloor() > 59)) { - mav.setModel(BasicModel.buildBadRequestModel("floor取值非法,正确范围[1,60)")); + mav.setModel(BasicModel.buildBadRequestModel("floor鍙栧�奸潪娉�,姝g‘鑼冨洿[1,60)")); return mav; } if (evaluationQuery.getMaxFloor() != null && evaluationQuery.getFloor() != null && evaluationQuery.getFloor() > evaluationQuery.getMaxFloor()) { - mav.setModel(BasicModel.buildBadRequestModel("所在楼层不能大于总楼层")); + mav.setModel(BasicModel.buildBadRequestModel("鎵�鍦ㄦゼ灞備笉鑳藉ぇ浜庢�绘ゼ灞�")); return mav; } @@ -248,7 +248,7 @@ public class CzbankController { fangjiaOfficialAreaMap = fangjiaOfficialAreaService.convertOfficialCodeToFangjiaCity(evaluationQuery.getDistrict()); } if(fangjiaOfficialAreaMap == null){ - mav.setModel(BasicModel.buildBadRequestModel("地区信息无法映射到房价网的地区信息->(province:" + evaluationQuery.getProvince() + " ,city: " + evaluationQuery.getCity() + " ,district: " + evaluationQuery.getDistrict() + ")")); + mav.setModel(BasicModel.buildBadRequestModel("鍦板尯淇℃伅鏃犳硶鏄犲皠鍒版埧浠风綉鐨勫湴鍖轰俊鎭�->(province:" + evaluationQuery.getProvince() + " ,city: " + evaluationQuery.getCity() + " ,district: " + evaluationQuery.getDistrict() + ")")); return mav; } String fangjiaCity = fangjiaOfficialAreaMap.getFangjiaCity(); @@ -278,7 +278,7 @@ public class CzbankController { } if(property == null){ - mav.setModel(BasicModel.buildBadRequestModel("该楼盘不存在 city:" + fangjiaCity + " region:" + fangjiaDistrict + " name:" + evaluationQuery.getName())); + mav.setModel(BasicModel.buildBadRequestModel("璇ユゼ鐩樹笉瀛樺湪 city:" + fangjiaCity + " region:" + fangjiaDistrict + " name:" + evaluationQuery.getName())); return mav; } @@ -286,7 +286,7 @@ public class CzbankController { if(property != null){ if(StringUtils.isNotBlank(fangjiaDistrict) && !property.getRegion().equals(fangjiaDistrict)){ - mav.setModel(BasicModel.buildBadRequestModel("该楼盘不存在 city:" + fangjiaCity + " region:" + fangjiaDistrict + " name:" + evaluationQuery.getName())); + mav.setModel(BasicModel.buildBadRequestModel("璇ユゼ鐩樹笉瀛樺湪 city:" + fangjiaCity + " region:" + fangjiaDistrict + " name:" + evaluationQuery.getName())); return mav; } } @@ -304,7 +304,7 @@ public class CzbankController { result.setTotalPrice(evaluation.getTotalPrice()); result.setAvgPrice(evaluation.getAvgPrice()); }else{ - mav.setModel(BasicModel.buildBadRequestModel("该楼盘暂无法估值!")); + mav.setModel(BasicModel.buildBadRequestModel("璇ユゼ鐩樻殏鏃犳硶浼板�硷紒")); return mav; } } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/DealPriceController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/DealPriceController.java index ab916308a..f6c766e4e 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/DealPriceController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/DealPriceController.java @@ -60,43 +60,43 @@ public class DealPriceController { private static final Map FITMENT_CODE = new HashMap(); static{ - priority.put("交易中心>链家在线>中原地产>搜房>新浪>百度乐居>满堂红",",北京,"); - priority.put("交易中心>中原地产>搜房>新浪>百度乐居>满堂红",",上海,"); - priority.put("房途网>中原地产>搜房>新浪>百度乐居>链家在线>满堂红",",杭州,"); - priority.put("链家在线>中原地产>搜房>新浪>百度乐居>满堂红",",天津,"); - priority.put("中原地产>满堂红>搜房>新浪>链家在线>百度乐居",",广州,深圳,东莞,佛山,"); - priority.put("中原地产>搜房>新浪>链家在线>百度乐居>满堂红",",重庆,成都,南京,苏州,宁波,合肥,武汉,南昌,长沙,郑州,哈尔滨,大连,济南,沈阳,长春,贵阳,乌鲁木齐,兰州,厦门,福州,西安,太原,石家庄,昆明,青岛,呼和浩特,温州,西宁,芜湖,南宁,无锡,烟台,泉州,南通,徐州,吉林,银川,常州,海口,潍坊,洛阳,淄博,绍兴,台州,大庆,鞍山,珠海,中山,柳州,汕头,保定,邯郸,秦皇岛,威海,湖州,扬州,镇江,盐城,嘉兴,金华,泰州,桂林,惠州,湛江,江门,株洲,衡阳,宜昌,平顶山,赣州,九江,绵阳,牡丹江,本溪,马鞍山,连云港,茂名,揭阳,自贡,衢州,廊坊,湘潭,清远,阳江,梅州,丹东,咸阳,丽江,张家界,大理,宿迁,襄阳,唐山,玉林,延安,三亚,六盘水,宜宾,莆田,攀枝花,北海,玉溪,云浮,肇庆,安阳,曲靖,新乡,营口,潮州,河源,黄石,焦作,盘锦,韶关,舟山,遵义,岳阳,锦州,常德,包头,济宁,蚌埠,安庆,南充,泸州,"); - ESTATE_TYPE_CODE.put("普通住宅", "1"); - ESTATE_TYPE_CODE.put("别墅", "2"); - ESTATE_TYPE_CODE.put("商住", "3"); + priority.put("浜ゆ槗涓績锛為摼瀹跺湪绾匡紴涓師鍦颁骇锛炴悳鎴匡紴鏂版氮锛炵櫨搴︿箰灞咃紴婊″爞绾�",",鍖椾含,"); + priority.put("浜ゆ槗涓績锛炰腑鍘熷湴浜э紴鎼滄埧锛炴柊娴紴鐧惧害涔愬眳锛炴弧鍫傜孩",",涓婃捣,"); + priority.put("鎴块�旂綉锛炰腑鍘熷湴浜э紴鎼滄埧锛炴柊娴紴鐧惧害涔愬眳锛為摼瀹跺湪绾匡紴婊″爞绾�",",鏉窞,"); + priority.put("閾惧鍦ㄧ嚎锛炰腑鍘熷湴浜э紴鎼滄埧锛炴柊娴紴鐧惧害涔愬眳锛炴弧鍫傜孩",",澶╂触,"); + priority.put("涓師鍦颁骇锛炴弧鍫傜孩锛炴悳鎴匡紴鏂版氮锛為摼瀹跺湪绾匡紴鐧惧害涔愬眳",",骞垮窞,娣卞湷,涓滆帪,浣涘北,"); + priority.put("涓師鍦颁骇锛炴悳鎴匡紴鏂版氮锛為摼瀹跺湪绾匡紴鐧惧害涔愬眳锛炴弧鍫傜孩",",閲嶅簡,鎴愰兘,鍗椾含,鑻忓窞,瀹佹尝,鍚堣偉,姝︽眽,鍗楁槍,闀挎矙,閮戝窞,鍝堝皵婊�,澶ц繛,娴庡崡,娌堥槼,闀挎槬,璐甸槼,涔岄瞾鏈ㄩ綈,鍏板窞,鍘﹂棬,绂忓窞,瑗垮畨,澶師,鐭冲搴�,鏄嗘槑,闈掑矝,鍛煎拰娴╃壒,娓╁窞,瑗垮畞,鑺滄箹,鍗楀畞,鏃犻敗,鐑熷彴,娉夊窞,鍗楅��,寰愬窞,鍚夋灄,閾跺窛,甯稿窞,娴峰彛,娼嶅潑,娲涢槼,娣勫崥,缁嶅叴,鍙板窞,澶у簡,闉嶅北,鐝犳捣,涓北,鏌冲窞,姹曞ご,淇濆畾,閭兏,绉︾殗宀�,濞佹捣,婀栧窞,鎵窞,闀囨睙,鐩愬煄,鍢夊叴,閲戝崕,娉板窞,妗傛灄,鎯犲窞,婀涙睙,姹熼棬,鏍床,琛¢槼,瀹滄槍,骞抽《灞�,璧e窞,涔濇睙,缁甸槼,鐗′腹姹�,鏈邯,椹瀺灞�,杩炰簯娓�,鑼傚悕,鎻槼,鑷础,琛㈠窞,寤婂潑,婀樻江,娓呰繙,闃虫睙,姊呭窞,涓逛笢,鍜搁槼,涓芥睙,寮犲鐣�,澶х悊,瀹胯縼,瑗勯槼,鍞愬北,鐜夋灄,寤跺畨,涓変簹,鍏洏姘�,瀹滃,鑾嗙敯,鏀�鏋濊姳,鍖楁捣,鐜夋邯,浜戞诞,鑲囧簡,瀹夐槼,鏇查潠,鏂颁埂,钀ュ彛,娼窞,娌虫簮,榛勭煶,鐒︿綔,鐩橀敠,闊跺叧,鑸熷北,閬典箟,宀抽槼,閿﹀窞,甯稿痉,鍖呭ご,娴庡畞,铓屽煚,瀹夊簡,鍗楀厖,娉稿窞,"); + ESTATE_TYPE_CODE.put("鏅�氫綇瀹�", "1"); + ESTATE_TYPE_CODE.put("鍒", "2"); + ESTATE_TYPE_CODE.put("鍟嗕綇", "3"); - BULIDS_TYPE_CODE.put("多层", "10"); - BULIDS_TYPE_CODE.put("小高层", "11"); - BULIDS_TYPE_CODE.put("超高层", "12"); - BULIDS_TYPE_CODE.put("高层", "13"); - BULIDS_TYPE_CODE.put("花园洋房", "14"); - BULIDS_TYPE_CODE.put("老洋房", "15"); - BULIDS_TYPE_CODE.put("四合院", "16"); - BULIDS_TYPE_CODE.put("独栋", "17"); - BULIDS_TYPE_CODE.put("双拼", "18"); - BULIDS_TYPE_CODE.put("联排", "19"); - BULIDS_TYPE_CODE.put("叠加", "20"); + BULIDS_TYPE_CODE.put("澶氬眰", "10"); + BULIDS_TYPE_CODE.put("灏忛珮灞�", "11"); + BULIDS_TYPE_CODE.put("瓒呴珮灞�", "12"); + BULIDS_TYPE_CODE.put("楂樺眰", "13"); + BULIDS_TYPE_CODE.put("鑺卞洯娲嬫埧", "14"); + BULIDS_TYPE_CODE.put("鑰佹磱鎴�", "15"); + BULIDS_TYPE_CODE.put("鍥涘悎闄�", "16"); + BULIDS_TYPE_CODE.put("鐙爧", "17"); + BULIDS_TYPE_CODE.put("鍙屾嫾", "18"); + BULIDS_TYPE_CODE.put("鑱旀帓", "19"); + BULIDS_TYPE_CODE.put("鍙犲姞", "20"); - DIRECTION_CODE.put("西北", "1"); - DIRECTION_CODE.put("北", "1"); - DIRECTION_CODE.put("东", "2"); - DIRECTION_CODE.put("西", "2"); - DIRECTION_CODE.put("东西", "2"); - DIRECTION_CODE.put("南", "3"); - DIRECTION_CODE.put("东南", "3"); - DIRECTION_CODE.put("南北", "3"); - DIRECTION_CODE.put("东北", "4"); - DIRECTION_CODE.put("西南", "5"); + DIRECTION_CODE.put("瑗垮寳", "1"); + DIRECTION_CODE.put("鍖�", "1"); + DIRECTION_CODE.put("涓�", "2"); + DIRECTION_CODE.put("瑗�", "2"); + DIRECTION_CODE.put("涓滆タ", "2"); + DIRECTION_CODE.put("鍗�", "3"); + DIRECTION_CODE.put("涓滃崡", "3"); + DIRECTION_CODE.put("鍗楀寳", "3"); + DIRECTION_CODE.put("涓滃寳", "4"); + DIRECTION_CODE.put("瑗垮崡", "5"); - FITMENT_CODE.put("毛坯", "1"); - FITMENT_CODE.put("简装", "1"); - FITMENT_CODE.put("精装", "2"); - FITMENT_CODE.put("全装修", "3"); + FITMENT_CODE.put("姣涘澂", "1"); + FITMENT_CODE.put("绠�瑁�", "1"); + FITMENT_CODE.put("绮捐", "2"); + FITMENT_CODE.put("鍏ㄨ淇�", "3"); } public static final String[] INCLUDE_DISTRICT_FIELDS = { @@ -112,20 +112,20 @@ public class DealPriceController { mv.setViewType("rest"); if (StringUtils.isNotBlank(model.getFloor())&&!StringUtil.isInteger(model.getFloor())) { - mv.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE,"楼层(floor)必须是数字")); + mv.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE,"妤煎眰(floor)蹇呴』鏄暟瀛�")); return mv; } if (model.getSize() == null) { - mv.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE,"面积(size)不能为空")); + mv.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE,"闈㈢Н(size)涓嶈兘涓虹┖")); return mv; } if(StringUtils.isBlank(model.getResidenceId())){ - mv.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE,"小区ID(residenceId)不能为空")); + mv.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE,"灏忓尯ID(residenceId)涓嶈兘涓虹┖")); return mv; } District district = districtService.findById(model.getResidenceId(), INCLUDE_DISTRICT_FIELDS); if(district == null){ - mv.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE,"没有找到匹配小区")); + mv.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE,"娌℃湁鎵惧埌鍖归厤灏忓尯")); return mv; } List districtNames = new ArrayList(); @@ -159,10 +159,10 @@ public class DealPriceController { Map deal; for (DealPrice dealPrice : dealPrices) { dealPrice.setId(null); - if("交易中心".equals(dealPrice.getSource())||"房途网".equals(dealPrice.getSource())){ - dealPrice.setSource("交易中心"); + if("浜ゆ槗涓績".equals(dealPrice.getSource())||"鎴块�旂綉".equals(dealPrice.getSource())){ + dealPrice.setSource("浜ゆ槗涓績"); }else{ - dealPrice.setSource("合作中介"); + dealPrice.setSource("鍚堜綔涓粙"); } deal = new LinkedHashMap(); deal.put("size", dealPrice.getArea()); @@ -219,14 +219,14 @@ public class DealPriceController { mv.setViewType("rest"); if (StringUtils.isBlank(model.getId())) { - mv.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "楼盘编号不能为空")); + mv.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "妤肩洏缂栧彿涓嶈兘涓虹┖")); return mv; } District district = districtService.findDistrictById(model.getId()); DistrictKey districtKey = new DistrictKey(district.getCity(), district.getRegion(), district.getName()); if(district == null){ - mv.setModel(BasicModel.buildBadRequestModel("该小区不存在")); + mv.setModel(BasicModel.buildBadRequestModel("璇ュ皬鍖轰笉瀛樺湪")); return mv; } DistrictStatBo bo = districtStatService.findCurrentDistrictStat(districtKey); @@ -257,7 +257,7 @@ public class DealPriceController { params.add(new QueryParam("city", city)); params.add(new QueryParam("region", region)); params.add(new QueryParam("districtName", name)); - params.add(new QueryParam("source", "交易中心")); + params.add(new QueryParam("source", "浜ゆ槗涓績")); params.add(new QueryParam("tradeDate", QueryParam.GREATER_THAN_EQUAL_OPERATOR, calendar.getTime())); List prioriyies = getPriority(city); List dealPrices = new ArrayList(); @@ -310,7 +310,7 @@ public class DealPriceController { /** - * 返回该城市成交价的数据源优先级 若没有找到返回NULL + * 杩斿洖璇ュ煄甯傛垚浜や环鐨勬暟鎹簮浼樺厛绾� 鑻ユ病鏈夋壘鍒拌繑鍥濶ULL * @param city * @return */ @@ -327,7 +327,7 @@ public class DealPriceController { if(priorities == null){ return null; } - return Arrays.asList(priorities.split(">")); + return Arrays.asList(priorities.split("锛�")); } public AddressService getAddressService() { @@ -427,10 +427,10 @@ public class DealPriceController { if(district.getBuildDate() != null || district.getFinishBuildingDate()!=null || district.getLiveDate() != null){ int minYear = getBuildYear(district.getFinishBuildingDate(), district.getLiveDate(), district.getBuildDate()); if(minYear > 0){ - buildDate = minYear + "年"; + buildDate = minYear + "骞�"; } if(StringUtils.isNotBlank(district.getPropertyLife())&&getHouseUseYear(minYear, district.getPropertyLife()) != null){ - remainUseYear = getHouseUseYear(minYear, district.getPropertyLife())+"年";//剩余使用年限 + remainUseYear = getHouseUseYear(minYear, district.getPropertyLife())+"骞�";//鍓╀綑浣跨敤骞撮檺 } } @@ -479,13 +479,13 @@ public class DealPriceController { private String getHouseType(DealPrice bo){ StringBuilder sb = new StringBuilder(); if(bo.getRoom() != null){ - sb.append(bo.getRoom()+"室"); + sb.append(bo.getRoom()+"瀹�"); } if(bo.getHall() != null){ - sb.append(bo.getHall()+"厅"); + sb.append(bo.getHall()+"鍘�"); } if(bo.getToilet() != null){ - sb.append(bo.getHall()+"卫"); + sb.append(bo.getHall()+"鍗�"); } return sb.toString(); } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/DingMessageController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/DingMessageController.java index 831695c10..41dd3189a 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/DingMessageController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/DingMessageController.java @@ -9,7 +9,7 @@ import org.apache.commons.lang.StringUtils; import org.sothis.web.mvc.annotation.Param; /** - * 钉钉消息发送接口 + * 閽夐拤娑堟伅鍙戦�佹帴鍙� */ public class DingMessageController { @@ -20,7 +20,7 @@ public class DingMessageController { RestfulModelAndView mav = new RestfulModelAndView(); if(StringUtils.isBlank(receiver) || StringUtils.isBlank(msg)){ - mav.setModel(BasicModel.buildBadRequestModel("receiver和msg不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("receiver鍜宮sg涓嶈兘涓虹┖")); return mav; } UniversalDto dto = new UniversalDto(); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/DistrictController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/DistrictController.java index 826ee47c4..7977605f4 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/DistrictController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/DistrictController.java @@ -72,7 +72,7 @@ import com.fangjia.service.sql.ApiUserService; import com.fangjia.service.web.MenuService; /** - * 小区接口 + * 灏忓尯鎺ュ彛 * * @author velna */ @@ -105,11 +105,11 @@ public class DistrictController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(city)) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "所在城市必须输入")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鎵�鍦ㄥ煄甯傚繀椤昏緭鍏�")); } if (StringUtils.isBlank(keyword)) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "关键字必须输入")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鍏抽敭瀛楀繀椤昏緭鍏�")); } List districts = this.districtService.searchByKeyword(cat, city, keyword, limit); @@ -138,12 +138,12 @@ public class DistrictController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(city)) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "小区所在城市必须输入")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "灏忓尯鎵�鍦ㄥ煄甯傚繀椤昏緭鍏�")); return mav; } if (!"district".equals(cat) && !"new_district".equals(cat)) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "小区类型必须输入正确")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "灏忓尯绫诲瀷蹇呴』杈撳叆姝g‘")); return mav; } @@ -152,7 +152,7 @@ public class DistrictController { System.out.println(new Date().getTime()); if (skip < 0 || skip > 1000000 || limit < 0 || limit > 10000) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "请求数量参数不正确")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "璇锋眰鏁伴噺鍙傛暟涓嶆纭�")); return mav; } @@ -188,7 +188,7 @@ public class DistrictController { } /** - * 根据城市和关键词取小区 + * 鏍规嵁鍩庡競鍜屽叧閿瘝鍙栧皬鍖� * * @param city * @param keyword @@ -200,11 +200,11 @@ public class DistrictController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(city)) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "小区所在城市必须输入")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "灏忓尯鎵�鍦ㄥ煄甯傚繀椤昏緭鍏�")); return mav; } if (StringUtils.isBlank(keyword)) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "关键词必须输入")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鍏抽敭璇嶅繀椤昏緭鍏�")); return mav; } List districtNames = autoCompleteService.suggestDistrict(keyword, city, 10); @@ -239,7 +239,7 @@ public class DistrictController { } /** - * 根据关键词取小区 + * 鏍规嵁鍏抽敭璇嶅彇灏忓尯 * * @param city * @param keyword @@ -251,7 +251,7 @@ public class DistrictController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(keyword)) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "关键词必须输入")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鍏抽敭璇嶅繀椤昏緭鍏�")); return mav; } @@ -289,7 +289,7 @@ public class DistrictController { } /** - * 小区搜索 + * 灏忓尯鎼滅储 * * @return */ @@ -297,7 +297,7 @@ public class DistrictController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "小区所在城市必须输入")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "灏忓尯鎵�鍦ㄥ煄甯傚繀椤昏緭鍏�")); return mav; } Pager pager = new Pager(); @@ -313,7 +313,7 @@ public class DistrictController { int startRow = (pageIndex - 1) * pager.getPageSize(); pager.setStartRow(startRow); } - // 是否输入半径查询,其他情况直接moedel查询即可 + // 鏄惁杈撳叆鍗婂緞鏌ヨ锛屽叾浠栨儏鍐电洿鎺oedel鏌ヨ鍗冲彲 if (isRadiusSearch(model)) { Long lng = model.getLng(); Long lat = model.getLat(); @@ -380,10 +380,10 @@ public class DistrictController { } } } - // 若存在外景图则只考虑外景图 + // 鑻ュ瓨鍦ㄥ鏅浘鍒欏彧鑰冭檻澶栨櫙鍥� List outPics = bo.getOutPics(); if (CollectionUtils.isNotEmpty(outPics)) { - // 标志图取中间一张 + // 鏍囧織鍥惧彇涓棿涓�寮� districtDto.setPic(outPics.get(outPics.size() / 2)); if (outPics.size() <= 5) { districtDto.setPics(outPics); @@ -423,7 +423,7 @@ public class DistrictController { } /** - * 是否可以提供经纬度 + * 鏄惁鍙互鎻愪緵缁忕含搴� * * @param request * @return @@ -439,7 +439,7 @@ public class DistrictController { } /** - * 小区详情 + * 灏忓尯璇︽儏 * * @return */ @@ -448,16 +448,16 @@ public class DistrictController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(name) || StringUtils.isBlank(city) || StringUtils.isBlank(region)) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "小区所在城市,小区名,所在区域必必须输入")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "灏忓尯鎵�鍦ㄥ煄甯�,灏忓尯鍚�,鎵�鍦ㄥ尯鍩熷繀蹇呴』杈撳叆")); return mav; } else { DistrictBo districtBo = districtService.findByFullMode(new DistrictKey(city, region, name)); if (null == districtBo) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "小区数据不存在,请检查查询条件")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "灏忓尯鏁版嵁涓嶅瓨鍦紝璇锋鏌ユ煡璇㈡潯浠�")); return mav; } districtBo.setStat(this.districtStatService.findDistrictStat(districtBo.getDistrictKey())); - // 去除小区描述中的html标签 + // 鍘婚櫎灏忓尯鎻忚堪涓殑html鏍囩 districtBo.setDescription(DataUtil.removeSpecialString(districtBo.getDescription())); DistrictHouse dh = this.districtHouseService.findDistrictHouseByDistrictKey(new DistrictKey(city, region, name)); DistrictDto districtDto = new DistrictDto(districtBo, isSupportLatLng(request)); @@ -465,10 +465,10 @@ public class DistrictController { districtDto.setSellCount(dh.getSellCount()); districtDto.setRentCount(dh.getRentCount()); } - // 若存在外景图则只考虑外景图,若无外景图则无图片,取前5张 + // 鑻ュ瓨鍦ㄥ鏅浘鍒欏彧鑰冭檻澶栨櫙鍥撅紝鑻ユ棤澶栨櫙鍥惧垯鏃犲浘鐗囷紝鍙栧墠5寮� List outPics = districtBo.getOutPics(); if (CollectionUtils.isNotEmpty(outPics)) { - // 标志图取中间一张 + // 鏍囧織鍥惧彇涓棿涓�寮� districtDto.setPic(outPics.get(outPics.size() / 2)); if (outPics.size() <= 5) { districtDto.setPics(outPics); @@ -495,7 +495,7 @@ public class DistrictController { } /** - * 智能解析小区详情 + * 鏅鸿兘瑙f瀽灏忓尯璇︽儏 * * @return */ @@ -504,13 +504,13 @@ public class DistrictController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(name) || StringUtils.isBlank(city) || StringUtils.isBlank(region)) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "小区所在城市,小区名,所在区域必必须输入")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "灏忓尯鎵�鍦ㄥ煄甯�,灏忓尯鍚�,鎵�鍦ㄥ尯鍩熷繀蹇呴』杈撳叆")); return mav; } city = knowbaseService.matchingCityDefaultNull(city); region = knowbaseService.matchingRegionDefaultNull(region, city); if (null == city || null == region) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "小区所在城市或所在区域不存在")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "灏忓尯鎵�鍦ㄥ煄甯傛垨鎵�鍦ㄥ尯鍩熶笉瀛樺湪")); return mav; } District tempDistrict = null; @@ -539,17 +539,17 @@ public class DistrictController { } } if (null == tempDistrict) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "小区数据不存在,请检查查询条件")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "灏忓尯鏁版嵁涓嶅瓨鍦紝璇锋鏌ユ煡璇㈡潯浠�")); return mav; } DistrictBo districtBo = districtService.findByFullMode(new DistrictKey(tempDistrict.getCity(), tempDistrict.getRegion(), tempDistrict.getName())); if (null == districtBo) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "小区数据不存在,请检查查询条件")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "灏忓尯鏁版嵁涓嶅瓨鍦紝璇锋鏌ユ煡璇㈡潯浠�")); return mav; } districtBo.setStat(this.districtStatService.findDistrictStat(districtBo.getDistrictKey())); - // 去除小区描述中的html标签 + // 鍘婚櫎灏忓尯鎻忚堪涓殑html鏍囩 districtBo.setDescription(DataUtil.removeSpecialString(districtBo.getDescription())); DistrictHouse dh = this.districtHouseService.findDistrictHouseByDistrictKey(new DistrictKey(city, region, name)); DistrictDto districtDto = new DistrictDto(districtBo, isSupportLatLng(request)); @@ -558,10 +558,10 @@ public class DistrictController { districtDto.setRentCount(dh.getRentCount()); } - // 若存在外景图则只考虑外景图,若无外景图则无图片,取前5张 + // 鑻ュ瓨鍦ㄥ鏅浘鍒欏彧鑰冭檻澶栨櫙鍥撅紝鑻ユ棤澶栨櫙鍥惧垯鏃犲浘鐗囷紝鍙栧墠5寮� List outPics = districtBo.getOutPics(); if (CollectionUtils.isNotEmpty(outPics)) { - // 标志图取中间一张 + // 鏍囧織鍥惧彇涓棿涓�寮� districtDto.setPic(outPics.get(outPics.size() / 2)); if (outPics.size() <= 5) { districtDto.setPics(outPics); @@ -589,7 +589,7 @@ public class DistrictController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "小区所在城市必须输入")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "灏忓尯鎵�鍦ㄥ煄甯傚繀椤昏緭鍏�")); return mav; } Pager pager = new Pager(); @@ -628,10 +628,10 @@ public class DistrictController { districtDto.setSellCount(dh.getSellCount()); districtDto.setRentCount(dh.getRentCount()); } - // 若存在外景图则只考虑外景图 + // 鑻ュ瓨鍦ㄥ鏅浘鍒欏彧鑰冭檻澶栨櫙鍥� List outPics = bo.getOutPics(); if (CollectionUtils.isNotEmpty(outPics)) { - // 标志图取中间一张 + // 鏍囧織鍥惧彇涓棿涓�寮� districtDto.setPic(outPics.get(outPics.size() / 2)); if (outPics.size() <= 5) { districtDto.setPics(outPics); @@ -659,7 +659,7 @@ public class DistrictController { } /** - * 小区均价查询接口 + * 灏忓尯鍧囦环鏌ヨ鎺ュ彛 * * @param model * @return @@ -668,13 +668,13 @@ public class DistrictController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getDistrict())) { - mav.setModel(BasicModel.buildBadRequestModel("参数缺失:city(城市),district(区域)是必须参数")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟缂哄け:city(鍩庡競),district(鍖哄煙)鏄繀椤诲弬鏁�")); return mav; } if (!RegionData.isCity(model.getCity())) { String city = RegionData.formatCity(model.getCity()); if (null == city) { - mav.setModel(BasicModel.buildBadRequestModel("非法城市:" + model.getCity())); + mav.setModel(BasicModel.buildBadRequestModel("闈炴硶鍩庡競:" + model.getCity())); return mav; } else { model.setCity(city); @@ -683,7 +683,7 @@ public class DistrictController { String region = RegionData.formatRegion(model.getCity(), model.getDistrict()); model.setDistrict(region); if (!RegionData.isRegion(model.getCity(), region)) { - mav.setModel(BasicModel.buildBadRequestModel("没有找你输入的区域")); + mav.setModel(BasicModel.buildBadRequestModel("娌℃湁鎵句綘杈撳叆鐨勫尯鍩�")); return mav; } @@ -691,7 +691,7 @@ public class DistrictController { model.setPeriodCount(1); } if (model.getPeriodCount() < 1 || model.getPeriodCount() > 36) { - mav.setModel(BasicModel.buildBadRequestModel("periodCount值不合法,取值范围是:[1-36]")); + mav.setModel(BasicModel.buildBadRequestModel("periodCount鍊间笉鍚堟硶,鍙栧�艰寖鍥存槸锛歔1-36]")); return mav; } @@ -699,7 +699,7 @@ public class DistrictController { calendar.add(Calendar.MONTH, -model.getPeriodCount()); int year = calendar.get(Calendar.YEAR); - int month = calendar.get(Calendar.MONTH) + 1; // 注意:月份从 0 开始,需要加 1 + int month = calendar.get(Calendar.MONTH) + 1; // 娉ㄦ剰锛氭湀浠戒粠 0 寮�濮嬶紝闇�瑕佸姞 1 int montyInt = year * 100 + month; List datas = regionStatTrendService.getAllWithMonths(model.getCity(), region, model.getPeriodCount()); @@ -721,7 +721,7 @@ public class DistrictController { } /** - * 区域均价查询接口 + * 鍖哄煙鍧囦环鏌ヨ鎺ュ彛 * * @param model * @return @@ -730,13 +730,13 @@ public class DistrictController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getDistrict())) { - mav.setModel(BasicModel.buildBadRequestModel("参数缺失:city(城市),district(区域)是必须参数")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟缂哄け:city(鍩庡競),district(鍖哄煙)鏄繀椤诲弬鏁�")); return mav; } if (!RegionData.isCity(model.getCity())) { String city = RegionData.formatCity(model.getCity()); if (null == city) { - mav.setModel(BasicModel.buildBadRequestModel("非法城市:" + model.getCity())); + mav.setModel(BasicModel.buildBadRequestModel("闈炴硶鍩庡競:" + model.getCity())); return mav; } else { model.setCity(city); @@ -745,11 +745,11 @@ public class DistrictController { String region = RegionData.formatRegion(model.getCity(), model.getDistrict()); model.setDistrict(region); if (!RegionData.isRegion(model.getCity(), region)) { - mav.setModel(BasicModel.buildBadRequestModel("没有找你输入的区域")); + mav.setModel(BasicModel.buildBadRequestModel("娌℃湁鎵句綘杈撳叆鐨勫尯鍩�")); return mav; } if (model.getHouseType() == null || model.getHouseType() < 1) { - mav.setModel(BasicModel.buildBadRequestModel("房屋类型不合法")); + mav.setModel(BasicModel.buildBadRequestModel("鎴垮眿绫诲瀷涓嶅悎娉�")); return mav; } @@ -757,7 +757,7 @@ public class DistrictController { model.setPeriodCount(1); } if (model.getPeriodCount() < 1 || model.getPeriodCount() > 72) { - mav.setModel(BasicModel.buildBadRequestModel("periodCount值不合法,取值范围是:[1-72]")); + mav.setModel(BasicModel.buildBadRequestModel("periodCount鍊间笉鍚堟硶,鍙栧�艰寖鍥存槸锛歔1-72]")); return mav; } @@ -780,7 +780,7 @@ public class DistrictController { } // /** -// * 获取小区的均价Action +// * 鑾峰彇灏忓尯鐨勫潎浠稟ction // * // * @param city // * @param region @@ -792,12 +792,12 @@ public class DistrictController { // RestfulModelAndView mav = new RestfulModelAndView(); // mav.setViewType("rest"); // if (StringUtils.isBlank(city) || StringUtils.isBlank(region) || StringUtils.isBlank(name)) { -// mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "小区所在城市,所在区域,小区名为必填项")); +// mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "灏忓尯鎵�鍦ㄥ煄甯�,鎵�鍦ㄥ尯鍩�,灏忓尯鍚嶄负蹇呭~椤�")); // return mav; // } // DistrictBo districtBo = this.districtService.findByFullMode(new DistrictKey(city, region, name)); // if (null == districtBo) { -// mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "小区不存在,请检查城市名,区域,小区名")); +// mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "灏忓尯涓嶅瓨鍦紝璇锋鏌ュ煄甯傚悕,鍖哄煙,灏忓尯鍚�")); // return mav; // } // @@ -807,7 +807,7 @@ public class DistrictController { // if(districtBo.getEstateType2().indexOf(DistrictKindEnum.bieshu.getValue())!=-1){ // kind = DistrictKindEnum.bieshu.getValue(); // } -// if(districtBo.getEstateType2().indexOf("住宅")!=-1||districtBo.getEstateType2().indexOf("小区")!=-1){ +// if(districtBo.getEstateType2().indexOf("浣忓畢")!=-1||districtBo.getEstateType2().indexOf("灏忓尯")!=-1){ // if(kind.length()>1){ // kind = kind + ","; // } @@ -841,7 +841,7 @@ public class DistrictController { // DistrictKindEnum.gongyu.getValue(), date, count); // } // if (CollectionUtils.isEmpty(districtStatList) && CollectionUtils.isEmpty(villaStatList)) { -// mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "对应的小区无均价数据")); +// mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "瀵瑰簲鐨勫皬鍖烘棤鍧囦环鏁版嵁")); // return mav; // } // districtStatList = (List) OfcChartUtils.fixYDatas(date, districtStatList, count, null); @@ -856,7 +856,7 @@ public class DistrictController { /** - * 获取小区的均价Action + * 鑾峰彇灏忓尯鐨勫潎浠稟ction * * @param city * @param region @@ -868,12 +868,12 @@ public class DistrictController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(city) || StringUtils.isBlank(region) || StringUtils.isBlank(name)) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "小区所在城市,所在区域,小区名为必填项")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "灏忓尯鎵�鍦ㄥ煄甯�,鎵�鍦ㄥ尯鍩�,灏忓尯鍚嶄负蹇呭~椤�")); return mav; } DistrictBo districtBo = this.districtService.findByFullMode(new DistrictKey(city, region, name)); if (null == districtBo) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "小区不存在,请检查城市名,区域,小区名")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "灏忓尯涓嶅瓨鍦紝璇锋鏌ュ煄甯傚悕,鍖哄煙,灏忓尯鍚�")); return mav; } @@ -883,7 +883,7 @@ public class DistrictController { if (districtBo.getEstateType2().indexOf(DistrictKindEnum.bieshu.getValue()) != -1) { kind = DistrictKindEnum.bieshu.getValue(); } - if (districtBo.getEstateType2().indexOf("住宅") != -1 || districtBo.getEstateType2().indexOf("小区") != -1) { + if (districtBo.getEstateType2().indexOf("浣忓畢") != -1 || districtBo.getEstateType2().indexOf("灏忓尯") != -1) { if (kind.length() > 1) { kind = kind + ","; } @@ -917,7 +917,7 @@ public class DistrictController { DistrictKindEnum.gongyu.getValue(), date, 1); } if (CollectionUtils.isEmpty(districtStatList) && CollectionUtils.isEmpty(villaStatList)) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "对应的小区无均价数据")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "瀵瑰簲鐨勫皬鍖烘棤鍧囦环鏁版嵁")); return mav; } @@ -937,7 +937,7 @@ public class DistrictController { } /** - * 获取小区的历史均价Action + * 鑾峰彇灏忓尯鐨勫巻鍙插潎浠稟ction * * @param city * @param region @@ -954,13 +954,13 @@ public class DistrictController { count = weekCount; } if (StringUtils.isBlank(name)) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "小区所在城市,小区名为必填项")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "灏忓尯鎵�鍦ㄥ煄甯�,灏忓尯鍚嶄负蹇呭~椤�")); return mav; } District currentDistrict = null; city = knowbaseService.matchingCityDefaultNull(city); if (StringUtils.isBlank(city)) { - city = "上海"; + city = "涓婃捣"; } Map konwbase = knowbaseService.parseWord(name); List> districts = (null != konwbase && null != konwbase.get("district_name")) ? (List>) konwbase @@ -986,15 +986,15 @@ public class DistrictController { } if (null == currentDistrict) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "未找到相关小区信息")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "鏈壘鍒扮浉鍏冲皬鍖轰俊鎭�")); return mav; } - // 解析出城市区域小区名楼栋号 + // 瑙f瀽鍑哄煄甯傚尯鍩熷皬鍖哄悕妤兼爧鍙� DistrictBo districtBo = this.districtService.findByFullMode(new DistrictKey(currentDistrict.getCity(), currentDistrict .getRegion(), currentDistrict.getName())); if (null == districtBo) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "小区不存在,请检查城市名,小区名")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "灏忓尯涓嶅瓨鍦紝璇锋鏌ュ煄甯傚悕,灏忓尯鍚�")); return mav; } if (StringUtils.isEmpty(districtBo.getKind())) { @@ -1019,7 +1019,7 @@ public class DistrictController { DistrictKindEnum.gongyu.getValue(), date, count); } if (CollectionUtils.isEmpty(districtStatList) && CollectionUtils.isEmpty(villaStatList)) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "对应的小区无均价数据")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "瀵瑰簲鐨勫皬鍖烘棤鍧囦环鏁版嵁")); return mav; } districtStatList = (List) OfcChartUtils.fixYDatas(date, districtStatList, count, null); @@ -1033,7 +1033,7 @@ public class DistrictController { } /** - * 根据小区名等获取小区属性 + * 鏍规嵁灏忓尯鍚嶇瓑鑾峰彇灏忓尯灞炴�� * * @param uniqueCodes * @param districtNames @@ -1048,11 +1048,11 @@ public class DistrictController { mav.setViewType("rest"); if (uniqueCodes.length * districtNames.length * regionNames.length * cityNames.length == 0) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "小区唯一码、小区名、小区所在区域、小区所在城市必填")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "灏忓尯鍞竴鐮併�佸皬鍖哄悕銆佸皬鍖烘墍鍦ㄥ尯鍩熴�佸皬鍖烘墍鍦ㄥ煄甯傚繀濉�")); return mav; } if (uniqueCodes.length - districtNames.length + regionNames.length - cityNames.length != 0) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "小区唯一码数组、小区名数组、小区所在区域数组、小区所在城市数组数量必须相同")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "灏忓尯鍞竴鐮佹暟缁勩�佸皬鍖哄悕鏁扮粍銆佸皬鍖烘墍鍦ㄥ尯鍩熸暟缁勩�佸皬鍖烘墍鍦ㄥ煄甯傛暟缁勬暟閲忓繀椤荤浉鍚�")); return mav; } @@ -1142,12 +1142,12 @@ public class DistrictController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(name) || StringUtils.isBlank(city) || StringUtils.isBlank(region)) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "小区所在城市,小区名,所在区域必必须输入")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "灏忓尯鎵�鍦ㄥ煄甯�,灏忓尯鍚�,鎵�鍦ㄥ尯鍩熷繀蹇呴』杈撳叆")); return mav; } else { District districtBo = districtService.findDistrict(new DistrictKey(city, region, name), "district"); if (null == districtBo) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "小区数据不存在")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "灏忓尯鏁版嵁涓嶅瓨鍦�")); return mav; } DistrictFacilitys facilitys = districtFacilitysService.findByDistrict(districtBo); @@ -1156,7 +1156,7 @@ public class DistrictController { return mav; } - // 保存周边配套 + // 淇濆瓨鍛ㄨ竟閰嶅 public Object saveFacilitiesAction(DistrictFacilitysModel model) { model = processParam(model); if (StringUtils.isNotBlank(model.getId())) { @@ -1186,21 +1186,21 @@ public class DistrictController { if (value != null && !value.isEmpty()) { value = value.replaceAll("\\[", "").replaceAll("]", "").replaceAll(" ", ""); - String[] splitValues = value.split(","); // 按逗号分割 + String[] splitValues = value.split(","); // 鎸夐�楀彿鍒嗗壊 - // 遍历数组并过滤空字符串 + // 閬嶅巻鏁扮粍骞惰繃婊ょ┖瀛楃涓� for (String str : splitValues) { - if (!str.isEmpty()) { // 只添加非空字符串 + if (!str.isEmpty()) { // 鍙坊鍔犻潪绌哄瓧绗︿覆 result.add(str); } } } - return result.isEmpty() ? null : result; // 如果结果为空,则返回 null + return result.isEmpty() ? null : result; // 濡傛灉缁撴灉涓虹┖锛屽垯杩斿洖 null } public static DistrictFacilitysModel processParam(DistrictFacilitysModel model) { - // 处理每个字段,确保只有非 null 字段才进行处理 + // 澶勭悊姣忎釜瀛楁锛岀‘淇濆彧鏈夐潪 null 瀛楁鎵嶈繘琛屽鐞� if (model.getKindergarten() != null) { model.setKindergarten(convertToList(model.getKindergarten().toString())); } @@ -1251,7 +1251,7 @@ public class DistrictController { } /** - * 获取小区图片 + * 鑾峰彇灏忓尯鍥剧墖 * * @param districtModel * @return @@ -1260,14 +1260,14 @@ public class DistrictController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(districtModel.getId())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "ID必须输入")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "ID蹇呴』杈撳叆")); return mav; } SeaweedImages seaweedImages = seaweedImagesService.findById(districtModel.getId()); if (seaweedImages != null) { mav.setModel(BasicModel.buildOKModel().setResult(seaweedImages)); } else { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "图片数据不存在")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "鍥剧墖鏁版嵁涓嶅瓨鍦�")); } return mav; } @@ -1276,11 +1276,11 @@ public class DistrictController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(model.getId())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "ID必须输入")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "ID蹇呴』杈撳叆")); return mav; } seaweedImagesService.deleteImage(model.getId(), model.getUrl(), model.getPicType(), model.getRoomType()); - mav.setModel(new HttpCode(OpenHttpCodeEnum.OK, "删除成功")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.OK, "鍒犻櫎鎴愬姛")); return mav; } @@ -1291,11 +1291,11 @@ public class DistrictController { model.setImageUrls(convertToList(model.getImageUrls().toString())); } if (StringUtils.isBlank(model.getId())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "ID必须输入")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "ID蹇呴』杈撳叆")); return mav; } seaweedImagesService.addImage(model.getId(), model.getImageUrls(), model.getPicType(), model.getRoomType()); - mav.setModel(new HttpCode(OpenHttpCodeEnum.OK, "添加成功")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.OK, "娣诲姞鎴愬姛")); return mav; } @@ -1304,7 +1304,7 @@ public class DistrictController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(address)) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "地址必须输入")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鍦板潃蹇呴』杈撳叆")); return mav; } else { String cat = "district"; @@ -1315,20 +1315,20 @@ public class DistrictController { params.put("city", city); params.put("address", address); params.put("category", "property"); - //新匹配接口 + //鏂板尮閰嶆帴鍙� json = request.getJsonContent("http://192.168.0.100:32080/FangJiaNlpService/match", params, "UTF-8"); District property = null; if (json != null && json.size() > 0) { MatchedBuildingDto dto = CommonDtoUtils.transformV(MatchedBuildingDto.class, json); property = districtService.findByNameAndAlias(dto.getCity(), dto.getDistrict(), dto.getName(), cat); if (null == property) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "小区数据不存在")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "灏忓尯鏁版嵁涓嶅瓨鍦�")); return mav; } DistrictFacilitys facilitys = districtFacilitysService.findByDistrict(property); mav.setModel(BasicModel.buildOKModel().setResult(facilitys)); } else { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "小区数据不存在")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "灏忓尯鏁版嵁涓嶅瓨鍦�")); } } return mav; @@ -1336,7 +1336,7 @@ public class DistrictController { /** - * 新版token验证 + * 鏂扮増token楠岃瘉 * * @param token * @return @@ -1346,7 +1346,7 @@ public class DistrictController { if (tokenMap == null) { return null; } - // token验证后,拿取出的字段再去数据库验证一遍 + // token楠岃瘉鍚庯紝鎷垮彇鍑虹殑瀛楁鍐嶅幓鏁版嵁搴撻獙璇佷竴閬� if (StringUtils.isNotBlank(tokenMap.get("userid")) && !"null".equals(tokenMap.get("userid"))) { List params = new ArrayList(); params.add(new QueryParam("ID", tokenMap.get("userid"))); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/DistrictMSGController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/DistrictMSGController.java index 07ad5165e..7be26c8a3 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/DistrictMSGController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/DistrictMSGController.java @@ -32,11 +32,11 @@ public class DistrictMSGController { mav.setViewType("rest"); if (uid == null || "".equals(uid.trim())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "用户id缺失!")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鐢ㄦ埛id缂哄け锛�")); return mav; } if (city == null || "".equals(city.trim())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "城市名缺失!")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鍩庡競鍚嶇己澶憋紒")); return mav; } if (region != null) { @@ -46,7 +46,7 @@ public class DistrictMSGController { name = name.trim(); } if (msg == null || "".equals(msg.trim())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "留言缺失!")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鐣欒█缂哄け锛�")); return mav; } districtMSGService.saveMSG(uid.trim(), city.trim(), region, name, msg.trim()); @@ -62,7 +62,7 @@ public class DistrictMSGController { if (city == null || "".equals(city.trim())) { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "城市名缺失!")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鍩庡競鍚嶇己澶憋紒")); return mav; } if (region != null) { @@ -86,7 +86,7 @@ public class DistrictMSGController { if (msgList == null || msgList.size() == 0) { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "小区留言不存在!")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "灏忓尯鐣欒█涓嶅瓨鍦紒")); return mav; } Map ret = new HashMap(); @@ -123,7 +123,7 @@ public class DistrictMSGController { if (uid == null || "".equals(uid.trim())) { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "用户id缺失!")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鐢ㄦ埛id缂哄け锛�")); return mav; } @@ -141,7 +141,7 @@ public class DistrictMSGController { if (msgList == null || msgList.size() == 0) { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "用户留言不存在!")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "鐢ㄦ埛鐣欒█涓嶅瓨鍦紒")); return mav; } Map userInfo = userInfoService.user(uid.trim()); @@ -172,15 +172,15 @@ public class DistrictMSGController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (uid == null || "".equals(uid.trim())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "用户id缺失!")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鐢ㄦ埛id缂哄け锛�")); return mav; } if (id == null || "".equals(id.trim())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "留言id缺失!")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鐣欒█id缂哄け锛�")); return mav; } if (!districtMSGService.checkUid(id.trim(), uid.trim())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.AUTH_FAILD, "你不是该留言的所有者,无权删除该留言!")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.AUTH_FAILD, "浣犱笉鏄鐣欒█鐨勬墍鏈夎�咃紝鏃犳潈鍒犻櫎璇ョ暀瑷�锛�")); return mav; } districtMSGService.delete(id.trim()); @@ -193,15 +193,15 @@ public class DistrictMSGController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (uid == null || "".equals(uid.trim())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "用户id缺失!")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鐢ㄦ埛id缂哄け锛�")); return mav; } if (msgId == null || "".equals(msgId.trim())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "留言id缺失!")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鐣欒█id缂哄け锛�")); return mav; } if (msg == null || "".equals(msg.trim())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "留言回复缺失!")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鐣欒█鍥炲缂哄け锛�")); return mav; } if (pid != null) { @@ -220,7 +220,7 @@ public class DistrictMSGController { if (msgId == null || "".equals(msgId.trim())) { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "留言id缺失!")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鐣欒█id缂哄け锛�")); return mav; } @@ -238,7 +238,7 @@ public class DistrictMSGController { if (msgList == null || msgList.size() == 0) { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "留言回复不存在!")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "鐣欒█鍥炲涓嶅瓨鍦紒")); return mav; } Map ret = new HashMap(); @@ -272,15 +272,15 @@ public class DistrictMSGController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (uid == null || "".equals(uid.trim())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "用户id缺失!")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鐢ㄦ埛id缂哄け锛�")); return mav; } if (id == null || "".equals(id.trim())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "留言回复id缺失!")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鐣欒█鍥炲id缂哄け锛�")); return mav; } if (!districtMSGService.checkReplyUid(id.trim(), uid.trim())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.AUTH_FAILD, "你不是该回复的所有者,无权删除该回复!")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.AUTH_FAILD, "浣犱笉鏄鍥炲鐨勬墍鏈夎�咃紝鏃犳潈鍒犻櫎璇ュ洖澶嶏紒")); return mav; } districtMSGService.deleteReply(id.trim()); @@ -292,7 +292,7 @@ public class DistrictMSGController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (uid == null || "".equals(uid.trim())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "用户id缺失!")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鐢ㄦ埛id缂哄け锛�")); return mav; } districtMSGService.deleteByUid(uid.trim()); @@ -306,19 +306,19 @@ public class DistrictMSGController { mav.setViewType("rest"); if (uid == null || "".equals(uid.trim())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "用户id缺失!")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鐢ㄦ埛id缂哄け锛�")); return mav; } if (city == null || "".equals(city.trim())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "城市名缺失!")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鍩庡競鍚嶇己澶憋紒")); return mav; } if (region == null || "".equals(region.trim())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "区域名缺失!")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鍖哄煙鍚嶇己澶憋紒")); return mav; } if (name == null || "".equals(name.trim())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "小区名缺失!")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "灏忓尯鍚嶇己澶憋紒")); return mav; } districtMSGService.sign(uid.trim(), city.trim(), region.trim(), name.trim()); @@ -331,19 +331,19 @@ public class DistrictMSGController { if (city == null || "".equals(city.trim())) { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "城市名缺失!")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鍩庡競鍚嶇己澶憋紒")); return mav; } if (region == null || "".equals(region.trim())) { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "区域名缺失!")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鍖哄煙鍚嶇己澶憋紒")); return mav; } if (name == null || "".equals(name.trim())) { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "小区名缺失!")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "灏忓尯鍚嶇己澶憋紒")); return mav; } @@ -361,7 +361,7 @@ public class DistrictMSGController { if (signList == null || signList.size() == 0) { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "小区签到不存在!")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "灏忓尯绛惧埌涓嶅瓨鍦紒")); return mav; } Map ret = new HashMap(); @@ -396,7 +396,7 @@ public class DistrictMSGController { if (uid == null || "".equals(uid.trim())) { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "用户id缺失!")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鐢ㄦ埛id缂哄け锛�")); return mav; } @@ -414,7 +414,7 @@ public class DistrictMSGController { if (signList == null || signList.size() == 0) { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "用户签到不存在!")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "鐢ㄦ埛绛惧埌涓嶅瓨鍦紒")); return mav; } Map userInfo = userInfoService.user(uid.trim()); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/EvaluationController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/EvaluationController.java index 7ed1a83f4..90c963447 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/EvaluationController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/EvaluationController.java @@ -64,26 +64,26 @@ import com.fangjia.service.sql.UserService; import com.fangjia.service.web.AddressService; /** - * 估价Controller + * 浼颁环Controller * * @author liupei */ @Authority(role = Role.NONE) public class EvaluationController { /** - * 估价Service + * 浼颁环Service */ private EvaluationService evaluationService; /** - * 小区Service + * 灏忓尯Service */ private DistrictService districtService; private HouseService houseService; /** - * 知识库Service + * 鐭ヨ瘑搴揝ervice */ private KnowbaseService knowbaseService; @@ -103,17 +103,17 @@ public class EvaluationController { mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity())) { - mav.setModel(BasicModel.buildBadRequestModel("city(城市)不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("city(鍩庡競)涓嶈兘涓虹┖")); return mav; } if (model.getLat() == null || model.getLng() == null) { - mav.setModel(BasicModel.buildBadRequestModel("lat,lng(经纬度)不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("lat,lng(缁忕含搴�)涓嶈兘涓虹┖")); return mav; } AddrEvaResult addrEvaResult = addressService.evaluationByLatLng(model.getCity(), model.getLng(), model.getLat(), model.getLngLatType(), model.getRadius(), model.getEstateType(), model.getBuildDate()); if (addrEvaResult == null) { - mav.setModel(BasicModel.buildBadRequestModel("无法进行估价")); + mav.setModel(BasicModel.buildBadRequestModel("鏃犳硶杩涜浼颁环")); return mav; } @@ -127,7 +127,7 @@ public class EvaluationController { /** - * 根据地址进行估价 + * 鏍规嵁鍦板潃杩涜浼颁环 * * @param model * @return @@ -138,21 +138,21 @@ public class EvaluationController { mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity())) { - mav.setModel(BasicModel.buildBadRequestModel("city(城市)不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("city(鍩庡競)涓嶈兘涓虹┖")); return mav; } if (StringUtils.isBlank(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("address(地址)不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("address(鍦板潃)涓嶈兘涓虹┖")); return mav; } if (0 >= model.getSize()) { - mav.setModel(BasicModel.buildBadRequestModel("size(面积)不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("size(闈㈢Н)涓嶈兘涓虹┖")); return mav; } AddrEvaResult addrEvaResult = addressService.evaluationByAddress(model.getCity(), model.getAddress(), model.getSize(), AK); if (addrEvaResult == null) { - mav.setModel(BasicModel.buildBadRequestModel("无法进行估价")); + mav.setModel(BasicModel.buildBadRequestModel("鏃犳硶杩涜浼颁环")); return mav; } @@ -173,19 +173,19 @@ public class EvaluationController { mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity())) { - mav.setModel(BasicModel.buildBadRequestModel("city(城市)不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("city(鍩庡競)涓嶈兘涓虹┖")); return mav; } if (StringUtils.isBlank(model.getDistrict())) { - mav.setModel(BasicModel.buildBadRequestModel("district(区域)不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("district(鍖哄煙)涓嶈兘涓虹┖")); return mav; } if (StringUtils.isBlank(model.getName())) { - mav.setModel(BasicModel.buildBadRequestModel("name(小区名)不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("name(灏忓尯鍚�)涓嶈兘涓虹┖")); return mav; } if (0 >= model.getSize()) { - mav.setModel(BasicModel.buildBadRequestModel("size(面积)不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("size(闈㈢Н)涓嶈兘涓虹┖")); return mav; } @@ -241,12 +241,12 @@ public class EvaluationController { mav.setModel(BasicModel.buildOKModel().setResult(resultMap)); }else { - mav.setModel(BasicModel.buildBadRequestModel("无法进行估价")); + mav.setModel(BasicModel.buildBadRequestModel("鏃犳硶杩涜浼颁环")); } return mav; } /** - * 根据样本估价 + * 鏍规嵁鏍锋湰浼颁环 * * @param model * @return @@ -257,19 +257,19 @@ public class EvaluationController { mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity())) { - mav.setModel(BasicModel.buildBadRequestModel("city(城市)不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("city(鍩庡競)涓嶈兘涓虹┖")); return mav; } if (StringUtils.isBlank(model.getDistrict())) { - mav.setModel(BasicModel.buildBadRequestModel("district(区域)不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("district(鍖哄煙)涓嶈兘涓虹┖")); return mav; } if (StringUtils.isBlank(model.getName())) { - mav.setModel(BasicModel.buildBadRequestModel("name(小区名)不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("name(灏忓尯鍚�)涓嶈兘涓虹┖")); return mav; } if (0 >= model.getSize()) { - mav.setModel(BasicModel.buildBadRequestModel("size(面积)不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("size(闈㈢Н)涓嶈兘涓虹┖")); return mav; } @@ -287,7 +287,7 @@ public class EvaluationController { List similarHouses = houseService.findMostSimilarHouse(similar, 20, model.isMatchAddr()); if (similarHouses == null || similarHouses.size() == 0) { - mav.setModel(BasicModel.buildBadRequestModel("无法进行估价")); + mav.setModel(BasicModel.buildBadRequestModel("鏃犳硶杩涜浼颁环")); return mav; } @@ -310,7 +310,7 @@ public class EvaluationController { } /** - * 数量得分(最高得分0.1) + * 鏁伴噺寰楀垎(鏈�楂樺緱鍒�0.1) * * @param points * @return @@ -319,14 +319,14 @@ public class EvaluationController { if (points.size() == 0) { return 0; } - // 每10个样本=0.01 + // 姣�10涓牱鏈�=0.01 double c1 = (double) points.size() / 10.0 / 100.0; c1 = (c1 > 0.1 ? 0.1 : c1); return c1; } /** - * 质量得分(最高得分0.1) + * 璐ㄩ噺寰楀垎(鏈�楂樺緱鍒�0.1) * * @param points * @return @@ -342,21 +342,21 @@ public class EvaluationController { for (HouseScorer p : points) { Date d = p.getHouse().getPublishDate(); long diff = calcDate.getTime() - d.getTime(); - if (diff <= 30 * 24 * 3600 * 1000) {// 一个月内 + if (diff <= 30 * 24 * 3600 * 1000) {// 涓�涓湀鍐� c2 = c2 + perc * 1.00d; - } else if (diff <= 60 * 24 * 3600 * 1000) {// 两个月内 + } else if (diff <= 60 * 24 * 3600 * 1000) {// 涓や釜鏈堝唴 c2 = c2 + perc * 0.90d; - } else if (diff <= 90 * 24 * 3600 * 1000) {// 三个月内 + } else if (diff <= 90 * 24 * 3600 * 1000) {// 涓変釜鏈堝唴 c2 = c2 + perc * 0.85d; - } else if (diff <= 180 * 24 * 3600 * 1000) {// 半年内 + } else if (diff <= 180 * 24 * 3600 * 1000) {// 鍗婂勾鍐� c2 = c2 + perc * 0.80d; - } else if (diff <= 365 * 24 * 3600 * 1000) {// 一年内 + } else if (diff <= 365 * 24 * 3600 * 1000) {// 涓�骞村唴 c2 = c2 + perc * 0.70d; - } else if (diff <= 540 * 24 * 3600 * 1000) {// 一年半内 + } else if (diff <= 540 * 24 * 3600 * 1000) {// 涓�骞村崐鍐� c2 = c2 + perc * 0.60d; - } else if (diff <= 720 * 24 * 3600 * 1000) {// 两年内 + } else if (diff <= 720 * 24 * 3600 * 1000) {// 涓ゅ勾鍐� c2 = c2 + perc * 0.40d; - } else {// 超过两年 + } else {// 瓒呰繃涓ゅ勾 c2 = c2 + perc * 0.10d; } } @@ -415,12 +415,12 @@ public class EvaluationController { List> result = new ArrayList>(); mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getDistrictName()) || model.getArea() <= 0) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "城市名,小区名,面积为必填项")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鍩庡競鍚�,灏忓尯鍚�,闈㈢Н涓哄繀濉」")); return mav; } if(model.getBasementArea() > 0 && (Math.abs(model.getBasementArea() - model.getArea()) / model.getArea()) > 2){ - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "地下室面积过大")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鍦颁笅瀹ら潰绉繃澶�")); return mav; } @@ -430,7 +430,7 @@ public class EvaluationController { results = businessEstateService .findShops(new DistrictKey(model.getCity(), model.getRegion(), model.getDistrictName())); if (null == results) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "商铺不存在,请检查参数")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "鍟嗛摵涓嶅瓨鍦�,璇锋鏌ュ弬鏁�")); return mav; } @@ -438,7 +438,7 @@ public class EvaluationController { results = businessEstateService.findOffices(new DistrictKey(model.getCity(), model.getRegion(), model .getDistrictName())); if (null == results) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "写字楼不存在,请检查参数")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "鍐欏瓧妤间笉瀛樺湪,璇锋鏌ュ弬鏁�")); return mav; } @@ -446,7 +446,7 @@ public class EvaluationController { results = districtService.findNewDistricts(new DistrictKey(model.getCity(), model.getRegion(), model .getDistrictName())); if (null == results || results.size() == 0) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "小区不存在,请检查参数")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "灏忓尯涓嶅瓨鍦�,璇锋鏌ュ弬鏁�")); return mav; } else { model.setNewDistrict(true); @@ -458,7 +458,7 @@ public class EvaluationController { results = districtService.findNewDistricts(new DistrictKey(model.getCity(), model.getRegion(), model .getDistrictName())); if (null == results || results.size() == 0) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "小区不存在,请检查参数")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "灏忓尯涓嶅瓨鍦�,璇锋鏌ュ弬鏁�")); return mav; } else { model.setNewDistrict(true); @@ -493,7 +493,7 @@ public class EvaluationController { districtPriceMap.put("city", district.getCity()); districtPriceMap.put("region", district.getRegion()); districtPriceMap.put("districtName", district.getName()); - // if ("成都".equals(evaluation.getCity())) { + // if ("鎴愰兘".equals(evaluation.getCity())) { // districtPriceMap.put("totalPrice", (int) // (evaluation.getTotalPrice() * 0.9)); // } else { @@ -521,12 +521,12 @@ public class EvaluationController { if (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getDistrictName()) || model.getArea() <= 0 || StringUtils.isBlank(model.getHouseNumber()) || StringUtils.isBlank(model.getRoomNumber())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "城市名,小区名,房号,室号,面积为必填项")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鍩庡競鍚�,灏忓尯鍚�,鎴垮彿,瀹ゅ彿,闈㈢Н涓哄繀濉」")); return mav; } - if (!"上海".equals(model.getCity()) && !"北京".equals(model.getCity())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "不支持的城市")); + if (!"涓婃捣".equals(model.getCity()) && !"鍖椾含".equals(model.getCity())) { + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "涓嶆敮鎸佺殑鍩庡競")); return mav; } @@ -537,7 +537,7 @@ public class EvaluationController { results = districtService.findNewDistricts(new DistrictKey(model.getCity(), model.getRegion(), model .getDistrictName())); if (CollectionUtils.isEmpty(results)) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "小区不存在,请检查参数")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "灏忓尯涓嶅瓨鍦�,璇锋鏌ュ弬鏁�")); return mav; } else { model.setNewDistrict(true); @@ -560,7 +560,7 @@ public class EvaluationController { districtPriceMap.put("city", district.getCity()); districtPriceMap.put("region", district.getRegion()); districtPriceMap.put("districtName", district.getName()); - if ("成都".equals(evaluation.getCity())) { + if ("鎴愰兘".equals(evaluation.getCity())) { districtPriceMap.put("totalPrice", (int) (evaluation.getTotalPrice() * 0.9)); } else { districtPriceMap.put("totalPrice", evaluation.getTotalPrice()); @@ -571,7 +571,7 @@ public class EvaluationController { } if (null == evaluation || evaluation.getTotalPrice() == null || evaluation.getTotalPrice() <= 0) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "该小区暂不能估价")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "璇ュ皬鍖烘殏涓嶈兘浼颁环")); return mav; } @@ -627,7 +627,7 @@ public class EvaluationController { } /** - * 新版token验证 + * 鏂扮増token楠岃瘉 * * @param token * @return @@ -637,7 +637,7 @@ public class EvaluationController { if (tokenMap == null) { return null; } - // token验证后,拿取出的字段再去数据库验证一遍 + // token楠岃瘉鍚庯紝鎷垮彇鍑虹殑瀛楁鍐嶅幓鏁版嵁搴撻獙璇佷竴閬� if (StringUtils.isNotBlank(tokenMap.get("userid")) && !"null".equals(tokenMap.get("userid"))) { List params = new ArrayList(); params.add(new QueryParam("ID", tokenMap.get("userid"))); @@ -652,7 +652,7 @@ public class EvaluationController { } /** - * 估价Action + * 浼颁环Action * * @param model * @return @@ -662,7 +662,7 @@ public class EvaluationController { mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getRegion()) || StringUtils.isBlank(model.getDistrictName()) || 0 == model.getArea()) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "城市名,区域,小区名,面积为必填项")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鍩庡競鍚�,鍖哄煙,灏忓尯鍚�,闈㈢Н涓哄繀濉」")); return mav; } @@ -671,7 +671,7 @@ public class EvaluationController { District district = businessEstateService.findShop(new DistrictKey(model.getCity(), model.getRegion(), model .getDistrictName())); if (null == district) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "商铺不存在,请检查参数")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "鍟嗛摵涓嶅瓨鍦�,璇锋鏌ュ弬鏁�")); return mav; } @@ -680,7 +680,7 @@ public class EvaluationController { District district = businessEstateService.findOffice(new DistrictKey(model.getCity(), model.getRegion(), model .getDistrictName())); if (null == district) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "写字楼不存在,请检查参数")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "鍐欏瓧妤间笉瀛樺湪,璇锋鏌ュ弬鏁�")); return mav; } @@ -690,7 +690,7 @@ public class EvaluationController { District district = districtService.findNewDistrict(new DistrictKey(model.getCity(), model.getRegion(), model .getDistrictName())); if (null == district) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "小区不存在,请检查参数")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "灏忓尯涓嶅瓨鍦�,璇锋鏌ュ弬鏁�")); return mav; } else { model.setNewDistrict(true); @@ -704,7 +704,7 @@ public class EvaluationController { district = districtService.findNewDistrict(new DistrictKey(model.getCity(), model.getRegion(), model .getDistrictName())); if (null == district) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "小区不存在,请检查参数")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "灏忓尯涓嶅瓨鍦�,璇锋鏌ュ弬鏁�")); return mav; } else { model.setNewDistrict(true); @@ -715,11 +715,11 @@ public class EvaluationController { evaluation = evaluationService.saveEvaluation(buildEvaluation(model)); } if (null == evaluation || evaluation.getTotalPrice() == null || 0 == evaluation.getTotalPrice()) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "该小区暂无均价,不能估价")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "璇ュ皬鍖烘殏鏃犲潎浠�,涓嶈兘浼颁环")); return mav; } Map map = new HashMap(1); - if ("成都".equals(evaluation.getCity())) { + if ("鎴愰兘".equals(evaluation.getCity())) { map.put("totalPrice", (int) (evaluation.getTotalPrice() * 0.9)); } else { map.put("totalPrice", evaluation.getTotalPrice()); @@ -729,7 +729,7 @@ public class EvaluationController { } /** - * 通过EvaluationModel组装Evaluation实体 + * 閫氳繃EvaluationModel缁勮Evaluation瀹炰綋 * * @param model * @return @@ -882,13 +882,13 @@ public class EvaluationController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(address)) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "房源地址为必填项")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鎴挎簮鍦板潃涓哄繀濉」")); return mav; } - // 解析出城市区域小区名楼栋号 + // 瑙f瀽鍑哄煄甯傚尯鍩熷皬鍖哄悕妤兼爧鍙� String[] keywords = knowbaseService.parseKeywords(address); if (keywords.length < 3) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_INVALID, "房源地址无效")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_INVALID, "鎴挎簮鍦板潃鏃犳晥")); return mav; } city = knowbaseService.matchingCityDefaultNull(city); @@ -929,14 +929,14 @@ public class EvaluationController { } if (null == currentDistrict) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "未找到相关小区信息")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "鏈壘鍒扮浉鍏冲皬鍖轰俊鎭�")); return mav; } - // 根据室号获取面积 + // 鏍规嵁瀹ゅ彿鑾峰彇闈㈢Н Evaluation evaluation = null; if (area < 10) { - // 获取 + // 鑾峰彇 evaluation = evaluationService.findEvaluationByNum(city, name, houseNum, roomNum); if (null != evaluation) { evaluation.setRegion(region); @@ -944,7 +944,7 @@ public class EvaluationController { } else { evaluation = new Evaluation(); if (null == city) { - city = "上海"; + city = "涓婃捣"; } evaluation.setCity(city); evaluation.setRegion(region); @@ -954,12 +954,12 @@ public class EvaluationController { evaluation.setArea(area); } if (null == evaluation) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "暂无该房源的相关面积信息,不能估价")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "鏆傛棤璇ユ埧婧愮殑鐩稿叧闈㈢Н淇℃伅,涓嶈兘浼颁环")); return mav; } evaluation = evaluationService.saveEvaluation(evaluation); if (null == evaluation || evaluation.getTotalPrice() == null || 0 == evaluation.getTotalPrice()) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "该小区暂无均价,不能估价")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "璇ュ皬鍖烘殏鏃犲潎浠�,涓嶈兘浼颁环")); return mav; } Map map = new HashMap(1); @@ -973,25 +973,25 @@ public class EvaluationController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (null == city) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "城市为必填项")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鍩庡競涓哄繀濉」")); return mav; } if (null == name) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "小区为必填项")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "灏忓尯涓哄繀濉」")); return mav; } if (null == houseNum) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "楼栋号为必填项")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "妤兼爧鍙蜂负蹇呭~椤�")); return mav; } if (null == roomNum) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "室号为必填项")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "瀹ゅ彿涓哄繀濉」")); return mav; } Evaluation evaluation = evaluationService.findEvaluationByNum(city, name, houseNum, roomNum); if (null == evaluation) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "该房屋暂无估价记录")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "璇ユ埧灞嬫殏鏃犱及浠疯褰�")); return mav; } Map map = new HashMap(); @@ -1012,14 +1012,14 @@ public class EvaluationController { mv.setViewType("rest"); if (StringUtils.isBlank(model.getId())) { - mv.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "楼盘编号不能为空")); + mv.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "妤肩洏缂栧彿涓嶈兘涓虹┖")); return mv; } District district = districtService.findDistrictById(model.getId()); DistrictKey districtKey = new DistrictKey(district.getCity(), district.getRegion(), district.getName()); if(district == null){ - mv.setModel(BasicModel.buildBadRequestModel("该小区不存在")); + mv.setModel(BasicModel.buildBadRequestModel("璇ュ皬鍖轰笉瀛樺湪")); return mv; } DistrictStatBo bo = districtStatService.findCurrentDistrictStat(districtKey); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/FangjiaApiController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/FangjiaApiController.java index db6d46c49..7b0701f9b 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/FangjiaApiController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/FangjiaApiController.java @@ -38,7 +38,7 @@ public class FangjiaApiController { private DistrictHouseService districtHouseService; /** - * 区和城市列表js + * 鍖哄拰鍩庡競鍒楄〃js * * @param model * @return @@ -48,7 +48,7 @@ public class FangjiaApiController { } /** - * 搜索api对外开放js + * 鎼滅储api瀵瑰寮�鏀緅s * * @param model * @return @@ -58,7 +58,7 @@ public class FangjiaApiController { } /** - * 搜索api实现 + * 鎼滅储api瀹炵幇 * * @param model * @return @@ -68,7 +68,7 @@ public class FangjiaApiController { } /** - * 估价api对外开放js + * 浼颁环api瀵瑰寮�鏀緅s * * @param model * @return @@ -78,7 +78,7 @@ public class FangjiaApiController { } /** - * 估价api实现 + * 浼颁环api瀹炵幇 * * @param model * @return @@ -88,7 +88,7 @@ public class FangjiaApiController { } /** - * 走势图api对外放js + * 璧板娍鍥綼pi瀵瑰鏀緅s * * @param model * @return @@ -98,7 +98,7 @@ public class FangjiaApiController { } /** - * 走势图api真正实现 + * 璧板娍鍥綼pi鐪熸瀹炵幇 * * @param model * @return @@ -108,7 +108,7 @@ public class FangjiaApiController { } /** - * 走势图api所用jsonp访问数据 + * 璧板娍鍥綼pi鎵�鐢╦sonp璁块棶鏁版嵁 * * @param model * @return @@ -125,7 +125,7 @@ public class FangjiaApiController { if (StringUtils.isNotBlank(cityName)) { cityName = this.knowbaseService.matchingCity(cityName); region = this.knowbaseService.matchingRegion(model.getRegion(), cityName); - // 取出wwwUrl + // 鍙栧嚭wwwUrl ServerArea city = ServerAreaData.getServerAreaByDisplayDefaultNull(cityName); if (null != city) { cityName = city.getDisplay(); @@ -136,7 +136,7 @@ public class FangjiaApiController { } String moreLink = wwwUrl; if (StringUtils.isNotBlank(cityName) && StringUtils.isNotBlank(region) && StringUtils.isNotBlank(districtName)) { - // 小区均价 + // 灏忓尯鍧囦环 DistrictStatBo districtStatBo = this.districtStatService.findDistrictStat(new DistrictKey(cityName, region, districtName)); if (null != districtStatBo) { @@ -154,7 +154,7 @@ public class FangjiaApiController { trendType = "districtTrend"; } } else if (StringUtils.isNotBlank(cityName) && StringUtils.isNotBlank(region)) { - // 区域均价 + // 鍖哄煙鍧囦环 RegionStat regionStat = this.regionStatService.findRegionStat(cityName, region); if (null != regionStat) { obj = new JSONObject(regionStat); @@ -169,7 +169,7 @@ public class FangjiaApiController { } } } else if (StringUtils.isNotBlank(cityName)) { - // 城市均价 + // 鍩庡競鍧囦环 RegionStat cityStat = this.regionStatService.findRegionStat(cityName, null); if (null != cityStat) { obj = new JSONObject(cityStat); @@ -190,7 +190,7 @@ public class FangjiaApiController { } /** - * 房源小工具iframe + * 鎴挎簮灏忓伐鍏穒frame * * @param model * @return @@ -200,7 +200,7 @@ public class FangjiaApiController { } /** - * 小区信息外放js Action + * 灏忓尯淇℃伅澶栨斁js Action * * @param model * @return @@ -210,7 +210,7 @@ public class FangjiaApiController { } /** - * 小区信息实现Action + * 灏忓尯淇℃伅瀹炵幇Action * * @param model * @return diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/FilesController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/FilesController.java index 885fc5381..6b8b073dd 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/FilesController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/FilesController.java @@ -30,13 +30,13 @@ public class FilesController { RestfulModelAndView mav = new RestfulModelAndView(); MultipartFile file = model.getFile(); if(file == null || file.getSize() == 0l){ - mav.setModel(BasicModel.buildBadRequestModel("请选择要上传的文件")); + mav.setModel(BasicModel.buildBadRequestModel("璇烽�夋嫨瑕佷笂浼犵殑鏂囦欢")); return mav; } try { String id = new ObjectId().toString(); if(file.getBytes().length > MAX_FILE_BYTES_SIZE){ - mav.setModel(BasicModel.buildBadRequestModel("文件大小不能超过16M")); + mav.setModel(BasicModel.buildBadRequestModel("鏂囦欢澶у皬涓嶈兘瓒呰繃16M")); return mav; } fileDao.save(id,"upload","o", file.getBytes(), file.getContentType()); @@ -50,7 +50,7 @@ public class FilesController { mav.setModel(BasicModel.buildOKModel().setResult(dto)); } catch (IOException e) { e.printStackTrace(); - mav.setModel(BasicModel.buildServerErrorModel().setMsg("文件上传失败!")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("鏂囦欢涓婁紶澶辫触锛�")); } return mav; } @@ -59,7 +59,7 @@ public class FilesController { RestfulModelAndView mav = new RestfulModelAndView(); MultipartFile file = model.getFile(); if(file == null || file.getSize() == 0l){ - mav.setModel(BasicModel.buildBadRequestModel("请选择要上传的文件")); + mav.setModel(BasicModel.buildBadRequestModel("璇烽�夋嫨瑕佷笂浼犵殑鏂囦欢")); return mav; } try { @@ -85,7 +85,7 @@ public class FilesController { mav.setModel(BasicModel.buildOKModel().setResult(dto)); } catch (IOException e) { e.printStackTrace(); - mav.setModel(BasicModel.buildServerErrorModel().setMsg("文件上传失败!")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("鏂囦欢涓婁紶澶辫触锛�")); } return mav; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/FormatterController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/FormatterController.java index 5773bbf19..5019e6473 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/FormatterController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/FormatterController.java @@ -15,16 +15,16 @@ public class FormatterController { String orgCity = city; String orgRegion = region; if(StringUtils.isBlank(orgCity)){ - mav.setModel(BasicModel.buildBadRequestModel("city不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("city涓嶈兘涓虹┖")); return mav; } if(StringUtils.isBlank(orgRegion)){ - mav.setModel(BasicModel.buildBadRequestModel("region不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("region涓嶈兘涓虹┖")); return mav; } city = RegionData.formatCity(city); if(!RegionData.isCity(city)){ - mav.setModel(BasicModel.buildBadRequestModel("city非法")); + mav.setModel(BasicModel.buildBadRequestModel("city闈炴硶")); return mav; } region = RegionData.formatRegion(city, region); @@ -40,7 +40,7 @@ public class FormatterController { mav.setModel(BasicModel.buildOKModel().setResult(dto)); return mav; }else{ - mav.setModel(BasicModel.buildBadRequestModel("region非法")); + mav.setModel(BasicModel.buildBadRequestModel("region闈炴硶")); return mav; } } @@ -49,7 +49,7 @@ public class FormatterController { RestfulModelAndView mav = new RestfulModelAndView(); String orgCity = city; if(StringUtils.isBlank(orgCity)){ - mav.setModel(BasicModel.buildBadRequestModel("city不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("city涓嶈兘涓虹┖")); return mav; } city = RegionData.formatCity(city); @@ -57,7 +57,7 @@ public class FormatterController { city = RegionData.parseCityInAddress(orgCity); } if(!RegionData.isCity(city)){ - mav.setModel(BasicModel.buildBadRequestModel("city非法")); + mav.setModel(BasicModel.buildBadRequestModel("city闈炴硶")); return mav; } UniversalDto dto = UniversalDto.newDto(); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/FshController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/FshController.java index c8b8b64ad..c1e15012a 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/FshController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/FshController.java @@ -126,88 +126,88 @@ public class FshController { private YdDealPriceService ydDealPriceService; private static final Map PROPERTY_TYPES = new HashMap() { { - put(null, "普通住宅"); - put("0", "普通住宅"); - put("1", "别墅"); - put("2", "商住"); + put(null, "鏅�氫綇瀹�"); + put("0", "鏅�氫綇瀹�"); + put("1", "鍒"); + put("2", "鍟嗕綇"); } }; private static final Map DIRECTION = new HashMap() { { - put(null, "南"); - put("1", "西南"); - put("2", "东南"); - put("3", "南"); - put("4", "西北"); - put("5", "东北"); - put("6", "东"); - put("7", "西"); - put("8", "北"); - put("9", "东西"); - put("10", "南北"); + put(null, "鍗�"); + put("1", "瑗垮崡"); + put("2", "涓滃崡"); + put("3", "鍗�"); + put("4", "瑗垮寳"); + put("5", "涓滃寳"); + put("6", "涓�"); + put("7", "瑗�"); + put("8", "鍖�"); + put("9", "涓滆タ"); + put("10", "鍗楀寳"); } }; private static final Map FITMENT = new HashMap() { { - put(null, "简装"); - put("1", "毛坯"); - put("2", "简装"); - put("3", "精装"); - put("4", "豪装"); + put(null, "绠�瑁�"); + put("1", "姣涘澂"); + put("2", "绠�瑁�"); + put("3", "绮捐"); + put("4", "璞"); } }; private static final Map EVALUATION_MODEL_FITMENT = new HashMap(){ { - put(null, "简单装修"); - put("简装", "简单装修"); - put("毛坯", "毛坯"); - put("精装", "精装修"); - put("豪装", "豪华装修"); + put(null, "绠�鍗曡淇�"); + put("绠�瑁�", "绠�鍗曡淇�"); + put("姣涘澂", "姣涘澂"); + put("绮捐", "绮捐淇�"); + put("璞", "璞崕瑁呬慨"); } }; private static final Map SIGHT = new HashMap() { { - put(null, "一般"); - put("1", "景观房"); - put("2", "侧景观房"); - put("3", "一般"); - put("4", "差"); + put(null, "涓�鑸�"); + put("1", "鏅鎴�"); + put("2", "渚ф櫙瑙傛埧"); + put("3", "涓�鑸�"); + put("4", "宸�"); } }; private static final Map NOISE = new HashMap() { { - put(null, "无噪音"); - put("0", "无噪音"); - put("1", "噪音较小"); - put("2", "噪音大"); + put(null, "鏃犲櫔闊�"); + put("0", "鏃犲櫔闊�"); + put("1", "鍣煶杈冨皬"); + put("2", "鍣煶澶�"); } }; private static final Map FACILITIES = new HashMap() { { - put("0", "健身房"); - put("1", "游泳池"); - put("2", "会所"); - put("3", "网球场"); - put("4", "球场"); - put("5", "棋牌室"); - put("6", "停车场"); - put("7", "图书馆"); - put("8", "活动中心"); + put("0", "鍋ヨ韩鎴�"); + put("1", "娓告吵姹�"); + put("2", "浼氭墍"); + put("3", "缃戠悆鍦�"); + put("4", "鐞冨満"); + put("5", "妫嬬墝瀹�"); + put("6", "鍋滆溅鍦�"); + put("7", "鍥句功棣�"); + put("8", "娲诲姩涓績"); } }; private static final Map NEGATIVE_FACTOR = new HashMap() { { - put(null, "无"); - put("1", "很近"); - put("2", "较近"); - put("3", "无"); + put(null, "鏃�"); + put("1", "寰堣繎"); + put("2", "杈冭繎"); + put("3", "鏃�"); } }; @@ -302,7 +302,7 @@ public class FshController { this.ydDealPriceService = ydDealPriceService; } /** - * 评估小区 + * 璇勪及灏忓尯 * @param model * @param request * @return @@ -312,11 +312,11 @@ public class FshController { mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getName()) || StringUtils.isBlank(model.getDistrict()) || model.getSize() <= 0) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:城市,区域,小区名,面积(size)为必填项")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:鍩庡競,鍖哄煙,灏忓尯鍚�,闈㈢Н(size)涓哄繀濉」")); return mav; } - if(model.getCity().endsWith("市")){ - model.setCity(model.getCity().replaceAll("市$", "")); + if(model.getCity().endsWith("甯�")){ + model.setCity(model.getCity().replaceAll("甯�$", "")); } if(StringUtils.isNotBlank(request.getParameter("calDate"))){ Date calDate = null; @@ -326,42 +326,42 @@ public class FshController { } if(calDate == null){ - mav.setModel(BasicModel.buildBadRequestModel("calDate:数据类型不合法")); + mav.setModel(BasicModel.buildBadRequestModel("calDate:鏁版嵁绫诲瀷涓嶅悎娉�")); return mav; }else{ model.setCalDate(calDate); } } - /*先到CPDB库中查找小区*/ + /*鍏堝埌CPDB搴撲腑鏌ユ壘灏忓尯*/ District district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(), "district"); if(district == null){ - mav.setModel(BasicModel.buildBadRequestModel("该小区不存在")); + mav.setModel(BasicModel.buildBadRequestModel("璇ュ皬鍖轰笉瀛樺湪")); return mav; } model.setName(district.getName()); if (model.getCarportPrice() != null && (model.getCarportPrice() < 0 || model.getCarportPrice() > 1000000)) { - mav.setModel(BasicModel.buildBadRequestModel("carportPrice(车位)取值不合法")); + mav.setModel(BasicModel.buildBadRequestModel("carportPrice(杞︿綅)鍙栧�间笉鍚堟硶")); return mav; } if(model.getMaxFloor() != null && (model.getMaxFloor() <= 0 || model.getMaxFloor() > 59)){ - mav.setModel(BasicModel.buildBadRequestModel("maxFloor取值非法,正确范围[1,60)")); + mav.setModel(BasicModel.buildBadRequestModel("maxFloor鍙栧�奸潪娉�,姝g‘鑼冨洿[1,60)")); return mav; } if(model.getFloor() != null && (model.getFloor() <= 0 || model.getFloor() > 59)){ - mav.setModel(BasicModel.buildBadRequestModel("floor取值非法,正确范围[1,60)")); + mav.setModel(BasicModel.buildBadRequestModel("floor鍙栧�奸潪娉�,姝g‘鑼冨洿[1,60)")); return mav; } if(model.getMaxFloor() != null && model.getFloor() != null && model.getFloor() > model.getMaxFloor()){ - mav.setModel(BasicModel.buildBadRequestModel("所在楼层不能大于总楼层")); + mav.setModel(BasicModel.buildBadRequestModel("鎵�鍦ㄦゼ灞備笉鑳藉ぇ浜庢�绘ゼ灞�")); return mav; } model.setRegion(district.getRegion()); model.setDistrictName(district.getName()); if (StringUtils.isBlank(model.getPropertyType())) { - if (district.getEstateType2() != null && district.getEstateType2().contains("别墅")) { + if (district.getEstateType2() != null && district.getEstateType2().contains("鍒")) { model.setPropertyType("1"); } } @@ -375,7 +375,7 @@ public class FshController { } else { model.setCalDate(DateUtil.getFirstDayOfWeek(new Date())); } - //判断是否需要取最近一次均价时间 + //鍒ゆ柇鏄惁闇�瑕佸彇鏈�杩戜竴娆″潎浠锋椂闂� if(StringUtils.isNotBlank(request.getParameter("nearestAvgPriceTime"))){ boolean flag = Boolean.parseBoolean(request.getParameter("nearestAvgPriceTime")); if(flag){ @@ -386,14 +386,14 @@ public class FshController { Double oneMonthMarkup = null; Evaluation evaluation = null; if(model.isYouDa()){ -// if("上海".equals(model.getCity())){ +// if("涓婃捣".equals(model.getCity())){ // YdDealPrice ydDealPrice = ydDealPriceService.findYdDealPrice(model.getCity(), model.getDistrict(), model.getName()); // if(ydDealPrice == null){ -// mav.setModel(BasicModel.buildOKModel().setMsg("该小区暂不支持估价").markNoData()); +// mav.setModel(BasicModel.buildOKModel().setMsg("璇ュ皬鍖烘殏涓嶆敮鎸佷及浠�").markNoData()); // return mav; // }else{ // evaluation = evaluationService.ydEvaluate(district, buildYdEvaluation(model, request), model.getCalDate(),ydDealPrice.getPrice()); -// //近30天的涨跌幅:取最近1个月至3个月之间最近的那期价格和当前均价相比 +// //杩�30澶╃殑娑ㄨ穼骞咃細鍙栨渶杩�1涓湀鑷�3涓湀涔嬮棿鏈�杩戠殑閭f湡浠锋牸鍜屽綋鍓嶅潎浠风浉姣� // Date end = DateUtil.getDateOfLastMonth(new Date(),-1); // Date start = DateUtil.getDateOfLastMonth(new Date(),-3); // List ydDealPrices = ydDealPriceService.findYdDealPrices(model.getCity(), model.getDistrict(), model.getName(),start,end); @@ -445,7 +445,7 @@ public class FshController { } if(!model.isYouFang()){ - //流动性评级 + //娴佸姩鎬ц瘎绾� EvaluationBeforeLoanDto dto = new EvaluationBeforeLoanDto(); CollateralEvaluationInfoModel collModel = new CollateralEvaluationInfoModel(); collModel.setCity(model.getCity()); @@ -458,16 +458,16 @@ public class FshController { dto.setTotalPrice((long)evaluation.getTotalPrice()); DistrictKey key = new DistrictKey(model.getCity(), model.getDistrict(), model.getName()); DistrictAnalyData districtAnalyData = districtAnalyDataService.findByDistrictKey(key); - //处置难易度 + //澶勭疆闅炬槗搴� double totalScore = buildHandleLevel(dto, collModel, districtAnalyData, district); districtPriceMap.put("totalScore", totalScore); - //城市相对最高和相对最低 + //鍩庡競鐩稿鏈�楂樺拰鐩稿鏈�浣� Map cityDistriceMinAndMaxPrice = districtStatService.getCityDistriceMinAndMaxPricePds(model.getCity()); Integer minS = cityDistriceMinAndMaxPrice.get("cityDistrictMinSellPrice"); Integer maxS = cityDistriceMinAndMaxPrice.get("cityDistrictMaxSellPrice"); districtPriceMap.put("cityDistrictMinSellPrice", minS); districtPriceMap.put("cityDistrictMaxSellPrice", maxS); - //涨跌幅在城市中排名 + //娑ㄨ穼骞呭湪鍩庡競涓帓鍚� Double increaseRate = 0d; if(districtAnalyData==null){ Double regionYoy = regionRiseAndDownNew(dto, collModel); @@ -483,7 +483,7 @@ public class FshController { } } - //没有小区年涨幅的时候用区域的代替 + //娌℃湁灏忓尯骞存定骞呯殑鏃跺�欑敤鍖哄煙鐨勪唬鏇� if (increaseRate.equals(0D)) { Double regionYoy = regionRiseAndDownNew(dto, collModel); if (regionYoy > 0) { @@ -491,9 +491,9 @@ public class FshController { } } - //还没的话就用均价相似小区的代替 + //杩樻病鐨勮瘽灏辩敤鍧囦环鐩镐技灏忓尯鐨勪唬鏇� if (increaseRate.equals(0D)) { - //小区均价的80%-120%取均价最相近的小区 + //灏忓尯鍧囦环鐨�80%-120%鍙栧潎浠锋渶鐩歌繎鐨勫皬鍖� List dataList = districtAnalyDataService.findSimilarDistrict(collModel.getCity(),collModel.getDistrict(),(int)(dto.getAvgPrice()*0.8),(int)(dto.getAvgPrice()*1.2)); orderDistrictDataList(dataList,dto.getAvgPrice()); if (dataList != null && dataList.size() > 0) { @@ -504,11 +504,11 @@ public class FshController { } } - //价格排名 + //浠锋牸鎺掑悕 districtPriceMap.put("upDownRangecityLevel", increaseRate < 0 ? 0 : increaseRate); - //价格排名 + //浠锋牸鎺掑悕 buildPriceRate(dto,collModel,districtAnalyData,districtPriceMap); - //求资产等级 + //姹傝祫浜х瓑绾� if(districtAnalyData!=null&&districtAnalyData.getCityRank()!=null&&districtAnalyData.getCityRankTotal()!=null){ Integer cityRank = districtAnalyData.getCityRank(); Integer cityRankTotal = districtAnalyData.getCityRankTotal(); @@ -521,7 +521,7 @@ public class FshController { districtPriceMap.put("id", evaluation.getId()); } DistrictKey districtKey = new DistrictKey(model.getCity(),model.getDistrict(),model.getName()); - //过去一年 + //杩囧幓涓�骞� List boList = districtStatService.findDistrictStatRangDate(districtKey,DateUtil.getThisWeekInLastYear(),null); if(boList!=null && boList.size()>0){ if(boList.get(0).getDistrictStat()==null){ @@ -531,7 +531,7 @@ public class FshController { } } - //过去一个月 + //杩囧幓涓�涓湀 List monthBoList = districtStatService.findDistrictStatRangDate(districtKey, DateUtil.getThisWeekInLastMonth(-1), null); if(monthBoList!=null && monthBoList.size()>0){ if(monthBoList.get(0).getDistrictStat()!=null){ @@ -561,13 +561,13 @@ public class FshController { return mav; } else { evaluationService.remove(evaluation.getId()); - mav.setModel(BasicModel.buildOKModel().setMsg("该小区暂不支持估价").markNoData()); + mav.setModel(BasicModel.buildOKModel().setMsg("璇ュ皬鍖烘殏涓嶆敮鎸佷及浠�").markNoData()); return mav; } } /** - * 取均价最相近的小区排序 + * 鍙栧潎浠锋渶鐩歌繎鐨勫皬鍖烘帓搴� * @param list * @param avgPrice */ @@ -584,7 +584,7 @@ public class FshController { } /** - * 均价在城市中排名比(也就是价格指数) + * 鍧囦环鍦ㄥ煄甯備腑鎺掑悕姣�(涔熷氨鏄环鏍兼寚鏁�) * @param dto * @param model */ @@ -599,7 +599,7 @@ public class FshController { rate = priceLevelRate; }else{ List list = districtStatService.findAllDistrictStats(model.getCity(),null,null,DateUtil.getFirstDayOfWeek(new Date())); - //最近一周查不到往前再推一周 + //鏈�杩戜竴鍛ㄦ煡涓嶅埌寰�鍓嶅啀鎺ㄤ竴鍛� if(list==null){ list = districtStatService.findAllDistrictStats(model.getCity(),null,null,DateUtil.getFirstDayOfWeek(DateUtil.getBeforeDay(new Date(), -7))); } @@ -631,7 +631,7 @@ public class FshController { } /** - * 查找小区标签 + * 鏌ユ壘灏忓尯鏍囩 * @param districtTagModel * @return */ @@ -639,15 +639,15 @@ public class FshController { RestfulModelAndView mav = new RestfulModelAndView(); if (StringUtils.isBlank(districtTagModel.getCity())) { - mav.setModel(BasicModel.buildBadRequestModel("城市不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍩庡競涓嶈兘涓虹┖")); return mav; } if (StringUtils.isBlank(districtTagModel.getDistrict())) { - mav.setModel(BasicModel.buildBadRequestModel("区域不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍖哄煙涓嶈兘涓虹┖")); return mav; } if (StringUtils.isBlank(districtTagModel.getName())) { - mav.setModel(BasicModel.buildBadRequestModel("名称不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍚嶇О涓嶈兘涓虹┖")); return mav; } @@ -664,7 +664,7 @@ public class FshController { /** - * 获取房生活均价排名 + * 鑾峰彇鎴跨敓娲诲潎浠锋帓鍚� * @author xuhe * @param model * @param request @@ -675,14 +675,14 @@ public class FshController { EvaluationBeforeLoanDto dto = new EvaluationBeforeLoanDto(); District district = districtService.findDistrict(new DistrictKey(model.getCity(), model.getDistrict(), model.getName()), "district"); if (district == null) { - mav.setModel(BasicModel.buildBadRequestModel("小区不存在")); + mav.setModel(BasicModel.buildBadRequestModel("灏忓尯涓嶅瓨鍦�")); return mav; } DistrictKey key = new DistrictKey(model.getCity(), model.getDistrict(), model.getName()); DistrictAnalyData districtAnalyData = districtAnalyDataService.findByDistrictKey(key); - //封装价格走势信息 + //灏佽浠锋牸璧板娍淇℃伅 this.buildPriceZouShi(dto, model, districtAnalyData); mav.setModel(BasicModel.buildOKModel().setResult(dto)); @@ -693,7 +693,7 @@ public class FshController { /** - * 获取小区排名 + * 鑾峰彇灏忓尯鎺掑悕 * @param model * @param request * @return @@ -702,7 +702,7 @@ public class FshController { RestfulModelAndView mav = new RestfulModelAndView(); District district = districtService.findDistrict(new DistrictKey(model.getCity(), model.getDistrict(), model.getName()), "district"); if (district == null) { - mav.setModel(BasicModel.buildBadRequestModel("小区不存在")); + mav.setModel(BasicModel.buildBadRequestModel("灏忓尯涓嶅瓨鍦�")); return mav; } @@ -716,7 +716,7 @@ public class FshController { /** - * 获取房生活流动性评级 + * 鑾峰彇鎴跨敓娲绘祦鍔ㄦ�ц瘎绾� * @author xuhe * @param model * @param request @@ -727,7 +727,7 @@ public class FshController { EvaluationBeforeLoanDto dto = new EvaluationBeforeLoanDto(); District district = districtService.findDistrict(new DistrictKey(model.getCity(), model.getDistrict(), model.getName()), "district"); if (district == null) { - mav.setModel(BasicModel.buildBadRequestModel("小区不存在")); + mav.setModel(BasicModel.buildBadRequestModel("灏忓尯涓嶅瓨鍦�")); return mav; } @@ -735,7 +735,7 @@ public class FshController { DistrictKey key = new DistrictKey(model.getCity(), model.getDistrict(), model.getName()); DistrictAnalyData districtAnalyData = districtAnalyDataService.findByDistrictKey(key); - //处置难易度 + //澶勭疆闅炬槗搴� double totalScore = buildHandleLevel(dto, model, districtAnalyData, district); Map map = new HashMap(); map.put("totalScore", totalScore); @@ -744,7 +744,7 @@ public class FshController { } /** - * 获取房生活周边均价相似小区 + * 鑾峰彇鎴跨敓娲诲懆杈瑰潎浠风浉浼煎皬鍖� * @author xuhe * @param model * @param request @@ -755,7 +755,7 @@ public class FshController { EvaluationBeforeLoanDto dto = new EvaluationBeforeLoanDto(); District district = districtService.findDistrict(new DistrictKey(model.getCity(), model.getDistrict(), model.getName()), "district"); if (district == null) { - mav.setModel(BasicModel.buildBadRequestModel("小区不存在")); + mav.setModel(BasicModel.buildBadRequestModel("灏忓尯涓嶅瓨鍦�")); return mav; } @@ -766,7 +766,7 @@ public class FshController { List cityList = districtNewPriceService.findDistrictRangPrice(model.getCity(), null, null, priceStart, priceEnd,end); List regionList = districtNewPriceService.findDistrictRangPrice(model.getCity(), model.getDistrict(), null, priceStart, priceEnd,end); - //上周无均价,再往前推一周 + //涓婂懆鏃犲潎浠凤紝鍐嶅線鍓嶆帹涓�鍛� if (cityList.size() == 0) { Date topEnd = DateUtil.getFirstDayOfWeek(end); cityList = districtNewPriceService.findDistrictRangPrice(model.getCity(), null, null, priceStart, priceEnd, topEnd); @@ -811,7 +811,7 @@ public class FshController { } /** - * 获取推荐的小区均价及标签信息 + * 鑾峰彇鎺ㄨ崘鐨勫皬鍖哄潎浠峰強鏍囩淇℃伅 * @param districtTagModel * @return */ @@ -847,7 +847,7 @@ public class FshController { } /** - * 获取以房换房意向小区列表 + * 鑾峰彇浠ユ埧鎹㈡埧鎰忓悜灏忓尯鍒楄〃 * @author xuhe * @param model * @param request @@ -863,7 +863,7 @@ public class FshController { List statList = districtNewPriceService.findAllNewDistrictStat( model.getCity(), model.getRegion(), date, model.getAreaTags(), model.getPoiTags(), model.getPurpose(), 100, model.getMinAvgPrice(), model.getMaxAvgPrice()); - //上周无均价,再往前推一周 + //涓婂懆鏃犲潎浠凤紝鍐嶅線鍓嶆帹涓�鍛� if (totalCount == 0) { Date topEnd = DateUtil.getFirstDayOfWeek(date); totalCount = districtNewPriceService.findAllNewDistrictStatCount( @@ -898,7 +898,7 @@ public class FshController { } } - //标签由多到少排序 + //鏍囩鐢卞鍒板皯鎺掑簭 sortTagSize(result); EvaluationBeforeLoanDto dto = new EvaluationBeforeLoanDto(); @@ -909,13 +909,13 @@ public class FshController { } /** - * 以房换房的相似小区均价筛选 + * 浠ユ埧鎹㈡埧鐨勭浉浼煎皬鍖哄潎浠风瓫閫� * @return */ private List getHouseTags(HouseChangeInfoModel model){ Date date = DateUtil.getFirstDayOfWeek(new Date()); List statList = districtNewPriceService.findDistrictRangPrice(model.getCity(), model.getRegion(),null,model.getMinAvgPrice(),model.getMaxAvgPrice(),date); - //上周无均价,再往前推一周 + //涓婂懆鏃犲潎浠凤紝鍐嶅線鍓嶆帹涓�鍛� if (statList.size() == 0) { Date topEnd = DateUtil.getFirstDayOfWeek(date); statList = districtNewPriceService.findDistrictRangPrice(model.getCity(), model.getRegion(), null, model.getMinAvgPrice(),model.getMaxAvgPrice(), topEnd); @@ -952,43 +952,43 @@ public class FshController { } - //根据条件筛选数据 + //鏍规嵁鏉′欢绛涢�夋暟鎹� private List getConditionData(List statList, int minAvgPrice, int maxAvgPrice, String region, int areaTags, int purpose){ if(statList.size() > 0){ List result = new ArrayList(); for(int i=0; imaxAvgPrice){ continue; } - //区域过滤 + //鍖哄煙杩囨护 if(StringUtils.isNotBlank(region)){ if(!districtTagsPrice.getRegion().equals(region)){ continue; } } - //面积标签过滤 + //闈㈢Н鏍囩杩囨护 if(districtTagsPrice.getAreaTags()!=null && !districtTagsPrice.getAreaTags().contains(areaTags)){ continue; } - //根据目的进行过滤 + //鏍规嵁鐩殑杩涜杩囨护 if(districtTagsPrice.getPoiSize()==null||districtTagsPrice.getPoiSize()==0){ continue; } if(purpose == 1){ - if(!districtTagsPrice.getPoiTags().contains("近超市")){ + if(!districtTagsPrice.getPoiTags().contains("杩戣秴甯�")){ continue; } }else if(purpose==2){ - if(!districtTagsPrice.getPoiTags().contains("近学校")){ + if(!districtTagsPrice.getPoiTags().contains("杩戝鏍�")){ continue; } }else if(purpose==3){ - if(!districtTagsPrice.getPoiTags().contains("近医疗")){ + if(!districtTagsPrice.getPoiTags().contains("杩戝尰鐤�")){ continue; } }else if(purpose==4){ - if(!districtTagsPrice.getPoiTags().contains("近地铁") && !districtTagsPrice.getPoiTags().contains("公交多")){ + if(!districtTagsPrice.getPoiTags().contains("杩戝湴閾�") && !districtTagsPrice.getPoiTags().contains("鍏氦澶�")){ continue; } } @@ -1018,8 +1018,8 @@ public class FshController { } /** - * 获取list的前几条数据 - * @param name 去掉名称为name的 + * 鑾峰彇list鐨勫墠鍑犳潯鏁版嵁 + * @param name 鍘绘帀鍚嶇О涓簄ame鐨� */ private List getFirstIndexList(List list,int index,String name){ List backList = new ArrayList(); @@ -1037,7 +1037,7 @@ public class FshController { return backList; } /** - * 封装价格走势信息 + * 灏佽浠锋牸璧板娍淇℃伅 * @author yinjihuan * @param dto * @param model @@ -1045,22 +1045,22 @@ public class FshController { private void buildPriceZouShi(EvaluationBeforeLoanDto dto, CollateralEvaluationInfoModel model, DistrictAnalyData districtAnalyData) { Date end = new Date(); - //2年前 + //2骞村墠 Date start = DateUtil.getDateOfLastMonth(end, -24); - //小区走势 + //灏忓尯璧板娍 this.buildDistrictAvgZouShi(dto, model, end, start); - //区域走势 + //鍖哄煙璧板娍 this.buildRegionAvgZouShi(dto, model, end, start); - //城市走势 + //鍩庡競璧板娍 this.buildCityAvgZouShi(dto, model, end, start); } /** - * 均价在城市中排名比(也就是价格指数) + * 鍧囦环鍦ㄥ煄甯備腑鎺掑悕姣�(涔熷氨鏄环鏍兼寚鏁�) * @param dto * @param model */ @@ -1074,7 +1074,7 @@ public class FshController { dto.setPriceRate(priceLevelRate); }else{ List list = districtStatService.findAllDistrictStats(model.getCity(),null,null,DateUtil.getFirstDayOfWeek(new Date())); - //最近一周查不到往前再推一周 + //鏈�杩戜竴鍛ㄦ煡涓嶅埌寰�鍓嶅啀鎺ㄤ竴鍛� if(list==null){ list = districtStatService.findAllDistrictStats(model.getCity(),null,null,DateUtil.getFirstDayOfWeek(DateUtil.getBeforeDay(new Date(), -7))); } @@ -1105,7 +1105,7 @@ public class FshController { } } - //小区成交数量 + //灏忓尯鎴愪氦鏁伴噺 private Map buildDealPricesCountByMonth(DistrictKey districtKey, Date end, Date start) { List list = dealPriceService.findDealPriceList(districtKey.getCity(), districtKey.getRegion(), districtKey.getName(), start, end); Map districtMap = new HashMap(); @@ -1119,7 +1119,7 @@ public class FshController { } return districtMap; } - //小区成交数量 + //灏忓尯鎴愪氦鏁伴噺 private Map buildDealPricesByMonth(DistrictKey districtKey, Date end, Date start) { List list = dealPriceService.findDealPriceList(districtKey.getCity(), districtKey.getRegion(), districtKey.getName(), start, end); Map> avgPriceDetailMap = new HashMap>(); @@ -1145,7 +1145,7 @@ public class FshController { } /** - * 小区走势 + * 灏忓尯璧板娍 * @author yinjihuan * @param dto * @param model @@ -1163,7 +1163,7 @@ public class FshController { private Map buildDistrictAvgZouShiByMonth(DistrictModel model,DistrictKey districtKey, Date end, Date start) { Map> avgPriceDetailMap = new HashMap>(); -// if(model.isYouDa() && "上海".equals(model.getCityName())){ +// if(model.isYouDa() && "涓婃捣".equals(model.getCityName())){ // List list = ydDealPriceService.findYdDealPrices(districtKey.getCity(), districtKey.getRegion(), districtKey.getName(), start, end); // for (YdDealPrice stat : list) { // String ws = DateUtil.formatByPattern(stat.getWeekend(), "yyyy-MM"); @@ -1200,7 +1200,7 @@ public class FshController { } /** - * 区域走势 + * 鍖哄煙璧板娍 * @author yinjihuan * @param dto * @param model @@ -1229,7 +1229,7 @@ public class FshController { } /** - * 城市走势 + * 鍩庡競璧板娍 * @author yinjihuan * @param dto * @param model @@ -1262,7 +1262,7 @@ public class FshController { /** - * 涨跌幅在城市排名 + * 娑ㄨ穼骞呭湪鍩庡競鎺掑悕 * @author yinjihuan * @param dto * @param key @@ -1286,7 +1286,7 @@ public class FshController { } /** - * 获取城市的相对最低和最高价 + * 鑾峰彇鍩庡競鐨勭浉瀵规渶浣庡拰鏈�楂樹环 * @param model * @return */ @@ -1301,37 +1301,37 @@ public class FshController { } /** - * 处置难易度 + * 澶勭疆闅炬槗搴� * @param dto */ private double buildHandleLevel(EvaluationBeforeLoanDto dto, CollateralEvaluationInfoModel model, DistrictAnalyData districtAnalyData, District district) { - //获取pds相关系数 + //鑾峰彇pds鐩稿叧绯绘暟 PdsRatio pdsRatio = getPdsRatio(model); - // 获取城市近12个月的年涨幅 + // 鑾峰彇鍩庡競杩�12涓湀鐨勫勾娑ㄥ箙 Integer cityAvgPrice = cityRiseAndDownNew(model.getCity()); dto.setCityAvgPrice(cityAvgPrice); - //总价相关得分 + //鎬讳环鐩稿叧寰楀垎 Double totalPriceScore = getTotalPriceScoreInfoNew(cityAvgPrice, dto, pdsRatio); - //中介数得分、知名中介数量、其他中介数量 、中介城市排名 + //涓粙鏁板緱鍒嗐�佺煡鍚嶄腑浠嬫暟閲忋�佸叾浠栦腑浠嬫暟閲� 銆佷腑浠嬪煄甯傛帓鍚� AgencyMountLevel agencyMountLevel = agencyMountLevelService.findAgencyMountLevelParam(model.getCity(), model.getDistrict(), model.getName()); Double agencyScore= getAgencyInfoNew(agencyMountLevel, model, dto, pdsRatio); //dto.setAgencyScore(agencyScore); - //近6个月挂牌量、近1个月挂牌量、近六个月最高挂牌量、6个月挂牌量在城市排名、挂牌量得分 + //杩�6涓湀鎸傜墝閲忋�佽繎1涓湀鎸傜墝閲忋�佽繎鍏釜鏈堟渶楂樻寕鐗岄噺銆�6涓湀鎸傜墝閲忓湪鍩庡競鎺掑悕銆佹寕鐗岄噺寰楀垎 DistrictKey key = new DistrictKey(model.getCity(), model.getDistrict(), model.getName()); Double quoteScore = getQuoteInfo(districtAnalyData, dto, key, pdsRatio); //dto.setQuoteScore(quoteScore); - //交通得分、交通情况城市排名、公交数量、地铁数量 + //浜ら�氬緱鍒嗐�佷氦閫氭儏鍐靛煄甯傛帓鍚嶃�佸叕浜ゆ暟閲忋�佸湴閾佹暟閲� Double trafficScore = getTrafficInfoNew(dto, key, pdsRatio); //dto.setTrafficScore(trafficScore); - //小区密度得分 + //灏忓尯瀵嗗害寰楀垎 Double distirctDensityScore = getDistrictDensityNew(district, pdsRatio, districtAnalyData, dto); - //交易量评分 + //浜ゆ槗閲忚瘎鍒� double dealCountScore = dealCountScore(districtAnalyData); - //交易量覆盖比例 - double dealCover = statisticReportService.findCityDealCover(model.getCity(),"成交数据覆盖率", null); + //浜ゆ槗閲忚鐩栨瘮渚� + double dealCover = statisticReportService.findCityDealCover(model.getCity(),"鎴愪氦鏁版嵁瑕嗙洊鐜�", null); Double handleDegreeScore = getHandleDegreeScore(pdsRatio, agencyScore, quoteScore, trafficScore, distirctDensityScore, totalPriceScore,dealCountScore,dealCover); return handleDegreeScore; @@ -1351,12 +1351,12 @@ public class FshController { } - //获取pds相关系数 + //鑾峰彇pds鐩稿叧绯绘暟 public PdsRatio getPdsRatio(CollateralEvaluationInfoModel model){ FSHAlgorithmRule algorithmRule = fSHAlgorithmRuleService.findAlgorithmRuleByCity(model.getCity()); model = setRuleParam(model, algorithmRule); PdsRatio pdsRatio = new PdsRatio(); - //此处需要调用接口 + //姝ゅ闇�瑕佽皟鐢ㄦ帴鍙� pdsRatio.setAgencyScale(model.getAgencyCount()); pdsRatio.setAgencyMax(model.getAgencyCountMax()); pdsRatio.setAgencyMin(model.getAgencyCountMin()); @@ -1455,7 +1455,7 @@ public class FshController { return model; } - //综合评分 + //缁煎悎璇勫垎 public Double getCollateralTotalScore(Double handleDegreeScore, Double priceStability,PdsRatio pdsRatio){ Double priceStabilityScale = PDSConstant.PRICE_STABILITY_SCALE; Double handleStabilityScale = PDSConstant.HANDLE_STABILITY_SCALE; @@ -1465,7 +1465,7 @@ public class FshController { Double totalScore = MathUtils.calTotalScore(handleDegreeScore,priceStability,priceStabilityScale,handleStabilityScale); return totalScore; } - //处置 难易度得分 + //澶勭疆 闅炬槗搴﹀緱鍒� public Double getHandleDegreeScore(PdsRatio pdsRatio,Double agencyScore,Double quoteScore,Double trafficScore,Double distirctDensityScore,Double totalPriceScore,Double dealCountScore,Double dealCover){ Double agencyScale= FSHConstant.AGENCY_SCALE; Double quoteScale = FSHConstant.QUOTE_SCALE; @@ -1500,7 +1500,7 @@ public class FshController { } return handleDegreeScore; } - //处置难易度 + //澶勭疆闅炬槗搴� private static double calHandleDegreeScore(Double agencyScore,Double quoteScore,Double trafficScore,Double distirctDensityScore,Double totalPriceScore ,Double agencyScale ,Double quoteScale ,Double trafficScale ,Double densityScale,Double totalPriceScale,Double dealCountScore,Double dealCountScale){ double score = 0d; score = (double)((agencyScore*agencyScale)+(quoteScore*quoteScale)+(trafficScore*trafficScale)+(distirctDensityScore*densityScale)+(totalPriceScore*totalPriceScale)+(dealCountScore*dealCountScale)); @@ -1509,7 +1509,7 @@ public class FshController { return f1; } - //以上价格稳定指数 + //浠ヤ笂浠锋牸绋冲畾鎸囨暟 public Double getPriceStabilityValue(Double yoy,Double regionAbs,PdsRatio cityRatio,Double regionYoy){ Double priceStability = 0d; Double absDLine = PDSConstant.ABSD_LINE; @@ -1541,7 +1541,7 @@ public class FshController { } return priceStability; } - //中介数得分、知名中介数量、其他中介数量 、中介城市排名 + //涓粙鏁板緱鍒嗐�佺煡鍚嶄腑浠嬫暟閲忋�佸叾浠栦腑浠嬫暟閲� 銆佷腑浠嬪煄甯傛帓鍚� private Double getAgencyInfoNew(AgencyMountLevel agencyMountLevel,CollateralEvaluationInfoModel model,EvaluationBeforeLoanDto dto,PdsRatio cityRatio){ int famousAgency = 0; if(agencyMountLevel !=null && agencyMountLevel.getFamousAgency() >= 0){ @@ -1551,17 +1551,17 @@ public class FshController { if(agencyMountLevel!=null&&agencyMountLevel.getOtherAgency()>=0){ otherAgency = agencyMountLevel.getOtherAgency(); } - int allAgency = famousAgency+otherAgency;//中介总数 + int allAgency = famousAgency+otherAgency;//涓粙鎬绘暟 if(agencyMountLevel==null||agencyMountLevel.getMomCityLevel()<0||agencyMountLevel.getCitySize()<0){ - //dto.setAgencyLevelRate(0d);//中介城市排名 + //dto.setAgencyLevelRate(0d);//涓粙鍩庡競鎺掑悕 }else{ //dto.setAgencyLevelRate(MathUtils.getLevelRate(agencyMountLevel.getMomCityLevel(), agencyMountLevel.getCitySize())); } - Double agencyScore = agencyScoreLog(allAgency, cityRatio);//中介得分 + Double agencyScore = agencyScoreLog(allAgency, cityRatio);//涓粙寰楀垎 return agencyScore; } - //中介得分逻辑 + //涓粙寰楀垎閫昏緫 public Double agencyScoreLog(int allAgency,PdsRatio cityRatio){ Double agencyScore = 0d; Double agencyMax = PDSConstant.AGENCY_MAX; @@ -1582,7 +1582,7 @@ public class FshController { } return agencyScore; } - // 城市近12个月的涨幅 + // 鍩庡競杩�12涓湀鐨勬定骞� private Integer cityRiseAndDownNew(String city){ Integer cityAvgPrice = 0; List citySellStats = citySellStatService.getAllWithMonths(city, 12); @@ -1595,7 +1595,7 @@ public class FshController { } return cityAvgPrice; } - //总价得分 + //鎬讳环寰楀垎 private Double getTotalPriceScoreInfoNew(Integer cityAvgPrice, EvaluationBeforeLoanDto dto, PdsRatio cityRatio){ int totalPrice = dto.getTotalPrice().intValue(); Double totalPriceScore = 0d; @@ -1628,7 +1628,7 @@ public class FshController { } return totalPriceScore; } - //近6个月挂牌量、近1个月挂牌量、近六个月最高挂牌量、6个月挂牌量在城市排名 + //杩�6涓湀鎸傜墝閲忋�佽繎1涓湀鎸傜墝閲忋�佽繎鍏釜鏈堟渶楂樻寕鐗岄噺銆�6涓湀鎸傜墝閲忓湪鍩庡競鎺掑悕 private Double getQuoteInfo(DistrictAnalyData districtAnalyData,EvaluationBeforeLoanDto dto, DistrictKey key, PdsRatio cityRatio){ Double quoteMax = PDSConstant.QUOTE_MAX; Double quoteMin = PDSConstant.QUOTE_MIN; @@ -1643,12 +1643,12 @@ public class FshController { if(districtAnalyData!=null&&districtAnalyData.getSellCountRank()!=null&&districtAnalyData.getSellRankTotal()!=null){ sixQuoteLevelRate = MathUtils.getLevelRate(districtAnalyData.getSellCountRank(),districtAnalyData.getSellRankTotal()); } - dto.setSixQuoteLevelRate(sixQuoteLevelRate * 100);//六个月挂牌量排名 + dto.setSixQuoteLevelRate(sixQuoteLevelRate * 100);//鍏釜鏈堟寕鐗岄噺鎺掑悕 int quoteHouseSix = 0; if(districtAnalyData!=null&&districtAnalyData.getSellCount()!=null&&districtAnalyData.getSellCount()>=0){ quoteHouseSix = districtAnalyData.getSellCount(); } - dto.setQuoteHouseSix(quoteHouseSix);// 近六个月的挂牌量 + dto.setQuoteHouseSix(quoteHouseSix);// 杩戝叚涓湀鐨勬寕鐗岄噺 /*Integer cityMaxQuote = districtAnalyDataService.findMaxSellCountByCity(key.getCity()); if(cityMaxQuote==null){ dto.setSixMaxQuoteMount(0); @@ -1660,9 +1660,9 @@ public class FshController { if(districtAnalyData!=null&&districtAnalyData.getMonthSellCount()!=null){ quertHouseOne = districtAnalyData.getMonthSellCount(); } - dto.setQuoteHouseOne(quertHouseOne);// 近一个月的挂牌量 + dto.setQuoteHouseOne(quertHouseOne);// 杩戜竴涓湀鐨勬寕鐗岄噺 - Double quoteScore = 0d;//挂牌量得分 + Double quoteScore = 0d;//鎸傜墝閲忓緱鍒� if(quoteHouseSix>=quoteMax){ quoteScore = 100d; }else if(quoteHouseSix<=quoteMin){ @@ -1673,7 +1673,7 @@ public class FshController { return quoteScore; } - //交通得分、交通情况城市排名、公交数量、地铁数量 + //浜ら�氬緱鍒嗐�佷氦閫氭儏鍐靛煄甯傛帓鍚嶃�佸叕浜ゆ暟閲忋�佸湴閾佹暟閲� private Double getTrafficInfoNew(EvaluationBeforeLoanDto dto, DistrictKey key, PdsRatio pdsRatio){ Double metroScale = PDSConstant.METRO_SCALE; Double metroMax = PDSConstant.METRO_MAX; @@ -1683,12 +1683,12 @@ public class FshController { Double busMin = PDSConstant.BUS_MIN; TrafficLevel trafficLevel = trafficLevelService.findTrafficLevelByParam(key.getCity(), key.getRegion(), key.getName()); - Integer metroCount = 0;//地铁数量 + Integer metroCount = 0;//鍦伴搧鏁伴噺 if(trafficLevel!=null&&trafficLevel.getMetroCount()!=null){ metroCount = trafficLevel.getMetroCount(); } dto.setMetroCount(metroCount); - Integer busCount = 0;//公交数量 + Integer busCount = 0;//鍏氦鏁伴噺 Integer trafficCount = 0; Integer maxTrafficCount = 0; if(trafficLevel!=null&&trafficLevel.getBusCount()!=null){ @@ -1705,14 +1705,14 @@ public class FshController { //dto.setMaxTrafficCount(maxTrafficCount); //dto.setTrafficCount(trafficCount); dto.setBusCount(busCount); - Double trafficLevelRate = 0d;//交通情况城市排名 + Double trafficLevelRate = 0d;//浜ら�氭儏鍐靛煄甯傛帓鍚� if(trafficLevel!=null&&trafficLevel.getTrafficLevel()!=null&&trafficLevel.getTrafficLevelTotal()!=null){ trafficLevelRate = MathUtils.getLevelRate(trafficLevel.getTrafficLevel(), trafficLevel.getTrafficLevelTotal()); } dto.setTrafficLevelRate(trafficLevelRate * 100); - Double trafficScore = 0d;//交通得分 - Double metroScore = 0d; //地铁得分 - Double busScore = 0d; //公交得分 + Double trafficScore = 0d;//浜ら�氬緱鍒� + Double metroScore = 0d; //鍦伴搧寰楀垎 + Double busScore = 0d; //鍏氦寰楀垎 if(pdsRatio!=null&&pdsRatio.getMetroScale()!=null){ metroScale = pdsRatio.getMetroScale(); } @@ -1750,7 +1750,7 @@ public class FshController { return trafficScore; } - //小区密度 + //灏忓尯瀵嗗害 private Double getDistrictDensityNew(District district,PdsRatio pdsRatio,DistrictAnalyData districtAnalyData, EvaluationBeforeLoanDto dto) { Double densityMax = PDSConstant.DENSITY_MAX; Double densityMin = PDSConstant.DENSITY_MIN; @@ -1823,7 +1823,7 @@ public class FshController { return densityScore; } - //区域近12个月的涨幅,年涨幅 + //鍖哄煙杩�12涓湀鐨勬定骞�,骞存定骞� private Double regionRiseAndDownNew(EvaluationBeforeLoanDto dto, CollateralEvaluationInfoModel model){ Double regionYoy = null; List regionStatTrends = regionStatTrendService.getAllWithMonths(model.getCity(), model.getDistrict(), 12); @@ -1839,10 +1839,10 @@ public class FshController { dto.setRegionSellStats(regionStatTrends); return regionYoy; } - //选择年涨跌幅、半年涨跌幅、季度涨跌幅 + //閫夋嫨骞存定璺屽箙銆佸崐骞存定璺屽箙銆佸搴︽定璺屽箙 public Double getAbsYoy(DistrictAnalyData districtAnalyData,Integer avgPrice,List css,List rss){ Double yoy = null; - if(districtAnalyData!=null){//选择年涨跌幅、半年涨跌幅、季度涨跌幅 + if(districtAnalyData!=null){//閫夋嫨骞存定璺屽箙銆佸崐骞存定璺屽箙銆佸搴︽定璺屽箙 if(districtAnalyData.getYoy()!=null){ yoy = districtAnalyData.getYoy(); }else if(districtAnalyData.getHalfYoy()!=null){ @@ -1859,9 +1859,9 @@ public class FshController { } return yoy; } - //与区域年涨跌幅差比 + //涓庡尯鍩熷勾娑ㄨ穼骞呭樊姣� public Double yoyRegionRiseAndDownAbs(DistrictAnalyData districtAnalyData,Double yoy,Double regionYoy){ - Double yoyRegionAbs = null;//小区涨跌幅与区域的差比 + Double yoyRegionAbs = null;//灏忓尯娑ㄨ穼骞呬笌鍖哄煙鐨勫樊姣� if(yoy!=null&®ionYoy!=null&®ionYoy!=0){ yoyRegionAbs = MathUtils.yoyAbs(yoy, regionYoy); }else{ @@ -1883,7 +1883,7 @@ public class FshController { } /** - * 通过EvaluationModel组装Evaluation实体(友达专用) + * 閫氳繃EvaluationModel缁勮Evaluation瀹炰綋(鍙嬭揪涓撶敤) * * @param model * @return @@ -2028,7 +2028,7 @@ public class FshController { return evaluation; } /** - * 通过EvaluationModel组装Evaluation实体 + * 閫氳繃EvaluationModel缁勮Evaluation瀹炰綋 * * @param model * @return @@ -2065,7 +2065,7 @@ public class FshController { } /** - * 获取小区不同时间的价格 + * 鑾峰彇灏忓尯涓嶅悓鏃堕棿鐨勪环鏍� * @param model * @return */ @@ -2077,12 +2077,12 @@ public class FshController { String region = model.getRegion(); String name = model.getName(); - // 获取上周均价 + // 鑾峰彇涓婂懆鍧囦环 Date date = DateUtil.getFirstDayOfWeek(new Date()); DistrictStat weekStat = districtStatService.findOneDistrictStatsSort(city, region, name, DateUtil.getFirstDayOfWeek(date)); dto.setPrice(weekStat == null ? 0 : weekStat.getAvgPrice()); - // 获取上月均价 + // 鑾峰彇涓婃湀鍧囦环 Calendar calendar = Calendar.getInstance(); calendar.setTime(new Date()); calendar.add(Calendar.MONTH, -1); @@ -2092,21 +2092,21 @@ public class FshController { DistrictSellStat sellStat = districtSellStatService.findByYearMonth(city, region, name, yearMonth); dto.setPriceMonthOne(sellStat == null ? 0 : sellStat.getAvgPrice()); - // 获取上2个月均价 + // 鑾峰彇涓�2涓湀鍧囦环 calendar.add(Calendar.MONTH, -1); month = DateUtil.formatByPattern(calendar.getTime(), "yyyyMM"); yearMonth = Integer.parseInt(month); sellStat = districtSellStatService.findByYearMonth(city, region, name, yearMonth); dto.setPriceMonthTwo(sellStat == null ? 0 : sellStat.getAvgPrice()); - // 获取上3个月均价 + // 鑾峰彇涓�3涓湀鍧囦环 calendar.add(Calendar.MONTH, -1); month = DateUtil.formatByPattern(calendar.getTime(), "yyyyMM"); yearMonth = Integer.parseInt(month); sellStat = districtSellStatService.findByYearMonth(city, region, name, yearMonth); dto.setPriceMonthThree(sellStat == null ? 0 : sellStat.getAvgPrice()); - // 获取上4个月均价 + // 鑾峰彇涓�4涓湀鍧囦环 calendar.add(Calendar.MONTH, -1); month = DateUtil.formatByPattern(calendar.getTime(), "yyyyMM"); yearMonth = Integer.parseInt(month); @@ -2117,7 +2117,7 @@ public class FshController { return mav; } /** - * 中介数据接口 + * 涓粙鏁版嵁鎺ュ彛 * @param model * @return */ @@ -2147,7 +2147,7 @@ public class FshController { } /** - * 获取周边相似挂牌房源 + * 鑾峰彇鍛ㄨ竟鐩镐技鎸傜墝鎴挎簮 * @param model * @return */ @@ -2179,7 +2179,7 @@ public class FshController { } /** - * 获取本小区相识房源 + * 鑾峰彇鏈皬鍖虹浉璇嗘埧婧� * @param model * @return */ @@ -2212,7 +2212,7 @@ public class FshController { return mav; } /** - * 附近成交记录 + * 闄勮繎鎴愪氦璁板綍 * @param model * @return */ @@ -2243,7 +2243,7 @@ public class FshController { } /** - * 同小区相似房源 + * 鍚屽皬鍖虹浉浼兼埧婧� * @param model * @return */ @@ -2278,7 +2278,7 @@ public class FshController { mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getName()) || StringUtils.isBlank(model.getDistrict())) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:城市,区域,小区名为必填项")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:鍩庡競,鍖哄煙,灏忓尯鍚嶄负蹇呭~椤�")); return mav; } District district = null; @@ -2292,7 +2292,7 @@ public class FshController { - //上月均价 + //涓婃湀鍧囦环 DistrictSellStat sellStat = districtSellStatService.findByYearMonth(district.getCity(), district.getRegion(), district.getName(), Integer.parseInt(DateUtil.formatByPattern(DateUtil.addMonthToDate(new Date(), -1), "yyyyMM"))); if (sellStat != null) { @@ -2301,7 +2301,7 @@ public class FshController { info.setMoreArea(getMoreHouseArea(district.getCity(), district.getRegion(), district.getName())); - //年涨跌幅 + //骞存定璺屽箙 List districtsSellStats = districtSellStatService.getAllWithMonths(district.getCity(), district.getRegion(), district.getName(), 12); if (districtsSellStats != null && districtsSellStats.size() > 0) { DistrictSellStat districtSellStat = districtsSellStats.get(0); @@ -2312,7 +2312,7 @@ public class FshController { DistrictKey districtKey = new DistrictKey(district.getCity(), district.getRegion(), district.getName()); DistrictAnalyData districtAnalyData = districtAnalyDataService.findByDistrictKey(districtKey); - //涨跌幅在城市排名 + //娑ㄨ穼骞呭湪鍩庡競鎺掑悕 Double increaseRate = 0d; if(districtAnalyData == null || districtAnalyData.getYoyCityRank() == null || districtAnalyData.getYoyCityTotal() == null) { info.setUpDownRangecityLevel(0d); @@ -2324,7 +2324,7 @@ public class FshController { } info.setUpDownRangecityLevel(increaseRate * 100); - //当前均价 + //褰撳墠鍧囦环 DistrictStatBo statBo = districtStatService.findDistrictStat(districtKey); if(null != statBo){ DistrictStat districtStat = statBo.getDistrictStat()!=null?statBo.getDistrictStat():statBo.getVillaDistrictStat(); @@ -2340,7 +2340,7 @@ public class FshController { } /** - * 批量获取小区均价 + * 鎵归噺鑾峰彇灏忓尯鍧囦环 * @param districtModel * @return */ @@ -2384,7 +2384,7 @@ public class FshController { resMap.put(key.getCity()+"_"+key.getRegion()+"_"+key.getName()+"_max", Math.round(prices[1]/10000)); } }*/ - // 性能优化 yinjihuan + // 鎬ц兘浼樺寲 yinjihuan for(String s : districts){ String[] array = s.split("_"); DistrictKey key = new DistrictKey(array[0], array[1], array[2]); @@ -2420,7 +2420,7 @@ public class FshController { return new double[] {0,0}; } /** - * 查找某经纬度半径范围内 最近的几条小区 + * 鏌ユ壘鏌愮粡绾害鍗婂緞鑼冨洿鍐� 鏈�杩戠殑鍑犳潯灏忓尯 * @param districtModel * @return */ @@ -2428,7 +2428,7 @@ public class FshController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (null == districtModel.getLat() || null==districtModel.getLng()) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:经度,纬度为必填项")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:缁忓害,绾害涓哄繀濉」")); return mav; } @@ -2452,7 +2452,7 @@ public class FshController { dto.setLng(d.getLng2()); dto.setLat(d.getLat2()); } - // 指定要价格才组装 + // 鎸囧畾瑕佷环鏍兼墠缁勮 if (districtModel.getShowPrice()) { Date weekend = new Date(); weekend = DateUtil.getThisSunday(weekend); @@ -2495,12 +2495,12 @@ public class FshController { mav.setViewType("rest"); if (StringUtils.isBlank(districtModel.getCityName()) || StringUtils.isBlank(districtModel.getName()) || StringUtils.isBlank(districtModel.getRegion())) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:城市,区域,小区名为必填项")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:鍩庡競,鍖哄煙,灏忓尯鍚嶄负蹇呭~椤�")); return mav; } Map> demoList = new HashMap>(); DistrictKey districtKey = new DistrictKey(districtModel.getCityName(),districtModel.getRegion(),districtModel.getName()); - //3年前 + //3骞村墠 Date date = DateUtil.getDateOfLastMonth(new Date(), districtModel.getType()); date = DateUtil.getFirstDayOfWeek(date); @@ -2524,17 +2524,17 @@ public class FshController { demoList.put(ws, list); } Map> treemap = new HashMap>(); - //处理开盘价,收盘价,峰值,谷值 + //澶勭悊寮�鐩樹环锛屾敹鐩樹环锛屽嘲鍊硷紝璋峰�� for(String key:demoList.keySet()){ List valueList = new ArrayList(); List values = demoList.get(key); - if(values.size()<2){ //只有一个数据的跳过 + if(values.size()<2){ //鍙湁涓�涓暟鎹殑璺宠繃 continue; } - valueList.add(values.get(0)); //开盘价 - valueList.add(values.get(values.size()-1)); //收盘价 - valueList.add(Collections.min(values)); //谷值 - valueList.add(Collections.max(values)); //峰值 + valueList.add(values.get(0)); //寮�鐩樹环 + valueList.add(values.get(values.size()-1)); //鏀剁洏浠� + valueList.add(Collections.min(values)); //璋峰�� + valueList.add(Collections.max(values)); //宄板�� Date startDate = DateUtil.getFirstDayOfLastMonth(DateUtil.parseDate(key, "yyyy-MM")); Date endDate = DateUtil.getLastDayOfMonth(DateUtil.parseDate(key, "yyyy-MM")); @@ -2554,7 +2554,7 @@ public class FshController { EvaluationBeforeLoanDto dto = new EvaluationBeforeLoanDto(); District district = districtService.findDistrict(new DistrictKey(model.getCityName(), model.getRegion(), model.getName()), "district"); if (district == null) { - mav.setModel(BasicModel.buildBadRequestModel("小区不存在")); + mav.setModel(BasicModel.buildBadRequestModel("灏忓尯涓嶅瓨鍦�")); return mav; } @@ -2576,11 +2576,11 @@ public class FshController { times.add(DateUtil.formatByPattern(date, "yyyy-MM")); } dto.setTimes(times); - //小区走势 + //灏忓尯璧板娍 dto.setDistrictAvgZouShi(buildDistrictAvgZouShiByMonth(model,key, end, start)); - //区域走势 + //鍖哄煙璧板娍 dto.setRegionAvgZouShi(buildRegionAvgZouShiByMonth(key, end, start)); - //城市走势 + //鍩庡競璧板娍 dto.setCityAvgZouShi(buildCityAvgZouShiByMonth(key.getCity(), end, start)); mav.setModel(BasicModel.buildOKModel().setResult(dto)); return mav; @@ -2591,7 +2591,7 @@ public class FshController { EvaluationBeforeLoanDto dto = new EvaluationBeforeLoanDto(); District district = districtService.findDistrict(new DistrictKey(model.getCityName(), model.getRegion(), model.getName()), "district"); if (district == null) { - mav.setModel(BasicModel.buildBadRequestModel("小区不存在")); + mav.setModel(BasicModel.buildBadRequestModel("灏忓尯涓嶅瓨鍦�")); return mav; } @@ -2613,14 +2613,14 @@ public class FshController { times.add(DateUtil.formatByPattern(date, "yyyy-MM")); } dto.setTimes(times); - //小区走势 + //灏忓尯璧板娍 dto.setDealDistricts(buildDealPricesCountByMonth(key, end, start)); mav.setModel(BasicModel.buildOKModel().setResult(dto)); return mav; } private String getMoreHouseArea(String city, String region, String name){ - //房型和面积占比 + //鎴垮瀷鍜岄潰绉崰姣� HourseTypeStat stat = hourseTypeStatService.getByNew(city, region, name); String areaString = ""; if(null != stat){ @@ -2639,15 +2639,15 @@ public class FshController { if(null != maxArea){ if(maxArea.equals("0")){ - areaString = "其他"; + areaString = "鍏朵粬"; }else if(maxArea.equals("1")){ - areaString = "60平米以下"; + areaString = "60骞崇背浠ヤ笅"; }else if(maxArea.equals("2")){ - areaString = "60-90平米"; + areaString = "60-90骞崇背"; }else if(maxArea.equals("3")){ - areaString = "90-120平米"; + areaString = "90-120骞崇背"; }else if(maxArea.equals("4")){ - areaString = "120平米以上"; + areaString = "120骞崇背浠ヤ笂"; } } } @@ -2663,7 +2663,7 @@ public class FshController { String[] citys = citysStr.split("_"); int sDate = getSDate(new Date(),-1); List cityNewPrices = cityNewPriceService.queryCitysNewPrice(citys, sDate); - if(null==cityNewPrices||cityNewPrices.size()==0) {//都没有 + if(null==cityNewPrices||cityNewPrices.size()==0) {//閮芥病鏈� sDate = getSDate(new Date(),-2); cityNewPrices = cityNewPriceService.queryCitysNewPrice(citys, sDate); } @@ -2681,15 +2681,15 @@ public class FshController { } } - sDate = getSDate(new Date(),-2);//处理个别没有 + sDate = getSDate(new Date(),-2);//澶勭悊涓埆娌℃湁 List notFindCitys = new ArrayList(); - for(String city : citys) {//未查到处理 + for(String city : citys) {//鏈煡鍒板鐞� if(null==cityExist.get(city)) { notFindCitys.add(city); } } List cityNewPricesSec = cityNewPriceService.queryCitysNewPrice(notFindCitys, sDate); - if(null!=cityNewPricesSec||cityNewPricesSec.size()>0) {//前两个月有的 + if(null!=cityNewPricesSec||cityNewPricesSec.size()>0) {//鍓嶄袱涓湀鏈夌殑 for(CityNewPrice c : cityNewPricesSec ) { Map p = new HashMap(); p.put("city", c.getCity()); @@ -2704,7 +2704,7 @@ public class FshController { for(String city: notFindCitys) { Map p = new HashMap(); p.put("city", city); - p.put("avgPrice", 0);//暂无数据 + p.put("avgPrice", 0);//鏆傛棤鏁版嵁 resList.add(p); } } @@ -2713,7 +2713,7 @@ public class FshController { } /** - * 小区详情数据汇总 + * 灏忓尯璇︽儏鏁版嵁姹囨�� * @author yinjihuan * @param model * @param request @@ -2731,13 +2731,13 @@ public class FshController { District district = districtService.findDistrict(new DistrictKey(city, region, name), "district"); if (district == null) { - mav.setModel(BasicModel.buildBadRequestModel("小区不存在")); + mav.setModel(BasicModel.buildBadRequestModel("灏忓尯涓嶅瓨鍦�")); return mav; } DistrictDetailDto result = new DistrictDetailDto(); - // 中介相关数据 + // 涓粙鐩稿叧鏁版嵁 AgencyMountLevel agencyInfo = agencyMountLevelService.findAgencyMountLevelParam(city, region, name); if (agencyInfo != null) { result.setFamousAgency(agencyInfo.getFamousAgency()); @@ -2749,7 +2749,7 @@ public class FshController { int maxAgencyMount = agencyMountLevelService.findMaxAgencyMount(city); result.setMaxCityAgency(maxAgencyMount); - // 小区基本信息 + // 灏忓尯鍩烘湰淇℃伅 result.setCity(city); result.setRegion(region); result.setName(name); @@ -2772,7 +2772,7 @@ public class FshController { result.setLng2(district.getLng2() / 10000000000d); } - // 价格信息 + // 浠锋牸淇℃伅 Date date = DateUtil.getFirstDayOfWeek(new Date()); DistrictKey districtKey = new DistrictKey(city, region, name); DistrictNewPrice districtNewPrice = districtNewPriceService.findDistrictStatByWeekend(districtKey, date); @@ -2800,7 +2800,7 @@ public class FshController { result.setCityDistrictMaxSellPrice(maxS); } - // 最新均价,任务周六跑,需要得到周六后一天的时间,均价再周五计算完成,如果后一天没数据就取上周的 + // 鏈�鏂板潎浠�,浠诲姟鍛ㄥ叚璺戯紝闇�瑕佸緱鍒板懆鍏悗涓�澶╃殑鏃堕棿锛屽潎浠峰啀鍛ㄤ簲璁$畻瀹屾垚锛屽鏋滃悗涓�澶╂病鏁版嵁灏卞彇涓婂懆鐨� Date d = DateUtil.getFirstDayOfWeek(new Date()); Calendar ca = Calendar.getInstance(); ca.setTime(d); @@ -2818,7 +2818,7 @@ public class FshController { result.setAvgPrice(avgPrice); result.setLastWeekendMarkup(districtStat.getWeekendMarkup()); } - // 无小区均价则是别墅,取别墅价格 + // 鏃犲皬鍖哄潎浠峰垯鏄埆澧咃紝鍙栧埆澧呬环鏍� if (result.getAvgPrice() == 0 && districtStatBo != null && districtStatBo.getVillaDistrictStat() != null) { avgPrice = districtStatBo.getVillaDistrictStat().getAvgPrice(); result.setAvgPrice(avgPrice); @@ -2832,7 +2832,7 @@ public class FshController { } - // 上月均价 + // 涓婃湀鍧囦环 int topMonthPrice = 0; DistrictSellStat sellStat = districtSellStatService.findByYearMonth(district.getCity(), district.getRegion(), district.getName(), Integer.parseInt(DateUtil.formatByPattern(DateUtil.addMonthToDate(new Date(), -1), "yyyyMM"))); @@ -2841,7 +2841,7 @@ public class FshController { result.setTopMonthAvgPrice(sellStat.getAvgPrice()); } - // 年涨跌幅 + // 骞存定璺屽箙 List districtsSellStats = districtSellStatService.getAllWithMonths(district.getCity(), district.getRegion(), district.getName(), 12); if (districtsSellStats != null && districtsSellStats.size() > 0) { DistrictSellStat districtSellStat = districtsSellStats.get(0); @@ -2850,7 +2850,7 @@ public class FshController { } } - // 近30天涨跌幅 + // 杩�30澶╂定璺屽箙 Date topWeek = DateUtil.getFirstDayOfWeek(date); Date top2Week = DateUtil.getFirstDayOfWeek(topWeek); Date top3Week = DateUtil.getFirstDayOfWeek(top2Week); @@ -2864,7 +2864,7 @@ public class FshController { } - // 流动性评级得分 + // 娴佸姩鎬ц瘎绾у緱鍒� EvaluationBeforeLoanDto dto = new EvaluationBeforeLoanDto(); dto.setTotalPrice(avgPrice * 100L); CollateralEvaluationInfoModel collModel = new CollateralEvaluationInfoModel(); @@ -2874,7 +2874,7 @@ public class FshController { double totalScore = buildHandleLevel(dto, collModel, districtAnalyData, district); result.setTotalScore(totalScore); - //过去一年 + //杩囧幓涓�骞� List boList = districtStatService.findDistrictStatRangDate(districtKey,DateUtil.getThisWeekInLastYear(),null); if(boList!=null && boList.size()>0){ if(boList.get(0).getDistrictStat()==null){ @@ -2896,7 +2896,7 @@ public class FshController { result.setPriceRate(Double.parseDouble(districtPriceMap.get("priceRate").toString())); } - //求资产等级 + //姹傝祫浜х瓑绾� if(districtAnalyData!=null&&districtAnalyData.getCityRank()!=null&&districtAnalyData.getCityRankTotal()!=null){ Integer cityRank = districtAnalyData.getCityRank(); Integer cityRankTotal = districtAnalyData.getCityRankTotal(); @@ -2909,7 +2909,7 @@ public class FshController { } /** - * 获取小区涨跌幅在城市中排名 + * 鑾峰彇灏忓尯娑ㄨ穼骞呭湪鍩庡競涓帓鍚� * @return */ private Double getUpDownRangecityLevel(DistrictAnalyData districtAnalyData, int avgPrice) { @@ -2923,7 +2923,7 @@ public class FshController { } } - //没有小区年涨幅的时候用区域的代替 + //娌℃湁灏忓尯骞存定骞呯殑鏃跺�欑敤鍖哄煙鐨勪唬鏇� if (increaseRate.equals(0D)) { Double regionYoy = null; List regionStatTrends = regionStatTrendService.getAllWithMonths(districtAnalyData.getCity(), districtAnalyData.getRegion(), 12); @@ -2938,9 +2938,9 @@ public class FshController { } } - //还没的话就用均价相似小区的代替 + //杩樻病鐨勮瘽灏辩敤鍧囦环鐩镐技灏忓尯鐨勪唬鏇� if (increaseRate.equals(0D)) { - //小区均价的80%-120%取均价最相近的小区 + //灏忓尯鍧囦环鐨�80%-120%鍙栧潎浠锋渶鐩歌繎鐨勫皬鍖� List dataList = districtAnalyDataService.findSimilarDistrict(districtAnalyData.getCity(),districtAnalyData.getRegion(),(int)(avgPrice*0.8),(int)(avgPrice*1.2)); orderDistrictDataList(dataList,avgPrice); if (dataList != null && dataList.size() > 0) { @@ -2951,11 +2951,11 @@ public class FshController { } } - //价格排名 + //浠锋牸鎺掑悕 return increaseRate < 0 ? 0 : increaseRate; } - private int getSDate(Date date,int n) {//获取n月后(负数向前,结果为:年+月数字 201711) + private int getSDate(Date date,int n) {//鑾峰彇n鏈堝悗锛堣礋鏁板悜鍓嶏紝缁撴灉涓猴細骞�+鏈堟暟瀛� 201711锛� Calendar c = Calendar.getInstance(); c.setTime(date); c.add(Calendar.MONTH, n); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/GdBankController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/GdBankController.java index f27802fc1..02b61535d 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/GdBankController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/GdBankController.java @@ -13,26 +13,26 @@ import java.util.HashMap; import java.util.Map; /** - * 光大接口 + * 鍏夊ぇ鎺ュ彛 */ @Authority(role = Role.USER) public class GdBankController { private static final Map areaMap = new HashMap() { { - // 添加键值对到 Map 中 - put("111", "主城区"); - put("112", "城乡结合区"); - put("121", "镇中心区"); - put("122", "镇乡结合区"); - put("123", "特殊区域"); - put("210", "乡中心区"); - put("220", "村庄"); + // 娣诲姞閿�煎鍒� Map 涓� + put("111", "涓诲煄鍖�"); + put("112", "鍩庝埂缁撳悎鍖�"); + put("121", "闀囦腑蹇冨尯"); + put("122", "闀囦埂缁撳悎鍖�"); + put("123", "鐗规畩鍖哄煙"); + put("210", "涔′腑蹇冨尯"); + put("220", "鏉戝簞"); } }; /** - * 判断所属区域 + * 鍒ゆ柇鎵�灞炲尯鍩� * * @param map * @return @@ -41,36 +41,36 @@ public class GdBankController { if (map.get("verifyFlag") == null) { return ""; } - if (map.get("verifyFlag").equals("非农")) { - return "城市区域"; + if (map.get("verifyFlag").equals("闈炲啘")) { + return "鍩庡競鍖哄煙"; } - if (map.get("verifyFlag").equals("农")) { - return "农村区域"; + if (map.get("verifyFlag").equals("鍐�")) { + return "鍐滄潙鍖哄煙"; } - if ("2".equals(type) && "是".equals(map.get("countyGov"))) { - return "县城城区"; + if ("2".equals(type) && "鏄�".equals(map.get("countyGov"))) { + return "鍘垮煄鍩庡尯"; } return ""; } /** - * 判断县级市 + * 鍒ゆ柇鍘跨骇甯� */ public String countyLevelCity(Map map) { if (map.get("city") == null) { return ""; } - if (map.get("city").endsWith("区")) { - return "否"; + if (map.get("city").endsWith("鍖�")) { + return "鍚�"; } - if (map.get("city").equals("东莞市") || map.get("city").equals("嘉峪关市") || map.get("city").equals("中山市") || map.get("city").equals("儋州市")) { - return "否"; + if (map.get("city").equals("涓滆帪甯�") || map.get("city").equals("鍢夊唱鍏冲競") || map.get("city").equals("涓北甯�") || map.get("city").equals("鍎嬪窞甯�")) { + return "鍚�"; } - return "是"; + return "鏄�"; } /** - * 涉农识别-新规则-光大银行对公识别接口 + * 娑夊啘璇嗗埆-鏂拌鍒�-鍏夊ぇ閾惰瀵瑰叕璇嗗埆鎺ュ彛 * * @param model * @return @@ -79,7 +79,7 @@ public class GdBankController { RestfulModelAndView mav = new RestfulModelAndView(); if (StringUtils.isBlank(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍦板潃涓嶈兘涓虹┖")); return mav; } @@ -110,7 +110,7 @@ public class GdBankController { } mav.setModel(basicModel); } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("鏈嶅姟鍗囩骇涓�...")); } return mav; } 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 d4f0a3311..9184e412f 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 @@ -31,7 +31,7 @@ import com.fangjia.service.mongo.fangjia.GuzhiService; import com.fangjia.service.sms.SmsService; /** - * 人工估值接口Controller + * 浜哄伐浼板�兼帴鍙ontroller */ @Authority(role = Role.USER) public class GuzhiController { @@ -99,7 +99,7 @@ public class GuzhiController { RestfulModelAndView mv = new RestfulModelAndView(); if(model.getMaxFloor() != null && model.getFloor() != null && model.getFloor() > model.getMaxFloor()){ - mv.setModel(BasicModel.buildBadRequestModel("所在楼层不能大于总楼层")); + mv.setModel(BasicModel.buildBadRequestModel("鎵�鍦ㄦゼ灞備笉鑳藉ぇ浜庢�绘ゼ灞�")); return mv; } @@ -155,19 +155,19 @@ public class GuzhiController { mv.setModel(BasicModel.buildOKModel().setResult(dto)); User user = userService.findById(token.getUserId()); - String msg = "【房价网-人工估值】客户: "+user.getDisplayName()+" 提交新的人工询价,请求请及时处理!城市:" + evaluation.getCity() - + " 区域:" + evaluation.getRegion() + " 小区名:" + evaluation.getDistrictName(); + String msg = "銆愭埧浠风綉-浜哄伐浼板�笺�戝鎴�: "+user.getDisplayName()+" 鎻愪氦鏂扮殑浜哄伐璇环锛岃姹傝鍙婃椂澶勭悊锛佸煄甯傦細" + evaluation.getCity() + + " 鍖哄煙锛�" + evaluation.getRegion() + " 灏忓尯鍚嶏細" + evaluation.getDistrictName(); DingDingMessageUtil.sendTextMessage("065f4a05d5f87eb39a9f9e048eeefb80c1f7560446f8926441de80453c160c60", msg); return mv; } - //福州农商行人工录入 + //绂忓窞鍐滃晢琛屼汉宸ュ綍鍏� public Object checkAction(@Valid GuzhiCheckModel model){ RestfulModelAndView mv = new RestfulModelAndView(); mv.setModel(BasicModel.buildOKModel()); - String msg = "【房价网-人工审查地址】接收到新的人工审查地址信息,请求请及时处理!城市:" + model.getCity()+" 区域:"+model.getDistrict() +" 小区名称:"+(model.getName()!=null?model.getName():"") - + " 产证地址:" + model.getAddress(); + String msg = "銆愭埧浠风綉-浜哄伐瀹℃煡鍦板潃銆戞帴鏀跺埌鏂扮殑浜哄伐瀹℃煡鍦板潃淇℃伅锛岃姹傝鍙婃椂澶勭悊锛佸煄甯傦細" + model.getCity()+" 鍖哄煙锛�"+model.getDistrict() +" 灏忓尯鍚嶇О锛�"+(model.getName()!=null?model.getName():"") + + " 浜ц瘉鍦板潃锛�" + model.getAddress(); DingDingMessageUtil.sendTextMessage("065f4a05d5f87eb39a9f9e048eeefb80c1f7560446f8926441de80453c160c60", msg); return mv; } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseController.java index 6906a34e4..40c797cc2 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseController.java @@ -108,37 +108,37 @@ public class HouseController { static { - ESTATE_TYPE_CODE.put("普通住宅", "1"); - ESTATE_TYPE_CODE.put("别墅", "2"); - ESTATE_TYPE_CODE.put("商住", "3"); + ESTATE_TYPE_CODE.put("鏅�氫綇瀹�", "1"); + ESTATE_TYPE_CODE.put("鍒", "2"); + ESTATE_TYPE_CODE.put("鍟嗕綇", "3"); - BULIDS_TYPE_CODE.put("多层", "10"); - BULIDS_TYPE_CODE.put("小高层", "11"); - BULIDS_TYPE_CODE.put("超高层", "12"); - BULIDS_TYPE_CODE.put("高层", "13"); - BULIDS_TYPE_CODE.put("花园洋房", "14"); - BULIDS_TYPE_CODE.put("老洋房", "15"); - BULIDS_TYPE_CODE.put("四合院", "16"); - BULIDS_TYPE_CODE.put("独栋", "17"); - BULIDS_TYPE_CODE.put("双拼", "18"); - BULIDS_TYPE_CODE.put("联排", "19"); - BULIDS_TYPE_CODE.put("叠加", "20"); + BULIDS_TYPE_CODE.put("澶氬眰", "10"); + BULIDS_TYPE_CODE.put("灏忛珮灞�", "11"); + BULIDS_TYPE_CODE.put("瓒呴珮灞�", "12"); + BULIDS_TYPE_CODE.put("楂樺眰", "13"); + BULIDS_TYPE_CODE.put("鑺卞洯娲嬫埧", "14"); + BULIDS_TYPE_CODE.put("鑰佹磱鎴�", "15"); + BULIDS_TYPE_CODE.put("鍥涘悎闄�", "16"); + BULIDS_TYPE_CODE.put("鐙爧", "17"); + BULIDS_TYPE_CODE.put("鍙屾嫾", "18"); + BULIDS_TYPE_CODE.put("鑱旀帓", "19"); + BULIDS_TYPE_CODE.put("鍙犲姞", "20"); - DIRECTION_CODE.put("西北", "1"); - DIRECTION_CODE.put("北", "1"); - DIRECTION_CODE.put("东", "2"); - DIRECTION_CODE.put("西", "2"); - DIRECTION_CODE.put("东西", "2"); - DIRECTION_CODE.put("南", "3"); - DIRECTION_CODE.put("东南", "3"); - DIRECTION_CODE.put("南北", "3"); - DIRECTION_CODE.put("东北", "4"); - DIRECTION_CODE.put("西南", "5"); + DIRECTION_CODE.put("瑗垮寳", "1"); + DIRECTION_CODE.put("鍖�", "1"); + DIRECTION_CODE.put("涓�", "2"); + DIRECTION_CODE.put("瑗�", "2"); + DIRECTION_CODE.put("涓滆タ", "2"); + DIRECTION_CODE.put("鍗�", "3"); + DIRECTION_CODE.put("涓滃崡", "3"); + DIRECTION_CODE.put("鍗楀寳", "3"); + DIRECTION_CODE.put("涓滃寳", "4"); + DIRECTION_CODE.put("瑗垮崡", "5"); - FITMENT_CODE.put("毛坯", "1"); - FITMENT_CODE.put("简装", "1"); - FITMENT_CODE.put("精装", "2"); - FITMENT_CODE.put("全装修", "3"); + FITMENT_CODE.put("姣涘澂", "1"); + FITMENT_CODE.put("绠�瑁�", "1"); + FITMENT_CODE.put("绮捐", "2"); + FITMENT_CODE.put("鍏ㄨ淇�", "3"); } @@ -160,14 +160,14 @@ public class HouseController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (model.getImage() == null || model.getImage().length == 0) { - mav.setModel(BasicModel.buildBadRequestModel("图片不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍥剧墖涓嶈兘涓虹┖")); return mav; } MultipartFile[] images = model.getImage(); for (int i = 0; i < images.length; i++) { MultipartFile img = images[i]; if (img.getSize() > MAX_PIC_SIZE) { - mav.setModel(BasicModel.buildBadRequestModel("图片过大")); + mav.setModel(BasicModel.buildBadRequestModel("鍥剧墖杩囧ぇ")); return mav; } } @@ -177,19 +177,19 @@ public class HouseController { House house = createHouse(model, Integer.valueOf(userId)); if (StringUtils.isNotBlank(house.getId())) { if (StringUtils.isBlank(model.getId()) || !ObjectId.isValid(model.getId())) { - mav.setModel(BasicModel.buildBadRequestModel("房源id不合法")); + mav.setModel(BasicModel.buildBadRequestModel("鎴挎簮id涓嶅悎娉�")); return mav; } House dbHouse = houseService.findHouseById(model.getId()); if (dbHouse == null) { - mav.setModel(BasicModel.buildBadRequestModel("房源不存在")); + mav.setModel(BasicModel.buildBadRequestModel("鎴挎簮涓嶅瓨鍦�")); return mav; } if (!userId.equals(dbHouse.getUserId().toString())) { - mav.setModel(BasicModel.buildUnAuthorizedModel().setMsg("你没有权限修改该房源")); + mav.setModel(BasicModel.buildUnAuthorizedModel().setMsg("浣犳病鏈夋潈闄愪慨鏀硅鎴挎簮")); return mav; } - for (String pic : dbHouse.getPics()) {//删除过时的房源图片 + for (String pic : dbHouse.getPics()) {//鍒犻櫎杩囨椂鐨勬埧婧愬浘鐗� fileDao.delete(pic, "user_house", "o"); fileDao.delete(pic, "user_house", "s"); fileDao.delete(pic, "user_house", "m"); @@ -237,8 +237,8 @@ public class HouseController { District district = querys.get(0).getProperty(); if (district != null) { sample.setHouseUseLimit(DataUtil.extractPrice(district.getPropertyLife())); - if (sample.getHouseUseLimit() == null && !Arrays.asList("成都", "重庆").contains(district.getCity())) { - if (district.getEstateType2() != null && district.getEstateType2().contains("商住")) { + if (sample.getHouseUseLimit() == null && !Arrays.asList("鎴愰兘", "閲嶅簡").contains(district.getCity())) { + if (district.getEstateType2() != null && district.getEstateType2().contains("鍟嗕綇")) { sample.setHouseUseLimit(50); } else { sample.setHouseUseLimit(70); @@ -261,7 +261,7 @@ public class HouseController { /** - * 商铺相似房源接口 + * 鍟嗛摵鐩镐技鎴挎簮鎺ュ彛 */ @Authority(role = Role.USER) public Object shopSimilarAction(@Valid ShopCollateralSampleQuery query) { @@ -270,7 +270,7 @@ public class HouseController { BeanUtils.copyProperties(query, queryBean); FangjiaOfficialAreaMap fangjiaOfficialAreaMap = fangjiaOfficialAreaService.convertOfficialCodeToFangjia(queryBean.getDistrict()); if (fangjiaOfficialAreaMap == null) { - String msg = "地区信息无法映射到房价网的地区信息->(province:" + queryBean.getProvince() + " ,city: " + queryBean.getCity() + " ,district: " + queryBean.getDistrict() + ")"; + String msg = "鍦板尯淇℃伅鏃犳硶鏄犲皠鍒版埧浠风綉鐨勫湴鍖轰俊鎭�->(province:" + queryBean.getProvince() + " ,city: " + queryBean.getCity() + " ,district: " + queryBean.getDistrict() + ")"; mav.setModel(BasicModel.buildBadRequestModel(msg)); return mav; } @@ -278,7 +278,7 @@ public class HouseController { queryBean.setFangjiaDistrict(fangjiaOfficialAreaMap.getFangjiaDistrict()); District property = districtService.findByNameAndAlias(queryBean.getFangjiaCity(), queryBean.getFangjiaDistrict(), queryBean.getBuildingName(), "shop"); if (property == null) { - mav.setModel(BasicModel.buildBadRequestModel("未找到该商铺")); + mav.setModel(BasicModel.buildBadRequestModel("鏈壘鍒拌鍟嗛摵")); return mav; } queryBean.setProperty(property); @@ -299,26 +299,26 @@ public class HouseController { if(StringUtils.isNotBlank(q.getDistrict())){ FangjiaOfficialAreaMap fangjiaOfficialAreaMap = fangjiaOfficialAreaService.convertOfficialCodeToFangjia(q.getDistrict()); if (fangjiaOfficialAreaMap == null) { - throw new Exception("地区信息无法映射到房价网的地区信息->(province:" + q.getProvince() + " ,city: " + q.getCity() + " ,district: " + q.getDistrict() + ")"); + throw new Exception("鍦板尯淇℃伅鏃犳硶鏄犲皠鍒版埧浠风綉鐨勫湴鍖轰俊鎭�->(province:" + q.getProvince() + " ,city: " + q.getCity() + " ,district: " + q.getDistrict() + ")"); } queryBean.setFangjiaCity(fangjiaOfficialAreaMap.getFangjiaCity()); queryBean.setFangjiaDistrict(fangjiaOfficialAreaMap.getFangjiaDistrict()); }else{ FangjiaOfficialAreaMap fangjiaOfficialAreaMap = fangjiaOfficialAreaService.convertOfficialCodeToFangjiaCity(q.getCity()); if(fangjiaOfficialAreaMap == null){ - throw new Exception("地区信息无法映射到房价网的地区信息->(province:" + q.getProvince() + " ,city: " + q.getCity()); + throw new Exception("鍦板尯淇℃伅鏃犳硶鏄犲皠鍒版埧浠风綉鐨勫湴鍖轰俊鎭�->(province:" + q.getProvince() + " ,city: " + q.getCity()); } queryBean.setFangjiaCity(fangjiaOfficialAreaMap.getFangjiaCity()); } String propertyTypeCode = queryBean.getPropertyTypeCode(); if (!PROPERTY_TYPE_CODE_LIST.contains(propertyTypeCode)) { - throw new Exception("propertyTypeCode取值非法"); + throw new Exception("propertyTypeCode鍙栧�奸潪娉�"); } String cat = "district"; District property = districtService.findByNameAndAlias(queryBean.getFangjiaCity(), queryBean.getFangjiaDistrict(), queryBean.getBuildingName(), cat); if (property == null) { - throw new Exception("未找到该小区"); + throw new Exception("鏈壘鍒拌灏忓尯"); } queryBean.setProperty(property); Integer decrCondCode = queryBean.getDecrCondCode(); @@ -326,14 +326,14 @@ public class HouseController { decrCondCode = 2; } if (decrCondCode > 5 || decrCondCode < 1) { - throw new Exception("decrCondCode取值非法"); + throw new Exception("decrCondCode鍙栧�奸潪娉�"); } Integer towardDirectCode = queryBean.getTowardDirectCode(); if (towardDirectCode == null) { towardDirectCode = 3; } if (towardDirectCode > 10 || towardDirectCode < 1) { - throw new Exception("towardDirectCode取值非法"); + throw new Exception("towardDirectCode鍙栧�奸潪娉�"); } queryBeans.add(queryBean); } @@ -350,14 +350,14 @@ public class HouseController { BeanUtils.copyProperties(q, queryBean); // String propertyTypeCode = queryBean.getPropertyTypeCode(); // if(!Arrays.asList("01", "02", "03").contains(propertyTypeCode)){ -// throw new Exception("propertyTypeCode取值非法"); +// throw new Exception("propertyTypeCode鍙栧�奸潪娉�"); // } String cat = "district"; if (StringUtils.isNotBlank(queryBean.getCity()) && StringUtils.isNotBlank(queryBean.getDistrict()) && StringUtils.isNotBlank(queryBean.getBuildingName())) { District property = districtService.findByNameAndAlias(queryBean.getCity(), queryBean.getDistrict(), queryBean.getBuildingName(), cat); if (property == null) { - throw new Exception("未找到该小区"); + throw new Exception("鏈壘鍒拌灏忓尯"); } queryBean.setProperty(property); } else if (StringUtils.isNotBlank(queryBean.getAddress())) { @@ -368,27 +368,27 @@ public class HouseController { params.put("city", queryBean.getCity()); params.put("address", address); params.put("category", "property"); - //新匹配接口 + //鏂板尮閰嶆帴鍙� json = request.getJsonContent("http://192.168.0.100:32080/FangJiaNlpService/match", params, "UTF-8"); if (json != null && json.size() > 0) { MatchedBuildingDto dto = CommonDtoUtils.transformV(MatchedBuildingDto.class, json); District property = districtService.findByNameAndAlias(dto.getCity(), dto.getDistrict(), dto.getName(), cat); if (property == null) { - throw new Exception("未找到该小区"); + throw new Exception("鏈壘鍒拌灏忓尯"); } queryBean.setProperty(property); } else { - throw new Exception("未找到该小区"); + throw new Exception("鏈壘鍒拌灏忓尯"); } } String estateType = queryBean.getProperty().getEstateType2(); queryBean.setPropertyTypeCode("01"); if (StringUtils.isNotBlank(estateType)) { - if (estateType.equals("普通住宅")) { + if (estateType.equals("鏅�氫綇瀹�")) { queryBean.setPropertyTypeCode("01"); - } else if (estateType.equals("别墅")) { + } else if (estateType.equals("鍒")) { queryBean.setPropertyTypeCode("02"); - } else if (estateType.equals("商住")) { + } else if (estateType.equals("鍟嗕綇")) { queryBean.setPropertyTypeCode("03"); } } @@ -398,14 +398,14 @@ public class HouseController { decrCondCode = 2; } if (decrCondCode > 5 || decrCondCode < 1) { - throw new Exception("decrCondCode取值非法"); + throw new Exception("decrCondCode鍙栧�奸潪娉�"); } Integer towardDirectCode = queryBean.getTowardDirectCode(); if (towardDirectCode == null) { towardDirectCode = 3; } if (towardDirectCode > 10 || towardDirectCode < 1) { - throw new Exception("towardDirectCode取值非法"); + throw new Exception("towardDirectCode鍙栧�奸潪娉�"); } queryBeans.add(queryBean); } @@ -424,12 +424,12 @@ public class HouseController { // // String propertyTypeCode = queryBean.getPropertyTypeCode(); // if(!Arrays.asList("01", "02", "03").contains(propertyTypeCode)){ -// throw new Exception("propertyTypeCode取值非法"); +// throw new Exception("propertyTypeCode鍙栧�奸潪娉�"); // } // String cat = "district"; // District property = districtService.findByNameAndAlias(queryBean.getCity(), queryBean.getDistrict(), queryBean.getBuildingName(), cat); // if(property == null){ -// throw new Exception("未找到该小区"); +// throw new Exception("鏈壘鍒拌灏忓尯"); // } // queryBean.setProperty(property); // Integer decrCondCode = queryBean.getDecrCondCode(); @@ -437,14 +437,14 @@ public class HouseController { // decrCondCode = 2; // } // if(decrCondCode > 5 || decrCondCode < 1){ -// throw new Exception("decrCondCode取值非法"); +// throw new Exception("decrCondCode鍙栧�奸潪娉�"); // } // Integer towardDirectCode = queryBean.getTowardDirectCode(); // if(towardDirectCode == null){ // towardDirectCode = 3; // } // if(towardDirectCode > 10 || towardDirectCode < 1){ -// throw new Exception("towardDirectCode取值非法"); +// throw new Exception("towardDirectCode鍙栧�奸潪娉�"); // } // queryBeans.add(queryBean); // } @@ -455,22 +455,22 @@ public class HouseController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(model.getId())) { - mav.setModel(BasicModel.buildBadRequestModel("房源id不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鎴挎簮id涓嶈兘涓虹┖")); return mav; } if (StringUtils.isBlank(model.getId()) || !ObjectId.isValid(model.getId())) { - mav.setModel(BasicModel.buildBadRequestModel("房源id不合法")); + mav.setModel(BasicModel.buildBadRequestModel("鎴挎簮id涓嶅悎娉�")); return mav; } House dbHouse = houseService.findHouseById(model.getId()); if (dbHouse == null || dbHouse.getStatus() == HOUSE_DELETE_STATUS) { - mav.setModel(BasicModel.buildBadRequestModel("房源不存在")); + mav.setModel(BasicModel.buildBadRequestModel("鎴挎簮涓嶅瓨鍦�")); return mav; } Map tokenMap = FangjiaApiUtil.parseToken(model.getToken()); String userId = tokenMap.get("userid"); if (dbHouse.getUserId() == null || !userId.equals(dbHouse.getUserId().toString())) { - mav.setModel(BasicModel.buildUnAuthorizedModel().setMsg("你没有权限访问该房源")); + mav.setModel(BasicModel.buildUnAuthorizedModel().setMsg("浣犳病鏈夋潈闄愯闂鎴挎簮")); return mav; } mav.setModel(BasicModel.buildOKModel().setResult(new HouseDto(dbHouse))); @@ -481,26 +481,26 @@ public class HouseController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(model.getId())) { - mav.setModel(BasicModel.buildBadRequestModel("房源id不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鎴挎簮id涓嶈兘涓虹┖")); return mav; } if (StringUtils.isBlank(model.getId()) || !ObjectId.isValid(model.getId())) { - mav.setModel(BasicModel.buildBadRequestModel("房源id不合法")); + mav.setModel(BasicModel.buildBadRequestModel("鎴挎簮id涓嶅悎娉�")); return mav; } House dbHouse = houseService.findHouseById(model.getId()); if (dbHouse == null || dbHouse.getStatus() == HOUSE_DELETE_STATUS) { - mav.setModel(BasicModel.buildBadRequestModel("房源不存在")); + mav.setModel(BasicModel.buildBadRequestModel("鎴挎簮涓嶅瓨鍦�")); return mav; } Map tokenMap = FangjiaApiUtil.parseToken(model.getToken()); String userId = tokenMap.get("userid"); if (dbHouse.getUserId() == null || !userId.equals(dbHouse.getUserId().toString())) { - mav.setModel(BasicModel.buildUnAuthorizedModel().setMsg("你没有权限删除该房源")); + mav.setModel(BasicModel.buildUnAuthorizedModel().setMsg("浣犳病鏈夋潈闄愬垹闄よ鎴挎簮")); return mav; } houseService.deleteHouse(dbHouse.getId()); - mav.setModel(BasicModel.buildOKModel().setMsg("删除成功")); + mav.setModel(BasicModel.buildOKModel().setMsg("鍒犻櫎鎴愬姛")); return mav; } @@ -508,30 +508,30 @@ public class HouseController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(model.getId())) { - mav.setModel(BasicModel.buildBadRequestModel("房源id不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鎴挎簮id涓嶈兘涓虹┖")); return mav; } if (StringUtils.isBlank(model.getId()) || !ObjectId.isValid(model.getId())) { - mav.setModel(BasicModel.buildBadRequestModel("房源id不合法")); + mav.setModel(BasicModel.buildBadRequestModel("鎴挎簮id涓嶅悎娉�")); return mav; } House dbHouse = houseService.findHouseById(model.getId()); if (dbHouse == null || dbHouse.getStatus() == HOUSE_DELETE_STATUS) { - mav.setModel(BasicModel.buildBadRequestModel("房源不存在")); + mav.setModel(BasicModel.buildBadRequestModel("鎴挎簮涓嶅瓨鍦�")); return mav; } Map tokenMap = FangjiaApiUtil.parseToken(model.getToken()); String userId = tokenMap.get("userid"); if (dbHouse.getUserId() == null || !userId.equals(dbHouse.getUserId().toString())) { - mav.setModel(BasicModel.buildUnAuthorizedModel().setMsg("你没有权限删除该房源")); + mav.setModel(BasicModel.buildUnAuthorizedModel().setMsg("浣犳病鏈夋潈闄愬垹闄よ鎴挎簮")); return mav; } boolean refresh = houseService.refreshHouse(dbHouse.getId(), Integer.valueOf(userId), "api"); if (!refresh) { - mav.setModel(BasicModel.buildOKModel().setMsg("每天只能刷新一次房源")); + mav.setModel(BasicModel.buildOKModel().setMsg("姣忓ぉ鍙兘鍒锋柊涓�娆℃埧婧�")); return mav; } else { - mav.setModel(BasicModel.buildOKModel().setMsg("刷新成功")); + mav.setModel(BasicModel.buildOKModel().setMsg("鍒锋柊鎴愬姛")); return mav; } } @@ -540,7 +540,7 @@ public class HouseController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(model.getId()) && (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getRegion()) || StringUtils.isBlank(model.getName()))) { - mav.setModel(BasicModel.buildBadRequestModel("楼盘编号或城市,区域,名称为必填项")); + mav.setModel(BasicModel.buildBadRequestModel("妤肩洏缂栧彿鎴栧煄甯�,鍖哄煙锛屽悕绉颁负蹇呭~椤�")); return mav; } District district = null; @@ -556,7 +556,7 @@ public class HouseController { } if (district == null) { - mav.setModel(BasicModel.buildBadRequestModel("该小区不存在")); + mav.setModel(BasicModel.buildBadRequestModel("璇ュ皬鍖轰笉瀛樺湪")); return mav; } DistrictStatBo bo = districtStatService.findCurrentDistrictStat(districtKey); @@ -586,7 +586,7 @@ public class HouseController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(model.getId()) && (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getRegion()) || StringUtils.isBlank(model.getName()))) { - mav.setModel(BasicModel.buildBadRequestModel("楼盘编号或城市,区域,名称为必填项")); + mav.setModel(BasicModel.buildBadRequestModel("妤肩洏缂栧彿鎴栧煄甯�,鍖哄煙锛屽悕绉颁负蹇呭~椤�")); return mav; } District district = null; @@ -602,11 +602,11 @@ public class HouseController { } if (district == null) { - mav.setModel(BasicModel.buildBadRequestModel("该小区不存在")); + mav.setModel(BasicModel.buildBadRequestModel("璇ュ皬鍖轰笉瀛樺湪")); return mav; } - //周边小区,默认10 + //鍛ㄨ竟灏忓尯锛岄粯璁�10 List districts = districtService.findNearestDistrict(district, 1000, model.getDistCount()); List houses = new ArrayList(); for (District dist : districts) { @@ -662,7 +662,7 @@ public class HouseController { house.setAddress(model.getAddress()); house.setName(model.getTitle()); house.setDescription(model.getDescription()); - house.setBuildDate(model.getBuildDate() == null ? null : (model.getBuildDate().toString() + "年")); + house.setBuildDate(model.getBuildDate() == null ? null : (model.getBuildDate().toString() + "骞�")); house.setContactPeople(model.getContactPerson()); house.setMobile(model.getMobile()); house.setFloor(model.getFloor()); @@ -691,7 +691,7 @@ public class HouseController { Map resMap = new LinkedHashMap(); if (StringUtils.isBlank(model.getCity()) || model.getTotalPrice() == null) { - mav.setModel(BasicModel.buildBadRequestModel("必填参数错误")); + mav.setModel(BasicModel.buildBadRequestModel("蹇呭~鍙傛暟閿欒")); return mav; } else { double[] compArrs = compareTotalPrice(model.getCity(), model.getTotalPrice()); @@ -745,7 +745,7 @@ public class HouseController { int baseGreaterThan = 0; Value inthisValue = null; - //房源的最大最小值 + //鎴挎簮鐨勬渶澶ф渶灏忓�� Integer[] extrmeValue = houseService.findExtremeTotalPrice(city, null); if (extrmeValue == null) { return null; @@ -806,28 +806,28 @@ public class HouseController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(model.getResidenceId())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "小区ID(residenceId)不能为空")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "灏忓尯ID(residenceId)涓嶈兘涓虹┖")); return mav; } if (StringUtils.isNotBlank(model.getFloor()) && !StringUtil.isInteger(model.getFloor())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "楼层(floor)必须是数字")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "妤煎眰(floor)蹇呴』鏄暟瀛�")); return mav; } if (StringUtils.isNotBlank(model.getHouseNo()) && !StringUtil.isInteger(model.getUnitNo())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "楼号((unitNo)必须是数字")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "妤煎彿((unitNo)蹇呴』鏄暟瀛�")); return mav; } if (model.getSize() == null) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "请输入房屋面积(size)")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "璇疯緭鍏ユ埧灞嬮潰绉�(size)")); return mav; } if (StringUtils.isBlank(model.getEstateType())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "请输入物业类型编码(estateType)")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "璇疯緭鍏ョ墿涓氱被鍨嬬紪鐮�(estateType)")); return mav; } else { String estateType = getEstateType(model.getEstateType()); if (estateType == null) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "请输入正确的物业类型编码")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "璇疯緭鍏ユ纭殑鐗╀笟绫诲瀷缂栫爜")); return mav; } model.setEstateType(estateType); @@ -835,7 +835,7 @@ public class HouseController { if (StringUtils.isNotBlank(model.getBuildingType())) { String buildingType = getBulidType(model.getBuildingType()); if (buildingType == null) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "请输入正确的建筑类型编码")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "璇疯緭鍏ユ纭殑寤虹瓚绫诲瀷缂栫爜")); return mav; } else { model.setBuildingType(buildingType); @@ -843,24 +843,24 @@ public class HouseController { } District district = districtService.findById(model.getResidenceId(), INCLUDE_DISTRICT_FIELDS); if (district == null) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "没有找到相关的楼盘:小区已删除")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "娌℃湁鎵惧埌鐩稿叧鐨勬ゼ鐩�:灏忓尯宸插垹闄�")); return mav; } Date endDate = getLatestStatIndex(district.getCity()); if (endDate == null) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "没有找到相关的楼盘:不存在小区所在城市的指数数据")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "娌℃湁鎵惧埌鐩稿叧鐨勬ゼ鐩�:涓嶅瓨鍦ㄥ皬鍖烘墍鍦ㄥ煄甯傜殑鎸囨暟鏁版嵁")); return mav; } - // 组装数据 + // 缁勮鏁版嵁 Map resMap = new LinkedHashMap(); FacetQueryResult houseBoList = new FacetQueryResult(); resMap.put("city", DistrictCodeUtils.getCityCode(district.getCity())); resMap.put("region", district.getRegion()); resMap.put("name", district.getName()); - // 查房源 + // 鏌ユ埧婧� FacetQueryResult houseList = findDistrictHouses(district, null); boolean showDetail = false; if (model.getShowDetail() != null && model.getShowDetail().booleanValue() == true) { @@ -872,7 +872,7 @@ public class HouseController { if (HouseValidator.validateEstateType(model.getEstateType())) { district.setEstateType2(model.getEstateType()); } - List districts = districtService.findSimilarityDistrict(district, 1000, 3);// 查找一公里以内相似的小区 + List districts = districtService.findSimilarityDistrict(district, 1000, 3);// 鏌ユ壘涓�鍏噷浠ュ唴鐩镐技鐨勫皬鍖� for (District d : districts) { d = districtService.findById(d.getId(), INCLUDE_DISTRICT_FIELDS); if (getRemainUseYear(district) == null) { @@ -913,53 +913,53 @@ public class HouseController { String region = model.getRegion(); String districtName = model.getName(); if (StringUtils.isNotBlank(districtName) && (StringUtils.isBlank(city) || StringUtils.isBlank(region))) { - mav.setModel(BasicModel.buildBadRequestModel("city,region,name为一组参数")); + mav.setModel(BasicModel.buildBadRequestModel("city,region,name涓轰竴缁勫弬鏁�")); return mav; } if (StringUtils.isNotBlank(model.getLocationType()) && !type3.contains(model.getLocationType())) { - mav.setModel(BasicModel.buildBadRequestModel("参数(locationType)有误")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟(locationType)鏈夎")); return mav; } if (StringUtils.isNotBlank(model.getPropertyType()) && !type3.contains(model.getPropertyType())) { - mav.setModel(BasicModel.buildBadRequestModel("参数(propertyType)有误")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟(propertyType)鏈夎")); return mav; } if (StringUtils.isNotBlank(model.getHouseType()) && !type2.contains(model.getHouseType())) { - mav.setModel(BasicModel.buildBadRequestModel("参数(houseType)有误")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟(houseType)鏈夎")); return mav; } - // 获取当前日期 + // 鑾峰彇褰撳墠鏃ユ湡 Calendar today = Calendar.getInstance(); - // 复制一份当前日期,用于计算半年前的日期 + // 澶嶅埗涓�浠藉綋鍓嶆棩鏈燂紝鐢ㄤ簬璁$畻鍗婂勾鍓嶇殑鏃ユ湡 Calendar sixMonthsAgo = (Calendar) today.clone(); - // 减去 6 个月 + // 鍑忓幓 6 涓湀 sixMonthsAgo.add(Calendar.MONTH, -6); - // 格式化日期为 yyyyMMdd + // 鏍煎紡鍖栨棩鏈熶负 yyyyMMdd int todayInt = formatDate(today); int sixMonthsAgoInt = formatDate(sixMonthsAgo); model.setStartTime(sixMonthsAgoInt); model.setEndTime(todayInt); - // 默认3000M内 + // 榛樿3000M鍐� if (model.getRadius() == null) { model.setRadius(3000); } if (StringUtils.isBlank(model.getLocation())) { - mav.setModel(BasicModel.buildBadRequestModel("location(经纬度)不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("location(缁忕含搴�)涓嶈兘涓虹┖")); return mav; } - model.setLocation(model.getLocation().replace(",", ",")); + model.setLocation(model.getLocation().replace("锛�", ",")); if (StringUtils.isBlank(model.getLocation()) || !model.getLocation().contains(",")) { - mav.setModel(BasicModel.buildBadRequestModel("location(经纬度)不能为空或格式错误")); + mav.setModel(BasicModel.buildBadRequestModel("location(缁忕含搴�)涓嶈兘涓虹┖鎴栨牸寮忛敊璇�")); return mav; } String[] locationStr = model.getLocation().split(","); - String numberPattern = "-?\\d+(\\.\\d+)?"; // 匹配整数或浮点数 + String numberPattern = "-?\\d+(\\.\\d+)?"; // 鍖归厤鏁存暟鎴栨诞鐐规暟 for (String loc : locationStr) { if (!loc.trim().matches(numberPattern)) { - mav.setModel(BasicModel.buildBadRequestModel("location(经纬度)格式错误")); + mav.setModel(BasicModel.buildBadRequestModel("location(缁忕含搴�)鏍煎紡閿欒")); return mav; } } @@ -973,7 +973,7 @@ public class HouseController { lat = gcj02Location.get("lat"); } if (lng < 70 || lng > 140 || lat < 0 || lat > 55) { - mav.setModel(BasicModel.buildBadRequestModel("非中国经纬度")); + mav.setModel(BasicModel.buildBadRequestModel("闈炰腑鍥界粡绾害")); return mav; } @@ -983,9 +983,9 @@ public class HouseController { List houseList = new ArrayList(); String[] categories = {"rent", "shop_rent", "office_rent"}; // if (cat.contains("_")) { - // 商铺,写字楼有经纬度,直接查 + // 鍟嗛摵锛屽啓瀛楁ゼ鏈夌粡绾害锛岀洿鎺ユ煡 SeawaterQuery query = new SeawaterQuery(); - // 先用名字查自身的样本 + // 鍏堢敤鍚嶅瓧鏌ヨ嚜韬殑鏍锋湰 query.setCityDisplay(city); query.setRegion(region); query.setDistrictName(districtName); @@ -1050,7 +1050,7 @@ public class HouseController { } houses.addAll(houseSelf); } - // 如果自身样本数不够,再查周边 + // 濡傛灉鑷韩鏍锋湰鏁颁笉澶燂紝鍐嶆煡鍛ㄨ竟 if (houseSelf != null && houseSelf.size() < pager.getPageSize()) { query.setRegion(null); query.setDistrictName(null); @@ -1066,7 +1066,7 @@ public class HouseController { while (iterator.hasNext()) { Seawater s = iterator.next(); if (!seenIds.add(s.getId())) { - // 如果已经存在,则从列表中移除 + // 濡傛灉宸茬粡瀛樺湪锛屽垯浠庡垪琛ㄤ腑绉婚櫎 iterator.remove(); } } @@ -1078,14 +1078,14 @@ public class HouseController { seawater.setAddress(house.getAddress()); seawater.setName(house.getDistrictName()); String name = house.getName(); - if (!"暂无数据".equals(name) && StringUtils.isNotBlank(name)) { + if (!"鏆傛棤鏁版嵁".equals(name) && StringUtils.isNotBlank(name)) { seawater.setTitle(name); } if (cat.contains("office")) { seawater.setLevel(house.getLevel()); } if (cat.contains("shop")) { - if (StringUtils.isNotBlank(house.getEstateType()) && !"其他".equals(house.getEstateType())) { + if (StringUtils.isNotBlank(house.getEstateType()) && !"鍏朵粬".equals(house.getEstateType())) { seawater.setShopType(house.getEstateType()); } if (StringUtils.isNotBlank(house.getBusinessRange())) { @@ -1117,10 +1117,10 @@ public class HouseController { seawater.setDecoration(house.getFitment()); if (house.getpDate() != null && house.getpDate() > 10000000) { String numberStr = String.valueOf(house.getpDate()); - // 拆分字符串并格式化 - String year = numberStr.substring(0, 4); // 前四位是年份 - String month = numberStr.substring(4, 6); // 中间两位是月份 - String day = numberStr.substring(6, 8); // 最后两位是日期 + // 鎷嗗垎瀛楃涓插苟鏍煎紡鍖� + String year = numberStr.substring(0, 4); // 鍓嶅洓浣嶆槸骞翠唤 + String month = numberStr.substring(4, 6); // 涓棿涓や綅鏄湀浠� + String day = numberStr.substring(6, 8); // 鏈�鍚庝袱浣嶆槸鏃ユ湡 String formattedDate = year + "-" + month + "-" + day; seawater.setPublishDate(formattedDate); } @@ -1147,7 +1147,7 @@ public class HouseController { BasicModel basicModel = new BasicModel(200, "ok"); - // 组装数据 + // 缁勮鏁版嵁 basicModel.setResult(houseList); mav.setModel(basicModel); mav.setViewType("rest"); @@ -1157,26 +1157,26 @@ public class HouseController { public Object samplesNumAction(final HouseSearchModel model){ RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); - // city region name 为必传参数 + // city region name 涓哄繀浼犲弬鏁� String city = model.getCity(); String region = model.getRegion(); String name = model.getName(); if (StringUtils.isBlank(city) || StringUtils.isBlank(region) || StringUtils.isBlank(name)) { - mav.setModel(BasicModel.buildBadRequestModel("城市(city),区域(region),小区名(name)为必填参数")); + mav.setModel(BasicModel.buildBadRequestModel("鍩庡競(city),鍖哄煙(region),灏忓尯鍚�(name)涓哄繀濉弬鏁�")); return mav; } Integer periodCount = model.getPeriodCount(); if (periodCount == null || periodCount < 0) { - mav.setModel(BasicModel.buildBadRequestModel("参数(periodCount)有误")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟(periodCount)鏈夎")); } SimpleDateFormat sdf = new SimpleDateFormat("yyyyMM"); - Calendar endCal = Calendar.getInstance(); // 当前月 + Calendar endCal = Calendar.getInstance(); // 褰撳墠鏈� int end = Integer.parseInt(sdf.format(endCal.getTime())); end = end * 100 + 31; Calendar startCal = (Calendar) endCal.clone(); - startCal.add(Calendar.MONTH, -periodCount - 5); // 往前推 periodCount-5 个月,用于计算移动平均 + startCal.add(Calendar.MONTH, -periodCount - 5); // 寰�鍓嶆帹 periodCount-5 涓湀锛岀敤浜庤绠楃Щ鍔ㄥ钩鍧� int start = Integer.parseInt(sdf.format(startCal.getTime())); start = start * 100 + 1; @@ -1185,7 +1185,7 @@ public class HouseController { if (maps != null && maps.size() > 6) { maps = maps.subList(6, maps.size()); } else { - // 如果不足5个,直接清空或者根据需求处理 + // 濡傛灉涓嶈冻5涓紝鐩存帴娓呯┖鎴栬�呮牴鎹渶姹傚鐞� maps = new ArrayList>(); } BasicModel basicModel = new BasicModel(200, "ok"); @@ -1199,29 +1199,29 @@ public class HouseController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (model.getSize() != null && model.getSize() < 0) { - mav.setModel(BasicModel.buildBadRequestModel("参数(size)有误")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟(size)鏈夎")); return mav; } if (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getDistrict()) || StringUtils.isBlank(model.getName())) { - mav.setModel(BasicModel.buildBadRequestModel("城市(city),区域(district),小区名(name)为必填参数")); + mav.setModel(BasicModel.buildBadRequestModel("鍩庡競(city),鍖哄煙(district),灏忓尯鍚�(name)涓哄繀濉弬鏁�")); return mav; } District property = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(), "district"); if (null == property) { - mav.setModel(BasicModel.buildBadRequestModel("未找到该小区")); + mav.setModel(BasicModel.buildBadRequestModel("鏈壘鍒拌灏忓尯")); return mav; } - // 获取当前日期 + // 鑾峰彇褰撳墠鏃ユ湡 Calendar today = Calendar.getInstance(); - // 复制一份当前日期,用于计算半年前的日期 + // 澶嶅埗涓�浠藉綋鍓嶆棩鏈燂紝鐢ㄤ簬璁$畻鍗婂勾鍓嶇殑鏃ユ湡 Calendar sixMonthsAgo = (Calendar) today.clone(); - // 减去 6 个月 + // 鍑忓幓 6 涓湀 sixMonthsAgo.add(Calendar.MONTH, -6); - // 格式化日期为 yyyyMMdd + // 鏍煎紡鍖栨棩鏈熶负 yyyyMMdd int todayInt = formatDate(today); int sixMonthsAgoInt = formatDate(sixMonthsAgo); model.setStartTime(sixMonthsAgoInt); @@ -1230,7 +1230,7 @@ public class HouseController { List houses = null; List houseList = new ArrayList(); // if (cat.contains("_")) { - // 商铺,写字楼有经纬度,直接查 + // 鍟嗛摵锛屽啓瀛楁ゼ鏈夌粡绾害锛岀洿鎺ユ煡 SeawaterQuery query = new SeawaterQuery(); query.setCat("rent"); query.setStartDate(model.getStartTime()); @@ -1258,7 +1258,7 @@ public class HouseController { seawater.setAddress(house.getAddress()); seawater.setName(house.getDistrictName()); String name = house.getName(); - if (!"暂无数据".equals(name) && StringUtils.isNotBlank(name)) { + if (!"鏆傛棤鏁版嵁".equals(name) && StringUtils.isNotBlank(name)) { seawater.setTitle(name); } seawater.setSize(house.getArea() == null || house.getArea() == 0 ? null : house.getArea()); @@ -1273,10 +1273,10 @@ public class HouseController { seawater.setDecoration(house.getFitment()); if (house.getpDate() != null && house.getpDate() > 10000000) { String numberStr = String.valueOf(house.getpDate()); - // 拆分字符串并格式化 - String year = numberStr.substring(0, 4); // 前四位是年份 - String month = numberStr.substring(4, 6); // 中间两位是月份 - String day = numberStr.substring(6, 8); // 最后两位是日期 + // 鎷嗗垎瀛楃涓插苟鏍煎紡鍖� + String year = numberStr.substring(0, 4); // 鍓嶅洓浣嶆槸骞翠唤 + String month = numberStr.substring(4, 6); // 涓棿涓や綅鏄湀浠� + String day = numberStr.substring(6, 8); // 鏈�鍚庝袱浣嶆槸鏃ユ湡 String formattedDate = year + "-" + month + "-" + day; seawater.setPublishDate(formattedDate); } @@ -1284,7 +1284,7 @@ public class HouseController { } } BasicModel basicModel = new BasicModel(200, "ok"); - // 组装数据 + // 缁勮鏁版嵁 basicModel.setResult(houseList); mav.setModel(basicModel); mav.setViewType("rest"); @@ -1295,30 +1295,30 @@ public class HouseController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (model.getSize() != null && model.getSize() < 0) { - mav.setModel(BasicModel.buildBadRequestModel("参数(size)有误")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟(size)鏈夎")); return mav; } if (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getDistrict()) || StringUtils.isBlank(model.getName())) { - mav.setModel(BasicModel.buildBadRequestModel("城市(city),区域(district),小区名(name)为必填参数")); + mav.setModel(BasicModel.buildBadRequestModel("鍩庡競(city),鍖哄煙(district),灏忓尯鍚�(name)涓哄繀濉弬鏁�")); return mav; } District property = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(), "district"); if (null == property) { - mav.setModel(BasicModel.buildBadRequestModel("未找到该小区")); + mav.setModel(BasicModel.buildBadRequestModel("鏈壘鍒拌灏忓尯")); return mav; } - // 没有输入时间范围,则是默认六个月的 + // 娌℃湁杈撳叆鏃堕棿鑼冨洿锛屽垯鏄粯璁ゅ叚涓湀鐨� if (model.getStartTime() == null && model.getEndTime() == null) { - // 获取当前日期 + // 鑾峰彇褰撳墠鏃ユ湡 Calendar today = Calendar.getInstance(); - // 复制一份当前日期,用于计算半年前的日期 + // 澶嶅埗涓�浠藉綋鍓嶆棩鏈燂紝鐢ㄤ簬璁$畻鍗婂勾鍓嶇殑鏃ユ湡 Calendar sixMonthsAgo = (Calendar) today.clone(); - // 减去 6 个月 + // 鍑忓幓 6 涓湀 sixMonthsAgo.add(Calendar.MONTH, -6); - // 格式化日期为 yyyyMMdd + // 鏍煎紡鍖栨棩鏈熶负 yyyyMMdd int todayInt = formatDate(today); int sixMonthsAgoInt = formatDate(sixMonthsAgo); model.setStartTime(sixMonthsAgoInt); @@ -1344,7 +1344,7 @@ public class HouseController { query.setDistrictName(model.getName()); query.setDistrictAlias(property.getAlias()); Pager pager = new Pager(); - // 没有查询数量,默认查前五个 + // 娌℃湁鏌ヨ鏁伴噺锛岄粯璁ゆ煡鍓嶄簲涓� if (model.getPageIndex() == null) { pager.setStartRow(0); } else { @@ -1373,7 +1373,7 @@ public class HouseController { seawater.setAddress(house.getAddress()); seawater.setName(house.getDistrictName()); String name = house.getName(); - if (!"暂无数据".equals(name) && StringUtils.isNotBlank(name)) { + if (!"鏆傛棤鏁版嵁".equals(name) && StringUtils.isNotBlank(name)) { seawater.setTitle(name); } seawater.setSize(house.getArea() == null || house.getArea() == 0 ? null : house.getArea()); @@ -1390,10 +1390,10 @@ public class HouseController { seawater.setRoot(house.getRoot()); if (house.getpDate() != null && house.getpDate() > 10000000) { String numberStr = String.valueOf(house.getpDate()); - // 拆分字符串并格式化 - String year = numberStr.substring(0, 4); // 前四位是年份 - String month = numberStr.substring(4, 6); // 中间两位是月份 - String day = numberStr.substring(6, 8); // 最后两位是日期 + // 鎷嗗垎瀛楃涓插苟鏍煎紡鍖� + String year = numberStr.substring(0, 4); // 鍓嶅洓浣嶆槸骞翠唤 + String month = numberStr.substring(4, 6); // 涓棿涓や綅鏄湀浠� + String day = numberStr.substring(6, 8); // 鏈�鍚庝袱浣嶆槸鏃ユ湡 String formattedDate = year + "-" + month + "-" + day; seawater.setPublishDate(formattedDate); } @@ -1406,7 +1406,7 @@ public class HouseController { query.setPager(pager); long count = seawaterDao.findSeawatersCountByQuery(query); pageModel.setTotal((int) count); - // 组装数据 + // 缁勮鏁版嵁 pageModel.setResult(houseList); mav.setModel(pageModel); mav.setViewType("rest"); @@ -1419,13 +1419,13 @@ public class HouseController { return bigDecimal.doubleValue(); } - // 格式化日期为 yyyyMMdd + // 鏍煎紡鍖栨棩鏈熶负 yyyyMMdd private static int formatDate(Calendar calendar) { int year = calendar.get(Calendar.YEAR); - int month = calendar.get(Calendar.MONTH) + 1; // 月份是从 0 开始的 + int month = calendar.get(Calendar.MONTH) + 1; // 鏈堜唤鏄粠 0 寮�濮嬬殑 int day = calendar.get(Calendar.DAY_OF_MONTH); - // 返回格式化后的整数 + // 杩斿洖鏍煎紡鍖栧悗鐨勬暣鏁� return year * 10000 + month * 100 + day; } @@ -1446,7 +1446,7 @@ public class HouseController { long start = System.currentTimeMillis(); List collaterals = czbankSampleService.findSample2(querys, sampleQuery.getMax()); long end = System.currentTimeMillis(); - System.out.println("用时:" + (end - start)); + System.out.println("鐢ㄦ椂:" + (end - start)); Collateral collateral = collaterals.get(0); List samples = collateral.getSample(); UniversalDto dto = UniversalDto.newDto(); @@ -1517,9 +1517,9 @@ public class HouseController { if (district.getBuildDate() != null || district.getFinishBuildingDate() != null || district.getLiveDate() != null || district.getOpenDate() != null) { Integer minYear = getBuildYear(district.getFinishBuildingDate(), district.getLiveDate(), district.getBuildDate(), district.getOpenDate()); if (minYear != null && minYear > 0) { - buildDate = minYear + "年"; + buildDate = minYear + "骞�"; if (getHouseUseYear(minYear, district.getPropertyLife()) != null) { - remainUseYear = getHouseUseYear(minYear, district.getPropertyLife()) + "年";// 剩余使用年限 + remainUseYear = getHouseUseYear(minYear, district.getPropertyLife()) + "骞�";// 鍓╀綑浣跨敤骞撮檺 } } } @@ -1587,7 +1587,7 @@ public class HouseController { } } - b.setPublishDate(generatorDate(endDate, house.getPublishDate()));// 发布时间 + b.setPublishDate(generatorDate(endDate, house.getPublishDate()));// 鍙戝竷鏃堕棿 b.setSource(getDomainName(house.getUrl())); b.setBlock(house.getBlock()); // b.setBlock(DateUtil.formatByPattern(house.getPublishDate(), "yyyy-MM-dd")); @@ -1669,7 +1669,7 @@ public class HouseController { } /** - * 查找小区房源 + * 鏌ユ壘灏忓尯鎴挎簮 * * @param district * @return @@ -1743,9 +1743,9 @@ public class HouseController { if (bo.getSize() != null && area != null) { score += computeAreaScore(bo.getSize(), area) * 0.98; } - if ("普通住宅".equals(model.getEstateType()) && !isVilla(bo.getName(), bo.getMaxFloor(), bo.getFloor(), bo.getSize())) { + if ("鏅�氫綇瀹�".equals(model.getEstateType()) && !isVilla(bo.getName(), bo.getMaxFloor(), bo.getFloor(), bo.getSize())) { score += 1; - } else if ("别墅".equals(model.getEstateType()) + } else if ("鍒".equals(model.getEstateType()) && isVilla(bo.getName(), bo.getMaxFloor(), bo.getFloor(), bo.getSize())) { score += 1; } @@ -1759,11 +1759,11 @@ public class HouseController { private boolean isVilla(String name, Integer maxFloor, Integer floor, Double size) { - if (name != null && name.indexOf("别墅") > -1) { + if (name != null && name.indexOf("鍒") > -1) { return true; } - if (name != null && name.indexOf("别墅") > -1 && size != null && size > 180) { + if (name != null && name.indexOf("鍒") > -1 && size != null && size > 180) { return true; } @@ -2014,13 +2014,13 @@ public class HouseController { private String getHouseType(com.fangjia.dal.datastore.model.House bo) { StringBuilder sb = new StringBuilder(); if (bo.getRoom() != null) { - sb.append(bo.getRoom() + "室"); + sb.append(bo.getRoom() + "瀹�"); } if (bo.getHall() != null) { - sb.append(bo.getHall() + "厅"); + sb.append(bo.getHall() + "鍘�"); } if (bo.getToilet() != null) { - sb.append(bo.getHall() + "卫"); + sb.append(bo.getHall() + "鍗�"); } return sb.toString(); } @@ -2108,7 +2108,7 @@ public class HouseController { } /** - * 新版token验证 + * 鏂扮増token楠岃瘉 * * @param token * @return @@ -2118,7 +2118,7 @@ public class HouseController { if (tokenMap == null) { return null; } - // token验证后,拿取出的字段再去数据库验证一遍 + // token楠岃瘉鍚庯紝鎷垮彇鍑虹殑瀛楁鍐嶅幓鏁版嵁搴撻獙璇佷竴閬� if (StringUtils.isNotBlank(tokenMap.get("userid")) && !"null".equals(tokenMap.get("userid"))) { List params = new ArrayList(); params.add(new QueryParam("ID", tokenMap.get("userid"))); @@ -2214,8 +2214,8 @@ public class HouseController { } private Integer getRemainUseYear(District district) { - if ("苏州".equals(district.getCity())) { - if ("商住".equals(district.getEstateType2())) { + if ("鑻忓窞".equals(district.getCity())) { + if ("鍟嗕綇".equals(district.getEstateType2())) { district.setPropertyLife("47"); } else { district.setPropertyLife("67"); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseImgController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseImgController.java index 161f50e80..e2ed5b76f 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseImgController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseImgController.java @@ -13,7 +13,7 @@ import java.util.List; /** * - * 房源图片 + * 鎴挎簮鍥剧墖 * @author wenyan */ public class HouseImgController { @@ -28,16 +28,16 @@ public class HouseImgController { mav.setViewType("rest"); System.out.println(model.getUrls()); if(model.getFile() == null || model.getFile().isEmpty()){ - mav.setModel(BasicModel.buildBadRequestModel("图片不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍥剧墖涓嶈兘涓虹┖")); return mav; } if (StringUtils.isBlank(model.getCat())){ - mav.setModel(BasicModel.buildBadRequestModel("图片类别不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍥剧墖绫诲埆涓嶈兘涓虹┖")); return mav; } if(!HOUSE_IMAGE_CAT.contains(model.getCat())){ - mav.setModel(BasicModel.buildBadRequestModel("图片类别不合法")); + mav.setModel(BasicModel.buildBadRequestModel("鍥剧墖绫诲埆涓嶅悎娉�")); return mav; } try{ diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HousePropertyController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HousePropertyController.java index 0d1ffab32..244d1b898 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HousePropertyController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HousePropertyController.java @@ -21,7 +21,7 @@ import org.bson.types.ObjectId; import java.util.*; /** - * 房产调查API接口 + * 鎴夸骇璋冩煡API鎺ュ彛 * Created by wenyan on 2015/3/19. */ @Authority(role = Role.USER) @@ -40,12 +40,12 @@ public class HousePropertyController { mav.setViewType("rest"); if(StringUtils.isBlank(model.getPropertyNumber())){ - mav.setModel(BasicModel.buildBadRequestModel("房产证编号(propertyNumber)不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鎴夸骇璇佺紪鍙�(propertyNumber)涓嶈兘涓虹┖")); return mav; } Map tokenMap = FangjiaApiUtil.parseToken(model.getToken()); String userName = null; - // token验证后,拿取出的字段再去数据库验证一遍 + // token楠岃瘉鍚庯紝鎷垮彇鍑虹殑瀛楁鍐嶅幓鏁版嵁搴撻獙璇佷竴閬� if (tokenMap != null && StringUtils.isNotBlank(tokenMap.get("userid"))&& !"null".equals(tokenMap.get("userid"))) { User user = userService.findById(Long.parseLong(tokenMap.get("userid"))); if(user != null){ @@ -60,7 +60,7 @@ public class HousePropertyController { task.setAddress(model.getPropertyAddress()); task.setStatus(1); task.setDateCreated(new Date()); - task.setTaskType("房产登记"); + task.setTaskType("鎴夸骇鐧昏"); BasicDBObject params = new BasicDBObject(); params.put("propertyNumber", model.getPropertyNumber()); @@ -73,12 +73,12 @@ public class HousePropertyController { Map data = new HashMap(); - data.put("taskMsg","任务提交成功"); + data.put("taskMsg","浠诲姟鎻愪氦鎴愬姛"); data.put("propertyRegisterInfoId",task.getId()); List receivers = new ArrayList(); - receivers.add("曹艺曦"); - receivers.add("王文艳"); - messengerService.sendMessage("登记注册任务","有新的登记注册任务","ApiSystem",receivers,"../registerInfo/edit?id=" + task.getId()); + receivers.add("鏇硅壓鏇�"); + receivers.add("鐜嬫枃鑹�"); + messengerService.sendMessage("鐧昏娉ㄥ唽浠诲姟","鏈夋柊鐨勭櫥璁版敞鍐屼换鍔�","ApiSystem",receivers,"../registerInfo/edit?id=" + task.getId()); BasicModel okModel = BasicModel.buildOKModel(); okModel.setResult(data); mav.setModel(okModel); @@ -91,24 +91,24 @@ public class HousePropertyController { mav.setViewType("rest"); if(StringUtils.isBlank(model.getId())){ - mav.setModel(BasicModel.buildBadRequestModel("房产登记信息编码(id)不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鎴夸骇鐧昏淇℃伅缂栫爜(id)涓嶈兘涓虹┖")); return mav; } if(StringUtils.isNotBlank(model.getId()) || !ObjectId.isValid(model.getId())){ - mav.setModel(BasicModel.buildBadRequestModel("房产登记信息编码(id)不合法")); + mav.setModel(BasicModel.buildBadRequestModel("鎴夸骇鐧昏淇℃伅缂栫爜(id)涓嶅悎娉�")); return mav; } Task task = taskService.findTaskById(model.getId()); if(task == null){ - mav.setModel(BasicModel.buildBadRequestModel("没有找到对应房产登记信息")); + mav.setModel(BasicModel.buildBadRequestModel("娌℃湁鎵惧埌瀵瑰簲鎴夸骇鐧昏淇℃伅")); return mav; } Map tokenMap = FangjiaApiUtil.parseToken(model.getToken()); String userName = null; - // token验证后,拿取出的字段再去数据库验证一遍 + // token楠岃瘉鍚庯紝鎷垮彇鍑虹殑瀛楁鍐嶅幓鏁版嵁搴撻獙璇佷竴閬� if (tokenMap != null && StringUtils.isNotBlank(tokenMap.get("userid"))&& !"null".equals(tokenMap.get("userid"))) { User user = userService.findById(Long.parseLong(tokenMap.get("userid"))); if(user != null){ @@ -117,7 +117,7 @@ public class HousePropertyController { } if(task.getUserName() != null &&!task.getUserName().equals(userName)){ - mav.setModel(BasicModel.buildUnAuthorizedModel().setMsg("你无权查看该房产登记信息")); + mav.setModel(BasicModel.buildUnAuthorizedModel().setMsg("浣犳棤鏉冩煡鐪嬭鎴夸骇鐧昏淇℃伅")); return mav; } @@ -127,20 +127,20 @@ public class HousePropertyController { okModel.setResult(result); if(task.getStatus() == 1 || task.getStatus() == 2){ result.put("status",1); - result.put("msg","房产登记信息正在调查中"); + result.put("msg","鎴夸骇鐧昏淇℃伅姝e湪璋冩煡涓�"); }else if(task.getStatus() ==3){ result.put("status",2); - result.put("msg","房产登记信息调查失败"); + result.put("msg","鎴夸骇鐧昏淇℃伅璋冩煡澶辫触"); }else if(task.getStatus() == 4){ result = task.getTaskResult(); result.put("status",0); - result.put("msg","房产登记信息调查完成"); + result.put("msg","鎴夸骇鐧昏淇℃伅璋冩煡瀹屾垚"); Date beginUseDate = (Date) result.get("beginUseDate"); Date endUseDate = (Date) result.get("endUseDate"); if(beginUseDate != null && endUseDate != null ){ result.remove("beginUseDate"); result.remove("endUseDate"); - String serviceLife = DateUtil.formatByPattern(beginUseDate, "yyyy-MM-dd") + " 至 " + String serviceLife = DateUtil.formatByPattern(beginUseDate, "yyyy-MM-dd") + " 鑷� " + DateUtil.formatByPattern(endUseDate,"yyyy-MM-dd"); result.put("serviceLife",serviceLife); } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/JnBankController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/JnBankController.java index a678283c2..70b2e697d 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/JnBankController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/JnBankController.java @@ -36,7 +36,7 @@ public class JnBankController { private DistrictService districtService; private DistrictStatService districtStatService; private JnBankDistrictService jnBankDistrictService; - private static final Pattern STAGE_PATTERN = Pattern.compile(".*[\\w东南北中西甲乙丙丁一二三四五六七八九十百千\\d]+(期|区)$"); + private static final Pattern STAGE_PATTERN = Pattern.compile(".*[\\w涓滃崡鍖椾腑瑗跨敳涔欎笝涓佷竴浜屼笁鍥涗簲鍏竷鍏節鍗佺櫨鍗僜\d]+(鏈焲鍖�)$"); @Authority(role = Role.USER) @@ -48,7 +48,7 @@ public class JnBankController { if(StringUtils.isNotBlank(model.getDISTRICT_CD())){ FangjiaOfficialAreaMap fangjiaOfficialAreaMap = fangjiaOfficialAreaService.convertOfficialCodeToFangjia(model.getDISTRICT_CD()); if(fangjiaOfficialAreaMap == null){ - mav.setModel(BasicModel.buildBadRequestModel("错误的区划编码")); + mav.setModel(BasicModel.buildBadRequestModel("閿欒鐨勫尯鍒掔紪鐮�")); return mav; } @@ -57,7 +57,7 @@ public class JnBankController { }else{ FangjiaOfficialAreaMap fangjiaOfficialAreaMap = fangjiaOfficialAreaService.convertOfficialCodeToFangjiaCity(model.getCITY_CD()); if(fangjiaOfficialAreaMap == null){ - mav.setModel(BasicModel.buildBadRequestModel("错误的城市编码")); + mav.setModel(BasicModel.buildBadRequestModel("閿欒鐨勫煄甯傜紪鐮�")); return mav; } @@ -145,7 +145,7 @@ public class JnBankController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(model.getId())) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:id为必填项")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:id涓哄繀濉」")); return mav; } @@ -153,7 +153,7 @@ public class JnBankController { if (StringUtils.isNotBlank(model.getId()) && ObjectId.isValid(model.getId())) { district = districtService.findById(model.getId()); } else { - mav.setModel(BasicModel.buildBadRequestModel("非法的住宅ID")); + mav.setModel(BasicModel.buildBadRequestModel("闈炴硶鐨勪綇瀹匢D")); return mav; } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/LoanController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/LoanController.java index d8f9a21da..0e82dbba9 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/LoanController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/LoanController.java @@ -42,12 +42,12 @@ public class LoanController { private LoanService loanService; private LoanLeadsService loanLeadsService; - private static final String DEFAULT_LOAN_TYPE = "房抵贷"; - private static final String DEFAULT_CHANNEL_NAME = "微盟"; + private static final String DEFAULT_LOAN_TYPE = "鎴挎姷璐�"; + private static final String DEFAULT_CHANNEL_NAME = "寰洘"; /** - * 根据API用户的displayName查询对应贷款机构下的所有产品的申请记录 - * 在bkoff配置API用户时,一定要把API用户的displayName和融时代那边机构的fullName设置成一样 + * 鏍规嵁API鐢ㄦ埛鐨刣isplayName鏌ヨ瀵瑰簲璐锋鏈烘瀯涓嬬殑鎵�鏈変骇鍝佺殑鐢宠璁板綍 + * 鍦╞koff閰嶇疆API鐢ㄦ埛鏃讹紝涓�瀹氳鎶夾PI鐢ㄦ埛鐨刣isplayName鍜岃瀺鏃朵唬閭h竟鏈烘瀯鐨刦ullName璁剧疆鎴愪竴鏍� * * @param model * @return @@ -100,7 +100,7 @@ public class LoanController { } /** - * 新版token验证 + * 鏂扮増token楠岃瘉 * * @param token * @return @@ -110,7 +110,7 @@ public class LoanController { if (tokenMap == null) { return null; } - // token验证后,拿取出的字段再去数据库验证一遍 + // token楠岃瘉鍚庯紝鎷垮彇鍑虹殑瀛楁鍐嶅幓鏁版嵁搴撻獙璇佷竴閬� if (StringUtils.isNotBlank(tokenMap.get("userid")) && !"null".equals(tokenMap.get("userid"))) { List params = new ArrayList(); params.add(new QueryParam("ID", tokenMap.get("userid"))); @@ -128,15 +128,15 @@ public class LoanController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isEmpty(model.getMobile())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,手机号不能为空!")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟閿欒锛屾墜鏈哄彿涓嶈兘涓虹┖锛�")); return mav; } if (StringUtils.isEmpty(model.getCityName())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市不能为空!")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟閿欒锛屽煄甯備笉鑳戒负绌猴紒")); return mav; } if (null == model.getAmount() || model.getAmount()<=0) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,贷款金额不能为空,且必须为有效数字!")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟閿欒锛岃捶娆鹃噾棰濅笉鑳戒负绌猴紝涓斿繀椤讳负鏈夋晥鏁板瓧锛�")); return mav; } LoanLeads loan = new LoanLeads(); @@ -150,7 +150,7 @@ public class LoanController { loan.setModifyDate(new Date()); loanLeadsService.save(loan); BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); - model1.setResult("保存成功!"); + model1.setResult("淇濆瓨鎴愬姛锛�"); mav.setModel(model1); return mav; } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/MapController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/MapController.java index 22326bdda..a663bea20 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/MapController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/MapController.java @@ -47,7 +47,7 @@ import com.fangjia.service.district.ShopStatService; import com.fangjia.service.open.DistrictBo; /** - * 地图找房controller + * 鍦板浘鎵炬埧controller * * @author liupei */ @@ -70,7 +70,7 @@ public class MapController { private OfficeStatService officeStatService; /** - * 地图找二手房 + * 鍦板浘鎵句簩鎵嬫埧 * * @param model * @return @@ -79,7 +79,7 @@ public class MapController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "城市名为必填项")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鍩庡競鍚嶄负蹇呭~椤�")); return mav; } List countList = new ArrayList(); @@ -95,7 +95,7 @@ public class MapController { } /** - * 地图找租房 + * 鍦板浘鎵剧鎴� * * @param model * @return @@ -104,7 +104,7 @@ public class MapController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "城市名为必填项")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鍩庡競鍚嶄负蹇呭~椤�")); return mav; } List countList = new ArrayList(); @@ -120,7 +120,7 @@ public class MapController { } /** - * 地图找出售商铺写字楼 + * 鍦板浘鎵惧嚭鍞晢閾哄啓瀛楁ゼ * * @param model * @return @@ -129,7 +129,7 @@ public class MapController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity())||StringUtils.isBlank(model.getKind())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "城市名为必填项")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鍩庡競鍚嶄负蹇呭~椤�")); return mav; } List countList = new ArrayList(); @@ -152,7 +152,7 @@ public class MapController { return mav; } /** - * 地图找出租商铺写字楼 + * 鍦板浘鎵惧嚭绉熷晢閾哄啓瀛楁ゼ * * @param model * @return @@ -161,7 +161,7 @@ public class MapController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity())||StringUtils.isBlank(model.getKind())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "城市名为必填项")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鍩庡競鍚嶄负蹇呭~椤�")); return mav; } List countList = new ArrayList(); @@ -185,7 +185,7 @@ public class MapController { return mav; } /** - * 获取小区 + * 鑾峰彇灏忓尯 * * @param countList * @param model @@ -217,10 +217,10 @@ public class MapController { if (null != statDto) { districtDto.setStat(Arrays.asList(statDto)); } - // 若存在外景图则只考虑外景图 + // 鑻ュ瓨鍦ㄥ鏅浘鍒欏彧鑰冭檻澶栨櫙鍥� List outPics = bo.getOutPics(); if (CollectionUtils.isNotEmpty(outPics)) { - // 标志图取中间一张 + // 鏍囧織鍥惧彇涓棿涓�寮� districtDto.setPic(outPics.get(outPics.size() / 2)); } districtDtos.add(districtDto); @@ -234,7 +234,7 @@ public class MapController { } /** - * 获取小区 + * 鑾峰彇灏忓尯 * * @param countList * @param model @@ -257,9 +257,9 @@ public class MapController { statMap = officeStatService.findOfficeStatByParams(districtKeys); } // Map statMap = districtStatService.findBusinessEstateStat(districtKeys, model.getKind() -// .equals("shop") ? "商铺" : "写字楼"); +// .equals("shop") ? "鍟嗛摵" : "鍐欏瓧妤�"); Map rentStatMap = businessStatRentService.findBusinessStat(districtKeys, model.getKind() - .equals("shop") ? "商铺" : "写字楼"); + .equals("shop") ? "鍟嗛摵" : "鍐欏瓧妤�"); for (Count count : countList) { cnt++; if (cnt > model.getPageSize()) { @@ -279,10 +279,10 @@ public class MapController { if (null != rentstatDto) { districtDto.setRentStat(Arrays.asList(rentstatDto)); } - // 若存在外景图则只考虑外景图 + // 鑻ュ瓨鍦ㄥ鏅浘鍒欏彧鑰冭檻澶栨櫙鍥� List outPics = bo.getOutPics(); if (CollectionUtils.isNotEmpty(outPics)) { - // 标志图取中间一张 + // 鏍囧織鍥惧彇涓棿涓�寮� districtDto.setPic(outPics.get(outPics.size() / 2)); } districtDtos.add(districtDto); @@ -296,7 +296,7 @@ public class MapController { } /** - * 是否可以提供经纬度 + * 鏄惁鍙互鎻愪緵缁忕含搴� * * @param request * @return @@ -312,7 +312,7 @@ public class MapController { } /** - * 获取FacetQuery + * 鑾峰彇FacetQuery * * @param model * @return @@ -327,10 +327,10 @@ public class MapController { List params = model.getQueryBean().getQueryParams(); params.add(new QueryParam(QueryParam.FACET_PARAM_NAME, facetQuery)); if (isRadiusTmp(model)) { - /*** 上面的SdQuery不支持到米,下面覆盖掉 **/ + /*** 涓婇潰鐨凷dQuery涓嶆敮鎸佸埌绫筹紝涓嬮潰瑕嗙洊鎺� **/ SdQuery sdQuery = new SdQuery(); double dlat = (double) (model.getLat() / 10000000000.0); - double dlng = (double) (model.getLng() / 10000000000.0);// 纬度必须为正负90,经度为正负180 + double dlng = (double) (model.getLng() / 10000000000.0);// 绾害蹇呴』涓烘璐�90锛岀粡搴︿负姝h礋180 if (dlat >= -90 && dlat <= 90 && dlng >= -180 && dlng <= 180) { sdQuery.setPoint("" + dlat + "," + dlng); sdQuery.setField("lat_lng"); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/MeishubaoController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/MeishubaoController.java index 20ea36e9c..5d734260d 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/MeishubaoController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/MeishubaoController.java @@ -16,7 +16,7 @@ import java.util.Map; public class MeishubaoController { /** - * 详细地址标准化接口 + * 璇︾粏鍦板潃鏍囧噯鍖栨帴鍙� * * @param model * @return @@ -25,7 +25,7 @@ public class MeishubaoController { RestfulModelAndView mav = new RestfulModelAndView(); if (StringUtils.isBlank(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍦板潃涓嶈兘涓虹┖")); return mav; } @@ -53,7 +53,7 @@ public class MeishubaoController { } mav.setModel(basicModel); } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("鏈嶅姟鍗囩骇涓�...")); } return mav; } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/MobileUserCollectionController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/MobileUserCollectionController.java index b36db6834..cefa7a73e 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/MobileUserCollectionController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/MobileUserCollectionController.java @@ -19,12 +19,12 @@ import com.fangjia.service.mongo.mobile.FavoriteService; @Authority(role = Role.USER) public class MobileUserCollectionController { /** - * 收藏接口 + * 鏀惰棌鎺ュ彛 */ private FavoriteService favoriteService; /** - * 添加收藏接口 + * 娣诲姞鏀惰棌鎺ュ彛 * * @param model * @return @@ -34,31 +34,31 @@ public class MobileUserCollectionController { mav.setViewType("rest"); if (StringUtils.isBlank(model.getUid()) || StringUtils.isBlank(model.getCategory()) || StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getIme())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "用户id,手机唯一码,城市,收藏类别都为必填项")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鐢ㄦ埛id,鎵嬫満鍞竴鐮�,鍩庡競,鏀惰棌绫诲埆閮戒负蹇呭~椤�")); return mav; } if (!CategoryEnum.getCategorys().contains(model.getCategory())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "收藏类别为未知类型")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鏀惰棌绫诲埆涓烘湭鐭ョ被鍨�")); return mav; } if (CategoryEnum.district.name().equals(model.getCategory())) { if (StringUtils.isBlank(model.getRegion()) || StringUtils.isBlank(model.getDistrictName())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "收藏类型为district时,区域和小区名为必填项")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鏀惰棌绫诲瀷涓篸istrict鏃�,鍖哄煙鍜屽皬鍖哄悕涓哄繀濉」")); return mav; } } else { if (StringUtils.isBlank(model.getId())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "收藏类型为sell,rent,evaluation时,对应的类别id为必填项")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鏀惰棌绫诲瀷涓簊ell,rent,evaluation鏃�,瀵瑰簲鐨勭被鍒玦d涓哄繀濉」")); return mav; } if (model.getId().length() != 24) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_INVALID, "收藏对象的id不正确")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_INVALID, "鏀惰棌瀵硅薄鐨刬d涓嶆纭�")); return mav; } } if (this.favoriteService.isFavoriteExist(model.getUid(), model.getCategory(), new DistrictKey(model.getCity(), model .getRegion(), model.getDistrictName()), model.getId())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.OK, "此对象已收藏")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.OK, "姝ゅ璞″凡鏀惰棌")); return mav; } Favorite favorite = new Favorite(); @@ -80,7 +80,7 @@ public class MobileUserCollectionController { } /** - * 删除收藏接口 + * 鍒犻櫎鏀惰棌鎺ュ彛 * * @param model * @return @@ -89,7 +89,7 @@ public class MobileUserCollectionController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(model.getUid()) || StringUtils.isBlank(model.getIme()) || StringUtils.isBlank(model.getId())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "用户id,手机唯一码,收藏id为必填项")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鐢ㄦ埛id,鎵嬫満鍞竴鐮�,鏀惰棌id涓哄繀濉」")); return mav; } Favorite favorite = this.favoriteService.findFavoriteById(model.getId()); @@ -97,7 +97,7 @@ public class MobileUserCollectionController { mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST)); return mav; } - // 判断用户id是否相同 + // 鍒ゆ柇鐢ㄦ埛id鏄惁鐩稿悓 if (!model.getUid().equals(favorite.getUid())) { mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST)); return mav; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/MobileUserStatController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/MobileUserStatController.java index e5c5f0195..100e2ec44 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/MobileUserStatController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/MobileUserStatController.java @@ -26,39 +26,39 @@ import com.fangjia.service.mongo.mobile.UserGeolocationService; import com.fangjia.service.mongo.mobile.UserHistoryService; /** - * 手机用户行为状态controller + * 鎵嬫満鐢ㄦ埛琛屼负鐘舵�乧ontroller * * @author liupei */ @Authority(role = Role.USER) public class MobileUserStatController { /** - * 用户地理位置Service + * 鐢ㄦ埛鍦扮悊浣嶇疆Service */ private UserGeolocationService userGeolocationService; /** - * 用户反馈信息Service + * 鐢ㄦ埛鍙嶉淇℃伅Service */ private UserFeedbackService userFeedbackService; /** - * 用户浏览历史信息Service + * 鐢ㄦ埛娴忚鍘嗗彶淇℃伅Service */ private UserHistoryService userHistoryService; /** - * 用户举报信息Service + * 鐢ㄦ埛涓炬姤淇℃伅Service */ private UserComplaintService userComplaintService; /** - * 用户呼叫记录Service + * 鐢ㄦ埛鍛煎彨璁板綍Service */ private UserCallRecordService userCallRecordService; /** - * 接收用户地理位置信息反馈Action + * 鎺ユ敹鐢ㄦ埛鍦扮悊浣嶇疆淇℃伅鍙嶉Action * * @param model * @return @@ -67,7 +67,7 @@ public class MobileUserStatController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (!model.isLegal()) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "用户id,手机唯一码,城市,经纬度都为必填项")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鐢ㄦ埛id,鎵嬫満鍞竴鐮�,鍩庡競,缁忕含搴﹂兘涓哄繀濉」")); return mav; } UserGeolocation geo = new UserGeolocation(); @@ -82,7 +82,7 @@ public class MobileUserStatController { } /** - * 接受用户举报(投诉)信息 + * 鎺ュ彈鐢ㄦ埛涓炬姤(鎶曡瘔)淇℃伅 * * @throws Exception */ @@ -90,11 +90,11 @@ public class MobileUserStatController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(model.getUid())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "用户唯一标示符为必填项")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鐢ㄦ埛鍞竴鏍囩ず绗︿负蹇呭~椤�")); return mav; } if (StringUtils.isBlank(model.getIme())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "手机唯一标示符为必填项")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鎵嬫満鍞竴鏍囩ず绗︿负蹇呭~椤�")); return mav; } @@ -118,7 +118,7 @@ public class MobileUserStatController { } /** - * 接受用户反馈信息 + * 鎺ュ彈鐢ㄦ埛鍙嶉淇℃伅 * * @throws Exception */ @@ -127,11 +127,11 @@ public class MobileUserStatController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(model.getUid())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "用户唯一标示符为必填项")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鐢ㄦ埛鍞竴鏍囩ず绗︿负蹇呭~椤�")); return mav; } if (StringUtils.isBlank(model.getIme())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "手机唯一标示符为必填项")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鎵嬫満鍞竴鏍囩ず绗︿负蹇呭~椤�")); return mav; } UserFeedback userFeedback = new UserFeedback(); @@ -147,7 +147,7 @@ public class MobileUserStatController { } /** - * 接受用户浏览历史信息 + * 鎺ュ彈鐢ㄦ埛娴忚鍘嗗彶淇℃伅 * * @throws Exception */ @@ -155,11 +155,11 @@ public class MobileUserStatController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(model.getUid())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "用户唯一标示符为必填项")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鐢ㄦ埛鍞竴鏍囩ず绗︿负蹇呭~椤�")); return mav; } if (StringUtils.isBlank(model.getIme())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "手机唯一标示符为必填项")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鎵嬫満鍞竴鏍囩ず绗︿负蹇呭~椤�")); return mav; } UserHistory userHistory = new UserHistory(); @@ -176,7 +176,7 @@ public class MobileUserStatController { } /** - * 统计用户呼叫记录Action + * 缁熻鐢ㄦ埛鍛煎彨璁板綍Action * * @param model * @return @@ -185,7 +185,7 @@ public class MobileUserStatController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (!model.isLegal()) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "用户id,手机唯一码,手机类型,主叫号码,房源id都为必填项")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鐢ㄦ埛id,鎵嬫満鍞竴鐮�,鎵嬫満绫诲瀷,涓诲彨鍙风爜,鎴挎簮id閮戒负蹇呭~椤�")); return mav; } UserCallRecord record = new UserCallRecord(); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/NearbyController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/NearbyController.java index b79072ca9..3ac11e860 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/NearbyController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/NearbyController.java @@ -28,7 +28,7 @@ public class NearbyController { RestfulModelAndView mv = new RestfulModelAndView(); if(model.getMaxAvgPrice() != null && model.getMinAvgPrice() != null && model.getMinAvgPrice() > model.getMaxAvgPrice()){ - mv.setModel(BasicModel.buildBadRequestModel("minAvgPrice不能大于maxAvgPrice")); + mv.setModel(BasicModel.buildBadRequestModel("minAvgPrice涓嶈兘澶т簬maxAvgPrice")); return mv; } Point centre = new Point(model.getLng(), model.getLat()); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/NewDistrictController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/NewDistrictController.java index 3d9b1a8b8..45394f618 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/NewDistrictController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/NewDistrictController.java @@ -50,7 +50,7 @@ public class NewDistrictController { private MenuService menuService; /** - * 小区详情 + * 灏忓尯璇︽儏 * * @return */ @@ -59,23 +59,23 @@ public class NewDistrictController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(name) || StringUtils.isBlank(city) || StringUtils.isBlank(region)) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "新房所在城市,小区名,所在区域必必须输入")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鏂版埧鎵�鍦ㄥ煄甯�,灏忓尯鍚�,鎵�鍦ㄥ尯鍩熷繀蹇呴』杈撳叆")); return mav; } else { District district = districtService.findNewDistrict(new DistrictKey(city, region, name)); if (null == district) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "新房数据不存在,请检查查询条件")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "鏂版埧鏁版嵁涓嶅瓨鍦紝璇锋鏌ユ煡璇㈡潯浠�")); return mav; } DistrictBo districtBo = new DistrictBo(district); - // 去除小区描述和打折信息中的html标签 + // 鍘婚櫎灏忓尯鎻忚堪鍜屾墦鎶樹俊鎭腑鐨刪tml鏍囩 districtBo.setDiscount(DataUtil.removeSpecialString(districtBo.getDiscount())); districtBo.setDescription(DataUtil.removeSpecialString(districtBo.getDescription())); NewDistrictDto districtDto = new NewDistrictDto(districtBo, isSupportLatLng(request)); - // 若存在外景图则只考虑外景图,若无外景图则无图片,取前5张 + // 鑻ュ瓨鍦ㄥ鏅浘鍒欏彧鑰冭檻澶栨櫙鍥撅紝鑻ユ棤澶栨櫙鍥惧垯鏃犲浘鐗囷紝鍙栧墠5寮� List outPics = districtBo.getOutPics(); if (CollectionUtils.isNotEmpty(outPics)) { - // 标志图取中间一张 + // 鏍囧織鍥惧彇涓棿涓�寮� districtDto.setPic(outPics.get(outPics.size() / 2)); if (outPics.size() <= 5) { districtDto.setPics(outPics); @@ -103,7 +103,7 @@ public class NewDistrictController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "小区所在城市必须输入")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "灏忓尯鎵�鍦ㄥ煄甯傚繀椤昏緭鍏�")); return mav; } Pager pager = new Pager(); @@ -119,7 +119,7 @@ public class NewDistrictController { int startRow = (pageIndex - 1) * pager.getPageSize(); pager.setStartRow(startRow); } - // 是否输入半径查询,其他情况直接moedel查询即可 + // 鏄惁杈撳叆鍗婂緞鏌ヨ锛屽叾浠栨儏鍐电洿鎺oedel鏌ヨ鍗冲彲 if (isRadiusSearch(model)) { Long lng = model.getLng(); Long lat = model.getLat(); @@ -171,10 +171,10 @@ public class NewDistrictController { FacetQueryResult districtDtos = new FacetQueryResult(); for (DistrictBo bo : districtList) { NewDistrictDto districtDto = new NewDistrictDto(bo, isSupportLatLng(request)); - // 若存在外景图则只考虑外景图 + // 鑻ュ瓨鍦ㄥ鏅浘鍒欏彧鑰冭檻澶栨櫙鍥� List outPics = bo.getOutPics(); if (CollectionUtils.isNotEmpty(outPics)) { - // 标志图取中间一张 + // 鏍囧織鍥惧彇涓棿涓�寮� districtDto.setPic(outPics.get(outPics.size() / 2)); if (outPics.size() <= 5) { districtDto.setPics(outPics); @@ -211,7 +211,7 @@ public class NewDistrictController { } /** - * 是否可以提供经纬度 + * 鏄惁鍙互鎻愪緵缁忕含搴� * * @param request * @return diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeController.java index c9c6ffba1..0c0895c34 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeController.java @@ -71,7 +71,7 @@ public class OfficeController { private DealSampleService dealSampleService; /** - * 城市出租均价 + * 鍩庡競鍑虹鍧囦环 * * @return */ @@ -79,7 +79,7 @@ public class OfficeController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(city)) { - mav.setModel(BasicModel.buildBadRequestModel("city不能为null")); + mav.setModel(BasicModel.buildBadRequestModel("city涓嶈兘涓簄ull")); return mav; } if (!RegionData.isCity(city)) { @@ -87,29 +87,29 @@ public class OfficeController { if (StringUtils.isNotBlank(formatCity)) { city = formatCity; } else { - mav.setModel(BasicModel.buildBadRequestModel("city非法")); + mav.setModel(BasicModel.buildBadRequestModel("city闈炴硶")); return mav; } } ServerArea serverArea = ServerAreaData.getServerAreaByCity(city); if (null == serverArea) { - mav.setModel(BasicModel.buildBadRequestModel("city非法")); + mav.setModel(BasicModel.buildBadRequestModel("city闈炴硶")); return mav; } if (startDate == null || endDate == null) { - mav.setModel(BasicModel.buildBadRequestModel("startDate或endDate不能为null")); + mav.setModel(BasicModel.buildBadRequestModel("startDate鎴杄ndDate涓嶈兘涓簄ull")); return mav; } if (startDate > endDate) { - mav.setModel(BasicModel.buildBadRequestModel("startDate不能大于endDate")); + mav.setModel(BasicModel.buildBadRequestModel("startDate涓嶈兘澶т簬endDate")); return mav; } List regionStats = officeService.findOfficeRentStat(city, null, null, "city", startDate, endDate); if (CollectionUtils.isEmpty(regionStats)) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "该城市没有均价数据")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "璇ュ煄甯傛病鏈夊潎浠锋暟鎹�")); return mav; } mav.setModel(BasicModel.buildOKModel().setResult(regionStats)); @@ -117,7 +117,7 @@ public class OfficeController { } /** - * 区域出租均价 + * 鍖哄煙鍑虹鍧囦环 * * @return */ @@ -126,11 +126,11 @@ public class OfficeController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(city)) { - mav.setModel(BasicModel.buildBadRequestModel("city不能为null")); + mav.setModel(BasicModel.buildBadRequestModel("city涓嶈兘涓簄ull")); return mav; } if (StringUtils.isBlank(district)) { - mav.setModel(BasicModel.buildBadRequestModel("district不能为null")); + mav.setModel(BasicModel.buildBadRequestModel("district涓嶈兘涓簄ull")); return mav; } if (!RegionData.isCity(city)) { @@ -138,34 +138,34 @@ public class OfficeController { if (StringUtils.isNotBlank(formatCity)) { city = formatCity; } else { - mav.setModel(BasicModel.buildBadRequestModel("city非法")); + mav.setModel(BasicModel.buildBadRequestModel("city闈炴硶")); return mav; } } ServerArea serverArea = ServerAreaData.getServerAreaByCity(city); if (null == serverArea) { - mav.setModel(BasicModel.buildBadRequestModel("city非法")); + mav.setModel(BasicModel.buildBadRequestModel("city闈炴硶")); return mav; } String region = RegionData.formatRegion(city, district); if (!RegionData.isRegion(city, region)) { - mav.setModel(BasicModel.buildBadRequestModel("没有找你输入的区域")); + mav.setModel(BasicModel.buildBadRequestModel("娌℃湁鎵句綘杈撳叆鐨勫尯鍩�")); return mav; } if (startDate == null || endDate == null) { - mav.setModel(BasicModel.buildBadRequestModel("startDate或endDate不能为null")); + mav.setModel(BasicModel.buildBadRequestModel("startDate鎴杄ndDate涓嶈兘涓簄ull")); return mav; } if (startDate > endDate) { - mav.setModel(BasicModel.buildBadRequestModel("startDate不能大于endDate")); + mav.setModel(BasicModel.buildBadRequestModel("startDate涓嶈兘澶т簬endDate")); return mav; } List regionStats = officeService.findOfficeRentStat(city, region, null, "district", startDate, endDate); if (CollectionUtils.isEmpty(regionStats)) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "该区域没有均价数据")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "璇ュ尯鍩熸病鏈夊潎浠锋暟鎹�")); return mav; } mav.setModel(BasicModel.buildOKModel().setResult(regionStats)); @@ -173,7 +173,7 @@ public class OfficeController { } /** - * 写字楼均价走势 + * 鍐欏瓧妤煎潎浠疯蛋鍔� * * @return */ @@ -183,11 +183,11 @@ public class OfficeController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(city)) { - mav.setModel(BasicModel.buildBadRequestModel("city不能为null")); + mav.setModel(BasicModel.buildBadRequestModel("city涓嶈兘涓簄ull")); return mav; } if (StringUtils.isBlank(district)) { - mav.setModel(BasicModel.buildBadRequestModel("district不能为null")); + mav.setModel(BasicModel.buildBadRequestModel("district涓嶈兘涓簄ull")); return mav; } if (!RegionData.isCity(city)) { @@ -195,34 +195,34 @@ public class OfficeController { if (StringUtils.isNotBlank(formatCity)) { city = formatCity; } else { - mav.setModel(BasicModel.buildBadRequestModel("city非法")); + mav.setModel(BasicModel.buildBadRequestModel("city闈炴硶")); return mav; } } ServerArea serverArea = ServerAreaData.getServerAreaByCity(city); if (null == serverArea) { - mav.setModel(BasicModel.buildBadRequestModel("city非法")); + mav.setModel(BasicModel.buildBadRequestModel("city闈炴硶")); return mav; } String region = RegionData.formatRegion(city, district); if (!RegionData.isRegion(city, region)) { - mav.setModel(BasicModel.buildBadRequestModel("没有找你输入的区域")); + mav.setModel(BasicModel.buildBadRequestModel("娌℃湁鎵句綘杈撳叆鐨勫尯鍩�")); return mav; } if (startDate == null || endDate == null) { - mav.setModel(BasicModel.buildBadRequestModel("startDate或endDate不能为null")); + mav.setModel(BasicModel.buildBadRequestModel("startDate鎴杄ndDate涓嶈兘涓簄ull")); return mav; } if (startDate > endDate) { - mav.setModel(BasicModel.buildBadRequestModel("startDate不能大于endDate")); + mav.setModel(BasicModel.buildBadRequestModel("startDate涓嶈兘澶т簬endDate")); return mav; } List regionStats = officeService.findOfficeRentStat(city, region, name, "office", startDate, endDate); if (CollectionUtils.isEmpty(regionStats)) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "该写字楼没有均价数据")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "璇ュ啓瀛楁ゼ娌℃湁鍧囦环鏁版嵁")); return mav; } mav.setModel(BasicModel.buildOKModel().setResult(regionStats)); @@ -230,7 +230,7 @@ public class OfficeController { } /** - * 写字楼楼租金地址估值 + * 鍐欏瓧妤兼ゼ绉熼噾鍦板潃浼板�� * * @param model * @param request @@ -240,28 +240,28 @@ public class OfficeController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getAddress()) || model.getSize() <= 0) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:城市,地址,面积(size)为必填项")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:鍩庡競,鍦板潃,闈㈢Н(size)涓哄繀濉」")); return mav; } - if (model.getCity().endsWith("市")) { - model.setCity(model.getCity().replaceAll("市$", "")); + if (model.getCity().endsWith("甯�")) { + model.setCity(model.getCity().replaceAll("甯�$", "")); } if (model.getCarportPrice() != null && (model.getCarportPrice() < 0 || model.getCarportPrice() > 1000000)) { - mav.setModel(BasicModel.buildBadRequestModel("carportPrice(车位)取值不合法")); + mav.setModel(BasicModel.buildBadRequestModel("carportPrice(杞︿綅)鍙栧�间笉鍚堟硶")); return mav; } if (model.getMaxFloor() != null && (model.getMaxFloor() <= 0 || model.getMaxFloor() > 59)) { - mav.setModel(BasicModel.buildBadRequestModel("maxFloor取值非法,正确范围[1,60)")); + mav.setModel(BasicModel.buildBadRequestModel("maxFloor鍙栧�奸潪娉�,姝g‘鑼冨洿[1,60)")); return mav; } if (model.getFloor() != null && (model.getFloor() <= 0 || model.getFloor() > 59)) { - mav.setModel(BasicModel.buildBadRequestModel("floor取值非法,正确范围[1,60)")); + mav.setModel(BasicModel.buildBadRequestModel("floor鍙栧�奸潪娉�,姝g‘鑼冨洿[1,60)")); return mav; } if (model.getMaxFloor() != null && model.getFloor() != null && model.getFloor() > model.getMaxFloor()) { - mav.setModel(BasicModel.buildBadRequestModel("所在楼层不能大于总楼层")); + mav.setModel(BasicModel.buildBadRequestModel("鎵�鍦ㄦゼ灞備笉鑳藉ぇ浜庢�绘ゼ灞�")); return mav; } @@ -302,13 +302,13 @@ public class OfficeController { return mav; } else { - mav.setModel(BasicModel.buildOKModel().setMsg("暂时不支持该地址写字楼的评估").markNoData()); + mav.setModel(BasicModel.buildOKModel().setMsg("鏆傛椂涓嶆敮鎸佽鍦板潃鍐欏瓧妤肩殑璇勪及").markNoData()); return mav; } } /** - * 写字楼详情 + * 鍐欏瓧妤艰鎯� * * @param model * @return @@ -321,7 +321,7 @@ public class OfficeController { || StringUtils.isBlank(model.getName())) && (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getDistrict()) || StringUtils.isBlank(model.getAddress()))) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:请输入正确的参数组合")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:璇疯緭鍏ユ纭殑鍙傛暟缁勫悎")); return mav; } @@ -330,7 +330,7 @@ public class OfficeController { if (ObjectId.isValid(model.getId())) { district = districtService.findById(model.getId()); } else { - mav.setModel(BasicModel.buildBadRequestModel("非法的写字楼ID")); + mav.setModel(BasicModel.buildBadRequestModel("闈炴硶鐨勫啓瀛楁ゼID")); return mav; } } @@ -450,13 +450,13 @@ public class OfficeController { mav.setModel(BasicModel.buildOKModel().setResult(districtInfoDto)); return mav; } - mav.setModel(BasicModel.buildBadRequestModel("该写字楼不存在")); + mav.setModel(BasicModel.buildBadRequestModel("璇ュ啓瀛楁ゼ涓嶅瓨鍦�")); return mav; } /** - * 写字楼租金评估 + * 鍐欏瓧妤肩閲戣瘎浼� * * @param model * @param request @@ -467,15 +467,15 @@ public class OfficeController { mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity()) || model.getSize()<=0) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:城市,面积为必填项")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:鍩庡競,闈㈢Н涓哄繀濉」")); return mav; } if (StringUtils.isBlank(model.getName()) && StringUtils.isBlank(model.getAddress()) ) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:名称或地址至少填一个")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:鍚嶇О鎴栧湴鍧�鑷冲皯濉竴涓�")); return mav; } - /* 先到CPDB库中查找写字楼 */ + /* 鍏堝埌CPDB搴撲腑鏌ユ壘鍐欏瓧妤� */ District district = null; if(StringUtils.isNotBlank(model.getDistrict()) && StringUtils.isNotBlank(model.getName())) { @@ -496,23 +496,23 @@ public class OfficeController { } if (district == null) { - mav.setModel(BasicModel.buildBadRequestModel("该写字楼不存在")); + mav.setModel(BasicModel.buildBadRequestModel("璇ュ啓瀛楁ゼ涓嶅瓨鍦�")); return mav; } model.setName(district.getName()); if (model.getMaxFloor() != null && (model.getMaxFloor() <= 0 || model.getMaxFloor() > 59)) { - mav.setModel(BasicModel.buildBadRequestModel("maxFloor取值非法,正确范围[1,60)")); + mav.setModel(BasicModel.buildBadRequestModel("maxFloor鍙栧�奸潪娉�,姝g‘鑼冨洿[1,60)")); return mav; } if (model.getFloor() != null && (model.getFloor() <= 0 || model.getFloor() > 59)) { - mav.setModel(BasicModel.buildBadRequestModel("floor取值非法,正确范围[1,60)")); + mav.setModel(BasicModel.buildBadRequestModel("floor鍙栧�奸潪娉�,姝g‘鑼冨洿[1,60)")); return mav; } if (model.getMaxFloor() != null && model.getFloor() != null && model.getFloor() > model.getMaxFloor()) { - mav.setModel(BasicModel.buildBadRequestModel("所在楼层不能大于总楼层")); + mav.setModel(BasicModel.buildBadRequestModel("鎵�鍦ㄦゼ灞備笉鑳藉ぇ浜庢�绘ゼ灞�")); return mav; } @@ -574,56 +574,56 @@ public class OfficeController { return mav; } else { - mav.setModel(BasicModel.buildOKModel().setMsg("暂时不支持该写字楼的评估").markNoData()); + mav.setModel(BasicModel.buildOKModel().setMsg("鏆傛椂涓嶆敮鎸佽鍐欏瓧妤肩殑璇勪及").markNoData()); return mav; } } /** - * 申请估值报告 + * 鐢宠浼板�兼姤鍛� * - * @param model 申请报告请求参数 + * @param model 鐢宠鎶ュ憡璇锋眰鍙傛暟 * @return */ public Object assessPriceReportApplyAction(ReportApplyModel model) { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(model.getClient())) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:委托机构为必填项")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:濮旀墭鏈烘瀯涓哄繀濉」")); return mav; } if (StringUtils.isBlank(model.getSubjectMatter())) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:标的物为必填项")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:鏍囩殑鐗╀负蹇呭~椤�")); return mav; } - if (StringUtils.isBlank(model.getCity()) || model.getCity().contains("全国")) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:城市为必填项且不能为全国")); + if (StringUtils.isBlank(model.getCity()) || model.getCity().contains("鍏ㄥ浗")) { + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:鍩庡競涓哄繀濉」涓斾笉鑳戒负鍏ㄥ浗")); return mav; } - if (StringUtils.isBlank(model.getDistrict()) || model.getDistrict().contains("全国")) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:区域为必填项且不能为全国")); + if (StringUtils.isBlank(model.getDistrict()) || model.getDistrict().contains("鍏ㄥ浗")) { + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:鍖哄煙涓哄繀濉」涓斾笉鑳戒负鍏ㄥ浗")); return mav; } if (model.getSize() == null || model.getSize() <= 0 ) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:面积(size)为必填项且大于0")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:闈㈢Н(size)涓哄繀濉」涓斿ぇ浜�0")); return mav; } - if (model.getCity().endsWith("市")) { - model.setCity(model.getCity().replaceAll("市$", "")); + if (model.getCity().endsWith("甯�")) { + model.setCity(model.getCity().replaceAll("甯�$", "")); } - if (model.getDistrict().endsWith("区")) { - model.setDistrict(model.getDistrict().replaceAll("区$", "")); + if (model.getDistrict().endsWith("鍖�")) { + model.setDistrict(model.getDistrict().replaceAll("鍖�$", "")); } if (model.getMaxFloor() != null && (model.getMaxFloor() <= 0 || model.getMaxFloor() > 59)) { - mav.setModel(BasicModel.buildBadRequestModel("maxFloor取值非法,正确范围[1,60)")); + mav.setModel(BasicModel.buildBadRequestModel("maxFloor鍙栧�奸潪娉�,姝g‘鑼冨洿[1,60)")); return mav; } if (model.getFloor() != null && (model.getFloor() <= 0 || model.getFloor() > 59)) { - mav.setModel(BasicModel.buildBadRequestModel("floor取值非法,正确范围[1,60)")); + mav.setModel(BasicModel.buildBadRequestModel("floor鍙栧�奸潪娉�,姝g‘鑼冨洿[1,60)")); return mav; } if (model.getMaxFloor() != null && model.getFloor() != null && model.getFloor() > model.getMaxFloor()) { - mav.setModel(BasicModel.buildBadRequestModel("所在楼层不能大于总楼层")); + mav.setModel(BasicModel.buildBadRequestModel("鎵�鍦ㄦゼ灞備笉鑳藉ぇ浜庢�绘ゼ灞�")); return mav; } HttpRequest request = new HttpRequest(); @@ -664,25 +664,25 @@ public class OfficeController { result.put("caseId", String.valueOf(json.get("data"))); mav.setModel(BasicModel.buildOKModel().setResult(result)); } else { - mav.setModel(BasicModel.buildBadRequestModel("申请估值报告失败:" + json.getString("message"))); + mav.setModel(BasicModel.buildBadRequestModel("鐢宠浼板�兼姤鍛婂け璐ワ細" + json.getString("message"))); } } else { - mav.setModel(BasicModel.buildBadRequestModel("申请估值报告失败:调用申请报告接口返回为空")); + mav.setModel(BasicModel.buildBadRequestModel("鐢宠浼板�兼姤鍛婂け璐ワ細璋冪敤鐢宠鎶ュ憡鎺ュ彛杩斿洖涓虹┖")); } return mav; } /** - * 获取估值报告 + * 鑾峰彇浼板�兼姤鍛� * - * @param caseId 估值报告ID + * @param caseId 浼板�兼姤鍛奍D * @return */ public Object assessPriceReportFetchAction(@Param(name = "caseId") String caseId) { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(caseId)) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:估值报告业务编号为必填项")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:浼板�兼姤鍛婁笟鍔$紪鍙蜂负蹇呭~椤�")); return mav; } HttpRequest request = new HttpRequest(); @@ -709,10 +709,10 @@ public class OfficeController { JSONObject resultJson = json.getJSONObject("data"); mav.setModel(BasicModel.buildOKModel().setResult(resultJson)); } else { - mav.setModel(BasicModel.buildBadRequestModel("获取估值报告失败:" + json.getString("message"))); + mav.setModel(BasicModel.buildBadRequestModel("鑾峰彇浼板�兼姤鍛婂け璐ワ細" + json.getString("message"))); } } else { - mav.setModel(BasicModel.buildBadRequestModel("申请报告失败:调用获取估值报告接口返回为空")); + mav.setModel(BasicModel.buildBadRequestModel("鐢宠鎶ュ憡澶辫触锛氳皟鐢ㄨ幏鍙栦及鍊兼姤鍛婃帴鍙h繑鍥炰负绌�")); } return mav; } @@ -723,15 +723,15 @@ public class OfficeController { mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity()) || model.getSize()<=0) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:城市,面积为必填项")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:鍩庡競,闈㈢Н涓哄繀濉」")); return mav; } if (StringUtils.isBlank(model.getName()) && StringUtils.isBlank(model.getAddress()) ) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:名称或地址至少填一个")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:鍚嶇О鎴栧湴鍧�鑷冲皯濉竴涓�")); return mav; } - /* 先到CPDB库中查找写字楼 */ + /* 鍏堝埌CPDB搴撲腑鏌ユ壘鍐欏瓧妤� */ District district = null; Double ratio = getUserPriceRatio(request); @@ -753,30 +753,30 @@ public class OfficeController { } if (district == null) { - mav.setModel(BasicModel.buildBadRequestModel("该写字楼不存在")); + mav.setModel(BasicModel.buildBadRequestModel("璇ュ啓瀛楁ゼ涓嶅瓨鍦�")); return mav; } model.setName(district.getName()); if (model.getMaxFloor() != null && (model.getMaxFloor() <= 0 || model.getMaxFloor() > 59)) { - mav.setModel(BasicModel.buildBadRequestModel("maxFloor取值非法,正确范围[1,60)")); + mav.setModel(BasicModel.buildBadRequestModel("maxFloor鍙栧�奸潪娉�,姝g‘鑼冨洿[1,60)")); return mav; } if (model.getFloor() != null && (model.getFloor() <= 0 || model.getFloor() > 59)) { - mav.setModel(BasicModel.buildBadRequestModel("floor取值非法,正确范围[1,60)")); + mav.setModel(BasicModel.buildBadRequestModel("floor鍙栧�奸潪娉�,姝g‘鑼冨洿[1,60)")); return mav; } if (model.getMaxFloor() != null && model.getFloor() != null && model.getFloor() > model.getMaxFloor()) { - mav.setModel(BasicModel.buildBadRequestModel("所在楼层不能大于总楼层")); + mav.setModel(BasicModel.buildBadRequestModel("鎵�鍦ㄦゼ灞備笉鑳藉ぇ浜庢�绘ゼ灞�")); return mav; } if(district.getCity()!=null){ ServerArea serverArea = serverAreaService.findByDisplay(district.getCity()); if(serverArea!=null && serverArea.getNewCityGrade()>=3000){ - mav.setModel(BasicModel.buildServerErrorModel().setMsg("当前仅支持一、二线城市,暂不支持您选择的城市")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("褰撳墠浠呮敮鎸佷竴銆佷簩绾垮煄甯傦紝鏆備笉鏀寔鎮ㄩ�夋嫨鐨勫煄甯�")); return mav; } } @@ -805,15 +805,15 @@ public class OfficeController { mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity()) || model.getSize()<=0) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:城市,面积为必填项")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:鍩庡競,闈㈢Н涓哄繀濉」")); return mav; } if (StringUtils.isBlank(model.getName()) && StringUtils.isBlank(model.getAddress()) ) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:名称或地址至少填一个")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:鍚嶇О鎴栧湴鍧�鑷冲皯濉竴涓�")); return mav; } - /* 先到CPDB库中查找写字楼 */ + /* 鍏堝埌CPDB搴撲腑鏌ユ壘鍐欏瓧妤� */ District district = null; Double ratio = getUserPriceRatio(request); @@ -835,30 +835,30 @@ public class OfficeController { } if (district == null) { - mav.setModel(BasicModel.buildBadRequestModel("该写字楼不存在")); + mav.setModel(BasicModel.buildBadRequestModel("璇ュ啓瀛楁ゼ涓嶅瓨鍦�")); return mav; } model.setName(district.getName()); if (model.getMaxFloor() != null && (model.getMaxFloor() <= 0 || model.getMaxFloor() > 59)) { - mav.setModel(BasicModel.buildBadRequestModel("maxFloor取值非法,正确范围[1,60)")); + mav.setModel(BasicModel.buildBadRequestModel("maxFloor鍙栧�奸潪娉�,姝g‘鑼冨洿[1,60)")); return mav; } if (model.getFloor() != null && (model.getFloor() <= 0 || model.getFloor() > 59)) { - mav.setModel(BasicModel.buildBadRequestModel("floor取值非法,正确范围[1,60)")); + mav.setModel(BasicModel.buildBadRequestModel("floor鍙栧�奸潪娉�,姝g‘鑼冨洿[1,60)")); return mav; } if (model.getMaxFloor() != null && model.getFloor() != null && model.getFloor() > model.getMaxFloor()) { - mav.setModel(BasicModel.buildBadRequestModel("所在楼层不能大于总楼层")); + mav.setModel(BasicModel.buildBadRequestModel("鎵�鍦ㄦゼ灞備笉鑳藉ぇ浜庢�绘ゼ灞�")); return mav; } if(district.getCity()!=null){ ServerArea serverArea = serverAreaService.findByDisplay(district.getCity()); if(serverArea!=null && serverArea.getNewCityGrade()>=3000){ - mav.setModel(BasicModel.buildServerErrorModel().setMsg("当前仅支持一、二线城市,暂不支持您选择的城市")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("褰撳墠浠呮敮鎸佷竴銆佷簩绾垮煄甯傦紝鏆備笉鏀寔鎮ㄩ�夋嫨鐨勫煄甯�")); return mav; } } @@ -954,7 +954,7 @@ public class OfficeController { /** - * 通过EvaluationModel组装Evaluation实体 + * 閫氳繃EvaluationModel缁勮Evaluation瀹炰綋 * * @param model * @param request @@ -1086,13 +1086,13 @@ public class OfficeController { if (model.isNewDistrict()) { evaluation.setNewDistrict(model.isNewDistrict()); } - String floorDesc = "中"; + String floorDesc = "涓�"; if (evaluation.getFloor() != null && evaluation.getHeight() != null) { Double floorInfo = evaluation.getFloor() * 1.0 / evaluation.getHeight(); if (floorInfo <= 0.33) { - floorDesc = "低"; + floorDesc = "浣�"; } else if (floorInfo > 0.66) { - floorDesc = "高"; + floorDesc = "楂�"; } evaluation.setFloorDesc(floorDesc); } @@ -1109,15 +1109,15 @@ public class OfficeController { private static final Map FACILITIES = new HashMap() { { - put("0", "健身房"); - put("1", "游泳池"); - put("2", "会所"); - put("3", "网球场"); - put("4", "球场"); - put("5", "棋牌室"); - put("6", "停车场"); - put("7", "图书馆"); - put("8", "活动中心"); + put("0", "鍋ヨ韩鎴�"); + put("1", "娓告吵姹�"); + put("2", "浼氭墍"); + put("3", "缃戠悆鍦�"); + put("4", "鐞冨満"); + put("5", "妫嬬墝瀹�"); + put("6", "鍋滆溅鍦�"); + put("7", "鍥句功棣�"); + put("8", "娲诲姩涓績"); } }; @@ -1163,10 +1163,10 @@ public class OfficeController { dto.setSize(house.getArea()); if (StringUtils.isNotBlank(house.getPublishDate())) { String numberStr = house.getPublishDate(); - // 拆分字符串并格式化 - String year = numberStr.substring(0, 4); // 前四位是年份 - String month = numberStr.substring(4, 6); // 中间两位是月份 - String day = numberStr.substring(6, 8); // 最后两位是日期 + // 鎷嗗垎瀛楃涓插苟鏍煎紡鍖� + String year = numberStr.substring(0, 4); // 鍓嶅洓浣嶆槸骞翠唤 + String month = numberStr.substring(4, 6); // 涓棿涓や綅鏄湀浠� + String day = numberStr.substring(6, 8); // 鏈�鍚庝袱浣嶆槸鏃ユ湡 String formattedDate = year + "-" + month + "-" + day; dto.setCaseDate(formattedDate); } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeSellController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeSellController.java index 4ee9677f9..c2c1950e7 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeSellController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeSellController.java @@ -62,7 +62,7 @@ public class OfficeSellController { private ServerAreaService serverAreaService; private DealSampleService dealSampleService; /** - * 写字楼城市出售均价 + * 鍐欏瓧妤煎煄甯傚嚭鍞潎浠� * * @return */ @@ -70,7 +70,7 @@ public class OfficeSellController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(city)) { - mav.setModel(BasicModel.buildBadRequestModel("city不能为null")); + mav.setModel(BasicModel.buildBadRequestModel("city涓嶈兘涓簄ull")); return mav; } if (!RegionData.isCity(city)) { @@ -78,29 +78,29 @@ public class OfficeSellController { if (StringUtils.isNotBlank(formatCity)) { city = formatCity; } else { - mav.setModel(BasicModel.buildBadRequestModel("city非法")); + mav.setModel(BasicModel.buildBadRequestModel("city闈炴硶")); return mav; } } ServerArea serverArea = ServerAreaData.getServerAreaByCity(city); if (null == serverArea) { - mav.setModel(BasicModel.buildBadRequestModel("city非法")); + mav.setModel(BasicModel.buildBadRequestModel("city闈炴硶")); return mav; } if (startDate == null || endDate == null) { - mav.setModel(BasicModel.buildBadRequestModel("startDate或endDate不能为null")); + mav.setModel(BasicModel.buildBadRequestModel("startDate鎴杄ndDate涓嶈兘涓簄ull")); return mav; } if (startDate > endDate) { - mav.setModel(BasicModel.buildBadRequestModel("startDate不能大于endDate")); + mav.setModel(BasicModel.buildBadRequestModel("startDate涓嶈兘澶т簬endDate")); return mav; } List sellList = officeService.findOfficeSellStat(city, null, null, "city", startDate, endDate); if (CollectionUtils.isEmpty(sellList)) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "该城市没有写字楼均价数据")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "璇ュ煄甯傛病鏈夊啓瀛楁ゼ鍧囦环鏁版嵁")); return mav; } mav.setModel(BasicModel.buildOKModel().setResult(sellList)); @@ -108,7 +108,7 @@ public class OfficeSellController { } /** - * 写字楼区域出售均价 + * 鍐欏瓧妤煎尯鍩熷嚭鍞潎浠� * * @return */ @@ -117,11 +117,11 @@ public class OfficeSellController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(city)) { - mav.setModel(BasicModel.buildBadRequestModel("city不能为null")); + mav.setModel(BasicModel.buildBadRequestModel("city涓嶈兘涓簄ull")); return mav; } if (StringUtils.isBlank(district)) { - mav.setModel(BasicModel.buildBadRequestModel("district不能为null")); + mav.setModel(BasicModel.buildBadRequestModel("district涓嶈兘涓簄ull")); return mav; } if (!RegionData.isCity(city)) { @@ -129,34 +129,34 @@ public class OfficeSellController { if (StringUtils.isNotBlank(formatCity)) { city = formatCity; } else { - mav.setModel(BasicModel.buildBadRequestModel("city非法")); + mav.setModel(BasicModel.buildBadRequestModel("city闈炴硶")); return mav; } } ServerArea serverArea = ServerAreaData.getServerAreaByCity(city); if (null == serverArea) { - mav.setModel(BasicModel.buildBadRequestModel("city非法")); + mav.setModel(BasicModel.buildBadRequestModel("city闈炴硶")); return mav; } String region = RegionData.formatRegion(city, district); if (!RegionData.isRegion(city, region)) { - mav.setModel(BasicModel.buildBadRequestModel("没有找你输入的区域")); + mav.setModel(BasicModel.buildBadRequestModel("娌℃湁鎵句綘杈撳叆鐨勫尯鍩�")); return mav; } if (startDate == null || endDate == null) { - mav.setModel(BasicModel.buildBadRequestModel("startDate或endDate不能为null")); + mav.setModel(BasicModel.buildBadRequestModel("startDate鎴杄ndDate涓嶈兘涓簄ull")); return mav; } if (startDate > endDate) { - mav.setModel(BasicModel.buildBadRequestModel("startDate不能大于endDate")); + mav.setModel(BasicModel.buildBadRequestModel("startDate涓嶈兘澶т簬endDate")); return mav; } List regionStats = officeService.findOfficeSellStat(city, region, null, "district", startDate, endDate); if (CollectionUtils.isEmpty(regionStats)) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "该区域没有均价数据")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "璇ュ尯鍩熸病鏈夊潎浠锋暟鎹�")); return mav; } mav.setModel(BasicModel.buildOKModel().setResult(regionStats)); @@ -164,7 +164,7 @@ public class OfficeSellController { } /** - * 写字楼出售均价走势 + * 鍐欏瓧妤煎嚭鍞潎浠疯蛋鍔� * * @return */ @@ -174,11 +174,11 @@ public class OfficeSellController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(city)) { - mav.setModel(BasicModel.buildBadRequestModel("city不能为null")); + mav.setModel(BasicModel.buildBadRequestModel("city涓嶈兘涓簄ull")); return mav; } if (StringUtils.isBlank(district)) { - mav.setModel(BasicModel.buildBadRequestModel("district不能为null")); + mav.setModel(BasicModel.buildBadRequestModel("district涓嶈兘涓簄ull")); return mav; } if (!RegionData.isCity(city)) { @@ -186,34 +186,34 @@ public class OfficeSellController { if (StringUtils.isNotBlank(formatCity)) { city = formatCity; } else { - mav.setModel(BasicModel.buildBadRequestModel("city非法")); + mav.setModel(BasicModel.buildBadRequestModel("city闈炴硶")); return mav; } } ServerArea serverArea = ServerAreaData.getServerAreaByCity(city); if (null == serverArea) { - mav.setModel(BasicModel.buildBadRequestModel("city非法")); + mav.setModel(BasicModel.buildBadRequestModel("city闈炴硶")); return mav; } String region = RegionData.formatRegion(city, district); if (!RegionData.isRegion(city, region)) { - mav.setModel(BasicModel.buildBadRequestModel("没有找你输入的区域")); + mav.setModel(BasicModel.buildBadRequestModel("娌℃湁鎵句綘杈撳叆鐨勫尯鍩�")); return mav; } if (startDate == null || endDate == null) { - mav.setModel(BasicModel.buildBadRequestModel("startDate或endDate不能为null")); + mav.setModel(BasicModel.buildBadRequestModel("startDate鎴杄ndDate涓嶈兘涓簄ull")); return mav; } if (startDate > endDate) { - mav.setModel(BasicModel.buildBadRequestModel("startDate不能大于endDate")); + mav.setModel(BasicModel.buildBadRequestModel("startDate涓嶈兘澶т簬endDate")); return mav; } List regionStats = officeService.findOfficeSellStat(city, region, name, "office", startDate, endDate); if (CollectionUtils.isEmpty(regionStats)) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "该写字楼没有均价数据")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "璇ュ啓瀛楁ゼ娌℃湁鍧囦环鏁版嵁")); return mav; } mav.setModel(BasicModel.buildOKModel().setResult(regionStats)); @@ -221,7 +221,7 @@ public class OfficeSellController { } /** - * 写字楼售价评估 + * 鍐欏瓧妤煎敭浠疯瘎浼� * * @param model * @param request @@ -232,24 +232,24 @@ public class OfficeSellController { mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity()) || model.getSize()<=0) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:城市,面积为必填项")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:鍩庡競,闈㈢Н涓哄繀濉」")); return mav; } if (StringUtils.isBlank(model.getName()) && StringUtils.isBlank(model.getAddress()) ) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:名称或地址至少填一个")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:鍚嶇О鎴栧湴鍧�鑷冲皯濉竴涓�")); return mav; } - /* 先到CPDB库中查找写字楼 */ + /* 鍏堝埌CPDB搴撲腑鏌ユ壘鍐欏瓧妤� */ District district = null; if(StringUtils.isNotBlank(model.getDistrict()) && StringUtils.isNotBlank(model.getName())) { district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(), "office"); } if (district == null) { - if (StringUtils.isNotBlank(model.getDistrict()) && (model.getDistrict().contains("市辖区") || model.getDistrict().contains(model.getCity()))) { + if (StringUtils.isNotBlank(model.getDistrict()) && (model.getDistrict().contains("甯傝緰鍖�") || model.getDistrict().contains(model.getCity()))) { district = districtService.findByNameAndAlias(model.getCity(), null, model.getName(), "office"); } @@ -269,29 +269,29 @@ public class OfficeSellController { } if (district == null) { - mav.setModel(BasicModel.buildBadRequestModel("该写字楼不存在")); + mav.setModel(BasicModel.buildBadRequestModel("璇ュ啓瀛楁ゼ涓嶅瓨鍦�")); return mav; } model.setName(district.getName()); if (model.getMaxFloor() != null && (model.getMaxFloor() <= 0 || model.getMaxFloor() > 59)) { - mav.setModel(BasicModel.buildBadRequestModel("maxFloor取值非法,正确范围[1,60)")); + mav.setModel(BasicModel.buildBadRequestModel("maxFloor鍙栧�奸潪娉�,姝g‘鑼冨洿[1,60)")); return mav; } if (model.getFloor() != null && (model.getFloor() <= 0 || model.getFloor() > 59)) { - mav.setModel(BasicModel.buildBadRequestModel("floor取值非法,正确范围[1,60)")); + mav.setModel(BasicModel.buildBadRequestModel("floor鍙栧�奸潪娉�,姝g‘鑼冨洿[1,60)")); return mav; } if (model.getMaxFloor() != null && model.getFloor() != null && model.getFloor() > model.getMaxFloor()) { - mav.setModel(BasicModel.buildBadRequestModel("所在楼层不能大于总楼层")); + mav.setModel(BasicModel.buildBadRequestModel("鎵�鍦ㄦゼ灞備笉鑳藉ぇ浜庢�绘ゼ灞�")); return mav; } if(district.getCity()!=null){ ServerArea serverArea = serverAreaService.findByDisplay(district.getCity()); if(serverArea!=null && serverArea.getNewCityGrade()>=3000){ - mav.setModel(BasicModel.buildServerErrorModel().setMsg("当前仅支持一、二线城市,暂不支持您选择的城市")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("褰撳墠浠呮敮鎸佷竴銆佷簩绾垮煄甯傦紝鏆備笉鏀寔鎮ㄩ�夋嫨鐨勫煄甯�")); return mav; } } @@ -355,13 +355,13 @@ public class OfficeSellController { return mav; } else { - mav.setModel(BasicModel.buildOKModel().setMsg("暂时不支持该写字楼的评估").markNoData()); + mav.setModel(BasicModel.buildOKModel().setMsg("鏆傛椂涓嶆敮鎸佽鍐欏瓧妤肩殑璇勪及").markNoData()); return mav; } } /** - * 写字楼售价地址估值 + * 鍐欏瓧妤煎敭浠峰湴鍧�浼板�� * * @param model * @param request @@ -371,28 +371,28 @@ public class OfficeSellController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getAddress()) || model.getSize() <= 0) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:城市,地址,面积(size)为必填项")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:鍩庡競,鍦板潃,闈㈢Н(size)涓哄繀濉」")); return mav; } - if (model.getCity().endsWith("市")) { - model.setCity(model.getCity().replaceAll("市$", "")); + if (model.getCity().endsWith("甯�")) { + model.setCity(model.getCity().replaceAll("甯�$", "")); } if (model.getCarportPrice() != null && (model.getCarportPrice() < 0 || model.getCarportPrice() > 1000000)) { - mav.setModel(BasicModel.buildBadRequestModel("carportPrice(车位)取值不合法")); + mav.setModel(BasicModel.buildBadRequestModel("carportPrice(杞︿綅)鍙栧�间笉鍚堟硶")); return mav; } if (model.getMaxFloor() != null && (model.getMaxFloor() <= 0 || model.getMaxFloor() > 59)) { - mav.setModel(BasicModel.buildBadRequestModel("maxFloor取值非法,正确范围[1,60)")); + mav.setModel(BasicModel.buildBadRequestModel("maxFloor鍙栧�奸潪娉�,姝g‘鑼冨洿[1,60)")); return mav; } if (model.getFloor() != null && (model.getFloor() <= 0 || model.getFloor() > 59)) { - mav.setModel(BasicModel.buildBadRequestModel("floor取值非法,正确范围[1,60)")); + mav.setModel(BasicModel.buildBadRequestModel("floor鍙栧�奸潪娉�,姝g‘鑼冨洿[1,60)")); return mav; } if (model.getMaxFloor() != null && model.getFloor() != null && model.getFloor() > model.getMaxFloor()) { - mav.setModel(BasicModel.buildBadRequestModel("所在楼层不能大于总楼层")); + mav.setModel(BasicModel.buildBadRequestModel("鎵�鍦ㄦゼ灞備笉鑳藉ぇ浜庢�绘ゼ灞�")); return mav; } @@ -433,7 +433,7 @@ public class OfficeSellController { return mav; } else { - mav.setModel(BasicModel.buildOKModel().setMsg("暂时不支持该地址写字楼的评估").markNoData()); + mav.setModel(BasicModel.buildOKModel().setMsg("鏆傛椂涓嶆敮鎸佽鍦板潃鍐欏瓧妤肩殑璇勪及").markNoData()); return mav; } } @@ -444,24 +444,24 @@ public class OfficeSellController { mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity()) || model.getSize()<=0) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:城市,面积为必填项")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:鍩庡競,闈㈢Н涓哄繀濉」")); return mav; } if (StringUtils.isBlank(model.getName()) && StringUtils.isBlank(model.getAddress()) ) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:名称或地址至少填一个")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:鍚嶇О鎴栧湴鍧�鑷冲皯濉竴涓�")); return mav; } Double ratio = getUserPriceRatio(request); - /* 先到CPDB库中查找写字楼 */ + /* 鍏堝埌CPDB搴撲腑鏌ユ壘鍐欏瓧妤� */ District district = null; if(StringUtils.isNotBlank(model.getDistrict()) && StringUtils.isNotBlank(model.getName())) { district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(), "office"); } if (district == null) { - if (StringUtils.isNotBlank(model.getDistrict()) && (model.getDistrict().contains("市辖区") || model.getDistrict().contains(model.getCity()))) { + if (StringUtils.isNotBlank(model.getDistrict()) && (model.getDistrict().contains("甯傝緰鍖�") || model.getDistrict().contains(model.getCity()))) { district = districtService.findByNameAndAlias(model.getCity(), null, model.getName(), "office"); } @@ -481,29 +481,29 @@ public class OfficeSellController { } if (district == null) { - mav.setModel(BasicModel.buildBadRequestModel("该写字楼不存在")); + mav.setModel(BasicModel.buildBadRequestModel("璇ュ啓瀛楁ゼ涓嶅瓨鍦�")); return mav; } model.setName(district.getName()); if (model.getMaxFloor() != null && (model.getMaxFloor() <= 0 || model.getMaxFloor() > 59)) { - mav.setModel(BasicModel.buildBadRequestModel("maxFloor取值非法,正确范围[1,60)")); + mav.setModel(BasicModel.buildBadRequestModel("maxFloor鍙栧�奸潪娉�,姝g‘鑼冨洿[1,60)")); return mav; } if (model.getFloor() != null && (model.getFloor() <= 0 || model.getFloor() > 59)) { - mav.setModel(BasicModel.buildBadRequestModel("floor取值非法,正确范围[1,60)")); + mav.setModel(BasicModel.buildBadRequestModel("floor鍙栧�奸潪娉�,姝g‘鑼冨洿[1,60)")); return mav; } if (model.getMaxFloor() != null && model.getFloor() != null && model.getFloor() > model.getMaxFloor()) { - mav.setModel(BasicModel.buildBadRequestModel("所在楼层不能大于总楼层")); + mav.setModel(BasicModel.buildBadRequestModel("鎵�鍦ㄦゼ灞備笉鑳藉ぇ浜庢�绘ゼ灞�")); return mav; } if(district.getCity()!=null){ ServerArea serverArea = serverAreaService.findByDisplay(district.getCity()); if(serverArea!=null && serverArea.getNewCityGrade()>=3000){ - mav.setModel(BasicModel.buildServerErrorModel().setMsg("当前仅支持一、二线城市,暂不支持您选择的城市")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("褰撳墠浠呮敮鎸佷竴銆佷簩绾垮煄甯傦紝鏆備笉鏀寔鎮ㄩ�夋嫨鐨勫煄甯�")); return mav; } } @@ -527,7 +527,7 @@ public class OfficeSellController { /** - * 湖北征信定制写字楼案例接口 + * 婀栧寳寰佷俊瀹氬埗鍐欏瓧妤兼渚嬫帴鍙� * @param model * @param request * @return @@ -537,24 +537,24 @@ public class OfficeSellController { mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity()) || model.getSize()<=0) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:城市,面积为必填项")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:鍩庡競,闈㈢Н涓哄繀濉」")); return mav; } if (StringUtils.isBlank(model.getName()) && StringUtils.isBlank(model.getAddress()) ) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:名称或地址至少填一个")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:鍚嶇О鎴栧湴鍧�鑷冲皯濉竴涓�")); return mav; } Double ratio = getUserPriceRatio(request); - /* 先到CPDB库中查找写字楼 */ + /* 鍏堝埌CPDB搴撲腑鏌ユ壘鍐欏瓧妤� */ District district = null; if(StringUtils.isNotBlank(model.getDistrict()) && StringUtils.isNotBlank(model.getName())) { district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(), "office"); } if (district == null) { - if (StringUtils.isNotBlank(model.getDistrict()) && (model.getDistrict().contains("市辖区") || model.getDistrict().contains(model.getCity()))) { + if (StringUtils.isNotBlank(model.getDistrict()) && (model.getDistrict().contains("甯傝緰鍖�") || model.getDistrict().contains(model.getCity()))) { district = districtService.findByNameAndAlias(model.getCity(), null, model.getName(), "office"); } @@ -574,29 +574,29 @@ public class OfficeSellController { } if (district == null) { - mav.setModel(BasicModel.buildBadRequestModel("该写字楼不存在")); + mav.setModel(BasicModel.buildBadRequestModel("璇ュ啓瀛楁ゼ涓嶅瓨鍦�")); return mav; } model.setName(district.getName()); if (model.getMaxFloor() != null && (model.getMaxFloor() <= 0 || model.getMaxFloor() > 59)) { - mav.setModel(BasicModel.buildBadRequestModel("maxFloor取值非法,正确范围[1,60)")); + mav.setModel(BasicModel.buildBadRequestModel("maxFloor鍙栧�奸潪娉�,姝g‘鑼冨洿[1,60)")); return mav; } if (model.getFloor() != null && (model.getFloor() <= 0 || model.getFloor() > 59)) { - mav.setModel(BasicModel.buildBadRequestModel("floor取值非法,正确范围[1,60)")); + mav.setModel(BasicModel.buildBadRequestModel("floor鍙栧�奸潪娉�,姝g‘鑼冨洿[1,60)")); return mav; } if (model.getMaxFloor() != null && model.getFloor() != null && model.getFloor() > model.getMaxFloor()) { - mav.setModel(BasicModel.buildBadRequestModel("所在楼层不能大于总楼层")); + mav.setModel(BasicModel.buildBadRequestModel("鎵�鍦ㄦゼ灞備笉鑳藉ぇ浜庢�绘ゼ灞�")); return mav; } if(district.getCity()!=null){ ServerArea serverArea = serverAreaService.findByDisplay(district.getCity()); if(serverArea!=null && serverArea.getNewCityGrade()>=3000){ - mav.setModel(BasicModel.buildServerErrorModel().setMsg("当前仅支持一、二线城市,暂不支持您选择的城市")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("褰撳墠浠呮敮鎸佷竴銆佷簩绾垮煄甯傦紝鏆備笉鏀寔鎮ㄩ�夋嫨鐨勫煄甯�")); return mav; } } @@ -674,7 +674,7 @@ public class OfficeSellController { } /** - * 通过EvaluationModel组装Evaluation实体 + * 閫氳繃EvaluationModel缁勮Evaluation瀹炰綋 * * @param model * @param request @@ -808,13 +808,13 @@ public class OfficeSellController { if (model.isNewDistrict()) { evaluation.setNewDistrict(model.isNewDistrict()); } - String floorDesc = "中"; + String floorDesc = "涓�"; if (evaluation.getFloor() != null && evaluation.getHeight() != null) { Double floorInfo = evaluation.getFloor() * 1.0 / evaluation.getHeight(); if (floorInfo <= 0.33) { - floorDesc = "低"; + floorDesc = "浣�"; } else if (floorInfo > 0.66) { - floorDesc = "高"; + floorDesc = "楂�"; } evaluation.setFloorDesc(floorDesc); } @@ -873,10 +873,10 @@ public class OfficeSellController { dto.setSize(house.getArea()); if (StringUtils.isNotBlank(house.getPublishDate())) { String numberStr = house.getPublishDate(); - // 拆分字符串并格式化 - String year = numberStr.substring(0, 4); // 前四位是年份 - String month = numberStr.substring(4, 6); // 中间两位是月份 - String day = numberStr.substring(6, 8); // 最后两位是日期 + // 鎷嗗垎瀛楃涓插苟鏍煎紡鍖� + String year = numberStr.substring(0, 4); // 鍓嶅洓浣嶆槸骞翠唤 + String month = numberStr.substring(4, 6); // 涓棿涓や綅鏄湀浠� + String day = numberStr.substring(6, 8); // 鏈�鍚庝袱浣嶆槸鏃ユ湡 String formattedDate = year + "-" + month + "-" + day; dto.setCaseDate(formattedDate); } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OurxnController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OurxnController.java index 2211938fd..857e1f28d 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OurxnController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OurxnController.java @@ -86,7 +86,7 @@ public class OurxnController { } /** - * 调用匹配接口匹配小区 + * 璋冪敤鍖归厤鎺ュ彛鍖归厤灏忓尯 * @param city * @param keyword * @return diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PaphController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PaphController.java index 905b14653..d9a0d6833 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PaphController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PaphController.java @@ -32,7 +32,7 @@ import java.util.*; import java.util.regex.Pattern; /** - * @author 王文艳 + * @author 鐜嬫枃鑹� * @create 2016-11-14 **/ @Authority(role = Role.USER) @@ -45,7 +45,7 @@ public class PaphController { private static final String EVALUATE_WAY_ARTIFICIAL = "artificial"; private static final List REQUEST_TYPES = Arrays.asList(AUTO_EVALUATE, ARTIFICIAL_EVALUATE, FETCH_EVALUATE_RESULT); private static final Logger logger = LoggerFactory.getLogger(PaphController.class); - private static final Pattern INVALID_INPUT_PATTERN = Pattern.compile(".*(无).*"); + private static final Pattern INVALID_INPUT_PATTERN = Pattern.compile(".*(鏃�).*"); private static final Pattern DISTRICT_CODE_PATTERN = Pattern.compile("^\\d{6}$"); private DistrictCodeService districtCodeService; @@ -60,7 +60,7 @@ public class PaphController { RestfulModelAndView mav = new RestfulModelAndView(); if(!REQUEST_TYPES.contains(model.getRequestType())){ - mav.setModel(BasicModel.buildBadRequestModel("requestType取值非法")); + mav.setModel(BasicModel.buildBadRequestModel("requestType鍙栧�奸潪娉�")); return mav; } BasicModel validateModel = validate(model); @@ -98,12 +98,12 @@ public class PaphController { }else{ DistrictCode districtCode = districtCodeService.findDistrictCode(model.getProvinceId(), model.getCityId(), model.getAreaId()); if(districtCode == null){ - mav.setModel(BasicModel.buildBadRequestModel("不支持的区划编码")); + mav.setModel(BasicModel.buildBadRequestModel("涓嶆敮鎸佺殑鍖哄垝缂栫爜")); return mav; } ApiUser apiUser = parseApiUserByToken(model); if(!isAuthCity(districtCode.getCity(), apiUser)){ - mav.setModel(BasicModel.buildUnAuthorizedModel().setMsg("没有权限访问对应的资源(您未开通城市" + districtCode.getCity() + "的权限)")); + mav.setModel(BasicModel.buildUnAuthorizedModel().setMsg("娌℃湁鏉冮檺璁块棶瀵瑰簲鐨勮祫婧�(鎮ㄦ湭寮�閫氬煄甯�" + districtCode.getCity() + "鐨勬潈闄�)")); return mav; } @@ -190,12 +190,12 @@ public class PaphController { } paphEvaluate.setEvaluateWay(EVALUATE_WAY_ARTIFICIAL); paphEvaluateService.save(paphEvaluate); - String msg = "【房价网】接收到来自平安普惠的人工估价请求,caseId:" + paphEvaluate.getCaseId() + ",请及时处理! 时间:" + DateUtil.formatToTightYYYYMMDDhhmmss(new Date()); + String msg = "銆愭埧浠风綉銆戞帴鏀跺埌鏉ヨ嚜骞冲畨鏅儬鐨勪汉宸ヤ及浠疯姹�,caseId:" + paphEvaluate.getCaseId() + ",璇峰強鏃跺鐞�! 鏃堕棿:" + DateUtil.formatToTightYYYYMMDDhhmmss(new Date()); for(String mobile : MOBILES){ try { smsService.send(mobile, msg); } catch (SmsException e) { - logger.error(mobile + "短信发送失败"); + logger.error(mobile + "鐭俊鍙戦�佸け璐�"); } } try { @@ -304,103 +304,103 @@ public class PaphController { if(!model.getRequestType().equals(FETCH_EVALUATE_RESULT)){ if(StringUtils.isBlank(model.getCaseId())){ - return BasicModel.buildBadRequestModel("caseId不能为空"); + return BasicModel.buildBadRequestModel("caseId涓嶈兘涓虹┖"); } if(StringUtils.isBlank(model.getProjectName())){ - return BasicModel.buildBadRequestModel("projectName不能为空"); + return BasicModel.buildBadRequestModel("projectName涓嶈兘涓虹┖"); } if(StringUtils.isBlank(model.getAddress())){ - return BasicModel.buildBadRequestModel("address不能为空"); + return BasicModel.buildBadRequestModel("address涓嶈兘涓虹┖"); } if(isInvalidKeyword(model.getProjectName()) && isInvalidKeyword(model.getAddress())){ - return BasicModel.buildBadRequestModel("address和projectName至少有一个包含有效信息"); + return BasicModel.buildBadRequestModel("address鍜宲rojectName鑷冲皯鏈変竴涓寘鍚湁鏁堜俊鎭�"); } if(model.getBuildArea() == null || model.getBuildArea() <=0 || model.getBuildArea() >= 1000){ - return BasicModel.buildBadRequestModel("buildArea不能为空,且在0~1000之间"); + return BasicModel.buildBadRequestModel("buildArea涓嶈兘涓虹┖锛屼笖鍦�0~1000涔嬮棿"); } if(StringUtils.isBlank(model.getProvinceId())){ - return BasicModel.buildBadRequestModel("provinceId不能为空"); + return BasicModel.buildBadRequestModel("provinceId涓嶈兘涓虹┖"); } if(!isValidDistrictCode(model.getProvinceId())){ - return BasicModel.buildBadRequestModel("provinceId不合法,必须是6位数字"); + return BasicModel.buildBadRequestModel("provinceId涓嶅悎娉�,蹇呴』鏄�6浣嶆暟瀛�"); } if(StringUtils.isBlank(model.getCityId())){ - return BasicModel.buildBadRequestModel("cityId不能为空"); + return BasicModel.buildBadRequestModel("cityId涓嶈兘涓虹┖"); } if(!isValidDistrictCode(model.getCityId())){ - return BasicModel.buildBadRequestModel("cityId不合法,必须是6位数字"); + return BasicModel.buildBadRequestModel("cityId涓嶅悎娉�,蹇呴』鏄�6浣嶆暟瀛�"); } if(StringUtils.isBlank(model.getAreaId())){ - return BasicModel.buildBadRequestModel("areaId不能为空"); + return BasicModel.buildBadRequestModel("areaId涓嶈兘涓虹┖"); } if(!isValidDistrictCode(model.getAreaId())){ - return BasicModel.buildBadRequestModel("areaId不合法,必须是6位数字"); + return BasicModel.buildBadRequestModel("areaId涓嶅悎娉�,蹇呴』鏄�6浣嶆暟瀛�"); } if(!model.getCityId().equals(model.getAreaId().replaceAll("\\w\\w$","00"))){ - return BasicModel.buildBadRequestModel("cityId和areaId没有隶属关系"); + return BasicModel.buildBadRequestModel("cityId鍜宎reaId娌℃湁闅跺睘鍏崇郴"); } if(!model.getProvinceId().equals(model.getCityId().replaceAll("\\w\\w\\w\\w$","0000"))){ - return BasicModel.buildBadRequestModel("provinceId和cityId没有隶属关系"); + return BasicModel.buildBadRequestModel("provinceId鍜宑ityId娌℃湁闅跺睘鍏崇郴"); } if(StringUtils.isBlank(model.getHouseCardNo())){ - return BasicModel.buildBadRequestModel("houseCardNo不能为空"); + return BasicModel.buildBadRequestModel("houseCardNo涓嶈兘涓虹┖"); } if(StringUtils.isBlank(model.getEndDate())){ - return BasicModel.buildBadRequestModel("endDate不能为空"); + return BasicModel.buildBadRequestModel("endDate涓嶈兘涓虹┖"); } if(StringUtils.isBlank(model.getRegDate())){ - return BasicModel.buildBadRequestModel("regDate不能为空"); + return BasicModel.buildBadRequestModel("regDate涓嶈兘涓虹┖"); } if(StringUtils.isBlank(model.getHouseState())){ - return BasicModel.buildBadRequestModel("houseState不能为空"); + return BasicModel.buildBadRequestModel("houseState涓嶈兘涓虹┖"); } if(StringUtils.isBlank(model.getIsSub())){ - return BasicModel.buildBadRequestModel("isSub不能为空"); + return BasicModel.buildBadRequestModel("isSub涓嶈兘涓虹┖"); } if(model.getFloor() == null){ - return BasicModel.buildBadRequestModel("floor不能为空"); + return BasicModel.buildBadRequestModel("floor涓嶈兘涓虹┖"); } if(model.getTotalFloor() == null){ - return BasicModel.buildBadRequestModel("totalFloor不能为空"); + return BasicModel.buildBadRequestModel("totalFloor涓嶈兘涓虹┖"); } if(model.getTotalFloor() <= 0 || model.getTotalFloor() > 59){ - return BasicModel.buildBadRequestModel("totalFloor在0~60之间"); + return BasicModel.buildBadRequestModel("totalFloor鍦�0~60涔嬮棿"); } if(model.getFloor() > model.getTotalFloor()){ - return BasicModel.buildBadRequestModel("floor不能大于totalFloor"); + return BasicModel.buildBadRequestModel("floor涓嶈兘澶т簬totalFloor"); } if(model.getFloor() <= 0){ - return BasicModel.buildBadRequestModel("floor必须大于0"); + return BasicModel.buildBadRequestModel("floor蹇呴』澶т簬0"); } } return null; } /** - * 是否有权限访问该城市 + * 鏄惁鏈夋潈闄愯闂鍩庡競 * * @param cityName * @param apiUser * @return */ private boolean isAuthCity(String cityName, ApiUser apiUser) { - // 若访问当前接口不需要城市参数,则返回true + // 鑻ヨ闂綋鍓嶆帴鍙d笉闇�瑕佸煄甯傚弬鏁帮紝鍒欒繑鍥瀟rue if (StringUtils.isBlank(cityName)) { return true; } - // 若当前接口需要城市,检查是否有访问当前城市的权限 + // 鑻ュ綋鍓嶆帴鍙i渶瑕佸煄甯�,妫�鏌ユ槸鍚︽湁璁块棶褰撳墠鍩庡競鐨勬潈闄� boolean authCity = StringUtils.isNotBlank(apiUser.getCity()) && StringUtils.equalsIgnoreCase(apiUser.getCity(), "all"); if (StringUtils.isNotBlank(apiUser.getCity()) && !authCity) { ServerArea city = ServerAreaData.getServerAreaByDisplayDefaultNull(cityName); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PdsController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PdsController.java index 8ebc0e92f..ebc4314c1 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PdsController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PdsController.java @@ -125,7 +125,7 @@ public class PdsController { } /** - * 获取小区的房号信息 + * 鑾峰彇灏忓尯鐨勬埧鍙蜂俊鎭� * @param model * @return */ @@ -147,7 +147,7 @@ public class PdsController { RestfulModelAndView mav = new RestfulModelAndView(); Map data = new HashMap(); DistrictKey key = new DistrictKey(model.getCity(), model.getDistrict(), model.getName()); - //均价 + //鍧囦环 Integer avgPrice = districtStatService.findLatestDistrictAvgPrice(model.getCity(), model.getDistrict(), null, model.getName()); if(avgPrice>0){ data.put("avgPrice",avgPrice); @@ -173,23 +173,23 @@ public class PdsController { dto.setName(model.getAddress()); model.setName(model.getAddress()); - //地址匹配信息 再次进行匹配会导致匹配失败,然后不能估价,只要确保pds过来的小区是通过下拉选择的即可 + //鍦板潃鍖归厤淇℃伅 鍐嶆杩涜鍖归厤浼氬鑷村尮閰嶅け璐ワ紝鐒跺悗涓嶈兘浼颁环锛屽彧瑕佺‘淇漰ds杩囨潵鐨勫皬鍖烘槸閫氳繃涓嬫媺閫夋嫨鐨勫嵆鍙� /*boolean addressMaRes = houseAddressMatch(model, dto); if (!addressMaRes) { - mav.setModel(BasicModel.buildBadRequestModel("地址不存在")); + mav.setModel(BasicModel.buildBadRequestModel("鍦板潃涓嶅瓨鍦�")); return mav; }*/ - //创建evaluation对象 + //鍒涘缓evaluation瀵硅薄 Evaluation evaluation = creEvaluationModel(model); - // 获取房屋总价 + // 鑾峰彇鎴垮眿鎬讳环 boolean houseEvaRes = houseEvaluation(model, evaluation, dto); if (!houseEvaRes) { mav.setModel(BasicModel.buildBadRequestModel(dto.getName())); return mav; } - //小区房子年龄,经纬度,小区图片相关信息 + //灏忓尯鎴垮瓙骞撮緞锛岀粡绾害锛屽皬鍖哄浘鐗囩浉鍏充俊鎭� District district = districtService.findDistrict(new DistrictKey(dto.getCity(), dto.getDistrict(), dto.getName()), "district"); districtInfo(district, dto); @@ -197,125 +197,125 @@ public class PdsController { DistrictAnalyData districtAnalyData = districtAnalyDataService.findByDistrictKey(key); - //均价 + //鍧囦环 Integer avgPrice = districtStatService.findLatestDistrictAvgPrice(dto.getCity(), dto.getDistrict(), null, dto.getName()); dto.setAvgPrice(avgPrice); - //小区年涨幅、月涨幅、12个月的小区涨跌幅 + //灏忓尯骞存定骞呫�佹湀娑ㄥ箙銆�12涓湀鐨勫皬鍖烘定璺屽箙 List districtsSellStats = districtSellStatService.getAllWithMonths(dto.getCity(), dto.getDistrict(), dto.getName(), 12); districtRiseAndDown(districtsSellStats, dto); - //获取房源 + //鑾峰彇鎴挎簮 try { houseResource(avgPrice, dto); } catch (Exception e) { List> houses = new ArrayList>(); dto.setHouses(houses); - logger.error("PDS估价房源异常",e); + logger.error("PDS浼颁环鎴挎簮寮傚父",e); } - // 获取城市近12个月的年涨幅 + // 鑾峰彇鍩庡競杩�12涓湀鐨勫勾娑ㄥ箙 Integer cityAvgPrice = cityRiseAndDown(dto); dto.setCityAvgPrice(cityAvgPrice); - //获取区域近12个月的涨幅 + //鑾峰彇鍖哄煙杩�12涓湀鐨勬定骞� Double regionYoy = regionRiseAndDown(dto); - // 抵押品年涨跌幅得分 + // 鎶垫娂鍝佸勾娑ㄨ穼骞呭緱鍒� collYoyIncScore(districtAnalyData, dto); - //抵押品年涨跌幅排名比 + //鎶垫娂鍝佸勾娑ㄨ穼骞呮帓鍚嶆瘮 collRiseAndDownLevl(districtAnalyData, dto); - //城市价格异常指数 + //鍩庡競浠锋牸寮傚父鎸囨暟 Double cityPriceStability = 0d; if(districtAnalyData!=null&&districtAnalyData.getYoyCityTotal()!=null&&districtAnalyData.getYoyCityRank()!=null){ cityPriceStability = MathUtils.getPriceStability(districtAnalyData.getYoyCityTotal(), districtAnalyData.getYoyCityRank()); } dto.setCityPriceStability(cityPriceStability); - //区域价格异常指数 + //鍖哄煙浠锋牸寮傚父鎸囨暟 Double regionPriceStability = 0d; if(districtAnalyData!=null&&districtAnalyData.getYoyRegionTotal()!=null&&districtAnalyData.getYoyRegionRank()!=null){ regionPriceStability = MathUtils.getPriceStability(districtAnalyData.getYoyRegionTotal(), districtAnalyData.getYoyRegionRank()); } dto.setRegionPriceStability(regionPriceStability); - //小区年涨跌幅(没有年涨幅用半年、季度) + //灏忓尯骞存定璺屽箙(娌℃湁骞存定骞呯敤鍗婂勾銆佸搴�) Double yoyRiseDown = getAbsYoy(districtAnalyData,avgPrice,dto.getCitySellStats(),dto.getRegionSellStats()); - //与区域年涨跌幅差比 + //涓庡尯鍩熷勾娑ㄨ穼骞呭樊姣� Double yoyRegionAbs = yoyRegionRiseAndDownAbs(districtAnalyData,yoyRiseDown,regionYoy); - //获取pds相关系数 + //鑾峰彇pds鐩稿叧绯绘暟 PdsRatio pdsRatio = getPdsRatio(model); - // 一年以上抵押品价格异常指数 + // 涓�骞翠互涓婃姷鎶煎搧浠锋牸寮傚父鎸囨暟 Double priceStability = getPriceStabilityValue(yoyRiseDown, yoyRegionAbs, pdsRatio,regionYoy); dto.setPriceStability(priceStability); Double priceStabilityLess = getPriceStabilityLessValue(yoyRiseDown,yoyRegionAbs,pdsRatio); dto.setPriceStabilityLess(priceStabilityLess); - // 抵押品价格指数,价格城市排名 - Double priceScore = collPriceIndex(districtAnalyData, dto);//价格指数 + // 鎶垫娂鍝佷环鏍兼寚鏁�,浠锋牸鍩庡競鎺掑悕 + Double priceScore = collPriceIndex(districtAnalyData, dto);//浠锋牸鎸囨暟 - // 最高中介数 + // 鏈�楂樹腑浠嬫暟 int maxAgencyMount = agencyMountLevelService.findMaxAgencyMount(dto.getCity()); dto.setMaxAgencyMount(maxAgencyMount); - //拥有户数数量、城市最高户数、户数城市排名、 + //鎷ユ湁鎴锋暟鏁伴噺銆佸煄甯傛渶楂樻埛鏁般�佹埛鏁板煄甯傛帓鍚嶃�� houseHoldInfo(districtAnalyData, dto); - // 小区同类型挂牌房源量排名得分 + // 灏忓尯鍚岀被鍨嬫寕鐗屾埧婧愰噺鎺掑悕寰楀垎 Double houseQuoteScore = getQuoteSellInfo(model, dto); - //城市成交量得分 + //鍩庡競鎴愪氦閲忓緱鍒� Double houseSellScore = getSellScoreInfo(districtAnalyData); - //带看数得分 + //甯︾湅鏁板緱鍒� Double seeTimeScore = getSeeScoreInfo(districtAnalyData); - //户数得分 + //鎴锋暟寰楀垎 Double houseHoldScore = getHouseHoldScoreInfo(districtAnalyData); - //中介数得分、知名中介数量、其他中介数量 、中介城市排名 + //涓粙鏁板緱鍒嗐�佺煡鍚嶄腑浠嬫暟閲忋�佸叾浠栦腑浠嬫暟閲� 銆佷腑浠嬪煄甯傛帓鍚� AgencyMountLevel agencyMountLevel = agencyMountLevelService.findAgencyMountLevelParam(dto.getCity(), dto.getDistrict(),dto.getName()); Double agencyScore= getAgencyInfo(agencyMountLevel, model, dto, pdsRatio); dto.setAgencyScore(agencyScore); - //总价相关得分 + //鎬讳环鐩稿叧寰楀垎 Double totalPriceScore = getTotalPriceScoreInfo(cityAvgPrice, dto, pdsRatio); - //近6个月挂牌量、近1个月挂牌量、近六个月最高挂牌量、6个月挂牌量在城市排名、挂牌量得分 + //杩�6涓湀鎸傜墝閲忋�佽繎1涓湀鎸傜墝閲忋�佽繎鍏釜鏈堟渶楂樻寕鐗岄噺銆�6涓湀鎸傜墝閲忓湪鍩庡競鎺掑悕銆佹寕鐗岄噺寰楀垎 Double quoteScore = getQuoteInfo(districtAnalyData, dto, key, pdsRatio); dto.setQuoteScore(quoteScore); - //近6个月成交量、1个月成交量、近6个月最高成交量、6个月成交量在城市排名、成交量得分 + //杩�6涓湀鎴愪氦閲忋��1涓湀鎴愪氦閲忋�佽繎6涓湀鏈�楂樻垚浜ら噺銆�6涓湀鎴愪氦閲忓湪鍩庡競鎺掑悕銆佹垚浜ら噺寰楀垎 getSellInfo(districtAnalyData, dto, key, pdsRatio); - //交通得分、交通情况城市排名、公交数量、地铁数量 + //浜ら�氬緱鍒嗐�佷氦閫氭儏鍐靛煄甯傛帓鍚嶃�佸叕浜ゆ暟閲忋�佸湴閾佹暟閲� Double trafficScore = getTrafficInfo(dto,key,pdsRatio); dto.setTrafficScore(trafficScore); - //小区密度得分 + //灏忓尯瀵嗗害寰楀垎 Double distirctDensityScore = getDistrictDensity(district, pdsRatio, districtAnalyData,dto); - // 处置难易度得分 + // 澶勭疆闅炬槗搴﹀緱鍒� Double handleDegreeScore = getHandleDegreeScore(pdsRatio,agencyScore,quoteScore,trafficScore,distirctDensityScore,totalPriceScore); dto.setHandleDegreeScore(handleDegreeScore); - // 押品综合评分 + // 鎶煎搧缁煎悎璇勫垎 Double collateralTotalScore = getCollateralTotalScore(handleDegreeScore,priceStability,pdsRatio); dto.setCollateralTotalScore(collateralTotalScore); - //获取抵押率系数相关 + //鑾峰彇鎶垫娂鐜囩郴鏁扮浉鍏� - // 最高抵押率 + // 鏈�楂樻姷鎶肩巼 Double maxCollateralRate = MathUtils.getMaxCollateralRate(collateralTotalScore,model.getUsage()); dto.setMaxCollateralRate(maxCollateralRate); - // 可贷款金额 + // 鍙捶娆鹃噾棰� double loneAmount = MathUtils.getLoneAmount((double) collateralTotalScore, (double) (dto.getTotalPrice())); dto.setLoneAmount((int) loneAmount); Integer cpdbPriceLevel = cPDBPriceLevelService.findPriceLevel(dto.getTotalPrice()); - Integer cpdbMomLevel = cPDBPriceLevelService.findMomLevel(dto.getDisMom());//此处刚改 mom相关 + Integer cpdbMomLevel = cPDBPriceLevelService.findMomLevel(dto.getDisMom());//姝ゅ鍒氭敼 mom鐩稿叧 Integer cpdbCount = cPDBPriceLevelService.findCount(); Double priceCpdbRankRate = MathUtils.getLevelRate(cpdbPriceLevel, cpdbCount); Double cbdpIncreaseRate = MathUtils.getLevelRate(cpdbMomLevel, cpdbCount); @@ -325,20 +325,20 @@ public class PdsController { cpdbScoreRate =MathUtils.getLevelRate(cpdbScoreLevel, cpdbCount); } dto.setCpdbScoreLevelRate(cpdbScoreRate); - //小区得分在城市的中的排名 + //灏忓尯寰楀垎鍦ㄥ煄甯傜殑涓殑鎺掑悕 Double cityScoreLevelRate = 1d; DistrictCityScoreLevel districtCityScoreLevel = districtCityScoreLevelService.findByParams(dto.getCity(), dto.getDistrict(), dto.getName()); if(districtCityScoreLevel!=null&&districtCityScoreLevel.getCitySize()!=null&&districtCityScoreLevel.getTotalScoreLevel()!=null){ cityScoreLevelRate = MathUtils.getLevelRate(districtCityScoreLevel.getTotalScoreLevel(), districtCityScoreLevel.getCitySize()); } dto.setCityScoreLevelRate(cityScoreLevelRate); - // cpdb抵押瓶库增长率率排名 + // cpdb鎶垫娂鐡跺簱澧為暱鐜囩巼鎺掑悕 dto.setCbdpIncreaseRate(cbdpIncreaseRate); - // cpdb抵押品库价格排名 + // cpdb鎶垫娂鍝佸簱浠锋牸鎺掑悕 dto.setPriceCpdbRankRate(priceCpdbRankRate); Map averageStatistics = getAverageStatistics(key.getCity(),key.getRegion(), key.getName(), avgPrice); dto.setAverageStatistics(averageStatistics); - //获取 + //鑾峰彇 Map cityDistriceMinAndMaxPrice = districtStatService.getCityDistriceMinAndMaxPricePds(key.getCity()); Integer minS = cityDistriceMinAndMaxPrice.get("cityDistrictMinSellPrice"); Integer maxS = cityDistriceMinAndMaxPrice.get("cityDistrictMaxSellPrice"); @@ -356,19 +356,19 @@ public class PdsController { Map resultMap = new HashMap(); if(StringUtils.isBlank(model.getCity())){ - mav.setModel(BasicModel.buildBadRequestModel("城市为必填项")); + mav.setModel(BasicModel.buildBadRequestModel("鍩庡競涓哄繀濉」")); return mav; } if(StringUtils.isBlank(model.getDistrict())){ - mav.setModel(BasicModel.buildBadRequestModel("区域为必填项")); + mav.setModel(BasicModel.buildBadRequestModel("鍖哄煙涓哄繀濉」")); return mav; } if(StringUtils.isBlank(model.getName())){ - mav.setModel(BasicModel.buildBadRequestModel("小区名为必填项")); + mav.setModel(BasicModel.buildBadRequestModel("灏忓尯鍚嶄负蹇呭~椤�")); return mav; } if(model.getSize() == null || model.getSize()<=0){ - mav.setModel(BasicModel.buildBadRequestModel("面积为必填项且必须大于0")); + mav.setModel(BasicModel.buildBadRequestModel("闈㈢Н涓哄繀濉」涓斿繀椤诲ぇ浜�0")); return mav; } @@ -377,7 +377,7 @@ public class PdsController { dto.setDistrict(model.getDistrict()); dto.setName(model.getName()); - //创建evaluation对象 + //鍒涘缓evaluation瀵硅薄 Evaluation evaluation = creEvaluationModel(model); resultMap.put("city", model.getCity()); resultMap.put("region", model.getDistrict()); @@ -389,46 +389,46 @@ public class PdsController { resultMap.put("fitment", model.getFitment()); resultMap.put("direction", model.getDirection()); - // 获取房屋总价 + // 鑾峰彇鎴垮眿鎬讳环 boolean houseEvaRes = houseEvaluation(model, evaluation, dto); if (!houseEvaRes) { - mav.setModel(BasicModel.buildBadRequestModel("获取房屋价格失败")); + mav.setModel(BasicModel.buildBadRequestModel("鑾峰彇鎴垮眿浠锋牸澶辫触")); return mav; } resultMap.put("totalPrice", dto.getTotalPrice()); District district = districtService.findDistrict(new DistrictKey(dto.getCity(), dto.getDistrict(), dto.getName()), "district"); if(district == null){ - mav.setModel(BasicModel.buildBadRequestModel("该小区不存在")); + mav.setModel(BasicModel.buildBadRequestModel("璇ュ皬鍖轰笉瀛樺湪")); return mav; } DistrictKey key = new DistrictKey(dto.getCity(), dto.getDistrict(), dto.getName()); DistrictAnalyData districtAnalyData = districtAnalyDataService.findByDistrictKey(key); - //均价 + //鍧囦环 Integer avgPrice = districtStatService.findLatestDistrictAvgPrice(dto.getCity(), dto.getDistrict(), null, dto.getName()); resultMap.put("avgPrice", dto.getResultAvgPrice()); - //小区年涨幅、月涨幅、12个月的小区涨跌幅 + //灏忓尯骞存定骞呫�佹湀娑ㄥ箙銆�12涓湀鐨勫皬鍖烘定璺屽箙 List districtsSellStats = districtSellStatService.getAllWithMonths(dto.getCity(), dto.getDistrict(), dto.getName(), 12); districtRiseAndDown(districtsSellStats, dto); - resultMap.put("yoyIncrease", MathUtils.formatDouble(dto.getYoyIncrease()*100)); //年涨跌幅 - resultMap.put("disMom", MathUtils.formatDouble(dto.getDisMom()*100)); //月涨跌幅 + resultMap.put("yoyIncrease", MathUtils.formatDouble(dto.getYoyIncrease()*100)); //骞存定璺屽箙 + resultMap.put("disMom", MathUtils.formatDouble(dto.getDisMom()*100)); //鏈堟定璺屽箙 - //获取房源 + //鑾峰彇鎴挎簮 try { houseResource(avgPrice, dto); } catch (Exception e) { List> houses = new ArrayList>(); dto.setHouses(houses); - logger.error("PDS估价房源异常",e); + logger.error("PDS浼颁环鎴挎簮寮傚父",e); } - // 获取城市近12个月的年涨幅 + // 鑾峰彇鍩庡競杩�12涓湀鐨勫勾娑ㄥ箙 Integer cityAvgPrice = cityRiseAndDown(dto); - //获取区域近12个月的涨幅 + //鑾峰彇鍖哄煙杩�12涓湀鐨勬定骞� Double regionYoy = regionRiseAndDown(dto); Map cityAvgMap = new TreeMap(); @@ -449,114 +449,114 @@ public class PdsController { - // 抵押品年涨跌幅得分 + // 鎶垫娂鍝佸勾娑ㄨ穼骞呭緱鍒� collYoyIncScore(districtAnalyData, dto); - //抵押品年涨跌幅排名比 + //鎶垫娂鍝佸勾娑ㄨ穼骞呮帓鍚嶆瘮 collRiseAndDownLevl(districtAnalyData, dto); dto.setIncreaseRate(dto.getIncreaseRate()*100); resultMap.put("increaseRate", MathUtils.formatDouble(dto.getIncreaseRate())); - //城市价格异常指数 + //鍩庡競浠锋牸寮傚父鎸囨暟 Double cityPriceStability = 0d; if(districtAnalyData!=null&&districtAnalyData.getYoyCityTotal()!=null&&districtAnalyData.getYoyCityRank()!=null){ cityPriceStability = MathUtils.getPriceStability(districtAnalyData.getYoyCityTotal(), districtAnalyData.getYoyCityRank()); } dto.setCityPriceStability(cityPriceStability); - //区域价格异常指数 + //鍖哄煙浠锋牸寮傚父鎸囨暟 Double regionPriceStability = 0d; if(districtAnalyData!=null&&districtAnalyData.getYoyRegionTotal()!=null&&districtAnalyData.getYoyRegionRank()!=null){ regionPriceStability = MathUtils.getPriceStability(districtAnalyData.getYoyRegionTotal(), districtAnalyData.getYoyRegionRank()); } dto.setRegionPriceStability(regionPriceStability); - //小区年涨跌幅(没有年涨幅用半年、季度) + //灏忓尯骞存定璺屽箙(娌℃湁骞存定骞呯敤鍗婂勾銆佸搴�) Double yoyRiseDown = getAbsYoy(districtAnalyData,avgPrice,dto.getCitySellStats(),dto.getRegionSellStats()); - //与区域年涨跌幅差比 + //涓庡尯鍩熷勾娑ㄨ穼骞呭樊姣� Double yoyRegionAbs = yoyRegionRiseAndDownAbs(districtAnalyData,yoyRiseDown,regionYoy); - //获取pds相关系数 + //鑾峰彇pds鐩稿叧绯绘暟 PdsAlgorithmRule pdsAlgorithmRule = pdsAlgorithmRuleService.findAlgorithmRuleByCity(model.getCity()); PdsRatio pdsRatio = queryPdsRatio(pdsAlgorithmRule); - // 价格波动风险(一年以上抵押品价格异常指数) [0-25) 不正常 [25-50) 防范预警[50-75) 较正常 (75 100] 正常 - //[0-55]下跌风险高 (55-100]下跌风险低 + // 浠锋牸娉㈠姩椋庨櫓锛堜竴骞翠互涓婃姷鎶煎搧浠锋牸寮傚父鎸囨暟锛� [0-25) 涓嶆甯� [25-50) 闃茶寖棰勮[50-75) 杈冩甯� (75 100] 姝e父 + //[0-55]涓嬭穼椋庨櫓楂� (55-100]涓嬭穼椋庨櫓浣� Double priceStability = getPriceStabilityValue(yoyRiseDown, yoyRegionAbs, pdsRatio,regionYoy); - resultMap.put("priceStability", MathUtils.formatDouble(priceStability));// 风险指数 - //[0-55]下跌风险高 (55-100]下跌风险低 + resultMap.put("priceStability", MathUtils.formatDouble(priceStability));// 椋庨櫓鎸囨暟 + //[0-55]涓嬭穼椋庨櫓楂� (55-100]涓嬭穼椋庨櫓浣� Double priceStabilityLess = getPriceStabilityLessValue(yoyRiseDown,yoyRegionAbs,pdsRatio); - resultMap.put("priceStabilityLess", MathUtils.formatDouble(priceStabilityLess));// 风险指数 - // 抵押品价格指数,价格城市排名 + resultMap.put("priceStabilityLess", MathUtils.formatDouble(priceStabilityLess));// 椋庨櫓鎸囨暟 + // 鎶垫娂鍝佷环鏍兼寚鏁�,浠锋牸鍩庡競鎺掑悕 Double priceScore = collPriceIndex(districtAnalyData, dto); - resultMap.put("priceRate", MathUtils.formatDouble(dto.getPriceRate()*100));// 价格指数 - // 最高中介数 + resultMap.put("priceRate", MathUtils.formatDouble(dto.getPriceRate()*100));// 浠锋牸鎸囨暟 + // 鏈�楂樹腑浠嬫暟 int maxAgencyMount = agencyMountLevelService.findMaxAgencyMount(dto.getCity()); dto.setMaxAgencyMount(maxAgencyMount); - resultMap.put("maxAgencyMount", dto.getMaxAgencyMount());// 最高中介数 - //拥有户数数量、城市最高户数、户数城市排名、 + resultMap.put("maxAgencyMount", dto.getMaxAgencyMount());// 鏈�楂樹腑浠嬫暟 + //鎷ユ湁鎴锋暟鏁伴噺銆佸煄甯傛渶楂樻埛鏁般�佹埛鏁板煄甯傛帓鍚嶃�� houseHoldInfo(districtAnalyData, dto); - resultMap.put("houseHoldMount", dto.getHouseHoldMount());// 拥有户数户量 - resultMap.put("maxHouseHold", dto.getMaxHouseHold());// 城市户数最高拥有量 - resultMap.put("houseHoldRate", MathUtils.formatDouble(dto.getHouseHoldRate()*100));// 户数城市排名 - //小区得分在城市的中的排名 + resultMap.put("houseHoldMount", dto.getHouseHoldMount());// 鎷ユ湁鎴锋暟鎴烽噺 + resultMap.put("maxHouseHold", dto.getMaxHouseHold());// 鍩庡競鎴锋暟鏈�楂樻嫢鏈夐噺 + resultMap.put("houseHoldRate", MathUtils.formatDouble(dto.getHouseHoldRate()*100));// 鎴锋暟鍩庡競鎺掑悕 + //灏忓尯寰楀垎鍦ㄥ煄甯傜殑涓殑鎺掑悕 Double cityScoreLevelRate = 1d; DistrictCityScoreLevel districtCityScoreLevel = districtCityScoreLevelService.findByParams(dto.getCity(), dto.getDistrict(), dto.getName()); if(districtCityScoreLevel!=null&&districtCityScoreLevel.getCitySize()!=null&&districtCityScoreLevel.getTotalScoreLevel()!=null){ cityScoreLevelRate = MathUtils.getLevelRate(districtCityScoreLevel.getTotalScoreLevel(), districtCityScoreLevel.getCitySize()); } - resultMap.put("cityScoreLevelRate", MathUtils.formatDouble(cityScoreLevelRate*100));// 小区得分在城市的中的排名 - //中介数得分、知名中介数量、其他中介数量 、中介城市排名 + resultMap.put("cityScoreLevelRate", MathUtils.formatDouble(cityScoreLevelRate*100));// 灏忓尯寰楀垎鍦ㄥ煄甯傜殑涓殑鎺掑悕 + //涓粙鏁板緱鍒嗐�佺煡鍚嶄腑浠嬫暟閲忋�佸叾浠栦腑浠嬫暟閲� 銆佷腑浠嬪煄甯傛帓鍚� AgencyMountLevel agencyMountLevel = agencyMountLevelService.findAgencyMountLevelParam(dto.getCity(), dto.getDistrict(),dto.getName()); Double agencyScore= getAgencyInfo(agencyMountLevel, model, dto, pdsRatio); dto.setAgencyScore(agencyScore); - resultMap.put("agencyScore", MathUtils.formatDouble(agencyScore));// 中介得分 - resultMap.put("famousAgency", dto.getFamousAgency());// 知名中介 - resultMap.put("otherAgency", dto.getOtherAgency());// 其他中介 + resultMap.put("agencyScore", MathUtils.formatDouble(agencyScore));// 涓粙寰楀垎 + resultMap.put("famousAgency", dto.getFamousAgency());// 鐭ュ悕涓粙 + resultMap.put("otherAgency", dto.getOtherAgency());// 鍏朵粬涓粙 int allAgency = dto.getFamousAgency()+dto.getOtherAgency(); - resultMap.put("allAgency", allAgency);// 中介总数 - resultMap.put("agencyLevelRate", MathUtils.formatDouble(dto.getAgencyLevelRate()*100));// 中介城市排名 + resultMap.put("allAgency", allAgency);// 涓粙鎬绘暟 + resultMap.put("agencyLevelRate", MathUtils.formatDouble(dto.getAgencyLevelRate()*100));// 涓粙鍩庡競鎺掑悕 - //总价相关得分 + //鎬讳环鐩稿叧寰楀垎 Double totalPriceScore = getTotalPriceScoreInfo(cityAvgPrice, dto, pdsRatio); - //近6个月挂牌量、近1个月挂牌量、近六个月最高挂牌量、6个月挂牌量在城市排名、挂牌量得分 + //杩�6涓湀鎸傜墝閲忋�佽繎1涓湀鎸傜墝閲忋�佽繎鍏釜鏈堟渶楂樻寕鐗岄噺銆�6涓湀鎸傜墝閲忓湪鍩庡競鎺掑悕銆佹寕鐗岄噺寰楀垎 Double quoteScore = getQuoteInfo(districtAnalyData, dto, key, pdsRatio); dto.setQuoteScore(quoteScore); - resultMap.put("quoteScore", MathUtils.formatDouble(quoteScore));// 挂牌量得分 - resultMap.put("quertHouseOne", dto.getQuertHouseOne());// 近一个月的挂牌量 - resultMap.put("quoteHouseSix", dto.getQuoteHouseSix());// 近一个月的挂牌量 - resultMap.put("sixQuoteLevelRate", MathUtils.formatDouble(dto.getSixQuoteLevelRate()*100));// 六个月挂牌量排名 - resultMap.put("sixMaxQuoteMount", dto.getSixMaxQuoteMount());// 近六个月挂牌量 + resultMap.put("quoteScore", MathUtils.formatDouble(quoteScore));// 鎸傜墝閲忓緱鍒� + resultMap.put("quertHouseOne", dto.getQuertHouseOne());// 杩戜竴涓湀鐨勬寕鐗岄噺 + resultMap.put("quoteHouseSix", dto.getQuoteHouseSix());// 杩戜竴涓湀鐨勬寕鐗岄噺 + resultMap.put("sixQuoteLevelRate", MathUtils.formatDouble(dto.getSixQuoteLevelRate()*100));// 鍏釜鏈堟寕鐗岄噺鎺掑悕 + resultMap.put("sixMaxQuoteMount", dto.getSixMaxQuoteMount());// 杩戝叚涓湀鎸傜墝閲� - //近6个月成交量、1个月成交量、近6个月最高成交量、6个月成交量在城市排名、成交量得分 + //杩�6涓湀鎴愪氦閲忋��1涓湀鎴愪氦閲忋�佽繎6涓湀鏈�楂樻垚浜ら噺銆�6涓湀鎴愪氦閲忓湪鍩庡競鎺掑悕銆佹垚浜ら噺寰楀垎 getSellInfo(districtAnalyData, dto, key, pdsRatio); - //交通得分、交通情况城市排名、公交数量、地铁数量 + //浜ら�氬緱鍒嗐�佷氦閫氭儏鍐靛煄甯傛帓鍚嶃�佸叕浜ゆ暟閲忋�佸湴閾佹暟閲� Double trafficScore = getTrafficInfo(dto,key,pdsRatio); dto.setTrafficScore(trafficScore); - resultMap.put("trafficScore", MathUtils.formatDouble(trafficScore));// 交通得分 - resultMap.put("busCount", dto.getBusCount());// 公交数量 - resultMap.put("metroCount", dto.getMetroCount());// 地铁数量 - resultMap.put("trafficLevelRate", MathUtils.formatDouble(dto.getTrafficLevelRate()*100));// 公共交通在城市的排名 - resultMap.put("maxTrafficCount", dto.getMaxTrafficCount());// 公共交数量 + resultMap.put("trafficScore", MathUtils.formatDouble(trafficScore));// 浜ら�氬緱鍒� + resultMap.put("busCount", dto.getBusCount());// 鍏氦鏁伴噺 + resultMap.put("metroCount", dto.getMetroCount());// 鍦伴搧鏁伴噺 + resultMap.put("trafficLevelRate", MathUtils.formatDouble(dto.getTrafficLevelRate()*100));// 鍏叡浜ら�氬湪鍩庡競鐨勬帓鍚� + resultMap.put("maxTrafficCount", dto.getMaxTrafficCount());// 鍏叡浜ゆ暟閲� - //小区密度得分 + //灏忓尯瀵嗗害寰楀垎 Double distirctDensityScore = getDistrictDensity(district, pdsRatio, districtAnalyData,dto); - // 处置难易度得分 [0-26) 困难 [26-38) 较困难 [38-70) 较容易 [70 100) 容易 + // 澶勭疆闅炬槗搴﹀緱鍒� [0-26) 鍥伴毦 [26-38) 杈冨洶闅� [38-70) 杈冨鏄� [70 100) 瀹规槗 Double handleDegreeScore = getHandleDegreeScore(pdsRatio,agencyScore,quoteScore,trafficScore,distirctDensityScore,totalPriceScore); resultMap.put("handleDegreeScore", handleDegreeScore); - // 押品综合评分 + // 鎶煎搧缁煎悎璇勫垎 Double collateralTotalScore = MathUtils.getCollateralTotalScore(priceStability,handleDegreeScore,priceScore,dto.getIncreaseScore()); resultMap.put("collateralTotalScore", MathUtils.formatDouble(collateralTotalScore)); - //获取 + //鑾峰彇 Map cityDistriceMinAndMaxPrice = districtStatService.getCityDistriceMinAndMaxPricePds(key.getCity()); Integer minS = cityDistriceMinAndMaxPrice.get("cityDistrictMinSellPrice"); Integer maxS = cityDistriceMinAndMaxPrice.get("cityDistrictMaxSellPrice"); - resultMap.put("cityDistrictMinSellPrice", minS); //城市相对最低价 - resultMap.put("cityDistrictMaxSellPrice", maxS); //城市相对最高价 + resultMap.put("cityDistrictMinSellPrice", minS); //鍩庡競鐩稿鏈�浣庝环 + resultMap.put("cityDistrictMaxSellPrice", maxS); //鍩庡競鐩稿鏈�楂樹环 mav.setModel(BasicModel.buildOKModel().setResult(resultMap)); System.out.println("pds EvaluationAction:"+(System.currentTimeMillis() - stime)); @@ -570,19 +570,19 @@ public class PdsController { Map resultMap = new HashMap(); if(StringUtils.isBlank(model.getCity())){ - mav.setModel(BasicModel.buildBadRequestModel("城市为必填项")); + mav.setModel(BasicModel.buildBadRequestModel("鍩庡競涓哄繀濉」")); return mav; } if(StringUtils.isBlank(model.getDistrict())){ - mav.setModel(BasicModel.buildBadRequestModel("区域为必填项")); + mav.setModel(BasicModel.buildBadRequestModel("鍖哄煙涓哄繀濉」")); return mav; } if(StringUtils.isBlank(model.getName())){ - mav.setModel(BasicModel.buildBadRequestModel("小区名为必填项")); + mav.setModel(BasicModel.buildBadRequestModel("灏忓尯鍚嶄负蹇呭~椤�")); return mav; } if(model.getSize() == null || model.getSize()<=0){ - mav.setModel(BasicModel.buildBadRequestModel("面积为必填项且必须大于0")); + mav.setModel(BasicModel.buildBadRequestModel("闈㈢Н涓哄繀濉」涓斿繀椤诲ぇ浜�0")); return mav; } @@ -591,7 +591,7 @@ public class PdsController { dto.setDistrict(model.getDistrict()); dto.setName(model.getName()); - //创建evaluation对象 + //鍒涘缓evaluation瀵硅薄 Evaluation evaluation = creEvaluationModel(model); resultMap.put("city", model.getCity()); resultMap.put("region", model.getDistrict()); @@ -603,46 +603,46 @@ public class PdsController { resultMap.put("fitment", model.getFitment()); resultMap.put("direction", model.getDirection()); - // 获取房屋总价 + // 鑾峰彇鎴垮眿鎬讳环 boolean houseEvaRes = houseEvaluation(model, evaluation, dto); if (!houseEvaRes) { - mav.setModel(BasicModel.buildBadRequestModel("获取房屋价格失败")); + mav.setModel(BasicModel.buildBadRequestModel("鑾峰彇鎴垮眿浠锋牸澶辫触")); return mav; } resultMap.put("totalPrice", dto.getTotalPrice()); District district = districtService.findDistrict(new DistrictKey(dto.getCity(), dto.getDistrict(), dto.getName()), "district"); if(district == null){ - mav.setModel(BasicModel.buildBadRequestModel("该小区不存在")); + mav.setModel(BasicModel.buildBadRequestModel("璇ュ皬鍖轰笉瀛樺湪")); return mav; } DistrictKey key = new DistrictKey(dto.getCity(), dto.getDistrict(), dto.getName()); DistrictAnalyData districtAnalyData = districtAnalyDataService.findByDistrictKey(key); - //均价 + //鍧囦环 Integer avgPrice = districtStatService.findLatestDistrictAvgPrice(dto.getCity(), dto.getDistrict(), null, dto.getName()); resultMap.put("avgPrice", dto.getResultAvgPrice()); - //小区年涨幅、月涨幅、12个月的小区涨跌幅 + //灏忓尯骞存定骞呫�佹湀娑ㄥ箙銆�12涓湀鐨勫皬鍖烘定璺屽箙 /*List districtsSellStats = districtSellStatService.getAllWithMonths(dto.getCity(), dto.getDistrict(), dto.getName(), 12); districtRiseAndDown(districtsSellStats, dto); - resultMap.put("yoyIncrease", MathUtils.formatDouble(dto.getYoyIncrease()*100)); //年涨跌幅 - resultMap.put("disMom", MathUtils.formatDouble(dto.getDisMom()*100)); //月涨跌幅 + resultMap.put("yoyIncrease", MathUtils.formatDouble(dto.getYoyIncrease()*100)); //骞存定璺屽箙 + resultMap.put("disMom", MathUtils.formatDouble(dto.getDisMom()*100)); //鏈堟定璺屽箙 */ - //获取房源 + //鑾峰彇鎴挎簮 try { houseResource(avgPrice, dto); } catch (Exception e) { List> houses = new ArrayList>(); dto.setHouses(houses); - logger.error("PDS估价房源异常",e); + logger.error("PDS浼颁环鎴挎簮寮傚父",e); } - // 获取城市近12个月的年涨幅 + // 鑾峰彇鍩庡競杩�12涓湀鐨勫勾娑ㄥ箙 Integer cityAvgPrice = cityRiseAndDown(dto); - //获取区域近12个月的涨幅 + //鑾峰彇鍖哄煙杩�12涓湀鐨勬定骞� Double regionYoy = regionRiseAndDown(dto); /*Map cityAvgMap = new TreeMap(); @@ -663,114 +663,114 @@ public class PdsController { - // 抵押品年涨跌幅得分 + // 鎶垫娂鍝佸勾娑ㄨ穼骞呭緱鍒� collYoyIncScore(districtAnalyData, dto); - //抵押品年涨跌幅排名比 + //鎶垫娂鍝佸勾娑ㄨ穼骞呮帓鍚嶆瘮 collRiseAndDownLevl(districtAnalyData, dto); dto.setIncreaseRate(dto.getIncreaseRate()*100); resultMap.put("increaseRate", MathUtils.formatDouble(dto.getIncreaseRate())); - //城市价格异常指数 + //鍩庡競浠锋牸寮傚父鎸囨暟 Double cityPriceStability = 0d; if(districtAnalyData!=null&&districtAnalyData.getYoyCityTotal()!=null&&districtAnalyData.getYoyCityRank()!=null){ cityPriceStability = MathUtils.getPriceStability(districtAnalyData.getYoyCityTotal(), districtAnalyData.getYoyCityRank()); } dto.setCityPriceStability(cityPriceStability); - //区域价格异常指数 + //鍖哄煙浠锋牸寮傚父鎸囨暟 Double regionPriceStability = 0d; if(districtAnalyData!=null&&districtAnalyData.getYoyRegionTotal()!=null&&districtAnalyData.getYoyRegionRank()!=null){ regionPriceStability = MathUtils.getPriceStability(districtAnalyData.getYoyRegionTotal(), districtAnalyData.getYoyRegionRank()); } dto.setRegionPriceStability(regionPriceStability); - //小区年涨跌幅(没有年涨幅用半年、季度) + //灏忓尯骞存定璺屽箙(娌℃湁骞存定骞呯敤鍗婂勾銆佸搴�) Double yoyRiseDown = getAbsYoy(districtAnalyData,avgPrice,dto.getCitySellStats(),dto.getRegionSellStats()); - //与区域年涨跌幅差比 + //涓庡尯鍩熷勾娑ㄨ穼骞呭樊姣� Double yoyRegionAbs = yoyRegionRiseAndDownAbs(districtAnalyData,yoyRiseDown,regionYoy); - //获取pds相关系数 + //鑾峰彇pds鐩稿叧绯绘暟 PdsAlgorithmRule pdsAlgorithmRule = pdsAlgorithmRuleService.findAlgorithmRuleByCity(model.getCity()); PdsRatio pdsRatio = queryPdsRatio(pdsAlgorithmRule); - // 价格波动风险(一年以上抵押品价格异常指数) [0-25) 不正常 [25-50) 防范预警[50-75) 较正常 (75 100] 正常 - //[0-55]下跌风险高 (55-100]下跌风险低 + // 浠锋牸娉㈠姩椋庨櫓锛堜竴骞翠互涓婃姷鎶煎搧浠锋牸寮傚父鎸囨暟锛� [0-25) 涓嶆甯� [25-50) 闃茶寖棰勮[50-75) 杈冩甯� (75 100] 姝e父 + //[0-55]涓嬭穼椋庨櫓楂� (55-100]涓嬭穼椋庨櫓浣� Double priceStability = getPriceStabilityValue(yoyRiseDown, yoyRegionAbs, pdsRatio,regionYoy); - resultMap.put("priceStability", MathUtils.formatDouble(priceStability));// 风险指数 - //[0-55]下跌风险高 (55-100]下跌风险低 + resultMap.put("priceStability", MathUtils.formatDouble(priceStability));// 椋庨櫓鎸囨暟 + //[0-55]涓嬭穼椋庨櫓楂� (55-100]涓嬭穼椋庨櫓浣� Double priceStabilityLess = getPriceStabilityLessValue(yoyRiseDown,yoyRegionAbs,pdsRatio); - resultMap.put("priceStabilityLess", MathUtils.formatDouble(priceStabilityLess));// 风险指数 - // 抵押品价格指数,价格城市排名 + resultMap.put("priceStabilityLess", MathUtils.formatDouble(priceStabilityLess));// 椋庨櫓鎸囨暟 + // 鎶垫娂鍝佷环鏍兼寚鏁�,浠锋牸鍩庡競鎺掑悕 Double priceScore = collPriceIndex(districtAnalyData, dto); - resultMap.put("priceRate", MathUtils.formatDouble(dto.getPriceRate()*100));// 价格指数 - // 最高中介数 + resultMap.put("priceRate", MathUtils.formatDouble(dto.getPriceRate()*100));// 浠锋牸鎸囨暟 + // 鏈�楂樹腑浠嬫暟 int maxAgencyMount = agencyMountLevelService.findMaxAgencyMount(dto.getCity()); dto.setMaxAgencyMount(maxAgencyMount); - resultMap.put("maxAgencyMount", dto.getMaxAgencyMount());// 最高中介数 - //拥有户数数量、城市最高户数、户数城市排名、 + resultMap.put("maxAgencyMount", dto.getMaxAgencyMount());// 鏈�楂樹腑浠嬫暟 + //鎷ユ湁鎴锋暟鏁伴噺銆佸煄甯傛渶楂樻埛鏁般�佹埛鏁板煄甯傛帓鍚嶃�� houseHoldInfo(districtAnalyData, dto); - resultMap.put("houseHoldMount", dto.getHouseHoldMount());// 拥有户数户量 - resultMap.put("maxHouseHold", dto.getMaxHouseHold());// 城市户数最高拥有量 - resultMap.put("houseHoldRate", MathUtils.formatDouble(dto.getHouseHoldRate()*100));// 户数城市排名 - //小区得分在城市的中的排名 + resultMap.put("houseHoldMount", dto.getHouseHoldMount());// 鎷ユ湁鎴锋暟鎴烽噺 + resultMap.put("maxHouseHold", dto.getMaxHouseHold());// 鍩庡競鎴锋暟鏈�楂樻嫢鏈夐噺 + resultMap.put("houseHoldRate", MathUtils.formatDouble(dto.getHouseHoldRate()*100));// 鎴锋暟鍩庡競鎺掑悕 + //灏忓尯寰楀垎鍦ㄥ煄甯傜殑涓殑鎺掑悕 Double cityScoreLevelRate = 1d; DistrictCityScoreLevel districtCityScoreLevel = districtCityScoreLevelService.findByParams(dto.getCity(), dto.getDistrict(), dto.getName()); if(districtCityScoreLevel!=null&&districtCityScoreLevel.getCitySize()!=null&&districtCityScoreLevel.getTotalScoreLevel()!=null){ cityScoreLevelRate = MathUtils.getLevelRate(districtCityScoreLevel.getTotalScoreLevel(), districtCityScoreLevel.getCitySize()); } - resultMap.put("cityScoreLevelRate", MathUtils.formatDouble(cityScoreLevelRate*100));// 小区得分在城市的中的排名 - //中介数得分、知名中介数量、其他中介数量 、中介城市排名 + resultMap.put("cityScoreLevelRate", MathUtils.formatDouble(cityScoreLevelRate*100));// 灏忓尯寰楀垎鍦ㄥ煄甯傜殑涓殑鎺掑悕 + //涓粙鏁板緱鍒嗐�佺煡鍚嶄腑浠嬫暟閲忋�佸叾浠栦腑浠嬫暟閲� 銆佷腑浠嬪煄甯傛帓鍚� AgencyMountLevel agencyMountLevel = agencyMountLevelService.findAgencyMountLevelParam(dto.getCity(), dto.getDistrict(),dto.getName()); Double agencyScore= getAgencyInfo(agencyMountLevel, model, dto, pdsRatio); dto.setAgencyScore(agencyScore); - resultMap.put("agencyScore", MathUtils.formatDouble(agencyScore));// 中介得分 - resultMap.put("famousAgency", dto.getFamousAgency());// 知名中介 - resultMap.put("otherAgency", dto.getOtherAgency());// 其他中介 + resultMap.put("agencyScore", MathUtils.formatDouble(agencyScore));// 涓粙寰楀垎 + resultMap.put("famousAgency", dto.getFamousAgency());// 鐭ュ悕涓粙 + resultMap.put("otherAgency", dto.getOtherAgency());// 鍏朵粬涓粙 int allAgency = dto.getFamousAgency()+dto.getOtherAgency(); - resultMap.put("allAgency", allAgency);// 中介总数 - resultMap.put("agencyLevelRate", MathUtils.formatDouble(dto.getAgencyLevelRate()*100));// 中介城市排名 + resultMap.put("allAgency", allAgency);// 涓粙鎬绘暟 + resultMap.put("agencyLevelRate", MathUtils.formatDouble(dto.getAgencyLevelRate()*100));// 涓粙鍩庡競鎺掑悕 - //总价相关得分 + //鎬讳环鐩稿叧寰楀垎 Double totalPriceScore = getTotalPriceScoreInfo(cityAvgPrice, dto, pdsRatio); - //近6个月挂牌量、近1个月挂牌量、近六个月最高挂牌量、6个月挂牌量在城市排名、挂牌量得分 + //杩�6涓湀鎸傜墝閲忋�佽繎1涓湀鎸傜墝閲忋�佽繎鍏釜鏈堟渶楂樻寕鐗岄噺銆�6涓湀鎸傜墝閲忓湪鍩庡競鎺掑悕銆佹寕鐗岄噺寰楀垎 Double quoteScore = getQuoteInfo(districtAnalyData, dto, key, pdsRatio); dto.setQuoteScore(quoteScore); - resultMap.put("quoteScore", MathUtils.formatDouble(quoteScore));// 挂牌量得分 - resultMap.put("quertHouseOne", dto.getQuertHouseOne());// 近一个月的挂牌量 - resultMap.put("quoteHouseSix", dto.getQuoteHouseSix());// 近一个月的挂牌量 - resultMap.put("sixQuoteLevelRate", MathUtils.formatDouble(dto.getSixQuoteLevelRate()*100));// 六个月挂牌量排名 - resultMap.put("sixMaxQuoteMount", dto.getSixMaxQuoteMount());// 近六个月挂牌量 + resultMap.put("quoteScore", MathUtils.formatDouble(quoteScore));// 鎸傜墝閲忓緱鍒� + resultMap.put("quertHouseOne", dto.getQuertHouseOne());// 杩戜竴涓湀鐨勬寕鐗岄噺 + resultMap.put("quoteHouseSix", dto.getQuoteHouseSix());// 杩戜竴涓湀鐨勬寕鐗岄噺 + resultMap.put("sixQuoteLevelRate", MathUtils.formatDouble(dto.getSixQuoteLevelRate()*100));// 鍏釜鏈堟寕鐗岄噺鎺掑悕 + resultMap.put("sixMaxQuoteMount", dto.getSixMaxQuoteMount());// 杩戝叚涓湀鎸傜墝閲� - //近6个月成交量、1个月成交量、近6个月最高成交量、6个月成交量在城市排名、成交量得分 + //杩�6涓湀鎴愪氦閲忋��1涓湀鎴愪氦閲忋�佽繎6涓湀鏈�楂樻垚浜ら噺銆�6涓湀鎴愪氦閲忓湪鍩庡競鎺掑悕銆佹垚浜ら噺寰楀垎 getSellInfo(districtAnalyData, dto, key, pdsRatio); - //交通得分、交通情况城市排名、公交数量、地铁数量 + //浜ら�氬緱鍒嗐�佷氦閫氭儏鍐靛煄甯傛帓鍚嶃�佸叕浜ゆ暟閲忋�佸湴閾佹暟閲� Double trafficScore = getTrafficInfo(dto,key,pdsRatio); dto.setTrafficScore(trafficScore); - resultMap.put("trafficScore", MathUtils.formatDouble(trafficScore));// 交通得分 - resultMap.put("busCount", dto.getBusCount());// 公交数量 - resultMap.put("metroCount", dto.getMetroCount());// 地铁数量 - resultMap.put("trafficLevelRate", MathUtils.formatDouble(dto.getTrafficLevelRate()*100));// 公共交通在城市的排名 - resultMap.put("maxTrafficCount", dto.getMaxTrafficCount());// 公共交数量 + resultMap.put("trafficScore", MathUtils.formatDouble(trafficScore));// 浜ら�氬緱鍒� + resultMap.put("busCount", dto.getBusCount());// 鍏氦鏁伴噺 + resultMap.put("metroCount", dto.getMetroCount());// 鍦伴搧鏁伴噺 + resultMap.put("trafficLevelRate", MathUtils.formatDouble(dto.getTrafficLevelRate()*100));// 鍏叡浜ら�氬湪鍩庡競鐨勬帓鍚� + resultMap.put("maxTrafficCount", dto.getMaxTrafficCount());// 鍏叡浜ゆ暟閲� - //小区密度得分 + //灏忓尯瀵嗗害寰楀垎 Double distirctDensityScore = getDistrictDensity(district, pdsRatio, districtAnalyData,dto); - // 处置难易度得分 [0-26) 困难 [26-38) 较困难 [38-70) 较容易 [70 100) 容易 + // 澶勭疆闅炬槗搴﹀緱鍒� [0-26) 鍥伴毦 [26-38) 杈冨洶闅� [38-70) 杈冨鏄� [70 100) 瀹规槗 Double handleDegreeScore = getHandleDegreeScore(pdsRatio,agencyScore,quoteScore,trafficScore,distirctDensityScore,totalPriceScore); resultMap.put("handleDegreeScore", handleDegreeScore); - // 押品综合评分 + // 鎶煎搧缁煎悎璇勫垎 Double collateralTotalScore = MathUtils.getNewCollateralTotalScore(priceStability,handleDegreeScore,priceScore,dto.getIncreaseScore()); resultMap.put("collateralTotalScore", MathUtils.formatDouble(collateralTotalScore)); - //获取 + //鑾峰彇 Map cityDistriceMinAndMaxPrice = districtStatService.getCityDistriceMinAndMaxPricePds(key.getCity()); Integer minS = cityDistriceMinAndMaxPrice.get("cityDistrictMinSellPrice"); Integer maxS = cityDistriceMinAndMaxPrice.get("cityDistrictMaxSellPrice"); - resultMap.put("cityDistrictMinSellPrice", minS); //城市相对最低价 - resultMap.put("cityDistrictMaxSellPrice", maxS); //城市相对最高价 + resultMap.put("cityDistrictMinSellPrice", minS); //鍩庡競鐩稿鏈�浣庝环 + resultMap.put("cityDistrictMaxSellPrice", maxS); //鍩庡競鐩稿鏈�楂樹环 mav.setModel(BasicModel.buildOKModel().setResult(resultMap)); System.out.println("pds EvaluationAction:"+(System.currentTimeMillis() - stime)); @@ -816,7 +816,7 @@ public class PdsController { return mav; } - //房屋地址匹配模块 + //鎴垮眿鍦板潃鍖归厤妯″潡 public boolean houseAddressMatch(CollateralEvaluationInfoModel model,CollateralEvaluationInfoDto dto){ Map params = new HashMap(); params.put("city", model.getCity()); @@ -855,7 +855,7 @@ public class PdsController { } return true; } - //创建evaluation模块 + //鍒涘缓evaluation妯″潡 public Evaluation creEvaluationModel(CollateralEvaluationInfoModel model){ Evaluation evaluation = new Evaluation(); evaluation.setCity(model.getCity()); @@ -868,9 +868,9 @@ public class PdsController { evaluation.setDirection(model.getDirection()); return evaluation; } - //房屋估价模块 评估后的评估单价 + //鎴垮眿浼颁环妯″潡 璇勪及鍚庣殑璇勪及鍗曚环 public boolean houseEvaluation(CollateralEvaluationInfoModel model,Evaluation evaluation,CollateralEvaluationInfoDto dto){ - // 获取房屋总价 + // 鑾峰彇鎴垮眿鎬讳环 if (StringUtils.isNotBlank(dto.getName())) { EvaluationBo evaluationBo = evaluationService.doApply(evaluation, false, true, true); if (evaluationBo != null && evaluationBo.getFinalValue() > 0) { @@ -882,7 +882,7 @@ public class PdsController { } return true; } - //小区房子年龄,经纬度,小区图片相关信息 + //灏忓尯鎴垮瓙骞撮緞锛岀粡绾害锛屽皬鍖哄浘鐗囩浉鍏充俊鎭� public void districtInfo(District district,CollateralEvaluationInfoDto dto){ Integer houseAge = null; @@ -908,7 +908,7 @@ public class PdsController { } - //小区年涨幅、月涨幅、12个月的小区涨跌幅 + //灏忓尯骞存定骞呫�佹湀娑ㄥ箙銆�12涓湀鐨勫皬鍖烘定璺屽箙 public void districtRiseAndDown(List districtsSellStats,CollateralEvaluationInfoDto dto){ Double mom = 0.0; Double yoyIn = 0d; @@ -926,20 +926,20 @@ public class PdsController { dto.setDisMom(mom); } - //获取相关房源信息 + //鑾峰彇鐩稿叧鎴挎簮淇℃伅 public void houseResource(Integer avgPrice,CollateralEvaluationInfoDto dto){ - // 获取房源相关信息 + // 鑾峰彇鎴挎簮鐩稿叧淇℃伅 List houseList =null; Map priceRange = MathUtils.getAvgPriceChange(avgPrice, 0.05); if(priceRange.get("minPrice")!=null&&priceRange.get("maxPrice")!=null){ - //正负0.05 + //姝h礋0.05 houseList = houseService.findHouseByDistrictName(dto.getCity(), dto.getDistrict(), dto.getName(), priceRange.get("minPrice"), priceRange.get("maxPrice"), 9); } if(houseList==null||houseList.size()<9){ - //正负0.1 + //姝h礋0.1 priceRange = MathUtils.getAvgPriceChange(avgPrice, 0.1); if(priceRange.get("minPrice")!=null&&priceRange.get("maxPrice")!=null){ - //正负0.05 + //姝h礋0.05 List houseList1 = houseService.findHouseByDistrictName(dto.getCity(), dto.getDistrict(), dto.getName(), priceRange.get("minPrice"), priceRange.get("maxPrice"), 9); if(houseList1!=null&&houseList1.size()>0){ for (House ho : houseList1) { @@ -996,7 +996,7 @@ public class PdsController { } - // 城市近12个月的涨幅 + // 鍩庡競杩�12涓湀鐨勬定骞� public Integer cityRiseAndDown(CollateralEvaluationInfoDto dto){ Integer cityAvgPrice = 0; List citySellStats = citySellStatService.getAllWithMonths(dto.getCity(), 12); @@ -1010,7 +1010,7 @@ public class PdsController { return cityAvgPrice; } - //区域近12个月的涨幅,年涨幅 + //鍖哄煙杩�12涓湀鐨勬定骞�,骞存定骞� public Double regionRiseAndDown(CollateralEvaluationInfoDto dto){ Double regionYoy = null; List regionStatTrends = regionStatTrendService.getAllWithMonths(dto.getCity(), dto.getDistrict(), 12); @@ -1024,7 +1024,7 @@ public class PdsController { return regionYoy; } - // 抵押品年涨跌幅得分 + // 鎶垫娂鍝佸勾娑ㄨ穼骞呭緱鍒� public void collYoyIncScore(DistrictAnalyData districtAnalyData,CollateralEvaluationInfoDto dto){ Double increaseScore = 0d; if(districtAnalyData!=null&&districtAnalyData.getYoyCityTotal()!=null&&districtAnalyData.getYoyCityRank()!=null){ @@ -1036,7 +1036,7 @@ public class PdsController { dto.setIncreaseScore(increaseScore); } - //抵押品年涨跌幅排名比 + //鎶垫娂鍝佸勾娑ㄨ穼骞呮帓鍚嶆瘮 public void collRiseAndDownLevl(DistrictAnalyData districtAnalyData,CollateralEvaluationInfoDto dto){ Double increaseScore = 0d; if(districtAnalyData!=null&&districtAnalyData.getYoyCityTotal()!=null&&districtAnalyData.getYoyCityRank()!=null){ @@ -1058,10 +1058,10 @@ public class PdsController { dto.setIncreaseRate(increaseRate); } - //选择年涨跌幅、半年涨跌幅、季度涨跌幅 + //閫夋嫨骞存定璺屽箙銆佸崐骞存定璺屽箙銆佸搴︽定璺屽箙 public Double getAbsYoy(DistrictAnalyData districtAnalyData,Integer avgPrice,List css,List rss){ Double yoy = null; - if(districtAnalyData!=null){//选择年涨跌幅、半年涨跌幅、季度涨跌幅 + if(districtAnalyData!=null){//閫夋嫨骞存定璺屽箙銆佸崐骞存定璺屽箙銆佸搴︽定璺屽箙 if(districtAnalyData.getYoy()!=null){ yoy = districtAnalyData.getYoy(); }else if(districtAnalyData.getHalfYoy()!=null){ @@ -1078,9 +1078,9 @@ public class PdsController { } return yoy; } - //与区域年涨跌幅差比 + //涓庡尯鍩熷勾娑ㄨ穼骞呭樊姣� public Double yoyRegionRiseAndDownAbs(DistrictAnalyData districtAnalyData,Double yoy,Double regionYoy){ - Double yoyRegionAbs = null;//小区涨跌幅与区域的差比 + Double yoyRegionAbs = null;//灏忓尯娑ㄨ穼骞呬笌鍖哄煙鐨勫樊姣� if(yoy!=null&®ionYoy!=null&®ionYoy!=0){ yoyRegionAbs = MathUtils.yoyAbs(yoy, regionYoy); }else{ @@ -1092,7 +1092,7 @@ public class PdsController { } return yoyRegionAbs; } - //以上价格稳定指数 + //浠ヤ笂浠锋牸绋冲畾鎸囨暟 public Double getPriceStabilityValue(Double yoy,Double regionAbs,PdsRatio cityRatio,Double regionYoy){ Double priceStability = 0d; Double absDLine = PDSConstant.ABSD_LINE; @@ -1124,7 +1124,7 @@ public class PdsController { } return priceStability; } - //一年以下价格稳定指数 + //涓�骞翠互涓嬩环鏍肩ǔ瀹氭寚鏁� public Double getPriceStabilityLessValue(Double yoy,Double regionAbs,PdsRatio cityRatio){ Double priceStability = 0d; Double absDLine = PDSConstant.ABSD_LINE; @@ -1152,7 +1152,7 @@ public class PdsController { return priceStability; } - //获取pds相关系数 + //鑾峰彇pds鐩稿叧绯绘暟 public PdsRatio queryPdsRatio(PdsAlgorithmRule al){ PdsRatio pdsRatio = new PdsRatio(); Double agencyCount = pdsAlgorithmRuleService.findAlgorithmRuleByCity(al, PdsAlgorithmRule.FieldEnum.AGENCY_COUNT); @@ -1187,7 +1187,7 @@ public class PdsController { Double yoyC = pdsAlgorithmRuleService.findAlgorithmRuleByCity(al, PdsAlgorithmRule.FieldEnum.YOY_C); - //此处需要调用接口 + //姝ゅ闇�瑕佽皟鐢ㄦ帴鍙� pdsRatio.setAgencyScale(agencyCount); pdsRatio.setAgencyMax(agencyCountMax); pdsRatio.setAgencyMin(agencyCountMin); @@ -1220,10 +1220,10 @@ public class PdsController { pdsRatio.setRegionAbsC(yoyC); return pdsRatio; } - //获取pds相关系数 + //鑾峰彇pds鐩稿叧绯绘暟 public PdsRatio getPdsRatio(CollateralEvaluationInfoModel model){ PdsRatio pdsRatio = new PdsRatio(); - //此处需要调用接口 + //姝ゅ闇�瑕佽皟鐢ㄦ帴鍙� pdsRatio.setAgencyScale(model.getAgencyCount()); pdsRatio.setAgencyMax(model.getAgencyCountMax()); pdsRatio.setAgencyMin(model.getAgencyCountMin()); @@ -1256,7 +1256,7 @@ public class PdsController { pdsRatio.setRegionAbsC(model.getYoyC()); return pdsRatio; } - //抵押平价格指数, 均价在城市排名 + //鎶垫娂骞充环鏍兼寚鏁�, 鍧囦环鍦ㄥ煄甯傛帓鍚� public Double collPriceIndex(DistrictAnalyData districtAnalyData,CollateralEvaluationInfoDto dto){ Integer cityRank = 0; Integer cityRankTotal = 0; @@ -1267,35 +1267,35 @@ public class PdsController { Double priceScore = MathUtils.getPriceScore(cityRank, cityRankTotal); Double priceLevelRate = MathUtils.getLevelRate(cityRank, cityRankTotal); - dto.setPriceRate(priceLevelRate);// 小区价格在城市排名比 + dto.setPriceRate(priceLevelRate);// 灏忓尯浠锋牸鍦ㄥ煄甯傛帓鍚嶆瘮 return priceScore; } - //拥有户数数量、城市最高户数、户数城市排名 + //鎷ユ湁鎴锋暟鏁伴噺銆佸煄甯傛渶楂樻埛鏁般�佹埛鏁板煄甯傛帓鍚� public void houseHoldInfo(DistrictAnalyData districtAnalyData,CollateralEvaluationInfoDto dto){ if(districtAnalyData==null||districtAnalyData.getHouseholds()==null){ - dto.setHouseHoldMount(0);//拥有户数户量 + dto.setHouseHoldMount(0);//鎷ユ湁鎴锋暟鎴烽噺 }else{ dto.setHouseHoldMount(districtAnalyData.getHouseholds()); } Integer houseHoldCount = districtAnalyDataService.findMaxHouseHoldCountByCity(dto.getCity()); - //城市户数最高拥有量 + //鍩庡競鎴锋暟鏈�楂樻嫢鏈夐噺 dto.setMaxHouseHold(houseHoldCount); if(districtAnalyData==null||districtAnalyData.getHouseholdsRank()==null||districtAnalyData.getHouseholdsTotal()==null){ - dto.setHouseHoldRate(0d);//户数城市排名 + dto.setHouseHoldRate(0d);//鎴锋暟鍩庡競鎺掑悕 }else{ dto.setHouseHoldRate(MathUtils.getLevelRate(districtAnalyData.getHouseholdsRank(), districtAnalyData.getHouseholdsTotal())); } } - //小区同类型挂牌房源量排名得分 + //灏忓尯鍚岀被鍨嬫寕鐗屾埧婧愰噺鎺掑悕寰楀垎 public Double getQuoteSellInfo(CollateralEvaluationInfoModel model,CollateralEvaluationInfoDto dto){ - //此功能已经废弃 + //姝ゅ姛鑳藉凡缁忓簾寮� return 0d; } - //小区成交量得分 + //灏忓尯鎴愪氦閲忓緱鍒� public Double getSellScoreInfo(DistrictAnalyData districtAnalyData){ - //城市成交量得分 + //鍩庡競鎴愪氦閲忓緱鍒� Double houseSellScore = 0d; if(districtAnalyData!=null&&districtAnalyData.getDealRankTotal()!=null&&districtAnalyData.getDealCountRank()!=null){ houseSellScore = MathUtils.getLevelScore(districtAnalyData.getDealRankTotal(),districtAnalyData.getDealCountRank()); @@ -1306,34 +1306,34 @@ public class PdsController { return houseSellScore; } - //小区带看数得分 + //灏忓尯甯︾湅鏁板緱鍒� public Double getSeeScoreInfo(DistrictAnalyData districtAnalyData){ - //此方法已经不用了 + //姝ゆ柟娉曞凡缁忎笉鐢ㄤ簡 return 0d; } - //中介数得分、知名中介数量、其他中介数量 、中介城市排名 + //涓粙鏁板緱鍒嗐�佺煡鍚嶄腑浠嬫暟閲忋�佸叾浠栦腑浠嬫暟閲� 銆佷腑浠嬪煄甯傛帓鍚� public Double getAgencyInfo(AgencyMountLevel agencyMountLevel,CollateralEvaluationInfoModel model,CollateralEvaluationInfoDto dto,PdsRatio cityRatio){ int famousAgency = 0; if(agencyMountLevel!=null&&agencyMountLevel.getFamousAgency()>=0){ famousAgency = agencyMountLevel.getFamousAgency(); } - dto.setFamousAgency(famousAgency);// 知名中介 + dto.setFamousAgency(famousAgency);// 鐭ュ悕涓粙 int otherAgency = 0; if(agencyMountLevel!=null&&agencyMountLevel.getOtherAgency()>=0){ otherAgency = agencyMountLevel.getOtherAgency(); } - dto.setOtherAgency(otherAgency);// 其他中介 - int allAgency = famousAgency+otherAgency;//中介总数 + dto.setOtherAgency(otherAgency);// 鍏朵粬涓粙 + int allAgency = famousAgency+otherAgency;//涓粙鎬绘暟 if(agencyMountLevel==null||agencyMountLevel.getMomCityLevel()<0||agencyMountLevel.getCitySize()<0){ - dto.setAgencyLevelRate(0d);//中介城市排名 + dto.setAgencyLevelRate(0d);//涓粙鍩庡競鎺掑悕 }else{ dto.setAgencyLevelRate(MathUtils.getLevelRate(agencyMountLevel.getMomCityLevel(), agencyMountLevel.getCitySize())); } - Double agencyScore = agencyScoreLog(allAgency, cityRatio);//中介得分 + Double agencyScore = agencyScoreLog(allAgency, cityRatio);//涓粙寰楀垎 return agencyScore; } - //中介得分逻辑 + //涓粙寰楀垎閫昏緫 public Double agencyScoreLog(int allAgency,PdsRatio cityRatio){ Double agencyScore = 0d; Double agencyMax = PDSConstant.AGENCY_MAX; @@ -1355,7 +1355,7 @@ public class PdsController { return agencyScore; } - //户数得分 + //鎴锋暟寰楀垎 public Double getHouseHoldScoreInfo(DistrictAnalyData districtAnalyData){ Double houseHoldScore = -1d; if(districtAnalyData!=null&&districtAnalyData.getHouseholdsTotal()!=null&&districtAnalyData.getHouseholdsRank()!=null){ @@ -1368,7 +1368,7 @@ public class PdsController { return houseHoldScore; } - //总价得分 + //鎬讳环寰楀垎 public Double getTotalPriceScoreInfo(Integer cityAvgPrice,CollateralEvaluationInfoDto dto,PdsRatio cityRatio){ int totalPrice = dto.getTotalPrice(); Double totalPriceScore = 0d; @@ -1402,7 +1402,7 @@ public class PdsController { return totalPriceScore; } - //近6个月挂牌量、近1个月挂牌量、近六个月最高挂牌量、6个月挂牌量在城市排名 + //杩�6涓湀鎸傜墝閲忋�佽繎1涓湀鎸傜墝閲忋�佽繎鍏釜鏈堟渶楂樻寕鐗岄噺銆�6涓湀鎸傜墝閲忓湪鍩庡競鎺掑悕 public Double getQuoteInfo(DistrictAnalyData districtAnalyData,CollateralEvaluationInfoDto dto,DistrictKey key,PdsRatio cityRatio){ Double quoteMax = PDSConstant.QUOTE_MAX; Double quoteMin = PDSConstant.QUOTE_MIN; @@ -1411,12 +1411,12 @@ public class PdsController { if(districtAnalyData!=null&&districtAnalyData.getSellCountRank()!=null&&districtAnalyData.getSellRankTotal()!=null){ sixQuoteLevelRate = MathUtils.getLevelRate(districtAnalyData.getSellCountRank(),districtAnalyData.getSellRankTotal()); } - dto.setSixQuoteLevelRate(sixQuoteLevelRate);//六个月挂牌量排名 + dto.setSixQuoteLevelRate(sixQuoteLevelRate);//鍏釜鏈堟寕鐗岄噺鎺掑悕 long quoteHouseSix = 0; if(districtAnalyData!=null&&districtAnalyData.getSellCount()!=null&&districtAnalyData.getSellCount()>=0){ quoteHouseSix = districtAnalyData.getSellCount(); } - dto.setQuoteHouseSix(quoteHouseSix);// 近六个月的挂牌量 + dto.setQuoteHouseSix(quoteHouseSix);// 杩戝叚涓湀鐨勬寕鐗岄噺 Integer cityMaxQuote = districtAnalyDataService.findMaxSellCountByCity(key.getCity()); dto.setSixMaxQuoteMount(cityMaxQuote); @@ -1424,9 +1424,9 @@ public class PdsController { if(districtAnalyData!=null&&districtAnalyData.getMonthSellCount()!=null){ quertHouseOne = districtAnalyData.getMonthSellCount(); } - dto.setQuertHouseOne(quertHouseOne);// 近一个月的挂牌量 + dto.setQuertHouseOne(quertHouseOne);// 杩戜竴涓湀鐨勬寕鐗岄噺 - Double quoteScore = 0d;//挂牌量得分 + Double quoteScore = 0d;//鎸傜墝閲忓緱鍒� if(quoteHouseSix>=quoteMax){ quoteScore = 100d; }else if(quoteHouseSix<=quoteMin){ @@ -1438,28 +1438,28 @@ public class PdsController { return quoteScore; } - //近6个月成交量、1个月成交量、近6个月最高成交量、6个月成交量在城市排名 + //杩�6涓湀鎴愪氦閲忋��1涓湀鎴愪氦閲忋�佽繎6涓湀鏈�楂樻垚浜ら噺銆�6涓湀鎴愪氦閲忓湪鍩庡競鎺掑悕 public void getSellInfo(DistrictAnalyData districtAnalyData,CollateralEvaluationInfoDto dto,DistrictKey key,PdsRatio cityRatio){ - //成交量排名 + //鎴愪氦閲忔帓鍚� Double sixSellLevelRate = 0d; if(districtAnalyData!=null&&districtAnalyData.getDealCountRank()!=null&&districtAnalyData.getDealRankTotal()!=null){ sixSellLevelRate = MathUtils.getLevelRate(districtAnalyData.getDealCountRank(),districtAnalyData.getDealRankTotal()); } dto.setSixSellHouseLevelRate(sixSellLevelRate); - // 近六个月的成交量 + // 杩戝叚涓湀鐨勬垚浜ら噺 //long houseSellSix = dealPriceService.findDealPriceCountByDistrictKey(key, getMonthAgo(-6)); long houseSellSix = 0; dto.setHouseSellSix(houseSellSix); - //城市6个月成交量最大排名 + //鍩庡競6涓湀鎴愪氦閲忔渶澶ф帓鍚� Integer cityMaxSell = districtAnalyDataService.findMaxDealCountByCity(key.getCity()); dto.setSixMaxSellMount(cityMaxSell); - // 近1个月的成交量 + // 杩�1涓湀鐨勬垚浜ら噺 //long houseSellOne = dealPriceService.findDealPriceCountByDistrictKey(key, getMonthAgo(-1)); long houseSellOne = 0; dto.setHouseSellOne(houseSellOne); } - //交通得分、交通情况城市排名、公交数量、地铁数量 + //浜ら�氬緱鍒嗐�佷氦閫氭儏鍐靛煄甯傛帓鍚嶃�佸叕浜ゆ暟閲忋�佸湴閾佹暟閲� public Double getTrafficInfo(CollateralEvaluationInfoDto dto, DistrictKey key, PdsRatio pdsRatio){ Double metroScale = PDSConstant.METRO_SCALE; Double metroMax = PDSConstant.METRO_MAX; @@ -1469,12 +1469,12 @@ public class PdsController { Double busMin = PDSConstant.BUS_MIN; TrafficLevel trafficLevel = trafficLevelService.findTrafficLevelByParam(key.getCity(), key.getRegion(), key.getName()); - Integer metroCount = 0;//地铁数量 + Integer metroCount = 0;//鍦伴搧鏁伴噺 if(trafficLevel!=null&&trafficLevel.getMetroCount()!=null){ metroCount = trafficLevel.getMetroCount(); } dto.setMetroCount(metroCount); - Integer busCount = 0;//公交数量 + Integer busCount = 0;//鍏氦鏁伴噺 Integer trafficCount = 0; Integer maxTrafficCount = 0; if(trafficLevel!=null&&trafficLevel.getBusCount()!=null){ @@ -1490,14 +1490,14 @@ public class PdsController { dto.setMaxTrafficCount(maxTrafficCount); dto.setTrafficCount(trafficCount); dto.setBusCount(busCount); - Double trafficLevelRate = 0d;//交通情况城市排名 + Double trafficLevelRate = 0d;//浜ら�氭儏鍐靛煄甯傛帓鍚� if(trafficLevel!=null&&trafficLevel.getTrafficLevel()!=null&&trafficLevel.getTrafficLevelTotal()!=null){ trafficLevelRate = MathUtils.getLevelRate(trafficLevel.getTrafficLevel(), trafficLevel.getTrafficLevelTotal()); } dto.setTrafficLevelRate(trafficLevelRate); - Double trafficScore = 0d;//交通得分 - Double metroScore = 0d; //地铁得分 - Double busScore = 0d; //公交得分 + Double trafficScore = 0d;//浜ら�氬緱鍒� + Double metroScore = 0d; //鍦伴搧寰楀垎 + Double busScore = 0d; //鍏氦寰楀垎 if(pdsRatio!=null&&pdsRatio.getMetroScale()!=null){ metroScale = pdsRatio.getMetroScale(); } @@ -1535,7 +1535,7 @@ public class PdsController { return trafficScore; } - //小区密度 + //灏忓尯瀵嗗害 public Double getDistrictDensity(District district,PdsRatio pdsRatio,DistrictAnalyData districtAnalyData,CollateralEvaluationInfoDto dto) { Double densityMax = PDSConstant.DENSITY_MAX; Double densityMin = PDSConstant.DENSITY_MIN; @@ -1609,7 +1609,7 @@ public class PdsController { } - //处置 难易度得分 + //澶勭疆 闅炬槗搴﹀緱鍒� public Double getHandleDegreeScore(PdsRatio pdsRatio,Double agencyScore,Double quoteScore,Double trafficScore,Double distirctDensityScore,Double totalPriceScore){ Double agencyScale= PDSConstant.AGENCY_SCALE; Double quoteScale = PDSConstant.QUOTE_SCALE; @@ -1635,7 +1635,7 @@ public class PdsController { return handleDegreeScore; } - //综合评分 + //缁煎悎璇勫垎 public Double getCollateralTotalScore(Double handleDegreeScore, Double priceStability,PdsRatio pdsRatio){ Double priceStabilityScale = PDSConstant.PRICE_STABILITY_SCALE; Double handleStabilityScale = PDSConstant.HANDLE_STABILITY_SCALE; @@ -1708,7 +1708,7 @@ public class PdsController { } } } catch (Exception e) { - logger.error("获取小区房龄异常", e); + logger.error("鑾峰彇灏忓尯鎴块緞寮傚父", e); } return null; } @@ -1732,49 +1732,49 @@ public class PdsController { Map averageStatisticsMap = new HashMap(); if (averageStatistics != null) { if (averageStatistics.getSoufangEsfPrice() != null) { - averageStatisticsMap.put("搜房", averageStatistics.getSoufangEsfPrice()); + averageStatisticsMap.put("鎼滄埧", averageStatistics.getSoufangEsfPrice()); } else { if(beforeAvgSta!=null){ - averageStatisticsMap.put("搜房", beforeAvgSta.getSoufangEsfPrice()); + averageStatisticsMap.put("鎼滄埧", beforeAvgSta.getSoufangEsfPrice()); } } if (averageStatistics.getAnjukeEsfPrice()!= null) { - averageStatisticsMap.put("安居客", averageStatistics.getAnjukeEsfPrice()); + averageStatisticsMap.put("瀹夊眳瀹�", averageStatistics.getAnjukeEsfPrice()); } else { if(beforeAvgSta!=null){ - averageStatisticsMap.put("安居客", beforeAvgSta.getAnjukeEsfPrice()); + averageStatisticsMap.put("瀹夊眳瀹�", beforeAvgSta.getAnjukeEsfPrice()); } } if(averageStatistics.getSinaEsfPrice()!=null){ - averageStatisticsMap.put("新浪",averageStatistics.getSinaEsfPrice()); + averageStatisticsMap.put("鏂版氮",averageStatistics.getSinaEsfPrice()); }else{ if(beforeAvgSta!=null){ - averageStatisticsMap.put("新浪",beforeAvgSta.getSinaEsfPrice()); + averageStatisticsMap.put("鏂版氮",beforeAvgSta.getSinaEsfPrice()); } } if(averageStatistics.getGanjiEsfPrice()!=null){ - averageStatisticsMap.put("赶集", averageStatistics.getGanjiEsfPrice()); + averageStatisticsMap.put("璧堕泦", averageStatistics.getGanjiEsfPrice()); }else{ if(beforeAvgSta!=null){ - averageStatisticsMap.put("赶集",beforeAvgSta.getGanjiEsfPrice()); + averageStatisticsMap.put("璧堕泦",beforeAvgSta.getGanjiEsfPrice()); } } if(averageStatistics.getLianjiaEsfPrice()!=null){ - averageStatisticsMap.put("链家", averageStatistics.getLianjiaEsfPrice()); + averageStatisticsMap.put("閾惧", averageStatistics.getLianjiaEsfPrice()); }else{ if(beforeAvgSta!=null){ - averageStatisticsMap.put("链家", beforeAvgSta.getLianjiaEsfPrice()); + averageStatisticsMap.put("閾惧", beforeAvgSta.getLianjiaEsfPrice()); } } - averageStatisticsMap.put("房价网", avgPrice); + averageStatisticsMap.put("鎴夸环缃�", avgPrice); }else{ if(beforeAvgSta!=null){ - averageStatisticsMap.put("搜房", beforeAvgSta.getSoufangEsfPrice()); - averageStatisticsMap.put("安居客", beforeAvgSta.getAnjukeEsfPrice()); - averageStatisticsMap.put("新浪",beforeAvgSta.getSinaEsfPrice()); - averageStatisticsMap.put("赶集",beforeAvgSta.getGanjiEsfPrice()); - averageStatisticsMap.put("链家", beforeAvgSta.getLianjiaEsfPrice()); - averageStatisticsMap.put("房价网", avgPrice); + averageStatisticsMap.put("鎼滄埧", beforeAvgSta.getSoufangEsfPrice()); + averageStatisticsMap.put("瀹夊眳瀹�", beforeAvgSta.getAnjukeEsfPrice()); + averageStatisticsMap.put("鏂版氮",beforeAvgSta.getSinaEsfPrice()); + averageStatisticsMap.put("璧堕泦",beforeAvgSta.getGanjiEsfPrice()); + averageStatisticsMap.put("閾惧", beforeAvgSta.getLianjiaEsfPrice()); + averageStatisticsMap.put("鎴夸环缃�", avgPrice); } } return averageStatisticsMap; @@ -1821,7 +1821,7 @@ public class PdsController { public Date getMonthAgo(int i) { Calendar calendar = Calendar.getInstance(); - calendar.add(Calendar.MONTH, i); // 得到前一个月 + calendar.add(Calendar.MONTH, i); // 寰楀埌鍓嶄竴涓湀 return calendar.getTime(); } @@ -1912,7 +1912,7 @@ public class PdsController { } /** - * 贷前估值接口-PDS1.4.3新增加 + * 璐峰墠浼板�兼帴鍙�-PDS1.4.3鏂板鍔� * @author yinjihuan * @param model * @param request @@ -1923,56 +1923,56 @@ public class PdsController { EvaluationBeforeLoanDto dto = new EvaluationBeforeLoanDto(); District district = districtService.findDistrict(new DistrictKey(model.getCity(), model.getDistrict(), model.getName()), "district"); if (district == null) { - mav.setModel(BasicModel.buildBadRequestModel("小区不存在")); + mav.setModel(BasicModel.buildBadRequestModel("灏忓尯涓嶅瓨鍦�")); return mav; } DistrictKey key = new DistrictKey(model.getCity(), model.getDistrict(), model.getName()); DistrictAnalyData districtAnalyData = districtAnalyDataService.findByDistrictKey(key); - //封装小区信息 + //灏佽灏忓尯淇℃伅 this.buildDistrictInfo(dto, district, districtAnalyData); - //获取评估房子有几室 + //鑾峰彇璇勪及鎴垮瓙鏈夊嚑瀹� int room = getRoom(model); - //封装房屋类型 + //灏佽鎴垮眿绫诲瀷 this.buildRoomType(dto, model, room); - //封装价格 + //灏佽浠锋牸 this.buildPrice(dto, model); if (dto.getTotalPrice() == null) { - mav.setModel(BasicModel.buildBadRequestModel("估价失败")); + mav.setModel(BasicModel.buildBadRequestModel("浼颁环澶辫触")); return mav; } - //拥有户数数量、城市最高户数、户数城市排名 + //鎷ユ湁鎴锋暟鏁伴噺銆佸煄甯傛渶楂樻埛鏁般�佹埛鏁板煄甯傛帓鍚� this.buildHouseHoldInfoNew(districtAnalyData, dto); - //封装价格走势信息 + //灏佽浠锋牸璧板娍淇℃伅 this.buildPriceZouShi(dto, model, districtAnalyData); - //房型和面积占比 + //鎴垮瀷鍜岄潰绉崰姣� HourseTypeStat stat = hourseTypeStatService.getByNew(model.getCity(), model.getDistrict(), model.getName()); this.buildHourseTypeAndAreaProportion(dto, model, stat); - //参考房源 + //鍙傝�冩埧婧� this.buildHourseResource(dto, model); - //处置难易度 + //澶勭疆闅炬槗搴� this.buildHandleLevel(dto, model, districtAnalyData, district); - //房源挂牌量以及价格走势 + //鎴挎簮鎸傜墝閲忎互鍙婁环鏍艰蛋鍔� this.buildGuaPaiAndZouShi(dto, model); - //小区500米之内的均价对比 + //灏忓尯500绫充箣鍐呯殑鍧囦环瀵规瘮 this.buildDistancePrice(dto, district); - //资产概述 + //璧勪骇姒傝堪 this.buildDistrictDesc(dto, stat, model, room); - //各大门户网站均价 + //鍚勫ぇ闂ㄦ埛缃戠珯鍧囦环 this.buildAverageStatistics(dto, key); mav.setModel(BasicModel.buildOKModel().setResult(dto)); @@ -1980,7 +1980,7 @@ public class PdsController { } /** - * PDS中的室号获取接口,需要模拟补全 + * PDS涓殑瀹ゅ彿鑾峰彇鎺ュ彛锛岄渶瑕佹ā鎷熻ˉ鍏� * @param model * @return */ @@ -2012,10 +2012,10 @@ public class PdsController { int maxRoomNum = 0; int maxFloor = fetchMaxFloor(model.getCity(), model.getDistrict(), model.getProjectName(), model.getBuildingNumber()); - int maxRoomFloor = 0;//从室号中提取的最高楼层 + int maxRoomFloor = 0;//浠庡鍙蜂腑鎻愬彇鐨勬渶楂樻ゼ灞� for(HouseLoudong houseLoudong : houseLoudongs){ if(houseLoudong.getStatus() == 1 - || "电信数据".equals(houseLoudong.getFrom()) + || "鐢典俊鏁版嵁".equals(houseLoudong.getFrom()) || StringUtils.isBlank(houseLoudong.getDistrictNo())){ continue; } @@ -2040,21 +2040,21 @@ public class PdsController { maxRoomFloor = Math.max(maxRoomFloor, floor); } PdsRoomDto dto = new PdsRoomDto(); - dto.setDisplay(houseLoudong.getRoomNum() + "室"); + dto.setDisplay(houseLoudong.getRoomNum() + "瀹�"); dto.setRoom(houseLoudong.getRoomNum()); dto.setFloor(floor); rooms.add(dto); } - //补全室号 + //琛ュ叏瀹ゅ彿 if(maxFloor == 0) { maxFloor = maxRoomFloor; } for(int i = 1; i<=maxFloor; ++i) { for(int j = 1; j <= maxRoomNum; ++j) { - //生成室号 + //鐢熸垚瀹ゅ彿 String generateRoomNum = String.valueOf(i * 100 + j); PdsRoomDto dto = new PdsRoomDto(); - dto.setDisplay(generateRoomNum + "室"); + dto.setDisplay(generateRoomNum + "瀹�"); dto.setRoom(generateRoomNum); dto.setFloor(i); rooms.add(dto); @@ -2072,7 +2072,7 @@ public class PdsController { } for (Map r : roomNumbers) { PdsRoomDto dto = new PdsRoomDto(); - dto.setDisplay(r.get("rn") + "室"); + dto.setDisplay(r.get("rn") + "瀹�"); dto.setRoom(r.get("rn").toString()); Object floor = r.get("floor"); if (floor != null) { @@ -2092,7 +2092,7 @@ public class PdsController { } /** - * 获取某楼栋的最高楼层 + * 鑾峰彇鏌愭ゼ鏍嬬殑鏈�楂樻ゼ灞� * @param city * @param district * @param projectName @@ -2103,11 +2103,11 @@ public class PdsController { int maxFloor = 0; List loudongs = loudongService.findAll(city, district, projectName, buildingNumber, null, Integer.MAX_VALUE); Map floorsMap = Maps.newHashMap(); - //将总楼层以及出现次数临时存储 - int mostFrequentCount = 0; //出现次数最多的次数 + //灏嗘�绘ゼ灞備互鍙婂嚭鐜版鏁颁复鏃跺瓨鍌� + int mostFrequentCount = 0; //鍑虹幇娆℃暟鏈�澶氱殑娆℃暟 for(Loudong loudong : loudongs) { if(loudong.getStatus() == 0 - || (loudong.getFrom().size() == 1 && loudong.getFrom().contains("电信数据")) + || (loudong.getFrom().size() == 1 && loudong.getFrom().contains("鐢典俊鏁版嵁")) || loudong.getFloors() <= 0){ continue; } @@ -2119,18 +2119,18 @@ public class PdsController { mostFrequentCount = Math.max(mostFrequentCount, floorCount + 1); floorsMap.put(loudong.getFloors(), floorCount + 1); } - //找出出现次数最多的楼层 + //鎵惧嚭鍑虹幇娆℃暟鏈�澶氱殑妤煎眰 List maxFloors = Lists.newArrayList(); for(Map.Entry floorsEntry: floorsMap.entrySet()) { if(floorsEntry.getValue() == mostFrequentCount) { maxFloors.add(floorsEntry.getKey()); } } - //如果maxFloors不唯一,取最大值 + //濡傛灉maxFloors涓嶅敮涓�锛屽彇鏈�澶у�� if(maxFloors.size() > 1) { Collections.sort(maxFloors, Collections.reverseOrder()); } - //取第一个值 + //鍙栫涓�涓�� if(maxFloors.size() > 0) { maxFloor = maxFloors.get(0); } @@ -2138,7 +2138,7 @@ public class PdsController { } /** - * PDS中的获取楼号接口 + * PDS涓殑鑾峰彇妤煎彿鎺ュ彛 * @param model * @return */ @@ -2165,11 +2165,11 @@ public class PdsController { } }); - int max = 0; //最大楼号数 + int max = 0; //鏈�澶фゼ鍙锋暟 Map housesHeight = Maps.newHashMap(); for(Loudong loudong : loudongs) { if(loudong.getStatus() == 0 - || (loudong.getFrom().size() == 1 && loudong.getFrom().contains("电信数据"))){ + || (loudong.getFrom().size() == 1 && loudong.getFrom().contains("鐢典俊鏁版嵁"))){ continue; } String houseNumber = loudong.getHouseNumber(); @@ -2199,7 +2199,7 @@ public class PdsController { housesHeight.put(houseNumber, height); } - //模拟补全楼号 + //妯℃嫙琛ュ叏妤煎彿 for(int i= 1; i <= max; ++i) { BuildingDto dto = new BuildingDto(); dto.setBuildingNumber(i + ""); @@ -2246,112 +2246,112 @@ public class PdsController { Map averageStatisticsMap = new HashMap(); if (averageStatistics != null) { if (averageStatistics.getSoufangEsfPrice() != null) { - averageStatisticsMap.put("房天下", averageStatistics.getSoufangEsfPrice()); + averageStatisticsMap.put("鎴垮ぉ涓�", averageStatistics.getSoufangEsfPrice()); } else { if(beforeAvgSta!=null){ - averageStatisticsMap.put("房天下", beforeAvgSta.getSoufangEsfPrice()); + averageStatisticsMap.put("鎴垮ぉ涓�", beforeAvgSta.getSoufangEsfPrice()); } } if (averageStatistics.getAnjukeEsfPrice()!= null) { - averageStatisticsMap.put("安居客", averageStatistics.getAnjukeEsfPrice()); + averageStatisticsMap.put("瀹夊眳瀹�", averageStatistics.getAnjukeEsfPrice()); } else { if(beforeAvgSta!=null){ - averageStatisticsMap.put("安居客", beforeAvgSta.getAnjukeEsfPrice()); + averageStatisticsMap.put("瀹夊眳瀹�", beforeAvgSta.getAnjukeEsfPrice()); } } if(averageStatistics.getZhongyuanEsfPrice()!=null){ - averageStatisticsMap.put("中原",averageStatistics.getZhongyuanEsfPrice()); + averageStatisticsMap.put("涓師",averageStatistics.getZhongyuanEsfPrice()); }else{ if(beforeAvgSta!=null){ - averageStatisticsMap.put("中原",beforeAvgSta.getZhongyuanEsfPrice()); + averageStatisticsMap.put("涓師",beforeAvgSta.getZhongyuanEsfPrice()); } } if(averageStatistics.getGanjiEsfPrice()!=null){ - averageStatisticsMap.put("赶集", averageStatistics.getGanjiEsfPrice()); + averageStatisticsMap.put("璧堕泦", averageStatistics.getGanjiEsfPrice()); }else{ if(beforeAvgSta!=null){ - averageStatisticsMap.put("赶集",beforeAvgSta.getGanjiEsfPrice()); + averageStatisticsMap.put("璧堕泦",beforeAvgSta.getGanjiEsfPrice()); } } if(averageStatistics.getLianjiaEsfPrice()!=null){ - averageStatisticsMap.put("链家", averageStatistics.getLianjiaEsfPrice()); + averageStatisticsMap.put("閾惧", averageStatistics.getLianjiaEsfPrice()); }else{ if(beforeAvgSta!=null){ - averageStatisticsMap.put("链家", beforeAvgSta.getLianjiaEsfPrice()); + averageStatisticsMap.put("閾惧", beforeAvgSta.getLianjiaEsfPrice()); } } }else{ if(beforeAvgSta!=null){ - averageStatisticsMap.put("房天下", beforeAvgSta.getSoufangEsfPrice()); - averageStatisticsMap.put("安居客", beforeAvgSta.getAnjukeEsfPrice()); - averageStatisticsMap.put("中原",beforeAvgSta.getZhongyuanEsfPrice()); - averageStatisticsMap.put("赶集",beforeAvgSta.getGanjiEsfPrice()); - averageStatisticsMap.put("链家", beforeAvgSta.getLianjiaEsfPrice()); + averageStatisticsMap.put("鎴垮ぉ涓�", beforeAvgSta.getSoufangEsfPrice()); + averageStatisticsMap.put("瀹夊眳瀹�", beforeAvgSta.getAnjukeEsfPrice()); + averageStatisticsMap.put("涓師",beforeAvgSta.getZhongyuanEsfPrice()); + averageStatisticsMap.put("璧堕泦",beforeAvgSta.getGanjiEsfPrice()); + averageStatisticsMap.put("閾惧", beforeAvgSta.getLianjiaEsfPrice()); } } return averageStatisticsMap; } - //拥有户数数量、城市最高户数、户数城市排名 + //鎷ユ湁鎴锋暟鏁伴噺銆佸煄甯傛渶楂樻埛鏁般�佹埛鏁板煄甯傛帓鍚� private void buildHouseHoldInfoNew(DistrictAnalyData districtAnalyData, EvaluationBeforeLoanDto dto){ if(districtAnalyData == null || districtAnalyData.getHouseholdsRank() == null || districtAnalyData.getHouseholdsTotal() == null){ - dto.setHouseHoldRate(0d);//户数城市排名 + dto.setHouseHoldRate(0d);//鎴锋暟鍩庡競鎺掑悕 }else{ dto.setHouseHoldRate(MathUtils.getLevelRate(districtAnalyData.getHouseholdsRank(), districtAnalyData.getHouseholdsTotal()) * 100); } } /** - * 资产概述 + * 璧勪骇姒傝堪 * @param dto */ private void buildDistrictDesc(EvaluationBeforeLoanDto dto, HourseTypeStat stat, CollateralEvaluationInfoModel model, int room) { StringBuilder desc = new StringBuilder(); if (StringUtils.isNotBlank(dto.getBlock())) { - desc.append("该房产处于" + dto.getBlock() + "板块"); + desc.append("璇ユ埧浜у浜�" + dto.getBlock() + "鏉垮潡"); } if (StringUtils.isNotBlank(dto.getBuildYear())) { - desc.append("," + dto.getBuildYear() + "年建成"); + desc.append("锛�" + dto.getBuildYear() + "骞村缓鎴�"); } if (dto.getArea() != null && dto.getArea() > 0) { - desc.append(",建筑面积" + dto.getArea() + "㎡"); + desc.append("锛屽缓绛戦潰绉�" + dto.getArea() + "銕�"); } Map proMap = dto.getHourseTypeProportion(); if (room > -1 && proMap != null && proMap.get(room) != null) { int rate = this.getRoomTypeProportion(proMap, room); if (rate > 0) { - desc.append(",该房型在该小区占比" + rate + "%"); + desc.append("锛岃鎴垮瀷鍦ㄨ灏忓尯鍗犳瘮" + rate + "%"); } } if (stat != null && stat.getMinArea() != null && stat.getMaxArea() != null) { - desc.append(",小区主力面积为" + stat.getMinArea().intValue() + "-" + stat.getMaxArea().intValue() + "㎡"); + desc.append("锛屽皬鍖轰富鍔涢潰绉负" + stat.getMinArea().intValue() + "-" + stat.getMaxArea().intValue() + "銕�"); } if (dto.getPriceRate() != null && dto.getPriceRate() > 0) { - desc.append(",均价超过" + dto.getCity() + "" + dto.getPriceRate().intValue() + "%的小区"); + desc.append("锛屽潎浠疯秴杩�" + dto.getCity() + "" + dto.getPriceRate().intValue() + "%鐨勫皬鍖�"); } if (dto.getSixQuoteLevelRate() != null && dto.getSixQuoteLevelRate() > 0) { int rate = dto.getSixQuoteLevelRate().intValue(); if (rate > 0) { - desc.append(",近半年成交量高于" + dto.getCity() + ""+ rate + "%的小区"); + desc.append("锛岃繎鍗婂勾鎴愪氦閲忛珮浜�" + dto.getCity() + ""+ rate + "%鐨勫皬鍖�"); } } if (dto.getUpDownRangecityLevel() != null && dto.getUpDownRangecityLevel() > 0) { int rate = dto.getUpDownRangecityLevel().intValue(); if (rate > 0) { - desc.append(",涨幅高于" + dto.getCity() + ""+ rate + "%的小区"); + desc.append("锛屾定骞呴珮浜�" + dto.getCity() + ""+ rate + "%鐨勫皬鍖�"); } } List aroundList = getMetro(dto); if (aroundList != null && aroundList.size() > 0) { String name = aroundList.get(0).getName(); - desc.append(",紧邻地铁" + name + ""); + desc.append("锛岀揣閭诲湴閾�" + name + ""); } if (dto.getBusCount() != null && dto.getBusCount() > 0) { - desc.append(",周边有" + dto.getBusCount() + "条公交线路。"); + desc.append("锛屽懆杈规湁" + dto.getBusCount() + "鏉″叕浜ょ嚎璺��"); } - if (desc.toString().startsWith(",")) { + if (desc.toString().startsWith("锛�")) { desc.delete(0, 1); } dto.setDesc(desc.toString()); @@ -2373,7 +2373,7 @@ public class PdsController { } /** - * 获取评估房子有几室 + * 鑾峰彇璇勪及鎴垮瓙鏈夊嚑瀹� * @param model * @return */ @@ -2390,15 +2390,15 @@ public class PdsController { } /** - * 获取地铁数据 + * 鑾峰彇鍦伴搧鏁版嵁 * @param dto * @return */ private List getMetro(EvaluationBeforeLoanDto dto) { Map> districtAroundMap = Maps.newHashMap(); Map> stationMap = busStationService.getNearByStations(dto.getCity(), dto.getLat(), dto.getLng(), 500); - addToDistrictAroundMap(districtAroundMap, stationMap, dto, "地铁"); - //根据maxNum参数过滤返回值数量,并由近及远排序 + addToDistrictAroundMap(districtAroundMap, stationMap, dto, "鍦伴搧"); + //鏍规嵁maxNum鍙傛暟杩囨护杩斿洖鍊兼暟閲忥紝骞剁敱杩戝強杩滄帓搴� Map districtAroundCountMap = Maps.newHashMap(); filterAndSortResult(districtAroundMap, districtAroundCountMap, 1); List aroundList = districtAroundMap.get("metro"); @@ -2426,7 +2426,7 @@ public class PdsController { private void addToDistrictAroundMap(Map> districtAroundMap, Map> stationMap, EvaluationBeforeLoanDto dto, String type) { List busList = stationMap.get(type); - Set stationCache = Sets.newHashSet();//记录是否有重复站点 + Set stationCache = Sets.newHashSet();//璁板綍鏄惁鏈夐噸澶嶇珯鐐� List aroundDtos = Lists.newArrayList(); double lat = dto.getLat() / 10000000000d; double lng = dto.getLng() / 10000000000d; @@ -2456,7 +2456,7 @@ public class PdsController { } /** - * 小区500米之内的均价对比 + * 灏忓尯500绫充箣鍐呯殑鍧囦环瀵规瘮 * @param dto * @param district */ @@ -2492,7 +2492,7 @@ public class PdsController { } /** - * 房源挂牌量以及价格走势 + * 鎴挎簮鎸傜墝閲忎互鍙婁环鏍艰蛋鍔� * @param dto * @param model */ @@ -2523,7 +2523,7 @@ public class PdsController { } /** - * 封装价格走势信息 + * 灏佽浠锋牸璧板娍淇℃伅 * @author yinjihuan * @param dto * @param model @@ -2531,84 +2531,84 @@ public class PdsController { private void buildPriceZouShi(EvaluationBeforeLoanDto dto, CollateralEvaluationInfoModel model, DistrictAnalyData districtAnalyData) { Date end = new Date(); - //2年前 + //2骞村墠 Date start = DateUtil.getDateOfLastMonth(end, -24); - //小区走势 + //灏忓尯璧板娍 this.buildDistrictAvgZouShi(dto, model, end, start); - //区域走势 + //鍖哄煙璧板娍 this.buildRegionAvgZouShi(dto, model, end, start); - //城市走势 + //鍩庡競璧板娍 this.buildCityAvgZouShi(dto, model, end, start); - //获得最近一期的小区均价 + //鑾峰緱鏈�杩戜竴鏈熺殑灏忓尯鍧囦环 this.buildWeekAvgPrice(dto, model); - //小区年涨幅 + //灏忓尯骞存定骞� this.buildOneYearUpDownRange(dto, model); - //上个月参考均价 + //涓婁釜鏈堝弬鑰冨潎浠� this.buildTopMonthAvgPrice(dto, model); - //涨跌幅在城市排名 + //娑ㄨ穼骞呭湪鍩庡競鎺掑悕 this.buildUpDownRangecityLevel(dto, model, districtAnalyData); - //均价在城市中排名比(也就是价格指数) + //鍧囦环鍦ㄥ煄甯備腑鎺掑悕姣�(涔熷氨鏄环鏍兼寚鏁�) this.buildPriceRate(dto, model, districtAnalyData); } /** - * 处置难易度 + * 澶勭疆闅炬槗搴� * @param dto */ private void buildHandleLevel(EvaluationBeforeLoanDto dto, CollateralEvaluationInfoModel model, DistrictAnalyData districtAnalyData, District district) { - //获取pds相关系数 + //鑾峰彇pds鐩稿叧绯绘暟 PdsRatio pdsRatio = getPdsRatio(model); - // 获取城市近12个月的年涨幅 + // 鑾峰彇鍩庡競杩�12涓湀鐨勫勾娑ㄥ箙 Integer cityAvgPrice = cityRiseAndDownNew(model.getCity()); dto.setCityAvgPrice(cityAvgPrice); - //总价相关得分 + //鎬讳环鐩稿叧寰楀垎 Double totalPriceScore = getTotalPriceScoreInfoNew(cityAvgPrice, dto, pdsRatio); - //中介数得分、知名中介数量、其他中介数量 、中介城市排名 + //涓粙鏁板緱鍒嗐�佺煡鍚嶄腑浠嬫暟閲忋�佸叾浠栦腑浠嬫暟閲� 銆佷腑浠嬪煄甯傛帓鍚� AgencyMountLevel agencyMountLevel = agencyMountLevelService.findAgencyMountLevelParam(model.getCity(), model.getDistrict(), model.getName()); Double agencyScore= getAgencyInfoNew(agencyMountLevel, model, dto, pdsRatio); dto.setAgencyScore(agencyScore); - //近6个月挂牌量、近1个月挂牌量、近六个月最高挂牌量、6个月挂牌量在城市排名、挂牌量得分 + //杩�6涓湀鎸傜墝閲忋�佽繎1涓湀鎸傜墝閲忋�佽繎鍏釜鏈堟渶楂樻寕鐗岄噺銆�6涓湀鎸傜墝閲忓湪鍩庡競鎺掑悕銆佹寕鐗岄噺寰楀垎 DistrictKey key = new DistrictKey(model.getCity(), model.getDistrict(), model.getName()); Double quoteScore = getQuoteInfo(districtAnalyData, dto, key, pdsRatio); dto.setQuoteScore(quoteScore); - //交通得分、交通情况城市排名、公交数量、地铁数量 + //浜ら�氬緱鍒嗐�佷氦閫氭儏鍐靛煄甯傛帓鍚嶃�佸叕浜ゆ暟閲忋�佸湴閾佹暟閲� Double trafficScore = getTrafficInfoNew(dto, key, pdsRatio); dto.setTrafficScore(trafficScore); - //小区密度得分 + //灏忓尯瀵嗗害寰楀垎 Double distirctDensityScore = getDistrictDensityNew(district, pdsRatio, districtAnalyData, dto); Double handleDegreeScore = getHandleDegreeScore(pdsRatio, agencyScore, quoteScore, trafficScore, distirctDensityScore, totalPriceScore); dto.setHandleLevel(handleDegreeScore); - //获取区域近12个月的涨幅 + //鑾峰彇鍖哄煙杩�12涓湀鐨勬定骞� Double regionYoy = regionRiseAndDownNew(dto, model); - //小区年涨跌幅(没有年涨幅用半年、季度) + //灏忓尯骞存定璺屽箙(娌℃湁骞存定骞呯敤鍗婂勾銆佸搴�) Double yoyRiseDown = getAbsYoy(districtAnalyData, dto.getAvgPrice(), dto.getCitySellStats(), dto.getRegionSellStats()); - //与区域年涨跌幅差比 + //涓庡尯鍩熷勾娑ㄨ穼骞呭樊姣� Double yoyRegionAbs = yoyRegionRiseAndDownAbs(districtAnalyData, yoyRiseDown, regionYoy); - // 一年以上抵押品价格异常指数 + // 涓�骞翠互涓婃姷鎶煎搧浠锋牸寮傚父鎸囨暟 Double priceStability = getPriceStabilityValue(yoyRiseDown, yoyRegionAbs, pdsRatio, regionYoy); dto.setPriceStability(priceStability); - // 押品综合评分 + // 鎶煎搧缁煎悎璇勫垎 Double collateralTotalScore = getCollateralTotalScore(handleDegreeScore,priceStability,pdsRatio); dto.setTotalScore(collateralTotalScore); } - //区域近12个月的涨幅,年涨幅 + //鍖哄煙杩�12涓湀鐨勬定骞�,骞存定骞� private Double regionRiseAndDownNew(EvaluationBeforeLoanDto dto, CollateralEvaluationInfoModel model){ Double regionYoy = null; List regionStatTrends = regionStatTrendService.getAllWithMonths(model.getCity(), model.getDistrict(), 12); @@ -2622,7 +2622,7 @@ public class PdsController { return regionYoy; } - //总价得分 + //鎬讳环寰楀垎 private Double getTotalPriceScoreInfoNew(Integer cityAvgPrice, EvaluationBeforeLoanDto dto, PdsRatio cityRatio){ int totalPrice = dto.getTotalPrice().intValue(); Double totalPriceScore = 0d; @@ -2656,7 +2656,7 @@ public class PdsController { return totalPriceScore; } - // 城市近12个月的涨幅 + // 鍩庡競杩�12涓湀鐨勬定骞� private Integer cityRiseAndDownNew(String city){ Integer cityAvgPrice = 0; List citySellStats = citySellStatService.getAllWithMonths(city, 12); @@ -2670,7 +2670,7 @@ public class PdsController { return cityAvgPrice; } - //交通得分、交通情况城市排名、公交数量、地铁数量 + //浜ら�氬緱鍒嗐�佷氦閫氭儏鍐靛煄甯傛帓鍚嶃�佸叕浜ゆ暟閲忋�佸湴閾佹暟閲� private Double getTrafficInfoNew(EvaluationBeforeLoanDto dto, DistrictKey key, PdsRatio pdsRatio){ Double metroScale = PDSConstant.METRO_SCALE; Double metroMax = PDSConstant.METRO_MAX; @@ -2680,12 +2680,12 @@ public class PdsController { Double busMin = PDSConstant.BUS_MIN; TrafficLevel trafficLevel = trafficLevelService.findTrafficLevelByParam(key.getCity(), key.getRegion(), key.getName()); - Integer metroCount = 0;//地铁数量 + Integer metroCount = 0;//鍦伴搧鏁伴噺 if(trafficLevel!=null&&trafficLevel.getMetroCount()!=null){ metroCount = trafficLevel.getMetroCount(); } dto.setMetroCount(metroCount); - Integer busCount = 0;//公交数量 + Integer busCount = 0;//鍏氦鏁伴噺 Integer trafficCount = 0; Integer maxTrafficCount = 0; if(trafficLevel!=null&&trafficLevel.getBusCount()!=null){ @@ -2701,14 +2701,14 @@ public class PdsController { //dto.setMaxTrafficCount(maxTrafficCount); //dto.setTrafficCount(trafficCount); dto.setBusCount(busCount); - Double trafficLevelRate = 0d;//交通情况城市排名 + Double trafficLevelRate = 0d;//浜ら�氭儏鍐靛煄甯傛帓鍚� if(trafficLevel!=null&&trafficLevel.getTrafficLevel()!=null&&trafficLevel.getTrafficLevelTotal()!=null){ trafficLevelRate = MathUtils.getLevelRate(trafficLevel.getTrafficLevel(), trafficLevel.getTrafficLevelTotal()); } dto.setTrafficLevelRate(trafficLevelRate * 100); - Double trafficScore = 0d;//交通得分 - Double metroScore = 0d; //地铁得分 - Double busScore = 0d; //公交得分 + Double trafficScore = 0d;//浜ら�氬緱鍒� + Double metroScore = 0d; //鍦伴搧寰楀垎 + Double busScore = 0d; //鍏氦寰楀垎 if(pdsRatio!=null&&pdsRatio.getMetroScale()!=null){ metroScale = pdsRatio.getMetroScale(); } @@ -2747,7 +2747,7 @@ public class PdsController { } - //小区密度 + //灏忓尯瀵嗗害 private Double getDistrictDensityNew(District district,PdsRatio pdsRatio,DistrictAnalyData districtAnalyData, EvaluationBeforeLoanDto dto) { Double densityMax = PDSConstant.DENSITY_MAX; Double densityMin = PDSConstant.DENSITY_MIN; @@ -2821,7 +2821,7 @@ public class PdsController { } - //近6个月挂牌量、近1个月挂牌量、近六个月最高挂牌量、6个月挂牌量在城市排名 + //杩�6涓湀鎸傜墝閲忋�佽繎1涓湀鎸傜墝閲忋�佽繎鍏釜鏈堟渶楂樻寕鐗岄噺銆�6涓湀鎸傜墝閲忓湪鍩庡競鎺掑悕 private Double getQuoteInfo(DistrictAnalyData districtAnalyData,EvaluationBeforeLoanDto dto, DistrictKey key, PdsRatio cityRatio){ Double quoteMax = PDSConstant.QUOTE_MAX; Double quoteMin = PDSConstant.QUOTE_MIN; @@ -2830,12 +2830,12 @@ public class PdsController { if(districtAnalyData!=null&&districtAnalyData.getSellCountRank()!=null&&districtAnalyData.getSellRankTotal()!=null){ sixQuoteLevelRate = MathUtils.getLevelRate(districtAnalyData.getSellCountRank(),districtAnalyData.getSellRankTotal()); } - dto.setSixQuoteLevelRate(sixQuoteLevelRate * 100);//六个月挂牌量排名 + dto.setSixQuoteLevelRate(sixQuoteLevelRate * 100);//鍏釜鏈堟寕鐗岄噺鎺掑悕 int quoteHouseSix = 0; if(districtAnalyData!=null&&districtAnalyData.getSellCount()!=null&&districtAnalyData.getSellCount()>=0){ quoteHouseSix = districtAnalyData.getSellCount(); } - dto.setQuoteHouseSix(quoteHouseSix);// 近六个月的挂牌量 + dto.setQuoteHouseSix(quoteHouseSix);// 杩戝叚涓湀鐨勬寕鐗岄噺 Integer cityMaxQuote = districtAnalyDataService.findMaxSellCountByCity(key.getCity()); if(cityMaxQuote==null){ //dto.setSixMaxQuoteMount(0); @@ -2847,9 +2847,9 @@ public class PdsController { if(districtAnalyData!=null&&districtAnalyData.getMonthSellCount()!=null){ quertHouseOne = districtAnalyData.getMonthSellCount(); } - dto.setQuoteHouseOne(quertHouseOne);// 近一个月的挂牌量 + dto.setQuoteHouseOne(quertHouseOne);// 杩戜竴涓湀鐨勬寕鐗岄噺 - Double quoteScore = 0d;//挂牌量得分 + Double quoteScore = 0d;//鎸傜墝閲忓緱鍒� if(quoteHouseSix>=quoteMax){ quoteScore = 100d; }else if(quoteHouseSix<=quoteMin){ @@ -2861,30 +2861,30 @@ public class PdsController { return quoteScore; } - //中介数得分、知名中介数量、其他中介数量 、中介城市排名 + //涓粙鏁板緱鍒嗐�佺煡鍚嶄腑浠嬫暟閲忋�佸叾浠栦腑浠嬫暟閲� 銆佷腑浠嬪煄甯傛帓鍚� private Double getAgencyInfoNew(AgencyMountLevel agencyMountLevel,CollateralEvaluationInfoModel model,EvaluationBeforeLoanDto dto,PdsRatio cityRatio){ int famousAgency = 0; if(agencyMountLevel !=null && agencyMountLevel.getFamousAgency() >= 0){ famousAgency = agencyMountLevel.getFamousAgency(); } - //dto.setFamousAgency(famousAgency);// 知名中介 + //dto.setFamousAgency(famousAgency);// 鐭ュ悕涓粙 int otherAgency = 0; if(agencyMountLevel!=null&&agencyMountLevel.getOtherAgency()>=0){ otherAgency = agencyMountLevel.getOtherAgency(); } - //dto.setOtherAgency(otherAgency);// 其他中介 - int allAgency = famousAgency+otherAgency;//中介总数 + //dto.setOtherAgency(otherAgency);// 鍏朵粬涓粙 + int allAgency = famousAgency+otherAgency;//涓粙鎬绘暟 if(agencyMountLevel==null||agencyMountLevel.getMomCityLevel()<0||agencyMountLevel.getCitySize()<0){ - //dto.setAgencyLevelRate(0d);//中介城市排名 + //dto.setAgencyLevelRate(0d);//涓粙鍩庡競鎺掑悕 }else{ //dto.setAgencyLevelRate(MathUtils.getLevelRate(agencyMountLevel.getMomCityLevel(), agencyMountLevel.getCitySize())); } - Double agencyScore = agencyScoreLog(allAgency, cityRatio);//中介得分 + Double agencyScore = agencyScoreLog(allAgency, cityRatio);//涓粙寰楀垎 return agencyScore; } /** - * 均价在城市中排名比(也就是价格指数) + * 鍧囦环鍦ㄥ煄甯備腑鎺掑悕姣�(涔熷氨鏄环鏍兼寚鏁�) * @param dto * @param model */ @@ -2900,7 +2900,7 @@ public class PdsController { } /** - * 参考房源,优先用下面5个网站的,每个一条,如果凑不齐则用其余的网站替补,如果这5个网站都没有再用其他的网站补充 + * 鍙傝�冩埧婧�,浼樺厛鐢ㄤ笅闈�5涓綉绔欑殑锛屾瘡涓竴鏉★紝濡傛灉鍑戜笉榻愬垯鐢ㄥ叾浣欑殑缃戠珯鏇胯ˉ锛屽鏋滆繖5涓綉绔欓兘娌℃湁鍐嶇敤鍏朵粬鐨勭綉绔欒ˉ鍏� * @param dto * @param model */ @@ -2924,15 +2924,15 @@ public class PdsController { String siteName = null; if (first) { if (u.equals("fang.com")) { - siteName = "房天下"; + siteName = "鎴垮ぉ涓�"; } else if (u.equals("homelink.com.cn")) { - siteName = "链家网"; + siteName = "閾惧缃�"; } else if (u.equals("centanet.com")) { - siteName = "中原地产"; + siteName = "涓師鍦颁骇"; } else if (u.equals("5i5j.com")) { - siteName = "我爱我家"; + siteName = "鎴戠埍鎴戝"; } else if (u.equals("anjuke.com")) { - siteName = "安居客"; + siteName = "瀹夊眳瀹�"; } } else { siteName = SitenameUtil.get(u); @@ -2976,7 +2976,7 @@ public class PdsController { } /** - * 房型和面积占比 + * 鎴垮瀷鍜岄潰绉崰姣� * @author yinjihuan * @param dto * @param model @@ -2989,7 +2989,7 @@ public class PdsController { } /** - * 小区走势 + * 灏忓尯璧板娍 * @author yinjihuan * @param dto * @param model @@ -3006,7 +3006,7 @@ public class PdsController { } /** - * 区域走势 + * 鍖哄煙璧板娍 * @author yinjihuan * @param dto * @param model @@ -3023,7 +3023,7 @@ public class PdsController { } /** - * 城市走势 + * 鍩庡競璧板娍 * @author yinjihuan * @param dto * @param model @@ -3041,7 +3041,7 @@ public class PdsController { } /** - * 获得最近一期的小区均价 + * 鑾峰緱鏈�杩戜竴鏈熺殑灏忓尯鍧囦环 * @author yinjihuan * @param dto * @param model @@ -3058,7 +3058,7 @@ public class PdsController { } /** - * 小区年涨幅 + * 灏忓尯骞存定骞� * @author yinjihuan * @param dto * @param model @@ -3074,7 +3074,7 @@ public class PdsController { } /** - * 上个月参考均价 + * 涓婁釜鏈堝弬鑰冨潎浠� * @author yinjihuan * @param dto * @param model @@ -3089,7 +3089,7 @@ public class PdsController { } /** - * 涨跌幅在城市排名 + * 娑ㄨ穼骞呭湪鍩庡競鎺掑悕 * @author yinjihuan * @param dto * @param model @@ -3109,15 +3109,15 @@ public class PdsController { } /** - * 封装价格 + * 灏佽浠锋牸 * @author yinjihuan * @param dto * @param model */ private void buildPrice(EvaluationBeforeLoanDto dto, CollateralEvaluationInfoModel model) { - //创建evaluation对象 + //鍒涘缓evaluation瀵硅薄 Evaluation evaluation = creEvaluationModel(model); - // 获取房屋总价 + // 鑾峰彇鎴垮眿鎬讳环 if (StringUtils.isNotBlank(model.getName())) { EvaluationBo evaluationBo = evaluationService.doApply(evaluation, false, true, true); if (evaluationBo != null && evaluationBo.getFinalValue() > 0) { @@ -3128,19 +3128,19 @@ public class PdsController { } /** - * 封装房屋类型(查询房号库) + * 灏佽鎴垮眿绫诲瀷锛堟煡璇㈡埧鍙峰簱锛� * @author yinjihuan * @param dto * @param model */ private void buildRoomType(EvaluationBeforeLoanDto dto, CollateralEvaluationInfoModel model, int room) { if (room > 0) { - dto.setRoomType(room + "房"); + dto.setRoomType(room + "鎴�"); } } /** - * 封装小区信息 + * 灏佽灏忓尯淇℃伅 * @author yinjihuan * @param dto * @param district @@ -3162,7 +3162,7 @@ public class PdsController { if (StringUtils.isNotBlank(district.getVirescencePercent())) { dto.setVirescencePercent(district.getVirescencePercent()); } - //拥有户数户量 + //鎷ユ湁鎴锋暟鎴烽噺 if(districtAnalyData == null || districtAnalyData.getHouseholds() == null){ dto.setHouseholdCount(0); } else { @@ -3192,7 +3192,7 @@ public class PdsController { } /** - * 获取城市的相对最低和最高价 + * 鑾峰彇鍩庡競鐨勭浉瀵规渶浣庡拰鏈�楂樹环 * @param model * @return */ @@ -3200,7 +3200,7 @@ public class PdsController { RestfulModelAndView mav = new RestfulModelAndView(); EvaluationBeforeLoanDto dto = new EvaluationBeforeLoanDto(); if (StringUtils.isBlank(model.getCity())) { - mav.setModel(BasicModel.buildBadRequestModel("城市不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍩庡競涓嶈兘涓虹┖")); return mav; } Map cityDistriceMinAndMaxPrice = districtStatService.getCityDistriceMinAndMaxPricePds(model.getCity()); @@ -3214,7 +3214,7 @@ public class PdsController { /** - * PDS - 批量评估 + * PDS - 鎵归噺璇勪及 * @param model * @param request * @return @@ -3225,21 +3225,21 @@ public class PdsController { String region = model.getDistrict(); String name = model.getName(); if (StringUtils.isBlank(city)) { - mav.setModel(BasicModel.buildBadRequestModel("城市不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍩庡競涓嶈兘涓虹┖")); return mav; } if (StringUtils.isBlank(region)) { - mav.setModel(BasicModel.buildBadRequestModel("区域不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍖哄煙涓嶈兘涓虹┖")); return mav; } if (StringUtils.isBlank(name)) { - mav.setModel(BasicModel.buildBadRequestModel("名称不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍚嶇О涓嶈兘涓虹┖")); return mav; } District district = districtService.findDistrict(new DistrictKey(city, region, name), "district"); if (district == null) { - mav.setModel(BasicModel.buildBadRequestModel("小区不存在")); + mav.setModel(BasicModel.buildBadRequestModel("灏忓尯涓嶅瓨鍦�")); return mav; } @@ -3266,7 +3266,7 @@ public class PdsController { dto.setLng(district.getLng2() / 10000000000d); } - //估价 + //浼颁环 Evaluation evaluation = creEvaluationModel(model); if (StringUtils.isNotBlank(model.getName())) { EvaluationBo evaluationBo = evaluationService.doApply(evaluation, false, true, true); @@ -3276,7 +3276,7 @@ public class PdsController { } } - //年涨幅 + //骞存定骞� List districtsSellStats = districtSellStatService.getAllWithMonths(model.getCity(), model.getDistrict(), model.getName(), 12); if (districtsSellStats != null && districtsSellStats.size() > 0) { DistrictSellStat districtSellStat = districtsSellStats.get(0); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PdsEverController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PdsEverController.java index 11d91b6f1..edba3e1cb 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PdsEverController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PdsEverController.java @@ -95,7 +95,7 @@ public class PdsEverController { model.setName(result.getString("name")); model.setDistrict(dto.getDistrict()); } else { - mav.setModel(BasicModel.buildBadRequestModel("地址不存在")); + mav.setModel(BasicModel.buildBadRequestModel("鍦板潃涓嶅瓨鍦�")); return mav; } @@ -107,7 +107,7 @@ public class PdsEverController { evaluation.setFloor(model.getFloor()); evaluation.setHeight(model.getHeight()); - // 获取房屋总价 + // 鑾峰彇鎴垮眿鎬讳环 if (StringUtils.isNotBlank(dto.getName())) { EvaluationBo evaluationBo = evaluationService.doApply(evaluation, false, true, true); if (evaluationBo != null && evaluationBo.getFinalValue() > 0) { @@ -118,7 +118,7 @@ public class PdsEverController { } } - // 市场法估价 + // 甯傚満娉曚及浠� if (StringUtils.isNotBlank(dto.getName())) { EvaluationBo evaluationBo = evaluationService.doApply(evaluation, true, false, true); if (evaluationBo != null && evaluationBo.getFinalValue() > 0) { @@ -126,7 +126,7 @@ public class PdsEverController { } } - // 根据购置时间估价 + // 鏍规嵁璐疆鏃堕棿浼颁环 if (dto.getPurchase() != null) { evaluation = evaluationService.evaluate(evaluation, model.getCalDate()); if (evaluation != null && evaluation.getTotalPrice() != null) { @@ -134,7 +134,7 @@ public class PdsEverController { } } - // 查询小区相关图片 + // 鏌ヨ灏忓尯鐩稿叧鍥剧墖 District district = districtService.findDistrict(new DistrictKey(dto.getCity(), dto.getDistrict(), dto.getName()), "district"); Integer houseAge = null; Double lat = null; @@ -158,7 +158,7 @@ public class PdsEverController { DistrictKey key = new DistrictKey(dto.getCity(), dto.getDistrict(), dto.getName()); DistrictAnalyData districtAnalyData = districtAnalyDataService.findByDistrictKey(key); - // 获小区近12个月的涨跌幅以及年涨跌幅 + // 鑾峰皬鍖鸿繎12涓湀鐨勬定璺屽箙浠ュ強骞存定璺屽箙 List districtsSellStats = districtSellStatService.getAllWithMonths(dto.getCity(), dto.getDistrict(), dto.getName(), 12); Double mom = 0.0; @@ -183,18 +183,18 @@ public class PdsEverController { dto.setDistrictSellStats(districtsSellStats); - // 获取房源相关信息 + // 鑾峰彇鎴挎簮鐩稿叧淇℃伅 List houseList =null; Map priceRange = MathUtils.getAvgPriceChange(avgPrice, 0.05); if(priceRange.get("minPrice")!=null&&priceRange.get("maxPrice")!=null){ - //正负0.05 + //姝h礋0.05 houseList = houseService.findHouseByDistrictName(dto.getCity(), dto.getDistrict(), dto.getName(), priceRange.get("minPrice"), priceRange.get("maxPrice"), 9); } if(houseList==null||houseList.size()<9){ - //正负0.1 + //姝h礋0.1 priceRange = MathUtils.getAvgPriceChange(avgPrice, 0.1); if(priceRange.get("minPrice")!=null&&priceRange.get("maxPrice")!=null){ - //正负0.05 + //姝h礋0.05 List houseList1 = houseService.findHouseByDistrictName(dto.getCity(), dto.getDistrict(), dto.getName(), priceRange.get("minPrice"), priceRange.get("maxPrice"), 9); if(houseList1!=null&&houseList1.size()>0){ for (House ho : houseList1) { @@ -253,21 +253,21 @@ public class PdsEverController { dto.setHouses(houses); - // 获取城市近12个月的年涨幅 + // 鑾峰彇鍩庡競杩�12涓湀鐨勫勾娑ㄥ箙 List citySellStats = citySellStatService.getAllWithMonths(dto.getCity(), 12); if (citySellStats == null) { citySellStats = new ArrayList(); } dto.setCitySellStats(citySellStats); - //获取区域近12个月的涨幅 + //鑾峰彇鍖哄煙杩�12涓湀鐨勬定骞� List regionStatTrends = regionStatTrendService.getAllWithMonths(dto.getCity(), dto.getDistrict(), 12); if(regionStatTrends==null){ regionStatTrends = new ArrayList(); } dto.setRegionSellStats(regionStatTrends); - // 抵押品年涨跌幅得分 + // 鎶垫娂鍝佸勾娑ㄨ穼骞呭緱鍒� Double yoy = 0.0; if (districtsSellStats != null && districtsSellStats.size() > 0) { yoy = districtsSellStats.get(0).getYoy(); @@ -295,26 +295,26 @@ public class PdsEverController { } dto.setIncreaseRate(increaseRate); - //城市价格异常指数 + //鍩庡競浠锋牸寮傚父鎸囨暟 Double cityPriceStability = 0d; if(districtAnalyData!=null&&districtAnalyData.getYoyCityTotal()!=null&&districtAnalyData.getYoyCityRank()!=null){ cityPriceStability = MathUtils.getPriceStability(districtAnalyData.getYoyCityTotal(), districtAnalyData.getYoyCityRank()); } dto.setCityPriceStability(cityPriceStability); - //区域价格异常指数 + //鍖哄煙浠锋牸寮傚父鎸囨暟 Double regionPriceStability = 0d; if(districtAnalyData!=null&&districtAnalyData.getYoyRegionTotal()!=null&&districtAnalyData.getYoyRegionRank()!=null){ regionPriceStability = MathUtils.getPriceStability(districtAnalyData.getYoyRegionTotal(), districtAnalyData.getYoyRegionRank()); } dto.setRegionPriceStability(regionPriceStability); - // 抵押品价格异常指数 + // 鎶垫娂鍝佷环鏍煎紓甯告寚鏁� Double priceStability = MathUtils.getStability(cityPriceStability, regionPriceStability); dto.setPriceStability(priceStability); - // 抵押品价格指数 + // 鎶垫娂鍝佷环鏍兼寚鏁� Integer cityRank = 0; Integer cityRankTotal = 0; if (districtAnalyData != null) { @@ -324,21 +324,21 @@ public class PdsEverController { Double priceScore = MathUtils.getPriceScore(cityRank, cityRankTotal); Double priceLevelRate = MathUtils.getLevelRate(cityRank, cityRankTotal); - dto.setPriceRate(priceLevelRate);// 小区价格在城市排名比 + dto.setPriceRate(priceLevelRate);// 灏忓尯浠锋牸鍦ㄥ煄甯傛帓鍚嶆瘮 - // 小区成交量得分 + // 灏忓尯鎴愪氦閲忓緱鍒� // HouseSellLevel houseSellLevel = // houseSellLevelService.findHouseSellLevelParam(dto.getCity(),dto.getDistrict(),dto.getName()); - // 同类型房源带看数 + // 鍚岀被鍨嬫埧婧愬甫鐪嬫暟 // SeeTimeLevel seeTimeLevel = // seeTimeLevelService.findAgencyMountLevelParam(dto.getCity(), // dto.getDistrict(), dto.getName()); - // 最高中介数 + // 鏈�楂樹腑浠嬫暟 int maxAgencyMount = agencyMountLevelService.findMaxAgencyMount(dto.getCity()); dto.setMaxAgencyMount(maxAgencyMount); - // 户数排名 + // 鎴锋暟鎺掑悕 // HouseHoldMountLevel houseHoldMountLevel = // houseHoldMountLevelService.findHouseHoldMountLevelParam(dto.getCity(), // dto.getDistrict(), dto.getName()); @@ -347,23 +347,23 @@ public class PdsEverController { }else{ dto.setHouseHoldMount(districtAnalyData.getHouseholds()); } - // 城市最高户数 + // 鍩庡競鏈�楂樻埛鏁� if(districtAnalyDataService.findMaxHouseHoldCountByCity(dto.getCity())==null){ dto.setMaxHouseHold(0); }else{ dto.setMaxHouseHold(districtAnalyDataService.findMaxHouseHoldCountByCity(dto.getCity())); } - // 户数城市排名比 + // 鎴锋暟鍩庡競鎺掑悕姣� if(districtAnalyData==null||districtAnalyData.getHouseholdsRank()==null||districtAnalyData.getHouseholdsTotal()==null){ dto.setHouseHoldRate(0d); }else{ dto.setHouseHoldRate(MathUtils.getLevelRate(districtAnalyData.getHouseholdsRank(), districtAnalyData.getHouseholdsTotal())); } - // 挂牌房源量得分 - // 小区同类型挂牌房源量排名 - Integer sizeType = houseSizeType(model.getSize());//面积类型 + // 鎸傜墝鎴挎簮閲忓緱鍒� + // 灏忓尯鍚岀被鍨嬫寕鐗屾埧婧愰噺鎺掑悕 + Integer sizeType = houseSizeType(model.getSize());//闈㈢Н绫诲瀷 HouseQuoteLevel houseQuoteLevel = houseQuoteLevelService.findHouseQuoteLevelByParam(dto.getCity(), dto.getDistrict(), dto.getName(),sizeType); Double houseQuoteScore = 0d; @@ -386,30 +386,30 @@ public class PdsEverController { seeTimeScore = -1d; } } - // 中介数得分 + // 涓粙鏁板緱鍒� AgencyMountLevel agencyMountLevel = agencyMountLevelService.findAgencyMountLevelParam(dto.getCity(), dto.getDistrict(),dto.getName()); int famousAgency = 0; if(agencyMountLevel!=null&&agencyMountLevel.getFamousAgency()>=0){ famousAgency = agencyMountLevel.getFamousAgency(); } - dto.setFamousAgency(famousAgency);// 知名中介 + dto.setFamousAgency(famousAgency);// 鐭ュ悕涓粙 int otherAgency = 0; if(agencyMountLevel!=null&&agencyMountLevel.getOtherAgency()>=0){ otherAgency = agencyMountLevel.getOtherAgency(); } - dto.setOtherAgency(otherAgency);// 其他中介 + dto.setOtherAgency(otherAgency);// 鍏朵粬涓粙 Double agencyScore = 0d; if(agencyMountLevel!=null){ agencyScore = MathUtils.getLevelScore(agencyMountLevel.getCitySize(), agencyMountLevel.getMomCityLevel()); } - // 中介城市排名率 + // 涓粙鍩庡競鎺掑悕鐜� if(agencyMountLevel==null||agencyMountLevel.getMomCityLevel()<0||agencyMountLevel.getCitySize()<0){ dto.setAgencyLevelRate(0d); }else{ dto.setAgencyLevelRate(MathUtils.getLevelRate(agencyMountLevel.getMomCityLevel(), agencyMountLevel.getCitySize())); } - //户数 + //鎴锋暟 Double houseHoldScore = -1d; if(districtAnalyData!=null&&districtAnalyData.getHouseholdsTotal()!=null&&districtAnalyData.getHouseholdsRank()!=null){ if (districtAnalyData.getHouseholds()==null||districtAnalyData.getHouseholds() <= 0) { @@ -419,22 +419,22 @@ public class PdsEverController { } } - // 处置难易度得分 + // 澶勭疆闅炬槗搴﹀緱鍒� Double handleDegreeScore = MathUtils.getHandleDegreeScore(houseQuoteScore, houseSellScore, seeTimeScore, agencyScore, houseHoldScore); dto.setHandleDegreeScore(handleDegreeScore); - // 押品综合评分 + // 鎶煎搧缁煎悎璇勫垎 Double collateralTotalScore = MathUtils.getCollateralTotalScore(priceStability, handleDegreeScore, priceScore, increaseScore); dto.setCollateralTotalScore(collateralTotalScore); - // 最高抵押率 - Double maxCollateralRate = MathUtils.getMaxCollateralRate(collateralTotalScore,"消费"); + // 鏈�楂樻姷鎶肩巼 + Double maxCollateralRate = MathUtils.getMaxCollateralRate(collateralTotalScore,"娑堣垂"); dto.setMaxCollateralRate(maxCollateralRate); - // 可贷款金额 + // 鍙捶娆鹃噾棰� double loneAmount = MathUtils.getLoneAmount((double) collateralTotalScore, (double) (dto.getTotalPrice())); dto.setLoneAmount((int) loneAmount); - // 近六个月挂牌量、成交量在上海市排名率 + // 杩戝叚涓湀鎸傜墝閲忋�佹垚浜ら噺鍦ㄤ笂娴峰競鎺掑悕鐜� // SixSellMountLevel sixSellMountLevel = // sixSellMountLevelService.findSixSellMountLevelParam(dto.getCity(), // dto.getDistrict(), dto.getName()); @@ -442,19 +442,19 @@ public class PdsEverController { if(districtAnalyData!=null&&districtAnalyData.getSellCountRank()!=null&&districtAnalyData.getSellRankTotal()!=null){ sixQuoteLevelRate = MathUtils.getLevelRate(districtAnalyData.getSellCountRank(),districtAnalyData.getSellRankTotal()); } - //成交量排名 + //鎴愪氦閲忔帓鍚� Double sixSellLevelRate = 0d; if(districtAnalyData!=null&&districtAnalyData.getDealCountRank()!=null&&districtAnalyData.getDealRankTotal()!=null){ sixSellLevelRate = MathUtils.getLevelRate(districtAnalyData.getDealCountRank(),districtAnalyData.getDealRankTotal()); } dto.setSixQuoteLevelRate(sixQuoteLevelRate); dto.setSixSellHouseLevelRate(sixSellLevelRate); - // 近六个月的挂牌量 + // 杩戝叚涓湀鐨勬寕鐗岄噺 if(districtAnalyData!=null&&districtAnalyData.getSellCount()!=null&&districtAnalyData.getSellCount()>=0){ dto.setQuoteHouseSix(districtAnalyData.getSellCount()); } - // 城市近六个月最高挂牌小区挂牌量和成交量 + // 鍩庡競杩戝叚涓湀鏈�楂樻寕鐗屽皬鍖烘寕鐗岄噺鍜屾垚浜ら噺 if(districtAnalyDataService.findMaxSellCountByCity(key.getCity())==null){ dto.setSixMaxQuoteMount(0); }else{ @@ -466,18 +466,18 @@ public class PdsEverController { dto.setSixMaxSellMount(districtAnalyDataService.findMaxDealCountByCity(key.getCity())); } - // 近一个月的挂牌量 + // 杩戜竴涓湀鐨勬寕鐗岄噺 long quertHouseOne = 0; if(districtAnalyData!=null&&districtAnalyData.getMonthSellCount()!=null){ quertHouseOne = districtAnalyData.getMonthSellCount(); } dto.setQuertHouseOne(quertHouseOne); - // 近六个月的成交量 + // 杩戝叚涓湀鐨勬垚浜ら噺 long houseSellSix = dealPriceService.findDealPriceCountByDistrictKey(key, getMonthAgo(-6)); dto.setHouseSellSix(houseSellSix); - // 近1个月的成交量 + // 杩�1涓湀鐨勬垚浜ら噺 long houseSellOne = dealPriceService.findDealPriceCountByDistrictKey(key, getMonthAgo(-1)); dto.setHouseSellOne(houseSellOne); @@ -492,20 +492,20 @@ public class PdsEverController { cpdbScoreRate =MathUtils.getLevelRate(cpdbScoreLevel, cpdbCount); } dto.setCpdbScoreLevelRate(cpdbScoreRate); - //小区得分在城市的中的排名 + //灏忓尯寰楀垎鍦ㄥ煄甯傜殑涓殑鎺掑悕 Double cityScoreLevelRate = 1d; DistrictCityScoreLevel districtCityScoreLevel = districtCityScoreLevelService.findByParams(dto.getCity(), dto.getDistrict(), dto.getName()); if(districtCityScoreLevel!=null&&districtCityScoreLevel.getCitySize()!=null&&districtCityScoreLevel.getTotalScoreLevel()!=null){ cityScoreLevelRate = MathUtils.getLevelRate(districtCityScoreLevel.getTotalScoreLevel(), districtCityScoreLevel.getCitySize()); } dto.setCityScoreLevelRate(cityScoreLevelRate); - // cpdb抵押瓶库增长率率排名 + // cpdb鎶垫娂鐡跺簱澧為暱鐜囩巼鎺掑悕 dto.setCbdpIncreaseRate(cbdpIncreaseRate); - // cpdb抵押品库价格排名 + // cpdb鎶垫娂鍝佸簱浠锋牸鎺掑悕 dto.setPriceCpdbRankRate(priceCpdbRankRate); Map averageStatistics = getAverageStatistics(key.getCity(),key.getRegion(), key.getName(), avgPrice); dto.setAverageStatistics(averageStatistics); - //获取 + //鑾峰彇 Map cityDistriceMinAndMaxPrice = districtStatService.getCityDistriceMinAndMaxPrice(key.getCity()); Integer minS = cityDistriceMinAndMaxPrice.get("cityDistrictMinSellPrice"); Integer maxS = cityDistriceMinAndMaxPrice.get("cityDistrictMaxSellPrice"); @@ -592,41 +592,41 @@ public class PdsEverController { Map averageStatisticsMap = new HashMap(); if (averageStatistics != null) { if (averageStatistics.getSoufangEsfPrice() != null) { - averageStatisticsMap.put("搜房", averageStatistics.getSoufangEsfPrice()); + averageStatisticsMap.put("鎼滄埧", averageStatistics.getSoufangEsfPrice()); } else { if(beforeAvgSta!=null){ - averageStatisticsMap.put("搜房", beforeAvgSta.getSoufangEsfPrice()); + averageStatisticsMap.put("鎼滄埧", beforeAvgSta.getSoufangEsfPrice()); } } if (averageStatistics.getAnjukeEsfPrice()!= null) { - averageStatisticsMap.put("安居客", averageStatistics.getAnjukeEsfPrice()); + averageStatisticsMap.put("瀹夊眳瀹�", averageStatistics.getAnjukeEsfPrice()); } else { if(beforeAvgSta!=null){ - averageStatisticsMap.put("安居客", beforeAvgSta.getAnjukeEsfPrice()); + averageStatisticsMap.put("瀹夊眳瀹�", beforeAvgSta.getAnjukeEsfPrice()); } } if(averageStatistics.getSinaEsfPrice()!=null){ - averageStatisticsMap.put("新浪",averageStatistics.getSinaEsfPrice()); + averageStatisticsMap.put("鏂版氮",averageStatistics.getSinaEsfPrice()); }else{ if(beforeAvgSta!=null){ - averageStatisticsMap.put("新浪",beforeAvgSta.getSinaEsfPrice()); + averageStatisticsMap.put("鏂版氮",beforeAvgSta.getSinaEsfPrice()); } } if(averageStatistics.getGanjiEsfPrice()!=null){ - averageStatisticsMap.put("赶集", averageStatistics.getGanjiEsfPrice()); + averageStatisticsMap.put("璧堕泦", averageStatistics.getGanjiEsfPrice()); }else{ if(beforeAvgSta!=null){ - averageStatisticsMap.put("赶集",beforeAvgSta.getGanjiEsfPrice()); + averageStatisticsMap.put("璧堕泦",beforeAvgSta.getGanjiEsfPrice()); } } if(averageStatistics.getLianjiaEsfPrice()!=null){ - averageStatisticsMap.put("链家", averageStatistics.getLianjiaEsfPrice()); + averageStatisticsMap.put("閾惧", averageStatistics.getLianjiaEsfPrice()); }else{ if(beforeAvgSta!=null){ - averageStatisticsMap.put("链家", beforeAvgSta.getLianjiaEsfPrice()); + averageStatisticsMap.put("閾惧", beforeAvgSta.getLianjiaEsfPrice()); } } - averageStatisticsMap.put("房价网", avgPrice); + averageStatisticsMap.put("鎴夸环缃�", avgPrice); } return averageStatisticsMap; @@ -672,7 +672,7 @@ public class PdsEverController { public Date getMonthAgo(int i) { Calendar calendar = Calendar.getInstance(); - calendar.add(Calendar.MONTH, i); // 得到前一个月 + calendar.add(Calendar.MONTH, i); // 寰楀埌鍓嶄竴涓湀 return calendar.getTime(); } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PdsTotalScoreController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PdsTotalScoreController.java index a5e9a48a2..e59b87bc8 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PdsTotalScoreController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PdsTotalScoreController.java @@ -105,99 +105,99 @@ public class PdsTotalScoreController { dto.setName(model.getAddress()); model.setName(model.getAddress()); Evaluation evaluation = creEvaluationModel(model); - // 获取房屋总价 + // 鑾峰彇鎴垮眿鎬讳环 boolean houseEvaRes = houseEvaluation(model, evaluation, dto); if (!houseEvaRes) { mav.setModel(BasicModel.buildBadRequestModel(dto.getName())); return mav; } - //小区房子年龄,经纬度,小区图片相关信息 + //灏忓尯鎴垮瓙骞撮緞锛岀粡绾害锛屽皬鍖哄浘鐗囩浉鍏充俊鎭� District district = districtService.findDistrict(new DistrictKey(dto.getCity(), dto.getDistrict(), dto.getName()), "district"); districtInfo(district, dto); DistrictKey key = new DistrictKey(dto.getCity(), dto.getDistrict(), dto.getName()); DistrictAnalyData districtAnalyData = districtAnalyDataService.findByDistrictKey(key); - //均价 + //鍧囦环 Integer avgPrice = districtStatService.findLatestDistrictAvgPrice(dto.getCity(), dto.getDistrict(), null, dto.getName()); dto.setAvgPrice(avgPrice); - //小区年涨幅、月涨幅、12个月的小区涨跌幅 + //灏忓尯骞存定骞呫�佹湀娑ㄥ箙銆�12涓湀鐨勫皬鍖烘定璺屽箙 List districtsSellStats = districtSellStatService.getAllWithMonths(dto.getCity(), dto.getDistrict(), dto.getName(), 12); districtRiseAndDown(districtsSellStats, dto); - // 获取城市近12个月的年涨幅 + // 鑾峰彇鍩庡競杩�12涓湀鐨勫勾娑ㄥ箙 Integer cityAvgPrice = cityRiseAndDown(dto); dto.setCityAvgPrice(cityAvgPrice); - //获取区域近12个月的涨幅 + //鑾峰彇鍖哄煙杩�12涓湀鐨勬定骞� Double regionYoy = regionRiseAndDown(dto); - // 抵押品年涨跌幅得分 + // 鎶垫娂鍝佸勾娑ㄨ穼骞呭緱鍒� collYoyIncScore(districtAnalyData, dto); - //抵押品年涨跌幅排名比 + //鎶垫娂鍝佸勾娑ㄨ穼骞呮帓鍚嶆瘮 collRiseAndDownLevl(districtAnalyData, dto); - //城市价格异常指数 + //鍩庡競浠锋牸寮傚父鎸囨暟 Double cityPriceStability = 0d; if(districtAnalyData!=null&&districtAnalyData.getYoyCityTotal()!=null&&districtAnalyData.getYoyCityRank()!=null){ cityPriceStability = MathUtils.getPriceStability(districtAnalyData.getYoyCityTotal(), districtAnalyData.getYoyCityRank()); } dto.setCityPriceStability(cityPriceStability); - //区域价格异常指数 + //鍖哄煙浠锋牸寮傚父鎸囨暟 Double regionPriceStability = 0d; if(districtAnalyData!=null&&districtAnalyData.getYoyRegionTotal()!=null&&districtAnalyData.getYoyRegionRank()!=null){ regionPriceStability = MathUtils.getPriceStability(districtAnalyData.getYoyRegionTotal(), districtAnalyData.getYoyRegionRank()); } dto.setRegionPriceStability(regionPriceStability); - //小区年涨跌幅(没有年涨幅用半年、季度) + //灏忓尯骞存定璺屽箙(娌℃湁骞存定骞呯敤鍗婂勾銆佸搴�) Double yoyRiseDown = getAbsYoy(districtAnalyData,avgPrice,dto.getCitySellStats(),dto.getRegionSellStats()); - //与区域年涨跌幅差比 + //涓庡尯鍩熷勾娑ㄨ穼骞呭樊姣� Double yoyRegionAbs = yoyRegionRiseAndDownAbs(districtAnalyData,yoyRiseDown,regionYoy); - //获取pds相关系数 + //鑾峰彇pds鐩稿叧绯绘暟 PdsRatio pdsRatio = getPdsRatio(model); - // 一年以上抵押品价格异常指数 + // 涓�骞翠互涓婃姷鎶煎搧浠锋牸寮傚父鎸囨暟 Double priceStability = getPriceStabilityValue(yoyRiseDown, yoyRegionAbs, pdsRatio,regionYoy); dto.setPriceStability(priceStability); Double priceStabilityLess = getPriceStabilityLessValue(yoyRiseDown,yoyRegionAbs,pdsRatio); dto.setPriceStabilityLess(priceStabilityLess); - // 抵押品价格指数,价格城市排名 - Double priceScore = collPriceIndex(districtAnalyData, dto);//价格指数 - // 最高中介数 + // 鎶垫娂鍝佷环鏍兼寚鏁�,浠锋牸鍩庡競鎺掑悕 + Double priceScore = collPriceIndex(districtAnalyData, dto);//浠锋牸鎸囨暟 + // 鏈�楂樹腑浠嬫暟 int maxAgencyMount = agencyMountLevelService.findMaxAgencyMount(dto.getCity()); dto.setMaxAgencyMount(maxAgencyMount); - //拥有户数数量、城市最高户数、户数城市排名、 + //鎷ユ湁鎴锋暟鏁伴噺銆佸煄甯傛渶楂樻埛鏁般�佹埛鏁板煄甯傛帓鍚嶃�� houseHoldInfo(districtAnalyData, dto); - // 小区同类型挂牌房源量排名得分 + // 灏忓尯鍚岀被鍨嬫寕鐗屾埧婧愰噺鎺掑悕寰楀垎 Double houseQuoteScore = getQuoteSellInfo(model, dto); - //城市成交量得分 + //鍩庡競鎴愪氦閲忓緱鍒� Double houseSellScore = getSellScoreInfo(districtAnalyData); - //带看数得分 + //甯︾湅鏁板緱鍒� Double seeTimeScore = getSeeScoreInfo(districtAnalyData); - //户数得分 + //鎴锋暟寰楀垎 Double houseHoldScore = getHouseHoldScoreInfo(districtAnalyData); - //中介数得分、知名中介数量、其他中介数量 、中介城市排名 + //涓粙鏁板緱鍒嗐�佺煡鍚嶄腑浠嬫暟閲忋�佸叾浠栦腑浠嬫暟閲� 銆佷腑浠嬪煄甯傛帓鍚� AgencyMountLevel agencyMountLevel = agencyMountLevelService.findAgencyMountLevelParam(dto.getCity(), dto.getDistrict(),dto.getName()); Double agencyScore= getAgencyInfo(agencyMountLevel, model, dto, pdsRatio); dto.setAgencyScore(agencyScore); - //总价相关得分 + //鎬讳环鐩稿叧寰楀垎 Double totalPriceScore = getTotalPriceScoreInfo(cityAvgPrice, dto, pdsRatio); - //近6个月挂牌量、近1个月挂牌量、近六个月最高挂牌量、6个月挂牌量在城市排名、挂牌量得分 + //杩�6涓湀鎸傜墝閲忋�佽繎1涓湀鎸傜墝閲忋�佽繎鍏釜鏈堟渶楂樻寕鐗岄噺銆�6涓湀鎸傜墝閲忓湪鍩庡競鎺掑悕銆佹寕鐗岄噺寰楀垎 Double quoteScore = getQuoteInfo(districtAnalyData, dto, key, pdsRatio); dto.setQuoteScore(quoteScore); - //近6个月成交量、1个月成交量、近6个月最高成交量、6个月成交量在城市排名、成交量得分 + //杩�6涓湀鎴愪氦閲忋��1涓湀鎴愪氦閲忋�佽繎6涓湀鏈�楂樻垚浜ら噺銆�6涓湀鎴愪氦閲忓湪鍩庡競鎺掑悕銆佹垚浜ら噺寰楀垎 getSellInfo(districtAnalyData, dto, key, pdsRatio); - //交通得分、交通情况城市排名、公交数量、地铁数量 + //浜ら�氬緱鍒嗐�佷氦閫氭儏鍐靛煄甯傛帓鍚嶃�佸叕浜ゆ暟閲忋�佸湴閾佹暟閲� Double trafficScore = getTrafficInfo(dto,key,pdsRatio); dto.setTrafficScore(trafficScore); - //小区密度得分 + //灏忓尯瀵嗗害寰楀垎 Double distirctDensityScore = getDistrictDensity(district, pdsRatio, districtAnalyData,dto); - // 处置难易度得分 + // 澶勭疆闅炬槗搴﹀緱鍒� Double handleDegreeScore = getHandleDegreeScore(pdsRatio,agencyScore,quoteScore,trafficScore,distirctDensityScore,totalPriceScore); dto.setHandleDegreeScore(handleDegreeScore); - // 押品综合评分 + // 鎶煎搧缁煎悎璇勫垎 Double collateralTotalScore = getCollateralTotalScore(handleDegreeScore,priceStability,pdsRatio); dto.setCollateralTotalScore(collateralTotalScore); mav.setModel(BasicModel.buildOKModel().setResult(dto)); @@ -243,7 +243,7 @@ public class PdsTotalScoreController { return mav; } - //房屋地址匹配模块 + //鎴垮眿鍦板潃鍖归厤妯″潡 public boolean houseAddressMatch(CollateralEvaluationInfoModel model,CollateralEvaluationInfoDto dto){ Map params = new HashMap(); params.put("city", model.getCity()); @@ -282,7 +282,7 @@ public class PdsTotalScoreController { } return true; } - //创建evaluation模块 + //鍒涘缓evaluation妯″潡 public Evaluation creEvaluationModel(CollateralEvaluationInfoModel model){ Evaluation evaluation = new Evaluation(); evaluation.setCity(model.getCity()); @@ -295,9 +295,9 @@ public class PdsTotalScoreController { evaluation.setDirection(model.getDirection()); return evaluation; } - //房屋估价模块 评估后的评估单价 + //鎴垮眿浼颁环妯″潡 璇勪及鍚庣殑璇勪及鍗曚环 public boolean houseEvaluation(CollateralEvaluationInfoModel model,Evaluation evaluation,CollateralEvaluationInfoDto dto){ - // 获取房屋总价 + // 鑾峰彇鎴垮眿鎬讳环 if (StringUtils.isNotBlank(dto.getName())) { EvaluationBo evaluationBo = evaluationService.doApply(evaluation, false, true, true); if (evaluationBo != null && evaluationBo.getFinalValue() > 0) { @@ -309,7 +309,7 @@ public class PdsTotalScoreController { } return true; } - //小区房子年龄,经纬度,小区图片相关信息 + //灏忓尯鎴垮瓙骞撮緞锛岀粡绾害锛屽皬鍖哄浘鐗囩浉鍏充俊鎭� public void districtInfo(District district,CollateralEvaluationInfoDto dto){ Integer houseAge = null; @@ -335,7 +335,7 @@ public class PdsTotalScoreController { } - //小区年涨幅、月涨幅、12个月的小区涨跌幅 + //灏忓尯骞存定骞呫�佹湀娑ㄥ箙銆�12涓湀鐨勫皬鍖烘定璺屽箙 public void districtRiseAndDown(List districtsSellStats,CollateralEvaluationInfoDto dto){ Double mom = 0.0; Double yoyIn = 0d; @@ -353,20 +353,20 @@ public class PdsTotalScoreController { dto.setDisMom(mom); } - //获取相关房源信息 + //鑾峰彇鐩稿叧鎴挎簮淇℃伅 public void houseResource(Integer avgPrice,CollateralEvaluationInfoDto dto){ - // 获取房源相关信息 + // 鑾峰彇鎴挎簮鐩稿叧淇℃伅 List houseList =null; Map priceRange = MathUtils.getAvgPriceChange(avgPrice, 0.05); if(priceRange.get("minPrice")!=null&&priceRange.get("maxPrice")!=null){ - //正负0.05 + //姝h礋0.05 houseList = houseService.findHouseByDistrictName(dto.getCity(), dto.getDistrict(), dto.getName(), priceRange.get("minPrice"), priceRange.get("maxPrice"), 9); } if(houseList==null||houseList.size()<9){ - //正负0.1 + //姝h礋0.1 priceRange = MathUtils.getAvgPriceChange(avgPrice, 0.1); if(priceRange.get("minPrice")!=null&&priceRange.get("maxPrice")!=null){ - //正负0.05 + //姝h礋0.05 List houseList1 = houseService.findHouseByDistrictName(dto.getCity(), dto.getDistrict(), dto.getName(), priceRange.get("minPrice"), priceRange.get("maxPrice"), 9); if(houseList1!=null&&houseList1.size()>0){ for (House ho : houseList1) { @@ -423,7 +423,7 @@ public class PdsTotalScoreController { } - // 城市近12个月的涨幅 + // 鍩庡競杩�12涓湀鐨勬定骞� public Integer cityRiseAndDown(CollateralEvaluationInfoDto dto){ Integer cityAvgPrice = 0; List citySellStats = citySellStatService.getAllWithMonths(dto.getCity(), 12); @@ -437,7 +437,7 @@ public class PdsTotalScoreController { return cityAvgPrice; } - //区域近12个月的涨幅,年涨幅 + //鍖哄煙杩�12涓湀鐨勬定骞�,骞存定骞� public Double regionRiseAndDown(CollateralEvaluationInfoDto dto){ Double regionYoy = null; List regionStatTrends = regionStatTrendService.getAllWithMonths(dto.getCity(), dto.getDistrict(), 12); @@ -451,7 +451,7 @@ public class PdsTotalScoreController { return regionYoy; } - // 抵押品年涨跌幅得分 + // 鎶垫娂鍝佸勾娑ㄨ穼骞呭緱鍒� public void collYoyIncScore(DistrictAnalyData districtAnalyData,CollateralEvaluationInfoDto dto){ Double increaseScore = 0d; if(districtAnalyData!=null&&districtAnalyData.getYoyCityTotal()!=null&&districtAnalyData.getYoyCityRank()!=null){ @@ -463,7 +463,7 @@ public class PdsTotalScoreController { dto.setIncreaseScore(increaseScore); } - //抵押品年涨跌幅排名比 + //鎶垫娂鍝佸勾娑ㄨ穼骞呮帓鍚嶆瘮 public void collRiseAndDownLevl(DistrictAnalyData districtAnalyData,CollateralEvaluationInfoDto dto){ Double increaseScore = 0d; if(districtAnalyData!=null&&districtAnalyData.getYoyCityTotal()!=null&&districtAnalyData.getYoyCityRank()!=null){ @@ -485,10 +485,10 @@ public class PdsTotalScoreController { dto.setIncreaseRate(increaseRate); } - //选择年涨跌幅、半年涨跌幅、季度涨跌幅 + //閫夋嫨骞存定璺屽箙銆佸崐骞存定璺屽箙銆佸搴︽定璺屽箙 public Double getAbsYoy(DistrictAnalyData districtAnalyData,Integer avgPrice,List css,List rss){ Double yoy = null; - if(districtAnalyData!=null){//选择年涨跌幅、半年涨跌幅、季度涨跌幅 + if(districtAnalyData!=null){//閫夋嫨骞存定璺屽箙銆佸崐骞存定璺屽箙銆佸搴︽定璺屽箙 if(districtAnalyData.getYoy()!=null){ yoy = districtAnalyData.getYoy(); }else if(districtAnalyData.getHalfYoy()!=null){ @@ -505,9 +505,9 @@ public class PdsTotalScoreController { } return yoy; } - //与区域年涨跌幅差比 + //涓庡尯鍩熷勾娑ㄨ穼骞呭樊姣� public Double yoyRegionRiseAndDownAbs(DistrictAnalyData districtAnalyData,Double yoy,Double regionYoy){ - Double yoyRegionAbs = null;//小区涨跌幅与区域的差比 + Double yoyRegionAbs = null;//灏忓尯娑ㄨ穼骞呬笌鍖哄煙鐨勫樊姣� if(yoy!=null&®ionYoy!=null&®ionYoy!=0){ yoyRegionAbs = MathUtils.yoyAbs(yoy, regionYoy); }else{ @@ -519,7 +519,7 @@ public class PdsTotalScoreController { } return yoyRegionAbs; } - //以上价格稳定指数 + //浠ヤ笂浠锋牸绋冲畾鎸囨暟 public Double getPriceStabilityValue(Double yoy,Double regionAbs,PdsRatio cityRatio,Double regionYoy){ Double priceStability = 0d; Double absDLine = PDSConstant.ABSD_LINE; @@ -551,7 +551,7 @@ public class PdsTotalScoreController { } return priceStability; } - //一年以下价格稳定指数 + //涓�骞翠互涓嬩环鏍肩ǔ瀹氭寚鏁� public Double getPriceStabilityLessValue(Double yoy,Double regionAbs,PdsRatio cityRatio){ Double priceStability = 0d; Double absDLine = PDSConstant.ABSD_LINE; @@ -579,10 +579,10 @@ public class PdsTotalScoreController { return priceStability; } - //获取pds相关系数 + //鑾峰彇pds鐩稿叧绯绘暟 public PdsRatio getPdsRatio(CollateralEvaluationInfoModel model){ PdsRatio pdsRatio = new PdsRatio(); - //此处需要调用接口 + //姝ゅ闇�瑕佽皟鐢ㄦ帴鍙� pdsRatio.setAgencyScale(model.getAgencyCount()); pdsRatio.setAgencyMax(model.getAgencyCountMax()); pdsRatio.setAgencyMin(model.getAgencyCountMin()); @@ -615,7 +615,7 @@ public class PdsTotalScoreController { pdsRatio.setRegionAbsC(model.getYoyC()); return pdsRatio; } - //抵押平价格指数, 均价在城市排名 + //鎶垫娂骞充环鏍兼寚鏁�, 鍧囦环鍦ㄥ煄甯傛帓鍚� public Double collPriceIndex(DistrictAnalyData districtAnalyData,CollateralEvaluationInfoDto dto){ Integer cityRank = 0; Integer cityRankTotal = 0; @@ -626,35 +626,35 @@ public class PdsTotalScoreController { Double priceScore = MathUtils.getPriceScore(cityRank, cityRankTotal); Double priceLevelRate = MathUtils.getLevelRate(cityRank, cityRankTotal); - dto.setPriceRate(priceLevelRate);// 小区价格在城市排名比 + dto.setPriceRate(priceLevelRate);// 灏忓尯浠锋牸鍦ㄥ煄甯傛帓鍚嶆瘮 return priceScore; } - //拥有户数数量、城市最高户数、户数城市排名 + //鎷ユ湁鎴锋暟鏁伴噺銆佸煄甯傛渶楂樻埛鏁般�佹埛鏁板煄甯傛帓鍚� public void houseHoldInfo(DistrictAnalyData districtAnalyData,CollateralEvaluationInfoDto dto){ if(districtAnalyData==null||districtAnalyData.getHouseholds()==null){ - dto.setHouseHoldMount(0);//拥有户数户量 + dto.setHouseHoldMount(0);//鎷ユ湁鎴锋暟鎴烽噺 }else{ dto.setHouseHoldMount(districtAnalyData.getHouseholds()); } Integer houseHoldCount = districtAnalyDataService.findMaxHouseHoldCountByCity(dto.getCity()); - //城市户数最高拥有量 + //鍩庡競鎴锋暟鏈�楂樻嫢鏈夐噺 dto.setMaxHouseHold(houseHoldCount); if(districtAnalyData==null||districtAnalyData.getHouseholdsRank()==null||districtAnalyData.getHouseholdsTotal()==null){ - dto.setHouseHoldRate(0d);//户数城市排名 + dto.setHouseHoldRate(0d);//鎴锋暟鍩庡競鎺掑悕 }else{ dto.setHouseHoldRate(MathUtils.getLevelRate(districtAnalyData.getHouseholdsRank(), districtAnalyData.getHouseholdsTotal())); } } - //小区同类型挂牌房源量排名得分 + //灏忓尯鍚岀被鍨嬫寕鐗屾埧婧愰噺鎺掑悕寰楀垎 public Double getQuoteSellInfo(CollateralEvaluationInfoModel model,CollateralEvaluationInfoDto dto){ - //此功能已经废弃 + //姝ゅ姛鑳藉凡缁忓簾寮� return 0d; } - //小区成交量得分 + //灏忓尯鎴愪氦閲忓緱鍒� public Double getSellScoreInfo(DistrictAnalyData districtAnalyData){ - //城市成交量得分 + //鍩庡競鎴愪氦閲忓緱鍒� Double houseSellScore = 0d; if(districtAnalyData!=null&&districtAnalyData.getDealRankTotal()!=null&&districtAnalyData.getDealCountRank()!=null){ houseSellScore = MathUtils.getLevelScore(districtAnalyData.getDealRankTotal(),districtAnalyData.getDealCountRank()); @@ -665,34 +665,34 @@ public class PdsTotalScoreController { return houseSellScore; } - //小区带看数得分 + //灏忓尯甯︾湅鏁板緱鍒� public Double getSeeScoreInfo(DistrictAnalyData districtAnalyData){ - //此方法已经不用了 + //姝ゆ柟娉曞凡缁忎笉鐢ㄤ簡 return 0d; } - //中介数得分、知名中介数量、其他中介数量 、中介城市排名 + //涓粙鏁板緱鍒嗐�佺煡鍚嶄腑浠嬫暟閲忋�佸叾浠栦腑浠嬫暟閲� 銆佷腑浠嬪煄甯傛帓鍚� public Double getAgencyInfo(AgencyMountLevel agencyMountLevel,CollateralEvaluationInfoModel model,CollateralEvaluationInfoDto dto,PdsRatio cityRatio){ int famousAgency = 0; if(agencyMountLevel!=null&&agencyMountLevel.getFamousAgency()>=0){ famousAgency = agencyMountLevel.getFamousAgency(); } - dto.setFamousAgency(famousAgency);// 知名中介 + dto.setFamousAgency(famousAgency);// 鐭ュ悕涓粙 int otherAgency = 0; if(agencyMountLevel!=null&&agencyMountLevel.getOtherAgency()>=0){ otherAgency = agencyMountLevel.getOtherAgency(); } - dto.setOtherAgency(otherAgency);// 其他中介 - int allAgency = famousAgency+otherAgency;//中介总数 + dto.setOtherAgency(otherAgency);// 鍏朵粬涓粙 + int allAgency = famousAgency+otherAgency;//涓粙鎬绘暟 if(agencyMountLevel==null||agencyMountLevel.getMomCityLevel()<0||agencyMountLevel.getCitySize()<0){ - dto.setAgencyLevelRate(0d);//中介城市排名 + dto.setAgencyLevelRate(0d);//涓粙鍩庡競鎺掑悕 }else{ dto.setAgencyLevelRate(MathUtils.getLevelRate(agencyMountLevel.getMomCityLevel(), agencyMountLevel.getCitySize())); } - Double agencyScore = agencyScoreLog(allAgency, cityRatio);//中介得分 + Double agencyScore = agencyScoreLog(allAgency, cityRatio);//涓粙寰楀垎 return agencyScore; } - //中介得分逻辑 + //涓粙寰楀垎閫昏緫 public Double agencyScoreLog(int allAgency,PdsRatio cityRatio){ Double agencyScore = 0d; Double agencyMax = PDSConstant.AGENCY_MAX; @@ -714,7 +714,7 @@ public class PdsTotalScoreController { return agencyScore; } - //户数得分 + //鎴锋暟寰楀垎 public Double getHouseHoldScoreInfo(DistrictAnalyData districtAnalyData){ Double houseHoldScore = -1d; if(districtAnalyData!=null&&districtAnalyData.getHouseholdsTotal()!=null&&districtAnalyData.getHouseholdsRank()!=null){ @@ -727,7 +727,7 @@ public class PdsTotalScoreController { return houseHoldScore; } - //总价得分 + //鎬讳环寰楀垎 public Double getTotalPriceScoreInfo(Integer cityAvgPrice,CollateralEvaluationInfoDto dto,PdsRatio cityRatio){ int totalPrice = dto.getTotalPrice(); Double totalPriceScore = 0d; @@ -761,7 +761,7 @@ public class PdsTotalScoreController { return totalPriceScore; } - //近6个月挂牌量、近1个月挂牌量、近六个月最高挂牌量、6个月挂牌量在城市排名 + //杩�6涓湀鎸傜墝閲忋�佽繎1涓湀鎸傜墝閲忋�佽繎鍏釜鏈堟渶楂樻寕鐗岄噺銆�6涓湀鎸傜墝閲忓湪鍩庡競鎺掑悕 public Double getQuoteInfo(DistrictAnalyData districtAnalyData,CollateralEvaluationInfoDto dto,DistrictKey key,PdsRatio cityRatio){ Double quoteMax = PDSConstant.QUOTE_MAX; Double quoteMin = PDSConstant.QUOTE_MIN; @@ -770,12 +770,12 @@ public class PdsTotalScoreController { if(districtAnalyData!=null&&districtAnalyData.getSellCountRank()!=null&&districtAnalyData.getSellRankTotal()!=null){ sixQuoteLevelRate = MathUtils.getLevelRate(districtAnalyData.getSellCountRank(),districtAnalyData.getSellRankTotal()); } - dto.setSixQuoteLevelRate(sixQuoteLevelRate);//六个月挂牌量排名 + dto.setSixQuoteLevelRate(sixQuoteLevelRate);//鍏釜鏈堟寕鐗岄噺鎺掑悕 long quoteHouseSix = 0; if(districtAnalyData!=null&&districtAnalyData.getSellCount()!=null&&districtAnalyData.getSellCount()>=0){ quoteHouseSix = districtAnalyData.getSellCount(); } - dto.setQuoteHouseSix(quoteHouseSix);// 近六个月的挂牌量 + dto.setQuoteHouseSix(quoteHouseSix);// 杩戝叚涓湀鐨勬寕鐗岄噺 Integer cityMaxQuote = districtAnalyDataService.findMaxSellCountByCity(key.getCity()); dto.setSixMaxQuoteMount(cityMaxQuote); @@ -783,9 +783,9 @@ public class PdsTotalScoreController { if(districtAnalyData!=null&&districtAnalyData.getMonthSellCount()!=null){ quertHouseOne = districtAnalyData.getMonthSellCount(); } - dto.setQuertHouseOne(quertHouseOne);// 近一个月的挂牌量 + dto.setQuertHouseOne(quertHouseOne);// 杩戜竴涓湀鐨勬寕鐗岄噺 - Double quoteScore = 0d;//挂牌量得分 + Double quoteScore = 0d;//鎸傜墝閲忓緱鍒� if(quoteHouseSix>=quoteMax){ quoteScore = 100d; }else if(quoteHouseSix<=quoteMin){ @@ -797,28 +797,28 @@ public class PdsTotalScoreController { return quoteScore; } - //近6个月成交量、1个月成交量、近6个月最高成交量、6个月成交量在城市排名 + //杩�6涓湀鎴愪氦閲忋��1涓湀鎴愪氦閲忋�佽繎6涓湀鏈�楂樻垚浜ら噺銆�6涓湀鎴愪氦閲忓湪鍩庡競鎺掑悕 public void getSellInfo(DistrictAnalyData districtAnalyData,CollateralEvaluationInfoDto dto,DistrictKey key,PdsRatio cityRatio){ - //成交量排名 + //鎴愪氦閲忔帓鍚� Double sixSellLevelRate = 0d; if(districtAnalyData!=null&&districtAnalyData.getDealCountRank()!=null&&districtAnalyData.getDealRankTotal()!=null){ sixSellLevelRate = MathUtils.getLevelRate(districtAnalyData.getDealCountRank(),districtAnalyData.getDealRankTotal()); } dto.setSixSellHouseLevelRate(sixSellLevelRate); - // 近六个月的成交量 + // 杩戝叚涓湀鐨勬垚浜ら噺 //long houseSellSix = dealPriceService.findDealPriceCountByDistrictKey(key, getMonthAgo(-6)); long houseSellSix = 0; dto.setHouseSellSix(houseSellSix); - //城市6个月成交量最大排名 + //鍩庡競6涓湀鎴愪氦閲忔渶澶ф帓鍚� Integer cityMaxSell = districtAnalyDataService.findMaxDealCountByCity(key.getCity()); dto.setSixMaxSellMount(cityMaxSell); - // 近1个月的成交量 + // 杩�1涓湀鐨勬垚浜ら噺 //long houseSellOne = dealPriceService.findDealPriceCountByDistrictKey(key, getMonthAgo(-1)); long houseSellOne = 0; dto.setHouseSellOne(houseSellOne); } - //交通得分、交通情况城市排名、公交数量、地铁数量 + //浜ら�氬緱鍒嗐�佷氦閫氭儏鍐靛煄甯傛帓鍚嶃�佸叕浜ゆ暟閲忋�佸湴閾佹暟閲� public Double getTrafficInfo(CollateralEvaluationInfoDto dto, DistrictKey key, PdsRatio pdsRatio){ Double metroScale = PDSConstant.METRO_SCALE; Double metroMax = PDSConstant.METRO_MAX; @@ -828,12 +828,12 @@ public class PdsTotalScoreController { Double busMin = PDSConstant.BUS_MIN; TrafficLevel trafficLevel = trafficLevelService.findTrafficLevelByParam(key.getCity(), key.getRegion(), key.getName()); - Integer metroCount = 0;//地铁数量 + Integer metroCount = 0;//鍦伴搧鏁伴噺 if(trafficLevel!=null&&trafficLevel.getMetroCount()!=null){ metroCount = trafficLevel.getMetroCount(); } dto.setMetroCount(metroCount); - Integer busCount = 0;//公交数量 + Integer busCount = 0;//鍏氦鏁伴噺 Integer trafficCount = 0; Integer maxTrafficCount = 0; if(trafficLevel!=null&&trafficLevel.getBusCount()!=null){ @@ -849,14 +849,14 @@ public class PdsTotalScoreController { dto.setMaxTrafficCount(maxTrafficCount); dto.setTrafficCount(trafficCount); dto.setBusCount(busCount); - Double trafficLevelRate = 0d;//交通情况城市排名 + Double trafficLevelRate = 0d;//浜ら�氭儏鍐靛煄甯傛帓鍚� if(trafficLevel!=null&&trafficLevel.getTrafficLevel()!=null&&trafficLevel.getTrafficLevelTotal()!=null){ trafficLevelRate = MathUtils.getLevelRate(trafficLevel.getTrafficLevel(), trafficLevel.getTrafficLevelTotal()); } dto.setTrafficLevelRate(trafficLevelRate); - Double trafficScore = 0d;//交通得分 - Double metroScore = 0d; //地铁得分 - Double busScore = 0d; //公交得分 + Double trafficScore = 0d;//浜ら�氬緱鍒� + Double metroScore = 0d; //鍦伴搧寰楀垎 + Double busScore = 0d; //鍏氦寰楀垎 if(pdsRatio!=null&&pdsRatio.getMetroScale()!=null){ metroScale = pdsRatio.getMetroScale(); } @@ -894,7 +894,7 @@ public class PdsTotalScoreController { return trafficScore; } - //小区密度 + //灏忓尯瀵嗗害 public Double getDistrictDensity(District district,PdsRatio pdsRatio,DistrictAnalyData districtAnalyData,CollateralEvaluationInfoDto dto) { Double densityMax = PDSConstant.DENSITY_MAX; Double densityMin = PDSConstant.DENSITY_MIN; @@ -968,7 +968,7 @@ public class PdsTotalScoreController { } - //处置 难易度得分 + //澶勭疆 闅炬槗搴﹀緱鍒� public Double getHandleDegreeScore(PdsRatio pdsRatio,Double agencyScore,Double quoteScore,Double trafficScore,Double distirctDensityScore,Double totalPriceScore){ Double agencyScale= PDSConstant.AGENCY_SCALE; Double quoteScale = PDSConstant.QUOTE_SCALE; @@ -994,7 +994,7 @@ public class PdsTotalScoreController { return handleDegreeScore; } - //综合评分 + //缁煎悎璇勫垎 public Double getCollateralTotalScore(Double handleDegreeScore, Double priceStability,PdsRatio pdsRatio){ Double priceStabilityScale = PDSConstant.PRICE_STABILITY_SCALE; Double handleStabilityScale = PDSConstant.HANDLE_STABILITY_SCALE; @@ -1087,49 +1087,49 @@ public class PdsTotalScoreController { Map averageStatisticsMap = new HashMap(); if (averageStatistics != null) { if (averageStatistics.getSoufangEsfPrice() != null) { - averageStatisticsMap.put("搜房", averageStatistics.getSoufangEsfPrice()); + averageStatisticsMap.put("鎼滄埧", averageStatistics.getSoufangEsfPrice()); } else { if(beforeAvgSta!=null){ - averageStatisticsMap.put("搜房", beforeAvgSta.getSoufangEsfPrice()); + averageStatisticsMap.put("鎼滄埧", beforeAvgSta.getSoufangEsfPrice()); } } if (averageStatistics.getAnjukeEsfPrice()!= null) { - averageStatisticsMap.put("安居客", averageStatistics.getAnjukeEsfPrice()); + averageStatisticsMap.put("瀹夊眳瀹�", averageStatistics.getAnjukeEsfPrice()); } else { if(beforeAvgSta!=null){ - averageStatisticsMap.put("安居客", beforeAvgSta.getAnjukeEsfPrice()); + averageStatisticsMap.put("瀹夊眳瀹�", beforeAvgSta.getAnjukeEsfPrice()); } } if(averageStatistics.getSinaEsfPrice()!=null){ - averageStatisticsMap.put("新浪",averageStatistics.getSinaEsfPrice()); + averageStatisticsMap.put("鏂版氮",averageStatistics.getSinaEsfPrice()); }else{ if(beforeAvgSta!=null){ - averageStatisticsMap.put("新浪",beforeAvgSta.getSinaEsfPrice()); + averageStatisticsMap.put("鏂版氮",beforeAvgSta.getSinaEsfPrice()); } } if(averageStatistics.getGanjiEsfPrice()!=null){ - averageStatisticsMap.put("赶集", averageStatistics.getGanjiEsfPrice()); + averageStatisticsMap.put("璧堕泦", averageStatistics.getGanjiEsfPrice()); }else{ if(beforeAvgSta!=null){ - averageStatisticsMap.put("赶集",beforeAvgSta.getGanjiEsfPrice()); + averageStatisticsMap.put("璧堕泦",beforeAvgSta.getGanjiEsfPrice()); } } if(averageStatistics.getLianjiaEsfPrice()!=null){ - averageStatisticsMap.put("链家", averageStatistics.getLianjiaEsfPrice()); + averageStatisticsMap.put("閾惧", averageStatistics.getLianjiaEsfPrice()); }else{ if(beforeAvgSta!=null){ - averageStatisticsMap.put("链家", beforeAvgSta.getLianjiaEsfPrice()); + averageStatisticsMap.put("閾惧", beforeAvgSta.getLianjiaEsfPrice()); } } - averageStatisticsMap.put("房价网", avgPrice); + averageStatisticsMap.put("鎴夸环缃�", avgPrice); }else{ if(beforeAvgSta!=null){ - averageStatisticsMap.put("搜房", beforeAvgSta.getSoufangEsfPrice()); - averageStatisticsMap.put("安居客", beforeAvgSta.getAnjukeEsfPrice()); - averageStatisticsMap.put("新浪",beforeAvgSta.getSinaEsfPrice()); - averageStatisticsMap.put("赶集",beforeAvgSta.getGanjiEsfPrice()); - averageStatisticsMap.put("链家", beforeAvgSta.getLianjiaEsfPrice()); - averageStatisticsMap.put("房价网", avgPrice); + averageStatisticsMap.put("鎼滄埧", beforeAvgSta.getSoufangEsfPrice()); + averageStatisticsMap.put("瀹夊眳瀹�", beforeAvgSta.getAnjukeEsfPrice()); + averageStatisticsMap.put("鏂版氮",beforeAvgSta.getSinaEsfPrice()); + averageStatisticsMap.put("璧堕泦",beforeAvgSta.getGanjiEsfPrice()); + averageStatisticsMap.put("閾惧", beforeAvgSta.getLianjiaEsfPrice()); + averageStatisticsMap.put("鎴夸环缃�", avgPrice); } } return averageStatisticsMap; @@ -1176,7 +1176,7 @@ public class PdsTotalScoreController { public Date getMonthAgo(int i) { Calendar calendar = Calendar.getInstance(); - calendar.add(Calendar.MONTH, i); // 得到前一个月 + calendar.add(Calendar.MONTH, i); // 寰楀埌鍓嶄竴涓湀 return calendar.getTime(); } @@ -1251,57 +1251,57 @@ public class PdsTotalScoreController { Map averageStatisticsMap = new HashMap(); if (averageStatistics != null) { if (averageStatistics.getSoufangEsfPrice() != null) { - averageStatisticsMap.put("房天下", averageStatistics.getSoufangEsfPrice()); + averageStatisticsMap.put("鎴垮ぉ涓�", averageStatistics.getSoufangEsfPrice()); } else { if(beforeAvgSta!=null){ - averageStatisticsMap.put("房天下", beforeAvgSta.getSoufangEsfPrice()); + averageStatisticsMap.put("鎴垮ぉ涓�", beforeAvgSta.getSoufangEsfPrice()); } } if (averageStatistics.getAnjukeEsfPrice()!= null) { - averageStatisticsMap.put("安居客", averageStatistics.getAnjukeEsfPrice()); + averageStatisticsMap.put("瀹夊眳瀹�", averageStatistics.getAnjukeEsfPrice()); } else { if(beforeAvgSta!=null){ - averageStatisticsMap.put("安居客", beforeAvgSta.getAnjukeEsfPrice()); + averageStatisticsMap.put("瀹夊眳瀹�", beforeAvgSta.getAnjukeEsfPrice()); } } if(averageStatistics.getZhongyuanEsfPrice()!=null){ - averageStatisticsMap.put("中原",averageStatistics.getZhongyuanEsfPrice()); + averageStatisticsMap.put("涓師",averageStatistics.getZhongyuanEsfPrice()); }else{ if(beforeAvgSta!=null){ - averageStatisticsMap.put("中原",beforeAvgSta.getZhongyuanEsfPrice()); + averageStatisticsMap.put("涓師",beforeAvgSta.getZhongyuanEsfPrice()); } } if(averageStatistics.getGanjiEsfPrice()!=null){ - averageStatisticsMap.put("赶集", averageStatistics.getGanjiEsfPrice()); + averageStatisticsMap.put("璧堕泦", averageStatistics.getGanjiEsfPrice()); }else{ if(beforeAvgSta!=null){ - averageStatisticsMap.put("赶集",beforeAvgSta.getGanjiEsfPrice()); + averageStatisticsMap.put("璧堕泦",beforeAvgSta.getGanjiEsfPrice()); } } if(averageStatistics.getLianjiaEsfPrice()!=null){ - averageStatisticsMap.put("链家", averageStatistics.getLianjiaEsfPrice()); + averageStatisticsMap.put("閾惧", averageStatistics.getLianjiaEsfPrice()); }else{ if(beforeAvgSta!=null){ - averageStatisticsMap.put("链家", beforeAvgSta.getLianjiaEsfPrice()); + averageStatisticsMap.put("閾惧", beforeAvgSta.getLianjiaEsfPrice()); } } }else{ if(beforeAvgSta!=null){ - averageStatisticsMap.put("房天下", beforeAvgSta.getSoufangEsfPrice()); - averageStatisticsMap.put("安居客", beforeAvgSta.getAnjukeEsfPrice()); - averageStatisticsMap.put("中原",beforeAvgSta.getZhongyuanEsfPrice()); - averageStatisticsMap.put("赶集",beforeAvgSta.getGanjiEsfPrice()); - averageStatisticsMap.put("链家", beforeAvgSta.getLianjiaEsfPrice()); + averageStatisticsMap.put("鎴垮ぉ涓�", beforeAvgSta.getSoufangEsfPrice()); + averageStatisticsMap.put("瀹夊眳瀹�", beforeAvgSta.getAnjukeEsfPrice()); + averageStatisticsMap.put("涓師",beforeAvgSta.getZhongyuanEsfPrice()); + averageStatisticsMap.put("璧堕泦",beforeAvgSta.getGanjiEsfPrice()); + averageStatisticsMap.put("閾惧", beforeAvgSta.getLianjiaEsfPrice()); } } return averageStatisticsMap; } - //拥有户数数量、城市最高户数、户数城市排名 + //鎷ユ湁鎴锋暟鏁伴噺銆佸煄甯傛渶楂樻埛鏁般�佹埛鏁板煄甯傛帓鍚� private void buildHouseHoldInfoNew(DistrictAnalyData districtAnalyData, EvaluationBeforeLoanDto dto){ if(districtAnalyData == null || districtAnalyData.getHouseholdsRank() == null || districtAnalyData.getHouseholdsTotal() == null){ - dto.setHouseHoldRate(0d);//户数城市排名 + dto.setHouseHoldRate(0d);//鎴锋暟鍩庡競鎺掑悕 }else{ dto.setHouseHoldRate(MathUtils.getLevelRate(districtAnalyData.getHouseholdsRank(), districtAnalyData.getHouseholdsTotal()) * 100); } @@ -1345,7 +1345,7 @@ public class PdsTotalScoreController { private void addToDistrictAroundMap(Map> districtAroundMap, Map> stationMap, EvaluationBeforeLoanDto dto, String type) { List busList = stationMap.get(type); - Set stationCache = Sets.newHashSet();//记录是否有重复站点 + Set stationCache = Sets.newHashSet();//璁板綍鏄惁鏈夐噸澶嶇珯鐐� List aroundDtos = Lists.newArrayList(); double lat = dto.getLat() / 10000000000d; double lng = dto.getLng() / 10000000000d; @@ -1375,7 +1375,7 @@ public class PdsTotalScoreController { } /** - * 小区500米之内的均价对比 + * 灏忓尯500绫充箣鍐呯殑鍧囦环瀵规瘮 * @param dto * @param district */ @@ -1411,7 +1411,7 @@ public class PdsTotalScoreController { } /** - * 房源挂牌量以及价格走势 + * 鎴挎簮鎸傜墝閲忎互鍙婁环鏍艰蛋鍔� * @param dto * @param model */ @@ -1442,7 +1442,7 @@ public class PdsTotalScoreController { } /** - * 封装价格走势信息 + * 灏佽浠锋牸璧板娍淇℃伅 * @author yinjihuan * @param dto * @param model @@ -1450,84 +1450,84 @@ public class PdsTotalScoreController { private void buildPriceZouShi(EvaluationBeforeLoanDto dto, CollateralEvaluationInfoModel model, DistrictAnalyData districtAnalyData) { Date end = new Date(); - //2年前 + //2骞村墠 Date start = DateUtil.getDateOfLastMonth(end, -24); - //小区走势 + //灏忓尯璧板娍 this.buildDistrictAvgZouShi(dto, model, end, start); - //区域走势 + //鍖哄煙璧板娍 this.buildRegionAvgZouShi(dto, model, end, start); - //城市走势 + //鍩庡競璧板娍 this.buildCityAvgZouShi(dto, model, end, start); - //获得最近一期的小区均价 + //鑾峰緱鏈�杩戜竴鏈熺殑灏忓尯鍧囦环 this.buildWeekAvgPrice(dto, model); - //小区年涨幅 + //灏忓尯骞存定骞� this.buildOneYearUpDownRange(dto, model); - //上个月参考均价 + //涓婁釜鏈堝弬鑰冨潎浠� this.buildTopMonthAvgPrice(dto, model); - //涨跌幅在城市排名 + //娑ㄨ穼骞呭湪鍩庡競鎺掑悕 this.buildUpDownRangecityLevel(dto, model, districtAnalyData); - //均价在城市中排名比(也就是价格指数) + //鍧囦环鍦ㄥ煄甯備腑鎺掑悕姣�(涔熷氨鏄环鏍兼寚鏁�) this.buildPriceRate(dto, model, districtAnalyData); } /** - * 处置难易度 + * 澶勭疆闅炬槗搴� * @param dto */ private void buildHandleLevel(EvaluationBeforeLoanDto dto, CollateralEvaluationInfoModel model, DistrictAnalyData districtAnalyData, District district) { - //获取pds相关系数 + //鑾峰彇pds鐩稿叧绯绘暟 PdsRatio pdsRatio = getPdsRatio(model); - // 获取城市近12个月的年涨幅 + // 鑾峰彇鍩庡競杩�12涓湀鐨勫勾娑ㄥ箙 Integer cityAvgPrice = cityRiseAndDownNew(model.getCity()); dto.setCityAvgPrice(cityAvgPrice); - //总价相关得分 + //鎬讳环鐩稿叧寰楀垎 Double totalPriceScore = getTotalPriceScoreInfoNew(cityAvgPrice, dto, pdsRatio); - //中介数得分、知名中介数量、其他中介数量 、中介城市排名 + //涓粙鏁板緱鍒嗐�佺煡鍚嶄腑浠嬫暟閲忋�佸叾浠栦腑浠嬫暟閲� 銆佷腑浠嬪煄甯傛帓鍚� AgencyMountLevel agencyMountLevel = agencyMountLevelService.findAgencyMountLevelParam(model.getCity(), model.getDistrict(), model.getName()); Double agencyScore= getAgencyInfoNew(agencyMountLevel, model, dto, pdsRatio); dto.setAgencyScore(agencyScore); - //近6个月挂牌量、近1个月挂牌量、近六个月最高挂牌量、6个月挂牌量在城市排名、挂牌量得分 + //杩�6涓湀鎸傜墝閲忋�佽繎1涓湀鎸傜墝閲忋�佽繎鍏釜鏈堟渶楂樻寕鐗岄噺銆�6涓湀鎸傜墝閲忓湪鍩庡競鎺掑悕銆佹寕鐗岄噺寰楀垎 DistrictKey key = new DistrictKey(model.getCity(), model.getDistrict(), model.getName()); Double quoteScore = getQuoteInfo(districtAnalyData, dto, key, pdsRatio); dto.setQuoteScore(quoteScore); - //交通得分、交通情况城市排名、公交数量、地铁数量 + //浜ら�氬緱鍒嗐�佷氦閫氭儏鍐靛煄甯傛帓鍚嶃�佸叕浜ゆ暟閲忋�佸湴閾佹暟閲� Double trafficScore = getTrafficInfoNew(dto, key, pdsRatio); dto.setTrafficScore(trafficScore); - //小区密度得分 + //灏忓尯瀵嗗害寰楀垎 Double distirctDensityScore = getDistrictDensityNew(district, pdsRatio, districtAnalyData, dto); Double handleDegreeScore = getHandleDegreeScore(pdsRatio, agencyScore, quoteScore, trafficScore, distirctDensityScore, totalPriceScore); dto.setHandleLevel(handleDegreeScore); - //获取区域近12个月的涨幅 + //鑾峰彇鍖哄煙杩�12涓湀鐨勬定骞� Double regionYoy = regionRiseAndDownNew(dto, model); - //小区年涨跌幅(没有年涨幅用半年、季度) + //灏忓尯骞存定璺屽箙(娌℃湁骞存定骞呯敤鍗婂勾銆佸搴�) Double yoyRiseDown = getAbsYoy(districtAnalyData, dto.getAvgPrice(), dto.getCitySellStats(), dto.getRegionSellStats()); - //与区域年涨跌幅差比 + //涓庡尯鍩熷勾娑ㄨ穼骞呭樊姣� Double yoyRegionAbs = yoyRegionRiseAndDownAbs(districtAnalyData, yoyRiseDown, regionYoy); - // 一年以上抵押品价格异常指数 + // 涓�骞翠互涓婃姷鎶煎搧浠锋牸寮傚父鎸囨暟 Double priceStability = getPriceStabilityValue(yoyRiseDown, yoyRegionAbs, pdsRatio, regionYoy); dto.setPriceStability(priceStability); - // 押品综合评分 + // 鎶煎搧缁煎悎璇勫垎 Double collateralTotalScore = getCollateralTotalScore(handleDegreeScore,priceStability,pdsRatio); dto.setTotalScore(collateralTotalScore); } - //区域近12个月的涨幅,年涨幅 + //鍖哄煙杩�12涓湀鐨勬定骞�,骞存定骞� private Double regionRiseAndDownNew(EvaluationBeforeLoanDto dto, CollateralEvaluationInfoModel model){ Double regionYoy = null; List regionStatTrends = regionStatTrendService.getAllWithMonths(model.getCity(), model.getDistrict(), 12); @@ -1541,7 +1541,7 @@ public class PdsTotalScoreController { return regionYoy; } - //总价得分 + //鎬讳环寰楀垎 private Double getTotalPriceScoreInfoNew(Integer cityAvgPrice, EvaluationBeforeLoanDto dto, PdsRatio cityRatio){ int totalPrice = dto.getTotalPrice().intValue(); Double totalPriceScore = 0d; @@ -1575,7 +1575,7 @@ public class PdsTotalScoreController { return totalPriceScore; } - // 城市近12个月的涨幅 + // 鍩庡競杩�12涓湀鐨勬定骞� private Integer cityRiseAndDownNew(String city){ Integer cityAvgPrice = 0; List citySellStats = citySellStatService.getAllWithMonths(city, 12); @@ -1589,7 +1589,7 @@ public class PdsTotalScoreController { return cityAvgPrice; } - //交通得分、交通情况城市排名、公交数量、地铁数量 + //浜ら�氬緱鍒嗐�佷氦閫氭儏鍐靛煄甯傛帓鍚嶃�佸叕浜ゆ暟閲忋�佸湴閾佹暟閲� private Double getTrafficInfoNew(EvaluationBeforeLoanDto dto, DistrictKey key, PdsRatio pdsRatio){ Double metroScale = PDSConstant.METRO_SCALE; Double metroMax = PDSConstant.METRO_MAX; @@ -1599,12 +1599,12 @@ public class PdsTotalScoreController { Double busMin = PDSConstant.BUS_MIN; TrafficLevel trafficLevel = trafficLevelService.findTrafficLevelByParam(key.getCity(), key.getRegion(), key.getName()); - Integer metroCount = 0;//地铁数量 + Integer metroCount = 0;//鍦伴搧鏁伴噺 if(trafficLevel!=null&&trafficLevel.getMetroCount()!=null){ metroCount = trafficLevel.getMetroCount(); } dto.setMetroCount(metroCount); - Integer busCount = 0;//公交数量 + Integer busCount = 0;//鍏氦鏁伴噺 Integer trafficCount = 0; Integer maxTrafficCount = 0; if(trafficLevel!=null&&trafficLevel.getBusCount()!=null){ @@ -1620,14 +1620,14 @@ public class PdsTotalScoreController { //dto.setMaxTrafficCount(maxTrafficCount); //dto.setTrafficCount(trafficCount); dto.setBusCount(busCount); - Double trafficLevelRate = 0d;//交通情况城市排名 + Double trafficLevelRate = 0d;//浜ら�氭儏鍐靛煄甯傛帓鍚� if(trafficLevel!=null&&trafficLevel.getTrafficLevel()!=null&&trafficLevel.getTrafficLevelTotal()!=null){ trafficLevelRate = MathUtils.getLevelRate(trafficLevel.getTrafficLevel(), trafficLevel.getTrafficLevelTotal()); } dto.setTrafficLevelRate(trafficLevelRate * 100); - Double trafficScore = 0d;//交通得分 - Double metroScore = 0d; //地铁得分 - Double busScore = 0d; //公交得分 + Double trafficScore = 0d;//浜ら�氬緱鍒� + Double metroScore = 0d; //鍦伴搧寰楀垎 + Double busScore = 0d; //鍏氦寰楀垎 if(pdsRatio!=null&&pdsRatio.getMetroScale()!=null){ metroScale = pdsRatio.getMetroScale(); } @@ -1666,7 +1666,7 @@ public class PdsTotalScoreController { } - //小区密度 + //灏忓尯瀵嗗害 private Double getDistrictDensityNew(District district,PdsRatio pdsRatio,DistrictAnalyData districtAnalyData, EvaluationBeforeLoanDto dto) { Double densityMax = PDSConstant.DENSITY_MAX; Double densityMin = PDSConstant.DENSITY_MIN; @@ -1740,7 +1740,7 @@ public class PdsTotalScoreController { } - //近6个月挂牌量、近1个月挂牌量、近六个月最高挂牌量、6个月挂牌量在城市排名 + //杩�6涓湀鎸傜墝閲忋�佽繎1涓湀鎸傜墝閲忋�佽繎鍏釜鏈堟渶楂樻寕鐗岄噺銆�6涓湀鎸傜墝閲忓湪鍩庡競鎺掑悕 private Double getQuoteInfo(DistrictAnalyData districtAnalyData,EvaluationBeforeLoanDto dto, DistrictKey key, PdsRatio cityRatio){ Double quoteMax = PDSConstant.QUOTE_MAX; Double quoteMin = PDSConstant.QUOTE_MIN; @@ -1749,12 +1749,12 @@ public class PdsTotalScoreController { if(districtAnalyData!=null&&districtAnalyData.getSellCountRank()!=null&&districtAnalyData.getSellRankTotal()!=null){ sixQuoteLevelRate = MathUtils.getLevelRate(districtAnalyData.getSellCountRank(),districtAnalyData.getSellRankTotal()); } - dto.setSixQuoteLevelRate(sixQuoteLevelRate * 100);//六个月挂牌量排名 + dto.setSixQuoteLevelRate(sixQuoteLevelRate * 100);//鍏釜鏈堟寕鐗岄噺鎺掑悕 int quoteHouseSix = 0; if(districtAnalyData!=null&&districtAnalyData.getSellCount()!=null&&districtAnalyData.getSellCount()>=0){ quoteHouseSix = districtAnalyData.getSellCount(); } - dto.setQuoteHouseSix(quoteHouseSix);// 近六个月的挂牌量 + dto.setQuoteHouseSix(quoteHouseSix);// 杩戝叚涓湀鐨勬寕鐗岄噺 Integer cityMaxQuote = districtAnalyDataService.findMaxSellCountByCity(key.getCity()); if(cityMaxQuote==null){ //dto.setSixMaxQuoteMount(0); @@ -1766,9 +1766,9 @@ public class PdsTotalScoreController { if(districtAnalyData!=null&&districtAnalyData.getMonthSellCount()!=null){ quertHouseOne = districtAnalyData.getMonthSellCount(); } - dto.setQuoteHouseOne(quertHouseOne);// 近一个月的挂牌量 + dto.setQuoteHouseOne(quertHouseOne);// 杩戜竴涓湀鐨勬寕鐗岄噺 - Double quoteScore = 0d;//挂牌量得分 + Double quoteScore = 0d;//鎸傜墝閲忓緱鍒� if(quoteHouseSix>=quoteMax){ quoteScore = 100d; }else if(quoteHouseSix<=quoteMin){ @@ -1780,30 +1780,30 @@ public class PdsTotalScoreController { return quoteScore; } - //中介数得分、知名中介数量、其他中介数量 、中介城市排名 + //涓粙鏁板緱鍒嗐�佺煡鍚嶄腑浠嬫暟閲忋�佸叾浠栦腑浠嬫暟閲� 銆佷腑浠嬪煄甯傛帓鍚� private Double getAgencyInfoNew(AgencyMountLevel agencyMountLevel,CollateralEvaluationInfoModel model,EvaluationBeforeLoanDto dto,PdsRatio cityRatio){ int famousAgency = 0; if(agencyMountLevel !=null && agencyMountLevel.getFamousAgency() >= 0){ famousAgency = agencyMountLevel.getFamousAgency(); } - //dto.setFamousAgency(famousAgency);// 知名中介 + //dto.setFamousAgency(famousAgency);// 鐭ュ悕涓粙 int otherAgency = 0; if(agencyMountLevel!=null&&agencyMountLevel.getOtherAgency()>=0){ otherAgency = agencyMountLevel.getOtherAgency(); } - //dto.setOtherAgency(otherAgency);// 其他中介 - int allAgency = famousAgency+otherAgency;//中介总数 + //dto.setOtherAgency(otherAgency);// 鍏朵粬涓粙 + int allAgency = famousAgency+otherAgency;//涓粙鎬绘暟 if(agencyMountLevel==null||agencyMountLevel.getMomCityLevel()<0||agencyMountLevel.getCitySize()<0){ - //dto.setAgencyLevelRate(0d);//中介城市排名 + //dto.setAgencyLevelRate(0d);//涓粙鍩庡競鎺掑悕 }else{ //dto.setAgencyLevelRate(MathUtils.getLevelRate(agencyMountLevel.getMomCityLevel(), agencyMountLevel.getCitySize())); } - Double agencyScore = agencyScoreLog(allAgency, cityRatio);//中介得分 + Double agencyScore = agencyScoreLog(allAgency, cityRatio);//涓粙寰楀垎 return agencyScore; } /** - * 均价在城市中排名比(也就是价格指数) + * 鍧囦环鍦ㄥ煄甯備腑鎺掑悕姣�(涔熷氨鏄环鏍兼寚鏁�) * @param dto * @param model */ @@ -1819,7 +1819,7 @@ public class PdsTotalScoreController { } /** - * 参考房源,优先用下面5个网站的,每个一条,如果凑不齐则用其余的网站替补,如果这5个网站都没有再用其他的网站补充 + * 鍙傝�冩埧婧�,浼樺厛鐢ㄤ笅闈�5涓綉绔欑殑锛屾瘡涓竴鏉★紝濡傛灉鍑戜笉榻愬垯鐢ㄥ叾浣欑殑缃戠珯鏇胯ˉ锛屽鏋滆繖5涓綉绔欓兘娌℃湁鍐嶇敤鍏朵粬鐨勭綉绔欒ˉ鍏� * @param dto * @param model */ @@ -1843,15 +1843,15 @@ public class PdsTotalScoreController { String siteName = null; if (first) { if (u.equals("fang.com")) { - siteName = "房天下"; + siteName = "鎴垮ぉ涓�"; } else if (u.equals("homelink.com.cn")) { - siteName = "链家网"; + siteName = "閾惧缃�"; } else if (u.equals("centanet.com")) { - siteName = "中原地产"; + siteName = "涓師鍦颁骇"; } else if (u.equals("5i5j.com")) { - siteName = "我爱我家"; + siteName = "鎴戠埍鎴戝"; } else if (u.equals("anjuke.com")) { - siteName = "安居客"; + siteName = "瀹夊眳瀹�"; } } else { siteName = SitenameUtil.get(u); @@ -1895,7 +1895,7 @@ public class PdsTotalScoreController { } /** - * 房型和面积占比 + * 鎴垮瀷鍜岄潰绉崰姣� * @author yinjihuan * @param dto * @param model @@ -1908,7 +1908,7 @@ public class PdsTotalScoreController { } /** - * 小区走势 + * 灏忓尯璧板娍 * @author yinjihuan * @param dto * @param model @@ -1925,7 +1925,7 @@ public class PdsTotalScoreController { } /** - * 区域走势 + * 鍖哄煙璧板娍 * @author yinjihuan * @param dto * @param model @@ -1942,7 +1942,7 @@ public class PdsTotalScoreController { } /** - * 城市走势 + * 鍩庡競璧板娍 * @author yinjihuan * @param dto * @param model @@ -1960,7 +1960,7 @@ public class PdsTotalScoreController { } /** - * 获得最近一期的小区均价 + * 鑾峰緱鏈�杩戜竴鏈熺殑灏忓尯鍧囦环 * @author yinjihuan * @param dto * @param model @@ -1977,7 +1977,7 @@ public class PdsTotalScoreController { } /** - * 小区年涨幅 + * 灏忓尯骞存定骞� * @author yinjihuan * @param dto * @param model @@ -1993,7 +1993,7 @@ public class PdsTotalScoreController { } /** - * 上个月参考均价 + * 涓婁釜鏈堝弬鑰冨潎浠� * @author yinjihuan * @param dto * @param model @@ -2008,7 +2008,7 @@ public class PdsTotalScoreController { } /** - * 涨跌幅在城市排名 + * 娑ㄨ穼骞呭湪鍩庡競鎺掑悕 * @author yinjihuan * @param dto * @param model @@ -2028,15 +2028,15 @@ public class PdsTotalScoreController { } /** - * 封装价格 + * 灏佽浠锋牸 * @author yinjihuan * @param dto * @param model */ private void buildPrice(EvaluationBeforeLoanDto dto, CollateralEvaluationInfoModel model) { - //创建evaluation对象 + //鍒涘缓evaluation瀵硅薄 Evaluation evaluation = creEvaluationModel(model); - // 获取房屋总价 + // 鑾峰彇鎴垮眿鎬讳环 if (StringUtils.isNotBlank(model.getName())) { EvaluationBo evaluationBo = evaluationService.doApply(evaluation, false, true, true); if (evaluationBo != null && evaluationBo.getFinalValue() > 0) { @@ -2047,19 +2047,19 @@ public class PdsTotalScoreController { } /** - * 封装房屋类型(查询房号库) + * 灏佽鎴垮眿绫诲瀷锛堟煡璇㈡埧鍙峰簱锛� * @author yinjihuan * @param dto * @param model */ private void buildRoomType(EvaluationBeforeLoanDto dto, CollateralEvaluationInfoModel model, int room) { if (room > 0) { - dto.setRoomType(room + "房"); + dto.setRoomType(room + "鎴�"); } } /** - * 封装小区信息 + * 灏佽灏忓尯淇℃伅 * @author yinjihuan * @param dto * @param district @@ -2081,7 +2081,7 @@ public class PdsTotalScoreController { if (StringUtils.isNotBlank(district.getVirescencePercent())) { dto.setVirescencePercent(district.getVirescencePercent()); } - //拥有户数户量 + //鎷ユ湁鎴锋暟鎴烽噺 if(districtAnalyData == null || districtAnalyData.getHouseholds() == null){ dto.setHouseholdCount(0); } else { @@ -2111,7 +2111,7 @@ public class PdsTotalScoreController { } /** - * 获取城市的相对最低和最高价 + * 鑾峰彇鍩庡競鐨勭浉瀵规渶浣庡拰鏈�楂樹环 * @param model * @return */ @@ -2119,7 +2119,7 @@ public class PdsTotalScoreController { RestfulModelAndView mav = new RestfulModelAndView(); EvaluationBeforeLoanDto dto = new EvaluationBeforeLoanDto(); if (StringUtils.isBlank(model.getCity())) { - mav.setModel(BasicModel.buildBadRequestModel("城市不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍩庡競涓嶈兘涓虹┖")); return mav; } Map cityDistriceMinAndMaxPrice = districtStatService.getCityDistriceMinAndMaxPricePds(model.getCity()); @@ -2133,7 +2133,7 @@ public class PdsTotalScoreController { /** - * PDS - 批量评估 + * PDS - 鎵归噺璇勪及 * @param model * @param request * @return @@ -2144,21 +2144,21 @@ public class PdsTotalScoreController { String region = model.getDistrict(); String name = model.getName(); if (StringUtils.isBlank(city)) { - mav.setModel(BasicModel.buildBadRequestModel("城市不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍩庡競涓嶈兘涓虹┖")); return mav; } if (StringUtils.isBlank(region)) { - mav.setModel(BasicModel.buildBadRequestModel("区域不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍖哄煙涓嶈兘涓虹┖")); return mav; } if (StringUtils.isBlank(name)) { - mav.setModel(BasicModel.buildBadRequestModel("名称不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍚嶇О涓嶈兘涓虹┖")); return mav; } District district = districtService.findDistrict(new DistrictKey(city, region, name), "district"); if (district == null) { - mav.setModel(BasicModel.buildBadRequestModel("小区不存在")); + mav.setModel(BasicModel.buildBadRequestModel("灏忓尯涓嶅瓨鍦�")); return mav; } @@ -2185,7 +2185,7 @@ public class PdsTotalScoreController { dto.setLng(district.getLng2() / 10000000000d); } - //估价 + //浼颁环 Evaluation evaluation = creEvaluationModel(model); if (StringUtils.isNotBlank(model.getName())) { EvaluationBo evaluationBo = evaluationService.doApply(evaluation, false, true, true); @@ -2195,7 +2195,7 @@ public class PdsTotalScoreController { } } - //年涨幅 + //骞存定骞� List districtsSellStats = districtSellStatService.getAllWithMonths(model.getCity(), model.getDistrict(), model.getName(), 12); if (districtsSellStats != null && districtsSellStats.size() > 0) { DistrictSellStat districtSellStat = districtsSellStats.get(0); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PdsTotalScoreEverController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PdsTotalScoreEverController.java index 6ae638821..c2f59dc54 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PdsTotalScoreEverController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PdsTotalScoreEverController.java @@ -54,7 +54,7 @@ public class PdsTotalScoreEverController { model.setName(result.getString("name")); model.setDistrict(result.getString("district")); } else { - mav.setModel(BasicModel.buildBadRequestModel("地址不存在")); + mav.setModel(BasicModel.buildBadRequestModel("鍦板潃涓嶅瓨鍦�")); return mav; } @@ -64,13 +64,13 @@ public class PdsTotalScoreEverController { dto.setName(model.getName()); DistrictKey key = new DistrictKey(dto.getCity(), dto.getDistrict(), dto.getName()); - // 获小区近12个月的涨跌幅以及年涨跌幅 + // 鑾峰皬鍖鸿繎12涓湀鐨勬定璺屽箙浠ュ強骞存定璺屽箙 List districtsSellStats = districtSellStatService.getAllWithMonths(dto.getCity(), dto.getDistrict(), dto.getName(), 12); DistrictAnalyData districtAnalyData = districtAnalyDataService.findByDistrictKey(key); - // 抵押品年涨跌幅得分 + // 鎶垫娂鍝佸勾娑ㄨ穼骞呭緱鍒� Double yoy = 0.0; if (districtsSellStats != null && districtsSellStats.size() > 0) { yoy = districtsSellStats.get(0).getYoy(); @@ -81,7 +81,7 @@ public class PdsTotalScoreEverController { } dto.setIncreaseScore(increaseScore); - //价格异常指数相关数据 + //浠锋牸寮傚父鎸囨暟鐩稿叧鏁版嵁 Double cityPriceStability = 0d; if(districtAnalyData!=null&&districtAnalyData.getYoyCityTotal()!=null&&districtAnalyData.getYoyCityRank()!=null){ cityPriceStability = MathUtils.getPriceStability(districtAnalyData.getYoyCityTotal(), districtAnalyData.getYoyCityRank()); @@ -90,12 +90,12 @@ public class PdsTotalScoreEverController { if(districtAnalyData!=null&&districtAnalyData.getYoyRegionTotal()!=null&&districtAnalyData.getYoyRegionRank()!=null){ regionPriceStability = MathUtils.getPriceStability(districtAnalyData.getYoyRegionTotal(), districtAnalyData.getYoyRegionRank()); } - // 抵押品价格异常指数 + // 鎶垫娂鍝佷环鏍煎紓甯告寚鏁� Double priceStability = MathUtils.getStability(cityPriceStability, regionPriceStability); dto.setPriceStability(priceStability); - // 抵押品价格指数 + // 鎶垫娂鍝佷环鏍兼寚鏁� Integer cityRank = 0; Integer cityRankTotal = 0; if (districtAnalyData != null) { @@ -104,16 +104,16 @@ public class PdsTotalScoreEverController { } Double priceScore = MathUtils.getPriceScore(cityRank, cityRankTotal); dto.setPriceRate(priceScore); - // 挂牌房源量得分 - // 小区同类型挂牌房源量排名 - Integer sizeType = houseSizeType(model.getSize());//面积类型 + // 鎸傜墝鎴挎簮閲忓緱鍒� + // 灏忓尯鍚岀被鍨嬫寕鐗屾埧婧愰噺鎺掑悕 + Integer sizeType = houseSizeType(model.getSize());//闈㈢Н绫诲瀷 HouseQuoteLevel houseQuoteLevel = houseQuoteLevelService.findHouseQuoteLevelByParam(dto.getCity(), dto.getDistrict(), dto.getName(),sizeType); Double houseQuoteScore = 0d; if(houseQuoteLevel!=null&&houseQuoteLevel.getCitySize()>=0&&houseQuoteLevel.getMomCityLevel()>=0){ houseQuoteScore = MathUtils.getHouseQuoteScore(houseQuoteLevel.getCitySize(), houseQuoteLevel.getMomCityLevel()); } - //小区成交量得分 + //灏忓尯鎴愪氦閲忓緱鍒� Double houseSellScore = 0d; if(districtAnalyData!=null&&districtAnalyData.getDealRankTotal()!=null&&districtAnalyData.getDealCountRank()!=null){ houseSellScore = MathUtils.getLevelScore(districtAnalyData.getDealRankTotal(),districtAnalyData.getDealCountRank()); @@ -121,7 +121,7 @@ public class PdsTotalScoreEverController { if (districtAnalyData==null||districtAnalyData.getDealCount()==null||districtAnalyData.getDealCount() == 0) { houseSellScore = -1.0; } - //带看数得分 + //甯︾湅鏁板緱鍒� Double seeTimeScore =-1d; if(districtAnalyData!=null&&districtAnalyData.getSeeRankTotal()!=null&&districtAnalyData.getSeeCountRank()!=null){ seeTimeScore = MathUtils.getLevelScore(districtAnalyData.getSeeRankTotal(), districtAnalyData.getSeeCountRank()); @@ -131,13 +131,13 @@ public class PdsTotalScoreEverController { seeTimeScore = -1d; } } - // 中介数得分 + // 涓粙鏁板緱鍒� AgencyMountLevel agencyMountLevel = agencyMountLevelService.findAgencyMountLevelParam(dto.getCity(), dto.getDistrict(),dto.getName()); Double agencyScore = 0d; if(agencyMountLevel!=null){ agencyScore = MathUtils.getLevelScore(agencyMountLevel.getCitySize(), agencyMountLevel.getMomCityLevel()); } - //户数得分 + //鎴锋暟寰楀垎 Double houseHoldScore = -1d; if(districtAnalyData!=null&&districtAnalyData.getHouseholdsTotal()!=null&&districtAnalyData.getHouseholdsRank()!=null){ if (districtAnalyData.getHouseholds()==null||districtAnalyData.getHouseholds() <= 0) { @@ -146,12 +146,12 @@ public class PdsTotalScoreEverController { houseHoldScore = MathUtils.getLevelScore(districtAnalyData.getHouseholdsTotal(),districtAnalyData.getHouseholdsRank()); } } - // 处置难易度得分 + // 澶勭疆闅炬槗搴﹀緱鍒� Double handleDegreeScore = MathUtils.getHandleDegreeScore(houseQuoteScore, houseSellScore, seeTimeScore, agencyScore, houseHoldScore); dto.setHandleDegreeScore(handleDegreeScore); - // 押品综合评分 + // 鎶煎搧缁煎悎璇勫垎 Double collateralTotalScore = MathUtils.getCollateralTotalScore(priceStability, handleDegreeScore, priceScore, increaseScore); dto.setCollateralTotalScore(collateralTotalScore); @@ -186,7 +186,7 @@ public class PdsTotalScoreEverController { public Date getMonthAgo(int i) { Calendar calendar = Calendar.getInstance(); - calendar.add(Calendar.MONTH, i); // 得到前一个月 + calendar.add(Calendar.MONTH, i); // 寰楀埌鍓嶄竴涓湀 return calendar.getTime(); } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PoiController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PoiController.java index c169205f1..e750fcc50 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PoiController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PoiController.java @@ -50,7 +50,7 @@ public class PoiController { dto.append("id", poi.getId()); dto.append("city", poi.getCityname()); dto.append("district", poi.getAdname()); - dto.append("name", poi.getName().replaceAll("(\\(|().*(\\)|))", "")); + dto.append("name", poi.getName().replaceAll("(\\(|锛�).*(\\)|锛�)", "")); dto.append("address", poi.getAddress()); dto.append("lat", poi.getLat()); dto.append("lng", poi.getLng()); @@ -91,7 +91,7 @@ public class PoiController { } } if (city == null) { - mav.setModel(BasicModel.buildBadRequestModel("city非法")); + mav.setModel(BasicModel.buildBadRequestModel("city闈炴硶")); return mav; } Address address = addressParserService.standardizeForSearch(poiSuggestModel.getCity(), poiSuggestModel.getKeywords()); @@ -219,7 +219,7 @@ public class PoiController { } /** - * POI搜索服务 + * POI鎼滅储鏈嶅姟 * * @param model * @return @@ -228,7 +228,7 @@ public class PoiController { RestfulModelAndView mav = new RestfulModelAndView(); if (StringUtils.isBlank(model.getLocation()) || StringUtils.isBlank(model.getCity())) { - mav.setModel(BasicModel.buildBadRequestModel("城市和经纬度为必填项")); + mav.setModel(BasicModel.buildBadRequestModel("鍩庡競鍜岀粡绾害涓哄繀濉」")); return mav; } @@ -269,7 +269,7 @@ public class PoiController { } mav.setModel(basicModel); } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("鏈嶅姟鍗囩骇涓�...")); } return mav; } @@ -279,27 +279,27 @@ public class PoiController { String city = administrativeMappingService.findCityByCityShort(model.getCity()); String lngStr = model.getLng(); String latStr = model.getLat(); - String numberPattern = "-?\\d+(\\.\\d+)?"; // 匹配整数或浮点数 + String numberPattern = "-?\\d+(\\.\\d+)?"; // 鍖归厤鏁存暟鎴栨诞鐐规暟 if (!lngStr.matches(numberPattern) || !latStr.matches(numberPattern)) { - mav.setModel(BasicModel.buildBadRequestModel("location(经纬度)格式错误")); + mav.setModel(BasicModel.buildBadRequestModel("location(缁忕含搴�)鏍煎紡閿欒")); return mav; } double lng = Double.parseDouble(lngStr); double lat = Double.parseDouble(latStr); Map> result = new HashMap>(); - List bankSmallType = Arrays.asList("中国人民银行", "国家开发银行", "中国进出口银行", - "中国银行", "中国工商银行", "中国建设银行", "中国农业银行", "交通银行", "招商银行", "华夏银行", - "中信银行", "中国民生银行", "中国光大银行", "上海银行", "上海浦东发展银行", "平安银行", "兴业银行", - "北京银行", "广发银行", "农村商业银行", "香港恒生银行", "东亚银行", "花旗银行", "渣打银行", "汇丰银行", - "荷兰银行", "美国运通银行", "瑞士友邦银行", "美国银行", "蒙特利尔银行", "纽约银行", "苏格兰皇家银行", "法国兴业银行", - "德意志银行", "日本三菱东京日联银行", "巴克莱银行", "摩根大通银行", "中国邮政储蓄银行", "香港星展银行", "南洋商业银行", - "上海商业银行", "永亨银行", "香港永隆银行", "创兴银行", "大新银行", "中信银行(国际)", "大众银行(香港)", - "北京农商银行", "上海农商银行", "广州农商银行", "深圳农村商业银行"); - List busSmallType = Collections.singletonList("公交车站相关"); - List hospitalSmallType = Arrays.asList("综合医院", "三级甲等医院", "专科医院"); - List schoolSmallType = Arrays.asList("学校", "高等院校", "中学", "小学", "幼儿园"); - List subwaySmallType = Collections.singletonList("地铁站"); - List supermarketSmallType = Arrays.asList("商场", "购物中心", "普通商场"); + List bankSmallType = Arrays.asList("涓浗浜烘皯閾惰", "鍥藉寮�鍙戦摱琛�", "涓浗杩涘嚭鍙i摱琛�", + "涓浗閾惰", "涓浗宸ュ晢閾惰", "涓浗寤鸿閾惰", "涓浗鍐滀笟閾惰", "浜ら�氶摱琛�", "鎷涘晢閾惰", "鍗庡閾惰", + "涓俊閾惰", "涓浗姘戠敓閾惰", "涓浗鍏夊ぇ閾惰", "涓婃捣閾惰", "涓婃捣娴︿笢鍙戝睍閾惰", "骞冲畨閾惰", "鍏翠笟閾惰", + "鍖椾含閾惰", "骞垮彂閾惰", "鍐滄潙鍟嗕笟閾惰", "棣欐腐鎭掔敓閾惰", "涓滀簹閾惰", "鑺辨棗閾惰", "娓f墦閾惰", "姹囦赴閾惰", + "鑽峰叞閾惰", "缇庡浗杩愰�氶摱琛�", "鐟炲+鍙嬮偊閾惰", "缇庡浗閾惰", "钂欑壒鍒╁皵閾惰", "绾界害閾惰", "鑻忔牸鍏扮殗瀹堕摱琛�", "娉曞浗鍏翠笟閾惰", + "寰锋剰蹇楅摱琛�", "鏃ユ湰涓夎彵涓滀含鏃ヨ仈閾惰", "宸村厠鑾遍摱琛�", "鎽╂牴澶ч�氶摱琛�", "涓浗閭斂鍌ㄨ搫閾惰", "棣欐腐鏄熷睍閾惰", "鍗楁磱鍟嗕笟閾惰", + "涓婃捣鍟嗕笟閾惰", "姘镐酣閾惰", "棣欐腐姘搁殕閾惰", "鍒涘叴閾惰", "澶ф柊閾惰", "涓俊閾惰(鍥介檯)", "澶т紬閾惰(棣欐腐)", + "鍖椾含鍐滃晢閾惰", "涓婃捣鍐滃晢閾惰", "骞垮窞鍐滃晢閾惰", "娣卞湷鍐滄潙鍟嗕笟閾惰"); + List busSmallType = Collections.singletonList("鍏氦杞︾珯鐩稿叧"); + List hospitalSmallType = Arrays.asList("缁煎悎鍖婚櫌", "涓夌骇鐢茬瓑鍖婚櫌", "涓撶鍖婚櫌"); + List schoolSmallType = Arrays.asList("瀛︽牎", "楂樼瓑闄㈡牎", "涓", "灏忓", "骞煎効鍥�"); + List subwaySmallType = Collections.singletonList("鍦伴搧绔�"); + List supermarketSmallType = Arrays.asList("鍟嗗満", "璐墿涓績", "鏅�氬晢鍦�"); result.put("bank", findAroundByLocation(city, lng, lat, bankSmallType, 1000, true)); result.put("bus", findAroundByLocation(city, lng, lat, busSmallType, 1000, false)); @@ -372,7 +372,7 @@ public class PoiController { for (Map hit : hits) { Map source = (Map) hit.get("_source"); - if (source.containsKey("name") && !source.get("name").toString().contains("公司")) { + if (source.containsKey("name") && !source.get("name").toString().contains("鍏徃")) { poiNames.add(source.get("name").toString()); } } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PriceController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PriceController.java index 0451aa874..adfbc925c 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PriceController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PriceController.java @@ -19,7 +19,7 @@ import javax.validation.Valid; import java.util.Date; /** - * 价格数据 + * 浠锋牸鏁版嵁 * @author wenyan */ @Authority(role = Role.USER) @@ -67,7 +67,7 @@ public class PriceController{ } if(districtStatBo == null){ - mav.setModel(BasicModel.buildOKModel().setMsg("该小区暂无均价")); + mav.setModel(BasicModel.buildOKModel().setMsg("璇ュ皬鍖烘殏鏃犲潎浠�")); return mav; } DistrictStat districtStat = districtStatBo.getDefaultDistrictStat(); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java index 6dd826a9e..cf3a827b7 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java @@ -183,9 +183,9 @@ public class PropertyController { private static final int DEFAULT_HOUSE_COUNT = 5; private static final String[] PROPERTY_SEARCH_API_FIELDS = {"address", "city", "region", "name", "lat2", "lng2", "lat", "lng", "block", "estateType2", "addrAlias", "alias"}; - private static final List GAODE_LEVEL = Arrays.asList("兴趣点", "门牌号", "单元号", "楼层", "房间", "门址", "住宅区"); - static final int BAI_DU_GEO = 1;// 百度系坐标 - static final int GAO_DE_GEO = 2;// 高德系坐标 + private static final List GAODE_LEVEL = Arrays.asList("鍏磋叮鐐�", "闂ㄧ墝鍙�", "鍗曞厓鍙�", "妤煎眰", "鎴块棿", "闂ㄥ潃", "浣忓畢鍖�"); + static final int BAI_DU_GEO = 1;// 鐧惧害绯诲潗鏍� + static final int GAO_DE_GEO = 2;// 楂樺痉绯诲潗鏍� private AutoCompleteService autoCompleteService; @@ -199,172 +199,172 @@ public class PropertyController { private static final int EVALUATE_SHOW_DETAIL = 1; private static final Map PROPERTY_TYPES = new HashMap() { { - put(null, "普通住宅"); - put("0", "普通住宅"); - put("1", "别墅"); - put("2", "商住"); + put(null, "鏅�氫綇瀹�"); + put("0", "鏅�氫綇瀹�"); + put("1", "鍒"); + put("2", "鍟嗕綇"); } }; private static final Map DIRECTION = new HashMap() { { - put(null, "南"); - put("1", "西南"); - put("2", "东南"); - put("3", "南"); - put("4", "西北"); - put("5", "东北"); - put("6", "东"); - put("7", "西"); - put("8", "北"); - put("9", "东西"); - put("10", "南北"); + put(null, "鍗�"); + put("1", "瑗垮崡"); + put("2", "涓滃崡"); + put("3", "鍗�"); + put("4", "瑗垮寳"); + put("5", "涓滃寳"); + put("6", "涓�"); + put("7", "瑗�"); + put("8", "鍖�"); + put("9", "涓滆タ"); + put("10", "鍗楀寳"); } }; private static final Map FITMENT = new HashMap() { { - put(null, "简装"); - put("1", "毛坯"); - put("2", "简装"); - put("3", "精装"); - put("4", "豪装"); + put(null, "绠�瑁�"); + put("1", "姣涘澂"); + put("2", "绠�瑁�"); + put("3", "绮捐"); + put("4", "璞"); } }; private static final Map EVALUATION_MODEL_FITMENT = new HashMap() { { - put(null, "简单装修"); - put("简装", "简单装修"); - put("毛坯", "毛坯"); - put("精装", "精装修"); - put("豪装", "豪华装修"); + put(null, "绠�鍗曡淇�"); + put("绠�瑁�", "绠�鍗曡淇�"); + put("姣涘澂", "姣涘澂"); + put("绮捐", "绮捐淇�"); + put("璞", "璞崕瑁呬慨"); } }; private static final Map FITMENT_MAP = new HashMap() { { - put("1", "毛坯"); - put("2", "简装"); - put("3", "精装"); - put("4", "豪装"); + put("1", "姣涘澂"); + put("2", "绠�瑁�"); + put("3", "绮捐"); + put("4", "璞"); } }; private static final Map SIGHT = new HashMap() { { - put(null, "一般"); - put("1", "景观房"); - put("2", "侧景观房"); - put("3", "一般"); - put("4", "差"); + put(null, "涓�鑸�"); + put("1", "鏅鎴�"); + put("2", "渚ф櫙瑙傛埧"); + put("3", "涓�鑸�"); + put("4", "宸�"); } }; private static final Map NOISE = new HashMap() { { - put(null, "无噪音"); - put("0", "无噪音"); - put("1", "噪音较小"); - put("2", "噪音大"); + put(null, "鏃犲櫔闊�"); + put("0", "鏃犲櫔闊�"); + put("1", "鍣煶杈冨皬"); + put("2", "鍣煶澶�"); } }; private static final Map WORRY_FACTOR = new HashMap() { { - put("0", "变电站"); - put("1", "垃圾场"); - put("2", "高架噪音"); - put("3", "轨交噪音"); - put("4", "发射塔"); + put("0", "鍙樼數绔�"); + put("1", "鍨冨溇鍦�"); + put("2", "楂樻灦鍣煶"); + put("3", "杞ㄤ氦鍣煶"); + put("4", "鍙戝皠濉�"); } }; private static final Map FACILITIES = new HashMap() { { - put("0", "健身房"); - put("1", "游泳池"); - put("2", "会所"); - put("3", "网球场"); - put("4", "球场"); - put("5", "棋牌室"); - put("6", "停车场"); - put("7", "图书馆"); - put("8", "活动中心"); + put("0", "鍋ヨ韩鎴�"); + put("1", "娓告吵姹�"); + put("2", "浼氭墍"); + put("3", "缃戠悆鍦�"); + put("4", "鐞冨満"); + put("5", "妫嬬墝瀹�"); + put("6", "鍋滆溅鍦�"); + put("7", "鍥句功棣�"); + put("8", "娲诲姩涓績"); } }; private static final Map FJT_DIRECTION = new HashMap() { { - put("1", "西南"); - put("2", "东南"); - put("3", "南"); - put("4", "西北"); - put("5", "东北"); - put("6", "东"); - put("7", "西"); - put("8", "北"); - put("9", "东西"); - put("10", "南北"); + put("1", "瑗垮崡"); + put("2", "涓滃崡"); + put("3", "鍗�"); + put("4", "瑗垮寳"); + put("5", "涓滃寳"); + put("6", "涓�"); + put("7", "瑗�"); + put("8", "鍖�"); + put("9", "涓滆タ"); + put("10", "鍗楀寳"); } }; private static final Map FJT_FITMENT = new HashMap() { { - put("0", "毛坯"); - put("1", "毛坯"); - put("2", "简装"); - put("4", "精装"); - put("5", "豪华装修"); + put("0", "姣涘澂"); + put("1", "姣涘澂"); + put("2", "绠�瑁�"); + put("4", "绮捐"); + put("5", "璞崕瑁呬慨"); } }; private static final Map NEGATIVE_FACTOR = new HashMap() { { - put(null, "无"); - put("1", "很近"); - put("2", "较近"); - put("3", "无"); + put(null, "鏃�"); + put("1", "寰堣繎"); + put("2", "杈冭繎"); + put("3", "鏃�"); } }; private static final Map AROUND_KEYWORD_FACTOR = new HashMap() { { put("KTV", "KTV"); - put("医院", "hospital"); - put("学校", "school"); - put("银行", "bank"); + put("鍖婚櫌", "hospital"); + put("瀛︽牎", "school"); + put("閾惰", "bank"); put("ATM", "ATM"); - put("写字楼", "office"); - put("超市", "superMarket"); - put("公园", "park"); - put("停车场", "parking"); - put("机场", "airport"); - put("网吧", "netbar"); - put("电影院", "cinema"); - put("美容院", "beautySalon"); - put("健身中心", "fitnessCenter"); - put("商场", "shoppingMall"); - put("星级酒店", "hotel"); - put("高尔夫球场", "golf"); - put("咖啡厅", "cafe"); + put("鍐欏瓧妤�", "office"); + put("瓒呭競", "superMarket"); + put("鍏洯", "park"); + put("鍋滆溅鍦�", "parking"); + put("鏈哄満", "airport"); + put("缃戝惂", "netbar"); + put("鐢靛奖闄�", "cinema"); + put("缇庡闄�", "beautySalon"); + put("鍋ヨ韩涓績", "fitnessCenter"); + put("鍟嗗満", "shoppingMall"); + put("鏄熺骇閰掑簵", "hotel"); + put("楂樺皵澶悆鍦�", "golf"); + put("鍜栧暋鍘�", "cafe"); } }; private static final Map AROUND_KEYWORD_FACTOR_NEW = new HashMap() { { - put("学校", "school"); - put("医院", "hospital"); - put("银行", "bank"); - put("超市", "supermarket"); - put("商场", "market"); - put("美容院", "beautySalon"); - put("健身中心", "gym"); - put("公园/绿地", "park"); - put("地铁", "metro"); - put("公交", "bus"); - put("码头", "dock"); - put("机场", "airport"); - put("火车站", "trainStation"); - put("餐馆", "restaurant"); - put("酒店", "hotel"); + put("瀛︽牎", "school"); + put("鍖婚櫌", "hospital"); + put("閾惰", "bank"); + put("瓒呭競", "supermarket"); + put("鍟嗗満", "market"); + put("缇庡闄�", "beautySalon"); + put("鍋ヨ韩涓績", "gym"); + put("鍏洯/缁垮湴", "park"); + put("鍦伴搧", "metro"); + put("鍏氦", "bus"); + put("鐮佸ご", "dock"); + put("鏈哄満", "airport"); + put("鐏溅绔�", "trainStation"); + put("椁愰", "restaurant"); + put("閰掑簵", "hotel"); } }; @@ -390,38 +390,38 @@ public class PropertyController { private static final Map CITYLEVEL_MAP = new HashMap() { { - put("1000", "one");// 一线 - put("1500", "newOne");// 新一线 - put("2000", "two");// 二线 - put("3000", "three");// 三线 - put("4000", "four");// 四线 - put("5000", "five");// 五线 + put("1000", "one");// 涓�绾� + put("1500", "newOne");// 鏂颁竴绾� + put("2000", "two");// 浜岀嚎 + put("3000", "three");// 涓夌嚎 + put("4000", "four");// 鍥涚嚎 + put("5000", "five");// 浜旂嚎 } }; /** - * 第三方均价映射 + * 绗笁鏂瑰潎浠锋槧灏� */ private static final Map OTHER_PRICE_MAP = new HashMap() { { - put("zhuge_price", "诸葛找房"); - put("anjuke_price", "安居客"); - put("fang_price", "房天下"); - put("lianjia_price", "链家"); - put("cityhouse_price", "禧泰数据"); - put("maitian_price", "麦田"); - put("ke_price", "贝壳"); - put("taofang_price", "淘房365"); - put("zhongyuan_price", "中原"); - put("tbs_price", "兔博士"); - put("qfang_price", "Q房"); - put("fangtan_price", "房探"); - put("fangduoduo_price", "房多多"); - put("wiwj_price", "我爱我家"); + put("zhuge_price", "璇歌憶鎵炬埧"); + put("anjuke_price", "瀹夊眳瀹�"); + put("fang_price", "鎴垮ぉ涓�"); + put("lianjia_price", "閾惧"); + put("cityhouse_price", "绂ф嘲鏁版嵁"); + put("maitian_price", "楹︾敯"); + put("ke_price", "璐濆3"); + put("taofang_price", "娣樻埧365"); + put("zhongyuan_price", "涓師"); + put("tbs_price", "鍏斿崥澹�"); + put("qfang_price", "Q鎴�"); + put("fangtan_price", "鎴挎帰"); + put("fangduoduo_price", "鎴垮澶�"); + put("wiwj_price", "鎴戠埍鎴戝"); } }; /** - * 利用百度API把GPS转换成Google经纬度 + * 鍒╃敤鐧惧害API鎶奊PS杞崲鎴怗oogle缁忕含搴� * * @param lng * @param lat @@ -443,7 +443,7 @@ public class PropertyController { } /** - * 利用算法模板把GPS转换成Google经纬度 + * 鍒╃敤绠楁硶妯℃澘鎶奊PS杞崲鎴怗oogle缁忕含搴� * * @param lng * @param lat @@ -458,13 +458,13 @@ public class PropertyController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity())) { - mav.setModel(BasicModel.buildBadRequestModel("城市(city)不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍩庡競(city)涓嶈兘涓虹┖")); return mav; } if (!RegionData.isCity(model.getCity())) { String city = RegionData.formatCity(model.getCity()); if (null == city) { - mav.setModel(BasicModel.buildBadRequestModel("非法城市:" + model.getCity())); + mav.setModel(BasicModel.buildBadRequestModel("闈炴硶鍩庡競:" + model.getCity())); return mav; } else { model.setCity(city); @@ -474,18 +474,18 @@ public class PropertyController { model.setDistrict(RegionData.formatRegion(model.getCity(), model.getDistrict())); } - /** 设置默认坐标系 */ + /** 璁剧疆榛樿鍧愭爣绯� */ if (model.getFrom() == 0) { model.setFrom(BAI_DU_GEO); } if (StringUtils.isBlank(model.getKeyword()) && !isRadiusSearch(model)) { ServerArea cityData = ServerAreaData.getServerAreaByCity(model.getCity()); if (cityData == null) { - mav.setModel(BasicModel.buildBadRequestModel("城市:" + model.getCity() + "暂不支持")); + mav.setModel(BasicModel.buildBadRequestModel("鍩庡競:" + model.getCity() + "鏆備笉鏀寔")); return mav; } if (cityData.getLng2() <= 0 || cityData.getLat2() <= 0) { - mav.setModel(BasicModel.buildBadRequestModel("关键字(keyword)和经纬度信息(lat,lng,radius)不能同时为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍏抽敭瀛�(keyword)鍜岀粡绾害淇℃伅(lat,lng,radius)涓嶈兘鍚屾椂涓虹┖")); return mav; } if (model.getFrom() == BAI_DU_GEO) { @@ -518,15 +518,15 @@ public class PropertyController { if (isRadiusSearch(model)) { if (model.getLat() < 0 || model.getLat() > 90) { - mav.setModel(BasicModel.buildBadRequestModel("lat(维度)的取值范围是0~90")); + mav.setModel(BasicModel.buildBadRequestModel("lat(缁村害)鐨勫彇鍊艰寖鍥存槸0~90")); return mav; } if (model.getLng() < 0 || model.getLng() > 180) { - mav.setModel(BasicModel.buildBadRequestModel("lng(经度)的取值范围是0~180")); + mav.setModel(BasicModel.buildBadRequestModel("lng(缁忓害)鐨勫彇鍊艰寖鍥存槸0~180")); return mav; } - // from=0为默认值,表示输入值为GPS的经纬度 - // from>0,表示为输入的是baidu经纬度 + // from=0涓洪粯璁ゅ��,琛ㄧず杈撳叆鍊间负GPS鐨勭粡绾害 + // from>0,琛ㄧず涓鸿緭鍏ョ殑鏄痓aidu缁忕含搴� if (model.getFrom() == BAI_DU_GEO) { Map geo = GeocodeUtils.geoconvBaiduToGoogle(model.getLng(), model.getLat()); point = new CoordPoint(geo.get("lng"), geo.get("lat")); @@ -551,7 +551,7 @@ public class PropertyController { if (result.isEmpty() && StringUtils.isNotBlank(model.getKeyword())) { District matchDistrict = matchDistrict(model.getCity(), model.getKeyword(), model.getDistrict(), null); if (matchDistrict != null) { - if (isRadiusSearch(model)) {// 如果搜索中包涵经纬度信息,计算匹配出来的小区是否在指定半径内 + if (isRadiusSearch(model)) {// 濡傛灉鎼滅储涓寘娑电粡绾害淇℃伅锛岃绠楀尮閰嶅嚭鏉ョ殑灏忓尯鏄惁鍦ㄦ寚瀹氬崐寰勫唴 double distance; if (hasGeoPoint(matchDistrict)) { distance = GeoUtils.calculateDistance(point.getLng(), point.getLat(), @@ -613,7 +613,7 @@ public class PropertyController { } dto.setPropertyType(district.getEstateType2()); if (CollectionUtils.isNotEmpty(district.getAlias())) { - // 将最相近的别名输出给用户 + // 灏嗘渶鐩歌繎鐨勫埆鍚嶈緭鍑虹粰鐢ㄦ埛 String alias = null; double similarity = 0; if (StringUtils.isNotBlank(model.getKeyword())) { @@ -658,7 +658,7 @@ public class PropertyController { } /** - * 判断小区是否有经纬度 + * 鍒ゆ柇灏忓尯鏄惁鏈夌粡绾害 * * @param district * @return @@ -669,7 +669,7 @@ public class PropertyController { } /** - * 调用匹配接口匹配小区 + * 璋冪敤鍖归厤鎺ュ彛鍖归厤灏忓尯 * * @param city * @param address @@ -713,7 +713,7 @@ public class PropertyController { || StringUtils.isBlank(model.getName())) && (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getDistrict()) || StringUtils.isBlank(model.getAddress()))) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:请输入正确的参数组合")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:璇疯緭鍏ユ纭殑鍙傛暟缁勫悎")); return mav; } String userId = FangjiaApiUtil.parseUserId(model.getToken()); @@ -723,7 +723,7 @@ public class PropertyController { if (ObjectId.isValid(model.getId())) { district = districtService.findById(model.getId()); } else { - mav.setModel(BasicModel.buildBadRequestModel("非法的住宅ID")); + mav.setModel(BasicModel.buildBadRequestModel("闈炴硶鐨勪綇瀹匢D")); return mav; } } @@ -759,7 +759,7 @@ public class PropertyController { districtInfoDto.setName(district.getName()); districtInfoDto.setAddress(district.getAddress()); //int avgPrice = districtStatService.findLatestDistrictAvgPrice(new DistrictKey(district), null); - // 返回2B价格,小程序用,其他也改为2B + // 杩斿洖2B浠锋牸锛屽皬绋嬪簭鐢紝鍏朵粬涔熸敼涓�2B // int avgPrice = districtStatService.findLatestDistrictAvgPrice2B(new DistrictKey(district), null); // if (avgPrice == 0) { // avgPrice = districtStatService.findLatestDistrictAvgPrice2B(new DistrictKey(district), DateUtil.add(new Date(), -7)); @@ -859,7 +859,7 @@ public class PropertyController { mav.setModel(BasicModel.buildOKModel().setResult(districtInfoDto)); return mav; } - mav.setModel(BasicModel.buildBadRequestModel("该小区不存在")); + mav.setModel(BasicModel.buildBadRequestModel("璇ュ皬鍖轰笉瀛樺湪")); return mav; } @@ -872,7 +872,7 @@ public class PropertyController { || StringUtils.isBlank(model.getName())) && (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getDistrict()) || StringUtils.isBlank(model.getAddress()))) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:请输入正确的参数组合")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:璇疯緭鍏ユ纭殑鍙傛暟缁勫悎")); return mav; } @@ -881,7 +881,7 @@ public class PropertyController { if (ObjectId.isValid(model.getId())) { district = districtService.findById(model.getId()); } else { - mav.setModel(BasicModel.buildBadRequestModel("非法的住宅ID")); + mav.setModel(BasicModel.buildBadRequestModel("闈炴硶鐨勪綇瀹匢D")); return mav; } } @@ -969,14 +969,14 @@ public class PropertyController { mav.setModel(BasicModel.buildOKModel().setResult(districtInfoDto)); return mav; } - mav.setModel(BasicModel.buildBadRequestModel("该小区不存在")); + mav.setModel(BasicModel.buildBadRequestModel("璇ュ皬鍖轰笉瀛樺湪")); return mav; } private void saveAddressMatchLog(Map resMap, String keywords, String city, String token) { Map tokenMap = FangjiaApiUtil.parseToken(token); String userName = null; - // token验证后,拿取出的字段再去数据库验证一遍 + // token楠岃瘉鍚庯紝鎷垮彇鍑虹殑瀛楁鍐嶅幓鏁版嵁搴撻獙璇佷竴閬� if (tokenMap != null && StringUtils.isNotBlank(tokenMap.get("userid")) && !"null".equals(tokenMap.get("userid"))) { User user = userService.findById(Long.parseLong(tokenMap.get("userid"))); @@ -984,7 +984,7 @@ public class PropertyController { userName = user.getUserName(); } } - // 记录用户搜索词open匹配结果 + // 璁板綍鐢ㄦ埛鎼滅储璇峯pen鍖归厤缁撴灉 HttpServletRequest request = ActionContext.getContext().getRequest(); AddressMatchLog addressMatchLog = new AddressMatchLog(); addressMatchLog.setCity(city); @@ -1018,43 +1018,43 @@ public class PropertyController { mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getName()) || StringUtils.isBlank(model.getDistrict()) || model.getSize() <= 0) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:城市,区域,小区名,面积(size)为必填项")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:鍩庡競,鍖哄煙,灏忓尯鍚�,闈㈢Н(size)涓哄繀濉」")); return mav; } - if (model.getCity().endsWith("市")) { - model.setCity(model.getCity().replaceAll("市$", "")); + if (model.getCity().endsWith("甯�")) { + model.setCity(model.getCity().replaceAll("甯�$", "")); } - /* 先到CPDB库中查找小区 */ + /* 鍏堝埌CPDB搴撲腑鏌ユ壘灏忓尯 */ District district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(), "district"); if (district == null) { - mav.setModel(BasicModel.buildBadRequestModel("该小区不存在")); + mav.setModel(BasicModel.buildBadRequestModel("璇ュ皬鍖轰笉瀛樺湪")); return mav; } model.setName(district.getName()); if (model.getCarportPrice() != null && (model.getCarportPrice() < 0 || model.getCarportPrice() > 1000000)) { - mav.setModel(BasicModel.buildBadRequestModel("carportPrice(车位)取值不合法")); + mav.setModel(BasicModel.buildBadRequestModel("carportPrice(杞︿綅)鍙栧�间笉鍚堟硶")); return mav; } if (model.getMaxFloor() != null && (model.getMaxFloor() <= 0 || model.getMaxFloor() > 59)) { - mav.setModel(BasicModel.buildBadRequestModel("maxFloor取值非法,正确范围[1,60)")); + mav.setModel(BasicModel.buildBadRequestModel("maxFloor鍙栧�奸潪娉�,姝g‘鑼冨洿[1,60)")); return mav; } if (model.getFloor() != null && (model.getFloor() <= 0 || model.getFloor() > 59)) { - mav.setModel(BasicModel.buildBadRequestModel("floor取值非法,正确范围[1,60)")); + mav.setModel(BasicModel.buildBadRequestModel("floor鍙栧�奸潪娉�,姝g‘鑼冨洿[1,60)")); return mav; } if (model.getMaxFloor() != null && model.getFloor() != null && model.getFloor() > model.getMaxFloor()) { - mav.setModel(BasicModel.buildBadRequestModel("所在楼层不能大于总楼层")); + mav.setModel(BasicModel.buildBadRequestModel("鎵�鍦ㄦゼ灞備笉鑳藉ぇ浜庢�绘ゼ灞�")); return mav; } model.setRegion(district.getRegion()); model.setDistrictName(district.getName()); if (StringUtils.isBlank(model.getPropertyType())) { - if (district.getEstateType2() != null && district.getEstateType2().contains("别墅")) { + if (district.getEstateType2() != null && district.getEstateType2().contains("鍒")) { model.setPropertyType("1"); } } @@ -1069,7 +1069,7 @@ public class PropertyController { mav.setModel(BasicModel.buildOKModel().setResult(dto)); return mav; } - mav.setModel(BasicModel.buildOKModel().setMsg("暂时不支持该小区的估价").markNoData()); + mav.setModel(BasicModel.buildOKModel().setMsg("鏆傛椂涓嶆敮鎸佽灏忓尯鐨勪及浠�").markNoData()); return mav; } @@ -1078,13 +1078,13 @@ public class PropertyController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getName()) - || StringUtils.isBlank(model.getDistrict()) || model.getSize() <= 0 || model.getCity().contains("全国") - || model.getDistrict().contains("全国")) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:城市,区域,小区名,面积(size)为必填项")); + || StringUtils.isBlank(model.getDistrict()) || model.getSize() <= 0 || model.getCity().contains("鍏ㄥ浗") + || model.getDistrict().contains("鍏ㄥ浗")) { + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:鍩庡競,鍖哄煙,灏忓尯鍚�,闈㈢Н(size)涓哄繀濉」")); return mav; } - if (model.getCity().endsWith("市")) { - model.setCity(model.getCity().replaceAll("市$", "")); + if (model.getCity().endsWith("甯�")) { + model.setCity(model.getCity().replaceAll("甯�$", "")); } if (StringUtils.isNotBlank(request.getParameter("calDate"))) { Date calDate = null; @@ -1094,41 +1094,41 @@ public class PropertyController { } if (calDate == null) { - mav.setModel(BasicModel.buildBadRequestModel("calDate:数据类型不合法")); + mav.setModel(BasicModel.buildBadRequestModel("calDate:鏁版嵁绫诲瀷涓嶅悎娉�")); return mav; } else { model.setCalDate(calDate); } } - /* 先到CPDB库中查找小区 */ + /* 鍏堝埌CPDB搴撲腑鏌ユ壘灏忓尯 */ District district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(), "district"); if (district == null) { - if (model.getDistrict().contains("市辖区") || model.getDistrict().contains(model.getCity())) { + if (model.getDistrict().contains("甯傝緰鍖�") || model.getDistrict().contains(model.getCity())) { district = districtService.findByNameAndAlias(model.getCity(), null, model.getName(), "district"); } if (district == null) { - mav.setModel(BasicModel.buildBadRequestModel("该小区不存在")); + mav.setModel(BasicModel.buildBadRequestModel("璇ュ皬鍖轰笉瀛樺湪")); return mav; } } model.setName(district.getName()); if (model.getCarportPrice() != null && (model.getCarportPrice() < 0 || model.getCarportPrice() > 1000000)) { - mav.setModel(BasicModel.buildBadRequestModel("carportPrice(车位)取值不合法")); + mav.setModel(BasicModel.buildBadRequestModel("carportPrice(杞︿綅)鍙栧�间笉鍚堟硶")); return mav; } if (model.getMaxFloor() != null && (model.getMaxFloor() <= 0 || model.getMaxFloor() > 59)) { - mav.setModel(BasicModel.buildBadRequestModel("maxFloor取值非法,正确范围[1,60)")); + mav.setModel(BasicModel.buildBadRequestModel("maxFloor鍙栧�奸潪娉�,姝g‘鑼冨洿[1,60)")); return mav; } if (model.getFloor() != null && (model.getFloor() <= 0 || model.getFloor() > 59)) { - mav.setModel(BasicModel.buildBadRequestModel("floor取值非法,正确范围[1,60)")); + mav.setModel(BasicModel.buildBadRequestModel("floor鍙栧�奸潪娉�,姝g‘鑼冨洿[1,60)")); return mav; } if (model.getMaxFloor() != null && model.getFloor() != null && model.getFloor() > model.getMaxFloor()) { - mav.setModel(BasicModel.buildBadRequestModel("所在楼层不能大于总楼层")); + mav.setModel(BasicModel.buildBadRequestModel("鎵�鍦ㄦゼ灞備笉鑳藉ぇ浜庢�绘ゼ灞�")); return mav; } @@ -1156,7 +1156,7 @@ public class PropertyController { model.setRegion(district.getRegion()); model.setDistrictName(district.getName()); if (StringUtils.isBlank(model.getPropertyType())) { - if (district.getEstateType2() != null && district.getEstateType2().contains("别墅")) { + if (district.getEstateType2() != null && district.getEstateType2().contains("鍒")) { model.setPropertyType("1"); } } @@ -1193,12 +1193,12 @@ public class PropertyController { this.adjustPriceByRatio(district, evaluation); } - // 调整面积不同面积价格 + // 璋冩暣闈㈢Н涓嶅悓闈㈢Н浠锋牸 try { DistrictStatBo districtStatBo = districtStatService.findDistrictStat(new DistrictKey(district)); int orgAvgPrice = 0; if (districtStatBo != null) { - if (StringUtils.isNotBlank(district.getEstateType2()) && district.getEstateType2().contains("别墅") && districtStatBo.getVillaDistrictStat() != null) { + if (StringUtils.isNotBlank(district.getEstateType2()) && district.getEstateType2().contains("鍒") && districtStatBo.getVillaDistrictStat() != null) { if(districtStatBo.getVillaDistrictStat().getAvg_price_2b() != null && districtStatBo.getVillaDistrictStat().getAvg_price_2b() > 0){ orgAvgPrice = districtStatBo.getVillaDistrictStat().getAvg_price_2b(); }else{ @@ -1218,7 +1218,7 @@ public class PropertyController { int avgPrice = evaluateFactorService.recompose(district.getCity(), district.getRegion(), evaluation.getArea(), factorPrice, orgAvgPrice); Integer minPrice = (int) (evaluation.getAvgPrice() * 0.95); Integer maxPrice = (int) (evaluation.getAvgPrice() * 1.05); - // 偏离度超过5%不进行调整 + // 鍋忕搴﹁秴杩�5%涓嶈繘琛岃皟鏁� if (minPrice <= avgPrice && avgPrice <= maxPrice) { evaluation.setAvgPrice(avgPrice); evaluation.setBigTotalPrice((long) (avgPrice * evaluation.getArea())); @@ -1226,7 +1226,7 @@ public class PropertyController { } } catch (Exception ex) { - LOGGER.error("调整面积不同面积价格异常{}", ex.getMessage()); + LOGGER.error("璋冩暣闈㈢Н涓嶅悓闈㈢Н浠锋牸寮傚父{}", ex.getMessage()); } if (evaluation.getTotalPrice() != null && evaluation.getTotalPrice() != 0 @@ -1238,7 +1238,7 @@ public class PropertyController { districtPriceMap.put("totalPrice", evaluation.getBigTotalPrice()); districtPriceMap.put("avgPrice", evaluation.getAvgPrice()); - // 根据城市等 级设置D级可信度 + // 鏍规嵁鍩庡競绛� 绾ц缃瓺绾у彲淇″害 ApiUserAuthority apiUserAuthority = apiUserAuthorityService .findByUserId(Long.valueOf(evaluation.getFromUserId())); if (apiUserAuthority != null && null != apiUserAuthority.getCreditLevelStatus() @@ -1272,7 +1272,7 @@ public class PropertyController { districtPriceMap.put("avgPrice", (int) (lastPrice / evaluation.getArea())); } } else { - mav.setModel(BasicModel.buildOKModel().setMsg("暂时不支持该小区的估价").markNoData()); + mav.setModel(BasicModel.buildOKModel().setMsg("鏆傛椂涓嶆敮鎸佽灏忓尯鐨勪及浠�").markNoData()); return mav; } @@ -1298,7 +1298,7 @@ public class PropertyController { return mav; } else { evaluationService.remove(evaluation.getId()); - mav.setModel(BasicModel.buildOKModel().setMsg("暂时不支持该小区的估价").markNoData()); + mav.setModel(BasicModel.buildOKModel().setMsg("鏆傛椂涓嶆敮鎸佽灏忓尯鐨勪及浠�").markNoData()); return mav; } } @@ -1309,22 +1309,22 @@ public class PropertyController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getName()) || StringUtils.isBlank(model.getDistrict()) || model.getSize()<=0 || model.getAvgPrice()<0) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:城市,区域,小区名,面积(size)为必填项")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:鍩庡競,鍖哄煙,灏忓尯鍚�,闈㈢Н(size)涓哄繀濉」")); return mav; } - /* 先到CPDB库中查找小区 */ + /* 鍏堝埌CPDB搴撲腑鏌ユ壘灏忓尯 */ District district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(), "district"); if (district == null) { - mav.setModel(BasicModel.buildBadRequestModel("该小区不存在")); + mav.setModel(BasicModel.buildBadRequestModel("璇ュ皬鍖轰笉瀛樺湪")); return mav; } DistrictStatBo districtStatBo = districtStatService.findDistrictStat(new DistrictKey(district)); int orgAvgPrice = 0; if (districtStatBo != null) { - if (StringUtils.isNotBlank(district.getEstateType2()) && district.getEstateType2().contains("别墅") && districtStatBo.getVillaDistrictStat() != null) { + if (StringUtils.isNotBlank(district.getEstateType2()) && district.getEstateType2().contains("鍒") && districtStatBo.getVillaDistrictStat() != null) { if(districtStatBo.getVillaDistrictStat().getAvg_price_2b() != null && districtStatBo.getVillaDistrictStat().getAvg_price_2b() > 0){ orgAvgPrice = districtStatBo.getVillaDistrictStat().getAvg_price_2b(); }else{ @@ -1342,7 +1342,7 @@ public class PropertyController { int newAvgPrice = evaluateFactorService.recompose(district.getCity(), district.getRegion(), model.getSize(), model.getAvgPrice(), 0); Integer minPrice = (int) ( model.getAvgPrice() * 0.95); Integer maxPrice = (int) ( model.getAvgPrice() * 1.05); - // 偏离度超过5%不进行调整 + // 鍋忕搴﹁秴杩�5%涓嶈繘琛岃皟鏁� Map map = new HashMap(); if (minPrice <= newAvgPrice && newAvgPrice <= maxPrice) { map.put("newAvgPrice", newAvgPrice); @@ -1356,7 +1356,7 @@ public class PropertyController { } /** - * 系数下调 + * 绯绘暟涓嬭皟 * * @param district * @param evaluation @@ -1367,7 +1367,7 @@ public class PropertyController { ApiUserCfg apiUserCfg_pt = apiUserCfgService.findByUserId(Long.valueOf(evaluation.getFromUserId()), ApiUserCfg.ApiUserCfgKey.PRICE_TYPE); if (apiUserCfg_pt != null && apiUserCfg_pt.getCfgValue() != null) { String priceType = apiUserCfg_pt.getCfgValue().toString(); - // 评估价则系数调整 + // 璇勪及浠峰垯绯绘暟璋冩暣 if (StringUtils.isNotBlank(priceType) && "evaluate".equals(priceType)) { EvaluateRatio evaluateRatio = null; if (StringUtils.isNotBlank(district.getRegion())) { @@ -1377,7 +1377,7 @@ public class PropertyController { evaluateRatio = evaluateRatioService.findByCity(district.getCity()); } if (evaluateRatio != null) { - // 系数添加 + // 绯绘暟娣诲姞 long totalPrice = evaluation.getBigTotalPrice(); totalPrice = (long) (totalPrice * (1 + evaluateRatio.getRatio())); evaluation.setBigTotalPrice(totalPrice); @@ -1386,38 +1386,38 @@ public class PropertyController { } } } catch (Exception ex) { - LOGGER.error("系数下调异常{}", ex.getMessage()); + LOGGER.error("绯绘暟涓嬭皟寮傚父{}", ex.getMessage()); } } static final Map CITY_CORRECTION_FACTOR = new HashMap(); static { - CITY_CORRECTION_FACTOR.put("上海", 0.02); - CITY_CORRECTION_FACTOR.put("杭州", 0.1); - CITY_CORRECTION_FACTOR.put("大连", 0.09); - CITY_CORRECTION_FACTOR.put("广州", 0.09); - CITY_CORRECTION_FACTOR.put("深圳", 0.02); - CITY_CORRECTION_FACTOR.put("重庆", 0.1); - CITY_CORRECTION_FACTOR.put("苏州", 0.08); - CITY_CORRECTION_FACTOR.put("成都", 0.07); - CITY_CORRECTION_FACTOR.put("北京", 0.04); - CITY_CORRECTION_FACTOR.put("厦门", 0.1); + CITY_CORRECTION_FACTOR.put("涓婃捣", 0.02); + CITY_CORRECTION_FACTOR.put("鏉窞", 0.1); + CITY_CORRECTION_FACTOR.put("澶ц繛", 0.09); + CITY_CORRECTION_FACTOR.put("骞垮窞", 0.09); + CITY_CORRECTION_FACTOR.put("娣卞湷", 0.02); + CITY_CORRECTION_FACTOR.put("閲嶅簡", 0.1); + CITY_CORRECTION_FACTOR.put("鑻忓窞", 0.08); + CITY_CORRECTION_FACTOR.put("鎴愰兘", 0.07); + CITY_CORRECTION_FACTOR.put("鍖椾含", 0.04); + CITY_CORRECTION_FACTOR.put("鍘﹂棬", 0.1); } public Object evaluateForTestAction(PropertyEvaluationModel model, HttpServletRequest request) { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity())) { - mav.setModel(BasicModel.buildBadRequestModel("城市为必填项")); + mav.setModel(BasicModel.buildBadRequestModel("鍩庡競涓哄繀濉」")); return mav; } if (model.getSize() <= 0) { - mav.setModel(BasicModel.buildBadRequestModel("面积为必填项")); + mav.setModel(BasicModel.buildBadRequestModel("闈㈢Н涓哄繀濉」")); return mav; } if (StringUtils.isBlank(model.getAddress()) && StringUtils.isBlank(model.getName())) { - mav.setModel(BasicModel.buildBadRequestModel("地址和小区名至少填一个")); + mav.setModel(BasicModel.buildBadRequestModel("鍦板潃鍜屽皬鍖哄悕鑷冲皯濉竴涓�")); return mav; } if (StringUtils.isNotBlank(model.getName()) && StringUtils.isBlank(model.getAddress())) { @@ -1427,39 +1427,39 @@ public class PropertyController { Date calDate = DateUtil.parseDate(request.getParameter("calDate"), "yyyy-MM-dd"); model.setCalDate(calDate); } - /* 先到CPDB库中查找小区 */ + /* 鍏堝埌CPDB搴撲腑鏌ユ壘灏忓尯 */ District district = districtService.findDistrict(new DistrictKey(model.getCity(), model.getDistrict(), model.getName()), "district");//matchDistrict(model.getCity(), model.getAddress(), model.getDistrict(), model.getName()); if (district == null) { - //防止地址模糊,名称详细的情况 + //闃叉鍦板潃妯$硦锛屽悕绉拌缁嗙殑鎯呭喌 district = matchDistrict(model.getCity(), model.getName(), model.getDistrict(), model.getAddress()); if (district == null) { - mav.setModel(BasicModel.buildBadRequestModel("该小区不存在")); + mav.setModel(BasicModel.buildBadRequestModel("璇ュ皬鍖轰笉瀛樺湪")); return mav; } } model.setName(district.getName()); if (model.getCarportPrice() != null && (model.getCarportPrice() < 0 || model.getCarportPrice() > 1000000)) { - mav.setModel(BasicModel.buildBadRequestModel("carportPrice(车位)取值不合法")); + mav.setModel(BasicModel.buildBadRequestModel("carportPrice(杞︿綅)鍙栧�间笉鍚堟硶")); return mav; } if (model.getMaxFloor() != null && (model.getMaxFloor() <= 0 || model.getMaxFloor() > 59)) { - mav.setModel(BasicModel.buildBadRequestModel("maxFloor取值非法,正确范围[1,60)")); + mav.setModel(BasicModel.buildBadRequestModel("maxFloor鍙栧�奸潪娉�,姝g‘鑼冨洿[1,60)")); return mav; } if (model.getFloor() != null && (model.getFloor() <= 0 || model.getFloor() > 59)) { - mav.setModel(BasicModel.buildBadRequestModel("floor取值非法,正确范围[1,60)")); + mav.setModel(BasicModel.buildBadRequestModel("floor鍙栧�奸潪娉�,姝g‘鑼冨洿[1,60)")); return mav; } if (model.getMaxFloor() != null && model.getFloor() != null && model.getFloor() > model.getMaxFloor()) { - mav.setModel(BasicModel.buildBadRequestModel("所在楼层不能大于总楼层")); + mav.setModel(BasicModel.buildBadRequestModel("鎵�鍦ㄦゼ灞備笉鑳藉ぇ浜庢�绘ゼ灞�")); return mav; } model.setRegion(district.getRegion()); model.setDistrictName(district.getName()); if (StringUtils.isBlank(model.getPropertyType())) { - if (district.getEstateType2() != null && district.getEstateType2().contains("别墅")) { + if (district.getEstateType2() != null && district.getEstateType2().contains("鍒")) { model.setPropertyType("1"); } } @@ -1476,18 +1476,18 @@ public class PropertyController { Evaluation evaluation = evaluationService.evaluate(district, buildEvaluation(model, request), model.getCalDate()); if (!"self".equalsIgnoreCase(evaluation.getEvaluateWay())) { evaluationService.remove(evaluation.getId()); - mav.setModel(BasicModel.buildOKModel().setMsg("暂时不支持该小区的估价").markNoData()); + mav.setModel(BasicModel.buildOKModel().setMsg("鏆傛椂涓嶆敮鎸佽灏忓尯鐨勪及浠�").markNoData()); return mav; } this.adjustPriceByRatio(district, evaluation); - // 调整面积不同面积价格 + // 璋冩暣闈㈢Н涓嶅悓闈㈢Н浠锋牸 try { DistrictStatBo districtStatBo = districtStatService.findDistrictStat(new DistrictKey(district)); int orgAvgPrice = 0; if (districtStatBo != null) { - if (StringUtils.isNotBlank(district.getEstateType2()) && district.getEstateType2().contains("别墅") && districtStatBo.getVillaDistrictStat() != null) { + if (StringUtils.isNotBlank(district.getEstateType2()) && district.getEstateType2().contains("鍒") && districtStatBo.getVillaDistrictStat() != null) { orgAvgPrice = districtStatBo.getVillaDistrictStat().getAvgPrice(); } else if (districtStatBo.getDistrictStat() != null) { orgAvgPrice = districtStatBo.getDistrictStat().getAvgPrice(); @@ -1498,7 +1498,7 @@ public class PropertyController { int avgPrice = evaluateFactorService.recompose(district.getCity(), district.getRegion(), evaluation.getArea(), factorPrice, orgAvgPrice); Integer minPrice = (int) (evaluation.getAvgPrice() * 0.95); Integer maxPrice = (int) (evaluation.getAvgPrice() * 1.05); - // 偏离度超过5%不进行调整 + // 鍋忕搴﹁秴杩�5%涓嶈繘琛岃皟鏁� if (minPrice <= avgPrice && avgPrice <= maxPrice) { evaluation.setAvgPrice(avgPrice); evaluation.setBigTotalPrice((long) (avgPrice * evaluation.getArea())); @@ -1514,7 +1514,7 @@ public class PropertyController { districtPriceMap.put("totalPrice", evaluation.getBigTotalPrice()); districtPriceMap.put("unitPrice", evaluation.getAvgPrice()); - // 新增置信度 + // 鏂板缃俊搴� CommunityBasePrice communityBasePrice = communityBasePriceService.getById(district.getId()); if (communityBasePrice != null) { districtPriceMap.put("credit", communityBasePrice.getCredit()); @@ -1534,7 +1534,7 @@ public class PropertyController { Integer maxPrice = (int) (evaluation.getAvgPrice() * 1.2); Integer min10Price = (int) (evaluation.getAvgPrice() * 0.9); Integer max10Price = (int) (evaluation.getAvgPrice() * 1.1); - // 新增第三方均价 + // 鏂板绗笁鏂瑰潎浠� try { double dCredit = 0.61; Map rMap = getLastEvaluationPrice(district, evaluation, dCredit); @@ -1544,7 +1544,7 @@ public class PropertyController { Map priceResultMap = new HashMap(); for (String key : otherPriceMap.keySet()) { Integer price = otherPriceMap.get(key); - // 剔除偏差大于10的 + // 鍓旈櫎鍋忓樊澶т簬10鐨� if (min10Price <= price && max10Price >= price) { if (OTHER_PRICE_MAP.containsKey(key)) { priceResultMap.put(OTHER_PRICE_MAP.get(key), price); @@ -1588,7 +1588,7 @@ public class PropertyController { List districts = districtService.findNearestDistrict(district.getEstateType2(), lng, lat, 1000 * 3, 6, null); if (districts.size() < 2) { evaluationService.remove(evaluation.getId()); - mav.setModel(BasicModel.buildOKModel().setMsg("暂时不支持该小区的估价").markNoData()); + mav.setModel(BasicModel.buildOKModel().setMsg("鏆傛椂涓嶆敮鎸佽灏忓尯鐨勪及浠�").markNoData()); return mav; } UniversalDto modelFeaturesFto = UniversalDto.newDto(); @@ -1640,7 +1640,7 @@ public class PropertyController { } modelFeaturesFto.append("nearCommunity", nearCommunityDtos); - // 模型特征新增周边数量 + // 妯″瀷鐗瑰緛鏂板鍛ㄨ竟鏁伴噺 CommunityPoi communityPoi = communityPoiService.getById(district.getId()); if (communityPoi != null) { modelFeaturesFto.put("subway", communityPoi.getSubway()); @@ -1658,9 +1658,9 @@ public class PropertyController { } /** - * 地址估值 + * 鍦板潃浼板�� * - * @param model 参数 + * @param model 鍙傛暟 * @param request * @return */ @@ -1669,18 +1669,18 @@ public class PropertyController { mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity()) || model.getSize() <= 0) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:城市,面积(size)为必填项")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:鍩庡競,闈㈢Н(size)涓哄繀濉」")); return mav; } if (StringUtils.isBlank(model.getAddress()) && StringUtils.isBlank(model.getName())) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:地址或名称不为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:鍦板潃鎴栧悕绉颁笉涓虹┖")); return mav; } if (model.getDistrict() != null) { - //区域编码转房价网区域 + //鍖哄煙缂栫爜杞埧浠风綉鍖哄煙 FangjiaOfficialAreaMap fangjiaOfficialAreaMap = fangjiaOfficialAreaService.convertOfficialCodeToFangjia(model.getDistrict()); if (fangjiaOfficialAreaMap != null) { model.setDistrict(fangjiaOfficialAreaMap.getFangjiaDistrict()); @@ -1721,13 +1721,13 @@ public class PropertyController { Map map = (Map) json.get("result"); if ((Integer) map.get("precise") >= 0) { String propertyType = (String) map.get("propertyType"); - // 优先使用客户的物业类型,即使面积很大也不进行别墅推断 20241111 + // 浼樺厛浣跨敤瀹㈡埛鐨勭墿涓氱被鍨嬶紝鍗充娇闈㈢Н寰堝ぇ涔熶笉杩涜鍒鎺ㄦ柇 20241111 String userPropertyTypeParam = model.getPropertyType(); if (StringUtils.isNotBlank(userPropertyTypeParam) && ("0,2".contains(userPropertyTypeParam))) { villaFlag = false; } - if (villaFlag && StringUtils.isNotBlank(propertyType) && !propertyType.equals("别墅")) { - district = districtService.findByNameAndAlias((String) map.get("city"), (String) map.get("district"), (String) map.get("name") + "别墅", "district"); + if (villaFlag && StringUtils.isNotBlank(propertyType) && !propertyType.equals("鍒")) { + district = districtService.findByNameAndAlias((String) map.get("city"), (String) map.get("district"), (String) map.get("name") + "鍒", "district"); } if (null == district) { district = districtService.findByNameAndAlias((String) map.get("city"), (String) map.get("district"), (String) map.get("name"), "district"); @@ -1739,7 +1739,7 @@ public class PropertyController { } if (district == null) { - //使用新匹配再配一遍,不加类型,有结果,类型为district则走小区估值,其它类型也走经纬度估值 + //浣跨敤鏂板尮閰嶅啀閰嶄竴閬嶏紝涓嶅姞绫诲瀷锛屾湁缁撴灉锛岀被鍨嬩负district鍒欒蛋灏忓尯浼板�硷紝鍏跺畠绫诲瀷涔熻蛋缁忕含搴︿及鍊� JSONObject resultObject = null; if(StringUtils.isNotBlank(model.getAddress())){ resultObject = addressMatchProxyService.newMatch(model.getCity(), model.getAddress(), null, false); @@ -1762,7 +1762,7 @@ public class PropertyController { } if (district == null) { - //加上高德获取经纬度 和 根据经纬度估值 + //鍔犱笂楂樺痉鑾峰彇缁忕含搴� 鍜� 鏍规嵁缁忕含搴︿及鍊� Map map = GeoUtils.parserByGaode(model.getCity(), model.getAddress()); if(map != null && (!map.containsKey("lng") || map.containsKey("level") && !GAODE_LEVEL.contains(map.get("level")))){ map = GeoUtils.parserByGaode(model.getCity(), model.getDistrict()+model.getName()); @@ -1777,7 +1777,7 @@ public class PropertyController { param.put("area", String.valueOf(model.getSize())); try { json = httpRequest.getJsonContent("http://192.168.0.100:30020/avmWeb/avmAnn", param, "UTF-8"); - if (json.containsKey("msg") && "成功".equals(json.getString("msg"))) { + if (json.containsKey("msg") && "鎴愬姛".equals(json.getString("msg"))) { HashMap resultMap = new HashMap(); Long totalPrice = getRatioPrice(request, Long.valueOf(json.getString("totalPrice"))); @@ -1785,13 +1785,13 @@ public class PropertyController { resultMap.put("totalPrice", totalPrice); mav.setModel(BasicModel.buildOKModel().setResult(resultMap)); } else { - mav.setModel(BasicModel.buildBadRequestModel("该地址不支持估价!")); + mav.setModel(BasicModel.buildBadRequestModel("璇ュ湴鍧�涓嶆敮鎸佷及浠凤紒")); } } catch (HttpRequestException e) { throw new RuntimeException(e); } } else { - mav.setModel(BasicModel.buildBadRequestModel("该地址不支持估价!")); + mav.setModel(BasicModel.buildBadRequestModel("璇ュ湴鍧�涓嶆敮鎸佷及浠凤紒")); } return mav; } @@ -1801,7 +1801,7 @@ public class PropertyController { model.setCity(district.getCity()); return this.evaluateAction(model, request); }else{ - mav.setModel(BasicModel.buildBadRequestModel("该地址不支持估价!")); + mav.setModel(BasicModel.buildBadRequestModel("璇ュ湴鍧�涓嶆敮鎸佷及浠凤紒")); return mav; } @@ -1848,11 +1848,11 @@ public class PropertyController { mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getName()) || StringUtils.isBlank(model.getDistrict()) || model.getSize() <= 0) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:城市,区域,小区名,面积(size)为必填项")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:鍩庡競,鍖哄煙,灏忓尯鍚�,闈㈢Н(size)涓哄繀濉」")); return mav; } - if (model.getCity().endsWith("市")) { - model.setCity(model.getCity().replaceAll("市$", "")); + if (model.getCity().endsWith("甯�")) { + model.setCity(model.getCity().replaceAll("甯�$", "")); } if (StringUtils.isNotBlank(request.getParameter("calDate"))) { Date calDate = null; @@ -1862,43 +1862,43 @@ public class PropertyController { } if (calDate == null) { - mav.setModel(BasicModel.buildBadRequestModel("calDate:数据类型不合法")); + mav.setModel(BasicModel.buildBadRequestModel("calDate:鏁版嵁绫诲瀷涓嶅悎娉�")); return mav; } else { model.setCalDate(calDate); } } - /* 先到CPDB库中查找小区 */ + /* 鍏堝埌CPDB搴撲腑鏌ユ壘灏忓尯 */ District district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(), "district"); if (district == null) { - mav.setModel(BasicModel.buildBadRequestModel("该小区不存在")); + mav.setModel(BasicModel.buildBadRequestModel("璇ュ皬鍖轰笉瀛樺湪")); return mav; } model.setName(district.getName()); if (model.getCarportPrice() != null && (model.getCarportPrice() < 0 || model.getCarportPrice() > 1000000)) { - mav.setModel(BasicModel.buildBadRequestModel("carportPrice(车位)取值不合法")); + mav.setModel(BasicModel.buildBadRequestModel("carportPrice(杞︿綅)鍙栧�间笉鍚堟硶")); return mav; } if (model.getMaxFloor() != null && (model.getMaxFloor() <= 0 || model.getMaxFloor() > 59)) { - mav.setModel(BasicModel.buildBadRequestModel("maxFloor取值非法,正确范围[1,60)")); + mav.setModel(BasicModel.buildBadRequestModel("maxFloor鍙栧�奸潪娉�,姝g‘鑼冨洿[1,60)")); return mav; } if (model.getFloor() != null && (model.getFloor() <= 0 || model.getFloor() > 59)) { - mav.setModel(BasicModel.buildBadRequestModel("floor取值非法,正确范围[1,60)")); + mav.setModel(BasicModel.buildBadRequestModel("floor鍙栧�奸潪娉�,姝g‘鑼冨洿[1,60)")); return mav; } if (model.getMaxFloor() != null && model.getFloor() != null && model.getFloor() > model.getMaxFloor()) { - mav.setModel(BasicModel.buildBadRequestModel("所在楼层不能大于总楼层")); + mav.setModel(BasicModel.buildBadRequestModel("鎵�鍦ㄦゼ灞備笉鑳藉ぇ浜庢�绘ゼ灞�")); return mav; } model.setRegion(district.getRegion()); model.setDistrictName(district.getName()); if (StringUtils.isBlank(model.getPropertyType())) { - if (district.getEstateType2() != null && district.getEstateType2().contains("别墅")) { + if (district.getEstateType2() != null && district.getEstateType2().contains("鍒")) { model.setPropertyType("1"); } } @@ -1939,7 +1939,7 @@ public class PropertyController { districtPriceMap.put("name", district.getName()); districtPriceMap.put("avgPrice", evaluation.getAvgPrice()); - // 根据城市等 级设置D级可信度 + // 鏍规嵁鍩庡競绛� 绾ц缃瓺绾у彲淇″害 ApiUserAuthority apiUserAuthority = apiUserAuthorityService .findByUserId(Long.valueOf(evaluation.getFromUserId())); if (apiUserAuthority != null && null != apiUserAuthority.getCreditLevelStatus() @@ -1972,7 +1972,7 @@ public class PropertyController { districtPriceMap.put("avgPrice", (int) (lastPrice / evaluation.getArea())); } } else { - mav.setModel(BasicModel.buildOKModel().setMsg("暂时不支持该小区的估价").markNoData()); + mav.setModel(BasicModel.buildOKModel().setMsg("鏆傛椂涓嶆敮鎸佽灏忓尯鐨勪及浠�").markNoData()); return mav; } @@ -1989,13 +1989,13 @@ public class PropertyController { return mav; } else { evaluationService.remove(evaluation.getId()); - mav.setModel(BasicModel.buildOKModel().setMsg("暂时不支持该小区的估价").markNoData()); + mav.setModel(BasicModel.buildOKModel().setMsg("鏆傛椂涓嶆敮鎸佽灏忓尯鐨勪及浠�").markNoData()); return mav; } } /** - * 四川锦程 定制接口 多建筑年代 + * 鍥涘窛閿︾▼ 瀹氬埗鎺ュ彛 澶氬缓绛戝勾浠� * * @param model * @param request @@ -2009,11 +2009,11 @@ public class PropertyController { mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getName()) || StringUtils.isBlank(model.getDistrict()) || model.getSize() <= 0) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:城市,区域,小区名,面积(size)为必填项")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:鍩庡競,鍖哄煙,灏忓尯鍚�,闈㈢Н(size)涓哄繀濉」")); return mav; } - if (model.getCity().endsWith("市")) { - model.setCity(model.getCity().replaceAll("市$", "")); + if (model.getCity().endsWith("甯�")) { + model.setCity(model.getCity().replaceAll("甯�$", "")); } if (StringUtils.isNotBlank(request.getParameter("calDate"))) { Date calDate = null; @@ -2023,43 +2023,43 @@ public class PropertyController { } if (calDate == null) { - mav.setModel(BasicModel.buildBadRequestModel("calDate:数据类型不合法")); + mav.setModel(BasicModel.buildBadRequestModel("calDate:鏁版嵁绫诲瀷涓嶅悎娉�")); return mav; } else { model.setCalDate(calDate); } } - /* 先到CPDB库中查找小区 */ + /* 鍏堝埌CPDB搴撲腑鏌ユ壘灏忓尯 */ District district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(), "district"); if (district == null) { - mav.setModel(BasicModel.buildBadRequestModel("该小区不存在")); + mav.setModel(BasicModel.buildBadRequestModel("璇ュ皬鍖轰笉瀛樺湪")); return mav; } model.setName(district.getName()); if (model.getCarportPrice() != null && (model.getCarportPrice() < 0 || model.getCarportPrice() > 1000000)) { - mav.setModel(BasicModel.buildBadRequestModel("carportPrice(车位)取值不合法")); + mav.setModel(BasicModel.buildBadRequestModel("carportPrice(杞︿綅)鍙栧�间笉鍚堟硶")); return mav; } if (model.getMaxFloor() != null && (model.getMaxFloor() <= 0 || model.getMaxFloor() > 59)) { - mav.setModel(BasicModel.buildBadRequestModel("maxFloor取值非法,正确范围[1,60)")); + mav.setModel(BasicModel.buildBadRequestModel("maxFloor鍙栧�奸潪娉�,姝g‘鑼冨洿[1,60)")); return mav; } if (model.getFloor() != null && (model.getFloor() <= 0 || model.getFloor() > 59)) { - mav.setModel(BasicModel.buildBadRequestModel("floor取值非法,正确范围[1,60)")); + mav.setModel(BasicModel.buildBadRequestModel("floor鍙栧�奸潪娉�,姝g‘鑼冨洿[1,60)")); return mav; } if (model.getMaxFloor() != null && model.getFloor() != null && model.getFloor() > model.getMaxFloor()) { - mav.setModel(BasicModel.buildBadRequestModel("所在楼层不能大于总楼层")); + mav.setModel(BasicModel.buildBadRequestModel("鎵�鍦ㄦゼ灞備笉鑳藉ぇ浜庢�绘ゼ灞�")); return mav; } model.setRegion(district.getRegion()); model.setDistrictName(district.getName()); if (StringUtils.isBlank(model.getPropertyType())) { - if (district.getEstateType2() != null && district.getEstateType2().contains("别墅")) { + if (district.getEstateType2() != null && district.getEstateType2().contains("鍒")) { model.setPropertyType("1"); } } @@ -2108,7 +2108,7 @@ public class PropertyController { } - // 根据城市等 级设置D级可信度 + // 鏍规嵁鍩庡競绛� 绾ц缃瓺绾у彲淇″害 ApiUserAuthority apiUserAuthority = apiUserAuthorityService .findByUserId(Long.valueOf(evaluation.getFromUserId())); if (apiUserAuthority != null && null != apiUserAuthority.getCreditLevelStatus() @@ -2141,7 +2141,7 @@ public class PropertyController { districtPriceMap.put("avgPrice", (int) (lastPrice / evaluation.getArea())); } } else { - mav.setModel(BasicModel.buildOKModel().setMsg("暂时不支持该小区的估价").markNoData()); + mav.setModel(BasicModel.buildOKModel().setMsg("鏆傛椂涓嶆敮鎸佽灏忓尯鐨勪及浠�").markNoData()); return mav; } @@ -2158,7 +2158,7 @@ public class PropertyController { return mav; } else { evaluationService.remove(evaluation.getId()); - mav.setModel(BasicModel.buildOKModel().setMsg("暂时不支持该小区的估价").markNoData()); + mav.setModel(BasicModel.buildOKModel().setMsg("鏆傛椂涓嶆敮鎸佽灏忓尯鐨勪及浠�").markNoData()); return mav; } } @@ -2169,13 +2169,13 @@ public class PropertyController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (model.getFile() == null || model.getFile().isEmpty()) { - mav.setModel(BasicModel.buildBadRequestModel("请上传包含待评估数据的数据文件")); + mav.setModel(BasicModel.buildBadRequestModel("璇蜂笂浼犲寘鍚緟璇勪及鏁版嵁鐨勬暟鎹枃浠�")); return mav; } MultipartFile file = model.getFile(); if (StringUtils.isNotBlank(model.getCharset()) && Charset.isSupported(model.getCharset())) { - mav.setModel(BasicModel.buildBadRequestModel("字符编码不支持")); + mav.setModel(BasicModel.buildBadRequestModel("瀛楃缂栫爜涓嶆敮鎸�")); return mav; } else { model.setCharset("GBK"); @@ -2204,28 +2204,28 @@ public class PropertyController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(model.getId()) || !ObjectId.isValid(model.getId())) { - mav.setModel(BasicModel.buildBadRequestModel("任务id非法")); + mav.setModel(BasicModel.buildBadRequestModel("浠诲姟id闈炴硶")); return mav; } Map tokenMap = FangjiaApiUtil.parseToken(model.getToken()); String userId = tokenMap.get("userid"); BatchEvaluateTask task = batchEvaluateService.findBatchEvaluateTaskById(model.getId()); if (task == null || !task.getUserId().equals(userId)) { - mav.setModel(BasicModel.buildBadRequestModel("任务不存在")); + mav.setModel(BasicModel.buildBadRequestModel("浠诲姟涓嶅瓨鍦�")); return mav; } Map data = new HashMap(); data.put("status", task.getStatus()); if (BatchEvaluateTask.StatusEnum.INIT.getStatus() == task.getStatus()) { - data.put("msg", "待处理"); + data.put("msg", "寰呭鐞�"); } else if (BatchEvaluateTask.StatusEnum.DOING.getStatus() == task.getStatus()) { - data.put("msg", "处理中"); + data.put("msg", "澶勭悊涓�"); } else if (BatchEvaluateTask.StatusEnum.SUC.getStatus() == task.getStatus()) { - data.put("msg", "已完成"); + data.put("msg", "宸插畬鎴�"); data.put("downLink", "http://open.fangjia.com/property/downEvaluateResult?id=" + task.getId() + "&token=" + model.getToken()); } else if (BatchEvaluateTask.StatusEnum.ERROR.getStatus() == task.getStatus()) { - data.put("msg", "处理失败"); + data.put("msg", "澶勭悊澶辫触"); data.put("subMsg", task.getMsg()); } mav.setModel(BasicModel.buildOKModel().setResult(data)); @@ -2237,7 +2237,7 @@ public class PropertyController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(model.getId()) || !ObjectId.isValid(model.getId())) { - mav.setModel(BasicModel.buildBadRequestModel("任务id非法")); + mav.setModel(BasicModel.buildBadRequestModel("浠诲姟id闈炴硶")); return mav; } Map tokenMap = FangjiaApiUtil.parseToken(model.getToken()); @@ -2245,7 +2245,7 @@ public class PropertyController { String userId = tokenMap.get("userid"); BatchEvaluateTask task = batchEvaluateService.findBatchEvaluateTaskById(model.getId()); if (task == null || !task.getUserId().equals(userId)) { - mav.setModel(BasicModel.buildBadRequestModel("任务不存在")); + mav.setModel(BasicModel.buildBadRequestModel("浠诲姟涓嶅瓨鍦�")); return mav; } @@ -2257,7 +2257,7 @@ public class PropertyController { response.setContentType("application/x-gzip"); String fileName = DateUtil.formatToYYYYMMDDhhmmss(new Date()) + ".csv.gz"; response.setHeader("Content-Disposition", "attachment;filename=" + fileName); - os = response.getOutputStream();// 取得输出流 + os = response.getOutputStream();// 鍙栧緱杈撳嚭娴� os.write(data); os.flush(); } catch (Exception e) { @@ -2285,7 +2285,7 @@ public class PropertyController { response.setCharacterEncoding("UTF-8"); response.setContentType("text/csv"); response.setHeader("Content-Disposition", "attachment;filename=batchEvaluateTemplate.csv"); - os = response.getOutputStream();// 取得输出流 + os = response.getOutputStream();// 鍙栧緱杈撳嚭娴� String path = request.getSession().getServletContext().getRealPath("") + File.separator + "WEB-INF" + File.separator + "classes" + File.separator + "batchEvaluateTemplate.csv"; File template = new File(path); @@ -2318,24 +2318,24 @@ public class PropertyController { mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getName()) || StringUtils.isBlank(model.getDistrict()) || model.getSize() <= 0) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:城市,区域,小区名,面积(size)为必填项")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:鍩庡競,鍖哄煙,灏忓尯鍚�,闈㈢Н(size)涓哄繀濉」")); return mav; } District district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(), "shop"); if (district == null) { - mav.setModel(BasicModel.buildBadRequestModel("该小区不存在")); + mav.setModel(BasicModel.buildBadRequestModel("璇ュ皬鍖轰笉瀛樺湪")); return mav; } model.setName(district.getName()); if (model.getCarportPrice() != null && (model.getCarportPrice() < 0 || model.getCarportPrice() > 1000000)) { - mav.setModel(BasicModel.buildBadRequestModel("carportPrice(车位)取值不合法")); + mav.setModel(BasicModel.buildBadRequestModel("carportPrice(杞︿綅)鍙栧�间笉鍚堟硶")); return mav; } model.setRegion(district.getRegion()); model.setDistrictName(district.getName()); if (StringUtils.isBlank(model.getPropertyType())) { - if (district.getEstateType2() != null && district.getEstateType2().contains("别墅")) { + if (district.getEstateType2() != null && district.getEstateType2().contains("鍒")) { model.setPropertyType("1"); } } @@ -2357,7 +2357,7 @@ public class PropertyController { return mav; } else { evaluationService.remove(evaluation.getId()); - mav.setModel(BasicModel.buildOKModel().setMsg("暂时不支持该小区的估价")); + mav.setModel(BasicModel.buildOKModel().setMsg("鏆傛椂涓嶆敮鎸佽灏忓尯鐨勪及浠�")); return mav; } } @@ -2377,32 +2377,32 @@ public class PropertyController { mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getName()) || StringUtils.isBlank(model.getDistrict()) || model.getHouseType() <= 0) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:城市,区域,小区名,房型(houseType)为必填项")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:鍩庡競,鍖哄煙,灏忓尯鍚�,鎴垮瀷(houseType)涓哄繀濉」")); return mav; } - /* 先到CPDB库中查找小区 */ + /* 鍏堝埌CPDB搴撲腑鏌ユ壘灏忓尯 */ District district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(), "district"); if (district == null) { - mav.setModel(BasicModel.buildBadRequestModel("该小区不存在")); + mav.setModel(BasicModel.buildBadRequestModel("璇ュ皬鍖轰笉瀛樺湪")); return mav; } model.setName(district.getName()); if (model.getCarportPrice() != null && (model.getCarportPrice() < 0 || model.getCarportPrice() > 1000000)) { - mav.setModel(BasicModel.buildBadRequestModel("carportPrice(车位)取值不合法")); + mav.setModel(BasicModel.buildBadRequestModel("carportPrice(杞︿綅)鍙栧�间笉鍚堟硶")); return mav; } model.setRegion(district.getRegion()); model.setDistrictName(district.getName()); if (StringUtils.isBlank(model.getPropertyType())) { - if (district.getEstateType2() != null && district.getEstateType2().contains("别墅")) { + if (district.getEstateType2() != null && district.getEstateType2().contains("鍒")) { model.setPropertyType("1"); } } List evaluations = evaluationService.histroyRent(district, buildEvaluation(model, request), 1, model.getHouseType()); if (evaluations.isEmpty()) { - mav.setModel(BasicModel.buildOKModel().setMsg("暂无租金")); + mav.setModel(BasicModel.buildOKModel().setMsg("鏆傛棤绉熼噾")); } else { Evaluation evaluation = evaluations.get(0); JSONObject item = new JSONObject(); @@ -2422,25 +2422,25 @@ public class PropertyController { mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getName()) || StringUtils.isBlank(model.getDistrict()) || model.getHouseType() <= 0) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:城市,区域,小区名,房型(houseType)为必填项")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:鍩庡競,鍖哄煙,灏忓尯鍚�,鎴垮瀷(houseType)涓哄繀濉」")); return mav; } - /* 先到CPDB库中查找小区 */ + /* 鍏堝埌CPDB搴撲腑鏌ユ壘灏忓尯 */ District district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(), "district"); if (district == null) { - mav.setModel(BasicModel.buildBadRequestModel("该小区不存在")); + mav.setModel(BasicModel.buildBadRequestModel("璇ュ皬鍖轰笉瀛樺湪")); return mav; } model.setName(district.getName()); if (model.getCarportPrice() != null && (model.getCarportPrice() < 0 || model.getCarportPrice() > 1000000)) { - mav.setModel(BasicModel.buildBadRequestModel("carportPrice(车位)取值不合法")); + mav.setModel(BasicModel.buildBadRequestModel("carportPrice(杞︿綅)鍙栧�间笉鍚堟硶")); return mav; } model.setRegion(district.getRegion()); model.setDistrictName(district.getName()); if (StringUtils.isBlank(model.getPropertyType())) { - if (district.getEstateType2() != null && district.getEstateType2().contains("别墅")) { + if (district.getEstateType2() != null && district.getEstateType2().contains("鍒")) { model.setPropertyType("1"); } } @@ -2448,7 +2448,7 @@ public class PropertyController { model.setPeriodCount(1); } if (model.getPeriodCount() < 1 || model.getPeriodCount() > 156) { - mav.setModel(BasicModel.buildBadRequestModel("periodCount值不合法,取值范围是:[1-156]")); + mav.setModel(BasicModel.buildBadRequestModel("periodCount鍊间笉鍚堟硶,鍙栧�艰寖鍥存槸锛歔1-156]")); return mav; } @@ -2482,26 +2482,26 @@ public class PropertyController { mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getName()) || StringUtils.isBlank(model.getDistrict()) || model.getSize() <= 0) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:城市,区域,小区名,面积(size)为必填项")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:鍩庡競,鍖哄煙,灏忓尯鍚�,闈㈢Н(size)涓哄繀濉」")); return mav; } - /* 先到CPDB库中查找小区 */ + /* 鍏堝埌CPDB搴撲腑鏌ユ壘灏忓尯 */ District district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(), "district"); if (district == null) { - mav.setModel(BasicModel.buildBadRequestModel("该小区不存在")); + mav.setModel(BasicModel.buildBadRequestModel("璇ュ皬鍖轰笉瀛樺湪")); return mav; } model.setName(district.getName()); if (model.getCarportPrice() != null && (model.getCarportPrice() < 0 || model.getCarportPrice() > 1000000)) { - mav.setModel(BasicModel.buildBadRequestModel("carportPrice(车位)取值不合法")); + mav.setModel(BasicModel.buildBadRequestModel("carportPrice(杞︿綅)鍙栧�间笉鍚堟硶")); return mav; } model.setRegion(district.getRegion()); model.setDistrictName(district.getName()); if (StringUtils.isBlank(model.getPropertyType())) { - if (district.getEstateType2() != null && district.getEstateType2().contains("别墅")) { + if (district.getEstateType2() != null && district.getEstateType2().contains("鍒")) { model.setPropertyType("1"); } } @@ -2509,14 +2509,14 @@ public class PropertyController { model.setPeriodCount(1); } if (model.getPeriodCount() < 1 || model.getPeriodCount() > 156) { - mav.setModel(BasicModel.buildBadRequestModel("periodCount值不合法,取值范围是:[1-156]")); + mav.setModel(BasicModel.buildBadRequestModel("periodCount鍊间笉鍚堟硶,鍙栧�艰寖鍥存槸锛歔1-156]")); return mav; } if (StringUtils.isBlank(model.getPeriodType())) { model.setPeriodType("weekly"); } else { if (!"weekly".equals(model.getPeriodType()) && !"monthly".equals(model.getPeriodType())) { - mav.setModel(BasicModel.buildBadRequestModel("periodModel值非法,合法值为:weekly,monthly")); + mav.setModel(BasicModel.buildBadRequestModel("periodModel鍊奸潪娉曪紝鍚堟硶鍊间负:weekly,monthly")); return mav; } } @@ -2561,27 +2561,27 @@ public class PropertyController { mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getName()) || StringUtils.isBlank(model.getDistrict())) { - mav.setModel(BasicModel.buildBadRequestModel("参数缺失:city(城市),district(区域),name(小区名)是必须参数")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟缂哄け:city(鍩庡競),district(鍖哄煙),name(灏忓尯鍚�)鏄繀椤诲弬鏁�")); return mav; } District district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(), "district"); if (null == district) { - mav.setModel(BasicModel.buildBadRequestModel("该小区不存在")); + mav.setModel(BasicModel.buildBadRequestModel("璇ュ皬鍖轰笉瀛樺湪")); return mav; } if (model.getPeriodCount() == null) { model.setPeriodCount(1); } if (model.getPeriodCount() < 1 || model.getPeriodCount() > 156) { - mav.setModel(BasicModel.buildBadRequestModel("periodCount值不合法,取值范围是:[1-156]")); + mav.setModel(BasicModel.buildBadRequestModel("periodCount鍊间笉鍚堟硶,鍙栧�艰寖鍥存槸锛歔1-156]")); return mav; } if (StringUtils.isBlank(model.getPeriodType())) { model.setPeriodType("weekly"); } else { if (!"weekly".equals(model.getPeriodType()) && !"monthly".equals(model.getPeriodType())) { - mav.setModel(BasicModel.buildBadRequestModel("periodModel值非法,合法值为:weekly,monthly")); + mav.setModel(BasicModel.buildBadRequestModel("periodModel鍊奸潪娉曪紝鍚堟硶鍊间负:weekly,monthly")); return mav; } } @@ -2652,7 +2652,7 @@ public class PropertyController { } /** - * 小区租金查询接口 + * 灏忓尯绉熼噾鏌ヨ鎺ュ彛 * * @param model * @return @@ -2662,34 +2662,34 @@ public class PropertyController { mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getName()) || StringUtils.isBlank(model.getDistrict())) { - mav.setModel(BasicModel.buildBadRequestModel("参数缺失:city(城市),district(区域),name(小区名)是必须参数")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟缂哄け:city(鍩庡競),district(鍖哄煙),name(灏忓尯鍚�)鏄繀椤诲弬鏁�")); return mav; } District district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(), "district"); if (null == district) { - mav.setModel(BasicModel.buildBadRequestModel("小区不存在")); + mav.setModel(BasicModel.buildBadRequestModel("灏忓尯涓嶅瓨鍦�")); return mav; } if (model.getPeriodCount() == null) { model.setPeriodCount(1); } if (model.getPeriodCount() < 1 || model.getPeriodCount() > 156) { - mav.setModel(BasicModel.buildBadRequestModel("periodCount值不合法,取值范围是:[1-156]")); + mav.setModel(BasicModel.buildBadRequestModel("periodCount鍊间笉鍚堟硶,鍙栧�艰寖鍥存槸锛歔1-156]")); return mav; } if (model.getHouseType() == null || model.getHouseType() < 1) { - mav.setModel(BasicModel.buildBadRequestModel("房屋类型不合法")); + mav.setModel(BasicModel.buildBadRequestModel("鎴垮眿绫诲瀷涓嶅悎娉�")); return mav; } - String estateType2 = "小区"; - if (district.getEstateType2().contains("别墅")) { - estateType2 = "别墅"; + String estateType2 = "灏忓尯"; + if (district.getEstateType2().contains("鍒")) { + estateType2 = "鍒"; } List rents = districtStatRentService.findAllByDistrictKeyAndHouseType( new DistrictKey(district), model.getHouseType(), estateType2, model.getPeriodCount()); - if (rents.isEmpty() && estateType2.equals("别墅")) { - estateType2 = "小区"; + if (rents.isEmpty() && estateType2.equals("鍒")) { + estateType2 = "灏忓尯"; rents = districtStatRentService.findAllByDistrictKeyAndHouseType(new DistrictKey(district), model.getHouseType(), estateType2, model.getPeriodCount()); } @@ -2710,9 +2710,9 @@ public class PropertyController { } /** - * 平米租金 - * cat 表示租金类型 - * city:城市 , region : 区域 ,district :小区 + * 骞崇背绉熼噾 + * cat 琛ㄧず绉熼噾绫诲瀷 + * city锛氬煄甯� , region 锛� 鍖哄煙 ,district 锛氬皬鍖� * * @param model * @return @@ -2722,19 +2722,19 @@ public class PropertyController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(model.getCat())) { - mav.setModel(BasicModel.buildBadRequestModel("参数缺失:cat(租金类型)是必须参数")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟缂哄け:cat(绉熼噾绫诲瀷)鏄繀椤诲弬鏁�")); return mav; } if ("city".equals(model.getCat()) && StringUtils.isBlank(model.getCity())) { - mav.setModel(BasicModel.buildBadRequestModel("城市平米租金,city(城市)是必须参数")); + mav.setModel(BasicModel.buildBadRequestModel("鍩庡競骞崇背绉熼噾,city(鍩庡競)鏄繀椤诲弬鏁�")); return mav; } if ("region".equals(model.getCat()) && (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getDistrict()))) { - mav.setModel(BasicModel.buildBadRequestModel("区域平米租金,city(城市),district(区域)是必须参数")); + mav.setModel(BasicModel.buildBadRequestModel("鍖哄煙骞崇背绉熼噾,city(鍩庡競),district(鍖哄煙)鏄繀椤诲弬鏁�")); return mav; } if ("district".equals(model.getCat()) && (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getDistrict()) || StringUtils.isBlank(model.getName()))) { - mav.setModel(BasicModel.buildBadRequestModel("小区平米租金,city(城市),district(区域),name(小区名)是必须参数")); + mav.setModel(BasicModel.buildBadRequestModel("灏忓尯骞崇背绉熼噾,city(鍩庡競),district(鍖哄煙),name(灏忓尯鍚�)鏄繀椤诲弬鏁�")); return mav; } District district = null; @@ -2742,7 +2742,7 @@ public class PropertyController { district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(), "district"); if (null == district) { - mav.setModel(BasicModel.buildBadRequestModel("小区不存在")); + mav.setModel(BasicModel.buildBadRequestModel("灏忓尯涓嶅瓨鍦�")); return mav; } } @@ -2750,7 +2750,7 @@ public class PropertyController { model.setPeriodCount(1); } if (model.getPeriodCount() < 1 || model.getPeriodCount() > 156) { - mav.setModel(BasicModel.buildBadRequestModel("periodCount值不合法,取值范围是:[1-156]")); + mav.setModel(BasicModel.buildBadRequestModel("periodCount鍊间笉鍚堟硶,鍙栧�艰寖鍥存槸锛歔1-156]")); return mav; } Date startDate = DateUtil.add(new Date(), Calendar.MONTH, -model.getPeriodCount()); @@ -2776,16 +2776,16 @@ public class PropertyController { RestfulModelAndView mav = new RestfulModelAndView(); model.setCity(RegionData.formatCity(model.getCity())); if (StringUtils.isBlank(model.getCity())) { - mav.setModel(BasicModel.buildBadRequestModel("city(城市)不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("city(鍩庡競)涓嶈兘涓虹┖")); return mav; } model.setDistrict(RegionData.formatRegion(model.getCity(), model.getDistrict())); if (StringUtils.isBlank(model.getDistrict())) { - mav.setModel(BasicModel.buildBadRequestModel("district(区域)不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("district(鍖哄煙)涓嶈兘涓虹┖")); return mav; } if (StringUtils.isBlank(model.getName())) { - mav.setModel(BasicModel.buildBadRequestModel("name(小区名)不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("name(灏忓尯鍚�)涓嶈兘涓虹┖")); return mav; } DistrictAnalyData districtAnalyData = districtAnalyDataService @@ -2803,7 +2803,7 @@ public class PropertyController { } mav.setModel(BasicModel.buildOKModel().setResult(dto)); } else { - mav.setModel(BasicModel.buildOKModel().setMsg("暂无该小区排名信息")); + mav.setModel(BasicModel.buildOKModel().setMsg("鏆傛棤璇ュ皬鍖烘帓鍚嶄俊鎭�")); } return mav; @@ -2811,7 +2811,7 @@ public class PropertyController { /** - * 小区成交记录查询 + * 灏忓尯鎴愪氦璁板綍鏌ヨ * * @param model * @return @@ -2821,15 +2821,15 @@ public class PropertyController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity())) { - mav.setModel(BasicModel.buildBadRequestModel("city(城市)不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("city(鍩庡競)涓嶈兘涓虹┖")); return mav; } if (StringUtils.isBlank(model.getDistrict())) { - mav.setModel(BasicModel.buildBadRequestModel("district(区域)不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("district(鍖哄煙)涓嶈兘涓虹┖")); return mav; } if (StringUtils.isBlank(model.getName())) { - mav.setModel(BasicModel.buildBadRequestModel("name(小区名)不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("name(灏忓尯鍚�)涓嶈兘涓虹┖")); return mav; } District district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(), @@ -2853,10 +2853,10 @@ public class PropertyController { if (StringUtils.isNotBlank(masterDistrictName)) { List districts; if ("master".equals(masterDistrictName)) { - // 所有的分期数据 + // 鎵�鏈夌殑鍒嗘湡鏁版嵁 districts = districtService.findSlaves(model.getCity(), model.getDistrict(), model.getName()); } else { - // 根据主小区名查询所有名称 + // 鏍规嵁涓诲皬鍖哄悕鏌ヨ鎵�鏈夊悕绉� districts = districtService.findSlaves(model.getCity(), model.getDistrict(), masterDistrictName); } if (CollectionUtils.isNotEmpty(districts)) { @@ -2865,14 +2865,14 @@ public class PropertyController { } } - // districtNames 不包含 主小区名,加进去 + // districtNames 涓嶅寘鍚� 涓诲皬鍖哄悕锛屽姞杩涘幓 if (!districtNames.contains(masterDistrictName)) { districtNames.add(masterDistrictName); } } } - // 将搜房中的别名与名称加入查询集合 + // 灏嗘悳鎴夸腑鐨勫埆鍚嶄笌鍚嶇О鍔犲叆鏌ヨ闆嗗悎 try { List aliasFangs = aliasFangService.findFangByNameAndAlias(model.getCity(), model.getDistrict(), districtNames); Set aliasSet = new HashSet(); @@ -2891,7 +2891,7 @@ public class PropertyController { // List dealPrices = new ArrayList(); - // 将主名与映射别名查得成交加入 存在不能查出最新成交问题 + // 灏嗕富鍚嶄笌鏄犲皠鍒悕鏌ュ緱鎴愪氦鍔犲叆 瀛樺湪涓嶈兘鏌ュ嚭鏈�鏂版垚浜ら棶棰� // for (String name : districtNames) { // List dealPricesTempList = findDealPricesByName(model.getCity(), model.getDistrict(), name, model.getMax() * 5, model); // if (CollectionUtils.isNotEmpty(dealPricesTempList)) { @@ -3007,25 +3007,25 @@ public class PropertyController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity())) { - mav.setModel(BasicModel.buildBadRequestModel("city(城市)不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("city(鍩庡競)涓嶈兘涓虹┖")); return mav; } if (StringUtils.isBlank(model.getDistrict())) { - mav.setModel(BasicModel.buildBadRequestModel("district(区域)不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("district(鍖哄煙)涓嶈兘涓虹┖")); return mav; } if (StringUtils.isBlank(model.getName())) { - mav.setModel(BasicModel.buildBadRequestModel("name(小区名)不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("name(灏忓尯鍚�)涓嶈兘涓虹┖")); return mav; } if (null == model.getSize()) { - mav.setModel(BasicModel.buildBadRequestModel("size(面积)不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("size(闈㈢Н)涓嶈兘涓虹┖")); return mav; } District district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName().replace(" ", ""), "district"); if (null == district) { - mav.setModel(BasicModel.buildBadRequestModel("该小区不存在")); + mav.setModel(BasicModel.buildBadRequestModel("璇ュ皬鍖轰笉瀛樺湪")); return mav; } if (model.getMax() == null || model.getMax() < 1) { @@ -3034,7 +3034,7 @@ public class PropertyController { model.setMax(100); } FacetQueryResult houseList = findDistrictHouses(district, model.getMax() * 5); - if (houseList == null || houseList.isEmpty()) {// 通知API没有找到房源 + if (houseList == null || houseList.isEmpty()) {// 閫氱煡API娌℃湁鎵惧埌鎴挎簮 String cat = "sell"; String source = ""; ApiUser apiUser = checkNewAuthorized(model.getToken()); @@ -3045,7 +3045,7 @@ public class PropertyController { } } else { - source = "api调用"; + source = "api璋冪敤"; } NoHouseDistrict noHouseDistrict = noHouseDistrictService.findNoHouseDistrictByParams(district.getCity(), @@ -3094,7 +3094,7 @@ public class PropertyController { } /** - * 通过EvaluationModel组装Evaluation实体 + * 閫氳繃EvaluationModel缁勮Evaluation瀹炰綋 * * @param model * @param request @@ -3235,7 +3235,7 @@ public class PropertyController { /** - * 批量获取小区的均价,均价走势数据 + * 鎵归噺鑾峰彇灏忓尯鐨勫潎浠凤紝鍧囦环璧板娍鏁版嵁 * * @param request * @return @@ -3247,16 +3247,16 @@ public class PropertyController { JSONObject jo = getJsonParam(request); if (jo == null || !jo.containsKey("property") || jo.getJSONArray("property").size() == 0) { - mav.setModel(BasicModel.buildBadRequestModel("参数格式错误")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟鏍煎紡閿欒")); return mav; } JSONArray ja = jo.getJSONArray("property"); if (ja.size() > 12) { - mav.setModel(BasicModel.buildBadRequestModel("批量查询小区数超过上限")); + mav.setModel(BasicModel.buildBadRequestModel("鎵归噺鏌ヨ灏忓尯鏁拌秴杩囦笂闄�")); return mav; } - JSONArray jsonArray = new JSONArray();// 结果集 + JSONArray jsonArray = new JSONArray();// 缁撴灉闆� boolean hasData = false; for (Object o : ja) { JSONObject subJo = (JSONObject) o; @@ -3272,7 +3272,7 @@ public class PropertyController { district = districtService.findById(id); } else { if (StringUtils.isBlank(city) || StringUtils.isBlank(region) || StringUtils.isBlank(name)) { - mav.setModel(BasicModel.buildBadRequestModel("参数格式错误")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟鏍煎紡閿欒")); return mav; } district = districtService.findByNameAndAlias(city, region, name, "district"); @@ -3287,7 +3287,7 @@ public class PropertyController { resultJo.put("district", district.getRegion()); resultJo.put("name", district.getName()); - int monthCountOfYear = 12;// 一年12个月 + int monthCountOfYear = 12;// 涓�骞�12涓湀 List districtSellStats = districtSellStatService.getAllWithMonths(district.getCity(), district.getRegion(), district.getName(), monthCountOfYear); if (CollectionUtils.isNotEmpty(districtSellStats)) { @@ -3340,7 +3340,7 @@ public class PropertyController { mav.setViewType("rest"); District district = districtService.findById(model.getId()); if (district == null) { - mav.setModel(BasicModel.buildBadRequestModel("未找到该小区")); + mav.setModel(BasicModel.buildBadRequestModel("鏈壘鍒拌灏忓尯")); return mav; } List srcFloorPlanPics = district.getSrcFloorplanPics(); @@ -3377,7 +3377,7 @@ public class PropertyController { } /** - * 批量获取小区的配套数据,最多12个小区 + * 鎵归噺鑾峰彇灏忓尯鐨勯厤濂楁暟鎹紝鏈�澶�12涓皬鍖� * * @param request * @return @@ -3388,27 +3388,27 @@ public class PropertyController { JSONObject jo = getJsonParam(request); if (jo == null || !jo.containsKey("property") || jo.getJSONArray("property").size() == 0) { - mav.setModel(BasicModel.buildBadRequestModel("参数格式错误")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟鏍煎紡閿欒")); return mav; } - // 查询半径 ,默认1000米,最大5000米 + // 鏌ヨ鍗婂緞 ,榛樿1000绫筹紝鏈�澶�5000绫� Double radius = getRadius(jo); if (radius == null) { - mav.setModel(BasicModel.buildBadRequestModel("查询半径(radius)非法")); + mav.setModel(BasicModel.buildBadRequestModel("鏌ヨ鍗婂緞(radius)闈炴硶")); return mav; } Integer maxNum = getNum(jo); if (maxNum == null) { - mav.setModel(BasicModel.buildBadRequestModel("最大记录数(num)非法")); + mav.setModel(BasicModel.buildBadRequestModel("鏈�澶ц褰曟暟(num)闈炴硶")); return mav; } JSONArray ja = jo.getJSONArray("property"); if (ja.size() > 12) { - mav.setModel(BasicModel.buildBadRequestModel("批量查询小区数超过上限")); + mav.setModel(BasicModel.buildBadRequestModel("鎵归噺鏌ヨ灏忓尯鏁拌秴杩囦笂闄�")); return mav; } - JSONArray jsonArray = new JSONArray();// 结果集 + JSONArray jsonArray = new JSONArray();// 缁撴灉闆� boolean hasData = false; for (Object o : ja) { JSONObject subJo = (JSONObject) o; @@ -3422,7 +3422,7 @@ public class PropertyController { district = districtService.findById(id); } else { if (StringUtils.isBlank(city) || StringUtils.isBlank(region) || StringUtils.isBlank(name)) { - mav.setModel(BasicModel.buildBadRequestModel("参数格式错误")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟鏍煎紡閿欒")); return mav; } district = districtService.findByNameAndAlias(city, region, name, "district"); @@ -3441,13 +3441,13 @@ public class PropertyController { double lat = district.getLat2() / 10000000000d; double lng = district.getLng2() / 10000000000d; - // 查询小区周边(所有类型) + // 鏌ヨ灏忓尯鍛ㄨ竟锛堟墍鏈夌被鍨嬶級 List arrs = baiduApiService.searchNearbyLocalDatabase(district, radius); Map> districtAroundMap = Maps.newHashMap(); Map districtAroundCountMap = Maps.newHashMap(); for (String key : AROUND_KEYWORD_FACTOR_NEW.keySet()) { - districtAroundMap.put(AROUND_KEYWORD_FACTOR_NEW.get(key), new ArrayList());// 把key的英文put到map并把value设置为一个List引用 + districtAroundMap.put(AROUND_KEYWORD_FACTOR_NEW.get(key), new ArrayList());// 鎶妅ey鐨勮嫳鏂噋ut鍒癿ap骞舵妸value璁剧疆涓轰竴涓狶ist寮曠敤 } for (int i = 0; i < arrs.size(); i++) { BaiduPlacePoi poiObj = arrs.get(i); @@ -3466,20 +3466,20 @@ public class PropertyController { dto.setLng(lngjs); dto.setDistance((int) GeoUtils.calculateDistance(lng, lat, lngjs, latjs)); if (districtAroundMap.get(key) != null) { - districtAroundMap.get(key).add(dto);// 按key值取出list add 周边名称已经经纬度 + districtAroundMap.get(key).add(dto);// 鎸塳ey鍊煎彇鍑簂ist add 鍛ㄨ竟鍚嶇О宸茬粡缁忕含搴� } } - // 周边公交、地铁 + // 鍛ㄨ竟鍏氦銆佸湴閾� Map> stationMap = busStationService.getNearByStations(district.getCity(), lat, lng, radius); - addToDistrictAroundMap(districtAroundMap, stationMap, district, "公交"); - addToDistrictAroundMap(districtAroundMap, stationMap, district, "地铁"); + addToDistrictAroundMap(districtAroundMap, stationMap, district, "鍏氦"); + addToDistrictAroundMap(districtAroundMap, stationMap, district, "鍦伴搧"); - // 根据maxNum参数过滤返回值数量,并由近及远排序 + // 鏍规嵁maxNum鍙傛暟杩囨护杩斿洖鍊兼暟閲忥紝骞剁敱杩戝強杩滄帓搴� filterAndSortResult(districtAroundMap, districtAroundCountMap, maxNum); - // 封装成需要的返回格式 + // 灏佽鎴愰渶瑕佺殑杩斿洖鏍煎紡 for (Map.Entry> entry : districtAroundMap.entrySet()) { String key = entry.getKey(); List listVal = entry.getValue(); @@ -3522,7 +3522,7 @@ public class PropertyController { } /** - * 获取JSON参数中的num参数值 + * 鑾峰彇JSON鍙傛暟涓殑num鍙傛暟鍊� * * @param jo * @return @@ -3547,7 +3547,7 @@ public class PropertyController { } /** - * 获取JSON参数中的radius值 + * 鑾峰彇JSON鍙傛暟涓殑radius鍊� * * @param jo * @return @@ -3570,7 +3570,7 @@ public class PropertyController { private void addToDistrictAroundMap(Map> districtAroundMap, Map> stationMap, District district, String type) { List busList = stationMap.get(type); - Set stationCache = Sets.newHashSet();// 记录是否有重复站点 + Set stationCache = Sets.newHashSet();// 璁板綍鏄惁鏈夐噸澶嶇珯鐐� List aroundDtos = Lists.newArrayList(); double lat = district.getLat2() / 10000000000d; double lng = district.getLng2() / 10000000000d; @@ -3594,15 +3594,15 @@ public class PropertyController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity())) { - mav.setModel(BasicModel.buildBadRequestModel("city(城市)不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("city(鍩庡競)涓嶈兘涓虹┖")); return mav; } if (StringUtils.isBlank(model.getKeyword())) { - mav.setModel(BasicModel.buildBadRequestModel("keyword(关键词)不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("keyword(鍏抽敭璇�)涓嶈兘涓虹┖")); return mav; } if (StringUtils.isBlank(model.getUnitNumber())) { - mav.setModel(BasicModel.buildBadRequestModel("unitNumber(室号)不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("unitNumber(瀹ゅ彿)涓嶈兘涓虹┖")); return mav; } @@ -3655,7 +3655,7 @@ public class PropertyController { } /** - * 把房价通估价,房价网估价以及房子信息转成房子信息 + * 鎶婃埧浠烽�氫及浠凤紝鎴夸环缃戜及浠蜂互鍙婃埧瀛愪俊鎭浆鎴愭埧瀛愪俊鎭� * * @param in * @param district @@ -3874,7 +3874,7 @@ public class PropertyController { if (model.getHall() != null) { params.add(new QueryParam("hall", model.getHall())); } - // 18年之后抓住的数据没有score字段 + // 18骞翠箣鍚庢姄浣忕殑鏁版嵁娌℃湁score瀛楁 // params.add(new QueryParam("score", QueryParam.GREATER_THAN_OPERATOR, 200000000000l)); List dealPrices = dealPriceService.findDealPrices(params, max); List distinctDealPrices = new ArrayList(); @@ -3901,7 +3901,7 @@ public class PropertyController { if (model.getHall() != null) { params.add(new QueryParam("hall", model.getHall())); } - // 18年之后抓住的数据没有score字段 + // 18骞翠箣鍚庢姄浣忕殑鏁版嵁娌℃湁score瀛楁 // params.add(new QueryParam("score", QueryParam.GREATER_THAN_OPERATOR, 200000000000l)); List dealPrices = dealPriceService.findDealPrices(params, max); List distinctDealPrices = new ArrayList(); @@ -3967,7 +3967,7 @@ public class PropertyController { } /** - * ????С????? + * ????小????? * * @param district * @return @@ -3977,7 +3977,7 @@ public class PropertyController { } /** - * 新版token验证 + * 鏂扮増token楠岃瘉 * * @param token * @return @@ -3987,7 +3987,7 @@ public class PropertyController { if (tokenMap == null) { return null; } - // token验证后,拿取出的字段再去数据库验证一遍 + // token楠岃瘉鍚庯紝鎷垮彇鍑虹殑瀛楁鍐嶅幓鏁版嵁搴撻獙璇佷竴閬� if (StringUtils.isNotBlank(tokenMap.get("userid")) && !"null".equals(tokenMap.get("userid"))) { List params = new ArrayList(); params.add(new QueryParam("ID", tokenMap.get("userid"))); @@ -4104,9 +4104,9 @@ public class PropertyController { } } if (house.getPublishDate() == null) { - b.setPublishDate("");// 发布时间 + b.setPublishDate("");// 鍙戝竷鏃堕棿 } else { - b.setPublishDate(DateUtil.formatByPattern(house.getPublishDate(), "yyyy-MM-dd"));// 发布时间 + b.setPublishDate(DateUtil.formatByPattern(house.getPublishDate(), "yyyy-MM-dd"));// 鍙戝竷鏃堕棿 } b.setSource(getDomainName(house.getUrl())); if (HouseValidator.validateBuildingType(house.getBuildType())) { @@ -4125,29 +4125,29 @@ public class PropertyController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity())) { - mav.setModel(BasicModel.buildBadRequestModel("city(城市)不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("city(鍩庡競)涓嶈兘涓虹┖")); return mav; } if (StringUtils.isBlank(model.getDistrict())) { - mav.setModel(BasicModel.buildBadRequestModel("district(区域)不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("district(鍖哄煙)涓嶈兘涓虹┖")); return mav; } if (StringUtils.isBlank(model.getName())) { - mav.setModel(BasicModel.buildBadRequestModel("name(小区名)不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("name(灏忓尯鍚�)涓嶈兘涓虹┖")); return mav; } if (0 >= model.getSize()) { - mav.setModel(BasicModel.buildBadRequestModel("size(面积)不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("size(闈㈢Н)涓嶈兘涓虹┖")); return mav; } - // 在库中找到对应的小区 + // 鍦ㄥ簱涓壘鍒板搴旂殑灏忓尯 District district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(), "district"); if (district == null) { - mav.setModel(BasicModel.buildBadRequestModel("该小区不存在")); + mav.setModel(BasicModel.buildBadRequestModel("璇ュ皬鍖轰笉瀛樺湪")); return mav; } - // 查找均价 + // 鏌ユ壘鍧囦环 List districtStats = districtStatService.findAllDistrictStatsSort(district.getCity(), district.getRegion(), district.getName(), model.getCalDate()); Integer districtAvg = 0; @@ -4161,7 +4161,7 @@ public class PropertyController { List listHouse = similarCommMethod(model, "similar", district); for (House house : listHouse) { long temp = Math.round(house.getTotalPrice() / house.getArea()); - // 均价范围在0.8~1.2 + // 鍧囦环鑼冨洿鍦�0.8~1.2 if (temp > districtAvg * 1.3 || temp < districtAvg * 0.7) { continue; } @@ -4170,7 +4170,7 @@ public class PropertyController { } if (count == 0) { - mav.setModel(BasicModel.buildOKModel().setMsg("该小区无均价")); + mav.setModel(BasicModel.buildOKModel().setMsg("璇ュ皬鍖烘棤鍧囦环")); return mav; } avgPrice = avgPrice / count; @@ -4185,7 +4185,7 @@ public class PropertyController { return mav; } - // 寻找相似房源 + // 瀵绘壘鐩镐技鎴挎簮 public List similarCommMethod(PropertyEvaluationModel model, String kind, District district) { model.setName(district.getName()); model.setRegion(district.getRegion()); @@ -4239,14 +4239,14 @@ public class PropertyController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity())) { - mav.setModel(BasicModel.buildBadRequestModel("city(城市)不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("city(鍩庡競)涓嶈兘涓虹┖")); return mav; } - if (!"全国".equals(model.getCity())) { + if (!"鍏ㄥ浗".equals(model.getCity())) { if (!RegionData.isCity(model.getCity())) { String city = RegionData.formatCity(model.getCity()); if (null == city) { - mav.setModel(BasicModel.buildBadRequestModel("非法城市:" + model.getCity())); + mav.setModel(BasicModel.buildBadRequestModel("闈炴硶鍩庡競:" + model.getCity())); return mav; } else { model.setCity(city); @@ -4259,7 +4259,7 @@ public class PropertyController { } if (StringUtils.isBlank(model.getKeyword())) { - mav.setModel(BasicModel.buildBadRequestModel("keyword(关键字)不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("keyword(鍏抽敭瀛�)涓嶈兘涓虹┖")); return mav; } @@ -4267,13 +4267,13 @@ public class PropertyController { if (StringUtils.isNotBlank(model.getFilter())) { type = model.getFilter(); } - //强行启用小区库 + //寮鸿鍚敤灏忓尯搴� if ("true".equals(model.getUseSeaweed())) { if (model.getMax() == null || model.getMax() < 1 || model.getMax() > 100) { model.setMax(10); } List params = new ArrayList(); - if (!"全国".equals(model.getCity())) { + if (!"鍏ㄥ浗".equals(model.getCity())) { params.add(new QueryParam("city", model.getCity())); } if (StringUtils.isNotBlank(model.getDistrict())) { @@ -4286,7 +4286,7 @@ public class PropertyController { if (model.getUseOrQuery()) { params.add(new QueryParam("$fangjiawang_query_type", "or")); } - // 2017-11-02新增, 指定查询字段,以:分割为多个字段查询,处理pds搜索问题,不指定默认用keyword查询 + // 2017-11-02鏂板锛� 鎸囧畾鏌ヨ瀛楁锛屼互:鍒嗗壊涓哄涓瓧娈垫煡璇紝澶勭悊pds鎼滅储闂锛屼笉鎸囧畾榛樿鐢╧eyword鏌ヨ String queryFields = model.getQueryField(); if (StringUtils.isNotBlank(queryFields) && queryFields.contains(":")) { String[] fs = queryFields.split(":"); @@ -4347,7 +4347,7 @@ public class PropertyController { } if(result.isEmpty()){ List params = new ArrayList(); - if (!"全国".equals(model.getCity())) { + if (!"鍏ㄥ浗".equals(model.getCity())) { params.add(new QueryParam("city", model.getCity())); } if (StringUtils.isNotBlank(model.getDistrict())) { @@ -4360,7 +4360,7 @@ public class PropertyController { if (model.getUseOrQuery()) { params.add(new QueryParam("$fangjiawang_query_type", "or")); } - // 2017-11-02新增, 指定查询字段,以:分割为多个字段查询,处理pds搜索问题,不指定默认用keyword查询 + // 2017-11-02鏂板锛� 鎸囧畾鏌ヨ瀛楁锛屼互:鍒嗗壊涓哄涓瓧娈垫煡璇紝澶勭悊pds鎼滅储闂锛屼笉鎸囧畾榛樿鐢╧eyword鏌ヨ String queryFields = model.getQueryField(); if (StringUtils.isNotBlank(queryFields) && queryFields.contains(":")) { String[] fs = queryFields.split(":"); @@ -4408,7 +4408,7 @@ public class PropertyController { } /** - * 解析出关键字中的小区名 + * 瑙f瀽鍑哄叧閿瓧涓殑灏忓尯鍚� * * @param keyword * @return @@ -4435,25 +4435,25 @@ public class PropertyController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity())) { - mav.setModel(BasicModel.buildBadRequestModel("city(城市)不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("city(鍩庡競)涓嶈兘涓虹┖")); return mav; } if (StringUtils.isBlank(model.getDistrict())) { - mav.setModel(BasicModel.buildBadRequestModel("district(区域)不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("district(鍖哄煙)涓嶈兘涓虹┖")); return mav; } if (StringUtils.isBlank(model.getName())) { - mav.setModel(BasicModel.buildBadRequestModel("name(小区名)不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("name(灏忓尯鍚�)涓嶈兘涓虹┖")); return mav; } if (0 >= model.getSize()) { - mav.setModel(BasicModel.buildBadRequestModel("size(面积)不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("size(闈㈢Н)涓嶈兘涓虹┖")); return mav; } - // 在库中找到对应的小区 + // 鍦ㄥ簱涓壘鍒板搴旂殑灏忓尯 District district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(), "district"); if (district == null) { - mav.setModel(BasicModel.buildBadRequestModel("该小区不存在")); + mav.setModel(BasicModel.buildBadRequestModel("璇ュ皬鍖轰笉瀛樺湪")); return mav; } @@ -4462,7 +4462,7 @@ public class PropertyController { int count = 0; List listHouse = similarCommMethod(model, "similarSort", district); - // 查找均价 + // 鏌ユ壘鍧囦环 List districtStats = districtStatService.findAllDistrictStatsSort(district.getCity(), district.getRegion(), district.getName(), model.getCalDate()); Integer districtAvg = 0; @@ -4479,7 +4479,7 @@ public class PropertyController { count++; } if (count == 0) { - mav.setModel(BasicModel.buildOKModel().setMsg("该小区无均价")); + mav.setModel(BasicModel.buildOKModel().setMsg("璇ュ皬鍖烘棤鍧囦环")); return mav; } avgPrice = avgPrice / count; @@ -4538,7 +4538,7 @@ public class PropertyController { } /** - * 小区统计分析接口 + * 灏忓尯缁熻鍒嗘瀽鎺ュ彛 * * @param model * @return @@ -4548,13 +4548,13 @@ public class PropertyController { mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getName()) || StringUtils.isBlank(model.getDistrict())) { - mav.setModel(BasicModel.buildBadRequestModel("参数缺失:city(城市),district(区域),name(小区名)是必须参数")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟缂哄け:city(鍩庡競),district(鍖哄煙),name(灏忓尯鍚�)鏄繀椤诲弬鏁�")); return mav; } District district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(), "district"); if (null == district) { - mav.setModel(BasicModel.buildBadRequestModel("小区不存在")); + mav.setModel(BasicModel.buildBadRequestModel("灏忓尯涓嶅瓨鍦�")); return mav; } if (district.getLat2() == null || district.getLng2() == null) { @@ -4564,12 +4564,12 @@ public class PropertyController { } DistrictKey districtKey = new DistrictKey(district.getCity(), district.getRegion(), district.getName()); - DistrictAttentionRank attention = districtAttentionRankService.findByDistrictKey(districtKey);// 小区关注度信息 + DistrictAttentionRank attention = districtAttentionRankService.findByDistrictKey(districtKey);// 灏忓尯鍏虫敞搴︿俊鎭� CityHot cityHot = cityHotService.findByCity(district.getCity()); DistrictHot districtHot = districtHotService.findDistrictHotByDistrictKey(districtKey); if (null != districtHot) { if (null != districtHot.getHouseLastMonth() && districtHot.getHouseLastMonth() > 0) { - int lastMonthHouses = districtHot.getHouseLastMonth();// 上月挂牌量 + int lastMonthHouses = districtHot.getHouseLastMonth();// 涓婃湀鎸傜墝閲� if (null != cityHot && null != cityHot.getSellMarkupMonth()) { districtHot.setHouseHalfYear( @@ -4583,7 +4583,7 @@ public class PropertyController { double lat = district.getLat2() / 10000000000d; double lng = district.getLng2() / 10000000000d; double radius = 1000d; - double aroundAvgConsumption = bizShopService.findAroundAvgConsumption(lat, lng, radius, "餐厅");// 周边消费人均 + double aroundAvgConsumption = bizShopService.findAroundAvgConsumption(lat, lng, radius, "椁愬巺");// 鍛ㄨ竟娑堣垂浜哄潎 int regionClickRank = 0; int cityClickRank = 0; @@ -4609,21 +4609,21 @@ public class PropertyController { } DistrictAnalysisDto districtAnalysisDto = new DistrictAnalysisDto(); - districtAnalysisDto.setCity(district.getCity());// 城市 - districtAnalysisDto.setDistrict(district.getRegion());// 区域 - districtAnalysisDto.setName(district.getName());// 小区名 - districtAnalysisDto.setAvgPriceAround((int) aroundAvgConsumption);// 周边餐饮平均消费 - districtAnalysisDto.setDistrictClickRank(regionClickRank);// 区域关注度排名 - districtAnalysisDto.setCityClickRank(cityClickRank);// 全市关注度排名 - districtAnalysisDto.setHouseHalfYear(houseHalfYear);// 近半年小区挂牌量 - districtAnalysisDto.setHouseLastMonth(houseLastMonth);// 上月小区挂牌量 + districtAnalysisDto.setCity(district.getCity());// 鍩庡競 + districtAnalysisDto.setDistrict(district.getRegion());// 鍖哄煙 + districtAnalysisDto.setName(district.getName());// 灏忓尯鍚� + districtAnalysisDto.setAvgPriceAround((int) aroundAvgConsumption);// 鍛ㄨ竟椁愰ギ骞冲潎娑堣垂 + districtAnalysisDto.setDistrictClickRank(regionClickRank);// 鍖哄煙鍏虫敞搴︽帓鍚� + districtAnalysisDto.setCityClickRank(cityClickRank);// 鍏ㄥ競鍏虫敞搴︽帓鍚� + districtAnalysisDto.setHouseHalfYear(houseHalfYear);// 杩戝崐骞村皬鍖烘寕鐗岄噺 + districtAnalysisDto.setHouseLastMonth(houseLastMonth);// 涓婃湀灏忓尯鎸傜墝閲� mav.setModel(BasicModel.buildOKModel().setResult(districtAnalysisDto)); return mav; } /** - * 小区交通接口 + * 灏忓尯浜ら�氭帴鍙� * * @param model * @return @@ -4633,13 +4633,13 @@ public class PropertyController { mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getName()) || StringUtils.isBlank(model.getDistrict())) { - mav.setModel(BasicModel.buildBadRequestModel("参数缺失:city(城市),district(区域),name(小区名)是必须参数")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟缂哄け:city(鍩庡競),district(鍖哄煙),name(灏忓尯鍚�)鏄繀椤诲弬鏁�")); return mav; } District district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(), "district"); if (null == district) { - mav.setModel(BasicModel.buildBadRequestModel("小区不存在")); + mav.setModel(BasicModel.buildBadRequestModel("灏忓尯涓嶅瓨鍦�")); return mav; } if (district.getLat2() == null || district.getLng2() == null) { @@ -4653,9 +4653,9 @@ public class PropertyController { double radius = 1000d; Map> stationMap = busStationService.getNearByStations(district.getCity(), lat, lng, - radius);// 查询交通信息(公交,地铁) bus_station,bus_line - List MetroStations = stationMap.get("地铁"); - List BusStation = stationMap.get("公交"); + radius);// 鏌ヨ浜ら�氫俊鎭�(鍏氦锛屽湴閾�) bus_station,bus_line + List MetroStations = stationMap.get("鍦伴搧"); + List BusStation = stationMap.get("鍏氦"); List StationDtos = new ArrayList(); if (MetroStations != null) { @@ -4681,7 +4681,7 @@ public class PropertyController { } /** - * 小区周边接口 + * 灏忓尯鍛ㄨ竟鎺ュ彛 * * @param model * @return @@ -4691,13 +4691,13 @@ public class PropertyController { mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getName()) || StringUtils.isBlank(model.getDistrict())) { - mav.setModel(BasicModel.buildBadRequestModel("参数缺失:city(城市),district(区域),name(小区名)是必须参数")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟缂哄け:city(鍩庡競),district(鍖哄煙),name(灏忓尯鍚�)鏄繀椤诲弬鏁�")); return mav; } District district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(), "district"); if (null == district) { - mav.setModel(BasicModel.buildBadRequestModel("小区不存在")); + mav.setModel(BasicModel.buildBadRequestModel("灏忓尯涓嶅瓨鍦�")); return mav; } if (district.getLat2() == null || district.getLng2() == null) { @@ -4706,15 +4706,15 @@ public class PropertyController { return mav; } - double radius = 1000d;// 查周围半径为1公里距离的信息 + double radius = 1000d;// 鏌ュ懆鍥村崐寰勪负1鍏噷璺濈鐨勪俊鎭� - List arrs = baiduApiService.searchNearbyLocalDatabase(district, radius);// 查询小区周边(所有类型) + List arrs = baiduApiService.searchNearbyLocalDatabase(district, radius);// 鏌ヨ灏忓尯鍛ㄨ竟锛堟墍鏈夌被鍨嬶級 Map> districtAroundMap = new HashMap>(); for (String key : AROUND_KEYWORD_FACTOR.keySet()) { List aroundNames = new ArrayList(); - districtAroundMap.put(AROUND_KEYWORD_FACTOR.get(key), aroundNames);// 把key的英文put到map并把value设置为一个List引用 + districtAroundMap.put(AROUND_KEYWORD_FACTOR.get(key), aroundNames);// 鎶妅ey鐨勮嫳鏂噋ut鍒癿ap骞舵妸value璁剧疆涓轰竴涓狶ist寮曠敤 } for (int i = 0; i < arrs.size(); i++) { @@ -4730,7 +4730,7 @@ public class PropertyController { dto.setLat(latjs); dto.setLng(lngjs); if (districtAroundMap.get(key) != null) { - districtAroundMap.get(key).add(dto);// 按key值取出list add 周边名称已经经纬度 + districtAroundMap.get(key).add(dto);// 鎸塳ey鍊煎彇鍑簂ist add 鍛ㄨ竟鍚嶇О宸茬粡缁忕含搴� } } @@ -4739,32 +4739,32 @@ public class PropertyController { } /** - * 相同小区相似户型房源挂牌量接口
- * 获取该小区的满足指定相似条件的挂牌房源量 条件说明: 1.输入面积-5<=房源面积<=输入面积+5 2.上个月发布的房源 + * 鐩稿悓灏忓尯鐩镐技鎴峰瀷鎴挎簮鎸傜墝閲忔帴鍙�
+ * 鑾峰彇璇ュ皬鍖虹殑婊¤冻鎸囧畾鐩镐技鏉′欢鐨勬寕鐗屾埧婧愰噺 鏉′欢璇存槑: 1.杈撳叆闈㈢Н-5<=鎴挎簮闈㈢Н<=杈撳叆闈㈢Н+5 2.涓婁釜鏈堝彂甯冪殑鎴挎簮 * - * @param city 城市 - * @param district 区域 - * @param name 小区名 - * @param size 面积 + * @param city 鍩庡競 + * @param district 鍖哄煙 + * @param name 灏忓尯鍚� + * @param size 闈㈢Н * @return * @author yinjihuan - * @date 2016年9月1日 + * @date 2016骞�9鏈�1鏃� */ public Object similarHouseAmoutAction(@Param(name = "city") String city, @Param(name = "district") String district, @Param(name = "name") String name, @Param(name = "size") Double size) { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(city) || StringUtils.isBlank(name) || StringUtils.isBlank(district) || size == null) { - mav.setModel(BasicModel.buildBadRequestModel("参数缺失:city(城市),district(区域),name(小区名),size(面积)是必须参数")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟缂哄け:city(鍩庡競),district(鍖哄煙),name(灏忓尯鍚�)锛宻ize(闈㈢Н)鏄繀椤诲弬鏁�")); return mav; } if (size <= 0) { - mav.setModel(BasicModel.buildBadRequestModel("size(面积)不能小于0")); + mav.setModel(BasicModel.buildBadRequestModel("size(闈㈢Н)涓嶈兘灏忎簬0")); return mav; } District districtInfo = districtService.findByNameAndAlias(city, district, name, "district"); if (null == districtInfo) { - mav.setModel(BasicModel.buildBadRequestModel("小区不存在")); + mav.setModel(BasicModel.buildBadRequestModel("灏忓尯涓嶅瓨鍦�")); return mav; } long result = districtHouseResourceStatService.findSimilarHouseAmoutCount(districtInfo.getId(), size); @@ -4775,17 +4775,17 @@ public class PropertyController { } /** - * 周边小区相似户型挂牌量接口
- * 获取该小区的满足指定相似条件的挂牌房源量 条件说明: 1.输入面积-5<=房源面积<=输入面积+5 2.上个月发布的房源 + * 鍛ㄨ竟灏忓尯鐩镐技鎴峰瀷鎸傜墝閲忔帴鍙�
+ * 鑾峰彇璇ュ皬鍖虹殑婊¤冻鎸囧畾鐩镐技鏉′欢鐨勬寕鐗屾埧婧愰噺 鏉′欢璇存槑: 1.杈撳叆闈㈢Н-5<=鎴挎簮闈㈢Н<=杈撳叆闈㈢Н+5 2.涓婁釜鏈堝彂甯冪殑鎴挎簮 * - * @param city 城市 - * @param district 区域 - * @param name 小区名 - * @param size 面积 - * @param radius 周边小区最大半径(单位:米,默认2000) + * @param city 鍩庡競 + * @param district 鍖哄煙 + * @param name 灏忓尯鍚� + * @param size 闈㈢Н + * @param radius 鍛ㄨ竟灏忓尯鏈�澶у崐寰�(鍗曚綅:绫筹紝榛樿2000) * @return * @author yinjihuan - * @date 2016年9月1日 + * @date 2016骞�9鏈�1鏃� */ public Object nearbySimilarHouseAmoutAction(@Param(name = "city") String city, @Param(name = "district") String district, @Param(name = "name") String name, @@ -4793,22 +4793,22 @@ public class PropertyController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(city) || StringUtils.isBlank(name) || StringUtils.isBlank(district) || size == null) { - mav.setModel(BasicModel.buildBadRequestModel("参数缺失:city(城市),district(区域),name(小区名),size(面积)是必须参数")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟缂哄け:city(鍩庡競),district(鍖哄煙),name(灏忓尯鍚�)锛宻ize(闈㈢Н)鏄繀椤诲弬鏁�")); return mav; } if (size <= 0) { - mav.setModel(BasicModel.buildBadRequestModel("size(面积)不能小于0")); + mav.setModel(BasicModel.buildBadRequestModel("size(闈㈢Н)涓嶈兘灏忎簬0")); return mav; } District districtInfo = districtService.findByNameAndAlias(city, district, name, "district"); if (null == districtInfo) { - mav.setModel(BasicModel.buildBadRequestModel("小区不存在")); + mav.setModel(BasicModel.buildBadRequestModel("灏忓尯涓嶅瓨鍦�")); return mav; } if (radius == null) { radius = 2000; } - // 找出小区周边范围类的小区 + // 鎵惧嚭灏忓尯鍛ㄨ竟鑼冨洿绫荤殑灏忓尯 List districts = districtService.findNearestDistrict(districtInfo, radius, 500); List districtIds = new ArrayList(); for (District dis : districts) { @@ -4822,7 +4822,7 @@ public class PropertyController { } /** - * 小区周边一公里均价 + * 灏忓尯鍛ㄨ竟涓�鍏噷鍧囦环 * * @param model * @return @@ -4845,7 +4845,7 @@ public class PropertyController { } /** - * 相同小区相似户型租金范围查询接口 + * 鐩稿悓灏忓尯鐩镐技鎴峰瀷绉熼噾鑼冨洿鏌ヨ鎺ュ彛 * * @param model * @return @@ -4857,7 +4857,7 @@ public class PropertyController { District district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(), "district"); if (null == district) { - mav.setModel(BasicModel.buildBadRequestModel("小区不存在")); + mav.setModel(BasicModel.buildBadRequestModel("灏忓尯涓嶅瓨鍦�")); return mav; } @@ -4866,7 +4866,7 @@ public class PropertyController { // district.getName(), 100, null, model.getSize()-5, model.getSize()+5); Integer room = houseService.getDistrictRoomType(model.getSize()); if (null == room) { - mav.setModel(BasicModel.buildBadRequestModel("根据size(面积)没有找到相应的室")); + mav.setModel(BasicModel.buildBadRequestModel("鏍规嵁size(闈㈢Н)娌℃湁鎵惧埌鐩稿簲鐨勫")); return mav; } @@ -4888,7 +4888,7 @@ public class PropertyController { } /** - * 周边小区相似户型租金范围查询接口 + * 鍛ㄨ竟灏忓尯鐩镐技鎴峰瀷绉熼噾鑼冨洿鏌ヨ鎺ュ彛 * * @param model * @return @@ -4899,10 +4899,10 @@ public class PropertyController { District district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(), "district"); if (null == district) { - mav.setModel(BasicModel.buildBadRequestModel("小区不存在")); + mav.setModel(BasicModel.buildBadRequestModel("灏忓尯涓嶅瓨鍦�")); return mav; } - if (null == model.getRadius()) {// 设置默认值 + if (null == model.getRadius()) {// 璁剧疆榛樿鍊� model.setRadius(2000); } @@ -4917,7 +4917,7 @@ public class PropertyController { // } Integer room = houseService.getDistrictRoomType(model.getSize()); if (null == room) { - mav.setModel(BasicModel.buildBadRequestModel("根据size(面积)没有找到相应的室")); + mav.setModel(BasicModel.buildBadRequestModel("鏍规嵁size(闈㈢Н)娌℃湁鎵惧埌鐩稿簲鐨勫")); return mav; } @@ -4944,14 +4944,14 @@ public class PropertyController { mav.setModel(BasicModel.buildOKModel()); } } else { - mav.setModel(BasicModel.buildBadRequestModel("没找到周边小区")); + mav.setModel(BasicModel.buildBadRequestModel("娌℃壘鍒板懆杈瑰皬鍖�")); } return mav; } /** - * 室号查询接口 + * 瀹ゅ彿鏌ヨ鎺ュ彛 * * @param model * @return @@ -4977,7 +4977,7 @@ public class PropertyController { continue; } RoomDto dto = new RoomDto(); - dto.setDisplay(houseLoudong.getRoomNum() + "室"); + dto.setDisplay(houseLoudong.getRoomNum() + "瀹�"); dto.setUnitNumber(houseLoudong.getHouseNumUnit()); dto.setRoom(houseLoudong.getRoomNum()); rooms.add(dto); @@ -4987,7 +4987,7 @@ public class PropertyController { } /** - * 楼栋楼层信息查询接口 + * 妤兼爧妤煎眰淇℃伅鏌ヨ鎺ュ彛 * * @param model * @return @@ -4998,7 +4998,7 @@ public class PropertyController { List loudongs = loudongService.findAll(model.getCity(), model.getDistrict(), model.getProjectName(), model.getBuildingNumber(), model.getUnitNumber(), Integer.MAX_VALUE); if (null == loudongs || loudongs.isEmpty()) { - mav.setModel(BasicModel.buildBadRequestModel("楼栋不存在")); + mav.setModel(BasicModel.buildBadRequestModel("妤兼爧涓嶅瓨鍦�")); return mav; } List floors = new ArrayList(); @@ -5012,7 +5012,7 @@ public class PropertyController { } /** - * 楼栋查询接口 + * 妤兼爧鏌ヨ鎺ュ彛 * * @param model * @return @@ -5057,7 +5057,7 @@ public class PropertyController { } /** - * 楼栋查询接口 + * 妤兼爧鏌ヨ鎺ュ彛 * * @param model * @return @@ -5108,13 +5108,13 @@ public class PropertyController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(city) || StringUtils.isBlank(district) || StringUtils.isBlank(name)) { - mav.setModel(BasicModel.buildBadRequestModel("小区所在城市,所在区域,小区名为必填项")); + mav.setModel(BasicModel.buildBadRequestModel("灏忓尯鎵�鍦ㄥ煄甯�,鎵�鍦ㄥ尯鍩�,灏忓尯鍚嶄负蹇呭~椤�")); return mav; } District districtBo = districtService.findByNameAndAlias(city, district, name, "district"); if (null == districtBo) { - mav.setModel(BasicModel.buildBadRequestModel("该小区不存在")); + mav.setModel(BasicModel.buildBadRequestModel("璇ュ皬鍖轰笉瀛樺湪")); return mav; } @@ -5144,7 +5144,7 @@ public class PropertyController { private Map getLastEvaluationPrice(District district, Evaluation evaluation, double dCredit) throws NumberFormatException, IllegalAccessException { Date startDate = DateUtil.parseDate(DateUtil.addMonth(new Date(), -6), "yyyy-MM-dd"); - // 第三方价格 + // 绗笁鏂逛环鏍� Map otherPriceRets = averageStatisticsService.findFirstAverageStatictics(district.getCity(), district.getRegion(), district.getName(), district.getCategory(), startDate); if (null == otherPriceRets) { @@ -5183,7 +5183,7 @@ public class PropertyController { if (prices != null) { avgPrice = findNewPrice(prices, evaluation.getAvgPrice()); } - // 在 dCredit与0.65之间 + // 鍦� dCredit涓�0.65涔嬮棿 if (evaluation.getCredit() >= dCredit && dCredit < 0.65) { if (avgPrice > 0) { Double newTotalPrice = avgPrice * evaluation.getArea(); @@ -5209,7 +5209,7 @@ public class PropertyController { lastPrice = evaluation.getBigTotalPrice(); } } - } else if (evaluation.getCredit() < dCredit) {// 在dCredit以下 + } else if (evaluation.getCredit() < dCredit) {// 鍦╠Credit浠ヤ笅 if (avgPrice > 0) { Double newTotalPrice = avgPrice * evaluation.getArea(); lastPrice = newTotalPrice.longValue(); @@ -5287,7 +5287,7 @@ public class PropertyController { List> values = new ArrayList>(); int fjw_price = avgPrice; - // 找出最小差 + // 鎵惧嚭鏈�灏忓樊 for (int i = 0; i < prices.size() - 1; i++) { int a = prices.get(i); for (int j = i + 1; j < prices.size(); j++) { @@ -5299,7 +5299,7 @@ public class PropertyController { } } - // 根据最小差找出结果 + // 鏍规嵁鏈�灏忓樊鎵惧嚭缁撴灉 for (int i = 0; i < prices.size() - 1; i++) { int a = prices.get(i); for (int j = i + 1; j < prices.size(); j++) { @@ -5510,17 +5510,17 @@ public class PropertyController { } /** - * 房产交易记录查询 + * 鎴夸骇浜ゆ槗璁板綍鏌ヨ * * @param model * @return */ public Object transactionRecordAction(PropertySearchModel model) { - // 输入(model中拿取) city+district+name+houseNum(楼栋号)+roomNum(室号) trade_date倒序 - // max查询条数 - // 输出 - // {"result":{"districtCnt":"小区1年内成交数量","transactionList":[{"time":"yyyy-MM-dd","price":"xxx万"}]}} - // time是每笔的成交时间,price是每笔的成交金额,注意看数据格式 + // 杈撳叆(model涓嬁鍙�) city+district+name+houseNum(妤兼爧鍙�)+roomNum(瀹ゅ彿) trade_date鍊掑簭 + // max鏌ヨ鏉℃暟 + // 杈撳嚭 + // {"result":{"districtCnt":"灏忓尯1骞村唴鎴愪氦鏁伴噺","transactionList":[{"time":"yyyy-MM-dd","price":"xxx涓�"}]}} + // time鏄瘡绗旂殑鎴愪氦鏃堕棿锛宲rice鏄瘡绗旂殑鎴愪氦閲戦锛屾敞鎰忕湅鏁版嵁鏍煎紡 RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); String city = model.getCity(); @@ -5530,27 +5530,27 @@ public class PropertyController { String roomNum = model.getRoomNum(); int max = model.getMax() == null ? 10 : model.getMax(); if (StringUtils.isBlank(city)) { - mav.setModel(BasicModel.buildBadRequestModel("城市(city)不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍩庡競(city)涓嶈兘涓虹┖")); return mav; } if (StringUtils.isBlank(district)) { - mav.setModel(BasicModel.buildBadRequestModel("区域(district)不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍖哄煙(district)涓嶈兘涓虹┖")); return mav; } if (StringUtils.isBlank(name)) { - mav.setModel(BasicModel.buildBadRequestModel("小区名(name)不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("灏忓尯鍚�(name)涓嶈兘涓虹┖")); return mav; } if (StringUtils.isBlank(houseNum)) { - mav.setModel(BasicModel.buildBadRequestModel("楼栋号(houseNum)不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("妤兼爧鍙�(houseNum)涓嶈兘涓虹┖")); return mav; } if (StringUtils.isBlank(roomNum)) { - mav.setModel(BasicModel.buildBadRequestModel("室号(roomNum)不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("瀹ゅ彿(roomNum)涓嶈兘涓虹┖")); return mav; } Date curDate = new Date(); - // 小区1年内成交数量 + // 灏忓尯1骞村唴鎴愪氦鏁伴噺 long count = dealPriceService.findTradeCount(city, district, name, DateUtil.getDateOfLastMonth(curDate, -12), curDate); List list = dealPriceService.findMaxTrade(city, district, name, houseNum, roomNum, max); @@ -5558,7 +5558,7 @@ public class PropertyController { for (DealPrice dealPrice : list) { HouseDealPriceDetailDto detail = new HouseDealPriceDetailDto(); detail.setPrice(dealPrice.getTotalPrice()); - detail.setPriceStr(DataUtil.roundDouble((dealPrice.getTotalPrice() / 10000d), 2) + "万"); + detail.setPriceStr(DataUtil.roundDouble((dealPrice.getTotalPrice() / 10000d), 2) + "涓�"); detail.setTime(DateUtil.formatByPattern(dealPrice.getTradeDate(), "yyyy-MM-dd")); transactionList.add(detail); } @@ -5570,19 +5570,19 @@ public class PropertyController { } /** - * 房产拍卖记录 + * 鎴夸骇鎷嶅崠璁板綍 * * @param model * @return */ public Object auctionRecordAction(PropertySearchModel model) { - // 拍卖记录表是fangjia_crawl.house_auction HouseAuction - // 输入(model中拿取) city+district+name+houseNum(楼栋号)+roomNum(室号) announcement_date倒序 - // max查询条数 - // 输入对应的表查询字段 cityMatch+regionMatch+nameMatch+buildingNumber+roomNumber - // 输出 - // {"result":{"districtCnt":"小区1年内拍卖数量","transactionList":[{"time":"yyyy-MM-dd","name":"xxx拍卖行"}]}} - // time是每笔的成交时间,name是每笔的拍卖机构,注意看数据格式 + // 鎷嶅崠璁板綍琛ㄦ槸fangjia_crawl.house_auction HouseAuction + // 杈撳叆(model涓嬁鍙�) city+district+name+houseNum(妤兼爧鍙�)+roomNum(瀹ゅ彿) announcement_date鍊掑簭 + // max鏌ヨ鏉℃暟 + // 杈撳叆瀵瑰簲鐨勮〃鏌ヨ瀛楁 cityMatch+regionMatch+nameMatch+buildingNumber+roomNumber + // 杈撳嚭 + // {"result":{"districtCnt":"灏忓尯1骞村唴鎷嶅崠鏁伴噺","transactionList":[{"time":"yyyy-MM-dd","name":"xxx鎷嶅崠琛�"}]}} + // time鏄瘡绗旂殑鎴愪氦鏃堕棿锛宯ame鏄瘡绗旂殑鎷嶅崠鏈烘瀯锛屾敞鎰忕湅鏁版嵁鏍煎紡 RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); String city = model.getCity(); @@ -5592,27 +5592,27 @@ public class PropertyController { String roomNum = model.getRoomNum(); int max = model.getMax() == null ? 10 : model.getMax(); if (StringUtils.isBlank(city)) { - mav.setModel(BasicModel.buildBadRequestModel("城市(city)不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍩庡競(city)涓嶈兘涓虹┖")); return mav; } if (StringUtils.isBlank(district)) { - mav.setModel(BasicModel.buildBadRequestModel("区域(district)不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍖哄煙(district)涓嶈兘涓虹┖")); return mav; } if (StringUtils.isBlank(name)) { - mav.setModel(BasicModel.buildBadRequestModel("小区名(name)不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("灏忓尯鍚�(name)涓嶈兘涓虹┖")); return mav; } if (StringUtils.isBlank(houseNum)) { - mav.setModel(BasicModel.buildBadRequestModel("楼栋号(houseNum)不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("妤兼爧鍙�(houseNum)涓嶈兘涓虹┖")); return mav; } if (StringUtils.isBlank(roomNum)) { - mav.setModel(BasicModel.buildBadRequestModel("室号(roomNum)不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("瀹ゅ彿(roomNum)涓嶈兘涓虹┖")); return mav; } Date curDate = new Date(); - // 小区1年内成交数量 + // 灏忓尯1骞村唴鎴愪氦鏁伴噺 long count = houseAuctionService.findHouseAuctionCount(city, district, name, DateUtil.getDateOfLastMonth(curDate, -12), curDate); List list = houseAuctionService.findMaxHouseAuction(city, district, name, houseNum, roomNum, max); @@ -5631,14 +5631,14 @@ public class PropertyController { } /** - * 房产近期评估次数 + * 鎴夸骇杩戞湡璇勪及娆℃暟 * * @param model * @return */ public Object evaluateNumAction(PropertySearchModel model) { - // 输入(model中拿取) city+district+name+houseNum(楼栋号)+roomNum(室号) - // 输出 {"result":{"oneMonth":"房屋最近30天的评估次数","threeMonth":"房屋最近90天的评估次数"}} + // 杈撳叆(model涓嬁鍙�) city+district+name+houseNum(妤兼爧鍙�)+roomNum(瀹ゅ彿) + // 杈撳嚭 {"result":{"oneMonth":"鎴垮眿鏈�杩�30澶╃殑璇勪及娆℃暟","threeMonth":"鎴垮眿鏈�杩�90澶╃殑璇勪及娆℃暟"}} RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); String city = model.getCity(); @@ -5647,23 +5647,23 @@ public class PropertyController { String houseNum = model.getHouseNum(); String roomNum = model.getRoomNum(); if (StringUtils.isBlank(city)) { - mav.setModel(BasicModel.buildBadRequestModel("城市(city)不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍩庡競(city)涓嶈兘涓虹┖")); return mav; } if (StringUtils.isBlank(district)) { - mav.setModel(BasicModel.buildBadRequestModel("区域(district)不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍖哄煙(district)涓嶈兘涓虹┖")); return mav; } if (StringUtils.isBlank(name)) { - mav.setModel(BasicModel.buildBadRequestModel("小区名(name)不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("灏忓尯鍚�(name)涓嶈兘涓虹┖")); return mav; } if (StringUtils.isBlank(houseNum)) { - mav.setModel(BasicModel.buildBadRequestModel("楼栋号(houseNum)不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("妤兼爧鍙�(houseNum)涓嶈兘涓虹┖")); return mav; } if (StringUtils.isBlank(roomNum)) { - mav.setModel(BasicModel.buildBadRequestModel("室号(roomNum)不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("瀹ゅ彿(roomNum)涓嶈兘涓虹┖")); return mav; } Date curDate = new Date(); @@ -5676,7 +5676,7 @@ public class PropertyController { } /*** - * 小区租金估值报告(上半部分) + * 灏忓尯绉熼噾浼板�兼姤鍛�(涓婂崐閮ㄥ垎) * @param model * @param request * @return @@ -5689,11 +5689,11 @@ public class PropertyController { mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getName()) || StringUtils.isBlank(model.getDistrict()) || model.getSize() <= 0) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:城市,区域,小区名,面积(size)为必填项")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:鍩庡競,鍖哄煙,灏忓尯鍚�,闈㈢Н(size)涓哄繀濉」")); return mav; } - if (model.getCity().endsWith("市")) { - model.setCity(model.getCity().replaceAll("市$", "")); + if (model.getCity().endsWith("甯�")) { + model.setCity(model.getCity().replaceAll("甯�$", "")); } if (StringUtils.isNotBlank(request.getParameter("calDate"))) { Date calDate = null; @@ -5703,40 +5703,40 @@ public class PropertyController { } if (calDate == null) { - mav.setModel(BasicModel.buildBadRequestModel("calDate:数据类型不合法")); + mav.setModel(BasicModel.buildBadRequestModel("calDate:鏁版嵁绫诲瀷涓嶅悎娉�")); return mav; } else { model.setCalDate(calDate); } } - /* 先到CPDB库中查找小区 */ + /* 鍏堝埌CPDB搴撲腑鏌ユ壘灏忓尯 */ District district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(), "district"); if (district == null) { - mav.setModel(BasicModel.buildBadRequestModel("该小区不存在")); + mav.setModel(BasicModel.buildBadRequestModel("璇ュ皬鍖轰笉瀛樺湪")); return mav; } model.setName(district.getName()); if (model.getMaxFloor() != null && (model.getMaxFloor() <= 0 || model.getMaxFloor() > 59)) { - mav.setModel(BasicModel.buildBadRequestModel("maxFloor取值非法,正确范围[1,60)")); + mav.setModel(BasicModel.buildBadRequestModel("maxFloor鍙栧�奸潪娉�,姝g‘鑼冨洿[1,60)")); return mav; } if (model.getFloor() != null && (model.getFloor() <= 0 || model.getFloor() > 59)) { - mav.setModel(BasicModel.buildBadRequestModel("floor取值非法,正确范围[1,60)")); + mav.setModel(BasicModel.buildBadRequestModel("floor鍙栧�奸潪娉�,姝g‘鑼冨洿[1,60)")); return mav; } if (model.getMaxFloor() != null && model.getFloor() != null && model.getFloor() > model.getMaxFloor()) { - mav.setModel(BasicModel.buildBadRequestModel("所在楼层不能大于总楼层")); + mav.setModel(BasicModel.buildBadRequestModel("鎵�鍦ㄦゼ灞備笉鑳藉ぇ浜庢�绘ゼ灞�")); return mav; } model.setRegion(district.getRegion()); model.setDistrictName(district.getName()); if (StringUtils.isBlank(model.getPropertyType())) { - if (district.getEstateType2() != null && district.getEstateType2().contains("别墅")) { + if (district.getEstateType2() != null && district.getEstateType2().contains("鍒")) { model.setPropertyType("1"); } } @@ -5776,13 +5776,13 @@ public class PropertyController { Integer startPrice = (int) (evaluation.getTotalPrice() - evaluation.getTotalPrice() * 0.2); Integer endPrice = (int) (evaluation.getTotalPrice() + evaluation.getTotalPrice() * 0.2); - //周边相似小区 -// if (null == model.getRadius()) {// 设置默认值 + //鍛ㄨ竟鐩镐技灏忓尯 +// if (null == model.getRadius()) {// 璁剧疆榛樿鍊� // model.setRadius(1000); // } // String[] fields = { "city", "region", "name", "estateType2", "id","finishBuildingDate"}; // List allDistricts = districtService.findNearestDistrict(district, model.getRadius(), fields, Integer.MAX_VALUE); -// //按条件过滤相似小区 +// //鎸夋潯浠惰繃婊ょ浉浼煎皬鍖� // Integer buildYear = null; // List districts = new ArrayList(); // if(StringUtils.isNotBlank(district.getFinishBuildingDate())){ @@ -5802,13 +5802,13 @@ public class PropertyController { // } // } - //相似房源 + //鐩镐技鎴挎簮 // Double startArea = model.getSize() - model.getSize()*0.1; // Double endArea = model.getSize() + model.getSize()*0.1; // Integer startDate = Integer.parseInt(org.apache.tools.ant.util.DateUtils.format(DateUtil.addMonthToDate(new Date(), -12), "yyyyMMdd")); // List houses = seawaterService.findSeawatersFromEs2("rent", district.getCity(), district.getRegion(), district.getName(), null, null, startDate, null, // startArea, endArea, startPrice, endPrice, null, null, "p_date", false, 1, 5 , null,"seawater-20*/_doc"); -// //无评估小区房源用周边相似小区的房源 +// //鏃犺瘎浼板皬鍖烘埧婧愮敤鍛ㄨ竟鐩镐技灏忓尯鐨勬埧婧� // if(null == houses || houses.size()==0){ // for (District dist : districts) { // houses = seawaterService.findSeawatersFromEs2("rent", dist.getCity(), dist.getRegion(), dist.getName(), null, null, startDate, null, @@ -5820,7 +5820,7 @@ public class PropertyController { // } // districtPriceMap.put("houses", houses); -// //周边相似小区租金 +// //鍛ㄨ竟鐩镐技灏忓尯绉熼噾 // Integer room = null; // if(model.getRoom()!=0){ // room = model.getRoom(); @@ -5863,7 +5863,7 @@ public class PropertyController { // } // // -// //近一年户型租金走势 +// //杩戜竴骞存埛鍨嬬閲戣蛋鍔� // Map trendsMap = districtRoomSqmetreRentService.getRentTrends(district.getCity(), district.getRegion(), district.getName(), room, -12); //// Map trendsMap = districtStatRentService.getRentTrend(district.getCity(), district.getRegion(), district.getDistrictName(), -12); // if (MapUtils.isNotEmpty(trendsMap)) { @@ -5879,7 +5879,7 @@ public class PropertyController { // districtPriceMap.put("trends", trendsMap); // // -// //成交的租房房源 +// //鎴愪氦鐨勭鎴挎埧婧� // List rentTrades = rentDealPriceService.getRentDealPrices(district.getCity(), district.getRegion(), district.getName(), 5); // districtPriceMap.put("trades", rentTrades); @@ -5887,13 +5887,13 @@ public class PropertyController { return mav; } else { - mav.setModel(BasicModel.buildOKModel().setMsg("暂时不支持该小区的租金估价").markNoData()); + mav.setModel(BasicModel.buildOKModel().setMsg("鏆傛椂涓嶆敮鎸佽灏忓尯鐨勭閲戜及浠�").markNoData()); return mav; } } /*** - * 小区租金估值报告(下半部分) + * 灏忓尯绉熼噾浼板�兼姤鍛�(涓嬪崐閮ㄥ垎) * @param model * @param request * @return @@ -5904,12 +5904,12 @@ public class PropertyController { public Object rentReport2Action(PropertyEvaluationModel model, HttpServletRequest request) throws NumberFormatException, IllegalAccessException { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); - /* 先到CPDB库中查找小区 */ + /* 鍏堝埌CPDB搴撲腑鏌ユ壘灏忓尯 */ District district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(), "district"); model.setRegion(district.getRegion()); model.setDistrictName(district.getName()); if (StringUtils.isBlank(model.getPropertyType())) { - if (district.getEstateType2() != null && district.getEstateType2().contains("别墅")) { + if (district.getEstateType2() != null && district.getEstateType2().contains("鍒")) { model.setPropertyType("1"); } } @@ -5923,13 +5923,13 @@ public class PropertyController { Integer startPrice = (int) (evaluation.getTotalPrice() - evaluation.getTotalPrice() * 0.2); Integer endPrice = (int) (evaluation.getTotalPrice() + evaluation.getTotalPrice() * 0.2); - //周边相似小区 - if (null == model.getRadius()) {// 设置默认值 + //鍛ㄨ竟鐩镐技灏忓尯 + if (null == model.getRadius()) {// 璁剧疆榛樿鍊� model.setRadius(1000); } String[] fields = {"city", "region", "name", "estateType2", "id", "finishBuildingDate"}; List allDistricts = districtService.findNearestDistrict(district, model.getRadius(), fields, Integer.MAX_VALUE); - //按条件过滤相似小区 + //鎸夋潯浠惰繃婊ょ浉浼煎皬鍖� Integer buildYear = null; List districts = new ArrayList(); if (StringUtils.isNotBlank(district.getFinishBuildingDate())) { @@ -5949,13 +5949,13 @@ public class PropertyController { } } - //相似房源 + //鐩镐技鎴挎簮 Double startArea = model.getSize() - model.getSize() * 0.1; Double endArea = model.getSize() + model.getSize() * 0.1; Integer startDate = Integer.parseInt(org.apache.tools.ant.util.DateUtils.format(DateUtil.addMonthToDate(new Date(), -12), "yyyyMMdd")); List houses = seawaterService.findSeawatersFromEs2("rent", district.getCity(), district.getRegion(), district.getName(), null, null, startDate, null, startArea, endArea, startPrice, endPrice, null, null, "p_date", false, 1, 5, null, "seawater-20*/_doc"); - //无评估小区房源用周边相似小区的房源 + //鏃犺瘎浼板皬鍖烘埧婧愮敤鍛ㄨ竟鐩镐技灏忓尯鐨勬埧婧� if (null == houses || houses.size() == 0) { for (District dist : districts) { houses = seawaterService.findSeawatersFromEs2("rent", dist.getCity(), dist.getRegion(), dist.getName(), null, null, startDate, null, @@ -5967,7 +5967,7 @@ public class PropertyController { } districtPriceMap.put("houses", houses); - //周边相似小区租金 + //鍛ㄨ竟鐩镐技灏忓尯绉熼噾 Integer room = null; if (model.getRoom() != null && model.getRoom() > 0) { room = model.getRoom(); @@ -6010,7 +6010,7 @@ public class PropertyController { } - //近一年户型租金走势 + //杩戜竴骞存埛鍨嬬閲戣蛋鍔� // Map trendsMap = districtRoomSqmetreRentService.getRentTrends(district.getCity(), district.getRegion(), district.getName(), room, -12); Map trendsMap = districtStatRentService.getRentTrend(district.getCity(), district.getRegion(), district.getDistrictName(), -12); if (MapUtils.isNotEmpty(trendsMap)) { @@ -6026,14 +6026,14 @@ public class PropertyController { districtPriceMap.put("trends", trendsMap); - //成交的租房房源 + //鎴愪氦鐨勭鎴挎埧婧� List rentTrades = rentDealPriceService.getRentDealPrices(district.getCity(), district.getRegion(), district.getName(), 5); districtPriceMap.put("trades", rentTrades); mav.setModel(BasicModel.buildOKModel().setResult(districtPriceMap)); return mav; } else { - mav.setModel(BasicModel.buildOKModel().setMsg("暂时不支持该小区的租金估价").markNoData()); + mav.setModel(BasicModel.buildOKModel().setMsg("鏆傛椂涓嶆敮鎸佽灏忓尯鐨勭閲戜及浠�").markNoData()); return mav; } } @@ -6043,11 +6043,11 @@ public class PropertyController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getAddress()) || model.getSize() <= 0) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:城市,地址,面积(size)为必填项")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:鍩庡競,鍦板潃,闈㈢Н(size)涓哄繀濉」")); return mav; } - if (model.getCity().endsWith("市")) { - model.setCity(model.getCity().replaceAll("市$", "")); + if (model.getCity().endsWith("甯�")) { + model.setCity(model.getCity().replaceAll("甯�$", "")); } if (StringUtils.isNotBlank(request.getParameter("calDate"))) { Date calDate = null; @@ -6057,7 +6057,7 @@ public class PropertyController { } if (calDate == null) { - mav.setModel(BasicModel.buildBadRequestModel("calDate:数据类型不合法")); + mav.setModel(BasicModel.buildBadRequestModel("calDate:鏁版嵁绫诲瀷涓嶅悎娉�")); return mav; } else { model.setCalDate(calDate); @@ -6065,16 +6065,16 @@ public class PropertyController { } if (model.getMaxFloor() != null && (model.getMaxFloor() <= 0 || model.getMaxFloor() > 59)) { - mav.setModel(BasicModel.buildBadRequestModel("maxFloor取值非法,正确范围[1,60)")); + mav.setModel(BasicModel.buildBadRequestModel("maxFloor鍙栧�奸潪娉�,姝g‘鑼冨洿[1,60)")); return mav; } if (model.getFloor() != null && (model.getFloor() <= 0 || model.getFloor() > 59)) { - mav.setModel(BasicModel.buildBadRequestModel("floor取值非法,正确范围[1,60)")); + mav.setModel(BasicModel.buildBadRequestModel("floor鍙栧�奸潪娉�,姝g‘鑼冨洿[1,60)")); return mav; } if (model.getMaxFloor() != null && model.getFloor() != null && model.getFloor() > model.getMaxFloor()) { - mav.setModel(BasicModel.buildBadRequestModel("所在楼层不能大于总楼层")); + mav.setModel(BasicModel.buildBadRequestModel("鎵�鍦ㄦゼ灞備笉鑳藉ぇ浜庢�绘ゼ灞�")); return mav; } @@ -6082,11 +6082,11 @@ public class PropertyController { String estateType = null; if(StringUtils.isNotBlank(model.getPropertyType())){ if(model.getPropertyType().equals("0")){ - estateType = "普通住宅"; + estateType = "鏅�氫綇瀹�"; }else if(model.getPropertyType().equals("1")){ - estateType = "别墅"; + estateType = "鍒"; }else if(model.getPropertyType().equals("2")){ - estateType = "商住"; + estateType = "鍟嗕綇"; } } @@ -6099,8 +6099,8 @@ public class PropertyController { if(StringUtils.isNotBlank(model.getAddress())){ resultObject = addressMatchProxyService.newMatch(model.getCity(), model.getAddress(), "property", false); }else if(StringUtils.isNotBlank(model.getName())){ - if(estateType !=null && estateType.equals("别墅") && !model.getName().contains("别墅")){ - resultObject = addressMatchProxyService.newMatch(model.getCity(), model.getName()+"别墅", "property", false); + if(estateType !=null && estateType.equals("鍒") && !model.getName().contains("鍒")){ + resultObject = addressMatchProxyService.newMatch(model.getCity(), model.getName()+"鍒", "property", false); }else{ resultObject = addressMatchProxyService.newMatch(model.getCity(), model.getName(), "property", false); } @@ -6113,7 +6113,7 @@ public class PropertyController { } } if(district == null){ - mav.setModel(BasicModel.buildOKModel().setMsg("暂时不支持该小区的租金估价").markNoData()); + mav.setModel(BasicModel.buildOKModel().setMsg("鏆傛椂涓嶆敮鎸佽灏忓尯鐨勭閲戜及浠�").markNoData()); return mav; } @@ -6121,7 +6121,7 @@ public class PropertyController { model.setRegion(district.getRegion()); model.setDistrictName(district.getName()); if (StringUtils.isBlank(model.getPropertyType())) { - if (district.getEstateType2() != null && district.getEstateType2().contains("别墅")) { + if (district.getEstateType2() != null && district.getEstateType2().contains("鍒")) { model.setPropertyType("1"); } } @@ -6152,11 +6152,11 @@ public class PropertyController { mav.setModel(BasicModel.buildOKModel().setResult(districtPriceMap)); return mav; }else{ - mav.setModel(BasicModel.buildOKModel().setMsg("暂时不支持该小区的租金估价").markNoData()); + mav.setModel(BasicModel.buildOKModel().setMsg("鏆傛椂涓嶆敮鎸佽灏忓尯鐨勭閲戜及浠�").markNoData()); return mav; } } - mav.setModel(BasicModel.buildOKModel().setMsg("暂时不支持该小区的租金估价").markNoData()); + mav.setModel(BasicModel.buildOKModel().setMsg("鏆傛椂涓嶆敮鎸佽灏忓尯鐨勭閲戜及浠�").markNoData()); return mav; } @@ -6165,7 +6165,7 @@ public class PropertyController { mav.setViewType("rest"); if (StringUtils.isBlank(model.getId()) || StringUtils.isBlank(model.getHouseNumber()) || StringUtils.isBlank(model.getRoomNumber())) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:楼盘编号,楼栋号,室为必填项")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:妤肩洏缂栧彿,妤兼爧鍙�,瀹や负蹇呭~椤�")); return mav; } @@ -6180,7 +6180,7 @@ public class PropertyController { mav.setViewType("rest"); if (StringUtils.isBlank(model.getId()) || StringUtils.isBlank(model.getHouseNumber())) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:楼盘编号,楼栋号为必填项")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:妤肩洏缂栧彿,妤兼爧鍙蜂负蹇呭~椤�")); return mav; } @@ -6195,12 +6195,12 @@ public class PropertyController { mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity())) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:城市为必填项")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:鍩庡競涓哄繀濉」")); return mav; } if (StringUtils.isBlank(model.getName()) && StringUtils.isBlank(model.getAddress()) ) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:名称或地址至少填一个")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:鍚嶇О鎴栧湴鍧�鑷冲皯濉竴涓�")); return mav; } @@ -6208,11 +6208,11 @@ public class PropertyController { String estateType = null; if(StringUtils.isNotBlank(model.getPropertyType())){ if(model.getPropertyType().equals("0")){ - estateType = "普通住宅"; + estateType = "鏅�氫綇瀹�"; }else if(model.getPropertyType().equals("1")){ - estateType = "别墅"; + estateType = "鍒"; }else if(model.getPropertyType().equals("2")){ - estateType = "商住"; + estateType = "鍟嗕綇"; } } @@ -6225,8 +6225,8 @@ public class PropertyController { if(StringUtils.isNotBlank(model.getAddress())){ resultObject = addressMatchProxyService.newMatch(model.getCity(), model.getAddress(), "property", false); }else if(StringUtils.isNotBlank(model.getName())){ - if(estateType !=null && estateType.equals("别墅") && !model.getName().contains("别墅")){ - resultObject = addressMatchProxyService.newMatch(model.getCity(), model.getName()+"别墅", "property", false); + if(estateType !=null && estateType.equals("鍒") && !model.getName().contains("鍒")){ + resultObject = addressMatchProxyService.newMatch(model.getCity(), model.getName()+"鍒", "property", false); }else{ resultObject = addressMatchProxyService.newMatch(model.getCity(), model.getName(), "property", false); } @@ -6262,7 +6262,7 @@ public class PropertyController { pager.setPageSize(5); } - // 默认1公里内 + // 榛樿1鍏噷鍐� if (model.getRadius() == null) { model.setRadius(1000); } @@ -6287,7 +6287,7 @@ public class PropertyController { model.setMaxPrice(model.getMaxPrice()); } } - //先查成交案例 + //鍏堟煡鎴愪氦妗堜緥 Date startTime = DateUtil.parseDate(startDate,"yyyyMMdd"); Date endTime = DateUtil.parseDate(endDate,"yyyyMMdd"); List dealPrices = dealPriceService.findDealPrices(district.getId(), pager.getPageSize(), model.getMinPrice(), model.getMaxPrice(), startTime, endTime); @@ -6302,7 +6302,7 @@ public class PropertyController { } if(caseDtos.size() < pager.getPageSize()){ - //查自身样本 + //鏌ヨ嚜韬牱鏈� List houseSelf = houseService.findSelfHouseByParams(district, "sell", Integer.parseInt(startDate), Integer.parseInt(endDate), model.getMinPrice(), model.getMaxPrice(), estateType, pager); if(houseSelf!=null && houseSelf.size()>0){ caseDtos = createHouseCase(caseDtos, houseSelf, model.getShowSource(), ratio); @@ -6316,11 +6316,11 @@ public class PropertyController { return mav; } } - if(caseDtos.size() < pager.getPageSize() && StringUtils.isNotBlank(estateType) && district.getName().contains("别墅")){ + if(caseDtos.size() < pager.getPageSize() && StringUtils.isNotBlank(estateType) && district.getName().contains("鍒")){ District newDist = new District(); newDist.setCity(district.getCity()); newDist.setRegion(district.getRegion()); - newDist.setName(district.getName().replace("别墅","")); + newDist.setName(district.getName().replace("鍒","")); newDist.setEstateType2(estateType); houseSelf = houseService.findSelfHouseByParams(newDist, "sell", Integer.parseInt(startDate), Integer.parseInt(endDate), model.getMinPrice(), model.getMaxPrice(), estateType, pager); if(houseSelf!=null && houseSelf.size()>0){ @@ -6332,12 +6332,12 @@ public class PropertyController { } } } - //有物业类型且自身样本数据不足,忽略物业类型查 + //鏈夌墿涓氱被鍨嬩笖鑷韩鏍锋湰鏁版嵁涓嶈冻锛屽拷鐣ョ墿涓氱被鍨嬫煡 if(caseDtos.size() ==0 && StringUtils.isNotBlank(estateType)){ District newDist = new District(); newDist.setCity(district.getCity()); newDist.setRegion(district.getRegion()); - newDist.setName(district.getName().replace("别墅","")); + newDist.setName(district.getName().replace("鍒","")); newDist.setEstateType2(estateType); houseSelf = houseService.findSelfHouseByParams(newDist, "sell", Integer.parseInt(startDate), Integer.parseInt(endDate), model.getMinPrice(), model.getMaxPrice(), null, pager); if(houseSelf!=null && houseSelf.size()>0){ @@ -6350,7 +6350,7 @@ public class PropertyController { } } - //自身样本不足,查周边成交 + //鑷韩鏍锋湰涓嶈冻锛屾煡鍛ㄨ竟鎴愪氦 List districts = districtService.findNearestDistrict(district, 1000, 20); if(districts!=null && districts.size()>0){ for(District d : districts){ @@ -6375,7 +6375,7 @@ public class PropertyController { } - //自身成交,自身样本,周边成交不足,查周边挂牌 + //鑷韩鎴愪氦锛岃嚜韬牱鏈紝鍛ㄨ竟鎴愪氦涓嶈冻锛屾煡鍛ㄨ竟鎸傜墝 List houseAround = null; if (caseDtos.size() < pager.getPageSize() ) { Double lng = null; @@ -6388,17 +6388,17 @@ public class PropertyController { } }else if(StringUtils.isNotBlank(model.getLocation())){ String[] locationStr = model.getLocation().split(","); - String numberPattern = "-?\\d+(\\.\\d+)?"; // 匹配整数或浮点数 + String numberPattern = "-?\\d+(\\.\\d+)?"; // 鍖归厤鏁存暟鎴栨诞鐐规暟 for (String loc : locationStr) { if (!loc.trim().matches(numberPattern)) { - mav.setModel(BasicModel.buildBadRequestModel("location(经纬度)格式错误")); + mav.setModel(BasicModel.buildBadRequestModel("location(缁忕含搴�)鏍煎紡閿欒")); return mav; } } lng = Double.valueOf(locationStr[0]); lat = Double.valueOf(locationStr[1]); if (lng < 70 || lng > 140 || lat < 0 || lat > 55) { - mav.setModel(BasicModel.buildBadRequestModel("非中国经纬度")); + mav.setModel(BasicModel.buildBadRequestModel("闈炰腑鍥界粡绾害")); return mav; } } @@ -6421,7 +6421,7 @@ public class PropertyController { /** - * 公用案例接口 + * 鍏敤妗堜緥鎺ュ彛 * @param model * @param request * @return @@ -6431,12 +6431,12 @@ public class PropertyController { mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity())) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:城市为必填项")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:鍩庡競涓哄繀濉」")); return mav; } if (StringUtils.isBlank(model.getName()) && StringUtils.isBlank(model.getAddress()) ) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:名称或地址至少填一个")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:鍚嶇О鎴栧湴鍧�鑷冲皯濉竴涓�")); return mav; } @@ -6444,11 +6444,11 @@ public class PropertyController { String estateType = null; if(StringUtils.isNotBlank(model.getPropertyType())){ if(model.getPropertyType().equals("0")){ - estateType = "普通住宅"; + estateType = "鏅�氫綇瀹�"; }else if(model.getPropertyType().equals("1")){ - estateType = "别墅"; + estateType = "鍒"; }else if(model.getPropertyType().equals("2")){ - estateType = "商住"; + estateType = "鍟嗕綇"; } } @@ -6461,8 +6461,8 @@ public class PropertyController { if(StringUtils.isNotBlank(model.getAddress())){ resultObject = addressMatchProxyService.newMatch(model.getCity(), model.getAddress(), "property", false); }else if(StringUtils.isNotBlank(model.getName())){ - if(estateType !=null && estateType.equals("别墅") && !model.getName().contains("别墅")){ - resultObject = addressMatchProxyService.newMatch(model.getCity(), model.getName()+"别墅", "property", false); + if(estateType !=null && estateType.equals("鍒") && !model.getName().contains("鍒")){ + resultObject = addressMatchProxyService.newMatch(model.getCity(), model.getName()+"鍒", "property", false); }else{ resultObject = addressMatchProxyService.newMatch(model.getCity(), model.getName(), "property", false); } @@ -6497,7 +6497,7 @@ public class PropertyController { pager.setPageSize(5); } - // 默认1公里内 + // 榛樿1鍏噷鍐� if (model.getRadius() == null) { model.setRadius(1000); } @@ -6525,7 +6525,7 @@ public class PropertyController { } if(caseDtos.size() < pager.getPageSize()){ - //查自身样本 + //鏌ヨ嚜韬牱鏈� List houseSelf = houseService.findSelfHouseByParams(district, "rent", Integer.parseInt(startDate), Integer.parseInt(endDate), model.getMinPrice(), model.getMaxPrice(), estateType, pager); if(houseSelf!=null && houseSelf.size()>0){ caseDtos = createHouseCase(caseDtos, houseSelf, model.getShowSource(), ratio); @@ -6539,11 +6539,11 @@ public class PropertyController { } } - if(caseDtos.size() < pager.getPageSize() && StringUtils.isNotBlank(estateType) && district.getName().contains("别墅")){ + if(caseDtos.size() < pager.getPageSize() && StringUtils.isNotBlank(estateType) && district.getName().contains("鍒")){ District newDist = new District(); newDist.setCity(district.getCity()); newDist.setRegion(district.getRegion()); - newDist.setName(district.getName().replace("别墅","")); + newDist.setName(district.getName().replace("鍒","")); newDist.setEstateType2(estateType); houseSelf = houseService.findSelfHouseByParams(newDist, "rent", Integer.parseInt(startDate), Integer.parseInt(endDate), model.getMinPrice(), model.getMaxPrice(), estateType, pager); if(houseSelf!=null && houseSelf.size()>0){ @@ -6557,12 +6557,12 @@ public class PropertyController { } - //有物业类型且自身样本数据不足,忽略物业类型查 + //鏈夌墿涓氱被鍨嬩笖鑷韩鏍锋湰鏁版嵁涓嶈冻锛屽拷鐣ョ墿涓氱被鍨嬫煡 if(caseDtos.size() ==0 && StringUtils.isNotBlank(estateType)){ District newDist = new District(); newDist.setCity(district.getCity()); newDist.setRegion(district.getRegion()); - newDist.setName(district.getName().replace("别墅","")); + newDist.setName(district.getName().replace("鍒","")); newDist.setEstateType2(estateType); houseSelf = houseService.findSelfHouseByParams(newDist, "rent", Integer.parseInt(startDate), Integer.parseInt(endDate), model.getMinPrice(), model.getMaxPrice(), null, pager); if(houseSelf!=null && houseSelf.size()>0){ @@ -6577,7 +6577,7 @@ public class PropertyController { } } - //自身样本不足,查周边挂牌 + //鑷韩鏍锋湰涓嶈冻锛屾煡鍛ㄨ竟鎸傜墝 List houseAround = null; if (caseDtos.size() < pager.getPageSize() ) { Double lng = null; @@ -6590,17 +6590,17 @@ public class PropertyController { } }else if(StringUtils.isNotBlank(model.getLocation())){ String[] locationStr = model.getLocation().split(","); - String numberPattern = "-?\\d+(\\.\\d+)?"; // 匹配整数或浮点数 + String numberPattern = "-?\\d+(\\.\\d+)?"; // 鍖归厤鏁存暟鎴栨诞鐐规暟 for (String loc : locationStr) { if (!loc.trim().matches(numberPattern)) { - mav.setModel(BasicModel.buildBadRequestModel("location(经纬度)格式错误")); + mav.setModel(BasicModel.buildBadRequestModel("location(缁忕含搴�)鏍煎紡閿欒")); return mav; } } lng = Double.valueOf(locationStr[0]); lat = Double.valueOf(locationStr[1]); if (lng < 70 || lng > 140 || lat < 0 || lat > 55) { - mav.setModel(BasicModel.buildBadRequestModel("非中国经纬度")); + mav.setModel(BasicModel.buildBadRequestModel("闈炰腑鍥界粡绾害")); return mav; } } @@ -6622,7 +6622,7 @@ public class PropertyController { } /** - * 湖北征信定制接口 + * 婀栧寳寰佷俊瀹氬埗鎺ュ彛 * @param model * @param request * @return @@ -6632,12 +6632,12 @@ public class PropertyController { mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity())) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:城市为必填项")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:鍩庡競涓哄繀濉」")); return mav; } if (StringUtils.isBlank(model.getName()) && StringUtils.isBlank(model.getAddress()) ) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:名称或地址至少填一个")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:鍚嶇О鎴栧湴鍧�鑷冲皯濉竴涓�")); return mav; } @@ -6645,11 +6645,11 @@ public class PropertyController { String estateType = null; if(StringUtils.isNotBlank(model.getPropertyType())){ if(model.getPropertyType().equals("0")){ - estateType = "普通住宅"; + estateType = "鏅�氫綇瀹�"; }else if(model.getPropertyType().equals("1")){ - estateType = "别墅"; + estateType = "鍒"; }else if(model.getPropertyType().equals("2")){ - estateType = "商住"; + estateType = "鍟嗕綇"; } } @@ -6662,8 +6662,8 @@ public class PropertyController { if(StringUtils.isNotBlank(model.getAddress())){ resultObject = addressMatchProxyService.newMatch(model.getCity(), model.getAddress(), "property", false); }else if(StringUtils.isNotBlank(model.getName())){ - if(estateType !=null && estateType.equals("别墅") && !model.getName().contains("别墅")){ - resultObject = addressMatchProxyService.newMatch(model.getCity(), model.getName()+"别墅", "property", false); + if(estateType !=null && estateType.equals("鍒") && !model.getName().contains("鍒")){ + resultObject = addressMatchProxyService.newMatch(model.getCity(), model.getName()+"鍒", "property", false); }else{ resultObject = addressMatchProxyService.newMatch(model.getCity(), model.getName(), "property", false); } @@ -6740,7 +6740,7 @@ public class PropertyController { /** - * 湖北征信定制接口 + * 婀栧寳寰佷俊瀹氬埗鎺ュ彛 * @param model * @param request * @return @@ -6750,12 +6750,12 @@ public class PropertyController { mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity())) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:城市为必填项")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:鍩庡競涓哄繀濉」")); return mav; } if (StringUtils.isBlank(model.getName()) && StringUtils.isBlank(model.getAddress()) ) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:名称或地址至少填一个")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:鍚嶇О鎴栧湴鍧�鑷冲皯濉竴涓�")); return mav; } @@ -6763,11 +6763,11 @@ public class PropertyController { String estateType = null; if(StringUtils.isNotBlank(model.getPropertyType())){ if(model.getPropertyType().equals("0")){ - estateType = "普通住宅"; + estateType = "鏅�氫綇瀹�"; }else if(model.getPropertyType().equals("1")){ - estateType = "别墅"; + estateType = "鍒"; }else if(model.getPropertyType().equals("2")){ - estateType = "商住"; + estateType = "鍟嗕綇"; } } @@ -6780,8 +6780,8 @@ public class PropertyController { if(StringUtils.isNotBlank(model.getAddress())){ resultObject = addressMatchProxyService.newMatch(model.getCity(), model.getAddress(), "property", false); }else if(StringUtils.isNotBlank(model.getName())){ - if(estateType !=null && estateType.equals("别墅") && !model.getName().contains("别墅")){ - resultObject = addressMatchProxyService.newMatch(model.getCity(), model.getName()+"别墅", "property", false); + if(estateType !=null && estateType.equals("鍒") && !model.getName().contains("鍒")){ + resultObject = addressMatchProxyService.newMatch(model.getCity(), model.getName()+"鍒", "property", false); }else{ resultObject = addressMatchProxyService.newMatch(model.getCity(), model.getName(), "property", false); } @@ -6821,7 +6821,7 @@ public class PropertyController { DistrictStatBo statBo = districtStatService.findCurrentDistrictStat(new DistrictKey(district.getCity(), district.getRegion(), district.getName())); if(statBo != null) { - if(StringUtils.isNotBlank(district.getEstateType2()) && district.getEstateType2().equals("别墅")){ + if(StringUtils.isNotBlank(district.getEstateType2()) && district.getEstateType2().equals("鍒")){ avgPrice = Double.valueOf(statBo.getVillaDistrictStat().getAvg_price_2b()); }else{ avgPrice = Double.valueOf(statBo.getDistrictStat().getAvg_price_2b()); @@ -6886,7 +6886,7 @@ public class PropertyController { dto.setHall(String.valueOf(dp.getHall())); dto.setCaseDate(DateUtil.formatByPattern(dp.getTradeDate(), "yyyy-MM-dd")); if(showSource!=null && showSource==1){ - dto.setSource("成交"); + dto.setSource("鎴愪氦"); } caseDtos.add(dto); } @@ -6903,7 +6903,7 @@ public class PropertyController { while (iterator.hasNext()) { DealSample s = iterator.next(); if (!seenIds.add(s.getId())) { - // 如果已经存在,则从列表中移除 + // 濡傛灉宸茬粡瀛樺湪锛屽垯浠庡垪琛ㄤ腑绉婚櫎 iterator.remove(); } } @@ -6955,7 +6955,7 @@ public class PropertyController { double distance = GeoUtils.calculateDistance(locationMap.get("lon"), locationMap.get("lat"), lng, lat); caseDto.setDistance((int)distance); if(showSource!=null && showSource==1){ - caseDto.setSource("成交"); + caseDto.setSource("鎴愪氦"); } caseDtos.add(caseDto); } @@ -6990,7 +6990,7 @@ public class PropertyController { while (iterator.hasNext()) { Seawater s = iterator.next(); if (!seenIds.add(s.getId())) { - // 如果已经存在,则从列表中移除 + // 濡傛灉宸茬粡瀛樺湪锛屽垯浠庡垪琛ㄤ腑绉婚櫎 iterator.remove(); } } @@ -7038,16 +7038,16 @@ public class PropertyController { if (house.getpDate() != null && house.getpDate() > 10000000) { String numberStr = String.valueOf(house.getpDate()); - // 拆分字符串并格式化 - String year = numberStr.substring(0, 4); // 前四位是年份 - String month = numberStr.substring(4, 6); // 中间两位是月份 - String day = numberStr.substring(6, 8); // 最后两位是日期 + // 鎷嗗垎瀛楃涓插苟鏍煎紡鍖� + String year = numberStr.substring(0, 4); // 鍓嶅洓浣嶆槸骞翠唤 + String month = numberStr.substring(4, 6); // 涓棿涓や綅鏄湀浠� + String day = numberStr.substring(6, 8); // 鏈�鍚庝袱浣嶆槸鏃ユ湡 String formattedDate = year + "-" + month + "-" + day; caseDto.setCaseDate(formattedDate); } caseDto.setDistance(house.getDistance()); if(showSource!=null && showSource==1){ - caseDto.setSource("挂牌"); + caseDto.setSource("鎸傜墝"); } caseDtos.add(caseDto); } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ProvinceController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ProvinceController.java index b38fe58f5..d58bf9568 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ProvinceController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ProvinceController.java @@ -22,7 +22,7 @@ public class ProvinceController { for(String province : provinces){ ProvinceDto dto = new ProvinceDto(); dto.setName(province); - if("重庆".equals(province)){ + if("閲嶅簡".equals(province)){ dto.setSpell("chongqing"); }else{ dto.setSpell(DataUtil.hanyuQuanpin(province, "")); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/QhzxController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/QhzxController.java index 0cc2bcd0a..14cff2dd5 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/QhzxController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/QhzxController.java @@ -29,8 +29,8 @@ import java.util.Map; import java.util.Random; /** - * 前海征信定制化接口Controller - * @author 王文艳 + * 鍓嶆捣寰佷俊瀹氬埗鍖栨帴鍙ontroller + * @author 鐜嬫枃鑹� * @create 2016-10-09 **/ @Authority(role = Role.USER) @@ -84,14 +84,14 @@ public class QhzxController { dto.append("lat", district.getLat()/10000000000d); } dto.append("loopLine", district.getLoopLineInfo()); - if("district".equals(district.getCategory()) && "别墅".equals(district.getEstateType2())){ - dto.append("propertyType", "别墅"); - }else if("district".equals(district.getCategory()) && "普通住宅".equals(district.getEstateType2())){ - dto.append("propertyType", "住宅"); + if("district".equals(district.getCategory()) && "鍒".equals(district.getEstateType2())){ + dto.append("propertyType", "鍒"); + }else if("district".equals(district.getCategory()) && "鏅�氫綇瀹�".equals(district.getEstateType2())){ + dto.append("propertyType", "浣忓畢"); }else if("office".equals(district.getCategory())){ - dto.append("propertyType", "写字楼"); + dto.append("propertyType", "鍐欏瓧妤�"); }else{ - dto.append("propertyType", "其他"); + dto.append("propertyType", "鍏朵粬"); } DistrictStatBo districtStatBo = districtStatService.findLatestDistrictAvgPrice(district.getCity(), district.getRegion(), district.getName()); if(districtStatBo != null && districtStatBo.getDefaultDistrictStat() != null){ diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/QinLinController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/QinLinController.java index 8d3c59971..9e27eef75 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/QinLinController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/QinLinController.java @@ -24,8 +24,8 @@ import javax.validation.Valid; import java.util.*; /** - * 亲邻定制化接口开发 - * @author 王文艳 + * 浜查偦瀹氬埗鍖栨帴鍙e紑鍙� + * @author 鐜嬫枃鑹� * @create 2016-10-09 **/ @Authority(role = Role.USER) @@ -41,7 +41,7 @@ public class QinLinController { RestfulModelAndView mav = new RestfulModelAndView(); District district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(),"district"); if (null == district) { - mav.setModel(BasicModel.buildBadRequestModel("该小区不存在")); + mav.setModel(BasicModel.buildBadRequestModel("璇ュ皬鍖轰笉瀛樺湪")); return mav; } UniversalDto dto = UniversalDto.newDto(); @@ -49,7 +49,7 @@ public class QinLinController { List> stats = new ArrayList>(); DistrictSellStat latestStat = null; if(null != districtStats && districtStats.size()>0){ - latestStat = districtStats.get(0);//时间倒排取第一条 + latestStat = districtStats.get(0);//鏃堕棿鍊掓帓鍙栫涓�鏉� for (DistrictSellStat districtStat : districtStats) { Map item = new LinkedHashMap(); item.put("avgPrice", districtStat.getAvgPrice()); @@ -96,13 +96,13 @@ public class QinLinController { if(nearestClassicPois != null){ for (BasicDBObject poi : nearestClassicPois) { if ("150500".equals(poi.get("code")) && (Double) poi.get("distance") < 1000) { - featureLabels.add("交通便利"); + featureLabels.add("浜ら�氫究鍒�"); } else if (poi.get("code").toString().startsWith("14120") && (Double) poi.get("distance") < 1000) { - featureLabels.add("靠近学校"); + featureLabels.add("闈犺繎瀛︽牎"); } List codes = Arrays.asList("060101", "050302", "050301", "050501"); if (codes.contains(poi.get("code").toString()) && (Double) poi.get("distance") < 500) { - featureLabels.add("繁华"); + featureLabels.add("绻佸崕"); } } } @@ -113,12 +113,12 @@ public class QinLinController { featureLabels.add(districtAnalyData.getEconomic()); } } - if (district.getEstateType2().contains("别墅")) { - featureLabels.add("别墅"); + if (district.getEstateType2().contains("鍒")) { + featureLabels.add("鍒"); } RegionBlock regionBlock = regionBlockService.getRegionBlockByCityRegion(district.getCity(), district.getRegion()); - if(regionBlock != null && regionBlock.getRankingLevel() != null && regionBlock.getRankingLevel().contains("县")){ - featureLabels.add("县城"); + if(regionBlock != null && regionBlock.getRankingLevel() != null && regionBlock.getRankingLevel().contains("鍘�")){ + featureLabels.add("鍘垮煄"); } dto.append("featureLabels", featureLabels); dto.append("stats", stats); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/QuotationsController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/QuotationsController.java index 7476a3fab..8384b4730 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/QuotationsController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/QuotationsController.java @@ -65,7 +65,7 @@ public class QuotationsController { } /** - * 查询区域的月均价 + * 鏌ヨ鍖哄煙鐨勬湀鍧囦环 * @param model * @return */ @@ -106,7 +106,7 @@ public class QuotationsController { return mav; } - //全国均价涨跌统计 + //鍏ㄥ浗鍧囦环娑ㄨ穼缁熻 public Object statisticsAction(CityQuotationModel model){ RestfulModelAndView mav = new RestfulModelAndView(); CityNewPrice cityNewPrice = cityNewPriceService.findFirstByStatDate(); @@ -125,7 +125,7 @@ public class QuotationsController { } - //全国均价 + //鍏ㄥ浗鍧囦环 public Object cityListAction(CityQuotationModel model){ RestfulModelAndView mav = new RestfulModelAndView(); CityNewPrice cityNewPrice = cityNewPriceService.findFirstByStatDate(); @@ -138,7 +138,7 @@ public class QuotationsController { return mav; } - //有房首页获取城市信息 + //鏈夋埧棣栭〉鑾峰彇鍩庡競淇℃伅 public Object getYouFangCityAction(CityQuotationModel model){ RestfulModelAndView mav = new RestfulModelAndView(); CityNewPrice cityNewPrice = cityNewPriceService.findFirstByStatDate(); @@ -155,7 +155,7 @@ public class QuotationsController { return mav; } - //区域均价 + //鍖哄煙鍧囦环 public Object regionMonthPricesAction(CityQuotationModel model){ RestfulModelAndView mav = new RestfulModelAndView(); RegionSellStat regionSellStat = regionSellStatService.findNewestRegionPrice(); @@ -169,7 +169,7 @@ public class QuotationsController { } /** - * 获取城市均价及挂牌量 + * 鑾峰彇鍩庡競鍧囦环鍙婃寕鐗岄噺 * @param model * @return */ @@ -178,19 +178,19 @@ public class QuotationsController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(model.getCityName())|| null==model.getType()) { - mav.setModel(BasicModel.buildBadRequestModel("参数缺失:city(城市),type(期数)是必须参数")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟缂哄け:city(鍩庡競),type(鏈熸暟)鏄繀椤诲弬鏁�")); return mav; } - if(model.getType() == 1){ //季度 + if(model.getType() == 1){ //瀛e害 type = -3; - }else if(model.getType() == 2){ //半年 + }else if(model.getType() == 2){ //鍗婂勾 type = -6; - }else if(model.getType() == 3){ //一年 + }else if(model.getType() == 3){ //涓�骞� type = -12; - }else if(model.getType() == 4){ //两年 + }else if(model.getType() == 4){ //涓ゅ勾 type = -24; - }else if(model.getType() == 5){ //三年 + }else if(model.getType() == 5){ //涓夊勾 type = -36; } List dates = DateUtil.getLastDayBetweenDates(DateUtil.addMonthToDate(new Date(),type), new Date()); @@ -241,7 +241,7 @@ public class QuotationsController { } /** - * 根据小区最新价格信息 + * 鏍规嵁灏忓尯鏈�鏂颁环鏍间俊鎭� * @param model * @return */ @@ -253,7 +253,7 @@ public class QuotationsController { } /** - * 根据条件查询周围小区 + * 鏍规嵁鏉′欢鏌ヨ鍛ㄥ洿灏忓尯 * @param model * @return */ @@ -265,7 +265,7 @@ public class QuotationsController { if(model.getLng()!=0 && model.getLat()!=0){ centre = new Point(model.getLng(), model.getLat()); radius = 10000; - //如果不是有经纬度且按距离排序则查询出所有的小区 + //濡傛灉涓嶆槸鏈夌粡绾害涓旀寜璺濈鎺掑簭鍒欐煡璇㈠嚭鎵�鏈夌殑灏忓尯 if(model.getSort()==1){ model.setLimit(30); } @@ -275,11 +275,11 @@ public class QuotationsController { List list = new ArrayList(); if(null != districtNewPriceList){ if(model.getLng()!=0 && model.getLat()!=0){ - for(DistrictNewPrice districtNewPrice:districtNewPriceList){ //查询小区距离 + for(DistrictNewPrice districtNewPrice:districtNewPriceList){ //鏌ヨ灏忓尯璺濈 double distance = GeoUtils.calculateDistance(districtNewPrice.getLng2(), districtNewPrice.getLat2(), model.getLng(), model.getLat()); districtNewPrice.setDistance(distance); } - //如果是按照距离排序 + //濡傛灉鏄寜鐓ц窛绂绘帓搴� if(model.getSort()==1){ orderByDistance(districtNewPriceList); } @@ -295,7 +295,7 @@ public class QuotationsController { } /** - * 查询不同城市的均价范围 + * 鏌ヨ涓嶅悓鍩庡競鐨勫潎浠疯寖鍥� * @param model * @return */ @@ -311,19 +311,19 @@ public class QuotationsController { /** - * 城市下的小区信息统计(小区上涨数量,下跌数量) + * 鍩庡競涓嬬殑灏忓尯淇℃伅缁熻锛堝皬鍖轰笂娑ㄦ暟閲忥紝涓嬭穼鏁伴噺锛� * @param model * @return */ public Object cityDistrictStatInfoAction(CityPriceIntervalModel model) { RestfulModelAndView mav = new RestfulModelAndView(); if (StringUtils.isBlank(model.getCity())) { - mav.setModel(BasicModel.buildBadRequestModel("参数缺失:city(城市)")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟缂哄け:city(鍩庡競)")); return mav; } - // 小区上涨数量 + // 灏忓尯涓婃定鏁伴噺 Long upCount = districtSellStatService.findCityMarkUpDistrictCount(model.getCity()); - // 小区下跌数量 + // 灏忓尯涓嬭穼鏁伴噺 Long downCount = districtSellStatService.findCityMarkDownDistrictCount(model.getCity()); Map result = new HashMap(); result.put("upCount", upCount); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/RegionController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/RegionController.java index eace5ec0a..2195d4a0a 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/RegionController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/RegionController.java @@ -33,14 +33,14 @@ import com.fangjia.service.mongo.fangjia.RegionBlockService; import com.fangjia.service.open.RegionPotentialService; /** - * 区域controller + * 鍖哄煙controller * * @author liupei */ @Authority(role = Role.USER) public class RegionController { /** - * 城市区域板块均价Service + * 鍩庡競鍖哄煙鏉垮潡鍧囦环Service */ private RegionStatService regionStatService; @@ -53,7 +53,7 @@ public class RegionController { private DealPriceService dealPriceService; /** - * 区域均价Action + * 鍖哄煙鍧囦环Action * * @return */ @@ -62,7 +62,7 @@ public class RegionController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(city) || StringUtils.isBlank(region)) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "城市,区域为必填项")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鍩庡競,鍖哄煙涓哄繀濉」")); return mav; } if (null == weekCount || 0 == weekCount) { @@ -70,7 +70,7 @@ public class RegionController { } List regionStatList = regionStatService.findRegionStat(city, region, null, new Date(), weekCount); if (CollectionUtils.isEmpty(regionStatList)) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "该区域没有均价数据")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "璇ュ尯鍩熸病鏈夊潎浠锋暟鎹�")); return mav; } Map map = new HashMap(1); @@ -83,12 +83,12 @@ public class RegionController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getDistrict())) { - mav.setModel(BasicModel.buildBadRequestModel("参数缺失:city(城市),district(区域)是必须参数")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟缂哄け:city(鍩庡競),district(鍖哄煙)鏄繀椤诲弬鏁�")); return mav; } List regions = regionBlockService.findAllRegion(model.getCity()); if(!regions.contains(model.getDistrict())){ - mav.setModel(BasicModel.buildBadRequestModel("没有找你输入的区域")); + mav.setModel(BasicModel.buildBadRequestModel("娌℃湁鎵句綘杈撳叆鐨勫尯鍩�")); return mav; } @@ -96,7 +96,7 @@ public class RegionController { model.setPeriodCount(1); } if(model.getPeriodCount()< 1 || model.getPeriodCount()>156){ - mav.setModel(BasicModel.buildBadRequestModel("periodCount值不合法,取值范围是:[1-156]")); + mav.setModel(BasicModel.buildBadRequestModel("periodCount鍊间笉鍚堟硶,鍙栧�艰寖鍥存槸锛歔1-156]")); return mav; } @@ -104,7 +104,7 @@ public class RegionController { model.setPeriodType("weekly"); }else{ if(!"weekly".equals(model.getPeriodType()) && !"monthly".equals(model.getPeriodType())){ - mav.setModel(BasicModel.buildBadRequestModel("periodModel值非法,合法值为:weekly,monthly")); + mav.setModel(BasicModel.buildBadRequestModel("periodModel鍊奸潪娉曪紝鍚堟硶鍊间负:weekly,monthly")); return mav; } } @@ -138,7 +138,7 @@ public class RegionController { } /** - * 区域历史均价 + * 鍖哄煙鍘嗗彶鍧囦环 * * @param city * @param region @@ -150,7 +150,7 @@ public class RegionController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(name)) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "区域为必填项")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鍖哄煙涓哄繀濉」")); return mav; } if (null == weekCount || weekCount <= 0) { @@ -159,12 +159,12 @@ public class RegionController { city = knowbaseService.matchingCityDefaultNull(city); if (null == city) { - city = "上海"; + city = "涓婃捣"; } name = knowbaseService.matchingRegionDefaultNull(name, city); List regionStatList = regionStatService.findRegionStat(city, name, null, new Date(), weekCount); if (CollectionUtils.isEmpty(regionStatList)) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "该区域没有均价数据")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "璇ュ尯鍩熸病鏈夊潎浠锋暟鎹�")); return mav; } Map map = new HashMap(1); @@ -178,7 +178,7 @@ public class RegionController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(region)||StringUtils.isBlank(block)) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "区域和板块为必填项")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鍖哄煙鍜屾澘鍧椾负蹇呭~椤�")); return mav; } if (null == weekCount || weekCount <= 0) { @@ -187,21 +187,21 @@ public class RegionController { city = knowbaseService.matchingCityDefaultNull(city); if (null == city) { - city = "上海"; + city = "涓婃捣"; } region = knowbaseService.matchingRegionDefaultNull(region, city); if(null == region){ - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_INVALID, "区域信息无效")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_INVALID, "鍖哄煙淇℃伅鏃犳晥")); return mav; } block = knowbaseService.matchingBlockDefaultNull(block, region, city); if(null == block){ - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_INVALID, "板块信息无效")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_INVALID, "鏉垮潡淇℃伅鏃犳晥")); return mav; } List regionStatList = regionStatService.findRegionStat(city, region, block, new Date(), weekCount); if (CollectionUtils.isEmpty(regionStatList)) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "该板块没有均价数据")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "璇ユ澘鍧楁病鏈夊潎浠锋暟鎹�")); return mav; } Map map = new HashMap(1); @@ -214,11 +214,11 @@ public class RegionController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(city)) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "城市不能为空")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鍩庡競涓嶈兘涓虹┖")); return mav; } if (StringUtils.isBlank(region)) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "区域不能为空")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鍖哄煙涓嶈兘涓虹┖")); return mav; } @@ -239,10 +239,10 @@ public class RegionController { } /** - * 区域信息,目前用在有房APP首页上 - * @param city 城市 - * @param region 区域 - * @param date 月份 + * 鍖哄煙淇℃伅锛岀洰鍓嶇敤鍦ㄦ湁鎴緼PP棣栭〉涓� + * @param city 鍩庡競 + * @param region 鍖哄煙 + * @param date 鏈堜唤 * @return */ public Object infoAction(@Param(name="city")String city, @Param(name="region")String region @@ -250,18 +250,18 @@ public class RegionController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(city)) { - mav.setModel(BasicModel.buildBadRequestModel("城市不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍩庡競涓嶈兘涓虹┖")); return mav; } if (StringUtils.isBlank(region)) { - mav.setModel(BasicModel.buildBadRequestModel("区域不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍖哄煙涓嶈兘涓虹┖")); return mav; } Map res = new LinkedHashMap(); - // 区域潜力指数 + // 鍖哄煙娼滃姏鎸囨暟 RegionPotential regionPotential = regionPotentialService.getRegionPotential(city, region); if (regionPotential != null) { res.put("index", regionPotential.getRegionIndex()); @@ -269,7 +269,7 @@ public class RegionController { res.put("index", -1); } - // 区域时间段的成交数量 + // 鍖哄煙鏃堕棿娈电殑鎴愪氦鏁伴噺 /*if (StringUtils.isBlank(startDate) && StringUtils.isBlank(endDate)) { Date start = DateUtil.getFirstDayOfLastMonth(new Date()); Date end = DateUtil.getLastDayOfMonth(new Date(), -1); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/RentController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/RentController.java index 0c5f5004f..e5b89aeb2 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/RentController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/RentController.java @@ -56,17 +56,17 @@ public class RentController { private EvaluationService evaluationService; private SeawaterService seawaterService; private HouseService houseService; - //城市平米租金 + //鍩庡競骞崇背绉熼噾 public Object cityRentAction(RentModel rentModel){ RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(rentModel.getCity())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "城市名为必填项")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鍩庡競鍚嶄负蹇呭~椤�")); return mav; } ServerArea serverArea = ServerAreaData.getServerAreaByCity(rentModel.getCity()); if (null == serverArea) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "对应的城市不存在")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "瀵瑰簲鐨勫煄甯備笉瀛樺湪")); return mav; } @@ -78,18 +78,18 @@ public class RentController { mav.setModel(BasicModel.buildOKModel().setResult(map)); return mav; } - //区域平米租金 + //鍖哄煙骞崇背绉熼噾 public Object regionRentAction(RentModel rentModel){ RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(rentModel.getCity()) || StringUtils.isBlank(rentModel.getDistrict())) { - mav.setModel(BasicModel.buildBadRequestModel("参数缺失:city(城市),district(区域)是必须参数")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟缂哄け:city(鍩庡競),district(鍖哄煙)鏄繀椤诲弬鏁�")); return mav; } String region = RegionData.formatRegion(rentModel.getCity(), rentModel.getDistrict()); rentModel.setDistrict(region); if(!RegionData.isRegion(rentModel.getCity(), region)){ - mav.setModel(BasicModel.buildBadRequestModel("没有找你输入的区域")); + mav.setModel(BasicModel.buildBadRequestModel("娌℃湁鎵句綘杈撳叆鐨勫尯鍩�")); return mav; } SqmetreRent sqmetreRent = sqmetreRentService.findNearestSqmetreRent(rentModel.getCity(), region, null,rentModel.getEndDate(), "region"); @@ -102,18 +102,18 @@ public class RentController { mav.setModel(BasicModel.buildOKModel().setResult(map)); return mav; } - //小区平米租金 + //灏忓尯骞崇背绉熼噾 public Object districtRentAction(RentModel rentModel){ RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(rentModel.getCity()) || StringUtils.isBlank(rentModel.getName()) || StringUtils.isBlank(rentModel.getDistrict())) { - mav.setModel(BasicModel.buildBadRequestModel("参数缺失:city(城市),district(区域),name(小区名)是必须参数")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟缂哄け:city(鍩庡競),district(鍖哄煙),name(灏忓尯鍚�)鏄繀椤诲弬鏁�")); return mav; } District district = districtService.findByNameAndAlias(rentModel.getCity(), rentModel.getDistrict(), rentModel.getName(), "district"); if (null == district) { - mav.setModel(BasicModel.buildBadRequestModel("该小区不存在")); + mav.setModel(BasicModel.buildBadRequestModel("璇ュ皬鍖轰笉瀛樺湪")); return mav; } SqmetreRent sqmetreRent = sqmetreRentService.findNearestSqmetreRent(district.getCity(), district.getRegion(), district.getName(),rentModel.getEndDate(), "district"); @@ -127,18 +127,18 @@ public class RentController { return mav; } - //小区室租金 + //灏忓尯瀹ょ閲� public Object districtRoomRentAction(RentModel rentModel){ RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(rentModel.getCity()) || StringUtils.isBlank(rentModel.getName()) || StringUtils.isBlank(rentModel.getDistrict())) { - mav.setModel(BasicModel.buildBadRequestModel("参数缺失:city(城市),district(区域),name(小区名)是必须参数")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟缂哄け:city(鍩庡競),district(鍖哄煙),name(灏忓尯鍚�)鏄繀椤诲弬鏁�")); return mav; } District district = districtService.findByNameAndAlias(rentModel.getCity(), rentModel.getDistrict(), rentModel.getName(), "district"); if (null == district) { - mav.setModel(BasicModel.buildBadRequestModel("该小区不存在")); + mav.setModel(BasicModel.buildBadRequestModel("璇ュ皬鍖轰笉瀛樺湪")); return mav; } List rentBos = districtStatRentService.findByDistrictStatRent(new DistrictKey(district.getCity(), district.getRegion(), district.getName())); @@ -160,33 +160,33 @@ public class RentController { } - //获取小区室租金,平米租金及小区均价 + //鑾峰彇灏忓尯瀹ょ閲戯紝骞崇背绉熼噾鍙婂皬鍖哄潎浠� public Object districtInfoAction(RentModel rentModel){ RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(rentModel.getCity()) || StringUtils.isBlank(rentModel.getName()) || StringUtils.isBlank(rentModel.getDistrict())) { - mav.setModel(BasicModel.buildBadRequestModel("参数缺失:city(城市),district(区域),name(小区名)是必须参数")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟缂哄け:city(鍩庡競),district(鍖哄煙),name(灏忓尯鍚�)鏄繀椤诲弬鏁�")); return mav; } District district = districtService.findByNameAndAlias(rentModel.getCity(), rentModel.getDistrict(), rentModel.getName(), "district"); if (null == district) { - mav.setModel(BasicModel.buildBadRequestModel("该小区不存在")); + mav.setModel(BasicModel.buildBadRequestModel("璇ュ皬鍖轰笉瀛樺湪")); return mav; } DistrictPriceDto dto = new DistrictPriceDto(); - //室租金 + //瀹ょ閲� List> roomPrices = getDistrictRoomPrice(district); if(roomPrices.size()>0){ dto.setRooms(roomPrices); } - //平米租金 + //骞崇背绉熼噾 Double sqmetreRent = getSqmetreRent(district); if(sqmetreRent != null){ dto.setRent(sqmetreRent); } - //小区均价 + //灏忓尯鍧囦环 DistrictStatBo statBo = districtStatService.findDistrictStat(new DistrictKey(district.getCity(), district.getRegion(), district.getName())); if(statBo!=null){ if(statBo.getDistrictStat()!=null){ @@ -229,24 +229,24 @@ public class RentController { public Object cityRentTrendsAction(RentModel rentModel){ int week = 3; - int type = 0; //月份 + int type = 0; //鏈堜唤 RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(rentModel.getCity())|| null==rentModel.getType()) { - mav.setModel(BasicModel.buildBadRequestModel("参数缺失:city(城市),type(期数)是必须参数")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟缂哄け:city(鍩庡競),type(鏈熸暟)鏄繀椤诲弬鏁�")); return mav; } - if(rentModel.getType() == 1){ //季度 + if(rentModel.getType() == 1){ //瀛e害 week = 3; type = -3; - }else if(rentModel.getType() == 2){ //半年 + }else if(rentModel.getType() == 2){ //鍗婂勾 week = 6; type = -6; - }else if(rentModel.getType() == 3){ //一年 + }else if(rentModel.getType() == 3){ //涓�骞� week = 12; type = -12; - }else if(rentModel.getType() == 4){ //两年 + }else if(rentModel.getType() == 4){ //涓ゅ勾 week = 24; type = -24; } @@ -287,28 +287,28 @@ public class RentController { /** - * 小区户型租金 + * 灏忓尯鎴峰瀷绉熼噾 * @param rentModel * @return */ public Object getDistrictRentTrendsAction(RentModel rentModel){ - int type = 0; //月份 + int type = 0; //鏈堜唤 RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(rentModel.getCity())||StringUtils.isBlank(rentModel.getDistrict())||StringUtils.isBlank(rentModel.getName())|| null==rentModel.getType()) { - mav.setModel(BasicModel.buildBadRequestModel("参数缺失:city(城市),district(区域),name(名称),type(期数)是必须参数")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟缂哄け:city(鍩庡競),district(鍖哄煙),name(鍚嶇О),type(鏈熸暟)鏄繀椤诲弬鏁�")); return mav; } - if(rentModel.getType() == 0){ //一个月 + if(rentModel.getType() == 0){ //涓�涓湀 type = -1; - }else if(rentModel.getType() == 1){ //季度 + }else if(rentModel.getType() == 1){ //瀛e害 type = -3; - }else if(rentModel.getType() == 2){ //半年 + }else if(rentModel.getType() == 2){ //鍗婂勾 type = -6; - }else if(rentModel.getType() == 3){ //一年 + }else if(rentModel.getType() == 3){ //涓�骞� type = -12; - }else if(rentModel.getType() == 4){ //两年 + }else if(rentModel.getType() == 4){ //涓ゅ勾 type = -24; } Map trendsMap = districtStatRentService.getRentTrend(rentModel.getCity(), rentModel.getDistrict(), rentModel.getName(), type); @@ -321,13 +321,13 @@ public class RentController { // // if (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getName()) // || StringUtils.isBlank(model.getDistrict()) || model.getSize() <= 0) { -// mav.setModel(BasicModel.buildBadRequestModel("参数非法:城市,区域,小区名,面积(size)为必填项")); +// mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:鍩庡競,鍖哄煙,灏忓尯鍚�,闈㈢Н(size)涓哄繀濉」")); // return mav; // } // // District district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(),"district"); // if (null == district) { -// mav.setModel(BasicModel.buildBadRequestModel("小区不存在")); +// mav.setModel(BasicModel.buildBadRequestModel("灏忓尯涓嶅瓨鍦�")); // return mav; // } // @@ -336,17 +336,17 @@ public class RentController { // // Integer startDate = Integer.parseInt(DateUtils.format(DateUtil.addMonthToDate(new Date(), -12), "yyyyMMdd")); // -// //相似房源 +// //鐩镐技鎴挎簮 // List houses = seawaterService.findSeawatersFromEs2("rent", district.getCity(), district.getRegion(), district.getName(), null, null, startDate, null, // startArea, endArea, null, null, null, null, "p_date", false, 1, 5 , null,"seawater-20*/_doc"); // Map retMap = new HashMap(); // retMap.put("houses", houses); // -// if (null == model.getRadius()) {// 设置默认值 +// if (null == model.getRadius()) {// 璁剧疆榛樿鍊� // model.setRadius(2000); // } // -// //相近小区 +// //鐩歌繎灏忓尯 // List districts = districtService.findNearestDistrict(district, model.getRadius(), 50); // if (null != districts) { // Integer room = null; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/RentHouseController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/RentHouseController.java index c935c0a6b..e8e34b5b3 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/RentHouseController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/RentHouseController.java @@ -62,7 +62,7 @@ import com.fangjia.service.web.MenuService; import org.springframework.web.multipart.MultipartFile; /** - * 租房接口 + * 绉熸埧鎺ュ彛 * * @author velna * @@ -85,14 +85,14 @@ public class RentHouseController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if(model.getImage() == null || model.getImage().length == 0){ - mav.setModel(BasicModel.buildBadRequestModel("图片不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍥剧墖涓嶈兘涓虹┖")); return mav; } MultipartFile[] images = model.getImage(); for (int i = 0; i < images.length; i++) { MultipartFile img = images[i]; if(img.getSize() > MAX_PIC_SIZE){ - mav.setModel(BasicModel.buildBadRequestModel("图片过大")); + mav.setModel(BasicModel.buildBadRequestModel("鍥剧墖杩囧ぇ")); return mav; } } @@ -102,19 +102,19 @@ public class RentHouseController { RentHouse house = createHouse(model,Integer.valueOf(userId)); if(StringUtils.isNotBlank(house.getId())){ if(StringUtils.isBlank(model.getId()) || !ObjectId.isValid(model.getId())){ - mav.setModel(BasicModel.buildBadRequestModel("房源id不合法")); + mav.setModel(BasicModel.buildBadRequestModel("鎴挎簮id涓嶅悎娉�")); return mav; } RentHouse dbHouse = rentHouseService.findRentHouseById(model.getId()); if(dbHouse == null){ - mav.setModel(BasicModel.buildBadRequestModel("房源不存在")); + mav.setModel(BasicModel.buildBadRequestModel("鎴挎簮涓嶅瓨鍦�")); return mav; } if(!userId.equals(dbHouse.getUserId().toString())){ - mav.setModel(BasicModel.buildUnAuthorizedModel().setMsg("你没有权限修改该房源")); + mav.setModel(BasicModel.buildUnAuthorizedModel().setMsg("浣犳病鏈夋潈闄愪慨鏀硅鎴挎簮")); return mav; } - for(String pic : dbHouse.getPics()){//删除过时的房源图片 + for(String pic : dbHouse.getPics()){//鍒犻櫎杩囨椂鐨勬埧婧愬浘鐗� fileDao.delete(pic,"user_house","o"); fileDao.delete(pic,"user_house","s"); fileDao.delete(pic,"user_house","m"); @@ -146,22 +146,22 @@ public class RentHouseController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if(StringUtils.isBlank(model.getId())){ - mav.setModel(BasicModel.buildBadRequestModel("房源id不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鎴挎簮id涓嶈兘涓虹┖")); return mav; } if(StringUtils.isBlank(model.getId()) || !ObjectId.isValid(model.getId())){ - mav.setModel(BasicModel.buildBadRequestModel("房源id不合法")); + mav.setModel(BasicModel.buildBadRequestModel("鎴挎簮id涓嶅悎娉�")); return mav; } RentHouse dbHouse = rentHouseService.findRentHouseById(model.getId()); if(dbHouse == null || dbHouse.getStatus() == HOUSE_DELETE_STATUS){ - mav.setModel(BasicModel.buildBadRequestModel("房源不存在")); + mav.setModel(BasicModel.buildBadRequestModel("鎴挎簮涓嶅瓨鍦�")); return mav; } Map tokenMap = FangjiaApiUtil.parseToken(model.getToken()); String userId = tokenMap.get("userid"); if(dbHouse.getUserId() == null || !userId.equals(dbHouse.getUserId().toString())){ - mav.setModel(BasicModel.buildUnAuthorizedModel().setMsg("你没有权限访问该房源")); + mav.setModel(BasicModel.buildUnAuthorizedModel().setMsg("浣犳病鏈夋潈闄愯闂鎴挎簮")); return mav; } mav.setModel(BasicModel.buildOKModel().setResult(new RentHouseDto(dbHouse))); @@ -172,26 +172,26 @@ public class RentHouseController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if(StringUtils.isBlank(model.getId())){ - mav.setModel(BasicModel.buildBadRequestModel("房源id不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鎴挎簮id涓嶈兘涓虹┖")); return mav; } if(StringUtils.isBlank(model.getId()) || !ObjectId.isValid(model.getId())){ - mav.setModel(BasicModel.buildBadRequestModel("房源id不合法")); + mav.setModel(BasicModel.buildBadRequestModel("鎴挎簮id涓嶅悎娉�")); return mav; } RentHouse dbHouse = rentHouseService.findRentHouseById(model.getId()); if(dbHouse == null || dbHouse.getStatus() == HOUSE_DELETE_STATUS){ - mav.setModel(BasicModel.buildBadRequestModel("房源不存在")); + mav.setModel(BasicModel.buildBadRequestModel("鎴挎簮涓嶅瓨鍦�")); return mav; } Map tokenMap = FangjiaApiUtil.parseToken(model.getToken()); String userId = tokenMap.get("userid"); if(dbHouse.getUserId() == null || !userId.equals(dbHouse.getUserId().toString())){ - mav.setModel(BasicModel.buildUnAuthorizedModel().setMsg("你没有权限删除该房源")); + mav.setModel(BasicModel.buildUnAuthorizedModel().setMsg("浣犳病鏈夋潈闄愬垹闄よ鎴挎簮")); return mav; } rentHouseService.logicDeleteRentHouseById(dbHouse.getId()); - mav.setModel(BasicModel.buildOKModel().setMsg("删除成功")); + mav.setModel(BasicModel.buildOKModel().setMsg("鍒犻櫎鎴愬姛")); return mav; } @@ -199,30 +199,30 @@ public class RentHouseController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if(StringUtils.isBlank(model.getId())){ - mav.setModel(BasicModel.buildBadRequestModel("房源id不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鎴挎簮id涓嶈兘涓虹┖")); return mav; } if(StringUtils.isBlank(model.getId()) || !ObjectId.isValid(model.getId())){ - mav.setModel(BasicModel.buildBadRequestModel("房源id不合法")); + mav.setModel(BasicModel.buildBadRequestModel("鎴挎簮id涓嶅悎娉�")); return mav; } RentHouse dbHouse = rentHouseService.findRentHouseById(model.getId()); if(dbHouse == null || dbHouse.getStatus() == HOUSE_DELETE_STATUS){ - mav.setModel(BasicModel.buildBadRequestModel("房源不存在")); + mav.setModel(BasicModel.buildBadRequestModel("鎴挎簮涓嶅瓨鍦�")); return mav; } Map tokenMap = FangjiaApiUtil.parseToken(model.getToken()); String userId = tokenMap.get("userid"); if(dbHouse.getUserId() == null || !userId.equals(dbHouse.getUserId().toString())){ - mav.setModel(BasicModel.buildUnAuthorizedModel().setMsg("你没有权限删除该房源")); + mav.setModel(BasicModel.buildUnAuthorizedModel().setMsg("浣犳病鏈夋潈闄愬垹闄よ鎴挎簮")); return mav; } boolean refresh = rentHouseService.refreshHouse(dbHouse.getId(), Integer.valueOf(userId), "api"); if(!refresh){ - mav.setModel(BasicModel.buildOKModel().setMsg("每天只能刷新一次房源")); + mav.setModel(BasicModel.buildOKModel().setMsg("姣忓ぉ鍙兘鍒锋柊涓�娆℃埧婧�")); return mav; }else{ - mav.setModel(BasicModel.buildOKModel().setMsg("刷新成功")); + mav.setModel(BasicModel.buildOKModel().setMsg("鍒锋柊鎴愬姛")); return mav; } } @@ -279,7 +279,7 @@ public class RentHouseController { } /** - * 租房搜索 + * 绉熸埧鎼滅储 * * @return */ @@ -299,7 +299,7 @@ public class RentHouseController { pager.setStartRow(startRow); } if (StringUtils.isBlank(model.getCity())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "城市输入错误")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鍩庡競杈撳叆閿欒")); } else { String sortField = model.getSortField(); boolean asc; @@ -362,7 +362,7 @@ public class RentHouseController { } /** - * 租房详情 + * 绉熸埧璇︽儏 * * @return */ @@ -389,16 +389,16 @@ public class RentHouseController { } houseBo.setPics(picsNew); } - // 去除电话乱码 + // 鍘婚櫎鐢佃瘽涔辩爜 houseBo.setMobile(PhoneNormalizer.normalizeContactPhone(ServerAreaData.getServerAreaByDisplay(houseBo.getCity()), false, houseBo.getMobile())); - // 若为400电话,格式化 + // 鑻ヤ负400鐢佃瘽,鏍煎紡鍖� if (StringUtils.isNotBlank(houseBo.getMobile())) { if (houseBo.getMobile().trim().startsWith("400")) { houseBo.setMobile(PhoneNormalizer.normalizeContact400Phone(houseBo.getMobile())); } } -// // 获取400电话 +// // 鑾峰彇400鐢佃瘽 // CpcBo cpcBo = cpcService.checkCpcUserEnable(rentHouse); // if (null != cpcBo) { // if (cpcBo.getEnabled400()) { @@ -418,7 +418,7 @@ public class RentHouseController { } /** - * 取得过期租房房源接口 + * 鍙栧緱杩囨湡绉熸埧鎴挎簮鎺ュ彛 * * @param model * @param request @@ -440,14 +440,14 @@ public class RentHouseController { pager.setStartRow(startRow); } if (StringUtils.isBlank(model.getCity())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "城市输入错误")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鍩庡競杈撳叆閿欒")); } else { List params = new ArrayList(); params.add(new QueryParam("city", model.getCity())); FacetQueryResult houseList = new FacetQueryResult(); if (StringUtils.isNotBlank(model.getUrl())) { HouseBo houseBo = openRentHouseService.findByFullMode(this.getRentHouseIdByUrl(model.getUrl())); - if (houseBo == null || !houseBo.getPublishDate().before(DateUtil.getBeforeDay(new Date(), 21))) {// 已过期 + if (houseBo == null || !houseBo.getPublishDate().before(DateUtil.getBeforeDay(new Date(), 21))) {// 宸茶繃鏈� houseList.setNumberFound(0); } else { RentHouse house = new RentHouse(); @@ -477,7 +477,7 @@ public class RentHouseController { } /** - * 取得租房新增房源接口 + * 鍙栧緱绉熸埧鏂板鎴挎簮鎺ュ彛 * * @return */ @@ -497,7 +497,7 @@ public class RentHouseController { pager.setStartRow(startRow); } if (StringUtils.isBlank(model.getCity())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "城市输入错误")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鍩庡競杈撳叆閿欒")); } else { List params = new ArrayList(); params.add(new QueryParam("visible", 0)); @@ -530,7 +530,7 @@ public class RentHouseController { } /** - * 租房房源删除 + * 绉熸埧鎴挎簮鍒犻櫎 * * @param model * @param request @@ -551,7 +551,7 @@ public class RentHouseController { } /** - * 租房房源刷新 + * 绉熸埧鎴挎簮鍒锋柊 * * @param model * @param request @@ -572,7 +572,7 @@ public class RentHouseController { } /** - * 租房发布 + * 绉熸埧鍙戝竷 * * @param model * @param request @@ -597,7 +597,7 @@ public class RentHouseController { } /** - * 兼容旧版发布出租房 + * 鍏煎鏃х増鍙戝竷鍑虹鎴� * * @param model * @return @@ -610,7 +610,7 @@ public class RentHouseController { } /** - * 兼容旧版删除出租房 + * 鍏煎鏃х増鍒犻櫎鍑虹鎴� * * @param model * @return @@ -623,7 +623,7 @@ public class RentHouseController { } /** - * 兼容旧版刷新出租房 + * 鍏煎鏃х増鍒锋柊鍑虹鎴� * * @param model * @return @@ -636,7 +636,7 @@ public class RentHouseController { } /** - * 获取RestfulModelAndView对象 + * 鑾峰彇RestfulModelAndView瀵硅薄 * * @param phd * @return @@ -660,7 +660,7 @@ public class RentHouseController { } /** - * 删除出租房 + * 鍒犻櫎鍑虹鎴� * * @param model * @return @@ -688,7 +688,7 @@ public class RentHouseController { } /** - * 刷新出租房 + * 鍒锋柊鍑虹鎴� * * @param model * @return @@ -716,7 +716,7 @@ public class RentHouseController { } /** - * 发布或更新出租房 + * 鍙戝竷鎴栨洿鏂板嚭绉熸埧 * * @param model * @return @@ -753,7 +753,7 @@ public class RentHouseController { } /** - * 获取城市enum + * 鑾峰彇鍩庡競enum * * @param model * @return @@ -770,7 +770,7 @@ public class RentHouseController { } /** - * model转化为RentHouse对象 + * model杞寲涓篟entHouse瀵硅薄 * * @param model * @return @@ -841,9 +841,9 @@ public class RentHouseController { List planPics = new ArrayList(); for (int i = 0; i < paths.length; i++) { try { - if ("房型图".equals(types[i])) { + if ("鎴垮瀷鍥�".equals(types[i])) { planPics.add(paths[i]); - } else if ("用户头像".equals(types[i])) { + } else if ("鐢ㄦ埛澶村儚".equals(types[i])) { house.setAvatar(paths[i]); } else { pics.add(paths[i]); @@ -861,7 +861,7 @@ public class RentHouseController { /** * - * 取得租房房源对应的url + * 鍙栧緱绉熸埧鎴挎簮瀵瑰簲鐨剈rl * * **/ private String getRentHouseUrlByCity(String cityName, String id) { @@ -873,11 +873,11 @@ public class RentHouseController { /** * - * 通过房源url取得对应的房源id + * 閫氳繃鎴挎簮url鍙栧緱瀵瑰簲鐨勬埧婧恑d * * **/ private String getRentHouseIdByUrl(String url) { - String validate = "xinxi-";// 确认url的string + String validate = "xinxi-";// 纭url鐨剆tring int _index = url.indexOf(validate); return url.substring(_index + validate.length(), url.length()); } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ResidenceController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ResidenceController.java index 8a1e34e28..e0f325cf4 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ResidenceController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ResidenceController.java @@ -45,16 +45,16 @@ public class ResidenceController { RestfulModelAndView mv = new RestfulModelAndView(); mv.setViewType("rest"); if(StringUtils.isBlank(model.getCity())){ - mv.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "所在城市编码不能为空")); + mv.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鎵�鍦ㄥ煄甯傜紪鐮佷笉鑳戒负绌�")); return mv; } String cityName = DistrictCodeUtils.getCityName(model.getCity()); if(StringUtils.isBlank(cityName)){ - mv.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "无法匹配的城市编码")); + mv.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鏃犳硶鍖归厤鐨勫煄甯傜紪鐮�")); return mv; } if(StringUtils.isBlank(model.getAddress())){ - mv.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "地址/楼盘名称/别名不能为空(参数名:address)")); + mv.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鍦板潃/妤肩洏鍚嶇О/鍒悕涓嶈兘涓虹┖(鍙傛暟鍚�:address)")); return mv; } List dataList = new ArrayList(); @@ -84,7 +84,7 @@ public class ResidenceController { Integer minYear = getBuildYear(d.getFinishBuildingDate(), d.getLiveDate(), d.getBuildDate(), d.getOpenDate()); residenceModel.setOpenDate(getOpenDate(d)); if(minYear != null){ - residenceModel.setBuildDate(minYear + "年"); + residenceModel.setBuildDate(minYear + "骞�"); } if(getRemainUseYear(d) != null){ dataList.add(residenceModel); @@ -134,7 +134,7 @@ public class ResidenceController { Integer minYear = getBuildYear(d.getFinishBuildingDate(),d.getLiveDate(), d.getBuildDate(), d.getOpenDate()); residenceModel.setOpenDate(getOpenDate(d)); if(minYear != null){ - residenceModel.setBuildDate(minYear + "年"); + residenceModel.setBuildDate(minYear + "骞�"); } if(getRemainUseYear(d) != null){ dataList.add(residenceModel); @@ -159,14 +159,14 @@ public class ResidenceController { private void saveAddressMatchLog(Map resMap,String keywords,String city,String token,int searchCount){ Map tokenMap = FangjiaApiUtil.parseToken(token); String userName = null; - // token验证后,拿取出的字段再去数据库验证一遍 + // token楠岃瘉鍚庯紝鎷垮彇鍑虹殑瀛楁鍐嶅幓鏁版嵁搴撻獙璇佷竴閬� if (tokenMap != null && StringUtils.isNotBlank(tokenMap.get("userid"))&& !"null".equals(tokenMap.get("userid"))) { User user = userService.findById(Long.parseLong(tokenMap.get("userid"))); if(user != null){ userName = user.getUserName(); } } - // 记录用户搜索词open匹配结果 + // 璁板綍鐢ㄦ埛鎼滅储璇峯pen鍖归厤缁撴灉 HttpServletRequest request = ActionContext.getContext().getRequest(); AddressMatchLog addressMatchLog = new AddressMatchLog(); addressMatchLog.setCity(city); @@ -212,8 +212,8 @@ public class ResidenceController { } private Integer getRemainUseYear(District district) { - if("苏州".equals(district.getCity())){ - if("商住".equals(district.getEstateType2())){ + if("鑻忓窞".equals(district.getCity())){ + if("鍟嗕綇".equals(district.getEstateType2())){ district.setPropertyLife("47"); }else{ district.setPropertyLife("67"); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/SellHouseController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/SellHouseController.java index 657c69e2e..adbc352c8 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/SellHouseController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/SellHouseController.java @@ -63,7 +63,7 @@ import com.fangjia.service.util.PhoneNormalizer; import com.fangjia.service.web.MenuService; /** - * 二手房源操作接口 + * 浜屾墜鎴挎簮鎿嶄綔鎺ュ彛 * * @author velna * @@ -81,7 +81,7 @@ public class SellHouseController { private DistrictService districtService; /** - * 二手房源搜索 + * 浜屾墜鎴挎簮鎼滅储 * * @param model * @return @@ -102,7 +102,7 @@ public class SellHouseController { pager.setStartRow(startRow); } if (StringUtils.isBlank(model.getCity())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "城市输入错误")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鍩庡競杈撳叆閿欒")); } else { String sortField = model.getSortField(); boolean asc = false; @@ -154,7 +154,7 @@ public class SellHouseController { } /** - * 二手房源搜索 + * 浜屾墜鎴挎簮鎼滅储 * * @param model * @return @@ -176,19 +176,19 @@ public class SellHouseController { pager.setStartRow(startRow); } if (StringUtils.isBlank(model.getCity())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "城市必须输入")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鍩庡競蹇呴』杈撳叆")); return mav; } String city = knowbaseService.matchingCityDefaultNull(model.getCity()); if (null == city) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_INVALID, "请求数据不合法")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_INVALID, "璇锋眰鏁版嵁涓嶅悎娉�")); return mav; } String region = model.getRegion(); if (StringUtils.isNotBlank(region)) { region = knowbaseService.matchingRegionDefaultNull(model.getRegion(), city); if (null == region) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_INVALID, "请求数据不合法")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_INVALID, "璇锋眰鏁版嵁涓嶅悎娉�")); return mav; } } @@ -283,7 +283,7 @@ public class SellHouseController { } /** - * 二手房源详情 + * 浜屾墜鎴挎簮璇︽儏 * * @return */ @@ -309,14 +309,14 @@ public class SellHouseController { } } houseBo.setPics(picsNew); - // 去除电话乱码 + // 鍘婚櫎鐢佃瘽涔辩爜 houseBo.setMobile(PhoneNormalizer.normalizeContactPhone(ServerAreaData.getServerAreaByDisplay(houseBo.getCity()), false, houseBo.getMobile())); -// // 若为400电话,格式化 +// // 鑻ヤ负400鐢佃瘽,鏍煎紡鍖� // if (houseBo.getMobile() !houseBo.getMobile().trim().startsWith("400")) { // houseBo.setMobile(PhoneNormalizer.normalizeContact400Phone(houseBo.getMobile())); // } -// // 获取400电话 +// // 鑾峰彇400鐢佃瘽 // if (StringUtils.isNotBlank(houseBo.getMobile())) { // CpcBo cpcBo = cpcService.checkCpcUserEnable(house); // if (null != cpcBo) { @@ -342,7 +342,7 @@ public class SellHouseController { } /** - * 取得过期二手房房源接口 + * 鍙栧緱杩囨湡浜屾墜鎴挎埧婧愭帴鍙� * * @param model * @param request @@ -364,14 +364,14 @@ public class SellHouseController { pager.setStartRow(startRow); } if (StringUtils.isBlank(model.getCity())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "城市输入错误")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鍩庡競杈撳叆閿欒")); } else { List params = new ArrayList(); params.add(new QueryParam("city", model.getCity())); FacetQueryResult houseList = new FacetQueryResult(); if (StringUtils.isNotBlank(model.getUrl())) { HouseBo houseBo = openSellHouseService.findByFullMode(this.getSellHouseIdByUrl(model.getUrl())); - if (houseBo == null || !houseBo.getPublishDate().before(DateUtil.getBeforeDay(new Date(), 21))) {// 已过期 + if (houseBo == null || !houseBo.getPublishDate().before(DateUtil.getBeforeDay(new Date(), 21))) {// 宸茶繃鏈� houseList.setNumberFound(0); } else { House house = new House(); @@ -401,7 +401,7 @@ public class SellHouseController { } /** - * 取得二手房新增房源接口 + * 鍙栧緱浜屾墜鎴挎柊澧炴埧婧愭帴鍙� * * @return */ @@ -421,7 +421,7 @@ public class SellHouseController { pager.setStartRow(startRow); } if (StringUtils.isBlank(model.getCity())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "城市输入错误")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鍩庡競杈撳叆閿欒")); } else { List params = new ArrayList(); params.add(new QueryParam("visible", 0)); @@ -454,7 +454,7 @@ public class SellHouseController { } /** - * 二手房删除 + * 浜屾墜鎴垮垹闄� * * @param model * @param request @@ -475,7 +475,7 @@ public class SellHouseController { } /** - * 二手房刷新 + * 浜屾墜鎴垮埛鏂� * * @param model * @param request @@ -495,7 +495,7 @@ public class SellHouseController { } /** - * 二手房发布 + * 浜屾墜鎴垮彂甯� * * @param model * @param request @@ -520,7 +520,7 @@ public class SellHouseController { } /** - * 兼容旧版二手房发布 + * 鍏煎鏃х増浜屾墜鎴垮彂甯� * * @param model * @return @@ -533,7 +533,7 @@ public class SellHouseController { } /** - * 兼容旧版二手房刪除 + * 鍏煎鏃х増浜屾墜鎴垮埅闄� * * @param model * @return @@ -546,7 +546,7 @@ public class SellHouseController { } /** - * 兼容旧版二手房刷新 + * 鍏煎鏃х増浜屾墜鎴垮埛鏂� * * @param model * @return @@ -559,7 +559,7 @@ public class SellHouseController { } /** - * 获取RestfulModelAndView对象 + * 鑾峰彇RestfulModelAndView瀵硅薄 * * @param phd * @return @@ -583,7 +583,7 @@ public class SellHouseController { } /** - * 刷新二手房 + * 鍒锋柊浜屾墜鎴� * * @param model * @return @@ -612,7 +612,7 @@ public class SellHouseController { } /** - * 发布或更新房源 + * 鍙戝竷鎴栨洿鏂版埧婧� * * @param model * @return @@ -649,7 +649,7 @@ public class SellHouseController { } /** - * 删除二手房 + * 鍒犻櫎浜屾墜鎴� * * @param model * @return @@ -677,7 +677,7 @@ public class SellHouseController { } /** - * 获取城市enum + * 鑾峰彇鍩庡競enum * * @param model * @return @@ -694,7 +694,7 @@ public class SellHouseController { } /** - * model转换为house + * model杞崲涓篽ouse * * @param model * @return @@ -763,9 +763,9 @@ public class SellHouseController { List planPics = new ArrayList(); for (int i = 0; i < paths.length; i++) { try { - if ("房型图".equals(types[i])) { + if ("鎴垮瀷鍥�".equals(types[i])) { planPics.add(paths[i]); - } else if ("用户头像".equals(types[i])) { + } else if ("鐢ㄦ埛澶村儚".equals(types[i])) { house.setAvatar(paths[i]); } else { pics.add(paths[i]); @@ -783,7 +783,7 @@ public class SellHouseController { /** * - * 取得二手房房源对应的url + * 鍙栧緱浜屾墜鎴挎埧婧愬搴旂殑url * * **/ private String getSellHouseUrlByCity(String cityName, String id) { @@ -795,11 +795,11 @@ public class SellHouseController { /** * - * 通过房源url取得对应的房源id + * 閫氳繃鎴挎簮url鍙栧緱瀵瑰簲鐨勬埧婧恑d * * **/ private String getSellHouseIdByUrl(String url) { - String validate = "xinxi-";// 确认url的string + String validate = "xinxi-";// 纭url鐨剆tring int _index = url.indexOf(validate); return url.substring(_index + validate.length(), url.length()); } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ShopAddressController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ShopAddressController.java index cfcdce54f..b553b4629 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ShopAddressController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ShopAddressController.java @@ -45,11 +45,11 @@ public class ShopAddressController { mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "城市必须输入")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鍩庡競蹇呴』杈撳叆")); return mav; } if (StringUtils.isBlank(model.getAddress())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "地址必须输入")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鍦板潃蹇呴』杈撳叆")); return mav; } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ShopController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ShopController.java index de61004a9..2e4977676 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ShopController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ShopController.java @@ -43,7 +43,7 @@ import static com.fangjia.open.util.CommonUtils.convertToString; import static com.fangjia.open.util.EvaluationFactorUtil.*; /** - * 商铺出租服务类 + * 鍟嗛摵鍑虹鏈嶅姟绫� * * @author shenjian * @since 2025/4/10 @@ -61,7 +61,7 @@ public class ShopController { private FieldFilterService fieldFilterService; /** - * 城市出租均价 + * 鍩庡競鍑虹鍧囦环 * * @return */ @@ -69,7 +69,7 @@ public class ShopController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(city)) { - mav.setModel(BasicModel.buildBadRequestModel("city不能为null")); + mav.setModel(BasicModel.buildBadRequestModel("city涓嶈兘涓簄ull")); return mav; } if (!RegionData.isCity(city)) { @@ -77,29 +77,29 @@ public class ShopController { if (StringUtils.isNotBlank(formatCity)) { city = formatCity; } else { - mav.setModel(BasicModel.buildBadRequestModel("city非法")); + mav.setModel(BasicModel.buildBadRequestModel("city闈炴硶")); return mav; } } ServerArea serverArea = ServerAreaData.getServerAreaByCity(city); if (null == serverArea) { - mav.setModel(BasicModel.buildBadRequestModel("city非法")); + mav.setModel(BasicModel.buildBadRequestModel("city闈炴硶")); return mav; } if (startDate == null || endDate == null) { - mav.setModel(BasicModel.buildBadRequestModel("startDate或endDate不能为null")); + mav.setModel(BasicModel.buildBadRequestModel("startDate鎴杄ndDate涓嶈兘涓簄ull")); return mav; } if (startDate > endDate) { - mav.setModel(BasicModel.buildBadRequestModel("startDate不能大于endDate")); + mav.setModel(BasicModel.buildBadRequestModel("startDate涓嶈兘澶т簬endDate")); return mav; } List regionStats = aiShopService.findShopRentStat(city, null, null, "city", startDate, endDate); if (CollectionUtils.isEmpty(regionStats)) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "该城市没有均价数据")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "璇ュ煄甯傛病鏈夊潎浠锋暟鎹�")); return mav; } mav.setModel(BasicModel.buildOKModel().setResult(regionStats)); @@ -107,7 +107,7 @@ public class ShopController { } /** - * 区域出租均价 + * 鍖哄煙鍑虹鍧囦环 * * @return */ @@ -116,11 +116,11 @@ public class ShopController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(city)) { - mav.setModel(BasicModel.buildBadRequestModel("city不能为null")); + mav.setModel(BasicModel.buildBadRequestModel("city涓嶈兘涓簄ull")); return mav; } if (StringUtils.isBlank(district)) { - mav.setModel(BasicModel.buildBadRequestModel("district不能为null")); + mav.setModel(BasicModel.buildBadRequestModel("district涓嶈兘涓簄ull")); return mav; } if (!RegionData.isCity(city)) { @@ -128,34 +128,34 @@ public class ShopController { if (StringUtils.isNotBlank(formatCity)) { city = formatCity; } else { - mav.setModel(BasicModel.buildBadRequestModel("city非法")); + mav.setModel(BasicModel.buildBadRequestModel("city闈炴硶")); return mav; } } ServerArea serverArea = ServerAreaData.getServerAreaByCity(city); if (null == serverArea) { - mav.setModel(BasicModel.buildBadRequestModel("city非法")); + mav.setModel(BasicModel.buildBadRequestModel("city闈炴硶")); return mav; } String region = RegionData.formatRegion(city, district); if (!RegionData.isRegion(city, region)) { - mav.setModel(BasicModel.buildBadRequestModel("没有找你输入的区域")); + mav.setModel(BasicModel.buildBadRequestModel("娌℃湁鎵句綘杈撳叆鐨勫尯鍩�")); return mav; } if (startDate == null || endDate == null) { - mav.setModel(BasicModel.buildBadRequestModel("startDate或endDate不能为null")); + mav.setModel(BasicModel.buildBadRequestModel("startDate鎴杄ndDate涓嶈兘涓簄ull")); return mav; } if (startDate > endDate) { - mav.setModel(BasicModel.buildBadRequestModel("startDate不能大于endDate")); + mav.setModel(BasicModel.buildBadRequestModel("startDate涓嶈兘澶т簬endDate")); return mav; } List regionStats = aiShopService.findShopRentStat(city, region, null, "district", startDate, endDate); if (CollectionUtils.isEmpty(regionStats)) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "该区域没有均价数据")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "璇ュ尯鍩熸病鏈夊潎浠锋暟鎹�")); return mav; } mav.setModel(BasicModel.buildOKModel().setResult(regionStats)); @@ -163,7 +163,7 @@ public class ShopController { } /** - * 写字楼均价走势 + * 鍐欏瓧妤煎潎浠疯蛋鍔� * * @return */ @@ -173,11 +173,11 @@ public class ShopController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(city)) { - mav.setModel(BasicModel.buildBadRequestModel("city不能为null")); + mav.setModel(BasicModel.buildBadRequestModel("city涓嶈兘涓簄ull")); return mav; } if (StringUtils.isBlank(district)) { - mav.setModel(BasicModel.buildBadRequestModel("district不能为null")); + mav.setModel(BasicModel.buildBadRequestModel("district涓嶈兘涓簄ull")); return mav; } if (!RegionData.isCity(city)) { @@ -185,34 +185,34 @@ public class ShopController { if (StringUtils.isNotBlank(formatCity)) { city = formatCity; } else { - mav.setModel(BasicModel.buildBadRequestModel("city非法")); + mav.setModel(BasicModel.buildBadRequestModel("city闈炴硶")); return mav; } } ServerArea serverArea = ServerAreaData.getServerAreaByCity(city); if (null == serverArea) { - mav.setModel(BasicModel.buildBadRequestModel("city非法")); + mav.setModel(BasicModel.buildBadRequestModel("city闈炴硶")); return mav; } String region = RegionData.formatRegion(city, district); if (!RegionData.isRegion(city, region)) { - mav.setModel(BasicModel.buildBadRequestModel("没有找你输入的区域")); + mav.setModel(BasicModel.buildBadRequestModel("娌℃湁鎵句綘杈撳叆鐨勫尯鍩�")); return mav; } if (startDate == null || endDate == null) { - mav.setModel(BasicModel.buildBadRequestModel("startDate或endDate不能为null")); + mav.setModel(BasicModel.buildBadRequestModel("startDate鎴杄ndDate涓嶈兘涓簄ull")); return mav; } if (startDate > endDate) { - mav.setModel(BasicModel.buildBadRequestModel("startDate不能大于endDate")); + mav.setModel(BasicModel.buildBadRequestModel("startDate涓嶈兘澶т簬endDate")); return mav; } List regionStats = aiShopService.findShopRentStat(city, region, name, "shop", startDate, endDate); if (CollectionUtils.isEmpty(regionStats)) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "该写字楼没有均价数据")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "璇ュ啓瀛楁ゼ娌℃湁鍧囦环鏁版嵁")); return mav; } mav.setModel(BasicModel.buildOKModel().setResult(regionStats)); @@ -220,7 +220,7 @@ public class ShopController { } /** - * 写字楼楼租金地址估值 + * 鍐欏瓧妤兼ゼ绉熼噾鍦板潃浼板�� * * @param model * @param request @@ -230,28 +230,28 @@ public class ShopController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getAddress()) || model.getSize() <= 0) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:城市,地址,面积(size)为必填项")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:鍩庡競,鍦板潃,闈㈢Н(size)涓哄繀濉」")); return mav; } - if (model.getCity().endsWith("市")) { - model.setCity(model.getCity().replaceAll("市$", "")); + if (model.getCity().endsWith("甯�")) { + model.setCity(model.getCity().replaceAll("甯�$", "")); } if (model.getCarportPrice() != null && (model.getCarportPrice() < 0 || model.getCarportPrice() > 1000000)) { - mav.setModel(BasicModel.buildBadRequestModel("carportPrice(车位)取值不合法")); + mav.setModel(BasicModel.buildBadRequestModel("carportPrice(杞︿綅)鍙栧�间笉鍚堟硶")); return mav; } if (model.getMaxFloor() != null && (model.getMaxFloor() <= 0 || model.getMaxFloor() > 59)) { - mav.setModel(BasicModel.buildBadRequestModel("maxFloor取值非法,正确范围[1,60)")); + mav.setModel(BasicModel.buildBadRequestModel("maxFloor鍙栧�奸潪娉�,姝g‘鑼冨洿[1,60)")); return mav; } if (model.getFloor() != null && (model.getFloor() <= 0 || model.getFloor() > 59)) { - mav.setModel(BasicModel.buildBadRequestModel("floor取值非法,正确范围[1,60)")); + mav.setModel(BasicModel.buildBadRequestModel("floor鍙栧�奸潪娉�,姝g‘鑼冨洿[1,60)")); return mav; } if (model.getMaxFloor() != null && model.getFloor() != null && model.getFloor() > model.getMaxFloor()) { - mav.setModel(BasicModel.buildBadRequestModel("所在楼层不能大于总楼层")); + mav.setModel(BasicModel.buildBadRequestModel("鎵�鍦ㄦゼ灞備笉鑳藉ぇ浜庢�绘ゼ灞�")); return mav; } @@ -277,56 +277,56 @@ public class ShopController { return mav; } else { - mav.setModel(BasicModel.buildOKModel().setMsg("暂时不支持该地址写字楼的评估").markNoData()); + mav.setModel(BasicModel.buildOKModel().setMsg("鏆傛椂涓嶆敮鎸佽鍦板潃鍐欏瓧妤肩殑璇勪及").markNoData()); return mav; } } /** - * 申请估值报告 + * 鐢宠浼板�兼姤鍛� * - * @param model 申请报告请求参数 + * @param model 鐢宠鎶ュ憡璇锋眰鍙傛暟 * @return */ public Object assessPriceReportApplyAction(ReportApplyModel model) { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(model.getClient())) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:委托机构为必填项")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:濮旀墭鏈烘瀯涓哄繀濉」")); return mav; } if (StringUtils.isBlank(model.getSubjectMatter())) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:标的物为必填项")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:鏍囩殑鐗╀负蹇呭~椤�")); return mav; } - if (StringUtils.isBlank(model.getCity()) || model.getCity().contains("全国")) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:城市为必填项且不能为全国")); + if (StringUtils.isBlank(model.getCity()) || model.getCity().contains("鍏ㄥ浗")) { + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:鍩庡競涓哄繀濉」涓斾笉鑳戒负鍏ㄥ浗")); return mav; } - if (StringUtils.isBlank(model.getDistrict()) || model.getDistrict().contains("全国")) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:区域为必填项且不能为全国")); + if (StringUtils.isBlank(model.getDistrict()) || model.getDistrict().contains("鍏ㄥ浗")) { + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:鍖哄煙涓哄繀濉」涓斾笉鑳戒负鍏ㄥ浗")); return mav; } if (model.getSize() == null || model.getSize() <= 0 ) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:面积(size)为必填项且大于0")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:闈㈢Н(size)涓哄繀濉」涓斿ぇ浜�0")); return mav; } - if (model.getCity().endsWith("市")) { - model.setCity(model.getCity().replaceAll("市$", "")); + if (model.getCity().endsWith("甯�")) { + model.setCity(model.getCity().replaceAll("甯�$", "")); } - if (model.getDistrict().endsWith("区")) { - model.setDistrict(model.getDistrict().replaceAll("区$", "")); + if (model.getDistrict().endsWith("鍖�")) { + model.setDistrict(model.getDistrict().replaceAll("鍖�$", "")); } if (model.getMaxFloor() != null && (model.getMaxFloor() <= 0 || model.getMaxFloor() > 59)) { - mav.setModel(BasicModel.buildBadRequestModel("maxFloor取值非法,正确范围[1,60)")); + mav.setModel(BasicModel.buildBadRequestModel("maxFloor鍙栧�奸潪娉�,姝g‘鑼冨洿[1,60)")); return mav; } if (model.getFloor() != null && (model.getFloor() <= 0 || model.getFloor() > 59)) { - mav.setModel(BasicModel.buildBadRequestModel("floor取值非法,正确范围[1,60)")); + mav.setModel(BasicModel.buildBadRequestModel("floor鍙栧�奸潪娉�,姝g‘鑼冨洿[1,60)")); return mav; } if (model.getMaxFloor() != null && model.getFloor() != null && model.getFloor() > model.getMaxFloor()) { - mav.setModel(BasicModel.buildBadRequestModel("所在楼层不能大于总楼层")); + mav.setModel(BasicModel.buildBadRequestModel("鎵�鍦ㄦゼ灞備笉鑳藉ぇ浜庢�绘ゼ灞�")); return mav; } HttpRequest request = new HttpRequest(); @@ -367,25 +367,25 @@ public class ShopController { result.put("caseId", String.valueOf(json.get("data"))); mav.setModel(BasicModel.buildOKModel().setResult(result)); } else { - mav.setModel(BasicModel.buildBadRequestModel("申请估值报告失败:" + json.getString("message"))); + mav.setModel(BasicModel.buildBadRequestModel("鐢宠浼板�兼姤鍛婂け璐ワ細" + json.getString("message"))); } } else { - mav.setModel(BasicModel.buildBadRequestModel("申请估值报告失败:调用申请报告接口返回为空")); + mav.setModel(BasicModel.buildBadRequestModel("鐢宠浼板�兼姤鍛婂け璐ワ細璋冪敤鐢宠鎶ュ憡鎺ュ彛杩斿洖涓虹┖")); } return mav; } /** - * 获取估值报告 + * 鑾峰彇浼板�兼姤鍛� * - * @param caseId 估值报告ID + * @param caseId 浼板�兼姤鍛奍D * @return */ public Object assessPriceReportFetchAction(@Param(name = "caseId") String caseId) { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(caseId)) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:估值报告业务编号为必填项")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:浼板�兼姤鍛婁笟鍔$紪鍙蜂负蹇呭~椤�")); return mav; } HttpRequest request = new HttpRequest(); @@ -412,10 +412,10 @@ public class ShopController { JSONObject resultJson = json.getJSONObject("data"); mav.setModel(BasicModel.buildOKModel().setResult(resultJson)); } else { - mav.setModel(BasicModel.buildBadRequestModel("获取估值报告失败:" + json.getString("message"))); + mav.setModel(BasicModel.buildBadRequestModel("鑾峰彇浼板�兼姤鍛婂け璐ワ細" + json.getString("message"))); } } else { - mav.setModel(BasicModel.buildBadRequestModel("申请报告失败:调用获取估值报告接口返回为空")); + mav.setModel(BasicModel.buildBadRequestModel("鐢宠鎶ュ憡澶辫触锛氳皟鐢ㄨ幏鍙栦及鍊兼姤鍛婃帴鍙h繑鍥炰负绌�")); } return mav; } @@ -434,7 +434,7 @@ public class ShopController { } /** - * 通过EvaluationModel组装Evaluation实体 + * 閫氳繃EvaluationModel缁勮Evaluation瀹炰綋 * * @param model * @param request @@ -575,13 +575,13 @@ public class ShopController { if (model.isNewDistrict()) { evaluation.setNewDistrict(model.isNewDistrict()); } - String floorDesc = "中"; + String floorDesc = "涓�"; if (evaluation.getFloor() != null && evaluation.getHeight() != null) { Double floorInfo = evaluation.getFloor() * 1.0 / evaluation.getHeight(); if (floorInfo <= 0.33) { - floorDesc = "低"; + floorDesc = "浣�"; } else if (floorInfo > 0.66) { - floorDesc = "高"; + floorDesc = "楂�"; } evaluation.setFloorDesc(floorDesc); } @@ -598,15 +598,15 @@ public class ShopController { private static final Map FACILITIES = new HashMap() { { - put("0", "健身房"); - put("1", "游泳池"); - put("2", "会所"); - put("3", "网球场"); - put("4", "球场"); - put("5", "棋牌室"); - put("6", "停车场"); - put("7", "图书馆"); - put("8", "活动中心"); + put("0", "鍋ヨ韩鎴�"); + put("1", "娓告吵姹�"); + put("2", "浼氭墍"); + put("3", "缃戠悆鍦�"); + put("4", "鐞冨満"); + put("5", "妫嬬墝瀹�"); + put("6", "鍋滆溅鍦�"); + put("7", "鍥句功棣�"); + put("8", "娲诲姩涓績"); } }; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ShopSellController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ShopSellController.java index 8807fda05..5e88d5d56 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ShopSellController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ShopSellController.java @@ -43,7 +43,7 @@ import static com.fangjia.open.util.CommonUtils.convertToString; import static com.fangjia.open.util.EvaluationFactorUtil.*; /** - * 商铺出售服务类 + * 鍟嗛摵鍑哄敭鏈嶅姟绫� * * @author shenjian * @since 2025/4/14 @@ -61,7 +61,7 @@ public class ShopSellController { private FieldFilterService fieldFilterService; /** - * 城市出租均价 + * 鍩庡競鍑虹鍧囦环 * * @return */ @@ -69,7 +69,7 @@ public class ShopSellController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(city)) { - mav.setModel(BasicModel.buildBadRequestModel("city不能为null")); + mav.setModel(BasicModel.buildBadRequestModel("city涓嶈兘涓簄ull")); return mav; } if (!RegionData.isCity(city)) { @@ -77,29 +77,29 @@ public class ShopSellController { if (StringUtils.isNotBlank(formatCity)) { city = formatCity; } else { - mav.setModel(BasicModel.buildBadRequestModel("city非法")); + mav.setModel(BasicModel.buildBadRequestModel("city闈炴硶")); return mav; } } ServerArea serverArea = ServerAreaData.getServerAreaByCity(city); if (null == serverArea) { - mav.setModel(BasicModel.buildBadRequestModel("city非法")); + mav.setModel(BasicModel.buildBadRequestModel("city闈炴硶")); return mav; } if (startDate == null || endDate == null) { - mav.setModel(BasicModel.buildBadRequestModel("startDate或endDate不能为null")); + mav.setModel(BasicModel.buildBadRequestModel("startDate鎴杄ndDate涓嶈兘涓簄ull")); return mav; } if (startDate > endDate) { - mav.setModel(BasicModel.buildBadRequestModel("startDate不能大于endDate")); + mav.setModel(BasicModel.buildBadRequestModel("startDate涓嶈兘澶т簬endDate")); return mav; } List regionStats = aiShopService.findShopSellStat(city, null, null, "city", startDate, endDate); if (CollectionUtils.isEmpty(regionStats)) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "该城市没有均价数据")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "璇ュ煄甯傛病鏈夊潎浠锋暟鎹�")); return mav; } mav.setModel(BasicModel.buildOKModel().setResult(regionStats)); @@ -107,7 +107,7 @@ public class ShopSellController { } /** - * 区域出租均价 + * 鍖哄煙鍑虹鍧囦环 * * @return */ @@ -116,11 +116,11 @@ public class ShopSellController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(city)) { - mav.setModel(BasicModel.buildBadRequestModel("city不能为null")); + mav.setModel(BasicModel.buildBadRequestModel("city涓嶈兘涓簄ull")); return mav; } if (StringUtils.isBlank(district)) { - mav.setModel(BasicModel.buildBadRequestModel("district不能为null")); + mav.setModel(BasicModel.buildBadRequestModel("district涓嶈兘涓簄ull")); return mav; } if (!RegionData.isCity(city)) { @@ -128,34 +128,34 @@ public class ShopSellController { if (StringUtils.isNotBlank(formatCity)) { city = formatCity; } else { - mav.setModel(BasicModel.buildBadRequestModel("city非法")); + mav.setModel(BasicModel.buildBadRequestModel("city闈炴硶")); return mav; } } ServerArea serverArea = ServerAreaData.getServerAreaByCity(city); if (null == serverArea) { - mav.setModel(BasicModel.buildBadRequestModel("city非法")); + mav.setModel(BasicModel.buildBadRequestModel("city闈炴硶")); return mav; } String region = RegionData.formatRegion(city, district); if (!RegionData.isRegion(city, region)) { - mav.setModel(BasicModel.buildBadRequestModel("没有找你输入的区域")); + mav.setModel(BasicModel.buildBadRequestModel("娌℃湁鎵句綘杈撳叆鐨勫尯鍩�")); return mav; } if (startDate == null || endDate == null) { - mav.setModel(BasicModel.buildBadRequestModel("startDate或endDate不能为null")); + mav.setModel(BasicModel.buildBadRequestModel("startDate鎴杄ndDate涓嶈兘涓簄ull")); return mav; } if (startDate > endDate) { - mav.setModel(BasicModel.buildBadRequestModel("startDate不能大于endDate")); + mav.setModel(BasicModel.buildBadRequestModel("startDate涓嶈兘澶т簬endDate")); return mav; } List regionStats = aiShopService.findShopSellStat(city, region, null, "district", startDate, endDate); if (CollectionUtils.isEmpty(regionStats)) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "该区域没有均价数据")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "璇ュ尯鍩熸病鏈夊潎浠锋暟鎹�")); return mav; } mav.setModel(BasicModel.buildOKModel().setResult(regionStats)); @@ -163,7 +163,7 @@ public class ShopSellController { } /** - * 写字楼均价走势 + * 鍐欏瓧妤煎潎浠疯蛋鍔� * * @return */ @@ -173,11 +173,11 @@ public class ShopSellController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(city)) { - mav.setModel(BasicModel.buildBadRequestModel("city不能为null")); + mav.setModel(BasicModel.buildBadRequestModel("city涓嶈兘涓簄ull")); return mav; } if (StringUtils.isBlank(district)) { - mav.setModel(BasicModel.buildBadRequestModel("district不能为null")); + mav.setModel(BasicModel.buildBadRequestModel("district涓嶈兘涓簄ull")); return mav; } if (!RegionData.isCity(city)) { @@ -185,34 +185,34 @@ public class ShopSellController { if (StringUtils.isNotBlank(formatCity)) { city = formatCity; } else { - mav.setModel(BasicModel.buildBadRequestModel("city非法")); + mav.setModel(BasicModel.buildBadRequestModel("city闈炴硶")); return mav; } } ServerArea serverArea = ServerAreaData.getServerAreaByCity(city); if (null == serverArea) { - mav.setModel(BasicModel.buildBadRequestModel("city非法")); + mav.setModel(BasicModel.buildBadRequestModel("city闈炴硶")); return mav; } String region = RegionData.formatRegion(city, district); if (!RegionData.isRegion(city, region)) { - mav.setModel(BasicModel.buildBadRequestModel("没有找你输入的区域")); + mav.setModel(BasicModel.buildBadRequestModel("娌℃湁鎵句綘杈撳叆鐨勫尯鍩�")); return mav; } if (startDate == null || endDate == null) { - mav.setModel(BasicModel.buildBadRequestModel("startDate或endDate不能为null")); + mav.setModel(BasicModel.buildBadRequestModel("startDate鎴杄ndDate涓嶈兘涓簄ull")); return mav; } if (startDate > endDate) { - mav.setModel(BasicModel.buildBadRequestModel("startDate不能大于endDate")); + mav.setModel(BasicModel.buildBadRequestModel("startDate涓嶈兘澶т簬endDate")); return mav; } List regionStats = aiShopService.findShopSellStat(city, region, name, "shop", startDate, endDate); if (CollectionUtils.isEmpty(regionStats)) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "该写字楼没有均价数据")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "璇ュ啓瀛楁ゼ娌℃湁鍧囦环鏁版嵁")); return mav; } mav.setModel(BasicModel.buildOKModel().setResult(regionStats)); @@ -220,7 +220,7 @@ public class ShopSellController { } /** - * 写字楼楼租金地址估值 + * 鍐欏瓧妤兼ゼ绉熼噾鍦板潃浼板�� * * @param model * @param request @@ -230,28 +230,28 @@ public class ShopSellController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getAddress()) || model.getSize() <= 0) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:城市,地址,面积(size)为必填项")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:鍩庡競,鍦板潃,闈㈢Н(size)涓哄繀濉」")); return mav; } - if (model.getCity().endsWith("市")) { - model.setCity(model.getCity().replaceAll("市$", "")); + if (model.getCity().endsWith("甯�")) { + model.setCity(model.getCity().replaceAll("甯�$", "")); } if (model.getCarportPrice() != null && (model.getCarportPrice() < 0 || model.getCarportPrice() > 1000000)) { - mav.setModel(BasicModel.buildBadRequestModel("carportPrice(车位)取值不合法")); + mav.setModel(BasicModel.buildBadRequestModel("carportPrice(杞︿綅)鍙栧�间笉鍚堟硶")); return mav; } if (model.getMaxFloor() != null && (model.getMaxFloor() <= 0 || model.getMaxFloor() > 59)) { - mav.setModel(BasicModel.buildBadRequestModel("maxFloor取值非法,正确范围[1,60)")); + mav.setModel(BasicModel.buildBadRequestModel("maxFloor鍙栧�奸潪娉�,姝g‘鑼冨洿[1,60)")); return mav; } if (model.getFloor() != null && (model.getFloor() <= 0 || model.getFloor() > 59)) { - mav.setModel(BasicModel.buildBadRequestModel("floor取值非法,正确范围[1,60)")); + mav.setModel(BasicModel.buildBadRequestModel("floor鍙栧�奸潪娉�,姝g‘鑼冨洿[1,60)")); return mav; } if (model.getMaxFloor() != null && model.getFloor() != null && model.getFloor() > model.getMaxFloor()) { - mav.setModel(BasicModel.buildBadRequestModel("所在楼层不能大于总楼层")); + mav.setModel(BasicModel.buildBadRequestModel("鎵�鍦ㄦゼ灞備笉鑳藉ぇ浜庢�绘ゼ灞�")); return mav; } @@ -277,56 +277,56 @@ public class ShopSellController { return mav; } else { - mav.setModel(BasicModel.buildOKModel().setMsg("暂时不支持该地址写字楼的评估").markNoData()); + mav.setModel(BasicModel.buildOKModel().setMsg("鏆傛椂涓嶆敮鎸佽鍦板潃鍐欏瓧妤肩殑璇勪及").markNoData()); return mav; } } /** - * 申请估值报告 + * 鐢宠浼板�兼姤鍛� * - * @param model 申请报告请求参数 + * @param model 鐢宠鎶ュ憡璇锋眰鍙傛暟 * @return */ public Object assessPriceReportApplyAction(ReportApplyModel model) { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(model.getClient())) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:委托机构为必填项")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:濮旀墭鏈烘瀯涓哄繀濉」")); return mav; } if (StringUtils.isBlank(model.getSubjectMatter())) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:标的物为必填项")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:鏍囩殑鐗╀负蹇呭~椤�")); return mav; } - if (StringUtils.isBlank(model.getCity()) || model.getCity().contains("全国")) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:城市为必填项且不能为全国")); + if (StringUtils.isBlank(model.getCity()) || model.getCity().contains("鍏ㄥ浗")) { + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:鍩庡競涓哄繀濉」涓斾笉鑳戒负鍏ㄥ浗")); return mav; } - if (StringUtils.isBlank(model.getDistrict()) || model.getDistrict().contains("全国")) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:区域为必填项且不能为全国")); + if (StringUtils.isBlank(model.getDistrict()) || model.getDistrict().contains("鍏ㄥ浗")) { + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:鍖哄煙涓哄繀濉」涓斾笉鑳戒负鍏ㄥ浗")); return mav; } if (model.getSize() == null || model.getSize() <= 0 ) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:面积(size)为必填项且大于0")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:闈㈢Н(size)涓哄繀濉」涓斿ぇ浜�0")); return mav; } - if (model.getCity().endsWith("市")) { - model.setCity(model.getCity().replaceAll("市$", "")); + if (model.getCity().endsWith("甯�")) { + model.setCity(model.getCity().replaceAll("甯�$", "")); } - if (model.getDistrict().endsWith("区")) { - model.setDistrict(model.getDistrict().replaceAll("区$", "")); + if (model.getDistrict().endsWith("鍖�")) { + model.setDistrict(model.getDistrict().replaceAll("鍖�$", "")); } if (model.getMaxFloor() != null && (model.getMaxFloor() <= 0 || model.getMaxFloor() > 59)) { - mav.setModel(BasicModel.buildBadRequestModel("maxFloor取值非法,正确范围[1,60)")); + mav.setModel(BasicModel.buildBadRequestModel("maxFloor鍙栧�奸潪娉�,姝g‘鑼冨洿[1,60)")); return mav; } if (model.getFloor() != null && (model.getFloor() <= 0 || model.getFloor() > 59)) { - mav.setModel(BasicModel.buildBadRequestModel("floor取值非法,正确范围[1,60)")); + mav.setModel(BasicModel.buildBadRequestModel("floor鍙栧�奸潪娉�,姝g‘鑼冨洿[1,60)")); return mav; } if (model.getMaxFloor() != null && model.getFloor() != null && model.getFloor() > model.getMaxFloor()) { - mav.setModel(BasicModel.buildBadRequestModel("所在楼层不能大于总楼层")); + mav.setModel(BasicModel.buildBadRequestModel("鎵�鍦ㄦゼ灞備笉鑳藉ぇ浜庢�绘ゼ灞�")); return mav; } HttpRequest request = new HttpRequest(); @@ -367,25 +367,25 @@ public class ShopSellController { result.put("caseId", String.valueOf(json.get("data"))); mav.setModel(BasicModel.buildOKModel().setResult(result)); } else { - mav.setModel(BasicModel.buildBadRequestModel("申请估值报告失败:" + json.getString("message"))); + mav.setModel(BasicModel.buildBadRequestModel("鐢宠浼板�兼姤鍛婂け璐ワ細" + json.getString("message"))); } } else { - mav.setModel(BasicModel.buildBadRequestModel("申请估值报告失败:调用申请报告接口返回为空")); + mav.setModel(BasicModel.buildBadRequestModel("鐢宠浼板�兼姤鍛婂け璐ワ細璋冪敤鐢宠鎶ュ憡鎺ュ彛杩斿洖涓虹┖")); } return mav; } /** - * 获取估值报告 + * 鑾峰彇浼板�兼姤鍛� * - * @param caseId 估值报告ID + * @param caseId 浼板�兼姤鍛奍D * @return */ public Object assessPriceReportFetchAction(@Param(name = "caseId") String caseId) { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(caseId)) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:估值报告业务编号为必填项")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:浼板�兼姤鍛婁笟鍔$紪鍙蜂负蹇呭~椤�")); return mav; } HttpRequest request = new HttpRequest(); @@ -412,10 +412,10 @@ public class ShopSellController { JSONObject resultJson = json.getJSONObject("data"); mav.setModel(BasicModel.buildOKModel().setResult(resultJson)); } else { - mav.setModel(BasicModel.buildBadRequestModel("获取估值报告失败:" + json.getString("message"))); + mav.setModel(BasicModel.buildBadRequestModel("鑾峰彇浼板�兼姤鍛婂け璐ワ細" + json.getString("message"))); } } else { - mav.setModel(BasicModel.buildBadRequestModel("申请报告失败:调用获取估值报告接口返回为空")); + mav.setModel(BasicModel.buildBadRequestModel("鐢宠鎶ュ憡澶辫触锛氳皟鐢ㄨ幏鍙栦及鍊兼姤鍛婃帴鍙h繑鍥炰负绌�")); } return mav; } @@ -434,7 +434,7 @@ public class ShopSellController { } /** - * 通过EvaluationModel组装Evaluation实体 + * 閫氳繃EvaluationModel缁勮Evaluation瀹炰綋 * * @param model * @param request @@ -574,13 +574,13 @@ public class ShopSellController { if (model.isNewDistrict()) { evaluation.setNewDistrict(model.isNewDistrict()); } - String floorDesc = "中"; + String floorDesc = "涓�"; if (evaluation.getFloor() != null && evaluation.getHeight() != null) { Double floorInfo = evaluation.getFloor() * 1.0 / evaluation.getHeight(); if (floorInfo <= 0.33) { - floorDesc = "低"; + floorDesc = "浣�"; } else if (floorInfo > 0.66) { - floorDesc = "高"; + floorDesc = "楂�"; } evaluation.setFloorDesc(floorDesc); } @@ -597,15 +597,15 @@ public class ShopSellController { private static final Map FACILITIES = new HashMap() { { - put("0", "健身房"); - put("1", "游泳池"); - put("2", "会所"); - put("3", "网球场"); - put("4", "球场"); - put("5", "棋牌室"); - put("6", "停车场"); - put("7", "图书馆"); - put("8", "活动中心"); + put("0", "鍋ヨ韩鎴�"); + put("1", "娓告吵姹�"); + put("2", "浼氭墍"); + put("3", "缃戠悆鍦�"); + put("4", "鐞冨満"); + put("5", "妫嬬墝瀹�"); + put("6", "鍋滆溅鍦�"); + put("7", "鍥句功棣�"); + put("8", "娲诲姩涓績"); } }; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/SinaLoginController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/SinaLoginController.java index 7c1eb4f2f..317c3b5ad 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/SinaLoginController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/SinaLoginController.java @@ -37,14 +37,14 @@ public class SinaLoginController { try { info = sinaLoginService.getToken(code); } catch (Exception e) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.REQUEST_ERROR, "新浪微博验证失败!")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.REQUEST_ERROR, "鏂版氮寰崥楠岃瘉澶辫触锛�")); return mav; } try { sinaLoginService.userInfo(info); } catch (Exception e) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.REQUEST_ERROR, "新浪微博无法取得用户信息!")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.REQUEST_ERROR, "鏂版氮寰崥鏃犳硶鍙栧緱鐢ㄦ埛淇℃伅锛�")); return mav; } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/SmsController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/SmsController.java index 7f36b4a77..6d503bc70 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/SmsController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/SmsController.java @@ -22,14 +22,14 @@ public class SmsController { RestfulModelAndView mav = new RestfulModelAndView(); SmsSendLog smsSendLog = smsService.findLastSmsSendLog(model.getMobile()); if(smsSendLog != null && System.currentTimeMillis() - smsSendLog.getCreateDate().getTime() < 1000 * 60){ - mav.setModel(BasicModel.buildForbidModel("该手机号短信发送频繁")); + mav.setModel(BasicModel.buildForbidModel("璇ユ墜鏈哄彿鐭俊鍙戦�侀绻�")); return mav; } Calendar calendar = Calendar.getInstance(); calendar.add(Calendar.HOUR, -1); long count = smsService.countSmsSendLog(model.getIp(), calendar.getTime()); if(count > 100){ - mav.setModel(BasicModel.buildForbidModel("该IP短信发送频繁")); + mav.setModel(BasicModel.buildForbidModel("璇P鐭俊鍙戦�侀绻�")); return mav; } try { @@ -44,7 +44,7 @@ public class SmsController { smsSendLog.setIp(model.getIp()); smsSendLog.setPurpose(model.getPurpose()); smsService.saveSmsSendLog(smsSendLog); - mav.setModel(BasicModel.buildOKModel().setMsg("短发发送成功")); + mav.setModel(BasicModel.buildOKModel().setMsg("鐭彂鍙戦�佹垚鍔�")); return mav; } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/SouController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/SouController.java index 2f64d31ba..4f9306fbe 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/SouController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/SouController.java @@ -23,29 +23,29 @@ import com.fangjia.service.datastore.bean.RentHouseQueryBean; import com.fangjia.service.mongo.mobile.SearchKeywordService; /** - * 站内搜索controller + * 绔欏唴鎼滅储controller * * @author liupei */ @Authority(role = Role.USER) public class SouController { /** - * 用户搜索Service + * 鐢ㄦ埛鎼滅储Service */ private SearchKeywordService searchKeywordService; /** - * 二手房Service + * 浜屾墜鎴縎ervice */ private HouseService houseService; /** - * 出租房Service + * 鍑虹鎴縎ervice */ private RentHouseService rentHouseService; /** - * 小区Service + * 灏忓尯Service */ private DistrictService districtService; @@ -55,7 +55,7 @@ public class SouController { private AutoCompleteService autoCompleteService; /** - * 用户搜索Action + * 鐢ㄦ埛鎼滅储Action * * @return */ @@ -64,7 +64,7 @@ public class SouController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(city) || StringUtils.isBlank(keyword)) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "城市名,关键词为必填项")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鍩庡競鍚�,鍏抽敭璇嶄负蹇呭~椤�")); return mav; } this.searchKeywordService.save(new SearchKeyword(city, keyword, lat, lng)); @@ -87,7 +87,7 @@ public class SouController { } /** - * 推荐关键词Action + * 鎺ㄨ崘鍏抽敭璇岮ction * * @param city * @param keyword @@ -97,7 +97,7 @@ public class SouController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(keyword)) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "关键词为必填项")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鍏抽敭璇嶄负蹇呭~椤�")); return mav; } mav.setModel(autoCompleteService.suggest(keyword, 20)); @@ -105,7 +105,7 @@ public class SouController { } /** - * 自动完成Action + * 鑷姩瀹屾垚Action * * @param city * @param keyword @@ -115,7 +115,7 @@ public class SouController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(keyword)) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "关键词为必填项")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鍏抽敭璇嶄负蹇呭~椤�")); return mav; } ServerArea serverArea = ServerAreaData.getServerAreaByDisplayDefaultNull(city); @@ -130,7 +130,7 @@ public class SouController { } /** - * 小区名纠错 + * 灏忓尯鍚嶇籂閿� * * @param city * @param keyword @@ -140,7 +140,7 @@ public class SouController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(keyword)) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "关键词为必填项")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鍏抽敭璇嶄负蹇呭~椤�")); return mav; } ServerArea serverArea = ServerAreaData.getServerAreaByDisplayDefaultNull(city); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/SqmetreRentController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/SqmetreRentController.java index 17c168e00..8506efa57 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/SqmetreRentController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/SqmetreRentController.java @@ -17,7 +17,7 @@ import org.apache.commons.lang.StringUtils; import java.util.*; /** - * 平米租金 + * 骞崇背绉熼噾 */ @Authority(role = Role.USER) public class SqmetreRentController { @@ -27,7 +27,7 @@ public class SqmetreRentController { /** - * 城市平米租金 + * 鍩庡競骞崇背绉熼噾 * * @param model * @return @@ -37,25 +37,25 @@ public class SqmetreRentController { mav.setViewType("rest"); model.setCat("city"); - // 校验城市参数 + // 鏍¢獙鍩庡競鍙傛暟 if (StringUtils.isBlank(model.getCity())) { - mav.setModel(BasicModel.buildBadRequestModel("city(城市)是必须参数")); + mav.setModel(BasicModel.buildBadRequestModel("city(鍩庡競)鏄繀椤诲弬鏁�")); return mav; } - // 设置默认 periodCount 并校验范围 + // 璁剧疆榛樿 periodCount 骞舵牎楠岃寖鍥� if (model.getPeriodCount() == null) { model.setPeriodCount(1); } if (model.getPeriodCount() < 1 || model.getPeriodCount() > 156) { - mav.setModel(BasicModel.buildBadRequestModel("periodCount值不合法,取值范围是:[1-156]")); + mav.setModel(BasicModel.buildBadRequestModel("periodCount鍊间笉鍚堟硶,鍙栧�艰寖鍥存槸锛歔1-156]")); return mav; } - // 计算起始日期 + // 璁$畻璧峰鏃ユ湡 Date startDate = DateUtil.add(new Date(), Calendar.MONTH, -(model.getPeriodCount() + 1)); - // 查询平米租金数据 + // 鏌ヨ骞崇背绉熼噾鏁版嵁 List sqmetreRents = sqmetreRentService.findSqmetreRents( RegionData.formatCity(model.getCity()), RegionData.formatRegion(model.getCity(), model.getDistrict()), @@ -65,20 +65,20 @@ public class SqmetreRentController { null ); - // 准备结果列表 + // 鍑嗗缁撴灉鍒楄〃 List> result = new ArrayList>(model.getPeriodCount()); Double lastMonthRent = null; - // 遍历并填充结果 + // 閬嶅巻骞跺~鍏呯粨鏋� if (sqmetreRents != null && !sqmetreRents.isEmpty()) { for (SqmetreRent sqmetreRent : sqmetreRents) { Map item = new LinkedHashMap(); item.put("city", sqmetreRent.getCity()); Integer currentRent = (sqmetreRent.getAvgPrice() != null) ? sqmetreRent.getAvgPrice().intValue() : 0; item.put("rent", currentRent); - item.put("date", sqmetreRent.getWeekend() != null ? DateUtil.formatByPattern(sqmetreRent.getWeekend(), "yyyy-MM") : "未知日期"); + item.put("date", sqmetreRent.getWeekend() != null ? DateUtil.formatByPattern(sqmetreRent.getWeekend(), "yyyy-MM") : "鏈煡鏃ユ湡"); - // 计算月涨幅 + // 璁$畻鏈堟定骞� if (lastMonthRent != null && lastMonthRent != 0) { double changePercent = ((double) currentRent - lastMonthRent) / lastMonthRent; item.put("changePercent", Double.valueOf(String.format("%.2f", changePercent))); @@ -91,7 +91,7 @@ public class SqmetreRentController { } } - // 设置返回结果,防止 subList 越界 + // 璁剧疆杩斿洖缁撴灉锛岄槻姝� subList 瓒婄晫 if (result.size() > 1) { mav.setModel(BasicModel.buildOKModel().setResult(result)); } else { @@ -100,7 +100,7 @@ public class SqmetreRentController { return mav; } /** - * 区域平米租金 + * 鍖哄煙骞崇背绉熼噾 * * @param model * @return @@ -110,25 +110,25 @@ public class SqmetreRentController { mav.setViewType("rest"); model.setCat("region"); - // 校验城市参数 + // 鏍¢獙鍩庡競鍙傛暟 if (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getDistrict())) { - mav.setModel(BasicModel.buildBadRequestModel("city(城市),district(区域)是必须参数")); + mav.setModel(BasicModel.buildBadRequestModel("city(鍩庡競),district(鍖哄煙)鏄繀椤诲弬鏁�")); return mav; } - // 设置默认 periodCount 并校验范围 + // 璁剧疆榛樿 periodCount 骞舵牎楠岃寖鍥� if (model.getPeriodCount() == null) { model.setPeriodCount(1); } if (model.getPeriodCount() < 1 || model.getPeriodCount() > 156) { - mav.setModel(BasicModel.buildBadRequestModel("periodCount值不合法,取值范围是:[1-156]")); + mav.setModel(BasicModel.buildBadRequestModel("periodCount鍊间笉鍚堟硶,鍙栧�艰寖鍥存槸锛歔1-156]")); return mav; } - // 计算起始日期 + // 璁$畻璧峰鏃ユ湡 Date startDate = DateUtil.add(new Date(), Calendar.MONTH, -(model.getPeriodCount() + 1)); - // 查询平米租金数据 + // 鏌ヨ骞崇背绉熼噾鏁版嵁 List sqmetreRents = sqmetreRentService.findSqmetreRents( RegionData.formatCity(model.getCity()), RegionData.formatRegion(model.getCity(), model.getDistrict()), @@ -138,11 +138,11 @@ public class SqmetreRentController { null ); - // 准备结果列表 + // 鍑嗗缁撴灉鍒楄〃 List> result = new ArrayList>(model.getPeriodCount()); Double lastMonthRent = null; - // 遍历并填充结果 + // 閬嶅巻骞跺~鍏呯粨鏋� if (sqmetreRents != null && !sqmetreRents.isEmpty()) { for (SqmetreRent sqmetreRent : sqmetreRents) { Map item = new LinkedHashMap(); @@ -150,9 +150,9 @@ public class SqmetreRentController { item.put("district", sqmetreRent.getRegion()); Integer currentRent = (sqmetreRent.getAvgPrice() != null) ? sqmetreRent.getAvgPrice().intValue() : 0; item.put("rent", currentRent); - item.put("date", sqmetreRent.getWeekend() != null ? DateUtil.formatByPattern(sqmetreRent.getWeekend(), "yyyy-MM") : "未知日期"); + item.put("date", sqmetreRent.getWeekend() != null ? DateUtil.formatByPattern(sqmetreRent.getWeekend(), "yyyy-MM") : "鏈煡鏃ユ湡"); - // 计算月涨幅 + // 璁$畻鏈堟定骞� if (lastMonthRent != null && lastMonthRent != 0) { double changePercent = ((double) currentRent - lastMonthRent) / lastMonthRent; item.put("changePercent", Double.valueOf(String.format("%.2f", changePercent))); @@ -165,7 +165,7 @@ public class SqmetreRentController { } } - // 设置返回结果,防止 subList 越界 + // 璁剧疆杩斿洖缁撴灉锛岄槻姝� subList 瓒婄晫 if (result.size() > 1) { mav.setModel(BasicModel.buildOKModel().setResult(result)); } else { @@ -174,7 +174,7 @@ public class SqmetreRentController { return mav; } /** - * 小区平米租金 + * 灏忓尯骞崇背绉熼噾 * * @param model * @return @@ -184,9 +184,9 @@ public class SqmetreRentController { mav.setViewType("rest"); model.setCat("district"); - // 校验城市参数 + // 鏍¢獙鍩庡競鍙傛暟 if (StringUtils.isBlank(model.getCity())) { - mav.setModel(BasicModel.buildBadRequestModel("city(城市),district(区域),name(小区名)是必须参数")); + mav.setModel(BasicModel.buildBadRequestModel("city(鍩庡競),district(鍖哄煙),name(灏忓尯鍚�)鏄繀椤诲弬鏁�")); return mav; } District district = null; @@ -194,24 +194,24 @@ public class SqmetreRentController { district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(), "district"); if (null == district) { - mav.setModel(BasicModel.buildBadRequestModel("该小区不存在")); + mav.setModel(BasicModel.buildBadRequestModel("璇ュ皬鍖轰笉瀛樺湪")); return mav; } } - // 设置默认 periodCount 并校验范围 + // 璁剧疆榛樿 periodCount 骞舵牎楠岃寖鍥� if (model.getPeriodCount() == null) { model.setPeriodCount(1); } if (model.getPeriodCount() < 1 || model.getPeriodCount() > 156) { - mav.setModel(BasicModel.buildBadRequestModel("periodCount值不合法,取值范围是:[1-156]")); + mav.setModel(BasicModel.buildBadRequestModel("periodCount鍊间笉鍚堟硶,鍙栧�艰寖鍥存槸锛歔1-156]")); return mav; } - // 计算起始日期 + // 璁$畻璧峰鏃ユ湡 Date startDate = DateUtil.add(new Date(), Calendar.MONTH, -(model.getPeriodCount() + 1)); - // 查询平米租金数据 + // 鏌ヨ骞崇背绉熼噾鏁版嵁 List sqmetreRents = sqmetreRentService.findSqmetreRents( RegionData.formatCity(model.getCity()), RegionData.formatRegion(model.getCity(), model.getDistrict()), @@ -221,11 +221,11 @@ public class SqmetreRentController { null ); - // 准备结果列表 + // 鍑嗗缁撴灉鍒楄〃 List> result = new ArrayList>(model.getPeriodCount()); Double lastMonthRent = null; - // 遍历并填充结果 + // 閬嶅巻骞跺~鍏呯粨鏋� if (sqmetreRents != null && !sqmetreRents.isEmpty()) { for (SqmetreRent sqmetreRent : sqmetreRents) { Map item = new LinkedHashMap(); @@ -235,9 +235,9 @@ public class SqmetreRentController { Integer currentRent = (sqmetreRent.getAvgPrice() != null) ? sqmetreRent.getAvgPrice().intValue() : 0; Double dayRentPrice = currentRent/30.0; item.put("rent", DataUtil.getRound(2, dayRentPrice)); - item.put("date", sqmetreRent.getWeekend() != null ? DateUtil.formatByPattern(sqmetreRent.getWeekend(), "yyyy-MM") : "未知日期"); + item.put("date", sqmetreRent.getWeekend() != null ? DateUtil.formatByPattern(sqmetreRent.getWeekend(), "yyyy-MM") : "鏈煡鏃ユ湡"); - // 计算月涨幅 + // 璁$畻鏈堟定骞� if (lastMonthRent != null && lastMonthRent != 0) { double changePercent = ((double) currentRent - lastMonthRent) / lastMonthRent; item.put("changePercent", Double.valueOf(String.format("%.2f", changePercent))); @@ -250,7 +250,7 @@ public class SqmetreRentController { } } - // 设置返回结果,防止 subList 越界 + // 璁剧疆杩斿洖缁撴灉锛岄槻姝� subList 瓒婄晫 if (result.size() > 0) { mav.setModel(BasicModel.buildOKModel().setResult(result.subList(1, result.size()))); } else { diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/StatsIndexController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/StatsIndexController.java index 5e2514098..e9eecba43 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/StatsIndexController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/StatsIndexController.java @@ -40,28 +40,28 @@ public class StatsIndexController { private PropertyStatsIndexService propertyStatsIndexService; /** - * 查询城市级别价格指数 - * param y:city : ,yearmonth: yyyyMM cat:商铺,写字楼,住宅 + * 鏌ヨ鍩庡競绾у埆浠锋牸鎸囨暟 + * param y:city : ,yearmonth: yyyyMM cat:鍟嗛摵锛屽啓瀛楁ゼ锛屼綇瀹� */ @Authority(role = Role.USER) public Object cityAction(StatsIndexModel model) throws Exception { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity())) { - mav.setModel(BasicModel.buildBadRequestModel("请输入城市编码")); + mav.setModel(BasicModel.buildBadRequestModel("璇疯緭鍏ュ煄甯傜紪鐮�")); return mav; } if (null == model.getYearmonth()) { - mav.setModel(BasicModel.buildBadRequestModel("请输入要查询的年月")); + mav.setModel(BasicModel.buildBadRequestModel("璇疯緭鍏ヨ鏌ヨ鐨勫勾鏈�")); return mav; } String cityName = DistrictCodeUtils.getCityName(model.getCity()); if (cityName == null) { - mav.setModel(BasicModel.buildBadRequestModel("无法匹配到该城市编码")); + mav.setModel(BasicModel.buildBadRequestModel("鏃犳硶鍖归厤鍒拌鍩庡競缂栫爜")); return mav; } Map resMap = new HashMap(); - StatsIndex statsIndex = statsIndexService.findStatsIndex(cityName, "", "城市", "", model.getYearmonth(), model.getCat()); + StatsIndex statsIndex = statsIndexService.findStatsIndex(cityName, "", "鍩庡競", "", model.getYearmonth(), model.getCat()); if (statsIndex != null) { StatsIndex newStatsIndex = new StatsIndex(); newStatsIndex.setChain(statsIndex.getChain()); @@ -91,7 +91,7 @@ public class StatsIndexController { } /** - * 查询区域级别价格指数 + * 鏌ヨ鍖哄煙绾у埆浠锋牸鎸囨暟 * * @param model * @return @@ -103,20 +103,20 @@ public class StatsIndexController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(model.getDistrict())) { - mav.setModel(BasicModel.buildBadRequestModel("请输入区域编码")); + mav.setModel(BasicModel.buildBadRequestModel("璇疯緭鍏ュ尯鍩熺紪鐮�")); return mav; } if (null == model.getYearmonth()) { - mav.setModel(BasicModel.buildBadRequestModel("请输入要查询的年月")); + mav.setModel(BasicModel.buildBadRequestModel("璇疯緭鍏ヨ鏌ヨ鐨勫勾鏈�")); return mav; } FangjiaOfficialAreaMap fangjiaOfficialAreaMap = fangjiaOfficialAreaService.convertOfficialCodeToFangjia(model.getDistrict()); if (fangjiaOfficialAreaMap == null) { - mav.setModel(BasicModel.buildBadRequestModel("无法匹配到该区域编码")); + mav.setModel(BasicModel.buildBadRequestModel("鏃犳硶鍖归厤鍒拌鍖哄煙缂栫爜")); return mav; } Map resMap = new HashMap(); - StatsIndex statsIndex = statsIndexService.findStatsIndex(fangjiaOfficialAreaMap.getFangjiaCity(), fangjiaOfficialAreaMap.getFangjiaDistrict(), "区域", "", model.getYearmonth(), model.getCat()); + StatsIndex statsIndex = statsIndexService.findStatsIndex(fangjiaOfficialAreaMap.getFangjiaCity(), fangjiaOfficialAreaMap.getFangjiaDistrict(), "鍖哄煙", "", model.getYearmonth(), model.getCat()); if (statsIndex != null) { StatsIndex newStatsIndex = new StatsIndex(); newStatsIndex.setChain(statsIndex.getChain()); @@ -133,7 +133,7 @@ public class StatsIndexController { } /** - * 小区价格指数 + * 灏忓尯浠锋牸鎸囨暟 * * @param model * @return @@ -144,16 +144,16 @@ public class StatsIndexController { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); if (StringUtils.isBlank(model.getId())) { - mav.setModel(BasicModel.buildBadRequestModel("请输入小区id")); + mav.setModel(BasicModel.buildBadRequestModel("璇疯緭鍏ュ皬鍖篿d")); return mav; } if (null == model.getYearmonth()) { - mav.setModel(BasicModel.buildBadRequestModel("请输入要查询的年月")); + mav.setModel(BasicModel.buildBadRequestModel("璇疯緭鍏ヨ鏌ヨ鐨勫勾鏈�")); return mav; } District district = districtService.findById(model.getId()); if (district == null) { - mav.setModel(BasicModel.buildBadRequestModel("无法匹配到小区")); + mav.setModel(BasicModel.buildBadRequestModel("鏃犳硶鍖归厤鍒板皬鍖�")); return mav; } Map resMap = new HashMap(); @@ -176,7 +176,7 @@ public class StatsIndexController { } /** - * 查询新房指数 + * 鏌ヨ鏂版埧鎸囨暟 * param yearmonth: yyyyMM */ @Authority(role = Role.USER) @@ -186,16 +186,16 @@ public class StatsIndexController { if (StringUtils.isNotBlank(model.getCity())) { String cityName = DistrictCodeUtils.getCityName(model.getCity()); if (cityName == null) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "无法匹配到该城市编码")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鏃犳硶鍖归厤鍒拌鍩庡競缂栫爜")); return mav; } model.setCity(cityName); } if (null == model.getYearmonth()) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "年月必须输入,格式:yyyyMM")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "骞存湀蹇呴』杈撳叆,鏍煎紡:yyyyMM")); return mav; } - List statsIndexs = statsIndexService.findAllStats(model.getCity(), model.getYearmonth(), false, "住宅"); + List statsIndexs = statsIndexService.findAllStats(model.getCity(), model.getYearmonth(), false, "浣忓畢"); List statsIndexList = new ArrayList(); if (statsIndexs != null && statsIndexs.size() > 0) { @@ -214,20 +214,20 @@ public class StatsIndexController { } if (statsIndexList.isEmpty()) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "目标数据不存在")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "鐩爣鏁版嵁涓嶅瓨鍦�")); return mav; } Map resMap = new HashMap(); resMap.put("results", statsIndexList); resMap.put("count", statsIndexList.size()); - resMap.put("type", "新建商品房"); + resMap.put("type", "鏂板缓鍟嗗搧鎴�"); mav.setModel(resMap); return mav; } /** - * 查询二手房指数 + * 鏌ヨ浜屾墜鎴挎寚鏁� * param yearmonth: yyyyMM */ @Authority(role = Role.USER) @@ -237,16 +237,16 @@ public class StatsIndexController { if (StringUtils.isNotBlank(model.getCity())) { String cityName = DistrictCodeUtils.getCityName(model.getCity()); if (cityName == null) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "无法匹配到该城市编码")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鏃犳硶鍖归厤鍒拌鍩庡競缂栫爜")); return mav; } model.setCity(cityName); } if (null == model.getYearmonth()) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "年月必须输入,格式:yyyyMM")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "骞存湀蹇呴』杈撳叆,鏍煎紡:yyyyMM")); return mav; } - List statsIndexs = statsIndexService.findAllStats(model.getCity(), model.getYearmonth(), false, "住宅"); + List statsIndexs = statsIndexService.findAllStats(model.getCity(), model.getYearmonth(), false, "浣忓畢"); List statsIndexList = new ArrayList(); if (statsIndexs != null && statsIndexs.size() > 0) { @@ -276,20 +276,20 @@ public class StatsIndexController { } if (statsIndexList.isEmpty()) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "目标数据不存在")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "鐩爣鏁版嵁涓嶅瓨鍦�")); return mav; } Map resMap = new HashMap(); resMap.put("results", statsIndexList); resMap.put("count", statsIndexList.size()); - resMap.put("type", "二手住宅"); + resMap.put("type", "浜屾墜浣忓畢"); mav.setModel(resMap); return mav; } /** - * 查询商铺指数 + * 鏌ヨ鍟嗛摵鎸囨暟 * param yearmonth: yyyyMM */ @Authority(role = Role.USER) @@ -299,16 +299,16 @@ public class StatsIndexController { if (StringUtils.isNotBlank(model.getCity())) { String cityName = DistrictCodeUtils.getCityName(model.getCity()); if (cityName == null) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "无法匹配到该城市编码")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鏃犳硶鍖归厤鍒拌鍩庡競缂栫爜")); return mav; } model.setCity(cityName); } if (null == model.getYearmonth()) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "年月必须输入,格式:yyyyMM")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "骞存湀蹇呴』杈撳叆,鏍煎紡:yyyyMM")); return mav; } - List statsIndexs = statsIndexService.findAllStats(model.getCity(), model.getYearmonth(), true, "商铺"); + List statsIndexs = statsIndexService.findAllStats(model.getCity(), model.getYearmonth(), true, "鍟嗛摵"); List statsIndexList = new ArrayList(); if (statsIndexs != null && statsIndexs.size() > 0) { @@ -326,20 +326,20 @@ public class StatsIndexController { } if (statsIndexList.isEmpty()) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "目标数据不存在")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "鐩爣鏁版嵁涓嶅瓨鍦�")); return mav; } Map resMap = new HashMap(); resMap.put("results", statsIndexList); resMap.put("count", statsIndexList.size()); - resMap.put("type", "商铺"); + resMap.put("type", "鍟嗛摵"); mav.setModel(resMap); return mav; } /** - * 查询写字楼指数 + * 鏌ヨ鍐欏瓧妤兼寚鏁� * yearmonth: yyyyMM */ @Authority(role = Role.USER) @@ -349,17 +349,17 @@ public class StatsIndexController { if (StringUtils.isNotBlank(model.getCity())) { String cityName = DistrictCodeUtils.getCityName(model.getCity()); if (cityName == null) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "无法匹配到该城市编码")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鏃犳硶鍖归厤鍒拌鍩庡競缂栫爜")); return mav; } model.setCity(cityName); } if (null == model.getYearmonth()) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "年月必须输入,格式:yyyyMM")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "骞存湀蹇呴』杈撳叆,鏍煎紡:yyyyMM")); return mav; } - List statsIndexs = statsIndexService.findAllStats(model.getCity(), model.getYearmonth(), true, "写字楼"); + List statsIndexs = statsIndexService.findAllStats(model.getCity(), model.getYearmonth(), true, "鍐欏瓧妤�"); List statsIndexList = new ArrayList(); if (statsIndexs != null && statsIndexs.size() > 0) { @@ -377,21 +377,21 @@ public class StatsIndexController { } if (statsIndexList.isEmpty()) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "目标数据不存在")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "鐩爣鏁版嵁涓嶅瓨鍦�")); return mav; } Map resMap = new HashMap(); resMap.put("results", statsIndexList); resMap.put("count", statsIndexList.size()); - resMap.put("type", "写字楼"); + resMap.put("type", "鍐欏瓧妤�"); mav.setModel(resMap); return mav; } /** - * 查询 - * param city:城市 , year:年份 + * 鏌ヨ + * param city:鍩庡競 , year:骞翠唤 */ @Authority(role = Role.USER) public Object searchLandIndexAction(LandPriceIndexModel model) { @@ -400,13 +400,13 @@ public class StatsIndexController { if (StringUtils.isNotBlank(model.getCity())) { String cityName = DistrictCodeUtils.getCityName(model.getCity()); if (cityName == null) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "无法匹配到该城市编码")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鏃犳硶鍖归厤鍒拌鍩庡競缂栫爜")); return mav; } model.setCity(cityName); } if (model.getYear() <= 0) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "年份必须输入,格式:yyyy")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "骞翠唤蹇呴』杈撳叆,鏍煎紡:yyyy")); return mav; } List landPriceIndexList = new ArrayList(); @@ -435,25 +435,25 @@ public class StatsIndexController { } if (landPriceIndexBoList.isEmpty()) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "目标数据不存在")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "鐩爣鏁版嵁涓嶅瓨鍦�")); return mav; } Map resMap = new HashMap(); resMap.put("results", landPriceIndexBoList); resMap.put("count", landPriceIndexBoList.size()); - resMap.put("type", "土地"); + resMap.put("type", "鍦熷湴"); mav.setModel(resMap); return mav; } private String getSourceString(int source) { if (source == 1) { - return "统计局"; + return "缁熻灞�"; } else if (source == 2) { - return "房价网"; + return "鎴夸环缃�"; } else if (source == 3) { - return "手工输入"; + return "鎵嬪伐杈撳叆"; } return ""; } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/TaskController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/TaskController.java index 9459a0d2a..9eef26581 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/TaskController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/TaskController.java @@ -132,7 +132,7 @@ public class TaskController { } /** - * 利用Map abc解析出指定经纬度的周边信息 + * 鍒╃敤Map abc瑙f瀽鍑烘寚瀹氱粡绾害鐨勫懆杈逛俊鎭� * * @param model * @return @@ -232,12 +232,12 @@ public class TaskController { } /** - * 分词服务 + * 鍒嗚瘝鏈嶅姟 *

- * 参数: k: 待分词的字符串(必选) channel: 频道(可选,默认为二手房) + * 鍙傛暟: k: 寰呭垎璇嶇殑瀛楃涓�(蹇呴��) channel: 棰戦亾(鍙��,榛樿涓轰簩鎵嬫埧) *

*

- * 返回: tokens: 切分结果 details:详细切分结果 querys:索引查询词 + * 杩斿洖: tokens: 鍒囧垎缁撴灉 details:璇︾粏鍒囧垎缁撴灉 querys:绱㈠紩鏌ヨ璇� *

* * @param model @@ -259,13 +259,13 @@ public class TaskController { Map resultMap = new HashMap(); resultMap.put("tokens", StringUtils.join(tokenList, ",")); resultMap.put("details", StringUtils.join(tokens, ", ")); - if ("二手房".equals(model.getChannel())) { + if ("浜屾墜鎴�".equals(model.getChannel())) { resultMap.put("querys", boostQuerySellPolicy.create(model.getK()).toString()); - } else if ("租房".equals(model.getChannel())) { + } else if ("绉熸埧".equals(model.getChannel())) { resultMap.put("querys", boostQueryRentPolicy.create(model.getK()).toString()); - } else if ("小区".equals(model.getChannel())) { + } else if ("灏忓尯".equals(model.getChannel())) { resultMap.put("querys", boostQueryDistrictPolicy.create(model.getK()).toString()); - } else if ("新闻".equals(model.getChannel())) { + } else if ("鏂伴椈".equals(model.getChannel())) { resultMap.put("querys", boostQueryNewsPolicy.create(model.getK()).toString()); } mav.setModel(resultMap); @@ -273,12 +273,12 @@ public class TaskController { } /** - * IP地址解析服务 + * IP鍦板潃瑙f瀽鏈嶅姟 *

- * 参数: k: ip地址(必选) city:ip默认城市(可选, 默认为"") + * 鍙傛暟: k: ip鍦板潃(蹇呴��) city:ip榛樿鍩庡競(鍙��, 榛樿涓�"") *

*

- * 返回: display:城市名 + * 杩斿洖: display:鍩庡競鍚� *

* * @param model @@ -305,10 +305,10 @@ public class TaskController { } /** - * 自动完成服务 + * 鑷姩瀹屾垚鏈嶅姟 *

- * 参数: k: 输入词(必选) city:城市(可选, 默认全国), limit:条目数量(可选,默认为10) - * useOtherCity:(1,0)当指定城市不足limit指定的数量时,是否使用其他城市的补充(可选, 默认为0) + * 鍙傛暟: k: 杈撳叆璇�(蹇呴��) city:鍩庡競(鍙��, 榛樿鍏ㄥ浗), limit:鏉$洰鏁伴噺(鍙��,榛樿涓�10) + * useOtherCity:(1,0)褰撴寚瀹氬煄甯備笉瓒砽imit鎸囧畾鐨勬暟閲忔椂锛屾槸鍚︿娇鐢ㄥ叾浠栧煄甯傜殑琛ュ厖(鍙��, 榛樿涓�0) *

* * @param model @@ -406,14 +406,14 @@ public class TaskController { } /** - * 解析关键词(KEYWORD)在特定频道(SELL|RENT|DISTRICT|NEWS)内的数据量 + * 瑙f瀽鍏抽敭璇�(KEYWORD)鍦ㄧ壒瀹氶閬�(SELL|RENT|DISTRICT|NEWS)鍐呯殑鏁版嵁閲� * * @param model * @return */ public Object parseRecordCountAction(TaskModel model) { - // 解析KEYWORD相应的频道 + // 瑙f瀽KEYWORD鐩稿簲鐨勯閬� CategoryEnum channel = knowbaseService.parseKeyWord(model.getKeyword()); long count = 0; @@ -452,7 +452,7 @@ public class TaskController { } /** - * 处理REST MODEL AND VIEW. + * 澶勭悊REST MODEL AND VIEW. * * @param datas * @return diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/TestController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/TestController.java index f58c8fd6d..75e954254 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/TestController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/TestController.java @@ -10,7 +10,7 @@ import java.net.NetworkInterface; import java.net.SocketException; import java.util.Enumeration; /** - * 站内搜索controller + * 绔欏唴鎼滅储controller * * @author liupei */ @@ -23,7 +23,7 @@ public class TestController { return mav; } public static String getLocalHostIP() { - /*k8s系统上运行时,使用hostname区分*/ + /*k8s绯荤粺涓婅繍琛屾椂,浣跨敤hostname鍖哄垎*/ if ("true".equalsIgnoreCase(System.getenv("ON_K8S"))) { return System.getenv("HOSTNAME"); } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/TransactionController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/TransactionController.java index 96c29ad74..d68a9f3d1 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/TransactionController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/TransactionController.java @@ -46,7 +46,7 @@ import java.net.URLEncoder; import java.util.*; /** - * API交易接口 + * API浜ゆ槗鎺ュ彛 */ @Authority(role = Role.USER) public class TransactionController { @@ -155,39 +155,39 @@ public class TransactionController { Map AROUND_KEYWORD_FACTOR_NEW = new HashMap() { { - put("地铁", "metro"); - put("公交", "bus"); - put("商场","market"); - put("健身中心","gym"); - put("美容院","beautySalon"); - put("大型超市","supermarket"); - put("医院", "hospital"); - put("学校", "school"); - put("公园", "park"); - put("银行", "bank"); - put("码头","wharf"); - put("机场","airport"); - put("火车站","railwayStation"); + put("鍦伴搧", "metro"); + put("鍏氦", "bus"); + put("鍟嗗満","market"); + put("鍋ヨ韩涓績","gym"); + put("缇庡闄�","beautySalon"); + put("澶у瀷瓒呭競","supermarket"); + put("鍖婚櫌", "hospital"); + put("瀛︽牎", "school"); + put("鍏洯", "park"); + put("閾惰", "bank"); + put("鐮佸ご","wharf"); + put("鏈哄満","airport"); + put("鐏溅绔�","railwayStation"); put("KTV","KTV"); - put("电影院","theatre"); - put("高尔夫球场","golf"); - put("私立学校","privateSchool"); - put("整容整形","facelift"); - put("洗浴中心","bathCenter"); - put("私立医院","privateHospital"); - put("酒店","hotel"); - put("咖啡厅","cafe"); - put("餐饮","repast"); - put("游乐场","playground"); - put("旅游景点","travel"); - put("体育场馆","stadium"); - put("办证中心","certificate"); - put("图书馆","library"); - put("博物馆","museum"); - put("写字楼","office"); - put("停车场","depot"); - put("网吧","cybercafe"); - put("便利店","CVS"); + put("鐢靛奖闄�","theatre"); + put("楂樺皵澶悆鍦�","golf"); + put("绉佺珛瀛︽牎","privateSchool"); + put("鏁村鏁村舰","facelift"); + put("娲楁荡涓績","bathCenter"); + put("绉佺珛鍖婚櫌","privateHospital"); + put("閰掑簵","hotel"); + put("鍜栧暋鍘�","cafe"); + put("椁愰ギ","repast"); + put("娓镐箰鍦�","playground"); + put("鏃呮父鏅偣","travel"); + put("浣撹偛鍦洪","stadium"); + put("鍔炶瘉涓績","certificate"); + put("鍥句功棣�","library"); + put("鍗氱墿棣�","museum"); + put("鍐欏瓧妤�","office"); + put("鍋滆溅鍦�","depot"); + put("缃戝惂","cybercafe"); + put("渚垮埄搴�","CVS"); } }; Map AROUND_KEYWORD_FACTOR_COMPLEX = new HashMap(){ @@ -232,11 +232,11 @@ public class TransactionController { public Object indexAction(@Valid TransactionModel model){ RestfulModelAndView mav = new RestfulModelAndView(); - List serviceCodes = Arrays.asList(model.getServiceCode().split(",|,|;")); - //对输入的servicecode进行判断,时候输入的规范的serviceCode + List serviceCodes = Arrays.asList(model.getServiceCode().split(",|锛寍;")); + //瀵硅緭鍏ョ殑servicecode杩涜鍒ゆ柇锛屾椂鍊欒緭鍏ョ殑瑙勮寖鐨剆erviceCode for (String servicescode : serviceCodes) { if(!CORRECT_SERVICECODE_LIST.contains(servicescode)){ - mav.setModel(BasicModel.buildBadRequestModel("serviceCode不存在")); + mav.setModel(BasicModel.buildBadRequestModel("serviceCode涓嶅瓨鍦�")); return mav; } } @@ -248,7 +248,7 @@ public class TransactionController { } } if(needAddressParam && StringUtils.isBlank(model.getAddress())){ - mav.setModel(BasicModel.buildBadRequestModel("address不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("address涓嶈兘涓虹┖")); return mav; } District district = null; @@ -291,7 +291,7 @@ public class TransactionController { } if(serviceCodes.contains(RENT_SERVICE_CODE)){ if(model.getHouseType() == null || model.getHouseType() < 1 || model.getHouseType() > 10){ - mav.setModel(BasicModel.buildBadRequestModel("houseType不能为空,且必须在1~10之间")); + mav.setModel(BasicModel.buildBadRequestModel("houseType涓嶈兘涓虹┖,涓斿繀椤诲湪1~10涔嬮棿")); return mav; } List districtStats = districtStatRentService.findLatestDistrictStatRent(district, 1, model.getHouseType()); @@ -304,8 +304,8 @@ public class TransactionController { double lat = district.getLat2()/10000000000d; double lng = district.getLng2()/10000000000d; Map> result = busStationService.getNearByStations(district.getCity(), lat, lng, 1000); - List bus = result.get("公交"); - List metro = result.get("地铁"); + List bus = result.get("鍏氦"); + List metro = result.get("鍦伴搧"); if(bus != null){ dto.setBusStationAmount(bus.size()); dto.setBusStation(bus); @@ -335,7 +335,7 @@ public class TransactionController { } if(serviceCodes.contains(AROUND_AVG_RENT_SERVICE_CODE) && hasGeoPoint(district) ){ if(model.getHouseType() == null || model.getHouseType() < 1 || model.getHouseType() > 10){ - mav.setModel(BasicModel.buildBadRequestModel("houseType不能为空,且必须在1~10之间")); + mav.setModel(BasicModel.buildBadRequestModel("houseType涓嶈兘涓虹┖,涓斿繀椤诲湪1~10涔嬮棿")); return mav; } Integer aroundAvgRent = districtStatRentService.findAroundDistrictAvgRent(district, model.getHouseType()); @@ -358,7 +358,7 @@ public class TransactionController { } if(serviceCodes.contains(DISTRICT_AVG_PRICE_SERVICE_CODE)){ if(StringUtils.isBlank(model.getDistrict())){ - mav.setModel(BasicModel.buildBadRequestModel("district不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("district涓嶈兘涓虹┖")); return mav; } RegionStat regionStat = regionStatService.findRegionStat(model.getCity(), model.getDistrict()); @@ -369,11 +369,11 @@ public class TransactionController { if(serviceCodes.contains(AROUND_SIMILAR_HOUSE_SERVICE_CODE)){ if(model.getFloor() < 1 || model.getFloor() > 100){ - mav.setModel(BasicModel.buildBadRequestModel("floor 必须在1~100之间")); + mav.setModel(BasicModel.buildBadRequestModel("floor 蹇呴』鍦�1~100涔嬮棿")); return mav; } if(null == model.getSize() || model.getSize() < 10 || model.getSize() > 1000){ - mav.setModel(BasicModel.buildBadRequestModel("size 必须在10~1000之间")); + mav.setModel(BasicModel.buildBadRequestModel("size 蹇呴』鍦�10~1000涔嬮棿")); return mav; } List similarHouses = houseService.findAroundSimilarHouse(district, model.getSize(), model.getFloor(), 1000, 10); @@ -408,11 +408,11 @@ public class TransactionController { } if(serviceCodes.contains(AROUND_SIMILAR_HOUSE_COUNT_SERVICE_CODE)){ if(model.getFloor() < 1 || model.getFloor() > 100){ - mav.setModel(BasicModel.buildBadRequestModel("floor 必须在1~100之间")); + mav.setModel(BasicModel.buildBadRequestModel("floor 蹇呴』鍦�1~100涔嬮棿")); return mav; } if(null == model.getSize() || model.getSize() < 10 || model.getSize() > 1000){ - mav.setModel(BasicModel.buildBadRequestModel("size 必须在10~1000之间")); + mav.setModel(BasicModel.buildBadRequestModel("size 蹇呴』鍦�10~1000涔嬮棿")); return mav; } dto.setSimilarHouseCount(houseService.findAroundSimilarHouseCount(district, model.getSize(), model.getFloor(), 1000)); @@ -432,7 +432,7 @@ public class TransactionController { } if(serviceCodes.contains(DISTRICT_AVERAGE_CONSUME_SERVICE_CODE)){ if(StringUtils.isBlank(model.getDistrict())){ - mav.setModel(BasicModel.buildBadRequestModel("district不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("district涓嶈兘涓虹┖")); return mav; } AverageConsume averageConsume = averageConsumeService.findOne(model.getCity(), model.getDistrict(), null); @@ -440,38 +440,38 @@ public class TransactionController { dto.setCityAverageConsume(averageConsume.getConsumption()); } } - //经纬度 + //缁忕含搴� if(serviceCodes.contains(DISTRICT_LNG_LAT_SERVICE_CODE)){ dto.setLng(district.getLng2()/10000000000d); dto.setLat(district.getLat2()/10000000000d); } - //小区建筑类型 + //灏忓尯寤虹瓚绫诲瀷 if(serviceCodes.contains(DISTRICT_BUILDINGTYPE_SERVICE_CODE)){ dto.setBuildingType(district.getBuildType()); } - //户数 + //鎴锋暟 if(serviceCodes.contains(DISTRICT_TOTALUNITCOUNT_SERVICE_CODE)){ dto.setTotalUnitCount(district.getHouseholdCount()); } - //物业费 + //鐗╀笟璐� if(serviceCodes.contains(DISTRICT_MANAGEMENTFEE_SERVICE_CODE)){ dto.setManagementFee(district.getEstateCharge()); } - //停车位 + //鍋滆溅浣� if(serviceCodes.contains(DISTRICT_PARKING_SERVICE_CODE)){ dto.setParking(district.getCarSiteCount()); } - //产权年限 + //浜ф潈骞撮檺 if(serviceCodes.contains(DISTRICT_OWNERSHIPPERIOD_SERVICE_CODE)){ dto.setOwnershipPeriod(district.getPropertyLife()); } - //建筑年代 + //寤虹瓚骞翠唬 if(serviceCodes.contains(DISTRICT_FINISHBUILDTIME_SERVICE_CODE)){ String buildingDate = district.getFinishBuildingDate(); if(StringUtils.isNotBlank(buildingDate)){ @@ -480,45 +480,45 @@ public class TransactionController { dto.setFinishBuildTime(buildingDate); } - //占地面积 + //鍗犲湴闈㈢Н if(serviceCodes.contains(DISTRICT_FLOORSPACE_SERVICE_CODE)){ dto.setFloorSpace(district.getAllArea()); } - //建筑面积 + //寤虹瓚闈㈢Н if(serviceCodes.contains(DISTRICT_CONSTRUCTIONSPACE_SERVICE_CODE)){ dto.setConstructionSpace(district.getBuildArea()); } - //绿化率 + //缁垮寲鐜� if(serviceCodes.contains(DISTRICT_GREENPERCENTAGE_SERVICE_CODE)){ dto.setGreenPercentage(district.getVirescencePercent()); } - //容积率 + //瀹圭Н鐜� if(serviceCodes.contains(DISTRICT_PLOTRATIO_SERVICE_CODE)){ dto.setPlotRatio(district.getCubagePercent()); } - //开发商 + //寮�鍙戝晢 if(serviceCodes.contains(DISTRICT_DEVELOPER_SERVICE_CODE)){ dto.setDeveloper(district.getDeveloper()); } - //物业公司 + //鐗╀笟鍏徃 if(serviceCodes.contains(DISTRICT_PROPERTYMANAGEMENT_SERVICE_CODE)){ dto.setPropertyManagement(district.getEstateCompany()); } - //地铁 + //鍦伴搧 if(serviceCodes.contains(DISTRICT_METRO_SERVICE_CODE)){ if(hasGeoPoint(district)){ - Map> districtAroundMap = Maps.newHashMap();//附近地铁站的map + Map> districtAroundMap = Maps.newHashMap();//闄勮繎鍦伴搧绔欑殑map double lat = district.getLat2()/10000000000d; double lng = district.getLng2()/10000000000d; Map> result = busStationService.getNearByStations(district.getCity(), lat, lng, 1000); - addTrafficInfoToDistrictAroundMap(result, districtAroundMap, "地铁","metros"); + addTrafficInfoToDistrictAroundMap(result, districtAroundMap, "鍦伴搧","metros"); Map jsonObject = new LinkedHashMap(); - //封装成需要的返回格式 + //灏佽鎴愰渶瑕佺殑杩斿洖鏍煎紡 for(Map.Entry> entry : districtAroundMap.entrySet()) { String key = entry.getKey(); List listVal = entry.getValue(); @@ -532,15 +532,15 @@ public class TransactionController { } } - //公交 + //鍏氦 if(serviceCodes.contains(DISTRICT_BUS_SERVICE_CODE)){ if(hasGeoPoint(district)){ Map> districtAroundMap = Maps.newHashMap(); double lat = district.getLat2()/10000000000d; double lng = district.getLng2()/10000000000d; Map> result = busStationService.getNearByStations(district.getCity(), lat, lng, 1000); - addTrafficInfoToDistrictAroundMap(result, districtAroundMap, "公交","buses"); - //封装成需要的返回格式 + addTrafficInfoToDistrictAroundMap(result, districtAroundMap, "鍏氦","buses"); + //灏佽鎴愰渶瑕佺殑杩斿洖鏍煎紡 Map jsonObject = new LinkedHashMap(); for(Map.Entry> entry : districtAroundMap.entrySet()) { String key = entry.getKey(); @@ -555,122 +555,122 @@ public class TransactionController { } } - //商场 + //鍟嗗満 if(serviceCodes.contains(DISTRICT_MARKET_SERVICE_CODE)){ - dto.setMarket(infoInsertIntoMap(district, "商场")); + dto.setMarket(infoInsertIntoMap(district, "鍟嗗満")); } - //健身中心 + //鍋ヨ韩涓績 if(serviceCodes.contains(DISTRICT_GYM_SERVICE_CODE)){ - dto.setGym(infoInsertIntoMap(district, "健身中心")); + dto.setGym(infoInsertIntoMap(district, "鍋ヨ韩涓績")); } - //美容院 + //缇庡闄� if(serviceCodes.contains(DISTRICT_BEAUTYSALON_SERVICE_CODE)){ - dto.setBeautySalon(infoInsertIntoMap(district, "美容院")); + dto.setBeautySalon(infoInsertIntoMap(district, "缇庡闄�")); } - //大型超市 + //澶у瀷瓒呭競 if(serviceCodes.contains(DISTRICT_SUPERMARKET_SERVICE_CODE)){ - dto.setSupermarket(infoInsertIntoMap(district, "大型超市")); + dto.setSupermarket(infoInsertIntoMap(district, "澶у瀷瓒呭競")); } - //医院 + //鍖婚櫌 if(serviceCodes.contains(DISTRICT_HOSPITAL_SERVICE_CODE)){ - dto.setHospital(infoInsertIntoMap(district, "医院")); + dto.setHospital(infoInsertIntoMap(district, "鍖婚櫌")); } - //学校 + //瀛︽牎 if(serviceCodes.contains(DISTRICT_SCHOOL_SERVICE_CODE)){ - dto.setSchool(infoInsertIntoMap(district, "学校")); + dto.setSchool(infoInsertIntoMap(district, "瀛︽牎")); } - //公园、绿地 + //鍏洯銆佺豢鍦� if(serviceCodes.contains(DISTRICT_PARK_SERVICE_CODE)){ - dto.setPark(infoInsertIntoMap(district, "公园")); + dto.setPark(infoInsertIntoMap(district, "鍏洯")); } - //银行、ATM + //閾惰銆丄TM if(serviceCodes.contains(DISTRICT_BANK_SERVICE_CODE)){ - dto.setBank(infoInsertIntoMap(district, "银行")); + dto.setBank(infoInsertIntoMap(district, "閾惰")); } - //码头 + //鐮佸ご if(serviceCodes.contains(DISTRICT_WHARF_SERVICE_CODE)){ - dto.setWharf(infoInsertIntoMap(district, "码头")); + dto.setWharf(infoInsertIntoMap(district, "鐮佸ご")); } - //机场 + //鏈哄満 if(serviceCodes.contains(DISTRICT_AIRPORT_SERVICE_CODE)){ - dto.setAirport(infoInsertIntoMap(district, "机场")); + dto.setAirport(infoInsertIntoMap(district, "鏈哄満")); } - //火车站 + //鐏溅绔� if(serviceCodes.contains(DISTRICT_RAILWAYSTATION_SERVICE_CODE)){ - dto.setRailwayStation(infoInsertIntoMap(district, "火车站")); + dto.setRailwayStation(infoInsertIntoMap(district, "鐏溅绔�")); } //KTV if(serviceCodes.contains(DISTRICT_KTV_SERVICE_CODE)){ dto.setKTV(infoInsertIntoMap(district, "KTV")); } - //剧场、影院 + //鍓у満銆佸奖闄� if(serviceCodes.contains(DISTRICT_THEATRE_SERVICE_CODE)){ - dto.setTheatre(infoInsertIntoMap(district, "电影院")); + dto.setTheatre(infoInsertIntoMap(district, "鐢靛奖闄�")); } - //私立学校 + //绉佺珛瀛︽牎 if(serviceCodes.contains(DISTRICT_PRIVATESCHOOL_SERVICE_CODE)){ - dto.setPrivateSchool(infoInsertIntoMap(district, "私立学校")); + dto.setPrivateSchool(infoInsertIntoMap(district, "绉佺珛瀛︽牎")); } - //洗浴中心 + //娲楁荡涓績 if(serviceCodes.contains(DISTRICT_BATHCENTER_SERVICE_CODE)){ - dto.setBathCenter(infoInsertIntoMap(district, "洗浴中心")); + dto.setBathCenter(infoInsertIntoMap(district, "娲楁荡涓績")); } - //酒店 + //閰掑簵 if(serviceCodes.contains(DISTRICT_HOTEL_SERVICE_CODE)){ - dto.setHotel(infoInsertIntoMap(district, "酒店")); + dto.setHotel(infoInsertIntoMap(district, "閰掑簵")); } - //咖啡厅 + //鍜栧暋鍘� if(serviceCodes.contains(DISTRICT_CAFE_SERVICE_CODE)){ - dto.setCafe(infoInsertIntoMap(district, "咖啡厅")); + dto.setCafe(infoInsertIntoMap(district, "鍜栧暋鍘�")); } - //餐饮 + //椁愰ギ if(serviceCodes.contains(DISTRICT_REPAST_SERVICE_CODE)){ - dto.setRepast(infoInsertIntoMap(district, "餐饮")); + dto.setRepast(infoInsertIntoMap(district, "椁愰ギ")); } - //游乐场 + //娓镐箰鍦� if(serviceCodes.contains(DISTRICT_PLAYGROUND_SERVICE_CODE)){ - dto.setPlayground(infoInsertIntoMap(district, "游乐场")); + dto.setPlayground(infoInsertIntoMap(district, "娓镐箰鍦�")); } - //旅游景点 + //鏃呮父鏅偣 if(serviceCodes.contains(DISTRICT_TRAVEL_SERVICE_CODE)){ - dto.setTravel(infoInsertIntoMap(district, "旅游景点")); + dto.setTravel(infoInsertIntoMap(district, "鏃呮父鏅偣")); } - //体育场馆 + //浣撹偛鍦洪 if(serviceCodes.contains(DISTRICT_STADIUM_SERVICE_CODE)){ - dto.setStadium(infoInsertIntoMap(district, "体育场馆")); + dto.setStadium(infoInsertIntoMap(district, "浣撹偛鍦洪")); } - //图书馆 + //鍥句功棣� if(serviceCodes.contains(DISTRICT_LIBRARY_SERVICE_CODE)){ - dto.setLibrary(infoInsertIntoMap(district, "图书馆")); + dto.setLibrary(infoInsertIntoMap(district, "鍥句功棣�")); } - //写字楼 + //鍐欏瓧妤� if(serviceCodes.contains(DISTRICT_OFFICE_SERVICE_CODE)){ - dto.setOffice(infoInsertIntoMap(district, "写字楼")); + dto.setOffice(infoInsertIntoMap(district, "鍐欏瓧妤�")); } - //停车场 + //鍋滆溅鍦� if(serviceCodes.contains(DISTRICT_DEPOT_SERVICE_CODE)){ - dto.setDepot(infoInsertIntoMap(district, "停车场")); + dto.setDepot(infoInsertIntoMap(district, "鍋滆溅鍦�")); } - //网吧 + //缃戝惂 if(serviceCodes.contains(DISTRICT_CYBERCAFE_SERVICE_CODE)){ - dto.setCybercafe(infoInsertIntoMap(district, "网吧")); + dto.setCybercafe(infoInsertIntoMap(district, "缃戝惂")); } - //便利店 + //渚垮埄搴� if(serviceCodes.contains(DISTRICT_CVS_SERVICE_CODE)){ - dto.setCVS(infoInsertIntoMap(district, "便利店")); + dto.setCVS(infoInsertIntoMap(district, "渚垮埄搴�")); } - // 小区相似挂牌房源 + // 灏忓尯鐩镐技鎸傜墝鎴挎簮 if(serviceCodes.contains(DISTRICT_SAMEDISTRICTSIMILARHOUSE_SERVICE_CODE)){ if(model.getFloor()<1||model.getFloor()>100){ - mav.setModel(BasicModel.buildBadRequestModel("floor 必须在1~100之间")); + mav.setModel(BasicModel.buildBadRequestModel("floor 蹇呴』鍦�1~100涔嬮棿")); return mav; } if(null == model.getSize() || model.getSize()<10||model.getSize()>1000){ - mav.setModel(BasicModel.buildBadRequestModel("floor 必须在1~100之间")); + mav.setModel(BasicModel.buildBadRequestModel("floor 蹇呴』鍦�1~100涔嬮棿")); return mav; } List similarHouse = houseService.findAroundSimilarHouse(district, model.getSize(), model.getFloor(), 0, 10); @@ -705,7 +705,7 @@ public class TransactionController { mav.setModel(BasicModel.buildOKModel().setResult(dto)); return mav; } - //根据所需的字段去获取map对象 + //鏍规嵁鎵�闇�鐨勫瓧娈靛幓鑾峰彇map瀵硅薄 private Map infoInsertIntoMap(District district,String keyword){ Map> baiduPlacePoiInfo = getBaiduPlacePoiInfo(district); String keywordEnglish = AROUND_KEYWORD_FACTOR_NEW.get(keyword); @@ -716,14 +716,14 @@ public class TransactionController { return jsonObject; } - //根据百度poi查询的很多信息 + //鏍规嵁鐧惧害poi鏌ヨ鐨勫緢澶氫俊鎭� private Map> getBaiduPlacePoiInfo(District district){ List arrs = baiduApiService.searchNearbyLocalDatabase(district, 1000d); Map> districtAroundMap = Maps.newHashMap(); for(String key : AROUND_KEYWORD_FACTOR_NEW.keySet()){ - districtAroundMap.put(AROUND_KEYWORD_FACTOR_NEW.get(key), new ArrayList());//把key的英文put到map并把value设置为一个List引用 + districtAroundMap.put(AROUND_KEYWORD_FACTOR_NEW.get(key), new ArrayList());//鎶妅ey鐨勮嫳鏂噋ut鍒癿ap骞舵妸value璁剧疆涓轰竴涓狶ist寮曠敤 } for(int i=0;i> stationMap, Map> districtAroundMap, String type, String typesEnglish) { List busList = stationMap.get(type); - Set stationCache = Sets.newHashSet();//记录是否有重复站点 + Set stationCache = Sets.newHashSet();//璁板綍鏄惁鏈夐噸澶嶇珯鐐� List aroundDtos = Lists.newArrayList(); if(CollectionUtils.isNotEmpty(busList)) { - for (BusStation bs : busList) {//将每一条交通信息遍历出来 + for (BusStation bs : busList) {//灏嗘瘡涓�鏉′氦閫氫俊鎭亶鍘嗗嚭鏉� if (stationCache.add(bs.getStation())) { - AroundDto aroundDto = new AroundDto();//创建一个通用的小区附近设施对象 - //aroundDto.setLat(bs.getLat());// 设置经纬度 + AroundDto aroundDto = new AroundDto();//鍒涘缓涓�涓�氱敤鐨勫皬鍖洪檮杩戣鏂藉璞� + //aroundDto.setLat(bs.getLat());// 璁剧疆缁忕含搴� //aroundDto.setLng(bs.getLng()); - aroundDto.setName(bs.getStation());//设置设施名称 - aroundDtos.add(aroundDto);//将设施对象方静设施list中 + aroundDto.setName(bs.getStation());//璁剧疆璁炬柦鍚嶇О + aroundDtos.add(aroundDto);//灏嗚鏂藉璞℃柟闈欒鏂絣ist涓� } } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/TriggerController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/TriggerController.java index 5748bda23..47baa1032 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/TriggerController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/TriggerController.java @@ -16,18 +16,18 @@ import org.sothis.web.mvc.ActionContext; import java.util.*; /** - * datatstore 建索引触发器 + * datatstore 寤虹储寮曡Е鍙戝櫒 * */ public class TriggerController { /** - * 索引需要的trigger + * 绱㈠紩闇�瑕佺殑trigger */ private Map triggerMap; private static final Logger LOGGER = LoggerFactory.getLogger(TriggerController.class); /** - * 建索引的trigger切入点 + * 寤虹储寮曠殑trigger鍒囧叆鐐� * * @return * @throws Exception @@ -49,7 +49,7 @@ public class TriggerController { return model; } - // 按类型分组,并且清空bSONDocList + // 鎸夌被鍨嬪垎缁勶紝骞朵笖娓呯┖bSONDocList Map> catBSONDataMap = groupBSONDataByCat(bSONDocList); bSONDocList.clear(); List docList = new ArrayList((Integer) object.get("doc_list_size")); @@ -71,7 +71,7 @@ public class TriggerController { } /** - * 按类型分组 + * 鎸夌被鍨嬪垎缁� * * @param bSONDocList * @return diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/UsersController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/UsersController.java index dff7d888b..7786bbaa5 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/UsersController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/UsersController.java @@ -54,7 +54,7 @@ public class UsersController { /** * @param model - * @return 1 无此用户 2 非法请求 3 密码错误 0 正常登陆 + * @return 1 鏃犳鐢ㄦ埛 2 闈炴硶璇锋眰 3 瀵嗙爜閿欒 0 姝e父鐧婚檰 * @throws Exception */ public Object loginAction(UsersModel model) throws Exception { @@ -80,7 +80,7 @@ public class UsersController { /** * @param model - * @return 1 无此用户 2 非法请求 3 原始密码错误 0 修改成功 + * @return 1 鏃犳鐢ㄦ埛 2 闈炴硶璇锋眰 3 鍘熷瀵嗙爜閿欒 0 淇敼鎴愬姛 * @throws Exception */ public Object modifyPwdAction(UsersModel model) throws Exception { @@ -108,13 +108,13 @@ public class UsersController { if (ime == null || "".equals(ime.trim())) { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "手机唯一标示缺失!")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鎵嬫満鍞竴鏍囩ず缂哄け锛�")); return mav; } if (name == null || "".equals(name.trim())) { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "用户名缺失!")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鐢ㄦ埛鍚嶇己澶憋紒")); return mav; } if (type == null || "".equals(type.trim())) { @@ -155,7 +155,7 @@ public class UsersController { long id = user.getId(); ApiUserAuthority authority = apiUserAuthorityService.findByUserId(id); if (null != authority) { - // 用户有的uri + // 鐢ㄦ埛鏈夌殑uri List userResources = new ArrayList(); for (OpenResource openResource : openResourceList) { if (authority.getOpenResourseUris().contains(openResource.getUri())) { @@ -164,7 +164,7 @@ public class UsersController { } Map countMap = authority.getTotalCountMap(); if (null != countMap) { - // 改成遍历用户有的uri + // 鏀规垚閬嶅巻鐢ㄦ埛鏈夌殑uri for (OpenResource openResource : userResources) { String uri = openResource.getUri(); ApiMonitorInfo info = new ApiMonitorInfo(); @@ -411,15 +411,15 @@ public class UsersController { if (bo.getKey().equals("level_0")) { array.put("0s"); } else if (bo.getKey().equals("level_1")) { - array.put("1s以下"); + array.put("1s浠ヤ笅"); } else if (bo.getKey().equals("level_2")) { - array.put("1-2s以下"); + array.put("1-2s浠ヤ笅"); } else if (bo.getKey().equals("level_3")) { - array.put("2-3s以下"); + array.put("2-3s浠ヤ笅"); } else if (bo.getKey().equals("level_4")) { - array.put("3s以上"); + array.put("3s浠ヤ笂"); } else if (bo.getKey().equals("level_100")) { - array.put("暂无数据"); + array.put("鏆傛棤鏁版嵁"); } else { array.put(bo.getKey()); } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/WebankController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/WebankController.java index d3a25aa06..7efc3b91e 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/WebankController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/WebankController.java @@ -35,7 +35,7 @@ import javax.validation.Valid; import java.util.*; /** - * 微众银行定制化接口 + * 寰紬閾惰瀹氬埗鍖栨帴鍙� */ public class WebankController { private final static Logger LOGGER = LoggerFactory.getLogger(WebankController.class); @@ -51,7 +51,7 @@ public class WebankController { private ApiUserCfgService apiUserCfgService; /** - * 微信估值接口 + * 寰俊浼板�兼帴鍙� * * @param model * @return @@ -116,7 +116,7 @@ public class WebankController { if (finishBuilding != null) { String year = DateUtil.formatByPattern(finishBuilding, "yyyy"); if (Integer.valueOf(year) <= 2018) { - dto.append("buildYear", DateUtil.formatByPattern(finishBuilding, "yyyy") + "年"); + dto.append("buildYear", DateUtil.formatByPattern(finishBuilding, "yyyy") + "骞�"); } } } @@ -240,7 +240,7 @@ public class WebankController { is2bPrice = true; } LOGGER.info(JSON.toJSONString(is2bPrice)); - if (StringUtils.isNotBlank(district.getEstateType2()) && district.getEstateType2().contains("别墅") && districtStatBo.getVillaDistrictStat() != null) { + if (StringUtils.isNotBlank(district.getEstateType2()) && district.getEstateType2().contains("鍒") && districtStatBo.getVillaDistrictStat() != null) { orgAvgPrice = districtStatBo.getVillaDistrictStat().getAvgPrice(); if (is2bPrice && districtStatBo.getVillaDistrictStat().getAvg_price_2b() != null) { price_2b = districtStatBo.getVillaDistrictStat().getAvg_price_2b().intValue(); @@ -301,7 +301,7 @@ public class WebankController { public Object resetMonitorAction() { RestfulModelAndView modelAndView = new RestfulModelAndView(); - modelAndView.setModel(BasicModel.buildOKModel().setResult("刷新成功")); + modelAndView.setModel(BasicModel.buildOKModel().setResult("鍒锋柊鎴愬姛")); webankService.resetMonitor(); return modelAndView; } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/WeixinController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/WeixinController.java index b54ec1dad..fe25fd90a 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/WeixinController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/WeixinController.java @@ -68,169 +68,169 @@ public class WeixinController { private static final String addrMatchURL = "http://open.fangjia.com/address/match?token=F54F52381C49BB9EB4A33EB1B65604AE4B71A28AEE53518A94A2F360408B9056D57553931D15CE6DDE765562DAD286BA38E05A4CDAFC51C3D527A4959BF8E75A3B95DB7108FCEA340DDE61925616DB55118E1851E67D83EAD800460D100D6B667A4ED8EE67C8F7FB&address=%s&city=%s&suggestDistrict="; - private final static List Provinces = new ArrayList(Arrays.asList("河北", "山西", "内蒙古", "辽宁", "吉林", "黑龙江", "江苏", - "浙江", "安徽", "福建", "江西", "山东", "河南", "湖北", "湖南", "广东", "广西", "海南", "四川", "贵州", "云南", "西藏", "山西", "甘肃", "青海", "宁夏", - "新疆", "香港", "澳门", "台湾")); + private final static List Provinces = new ArrayList(Arrays.asList("娌冲寳", "灞辫タ", "鍐呰挋鍙�", "杈藉畞", "鍚夋灄", "榛戦緳姹�", "姹熻嫃", + "娴欐睙", "瀹夊窘", "绂忓缓", "姹熻タ", "灞变笢", "娌冲崡", "婀栧寳", "婀栧崡", "骞夸笢", "骞胯タ", "娴峰崡", "鍥涘窛", "璐靛窞", "浜戝崡", "瑗胯棌", "灞辫タ", "鐢樿們", "闈掓捣", "瀹佸", + "鏂扮枂", "棣欐腐", "婢抽棬", "鍙版咕")); - private final static List Citys = new ArrayList(Arrays.asList("邢台", "张家口", "承德", "沧州", "衡水", "大同", "阳泉", - "长治", "晋城", "朔州", "晋中", "运城", "忻州", "临汾", "吕梁", "包头", "乌海", "赤峰", "通辽", "鄂尔多斯", "呼伦贝尔", "巴彦淖尔", "乌兰察布", "兴安盟", - "锡林郭勒盟", "阿拉善盟", "抚顺", "锦州", "阜新", "辽阳", "铁岭", "朝阳", "葫芦岛", "四平", "辽源", "通化", "白山", "松原", "白城", "延边朝鲜族自治州", "齐齐哈尔", - "鸡西", "鹤岗", "双鸭山", "伊春", "佳木斯", "七台河", "黑河", "绥化", "大兴安岭", "淮安", "舟山", "丽水", "蚌埠", "淮南", "淮北", "铜陵", "安庆", "黄山", - "滁州", "阜阳", "宿州", "巢湖", "六安", "亳州", "池州", "宣城", "三明", "漳州", "南平", "龙岩", "宁德", "景德镇", "萍乡", "新余", "鹰潭", "吉安", "宜春", - "抚州", "上饶", "枣庄", "东营", "济宁", "泰安", "日照", "莱芜", "德州", "聊城", "滨州", "菏泽", "开封", "鹤壁", "濮阳", "许昌", "漯河", "三门峡", "南阳", - "商丘", "信阳", "周口", "驻马店", "十堰", "襄樊", "鄂州", "孝感", "荆州", "黄冈", "咸宁", "随州", "恩施土家族苗族自治州", "邵阳", "岳阳", "常德", "益阳", "郴州", - "永州", "怀化", "娄底", "湘西土家族苗族自治州", "汕尾", "梧州", "防城港", "钦州", "贵港", "百色", "贺州", "河池", "来宾", "崇左", "市辖区", "泸州", "德阳", "广元", - "遂宁", "内江", "乐山", "南充", "眉山", "广安", "达州", "雅安", "巴中", "资阳", "阿坝藏族羌族自治州", "甘孜藏族自治州", "凉山彝族自治州", "遵义", "安顺", "铜仁", - "黔西南布依族苗族自治州", "毕节", "黔东南苗族侗族自治州", "黔南布依族苗族自治州", "保山", "昭通", "思茅", "临沧", "楚雄彝族自治州", "红河哈尼族彝族自治州", "文山壮族苗族自治州", - "西双版纳傣族自治州", "大理白族自治州", "德宏傣族景颇族自治州", "怒江傈僳族自治州", "迪庆藏族自治州", "拉萨", "昌都", "山南", "日喀则", "那曲", "阿里", "林芝", "铜川", "宝鸡", - "渭南", "汉中", "榆林", "安康", "商洛", "嘉峪关", "白银", "天水", "武威", "张掖", "平凉", "酒泉", "庆阳", "定西", "陇南", "临夏回族自治州", "甘南藏族自治州", - "海东", "海北藏族自治州", "黄南藏族自治州", "海南藏族自治州", "果洛藏族自治州", "玉树藏族自治州", "海西蒙古族藏族自治州", "石嘴山", "吴忠", "固原", "中卫", "克拉玛依", "哈密", - "昌吉回族自治州", "博尔塔拉蒙古自治州", "巴音郭楞蒙古自治州", "阿克苏", "克孜勒苏柯尔克孜自治州", "喀什", "和田", "伊犁哈萨克自治州", "塔城", "阿勒泰", "牡丹江")); + private final static List Citys = new ArrayList(Arrays.asList("閭㈠彴", "寮犲鍙�", "鎵垮痉", "娌у窞", "琛℃按", "澶у悓", "闃虫硥", + "闀挎不", "鏅嬪煄", "鏈斿窞", "鏅嬩腑", "杩愬煄", "蹇诲窞", "涓存本", "鍚曟", "鍖呭ご", "涔屾捣", "璧ゅ嘲", "閫氳窘", "閯傚皵澶氭柉", "鍛间鸡璐濆皵", "宸村溅娣栧皵", "涔屽叞瀵熷竷", "鍏村畨鐩�", + "閿℃灄閮嫆鐩�", "闃挎媺鍠勭洘", "鎶氶『", "閿﹀窞", "闃滄柊", "杈介槼", "閾佸箔", "鏈濋槼", "钁姦宀�", "鍥涘钩", "杈芥簮", "閫氬寲", "鐧藉北", "鏉惧師", "鐧藉煄", "寤惰竟鏈濋矞鏃忚嚜娌诲窞", "榻愰綈鍝堝皵", + "楦¤タ", "楣ゅ矖", "鍙岄腑灞�", "浼婃槬", "浣虫湪鏂�", "涓冨彴娌�", "榛戞渤", "缁ュ寲", "澶у叴瀹夊箔", "娣畨", "鑸熷北", "涓芥按", "铓屽煚", "娣崡", "娣寳", "閾滈櫟", "瀹夊簡", "榛勫北", + "婊佸窞", "闃滈槼", "瀹垮窞", "宸㈡箹", "鍏畨", "浜冲窞", "姹犲窞", "瀹e煄", "涓夋槑", "婕冲窞", "鍗楀钩", "榫欏博", "瀹佸痉", "鏅痉闀�", "钀嶄埂", "鏂颁綑", "楣版江", "鍚夊畨", "瀹滄槬", + "鎶氬窞", "涓婇ザ", "鏋e簞", "涓滆惀", "娴庡畞", "娉板畨", "鏃ョ収", "鑾辫姕", "寰峰窞", "鑱婂煄", "婊ㄥ窞", "鑿忔辰", "寮�灏�", "楣ゅ", "婵槼", "璁告槍", "婕渤", "涓夐棬宄�", "鍗楅槼", + "鍟嗕笜", "淇¢槼", "鍛ㄥ彛", "椹婚┈搴�", "鍗佸牥", "瑗勬▕", "閯傚窞", "瀛濇劅", "鑽嗗窞", "榛勫唸", "鍜稿畞", "闅忓窞", "鎭╂柦鍦熷鏃忚嫍鏃忚嚜娌诲窞", "閭甸槼", "宀抽槼", "甯稿痉", "鐩婇槼", "閮村窞", + "姘稿窞", "鎬�鍖�", "濞勫簳", "婀樿タ鍦熷鏃忚嫍鏃忚嚜娌诲窞", "姹曞熬", "姊у窞", "闃插煄娓�", "閽﹀窞", "璐垫腐", "鐧捐壊", "璐哄窞", "娌虫睜", "鏉ュ", "宕囧乏", "甯傝緰鍖�", "娉稿窞", "寰烽槼", "骞垮厓", + "閬傚畞", "鍐呮睙", "涔愬北", "鍗楀厖", "鐪夊北", "骞垮畨", "杈惧窞", "闆呭畨", "宸翠腑", "璧勯槼", "闃垮潩钘忔棌缇屾棌鑷不宸�", "鐢樺瓬钘忔棌鑷不宸�", "鍑夊北褰濇棌鑷不宸�", "閬典箟", "瀹夐『", "閾滀粊", + "榛旇タ鍗楀竷渚濇棌鑻楁棌鑷不宸�", "姣曡妭", "榛斾笢鍗楄嫍鏃忎緱鏃忚嚜娌诲窞", "榛斿崡甯冧緷鏃忚嫍鏃忚嚜娌诲窞", "淇濆北", "鏄��", "鎬濊寘", "涓存钵", "妤氶泟褰濇棌鑷不宸�", "绾㈡渤鍝堝凹鏃忓綕鏃忚嚜娌诲窞", "鏂囧北澹棌鑻楁棌鑷不宸�", + "瑗垮弻鐗堢撼鍌f棌鑷不宸�", "澶х悊鐧芥棌鑷不宸�", "寰峰畯鍌f棌鏅鏃忚嚜娌诲窞", "鎬掓睙鍌堝兂鏃忚嚜娌诲窞", "杩簡钘忔棌鑷不宸�", "鎷夎惃", "鏄岄兘", "灞卞崡", "鏃ュ杸鍒�", "閭f洸", "闃块噷", "鏋楄姖", "閾滃窛", "瀹濋浮", + "娓崡", "姹変腑", "姒嗘灄", "瀹夊悍", "鍟嗘礇", "鍢夊唱鍏�", "鐧介摱", "澶╂按", "姝﹀▉", "寮犳帠", "骞冲噳", "閰掓硥", "搴嗛槼", "瀹氳タ", "闄囧崡", "涓村鍥炴棌鑷不宸�", "鐢樺崡钘忔棌鑷不宸�", + "娴蜂笢", "娴峰寳钘忔棌鑷不宸�", "榛勫崡钘忔棌鑷不宸�", "娴峰崡钘忔棌鑷不宸�", "鏋滄礇钘忔棌鑷不宸�", "鐜夋爲钘忔棌鑷不宸�", "娴疯タ钂欏彜鏃忚棌鏃忚嚜娌诲窞", "鐭冲槾灞�", "鍚村繝", "鍥哄師", "涓崼", "鍏嬫媺鐜涗緷", "鍝堝瘑", + "鏄屽悏鍥炴棌鑷不宸�", "鍗氬皵濉旀媺钂欏彜鑷不宸�", "宸撮煶閮钂欏彜鑷不宸�", "闃垮厠鑻�", "鍏嬪瓬鍕掕嫃鏌皵鍏嬪瓬鑷不宸�", "鍠�浠�", "鍜岀敯", "浼婄妬鍝堣惃鍏嬭嚜娌诲窞", "濉斿煄", "闃垮嫆娉�", "鐗′腹姹�")); - private final static List Citys2 = new ArrayList(Arrays.asList("井陉县", "正定县", "栾城县", "行唐县", "灵寿县", "高邑县", - "深泽县", "赞皇县", "无极县", "平山县", "元氏县", "赵县", "辛集市", "藁城市", "晋州市", "新乐市", "鹿泉市", "滦县", "滦南县", "乐亭县", "迁西县", "玉田县", "唐海县", - "遵化市", "迁安市", "青龙满族自治县", "昌黎县", "抚宁县", "卢龙县", "邯郸县", "临漳县", "成安县", "大名县", "涉县", "磁县", "肥乡县", "永年县", "邱县", "鸡泽县", - "广平县", "馆陶县", "魏县", "曲周县", "武安市", "邢台县", "临城县", "内丘县", "柏乡县", "隆尧县", "任县", "南和县", "宁晋县", "巨鹿县", "新河县", "广宗县", "平乡县", - "威县", "清河县", "临西县", "南宫市", "沙河市", "满城县", "清苑县", "涞水县", "阜平县", "徐水县", "定兴县", "唐县", "高阳县", "容城县", "涞源县", "望都县", "安新县", - "易县", "曲阳县", "蠡县", "顺平县", "博野县", "雄县", "涿州市", "定州市", "安国市", "高碑店市", "宣化县", "张北县", "康保县", "沽源县", "尚义县", "蔚县", "阳原县", - "怀安县", "万全县", "怀来县", "涿鹿县", "赤城县", "崇礼县", "承德县", "兴隆县", "平泉县", "滦平县", "隆化县", "丰宁满族自治县", "宽城满族自治县", "围场满族蒙古族自治县", - "沧县", "青县", "东光县", "海兴县", "盐山县", "肃宁县", "南皮县", "吴桥县", "献县", "孟村回族自治县", "泊头市", "任丘市", "黄骅市", "河间市", "固安县", "永清县", - "香河县", "大城县", "文安县", "大厂回族自治县", "霸州市", "三河市", "枣强县", "武邑县", "武强县", "饶阳县", "安平县", "故城县", "景县", "阜城县", "冀州市", "深州市", - "清徐县", "阳曲县", "娄烦县", "古交市", "阳高县", "天镇县", "广灵县", "灵丘县", "浑源县", "左云县", "大同县", "平定县", "盂县", "长治县", "襄垣县", "屯留县", "平顺县", - "黎城县", "壶关县", "长子县", "武乡县", "沁县", "沁源县", "潞城市", "沁水县", "阳城县", "陵川县", "泽州县", "高平市", "山阴县", "应县", "右玉县", "怀仁县", "榆社县", - "左权县", "和顺县", "昔阳县", "寿阳县", "太谷县", "祁县", "平遥县", "灵石县", "介休市", "临猗县", "万荣县", "闻喜县", "稷山县", "新绛县", "绛县", "垣曲县", "夏县", - "平陆县", "芮城县", "永济市", "河津市", "定襄县", "五台县", "代县", "繁峙县", "宁武县", "静乐县", "神池县", "五寨县", "岢岚县", "河曲县", "保德县", "偏关县", "原平市", - "曲沃县", "翼城县", "襄汾县", "洪洞县", "古县", "安泽县", "浮山县", "吉县", "乡宁县", "大宁县", "隰县", "永和县", "蒲县", "汾西县", "侯马市", "霍州市", "文水县", - "交城县", "兴县", "临县", "柳林县", "石楼县", "岚县", "方山县", "中阳县", "交口县", "孝义市", "汾阳市", "土默特左旗", "托克托县", "和林格尔县", "清水河县", "武川县", - "土默特右旗", "固阳县", "达尔罕茂明安联合旗", "阿鲁科尔沁旗", "巴林左旗", "巴林右旗", "林西县", "克什克腾旗", "翁牛特旗", "喀喇沁旗", "宁城县", "敖汉旗", "科尔沁左翼中旗", - "科尔沁左翼后旗", "开鲁县", "库伦旗", "奈曼旗", "扎鲁特旗", "霍林郭勒市", "东胜区", "达拉特旗", "准格尔旗", "鄂托克前旗", "鄂托克旗", "杭锦旗", "乌审旗", "伊金霍洛旗", - "阿荣旗", "莫力达瓦达斡尔族自治旗", "鄂伦春自治旗", "鄂温克族自治旗", "陈巴尔虎旗", "新巴尔虎左旗", "新巴尔虎右旗", "满洲里市", "牙克石市", "扎兰屯市", "额尔古纳市", "根河市", - "五原县", "磴口县", "乌拉特前旗", "乌拉特中旗", "乌拉特后旗", "杭锦后旗", "卓资县", "化德县", "商都县", "兴和县", "凉城县", "察哈尔右翼前旗", "察哈尔右翼中旗", "察哈尔右翼后旗", - "四子王旗", "丰镇市", "乌兰浩特市", "阿尔山市", "科尔沁右翼前旗", "科尔沁右翼中旗", "扎赉特旗", "突泉县", "二连浩特市", "锡林浩特市", "阿巴嘎旗", "苏尼特左旗", "苏尼特右旗", - "东乌珠穆沁旗", "西乌珠穆沁旗", "太仆寺旗", "镶黄旗", "正镶白旗", "正蓝旗", "多伦县", "阿拉善左旗", "阿拉善右旗", "额济纳旗", "辽中县", "康平县", "法库县", "新民市", "长海县", - "瓦房店市", "普兰店市", "庄河市", "台安县", "岫岩满族自治县", "海城市", "抚顺县", "新宾满族自治县", "清原满族自治县", "本溪满族自治县", "桓仁满族自治县", "宽甸满族自治县", "东港市", - "凤城市", "黑山县", "义县", "凌海市", "北宁市", "盖州市", "大石桥市", "阜新蒙古族自治县", "彰武县", "辽阳县", "灯塔市", "大洼县", "盘山县", "铁岭县", "西丰县", "昌图县", - "调兵山市", "开原市", "朝阳县", "建平县", "喀喇沁左翼蒙古族自治县", "北票市", "凌源市", "绥中县", "建昌县", "兴城市", "农安县", "九台市", "榆树市", "德惠市", "永吉县", - "蛟河市", "桦甸市", "舒兰市", "磐石市", "梨树县", "伊通满族自治县", "公主岭市", "双辽市", "东丰县", "东辽县", "通化县", "辉南县", "柳河县", "梅河口市", "集安市", "抚松县", - "靖宇县", "长白朝鲜族自治县", "江源县", "临江市", "前郭尔罗斯蒙古族自治县", "长岭县", "乾安县", "扶余县", "镇赉县", "通榆县", "洮南市", "大安市", "延吉市", "图们市", "敦化市", - "珲春市", "龙井市", "和龙市", "汪清县", "安图县", "依兰县", "方正县", "宾县", "巴彦县", "木兰县", "通河县", "延寿县", "阿城市", "双城市", "尚志市", "五常市", "龙江县", - "依安县", "泰来县", "甘南县", "富裕县", "克山县", "克东县", "拜泉县", "讷河市", "鸡东县", "虎林市", "密山市", "萝北县", "绥滨县", "集贤县", "友谊县", "宝清县", - "饶河县", "肇州县", "肇源县", "林甸县", "杜尔伯特蒙古族自治县", "嘉荫县", "铁力市", "桦南县", "桦川县", "汤原县", "抚远县", "同江市", "富锦市", "勃利县", "东宁县", - "林口县", "绥芬河市", "海林市", "宁安市", "穆棱市", "嫩江县", "逊克县", "孙吴县", "北安市", "五大连池市", "望奎县", "兰西县", "青冈县", "庆安县", "明水县", "绥棱县", - "安达市", "肇东市", "海伦市", "呼玛县", "塔河县", "漠河县", "溧水县", "高淳县", "市辖区", "江阴市", "宜兴市", "市辖区", "丰县", "沛县", "铜山县", "睢宁县", "新沂市", - "邳州市", "市辖区", "溧阳市", "金坛市", "市辖区", "常熟市", "张家港市", "昆山市", "吴江市", "太仓市", "市辖区", "海安县", "如东县", "启东市", "如皋市", "通州市", - "海门市", "市辖区", "赣榆县", "东海县", "灌云县", "灌南县", "市辖区", "涟水县", "洪泽县", "盱眙县", "金湖县", "市辖区", "响水县", "滨海县", "阜宁县", "射阳县", - "建湖县", "东台市", "大丰市", "市辖区", "宝应县", "仪征市", "高邮市", "江都市", "市辖区", "丹阳市", "扬中市", "句容市", "市辖区", "兴化市", "靖江市", "泰兴市", - "姜堰市", "市辖区", "沭阳县", "泗阳县", "泗洪县", "市辖区", "桐庐县", "淳安县", "建德市", "富阳市", "临安市", "市辖区", "象山县", "宁海县", "余姚市", "慈溪市", - "奉化市", "市辖区", "洞头县", "永嘉县", "平阳县", "苍南县", "文成县", "泰顺县", "瑞安市", "乐清市", "市辖区", "嘉善县", "海盐县", "海宁市", "平湖市", "桐乡市", - "市辖区", "德清县", "长兴县", "安吉县", "市辖区", "绍兴县", "新昌县", "诸暨市", "上虞市", "嵊州市", "市辖区", "武义县", "浦江县", "磐安县", "兰溪市", "义乌市", - "东阳市", "永康市", "市辖区", "常山县", "开化县", "龙游县", "江山市", "市辖区", "岱山县", "嵊泗县", "市辖区", "玉环县", "三门县", "天台县", "仙居县", "温岭市", - "临海市", "市辖区", "青田县", "缙云县", "遂昌县", "松阳县", "云和县", "庆元县", "景宁畲族自治县", "龙泉市", "市辖区", "长丰县", "肥东县", "肥西县", "市辖区", "芜湖县", - "繁昌县", "南陵县", "市辖区", "怀远县", "五河县", "固镇县", "市辖区", "凤台县", "市辖区", "当涂县", "市辖区", "濉溪县", "市辖区", "铜陵县", "市辖区", "怀宁县", - "枞阳县", "潜山县", "太湖县", "宿松县", "望江县", "岳西县", "桐城市", "市辖区", "歙县", "休宁县", "黟县", "祁门县", "市辖区", "来安县", "全椒县", "定远县", "凤阳县", - "天长市", "明光市", "市辖区", "临泉县", "太和县", "阜南县", "颍上县", "界首市", "市辖区", "砀山县", "萧县", "灵璧县", "泗县", "市辖区", "庐江县", "无为县", "含山县", - "和县", "市辖区", "寿县", "霍邱县", "舒城县", "金寨县", "霍山县", "市辖区", "涡阳县", "蒙城县", "利辛县", "市辖区", "东至县", "石台县", "青阳县", "市辖区", "郎溪县", - "广德县", "泾县", "绩溪县", "旌德县", "宁国市", "市辖区", "闽侯县", "连江县", "罗源县", "闽清县", "永泰县", "平潭县", "福清市", "长乐市", "市辖区", "市辖区", "仙游县", - "市辖区", "明溪县", "清流县", "宁化县", "大田县", "尤溪县", "沙县", "将乐县", "泰宁县", "建宁县", "永安市", "市辖区", "惠安县", "安溪县", "永春县", "德化县", "金门县", - "石狮市", "晋江市", "南安市", "市辖区", "云霄县", "漳浦县", "诏安县", "长泰县", "东山县", "南靖县", "平和县", "华安县", "龙海市", "市辖区", "顺昌县", "浦城县", - "光泽县", "松溪县", "政和县", "邵武市", "武夷山市", "建瓯市", "建阳市", "市辖区", "长汀县", "永定县", "上杭县", "武平县", "连城县", "漳平市", "市辖区", "霞浦县", - "古田县", "屏南县", "寿宁县", "周宁县", "柘荣县", "福安市", "福鼎市", "市辖区", "南昌县", "新建县", "安义县", "进贤县", "市辖区", "浮梁县", "乐平市", "市辖区", - "莲花县", "上栗县", "芦溪县", "市辖区", "九江县", "武宁县", "修水县", "永修县", "德安县", "星子县", "都昌县", "湖口县", "彭泽县", "瑞昌市", "市辖区", "分宜县", - "市辖区", "余江县", "贵溪市", "市辖区", "赣县", "信丰县", "大余县", "上犹县", "崇义县", "安远县", "龙南县", "定南县", "全南县", "宁都县", "于都县", "兴国县", "会昌县", - "寻乌县", "石城县", "瑞金市", "南康市", "市辖区", "吉安县", "吉水县", "峡江县", "新干县", "永丰县", "泰和县", "遂川县", "万安县", "安福县", "永新县", "井冈山市", - "市辖区", "奉新县", "万载县", "上高县", "宜丰县", "靖安县", "铜鼓县", "丰城市", "樟树市", "高安市", "市辖区", "南城县", "黎川县", "南丰县", "崇仁县", "乐安县", - "宜黄县", "金溪县", "资溪县", "东乡县", "广昌县", "市辖区", "上饶县", "广丰县", "玉山县", "铅山县", "横峰县", "弋阳县", "余干县", "鄱阳县", "万年县", "婺源县", - "德兴市", "市辖区", "平阴县", "济阳县", "商河县", "章丘市", "市辖区", "胶州市", "即墨市", "平度市", "胶南市", "莱西市", "市辖区", "桓台县", "高青县", "沂源县", - "市辖区", "滕州市", "市辖区", "垦利县", "利津县", "广饶县", "市辖区", "长岛县", "龙口市", "莱阳市", "莱州市", "蓬莱市", "招远市", "栖霞市", "海阳市", "市辖区", - "临朐县", "昌乐县", "青州市", "诸城市", "寿光市", "安丘市", "高密市", "昌邑市", "市辖区", "微山县", "鱼台县", "金乡县", "嘉祥县", "汶上县", "泗水县", "梁山县", - "曲阜市", "兖州市", "邹城市", "市辖区", "宁阳县", "东平县", "新泰市", "肥城市", "市辖区", "文登市", "荣成市", "乳山市", "市辖区", "五莲县", "莒县", "市辖区", "市辖区", - "沂南县", "郯城县", "沂水县", "苍山县", "费县", "平邑县", "莒南县", "蒙阴县", "临沭县", "市辖区", "陵县", "宁津县", "庆云县", "临邑县", "齐河县", "平原县", "夏津县", - "武城县", "乐陵市", "禹城市", "市辖区", "阳谷县", "莘县", "茌平县", "东阿县", "冠县", "高唐县", "临清市", "市辖区", "惠民县", "阳信县", "无棣县", "沾化县", "博兴县", - "邹平县", "市辖区", "曹县", "单县", "成武县", "巨野县", "郓城县", "鄄城县", "定陶县", "东明县", "市辖区", "中牟县", "巩义市", "荥阳市", "新密市", "新郑市", "登封市", - "市辖区", "杞县", "通许县", "尉氏县", "开封县", "兰考县", "市辖区", "孟津县", "新安县", "栾川县", "嵩县", "汝阳县", "宜阳县", "洛宁县", "伊川县", "偃师市", "市辖区", - "宝丰县", "叶县", "鲁山县", "郏县", "舞钢市", "汝州市", "市辖区", "安阳县", "汤阴县", "滑县", "内黄县", "林州市", "市辖区", "浚县", "淇县", "市辖区", "新乡县", - "获嘉县", "原阳县", "延津县", "封丘县", "长垣县", "卫辉市", "辉县市", "市辖区", "修武县", "博爱县", "武陟县", "温县", "济源市", "沁阳市", "孟州市", "市辖区", "清丰县", - "南乐县", "范县", "台前县", "濮阳县", "市辖区", "许昌县", "鄢陵县", "襄城县", "禹州市", "长葛市", "市辖区", "舞阳县", "临颍县", "市辖区", "渑池县", "陕县", "卢氏县", - "义马市", "灵宝市", "市辖区", "南召县", "方城县", "西峡县", "镇平县", "内乡县", "淅川县", "社旗县", "唐河县", "新野县", "桐柏县", "邓州市", "市辖区", "民权县", "睢县", - "宁陵县", "柘城县", "虞城县", "夏邑县", "永城市", "市辖区", "罗山县", "光山县", "新县", "商城县", "固始县", "潢川县", "淮滨县", "息县", "市辖区", "扶沟县", "西华县", - "商水县", "沈丘县", "郸城县", "淮阳县", "太康县", "鹿邑县", "项城市", "市辖区", "西平县", "上蔡县", "平舆县", "正阳县", "确山县", "泌阳县", "汝南县", "遂平县", - "新蔡县", "市辖区", "市辖区", "阳新县", "大冶市", "市辖区", "郧县", "郧西县", "竹山县", "竹溪县", "房县", "丹江口市", "市辖区", "远安县", "兴山县", "秭归县", - "长阳土家族自治县", "五峰土家族自治县", "宜都市", "当阳市", "枝江市", "市辖区", "南漳县", "谷城县", "保康县", "老河口市", "枣阳市", "宜城市", "市辖区", "市辖区", "京山县", - "沙洋县", "钟祥市", "市辖区", "孝昌县", "大悟县", "云梦县", "应城市", "安陆市", "汉川市", "市辖区", "公安县", "监利县", "江陵县", "石首市", "洪湖市", "松滋市", - "市辖区", "团风县", "红安县", "罗田县", "英山县", "浠水县", "蕲春县", "黄梅县", "麻城市", "武穴市", "市辖区", "嘉鱼县", "通城县", "崇阳县", "通山县", "赤壁市", - "市辖区", "广水市", "恩施市", "利川市", "建始县", "巴东县", "宣恩县", "咸丰县", "来凤县", "鹤峰县", "仙桃市", "潜江市", "天门市", "神农架林区", "市辖区", "长沙县", - "望城县", "宁乡县", "浏阳市", "市辖区", "株洲县", "攸县", "茶陵县", "炎陵县", "醴陵市", "市辖区", "湘潭县", "湘乡市", "韶山市", "市辖区", "衡阳县", "衡南县", "衡山县", - "衡东县", "祁东县", "耒阳市", "常宁市", "市辖区", "邵东县", "新邵县", "邵阳县", "隆回县", "洞口县", "绥宁县", "新宁县", "城步苗族自治县", "武冈市", "市辖区", "岳阳县", - "华容县", "湘阴县", "平江县", "汨罗市", "临湘市", "市辖区", "安乡县", "汉寿县", "澧县", "临澧县", "桃源县", "石门县", "津市市", "市辖区", "慈利县", "桑植县", "市辖区", - "南县", "桃江县", "安化县", "沅江市", "市辖区", "桂阳县", "宜章县", "永兴县", "嘉禾县", "临武县", "汝城县", "桂东县", "安仁县", "资兴市", "市辖区", "祁阳县", "东安县", - "双牌县", "道县", "江永县", "宁远县", "蓝山县", "新田县", "江华瑶族自治县", "市辖区", "中方县", "沅陵县", "辰溪县", "溆浦县", "会同县", "麻阳苗族自治县", "新晃侗族自治县", - "芷江侗族自治县", "靖州苗族侗族自治县", "通道侗族自治县", "洪江市", "市辖区", "双峰县", "新化县", "冷水江市", "涟源市", "吉首市", "泸溪县", "凤凰县", "花垣县", "保靖县", - "古丈县", "永顺县", "龙山县", "市辖区", "增城市", "从化市", "市辖区", "始兴县", "仁化县", "翁源县", "乳源瑶族自治县", "新丰县", "乐昌市", "南雄市", "市辖区", "市辖区", - "市辖区", "南澳县", "市辖区", "市辖区", "台山市", "开平市", "鹤山市", "恩平市", "市辖区", "遂溪县", "徐闻县", "廉江市", "雷州市", "吴川市", "市辖区", "电白县", - "高州市", "化州市", "信宜市", "市辖区", "广宁县", "怀集县", "封开县", "德庆县", "高要市", "四会市", "市辖区", "博罗县", "惠东县", "龙门县", "市辖区", "梅县", "大埔县", - "丰顺县", "五华县", "平远县", "蕉岭县", "兴宁市", "市辖区", "海丰县", "陆河县", "陆丰市", "市辖区", "紫金县", "龙川县", "连平县", "和平县", "东源县", "市辖区", - "阳西县", "阳东县", "阳春市", "市辖区", "佛冈县", "阳山县", "连山壮族瑶族自治县", "连南瑶族自治县", "清新县", "英德市", "连州市", "市辖区", "潮安县", "饶平县", "市辖区", - "揭东县", "揭西县", "惠来县", "普宁市", "市辖区", "新兴县", "郁南县", "云安县", "罗定市", "市辖区", "武鸣县", "隆安县", "马山县", "上林县", "宾阳县", "横县", "市辖区", - "柳江县", "柳城县", "鹿寨县", "融安县", "融水苗族自治县", "三江侗族自治县", "市辖区", "阳朔县", "临桂县", "灵川县", "全州县", "兴安县", "永福县", "灌阳县", "龙胜各族自治县", - "资源县", "平乐县", "荔蒲县", "恭城瑶族自治县", "市辖区", "苍梧县", "藤县", "蒙山县", "岑溪市", "市辖区", "合浦县", "市辖区", "上思县", "东兴市", "市辖区", "灵山县", - "浦北县", "市辖区", "平南县", "桂平市", "市辖区", "容县", "陆川县", "博白县", "兴业县", "北流市", "市辖区", "田阳县", "田东县", "平果县", "德保县", "靖西县", "那坡县", - "凌云县", "乐业县", "田林县", "西林县", "隆林各族自治县", "市辖区", "昭平县", "钟山县", "富川瑶族自治县", "市辖区", "南丹县", "天峨县", "凤山县", "东兰县", "罗城仫佬族自治县", - "环江毛南族自治县", "巴马瑶族自治县", "都安瑶族自治县", "大化瑶族自治县", "宜州市", "市辖区", "忻城县", "象州县", "武宣县", "金秀瑶族自治县", "合山市", "市辖区", "扶绥县", - "宁明县", "龙州县", "大新县", "天等县", "凭祥市", "市辖区", "市辖区", "五指山市", "琼海市", "儋州市", "文昌市", "万宁市", "东方市", "定安县", "屯昌县", "澄迈县", - "临高县", "白沙黎族自治县", "昌江黎族自治县", "乐东黎族自治县", "陵水黎族自治县", "保亭黎族苗族自治县", "琼中黎族苗族自治县", "西沙群岛", "南沙群岛", "中沙群岛的岛礁及其海域", "万州区", - "涪陵区", "渝中区", "大渡口区", "江北区", "沙坪坝区", "九龙坡区", "南岸区", "北碚区", "万盛区", "双桥区", "渝北区", "巴南区", "黔江区", "长寿区", "綦江县", "潼南县", - "铜梁县", "大足县", "荣昌县", "璧山县", "梁平县", "城口县", "丰都县", "垫江县", "武隆县", "忠县", "开县", "云阳县", "奉节县", "巫山县", "巫溪县", "石柱土家族自治县", - "秀山土家族苗族自治县", "酉阳土家族苗族自治县", "彭水苗族土家族自治县", "江津市", "合川市", "永川市", "南川市", "市辖区", "金堂县", "双流县", "郫县", "大邑县", "蒲江县", "新津县", - "都江堰市", "彭州市", "邛崃市", "崇州市", "市辖区", "荣县", "富顺县", "市辖区", "米易县", "盐边县", "市辖区", "泸县", "合江县", "叙永县", "古蔺县", "市辖区", "中江县", - "罗江县", "广汉市", "什邡市", "绵竹市", "市辖区", "三台县", "盐亭县", "安县", "梓潼县", "北川羌族自治县", "平武县", "江油市", "市辖区", "旺苍县", "青川县", "剑阁县", - "苍溪县", "市辖区", "蓬溪县", "射洪县", "大英县", "市辖区", "威远县", "资中县", "隆昌县", "市辖区", "犍为县", "井研县", "夹江县", "沐川县", "峨边彝族自治县", - "马边彝族自治县", "峨眉山市", "市辖区", "南部县", "营山县", "蓬安县", "仪陇县", "西充县", "阆中市", "市辖区", "仁寿县", "彭山县", "洪雅县", "丹棱县", "青神县", "市辖区", - "宜宾县", "南溪县", "江安县", "长宁县", "高县", "珙县", "筠连县", "兴文县", "屏山县", "市辖区", "岳池县", "武胜县", "邻水县", "华蓥市", "市辖区", "达县", "宣汉县", - "开江县", "大竹县", "渠县", "万源市", "市辖区", "名山县", "荥经县", "汉源县", "石棉县", "天全县", "芦山县", "宝兴县", "市辖区", "通江县", "南江县", "平昌县", "市辖区", - "安岳县", "乐至县", "简阳市", "汶川县", "理县", "茂县", "松潘县", "九寨沟县", "金川县", "小金县", "黑水县", "马尔康县", "壤塘县", "阿坝县", "若尔盖县", "红原县", - "康定县", "泸定县", "丹巴县", "九龙县", "雅江县", "道孚县", "炉霍县", "甘孜县", "新龙县", "德格县", "白玉县", "石渠县", "色达县", "理塘县", "巴塘县", "乡城县", - "稻城县", "得荣县", "西昌市", "木里藏族自治县", "盐源县", "德昌县", "会理县", "会东县", "宁南县", "普格县", "布拖县", "金阳县", "昭觉县", "喜德县", "冕宁县", "越西县", - "甘洛县", "美姑县", "雷波县", "市辖区", "开阳县", "息烽县", "修文县", "清镇市", "钟山区", "六枝特区", "水城县", "盘县", "市辖区", "遵义县", "桐梓县", "绥阳县", - "正安县", "道真仡佬族苗族自治县", "务川仡佬族苗族自治县", "凤冈县", "湄潭县", "余庆县", "习水县", "赤水市", "仁怀市", "市辖区", "平坝县", "普定县", "镇宁布依族苗族自治县", - "关岭布依族苗族自治县", "紫云苗族布依族自治县", "铜仁市", "江口县", "玉屏侗族自治县", "石阡县", "思南县", "印江土家族苗族自治县", "德江县", "沿河土家族自治县", "松桃苗族自治县", - "万山特区", "兴义市", "兴仁县", "普安县", "晴隆县", "贞丰县", "望谟县", "册亨县", "安龙县", "毕节市", "大方县", "黔西县", "金沙县", "织金县", "纳雍县", - "威宁彝族回族苗族自治县", "赫章县", "凯里市", "黄平县", "施秉县", "三穗县", "镇远县", "岑巩县", "天柱县", "锦屏县", "剑河县", "台江县", "黎平县", "榕江县", "从江县", - "雷山县", "麻江县", "丹寨县", "都匀市", "福泉市", "荔波县", "贵定县", "瓮安县", "独山县", "平塘县", "罗甸县", "长顺县", "龙里县", "惠水县", "三都水族自治县", "市辖区", - "呈贡县", "晋宁县", "富民县", "宜良县", "石林彝族自治县", "嵩明县", "禄劝彝族苗族自治县", "寻甸回族彝族自治县", "安宁市", "市辖区", "马龙县", "陆良县", "师宗县", "罗平县", - "富源县", "会泽县", "沾益县", "宣威市", "市辖区", "江川县", "澄江县", "通海县", "华宁县", "易门县", "峨山彝族自治县", "新平彝族傣族自治县", "元江哈尼族彝族傣族自治县", "市辖区", - "施甸县", "腾冲县", "龙陵县", "昌宁县", "市辖区", "鲁甸县", "巧家县", "盐津县", "大关县", "永善县", "绥江县", "镇雄县", "彝良县", "威信县", "水富县", "市辖区", - "玉龙纳西族自治县", "永胜县", "华坪县", "宁蒗彝族自治县", "市辖区", "普洱哈尼族彝族自治县", "墨江哈尼族自治县", "景东彝族自治县", "景谷傣族彝族自治县", "镇沅彝族哈尼族拉祜族自治县", - "江城哈尼族彝族自治县", "孟连傣族拉祜族佤族自治县", "澜沧拉祜族自治县", "西盟佤族自治县", "市辖区", "凤庆县", "云县", "永德县", "镇康县", "双江拉祜族佤族布朗族傣族自治县", - "耿马傣族佤族自治县", "沧源佤族自治县", "楚雄市", "双柏县", "牟定县", "南华县", "姚安县", "大姚县", "永仁县", "元谋县", "武定县", "禄丰县", "个旧市", "开远市", "蒙自县", - "屏边苗族自治县", "建水县", "石屏县", "弥勒县", "泸西县", "元阳县", "红河县", "金平苗族瑶族傣族自治县", "绿春县", "河口瑶族自治县", "文山县", "砚山县", "西畴县", "麻栗坡县", - "马关县", "丘北县", "广南县", "富宁县", "景洪市", "勐海县", "勐腊县", "大理市", "漾濞彝族自治县", "祥云县", "宾川县", "弥渡县", "南涧彝族自治县", "巍山彝族回族自治县", - "永平县", "云龙县", "洱源县", "剑川县", "鹤庆县", "瑞丽市", "潞西市", "梁河县", "盈江县", "陇川县", "泸水县", "福贡县", "贡山独龙族怒族自治县", "兰坪白族普米族自治县", - "香格里拉县", "德钦县", "维西傈僳族自治县", "市辖区", "林周县", "当雄县", "尼木县", "曲水县", "堆龙德庆县", "达孜县", "墨竹工卡县", "昌都县", "江达县", "贡觉县", "类乌齐县", - "丁青县", "察雅县", "八宿县", "左贡县", "芒康县", "洛隆县", "边坝县", "乃东县", "扎囊县", "贡嘎县", "桑日县", "琼结县", "曲松县", "措美县", "洛扎县", "加查县", - "隆子县", "错那县", "浪卡子县", "日喀则市", "南木林县", "江孜县", "定日县", "萨迦县", "拉孜县", "昂仁县", "谢通门县", "白朗县", "仁布县", "康马县", "定结县", "仲巴县", - "亚东县", "吉隆县", "聂拉木县", "萨嘎县", "岗巴县", "那曲县", "嘉黎县", "比如县", "聂荣县", "安多县", "申扎县", "索县", "班戈县", "巴青县", "尼玛县", "普兰县", - "札达县", "噶尔县", "日土县", "革吉县", "改则县", "措勤县", "林芝县", "工布江达县", "米林县", "墨脱县", "波密县", "察隅县", "朗县", "市辖区", "蓝田县", "周至县", - "户县", "高陵县", "市辖区", "宜君县", "市辖区", "凤翔县", "岐山县", "扶风县", "眉县", "陇县", "千阳县", "麟游县", "凤县", "太白县", "市辖区", "三原县", "泾阳县", - "乾县", "礼泉县", "永寿县", "彬县", "长武县", "旬邑县", "淳化县", "武功县", "兴平市", "市辖区", "华县", "潼关县", "大荔县", "合阳县", "澄城县", "蒲城县", "白水县", - "富平县", "韩城市", "华阴市", "市辖区", "延长县", "延川县", "子长县", "安塞县", "志丹县", "吴旗县", "甘泉县", "富县", "洛川县", "宜川县", "黄龙县", "黄陵县", "市辖区", - "南郑县", "城固县", "洋县", "西乡县", "勉县", "宁强县", "略阳县", "镇巴县", "留坝县", "佛坪县", "市辖区", "神木县", "府谷县", "横山县", "靖边县", "定边县", "绥德县", - "米脂县", "佳县", "吴堡县", "清涧县", "子洲县", "市辖区", "汉阴县", "石泉县", "宁陕县", "紫阳县", "岚皋县", "平利县", "镇坪县", "旬阳县", "白河县", "市辖区", "洛南县", - "丹凤县", "商南县", "山阳县", "镇安县", "柞水县", "市辖区", "永登县", "皋兰县", "榆中县", "市辖区", "市辖区", "永昌县", "市辖区", "靖远县", "会宁县", "景泰县", - "市辖区", "清水县", "秦安县", "甘谷县", "武山县", "张家川回族自治县", "市辖区", "民勤县", "古浪县", "天祝藏族自治县", "市辖区", "肃南裕固族自治县", "民乐县", "临泽县", - "高台县", "山丹县", "市辖区", "泾川县", "灵台县", "崇信县", "华亭县", "庄浪县", "静宁县", "市辖区", "金塔县", "安西县", "肃北蒙古族自治县", "阿克塞哈萨克族自治县", "玉门市", - "敦煌市", "市辖区", "庆城县", "环县", "华池县", "合水县", "正宁县", "宁县", "镇原县", "市辖区", "通渭县", "陇西县", "渭源县", "临洮县", "漳县", "岷县", "市辖区", - "成县", "文县", "宕昌县", "康县", "西和县", "礼县", "徽县", "两当县", "临夏市", "临夏县", "康乐县", "永靖县", "广河县", "和政县", "东乡族自治县", - "积石山保安族东乡族撒拉族自治县", "合作市", "临潭县", "卓尼县", "舟曲县", "迭部县", "玛曲县", "碌曲县", "夏河县", "市辖区", "大通回族土族自治县", "湟中县", "湟源县", "平安县", - "民和回族土族自治县", "乐都县", "互助土族自治县", "化隆回族自治县", "循化撒拉族自治县", "门源回族自治县", "祁连县", "海晏县", "刚察县", "同仁县", "尖扎县", "泽库县", - "河南蒙古族自治县", "共和县", "同德县", "贵德县", "兴海县", "贵南县", "玛沁县", "班玛县", "甘德县", "达日县", "久治县", "玛多县", "玉树县", "杂多县", "称多县", "治多县", - "囊谦县", "曲麻莱县", "格尔木市", "德令哈市", "乌兰县", "都兰县", "天峻县", "市辖区", "永宁县", "贺兰县", "灵武市", "市辖区", "平罗县", "市辖区", "盐池县", "同心县", - "青铜峡市", "市辖区", "西吉县", "隆德县", "泾源县", "彭阳县", "市辖区", "中宁县", "海原县", "市辖区", "乌鲁木齐县", "市辖区", "吐鲁番市", "鄯善县", "托克逊县", "哈密市", - "巴里坤哈萨克自治县", "伊吾县", "昌吉市", "阜康市", "米泉市", "呼图壁县", "玛纳斯县", "奇台县", "吉木萨尔县", "木垒哈萨克自治县", "博乐市", "精河县", "温泉县", "库尔勒市", - "轮台县", "尉犁县", "若羌县", "且末县", "焉耆回族自治县", "和静县", "和硕县", "博湖县", "阿克苏市", "温宿县", "库车县", "沙雅县", "新和县", "拜城县", "乌什县", "阿瓦提县", - "柯坪县", "阿图什市", "阿克陶县", "阿合奇县", "乌恰县", "喀什市", "疏附县", "疏勒县", "英吉沙县", "泽普县", "莎车县", "叶城县", "麦盖提县", "岳普湖县", "伽师县", "巴楚县", - "塔什库尔干塔吉克自治县", "和田市", "和田县", "墨玉县", "皮山县", "洛浦县", "策勒县", "于田县", "民丰县", "伊宁市", "奎屯市", "伊宁县", "察布查尔锡伯自治县", "霍城县", - "巩留县", "新源县", "昭苏县", "特克斯县", "尼勒克县", "塔城市", "乌苏市", "额敏县", "沙湾县", "托里县", "裕民县", "和布克赛尔蒙古自治县", "阿勒泰市", "布尔津县", "富蕴县", - "福海县", "哈巴河县", "青河县", "吉木乃县", "石河子市", "阿拉尔市", "图木舒克市", "五家渠市")); + private final static List Citys2 = new ArrayList(Arrays.asList("浜曢檳鍘�", "姝e畾鍘�", "鏍惧煄鍘�", "琛屽攼鍘�", "鐏靛鍘�", "楂橀倯鍘�", + "娣辨辰鍘�", "璧炵殗鍘�", "鏃犳瀬鍘�", "骞冲北鍘�", "鍏冩皬鍘�", "璧靛幙", "杈涢泦甯�", "钘佸煄甯�", "鏅嬪窞甯�", "鏂颁箰甯�", "楣挎硥甯�", "婊﹀幙", "婊﹀崡鍘�", "涔愪涵鍘�", "杩佽タ鍘�", "鐜夌敯鍘�", "鍞愭捣鍘�", + "閬靛寲甯�", "杩佸畨甯�", "闈掗緳婊℃棌鑷不鍘�", "鏄岄粠鍘�", "鎶氬畞鍘�", "鍗㈤緳鍘�", "閭兏鍘�", "涓存汲鍘�", "鎴愬畨鍘�", "澶у悕鍘�", "娑夊幙", "纾佸幙", "鑲ヤ埂鍘�", "姘稿勾鍘�", "閭卞幙", "楦℃辰鍘�", + "骞垮钩鍘�", "棣嗛櫠鍘�", "榄忓幙", "鏇插懆鍘�", "姝﹀畨甯�", "閭㈠彴鍘�", "涓村煄鍘�", "鍐呬笜鍘�", "鏌忎埂鍘�", "闅嗗哀鍘�", "浠诲幙", "鍗楀拰鍘�", "瀹佹檵鍘�", "宸ㄩ箍鍘�", "鏂版渤鍘�", "骞垮畻鍘�", "骞充埂鍘�", + "濞佸幙", "娓呮渤鍘�", "涓磋タ鍘�", "鍗楀甯�", "娌欐渤甯�", "婊″煄鍘�", "娓呰嫅鍘�", "娑炴按鍘�", "闃滃钩鍘�", "寰愭按鍘�", "瀹氬叴鍘�", "鍞愬幙", "楂橀槼鍘�", "瀹瑰煄鍘�", "娑炴簮鍘�", "鏈涢兘鍘�", "瀹夋柊鍘�", + "鏄撳幙", "鏇查槼鍘�", "锠″幙", "椤哄钩鍘�", "鍗氶噹鍘�", "闆勫幙", "娑垮窞甯�", "瀹氬窞甯�", "瀹夊浗甯�", "楂樼搴楀競", "瀹e寲鍘�", "寮犲寳鍘�", "搴蜂繚鍘�", "娌芥簮鍘�", "灏氫箟鍘�", "钄氬幙", "闃冲師鍘�", + "鎬�瀹夊幙", "涓囧叏鍘�", "鎬�鏉ュ幙", "娑块箍鍘�", "璧ゅ煄鍘�", "宕囩ぜ鍘�", "鎵垮痉鍘�", "鍏撮殕鍘�", "骞虫硥鍘�", "婊﹀钩鍘�", "闅嗗寲鍘�", "涓板畞婊℃棌鑷不鍘�", "瀹藉煄婊℃棌鑷不鍘�", "鍥村満婊℃棌钂欏彜鏃忚嚜娌诲幙", + "娌у幙", "闈掑幙", "涓滃厜鍘�", "娴峰叴鍘�", "鐩愬北鍘�", "鑲冨畞鍘�", "鍗楃毊鍘�", "鍚存ˉ鍘�", "鐚幙", "瀛熸潙鍥炴棌鑷不鍘�", "娉婂ご甯�", "浠讳笜甯�", "榛勯獏甯�", "娌抽棿甯�", "鍥哄畨鍘�", "姘告竻鍘�", + "棣欐渤鍘�", "澶у煄鍘�", "鏂囧畨鍘�", "澶у巶鍥炴棌鑷不鍘�", "闇稿窞甯�", "涓夋渤甯�", "鏋e己鍘�", "姝﹂倯鍘�", "姝﹀己鍘�", "楗堕槼鍘�", "瀹夊钩鍘�", "鏁呭煄鍘�", "鏅幙", "闃滃煄鍘�", "鍐�宸炲競", "娣卞窞甯�", + "娓呭緪鍘�", "闃虫洸鍘�", "濞勭儲鍘�", "鍙や氦甯�", "闃抽珮鍘�", "澶╅晣鍘�", "骞跨伒鍘�", "鐏典笜鍘�", "娴戞簮鍘�", "宸︿簯鍘�", "澶у悓鍘�", "骞冲畾鍘�", "鐩傚幙", "闀挎不鍘�", "瑗勫灒鍘�", "灞暀鍘�", "骞抽『鍘�", + "榛庡煄鍘�", "澹跺叧鍘�", "闀垮瓙鍘�", "姝︿埂鍘�", "娌佸幙", "娌佹簮鍘�", "娼炲煄甯�", "娌佹按鍘�", "闃冲煄鍘�", "闄靛窛鍘�", "娉藉窞鍘�", "楂樺钩甯�", "灞遍槾鍘�", "搴斿幙", "鍙崇帀鍘�", "鎬�浠佸幙", "姒嗙ぞ鍘�", + "宸︽潈鍘�", "鍜岄『鍘�", "鏄旈槼鍘�", "瀵块槼鍘�", "澶胺鍘�", "绁佸幙", "骞抽仴鍘�", "鐏电煶鍘�", "浠嬩紤甯�", "涓寸寳鍘�", "涓囪崳鍘�", "闂诲枩鍘�", "绋峰北鍘�", "鏂扮粵鍘�", "缁涘幙", "鍨f洸鍘�", "澶忓幙", + "骞抽檰鍘�", "鑺煄鍘�", "姘告祹甯�", "娌虫触甯�", "瀹氳鍘�", "浜斿彴鍘�", "浠e幙", "绻佸硻鍘�", "瀹佹鍘�", "闈欎箰鍘�", "绁炴睜鍘�", "浜斿鍘�", "宀㈠矚鍘�", "娌虫洸鍘�", "淇濆痉鍘�", "鍋忓叧鍘�", "鍘熷钩甯�", + "鏇叉矁鍘�", "缈煎煄鍘�", "瑗勬本鍘�", "娲礊鍘�", "鍙ゅ幙", "瀹夋辰鍘�", "娴北鍘�", "鍚夊幙", "涔″畞鍘�", "澶у畞鍘�", "闅板幙", "姘稿拰鍘�", "钂插幙", "姹捐タ鍘�", "渚┈甯�", "闇嶅窞甯�", "鏂囨按鍘�", + "浜ゅ煄鍘�", "鍏村幙", "涓村幙", "鏌虫灄鍘�", "鐭虫ゼ鍘�", "宀氬幙", "鏂瑰北鍘�", "涓槼鍘�", "浜ゅ彛鍘�", "瀛濅箟甯�", "姹鹃槼甯�", "鍦熼粯鐗瑰乏鏃�", "鎵樺厠鎵樺幙", "鍜屾灄鏍煎皵鍘�", "娓呮按娌冲幙", "姝﹀窛鍘�", + "鍦熼粯鐗瑰彸鏃�", "鍥洪槼鍘�", "杈惧皵缃曡寕鏄庡畨鑱斿悎鏃�", "闃块瞾绉戝皵娌佹棗", "宸存灄宸︽棗", "宸存灄鍙虫棗", "鏋楄タ鍘�", "鍏嬩粈鍏嬭吘鏃�", "缈佺墰鐗规棗", "鍠�鍠囨瞾鏃�", "瀹佸煄鍘�", "鏁栨眽鏃�", "绉戝皵娌佸乏缈间腑鏃�", + "绉戝皵娌佸乏缈煎悗鏃�", "寮�椴佸幙", "搴撲鸡鏃�", "濂堟浖鏃�", "鎵庨瞾鐗规棗", "闇嶆灄閮嫆甯�", "涓滆儨鍖�", "杈炬媺鐗规棗", "鍑嗘牸灏旀棗", "閯傛墭鍏嬪墠鏃�", "閯傛墭鍏嬫棗", "鏉敠鏃�", "涔屽鏃�", "浼婇噾闇嶆礇鏃�", + "闃胯崳鏃�", "鑾姏杈剧摝杈炬枴灏旀棌鑷不鏃�", "閯備鸡鏄ヨ嚜娌绘棗", "閯傛俯鍏嬫棌鑷不鏃�", "闄堝反灏旇檸鏃�", "鏂板反灏旇檸宸︽棗", "鏂板反灏旇檸鍙虫棗", "婊℃床閲屽競", "鐗欏厠鐭冲競", "鎵庡叞灞競", "棰濆皵鍙ょ撼甯�", "鏍规渤甯�", + "浜斿師鍘�", "纾村彛鍘�", "涔屾媺鐗瑰墠鏃�", "涔屾媺鐗逛腑鏃�", "涔屾媺鐗瑰悗鏃�", "鏉敠鍚庢棗", "鍗撹祫鍘�", "鍖栧痉鍘�", "鍟嗛兘鍘�", "鍏村拰鍘�", "鍑夊煄鍘�", "瀵熷搱灏斿彸缈煎墠鏃�", "瀵熷搱灏斿彸缈间腑鏃�", "瀵熷搱灏斿彸缈煎悗鏃�", + "鍥涘瓙鐜嬫棗", "涓伴晣甯�", "涔屽叞娴╃壒甯�", "闃垮皵灞卞競", "绉戝皵娌佸彸缈煎墠鏃�", "绉戝皵娌佸彸缈间腑鏃�", "鎵庤祲鐗规棗", "绐佹硥鍘�", "浜岃繛娴╃壒甯�", "閿℃灄娴╃壒甯�", "闃垮反鍢庢棗", "鑻忓凹鐗瑰乏鏃�", "鑻忓凹鐗瑰彸鏃�", + "涓滀箤鐝犵﹩娌佹棗", "瑗夸箤鐝犵﹩娌佹棗", "澶粏瀵烘棗", "闀堕粍鏃�", "姝i暥鐧芥棗", "姝h摑鏃�", "澶氫鸡鍘�", "闃挎媺鍠勫乏鏃�", "闃挎媺鍠勫彸鏃�", "棰濇祹绾虫棗", "杈戒腑鍘�", "搴峰钩鍘�", "娉曞簱鍘�", "鏂版皯甯�", "闀挎捣鍘�", + "鐡︽埧搴楀競", "鏅叞搴楀競", "搴勬渤甯�", "鍙板畨鍘�", "宀博婊℃棌鑷不鍘�", "娴峰煄甯�", "鎶氶『鍘�", "鏂板婊℃棌鑷不鍘�", "娓呭師婊℃棌鑷不鍘�", "鏈邯婊℃棌鑷不鍘�", "妗撲粊婊℃棌鑷不鍘�", "瀹界敻婊℃棌鑷不鍘�", "涓滄腐甯�", + "鍑ゅ煄甯�", "榛戝北鍘�", "涔夊幙", "鍑屾捣甯�", "鍖楀畞甯�", "鐩栧窞甯�", "澶х煶妗ュ競", "闃滄柊钂欏彜鏃忚嚜娌诲幙", "褰版鍘�", "杈介槼鍘�", "鐏甯�", "澶ф醇鍘�", "鐩樺北鍘�", "閾佸箔鍘�", "瑗夸赴鍘�", "鏄屽浘鍘�", + "璋冨叺灞卞競", "寮�鍘熷競", "鏈濋槼鍘�", "寤哄钩鍘�", "鍠�鍠囨瞾宸︾考钂欏彜鏃忚嚜娌诲幙", "鍖楃エ甯�", "鍑屾簮甯�", "缁ヤ腑鍘�", "寤烘槍鍘�", "鍏村煄甯�", "鍐滃畨鍘�", "涔濆彴甯�", "姒嗘爲甯�", "寰锋儬甯�", "姘稿悏鍘�", + "铔熸渤甯�", "妗︾敻甯�", "鑸掑叞甯�", "纾愮煶甯�", "姊ㄦ爲鍘�", "浼婇�氭弧鏃忚嚜娌诲幙", "鍏富宀競", "鍙岃窘甯�", "涓滀赴鍘�", "涓滆窘鍘�", "閫氬寲鍘�", "杈夊崡鍘�", "鏌虫渤鍘�", "姊呮渤鍙e競", "闆嗗畨甯�", "鎶氭澗鍘�", + "闈栧畤鍘�", "闀跨櫧鏈濋矞鏃忚嚜娌诲幙", "姹熸簮鍘�", "涓存睙甯�", "鍓嶉儹灏旂綏鏂挋鍙ゆ棌鑷不鍘�", "闀垮箔鍘�", "涔惧畨鍘�", "鎵朵綑鍘�", "闀囪祲鍘�", "閫氭鍘�", "娲崡甯�", "澶у畨甯�", "寤跺悏甯�", "鍥句滑甯�", "鏁﹀寲甯�", + "鐝叉槬甯�", "榫欎簳甯�", "鍜岄緳甯�", "姹竻鍘�", "瀹夊浘鍘�", "渚濆叞鍘�", "鏂规鍘�", "瀹惧幙", "宸村溅鍘�", "鏈ㄥ叞鍘�", "閫氭渤鍘�", "寤跺鍘�", "闃垮煄甯�", "鍙屽煄甯�", "灏氬織甯�", "浜斿父甯�", "榫欐睙鍘�", + "渚濆畨鍘�", "娉版潵鍘�", "鐢樺崡鍘�", "瀵岃鍘�", "鍏嬪北鍘�", "鍏嬩笢鍘�", "鎷滄硥鍘�", "璁锋渤甯�", "楦′笢鍘�", "铏庢灄甯�", "瀵嗗北甯�", "钀濆寳鍘�", "缁ユ花鍘�", "闆嗚搐鍘�", "鍙嬭皧鍘�", "瀹濇竻鍘�", + "楗舵渤鍘�", "鑲囧窞鍘�", "鑲囨簮鍘�", "鏋楃敻鍘�", "鏉滃皵浼壒钂欏彜鏃忚嚜娌诲幙", "鍢夎崼鍘�", "閾佸姏甯�", "妗﹀崡鍘�", "妗﹀窛鍘�", "姹ゅ師鍘�", "鎶氳繙鍘�", "鍚屾睙甯�", "瀵岄敠甯�", "鍕冨埄鍘�", "涓滃畞鍘�", + "鏋楀彛鍘�", "缁ヨ姮娌冲競", "娴锋灄甯�", "瀹佸畨甯�", "绌嗘1甯�", "瀚╂睙鍘�", "閫婂厠鍘�", "瀛欏惔鍘�", "鍖楀畨甯�", "浜斿ぇ杩炴睜甯�", "鏈涘鍘�", "鍏拌タ鍘�", "闈掑唸鍘�", "搴嗗畨鍘�", "鏄庢按鍘�", "缁ユ1鍘�", + "瀹夎揪甯�", "鑲囦笢甯�", "娴蜂鸡甯�", "鍛肩帥鍘�", "濉旀渤鍘�", "婕犳渤鍘�", "婧ф按鍘�", "楂樻烦鍘�", "甯傝緰鍖�", "姹熼槾甯�", "瀹滃叴甯�", "甯傝緰鍖�", "涓板幙", "娌涘幙", "閾滃北鍘�", "鐫㈠畞鍘�", "鏂版矀甯�", + "閭冲窞甯�", "甯傝緰鍖�", "婧ч槼甯�", "閲戝潧甯�", "甯傝緰鍖�", "甯哥啛甯�", "寮犲娓競", "鏄嗗北甯�", "鍚存睙甯�", "澶粨甯�", "甯傝緰鍖�", "娴峰畨鍘�", "濡備笢鍘�", "鍚笢甯�", "濡傜殝甯�", "閫氬窞甯�", + "娴烽棬甯�", "甯傝緰鍖�", "璧f鍘�", "涓滄捣鍘�", "鐏屼簯鍘�", "鐏屽崡鍘�", "甯傝緰鍖�", "娑熸按鍘�", "娲辰鍘�", "鐩辩湙鍘�", "閲戞箹鍘�", "甯傝緰鍖�", "鍝嶆按鍘�", "婊ㄦ捣鍘�", "闃滃畞鍘�", "灏勯槼鍘�", + "寤烘箹鍘�", "涓滃彴甯�", "澶т赴甯�", "甯傝緰鍖�", "瀹濆簲鍘�", "浠緛甯�", "楂橀偖甯�", "姹熼兘甯�", "甯傝緰鍖�", "涓归槼甯�", "鎵腑甯�", "鍙ュ甯�", "甯傝緰鍖�", "鍏村寲甯�", "闈栨睙甯�", "娉板叴甯�", + "濮滃牥甯�", "甯傝緰鍖�", "娌槼鍘�", "娉楅槼鍘�", "娉楁椽鍘�", "甯傝緰鍖�", "妗愬簮鍘�", "娣冲畨鍘�", "寤哄痉甯�", "瀵岄槼甯�", "涓村畨甯�", "甯傝緰鍖�", "璞″北鍘�", "瀹佹捣鍘�", "浣欏甯�", "鎱堟邯甯�", + "濂夊寲甯�", "甯傝緰鍖�", "娲炲ご鍘�", "姘稿槈鍘�", "骞抽槼鍘�", "鑻嶅崡鍘�", "鏂囨垚鍘�", "娉伴『鍘�", "鐟炲畨甯�", "涔愭竻甯�", "甯傝緰鍖�", "鍢夊杽鍘�", "娴风洂鍘�", "娴峰畞甯�", "骞虫箹甯�", "妗愪埂甯�", + "甯傝緰鍖�", "寰锋竻鍘�", "闀垮叴鍘�", "瀹夊悏鍘�", "甯傝緰鍖�", "缁嶅叴鍘�", "鏂版槍鍘�", "璇告毃甯�", "涓婅櫈甯�", "宓婂窞甯�", "甯傝緰鍖�", "姝︿箟鍘�", "娴︽睙鍘�", "纾愬畨鍘�", "鍏版邯甯�", "涔変箤甯�", + "涓滈槼甯�", "姘稿悍甯�", "甯傝緰鍖�", "甯稿北鍘�", "寮�鍖栧幙", "榫欐父鍘�", "姹熷北甯�", "甯傝緰鍖�", "宀卞北鍘�", "宓婃硹鍘�", "甯傝緰鍖�", "鐜夌幆鍘�", "涓夐棬鍘�", "澶╁彴鍘�", "浠欏眳鍘�", "娓╁箔甯�", + "涓存捣甯�", "甯傝緰鍖�", "闈掔敯鍘�", "缂欎簯鍘�", "閬傛槍鍘�", "鏉鹃槼鍘�", "浜戝拰鍘�", "搴嗗厓鍘�", "鏅畞鐣叉棌鑷不鍘�", "榫欐硥甯�", "甯傝緰鍖�", "闀夸赴鍘�", "鑲ヤ笢鍘�", "鑲ヨタ鍘�", "甯傝緰鍖�", "鑺滄箹鍘�", + "绻佹槍鍘�", "鍗楅櫟鍘�", "甯傝緰鍖�", "鎬�杩滃幙", "浜旀渤鍘�", "鍥洪晣鍘�", "甯傝緰鍖�", "鍑ゅ彴鍘�", "甯傝緰鍖�", "褰撴秱鍘�", "甯傝緰鍖�", "婵夋邯鍘�", "甯傝緰鍖�", "閾滈櫟鍘�", "甯傝緰鍖�", "鎬�瀹佸幙", + "鏋為槼鍘�", "娼滃北鍘�", "澶箹鍘�", "瀹挎澗鍘�", "鏈涙睙鍘�", "宀宠タ鍘�", "妗愬煄甯�", "甯傝緰鍖�", "姝欏幙", "浼戝畞鍘�", "榛熷幙", "绁侀棬鍘�", "甯傝緰鍖�", "鏉ュ畨鍘�", "鍏ㄦ鍘�", "瀹氳繙鍘�", "鍑ら槼鍘�", + "澶╅暱甯�", "鏄庡厜甯�", "甯傝緰鍖�", "涓存硥鍘�", "澶拰鍘�", "闃滃崡鍘�", "棰嶄笂鍘�", "鐣岄甯�", "甯傝緰鍖�", "鐮�灞卞幙", "钀у幙", "鐏电挧鍘�", "娉楀幙", "甯傝緰鍖�", "搴愭睙鍘�", "鏃犱负鍘�", "鍚北鍘�", + "鍜屽幙", "甯傝緰鍖�", "瀵垮幙", "闇嶉偙鍘�", "鑸掑煄鍘�", "閲戝鍘�", "闇嶅北鍘�", "甯傝緰鍖�", "娑¢槼鍘�", "钂欏煄鍘�", "鍒╄緵鍘�", "甯傝緰鍖�", "涓滆嚦鍘�", "鐭冲彴鍘�", "闈掗槼鍘�", "甯傝緰鍖�", "閮庢邯鍘�", + "骞垮痉鍘�", "娉惧幙", "缁╂邯鍘�", "鏃屽痉鍘�", "瀹佸浗甯�", "甯傝緰鍖�", "闂戒警鍘�", "杩炴睙鍘�", "缃楁簮鍘�", "闂芥竻鍘�", "姘告嘲鍘�", "骞虫江鍘�", "绂忔竻甯�", "闀夸箰甯�", "甯傝緰鍖�", "甯傝緰鍖�", "浠欐父鍘�", + "甯傝緰鍖�", "鏄庢邯鍘�", "娓呮祦鍘�", "瀹佸寲鍘�", "澶х敯鍘�", "灏ゆ邯鍘�", "娌欏幙", "灏嗕箰鍘�", "娉板畞鍘�", "寤哄畞鍘�", "姘稿畨甯�", "甯傝緰鍖�", "鎯犲畨鍘�", "瀹夋邯鍘�", "姘告槬鍘�", "寰峰寲鍘�", "閲戦棬鍘�", + "鐭崇嫯甯�", "鏅嬫睙甯�", "鍗楀畨甯�", "甯傝緰鍖�", "浜戦渼鍘�", "婕虫郸鍘�", "璇忓畨鍘�", "闀挎嘲鍘�", "涓滃北鍘�", "鍗楅潠鍘�", "骞冲拰鍘�", "鍗庡畨鍘�", "榫欐捣甯�", "甯傝緰鍖�", "椤烘槍鍘�", "娴﹀煄鍘�", + "鍏夋辰鍘�", "鏉炬邯鍘�", "鏀垮拰鍘�", "閭垫甯�", "姝﹀し灞卞競", "寤虹摨甯�", "寤洪槼甯�", "甯傝緰鍖�", "闀挎眬鍘�", "姘稿畾鍘�", "涓婃澀鍘�", "姝﹀钩鍘�", "杩炲煄鍘�", "婕冲钩甯�", "甯傝緰鍖�", "闇炴郸鍘�", + "鍙ょ敯鍘�", "灞忓崡鍘�", "瀵垮畞鍘�", "鍛ㄥ畞鍘�", "鏌樿崳鍘�", "绂忓畨甯�", "绂忛紟甯�", "甯傝緰鍖�", "鍗楁槍鍘�", "鏂板缓鍘�", "瀹変箟鍘�", "杩涜搐鍘�", "甯傝緰鍖�", "娴鍘�", "涔愬钩甯�", "甯傝緰鍖�", + "鑾茶姳鍘�", "涓婃牀鍘�", "鑺︽邯鍘�", "甯傝緰鍖�", "涔濇睙鍘�", "姝﹀畞鍘�", "淇按鍘�", "姘镐慨鍘�", "寰峰畨鍘�", "鏄熷瓙鍘�", "閮芥槍鍘�", "婀栧彛鍘�", "褰辰鍘�", "鐟炴槍甯�", "甯傝緰鍖�", "鍒嗗疁鍘�", + "甯傝緰鍖�", "浣欐睙鍘�", "璐垫邯甯�", "甯傝緰鍖�", "璧e幙", "淇′赴鍘�", "澶т綑鍘�", "涓婄姽鍘�", "宕囦箟鍘�", "瀹夎繙鍘�", "榫欏崡鍘�", "瀹氬崡鍘�", "鍏ㄥ崡鍘�", "瀹侀兘鍘�", "浜庨兘鍘�", "鍏村浗鍘�", "浼氭槍鍘�", + "瀵讳箤鍘�", "鐭冲煄鍘�", "鐟為噾甯�", "鍗楀悍甯�", "甯傝緰鍖�", "鍚夊畨鍘�", "鍚夋按鍘�", "宄℃睙鍘�", "鏂板共鍘�", "姘镐赴鍘�", "娉板拰鍘�", "閬傚窛鍘�", "涓囧畨鍘�", "瀹夌鍘�", "姘告柊鍘�", "浜曞唸灞卞競", + "甯傝緰鍖�", "濂夋柊鍘�", "涓囪浇鍘�", "涓婇珮鍘�", "瀹滀赴鍘�", "闈栧畨鍘�", "閾滈紦鍘�", "涓板煄甯�", "妯熸爲甯�", "楂樺畨甯�", "甯傝緰鍖�", "鍗楀煄鍘�", "榛庡窛鍘�", "鍗椾赴鍘�", "宕囦粊鍘�", "涔愬畨鍘�", + "瀹滈粍鍘�", "閲戞邯鍘�", "璧勬邯鍘�", "涓滀埂鍘�", "骞挎槍鍘�", "甯傝緰鍖�", "涓婇ザ鍘�", "骞夸赴鍘�", "鐜夊北鍘�", "閾呭北鍘�", "妯嘲鍘�", "寮嬮槼鍘�", "浣欏共鍘�", "閯遍槼鍘�", "涓囧勾鍘�", "濠烘簮鍘�", + "寰峰叴甯�", "甯傝緰鍖�", "骞抽槾鍘�", "娴庨槼鍘�", "鍟嗘渤鍘�", "绔犱笜甯�", "甯傝緰鍖�", "鑳跺窞甯�", "鍗冲ⅷ甯�", "骞冲害甯�", "鑳跺崡甯�", "鑾辫タ甯�", "甯傝緰鍖�", "妗撳彴鍘�", "楂橀潚鍘�", "娌傛簮鍘�", + "甯傝緰鍖�", "婊曞窞甯�", "甯傝緰鍖�", "鍨﹀埄鍘�", "鍒╂触鍘�", "骞块ザ鍘�", "甯傝緰鍖�", "闀垮矝鍘�", "榫欏彛甯�", "鑾遍槼甯�", "鑾卞窞甯�", "钃幈甯�", "鎷涜繙甯�", "鏍栭湠甯�", "娴烽槼甯�", "甯傝緰鍖�", + "涓存湊鍘�", "鏄屼箰鍘�", "闈掑窞甯�", "璇稿煄甯�", "瀵垮厜甯�", "瀹変笜甯�", "楂樺瘑甯�", "鏄岄倯甯�", "甯傝緰鍖�", "寰北鍘�", "楸煎彴鍘�", "閲戜埂鍘�", "鍢夌ゥ鍘�", "姹朵笂鍘�", "娉楁按鍘�", "姊佸北鍘�", + "鏇查槣甯�", "鍏栧窞甯�", "閭瑰煄甯�", "甯傝緰鍖�", "瀹侀槼鍘�", "涓滃钩鍘�", "鏂版嘲甯�", "鑲ュ煄甯�", "甯傝緰鍖�", "鏂囩櫥甯�", "鑽f垚甯�", "涔冲北甯�", "甯傝緰鍖�", "浜旇幉鍘�", "鑾掑幙", "甯傝緰鍖�", "甯傝緰鍖�", + "娌傚崡鍘�", "閮煄鍘�", "娌傛按鍘�", "鑻嶅北鍘�", "璐瑰幙", "骞抽倯鍘�", "鑾掑崡鍘�", "钂欓槾鍘�", "涓存箔鍘�", "甯傝緰鍖�", "闄靛幙", "瀹佹触鍘�", "搴嗕簯鍘�", "涓撮倯鍘�", "榻愭渤鍘�", "骞冲師鍘�", "澶忔触鍘�", + "姝﹀煄鍘�", "涔愰櫟甯�", "绂瑰煄甯�", "甯傝緰鍖�", "闃宠胺鍘�", "鑾樺幙", "鑼屽钩鍘�", "涓滈樋鍘�", "鍐犲幙", "楂樺攼鍘�", "涓存竻甯�", "甯傝緰鍖�", "鎯犳皯鍘�", "闃充俊鍘�", "鏃犳#鍘�", "娌惧寲鍘�", "鍗氬叴鍘�", + "閭瑰钩鍘�", "甯傝緰鍖�", "鏇瑰幙", "鍗曞幙", "鎴愭鍘�", "宸ㄩ噹鍘�", "閮撳煄鍘�", "閯勫煄鍘�", "瀹氶櫠鍘�", "涓滄槑鍘�", "甯傝緰鍖�", "涓墴鍘�", "宸╀箟甯�", "鑽ラ槼甯�", "鏂板瘑甯�", "鏂伴儜甯�", "鐧诲皝甯�", + "甯傝緰鍖�", "鏉炲幙", "閫氳鍘�", "灏夋皬鍘�", "寮�灏佸幙", "鍏拌�冨幙", "甯傝緰鍖�", "瀛熸触鍘�", "鏂板畨鍘�", "鏍惧窛鍘�", "宓╁幙", "姹濋槼鍘�", "瀹滈槼鍘�", "娲涘畞鍘�", "浼婂窛鍘�", "鍋冨笀甯�", "甯傝緰鍖�", + "瀹濅赴鍘�", "鍙跺幙", "椴佸北鍘�", "閮忓幙", "鑸為挗甯�", "姹濆窞甯�", "甯傝緰鍖�", "瀹夐槼鍘�", "姹ら槾鍘�", "婊戝幙", "鍐呴粍鍘�", "鏋楀窞甯�", "甯傝緰鍖�", "娴氬幙", "娣囧幙", "甯傝緰鍖�", "鏂颁埂鍘�", + "鑾峰槈鍘�", "鍘熼槼鍘�", "寤舵触鍘�", "灏佷笜鍘�", "闀垮灒鍘�", "鍗緣甯�", "杈夊幙甯�", "甯傝緰鍖�", "淇鍘�", "鍗氱埍鍘�", "姝﹂櫉鍘�", "娓╁幙", "娴庢簮甯�", "娌侀槼甯�", "瀛熷窞甯�", "甯傝緰鍖�", "娓呬赴鍘�", + "鍗椾箰鍘�", "鑼冨幙", "鍙板墠鍘�", "婵槼鍘�", "甯傝緰鍖�", "璁告槍鍘�", "閯㈤櫟鍘�", "瑗勫煄鍘�", "绂瑰窞甯�", "闀胯憶甯�", "甯傝緰鍖�", "鑸為槼鍘�", "涓撮鍘�", "甯傝緰鍖�", "娓戞睜鍘�", "闄曞幙", "鍗㈡皬鍘�", + "涔夐┈甯�", "鐏靛疂甯�", "甯傝緰鍖�", "鍗楀彫鍘�", "鏂瑰煄鍘�", "瑗垮场鍘�", "闀囧钩鍘�", "鍐呬埂鍘�", "娣呭窛鍘�", "绀炬棗鍘�", "鍞愭渤鍘�", "鏂伴噹鍘�", "妗愭煆鍘�", "閭撳窞甯�", "甯傝緰鍖�", "姘戞潈鍘�", "鐫㈠幙", + "瀹侀櫟鍘�", "鏌樺煄鍘�", "铏炲煄鍘�", "澶忛倯鍘�", "姘稿煄甯�", "甯傝緰鍖�", "缃楀北鍘�", "鍏夊北鍘�", "鏂板幙", "鍟嗗煄鍘�", "鍥哄鍘�", "娼㈠窛鍘�", "娣花鍘�", "鎭幙", "甯傝緰鍖�", "鎵舵矡鍘�", "瑗垮崕鍘�", + "鍟嗘按鍘�", "娌堜笜鍘�", "閮稿煄鍘�", "娣槼鍘�", "澶悍鍘�", "楣块倯鍘�", "椤瑰煄甯�", "甯傝緰鍖�", "瑗垮钩鍘�", "涓婅敗鍘�", "骞宠垎鍘�", "姝i槼鍘�", "纭北鍘�", "娉岄槼鍘�", "姹濆崡鍘�", "閬傚钩鍘�", + "鏂拌敗鍘�", "甯傝緰鍖�", "甯傝緰鍖�", "闃虫柊鍘�", "澶у喍甯�", "甯傝緰鍖�", "閮у幙", "閮цタ鍘�", "绔瑰北鍘�", "绔规邯鍘�", "鎴垮幙", "涓规睙鍙e競", "甯傝緰鍖�", "杩滃畨鍘�", "鍏村北鍘�", "绉綊鍘�", + "闀块槼鍦熷鏃忚嚜娌诲幙", "浜斿嘲鍦熷鏃忚嚜娌诲幙", "瀹滈兘甯�", "褰撻槼甯�", "鏋濇睙甯�", "甯傝緰鍖�", "鍗楁汲鍘�", "璋峰煄鍘�", "淇濆悍鍘�", "鑰佹渤鍙e競", "鏋i槼甯�", "瀹滃煄甯�", "甯傝緰鍖�", "甯傝緰鍖�", "浜北鍘�", + "娌欐磱鍘�", "閽熺ゥ甯�", "甯傝緰鍖�", "瀛濇槍鍘�", "澶ф偀鍘�", "浜戞ⅵ鍘�", "搴斿煄甯�", "瀹夐檰甯�", "姹夊窛甯�", "甯傝緰鍖�", "鍏畨鍘�", "鐩戝埄鍘�", "姹熼櫟鍘�", "鐭抽甯�", "娲箹甯�", "鏉炬粙甯�", + "甯傝緰鍖�", "鍥㈤鍘�", "绾㈠畨鍘�", "缃楃敯鍘�", "鑻卞北鍘�", "娴犳按鍘�", "钑叉槬鍘�", "榛勬鍘�", "楹诲煄甯�", "姝︾┐甯�", "甯傝緰鍖�", "鍢夐奔鍘�", "閫氬煄鍘�", "宕囬槼鍘�", "閫氬北鍘�", "璧ゅ甯�", + "甯傝緰鍖�", "骞挎按甯�", "鎭╂柦甯�", "鍒╁窛甯�", "寤哄鍘�", "宸翠笢鍘�", "瀹f仼鍘�", "鍜镐赴鍘�", "鏉ュ嚖鍘�", "楣ゅ嘲鍘�", "浠欐甯�", "娼滄睙甯�", "澶╅棬甯�", "绁炲啘鏋舵灄鍖�", "甯傝緰鍖�", "闀挎矙鍘�", + "鏈涘煄鍘�", "瀹佷埂鍘�", "娴忛槼甯�", "甯傝緰鍖�", "鏍床鍘�", "鏀稿幙", "鑼堕櫟鍘�", "鐐庨櫟鍘�", "閱撮櫟甯�", "甯傝緰鍖�", "婀樻江鍘�", "婀樹埂甯�", "闊跺北甯�", "甯傝緰鍖�", "琛¢槼鍘�", "琛″崡鍘�", "琛″北鍘�", + "琛′笢鍘�", "绁佷笢鍘�", "鑰掗槼甯�", "甯稿畞甯�", "甯傝緰鍖�", "閭典笢鍘�", "鏂伴偟鍘�", "閭甸槼鍘�", "闅嗗洖鍘�", "娲炲彛鍘�", "缁ュ畞鍘�", "鏂板畞鍘�", "鍩庢鑻楁棌鑷不鍘�", "姝﹀唸甯�", "甯傝緰鍖�", "宀抽槼鍘�", + "鍗庡鍘�", "婀橀槾鍘�", "骞虫睙鍘�", "姹ㄧ綏甯�", "涓存箻甯�", "甯傝緰鍖�", "瀹変埂鍘�", "姹夊鍘�", "婢у幙", "涓存晶鍘�", "妗冩簮鍘�", "鐭抽棬鍘�", "娲ュ競甯�", "甯傝緰鍖�", "鎱堝埄鍘�", "妗戞鍘�", "甯傝緰鍖�", + "鍗楀幙", "妗冩睙鍘�", "瀹夊寲鍘�", "娌呮睙甯�", "甯傝緰鍖�", "妗傞槼鍘�", "瀹滅珷鍘�", "姘稿叴鍘�", "鍢夌鍘�", "涓存鍘�", "姹濆煄鍘�", "妗備笢鍘�", "瀹変粊鍘�", "璧勫叴甯�", "甯傝緰鍖�", "绁侀槼鍘�", "涓滃畨鍘�", + "鍙岀墝鍘�", "閬撳幙", "姹熸案鍘�", "瀹佽繙鍘�", "钃濆北鍘�", "鏂扮敯鍘�", "姹熷崕鐟舵棌鑷不鍘�", "甯傝緰鍖�", "涓柟鍘�", "娌呴櫟鍘�", "杈版邯鍘�", "婧嗘郸鍘�", "浼氬悓鍘�", "楹婚槼鑻楁棌鑷不鍘�", "鏂版檭渚楁棌鑷不鍘�", + "鑺锋睙渚楁棌鑷不鍘�", "闈栧窞鑻楁棌渚楁棌鑷不鍘�", "閫氶亾渚楁棌鑷不鍘�", "娲睙甯�", "甯傝緰鍖�", "鍙屽嘲鍘�", "鏂板寲鍘�", "鍐锋按姹熷競", "娑熸簮甯�", "鍚夐甯�", "娉告邯鍘�", "鍑ゅ嚢鍘�", "鑺卞灒鍘�", "淇濋潠鍘�", + "鍙や笀鍘�", "姘搁『鍘�", "榫欏北鍘�", "甯傝緰鍖�", "澧炲煄甯�", "浠庡寲甯�", "甯傝緰鍖�", "濮嬪叴鍘�", "浠佸寲鍘�", "缈佹簮鍘�", "涔虫簮鐟舵棌鑷不鍘�", "鏂颁赴鍘�", "涔愭槍甯�", "鍗楅泟甯�", "甯傝緰鍖�", "甯傝緰鍖�", + "甯傝緰鍖�", "鍗楁境鍘�", "甯傝緰鍖�", "甯傝緰鍖�", "鍙板北甯�", "寮�骞冲競", "楣ゅ北甯�", "鎭╁钩甯�", "甯傝緰鍖�", "閬傛邯鍘�", "寰愰椈鍘�", "寤夋睙甯�", "闆峰窞甯�", "鍚村窛甯�", "甯傝緰鍖�", "鐢电櫧鍘�", + "楂樺窞甯�", "鍖栧窞甯�", "淇″疁甯�", "甯傝緰鍖�", "骞垮畞鍘�", "鎬�闆嗗幙", "灏佸紑鍘�", "寰峰簡鍘�", "楂樿甯�", "鍥涗細甯�", "甯傝緰鍖�", "鍗氱綏鍘�", "鎯犱笢鍘�", "榫欓棬鍘�", "甯傝緰鍖�", "姊呭幙", "澶у煍鍘�", + "涓伴『鍘�", "浜斿崕鍘�", "骞宠繙鍘�", "钑夊箔鍘�", "鍏村畞甯�", "甯傝緰鍖�", "娴蜂赴鍘�", "闄嗘渤鍘�", "闄嗕赴甯�", "甯傝緰鍖�", "绱噾鍘�", "榫欏窛鍘�", "杩炲钩鍘�", "鍜屽钩鍘�", "涓滄簮鍘�", "甯傝緰鍖�", + "闃宠タ鍘�", "闃充笢鍘�", "闃虫槬甯�", "甯傝緰鍖�", "浣涘唸鍘�", "闃冲北鍘�", "杩炲北澹棌鐟舵棌鑷不鍘�", "杩炲崡鐟舵棌鑷不鍘�", "娓呮柊鍘�", "鑻卞痉甯�", "杩炲窞甯�", "甯傝緰鍖�", "娼畨鍘�", "楗跺钩鍘�", "甯傝緰鍖�", + "鎻笢鍘�", "鎻タ鍘�", "鎯犳潵鍘�", "鏅畞甯�", "甯傝緰鍖�", "鏂板叴鍘�", "閮佸崡鍘�", "浜戝畨鍘�", "缃楀畾甯�", "甯傝緰鍖�", "姝﹂福鍘�", "闅嗗畨鍘�", "椹北鍘�", "涓婃灄鍘�", "瀹鹃槼鍘�", "妯幙", "甯傝緰鍖�", + "鏌虫睙鍘�", "鏌冲煄鍘�", "楣垮鍘�", "铻嶅畨鍘�", "铻嶆按鑻楁棌鑷不鍘�", "涓夋睙渚楁棌鑷不鍘�", "甯傝緰鍖�", "闃虫湐鍘�", "涓存鍘�", "鐏靛窛鍘�", "鍏ㄥ窞鍘�", "鍏村畨鍘�", "姘哥鍘�", "鐏岄槼鍘�", "榫欒儨鍚勬棌鑷不鍘�", + "璧勬簮鍘�", "骞充箰鍘�", "鑽旇挷鍘�", "鎭煄鐟舵棌鑷不鍘�", "甯傝緰鍖�", "鑻嶆ⅶ鍘�", "钘ゅ幙", "钂欏北鍘�", "宀戞邯甯�", "甯傝緰鍖�", "鍚堟郸鍘�", "甯傝緰鍖�", "涓婃�濆幙", "涓滃叴甯�", "甯傝緰鍖�", "鐏靛北鍘�", + "娴﹀寳鍘�", "甯傝緰鍖�", "骞冲崡鍘�", "妗傚钩甯�", "甯傝緰鍖�", "瀹瑰幙", "闄嗗窛鍘�", "鍗氱櫧鍘�", "鍏翠笟鍘�", "鍖楁祦甯�", "甯傝緰鍖�", "鐢伴槼鍘�", "鐢颁笢鍘�", "骞虫灉鍘�", "寰蜂繚鍘�", "闈栬タ鍘�", "閭e潯鍘�", + "鍑屼簯鍘�", "涔愪笟鍘�", "鐢版灄鍘�", "瑗挎灄鍘�", "闅嗘灄鍚勬棌鑷不鍘�", "甯傝緰鍖�", "鏄钩鍘�", "閽熷北鍘�", "瀵屽窛鐟舵棌鑷不鍘�", "甯傝緰鍖�", "鍗椾腹鍘�", "澶╁敞鍘�", "鍑ゅ北鍘�", "涓滃叞鍘�", "缃楀煄浠浆鏃忚嚜娌诲幙", + "鐜睙姣涘崡鏃忚嚜娌诲幙", "宸撮┈鐟舵棌鑷不鍘�", "閮藉畨鐟舵棌鑷不鍘�", "澶у寲鐟舵棌鑷不鍘�", "瀹滃窞甯�", "甯傝緰鍖�", "蹇诲煄鍘�", "璞″窞鍘�", "姝﹀鍘�", "閲戠鐟舵棌鑷不鍘�", "鍚堝北甯�", "甯傝緰鍖�", "鎵剁互鍘�", + "瀹佹槑鍘�", "榫欏窞鍘�", "澶ф柊鍘�", "澶╃瓑鍘�", "鍑ゥ甯�", "甯傝緰鍖�", "甯傝緰鍖�", "浜旀寚灞卞競", "鐞兼捣甯�", "鍎嬪窞甯�", "鏂囨槍甯�", "涓囧畞甯�", "涓滄柟甯�", "瀹氬畨鍘�", "灞槍鍘�", "婢勮繄鍘�", + "涓撮珮鍘�", "鐧芥矙榛庢棌鑷不鍘�", "鏄屾睙榛庢棌鑷不鍘�", "涔愪笢榛庢棌鑷不鍘�", "闄垫按榛庢棌鑷不鍘�", "淇濅涵榛庢棌鑻楁棌鑷不鍘�", "鐞间腑榛庢棌鑻楁棌鑷不鍘�", "瑗挎矙缇ゅ矝", "鍗楁矙缇ゅ矝", "涓矙缇ゅ矝鐨勫矝绀佸強鍏舵捣鍩�", "涓囧窞鍖�", + "娑櫟鍖�", "娓濅腑鍖�", "澶ф浮鍙e尯", "姹熷寳鍖�", "娌欏潽鍧濆尯", "涔濋緳鍧″尯", "鍗楀哺鍖�", "鍖楃鍖�", "涓囩洓鍖�", "鍙屾ˉ鍖�", "娓濆寳鍖�", "宸村崡鍖�", "榛旀睙鍖�", "闀垮鍖�", "缍︽睙鍘�", "娼煎崡鍘�", + "閾滄鍘�", "澶ц冻鍘�", "鑽f槍鍘�", "鐠у北鍘�", "姊佸钩鍘�", "鍩庡彛鍘�", "涓伴兘鍘�", "鍨睙鍘�", "姝﹂殕鍘�", "蹇犲幙", "寮�鍘�", "浜戦槼鍘�", "濂夎妭鍘�", "宸北鍘�", "宸邯鍘�", "鐭虫煴鍦熷鏃忚嚜娌诲幙", + "绉�灞卞湡瀹舵棌鑻楁棌鑷不鍘�", "閰夐槼鍦熷鏃忚嫍鏃忚嚜娌诲幙", "褰按鑻楁棌鍦熷鏃忚嚜娌诲幙", "姹熸触甯�", "鍚堝窛甯�", "姘稿窛甯�", "鍗楀窛甯�", "甯傝緰鍖�", "閲戝爞鍘�", "鍙屾祦鍘�", "閮幙", "澶ч倯鍘�", "钂叉睙鍘�", "鏂版触鍘�", + "閮芥睙鍫板競", "褰窞甯�", "閭涘磧甯�", "宕囧窞甯�", "甯傝緰鍖�", "鑽e幙", "瀵岄『鍘�", "甯傝緰鍖�", "绫虫槗鍘�", "鐩愯竟鍘�", "甯傝緰鍖�", "娉稿幙", "鍚堟睙鍘�", "鍙欐案鍘�", "鍙よ敽鍘�", "甯傝緰鍖�", "涓睙鍘�", + "缃楁睙鍘�", "骞挎眽甯�", "浠�閭″競", "缁电甯�", "甯傝緰鍖�", "涓夊彴鍘�", "鐩愪涵鍘�", "瀹夊幙", "姊撴郊鍘�", "鍖楀窛缇屾棌鑷不鍘�", "骞虫鍘�", "姹熸补甯�", "甯傝緰鍖�", "鏃鸿媿鍘�", "闈掑窛鍘�", "鍓戦榿鍘�", + "鑻嶆邯鍘�", "甯傝緰鍖�", "钃邯鍘�", "灏勬椽鍘�", "澶ц嫳鍘�", "甯傝緰鍖�", "濞佽繙鍘�", "璧勪腑鍘�", "闅嗘槍鍘�", "甯傝緰鍖�", "鐘嶄负鍘�", "浜曠爺鍘�", "澶规睙鍘�", "娌愬窛鍘�", "宄ㄨ竟褰濇棌鑷不鍘�", + "椹竟褰濇棌鑷不鍘�", "宄ㄧ湁灞卞競", "甯傝緰鍖�", "鍗楅儴鍘�", "钀ュ北鍘�", "钃畨鍘�", "浠檱鍘�", "瑗垮厖鍘�", "闃嗕腑甯�", "甯傝緰鍖�", "浠佸鍘�", "褰北鍘�", "娲泤鍘�", "涓规1鍘�", "闈掔鍘�", "甯傝緰鍖�", + "瀹滃鍘�", "鍗楁邯鍘�", "姹熷畨鍘�", "闀垮畞鍘�", "楂樺幙", "鐝欏幙", "绛犺繛鍘�", "鍏存枃鍘�", "灞忓北鍘�", "甯傝緰鍖�", "宀虫睜鍘�", "姝﹁儨鍘�", "閭绘按鍘�", "鍗庤摜甯�", "甯傝緰鍖�", "杈惧幙", "瀹f眽鍘�", + "寮�姹熷幙", "澶х鍘�", "娓犲幙", "涓囨簮甯�", "甯傝緰鍖�", "鍚嶅北鍘�", "鑽ョ粡鍘�", "姹夋簮鍘�", "鐭虫鍘�", "澶╁叏鍘�", "鑺﹀北鍘�", "瀹濆叴鍘�", "甯傝緰鍖�", "閫氭睙鍘�", "鍗楁睙鍘�", "骞虫槍鍘�", "甯傝緰鍖�", + "瀹夊渤鍘�", "涔愯嚦鍘�", "绠�闃冲競", "姹跺窛鍘�", "鐞嗗幙", "鑼傚幙", "鏉炬綐鍘�", "涔濆娌熷幙", "閲戝窛鍘�", "灏忛噾鍘�", "榛戞按鍘�", "椹皵搴峰幙", "澹ゅ鍘�", "闃垮潩鍘�", "鑻ュ皵鐩栧幙", "绾㈠師鍘�", + "搴峰畾鍘�", "娉稿畾鍘�", "涓瑰反鍘�", "涔濋緳鍘�", "闆呮睙鍘�", "閬撳瓪鍘�", "鐐夐湇鍘�", "鐢樺瓬鍘�", "鏂伴緳鍘�", "寰锋牸鍘�", "鐧界帀鍘�", "鐭虫笭鍘�", "鑹茶揪鍘�", "鐞嗗鍘�", "宸村鍘�", "涔″煄鍘�", + "绋诲煄鍘�", "寰楄崳鍘�", "瑗挎槍甯�", "鏈ㄩ噷钘忔棌鑷不鍘�", "鐩愭簮鍘�", "寰锋槍鍘�", "浼氱悊鍘�", "浼氫笢鍘�", "瀹佸崡鍘�", "鏅牸鍘�", "甯冩嫋鍘�", "閲戦槼鍘�", "鏄鍘�", "鍠滃痉鍘�", "鍐曞畞鍘�", "瓒婅タ鍘�", + "鐢樻礇鍘�", "缇庡鍘�", "闆锋尝鍘�", "甯傝緰鍖�", "寮�闃冲幙", "鎭兘鍘�", "淇枃鍘�", "娓呴晣甯�", "閽熷北鍖�", "鍏灊鐗瑰尯", "姘村煄鍘�", "鐩樺幙", "甯傝緰鍖�", "閬典箟鍘�", "妗愭鍘�", "缁ラ槼鍘�", + "姝e畨鍘�", "閬撶湡浠′浆鏃忚嫍鏃忚嚜娌诲幙", "鍔″窛浠′浆鏃忚嫍鏃忚嚜娌诲幙", "鍑ゅ唸鍘�", "婀勬江鍘�", "浣欏簡鍘�", "涔犳按鍘�", "璧ゆ按甯�", "浠佹��甯�", "甯傝緰鍖�", "骞冲潩鍘�", "鏅畾鍘�", "闀囧畞甯冧緷鏃忚嫍鏃忚嚜娌诲幙", + "鍏冲箔甯冧緷鏃忚嫍鏃忚嚜娌诲幙", "绱簯鑻楁棌甯冧緷鏃忚嚜娌诲幙", "閾滀粊甯�", "姹熷彛鍘�", "鐜夊睆渚楁棌鑷不鍘�", "鐭抽槨鍘�", "鎬濆崡鍘�", "鍗版睙鍦熷鏃忚嫍鏃忚嚜娌诲幙", "寰锋睙鍘�", "娌挎渤鍦熷鏃忚嚜娌诲幙", "鏉炬鑻楁棌鑷不鍘�", + "涓囧北鐗瑰尯", "鍏翠箟甯�", "鍏翠粊鍘�", "鏅畨鍘�", "鏅撮殕鍘�", "璐炰赴鍘�", "鏈涜盁鍘�", "鍐屼酣鍘�", "瀹夐緳鍘�", "姣曡妭甯�", "澶ф柟鍘�", "榛旇タ鍘�", "閲戞矙鍘�", "缁囬噾鍘�", "绾抽泹鍘�", + "濞佸畞褰濇棌鍥炴棌鑻楁棌鑷不鍘�", "璧珷鍘�", "鍑噷甯�", "榛勫钩鍘�", "鏂界鍘�", "涓夌鍘�", "闀囪繙鍘�", "宀戝珐鍘�", "澶╂煴鍘�", "閿﹀睆鍘�", "鍓戞渤鍘�", "鍙版睙鍘�", "榛庡钩鍘�", "姒曟睙鍘�", "浠庢睙鍘�", + "闆峰北鍘�", "楹绘睙鍘�", "涓瑰鍘�", "閮藉寑甯�", "绂忔硥甯�", "鑽旀尝鍘�", "璐靛畾鍘�", "鐡畨鍘�", "鐙北鍘�", "骞冲鍘�", "缃楃敻鍘�", "闀块『鍘�", "榫欓噷鍘�", "鎯犳按鍘�", "涓夐兘姘存棌鑷不鍘�", "甯傝緰鍖�", + "鍛堣础鍘�", "鏅嬪畞鍘�", "瀵屾皯鍘�", "瀹滆壇鍘�", "鐭虫灄褰濇棌鑷不鍘�", "宓╂槑鍘�", "绂勫姖褰濇棌鑻楁棌鑷不鍘�", "瀵荤敻鍥炴棌褰濇棌鑷不鍘�", "瀹夊畞甯�", "甯傝緰鍖�", "椹緳鍘�", "闄嗚壇鍘�", "甯堝畻鍘�", "缃楀钩鍘�", + "瀵屾簮鍘�", "浼氭辰鍘�", "娌剧泭鍘�", "瀹e▉甯�", "甯傝緰鍖�", "姹熷窛鍘�", "婢勬睙鍘�", "閫氭捣鍘�", "鍗庡畞鍘�", "鏄撻棬鍘�", "宄ㄥ北褰濇棌鑷不鍘�", "鏂板钩褰濇棌鍌f棌鑷不鍘�", "鍏冩睙鍝堝凹鏃忓綕鏃忓偅鏃忚嚜娌诲幙", "甯傝緰鍖�", + "鏂界敻鍘�", "鑵惧啿鍘�", "榫欓櫟鍘�", "鏄屽畞鍘�", "甯傝緰鍖�", "椴佺敻鍘�", "宸у鍘�", "鐩愭触鍘�", "澶у叧鍘�", "姘稿杽鍘�", "缁ユ睙鍘�", "闀囬泟鍘�", "褰濊壇鍘�", "濞佷俊鍘�", "姘村瘜鍘�", "甯傝緰鍖�", + "鐜夐緳绾宠タ鏃忚嚜娌诲幙", "姘歌儨鍘�", "鍗庡潽鍘�", "瀹佽挆褰濇棌鑷不鍘�", "甯傝緰鍖�", "鏅幢鍝堝凹鏃忓綕鏃忚嚜娌诲幙", "澧ㄦ睙鍝堝凹鏃忚嚜娌诲幙", "鏅笢褰濇棌鑷不鍘�", "鏅胺鍌f棌褰濇棌鑷不鍘�", "闀囨矃褰濇棌鍝堝凹鏃忔媺绁滄棌鑷不鍘�", + "姹熷煄鍝堝凹鏃忓綕鏃忚嚜娌诲幙", "瀛熻繛鍌f棌鎷夌鏃忎饯鏃忚嚜娌诲幙", "婢滄钵鎷夌鏃忚嚜娌诲幙", "瑗跨洘浣ゆ棌鑷不鍘�", "甯傝緰鍖�", "鍑ゅ簡鍘�", "浜戝幙", "姘稿痉鍘�", "闀囧悍鍘�", "鍙屾睙鎷夌鏃忎饯鏃忓竷鏈楁棌鍌f棌鑷不鍘�", + "鑰块┈鍌f棌浣ゆ棌鑷不鍘�", "娌ф簮浣ゆ棌鑷不鍘�", "妤氶泟甯�", "鍙屾煆鍘�", "鐗熷畾鍘�", "鍗楀崕鍘�", "濮氬畨鍘�", "澶у鍘�", "姘镐粊鍘�", "鍏冭皨鍘�", "姝﹀畾鍘�", "绂勪赴鍘�", "涓棫甯�", "寮�杩滃競", "钂欒嚜鍘�", + "灞忚竟鑻楁棌鑷不鍘�", "寤烘按鍘�", "鐭冲睆鍘�", "寮ュ嫆鍘�", "娉歌タ鍘�", "鍏冮槼鍘�", "绾㈡渤鍘�", "閲戝钩鑻楁棌鐟舵棌鍌f棌鑷不鍘�", "缁挎槬鍘�", "娌冲彛鐟舵棌鑷不鍘�", "鏂囧北鍘�", "鐮氬北鍘�", "瑗跨暣鍘�", "楹绘牀鍧″幙", + "椹叧鍘�", "涓樺寳鍘�", "骞垮崡鍘�", "瀵屽畞鍘�", "鏅椽甯�", "鍕愭捣鍘�", "鍕愯厞鍘�", "澶х悊甯�", "婕炬繛褰濇棌鑷不鍘�", "绁ヤ簯鍘�", "瀹惧窛鍘�", "寮ユ浮鍘�", "鍗楁锭褰濇棌鑷不鍘�", "宸嶅北褰濇棌鍥炴棌鑷不鍘�", + "姘稿钩鍘�", "浜戦緳鍘�", "娲辨簮鍘�", "鍓戝窛鍘�", "楣ゅ簡鍘�", "鐟炰附甯�", "娼炶タ甯�", "姊佹渤鍘�", "鐩堟睙鍘�", "闄囧窛鍘�", "娉告按鍘�", "绂忚础鍘�", "璐″北鐙緳鏃忔�掓棌鑷不鍘�", "鍏板潽鐧芥棌鏅背鏃忚嚜娌诲幙", + "棣欐牸閲屾媺鍘�", "寰烽挦鍘�", "缁磋タ鍌堝兂鏃忚嚜娌诲幙", "甯傝緰鍖�", "鏋楀懆鍘�", "褰撻泟鍘�", "灏兼湪鍘�", "鏇叉按鍘�", "鍫嗛緳寰峰簡鍘�", "杈惧瓬鍘�", "澧ㄧ宸ュ崱鍘�", "鏄岄兘鍘�", "姹熻揪鍘�", "璐¤鍘�", "绫讳箤榻愬幙", + "涓侀潚鍘�", "瀵熼泤鍘�", "鍏鍘�", "宸﹁础鍘�", "鑺掑悍鍘�", "娲涢殕鍘�", "杈瑰潩鍘�", "涔冧笢鍘�", "鎵庡泭鍘�", "璐″槑鍘�", "妗戞棩鍘�", "鐞肩粨鍘�", "鏇叉澗鍘�", "鎺編鍘�", "娲涙墡鍘�", "鍔犳煡鍘�", + "闅嗗瓙鍘�", "閿欓偅鍘�", "娴崱瀛愬幙", "鏃ュ杸鍒欏競", "鍗楁湪鏋楀幙", "姹熷瓬鍘�", "瀹氭棩鍘�", "钀ㄨ喀鍘�", "鎷夊瓬鍘�", "鏄備粊鍘�", "璋㈤�氶棬鍘�", "鐧芥湕鍘�", "浠佸竷鍘�", "搴烽┈鍘�", "瀹氱粨鍘�", "浠插反鍘�", + "浜氫笢鍘�", "鍚夐殕鍘�", "鑱傛媺鏈ㄥ幙", "钀ㄥ槑鍘�", "宀楀反鍘�", "閭f洸鍘�", "鍢夐粠鍘�", "姣斿鍘�", "鑱傝崳鍘�", "瀹夊鍘�", "鐢虫墡鍘�", "绱㈠幙", "鐝垐鍘�", "宸撮潚鍘�", "灏肩帥鍘�", "鏅叞鍘�", + "鏈揪鍘�", "鍣跺皵鍘�", "鏃ュ湡鍘�", "闈╁悏鍘�", "鏀瑰垯鍘�", "鎺嫟鍘�", "鏋楄姖鍘�", "宸ュ竷姹熻揪鍘�", "绫虫灄鍘�", "澧ㄨ劚鍘�", "娉㈠瘑鍘�", "瀵熼殔鍘�", "鏈楀幙", "甯傝緰鍖�", "钃濈敯鍘�", "鍛ㄨ嚦鍘�", + "鎴峰幙", "楂橀櫟鍘�", "甯傝緰鍖�", "瀹滃悰鍘�", "甯傝緰鍖�", "鍑ょ繑鍘�", "宀愬北鍘�", "鎵堕鍘�", "鐪夊幙", "闄囧幙", "鍗冮槼鍘�", "楹熸父鍘�", "鍑ゅ幙", "澶櫧鍘�", "甯傝緰鍖�", "涓夊師鍘�", "娉鹃槼鍘�", + "涔惧幙", "绀兼硥鍘�", "姘稿鍘�", "褰幙", "闀挎鍘�", "鏃倯鍘�", "娣冲寲鍘�", "姝﹀姛鍘�", "鍏村钩甯�", "甯傝緰鍖�", "鍗庡幙", "娼煎叧鍘�", "澶ц崝鍘�", "鍚堥槼鍘�", "婢勫煄鍘�", "钂插煄鍘�", "鐧芥按鍘�", + "瀵屽钩鍘�", "闊╁煄甯�", "鍗庨槾甯�", "甯傝緰鍖�", "寤堕暱鍘�", "寤跺窛鍘�", "瀛愰暱鍘�", "瀹夊鍘�", "蹇椾腹鍘�", "鍚存棗鍘�", "鐢樻硥鍘�", "瀵屽幙", "娲涘窛鍘�", "瀹滃窛鍘�", "榛勯緳鍘�", "榛勯櫟鍘�", "甯傝緰鍖�", + "鍗楅儜鍘�", "鍩庡浐鍘�", "娲嬪幙", "瑗夸埂鍘�", "鍕夊幙", "瀹佸己鍘�", "鐣ラ槼鍘�", "闀囧反鍘�", "鐣欏潩鍘�", "浣涘潽鍘�", "甯傝緰鍖�", "绁炴湪鍘�", "搴滆胺鍘�", "妯北鍘�", "闈栬竟鍘�", "瀹氳竟鍘�", "缁ュ痉鍘�", + "绫宠剛鍘�", "浣冲幙", "鍚村牎鍘�", "娓呮锭鍘�", "瀛愭床鍘�", "甯傝緰鍖�", "姹夐槾鍘�", "鐭虫硥鍘�", "瀹侀檿鍘�", "绱槼鍘�", "宀氱殝鍘�", "骞冲埄鍘�", "闀囧潽鍘�", "鏃槼鍘�", "鐧芥渤鍘�", "甯傝緰鍖�", "娲涘崡鍘�", + "涓瑰嚖鍘�", "鍟嗗崡鍘�", "灞遍槼鍘�", "闀囧畨鍘�", "鏌炴按鍘�", "甯傝緰鍖�", "姘哥櫥鍘�", "鐨嬪叞鍘�", "姒嗕腑鍘�", "甯傝緰鍖�", "甯傝緰鍖�", "姘告槍鍘�", "甯傝緰鍖�", "闈栬繙鍘�", "浼氬畞鍘�", "鏅嘲鍘�", + "甯傝緰鍖�", "娓呮按鍘�", "绉﹀畨鍘�", "鐢樿胺鍘�", "姝﹀北鍘�", "寮犲宸濆洖鏃忚嚜娌诲幙", "甯傝緰鍖�", "姘戝嫟鍘�", "鍙ゆ氮鍘�", "澶╃钘忔棌鑷不鍘�", "甯傝緰鍖�", "鑲冨崡瑁曞浐鏃忚嚜娌诲幙", "姘戜箰鍘�", "涓存辰鍘�", + "楂樺彴鍘�", "灞变腹鍘�", "甯傝緰鍖�", "娉惧窛鍘�", "鐏靛彴鍘�", "宕囦俊鍘�", "鍗庝涵鍘�", "搴勬氮鍘�", "闈欏畞鍘�", "甯傝緰鍖�", "閲戝鍘�", "瀹夎タ鍘�", "鑲冨寳钂欏彜鏃忚嚜娌诲幙", "闃垮厠濉炲搱钀ㄥ厠鏃忚嚜娌诲幙", "鐜夐棬甯�", + "鏁︾厡甯�", "甯傝緰鍖�", "搴嗗煄鍘�", "鐜幙", "鍗庢睜鍘�", "鍚堟按鍘�", "姝e畞鍘�", "瀹佸幙", "闀囧師鍘�", "甯傝緰鍖�", "閫氭腑鍘�", "闄囪タ鍘�", "娓簮鍘�", "涓存串鍘�", "婕冲幙", "宀峰幙", "甯傝緰鍖�", + "鎴愬幙", "鏂囧幙", "瀹曟槍鍘�", "搴峰幙", "瑗垮拰鍘�", "绀煎幙", "寰藉幙", "涓ゅ綋鍘�", "涓村甯�", "涓村鍘�", "搴蜂箰鍘�", "姘搁潠鍘�", "骞挎渤鍘�", "鍜屾斂鍘�", "涓滀埂鏃忚嚜娌诲幙", + "绉煶灞变繚瀹夋棌涓滀埂鏃忔拻鎷夋棌鑷不鍘�", "鍚堜綔甯�", "涓存江鍘�", "鍗撳凹鍘�", "鑸熸洸鍘�", "杩儴鍘�", "鐜涙洸鍘�", "纰屾洸鍘�", "澶忔渤鍘�", "甯傝緰鍖�", "澶ч�氬洖鏃忓湡鏃忚嚜娌诲幙", "婀熶腑鍘�", "婀熸簮鍘�", "骞冲畨鍘�", + "姘戝拰鍥炴棌鍦熸棌鑷不鍘�", "涔愰兘鍘�", "浜掑姪鍦熸棌鑷不鍘�", "鍖栭殕鍥炴棌鑷不鍘�", "寰寲鎾掓媺鏃忚嚜娌诲幙", "闂ㄦ簮鍥炴棌鑷不鍘�", "绁佽繛鍘�", "娴锋檹鍘�", "鍒氬療鍘�", "鍚屼粊鍘�", "灏栨墡鍘�", "娉藉簱鍘�", + "娌冲崡钂欏彜鏃忚嚜娌诲幙", "鍏卞拰鍘�", "鍚屽痉鍘�", "璐靛痉鍘�", "鍏存捣鍘�", "璐靛崡鍘�", "鐜涙瞾鍘�", "鐝帥鍘�", "鐢樺痉鍘�", "杈炬棩鍘�", "涔呮不鍘�", "鐜涘鍘�", "鐜夋爲鍘�", "鏉傚鍘�", "绉板鍘�", "娌诲鍘�", + "鍥婅唉鍘�", "鏇查夯鑾卞幙", "鏍煎皵鏈ㄥ競", "寰蜂护鍝堝競", "涔屽叞鍘�", "閮藉叞鍘�", "澶╁郴鍘�", "甯傝緰鍖�", "姘稿畞鍘�", "璐哄叞鍘�", "鐏垫甯�", "甯傝緰鍖�", "骞崇綏鍘�", "甯傝緰鍖�", "鐩愭睜鍘�", "鍚屽績鍘�", + "闈掗摐宄″競", "甯傝緰鍖�", "瑗垮悏鍘�", "闅嗗痉鍘�", "娉炬簮鍘�", "褰槼鍘�", "甯傝緰鍖�", "涓畞鍘�", "娴峰師鍘�", "甯傝緰鍖�", "涔岄瞾鏈ㄩ綈鍘�", "甯傝緰鍖�", "鍚愰瞾鐣競", "閯杽鍘�", "鎵樺厠閫婂幙", "鍝堝瘑甯�", + "宸撮噷鍧ゅ搱钀ㄥ厠鑷不鍘�", "浼婂惥鍘�", "鏄屽悏甯�", "闃滃悍甯�", "绫虫硥甯�", "鍛煎浘澹佸幙", "鐜涚撼鏂幙", "濂囧彴鍘�", "鍚夋湪钀ㄥ皵鍘�", "鏈ㄥ瀿鍝堣惃鍏嬭嚜娌诲幙", "鍗氫箰甯�", "绮炬渤鍘�", "娓╂硥鍘�", "搴撳皵鍕掑競", + "杞彴鍘�", "灏夌妬鍘�", "鑻ョ緦鍘�", "涓旀湯鍘�", "鐒夎�嗗洖鏃忚嚜娌诲幙", "鍜岄潤鍘�", "鍜岀鍘�", "鍗氭箹鍘�", "闃垮厠鑻忓競", "娓╁鍘�", "搴撹溅鍘�", "娌欓泤鍘�", "鏂板拰鍘�", "鎷滃煄鍘�", "涔屼粈鍘�", "闃跨摝鎻愬幙", + "鏌潽鍘�", "闃垮浘浠�甯�", "闃垮厠闄跺幙", "闃垮悎濂囧幙", "涔屾伆鍘�", "鍠�浠�甯�", "鐤忛檮鍘�", "鐤忓嫆鍘�", "鑻卞悏娌欏幙", "娉芥櫘鍘�", "鑾庤溅鍘�", "鍙跺煄鍘�", "楹︾洊鎻愬幙", "宀虫櫘婀栧幙", "浼藉笀鍘�", "宸存鍘�", + "濉斾粈搴撳皵骞插鍚夊厠鑷不鍘�", "鍜岀敯甯�", "鍜岀敯鍘�", "澧ㄧ帀鍘�", "鐨北鍘�", "娲涙郸鍘�", "绛栧嫆鍘�", "浜庣敯鍘�", "姘戜赴鍘�", "浼婂畞甯�", "濂庡悲甯�", "浼婂畞鍘�", "瀵熷竷鏌ュ皵閿′集鑷不鍘�", "闇嶅煄鍘�", + "宸╃暀鍘�", "鏂版簮鍘�", "鏄嫃鍘�", "鐗瑰厠鏂幙", "灏煎嫆鍏嬪幙", "濉斿煄甯�", "涔岃嫃甯�", "棰濇晱鍘�", "娌欐咕鍘�", "鎵橀噷鍘�", "瑁曟皯鍘�", "鍜屽竷鍏嬭禌灏旇挋鍙よ嚜娌诲幙", "闃垮嫆娉板競", "甯冨皵娲ュ幙", "瀵岃暣鍘�", + "绂忔捣鍘�", "鍝堝反娌冲幙", "闈掓渤鍘�", "鍚夋湪涔冨幙", "鐭虫渤瀛愬競", "闃挎媺灏斿競", "鍥炬湪鑸掑厠甯�", "浜斿娓犲競")); public Object index3Action(WeixinModel model, HttpServletRequest request, HttpServletResponse response) throws IOException, DocumentException { @@ -248,7 +248,7 @@ public class WeixinController { /** - * 处理微信请求返回信息 + * 澶勭悊寰俊璇锋眰杩斿洖淇℃伅 * @param model * @param request * @param response @@ -261,28 +261,28 @@ public class WeixinController { request.setCharacterEncoding("utf-8"); response.setContentType("text/xml;charset=utf-8"); - //获取当前时间 + //鑾峰彇褰撳墠鏃堕棿 long start = System.currentTimeMillis(); - //响应客户端请求 + //鍝嶅簲瀹㈡埛绔姹� PrintWriter out = response.getWriter(); - //获取用户传入的信息 + //鑾峰彇鐢ㄦ埛浼犲叆鐨勪俊鎭� ReceivedMessage receivedMessage = WeixinUtils.getMessage(request); String postMessage = null; // System.out.println(DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) + "\t" + (receivedMessage != null ? receivedMessage.toString() : "")); if (null != receivedMessage) { LOGGER.info("weixin received text message: " + receivedMessage.toString()); if (receivedMessage instanceof ReceivedTextMessage) { - // 处理文本类信息 + // 澶勭悊鏂囨湰绫讳俊鎭� postMessage = processTextMessage((ReceivedTextMessage) receivedMessage, model); LOGGER.info("weixin post text message: " + postMessage); saveTextMsg(receivedMessage, StringUtils.isNotBlank(postMessage), postMessage); } else if (receivedMessage instanceof ReceivedEventMessage) { - // 用户订阅/取消订阅信息,返回相应的内容 + // 鐢ㄦ埛璁㈤槄/鍙栨秷璁㈤槄淇℃伅锛岃繑鍥炵浉搴旂殑鍐呭 postMessage = processEventMessage((ReceivedEventMessage) receivedMessage); LOGGER.info("weixin post text message: " + postMessage); } else if (receivedMessage instanceof ReceivedLocationMessage) { - // 处理位置信息以3000米为半径查询附近的小区信息 + // 澶勭悊浣嶇疆淇℃伅浠�3000绫充负鍗婂緞鏌ヨ闄勮繎鐨勫皬鍖轰俊鎭� postMessage = processLocationMessage((ReceivedLocationMessage) receivedMessage, model); LOGGER.info("weixin post text message: " + postMessage); } @@ -302,7 +302,7 @@ public class WeixinController { } /** - * 用户信息委地址坐标的请求处理方法,返回根据此坐标3000米半径范围内的所有小区信息 + * 鐢ㄦ埛淇℃伅濮斿湴鍧�鍧愭爣鐨勮姹傚鐞嗘柟娉曪紝杩斿洖鏍规嵁姝ゅ潗鏍�3000绫冲崐寰勮寖鍥村唴鐨勬墍鏈夊皬鍖轰俊鎭� * @param receivedMessage * @param model * @return @@ -349,7 +349,7 @@ public class WeixinController { response.setContentType("text/xml;charset=utf-8"); ReceivedMessage receivedMessage = new ReceivedTextMessage(1234567890L, request.getParameter("c")); - // 处理文本类信息 + // 澶勭悊鏂囨湰绫讳俊鎭� String postMessage = processTextMessage((ReceivedTextMessage) receivedMessage, model); // ReceivedLocationMessage receivedMessage = new @@ -357,7 +357,7 @@ public class WeixinController { // receivedMessage.setFromUserName("onLLRjk2VJVihJ-Rcl4Dk3AdWJ_M"); // receivedMessage.setLocationX(31.216365); // receivedMessage.setLocationY(121.353499); - // receivedMessage.setLabel("中国上海市长宁区定威路22号-34号 邮政编码: 201106"); + // receivedMessage.setLabel("涓浗涓婃捣甯傞暱瀹佸尯瀹氬▉璺�22鍙�-34鍙� 閭斂缂栫爜: 201106"); // receivedMessage.setScale(20); // String postMessage = processLocationMessage(receivedMessage, model); @@ -374,7 +374,7 @@ public class WeixinController { public static final String TICKET = "gQGI7zoAAAAAAAAAASxodHRwOi8vd2VpeGluLnFxLmNvbS9xL1EzVnZZV25sSGxabnJqbWQ5bGxZAAIEpW4tWAMEAAAAAA=="; /** - * 用户订阅/取消订阅信息的接口 + * 鐢ㄦ埛璁㈤槄/鍙栨秷璁㈤槄淇℃伅鐨勬帴鍙� * @param receivedMessage * @return */ @@ -388,16 +388,16 @@ public class WeixinController { return postImageMessage.format(); }else{ PostTextMessage postMessage = new PostTextMessage( - "欢迎关注房价网!"+"\n" +"想了解我们的产品服务及更多企业级地址数据解决方案,可登录官网http://sh.fangjia.com/\n" + - "一对一在线人工咨询,可添加企业客服微信13816692251"+"\n"+"全国客服热线:400-188-3737"+"\n\n"+"市场品牌或渠道合作,发邮件至gujia@fangjia.com"); + "娆㈣繋鍏虫敞鎴夸环缃戯紒"+"\n" +"鎯充簡瑙f垜浠殑浜у搧鏈嶅姟鍙婃洿澶氫紒涓氱骇鍦板潃鏁版嵁瑙e喅鏂规锛屽彲鐧诲綍瀹樼綉http://sh.fangjia.com/\n" + + "涓�瀵逛竴鍦ㄧ嚎浜哄伐鍜ㄨ锛屽彲娣诲姞浼佷笟瀹㈡湇寰俊13816692251"+"\n"+"鍏ㄥ浗瀹㈡湇鐑嚎锛�400-188-3737"+"\n\n"+"甯傚満鍝佺墝鎴栨笭閬撳悎浣滐紝鍙戦偖浠惰嚦gujia@fangjia.com"); postMessage.setToUserName(receivedMessage.getFromUserName()); return postMessage.format(); } } else if ("unsubscribe".equals(receivedMessage.getEvent())) { - // 经测试,取消订阅时,发送的信息用户是收不到的,所以不处理 + // 缁忔祴璇曪紝鍙栨秷璁㈤槄鏃讹紝鍙戦�佺殑淇℃伅鐢ㄦ埛鏄敹涓嶅埌鐨勶紝鎵�浠ヤ笉澶勭悊 }else { if("biz".equalsIgnoreCase(receivedMessage.getKey())) { - PostTextMessage postMessage = new PostTextMessage("商务咨询方式——\n公司网站:www.fangjia.com\n客服电话:4001883787\n电子邮箱:service@fangjia.com"); + PostTextMessage postMessage = new PostTextMessage("鍟嗗姟鍜ㄨ鏂瑰紡鈥斺�擻n鍏徃缃戠珯锛歸ww.fangjia.com\n瀹㈡湇鐢佃瘽锛�4001883787\n鐢靛瓙閭锛歴ervice@fangjia.com"); postMessage.setToUserName(receivedMessage.getFromUserName()); return postMessage.format(); } @@ -414,37 +414,37 @@ public class WeixinController { } /** - * 处理用户发过来的和“周边有关”的信息 + * 澶勭悊鐢ㄦ埛鍙戣繃鏉ョ殑鍜屸�滃懆杈规湁鍏斥�濈殑淇℃伅 * @param receivedMessage * @param model * @return * @throws UnsupportedEncodingException */ private String processTextMessage(ReceivedTextMessage receivedMessage, WeixinModel model) throws UnsupportedEncodingException { - //去掉字符串两端的控制符 + //鍘绘帀瀛楃涓蹭袱绔殑鎺у埗绗� final String receivedContent = StringUtils.trim(receivedMessage.getContent()); - if (StringUtils.startsWith(receivedContent, "周边房价") || StringUtils.startsWith(receivedContent, "周边均价") - || StringUtils.startsWith(receivedContent, "周边小区")) { - PostTextMessage postMessage = new PostTextMessage("您想问的是:" + receivedContent - + "\r\n请按+键并点击位置,告诉我您的位置信息。\r\n点击查看怎么发送位置"); + if (StringUtils.startsWith(receivedContent, "鍛ㄨ竟鎴夸环") || StringUtils.startsWith(receivedContent, "鍛ㄨ竟鍧囦环") + || StringUtils.startsWith(receivedContent, "鍛ㄨ竟灏忓尯")) { + PostTextMessage postMessage = new PostTextMessage("鎮ㄦ兂闂殑鏄細" + receivedContent + + "\r\n璇锋寜+閿苟鐐瑰嚮浣嶇疆锛屽憡璇夋垜鎮ㄧ殑浣嶇疆淇℃伅銆俓r\n鐐瑰嚮鏌ョ湅鎬庝箞鍙戦�佷綅缃�"); postMessage.setToUserName(receivedMessage.getFromUserName()); return postMessage.format(); } - //add by shibb at 2015-4-21用于当微信用户输入“调查”时返回给他调查链接 - if("调查".equals(receivedContent)){ - PostTextMessage postMessage = new PostTextMessage("请点击此链接参加任务"); + //add by shibb at 2015-4-21鐢ㄤ簬褰撳井淇$敤鎴疯緭鍏モ�滆皟鏌モ�濇椂杩斿洖缁欎粬璋冩煡閾炬帴 + if("璋冩煡".equals(receivedContent)){ + PostTextMessage postMessage = new PostTextMessage("璇风偣鍑绘閾炬帴鍙傚姞浠诲姟"); postMessage.setToUserName(receivedMessage.getFromUserName()); return postMessage.format(); } if("pds".equalsIgnoreCase(receivedContent)){ - PostTextMessage postMessage = new PostTextMessage("点击 → 申请试用PDS"); + PostTextMessage postMessage = new PostTextMessage("鐐瑰嚮 鈫� 鐢宠璇曠敤PDS"); postMessage.setToUserName(receivedMessage.getFromUserName()); return postMessage.format(); } - if(receivedContent.endsWith("@快照") || receivedContent.endsWith("均价快照")){ - String keyword = receivedContent.replace("均价快照", "").replace("@快照", ""); + if(receivedContent.endsWith("@蹇収") || receivedContent.endsWith("鍧囦环蹇収")){ + String keyword = receivedContent.replace("鍧囦环蹇収", "").replace("@蹇収", ""); keyword = DataUtil.toDBCcase(keyword); String[] arrs = keyword.split(" "); String city = null; @@ -467,14 +467,14 @@ public class WeixinController { if(list.size() == 1) { district = list.get(0); }else if(list.size() > 1) { - PostTextMessage postMessage = new PostTextMessage("该小区有重名,请输入:城市 区域 小区名均价快照"); + PostTextMessage postMessage = new PostTextMessage("璇ュ皬鍖烘湁閲嶅悕锛岃杈撳叆锛氬煄甯� 鍖哄煙 灏忓尯鍚嶅潎浠峰揩鐓�"); postMessage.setToUserName(receivedMessage.getFromUserName()); return postMessage.format(); } } if(district == null) { - PostTextMessage postMessage = new PostTextMessage("该小区存在. 请检查输入:城市 区域 小区名均价快照"); + PostTextMessage postMessage = new PostTextMessage("璇ュ皬鍖哄瓨鍦�. 璇锋鏌ヨ緭鍏ワ細鍩庡競 鍖哄煙 灏忓尯鍚嶅潎浠峰揩鐓�"); postMessage.setToUserName(receivedMessage.getFromUserName()); return postMessage.format(); } @@ -482,7 +482,7 @@ public class WeixinController { PostTextMessage postMessage = new PostTextMessage("点击查看"); + + "'>鐐瑰嚮鏌ョ湅"); postMessage.setToUserName(receivedMessage.getFromUserName()); return postMessage.format(); } @@ -490,14 +490,14 @@ public class WeixinController { String retStr = null; String matchRagion = null; boolean searchByKey = true; - String formatReceivedContent = receivedContent.replaceAll("(市)?(区)?(的房价|房价|的均价|均价)", ""); - //输入的是城市 + String formatReceivedContent = receivedContent.replaceAll("(甯�)?(鍖�)?(鐨勬埧浠穦鎴夸环|鐨勫潎浠穦鍧囦环)", ""); + //杈撳叆鐨勬槸鍩庡競 if(RegionData.getAllCity().contains(formatReceivedContent)) { retStr = processCityAvgPrice(formatReceivedContent, receivedMessage); if(StringUtils.isNotBlank(retStr)) { return retStr; } - } else if(StringUtils.isNotBlank(matchRagion = matchesRagion(formatReceivedContent))) {//输入的是城市和区域 + } else if(StringUtils.isNotBlank(matchRagion = matchesRagion(formatReceivedContent))) {//杈撳叆鐨勬槸鍩庡競鍜屽尯鍩� retStr = processRegion(matchRagion.split(",")[0], matchRagion.split(",")[1], receivedMessage); if(StringUtils.isBlank(retStr)) { retStr = processCityAvgPrice(formatReceivedContent, receivedMessage); @@ -505,25 +505,25 @@ public class WeixinController { if(StringUtils.isNotBlank(retStr)) { return retStr; } - } else {//判断是否输入的是“城市、区域、和小区名” + } else {//鍒ゆ柇鏄惁杈撳叆鐨勬槸鈥滃煄甯傘�佸尯鍩熴�佸拰灏忓尯鍚嶁�� Set cities = RegionData.getAllCity(); - String c = null;//城市 - String r = null;//区域 - String d = formatReceivedContent;//小区名 + String c = null;//鍩庡競 + String r = null;//鍖哄煙 + String d = formatReceivedContent;//灏忓尯鍚� boolean isBreak = false; - //对输入按照 “市、区、小区名” 进行拆分 + //瀵硅緭鍏ユ寜鐓� 鈥滃競銆佸尯銆佸皬鍖哄悕鈥� 杩涜鎷嗗垎 for(String city : cities) { if(isBreak) {break;} if(d.startsWith(city)) { - d = d.replaceFirst(city+"(市)?", ""); + d = d.replaceFirst(city+"(甯�)?", ""); c = city; for(Map.Entry> entry : RegionData.getAllRegions(city).entrySet()) { if(isBreak){break;} for(int i=0; inewHashMap(), "UTF-8"); @@ -559,7 +559,7 @@ public class WeixinController { } } if(searchByKey) { - // 关键字查询的小区 + // 鍏抽敭瀛楁煡璇㈢殑灏忓尯 List parseDistrictsTmp = new ArrayList(); String escapeSolr = DataUtil.escapeSolr(receivedContent); parseDistrictsTmp.addAll(districtService.findDistrictByKeyword(null, escapeSolr)); @@ -580,13 +580,13 @@ public class WeixinController { city = parseDistricts.get(0).getCity(); } if (StringUtils.isBlank(city)) { - // 获取用户最近一次有效的城市 + // 鑾峰彇鐢ㄦ埛鏈�杩戜竴娆℃湁鏁堢殑鍩庡競 WeixinUserLocation location = weixinUserLocationService.findById(receivedMessage.getFromUserName()); if (null != location) { city = location.getCity(); } } else { - // 保存用户位置 + // 淇濆瓨鐢ㄦ埛浣嶇疆 weixinUserLocationService.saveOrUpdate(receivedMessage.getFromUserName(), city, null, null, null, null); } @@ -598,10 +598,10 @@ public class WeixinController { /*if (MapUtils.isNotEmpty(knowbase)) { - // 有小区有门牌号,进行估价,不能估价返回小区信息;返回小区列表(5个);返回区域均价;返回城市均价;other模式匹配 + // 鏈夊皬鍖烘湁闂ㄧ墝鍙凤紝杩涜浼颁环锛屼笉鑳戒及浠疯繑鍥炲皬鍖轰俊鎭紱杩斿洖灏忓尯鍒楄〃锛�5涓級锛涜繑鍥炲尯鍩熷潎浠凤紱杩斿洖鍩庡競鍧囦环锛沷ther妯″紡鍖归厤 - // 合并两个解析器的信息 - boolean enteredCity = false; // 是否输入了城市 + // 鍚堝苟涓や釜瑙f瀽鍣ㄧ殑淇℃伅 + boolean enteredCity = false; // 鏄惁杈撳叆浜嗗煄甯� String city = knowbaseService.matchingCityDefaultNull(receivedContent); enteredCity = StringUtils.isNotBlank(city); if (receivedContent.equals(city)) { @@ -618,7 +618,7 @@ public class WeixinController { List parseDistrictsTmp = new ArrayList(); if (null != addressResult) { - // 先用地址解析器的信息 + // 鍏堢敤鍦板潃瑙f瀽鍣ㄧ殑淇℃伅 keyword = addressResult.getAddress(); houseNum = addressResult.getHouseNum(); @@ -628,7 +628,7 @@ public class WeixinController { } } if (MapUtils.isNotEmpty(knowbase)) { - // 缺的用知识库的 + // 缂虹殑鐢ㄧ煡璇嗗簱鐨� if (StringUtils.isBlank(houseNum) && null != knowbase.get("house_num")) { houseNum = String.valueOf(((Double) knowbase.get("house_num")).intValue()); } @@ -639,17 +639,17 @@ public class WeixinController { area = (Double) knowbase.get("area"); } - // 知识库解析小区 + // 鐭ヨ瘑搴撹В鏋愬皬鍖� List districtKeys = knowbaseService.matchDistrictKeys(null, StringUtils.isBlank(keyword) ? receivedContent : keyword); parseDistrictsTmp.addAll(districtService.findByKeyList(districtKeys, false)); } if (StringUtils.isNotBlank(keyword)) { - keyword = StringUtils.replace(keyword, "房价", ""); - keyword = StringUtils.replace(keyword, "均价", ""); + keyword = StringUtils.replace(keyword, "鎴夸环", ""); + keyword = StringUtils.replace(keyword, "鍧囦环", ""); if (StringUtils.isNotBlank(keyword)) { - // 关键字查询的小区 + // 鍏抽敭瀛楁煡璇㈢殑灏忓尯 DistrictQueryBean bean = new DistrictQueryBean(); bean.setKeyword(DataUtil.escapeSolr(keyword)); Pager pager = new Pager(10); @@ -663,13 +663,13 @@ public class WeixinController { city = parseDistricts.get(0).getCity(); } if (StringUtils.isBlank(city)) { - // 获取用户最近一次有效的城市 + // 鑾峰彇鐢ㄦ埛鏈�杩戜竴娆℃湁鏁堢殑鍩庡競 WeixinUserLocation location = weixinUserLocationService.findById(receivedMessage.getFromUserName()); if (null != location) { city = location.getCity(); } } else { - // 保存用户位置 + // 淇濆瓨鐢ㄦ埛浣嶇疆 weixinUserLocationService.saveOrUpdate(receivedMessage.getFromUserName(), city, null, null, null, null); } @@ -688,7 +688,7 @@ public class WeixinController { return retStr; } } else { - // 关键字查询的小区 + // 鍏抽敭瀛楁煡璇㈢殑灏忓尯 List parseDistrictsTmp = new ArrayList(); String escapeSolr = DataUtil.escapeSolr(receivedContent); parseDistrictsTmp.addAll(districtService.findDistrictByKeyword(null, escapeSolr)); @@ -709,13 +709,13 @@ public class WeixinController { city = parseDistricts.get(0).getCity(); } if (StringUtils.isBlank(city)) { - // 获取用户最近一次有效的城市 + // 鑾峰彇鐢ㄦ埛鏈�杩戜竴娆℃湁鏁堢殑鍩庡競 WeixinUserLocation location = weixinUserLocationService.findById(receivedMessage.getFromUserName()); if (null != location) { city = location.getCity(); } } else { - // 保存用户位置 + // 淇濆瓨鐢ㄦ埛浣嶇疆 weixinUserLocationService.saveOrUpdate(receivedMessage.getFromUserName(), city, null, null, null, null); } @@ -726,39 +726,39 @@ public class WeixinController { }*/ - String txt = receivedContent.replaceAll("(的)?(房价|均价)",""); + String txt = receivedContent.replaceAll("(鐨�)?(鎴夸环|鍧囦环)",""); if (Citys.contains(txt)) { - PostTextMessage postMessage = new PostTextMessage("对不起,您查询的" + txt + "城市目前我们还未开通,请关注我们,我们尽力帮您开通这个城市。谢谢!"); + PostTextMessage postMessage = new PostTextMessage("瀵逛笉璧凤紝鎮ㄦ煡璇㈢殑" + txt + "鍩庡競鐩墠鎴戜滑杩樻湭寮�閫氾紝璇峰叧娉ㄦ垜浠紝鎴戜滑灏藉姏甯偍寮�閫氳繖涓煄甯傘�傝阿璋紒"); postMessage.setToUserName(receivedMessage.getFromUserName()); return postMessage.format(); } for (String s : Citys) { if (StringUtils.contains(receivedContent, s)) { - PostTextMessage postMessage = new PostTextMessage("对不起,您查询的" + s + "城市目前我们还未开通,请关注我们,我们尽力帮您开通这个城市。谢谢!"); + PostTextMessage postMessage = new PostTextMessage("瀵逛笉璧凤紝鎮ㄦ煡璇㈢殑" + s + "鍩庡競鐩墠鎴戜滑杩樻湭寮�閫氾紝璇峰叧娉ㄦ垜浠紝鎴戜滑灏藉姏甯偍寮�閫氳繖涓煄甯傘�傝阿璋紒"); postMessage.setToUserName(receivedMessage.getFromUserName()); return postMessage.format(); } } if (Citys2.contains(txt)) { - PostTextMessage postMessage = new PostTextMessage("对不起,您查询的" + txt + "城市目前我们还未开通,请关注我们,我们尽力帮您开通这个城市。谢谢!"); + PostTextMessage postMessage = new PostTextMessage("瀵逛笉璧凤紝鎮ㄦ煡璇㈢殑" + txt + "鍩庡競鐩墠鎴戜滑杩樻湭寮�閫氾紝璇峰叧娉ㄦ垜浠紝鎴戜滑灏藉姏甯偍寮�閫氳繖涓煄甯傘�傝阿璋紒"); postMessage.setToUserName(receivedMessage.getFromUserName()); return postMessage.format(); } for (String s : Citys2) { if (StringUtils.contains(receivedContent, s)) { - PostTextMessage postMessage = new PostTextMessage("对不起,您查询的" + s + "城市目前我们还未开通,请关注我们,我们尽力帮您开通这个城市。谢谢!"); + PostTextMessage postMessage = new PostTextMessage("瀵逛笉璧凤紝鎮ㄦ煡璇㈢殑" + s + "鍩庡競鐩墠鎴戜滑杩樻湭寮�閫氾紝璇峰叧娉ㄦ垜浠紝鎴戜滑灏藉姏甯偍寮�閫氳繖涓煄甯傘�傝阿璋紒"); postMessage.setToUserName(receivedMessage.getFromUserName()); return postMessage.format(); } } if (Provinces.contains(txt)) { - PostTextMessage postMessage = new PostTextMessage("对不起,暂不支持省份的房价查询。可以输入您感兴趣的城市名字试试。谢谢!"); + PostTextMessage postMessage = new PostTextMessage("瀵逛笉璧凤紝鏆備笉鏀寔鐪佷唤鐨勬埧浠锋煡璇€�傚彲浠ヨ緭鍏ユ偍鎰熷叴瓒g殑鍩庡競鍚嶅瓧璇曡瘯銆傝阿璋紒"); postMessage.setToUserName(receivedMessage.getFromUserName()); return postMessage.format(); } for (String s : Provinces) { if (StringUtils.contains(receivedContent, s)) { - PostTextMessage postMessage = new PostTextMessage("对不起,暂不支持省份的房价查询。可以输入您感兴趣的城市名字试试。谢谢!"); + PostTextMessage postMessage = new PostTextMessage("瀵逛笉璧凤紝鏆備笉鏀寔鐪佷唤鐨勬埧浠锋煡璇€�傚彲浠ヨ緭鍏ユ偍鎰熷叴瓒g殑鍩庡競鍚嶅瓧璇曡瘯銆傝阿璋紒"); postMessage.setToUserName(receivedMessage.getFromUserName()); return postMessage.format(); } @@ -783,7 +783,7 @@ public class WeixinController { continue; } for(String region : entry.getValue()) { - if(formatReceivedContent.matches(city+"(市)?"+region)) { + if(formatReceivedContent.matches(city+"(甯�)?"+region)) { return city.concat(",")+entry.getKey(); } } @@ -796,7 +796,7 @@ public class WeixinController { List parseDistricts = new ArrayList(); parseDistricts.addAll(parseDistrictsTmp); if (parseDistrictsTmp.size() > 1) { - // 合并重复小区 + // 鍚堝苟閲嶅灏忓尯 parseDistricts = new ArrayList(); Set keySets = new HashSet(); Set citySets = new HashSet(); @@ -818,7 +818,7 @@ public class WeixinController { } if (parseDistricts.size() > 1) { - // 按城市优先级对小区排序 + // 鎸夊煄甯備紭鍏堢骇瀵瑰皬鍖烘帓搴� final String parseCityClone = city; if (StringUtils.isNotBlank(city)) { Collections.sort(parseDistricts, new Comparator() { @@ -880,20 +880,20 @@ public class WeixinController { TextImageMessage m = new TextImageMessage(); StringBuilder postContentSb = new StringBuilder(); - postContentSb.append("截止").append(new SimpleDateFormat("yyyy年MM月dd日").format(cityStat.getWeekend())) - .append(",").append(city).append("二手房均价为:").append(cityStat.getAvgPrice()).append("元/平米,环比上周"); + postContentSb.append("鎴").append(new SimpleDateFormat("yyyy骞碝M鏈坉d鏃�").format(cityStat.getWeekend())) + .append("锛�").append(city).append("浜屾墜鎴垮潎浠蜂负锛�").append(cityStat.getAvgPrice()).append("鍏�/骞崇背锛岀幆姣斾笂鍛�"); BigDecimal bg = new BigDecimal(cityStat.getWeekendMarkup() / 100.0); double weekendMarkup = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); if (cityStat.getWeekendMarkup() > 0) { - postContentSb.append("上涨").append(weekendMarkup).append("%。"); + postContentSb.append("涓婃定").append(weekendMarkup).append("%銆�"); } else if (cityStat.getWeekendMarkup() < 0) { - postContentSb.append("下跌").append(Math.abs(weekendMarkup)).append("%。"); + postContentSb.append("涓嬭穼").append(Math.abs(weekendMarkup)).append("%銆�"); } else { - postContentSb.append("持平。"); + postContentSb.append("鎸佸钩銆�"); } - m.setTitle(city + "市目前二手房均价:" + cityStat.getAvgPrice() + "元/平米"); + m.setTitle(city + "甯傜洰鍓嶄簩鎵嬫埧鍧囦环锛�" + cityStat.getAvgPrice() + "鍏�/骞崇背"); StringBuilder urlBuilder = new StringBuilder(); urlBuilder.append("pt=0&c=").append(city).append("&wc=12").append("&w=360&h=200"); @@ -904,7 +904,7 @@ public class WeixinController { dsMsgs.add(m); postMessage.setArticles(dsMsgs); - // 保存用户位置 + // 淇濆瓨鐢ㄦ埛浣嶇疆 weixinUserLocationService.saveOrUpdate(receivedMessage.getFromUserName(), city, null, null, null, null); return postMessage.format(); } @@ -913,7 +913,7 @@ public class WeixinController { } /** - * 处理城市和区域 + * 澶勭悊鍩庡競鍜屽尯鍩� * * @throws UnsupportedEncodingException */ @@ -925,10 +925,10 @@ public class WeixinController { } if (enteredCity) { - // 用户输入了城市,先看看能不能匹配到区域 + // 鐢ㄦ埛杈撳叆浜嗗煄甯傦紝鍏堢湅鐪嬭兘涓嶈兘鍖归厤鍒板尯鍩� String[] arr = getRegion(knowbase, city); if (null != arr) { - //modify by shibb 排除异常 + //modify by shibb 鎺掗櫎寮傚父 if( null != arr[1] ){ String ret = processRegion(arr[0], arr[1], receivedMessage); if (null != ret) { @@ -937,7 +937,7 @@ public class WeixinController { } } - // 没有匹配到区域,则返回城市均价 + // 娌℃湁鍖归厤鍒板尯鍩燂紝鍒欒繑鍥炲煄甯傚潎浠� if (enteredCity && StringUtils.isNotBlank(city)) { RegionStat cityStat = regionStatService.findByCity(city); if (null != cityStat) { @@ -952,20 +952,20 @@ public class WeixinController { TextImageMessage m = new TextImageMessage(); StringBuilder postContentSb = new StringBuilder(); - postContentSb.append("截止").append(new SimpleDateFormat("yyyy年MM月dd日").format(cityStat.getWeekend())) - .append(",").append(city).append("二手房均价为:").append(cityStat.getAvgPrice()).append("元/平米,环比上周"); + postContentSb.append("鎴").append(new SimpleDateFormat("yyyy骞碝M鏈坉d鏃�").format(cityStat.getWeekend())) + .append("锛�").append(city).append("浜屾墜鎴垮潎浠蜂负锛�").append(cityStat.getAvgPrice()).append("鍏�/骞崇背锛岀幆姣斾笂鍛�"); BigDecimal bg = new BigDecimal(cityStat.getWeekendMarkup() / 100.0); double weekendMarkup = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); if (cityStat.getWeekendMarkup() > 0) { - postContentSb.append("上涨").append(weekendMarkup).append("%。"); + postContentSb.append("涓婃定").append(weekendMarkup).append("%銆�"); } else if (cityStat.getWeekendMarkup() < 0) { - postContentSb.append("下跌").append(Math.abs(weekendMarkup)).append("%。"); + postContentSb.append("涓嬭穼").append(Math.abs(weekendMarkup)).append("%銆�"); } else { - postContentSb.append("持平。"); + postContentSb.append("鎸佸钩銆�"); } - m.setTitle(city + "市目前二手房均价:" + cityStat.getAvgPrice() + "元/平米"); + m.setTitle(city + "甯傜洰鍓嶄簩鎵嬫埧鍧囦环锛�" + cityStat.getAvgPrice() + "鍏�/骞崇背"); StringBuilder urlBuilder = new StringBuilder(); urlBuilder.append("pt=0&c=").append(city).append("&wc=12").append("&w=360&h=200"); @@ -976,13 +976,13 @@ public class WeixinController { dsMsgs.add(m); postMessage.setArticles(dsMsgs); - // 保存用户位置 + // 淇濆瓨鐢ㄦ埛浣嶇疆 weixinUserLocationService.saveOrUpdate(receivedMessage.getFromUserName(), city, null, null, null, null); return postMessage.format(); } } } else { - // 用户没输入城市,看能不能匹配到区域,返回第一个有均价的区域 + // 鐢ㄦ埛娌¤緭鍏ュ煄甯傦紝鐪嬭兘涓嶈兘鍖归厤鍒板尯鍩燂紝杩斿洖绗竴涓湁鍧囦环鐨勫尯鍩� List> regionList = (List>) knowbase.get("region"); if (CollectionUtils.isEmpty(regionList)) { return null; @@ -1017,21 +1017,21 @@ public class WeixinController { TextImageMessage m = new TextImageMessage(); StringBuilder postContentSb = new StringBuilder(); - postContentSb.append("截止").append(new SimpleDateFormat("yyyy年MM月dd日").format(regionStat.getWeekend())).append(",") - .append(city).append("市").append(regionOrg).append("二手房均价为:").append(regionStat.getAvgPrice()) - .append("元/平米,环比上周"); + postContentSb.append("鎴").append(new SimpleDateFormat("yyyy骞碝M鏈坉d鏃�").format(regionStat.getWeekend())).append("锛�") + .append(city).append("甯�").append(regionOrg).append("浜屾墜鎴垮潎浠蜂负锛�").append(regionStat.getAvgPrice()) + .append("鍏�/骞崇背锛岀幆姣斾笂鍛�"); BigDecimal bg = new BigDecimal(regionStat.getWeekendMarkup() / 100.0); double weekendMarkup = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); if (regionStat.getWeekendMarkup() > 0) { - postContentSb.append("上涨").append(weekendMarkup).append("%。"); + postContentSb.append("涓婃定").append(weekendMarkup).append("%銆�"); } else if (regionStat.getWeekendMarkup() < 0) { - postContentSb.append("下跌").append(Math.abs(weekendMarkup)).append("%。"); + postContentSb.append("涓嬭穼").append(Math.abs(weekendMarkup)).append("%銆�"); } else { - postContentSb.append("持平。"); + postContentSb.append("鎸佸钩銆�"); } - m.setTitle(city + "市" + regionOrg + "目前二手房均价:" + regionStat.getAvgPrice() + "元/平米"); + m.setTitle(city + "甯�" + regionOrg + "鐩墠浜屾墜鎴垮潎浠凤細" + regionStat.getAvgPrice() + "鍏�/骞崇背"); StringBuilder urlBuilder = new StringBuilder(); urlBuilder.append("pt=0&c=").append(city).append("&r=").append(region).append("&wc=12").append("&w=360&h=200"); @@ -1042,7 +1042,7 @@ public class WeixinController { dsMsgs.add(m); postMessage.setArticles(dsMsgs); - // 保存用户位置 + // 淇濆瓨鐢ㄦ埛浣嶇疆 weixinUserLocationService.saveOrUpdate(receivedMessage.getFromUserName(), city, region, null, null, null); return postMessage.format(); } @@ -1065,21 +1065,21 @@ public class WeixinController { TextImageMessage m = new TextImageMessage(); StringBuilder postContentSb = new StringBuilder(); - postContentSb.append("截止").append(new SimpleDateFormat("yyyy年MM月dd日").format(districtStat.getWeekend())).append(",") - .append(city).append("市").append(regionOrg).append(districtName).append("二手房均价为:").append(districtStat.getAvgPrice()) - .append("元/平米,环比上周"); + postContentSb.append("鎴").append(new SimpleDateFormat("yyyy骞碝M鏈坉d鏃�").format(districtStat.getWeekend())).append("锛�") + .append(city).append("甯�").append(regionOrg).append(districtName).append("浜屾墜鎴垮潎浠蜂负锛�").append(districtStat.getAvgPrice()) + .append("鍏�/骞崇背锛岀幆姣斾笂鍛�"); BigDecimal bg = new BigDecimal(districtStat.getWeekendMarkup() / 100.0); double weekendMarkup = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); if (districtStat.getWeekendMarkup() > 0) { - postContentSb.append("上涨").append(weekendMarkup).append("%。"); + postContentSb.append("涓婃定").append(weekendMarkup).append("%銆�"); } else if (districtStat.getWeekendMarkup() < 0) { - postContentSb.append("下跌").append(Math.abs(weekendMarkup)).append("%。"); + postContentSb.append("涓嬭穼").append(Math.abs(weekendMarkup)).append("%銆�"); } else { - postContentSb.append("持平。"); + postContentSb.append("鎸佸钩銆�"); } - m.setTitle(city + "市" + regionOrg + districtName+"目前二手房均价:" + districtStat.getAvgPrice() + "元/平米"); + m.setTitle(city + "甯�" + regionOrg + districtName+"鐩墠浜屾墜鎴垮潎浠凤細" + districtStat.getAvgPrice() + "鍏�/骞崇背"); StringBuilder urlBuilder = new StringBuilder(); urlBuilder.append("pt=0&c=").append(city).append("&r=").append(region).append("&wc=12").append("&w=360&h=200"); @@ -1095,7 +1095,7 @@ public class WeixinController { dsMsgs.add(m); postMessage.setArticles(dsMsgs); - // 保存用户位置 + // 淇濆瓨鐢ㄦ埛浣嶇疆 weixinUserLocationService.saveOrUpdate(receivedMessage.getFromUserName(), city, region, null, null, null); return postMessage.format(); } @@ -1103,8 +1103,8 @@ public class WeixinController { } /** - * 处理小区列表 - * DIstrict小区信息 + * 澶勭悊灏忓尯鍒楄〃 + * DIstrict灏忓尯淇℃伅 */ private String processDistrict(boolean enteredCity, String city, List parseDistricts, String receivedContent, ReceivedMessage receivedMessage, WeixinModel model) throws UnsupportedEncodingException { @@ -1130,7 +1130,7 @@ public class WeixinController { List dsMsgs = new ArrayList(ds.size()); Set citys = new HashSet(); - boolean useStat = StringUtils.contains(receivedContent, "房价") || StringUtils.contains(receivedContent, "均价"); + boolean useStat = StringUtils.contains(receivedContent, "鎴夸环") || StringUtils.contains(receivedContent, "鍧囦环"); Map statMap = Collections.emptyMap(); if (useStat) { List districtKeys = new ArrayList(ds.size()); @@ -1173,10 +1173,10 @@ public class WeixinController { } if (useStat && null != avgPrice) { - m.setTitle(d.getCity() + "市" + RegionData.getOrgName(d.getCity(), d.getRegion()) + d.getName() + " " + avgPrice - + "元/平米"); + m.setTitle(d.getCity() + "甯�" + RegionData.getOrgName(d.getCity(), d.getRegion()) + d.getName() + " " + avgPrice + + "鍏�/骞崇背"); } else { - m.setTitle(d.getCity() + "市" + RegionData.getOrgName(d.getCity(), d.getRegion()) + d.getName()); + m.setTitle(d.getCity() + "甯�" + RegionData.getOrgName(d.getCity(), d.getRegion()) + d.getName()); } String picUrl = picService.getDistrictPic(d); @@ -1197,9 +1197,9 @@ public class WeixinController { } if (ds.size() == 1) { - m.setDescription(StringUtils.substring(DataUtil.removeHtml(d.getDescription()), 0, 55) + "……"); + m.setDescription(StringUtils.substring(DataUtil.removeHtml(d.getDescription()), 0, 55) + "鈥︹��"); - // 保存用户位置 + // 淇濆瓨鐢ㄦ埛浣嶇疆 weixinUserLocationService.saveOrUpdate(receivedMessage.getFromUserName(), d.getCity(), d.getRegion(), null, null, null); } @@ -1209,12 +1209,12 @@ public class WeixinController { if (!cityExist && dsMsgs.size() > 1) { TextImageMessage m = new TextImageMessage(); - m.setTitle("为您找到" + ds.size() + "个相关结果,您可以加上城市方便我们筛选:例如" + citys.iterator().next() + StringUtils.trimToEmpty(receivedContent)); + m.setTitle("涓烘偍鎵惧埌" + ds.size() + "涓浉鍏崇粨鏋滐紝鎮ㄥ彲浠ュ姞涓婂煄甯傛柟渚挎垜浠瓫閫夛細渚嬪" + citys.iterator().next() + StringUtils.trimToEmpty(receivedContent)); dsMsgs.add(m); } if (cityExist && dsMsgs.size() > 1) { TextImageMessage m = new TextImageMessage(); - m.setTitle("为您找到" + ds.size() + "个相关结果,您可以输入详细的小区名试试,例如:" + city + ds.get(0).getName()); + m.setTitle("涓烘偍鎵惧埌" + ds.size() + "涓浉鍏崇粨鏋滐紝鎮ㄥ彲浠ヨ緭鍏ヨ缁嗙殑灏忓尯鍚嶈瘯璇曪紝渚嬪锛�" + city + ds.get(0).getName()); dsMsgs.add(m); } @@ -1223,22 +1223,22 @@ public class WeixinController { } /** - * 处理估价 + * 澶勭悊浼颁环 */ private String processEvaluation(boolean enteredCity, String city, String houseNum, String roomNum, Double area, List parseDistricts, ReceivedTextMessage receivedMessage, WeixinModel model) throws UnsupportedEncodingException { - boolean b0 = StringUtils.isBlank(houseNum) || StringUtils.isBlank(roomNum); // 楼栋号不全 - boolean b1 = null == area || area <= 0; // 面积不对 - boolean b2 = CollectionUtils.isEmpty(parseDistricts); // 没匹配到小区 + boolean b0 = StringUtils.isBlank(houseNum) || StringUtils.isBlank(roomNum); // 妤兼爧鍙蜂笉鍏� + boolean b1 = null == area || area <= 0; // 闈㈢Н涓嶅 + boolean b2 = CollectionUtils.isEmpty(parseDistricts); // 娌″尮閰嶅埌灏忓尯 if ((b0 && b1) || b2) { return null; } boolean cityExist = enteredCity || StringUtils.isNotBlank(city); if (!cityExist && parseDistricts.size() > 1) { - // 用户没输入城市或没最近城市,且匹配到多个小区,提示用户输入城市 - PostTextMessage postMessage = new PostTextMessage("您想问的是:" + receivedMessage.getContent() + "\r\n请告诉我们您所在的城市:例如" + // 鐢ㄦ埛娌¤緭鍏ュ煄甯傛垨娌℃渶杩戝煄甯傦紝涓斿尮閰嶅埌澶氫釜灏忓尯锛屾彁绀虹敤鎴疯緭鍏ュ煄甯� + PostTextMessage postMessage = new PostTextMessage("鎮ㄦ兂闂殑鏄細" + receivedMessage.getContent() + "\r\n璇峰憡璇夋垜浠偍鎵�鍦ㄧ殑鍩庡競锛氫緥濡�" + parseDistricts.get(0).getCity() + receivedMessage.getContent()); postMessage.setToUserName(receivedMessage.getFromUserName()); return postMessage.format(); @@ -1247,11 +1247,11 @@ public class WeixinController { Evaluation eva = null; District district = null; if (!b0) { - // 有楼栋号,要么有估价结果,要么返回单个小区信息 + // 鏈夋ゼ鏍嬪彿锛岃涔堟湁浼颁环缁撴灉锛岃涔堣繑鍥炲崟涓皬鍖轰俊鎭� HouseLoudong loudong = null; for (District d : parseDistricts) { if (!cityExist || d.getCity().equals(city)) { - // 用户输入了城市,且和小区的城市匹配。或者,用户没输入小区,则取历史记录的城市小区 + // 鐢ㄦ埛杈撳叆浜嗗煄甯傦紝涓斿拰灏忓尯鐨勫煄甯傚尮閰嶃�傛垨鑰咃紝鐢ㄦ埛娌¤緭鍏ュ皬鍖猴紝鍒欏彇鍘嗗彶璁板綍鐨勫煄甯傚皬鍖� loudong = houseLoudongService.findHouseLoudong(d.getCity(), d.getRegion(), d.getName(), houseNum, null, roomNum); if (null != loudong) { @@ -1283,7 +1283,7 @@ public class WeixinController { eva = evaluationService.saveEvaluation(eva); } } else if (!b1) { - // 没有楼栋号但有面积 + // 娌℃湁妤兼爧鍙蜂絾鏈夐潰绉� for (District d : parseDistricts) { if (!cityExist || d.getCity().equals(city)) { district = d; @@ -1313,18 +1313,18 @@ public class WeixinController { TextImageMessage m = new TextImageMessage(); StringBuilder title = new StringBuilder(); StringBuilder postContentSb = new StringBuilder(); - title.append(eva.getCity()).append("市").append(RegionData.getOrgName(eva.getCity(), eva.getRegion())) + title.append(eva.getCity()).append("甯�").append(RegionData.getOrgName(eva.getCity(), eva.getRegion())) .append(eva.getDistrictName()); if (StringUtils.isNotBlank(eva.getHouseNum()) && StringUtils.isNotBlank(eva.getRoomNum())) { - title.append(eva.getHouseNum()).append("号").append(eva.getRoomNum()).append("室").append(intTotlaPrice) - .append("万"); - postContentSb.append(eva.getHouseNum()).append("号").append(eva.getRoomNum()).append("室的估价结果为:"); + title.append(eva.getHouseNum()).append("鍙�").append(eva.getRoomNum()).append("瀹�").append(intTotlaPrice) + .append("涓�"); + postContentSb.append(eva.getHouseNum()).append("鍙�").append(eva.getRoomNum()).append("瀹ょ殑浼颁环缁撴灉涓猴細"); } if (!b1) { - title.append(eva.getArea()).append("平米").append(intTotlaPrice).append("万"); - postContentSb.append(eva.getDistrictName()).append(eva.getArea()).append("平米").append("的估价结果为:"); + title.append(eva.getArea()).append("骞崇背").append(intTotlaPrice).append("涓�"); + postContentSb.append(eva.getDistrictName()).append(eva.getArea()).append("骞崇背").append("鐨勪及浠风粨鏋滀负锛�"); } - postContentSb.append(intTotlaPrice).append("万元,当前小区均价为:").append(eva.getAvgPrice()).append("元/平米。"); + postContentSb.append(intTotlaPrice).append("涓囧厓锛屽綋鍓嶅皬鍖哄潎浠蜂负锛�").append(eva.getAvgPrice()).append("鍏�/骞崇背銆�"); m.setTitle(title.toString()); m.setDescription(postContentSb.toString()); @@ -1339,12 +1339,12 @@ public class WeixinController { dsMsgs.add(m); postMessage.setArticles(dsMsgs); - // 保存用户位置 + // 淇濆瓨鐢ㄦ埛浣嶇疆 weixinUserLocationService.saveOrUpdate(receivedMessage.getFromUserName(), eva.getCity(), eva.getRegion(), null, null, null); return postMessage.format(); } else if (null != district) { - // 不能估价, 返回小区信息 + // 涓嶈兘浼颁环锛� 杩斿洖灏忓尯淇℃伅 PostNewsMessage postMessage = new PostNewsMessage(); postMessage.setToUserName(receivedMessage.getFromUserName()); List dsMsgs = new ArrayList(2); @@ -1364,26 +1364,26 @@ public class WeixinController { StringBuilder title = new StringBuilder(); if (StringUtils.isNotBlank(eva.getHouseNum()) && StringUtils.isNotBlank(eva.getRoomNum())) { - title.append(district.getName()).append(eva.getHouseNum()).append("号").append(eva.getRoomNum()); + title.append(district.getName()).append(eva.getHouseNum()).append("鍙�").append(eva.getRoomNum()); if (null != districtStat && districtStat.getAvgPrice() > 0) { - title.append("室均价").append(districtStat.getAvgPrice()).append("元/平米"); + title.append("瀹ゅ潎浠�").append(districtStat.getAvgPrice()).append("鍏�/骞崇背"); } else { - title.append("室"); + title.append("瀹�"); } } if (!b1) { title.append(district.getName()).append(eva.getArea()); if (null != districtStat && districtStat.getAvgPrice() > 0) { - title.append("平米均价").append(districtStat.getAvgPrice()).append("元/平米"); + title.append("骞崇背鍧囦环").append(districtStat.getAvgPrice()).append("鍏�/骞崇背"); } else { - title.append("平米"); + title.append("骞崇背"); } } m.setTitle(title.toString()); } if (StringUtils.isBlank(m.getTitle())) { - m.setTitle(district.getCity() + "市" + RegionData.getOrgName(district.getCity(), district.getRegion()) + m.setTitle(district.getCity() + "甯�" + RegionData.getOrgName(district.getCity(), district.getRegion()) + district.getName()); } @@ -1395,11 +1395,11 @@ public class WeixinController { } m.setUrl("http://" + dCity.getName() + ".fangjia.com/wxiaoqu/" + URLEncoder.encode(district.getRegion(), "UTF-8") + "/" + URLEncoder.encode(district.getName(), "UTF-8") + "/"); - m.setDescription(StringUtils.substring(DataUtil.removeHtml(district.getDescription()), 0, 55) + "……"); + m.setDescription(StringUtils.substring(DataUtil.removeHtml(district.getDescription()), 0, 55) + "鈥︹��"); dsMsgs.add(m); TextImageMessage m2 = new TextImageMessage(); - m2.setTitle("立即估价>>"); + m2.setTitle("绔嬪嵆浼颁环>>"); m2.setPicUrl("http://static.fangjia.com/stc/wechat/gujia.png?t=" + new Date().getTime()); m2.setUrl("http://" + dCity.getName() + ".fangjia.com/wgujia/?evaluation.districtName=" + URLEncoder.encode(district.getName(), "UTF-8") + "&evaluation.houseNum=" @@ -1408,7 +1408,7 @@ public class WeixinController { dsMsgs.add(m2); postMessage.setArticles(dsMsgs); - // 保存用户位置 + // 淇濆瓨鐢ㄦ埛浣嶇疆 weixinUserLocationService.saveOrUpdate(receivedMessage.getFromUserName(), district.getCity(), district.getRegion(), null, null, null); return postMessage.format(); @@ -1417,7 +1417,7 @@ public class WeixinController { } /** - * 知识库处理 + * 鐭ヨ瘑搴撳鐞� */ @SuppressWarnings("unchecked") private String processKnowbaseParser(AddressResult addressResult, Map knowbase, @@ -1427,19 +1427,19 @@ public class WeixinController { return null; } - // 输入中解析到的城市 + // 杈撳叆涓В鏋愬埌鐨勫煄甯� String suggestCity = null == addressResult ? null : addressResult.getCity(); if (StringUtils.isBlank(suggestCity)) { suggestCity = knowbaseService.matchingCityDefaultNull(receivedContent); } if (StringUtils.isBlank(suggestCity)) { - // 获取用户最近一次有效的城市 + // 鑾峰彇鐢ㄦ埛鏈�杩戜竴娆℃湁鏁堢殑鍩庡競 WeixinUserLocation location = weixinUserLocationService.findById(receivedMessage.getFromUserName()); if (null != location) { suggestCity = location.getCity(); } } else { - // 保存用户位置 + // 淇濆瓨鐢ㄦ埛浣嶇疆 weixinUserLocationService.saveOrUpdate(receivedMessage.getFromUserName(), suggestCity, null, null, null, null); } @@ -1449,14 +1449,14 @@ public class WeixinController { String houseNum = null; String roomNum = null; - // 有楼栋号 + // 鏈夋ゼ鏍嬪彿 if (null != addressResult && StringUtils.isNotBlank(addressResult.getHouseNum()) && StringUtils.isNotBlank(addressResult.getRoomNum())) { houseNum = addressResult.getHouseNum(); roomNum = addressResult.getRoomNum(); } - // 解析的小区列表中挑选一个小区 + // 瑙f瀽鐨勫皬鍖哄垪琛ㄤ腑鎸戦�変竴涓皬鍖� List> districts = (null != knowbase && null != knowbase.get("district_name")) ? (List>) knowbase .get("district_name") : Collections.EMPTY_LIST; if (CollectionUtils.isNotEmpty(districts)) { @@ -1476,7 +1476,7 @@ public class WeixinController { } } - // 找到小区后,去估价 + // 鎵惧埌灏忓尯鍚庯紝鍘讳及浠� if (StringUtils.isNotBlank(city) && StringUtils.isNotBlank(region) && StringUtils.isNotBlank(name)) { HouseLoudong loudong = evaluationService.findHouseInfo(city, region, name, houseNum, roomNum); Evaluation eva = null; @@ -1500,7 +1500,7 @@ public class WeixinController { eva.setArea(Double.parseDouble((String) knowbase.get("area"))); } - // 解析出楼栋信息 + // 瑙f瀽鍑烘ゼ鏍嬩俊鎭� eva.setSource("api_weixin"); eva = evaluationService.saveEvaluation(eva); if (null != eva.getTotalPrice() && eva.getTotalPrice() > 0) { @@ -1513,12 +1513,12 @@ public class WeixinController { List dsMsgs = new ArrayList(1); StringBuilder postContentSb = new StringBuilder(); - postContentSb.append(houseNum).append("号").append(roomNum).append("室的估价结果为:") - .append((int) (eva.getTotalPrice() / 10000)).append("万元,当前小区均价为:").append(eva.getAvgPrice()) - .append("元/平米。"); + postContentSb.append(houseNum).append("鍙�").append(roomNum).append("瀹ょ殑浼颁环缁撴灉涓猴細") + .append((int) (eva.getTotalPrice() / 10000)).append("涓囧厓锛屽綋鍓嶅皬鍖哄潎浠蜂负锛�").append(eva.getAvgPrice()) + .append("鍏�/骞崇背銆�"); TextImageMessage m = new TextImageMessage(); - m.setTitle(city + "市" + RegionData.getOrgName(city, region) + name); + m.setTitle(city + "甯�" + RegionData.getOrgName(city, region) + name); m.setDescription(postContentSb.toString()); String picUrl = picService.getDistrictPic(dis); @@ -1532,11 +1532,11 @@ public class WeixinController { dsMsgs.add(m); postMessage.setArticles(dsMsgs); - // 保存用户位置 + // 淇濆瓨鐢ㄦ埛浣嶇疆 weixinUserLocationService.saveOrUpdate(receivedMessage.getFromUserName(), city, region, null, null, null); return postMessage.format(); } else { - // 不能估价, 返回小区信息 + // 涓嶈兘浼颁环锛� 杩斿洖灏忓尯淇℃伅 PostNewsMessage postMessage = new PostNewsMessage(); postMessage.setToUserName(receivedMessage.getFromUserName()); @@ -1547,7 +1547,7 @@ public class WeixinController { List dsMsgs = new ArrayList(2); TextImageMessage m = new TextImageMessage(); - m.setTitle(city + "市" + RegionData.getOrgName(city, region) + name); + m.setTitle(city + "甯�" + RegionData.getOrgName(city, region) + name); String picUrl = picService.getDistrictPic(dis); if (StringUtils.isNotBlank(picUrl)) { @@ -1557,11 +1557,11 @@ public class WeixinController { } m.setUrl("http://" + dCity.getName() + ".fangjia.com/wxiaoqu/" + URLEncoder.encode(region, "UTF-8") + "/" + URLEncoder.encode(name, "UTF-8") + "/"); - m.setDescription(StringUtils.substring(DataUtil.removeHtml(dis.getDescription()), 0, 55) + "……"); + m.setDescription(StringUtils.substring(DataUtil.removeHtml(dis.getDescription()), 0, 55) + "鈥︹��"); dsMsgs.add(m); TextImageMessage m2 = new TextImageMessage(); - m2.setTitle("立即估价>>"); + m2.setTitle("绔嬪嵆浼颁环>>"); m2.setPicUrl("http://static.fangjia.com/stc/wechat/gujia.png?t=" + new Date().getTime()); m2.setUrl("http://" + dCity.getName() + ".fangjia.com/wgujia/?evaluation.districtName=" + URLEncoder.encode(name, "UTF-8") + "&evaluation.houseNum=" @@ -1571,7 +1571,7 @@ public class WeixinController { postMessage.setArticles(dsMsgs); - // 保存用户位置 + // 淇濆瓨鐢ㄦ埛浣嶇疆 weixinUserLocationService.saveOrUpdate(receivedMessage.getFromUserName(), city, region, null, null, null); return postMessage.format(); } @@ -1580,7 +1580,7 @@ public class WeixinController { } if (null != knowbase.get("district_name")) { - // 解析出小区 + // 瑙f瀽鍑哄皬鍖� List> districtList = (List>) knowbase.get("district_name"); List ds = null; if (CollectionUtils.isNotEmpty(districtList)) { @@ -1639,7 +1639,7 @@ public class WeixinController { citys.add(d.getCity()); TextImageMessage m = new TextImageMessage(); - m.setTitle(d.getCity() + "市" + RegionData.getOrgName(d.getCity(), d.getRegion()) + d.getName()); + m.setTitle(d.getCity() + "甯�" + RegionData.getOrgName(d.getCity(), d.getRegion()) + d.getName()); String picUrl = picService.getDistrictPic(d); if (StringUtils.isNotBlank(picUrl)) { @@ -1650,9 +1650,9 @@ public class WeixinController { m.setUrl("http://" + dCity.getName() + ".fangjia.com/wxiaoqu/" + URLEncoder.encode(d.getRegion(), "UTF-8") + "/" + URLEncoder.encode(d.getName(), "UTF-8") + "/"); if (ds.size() == 1) { - m.setDescription(StringUtils.substring(DataUtil.removeHtml(d.getDescription()), 0, 55) + "……"); + m.setDescription(StringUtils.substring(DataUtil.removeHtml(d.getDescription()), 0, 55) + "鈥︹��"); - // 保存用户位置 + // 淇濆瓨鐢ㄦ埛浣嶇疆 weixinUserLocationService.saveOrUpdate(receivedMessage.getFromUserName(), d.getCity(), d.getRegion(), null, null, null); } @@ -1662,7 +1662,7 @@ public class WeixinController { if (dsMsgs.size() > 1) { TextImageMessage m = new TextImageMessage(); - m.setTitle("为您找到" + ds.size() + "个相关结果,您可以加上城市方便我们筛选:例如" + citys.iterator().next() + receivedContent); + m.setTitle("涓烘偍鎵惧埌" + ds.size() + "涓浉鍏崇粨鏋滐紝鎮ㄥ彲浠ュ姞涓婂煄甯傛柟渚挎垜浠瓫閫夛細渚嬪" + citys.iterator().next() + receivedContent); dsMsgs.add(m); } @@ -1672,7 +1672,7 @@ public class WeixinController { } if (null != knowbase.get("region")) { - // 区域 + // 鍖哄煙 city = knowbaseService.matchingCityDefaultNull(receivedContent); region = null; String[] infoArr = getRegion(knowbase, suggestCity); @@ -1685,24 +1685,24 @@ public class WeixinController { RegionStat regionStat = regionStatService.findRegionStat(city, region); if (null != regionStat) { StringBuilder postContentSb = new StringBuilder(); - postContentSb.append("截止").append(new SimpleDateFormat("yyyy年MM月dd日").format(regionStat.getWeekend())) - .append(",").append(city).append("市").append(RegionData.getOrgName(city, region)).append("二手房均价为:") - .append(regionStat.getAvgPrice()).append("元/平米,环比上周"); + postContentSb.append("鎴").append(new SimpleDateFormat("yyyy骞碝M鏈坉d鏃�").format(regionStat.getWeekend())) + .append("锛�").append(city).append("甯�").append(RegionData.getOrgName(city, region)).append("浜屾墜鎴垮潎浠蜂负锛�") + .append(regionStat.getAvgPrice()).append("鍏�/骞崇背锛岀幆姣斾笂鍛�"); BigDecimal bg = new BigDecimal(regionStat.getWeekendMarkup() / 100.0); double weekendMarkup = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); if (regionStat.getWeekendMarkup() > 0) { - postContentSb.append("上涨").append(weekendMarkup).append("%。"); + postContentSb.append("涓婃定").append(weekendMarkup).append("%銆�"); } else if (regionStat.getWeekendMarkup() < 0) { - postContentSb.append("下跌").append(Math.abs(weekendMarkup)).append("%。"); + postContentSb.append("涓嬭穼").append(Math.abs(weekendMarkup)).append("%銆�"); } else { - postContentSb.append("持平。"); + postContentSb.append("鎸佸钩銆�"); } PostTextMessage postMessage = new PostTextMessage(postContentSb.toString()); postMessage.setToUserName(receivedMessage.getFromUserName()); - // 保存用户位置 + // 淇濆瓨鐢ㄦ埛浣嶇疆 weixinUserLocationService.saveOrUpdate(receivedMessage.getFromUserName(), city, region, null, null, null); return postMessage.format(); } @@ -1710,31 +1710,31 @@ public class WeixinController { } if (null != knowbase.get("city")) { - // 城市 + // 鍩庡競 Map cityInfo = (Map) knowbase.get("city"); city = (String) cityInfo.get("value"); - if (city.equals(receivedContent) || StringUtils.contains(receivedContent, "房价") - || StringUtils.contains(receivedContent, "均价")) { + if (city.equals(receivedContent) || StringUtils.contains(receivedContent, "鎴夸环") + || StringUtils.contains(receivedContent, "鍧囦环")) { RegionStat cityStat = regionStatService.findByCity(city); if (null != cityStat) { StringBuilder postContentSb = new StringBuilder(); - postContentSb.append("截止").append(new SimpleDateFormat("yyyy年MM月dd日").format(cityStat.getWeekend())) - .append(",").append(city).append("二手房均价为:").append(cityStat.getAvgPrice()).append("元/平米,环比上周"); + postContentSb.append("鎴").append(new SimpleDateFormat("yyyy骞碝M鏈坉d鏃�").format(cityStat.getWeekend())) + .append("锛�").append(city).append("浜屾墜鎴垮潎浠蜂负锛�").append(cityStat.getAvgPrice()).append("鍏�/骞崇背锛岀幆姣斾笂鍛�"); BigDecimal bg = new BigDecimal(cityStat.getWeekendMarkup() / 100.0); double weekendMarkup = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); if (cityStat.getWeekendMarkup() > 0) { - postContentSb.append("上涨").append(weekendMarkup).append("%。"); + postContentSb.append("涓婃定").append(weekendMarkup).append("%銆�"); } else if (cityStat.getWeekendMarkup() < 0) { - postContentSb.append("下跌").append(Math.abs(weekendMarkup)).append("%。"); + postContentSb.append("涓嬭穼").append(Math.abs(weekendMarkup)).append("%銆�"); } else { - postContentSb.append("持平。"); + postContentSb.append("鎸佸钩銆�"); } PostTextMessage postMessage = new PostTextMessage(postContentSb.toString()); postMessage.setToUserName(receivedMessage.getFromUserName()); - // 保存用户位置 + // 淇濆瓨鐢ㄦ埛浣嶇疆 weixinUserLocationService.saveOrUpdate(receivedMessage.getFromUserName(), city, null, null, null, null); return postMessage.format(); } @@ -1778,7 +1778,7 @@ public class WeixinController { } /** - * 地址解析器处理 + * 鍦板潃瑙f瀽鍣ㄥ鐞� */ @SuppressWarnings("unchecked") private String processAddressParser(AddressResult addressResult, Map knowbase, @@ -1788,7 +1788,7 @@ public class WeixinController { return null; } - // 解析房子信息 + // 瑙f瀽鎴垮瓙淇℃伅 Object parseObj = parseDistrictAddressService.findAddressInfo(addressResult); if (null != parseObj && parseObj instanceof HouseLoudong) { Evaluation eva = houseLoudongService.loudongToEva((HouseLoudong) parseObj); @@ -1797,11 +1797,11 @@ public class WeixinController { String regionOrg = RegionData.getOrgName(city, region); String districtName = eva.getDistrictName(); - // 解析出楼栋信息,进行估价 + // 瑙f瀽鍑烘ゼ鏍嬩俊鎭紝杩涜浼颁环 eva.setSource("api_weixin"); eva = evaluationService.saveEvaluation(eva); if (null != eva.getTotalPrice() && eva.getTotalPrice() > 0) { - // 能估价,返回估价结果 + // 鑳戒及浠凤紝杩斿洖浼颁环缁撴灉 PostNewsMessage postMessage = new PostNewsMessage(); postMessage.setToUserName(receivedMessage.getFromUserName()); @@ -1811,12 +1811,12 @@ public class WeixinController { List dsMsgs = new ArrayList(1); StringBuilder postContentSb = new StringBuilder(); - postContentSb.append(eva.getHouseNum()).append("号").append(eva.getRoomNum()).append("室的估价结果为:") - .append((int) (eva.getTotalPrice() / 10000)).append("万元,当前小区均价为:").append(eva.getAvgPrice()) - .append("元/平米。"); + postContentSb.append(eva.getHouseNum()).append("鍙�").append(eva.getRoomNum()).append("瀹ょ殑浼颁环缁撴灉涓猴細") + .append((int) (eva.getTotalPrice() / 10000)).append("涓囧厓锛屽綋鍓嶅皬鍖哄潎浠蜂负锛�").append(eva.getAvgPrice()) + .append("鍏�/骞崇背銆�"); TextImageMessage m = new TextImageMessage(); - m.setTitle(city + "市" + regionOrg + districtName); + m.setTitle(city + "甯�" + regionOrg + districtName); m.setDescription(postContentSb.toString()); String picUrl = picService.getDistrictPic(dis); @@ -1830,12 +1830,12 @@ public class WeixinController { dsMsgs.add(m); postMessage.setArticles(dsMsgs); - // 保存用户位置 + // 淇濆瓨鐢ㄦ埛浣嶇疆 weixinUserLocationService.saveOrUpdate(receivedMessage.getFromUserName(), city, region, null, null, null); return postMessage.format(); } else { - // 不能估价, 返回小区信息 + // 涓嶈兘浼颁环锛� 杩斿洖灏忓尯淇℃伅 PostNewsMessage postMessage = new PostNewsMessage(); postMessage.setToUserName(receivedMessage.getFromUserName()); @@ -1846,7 +1846,7 @@ public class WeixinController { List dsMsgs = new ArrayList(2); TextImageMessage m = new TextImageMessage(); - m.setTitle(city + "市" + RegionData.getOrgName(city, region) + districtName); + m.setTitle(city + "甯�" + RegionData.getOrgName(city, region) + districtName); String picUrl = picService.getDistrictPic(dis); if (StringUtils.isNotBlank(picUrl)) { @@ -1856,11 +1856,11 @@ public class WeixinController { } m.setUrl("http://" + dCity.getName() + ".fangjia.com/wxiaoqu/" + URLEncoder.encode(region, "UTF-8") + "/" + URLEncoder.encode(districtName, "UTF-8") + "/"); - m.setDescription(StringUtils.substring(DataUtil.removeHtml(dis.getDescription()), 0, 55) + "……"); + m.setDescription(StringUtils.substring(DataUtil.removeHtml(dis.getDescription()), 0, 55) + "鈥︹��"); dsMsgs.add(m); TextImageMessage m2 = new TextImageMessage(); - m2.setTitle("立即估价>>"); + m2.setTitle("绔嬪嵆浼颁环>>"); m2.setPicUrl("http://static.fangjia.com/stc/wechat/gujia.png?t=" + new Date().getTime()); m2.setUrl("http://" + dCity.getName() + ".fangjia.com/wgujia/?evaluation.districtName=" + URLEncoder.encode(districtName, "UTF-8") + "&evaluation.houseNum=" @@ -1870,7 +1870,7 @@ public class WeixinController { postMessage.setArticles(dsMsgs); - // 保存用户位置 + // 淇濆瓨鐢ㄦ埛浣嶇疆 weixinUserLocationService.saveOrUpdate(receivedMessage.getFromUserName(), city, region, null, null, null); return postMessage.format(); @@ -1878,7 +1878,7 @@ public class WeixinController { } } - // 没有解析出楼栋信息 + // 娌℃湁瑙f瀽鍑烘ゼ鏍嬩俊鎭� if (null != parseObj && parseObj instanceof List) { String suggestCity = addressResult.getCity(); if (StringUtils.isBlank(suggestCity)) { @@ -1887,12 +1887,12 @@ public class WeixinController { suggestCity = location.getCity(); } } else { - // 保存用户位置 + // 淇濆瓨鐢ㄦ埛浣嶇疆 weixinUserLocationService.saveOrUpdate(receivedMessage.getFromUserName(), suggestCity, addressResult.getRegion(), null, null, null); } - // 解析到小区 + // 瑙f瀽鍒板皬鍖� List ds = (List) parseObj; if (CollectionUtils.isNotEmpty(ds)) { if (StringUtils.isNotBlank(suggestCity)) { @@ -1938,7 +1938,7 @@ public class WeixinController { citys.add(d.getCity()); TextImageMessage m = new TextImageMessage(); - m.setTitle(d.getCity() + "市" + RegionData.getOrgName(d.getCity(), d.getRegion()) + d.getName()); + m.setTitle(d.getCity() + "甯�" + RegionData.getOrgName(d.getCity(), d.getRegion()) + d.getName()); String picUrl = picService.getDistrictPic(d); if (StringUtils.isNotBlank(picUrl)) { @@ -1949,9 +1949,9 @@ public class WeixinController { m.setUrl("http://" + dCity.getName() + ".fangjia.com/wxiaoqu/" + URLEncoder.encode(d.getRegion(), "UTF-8") + "/" + URLEncoder.encode(d.getName(), "UTF-8") + "/"); if (ds.size() == 1) { - m.setDescription(StringUtils.substring(DataUtil.removeHtml(d.getDescription()), 0, 55) + "……"); + m.setDescription(StringUtils.substring(DataUtil.removeHtml(d.getDescription()), 0, 55) + "鈥︹��"); - // 保存用户位置 + // 淇濆瓨鐢ㄦ埛浣嶇疆 weixinUserLocationService.saveOrUpdate(receivedMessage.getFromUserName(), d.getCity(), d.getRegion(), null, null, null); } @@ -1961,7 +1961,7 @@ public class WeixinController { if (dsMsgs.size() > 1) { TextImageMessage m = new TextImageMessage(); - m.setTitle("为您找到" + ds.size() + "个相关结果,您可以加上城市方便我们筛选:例如" + citys.iterator().next() + receivedContent); + m.setTitle("涓烘偍鎵惧埌" + ds.size() + "涓浉鍏崇粨鏋滐紝鎮ㄥ彲浠ュ姞涓婂煄甯傛柟渚挎垜浠瓫閫夛細渚嬪" + citys.iterator().next() + receivedContent); dsMsgs.add(m); } @@ -1971,7 +1971,7 @@ public class WeixinController { } if (StringUtils.isNotBlank(addressResult.getRegion())) { - // 区域 + // 鍖哄煙 String city = addressResult.getCity(); String region = addressResult.getRegion(); @@ -1979,24 +1979,24 @@ public class WeixinController { RegionStat regionStat = regionStatService.findRegionStat(city, region); if (null != regionStat) { StringBuilder postContentSb = new StringBuilder(); - postContentSb.append("截止").append(new SimpleDateFormat("yyyy年MM月dd日").format(regionStat.getWeekend())) - .append(",").append(city).append("市").append(RegionData.getOrgName(city, region)).append("二手房均价为:") - .append(regionStat.getAvgPrice()).append("元/平米,环比上周"); + postContentSb.append("鎴").append(new SimpleDateFormat("yyyy骞碝M鏈坉d鏃�").format(regionStat.getWeekend())) + .append("锛�").append(city).append("甯�").append(RegionData.getOrgName(city, region)).append("浜屾墜鎴垮潎浠蜂负锛�") + .append(regionStat.getAvgPrice()).append("鍏�/骞崇背锛岀幆姣斾笂鍛�"); BigDecimal bg = new BigDecimal(regionStat.getWeekendMarkup() / 100.0); double weekendMarkup = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); if (regionStat.getWeekendMarkup() > 0) { - postContentSb.append("上涨").append(weekendMarkup).append("%。"); + postContentSb.append("涓婃定").append(weekendMarkup).append("%銆�"); } else if (regionStat.getWeekendMarkup() < 0) { - postContentSb.append("下跌").append(Math.abs(weekendMarkup)).append("%。"); + postContentSb.append("涓嬭穼").append(Math.abs(weekendMarkup)).append("%銆�"); } else { - postContentSb.append("持平。"); + postContentSb.append("鎸佸钩銆�"); } PostTextMessage postMessage = new PostTextMessage(postContentSb.toString()); postMessage.setToUserName(receivedMessage.getFromUserName()); - // 保存用户位置 + // 淇濆瓨鐢ㄦ埛浣嶇疆 weixinUserLocationService.saveOrUpdate(receivedMessage.getFromUserName(), city, region, null, null, null); return postMessage.format(); } @@ -2004,30 +2004,30 @@ public class WeixinController { } if (StringUtils.isNotBlank(addressResult.getCity())) { - // 城市 + // 鍩庡競 String city = addressResult.getCity(); - if (city.equals(receivedContent) || StringUtils.contains(receivedContent, "房价") - || StringUtils.contains(receivedContent, "均价")) { + if (city.equals(receivedContent) || StringUtils.contains(receivedContent, "鎴夸环") + || StringUtils.contains(receivedContent, "鍧囦环")) { RegionStat cityStat = regionStatService.findByCity(city); if (null != cityStat) { StringBuilder postContentSb = new StringBuilder(); - postContentSb.append("截止").append(new SimpleDateFormat("yyyy年MM月dd日").format(cityStat.getWeekend())) - .append(",").append(city).append("二手房均价为:").append(cityStat.getAvgPrice()).append("元/平米,环比上周"); + postContentSb.append("鎴").append(new SimpleDateFormat("yyyy骞碝M鏈坉d鏃�").format(cityStat.getWeekend())) + .append("锛�").append(city).append("浜屾墜鎴垮潎浠蜂负锛�").append(cityStat.getAvgPrice()).append("鍏�/骞崇背锛岀幆姣斾笂鍛�"); BigDecimal bg = new BigDecimal(cityStat.getWeekendMarkup() / 100.0); double weekendMarkup = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); if (cityStat.getWeekendMarkup() > 0) { - postContentSb.append("上涨").append(weekendMarkup).append("%。"); + postContentSb.append("涓婃定").append(weekendMarkup).append("%銆�"); } else if (cityStat.getWeekendMarkup() < 0) { - postContentSb.append("下跌").append(Math.abs(weekendMarkup)).append("%。"); + postContentSb.append("涓嬭穼").append(Math.abs(weekendMarkup)).append("%銆�"); } else { - postContentSb.append("持平。"); + postContentSb.append("鎸佸钩銆�"); } PostTextMessage postMessage = new PostTextMessage(postContentSb.toString()); postMessage.setToUserName(receivedMessage.getFromUserName()); - // 保存用户位置 + // 淇濆瓨鐢ㄦ埛浣嶇疆 weixinUserLocationService.saveOrUpdate(receivedMessage.getFromUserName(), city, null, null, null, null); return postMessage.format(); } @@ -2038,8 +2038,8 @@ public class WeixinController { } private String doOther(String content) { - String reg0 = "^周边.*房价.*"; - String reg1 = "^周边.*均价.*"; + String reg0 = "^鍛ㄨ竟.*鎴夸环.*"; + String reg1 = "^鍛ㄨ竟.*鍧囦环.*"; List replys = weixinReplyService.findAll(); if (CollectionUtils.isEmpty(replys)) { return null; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/WeixinTaskController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/WeixinTaskController.java index 4205396e5..b0b15e346 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/WeixinTaskController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/WeixinTaskController.java @@ -40,7 +40,7 @@ public class WeixinTaskController { private IpAddressService ipAddressService; /** - * 获取填写列表 + * 鑾峰彇濉啓鍒楄〃 * * @param model * @return @@ -48,13 +48,13 @@ public class WeixinTaskController { */ public Object listAction(WeixinTaskModel model, HttpServletRequest request) throws Exception { - // 通过微信菜单进入时会传一个code + // 閫氳繃寰俊鑿滃崟杩涘叆鏃朵細浼犱竴涓猚ode String code = request.getParameter("code"); - // 每次从微信点击链接进入时会有一个openId + // 姣忔浠庡井淇$偣鍑婚摼鎺ヨ繘鍏ユ椂浼氭湁涓�涓猳penId String openId = request.getParameter("openId"); - // 用户id + // 鐢ㄦ埛id String userId = request.getParameter("userId"); if (openId != null) { @@ -69,10 +69,10 @@ public class WeixinTaskController { userId = "web"; } - // 获取用户所在城市信息 + // 鑾峰彇鐢ㄦ埛鎵�鍦ㄥ煄甯備俊鎭� String searchCity = request.getParameter("searchCity"); - // 如果没有查询城市则显示用户最近一次登录时选择的城市 + // 濡傛灉娌℃湁鏌ヨ鍩庡競鍒欐樉绀虹敤鎴锋渶杩戜竴娆$櫥褰曟椂閫夋嫨鐨勫煄甯� if (null == searchCity || "".equals(searchCity)) { WeixinTaskUser weixinTaskUser = weixinTaskUserService.findWeixinTaskUserByUserId(userId); searchCity = weixinTaskUser.getCity(); @@ -100,7 +100,7 @@ public class WeixinTaskController { } /** - * 跳转到填写页面 + * 璺宠浆鍒板~鍐欓〉闈� * * @param model * @return @@ -118,28 +118,28 @@ public class WeixinTaskController { model.setWriteStatus(writeStatusEnum.UNWRITE.getValue()); } else if (writeEnum.WRITE.getValue().equals(status)) { taskResult = taskService.findTaskResultByWorkerAndTaskId(userId, taskId); - //如果处理完成,则不可编辑 + //濡傛灉澶勭悊瀹屾垚锛屽垯涓嶅彲缂栬緫 if(TaskStatusEnum.SUC.getValue() == task.getStatus()){ model.setWriteStatus(writeStatusEnum.FINISH.getValue()); }else{ model.setWriteStatus(writeStatusEnum.WRITE.getValue()); } } - //计算当前日期的前一天,预留一天做审核 + //璁$畻褰撳墠鏃ユ湡鐨勫墠涓�澶╋紝棰勭暀涓�澶╁仛瀹℃牳 task.setDeadline(DateCalculationUtils.getOneDayBefore(task.getDeadline())); int days = DateCalculationUtils.daysBetween(new Date(),task.getDeadline()); model.setTask(task); model.setTaskResult(taskResult); model.setUserId(userId); model.setTaskId(taskId); - //需要预留一天进行审核工作 + //闇�瑕侀鐣欎竴澶╄繘琛屽鏍稿伐浣� model.setLeaveDays(days-1); model.setStatus(status); return model; } /** - * 任务填写提交 + * 浠诲姟濉啓鎻愪氦 * * @param model * @throws Exception @@ -149,7 +149,7 @@ public class WeixinTaskController { TaskResult taskResult = taskService.findTaskResultByWorkerAndTaskId(model.getUserId(), model.getTaskId()); if(null != taskResult){ - //修改内容 + //淇敼鍐呭 BasicDBObject obj = new BasicDBObject(); obj.append("property", model.getProperty()); @@ -164,7 +164,7 @@ public class WeixinTaskController { resultObj.put("dateModified", new Date()); taskService.updateTaskResult(taskResult.getId(), resultObj); }else{ - //新增taskResult + //鏂板taskResult taskResult = new TaskResult(); BasicDBObject obj = new BasicDBObject(); @@ -196,7 +196,7 @@ public class WeixinTaskController { } /** - * 跳转到选择城市页面 + * 璺宠浆鍒伴�夋嫨鍩庡競椤甸潰 * * @param model * @return @@ -205,7 +205,7 @@ public class WeixinTaskController { String userId = model.getUserId(); String searchCity = model.getSearchCity(); List serverAreaList = serverAreaService.findAllBySortByName(); - //从数据库取热门城市 + //浠庢暟鎹簱鍙栫儹闂ㄥ煄甯� List hotServerAreaList = new ArrayList(); for(ServerArea serverArea : serverAreaList){ if(CityGradeEnum.ONE.value() == serverArea.getCityGrade()){ @@ -220,7 +220,7 @@ public class WeixinTaskController { } /** - * 城市查询数据 + * 鍩庡競鏌ヨ鏁版嵁 * * @param model * @return @@ -239,7 +239,7 @@ public class WeixinTaskController { } /** - * 用户进行注册 说明:进入到注册页面的用户肯定是没有进行过注册的 + * 鐢ㄦ埛杩涜娉ㄥ唽 璇存槑锛氳繘鍏ュ埌娉ㄥ唽椤甸潰鐨勭敤鎴疯偗瀹氭槸娌℃湁杩涜杩囨敞鍐岀殑 * * @param model * @param request @@ -256,7 +256,7 @@ public class WeixinTaskController { } /** - * 保存微信用户申请信息 + * 淇濆瓨寰俊鐢ㄦ埛鐢宠淇℃伅 * * @param model * @param request @@ -275,7 +275,7 @@ public class WeixinTaskController { } /** - * 第一次进入判断进那个页面 + * 绗竴娆¤繘鍏ュ垽鏂繘閭d釜椤甸潰 * * @param model * @param request @@ -302,7 +302,7 @@ public class WeixinTaskController { } /** - * 获取审核列表页面 + * 鑾峰彇瀹℃牳鍒楄〃椤甸潰 * @param model * @param request * @return @@ -321,7 +321,7 @@ public class WeixinTaskController { } /** - * 跳转到联系我们页面 + * 璺宠浆鍒拌仈绯绘垜浠〉闈� * @param model * @param request * @return diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/WithHoldController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/WithHoldController.java index d06c2ee74..b9874bcc4 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/WithHoldController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/WithHoldController.java @@ -37,7 +37,7 @@ public class WithHoldController { } /** - * 易宝代扣回调接口 + * 鏄撳疂浠f墸鍥炶皟鎺ュ彛 * @author xuhe * @param model * @param request @@ -50,7 +50,7 @@ public class WithHoldController { } Map jsonMap=null; try { - //开始解密 + //寮�濮嬭В瀵� DigitalEnvelopeDTO dto = new DigitalEnvelopeDTO(); dto.setCipherText(responseMsg); PrivateKey privateKey = InternalConfig.getISVPrivateKey(CertTypeEnum.RSA2048); @@ -72,7 +72,7 @@ public class WithHoldController { if(StringUtils.isNotBlank(yborderid)){ LoanWithHold loanWithHold = loanWithHoldService.findByParam(null,yborderid,null); if(loanWithHold!=null){ - //订单状态 0-等待代扣,1-代扣成功,2-代扣失败,3-处理中,4-超时失败,5-系统异常 + //璁㈠崟鐘舵�� 0-绛夊緟浠f墸,1-浠f墸鎴愬姛,2-浠f墸澶辫触,3-澶勭悊涓�,4-瓒呮椂澶辫触,5-绯荤粺寮傚父 if("PAY_SUCCESS".equals(status)){ loanWithHold.setStatus(1); loanWithHold.setFinishTime(new Date()); @@ -80,7 +80,7 @@ public class WithHoldController { loanWithHold.setStatus(2); }else if("TIME_OUT".equals(status)){ loanWithHold.setStatus(4); - }else{ //默认代扣失败 + }else{ //榛樿浠f墸澶辫触 loanWithHold.setStatus(2); } loanWithHold.setErrorMsg(errormsg);; @@ -113,7 +113,7 @@ public class WithHoldController { private Map parseResponse(String yopresponse){ Map jsonMap = new HashMap(); jsonMap = JSON.parseObject(yopresponse, new TypeReference>() {}); - System.out.println("将结果yopresponse转化为map格式之后: "+jsonMap); + System.out.println("灏嗙粨鏋測opresponse杞寲涓簃ap鏍煎紡涔嬪悗: "+jsonMap); return jsonMap; } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ZimoOfficeController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ZimoOfficeController.java index e414d07e9..3dcdaa69e 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ZimoOfficeController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ZimoOfficeController.java @@ -33,7 +33,7 @@ public class ZimoOfficeController { /** - * 办公室搜索 + * 鍔炲叕瀹ゆ悳绱� * * @return */ @@ -42,7 +42,7 @@ public class ZimoOfficeController { mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "写字楼所在城市必须输入")); + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "鍐欏瓧妤兼墍鍦ㄥ煄甯傚繀椤昏緭鍏�")); return mav; } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ZyFshController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ZyFshController.java index bc593d880..b51885d52 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ZyFshController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ZyFshController.java @@ -90,88 +90,88 @@ public class ZyFshController { private static final Map PROPERTY_TYPES = new HashMap() { { - put(null, "普通住宅"); - put("0", "普通住宅"); - put("1", "别墅"); - put("2", "商住"); + put(null, "鏅�氫綇瀹�"); + put("0", "鏅�氫綇瀹�"); + put("1", "鍒"); + put("2", "鍟嗕綇"); } }; private static final Map DIRECTION = new HashMap() { { - put(null, "南"); - put("1", "西南"); - put("2", "东南"); - put("3", "南"); - put("4", "西北"); - put("5", "东北"); - put("6", "东"); - put("7", "西"); - put("8", "北"); - put("9", "东西"); - put("10", "南北"); + put(null, "鍗�"); + put("1", "瑗垮崡"); + put("2", "涓滃崡"); + put("3", "鍗�"); + put("4", "瑗垮寳"); + put("5", "涓滃寳"); + put("6", "涓�"); + put("7", "瑗�"); + put("8", "鍖�"); + put("9", "涓滆タ"); + put("10", "鍗楀寳"); } }; private static final Map FITMENT = new HashMap() { { - put(null, "简装"); - put("1", "毛坯"); - put("2", "简装"); - put("3", "精装"); - put("4", "豪装"); + put(null, "绠�瑁�"); + put("1", "姣涘澂"); + put("2", "绠�瑁�"); + put("3", "绮捐"); + put("4", "璞"); } }; private static final Map EVALUATION_MODEL_FITMENT = new HashMap(){ { - put(null, "简单装修"); - put("简装", "简单装修"); - put("毛坯", "毛坯"); - put("精装", "精装修"); - put("豪装", "豪华装修"); + put(null, "绠�鍗曡淇�"); + put("绠�瑁�", "绠�鍗曡淇�"); + put("姣涘澂", "姣涘澂"); + put("绮捐", "绮捐淇�"); + put("璞", "璞崕瑁呬慨"); } }; private static final Map SIGHT = new HashMap() { { - put(null, "一般"); - put("1", "景观房"); - put("2", "侧景观房"); - put("3", "一般"); - put("4", "差"); + put(null, "涓�鑸�"); + put("1", "鏅鎴�"); + put("2", "渚ф櫙瑙傛埧"); + put("3", "涓�鑸�"); + put("4", "宸�"); } }; private static final Map NOISE = new HashMap() { { - put(null, "无噪音"); - put("0", "无噪音"); - put("1", "噪音较小"); - put("2", "噪音大"); + put(null, "鏃犲櫔闊�"); + put("0", "鏃犲櫔闊�"); + put("1", "鍣煶杈冨皬"); + put("2", "鍣煶澶�"); } }; private static final Map FACILITIES = new HashMap() { { - put("0", "健身房"); - put("1", "游泳池"); - put("2", "会所"); - put("3", "网球场"); - put("4", "球场"); - put("5", "棋牌室"); - put("6", "停车场"); - put("7", "图书馆"); - put("8", "活动中心"); + put("0", "鍋ヨ韩鎴�"); + put("1", "娓告吵姹�"); + put("2", "浼氭墍"); + put("3", "缃戠悆鍦�"); + put("4", "鐞冨満"); + put("5", "妫嬬墝瀹�"); + put("6", "鍋滆溅鍦�"); + put("7", "鍥句功棣�"); + put("8", "娲诲姩涓績"); } }; private static final Map NEGATIVE_FACTOR = new HashMap() { { - put(null, "无"); - put("1", "很近"); - put("2", "较近"); - put("3", "无"); + put(null, "鏃�"); + put("1", "寰堣繎"); + put("2", "杈冭繎"); + put("3", "鏃�"); } }; @@ -234,7 +234,7 @@ public class ZyFshController { } /** - * 评估小区 + * 璇勪及灏忓尯 * @param model * @param request * @return @@ -244,11 +244,11 @@ public class ZyFshController { mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getName()) || StringUtils.isBlank(model.getDistrict()) || model.getSize() <= 0) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:城市,区域,小区名,面积(size)为必填项")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:鍩庡競,鍖哄煙,灏忓尯鍚�,闈㈢Н(size)涓哄繀濉」")); return mav; } - if(model.getCity().endsWith("市")){ - model.setCity(model.getCity().replaceAll("市$", "")); + if(model.getCity().endsWith("甯�")){ + model.setCity(model.getCity().replaceAll("甯�$", "")); } if(StringUtils.isNotBlank(request.getParameter("calDate"))){ Date calDate = null; @@ -258,42 +258,42 @@ public class ZyFshController { } if(calDate == null){ - mav.setModel(BasicModel.buildBadRequestModel("calDate:数据类型不合法")); + mav.setModel(BasicModel.buildBadRequestModel("calDate:鏁版嵁绫诲瀷涓嶅悎娉�")); return mav; }else{ model.setCalDate(calDate); } } - /*先到CPDB库中查找小区*/ + /*鍏堝埌CPDB搴撲腑鏌ユ壘灏忓尯*/ District district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(), "district"); if(district == null){ - mav.setModel(BasicModel.buildBadRequestModel("该小区不存在")); + mav.setModel(BasicModel.buildBadRequestModel("璇ュ皬鍖轰笉瀛樺湪")); return mav; } model.setName(district.getName()); if (model.getCarportPrice() != null && (model.getCarportPrice() < 0 || model.getCarportPrice() > 1000000)) { - mav.setModel(BasicModel.buildBadRequestModel("carportPrice(车位)取值不合法")); + mav.setModel(BasicModel.buildBadRequestModel("carportPrice(杞︿綅)鍙栧�间笉鍚堟硶")); return mav; } if(model.getMaxFloor() != null && (model.getMaxFloor() <= 0 || model.getMaxFloor() > 59)){ - mav.setModel(BasicModel.buildBadRequestModel("maxFloor取值非法,正确范围[1,60)")); + mav.setModel(BasicModel.buildBadRequestModel("maxFloor鍙栧�奸潪娉�,姝g‘鑼冨洿[1,60)")); return mav; } if(model.getFloor() != null && (model.getFloor() <= 0 || model.getFloor() > 59)){ - mav.setModel(BasicModel.buildBadRequestModel("floor取值非法,正确范围[1,60)")); + mav.setModel(BasicModel.buildBadRequestModel("floor鍙栧�奸潪娉�,姝g‘鑼冨洿[1,60)")); return mav; } if(model.getMaxFloor() != null && model.getFloor() != null && model.getFloor() > model.getMaxFloor()){ - mav.setModel(BasicModel.buildBadRequestModel("所在楼层不能大于总楼层")); + mav.setModel(BasicModel.buildBadRequestModel("鎵�鍦ㄦゼ灞備笉鑳藉ぇ浜庢�绘ゼ灞�")); return mav; } model.setRegion(district.getRegion()); model.setDistrictName(district.getName()); if (StringUtils.isBlank(model.getPropertyType())) { - if (district.getEstateType2() != null && district.getEstateType2().contains("别墅")) { + if (district.getEstateType2() != null && district.getEstateType2().contains("鍒")) { model.setPropertyType("1"); } } @@ -307,7 +307,7 @@ public class ZyFshController { } else { model.setCalDate(DateUtil.getFirstDayOfWeek(new Date())); } - //判断是否需要取最近一次均价时间 + //鍒ゆ柇鏄惁闇�瑕佸彇鏈�杩戜竴娆″潎浠锋椂闂� if(StringUtils.isNotBlank(request.getParameter("nearestAvgPriceTime"))){ boolean flag = Boolean.parseBoolean(request.getParameter("nearestAvgPriceTime")); if(flag){ @@ -325,11 +325,11 @@ public class ZyFshController { districtPriceMap.put("avgPrice", evaluation.getAvgPrice()); districtPriceMap.put("estateType", district.getEstateType2()); - //判断是否需要取最近一次均价时间 + //鍒ゆ柇鏄惁闇�瑕佸彇鏈�杩戜竴娆″潎浠锋椂闂� if(StringUtils.isNotBlank(request.getParameter("evalAgain"))){ boolean flag = Boolean.parseBoolean(request.getParameter("evalAgain")); if(flag){ - //流动性评级 + //娴佸姩鎬ц瘎绾� EvaluationBeforeLoanDto dto = new EvaluationBeforeLoanDto(); CollateralEvaluationInfoModel collModel = new CollateralEvaluationInfoModel(); collModel.setCity(model.getCity()); @@ -342,16 +342,16 @@ public class ZyFshController { dto.setTotalPrice((long)evaluation.getTotalPrice()); DistrictKey key = new DistrictKey(model.getCity(), model.getDistrict(), model.getName()); DistrictAnalyData districtAnalyData = districtAnalyDataService.findByDistrictKey(key); - //处置难易度 + //澶勭疆闅炬槗搴� double totalScore = buildHandleLevel(dto, collModel, districtAnalyData, district); districtPriceMap.put("totalScore", totalScore); - //城市相对最高和相对最低 + //鍩庡競鐩稿鏈�楂樺拰鐩稿鏈�浣� Map cityDistriceMinAndMaxPrice = districtStatService.getCityDistriceMinAndMaxPricePds(model.getCity()); Integer minS = cityDistriceMinAndMaxPrice.get("cityDistrictMinSellPrice"); Integer maxS = cityDistriceMinAndMaxPrice.get("cityDistrictMaxSellPrice"); districtPriceMap.put("cityDistrictMinSellPrice", minS); districtPriceMap.put("cityDistrictMaxSellPrice", maxS); - //涨跌幅在城市中排名 + //娑ㄨ穼骞呭湪鍩庡競涓帓鍚� Double increaseRate = 0d; if(districtAnalyData!=null){ if(districtAnalyData.getYoyCityRank() == null || districtAnalyData.getYoyCityTotal() == null) { @@ -363,7 +363,7 @@ public class ZyFshController { } } } - //没有小区年涨幅的时候用区域的代替 + //娌℃湁灏忓尯骞存定骞呯殑鏃跺�欑敤鍖哄煙鐨勪唬鏇� if (increaseRate.equals(0D)) { Double regionYoy = regionRiseAndDownNew(dto, collModel); if (regionYoy > 0) { @@ -371,9 +371,9 @@ public class ZyFshController { } } - //还没的话就用均价相似小区的代替 + //杩樻病鐨勮瘽灏辩敤鍧囦环鐩镐技灏忓尯鐨勪唬鏇� if (increaseRate.equals(0D)) { - //小区均价的80%-120%取均价最相近的小区 + //灏忓尯鍧囦环鐨�80%-120%鍙栧潎浠锋渶鐩歌繎鐨勫皬鍖� List dataList = districtAnalyDataService.findSimilarDistrict(collModel.getCity(),collModel.getDistrict(),(int)(dto.getAvgPrice()*0.8),(int)(dto.getAvgPrice()*1.2)); orderDistrictDataList(dataList,dto.getAvgPrice()); if (dataList != null && dataList.size() > 0) { @@ -385,7 +385,7 @@ public class ZyFshController { } districtPriceMap.put("upDownRangecityLevel", increaseRate < 0 ? 0 : increaseRate); - //价格排名 + //浠锋牸鎺掑悕 buildPriceRate(dto,collModel,districtAnalyData,districtPriceMap); } } @@ -393,13 +393,13 @@ public class ZyFshController { return mav; } else { evaluationService.remove(evaluation.getId()); - mav.setModel(BasicModel.buildOKModel().setMsg("暂时不支持该小区的估价").markNoData()); + mav.setModel(BasicModel.buildOKModel().setMsg("鏆傛椂涓嶆敮鎸佽灏忓尯鐨勪及浠�").markNoData()); return mav; } } /** - * 评估小区流动性评级等信息 + * 璇勪及灏忓尯娴佸姩鎬ц瘎绾х瓑淇℃伅 * @param model * @param request * @return @@ -409,11 +409,11 @@ public class ZyFshController { mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getName()) || StringUtils.isBlank(model.getDistrict()) || model.getSize() <= 0) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:城市,区域,小区名,面积(size)为必填项")); + mav.setModel(BasicModel.buildBadRequestModel("鍙傛暟闈炴硶:鍩庡競,鍖哄煙,灏忓尯鍚�,闈㈢Н(size)涓哄繀濉」")); return mav; } - if(model.getCity().endsWith("市")){ - model.setCity(model.getCity().replaceAll("市$", "")); + if(model.getCity().endsWith("甯�")){ + model.setCity(model.getCity().replaceAll("甯�$", "")); } if(StringUtils.isNotBlank(request.getParameter("calDate"))){ Date calDate = null; @@ -423,21 +423,21 @@ public class ZyFshController { } if(calDate == null){ - mav.setModel(BasicModel.buildBadRequestModel("calDate:数据类型不合法")); + mav.setModel(BasicModel.buildBadRequestModel("calDate:鏁版嵁绫诲瀷涓嶅悎娉�")); return mav; }else{ model.setCalDate(calDate); } } - /*先到CPDB库中查找小区*/ + /*鍏堝埌CPDB搴撲腑鏌ユ壘灏忓尯*/ District district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(), "district"); if(district == null){ - mav.setModel(BasicModel.buildBadRequestModel("该小区不存在")); + mav.setModel(BasicModel.buildBadRequestModel("璇ュ皬鍖轰笉瀛樺湪")); return mav; } model.setName(district.getName()); Map districtPriceMap = new HashMap(); - //流动性评级 + //娴佸姩鎬ц瘎绾� EvaluationBeforeLoanDto dto = new EvaluationBeforeLoanDto(); CollateralEvaluationInfoModel collModel = new CollateralEvaluationInfoModel(); collModel.setCity(model.getCity()); @@ -445,29 +445,29 @@ public class ZyFshController { collModel.setName(model.getName()); collModel.setSize((double)model.getSize()); collModel.setToken(model.getToken()); - //加载总价 + //鍔犺浇鎬讳环 if(StringUtils.isNotBlank(request.getParameter("totalPrice"))){ dto.setTotalPrice(Long.parseLong(request.getParameter("totalPrice"))); } - //加载均价 + //鍔犺浇鍧囦环 if(StringUtils.isNotBlank(request.getParameter("price"))){ dto.setAvgPrice(Integer.parseInt(request.getParameter("price"))); } DistrictKey key = new DistrictKey(model.getCity(), model.getDistrict(), model.getName()); DistrictAnalyData districtAnalyData = districtAnalyDataService.findByDistrictKey(key); - //处置难易度 + //澶勭疆闅炬槗搴� double totalScore = buildHandleLevel(dto, collModel, districtAnalyData, district); districtPriceMap.put("totalScore", totalScore); - //城市相对最高和相对最低 + //鍩庡競鐩稿鏈�楂樺拰鐩稿鏈�浣� Map cityDistriceMinAndMaxPrice = districtStatService.getCityDistriceMinAndMaxPricePds(model.getCity()); Integer minS = cityDistriceMinAndMaxPrice.get("cityDistrictMinSellPrice"); Integer maxS = cityDistriceMinAndMaxPrice.get("cityDistrictMaxSellPrice"); districtPriceMap.put("cityDistrictMinSellPrice", minS); districtPriceMap.put("cityDistrictMaxSellPrice", maxS); - //涨跌幅在城市中排名 + //娑ㄨ穼骞呭湪鍩庡競涓帓鍚� Double increaseRate = 0d; if(districtAnalyData==null){ - //小区均价的80%-120%取均价最相近的小区 + //灏忓尯鍧囦环鐨�80%-120%鍙栧潎浠锋渶鐩歌繎鐨勫皬鍖� List dataList = districtAnalyDataService.findSimilarDistrict(collModel.getCity(),collModel.getDistrict(),(int)(dto.getAvgPrice()*0.8),(int)(dto.getAvgPrice()*1.2)); orderDistrictDataList(dataList,dto.getAvgPrice()); //Double regionYoy = regionRiseAndDownNew(dto, collModel); @@ -482,14 +482,14 @@ public class ZyFshController { } } districtPriceMap.put("upDownRangecityLevel", increaseRate); - //价格排名 + //浠锋牸鎺掑悕 buildPriceRate(dto,collModel,districtAnalyData,districtPriceMap); mav.setModel(BasicModel.buildOKModel().setResult(districtPriceMap)); return mav; } /** - * 取均价最相近的小区排序 + * 鍙栧潎浠锋渶鐩歌繎鐨勫皬鍖烘帓搴� * @param list * @param avgPrice */ @@ -505,7 +505,7 @@ public class ZyFshController { }); } /** - * 查找小区标签 + * 鏌ユ壘灏忓尯鏍囩 * @param districtTagModel * @return */ @@ -513,15 +513,15 @@ public class ZyFshController { RestfulModelAndView mav = new RestfulModelAndView(); if (StringUtils.isBlank(districtTagModel.getCity())) { - mav.setModel(BasicModel.buildBadRequestModel("城市不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍩庡競涓嶈兘涓虹┖")); return mav; } if (StringUtils.isBlank(districtTagModel.getDistrict())) { - mav.setModel(BasicModel.buildBadRequestModel("区域不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍖哄煙涓嶈兘涓虹┖")); return mav; } if (StringUtils.isBlank(districtTagModel.getName())) { - mav.setModel(BasicModel.buildBadRequestModel("名称不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("鍚嶇О涓嶈兘涓虹┖")); return mav; } @@ -538,7 +538,7 @@ public class ZyFshController { /** - * 获取房生活均价排名 + * 鑾峰彇鎴跨敓娲诲潎浠锋帓鍚� * @author xuhe * @param model * @param request @@ -549,17 +549,17 @@ public class ZyFshController { EvaluationBeforeLoanDto dto = new EvaluationBeforeLoanDto(); /*District district = districtService.findDistrict(new DistrictKey(model.getCity(), model.getDistrict(), model.getName()), "district"); if (district == null) { - mav.setModel(BasicModel.buildBadRequestModel("小区不存在")); + mav.setModel(BasicModel.buildBadRequestModel("灏忓尯涓嶅瓨鍦�")); return mav; }*/ - //封装价格走势信息 + //灏佽浠锋牸璧板娍淇℃伅 this.buildPriceZouShi(dto, model); mav.setModel(BasicModel.buildOKModel().setResult(dto)); return mav; } /** - * 获取房生活周边均价相似小区 + * 鑾峰彇鎴跨敓娲诲懆杈瑰潎浠风浉浼煎皬鍖� * @author xuhe * @param model * @param request @@ -575,7 +575,7 @@ public class ZyFshController { int priceEnd = start.add(start.multiply(new BigDecimal(0.02))).intValue(); Date end = DateUtil.getFirstDayOfWeek(new Date()); List cityList = districtNewPriceService.findDistrictRangPrice(model.getCity(), null, null, priceStart, priceEnd,end); - //上周无均价,再往前推一周 + //涓婂懆鏃犲潎浠凤紝鍐嶅線鍓嶆帹涓�鍛� if (cityList.size() == 0) { Date topEnd = DateUtil.getFirstDayOfWeek(end); cityList = districtNewPriceService.findDistrictRangPrice(model.getCity(), null, null, priceStart, priceEnd, topEnd); @@ -587,13 +587,13 @@ public class ZyFshController { } } - //如果区域小于6个则扩大价格范围重新查一次 + //濡傛灉鍖哄煙灏忎簬6涓垯鎵╁ぇ浠锋牸鑼冨洿閲嶆柊鏌ヤ竴娆� if (regionList.size() < 6) { priceStart = start.subtract(start.multiply(new BigDecimal(0.04))).intValue(); priceEnd = start.add(start.multiply(new BigDecimal(0.04))).intValue(); end = DateUtil.getFirstDayOfWeek(new Date()); cityList = districtNewPriceService.findDistrictRangPrice(model.getCity(), null, null, priceStart, priceEnd,end); - //上周无均价,再往前推一周 + //涓婂懆鏃犲潎浠凤紝鍐嶅線鍓嶆帹涓�鍛� if (cityList.size() == 0) { Date topEnd = DateUtil.getFirstDayOfWeek(end); cityList = districtNewPriceService.findDistrictRangPrice(model.getCity(), null, null, priceStart, priceEnd, topEnd); @@ -613,7 +613,7 @@ public class ZyFshController { orderHouseList(regionList,model.getAvgPrice()); } - //优先取区域的相似小区 + //浼樺厛鍙栧尯鍩熺殑鐩镐技灏忓尯 List regionListTurnNew = new ArrayList(); if(regionList.size()>6){ regionListTurnNew = getFirstIndexList(regionList,6,model.getName()); @@ -647,12 +647,12 @@ public class ZyFshController { } } - //如果城市的小于区域的数量那么就按顺序取 + //濡傛灉鍩庡競鐨勫皬浜庡尯鍩熺殑鏁伴噺閭d箞灏辨寜椤哄簭鍙� if (cityListTurnNew.size() < regionListTurnNew.size()) { cityListTurnNew = getFirstIndexList(cityList,6,model.getName()); } - //添加地址信息 + //娣诲姞鍦板潃淇℃伅 /*List districtnameKeys = new ArrayList(); for(DistrictNewPrice newPreice:cityListTurnNew){ districtnameKeys.add(newPreice.getCity() + "-" + newPreice.getRegion() + "-" + newPreice.getDistrictName()); @@ -667,7 +667,7 @@ public class ZyFshController { newPreice.setAddress(dis.getAddress()); } }*/ - //添加地址信息 + //娣诲姞鍦板潃淇℃伅 /*for(DistrictNewPrice newRegionPreice:regionListTurnNew){ District dis = disMap.get(newRegionPreice.getCity() + "-" + newRegionPreice.getRegion() + "-" + newRegionPreice.getDistrictName()); if (dis != null) { @@ -681,7 +681,7 @@ public class ZyFshController { } /** - * 获取以房换房意向小区列表 + * 鑾峰彇浠ユ埧鎹㈡埧鎰忓悜灏忓尯鍒楄〃 * @author xuhe * @param model * @param request @@ -693,7 +693,7 @@ public class ZyFshController { /*int totalCount = districtNewPriceService.findAllNewDistrictStatCountByZYBank( model.getCity(), model.getRegion(), date, model.getAreaTags(), model.getPoiTags(), model.getPurpose(), model.getMinAvgPrice(), model.getMaxAvgPrice()); - //上周无均价,再往前推一周 + //涓婂懆鏃犲潎浠凤紝鍐嶅線鍓嶆帹涓�鍛� if (totalCount == 0) { date = DateUtil.getFirstDayOfWeek(date); totalCount = districtNewPriceService.findAllNewDistrictStatCountByZYBank( @@ -713,7 +713,7 @@ public class ZyFshController { } /** - * 以房换房的相似小区均价筛选 + * 浠ユ埧鎹㈡埧鐨勭浉浼煎皬鍖哄潎浠风瓫閫� * @return */ private List getHouseTags(HouseChangeInfoModel model, Date date){ @@ -743,10 +743,10 @@ public class ZyFshController { } if(tagList==null || tagList.size()==0){ - //查找不到相似小区时 - //先正序查,取最大的五个值 + //鏌ユ壘涓嶅埌鐩镐技灏忓尯鏃� + //鍏堟搴忔煡,鍙栨渶澶х殑浜斾釜鍊� tagList = districtNewPriceService.findByOrder(model.getCity(), model.getRegion(), 5, false); - //判断第一个值是否大于均价最大值(若大于取最小的五个值否则取当前查出的五个值) + //鍒ゆ柇绗竴涓�兼槸鍚﹀ぇ浜庡潎浠锋渶澶у�硷紙鑻ュぇ浜庡彇鏈�灏忕殑浜斾釜鍊煎惁鍒欏彇褰撳墠鏌ュ嚭鐨勪簲涓�硷級 if(tagList.get(0).getAvgPrice() > model.getMaxAvgPrice()){ tagList = districtNewPriceService.findByOrder(model.getCity(), model.getRegion(), 5, true); } @@ -758,7 +758,7 @@ public class ZyFshController { } /** - * 以房换房的相似小区均价筛选 + * 浠ユ埧鎹㈡埧鐨勭浉浼煎皬鍖哄潎浠风瓫閫� * @return */ @Deprecated @@ -771,10 +771,10 @@ public class ZyFshController { } List tagList = districtTagService.findByParame(model.getCity(),null, model.getAreaTags(),model.getPoiTags(),model.getPurpose(),idsMap); if(tagList==null || tagList.size()==0){ - //查找不到相似小区时 - //先正序查,取最大的五个值 + //鏌ユ壘涓嶅埌鐩镐技灏忓尯鏃� + //鍏堟搴忔煡,鍙栨渶澶х殑浜斾釜鍊� tagList = districtStatService.findByOrder(model.getCity(), model.getRegion(), 5, false); - //判断第一个值是否大于均价最大值(若大于取最小的五个值否则取当前查出的五个值) + //鍒ゆ柇绗竴涓�兼槸鍚﹀ぇ浜庡潎浠锋渶澶у�硷紙鑻ュぇ浜庡彇鏈�灏忕殑浜斾釜鍊煎惁鍒欏彇褰撳墠鏌ュ嚭鐨勪簲涓�硷級 if(tagList.get(0).getAvgPrice() > model.getMaxAvgPrice()){ tagList = districtStatService.findByOrder(model.getCity(), model.getRegion(), 5, true); } @@ -798,8 +798,8 @@ public class ZyFshController { } /** - * 获取list的前几条数据 - * @param name 去掉名称为name的 + * 鑾峰彇list鐨勫墠鍑犳潯鏁版嵁 + * @param name 鍘绘帀鍚嶇О涓簄ame鐨� */ private List getFirstIndexList(List list,int index,String name){ List backList = new ArrayList(); @@ -817,7 +817,7 @@ public class ZyFshController { return backList; } /** - * 封装价格走势信息 + * 灏佽浠锋牸璧板娍淇℃伅 * @author yinjihuan * @param dto * @param model @@ -825,22 +825,22 @@ public class ZyFshController { private void buildPriceZouShi(EvaluationBeforeLoanDto dto, CollateralEvaluationInfoModel model) { Date end = new Date(); - //2年前 + //2骞村墠 Date start = DateUtil.getDateOfLastMonth(end, -24); - //小区走势 + //灏忓尯璧板娍 this.buildDistrictAvgZouShi(dto, model, end, start); - //区域走势 + //鍖哄煙璧板娍 this.buildRegionAvgZouShi(dto, model, end, start); - //城市走势 + //鍩庡競璧板娍 this.buildCityAvgZouShi(dto, model, end, start); } /** - * 均价在城市中排名比(也就是价格指数) + * 鍧囦环鍦ㄥ煄甯備腑鎺掑悕姣�(涔熷氨鏄环鏍兼寚鏁�) * @param dto * @param model */ @@ -855,7 +855,7 @@ public class ZyFshController { rate = priceLevelRate; }else{ List list = districtStatService.findAllDistrictStats(model.getCity(),null,null,DateUtil.getFirstDayOfWeek(new Date())); - //最近一周查不到往前再推一周 + //鏈�杩戜竴鍛ㄦ煡涓嶅埌寰�鍓嶅啀鎺ㄤ竴鍛� if(list==null){ list = districtStatService.findAllDistrictStats(model.getCity(),null,null,DateUtil.getFirstDayOfWeek(DateUtil.getBeforeDay(new Date(), -7))); } @@ -889,7 +889,7 @@ public class ZyFshController { /** - * 小区走势 + * 灏忓尯璧板娍 * @author yinjihuan * @param dto * @param model @@ -906,7 +906,7 @@ public class ZyFshController { } /** - * 区域走势 + * 鍖哄煙璧板娍 * @author yinjihuan * @param dto * @param model @@ -924,7 +924,7 @@ public class ZyFshController { } /** - * 城市走势 + * 鍩庡競璧板娍 * @author yinjihuan * @param dto * @param model @@ -946,7 +946,7 @@ public class ZyFshController { /** - * 获取城市的相对最低和最高价 + * 鑾峰彇鍩庡競鐨勭浉瀵规渶浣庡拰鏈�楂樹环 * @param model * @return */ @@ -961,56 +961,56 @@ public class ZyFshController { } /** - * 处置难易度 + * 澶勭疆闅炬槗搴� * @param dto */ private double buildHandleLevel(EvaluationBeforeLoanDto dto, CollateralEvaluationInfoModel model, DistrictAnalyData districtAnalyData, District district) { - //获取pds相关系数 + //鑾峰彇pds鐩稿叧绯绘暟 PdsRatio pdsRatio = getPdsRatio(model); - // 获取城市近12个月的年涨幅 + // 鑾峰彇鍩庡競杩�12涓湀鐨勫勾娑ㄥ箙 Integer cityAvgPrice = cityRiseAndDownNew(model.getCity()); dto.setCityAvgPrice(cityAvgPrice); - //总价相关得分 + //鎬讳环鐩稿叧寰楀垎 Double totalPriceScore = getTotalPriceScoreInfoNew(cityAvgPrice, dto, pdsRatio); - //中介数得分、知名中介数量、其他中介数量 、中介城市排名 + //涓粙鏁板緱鍒嗐�佺煡鍚嶄腑浠嬫暟閲忋�佸叾浠栦腑浠嬫暟閲� 銆佷腑浠嬪煄甯傛帓鍚� AgencyMountLevel agencyMountLevel = agencyMountLevelService.findAgencyMountLevelParam(model.getCity(), model.getDistrict(), model.getName()); Double agencyScore= getAgencyInfoNew(agencyMountLevel, model, dto, pdsRatio); //dto.setAgencyScore(agencyScore); - //近6个月挂牌量、近1个月挂牌量、近六个月最高挂牌量、6个月挂牌量在城市排名、挂牌量得分 + //杩�6涓湀鎸傜墝閲忋�佽繎1涓湀鎸傜墝閲忋�佽繎鍏釜鏈堟渶楂樻寕鐗岄噺銆�6涓湀鎸傜墝閲忓湪鍩庡競鎺掑悕銆佹寕鐗岄噺寰楀垎 DistrictKey key = new DistrictKey(model.getCity(), model.getDistrict(), model.getName()); Double quoteScore = getQuoteInfo(districtAnalyData, dto, key, pdsRatio); //dto.setQuoteScore(quoteScore); - //交通得分、交通情况城市排名、公交数量、地铁数量 + //浜ら�氬緱鍒嗐�佷氦閫氭儏鍐靛煄甯傛帓鍚嶃�佸叕浜ゆ暟閲忋�佸湴閾佹暟閲� Double trafficScore = getTrafficInfoNew(dto, key, pdsRatio); //dto.setTrafficScore(trafficScore); - //小区密度得分 + //灏忓尯瀵嗗害寰楀垎 Double distirctDensityScore = getDistrictDensityNew(district, pdsRatio, districtAnalyData, dto); Double handleDegreeScore = getHandleDegreeScore(pdsRatio, agencyScore, quoteScore, trafficScore, distirctDensityScore, totalPriceScore); //dto.setHandleLevel(handleDegreeScore); - //获取区域近12个月的涨幅 + //鑾峰彇鍖哄煙杩�12涓湀鐨勬定骞� Double regionYoy = regionRiseAndDownNew(dto, model); - //小区年涨跌幅(没有年涨幅用半年、季度) + //灏忓尯骞存定璺屽箙(娌℃湁骞存定骞呯敤鍗婂勾銆佸搴�) Double yoyRiseDown = getAbsYoy(districtAnalyData, dto.getAvgPrice(), dto.getCitySellStats(), dto.getRegionSellStats()); - //与区域年涨跌幅差比 + //涓庡尯鍩熷勾娑ㄨ穼骞呭樊姣� Double yoyRegionAbs = yoyRegionRiseAndDownAbs(districtAnalyData, yoyRiseDown, regionYoy); - // 一年以上抵押品价格异常指数 + // 涓�骞翠互涓婃姷鎶煎搧浠锋牸寮傚父鎸囨暟 Double priceStability = getPriceStabilityValue(yoyRiseDown, yoyRegionAbs, pdsRatio, regionYoy); //dto.setPriceStability(priceStability); - // 押品综合评分 + // 鎶煎搧缁煎悎璇勫垎 Double collateralTotalScore = getCollateralTotalScore(handleDegreeScore,priceStability,pdsRatio); return collateralTotalScore; } - //获取pds相关系数 + //鑾峰彇pds鐩稿叧绯绘暟 public PdsRatio getPdsRatio(CollateralEvaluationInfoModel model){ PdsRatio pdsRatio = new PdsRatio(); - //此处需要调用接口 + //姝ゅ闇�瑕佽皟鐢ㄦ帴鍙� pdsRatio.setAgencyScale(model.getAgencyCount()); pdsRatio.setAgencyMax(model.getAgencyCountMax()); pdsRatio.setAgencyMin(model.getAgencyCountMin()); @@ -1044,7 +1044,7 @@ public class ZyFshController { return pdsRatio; } - //综合评分 + //缁煎悎璇勫垎 public Double getCollateralTotalScore(Double handleDegreeScore, Double priceStability,PdsRatio pdsRatio){ Double priceStabilityScale = PDSConstant.PRICE_STABILITY_SCALE; Double handleStabilityScale = PDSConstant.HANDLE_STABILITY_SCALE; @@ -1054,7 +1054,7 @@ public class ZyFshController { Double totalScore = MathUtils.calTotalScore(handleDegreeScore,priceStability,priceStabilityScale,handleStabilityScale); return totalScore; } - //处置 难易度得分 + //澶勭疆 闅炬槗搴﹀緱鍒� public Double getHandleDegreeScore(PdsRatio pdsRatio,Double agencyScore,Double quoteScore,Double trafficScore,Double distirctDensityScore,Double totalPriceScore){ Double agencyScale= PDSConstant.AGENCY_SCALE; Double quoteScale = PDSConstant.QUOTE_SCALE; @@ -1080,7 +1080,7 @@ public class ZyFshController { return handleDegreeScore; } - //以上价格稳定指数 + //浠ヤ笂浠锋牸绋冲畾鎸囨暟 public Double getPriceStabilityValue(Double yoy,Double regionAbs,PdsRatio cityRatio,Double regionYoy){ Double priceStability = 0d; Double absDLine = PDSConstant.ABSD_LINE; @@ -1112,29 +1112,29 @@ public class ZyFshController { } return priceStability; } - //中介数得分、知名中介数量、其他中介数量 、中介城市排名 + //涓粙鏁板緱鍒嗐�佺煡鍚嶄腑浠嬫暟閲忋�佸叾浠栦腑浠嬫暟閲� 銆佷腑浠嬪煄甯傛帓鍚� private Double getAgencyInfoNew(AgencyMountLevel agencyMountLevel,CollateralEvaluationInfoModel model,EvaluationBeforeLoanDto dto,PdsRatio cityRatio){ int famousAgency = 0; if(agencyMountLevel !=null && agencyMountLevel.getFamousAgency() >= 0){ famousAgency = agencyMountLevel.getFamousAgency(); } - //dto.setFamousAgency(famousAgency);// 知名中介 + //dto.setFamousAgency(famousAgency);// 鐭ュ悕涓粙 int otherAgency = 0; if(agencyMountLevel!=null&&agencyMountLevel.getOtherAgency()>=0){ otherAgency = agencyMountLevel.getOtherAgency(); } - //dto.setOtherAgency(otherAgency);// 其他中介 - int allAgency = famousAgency+otherAgency;//中介总数 + //dto.setOtherAgency(otherAgency);// 鍏朵粬涓粙 + int allAgency = famousAgency+otherAgency;//涓粙鎬绘暟 if(agencyMountLevel==null||agencyMountLevel.getMomCityLevel()<0||agencyMountLevel.getCitySize()<0){ - //dto.setAgencyLevelRate(0d);//中介城市排名 + //dto.setAgencyLevelRate(0d);//涓粙鍩庡競鎺掑悕 }else{ //dto.setAgencyLevelRate(MathUtils.getLevelRate(agencyMountLevel.getMomCityLevel(), agencyMountLevel.getCitySize())); } - Double agencyScore = agencyScoreLog(allAgency, cityRatio);//中介得分 + Double agencyScore = agencyScoreLog(allAgency, cityRatio);//涓粙寰楀垎 return agencyScore; } - //中介得分逻辑 + //涓粙寰楀垎閫昏緫 public Double agencyScoreLog(int allAgency,PdsRatio cityRatio){ Double agencyScore = 0d; Double agencyMax = PDSConstant.AGENCY_MAX; @@ -1155,7 +1155,7 @@ public class ZyFshController { } return agencyScore; } - // 城市近12个月的涨幅 + // 鍩庡競杩�12涓湀鐨勬定骞� private Integer cityRiseAndDownNew(String city){ Integer cityAvgPrice = 0; List citySellStats = citySellStatService.getAllWithMonths(city, 12); @@ -1168,7 +1168,7 @@ public class ZyFshController { } return cityAvgPrice; } - //总价得分 + //鎬讳环寰楀垎 private Double getTotalPriceScoreInfoNew(Integer cityAvgPrice, EvaluationBeforeLoanDto dto, PdsRatio cityRatio){ int totalPrice = dto.getTotalPrice().intValue(); Double totalPriceScore = 0d; @@ -1201,7 +1201,7 @@ public class ZyFshController { } return totalPriceScore; } - //近6个月挂牌量、近1个月挂牌量、近六个月最高挂牌量、6个月挂牌量在城市排名 + //杩�6涓湀鎸傜墝閲忋�佽繎1涓湀鎸傜墝閲忋�佽繎鍏釜鏈堟渶楂樻寕鐗岄噺銆�6涓湀鎸傜墝閲忓湪鍩庡競鎺掑悕 private Double getQuoteInfo(DistrictAnalyData districtAnalyData,EvaluationBeforeLoanDto dto, DistrictKey key, PdsRatio cityRatio){ Double quoteMax = PDSConstant.QUOTE_MAX; Double quoteMin = PDSConstant.QUOTE_MIN; @@ -1210,12 +1210,12 @@ public class ZyFshController { if(districtAnalyData!=null&&districtAnalyData.getSellCountRank()!=null&&districtAnalyData.getSellRankTotal()!=null){ sixQuoteLevelRate = MathUtils.getLevelRate(districtAnalyData.getSellCountRank(),districtAnalyData.getSellRankTotal()); } - dto.setSixQuoteLevelRate(sixQuoteLevelRate * 100);//六个月挂牌量排名 + dto.setSixQuoteLevelRate(sixQuoteLevelRate * 100);//鍏釜鏈堟寕鐗岄噺鎺掑悕 int quoteHouseSix = 0; if(districtAnalyData!=null&&districtAnalyData.getSellCount()!=null&&districtAnalyData.getSellCount()>=0){ quoteHouseSix = districtAnalyData.getSellCount(); } - dto.setQuoteHouseSix(quoteHouseSix);// 近六个月的挂牌量 + dto.setQuoteHouseSix(quoteHouseSix);// 杩戝叚涓湀鐨勬寕鐗岄噺 /*Integer cityMaxQuote = districtAnalyDataService.findMaxSellCountByCity(key.getCity()); if(cityMaxQuote==null){ dto.setSixMaxQuoteMount(0); @@ -1227,9 +1227,9 @@ public class ZyFshController { if(districtAnalyData!=null&&districtAnalyData.getMonthSellCount()!=null){ quertHouseOne = districtAnalyData.getMonthSellCount(); } - dto.setQuoteHouseOne(quertHouseOne);// 近一个月的挂牌量 + dto.setQuoteHouseOne(quertHouseOne);// 杩戜竴涓湀鐨勬寕鐗岄噺 - Double quoteScore = 0d;//挂牌量得分 + Double quoteScore = 0d;//鎸傜墝閲忓緱鍒� if(quoteHouseSix>=quoteMax){ quoteScore = 100d; }else if(quoteHouseSix<=quoteMin){ @@ -1240,7 +1240,7 @@ public class ZyFshController { return quoteScore; } - //交通得分、交通情况城市排名、公交数量、地铁数量 + //浜ら�氬緱鍒嗐�佷氦閫氭儏鍐靛煄甯傛帓鍚嶃�佸叕浜ゆ暟閲忋�佸湴閾佹暟閲� private Double getTrafficInfoNew(EvaluationBeforeLoanDto dto, DistrictKey key, PdsRatio pdsRatio){ Double metroScale = PDSConstant.METRO_SCALE; Double metroMax = PDSConstant.METRO_MAX; @@ -1250,12 +1250,12 @@ public class ZyFshController { Double busMin = PDSConstant.BUS_MIN; TrafficLevel trafficLevel = trafficLevelService.findTrafficLevelByParam(key.getCity(), key.getRegion(), key.getName()); - Integer metroCount = 0;//地铁数量 + Integer metroCount = 0;//鍦伴搧鏁伴噺 if(trafficLevel!=null&&trafficLevel.getMetroCount()!=null){ metroCount = trafficLevel.getMetroCount(); } dto.setMetroCount(metroCount); - Integer busCount = 0;//公交数量 + Integer busCount = 0;//鍏氦鏁伴噺 Integer trafficCount = 0; Integer maxTrafficCount = 0; if(trafficLevel!=null&&trafficLevel.getBusCount()!=null){ @@ -1272,14 +1272,14 @@ public class ZyFshController { //dto.setMaxTrafficCount(maxTrafficCount); //dto.setTrafficCount(trafficCount); dto.setBusCount(busCount); - Double trafficLevelRate = 0d;//交通情况城市排名 + Double trafficLevelRate = 0d;//浜ら�氭儏鍐靛煄甯傛帓鍚� if(trafficLevel!=null&&trafficLevel.getTrafficLevel()!=null&&trafficLevel.getTrafficLevelTotal()!=null){ trafficLevelRate = MathUtils.getLevelRate(trafficLevel.getTrafficLevel(), trafficLevel.getTrafficLevelTotal()); } dto.setTrafficLevelRate(trafficLevelRate * 100); - Double trafficScore = 0d;//交通得分 - Double metroScore = 0d; //地铁得分 - Double busScore = 0d; //公交得分 + Double trafficScore = 0d;//浜ら�氬緱鍒� + Double metroScore = 0d; //鍦伴搧寰楀垎 + Double busScore = 0d; //鍏氦寰楀垎 if(pdsRatio!=null&&pdsRatio.getMetroScale()!=null){ metroScale = pdsRatio.getMetroScale(); } @@ -1317,7 +1317,7 @@ public class ZyFshController { return trafficScore; } - //小区密度 + //灏忓尯瀵嗗害 private Double getDistrictDensityNew(District district,PdsRatio pdsRatio,DistrictAnalyData districtAnalyData, EvaluationBeforeLoanDto dto) { Double densityMax = PDSConstant.DENSITY_MAX; Double densityMin = PDSConstant.DENSITY_MIN; @@ -1390,7 +1390,7 @@ public class ZyFshController { return densityScore; } - //区域近12个月的涨幅,年涨幅 + //鍖哄煙杩�12涓湀鐨勬定骞�,骞存定骞� private Double regionRiseAndDownNew(EvaluationBeforeLoanDto dto, CollateralEvaluationInfoModel model){ Double regionYoy = null; List regionStatTrends = regionStatTrendService.getAllWithMonths(model.getCity(), model.getDistrict(), 12); @@ -1403,10 +1403,10 @@ public class ZyFshController { dto.setRegionSellStats(regionStatTrends); return regionYoy; } - //选择年涨跌幅、半年涨跌幅、季度涨跌幅 + //閫夋嫨骞存定璺屽箙銆佸崐骞存定璺屽箙銆佸搴︽定璺屽箙 public Double getAbsYoy(DistrictAnalyData districtAnalyData,Integer avgPrice,List css,List rss){ Double yoy = null; - if(districtAnalyData!=null){//选择年涨跌幅、半年涨跌幅、季度涨跌幅 + if(districtAnalyData!=null){//閫夋嫨骞存定璺屽箙銆佸崐骞存定璺屽箙銆佸搴︽定璺屽箙 if(districtAnalyData.getYoy()!=null){ yoy = districtAnalyData.getYoy(); }else if(districtAnalyData.getHalfYoy()!=null){ @@ -1423,9 +1423,9 @@ public class ZyFshController { } return yoy; } - //与区域年涨跌幅差比 + //涓庡尯鍩熷勾娑ㄨ穼骞呭樊姣� public Double yoyRegionRiseAndDownAbs(DistrictAnalyData districtAnalyData,Double yoy,Double regionYoy){ - Double yoyRegionAbs = null;//小区涨跌幅与区域的差比 + Double yoyRegionAbs = null;//灏忓尯娑ㄨ穼骞呬笌鍖哄煙鐨勫樊姣� if(yoy!=null&®ionYoy!=null&®ionYoy!=0){ yoyRegionAbs = MathUtils.yoyAbs(yoy, regionYoy); }else{ @@ -1447,7 +1447,7 @@ public class ZyFshController { } /** - * 通过EvaluationModel组装Evaluation实体 + * 閫氳繃EvaluationModel缁勮Evaluation瀹炰綋 * * @param model * @return diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/requestController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/requestController.java index d23a312bb..5d547a6c7 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/requestController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/requestController.java @@ -14,7 +14,7 @@ import java.util.Map; public class requestController { /** - * 获取请求的request和IP信息 + * 鑾峰彇璇锋眰鐨剅equest鍜孖P淇℃伅 * @param request * @return */ diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/CcbRentController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/CcbRentController.java index ae7b0e7ec..00172c57e 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/CcbRentController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/CcbRentController.java @@ -58,7 +58,7 @@ import java.text.ParseException; import java.util.*; /** - * 建设银行租金控制类 + * 寤鸿閾惰绉熼噾鎺у埗绫� * * @author shenjian * @since 2021/4/6 @@ -97,7 +97,7 @@ public class CcbRentController { HttpRequest httpRequest = new HttpRequest(); try { Map headers = new HashMap(); - // &__refresh_cache=1 刷新缓存 + // &__refresh_cache=1 鍒锋柊缂撳瓨 String url = "http://open.fangjia.com/address/match?token=" + APIConstant.SUPER_USER_TOKEN; Map params = org.apache.commons.beanutils.BeanUtils.describe(model); result = httpRequest.post(url, params, headers,"UTF-8"); @@ -118,7 +118,7 @@ public class CcbRentController { HttpRequest httpRequest = new HttpRequest(); try { Map headers = new HashMap(); - // &__refresh_cache=1 刷新缓存 + // &__refresh_cache=1 鍒锋柊缂撳瓨 String url = "http://open.fangjia.com/property/evaluateRent?token=" + APIConstant.SUPER_USER_TOKEN; Map params = org.apache.commons.beanutils.BeanUtils.describe(model); result = httpRequest.post(url, params, headers,"UTF-8"); @@ -156,8 +156,8 @@ public class CcbRentController { model.setDirection(direction); model.setFitment(fitment); - if (model.getCity().endsWith("市")) { - model.setCity(model.getCity().replaceAll("市$", "")); + if (model.getCity().endsWith("甯�")) { + model.setCity(model.getCity().replaceAll("甯�$", "")); } if (StringUtils.isNotBlank(request.getParameter("calDate"))) { Date calDate = null; @@ -168,7 +168,7 @@ public class CcbRentController { } model.setCalDate(calDate); } - /* 先到CPDB库中查找小区 */ + /* 鍏堝埌CPDB搴撲腑鏌ユ壘灏忓尯 */ District district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(), "district"); model.setName(district.getName()); @@ -177,7 +177,7 @@ public class CcbRentController { model.setRegion(district.getRegion()); model.setDistrictName(district.getName()); if (StringUtils.isBlank(model.getPropertyType())) { - if (district.getEstateType2() != null && district.getEstateType2().contains("别墅")) { + if (district.getEstateType2() != null && district.getEstateType2().contains("鍒")) { model.setPropertyType("1"); } } @@ -219,13 +219,13 @@ public class CcbRentController { Integer startPrice = (int)(evaluation.getTotalPrice() - evaluation.getTotalPrice()*0.2); Integer endPrice = (int)(evaluation.getTotalPrice() + evaluation.getTotalPrice()*0.2); - //周边相似小区 - if (null == model.getRadius()) {// 设置默认值 + //鍛ㄨ竟鐩镐技灏忓尯 + if (null == model.getRadius()) {// 璁剧疆榛樿鍊� model.setRadius(1000); } String[] fields = { "city", "region", "name", "estateType2", "id","finishBuildingDate"}; List allDistricts = districtService.findNearestDistrict(district, model.getRadius(), fields, Integer.MAX_VALUE); - //按条件过滤相似小区 + //鎸夋潯浠惰繃婊ょ浉浼煎皬鍖� Integer buildYear = null; List districts = new ArrayList(); if(StringUtils.isNotBlank(district.getFinishBuildingDate())){ @@ -245,13 +245,13 @@ public class CcbRentController { } } - //相似房源 + //鐩镐技鎴挎簮 Double startArea = model.getSize() - model.getSize()*0.1; Double endArea = model.getSize() + model.getSize()*0.1; Integer startDate = Integer.parseInt(org.apache.tools.ant.util.DateUtils.format(DateUtil.addMonthToDate(new Date(), -12), "yyyyMMdd")); List houses = seawaterService.findSeawatersFromEs2("rent", district.getCity(), district.getRegion(), district.getName(), null, null, startDate, null, startArea, endArea, startPrice, endPrice, null, null, "p_date", false, 1, 5 , null,"seawater-20*/_doc"); - //无评估小区房源用周边相似小区的房源 + //鏃犺瘎浼板皬鍖烘埧婧愮敤鍛ㄨ竟鐩镐技灏忓尯鐨勬埧婧� if(null == houses || houses.size()==0){ for (District dist : districts) { houses = seawaterService.findSeawatersFromEs2("rent", dist.getCity(), dist.getRegion(), dist.getName(), null, null, startDate, null, @@ -270,7 +270,7 @@ public class CcbRentController { } districtPriceMap.put("houses", houses); - //周边相似小区租金 + //鍛ㄨ竟鐩镐技灏忓尯绉熼噾 if(model.getRoom() != 0){ room = model.getRoom(); }else{ @@ -311,7 +311,7 @@ public class CcbRentController { } } - //近一年户型租金走势 + //杩戜竴骞存埛鍨嬬閲戣蛋鍔� //Map trendsMap = districtRoomSqmetreRentService.getRentTrends(district.getCity(), district.getRegion(), district.getName(), room, -12); Map trendsMap = districtStatRentService.getRentTrend(district.getCity(), district.getRegion(), district.getDistrictName(), -12); if (MapUtils.isNotEmpty(trendsMap)) { @@ -326,15 +326,15 @@ public class CcbRentController { } districtPriceMap.put("trends", trendsMap); - // 生成走势图图片,一遍转pdf + // 鐢熸垚璧板娍鍥惧浘鐗囷紝涓�閬嶈浆pdf //String tradesImgUrl = buildTrendImage(trendsMap, room); String tradesImgUrl = chartImgUrl; - //成交的租房房源 + //鎴愪氦鐨勭鎴挎埧婧� List rentTrades = rentDealPriceService.getRentDealPrices(district.getCity(), district.getRegion(), district.getName(), 5); if (CollectionUtils.isNotEmpty(rentTrades)) { for (RentDealPrice price : rentTrades) { - // 返回成交日期到前端,直接取日期转pdf报错!!!!!!!!!!!!!!!!! + // 杩斿洖鎴愪氦鏃ユ湡鍒板墠绔紝鐩存帴鍙栨棩鏈熻浆pdf鎶ラ敊锛侊紒锛侊紒锛侊紒锛侊紒锛侊紒锛侊紒锛侊紒锛侊紒锛� if (price.getTradeDate() != null) { price.setSource(DateUtil.formatByPattern(price.getTradeDate(), "yyyy-MM-dd")); } @@ -360,17 +360,17 @@ public class CcbRentController { values.add(null); } } - // 保存到本地测试 - //String url = LineChartsUtils.createChartAndSave2Png("d://test.png",room + "居室", times, values); - String url = LineChartsUtils.createChartAndUpload(fileService,room + "居室", times, values); - logger.info("租金估值图片上传至服务器:{}", url); + // 淇濆瓨鍒版湰鍦版祴璇� + //String url = LineChartsUtils.createChartAndSave2Png("d://test.png",room + "灞呭", times, values); + String url = LineChartsUtils.createChartAndUpload(fileService,room + "灞呭", times, values); + logger.info("绉熼噾浼板�煎浘鐗囦笂浼犺嚦鏈嶅姟鍣細{}", url); return url; } return null; } /** - * 通过EvaluationModel组装Evaluation实体 + * 閫氳繃EvaluationModel缁勮Evaluation瀹炰綋 * * @param model * @param request @@ -529,7 +529,7 @@ public class CcbRentController { @Param(name = "name") String name, @Param(name = "address") String address, @Param(name = "addressDetail") String addressDetail, @Param(name = "size") Double size, @Param(name = "floor") Integer floor, @Param(name = "height") Integer height, @Param(name = "room") Integer room, @Param(name = "hall") Integer hall, @Param(name = "toilet") Integer toilet, @Param(name = "direction") String direction, @Param(name = "fitment") String fitment, @Param(name = "hasLift") String hasLift, @Param(name = "chartImgUrl") String chartImgUrl) throws IOException { - response.setHeader("Content-disposition", "attachment; filename=" + URLEncoder.encode("租金估值报告", "UTF-8") + ".pdf"); + response.setHeader("Content-disposition", "attachment; filename=" + URLEncoder.encode("绉熼噾浼板�兼姤鍛�", "UTF-8") + ".pdf"); response.setContentType("application/pdf;charset=UTF-8"); response.setCharacterEncoding("UTF-8"); OutputStream os = null; @@ -558,7 +558,7 @@ public class CcbRentController { } /** - * 方法同DistrictController#suggestAction + * 鏂规硶鍚孌istrictController#suggestAction */ public Object suggestAction(@Param(name = "city") String city, @Param(name = "cat") String cat, @Param(name = "keyword") String keyword, @Param(name = "limit") Integer limit, @Param(name="lat")Double lat, @Param(name="lng")Double lng) { @@ -592,7 +592,7 @@ public class CcbRentController { // nameQuery.add(new TermQuery(new Term("address", keyword)), BooleanClause.Occur.SHOULD); // nameQuery.add(new TermQuery(new Term("addr_alias_std", keyword)), BooleanClause.Occur.SHOULD); nameQuery.add(new TermQuery(new Term("keyword", keyword)), BooleanClause.Occur.SHOULD); - //nameQuery.add(new TermQuery(new Term("keyword_cjk", keyword)), BooleanClause.Occur.SHOULD);//这个重要,因seaweed不支持模糊搜索,当输入"中远两"需用此进行搜索 + //nameQuery.add(new TermQuery(new Term("keyword_cjk", keyword)), BooleanClause.Occur.SHOULD);//杩欎釜閲嶈锛屽洜seaweed涓嶆敮鎸佹ā绯婃悳绱紝褰撹緭鍏�"涓繙涓�"闇�鐢ㄦ杩涜鎼滅储 srQuery1.add(nameQuery, BooleanClause.Occur.SHOULD); if(lat != null && lng != null && lat != 0 && lng != 0){ Map geo = GeocodeUtils.geoconvBaiduToGoogle(lng, lat); @@ -619,37 +619,37 @@ public class CcbRentController { private static final Map DIRECTION = new HashMap() { { - put(null, "南"); - put("1", "西南"); - put("2", "东南"); - put("3", "南"); - put("4", "西北"); - put("5", "东北"); - put("6", "东"); - put("7", "西"); - put("8", "北"); - put("9", "东西"); - put("10", "南北"); + put(null, "鍗�"); + put("1", "瑗垮崡"); + put("2", "涓滃崡"); + put("3", "鍗�"); + put("4", "瑗垮寳"); + put("5", "涓滃寳"); + put("6", "涓�"); + put("7", "瑗�"); + put("8", "鍖�"); + put("9", "涓滆タ"); + put("10", "鍗楀寳"); } }; private static final Map FITMENT = new HashMap() { { - put(null, "简装"); - put("1", "毛坯"); - put("2", "简装"); - put("3", "精装"); - put("4", "豪装"); + put(null, "绠�瑁�"); + put("1", "姣涘澂"); + put("2", "绠�瑁�"); + put("3", "绮捐"); + put("4", "璞"); } }; private static final Map EVALUATION_MODEL_FITMENT = new HashMap() { { - put(null, "简单装修"); - put("简装", "简单装修"); - put("毛坯", "毛坯"); - put("精装", "精装修"); - put("豪装", "豪华装修"); + put(null, "绠�鍗曡淇�"); + put("绠�瑁�", "绠�鍗曡淇�"); + put("姣涘澂", "姣涘澂"); + put("绮捐", "绮捐淇�"); + put("璞", "璞崕瑁呬慨"); } }; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/DistrictController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/DistrictController.java index 74e1af29d..38a400048 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/DistrictController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/DistrictController.java @@ -48,7 +48,7 @@ public class DistrictController { /********************************************* new start *****************************************************/ /** - * 自动完成新实现 + * 鑷姩瀹屾垚鏂板疄鐜� * * @param cat * @param city @@ -74,7 +74,7 @@ public class DistrictController { public Object weXinListAction(DistrictSearchModel model, HttpServletRequest request, HttpServletResponse response) throws IOException { String login_user_type = CookieUtils.getCookieValue(request, "login_user_type"); - //保存企业用户选择的城市,企业用户7天 + //淇濆瓨浼佷笟鐢ㄦ埛閫夋嫨鐨勫煄甯�,浼佷笟鐢ㄦ埛7澶� String weiXinId = CookieUtils.getCookieValue(request, "we_chat_open_id"); // if(StringUtils.isBlank(login_user_type) || StringUtils.isBlank(weiXinId)){ // response.sendRedirect("/coming"); @@ -156,9 +156,9 @@ public class DistrictController { } public Object districtDetailAction(DistrictModel districtModel, HttpServletRequest request, HttpServletResponse response) { - //id和name不能同时为空 + //id鍜宯ame涓嶈兘鍚屾椂涓虹┖ if (StringUtils.isBlank(districtModel.getId()) && (StringUtils.isBlank(districtModel.getCityName()) || StringUtils.isBlank(districtModel.getName()))) { - districtModel.setMsg("参数错误"); + districtModel.setMsg("鍙傛暟閿欒"); return districtModel; } @@ -172,19 +172,19 @@ public class DistrictController { districtModel.setName(district.getName()); } } else { - System.out.println("小区详情2"); + System.out.println("灏忓尯璇︽儏2"); district = districtService.findByKeyMiniModel(districtModel.getCityName(), districtModel.getRegion(), districtModel.getName(), "district"); } - //小区价格 + //灏忓尯浠锋牸 DistrictStatBo districtStatBo = getDistrictStat(new DistrictKey(district)); String userId = CookieUtils.getCookieValue(request, "login_user_id"); - //小区租金 + //灏忓尯绉熼噾 List districtStatRentBos = districtStatRentService.findAllHouseTypeByDistrictStatRent(new DistrictKey(district)); - //处理图片链接 + //澶勭悊鍥剧墖閾炬帴 // List outPics = Lists.newArrayList(); // if(district.getOutPics() != null) { // for (String outPic : district.getOutPics()) { @@ -240,7 +240,7 @@ public class DistrictController { statBo = districtStatService.findDistrictStat(districtKey); } - // 同比数据 + // 鍚屾瘮鏁版嵁 if (statBo != null) { Date date = DateUtil.getThisWeekInLastYear(); Date[] dateList = {DateUtil.getBeforeDay(date, 14), DateUtil.getBeforeDay(date, 7), DateUtil.getAfterDay(date, 7), diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/DistrictTrendController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/DistrictTrendController.java index 18c8f0bbe..9cbbd1938 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/DistrictTrendController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/DistrictTrendController.java @@ -91,7 +91,7 @@ public class DistrictTrendController { } /** - * 走势图小模块 + * 璧板娍鍥惧皬妯″潡 * * @param model * @param request @@ -108,7 +108,7 @@ public class DistrictTrendController { } /** - * 走势图 + * 璧板娍鍥� * * @param model * @return @@ -191,7 +191,7 @@ public class DistrictTrendController { } /** - * 移动页面走势图 + * 绉诲姩椤甸潰璧板娍鍥� */ public Object wtrendAction(DistrictTrendModel model) { /*Object mav = FangjiaRudder.listMan(model.getKeyword()); @@ -283,7 +283,7 @@ public class DistrictTrendController { } /** - * 获取相关城市的行情 + * 鑾峰彇鐩稿叧鍩庡競鐨勮鎯� * * @return */ @@ -337,7 +337,7 @@ public class DistrictTrendController { } } - String[] defaultCitys = { "北京", "上海", "广州", "深圳", "天津" }; + String[] defaultCitys = { "鍖椾含", "涓婃捣", "骞垮窞", "娣卞湷", "澶╂触" }; for (int i = 0; i < 5; i++) { if (ret.size() >= 5) { break; @@ -361,7 +361,7 @@ public class DistrictTrendController { } /** - * 季度数据集 + * 瀛e害鏁版嵁闆� * * @param model * @return @@ -374,7 +374,7 @@ public class DistrictTrendController { } /** - * 半年数据集 + * 鍗婂勾鏁版嵁闆� * * @param model * @return @@ -387,7 +387,7 @@ public class DistrictTrendController { } /** - * 一年数据集 + * 涓�骞存暟鎹泦 * * @param model * @return @@ -399,7 +399,7 @@ public class DistrictTrendController { return mav; } /** - * 两年数据集 + * 涓ゅ勾鏁版嵁闆� * * @param model * @return @@ -412,7 +412,7 @@ public class DistrictTrendController { } /** - * 历史所有数据集 + * 鍘嗗彶鎵�鏈夋暟鎹泦 * * @param model * @return @@ -425,7 +425,7 @@ public class DistrictTrendController { } /** - * 小区租金(历史一年的数据) + * 灏忓尯绉熼噾锛堝巻鍙蹭竴骞寸殑鏁版嵁锛� * @param model * @return */ @@ -440,7 +440,7 @@ public class DistrictTrendController { Calendar startDate = Calendar.getInstance(); startDate.set(Calendar.YEAR, startDate.get(Calendar.YEAR)-1); List districtStatRentBos = districtStatRentService.findDistrictStatRentByParams(districtKey, null, startDate.getTime(), null, null, null, true); - //对租金数据分组 + //瀵圭閲戞暟鎹垎缁� Map> districtStatRentMap = new HashMap>(); /*Calendar calendar = Calendar.getInstance(); calendar.setTime(districtStatRentBos.get(0).getDistrictStatRent().getEndMonthDate());*/ @@ -454,7 +454,7 @@ public class DistrictTrendController { map.put(districtStatRentBo.getDistrictStatRent().getEndMonthDate().getTime(), districtStatRentBo.getDistrictStatRent().getAvgPrice()); districtStatRentMap.put(houseType, map); } - //查看是否有漏掉的日期,有则设置为null;然后转为JSON格式 + //鏌ョ湅鏄惁鏈夋紡鎺夌殑鏃ユ湡锛屾湁鍒欒缃负null;鐒跺悗杞负JSON鏍煎紡 List seriesOptions = new ArrayList(); for(Integer key : districtStatRentMap.keySet()) { LinkedHashMap map = districtStatRentMap.get(key); @@ -476,7 +476,7 @@ public class DistrictTrendController { calendar.set(Calendar.DAY_OF_MONTH, 1); calendar.add(Calendar.DATE, -1); ja.put(calendar.getTimeInMillis()); - ja.put(map.get(0));//这里不能直接赋null值 + ja.put(map.get(0));//杩欓噷涓嶈兘鐩存帴璧媙ull鍊� data.put(ja); } JSONArray ja = new JSONArray(); @@ -487,7 +487,7 @@ public class DistrictTrendController { firstTimeKey = nextTimeKey; } JSONObject jo = new JSONObject(); - jo.put("name", key + "居室"); + jo.put("name", key + "灞呭"); jo.put("data", data.toString()); jo.put("yAxis", 0); seriesOptions.add(jo); @@ -518,7 +518,7 @@ public class DistrictTrendController { addBlockStat(seriesOptions, trendView.getCityName(), trendView.getRegion(), trendView.getBlock(), weeks); } } else if (TrendView.ViewType.block.equals(trendView.getType())) { - //title = trendView.getRegion() + trendView.getBlock() + "板块"; + //title = trendView.getRegion() + trendView.getBlock() + "鏉垮潡"; addCityColumnStat(seriesOptions, trendView.getCityName(), trendView.getRegion(), trendView.getBlock(), weeks); addRegionStat(seriesOptions, trendView.getCityName(), trendView.getRegion(), weeks); addBlockStat(seriesOptions, trendView.getCityName(), trendView.getRegion(), trendView.getBlock(), weeks); @@ -539,7 +539,7 @@ public class DistrictTrendController { } private void addDistrictStat(List seriesOptions, DistrictKey districtKey, int weeks) { - List list = Arrays.asList(StringUtils.split(districtService.findDistrictKind(districtKey), ",,")); + List list = Arrays.asList(StringUtils.split(districtService.findDistrictKind(districtKey), ",锛�")); List districtStatBoList = districtStatService.findAllDistrictStatByKind(districtKey, new Date(), weeks, list); JSONArray districtJa = new JSONArray(); @@ -581,7 +581,7 @@ public class DistrictTrendController { if (villaJa.length() > 0) { JSONObject jo2 = new JSONObject(); - jo2.put("name", districtKey.getName() + "(别墅)"); + jo2.put("name", districtKey.getName() + "(鍒)"); jo2.put("data", villaJa.toString()); jo2.put("yAxis", 0); seriesOptions.add(jo2); @@ -594,7 +594,7 @@ public class DistrictTrendController { Date currentDate = new Date(); if (city != null && region != null && block != null) { regionStatList = regionStatService.findRegionStat(city, region, block, currentDate, weeks); - oprions.put("name", block + "板块"); + oprions.put("name", block + "鏉垮潡"); } else if (city != null && region != null) { regionStatList = regionStatService.findRegionStat(city, region, null, currentDate, weeks); oprions.put("name", region); @@ -663,7 +663,7 @@ public class DistrictTrendController { if (columnJa.length() > 0) { JSONObject jo = new JSONObject(); - jo.put("name", "成交量"); + jo.put("name", "鎴愪氦閲�"); jo.put("data", columnJa.toString()); jo.put("type", "column"); jo.put("yAxis", 1); @@ -675,7 +675,7 @@ public class DistrictTrendController { } private void addCityColumnStat(List seriesOptions, String city, String region, String block, int weeks) { - if (!"上海".equals(city)) { + if (!"涓婃捣".equals(city)) { return; } if (weeks > QUARTER_WEEK * 4 || weeks <= QUARTER_WEEK) { @@ -687,10 +687,10 @@ public class DistrictTrendController { List fromDates = DateUtil.getSundayListOfWeek(currentDate, weeks); if (city != null && region != null && block != null) { cityTradeStats = this.tradeStatService.findCityTradeStats(fromDates.get(0), currentDate, city, region, block); - oprions.put("name", block + "板块"); + oprions.put("name", block + "鏉垮潡"); } else if (city != null && region != null) { cityTradeStats = this.tradeStatService.findCityTradeStats(fromDates.get(0), currentDate, city, region); - oprions.put("name", "成交量"); + oprions.put("name", "鎴愪氦閲�"); } else if (city != null) { cityTradeStats = this.tradeStatService.findCityTradeStats(fromDates.get(0), currentDate, city); oprions.put("name", city); @@ -710,7 +710,7 @@ public class DistrictTrendController { if (columnJa.length() > 0) { JSONObject jo = new JSONObject(); - jo.put("name", "成交量"); + jo.put("name", "鎴愪氦閲�"); jo.put("data", columnJa.toString()); jo.put("type", "column"); jo.put("yAxis", 1); @@ -798,7 +798,7 @@ public class DistrictTrendController { statBo = districtStatService.findDistrictStat(districtKey); } - // 同比数据 + // 鍚屾瘮鏁版嵁 if (statBo != null) { Date date = DateUtil.getThisWeekInLastYear(); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/ReportController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/ReportController.java index 2c75d331e..5700c6df9 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/ReportController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/ReportController.java @@ -37,7 +37,7 @@ public class ReportController { FjtUsers fjtUsers = fjtUsersService.findById(userId); RestfulModelAndView data = new RestfulModelAndView(); JSONObject result = new JSONObject(); - //最多10页 + //鏈�澶�10椤� if(NumberUtils.toInt(page) > 10) { result.put("result", new JSONArray().toString()); data.setModel(result); @@ -91,9 +91,9 @@ public class ReportController { } } - jsonObject.put("zj", zj);//总价 - jsonObject.put("qwj", qwj);//期望价 - jsonObject.put("zsj", zsj);//终审价 + jsonObject.put("zj", zj);//鎬讳环 + jsonObject.put("qwj", qwj);//鏈熸湜浠� + jsonObject.put("zsj", zsj);//缁堝浠� }else{ EvaluationAudit evaluationAudit = evaluationAuditService.findByEvalutionId(evaluationId); @@ -102,8 +102,8 @@ public class ReportController { } if(evaluationAudit != null) { - jsonObject.put("ckj", (evaluationAudit.getDealPrice()==null) ? "-" : df.format(evaluationAudit.getDealPrice())+"");//参考价 - jsonObject.put("zsj", (evaluationAudit.getAuditPrice()==null) ? "-" : df.format(evaluationAudit.getAuditPrice())+"");//终审价 + jsonObject.put("ckj", (evaluationAudit.getDealPrice()==null) ? "-" : df.format(evaluationAudit.getDealPrice())+"");//鍙傝�冧环 + jsonObject.put("zsj", (evaluationAudit.getAuditPrice()==null) ? "-" : df.format(evaluationAudit.getAuditPrice())+"");//缁堝浠� } } } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/UserController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/UserController.java index 460a95e78..885b73ecf 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/UserController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/UserController.java @@ -69,7 +69,7 @@ public class UserController { return model; } - //渤海银行登录 + //娓ゆ捣閾惰鐧诲綍 public Object bhydLoginPageAction(UserModel model, HttpServletResponse response, HttpServletRequest request) { String type = StringUtils.trimToNull(model.getType()); if(!StringUtils.isBlank(type)){ @@ -95,14 +95,14 @@ public class UserController { e.printStackTrace(); } - if(weiXinId == null && StringUtils.isNotBlank(model.getCode())) {//微信公众号渤海银行 - System.out.println("bh OPEN_ID 随机生成:" + weiXinId); + if(weiXinId == null && StringUtils.isNotBlank(model.getCode())) {//寰俊鍏紬鍙锋袱娴烽摱琛� + System.out.println("bh OPEN_ID 闅忔満鐢熸垚锛�" + weiXinId); weiXinId = DataConvertUtil.getRandomString2(16); } if(weiXinId != null && !weiXinId.equals("")){ CookieUtils.setCookie("we_chat_open_id", weiXinId, "/", 60 * 60 * 24 *7, response); } - System.out.println("bhyd微信OPEN_ID:" + weiXinId); + System.out.println("bhyd寰俊OPEN_ID锛�" + weiXinId); return model; } @@ -131,8 +131,8 @@ public class UserController { if(weiXinId != null && !weiXinId.equals("")){ CookieUtils.setCookie("we_chat_open_id", weiXinId, "/", 60 * 60 * 24 *7, response); } - System.out.println("reqCityChoicePage 微信OPEN_ID:" + weiXinId); - //企业用户入口查询企业账户开通的城市 + System.out.println("reqCityChoicePage 寰俊OPEN_ID锛�" + weiXinId); + //浼佷笟鐢ㄦ埛鍏ュ彛鏌ヨ浼佷笟璐︽埛寮�閫氱殑鍩庡競 if(type.equals("b") || type.equals("gb")){ //Boolean isLogin = usersInfoService.checkEnterpriseWeiXinUserIsLogin(weiXinId); String cacheWeiXinId = CookieUtils.getCookieValue(request,"login_enterpriseuser_weixinid"); @@ -152,10 +152,10 @@ public class UserController { }else{ List citys = userCityService.findSupportCityByUserId(userId); if(citys == null || citys.isEmpty()){ - citys = Arrays.asList("上海"); + citys = Arrays.asList("涓婃捣"); } // if(users!=null && users.getRole() == 12){ -// citys = Arrays.asList("上海"); +// citys = Arrays.asList("涓婃捣"); // }else{ // citys = userCityService.findSupportCityByUserId(userId); // } @@ -178,7 +178,7 @@ public class UserController { } } - //如果用户之前有选择过城市则直接默认为该城市 + //濡傛灉鐢ㄦ埛涔嬪墠鏈夐�夋嫨杩囧煄甯傚垯鐩存帴榛樿涓鸿鍩庡競 String hisCity = (String) CacheUtils.getValue(UsersInfoService.class, weiXinId + "_city_"+type); String referer = request.getHeader("Referer"); if(referer != null && referer.contains("weXinList")){ @@ -233,9 +233,9 @@ public class UserController { } /** - * 普通用户登录 + * 鏅�氱敤鎴风櫥褰� * @author yinjihuan - * @date 2016年7月15日 + * @date 2016骞�7鏈�15鏃� * @param model * @return */ @@ -263,7 +263,7 @@ public class UserController { return resultModel; } - //判断是否已是房价网用户,是的话就绑定微信号,不是则添加账户记录并绑定微信号 + //鍒ゆ柇鏄惁宸叉槸鎴夸环缃戠敤鎴凤紝鏄殑璇濆氨缁戝畾寰俊鍙凤紝涓嶆槸鍒欐坊鍔犺处鎴疯褰曞苟缁戝畾寰俊鍙� try { FjtUsers user = usersInfoService.getUser(mobile); if(user == null) { @@ -298,9 +298,9 @@ public class UserController { } /** - * 企业用户登录 + * 浼佷笟鐢ㄦ埛鐧诲綍 * @author yinjihuan - * @date 2016年7月15日 + * @date 2016骞�7鏈�15鏃� * @param model * @return */ @@ -313,16 +313,16 @@ public class UserController { String source = model.getSource(); - // AI估价小程序 + // AI浼颁环灏忕▼搴� if ("ai-price-mp".equals(source)) { model.setAppId("wx30979dc8c24a82b6"); model.setAppSecret("ec013ae42882368bf3b157545042249a"); } if(StringUtils.isBlank(weiXinId) && StringUtils.isNotBlank(model.getCode())){ - System.out.println("小程序code:"+model.getCode()); - System.out.println("小程序AppId:"+model.getAppId()); - System.out.println("小程序AppSecret:"+model.getAppSecret()); + System.out.println("灏忕▼搴廲ode:"+model.getCode()); + System.out.println("灏忕▼搴廇ppId:"+model.getAppId()); + System.out.println("灏忕▼搴廇ppSecret:"+model.getAppSecret()); System.out.println("sid:"+model.getSid()); XcxKey sessionValue = getSessionValue(model.getCode(), null, model.getAppId(), model.getAppSecret()); if(sessionValue!=null){ @@ -334,10 +334,10 @@ public class UserController { if(weiXinId != null && !weiXinId.equals("")){ CookieUtils.setCookie("we_chat_open_id", weiXinId, "/", 60 * 60 * 24 *7, response); } - System.out.println("[sid]小程序微信OPEN_ID:" + weiXinId); + System.out.println("[sid]灏忕▼搴忓井淇PEN_ID锛�" + weiXinId); } - //测试时可以先去掉 + //娴嬭瘯鏃跺彲浠ュ厛鍘绘帀 if (StringUtils.isBlank(username) || StringUtils.isBlank(pass) || StringUtils.isBlank(weiXinId)){ resultModel.setMsg(Message.PARAM_NOT_NULL); return resultModel; @@ -364,7 +364,7 @@ public class UserController { /** - * 渤海 + * 娓ゆ捣 * @param model * @param response * @param request @@ -391,9 +391,9 @@ public class UserController { String weiXinId = CookieUtils.getCookieValue(request,"we_chat_open_id"); if(StringUtils.isBlank(weiXinId) && StringUtils.isNotBlank(model.getCode())){ - System.out.println("小程序code:"+model.getCode()); - System.out.println("小程序AppId:"+model.getAppId()); - System.out.println("小程序AppSecret:"+model.getAppSecret()); + System.out.println("灏忕▼搴廲ode:"+model.getCode()); + System.out.println("灏忕▼搴廇ppId:"+model.getAppId()); + System.out.println("灏忕▼搴廇ppSecret:"+model.getAppSecret()); System.out.println("sid:"+model.getSid()); XcxKey sessionValue = getSessionValue(model.getCode(), null, model.getAppId(), model.getAppSecret()); if(sessionValue!=null){ @@ -405,10 +405,10 @@ public class UserController { if(weiXinId != null && !weiXinId.equals("")){ CookieUtils.setCookie("we_chat_open_id", weiXinId, "/", 60 * 60 * 24 *7, response); } - System.out.println("[sid]小程序微信OPEN_ID:" + weiXinId); + System.out.println("[sid]灏忕▼搴忓井淇PEN_ID锛�" + weiXinId); } - //测试时可以先去掉 + //娴嬭瘯鏃跺彲浠ュ厛鍘绘帀 if (StringUtils.isBlank(username) || StringUtils.isBlank(pass) || StringUtils.isBlank(weiXinId)){ resultModel.setMsg(Message.PARAM_NOT_NULL); return resultModel; @@ -440,13 +440,13 @@ public class UserController { sessionValue.setSid(sid); sessionValue.setOpenId(sid); } - //缓存中没有登陆信息 + //缂撳瓨涓病鏈夌櫥闄嗕俊鎭� if(sessionValue==null){ - //获取openid信息 + //鑾峰彇openid淇℃伅 sessionValue = xcxUserInfoService.getOpenId(code, appId, secret); XcxUserInfo user = null; if(sessionValue!=null&&StringUtils.isNotBlank(sessionValue.getOpenId())){ - //根据是否是第一次使用,保存并查询除用户信息 + //鏍规嵁鏄惁鏄涓�娆′娇鐢紝淇濆瓨骞舵煡璇㈤櫎鐢ㄦ埛淇℃伅 user = xcxUserInfoService.save(sessionValue.getOpenId(), null); sessionValue.setSid(sessionValue.getOpenId()); } @@ -456,11 +456,11 @@ public class UserController { } /** - * 获取缓存的验证码 + * 鑾峰彇缂撳瓨鐨勯獙璇佺爜 * @author yinjihuan - * @date 2016年5月12日 - * @param mobile 手机 - * @param type 类型 + * @date 2016骞�5鏈�12鏃� + * @param mobile 鎵嬫満 + * @param type 绫诲瀷 * @return */ private String getCacheCode(String mobile, String type, HttpServletRequest request) { @@ -471,9 +471,9 @@ public class UserController { /** - * 发送验证码到指定的手机上 + * 鍙戦�侀獙璇佺爜鍒版寚瀹氱殑鎵嬫満涓� * @author yinjihuan - * @date 2016年5月10日 + * @date 2016骞�5鏈�10鏃� * @param model * @return */ @@ -511,9 +511,9 @@ public class UserController { } /** - * 发送验证码 + * 鍙戦�侀獙璇佺爜 * @author yinjihuan - * @date 2016年5月12日 + * @date 2016骞�5鏈�12鏃� * @param model * @param resultModel * @param mobile @@ -536,7 +536,7 @@ public class UserController { String code = usersInfoService.randomCode(); System.out.println(code); try { - smsService.send(model.getMobile(), "【房价网】你的验证码是" + code + ",验证码5分钟内有效,请立即验证。"); + smsService.send(model.getMobile(), "銆愭埧浠风綉銆戜綘鐨勯獙璇佺爜鏄�" + code + ",楠岃瘉鐮�5鍒嗛挓鍐呮湁鏁堬紝璇风珛鍗抽獙璇併��"); resultModel.setResult(Message.RESULT_SUCCESS); //CacheUtils.putValue(CachePolicyEnum.TINY, UsersInfoService.class, mobile + "_" + type, code); //CacheUtils.putValue(CachePolicyEnum.TINY, UsersInfoService.class, mobile, new Date().getTime()); @@ -565,7 +565,7 @@ public class UserController { String code = usersInfoService.randomCode(); System.out.println(code); try { - smsService.send(model.getMobile(), "【百盛评估】你的验证码是" + code + ",请立即验证。"); + smsService.send(model.getMobile(), "銆愮櫨鐩涜瘎浼般�戜綘鐨勯獙璇佺爜鏄�" + code + "锛岃绔嬪嵆楠岃瘉銆�"); resultModel.setResult(Message.RESULT_SUCCESS); CookieUtils.setCookie(mobile + "_" + type, code, "/", 60 * 60 * 24 *7, resp); CacheUtils.putValue(CachePolicyEnum.TINY, FjtUsers.class, mobile, new Date().getTime()); 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 c12665d2e..562b9d23c 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 @@ -63,15 +63,15 @@ public class WeiXinEvaluationController { private static final Map BUILDTYPE_MAP = new HashMap(){ { - put(0, "其他"); - put(1, "商铺"); - put(2, "写字楼"); - put(3, "住宅"); - put(4, "独立别墅"); - put(5, "双拼别墅"); - put(6, "联排别墅"); - put(7, "叠加别墅"); - put(8, "公寓"); + put(0, "鍏朵粬"); + put(1, "鍟嗛摵"); + put(2, "鍐欏瓧妤�"); + put(3, "浣忓畢"); + put(4, "鐙珛鍒"); + put(5, "鍙屾嫾鍒"); + put(6, "鑱旀帓鍒"); + put(7, "鍙犲姞鍒"); + put(8, "鍏瘬"); } }; @@ -154,7 +154,7 @@ public class WeiXinEvaluationController { /** - * 微信小程序:小区详情获取 + * 寰俊灏忕▼搴�:灏忓尯璇︽儏鑾峰彇 * @return */ public Object districtForXcxAction(@Param(name = "city")String city, @Param(name = "region")String region, @@ -167,7 +167,7 @@ public class WeiXinEvaluationController { Integer weeklyUpRate = 0; long lastMonthHouseCount = houseService.getHouseCountByOneMonth(new DistrictKey(city, region, name), DateUtil.getDateOfLastMonth(new Date(), -1)); - //小区均价 + //灏忓尯鍧囦环 DistrictStatBo districtStatBo = districtStatService.findDistrictStat(new DistrictKey(city, region, name)); if(districtStatBo != null) { @@ -181,7 +181,7 @@ public class WeiXinEvaluationController { } - //租房上周房源量 + //绉熸埧涓婂懆鎴挎簮閲� RentHouseQueryBean queryBean = new RentHouseQueryBean(); queryBean.setCity(city); queryBean.setRegion(region); @@ -208,7 +208,7 @@ public class WeiXinEvaluationController { FjtUsers fjtUsers = fjtUsersService.findById(userId); RestfulModelAndView data = new RestfulModelAndView(); JSONObject result = new JSONObject(); - //最多10页 + //鏈�澶�10椤� if (NumberUtils.toInt(page) > 10) { result.put("result", new JSONArray().toString()); data.setModel(result); @@ -217,7 +217,7 @@ public class WeiXinEvaluationController { Pager pager = new Pager(10); pager.setCurrentPage(NumberUtils.toInt(page)); List fjtEvaluationList = fjtEvaluationService.findEvaluationsByUserId(userId, pager); - System.out.println("估价记录:"+fjtEvaluationList.size()); + System.out.println("浼颁环璁板綍:"+fjtEvaluationList.size()); JSONArray ja = new JSONArray(); SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd"); for (int i = 0; i < fjtEvaluationList.size(); ++i) { @@ -225,31 +225,31 @@ public class WeiXinEvaluationController { BohaiEvaluationAudit evaluationAudit = bohaiEvaluationAuditService.findByBohaiEvaluationAuditId(fjtEvaluation.getId()); JSONObject jsonObject = new JSONObject(); jsonObject.put("eid", fjtEvaluation.getId()); - jsonObject.put("pgrq", sdf.format(fjtEvaluation.getDateCreated()));//评估日期 - jsonObject.put("tjrq", (evaluationAudit == null || evaluationAudit.getAuditStatus() != 4) ? "-" : sdf.format(evaluationAudit.getLastUpdated()));//调价日期 - jsonObject.put("dz", fjtEvaluation.getAddress());//地址 + jsonObject.put("pgrq", sdf.format(fjtEvaluation.getDateCreated()));//璇勪及鏃ユ湡 + jsonObject.put("tjrq", (evaluationAudit == null || evaluationAudit.getAuditStatus() != 4) ? "-" : sdf.format(evaluationAudit.getLastUpdated()));//璋冧环鏃ユ湡 + jsonObject.put("dz", fjtEvaluation.getAddress());//鍦板潃 jsonObject.put("hn", fjtEvaluation.getHouseNum()); jsonObject.put("rn", fjtEvaluation.getRoomNum()); - jsonObject.put("wylx", StringUtils.isBlank(BUILDTYPE_MAP.get(fjtEvaluation.getBuildType())) ? "-" : BUILDTYPE_MAP.get(fjtEvaluation.getBuildType()));//物业类型 - jsonObject.put("mj", fjtEvaluation.getHouseArea());//面积 + jsonObject.put("wylx", StringUtils.isBlank(BUILDTYPE_MAP.get(fjtEvaluation.getBuildType())) ? "-" : BUILDTYPE_MAP.get(fjtEvaluation.getBuildType()));//鐗╀笟绫诲瀷 + jsonObject.put("mj", fjtEvaluation.getHouseArea());//闈㈢Н if(evaluationAudit != null && evaluationAudit.getInquirePrice() > 0){ double zj = DataUtil.getDoubleRound(2, evaluationAudit.getInquirePrice() / 10000.0); if(zj == (int)zj){ - jsonObject.put("zj", (int)zj);//总价 + jsonObject.put("zj", (int)zj);//鎬讳环 }else{ - jsonObject.put("zj", zj);//总价 + jsonObject.put("zj", zj);//鎬讳环 } }else{ - jsonObject.put("zj", "-");//总价 + jsonObject.put("zj", "-");//鎬讳环 } if(evaluationAudit == null || evaluationAudit.getHopePrice() == null){ jsonObject.put("ckj","-"); }else{ double ckj = DataUtil.getDoubleRound(2,evaluationAudit.getHopePrice()/10000.0); if(ckj == (int)ckj){ - jsonObject.put("ckj", (int)ckj);//期望价 + jsonObject.put("ckj", (int)ckj);//鏈熸湜浠� }else{ - jsonObject.put("ckj", ckj);//期望价 + jsonObject.put("ckj", ckj);//鏈熸湜浠� } } @@ -258,25 +258,25 @@ public class WeiXinEvaluationController { }else{ double zsj = DataUtil.getDoubleRound(2,evaluationAudit.getLastPrice()/ 10000.0); if(zsj == (int)zsj){ - jsonObject.put("zsj", (int)zsj);//终审价 + jsonObject.put("zsj", (int)zsj);//缁堝浠� }else{ - jsonObject.put("zsj", zsj);//终审价 + jsonObject.put("zsj", zsj);//缁堝浠� } } - jsonObject.put("zdr", StringUtils.isBlank(fjtEvaluation.getLender()) ? "-" : fjtEvaluation.getLender());//主贷人 + jsonObject.put("zdr", StringUtils.isBlank(fjtEvaluation.getLender()) ? "-" : fjtEvaluation.getLender());//涓昏捶浜� if(evaluationAudit==null || (evaluationAudit!=null && StringUtils.isBlank(evaluationAudit.getInquireRemark()))){ - jsonObject.put("pgsm","");//评估说明 + jsonObject.put("pgsm","");//璇勪及璇存槑 }else{ - jsonObject.put("pgsm",evaluationAudit.getInquireRemark());//评估说明 + jsonObject.put("pgsm",evaluationAudit.getInquireRemark());//璇勪及璇存槑 } if (evaluationAudit!=null && evaluationAudit.getAuditStatus()==0) { - jsonObject.put("shzt", "价格待审核"); + jsonObject.put("shzt", "浠锋牸寰呭鏍�"); - //接入询价结果查询接口 - System.out.println("开始接入询价结果查询接口......"+evaluationAudit.getQueryId()); + //鎺ュ叆璇环缁撴灉鏌ヨ鎺ュ彛 + System.out.println("寮�濮嬫帴鍏ヨ浠风粨鏋滄煡璇㈡帴鍙�......"+evaluationAudit.getQueryId()); JSONObject obj = BHBankUtils.getInquireRecord(evaluationAudit.getQueryId()); - System.out.println("接入询价结果查询接口完成......"+evaluationAudit.getQueryId()); + System.out.println("鎺ュ叆璇环缁撴灉鏌ヨ鎺ュ彛瀹屾垚......"+evaluationAudit.getQueryId()); if(obj!=null){ Integer totalPrice = (Integer) obj.get("inquirePrice"); if(totalPrice>0){ @@ -284,27 +284,27 @@ public class WeiXinEvaluationController { evaluationAudit.setInquirePrice(totalPrice); double zj = DataUtil.getDoubleRound(2, totalPrice / 10000.0); if(zj == (int)zj){ - jsonObject.put("zj", (int)zj);//总价 + jsonObject.put("zj", (int)zj);//鎬讳环 }else{ - jsonObject.put("zj", zj);//总价 + jsonObject.put("zj", zj);//鎬讳环 } bohaiEvaluationAuditService.updateBohaiEvaluationAudit(evaluationAudit); - jsonObject.put("shzt", "价格已审核"); + jsonObject.put("shzt", "浠锋牸宸插鏍�"); } } } else if (evaluationAudit!=null && evaluationAudit.getAuditStatus()==1) { - jsonObject.put("shzt", "价格已审核"); + jsonObject.put("shzt", "浠锋牸宸插鏍�"); FormalReport report = formalReportService.findFormalReportById(evaluationAudit.getEvaluationId()); if(report != null){ - jsonObject.put("shzt", "已申请正式报告"); + jsonObject.put("shzt", "宸茬敵璇锋寮忔姤鍛�"); } } else if (evaluationAudit!=null && evaluationAudit.getAuditStatus()==2) { - jsonObject.put("shzt", "价格待审核"); + jsonObject.put("shzt", "浠锋牸寰呭鏍�"); if(evaluationAudit.getHopePrice()>0){ - //接入反馈结果查询接口 - System.out.println("开始接入反馈结果查询接口......"+evaluationAudit.getFeedbackId()); + //鎺ュ叆鍙嶉缁撴灉鏌ヨ鎺ュ彛 + System.out.println("寮�濮嬫帴鍏ュ弽棣堢粨鏋滄煡璇㈡帴鍙�......"+evaluationAudit.getFeedbackId()); JSONObject object = BHBankUtils.inquireFeedbackCall(evaluationAudit.getFeedbackId()); - System.out.println("完成接入反馈结果查询接口......"+evaluationAudit.getFeedbackId()); + System.out.println("瀹屾垚鎺ュ叆鍙嶉缁撴灉鏌ヨ鎺ュ彛......"+evaluationAudit.getFeedbackId()); if(object!=null){ Integer feedbackStatus = (Integer) object.get("feedbackStatus"); if(feedbackStatus!=0){ @@ -316,23 +316,23 @@ public class WeiXinEvaluationController { if(!callMsg.toString().equals("null")){ evaluationAudit.setFeedbackMsg((String)object.get("feedbackCallMsg")); } - double zsj = DataUtil.getDoubleRound(2,inquirePrice/ 10000.0);//终审价 + double zsj = DataUtil.getDoubleRound(2,inquirePrice/ 10000.0);//缁堝浠� if(zsj == (int)zsj){ - jsonObject.put("zsj", (int)zsj);//终审价 + jsonObject.put("zsj", (int)zsj);//缁堝浠� }else{ - jsonObject.put("zsj", zsj);//终审价 + jsonObject.put("zsj", zsj);//缁堝浠� } bohaiEvaluationAuditService.updateBohaiEvaluationAudit(evaluationAudit); - jsonObject.put("shzt", "审核完成"); + jsonObject.put("shzt", "瀹℃牳瀹屾垚"); } } } }else if (evaluationAudit!=null && evaluationAudit.getAuditStatus()==3) { - jsonObject.put("shzt", "审核完成"); + jsonObject.put("shzt", "瀹℃牳瀹屾垚"); FormalReport report = formalReportService.findFormalReportById(evaluationAudit.getEvaluationId()); if(report != null){ - jsonObject.put("shzt", "已申请正式报告"); + jsonObject.put("shzt", "宸茬敵璇锋寮忔姤鍛�"); } }else{ jsonObject.put("shzt", "-"); @@ -351,7 +351,7 @@ public class WeiXinEvaluationController { } /** - * 估价记录列表 + * 浼颁环璁板綍鍒楄〃 * @param model * @return */ @@ -364,7 +364,7 @@ public class WeiXinEvaluationController { FjtUsers fjtUsers = fjtUsersService.findById(userId); RestfulModelAndView data = new RestfulModelAndView(); JSONObject result = new JSONObject(); - //最多10页 + //鏈�澶�10椤� if (NumberUtils.toInt(page) > 10) { result.put("result", new JSONArray().toString()); data.setModel(result); @@ -381,25 +381,25 @@ public class WeiXinEvaluationController { EvaluationAudit evaluationAudit = evaluationAuditService.findByEvalutionId(fjtEvaluation.getId() + ""); JSONObject jsonObject = new JSONObject(); jsonObject.put("eid", fjtEvaluation.getId()); - jsonObject.put("pgrq", sdf.format(fjtEvaluation.getDateCreated()));//评估日期 - jsonObject.put("tjrq", (evaluationAudit == null || evaluationAudit.getAuditDate() == null) ? "-" : sdf.format(evaluationAudit.getAuditDate()));//调价日期 - jsonObject.put("dz", fjtEvaluation.getAddress());//地址 + jsonObject.put("pgrq", sdf.format(fjtEvaluation.getDateCreated()));//璇勪及鏃ユ湡 + jsonObject.put("tjrq", (evaluationAudit == null || evaluationAudit.getAuditDate() == null) ? "-" : sdf.format(evaluationAudit.getAuditDate()));//璋冧环鏃ユ湡 + jsonObject.put("dz", fjtEvaluation.getAddress());//鍦板潃 jsonObject.put("hn", fjtEvaluation.getHouseNum()); jsonObject.put("rn", fjtEvaluation.getRoomNum()); - jsonObject.put("wylx", StringUtils.isBlank(BUILDTYPE_MAP.get(fjtEvaluation.getBuildType())) ? "-" : BUILDTYPE_MAP.get(fjtEvaluation.getBuildType()));//物业类型 - jsonObject.put("mj", fjtEvaluation.getHouseArea());//面积 - jsonObject.put("zj", fjtEvaluation.getTotalPrice() <= 0 ? "-" : df.format(fjtEvaluation.getTotalPrice() / 10000.0));//总价 - jsonObject.put("ckj", (evaluationAudit == null || evaluationAudit.getDealPrice() == null) ? "-" : df.format(evaluationAudit.getDealPrice()));//参考价 - jsonObject.put("zsj", (evaluationAudit == null || evaluationAudit.getAuditPrice() == null) ? "-" : df.format(evaluationAudit.getAuditPrice()));//终审价 - jsonObject.put("zdr", StringUtils.isBlank(fjtEvaluation.getLender()) ? "-" : fjtEvaluation.getLender());//主贷人 + jsonObject.put("wylx", StringUtils.isBlank(BUILDTYPE_MAP.get(fjtEvaluation.getBuildType())) ? "-" : BUILDTYPE_MAP.get(fjtEvaluation.getBuildType()));//鐗╀笟绫诲瀷 + jsonObject.put("mj", fjtEvaluation.getHouseArea());//闈㈢Н + jsonObject.put("zj", fjtEvaluation.getTotalPrice() <= 0 ? "-" : df.format(fjtEvaluation.getTotalPrice() / 10000.0));//鎬讳环 + jsonObject.put("ckj", (evaluationAudit == null || evaluationAudit.getDealPrice() == null) ? "-" : df.format(evaluationAudit.getDealPrice()));//鍙傝�冧环 + jsonObject.put("zsj", (evaluationAudit == null || evaluationAudit.getAuditPrice() == null) ? "-" : df.format(evaluationAudit.getAuditPrice()));//缁堝浠� + jsonObject.put("zdr", StringUtils.isBlank(fjtEvaluation.getLender()) ? "-" : fjtEvaluation.getLender());//涓昏捶浜� if (evaluationAudit == null || StringUtils.isBlank(evaluationAudit.getAuditStatus())) { jsonObject.put("shzt", "-"); } else if ("UnderReview".equalsIgnoreCase(evaluationAudit.getAuditStatus())) { - jsonObject.put("shzt", "审核中"); + jsonObject.put("shzt", "瀹℃牳涓�"); } else if ("Passed".equalsIgnoreCase(evaluationAudit.getAuditStatus())) { - jsonObject.put("shzt", "审核通过"); + jsonObject.put("shzt", "瀹℃牳閫氳繃"); } else if ("Fail".equalsIgnoreCase(evaluationAudit.getAuditStatus())) { - jsonObject.put("shzt", "审核失败"); + jsonObject.put("shzt", "瀹℃牳澶辫触"); } UserTrades userTrade = userTradesService.findUserTradesByEvaluationId(String.valueOf(fjtEvaluation.getId())); @@ -431,7 +431,7 @@ public class WeiXinEvaluationController { goldLogs.setUserId(user.getId()); goldLogs.setStatus(2); goldLogs.setGoldCount(1); - goldLogs.setContent("微信房产评估"); + goldLogs.setContent("寰俊鎴夸骇璇勪及"); goldLogs.setActionType(0); goldLogs.setDateCreated(new Date()); goldLogs.setLastUpdated(new Date()); @@ -465,7 +465,7 @@ public class WeiXinEvaluationController { evaluation.setLat(0.0); evaluation.setLng(0.0); evaluation.setLoanTotalPrice(0.0); - if(district.getLng2() != null && district.getLat2() != null && district.getLat2() > 0 && district.getCity()!=null && district.getCity().equals("上海")){ + if(district.getLng2() != null && district.getLat2() != null && district.getLat2() > 0 && district.getCity()!=null && district.getCity().equals("涓婃捣")){ String loopline = getLoopLineInfo(district.getLng2() /10000000000d, district.getLat2()/10000000000d, district.getCity()); evaluation.setLoopLine(loopline); } @@ -474,9 +474,9 @@ public class WeiXinEvaluationController { FjtUsers fjtUser = fjtUsersService.findById(Long.valueOf(userId)); if(fjtUser!=null && fjtUser.getRole()==17) { - evaluation.setDirection(3);//渤海朝向默认南 + evaluation.setDirection(3);//娓ゆ捣鏈濆悜榛樿鍗� if(StringUtils.isBlank(evaluation.getUseType())){ - evaluation.setUseType("居住"); + evaluation.setUseType("灞呬綇"); } // BHBankUtils.getInquirePrice(model); } @@ -489,7 +489,7 @@ public class WeiXinEvaluationController { if(fjtUser!=null && fjtUser.getRole()==17) { - System.out.println("渤海地址搜索 "+evaluation.getCertificateAddress()); + System.out.println("娓ゆ捣鍦板潃鎼滅储 "+evaluation.getCertificateAddress()); List bhDists = BHBankUtils.getDistrictByBhbank(evaluation.getCertificateAddress()); JSONObject o = null; if(bhDists.size()==0){ @@ -537,29 +537,29 @@ public class WeiXinEvaluationController { } bhMatchMap.put("preName", district.getName()); bhMatchMap.put("countryCode",regionCode); - System.out.println("【渤海银行】地址查询返回结果"+bhDists.size()+"个"); + System.out.println("銆愭袱娴烽摱琛屻�戝湴鍧�鏌ヨ杩斿洖缁撴灉"+bhDists.size()+"涓�"); } UsersDetail usersDetail = usersDetailService.findById(Long.valueOf(userId)); if(StringUtils.isBlank(usersDetail.getMobile())){ usersDetail.setMobile(fjtUser.getEmail()); } - System.out.println("渤海询价搜索 "+evaluation.getCertificateAddress()); + System.out.println("娓ゆ捣璇环鎼滅储 "+evaluation.getCertificateAddress()); JSONObject bhApiResult = BHBankUtils.getInquirePrice(model, bhMatchMap, usersDetail, evaluation.getTotalPrice()); if(bhApiResult!=null && (Integer)bhApiResult.get("errCode")==0){ - System.out.println("渤海询价搜索结果 "+bhApiResult.toString()); + System.out.println("娓ゆ捣璇环鎼滅储缁撴灉 "+bhApiResult.toString()); JSONObject dataObj = (JSONObject) bhApiResult.get("data"); String queryId = (String) dataObj.get("queryId"); Integer inquirePrice = (Integer) dataObj.get("inquirePrice"); Integer auditStatus = 0; String inquireRemark = (String) dataObj.get("remark"); - if((Integer) bhApiResult.get("errCode") == 1){//待人工核验 + if((Integer) bhApiResult.get("errCode") == 1){//寰呬汉宸ユ牳楠� auditStatus = 0; - }else if((Integer) bhApiResult.get("errCode") == 0 && inquirePrice>0){//正常返回 + }else if((Integer) bhApiResult.get("errCode") == 0 && inquirePrice>0){//姝e父杩斿洖 auditStatus = 1; } fjtEvaluationService.saveEvaluation(evaluation); - System.out.println("保存评估记录成功 "+evaluation.getDistrictName()); + System.out.println("淇濆瓨璇勪及璁板綍鎴愬姛 "+evaluation.getDistrictName()); BohaiEvaluationAudit audit = new BohaiEvaluationAudit(); audit.setEvaluationId(evaluation.getId()); @@ -567,7 +567,7 @@ public class WeiXinEvaluationController { audit.setBackStatus((Integer) bhApiResult.get("errCode") ); audit.setUserId(userId); audit.setInquirePrice(inquirePrice); - audit.setAuditStatus(auditStatus);//0:价格待审核 1:价格已审核 2:有期望价 3:价格确认 + audit.setAuditStatus(auditStatus);//0:浠锋牸寰呭鏍� 1:浠锋牸宸插鏍� 2锛氭湁鏈熸湜浠� 3锛氫环鏍肩‘璁� if(StringUtils.isNotBlank(inquireRemark) && !inquireRemark.equals("None")){ audit.setInquireRemark(inquireRemark); } @@ -580,15 +580,15 @@ public class WeiXinEvaluationController { if(StringUtils.isNotBlank((String)dataObj.get("remark"))){ data.put("msg", (String)dataObj.get("remark")); }else{ - data.put("msg", "估价失败,请重新评估!"); + data.put("msg", "浼颁环澶辫触锛岃閲嶆柊璇勪及锛�"); } }else{ - data.put("msg", "估价失败,请重新评估!"); + data.put("msg", "浼颁环澶辫触锛岃閲嶆柊璇勪及锛�"); } } }else{ fjtEvaluationService.saveEvaluation(evaluation); - System.out.println("保存评估记录成功 "+evaluation.getDistrictName()); + System.out.println("淇濆瓨璇勪及璁板綍鎴愬姛 "+evaluation.getDistrictName()); } data.put("id", String.valueOf(evaluation.getId())); @@ -612,13 +612,13 @@ public class WeiXinEvaluationController { Date endDate = DateUtil.add(DateUtil.formatByPattern(new Date(), "yyyy-MM-dd"), 1); String openId = CookieUtils.getCookieValue(request, "we_chat_open_id"); if(!usersInfoService.checkWeiXinUserIsLogin(openId)){ - data.put("msg","未绑定"); + data.put("msg","鏈粦瀹�"); return json; } FjtUsers users = usersInfoService.findUserByWeChatId(openId); long count = evaluationService.findUserEvaluationCount(1, DateUtil.truncateDay(new Date()), DateUtil.truncateDay(endDate)); if(count > 5 && users.getGoldTotal() <= 0 ){ - data.put("msg", "您今天的免费评估次数已用完,请到房价网充值房豆后再进行评估!"); + data.put("msg", "鎮ㄤ粖澶╃殑鍏嶈垂璇勪及娆℃暟宸茬敤瀹岋紝璇峰埌鎴夸环缃戝厖鍊兼埧璞嗗悗鍐嶈繘琛岃瘎浼帮紒"); return json; } evaluation.setCity(district.getCity()); @@ -637,7 +637,7 @@ public class WeiXinEvaluationController { evaluation.setTotalPrice(Integer.valueOf(totalPrice+"")); evaluation.setAvgPrice((int)(totalPrice/evaluation.getArea())); if(count > 5){ - data.put("msg", "你本次评估使用了1个房豆!"); + data.put("msg", "浣犳湰娆¤瘎浼颁娇鐢ㄤ簡1涓埧璞嗭紒"); users.setGoldTotal(users.getGoldTotal() -1); saveGoldLogs(users); fjtUsersService.update(users); @@ -651,7 +651,7 @@ public class WeiXinEvaluationController { } - //To B 报告结果页 + //To B 鎶ュ憡缁撴灉椤� public Object reportAction(EvaluationModel model){ String evaluationId = model.getEvaluationId(); FjtEvaluation evaluation = fjtEvaluationService.findEvaluationById(Long.valueOf(evaluationId)); @@ -665,11 +665,11 @@ public class WeiXinEvaluationController { District district = districtService.findDistrict(new DistrictKey(evaluation.getCity(), evaluation.getRegion(), evaluation.getDistrictName()), "district"); model.setId(district.getId()); - //参考价 + //鍙傝�冧环 EvaluationAudit evaluationAudit = evaluationAuditService.findByEvalutionId(evaluationId); model.setEvaluationAudit(evaluationAudit); - if(fjtUser!=null && fjtUser.getRole()==17 && district.getCity().equals("上海")){ + if(fjtUser!=null && fjtUser.getRole()==17 && district.getCity().equals("涓婃捣")){ Map retMap = getLoanInfo(district, evaluation.getHouseArea()); if(retMap!=null && retMap.size()>0){ model.setLoanInfoMap(retMap); @@ -691,7 +691,7 @@ public class WeiXinEvaluationController { District district = districtService.findDistrict(new DistrictKey(evaluation.getCity(), evaluation.getRegion(), evaluation.getDistrictName()), "district"); model.setId(district.getId()); - //参考价 + //鍙傝�冧环 BohaiEvaluationAudit bohaiEvaluationAudit = bohaiEvaluationAuditService.findByBohaiEvaluationAuditId(Long.valueOf(evaluationId)); model.setBohaiEvaluationAudit(bohaiEvaluationAudit); @@ -714,8 +714,8 @@ public class WeiXinEvaluationController { UserTrades userTrade = userTradesService.findUserTradesByEvaluationId(model.getEvaluationId()); model.setUserTrades(userTrade); - if(fjtUser!=null && fjtUser.getRole()==17 && district.getCity().equals("上海")){ - System.out.println("渤海用户:"+fjtUser.getEmail()); + if(fjtUser!=null && fjtUser.getRole()==17 && district.getCity().equals("涓婃捣")){ + System.out.println("娓ゆ捣鐢ㄦ埛锛�"+fjtUser.getEmail()); Map retMap = getLoanInfo(district, evaluation.getHouseArea()); if(retMap!=null && retMap.size()>0){ model.setLoanInfoMap(retMap); @@ -723,37 +723,37 @@ public class WeiXinEvaluationController { } return model; } - //To C 报告结果页 + //To C 鎶ュ憡缁撴灉椤� public Object resultAction(EvaluationModel model){ String evaluationId = model.getEvaluationId(); - //估价记录 + //浼颁环璁板綍 Evaluation evaluation = evaluationService.findEvaluationById(evaluationId); model.setEvaluation(evaluation); District district = districtService.findDistrict(new DistrictKey(evaluation.getCity(), evaluation.getRegion(), evaluation.getDistrictName()), "district"); model.setDistrict(district); - //小区均价 + //灏忓尯鍧囦环 DistrictStatBo districtStatBo = districtStatService.findDistrictStat(new DistrictKey(evaluation.getCity(), evaluation.getRegion(), evaluation.getDistrictName())); model.setDistrictStatBo(districtStatBo); - //二手房上周房源量 + //浜屾墜鎴夸笂鍛ㄦ埧婧愰噺 DistrictHouseStat sellHouseStat = districtHouseStatService.findDistrictHouseCount(evaluation.getCity(), evaluation.getRegion(), evaluation.getDistrictName(), "sell"); if(sellHouseStat != null){ model.setSellHouseCount(sellHouseStat.getLastWeekendCount()); } - //租房上周房源量 + //绉熸埧涓婂懆鎴挎簮閲� DistrictHouseStat rentHouseStat = districtHouseStatService.findDistrictHouseCount(evaluation.getCity(), evaluation.getRegion(), evaluation.getDistrictName(), "rent"); if(rentHouseStat != null){ model.setRentHouseCount(rentHouseStat.getLastWeekendCount()); } - //参考价 + //鍙傝�冧环 EvaluationAudit evaluationAudit = evaluationAuditService.findByEvalutionId(evaluationId); model.setEvaluationAudit(evaluationAudit); return model; } - //收藏估价记录 + //鏀惰棌浼颁环璁板綍 public Object collectDistrictAction(EvaluationModel model){ model.setViewType("json"); if(StringUtils.isNotBlank(model.getEvaluationId()) && model.getStatus()!=null){ @@ -764,7 +764,7 @@ public class WeiXinEvaluationController { return model; } - // 均价对比接口(房价通小程序用) + // 鍧囦环瀵规瘮鎺ュ彛(鎴夸环閫氬皬绋嬪簭鐢�) public Object otherSourcePlusAction(EvaluationModel model){ JsonModel jsonMmodel = new JsonModel(); @@ -774,7 +774,7 @@ public class WeiXinEvaluationController { AverageStatistics averageStatistics = averageStatisticsService.findOneAverageStatictics(model.getCityName(), model.getName(), category); Integer tradeAvgPrice = dealPriceService.findDealPrices(model.getCityName(), model.getRegion(), model.getName(), DateUtil.getFirstDayOfMonth(new Date(), -6), DateUtil.getFirstDayOfMonth(new Date(), 0)); - //columnX = "['成交均价(近半年)','房价网挂牌均价','搜房挂牌均价','安居客挂牌均价']"; + //columnX = "['鎴愪氦鍧囦环(杩戝崐骞�)','鎴夸环缃戞寕鐗屽潎浠�','鎼滄埧鎸傜墝鍧囦环','瀹夊眳瀹㈡寕鐗屽潎浠�']"; dataMap.put("dealPrice", tradeAvgPrice); if (averageStatistics != null) { dataMap.put("fjw", averageStatistics.getFangjiaPrice()); @@ -787,7 +787,7 @@ public class WeiXinEvaluationController { return jsonMmodel; } - //均价对比 + //鍧囦环瀵规瘮 public Object otherSourceAction(EvaluationModel model){ JsonModel jsonMmodel = new JsonModel(); @@ -800,9 +800,9 @@ public class WeiXinEvaluationController { String columnX; String columnY; - if(evaluation.getCity().equals("上海")){ + if(evaluation.getCity().equals("涓婃捣")){ Integer tradeAvgPrice = dealPriceService.findDealPrices(evaluation.getCity(), evaluation.getRegion(), evaluation.getDistrictName(), DateUtil.getFirstDayOfMonth(new Date(), -6), DateUtil.getFirstDayOfMonth(new Date(), 0)); - columnX = "['成交均价(近半年)','房价网挂牌均价','搜房挂牌均价','安居客挂牌均价']"; + columnX = "['鎴愪氦鍧囦环(杩戝崐骞�)','鎴夸环缃戞寕鐗屽潎浠�','鎼滄埧鎸傜墝鍧囦环','瀹夊眳瀹㈡寕鐗屽潎浠�']"; if(averageStatistics!=null){ columnY = "[{color:'#ffcccc',y:"+tradeAvgPrice+"},{color:'#ffe5cc',y:"+ averageStatistics.getFangjiaPrice()+"},{color:'#ccffdd',y:"+ averageStatistics.getSoufangEsfPrice()+"},{color:'#cce5ff',y:"+ averageStatistics.getAnjukeEsfPrice()+"}]"; }else{ @@ -810,7 +810,7 @@ public class WeiXinEvaluationController { } }else{ - columnX = "['房价网挂牌均价','搜房挂牌均价','安居客挂牌均价','新浪挂牌均价']"; + columnX = "['鎴夸环缃戞寕鐗屽潎浠�','鎼滄埧鎸傜墝鍧囦环','瀹夊眳瀹㈡寕鐗屽潎浠�','鏂版氮鎸傜墝鍧囦环']"; if(averageStatistics!=null){ columnY = "[{color:'#ffcccc',y:"+ averageStatistics.getFangjiaPrice()+"},{color:'#ffe5cc',y:"+ averageStatistics.getSoufangEsfPrice()+"},{color:'#ccffdd',y:"+ averageStatistics.getAnjukeEsfPrice()+"},{color:'#cce5ff',y:"+averageStatistics.getSinaEsfPrice()+"}]"; }else{ @@ -835,7 +835,7 @@ public class WeiXinEvaluationController { } - //参考房源 + //鍙傝�冩埧婧� public Object houseReferenceAction(EvaluationModel model){ JsonModel jsonMmodel = new JsonModel(); List houseBos = new ArrayList(); @@ -854,7 +854,7 @@ public class WeiXinEvaluationController { return jsonMmodel; } - //成交参考 + //鎴愪氦鍙傝�� public Object tradeReferenceAction(EvaluationModel model){ JsonModel jsonMmodel = new JsonModel(); Map dataMap = new HashMap(); @@ -886,7 +886,7 @@ public class WeiXinEvaluationController { return jsonMmodel; } - //保存主贷人 + //淇濆瓨涓昏捶浜� public Object updateLenderAction(EvaluationModel model){ JsonModel jsonMmodel = new JsonModel(); if(StringUtils.isNotBlank(model.getEvaluationId()) && StringUtils.isNotBlank(model.getLender())){ @@ -898,7 +898,7 @@ public class WeiXinEvaluationController { } - //修改身份证号 + //淇敼韬唤璇佸彿 public Object updateCardIdAction(EvaluationModel model){ JsonModel jsonMmodel = new JsonModel(); if(StringUtils.isNotBlank(model.getEvaluationId()) && StringUtils.isNotBlank(model.getCardId())){ @@ -910,7 +910,7 @@ public class WeiXinEvaluationController { return jsonMmodel; } - //用户输入参考价 + //鐢ㄦ埛杈撳叆鍙傝�冧环 public Object saveDealPriceAction(EvaluationModel model){ JsonModel jsonMmodel = new JsonModel(); if(StringUtils.isNotBlank(model.getEvaluationId()) && model.getDealPrice()!=null){ @@ -939,7 +939,7 @@ public class WeiXinEvaluationController { evaluationAudit.setVersion(1); evaluationAuditService.save(evaluationAudit); } - String smsContent = "【房价网】微信端调价地址:"+evaluationAudit.getCity()+" "+evaluationAudit.getInput()+",成交价:"+evaluationAudit.getDealPrice()+"万,请及时审核!用户邮箱: "+evaluationAudit.getUserName(); + String smsContent = "銆愭埧浠风綉銆戝井淇$璋冧环鍦板潃锛�"+evaluationAudit.getCity()+" "+evaluationAudit.getInput()+"锛屾垚浜や环锛�"+evaluationAudit.getDealPrice()+"涓囷紝璇峰強鏃跺鏍革紒鐢ㄦ埛閭: "+evaluationAudit.getUserName(); try { for (String mobile : MOBILES) { smsService.send(mobile, smsContent); @@ -962,7 +962,7 @@ public class WeiXinEvaluationController { evaluationAudit.setLastUpdated(new Date()); evaluationAudit.setAuditStatus(2); - //期望价反馈接口 + //鏈熸湜浠峰弽棣堟帴鍙� UsersDetail usersDetail = usersDetailService.findById(evaluationAudit.getUserId()); String feedbackId = BHBankUtils.inquireFeedback(usersDetail.getName(), evaluationAudit.getQueryId(), model.getHopePrice()); if(StringUtils.isNotBlank(feedbackId)){ @@ -1000,7 +1000,7 @@ public class WeiXinEvaluationController { return jsonMmodel; } - //刷新审核价 + //鍒锋柊瀹℃牳浠� public Object refreshAuditPriceAction(EvaluationModel model){ JsonModel jsonMmodel = new JsonModel(); Map dataMap = new HashMap(); @@ -1117,7 +1117,7 @@ public class WeiXinEvaluationController { fjtEvaluationService.updateEvaluation(evaluation); try { - String smsContent = "【房价网】微信询价报告发送 用户邮箱:"+model.getEmail(); + String smsContent = "銆愭埧浠风綉銆戝井淇¤浠锋姤鍛婂彂閫� 鐢ㄦ埛閭锛�"+model.getEmail(); smsService.sendDingMsgByRobot(DD_ID, smsContent); } catch (SmsException e) { @@ -1147,7 +1147,7 @@ public class WeiXinEvaluationController { } } } catch (IOException e) { - //处理异常信息 + //澶勭悊寮傚父淇℃伅 System.out.println(e.getMessage()); } } @@ -1211,42 +1211,42 @@ public class WeiXinEvaluationController { try { FjtEvaluation evaluation = fjtEvaluationService.findEvaluationById(Long.valueOf(evaluationId)); FjtUsers fjtUsers = fjtUsersService.findById(evaluation.getUserId()); - // 发邮件给用户 + // 鍙戦偖浠剁粰鐢ㄦ埛 if(evaluation != null){ String address = evaluation.getAddress(); if(StringUtils.isNotBlank(evaluation.getHouseNum())){ - address = address +evaluation.getHouseNum()+"栋"; + address = address +evaluation.getHouseNum()+"鏍�"; } if(StringUtils.isNotBlank(evaluation.getRoomNum())){ - address = address + evaluation.getRoomNum()+"室"; + address = address + evaluation.getRoomNum()+"瀹�"; } Mail mail = new Mail(); mail.setReceiver(new MailUser(email)); - mail.setSubject("【房价网询价报告】"+address); + mail.setSubject("銆愭埧浠风綉璇环鎶ュ憡銆�"+address); StringBuffer emailMsg = new StringBuffer(); - emailMsg.append("老师,您好

") - .append("附件是您需要的询价报告,请查收,谢谢!

") - .append("祝,工作顺利!

"); + emailMsg.append("鑰佸笀锛屾偍濂�

") + .append("闄勪欢鏄偍闇�瑕佺殑璇环鎶ュ憡锛岃鏌ユ敹锛岃阿璋紒

") + .append("绁濓紝宸ヤ綔椤哄埄锛�

"); if(fjtUsers.getRole() == 16){ - emailMsg.append("如有任何问题可随时与我们联系,联系电话:021-31075061/021-31075062

"); - emailMsg.append("微信查询:18217519040(微信号)

"); + emailMsg.append("濡傛湁浠讳綍闂鍙殢鏃朵笌鎴戜滑鑱旂郴锛岃仈绯荤數璇濓細021-31075061/021-31075062

"); + emailMsg.append("寰俊鏌ヨ锛�18217519040锛堝井淇″彿锛�

"); }else{ - emailMsg.append("如有任何问题可随时与我们联系,联系电话:021-62392317/021-62397088

"); + emailMsg.append("濡傛湁浠讳綍闂鍙殢鏃朵笌鎴戜滑鑱旂郴锛岃仈绯荤數璇濓細021-62392317/021-62397088

"); } mail.setContent(emailMsg.toString()); mail.setImportant(true); mail.setAttachment(true); - mail.setAttachmentDes("【房价网询价报告】"+address); + mail.setAttachmentDes("銆愭埧浠风綉璇环鎶ュ憡銆�"+address); mail.setAttachmentName(DateUtils.format(new Date(), "yyyy-MM-dd") +"_"+evaluation.getReportNum()+".pdf"); //mail.setAttachmentUrl("http://user.fangjia.com/fangjiatong2/evaluation/exportPdf?evaluationId=3344841&bkoffDownload=true&userId=183169"); //String url = "http://192.168.0.222:9166/evaluation/exportPdf?evaluationId="+evaluation.getId()+"&bkoffDownload=true&userId="+evaluation.getUserId(); String url = fjtUrl + "/evaluation/exportPdf?evaluationId="+evaluation.getId()+"&bkoffDownload=true&userId="+evaluation.getUserId(); - System.out.println("下载地址:"+url); + System.out.println("涓嬭浇鍦板潃锛�"+url); mail.setAttachmentUrl(url); emailService.sendHtmlMailWithFile(mail); } @@ -1273,21 +1273,21 @@ public class WeiXinEvaluationController { } private String getLoopLineInfo(double lng , double lat, String city){ - boolean flag = isInArea(lng, lat, city, "内环"); + boolean flag = isInArea(lng, lat, city, "鍐呯幆"); String loopLine = ""; if(flag){ - loopLine = "内环以内"; + loopLine = "鍐呯幆浠ュ唴"; }else{ - flag = isInArea(lng, lat,city,"中环"); + flag = isInArea(lng, lat,city,"涓幆"); if(flag){ - loopLine = "中内环之间"; + loopLine = "涓唴鐜箣闂�"; }else{ - flag = isInArea(lng, lat, city, "外环"); + flag = isInArea(lng, lat, city, "澶栫幆"); if(flag){ - loopLine = "中外环之间"; + loopLine = "涓鐜箣闂�"; }else{ - loopLine = "外环以外"; + loopLine = "澶栫幆浠ュ"; } } @@ -1323,7 +1323,7 @@ public class WeiXinEvaluationController { } Integer yearAge = getBuildYear(district.getFinishBuildingDate()); if(pbObj!=null){ - System.out.println("渤海银行:"+district.getName() +" 年限:"+yearAge+" Level:"+pbObj.getLevel()+" 所属板块:"+pbObj.getName()); + System.out.println("娓ゆ捣閾惰锛�"+district.getName() +" 骞撮檺锛�"+yearAge+" Level:"+pbObj.getLevel()+" 鎵�灞炴澘鍧楋細"+pbObj.getName()); } Map retsMap = new HashMap(); if(pbObj!=null && pbObj.getLevel()!=null && pbObj.getLevel()==1 && yearAge!=null && yearAge<=25 && area>=60){ @@ -1369,16 +1369,16 @@ public class WeiXinEvaluationController { RestfulModelAndView mav = new RestfulModelAndView(); List files = model.getReportFiles(); if(files == null || files.size()<=1){ - mav.setModel(BasicModel.buildBadRequestModel("请选择要上传的文件")); + mav.setModel(BasicModel.buildBadRequestModel("璇烽�夋嫨瑕佷笂浼犵殑鏂囦欢")); return mav; } if(model.getEvaluationId()==null || model.getQueryId()==null){ - mav.setModel(BasicModel.buildBadRequestModel("评估编号或查询编号为空")); + mav.setModel(BasicModel.buildBadRequestModel("璇勪及缂栧彿鎴栨煡璇㈢紪鍙蜂负绌�")); return mav; } if(model.getFileClass()==3 && files.size()<7){ - mav.setModel(BasicModel.buildBadRequestModel("上传图片不能少于6张")); + mav.setModel(BasicModel.buildBadRequestModel("涓婁紶鍥剧墖涓嶈兘灏戜簬6寮�")); return mav; } @@ -1411,13 +1411,13 @@ public class WeiXinEvaluationController { try { tempFile.createNewFile(); } catch (IOException e) { - //处理异常信息 + //澶勭悊寮傚父淇℃伅 } try { inputStreamToFile(file.getInputStream(), tempFile); uploadfiles.add(tempFile); } catch (IOException e) { - //处理异常信息 + //澶勭悊寮傚父淇℃伅 } String id = new ObjectId().toString(); @@ -1442,16 +1442,16 @@ public class WeiXinEvaluationController { if(jsonObj!=null && (Integer)jsonObj.get("errCode")!=0) { mav.setModel(BasicModel.buildServerErrorModel().setMsg((String) jsonObj.get("errMsg"))); }else{ - mav.setModel(BasicModel.buildServerErrorModel().setMsg(("文件上传成功!"))); + mav.setModel(BasicModel.buildServerErrorModel().setMsg(("鏂囦欢涓婁紶鎴愬姛锛�"))); } }else{ - mav.setModel(BasicModel.buildServerErrorModel().setMsg("上传失败!")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("涓婁紶澶辫触锛�")); } } } catch (Exception e) { e.printStackTrace(); - mav.setModel(BasicModel.buildServerErrorModel().setMsg("文件上传失败!")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("鏂囦欢涓婁紶澶辫触锛�")); } return mav; } @@ -1504,9 +1504,9 @@ public class WeiXinEvaluationController { } } - //将InputStream类型转化为File类型 + //灏咺nputStream绫诲瀷杞寲涓篎ile绫诲瀷 private static void inputStreamToFile(InputStream ins, File file) { - //将输出流转化为文件即可 + //灏嗚緭鍑烘祦杞寲涓烘枃浠跺嵆鍙� FileOutputStream os = null; try { os = new FileOutputStream(file); @@ -1516,7 +1516,7 @@ public class WeiXinEvaluationController { os.write(buffer, 0, bytesRead); } } catch (Exception e) { - throw new RuntimeException("调用inputStreamToFile产生异常:" + e.getMessage()); + throw new RuntimeException("璋冪敤inputStreamToFile浜х敓寮傚父锛�" + e.getMessage()); } finally { try { if (os != null) { @@ -1526,7 +1526,7 @@ public class WeiXinEvaluationController { ins.close(); } } catch (IOException e) { - throw new RuntimeException("inputStreamToFile关闭io时产生异常:" + e.getMessage()); + throw new RuntimeException("inputStreamToFile鍏抽棴io鏃朵骇鐢熷紓甯革細" + e.getMessage()); } } } @@ -1534,7 +1534,7 @@ public class WeiXinEvaluationController { /** - * 保存图片到FS + * 淇濆瓨鍥剧墖鍒癋S */ private List savePics(String districtId, List pics) { List ret = new ArrayList(pics.size()); @@ -1565,7 +1565,7 @@ public class WeiXinEvaluationController { } /** - * 验证图片文件类型,目前支持gif、jpg + * 楠岃瘉鍥剧墖鏂囦欢绫诲瀷锛岀洰鍓嶆敮鎸乬if銆乯pg * * @param pic * @return diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/xcx/WeiXinxcxController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/xcx/WeiXinxcxController.java index d6f33f9b2..0108fc56f 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/xcx/WeiXinxcxController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/xcx/WeiXinxcxController.java @@ -12,7 +12,7 @@ import com.fangjia.core.util.HttpRequestException; import com.fangjia.core.util.XCXConstant; import com.fangjia.open.compatible.model.JsonModel; /** - * 微信小程序相关数据接口 + * 寰俊灏忕▼搴忕浉鍏虫暟鎹帴鍙� * @author user * */ diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/xcx/XcxInfoController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/xcx/XcxInfoController.java index 4d3772584..3addd6893 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/xcx/XcxInfoController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/xcx/XcxInfoController.java @@ -38,7 +38,7 @@ import com.fangjia.service.mongo.fangjia.XcxLoanInfoService; import com.fangjia.service.mongo.fangjia.XcxUserInfoService; import com.google.common.collect.ImmutableMap; /** - * 微信小程序相关数据接口 + * 寰俊灏忕▼搴忕浉鍏虫暟鎹帴鍙� * @author user * */ @@ -70,9 +70,9 @@ public class XcxInfoController { } /** - * 保存用户授权的用户微信昵称和头像 - * @param nickName 昵称 - * @param logoUrl 用户头像 + * 淇濆瓨鐢ㄦ埛鎺堟潈鐨勭敤鎴峰井淇℃樀绉板拰澶村儚 + * @param nickName 鏄电О + * @param logoUrl 鐢ㄦ埛澶村儚 * @return */ public Object wxInfoAction(@Param(name = "sid") String sid,@Param(name = "code")String code,@Param(name = "nickName") String nickName,@Param(name = "logoUrl") String logoUrl) { @@ -85,7 +85,7 @@ public class XcxInfoController { } /** - * 小程序已经评估总数的count 以及最新三位使用者的头像照片 + * 灏忕▼搴忓凡缁忚瘎浼版�绘暟鐨刢ount 浠ュ強鏈�鏂颁笁浣嶄娇鐢ㄨ�呯殑澶村儚鐓х墖 * @param sid * @return */ @@ -101,7 +101,7 @@ public class XcxInfoController { } /** - * 最新一次的故事 + * 鏈�鏂颁竴娆$殑鏁呬簨 * @param sid * @return */ @@ -115,7 +115,7 @@ public class XcxInfoController { /** - * 评估出房子对应的小区故事 + * 璇勪及鍑烘埧瀛愬搴旂殑灏忓尯鏁呬簨 * @param city * @param region * @param name @@ -144,7 +144,7 @@ public class XcxInfoController { } /** - * 获取小程序登陆opeid并保存登陆信息 + * 鑾峰彇灏忕▼搴忕櫥闄唎peid骞朵繚瀛樼櫥闄嗕俊鎭� * @param code * @return */ @@ -155,7 +155,7 @@ public class XcxInfoController { } catch (InterruptedException e) { e.printStackTrace(); }*/ - //判断缓存中的session是否还存在,不存在则获取,存在则去缓存 + //鍒ゆ柇缂撳瓨涓殑session鏄惁杩樺瓨鍦�,涓嶅瓨鍦ㄥ垯鑾峰彇锛屽瓨鍦ㄥ垯鍘荤紦瀛� XcxKey sessionValue = getSessionValue(code,sid); Map map = new HashMap(); map.put("sid", sessionValue.getSid()); @@ -165,7 +165,7 @@ public class XcxInfoController { } /** - * 根据sid获取openid相关信息 + * 鏍规嵁sid鑾峰彇openid鐩稿叧淇℃伅 * @param sid * @return */ @@ -177,13 +177,13 @@ public class XcxInfoController { sessionValue.setSid(sid); sessionValue.setOpenId(sid); } - //缓存中没有登陆信息 + //缂撳瓨涓病鏈夌櫥闄嗕俊鎭� if(sessionValue==null){ - //获取openid信息 + //鑾峰彇openid淇℃伅 sessionValue = xcxUserInfoService.getOpenId(code); XcxUserInfo user = null; if(sessionValue!=null&&StringUtils.isNotBlank(sessionValue.getOpenId())){ - //根据是否是第一次使用,保存并查询除用户信息 + //鏍规嵁鏄惁鏄涓�娆′娇鐢紝淇濆瓨骞舵煡璇㈤櫎鐢ㄦ埛淇℃伅 user = xcxUserInfoService.save(sessionValue.getOpenId(), null); sessionValue.setSid(sessionValue.getOpenId()); } @@ -195,7 +195,7 @@ public class XcxInfoController { /** - * 小程序估价接口 + * 灏忕▼搴忎及浠锋帴鍙� * @param model * @return */ @@ -205,19 +205,19 @@ public class XcxInfoController { mav.setViewType("rest"); if (StringUtils.isBlank(model.getCity())) { - mav.setModel(BasicModel.buildBadRequestModel("city(城市)不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("city(鍩庡競)涓嶈兘涓虹┖")); return mav; } if (StringUtils.isBlank(model.getDistrict())) { - mav.setModel(BasicModel.buildBadRequestModel("district(区域)不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("district(鍖哄煙)涓嶈兘涓虹┖")); return mav; } if (StringUtils.isBlank(model.getName())) { - mav.setModel(BasicModel.buildBadRequestModel("name(小区名)不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("name(灏忓尯鍚�)涓嶈兘涓虹┖")); return mav; } if (0 >= model.getSize()) { - mav.setModel(BasicModel.buildBadRequestModel("size(面积)不能为空")); + mav.setModel(BasicModel.buildBadRequestModel("size(闈㈢Н)涓嶈兘涓虹┖")); return mav; } String sid = model.getSid(); @@ -275,7 +275,7 @@ public class XcxInfoController { resultMap.put("avgMode", avgMap); resultMap.put("sampleMode", sampleMap); resultMap.put("final", finalMap); - //保存估价纪录 + //淇濆瓨浼颁环绾綍 xe.setTotalPrice((double)(evaluationBo.getFinalValue())); xe.setAvgPrice((int)(evaluationBo.getFinalValue() / model.getSize())); xcxEvaluationService.save(xe); @@ -285,20 +285,20 @@ public class XcxInfoController { resultMap.put("evalId", xcxEval.getId()); } }else{ - System.out.println("sessionValue没有值"); + System.out.println("sessionValue娌℃湁鍊�"); } - System.out.println("估价都结束了"); + System.out.println("浼颁环閮界粨鏉熶簡"); mav.setModel(BasicModel.buildOKModel().setResult(resultMap)); }else { - System.out.println("无法估价"); - mav.setModel(BasicModel.buildBadRequestModel("该小区不支持估价")); + System.out.println("鏃犳硶浼颁环"); + mav.setModel(BasicModel.buildBadRequestModel("璇ュ皬鍖轰笉鏀寔浼颁环")); } return mav; } /** - * 微信小程序:小区详情获取 + * 寰俊灏忕▼搴�:灏忓尯璇︽儏鑾峰彇 * @return */ public Object districtForXcxAction(@Param(name = "city")String city, @Param(name = "region")String region, @@ -311,7 +311,7 @@ public class XcxInfoController { Integer weeklyUpRate = 0; long lastMonthHouseCount = houseService.getHouseCountByOneMonth(new DistrictKey(city, region, name), DateUtil.getDateOfLastMonth(new Date(), -1)); - //小区均价 + //灏忓尯鍧囦环 DistrictStatBo districtStatBo = districtStatService.findDistrictStat(new DistrictKey(city, region, name)); if(districtStatBo != null) { @@ -325,7 +325,7 @@ public class XcxInfoController { } - //租房上周房源量 + //绉熸埧涓婂懆鎴挎簮閲� RentHouseQueryBean queryBean = new RentHouseQueryBean(); queryBean.setCity(city); queryBean.setRegion(region); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/AroundDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/AroundDto.java index eb75523bd..3728b836d 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/AroundDto.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/AroundDto.java @@ -9,7 +9,7 @@ import com.fangjia.core.util.DataUtil; import com.fangjia.service.open.DistrictBo; /** - * 小区周边信息bean + * 灏忓尯鍛ㄨ竟淇℃伅bean * * @author zengshaohui */ @@ -19,21 +19,21 @@ public class AroundDto implements Serializable { /** - * 名称 + * 鍚嶇О */ private String name; /** - * 纬度 + * 绾害 */ private Double lat; /** - * 经度 + * 缁忓害 */ private Double lng; /** - * 距离 + * 璺濈 */ private Integer distance; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/BusinessCaseDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/BusinessCaseDto.java index b0fd56b1a..48083e3db 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/BusinessCaseDto.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/BusinessCaseDto.java @@ -1,18 +1,18 @@ package com.fangjia.open.dto; public class BusinessCaseDto { - private String id;//房源id - private String city;//城市 - private String district;//区域 - private String name;//楼盘名称 - private Integer distance;//距离(单位:米) - private String location;//经纬度 - private Double size;//面积(单位:平米) - private Number unitPrice;//单价(单位:元/平米) - private Integer totalPrice;//总价(单位:元) - private Integer floor;//所在楼层 - private String caseDate;//案例时间(如: 2013-07-12) - private String estateType;//类型 + private String id;//鎴挎簮id + private String city;//鍩庡競 + private String district;//鍖哄煙 + private String name;//妤肩洏鍚嶇О + private Integer distance;//璺濈(鍗曚綅锛氱背) + private String location;//缁忕含搴� + private Double size;//闈㈢Н(鍗曚綅锛氬钩绫�) + private Number unitPrice;//鍗曚环(鍗曚綅锛氬厓/骞崇背) + private Integer totalPrice;//鎬讳环(鍗曚綅锛氬厓) + private Integer floor;//鎵�鍦ㄦゼ灞� + private String caseDate;//妗堜緥鏃堕棿锛堝: 2013-07-12锛� + private String estateType;//绫诲瀷 public String getId() { return id; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/CcbRentDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/CcbRentDto.java index 55ff07adc..999ac9394 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/CcbRentDto.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/CcbRentDto.java @@ -5,7 +5,7 @@ import groovy.transform.builder.Builder; import java.io.Serializable; /** - * 建行租金dto + * 寤鸿绉熼噾dto * * @author shenjian * @since 2021/4/6 @@ -14,29 +14,29 @@ import java.io.Serializable; public class CcbRentDto implements Serializable { private String city; - // 区域 + // 鍖哄煙 private String district; - // 小区名 + // 灏忓尯鍚� private String name; - // 面积 + // 闈㈢Н private Double size; - // 半径 + // 鍗婂緞 private Integer radius; - // 室 + // 瀹� private Integer room; - // 厅 + // 鍘� private Integer hall; - // 卫 + // 鍗� private Integer toilet; - // 所在楼层 + // 鎵�鍦ㄦゼ灞� private Integer floor; - // 总楼层 + // 鎬绘ゼ灞� private Integer height; - // 朝向 + // 鏈濆悜 private String direction; - // 装修情况 + // 瑁呬慨鎯呭喌 private String fitment; - // 电梯配套 + // 鐢垫閰嶅 private Boolean hasLift; public String getCity() { diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/CityDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/CityDto.java index 951932c96..d458619fb 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/CityDto.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/CityDto.java @@ -7,7 +7,7 @@ import java.util.ArrayList; import java.util.List; /** - * 城市数据传说对象 + * 鍩庡競鏁版嵁浼犺瀵硅薄 * * @author liupei */ @@ -15,46 +15,46 @@ import java.util.List; @XStreamAlias("city") public class CityDto implements Serializable { /** - * 城市名 + * 鍩庡競鍚� */ private String name; /** - * 城市全拼 + * 鍩庡競鍏ㄦ嫾 */ private String spell; /** - * 城市首字母 + * 鍩庡競棣栧瓧姣� */ private String firstLetter; /** - * 城市纬度 + * 鍩庡競绾害 */ private Double lat; /** - * 城市经度 + * 鍩庡競缁忓害 */ private Double lng; /** - * 城市纬度 + * 鍩庡競绾害 */ private Boolean supportDistrict; /** - * 别名 + * 鍒悕 */ private List aliasList = null; /** - * 城市等级(尹吉欢17-10-29增加) + * 鍩庡競绛夌骇锛堝肮鍚夋17-10-29澧炲姞锛� */ private int cityGrade; /** - * 省份 (尹吉欢17-10-29增加) + * 鐪佷唤 锛堝肮鍚夋17-10-29澧炲姞锛� */ private String province; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/CityNewPriceDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/CityNewPriceDto.java index 4b09649d3..3742a3290 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/CityNewPriceDto.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/CityNewPriceDto.java @@ -16,24 +16,24 @@ CityNewPriceDto implements Serializable{ private static final long serialVersionUID = 6256272580683680157L; /** - * 上涨数量 + * 涓婃定鏁伴噺 */ private Integer upCount; /** - * 下跌量 + * 涓嬭穼閲� */ private Integer downCount; /** - * 平均上涨幅度 + * 骞冲潎涓婃定骞呭害 */ private Double avgUp; /** - * 平均下跌幅度 + * 骞冲潎涓嬭穼骞呭害 */ private Double avgDown; /** - * 城市年涨跌幅 + * 鍩庡競骞存定璺屽箙 */ private Double yoy; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/CityStatDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/CityStatDto.java index 3feeed4f3..7f17edf0c 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/CityStatDto.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/CityStatDto.java @@ -3,19 +3,19 @@ package com.fangjia.open.dto; import java.io.Serializable; /** - * 城市均价数据传输对象,包含二手房均价和租房均价 + * 鍩庡競鍧囦环鏁版嵁浼犺緭瀵硅薄锛屽寘鍚簩鎵嬫埧鍧囦环鍜岀鎴垮潎浠� * * @author */ @SuppressWarnings("serial") public class CityStatDto implements Serializable { /** - * 城市名 + * 鍩庡競鍚� */ private String name; /** - * 城市全拼 + * 鍩庡競鍏ㄦ嫾 */ private String spell; private int[] point; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/CollateralEvaluationInfoDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/CollateralEvaluationInfoDto.java index ac9784729..1e6e388f2 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/CollateralEvaluationInfoDto.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/CollateralEvaluationInfoDto.java @@ -29,61 +29,61 @@ public class CollateralEvaluationInfoDto { private int avgPrice; private int purchasePrice; private int marketPrice; - private Double priceStability;//价格异常指数 - private List districtSellStats;//小区近12个月的涨幅 - private List citySellStats;//城市近12个月的涨幅 - private List regionSellStats;//区域近12个月的年涨跌幅 - private Double collateralTotalScore;//押品综合评分 - private Double maxCollateralRate;//最高抵押率 - private int loneAmount;//可贷款金额 - private long quoteHouseSix;//6个月挂牌量 - private long quertHouseOne;//1个月挂牌量 - private long houseSellSix;//6个月成交量 - private long houseSellOne;//1个月成交量 - private int famousAgency;//知名中介 - private int otherAgency;//其他中介 - private int maxAgencyMount;//最大中介数 - private Double agencyLevelRate;//中介数在当前城市排名比 - private Double sixQuoteLevelRate;//小区在城市中六个月成交量排名比 - private Double sixSellHouseLevelRate;//小区在城市中六个月排名比 - private int sixMaxQuoteMount;//近六个月最大挂牌量 - private int sixMaxSellMount;//近六个月最大成交量 - private Double houseHoldRate;//户数排名比 - private int maxHouseHold;//最大户数 - private Double priceRate;//均价在城市排名 - private Double handleDegreeScore;//处置难以度 + private Double priceStability;//浠锋牸寮傚父鎸囨暟 + private List districtSellStats;//灏忓尯杩�12涓湀鐨勬定骞� + private List citySellStats;//鍩庡競杩�12涓湀鐨勬定骞� + private List regionSellStats;//鍖哄煙杩�12涓湀鐨勫勾娑ㄨ穼骞� + private Double collateralTotalScore;//鎶煎搧缁煎悎璇勫垎 + private Double maxCollateralRate;//鏈�楂樻姷鎶肩巼 + private int loneAmount;//鍙捶娆鹃噾棰� + private long quoteHouseSix;//6涓湀鎸傜墝閲� + private long quertHouseOne;//1涓湀鎸傜墝閲� + private long houseSellSix;//6涓湀鎴愪氦閲� + private long houseSellOne;//1涓湀鎴愪氦閲� + private int famousAgency;//鐭ュ悕涓粙 + private int otherAgency;//鍏朵粬涓粙 + private int maxAgencyMount;//鏈�澶т腑浠嬫暟 + private Double agencyLevelRate;//涓粙鏁板湪褰撳墠鍩庡競鎺掑悕姣� + private Double sixQuoteLevelRate;//灏忓尯鍦ㄥ煄甯備腑鍏釜鏈堟垚浜ら噺鎺掑悕姣� + private Double sixSellHouseLevelRate;//灏忓尯鍦ㄥ煄甯備腑鍏釜鏈堟帓鍚嶆瘮 + private int sixMaxQuoteMount;//杩戝叚涓湀鏈�澶ф寕鐗岄噺 + private int sixMaxSellMount;//杩戝叚涓湀鏈�澶ф垚浜ら噺 + private Double houseHoldRate;//鎴锋暟鎺掑悕姣� + private int maxHouseHold;//鏈�澶ф埛鏁� + private Double priceRate;//鍧囦环鍦ㄥ煄甯傛帓鍚� + private Double handleDegreeScore;//澶勭疆闅句互搴� private Double increaseScore; private int houseHoldMount; - private Double cbdpIncreaseRate;//cpdp抵押品库平均增长率排名 - private Double yoyIncrease;// 押品近一年镇长率 - private Double priceCpdbRankRate;//cpdb低压品库均价排名排名 - private Double cpdbScoreLevelRate;//cpdb抵押品库中的得分排名 - private Double cityScoreLevelRate;//得分在城市中的排名 - private Double increaseRate;//涨幅在城市排名 - private List outPics;//小区图片 - private Double lng;//经度 - private Double lat;//纬度 - private List> houses;//房源信息 + private Double cbdpIncreaseRate;//cpdp鎶垫娂鍝佸簱骞冲潎澧為暱鐜囨帓鍚� + private Double yoyIncrease;// 鎶煎搧杩戜竴骞撮晣闀跨巼 + private Double priceCpdbRankRate;//cpdb浣庡帇鍝佸簱鍧囦环鎺掑悕鎺掑悕 + private Double cpdbScoreLevelRate;//cpdb鎶垫娂鍝佸簱涓殑寰楀垎鎺掑悕 + private Double cityScoreLevelRate;//寰楀垎鍦ㄥ煄甯備腑鐨勬帓鍚� + private Double increaseRate;//娑ㄥ箙鍦ㄥ煄甯傛帓鍚� + private List outPics;//灏忓尯鍥剧墖 + private Double lng;//缁忓害 + private Double lat;//绾害 + private List> houses;//鎴挎簮淇℃伅 private Map averageStatistics; - private Integer houseAge;//房子年龄 - private Integer cityDistrictMinSellPrice;//城市均价最小 - private Integer cityDistrictMaxSellPrice;//城市均价最大 - private Double regionPriceStability;//区域价格稳定排名 - private Double cityPriceStability;//城市价格稳定度排名 - private Double disMom;//小区月涨跌幅 - private Integer metroCount;//周围地铁数量 - private Integer busCount;//周围公交数量 - private Double trafficLevelRate;//交通城市排名 - private Integer maxTrafficCount;//城市最大交通数量 - private Integer trafficCount;//周围交通数量 - private Double priceStabilityLess;//一年以内的价格稳定指数 - private Integer districtCount;//周围小区数量 - private Double districtCountLevel;//周围小区数量排名 - private Integer maxDistrictCount;//城市里面最大的小区数量 - private Integer cityAvgPrice;//城市均价 - private Double quoteScore;//发布量得分 - private Double trafficScore;//交通得分 - private Double agencyScore;//周边中介得分 + private Integer houseAge;//鎴垮瓙骞撮緞 + private Integer cityDistrictMinSellPrice;//鍩庡競鍧囦环鏈�灏� + private Integer cityDistrictMaxSellPrice;//鍩庡競鍧囦环鏈�澶� + private Double regionPriceStability;//鍖哄煙浠锋牸绋冲畾鎺掑悕 + private Double cityPriceStability;//鍩庡競浠锋牸绋冲畾搴︽帓鍚� + private Double disMom;//灏忓尯鏈堟定璺屽箙 + private Integer metroCount;//鍛ㄥ洿鍦伴搧鏁伴噺 + private Integer busCount;//鍛ㄥ洿鍏氦鏁伴噺 + private Double trafficLevelRate;//浜ら�氬煄甯傛帓鍚� + private Integer maxTrafficCount;//鍩庡競鏈�澶т氦閫氭暟閲� + private Integer trafficCount;//鍛ㄥ洿浜ら�氭暟閲� + private Double priceStabilityLess;//涓�骞翠互鍐呯殑浠锋牸绋冲畾鎸囨暟 + private Integer districtCount;//鍛ㄥ洿灏忓尯鏁伴噺 + private Double districtCountLevel;//鍛ㄥ洿灏忓尯鏁伴噺鎺掑悕 + private Integer maxDistrictCount;//鍩庡競閲岄潰鏈�澶х殑灏忓尯鏁伴噺 + private Integer cityAvgPrice;//鍩庡競鍧囦环 + private Double quoteScore;//鍙戝竷閲忓緱鍒� + private Double trafficScore;//浜ら�氬緱鍒� + private Double agencyScore;//鍛ㄨ竟涓粙寰楀垎 public String getCity() { diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/CzInfoDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/CzInfoDto.java index 17d2e4673..39b6f3d23 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/CzInfoDto.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/CzInfoDto.java @@ -6,43 +6,43 @@ import java.util.Map; @SuppressWarnings("serial") public class CzInfoDto implements Serializable{ - //楼盘编号 + //妤肩洏缂栧彿 private String hid; - //楼盘名称 + //妤肩洏鍚嶇О private String name; - private List alias;//别名 - //楼盘均价 + private List alias;//鍒悕 + //妤肩洏鍧囦环 private Integer avgPrice; - //省 + //鐪� private String provinceCode; - //市 + //甯� private String cityCode; - //区 + //鍖� private String districtCode; - //地址 + //鍦板潃 private String address; - //公共服务配套 + //鍏叡鏈嶅姟閰嶅 private String publicServiceSetCode; - //基础设施 + //鍩虹璁炬柦 private String facilitiesCode; - //居住社区成熟度 + //灞呬綇绀惧尯鎴愮啛搴� private String sophisticationCode; - //交通条件 + //浜ら�氭潯浠� private String trafficCode; - //泊车条件 + //娉婅溅鏉′欢 private String stopCarCode; - //学区房类型 + //瀛﹀尯鎴跨被鍨� private String schoolCode; - //小区绿化率 + //灏忓尯缁垮寲鐜� private String virescencePercent; - //容积率 + //瀹圭Н鐜� private String cubagePercent; - //参考租金(1室) 参考租金(2室) 参考租金(3室) 参考租金(4室) 参考租金(5室) 参考租金(5室以上) + //鍙傝�冪閲�(1瀹�) 鍙傝�冪閲�(2瀹�) 鍙傝�冪閲�(3瀹�) 鍙傝�冪閲�(4瀹�) 鍙傝�冪閲�(5瀹�) 鍙傝�冪閲�(5瀹や互涓�) private Map rents; - //物业公司 + //鐗╀笟鍏徃 private String estateCompany; - //物业费(每月每平米) + //鐗╀笟璐癸紙姣忔湀姣忓钩绫筹級 private String estateCharge; public String getHid() { return hid; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictAnalysisDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictAnalysisDto.java index 002ff6e12..420d0aa34 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictAnalysisDto.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictAnalysisDto.java @@ -10,7 +10,7 @@ import com.fangjia.core.util.DataUtil; import com.fangjia.service.open.DistrictBo; /** - * 小区统计分析信息bean + * 灏忓尯缁熻鍒嗘瀽淇℃伅bean * * @author zengshaohui */ @@ -19,45 +19,45 @@ public class DistrictAnalysisDto implements Serializable { /** - * 小区名 + * 灏忓尯鍚� */ private String name; /** - * 城市 + * 鍩庡競 */ private String city; /** - * 区域 + * 鍖哄煙 */ private String district; /** - * 周边餐饮人均消费 + * 鍛ㄨ竟椁愰ギ浜哄潎娑堣垂 */ private int avgPriceAround; /** - * 全市人均最低消费 + * 鍏ㄥ競浜哄潎鏈�浣庢秷璐� */ private int avgPriceCityMin = 15; /** - * 全市人均最高消费 + * 鍏ㄥ競浜哄潎鏈�楂樻秷璐� */ private int avgPriceCityMax = 150; /** - * 区域关注度排名 + * 鍖哄煙鍏虫敞搴︽帓鍚� */ private int districtClickRank; /** - * 全市关注度排名 + * 鍏ㄥ競鍏虫敞搴︽帓鍚� */ private int cityClickRank; /** - * 近半年挂牌量 + * 杩戝崐骞存寕鐗岄噺 */ private int houseHalfYear; /** - * 上月挂牌量 + * 涓婃湀鎸傜墝閲� */ private int houseLastMonth; @@ -82,12 +82,12 @@ public class DistrictAnalysisDto implements Serializable { } public int getAvgPriceAround() { int max=10; - if(avgPriceAround <= this.avgPriceCityMin){//小于最低消费 最低消费价格+(0~10)的数 + if(avgPriceAround <= this.avgPriceCityMin){//灏忎簬鏈�浣庢秷璐� 鏈�浣庢秷璐逛环鏍�+锛�0~10锛夌殑鏁� int offset = Math.abs(name.hashCode()) % max; avgPriceAround = avgPriceCityMin + offset; } - if(avgPriceAround >= this.avgPriceCityMax){//大于最高消费 最高消费价格-(0~10)的数 + if(avgPriceAround >= this.avgPriceCityMax){//澶т簬鏈�楂樻秷璐� 鏈�楂樻秷璐逛环鏍�-锛�0~10锛夌殑鏁� int offset = Math.abs(name.hashCode()) % max; avgPriceAround = avgPriceCityMax - offset; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictBaseInfoDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictBaseInfoDto.java index 68936dffb..8289d671d 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictBaseInfoDto.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictBaseInfoDto.java @@ -14,17 +14,17 @@ public class DistrictBaseInfoDto { private Integer lastWeekendMarkup; /** - * 上月参考均价 + * 涓婃湀鍙傝�冨潎浠� */ private Integer topMonthAvgPrice; /** - * 近1年涨跌幅(%) + * 杩�1骞存定璺屽箙锛�%锛� */ private Double oneYearUpDownRange; /** - * 涨跌幅在城市排名(%) + * 娑ㄨ穼骞呭湪鍩庡競鎺掑悕锛�%锛� */ private Double upDownRangecityLevel; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictChartDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictChartDto.java index 2d7ebf3f2..4ac581915 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictChartDto.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictChartDto.java @@ -4,19 +4,19 @@ import java.io.Serializable; import java.util.List; /** - * 小区均价及走势图数据中转dto + * 灏忓尯鍧囦环鍙婅蛋鍔垮浘鏁版嵁涓浆dto * * @author liupei */ @SuppressWarnings("serial") public class DistrictChartDto implements Serializable { /** - * 走势图链接 + * 璧板娍鍥鹃摼鎺� */ private String chart; /** - * 小区均价 + * 灏忓尯鍧囦环 */ private List stat; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictConditionDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictConditionDto.java index 76944ffd1..427368ab0 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictConditionDto.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictConditionDto.java @@ -4,19 +4,19 @@ import java.io.Serializable; import java.util.List; /** - * 小区搜索条件 + * 灏忓尯鎼滅储鏉′欢 * * @author liupei */ @SuppressWarnings("serial") public class DistrictConditionDto implements Serializable { /** - * 均价条件 + * 鍧囦环鏉′欢 */ private List avgPrices; /** - * 小区类别 + * 灏忓尯绫诲埆 */ private List kinds; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictDetailDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictDetailDto.java index c3fa6dd36..8d11605ca 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictDetailDto.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictDetailDto.java @@ -3,7 +3,7 @@ package com.fangjia.open.dto; import java.util.List; /** - * 小区详情数据汇总(有房,房生活用) + * 灏忓尯璇︽儏鏁版嵁姹囨��(鏈夋埧锛屾埧鐢熸椿鐢�) * @author yinjihuan * */ @@ -14,182 +14,182 @@ public class DistrictDetailDto { private String address; /** - * 潜力指数 + * 娼滃姏鎸囨暟 */ private int index; /** - * 最新均价 + * 鏈�鏂板潎浠� */ private int avgPrice; /** - * 涨跌幅在城市中的排名 + * 娑ㄨ穼骞呭湪鍩庡競涓殑鎺掑悕 */ private double upDownRangecityLevel; /** - * 上月参考均价 + * 涓婃湀鍙傝�冨潎浠� */ private int topMonthAvgPrice; /** - * 近1年涨跌幅(%) + * 杩�1骞存定璺屽箙锛�%锛� */ private double oneYearUpDownRange; /** - * 房产等级 + * 鎴夸骇绛夌骇 */ private double levelRate; /** - * 租房回报率 + * 绉熸埧鍥炴姤鐜� */ private double rentRate; /** - * 周涨幅 + * 鍛ㄦ定骞� */ private int lastWeekendMarkup; /** - * 近30天涨跌幅(%) + * 杩�30澶╂定璺屽箙锛�%锛� */ private double oneMonthUpDownRange; /** - * 价格城市中的排名 + * 浠锋牸鍩庡競涓殑鎺掑悕 */ private double priceRate; /** - * 流动性评级得分 + * 娴佸姩鎬ц瘎绾у緱鍒� */ private double totalScore; /** - * 一年前房屋均价 + * 涓�骞村墠鎴垮眿鍧囦环 */ private int oneYearAvgPrice; /** - * 相对最高价 + * 鐩稿鏈�楂樹环 */ private int cityDistrictMaxSellPrice; /** - * 相对最低价 + * 鐩稿鏈�浣庝环 */ private int cityDistrictMinSellPrice; /** - * 小区标签 + * 灏忓尯鏍囩 */ private List poiTags; /** - * 小区标签数量(排序用) + * 灏忓尯鏍囩鏁伴噺锛堟帓搴忕敤锛� */ private int poiSize; /** - * 百度经度 + * 鐧惧害缁忓害 */ private double lng2; /** - * 百度纬度 + * 鐧惧害绾害 */ private double lat2; /** - * 开发商 + * 寮�鍙戝晢 */ private String developer; /** - * 物业公司 + * 鐗╀笟鍏徃 */ private String estateCompany; /** - * 容积率 + * 瀹圭Н鐜� */ private String cubagePercent; /** - * 绿化率 + * 缁垮寲鐜� */ private String virescencePercent; /** - * 物业费 + * 鐗╀笟璐� */ private String estateCharge; /** - * 创建时间 + * 鍒涘缓鏃堕棿 */ private String buildDate; /** - * 停车位 + * 鍋滆溅浣� */ private int carSiteCount; /** - * 总户数 + * 鎬绘埛鏁� */ private int householdCount; /** - * 竣工时间 + * 绔e伐鏃堕棿 */ private String finishBuildingDate; /** - * 主力面积 + * 涓诲姏闈㈢Н */ private String moreArea; /** - * 中介总数量 + * 涓粙鎬绘暟閲� */ private int agencyMount; /** - * 知名中介数量 + * 鐭ュ悕涓粙鏁伴噺 */ private int famousAgency; /** - * 其他中介数量 + * 鍏朵粬涓粙鏁伴噺 */ private int otherAgency; /** - * 中介数量在城市中的排名 + * 涓粙鏁伴噺鍦ㄥ煄甯備腑鐨勬帓鍚� */ private int momCityLevel; /** - * 城市排名总量 + * 鍩庡競鎺掑悕鎬婚噺 */ private int citySize; /** - * 城市中介最多的数量 + * 鍩庡競涓粙鏈�澶氱殑鏁伴噺 */ private int maxCityAgency; /** - * 均价的城市排名 + * 鍧囦环鐨勫煄甯傛帓鍚� */ private String rank; /** - * 房屋结构 + * 鎴垮眿缁撴瀯 */ private String houseStructure; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictDto.java index 0e3268bf1..8bacaf6b9 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictDto.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictDto.java @@ -9,7 +9,7 @@ import com.fangjia.core.util.DataUtil; import com.fangjia.service.open.DistrictBo; /** - * 小区数据中转bean + * 灏忓尯鏁版嵁涓浆bean * * @author liupei */ @@ -19,64 +19,64 @@ public class DistrictDto implements Serializable { private String id; /** - * 小区名 + * 灏忓尯鍚� */ private String name; /** - * 城市 + * 鍩庡競 */ private String city; /** - * 类型:公寓、别墅 + * 绫诲瀷:鍏瘬銆佸埆澧� */ private String kind; /** - * 小区默认图片url + * 灏忓尯榛樿鍥剧墖url */ private String pic; /** - * 区域 + * 鍖哄煙 */ private String region; private String district; /** - * 均价 + * 鍧囦环 */ private Integer avgPrice; /** - * 板块 + * 鏉垮潡 */ private String block; /** - * 小区描述 + * 灏忓尯鎻忚堪 */ private String description; /** - * 开发商 + * 寮�鍙戝晢 */ private String developer; /** - * 物业公司 + * 鐗╀笟鍏徃 */ private String estateCompany; /** - * 占地面积 + * 鍗犲湴闈㈢Н */ private String allArea; /** - * 建筑面积 + * 寤虹瓚闈㈢Н */ private String buildArea; @@ -103,12 +103,12 @@ public class DistrictDto implements Serializable { } /** - * 绿化率 + * 缁垮寲鐜� */ private String virescencePercent; /** - * 容积率 + * 瀹圭Н鐜� */ private String cubagePercent; @@ -185,55 +185,55 @@ public class DistrictDto implements Serializable { } /** - * 纬度 + * 绾害 */ private Long lat; /** - * 经度 + * 缁忓害 */ private Long lng; /** - * 百度纬度 + * 鐧惧害绾害 */ private Long lat2; /** - * 百度经度 + * 鐧惧害缁忓害 */ private Long lng2; /** - * 小区图片 + * 灏忓尯鍥剧墖 */ private List pics; /** - * 小区地址 + * 灏忓尯鍦板潃 */ private String address; /** - * 小区均价 + * 灏忓尯鍧囦环 */ private List stat; /** - * 小区租金 + * 灏忓尯绉熼噾 */ private List rentStat; /** - * 小区在售二手房套数 + * 灏忓尯鍦ㄥ敭浜屾墜鎴垮鏁� */ private Long sellCount; /** - * 小区在租出租房源数 + * 灏忓尯鍦ㄧ鍑虹鎴挎簮鏁� */ private Long rentCount; /** - * 线上url地址 + * 绾夸笂url鍦板潃 */ private String url; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictInfoDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictInfoDto.java index f30ccbf54..1c5e5453c 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictInfoDto.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictInfoDto.java @@ -29,12 +29,12 @@ public class DistrictInfoDto { private List alias; private List addressAlias; private String videoUrl; - //高德坐标 - //维度 + //楂樺痉鍧愭爣 + //缁村害 private Double lat; - //经度 + //缁忓害 private Double lng; - // 百度坐标 + // 鐧惧害鍧愭爣 private Double lat2; private Double lng2; private String developer; @@ -47,10 +47,10 @@ public class DistrictInfoDto { private String estateCharge; private String liveDate; private String carSite; - private Long sellCount; // 出售房源量 - private Long rentCount; // 出租房源量 - private String register; // 是否可注册 - private String elevatorsCount; // 电梯数量 + private Long sellCount; // 鍑哄敭鎴挎簮閲� + private Long rentCount; // 鍑虹鎴挎簮閲� + private String register; // 鏄惁鍙敞鍐� + private String elevatorsCount; // 鐢垫鏁伴噺 private Integer avgPrice; private Integer villaAvgPrice; private Integer totalPrice; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictStatDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictStatDto.java index 91c69c3df..23fe1c98c 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictStatDto.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictStatDto.java @@ -4,77 +4,77 @@ import java.io.Serializable; import java.util.Date; /** - * 小区均价数据中转bean + * 灏忓尯鍧囦环鏁版嵁涓浆bean * * @author liupei */ @SuppressWarnings("serial") public class DistrictStatDto implements Serializable { /** - * 城市 + * 鍩庡競 */ private String city; /** - * 区域 + * 鍖哄煙 */ private String region; /** - * 小区名 + * 灏忓尯鍚� */ private String districtName; /** - * 公寓租金 + * 鍏瘬绉熼噾 */ private Integer avgRentPrice; /** - * 公寓均价 + * 鍏瘬鍧囦环 */ private Integer avgPrice; /** - * 别墅均价 + * 鍒鍧囦环 */ private Integer villaAvgPrice; /** - * 缺省均价 若公寓均价不为空则返回公寓均价,否则返回别墅均价 + * 缂虹渷鍧囦环 鑻ュ叕瀵撳潎浠蜂笉涓虹┖鍒欒繑鍥炲叕瀵撳潎浠凤紝鍚﹀垯杩斿洖鍒鍧囦环 */ private Integer defaultAvgPrice; /** - * 均价计算日期 + * 鍧囦环璁$畻鏃ユ湡 */ private Date weekend; /** - * 公寓月均价涨跌幅 + * 鍏瘬鏈堝潎浠锋定璺屽箙 */ private Float markup; /** - * 别墅月均价涨跌幅 + * 鍒鏈堝潎浠锋定璺屽箙 */ private Float villaMarkup; /** - * 公寓周均价涨跌幅 + * 鍏瘬鍛ㄥ潎浠锋定璺屽箙 */ private Float weekMarkup; /** - * 别墅周均价涨跌幅 + * 鍒鍛ㄥ潎浠锋定璺屽箙 */ private Float weekVillaMarkup; /** - * 缺省月均价涨跌幅 若公寓月均价涨跌幅不为空则返回公寓月均价涨跌幅,否则返回别墅月均价涨跌幅 + * 缂虹渷鏈堝潎浠锋定璺屽箙 鑻ュ叕瀵撴湀鍧囦环娑ㄨ穼骞呬笉涓虹┖鍒欒繑鍥炲叕瀵撴湀鍧囦环娑ㄨ穼骞咃紝鍚﹀垯杩斿洖鍒鏈堝潎浠锋定璺屽箙 */ private Float defaultMarkup; /** - * 缺省周均价涨跌幅 若公寓周均价涨跌幅不为空则返回公寓周均价涨跌幅,否则返回别墅周均价涨跌幅 + * 缂虹渷鍛ㄥ潎浠锋定璺屽箙 鑻ュ叕瀵撳懆鍧囦环娑ㄨ穼骞呬笉涓虹┖鍒欒繑鍥炲叕瀵撳懆鍧囦环娑ㄨ穼骞咃紝鍚﹀垯杩斿洖鍒鍛ㄥ潎浠锋定璺屽箙 */ private Float defaultWeekMarkup; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictTopPriceDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictTopPriceDto.java index 6d997beda..ef56e0c72 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictTopPriceDto.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictTopPriceDto.java @@ -2,28 +2,28 @@ package com.fangjia.open.dto; public class DistrictTopPriceDto { /** - * 上周均价 + * 涓婂懆鍧囦环 */ private int price; /** - * 上月均价 + * 涓婃湀鍧囦环 */ private int priceMonthOne; /** - * 上2个月均价 + * 涓�2涓湀鍧囦环 */ private int priceMonthTwo; /** - * 上3个月均价 + * 涓�3涓湀鍧囦环 */ private int priceMonthThree; /** - * 上4个月均价 + * 涓�4涓湀鍧囦环 */ private int priceMonthFour; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictsDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictsDto.java index e26e3f966..6a2273c3d 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictsDto.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictsDto.java @@ -4,19 +4,19 @@ import java.io.Serializable; import java.util.List; /** - * 小区列表数据中转bean + * 灏忓尯鍒楄〃鏁版嵁涓浆bean * * @author liupei */ @SuppressWarnings("serial") public class DistrictsDto implements Serializable { /** - * 小区列表 + * 灏忓尯鍒楄〃 */ private List districts; /** - * 符合条件的小区总数 + * 绗﹀悎鏉′欢鐨勫皬鍖烘�绘暟 */ private Long totleSize; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictsPropertiesDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictsPropertiesDto.java index 48f2b6ede..35f25ed2e 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictsPropertiesDto.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictsPropertiesDto.java @@ -5,32 +5,32 @@ import java.io.Serializable; @SuppressWarnings("serial") public class DistrictsPropertiesDto implements Serializable { /** - * 唯一码 + * 鍞竴鐮� */ private String uniqueCode; /** - * 小区名 + * 灏忓尯鍚� */ private String districtName; /** - * 是否是新盘 + * 鏄惁鏄柊鐩� */ private Boolean newDistrict; /** - * 是否有在售信息 + * 鏄惁鏈夊湪鍞俊鎭� */ private Boolean onSale; /** - * 是否有打折 + * 鏄惁鏈夋墦鎶� */ private Boolean discount; /** - * 是否有视频 + * 鏄惁鏈夎棰� */ private Boolean video; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DtoConverter.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DtoConverter.java index be34653eb..22a598101 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DtoConverter.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DtoConverter.java @@ -18,13 +18,13 @@ import com.fangjia.service.menu.Group; import com.fangjia.service.menu.Item; /** - * dto的转换器 + * dto鐨勮浆鎹㈠櫒 * * @author liupei */ public final class DtoConverter { /** - * 将DistrictStatBo转化为DistrictStatDto + * 灏咲istrictStatBo杞寲涓篋istrictStatDto * *

* if DistrictStatDto is null or (districtStatBo.districtStat and @@ -110,7 +110,7 @@ public final class DtoConverter { } /** - * 将公寓均价列表和别墅均价列表转化为DistrictStatDto均价列表 + * 灏嗗叕瀵撳潎浠峰垪琛ㄥ拰鍒鍧囦环鍒楄〃杞寲涓篋istrictStatDto鍧囦环鍒楄〃 * *

* districtStatList.size === villaStatList.size @@ -143,7 +143,7 @@ public final class DtoConverter { } /** - * 将groups转化为小区搜索条件对象 + * 灏唃roups杞寲涓哄皬鍖烘悳绱㈡潯浠跺璞� * * @param prices * @param kinds @@ -154,7 +154,7 @@ public final class DtoConverter { } /** - * 将groups转化为房源搜索条件对象 + * 灏唃roups杞寲涓烘埧婧愭悳绱㈡潯浠跺璞� * * @param prices * @param areas @@ -167,7 +167,7 @@ public final class DtoConverter { } /** - * 将group转化为RangeConditionDto列表 + * 灏唃roup杞寲涓篟angeConditionDto鍒楄〃 * *

* if group is null or group.itemList is empty, return a empty collection @@ -198,7 +198,7 @@ public final class DtoConverter { } /** - * 将group转化为ValueConditionDto列表 + * 灏唃roup杞寲涓篤alueConditionDto鍒楄〃 * *

* if group is null or group.itemList is empty, return a empty collection @@ -219,7 +219,7 @@ public final class DtoConverter { } /** - * 将Group转化为string列表 + * 灏咷roup杞寲涓簊tring鍒楄〃 * *

* if group is null or group.itemList is empty, return a empty collection @@ -242,7 +242,7 @@ public final class DtoConverter { } /** - * 将RegionStat列表转化为RegionStatDto列表 + * 灏哛egionStat鍒楄〃杞寲涓篟egionStatDto鍒楄〃 * * @param rss * @return diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/EvaluationBeforeLoanDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/EvaluationBeforeLoanDto.java index 84041a7c7..34e8408b1 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/EvaluationBeforeLoanDto.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/EvaluationBeforeLoanDto.java @@ -9,7 +9,7 @@ import com.fangjia.dal.mongo.pds.model.EvaluationBeforeLoan; import com.fangjia.service.bo.DistrictTagBo; /** - * 贷前估值Dto + * 璐峰墠浼板�糄to * * @author yinjihuan * @@ -19,31 +19,31 @@ public class EvaluationBeforeLoanDto extends EvaluationBeforeLoan { private static final long serialVersionUID = -3811522722171805365L; /** - * 城市中相对最低价格 + * 鍩庡競涓浉瀵规渶浣庝环鏍� */ private Integer cityDistrictMinSellPrice; /** - * 城市中相对最高价格 + * 鍩庡競涓浉瀵规渶楂樹环鏍� */ private Integer cityDistrictMaxSellPrice; /** - * 城市中周围均价相近的小区 + * 鍩庡競涓懆鍥村潎浠风浉杩戠殑灏忓尯 */ private List cityAroundList; /** - * 区域中均价相近的小区 + * 鍖哄煙涓潎浠风浉杩戠殑灏忓尯 */ private List regionAroundList; /** - * 以房换房相似的小区 + * 浠ユ埧鎹㈡埧鐩镐技鐨勫皬鍖� */ private List tagList; /** - * 以房换房相似的小区总数量 + * 浠ユ埧鎹㈡埧鐩镐技鐨勫皬鍖烘�绘暟閲� */ private long count; @@ -56,7 +56,7 @@ public class EvaluationBeforeLoanDto extends EvaluationBeforeLoan { private List times; - //小区成交数据 + //灏忓尯鎴愪氦鏁版嵁 private Map dealDistricts; public Integer getCityDistrictMinSellPrice() { diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/FilterConditionDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/FilterConditionDto.java index 403e03fcb..e66744dda 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/FilterConditionDto.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/FilterConditionDto.java @@ -3,34 +3,34 @@ package com.fangjia.open.dto; import java.io.Serializable; import java.util.List; /** - * 城市筛选条件 + * 鍩庡競绛涢�夋潯浠� * * @author liupei */ @SuppressWarnings("serial") public class FilterConditionDto implements Serializable { /** - * 城市 + * 鍩庡競 */ private String city; /** - * 区域及其下板块 + * 鍖哄煙鍙婂叾涓嬫澘鍧� */ private List regions; /** - * 二手房条件 + * 浜屾墜鎴挎潯浠� */ private HouseConditionDto sell; /** - * 出租房条件 + * 鍑虹鎴挎潯浠� */ private HouseConditionDto rent; /** - * 小区条件 + * 灏忓尯鏉′欢 */ private DistrictConditionDto district; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/HouseAuctionDetailDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/HouseAuctionDetailDto.java index 6503f0c49..e372c4424 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/HouseAuctionDetailDto.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/HouseAuctionDetailDto.java @@ -1,17 +1,17 @@ package com.fangjia.open.dto; /** - * 拍卖数据详情 + * 鎷嶅崠鏁版嵁璇︽儏 * @author user * */ public class HouseAuctionDetailDto { /** - * 名称 + * 鍚嶇О */ private String name; /** - * 时间(yyyy-MM-dd) + * 鏃堕棿锛坹yyy-MM-dd锛� */ private String time; public String getName() { diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/HouseAuctionDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/HouseAuctionDto.java index de710e1e7..ca2de7a35 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/HouseAuctionDto.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/HouseAuctionDto.java @@ -3,7 +3,7 @@ package com.fangjia.open.dto; import java.util.List; /** - * 房产拍卖数据信息 + * 鎴夸骇鎷嶅崠鏁版嵁淇℃伅 * * @author yinjihuan * @@ -11,12 +11,12 @@ import java.util.List; public class HouseAuctionDto { /** - * 小区1年内拍卖数量 + * 灏忓尯1骞村唴鎷嶅崠鏁伴噺 */ private long districtCnt; /** - * 拍卖详情 + * 鎷嶅崠璇︽儏 */ private List transactionList; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/HouseCaseDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/HouseCaseDto.java index 29acee130..a6b677c0e 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/HouseCaseDto.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/HouseCaseDto.java @@ -2,22 +2,22 @@ package com.fangjia.open.dto; public class HouseCaseDto { - private String id;//房源id - private String city;//城市 - private String district;//区域 - private String name;//楼盘名称 - private Integer distance;//距离(单位:米) - private Double size;//面积(单位:平米) - private Number unitPrice;//单价(单位:元/平米) - private Integer totalPrice;//总价(单位:元) - private String decoration;//装修(如:精装) - private String direction;//朝向(如:南) - private Integer floor;//所在楼层 - private Integer maxFloor;//总楼层 - private String room;//室 - private String hall;//厅 - private String caseDate;//案例时间(如: 2013-07-12) - private String source;//来源 + private String id;//鎴挎簮id + private String city;//鍩庡競 + private String district;//鍖哄煙 + private String name;//妤肩洏鍚嶇О + private Integer distance;//璺濈(鍗曚綅锛氱背) + private Double size;//闈㈢Н(鍗曚綅锛氬钩绫�) + private Number unitPrice;//鍗曚环(鍗曚綅锛氬厓/骞崇背) + private Integer totalPrice;//鎬讳环(鍗曚綅锛氬厓) + private String decoration;//瑁呬慨锛堝锛氱簿瑁咃級 + private String direction;//鏈濆悜锛堝锛氬崡锛� + private Integer floor;//鎵�鍦ㄦゼ灞� + private Integer maxFloor;//鎬绘ゼ灞� + private String room;//瀹� + private String hall;//鍘� + private String caseDate;//妗堜緥鏃堕棿锛堝: 2013-07-12锛� + private String source;//鏉ユ簮 public String getId() { return id; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/HouseConditionDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/HouseConditionDto.java index 841ea6810..b53defe01 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/HouseConditionDto.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/HouseConditionDto.java @@ -4,24 +4,24 @@ import java.io.Serializable; import java.util.List; /** - * 房源(二手房、租房)搜索条件 + * 鎴挎簮(浜屾墜鎴裤�佺鎴�)鎼滅储鏉′欢 * * @author liupei */ @SuppressWarnings("serial") public class HouseConditionDto implements Serializable { /** - * 价格条件 + * 浠锋牸鏉′欢 */ private List totalPrices; /** - * 面积条件 + * 闈㈢Н鏉′欢 */ private List areas; /** - * 户型搜索条件 + * 鎴峰瀷鎼滅储鏉′欢 */ private List rooms; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/HouseDealPriceDetailDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/HouseDealPriceDetailDto.java index 614c658e1..20dabc73a 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/HouseDealPriceDetailDto.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/HouseDealPriceDetailDto.java @@ -3,17 +3,17 @@ package com.fangjia.open.dto; public class HouseDealPriceDetailDto { /** - * 成交时间(yyyy-MM-dd) + * 鎴愪氦鏃堕棿锛坹yyy-MM-dd锛� */ private String time; /** - * 成交价(字符串显示) + * 鎴愪氦浠凤紙瀛楃涓叉樉绀猴級 */ private String priceStr; /** - * 成交价 + * 鎴愪氦浠� */ private int price; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/HouseDealPriceDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/HouseDealPriceDto.java index a88e1dbbd..cc19c63ff 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/HouseDealPriceDto.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/HouseDealPriceDto.java @@ -3,7 +3,7 @@ package com.fangjia.open.dto; import java.util.List; /** - * 房产成交数据信息 + * 鎴夸骇鎴愪氦鏁版嵁淇℃伅 * * @author yinjihuan * @@ -11,12 +11,12 @@ import java.util.List; public class HouseDealPriceDto { /** - * 小区1年内成交数量 + * 灏忓尯1骞村唴鎴愪氦鏁伴噺 */ private long districtCnt; /** - * 成交详情 + * 鎴愪氦璇︽儏 */ private List transactionList; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/HouseDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/HouseDto.java index 4c4156187..e6cb4714c 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/HouseDto.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/HouseDto.java @@ -19,25 +19,25 @@ import java.util.List; public class HouseDto { private String id; - private String city; // 城市 - private String district; // 区域 - private String block; // 板块 + private String city; // 鍩庡競 + private String district; // 鍖哄煙 + private String block; // 鏉垮潡 private String address; - private String propertyName; // 小区名称 - private String title; // 房源标题 - private String description; // 房源描述 + private String propertyName; // 灏忓尯鍚嶇О + private String title; // 鎴挎簮鏍囬 + private String description; // 鎴挎簮鎻忚堪 private Integer buildDate; - private String contactPerson; // 用户名 - private String mobile; // 联系人电话 - private Integer floor; // 所在楼层 - private Integer maxFloor; // 总楼层 - private String fitment; // 装修情况 - private String direction; // 朝向 - private Double totalPrice; // 售价 - private Double size; // 建筑面积 - private Integer room; // 室 - private Integer hall; // 厅 - private Integer toilet; // 卫 + private String contactPerson; // 鐢ㄦ埛鍚� + private String mobile; // 鑱旂郴浜虹數璇� + private Integer floor; // 鎵�鍦ㄦゼ灞� + private Integer maxFloor; // 鎬绘ゼ灞� + private String fitment; // 瑁呬慨鎯呭喌 + private String direction; // 鏈濆悜 + private Double totalPrice; // 鍞环 + private Double size; // 寤虹瓚闈㈢Н + private Integer room; // 瀹� + private Integer hall; // 鍘� + private Integer toilet; // 鍗� private String buildingNum; private String roomNum; private List imgs; @@ -52,7 +52,7 @@ public class HouseDto { this.district = house.getRegion(); this.buildingNum = house.getHouseNum(); if(StringUtils.isNotBlank(house.getBuildDate())){ - this.buildDate = Integer.valueOf(house.getBuildDate().replaceAll("年","")); + this.buildDate = Integer.valueOf(house.getBuildDate().replaceAll("骞�","")); } this.contactPerson = house.getContactPeople(); this.size = house.getArea(); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/HouseEvaluateNumDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/HouseEvaluateNumDto.java index 491f9f4bc..7191b22a9 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/HouseEvaluateNumDto.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/HouseEvaluateNumDto.java @@ -1,6 +1,6 @@ package com.fangjia.open.dto; /** - * 房产近期评估次数返回信息 + * 鎴夸骇杩戞湡璇勪及娆℃暟杩斿洖淇℃伅 * * @author yinjihuan * @@ -8,12 +8,12 @@ package com.fangjia.open.dto; public class HouseEvaluateNumDto { /** - * 房屋最近30天的评估次数 + * 鎴垮眿鏈�杩�30澶╃殑璇勪及娆℃暟 */ private long oneMonth; /** - * 房屋最近90天的评估次数 + * 鎴垮眿鏈�杩�90澶╃殑璇勪及娆℃暟 */ private long threeMonth; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/HouseValueInformationDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/HouseValueInformationDto.java index 7c699ae17..a10089a40 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/HouseValueInformationDto.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/HouseValueInformationDto.java @@ -11,15 +11,15 @@ import java.util.Map; * @since 2023/12/12 10:47 */ public class HouseValueInformationDto { - // 原小区均价返回值 + // 鍘熷皬鍖哄潎浠疯繑鍥炲�� private MatchedBuildingDto communityAvgPrice; - // 原房屋价值评估返回值 + // 鍘熸埧灞嬩环鍊艰瘎浼拌繑鍥炲�� private Map addressValue; - //原房源样本返回值 + //鍘熸埧婧愭牱鏈繑鍥炲�� private UniversalDto houseCase; - //原周边POI返回值 + //鍘熷懆杈筆OI杩斿洖鍊� private DistrictFacilitys surroundingPoi; public MatchedBuildingDto getCommunityAvgPrice() { diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/HousesDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/HousesDto.java index eb1f94f03..a7197b86e 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/HousesDto.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/HousesDto.java @@ -4,19 +4,19 @@ import java.io.Serializable; import java.util.List; /** - * 房源数据传输对象 + * 鎴挎簮鏁版嵁浼犺緭瀵硅薄 * * @author liupei */ @SuppressWarnings("serial") public class HousesDto implements Serializable { /** - * 房源列表 + * 鎴挎簮鍒楄〃 */ private List houses; /** - * 符合条件的房源总数 + * 绗﹀悎鏉′欢鐨勬埧婧愭�绘暟 */ private Long totalCount; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/JnBankPropertyDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/JnBankPropertyDto.java index 4008f58cf..8f915c3e4 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/JnBankPropertyDto.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/JnBankPropertyDto.java @@ -2,63 +2,63 @@ package com.fangjia.open.dto; public class JnBankPropertyDto { - /**省份编码 */ + /**鐪佷唤缂栫爜 */ private String PROVINCE_CD; - /**城市编码 */ + /**鍩庡競缂栫爜 */ private String CITY_CD; - /**区域编码 */ + /**鍖哄煙缂栫爜 */ private String DISTRICT_CD; - /**小区名称 */ + /**灏忓尯鍚嶇О */ private String HOUSING_EST_NM; - /**小区编号 */ + /**灏忓尯缂栧彿 */ private String HOUSING_EST_NO; - /**公共服务配套 */ + /**鍏叡鏈嶅姟閰嶅 */ private String PUBSRV_MATCH_CD; - /**基础设施 */ + /**鍩虹璁炬柦 */ private String BASIC_FACILITY_CD; - /**交通条件 */ + /**浜ら�氭潯浠� */ private String TRAFFIC_COND_CD; - /**居住社区成熟度/商业密度 */ + /**灞呬綇绀惧尯鎴愮啛搴�/鍟嗕笟瀵嗗害 */ private String HOUSING_DENSE_CD; - /**小区绿化率 */ + /**灏忓尯缁垮寲鐜� */ private String AFFOREST_RT; - /**所属区域 */ + /**鎵�灞炲尯鍩� */ private String BLOCK_NM; - /**类型 */ + /**绫诲瀷 */ private String HOUSING_EST_TP_NO; - /**容积率 */ + /**瀹圭Н鐜� */ private String VLM_RT; - /**泊车条件 */ + /**娉婅溅鏉′欢 */ private String PARKING_COND_CD; - /**均价 */ + /**鍧囦环 */ private Integer AVG_PRICE_AMT; - /**地址 */ + /**鍦板潃 */ private String DETAIL_ADS; - /**物业公司 */ + /**鐗╀笟鍏徃 */ private String PROPERTY_COMPANY; - /**物业费 */ + /**鐗╀笟璐� */ private String PROPERTY_PRICE; - /**一居租金 */ + /**涓�灞呯閲� */ private Integer RENTAL_MON_AMT1; - /**二居租金 */ + /**浜屽眳绉熼噾 */ private Integer RENTAL_MON_AMT2; - /**三居租金 */ + /**涓夊眳绉熼噾 */ private Integer RENTAL_MON_AMT3; - /**四居租金 */ + /**鍥涘眳绉熼噾 */ private Integer RENTAL_MON_AMT4; - /**五居租金 */ + /**浜斿眳绉熼噾 */ private Integer RENTAL_MON_AMT5; - /**六居租金 */ + /**鍏眳绉熼噾 */ private Integer RENTAL_MON_AMT6; - /**学区房类型*/ + /**瀛﹀尯鎴跨被鍨�*/ private Integer SCHOOL_NEARBY_TP_CD; - /**商铺租金*/ + /**鍟嗛摵绉熼噾*/ private Double RENT; - /**商铺类型*/ + /**鍟嗛摵绫诲瀷*/ private Integer ESTATE_TYPE; - /**临街道路*/ + /**涓磋閬撹矾*/ private Integer STREET_CODE; - /**位置*/ + /**浣嶇疆*/ private Integer LAND_POSITION; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/MallsDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/MallsDto.java index 343adeb5f..1fb892d22 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/MallsDto.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/MallsDto.java @@ -6,19 +6,19 @@ import java.util.List; import net.sf.json.JSONObject; /** - * 电商数据传输对象 + * 鐢靛晢鏁版嵁浼犺緭瀵硅薄 * * @author */ @SuppressWarnings("serial") public class MallsDto implements Serializable { /** - * 小区列表 + * 灏忓尯鍒楄〃 */ private List districts; /** - * 符合条件的小区总数 + * 绗﹀悎鏉′欢鐨勫皬鍖烘�绘暟 */ private Long totleSize; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/NewDistrictDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/NewDistrictDto.java index e0de0ce82..6131c0772 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/NewDistrictDto.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/NewDistrictDto.java @@ -10,82 +10,82 @@ public class NewDistrictDto extends DistrictDto { private Integer avgPrize; /** - * 优惠信息 + * 浼樻儬淇℃伅 */ private String discount; /** - * 物业类型 + * 鐗╀笟绫诲瀷 */ private String buildType; /** - * 开盘时间 + * 寮�鐩樻椂闂� */ private Date openDate; /** - * 入住时间 + * 鍏ヤ綇鏃堕棿 */ private String liveDate; /** - * 售楼电话 + * 鍞ゼ鐢佃瘽 */ private String mobile; /** - * 容积率 + * 瀹圭Н鐜� */ private String cubagePercent; /** - * 绿化率 + * 缁垮寲鐜� */ private String virescencePercent; /** - * 户数 + * 鎴锋暟 * **/ private Integer householdCount; /** - * 物业费 + * 鐗╀笟璐� */ private String estateCharge; /** - * 物业公司 + * 鐗╀笟鍏徃 */ private String estateCompany; /** - * 售楼地址 + * 鍞ゼ鍦板潃 */ private String sellAddress; /** - * 建筑类型 + * 寤虹瓚绫诲瀷 * */ private String estateType; /** - * 预售许可证 + * 棰勫敭璁稿彲璇� * */ private String licence; /** - * 交通 + * 浜ら�� * */ private String traffic; /** - * 周边 + * 鍛ㄨ竟 * */ private String facilities; /** - * 建材装修 + * 寤烘潗瑁呬慨 * */ private String fitmentMaterials; /** - * 楼层状况 + * 妤煎眰鐘跺喌 * */ private String floorInfo; /** - * 相关信息 + * 鐩稿叧淇℃伅 * */ private String relateInfo; /** - * 车位信息 + * 杞︿綅淇℃伅 * */ private String carSite; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/PdsRoomDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/PdsRoomDto.java index 94e41c09e..3c84ea9c6 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/PdsRoomDto.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/PdsRoomDto.java @@ -2,7 +2,7 @@ package com.fangjia.open.dto; /** - * 室号DTO + * 瀹ゅ彿DTO */ public class PdsRoomDto { diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/PropertyDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/PropertyDto.java index aac0f83b2..0e05e94ff 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/PropertyDto.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/PropertyDto.java @@ -16,7 +16,7 @@ public class PropertyDto { private String block; private String distance; /** - * 新增小区别名 + * 鏂板灏忓尯鍒悕 */ private String alias; public String getId() { diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/RangeConditionDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/RangeConditionDto.java index 1b831cac4..8e71ed1e0 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/RangeConditionDto.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/RangeConditionDto.java @@ -5,17 +5,17 @@ import java.io.Serializable; @SuppressWarnings("serial") public class RangeConditionDto implements Serializable { /** - * 展示的名称 + * 灞曠ず鐨勫悕绉� */ private String name; /** - * 区间下限 + * 鍖洪棿涓嬮檺 */ private Integer lower; /** - * 区间上限 + * 鍖洪棿涓婇檺 */ private Integer upper; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/RegionBlockConditionDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/RegionBlockConditionDto.java index eca852069..ab47e45aa 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/RegionBlockConditionDto.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/RegionBlockConditionDto.java @@ -4,29 +4,29 @@ import java.io.Serializable; import java.util.List; /** - * 区域搜索条件(内含该区域下的板块列表) + * 鍖哄煙鎼滅储鏉′欢(鍐呭惈璇ュ尯鍩熶笅鐨勬澘鍧楀垪琛�) * * @author liupei */ @SuppressWarnings("serial") public class RegionBlockConditionDto implements Serializable { /** - * 区域或板块名称 + * 鍖哄煙鎴栨澘鍧楀悕绉� */ private String name; /** - * 纬度 + * 绾害 */ private Long lat; /** - * 经度 + * 缁忓害 */ private Long lng; /** - * 板块 + * 鏉垮潡 */ private List blocks; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/RegionSellStatDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/RegionSellStatDto.java index bc74a60a7..a928f4df6 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/RegionSellStatDto.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/RegionSellStatDto.java @@ -4,7 +4,7 @@ import java.io.Serializable; import java.util.List; /** - * 城市区域均价dto + * 鍩庡競鍖哄煙鍧囦环dto * * @author liupei */ @@ -12,36 +12,36 @@ public class RegionSellStatDto implements Serializable { private static final long serialVersionUID = 8932019527738097236L; /** - * 城市 + * 鍩庡競 */ private String city; /** - * 区域 + * 鍖哄煙 */ private String region; - /**均价对应的时间(月份)*/ + /**鍧囦环瀵瑰簲鐨勬椂闂达紙鏈堜唤锛�*/ private Integer date; /** - * 均价 + * 鍧囦环 */ private Integer avgPrice; /** - * 均价月涨幅 + * 鍧囦环鏈堟定骞� */ private Double mom; /** - * 区域月涨跌幅排名 + * 鍖哄煙鏈堟定璺屽箙鎺掑悕 */ private int regionRank; /** - * 当前城市下的所有区域列表 + * 褰撳墠鍩庡競涓嬬殑鎵�鏈夊尯鍩熷垪琛� */ private List regionList; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/RegionStatDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/RegionStatDto.java index b646b21a7..ace37dbda 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/RegionStatDto.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/RegionStatDto.java @@ -8,7 +8,7 @@ import org.apache.commons.lang.StringUtils; import com.fangjia.dal.mongo.model.RegionStat; /** - * 城市区域均价dto + * 鍩庡競鍖哄煙鍧囦环dto * * @author liupei */ @@ -16,38 +16,38 @@ public class RegionStatDto implements Serializable { private static final long serialVersionUID = 8932019527738097236L; /** - * 城市 + * 鍩庡競 */ private String city; /** - * 区域 + * 鍖哄煙 */ private String region; /** - * 板块 + * 鏉垮潡 */ private String block; /** - * 统计日期 + * 缁熻鏃ユ湡 */ private Date weekend; /** - * 均价 + * 鍧囦环 */ private int avgPrice; /** - * 月均价涨跌幅 + * 鏈堝潎浠锋定璺屽箙 */ private int markup; /** - * 周均价涨跌幅 + * 鍛ㄥ潎浠锋定璺屽箙 */ private int weekMarkup; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/RentHouseDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/RentHouseDto.java index 2bfe480d2..fa4a8369a 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/RentHouseDto.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/RentHouseDto.java @@ -13,30 +13,30 @@ import java.util.ArrayList; import java.util.List; /** - * 租金dto + * 绉熼噾dto * Created by wenyan on 2015/12/24. */ public class RentHouseDto { private String id; - private String city; // 城市 - private String district; // 区域 - private String block; // 板块 + private String city; // 鍩庡競 + private String district; // 鍖哄煙 + private String block; // 鏉垮潡 private String address; - private String propertyName; // 小区名称 - private String title; // 房源标题 - private String description; // 房源描述 + private String propertyName; // 灏忓尯鍚嶇О + private String title; // 鎴挎簮鏍囬 + private String description; // 鎴挎簮鎻忚堪 private Integer buildDate; - private String contactPerson; // 用户名 - private String mobile; // 联系人电话 - private Integer floor; // 所在楼层 - private Integer maxFloor; // 总楼层 - private String fitment; // 装修情况 - private String direction; // 朝向 - private Double totalPrice; // 售价 - private Double size; // 建筑面积 - private Integer room; // 室 - private Integer hall; // 厅 - private Integer toilet; // 卫 + private String contactPerson; // 鐢ㄦ埛鍚� + private String mobile; // 鑱旂郴浜虹數璇� + private Integer floor; // 鎵�鍦ㄦゼ灞� + private Integer maxFloor; // 鎬绘ゼ灞� + private String fitment; // 瑁呬慨鎯呭喌 + private String direction; // 鏈濆悜 + private Double totalPrice; // 鍞环 + private Double size; // 寤虹瓚闈㈢Н + private Integer room; // 瀹� + private Integer hall; // 鍘� + private Integer toilet; // 鍗� private String buildingNum; private String roomNum; private List imgs; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/RoomDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/RoomDto.java index 041ef4b93..f65ead12f 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/RoomDto.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/RoomDto.java @@ -3,7 +3,7 @@ package com.fangjia.open.dto; import com.thoughtworks.xstream.annotations.XStreamAlias; /** - * 室号DTO + * 瀹ゅ彿DTO */ @XStreamAlias("room") public class RoomDto { diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/SearchKeywordResultDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/SearchKeywordResultDto.java index 1af495c5c..b8db0d831 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/SearchKeywordResultDto.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/SearchKeywordResultDto.java @@ -5,12 +5,12 @@ import java.io.Serializable; @SuppressWarnings("serial") public class SearchKeywordResultDto implements Serializable { /** - * 类别 + * 绫诲埆 */ private String category; /** - * 数量 + * 鏁伴噺 */ private Long count; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/StationDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/StationDto.java index 7eecce22e..1ab72ff5d 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/StationDto.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/StationDto.java @@ -9,7 +9,7 @@ import com.fangjia.core.util.DataUtil; import com.fangjia.service.open.DistrictBo; /** - * 小区交通站点信息bean + * 灏忓尯浜ら�氱珯鐐逛俊鎭痓ean * * @author zengshaohui */ @@ -18,12 +18,12 @@ public class StationDto implements Serializable { /** - * 站名 + * 绔欏悕 */ private String name; /** - * 线路名 + * 绾胯矾鍚� */ private String lineName; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/TransactionDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/TransactionDto.java index 2b54c1eac..b3bd53c49 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/TransactionDto.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/TransactionDto.java @@ -43,52 +43,52 @@ public class TransactionDto { private Integer peopleDensity; private Integer districtAverageConsume; private Integer cityAverageConsume; - private Double lng;//经度 - private Double lat;//纬度 - private String buildingType;//建筑类型 - private Integer totalUnitCount;//户数 - private String managementFee;//物业费 - private Integer parking;//停车位 - private String ownershipPeriod;// 产权年限 - private String finishBuildTime;//建筑年代 - private String floorSpace;//占地面积 - private String constructionSpace;//建筑面积 - private String greenPercentage;//绿化率 - private String plotRatio;//容积率 - private String developer;//开发商 - private String propertyManagement;//物业公司 - private Map metro;//地铁 - private Map bus;//公交 - private Map market;//商场 - private Map gym;//健身中心 - private Map beautySalon;//美容院 - private Map supermarket;//大型超市 - private Map hospital;//医院 - private Map school;//学校 - private Map park;//公园 - private Map bank;//银行 - private Map wharf;//码头 - private Map airport;//飞机场 - private Map railwayStation;//火车站 + private Double lng;//缁忓害 + private Double lat;//绾害 + private String buildingType;//寤虹瓚绫诲瀷 + private Integer totalUnitCount;//鎴锋暟 + private String managementFee;//鐗╀笟璐� + private Integer parking;//鍋滆溅浣� + private String ownershipPeriod;// 浜ф潈骞撮檺 + private String finishBuildTime;//寤虹瓚骞翠唬 + private String floorSpace;//鍗犲湴闈㈢Н + private String constructionSpace;//寤虹瓚闈㈢Н + private String greenPercentage;//缁垮寲鐜� + private String plotRatio;//瀹圭Н鐜� + private String developer;//寮�鍙戝晢 + private String propertyManagement;//鐗╀笟鍏徃 + private Map metro;//鍦伴搧 + private Map bus;//鍏氦 + private Map market;//鍟嗗満 + private Map gym;//鍋ヨ韩涓績 + private Map beautySalon;//缇庡闄� + private Map supermarket;//澶у瀷瓒呭競 + private Map hospital;//鍖婚櫌 + private Map school;//瀛︽牎 + private Map park;//鍏洯 + private Map bank;//閾惰 + private Map wharf;//鐮佸ご + private Map airport;//椋炴満鍦� + private Map railwayStation;//鐏溅绔� private Map KTV;//KTV - private Map theatre;//剧场、影院 - private Map golf;//高尔夫球场 - private Map privateSchool;//私人学校 - private Map facelift;//整容整形 - private Map bathCenter;//洗浴中心 - private Map privateHospital;//私人医院 - private Map hotel;//酒店 - private Map cafe;//咖啡厅 - private Map repast;//餐饮 - private Map playground;//游乐场 - private Map travel;//旅游景点 - private Map stadium;//体育场馆 - private Map library;//图书馆 - private Map office;//写字楼 - private Map depot;//停车场 - private Map CVS;//便利店 - private Map cybercafe;//网吧 - private Integer rent;//区域平均租金 + private Map theatre;//鍓у満銆佸奖闄� + private Map golf;//楂樺皵澶悆鍦� + private Map privateSchool;//绉佷汉瀛︽牎 + private Map facelift;//鏁村鏁村舰 + private Map bathCenter;//娲楁荡涓績 + private Map privateHospital;//绉佷汉鍖婚櫌 + private Map hotel;//閰掑簵 + private Map cafe;//鍜栧暋鍘� + private Map repast;//椁愰ギ + private Map playground;//娓镐箰鍦� + private Map travel;//鏃呮父鏅偣 + private Map stadium;//浣撹偛鍦洪 + private Map library;//鍥句功棣� + private Map office;//鍐欏瓧妤� + private Map depot;//鍋滆溅鍦� + private Map CVS;//渚垮埄搴� + private Map cybercafe;//缃戝惂 + private Integer rent;//鍖哄煙骞冲潎绉熼噾 private List sameDistrictSimilarHouse;// diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/UniversalDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/UniversalDto.java index 368ac4ffd..41f922247 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/UniversalDto.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/UniversalDto.java @@ -3,8 +3,8 @@ package com.fangjia.open.dto; import java.util.LinkedHashMap; /** - * 通用Dto,减少Dto的创建 - * @author 王文艳 + * 閫氱敤Dto,鍑忓皯Dto鐨勫垱寤� + * @author 鐜嬫枃鑹� * @create 2016-10-08 **/ public class UniversalDto extends LinkedHashMap { diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/ValueConditionDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/ValueConditionDto.java index 77db52ccf..80a5e97b3 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/ValueConditionDto.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/ValueConditionDto.java @@ -3,19 +3,19 @@ package com.fangjia.open.dto; import java.io.Serializable; /** - * name-value查询条件 + * name-value鏌ヨ鏉′欢 * * @author liupei */ @SuppressWarnings("serial") public class ValueConditionDto implements Serializable { /** - * 展示名称 + * 灞曠ず鍚嶇О */ private String name; /** - * 对应的值 + * 瀵瑰簲鐨勫�� */ private String value; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/ZimoOfficeListDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/ZimoOfficeListDto.java index 5df541b18..ed22d9ba2 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/ZimoOfficeListDto.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/ZimoOfficeListDto.java @@ -13,7 +13,7 @@ public class ZimoOfficeListDto implements Serializable{ private List offices; /** - * 符合条件的写字楼总数 + * 绗﹀悎鏉′欢鐨勫啓瀛楁ゼ鎬绘暟 */ private Long totleSize; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/addressGovernance/DistrictIdentifyDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/addressGovernance/DistrictIdentifyDto.java index 03301c218..ff4bd8079 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/addressGovernance/DistrictIdentifyDto.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/addressGovernance/DistrictIdentifyDto.java @@ -1,7 +1,7 @@ package com.fangjia.open.dto.addressGovernance; /** - * 区划识别DTO + * 鍖哄垝璇嗗埆DTO * * @author shenjian * @since 2023/5/25 diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/addressGovernance/MatchedBuildingDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/addressGovernance/MatchedBuildingDto.java index ce0ad64cc..95a86b0e2 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/addressGovernance/MatchedBuildingDto.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/addressGovernance/MatchedBuildingDto.java @@ -1,7 +1,7 @@ package com.fangjia.open.dto.addressGovernance; /** - * 地址匹配DTO + * 鍦板潃鍖归厤DTO */ public class MatchedBuildingDto { @@ -10,44 +10,44 @@ public class MatchedBuildingDto { */ private String id; /** - * 置信度 + * 缃俊搴� */ private Double credit; /** - * 城市 + * 鍩庡競 */ private String city; /** - * 区域 + * 鍖哄煙 */ private String district; /** - * 乡镇街道 + * 涔¢晣琛楅亾 */ private String township; /** - * 建筑物名称 + * 寤虹瓚鐗╁悕绉� */ private String name; /** - * 建筑物地址 + * 寤虹瓚鐗╁湴鍧� */ private String address; /** - * 经度(高德) + * 缁忓害(楂樺痉) */ private Double lng; /** - * 纬度(高德) + * 绾害(楂樺痉) */ private Double lat; /** - * 物业类型 + * 鐗╀笟绫诲瀷 */ private String propertyType; /** - * 均价 + * 鍧囦环 */ private Integer avgPrice; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/addressGovernance/StructureAndCompleteDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/addressGovernance/StructureAndCompleteDto.java index 786b6d995..c90fa2eb8 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/addressGovernance/StructureAndCompleteDto.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/addressGovernance/StructureAndCompleteDto.java @@ -1,7 +1,7 @@ package com.fangjia.open.dto.addressGovernance; /** - * 地址补全DTO + * 鍦板潃琛ュ叏DTO * * @author shenjian * @since 2023/5/25 @@ -9,84 +9,84 @@ package com.fangjia.open.dto.addressGovernance; public class StructureAndCompleteDto { /** - * 省份 + * 鐪佷唤 */ private String province; /** - * 省份编码 + * 鐪佷唤缂栫爜 */ private String provinceCode; /** - * 城市 + * 鍩庡競 */ private String city; /** - * city编码 + * city缂栫爜 */ private String cityCode; /** - * 区域 + * 鍖哄煙 */ private String district; /** - * 区域编码 + * 鍖哄煙缂栫爜 */ private String districtCode; /** - * 开发区 + * 寮�鍙戝尯 */ private String dev; /** - * 乡镇街道 + * 涔¢晣琛楅亾 */ private String township; /** - * 乡镇街道编码 + * 涔¢晣琛楅亾缂栫爜 */ private String townshipCode; /** - * 道路 + * 閬撹矾 */ private String street; /** - * 路号 + * 璺彿 */ private String streetNumber; /** - * 居委村委 + * 灞呭鏉戝 */ private String community; /** - * 村组 + * 鏉戠粍 */ private String group; /** - * 名称 + * 鍚嶇О */ private String name; /** - * 楼栋 + * 妤兼爧 */ private String buildingNumber; /** - * 单元 + * 鍗曞厓 */ private String unitNumber; /** - * 楼层 + * 妤煎眰 */ private String floor; /** - * 室号 + * 瀹ゅ彿 */ private String roomNumber; /** - * 格式化地址 + * 鏍煎紡鍖栧湴鍧� */ private String formatAddress; /** - * 地址验证 + * 鍦板潃楠岃瘉 */ private String addrVerify; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/addressGovernance/StructureDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/addressGovernance/StructureDto.java index f2ca60475..4a9f9234f 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/addressGovernance/StructureDto.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/addressGovernance/StructureDto.java @@ -1,7 +1,7 @@ package com.fangjia.open.dto.addressGovernance; /** - * 地址结构化,请不要增加其他字段,与文档及地数输出一致 + * 鍦板潃缁撴瀯鍖�,璇蜂笉瑕佸鍔犲叾浠栧瓧娈碉紝涓庢枃妗e強鍦版暟杈撳嚭涓�鑷� * * @author shenjian * @since 2023/5/25 @@ -9,63 +9,63 @@ package com.fangjia.open.dto.addressGovernance; public class StructureDto { /** - * 省份 + * 鐪佷唤 */ private String province; /** - * 城市 + * 鍩庡競 */ private String city; /** - * 区域 + * 鍖哄煙 */ private String district; /** - * 开发区 + * 寮�鍙戝尯 */ private String dev; /** - * 乡镇街道 + * 涔¢晣琛楅亾 */ private String township; /** - * 道路 + * 閬撹矾 */ private String street; /** - * 路号 + * 璺彿 */ private String streetNumber; /** - * 居委村委 + * 灞呭鏉戝 */ private String community; /** - * 村组 + * 鏉戠粍 */ private String group; /** - * 名称 + * 鍚嶇О */ private String name; /** - * 楼栋 + * 妤兼爧 */ private String buildingNumber; /** - * 单元 + * 鍗曞厓 */ private String unitNumber; /** - * 楼层 + * 妤煎眰 */ private String floor; /** - * 室号 + * 瀹ゅ彿 */ private String roomNumber; /** - * 地址验证 + * 鍦板潃楠岃瘉 */ private String addrVerify; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/exceptionhander/FangjiaOpenExceptionHandler.java b/projects/fangjia-open/src/main/java/com/fangjia/open/exceptionhander/FangjiaOpenExceptionHandler.java index 7b01908d0..8381258ad 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/exceptionhander/FangjiaOpenExceptionHandler.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/exceptionhander/FangjiaOpenExceptionHandler.java @@ -19,23 +19,23 @@ public class FangjiaOpenExceptionHandler implements ExceptionHandler { public void onExcetion(Throwable e) throws ServletException, IOException { ActionContext context = ActionContext.getContext(); if (LOGGER.isErrorEnabled()) { - LOGGER.error("请求地址:{}", context.getRequest().getRequestURL().toString(), e); + LOGGER.error("璇锋眰鍦板潃锛歿}", context.getRequest().getRequestURL().toString(), e); } String ip = getLocalHostIP(); String token = "ae14f50045e9375c354940a2afb86f14e453bd1f08f78da0ba6e788d35bccec4"; try { - DingDingMessageUtil.sendTextMessage(token, "[OpenApi] "+ip+"服务器内部错误,请及时关注!"); + DingDingMessageUtil.sendTextMessage(token, "[OpenApi] "+ip+"鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇峰強鏃跺叧娉紒"); } catch (Exception e1) { e1.printStackTrace(); } context.getResponse().setStatus(500); context.getResponse().setCharacterEncoding("UTF-8"); context.getResponse().setContentType("application/json;charset=UTF-8"); - context.getResponse().getWriter().println("{\"code\":500, \"msg\":\"服务器内部错误\"}"); + context.getResponse().getWriter().println("{\"code\":500, \"msg\":\"鏈嶅姟鍣ㄥ唴閮ㄩ敊璇痋"}"); } public static String getLocalHostIP() { - /*k8s系统上运行时,使用hostname区分*/ + /*k8s绯荤粺涓婅繍琛屾椂,浣跨敤hostname鍖哄垎*/ if ("true".equalsIgnoreCase(System.getenv("ON_K8S"))) { return System.getenv("HOSTNAME"); } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/filters/AnalyticsFilter.java b/projects/fangjia-open/src/main/java/com/fangjia/open/filters/AnalyticsFilter.java index 21088af03..477f5ab51 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/filters/AnalyticsFilter.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/filters/AnalyticsFilter.java @@ -47,7 +47,7 @@ public class AnalyticsFilter implements Filter { realDoFilter(request, response, chain); } finally { ThreadLocalData.getInstance().clear(); - MDC.remove("trace_id"); // 清理 + MDC.remove("trace_id"); // 娓呯悊 } } @@ -78,7 +78,7 @@ public class AnalyticsFilter implements Filter { } private String createUID(HttpServletRequest request, HttpServletResponse response) { - // 设置UID + // 璁剧疆UID String uid = cookieContext.getUid(request); if (StringUtils.isEmpty(uid)) { uid = new ObjectId().toString(); @@ -90,7 +90,7 @@ public class AnalyticsFilter implements Filter { } private String createSID(HttpServletRequest request, HttpServletResponse response) { - // 设置SID + // 璁剧疆SID String sid = cookieContext.getSid(request); if (StringUtils.isEmpty(sid)) { sid = new ObjectId().toString(); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/interceptors/ApiVisitCountInterceptor.java b/projects/fangjia-open/src/main/java/com/fangjia/open/interceptors/ApiVisitCountInterceptor.java index 711b7278c..901521e06 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/interceptors/ApiVisitCountInterceptor.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/interceptors/ApiVisitCountInterceptor.java @@ -17,7 +17,7 @@ import java.math.BigDecimal; import java.util.*; /** - * API访问计费Interceptor + * API璁块棶璁¤垂Interceptor */ public class ApiVisitCountInterceptor implements Interceptor { @@ -25,7 +25,7 @@ public class ApiVisitCountInterceptor implements Interceptor { private ApiVisitCountService apiVisitCountService; /** - * 按照是否有返回有效数据计费 + * 鎸夌収鏄惁鏈夎繑鍥炴湁鏁堟暟鎹璐� */ private static final int PRICING_MODEL_BY_DATA_RESULT = 1; @@ -50,7 +50,7 @@ public class ApiVisitCountInterceptor implements Interceptor { /** - * 计费逻辑 + * 璁¤垂閫昏緫 * @param request * @param authBean */ @@ -75,7 +75,7 @@ public class ApiVisitCountInterceptor implements Interceptor { } /** - * 获取接口的URI + * 鑾峰彇鎺ュ彛鐨刄RI * @param request * @return */ @@ -85,7 +85,7 @@ public class ApiVisitCountInterceptor implements Interceptor { } /** - * 判断请求是否需要计费 + * 鍒ゆ柇璇锋眰鏄惁闇�瑕佽璐� * @param authBean * @param uri * @return @@ -126,7 +126,7 @@ public class ApiVisitCountInterceptor implements Interceptor { return auth.getOpenResourseUrisMap().get(uri) != PRICING_MODEL_BY_DATA_RESULT; } /** - * 判断是否是超级用户 + * 鍒ゆ柇鏄惁鏄秴绾х敤鎴� * @param userId * @return */ @@ -135,7 +135,7 @@ public class ApiVisitCountInterceptor implements Interceptor { } /** - * 获取超级接口的ServiceCode + * 鑾峰彇瓒呯骇鎺ュ彛鐨凷erviceCode * @param request * @return */ @@ -145,7 +145,7 @@ public class ApiVisitCountInterceptor implements Interceptor { if(StringUtils.isBlank(serviceCode)){ return Collections.emptyList(); } - return Arrays.asList(serviceCode.split(",|,")); + return Arrays.asList(serviceCode.split(",|锛�")); } public void setApiVisitCountService(ApiVisitCountService apiVisitCountService) { diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/interceptors/AuditInterceptor.java b/projects/fangjia-open/src/main/java/com/fangjia/open/interceptors/AuditInterceptor.java index cd2da8ea8..f539cdb36 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/interceptors/AuditInterceptor.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/interceptors/AuditInterceptor.java @@ -33,9 +33,9 @@ import java.util.concurrent.BlockingQueue; /** - * API审计日志监控器 + * API瀹¤鏃ュ織鐩戞帶鍣� * - * @author 王文艳 + * @author 鐜嬫枃鑹� * @create 2016-10-21 **/ public class AuditInterceptor implements Interceptor { @@ -85,12 +85,12 @@ public class AuditInterceptor implements Interceptor { if (msg == null) { msg = ""; } - msg = msg + "->" + httpCode.getErrorMessage().toString() + "(不规范API)"; + msg = msg + "->" + httpCode.getErrorMessage().toString() + "(涓嶈鑼傾PI)"; } isReturnData = true; } else { status = 200; - msg = "返回成功(不规范API)"; + msg = "杩斿洖鎴愬姛(涓嶈鑼傾PI)"; } openUriLogAction(request, apiUser, user, object, status, msg, startMills); @@ -125,13 +125,13 @@ public class AuditInterceptor implements Interceptor { private void openUriLogAction(HttpServletRequest request, ApiUser apiUser, User user, Object result, int status, String msg, long startMills) { - /**1:无token或者token错误的不记录日志 2:OpenApi测试账户:仅供房价网内部使用,正常访问的情况下不记录日志*/ + /**1:鏃爐oken鎴栬�卼oken閿欒鐨勪笉璁板綍鏃ュ織 2:OpenApi娴嬭瘯璐︽埛锛氫粎渚涙埧浠风綉鍐呴儴浣跨敤锛屾甯歌闂殑鎯呭喌涓嬩笉璁板綍鏃ュ織*/ if (apiUser == null || (apiUser.getId() == 1007497 && status == 200)) { return; } try { String requestUri = request.getRequestURI(); - //对于建索引的请求,不做日志记录 + //瀵逛簬寤虹储寮曠殑璇锋眰锛屼笉鍋氭棩蹇楄褰� if (!requestUri.contains("/trigger/trigger") && !requestUri.contains("/refreshCache")) { String ip = AnalyticsUtil.getIpAddress(request); OpenUriLog openUriLog = new OpenUriLog(); @@ -182,7 +182,7 @@ public class AuditInterceptor implements Interceptor { } /** - * 判断是否需要保存返回结果 + * 鍒ゆ柇鏄惁闇�瑕佷繚瀛樿繑鍥炵粨鏋� * @param request * @return */ @@ -242,7 +242,7 @@ public class AuditInterceptor implements Interceptor { LOGGER.warn("OpenUriLog Queue Is Over 4000"); } } catch (Throwable e) { - LOGGER.error("API保存日志发生异常:", e); + LOGGER.error("API淇濆瓨鏃ュ織鍙戠敓寮傚父:", e); } } } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/interceptors/AuthenticationInterceptor.java b/projects/fangjia-open/src/main/java/com/fangjia/open/interceptors/AuthenticationInterceptor.java index b262fe5b3..aafee1e5e 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/interceptors/AuthenticationInterceptor.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/interceptors/AuthenticationInterceptor.java @@ -33,7 +33,7 @@ import java.net.SocketException; import java.util.*; /** - * API拦截器 + * API鎷︽埅鍣� * * @author */ @@ -58,7 +58,7 @@ public class AuthenticationInterceptor implements Interceptor { } /** - * token过期时间 单位:s + * token杩囨湡鏃堕棿 鍗曚綅:s */ private static final long TOKEN_EXPIRED_TIME = 60 * 60 * 2; @@ -85,7 +85,7 @@ public class AuthenticationInterceptor implements Interceptor { } } } - //功能方法没有设置权限或者有该方法权限 + //鍔熻兘鏂规硶娌℃湁璁剧疆鏉冮檺鎴栬�呮湁璇ユ柟娉曟潈闄� if (authority == null || authority.role() == Role.NONE || null == httpCode) { Object obj; try { @@ -111,11 +111,11 @@ public class AuthenticationInterceptor implements Interceptor { String ip = getLocalHostIP(); String token = "ae14f50045e9375c354940a2afb86f14e453bd1f08f78da0ba6e788d35bccec4"; try { - DingDingMessageUtil.sendTextMessage(token, "[OpenApi] "+ip+"Authentication 错误!"); + DingDingMessageUtil.sendTextMessage(token, "[OpenApi] "+ip+"Authentication 閿欒锛�"); } catch (Exception e1) { e1.printStackTrace(); } - LOGGER.error("请求地址:{}", context.getRequest().getRequestURL().toString(), e); + LOGGER.error("璇锋眰鍦板潃锛歿}", context.getRequest().getRequestURL().toString(), e); LOGGER.error("Authentication error : ", e); ret.setModel(BasicModel.buildServerErrorModel()); ret.setViewParam("code", HttpServletResponse.SC_INTERNAL_SERVER_ERROR); @@ -124,7 +124,7 @@ public class AuthenticationInterceptor implements Interceptor { } private static String getLocalHostIP() { - /*k8s系统上运行时,使用hostname区分*/ + /*k8s绯荤粺涓婅繍琛屾椂,浣跨敤hostname鍖哄垎*/ if ("true".equalsIgnoreCase(System.getenv("ON_K8S"))) { return System.getenv("HOSTNAME"); } @@ -257,19 +257,19 @@ public class AuthenticationInterceptor implements Interceptor { private Authority getAuthority(ActionInvocation invocation) { Authority authority; - // 获取方法上的权限注解 + // 鑾峰彇鏂规硶涓婄殑鏉冮檺娉ㄨВ authority = invocation.getAction().getActionMethod().getAnnotation(Authority.class); if (null != authority) { return authority; } - // 获取类上的权限注解 + // 鑾峰彇绫讳笂鐨勬潈闄愭敞瑙� authority = invocation.getControllerInstance().getClass().getAnnotation(Authority.class); return authority; } /** - * 检验是否有访问该Action的权限 + * 妫�楠屾槸鍚︽湁璁块棶璇ction鐨勬潈闄� * * @param tokenStr * @param request @@ -278,7 +278,7 @@ public class AuthenticationInterceptor implements Interceptor { */ private HttpCode authorized(String tokenStr, HttpServletRequest request) throws Exception { - // 检查是否为api用户 + // 妫�鏌ユ槸鍚︿负api鐢ㄦ埛 HttpCode ret = new HttpCode(OpenHttpCodeEnum.AUTH_FAILD); Token token = FangjiaApiUtil.parse2Token(tokenStr); ApiUser apiUser = parseApiUserByToken(token); @@ -292,12 +292,12 @@ public class AuthenticationInterceptor implements Interceptor { return new HttpCode(OpenHttpCodeEnum.TOKEN_EXPIRED); } if (1 == apiUser.getStatus()) { - return new HttpCode(OpenHttpCodeEnum.AUTH_FAILD, "你的账户已失效"); + return new HttpCode(OpenHttpCodeEnum.AUTH_FAILD, "浣犵殑璐︽埛宸插け鏁�"); } if (StringUtils.isNotBlank(apiUser.getIp())) { String ip = AnalyticsUtil.getIpAddress(request); if (!isAuthIp(ip, apiUser)) { - ret = new HttpCode(OpenHttpCodeEnum.AUTH_FAILD, "ip[" + ip + "]无权限访问API"); + ret = new HttpCode(OpenHttpCodeEnum.AUTH_FAILD, "ip[" + ip + "]鏃犳潈闄愯闂瓵PI"); return ret; } } @@ -309,7 +309,7 @@ public class AuthenticationInterceptor implements Interceptor { AuthenticationBean.get(request, apiUser, user, auth); } uri = OpenConfig.getConfig().isDevelopmentEnvironment() ? uri.replace("/fangjia-open", "") : uri; - // 检查是否有访问该Action的权限 + // 妫�鏌ユ槸鍚︽湁璁块棶璇ction鐨勬潈闄� boolean authAction = null != auth && auth.getOpenResourseUris().contains(uri); String cityName = request.getParameter("city"); if (StringUtils.isBlank(cityName)) { @@ -322,37 +322,37 @@ public class AuthenticationInterceptor implements Interceptor { cityName = RegionData.formatCity(cityName); if (!RegionData.isCity(cityName)) { ret = new HttpCode(OpenHttpCodeEnum.ARGUMENT_INVALID); - ret.setErrorMessage("城市非法"); + ret.setErrorMessage("鍩庡競闈炴硶"); return ret; } } } boolean authCity = isAuthCity(cityName, apiUser); if (!authCity) { - ret = new HttpCode(OpenHttpCodeEnum.AUTH_FAILD, "您未开通城市" + (StringUtils.isNotBlank(cityName) ? cityName : StringUtils.EMPTY) + "的权限"); + ret = new HttpCode(OpenHttpCodeEnum.AUTH_FAILD, "鎮ㄦ湭寮�閫氬煄甯�" + (StringUtils.isNotBlank(cityName) ? cityName : StringUtils.EMPTY) + "鐨勬潈闄�"); } if (authAction && authCity) { if (hasSubService(uri)) { List serviceCodes = getServiceCode(request); for (String serviceCode : serviceCodes) { if (!auth.getOpenResourseUris().contains(uri + SUB_SERVICE_SEPARATOR + serviceCode)) { - ret = new HttpCode(OpenHttpCodeEnum.AUTH_FAILD, "无权限访问服务:" + serviceCode); + ret = new HttpCode(OpenHttpCodeEnum.AUTH_FAILD, "鏃犳潈闄愯闂湇鍔�:" + serviceCode); return ret; } if (isReachDeadline(auth, uri, serviceCode)) { - ret = new HttpCode(OpenHttpCodeEnum.SERVICE_EXPIRED, serviceCode + "服务已过期"); + ret = new HttpCode(OpenHttpCodeEnum.SERVICE_EXPIRED, serviceCode + "鏈嶅姟宸茶繃鏈�"); return ret; } if (isReachUpperLimit(auth, uri, serviceCode)) { - ret = new HttpCode(OpenHttpCodeEnum.UPPER_LIMIT, serviceCode + "今日已达到配额上限"); + ret = new HttpCode(OpenHttpCodeEnum.UPPER_LIMIT, serviceCode + "浠婃棩宸茶揪鍒伴厤棰濅笂闄�"); return ret; } - // 检测是否达到总数访问上限 + // 妫�娴嬫槸鍚﹁揪鍒版�绘暟璁块棶涓婇檺 if (isReachSumLimit(auth, uri, serviceCode)) { - ret = new HttpCode(OpenHttpCodeEnum.UPPER_LIMIT, serviceCode + "已达到配额上限"); + ret = new HttpCode(OpenHttpCodeEnum.UPPER_LIMIT, serviceCode + "宸茶揪鍒伴厤棰濅笂闄�"); return ret; } - // 检测是否达到总数的90% + // 妫�娴嬫槸鍚﹁揪鍒版�绘暟鐨�90% if (isReach90SumLimit(auth, uri, serviceCode)) { kafkaProducerUtils.send(SMS_DATA_TOPIC, SMS_DATA_TOPIC_PROFIX + apiUser.getPhone() + "-" + user.getUserName() + "-" + uri); } @@ -360,20 +360,20 @@ public class AuthenticationInterceptor implements Interceptor { } else { if (isReachDeadline(auth, uri, null)) { - ret = new HttpCode(OpenHttpCodeEnum.UPPER_LIMIT, "服务已过期"); + ret = new HttpCode(OpenHttpCodeEnum.UPPER_LIMIT, "鏈嶅姟宸茶繃鏈�"); return ret; } - // 检测是否达到今天访问上限 + // 妫�娴嬫槸鍚﹁揪鍒颁粖澶╄闂笂闄� if (isReachUpperLimit(auth, uri, null)) { - ret = new HttpCode(OpenHttpCodeEnum.UPPER_LIMIT, "今日已达到配额上限"); + ret = new HttpCode(OpenHttpCodeEnum.UPPER_LIMIT, "浠婃棩宸茶揪鍒伴厤棰濅笂闄�"); return ret; } - // 检测是否达到总数访问上限 + // 妫�娴嬫槸鍚﹁揪鍒版�绘暟璁块棶涓婇檺 if (isReachSumLimit(auth, uri, null)) { - ret = new HttpCode(OpenHttpCodeEnum.UPPER_LIMIT, "已达到配额上限"); + ret = new HttpCode(OpenHttpCodeEnum.UPPER_LIMIT, "宸茶揪鍒伴厤棰濅笂闄�"); return ret; } - // 检测是否达到总数的90% + // 妫�娴嬫槸鍚﹁揪鍒版�绘暟鐨�90% if (isReach90SumLimit(auth, uri, null)) { kafkaProducerUtils.send(SMS_DATA_TOPIC, SMS_DATA_TOPIC_PROFIX + apiUser.getPhone() + "-" + user.getUserName() + "-" + uri); } @@ -395,11 +395,11 @@ public class AuthenticationInterceptor implements Interceptor { if (StringUtils.isBlank(serviceCode)) { return Collections.emptyList(); } - return Arrays.asList(serviceCode.split(",|,")); + return Arrays.asList(serviceCode.split(",|锛�")); } /** - * 判断该API是否拥有子权限 + * 鍒ゆ柇璇PI鏄惁鎷ユ湁瀛愭潈闄� * * @param uri * @return @@ -409,7 +409,7 @@ public class AuthenticationInterceptor implements Interceptor { } /** - * 2016年06月06日以前的用户是老用户,token不过期 + * 2016骞�06鏈�06鏃ヤ互鍓嶇殑鐢ㄦ埛鏄�佺敤鎴凤紝token涓嶈繃鏈� * * @param apiUser * @return @@ -419,7 +419,7 @@ public class AuthenticationInterceptor implements Interceptor { } /** - * 判断Token是否过期 + * 鍒ゆ柇Token鏄惁杩囨湡 * * @param token * @return @@ -429,7 +429,7 @@ public class AuthenticationInterceptor implements Interceptor { } /** - * @param ip 验证客户IP是否在注册的白名单中 + * @param ip 楠岃瘉瀹㈡埛IP鏄惁鍦ㄦ敞鍐岀殑鐧藉悕鍗曚腑 * @param apiUser * @return */ @@ -447,14 +447,14 @@ public class AuthenticationInterceptor implements Interceptor { } /** - * 是否有权限访问该城市 + * 鏄惁鏈夋潈闄愯闂鍩庡競 * * @param cityName * @param apiUser * @return */ private boolean isAuthCity(String cityName, ApiUser apiUser) { - // 若访问当前接口不需要城市参数,则返回true + // 鑻ヨ闂綋鍓嶆帴鍙d笉闇�瑕佸煄甯傚弬鏁帮紝鍒欒繑鍥瀟rue if (StringUtils.isBlank(cityName)) { return true; } @@ -464,7 +464,7 @@ public class AuthenticationInterceptor implements Interceptor { cityName = city; } } - // 若当前接口需要城市,检查是否有访问当前城市的权限 + // 鑻ュ綋鍓嶆帴鍙i渶瑕佸煄甯�,妫�鏌ユ槸鍚︽湁璁块棶褰撳墠鍩庡競鐨勬潈闄� boolean authCity = StringUtils.isNotBlank(apiUser.getCity()) && !StringUtils.equalsIgnoreCase(apiUser.getCity(), "all"); if (authCity) { ServerArea city = ServerAreaData.getServerAreaByDisplayDefaultNull(cityName); @@ -492,7 +492,7 @@ public class AuthenticationInterceptor implements Interceptor { /** - * 新版token验证 + * 鏂扮増token楠岃瘉 * * @param token * @return @@ -503,7 +503,7 @@ public class AuthenticationInterceptor implements Interceptor { if (tokenMap == null) { return null; } - // token验证后,拿取出的字段再去数据库验证一遍 + // token楠岃瘉鍚庯紝鎷垮彇鍑虹殑瀛楁鍐嶅幓鏁版嵁搴撻獙璇佷竴閬� if (StringUtils.isNotBlank(tokenMap.get("userid")) && !"null".equals(tokenMap.get("userid"))) { ApiUser apiUser = apiUserService.findApiUserById(Long.parseLong(tokenMap.get("userid"))); if (apiUser != null) { diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/interceptors/FileUploadInterceptor.java b/projects/fangjia-open/src/main/java/com/fangjia/open/interceptors/FileUploadInterceptor.java index 5f581e2a7..d5caa439d 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/interceptors/FileUploadInterceptor.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/interceptors/FileUploadInterceptor.java @@ -11,7 +11,7 @@ import org.sothis.web.mvc.interceptors.HttpMultipartException; import javax.servlet.http.HttpServletRequest; /** - * 文件上传拦截器 + * 鏂囦欢涓婁紶鎷︽埅鍣� * @author wenyan */ @Bean(scope = Scope.SINGLETON) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/interceptors/JsonViewInterceptor.java b/projects/fangjia-open/src/main/java/com/fangjia/open/interceptors/JsonViewInterceptor.java index 68ed42db0..1bf321673 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/interceptors/JsonViewInterceptor.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/interceptors/JsonViewInterceptor.java @@ -18,7 +18,7 @@ import java.util.Arrays; import java.util.List; /** - * JSON 视图拦截器,主要是过滤字段是否返回 + * JSON 瑙嗗浘鎷︽埅鍣紝涓昏鏄繃婊ゅ瓧娈垫槸鍚﹁繑鍥� */ public class JsonViewInterceptor implements Interceptor { diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/interceptors/ParametersInterceptor.java b/projects/fangjia-open/src/main/java/com/fangjia/open/interceptors/ParametersInterceptor.java index e6e2211a1..2f9696850 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/interceptors/ParametersInterceptor.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/interceptors/ParametersInterceptor.java @@ -21,7 +21,7 @@ import java.util.*; import java.util.regex.Pattern; /** - * 重写参数注入拦截器 + * 閲嶅啓鍙傛暟娉ㄥ叆鎷︽埅鍣� * @date 216/10/08 * @author wenyan * @see org.sothis.web.mvc.interceptors.ParametersInterceptor @@ -184,7 +184,7 @@ public class ParametersInterceptor implements Interceptor { break; } Type[] types = writeMethod.getGenericParameterTypes(); - // 如果是泛型,则尽量找到泛型对应的实际类型 + // 濡傛灉鏄硾鍨嬶紝鍒欏敖閲忔壘鍒版硾鍨嬪搴旂殑瀹為檯绫诲瀷 if (types != null && types.length > 0 && types[0] instanceof TypeVariable) { TypeVariable typeVariable = (TypeVariable) types[0]; Type type = bean.getClass().getGenericSuperclass(); @@ -216,7 +216,7 @@ public class ParametersInterceptor implements Interceptor { try{ propertyValue = convert(entry.getValue(), propertyType, p); }catch (TypeConvertException e){ - throw new TypeConvertException(descriptor.getName() + ":数据类型不合法"); + throw new TypeConvertException(descriptor.getName() + ":鏁版嵁绫诲瀷涓嶅悎娉�"); } if (null != propertyValue) { writeMethod.invoke(bean, propertyValue); @@ -342,7 +342,7 @@ public class ParametersInterceptor implements Interceptor { } /** - * 数据类型转换异常 + * 鏁版嵁绫诲瀷杞崲寮傚父 * @author wenyan */ class TypeConvertException extends Exception{ diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/interceptors/Role.java b/projects/fangjia-open/src/main/java/com/fangjia/open/interceptors/Role.java index b56e9b880..4bf27bdd3 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/interceptors/Role.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/interceptors/Role.java @@ -2,15 +2,15 @@ package com.fangjia.open.interceptors; public enum Role { /** - * 任意用户(登录或未登录) + * 浠绘剰鐢ㄦ埛锛堢櫥褰曟垨鏈櫥褰曪級 */ NONE, /** - * 已登录的所有用户 + * 宸茬櫥褰曠殑鎵�鏈夌敤鎴� */ USER, /** - * 登录的管理员 + * 鐧诲綍鐨勭鐞嗗憳 */ ADMIN } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/interceptors/ValidatorInterceptor.java b/projects/fangjia-open/src/main/java/com/fangjia/open/interceptors/ValidatorInterceptor.java index 600955349..9266b4d62 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/interceptors/ValidatorInterceptor.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/interceptors/ValidatorInterceptor.java @@ -16,7 +16,7 @@ import java.lang.annotation.Annotation; import java.util.Set; /** - * 请求参数校验器 + * 璇锋眰鍙傛暟鏍¢獙鍣� * */ public class ValidatorInterceptor implements Interceptor { @@ -37,7 +37,7 @@ public class ValidatorInterceptor implements Interceptor { String token = request.getParameter("token"); if(StringUtils.isBlank(token)){ RestfulModelAndView mav = new RestfulModelAndView(); - mav.setModel(BasicModel.buildUnAuthorizedModel().setMsg("token不能为空")); + mav.setModel(BasicModel.buildUnAuthorizedModel().setMsg("token涓嶈兘涓虹┖")); return mav; } @@ -71,10 +71,10 @@ public class ValidatorInterceptor implements Interceptor { private boolean isNeedToken(ActionInvocation invocation){ - // 获取方法上的权限注解 + // 鑾峰彇鏂规硶涓婄殑鏉冮檺娉ㄨВ Authority authority = invocation.getAction().getActionMethod().getAnnotation(Authority.class); if (null == authority) { - // 获取类上的权限注解 + // 鑾峰彇绫讳笂鐨勬潈闄愭敞瑙� authority = invocation.getControllerInstance().getClass().getAnnotation(Authority.class); } return authority != null && authority.role() != null && authority.role() != Role.NONE; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/listeners/ContextLoaderListener.java b/projects/fangjia-open/src/main/java/com/fangjia/open/listeners/ContextLoaderListener.java index 1d388dc0b..fcaa856fb 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/listeners/ContextLoaderListener.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/listeners/ContextLoaderListener.java @@ -26,7 +26,7 @@ public class ContextLoaderListener implements ServletContextListener { private WeChatAuthService weChatAuthService; private boolean addressMatchEnabled = OpenConfig.getConfig().addressMatchEnabled(); - //时间间隔(一天) + //鏃堕棿闂撮殧(涓�澶�) private static final long PERIOD_DAY = 24 * 60 * 60 * 1000; private Timer timer; @@ -41,10 +41,10 @@ public class ContextLoaderListener implements ServletContextListener { try { LOGGER.warn("warm up starting..."); QueryParser parser = new QueryParser(Version.LUCENE_35, "foo", new IKAnalyzer(true)); - parser.parse("上海康城"); + parser.parse("涓婃捣搴峰煄"); if(OpenConfig.getConfig().isProductionEnvironment() || addressMatchEnabled) { LOGGER.warn("warm up regions..."); - RegionData.formatRegion("重庆", "江北区"); + RegionData.formatRegion("閲嶅簡", "姹熷寳鍖�"); LOGGER.warn("warm up cn dictionary..."); } if(!SystemUtils.IS_OS_WINDOWS || addressMatchEnabled){ @@ -78,7 +78,7 @@ public class ContextLoaderListener implements ServletContextListener { } /** - * 数据加载任务 + * 鏁版嵁鍔犺浇浠诲姟 */ class DataLoadTask extends TimerTask{ diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/AddesssMatchModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/AddesssMatchModel.java index 6feef4517..9e39c5b85 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/AddesssMatchModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/AddesssMatchModel.java @@ -3,7 +3,7 @@ package com.fangjia.open.model; import org.hibernate.validator.constraints.NotBlank; /** - * @author 王文艳 + * @author 鐜嬫枃鑹� * @create 2016-09-08 **/ public class AddesssMatchModel extends FangjiaApiModel { diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/AddressModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/AddressModel.java index 94af02362..62bd77997 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/AddressModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/AddressModel.java @@ -15,9 +15,9 @@ public class AddressModel extends FangjiaApiModel { private boolean nearby; private String category; private String verify; - // 返回最大结果集 + // 杩斿洖鏈�澶х粨鏋滈泦 private int max; - // 是否包含地图数据 + // 鏄惁鍖呭惈鍦板浘鏁版嵁 private boolean includeMaps; private boolean matchAddrepo; private String preciseLevel; @@ -27,26 +27,26 @@ public class AddressModel extends FangjiaApiModel { private String chooseId; - // poi类型 + // poi绫诲瀷 private String type; - // 范围距离 + // 鑼冨洿璺濈 private Integer radius; - // 查询数量 + // 鏌ヨ鏁伴噺 private Integer number; private Integer offset; - // 查询页码 + // 鏌ヨ椤电爜 private Integer pageNo; private Integer page; - // 是否用于检查 + // 鏄惁鐢ㄤ簬妫�鏌� private String dataLevel; private String keywords; - //是否使用地图poi数据 + //鏄惁浣跨敤鍦板浘poi鏁版嵁 private boolean useMap; - //涉农到区之后,是否显式后面的字段值 + //娑夊啘鍒板尯涔嬪悗锛屾槸鍚︽樉寮忓悗闈㈢殑瀛楁鍊� private String showFullValue; - //是否显示涉农测试用字段值 + //鏄惁鏄剧ず娑夊啘娴嬭瘯鐢ㄥ瓧娈靛�� private String showTestValue; private String lat; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/ApiUserModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/ApiUserModel.java index a3c228c25..fb5d69948 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/ApiUserModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/ApiUserModel.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.Map; /** - * API用户管理Model + * API鐢ㄦ埛绠$悊Model */ public class ApiUserModel extends FangjiaApiModel{ @@ -20,8 +20,8 @@ public class ApiUserModel extends FangjiaApiModel{ private static final long serialVersionUID = 7044341510628330454L; - private String begDateStr;// 查询开始日期 - private String endDateStr;// 查询结束日期 + private String begDateStr;// 鏌ヨ寮�濮嬫棩鏈� + private String endDateStr;// 鏌ヨ缁撴潫鏃ユ湡 private String statDate; private String appKey; private String userName; @@ -66,18 +66,18 @@ public class ApiUserModel extends FangjiaApiModel{ private Integer sum; private Integer limit; - /*** 权限控制相关 **/ + /*** 鏉冮檺鎺у埗鐩稿叧 **/ private ApiUserBo apiUserBo; private List authorityList; private ApiUserAuthority authority; private List authorityBoList; //private List serverAreaList; private List> serverAreaList; - private String openCitys;// 汉字说明 - private List cityFirstLetters;// 城市拼音首字母 + private String openCitys;// 姹夊瓧璇存槑 + private List cityFirstLetters;// 鍩庡競鎷奸煶棣栧瓧姣� private String type; private String citys;// spell - private String unCheckCitys;// 页面反选的city + private String unCheckCitys;// 椤甸潰鍙嶉�夌殑city private Integer status; private boolean hasAuth; private boolean supportLatLng; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/AroundAverageModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/AroundAverageModel.java index 651789f10..754a4917f 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/AroundAverageModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/AroundAverageModel.java @@ -5,8 +5,8 @@ import com.fangjia.open.validation.IsCity; import org.hibernate.validator.constraints.NotBlank; /** - * 小区周边均价Model - * @author 王文艳 + * 灏忓尯鍛ㄨ竟鍧囦环Model + * @author 鐜嬫枃鑹� * @create 2016-10-08 **/ public class AroundAverageModel extends FangjiaApiModel { diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/AvgPriceGuidePriceModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/AvgPriceGuidePriceModel.java index 901153911..303ac222d 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/AvgPriceGuidePriceModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/AvgPriceGuidePriceModel.java @@ -10,13 +10,13 @@ public class AvgPriceGuidePriceModel { private int guidePrice; /** - * 指导日期(只能是前面的周日) + * 鎸囧鏃ユ湡(鍙兘鏄墠闈㈢殑鍛ㄦ棩) */ // private String guideDate; // private String guideDate; /** - * 均价计算类型,1:当期,2-全部 + * 鍧囦环璁$畻绫诲瀷,1:褰撴湡锛�2-鍏ㄩ儴 */ // private String calcType; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/BaseModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/BaseModel.java index 5f8712b9f..8283aa15c 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/BaseModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/BaseModel.java @@ -30,7 +30,7 @@ public class BaseModel extends ModelAndViewSupport { private final static String PIC_URL = STATIC_URL + "/fs/"; - // 默认房源小图 + // 榛樿鎴挎簮灏忓浘 private final static String DEFAULT_S_PIC = STATIC_URL + "/images/common/no-s.gif"; private Pager pager; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/BatchEvaluateModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/BatchEvaluateModel.java index 46d30b887..7c26a9566 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/BatchEvaluateModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/BatchEvaluateModel.java @@ -3,7 +3,7 @@ package com.fangjia.open.model; import org.springframework.web.multipart.MultipartFile; /** - * 批量重估Model + * 鎵归噺閲嶄及Model * Created by wenyan on 2016/1/7. */ public class BatchEvaluateModel extends FangjiaApiModel { diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/CityPriceIntervalModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/CityPriceIntervalModel.java index 91a93c058..80f8fdd33 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/CityPriceIntervalModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/CityPriceIntervalModel.java @@ -3,12 +3,12 @@ package com.fangjia.open.model; public class CityPriceIntervalModel extends FangjiaApiModel{ /** - * 城市 + * 鍩庡競 */ private String city; /** - * 区域 + * 鍖哄煙 */ private String region; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/CollateralEvaluationInfoModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/CollateralEvaluationInfoModel.java index be4982c92..2f9353741 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/CollateralEvaluationInfoModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/CollateralEvaluationInfoModel.java @@ -12,22 +12,22 @@ public class CollateralEvaluationInfoModel extends FangjiaApiModel { private String address; private String name; private String estateType; - private Integer maxFloor;//总楼层 - private Integer floor;//所在楼层 + private Integer maxFloor;//鎬绘ゼ灞� + private Integer floor;//鎵�鍦ㄦゼ灞� private Double size; - private Date purchaseDate;//购置时间 - private String usage;//用途 - private Date calDate; //时间 + private Date purchaseDate;//璐疆鏃堕棿 + private String usage;//鐢ㄩ�� + private Date calDate; //鏃堕棿 private Integer height; private String houseNumber; private String houseUnitNumber; private String roomNumber; private String fitment; private String direction; - private int avgPrice;//小区均价 + private int avgPrice;//灏忓尯鍧囦环 - //相关系数 + //鐩稿叧绯绘暟 private Double agencyCount; private Double agencyCountMax; private Double agencyCountMin; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/CommercialModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/CommercialModel.java index 60da71c02..50eee7c30 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/CommercialModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/CommercialModel.java @@ -10,18 +10,18 @@ public class CommercialModel extends FangjiaApiModel{ private String location; - private Integer floor;//所在楼层 - private Integer maxFloor;//总楼层 + private Integer floor;//鎵�鍦ㄦゼ灞� + private Integer maxFloor;//鎬绘ゼ灞� - private Integer passengerFlow;//客流量---0:高 1:中 2:低 - private Integer leaseStability;//租约稳定性---0:持续稳定出租 1:阶段性出租 2:偶尔出租 3:未出租 - private Integer sellType;//出售/转让---0:出售 1:转让 - private Integer decorationCost;//装修成本(单位:万元) - private Integer decorationYear;//装修年限(单位:年) + private Integer passengerFlow;//瀹㈡祦閲�---0:楂� 1:涓� 2:浣� + private Integer leaseStability;//绉熺害绋冲畾鎬�---0:鎸佺画绋冲畾鍑虹 1:闃舵鎬у嚭绉� 2:鍋跺皵鍑虹 3:鏈嚭绉� + private Integer sellType;//鍑哄敭/杞---0:鍑哄敭 1:杞 + private Integer decorationCost;//瑁呬慨鎴愭湰(鍗曚綅:涓囧厓) + private Integer decorationYear;//瑁呬慨骞撮檺(鍗曚綅:骞�) @NotBlank - private Integer estateType;//商铺类型---0:临街商铺 1:住宅底商 2:购物百货中心 3:写字楼商铺 4:档口摊位 5:市场类商铺 6:交通设施商铺 7:旅游商铺 + private Integer estateType;//鍟嗛摵绫诲瀷---0:涓磋鍟嗛摵 1:浣忓畢搴曞晢 2:璐墿鐧捐揣涓績 3:鍐欏瓧妤煎晢閾� 4:妗e彛鎽婁綅 5:甯傚満绫诲晢閾� 6:浜ら�氳鏂藉晢閾� 7:鏃呮父鍟嗛摵 - private Integer showSample;//是否显示样本 1:显示 + private Integer showSample;//鏄惁鏄剧ず鏍锋湰 1:鏄剧ず private Integer maxPrice; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/CommunitySummaryRequestDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/CommunitySummaryRequestDto.java index fb5ed4f7b..ab50f36fb 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/CommunitySummaryRequestDto.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/CommunitySummaryRequestDto.java @@ -2,7 +2,7 @@ package com.fangjia.open.model; /** - * 小区宽表入参DTO + * 灏忓尯瀹借〃鍏ュ弬DTO * * @author shenjian * @since 2022/10/11 @@ -10,37 +10,37 @@ package com.fangjia.open.model; public class CommunitySummaryRequestDto extends FangjiaApiModel { /** - * 小区ID + * 灏忓尯ID */ private String id; /** - * 城市 + * 鍩庡競 */ private String city; /** - * 地址 + * 鍦板潃 */ private String address; /** - * 总楼层 + * 鎬绘ゼ灞� */ private Integer maxFloor; /** - * 面积 + * 闈㈢Н */ private Float area; /** - * 房屋用途 + * 鎴垮眿鐢ㄩ�� */ private String housePurpose; /** - * 备注 + * 澶囨敞 */ private String memo; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/CzbankSampleModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/CzbankSampleModel.java index a24154823..f01e3ecfd 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/CzbankSampleModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/CzbankSampleModel.java @@ -10,44 +10,44 @@ import java.util.Date; public class CzbankSampleModel extends FangjiaApiModel{ private String cltNo; private String province; - /**城市*/ + /**鍩庡競*/ private String city; - /**区域*/ + /**鍖哄煙*/ private String district; - /**小区名*/ + /**灏忓尯鍚�*/ private String buildingName; - /**楼栋名称*/ + /**妤兼爧鍚嶇О*/ private String buildingNoName; - /**物业类型编码*/ + /**鐗╀笟绫诲瀷缂栫爜*/ private String propertyTypeCode; - /**是否有电梯 0:无 1:有*/ + /**鏄惁鏈夌數姊� 0锛氭棤 1锛氭湁*/ private Integer isElevator; - /**总楼层*/ + /**鎬绘ゼ灞�*/ private Integer aboveFloorAmount; - /**所在楼层*/ + /**鎵�鍦ㄦゼ灞�*/ private Integer floorNumber; /** - * 装修情况编码 - * 1:毛坯 - * 2:简装(默认) - * 3:精装 - * 4:豪装 + * 瑁呬慨鎯呭喌缂栫爜 + * 1锛氭瘺鍧� + * 2锛氱畝瑁咃紙榛樿锛� + * 3锛氱簿瑁� + * 4锛氳豹瑁� * */ private Integer decrCondCode; - /**面积**/ + /**闈㈢Н**/ private Double strctureArea; /** - * 朝向情况编码 - * 1:西南 - * 2:东南 - * 3:南(默认) - * 4:西北 - * 5:东北 - * 6:东 - * 7:西 - * 8:北 - * 9:东西 - * 10:南北 + * 鏈濆悜鎯呭喌缂栫爜 + * 1锛氳タ鍗� + * 2锛氫笢鍗� + * 3锛氬崡(榛樿) + * 4锛氳タ鍖� + * 5锛氫笢鍖� + * 6锛氫笢 + * 7锛氳タ + * 8锛氬寳 + * 9锛氫笢瑗� + * 10锛氬崡鍖� * */ private Integer towardDirectCode; private Date updateDate; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/DistrictAvgPriceModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/DistrictAvgPriceModel.java index 00853695a..03e08eb9f 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/DistrictAvgPriceModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/DistrictAvgPriceModel.java @@ -2,23 +2,23 @@ package com.fangjia.open.model; public class DistrictAvgPriceModel { /** - * 区域名称 + * 鍖哄煙鍚嶇О */ private String name; /** - * 均价(元/平米) + * 鍧囦环(鍏�/骞崇背) */ private int avgPrice; /** - * 环比涨幅(单位%) + * 鐜瘮娑ㄥ箙(鍗曚綅%) */ private double mom; /** - * 月涨价(单位元) + * 鏈堟定浠凤紙鍗曚綅鍏冿級 */ private int riseOnMonth; /** - * 更新日期,格式:yyyy-MM-dd + * 鏇存柊鏃ユ湡锛屾牸寮�:yyyy-MM-dd */ private String updatedDate; public String getName() { diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/DistrictFacilitysModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/DistrictFacilitysModel.java index ca5c12046..ddc05adec 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/DistrictFacilitysModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/DistrictFacilitysModel.java @@ -4,7 +4,7 @@ import java.util.Date; import java.util.List; /** - * 小区周边配套 + * 灏忓尯鍛ㄨ竟閰嶅 */ public class DistrictFacilitysModel { private static final long serialVersionUID = -9200383212669643823L; @@ -36,13 +36,13 @@ public class DistrictFacilitysModel { private Date creationDate; - private List positives; // 正面 - private List negatives; // 负面 - private List appraisalNegative; // 负面 - private List appraisalPositive; // 正面 + private List positives; // 姝i潰 + private List negatives; // 璐熼潰 + private List appraisalNegative; // 璐熼潰 + private List appraisalPositive; // 姝i潰 /** - * 鏍囩寰楀垎 + * 閺嶅洨顒峰妤�鍨� */ private Double traScore; private Double virScore; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/DistrictInfoApiModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/DistrictInfoApiModel.java index f21cb541d..3b5ef95a7 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/DistrictInfoApiModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/DistrictInfoApiModel.java @@ -8,31 +8,31 @@ public class DistrictInfoApiModel extends BaseModel { private static final long serialVersionUID = 7366911188291142312L; /** - * 区域 + * 鍖哄煙 */ private String region; /** - * 小区 + * 灏忓尯 */ private String districtName; private District district; /** - * 二手房数量 + * 浜屾墜鎴挎暟閲� */ private int sellCount; /** - * 租房数量 + * 绉熸埧鏁伴噺 */ private int rentCount; private boolean showPic = true; /** - * 回调函数 + * 鍥炶皟鍑芥暟 */ private String callBack; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/DistrictNewPriceModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/DistrictNewPriceModel.java index ca07b5d64..fd51ef080 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/DistrictNewPriceModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/DistrictNewPriceModel.java @@ -3,17 +3,17 @@ package com.fangjia.open.model; public class DistrictNewPriceModel extends FangjiaApiModel{ /** - * 城市 + * 鍩庡競 */ private String city; /** - * 区域 + * 鍖哄煙 */ private String region; /** - * 小区名 + * 灏忓尯鍚� */ private String name; @@ -21,16 +21,16 @@ public class DistrictNewPriceModel extends FangjiaApiModel{ private int maxAvgPrice; - /********小区扩展信息*******/ - private double lng; //百度经度 - private double lat; //百度纬度 + /********灏忓尯鎵╁睍淇℃伅*******/ + private double lng; //鐧惧害缁忓害 + private double lat; //鐧惧害绾害 - private String poiTags; //小区地图标签 + private String poiTags; //灏忓尯鍦板浘鏍囩 - //排序 1-距离近 2-均价低 3-涨幅排序 4-跌幅排序 5-租售比排序 6-潜力指数排序 + //鎺掑簭 1-璺濈杩� 2-鍧囦环浣� 3-娑ㄥ箙鎺掑簭 4-璺屽箙鎺掑簭 5-绉熷敭姣旀帓搴� 6-娼滃姏鎸囨暟鎺掑簭 private int sort; - //查询返回条数 + //鏌ヨ杩斿洖鏉℃暟 private int limit; public String getCity() { diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/DistrictQueryModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/DistrictQueryModel.java index 5765c4981..5d8d07e25 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/DistrictQueryModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/DistrictQueryModel.java @@ -3,9 +3,9 @@ package com.fangjia.open.model; public class DistrictQueryModel { - String city;//城市 - String district;//区域 - String name;//小区名称 + String city;//鍩庡競 + String district;//鍖哄煙 + String name;//灏忓尯鍚嶇О public String getCity() { return city; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/DistrictSearchModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/DistrictSearchModel.java index 182a4fdff..049d9376d 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/DistrictSearchModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/DistrictSearchModel.java @@ -9,10 +9,10 @@ public class DistrictSearchModel extends SearchModel { private Long latMin; private Long lngMax; private Long lngMin; - private String loc;// 调用电商接口的参数 + private String loc;// 璋冪敤鐢靛晢鎺ュ彛鐨勫弬鏁� /** - * 小区类别 + * 灏忓尯绫诲埆 */ private String kind; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/DistrictToolModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/DistrictToolModel.java index 409a8e0ef..46db3b340 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/DistrictToolModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/DistrictToolModel.java @@ -8,19 +8,19 @@ import com.fangjia.service.bo.RentHouseBo; /*** * - * 小区详情页面小工具,for丁丁地图 + * 灏忓尯璇︽儏椤甸潰灏忓伐鍏凤紝for涓佷竵鍦板浘 * * **/ public class DistrictToolModel extends BaseModel { private static final long serialVersionUID = -8296872135217813030L; - private String regionName; // 区域 - private String districtName; // 小区名 - private String keyword;// 关键字 + private String regionName; // 鍖哄煙 + private String districtName; // 灏忓尯鍚� + private String keyword;// 鍏抽敭瀛� private District district; private List houseBoList; private List rentHouseBoList; - private String url;// 链到房价网的url,一般由更多使用 + private String url;// 閾惧埌鎴夸环缃戠殑url锛屼竴鑸敱鏇村浣跨敤 public String getRegionName() { return regionName; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/EvaluationBatchDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/EvaluationBatchDto.java index 09993ddf0..959fdd659 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/EvaluationBatchDto.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/EvaluationBatchDto.java @@ -1,42 +1,42 @@ package com.fangjia.open.model; /** - * PDS - 批量评估结果 + * PDS - 鎵归噺璇勪及缁撴灉 * @author yinjihuan * */ public class EvaluationBatchDto { /** - * 房龄 单位:年 + * 鎴块緞 鍗曚綅:骞� */ private Integer houseYear; /** - * 物业类型 + * 鐗╀笟绫诲瀷 */ private String estateType; /** - * 评估总价 单位:元 + * 璇勪及鎬讳环 鍗曚綅锛氬厓 */ private Integer totalPrice; /** - * 评估单价 单位:元 + * 璇勪及鍗曚环 鍗曚綅锛氬厓 */ private Integer price; /** - * 近1年涨跌幅(%) + * 杩�1骞存定璺屽箙锛�%锛� */ private Double oneYearUpDownRange; /** - * 纬度 + * 绾害 */ private Double lat; /** - * 经度 + * 缁忓害 */ private Double lng; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/EvaluationModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/EvaluationModel.java index 71130e7bb..ea651ce6d 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/EvaluationModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/EvaluationModel.java @@ -4,225 +4,225 @@ import java.util.Date; public class EvaluationModel extends FangjiaApiModel { /** - * 城市 + * 鍩庡競 */ private String city; /** - * 区域 + * 鍖哄煙 */ private String region; /** - * 区域(新版本估价) + * 鍖哄煙(鏂扮増鏈及浠�) **/ private String district; /** - * 小区名 + * 灏忓尯鍚� */ private String districtName; /** - * 小区名(新版本) + * 灏忓尯鍚�(鏂扮増鏈�) */ private String name; /** - * 楼号 + * 妤煎彿 */ private String houseNumber; /** - * 室号 + * 瀹ゅ彿 */ private String roomNumber; /** - * 面积 + * 闈㈢Н */ private float area; private double size; /** - * 所在楼层 + * 鎵�鍦ㄦゼ灞� */ private int floor; /** - * 总楼层 + * 鎬绘ゼ灞� */ private int height; /** - * 室数 + * 瀹ゆ暟 */ private int room; /** - * 厅数 + * 鍘呮暟 */ private int hall; /** - * 卫数 + * 鍗暟 */ private int toilet; /** - * 估价时间 + * 浼颁环鏃堕棿 */ private Date weekend; private String propertyType; /** - * 建筑类型 + * 寤虹瓚绫诲瀷 */ private String buildType; /** - * 朝向 + * 鏈濆悜 */ private String direction; /** - * 装修情况 + * 瑁呬慨鎯呭喌 */ private String fitment; /** - * 装修价格 + * 瑁呬慨浠锋牸 */ private int fitmentCharge; /** - * 景观情况 + * 鏅鎯呭喌 */ private String sight; /** - * 噪音情况 + * 鍣煶鎯呭喌 */ private String noise; /** - * 花园面积 + * 鑺卞洯闈㈢Н */ private float gardenArea; /** - * 地下室面积 + * 鍦颁笅瀹ら潰绉� */ private float basementArea; /** - * 厌恶因素 + * 鍘屾伓鍥犵礌 */ private String[] worryFactor; /** - * 房龄 + * 鎴块緞 */ private int age; /** - * 自有车位 + * 鑷湁杞︿綅 */ private String carport; /** - * 小区配套 + * 灏忓尯閰嶅 */ private String[] facilities; /** - * 小区位置 + * 灏忓尯浣嶇疆 */ private String insidepos; /** - * 装修年限 + * 瑁呬慨骞撮檺 */ private int fitmentAge; /** - * 采光通风 + * 閲囧厜閫氶 */ private String lightingVentilation; /** - * 边套装置 + * 杈瑰瑁呯疆 */ private String sideset; /** - * 建筑质量 + * 寤虹瓚璐ㄩ噺 */ private String[] buildQuality; /** - * 厌恶设施 + * 鍘屾伓璁炬柦 */ private String worryFacility; /** - * 产权属性 + * 浜ф潈灞炴�� */ private String houseProperty; /** - * 其他因素 + * 鍏朵粬鍥犵礌 */ private String otherFactor; /** - * 门面开间 + * 闂ㄩ潰寮�闂� */ private String facade; /** - * 公共交通 + * 鍏叡浜ら�� */ private String traffice; /** - * 形状 + * 褰㈢姸 */ private String shape; /** - * 障碍物 + * 闅滅鐗� */ private String obstacle; /** - * 经营性质 + * 缁忚惀鎬ц川 */ private String industry; /** - * 配套设备 + * 閰嶅璁惧 */ private String supportDevice; /** - * 距离扶梯位置 + * 璺濈鎵舵浣嶇疆 */ private String leftPosition; /** - * 商铺类型 + * 鍟嗛摵绫诲瀷 */ private String shopType; /** - * 商铺唯一性 + * 鍟嗛摵鍞竴鎬� */ private String shopUnique; /** - * 商铺位置 + * 鍟嗛摵浣嶇疆 */ private String location; @@ -238,14 +238,14 @@ public class EvaluationModel extends FangjiaApiModel { private Double lat; private Double lng; - private int lngLatType; //0-高德 1-百度 + private int lngLatType; //0-楂樺痉 1-鐧惧害 private String periodType; private Integer periodCount; private int radius; private String estateType; private Date buildDate; - private String sid;//微信小程序中的sid - private String code;//微信小程序中的code + private String sid;//寰俊灏忕▼搴忎腑鐨剆id + private String code;//寰俊灏忕▼搴忎腑鐨刢ode private String id; private String startDate; private String endDate; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/FavoriteModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/FavoriteModel.java index 2ebe979be..3800a169b 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/FavoriteModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/FavoriteModel.java @@ -1,43 +1,43 @@ package com.fangjia.open.model; /** - * 用户收藏model + * 鐢ㄦ埛鏀惰棌model * * @author liupei */ public class FavoriteModel extends FangjiaApiModel { /** - * 用户唯一标识符 + * 鐢ㄦ埛鍞竴鏍囪瘑绗� */ private String uid; /** - * 手机唯一标识符 + * 鎵嬫満鍞竴鏍囪瘑绗� */ private String ime; /** - * 城市 + * 鍩庡競 */ private String city; /** - * 类别:sell=二手房,rent=租房,district=小区,evaluation=评估报告 + * 绫诲埆:sell=浜屾墜鎴�,rent=绉熸埧,district=灏忓尯,evaluation=璇勪及鎶ュ憡 */ private String category; /** - * 收藏的二手房,租房,评估报告id或收藏对象id + * 鏀惰棌鐨勪簩鎵嬫埧,绉熸埧,璇勪及鎶ュ憡id鎴栨敹钘忓璞d */ private String id; /** - * 收藏的小区所在区域 + * 鏀惰棌鐨勫皬鍖烘墍鍦ㄥ尯鍩� */ private String region; /** - * 收藏的小区名称 + * 鏀惰棌鐨勫皬鍖哄悕绉� */ private String districtName; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/FilesModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/FilesModel.java index 30908c9dd..76f72a881 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/FilesModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/FilesModel.java @@ -8,7 +8,7 @@ public class FilesModel extends FangjiaApiModel { private String contentType; private String filename; /** - * 文件类型 + * 鏂囦欢绫诲瀷 */ private String type; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/FinancialPictureModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/FinancialPictureModel.java index c70537af6..22bbfeabd 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/FinancialPictureModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/FinancialPictureModel.java @@ -5,13 +5,13 @@ import org.hibernate.validator.constraints.NotBlank; import javax.validation.constraints.Pattern; /** - * 金融画像Model + * 閲戣瀺鐢诲儚Model */ public class FinancialPictureModel extends FangjiaApiModel { @NotBlank - @Pattern(regexp = "^1[3|4|5|7|8][0-9]\\d{8}$", message = "手机号格式不对") + @Pattern(regexp = "^1[3|4|5|7|8][0-9]\\d{8}$", message = "鎵嬫満鍙锋牸寮忎笉瀵�") private String mobile; public String getMobile() { diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/FloorsModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/FloorsModel.java index 269f9113d..bad3307f8 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/FloorsModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/FloorsModel.java @@ -3,7 +3,7 @@ package com.fangjia.open.model; import org.hibernate.validator.constraints.NotBlank; /** - * 楼层查询Model + * 妤煎眰鏌ヨModel */ public class FloorsModel extends FangjiaApiModel { diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/GujiaToolModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/GujiaToolModel.java index a66629d5f..be6e390b1 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/GujiaToolModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/GujiaToolModel.java @@ -10,37 +10,37 @@ public class GujiaToolModel extends BaseModel { private static final long serialVersionUID = -8296872135217813030L; /** - * api用户appkey + * api鐢ㄦ埛appkey */ private String appKey; /** - * 区域名 + * 鍖哄煙鍚� */ private String regionName; /** - * 关键词 + * 鍏抽敭璇� */ private String keyword; /** - * 总价start + * 鎬讳环start */ private Integer totalPriceStart; /** - * 总价end + * 鎬讳环end */ private Integer totalPriceEnd; /** - * 户型 + * 鎴峰瀷 */ private Integer room; /** - * 电商数据 + * 鐢靛晢鏁版嵁 */ private JSONObject mallData; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/GuzhiApplyModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/GuzhiApplyModel.java index 28ef09ce5..55d70f60a 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/GuzhiApplyModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/GuzhiApplyModel.java @@ -10,39 +10,39 @@ import javax.validation.constraints.Min; public class GuzhiApplyModel extends FangjiaApiModel { - /**业务编号*/ + /**涓氬姟缂栧彿*/ private String caseId; - /**城市*/ + /**鍩庡競*/ @NotBlank @IsCity(groups = {FirstGroup.class}) private String city; - /**区域*/ + /**鍖哄煙*/ @NotBlank private String district; - /**小区名*/ + /**灏忓尯鍚�*/ @NotBlank private String name; - /**楼号*/ + /**妤煎彿*/ private String buildingNumber; - /**室号*/ + /**瀹ゅ彿*/ private String unitNumber; - /**面积*/ + /**闈㈢Н*/ private double size; - /**所在楼层*/ + /**鎵�鍦ㄦゼ灞�*/ @Min(-2) @Max(60) private Integer floor; - /** 总楼层*/ + /** 鎬绘ゼ灞�*/ @Min(1) @Max(60) private Integer maxFloor; - /**物业类型*/ + /**鐗╀笟绫诲瀷*/ @InList({"0", "1", "2"}) private String propertyType; - /**朝向*/ + /**鏈濆悜*/ @InList(value = {"1", "2", "3", "4"},groups = {FirstGroup.class}) private String direction; - /**装修情况*/ + /**瑁呬慨鎯呭喌*/ @InList({"1", "2", "3", "4", "5", "6", "7", "8", "9", "10"}) private String decoration; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/GuzhiCheckModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/GuzhiCheckModel.java index 5da513859..be73276d7 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/GuzhiCheckModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/GuzhiCheckModel.java @@ -9,9 +9,9 @@ public class GuzhiCheckModel extends FangjiaApiModel { @NotBlank @IsCity(groups = {FirstGroup.class}) private String city; - /**区域*/ + /**鍖哄煙*/ private String district; - /**小区名*/ + /**灏忓尯鍚�*/ private String name; @NotBlank private String address; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/GuzhiGetModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/GuzhiGetModel.java index 2cd6b2185..3e119475c 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/GuzhiGetModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/GuzhiGetModel.java @@ -4,7 +4,7 @@ import org.hibernate.validator.constraints.NotBlank; public class GuzhiGetModel extends FangjiaApiModel { - /**业务编号*/ + /**涓氬姟缂栧彿*/ @NotBlank private String caseId; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/HouseChangeInfoModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/HouseChangeInfoModel.java index d7403f15a..6a3243e17 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/HouseChangeInfoModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/HouseChangeInfoModel.java @@ -1,60 +1,60 @@ package com.fangjia.open.model; /** - * 以房换房查询条件 + * 浠ユ埧鎹㈡埧鏌ヨ鏉′欢 * @author Administrator * */ public class HouseChangeInfoModel extends FangjiaApiModel { /** - * 城市 + * 鍩庡競 */ private String city; /** - * 区域 + * 鍖哄煙 */ private String region; /** - * 小区名称 + * 灏忓尯鍚嶇О */ private String name; /** - * 面积段标签 + * 闈㈢Н娈垫爣绛� */ private int areaTags; /** - * 小区poi标签 + * 灏忓尯poi鏍囩 */ private String poiTags; /** - * 置换目的 + * 缃崲鐩殑 */ private int purpose; /** - * 意向均价 + * 鎰忓悜鍧囦环 */ private int avgPrice; /** - * 意向均价最小值 + * 鎰忓悜鍧囦环鏈�灏忓�� */ private int minAvgPrice; /** - * 意向均价最大值 + * 鎰忓悜鍧囦环鏈�澶у�� */ private int maxAvgPrice; /** - * 是否查找出推荐小区 + * 鏄惁鏌ユ壘鍑烘帹鑽愬皬鍖� */ private boolean isMatch; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/HouseClickLogModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/HouseClickLogModel.java index 7701dbb89..28d2e490f 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/HouseClickLogModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/HouseClickLogModel.java @@ -1,7 +1,7 @@ package com.fangjia.open.model; /** - * 房源点击日志model + * 鎴挎簮鐐瑰嚮鏃ュ織model * * @author liupei */ @@ -9,12 +9,12 @@ public class HouseClickLogModel extends ToolClickLogModel { private static final long serialVersionUID = -4563944132725968328L; /** - * 房源id + * 鎴挎簮id */ private String houseId; /** - * 房源类型 + * 鎴挎簮绫诲瀷 */ private String houseType; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/HouseInfomationModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/HouseInfomationModel.java index 22e0b8ec4..057ddcb57 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/HouseInfomationModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/HouseInfomationModel.java @@ -13,80 +13,80 @@ public class HouseInfomationModel extends FangjiaApiModel { private boolean useMap; /** - * 判断是不是有房估价 + * 鍒ゆ柇鏄笉鏄湁鎴夸及浠� */ private boolean isYouFang; /** - * 判断是不是友达 + * 鍒ゆ柇鏄笉鏄弸杈� */ private boolean isYouDa; /** - * 区域 + * 鍖哄煙 */ private String region; /** - * 区域(新版本估价) + * 鍖哄煙(鏂扮増鏈及浠�) **/ private String district; /** - * 小区名 + * 灏忓尯鍚� */ private String districtName; /** - * 小区名(新版本) + * 灏忓尯鍚�(鏂扮増鏈�) */ private String name; /** - * 楼号 + * 妤煎彿 */ private String unitNumber; /** - * 新楼号 + * 鏂版ゼ鍙� */ private String houseNumber; private String id; /** - * 室号 + * 瀹ゅ彿 */ private String roomNumber; /** - * 面积 + * 闈㈢Н */ private Double size; /** - * 所在楼层 + * 鎵�鍦ㄦゼ灞� */ private Integer floor; /** - * 总楼层 + * 鎬绘ゼ灞� */ private Integer height; /** - * 室数 + * 瀹ゆ暟 */ private Integer room; /** - * 厅数 + * 鍘呮暟 */ private int hall; /** - * 卫数 + * 鍗暟 */ private int toilet; /** - * 估价时间 + * 浼颁环鏃堕棿 */ private Date calDate; @@ -94,152 +94,152 @@ public class HouseInfomationModel extends FangjiaApiModel { /** - * 建筑类型 + * 寤虹瓚绫诲瀷 */ private String buildType; /** - * 朝向 + * 鏈濆悜 */ private String direction; /** - * 装修情况 + * 瑁呬慨鎯呭喌 */ private String fitment; /** - * 装修价格 + * 瑁呬慨浠锋牸 */ private int fitmentCharge; /** - * 景观情况 + * 鏅鎯呭喌 */ private String view; /** - * 噪音情况 + * 鍣煶鎯呭喌 */ private String noise; /** - * 花园面积 + * 鑺卞洯闈㈢Н */ private Double gardenArea; /** - * 地下室面积 + * 鍦颁笅瀹ら潰绉� */ private Double basementArea; /** - * 厌恶因素 + * 鍘屾伓鍥犵礌 */ private String[] worryFactor; /** - * 房龄 + * 鎴块緞 */ private int age; /** - * 自有车位 + * 鑷湁杞︿綅 */ private String carport; /** - * 小区配套 + * 灏忓尯閰嶅 */ private String facilities; /** - * 小区位置 + * 灏忓尯浣嶇疆 */ private String insidepos; /** - * 装修年限 + * 瑁呬慨骞撮檺 */ private int fitmentAge; /** - * 采光通风 + * 閲囧厜閫氶 */ private String lightingVentilation; /** - * 边套装置 + * 杈瑰瑁呯疆 */ private String sideset; /** - * 建筑质量 + * 寤虹瓚璐ㄩ噺 */ private String[] buildQuality; /** - * 厌恶设施 + * 鍘屾伓璁炬柦 */ private String worryFacility; /** - * 产权属性 + * 浜ф潈灞炴�� */ private String houseProperty; /** - * 其他因素 + * 鍏朵粬鍥犵礌 */ private String otherFactor; /** - * 门面开间 + * 闂ㄩ潰寮�闂� */ private String facade; /** - * 公共交通 + * 鍏叡浜ら�� */ private String traffice; /** - * 形状 + * 褰㈢姸 */ private String shape; /** - * 障碍物 + * 闅滅鐗� */ private String obstacle; /** - * 经营性质 + * 缁忚惀鎬ц川 */ private String industry; /** - * 配套设备 + * 閰嶅璁惧 */ private String supportDevice; /** - * 距离扶梯位置 + * 璺濈鎵舵浣嶇疆 */ private String leftPosition; /** - * 商铺类型 + * 鍟嗛摵绫诲瀷 */ private String shopType; /** - * 商铺唯一性 + * 鍟嗛摵鍞竴鎬� */ private String shopUnique; /** - * 商铺位置 + * 鍟嗛摵浣嶇疆 */ private String location; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/HouseModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/HouseModel.java index dd5c2f9d8..72ecc46ba 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/HouseModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/HouseModel.java @@ -3,42 +3,42 @@ package com.fangjia.open.model; public class HouseModel extends FangjiaApiModel{ private static final long serialVersionUID = -3545956537705010223L; - private String method; // API调用方法 + private String method; // API璋冪敤鏂规硶 - // 房源参数 start - private String city; // 城市 - private String region; // 区域 - private String block; // 板块 - private String contactPeople; // 用户名 - private String originalUrl; // 房源来源地址(根据此地址可对房源进行编辑和删除操作,此地址必须唯一) - private String mobile; // 联系人电话 - private String districtName; // 小区名称 - private double area; // 建筑面积 - private int room; // 室 - private int hall; // 厅 - private int toilet; // 卫 - private int totalPrice; // 售价 - private int floor; // 所在楼层 - private int height; // 总楼层 - private int age; // 房龄 - private String estateType; // 房屋类型 - private String fitment; // 装修情况 - private String direction; // 朝向 - private String title; // 房源标题 - private String description; // 房源描述 - private String creationDate; // 创建时间 - private String picture; // 房源图片 - private String picType; // 房源图片类型 - private String contactCompany; // 经纪公司 - private String shop; // 经济门店 - // 房源参数 end + // 鎴挎簮鍙傛暟 start + private String city; // 鍩庡競 + private String region; // 鍖哄煙 + private String block; // 鏉垮潡 + private String contactPeople; // 鐢ㄦ埛鍚� + private String originalUrl; // 鎴挎簮鏉ユ簮鍦板潃锛堟牴鎹鍦板潃鍙鎴挎簮杩涜缂栬緫鍜屽垹闄ゆ搷浣滐紝姝ゅ湴鍧�蹇呴』鍞竴锛� + private String mobile; // 鑱旂郴浜虹數璇� + private String districtName; // 灏忓尯鍚嶇О + private double area; // 寤虹瓚闈㈢Н + private int room; // 瀹� + private int hall; // 鍘� + private int toilet; // 鍗� + private int totalPrice; // 鍞环 + private int floor; // 鎵�鍦ㄦゼ灞� + private int height; // 鎬绘ゼ灞� + private int age; // 鎴块緞 + private String estateType; // 鎴垮眿绫诲瀷 + private String fitment; // 瑁呬慨鎯呭喌 + private String direction; // 鏈濆悜 + private String title; // 鎴挎簮鏍囬 + private String description; // 鎴挎簮鎻忚堪 + private String creationDate; // 鍒涘缓鏃堕棿 + private String picture; // 鎴挎簮鍥剧墖 + private String picType; // 鎴挎簮鍥剧墖绫诲瀷 + private String contactCompany; // 缁忕邯鍏徃 + private String shop; // 缁忔祹闂ㄥ簵 + // 鎴挎簮鍙傛暟 end - // 租房房源特有参数 - private String rentMode; // 付押方式 - private String rentType; // 出租类型 - private String expectedSex; // 期望性别 - private String rentPeriod; // 租赁期限 - // 租房房源特有参数 end + // 绉熸埧鎴挎簮鐗规湁鍙傛暟 + private String rentMode; // 浠樻娂鏂瑰紡 + private String rentType; // 鍑虹绫诲瀷 + private String expectedSex; // 鏈熸湜鎬у埆 + private String rentPeriod; // 绉熻祦鏈熼檺 + // 绉熸埧鎴挎簮鐗规湁鍙傛暟 end public String getMethod() { return method; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/HousePublishModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/HousePublishModel.java index c30e59d4f..185945444 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/HousePublishModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/HousePublishModel.java @@ -6,52 +6,52 @@ import org.springframework.web.multipart.MultipartFile; import javax.validation.constraints.*; /** - * 房源发布模型 + * 鎴挎簮鍙戝竷妯″瀷 * Created by wenyan on 2015/12/23. */ public class HousePublishModel extends FangjiaApiModel { private String id; @NotBlank - private String city; // 城市 + private String city; // 鍩庡競 @NotBlank - private String district; // 区域 - private String block; // 板块 + private String district; // 鍖哄煙 + private String block; // 鏉垮潡 private String address; @NotBlank - private String propertyName; // 小区名称 + private String propertyName; // 灏忓尯鍚嶇О @NotBlank - private String title; // 房源标题 + private String title; // 鎴挎簮鏍囬 - private String description; // 房源描述 + private String description; // 鎴挎簮鎻忚堪 - @Min(value = 1900 , message = "年代范围错误") - @Max(value = 2099 , message = "年代范围错误") + @Min(value = 1900 , message = "骞翠唬鑼冨洿閿欒") + @Max(value = 2099 , message = "骞翠唬鑼冨洿閿欒") private Integer buildDate; @NotBlank - private String contactPerson; // 用户名 + private String contactPerson; // 鐢ㄦ埛鍚� @NotBlank - private String mobile; // 联系人电话 - private Integer floor; // 所在楼层 - private Integer maxFloor; // 总楼层 - private String fitment; // 装修情况 - private String direction; // 朝向 + private String mobile; // 鑱旂郴浜虹數璇� + private Integer floor; // 鎵�鍦ㄦゼ灞� + private Integer maxFloor; // 鎬绘ゼ灞� + private String fitment; // 瑁呬慨鎯呭喌 + private String direction; // 鏈濆悜 @NotNull @Min(10) @Max(10000) - private Double totalPrice; // 售价 + private Double totalPrice; // 鍞环 @NotNull @Min(10) @Max(2000) @Digits(integer = 4,fraction = 2) - private double size; // 建筑面积 + private double size; // 寤虹瓚闈㈢Н @Max(5) @Min(0) - private int room; // 室 + private int room; // 瀹� @Min(0) - private int hall; // 厅 + private int hall; // 鍘� @Min(0) - private int toilet; // 卫 + private int toilet; // 鍗� private String buildingNum; private String roomNum; private MultipartFile[] image; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/HouseSearchModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/HouseSearchModel.java index ef1349ad0..368b450eb 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/HouseSearchModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/HouseSearchModel.java @@ -32,7 +32,7 @@ public class HouseSearchModel extends SearchModel { private Double price; - // 期数 + // 鏈熸暟 private Integer periodCount; @Override public QueryBean getQueryBean() { diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/HouseToolModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/HouseToolModel.java index 3e300c7b6..de1ef1031 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/HouseToolModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/HouseToolModel.java @@ -7,8 +7,8 @@ import com.fangjia.service.bo.RentHouseBo; public class HouseToolModel extends BaseModel { private static final long serialVersionUID = -8296872135217813030L; - private String regionName; // 区域 - private String keyword;// 关键字 + private String regionName; // 鍖哄煙 + private String keyword;// 鍏抽敭瀛� private String style = "1"; private String type; @@ -16,8 +16,8 @@ public class HouseToolModel extends BaseModel { private String widthStr; private String heightStr; private Integer height = 200; - private Integer picX = 3;// 列数 - private Integer picY = 2;// 行数 + private Integer picX = 3;// 鍒楁暟 + private Integer picY = 2;// 琛屾暟 private String padding; private String strCssStyle; private String appKey; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/LoanModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/LoanModel.java index 7883999cb..a436ae905 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/LoanModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/LoanModel.java @@ -10,9 +10,9 @@ public class LoanModel extends BaseModel { private Date end; private String mobile; - private Double amount;//贷款金额 - private String loanType;//贷款类型 - private String channelName;//渠道名称 + private Double amount;//璐锋閲戦 + private String loanType;//璐锋绫诲瀷 + private String channelName;//娓犻亾鍚嶇О public String getToken() { return token; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/MobileUserStatModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/MobileUserStatModel.java index c0e2f7968..83e164513 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/MobileUserStatModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/MobileUserStatModel.java @@ -1,23 +1,23 @@ package com.fangjia.open.model; /** - * 用户行为状态Model + * 鐢ㄦ埛琛屼负鐘舵�丮odel * * @author liupei */ public class MobileUserStatModel extends FangjiaApiModel { /** - * 用户唯一身份标识 + * 鐢ㄦ埛鍞竴韬唤鏍囪瘑 */ private String uid; /** - * 手机唯一码 + * 鎵嬫満鍞竴鐮� */ private String iem; /** - * 城市 + * 鍩庡競 */ private String city; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/OldHouseModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/OldHouseModel.java index 37d9ca6a8..5fcea45f3 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/OldHouseModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/OldHouseModel.java @@ -3,7 +3,7 @@ package com.fangjia.open.model; import org.apache.commons.lang.StringUtils; /** - * 旧版房源api接口model + * 鏃х増鎴挎簮api鎺ュ彛model * * @author liupei */ diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/PaphEvaluateModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/PaphEvaluateModel.java index 920c289b9..f17d3f3b6 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/PaphEvaluateModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/PaphEvaluateModel.java @@ -3,8 +3,8 @@ package com.fangjia.open.model; import org.hibernate.validator.constraints.NotBlank; /** - * 平安普惠估价模型 - * @author 王文艳 + * 骞冲畨鏅儬浼颁环妯″瀷 + * @author 鐜嬫枃鑹� * @create 2016-11-14 **/ public class PaphEvaluateModel extends FangjiaApiModel { diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/PropertyDetailModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/PropertyDetailModel.java index 5aadb257f..74831fce6 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/PropertyDetailModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/PropertyDetailModel.java @@ -3,7 +3,7 @@ package com.fangjia.open.model; import org.hibernate.validator.constraints.NotBlank; /** - * @author 王文艳 + * @author 鐜嬫枃鑹� * @create 2016-10-09 **/ public class PropertyDetailModel { diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/PropertyEvaluationModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/PropertyEvaluationModel.java index 4671f579d..a3dc46a43 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/PropertyEvaluationModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/PropertyEvaluationModel.java @@ -4,89 +4,89 @@ import java.util.Date; public class PropertyEvaluationModel extends FangjiaApiModel { /** - * 城市 + * 鍩庡競 */ private String city; /** - * 判断是不是有房估价 + * 鍒ゆ柇鏄笉鏄湁鎴夸及浠� */ private boolean isYouFang; /** - * 判断是不是友达 + * 鍒ゆ柇鏄笉鏄弸杈� */ private boolean isYouDa; /** - * 区域 + * 鍖哄煙 */ private String region; /** - * 区域(新版本估价) + * 鍖哄煙(鏂扮増鏈及浠�) **/ private String district; /** - * 小区名 + * 灏忓尯鍚� */ private String districtName; /** - * 小区名(新版本) + * 灏忓尯鍚�(鏂扮増鏈�) */ private String name; /** - * 地址 + * 鍦板潃 */ private String address; /** - * 楼号 + * 妤煎彿 */ private String unitNumber; /** - * 新楼号 + * 鏂版ゼ鍙� */ private String houseNumber; private String id; /** - * 室号 + * 瀹ゅ彿 */ private String roomNumber; /** - * 面积 + * 闈㈢Н */ private double size; /** - * 所在楼层 + * 鎵�鍦ㄦゼ灞� */ private Integer floor; /** - * 总楼层 + * 鎬绘ゼ灞� */ private Integer height; /** - * 室数 + * 瀹ゆ暟 */ private Integer room; /** - * 厅数 + * 鍘呮暟 */ private int hall; /** - * 卫数 + * 鍗暟 */ private int toilet; /** - * 估价时间 + * 浼颁环鏃堕棿 */ private Date calDate; @@ -94,152 +94,152 @@ public class PropertyEvaluationModel extends FangjiaApiModel { /** - * 建筑类型 + * 寤虹瓚绫诲瀷 */ private String buildType; /** - * 朝向 + * 鏈濆悜 */ private String direction; /** - * 装修情况 + * 瑁呬慨鎯呭喌 */ private String fitment; /** - * 装修价格 + * 瑁呬慨浠锋牸 */ private int fitmentCharge; /** - * 景观情况 + * 鏅鎯呭喌 */ private String view; /** - * 噪音情况 + * 鍣煶鎯呭喌 */ private String noise; /** - * 花园面积 + * 鑺卞洯闈㈢Н */ private Double gardenArea; /** - * 地下室面积 + * 鍦颁笅瀹ら潰绉� */ private Double basementArea; /** - * 厌恶因素 + * 鍘屾伓鍥犵礌 */ private String[] worryFactor; /** - * 房龄 + * 鎴块緞 */ private int age; /** - * 自有车位 + * 鑷湁杞︿綅 */ private String carport; /** - * 小区配套 + * 灏忓尯閰嶅 */ private String facilities; /** - * 小区位置 + * 灏忓尯浣嶇疆 */ private String insidepos; /** - * 装修年限 + * 瑁呬慨骞撮檺 */ private int fitmentAge; /** - * 采光通风 + * 閲囧厜閫氶 */ private String lightingVentilation; /** - * 边套装置 + * 杈瑰瑁呯疆 */ private String sideset; /** - * 建筑质量 + * 寤虹瓚璐ㄩ噺 */ private String[] buildQuality; /** - * 厌恶设施 + * 鍘屾伓璁炬柦 */ private String worryFacility; /** - * 产权属性 + * 浜ф潈灞炴�� */ private String houseProperty; /** - * 其他因素 + * 鍏朵粬鍥犵礌 */ private String otherFactor; /** - * 门面开间 + * 闂ㄩ潰寮�闂� */ private String facade; /** - * 公共交通 + * 鍏叡浜ら�� */ private String traffice; /** - * 形状 + * 褰㈢姸 */ private String shape; /** - * 障碍物 + * 闅滅鐗� */ private String obstacle; /** - * 经营性质 + * 缁忚惀鎬ц川 */ private String industry; /** - * 配套设备 + * 閰嶅璁惧 */ private String supportDevice; /** - * 距离扶梯位置 + * 璺濈鎵舵浣嶇疆 */ private String leftPosition; /** - * 商铺类型 + * 鍟嗛摵绫诲瀷 */ private String shopType; /** - * 商铺唯一性 + * 鍟嗛摵鍞竴鎬� */ private String shopUnique; /** - * 商铺位置 + * 鍟嗛摵浣嶇疆 */ private String location; @@ -304,17 +304,17 @@ public class PropertyEvaluationModel extends FangjiaApiModel { private Integer pageSize; /** - * 显示来源 + * 鏄剧ず鏉ユ簮 */ private Integer showSource; /** - * 显示房源 1:显示 0:默认 不显示 + * 鏄剧ず鎴挎簮 1:鏄剧ず 0锛氶粯璁� 涓嶆樉绀� */ private Integer show; private Integer newAvgPrice; - private Double ratio;//系数 + private Double ratio;//绯绘暟 public Integer getPageSize() { return pageSize; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/PropertySearchModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/PropertySearchModel.java index a4607d7ab..d1bcf376e 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/PropertySearchModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/PropertySearchModel.java @@ -27,20 +27,20 @@ public class PropertySearchModel { private int from; private String filter; private String useSeaweed; - // 是否使用or查询 + // 鏄惁浣跨敤or鏌ヨ private Boolean useOrQuery = false; - // 查询字段 + // 鏌ヨ瀛楁 private String queryField = "keyword"; private String source; - // 楼栋号 + // 妤兼爧鍙� private String houseNum; - // 室号 + // 瀹ゅ彿 private String roomNum; - // 类型 + // 绫诲瀷 private String cat; public Boolean getUseOrQuery() { diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/RentHouseModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/RentHouseModel.java index f01be5144..2887f59d9 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/RentHouseModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/RentHouseModel.java @@ -10,7 +10,7 @@ import javax.validation.constraints.Min; import javax.validation.constraints.NotNull; /** - * 租金房源发布MODEL + * 绉熼噾鎴挎簮鍙戝竷MODEL * Created by wenyan on 2015/12/24. */ public class RentHouseModel extends FangjiaApiModel{ @@ -18,18 +18,18 @@ public class RentHouseModel extends FangjiaApiModel{ private String id; @NotBlank - private String city; // 城市 + private String city; // 鍩庡競 @NotBlank - private String district; // 区域 - private String block; // 板块 + private String district; // 鍖哄煙 + private String block; // 鏉垮潡 private String address; @NotBlank - private String propertyName; // 小区名称 + private String propertyName; // 灏忓尯鍚嶇О @NotBlank - private String title; // 房源标题 + private String title; // 鎴挎簮鏍囬 - private String description; // 房源描述 + private String description; // 鎴挎簮鎻忚堪 private String facilities; @NotNull @@ -42,29 +42,29 @@ public class RentHouseModel extends FangjiaApiModel{ private Integer cook; @NotBlank - @InList(value = {"合租" , "整租"}) + @InList(value = {"鍚堢" , "鏁寸"}) private String leaseWay; @NotBlank - private String contactPerson; // 用户名 + private String contactPerson; // 鐢ㄦ埛鍚� @NotBlank - private String mobile; // 联系人电话 - private Integer floor; // 所在楼层 - private Integer maxFloor; // 总楼层 - private String fitment; // 装修情况 - private String direction; // 朝向 + private String mobile; // 鑱旂郴浜虹數璇� + private Integer floor; // 鎵�鍦ㄦゼ灞� + private Integer maxFloor; // 鎬绘ゼ灞� + private String fitment; // 瑁呬慨鎯呭喌 + private String direction; // 鏈濆悜 @NotNull @Min(10) @Max(2000) @Digits(integer = 4,fraction = 2) - private double size; // 建筑面积 + private double size; // 寤虹瓚闈㈢Н @Max(5) @Min(0) - private int room; // 室 + private int room; // 瀹� @Min(0) - private int hall; // 厅 + private int hall; // 鍘� @Min(0) - private int toilet; // 卫 + private int toilet; // 鍗� private String buildingNum; private String roomNum; private MultipartFile[] image; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/RentModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/RentModel.java index b2d48f791..a23db9336 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/RentModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/RentModel.java @@ -13,19 +13,19 @@ public class RentModel { String city; @NotBlank - private String district; // 区域 + private String district; // 鍖哄煙 @NotBlank - private String name; // 小区名 + private String name; // 灏忓尯鍚� @NotNull @Min(10) @Max(1000) - private float size;//面积 + private float size;//闈㈢Н @Min(0) @Max(2500) - private Integer radius;//半径 + private Integer radius;//鍗婂緞 private String endDate; @@ -33,11 +33,11 @@ public class RentModel { @Min(1) @Max(4) - private Integer type;//类型 + private Integer type;//绫诲瀷 @Min(1) @Max(6) - private Integer houseType;//房型 + private Integer houseType;//鎴垮瀷 public String getCity() { return city; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/ReportApplyModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/ReportApplyModel.java index 89cbcfbea..650bded60 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/ReportApplyModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/ReportApplyModel.java @@ -3,59 +3,59 @@ package com.fangjia.open.model; public class ReportApplyModel extends FangjiaApiModel { /** - * 委托机构 + * 濮旀墭鏈烘瀯 */ private String client; /** - * 标的物 + * 鏍囩殑鐗� */ private String subjectMatter; /** - * 标的物所在城市 + * 鏍囩殑鐗╂墍鍦ㄥ煄甯� */ private String city; /** - * 标的物地址 + * 鏍囩殑鐗╁湴鍧� */ private String address; /** - * 标的物区域 + * 鏍囩殑鐗╁尯鍩� */ private String district; /** - * 标的物小区名称 + * 鏍囩殑鐗╁皬鍖哄悕绉� */ private String name; /** - * 楼号 + * 妤煎彿 */ private String buildingNumber; /** - * 室号 + * 瀹ゅ彿 */ private String unitNumber; /** - * 面积,单位:平米 + * 闈㈢Н锛屽崟浣嶏細骞崇背 */ private Float size; /** - * 所在楼层 + * 鎵�鍦ㄦゼ灞� */ private Integer floor; /** - * 总楼层 + * 鎬绘ゼ灞� */ private Integer maxFloor; /** - * 物业类型 取值为: 0=普通住宅(默认) 1=别墅 2=商住 + * 鐗╀笟绫诲瀷 鍙栧�间负锛� 0=鏅�氫綇瀹�(榛樿) 1=鍒 2=鍟嗕綇 */ private String propertyType; /** - * 朝向,可选值有: 1=西南 2=东南 3=南(默认) 4=西北 5=东北 6=东 7=西 8=北 9=东西 10=南北 + * 鏈濆悜锛屽彲閫夊�兼湁锛� 1=瑗垮崡 2=涓滃崡 3=鍗�(榛樿) 4=瑗垮寳 5=涓滃寳 6=涓� 7=瑗� 8=鍖� 9=涓滆タ 10=鍗楀寳 */ private String direction; /** - * 装修情况,可选值有: 1=毛坯 2=简装(默认) 3=精装 4=豪装 + * 瑁呬慨鎯呭喌锛屽彲閫夊�兼湁锛� 1=姣涘澂 2=绠�瑁�(榛樿) 3=绮捐 4=璞 */ private String decoration; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/RestfulModelAndView.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/RestfulModelAndView.java index 373f654c2..64660e474 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/RestfulModelAndView.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/RestfulModelAndView.java @@ -3,7 +3,7 @@ package com.fangjia.open.model; import org.sothis.web.mvc.ModelAndViewSupport; /** - * 用于RestAPI的ModelAndView + * 鐢ㄤ簬RestAPI鐨凪odelAndView * * @author velna * diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/RetryCalcPriceModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/RetryCalcPriceModel.java index 7777edeb7..60e66b13e 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/RetryCalcPriceModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/RetryCalcPriceModel.java @@ -1,7 +1,7 @@ package com.fangjia.open.model; /** - * 重新计算均价参数 + * 閲嶆柊璁$畻鍧囦环鍙傛暟 * @author yinjihuan * */ @@ -10,22 +10,22 @@ public class RetryCalcPriceModel { private String _id; /** - * 城市 + * 鍩庡競 */ private String city; /** - * 区域 + * 鍖哄煙 */ private String region; /** - * 小区名称 + * 灏忓尯鍚嶇О */ private String name; /** - * 计算时间 + * 璁$畻鏃堕棿 */ private String weekend; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/SearchModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/SearchModel.java index 64fb38772..e92e09909 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/SearchModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/SearchModel.java @@ -25,14 +25,14 @@ public abstract class SearchModel extends FangjiaApiModel { protected Integer pageIndex; protected String rentType; protected String columns; - protected String begDate;// 过期房源查询日期区间段YYYYMMDD + protected String begDate;// 杩囨湡鎴挎簮鏌ヨ鏃ユ湡鍖洪棿娈礩YYYMMDD protected String endDate; - protected String url;// 房源的房价网url + protected String url;// 鎴挎簮鐨勬埧浠风綉url protected String sortField; protected String sortBy; protected Integer totalPrice; - protected Long lat;// 经纬度字段,以及最大最小经纬度字段 + protected Long lat;// 缁忕含搴﹀瓧娈碉紝浠ュ強鏈�澶ф渶灏忕粡绾害瀛楁 protected Long lng; protected Integer radius; protected Long latA; @@ -47,11 +47,11 @@ public abstract class SearchModel extends FangjiaApiModel { private String houseNo; private Double area; - protected Integer dataPeriod;//查询天数 + protected Integer dataPeriod;//鏌ヨ澶╂暟 private Integer distCount; /** - * 获取房源数量类型 sell:只取得二手房数量 rent:只取得出租房数量 其他:不获取数量 + * 鑾峰彇鎴挎簮鏁伴噺绫诲瀷 sell:鍙彇寰椾簩鎵嬫埧鏁伴噺 rent:鍙彇寰楀嚭绉熸埧鏁伴噺 鍏朵粬:涓嶈幏鍙栨暟閲� */ private String houseCountType; @@ -234,7 +234,7 @@ public abstract class SearchModel extends FangjiaApiModel { } public Integer getPageSize() { - // 默认20 + // 榛樿20 return (null != pageSize && 0 != pageSize) ? pageSize : 20; } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/SmsSendModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/SmsSendModel.java index d52ba2eb9..4d59dbb28 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/SmsSendModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/SmsSendModel.java @@ -13,12 +13,12 @@ public class SmsSendModel { @NotNull @NotBlank - @Pattern(regexp="(25[0-5]|2[0-4]\\d|[0-1]\\d{2}|[1-9]?\\d)\\.(25[0-5]|2[0-4]\\d|[0-1]\\d{2}|[1-9]?\\d)\\.(25[0-5]|2[0-4]\\d|[0-1]\\d{2}|[1-9]?\\d)\\.(25[0-5]|2[0-4]\\d|[0-1]\\d{2}|[1-9]?\\d)", message = "IP非法") + @Pattern(regexp="(25[0-5]|2[0-4]\\d|[0-1]\\d{2}|[1-9]?\\d)\\.(25[0-5]|2[0-4]\\d|[0-1]\\d{2}|[1-9]?\\d)\\.(25[0-5]|2[0-4]\\d|[0-1]\\d{2}|[1-9]?\\d)\\.(25[0-5]|2[0-4]\\d|[0-1]\\d{2}|[1-9]?\\d)", message = "IP闈炴硶") private String ip; @NotNull @NotBlank - @Pattern(regexp = "0?(13|14|15|17|18|19)[0-9]{9}", message = "手机号非法") + @Pattern(regexp = "0?(13|14|15|17|18|19)[0-9]{9}", message = "鎵嬫満鍙烽潪娉�") private String mobile; @NotNull diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/ToolClickLogModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/ToolClickLogModel.java index e6f3d8e48..41fe3f59b 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/ToolClickLogModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/ToolClickLogModel.java @@ -9,7 +9,7 @@ public abstract class ToolClickLogModel extends BaseModel { private String appKey; /** - * 请求url + * 璇锋眰url */ private String requestUrl; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/TransactionModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/TransactionModel.java index ad6bd58ad..0f220ec55 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/TransactionModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/TransactionModel.java @@ -5,7 +5,7 @@ import org.hibernate.validator.constraints.NotBlank; import java.util.Date; /** - * 交易接口Model + * 浜ゆ槗鎺ュ彛Model */ public class TransactionModel extends FangjiaApiModel{ @@ -25,47 +25,47 @@ public class TransactionModel extends FangjiaApiModel{ /** - * 楼号 + * 妤煎彿 */ private String unitNumber; /** - * 室号 + * 瀹ゅ彿 */ private String roomNumber; /** - * 面积 + * 闈㈢Н */ private Double size; /** - * 所在楼层 + * 鎵�鍦ㄦゼ灞� */ private int floor; /** - * 总楼层 + * 鎬绘ゼ灞� */ private int height; /** - * 室数 + * 瀹ゆ暟 */ private int room; /** - * 厅数 + * 鍘呮暟 */ private int hall; /** - * 卫数 + * 鍗暟 */ private int toilet; /** - * 估价时间 + * 浼颁环鏃堕棿 */ private Date calDate; @@ -73,122 +73,122 @@ public class TransactionModel extends FangjiaApiModel{ /** - * 建筑类型 + * 寤虹瓚绫诲瀷 */ private String buildType; /** - * 朝向 + * 鏈濆悜 */ private String direction; /** - * 装修情况 + * 瑁呬慨鎯呭喌 */ private String fitment; /** - * 装修价格 + * 瑁呬慨浠锋牸 */ private int fitmentCharge; /** - * 景观情况 + * 鏅鎯呭喌 */ private String view; /** - * 噪音情况 + * 鍣煶鎯呭喌 */ private String noise; /** - * 花园面积 + * 鑺卞洯闈㈢Н */ private float gardenArea; /** - * 地下室面积 + * 鍦颁笅瀹ら潰绉� */ private float basementArea; /** - * 厌恶因素 + * 鍘屾伓鍥犵礌 */ private String[] worryFactor; /** - * 房龄 + * 鎴块緞 */ private int age; /** - * 自有车位 + * 鑷湁杞︿綅 */ private String carport; /** - * 小区配套 + * 灏忓尯閰嶅 */ private String facilities; /** - * 小区位置 + * 灏忓尯浣嶇疆 */ private String insidepos; /** - * 装修年限 + * 瑁呬慨骞撮檺 */ private int fitmentAge; /** - * 采光通风 + * 閲囧厜閫氶 */ private String lightingVentilation; /** - * 边套装置 + * 杈瑰瑁呯疆 */ private String sideset; /** - * 建筑质量 + * 寤虹瓚璐ㄩ噺 */ private String[] buildQuality; /** - * 厌恶设施 + * 鍘屾伓璁炬柦 */ private String worryFacility; /** - * 产权属性 + * 浜ф潈灞炴�� */ private String houseProperty; /** - * 其他因素 + * 鍏朵粬鍥犵礌 */ private String otherFactor; /** - * 门面开间 + * 闂ㄩ潰寮�闂� */ private String facade; /** - * 公共交通 + * 鍏叡浜ら�� */ private String traffice; /** - * 形状 + * 褰㈢姸 */ private String shape; /** - * 障碍物 + * 闅滅鐗� */ private String obstacle; private String industry; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/TrendApiModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/TrendApiModel.java index b7153161c..aa9540d04 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/TrendApiModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/TrendApiModel.java @@ -5,22 +5,22 @@ import org.json.JSONObject; public class TrendApiModel extends BaseModel { private static final long serialVersionUID = -2378342266000248591L; /** - * 回调函数 + * 鍥炶皟鍑芥暟 */ private String callBack; /** - * 区域 + * 鍖哄煙 */ private String region; /** - * 小区 + * 灏忓尯 */ private String districtName; /** - * 均价 + * 鍧囦环 */ private JSONObject stat; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/TrendModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/TrendModel.java index 1a3c16441..615329d54 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/TrendModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/TrendModel.java @@ -3,44 +3,44 @@ package com.fangjia.open.model; import com.fangjia.service.chart.OfcChartUtils; /** - * 走势图model + * 璧板娍鍥緈odel * * @author liupei */ public class TrendModel extends FangjiaApiModel { /** - * 小区所在城市 + * 灏忓尯鎵�鍦ㄥ煄甯� */ private String city; /** - * 小区所在区域 + * 灏忓尯鎵�鍦ㄥ尯鍩� */ private String region; /** - * 小区名 + * 灏忓尯鍚� */ private String name; /** - * 图片高度 + * 鍥剧墖楂樺害 */ private int height; /** - * 图片宽度 + * 鍥剧墖瀹藉害 */ private int width; /** - * 小区所在板块 + * 灏忓尯鎵�鍦ㄦ澘鍧� */ private String block; /** - * 周数 + * 鍛ㄦ暟 */ private int weekCount = OfcChartUtils.SEASON_COUNT; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/UesrComplaintModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/UesrComplaintModel.java index 71621fc14..5c7a33e11 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/UesrComplaintModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/UesrComplaintModel.java @@ -2,54 +2,54 @@ package com.fangjia.open.model; /** * - * 用户举报信息Model + * 鐢ㄦ埛涓炬姤淇℃伅Model * * @author _tyler */ public class UesrComplaintModel extends FangjiaApiModel { /** - * 用户唯一标示符 + * 鐢ㄦ埛鍞竴鏍囩ず绗� */ private String uid; /** - * 手机唯一标示符 + * 鎵嬫満鍞竴鏍囩ず绗� */ private String ime; /** - * 类别(二手房 租房 小区) + * 绫诲埆(浜屾墜鎴� 绉熸埧 灏忓尯) */ private String category; /** - * 类型(房源问题 其他 小区问题等) + * 绫诲瀷(鎴挎簮闂 鍏朵粬 灏忓尯闂绛�) */ private String type; /** - * 内容 + * 鍐呭 */ private String content; /** - * 用户手机号码 + * 鐢ㄦ埛鎵嬫満鍙风爜 */ private String mobile; /** - * 相关ID(二手房或者租房) + * 鐩稿叧ID(浜屾墜鎴挎垨鑰呯鎴�) */ private String relateId; /** - * 区域 + * 鍖哄煙 */ private String region; /** - * 小区名 + * 灏忓尯鍚� */ private String districtName; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/UserCallRecordModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/UserCallRecordModel.java index b690ba8f0..194a1bc92 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/UserCallRecordModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/UserCallRecordModel.java @@ -4,27 +4,27 @@ import org.apache.commons.lang.StringUtils; public class UserCallRecordModel extends FangjiaApiModel { /** - * 手机类型 + * 鎵嬫満绫诲瀷 */ private String phoneType; /** - * 用户id + * 鐢ㄦ埛id */ private String uid; /** - * 手机唯一码 + * 鎵嬫満鍞竴鐮� */ private String ime; /** - * 主叫电话 + * 涓诲彨鐢佃瘽 */ private String caller; /** - * 关联id + * 鍏宠仈id */ private String relateId; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/UserFeedbackModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/UserFeedbackModel.java index 9c6cd7170..bd2d11039 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/UserFeedbackModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/UserFeedbackModel.java @@ -1,34 +1,34 @@ package com.fangjia.open.model; /** - * 用户反馈信息Model + * 鐢ㄦ埛鍙嶉淇℃伅Model * * @author _tyler */ public class UserFeedbackModel extends FangjiaApiModel { /** - * 用户唯一标示符 + * 鐢ㄦ埛鍞竴鏍囩ず绗� */ private String uid; /** - * 手机唯一标示符 + * 鎵嬫満鍞竴鏍囩ず绗� */ private String ime; /** - * 用户反馈信息内容 + * 鐢ㄦ埛鍙嶉淇℃伅鍐呭 */ private String content; /** - * 手机号码 + * 鎵嬫満鍙风爜 */ private String mobile; /** - * 用户邮箱地址 + * 鐢ㄦ埛閭鍦板潃 */ private String email; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/UserGeolocationModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/UserGeolocationModel.java index e15143c6f..d0f4da806 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/UserGeolocationModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/UserGeolocationModel.java @@ -3,33 +3,33 @@ package com.fangjia.open.model; import org.apache.commons.lang.StringUtils; /** - * 用户地理位置Model + * 鐢ㄦ埛鍦扮悊浣嶇疆Model * * @author liupei */ public class UserGeolocationModel extends FangjiaApiModel { /** - * 用户唯一身份标识 + * 鐢ㄦ埛鍞竴韬唤鏍囪瘑 */ private String uid; /** - * 手机唯一码 + * 鎵嬫満鍞竴鐮� */ private String ime; /** - * 城市 + * 鍩庡競 */ private String city; /** - * 纬度 + * 绾害 */ private double lat; /** - * 经度 + * 缁忓害 */ private double lng; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/UserHistoryModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/UserHistoryModel.java index fdf1e35f6..b183430a8 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/UserHistoryModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/UserHistoryModel.java @@ -1,39 +1,39 @@ package com.fangjia.open.model; /** - * 用户浏览信息Model + * 鐢ㄦ埛娴忚淇℃伅Model * * @author _tyler */ public class UserHistoryModel extends FangjiaApiModel { /** - * 用户唯一标示符 + * 鐢ㄦ埛鍞竴鏍囩ず绗� */ private String uid; /** - * 手机唯一标示符 + * 鎵嬫満鍞竴鏍囩ず绗� */ private String ime; /** - * 用户浏览信息分类(二手房|租房|小区) + * 鐢ㄦ埛娴忚淇℃伅鍒嗙被锛堜簩鎵嬫埧|绉熸埧|灏忓尯锛� */ private String category; /** - * 相关ID + * 鐩稿叧ID */ private String relateId; /** - * 相关小区区域 + * 鐩稿叧灏忓尯鍖哄煙 */ private String region; /** - * 相关小区 小区名 + * 鐩稿叧灏忓尯 灏忓尯鍚� */ private String districtName; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/WebankEvaluateModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/WebankEvaluateModel.java index 370f15901..8a7b0a1e0 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/WebankEvaluateModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/WebankEvaluateModel.java @@ -13,16 +13,16 @@ public class WebankEvaluateModel extends FangjiaApiModel { @IsCity private String city; /** - * 地址所在区域 + * 鍦板潃鎵�鍦ㄥ尯鍩� */ private String district; /** - * 产证地址 + * 浜ц瘉鍦板潃 */ @NotBlank private String address; /** - * 房产面积 + * 鎴夸骇闈㈢Н */ @Min(value = 1) @Max(value = 500) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/WeixinModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/WeixinModel.java index e5972b9a4..1e58fdfa0 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/WeixinModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/WeixinModel.java @@ -5,10 +5,10 @@ import java.io.File; public class WeixinModel extends BaseModel { private static final long serialVersionUID = -4359949623275094082L; - private String signature; // 微信加密签名 - private String timestamp; // 时间戳 - private String nonce; // 随机数 - private String echostr; // 随机字符串 + private String signature; // 寰俊鍔犲瘑绛惧悕 + private String timestamp; // 鏃堕棿鎴� + private String nonce; // 闅忔満鏁� + private String echostr; // 闅忔満瀛楃涓� private File receivedMsgFile; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/WeixinTaskModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/WeixinTaskModel.java index a66cf6d27..3fddfc9ea 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/WeixinTaskModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/WeixinTaskModel.java @@ -24,9 +24,9 @@ public class WeixinTaskModel extends BaseModel{ private int writeStatus; public enum writeStatusEnum { - UNWRITE(0),//未填写 - WRITE(1), // 已填写 - FINISH(2);// 处理完成 + UNWRITE(0),//鏈~鍐� + WRITE(1), // 宸插~鍐� + FINISH(2);// 澶勭悊瀹屾垚 private final int value; @@ -50,60 +50,60 @@ public class WeixinTaskModel extends BaseModel{ private String status; /** - * 物业类型 + * 鐗╀笟绫诲瀷 */ private String estate_type2; /** - * 城市信息 + * 鍩庡競淇℃伅 */ private List serverAreaList; /** - * 热门城市信息 + * 鐑棬鍩庡競淇℃伅 */ private List hotServerAreaList; /** - * 查询输入框传递过来的值 + * 鏌ヨ杈撳叆妗嗕紶閫掕繃鏉ョ殑鍊� */ private String searchCity; /** - * 用户的唯一凭证 + * 鐢ㄦ埛鐨勫敮涓�鍑瘉 */ private String openId; /** - * 选择完城市之后需要重定向去的页面 + * 閫夋嫨瀹屽煄甯備箣鍚庨渶瑕侀噸瀹氬悜鍘荤殑椤甸潰 */ private String refectTo; /** - * 所在城市 + * 鎵�鍦ㄥ煄甯� */ private String localCity; private WeixinTaskUser weixinTaskUser; /** - * 联系人手机号 + * 鑱旂郴浜烘墜鏈哄彿 */ private String phone; /** - * 用户名 + * 鐢ㄦ埛鍚� */ private String userName; /** - * 任务类型的枚举 + * 浠诲姟绫诲瀷鐨勬灇涓� * @author shibb * */ public enum refectToEnum{ - REGISTER("申请"), - SEARCHTASK("查询"); + REGISTER("鐢宠"), + SEARCHTASK("鏌ヨ"); private final String value; @@ -117,37 +117,37 @@ public class WeixinTaskModel extends BaseModel{ } /** - * 截止日期剩余天数 + * 鎴鏃ユ湡鍓╀綑澶╂暟 */ private int leaveDays; /** - * 用户填写的区域 + * 鐢ㄦ埛濉啓鐨勫尯鍩� */ private String region; /** - * 用户填写的备注 + * 鐢ㄦ埛濉啓鐨勫娉� */ private String remark; /** - * 所属中介公司 + * 鎵�灞炰腑浠嬪叕鍙� */ private String belongAgentCompany; /** - * 回答的状态 + * 鍥炵瓟鐨勭姸鎬� */ private int resultStatus; /** - * 任务数目 + * 浠诲姟鏁扮洰 */ private int taskListSize; /** - * 用户回答的id + * 鐢ㄦ埛鍥炵瓟鐨刬d */ private String taskResultId; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/WithHoldInfoModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/WithHoldInfoModel.java index 8196f73b7..87e1ebddf 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/WithHoldInfoModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/WithHoldInfoModel.java @@ -2,7 +2,7 @@ package com.fangjia.open.model; public class WithHoldInfoModel extends FangjiaApiModel { /** - * 回调返回加密密文 + * 鍥炶皟杩斿洖鍔犲瘑瀵嗘枃 */ private String response; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/weixin/DistrictModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/weixin/DistrictModel.java index b3c210301..73ae647b1 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/weixin/DistrictModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/weixin/DistrictModel.java @@ -15,7 +15,7 @@ public class DistrictModel extends BaseModel { private static final long serialVersionUID = 5774898391731351568L; private String id; - /**保存错误信息*/ + /**淇濆瓨閿欒淇℃伅*/ private String msg; private String name; private String region; @@ -36,33 +36,33 @@ public class DistrictModel extends BaseModel { private Integer limit; - //查询日期 + //鏌ヨ鏃ユ湡 private Date date; - //查询日期 + //鏌ヨ鏃ユ湡 private String evalDate; - //判断是否需要查询经纬度 + //鍒ゆ柇鏄惁闇�瑕佹煡璇㈢粡绾害 private Boolean showLat = false; - // 判断是否需要查询均价,false则调用方自己去组装价格 + // 鍒ゆ柇鏄惁闇�瑕佹煡璇㈠潎浠凤紝false鍒欒皟鐢ㄦ柟鑷繁鍘荤粍瑁呬环鏍� private Boolean showPrice = true; -// private String preCode;//渤海接口--楼盘编码 -// private String preName;//渤海接口--楼盘名称 -// private String countryCode;//渤海接口--区域编码 -// private String buildName;//渤海接口--地址 +// private String preCode;//娓ゆ捣鎺ュ彛--妤肩洏缂栫爜 +// private String preName;//娓ゆ捣鎺ュ彛--妤肩洏鍚嶇О +// private String countryCode;//娓ゆ捣鎺ュ彛--鍖哄煙缂栫爜 +// private String buildName;//娓ゆ捣鎺ュ彛--鍦板潃 /** - * 判断是不是友达 + * 鍒ゆ柇鏄笉鏄弸杈� */ private boolean isYouDa; - //用于删除和新增 - // 图片url + //鐢ㄤ簬鍒犻櫎鍜屾柊澧� + // 鍥剧墖url private String url; - //房型图 或 外景图 + //鎴垮瀷鍥� 鎴� 澶栨櫙鍥� private String PicType; - //几室 + //鍑犲 private String roomType; private List imageUrls; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/weixin/DistrictRentTrendModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/weixin/DistrictRentTrendModel.java index 93aaba966..1d1bfab2f 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/weixin/DistrictRentTrendModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/weixin/DistrictRentTrendModel.java @@ -48,7 +48,7 @@ public class DistrictRentTrendModel extends BaseModel implements TrendViewModel private List upTop5; private List downTop5; private int width; - private int showBlock; // 小区走势图里显示板块线,不为0时显示 + private int showBlock; // 灏忓尯璧板娍鍥鹃噷鏄剧ず鏉垮潡绾匡紝涓嶄负0鏃舵樉绀� public String getKeyword() { return keyword; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/weixin/DistrictTrendModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/weixin/DistrictTrendModel.java index 0d21e86e5..b7f2860be 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/weixin/DistrictTrendModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/weixin/DistrictTrendModel.java @@ -48,7 +48,7 @@ public class DistrictTrendModel extends BaseModel implements TrendViewModel { private List upTop5; private List downTop5; private int width; - private int showBlock; // 小区走势图里显示板块线,不为0时显示 + private int showBlock; // 灏忓尯璧板娍鍥鹃噷鏄剧ず鏉垮潡绾匡紝涓嶄负0鏃舵樉绀� public String getKeyword() { return keyword; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/weixin/EvaluationModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/weixin/EvaluationModel.java index 44cc2ca36..e83a665bf 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/weixin/EvaluationModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/weixin/EvaluationModel.java @@ -46,10 +46,10 @@ public class EvaluationModel extends BaseModel{ private Double hopePrice; private String remark; private Integer loan; -// private String preCode;//渤海接口--楼盘编码 -// private String preName;//渤海接口--楼盘名称 -// private String countryCode;//渤海接口--区域编码 -// private String buildName;//渤海接口--地址 +// private String preCode;//娓ゆ捣鎺ュ彛--妤肩洏缂栫爜 +// private String preName;//娓ゆ捣鎺ュ彛--妤肩洏鍚嶇О +// private String countryCode;//娓ゆ捣鎺ュ彛--鍖哄煙缂栫爜 +// private String buildName;//娓ゆ捣鎺ュ彛--鍦板潃 private List reportFiles; private String queryId; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/weixin/Message.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/weixin/Message.java index dd123cc38..f32802459 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/weixin/Message.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/weixin/Message.java @@ -2,7 +2,7 @@ package com.fangjia.open.model.weixin; public class Message { /** - * 短信验证码的使用类型(登录,注册,绑定号码) + * 鐭俊楠岃瘉鐮佺殑浣跨敤绫诲瀷锛堢櫥褰曪紝娉ㄥ唽锛岀粦瀹氬彿鐮侊級 */ public static final String SMS_CODE_TYPE_LOGIN = "login"; public static final String SMS_CODE_TYPE_REG = "register"; @@ -15,37 +15,37 @@ public class Message { public static final String RESULT_SUCCESS = "success"; - public static final String PARAM_NOT_NULL = "请将信息输入完整"; + public static final String PARAM_NOT_NULL = "璇峰皢淇℃伅杈撳叆瀹屾暣"; - public static final String SMS_CODE_SEND_FAIL = "短信验证码发送失败"; + public static final String SMS_CODE_SEND_FAIL = "鐭俊楠岃瘉鐮佸彂閫佸け璐�"; - public static final String SMS_CODE_SEND_FAIL_TIME = "操作太频繁"; + public static final String SMS_CODE_SEND_FAIL_TIME = "鎿嶄綔澶绻�"; - public static final String MIBILE_FORMAT = "手机号码不正确"; + public static final String MIBILE_FORMAT = "鎵嬫満鍙风爜涓嶆纭�"; - public static final String PASS_REPEAT = "2次密码输入不一致"; + public static final String PASS_REPEAT = "2娆″瘑鐮佽緭鍏ヤ笉涓�鑷�"; - public static final String MOBILE_NOT_SEND_CODE = "此号码没发过验证码"; + public static final String MOBILE_NOT_SEND_CODE = "姝ゅ彿鐮佹病鍙戣繃楠岃瘉鐮�"; - public static final String CODE_ERROR = "输入的验证码不正确,请重新输入"; + public static final String CODE_ERROR = "杈撳叆鐨勯獙璇佺爜涓嶆纭紝璇烽噸鏂拌緭鍏�"; - public static final String ACCOUNT_EXISTS = "该账户已存在"; + public static final String ACCOUNT_EXISTS = "璇ヨ处鎴峰凡瀛樺湪"; - public static final String ACCOUNT_NOT_EXISTS = "该账户不存在,请先注册"; + public static final String ACCOUNT_NOT_EXISTS = "璇ヨ处鎴蜂笉瀛樺湪锛岃鍏堟敞鍐�"; - public static final String ACCOUNT_SAVE_FAIL = "用户信息保存失败"; + public static final String ACCOUNT_SAVE_FAIL = "鐢ㄦ埛淇℃伅淇濆瓨澶辫触"; - public static final String LOGIN_FAIL = "账号或者密码错误"; + public static final String LOGIN_FAIL = "璐﹀彿鎴栬�呭瘑鐮侀敊璇�"; - public static final String NOT_BIND_MOBILE = "没有绑定手机"; + public static final String NOT_BIND_MOBILE = "娌℃湁缁戝畾鎵嬫満"; - public static final String IMG_CODE_ERROR = "输入的图形验证码不正确,请重新输入"; + public static final String IMG_CODE_ERROR = "杈撳叆鐨勫浘褰㈤獙璇佺爜涓嶆纭紝璇烽噸鏂拌緭鍏�"; - public static final String NOT_SET_PAY_PASSWORD = "未设置支付密码"; + public static final String NOT_SET_PAY_PASSWORD = "鏈缃敮浠樺瘑鐮�"; - public static final String PAY_PASSWORD_ERROR = "支付密码错误,请重新输入"; + public static final String PAY_PASSWORD_ERROR = "鏀粯瀵嗙爜閿欒锛岃閲嶆柊杈撳叆"; - public static final String NOT_LOGIN = "请先进行登录"; + public static final String NOT_LOGIN = "璇峰厛杩涜鐧诲綍"; - public static final String LOGIN_UPPSW = "原始密码输入错误"; + public static final String LOGIN_UPPSW = "鍘熷瀵嗙爜杈撳叆閿欒"; } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/weixin/PropertyEvaluationModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/weixin/PropertyEvaluationModel.java index 18068d19c..350bb5866 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/weixin/PropertyEvaluationModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/weixin/PropertyEvaluationModel.java @@ -5,7 +5,7 @@ import com.fangjia.open.model.BaseModel; import java.util.Map; /** - * 建行租房估值 + * 寤鸿绉熸埧浼板�� * * @author shenjian * @since 2021/4/7 @@ -13,61 +13,61 @@ import java.util.Map; public class PropertyEvaluationModel extends BaseModel { /** - * 城市 + * 鍩庡競 */ private String cityName; /** - * 区域(新版本估价) + * 鍖哄煙(鏂扮増鏈及浠�) **/ private String district; /** - * 小区名(新版本) + * 灏忓尯鍚�(鏂扮増鏈�) */ private String name; /** - * 地址 + * 鍦板潃 */ private String address; /** - * 面积 + * 闈㈢Н */ private double size; /** - * 所在楼层 + * 鎵�鍦ㄦゼ灞� */ private Integer floor; /** - * 总楼层 + * 鎬绘ゼ灞� */ private Integer height; /** - * 室数 + * 瀹ゆ暟 */ private Integer room; /** - * 厅数 + * 鍘呮暟 */ private Integer hall; /** - * 卫数 + * 鍗暟 */ private Integer toilet; /** - * 朝向 + * 鏈濆悜 */ private String direction; /** - * 装修情况 + * 瑁呬慨鎯呭喌 */ private String fitment; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/weixin/SendCodeJsonModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/weixin/SendCodeJsonModel.java index b9927816a..4d0e8b524 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/weixin/SendCodeJsonModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/weixin/SendCodeJsonModel.java @@ -3,9 +3,9 @@ package com.fangjia.open.model.weixin; import org.sothis.web.mvc.ModelAndViewSupport; /** - * 发送验证码返回JSON数据 + * 鍙戦�侀獙璇佺爜杩斿洖JSON鏁版嵁 * @author yinjihuan - * @date 2016年5月10日 + * @date 2016骞�5鏈�10鏃� * */ public class SendCodeJsonModel extends ModelAndViewSupport { @@ -18,7 +18,7 @@ public class SendCodeJsonModel extends ModelAndViewSupport { } /** - * 发送结果(success:成功 fail:失败) + * 鍙戦�佺粨鏋滐紙success:鎴愬姛 fail:澶辫触锛� */ private String result; private String msg; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/weixin/SendCodeModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/weixin/SendCodeModel.java index 0aef629d3..cd017f90e 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/weixin/SendCodeModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/weixin/SendCodeModel.java @@ -4,20 +4,20 @@ import com.fangjia.open.model.BaseModel; /** - * 发送验证码 + * 鍙戦�侀獙璇佺爜 * @author yinjihuan - * @date 2016年5月10日 + * @date 2016骞�5鏈�10鏃� * */ public class SendCodeModel extends BaseModel { private static final long serialVersionUID = 4443755009679445709L; /** - * 类型(login:登录 register:注册 bindmobile:绑定手机,leaveMessage:联系我们留言) + * 绫诲瀷锛坙ogin:鐧诲綍 register:娉ㄥ唽 bindmobile:缁戝畾鎵嬫満,leaveMessage:鑱旂郴鎴戜滑鐣欒█锛� */ private String type; /** - * 手机号 + * 鎵嬫満鍙� */ private String mobile; private String codeToken; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/weixin/UserModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/weixin/UserModel.java index 88d8fb971..47d79da00 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/weixin/UserModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/weixin/UserModel.java @@ -19,12 +19,12 @@ public class UserModel extends BaseModel { private String code; private List citys; - private String appId;//测试 - private String appSecret;//测试 - private String sid;//测试 + private String appId;//娴嬭瘯 + private String appSecret;//娴嬭瘯 + private String sid;//娴嬭瘯 /** - * 登录来源:AI估价小程序 + * 鐧诲綍鏉ユ簮锛欰I浼颁环灏忕▼搴� */ private String source; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/servlet/SafeCode.java b/projects/fangjia-open/src/main/java/com/fangjia/open/servlet/SafeCode.java index 2be03853f..b80d116d9 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/servlet/SafeCode.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/servlet/SafeCode.java @@ -21,7 +21,7 @@ import com.fangjia.service.util.CookieUtils; public class SafeCode extends HttpServlet { private static final long serialVersionUID = 8729414662081043987L; - //产生随即的字体 + //浜х敓闅忓嵆鐨勫瓧浣� private Font getFont() { Random random = new Random(); Font font[] = new Font[5]; @@ -35,49 +35,49 @@ public class SafeCode extends HttpServlet { protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { - // 设置响应头 Content-type类型 + // 璁剧疆鍝嶅簲澶� Content-type绫诲瀷 resp.setContentType("image/jpeg"); - // 以下三句是用于设置页面不缓存 + // 浠ヤ笅涓夊彞鏄敤浜庤缃〉闈笉缂撳瓨 resp.setHeader("Pragma", "No-cache"); resp.setHeader("Cache-Control", "No-cache"); resp.setDateHeader("Expires", 0); OutputStream os = resp.getOutputStream(); int width = 72, height = 30; - // 建立指定宽、高和BufferedImage对象 + // 寤虹珛鎸囧畾瀹姐�侀珮鍜孊ufferedImage瀵硅薄 BufferedImage image = new BufferedImage(width, height,BufferedImage.TYPE_INT_RGB); - Graphics g = image.getGraphics(); // 该画笔画在image上 - Color c = g.getColor(); // 保存当前画笔的颜色,用完画笔后要回复现场 + Graphics g = image.getGraphics(); // 璇ョ敾绗旂敾鍦╥mage涓� + Color c = g.getColor(); // 淇濆瓨褰撳墠鐢荤瑪鐨勯鑹诧紝鐢ㄥ畬鐢荤瑪鍚庤鍥炲鐜板満 g.fillRect(0, 0, width, height); - char[] ch = "abcdefghjkmnpqrstuvwxyz23456789".toCharArray(); // 随即产生的字符串 不包括 i l(小写L) o(小写O) 1(数字1)0(数字0) - int length = ch.length; // 随即字符串的长度 - StringBuilder sRand = new StringBuilder(); // 保存随即产生的字符串 + char[] ch = "abcdefghjkmnpqrstuvwxyz23456789".toCharArray(); // 闅忓嵆浜х敓鐨勫瓧绗︿覆 涓嶅寘鎷� i l(灏忓啓L) o锛堝皬鍐橭锛� 1锛堟暟瀛�1锛�0(鏁板瓧0) + int length = ch.length; // 闅忓嵆瀛楃涓茬殑闀垮害 + StringBuilder sRand = new StringBuilder(); // 淇濆瓨闅忓嵆浜х敓鐨勫瓧绗︿覆 Random random = new Random(); for (int i = 0; i < 4; i++) { - // 设置字体 + // 璁剧疆瀛椾綋 g.setFont(getFont()); - // 随即生成0-9的数字 + // 闅忓嵆鐢熸垚0-9鐨勬暟瀛� String rand = new Character(ch[random.nextInt(length)]).toString(); sRand.append(rand); - // 设置随机颜色 + // 璁剧疆闅忔満棰滆壊 g.setColor(new Color(random.nextInt(255), random.nextInt(255), random.nextInt(255))); g.drawString(rand, 18 * i , 22); } - //产生随即干扰点 + //浜х敓闅忓嵆骞叉壈鐐� for (int i = 0; i < 20; i++) { int x1 = random.nextInt(width); int y1 = random.nextInt(height); g.drawOval(x1, y1, 2, 2); } - g.setColor(c); // 将画笔的颜色再设置回去 + g.setColor(c); // 灏嗙敾绗旂殑棰滆壊鍐嶈缃洖鍘� g.dispose(); String codeToken = getCodeToken(req); CookieUtils.setCookie(codeToken + "_" + Message.SMS_CODE_TYPE_LOGIN, sRand.toString(), "/", 60 * 60 * 24 *7, resp); //CacheUtils.putValue(CachePolicyEnum.TINY, UsersInfoService.class, codeToken + "_" + Message.SMS_CODE_TYPE_LOGIN, sRand.toString()); - // 输出图像到页面 + // 杈撳嚭鍥惧儚鍒伴〉闈� ImageIO.write(image, "JPEG", os); } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/tool/controllers/DistrictToolController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/tool/controllers/DistrictToolController.java index 9c5e64405..b3ae8c8a6 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/tool/controllers/DistrictToolController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/tool/controllers/DistrictToolController.java @@ -25,7 +25,7 @@ import com.fangjia.service.datastore.bean.HouseQueryBean; import com.fangjia.service.datastore.bean.RentHouseQueryBean; /** - * 丁丁地图小区详情小工具 + * 涓佷竵鍦板浘灏忓尯璇︽儏灏忓伐鍏� * * @author */ @@ -36,7 +36,7 @@ public class DistrictToolController { private DistrictService districtService; /** - * 公开Action + * 鍏紑Action * * @param model * @return @@ -48,7 +48,7 @@ public class DistrictToolController { } /** - * 实现Action + * 瀹炵幇Action * * @param model * @return @@ -60,7 +60,7 @@ public class DistrictToolController { public Object districtIframeAction(DistrictToolModel model, HttpServletRequest request) { HttpServletResponse res = ActionContext.getContext().getResponse(); - res.addHeader("P3P", "CP=CAO PSA OUR");// ie下拿不到uid sid的bug + res.addHeader("P3P", "CP=CAO PSA OUR");// ie涓嬫嬁涓嶅埌uid sid鐨刡ug if (StringUtils.isNotBlank(model.getDistrictName()) && StringUtils.isNotBlank(model.getCityName())) { DistrictKey districtKey = new DistrictKey(model.getCityName(), model.getRegionName(), model.getDistrictName()); District district = districtService.findDistrict(districtKey, true); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/tool/controllers/GujiaToolController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/tool/controllers/GujiaToolController.java index 135add8e5..f0bd098fe 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/tool/controllers/GujiaToolController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/tool/controllers/GujiaToolController.java @@ -26,7 +26,7 @@ import com.fangjia.service.datastore.bean.HouseQueryBean; import com.fangjia.service.tool.GainDataDetailLogService; /** - * 估价小工具controller + * 浼颁环灏忓伐鍏穋ontroller * * @author liupei */ @@ -38,7 +38,7 @@ public class GujiaToolController { private GainDataDetailLogService gainDataDetailLogService; /** - * 估价链接公开js Action + * 浼颁环閾炬帴鍏紑js Action * * @param model * @return @@ -50,7 +50,7 @@ public class GujiaToolController { } /** - * 估价链接实现js Action + * 浼颁环閾炬帴瀹炵幇js Action * * @param model * @return @@ -60,7 +60,7 @@ public class GujiaToolController { } /** - * 估价按钮公开js Action + * 浼颁环鎸夐挳鍏紑js Action * * @param model * @return @@ -72,7 +72,7 @@ public class GujiaToolController { } /** - * 估价按钮实现Action + * 浼颁环鎸夐挳瀹炵幇Action * * @param model * @return @@ -82,7 +82,7 @@ public class GujiaToolController { } /** - * 估价框公开js Action + * 浼颁环妗嗗叕寮�js Action * * @param model * @return @@ -94,7 +94,7 @@ public class GujiaToolController { } /** - * 估价框实现Action + * 浼颁环妗嗗疄鐜癆ction * * @param model * @return @@ -104,7 +104,7 @@ public class GujiaToolController { } /** - * 估价框iframe 950x120对应的src Action + * 浼颁环妗唅frame 950x120瀵瑰簲鐨剆rc Action * * @param model * @return @@ -114,7 +114,7 @@ public class GujiaToolController { } /** - * 估价框iframe 950x80对应的src Action + * 浼颁环妗唅frame 950x80瀵瑰簲鐨剆rc Action * * @param model * @return @@ -126,7 +126,7 @@ public class GujiaToolController { private Object boxIframe(GujiaToolModel model, HttpServletRequest request, HttpServletResponse response) { response.addHeader("P3P", "CP=CAO PSA OUR"); int count = 4; -// if ("华东城市".equals(model.getCity().getSection())) { +// if ("鍗庝笢鍩庡競".equals(model.getCity().getSection())) { // count--; // try { // Object[] jsons = MallUtils.getData(null, "UTF-8").toArray(); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/tool/controllers/HouseToolController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/tool/controllers/HouseToolController.java index dda52d0a6..240b4c1fa 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/tool/controllers/HouseToolController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/tool/controllers/HouseToolController.java @@ -25,7 +25,7 @@ import com.fangjia.service.datastore.bean.RentHouseQueryBean; import com.fangjia.service.tool.GainDataDetailLogService; /** - * 房源小工具 + * 鎴挎簮灏忓伐鍏� * * @author */ @@ -37,7 +37,7 @@ public class HouseToolController { private GainDataDetailLogService gainDataDetailLogService; /** - * 公开Action + * 鍏紑Action * * @param model * @return @@ -49,7 +49,7 @@ public class HouseToolController { } /** - * 实现Action + * 瀹炵幇Action * * @param model * @return @@ -61,10 +61,10 @@ public class HouseToolController { public Object houseIframeAction(HouseToolModel model, HttpServletRequest request) { HttpServletResponse res = ActionContext.getContext().getResponse(); - res.addHeader("P3P", "CP=CAO PSA OUR");// ie下拿不到uid sid的bug + res.addHeader("P3P", "CP=CAO PSA OUR");// ie涓嬫嬁涓嶅埌uid sid鐨刡ug int count = 20; if (model.getStyle().equals("withPic")) { - int picX = (model.getWidth() - 8) / 122;// 减去div边框和ul边框,ulpadding + int picX = (model.getWidth() - 8) / 122;// 鍑忓幓div杈规鍜寀l杈规,ulpadding int picY = (model.getHeight() - 8) / 148; count = picX * picY; String cssStr = "margin: " + String.valueOf((model.getHeight() - 8) % 148 / 2) + "px " @@ -99,7 +99,7 @@ public class HouseToolController { queryBean.setRegion(model.getRegionName()); FacetQueryResult houseBoResult = houseService.randomGainHouse(queryBean, count); if (CollectionUtils.isNotEmpty(houseBoResult)) { - // 加入cpc + // 鍔犲叆cpc // cpcService.checkCpcUserEnable(houseBoResult); model.setHouseBoList(houseBoResult); for (HouseBo bo : houseBoResult) { @@ -124,7 +124,7 @@ public class HouseToolController { queryBean.setRegion(model.getRegionName()); FacetQueryResult houseBoResult = rentHouseService.randomGainHouse(queryBean, count); if (CollectionUtils.isNotEmpty(houseBoResult)) { - // 加入cpc + // 鍔犲叆cpc // cpcService.checkCpcUserEnable(houseBoResult); model.setRentHouseBoList(houseBoResult); for (RentHouseBo bo : houseBoResult) { diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/tool/controllers/ToolController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/tool/controllers/ToolController.java index 2e74375bf..a020d7c83 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/tool/controllers/ToolController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/tool/controllers/ToolController.java @@ -28,7 +28,7 @@ import com.fangjia.service.sql.ApiUserService; import com.fangjia.service.tool.ToolClickDetailLogService; /** - * 小工具中的工具js类 + * 灏忓伐鍏蜂腑鐨勫伐鍏穓s绫� * * @author liupei */ @@ -48,7 +48,7 @@ public class ToolController { } /** - * 记录房源点击日志 + * 璁板綍鎴挎簮鐐瑰嚮鏃ュ織 * * @param model * @param request @@ -77,14 +77,14 @@ public class ToolController { } /** - * 估价点击日志 + * 浼颁环鐐瑰嚮鏃ュ織 * * @param model * @return */ public Object gujiaClickLogAction(GujiaClickLogModel model, HttpServletRequest request) { String ip = AnalyticsUtil.getIpAddress(request); - // ip过滤 + // ip杩囨护 if (ip.indexOf(OpenConfig.getConfig().getGujiaClickFilterIps()) != -1) { String uid = OpenCookieContext.getInstance().getUid(request); String sid = OpenCookieContext.getInstance().getSid(request); @@ -105,7 +105,7 @@ public class ToolController { } /** - * 检查apiuser是否开通了城市,没有开通自动开通 + * 妫�鏌piuser鏄惁寮�閫氫簡鍩庡競,娌℃湁寮�閫氳嚜鍔ㄥ紑閫� * * @param appKey * @param city diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/util/BHBankUtils.java b/projects/fangjia-open/src/main/java/com/fangjia/open/util/BHBankUtils.java index 77f54b39e..c26c5e295 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/util/BHBankUtils.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/util/BHBankUtils.java @@ -17,45 +17,45 @@ import java.util.*; public class BHBankUtils { -// public static String token = "bohaifangjia";// 原:bohaifangjiatest -// public static String uri = "http://shbreac.ruitingcc.com/API/";//测试 原:http://topen.shbrea.com.cn/API +// public static String token = "bohaifangjia";// 鍘燂細bohaifangjiatest +// public static String uri = "http://shbreac.ruitingcc.com/API/";//娴嬭瘯 鍘燂細http://topen.shbrea.com.cn/API - public static String token = "bohaifangjia";//正式token - public static String uri = "http://bizapi.shbrea.com.cn/API"; //"https://open.shbrea.com.cn/API"; //正式 http://bizapi.shbrea.com.cn/API/ + public static String token = "bohaifangjia";//姝e紡token + public static String uri = "http://bizapi.shbrea.com.cn/API"; //"https://open.shbrea.com.cn/API"; //姝e紡 http://bizapi.shbrea.com.cn/API/ public static String nonce = "818975"; public static Map regionCodeMap = new HashMap(){{ - put("11","黄浦"); - put("14","徐汇"); - put("12","长宁"); - put("13","静安"); - put("15","普陀"); - put("16","虹口"); - put("17","杨浦"); - put("19","闵行"); - put("20","宝山"); - put("21","嘉定"); - put("18","浦东"); - put("26","金山"); - put("25","松江"); - put("24","青浦"); - put("23","奉贤"); - put("22","崇明"); + put("11","榛勬郸"); + put("14","寰愭眹"); + put("12","闀垮畞"); + put("13","闈欏畨"); + put("15","鏅檧"); + put("16","铏瑰彛"); + put("17","鏉ㄦ郸"); + put("19","闂佃"); + put("20","瀹濆北"); + put("21","鍢夊畾"); + put("18","娴︿笢"); + put("26","閲戝北"); + put("25","鏉炬睙"); + put("24","闈掓郸"); + put("23","濂夎搐"); + put("22","宕囨槑"); }}; - //房屋类型传参 + //鎴垮眿绫诲瀷浼犲弬 public static Map houseTypeMap = new HashMap(){{ - put("8","公寓"); - put("4","独立别墅"); - put("5","双拼别墅"); - put("6","联排别墅"); - put("7","叠加别墅"); - put("9","联列住宅"); - put("10","花园住宅"); - put("11","旧式里弄2"); - put("0","其它"); + put("8","鍏瘬"); + put("4","鐙珛鍒"); + put("5","鍙屾嫾鍒"); + put("6","鑱旀帓鍒"); + put("7","鍙犲姞鍒"); + put("9","鑱斿垪浣忓畢"); + put("10","鑺卞洯浣忓畢"); + put("11","鏃у紡閲屽紕2"); + put("0","鍏跺畠"); }}; public static List getDistrictByBhbank(String address){ @@ -98,12 +98,12 @@ public class BHBankUtils { FjtEvaluation ev = model.getFjtEvaluation(); String queryFullAddr = ev.getAddress(); if(StringUtils.isNotBlank(ev.getHouseNum())){ - queryFullAddr = queryFullAddr + ev.getHouseNum()+"号"; + queryFullAddr = queryFullAddr + ev.getHouseNum()+"鍙�"; } if(StringUtils.isNotBlank(ev.getRoomNum())){ - queryFullAddr = queryFullAddr + ev.getRoomNum()+"室"; + queryFullAddr = queryFullAddr + ev.getRoomNum()+"瀹�"; } - params.put("queryFullAddr",queryFullAddr);//加了楼栋号和室号403 + params.put("queryFullAddr",queryFullAddr);//鍔犱簡妤兼爧鍙峰拰瀹ゅ彿403 if(bhMatchMap.containsKey("preCode")){ params.put("preCode", bhMatchMap.get("preCode")); } @@ -118,7 +118,7 @@ public class BHBankUtils { params.put("buildName", ev.getAddress()); } if(StringUtils.isNotBlank(ev.getHouseNum())){ - params.put("unitCode", ev.getHouseNum());// 渤海认为的单元号是楼栋号 + params.put("unitCode", ev.getHouseNum());// 娓ゆ捣璁や负鐨勫崟鍏冨彿鏄ゼ鏍嬪彿 } if(ev.getHouseFloor()>0){ params.put("floor", String.valueOf(ev.getHouseFloor())); @@ -147,7 +147,7 @@ public class BHBankUtils { params.put("undergroundArea", String.valueOf(ev.getBasementArea())); } - params.put("orientName", "南"); + params.put("orientName", "鍗�"); params.put("buildYear", ev.getFinishDateStr()); fjwTotalPrice= (int)(fjwTotalPrice/10000) * 10000; params.put("dealPriceTotal", String.valueOf(fjwTotalPrice)); @@ -233,7 +233,7 @@ public class BHBankUtils { Map params = new HashMap(); params.put("queryId",queryId); params.put("userName",name); - params.put("feedbackMsg","期望价:"+hopePrice+"万"); + params.put("feedbackMsg","鏈熸湜浠凤細"+hopePrice+"涓�"); List lists = Arrays.asList("queryId", "userName", "feedbackMsg"); @@ -436,7 +436,7 @@ public class BHBankUtils { String content = response.body().string(); JSONObject jsonObj = JSONObject.fromObject(content); - System.out.println("上传接口返回:"+jsonObj.toString()); + System.out.println("涓婁紶鎺ュ彛杩斿洖:"+jsonObj.toString()); return jsonObj; }catch (Exception e){ e.printStackTrace(); @@ -482,9 +482,9 @@ public class BHBankUtils { HttpRequest request = new HttpRequest(); String content = null; try { - System.out.println("调用渤海转评估报告 "+queryId); + System.out.println("璋冪敤娓ゆ捣杞瘎浼版姤鍛� "+queryId); content = request.post(uri+"/inquireToReport/bh/", params, headers, "utf-8"); - System.out.println("完成调用渤海转评估报告 "+content); + System.out.println("瀹屾垚璋冪敤娓ゆ捣杞瘎浼版姤鍛� "+content); if(StringUtils.isNotBlank(content)){ JSONObject jsonObj = JSONObject.fromObject(content); if(jsonObj.containsKey("errCode")){ diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/util/CommonDtoUtils.java b/projects/fangjia-open/src/main/java/com/fangjia/open/util/CommonDtoUtils.java index bebd942e0..f324bc8f6 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/util/CommonDtoUtils.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/util/CommonDtoUtils.java @@ -7,7 +7,7 @@ import com.alibaba.fastjson.JSONObject; import java.util.List; /** - * 通用实体与DTO互相转换工具类 + * 閫氱敤瀹炰綋涓嶥TO浜掔浉杞崲宸ュ叿绫� * * @author shenjian * @date 2021/06/16 diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/util/CommonUtils.java b/projects/fangjia-open/src/main/java/com/fangjia/open/util/CommonUtils.java index f5c8ea110..caa0bac68 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/util/CommonUtils.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/util/CommonUtils.java @@ -8,10 +8,10 @@ import java.lang.reflect.InvocationTargetException; import java.util.HashMap; import java.util.Map; -//公用 +//鍏敤 public class CommonUtils { - //对象转map + //瀵硅薄杞琺ap public static Map convertToMap(Object obj) { try { if (obj instanceof Map) { diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/util/DateCalculationUtils.java b/projects/fangjia-open/src/main/java/com/fangjia/open/util/DateCalculationUtils.java index 6346ab9b2..cceaf283e 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/util/DateCalculationUtils.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/util/DateCalculationUtils.java @@ -8,13 +8,13 @@ import java.util.Date; public class DateCalculationUtils { /** - * 计算两个日期之间相差的天数 + * 璁$畻涓や釜鏃ユ湡涔嬮棿鐩稿樊鐨勫ぉ鏁� * * @param smdate - * 较小的时间 + * 杈冨皬鐨勬椂闂� * @param bdate - * 较大的时间 - * @return 相差天数 + * 杈冨ぇ鐨勬椂闂� + * @return 鐩稿樊澶╂暟 * @throws ParseException */ public static int daysBetween(Date smdate, Date bdate) @@ -33,7 +33,7 @@ public class DateCalculationUtils { } /** - * 字符串的日期格式的计算 + * 瀛楃涓茬殑鏃ユ湡鏍煎紡鐨勮绠� */ public static int daysBetween(String smdate, String bdate) throws ParseException { @@ -49,14 +49,14 @@ public class DateCalculationUtils { } /** - * 计算前一天日期 + * 璁$畻鍓嶄竴澶╂棩鏈� * @param startDate * @return */ public static Date getOneDayBefore(Date startDate){ Calendar cal=Calendar.getInstance(); cal.setTime(startDate); - cal.add(Calendar.DATE, -1); //减1天 + cal.add(Calendar.DATE, -1); //鍑�1澶� Date oneDayBefore = cal.getTime(); return oneDayBefore; } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/util/EvaluationFactorUtil.java b/projects/fangjia-open/src/main/java/com/fangjia/open/util/EvaluationFactorUtil.java index ca7e1daf5..abbf72613 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/util/EvaluationFactorUtil.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/util/EvaluationFactorUtil.java @@ -7,172 +7,172 @@ public class EvaluationFactorUtil { public static final Map PROPERTY_TYPES = new HashMap() { { - put(null, "普通住宅"); - put("0", "普通住宅"); - put("1", "别墅"); - put("2", "商住"); + put(null, "鏅�氫綇瀹�"); + put("0", "鏅�氫綇瀹�"); + put("1", "鍒"); + put("2", "鍟嗕綇"); } }; public static final Map DIRECTION = new HashMap() { { - put(null, "南"); - put("1", "西南"); - put("2", "东南"); - put("3", "南"); - put("4", "西北"); - put("5", "东北"); - put("6", "东"); - put("7", "西"); - put("8", "北"); - put("9", "东西"); - put("10", "南北"); + put(null, "鍗�"); + put("1", "瑗垮崡"); + put("2", "涓滃崡"); + put("3", "鍗�"); + put("4", "瑗垮寳"); + put("5", "涓滃寳"); + put("6", "涓�"); + put("7", "瑗�"); + put("8", "鍖�"); + put("9", "涓滆タ"); + put("10", "鍗楀寳"); } }; public static final Map FITMENT = new HashMap() { { - put(null, "简装"); - put("1", "毛坯"); - put("2", "简装"); - put("3", "精装"); - put("4", "豪装"); + put(null, "绠�瑁�"); + put("1", "姣涘澂"); + put("2", "绠�瑁�"); + put("3", "绮捐"); + put("4", "璞"); } }; public static final Map EVALUATION_MODEL_FITMENT = new HashMap() { { - put(null, "简单装修"); - put("简装", "简单装修"); - put("毛坯", "毛坯"); - put("精装", "精装修"); - put("豪装", "豪华装修"); + put(null, "绠�鍗曡淇�"); + put("绠�瑁�", "绠�鍗曡淇�"); + put("姣涘澂", "姣涘澂"); + put("绮捐", "绮捐淇�"); + put("璞", "璞崕瑁呬慨"); } }; public static final Map FITMENT_MAP = new HashMap() { { - put("1", "毛坯"); - put("2", "简装"); - put("3", "精装"); - put("4", "豪装"); + put("1", "姣涘澂"); + put("2", "绠�瑁�"); + put("3", "绮捐"); + put("4", "璞"); } }; public static final Map SIGHT = new HashMap() { { - put(null, "一般"); - put("1", "景观房"); - put("2", "侧景观房"); - put("3", "一般"); - put("4", "差"); + put(null, "涓�鑸�"); + put("1", "鏅鎴�"); + put("2", "渚ф櫙瑙傛埧"); + put("3", "涓�鑸�"); + put("4", "宸�"); } }; public static final Map NOISE = new HashMap() { { - put(null, "无噪音"); - put("0", "无噪音"); - put("1", "噪音较小"); - put("2", "噪音大"); + put(null, "鏃犲櫔闊�"); + put("0", "鏃犲櫔闊�"); + put("1", "鍣煶杈冨皬"); + put("2", "鍣煶澶�"); } }; public static final Map WORRY_FACTOR = new HashMap() { { - put("0", "变电站"); - put("1", "垃圾场"); - put("2", "高架噪音"); - put("3", "轨交噪音"); - put("4", "发射塔"); + put("0", "鍙樼數绔�"); + put("1", "鍨冨溇鍦�"); + put("2", "楂樻灦鍣煶"); + put("3", "杞ㄤ氦鍣煶"); + put("4", "鍙戝皠濉�"); } }; public static final Map FACILITIES = new HashMap() { { - put("0", "健身房"); - put("1", "游泳池"); - put("2", "会所"); - put("3", "网球场"); - put("4", "球场"); - put("5", "棋牌室"); - put("6", "停车场"); - put("7", "图书馆"); - put("8", "活动中心"); + put("0", "鍋ヨ韩鎴�"); + put("1", "娓告吵姹�"); + put("2", "浼氭墍"); + put("3", "缃戠悆鍦�"); + put("4", "鐞冨満"); + put("5", "妫嬬墝瀹�"); + put("6", "鍋滆溅鍦�"); + put("7", "鍥句功棣�"); + put("8", "娲诲姩涓績"); } }; public static final Map FJT_DIRECTION = new HashMap() { { - put("1", "西南"); - put("2", "东南"); - put("3", "南"); - put("4", "西北"); - put("5", "东北"); - put("6", "东"); - put("7", "西"); - put("8", "北"); - put("9", "东西"); - put("10", "南北"); + put("1", "瑗垮崡"); + put("2", "涓滃崡"); + put("3", "鍗�"); + put("4", "瑗垮寳"); + put("5", "涓滃寳"); + put("6", "涓�"); + put("7", "瑗�"); + put("8", "鍖�"); + put("9", "涓滆タ"); + put("10", "鍗楀寳"); } }; public static final Map FJT_FITMENT = new HashMap() { { - put("0", "毛坯"); - put("1", "毛坯"); - put("2", "简装"); - put("4", "精装"); - put("5", "豪华装修"); + put("0", "姣涘澂"); + put("1", "姣涘澂"); + put("2", "绠�瑁�"); + put("4", "绮捐"); + put("5", "璞崕瑁呬慨"); } }; public static final Map NEGATIVE_FACTOR = new HashMap() { { - put(null, "无"); - put("1", "很近"); - put("2", "较近"); - put("3", "无"); + put(null, "鏃�"); + put("1", "寰堣繎"); + put("2", "杈冭繎"); + put("3", "鏃�"); } }; public static final Map AROUND_KEYWORD_FACTOR = new HashMap() { { put("KTV", "KTV"); - put("医院", "hospital"); - put("学校", "school"); - put("银行", "bank"); + put("鍖婚櫌", "hospital"); + put("瀛︽牎", "school"); + put("閾惰", "bank"); put("ATM", "ATM"); - put("写字楼", "office"); - put("超市", "superMarket"); - put("公园", "park"); - put("停车场", "parking"); - put("机场", "airport"); - put("网吧", "netbar"); - put("电影院", "cinema"); - put("美容院", "beautySalon"); - put("健身中心", "fitnessCenter"); - put("商场", "shoppingMall"); - put("星级酒店", "hotel"); - put("高尔夫球场", "golf"); - put("咖啡厅", "cafe"); + put("鍐欏瓧妤�", "office"); + put("瓒呭競", "superMarket"); + put("鍏洯", "park"); + put("鍋滆溅鍦�", "parking"); + put("鏈哄満", "airport"); + put("缃戝惂", "netbar"); + put("鐢靛奖闄�", "cinema"); + put("缇庡闄�", "beautySalon"); + put("鍋ヨ韩涓績", "fitnessCenter"); + put("鍟嗗満", "shoppingMall"); + put("鏄熺骇閰掑簵", "hotel"); + put("楂樺皵澶悆鍦�", "golf"); + put("鍜栧暋鍘�", "cafe"); } }; public static final Map AROUND_KEYWORD_FACTOR_NEW = new HashMap() { { - put("学校", "school"); - put("医院", "hospital"); - put("银行", "bank"); - put("超市", "supermarket"); - put("商场", "market"); - put("美容院", "beautySalon"); - put("健身中心", "gym"); - put("公园/绿地", "park"); - put("地铁", "metro"); - put("公交", "bus"); - put("码头", "dock"); - put("机场", "airport"); - put("火车站", "trainStation"); - put("餐馆", "restaurant"); - put("酒店", "hotel"); + put("瀛︽牎", "school"); + put("鍖婚櫌", "hospital"); + put("閾惰", "bank"); + put("瓒呭競", "supermarket"); + put("鍟嗗満", "market"); + put("缇庡闄�", "beautySalon"); + put("鍋ヨ韩涓績", "gym"); + put("鍏洯/缁垮湴", "park"); + put("鍦伴搧", "metro"); + put("鍏氦", "bus"); + put("鐮佸ご", "dock"); + put("鏈哄満", "airport"); + put("鐏溅绔�", "trainStation"); + put("椁愰", "restaurant"); + put("閰掑簵", "hotel"); } }; @@ -198,12 +198,12 @@ public class EvaluationFactorUtil { public static final Map CITYLEVEL_MAP = new HashMap() { { - put("1000", "one");// 一线 - put("1500", "newOne");// 新一线 - put("2000", "two");// 二线 - put("3000", "three");// 三线 - put("4000", "four");// 四线 - put("5000", "five");// 五线 + put("1000", "one");// 涓�绾� + put("1500", "newOne");// 鏂颁竴绾� + put("2000", "two");// 浜岀嚎 + put("3000", "three");// 涓夌嚎 + put("4000", "four");// 鍥涚嚎 + put("5000", "five");// 浜旂嚎 } }; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/util/FangJiaTongUrl.java b/projects/fangjia-open/src/main/java/com/fangjia/open/util/FangJiaTongUrl.java index 47d8fa603..75f73bf3f 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/util/FangJiaTongUrl.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/util/FangJiaTongUrl.java @@ -5,32 +5,32 @@ import org.apache.commons.lang.StringUtils; public class FangJiaTongUrl { /** - * 房价通后台服务token + * 鎴夸环閫氬悗鍙版湇鍔oken */ public static final String FANG_JIA_TONG_TOKEN = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJhY2NvdW50Ijoib3BlbiIsImV4cCI6MTMxMzQxNTk0MTQ5MTkzLCJvcmdDb2RlIjoiMDAxLjAwMSIsInJvbGVzIjpbImFkbWluIl0sInVzZXJJZCI6IjE4OTkwMDc1OTc0MDY3NzMyNDgiLCJ1c2VybmFtZSI6Ik9QRU7osIPnlKjotKblj7cifQ.ImHYDRYqmrZ13Wtzx87IlUFkUCy-HGf07M4IuaSyXTfPjNjG7FT_zyceWC2V0iTjexwfLyrPAlJtVflNgIsJYQ"; /** - * 房价通后台服务UAT地址 + * 鎴夸环閫氬悗鍙版湇鍔AT鍦板潃 */ public static final String FANG_JIA_TONG_URL_UAT = "https://api-uat.fangjia.com"; /** - * 房价通后台服务生产地址 + * 鎴夸环閫氬悗鍙版湇鍔$敓浜у湴鍧� */ public static final String FANG_JIA_TONG_URL_PROD = "https://api.fangjia.com"; /** - * 写字楼申请估值报告接口 + * 鍐欏瓧妤肩敵璇蜂及鍊兼姤鍛婃帴鍙� */ public static final String ASSESS_PRICE_REPORT_APPLY = "/office/assessPriceReport/apply"; /** - * 写字楼获取估值报告接口 + * 鍐欏瓧妤艰幏鍙栦及鍊兼姤鍛婃帴鍙� */ public static final String ASSESS_PRICE_REPORT_FETCH = "/office/assessPriceReport/fetch"; /** - * 处理调用接口回参中的特殊字符 + * 澶勭悊璋冪敤鎺ュ彛鍥炲弬涓殑鐗规畩瀛楃 * @param str * @return */ diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/util/InsidePolygon.java b/projects/fangjia-open/src/main/java/com/fangjia/open/util/InsidePolygon.java index 55706d5b4..19b34b4bc 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/util/InsidePolygon.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/util/InsidePolygon.java @@ -24,16 +24,16 @@ public class InsidePolygon { } /** - * 判定一个经纬度点与区域的关系 - * @param point 需要判断的经纬度点 - * @return boolean 如果点在区域内,true;如果在区域外,false + * 鍒ゅ畾涓�涓粡绾害鐐逛笌鍖哄煙鐨勫叧绯� + * @param point 闇�瑕佸垽鏂殑缁忕含搴︾偣 + * @return boolean 濡傛灉鐐瑰湪鍖哄煙鍐咃紝true锛涘鏋滃湪鍖哄煙澶栵紝false */ public static boolean aboutZone(Point point, List vPoint) { if(vPoint==null||vPoint.size()==0) return false; int I = 0; - //求出最大值, 得到一个落在矩形外的点, 由该点与point组成的线段, 与多边形求交, 交点为奇数则为 - // 在多边形内 + //姹傚嚭鏈�澶у��, 寰楀埌涓�涓惤鍦ㄧ煩褰㈠鐨勭偣, 鐢辫鐐逛笌point缁勬垚鐨勭嚎娈�, 涓庡杈瑰舰姹備氦, 浜ょ偣涓哄鏁板垯涓� + // 鍦ㄥ杈瑰舰鍐� I = 1; int odd = 0; @@ -166,12 +166,12 @@ public class InsidePolygon { dLon2 = ps.get(iIndex + 1).getLon(); dLat2 = ps.get(iIndex + 1).getLat(); } - // 以下语句判断A点是否在边的两端点的水平平行线之间,在则可能有交点,开始判断交点是否在左射线上 + // 浠ヤ笅璇彞鍒ゆ柇A鐐规槸鍚﹀湪杈圭殑涓ょ鐐圭殑姘村钩骞宠绾夸箣闂达紝鍦ㄥ垯鍙兘鏈変氦鐐癸紝寮�濮嬪垽鏂氦鐐规槸鍚﹀湪宸﹀皠绾夸笂 if (((ALat >= dLat1) && (ALat < dLat2)) || ((ALat >= dLat2) && (ALat < dLat1))) { if (Math.abs(dLat1 - dLat2) > 0) { - //得到 A点向左射线与边的交点的x坐标: + //寰楀埌 A鐐瑰悜宸﹀皠绾夸笌杈圭殑浜ょ偣鐨剎鍧愭爣锛� dLon = dLon1 - ((dLon1 - dLon2) * (dLat1 - ALat) ) / (dLat1 - dLat2); - // 如果交点在A点左侧(说明是做射线与 边的交点),则射线与边的全部交点数加一: + // 濡傛灉浜ょ偣鍦ˋ鐐瑰乏渚э紙璇存槑鏄仛灏勭嚎涓� 杈圭殑浜ょ偣锛夛紝鍒欏皠绾夸笌杈圭殑鍏ㄩ儴浜ょ偣鏁板姞涓�锛� if (dLon < ALon) { iSum++; } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/util/InsidePolygon2.java b/projects/fangjia-open/src/main/java/com/fangjia/open/util/InsidePolygon2.java index 2ecdb60fe..6182c1469 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/util/InsidePolygon2.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/util/InsidePolygon2.java @@ -6,10 +6,10 @@ import java.util.List; public class InsidePolygon2 { /** - * 判断当前位置是否在多边形区域内 + * 鍒ゆ柇褰撳墠浣嶇疆鏄惁鍦ㄥ杈瑰舰鍖哄煙鍐� * - * @param checkPoint 当前经纬度 - * @param areaAround 围栏范围 + * @param checkPoint 褰撳墠缁忕含搴� + * @param areaAround 鍥存爮鑼冨洿 * @return */ public static boolean checkIsInPolygon(Point checkPoint, List areaAround) { @@ -23,23 +23,23 @@ public class InsidePolygon2 { } /** - * 判断点是否在多边形内,如果点位于多边形的顶点或边上,也算做点在多边形内,直接返回true + * 鍒ゆ柇鐐规槸鍚﹀湪澶氳竟褰㈠唴锛屽鏋滅偣浣嶄簬澶氳竟褰㈢殑椤剁偣鎴栬竟涓婏紝涔熺畻鍋氱偣鍦ㄥ杈瑰舰鍐咃紝鐩存帴杩斿洖true * - * @param point 检测点 - * @param pts 多边形的顶点 - * @return 点在多边形内返回true, 否则返回false + * @param point 妫�娴嬬偣 + * @param pts 澶氳竟褰㈢殑椤剁偣 + * @return 鐐瑰湪澶氳竟褰㈠唴杩斿洖true, 鍚﹀垯杩斿洖false */ public static boolean checkIsPtInPoly(Point2D.Double point, List pts) { int N = pts.size(); - //如果点位于多边形的顶点或边上,也算做点在多边形内,直接返回true + //濡傛灉鐐逛綅浜庡杈瑰舰鐨勯《鐐规垨杈逛笂锛屼篃绠楀仛鐐瑰湪澶氳竟褰㈠唴锛岀洿鎺ヨ繑鍥瀟rue boolean boundOrVertex = true; //cross points count of x int intersectCount = 0; - //浮点类型计算时候与0比较时候的容差 + //娴偣绫诲瀷璁$畻鏃跺�欎笌0姣旇緝鏃跺�欑殑瀹瑰樊 double precision = 2e-10; //neighbour bound vertices Point2D.Double p1, p2; - //当前点 + //褰撳墠鐐� Point2D.Double p = point; //left vertex p1 = pts.get(0); @@ -105,11 +105,11 @@ public class InsidePolygon2 { //next ray left point p1 = p2; } - //偶数在多边形外 + //鍋舵暟鍦ㄥ杈瑰舰澶� if (intersectCount % 2 == 0) { return false; } else { - //奇数在多边形内 + //濂囨暟鍦ㄥ杈瑰舰鍐� return true; } } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/util/LatitudeAndLongitudeUtil.java b/projects/fangjia-open/src/main/java/com/fangjia/open/util/LatitudeAndLongitudeUtil.java index bca419451..97d58a973 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/util/LatitudeAndLongitudeUtil.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/util/LatitudeAndLongitudeUtil.java @@ -72,7 +72,7 @@ public class LatitudeAndLongitudeUtil { urlStr.append(ak); urlStr.append("&sn="); urlStr.append(sn); - // 传入拼装好后的url + // 浼犲叆鎷艰濂藉悗鐨剈rl String jsonStr = getJsonStr(urlStr.toString()); return jsonStr; } @@ -81,7 +81,7 @@ public class LatitudeAndLongitudeUtil { throws UnsupportedEncodingException { LatitudeAndLongitudeUtil snCal = new LatitudeAndLongitudeUtil(); - // 对paramsStr前面拼接上/geoconv/v1/?,后面直接拼接ak得到/geoconv/v1/?coords=114,29&from=1&to=6&ak=0D8clKvKp7wi7jn37kd1aXC989c6ed238ec3c7a6d5319bb3e2f237f7 + // 瀵筽aramsStr鍓嶉潰鎷兼帴涓�/geoconv/v1/?锛屽悗闈㈢洿鎺ユ嫾鎺k寰楀埌/geoconv/v1/?coords=114,29&from=1&to=6&ak=0D8clKvKp7wi7jn37kd1aXC989c6ed238ec3c7a6d5319bb3e2f237f7 StringBuilder stringBuilder = new StringBuilder(); stringBuilder.append(gv); stringBuilder.append("coords="); @@ -97,17 +97,17 @@ public class LatitudeAndLongitudeUtil { stringBuilder.append(sk); String wholeStr = new String(stringBuilder); - // 对上面wholeStr再作utf8编码 + // 瀵逛笂闈holeStr鍐嶄綔utf8缂栫爜 String tempStr = URLEncoder.encode(wholeStr, "UTF-8"); - // 调用下面的MD5方法得到最后的sn签名89c6ed238ec3c7a6d5319bb3e2f237f7 + // 璋冪敤涓嬮潰鐨凪D5鏂规硶寰楀埌鏈�鍚庣殑sn绛惧悕89c6ed238ec3c7a6d5319bb3e2f237f7 return snCal.MD5(tempStr); } /** - * 获取返回的json串 + * 鑾峰彇杩斿洖鐨刯son涓� * - * @param url 传入的url + * @param url 浼犲叆鐨剈rl * @return * @throws Exception */ @@ -158,7 +158,7 @@ public class LatitudeAndLongitudeUtil { return resultBuffer.toString(); } - // 对Map内所有value作utf8编码,拼接返回结果 + // 瀵筂ap鍐呮墍鏈塿alue浣渦tf8缂栫爜锛屾嫾鎺ヨ繑鍥炵粨鏋� public String toQueryString(Map data) throws UnsupportedEncodingException { StringBuffer queryString = new StringBuffer(); for (Entry pair : data.entrySet()) { @@ -171,7 +171,7 @@ public class LatitudeAndLongitudeUtil { return queryString.toString(); } - // 来自stackoverflow的MD5计算方法,调用了MessageDigest库函数,并把byte数组结果转换成16进制 + // 鏉ヨ嚜stackoverflow鐨凪D5璁$畻鏂规硶锛岃皟鐢ㄤ簡MessageDigest搴撳嚱鏁帮紝骞舵妸byte鏁扮粍缁撴灉杞崲鎴�16杩涘埗 public String MD5(String md5) { try { java.security.MessageDigest md = java.security.MessageDigest.getInstance("MD5"); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/util/LineChartsUtils.java b/projects/fangjia-open/src/main/java/com/fangjia/open/util/LineChartsUtils.java index 605c6e137..9b9d16ca5 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/util/LineChartsUtils.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/util/LineChartsUtils.java @@ -24,7 +24,7 @@ import java.util.ArrayList; import java.util.List; /** - * 折线图绘图工具类 + * 鎶樼嚎鍥剧粯鍥惧伐鍏风被 * * @author shenjian * @since 2021/4/9 @@ -62,7 +62,7 @@ public class LineChartsUtils { values.add(3000); values.add(3000); - createChartAndSave2Png("d://test.png", "1居室", columns, values); + createChartAndSave2Png("d://test.png", "1灞呭", columns, values); } public static String createChartAndSave2Png(String path, String rowKey, List columns, List values) { @@ -137,18 +137,18 @@ public class LineChartsUtils { } /** - * 定义图表对象 - * @param rowKey 曲线名,如一居室 - * @param columns 横坐标名 - * @param values 纵坐标值 + * 瀹氫箟鍥捐〃瀵硅薄 + * @param rowKey 鏇茬嚎鍚嶏紝濡備竴灞呭 + * @param columns 妯潗鏍囧悕 + * @param values 绾靛潗鏍囧�� */ public static JFreeChart createChart(String rowKey, List columns, List values) { createDataset(rowKey, columns, values); - // 折线图名称, 横坐标名称, 纵坐标名称 数据水平竖直 PlotOrientation.HORIZONTAL, 水平显示图像 true, 水平显示图像 true, include legend true, tooltips false, urls + // 鎶樼嚎鍥惧悕绉�, 妯潗鏍囧悕绉�, 绾靛潗鏍囧悕绉� 鏁版嵁姘村钩绔栫洿 PlotOrientation.HORIZONTAL锛� 姘村钩鏄剧ず鍥惧儚 true, 姘村钩鏄剧ず鍥惧儚 true, include legend true, tooltips false, urls JFreeChart chart = ChartFactory.createLineChart("", "", "", createDataset(rowKey, columns, values), PlotOrientation.VERTICAL, true, true, false); CategoryPlot plot = chart.getCategoryPlot(); - plot.setRangeGridlinesVisible(false); // 是否显示格子线 - plot.setBackgroundAlpha(0.3f); // 设置背景透明度 + plot.setRangeGridlinesVisible(false); // 鏄惁鏄剧ず鏍煎瓙绾� + plot.setBackgroundAlpha(0.3f); // 璁剧疆鑳屾櫙閫忔槑搴� LineAndShapeRenderer renderer = (LineAndShapeRenderer) plot.getRenderer(); renderer.setSeriesPaint(0, Color.BLUE); NumberAxis rangeAxis = (NumberAxis) plot.getRangeAxis(); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/util/MallUtils.java b/projects/fangjia-open/src/main/java/com/fangjia/open/util/MallUtils.java index d2f28c455..894c821bb 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/util/MallUtils.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/util/MallUtils.java @@ -14,13 +14,13 @@ import org.apache.commons.io.IOUtils; import org.apache.commons.lang.StringUtils; /** - * 电商业务工具类 + * 鐢靛晢涓氬姟宸ュ叿绫� * * @author liupei */ public final class MallUtils { /** - * 获取电商的数据 + * 鑾峰彇鐢靛晢鐨勬暟鎹� * * @param loc * @param encoding diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/util/OpenApiClient.java b/projects/fangjia-open/src/main/java/com/fangjia/open/util/OpenApiClient.java index 75c733d74..a2a80ef58 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/util/OpenApiClient.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/util/OpenApiClient.java @@ -10,7 +10,7 @@ import java.util.HashMap; import java.util.Map; /** - * API接口调用工具类 + * API鎺ュ彛璋冪敤宸ュ叿绫� */ public class OpenApiClient { diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/validation/CityValidator.java b/projects/fangjia-open/src/main/java/com/fangjia/open/validation/CityValidator.java index 7423feb94..d525cc652 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/validation/CityValidator.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/validation/CityValidator.java @@ -9,7 +9,7 @@ import javax.validation.ConstraintValidatorContext; /** * - * 城市合法性验证器 + * 鍩庡競鍚堟硶鎬ч獙璇佸櫒 * @see IsCity * @author wenyan */ diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/validation/DataPublishValidation.java b/projects/fangjia-open/src/main/java/com/fangjia/open/validation/DataPublishValidation.java index 563c7672a..7a5a49e73 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/validation/DataPublishValidation.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/validation/DataPublishValidation.java @@ -17,77 +17,77 @@ public abstract class DataPublishValidation { public abstract void validate(Object object, List errs); protected void commonValidation(HouseModel house, List errorContext) { - house.setRoom(checkIntField(house.getRoom(), "室数", errorContext, 0, 1, false, 1, Integer.MAX_VALUE)); - house.setFloor(checkIntField(house.getFloor(), "楼层", errorContext, 0, 1, false, 1, Integer.MAX_VALUE)); - house.setHeight(checkIntField(house.getHeight(), "总楼层", errorContext, 0, 1, false, 1, Integer.MAX_VALUE)); + house.setRoom(checkIntField(house.getRoom(), "瀹ゆ暟", errorContext, 0, 1, false, 1, Integer.MAX_VALUE)); + house.setFloor(checkIntField(house.getFloor(), "妤煎眰", errorContext, 0, 1, false, 1, Integer.MAX_VALUE)); + house.setHeight(checkIntField(house.getHeight(), "鎬绘ゼ灞�", errorContext, 0, 1, false, 1, Integer.MAX_VALUE)); if (StringUtils.isNotBlank(house.getEstateType())) { if (APIConstant.ESTATE_TYPES_ALIAS.containsKey(StringUtils.trim(house.getEstateType()))) { house.setEstateType(APIConstant.ESTATE_TYPES_ALIAS.get(house.getEstateType())); } - house.setEstateType(checkField(house.getEstateType(), "房源类型", errorContext, new ArrayList( + house.setEstateType(checkField(house.getEstateType(), "鎴挎簮绫诲瀷", errorContext, new ArrayList( APIConstant.ESTATE_TYPES))); } else { - errorContext.add("房源类型不合法"); + errorContext.add("鎴挎簮绫诲瀷涓嶅悎娉�"); } - house.setAge(checkIntField(house.getAge(), "房龄", errorContext, 0, 1, false, 1, Integer.MAX_VALUE)); - house.setArea((double) checkDoubleField(house.getArea(), "面积", errorContext, 0, 1, false, 1, Integer.MAX_VALUE)); + house.setAge(checkIntField(house.getAge(), "鎴块緞", errorContext, 0, 1, false, 1, Integer.MAX_VALUE)); + house.setArea((double) checkDoubleField(house.getArea(), "闈㈢Н", errorContext, 0, 1, false, 1, Integer.MAX_VALUE)); if (StringUtils.isNotBlank(house.getDirection())) { if (APIConstant.DIRECTIONS_ALIAS.containsKey(StringUtils.trim(house.getDirection()))) { house.setDirection(APIConstant.DIRECTIONS_ALIAS.get(house.getDirection())); } house - .setDirection(checkField(house.getDirection(), "朝向", errorContext, new ArrayList( + .setDirection(checkField(house.getDirection(), "鏈濆悜", errorContext, new ArrayList( APIConstant.DIRECTIONS))); } else { - errorContext.add("朝向不合法"); + errorContext.add("鏈濆悜涓嶅悎娉�"); } if (StringUtils.isNotBlank(house.getFitment())) { if (APIConstant.FITMENTS_ALIAS.containsKey(StringUtils.trim(house.getFitment()))) { house.setFitment(APIConstant.FITMENTS_ALIAS.get(house.getFitment())); } - house.setFitment(checkField(house.getFitment(), "装修", errorContext, new ArrayList(APIConstant.FITMENTS))); + house.setFitment(checkField(house.getFitment(), "瑁呬慨", errorContext, new ArrayList(APIConstant.FITMENTS))); } else { - errorContext.add("装修不合法"); + errorContext.add("瑁呬慨涓嶅悎娉�"); } - house.setRoom(checkIntField(house.getRoom(), "室数量", errorContext, 0, 1, false, 0, Integer.MAX_VALUE)); - house.setHall(checkIntField(house.getHall(), "厅数量", errorContext, 0, 1, true, 0, Integer.MAX_VALUE)); - house.setToilet(checkIntField(house.getToilet(), "卫数量", errorContext, 0, 1, true, 0, Integer.MAX_VALUE)); - house.setDescription(checkStringField(StringUtils.trim(house.getDescription()), "房源描述", errorContext, null, true, 0, + house.setRoom(checkIntField(house.getRoom(), "瀹ゆ暟閲�", errorContext, 0, 1, false, 0, Integer.MAX_VALUE)); + house.setHall(checkIntField(house.getHall(), "鍘呮暟閲�", errorContext, 0, 1, true, 0, Integer.MAX_VALUE)); + house.setToilet(checkIntField(house.getToilet(), "鍗暟閲�", errorContext, 0, 1, true, 0, Integer.MAX_VALUE)); + house.setDescription(checkStringField(StringUtils.trim(house.getDescription()), "鎴挎簮鎻忚堪", errorContext, null, true, 0, 65535)); - house.setTitle(checkStringField(house.getTitle(), "房源标题", errorContext, null, false, 1, 100)); + house.setTitle(checkStringField(house.getTitle(), "鎴挎簮鏍囬", errorContext, null, false, 1, 100)); - house.setContactPeople(checkStringField(house.getContactPeople(), "联系人", errorContext, null, true, 0, 100)); + house.setContactPeople(checkStringField(house.getContactPeople(), "鑱旂郴浜�", errorContext, null, true, 0, 100)); if (StringUtils.isNotBlank(house.getMobile())) { Set mobiles = PhoneNormalizer.normalize(FangjiaServerAreaContextHolder.getServerAreaDefault(), house .getMobile()); if (mobiles.size() > 0) { house.setMobile(mobiles.iterator().next()); } else { - errorContext.add("无效的联系人手机" + house.getMobile()); + errorContext.add("鏃犳晥鐨勮仈绯讳汉鎵嬫満" + house.getMobile()); } } - house.setDistrictName(checkStringField(house.getDistrictName(), "小区名", errorContext, null, false, 1, 255)); - house.setRegion(checkStringField(house.getRegion(), "区域", errorContext, null, true, 0, 20)); - house.setBlock(checkStringField(house.getBlock(), "板块", errorContext, null, true, 0, 20)); + house.setDistrictName(checkStringField(house.getDistrictName(), "灏忓尯鍚�", errorContext, null, false, 1, 255)); + house.setRegion(checkStringField(house.getRegion(), "鍖哄煙", errorContext, null, true, 0, 20)); + house.setBlock(checkStringField(house.getBlock(), "鏉垮潡", errorContext, null, true, 0, 20)); if (StringUtils.isBlank(house.getDescription())) { - errorContext.add("房源描述不合法"); + errorContext.add("鎴挎簮鎻忚堪涓嶅悎娉�"); } - house.setContactCompany(checkStringField(house.getContactCompany(), "经纪公司", errorContext, null, true, 0, 255)); - house.setShop(checkStringField(house.getShop(), "经纪门店", errorContext, null, true, 0, 255)); + house.setContactCompany(checkStringField(house.getContactCompany(), "缁忕邯鍏徃", errorContext, null, true, 0, 255)); + house.setShop(checkStringField(house.getShop(), "缁忕邯闂ㄥ簵", errorContext, null, true, 0, 255)); } protected String checkField(String field, String fieldDescription, List errorContext, List expectedValueList) { field = StringUtils.trim(field); if (!expectedValueList.contains(field)) { - errorContext.add(fieldDescription + "不合法"); + errorContext.add(fieldDescription + "涓嶅悎娉�"); return null; } return field; } /** - * 字符串属性检测 + * 瀛楃涓插睘鎬ф娴� * * @param field * @param fieldDescription @@ -105,18 +105,18 @@ public abstract class DataPublishValidation { if (!canNull) { if (StringUtils.isBlank(field)) { - errorContext.add(fieldDescription + "不能为空"); + errorContext.add(fieldDescription + "涓嶈兘涓虹┖"); return null; } } else if (StringUtils.isBlank(field)) { return defaultValue; } if (minSize >= 0 && field.length() < minSize) { - errorContext.add(fieldDescription + "必须大于等于" + minSize + "个字符"); + errorContext.add(fieldDescription + "蹇呴』澶т簬绛変簬" + minSize + "涓瓧绗�"); return null; } if (maxSize >= 0 && field.length() > maxSize) { - errorContext.add(fieldDescription + "必须小于等于" + maxSize + "个字符"); + errorContext.add(fieldDescription + "蹇呴』灏忎簬绛変簬" + maxSize + "涓瓧绗�"); return null; } return null == field ? defaultValue : field; @@ -126,20 +126,20 @@ public abstract class DataPublishValidation { boolean canNull, int minNum, long maxNum) { int ret = -1; if (!canNull && null == field) { - errorContext.add(fieldDescription + "不能为空"); + errorContext.add(fieldDescription + "涓嶈兘涓虹┖"); } else if (null == field) { ret = defaultValue; } else { try { ret = field; if (((double) ret / mod) < minNum) { - errorContext.add(fieldDescription + "必须大于等于" + minNum); + errorContext.add(fieldDescription + "蹇呴』澶т簬绛変簬" + minNum); } if (((double) ret / mod) > maxNum) { - errorContext.add(fieldDescription + "必须小于等于" + maxNum); + errorContext.add(fieldDescription + "蹇呴』灏忎簬绛変簬" + maxNum); } } catch (Exception e) { - errorContext.add(fieldDescription + field + "不是一个有效的数字"); + errorContext.add(fieldDescription + field + "涓嶆槸涓�涓湁鏁堢殑鏁板瓧"); } } return ret; @@ -149,20 +149,20 @@ public abstract class DataPublishValidation { int mod, boolean canNull, int minNum, long maxNum) { double ret = -1; if (!canNull && null == field) { - errorContext.add(fieldDescription + "不能为空"); + errorContext.add(fieldDescription + "涓嶈兘涓虹┖"); } else if (null == field) { ret = defaultValue; } else { try { ret = field; if (((double) ret / mod) < minNum) { - errorContext.add(fieldDescription + "必须大于等于" + minNum); + errorContext.add(fieldDescription + "蹇呴』澶т簬绛変簬" + minNum); } if (((double) ret / mod) > maxNum) { - errorContext.add(fieldDescription + "必须小于等于" + maxNum); + errorContext.add(fieldDescription + "蹇呴』灏忎簬绛変簬" + maxNum); } } catch (Exception e) { - errorContext.add(fieldDescription + field + "不是一个有效的数字"); + errorContext.add(fieldDescription + field + "涓嶆槸涓�涓湁鏁堢殑鏁板瓧"); } } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/validation/FirstGroup.java b/projects/fangjia-open/src/main/java/com/fangjia/open/validation/FirstGroup.java index ed3484378..21046e10e 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/validation/FirstGroup.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/validation/FirstGroup.java @@ -1,8 +1,8 @@ package com.fangjia.open.validation; /** - * 第一优先级验证组 - * @author 王文艳 + * 绗竴浼樺厛绾ч獙璇佺粍 + * @author 鐜嬫枃鑹� * @create 2016-10-09 **/ public interface FirstGroup { diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/validation/InList.java b/projects/fangjia-open/src/main/java/com/fangjia/open/validation/InList.java index 23147af70..649332ffc 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/validation/InList.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/validation/InList.java @@ -15,7 +15,7 @@ import java.lang.annotation.*; @ReportAsSingleViolation public @interface InList { - String message() default "值非法,正确值为:"; + String message() default "鍊奸潪娉�,姝g‘鍊间负:"; Class[] groups() default {}; Class[] payload() default {}; String[] value(); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/validation/IsCity.java b/projects/fangjia-open/src/main/java/com/fangjia/open/validation/IsCity.java index 610cf8288..00c00d4e0 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/validation/IsCity.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/validation/IsCity.java @@ -6,7 +6,7 @@ import javax.validation.ReportAsSingleViolation; import java.lang.annotation.*; /** - * 验证被注解的字符串是否为一个合法的城市 + * 楠岃瘉琚敞瑙g殑瀛楃涓叉槸鍚︿负涓�涓悎娉曠殑鍩庡競 * @see CityValidator * @author wenyan */ @@ -16,7 +16,7 @@ import java.lang.annotation.*; @Retention(RetentionPolicy.RUNTIME) @ReportAsSingleViolation public @interface IsCity { - String message() default "城市非法"; + String message() default "鍩庡競闈炴硶"; Class[] groups() default {}; Class[] payload() default {}; } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/validation/ListValidatorForString.java b/projects/fangjia-open/src/main/java/com/fangjia/open/validation/ListValidatorForString.java index c6c7e8f29..3b3a74c77 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/validation/ListValidatorForString.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/validation/ListValidatorForString.java @@ -8,7 +8,7 @@ import javax.validation.ConstraintValidatorContext; import java.util.Arrays; /** - * 列表值校验器 + * 鍒楄〃鍊兼牎楠屽櫒 * Created by wenyan on 2015/12/24. */ public class ListValidatorForString implements ConstraintValidator { diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/validation/RentHousePublishValidation.java b/projects/fangjia-open/src/main/java/com/fangjia/open/validation/RentHousePublishValidation.java index f34c21a8c..16021865d 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/validation/RentHousePublishValidation.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/validation/RentHousePublishValidation.java @@ -12,9 +12,9 @@ public class RentHousePublishValidation extends DataPublishValidation { public void validate(Object object, List errs) { HouseModel house = (HouseModel) object; super.commonValidation(house, errs); - house.setTotalPrice(checkIntField(house.getTotalPrice(), "租金", errs, 0, 1, false, 1, 99999)); + house.setTotalPrice(checkIntField(house.getTotalPrice(), "绉熼噾", errs, 0, 1, false, 1, 99999)); if (StringUtils.isNotBlank(house.getRentType())) { - house.setRentType(checkField(house.getRentType(), "出租类型", errs, Arrays.asList(new String[] { "整体出租", "合租" }))); + house.setRentType(checkField(house.getRentType(), "鍑虹绫诲瀷", errs, Arrays.asList(new String[] { "鏁翠綋鍑虹", "鍚堢" }))); } } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/validation/SecondGroup.java b/projects/fangjia-open/src/main/java/com/fangjia/open/validation/SecondGroup.java index a22763bd5..d7c752db8 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/validation/SecondGroup.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/validation/SecondGroup.java @@ -1,8 +1,8 @@ package com.fangjia.open.validation; /** - * 第二优先级验证组 - * @author 王文艳 + * 绗簩浼樺厛绾ч獙璇佺粍 + * @author 鐜嬫枃鑹� * @create 2016-10-09 **/ public interface SecondGroup { diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/validation/SellHousePublishValidation.java b/projects/fangjia-open/src/main/java/com/fangjia/open/validation/SellHousePublishValidation.java index 2d280e5fe..b280f3300 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/validation/SellHousePublishValidation.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/validation/SellHousePublishValidation.java @@ -13,13 +13,13 @@ public class SellHousePublishValidation extends DataPublishValidation { public void validate(Object object, List errs) { HouseModel house = (HouseModel) object; super.commonValidation(house, errs); - house.setTotalPrice(checkIntField(house.getTotalPrice(), "售价", errs, 0, 1, false, 1, Integer.MAX_VALUE)); + house.setTotalPrice(checkIntField(house.getTotalPrice(), "鍞环", errs, 0, 1, false, 1, Integer.MAX_VALUE)); if (StringUtils.isNotBlank(house.getPicture()) && ArrayUtils.isNotEmpty(house.getPicture().split(","))) { for (String path : house.getPicture().split(",")) { if (StringUtils.isNotBlank(path)) { if (!StringUtils.trim(StringUtils.lowerCase(path)).startsWith("http://")) { - errs.add("图片地址应以http://开头"); + errs.add("鍥剧墖鍦板潃搴斾互http://寮�澶�"); } } } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/validation/ValidationSequence.java b/projects/fangjia-open/src/main/java/com/fangjia/open/validation/ValidationSequence.java index 67a1327c7..0bbbc2a2b 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/validation/ValidationSequence.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/validation/ValidationSequence.java @@ -5,7 +5,7 @@ import javax.validation.groups.Default; /** * - * 指定Validator所在分组的执行顺序 + * 鎸囧畾Validator鎵�鍦ㄥ垎缁勭殑鎵ц椤哄簭 * @author wenyan */ @GroupSequence({Default.class, FirstGroup.class, SecondGroup.class}) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/views/RestView.java b/projects/fangjia-open/src/main/java/com/fangjia/open/views/RestView.java index 70ee2b1a0..4747f67f4 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/views/RestView.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/views/RestView.java @@ -9,9 +9,9 @@ import java.io.IOException; import java.util.Map; /** - * Rest视图追加ContentType返回 + * Rest瑙嗗浘杩藉姞ContentType杩斿洖 * - * @author 王文艳 + * @author 鐜嬫枃鑹� * @create 2016-09-09 **/ @Bean(scope = Scope.SINGLETON) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/ws/CzbankService.java b/projects/fangjia-open/src/main/java/com/fangjia/open/ws/CzbankService.java index b47f8eed3..1dfde2fe9 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/ws/CzbankService.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/ws/CzbankService.java @@ -17,7 +17,7 @@ import java.util.List; /** * - * 浙商银行SOAP服务接口 + * 娴欏晢閾惰SOAP鏈嶅姟鎺ュ彛 */ @WebService @BindingType(value = SOAPBinding.SOAP12HTTP_BINDING) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/ws/CzbankServiceImpl.java b/projects/fangjia-open/src/main/java/com/fangjia/open/ws/CzbankServiceImpl.java index c665678ca..3173883c7 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/ws/CzbankServiceImpl.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/ws/CzbankServiceImpl.java @@ -46,7 +46,7 @@ import java.util.*; import javax.servlet.http.HttpServletRequest; /** - * 浙商银行SOAP服务 + * 娴欏晢閾惰SOAP鏈嶅姟 */ public class CzbankServiceImpl implements CzbankService { @@ -122,7 +122,7 @@ public class CzbankServiceImpl implements CzbankService { result.setTotalPrice(evaluation.getTotalPrice()); result.setAvgPrice(evaluation.getAvgPrice()); }else{ - throw new Fault(new IllegalArgumentException("该楼盘暂无法估值!")); + throw new Fault(new IllegalArgumentException("璇ユゼ鐩樻殏鏃犳硶浼板�硷紒")); } } return result; @@ -139,7 +139,7 @@ public class CzbankServiceImpl implements CzbankService { new String[] { "address", "city", "region", "name", "lat2", "lng2","lat","lng","block", "estateType2" }, limit); List propertyList = new ArrayList(result.size()); if(StringUtils.isBlank(city)){ - throw new Fault(new IllegalArgumentException("city不能为空")); + throw new Fault(new IllegalArgumentException("city涓嶈兘涓虹┖")); } for(District d : result){ Property property = new Property(); @@ -163,29 +163,29 @@ public class CzbankServiceImpl implements CzbankService { String cltNo = queryBean.getCltNo(); if(StringUtils.isBlank(queryBean.getCltNo())){ - throw new Exception("cltNo不能为空"); + throw new Exception("cltNo涓嶈兘涓虹┖"); } String city = queryBean.getCity(); if(StringUtils.isBlank(city)){ - throw new Exception("city不能为空,cltNo:" + cltNo); + throw new Exception("city涓嶈兘涓虹┖,cltNo:" + cltNo); } String district = queryBean.getDistrict(); if(StringUtils.isBlank(district)){ - throw new Exception("district不能为空,cltNo:" + cltNo); + throw new Exception("district涓嶈兘涓虹┖,cltNo:" + cltNo); } FangjiaOfficialAreaMap fangjiaOfficialAreaMap = fangjiaOfficialAreaService.convertOfficialCodeToFangjia(q.getDistrict()); if(fangjiaOfficialAreaMap == null){ fangjiaOfficialAreaMap = fangjiaOfficialAreaService.convertOfficialCodeToFangjiaCity(q.getDistrict()); } if(fangjiaOfficialAreaMap == null){ - throw new Exception("地区信息无法映射到房价网的地区信息->(province:" + q.getProvince() + " ,city: " + q.getCity() + " ,district: " + q.getDistrict() + ")"); + throw new Exception("鍦板尯淇℃伅鏃犳硶鏄犲皠鍒版埧浠风綉鐨勫湴鍖轰俊鎭�->(province:" + q.getProvince() + " ,city: " + q.getCity() + " ,district: " + q.getDistrict() + ")"); } queryBean.setFangjiaCity(fangjiaOfficialAreaMap.getFangjiaCity()); queryBean.setFangjiaDistrict(fangjiaOfficialAreaMap.getFangjiaDistrict()); String buildingName = queryBean.getBuildingName(); if(StringUtils.isBlank(buildingName)){ - throw new Exception("buildingName不能为空,cltNo:" + cltNo); + throw new Exception("buildingName涓嶈兘涓虹┖,cltNo:" + cltNo); } District property = districtService.findByNameAndAlias(queryBean.getFangjiaCity(), queryBean.getFangjiaDistrict(), buildingName, "district"); if(property == null){ @@ -210,7 +210,7 @@ public class CzbankServiceImpl implements CzbankService { } } if(property == null){ - throw new Exception("该楼盘不存在 city:" + queryBean.getFangjiaCity() + " region:" + queryBean.getFangjiaDistrict() + " name:" + buildingName); + throw new Exception("璇ユゼ鐩樹笉瀛樺湪 city:" + queryBean.getFangjiaCity() + " region:" + queryBean.getFangjiaDistrict() + " name:" + buildingName); } } queryBean.setProperty(property); @@ -219,12 +219,12 @@ public class CzbankServiceImpl implements CzbankService { propertyTypeCode = "01"; } if(!PROPERTY_TYPE_CODE_LIST.contains(propertyTypeCode)){ - throw new Exception("propertyTypeCode取值非法,cltNo:" + cltNo); + throw new Exception("propertyTypeCode鍙栧�奸潪娉�,cltNo:" + cltNo); } Double strctureArea = queryBean.getStrctureArea(); if(strctureArea == null){ - throw new Exception("strctureArea取值非法,cltNo:" + cltNo); + throw new Exception("strctureArea鍙栧�奸潪娉�,cltNo:" + cltNo); } Integer decrCondCode = queryBean.getDecrCondCode(); @@ -232,7 +232,7 @@ public class CzbankServiceImpl implements CzbankService { decrCondCode = 2; } if(decrCondCode > 5 || decrCondCode < 1){ - throw new Exception("decrCondCode取值非法,cltNo:" + cltNo); + throw new Exception("decrCondCode鍙栧�奸潪娉�,cltNo:" + cltNo); } Integer towardDirectCode = queryBean.getTowardDirectCode(); @@ -240,7 +240,7 @@ public class CzbankServiceImpl implements CzbankService { towardDirectCode = 3; } if(towardDirectCode > 10 || towardDirectCode < 1){ - throw new Exception("towardDirectCode取值非法,cltNo:" + cltNo); + throw new Exception("towardDirectCode鍙栧�奸潪娉�,cltNo:" + cltNo); } queryBeans.add(queryBean); } @@ -252,35 +252,35 @@ public class CzbankServiceImpl implements CzbankService { private District convertQueryToBean(EvaluationQuery evaluationQuery) throws Exception{ String city = evaluationQuery.getCity(); if(StringUtils.isBlank(city)){ - throw new Exception("city不能为空" ); + throw new Exception("city涓嶈兘涓虹┖" ); } String district = evaluationQuery.getDistrict(); if(StringUtils.isBlank(district)){ - throw new Exception("district不能为空"); + throw new Exception("district涓嶈兘涓虹┖"); } String districtName = evaluationQuery.getName(); if(StringUtils.isBlank(districtName)){ - throw new Exception("name不能为空"); + throw new Exception("name涓嶈兘涓虹┖"); } if(evaluationQuery.getSize() <= 0){ - throw new Exception("size不能为空"); + throw new Exception("size涓嶈兘涓虹┖"); } if (evaluationQuery.getCarportPrice() != null && (evaluationQuery.getCarportPrice() < 0 || evaluationQuery.getCarportPrice() > 1000000)) { - throw new Exception("carportPrice(车位)取值不合法"); + throw new Exception("carportPrice(杞︿綅)鍙栧�间笉鍚堟硶"); } if (evaluationQuery.getMaxFloor() != null && (evaluationQuery.getMaxFloor() <= 0 || evaluationQuery.getMaxFloor() > 59)) { - throw new Exception("maxFloor取值非法,正确范围[1,60)"); + throw new Exception("maxFloor鍙栧�奸潪娉�,姝g‘鑼冨洿[1,60)"); } if (evaluationQuery.getFloor() != null && (evaluationQuery.getFloor() <= 0 || evaluationQuery.getFloor() > 59)) { - throw new Exception("floor取值非法,正确范围[1,60)"); + throw new Exception("floor鍙栧�奸潪娉�,姝g‘鑼冨洿[1,60)"); } if (evaluationQuery.getMaxFloor() != null && evaluationQuery.getFloor() != null && evaluationQuery.getFloor() > evaluationQuery.getMaxFloor()) { - throw new Exception("所在楼层不能大于总楼层"); + throw new Exception("鎵�鍦ㄦゼ灞備笉鑳藉ぇ浜庢�绘ゼ灞�"); } FangjiaOfficialAreaMap fangjiaOfficialAreaMap = fangjiaOfficialAreaService.convertOfficialCodeToFangjia(evaluationQuery.getDistrict()); @@ -288,7 +288,7 @@ public class CzbankServiceImpl implements CzbankService { fangjiaOfficialAreaMap = fangjiaOfficialAreaService.convertOfficialCodeToFangjiaCity(evaluationQuery.getDistrict()); } if(fangjiaOfficialAreaMap == null){ - throw new Exception("地区信息无法映射到房价网的地区信息->(province:" + evaluationQuery.getProvince() + " ,city: " + evaluationQuery.getCity() + " ,district: " + evaluationQuery.getDistrict() + ")"); + throw new Exception("鍦板尯淇℃伅鏃犳硶鏄犲皠鍒版埧浠风綉鐨勫湴鍖轰俊鎭�->(province:" + evaluationQuery.getProvince() + " ,city: " + evaluationQuery.getCity() + " ,district: " + evaluationQuery.getDistrict() + ")"); } String fangjiaCity = fangjiaOfficialAreaMap.getFangjiaCity(); String fangjiaDistrict = fangjiaOfficialAreaMap.getFangjiaDistrict(); @@ -317,14 +317,14 @@ public class CzbankServiceImpl implements CzbankService { } if(property == null){ - throw new Exception("该楼盘不存在 city:" + fangjiaCity + " region:" + fangjiaDistrict + " name:" + districtName); + throw new Exception("璇ユゼ鐩樹笉瀛樺湪 city:" + fangjiaCity + " region:" + fangjiaDistrict + " name:" + districtName); } } if(property != null){ if(StringUtils.isNotBlank(fangjiaDistrict) && !property.getRegion().equals(fangjiaDistrict)){ - throw new Exception("该楼盘不存在 city:" + fangjiaCity + " region:" + fangjiaDistrict + " name:" + districtName); + throw new Exception("璇ユゼ鐩樹笉瀛樺湪 city:" + fangjiaCity + " region:" + fangjiaDistrict + " name:" + districtName); } } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/ws/interceptor/AuthInterceptor.java b/projects/fangjia-open/src/main/java/com/fangjia/open/ws/interceptor/AuthInterceptor.java index 422f37fb2..2e6da672a 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/ws/interceptor/AuthInterceptor.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/ws/interceptor/AuthInterceptor.java @@ -20,7 +20,7 @@ import java.util.List; import javax.servlet.http.HttpServletRequest; /** - * SOAP 协议权限验证信息 + * SOAP 鍗忚鏉冮檺楠岃瘉淇℃伅 */ public class AuthInterceptor extends AbstractPhaseInterceptor { @@ -30,7 +30,7 @@ public class AuthInterceptor extends AbstractPhaseInterceptor { - //在调用之前拦截 + //鍦ㄨ皟鐢ㄤ箣鍓嶆嫤鎴� public AuthInterceptor() { super(Phase.PRE_INVOKE); } @@ -42,9 +42,9 @@ public class AuthInterceptor extends AbstractPhaseInterceptor { List

headers = message.getHeaders(); - //检查headers是否存在 + //妫�鏌eaders鏄惁瀛樺湪 if (headers == null | headers.size() < 1) { - throw new Fault(new IllegalArgumentException("找不到header,无法验证用户信息")); + throw new Fault(new IllegalArgumentException("鎵句笉鍒癶eader锛屾棤娉曢獙璇佺敤鎴蜂俊鎭�")); } Header securityHeader = null; for(Header header : headers){ @@ -54,24 +54,24 @@ public class AuthInterceptor extends AbstractPhaseInterceptor { } } if(securityHeader == null){ - throw new Fault(new IllegalArgumentException("header中无security信息,无法验证用户信息")); + throw new Fault(new IllegalArgumentException("header涓棤security淇℃伅锛屾棤娉曢獙璇佺敤鎴蜂俊鎭�")); } Element el = (Element) securityHeader.getObject(); NodeList users = el.getElementsByTagName("username"); NodeList passwords = el.getElementsByTagName("password"); if (users.getLength() < 1) { - throw new Fault(new IllegalArgumentException("username信息找不到")); + throw new Fault(new IllegalArgumentException("username淇℃伅鎵句笉鍒�")); } String username = users.item(0).getTextContent().trim(); if (passwords.getLength() < 1) { - throw new Fault(new IllegalArgumentException("password信息找不到")); + throw new Fault(new IllegalArgumentException("password淇℃伅鎵句笉鍒�")); } String password = passwords.item(0).getTextContent(); User user = userService.findByUserName(username); password = DigestUtils.md5Hex(password); if(user == null || !password.equals(user.getPassword())){ - throw new Fault(new IllegalArgumentException("授权信息校验失败")); + throw new Fault(new IllegalArgumentException("鎺堟潈淇℃伅鏍¢獙澶辫触")); }else{ HttpServletRequest request = ActionContext.getContext().getRequest(); request.setAttribute("from_user_id", String.valueOf(user.getId())); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/ws/model/ResponseBuilder.java b/projects/fangjia-open/src/main/java/com/fangjia/open/ws/model/ResponseBuilder.java index 9000fe673..5f679c7de 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/ws/model/ResponseBuilder.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/ws/model/ResponseBuilder.java @@ -1,7 +1,7 @@ package com.fangjia.open.ws.model; /** - * 应答构建器 + * 搴旂瓟鏋勫缓鍣� */ public class ResponseBuilder { diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/ws/query/CollateralSampleQuery.java b/projects/fangjia-open/src/main/java/com/fangjia/open/ws/query/CollateralSampleQuery.java index 164ea0ef9..270e4176e 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/ws/query/CollateralSampleQuery.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/ws/query/CollateralSampleQuery.java @@ -8,7 +8,7 @@ import javax.validation.constraints.NotNull; import java.util.Date; /** - * 样本查询对象 + * 鏍锋湰鏌ヨ瀵硅薄 */ public class CollateralSampleQuery { @@ -17,52 +17,52 @@ public class CollateralSampleQuery { @NotBlank private String province; - /**城市*/ + /**鍩庡競*/ @NotBlank private String city; - /**区域*/ + /**鍖哄煙*/ // @NotBlank private String district; @NotBlank - /**小区名*/ + /**灏忓尯鍚�*/ private String buildingName; - /**楼栋名称*/ + /**妤兼爧鍚嶇О*/ private String buildingNoName; - /**物业类型编码*/ + /**鐗╀笟绫诲瀷缂栫爜*/ private String propertyTypeCode; - /**是否有电梯 0:无 1:有*/ + /**鏄惁鏈夌數姊� 0锛氭棤 1锛氭湁*/ private Integer isElevator; - /**总楼层*/ + /**鎬绘ゼ灞�*/ @NotNull private Integer aboveFloorAmount; - /**所在楼层*/ + /**鎵�鍦ㄦゼ灞�*/ @NotNull private Integer floorNumber; /** - * 装修情况编码 - * 1:毛坯 - * 2:简装(默认) - * 3:精装 - * 4:豪装 + * 瑁呬慨鎯呭喌缂栫爜 + * 1锛氭瘺鍧� + * 2锛氱畝瑁咃紙榛樿锛� + * 3锛氱簿瑁� + * 4锛氳豹瑁� * */ private Integer decrCondCode; - /**面积**/ + /**闈㈢Н**/ @NotNull private Double strctureArea; /** - * 朝向情况编码 - * 1:西南 - * 2:东南 - * 3:南(默认) - * 4:西北 - * 5:东北 - * 6:东 - * 7:西 - * 8:北 - * 9:东西 - * 10:南北 + * 鏈濆悜鎯呭喌缂栫爜 + * 1锛氳タ鍗� + * 2锛氫笢鍗� + * 3锛氬崡(榛樿) + * 4锛氳タ鍖� + * 5锛氫笢鍖� + * 6锛氫笢 + * 7锛氳タ + * 8锛氬寳 + * 9锛氫笢瑗� + * 10锛氬崡鍖� * */ private Integer towardDirectCode; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/ws/query/EvaluationQuery.java b/projects/fangjia-open/src/main/java/com/fangjia/open/ws/query/EvaluationQuery.java index 35ea10ed0..b789b0532 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/ws/query/EvaluationQuery.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/ws/query/EvaluationQuery.java @@ -5,71 +5,71 @@ import java.util.Date; import org.hibernate.validator.constraints.NotBlank; /** - * 估价查询对象 + * 浼颁环鏌ヨ瀵硅薄 * @author gaojuan * */ public class EvaluationQuery { @NotBlank private String province; - /**城市*/ + /**鍩庡競*/ @NotBlank private String city; - /**区域*/ + /**鍖哄煙*/ @NotBlank private String district; @NotBlank - /**小区名*/ + /**灏忓尯鍚�*/ private String name; - /**地址*/ + /**鍦板潃*/ private String address; /** - * 楼号 + * 妤煎彿 */ private String buildingNumber; /** - * 室号 + * 瀹ゅ彿 */ private String roomNumber; /** - * 面积 + * 闈㈢Н */ private double size; /** - * 所在楼层 + * 鎵�鍦ㄦゼ灞� */ private Integer floor; /** - * 总楼层 + * 鎬绘ゼ灞� */ private Integer maxFloor; /** - * 室数 + * 瀹ゆ暟 */ private int room; /** - * 厅数 + * 鍘呮暟 */ private int hall; /** - * 卫数 + * 鍗暟 */ private int toilet; /** - * 估价时间 + * 浼颁环鏃堕棿 */ private Date calDate; @@ -77,78 +77,78 @@ public class EvaluationQuery { /** - * 朝向 + * 鏈濆悜 */ private String direction; /** - * 装修情况 + * 瑁呬慨鎯呭喌 */ private String decoration; /** - * 装修价格 + * 瑁呬慨浠锋牸 */ private Integer decorationCost; /** - * 装修年限 + * 瑁呬慨骞撮檺 */ private int decorationAge; /** - * 景观情况 + * 鏅鎯呭喌 */ private String view; /** - * 噪音情况 + * 鍣煶鎯呭喌 */ private String noise; /** - * 花园面积 + * 鑺卞洯闈㈢Н */ private Float gardenSize; /** - * 地下室面积 + * 鍦颁笅瀹ら潰绉� */ private Float basementSize; /** - * 露台面积 + * 闇插彴闈㈢Н */ private Float outerSize; /** - * 阁楼面积 + * 闃佹ゼ闈㈢Н */ private Float atticSize; /** - * 厌恶因素 + * 鍘屾伓鍥犵礌 */ private String negativeFactor; /** - * 房龄 + * 鎴块緞 */ private int age; /** - * 车位价 + * 杞︿綅浠� */ private Integer carportPrice;; /** - * 小区配套 + * 灏忓尯閰嶅 */ private String facilities; /** - * 小区位置 + * 灏忓尯浣嶇疆 */ private String insidePosition; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/ws/query/SampleQuery.java b/projects/fangjia-open/src/main/java/com/fangjia/open/ws/query/SampleQuery.java index 2be04d480..d9a1b5dfa 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/ws/query/SampleQuery.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/ws/query/SampleQuery.java @@ -10,49 +10,49 @@ import java.util.Date; public class SampleQuery { - /**城市*/ + /**鍩庡競*/ // @NotBlank private String city; - /**区域*/ + /**鍖哄煙*/ // @NotBlank private String district; // @NotBlank - /**小区名*/ + /**灏忓尯鍚�*/ private String buildingName; - /**楼栋名称*/ + /**妤兼爧鍚嶇О*/ private String buildingNoName; - /**物业类型编码*/ + /**鐗╀笟绫诲瀷缂栫爜*/ private String propertyTypeCode; - /**是否有电梯 0:无 1:有*/ + /**鏄惁鏈夌數姊� 0锛氭棤 1锛氭湁*/ private Integer isElevator; - /**总楼层*/ + /**鎬绘ゼ灞�*/ private Integer aboveFloorAmount; - /**所在楼层*/ + /**鎵�鍦ㄦゼ灞�*/ private Integer floorNumber; /** - * 装修情况编码 - * 1:毛坯 - * 2:简装(默认) - * 3:精装 - * 4:豪装 + * 瑁呬慨鎯呭喌缂栫爜 + * 1锛氭瘺鍧� + * 2锛氱畝瑁咃紙榛樿锛� + * 3锛氱簿瑁� + * 4锛氳豹瑁� * */ private Integer decrCondCode; - /**面积**/ + /**闈㈢Н**/ private Double strctureArea; /** - * 朝向情况编码 - * 1:西南 - * 2:东南 - * 3:南(默认) - * 4:西北 - * 5:东北 - * 6:东 - * 7:西 - * 8:北 - * 9:东西 - * 10:南北 + * 鏈濆悜鎯呭喌缂栫爜 + * 1锛氳タ鍗� + * 2锛氫笢鍗� + * 3锛氬崡(榛樿) + * 4锛氳タ鍖� + * 5锛氫笢鍖� + * 6锛氫笢 + * 7锛氳タ + * 8锛氬寳 + * 9锛氫笢瑗� + * 10锛氬崡鍖� * */ private Integer towardDirectCode; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/ws/query/ShopCollateralSampleQuery.java b/projects/fangjia-open/src/main/java/com/fangjia/open/ws/query/ShopCollateralSampleQuery.java index a6410bcf4..80eda4e23 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/ws/query/ShopCollateralSampleQuery.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/ws/query/ShopCollateralSampleQuery.java @@ -8,28 +8,28 @@ public class ShopCollateralSampleQuery { @NotBlank private String province; - /**城市*/ + /**鍩庡競*/ @NotBlank private String city; - /**区域*/ + /**鍖哄煙*/ @NotBlank private String district; @NotBlank - /**小区名*/ + /**灏忓尯鍚�*/ private String buildingName; - /**楼栋名称*/ + /**妤兼爧鍚嶇О*/ private String buildingNoName; @NotNull private Integer aboveFloorAmount; - /**所在楼层*/ + /**鎵�鍦ㄦゼ灞�*/ private Integer floorNumber; - /**面积**/ + /**闈㈢Н**/ @NotNull private Double strctureArea; diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/common/CityFactory.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/common/CityFactory.java index c24f0fe55..aaa10b336 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/common/CityFactory.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/common/CityFactory.java @@ -106,7 +106,7 @@ public class CityFactory { } /** - * 根据关键词返回城市 + * 鏍规嵁鍏抽敭璇嶈繑鍥炲煄甯� * @param keyword * @return */ @@ -123,9 +123,9 @@ public class CityFactory { } /** - * 根据关键词返回城市 + * 鏍规嵁鍏抽敭璇嶈繑鍥炲煄甯� * @param keyword - * @param limit 限制最多返回数据条数 + * @param limit 闄愬埗鏈�澶氳繑鍥炴暟鎹潯鏁� * @return */ public List matchCities(String keyword, int limit) { @@ -144,7 +144,7 @@ public class CityFactory { } /** - * 根据城市名或城市别名对关键词进行匹配 + * 鏍规嵁鍩庡競鍚嶆垨鍩庡競鍒悕瀵瑰叧閿瘝杩涜鍖归厤 * @param keyword * @param matchAlias * @return @@ -153,14 +153,14 @@ public class CityFactory { List result = Lists.newArrayList(); if(StringUtils.isNotBlank(keyword)) { if(!matchAlias) { - //不搜索别名 + //涓嶆悳绱㈠埆鍚� for (Cities cities : citiesList) { if (cities.getName().startsWith(keyword) || cities.getSpell().startsWith(keyword)) { result.add(cities); } } } else { - //搜索别名 + //鎼滅储鍒悕 for (Cities cities : citiesList) { if (cities.getName().startsWith(keyword) || cities.getSpell().startsWith(keyword) || (CollectionUtils.isNotEmpty(cities.getAliasList()) && cities.getAliasList().contains(keyword))) { @@ -173,9 +173,9 @@ public class CityFactory { } /** - * 根据关键词返回城市 + * 鏍规嵁鍏抽敭璇嶈繑鍥炲煄甯� * @param keyword - * @param limit 限制最多返回数据条数 + * @param limit 闄愬埗鏈�澶氳繑鍥炴暟鎹潯鏁� * @return */ public List matchCities(String keyword, int limit, boolean matchAlias) { @@ -206,7 +206,7 @@ public class CityFactory { } /** - * 根据keyword查询是否城市是否存在 + * 鏍规嵁keyword鏌ヨ鏄惁鍩庡競鏄惁瀛樺湪 * @param keyword * @return */ @@ -224,7 +224,7 @@ public class CityFactory { } /** - * 是否默认所有城市都开通 + * 鏄惁榛樿鎵�鏈夊煄甯傞兘寮�閫� * @param isAllOpen * @return */ @@ -244,10 +244,10 @@ public class CityFactory { } /** - * 获取以城市拼音首字母为分组的城市列表,默认全部不开通 - * 如: - * A -> [安阳, 鞍山...] - * B -> [北京, 宝鸡...] + * 鑾峰彇浠ュ煄甯傛嫾闊抽瀛楁瘝涓哄垎缁勭殑鍩庡競鍒楄〃锛岄粯璁ゅ叏閮ㄤ笉寮�閫� + * 濡�: + * A -> [瀹夐槼, 闉嶅北...] + * B -> [鍖椾含, 瀹濋浮...] * @return */ public Map> getPinyinCitiesMap() { @@ -256,7 +256,7 @@ public class CityFactory { public Map> getProvinceCitiesMap(){ - String[] spCitys = {"上海","天津","北京","重庆"}; + String[] spCitys = {"涓婃捣","澶╂触","鍖椾含","閲嶅簡"}; List spList = new ArrayList(); Map> result = Maps.newHashMap(); for(Cities cities : citiesList) { @@ -272,13 +272,13 @@ public class CityFactory { } } - //中文拼音排序 + //涓枃鎷奸煶鎺掑簭 Comparator com = Collator.getInstance(java.util.Locale.CHINA); List list = new ArrayList(result.keySet()); Collections.sort(list, com); Map> rMap = Maps.newLinkedHashMap(); if(spList.size()>0){ - rMap.put("直辖市", spList); + rMap.put("鐩磋緰甯�", spList); } for(String key : list){ rMap.put(key, result.get(key)); @@ -289,8 +289,8 @@ public class CityFactory { /** - * 获取以城市拼音首字母为分组的城市列表 - * @param openedCities 开通的城市列表 + * 鑾峰彇浠ュ煄甯傛嫾闊抽瀛楁瘝涓哄垎缁勭殑鍩庡競鍒楄〃 + * @param openedCities 寮�閫氱殑鍩庡競鍒楄〃 * @return */ public Map> getPinyinCitiesMap(List openedCities) { @@ -314,7 +314,7 @@ public class CityFactory { } /** - * 获取所有区域 + * 鑾峰彇鎵�鏈夊尯鍩� * @param city * @return */ @@ -331,7 +331,7 @@ public class CityFactory { } /** - * 根据区域匹配城市名 + * 鏍规嵁鍖哄煙鍖归厤鍩庡競鍚� * @param region * @param level * @return diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/common/EmployeeRoleConfig.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/common/EmployeeRoleConfig.java index 443c7f8b5..b3d8c1e56 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/common/EmployeeRoleConfig.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/common/EmployeeRoleConfig.java @@ -7,7 +7,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; /** - * 后台员工角色配置 + * 鍚庡彴鍛樺伐瑙掕壊閰嶇疆 * @author yinjihuan * */ @@ -18,20 +18,20 @@ public class EmployeeRoleConfig { public static final Map roleAuthConfig = new ConcurrentHashMap(); static { - roleConfig.put("超级管理员", Arrays.asList("bkoffEnterprise/add", "bkoffEnterprise", "bkoffRole", "bkoffUser", "algorithmRule", "bkoffEmployee","collRate", "bkoffPeopleInquiry", "bkoffManualInquiry", "bkoffCollInfo")); - roleConfig.put("销售经理", Arrays.asList("bkoffEnterprise/add", "bkoffEnterprise", "bkoffRole", "bkoffUser", "bkoffPeopleInquiry", "bkoffManualInquiry", "bkoffCollInfo")); - roleConfig.put("产品管理", Arrays.asList("algorithmRule", "collRate", "bkoffPeopleInquiry", "bkoffManualInquiry", "bkoffCollInfo")); + roleConfig.put("瓒呯骇绠$悊鍛�", Arrays.asList("bkoffEnterprise/add", "bkoffEnterprise", "bkoffRole", "bkoffUser", "algorithmRule", "bkoffEmployee","collRate", "bkoffPeopleInquiry", "bkoffManualInquiry", "bkoffCollInfo")); + roleConfig.put("閿�鍞粡鐞�", Arrays.asList("bkoffEnterprise/add", "bkoffEnterprise", "bkoffRole", "bkoffUser", "bkoffPeopleInquiry", "bkoffManualInquiry", "bkoffCollInfo")); + roleConfig.put("浜у搧绠$悊", Arrays.asList("algorithmRule", "collRate", "bkoffPeopleInquiry", "bkoffManualInquiry", "bkoffCollInfo")); - roleAuthConfig.put("bkoffEnterprise/add", "注册企业"); - roleAuthConfig.put("bkoffEnterprise", "企业列表"); - roleAuthConfig.put("bkoffRole", "角色管理"); - roleAuthConfig.put("bkoffUser", "用户列表"); - roleAuthConfig.put("bkoffEmployee", "员工列表"); - roleAuthConfig.put("algorithmRule", "算法参数"); - roleAuthConfig.put("collRate", "最大抵押率系数"); - roleAuthConfig.put("bkoffPeopleInquiry", "demo人工询价管理"); - roleAuthConfig.put("bkoffManualInquiry", "人工询价管理"); - roleAuthConfig.put("bkoffCollInfo", "押品列表"); + roleAuthConfig.put("bkoffEnterprise/add", "娉ㄥ唽浼佷笟"); + roleAuthConfig.put("bkoffEnterprise", "浼佷笟鍒楄〃"); + roleAuthConfig.put("bkoffRole", "瑙掕壊绠$悊"); + roleAuthConfig.put("bkoffUser", "鐢ㄦ埛鍒楄〃"); + roleAuthConfig.put("bkoffEmployee", "鍛樺伐鍒楄〃"); + roleAuthConfig.put("algorithmRule", "绠楁硶鍙傛暟"); + roleAuthConfig.put("collRate", "鏈�澶ф姷鎶肩巼绯绘暟"); + roleAuthConfig.put("bkoffPeopleInquiry", "demo浜哄伐璇环绠$悊"); + roleAuthConfig.put("bkoffManualInquiry", "浜哄伐璇环绠$悊"); + roleAuthConfig.put("bkoffCollInfo", "鎶煎搧鍒楄〃"); } public static List getRoleAuths(List roles) { diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/common/PdsAPIs.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/common/PdsAPIs.java index 800bac84e..5b1731ec5 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/common/PdsAPIs.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/common/PdsAPIs.java @@ -7,64 +7,64 @@ import com.fangjia.pds.PdsConfig; */ public enum PdsAPIs { /** - * 小区月度均价走势接口 + * 灏忓尯鏈堝害鍧囦环璧板娍鎺ュ彛 */ - DISTRICT_AVG_TREND("/property/avgPrice", "小区月度均价走势接口"), + DISTRICT_AVG_TREND("/property/avgPrice", "灏忓尯鏈堝害鍧囦环璧板娍鎺ュ彛"), /** - * 小区自动完成接口 + * 灏忓尯鑷姩瀹屾垚鎺ュ彛 */ - DISTRICT_AUTO_COMPLETE("/property/autoComplete", "小区自动完成接口"), + DISTRICT_AUTO_COMPLETE("/property/autoComplete", "灏忓尯鑷姩瀹屾垚鎺ュ彛"), /** - * 小区估价接口 + * 灏忓尯浼颁环鎺ュ彛 */ - EVALUATION("/property/evaluate", "小区估价接口"), + EVALUATION("/property/evaluate", "灏忓尯浼颁环鎺ュ彛"), /** - * 城市自动补全接口 + * 鍩庡競鑷姩琛ュ叏鎺ュ彛 */ - CITY_AUTO_COMPLETE("/city/list", "城市自动补全接口"), + CITY_AUTO_COMPLETE("/city/list", "鍩庡競鑷姩琛ュ叏鎺ュ彛"), /** - *城市均价走势接口 + *鍩庡競鍧囦环璧板娍鎺ュ彛 */ - CITY_AVG_TREND("/city/avgPrice2", "城市均价走势接口"), + CITY_AVG_TREND("/city/avgPrice2", "鍩庡競鍧囦环璧板娍鎺ュ彛"), /** - * 获取城市的区域 + * 鑾峰彇鍩庡競鐨勫尯鍩� */ - REGIONS_AUTO_COMPLETE("/city/regions", "获取城市区域接口"), + REGIONS_AUTO_COMPLETE("/city/regions", "鑾峰彇鍩庡競鍖哄煙鎺ュ彛"), - COLLATERAL_EVALUATION_INFO("/pds/collateralEvaluationInfo", "PDS押品分析接口"), + COLLATERAL_EVALUATION_INFO("/pds/collateralEvaluationInfo", "PDS鎶煎搧鍒嗘瀽鎺ュ彛"), - AVG_PRICE_EXISTS("/price/propertyAvgPrice", "判断小区是否存在均价"), + AVG_PRICE_EXISTS("/price/propertyAvgPrice", "鍒ゆ柇灏忓尯鏄惁瀛樺湪鍧囦环"), - CHECK_DISTRICT_ANALY_DATA("/pds/checkDistrictAnalyData", "判断小区是否有半年涨幅、季度涨幅"), + CHECK_DISTRICT_ANALY_DATA("/pds/checkDistrictAnalyData", "鍒ゆ柇灏忓尯鏄惁鏈夊崐骞存定骞呫�佸搴︽定骞�"), - DISTRICT_AVG_PRICE_CITY_RANK("/property/rank", "查看小区均价排名"), + DISTRICT_AVG_PRICE_CITY_RANK("/property/rank", "鏌ョ湅灏忓尯鍧囦环鎺掑悕"), - DISTRICT_HOUSE("/property/house", "房源接口"), + DISTRICT_HOUSE("/property/house", "鎴挎簮鎺ュ彛"), - DISTRICT_DETAIL("/property/detail","小区详情"), + DISTRICT_DETAIL("/property/detail","灏忓尯璇︽儏"), - NOTICE_INFO("/pds/appointNews", "公告详情接口"), + NOTICE_INFO("/pds/appointNews", "鍏憡璇︽儏鎺ュ彛"), - NOTICE_LIST_INFO("/pds/news", "公告top5列表接口"), + NOTICE_LIST_INFO("/pds/news", "鍏憡top5鍒楄〃鎺ュ彛"), - BUILDING_NUMBERS("/pds/building", "获取楼号数据"), + BUILDING_NUMBERS("/pds/building", "鑾峰彇妤煎彿鏁版嵁"), - ROOM_NUMBERS("/pds/roomNumber", "获取室号数据"), + ROOM_NUMBERS("/pds/roomNumber", "鑾峰彇瀹ゅ彿鏁版嵁"), - ADDRESS_MATCH("/address/match", "小区匹配"), + ADDRESS_MATCH("/address/match", "灏忓尯鍖归厤"), - ADDRESS_STANDARDIZE("/address/standardize", "地址标准化"), + ADDRESS_STANDARDIZE("/address/standardize", "鍦板潃鏍囧噯鍖�"), - ASSERTINFO("/pds/assertInfo","资产排名信息"), + ASSERTINFO("/pds/assertInfo","璧勪骇鎺掑悕淇℃伅"), - CITY_SELL_PRICE("/pds/citySellPrice", "获取城市的相对最低和最高价"), + CITY_SELL_PRICE("/pds/citySellPrice", "鑾峰彇鍩庡競鐨勭浉瀵规渶浣庡拰鏈�楂樹环"), - DINGDING_SEND("/dingMessage/send", "钉钉发送信息接口"), + DINGDING_SEND("/dingMessage/send", "閽夐拤鍙戦�佷俊鎭帴鍙�"), - UPLOAD_PIC("/files/upload","图片保存到图片服务器"), + UPLOAD_PIC("/files/upload","鍥剧墖淇濆瓨鍒板浘鐗囨湇鍔″櫒"), - HOUSE_INFO("/pds/getDistrictHouseInfo", "获取小区的房号信息"); + HOUSE_INFO("/pds/getDistrictHouseInfo", "鑾峰彇灏忓尯鐨勬埧鍙蜂俊鎭�"); private String uri; private String name; diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/common/PdsConstants.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/common/PdsConstants.java index 37b8ae10c..6ad908d21 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/common/PdsConstants.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/common/PdsConstants.java @@ -10,54 +10,54 @@ public class PdsConstants { public static String DINGDING_URL = "https://oapi.dingtalk.com/robot/send?access_token=379fa9f4f8e4a67dccb2ea09f687d47fe97628783eabaa9ac2083b6f60444d9b"; public static Integer NOT_HIT = 0; - // 高风险 - public static Integer HIGH_HIT = -40;// 击中高风险 - public static Integer HIGHT_OTHER = -10;// 其他 + // 楂橀闄� + public static Integer HIGH_HIT = -40;// 鍑讳腑楂橀闄� + public static Integer HIGHT_OTHER = -10;// 鍏朵粬 - // 中风险 黑名单信息查询服务 - public static Integer MIDDLE_BLACKINFO_LAW_HIT = -30;// 黑名单信息查询服务,法律方面原因(击中) - public static Integer MIDDLE_BLACKINFO_INTERNET_HIT = -24;// 黑名单信息查询服务,网络不良行为(击中) - public static Integer MIDDLE_BLACKINFO_VENTURE_HIT = -30;// 黑名单信息查询服务,因为风险信息被机构拒绝(击中) - public static Integer MIDDLE_BLACKINFO_ECONOMIC_HIT = -20;// 黑名单信息查询服务,共享经济黑名单(击中) - public static Integer MIDDLE_BLACKINFO_OTHER = -8;// 黑名单信息查询服务 其它 + // 涓闄� 榛戝悕鍗曚俊鎭煡璇㈡湇鍔� + public static Integer MIDDLE_BLACKINFO_LAW_HIT = -30;// 榛戝悕鍗曚俊鎭煡璇㈡湇鍔�,娉曞緥鏂归潰鍘熷洜锛堝嚮涓級 + public static Integer MIDDLE_BLACKINFO_INTERNET_HIT = -24;// 榛戝悕鍗曚俊鎭煡璇㈡湇鍔�,缃戠粶涓嶈壇琛屼负锛堝嚮涓級 + public static Integer MIDDLE_BLACKINFO_VENTURE_HIT = -30;// 榛戝悕鍗曚俊鎭煡璇㈡湇鍔�,鍥犱负椋庨櫓淇℃伅琚満鏋勬嫆缁濓紙鍑讳腑锛� + public static Integer MIDDLE_BLACKINFO_ECONOMIC_HIT = -20;// 榛戝悕鍗曚俊鎭煡璇㈡湇鍔�,鍏变韩缁忔祹榛戝悕鍗曪紙鍑讳腑锛� + public static Integer MIDDLE_BLACKINFO_OTHER = -8;// 榛戝悕鍗曚俊鎭煡璇㈡湇鍔� 鍏跺畠 - // 中风险 多平台借贷黑名单验证服务 - public static Integer MIDDLE_BORR_BLACK_HIT = -30;// 多平台借贷黑名单验证服务 多头借贷(击中) - public static Integer MIDDLE_BORR_BLACK_OTHER = -8;// 多平台借贷黑名单验证服务 其它 + // 涓闄� 澶氬钩鍙板�熻捶榛戝悕鍗曢獙璇佹湇鍔� + public static Integer MIDDLE_BORR_BLACK_HIT = -30;// 澶氬钩鍙板�熻捶榛戝悕鍗曢獙璇佹湇鍔� 澶氬ご鍊熻捶锛堝嚮涓級 + public static Integer MIDDLE_BORR_BLACK_OTHER = -8;// 澶氬钩鍙板�熻捶榛戝悕鍗曢獙璇佹湇鍔� 鍏跺畠 - // 低风险 多平台借贷黑名单验证服务 - public static Integer LOW_INVEST_HIT = -20;// 个人对外投资查询 失信对外投资(击中) - public static Integer LOW_INVEST_OTHER = -5;// 个人对外投资查询 其它 + // 浣庨闄� 澶氬钩鍙板�熻捶榛戝悕鍗曢獙璇佹湇鍔� + public static Integer LOW_INVEST_HIT = -20;// 涓汉瀵瑰鎶曡祫鏌ヨ 澶变俊瀵瑰鎶曡祫锛堝嚮涓級 + public static Integer LOW_INVEST_OTHER = -5;// 涓汉瀵瑰鎶曡祫鏌ヨ 鍏跺畠 - // 低风险 被执行人信息查询服务 - public static Integer LOW_EXECUTOR_HIT = -20;// 被执行人(击中) - public static Integer LOW_EXECUTOR_OTHER = -5;// 其它 + // 浣庨闄� 琚墽琛屼汉淇℃伅鏌ヨ鏈嶅姟 + public static Integer LOW_EXECUTOR_HIT = -20;// 琚墽琛屼汉锛堝嚮涓級 + public static Integer LOW_EXECUTOR_OTHER = -5;// 鍏跺畠 - // 非风险项 三大运营商手机入网在时长 - // 移动 - public static Integer TELE_NO_GET = 6;// 未查的 - public static Integer TELE_LARGE_TWOFOUR = 20;// >24个月 - public static Integer TELE_LARGE_ONETWO_LESS_TWOFOUR = 15;// 12-24个月 - public static Integer TELE_LARGE_SIX_LESS_ONETWO = 8;// 6-12个月 - public static Integer TELE_LARGE_THREE_LESS_SIX = 6;// 3-6个月 - public static Integer TELE_LESS_THREE = 2;// 0-3个月 - // 电信 - public static Integer MOBILE_NO_GET = 6;// 未查得 - public static Integer MOBILE_LARGE_SIXZERO = 20;// 60个月及以上 - public static Integer MOBILE_LARGE_THREESIX_LESS_SIXZERO = 20;// 36-60个月 - public static Integer MOBILE_LARGE_ONETWO_LESS_THREESIX = 12;// 12-36个月 - public static Integer MOBILE_LARGE_SIX_LESS_ONETWO = 8;// 6-12个月 - public static Integer MOBILE_LESS_SXI = 4;// 0-6个月 + // 闈為闄╅」 涓夊ぇ杩愯惀鍟嗘墜鏈哄叆缃戝湪鏃堕暱 + // 绉诲姩 + public static Integer TELE_NO_GET = 6;// 鏈煡鐨� + public static Integer TELE_LARGE_TWOFOUR = 20;// 锛�24涓湀 + public static Integer TELE_LARGE_ONETWO_LESS_TWOFOUR = 15;// 12-24涓湀 + public static Integer TELE_LARGE_SIX_LESS_ONETWO = 8;// 6-12涓湀 + public static Integer TELE_LARGE_THREE_LESS_SIX = 6;// 3-6涓湀 + public static Integer TELE_LESS_THREE = 2;// 0-3涓湀 + // 鐢典俊 + public static Integer MOBILE_NO_GET = 6;// 鏈煡寰� + public static Integer MOBILE_LARGE_SIXZERO = 20;// 60涓湀鍙婁互涓� + public static Integer MOBILE_LARGE_THREESIX_LESS_SIXZERO = 20;// 36-60涓湀 + public static Integer MOBILE_LARGE_ONETWO_LESS_THREESIX = 12;// 12-36涓湀 + public static Integer MOBILE_LARGE_SIX_LESS_ONETWO = 8;// 6-12涓湀 + public static Integer MOBILE_LESS_SXI = 4;// 0-6涓湀 - // 联通 - public static Integer UNICOM_NO_GET = 6;// 未查得 - public static Integer UNICOM_LARGE_THREESIX = 20;// 36个月及以上 - public static Integer UNICOM_LARGE_TWOFOUR_LESS_THREESIX = 20;// 24-36个月 - public static Integer UNICOM_LARGE_ONETWO_LESS_TWOFOUR = 15;// 12-24个月 - public static Integer UNICOM_LARGE_SIX_LESS_ONETWO = 8;// 6-12个月 - public static Integer UNICOM_LARGE_THREE_LESS_SIX = 6;// 3-6个月 - public static Integer UNICOM_LARGE_ONE_LESS_THREE = 2;// 1-3个月 - public static Integer UNICOM_LESS_ONE = 1;// 0-1个月 + // 鑱旈�� + public static Integer UNICOM_NO_GET = 6;// 鏈煡寰� + public static Integer UNICOM_LARGE_THREESIX = 20;// 36涓湀鍙婁互涓� + public static Integer UNICOM_LARGE_TWOFOUR_LESS_THREESIX = 20;// 24-36涓湀 + public static Integer UNICOM_LARGE_ONETWO_LESS_TWOFOUR = 15;// 12-24涓湀 + public static Integer UNICOM_LARGE_SIX_LESS_ONETWO = 8;// 6-12涓湀 + public static Integer UNICOM_LARGE_THREE_LESS_SIX = 6;// 3-6涓湀 + public static Integer UNICOM_LARGE_ONE_LESS_THREE = 2;// 1-3涓湀 + public static Integer UNICOM_LESS_ONE = 1;// 0-1涓湀 public static final String LOGIN_ERROR = "LOGIN_ERROR"; public static final String SUCCESS = "SUCCESS"; diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/common/PdsPersonInfoUtils.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/common/PdsPersonInfoUtils.java index e822e7d56..7ce9dcc7b 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/common/PdsPersonInfoUtils.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/common/PdsPersonInfoUtils.java @@ -12,24 +12,24 @@ import com.mongodb.DBObject; */ public class PdsPersonInfoUtils { - //违约风险 + //杩濈害椋庨櫓 public static Integer getBleakRisk(Borrower borr){ - int blackInfo = 0;//黑名单信息查询服务 + int blackInfo = 0;//榛戝悕鍗曚俊鎭煡璇㈡湇鍔� BasicDBList blackL = borr.getBlackList(); if(blackL!=null&&blackL.size()>0){ for (Object object : blackL) { DBObject obj = (DBObject)object; if("0".equals(obj.get("reason"))||"3".equals(obj.get("reason"))){ - blackInfo =1;//命中 + blackInfo =1;//鍛戒腑 } } }else if(blackL==null){ - blackInfo = 0;//未知 + blackInfo = 0;//鏈煡 }else{ - blackInfo = 2;//为命中 + blackInfo = 2;//涓哄懡涓� } - //失信被执行人查询服务 + //澶变俊琚墽琛屼汉鏌ヨ鏈嶅姟 int loseCreditInfo = 0; BasicDBList loseCreditJudicialL = borr.getLoseCreditJudicialList(); if(loseCreditJudicialL!=null&&loseCreditJudicialL.size()>0){ @@ -39,7 +39,7 @@ public class PdsPersonInfoUtils { }else{ loseCreditInfo = 2; } - //多平台借贷黑名单验证服务 + //澶氬钩鍙板�熻捶榛戝悕鍗曢獙璇佹湇鍔� int borrPInfo = 0; Integer borrowPlatCount = borr.getBorrowPlatCount(); if(borrowPlatCount==null){ @@ -50,7 +50,7 @@ public class PdsPersonInfoUtils { borrPInfo = 2; } - //个人对外投资查询 + //涓汉瀵瑰鎶曡祫鏌ヨ int badEnterpriseInfo = 0; BasicDBList badEnterpriseInvestments = borr.getBadEnterpriseInvestments(); if(badEnterpriseInvestments!=null&&badEnterpriseInvestments.size()>0){ @@ -61,7 +61,7 @@ public class PdsPersonInfoUtils { badEnterpriseInfo = 2; } - //被执行人信息查询服务 + //琚墽琛屼汉淇℃伅鏌ヨ鏈嶅姟 int defendantJInfo = 0; BasicDBList defendantJudicialList = borr.getDefendantJudicialList(); if(defendantJudicialList==null){ @@ -73,52 +73,52 @@ public class PdsPersonInfoUtils { } if(blackInfo==1||loseCreditInfo==1||borrPInfo==1||badEnterpriseInfo==1){ - return 2;//欺诈高风险 + return 2;//娆鸿瘓楂橀闄� }else if(blackInfo==2&&loseCreditInfo==2&&borrPInfo==2&&badEnterpriseInfo==2&&defendantJInfo==2){ - return 0;// 欺诈中风险 + return 0;// 娆鸿瘓涓闄� }else{ - return 1;//欺诈中风险 + return 1;//娆鸿瘓涓闄� } } - //欺诈风险 + //娆鸿瘓椋庨櫓 public static Integer getCheatRisk(Borrower borr){ int cheatRisk = 0; BasicDBObject phoneOnlineTimes = borr.getPhoneOnlineTimes(); int mobileInfo = 0;// if(phoneOnlineTimes!=null){ String type = (String)phoneOnlineTimes.get("type"); - if("中国移动".equals(type)){ + if("涓浗绉诲姩".equals(type)){ String time = (String)phoneOnlineTimes.get("inTimesDesc"); - if("0-3个月".equals(time)){ + if("0-3涓湀".equals(time)){ mobileInfo = 1; - }else if("3-6个月".equals(time)){ + }else if("3-6涓湀".equals(time)){ mobileInfo = 1; - }else if(!("未知".equals(time))){ + }else if(!("鏈煡".equals(time))){ mobileInfo = 2; } - }else if("中国联通".equals(type)){ + }else if("涓浗鑱旈��".equals(type)){ String time = (String)phoneOnlineTimes.get("inTimesDesc"); - if("0-1个月".equals(time)){ + if("0-1涓湀".equals(time)){ mobileInfo = 1; - }else if("1-3个月".equals(time)){ + }else if("1-3涓湀".equals(time)){ mobileInfo = 1; - }else if("3-6个月".equals(time)){ + }else if("3-6涓湀".equals(time)){ mobileInfo = 1; - }else if(!("未知".equals(time))){ + }else if(!("鏈煡".equals(time))){ mobileInfo = 2; } - }else if("中国电信".equals(type)){ + }else if("涓浗鐢典俊".equals(type)){ String time = (String)phoneOnlineTimes.get("inTimesDesc"); - if("0-6个月".equals(time)){ + if("0-6涓湀".equals(time)){ mobileInfo = 1; - }else if(!("未知".equals(time))){ + }else if(!("鏈煡".equals(time))){ mobileInfo = 2; } } } - int idInfo = 0;//身份信息验证服务 + int idInfo = 0;//韬唤淇℃伅楠岃瘉鏈嶅姟 Integer isRight = borr.getCompareResult(); if(isRight!=null&&isRight==2){ idInfo = 1; @@ -128,32 +128,32 @@ public class PdsPersonInfoUtils { idInfo = 0; } - int blackInfo = 0;//黑名单信息查询服务 + int blackInfo = 0;//榛戝悕鍗曚俊鎭煡璇㈡湇鍔� BasicDBList blackL = borr.getBlackList(); if(blackL!=null&&blackL.size()>0){ for (Object object : blackL) { DBObject obj = (DBObject)object; if("1".equals(obj.get("reason"))||"2".equals(obj.get("reason"))||"4".equals(obj.get("reason"))){ - blackInfo =1;//命中 + blackInfo =1;//鍛戒腑 } } }else if(blackL==null){ - blackInfo = 0;//未知 + blackInfo = 0;//鏈煡 }else{ - blackInfo = 2;//为命中 + blackInfo = 2;//涓哄懡涓� } if(idInfo==1){ - cheatRisk = 2;//欺诈高风险 + cheatRisk = 2;//娆鸿瘓楂橀闄� }else if(mobileInfo==1||blackInfo!=2||idInfo==0){ - cheatRisk = 1;//欺诈中风险 + cheatRisk = 1;//娆鸿瘓涓闄� }else{ - cheatRisk = 0;//欺诈低风险 + cheatRisk = 0;//娆鸿瘓浣庨闄� } return cheatRisk; } - //人物得分 + //浜虹墿寰楀垎 public static Integer getScore(Borrower borr){ int score = 0; int high = highRiskStatus(borr); @@ -195,7 +195,7 @@ public class PdsPersonInfoUtils { } - //判断黑名单是中风险还是高风险0中 1高 -1其他 + //鍒ゆ柇榛戝悕鍗曟槸涓闄╄繕鏄珮椋庨櫓0涓� 1楂� -1鍏朵粬 public static boolean blackStatus(BasicDBList blackL){ if(blackL!=null&&blackL.size()>0){ for (Object object : blackL) { @@ -208,7 +208,7 @@ public class PdsPersonInfoUtils { return false; } - //中风险黑名单信息查询服务得分 + //涓闄╅粦鍚嶅崟淇℃伅鏌ヨ鏈嶅姟寰楀垎 public static Integer blackListScore(Borrower borr){ BasicDBList blackL = borr.getBlackList(); if(blackStatus(blackL)){ @@ -247,7 +247,7 @@ public class PdsPersonInfoUtils { return blackLScore; } - //击中中风险项得分 + //鍑讳腑涓闄╅」寰楀垎 public static Integer middleRiskItemScore(Borrower borr){ int score = PdsConstants.MIDDLE_BORR_BLACK_HIT; int middSta = middleRiskStatus(borr); @@ -262,7 +262,7 @@ public class PdsPersonInfoUtils { return score; } - //低风险项 + //浣庨闄╅」 public static Integer lowRiskStatus(Borrower borr){ BasicDBList defendantJudicialList = borr.getDefendantJudicialList(); int defendantJudicialSta = 0; @@ -292,7 +292,7 @@ public class PdsPersonInfoUtils { } } - //高风险击中情况 + //楂橀闄╁嚮涓儏鍐� public static Integer highRiskStatus(Borrower borr){ BasicDBList blackL = borr.getBlackList(); int blackLSta = 1; @@ -315,27 +315,27 @@ public class PdsPersonInfoUtils { } if(borr.getCompareResult()!=null&&borr.getCompareResult()==1&&blackLSta==1&&loseCreditJudicialLStatus ==1){ - return 1; //未击中 + return 1; //鏈嚮涓� }else if((borr.getCompareResult()!=null&&borr.getCompareResult()==2)||blackLSta==2&&loseCreditJudicialLStatus==2){ - return 2; //击中 + return 2; //鍑讳腑 }else{ - return 3; //其他 + return 3; //鍏朵粬 } } - //中风险击中情况 + //涓闄╁嚮涓儏鍐� public static Integer middleRiskStatus(Borrower borr){ BasicDBList blackL = borr.getBlackList(); Integer blackSta = 0; if(blackStatus(blackL)){ - blackSta = 0;//属于高风险 + blackSta = 0;//灞炰簬楂橀闄� }else{ if(blackL==null){ - blackSta = 3;//其他 + blackSta = 3;//鍏朵粬 }else if(blackL.size()>0){ - blackSta = 2;//击中 + blackSta = 2;//鍑讳腑 }else{ - blackSta = 1;//未击中 + blackSta = 1;//鏈嚮涓� } } @@ -360,57 +360,57 @@ public class PdsPersonInfoUtils { } - //非风险项目得分 + //闈為闄╅」鐩緱鍒� public static Integer noRiskItemScore(Borrower borr){ int noRiskScore = PdsConstants.TELE_NO_GET; BasicDBObject phoneOnlineTimes = borr.getPhoneOnlineTimes(); if(phoneOnlineTimes!=null){ String type = (String)phoneOnlineTimes.get("type"); - if("中国移动".equals(type)){ + if("涓浗绉诲姩".equals(type)){ String time = (String)phoneOnlineTimes.get("inTimesDesc"); - if("0-3个月".equals(time)){ + if("0-3涓湀".equals(time)){ noRiskScore = PdsConstants.TELE_LESS_THREE; - }else if("3-6个月".equals(time)){ + }else if("3-6涓湀".equals(time)){ noRiskScore = PdsConstants.TELE_LARGE_THREE_LESS_SIX; - }else if("6-12个月".equals(time)){ + }else if("6-12涓湀".equals(time)){ noRiskScore = PdsConstants.TELE_LARGE_SIX_LESS_ONETWO; - }else if("12-24个月".equals(time)){ + }else if("12-24涓湀".equals(time)){ noRiskScore = PdsConstants.TELE_LARGE_ONETWO_LESS_TWOFOUR; - }else if("24月以上".equals(time)){ + }else if("24鏈堜互涓�".equals(time)){ noRiskScore = PdsConstants.TELE_LARGE_TWOFOUR; }else{ noRiskScore = PdsConstants.TELE_NO_GET; } - }else if("中国联通".equals(type)){ + }else if("涓浗鑱旈��".equals(type)){ String time = (String)phoneOnlineTimes.get("inTimesDesc"); - if("0-1个月".equals(time)){ + if("0-1涓湀".equals(time)){ noRiskScore = PdsConstants.UNICOM_LESS_ONE; - }else if("1-3个月".equals(time)){ + }else if("1-3涓湀".equals(time)){ noRiskScore = PdsConstants.UNICOM_LARGE_ONE_LESS_THREE; - }else if("3-6个月".equals(time)){ + }else if("3-6涓湀".equals(time)){ noRiskScore = PdsConstants.UNICOM_LARGE_THREE_LESS_SIX; - }else if("6-12个月".equals(time)){ + }else if("6-12涓湀".equals(time)){ noRiskScore = PdsConstants.UNICOM_LARGE_SIX_LESS_ONETWO; - }else if("12-24个月".equals(time)){ + }else if("12-24涓湀".equals(time)){ noRiskScore = PdsConstants.UNICOM_LARGE_ONETWO_LESS_TWOFOUR; - }else if("24-36个月".equals(time)){ + }else if("24-36涓湀".equals(time)){ noRiskScore = PdsConstants.UNICOM_LARGE_TWOFOUR_LESS_THREESIX; - }else if("36个月以上".equals(time)){ + }else if("36涓湀浠ヤ笂".equals(time)){ noRiskScore = PdsConstants.UNICOM_LARGE_THREESIX; }else{ noRiskScore = PdsConstants.UNICOM_NO_GET; } - }else if("中国电信".equals(type)){ + }else if("涓浗鐢典俊".equals(type)){ String time = (String)phoneOnlineTimes.get("inTimesDesc"); - if("0-6个月".equals(time)){ + if("0-6涓湀".equals(time)){ noRiskScore = PdsConstants.MOBILE_LESS_SXI; - }else if("6-12个月".equals(time)){ + }else if("6-12涓湀".equals(time)){ noRiskScore = PdsConstants.MOBILE_LARGE_SIX_LESS_ONETWO; - }else if("12-36个月".equals(time)){ + }else if("12-36涓湀".equals(time)){ noRiskScore = PdsConstants.MOBILE_LARGE_ONETWO_LESS_THREESIX; - }else if("36-60个月".equals(time)){ + }else if("36-60涓湀".equals(time)){ noRiskScore = PdsConstants.MOBILE_LARGE_THREESIX_LESS_SIXZERO; - }else if("60月以上".equals(time)){ + }else if("60鏈堜互涓�".equals(time)){ noRiskScore = PdsConstants.MOBILE_LARGE_SIXZERO; }else{ noRiskScore = PdsConstants.MOBILE_NO_GET; diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/AddressController.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/AddressController.java index c52394d8a..7c014b6bb 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/AddressController.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/AddressController.java @@ -14,7 +14,7 @@ import java.util.Map; /** * Created by luoxf on 2018/11/6. - * 地址评级 + * 鍦板潃璇勭骇 */ public class AddressController { @@ -49,18 +49,18 @@ public class AddressController { private boolean showFall(JsonModel jsonModel, AddressModel model) { if (StringUtils.isEmpty(model.getCityName())) { - jsonModel.setJsonModel(new ReponseData(201, "请输入城市")); + jsonModel.setJsonModel(new ReponseData(201, "璇疯緭鍏ュ煄甯�")); return false; } if (StringUtils.isEmpty(model.getKeyword())) { - jsonModel.setJsonModel(new ReponseData(201, "请输入地址")); + jsonModel.setJsonModel(new ReponseData(201, "璇疯緭鍏ュ湴鍧�")); return false; } return true; } /** - * 获取城市列表 + * 鑾峰彇鍩庡競鍒楄〃 * * @return */ diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/AlgorithmRuleController.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/AlgorithmRuleController.java index eafb3c6d5..4cc21bd7c 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/AlgorithmRuleController.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/AlgorithmRuleController.java @@ -70,7 +70,7 @@ public class AlgorithmRuleController { data.put("status", 0); if(StringUtils.isBlank(model.getRuleName()) || CollectionUtils.isEmpty(model.getCities()) || CollectionUtils.isEmpty(model.getValues())) { data.put("status", 1); - data.put("msg", "信息没有录入完整!"); + data.put("msg", "淇℃伅娌℃湁褰曞叆瀹屾暣锛�"); return ret; } @@ -87,7 +87,7 @@ public class AlgorithmRuleController { } }catch (Exception e) { data.put("status", 1); - data.put("msg", "请输入数字类型的分值!"); + data.put("msg", "璇疯緭鍏ユ暟瀛楃被鍨嬬殑鍒嗗�硷紒"); return ret; } diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/AutoController.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/AutoController.java index 1bf260fb4..d5684b820 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/AutoController.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/AutoController.java @@ -37,7 +37,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; /** - *自动完成 + *鑷姩瀹屾垚 */ public class AutoController { private final static Logger LOGGER = LoggerFactory.getLogger(EnterpriseController.class); @@ -84,7 +84,7 @@ public class AutoController { String city = model.getCityName(); String district = model.getSuggestRegion(); String keyword = model.getKeywords(); - //拆分地址,如果输入纯字母或数字组合,不进行拆分 + //鎷嗗垎鍦板潃锛屽鏋滆緭鍏ョ函瀛楁瘝鎴栨暟瀛楃粍鍚堬紝涓嶈繘琛屾媶鍒� Map resultMap = assetAutoService.assetAutoByKeyword(city, district, keyword, 20); JsonModel jsonModel = new JsonModel(); jsonModel.setJsonModel(resultMap); @@ -118,7 +118,7 @@ public class AutoController { } /** - * 输入的地址进行拆分 + * 杈撳叆鐨勫湴鍧�杩涜鎷嗗垎 * @param city * @param keyword * @return @@ -143,7 +143,7 @@ public class AutoController { } if(StringUtils.isBlank(city)) { - city = "全国"; + city = "鍏ㄥ浗"; } Map params = new HashMap(); @@ -259,12 +259,12 @@ public class AutoController { "exists", existsAvgPrice)); } else { jsonModel.setJsonModel(ImmutableMap.of("credit", credit)); - //对匹配的结局进行检测 + //瀵瑰尮閰嶇殑缁撳眬杩涜妫�娴� mmd = monitorMatchDistirct(credit, null, null, null, null, params,request); } if(StringUtils.isBlank(icon)){ if(mmd!=null&&StringUtils.isNotBlank(mmd.getEnterpriseId())){ - LOGGER.warn("企业为空来源:autoController"+mmd.getCity()+"========"+mmd.getRegion()+"============"+mmd.getAddress()); + LOGGER.warn("浼佷笟涓虹┖鏉ユ簮锛歛utoController"+mmd.getCity()+"========"+mmd.getRegion()+"============"+mmd.getAddress()); } houseInfoMonitorService.save(mmd); } @@ -279,7 +279,7 @@ public class AutoController { if(StringUtils.isBlank(cityName)) { result.put("valid", true); }else { - List citys = CityFactory.getInstance().matchCitiesByRegion(cityName, "县级市"); + List citys = CityFactory.getInstance().matchCitiesByRegion(cityName, "鍘跨骇甯�"); if(CollectionUtils.isNotEmpty(citys)) { result.put("valid", true); } else { @@ -319,7 +319,7 @@ public class AutoController { String userId = PdsSessionContent.getLoginUserId(request); User user = pdsUserService.getUser(userId); String cityParam = city; - if(StringUtils.isNotBlank(cityParam) && cityParam.endsWith("市")) { + if(StringUtils.isNotBlank(cityParam) && cityParam.endsWith("甯�")) { cityParam = cityParam.substring(0, cityParam.length()-1); } @@ -332,8 +332,8 @@ public class AutoController { citiesList.addAll(CityFactory.getInstance().matchCities(cityParam, true)); } if (CollectionUtils.isEmpty(citiesList)) { - //看是不是县级市 - citiesList.addAll(CityFactory.getInstance().matchCitiesByRegion(cityParam, "县级市")); + //鐪嬫槸涓嶆槸鍘跨骇甯� + citiesList.addAll(CityFactory.getInstance().matchCitiesByRegion(cityParam, "鍘跨骇甯�")); if (CollectionUtils.isNotEmpty(citiesList)) { result.put("isCityLevel", false); } @@ -386,7 +386,7 @@ public class AutoController { } JsonModel jsonModel = new JsonModel(); jsonModel.setJsonModel(ImmutableMap.of("support", isSupport)); - //押品评级监控 + //鎶煎搧璇勭骇鐩戞帶 monitorInfo(model.getInputName(), model.getCityName(), model.getSuggestRegion(), model.getKeywords(), userId, enterpriseId, isSupport); return jsonModel; } @@ -412,7 +412,7 @@ public class AutoController { } /** - * 判断是否存在均价 + * 鍒ゆ柇鏄惁瀛樺湪鍧囦环 * @param city * @param region * @param name @@ -437,7 +437,7 @@ public class AutoController { } /** - * 对匹配的结果进行检测 + * 瀵瑰尮閰嶇殑缁撴灉杩涜妫�娴� */ private HouseInfoMonitor monitorMatchDistirct(Double credit,Boolean exist,String matchCity,String matchRegion,String matchName,Map params,HttpServletRequest request ){ HouseInfoMonitor him = new HouseInfoMonitor(); diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/BkoffCollInfoController.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/BkoffCollInfoController.java index 191ffe9d8..53d9e9bd9 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/BkoffCollInfoController.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/BkoffCollInfoController.java @@ -40,13 +40,13 @@ import com.fangjia.service.pds.OnceCollateralEvaluationInfoService; import com.fangjia.service.pds.PdsUserService; /** - * PDS后台角色管理控制器 + * PDS鍚庡彴瑙掕壊绠$悊鎺у埗鍣� * @author yinjihuan * */ public class BkoffCollInfoController { private final static Logger LOGGER = LoggerFactory.getLogger(BkoffCollInfoController.class); - private static final String[] titles = {"用户名", "城市", "小区", "地址", "评分", "总价", "评估时间", "来源"}; + private static final String[] titles = {"鐢ㄦ埛鍚�", "鍩庡競", "灏忓尯", "鍦板潃", "璇勫垎", "鎬讳环", "璇勪及鏃堕棿", "鏉ユ簮"}; private OnceCollateralEvaluationInfoService onceCollateralEvaluationInfoService; private EquipmentInfoService equipmentInfoService; private EnterpriseService enterpriseService; @@ -67,7 +67,7 @@ public class BkoffCollInfoController { this.pdsUserService = pdsUserService; } /** - * 怕平列表页 + * 鎬曞钩鍒楄〃椤� * @param model * @return */ @@ -94,12 +94,12 @@ public class BkoffCollInfoController { String enterpriseId = onceColl.getEnterpriseId(); String userId = onceColl.getUserId(); try { - //企业信息 + //浼佷笟淇℃伅 if(StringUtils.isNotBlank(enterpriseId)){ Enterprise enterprise = enterpriseService.getEnterprise(enterpriseId); onceCollInfo.setEnterprise(enterprise); } - //user信息 + //user淇℃伅 if(StringUtils.isNotBlank(userId)){ User user = pdsUserService.getUser(userId); if(user!=null){ @@ -131,7 +131,7 @@ public class BkoffCollInfoController { } /** - * 导出数据 + * 瀵煎嚭鏁版嵁 * @param model * @param response * @return @@ -153,12 +153,12 @@ public class BkoffCollInfoController { String enterpriseId = onceColl.getEnterpriseId(); String userId = onceColl.getUserId(); try { - //企业信息 + //浼佷笟淇℃伅 if(StringUtils.isNotBlank(enterpriseId)){ Enterprise enterprise = enterpriseService.getEnterprise(enterpriseId); onceCollInfo.setEnterprise(enterprise); } - //user信息 + //user淇℃伅 if(StringUtils.isNotBlank(userId)){ User user = pdsUserService.getUser(userId); if(user!=null){ @@ -176,17 +176,17 @@ public class BkoffCollInfoController { } OutputStream os = null; BufferedOutputStream fos = null; - String fileName = "评估记录.xls"; + String fileName = "璇勪及璁板綍.xls"; Workbook wb = creatExcel(list, fileName); try { response.setCharacterEncoding("UTF-8"); response.setContentType("application/x-download;charset=UTF-8"); fileName = new String(fileName.getBytes("GBK"),"ISO-8859-1"); - if(fileName.length()>150){//解决IE 6.0 bug + if(fileName.length()>150){//瑙e喅IE 6.0 bug fileName = new String(fileName.getBytes("GBK"),"ISO-8859-1"); } response.setHeader( "Content-Disposition", "attachment;filename=" + fileName); - os = response.getOutputStream();// 取得输出流 + os = response.getOutputStream();// 鍙栧緱杈撳嚭娴� wb.write(os); os.flush(); @@ -208,7 +208,7 @@ public class BkoffCollInfoController { } /** - * 创建excel + * 鍒涘缓excel * @param datas * @return */ @@ -216,7 +216,7 @@ public class BkoffCollInfoController { HSSFWorkbook workbook = new HSSFWorkbook(); HSSFSheet sheet = workbook.createSheet(fileName); createHeader(sheet); - //"用户名", "城市", "小区", "地址", "评分", "总价", "评估时间", "来源" + //"鐢ㄦ埛鍚�", "鍩庡競", "灏忓尯", "鍦板潃", "璇勫垎", "鎬讳环", "璇勪及鏃堕棿", "鏉ユ簮" if(datas!=null&&datas.size()>0){ for(OnceCollInfo collInfo:datas){ String userName = collInfo.getUserName(); @@ -226,13 +226,13 @@ public class BkoffCollInfoController { double totalScore = collInfo.getOnceColl().getTotalScore(); int totalPrice = collInfo.getOnceColl().getTotalPrice(); String evalDate = DateUtil.formatByPattern(collInfo.getOnceColl().getCreatDate(), "yyyy-MM-dd HH:mm");; - String from = "业务评估"; + String from = "涓氬姟璇勪及"; if(StringUtils.isNotBlank(collInfo.getOnceColl().getFrom())){ if("eam".equals(collInfo.getOnceColl().getFrom())) { - from = "资产管理"; + from = "璧勪骇绠$悊"; } if("hk".equals(collInfo.getOnceColl().getFrom())) { - from = "客户申请"; + from = "瀹㈡埛鐢宠"; } } diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/BkoffEmployeeController.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/BkoffEmployeeController.java index b4a123a95..b6ac39ab7 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/BkoffEmployeeController.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/BkoffEmployeeController.java @@ -14,7 +14,7 @@ import com.fangjia.pds.model.EmployeeShowModel; import com.fangjia.pds.model.JsonResultModel; import com.fangjia.service.pds.PdsEmployeeService; /** - * 员工管理 + * 鍛樺伐绠$悊 * @author yinjihuan * */ @@ -57,7 +57,7 @@ public class BkoffEmployeeController { } else { Employee old = pdsEmployeeService.get(model.getId()); if (old == null) { - return new JsonResultModel(false, "要修改的员工不存在"); + return new JsonResultModel(false, "瑕佷慨鏀圭殑鍛樺伐涓嶅瓨鍦�"); } model.setCreateDate(old.getCreateDate()); model.setModifyDate(date); diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/BkoffEnterpriseController.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/BkoffEnterpriseController.java index 2da113395..b22012e50 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/BkoffEnterpriseController.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/BkoffEnterpriseController.java @@ -27,7 +27,7 @@ import com.fangjia.service.pds.ApiCallLimitService; import com.fangjia.service.pds.EnterpriseService; import com.fangjia.service.pds.PdsUserService; /** - * PDS后台管理企业控制器 + * PDS鍚庡彴绠$悊浼佷笟鎺у埗鍣� * @author yinjihuan * */ @@ -59,7 +59,7 @@ public class BkoffEnterpriseController { } /** - * 企业管理页面 + * 浼佷笟绠$悊椤甸潰 * @param model * @return */ @@ -79,9 +79,9 @@ public class BkoffEnterpriseController { int huoKeTotal = 0; int evaluatingTotal = 0; for(ApiCallLimit call:callLimitAList){ - if("hk/evaluate".equals(call.getUri())){ //营销货客 + if("hk/evaluate".equals(call.getUri())){ //钀ラ攢璐у huoKeTotal = call.getCount(); - }else if("evaluation/overView".equals(call.getUri())){ //我要评估 + }else if("evaluation/overView".equals(call.getUri())){ //鎴戣璇勪及 evaluatingTotal = call.getCount(); } } @@ -92,15 +92,15 @@ public class BkoffEnterpriseController { PageBean showPageBean = new PageBean(pageBean.getStart(), pageBean.getLimit(), showModelList, pageBean.getTotalRecords()); model.setPageBean(showPageBean); - request.getSession().setAttribute("pds_menu", "企业模块"); + request.getSession().setAttribute("pds_menu", "浼佷笟妯″潡"); } catch (Exception e) { - LOGGER.error("企业管理页面查询异常", e); + LOGGER.error("浼佷笟绠$悊椤甸潰鏌ヨ寮傚父", e); } return model; } /** - * 进入添加企业页面 + * 杩涘叆娣诲姞浼佷笟椤甸潰 * @param model * @return * @throws Exception @@ -120,7 +120,7 @@ public class BkoffEnterpriseController { } /** - * 进入充值页面 + * 杩涘叆鍏呭�奸〉闈� * @param model * @return * @throws Exception @@ -133,31 +133,31 @@ public class BkoffEnterpriseController { } List callLimitAList = apiCallLimitService.findAllCountByEid(model.getId()); for(ApiCallLimit call:callLimitAList){ - if("uploaddata".equals(call.getUri())){ //客户分类 + if("uploaddata".equals(call.getUri())){ //瀹㈡埛鍒嗙被 model.setCustomerTypeTotal(call.getCount()); model.setCustomerTypeSumTotal(call.getSumCount()); - }else if("demo/detail".equals(call.getUri())){ //客户评级 + }else if("demo/detail".equals(call.getUri())){ //瀹㈡埛璇勭骇 model.setCustomerLevelTotal(call.getCount()); model.setCustomerLevelSumTotal(call.getSumCount()); - }else if("zichan/saveevaluation".equals(call.getUri())){ //我的房产 + }else if("zichan/saveevaluation".equals(call.getUri())){ //鎴戠殑鎴夸骇 model.setMyHouseTotal(call.getCount()); model.setMyHouseSumTotal(call.getSumCount()); - }else if("prevaluation/saveevalinfo".equals(call.getUri())){ //贷前估值 + }else if("prevaluation/saveevalinfo".equals(call.getUri())){ //璐峰墠浼板�� model.setPrevaluationTotal(call.getCount()); model.setPrevaluationSumTotal(call.getSumCount()); - }else if("uploaddatabatch".equals(call.getUri())){ //批量评估 + }else if("uploaddatabatch".equals(call.getUri())){ //鎵归噺璇勪及 model.setEvaluationBatchTotal(call.getCount()); model.setEvaluationBatchSumTotal(call.getSumCount()); - }else if("hk/evaluate".equals(call.getUri())){ //营销货客 + }else if("hk/evaluate".equals(call.getUri())){ //钀ラ攢璐у model.setHuoKeTotal(call.getCount()); model.setHuoKeSumTotal(call.getSumCount()); - }else if("lenderquery".equals(call.getUri())){ //贷款人查询 + }else if("lenderquery".equals(call.getUri())){ //璐锋浜烘煡璇� model.setLenderQueryTotal(call.getCount()); model.setLenderQuerySumTotal(call.getSumCount()); - }else if("evaluation/overView".equals(call.getUri())){ //我要评估 + }else if("evaluation/overView".equals(call.getUri())){ //鎴戣璇勪及 model.setEvaluatingTotal(call.getCount()); model.setEvaluatingSumTotal(call.getSumCount()); - }else if("report/evaltution".equals(call.getUri())){ //评估报告 + }else if("report/evaltution".equals(call.getUri())){ //璇勪及鎶ュ憡 model.setReportListTotal(call.getCount()); model.setReportListSumTotal(call.getSumCount()); } @@ -183,17 +183,17 @@ public class BkoffEnterpriseController { } /** - * 保存充值信息 + * 淇濆瓨鍏呭�间俊鎭� * @param enterprise * @return */ public Object saveDetailAction(@Param(name = "uri")String uri, @Param(name = "count")String count,@Param(name = "eid")String eid, @Param(name = "rechargeWay")String rechargeWay,HttpServletRequest request) { try { - //判断充值类型有没有开通 + //鍒ゆ柇鍏呭�肩被鍨嬫湁娌℃湁寮�閫� boolean flag = apiCallLimitService.checkStatus(eid, uri); if(!flag){ - return new JsonResultModel(false, "该种类型还没有开通!"); + return new JsonResultModel(false, "璇ョ绫诲瀷杩樻病鏈夊紑閫�!"); } String userName = (String) request.getSession().getAttribute("login_name"); ApiCallLimitDetail apiCallLimitDetail = new ApiCallLimitDetail(); @@ -203,28 +203,28 @@ public class BkoffEnterpriseController { apiCallLimitDetail.setRechargeWay(Integer.parseInt(rechargeWay)); apiCallLimitDetail.setUserName(userName); apiCallLimitDetail.setCreateDate(new Date()); - //保存 + //淇濆瓨 apiCallLimitDetailService.saveDetail(apiCallLimitDetail); - //修改剩余次数 + //淇敼鍓╀綑娆℃暟 apiCallLimitService.recharge(eid, uri, Integer.parseInt(count)); } catch (Exception e) { - LOGGER.error("保存充值记录异常", e); + LOGGER.error("淇濆瓨鍏呭�艰褰曞紓甯�", e); return new JsonResultModel(false, e.getMessage()); } return new JsonResultModel(true); } /** - * 保存或者修改企业信息 + * 淇濆瓨鎴栬�呬慨鏀逛紒涓氫俊鎭� * @param enterprise * @return */ public Object saveOrUpdateAction(Enterprise enterprise) { try { - //保存 + //淇濆瓨 enterprise.setModifyDate(new Date()); - //结束时间为 当天的最后一秒 + //缁撴潫鏃堕棿涓� 褰撳ぉ鐨勬渶鍚庝竴绉� if(enterprise.getEndDateLimit() != null) { long endDateTimeMillis = enterprise.getEndDateLimit().getTime() + (1000*3600*24-1); enterprise.setEndDateLimit(new Date(endDateTimeMillis)); @@ -232,7 +232,7 @@ public class BkoffEnterpriseController { if (StringUtils.isBlank(enterprise.getId())) { if (enterpriseService.getEnterpriseByName(enterprise.getEnterpriseName()) != null) { - return new JsonResultModel(false, "该企业名称已经被注册"); + return new JsonResultModel(false, "璇ヤ紒涓氬悕绉板凡缁忚娉ㄥ唽"); } enterprise.setId(null); enterprise.setCreateDate(new Date()); @@ -240,11 +240,11 @@ public class BkoffEnterpriseController { } else { Enterprise old = enterpriseService.getEnterprise(enterprise.getId()); if (old == null) { - return new JsonResultModel(false, "修改的企业不存在"); + return new JsonResultModel(false, "淇敼鐨勪紒涓氫笉瀛樺湪"); } enterprise.setCreateDate(old.getCreateDate()); - //去掉空字符串的IP + //鍘绘帀绌哄瓧绗︿覆鐨処P List ips = new ArrayList(); if (enterprise.getWhiteIps() != null ) { for (String ip : enterprise.getWhiteIps()) { @@ -257,21 +257,21 @@ public class BkoffEnterpriseController { updateEnterpriseCitys(enterprise); - //企业名称有修改,需要修改企业下所有用户的企业名称 + //浼佷笟鍚嶇О鏈変慨鏀癸紝闇�瑕佷慨鏀逛紒涓氫笅鎵�鏈夌敤鎴风殑浼佷笟鍚嶇О if (!old.getEnterpriseName().equals(enterprise.getEnterpriseName())) { pdsUserService.updateUserEnterpriseName(enterprise.getId(), enterprise.getEnterpriseName()); } } } catch (Exception e) { - LOGGER.error("保存或者修改企业信息异常", e); + LOGGER.error("淇濆瓨鎴栬�呬慨鏀逛紒涓氫俊鎭紓甯�", e); return new JsonResultModel(false, e.getMessage()); } return new JsonResultModel(true); } /** - * 企业开通的城市减少,企业下用户的城市也要跟着减少,用户的城市必须在企业中存在 + * 浼佷笟寮�閫氱殑鍩庡競鍑忓皯锛屼紒涓氫笅鐢ㄦ埛鐨勫煄甯備篃瑕佽窡鐫�鍑忓皯锛岀敤鎴风殑鍩庡競蹇呴』鍦ㄤ紒涓氫腑瀛樺湪 * @param enterprise * @throws Exception */ diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/BkoffManualInquiryController.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/BkoffManualInquiryController.java index ba31e23b9..8e582bb81 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/BkoffManualInquiryController.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/BkoffManualInquiryController.java @@ -41,7 +41,7 @@ import com.fangjia.service.pds.PdsNoticeService; import com.google.common.collect.ImmutableMap; /** - * 人工询价 + * 浜哄伐璇环 * */ public class BkoffManualInquiryController { @@ -74,7 +74,7 @@ public class BkoffManualInquiryController { model.setReplyCount(manualInquiryService.countByStatus(1)); model.setNoReplyCount(manualInquiryService.countByStatus(0)); - //等回复 + //绛夊洖澶� PageBean ret = manualInquiryService.listForPage(0, model.getReplyBean().getCurrentPage(), 10); PageBean ret1 = manualInquiryService.listForPage(1, model.getReplyedBean().getCurrentPage(), 10); @@ -84,7 +84,7 @@ public class BkoffManualInquiryController { } /** - * 进入人工询价页面 + * 杩涘叆浜哄伐璇环椤甸潰 * @param model * @return * @throws Exception @@ -102,7 +102,7 @@ public class BkoffManualInquiryController { } /** - * 封装ManualInquiry信息 + * 灏佽ManualInquiry淇℃伅 * @param model * @param inquiry */ @@ -129,7 +129,7 @@ public class BkoffManualInquiryController { } /** - * 封装HouseInfo信息 + * 灏佽HouseInfo淇℃伅 * @param model * @param inquiry */ @@ -151,7 +151,7 @@ public class BkoffManualInquiryController { } /** - * 人工询价 可评估 + * 浜哄伐璇环 鍙瘎浼� * manualInquiryModel * @param houseInfoModels * @return @@ -161,7 +161,7 @@ public class BkoffManualInquiryController { String sid = manualInquiryModel.getSid(); String id = manualInquiryModel.getId(); String replyContent = manualInquiryModel.getReplyContent(); - //model转换,并保存数据 + //model杞崲锛屽苟淇濆瓨鏁版嵁 boolean needManual = false; Map data = new HashMap(); data.put("cityDisplay", CommonUtil.formatCity(manualInquiryModel.getCityName())); @@ -195,15 +195,15 @@ public class BkoffManualInquiryController { String userName = PdsSessionContent.getLoginBkoffUsername(request); if(StringUtils.isNotBlank(id)){ ManualInquiry inquiry = manualInquiryService.findById(id); - inquiry.setStatus(1); //已回价 + inquiry.setStatus(1); //宸插洖浠� inquiry.setReplyTime(new Date()); if(StringUtils.isNotBlank(replyContent)){ inquiry.setReplyContent(replyContent); } inquiry.setReplyUser(userName); - inquiry.setReplyType(1); //可评估 + inquiry.setReplyType(1); //鍙瘎浼� manualInquiryService.updateManualInquiry(inquiry); - //首页通知 + //棣栭〉閫氱煡 List houseInfos = houseInfoService.findBySid(inquiry.getSid()); HouseInfo houseInfo = null; if(null != houseInfos && houseInfos.size()>=1){ @@ -211,7 +211,7 @@ public class BkoffManualInquiryController { } PdsNotice notice = new PdsNotice(); notice.setType(1); - String content = "收到【"; + String content = "鏀跺埌銆�"; if(StringUtils.isNotBlank(houseInfo.getCityDisplay())){ content += houseInfo.getCityDisplay(); } @@ -222,7 +222,7 @@ public class BkoffManualInquiryController { if(houseInfo.getArea()!=0){ content += " "+houseInfo.getArea(); } - content += "】人工评估的回复"; + content += "銆戜汉宸ヨ瘎浼扮殑鍥炲"; notice.setContent(content); notice.setCreateDate(new Date()); notice.setEid(inquiry.getEid()); @@ -239,7 +239,7 @@ public class BkoffManualInquiryController { } /** - * 人工询价 修改 + * 浜哄伐璇环 淇敼 * manualInquiryModel * @param houseInfoModels * @return @@ -249,7 +249,7 @@ public class BkoffManualInquiryController { String sid = manualInquiryModel.getSid(); String id = manualInquiryModel.getId(); String replyContent = manualInquiryModel.getReplyContent(); - //model转换,并保存数据 + //model杞崲锛屽苟淇濆瓨鏁版嵁 boolean needManual = false; Map data = new HashMap(); data.put("cityDisplay", CommonUtil.formatCity(manualInquiryModel.getCityName())); @@ -290,7 +290,7 @@ public class BkoffManualInquiryController { } /** - * 人工询价 - 不可评估 + * 浜哄伐璇环 - 涓嶅彲璇勪及 * @param ManualInquiry * @throws Exception */ @@ -298,11 +298,11 @@ public class BkoffManualInquiryController { try { String userName = PdsSessionContent.getLoginBkoffUsername(request); ManualInquiry inquiry = manualInquiryService.findById(model.getId()); - inquiry.setStatus(1); //已回价 + inquiry.setStatus(1); //宸插洖浠� inquiry.setReplyTime(new Date()); inquiry.setReplyContent(model.getReplyContent()); inquiry.setReplyUser(userName); - inquiry.setReplyType(2); //不可评估 + inquiry.setReplyType(2); //涓嶅彲璇勪及 inquiry.setNoEvalReason(model.getNoEvalReason()); manualInquiryService.updateManualInquiry(inquiry); @@ -313,37 +313,37 @@ public class BkoffManualInquiryController { } PdsNotice notice = new PdsNotice(); notice.setType(1); - String content = "您的【"; + String content = "鎮ㄧ殑銆�"; if(StringUtils.isNotBlank(houseInfo.getCityDisplay())){ - content += "城市:"+houseInfo.getCityDisplay(); + content += "鍩庡競:"+houseInfo.getCityDisplay(); } if(StringUtils.isNotBlank(houseInfo.getOriDistrict())){ - content += "、小区名称:"+houseInfo.getOriDistrict(); + content += "銆佸皬鍖哄悕绉�:"+houseInfo.getOriDistrict(); } if(StringUtils.isNotBlank(houseInfo.getEstateType())){ - content += "、物业类型:"+houseInfo.getEstateType(); + content += "銆佺墿涓氱被鍨�:"+houseInfo.getEstateType(); } if(houseInfo.getArea()!=0){ - content += "、建筑面积:"+houseInfo.getArea(); + content += "銆佸缓绛戦潰绉�:"+houseInfo.getArea(); } if(StringUtils.isNotBlank(houseInfo.getHouseNumber())){ - content += "、楼栋:"+houseInfo.getHouseNumber(); + content += "銆佹ゼ鏍�:"+houseInfo.getHouseNumber(); } if(StringUtils.isNotBlank(houseInfo.getFitment())){ - content += "、装修:"+houseInfo.getFitment(); + content += "銆佽淇�:"+houseInfo.getFitment(); } if(StringUtils.isNotBlank(houseInfo.getDirection())){ - content += "、朝向:"+houseInfo.getDirection(); + content += "銆佹湞鍚�:"+houseInfo.getDirection(); } - content += "】无法评估,原因:"; + content += "銆戞棤娉曡瘎浼�,鍘熷洜:"; if(model.getNoEvalReason()==1){ - content += "小区不存在"; + content += "灏忓尯涓嶅瓨鍦�"; }else if(model.getNoEvalReason()==2){ - content += "无法获取价格"; + content += "鏃犳硶鑾峰彇浠锋牸"; }else if(model.getNoEvalReason()==3){ - content += "非住宅,不支持估价"; + content += "闈炰綇瀹咃紝涓嶆敮鎸佷及浠�"; } notice.setContent(content); notice.setCreateDate(new Date()); @@ -354,7 +354,7 @@ public class BkoffManualInquiryController { notice.setExt(ext);*/ pdsNoticeService.save(notice); } catch (Exception e) { - LOGGER.error("保存人工询价信息失败", e); + LOGGER.error("淇濆瓨浜哄伐璇环淇℃伅澶辫触", e); return new JsonResultModel(false, e.getMessage()); } return new JsonResultModel(true); @@ -452,14 +452,14 @@ public class BkoffManualInquiryController { return new JsonResultModel(true); } } - return new JsonResultModel(false, "输入信息不完整"); + return new JsonResultModel(false, "杈撳叆淇℃伅涓嶅畬鏁�"); } private void saveNotice(HouseInfo houseInfo, ManualInquiry inquiry){ PdsNotice notice = new PdsNotice(); notice.setType(2); - String content = "收到【"+houseInfo.getCityDisplay()+" "+houseInfo.getOriDistrict(); - content += " "+houseInfo.getArea()+"平】价格纠错的回复"; + String content = "鏀跺埌銆�"+houseInfo.getCityDisplay()+" "+houseInfo.getOriDistrict(); + content += " "+houseInfo.getArea()+"骞炽�戜环鏍肩籂閿欑殑鍥炲"; notice.setContent(content); notice.setCreateDate(new Date()); diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/BkoffPeopleInquiryController.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/BkoffPeopleInquiryController.java index c508e0fb9..bdeaf4774 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/BkoffPeopleInquiryController.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/BkoffPeopleInquiryController.java @@ -12,7 +12,7 @@ import com.fangjia.service.sms.SmsException; import com.fangjia.service.sms.SmsService; /** - * 人工询价管理 + * 浜哄伐璇环绠$悊 * @author yinjihuan * */ @@ -20,7 +20,7 @@ public class BkoffPeopleInquiryController { private PeopleInquiryService peopleInquiryService; /** - * 短信Service + * 鐭俊Service */ private SmsService smsService; @@ -38,7 +38,7 @@ public class BkoffPeopleInquiryController { } /** - * 回复价格 + * 鍥炲浠锋牸 * @param model * @param request * @return @@ -54,21 +54,21 @@ public class BkoffPeopleInquiryController { peopleInquiryService.save(inquiry); String content = null; if (model.getType() == 1) { - content = "您在PDS中申请的人工询价已回价,询价地址:" + inquiry.getAddress() + ",价格为:" + model.getReplyPrice(); + content = "鎮ㄥ湪PDS涓敵璇风殑浜哄伐璇环宸插洖浠凤紝璇环鍦板潃锛�" + inquiry.getAddress() + ",浠锋牸涓猴細" + model.getReplyPrice(); } else { content = model.getReplyContent(); } try { if (StringUtils.isNotBlank(content)) { - smsService.send(inquiry.getMobile(), content + " 【房价网】"); + smsService.send(inquiry.getMobile(), content + " 銆愭埧浠风綉銆�"); } } catch (SmsException e) { - return new JsonResultModel(false, "短信发送失败"); + return new JsonResultModel(false, "鐭俊鍙戦�佸け璐�"); } return new JsonResultModel(true); } } - return new JsonResultModel(false, "输入信息不完整"); + return new JsonResultModel(false, "杈撳叆淇℃伅涓嶅畬鏁�"); } } diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/BkoffRoleController.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/BkoffRoleController.java index 142c93a2a..d469f8c88 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/BkoffRoleController.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/BkoffRoleController.java @@ -21,7 +21,7 @@ import com.fangjia.service.pds.PdsRoleService; import org.sothis.web.mvc.annotation.Param; /** - * PDS后台角色管理控制器 + * PDS鍚庡彴瑙掕壊绠$悊鎺у埗鍣� * @author yinjihuan * */ @@ -58,13 +58,13 @@ public class BkoffRoleController { } /** - * 角色管理页面 + * 瑙掕壊绠$悊椤甸潰 * @param model * @return */ public Object indexAction(RoleModel model) { try { - //角色信息 + //瑙掕壊淇℃伅 PageBean pageBean = pdsRoleService.queryRolesByPage(model.getEnterpriseId(), model.getPageBean().getCurrentPage(), 10); List roles = pageBean.getList(); @@ -77,7 +77,7 @@ public class BkoffRoleController { } model.setPageBean(new PageBean(pageBean.getStart(), pageBean.getLimit(), list, pageBean.getTotalRecords())); - //设置权限信息 + //璁剧疆鏉冮檺淇℃伅 List groupInfos = new ArrayList(); List groups = pdsAuthorityGroupService.queryGroups(); for (AuthorityGroup group : groups) { @@ -88,31 +88,31 @@ public class BkoffRoleController { } model.setGroupInfos(groupInfos); } catch (Exception e) { - LOGGER.error("角色管理页面查询异常", e); + LOGGER.error("瑙掕壊绠$悊椤甸潰鏌ヨ寮傚父", e); } return model; } /** - * 查询企业下的角色信息 + * 鏌ヨ浼佷笟涓嬬殑瑙掕壊淇℃伅 * @param role * @return */ public Object queryRolesAction(Role role) { if (StringUtils.isBlank(role.getEnterpriseId())) { - return new JsonResultModel(false, "enterpriseId不能为空"); + return new JsonResultModel(false, "enterpriseId涓嶈兘涓虹┖"); } try { List roles = pdsRoleService.queryRoleByenterpriseId(role.getEnterpriseId()); return new JsonResultModel(true, roles); } catch (Exception e) { - LOGGER.error("查询企业下的角色信息异常", e); + LOGGER.error("鏌ヨ浼佷笟涓嬬殑瑙掕壊淇℃伅寮傚父", e); return new JsonResultModel(false, e.getMessage()); } } /** - * 保存角色 + * 淇濆瓨瑙掕壊 * @param role * @return */ @@ -120,24 +120,24 @@ public class BkoffRoleController { try { Enterprise enterprise = enterpriseService.getEnterprise(role.getEnterpriseId()); if (enterprise == null) { - return new JsonResultModel(false, "输入的企业编号错误"); + return new JsonResultModel(false, "杈撳叆鐨勪紒涓氱紪鍙烽敊璇�"); } } catch (Exception e) { - return new JsonResultModel(false, "输入的企业编号错误"); + return new JsonResultModel(false, "杈撳叆鐨勪紒涓氱紪鍙烽敊璇�"); } try { role.setCreateDate(new Date()); pdsRoleService.saveRole(role); } catch (Exception e) { - LOGGER.error("保存角色异常", e); + LOGGER.error("淇濆瓨瑙掕壊寮傚父", e); return new JsonResultModel(false, e.getMessage()); } return new JsonResultModel(true); } /** - * 修改角色 + * 淇敼瑙掕壊 * @param role * @return */ @@ -145,28 +145,28 @@ public class BkoffRoleController { try { Enterprise enterprise = enterpriseService.getEnterprise(role.getEnterpriseId()); if (enterprise == null) { - return new JsonResultModel(false, "输入的企业编号错误"); + return new JsonResultModel(false, "杈撳叆鐨勪紒涓氱紪鍙烽敊璇�"); } } catch (Exception e) { - return new JsonResultModel(false, "输入的企业编号错误"); + return new JsonResultModel(false, "杈撳叆鐨勪紒涓氱紪鍙烽敊璇�"); } try { Role old = pdsRoleService.getRole(role.getId()); if (old == null) { - return new JsonResultModel(false, "要修改的角色不存在"); + return new JsonResultModel(false, "瑕佷慨鏀圭殑瑙掕壊涓嶅瓨鍦�"); } role.setCreateDate(old.getCreateDate()); pdsRoleService.updateRole(role); } catch (Exception e) { - LOGGER.error("修改角色异常", e); + LOGGER.error("淇敼瑙掕壊寮傚父", e); return new JsonResultModel(false, e.getMessage()); } return new JsonResultModel(true); } /** - * 查询角色下的权限 + * 鏌ヨ瑙掕壊涓嬬殑鏉冮檺 * @param role * @return */ @@ -174,11 +174,11 @@ public class BkoffRoleController { try { Role old = pdsRoleService.getRole(role.getId()); if (old == null) { - return new JsonResultModel(false, "角色不存在"); + return new JsonResultModel(false, "瑙掕壊涓嶅瓨鍦�"); } return new JsonResultModel(true, pdsAuthorityService.queryAuthoritys(old.getAuthoritys())); } catch (Exception e) { - LOGGER.error("查询角色下的权限异常", e); + LOGGER.error("鏌ヨ瑙掕壊涓嬬殑鏉冮檺寮傚父", e); return new JsonResultModel(false, e.getMessage()); } } diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/BkoffUserController.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/BkoffUserController.java index 38bc2595d..545583d02 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/BkoffUserController.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/BkoffUserController.java @@ -24,7 +24,7 @@ import com.fangjia.service.pds.PdsEmployeeService; import com.fangjia.service.pds.PdsRoleService; import com.fangjia.service.pds.PdsUserService; /** - * PDS后台用户管理控制器 + * PDS鍚庡彴鐢ㄦ埛绠$悊鎺у埗鍣� * @author yinjihuan * */ @@ -55,7 +55,7 @@ public class BkoffUserController { } /** - * 进入登录页面 + * 杩涘叆鐧诲綍椤甸潰 * @return */ public Object loginAction() { @@ -63,16 +63,16 @@ public class BkoffUserController { } /** - * 用户登录后台 + * 鐢ㄦ埛鐧诲綍鍚庡彴 * @param user * @return */ public Object userLoginAction(User user, HttpServletRequest request) { if (StringUtils.isBlank(user.getName())) { - return new JsonResultModel(false, "用户名不能为空"); + return new JsonResultModel(false, "鐢ㄦ埛鍚嶄笉鑳戒负绌�"); } if (StringUtils.isBlank(user.getPass())) { - return new JsonResultModel(false, "用户名不能为空"); + return new JsonResultModel(false, "鐢ㄦ埛鍚嶄笉鑳戒负绌�"); } Employee employee = pdsEmployeeService.login(user.getName(), user.getPass()); if (employee != null) { @@ -83,11 +83,11 @@ public class BkoffUserController { request.getSession().setAttribute("login_name", employee.getName()); return new JsonResultModel(true); } - return new JsonResultModel(false, "用户名密码错误"); + return new JsonResultModel(false, "鐢ㄦ埛鍚嶅瘑鐮侀敊璇�"); } /** - * 用户管理页面 + * 鐢ㄦ埛绠$悊椤甸潰 * @param model * @return */ @@ -108,13 +108,13 @@ public class BkoffUserController { } model.setPageBean(new PageBean(pageBean.getStart(), pageBean.getLimit(), list, pageBean.getTotalRecords())); } catch (Exception e) { - LOGGER.error("用户管理页面查询异常", e); + LOGGER.error("鐢ㄦ埛绠$悊椤甸潰鏌ヨ寮傚父", e); } return model; } /** - * 退出系统 + * 閫�鍑虹郴缁� * @param request * @param model * @return @@ -126,7 +126,7 @@ public class BkoffUserController { } /** - * 进入添加用户页面 + * 杩涘叆娣诲姞鐢ㄦ埛椤甸潰 * @param model * @return */ @@ -145,25 +145,25 @@ public class BkoffUserController { } } catch (Exception e) { - LOGGER.error("进入添加用户页面异常", e); + LOGGER.error("杩涘叆娣诲姞鐢ㄦ埛椤甸潰寮傚父", e); } return model; } /** - * 保存或者修改用户信息 + * 淇濆瓨鎴栬�呬慨鏀圭敤鎴蜂俊鎭� * @param enterprise * @return */ public Object saveOrUpdateAction(User user) { try { - //保存 + //淇濆瓨 user.setUpdateDate(new Date()); if (StringUtils.isBlank(user.getId())) { User mobileUser = pdsUserService.getUserByMobile(user.getMobile()); if (mobileUser != null) { - String msg = "手机号已在" + mobileUser.getEnterpriseName() + "使用"; + String msg = "鎵嬫満鍙峰凡鍦�" + mobileUser.getEnterpriseName() + "浣跨敤"; return new JsonResultModel(false, msg); } user.setId(null); @@ -173,7 +173,7 @@ public class BkoffUserController { } else { User old = pdsUserService.getUser(user.getId()); if (old == null) { - return new JsonResultModel(false, "修改的用户不存在"); + return new JsonResultModel(false, "淇敼鐨勭敤鎴蜂笉瀛樺湪"); } user.setCreateDate(old.getCreateDate()); user.setEnterpriseId(old.getEnterpriseId()); @@ -188,14 +188,14 @@ public class BkoffUserController { } } catch (Exception e) { - LOGGER.error("保存或者修改用户信息异常", e); + LOGGER.error("淇濆瓨鎴栬�呬慨鏀圭敤鎴蜂俊鎭紓甯�", e); return new JsonResultModel(false, e.getMessage()); } return new JsonResultModel(true); } /** - * 获取企业下的用户 + * 鑾峰彇浼佷笟涓嬬殑鐢ㄦ埛 * @param eid * @return */ diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/CollRateController.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/CollRateController.java index 494fdd93e..8edf311dc 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/CollRateController.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/CollRateController.java @@ -32,7 +32,7 @@ public class CollRateController { List colls = collRateService.findByUsage(enterpriseId,null); for (CollRate collRate : colls) { Double usageRate = collRate.getUsageRate(); - if(collRate.getUsage().equals("消费")){ + if(collRate.getUsage().equals("娑堣垂")){ if(ur!=null&&ur.getConsumeRate()!=null){ usageRate = ur.getConsumeRate(); } @@ -66,7 +66,7 @@ public class CollRateController { collRate.setScoreMin(model.getScoreMin()); collRate.setRate(model.getRate()); Double usageRate = 0d; - if(model.getUsage().equals("消费")){ + if(model.getUsage().equals("娑堣垂")){ usageRate = 0.6d; if(ur!=null){ usageRate = ur.getConsumeRate(); @@ -83,7 +83,7 @@ public class CollRateController { collRateService.saveColl(collRate); }catch(Exception e){ - return new JsonResultModel(false,"保存失败"); + return new JsonResultModel(false,"淇濆瓨澶辫触"); } return new JsonResultModel(true); } @@ -103,7 +103,7 @@ public class CollRateController { if(collR!=null){ collR.setUsage(model.getUsage()); Double usageRate = 0d; - if(model.getUsage().equals("消费")){ + if(model.getUsage().equals("娑堣垂")){ usageRate = 0.6d; if(ur!=null&&ur.getConsumeRate()!=null){ usageRate = ur.getConsumeRate(); diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/CustomerClassifyController.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/CustomerClassifyController.java index 00780b512..e15db2504 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/CustomerClassifyController.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/CustomerClassifyController.java @@ -43,12 +43,12 @@ import com.google.common.collect.Lists; import org.sothis.web.mvc.annotation.Param; /** - * 客户分类 + * 瀹㈡埛鍒嗙被 * @author Administrator * */ public class CustomerClassifyController { - private static final String[] titles = {"物业地址", "城市", "均价(元/㎡)", "资产等级", "当前城市排名", "当前城市资产排名指数"}; + private static final String[] titles = {"鐗╀笟鍦板潃", "鍩庡競", "鍧囦环(鍏�/銕�)", "璧勪骇绛夌骇", "褰撳墠鍩庡競鎺掑悕", "褰撳墠鍩庡競璧勪骇鎺掑悕鎸囨暟"}; private FileDataTotalityService fileDataTotalityService; @@ -70,7 +70,7 @@ public class CustomerClassifyController { } public Object classifyAction(CustomerClassifyModel model, HttpServletRequest request) { - //查询文件 + //鏌ヨ鏂囦欢 String userId = PdsSessionContent.getLoginUserId(request); List fileSort = new ArrayList(); fileSort.add(new SortParam("createDate", false)); @@ -85,7 +85,7 @@ public class CustomerClassifyController { } model.setFileMap(map); - //查询城市 + //鏌ヨ鍩庡競 List cityQuery = new ArrayList(); List cityList = new ArrayList(); if(StringUtils.isNotBlank(model.getFileId()) || list.size()>0){ @@ -143,7 +143,7 @@ public class CustomerClassifyController { } /** - * 地图数据查询 + * 鍦板浘鏁版嵁鏌ヨ * @param model * @return */ @@ -153,14 +153,14 @@ public class CustomerClassifyController { model.setCityName(null); List queryParams = convertToQueryParams(model); List list = fileDataDetailService.findAllFileDataDetail(queryParams); - //构建地图数据 + //鏋勫缓鍦板浘鏁版嵁 List mapModels = convertToMapModels(list); - //计算级别占比 + //璁$畻绾у埆鍗犳瘮 // Map levelRatioMap = buildLevelRatioMap(list, city); Map levelRatioMap = buildLevelRatioMap2(mapModels, city); - //计算每个城市的数据量 + //璁$畻姣忎釜鍩庡競鐨勬暟鎹噺 Map cityDataCountMap = buildCityDataCount(mapModels); - //查询默认城市 + //鏌ヨ榛樿鍩庡競 String defaultCity = null; /*try { User user = pdsUserService.getUser(userId); @@ -182,7 +182,7 @@ public class CustomerClassifyController { } /** - * 获取文件中的所有城市 + * 鑾峰彇鏂囦欢涓殑鎵�鏈夊煄甯� * @param list * @return */ @@ -197,7 +197,7 @@ public class CustomerClassifyController { } /** - * 修改地图的默认城市 + * 淇敼鍦板浘鐨勯粯璁ゅ煄甯� * @param city * @param isSet * @return @@ -225,7 +225,7 @@ public class CustomerClassifyController { /** - * 计算地图上每个城市中的数据量 + * 璁$畻鍦板浘涓婃瘡涓煄甯備腑鐨勬暟鎹噺 * @param mapModels * @return */ @@ -328,7 +328,7 @@ public class CustomerClassifyController { } /** - * 是否是有效的经纬度 + * 鏄惁鏄湁鏁堢殑缁忕含搴� * @param lat * @param lng * @return @@ -344,7 +344,7 @@ public class CustomerClassifyController { } /** - * 构建查询参数 + * 鏋勫缓鏌ヨ鍙傛暟 * @param model * @return */ @@ -371,7 +371,7 @@ public class CustomerClassifyController { return queryParams; } /** - * 导出数据 + * 瀵煎嚭鏁版嵁 * @param model * @param response * @return @@ -381,17 +381,17 @@ public class CustomerClassifyController { List list = fileDataDetailService.findAllFileDataDetail(queryParams); OutputStream os = null; BufferedOutputStream fos = null; - String fileName = "客户分类.xls"; + String fileName = "瀹㈡埛鍒嗙被.xls"; Workbook wb = creatExcel(list, fileName); try { response.setCharacterEncoding("UTF-8"); response.setContentType("application/x-download;charset=UTF-8"); fileName = new String(fileName.getBytes("GBK"),"ISO-8859-1"); - if(fileName.length()>150){//解决IE 6.0 bug + if(fileName.length()>150){//瑙e喅IE 6.0 bug fileName = new String(fileName.getBytes("GBK"),"ISO-8859-1"); } response.setHeader( "Content-Disposition", "attachment;filename=" + fileName); - os = response.getOutputStream();// 取得输出流 + os = response.getOutputStream();// 鍙栧緱杈撳嚭娴� wb.write(os); os.flush(); @@ -413,7 +413,7 @@ public class CustomerClassifyController { } /** - * 排序字段 + * 鎺掑簭瀛楁 * @param model * @return */ @@ -432,7 +432,7 @@ public class CustomerClassifyController { return sortParams; } /** - * 创建excel + * 鍒涘缓excel * @param datas * @return */ diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/CustomerClassifyDataBatchController.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/CustomerClassifyDataBatchController.java index d62bbbb84..93e3061e9 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/CustomerClassifyDataBatchController.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/CustomerClassifyDataBatchController.java @@ -15,7 +15,7 @@ import com.fangjia.service.pds.FileDataDetailBatchService; import com.fangjia.service.pds.FileDataTotalityBatchService; /** - * 客户分类数据-批量评估控制器 + * 瀹㈡埛鍒嗙被鏁版嵁-鎵归噺璇勪及鎺у埗鍣� * @author yinjihuan * */ @@ -42,7 +42,7 @@ public class CustomerClassifyDataBatchController { } /** - * 数据导入页面 + * 鏁版嵁瀵煎叆椤甸潰 * @param model * @return */ @@ -56,7 +56,7 @@ public class CustomerClassifyDataBatchController { } /** - * 查询文件的失败信息 + * 鏌ヨ鏂囦欢鐨勫け璐ヤ俊鎭� * @param model * @return */ diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/CustomerClassifyDataController.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/CustomerClassifyDataController.java index eb6a2b27e..93d086ca4 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/CustomerClassifyDataController.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/CustomerClassifyDataController.java @@ -11,7 +11,7 @@ import com.fangjia.service.pds.FileDataDetailService; import com.fangjia.service.pds.FileDataTotalityService; /** - * 客户分类数据控制器 + * 瀹㈡埛鍒嗙被鏁版嵁鎺у埗鍣� * @author yinjihuan * */ @@ -30,7 +30,7 @@ public class CustomerClassifyDataController { } /** - * 数据导入页面 + * 鏁版嵁瀵煎叆椤甸潰 * @param model * @return */ @@ -44,7 +44,7 @@ public class CustomerClassifyDataController { } /** - * 查询文件的失败信息 + * 鏌ヨ鏂囦欢鐨勫け璐ヤ俊鎭� * @param model * @return */ diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/DataImportController.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/DataImportController.java index 5dc619fda..5f9cab83d 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/DataImportController.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/DataImportController.java @@ -25,7 +25,7 @@ import com.fangjia.service.pds.UploadDataTotalityService; import com.fangjia.service.pds.UploadErrorDetailService; /** - * 数据导入 + * 鏁版嵁瀵煎叆 * @author gaojuan * */ @@ -40,7 +40,7 @@ public class DataImportController { return model; } - //获取最新上传记录 + //鑾峰彇鏈�鏂颁笂浼犺褰� public Object getNewUploadTotalInfoAction(UploadDataModel model, HttpServletRequest request){ String userId = PdsSessionContent.getLoginUserId(request); UploadDataTotality uploadDataTotality = uploadDataTotalityService.findLastUploadRows(userId); @@ -51,7 +51,7 @@ public class DataImportController { return jsonModel; } - //获取历史上传成功记录 + //鑾峰彇鍘嗗彶涓婁紶鎴愬姛璁板綍 public Object getUploadTotalInfoAction(UploadDataModel model, HttpServletRequest request) throws Exception{ String userId = PdsSessionContent.getLoginUserId(request); JsonModel jsonModel = new JsonModel(); @@ -84,7 +84,7 @@ public class DataImportController { return jsonModel; } - //获取上传失败的错误记录 + //鑾峰彇涓婁紶澶辫触鐨勯敊璇褰� public Object getUploadErrorInfoAction(UploadDataModel model, HttpServletRequest request){ String userId = PdsSessionContent.getLoginUserId(request); UploadDataTotality uploadDataTotality = uploadDataTotalityService.findLastUploadRows(userId); diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/DemoController.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/DemoController.java index 7ad199ede..9849a8f66 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/DemoController.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/DemoController.java @@ -108,7 +108,7 @@ public class DemoController { model.setCityName(city); model.setDetailAddress(detailAddress); houseLevelInfoService.save(hli); - //监控 + //鐩戞帶 monitorInfo(hli); return model; } diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/EnterpriseController.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/EnterpriseController.java index c5f98b989..18bfe630c 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/EnterpriseController.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/EnterpriseController.java @@ -31,7 +31,7 @@ import com.fangjia.service.pds.EnterpriseService; import com.fangjia.service.pds.PdsUserService; /** - * 企业控制器 + * 浼佷笟鎺у埗鍣� * @author yinjihuan * */ @@ -62,7 +62,7 @@ public class EnterpriseController { } /** - * 企业信息页面 + * 浼佷笟淇℃伅椤甸潰 * @return */ public Object infoAction(HttpServletRequest request, EnterpriseModel model) { @@ -72,34 +72,34 @@ public class EnterpriseController { model.setEnterpriseUserCount(pdsUserService.queryUserCountByEnterprise(enterpriseId)); List callLimitAList = apiCallLimitService.findAllCountByEid(enterpriseId); for(ApiCallLimit call:callLimitAList){ - if("uploaddata".equals(call.getUri())){ //客户分类 + if("uploaddata".equals(call.getUri())){ //瀹㈡埛鍒嗙被 model.setCustomerTypeTotal(call.getCount()); - }else if("demo/detail".equals(call.getUri())){ //客户评级 + }else if("demo/detail".equals(call.getUri())){ //瀹㈡埛璇勭骇 model.setCustomerLevelTotal(call.getCount()); - }else if("zichan/saveevaluation".equals(call.getUri())){ //我的房产 + }else if("zichan/saveevaluation".equals(call.getUri())){ //鎴戠殑鎴夸骇 model.setMyHouseTotal(call.getCount()); - }else if("prevaluation/saveevalinfo".equals(call.getUri())){ //贷前估值 + }else if("prevaluation/saveevalinfo".equals(call.getUri())){ //璐峰墠浼板�� model.setPrevaluationTotal(call.getCount()); - }else if("uploaddatabatch".equals(call.getUri())){ //批量评估 + }else if("uploaddatabatch".equals(call.getUri())){ //鎵归噺璇勪及 model.setEvaluationBatchTotal(call.getCount()); - }else if("hk/evaluate".equals(call.getUri())){ //营销货客 + }else if("hk/evaluate".equals(call.getUri())){ //钀ラ攢璐у model.setHuoKeTotal(call.getCount()); - }else if("lenderquery".equals(call.getUri())){ //贷款人查询 + }else if("lenderquery".equals(call.getUri())){ //璐锋浜烘煡璇� model.setLenderQueryTotal(call.getCount()); - }else if("evaluation/overView".equals(call.getUri())){ //我要评估 + }else if("evaluation/overView".equals(call.getUri())){ //鎴戣璇勪及 model.setEvaluatingTotal(call.getCount()); - }else if("report/evaltution".equals(call.getUri())){ //评估报告 + }else if("report/evaltution".equals(call.getUri())){ //璇勪及鎶ュ憡 model.setReportListTotal(call.getCount()); } } } catch (Exception e) { - LOGGER.error("企业信息页面异常", e); + LOGGER.error("浼佷笟淇℃伅椤甸潰寮傚父", e); } return model; } /** - * 查看充值记录 + * 鏌ョ湅鍏呭�艰褰� * @return */ public JsonModel getRechargeDetailAction(HttpServletRequest request) { @@ -118,41 +118,41 @@ public class EnterpriseController { model.setCount(detail.getCount()); model.setRechargeTime(DateUtil.formatByPattern(detail.getCreateDate(), "yyyy/MM/dd HH:mm")); model.setRechargeType(getRechargeType(detail.getUri())); - model.setRechargeWay(detail.getRechargeWay()==1?"购买":"赠送"); + model.setRechargeWay(detail.getRechargeWay()==1?"璐拱":"璧犻��"); modelList.add(model); } JsonModel jsonModel = new JsonModel(); jsonModel.setJsonModel(modelList); return jsonModel; } catch (Exception e) { - LOGGER.error("企业信息页面异常", e); + LOGGER.error("浼佷笟淇℃伅椤甸潰寮傚父", e); } return null; } /** - * 获取充值类型 + * 鑾峰彇鍏呭�肩被鍨� * @return */ private String getRechargeType(String uri){ if("evaluation/overView".equals(uri)){ - return "我要评估"; + return "鎴戣璇勪及"; }else if("lenderquery".equals(uri)){ - return "贷款人查询"; + return "璐锋浜烘煡璇�"; }else if("hk/evaluate".equals(uri)){ - return "营销货客"; + return "钀ラ攢璐у"; }else if("demo/detail".equals(uri)){ - return "客户评级"; + return "瀹㈡埛璇勭骇"; }else if("uploaddata".equals(uri)){ - return "客户分类"; + return "瀹㈡埛鍒嗙被"; }else if("zichan/saveevaluation".equals(uri)){ - return "我的房产"; + return "鎴戠殑鎴夸骇"; }else if("prevaluation/saveevalinfo".equals(uri)){ - return "贷前估值"; + return "璐峰墠浼板��"; }else if("uploaddatabatch".equals(uri)){ - return "批量复估"; + return "鎵归噺澶嶄及"; }else if("report/evaltution".equals(uri)){ - return "评估报告"; + return "璇勪及鎶ュ憡"; } return null; } diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/EvaluationBatchController.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/EvaluationBatchController.java index 7774fd9bd..41ab4adf4 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/EvaluationBatchController.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/EvaluationBatchController.java @@ -35,12 +35,12 @@ import com.google.common.collect.Lists; /** - * 批量评估 + * 鎵归噺璇勪及 * @author Administrator * */ public class EvaluationBatchController { - private static final String[] titles = {"物业地址", "城市", "均价(元/㎡)", "资产等级", "当前城市排名", "当前城市资产排名指数"}; + private static final String[] titles = {"鐗╀笟鍦板潃", "鍩庡競", "鍧囦环(鍏�/銕�)", "璧勪骇绛夌骇", "褰撳墠鍩庡競鎺掑悕", "褰撳墠鍩庡競璧勪骇鎺掑悕鎸囨暟"}; private FileDataTotalityBatchService fileDataTotalityBatchService; @@ -68,7 +68,7 @@ public class EvaluationBatchController { } public Object indexAction(EvaluationBatchModel model, HttpServletRequest request) { - //查询文件 + //鏌ヨ鏂囦欢 String userId = PdsSessionContent.getLoginUserId(request); List fileSort = new ArrayList(); fileSort.add(new SortParam("createDate", false)); @@ -83,7 +83,7 @@ public class EvaluationBatchController { } model.setFileMap(map); - //查询城市 + //鏌ヨ鍩庡競 List cityQuery = new ArrayList(); List cityList = new ArrayList(); if(StringUtils.isNotBlank(model.getFileId()) || list.size()>0){ @@ -138,14 +138,14 @@ public class EvaluationBatchController { }else{ pager.setTotalRows(0); } - //封装汇总信息 + //灏佽姹囨�讳俊鎭� model.setFileDataDetailBatchList(batchList); return model; } /** - * 构建查询参数 + * 鏋勫缓鏌ヨ鍙傛暟 * @param model * @return */ @@ -162,7 +162,7 @@ public class EvaluationBatchController { queryParams.add(new QueryParam("region", model.getRegion())); } - //评估总价 + //璇勪及鎬讳环 if(StringUtils.isNotBlank(model.getMinTotalPrice())){ queryParams.add(new QueryParam("totalPrice", QueryParam.GREATER_THAN_EQUAL_OPERATOR, Integer.parseInt(model.getMinTotalPrice())*10000)); } @@ -170,7 +170,7 @@ public class EvaluationBatchController { queryParams.add(new QueryParam("totalPrice", QueryParam.LESS_THAN_EQUAL_OPERATOR, Integer.parseInt(model.getMaxTotalPrice())*10000)); } - //评估单价 + //璇勪及鍗曚环 if(StringUtils.isNotBlank(model.getMinPrice())){ queryParams.add(new QueryParam("price", QueryParam.GREATER_THAN_EQUAL_OPERATOR, Integer.parseInt(model.getMinPrice()))); } @@ -178,12 +178,12 @@ public class EvaluationBatchController { queryParams.add(new QueryParam("price", QueryParam.LESS_THAN_EQUAL_OPERATOR, Integer.parseInt(model.getMaxPrice()))); } - //物业类型 + //鐗╀笟绫诲瀷 if(StringUtils.isNotBlank(model.getEstateType())){ queryParams.add(new QueryParam("estateType", model.getEstateType())); } - //房龄 + //鎴块緞 if(StringUtils.isNotBlank(model.getMinHouseYear())){ queryParams.add(new QueryParam("houseYear", QueryParam.GREATER_THAN_EQUAL_OPERATOR, Integer.parseInt(model.getMinHouseYear()))); } @@ -191,7 +191,7 @@ public class EvaluationBatchController { queryParams.add(new QueryParam("houseYear", QueryParam.LESS_THAN_EQUAL_OPERATOR, Integer.parseInt(model.getMaxHouseYear()))); } - //面积 + //闈㈢Н if(StringUtils.isNotBlank(model.getMinArea())){ queryParams.add(new QueryParam("area", QueryParam.GREATER_THAN_EQUAL_OPERATOR, Double.parseDouble(model.getMinArea()))); } @@ -204,7 +204,7 @@ public class EvaluationBatchController { } /** - * 排序字段 + * 鎺掑簭瀛楁 * @param model * @return */ @@ -224,7 +224,7 @@ public class EvaluationBatchController { } /** - * 获取城市下的区域(ajax用) + * 鑾峰彇鍩庡競涓嬬殑鍖哄煙锛坅jax鐢級 */ public JsonModel getRegionsAction(@Param(name = "city")String city) { JsonModel jsonModel = new JsonModel(); @@ -241,7 +241,7 @@ public class EvaluationBatchController { } /** - * 封装汇总信息 + * 灏佽姹囨�讳俊鎭� */ private void wrapSumDetail(List detailList,EvaluationBatchModel model){ int totalNum = 0; @@ -273,11 +273,11 @@ public class EvaluationBatchController { } /** - * 加载城市数据 + * 鍔犺浇鍩庡競鏁版嵁 * @return */ public Object getMapDataAction(EvaluationBatchModel model, HttpServletRequest request) { - //查询文件 + //鏌ヨ鏂囦欢 String userId = PdsSessionContent.getLoginUserId(request); List fileParams = new ArrayList(); fileParams.add(new QueryParam("userId", userId)); @@ -287,7 +287,7 @@ public class EvaluationBatchController { list.add(fileData.getId()); } - //查询城市 + //鏌ヨ鍩庡競 List cityQuery = new ArrayList(); List cityList = new ArrayList(); if(StringUtils.isNotBlank(model.getFileId()) || list.size()>0){ @@ -309,10 +309,10 @@ public class EvaluationBatchController { } // model.setFileDataDetailBatchList(detailList); - //计算每个城市的数据量 + //璁$畻姣忎釜鍩庡競鐨勬暟鎹噺 Map cityDataCountMap = buildCityDataCount(detailList); - //封装汇总信息 + //灏佽姹囨�讳俊鎭� wrapSumDetail(detailList, model); Map aggr = convertToAggregate(model); @@ -342,7 +342,7 @@ public class EvaluationBatchController { } /** - * 过滤无经纬度的数据 + * 杩囨护鏃犵粡绾害鐨勬暟鎹� * @param detailList */ private void filterDetailList(List detailList) { @@ -359,7 +359,7 @@ public class EvaluationBatchController { } /** - * 计算每个城市的数量 + * 璁$畻姣忎釜鍩庡競鐨勬暟閲� * @param detailList * @return */ diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/EvaluationBeforeLoanController.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/EvaluationBeforeLoanController.java index bb5af823a..48635d7c5 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/EvaluationBeforeLoanController.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/EvaluationBeforeLoanController.java @@ -30,7 +30,7 @@ import com.fangjia.service.pds.SmartInputService; import com.mongodb.BasicDBObject; /** - * 贷前估值 + * 璐峰墠浼板�� */ public class EvaluationBeforeLoanController { @@ -58,11 +58,11 @@ public class EvaluationBeforeLoanController { } String enterpriseId = PdsSessionContent.getLoginEnterpriseId(request); EvaluationBeforeLoan eval = evaluationBeforeLoanService.get(model.getEid()); - //显示评估结果信息 + //鏄剧ず璇勪及缁撴灉淇℃伅 if (eval != null) { showDetailResult(model, eval, enterpriseId); } else { - //进行评估操作 + //杩涜璇勪及鎿嶄綔 SmartInput input = smartInputService.findById(model.getEid()); if (input == null) { return model.redirect("/index"); @@ -80,13 +80,13 @@ public class EvaluationBeforeLoanController { calendar.setTime(eval.getCreateDate()); model.setTopMonth(calendar.get(Calendar.MONTH)); - //设置各大门户小区均价 + //璁剧疆鍚勫ぇ闂ㄦ埛灏忓尯鍧囦环 ArrayList> siteDistrict = new ArrayList>(); List otherSiteInfo = getOtherSiteInfo(eval); siteDistrict.add(otherSiteInfo); model.setSitePrices(siteDistrict); - //正负因素设置 + //姝h礋鍥犵礌璁剧疆 Enterprise enterprise = null; try { enterprise = enterpriseService.getEnterprise(enterpriseId); @@ -119,20 +119,20 @@ public class EvaluationBeforeLoanController { if(colls==null||colls.size()<1){ return fs; } - ArrayList priceTrendHigh = new ArrayList();//押品价格指数 - ArrayList priceTrendLow = new ArrayList();//押品价格指数 - ArrayList totalPriceBLow = new ArrayList();//押品总价B - ArrayList totalPriceALow = new ArrayList();//押品总价A - ArrayList totalPriceHigh = new ArrayList();//押品总价 - ArrayList handleHigh = new ArrayList();//押品处置 - ArrayList handleLow = new ArrayList();//押品处置 - ArrayList quoteHigh = new ArrayList();//发布量 - ArrayList quoteLow = new ArrayList();//发布量 - ArrayList trafficHigh = new ArrayList();//交通 - ArrayList trafficLow = new ArrayList();//交通 - ArrayList agencyHigh = new ArrayList();//周边中介 - ArrayList agencyLow = new ArrayList();//周边中介 - ArrayList houseAge = new ArrayList();//房龄 + ArrayList priceTrendHigh = new ArrayList();//鎶煎搧浠锋牸鎸囨暟 + ArrayList priceTrendLow = new ArrayList();//鎶煎搧浠锋牸鎸囨暟 + ArrayList totalPriceBLow = new ArrayList();//鎶煎搧鎬讳环B + ArrayList totalPriceALow = new ArrayList();//鎶煎搧鎬讳环A + ArrayList totalPriceHigh = new ArrayList();//鎶煎搧鎬讳环 + ArrayList handleHigh = new ArrayList();//鎶煎搧澶勭疆 + ArrayList handleLow = new ArrayList();//鎶煎搧澶勭疆 + ArrayList quoteHigh = new ArrayList();//鍙戝竷閲� + ArrayList quoteLow = new ArrayList();//鍙戝竷閲� + ArrayList trafficHigh = new ArrayList();//浜ら�� + ArrayList trafficLow = new ArrayList();//浜ら�� + ArrayList agencyHigh = new ArrayList();//鍛ㄨ竟涓粙 + ArrayList agencyLow = new ArrayList();//鍛ㄨ竟涓粙 + ArrayList houseAge = new ArrayList();//鎴块緞 for (EvaluationBeforeLoan coll : colls) { if(coll.getPriceStability()!=null&&coll.getPriceStability()>75){ priceTrendHigh.add(coll.getName()); @@ -231,7 +231,7 @@ public class EvaluationBeforeLoanController { } /** - * 获取房产价格走势数据 + * 鑾峰彇鎴夸骇浠锋牸璧板娍鏁版嵁 * @param model * @return */ @@ -242,12 +242,12 @@ public class EvaluationBeforeLoanController { } int endDate = Integer.parseInt(DateUtil.formatToTightYYYYMMDD(eval.getCreateDate())); - int monthNum = 24; //2年 - if (model.getType() == 1) { //季度 + int monthNum = 24; //2骞� + if (model.getType() == 1) { //瀛e害 monthNum = 3; - } else if (model.getType() == 2) { //半年 + } else if (model.getType() == 2) { //鍗婂勾 monthNum = 6; - } else if (model.getType() == 3) { //1年 + } else if (model.getType() == 3) { //1骞� monthNum = 12; } int startDate = Integer.parseInt(DateUtil.formatToTightYYYYMMDD(DateUtil.getDateOfLastMonth(eval.getCreateDate(), -monthNum))); @@ -271,43 +271,43 @@ public class EvaluationBeforeLoanController { List sitePrices = new ArrayList(); BasicDBObject averageStatistics = eval.getAverageStatistics(); if(averageStatistics!=null){ - if(averageStatistics.containsKey("房天下")){ - Double div = MathUtils.formatDouble(MathUtils.div((double)(Integer)averageStatistics.get("房天下"),10000d)); - sitePrices.add(new SiteDistrictAvgPriceInfo("房天下", div)); + if(averageStatistics.containsKey("鎴垮ぉ涓�")){ + Double div = MathUtils.formatDouble(MathUtils.div((double)(Integer)averageStatistics.get("鎴垮ぉ涓�"),10000d)); + sitePrices.add(new SiteDistrictAvgPriceInfo("鎴垮ぉ涓�", div)); }else{ - sitePrices.add(new SiteDistrictAvgPriceInfo("房天下", 0d)); + sitePrices.add(new SiteDistrictAvgPriceInfo("鎴垮ぉ涓�", 0d)); } - if(averageStatistics.containsKey("安居客")){ - Double div = MathUtils.formatDouble(MathUtils.div((double)(Integer)averageStatistics.get("安居客"),10000d)); - sitePrices.add(new SiteDistrictAvgPriceInfo("安居客", div)); + if(averageStatistics.containsKey("瀹夊眳瀹�")){ + Double div = MathUtils.formatDouble(MathUtils.div((double)(Integer)averageStatistics.get("瀹夊眳瀹�"),10000d)); + sitePrices.add(new SiteDistrictAvgPriceInfo("瀹夊眳瀹�", div)); }else{ - sitePrices.add(new SiteDistrictAvgPriceInfo("安居客", 0d)); + sitePrices.add(new SiteDistrictAvgPriceInfo("瀹夊眳瀹�", 0d)); } - if(averageStatistics.containsKey("中原")){ - Double div = MathUtils.formatDouble(MathUtils.div((double)(Integer)averageStatistics.get("中原"),10000d)); - sitePrices.add(new SiteDistrictAvgPriceInfo("中原", div)); + if(averageStatistics.containsKey("涓師")){ + Double div = MathUtils.formatDouble(MathUtils.div((double)(Integer)averageStatistics.get("涓師"),10000d)); + sitePrices.add(new SiteDistrictAvgPriceInfo("涓師", div)); }else{ - sitePrices.add(new SiteDistrictAvgPriceInfo("中原", 0d)); + sitePrices.add(new SiteDistrictAvgPriceInfo("涓師", 0d)); } - if(averageStatistics.containsKey("链家")){ - Double div = MathUtils.formatDouble(MathUtils.div((double)(Integer)averageStatistics.get("链家"),10000d)); - sitePrices.add(new SiteDistrictAvgPriceInfo("链家", div)); + if(averageStatistics.containsKey("閾惧")){ + Double div = MathUtils.formatDouble(MathUtils.div((double)(Integer)averageStatistics.get("閾惧"),10000d)); + sitePrices.add(new SiteDistrictAvgPriceInfo("閾惧", div)); }else{ - sitePrices.add(new SiteDistrictAvgPriceInfo("链家", 0d)); + sitePrices.add(new SiteDistrictAvgPriceInfo("閾惧", 0d)); } - if(averageStatistics.containsKey("赶集")){ - Double div = MathUtils.formatDouble(MathUtils.div((double)(Integer)averageStatistics.get("赶集"),10000d)); - sitePrices.add(new SiteDistrictAvgPriceInfo("赶集", div)); + if(averageStatistics.containsKey("璧堕泦")){ + Double div = MathUtils.formatDouble(MathUtils.div((double)(Integer)averageStatistics.get("璧堕泦"),10000d)); + sitePrices.add(new SiteDistrictAvgPriceInfo("璧堕泦", div)); }else{ - sitePrices.add(new SiteDistrictAvgPriceInfo("赶集", 0d)); + sitePrices.add(new SiteDistrictAvgPriceInfo("璧堕泦", 0d)); } }else{ - sitePrices.add(new SiteDistrictAvgPriceInfo("房天下", 0d)); - sitePrices.add(new SiteDistrictAvgPriceInfo("安居客", 0d)); - sitePrices.add(new SiteDistrictAvgPriceInfo("中原", 0d)); - sitePrices.add(new SiteDistrictAvgPriceInfo("链家", 0d)); - sitePrices.add(new SiteDistrictAvgPriceInfo("赶集", 0d)); + sitePrices.add(new SiteDistrictAvgPriceInfo("鎴垮ぉ涓�", 0d)); + sitePrices.add(new SiteDistrictAvgPriceInfo("瀹夊眳瀹�", 0d)); + sitePrices.add(new SiteDistrictAvgPriceInfo("涓師", 0d)); + sitePrices.add(new SiteDistrictAvgPriceInfo("閾惧", 0d)); + sitePrices.add(new SiteDistrictAvgPriceInfo("璧堕泦", 0d)); } return sitePrices; } diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/EvaluationGeneralController.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/EvaluationGeneralController.java index a8a97acb0..ea888a57e 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/EvaluationGeneralController.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/EvaluationGeneralController.java @@ -63,7 +63,7 @@ import com.mongodb.BasicDBList; import com.mongodb.BasicDBObject; /** - * 贷前评估 + * 璐峰墠璇勪及 */ public class EvaluationGeneralController { private HouseInfoService houseInfoService; @@ -88,13 +88,13 @@ public class EvaluationGeneralController { private static final Logger logger = Logger.getLogger(EvaluationGeneralController.class); - //评估概况pds1.2 + //璇勪及姒傚喌pds1.2 public Object overViewAction(HttpServletRequest request, final EvaluationGeneralModel model) { if (model.getSid() == null || !ObjectId.isValid(model.getSid())) { return model.redirect("/index"); } if(model.getSid().equals(request.getSession().getAttribute(model.getSid()))){ - System.out.println("二次进入"); + System.out.println("浜屾杩涘叆"); while(model.getSid().equals(request.getSession().getAttribute(model.getSid()))){ try { Thread.sleep(1000); @@ -135,11 +135,11 @@ public class EvaluationGeneralController { } } } - //人物评分相关 + //浜虹墿璇勫垎鐩稿叧 List borrows = borrowerService.findBySid(model.getSid()); Borrower mainBorr = null; if(borrows!=null&&borrows.size()>0){ - //主贷人是否需要进行评估 + //涓昏捶浜烘槸鍚﹂渶瑕佽繘琛岃瘎浼� mainBorr = borrows.get(0); if(mainBorr!=null){ if(mainBorr.getCurrentNeedPerson()==null&&mainBorr.getPersonIsColl()==null){ @@ -150,7 +150,7 @@ public class EvaluationGeneralController { onceCollateralEvaluationInfoService.saveCollateralEvaluationInfo(onceCo); } } - if(mainBorr.getCurrentNeedPerson()!=null&&mainBorr.getCurrentNeedPerson()){//判断评估时候是否是关闭状态 + if(mainBorr.getCurrentNeedPerson()!=null&&mainBorr.getCurrentNeedPerson()){//鍒ゆ柇璇勪及鏃跺�欐槸鍚︽槸鍏抽棴鐘舵�� if(mainBorr.getCurrentLendQueryCount()==null||mainBorr.getCurrentLendQueryCount()){ model.setMainBorrower(mainBorr); model.setBorrower(mainBorr); @@ -171,11 +171,11 @@ public class EvaluationGeneralController { model.setMainBorrower(mainBorr); model.setBorrowers(borrows); }*/ - //判断是都需要将mainBorrower在页面上展示 + //鍒ゆ柇鏄兘闇�瑕佸皢mainBorrower鍦ㄩ〉闈笂灞曠ず } } - //获取房屋年限的上线 + //鑾峰彇鎴垮眿骞撮檺鐨勪笂绾� FactorStat factorStat = getFactorStat(colls,mainBorr,houseAgeLimit); model.setHouseAgeLimit(houseAgeLimit); model.setFactorStat(factorStat); @@ -183,7 +183,7 @@ public class EvaluationGeneralController { model.setCollateralEvaluationInfos(colls); }else { int limitCount = apiCallLimitService.getCount(enterpriseId, ApiCallLimitEnum.WO_YAO_PING_GU.getUri()); - // limitCount不能判断<1, 过滤器先减一了 + // limitCount涓嶈兘鍒ゆ柇<1, 杩囨护鍣ㄥ厛鍑忎竴浜� if (limitCount < 0) { return model.redirect("/index"); } @@ -203,9 +203,9 @@ public class EvaluationGeneralController { Double totalScore = 0.0; Double priceStability = 0.0; Double handleLevel = 0.0; - String usage = "经营"; + String usage = "缁忚惀"; int count = 0; - System.out.println(model.getSid()+"开始调用pdsController"); + System.out.println(model.getSid()+"寮�濮嬭皟鐢╬dsController"); for (HouseInfo houseInfo : houseInfos) { onceColl.setFrom(houseInfo.getFrom()); AlgorithmRule algorithmRule = algorithmRuleService.findAlgorithmRuleByCity(houseInfo.getCityDisplay()); @@ -227,7 +227,7 @@ public class EvaluationGeneralController { allInfo.setPurchaseDate(purchaseDate); } allInfo.setUsage(usage); - //设置最大抵押率 + //璁剧疆鏈�澶ф姷鎶肩巼 Double maxCollRate = collRateService.findByEnterpriseId(enterpriseId, usage, allInfo.getTotalScore()); if(maxCollRate!=null){ maxCollRate = MathUtils.formatDouble(maxCollRate); @@ -256,10 +256,10 @@ public class EvaluationGeneralController { onceColl.setCity(allInfo.getCity()); onceColl.setAddress(allInfo.getAddress()); onceColl.setName(allInfo.getDistrictName()); - //各大门户小区均价未显示3个及3个以上的次数监控 + //鍚勫ぇ闂ㄦ埛灏忓尯鍧囦环鏈樉绀�3涓強3涓互涓婄殑娆℃暟鐩戞帶 HouseInfoMonitor him = monitorMatchDistirct(houseInfo, allInfo, onceColl.getSid(), PdsSessionContent.getLoginUserId(request),enterpriseId); if(him!=null&&StringUtils.isNotBlank(him.getEnterpriseId())){ - logger.warn("企业为空来源:EvaluationGeneralController"+him.getCity()+"========"+him.getRegion()+"============"+him.getAddress()); + logger.warn("浼佷笟涓虹┖鏉ユ簮锛欵valuationGeneralController"+him.getCity()+"========"+him.getRegion()+"============"+him.getAddress()); } houseInfoMonitorService.save(him); } @@ -276,17 +276,17 @@ public class EvaluationGeneralController { onceColl.setHandleLevel(MathUtils.formatDouble(MathUtils.div(handleLevel, (double)(count)))); onceColl.setStatus(0); List deputyIdCodes = new ArrayList(); - logger.warn(model.getSid()+"调用结束pdsController"); + logger.warn(model.getSid()+"璋冪敤缁撴潫pdsController"); Borrower mainBorr = null; if (apiCallLimitService.checkStatus(enterpriseId, ApiCallLimitEnum.DAI_KUANG.getUri())) { - logger.warn(model.getSid()+"开始调用人物信息接口"); - //人物相关信息 调取接口等信息 + logger.warn(model.getSid()+"寮�濮嬭皟鐢ㄤ汉鐗╀俊鎭帴鍙�"); + //浜虹墿鐩稿叧淇℃伅 璋冨彇鎺ュ彛绛変俊鎭� borrowerColl(model, borrowers, deputyIdCodes, onceColl,enterprise); if(borrowers!=null&&borrowers.size()>0){ mainBorr = borrowers.get(0); } - //判断主贷款人是否能显示在页面上 + //鍒ゆ柇涓昏捶娆句汉鏄惁鑳芥樉绀哄湪椤甸潰涓� if(mainBorr!=null){ if(enterprise.getLenderQueryStatus()){ if(mainBorr.getCurrentLendQueryCount()==null||mainBorr.getCurrentLendQueryCount()){ @@ -300,7 +300,7 @@ public class EvaluationGeneralController { if (deputyIdCodes.size() > 0) { onceColl.setDeputyIdCodes(deputyIdCodes); } - //评估次数减1 + //璇勪及娆℃暟鍑�1 //updateUseTime(enterpriseId); onceColl.setEnterpriseId(enterpriseId); onceColl.setUserId(PdsSessionContent.getLoginUserId(request)); @@ -314,13 +314,13 @@ public class EvaluationGeneralController { isNeedColl = 1; } onceColl.setNeedAdvise(isNeedColl); - // 根据企业id去获取 - logger.warn(model.getSid()+"保存once"); + // 鏍规嵁浼佷笟id鍘昏幏鍙� + logger.warn(model.getSid()+"淇濆瓨once"); onceCollateralEvaluationInfoService.saveCollateralEvaluationInfo(onceColl); - logger.warn(model.getSid()+"保存结束once"); + logger.warn(model.getSid()+"淇濆瓨缁撴潫once"); model.setOnceCollateralEvaluationInfo(onceColl); model.setCollateralEvaluationInfos(colls); - //记录访问设备信息 + //璁板綍璁块棶璁惧淇℃伅 getEquipmentInfo(request,model.getSid()); FactorStat factorStat = getFactorStat(colls,mainBorr,houseAgeLimit); model.setFactorStat(factorStat); @@ -356,20 +356,20 @@ public class EvaluationGeneralController { for (final Borrower borrower : borrowers) { borrower.setCurrentNeedPerson(enterprise.getLenderQueryStatus()); int limitCount = apiCallLimitService.getCount(enterprise.getId(), ApiCallLimitEnum.DAI_KUANG.getUri()); - if(limitCount > 0){//判断企业是否还有对人物信息评估的次数 + if(limitCount > 0){//鍒ゆ柇浼佷笟鏄惁杩樻湁瀵逛汉鐗╀俊鎭瘎浼扮殑娆℃暟 borrower.setCurrentLendQueryCount(true); }else{ borrower.setCurrentLendQueryCount(false); } - if(borrower.getPersonIsColl()==null){//判断borr是不是已经评估了 + if(borrower.getPersonIsColl()==null){//鍒ゆ柇borr鏄笉鏄凡缁忚瘎浼颁簡 borrower.setPersonIsColl(1); - if(enterprise.getLenderQueryStatus()!=null&&enterprise.getLenderQueryStatus()){//判断公司是不是已经关闭了人物评估 - if(limitCount > 0){//判断是否还有评估次数 - if(limitCount > 0){//减少一次评估次数 + if(enterprise.getLenderQueryStatus()!=null&&enterprise.getLenderQueryStatus()){//鍒ゆ柇鍏徃鏄笉鏄凡缁忓叧闂簡浜虹墿璇勪及 + if(limitCount > 0){//鍒ゆ柇鏄惁杩樻湁璇勪及娆℃暟 + if(limitCount > 0){//鍑忓皯涓�娆¤瘎浼版鏁� apiCallLimitService.decrCount(enterprise.getId(), ApiCallLimitEnum.DAI_KUANG.getUri()); } - logger.warn(model.getSid()+"进方法了-----"); + logger.warn(model.getSid()+"杩涙柟娉曚簡-----"); ExecutorService fixedThreadPool = Executors.newFixedThreadPool(11); fixedThreadPool.submit(new Runnable() { public void run() { @@ -378,14 +378,14 @@ public class EvaluationGeneralController { }); fixedThreadPool.submit(new Runnable() { public void run() { - logger.warn(model.getSid()+"正在调用中-----"); + logger.warn(model.getSid()+"姝e湪璋冪敤涓�-----"); BasicDBList loseCreditJudicialList = talkingDataApiService.queryDishonest(borrower.getIdcode(), borrower.getName()); borrower.setLoseCreditJudicialList(loseCreditJudicialList); } }); fixedThreadPool.submit(new Runnable() { public void run() { - logger.warn(model.getSid()+"正在调用中-----"); + logger.warn(model.getSid()+"姝e湪璋冪敤涓�-----"); BasicDBList handle = talkingDataApiService.personExecuted(borrower.getIdcode()); borrower.setDefendantJudicialList(handle); } @@ -398,7 +398,7 @@ public class EvaluationGeneralController { }); fixedThreadPool.submit(new Runnable() { public void run() { - //查询手机号入网时长 + //鏌ヨ鎵嬫満鍙峰叆缃戞椂闀� BasicDBObject phoneOnlineTimes = talkingDataApiService.queryPhoneOnlineTimes(borrower.getPhoneNumber()); borrower.setPhoneOnlineTimes(phoneOnlineTimes); } @@ -435,7 +435,7 @@ public class EvaluationGeneralController { } catch (InterruptedException e) { e.printStackTrace(); } - logger.warn(model.getSid()+"调用人物信息接口结束"); + logger.warn(model.getSid()+"璋冪敤浜虹墿淇℃伅鎺ュ彛缁撴潫"); if (borrower.getIsMainBorrower() != null && borrower.getIsMainBorrower()) { onceColl.setMianIdCode(borrower.getId()); } else { @@ -450,7 +450,7 @@ public class EvaluationGeneralController { borrower.setCheatRisk(cheatRisk); } borrowerService.saveByid(borrower); - //人物相关的查询监控 + //浜虹墿鐩稿叧鐨勬煡璇㈢洃鎺� BorrowerInfoMonitor bim = getBorrowerMoniter(borrower,enterprise.getId()); borrowerInfoMonitorService.save(bim); } @@ -531,7 +531,7 @@ public class EvaluationGeneralController { } colls.add(collateralEvaluationInfo); } - //设置各大门户小区均价 + //璁剧疆鍚勫ぇ闂ㄦ埛灏忓尯鍧囦环 ArrayList> siteDistrict = new ArrayList>(); for (CollateralEvaluationInfo collateralEvaluationInfo : colls) { List otherSiteInfo = getOtherSiteInfo(collateralEvaluationInfo); @@ -566,8 +566,8 @@ public class EvaluationGeneralController { Map citySellStats = coll.getCitySellStats(); Map trendMap = new HashMap(); - trendMap.put("存量押品市值走势", districtSellStats); - trendMap.put("CPDB押品市值走势", citySellStats); + trendMap.put("瀛橀噺鎶煎搧甯傚�艰蛋鍔�", districtSellStats); + trendMap.put("CPDB鎶煎搧甯傚�艰蛋鍔�", citySellStats); json.setJsonModel(ImmutableMap.of("trend", trendMap)); return json; @@ -590,20 +590,20 @@ public class EvaluationGeneralController { if(colls==null||colls.size()<1){ return fs; } - ArrayList priceTrendHigh = new ArrayList();//押品价格指数 - ArrayList priceTrendLow = new ArrayList();//押品价格指数 - ArrayList totalPriceBLow = new ArrayList();//押品总价B - ArrayList totalPriceALow = new ArrayList();//押品总价A - ArrayList totalPriceHigh = new ArrayList();//押品总价 - ArrayList handleHigh = new ArrayList();//押品处置 - ArrayList handleLow = new ArrayList();//押品处置 - ArrayList quoteHigh = new ArrayList();//发布量 - ArrayList quoteLow = new ArrayList();//发布量 - ArrayList trafficHigh = new ArrayList();//交通 - ArrayList trafficLow = new ArrayList();//交通 - ArrayList agencyHigh = new ArrayList();//周边中介 - ArrayList agencyLow = new ArrayList();//周边中介 - ArrayList houseAge = new ArrayList();//房龄 + ArrayList priceTrendHigh = new ArrayList();//鎶煎搧浠锋牸鎸囨暟 + ArrayList priceTrendLow = new ArrayList();//鎶煎搧浠锋牸鎸囨暟 + ArrayList totalPriceBLow = new ArrayList();//鎶煎搧鎬讳环B + ArrayList totalPriceALow = new ArrayList();//鎶煎搧鎬讳环A + ArrayList totalPriceHigh = new ArrayList();//鎶煎搧鎬讳环 + ArrayList handleHigh = new ArrayList();//鎶煎搧澶勭疆 + ArrayList handleLow = new ArrayList();//鎶煎搧澶勭疆 + ArrayList quoteHigh = new ArrayList();//鍙戝竷閲� + ArrayList quoteLow = new ArrayList();//鍙戝竷閲� + ArrayList trafficHigh = new ArrayList();//浜ら�� + ArrayList trafficLow = new ArrayList();//浜ら�� + ArrayList agencyHigh = new ArrayList();//鍛ㄨ竟涓粙 + ArrayList agencyLow = new ArrayList();//鍛ㄨ竟涓粙 + ArrayList houseAge = new ArrayList();//鎴块緞 for (CollateralEvaluationInfo coll : colls) { if(coll.getPriceStability()!=null&&coll.getPriceStability()>75){ priceTrendHigh.add(coll.getDistrictName()); @@ -722,43 +722,43 @@ public class EvaluationGeneralController { List sitePrices = new ArrayList(); BasicDBObject averageStatistics = collateralEvaluationInfo.getAverageStatistics(); if(averageStatistics!=null){ - if(averageStatistics.containsKey("搜房")){ - Double div = MathUtils.formatDouble(MathUtils.div((double)(Integer)averageStatistics.get("搜房"),10000d)); - sitePrices.add(new SiteDistrictAvgPriceInfo("搜房", div)); + if(averageStatistics.containsKey("鎼滄埧")){ + Double div = MathUtils.formatDouble(MathUtils.div((double)(Integer)averageStatistics.get("鎼滄埧"),10000d)); + sitePrices.add(new SiteDistrictAvgPriceInfo("鎼滄埧", div)); }else{ - sitePrices.add(new SiteDistrictAvgPriceInfo("搜房", 0d)); + sitePrices.add(new SiteDistrictAvgPriceInfo("鎼滄埧", 0d)); } - if(averageStatistics.containsKey("安居客")){ - Double div = MathUtils.formatDouble(MathUtils.div((double)(Integer)averageStatistics.get("安居客"),10000d)); - sitePrices.add(new SiteDistrictAvgPriceInfo("安居客", div)); + if(averageStatistics.containsKey("瀹夊眳瀹�")){ + Double div = MathUtils.formatDouble(MathUtils.div((double)(Integer)averageStatistics.get("瀹夊眳瀹�"),10000d)); + sitePrices.add(new SiteDistrictAvgPriceInfo("瀹夊眳瀹�", div)); }else{ - sitePrices.add(new SiteDistrictAvgPriceInfo("安居客", 0d)); + sitePrices.add(new SiteDistrictAvgPriceInfo("瀹夊眳瀹�", 0d)); } - if(averageStatistics.containsKey("赶集")){ - Double div = MathUtils.formatDouble(MathUtils.div((double)(Integer)averageStatistics.get("赶集"),10000d)); - sitePrices.add(new SiteDistrictAvgPriceInfo("赶集", div)); + if(averageStatistics.containsKey("璧堕泦")){ + Double div = MathUtils.formatDouble(MathUtils.div((double)(Integer)averageStatistics.get("璧堕泦"),10000d)); + sitePrices.add(new SiteDistrictAvgPriceInfo("璧堕泦", div)); }else{ - sitePrices.add(new SiteDistrictAvgPriceInfo("赶集", 0d)); + sitePrices.add(new SiteDistrictAvgPriceInfo("璧堕泦", 0d)); } - if(averageStatistics.containsKey("链家")){ - Double div = MathUtils.formatDouble(MathUtils.div((double)(Integer)averageStatistics.get("链家"),10000d)); - sitePrices.add(new SiteDistrictAvgPriceInfo("链家", div)); + if(averageStatistics.containsKey("閾惧")){ + Double div = MathUtils.formatDouble(MathUtils.div((double)(Integer)averageStatistics.get("閾惧"),10000d)); + sitePrices.add(new SiteDistrictAvgPriceInfo("閾惧", div)); }else{ - sitePrices.add(new SiteDistrictAvgPriceInfo("链家", 0d)); + sitePrices.add(new SiteDistrictAvgPriceInfo("閾惧", 0d)); } - if(averageStatistics.containsKey("新浪")){ - Double div = MathUtils.formatDouble(MathUtils.div((double)(Integer)averageStatistics.get("新浪"),10000d)); - sitePrices.add(new SiteDistrictAvgPriceInfo("新浪", div)); + if(averageStatistics.containsKey("鏂版氮")){ + Double div = MathUtils.formatDouble(MathUtils.div((double)(Integer)averageStatistics.get("鏂版氮"),10000d)); + sitePrices.add(new SiteDistrictAvgPriceInfo("鏂版氮", div)); }else{ - sitePrices.add(new SiteDistrictAvgPriceInfo("新浪", 0d)); + sitePrices.add(new SiteDistrictAvgPriceInfo("鏂版氮", 0d)); } }else{ - sitePrices.add(new SiteDistrictAvgPriceInfo("搜房", 0d)); - sitePrices.add(new SiteDistrictAvgPriceInfo("安居客", 0d)); - sitePrices.add(new SiteDistrictAvgPriceInfo("赶集", 0d)); - sitePrices.add(new SiteDistrictAvgPriceInfo("链家", 0d)); - sitePrices.add(new SiteDistrictAvgPriceInfo("新浪", 0d)); + sitePrices.add(new SiteDistrictAvgPriceInfo("鎼滄埧", 0d)); + sitePrices.add(new SiteDistrictAvgPriceInfo("瀹夊眳瀹�", 0d)); + sitePrices.add(new SiteDistrictAvgPriceInfo("璧堕泦", 0d)); + sitePrices.add(new SiteDistrictAvgPriceInfo("閾惧", 0d)); + sitePrices.add(new SiteDistrictAvgPriceInfo("鏂版氮", 0d)); } return sitePrices; } diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/EvaluationHistoryController.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/EvaluationHistoryController.java index dd190de8a..26cf2a18d 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/EvaluationHistoryController.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/EvaluationHistoryController.java @@ -35,7 +35,7 @@ import com.fangjia.service.pds.PdsUserService; /** - * 评估历史 + * 璇勪及鍘嗗彶 * @author gaojuan * */ @@ -68,14 +68,14 @@ public class EvaluationHistoryController { public void setHouseInfoService(HouseInfoService houseInfoService) { this.houseInfoService = houseInfoService; } - //列表页 + //鍒楄〃椤� public Object listAction(CollateralEvaluationInfoModel model, HttpServletRequest request){ try { String userId = PdsSessionContent.getLoginUserId(request); List userIds = getHaveAuthorityUserIds(userId); String enterpriseId = PdsSessionContent.getLoginEnterpriseId(request); - //城市列表查询 + //鍩庡競鍒楄〃鏌ヨ List citys = onceCollateralEvaluationInfoService.findAllAuthorityCitys(userIds, enterpriseId); model.setCitys(citys); Date startDate = model.getStartDate(); @@ -116,14 +116,14 @@ public class EvaluationHistoryController { /*List collateralIds = info.getCollateralIds(); List addresses = getMortgageAddress(collateralIds); if(null != addresses){ - bo.setMortgageAddress(StringUtils.join(addresses, "、")); + bo.setMortgageAddress(StringUtils.join(addresses, "銆�")); }*/ - //查询人的信息 + //鏌ヨ浜虹殑淇℃伅 User user = pdsUserService.getUser(info.getUserId()); if(user!=null){ bo.setEvalPersonName(user.getName()); } - /*//房产信息 + /*//鎴夸骇淇℃伅 List collIds = info.getCollateralIds(); CollateralEvaluationInfo coll = getAddressList(collIds); if(coll!=null){ @@ -179,7 +179,7 @@ public class EvaluationHistoryController { } - //获取贷款人信息 + //鑾峰彇璐锋浜轰俊鎭� public JsonModel getAlllenderAction(CollateralEvaluationInfoModel model){ JsonModel jsonModel = new JsonModel(); Map data = new HashMap(); @@ -199,7 +199,7 @@ public class EvaluationHistoryController { return jsonModel; } - //获取押品房产 + //鑾峰彇鎶煎搧鎴夸骇 public JsonModel getAlllHouseAddressAction(CollateralEvaluationInfoModel model){ JsonModel jsonModel = new JsonModel(); Map data = new HashMap(); @@ -220,7 +220,7 @@ public class EvaluationHistoryController { return jsonModel; } - //添加房产到抵押库 + //娣诲姞鎴夸骇鍒版姷鎶煎簱 public Object doAddAction(CollateralEvaluationInfoModel model, HttpServletRequest request){ String userId = PdsSessionContent.getLoginUserId(request); String enterpriseId = PdsSessionContent.getLoginEnterpriseId(request); @@ -242,7 +242,7 @@ public class EvaluationHistoryController { detail.setEnterpriseId(enterpriseId); detail.setCreateDate(new Date()); detail.setRepaymentWay(model.getRepaymentWay()); - detail.setSource("贷前评估"); + detail.setSource("璐峰墠璇勪及"); mortgageDetailService.save(detail, PdsConstants.FANGJIA_API_TOKEN); if(StringUtils.isNotBlank(detail.getId())){ @@ -261,7 +261,7 @@ public class EvaluationHistoryController { model.redirect("/evaluationHistory/list"); return model; } - //获取共同贷款人 + //鑾峰彇鍏卞悓璐锋浜� private List getTogetherLenders(List deputyIdCodes){ if(null != deputyIdCodes){ List names = new ArrayList(); @@ -300,10 +300,10 @@ public class EvaluationHistoryController { if(null != collateralInfo){ String address = collateralInfo.getDistrictName(); if(StringUtils.isNotBlank(collateralInfo.getHouseNumber())){ - address += collateralInfo.getHouseNumber()+"号"; + address += collateralInfo.getHouseNumber()+"鍙�"; } if(StringUtils.isNotBlank(collateralInfo.getRoomNumber())){ - address += collateralInfo.getRoomNumber()+"室"; + address += collateralInfo.getRoomNumber()+"瀹�"; } return address; } diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/HkController.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/HkController.java index bf546f7a0..daf7a7099 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/HkController.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/HkController.java @@ -34,7 +34,7 @@ import java.util.HashMap; import java.util.Map; /** - * PDS 获客页面Controller + * PDS 鑾峰椤甸潰Controller */ public class HkController { @@ -52,7 +52,7 @@ public class HkController { private ApiCallLimitService apiCallLimitService; /** - * 获客类型选择页面 + * 鑾峰绫诲瀷閫夋嫨椤甸潰 * @param model * @param response * @return @@ -65,17 +65,17 @@ public class HkController { } if(enterprise == null){ - model.setMsg("无效的企业编码"); + model.setMsg("鏃犳晥鐨勪紒涓氱紪鐮�"); return model; } if((enterprise.getEnterpriseStatus() != null && !enterprise.getEnterpriseStatus()) || (enterprise.getHuoKeStatus() != null && !enterprise.getHuoKeStatus())){ - model.setMsg("账号已关闭"); + model.setMsg("璐﹀彿宸插叧闂�"); return model; } if(StringUtils.isBlank(model.getSource())){ - model.setSource("未知"); + model.setSource("鏈煡"); } CookieUtils.setCookie(CODE_LABEL, model.getCode(),"/", MAX_AGE, response); CookieUtils.setCookie(FROM_LABEL, URLEncoder.encode(model.getSource(), "UTF-8"),"/", MAX_AGE, response); @@ -83,7 +83,7 @@ public class HkController { } /** - * 获客城市选择页面 + * 鑾峰鍩庡競閫夋嫨椤甸潰 * @param model * @param response * @return @@ -110,7 +110,7 @@ public class HkController { } /** - *房屋信息录入页面 + *鎴垮眿淇℃伅褰曞叆椤甸潰 * @param model * @return */ @@ -133,7 +133,7 @@ public class HkController { } /** - * 估价页面 + * 浼颁环椤甸潰 * @param model * @param request * @return @@ -146,7 +146,7 @@ public class HkController { try { source = URLDecoder.decode(CookieUtils.getCookieValue(request, FROM_LABEL),"UTF-8"); } catch (UnsupportedEncodingException e) { - source = "未知"; + source = "鏈煡"; e.printStackTrace(); } if(StringUtil.hasBlank(model.getAddress(), model.getCityName(), model.getHouseOwner(), model.getHouseType(), enterpriseId, category) @@ -169,7 +169,7 @@ public class HkController { JSONObject resp = pdsApiProxyService.invoke(PdsAPIs.EVALUATION.getUri(), params); HouseInfoMonitor him = hkHouseInfoMonitor(model.getCityName(), model.getRegion(), model.getName(),model.getAddress(),enterpriseId); if(!existsAvgPrice(model.getCityName(), model.getRegion(), model.getName())){ - //监控匹配 + //鐩戞帶鍖归厤 him.setReason(2); houseInfoMonitorService.save(him); return model; @@ -209,13 +209,13 @@ public class HkController { houseInfo.setEstateType(loanApply.getHouseType()); houseInfo.setFrom("hk"); if("personal".equals(loanApply.getCategory())){ - houseInfo.setUsage("消费"); + houseInfo.setUsage("娑堣垂"); }else{ - houseInfo.setUsage("经营"); + houseInfo.setUsage("缁忚惀"); } houseInfoService.save(houseInfo.getSid(), Arrays.asList(houseInfo)); request.getSession(true).setAttribute(HK_LOAN_APPLY_SESSION_KEY, loanApply); - /*获客估价次数减一*/ + /*鑾峰浼颁环娆℃暟鍑忎竴*/ /* Enterprise enterprise = getEnterpriseFromCookie(request); if(enterprise.getHoukeCount() != null){ enterprise.setHoukeCount(enterprise.getHoukeCount() -1); @@ -244,7 +244,7 @@ public class HkController { } /** - * 贷款申请页面 + * 璐锋鐢宠椤甸潰 * @param model * @param request * @return @@ -261,7 +261,7 @@ public class HkController { } /** - * 贷款申请结果页面 + * 璐锋鐢宠缁撴灉椤甸潰 * @param model * @param request * @return @@ -278,9 +278,9 @@ public class HkController { sessionLoanApply.setCardId(loanApply.getCardId()); int genderNumber = Integer.valueOf(loanApply.getCardId().charAt(16) + ""); if(genderNumber % 2 == 0){ - sessionLoanApply.setGender("女"); + sessionLoanApply.setGender("濂�"); }else{ - sessionLoanApply.setGender("男"); + sessionLoanApply.setGender("鐢�"); } sessionLoanApply.setMobile(loanApply.getMobile()); @@ -317,7 +317,7 @@ public class HkController { } /** - * 判断是否存在均价 + * 鍒ゆ柇鏄惁瀛樺湪鍧囦环 * @param city * @param region * @param name diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/HomeController.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/HomeController.java index 6dd7da838..ed08a70f8 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/HomeController.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/HomeController.java @@ -65,15 +65,15 @@ public class HomeController { request.getSession().setAttribute("notice_msg", Message.PDS_EXPIRED); return model; } - //临近到期:<=30天 + //涓磋繎鍒版湡锛�<=30澶� if((endLimitDate.getTime()-now.getTime())/(1000*3600*24) <= 30) { - SimpleDateFormat sdf = new SimpleDateFormat("yyyy年MM月dd日"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy骞碝M鏈坉d鏃�"); model.setMsg(MessageFormat.format(Message.PDS_EXPIRING, sdf.format(endLimitDate))); request.getSession().setAttribute("notice_msg", MessageFormat.format(Message.PDS_EXPIRING, sdf.format(endLimitDate))); return model; } } - //评估总次数<=50 + //璇勪及鎬绘鏁�<=50 int limitCount = apiCallLimitService.getCount(enterprise.getId(), ApiCallLimitEnum.WO_YAO_PING_GU.getUri()); if(limitCount <= 50) { model.setMsg(MessageFormat.format(Message.INSUFFICIENT, limitCount)); diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/LoanManageController.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/LoanManageController.java index 4e91a4625..b24dcdcbd 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/LoanManageController.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/LoanManageController.java @@ -65,7 +65,7 @@ public class LoanManageController { data.put("success", Boolean.FALSE); json.setJsonModel(data); if(!ObjectId.isValid(model.getId())){ - data.put("msg", "更新失败"); + data.put("msg", "鏇存柊澶辫触"); return json; } String userId = PdsSessionContent.getLoginUserId(request); @@ -77,7 +77,7 @@ public class LoanManageController { loanApply.setOperator(user.getName()); loanApply.setOperatorId(user.getId()); loanApplyService.save(loanApply); - data.put("msg", "已处理成功"); + data.put("msg", "宸插鐞嗘垚鍔�"); data.put("success", Boolean.TRUE); data.put("finishDate", DateUtil.formatByPattern(loanApply.getFinishDate(), "yyyy.MM.dd HH:mm")); data.put("operator", loanApply.getOperator()); diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/ManagerController.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/ManagerController.java index 8bc10fc3c..17f3f5306 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/ManagerController.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/ManagerController.java @@ -29,7 +29,7 @@ import com.fangjia.service.pds.PdsLoanRateService; import com.fangjia.service.pds.RiskWarnService; /** - * PDS设置控制器 + * PDS璁剧疆鎺у埗鍣� * @author yinjihuan * */ @@ -55,7 +55,7 @@ public class ManagerController { } /** - * 参数设置(贷款利率设置) + * 鍙傛暟璁剧疆锛堣捶娆惧埄鐜囪缃級 * @param model * @return */ @@ -72,13 +72,13 @@ public class ManagerController { } model.setInfos(infos); } catch (Exception e) { - LOGGER.error("参数设置(贷款利率设置)异常", e); + LOGGER.error("鍙傛暟璁剧疆锛堣捶娆惧埄鐜囪缃級寮傚父", e); } return model; } /** - * 保存贷款利率 + * 淇濆瓨璐锋鍒╃巼 * @param loanRate * @param request * @return @@ -100,14 +100,14 @@ public class ManagerController { } } catch (Exception e) { - LOGGER.error("保存贷款利率异常", e); + LOGGER.error("淇濆瓨璐锋鍒╃巼寮傚父", e); return new JsonResultModel(false, e.getMessage()); } return new JsonResultModel(true); } /** - * 风险预警提醒查询 + * 椋庨櫓棰勮鎻愰啋鏌ヨ * @param model * @param request * @return @@ -118,13 +118,13 @@ public class ManagerController { List riskWarns = riskWarnService.queryRiskWarns(enterpriseId); model.setRiskWarns(riskWarns); } catch (Exception e) { - LOGGER.error("风险预警提醒查询异常", e); + LOGGER.error("椋庨櫓棰勮鎻愰啋鏌ヨ寮傚父", e); } return model; } /** - * 删除风险预警 + * 鍒犻櫎椋庨櫓棰勮 * @param riskWarn * @return */ @@ -133,14 +133,14 @@ public class ManagerController { String enterpriseId = PdsSessionContent.getLoginEnterpriseId(request); riskWarnService.remove(riskWarn.getId(), enterpriseId); } catch (Exception e) { - LOGGER.error("删除风险预警异常", e); + LOGGER.error("鍒犻櫎椋庨櫓棰勮寮傚父", e); return new JsonResultModel(false, e.getMessage()); } return new JsonResultModel(true); } /** - * 添加风险预警 + * 娣诲姞椋庨櫓棰勮 * @param riskWarn * @param request * @return @@ -156,7 +156,7 @@ public class ManagerController { for (String email : emails) { if (!email.trim().equals("")) { if (!CommonUtil.isEmail(email.trim())) { - return new JsonResultModel(false, email + "格式不正确"); + return new JsonResultModel(false, email + "鏍煎紡涓嶆纭�"); } newEmails.add(email.trim()); } @@ -164,13 +164,13 @@ public class ManagerController { riskWarn.setEmails(newEmails); riskWarnService.save(riskWarn); } catch (Exception e) { - LOGGER.error("添加风险预警异常", e); + LOGGER.error("娣诲姞椋庨櫓棰勮寮傚父", e); return new JsonResultModel(false, e.getMessage()); } return new JsonResultModel(true); } - //加载利率 + //鍔犺浇鍒╃巼 public JsonModel loadRatesAction(RiskWarn riskWarn, HttpServletRequest request) throws Exception { String enterpriseId = PdsSessionContent.getLoginEnterpriseId(request); List bankLoanRates = bankLoanRateService.queryBankLoans(); diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/ManualInquiryController.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/ManualInquiryController.java index 5c6333eee..5493c6130 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/ManualInquiryController.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/ManualInquiryController.java @@ -42,12 +42,12 @@ public class ManualInquiryController { public Object saveAction(ManualInquiry manualInquiry, HttpServletRequest request) throws Exception { try { - //已有 sid,type,evalPrice,myPrice + //宸叉湁 sid,type,evalPrice,myPrice String enterpriseId = PdsSessionContent.getLoginEnterpriseId(request); String uid = PdsSessionContent.getLoginUserId(request); - //得到企业信息以填充ManualInquiry + //寰楀埌浼佷笟淇℃伅浠ュ~鍏匨anualInquiry Enterprise enterprise = enterpriseService.getEnterprise(enterpriseId); - //得到用户信息以填充ManualInquiry + //寰楀埌鐢ㄦ埛淇℃伅浠ュ~鍏匨anualInquiry User user = pdsUserService.getUser(uid); manualInquiry.setEid(enterpriseId); @@ -61,7 +61,7 @@ public class ManualInquiryController { manualInquiry.setType(2); manualInquiryService.save(manualInquiry); } catch (Exception e) { - LOGGER.error("价格纠正保存异常", e); + LOGGER.error("浠锋牸绾犳淇濆瓨寮傚父", e); return new JsonResultModel(false, e.getMessage()); } return new JsonResultModel(true); diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/MobileController.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/MobileController.java index 4aef6e927..32d4c63e1 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/MobileController.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/MobileController.java @@ -3,14 +3,14 @@ package com.fangjia.pds.controllers; import com.fangjia.pds.model.BaseModel; /** - * PC页面上嵌入手机版页面 + * PC椤甸潰涓婂祵鍏ユ墜鏈虹増椤甸潰 * @author yinjihuan * */ public class MobileController { /** - * 我的房产页面 + * 鎴戠殑鎴夸骇椤甸潰 * @param model * @return */ @@ -19,7 +19,7 @@ public class MobileController { } /** - * 营销货客页面 + * 钀ラ攢璐у椤甸潰 * @param model * @return */ diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/MortgagesController.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/MortgagesController.java index 06fef0302..5162e63d0 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/MortgagesController.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/MortgagesController.java @@ -28,7 +28,7 @@ public class MortgagesController { * @return */ public Object indexAction(MortgagesModel model, HttpServletRequest request) { - LOG.debug("押品评估开始"); + LOG.debug("鎶煎搧璇勪及寮�濮�"); String userId = PdsSessionContent.getLoginUserId(request); Map> cities = getAllCities(userId); model.setCitiesMap(cities); @@ -36,7 +36,7 @@ public class MortgagesController { } /** - * 获取城市列表 + * 鑾峰彇鍩庡競鍒楄〃 * * @return */ @@ -45,7 +45,7 @@ public class MortgagesController { // } /** - * 获取城市列表 (带权限) + * 鑾峰彇鍩庡競鍒楄〃 锛堝甫鏉冮檺锛� * * @return */ diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/NoticeController.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/NoticeController.java index cce287bcb..0aa8da07f 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/NoticeController.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/NoticeController.java @@ -10,7 +10,7 @@ import com.fangjia.pds.model.NoticeModel; import com.fangjia.service.pds.PdsApiProxyService; /** - * 公告控制器 + * 鍏憡鎺у埗鍣� * @author yinjihuan * */ diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/PdsRiskMapController.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/PdsRiskMapController.java index 806904664..1d2d75672 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/PdsRiskMapController.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/PdsRiskMapController.java @@ -22,7 +22,7 @@ import com.fangjia.service.pds.PdsRiskMapService; import com.fangjia.service.pds.RiskWarnService; /** - * 风险预警 + * 椋庨櫓棰勮 * @author yinjihuan * */ @@ -48,27 +48,27 @@ public class PdsRiskMapController { } /** - * 发送预警邮件 + * 鍙戦�侀璀﹂偖浠� * @param model * @return */ public Object sendRiskEmailAction(RiskMapModel model) { if (model == null) { - return new JsonResultModel(false, "请填写参数"); + return new JsonResultModel(false, "璇峰~鍐欏弬鏁�"); } if (StringUtils.isBlank(model.getToken())) { - return new JsonResultModel(false, "Token不能为空"); + return new JsonResultModel(false, "Token涓嶈兘涓虹┖"); } if (StringUtils.isBlank(model.getCountDate())) { - return new JsonResultModel(false, "CountDate不能为空"); + return new JsonResultModel(false, "CountDate涓嶈兘涓虹┖"); } if (!model.getToken().toString().equals("5850cf09fe432a5effe58fcb")) { - return new JsonResultModel(false, "无操作权限"); + return new JsonResultModel(false, "鏃犳搷浣滄潈闄�"); } - LOGGER.info("开始发送预警邮件:" + model.getCountDate()); - //得到所有分析后的押品信息 + LOGGER.info("寮�濮嬪彂閫侀璀﹂偖浠�:" + model.getCountDate()); + //寰楀埌鎵�鏈夊垎鏋愬悗鐨勬娂鍝佷俊鎭� try { - //key:邮箱 value:押品编号集合 + //key:閭 value:鎶煎搧缂栧彿闆嗗悎 Map> riskMap = new HashMap>(); List risks = pdsRiskMapService.findAllByCountDate(model.getCountDate()); for (PdsRiskMap risk : risks) { @@ -76,7 +76,7 @@ public class PdsRiskMapController { } sendEmail(riskMap); } catch (Exception e) { - LOGGER.error("发送预警邮件异常", e); + LOGGER.error("鍙戦�侀璀﹂偖浠跺紓甯�", e); return new JsonResultModel(false, e.getMessage()); } return new JsonResultModel(true); @@ -89,9 +89,9 @@ public class PdsRiskMapController { List riskList = riskMap.get(email); for (String riskId : riskList) { PdsRiskMap risk = pdsRiskMapService.getPdsRiskMap(riskId); - emailStr.append("贷款人:" + risk.getName()); + emailStr.append("璐锋浜猴細" + risk.getName()); emailStr.append("
\n"); - emailStr.append("手机号:" + risk.getPhone()); + emailStr.append("鎵嬫満鍙凤細" + risk.getPhone()); emailStr.append("
\n"); StringBuilder name = new StringBuilder(); StringBuilder addr = new StringBuilder(); @@ -100,35 +100,35 @@ public class PdsRiskMapController { name.append(map.get("name") + ","); addr.append(map.get("addr") + ","); } - emailStr.append("押品房产:" + name.delete(name.length() -1, name.length())); + emailStr.append("鎶煎搧鎴夸骇锛�" + name.delete(name.length() -1, name.length())); emailStr.append("
\n"); - emailStr.append("房产地址:" + addr.delete(addr.length() -1, addr.length())); + emailStr.append("鎴夸骇鍦板潃锛�" + addr.delete(addr.length() -1, addr.length())); emailStr.append("
\n"); - emailStr.append("贷款金额:" + risk.getMortgagePrice()); + emailStr.append("璐锋閲戦锛�" + risk.getMortgagePrice()); emailStr.append("
\n"); - emailStr.append("放贷日期:" + DateUtil.formatToYYYYMMDD(risk.getMortgageDate())); + emailStr.append("鏀捐捶鏃ユ湡锛�" + DateUtil.formatToYYYYMMDD(risk.getMortgageDate())); emailStr.append("
\n"); - emailStr.append("贷款期限:" + risk.getMonths() + "个月"); + emailStr.append("璐锋鏈熼檺锛�" + risk.getMonths() + "涓湀"); emailStr.append("
\n"); - emailStr.append("贷款利率:" + risk.getRate() + "%"); + emailStr.append("璐锋鍒╃巼锛�" + risk.getRate() + "%"); emailStr.append("
\n"); - emailStr.append("还款方式:"); - emailStr.append(risk.getRepaymentWay() != null && risk.getRepaymentWay().equals(1) ? "等额本息" : "等额本金"); + emailStr.append("杩樻鏂瑰紡锛�"); + emailStr.append(risk.getRepaymentWay() != null && risk.getRepaymentWay().equals(1) ? "绛夐鏈伅" : "绛夐鏈噾"); emailStr.append("
\n"); - emailStr.append("放贷时估价:" + risk.getOriPrice()); + emailStr.append("鏀捐捶鏃朵及浠凤細" + risk.getOriPrice()); emailStr.append("
\n"); - emailStr.append("抵押率:" + risk.getMortgageRate() + "%"); + emailStr.append("鎶垫娂鐜囷細" + risk.getMortgageRate() + "%"); emailStr.append("
\n"); - emailStr.append("即时抵押率CLTV:" + risk.getCurMortgageRate() + "%("+DateUtil.formatToYYYYMMDD(risk.getCreateDate())+"更新)"); + emailStr.append("鍗虫椂鎶垫娂鐜嘋LTV锛�" + risk.getCurMortgageRate() + "%锛�"+DateUtil.formatToYYYYMMDD(risk.getCreateDate())+"鏇存柊锛�"); emailStr.append("
\n"); - emailStr.append("风险指数:" + risk.getRiskRate() + "("+DateUtil.formatToYYYYMMDD(risk.getCreateDate())+"更新)"); + emailStr.append("椋庨櫓鎸囨暟锛�" + risk.getRiskRate() + "锛�"+DateUtil.formatToYYYYMMDD(risk.getCreateDate())+"鏇存柊锛�"); emailStr.append("
\n"); emailStr.append("==============================================================
\n"); } LOGGER.info("send email to:" + email); LOGGER.info(emailStr.toString()); Mail mail = new Mail(); - mail.setSubject("PDS贷款风险指数监控"); + mail.setSubject("PDS璐锋椋庨櫓鎸囨暟鐩戞帶"); mail.setContent(emailStr.toString()); mail.setReceiver(new MailUser(email)); emailService.sendMail(mail); @@ -140,7 +140,7 @@ public class PdsRiskMapController { List riskWarns = riskWarnService.queryRiskWarns(risk.getEnterpriseId()); Double rate = risk.getRiskRate(); for (RiskWarn riskWarn : riskWarns) { - //大于指定风险指数存起来 + //澶т簬鎸囧畾椋庨櫓鎸囨暟瀛樿捣鏉� if (rate * 100 > riskWarn.getNumber()){ List emails = riskWarn.getEmails(); for (String email : emails) { diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/PreassessController.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/PreassessController.java index 2db550615..9b5fcc1bd 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/PreassessController.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/PreassessController.java @@ -59,23 +59,23 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; /** - * 贷前评估-填表 + * 璐峰墠璇勪及-濉〃 * Created by linxsh on 2016/12/6. */ public class PreassessController { private static final Logger logger = Logger.getLogger(PreassessController.class); - private static final List ESTATE_TYPE = ImmutableList.of("公寓", "独栋别墅", "双拼别墅", "联排别墅", "叠加别墅", "其它"); + private static final List ESTATE_TYPE = ImmutableList.of("鍏瘬", "鐙爧鍒", "鍙屾嫾鍒", "鑱旀帓鍒", "鍙犲姞鍒", "鍏跺畠"); private static final MessageFormat markdownTemplate = new MessageFormat( - "## 人工评估信息\n\n" + - "- sid:{0}\n- 联系电话:{1}\n" + - "- 联系人:{15}\n- 企业:{16}\n" + - "- 城市:{2}\n- 区域:{3}\n" + - "- 小区名称:{4}\n- 地址:{5}\n" + - "- 物业类型:{6}\n- 建筑面积:{7}\n" + - "- 楼栋:{8}\n- 单元:{9}\n" + - "- 室号:{10}\n- 楼层:{11}\n" + - "- 总楼层:{12}\n- 装修:{13}\n" + - "- 朝向:{14}"); + "## 浜哄伐璇勪及淇℃伅\n\n" + + "- sid锛歿0}\n- 鑱旂郴鐢佃瘽锛歿1}\n" + + "- 鑱旂郴浜猴細{15}\n- 浼佷笟锛歿16}\n" + + "- 鍩庡競锛歿2}\n- 鍖哄煙锛歿3}\n" + + "- 灏忓尯鍚嶇О锛歿4}\n- 鍦板潃锛歿5}\n" + + "- 鐗╀笟绫诲瀷锛歿6}\n- 寤虹瓚闈㈢Н锛歿7}\n" + + "- 妤兼爧锛歿8}\n- 鍗曞厓锛歿9}\n" + + "- 瀹ゅ彿锛歿10}\n- 妤煎眰锛歿11}\n" + + "- 鎬绘ゼ灞傦細{12}\n- 瑁呬慨锛歿13}\n" + + "- 鏈濆悜锛歿14}"); private HouseInfoService houseInfoService; private BorrowerService borrowerService; @@ -88,7 +88,7 @@ public class PreassessController { private PicUploadAndDownloadService picUploadAndDownloadService; /** - * 上传房产证件 + * 涓婁紶鎴夸骇璇佷欢 */ public Object uploadImgAction(HttpServletRequest request){ JsonModel json = new JsonModel(); @@ -122,7 +122,7 @@ public class PreassessController { } /** - * 打开押品房产信息页 + * 鎵撳紑鎶煎搧鎴夸骇淇℃伅椤� * @return */ public Object houseinfoAction(HttpServletRequest request, PreassessModel model) { @@ -163,7 +163,7 @@ public class PreassessController { /** - * 跳转到贷款人信息页 + * 璺宠浆鍒拌捶娆句汉淇℃伅椤� * @param model * @return */ @@ -198,7 +198,7 @@ public class PreassessController { } /** - * 点击“下一步”时保存押品房产信息 + * 鐐瑰嚮鈥滀笅涓�姝モ�濇椂淇濆瓨鎶煎搧鎴夸骇淇℃伅 * @param houseInfoModels * @return */ @@ -212,12 +212,12 @@ public class PreassessController { String userId = PdsSessionContent.getLoginUserId(request); String enterpriseId = PdsSessionContent.getLoginEnterpriseId(request); Enterprise enterprise = null; - //检验参数 + //妫�楠屽弬鏁� try { enterprise = enterpriseService.getEnterprise(enterpriseId); User user = pdsUserService.getUser(userId); validateHouseInfoParams(houseInfoModels, user); - //评估次数、开通城市等校验 + //璇勪及娆℃暟銆佸紑閫氬煄甯傜瓑鏍¢獙 validateAuthority(userId, enterprise); validateOpenCity(houseInfoModels, user.getCitys()); } catch (PdsException e) { @@ -229,7 +229,7 @@ public class PreassessController { result.setJsonModel(msg); return result; } - //model转换,并保存数据 + //model杞崲锛屽苟淇濆瓨鏁版嵁 List houseInfos = new ArrayList(); boolean needManual = false; for(HouseInfoModel houseInfoModel : houseInfoModels) { @@ -274,15 +274,15 @@ public class PreassessController { } for(HouseInfoModel houseInfoModel : houseInfoModels) { if(StringUtils.isBlank(houseInfoModel.getCityDisplay())) { -// throw new PdsException("“所在城市”不能为空", 2); +// throw new PdsException("鈥滄墍鍦ㄥ煄甯傗�濅笉鑳戒负绌�", 2); } else if(CollectionUtils.isEmpty(citys) || !citys.contains(houseInfoModel.getCityDisplay())) { - throw new PdsException("“所在城市["+houseInfoModel.getCityDisplay()+"]”尚未开通", 2); + throw new PdsException("鈥滄墍鍦ㄥ煄甯俒"+houseInfoModel.getCityDisplay()+"]鈥濆皻鏈紑閫�", 2); } } } /** - * 保存贷款人信息 + * 淇濆瓨璐锋浜轰俊鎭� * @param request * @param borrowerModels * @return @@ -292,7 +292,7 @@ public class PreassessController { String sid = request.getParameter("sid"); if(StringUtils.isBlank(sid)) { - Map msg = ImmutableMap.of("status", 1, "msg", "不能重复保存"); + Map msg = ImmutableMap.of("status", 1, "msg", "涓嶈兘閲嶅淇濆瓨"); result.setJsonModel(msg); return result; } @@ -300,10 +300,10 @@ public class PreassessController { String enterpriseId = PdsSessionContent.getLoginEnterpriseId(request); try { - //校验参数 + //鏍¢獙鍙傛暟 validateBorrowerInfoParams(borrowerModels); Enterprise enterprise = enterpriseService.getEnterprise(enterpriseId); - //评估次数、开通城市等校验 + //璇勪及娆℃暟銆佸紑閫氬煄甯傜瓑鏍¢獙 validateAuthority(userId, enterprise); } catch (PdsException e) { Map msg = ImmutableMap.of("status", 2, "msg", e.getMessage()); @@ -315,7 +315,7 @@ public class PreassessController { return result; } - //model转换,并保存数据 + //model杞崲锛屽苟淇濆瓨鏁版嵁 List borrowers = new ArrayList(); for(BorrowerModel borrowerModel : borrowerModels) { borrowerModel.setWorkCity(CommonUtil.formatCity(borrowerModel.getWorkCity())); @@ -336,21 +336,21 @@ public class PreassessController { } /** - * 保存联系人电话 + * 淇濆瓨鑱旂郴浜虹數璇� * @return * @throws Exception */ public Object saveContactNumberAction(PreassessModel model) throws Exception { JsonModel result = new JsonModel(); /*if(StringUtils.isBlank(model.getSid()) || StringUtils.isBlank(model.getPhone())) { - Map msg = ImmutableMap.of("status", 0, "msg", "保存失败,请重试"); + Map msg = ImmutableMap.of("status", 0, "msg", "淇濆瓨澶辫触锛岃閲嶈瘯"); result.setJsonModel(msg); return result; }*/ - //更新库里的字段 + //鏇存柊搴撻噷鐨勫瓧娈� List houseInfos = houseInfoService.findBySid(model.getSid()); if(CollectionUtils.isEmpty(houseInfos)) { - Map msg = ImmutableMap.of("status", 0, "msg", "房产信息不存在"); + Map msg = ImmutableMap.of("status", 0, "msg", "鎴夸骇淇℃伅涓嶅瓨鍦�"); result.setJsonModel(msg); return result; } @@ -359,10 +359,10 @@ public class PreassessController { } - //发送信息到钉钉 + //鍙戦�佷俊鎭埌閽夐拤 sendMsgToDingding(model.getSid(), model.getPhone(), houseInfos); - //保存人工询价信息 + //淇濆瓨浜哄伐璇环淇℃伅 saveInquiryInfo(houseInfos.get(0),model.getLinks()); Map msg = ImmutableMap.of("status", 200, "msg", model.getSid()); result.setJsonModel(msg); @@ -392,7 +392,7 @@ public class PreassessController { } /** - * 发送信息到钉钉 + * 鍙戦�佷俊鎭埌閽夐拤 * @param sid * @param phone * @@ -427,7 +427,7 @@ public class PreassessController { JSONObject jsonBody = new JSONObject(); jsonBody.put("msgtype", "markdown"); JSONObject markdown = new JSONObject(); - markdown.put("title", "人工评估信息"); + markdown.put("title", "浜哄伐璇勪及淇℃伅"); markdown.put("text", sendMsg); jsonBody.put("markdown", markdown); JSONObject jo = pdsApiProxyService.invoke(PdsConstants.DINGDING_URL, jsonBody, null, "UTF-8", false); @@ -435,7 +435,7 @@ public class PreassessController { } /** - * 获取城市列表 + * 鑾峰彇鍩庡競鍒楄〃 * @param userId * @return */ @@ -479,21 +479,21 @@ public class PreassessController { private void validateAuthority(String userId, Enterprise enterprise) throws PdsException { if(enterprise == null) { - throw new PdsException("当前企业不存在"); + throw new PdsException("褰撳墠浼佷笟涓嶅瓨鍦�"); } if(isExpire(enterprise)) { - throw new PdsException("评估权限已过期"); + throw new PdsException("璇勪及鏉冮檺宸茶繃鏈�"); } if(isOverMaxLimit(enterprise)) { - throw new PdsException("已达到最大评估次数限制,无法继续评估"); + throw new PdsException("宸茶揪鍒版渶澶ц瘎浼版鏁伴檺鍒讹紝鏃犳硶缁х画璇勪及"); } if(isOverDayLimit(userId, enterprise)) { - throw new PdsException("已达到每天最大评估次数限制,无法继续评估"); + throw new PdsException("宸茶揪鍒版瘡澶╂渶澶ц瘎浼版鏁伴檺鍒讹紝鏃犳硶缁х画璇勪及"); } } /** - * 每天最大次数 + * 姣忓ぉ鏈�澶ф鏁� * @param enterprise * @return */ @@ -511,7 +511,7 @@ public class PreassessController { private boolean isOverMaxLimit(Enterprise enterprise) { int limitCount = apiCallLimitService.getCount_(enterprise.getId(), ApiCallLimitEnum.WO_YAO_PING_GU.getUri()); - // 过滤器先减一, 这里应该是为零也可以 + // 杩囨护鍣ㄥ厛鍑忎竴, 杩欓噷搴旇鏄负闆朵篃鍙互 if(limitCount < 0) { return true; } @@ -519,7 +519,7 @@ public class PreassessController { } /** - * 是否过期 + * 鏄惁杩囨湡 * @param enterprise * @return */ @@ -536,7 +536,7 @@ public class PreassessController { private void validateBorrowerInfoParams(List borrowerModels) throws PdsException { /*if(borrowerModels.size() > 6) { - throw new Exception("贷款人不能超过6位"); + throw new Exception("璐锋浜轰笉鑳借秴杩�6浣�"); }*/ for(int i=0; borrowerModels != null && i houseInfoModels, User user) throws PdsException { if(houseInfoModels.size() > 6) { - throw new PdsException("押品房产不能超过6套"); + throw new PdsException("鎶煎搧鎴夸骇涓嶈兘瓒呰繃6濂�"); } for(int i=0; i59) { - throw new PdsException("“楼层”不合法"); + throw new PdsException("鈥滄ゼ灞傗�濅笉鍚堟硶"); } } if(houseInfoModel.getHeight() != null) { if(houseInfoModel.getHeight() <=0 || houseInfoModel.getHeight() > 59) { - throw new PdsException("“楼层”不合法"); + throw new PdsException("鈥滄ゼ灞傗�濅笉鍚堟硶"); } } /*if (houseInfoModel.getFloor() == null || houseInfoModel.getHeight() == null || houseInfoModel.getFloor() <= 0 || houseInfoModel.getFloor() > houseInfoModel.getHeight() || houseInfoModel.getFloor() > 50 || houseInfoModel.getHeight() > 50) { - throw new PdsException("“楼层”不合法"); + throw new PdsException("鈥滄ゼ灞傗�濅笉鍚堟硶"); }*/ } if(houseInfoModel.getArea() == null || houseInfoModel.getArea() <= 0 || - ("公寓".equals(houseInfoModel.getEstateType()) && houseInfoModel.getArea() > 600)) { - throw new PdsException("“建筑面积”不合法"); + ("鍏瘬".equals(houseInfoModel.getEstateType()) && houseInfoModel.getArea() > 600)) { + throw new PdsException("鈥滃缓绛戦潰绉�濅笉鍚堟硶"); } } } @@ -644,7 +644,7 @@ public class PreassessController { him.setReason(2); } if(him!=null&&StringUtils.isBlank(him.getEnterpriseId())){ - logger.warn("企业为空来源:PreassessController"+him.getCity()+"========"+him.getRegion()+"============"+him.getAddress()); + logger.warn("浼佷笟涓虹┖鏉ユ簮锛歅reassessController"+him.getCity()+"========"+him.getRegion()+"============"+him.getAddress()); } houseInfoMonitorService.save(him); } diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/PrevaluationController.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/PrevaluationController.java index 6a3b4a5a5..26f2cb482 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/PrevaluationController.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/PrevaluationController.java @@ -37,13 +37,13 @@ import java.util.*; * Created by linxsh on 2017/6/29. */ public class PrevaluationController { - private static final List ESTATE_TYPE = ImmutableList.of("公寓", "独栋别墅", "双拼别墅", "联排别墅", "叠加别墅", "其它"); + private static final List ESTATE_TYPE = ImmutableList.of("鍏瘬", "鐙爧鍒", "鍙屾嫾鍒", "鑱旀帓鍒", "鍙犲姞鍒", "鍏跺畠"); private static final MessageFormat markdownTemplate = new MessageFormat( - "## 人工评估信息 - 房产贷前估值\n\n" + - "- 联系电话:{0}\n" + - "- 联系人:{1}\n- 企业:{2}\n" + - "- 输入:{3}"); + "## 浜哄伐璇勪及淇℃伅 - 鎴夸骇璐峰墠浼板�糪n\n" + + "- 鑱旂郴鐢佃瘽锛歿0}\n" + + "- 鑱旂郴浜猴細{1}\n- 浼佷笟锛歿2}\n" + + "- 杈撳叆锛歿3}"); private PdsUserService pdsUserService; @@ -54,7 +54,7 @@ public class PrevaluationController { private HouseInfoMonitorService houseInfoMonitorService; /** - * 贷前估值 + * 璐峰墠浼板�� * * @return */ @@ -67,7 +67,7 @@ public class PrevaluationController { } /** - * 获取城市列表 + * 鑾峰彇鍩庡競鍒楄〃 * @return */ private Map> getAllCities() { @@ -87,7 +87,7 @@ public class PrevaluationController { } /** - * 保存评估信息 + * 淇濆瓨璇勪及淇℃伅 * @param model * @return */ @@ -97,7 +97,7 @@ public class PrevaluationController { String userId = PdsSessionContent.getLoginUserId(request); String enterpriseId = PdsSessionContent.getLoginEnterpriseId(request); - //检验参数 + //妫�楠屽弬鏁� try { validateEvalInfoParams(model); } catch (PdsException e) { @@ -110,7 +110,7 @@ public class PrevaluationController { return result; } - //model转换,并保存数据 + //model杞崲锛屽苟淇濆瓨鏁版嵁 SmartInput smartInput = new SmartInput(); BeanUtils.copyProperties(model, smartInput); smartInput.setCity(CommonUtil.formatCity(model.getCityDisplay())); @@ -121,7 +121,7 @@ public class PrevaluationController { boolean supportEvaluate = supportEvaluate(smartInput.getCity(), smartInput.getRegion(), smartInput.getDistrictName()); boolean hasLocation = hasLocation(smartInput.getCity(), smartInput.getRegion(), smartInput.getDistrictName()); - //监控估价 + //鐩戞帶浼颁环 monitorInfo(smartInput, supportEvaluate,smartInput.getId()); Map msg = ImmutableMap.of("status", 200, "support", supportEvaluate && hasLocation, "msg", smartInput.getId()); result.setJsonModel(msg); @@ -148,7 +148,7 @@ public class PrevaluationController { } /** - * 保存联系人电话 + * 淇濆瓨鑱旂郴浜虹數璇� * @return */ public Object saveContactNumberAction(PrevaluationModel model, HttpServletRequest request) { @@ -165,7 +165,7 @@ public class PrevaluationController { peopleInquiry.setInquiryDate(new Date()); peopleInquiryService.save(peopleInquiry); - //发送信息到钉钉 + //鍙戦�佷俊鎭埌閽夐拤 sendMsgToDingding(peopleInquiry); msg.put("status", 200); @@ -204,40 +204,40 @@ public class PrevaluationController { JSONObject jsonBody = new JSONObject(); jsonBody.put("msgtype", "markdown"); JSONObject markdown = new JSONObject(); - markdown.put("title", "人工评估信息"); + markdown.put("title", "浜哄伐璇勪及淇℃伅"); markdown.put("text", sendMsg); jsonBody.put("markdown", markdown); pdsApiProxyService.invoke(PdsConstants.DINGDING_URL, jsonBody, null, "UTF-8", false); } /** - * 验证参数合法性 + * 楠岃瘉鍙傛暟鍚堟硶鎬� * @param evalInfoModel * @return */ private void validateEvalInfoParams(PrevaluationModel evalInfoModel) throws PdsException { if(StringUtils.isBlank(evalInfoModel.getEstateType()) || !ESTATE_TYPE.contains(evalInfoModel.getEstateType())) { - throw new PdsException("“房产类型”不合法"); + throw new PdsException("鈥滄埧浜х被鍨嬧�濅笉鍚堟硶"); } if(StringUtils.isBlank(evalInfoModel.getAddress())) { - throw new PdsException("“楼盘/地址”不能为空"); + throw new PdsException("鈥滄ゼ鐩�/鍦板潃鈥濅笉鑳戒负绌�"); } - if(evalInfoModel.getEstateType().indexOf("别墅") == -1) { + if(evalInfoModel.getEstateType().indexOf("鍒") == -1) { if(evalInfoModel.getFloor() != null) { if(evalInfoModel.getFloor() <=0 || evalInfoModel.getFloor()>59) { - throw new PdsException("“楼层”不合法"); + throw new PdsException("鈥滄ゼ灞傗�濅笉鍚堟硶"); } } if(evalInfoModel.getHeight() != null) { if(evalInfoModel.getHeight() <=0 || evalInfoModel.getHeight() > 59) { - throw new PdsException("“楼层”不合法"); + throw new PdsException("鈥滄ゼ灞傗�濅笉鍚堟硶"); } } } if(evalInfoModel.getArea() == null || evalInfoModel.getArea() <= 0 || - ("公寓".equals(evalInfoModel.getEstateType()) && evalInfoModel.getArea() > 600)) { - throw new PdsException("“建筑面积”不合法"); + ("鍏瘬".equals(evalInfoModel.getEstateType()) && evalInfoModel.getArea() > 600)) { + throw new PdsException("鈥滃缓绛戦潰绉�濅笉鍚堟硶"); } } @@ -262,7 +262,7 @@ public class PrevaluationController { } /** - * 是否有经纬度 + * 鏄惁鏈夌粡绾害 * @param city * @param region * @param name @@ -312,7 +312,7 @@ public class PrevaluationController { } /** - * 获取小区的房号信息 + * 鑾峰彇灏忓尯鐨勬埧鍙蜂俊鎭� * @param model * @return */ diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/ReportController.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/ReportController.java index bf4ad58e0..1b0204106 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/ReportController.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/ReportController.java @@ -49,9 +49,9 @@ public class ReportController { private static final int DEFAULT_MAX = 10; private static final int REPORT_INPUT_SUCCESS = 1; private static final int REPORT_INPUT_FAIL = 2; - private static final int PERSON_TYPE = 1; // 个人 - private static final int ENTERPRISE_TYPE = 2; // 企业 - private static final int ENTERPRISE_SELF_TYPE = 3; // 自雇企业 + private static final int PERSON_TYPE = 1; // 涓汉 + private static final int ENTERPRISE_TYPE = 2; // 浼佷笟 + private static final int ENTERPRISE_SELF_TYPE = 3; // 鑷泧浼佷笟 private ReportInputService reportInputService; @@ -65,7 +65,7 @@ public class ReportController { private static final int SAVE_TRY_NUM = 6; - private static final int BAIDU_MAX = 1000;// 百度坐标最大值 + private static final int BAIDU_MAX = 1000;// 鐧惧害鍧愭爣鏈�澶у�� private List getQueryParam(ReportModel model, String enterpriseId) { List params = new ArrayList(); @@ -90,7 +90,7 @@ public class ReportController { } /** - * 页面定时刷新, 更改评估报告状态 + * 椤甸潰瀹氭椂鍒锋柊, 鏇存敼璇勪及鎶ュ憡鐘舵�� * * @param model * @return @@ -103,19 +103,19 @@ public class ReportController { } /** - * 生成评估报告, 异步线程执行 + * 鐢熸垚璇勪及鎶ュ憡, 寮傛绾跨▼鎵ц * * @param request * @param model * @return */ public Object evaltutionAction(HttpServletRequest request, ReportModel model) { - // 1.登录检查 + // 1.鐧诲綍妫�鏌� model.setViewType("json"); final String enterpriseId = PdsSessionContent.getLoginEnterpriseId(request); String userId = PdsSessionContent.getLoginUserId(request); if (StringUtils.isEmpty(enterpriseId) || StringUtils.isEmpty(userId)) { - LOG.warn("评估报告提交失败,缺少登录信息!"); + LOG.warn("璇勪及鎶ュ憡鎻愪氦澶辫触锛岀己灏戠櫥褰曚俊鎭紒"); model.setResult(PdsConstants.LOGIN_ERROR); return model; } @@ -123,28 +123,28 @@ public class ReportController { } /** - * 添加check,重新生成报告 + * 娣诲姞check锛岄噸鏂扮敓鎴愭姤鍛� * * @param request * @param model * @return */ public Object retryEvaltutionAction(HttpServletRequest request, ReportModel model) { - // 1.登录检查 + // 1.鐧诲綍妫�鏌� model.setViewType("json"); final String enterpriseId = PdsSessionContent.getLoginEnterpriseId(request); String userId = PdsSessionContent.getLoginUserId(request); if (StringUtils.isEmpty(enterpriseId) || StringUtils.isEmpty(userId)) { - LOG.warn("评估报告新增check提交失败,缺少登录信息!"); + LOG.warn("璇勪及鎶ュ憡鏂板check鎻愪氦澶辫触锛岀己灏戠櫥褰曚俊鎭紒"); model.setResult(PdsConstants.LOGIN_ERROR); return model; } - if (StringUtils.isEmpty(model.getId())) { // 新增 - LOG.warn("评估报告新增check提交失败,缺少报告ID!"); + if (StringUtils.isEmpty(model.getId())) { // 鏂板 + LOG.warn("璇勪及鎶ュ憡鏂板check鎻愪氦澶辫触锛岀己灏戞姤鍛奍D锛�"); model.setResult(PdsConstants.PARAM_ERROR); return model; } - // 2.处理 + // 2.澶勭悊 return evaltutionUpdate(model, enterpriseId, userId); } @@ -153,14 +153,14 @@ public class ReportController { model.setResult(PdsConstants.PARAM_ERROR); return model; } - // 卡号校验比较特殊,单独校验 + // 鍗″彿鏍¢獙姣旇緝鐗规畩锛屽崟鐙牎楠� if (!checkCardError(model, true, null, enterpriseId, userId)) { model.setResult(PdsConstants.CARD_PARAM_ERROR); return model; } String cache = (String) CacheUtils.getValue(ReportController.class, model.getObjectId()); if (StringUtils.isNotEmpty(cache)) { - LOG.warn("评估报告提交失败,重复提交!"); + LOG.warn("璇勪及鎶ュ憡鎻愪氦澶辫触锛岄噸澶嶆彁浜わ紒"); model.setResult(PdsConstants.REPEAT_COMMIT_ERROR); return model; } else { @@ -170,7 +170,7 @@ public class ReportController { long count = getCount(enterpriseId); final ReportInput input = getReportInput(model, enterpriseId, userId, count); - // 添加去重复卡 + // 娣诲姞鍘婚噸澶嶅崱 repeatCardRemove(input); int i = 0; for (; i < SAVE_TRY_NUM; i++) { @@ -189,7 +189,7 @@ public class ReportController { String id = input.getId(); if (StringUtils.isEmpty(id)) { - LOG.debug("评估报告提交失败,input保存失败!"); + LOG.debug("璇勪及鎶ュ憡鎻愪氦澶辫触锛宨nput淇濆瓨澶辫触锛�"); model.setResult(PdsConstants.FAIL); CacheUtils.delete(ReportController.class, model.getObjectId()); return model; @@ -197,26 +197,26 @@ public class ReportController { final ReportCheck check = getReportCheck(model, input.getId()); reportCheckService.save(check); if (StringUtils.isEmpty(check.getId())) { - LOG.debug("评估报告提交失败,check保存失败!"); + LOG.debug("璇勪及鎶ュ憡鎻愪氦澶辫触锛宑heck淇濆瓨澶辫触锛�"); model.setResult(PdsConstants.FAIL); CacheUtils.delete(ReportController.class, model.getObjectId()); return model; } model.setResult(PdsConstants.SUCCESS); - // 分析 + // 鍒嗘瀽 EXECUTOR.execute(new Runnable() { @Override public void run() { try { - LOG.warn("报告分析开始,id:" + input.getId()); + LOG.warn("鎶ュ憡鍒嗘瀽寮�濮嬶紝id:" + input.getId()); reportInputService.evaltutionReport(input, check); - // 更新报告reportInput 为成功 + // 鏇存柊鎶ュ憡reportInput 涓烘垚鍔� input.setStatus(REPORT_INPUT_SUCCESS); } catch (Exception e) { - // 更新报告reportInput 为失败 + // 鏇存柊鎶ュ憡reportInput 涓哄け璐� input.setStatus(REPORT_INPUT_FAIL); e.printStackTrace(); - LOG.error("报告分析发生异常, 异常对象id为:" + input.getId() + "异常信息为:" + e.getLocalizedMessage()); + LOG.error("鎶ュ憡鍒嗘瀽鍙戠敓寮傚父, 寮傚父瀵硅薄id涓�:" + input.getId() + "寮傚父淇℃伅涓�:" + e.getLocalizedMessage()); } finally { reportInputService.update(input); reportCheckService.update(check); @@ -232,44 +232,44 @@ public class ReportController { model.setResult(PdsConstants.PARAM_ERROR); return model; } - // 1.先update input和check - // 注意lastUpdateUserId的更新 + // 1.鍏坲pdate input鍜宑heck + // 娉ㄦ剰lastUpdateUserId鐨勬洿鏂� final ReportInput input = getReportInputAagin(model, userId, enterpriseId); if (null == input) { - LOG.warn("评估报告提交失败,查询不到input信息,inputId:" + model.getId()); - model.setResult("提交失败,原报告上次评估时间还不到一周,或还未生成!"); + LOG.warn("璇勪及鎶ュ憡鎻愪氦澶辫触锛屾煡璇笉鍒癷nput淇℃伅,inputId:" + model.getId()); + model.setResult("鎻愪氦澶辫触锛屽師鎶ュ憡涓婃璇勪及鏃堕棿杩樹笉鍒颁竴鍛�,鎴栬繕鏈敓鎴�!"); return model; } - // 卡号校验比较特殊,单独校验 + // 鍗″彿鏍¢獙姣旇緝鐗规畩锛屽崟鐙牎楠� if (!checkCardError(model, false, input.getId(), enterpriseId, userId)) { model.setResult(PdsConstants.CARD_PARAM_ERROR); return model; } - final ReportCheck check = getReportCheckAagin(model, input.getId());// 只包含本次选择的check对象用于报告评估 - ReportCheck checkForUpdate = getReportCheckAaginForUpdate(model);// 包含完整选择的check对象用于更新 + final ReportCheck check = getReportCheckAagin(model, input.getId());// 鍙寘鍚湰娆¢�夋嫨鐨刢heck瀵硅薄鐢ㄤ簬鎶ュ憡璇勪及 + ReportCheck checkForUpdate = getReportCheckAaginForUpdate(model);// 鍖呭惈瀹屾暣閫夋嫨鐨刢heck瀵硅薄鐢ㄤ簬鏇存柊 if (null == check) { - LOG.warn("评估报告提交失败,查询不到check信息,inputId:" + model.getId()); - model.setResult("提交失败,查询不到reportCheck信息!"); + LOG.warn("璇勪及鎶ュ憡鎻愪氦澶辫触锛屾煡璇笉鍒癱heck淇℃伅,inputId:" + model.getId()); + model.setResult("鎻愪氦澶辫触锛屾煡璇笉鍒皉eportCheck淇℃伅!"); return model; } - // 添加去重复卡 + // 娣诲姞鍘婚噸澶嶅崱 repeatCardRemove(input); reportInputService.update(input); reportCheckService.update(checkForUpdate); model.setResult(PdsConstants.SUCCESS); - // 2.执行报告 + // 2.鎵ц鎶ュ憡 EXECUTOR.execute(new Runnable() { @Override public void run() { try { - LOG.warn("报告分析开始,id:" + input.getId()); + LOG.warn("鎶ュ憡鍒嗘瀽寮�濮嬶紝id:" + input.getId()); reportInputService.evaltutionReport(input, check); - // 更新报告reportInput 为成功 + // 鏇存柊鎶ュ憡reportInput 涓烘垚鍔� input.setStatus(REPORT_INPUT_SUCCESS); } catch (Exception e) { - // 更新报告reportInput 为失败 + // 鏇存柊鎶ュ憡reportInput 涓哄け璐� input.setStatus(REPORT_INPUT_FAIL); - LOG.error("报告分析发生异常, 异常对象id为:" + input.getId() + "异常信息为:" + e.getMessage()); + LOG.error("鎶ュ憡鍒嗘瀽鍙戠敓寮傚父, 寮傚父瀵硅薄id涓�:" + input.getId() + "寮傚父淇℃伅涓�:" + e.getMessage()); } finally { reportInputService.update(input); reportCheckService.update(getCheckForUpdate(model, check)); @@ -280,7 +280,7 @@ public class ReportController { } /** - * 失败后,重新生成评估报告, 异步线程执行 + * 澶辫触鍚庯紝閲嶆柊鐢熸垚璇勪及鎶ュ憡, 寮傛绾跨▼鎵ц * * @param request * @param model @@ -292,24 +292,24 @@ public class ReportController { final ReportCheck check = reportCheckService.findByInputId(model.getId()); if (null != input && null != check) { model.setResult(PdsConstants.SUCCESS); - // 分析 + // 鍒嗘瀽 EXECUTOR.execute(new Runnable() { @Override public void run() { try { - // 重新生成时,先修改为生成中状态 + // 閲嶆柊鐢熸垚鏃讹紝鍏堜慨鏀逛负鐢熸垚涓姸鎬� input.setStatus(PdsConstants.EVALTUTION_STATUS); reportInputService.update(input); - LOG.warn("报告重新生成开始,id:" + input.getId()); + LOG.warn("鎶ュ憡閲嶆柊鐢熸垚寮�濮嬶紝id:" + input.getId()); reportInputService.evaltutionReport(input, check); - // 更新报告reportInput 为成功 + // 鏇存柊鎶ュ憡reportInput 涓烘垚鍔� input.setStatus(REPORT_INPUT_SUCCESS); input.setUpdateTime(new Date()); } catch (Exception e) { - // 更新报告reportInput 为失败 + // 鏇存柊鎶ュ憡reportInput 涓哄け璐� input.setStatus(REPORT_INPUT_FAIL); input.setUpdateTime(new Date()); - LOG.error("报告重新生成发生异常, 异常对象id为:" + input.getId() + "异常信息为:" + e.getLocalizedMessage()); + LOG.error("鎶ュ憡閲嶆柊鐢熸垚鍙戠敓寮傚父, 寮傚父瀵硅薄id涓�:" + input.getId() + "寮傚父淇℃伅涓�:" + e.getLocalizedMessage()); } finally { reportInputService.update(input); reportCheckService.update(check); @@ -317,14 +317,14 @@ public class ReportController { } }); } else { - LOG.warn("报告重新分析失败,查询不到该报告,id:" + model.getId()); + LOG.warn("鎶ュ憡閲嶆柊鍒嗘瀽澶辫触,鏌ヨ涓嶅埌璇ユ姤鍛婏紝id:" + model.getId()); model.setResult(PdsConstants.FAIL); } return model; } /** - * 获取reportInput参数用于保存 + * 鑾峰彇reportInput鍙傛暟鐢ㄤ簬淇濆瓨 * * @param model * @param enterpriseId @@ -334,7 +334,7 @@ public class ReportController { */ private ReportInput getReportInput(ReportModel model, String enterpriseId, String userId, long count) { ReportInput input = new ReportInput(); - input.setEvaluateNum(1);// 评估次数 + input.setEvaluateNum(1);// 璇勪及娆℃暟 input.setAddTime(new Date()); input.setUpdateTime(new Date()); input.setHouseAddress(model.getHouseAddress()); @@ -343,7 +343,7 @@ public class ReportController { input.setHouseName(model.getHouseName()); input.setHouseRegion(model.getHouseRegion()); input.setIdentityCard(model.getIdentityCard()); - // 个人身份证对应授权码及时间 + // 涓汉韬唤璇佸搴旀巿鏉冪爜鍙婃椂闂� setAuthorCode(input, enterpriseId, userId, model.getIdentityCard(), PERSON_TYPE); input.setLiveAddress(model.getLiveAddress()); input.setLiveArea(model.getLiveArea()); @@ -354,14 +354,14 @@ public class ReportController { input.setStatus(PdsConstants.EVALTUTION_STATUS); input.setUsername(model.getUsername()); input.setEstateType(model.getEstateType()); - input.setUsage("消费"); + input.setUsage("娑堣垂"); input.setEnterpriseId(enterpriseId); input.setUserId(userId); - // 新增 - // 工作地址 + // 鏂板 + // 宸ヤ綔鍦板潃 if (StringUtils.isNotEmpty(model.getWorkAddress())) { input.setWorkAddress(model.getWorkAddress()); - if (model.getWorkAddressLat() < BAIDU_MAX) { // 判断是否百度坐标 + if (model.getWorkAddressLat() < BAIDU_MAX) { // 鍒ゆ柇鏄惁鐧惧害鍧愭爣 input.setWorkAddressLat((long) (model.getWorkAddressLat() * 10000000000l)); input.setWorkAddressLng((long) (model.getWorkAddressLng() * 10000000000l)); } else { @@ -369,36 +369,36 @@ public class ReportController { input.setWorkAddressLng(model.getWorkAddressLng().longValue()); } } - // 文化程度 + // 鏂囧寲绋嬪害 input.setEducationLevels(model.getEducationLevels()); - // 企业注册号 + // 浼佷笟娉ㄥ唽鍙� if (StringUtils.isNotEmpty(model.getEnterpriseRegisterNumber())) { input.setEnterpriseRegisterNumber(model.getEnterpriseRegisterNumber()); - // 企业注册号证对应授权码及时间 + // 浼佷笟娉ㄥ唽鍙疯瘉瀵瑰簲鎺堟潈鐮佸強鏃堕棿 setAuthorCode(input, enterpriseId, userId, model.getEnterpriseRegisterNumber(), ENTERPRISE_TYPE); } if (StringUtils.isNotEmpty(model.getSelfEnterpriseRegisterNumber())) { - // 自雇佣企业注册号 + // 鑷泧浣d紒涓氭敞鍐屽彿 input.setSelfEnterpriseRegisterNumber(model.getSelfEnterpriseRegisterNumber()); - // 自雇企业注册号证对应授权码及时间 + // 鑷泧浼佷笟娉ㄥ唽鍙疯瘉瀵瑰簲鎺堟潈鐮佸強鏃堕棿 setAuthorCode(input, enterpriseId, userId, model.getSelfEnterpriseRegisterNumber(), ENTERPRISE_SELF_TYPE); } - // 车架号 + // 杞︽灦鍙� input.setCarNumber(model.getCarNumber()); - // 抵押物相关 + // 鎶垫娂鐗╃浉鍏� input.setHouseNum(model.getHouseNum()); input.setRoomNum(model.getRoomNum()); - // 总户数和经纬度 + // 鎬绘埛鏁板拰缁忕含搴� input.setHouseLat(model.getHouseLat()); input.setHouseLng(model.getHouseLng()); input.setHouseSum(model.getHouseSum()); - // 居住地址经纬度 + // 灞呬綇鍦板潃缁忕含搴� input.setLiveLat(model.getLiveLat()); input.setLiveLng(model.getLiveLng()); - // 认证状态 0.待认证 1.认证中 2.认证成功 3.认证失败 + // 璁よ瘉鐘舵�� 0.寰呰璇� 1.璁よ瘉涓� 2.璁よ瘉鎴愬姛 3.璁よ瘉澶辫触 input.setCreditCertification(model.getCreditCertification()); input.setFundCertification(model.getFundCertification()); - // 银行卡 + // 閾惰鍗� if (StringUtils.isNotEmpty(model.getCard1())) { input.setCard1(model.getCard1()); } @@ -418,17 +418,17 @@ public class ReportController { } /** - * 设置报告授权码 + * 璁剧疆鎶ュ憡鎺堟潈鐮� */ private void setAuthorCode(ReportInput input, String enterpriseId, String userId, String code, int inputType) { - int type = 2;// 企业 + int type = 2;// 浼佷笟 if (inputType == PERSON_TYPE) { - type = 1;// 个人 + type = 1;// 涓汉 } List params = new ArrayList(); params.add(new QueryParam("enterpriseId", enterpriseId)); params.add(new QueryParam("code", code)); - params.add(new QueryParam("authType", type));// 个人 + params.add(new QueryParam("authType", type));// 涓汉 ReportAuthorizationCode personCode = reportAuthorizationCodeService.findByParams(params); if (null == personCode) { personCode = new ReportAuthorizationCode(); @@ -453,7 +453,7 @@ public class ReportController { } /** - * 获取reportCheck参数 用于保存 + * 鑾峰彇reportCheck鍙傛暟 鐢ㄤ簬淇濆瓨 * * @param model * @param inputId @@ -510,19 +510,19 @@ public class ReportController { if (null != model.getRealEstate()) { check.setRealEstate(model.getRealEstate()); } - // 征信信息查询 + // 寰佷俊淇℃伅鏌ヨ if (null != model.getCredit()) { check.setCredit(model.getCredit()); } - // 公积金信息 + // 鍏Н閲戜俊鎭� if (null != model.getFund()) { check.setFund(model.getFund()); } - // 负债状况 + // 璐熷�虹姸鍐� if (null != model.getLiabilities()) { check.setLiabilities(model.getLiabilities()); } - // 个人信息最近查询量 + // 涓汉淇℃伅鏈�杩戞煡璇㈤噺 if (null != model.getPersonalQueryNum()) { check.setPersonalQueryNum(model.getPersonalQueryNum()); } @@ -530,7 +530,7 @@ public class ReportController { } /** - * 获取最新的reportInput用于更新 + * 鑾峰彇鏈�鏂扮殑reportInput鐢ㄤ簬鏇存柊 * * @param model * @param userId @@ -543,14 +543,14 @@ public class ReportController { } if (input.getStatus() == PdsConstants.EVALTUTION_STATUS) { - LOG.warn("报告处于生成中,不可修改!"); + LOG.warn("鎶ュ憡澶勪簬鐢熸垚涓�,涓嶅彲淇敼锛�"); return null; } input.setStatus(PdsConstants.EVALTUTION_STATUS); input.setLastUpdateUserId(userId); int num = input.getEvaluateNum() == null ? 1 : input.getEvaluateNum(); input.setEvaluateNum(num + 1); - // 页面不传老数据 + // 椤甸潰涓嶄紶鑰佹暟鎹� if (StringUtils.isNotEmpty(model.getWorkAddress())) { input.setWorkAddress(model.getWorkAddress()); } @@ -565,12 +565,12 @@ public class ReportController { } if (StringUtils.isNotEmpty(model.getEnterpriseRegisterNumber())) { input.setEnterpriseRegisterNumber(model.getEnterpriseRegisterNumber()); - // 企业注册号证对应授权码及时间 + // 浼佷笟娉ㄥ唽鍙疯瘉瀵瑰簲鎺堟潈鐮佸強鏃堕棿 setAuthorCode(input, enterpriseId, userId, model.getEnterpriseRegisterNumber(), ENTERPRISE_TYPE); } if (StringUtils.isNotEmpty(model.getSelfEnterpriseRegisterNumber())) { input.setSelfEnterpriseRegisterNumber(model.getSelfEnterpriseRegisterNumber()); - // 自雇企业注册号证对应授权码及时间 + // 鑷泧浼佷笟娉ㄥ唽鍙疯瘉瀵瑰簲鎺堟潈鐮佸強鏃堕棿 setAuthorCode(input, enterpriseId, userId, model.getSelfEnterpriseRegisterNumber(), ENTERPRISE_SELF_TYPE); } if (StringUtils.isNotEmpty(model.getCarNumber())) { @@ -584,26 +584,26 @@ public class ReportController { } input.setUpdateTime(new Date()); input.setLastAddOptionTime(new Date()); - // 银行卡 - //1.先处理顺序,银行卡最大5张 + // 閾惰鍗� + //1.鍏堝鐞嗛『搴�,閾惰鍗℃渶澶�5寮� for(int i = 1;i<5;i++){ String cardNo = getCardNoByNum(input,i); if(StringUtils.isNotEmpty(cardNo)){ - //存在不做处理 + //瀛樺湪涓嶅仛澶勭悊 continue; } - //不存在,找最近存在的进行替换 + //涓嶅瓨鍦�,鎵炬渶杩戝瓨鍦ㄧ殑杩涜鏇挎崲 int k = i+1; for(;k<=5;k++){ String cardNo2 = getCardNoByNum(input,k); if(StringUtils.isNotEmpty(cardNo2)){ setCardNoByNum(input,i,cardNo2); - setCardNoByNum(input,k,null);//替换后清空 + setCardNoByNum(input,k,null);//鏇挎崲鍚庢竻绌� break; } } } - //2.顺序处理好后,直接填充 + //2.椤哄簭澶勭悊濂藉悗,鐩存帴濉厖 if (StringUtils.isNotEmpty(model.getCard1())) { input.setCard1(model.getCard1()); } @@ -652,7 +652,7 @@ public class ReportController { } /** - * 获取最新的reportCheck用于更新 + * 鑾峰彇鏈�鏂扮殑reportCheck鐢ㄤ簬鏇存柊 * * @param model * @return @@ -718,9 +718,9 @@ public class ReportController { if (null == check) { return null; } - // 查一下inputResult 再操作 + // 鏌ヤ竴涓媔nputResult 鍐嶆搷浣� ReportResult reportResult = reportInputService.queryReportResult(inputId); - if (null == reportResult) { // 无报告生成,model+原check + if (null == reportResult) { // 鏃犳姤鍛婄敓鎴�,model+鍘焎heck if (null != model.getApplyLoanNum()) { check.setApplyLoanNum(model.getApplyLoanNum()); } @@ -765,7 +765,7 @@ public class ReportController { if (null != model.getRealEstate()) { check.setRealEstate(model.getRealEstate()); } - } else { //已有报告生成 ,以传入model为主 + } else { //宸叉湁鎶ュ憡鐢熸垚 锛屼互浼犲叆model涓轰富 check.setApplyLoanNum(model.getApplyLoanNum()); check.setAssetsStatus(model.getAssetsStatus()); check.setBadRecord(model.getBadRecord()); @@ -787,7 +787,7 @@ public class ReportController { } /** - * check的回滚处理,用于二次以上的check选择情况 + * check鐨勫洖婊氬鐞嗭紝鐢ㄤ簬浜屾浠ヤ笂鐨刢heck閫夋嫨鎯呭喌 * * @param model * @param checkNew @@ -795,7 +795,7 @@ public class ReportController { */ private ReportCheck getCheckForUpdate(ReportModel model, ReportCheck checkNew) { ReportCheck check = reportCheckService.findByInputId(model.getId()); - // check的回滚处理 + // check鐨勫洖婊氬鐞� if (null != model.getApplyLoanNum() && (null == checkNew.getApplyLoanNum() || !checkNew.getApplyLoanNum())) { check.setApplyLoanNum(null); } @@ -859,186 +859,186 @@ public class ReportController { } /** - * 基本输入参数检查 + * 鍩烘湰杈撳叆鍙傛暟妫�鏌� * * @param model * @return */ private boolean checkError(ReportModel model) { if (StringUtils.isEmpty(model.getUsername())) { - LOG.warn("评估报告提交失败,用户名为空!"); + LOG.warn("璇勪及鎶ュ憡鎻愪氦澶辫触锛岀敤鎴峰悕涓虹┖锛�"); return false; } if (!CommonUtil.isMobile(model.getMobile())) { - LOG.warn("评估报告提交失败,手机号不正确!"); + LOG.warn("璇勪及鎶ュ憡鎻愪氦澶辫触锛屾墜鏈哄彿涓嶆纭紒"); return false; } if (!CommonUtil.isIdentityCard(model.getIdentityCard())) { - LOG.warn("评估报告提交失败,身份证号不正确!"); + LOG.warn("璇勪及鎶ュ憡鎻愪氦澶辫触锛岃韩浠借瘉鍙蜂笉姝g‘锛�"); return false; } if (StringUtils.isEmpty(model.getHouseCity())) { - LOG.warn("评估报告提交失败,抵押物城市为空!"); + LOG.warn("璇勪及鎶ュ憡鎻愪氦澶辫触锛屾姷鎶肩墿鍩庡競涓虹┖锛�"); return false; } if (StringUtils.isEmpty(model.getHouseRegion())) { - LOG.warn("评估报告提交失败,抵押物区域为空!"); + LOG.warn("璇勪及鎶ュ憡鎻愪氦澶辫触锛屾姷鎶肩墿鍖哄煙涓虹┖锛�"); return false; } if (StringUtils.isEmpty(model.getHouseName())) { - LOG.warn("评估报告提交失败,抵押物名称为空!"); + LOG.warn("璇勪及鎶ュ憡鎻愪氦澶辫触锛屾姷鎶肩墿鍚嶇О涓虹┖锛�"); return false; } if (StringUtils.isEmpty(model.getHouseAddress())) { - LOG.warn("评估报告提交失败,抵押物地址为空!"); + LOG.warn("璇勪及鎶ュ憡鎻愪氦澶辫触锛屾姷鎶肩墿鍦板潃涓虹┖锛�"); return false; } if (null == model.getHouseArea() || model.getHouseArea() <= 0) { - LOG.warn("评估报告提交失败,抵押物面积不正确!"); + LOG.warn("璇勪及鎶ュ憡鎻愪氦澶辫触锛屾姷鎶肩墿闈㈢Н涓嶆纭紒"); return false; } if (StringUtils.isEmpty(model.getLiveCity())) { - LOG.warn("评估报告提交失败,实际居住城市为空!"); + LOG.warn("璇勪及鎶ュ憡鎻愪氦澶辫触锛屽疄闄呭眳浣忓煄甯備负绌猴紒"); return false; } if (StringUtils.isEmpty(model.getLiveRegion())) { - LOG.warn("评估报告提交失败,实际居住区域为空!"); + LOG.warn("璇勪及鎶ュ憡鎻愪氦澶辫触锛屽疄闄呭眳浣忓尯鍩熶负绌猴紒"); return false; } if (StringUtils.isEmpty(model.getLiveName())) { - LOG.warn("评估报告提交失败,实际居住名称为空!"); + LOG.warn("璇勪及鎶ュ憡鎻愪氦澶辫触锛屽疄闄呭眳浣忓悕绉颁负绌猴紒"); return false; } if (StringUtils.isEmpty(model.getLiveAddress())) { - LOG.warn("评估报告提交失败,实际居住地址为空!"); + LOG.warn("璇勪及鎶ュ憡鎻愪氦澶辫触锛屽疄闄呭眳浣忓湴鍧�涓虹┖锛�"); return false; } if (null == model.getHouseArea() || model.getLiveArea() <= 0) { - LOG.warn("评估报告提交失败,实际居住面积不正确!"); + LOG.warn("璇勪及鎶ュ憡鎻愪氦澶辫触锛屽疄闄呭眳浣忛潰绉笉姝g‘锛�"); return false; } if (StringUtils.isEmpty(model.getEstateType())) { - LOG.warn("评估报告提交失败,物业类型为空!"); + LOG.warn("璇勪及鎶ュ憡鎻愪氦澶辫触锛岀墿涓氱被鍨嬩负绌猴紒"); return false; } if (StringUtils.isEmpty(model.getObjectId())) { - LOG.warn("评估报告提交失败,ObjectId为空!"); + LOG.warn("璇勪及鎶ュ憡鎻愪氦澶辫触锛孫bjectId涓虹┖锛�"); return false; } if (StringUtils.isEmpty(model.getHouseNum())) { - LOG.warn("评估报告提交失败,抵押物楼栋号为空!"); + LOG.warn("璇勪及鎶ュ憡鎻愪氦澶辫触锛屾姷鎶肩墿妤兼爧鍙蜂负绌猴紒"); return false; } if (StringUtils.isEmpty(model.getRoomNum())) { - LOG.warn("评估报告提交失败,抵押物室号为空!"); + LOG.warn("璇勪及鎶ュ憡鎻愪氦澶辫触锛屾姷鎶肩墿瀹ゅ彿涓虹┖锛�"); return false; } - // 抵押物(和居住地)经纬度和总户数可能缺数据,不检查 + // 鎶垫娂鐗�(鍜屽眳浣忓湴)缁忕含搴﹀拰鎬绘埛鏁板彲鑳界己鏁版嵁锛屼笉妫�鏌� return true; } /** - * 扩展参数检查,需要check参数关联检查,update情况下需先查询后检查 + * 鎵╁睍鍙傛暟妫�鏌ワ紝闇�瑕乧heck鍙傛暟鍏宠仈妫�鏌ワ紝update鎯呭喌涓嬮渶鍏堟煡璇㈠悗妫�鏌� * * @param model * @return */ private boolean checkErrorNew(ReportModel model, String enterpriseId) { - // 1.修改先检查企业id是否一致 + // 1.淇敼鍏堟鏌ヤ紒涓歩d鏄惁涓�鑷� ReportInput input = null; if (StringUtils.isNotEmpty(model.getId())) { input = reportInputService.findById(model.getId()); if (null == input) { - LOG.warn("评估报告提交失败,新增报告项目时,查无该报告,报告inputId:" + model.getId()); + LOG.warn("璇勪及鎶ュ憡鎻愪氦澶辫触锛屾柊澧炴姤鍛婇」鐩椂,鏌ユ棤璇ユ姤鍛�,鎶ュ憡inputId锛�" + model.getId()); return false; } if (!enterpriseId.equals(input.getEnterpriseId())) { - LOG.warn("评估报告提交失败,新增报告项目时,企业id不一致,原企业id:" + input.getEnterpriseId() + ",现企业id:" + enterpriseId - + ",报告id:" + model.getId()); + LOG.warn("璇勪及鎶ュ憡鎻愪氦澶辫触锛屾柊澧炴姤鍛婇」鐩椂,浼佷笟id涓嶄竴鑷�,鍘熶紒涓歩d锛�" + input.getEnterpriseId() + ",鐜颁紒涓歩d:" + enterpriseId + + ",鎶ュ憡id:" + model.getId()); return false; } } - // 2.检查check 和 input 关系 + // 2.妫�鏌heck 鍜� input 鍏崇郴 return checkInputAndCheck(model, input); } /** - * 银行卡校验 + * 閾惰鍗℃牎楠� * * @param model * @return */ private boolean checkCardError(ReportModel model, boolean isNewCheck, String inputId, String enterpriseId, String userId) { - String errorMsg = ""; // 为了处理每张卡的校验 - // 银行卡校验(必输的银行卡1做基本校验) + String errorMsg = ""; // 涓轰簡澶勭悊姣忓紶鍗$殑鏍¢獙 + // 閾惰鍗℃牎楠�(蹇呰緭鐨勯摱琛屽崱1鍋氬熀鏈牎楠�) if (StringUtils.isNotEmpty(model.getCard1())) { if (!CommonUtil.isCard(model.getCard1())) { - LOG.warn("评估报告提交失败,常用银行卡1格式不正确!"); - errorMsg += "银行卡1格式不正确;"; + LOG.warn("璇勪及鎶ュ憡鎻愪氦澶辫触锛屽父鐢ㄩ摱琛屽崱1鏍煎紡涓嶆纭紒"); + errorMsg += "閾惰鍗�1鏍煎紡涓嶆纭�;"; } else { - // 银行卡校验逻辑 + // 閾惰鍗℃牎楠岄�昏緫 String msg = checkCard(model.getCard1(), model.getUsername(), model.getIdentityCard(), inputId, enterpriseId, userId); if (StringUtils.isNotEmpty(msg)) { - errorMsg += "银行卡1" + msg + ";"; + errorMsg += "閾惰鍗�1" + msg + ";"; } } - } else if (isNewCheck) { // 首次输入时,必须输入首张银行卡 - LOG.warn("评估报告提交失败,缺少常用银行卡输入!"); - errorMsg += "银行卡1缺少常用银行卡输入;"; + } else if (isNewCheck) { // 棣栨杈撳叆鏃讹紝蹇呴』杈撳叆棣栧紶閾惰鍗� + LOG.warn("璇勪及鎶ュ憡鎻愪氦澶辫触锛岀己灏戝父鐢ㄩ摱琛屽崱杈撳叆锛�"); + errorMsg += "閾惰鍗�1缂哄皯甯哥敤閾惰鍗¤緭鍏�;"; } - // 银行卡校验(非必输的银行卡2-5做update校验) + // 閾惰鍗℃牎楠�(闈炲繀杈撶殑閾惰鍗�2-5鍋歶pdate鏍¢獙) if (StringUtils.isNotEmpty(model.getCard2())) { if (!CommonUtil.isCard(model.getCard2())) { - LOG.warn("评估报告提交失败,常用银行卡2格式不正确!"); - errorMsg += "银行卡2格式不正确;"; + LOG.warn("璇勪及鎶ュ憡鎻愪氦澶辫触锛屽父鐢ㄩ摱琛屽崱2鏍煎紡涓嶆纭紒"); + errorMsg += "閾惰鍗�2鏍煎紡涓嶆纭�;"; } else { - // 银行卡校验逻辑 + // 閾惰鍗℃牎楠岄�昏緫 String msg = checkCard(model.getCard2(), model.getUsername(), model.getIdentityCard(), inputId, enterpriseId, userId); if (StringUtils.isNotEmpty(msg)) { - errorMsg += "银行卡2" + msg + ";"; + errorMsg += "閾惰鍗�2" + msg + ";"; } } } if (StringUtils.isNotEmpty(model.getCard3())) { if (!CommonUtil.isCard(model.getCard3())) { - LOG.warn("评估报告提交失败,常用银行卡3格式不正确!"); - errorMsg += "银行卡3格式不正确;"; + LOG.warn("璇勪及鎶ュ憡鎻愪氦澶辫触锛屽父鐢ㄩ摱琛屽崱3鏍煎紡涓嶆纭紒"); + errorMsg += "閾惰鍗�3鏍煎紡涓嶆纭�;"; } else { - // 银行卡校验逻辑 + // 閾惰鍗℃牎楠岄�昏緫 String msg = checkCard(model.getCard3(), model.getUsername(), model.getIdentityCard(), inputId, enterpriseId, userId); if (StringUtils.isNotEmpty(msg)) { - errorMsg += "银行卡3" + msg + ";"; + errorMsg += "閾惰鍗�3" + msg + ";"; } } } if (StringUtils.isNotEmpty(model.getCard4())) { if (!CommonUtil.isCard(model.getCard4())) { - LOG.warn("评估报告提交失败,常用银行卡4格式不正确!"); - errorMsg += "银行卡4格式不正确;"; + LOG.warn("璇勪及鎶ュ憡鎻愪氦澶辫触锛屽父鐢ㄩ摱琛屽崱4鏍煎紡涓嶆纭紒"); + errorMsg += "閾惰鍗�4鏍煎紡涓嶆纭�;"; } else { - // 银行卡校验逻辑 + // 閾惰鍗℃牎楠岄�昏緫 String msg = checkCard(model.getCard4(), model.getUsername(), model.getIdentityCard(), inputId, enterpriseId, userId); if (StringUtils.isNotEmpty(msg)) { - errorMsg += "银行卡4" + msg + ";"; + errorMsg += "閾惰鍗�4" + msg + ";"; } } } if (StringUtils.isNotEmpty(model.getCard5())) { if (!CommonUtil.isCard(model.getCard5())) { - LOG.warn("评估报告提交失败,常用银行卡5格式不正确!"); - errorMsg += "银行卡5格式不正确;"; + LOG.warn("璇勪及鎶ュ憡鎻愪氦澶辫触锛屽父鐢ㄩ摱琛屽崱5鏍煎紡涓嶆纭紒"); + errorMsg += "閾惰鍗�5鏍煎紡涓嶆纭�;"; } else { - // 银行卡校验逻辑 + // 閾惰鍗℃牎楠岄�昏緫 String msg = checkCard(model.getCard5(), model.getUsername(), model.getIdentityCard(), inputId, enterpriseId, userId); if (StringUtils.isNotEmpty(msg)) { - errorMsg += "银行卡5" + msg + ";"; + errorMsg += "閾惰鍗�5" + msg + ";"; } } } @@ -1051,7 +1051,7 @@ public class ReportController { } /** - * 银联卡校验 校验成功不返回,失败返回失败原因 + * 閾惰仈鍗℃牎楠� 鏍¢獙鎴愬姛涓嶈繑鍥烇紝澶辫触杩斿洖澶辫触鍘熷洜 * * @param cardNo * @return @@ -1059,105 +1059,105 @@ public class ReportController { private String checkCard(String card, String name, String idCard, String inputId, String enterpriseId, String userId) { String errorMsg = ""; - // 1.先查询全匹配记录 + // 1.鍏堟煡璇㈠叏鍖归厤璁板綍 ReportPreAuthCheck successLog = reportInputService.findCardSuccessByCard(card); if (null != successLog) { - // 身份证匹配 + // 韬唤璇佸尮閰� if (!successLog.getIdentityCard().equals(idCard)) { - errorMsg += "身份证不一致,"; + errorMsg += "韬唤璇佷笉涓�鑷�,"; } else { - errorMsg += "身份证一致,"; + errorMsg += "韬唤璇佷竴鑷�,"; } - // 姓名匹配 + // 濮撳悕鍖归厤 if (!successLog.getName().equals(name)) { - errorMsg += "姓名不一致"; + errorMsg += "濮撳悕涓嶄竴鑷�"; } else { - errorMsg += "姓名一致"; + errorMsg += "濮撳悕涓�鑷�"; } - // 返回 - if ("身份证一致,姓名一致".equals(errorMsg)) { + // 杩斿洖 + if ("韬唤璇佷竴鑷�,濮撳悕涓�鑷�".equals(errorMsg)) { return null; } else { return errorMsg; } } - // 2.再查询匹配失败记录 + // 2.鍐嶆煡璇㈠尮閰嶅け璐ヨ褰� ReportPreAuthCheck errorLog = reportInputService.findCardCheckByRecord(card, name, idCard); if (null != errorLog) { - if (2 == errorLog.getStatus()) {// 姓名一致,身份证不一致 - return "身份证不一致,姓名一致"; - } else { // 姓名不一致,身份证未知 - return "姓名不一致"; + if (2 == errorLog.getStatus()) {// 濮撳悕涓�鑷�,韬唤璇佷笉涓�鑷� + return "韬唤璇佷笉涓�鑷�,濮撳悕涓�鑷�"; + } else { // 濮撳悕涓嶄竴鑷�,韬唤璇佹湭鐭� + return "濮撳悕涓嶄竴鑷�"; } } - // 后请求 - // 最后保存mongo + // 鍚庤姹� + // 鏈�鍚庝繚瀛榤ongo ReportRequestApiLogs reportLog = new ReportRequestApiLogs(); try { JSONObject data = queryCheckCard(card, name, idCard, reportLog); // YinLianApiCallLimitEnum.AUTH_AUTHCARD - reportLog.setApiUrl(YinLianApiUtils.constructUrl(YinLianApiCallLimitEnum.AUTH_AUTHCARD));// url记录 + reportLog.setApiUrl(YinLianApiUtils.constructUrl(YinLianApiCallLimitEnum.AUTH_AUTHCARD));// url璁板綍 String code = data.getString("code"); String status = data.getString("status"); if (StringUtils.isEmpty(code) || StringUtils.isEmpty(status)) { - return "服务正忙,请检查卡号,稍后再试"; // 异常返回值 + return "鏈嶅姟姝e繖锛岃妫�鏌ュ崱鍙凤紝绋嶅悗鍐嶈瘯"; // 寮傚父杩斿洖鍊� } if (code.equals("200")) { - if (status.equals("1000")) {// 验证成功 - // 保存结果 + if (status.equals("1000")) {// 楠岃瘉鎴愬姛 + // 淇濆瓨缁撴灉 ReportPreAuthCheck authCheck = new ReportPreAuthCheck(); authCheck.setCard(card); authCheck.setName(name); authCheck.setIdentityCard(idCard); - authCheck.setStatus(1); // 全一致 + authCheck.setStatus(1); // 鍏ㄤ竴鑷� reportInputService.saveReportPreAuthCheck(authCheck); - return null;// 成功返回空 - } else if (status.equals("1001")) {// 验证不成功 - // 再次验证姓名和卡号 + return null;// 鎴愬姛杩斿洖绌� + } else if (status.equals("1001")) {// 楠岃瘉涓嶆垚鍔� + // 鍐嶆楠岃瘉濮撳悕鍜屽崱鍙� JSONObject data2 = queryCheckCard(card, name, null, reportLog); String code2 = data2.getString("code"); String status2 = data2.getString("status"); if (StringUtils.isEmpty(code2) || StringUtils.isEmpty(status2)) { - return "服务正忙,请检查卡号,稍后再试"; // 异常返回值 + return "鏈嶅姟姝e繖锛岃妫�鏌ュ崱鍙凤紝绋嶅悗鍐嶈瘯"; // 寮傚父杩斿洖鍊� } if (code.equals("200")) { - if (status.equals("1000")) {// 验证成功 - // 保存结果 + if (status.equals("1000")) {// 楠岃瘉鎴愬姛 + // 淇濆瓨缁撴灉 ReportPreAuthCheck authCheck = new ReportPreAuthCheck(); authCheck.setCard(card); authCheck.setName(name); authCheck.setIdentityCard(idCard); - authCheck.setStatus(2); // 姓名一致 + authCheck.setStatus(2); // 濮撳悕涓�鑷� reportInputService.saveReportPreAuthCheck(authCheck); - return "身份证不一致,姓名一致"; - } else if (status.equals("1001")) {// 验证不成功 - // 保存结果 + return "韬唤璇佷笉涓�鑷�,濮撳悕涓�鑷�"; + } else if (status.equals("1001")) {// 楠岃瘉涓嶆垚鍔� + // 淇濆瓨缁撴灉 ReportPreAuthCheck authCheck = new ReportPreAuthCheck(); authCheck.setCard(card); authCheck.setName(name); authCheck.setIdentityCard(idCard); - authCheck.setStatus(3); // 姓名不一致,身份证未知 + authCheck.setStatus(3); // 濮撳悕涓嶄竴鑷达紝韬唤璇佹湭鐭� reportInputService.saveReportPreAuthCheck(authCheck); - return "姓名不一致"; - } else { // 卡不能处理 - return "验证失败,请更换卡号"; + return "濮撳悕涓嶄竴鑷�"; + } else { // 鍗′笉鑳藉鐞� + return "楠岃瘉澶辫触锛岃鏇存崲鍗″彿"; } } else { - return "服务正忙,请检查卡号,稍后再试"; + return "鏈嶅姟姝e繖锛岃妫�鏌ュ崱鍙凤紝绋嶅悗鍐嶈瘯"; } - } else { // 卡不能处理 - return "验证失败,请更换卡号"; + } else { // 鍗′笉鑳藉鐞� + return "楠岃瘉澶辫触锛岃鏇存崲鍗″彿"; } } else { - return "服务正忙,请检查卡号,稍后再试"; + return "鏈嶅姟姝e繖锛岃妫�鏌ュ崱鍙凤紝绋嶅悗鍐嶈瘯"; } } catch (Exception e) { LOG.error(e.getMessage(), e); JSONObject errorJson = new JSONObject(); errorJson.put("error", e.toString()); reportLog.setResponseData(DataUtil.toMongoDbObj(errorJson)); - return "服务正忙,请检查卡号,稍后再试"; + return "鏈嶅姟姝e繖锛岃妫�鏌ュ崱鍙凤紝绋嶅悗鍐嶈瘯"; } finally { reportLog.setEnterpriseId(enterpriseId); reportLog.setReportInputId(inputId); @@ -1169,7 +1169,7 @@ public class ReportController { } /** - * 发送银联前置授权校验 + * 鍙戦�侀摱鑱斿墠缃巿鏉冩牎楠� * * @param card * @param name @@ -1185,7 +1185,7 @@ public class ReportController { if (StringUtils.isNotEmpty(idCard)) { body.put("cid", idCard); } - reportLog.setRequestData(DataUtil.toMongoDbObj(JSONObject.fromObject(body)));// log记录 + reportLog.setRequestData(DataUtil.toMongoDbObj(JSONObject.fromObject(body)));// log璁板綍 Map riskAssessData = YinLianApiUtils.postHttpsApi(body, YinLianApiCallLimitEnum.AUTH_AUTHCARD, YinLianApiValidateRtCodeLimitEnum.NOAUTO_VALIDATE_1000); reportLog.setResponseData(DataUtil.toMongoDbObj(JSONObject.fromObject(riskAssessData))); @@ -1194,69 +1194,69 @@ public class ReportController { } /** - * 检查报告选项和输入参数 人房关系 工作关系 个人资料核验 文化程度 企业信息查询 企业注册号 自雇企业经营状况 企业注册号 个人关联企业 企业注册号 - * 名下动产信息 车架号 + * 妫�鏌ユ姤鍛婇�夐」鍜岃緭鍏ュ弬鏁� 浜烘埧鍏崇郴 宸ヤ綔鍏崇郴 涓汉璧勬枡鏍搁獙 鏂囧寲绋嬪害 浼佷笟淇℃伅鏌ヨ 浼佷笟娉ㄥ唽鍙� 鑷泧浼佷笟缁忚惀鐘跺喌 浼佷笟娉ㄥ唽鍙� 涓汉鍏宠仈浼佷笟 浼佷笟娉ㄥ唽鍙� + * 鍚嶄笅鍔ㄤ骇淇℃伅 杞︽灦鍙� * * @return */ private boolean checkInputAndCheck(ReportModel model, ReportInput input) { - // 先检查model(model没有,检查input--input为查询结果) - // 人房关系 + // 鍏堟鏌odel(model娌℃湁锛屾鏌nput--input涓烘煡璇㈢粨鏋�) + // 浜烘埧鍏崇郴 if (null != model.getPersonHouse() && model.getPersonHouse()) { if (StringUtils.isEmpty(model.getWorkAddress()) && (null == input || StringUtils.isEmpty(input.getWorkAddress()))) { - LOG.warn("评估报告提交失败,选择人房关系,但缺少工作地址输入,报告id:" + model.getId()); + LOG.warn("璇勪及鎶ュ憡鎻愪氦澶辫触,閫夋嫨浜烘埧鍏崇郴,浣嗙己灏戝伐浣滃湴鍧�杈撳叆,鎶ュ憡id:" + model.getId()); return false; } if ((null == model.getWorkAddressLat() || null == model.getWorkAddressLng()) && (null == input || null == input.getWorkAddressLat() || null == input.getWorkAddressLng())) { - LOG.warn("评估报告提交失败,选择人房关系,但缺少工作地址坐标,报告id:" + model.getId()); + LOG.warn("璇勪及鎶ュ憡鎻愪氦澶辫触,閫夋嫨浜烘埧鍏崇郴,浣嗙己灏戝伐浣滃湴鍧�鍧愭爣,鎶ュ憡id:" + model.getId()); return false; } } - // 个人资料核验 + // 涓汉璧勬枡鏍搁獙 if (null != model.getPersonCheck() && model.getPersonCheck()) { if (StringUtils.isEmpty(model.getEducationLevels()) && (null == input || StringUtils.isEmpty(input.getEducationLevels()))) { - LOG.warn("评估报告提交失败,选择个人资料核验,但缺少文化程度输入,报告id:" + model.getId()); + LOG.warn("璇勪及鎶ュ憡鎻愪氦澶辫触,閫夋嫨涓汉璧勬枡鏍搁獙,浣嗙己灏戞枃鍖栫▼搴﹁緭鍏�,鎶ュ憡id:" + model.getId()); return false; } } - // 企业信息查询 + // 浼佷笟淇℃伅鏌ヨ if (null != model.getEnterpriseInformation() && model.getEnterpriseInformation()) { if (StringUtils.isEmpty(model.getEnterpriseRegisterNumber()) && (null == input || StringUtils.isEmpty(input.getEnterpriseRegisterNumber()))) { - LOG.warn("评估报告提交失败,选择企业信息查询,但缺少企业注册号输入,报告id:" + model.getId()); + LOG.warn("璇勪及鎶ュ憡鎻愪氦澶辫触,閫夋嫨浼佷笟淇℃伅鏌ヨ,浣嗙己灏戜紒涓氭敞鍐屽彿杈撳叆,鎶ュ憡id:" + model.getId()); return false; } } - // 自雇企业经营状况 + // 鑷泧浼佷笟缁忚惀鐘跺喌 if (null != model.getEnterpriseOperation() && model.getEnterpriseOperation()) { if (StringUtils.isEmpty(model.getSelfEnterpriseRegisterNumber()) && (null == input || StringUtils.isEmpty(input.getSelfEnterpriseRegisterNumber()))) { - LOG.warn("评估报告提交失败,选择自雇企业经营状况,但缺少自雇企业注册号输入,报告id:" + model.getId()); + LOG.warn("璇勪及鎶ュ憡鎻愪氦澶辫触,閫夋嫨鑷泧浼佷笟缁忚惀鐘跺喌,浣嗙己灏戣嚜闆囦紒涓氭敞鍐屽彿杈撳叆,鎶ュ憡id:" + model.getId()); return false; } } - // 个人关联企业 (去除企业注册号关联) + // 涓汉鍏宠仈浼佷笟 (鍘婚櫎浼佷笟娉ㄥ唽鍙峰叧鑱�) // if (null != model.getPersonEnterprise() && model.getPersonEnterprise()) { // if (StringUtils.isEmpty(model.getEnterpriseRegisterNumber()) // && (null == input || // StringUtils.isEmpty(input.getEnterpriseRegisterNumber()))) { - // LOG.warn("评估报告提交失败,选择个人关联企业,但缺少企业注册号输入,报告id:" + model.getId()); + // LOG.warn("璇勪及鎶ュ憡鎻愪氦澶辫触,閫夋嫨涓汉鍏宠仈浼佷笟,浣嗙己灏戜紒涓氭敞鍐屽彿杈撳叆,鎶ュ憡id:" + model.getId()); // return false; // } // } - // 名下动产信息 + // 鍚嶄笅鍔ㄤ骇淇℃伅 if (null != model.getRealEstate() && model.getRealEstate()) { if (StringUtils.isEmpty(model.getCarNumber()) && (null == input || StringUtils.isEmpty(input.getCarNumber()))) { - LOG.warn("评估报告提交失败,选择名下动产信息,但缺少车架号输入,报告id:" + model.getId()); + LOG.warn("璇勪及鎶ュ憡鎻愪氦澶辫触,閫夋嫨鍚嶄笅鍔ㄤ骇淇℃伅,浣嗙己灏戣溅鏋跺彿杈撳叆,鎶ュ憡id:" + model.getId()); return false; } } - // 征信信息查询 ; 负债状况 ; 个人信息最近查询量 - // 认证状态 0.待认证 1.认证中 2.认证成功 3.认证失败 + // 寰佷俊淇℃伅鏌ヨ ; 璐熷�虹姸鍐� ; 涓汉淇℃伅鏈�杩戞煡璇㈤噺 + // 璁よ瘉鐘舵�� 0.寰呰璇� 1.璁よ瘉涓� 2.璁よ瘉鎴愬姛 3.璁よ瘉澶辫触 if ((null != model.getCredit() && model.getCredit()) || (null != model.getLiabilities() && model.getLiabilities()) || (null != model.getPersonalQueryNum() && model.getPersonalQueryNum())) { @@ -1264,18 +1264,18 @@ public class ReportController { || (model.getCreditCertification() != 1 && model.getCreditCertification() != 2)) && (null == input || null == input.getCreditCertification() || (input.getCreditCertification() != 1 && input.getCreditCertification() != 2))) { - LOG.warn("评估报告提交失败,选择征信信息查询,但没有认证或认证失败,报告id:" + model.getId()); + LOG.warn("璇勪及鎶ュ憡鎻愪氦澶辫触,閫夋嫨寰佷俊淇℃伅鏌ヨ,浣嗘病鏈夎璇佹垨璁よ瘉澶辫触,鎶ュ憡id:" + model.getId()); return false; } } - // 公积金查询 - // 认证状态 0.待认证 1.认证中 2.认证成功 3.认证失败 + // 鍏Н閲戞煡璇� + // 璁よ瘉鐘舵�� 0.寰呰璇� 1.璁よ瘉涓� 2.璁よ瘉鎴愬姛 3.璁よ瘉澶辫触 if (null != model.getFund() && model.getFund()) { if ((null == model.getFundCertification() || (model.getFundCertification() != 1 && model.getFundCertification() != 2)) && (null == input || null == input.getFundCertification() || (input.getFundCertification() != 1 && input.getFundCertification() != 2))) { - LOG.warn("评估报告提交失败,选择公积金信息,但没有认证或认证失败,报告id:" + model.getId()); + LOG.warn("璇勪及鎶ュ憡鎻愪氦澶辫触,閫夋嫨鍏Н閲戜俊鎭�,浣嗘病鏈夎璇佹垨璁よ瘉澶辫触,鎶ュ憡id:" + model.getId()); return false; } } @@ -1296,7 +1296,7 @@ public class ReportController { } /** - * 人房关系列表 + * 浜烘埧鍏崇郴鍒楄〃 * * @param request * @param model @@ -1306,11 +1306,11 @@ public class ReportController { String userId = PdsSessionContent.getLoginUserId(request); String enterpriseId = PdsSessionContent.getLoginEnterpriseId(request); if (StringUtils.isEmpty(enterpriseId) || StringUtils.isEmpty(userId)) { - LOG.warn("人房关系列表查询失败,缺少登录信息!"); + LOG.warn("浜烘埧鍏崇郴鍒楄〃鏌ヨ澶辫触锛岀己灏戠櫥褰曚俊鎭紒"); model.setResult(PdsConstants.LOGIN_ERROR); return model; } - // model.setCitiesMap(getAllCities(userId));//城市列表相关去除 + // model.setCitiesMap(getAllCities(userId));//鍩庡競鍒楄〃鐩稿叧鍘婚櫎 List queryParams = getQueryParam(model, enterpriseId); List sortParams = new ArrayList(); sortParams.add(new SortParam("updateTime", false)); @@ -1334,7 +1334,7 @@ public class ReportController { } /** - * 查询对应checkbox状态 + * 鏌ヨ瀵瑰簲checkbox鐘舵�� * * @param model * @return @@ -1346,61 +1346,61 @@ public class ReportController { } private void repeatCardRemove(ReportInput input) { - // Card2 去重 + // Card2 鍘婚噸 if (StringUtils.isNotEmpty(input.getCard2()) && StringUtils.isNotEmpty(input.getCard1())) { if (input.getCard2().equals(input.getCard1())) { input.setCard2(null); } } - // Card3 去重 + // Card3 鍘婚噸 if (StringUtils.isNotEmpty(input.getCard3()) && StringUtils.isNotEmpty(input.getCard1())) { if (input.getCard3().equals(input.getCard1())) { input.setCard3(null); } } - // Card3 去重 + // Card3 鍘婚噸 if (StringUtils.isNotEmpty(input.getCard3()) && StringUtils.isNotEmpty(input.getCard2())) { if (input.getCard3().equals(input.getCard2())) { input.setCard3(null); } } - // Card4 去重 + // Card4 鍘婚噸 if (StringUtils.isNotEmpty(input.getCard4()) && StringUtils.isNotEmpty(input.getCard1())) { if (input.getCard4().equals(input.getCard1())) { input.setCard4(null); } } - // Card4 去重 + // Card4 鍘婚噸 if (StringUtils.isNotEmpty(input.getCard4()) && StringUtils.isNotEmpty(input.getCard2())) { if (input.getCard4().equals(input.getCard2())) { input.setCard4(null); } } - // Card4 去重 + // Card4 鍘婚噸 if (StringUtils.isNotEmpty(input.getCard4()) && StringUtils.isNotEmpty(input.getCard3())) { if (input.getCard4().equals(input.getCard3())) { input.setCard4(null); } } - // Card5 去重 + // Card5 鍘婚噸 if (StringUtils.isNotEmpty(input.getCard5()) && StringUtils.isNotEmpty(input.getCard1())) { if (input.getCard5().equals(input.getCard1())) { input.setCard5(null); } } - // Card5 去重 + // Card5 鍘婚噸 if (StringUtils.isNotEmpty(input.getCard5()) && StringUtils.isNotEmpty(input.getCard2())) { if (input.getCard5().equals(input.getCard2())) { input.setCard5(null); } } - // Card5 去重 + // Card5 鍘婚噸 if (StringUtils.isNotEmpty(input.getCard5()) && StringUtils.isNotEmpty(input.getCard3())) { if (input.getCard5().equals(input.getCard3())) { input.setCard5(null); } } - // Card5 去重 + // Card5 鍘婚噸 if (StringUtils.isNotEmpty(input.getCard5()) && StringUtils.isNotEmpty(input.getCard4())) { if (input.getCard5().equals(input.getCard4())) { input.setCard5(null); diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/ReportResultController.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/ReportResultController.java index bd08ead67..4f5cf7285 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/ReportResultController.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/ReportResultController.java @@ -27,7 +27,7 @@ import com.fangjia.service.pds.ReportResultService; import net.sf.json.JSONObject; /** - * 报告 + * 鎶ュ憡 * @author gaojuan * */ @@ -45,7 +45,7 @@ public class ReportResultController { private final String ROOT = CONFIG.isDevelopmentEnvironment() ? "/fangjia-pds" : ""; /** - * 预览 + * 棰勮 * * @param model * @return @@ -72,32 +72,32 @@ public class ReportResultController { } /** - * 查看详情 + * 鏌ョ湅璇︽儏 * * @param model * @return */ public Object infoAction(ReportResultModel model) { - LOG.warn("****************** 查看报告详情 开始******************"); - // 通过ReportInput id 构造QueryParam + LOG.warn("****************** 鏌ョ湅鎶ュ憡璇︽儏 寮�濮�******************"); + // 閫氳繃ReportInput id 鏋勯�燪ueryParam List params = new ArrayList(); params.add(new QueryParam("reportInputId", model.getReportInputId())); - // reportInput的id + // reportInput鐨刬d ReportInput reportInput = reportInputService.findById(model.getReportInputId()); - // 根据reportInput的id作为reportResult结果表中关联字段查询 + // 鏍规嵁reportInput鐨刬d浣滀负reportResult缁撴灉琛ㄤ腑鍏宠仈瀛楁鏌ヨ ReportResult reportResult = reportResultService.findByParams(params); - //根据reportInput的id作为reportCheck结果表中关联字段查询 + //鏍规嵁reportInput鐨刬d浣滀负reportCheck缁撴灉琛ㄤ腑鍏宠仈瀛楁鏌ヨ ReportCheck reportCheck = reportCheckService.findByInputId(model.getReportInputId()); - // 存入model + // 瀛樺叆model model.setReportResult(reportResult); model.setReportInput(reportInput); model.setReportCheck(reportCheck); - LOG.warn("****************** 查看报告详情 结束******************"); + LOG.warn("****************** 鏌ョ湅鎶ュ憡璇︽儏 缁撴潫******************"); return model; } /** - * 生成PDF报告 + * 鐢熸垚PDF鎶ュ憡 * * @param model * @param response @@ -105,29 +105,29 @@ public class ReportResultController { * @throws IOException */ public Object createPdfAction(ReportResultModel model, HttpServletResponse response) throws IOException{ - LOG.warn("开始下载......"); + LOG.warn("寮�濮嬩笅杞�......"); ReportResult reportResult = reportResultService.findById(model.getId()); if(null != reportResult){ String htmlUrl = "http://" + CONFIG.getDomainName() + ROOT + "/reportResult/show?id="+model.getId(); - LOG.warn("要下载的地址:"+htmlUrl); + LOG.warn("瑕佷笅杞界殑鍦板潃:"+htmlUrl); String toPdfTool = "wkhtmltopdf"; String filename= reportResult.getReportNumber() + ".pdf"; String outprintUrl = "e:/" + filename; if(System.getProperty("os.name").indexOf("Windows") == -1){ - //非windows 系统 + //闈瀢indows 绯荤粺 outprintUrl = "/home/goojia/pds-pdf/"+filename; } HtmlToPdf.convert(htmlUrl, outprintUrl, toPdfTool); DownloadPdf.download(outprintUrl, response); - LOG.warn("下载完成......"+outprintUrl); + LOG.warn("涓嬭浇瀹屾垚......"+outprintUrl); }else{ - LOG.warn("报告id为 "+model.getId()+" 不存在"); + LOG.warn("鎶ュ憡id涓� "+model.getId()+" 涓嶅瓨鍦�"); } model.setViewType("stream"); return model; } - //更新周边配套信息,用于生成pdf使用 + //鏇存柊鍛ㄨ竟閰嶅淇℃伅锛岀敤浜庣敓鎴恜df浣跨敤 public Object updateResultAction(ReportResultModel model){ ReportResult reportResult = reportResultService.findById(model.getId()); if(reportResult != null && StringUtils.isNotBlank(model.getPoiString())){ diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/RiskcontrolController.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/RiskcontrolController.java index 4a07747d4..cd0be91ab 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/RiskcontrolController.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/RiskcontrolController.java @@ -31,7 +31,7 @@ import java.text.SimpleDateFormat; import java.util.*; /** - * 押品风控 + * 鎶煎搧椋庢帶 * Created by linxsh on 2016/12/9. */ public class RiskcontrolController { @@ -44,14 +44,14 @@ public class RiskcontrolController { private MortgageInfoService mortgageInfoService; /** - * 押品风控页 + * 鎶煎搧椋庢帶椤� * @param request * @param model * @return * @throws Exception */ public Object indexAction(HttpServletRequest request, RiskControlModel model) throws Exception { - //获取登陆用户对应的企业ID + //鑾峰彇鐧婚檰鐢ㄦ埛瀵瑰簲鐨勪紒涓欼D String enterpriseId = PdsSessionContent.getLoginEnterpriseId(request); String userId = PdsSessionContent.getLoginUserId(request); // User user = pdsUserService.getUser(userId); @@ -65,24 +65,24 @@ public class RiskcontrolController { return model; } - //有效评估套数 + //鏈夋晥璇勪及濂楁暟 // long availableAssess = riskControlDetailService.countAvailableAssess(enterpriseId); - //贷款已结清 + //璐锋宸茬粨娓� // long clearCount = riskControlDetailService.countClearLoan(enterpriseId); /* String defaultCity = user.getRiskMapCity(); - //风险指数占比 + //椋庨櫓鎸囨暟鍗犳瘮 Map riskRateLevelMap = getRiskRateLevelMap(defaultCity); - //CLTV占比 + //CLTV鍗犳瘮 Map cltvLevelMap = getCltvLevelMap(defaultCity);*/ Date countDate = null; - long availableCount = 0;//有效评估套数 - long clearCount = 0;//贷款已结清套数 - long loanPrice = 0;//贷款总金额 - double loanBalance = 0;//贷款余额 - double totalLoanBalance = 0;//剩余本金 - long totalPrice = 0;//当前押品总市值 - long totalOriPrice = 0; //原始押品总市值 + long availableCount = 0;//鏈夋晥璇勪及濂楁暟 + long clearCount = 0;//璐锋宸茬粨娓呭鏁� + long loanPrice = 0;//璐锋鎬婚噾棰� + double loanBalance = 0;//璐锋浣欓 + double totalLoanBalance = 0;//鍓╀綑鏈噾 + long totalPrice = 0;//褰撳墠鎶煎搧鎬诲競鍊� + long totalOriPrice = 0; //鍘熷鎶煎搧鎬诲競鍊� if(CollectionUtils.isNotEmpty(riskControlDetails)) { for(RiskControlDetail riskControlDetail : riskControlDetails) { RiskControlDetailModel riskControlDetailModel = new RiskControlDetailModel(); @@ -99,24 +99,24 @@ public class RiskcontrolController { clearCount++; } - //累加贷款总金额 + //绱姞璐锋鎬婚噾棰� if(riskControlDetail.getLendingPrice() != null) { loanPrice += riskControlDetail.getLendingPrice(); } - //累加贷款余额 + //绱姞璐锋浣欓 if(riskControlDetail.getLoanBalance() != null) { loanBalance += riskControlDetail.getLoanBalance(); } - //累加押品总市值 + //绱姞鎶煎搧鎬诲競鍊� if(riskControlDetail.getCurPrice() != null) { totalPrice += riskControlDetail.getCurPrice(); } if(riskControlDetail.getOriPrice() != null) { totalOriPrice += riskControlDetail.getOriPrice(); } - //累加剩余本金 + //绱姞鍓╀綑鏈噾 String repayWay = riskControlDetail.getRepayWay(); - totalLoanBalance += LoanUtil.remainInterest(riskControlDetail.getLendingPrice(), riskControlDetail.getLoanMonth(), riskControlDetail.getRate(), "等额本息".equals(repayWay)?1:2, riskControlDetail.getLendingDate()); + totalLoanBalance += LoanUtil.remainInterest(riskControlDetail.getLendingPrice(), riskControlDetail.getLoanMonth(), riskControlDetail.getRate(), "绛夐鏈伅".equals(repayWay)?1:2, riskControlDetail.getLendingDate()); /* results.add(riskControlDetailModel); if(riskControlDetail.getCity() != null) { @@ -133,25 +133,25 @@ public class RiskcontrolController { totalLtv = loanPrice * 1.0 / totalOriPrice; } - //存量押品总市值 + //瀛橀噺鎶煎搧鎬诲競鍊� Double stockHousePrice = new BigDecimal(CommonUtil.formatNumber(totalPrice/10000.0, 2)).doubleValue(); - //贷款余额 + //璐锋浣欓 Double stockBalance = new BigDecimal(CommonUtil.formatNumber(loanBalance/10000.0, 2)).doubleValue(); - //原始抵押率LTV + //鍘熷鎶垫娂鐜嘗TV Double oriMortgageRate = new BigDecimal(CommonUtil.formatNumber(totalLtv, 2)).doubleValue(); - //即时抵押率CLTV + //鍗虫椂鎶垫娂鐜嘋LTV Double curMortgageRate = new BigDecimal(CommonUtil.formatNumber(totalCltv, 2)).doubleValue(); - //存量押品平均涨幅 + //瀛橀噺鎶煎搧骞冲潎娑ㄥ箙 Double stockHousePriceAvgRate = riskControl.getStockHouseAvgRate(); - //CPDB押品平均涨幅 + //CPDB鎶煎搧骞冲潎娑ㄥ箙 Double cpdbHousePriceAvgRate = riskControl.getCpdbHouseAvgRate(); - //存量押品涨跌比率及对应增长率 + //瀛橀噺鎶煎搧娑ㄨ穼姣旂巼鍙婂搴斿闀跨巼 Double stockHousePriceUpRate = CommonUtil.formatNumber(riskControl.getStockUpRate(), 2); Double stockHousePriceDownRate = CommonUtil.formatNumber(riskControl.getStockDownRate(), 2); Double stockHousePriceUpAvgRate = riskControl.getTotalUpAvgRate(); Double stockHousePriceDownAvgRate = riskControl.getTotalDownAvgRate(); - //CPDB押品涨跌比率及对应增长率 + //CPDB鎶煎搧娑ㄨ穼姣旂巼鍙婂搴斿闀跨巼 Double cpdbHousePriceUpRate = CommonUtil.formatNumber(riskControl.getCpdbUpRate(), 2); Double cpdbHousePriceDownRate = CommonUtil.formatNumber(riskControl.getCpdbDownRate(), 2); Double cpdbHousePriceUpAvgRate = riskControl.getCpdbUpAvgRate(); @@ -184,7 +184,7 @@ public class RiskcontrolController { /** - * 押品列表页 + * 鎶煎搧鍒楄〃椤� * @return */ public Object listAction(HttpServletRequest request, RiskControlDetailListModel model) { @@ -206,12 +206,12 @@ public class RiskcontrolController { List results = Lists.newArrayList(); Date countDate = null; - int availableCount = 0;//有效评估套数 - int clearCount = 0;//贷款已结清套数 - long loanPrice = 0;//贷款总金额 - double loanBalance = 0;//贷款余额 - double totalLoanBalance = 0;//剩余本金 - long totalPrice = 0;//查询结果的押品总市值 + int availableCount = 0;//鏈夋晥璇勪及濂楁暟 + int clearCount = 0;//璐锋宸茬粨娓呭鏁� + long loanPrice = 0;//璐锋鎬婚噾棰� + double loanBalance = 0;//璐锋浣欓 + double totalLoanBalance = 0;//鍓╀綑鏈噾 + long totalPrice = 0;//鏌ヨ缁撴灉鐨勬娂鍝佹�诲競鍊� Set cities = Sets.newHashSet(); if(CollectionUtils.isNotEmpty(riskControlDetails)) { for(RiskControlDetail riskControlDetail : riskControlDetails) { @@ -229,21 +229,21 @@ public class RiskcontrolController { clearCount++; } - //累加贷款总金额 + //绱姞璐锋鎬婚噾棰� if(riskControlDetail.getLendingPrice() != null) { loanPrice += riskControlDetail.getLendingPrice(); } - //累加贷款余额 + //绱姞璐锋浣欓 if(riskControlDetail.getLoanBalance() != null) { loanBalance += riskControlDetail.getLoanBalance(); } - //累加押品总市值 + //绱姞鎶煎搧鎬诲競鍊� if(riskControlDetail.getCurPrice() != null) { totalPrice += riskControlDetail.getCurPrice(); } - //累加剩余本金 + //绱姞鍓╀綑鏈噾 String repayWay = riskControlDetail.getRepayWay(); - totalLoanBalance += LoanUtil.remainInterest(riskControlDetail.getLendingPrice(), riskControlDetail.getLoanMonth(), riskControlDetail.getRate(), "等额本息".equals(repayWay)?1:2, riskControlDetail.getLendingDate()); + totalLoanBalance += LoanUtil.remainInterest(riskControlDetail.getLendingPrice(), riskControlDetail.getLoanMonth(), riskControlDetail.getRate(), "绛夐鏈伅".equals(repayWay)?1:2, riskControlDetail.getLendingDate()); results.add(riskControlDetailModel); if(riskControlDetail.getCity() != null) { @@ -310,14 +310,14 @@ public class RiskcontrolController { } /** - * 走势图 + * 璧板娍鍥� * @param request * @param model * @return * @throws Exception */ public Object trendAction(HttpServletRequest request, JsonModel model) throws Exception { - //获取登陆用户对应的企业ID + //鑾峰彇鐧婚檰鐢ㄦ埛瀵瑰簲鐨勪紒涓欼D String enterpriseId = PdsSessionContent.getLoginEnterpriseId(request); RiskControl riskControl = riskControlService.findYearlyTend(enterpriseId); @@ -334,15 +334,15 @@ public class RiskcontrolController { } } - trendMap.put("存量押品市值走势", sortMap(monthlyTotalTrend)); - trendMap.put("CPDB押品市值走势", sortMap(monthlyTotalCpdbTrend)); + trendMap.put("瀛橀噺鎶煎搧甯傚�艰蛋鍔�", sortMap(monthlyTotalTrend)); + trendMap.put("CPDB鎶煎搧甯傚�艰蛋鍔�", sortMap(monthlyTotalCpdbTrend)); model.setJsonModel(ImmutableMap.of("trend", trendMap)); return model; } /** - * 构建查询参数 + * 鏋勫缓鏌ヨ鍙傛暟 * @param model * @return */ @@ -425,7 +425,7 @@ public class RiskcontrolController { data.put("defaultRiskMapCity", user.getRiskMapCity()); data.put("defaultCltvMapCity", user.getCltvMapCity()); if(StringUtils.isNotBlank(model.getCityName())) { - String defaultCity = model.getCityName().replace("中国", ""); + String defaultCity = model.getCityName().replace("涓浗", ""); data.put("riskRateLevelMap", getRiskRateLevelMap(enterpriseId, defaultCity)); data.put("cltvLevelMap", getCltvLevelMap(enterpriseId, defaultCity)); } else { @@ -490,7 +490,7 @@ public class RiskcontrolController { } /** - * 地图数据 + * 鍦板浘鏁版嵁 * @param request * @param model * @return @@ -511,7 +511,7 @@ public class RiskcontrolController { Map result = Maps.newHashMap(); List cities = pdsRiskMapService.findAllCities(enterpriseId); - //加载详情 + //鍔犺浇璇︽儏 if(loadDetail != null && loadDetail) { List riskMaps = loadMapDetail(enterpriseId, city); result.put("datas", riskMaps); @@ -557,7 +557,7 @@ public class RiskcontrolController { } /** - * 按区域统计押品数量 + * 鎸夊尯鍩熺粺璁℃娂鍝佹暟閲� * @param enterpriseId * @param city */ @@ -581,7 +581,7 @@ public class RiskcontrolController { /** - * 地图数据详情 + * 鍦板浘鏁版嵁璇︽儏 * @param enterpriseId * @throws Exception */ @@ -589,8 +589,8 @@ public class RiskcontrolController { List pdsRiskMapDatas = pdsRiskMapService.findAll(enterpriseId, city); /*List pdsRiskMapDatas = Lists.newArrayList(); PdsRiskMap testpdsRiskMap = new PdsRiskMap(); - testpdsRiskMap.setName("张三"); - testpdsRiskMap.setCity("上海"); + testpdsRiskMap.setName("寮犱笁"); + testpdsRiskMap.setCity("涓婃捣"); testpdsRiskMap.setCountDate("2016.12.03"); testpdsRiskMap.setCreateDate(new Date()); testpdsRiskMap.setCurMortgageRate(0.3); @@ -632,7 +632,7 @@ public class RiskcontrolController { riskMapModel.setRiskRate(CommonUtil.formatNumber(pdsRiskMap.getRiskRate() * 100, 2)); } if(pdsRiskMap.getRepaymentWay() != null) { - riskMapModel.setRepaymentWay(pdsRiskMap.getRepaymentWay() == 1 ? "等额本息" : "等额本金"); + riskMapModel.setRepaymentWay(pdsRiskMap.getRepaymentWay() == 1 ? "绛夐鏈伅" : "绛夐鏈噾"); } riskMaps.add(riskMapModel); @@ -643,7 +643,7 @@ public class RiskcontrolController { } /** - * 修改当前用户的默认城市 + * 淇敼褰撳墠鐢ㄦ埛鐨勯粯璁ゅ煄甯� * @return */ public Object changeDefaultCityAction(HttpServletRequest request, diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/RoleController.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/RoleController.java index 876b24be1..da6560528 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/RoleController.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/RoleController.java @@ -43,7 +43,7 @@ public class RoleController { } /** - * 角色列表页面 + * 瑙掕壊鍒楄〃椤甸潰 * @param model * @param request * @return @@ -53,7 +53,7 @@ public class RoleController { String enterpriseId = PdsSessionContent.getLoginEnterpriseId(request); model.setRoles(pdsRoleService.queryRoleByenterpriseId(enterpriseId)); - //设置权限信息 + //璁剧疆鏉冮檺淇℃伅 List groupInfos = new ArrayList(); List groups = pdsAuthorityGroupService.queryGroups(); for (AuthorityGroup group : groups) { @@ -64,13 +64,13 @@ public class RoleController { } model.setGroupInfos(groupInfos); } catch (Exception e) { - LOGGER.error("角色列表页面异常", e); + LOGGER.error("瑙掕壊鍒楄〃椤甸潰寮傚父", e); } return model; } /** - * 查询角色下的权限 + * 鏌ヨ瑙掕壊涓嬬殑鏉冮檺 * @param role * @return */ @@ -78,17 +78,17 @@ public class RoleController { try { Role old = pdsRoleService.getRole(role.getId()); if (old == null) { - return new JsonResultModel(false, "角色不存在"); + return new JsonResultModel(false, "瑙掕壊涓嶅瓨鍦�"); } return new JsonResultModel(true, pdsAuthorityService.queryAuthoritys(old.getAuthoritys())); } catch (Exception e) { - LOGGER.error("查询角色下的权限异常", e); + LOGGER.error("鏌ヨ瑙掕壊涓嬬殑鏉冮檺寮傚父", e); return new JsonResultModel(false, e.getMessage()); } } /** - * 保存角色 + * 淇濆瓨瑙掕壊 * @param role * @return */ @@ -99,14 +99,14 @@ public class RoleController { role.setEnterpriseId(enterpriseId); pdsRoleService.saveRole(role); } catch (Exception e) { - LOGGER.error("保存角色异常", e); + LOGGER.error("淇濆瓨瑙掕壊寮傚父", e); return new JsonResultModel(false, e.getMessage()); } return new JsonResultModel(true); } /** - * 修改角色 + * 淇敼瑙掕壊 * @param role * @return */ @@ -115,16 +115,16 @@ public class RoleController { String enterpriseId = PdsSessionContent.getLoginEnterpriseId(request); Role old = pdsRoleService.getRole(role.getId()); if (old == null) { - return new JsonResultModel(false, "要修改的角色不存在"); + return new JsonResultModel(false, "瑕佷慨鏀圭殑瑙掕壊涓嶅瓨鍦�"); } if (!old.getEnterpriseId().equals(enterpriseId)) { - return new JsonResultModel(false, "只能修改本企业的角色"); + return new JsonResultModel(false, "鍙兘淇敼鏈紒涓氱殑瑙掕壊"); } role.setEnterpriseId(old.getEnterpriseId()); role.setCreateDate(old.getCreateDate()); pdsRoleService.updateRole(role); } catch (Exception e) { - LOGGER.error("修改角色异常", e); + LOGGER.error("淇敼瑙掕壊寮傚父", e); return new JsonResultModel(false, e.getMessage()); } return new JsonResultModel(true); diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/UserController.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/UserController.java index ac1dff3c1..cfe051535 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/UserController.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/UserController.java @@ -51,7 +51,7 @@ import com.fangjia.service.sms.SmsException; import com.fangjia.service.sms.SmsService; /** - * PDS用户控制器 + * PDS鐢ㄦ埛鎺у埗鍣� * @author yinjihuan * */ @@ -61,7 +61,7 @@ public class UserController { private PdsUserService pdsUserService; /** - * 短信Service + * 鐭俊Service */ private SmsService smsService; @@ -121,13 +121,13 @@ public class UserController { model.setNotices(notices); } } catch (Exception e) { - LOGGER.error("查询公告信息异常", e); + LOGGER.error("鏌ヨ鍏憡淇℃伅寮傚父", e); } return model; } /** - * 链接登录加密链接 + * 閾炬帴鐧诲綍鍔犲瘑閾炬帴 * @param model * @return */ @@ -139,13 +139,13 @@ public class UserController { String codeToken = URLEncoder.encode(DesUtils.encrypt(model.getCodeToken(), "fangjia_pds_goojia"), "utf-8"); return model.getWwwUrl() + "/user/linkLogin?codeToken=" + codeToken; } catch (Exception e) { - LOGGER.error("链接请求直接登录异常", e); + LOGGER.error("閾炬帴璇锋眰鐩存帴鐧诲綍寮傚父", e); } return model.redirect("/index"); } /** - * 链接请求直接登录(新需求) + * 閾炬帴璇锋眰鐩存帴鐧诲綍锛堟柊闇�姹傦級 * @param model * @param req * @param response @@ -168,14 +168,14 @@ public class UserController { } setUserSessionInfo(req, user); } catch (Exception e) { - LOGGER.error("链接请求直接登录异常", e); + LOGGER.error("閾炬帴璇锋眰鐩存帴鐧诲綍寮傚父", e); } return model.redirect("/index"); } /** - * 用户登录 + * 鐢ㄦ埛鐧诲綍 * @param model * @param req * @param response @@ -190,13 +190,13 @@ public class UserController { } String codeToken = StringUtils.trimToNull(model.getCodeToken()); if (StringUtils.isBlank(code) || StringUtils.isBlank(username)) { - return new JsonResultModel(false, "参数不完整"); + return new JsonResultModel(false, "鍙傛暟涓嶅畬鏁�"); } try { User user = pdsUserService.getUserByMobile(username); - //不存在继续走流程是为了提示用户账户没注册,后续的流程中有判断 + //涓嶅瓨鍦ㄧ户缁蛋娴佺▼鏄负浜嗘彁绀虹敤鎴疯处鎴锋病娉ㄥ唽锛屽悗缁殑娴佺▼涓湁鍒ゆ柇 if(user != null) { Enterprise enterprise = enterpriseService.getEnterprise(user.getEnterpriseId()); if (enterprise == null || !enterprise.getEnterpriseStatus()) { @@ -208,7 +208,7 @@ public class UserController { if(enterprise.getEndDateLimit() != null && enterprise.getEndDateLimit().before(new Date())) { return new JsonResultModel(false, Message.PDS_EXPIRED); } - //验证IP白名单 + //楠岃瘉IP鐧藉悕鍗� List whiteIps = enterprise.getWhiteIps(); if(null != whiteIps && whiteIps.size() > 0){ String ip = AnalyticsUtil.getIpAddress(req); @@ -220,7 +220,7 @@ public class UserController { } } if(!passed){ - LOGGER.warn("非法登录IP:" + ip); + LOGGER.warn("闈炴硶鐧诲綍IP:" + ip); return new JsonResultModel(false, Message.IP_FORBID); } } @@ -229,10 +229,10 @@ public class UserController { return new JsonResultModel(false, Message.USER_PROHIBIT); }*/ } catch (Exception e) { - LOGGER.error("用户登录异常", e); + LOGGER.error("鐢ㄦ埛鐧诲綍寮傚父", e); } - //密码为空表示短信验证码登录,否则账号密码登录 + //瀵嗙爜涓虹┖琛ㄧず鐭俊楠岃瘉鐮佺櫥褰�,鍚﹀垯璐﹀彿瀵嗙爜鐧诲綍 if (StringUtils.isBlank(pass)) { return smsCodeLogin(username, code, req); } else { @@ -241,11 +241,11 @@ public class UserController { } /** - * 账号登录 - * @param username 用户名 - * @param pass 密码 - * @param code 验证码 - * @param codeToken 验证码Token + * 璐﹀彿鐧诲綍 + * @param username 鐢ㄦ埛鍚� + * @param pass 瀵嗙爜 + * @param code 楠岃瘉鐮� + * @param codeToken 楠岃瘉鐮乀oken * @param req * @return */ @@ -267,14 +267,14 @@ public class UserController { } setUserSessionInfo(req, user); } catch (Exception e) { - LOGGER.error("账号登录异常", e); + LOGGER.error("璐﹀彿鐧诲綍寮傚父", e); return new JsonResultModel(false, e.getMessage()); } return new JsonResultModel(true); } /** - * 设置登录后的Session信息 + * 璁剧疆鐧诲綍鍚庣殑Session淇℃伅 * @param req * @param user */ @@ -293,14 +293,14 @@ public class UserController { user.setLastLoginDate(new Date()); pdsUserService.updateUser(user); } catch (Exception e) { - LOGGER.error("查询用户权限异常", e); + LOGGER.error("鏌ヨ鐢ㄦ埛鏉冮檺寮傚父", e); } } /** - * 短信验证码登录 - * @param username 用户名 - * @param code 验证码 + * 鐭俊楠岃瘉鐮佺櫥褰� + * @param username 鐢ㄦ埛鍚� + * @param code 楠岃瘉鐮� * @param req * @return */ @@ -321,18 +321,18 @@ public class UserController { } setUserSessionInfo(req, user); } catch (Exception e) { - LOGGER.error("短信登录异常", e); + LOGGER.error("鐭俊鐧诲綍寮傚父", e); return new JsonResultModel(false, e.getMessage()); } - //验证码登录需要判断是否有密码,无密码则登录后跳转到设置密码页面 + //楠岃瘉鐮佺櫥褰曢渶瑕佸垽鏂槸鍚︽湁瀵嗙爜锛屾棤瀵嗙爜鍒欑櫥褰曞悗璺宠浆鍒拌缃瘑鐮侀〉闈� return new JsonResultModel(true, StringUtils.isBlank(user.getPass())); } /** - * 获取缓存的验证码 + * 鑾峰彇缂撳瓨鐨勯獙璇佺爜 * @author yinjihuan - * @param mobile 手机 - * @param type 类型 + * @param mobile 鎵嬫満 + * @param type 绫诲瀷 * @return */ private String getCacheCode(String mobile, String type) { @@ -341,7 +341,7 @@ public class UserController { } /** - * 发送验证码到指定的手机上 + * 鍙戦�侀獙璇佺爜鍒版寚瀹氱殑鎵嬫満涓� * @author yinjihuan * @param model * @return @@ -351,7 +351,7 @@ public class UserController { String type = StringUtils.trimToNull(model.getType()); String codeToken = StringUtils.trimToNull(model.getCodeToken()); String code = StringUtils.trimToNull(model.getCode()); - //判断是不是被禁用的用户 + //鍒ゆ柇鏄笉鏄绂佺敤鐨勭敤鎴� try{ if(!pdsUserService.checkIsLoginEnt(mobile)){ return new JsonResultModel(false, Message.ENT_PROHIBIT); @@ -360,7 +360,7 @@ public class UserController { return new JsonResultModel(false, Message.USER_PROHIBIT); } } catch (Exception e) { - LOGGER.error("账号登录异常", e); + LOGGER.error("璐﹀彿鐧诲綍寮傚父", e); return new JsonResultModel(false, e.getMessage()); } @@ -391,7 +391,7 @@ public class UserController { return new JsonResultModel(false, Message.PDS_EXPIRED); } } catch (Exception e) { - LOGGER.error("发送登录验证码异常", e); + LOGGER.error("鍙戦�佺櫥褰曢獙璇佺爜寮傚父", e); return new JsonResultModel(false, e.getMessage()); } return sendCode(model, mobile, type); @@ -400,17 +400,17 @@ public class UserController { private Object sendCode(SendCodeModel model, String mobile, String type) { String code = pdsUserService.randomCode(); try { - smsService.send(model.getMobile(), "【房价网】你的验证码是" + code + ",验证码5分钟内有效,请立即验证。"); + smsService.send(model.getMobile(), "銆愭埧浠风綉銆戜綘鐨勯獙璇佺爜鏄�" + code + ",楠岃瘉鐮�5鍒嗛挓鍐呮湁鏁堬紝璇风珛鍗抽獙璇併��"); CacheUtils.putValue(CachePolicyEnum.TINY, PdsUserService.class, mobile + "_" + type, code); } catch (SmsException e) { - LOGGER.error("发送登录验证码异常", e); + LOGGER.error("鍙戦�佺櫥褰曢獙璇佺爜寮傚父", e); return new JsonResultModel(false, Message.SMS_CODE_SEND_FAIL); } return new JsonResultModel(true); } /** - * 密码设置页面 + * 瀵嗙爜璁剧疆椤甸潰 * @return */ public Object passAction() { @@ -418,7 +418,7 @@ public class UserController { } /** - * 个人信息设置页面 + * 涓汉淇℃伅璁剧疆椤甸潰 * @return */ public Object infoAction() { @@ -426,7 +426,7 @@ public class UserController { } /** - * 退出系统 + * 閫�鍑虹郴缁� * @param request * @param model * @return @@ -438,7 +438,7 @@ public class UserController { } /** - * 发送更换手机号验证码 + * 鍙戦�佹洿鎹㈡墜鏈哄彿楠岃瘉鐮� * @param model * @return */ @@ -457,7 +457,7 @@ public class UserController { } /** - * 更换手机 + * 鏇存崲鎵嬫満 * @param model * @return */ @@ -492,7 +492,7 @@ public class UserController { pdsUserService.updateUser(user); request.getSession().setAttribute("login_mobile", mobile); } catch (Exception e) { - LOGGER.error("更换手机异常", e); + LOGGER.error("鏇存崲鎵嬫満寮傚父", e); return new JsonResultModel(false, e.getMessage()); } @@ -500,7 +500,7 @@ public class UserController { } /** - * 修改密码 + * 淇敼瀵嗙爜 * @param model * @return */ @@ -520,7 +520,7 @@ public class UserController { String userId = PdsSessionContent.getLoginUserId(request); try { User user = pdsUserService.getUser(userId); - //原始密码为空表示第一次设置密码,无原始密码 + //鍘熷瀵嗙爜涓虹┖琛ㄧず绗竴娆¤缃瘑鐮侊紝鏃犲師濮嬪瘑鐮� if (!StringUtils.isBlank(oldPass) && !user.getPass().equals(oldPass)) { return new JsonResultModel(false, Message.PASS_OLD); } @@ -528,7 +528,7 @@ public class UserController { pdsUserService.updateUser(user); request.getSession().setAttribute("login_user_info", user); } catch (Exception e) { - LOGGER.error("修改密码异常", e); + LOGGER.error("淇敼瀵嗙爜寮傚父", e); return new JsonResultModel(false, e.getMessage()); } @@ -536,7 +536,7 @@ public class UserController { } /** - * 进入找回密码页面 + * 杩涘叆鎵惧洖瀵嗙爜椤甸潰 * @return */ public Object findPassAction() { @@ -544,7 +544,7 @@ public class UserController { } /** - * 找回密码 + * 鎵惧洖瀵嗙爜 * @param model * @return */ @@ -581,14 +581,14 @@ public class UserController { pdsUserService.updateUser(user); setUserSessionInfo(req, user); } catch (Exception e) { - LOGGER.error("找回密码异常", e); + LOGGER.error("鎵惧洖瀵嗙爜寮傚父", e); return new JsonResultModel(false, e.getMessage()); } return new JsonResultModel(true); } /** - * 用户列表页面 + * 鐢ㄦ埛鍒楄〃椤甸潰 * @param model * @return */ @@ -609,13 +609,13 @@ public class UserController { } model.setUserInfos(list); } catch (Exception e) { - LOGGER.error("用户列表页面异常", e); + LOGGER.error("鐢ㄦ埛鍒楄〃椤甸潰寮傚父", e); } return model; } /** - * 用户添加页面 + * 鐢ㄦ埛娣诲姞椤甸潰 * @param model * @param request * @return @@ -633,13 +633,13 @@ public class UserController { model.setProvinceCitys(CityFactory.getInstance().getProvinceCitiesMap()); model.setEnterpriseRoles(pdsRoleService.queryRoleByenterpriseId(enterpriseId)); } catch (Exception e) { - LOGGER.error("用户添加页面异常", e); + LOGGER.error("鐢ㄦ埛娣诲姞椤甸潰寮傚父", e); } return model; } /** - * 保存或者修改用户信息 + * 淇濆瓨鎴栬�呬慨鏀圭敤鎴蜂俊鎭� * @param user * @param request * @return @@ -653,29 +653,29 @@ public class UserController { if (citys != null) { for (String city : citys) { if (!enterprise.getEnterpriseCitys().contains(city)) { - return new JsonResultModel(false, "企业没开通" + city); + return new JsonResultModel(false, "浼佷笟娌″紑閫�" + city); } } } - //保存 + //淇濆瓨 user.setUpdateDate(new Date()); if (StringUtils.isBlank(user.getId())) { User mobileUser = pdsUserService.getUserByMobile(user.getMobile()); if (mobileUser != null) { - return new JsonResultModel(false, "此号已注册"); + return new JsonResultModel(false, "姝ゅ彿宸叉敞鍐�"); } user.setId(null); user.setCreateDate(new Date()); user.setLastLoginDate(new Date()); user.setEnterpriseId(enterpriseId); user.setEnterpriseName(enterprise.getEnterpriseName()); - //2018-11-20新版需求调整前端创建用户默认类型为:普通用户 -- 用户类型(0管理员 1普通用户) + //2018-11-20鏂扮増闇�姹傝皟鏁村墠绔垱寤虹敤鎴烽粯璁ょ被鍨嬩负:鏅�氱敤鎴� -- 鐢ㄦ埛绫诲瀷锛�0绠$悊鍛� 1鏅�氱敤鎴凤級 user.setUserType(1); pdsUserService.saveUser(user); } else { User old = pdsUserService.getUser(user.getId()); if (old == null) { - return new JsonResultModel(false, "修改的用户不存在"); + return new JsonResultModel(false, "淇敼鐨勭敤鎴蜂笉瀛樺湪"); } user.setCreateDate(old.getCreateDate()); user.setEnterpriseId(old.getEnterpriseId()); @@ -692,7 +692,7 @@ public class UserController { } } catch (Exception e) { - LOGGER.error("保存或者修改用户信息异常", e); + LOGGER.error("淇濆瓨鎴栬�呬慨鏀圭敤鎴蜂俊鎭紓甯�", e); return new JsonResultModel(false, e.getMessage()); } return new JsonResultModel(true); diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/ZichanController.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/ZichanController.java index 17119b8de..2e9d4fab8 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/ZichanController.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/controllers/ZichanController.java @@ -36,7 +36,7 @@ import java.util.List; import java.util.Map; /** - * 资产管理Controller + * 璧勪骇绠$悊Controller */ public class ZichanController { @@ -108,10 +108,10 @@ public class ZichanController { loanApply.setTotalPrice(houseInfo.getTotalPrice()); if("personal".equalsIgnoreCase(loanApply.getCategory())){ loanApply.setAvailableMoney(loanApply.getTotalPrice() * 0.6); - houseInfo.setUsage("消费"); + houseInfo.setUsage("娑堣垂"); }else{ loanApply.setAvailableMoney(loanApply.getTotalPrice() * 0.6); - houseInfo.setUsage("经营"); + houseInfo.setUsage("缁忚惀"); } houseInfoService.save(houseInfo); loanApplyService.save(loanApply); @@ -162,7 +162,7 @@ public class ZichanController { params.put("unitNumber", houseInfo.getUnitNumber()); params.put("roomNumber", houseInfo.getRoomNumber()); params.put("size", houseInfo.getArea()); - if(houseInfo.getEstateType() != null && houseInfo.getEstateType().contains("别墅")){ + if(houseInfo.getEstateType() != null && houseInfo.getEstateType().contains("鍒")){ params.put("propertyType", 1); }else{ params.put("propertyType", 2); @@ -278,7 +278,7 @@ public class ZichanController { } if(StringUtils.isBlank(code)){ - eamModel.setMsg("企业编码缺失!"); + eamModel.setMsg("浼佷笟缂栫爜缂哄け!"); return eamModel; } Enterprise enterprise = null; @@ -288,17 +288,17 @@ public class ZichanController { } if(enterprise == null){ - eamModel.setMsg("无效的企业编码"); + eamModel.setMsg("鏃犳晥鐨勪紒涓氱紪鐮�"); return eamModel; } if((enterprise.getEnterpriseStatus() != null && !enterprise.getEnterpriseStatus()) || (enterprise.getHuoKeStatus() != null && !enterprise.getHuoKeStatus())){ - eamModel.setMsg("账号已关闭"); + eamModel.setMsg("璐﹀彿宸插叧闂�"); return eamModel; } CookieUtils.setCookie("code", code, "/", COOKIE_EXPIRES_AGE, response); if(StringUtils.isBlank(eamModel.getSource())){ - eamModel.setSource("未知"); + eamModel.setSource("鏈煡"); } CookieUtils.setCookie("source", DataUtil.urlEncode(eamModel.getSource()), "/", COOKIE_EXPIRES_AGE, response); EamUser eamUser = getEamUserFromCookie(request); @@ -308,7 +308,7 @@ public class ZichanController { } CookieUtils.setCookie(EAM_USER_ID_COOKIE_NAME, eamUser.getId(), "/", COOKIE_EXPIRES_AGE, response); List houseInfos = houseInfoService.findByUserId(eamUser.getId()); - Map gatherPriceInfo = gatherPriceInfo(houseInfos);//获取用户所有资产信息汇总信息 + Map gatherPriceInfo = gatherPriceInfo(houseInfos);//鑾峰彇鐢ㄦ埛鎵�鏈夎祫浜т俊鎭眹鎬讳俊鎭� eamModel.setAllPurchasePrice(gatherPriceInfo.get("allPurchasePrice")); eamModel.setAllTotalPrice(gatherPriceInfo.get("allTotalPrice")); eamModel.setHouseInfos(houseInfos); @@ -394,7 +394,7 @@ public class ZichanController { } /** - * 判断是否存在均价 + * 鍒ゆ柇鏄惁瀛樺湪鍧囦环 * @param city * @param region * @param name @@ -425,23 +425,23 @@ public class ZichanController { BaseAjaxModel result = new BaseAjaxModel(); json.setJsonModel(result); if(StringUtils.isBlank(mobile) || StringUtils.isBlank(smsCode)){ - result.setMsg("参数不完整"); + result.setMsg("鍙傛暟涓嶅畬鏁�"); return json; } BasicDBObject smsCodeCacheBean = (BasicDBObject)getCacheCode(mobile, Message.SMS_CODE_TYPE_CI_CHAN); if(smsCodeCacheBean == null){ - result.setMsg("验证码不正确,请重新输入!"); + result.setMsg("楠岃瘉鐮佷笉姝g‘锛岃閲嶆柊杈撳叆锛�"); return json; } if(smsCodeCacheBean != null){ String cacheSmsCode = smsCodeCacheBean.getString("code"); long expireTime = smsCodeCacheBean.getLong("expireTime"); if(!smsCode.equals(cacheSmsCode)){ - result.setMsg("验证码不正确,请重新输入!"); + result.setMsg("楠岃瘉鐮佷笉姝g‘锛岃閲嶆柊杈撳叆锛�"); return json; } if(expireTime < System.currentTimeMillis()){ - result.setMsg("短信验证码已过期!"); + result.setMsg("鐭俊楠岃瘉鐮佸凡杩囨湡锛�"); return json; } @@ -470,25 +470,25 @@ public class ZichanController { BaseAjaxModel result = new BaseAjaxModel(); json.setJsonModel(result); if(StringUtils.isBlank(code) || StringUtils.isBlank(token) || StringUtils.isBlank(mobile)){ - result.setMsg("参数非法"); + result.setMsg("鍙傛暟闈炴硶"); return json; } String cacheCode = (String) getCacheCode(token, Message.SMS_CODE_TYPE_LOGIN); - LOGGER.info("验证码:{},手机号:{},Cache Code:{}, Token:{}",new String[]{cacheCode, mobile, cacheCode,token}); + LOGGER.info("楠岃瘉鐮�:{},鎵嬫満鍙�:{},Cache Code:{}, Token:{}",new String[]{cacheCode, mobile, cacheCode,token}); if(!code.equalsIgnoreCase(cacheCode)){ - result.setMsg("验证码错误,请重新输入!"); + result.setMsg("楠岃瘉鐮侀敊璇紝璇烽噸鏂拌緭鍏ワ紒"); return json; } try { code = pdsUserService.randomCode(); - smsService.send(mobile, "【房价网】你的验证码是" + code + ",验证码5分钟内有效,请立即验证。"); + smsService.send(mobile, "銆愭埧浠风綉銆戜綘鐨勯獙璇佺爜鏄�" + code + ",楠岃瘉鐮�5鍒嗛挓鍐呮湁鏁堬紝璇风珛鍗抽獙璇併��"); BasicDBObject smsCode = new BasicDBObject(); smsCode.put("code", code); smsCode.put("expireTime", System.currentTimeMillis() + 1000 * 60 * 5); CacheUtils.putValue(CacheUtils.CachePolicyEnum.TINY, PdsUserService.class, mobile + "_" + Message.SMS_CODE_TYPE_CI_CHAN, smsCode); } catch (SmsException e) { - result.setMsg("验证码发送失败"); + result.setMsg("楠岃瘉鐮佸彂閫佸け璐�"); return json; } result.setSuccess(true); @@ -497,10 +497,10 @@ public class ZichanController { } /** - * 获取缓存的验证码 + * 鑾峰彇缂撳瓨鐨勯獙璇佺爜 * @author yinjihuan - * @param mobile 手机 - * @param type 类型 + * @param mobile 鎵嬫満 + * @param type 绫诲瀷 * @return */ private Object getCacheCode(String mobile, String type) { @@ -522,13 +522,13 @@ public class ZichanController { params.put("unitNumber", houseInfo.getUnitNumber()); params.put("roomNumber", houseInfo.getRoomNumber()); params.put("size", houseInfo.getArea()); - if(houseInfo.getEstateType() != null && houseInfo.getEstateType().contains("别墅")){ + if(houseInfo.getEstateType() != null && houseInfo.getEstateType().contains("鍒")){ params.put("propertyType", 1); }else{ params.put("propertyType", 2); } JSONObject resp = pdsApiProxyService.invoke(PdsAPIs.EVALUATION.getUri(), params); - if(resp.getString("msg").contains("不支持")){ + if(resp.getString("msg").contains("涓嶆敮鎸�")){ data.setSuccess(false); } return json; diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/customlabel/AuthorityDirective.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/customlabel/AuthorityDirective.java index 20a4b5a9f..717ee1e93 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/customlabel/AuthorityDirective.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/customlabel/AuthorityDirective.java @@ -12,11 +12,11 @@ import freemarker.template.TemplateException; import freemarker.template.TemplateModel; /** - * 自定义A标签,控制权限用 + * 鑷畾涔堿鏍囩锛屾帶鍒舵潈闄愮敤 * @author yinjihuan - * 用法:<@d_a text="设置" href="/user/info" target="_blank" uri="/user" type="disabled" class="btn" style="color:red;" id="saveBtn"/>
- * text:显示的文字
href:链接地址
target:打开方式
uri:权限地址
- * type:取值disabled为禁用操作,无权限点击弹出提示框,取值hidden为隐藏 + * 鐢ㄦ硶锛�<@d_a text="璁剧疆" href="/user/info" target="_blank" uri="/user" type="disabled" class="btn" style="color:red;" id="saveBtn"/>
+ * text:鏄剧ず鐨勬枃瀛�
href:閾炬帴鍦板潃
target锛氭墦寮�鏂瑰紡
uri:鏉冮檺鍦板潃
+ * type:鍙栧�糳isabled涓虹鐢ㄦ搷浣滐紝鏃犳潈闄愮偣鍑诲脊鍑烘彁绀烘锛屽彇鍊糷idden涓洪殣钘� */ public class AuthorityDirective implements TemplateDirectiveModel { @@ -24,11 +24,11 @@ public class AuthorityDirective implements TemplateDirectiveModel { @Override public void execute(Environment env, Map params, TemplateModel[] loopVars, TemplateDirectiveBody body) throws TemplateException, IOException { - //获取HttpSession + //鑾峰彇HttpSession ActionContext actionContext = ActionContext.getContext(); HttpSession session = actionContext.getRequest().getSession(); List authoritys = (List) session.getAttribute("authoritys"); - String message = "无权限访问"; + String message = "鏃犳潈闄愯闂�"; String content = ""; if (authoritys != null) { String uri = params.get("uri").toString(); diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/enums/ApiCallLimitEnum.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/enums/ApiCallLimitEnum.java index 0b8018a18..59a2a61e4 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/enums/ApiCallLimitEnum.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/enums/ApiCallLimitEnum.java @@ -2,15 +2,15 @@ package com.fangjia.pds.enums; public enum ApiCallLimitEnum { - WO_YAO_PING_GU("evaluation/overView", "我要评估"), - KE_HU_FEN_LEI("uploaddata", "客户分类"), - KE_HU_PIN_JI("demo/detail", "客户评级"), - WO_DE_FANG_CHAN("zichan/saveevaluation", "我的房产"), - DAI_QIAN_GU_ZHI("prevaluation/saveevalinfo", "贷前估值"), - PI_LIANG_PING_GU("uploaddatabatch", "批量评估"), - HUO_KE("hk/evaluate", "营销货客"), - DAI_KUANG("lenderquery", "贷款人查询"), - PIONG_GU_BAO_GAO("report/evaltution", "评估报告"); + WO_YAO_PING_GU("evaluation/overView", "鎴戣璇勪及"), + KE_HU_FEN_LEI("uploaddata", "瀹㈡埛鍒嗙被"), + KE_HU_PIN_JI("demo/detail", "瀹㈡埛璇勭骇"), + WO_DE_FANG_CHAN("zichan/saveevaluation", "鎴戠殑鎴夸骇"), + DAI_QIAN_GU_ZHI("prevaluation/saveevalinfo", "璐峰墠浼板��"), + PI_LIANG_PING_GU("uploaddatabatch", "鎵归噺璇勪及"), + HUO_KE("hk/evaluate", "钀ラ攢璐у"), + DAI_KUANG("lenderquery", "璐锋浜烘煡璇�"), + PIONG_GU_BAO_GAO("report/evaltution", "璇勪及鎶ュ憡"); private String uri; private String desc; diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/filters/AnalyticsFilter.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/filters/AnalyticsFilter.java index 2ca406c0c..5c574ef70 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/filters/AnalyticsFilter.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/filters/AnalyticsFilter.java @@ -53,7 +53,7 @@ public class AnalyticsFilter implements Filter { } private String createUID(HttpServletRequest request, HttpServletResponse response) { - // 设置UID + // 璁剧疆UID String uid = cookieContext.getUid(request); if (StringUtils.isEmpty(uid)) { uid = new ObjectId().toString(); @@ -65,7 +65,7 @@ public class AnalyticsFilter implements Filter { } private String createSID(HttpServletRequest request, HttpServletResponse response) { - // 设置SID + // 璁剧疆SID String sid = cookieContext.getSid(request); if (StringUtils.isEmpty(sid)) { sid = new ObjectId().toString(); diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/filters/SecurityFilter.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/filters/SecurityFilter.java index aee0f6b60..5a7901971 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/filters/SecurityFilter.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/filters/SecurityFilter.java @@ -24,25 +24,25 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; /** - * 权限控制过滤器
- * 需要注意的是目前前台和后台读在一个项目里面
- * 控制的时候需要对前后台分别控制,目前后台所有的链接都以bkoff开头
+ * 鏉冮檺鎺у埗杩囨护鍣�
+ * 闇�瑕佹敞鎰忕殑鏄洰鍓嶅墠鍙板拰鍚庡彴璇诲湪涓�涓」鐩噷闈�
+ * 鎺у埗鐨勬椂鍊欓渶瑕佸鍓嶅悗鍙板垎鍒帶鍒讹紝鐩墠鍚庡彴鎵�鏈夌殑閾炬帴閮戒互bkoff寮�澶�
* * @author yinjihuan */ public class SecurityFilter implements Filter { private final static Logger LOGGER = LoggerFactory.getLogger(SecurityFilter.class); private ApiCallLimitService apiCallLimitService; - //需要拦截的后台URI + //闇�瑕佹嫤鎴殑鍚庡彴URI private List bkoffUris = Arrays.asList("bkoffrole", "bkoffUser", "bkoffIndex", "bkoffEnterprise", "algorithmRule", "bkoffEmployee", "collRate", "bkoffPeopleInquiry", "bkoffManualInquiry", "bkoffCollInfo"); - //白名单URI,不需要拦截的 + //鐧藉悕鍗昒RI,涓嶉渶瑕佹嫤鎴殑 private List whiteList = Arrays.asList("/static/", "randomCode", "login", "user/findPass", "user/resetPass", "user/sendSmsCode", "user/logout", "pdsRiskMap/sendRiskEmail", "/hk/", "/auto/", "zichan", "preassess/monitorInfo", "prevaluation/prevaluationInputMonitor", "notice", "preassess/uploadImg", "reportResult/show", "reportResult/createPdf"); - //需要进行登录拦截,但不需要权限拦截的 + //闇�瑕佽繘琛岀櫥褰曟嫤鎴紝浣嗕笉闇�瑕佹潈闄愭嫤鎴殑 private List noAuthorityList = Arrays.asList("user/sendSmsCode", "user/info", "user/pass", @@ -146,26 +146,26 @@ public class SecurityFilter implements Filter { if (req.getHeader("x-requested-with") != null && "XMLHttpRequest".equalsIgnoreCase(req.getHeader("x-requested-with"))) { resp.setContentType("text/html;charset=UTF-8"); resp.setHeader("sessionstatus", "timeout"); - String json = getJsonResult("非法请求"); + String json = getJsonResult("闈炴硶璇锋眰"); resp.getWriter().write(json.toString()); resp.getWriter().flush(); resp.getWriter().close(); return; } - resp.sendRedirect(getReferer(req, resp, "非法请求")); + resp.sendRedirect(getReferer(req, resp, "闈炴硶璇锋眰")); return; } if (!apiCallLimitService.checkStatus(loginEid, limitUris.get(limitUri))) { if (req.getHeader("x-requested-with") != null && "XMLHttpRequest".equalsIgnoreCase(req.getHeader("x-requested-with"))) { response.setContentType("text/html;charset=UTF-8"); - String json = getJsonResult("本功能未开通"); + String json = getJsonResult("鏈姛鑳芥湭寮�閫�"); response.getWriter().write(json.toString()); response.getWriter().flush(); response.getWriter().close(); return; } - resp.sendRedirect(getReferer(req, resp, "本功能未开通")); + resp.sendRedirect(getReferer(req, resp, "鏈姛鑳芥湭寮�閫�")); return; } @@ -173,13 +173,13 @@ public class SecurityFilter implements Filter { if (count <= 0) { if (req.getHeader("x-requested-with") != null && "XMLHttpRequest".equalsIgnoreCase(req.getHeader("x-requested-with"))) { response.setContentType("text/html;charset=UTF-8"); - String json = getJsonResult("本功能次数已使用完"); + String json = getJsonResult("鏈姛鑳芥鏁板凡浣跨敤瀹�"); response.getWriter().write(json.toString()); response.getWriter().flush(); response.getWriter().close(); return; } - resp.sendRedirect(getReferer(req, resp, "本功能次数已使用完")); + resp.sendRedirect(getReferer(req, resp, "鏈姛鑳芥鏁板凡浣跨敤瀹�")); return; } apiCallLimitService.decrCount(loginEid, limitUris.get(limitUri)); @@ -248,9 +248,9 @@ public class SecurityFilter implements Filter { if (!loginType.equals("bkoff")) { resp.sendRedirect(loginUrl); } else { - //后台权限拦截 + //鍚庡彴鏉冮檺鎷︽埅 if (bkoffRoles != null && !containsBkoffAuthority(uri, bkoffRoles)) { - resp.sendRedirect(basePath + path + "/bkoffIndex?msg=" + URLEncoder.encode("无操作权限", "utf-8")); + resp.sendRedirect(basePath + path + "/bkoffIndex?msg=" + URLEncoder.encode("鏃犳搷浣滄潈闄�", "utf-8")); return; } chain.doFilter(req, resp); @@ -258,14 +258,14 @@ public class SecurityFilter implements Filter { } } else { String loginUrl = basePath + path + "/user/login"; - //进行未登录拦截 + //杩涜鏈櫥褰曟嫤鎴� if (session.getAttribute("login_user_name") == null || !session.getAttribute("login_user_type").toString().equals("web")) { if (req.getHeader("x-requested-with") != null && "XMLHttpRequest".equalsIgnoreCase(req.getHeader("x-requested-with"))) { resp.setHeader("sessionstatus", "timeout"); resp.setStatus(401); return; } - //有参数跳转时带上参数 + //鏈夊弬鏁拌烦杞椂甯︿笂鍙傛暟 if (req.getQueryString() != null) { resp.sendRedirect(loginUrl + "?backUrl=" + req.getRequestURL() + "?" + req.getQueryString()); } else { @@ -274,21 +274,21 @@ public class SecurityFilter implements Filter { return; } - //需要进行权限控制 + //闇�瑕佽繘琛屾潈闄愭帶鍒� if (uri.endsWith("/")) { uri = uri.substring(0, uri.length() - 1); } if (!uri.equals(path) && authoritys != null && !containsAuthority(uri, authoritys)) { - //ajax请求返回状态码,前端统一处理 + //ajax璇锋眰杩斿洖鐘舵�佺爜锛屽墠绔粺涓�澶勭悊 if (req.getHeader("x-requested-with") != null && "XMLHttpRequest".equalsIgnoreCase(req.getHeader("x-requested-with"))) { - String json = getJsonResult("无权限操作此功能"); + String json = getJsonResult("鏃犳潈闄愭搷浣滄鍔熻兘"); resp.setContentType("text/html;charset=UTF-8"); resp.getWriter().write(json.toString()); resp.getWriter().flush(); resp.getWriter().close(); return; } - //普通请求直接跳转到首页面 + //鏅�氳姹傜洿鎺ヨ烦杞埌棣栭〉闈� resp.sendRedirect(basePath + path); } else { chain.doFilter(req, resp); diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/interceptors/AuthenticationInterceptor.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/interceptors/AuthenticationInterceptor.java index 3ffaaa32c..79bcc5f42 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/interceptors/AuthenticationInterceptor.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/interceptors/AuthenticationInterceptor.java @@ -6,7 +6,7 @@ import org.sothis.web.mvc.Interceptor; /** - * 拦截器 + * 鎷︽埅鍣� */ public class AuthenticationInterceptor implements Interceptor { diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/interceptors/BatchInterceptor.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/interceptors/BatchInterceptor.java index 67f7c0255..1550fd5db 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/interceptors/BatchInterceptor.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/interceptors/BatchInterceptor.java @@ -4,7 +4,7 @@ import com.fangjia.dal.mongo.pds.model.MortgageDetail; import org.aspectj.lang.JoinPoint; /** - * 每次增加押品,对新增押品进行统计 + * 姣忔澧炲姞鎶煎搧锛屽鏂板鎶煎搧杩涜缁熻 * Created by linxsh on 2017/1/16. */ @Deprecated diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/interceptors/ParametersInterceptor.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/interceptors/ParametersInterceptor.java index 42d44b369..a371952f4 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/interceptors/ParametersInterceptor.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/interceptors/ParametersInterceptor.java @@ -24,7 +24,7 @@ import java.util.*; import java.util.regex.Pattern; /** - * 参数注入拦截器 + * 鍙傛暟娉ㄥ叆鎷︽埅鍣� * * @author velna * @@ -191,7 +191,7 @@ public class ParametersInterceptor implements Interceptor { break; } Type[] types = writeMethod.getGenericParameterTypes(); - // 如果是泛型,则尽量找到泛型对应的实际类型 + // 濡傛灉鏄硾鍨嬶紝鍒欏敖閲忔壘鍒版硾鍨嬪搴旂殑瀹為檯绫诲瀷 if (types != null && types.length > 0 && types[0] instanceof TypeVariable) { TypeVariable typeVariable = (TypeVariable) types[0]; Type type = bean.getClass().getGenericSuperclass(); @@ -337,7 +337,7 @@ public class ParametersInterceptor implements Interceptor { } /** - * 默认UTF-8编码 + * 榛樿UTF-8缂栫爜 * @param request * @return */ diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/ApiCountLimitDetailModel.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/ApiCountLimitDetailModel.java index 203f3d5ca..84eb6c80b 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/ApiCountLimitDetailModel.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/ApiCountLimitDetailModel.java @@ -2,7 +2,7 @@ package com.fangjia.pds.model; /** - * 充值信息Model + * 鍏呭�间俊鎭疢odel * @author * */ @@ -11,27 +11,27 @@ public class ApiCountLimitDetailModel extends BaseModel { private static final long serialVersionUID = 5146641850533025872L; /** - * 充值时间 + * 鍏呭�兼椂闂� */ private String rechargeTime; /** - * 充值类型 + * 鍏呭�肩被鍨� */ private String rechargeType; /** - * 充值方式 + * 鍏呭�兼柟寮� */ private String rechargeWay; /** - * 充值数量 + * 鍏呭�兼暟閲� */ private int count; /** - * 充值人 + * 鍏呭�间汉 */ private String userName; diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/BaseAjaxModel.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/BaseAjaxModel.java index 35da1e5e9..cd888493a 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/BaseAjaxModel.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/BaseAjaxModel.java @@ -1,7 +1,7 @@ package com.fangjia.pds.model; /** - *Ajax返回数据模型 + *Ajax杩斿洖鏁版嵁妯″瀷 */ public class BaseAjaxModel { diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/BaseModel.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/BaseModel.java index 08bda52f7..96986f14f 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/BaseModel.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/BaseModel.java @@ -105,7 +105,7 @@ public class BaseModel extends ModelAndViewSupport { } /** - * 开发环境 + * 寮�鍙戠幆澧� * @return */ public boolean isDeveloperEnvironment() { @@ -113,7 +113,7 @@ public class BaseModel extends ModelAndViewSupport { } /** - * 生成环境 + * 鐢熸垚鐜 * @return */ public boolean isProductionEnvironment() { @@ -121,7 +121,7 @@ public class BaseModel extends ModelAndViewSupport { } /** - * 测试环境 + * 娴嬭瘯鐜 * * @return */ diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/BorrowerModel.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/BorrowerModel.java index e2889efc2..748501f62 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/BorrowerModel.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/BorrowerModel.java @@ -1,36 +1,36 @@ package com.fangjia.pds.model; /** - * 贷款人model + * 璐锋浜簃odel * Created by linxsh on 2016/12/6. */ public class BorrowerModel extends BaseModel { private static final long serialVersionUID = 418594362199320828L; private String sid; - /**姓名*/ + /**濮撳悕*/ private String name; - /**身份证号*/ + /**韬唤璇佸彿*/ private String idcode; - /** 婚姻状况 */ + /** 濠氬Щ鐘跺喌 */ private String maritalStatus; - /** 手机号码1 */ + /** 鎵嬫満鍙风爜1 */ private String phoneNumber; - /** 手机号码2,可选 */ + /** 鎵嬫満鍙风爜2锛屽彲閫� */ private String phoneNumber2; - /** 现居住地-市 */ + /** 鐜板眳浣忓湴-甯� */ private String residentialCity; - /** 现居住地-区县 */ + /** 鐜板眳浣忓湴-鍖哄幙 */ private String residentialRegion; - /** 现居住地-详细地址 */ + /** 鐜板眳浣忓湴-璇︾粏鍦板潃 */ private String residentialAddress; - /** 工作地址-市 */ + /** 宸ヤ綔鍦板潃-甯� */ private String workCity; - /** 工作地址-区县 */ + /** 宸ヤ綔鍦板潃-鍖哄幙 */ private String workRegion; - /** 工作地址-详细地址 */ + /** 宸ヤ綔鍦板潃-璇︾粏鍦板潃 */ private String workAddress; - /** 是否是主贷人 */ + /** 鏄惁鏄富璐蜂汉 */ private boolean isMainBorrower; private boolean lenderQueryStatus = true; diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/CertifiCateImgModel.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/CertifiCateImgModel.java index 43cc1e4ec..8378b5a68 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/CertifiCateImgModel.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/CertifiCateImgModel.java @@ -4,7 +4,7 @@ package com.fangjia.pds.model; public class CertifiCateImgModel { private static final long serialVersionUID = 2063979794964333858L; /** - * 利率信息 + * 鍒╃巼淇℃伅 */ private boolean success; private String link; diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/ClassifyMapModel.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/ClassifyMapModel.java index 5f4d19970..dc2a7e08b 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/ClassifyMapModel.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/ClassifyMapModel.java @@ -1,40 +1,40 @@ package com.fangjia.pds.model; /** - * 客户分类-地图数据model + * 瀹㈡埛鍒嗙被-鍦板浘鏁版嵁model * Created by linxsh on 2017/6/22. */ public class ClassifyMapModel { /** - * 物业地址 + * 鐗╀笟鍦板潃 */ private String address; /** - * 所在城市 + * 鎵�鍦ㄥ煄甯� */ private String city; /** - * 物业最新均价 + * 鐗╀笟鏈�鏂板潎浠� */ private String avgPrice; /** - * 资产等级 + * 璧勪骇绛夌骇 */ private Integer level; /** - * 排名 + * 鎺掑悕 */ private Integer rank; /** - * 资产排名指数 + * 璧勪骇鎺掑悕鎸囨暟 */ private String rankIndex; /** - * 评估时间 + * 璇勪及鏃堕棿 */ private String evalDate; /** - * 导入时间 + * 瀵煎叆鏃堕棿 */ private String importDate; diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/CollateralEvaluationInfoModel.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/CollateralEvaluationInfoModel.java index 0deb972a2..214a7a997 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/CollateralEvaluationInfoModel.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/CollateralEvaluationInfoModel.java @@ -29,12 +29,12 @@ public class CollateralEvaluationInfoModel extends BaseModel{ private List citys; - private String cardIds;//贷款人集合 - private String houseIds;//房产集合 - private Integer loanMonth;//贷款期限 - private Double rate;//年化利率 - private Date lendingDate;//放贷时间 - private Integer repaymentWay;//还款方式 1:等额本息 2:等额本金 + private String cardIds;//璐锋浜洪泦鍚� + private String houseIds;//鎴夸骇闆嗗悎 + private Integer loanMonth;//璐锋鏈熼檺 + private Double rate;//骞村寲鍒╃巼 + private Date lendingDate;//鏀捐捶鏃堕棿 + private Integer repaymentWay;//杩樻鏂瑰紡 1:绛夐鏈伅 2:绛夐鏈噾 private Integer lendingPrice; diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/CustomerClassifyDataBatchModel.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/CustomerClassifyDataBatchModel.java index adbab9799..458f4b587 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/CustomerClassifyDataBatchModel.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/CustomerClassifyDataBatchModel.java @@ -4,7 +4,7 @@ import java.util.List; import com.fangjia.dal.mongo.pds.model.FileDataTotalityBatch; /** - * 客户分类数据导入信息-批量评估 + * 瀹㈡埛鍒嗙被鏁版嵁瀵煎叆淇℃伅-鎵归噺璇勪及 * @author yinjihuan * */ diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/CustomerClassifyDataModel.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/CustomerClassifyDataModel.java index 8137e9ed1..aafc3c692 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/CustomerClassifyDataModel.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/CustomerClassifyDataModel.java @@ -5,7 +5,7 @@ import java.util.List; import com.fangjia.dal.mongo.pds.model.FileDataTotality; /** - * 客户分类数据导入信息 + * 瀹㈡埛鍒嗙被鏁版嵁瀵煎叆淇℃伅 * @author yinjihuan * */ diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/CustomerClassifyModel.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/CustomerClassifyModel.java index bdd1d0837..93a3fa3a6 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/CustomerClassifyModel.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/CustomerClassifyModel.java @@ -6,7 +6,7 @@ import java.util.Map; import com.fangjia.dal.mongo.pds.model.FileDataDetail; /** - * 客户编号 + * 瀹㈡埛缂栧彿 * @author Administrator * */ @@ -15,47 +15,47 @@ public class CustomerClassifyModel extends BaseModel { private static final long serialVersionUID = 1L; - private List cityList; //城市 - private String avePrice; //均价 - private String num; //排名 - private int index; //指数 - private int rank; //等级 + private List cityList; //鍩庡競 + private String avePrice; //鍧囦环 + private String num; //鎺掑悕 + private int index; //鎸囨暟 + private int rank; //绛夌骇 /** - * 文件列表 + * 鏂囦欢鍒楄〃 * @return */ private Map fileMap; /** - * 文件ID + * 鏂囦欢ID */ private String fileId; /** - * 查询最小等级 + * 鏌ヨ鏈�灏忕瓑绾� */ private int minLevel=1; /** - * 插叙最大等级 + * 鎻掑彊鏈�澶х瓑绾� */ private int maxLevel=10; /** - * 物业地址 + * 鐗╀笟鍦板潃 */ private String address; private List fileDataDetailList; /** - * 排序字段和类型 + * 鎺掑簭瀛楁鍜岀被鍨� */ private String sort="assetLevel_asc"; /** - * 解析状态 + * 瑙f瀽鐘舵�� */ private String status; diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/DemoModel.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/DemoModel.java index dff7d1d2e..3225d26ac 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/DemoModel.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/DemoModel.java @@ -4,13 +4,13 @@ package com.fangjia.pds.model; * Created by linxsh on 2017/6/14. */ public class DemoModel extends BaseModel { - private String address; //输入的 - private String avePrice; //均价 - private String num; //排名 - private int index; //指数 - private int rank; //等级 - private String searchTime;//查询时间 2017/06/14格式 - private String detailAddress;//匹配到的详细地址 + private String address; //杈撳叆鐨� + private String avePrice; //鍧囦环 + private String num; //鎺掑悕 + private int index; //鎸囨暟 + private int rank; //绛夌骇 + private String searchTime;//鏌ヨ鏃堕棿 2017/06/14鏍煎紡 + private String detailAddress;//鍖归厤鍒扮殑璇︾粏鍦板潃 public String getAddress() { return address; diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/EamModel.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/EamModel.java index 0965c1ab8..bf77bc683 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/EamModel.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/EamModel.java @@ -7,7 +7,7 @@ import net.sf.json.JSONArray; import java.util.List; /** - * 资产管理Model + * 璧勪骇绠$悊Model */ public class EamModel extends BaseModel { diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/EnterpriseModel.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/EnterpriseModel.java index 537c8ca13..80e62fc89 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/EnterpriseModel.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/EnterpriseModel.java @@ -9,7 +9,7 @@ import com.fangjia.dal.mongo.pds.model.Enterprise; import com.fangjia.pds.common.Cities; /** - * 企业展示Model + * 浼佷笟灞曠ずModel * @author yinjihuan * */ @@ -18,137 +18,137 @@ public class EnterpriseModel extends BaseModel { private static final long serialVersionUID = 5146641850533025872L; /** - * 企业编号 + * 浼佷笟缂栧彿 */ private String id; /** - * 企业名称 + * 浼佷笟鍚嶇О */ private String enterpriseName; /** - * 分页数据对象 + * 鍒嗛〉鏁版嵁瀵硅薄 */ private PageBean pageBean; /** - * 分页数据对象 + * 鍒嗛〉鏁版嵁瀵硅薄 */ private PageBean pageDetailBean; /** - * 拼音城市列表 + * 鎷奸煶鍩庡競鍒楄〃 */ private Map> pinYinCitys; /** - * 操作标识(save,update,detail) + * 鎿嶄綔鏍囪瘑锛坰ave,update,detail锛� */ private String op = "save"; /** - * 企业对象 + * 浼佷笟瀵硅薄 */ private Enterprise enterprise; /** - * 企业用户数 + * 浼佷笟鐢ㄦ埛鏁� */ private Long enterpriseUserCount; /** - * 贷款人查询剩余查询次数 + * 璐锋浜烘煡璇㈠墿浣欐煡璇㈡鏁� */ private int lenderQueryTotal; /** - * 贷款人查询总次数 + * 璐锋浜烘煡璇㈡�绘鏁� */ private long lenderQuerySumTotal; /** - * 货客剩余查询次数 + * 璐у鍓╀綑鏌ヨ娆℃暟 */ private int huoKeTotal; /** - * 货客总查询次数 + * 璐у鎬绘煡璇㈡鏁� */ private long huoKeSumTotal; /** - * 客户评级剩余查询次数 + * 瀹㈡埛璇勭骇鍓╀綑鏌ヨ娆℃暟 */ private int customerLevelTotal; /** - * 客户评级总查询次数 + * 瀹㈡埛璇勭骇鎬绘煡璇㈡鏁� */ private long customerLevelSumTotal; /** - * 客户分类剩余查询次数 + * 瀹㈡埛鍒嗙被鍓╀綑鏌ヨ娆℃暟 */ private int customerTypeTotal; /** - * 客户分类总查询次数 + * 瀹㈡埛鍒嗙被鎬绘煡璇㈡鏁� */ private long customerTypeSumTotal; /** - * 我的房产剩余查询次数 + * 鎴戠殑鎴夸骇鍓╀綑鏌ヨ娆℃暟 */ private int myHouseTotal; /** - * 我的房产总查询次数 + * 鎴戠殑鎴夸骇鎬绘煡璇㈡鏁� */ private long myHouseSumTotal; /** - * 贷前估值剩余查询次数 + * 璐峰墠浼板�煎墿浣欐煡璇㈡鏁� */ private int prevaluationTotal; /** - * 贷前估值总查询次数 + * 璐峰墠浼板�兼�绘煡璇㈡鏁� */ private long prevaluationSumTotal; /** - * 批量评估剩余查询次数 + * 鎵归噺璇勪及鍓╀綑鏌ヨ娆℃暟 */ private int evaluationBatchTotal; /** - * 批量评估总查询次数 + * 鎵归噺璇勪及鎬绘煡璇㈡鏁� */ private long evaluationBatchSumTotal; /** - * 我要评估剩余查询次数 + * 鎴戣璇勪及鍓╀綑鏌ヨ娆℃暟 */ private int evaluatingTotal; /** - * 我要评估总查询次数 + * 鎴戣璇勪及鎬绘煡璇㈡鏁� */ private long evaluatingSumTotal; /** - * 分页时传过来的页数 + * 鍒嗛〉鏃朵紶杩囨潵鐨勯〉鏁� */ private int currentPage; /** - * 评估报告剩余查询次数 + * 璇勪及鎶ュ憡鍓╀綑鏌ヨ娆℃暟 */ private int reportListTotal; /** - * 评估报告总查询次数 + * 璇勪及鎶ュ憡鎬绘煡璇㈡鏁� */ private long reportListSumTotal; diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/EnterpriseShowModel.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/EnterpriseShowModel.java index 8961b3da7..925cddf0f 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/EnterpriseShowModel.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/EnterpriseShowModel.java @@ -6,16 +6,16 @@ public class EnterpriseShowModel extends Enterprise { private static final long serialVersionUID = 1L; - //企业用户数 + //浼佷笟鐢ㄦ埛鏁� private Long enterpriseUserCount; /** - * 我要评估剩余查询次数 + * 鎴戣璇勪及鍓╀綑鏌ヨ娆℃暟 */ private int evaluatingTotal; /** - * 货客剩余查询次数 + * 璐у鍓╀綑鏌ヨ娆℃暟 */ private int huoKeTotal; diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/EquipmentInfoModel.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/EquipmentInfoModel.java index 884a1e87d..0842e9629 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/EquipmentInfoModel.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/EquipmentInfoModel.java @@ -8,7 +8,7 @@ public class EquipmentInfoModel extends BaseModel { private static final long serialVersionUID = -5724990326450013316L; /** - * 分页数据对象 + * 鍒嗛〉鏁版嵁瀵硅薄 */ private PageBean pageBean; private Date startDate; diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/EvaluationBatchModel.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/EvaluationBatchModel.java index 2fbbb92e9..178eb6dc1 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/EvaluationBatchModel.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/EvaluationBatchModel.java @@ -6,7 +6,7 @@ import java.util.Map; import com.fangjia.dal.mongo.pds.model.FileDataDetailBatch; /** - * 批量评估 + * 鎵归噺璇勪及 * @author Administrator * */ @@ -15,118 +15,118 @@ public class EvaluationBatchModel extends BaseModel { private static final long serialVersionUID = 1L; - private List cityList; //城市 + private List cityList; //鍩庡競 /** - * 区域 + * 鍖哄煙 */ private String region; /** - * 物业类型 + * 鐗╀笟绫诲瀷 */ private String estateType; /** - * 最小评估总价(查询)单位:万 + * 鏈�灏忚瘎浼版�讳环锛堟煡璇級鍗曚綅锛氫竾 */ private String minTotalPrice; /** - * 最大评估总价(查询)单位:万 + * 鏈�澶ц瘎浼版�讳环锛堟煡璇級鍗曚綅锛氫竾 */ private String maxTotalPrice; /** - * 最小评估单价(查询)单位:元/平米 + * 鏈�灏忚瘎浼板崟浠凤紙鏌ヨ锛夊崟浣嶏細鍏�/骞崇背 */ private String minPrice; /** - * 最大评估单价(查询)单位:元/平米 + * 鏈�澶ц瘎浼板崟浠凤紙鏌ヨ锛夊崟浣嶏細鍏�/骞崇背 */ private String maxPrice; /** - * 最小房龄(查询)单位:年 + * 鏈�灏忔埧榫勶紙鏌ヨ锛夊崟浣嶏細骞� */ private String minHouseYear; /** - * 最大房龄(查询)单位:年 + * 鏈�澶ф埧榫勶紙鏌ヨ锛夊崟浣嶏細骞� */ private String maxHouseYear; /** - * 最小面积(查询)单位:平米 + * 鏈�灏忛潰绉紙鏌ヨ锛夊崟浣嶏細骞崇背 */ private String minArea; /** - * 最大面积(查询)单位:平米 + * 鏈�澶ч潰绉紙鏌ヨ锛夊崟浣嶏細骞崇背 */ private String maxArea; /** - * 文件列表 + * 鏂囦欢鍒楄〃 * @return */ private Map fileMap; /** - * 文件ID + * 鏂囦欢ID */ private String fileId; /** - * 物业地址 + * 鐗╀笟鍦板潃 */ private String address; private List fileDataDetailBatchList; /** - * 排序字段和类型 + * 鎺掑簭瀛楁鍜岀被鍨� */ private String sort="assetLevel_asc"; /** - * 解析状态 + * 瑙f瀽鐘舵�� */ private String status; /** - * 总量(用于页面显示) + * 鎬婚噺锛堢敤浜庨〉闈㈡樉绀猴級 */ private Integer totalNum; /** - * 资产总价(用于页面显示) + * 璧勪骇鎬讳环锛堢敤浜庨〉闈㈡樉绀猴級 */ private Long sumTotalPrice; /** - * 平均涨跌幅(用于页面显示)% + * 骞冲潎娑ㄨ穼骞咃紙鐢ㄤ簬椤甸潰鏄剧ず锛�% */ private Double aveUpDownRange; /** - * 平均面积(用于页面显示) + * 骞冲潎闈㈢Н锛堢敤浜庨〉闈㈡樉绀猴級 */ private Double aveArea; /** - * 平均总价(用于页面显示) + * 骞冲潎鎬讳环锛堢敤浜庨〉闈㈡樉绀猴級 */ private Long aveTotalPrice; /** - * 平均均价(用于页面显示) + * 骞冲潎鍧囦环锛堢敤浜庨〉闈㈡樉绀猴級 */ private Double avePrice; /** - * 评估时间(用于页面显示) 例:2016.01.25 + * 璇勪及鏃堕棿锛堢敤浜庨〉闈㈡樉绀猴級 渚嬶細2016.01.25 */ private String evaluationTime; diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/EvaluationBeforeLoanModel.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/EvaluationBeforeLoanModel.java index f79eb66eb..4ea5da7b2 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/EvaluationBeforeLoanModel.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/EvaluationBeforeLoanModel.java @@ -12,37 +12,37 @@ public class EvaluationBeforeLoanModel extends BaseModel { private static final long serialVersionUID = -6321801605609229903L; /** - * 评估结果ID + * 璇勪及缁撴灉ID */ private String eid; /** - * 贷前估值评估结果 + * 璐峰墠浼板�艰瘎浼扮粨鏋� */ private EvaluationBeforeLoan result; /** - * 上个月月份 + * 涓婁釜鏈堟湀浠� */ private Integer topMonth; /** - * 房产价格走势数据查询参数 + * 鎴夸骇浠锋牸璧板娍鏁版嵁鏌ヨ鍙傛暟 */ private int type; /** - * 各大小区均价 + * 鍚勫ぇ灏忓尯鍧囦环 */ private List> sitePrices; /** - * 正负向因素 + * 姝h礋鍚戝洜绱� */ private FactorStat factorStat; /** - * 房龄 + * 鎴块緞 */ private Integer houseAgeLimit; diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/HkEvaluateModel.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/HkEvaluateModel.java index ad9a2baed..0940d629e 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/HkEvaluateModel.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/HkEvaluateModel.java @@ -23,7 +23,7 @@ public class HkEvaluateModel extends BaseModel { private Integer avgPrice; /** - * 楼栋单元室号拼接显示(移动端) + * 妤兼爧鍗曞厓瀹ゅ彿鎷兼帴鏄剧ず锛堢Щ鍔ㄧ锛� */ private String loudongName; diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/HouseInfoModel.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/HouseInfoModel.java index 26bf18c0d..3bf549447 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/HouseInfoModel.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/HouseInfoModel.java @@ -3,48 +3,48 @@ package com.fangjia.pds.model; import java.util.Date; /** - * 抵押品model + * 鎶垫娂鍝乵odel * Created by linxsh on 2016/12/6. */ public class HouseInfoModel { - /** 房产类型 */ + /** 鎴夸骇绫诲瀷 */ private String estateType; - /**所在城市*/ + /**鎵�鍦ㄥ煄甯�*/ private String cityDisplay; - /**实际输入的城市*/ + /**瀹為檯杈撳叆鐨勫煄甯�*/ private String cityInput; - /**所在区、县*/ + /**鎵�鍦ㄥ尯銆佸幙*/ private String region; - /**楼盘/地址*/ + /**妤肩洏/鍦板潃*/ private String district; - /**楼号*/ + /**妤煎彿*/ private String houseNumber; /** - * 单元号 + * 鍗曞厓鍙� */ private String unitNumber; - /**室号*/ + /**瀹ゅ彿*/ private String roomNumber; - /**所在楼层*/ + /**鎵�鍦ㄦゼ灞�*/ private Integer floor; - /**总楼层*/ + /**鎬绘ゼ灞�*/ private Integer height; - /**建筑面积*/ + /**寤虹瓚闈㈢Н*/ private Double area; - /**购置时间*/ + /**璐疆鏃堕棿*/ private Date purchaseDate; - /**款项用途*/ + /**娆鹃」鐢ㄩ��*/ private String usage; - /**匹配到的小区名*/ + /**鍖归厤鍒扮殑灏忓尯鍚�*/ private String districtMatch; - /**装修*/ + /**瑁呬慨*/ private String direction; - /**朝向*/ + /**鏈濆悜*/ private String fitment; - /**地址*/ + /**鍦板潃*/ private String address; - /**是否填写了非必要信息,即是否精准评估*/ + /**鏄惁濉啓浜嗛潪蹇呰淇℃伅锛屽嵆鏄惁绮惧噯璇勪及*/ private Boolean hasDetailInfo; public String getEstateType() { diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/LoadMapDataModel.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/LoadMapDataModel.java index 7905be78b..63062918c 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/LoadMapDataModel.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/LoadMapDataModel.java @@ -3,7 +3,7 @@ package com.fangjia.pds.model; import java.util.Map; /** - * 押品风控地图加载model + * 鎶煎搧椋庢帶鍦板浘鍔犺浇model * @author wenyan */ public class LoadMapDataModel extends BaseModel { diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/LoanRateModel.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/LoanRateModel.java index b80196083..104de028b 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/LoanRateModel.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/LoanRateModel.java @@ -5,7 +5,7 @@ import java.util.List; public class LoanRateModel extends BaseModel { private static final long serialVersionUID = 2063979794964333858L; /** - * 利率信息 + * 鍒╃巼淇℃伅 */ private List infos; public void setInfos(List infos) { diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/ManualInquiryModel.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/ManualInquiryModel.java index 646ba1360..fc280202b 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/ManualInquiryModel.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/ManualInquiryModel.java @@ -14,7 +14,7 @@ public class ManualInquiryModel extends BaseModel { private static final long serialVersionUID = -1671947694144540813L; /** - * 分页数据对象 + * 鍒嗛〉鏁版嵁瀵硅薄 */ private PageBean replyBean; @@ -30,17 +30,17 @@ public class ManualInquiryModel extends BaseModel { private String id; /** - * 评估ID + * 璇勪及ID */ private String sid; /** - * 类型(1:人工询价 2:价格纠错) + * 绫诲瀷锛�1:浜哄伐璇环 2:浠锋牸绾犻敊锛� */ private int type; /** - * 创建时间(提交时间) + * 鍒涘缓鏃堕棿锛堟彁浜ゆ椂闂达級 */ private Date crateDate; @@ -54,96 +54,96 @@ public class ManualInquiryModel extends BaseModel { private double area; - //物业类型 + //鐗╀笟绫诲瀷 private String estateType; - //楼栋 + //妤兼爧 private String houseNumber; - //单元 + //鍗曞厓 private String unitNumber; - //室号 + //瀹ゅ彿 private String roomNumber; - //楼层 + //妤煎眰 private Integer floor; - //总楼层 + //鎬绘ゼ灞� private Integer height; - //朝向 + //鏈濆悜 private String direction; - //装修 + //瑁呬慨 private String fitment; /** - * 提交用户姓名 + * 鎻愪氦鐢ㄦ埛濮撳悕 */ private String uname; /** - * 用户手机号 + * 鐢ㄦ埛鎵嬫満鍙� */ private String umobile; /** - * 提交用户所在企业名称 + * 鎻愪氦鐢ㄦ埛鎵�鍦ㄤ紒涓氬悕绉� */ private String ename; /** - * 评估均价 + * 璇勪及鍧囦环 */ private int evalPrice; /** - * 原因(1偏低 2偏高 3合理) + * 鍘熷洜锛�1鍋忎綆 2鍋忛珮 3鍚堢悊锛� */ private int reason; /** - * 我认为的均价 + * 鎴戣涓虹殑鍧囦环 */ private int myPrice; /** - * 回复给客户的价格, 价格纠错就是直接回复的价格, 人工估价,如果能评估,那就是评估之后的价格, 不能评估为空 + * 鍥炲缁欏鎴风殑浠锋牸锛� 浠锋牸绾犻敊灏辨槸鐩存帴鍥炲鐨勪环鏍硷紝 浜哄伐浼颁环锛屽鏋滆兘璇勪及锛岄偅灏辨槸璇勪及涔嬪悗鐨勪环鏍硷紝 涓嶈兘璇勪及涓虹┖ */ private int replyPrice; /** - * 回复内容 + * 鍥炲鍐呭 */ private String replyContent; /** - * 回复时间(用时多长时间) + * 鍥炲鏃堕棿(鐢ㄦ椂澶氶暱鏃堕棿) */ private Date backTime; /** - * 回复时间 + * 鍥炲鏃堕棿 */ private Date replyTime; /** - * 回复用户 + * 鍥炲鐢ㄦ埛 */ private String replyUser; - private long replyCount;//已回复数量 - private long noReplyCount;//末回复数量 + private long replyCount;//宸插洖澶嶆暟閲� + private long noReplyCount;//鏈洖澶嶆暟閲� private PageBean pageBean; /** - * 不能评估原因(1小区不存在 2无法获取价格 3非住宅,不支持估价) + * 涓嶈兘璇勪及鍘熷洜锛�1灏忓尯涓嶅瓨鍦� 2鏃犳硶鑾峰彇浠锋牸 3闈炰綇瀹咃紝涓嶆敮鎸佷及浠凤級 */ private int noEvalReason; /** - * 回复类型(1 可评估 2不可评估) + * 鍥炲绫诲瀷锛�1 鍙瘎浼� 2涓嶅彲璇勪及锛� */ private int replyType; @@ -151,12 +151,12 @@ public class ManualInquiryModel extends BaseModel { private Map> citiesMap; /** - * 状态(0 待回价 1已回价) + * 鐘舵�侊紙0 寰呭洖浠� 1宸插洖浠凤級 */ private int status; /** - * 房产证和土地证 + * 鎴夸骇璇佸拰鍦熷湴璇� */ private List certificates; diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/Message.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/Message.java index e7225c049..ceaf3681e 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/Message.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/Message.java @@ -2,7 +2,7 @@ package com.fangjia.pds.model; public class Message { /** - * 短信验证码的使用类型(登录,注册,绑定号码) + * 鐭俊楠岃瘉鐮佺殑浣跨敤绫诲瀷锛堢櫥褰曪紝娉ㄥ唽锛岀粦瀹氬彿鐮侊級 */ public static final String SMS_CODE_TYPE_LOGIN = "login"; public static final String SMS_CODE_TYPE_CI_CHAN = "Zi_Chan_Guan_Li"; @@ -17,55 +17,55 @@ public class Message { public static final String RESULT_SUCCESS = "success"; - public static final String PARAM_NOT_NULL = "请将信息输入完整"; + public static final String PARAM_NOT_NULL = "璇峰皢淇℃伅杈撳叆瀹屾暣"; - public static final String SMS_CODE_SEND_FAIL = "短信验证码发送失败"; + public static final String SMS_CODE_SEND_FAIL = "鐭俊楠岃瘉鐮佸彂閫佸け璐�"; - public static final String SMS_CODE_SEND_FAIL_TIME = "操作太频繁"; + public static final String SMS_CODE_SEND_FAIL_TIME = "鎿嶄綔澶绻�"; - public static final String MOBILE_EXISTS = "您输入的手机号码已经存在,请重新输入"; + public static final String MOBILE_EXISTS = "鎮ㄨ緭鍏ョ殑鎵嬫満鍙风爜宸茬粡瀛樺湪锛岃閲嶆柊杈撳叆"; - public static final String MIBILE_FORMAT = "手机号码已存在"; + public static final String MIBILE_FORMAT = "鎵嬫満鍙风爜宸插瓨鍦�"; - public static final String PASS_REPEAT = "2次密码输入不一致"; + public static final String PASS_REPEAT = "2娆″瘑鐮佽緭鍏ヤ笉涓�鑷�"; - public static final String PASS_OLD = "原密码错误"; + public static final String PASS_OLD = "鍘熷瘑鐮侀敊璇�"; - public static final String MOBILE_NOT_SEND_CODE = "此号码没发过验证码"; + public static final String MOBILE_NOT_SEND_CODE = "姝ゅ彿鐮佹病鍙戣繃楠岃瘉鐮�"; - public static final String CODE_ERROR = "输入的验证码不正确,请重新输入"; + public static final String CODE_ERROR = "杈撳叆鐨勯獙璇佺爜涓嶆纭紝璇烽噸鏂拌緭鍏�"; - public static final String ACCOUNT_EXISTS = "该账户已存在"; + public static final String ACCOUNT_EXISTS = "璇ヨ处鎴峰凡瀛樺湪"; - public static final String ACCOUNT_NOT_EXISTS = "该用户不存在,请联系管理员开通"; + public static final String ACCOUNT_NOT_EXISTS = "璇ョ敤鎴蜂笉瀛樺湪锛岃鑱旂郴绠$悊鍛樺紑閫�"; - public static final String ACCOUNT_SAVE_FAIL = "用户信息保存失败"; + public static final String ACCOUNT_SAVE_FAIL = "鐢ㄦ埛淇℃伅淇濆瓨澶辫触"; - public static final String LOGIN_FAIL = "账号/密码错误"; + public static final String LOGIN_FAIL = "璐﹀彿/瀵嗙爜閿欒"; - public static final String NOT_BIND_MOBILE = "没有绑定手机"; + public static final String NOT_BIND_MOBILE = "娌℃湁缁戝畾鎵嬫満"; - public static final String IMG_CODE_ERROR = "输入的验证码不正确,请重新输入"; + public static final String IMG_CODE_ERROR = "杈撳叆鐨勯獙璇佺爜涓嶆纭紝璇烽噸鏂拌緭鍏�"; - public static final String NOT_SET_PAY_PASSWORD = "未设置支付密码"; + public static final String NOT_SET_PAY_PASSWORD = "鏈缃敮浠樺瘑鐮�"; - public static final String PAY_PASSWORD_ERROR = "支付密码错误,请重新输入"; + public static final String PAY_PASSWORD_ERROR = "鏀粯瀵嗙爜閿欒锛岃閲嶆柊杈撳叆"; - public static final String NOT_LOGIN = "请先进行登录"; + public static final String NOT_LOGIN = "璇峰厛杩涜鐧诲綍"; - public static final String IMG_CODE_VALID = "图形验证码已过期,请刷新验证码"; + public static final String IMG_CODE_VALID = "鍥惧舰楠岃瘉鐮佸凡杩囨湡锛岃鍒锋柊楠岃瘉鐮�"; - public static final String IP_FORBID = "IP非法,禁止访问"; + public static final String IP_FORBID = "IP闈炴硶锛岀姝㈣闂�"; - public static final String PDS_EXPIRED = "账号已到期,请及时联系业务人员续约,咨询4001883787"; + public static final String PDS_EXPIRED = "璐﹀彿宸插埌鏈燂紝璇峰強鏃惰仈绯讳笟鍔′汉鍛樼画绾︼紝鍜ㄨ4001883787"; - public static final String PDS_EXPIRING = "贵公司PDS即将于{0}到期,为了保证您正常使用,请及时联系业务人员续约,咨询电话4001883787"; + public static final String PDS_EXPIRING = "璐靛叕鍙窹DS鍗冲皢浜巤0}鍒版湡锛屼负浜嗕繚璇佹偍姝e父浣跨敤锛岃鍙婃椂鑱旂郴涓氬姟浜哄憳缁害锛屽挩璇㈢數璇�4001883787"; - public static final String INSUFFICIENT = "贵公司PDS评估次数余额为{0}次,为了保证您正常使用,请及时联系业务人员续约,咨询电话4001883787"; + public static final String INSUFFICIENT = "璐靛叕鍙窹DS璇勪及娆℃暟浣欓涓簕0}娆★紝涓轰簡淇濊瘉鎮ㄦ甯镐娇鐢紝璇峰強鏃惰仈绯讳笟鍔′汉鍛樼画绾︼紝鍜ㄨ鐢佃瘽4001883787"; - public static final String USER_PROHIBIT = "该用户已禁用,无法使用"; + public static final String USER_PROHIBIT = "璇ョ敤鎴峰凡绂佺敤锛屾棤娉曚娇鐢�"; - public static final String ENT_PROHIBIT = "该企业用户已禁用,无法使用"; + public static final String ENT_PROHIBIT = "璇ヤ紒涓氱敤鎴峰凡绂佺敤锛屾棤娉曚娇鐢�"; } diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/MortgagesModel.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/MortgagesModel.java index 6738a4c71..9fef78ea4 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/MortgagesModel.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/MortgagesModel.java @@ -13,75 +13,75 @@ public class MortgagesModel extends BaseModel { private String input; /** - * 城市 + * 鍩庡競 */ private String cityDisplay; /** - * 区域 + * 鍖哄煙 */ private String region; /** - * 小区名 + * 灏忓尯鍚� */ private String districtName; /** - * 地址 + * 鍦板潃 */ private String address; /** - * 物业类型 + * 鐗╀笟绫诲瀷 */ private String estateType; /** - * 楼号 + * 妤煎彿 */ private String houseNumber; /** - * 单元号 + * 鍗曞厓鍙� */ private String unitNumber; /** - * 面积 + * 闈㈢Н */ private Double area; /** - * 室号 + * 瀹ゅ彿 */ private String roomNumber; /** - * 所在楼层 + * 鎵�鍦ㄦゼ灞� */ private Integer floor; /** - * 总楼层 + * 鎬绘ゼ灞� */ private Integer height; /** - * 朝向 + * 鏈濆悜 */ private String direction; /** - * 地下室面积 + * 鍦颁笅瀹ら潰绉� */ private Double basementArea; /** - * 阁楼面积 + * 闃佹ゼ闈㈢Н */ private Double atticArea; /** - * 露台面积 + * 闇插彴闈㈢Н */ private Double terraceArea; /** - * 采光通风 + * 閲囧厜閫氶 */ private String lighting; /** - * 车位情况 + * 杞︿綅鎯呭喌 */ private String carport; /** - * 需要人工评估时填写的联系电话 + * 闇�瑕佷汉宸ヨ瘎浼版椂濉啓鐨勮仈绯荤數璇� */ private String contactNumber; diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/NoticeModel.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/NoticeModel.java index 76e65207a..2844e5235 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/NoticeModel.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/NoticeModel.java @@ -1,29 +1,29 @@ package com.fangjia.pds.model; /** - * 公告Model + * 鍏憡Model * @author yinjihuan * */ public class NoticeModel extends BaseModel { /** - * 编号 + * 缂栧彿 */ private String id; /** - * 标题 + * 鏍囬 */ private String title; /** - * 发布时间 + * 鍙戝竷鏃堕棿 */ private String pushDate; /** - * 内容 + * 鍐呭 */ private String content; diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/PeopleInquiryModel.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/PeopleInquiryModel.java index f2a780f3c..13784f9b0 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/PeopleInquiryModel.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/PeopleInquiryModel.java @@ -8,24 +8,24 @@ public class PeopleInquiryModel extends BaseModel { private static final long serialVersionUID = -1671947694144540813L; /** - * 分页数据对象 + * 鍒嗛〉鏁版嵁瀵硅薄 */ private PageBean pageBean; private String id; /** - * 回复价格 + * 鍥炲浠锋牸 */ private int replyPrice; /** - * 回复内容 + * 鍥炲鍐呭 */ private String replyContent; /** - * 回复类型(1有价格 0无价格) + * 鍥炲绫诲瀷锛�1鏈変环鏍� 0鏃犱环鏍硷級 */ private int type; diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/PreassessModel.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/PreassessModel.java index f255ca9b5..9043ec191 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/PreassessModel.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/PreassessModel.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.Map; /** - * 押品房产信息Model + * 鎶煎搧鎴夸骇淇℃伅Model * @author wenyan */ public class PreassessModel extends BaseModel { diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/PrevaluationModel.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/PrevaluationModel.java index 0d8abe295..dc4b5863c 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/PrevaluationModel.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/PrevaluationModel.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.Map; /** - * 数据展示 + * 鏁版嵁灞曠ず * Created by linxsh on 2017/6/29. */ public class PrevaluationModel extends BaseModel { @@ -14,75 +14,75 @@ public class PrevaluationModel extends BaseModel { private String input; /** - * 城市 + * 鍩庡競 */ private String cityDisplay; /** - * 区域 + * 鍖哄煙 */ private String region; /** - * 小区名 + * 灏忓尯鍚� */ private String districtName; /** - * 地址 + * 鍦板潃 */ private String address; /** - * 物业类型 + * 鐗╀笟绫诲瀷 */ private String estateType; /** - * 楼号 + * 妤煎彿 */ private String houseNumber; /** - * 单元号 + * 鍗曞厓鍙� */ private String unitNumber; /** - * 面积 + * 闈㈢Н */ private Double area; /** - * 室号 + * 瀹ゅ彿 */ private String roomNumber; /** - * 所在楼层 + * 鎵�鍦ㄦゼ灞� */ private Integer floor; /** - * 总楼层 + * 鎬绘ゼ灞� */ private Integer height; /** - * 朝向 + * 鏈濆悜 */ private String direction; /** - * 地下室面积 + * 鍦颁笅瀹ら潰绉� */ private Double basementArea; /** - * 阁楼面积 + * 闃佹ゼ闈㈢Н */ private Double atticArea; /** - * 露台面积 + * 闇插彴闈㈢Н */ private Double terraceArea; /** - * 采光通风 + * 閲囧厜閫氶 */ private String lighting; /** - * 车位情况 + * 杞︿綅鎯呭喌 */ private String carport; /** - * 需要人工评估时填写的联系电话 + * 闇�瑕佷汉宸ヨ瘎浼版椂濉啓鐨勮仈绯荤數璇� */ private String contactNumber; diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/ReportModel.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/ReportModel.java index 14e06d01c..3b37cecf2 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/ReportModel.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/ReportModel.java @@ -15,70 +15,70 @@ public class ReportModel extends BaseModel { private String id; - // 姓名 + // 濮撳悕 private String username; - // 手机号码 + // 鎵嬫満鍙风爜 private String mobile; - // 身份证 + // 韬唤璇� private String identityCard; - // 房产所在城市 + // 鎴夸骇鎵�鍦ㄥ煄甯� private String houseCity; - // 房产区域 + // 鎴夸骇鍖哄煙 private String houseRegion; - // 房产名称 + // 鎴夸骇鍚嶇О private String houseName; - // 房产地址 + // 鎴夸骇鍦板潃 private String houseAddress; - // 房产面积 + // 鎴夸骇闈㈢Н private Double houseArea; - // 居住城市 + // 灞呬綇鍩庡競 private String liveCity; - // 居住区域 + // 灞呬綇鍖哄煙 private String liveRegion; - // 居住名称 + // 灞呬綇鍚嶇О private String liveName; - // 居住地址 + // 灞呬綇鍦板潃 private String liveAddress; - // 实际居住房产面积 + // 瀹為檯灞呬綇鎴夸骇闈㈢Н private Double liveArea; - // 工作地址 + // 宸ヤ綔鍦板潃 private String workAddress; - // 工作地址坐标 + // 宸ヤ綔鍦板潃鍧愭爣 private Double workAddressLat; private Double workAddressLng; - // 文化程度 + // 鏂囧寲绋嬪害 private String educationLevels; - // 企业注册号 + // 浼佷笟娉ㄥ唽鍙� private String enterpriseRegisterNumber; - // 车架号 + // 杞︽灦鍙� private String carNumber; - // 物业类型 + // 鐗╀笟绫诲瀷 private String estateType; - // 用途 + // 鐢ㄩ�� private String usage; - // 处理结果 + // 澶勭悊缁撴灉 private String result; - // 状态(0-生成中 1-成功 2-失败) + // 鐘舵�侊紙0-鐢熸垚涓� 1-鎴愬姛 2-澶辫触锛� private int status; private Date startDate; @@ -87,38 +87,38 @@ public class ReportModel extends BaseModel { private List inputList; - // 防重复提交 + // 闃查噸澶嶆彁浜� private String objectId; private String reportNumber; private ReportCheck reportCheck; - // 抵押物楼栋号和室号 + // 鎶垫娂鐗╂ゼ鏍嬪彿鍜屽鍙� private String houseNum; private String roomNum; - // 抵押物经纬度 + // 鎶垫娂鐗╃粡绾害 private Long houseLat; private Long houseLng; - // 居住地址经纬度 + // 灞呬綇鍦板潃缁忕含搴� private Long liveLat; private Long liveLng; - // 总户数 + // 鎬绘埛鏁� private Integer houseSum; - // 自雇企业注册号 + // 鑷泧浼佷笟娉ㄥ唽鍙� private String selfEnterpriseRegisterNumber; - // 认证状态 0.待认证 1.认证中 2.认证成功 3.认证失败 + // 璁よ瘉鐘舵�� 0.寰呰璇� 1.璁よ瘉涓� 2.璁よ瘉鎴愬姛 3.璁よ瘉澶辫触 private Integer creditCertification; - // 认证状态 0.待认证 1.认证中 2.认证成功 3.认证失败 + // 璁よ瘉鐘舵�� 0.寰呰璇� 1.璁よ瘉涓� 2.璁よ瘉鎴愬姛 3.璁よ瘉澶辫触 private Integer fundCertification; - //银行卡 + //閾惰鍗� private String card1; private String card2; private String card3; @@ -327,46 +327,46 @@ public class ReportModel extends BaseModel { this.reportCheck = reportCheck; } - // 选项选择 - // 押品成交信息 + // 閫夐」閫夋嫨 + // 鎶煎搧鎴愪氦淇℃伅 private Boolean contractTransaction; - // 人房关系 + // 浜烘埧鍏崇郴 private Boolean personHouse; - // 押品处理分析 + // 鎶煎搧澶勭悊鍒嗘瀽 private Boolean collateralTreatment; - // 个人资料核验 + // 涓汉璧勬枡鏍搁獙 private Boolean personCheck; - // 企业信息查询 + // 浼佷笟淇℃伅鏌ヨ private Boolean enterpriseInformation; - // 自雇企业经营状况 + // 鑷泧浼佷笟缁忚惀鐘跺喌 private Boolean enterpriseOperation; - // 个人关联企业 + // 涓汉鍏宠仈浼佷笟 private Boolean personEnterprise; - // 银行交易综合评估 + // 閾惰浜ゆ槗缁煎悎璇勪及 private Boolean bankTransaction; - // 消费画像 + // 娑堣垂鐢诲儚 private Boolean consumePortrait; - // 资产状况 + // 璧勪骇鐘跺喌 private Boolean assetsStatus; - // 名下动产信息 + // 鍚嶄笅鍔ㄤ骇淇℃伅 private Boolean realEstate; - // 借贷情况 + // 鍊熻捶鎯呭喌 private Boolean loanData; - // 逾期信息 + // 閫炬湡淇℃伅 private Boolean overdueData; - // 涉诉风险摘要 + // 娑夎瘔椋庨櫓鎽樿 private Boolean caseRiskAbstract; - // 不良记录 + // 涓嶈壇璁板綍 private Boolean badRecord; - // 个人申请贷款次数 + // 涓汉鐢宠璐锋娆℃暟 private Boolean applyLoanNum; - // 征信信息查询 + // 寰佷俊淇℃伅鏌ヨ private Boolean credit; - // 公积金信息 + // 鍏Н閲戜俊鎭� private Boolean fund; - // 负债状况 + // 璐熷�虹姸鍐� private Boolean liabilities; - // 个人信息最近查询量 + // 涓汉淇℃伅鏈�杩戞煡璇㈤噺 private Boolean personalQueryNum; public Boolean getContractTransaction() { diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/ReportResultModel.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/ReportResultModel.java index 1a28bf253..f9f0493bf 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/ReportResultModel.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/ReportResultModel.java @@ -19,8 +19,8 @@ public class ReportResultModel extends BaseModel { private ReportCheck reportCheck; - private Integer ypFlag;//押品分析是否选中,0:为选中 1:选中 - private Integer userFlag;//用户分析及风险提示是否选中,0:为选中 1:选中 + private Integer ypFlag;//鎶煎搧鍒嗘瀽鏄惁閫変腑锛�0锛氫负閫変腑 1锛氶�変腑 + private Integer userFlag;//鐢ㄦ埛鍒嗘瀽鍙婇闄╂彁绀烘槸鍚﹂�変腑锛�0锛氫负閫変腑 1锛氶�変腑 private boolean flag; private Map resultMap; private String poiString; diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/ResetPassModel.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/ResetPassModel.java index d83600503..4aabf8d6c 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/ResetPassModel.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/ResetPassModel.java @@ -1,27 +1,27 @@ package com.fangjia.pds.model; /** - * 找回密码 + * 鎵惧洖瀵嗙爜 * @author yinjihuan * */ public class ResetPassModel { /** - * 手机 + * 鎵嬫満 */ private String mobile; /** - * 短信验证码 + * 鐭俊楠岃瘉鐮� */ private String smsCode; /** - * 新密码 + * 鏂板瘑鐮� */ private String newPass; /** - * 重复密码 + * 閲嶅瀵嗙爜 */ private String repeatePass; diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/RiskControlDetailDistrictGroup.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/RiskControlDetailDistrictGroup.java index 2dd5f682d..ecb7162c5 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/RiskControlDetailDistrictGroup.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/RiskControlDetailDistrictGroup.java @@ -6,7 +6,7 @@ import java.util.List; /** * - * 押品详情小区分组 + * 鎶煎搧璇︽儏灏忓尯鍒嗙粍 */ public class RiskControlDetailDistrictGroup { diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/RiskControlDetailListModel.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/RiskControlDetailListModel.java index 7faaaa9ea..0f6a47c6c 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/RiskControlDetailListModel.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/RiskControlDetailListModel.java @@ -16,61 +16,61 @@ public class RiskControlDetailListModel extends BaseModel { private String region; private String districtName; /** - * 贷款金额:最小 + * 璐锋閲戦锛氭渶灏� */ private Double minLendingPrice; /** - * 贷款金额:最大 + * 璐锋閲戦锛氭渶澶� */ private Double maxLendingPrice; /** - * 开始放贷日期 + * 寮�濮嬫斁璐锋棩鏈� */ private Date startLendingDate; /** - * 放贷结束日期 + * 鏀捐捶缁撴潫鏃ユ湡 */ private Date endLendingDate; private Integer minLoanMonth; private Integer maxLoanMonth; /** - * 贷款余额 + * 璐锋浣欓 */ private Double minLoanBalance; private Double maxLoanBalance; /** - * 当前估价 + * 褰撳墠浼颁环 */ private Double minCurPrice; private Double maxCurPrice; /** - * 即时抵押率 CLTV + * 鍗虫椂鎶垫娂鐜� CLTV */ private Double minCltv; private Double maxCltv; /** - * 风险指数 + * 椋庨櫓鎸囨暟 */ private Double minRiskRate; private Double maxRiskRate; /** - * 数据来源 + * 鏁版嵁鏉ユ簮 */ private String source; /** - * 是否显示所有,包括无法评估的数据 + * 鏄惁鏄剧ず鎵�鏈夛紝鍖呮嫭鏃犳硶璇勪及鐨勬暟鎹� */ private Boolean showInvalid; /** - * 显示未结清 + * 鏄剧ず鏈粨娓� */ private Boolean showOnlyUncleared; /** - * 最新统计日期 + * 鏈�鏂扮粺璁℃棩鏈� */ private Date countDate; @@ -78,30 +78,30 @@ public class RiskControlDetailListModel extends BaseModel { private Integer clearCount; /** - * 贷款总金额 + * 璐锋鎬婚噾棰� */ private Integer loanPrice; /** - * 贷款余额 + * 璐锋浣欓 */ private Double loanBalance; /** - * 押品总市值 + * 鎶煎搧鎬诲競鍊� */ private Integer totalPrice; /** - * 即时抵押率 + * 鍗虫椂鎶垫娂鐜� */ private Double totalCltv; private List riskControlDetailModels = new ArrayList(); /** - * 所有的城市列表 + * 鎵�鏈夌殑鍩庡競鍒楄〃 */ private List cities = Lists.newArrayList(); /** - * 排序字段和类型 + * 鎺掑簭瀛楁鍜岀被鍨� */ private String sort; diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/RiskControlDetailModel.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/RiskControlDetailModel.java index 89d1980f1..b83a3e21f 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/RiskControlDetailModel.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/RiskControlDetailModel.java @@ -12,68 +12,68 @@ public class RiskControlDetailModel extends BaseModel { private String region; private String name; /** - * 贷款金额 + * 璐锋閲戦 */ private Integer lendingPrice; /** - * 放贷日期 + * 鏀捐捶鏃ユ湡 */ private Date lendingDate; /** - * 贷款期限 + * 璐锋鏈熼檺 */ private Integer loanMonth; /** - * 贷款余额 + * 璐锋浣欓 */ private Double loanBalance; /** - * 当前估价 + * 褰撳墠浼颁环 */ private Integer curPrice; /** - * 即时抵押率 CLTV + * 鍗虫椂鎶垫娂鐜� CLTV */ private Double cltv; /** - * 风险指数 + * 椋庨櫓鎸囨暟 */ private Double riskRate; /** - * 数据来源 + * 鏁版嵁鏉ユ簮 */ private String source; /** - * 详情中的展示名称 + * 璇︽儏涓殑灞曠ず鍚嶇О */ private String displayName; /** - * 地址 + * 鍦板潃 */ private String address; /** - * 贷款人姓名、手机号 + * 璐锋浜哄鍚嶃�佹墜鏈哄彿 */ private String personName; private String phone; /** - * 还款方式 + * 杩樻鏂瑰紡 */ private String repayWay; /** - * 贷款利率 + * 璐锋鍒╃巼 */ private Double rate; /** - * 放贷时估价 + * 鏀捐捶鏃朵及浠� */ private Integer oriPrice; /** - * 原始抵押率 + * 鍘熷鎶垫娂鐜� */ private Double ltv; diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/RiskControlModel.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/RiskControlModel.java index 95bc69f30..8e08a436e 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/RiskControlModel.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/RiskControlModel.java @@ -11,57 +11,57 @@ public class RiskControlModel extends BaseModel { private int status = 0; /** - * 统计日期 + * 缁熻鏃ユ湡 */ private Date countDate; - /**有效评估套数*/ + /**鏈夋晥璇勪及濂楁暟*/ private Long availableAssess; /** - * 贷款已结清 + * 璐锋宸茬粨娓� */ private Long clearCount; - /** 存量押品总市值 */ + /** 瀛橀噺鎶煎搧鎬诲競鍊� */ private Double stockHousePrice; - /** 贷款余额 */ + /** 璐锋浣欓 */ private Double stockBalance; - /**原始抵押率*/ + /**鍘熷鎶垫娂鐜�*/ private Double oriMortgageRate; - /**即时抵押率*/ + /**鍗虫椂鎶垫娂鐜�*/ private Double curMortgageRate; - /**存量押品平均增长率 + /**瀛橀噺鎶煎搧骞冲潎澧為暱鐜� private Double totalHousePriceAvgRate; - *存量押品平均增长率标识:+(正)、-(负) + *瀛橀噺鎶煎搧骞冲潎澧為暱鐜囨爣璇嗭細+锛堟锛夈��-锛堣礋锛� private String totalHousePriceAvgRateFlag = "+";*/ - /**存量押品平均涨幅*/ + /**瀛橀噺鎶煎搧骞冲潎娑ㄥ箙*/ private Double stockHousePriceAvgRate; - /**CPDB押品平均涨幅*/ + /**CPDB鎶煎搧骞冲潎娑ㄥ箙*/ private Double cpdbHousePriceAvgRate; - /**存量押品上涨数比率*/ + /**瀛橀噺鎶煎搧涓婃定鏁版瘮鐜�*/ private Double stockHousePriceUpRate; - /**存量押品下跌数比率*/ + /**瀛橀噺鎶煎搧涓嬭穼鏁版瘮鐜�*/ private Double stockHousePriceDownRate; - /**CPDB押品上涨数比率*/ + /**CPDB鎶煎搧涓婃定鏁版瘮鐜�*/ private Double cpdbHousePriceUpRate; - /**存量押品下跌数比率*/ + /**瀛橀噺鎶煎搧涓嬭穼鏁版瘮鐜�*/ private Double cpdbHousePriceDownRate; - /**存量押品上涨-平均增长率*/ + /**瀛橀噺鎶煎搧涓婃定-骞冲潎澧為暱鐜�*/ private Double stockHousePriceUpAvgRate; - /**存量押品下跌-平均增长率*/ + /**瀛橀噺鎶煎搧涓嬭穼-骞冲潎澧為暱鐜�*/ private Double stockHousePriceDownAvgRate; - /**CPDB押品上涨-平均增长率*/ + /**CPDB鎶煎搧涓婃定-骞冲潎澧為暱鐜�*/ private Double cpdbHousePriceUpAvgRate; - /**CPDB押品下跌-平均增长率*/ + /**CPDB鎶煎搧涓嬭穼-骞冲潎澧為暱鐜�*/ private Double cpdbHousePriceDownAvgRate; - /**存量押品市值走势*/ + /**瀛橀噺鎶煎搧甯傚�艰蛋鍔�*/ private Map stockHousePriceTrend = new LinkedHashMap(); - /**CPDB押品市值走势*/ + /**CPDB鎶煎搧甯傚�艰蛋鍔�*/ private Map cpdbHousePriceTrend = new LinkedHashMap(); - /**风险指数占比*/ + /**椋庨櫓鎸囨暟鍗犳瘮*/ private Map riskRateLevelMap = new HashMap(); - /**CLTV占比*/ + /**CLTV鍗犳瘮*/ private Map cltvLevelMap = new HashMap(); public int getStatus() { diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/RiskMapModel.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/RiskMapModel.java index 31627d180..0818427e2 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/RiskMapModel.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/RiskMapModel.java @@ -9,37 +9,37 @@ public class RiskMapModel extends BaseModel { private String cityDisplay; private String region; private String token; - /**统计日期*/ + /**缁熻鏃ユ湡*/ private String countDate; - /**创建时间*/ + /**鍒涘缓鏃堕棿*/ private String createDate; - /**放贷时间*/ + /**鏀捐捶鏃堕棿*/ private String mortgageDate; - /**贷款月数(期数)*/ + /**璐锋鏈堟暟锛堟湡鏁帮級*/ private Integer months; - /**贷款数额*/ + /**璐锋鏁伴*/ private Integer mortgagePrice; - /**年化利率*/ + /**骞村寲鍒╃巼*/ private Double rate; - /**还款方式*/ + /**杩樻鏂瑰紡*/ private String repaymentWay; - /**主贷人姓名*/ + /**涓昏捶浜哄鍚�*/ private String name; - /**电话*/ + /**鐢佃瘽*/ private String phone; - /**抵押房产:房产名*/ + /**鎶垫娂鎴夸骇锛氭埧浜у悕*/ private String districtName; - /**抵押房产:房产地址*/ + /**鎶垫娂鎴夸骇锛氭埧浜у湴鍧�*/ private String districtAddr; - /**房贷时估价*/ + /**鎴胯捶鏃朵及浠�*/ private Integer oriPrice; - /**抵押率*/ + /**鎶垫娂鐜�*/ private Double mortgageRate; - /**即时抵押率*/ + /**鍗虫椂鎶垫娂鐜�*/ private Double curMortgageRate; - /**风险指数*/ + /**椋庨櫓鎸囨暟*/ private Double riskRate; - /**经纬度*/ + /**缁忕含搴�*/ private Double lat; private Double lng; diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/RiskWarnModel.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/RiskWarnModel.java index 36926b4b5..0b8eacad3 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/RiskWarnModel.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/RiskWarnModel.java @@ -3,7 +3,7 @@ package com.fangjia.pds.model; import java.util.List; import com.fangjia.dal.mongo.pds.model.RiskWarn; /** - * 风险警告 + * 椋庨櫓璀﹀憡 * @author yinjihuan * */ @@ -11,7 +11,7 @@ public class RiskWarnModel extends BaseModel { private static final long serialVersionUID = 7561604992967123257L; /** - * 风险警告信息 + * 椋庨櫓璀﹀憡淇℃伅 */ private List riskWarns; diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/RoleModel.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/RoleModel.java index 9a2cb2d44..b520de121 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/RoleModel.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/RoleModel.java @@ -10,22 +10,22 @@ public class RoleModel extends BaseModel { private static final long serialVersionUID = -5724990326450013316L; /** - * 分页数据对象 + * 鍒嗛〉鏁版嵁瀵硅薄 */ private PageBean pageBean; /** - * 企业编号 + * 浼佷笟缂栧彿 */ private String enterpriseId; /** - * 权限信息 + * 鏉冮檺淇℃伅 */ private List groupInfos; /** - * 角色信息,pds前台列表展示 + * 瑙掕壊淇℃伅锛宲ds鍓嶅彴鍒楄〃灞曠ず */ private List roles; diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/SendCodeModel.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/SendCodeModel.java index deda24f5d..52951a5af 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/SendCodeModel.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/SendCodeModel.java @@ -1,20 +1,20 @@ package com.fangjia.pds.model; /** - * 发送验证码 + * 鍙戦�侀獙璇佺爜 * @author yinjihuan - * @date 2016年5月10日 + * @date 2016骞�5鏈�10鏃� * */ public class SendCodeModel extends BaseModel { private static final long serialVersionUID = 4443755009679445709L; /** - * 类型(login:登录 register:注册 bindmobile:绑定手机,leaveMessage:联系我们留言) + * 绫诲瀷锛坙ogin:鐧诲綍 register:娉ㄥ唽 bindmobile:缁戝畾鎵嬫満,leaveMessage:鑱旂郴鎴戜滑鐣欒█锛� */ private String type; /** - * 手机号 + * 鎵嬫満鍙� */ private String mobile; private String codeToken; diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/SiteDistrictAvgPriceInfo.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/SiteDistrictAvgPriceInfo.java index 0bd69022c..0ed56037c 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/SiteDistrictAvgPriceInfo.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/SiteDistrictAvgPriceInfo.java @@ -1,6 +1,6 @@ package com.fangjia.pds.model; /** - * 各大门户小区均价 + * 鍚勫ぇ闂ㄦ埛灏忓尯鍧囦环 * @author user * */ diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/UpdatePassModel.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/UpdatePassModel.java index 0f91a7174..0d7f4506b 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/UpdatePassModel.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/UpdatePassModel.java @@ -1,23 +1,23 @@ package com.fangjia.pds.model; /** - * 修改密码Model + * 淇敼瀵嗙爜Model * @author yinjihuan * */ public class UpdatePassModel { /** - * 原始密码 + * 鍘熷瀵嗙爜 */ private String oldPass; /** - * 新密码 + * 鏂板瘑鐮� */ private String newPass; /** - * 重复密码 + * 閲嶅瀵嗙爜 */ private String repeatePass; diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/UserInfo.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/UserInfo.java index 3d857ed97..8702ce72a 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/UserInfo.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/UserInfo.java @@ -15,7 +15,7 @@ public class UserInfo extends User { private List roleInfos; /** - * 评估次数 + * 璇勪及娆℃暟 * @return */ private long evaluationTime; diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/UserLoginModel.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/UserLoginModel.java index 497a8dfa1..6f7875707 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/UserLoginModel.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/UserLoginModel.java @@ -6,19 +6,19 @@ public class UserLoginModel extends BaseModel { private static final long serialVersionUID = -6691753727056036214L; - //手机或者邮箱 + //鎵嬫満鎴栬�呴偖绠� private String username; - //密码 + //瀵嗙爜 private String pass; - //图片验证码或者短信验证码 + //鍥剧墖楠岃瘉鐮佹垨鑰呯煭淇¢獙璇佺爜 private String code; private String codeToken; private String smsCode; /** - * 公告列表 + * 鍏憡鍒楄〃 */ private List notices; diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/UserModel.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/UserModel.java index 195659be7..069c0f726 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/UserModel.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/model/UserModel.java @@ -16,89 +16,89 @@ public class UserModel extends BaseModel { private static final long serialVersionUID = 4899071723202633378L; /** - * 用户ID + * 鐢ㄦ埛ID */ private String id; /** - * 分页数据对象 + * 鍒嗛〉鏁版嵁瀵硅薄 */ private PageBean pageBean; /** - * 公司 + * 鍏徃 */ private String company; /** - * 手机 + * 鎵嬫満 */ private String mobile; /** - * 企业编号 + * 浼佷笟缂栧彿 */ private String enterpriseId; /** - * 企业名称 + * 浼佷笟鍚嶇О */ private String enterpriseName; /** - * 操作标识(save,update,detail) + * 鎿嶄綔鏍囪瘑锛坰ave,update,detail锛� */ private String op = "save"; /** - * 用户对象 + * 鐢ㄦ埛瀵硅薄 */ private User user; /** - * 企业下的角色列表 + * 浼佷笟涓嬬殑瑙掕壊鍒楄〃 */ private List enterpriseRoles; /** - * 企业开通的城市列表 + * 浼佷笟寮�閫氱殑鍩庡競鍒楄〃 */ private List enterpriseCitys; /** - * 用户姓名 + * 鐢ㄦ埛濮撳悕 */ private String name; /** - * 用户信息列表,pds前台用户列表 + * 鐢ㄦ埛淇℃伅鍒楄〃锛宲ds鍓嶅彴鐢ㄦ埛鍒楄〃 */ private List userInfos; /** - * 拼音城市列表 + * 鎷奸煶鍩庡競鍒楄〃 */ private Map> pinYinCitys; /** - * 省份城市列表 + * 鐪佷唤鍩庡競鍒楄〃 */ private Map> provinceCitys; /** - * 企业对象 + * 浼佷笟瀵硅薄 */ private Enterprise enterprise; /** - * 查询评估次数开始时间 + * 鏌ヨ璇勪及娆℃暟寮�濮嬫椂闂� * @return */ private Date startDate; /** - * 查询评估次数结束时间 + * 鏌ヨ璇勪及娆℃暟缁撴潫鏃堕棿 * @return */ private Date endDate; diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/servlet/SafeCode.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/servlet/SafeCode.java index 32d912b95..4483c6080 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/servlet/SafeCode.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/servlet/SafeCode.java @@ -17,7 +17,7 @@ import com.fangjia.service.pds.PdsUserService; public class SafeCode extends HttpServlet { private static final long serialVersionUID = 8729414662081043987L; - //产生随即的字体 + //浜х敓闅忓嵆鐨勫瓧浣� private Font getFont() { Random random = new Random(); Font font[] = new Font[5]; @@ -31,44 +31,44 @@ public class SafeCode extends HttpServlet { protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { - // 设置响应头 Content-type类型 + // 璁剧疆鍝嶅簲澶� Content-type绫诲瀷 resp.setContentType("image/jpeg"); - // 以下三句是用于设置页面不缓存 + // 浠ヤ笅涓夊彞鏄敤浜庤缃〉闈笉缂撳瓨 resp.setHeader("Pragma", "No-cache"); resp.setHeader("Cache-Control", "No-cache"); resp.setDateHeader("Expires", 0); OutputStream os = resp.getOutputStream(); int width = 72, height = 30; - // 建立指定宽、高和BufferedImage对象 + // 寤虹珛鎸囧畾瀹姐�侀珮鍜孊ufferedImage瀵硅薄 BufferedImage image = new BufferedImage(width, height,BufferedImage.TYPE_INT_RGB); - Graphics g = image.getGraphics(); // 该画笔画在image上 - Color c = g.getColor(); // 保存当前画笔的颜色,用完画笔后要回复现场 + Graphics g = image.getGraphics(); // 璇ョ敾绗旂敾鍦╥mage涓� + Color c = g.getColor(); // 淇濆瓨褰撳墠鐢荤瑪鐨勯鑹诧紝鐢ㄥ畬鐢荤瑪鍚庤鍥炲鐜板満 g.fillRect(0, 0, width, height); - char[] ch = "abcdefghjkmnpqrstuvwxyz23456789".toCharArray(); // 随即产生的字符串 不包括 i l(小写L) o(小写O) 1(数字1)0(数字0) - int length = ch.length; // 随即字符串的长度 - StringBuilder sRand = new StringBuilder(); // 保存随即产生的字符串 + char[] ch = "abcdefghjkmnpqrstuvwxyz23456789".toCharArray(); // 闅忓嵆浜х敓鐨勫瓧绗︿覆 涓嶅寘鎷� i l(灏忓啓L) o锛堝皬鍐橭锛� 1锛堟暟瀛�1锛�0(鏁板瓧0) + int length = ch.length; // 闅忓嵆瀛楃涓茬殑闀垮害 + StringBuilder sRand = new StringBuilder(); // 淇濆瓨闅忓嵆浜х敓鐨勫瓧绗︿覆 Random random = new Random(); for (int i = 0; i < 4; i++) { - // 设置字体 + // 璁剧疆瀛椾綋 g.setFont(getFont()); - // 随即生成0-9的数字 + // 闅忓嵆鐢熸垚0-9鐨勬暟瀛� String rand = new Character(ch[random.nextInt(length)]).toString(); sRand.append(rand); - // 设置随机颜色 + // 璁剧疆闅忔満棰滆壊 g.setColor(new Color(random.nextInt(255), random.nextInt(255), random.nextInt(255))); g.drawString(rand, 18 * i , 22); } - //产生随即干扰点 + //浜х敓闅忓嵆骞叉壈鐐� for (int i = 0; i < 20; i++) { int x1 = random.nextInt(width); int y1 = random.nextInt(height); g.drawOval(x1, y1, 2, 2); } - g.setColor(c); // 将画笔的颜色再设置回去 + g.setColor(c); // 灏嗙敾绗旂殑棰滆壊鍐嶈缃洖鍘� g.dispose(); String codeToken = getCodeToken(req); try { @@ -76,7 +76,7 @@ public class SafeCode extends HttpServlet { } catch (Exception e) { CacheUtils.putValue(CachePolicyEnum.TINY, PdsUserService.class, codeToken + "_" + Message.SMS_CODE_TYPE_LOGIN, sRand.toString()); } - // 输出图像到页面 + // 杈撳嚭鍥惧儚鍒伴〉闈� ImageIO.write(image, "JPEG", os); } diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/servlet/Test.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/servlet/Test.java index 0d51196c8..33b763d54 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/servlet/Test.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/servlet/Test.java @@ -65,8 +65,8 @@ public class Test { // // public void createPDF(String path) { // try { -// Rectangle rectPageSize = new Rectangle(PageSize.A4);// A4纸张 -// Document document = new Document(rectPageSize, 40, 40, 40, 40);// 上、下、左、右间距 +// Rectangle rectPageSize = new Rectangle(PageSize.A4);// A4绾稿紶 +// Document document = new Document(rectPageSize, 40, 40, 40, 40);// 涓娿�佷笅銆佸乏銆佸彸闂磋窛 // // OutputStream outputStream = new FileOutputStream(new File(path)); >>>>>>> .theirs @@ -76,18 +76,18 @@ public class Test { public static void pdfTest(final String htmlUrl, final String pdfFilePath) { - // 只能5个线程同时访问 + // 鍙兘5涓嚎绋嬪悓鏃惰闂� final Semaphore semaphore = new Semaphore(2); final String whktmlExe = "wkhtmltopdf"; try { System.out.println(" inside for before " + semaphore.availablePermits()); - // 获取许可 + // 鑾峰彇璁稿彲 semaphore.acquire(); System.out.println(" inside for after " + " ---" + htmlUrl); new java.lang.Thread() { public void run() { try { - ProcessBuilder pb = new ProcessBuilder(whktmlExe, "--print-media-type", "--margin-left", "10mm", "--margin-right", "10mm", htmlUrl, pdfFilePath); // 使用print样式 + ProcessBuilder pb = new ProcessBuilder(whktmlExe, "--print-media-type", "--margin-left", "10mm", "--margin-right", "10mm", htmlUrl, pdfFilePath); // 浣跨敤print鏍峰紡 //ProcessBuilder pb = new ProcessBuilder(whktmlExe, htmlUrl, pdfFilePath); pb.redirectErrorStream(true); Process process = pb.start(); @@ -102,7 +102,7 @@ public class Test { e.printStackTrace(); } finally { System.out.println("in finally releasing " + semaphore.availablePermits()); - // 访问完后,释放 + // 璁块棶瀹屽悗锛岄噴鏀� semaphore.release(); } } diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/servlet/UploadDataBatchServlet.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/servlet/UploadDataBatchServlet.java index 9c576cfe9..cdce4d751 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/servlet/UploadDataBatchServlet.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/servlet/UploadDataBatchServlet.java @@ -77,26 +77,26 @@ public class UploadDataBatchServlet extends HttpServlet { HttpServletResponse response) throws ServletException, IOException { request.setCharacterEncoding("UTF-8"); response.setContentType("text/html;charset=UTF-8"); - // 构造一个文件上传处理对象 + // 鏋勯�犱竴涓枃浠朵笂浼犲鐞嗗璞� FileItemFactory factory = new DiskFileItemFactory(); ServletFileUpload upload = new ServletFileUpload(factory); String userId = PdsSessionContent.getLoginUserId(request); Iterator items; Map infoMap = new HashMap(); try { - // 解析表单中提交的所有文件内容 + // 瑙f瀽琛ㄥ崟涓彁浜ょ殑鎵�鏈夋枃浠跺唴瀹� items = upload.parseRequest(request).iterator(); while (items.hasNext()) { FileItem item = (FileItem) items.next(); if (!item.isFormField()) { - // 取出上传文件的文件名称 + // 鍙栧嚭涓婁紶鏂囦欢鐨勬枃浠跺悕绉� String name = item.getName(); - // 取得上传文件以后的存储路径 + // 鍙栧緱涓婁紶鏂囦欢浠ュ悗鐨勫瓨鍌ㄨ矾寰� Workbook workbook = getWorkbookFromStream(name, item); workbook.setForceFormulaRecalculation(true); if (workbook == null) { - infoMap.put("msg", "上传类型不匹配!"); + infoMap.put("msg", "涓婁紶绫诲瀷涓嶅尮閰嶏紒"); String json = JSONObject.fromObject(infoMap).toString(); response.getWriter().write(json.toString()); response.getWriter().flush(); @@ -117,7 +117,7 @@ public class UploadDataBatchServlet extends HttpServlet { } } catch (Exception e) { e.printStackTrace(); - infoMap.put("msg", "上传失败!"); + infoMap.put("msg", "涓婁紶澶辫触锛�"); String json = JSONObject.fromObject(infoMap).toString(); response.getWriter().write(json.toString()); response.getWriter().flush(); @@ -160,7 +160,7 @@ public class UploadDataBatchServlet extends HttpServlet { String userId, long version, Map infoMap) { int totalNum = sheet.getLastRowNum(); if (totalNum > 5000) { - infoMap.put("msg", "上传数量最多5000条数据!"); + infoMap.put("msg", "涓婁紶鏁伴噺鏈�澶�5000鏉℃暟鎹紒"); return infoMap; } @@ -176,7 +176,7 @@ public class UploadDataBatchServlet extends HttpServlet { } if (datas.size() == 0) { - infoMap.put("msg", "不能上传空文件"); + infoMap.put("msg", "涓嶈兘涓婁紶绌烘枃浠�"); return infoMap; } @@ -191,7 +191,7 @@ public class UploadDataBatchServlet extends HttpServlet { fileDataTotality = fileDataTotalityService.get(userId, fileName); if (fileDataTotality == null) { - infoMap.put("msg", "上传失败,请重新上传"); + infoMap.put("msg", "涓婁紶澶辫触锛岃閲嶆柊涓婁紶"); return infoMap; } List list = new ArrayList(); diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/servlet/UploadDataServlet.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/servlet/UploadDataServlet.java index 157475d8a..653b25c31 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/servlet/UploadDataServlet.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/servlet/UploadDataServlet.java @@ -79,26 +79,26 @@ public class UploadDataServlet extends HttpServlet { HttpServletResponse response) throws ServletException, IOException { request.setCharacterEncoding("UTF-8"); response.setContentType("text/html;charset=UTF-8"); - // 构造一个文件上传处理对象 + // 鏋勯�犱竴涓枃浠朵笂浼犲鐞嗗璞� FileItemFactory factory = new DiskFileItemFactory(); ServletFileUpload upload = new ServletFileUpload(factory); String userId = PdsSessionContent.getLoginUserId(request); Iterator items; Map infoMap = new HashMap(); try { - // 解析表单中提交的所有文件内容 + // 瑙f瀽琛ㄥ崟涓彁浜ょ殑鎵�鏈夋枃浠跺唴瀹� items = upload.parseRequest(request).iterator(); while (items.hasNext()) { FileItem item = (FileItem) items.next(); if (!item.isFormField()) { - // 取出上传文件的文件名称 + // 鍙栧嚭涓婁紶鏂囦欢鐨勬枃浠跺悕绉� String name = item.getName(); - // 取得上传文件以后的存储路径 + // 鍙栧緱涓婁紶鏂囦欢浠ュ悗鐨勫瓨鍌ㄨ矾寰� Workbook workbook = getWorkbookFromStream(name, item); workbook.setForceFormulaRecalculation(true); if (workbook == null) { - infoMap.put("msg", "上传类型不匹配!"); + infoMap.put("msg", "涓婁紶绫诲瀷涓嶅尮閰嶏紒"); String json = JSONObject.fromObject(infoMap).toString(); response.getWriter().write(json.toString()); response.getWriter().flush(); @@ -119,7 +119,7 @@ public class UploadDataServlet extends HttpServlet { } } catch (Exception e) { e.printStackTrace(); - infoMap.put("msg", "上传失败!"); + infoMap.put("msg", "涓婁紶澶辫触锛�"); String json = JSONObject.fromObject(infoMap).toString(); response.getWriter().write(json.toString()); response.getWriter().flush(); @@ -162,7 +162,7 @@ public class UploadDataServlet extends HttpServlet { String userId, long version, Map infoMap) { int totalNum = sheet.getLastRowNum(); if (totalNum > 5000) { - infoMap.put("msg", "上传数量最多5000条数据!"); + infoMap.put("msg", "涓婁紶鏁伴噺鏈�澶�5000鏉℃暟鎹紒"); return infoMap; } @@ -178,7 +178,7 @@ public class UploadDataServlet extends HttpServlet { } if (datas.size() == 0) { - infoMap.put("msg", "不能上传空文件"); + infoMap.put("msg", "涓嶈兘涓婁紶绌烘枃浠�"); return infoMap; } @@ -193,7 +193,7 @@ public class UploadDataServlet extends HttpServlet { fileDataTotality = fileDataTotalityService.get(userId, fileName); if (fileDataTotality == null) { - infoMap.put("msg", "上传失败,请重新上传"); + infoMap.put("msg", "涓婁紶澶辫触锛岃閲嶆柊涓婁紶"); return infoMap; } List list = new ArrayList(); diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/servlet/UploadFileServlet.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/servlet/UploadFileServlet.java index 745285fd5..a3e4c58be 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/servlet/UploadFileServlet.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/servlet/UploadFileServlet.java @@ -63,7 +63,7 @@ public class UploadFileServlet extends HttpServlet{ private PdsApiProxyService pdsApiProxyService; private UploadErrorDetailService uploadErrorDetailService; private UploadDataTotalityService uploadDataTotalityService; - private static final String[] columns = {"","*房产所在城市","*房产类型","*小区名/地址","*楼栋号","单元号","*室号","*面积(㎡)","*放贷时估价(元)","*贷款开始日期","*贷款金额(元)","*贷款年化利率(%)","*贷款期限(个月)","*还款方式","*当前贷款余额(元)"}; + private static final String[] columns = {"","*鎴夸骇鎵�鍦ㄥ煄甯�","*鎴夸骇绫诲瀷","*灏忓尯鍚�/鍦板潃","*妤兼爧鍙�","鍗曞厓鍙�","*瀹ゅ彿","*闈㈢Н锛堛帯锛�","*鏀捐捶鏃朵及浠凤紙鍏冿級","*璐锋寮�濮嬫棩鏈�","*璐锋閲戦锛堝厓锛�","*璐锋骞村寲鍒╃巼锛�%锛�","*璐锋鏈熼檺锛堜釜鏈堬級","*杩樻鏂瑰紡","*褰撳墠璐锋浣欓锛堝厓锛�"}; @Override public void init(ServletConfig config) throws ServletException { // Mongo mongo; @@ -92,29 +92,29 @@ public class UploadFileServlet extends HttpServlet{ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - request.setCharacterEncoding("UTF-8"); //转码 + request.setCharacterEncoding("UTF-8"); //杞爜 response.setContentType("text/html;charset=UTF-8"); - //构造一个文件上传处理对象 + //鏋勯�犱竴涓枃浠朵笂浼犲鐞嗗璞� FileItemFactory factory = new DiskFileItemFactory(); ServletFileUpload upload = new ServletFileUpload(factory); String userId = PdsSessionContent.getLoginUserId(request); String enterpriseId = PdsSessionContent.getLoginEnterpriseId(request); Iterator items; try{ - //解析表单中提交的所有文件内容 + //瑙f瀽琛ㄥ崟涓彁浜ょ殑鎵�鏈夋枃浠跺唴瀹� items = upload.parseRequest(request).iterator(); while(items.hasNext()){ FileItem item = (FileItem) items.next(); if(!item.isFormField()){ - //取出上传文件的文件名称 + //鍙栧嚭涓婁紶鏂囦欢鐨勬枃浠跺悕绉� String name = item.getName(); - //取得上传文件以后的存储路径 + //鍙栧緱涓婁紶鏂囦欢浠ュ悗鐨勫瓨鍌ㄨ矾寰� Workbook workbook = getWorkbookFromStream(name, item); workbook.setForceFormulaRecalculation(true); Map infoMap = new HashMap(); if(workbook == null){ - infoMap.put("error", "上传类型不匹配!"); + infoMap.put("error", "涓婁紶绫诲瀷涓嶅尮閰嶏紒"); String json = JSONObject.fromObject(infoMap).toString(); response.getWriter().write(json.toString()); response.getWriter().flush(); @@ -143,17 +143,17 @@ public class UploadFileServlet extends HttpServlet{ private Map checkUploadData(Sheet sheet, String name, String userId, String enterpriseId, long version, Map infoMap){ int totalNum = sheet.getLastRowNum(); - System.out.println("上传文件共:"+totalNum+"个"); + System.out.println("涓婁紶鏂囦欢鍏�:"+totalNum+"涓�"); if(totalNum>1000){ totalNum = 1000; } - Integer totalLine = 0;//总行数 - Integer totalErrorLine = 0;//总错误行 - String message = "上传成功!"; + Integer totalLine = 0;//鎬昏鏁� + Integer totalErrorLine = 0;//鎬婚敊璇 + String message = "涓婁紶鎴愬姛!"; - //获取总列数 - int coloumNum=sheet.getRow(0).getPhysicalNumberOfCells();//获得总列数 + //鑾峰彇鎬诲垪鏁� + int coloumNum=sheet.getRow(0).getPhysicalNumberOfCells();//鑾峰緱鎬诲垪鏁� List> ret = new ArrayList>(); List> datas = new ArrayList>(); for(int rowj=3;rowj <= totalNum;rowj++){ @@ -166,18 +166,18 @@ public class UploadFileServlet extends HttpServlet{ Map dataMap = new HashMap(); List errorList = new ArrayList(); - //字段验证 + //瀛楁楠岃瘉 for(int i=1;i=10&&i<=12||i>=14){ if(!DataUtil.getNumberFromString(val.toString())){ errorFlag = true; @@ -190,7 +190,7 @@ public class UploadFileServlet extends HttpServlet{ if(val.toString().contains("/")){ dateArr = val.toString().split("/"); } - //日期类型检查 + //鏃ユ湡绫诲瀷妫�鏌� Date date = DateUtil.parseDate(val.toString(), "yyyy/MM/dd"); if(null == date || dateArr.length<3 || (dateArr.length==3 && (dateArr[0].length()<4 || dateArr[1].length()>=3 || dateArr[2].length()>=3))){ errorFlag = true; @@ -214,7 +214,7 @@ public class UploadFileServlet extends HttpServlet{ } } - if(!isBlankRows){//不是空白行 + if(!isBlankRows){//涓嶆槸绌虹櫧琛� totalLine ++; if(errorFlag){ totalErrorLine++; @@ -227,20 +227,20 @@ public class UploadFileServlet extends HttpServlet{ } - //保存上传文件的总体情况 + //淇濆瓨涓婁紶鏂囦欢鐨勬�讳綋鎯呭喌 saveUploadFileData(totalLine, totalErrorLine, name, userId, version); if(totalErrorLine > 0){ - //保存失败信息 + //淇濆瓨澶辫触淇℃伅 saveUploadErrorInfo(ret, version); - infoMap.put("error", "上传失败!"); + infoMap.put("error", "涓婁紶澶辫触!"); }else if(totalLine==0){ - ret.add(Arrays.asList("0", Arrays.asList("格式有误或无数据"))); + ret.add(Arrays.asList("0", Arrays.asList("鏍煎紡鏈夎鎴栨棤鏁版嵁"))); saveUploadErrorInfo(ret, version); - infoMap.put("error", "上传失败!"); + infoMap.put("error", "涓婁紶澶辫触!"); }else{ infoMap.put("success", message); - //验证通过后,保存信息 + //楠岃瘉閫氳繃鍚�,淇濆瓨淇℃伅 saveSuccessToDB(datas, userId, enterpriseId, version); } @@ -272,51 +272,51 @@ public class UploadFileServlet extends HttpServlet{ DBObject detailDbo = new BasicDBObject();*/ while(ite.hasNext()){ String key = (String) ite.next(); - if(key.equals("*房产所在城市")){ + if(key.equals("*鎴夸骇鎵�鍦ㄥ煄甯�")){ collateralEvaluationInfo.setCity(map.get(key)); // houseDbo.put("city", map.get(key)); - }else if(key.equals("*房产类型")){ + }else if(key.equals("*鎴夸骇绫诲瀷")){ collateralEvaluationInfo.setEstateType(map.get(key)); // houseDbo.put("estate_type", map.get(key)); - }else if(key.equals("*小区名/地址")){ + }else if(key.equals("*灏忓尯鍚�/鍦板潃")){ collateralEvaluationInfo.setOldAddress(map.get(key)); // houseDbo.put("old_address", map.get(key)); - }else if(key.equals("*楼栋号")){ + }else if(key.equals("*妤兼爧鍙�")){ collateralEvaluationInfo.setHouseNumber(formatNumer(map.get(key))); // houseDbo.put("house_number", formatNumer(map.get(key))); - }else if(key.equals("单元号")){ + }else if(key.equals("鍗曞厓鍙�")){ collateralEvaluationInfo.setUnitNumber(formatNumer(map.get(key))); // houseDbo.put("unit_number", formatNumer(map.get(key))); - }else if(key.equals("*室号")){ + }else if(key.equals("*瀹ゅ彿")){ collateralEvaluationInfo.setRoomNumber(formatNumer(map.get(key))); // houseDbo.put("room_number", formatNumer(map.get(key))); - }else if(key.equals("*面积(㎡)")){ + }else if(key.equals("*闈㈢Н锛堛帯锛�")){ collateralEvaluationInfo.setArea(NumberUtils.toDouble(map.get(key))); // houseDbo.put("area", Double.valueOf(formatNumer(map.get(key)))); - }else if(key.equals("*放贷时估价(元)")){ + }else if(key.equals("*鏀捐捶鏃朵及浠凤紙鍏冿級")){ collateralEvaluationInfo.setTotalPrice(new BigDecimal(map.get(key)).intValue()); // houseDbo.put("total_price", formatInt(formatNumer(map.get(key)))); - }else if(key.equals("*贷款开始日期")){ + }else if(key.equals("*璐锋寮�濮嬫棩鏈�")){ mortgageDetail.setLendingDate(DateUtil.parseDate(map.get(key), "yyyy/MM/dd")); // detailDbo.put("lending_date", DateUtil.parseDate(map.get(key),"yyyy/MM/dd")); - }else if(key.equals("*贷款金额(元)")){ + }else if(key.equals("*璐锋閲戦锛堝厓锛�")){ mortgageDetail.setLendingPrice(new BigDecimal(map.get(key)).intValue()); // detailDbo.put("lending_price", formatInt(formatNumer(map.get(key)))); - }else if(key.equals("*贷款年化利率(%)")){ + }else if(key.equals("*璐锋骞村寲鍒╃巼锛�%锛�")){ mortgageDetail.setRate(NumberUtils.toDouble(map.get(key))); // detailDbo.put("rate", Double.valueOf(formatNumer(map.get(key)))); - }else if(key.equals("*贷款期限(个月)")){ + }else if(key.equals("*璐锋鏈熼檺锛堜釜鏈堬級")){ mortgageDetail.setLoanMonth(new BigDecimal(map.get(key)).intValue()); // detailDbo.put("loan_month", formatInt(formatNumer(map.get(key)))); - }else if(key.equals("*还款方式")){ - mortgageDetail.setRepaymentWay("等额本息".equals(map.get(key)) ? 1 : 2); - /*if(map.get(key).toString().equals("等额本息")){ + }else if(key.equals("*杩樻鏂瑰紡")){ + mortgageDetail.setRepaymentWay("绛夐鏈伅".equals(map.get(key)) ? 1 : 2); + /*if(map.get(key).toString().equals("绛夐鏈伅")){ detailDbo.put("repayment_way", 1); }else{ detailDbo.put("repayment_way", 2); }*/ } - else if(key.equals("*当前贷款余额(元)")){ + else if(key.equals("*褰撳墠璐锋浣欓锛堝厓锛�")){ try { long balance = new BigDecimal(map.get(key)).longValue(); mortgageDetail.setBalance(balance); @@ -350,7 +350,7 @@ public class UploadFileServlet extends HttpServlet{ mortgageDetail.setHouseIds(Arrays.asList(houseId)); mortgageDetail.setUserId(userId); mortgageDetail.setEnterpriseId(enterpriseId); - mortgageDetail.setSource("导入数据"); + mortgageDetail.setSource("瀵煎叆鏁版嵁"); mortgageDetail.setCreateDate(new Date()); mortgageDetail.setVersion(version); mortgageDetailService.save(mortgageDetail, PdsConstants.FANGJIA_API_TOKEN); @@ -360,7 +360,7 @@ public class UploadFileServlet extends HttpServlet{ detailDbo.put("house_ids", Arrays.asList(houseId)); detailDbo.put("user_id", userId); detailDbo.put("enterprise_id", enterpriseId); - detailDbo.put("source", "导入数据"); + detailDbo.put("source", "瀵煎叆鏁版嵁"); detailDbo.put("c_date", new Date()); detailDbo.put("version", version);*/ diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/util/CommonUtil.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/util/CommonUtil.java index 16de60f83..7e31c6647 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/util/CommonUtil.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/util/CommonUtil.java @@ -21,7 +21,7 @@ public class CommonUtil { private static final Pattern specialChacacter = Pattern.compile("([-\\{\\}\\(\\)\\[\\]\\.\\*\\+\\:\\?\\\\])"); public static String formatCity(String city) { - if(city.endsWith("市")){ + if(city.endsWith("甯�")){ city = city.substring(0, city.length() - 1); } return city; @@ -29,16 +29,16 @@ public class CommonUtil { /** *
-     * 省、直辖市代码表:
-     *     11 : 北京  12 : 天津  13 : 河北       14 : 山西  15 : 内蒙古
-     *     21 : 辽宁  22 : 吉林  23 : 黑龙江     31 : 上海  32 : 江苏
-     *     33 : 浙江  34 : 安徽  35 : 福建       36 : 江西  37 : 山东
-     *     41 : 河南  42 : 湖北  43 : 湖南       44 : 广东  45 : 广西      46 : 海南
-     *     50 : 重庆  51 : 四川  52 : 贵州       53 : 云南  54 : 西藏
-     *     61 : 陕西  62 : 甘肃  63 : 青海       64 : 宁夏  65 : 新疆
-     *     71 : 台湾
-     *     81 : 香港  82 : 澳门
-     *     91 : 国外
+     * 鐪併�佺洿杈栧競浠g爜琛細
+     *     11 : 鍖椾含  12 : 澶╂触  13 : 娌冲寳       14 : 灞辫タ  15 : 鍐呰挋鍙�
+     *     21 : 杈藉畞  22 : 鍚夋灄  23 : 榛戦緳姹�     31 : 涓婃捣  32 : 姹熻嫃
+     *     33 : 娴欐睙  34 : 瀹夊窘  35 : 绂忓缓       36 : 姹熻タ  37 : 灞变笢
+     *     41 : 娌冲崡  42 : 婀栧寳  43 : 婀栧崡       44 : 骞夸笢  45 : 骞胯タ      46 : 娴峰崡
+     *     50 : 閲嶅簡  51 : 鍥涘窛  52 : 璐靛窞       53 : 浜戝崡  54 : 瑗胯棌
+     *     61 : 闄曡タ  62 : 鐢樿們  63 : 闈掓捣       64 : 瀹佸  65 : 鏂扮枂
+     *     71 : 鍙版咕
+     *     81 : 棣欐腐  82 : 婢抽棬
+     *     91 : 鍥藉
      * 
*/ private static String cityCode[] = { "11", "12", "13", "14", "15", "21", @@ -47,7 +47,7 @@ public class CommonUtil { "63", "64", "65", "71", "81", "82", "91" }; /** - * 每位加权因子 + * 姣忎綅鍔犳潈鍥犲瓙 */ private static int power[] = { 7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2 }; @@ -59,7 +59,7 @@ public class CommonUtil { } /** - * 验证是否是手机号 + * 楠岃瘉鏄惁鏄墜鏈哄彿 * @param phoneNumber * @return */ @@ -71,12 +71,12 @@ public class CommonUtil { } /** - * 身份证号合法性校验 + * 韬唤璇佸彿鍚堟硶鎬ф牎楠� * *
-     * --15位身份证号码:第7、8位为出生年份(两位数),第9、10位为出生月份,第11、12位代表出生日期,第15位代表性别,奇数为男,偶数为女。
-     * --18位身份证号码:第7、8、9、10位为出生年份(四位数),第11、第12位为出生月份,第13、14位代表出生日期,第17位代表性别,奇数为男,偶数为女。
-     *    最后一位为校验位
+     * --15浣嶈韩浠借瘉鍙风爜锛氱7銆�8浣嶄负鍑虹敓骞翠唤(涓や綅鏁�)锛岀9銆�10浣嶄负鍑虹敓鏈堜唤锛岀11銆�12浣嶄唬琛ㄥ嚭鐢熸棩鏈燂紝绗�15浣嶄唬琛ㄦ�у埆锛屽鏁颁负鐢凤紝鍋舵暟涓哄コ銆�
+     * --18浣嶈韩浠借瘉鍙风爜锛氱7銆�8銆�9銆�10浣嶄负鍑虹敓骞翠唤(鍥涗綅鏁�)锛岀11銆佺12浣嶄负鍑虹敓鏈堜唤锛岀13銆�14浣嶄唬琛ㄥ嚭鐢熸棩鏈燂紝绗�17浣嶄唬琛ㄦ�у埆锛屽鏁颁负鐢凤紝鍋舵暟涓哄コ銆�
+     *    鏈�鍚庝竴浣嶄负鏍¢獙浣�
      * 
* * @param idCardNumber @@ -91,9 +91,9 @@ public class CommonUtil { } /** - * 格式化为指定位数的小数,四舍五入 + * 鏍煎紡鍖栦负鎸囧畾浣嶆暟鐨勫皬鏁帮紝鍥涜垗浜斿叆 * @param d - * @param scale 保留的小数位数 + * @param scale 淇濈暀鐨勫皬鏁颁綅鏁� * @return */ public static Double formatNumber(Double d, int scale) { @@ -105,7 +105,7 @@ public class CommonUtil { } /** - * 功能:判断字符串是否为日期格式 + * 鍔熻兘锛氬垽鏂瓧绗︿覆鏄惁涓烘棩鏈熸牸寮� * * @param strDate * @return @@ -117,41 +117,41 @@ public class CommonUtil { /** - * 功能:身份证的有效验证 + * 鍔熻兘锛氳韩浠借瘉鐨勬湁鏁堥獙璇� * * @param IDStr - * 身份证号 - * @return 有效:返回"" 无效:返回String信息 + * 韬唤璇佸彿 + * @return 鏈夋晥锛氳繑鍥�"" 鏃犳晥锛氳繑鍥濻tring淇℃伅 */ private static String IDCardValidate(String IDStr) { - String errorInfo = "";// 记录错误信息 + String errorInfo = "";// 璁板綍閿欒淇℃伅 String[] ValCodeArr = { "1", "0", "x", "9", "8", "7", "6", "5", "4", "3", "2" }; String Ai = ""; - // ================ 号码的长度 15位或18位 ================ + // ================ 鍙风爜鐨勯暱搴� 15浣嶆垨18浣� ================ if (IDStr.length() != 15 && IDStr.length() != 18) { - errorInfo = "身份证号码长度应该为15位或18位"; + errorInfo = "韬唤璇佸彿鐮侀暱搴﹀簲璇ヤ负15浣嶆垨18浣�"; return errorInfo; } // =======================(end)======================== - // ================ 数字 除最后以为都为数字 ================ + // ================ 鏁板瓧 闄ゆ渶鍚庝互涓洪兘涓烘暟瀛� ================ if (IDStr.length() == 18) { Ai = IDStr.substring(0, 17); } else if (IDStr.length() == 15) { Ai = IDStr.substring(0, 6) + "19" + IDStr.substring(6, 15); } if (!StringUtils.isNumeric(Ai)) { - errorInfo = "身份证15位号码都应为数字;18位号码除最后一位外,都应为数字。"; + errorInfo = "韬唤璇�15浣嶅彿鐮侀兘搴斾负鏁板瓧锛�18浣嶅彿鐮侀櫎鏈�鍚庝竴浣嶅锛岄兘搴斾负鏁板瓧銆�"; return errorInfo; } // =======================(end)======================== - // ================ 出生年月是否有效 ================ - String strYear = Ai.substring(6, 10);// 年份 - String strMonth = Ai.substring(10, 12);// 月份 - String strDay = Ai.substring(12, 14);// 月份 + // ================ 鍑虹敓骞存湀鏄惁鏈夋晥 ================ + String strYear = Ai.substring(6, 10);// 骞翠唤 + String strMonth = Ai.substring(10, 12);// 鏈堜唤 + String strDay = Ai.substring(12, 14);// 鏈堜唤 if (isDate(strYear + "-" + strMonth + "-" + strDay) == false) { - errorInfo = "身份证生日无效"; + errorInfo = "韬唤璇佺敓鏃ユ棤鏁�"; return errorInfo; } GregorianCalendar gc = new GregorianCalendar(); @@ -160,7 +160,7 @@ public class CommonUtil { if ((gc.get(Calendar.YEAR) - Integer.parseInt(strYear)) > 150 || (gc.getTime().getTime() - s.parse( strYear + "-" + strMonth + "-" + strDay).getTime()) < 0) { - errorInfo = "身份证生日不在有效范围"; + errorInfo = "韬唤璇佺敓鏃ヤ笉鍦ㄦ湁鏁堣寖鍥�"; return errorInfo; } } catch (NumberFormatException e) { @@ -169,24 +169,24 @@ public class CommonUtil { e.printStackTrace(); } if (Integer.parseInt(strMonth) > 12 || Integer.parseInt(strMonth) == 0) { - errorInfo = "身份证月份无效"; + errorInfo = "韬唤璇佹湀浠芥棤鏁�"; return errorInfo; } if (Integer.parseInt(strDay) > 31 || Integer.parseInt(strDay) == 0) { - errorInfo = "身份证日期无效"; + errorInfo = "韬唤璇佹棩鏈熸棤鏁�"; return errorInfo; } // =====================(end)===================== - // ================ 地区码时候有效 ================ + // ================ 鍦板尯鐮佹椂鍊欐湁鏁� ================ Hashtable h = GetAreaCode(); if (h.get(Ai.substring(0, 2)) == null) { - errorInfo = "身份证地区编码错误"; + errorInfo = "韬唤璇佸湴鍖虹紪鐮侀敊璇�"; return errorInfo; } // ============================================== - // ================ 判断最后一位的值 ================ + // ================ 鍒ゆ柇鏈�鍚庝竴浣嶇殑鍊� ================ int TotalmulAiWi = 0; for (int i = 0; i < 17; i++) { TotalmulAiWi = TotalmulAiWi @@ -199,7 +199,7 @@ public class CommonUtil { if (IDStr.length() == 18) { if (Ai.equals(IDStr) == false) { - errorInfo = "身份证无效,不是合法的身份证号码"; + errorInfo = "韬唤璇佹棤鏁堬紝涓嶆槸鍚堟硶鐨勮韩浠借瘉鍙风爜"; return errorInfo; } } else { @@ -210,47 +210,47 @@ public class CommonUtil { } /** - * 功能:设置地区编码 + * 鍔熻兘锛氳缃湴鍖虹紪鐮� * - * @return Hashtable 对象 + * @return Hashtable 瀵硅薄 */ private static Hashtable GetAreaCode() { Hashtable hashtable = new Hashtable(); - hashtable.put("11", "北京"); - hashtable.put("12", "天津"); - hashtable.put("13", "河北"); - hashtable.put("14", "山西"); - hashtable.put("15", "内蒙古"); - hashtable.put("21", "辽宁"); - hashtable.put("22", "吉林"); - hashtable.put("23", "黑龙江"); - hashtable.put("31", "上海"); - hashtable.put("32", "江苏"); - hashtable.put("33", "浙江"); - hashtable.put("34", "安徽"); - hashtable.put("35", "福建"); - hashtable.put("36", "江西"); - hashtable.put("37", "山东"); - hashtable.put("41", "河南"); - hashtable.put("42", "湖北"); - hashtable.put("43", "湖南"); - hashtable.put("44", "广东"); - hashtable.put("45", "广西"); - hashtable.put("46", "海南"); - hashtable.put("50", "重庆"); - hashtable.put("51", "四川"); - hashtable.put("52", "贵州"); - hashtable.put("53", "云南"); - hashtable.put("54", "西藏"); - hashtable.put("61", "陕西"); - hashtable.put("62", "甘肃"); - hashtable.put("63", "青海"); - hashtable.put("64", "宁夏"); - hashtable.put("65", "新疆"); - hashtable.put("71", "台湾"); - hashtable.put("81", "香港"); - hashtable.put("82", "澳门"); - hashtable.put("91", "国外"); + hashtable.put("11", "鍖椾含"); + hashtable.put("12", "澶╂触"); + hashtable.put("13", "娌冲寳"); + hashtable.put("14", "灞辫タ"); + hashtable.put("15", "鍐呰挋鍙�"); + hashtable.put("21", "杈藉畞"); + hashtable.put("22", "鍚夋灄"); + hashtable.put("23", "榛戦緳姹�"); + hashtable.put("31", "涓婃捣"); + hashtable.put("32", "姹熻嫃"); + hashtable.put("33", "娴欐睙"); + hashtable.put("34", "瀹夊窘"); + hashtable.put("35", "绂忓缓"); + hashtable.put("36", "姹熻タ"); + hashtable.put("37", "灞变笢"); + hashtable.put("41", "娌冲崡"); + hashtable.put("42", "婀栧寳"); + hashtable.put("43", "婀栧崡"); + hashtable.put("44", "骞夸笢"); + hashtable.put("45", "骞胯タ"); + hashtable.put("46", "娴峰崡"); + hashtable.put("50", "閲嶅簡"); + hashtable.put("51", "鍥涘窛"); + hashtable.put("52", "璐靛窞"); + hashtable.put("53", "浜戝崡"); + hashtable.put("54", "瑗胯棌"); + hashtable.put("61", "闄曡タ"); + hashtable.put("62", "鐢樿們"); + hashtable.put("63", "闈掓捣"); + hashtable.put("64", "瀹佸"); + hashtable.put("65", "鏂扮枂"); + hashtable.put("71", "鍙版咕"); + hashtable.put("81", "棣欐腐"); + hashtable.put("82", "婢抽棬"); + hashtable.put("91", "鍥藉"); return hashtable; } diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/util/DesUtils.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/util/DesUtils.java index 65ac7989a..26e9e8cca 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/util/DesUtils.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/util/DesUtils.java @@ -18,9 +18,9 @@ public class DesUtils { private final static String DES = "DES"; /** - * Description 根据键值进行加密 + * Description 鏍规嵁閿�艰繘琛屽姞瀵� * @param data - * @param key 加密键byte数组 + * @param key 鍔犲瘑閿産yte鏁扮粍 * @return * @throws Exception */ @@ -31,9 +31,9 @@ public class DesUtils { } /** - * Description 根据键值进行解密 + * Description 鏍规嵁閿�艰繘琛岃В瀵� * @param data - * @param key 加密键byte数组 + * @param key 鍔犲瘑閿産yte鏁扮粍 * @return * @throws IOException * @throws Exception @@ -49,27 +49,27 @@ public class DesUtils { } /** - * Description 根据键值进行加密 + * Description 鏍规嵁閿�艰繘琛屽姞瀵� * @param data - * @param key 加密键byte数组 + * @param key 鍔犲瘑閿産yte鏁扮粍 * @return * @throws Exception */ private static byte[] encrypt(byte[] data, byte[] key) throws Exception { - // 生成一个可信任的随机数源 + // 鐢熸垚涓�涓彲淇′换鐨勯殢鏈烘暟婧� SecureRandom sr = new SecureRandom(); - // 从原始密钥数据创建DESKeySpec对象 + // 浠庡師濮嬪瘑閽ユ暟鎹垱寤篋ESKeySpec瀵硅薄 DESKeySpec dks = new DESKeySpec(key); - // 创建一个密钥工厂,然后用它把DESKeySpec转换成SecretKey对象 + // 鍒涘缓涓�涓瘑閽ュ伐鍘傦紝鐒跺悗鐢ㄥ畠鎶奃ESKeySpec杞崲鎴怱ecretKey瀵硅薄 SecretKeyFactory keyFactory = SecretKeyFactory.getInstance(DES); SecretKey securekey = keyFactory.generateSecret(dks); - // Cipher对象实际完成加密操作 + // Cipher瀵硅薄瀹為檯瀹屾垚鍔犲瘑鎿嶄綔 Cipher cipher = Cipher.getInstance(DES); - // 用密钥初始化Cipher对象 + // 鐢ㄥ瘑閽ュ垵濮嬪寲Cipher瀵硅薄 cipher.init(Cipher.ENCRYPT_MODE, securekey, sr); return cipher.doFinal(data); @@ -77,27 +77,27 @@ public class DesUtils { /** - * Description 根据键值进行解密 + * Description 鏍规嵁閿�艰繘琛岃В瀵� * @param data - * @param key 加密键byte数组 + * @param key 鍔犲瘑閿産yte鏁扮粍 * @return * @throws Exception */ private static byte[] decrypt(byte[] data, byte[] key) throws Exception { - // 生成一个可信任的随机数源 + // 鐢熸垚涓�涓彲淇′换鐨勯殢鏈烘暟婧� SecureRandom sr = new SecureRandom(); - // 从原始密钥数据创建DESKeySpec对象 + // 浠庡師濮嬪瘑閽ユ暟鎹垱寤篋ESKeySpec瀵硅薄 DESKeySpec dks = new DESKeySpec(key); - // 创建一个密钥工厂,然后用它把DESKeySpec转换成SecretKey对象 + // 鍒涘缓涓�涓瘑閽ュ伐鍘傦紝鐒跺悗鐢ㄥ畠鎶奃ESKeySpec杞崲鎴怱ecretKey瀵硅薄 SecretKeyFactory keyFactory = SecretKeyFactory.getInstance(DES); SecretKey securekey = keyFactory.generateSecret(dks); - // Cipher对象实际完成解密操作 + // Cipher瀵硅薄瀹為檯瀹屾垚瑙e瘑鎿嶄綔 Cipher cipher = Cipher.getInstance(DES); - // 用密钥初始化Cipher对象 + // 鐢ㄥ瘑閽ュ垵濮嬪寲Cipher瀵硅薄 cipher.init(Cipher.DECRYPT_MODE, securekey, sr); return cipher.doFinal(data); @@ -105,7 +105,7 @@ public class DesUtils { /** - * Description 获取字符串MD5值 + * Description 鑾峰彇瀛楃涓睲D5鍊� * @param sourceStr */ private static String MD5(String sourceStr) { @@ -136,12 +136,12 @@ public class DesUtils { public static void main(String[] args) throws Exception { String data = "18616348076_1234561"; - String key = "fangjia_pds_goojia"; //秘钥 + String key = "fangjia_pds_goojia"; //绉橀挜 String encode = encrypt(data, key); - System.err.println("加密:"+encode); - System.err.println("加密encode:"+URLEncoder.encode(encode, "utf-8")); - System.err.println("加密decode:"+URLDecoder.decode(URLEncoder.encode(encode, "utf-8"), "utf-8")); + System.err.println("鍔犲瘑锛�"+encode); + System.err.println("鍔犲瘑encode锛�"+URLEncoder.encode(encode, "utf-8")); + System.err.println("鍔犲瘑decode锛�"+URLDecoder.decode(URLEncoder.encode(encode, "utf-8"), "utf-8")); String dcode = decrypt(encode, key); - System.err.println("解密:"+dcode); + System.err.println("瑙e瘑锛�"+dcode); } } diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/util/DownloadPdf.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/util/DownloadPdf.java index ad1aeaec0..1f581cd6f 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/util/DownloadPdf.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/util/DownloadPdf.java @@ -16,25 +16,25 @@ public class DownloadPdf { private static final Logger LOG = Logger.getLogger(DownloadPdf.class); /** - * 下载 - * @param path 需要下载的文件的路径 + * 涓嬭浇 + * @param path 闇�瑕佷笅杞界殑鏂囦欢鐨勮矾寰� * @param response */ public static void download(String path, HttpServletResponse response){ try{ - LOG.warn("下载pdf:"+path); + LOG.warn("涓嬭浇pdf:"+path); File file = new File(path); String fileName = file.getName(); String ext = fileName.substring(fileName.lastIndexOf(".")+1).toUpperCase(); - //以流的形式下载文件 + //浠ユ祦鐨勫舰寮忎笅杞芥枃浠� InputStream is = new BufferedInputStream(new FileInputStream(file)); byte[] bytes = new byte[is.available()]; is.read(bytes); is.close(); - //清空response + //娓呯┖response response.reset(); - //设置response的Header + //璁剧疆response鐨凥eader response.addHeader("Content-Disposition", "attachment; filename=" + fileName); response.addHeader("Content-Length", "" + file.length()); OutputStream toClient = new BufferedOutputStream(response.getOutputStream()); diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/util/HtmlToPdf.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/util/HtmlToPdf.java index 94f474752..7cb452682 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/util/HtmlToPdf.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/util/HtmlToPdf.java @@ -8,42 +8,42 @@ import org.apache.log4j.Logger; * @ClassName: HtmlToPdf * @Description: TODO() * @author xsw - * @date 2016-12-8 上午10:14:54 + * @date 2016-12-8 涓婂崍10:14:54 * */ public class HtmlToPdf { private static final Logger LOG = Logger.getLogger(HtmlToPdf.class); - //wkhtmltopdf在系统中的路径 + //wkhtmltopdf鍦ㄧ郴缁熶腑鐨勮矾寰� //private static String toPdfTool = "H:\\wkhtmltopdf\\bin\\wkhtmltopdf.exe"; /** - * html转pdf - * @param srcPath html路径,可以是硬盘上的路径,也可以是网络路径 - * @param destPath pdf保存路径 - * @return 转换成功返回true + * html杞琾df + * @param srcPath html璺緞锛屽彲浠ユ槸纭洏涓婄殑璺緞锛屼篃鍙互鏄綉缁滆矾寰� + * @param destPath pdf淇濆瓨璺緞 + * @return 杞崲鎴愬姛杩斿洖true */ public static boolean convert(String srcPath, String destPath, String toPdfTool){ File file = new File(destPath); File parent = file.getParentFile(); - //如果pdf保存路径不存在,则创建路径 + //濡傛灉pdf淇濆瓨璺緞涓嶅瓨鍦紝鍒欏垱寤鸿矾寰� if(!parent.exists()){ parent.mkdirs(); } StringBuilder cmd = new StringBuilder(); // if(System.getProperty("os.name").indexOf("Windows") == -1){ -// //非windows 系统 +// //闈瀢indows 绯荤粺 // toPdfTool = "/home/ubuntu/wkhtmltox/bin/wkhtmltopdf"; // } cmd.append(toPdfTool); cmd.append(" "); - cmd.append("--footer-right 第[page]/[topage]页 "); + cmd.append("--footer-right 绗琜page]/[topage]椤� "); cmd.append(srcPath); cmd.append(" "); cmd.append(destPath); boolean result = true; try{ - LOG.warn("生成pdf命令:"+cmd.toString()); + LOG.warn("鐢熸垚pdf鍛戒护锛�"+cmd.toString()); Process proc = Runtime.getRuntime().exec(cmd.toString()); HtmlToPdfInterceptor error = new HtmlToPdfInterceptor(proc.getErrorStream()); HtmlToPdfInterceptor output = new HtmlToPdfInterceptor(proc.getInputStream()); diff --git a/projects/fangjia-pds/src/main/java/com/fangjia/pds/util/IpUtil.java b/projects/fangjia-pds/src/main/java/com/fangjia/pds/util/IpUtil.java index c57b843fa..b3946895f 100644 --- a/projects/fangjia-pds/src/main/java/com/fangjia/pds/util/IpUtil.java +++ b/projects/fangjia-pds/src/main/java/com/fangjia/pds/util/IpUtil.java @@ -12,42 +12,42 @@ public class IpUtil { /** * * @param content - * 请求的参数 格式为:name=xxx&pwd=xxx + * 璇锋眰鐨勫弬鏁� 鏍煎紡涓猴細name=xxx&pwd=xxx * @param encoding - * 服务器端请求编码。如GBK,UTF-8等 + * 鏈嶅姟鍣ㄧ璇锋眰缂栫爜銆傚GBK,UTF-8绛� * @return * @throws UnsupportedEncodingException */ public static String getAddresses(String content, String encodingString) throws UnsupportedEncodingException { - // 这里调用pconline的接口 + // 杩欓噷璋冪敤pconline鐨勬帴鍙� String urlStr = "http://ip.taobao.com/service/getIpInfo.php"; - // 从http://whois.pconline.com.cn取得IP所在的省市区信息 + // 浠巋ttp://whois.pconline.com.cn鍙栧緱IP鎵�鍦ㄧ殑鐪佸競鍖轰俊鎭� String returnStr = getResult(urlStr, content, encodingString); if (returnStr != null) { - // 处理返回的省市区信息 + // 澶勭悊杩斿洖鐨勭渷甯傚尯淇℃伅 String[] temp = returnStr.split(","); if(temp.length<3){ - return "0";//无效IP,局域网测试 + return "0";//鏃犳晥IP锛屽眬鍩熺綉娴嬭瘯 } String region = (temp[5].split(":"))[1].replaceAll("\"", ""); - region = decodeUnicode(region);// 省份 + region = decodeUnicode(region);// 鐪佷唤 /** * String country = ""; String area = ""; String region = ""; String * city = ""; String county = ""; String isp = ""; for(int i=0;i { /** - * 计算对象(K)均价 + * 璁$畻瀵硅薄(K)鍧囦环 * * @param k * @param calcDate - * 计算日期 + * 璁$畻鏃ユ湡 * @return * @throws CalcException */ diff --git a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/core/Operator.java b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/core/Operator.java index c777b1e6d..638b47ddb 100644 --- a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/core/Operator.java +++ b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/core/Operator.java @@ -3,7 +3,7 @@ package com.fangjia.analysis.core; import com.fangjia.analysis.exceptions.ApplyException; /** - * 计算结果处理器 + * 璁$畻缁撴灉澶勭悊鍣� * * @author xiaoyu * @@ -13,7 +13,7 @@ import com.fangjia.analysis.exceptions.ApplyException; public interface Operator { /** - * 结果处理 + * 缁撴灉澶勭悊 * * @param k * @param r diff --git a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/core/Point.java b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/core/Point.java index 1b8dd26d3..534146401 100644 --- a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/core/Point.java +++ b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/core/Point.java @@ -4,21 +4,21 @@ import java.io.Serializable; import java.util.Date; /** - * 元数据 + * 鍏冩暟鎹� * * @author xiaoyu * */ public interface Point extends Serializable { /** - * 值 + * 鍊� * * @return */ public Integer getValue(); /** - * 时间 + * 鏃堕棿 * * @return */ diff --git a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/core/Provider.java b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/core/Provider.java index 86330cfa6..12b425bdc 100644 --- a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/core/Provider.java +++ b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/core/Provider.java @@ -6,7 +6,7 @@ import java.util.List; import com.fangjia.analysis.exceptions.FetchException; /** - * 原始数据提供者 + * 鍘熷鏁版嵁鎻愪緵鑰� * * @author xiaoyu * @@ -16,7 +16,7 @@ import com.fangjia.analysis.exceptions.FetchException; public interface Provider { /** - * 数据获取 + * 鏁版嵁鑾峰彇 * * @param k * @return diff --git a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/core/Result.java b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/core/Result.java index 60ca971d8..0e371b6a1 100644 --- a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/core/Result.java +++ b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/core/Result.java @@ -3,28 +3,28 @@ package com.fangjia.analysis.core; import java.util.Date; /** - * 结果定义接口 + * 缁撴灉瀹氫箟鎺ュ彛 * * @author xiaoyu * */ public interface Result { /** - * 计算值 + * 璁$畻鍊� * * @return */ public int getValue(); /** - * 计算日期 + * 璁$畻鏃ユ湡 * * @return */ public Date getCalcDate(); /** - * 计算的可信度 + * 璁$畻鐨勫彲淇″害 * * @return */ diff --git a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/rent/CalcCommandConsumer.java b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/rent/CalcCommandConsumer.java index e709caced..07e2d466a 100644 --- a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/rent/CalcCommandConsumer.java +++ b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/rent/CalcCommandConsumer.java @@ -13,8 +13,8 @@ import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.BlockingQueue; /** - * 写字楼计算命令处理者 - * @author 王文艳 + * 鍐欏瓧妤艰绠楀懡浠ゅ鐞嗚�� + * @author 鐜嬫枃鑹� */ public class CalcCommandConsumer { private final static Logger LOGGER = LoggerFactory.getLogger(CalcCommandConsumer.class); @@ -55,7 +55,7 @@ public class CalcCommandConsumer { Runnable runnable = null; if (StringUtils.isNotBlank(calcCommand.getCity()) && StringUtils.isNotBlank(calcCommand.getRegion()) - && StringUtils.isNotBlank(calcCommand.getName())) {// 小区 + && StringUtils.isNotBlank(calcCommand.getName())) {// 灏忓尯 } if (runnable != null) { diff --git a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/rent/office/OfficeRentProvider.java b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/rent/office/OfficeRentProvider.java index b2155384d..34567f4c8 100644 --- a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/rent/office/OfficeRentProvider.java +++ b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/rent/office/OfficeRentProvider.java @@ -27,7 +27,7 @@ import java.util.*; import java.util.concurrent.TimeUnit; /** - * 写字楼租金数据提供者 + * 鍐欏瓧妤肩閲戞暟鎹彁渚涜�� * @author wenyan */ public class OfficeRentProvider implements Provider { @@ -90,7 +90,7 @@ public class OfficeRentProvider implements Provider -1 || name.indexOf(")") > -1 || name.indexOf("(") > -1 || name.indexOf(")") > -1 + if (name.indexOf("锛�") > -1 || name.indexOf("锛�") > -1 || name.indexOf("(") > -1 || name.indexOf(")") > -1 | name.indexOf("[") > -1 || name.indexOf("]") > -1 || name.indexOf("-") > -1 || name.indexOf("{") > -1 || name.indexOf("}") > -1 || name.indexOf("{") > -1 || name.indexOf("}") > -1 || name.indexOf(":") > -1) { continue; diff --git a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/CalcCommandConsumer.java b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/CalcCommandConsumer.java index 2096b90a4..2ef47d401 100644 --- a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/CalcCommandConsumer.java +++ b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/CalcCommandConsumer.java @@ -35,7 +35,7 @@ import java.net.UnknownHostException; import java.util.*; /** - * 二手房价格计算命令处理者 + * 浜屾墜鎴夸环鏍艰绠楀懡浠ゅ鐞嗚�� * * @author xiaoyu */ @@ -155,9 +155,9 @@ public class CalcCommandConsumer extends Thread { public static void main(String[] args) throws Exception { CalcCommandConsumer sd = new CalcCommandConsumer(null); List cities = Arrays.asList( - "广州","北京","上海","深圳","成都","西安","天津","杭州","武汉","南京","沈阳","重庆","贵阳","福州","宁波","石家庄","大连","昆明","苏州","长沙","太原","厦门","无锡","郑州","呼和浩特","兰州","哈尔滨","济南","佛山","长春","青岛","东莞","合肥","乌鲁木齐","烟台","南昌","泉州","齐齐哈尔","包头","常德","大同","温州","银川","西宁","扬州","绵阳","威海","吉林","邯郸", - "中山","湛江","潍坊","保定","秦皇岛","常州","宜昌","鞍山","嘉兴","大庆","徐州","株洲","镇江","赣州","芜湖","南通","九江","泰州","洛阳","台州","惠州","湖州","江门","绍兴","海口","珠海","金华","连云港","桂林","马鞍山","柳州","淄博","盐城","本溪","汕头","衡阳","揭阳","茂名","牡丹江","平顶山","舟山","安阳","岳阳","许昌","四平","淮南","淮安","赤峰","佳木斯","南阳","临沂","临汾","榆林","咸阳","唐山","三亚","宜宾","自贡","廊坊","攀枝花","南宁","延安","襄阳","丽江","大理","六盘水","湘潭","清远","衢州","宿迁","北海","莆田","玉林","张家界","玉溪","云浮","肇庆", - "新乡","营口","潮州","黄石","焦作","盘锦","梅州","曲靖","阳江","韶关","河源","遵义","伊犁","阿拉善盟","锡林郭勒盟","兴安盟","林芝","阿里","那曲","山南","日喀则","昌都","红河","中卫","双鸭山","克孜勒苏","巴音郭楞","博尔塔拉","阿勒泰","昌吉","和田","哈密","吐鲁番","文山州","武威","铁岭","天水","泰安","黄冈","广元","阜阳","定西","辽源","丽水","乐山","菏泽","锦州","汉中","黄山","白山","安顺","安康","绥化","钦州","鄂尔多斯","梧州","百色","鸡西","七台河","白城","朝阳","亳州","安庆","六安","宁德","三沙","临沧","拉萨","南充","泸州","资阳","乌海","开封","固原","朔州","平凉","白银","吉安","通化","景德镇","鹤岗","铜仁","南平","贵港","商洛","吴忠","晋城","阿克苏","海东","黑河","阜新","抚顺","葫芦岛","张家口","衡水","邢台","石嘴山","济宁","日照","聊城","滨州","淮北","宣城","三明","宿州","龙岩","保山","池州","乌兰察布","内江","达州","贺州","巴中","昭通","怀化","鄂州","伊春","毕节","十堰","遂宁","漯河","松原","眉山","鹤壁","忻州","郴州","晋中","益阳","辽阳","宝鸡","酒泉","张掖","随州","承德","鹰潭","新余","孝感","枣庄","周口","濮阳","莱芜","阳泉","运城","蚌埠","渭南","滁州","铜陵","嘉峪关","漳州","庆阳","汕尾","上饶","普洱","沧州","宜春","德阳","东营","广安","德州","雅安","永州","娄底","荆州","咸宁","三门峡","商丘","长治","吕梁","金昌","陇南","萍乡","抚州","通辽","楚雄","临夏","甘南","黔西南","黔东南","湘西","延边","海北州","黄南州","海南州","果洛州","玉树州","海西州","阿坝州","凉山州","怒江州","巴彦淖尔","来宾","信阳","克拉玛依","河池","邵阳","荆门","防城港","驻马店","铜川","崇左","呼伦贝尔","大兴安岭","甘孜州","西双版纳州","德宏州","喀什","恩施","塔城","黔南","迪庆州","丹东","石河子","阿拉尔","图木舒克","五家渠","济源","仙桃","潜江","天门","神农架","五指山","琼海","儋州","文昌","万宁","东方","定安","屯昌","澄迈","临高","白沙","昌江","乐东","陵水","保亭","琼中","北屯","铁门关","双河","可克达拉"); + "骞垮窞","鍖椾含","涓婃捣","娣卞湷","鎴愰兘","瑗垮畨","澶╂触","鏉窞","姝︽眽","鍗椾含","娌堥槼","閲嶅簡","璐甸槼","绂忓窞","瀹佹尝","鐭冲搴�","澶ц繛","鏄嗘槑","鑻忓窞","闀挎矙","澶師","鍘﹂棬","鏃犻敗","閮戝窞","鍛煎拰娴╃壒","鍏板窞","鍝堝皵婊�","娴庡崡","浣涘北","闀挎槬","闈掑矝","涓滆帪","鍚堣偉","涔岄瞾鏈ㄩ綈","鐑熷彴","鍗楁槍","娉夊窞","榻愰綈鍝堝皵","鍖呭ご","甯稿痉","澶у悓","娓╁窞","閾跺窛","瑗垮畞","鎵窞","缁甸槼","濞佹捣","鍚夋灄","閭兏", + "涓北","婀涙睙","娼嶅潑","淇濆畾","绉︾殗宀�","甯稿窞","瀹滄槍","闉嶅北","鍢夊叴","澶у簡","寰愬窞","鏍床","闀囨睙","璧e窞","鑺滄箹","鍗楅��","涔濇睙","娉板窞","娲涢槼","鍙板窞","鎯犲窞","婀栧窞","姹熼棬","缁嶅叴","娴峰彛","鐝犳捣","閲戝崕","杩炰簯娓�","妗傛灄","椹瀺灞�","鏌冲窞","娣勫崥","鐩愬煄","鏈邯","姹曞ご","琛¢槼","鎻槼","鑼傚悕","鐗′腹姹�","骞抽《灞�","鑸熷北","瀹夐槼","宀抽槼","璁告槍","鍥涘钩","娣崡","娣畨","璧ゅ嘲","浣虫湪鏂�","鍗楅槼","涓存矀","涓存本","姒嗘灄","鍜搁槼","鍞愬北","涓変簹","瀹滃","鑷础","寤婂潑","鏀�鏋濊姳","鍗楀畞","寤跺畨","瑗勯槼","涓芥睙","澶х悊","鍏洏姘�","婀樻江","娓呰繙","琛㈠窞","瀹胯縼","鍖楁捣","鑾嗙敯","鐜夋灄","寮犲鐣�","鐜夋邯","浜戞诞","鑲囧簡", + "鏂颁埂","钀ュ彛","娼窞","榛勭煶","鐒︿綔","鐩橀敠","姊呭窞","鏇查潠","闃虫睙","闊跺叧","娌虫簮","閬典箟","浼婄妬","闃挎媺鍠勭洘","閿℃灄閮嫆鐩�","鍏村畨鐩�","鏋楄姖","闃块噷","閭f洸","灞卞崡","鏃ュ杸鍒�","鏄岄兘","绾㈡渤","涓崼","鍙岄腑灞�","鍏嬪瓬鍕掕嫃","宸撮煶閮","鍗氬皵濉旀媺","闃垮嫆娉�","鏄屽悏","鍜岀敯","鍝堝瘑","鍚愰瞾鐣�","鏂囧北宸�","姝﹀▉","閾佸箔","澶╂按","娉板畨","榛勫唸","骞垮厓","闃滈槼","瀹氳タ","杈芥簮","涓芥按","涔愬北","鑿忔辰","閿﹀窞","姹変腑","榛勫北","鐧藉北","瀹夐『","瀹夊悍","缁ュ寲","閽﹀窞","閯傚皵澶氭柉","姊у窞","鐧捐壊","楦¤タ","涓冨彴娌�","鐧藉煄","鏈濋槼","浜冲窞","瀹夊簡","鍏畨","瀹佸痉","涓夋矙","涓存钵","鎷夎惃","鍗楀厖","娉稿窞","璧勯槼","涔屾捣","寮�灏�","鍥哄師","鏈斿窞","骞冲噳","鐧介摱","鍚夊畨","閫氬寲","鏅痉闀�","楣ゅ矖","閾滀粊","鍗楀钩","璐垫腐","鍟嗘礇","鍚村繝","鏅嬪煄","闃垮厠鑻�","娴蜂笢","榛戞渤","闃滄柊","鎶氶『","钁姦宀�","寮犲鍙�","琛℃按","閭㈠彴","鐭冲槾灞�","娴庡畞","鏃ョ収","鑱婂煄","婊ㄥ窞","娣寳","瀹e煄","涓夋槑","瀹垮窞","榫欏博","淇濆北","姹犲窞","涔屽叞瀵熷竷","鍐呮睙","杈惧窞","璐哄窞","宸翠腑","鏄��","鎬�鍖�","閯傚窞","浼婃槬","姣曡妭","鍗佸牥","閬傚畞","婕渤","鏉惧師","鐪夊北","楣ゅ","蹇诲窞","閮村窞","鏅嬩腑","鐩婇槼","杈介槼","瀹濋浮","閰掓硥","寮犳帠","闅忓窞","鎵垮痉","楣版江","鏂颁綑","瀛濇劅","鏋e簞","鍛ㄥ彛","婵槼","鑾辫姕","闃虫硥","杩愬煄","铓屽煚","娓崡","婊佸窞","閾滈櫟","鍢夊唱鍏�","婕冲窞","搴嗛槼","姹曞熬","涓婇ザ","鏅幢","娌у窞","瀹滄槬","寰烽槼","涓滆惀","骞垮畨","寰峰窞","闆呭畨","姘稿窞","濞勫簳","鑽嗗窞","鍜稿畞","涓夐棬宄�","鍟嗕笜","闀挎不","鍚曟","閲戞槍","闄囧崡","钀嶄埂","鎶氬窞","閫氳窘","妤氶泟","涓村","鐢樺崡","榛旇タ鍗�","榛斾笢鍗�","婀樿タ","寤惰竟","娴峰寳宸�","榛勫崡宸�","娴峰崡宸�","鏋滄礇宸�","鐜夋爲宸�","娴疯タ宸�","闃垮潩宸�","鍑夊北宸�","鎬掓睙宸�","宸村溅娣栧皵","鏉ュ","淇¢槼","鍏嬫媺鐜涗緷","娌虫睜","閭甸槼","鑽嗛棬","闃插煄娓�","椹婚┈搴�","閾滃窛","宕囧乏","鍛间鸡璐濆皵","澶у叴瀹夊箔","鐢樺瓬宸�","瑗垮弻鐗堢撼宸�","寰峰畯宸�","鍠�浠�","鎭╂柦","濉斿煄","榛斿崡","杩簡宸�","涓逛笢","鐭虫渤瀛�","闃挎媺灏�","鍥炬湪鑸掑厠","浜斿娓�","娴庢簮","浠欐","娼滄睙","澶╅棬","绁炲啘鏋�","浜旀寚灞�","鐞兼捣","鍎嬪窞","鏂囨槍","涓囧畞","涓滄柟","瀹氬畨","灞槍","婢勮繄","涓撮珮","鐧芥矙","鏄屾睙","涔愪笢","闄垫按","淇濅涵","鐞间腑","鍖楀悲","閾侀棬鍏�","鍙屾渤","鍙厠杈炬媺"); int c = 0; for(String city : cities) { int k = 0; @@ -177,7 +177,7 @@ public class CalcCommandConsumer extends Thread { command.setCity(city); command.setRegion(region); command.setName(name); - command.setEstateType("普通住宅"); + command.setEstateType("鏅�氫綇瀹�"); command.setCalcType(0); command.setCalcDate(DateUtil.parseDate("2017-01-01", "yyyy-MM-dd")); command.setId(ObjectId.get().toString()); @@ -188,14 +188,14 @@ public class CalcCommandConsumer extends Thread { } /** - * 开始消耗计算指令 + * 寮�濮嬫秷鑰楄绠楁寚浠� * * @param command * @throws Exception */ private void doConsumer(CalcCommand command) throws Exception { long startMills = System.currentTimeMillis(); - //计算某一天的均价 + //璁$畻鏌愪竴澶╃殑鍧囦环 if (command.getCalcType() == CalcCommand.CalcTypeEnum.CALC_BY_DATE.getCalcType()) { if (command.getCalcDate() == null) { commandService.updateToErr(command.getId()); @@ -220,7 +220,7 @@ public class CalcCommandConsumer extends Thread { Calculator calculator = null; Operator operator = null; Serializable calcKey = null; - if (command.isCommandOfDistrict()) {// 小区 + if (command.isCommandOfDistrict()) {// 灏忓尯 calcKey = new DistrictKey(command.getCity(), command.getRegion(), command.getName(), command.getEstateType()); calculator = new DistrictSellCalculator(); operator = new DistrictSellOperator(); @@ -244,7 +244,7 @@ public class CalcCommandConsumer extends Thread { } else { throw new CalcException("can't find calculator or operator or calcKey!"); } - } else if (command.getCalcType() == CalcCommand.CalcTypeEnum.CALC_ALL_WEEKS.getCalcType()) {//重算某个小区的所有均价 + } else if (command.getCalcType() == CalcCommand.CalcTypeEnum.CALC_ALL_WEEKS.getCalcType()) {//閲嶇畻鏌愪釜灏忓尯鐨勬墍鏈夊潎浠� if (command.isCommandOfDistrict()) { if (reCalcluatorAll(new DistrictKey(command.getCity(), command.getRegion(), command.getName(), command.getEstateType()))) { commandService.updateToCalcSuc(command.getId()); @@ -261,7 +261,7 @@ public class CalcCommandConsumer extends Thread { } /** - * 重算指定小区的所有价格 + * 閲嶇畻鎸囧畾灏忓尯鐨勬墍鏈変环鏍� * * @param districtKey * @return @@ -275,14 +275,14 @@ public class CalcCommandConsumer extends Thread { String name = districtKey.getName(); String estateType = districtKey.getEstateTypeEnum().getEstateType(); - // 查出配置信息 + // 鏌ュ嚭閰嶇疆淇℃伅 CalcConfig calcConfig = calcConfigDao.findCalcConfig(city, region, name, "district", estateType); - // 删除之前所有价格 + // 鍒犻櫎涔嬪墠鎵�鏈変环鏍� districtStatDao.deleteAll(city, region, name, estateType); calcDistrictStatDao.deleteAll(city, region, name, estateType); - // 计算日期的起始点 + // 璁$畻鏃ユ湡鐨勮捣濮嬬偣 Date leftDate = getLeftDate(calcConfig); Date rightDate = new Date(); List weekends = DateUtil.getWeekendBetweenDates(leftDate, rightDate); @@ -309,7 +309,7 @@ public class CalcCommandConsumer extends Thread { } } - // 如果数据库中的价格开始时间早于样本开始时间,则该时间段的价格需要模拟出来 + // 濡傛灉鏁版嵁搴撲腑鐨勪环鏍煎紑濮嬫椂闂存棭浜庢牱鏈紑濮嬫椂闂�,鍒欒鏃堕棿娈电殑浠锋牸闇�瑕佹ā鎷熷嚭鏉� if (rebool && startRes != null && calcConfig != null && calcConfig.getCalcStartDate() != null && calcConfig.getStatStartDate() != null && calcConfig.getCalcStartDate().before(calcConfig.getStatStartDate())) { List derivationWeekends = DateUtil.getWeekendBetweenDates(calcConfig.getCalcStartDate(), calcConfig.getStatStartDate()); @@ -339,7 +339,7 @@ public class CalcCommandConsumer extends Thread { } private Date getLeftDate(CalcConfig calcConfig) { - // 优先使用样本开始时间 + // 浼樺厛浣跨敤鏍锋湰寮�濮嬫椂闂� if (calcConfig != null && calcConfig.getStatStartDate() != null) { if(calcConfig.getStatStartDate().before(CALC_START_DATE)) { return CALC_START_DATE; diff --git a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/CalcCommandConsumerTest.java b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/CalcCommandConsumerTest.java index 802ea831c..13d222d3d 100644 --- a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/CalcCommandConsumerTest.java +++ b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/CalcCommandConsumerTest.java @@ -35,7 +35,7 @@ import java.net.UnknownHostException; import java.util.*; /** - * 二手房价格计算命令处理者 + * 浜屾墜鎴夸环鏍艰绠楀懡浠ゅ鐞嗚�� * * @author xiaoyu */ @@ -154,9 +154,9 @@ public class CalcCommandConsumerTest { public static void main(String[] args) throws Exception { CalcCommandConsumerTest sd = new CalcCommandConsumerTest(null); List cities = Arrays.asList( - "广州","北京","上海","深圳","成都","西安","天津","杭州","武汉","南京","沈阳","重庆","贵阳","福州","宁波","石家庄","大连","昆明","苏州","长沙","太原","厦门","无锡","郑州","呼和浩特","兰州","哈尔滨","济南","佛山","长春","青岛","东莞","合肥","乌鲁木齐","烟台","南昌","泉州","齐齐哈尔","包头","常德","大同","温州","银川","西宁","扬州","绵阳","威海","吉林","邯郸", - "中山","湛江","潍坊","保定","秦皇岛","常州","宜昌","鞍山","嘉兴","大庆","徐州","株洲","镇江","赣州","芜湖","南通","九江","泰州","洛阳","台州","惠州","湖州","江门","绍兴","海口","珠海","金华","连云港","桂林","马鞍山","柳州","淄博","盐城","本溪","汕头","衡阳","揭阳","茂名","牡丹江","平顶山","舟山","安阳","岳阳","许昌","四平","淮南","淮安","赤峰","佳木斯","南阳","临沂","临汾","榆林","咸阳","唐山","三亚","宜宾","自贡","廊坊","攀枝花","南宁","延安","襄阳","丽江","大理","六盘水","湘潭","清远","衢州","宿迁","北海","莆田","玉林","张家界","玉溪","云浮","肇庆", - "新乡","营口","潮州","黄石","焦作","盘锦","梅州","曲靖","阳江","韶关","河源","遵义","伊犁","阿拉善盟","锡林郭勒盟","兴安盟","林芝","阿里","那曲","山南","日喀则","昌都","红河","中卫","双鸭山","克孜勒苏","巴音郭楞","博尔塔拉","阿勒泰","昌吉","和田","哈密","吐鲁番","文山州","武威","铁岭","天水","泰安","黄冈","广元","阜阳","定西","辽源","丽水","乐山","菏泽","锦州","汉中","黄山","白山","安顺","安康","绥化","钦州","鄂尔多斯","梧州","百色","鸡西","七台河","白城","朝阳","亳州","安庆","六安","宁德","三沙","临沧","拉萨","南充","泸州","资阳","乌海","开封","固原","朔州","平凉","白银","吉安","通化","景德镇","鹤岗","铜仁","南平","贵港","商洛","吴忠","晋城","阿克苏","海东","黑河","阜新","抚顺","葫芦岛","张家口","衡水","邢台","石嘴山","济宁","日照","聊城","滨州","淮北","宣城","三明","宿州","龙岩","保山","池州","乌兰察布","内江","达州","贺州","巴中","昭通","怀化","鄂州","伊春","毕节","十堰","遂宁","漯河","松原","眉山","鹤壁","忻州","郴州","晋中","益阳","辽阳","宝鸡","酒泉","张掖","随州","承德","鹰潭","新余","孝感","枣庄","周口","濮阳","莱芜","阳泉","运城","蚌埠","渭南","滁州","铜陵","嘉峪关","漳州","庆阳","汕尾","上饶","普洱","沧州","宜春","德阳","东营","广安","德州","雅安","永州","娄底","荆州","咸宁","三门峡","商丘","长治","吕梁","金昌","陇南","萍乡","抚州","通辽","楚雄","临夏","甘南","黔西南","黔东南","湘西","延边","海北州","黄南州","海南州","果洛州","玉树州","海西州","阿坝州","凉山州","怒江州","巴彦淖尔","来宾","信阳","克拉玛依","河池","邵阳","荆门","防城港","驻马店","铜川","崇左","呼伦贝尔","大兴安岭","甘孜州","西双版纳州","德宏州","喀什","恩施","塔城","黔南","迪庆州","丹东","石河子","阿拉尔","图木舒克","五家渠","济源","仙桃","潜江","天门","神农架","五指山","琼海","儋州","文昌","万宁","东方","定安","屯昌","澄迈","临高","白沙","昌江","乐东","陵水","保亭","琼中","北屯","铁门关","双河","可克达拉"); + "骞垮窞","鍖椾含","涓婃捣","娣卞湷","鎴愰兘","瑗垮畨","澶╂触","鏉窞","姝︽眽","鍗椾含","娌堥槼","閲嶅簡","璐甸槼","绂忓窞","瀹佹尝","鐭冲搴�","澶ц繛","鏄嗘槑","鑻忓窞","闀挎矙","澶師","鍘﹂棬","鏃犻敗","閮戝窞","鍛煎拰娴╃壒","鍏板窞","鍝堝皵婊�","娴庡崡","浣涘北","闀挎槬","闈掑矝","涓滆帪","鍚堣偉","涔岄瞾鏈ㄩ綈","鐑熷彴","鍗楁槍","娉夊窞","榻愰綈鍝堝皵","鍖呭ご","甯稿痉","澶у悓","娓╁窞","閾跺窛","瑗垮畞","鎵窞","缁甸槼","濞佹捣","鍚夋灄","閭兏", + "涓北","婀涙睙","娼嶅潑","淇濆畾","绉︾殗宀�","甯稿窞","瀹滄槍","闉嶅北","鍢夊叴","澶у簡","寰愬窞","鏍床","闀囨睙","璧e窞","鑺滄箹","鍗楅��","涔濇睙","娉板窞","娲涢槼","鍙板窞","鎯犲窞","婀栧窞","姹熼棬","缁嶅叴","娴峰彛","鐝犳捣","閲戝崕","杩炰簯娓�","妗傛灄","椹瀺灞�","鏌冲窞","娣勫崥","鐩愬煄","鏈邯","姹曞ご","琛¢槼","鎻槼","鑼傚悕","鐗′腹姹�","骞抽《灞�","鑸熷北","瀹夐槼","宀抽槼","璁告槍","鍥涘钩","娣崡","娣畨","璧ゅ嘲","浣虫湪鏂�","鍗楅槼","涓存矀","涓存本","姒嗘灄","鍜搁槼","鍞愬北","涓変簹","瀹滃","鑷础","寤婂潑","鏀�鏋濊姳","鍗楀畞","寤跺畨","瑗勯槼","涓芥睙","澶х悊","鍏洏姘�","婀樻江","娓呰繙","琛㈠窞","瀹胯縼","鍖楁捣","鑾嗙敯","鐜夋灄","寮犲鐣�","鐜夋邯","浜戞诞","鑲囧簡", + "鏂颁埂","钀ュ彛","娼窞","榛勭煶","鐒︿綔","鐩橀敠","姊呭窞","鏇查潠","闃虫睙","闊跺叧","娌虫簮","閬典箟","浼婄妬","闃挎媺鍠勭洘","閿℃灄閮嫆鐩�","鍏村畨鐩�","鏋楄姖","闃块噷","閭f洸","灞卞崡","鏃ュ杸鍒�","鏄岄兘","绾㈡渤","涓崼","鍙岄腑灞�","鍏嬪瓬鍕掕嫃","宸撮煶閮","鍗氬皵濉旀媺","闃垮嫆娉�","鏄屽悏","鍜岀敯","鍝堝瘑","鍚愰瞾鐣�","鏂囧北宸�","姝﹀▉","閾佸箔","澶╂按","娉板畨","榛勫唸","骞垮厓","闃滈槼","瀹氳タ","杈芥簮","涓芥按","涔愬北","鑿忔辰","閿﹀窞","姹変腑","榛勫北","鐧藉北","瀹夐『","瀹夊悍","缁ュ寲","閽﹀窞","閯傚皵澶氭柉","姊у窞","鐧捐壊","楦¤タ","涓冨彴娌�","鐧藉煄","鏈濋槼","浜冲窞","瀹夊簡","鍏畨","瀹佸痉","涓夋矙","涓存钵","鎷夎惃","鍗楀厖","娉稿窞","璧勯槼","涔屾捣","寮�灏�","鍥哄師","鏈斿窞","骞冲噳","鐧介摱","鍚夊畨","閫氬寲","鏅痉闀�","楣ゅ矖","閾滀粊","鍗楀钩","璐垫腐","鍟嗘礇","鍚村繝","鏅嬪煄","闃垮厠鑻�","娴蜂笢","榛戞渤","闃滄柊","鎶氶『","钁姦宀�","寮犲鍙�","琛℃按","閭㈠彴","鐭冲槾灞�","娴庡畞","鏃ョ収","鑱婂煄","婊ㄥ窞","娣寳","瀹e煄","涓夋槑","瀹垮窞","榫欏博","淇濆北","姹犲窞","涔屽叞瀵熷竷","鍐呮睙","杈惧窞","璐哄窞","宸翠腑","鏄��","鎬�鍖�","閯傚窞","浼婃槬","姣曡妭","鍗佸牥","閬傚畞","婕渤","鏉惧師","鐪夊北","楣ゅ","蹇诲窞","閮村窞","鏅嬩腑","鐩婇槼","杈介槼","瀹濋浮","閰掓硥","寮犳帠","闅忓窞","鎵垮痉","楣版江","鏂颁綑","瀛濇劅","鏋e簞","鍛ㄥ彛","婵槼","鑾辫姕","闃虫硥","杩愬煄","铓屽煚","娓崡","婊佸窞","閾滈櫟","鍢夊唱鍏�","婕冲窞","搴嗛槼","姹曞熬","涓婇ザ","鏅幢","娌у窞","瀹滄槬","寰烽槼","涓滆惀","骞垮畨","寰峰窞","闆呭畨","姘稿窞","濞勫簳","鑽嗗窞","鍜稿畞","涓夐棬宄�","鍟嗕笜","闀挎不","鍚曟","閲戞槍","闄囧崡","钀嶄埂","鎶氬窞","閫氳窘","妤氶泟","涓村","鐢樺崡","榛旇タ鍗�","榛斾笢鍗�","婀樿タ","寤惰竟","娴峰寳宸�","榛勫崡宸�","娴峰崡宸�","鏋滄礇宸�","鐜夋爲宸�","娴疯タ宸�","闃垮潩宸�","鍑夊北宸�","鎬掓睙宸�","宸村溅娣栧皵","鏉ュ","淇¢槼","鍏嬫媺鐜涗緷","娌虫睜","閭甸槼","鑽嗛棬","闃插煄娓�","椹婚┈搴�","閾滃窛","宕囧乏","鍛间鸡璐濆皵","澶у叴瀹夊箔","鐢樺瓬宸�","瑗垮弻鐗堢撼宸�","寰峰畯宸�","鍠�浠�","鎭╂柦","濉斿煄","榛斿崡","杩簡宸�","涓逛笢","鐭虫渤瀛�","闃挎媺灏�","鍥炬湪鑸掑厠","浜斿娓�","娴庢簮","浠欐","娼滄睙","澶╅棬","绁炲啘鏋�","浜旀寚灞�","鐞兼捣","鍎嬪窞","鏂囨槍","涓囧畞","涓滄柟","瀹氬畨","灞槍","婢勮繄","涓撮珮","鐧芥矙","鏄屾睙","涔愪笢","闄垫按","淇濅涵","鐞间腑","鍖楀悲","閾侀棬鍏�","鍙屾渤","鍙厠杈炬媺"); int c = 0; for(String city : cities) { int k = 0; @@ -176,7 +176,7 @@ public class CalcCommandConsumerTest { command.setCity(city); command.setRegion(region); command.setName(name); - command.setEstateType("普通住宅"); + command.setEstateType("鏅�氫綇瀹�"); command.setCalcType(0); command.setCalcDate(DateUtil.parseDate("2017-01-01", "yyyy-MM-dd")); command.setId(ObjectId.get().toString()); @@ -187,14 +187,14 @@ public class CalcCommandConsumerTest { } /** - * 开始消耗计算指令 + * 寮�濮嬫秷鑰楄绠楁寚浠� * * @param command * @throws Exception */ private void doConsumer(CalcCommand command) throws Exception { long startMills = System.currentTimeMillis(); - //计算某一天的均价 + //璁$畻鏌愪竴澶╃殑鍧囦环 if (command.getCalcType() == CalcCommand.CalcTypeEnum.CALC_BY_DATE.getCalcType()) { // if (command.getCalcDate() == null) { // commandService.updateToErr(command.getId()); @@ -219,7 +219,7 @@ public class CalcCommandConsumerTest { Calculator calculator = null; Operator operator = null; Serializable calcKey = null; - if (command.isCommandOfDistrict()) {// 小区 + if (command.isCommandOfDistrict()) {// 灏忓尯 calcKey = new DistrictKey(command.getCity(), command.getRegion(), command.getName(), command.getEstateType()); calculator = new DistrictSellCalculator(); operator = new DistrictSellOperator(); @@ -243,7 +243,7 @@ public class CalcCommandConsumerTest { } else { throw new CalcException("can't find calculator or operator or calcKey!"); } - } else if (command.getCalcType() == CalcCommand.CalcTypeEnum.CALC_ALL_WEEKS.getCalcType()) {//重算某个小区的所有均价 + } else if (command.getCalcType() == CalcCommand.CalcTypeEnum.CALC_ALL_WEEKS.getCalcType()) {//閲嶇畻鏌愪釜灏忓尯鐨勬墍鏈夊潎浠� if (command.isCommandOfDistrict()) { if (reCalcluatorAll(new DistrictKey(command.getCity(), command.getRegion(), command.getName(), command.getEstateType()))) { // commandService.updateToCalcSuc(command.getId()); @@ -260,7 +260,7 @@ public class CalcCommandConsumerTest { } /** - * 重算指定小区的所有价格 + * 閲嶇畻鎸囧畾灏忓尯鐨勬墍鏈変环鏍� * * @param districtKey * @return @@ -274,14 +274,14 @@ public class CalcCommandConsumerTest { String name = districtKey.getName(); String estateType = districtKey.getEstateTypeEnum().getEstateType(); - // 查出配置信息 + // 鏌ュ嚭閰嶇疆淇℃伅 CalcConfig calcConfig = calcConfigDao.findCalcConfig(city, region, name, "district", estateType); - // 删除之前所有价格 + // 鍒犻櫎涔嬪墠鎵�鏈変环鏍� districtStatDao.deleteAll(city, region, name, estateType); calcDistrictStatDao.deleteAll(city, region, name, estateType); - // 计算日期的起始点 + // 璁$畻鏃ユ湡鐨勮捣濮嬬偣 Date leftDate = getLeftDate(calcConfig); Date rightDate = new Date(); List weekends = DateUtil.getWeekendBetweenDates(leftDate, rightDate); @@ -308,7 +308,7 @@ public class CalcCommandConsumerTest { } } - // 如果数据库中的价格开始时间早于样本开始时间,则该时间段的价格需要模拟出来 + // 濡傛灉鏁版嵁搴撲腑鐨勪环鏍煎紑濮嬫椂闂存棭浜庢牱鏈紑濮嬫椂闂�,鍒欒鏃堕棿娈电殑浠锋牸闇�瑕佹ā鎷熷嚭鏉� if (rebool && startRes != null && calcConfig != null && calcConfig.getCalcStartDate() != null && calcConfig.getStatStartDate() != null && calcConfig.getCalcStartDate().before(calcConfig.getStatStartDate())) { List derivationWeekends = DateUtil.getWeekendBetweenDates(calcConfig.getCalcStartDate(), calcConfig.getStatStartDate()); @@ -338,7 +338,7 @@ public class CalcCommandConsumerTest { } private Date getLeftDate(CalcConfig calcConfig) { - // 优先使用样本开始时间 + // 浼樺厛浣跨敤鏍锋湰寮�濮嬫椂闂� if (calcConfig != null && calcConfig.getStatStartDate() != null) { if(calcConfig.getStatStartDate().before(CALC_START_DATE)) { return CALC_START_DATE; diff --git a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/CalcCommandQueueProvider.java b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/CalcCommandQueueProvider.java index 2555d1ab8..701f3c793 100644 --- a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/CalcCommandQueueProvider.java +++ b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/CalcCommandQueueProvider.java @@ -12,7 +12,7 @@ import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.BlockingQueue; /** - * 二手房价格计算命令提供者 + * 浜屾墜鎴夸环鏍艰绠楀懡浠ゆ彁渚涜�� * * @author xiaoyu */ @@ -38,7 +38,7 @@ public class CalcCommandQueueProvider { return; } - //把已经状态改变的指令,重新设为初始化 + //鎶婂凡缁忕姸鎬佹敼鍙樼殑鎸囦护锛岄噸鏂拌涓哄垵濮嬪寲 calcCommandDao.updateCalcingToInit(FangjiaCalcEnum.SELL.getCategory()); new AsyncThread(3 * 1000, new AsyncThread.Call() { diff --git a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/TransferDataConsumer.java b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/TransferDataConsumer.java index 7d26c6d53..83d54f838 100644 --- a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/TransferDataConsumer.java +++ b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/TransferDataConsumer.java @@ -158,7 +158,7 @@ public class TransferDataConsumer { udata.put("city", command.getCity()); udata.put("region", command.getRegion()); udata.put("district_name", command.getName()); - udata.put("estate_type", (command.getEstateType() != null && command.getEstateType().indexOf("别墅") > -1 ? "别墅" : "小区")); + udata.put("estate_type", (command.getEstateType() != null && command.getEstateType().indexOf("鍒") > -1 ? "鍒" : "灏忓尯")); districtStatDao.updateById(udata ,id); } diff --git a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/TrendMonitorConsumer.java b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/TrendMonitorConsumer.java index 56a4d9ad2..c40219894 100644 --- a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/TrendMonitorConsumer.java +++ b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/TrendMonitorConsumer.java @@ -41,7 +41,7 @@ public class TrendMonitorConsumer { private CalcCommandDao calcCommandDao = CalcCommandDao.getInstance(); private DistrictStatDao districtStatDao = DistrictStatDao.getInstance(); private CalcCommandService calcCommandService = CalcCommandService.getInstance(); - // 计算值最大允许的涨跌幅 + // 璁$畻鍊兼渶澶у厑璁哥殑娑ㄨ穼骞� public static final double MAX_CALC_MARKUP = 0.020; private static TrendMonitorConsumer instance = new TrendMonitorConsumer(); @@ -54,7 +54,7 @@ public class TrendMonitorConsumer { } public void start() { - //把计算完成的指令,放入待处理的队列中 + //鎶婅绠楀畬鎴愮殑鎸囦护锛屾斁鍏ュ緟澶勭悊鐨勯槦鍒椾腑 collector(); for (int i = 1; i <= MONITOR_THREAD_SIZE; i++) { @@ -86,7 +86,7 @@ public class TrendMonitorConsumer { } /** - * 把计算完成的指令,放入待处理的队列中 + * 鎶婅绠楀畬鎴愮殑鎸囦护锛屾斁鍏ュ緟澶勭悊鐨勯槦鍒椾腑 */ public void collector() { calcCommandDao.updateReingToCalcSuc(COMMAND_CATEGORY); @@ -136,32 +136,32 @@ public class TrendMonitorConsumer { } public static void main(String[] args) { - String city = "中山"; - String region = "五桂山"; - String name = "雅居乐长堤半岛"; + String city = "涓北"; + String region = "浜旀灞�"; + String name = "闆呭眳涔愰暱鍫ゅ崐宀�"; TrendMonitorConsumer sd = new TrendMonitorConsumer(); CalcCommand command = new CalcCommand(); command.setCity(city); command.setRegion(region); command.setName(name); - command.setEstateType("普通住宅"); + command.setEstateType("鏅�氫綇瀹�"); command.setCalcType(1); command.setId(ObjectId.get().toString()); sd.startRedraw(command); } /** - * 检查是否有需要回溯的指令 + * 妫�鏌ユ槸鍚︽湁闇�瑕佸洖婧殑鎸囦护 * * @throws InterruptedException */ public void startRedraw(CalcCommand command) { long lstart = System.currentTimeMillis(); Date startRedrawDate = command.getCalcDate(); - String estateType = (command.getEstateType() != null && command.getEstateType().indexOf("别墅") > -1 ? "别墅" : "普通住宅"); + String estateType = (command.getEstateType() != null && command.getEstateType().indexOf("鍒") > -1 ? "鍒" : "鏅�氫綇瀹�"); if (command.getCalcType() != null && CalcCommand.CalcTypeEnum.CALC_ALL_WEEKS.getCalcType() == command.getCalcType()) { - if (command.isCommandOfDistrict()) {// 小区 + if (command.isCommandOfDistrict()) {// 灏忓尯 DistrictStat districtStat = districtStatDao.findNewestDistrictStat(command.getCity(), command.getRegion(), command.getName(), estateType); if (districtStat != null) { startRedrawDate = districtStat.getWeekend(); @@ -175,13 +175,13 @@ public class TrendMonitorConsumer { } int updateSize = 0; - if (command.isCommandOfDistrict()) {// 小区 + if (command.isCommandOfDistrict()) {// 灏忓尯 updateSize = redrawTrend(command.getCity(), command.getRegion(), command.getName(), estateType, startRedrawDate); - } else if (command.isCommandOfBlock()) {//板块 + } else if (command.isCommandOfBlock()) {//鏉垮潡 updateSize = redrawTrend(command.getCity(), command.getRegion(), command.getBlock(), startRedrawDate); - } else if (command.isCommandOfRegion()) {//区域 + } else if (command.isCommandOfRegion()) {//鍖哄煙 updateSize = redrawTrend(command.getCity(), command.getRegion(), null, startRedrawDate); - } else if (command.isCommandOfCity()) {//城市 + } else if (command.isCommandOfCity()) {//鍩庡競 updateSize = redrawTrend(command.getCity(), null, null, startRedrawDate); } @@ -191,7 +191,7 @@ public class TrendMonitorConsumer { /** - * 城市曲线回溯 + * 鍩庡競鏇茬嚎鍥炴函 * * @param city * @param region @@ -212,7 +212,7 @@ public class TrendMonitorConsumer { int baseValue = recentlyStat.getCalcValue(); int calcValue = recentlyStat.getCalcValue(); - // 数据更新器 + // 鏁版嵁鏇存柊鍣� StatUpdater statUpdater = new StatUpdater(regionStatDao); for (Date weekend : weekendRegionStatMap.keySet()) { if (weekend.equals(calcDate)) { @@ -220,7 +220,7 @@ public class TrendMonitorConsumer { } RegionStat stat = weekendRegionStatMap.get(weekend); - // 以前的数据中没有calc_value这个字段,所以就把以前的显示值当做计算值 + // 浠ュ墠鐨勬暟鎹腑娌℃湁calc_value杩欎釜瀛楁锛屾墍浠ュ氨鎶婁互鍓嶇殑鏄剧ず鍊煎綋鍋氳绠楀�� if (stat.getCalcValue() <= 0) { stat.setCalcValue(stat.getAvgPrice()); } @@ -240,20 +240,20 @@ public class TrendMonitorConsumer { newValue = stat.getCalcValue(); } - // 判断是否发生变化 + // 鍒ゆ柇鏄惁鍙戠敓鍙樺寲 if (newValue != stat.getAvgPrice()) { - // 如果价格有更新,那么本周的涨跌幅和下周的涨跌幅应该发生变化 + // 濡傛灉浠锋牸鏈夋洿鏂帮紝閭d箞鏈懆鐨勬定璺屽箙鍜屼笅鍛ㄧ殑娑ㄨ穼骞呭簲璇ュ彂鐢熷彉鍖� RegionStat lastStat = weekendRegionStatMap.get(DateUtil.getLastSunday(weekend)); RegionStat nextStat = weekendRegionStatMap.get(DateUtil.getNextSunday(weekend)); statUpdater.update(stat.getId(), new BasicDBObject("avg_price", newValue)); - // 本周的涨跌幅发生变化 + // 鏈懆鐨勬定璺屽箙鍙戠敓鍙樺寲 if (lastStat != null) { statUpdater.update(stat.getId(), new BasicDBObject("weekend_markup", getWeekendMarkup(newValue, lastStat.getAvgPrice()))); } - // 下周的涨跌幅发生变化 + // 涓嬪懆鐨勬定璺屽箙鍙戠敓鍙樺寲 if (nextStat != null) { statUpdater.update(nextStat.getId(), new BasicDBObject("weekend_markup", getWeekendMarkup(nextStat.getAvgPrice(), newValue))); @@ -267,14 +267,14 @@ public class TrendMonitorConsumer { } } - // 确认更新 + // 纭鏇存柊 statUpdater.commit(); return statUpdater.getUpdateMapSize(); } /** - * 小区曲线回溯 + * 灏忓尯鏇茬嚎鍥炴函 * * @param city * @param region @@ -300,7 +300,7 @@ public class TrendMonitorConsumer { int baseValue = recentlyStat.getCalcValue(); int calcValue = recentlyStat.getCalcValue(); - // 数据更新器 + // 鏁版嵁鏇存柊鍣� StatUpdater statUpdater = new StatUpdater(districtStatDao); for (Date weekend : weekendDistrictStatMap.keySet()) { @@ -309,7 +309,7 @@ public class TrendMonitorConsumer { } DistrictStat stat = weekendDistrictStatMap.get(weekend); - // 以前的数据中没有calc_value这个字段,所以就把以前的显示值当做计算值 + // 浠ュ墠鐨勬暟鎹腑娌℃湁calc_value杩欎釜瀛楁锛屾墍浠ュ氨鎶婁互鍓嶇殑鏄剧ず鍊煎綋鍋氳绠楀�� if (stat.getCalcValue() <= 0) { stat.setCalcValue(stat.getAvgPrice()); } @@ -331,20 +331,20 @@ public class TrendMonitorConsumer { newValue = stat.getCalcValue(); } - // 判断是否发生变化 + // 鍒ゆ柇鏄惁鍙戠敓鍙樺寲 if (newValue != stat.getAvgPrice()) { - // 如果价格有更新,那么本周的涨跌幅和下周的涨跌幅应该发生变化 + // 濡傛灉浠锋牸鏈夋洿鏂帮紝閭d箞鏈懆鐨勬定璺屽箙鍜屼笅鍛ㄧ殑娑ㄨ穼骞呭簲璇ュ彂鐢熷彉鍖� DistrictStat lastDistrictStat = weekendDistrictStatMap.get(DateUtil.getLastSunday(weekend)); DistrictStat nextDistrictStat = weekendDistrictStatMap.get(DateUtil.getNextSunday(weekend)); statUpdater.update(stat.getId(), new BasicDBObject("avg_price", newValue)); - // 本周的涨跌幅发生变化 + // 鏈懆鐨勬定璺屽箙鍙戠敓鍙樺寲 if (lastDistrictStat != null) { statUpdater.update(stat.getId(), new BasicDBObject("weekend_markup", getWeekendMarkup(newValue, lastDistrictStat.getAvgPrice()))); } - // 下周的涨跌幅发生变化 + // 涓嬪懆鐨勬定璺屽箙鍙戠敓鍙樺寲 if (nextDistrictStat != null) { statUpdater.update(nextDistrictStat.getId(), new BasicDBObject("weekend_markup", getWeekendMarkup(nextDistrictStat.getAvgPrice(), newValue))); @@ -357,7 +357,7 @@ public class TrendMonitorConsumer { calcValue = stat.getCalcValue(); } } - // 确认更新 + // 纭鏇存柊 statUpdater.commit(); return statUpdater.getUpdateMapSize(); @@ -414,7 +414,7 @@ public class TrendMonitorConsumer { } /** - * 数据更新对象 + * 鏁版嵁鏇存柊瀵硅薄 * * @author dxy */ @@ -428,7 +428,7 @@ public class TrendMonitorConsumer { } /** - * 请求更新 + * 璇锋眰鏇存柊 * * @param id * @param data @@ -448,7 +448,7 @@ public class TrendMonitorConsumer { } /** - * 确认之前的请求进行提交 + * 纭涔嬪墠鐨勮姹傝繘琛屾彁浜� */ public void commit() { if (updateDataMap.size() <= 0) { diff --git a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/city/CitySellCalculator.java b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/city/CitySellCalculator.java index 42c0d6d6d..d0aa86f91 100644 --- a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/city/CitySellCalculator.java +++ b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/city/CitySellCalculator.java @@ -17,7 +17,7 @@ import com.mongodb.BasicDBObject; import com.mongodb.DBObject; /** - * 城市价格计算器实现 + * 鍩庡競浠锋牸璁$畻鍣ㄥ疄鐜� * * @author duxiaoyu * @@ -28,7 +28,7 @@ public class CitySellCalculator implements Calculator { private CitySellProvider provider = CitySellProvider.getInstance(); public static void main(String[] args) throws CalcException { CitySellCalculator calculator = new CitySellCalculator(); - String city = "天津"; + String city = "澶╂触"; Date date1 = DateUtil.parseDate("2016-11-19", "yyyy-MM-dd"); Date date2 = DateUtil.parseDate("2016-11-25", "yyyy-MM-dd"); List weekends = DateUtil.getWeekendBetweenDates(date1, date2); @@ -37,7 +37,7 @@ public class CitySellCalculator implements Calculator { for(RegionBlock region : regions) { List blocks = RegionBlockDao.getInstance().findBlocks(city, region.getName()); for(RegionBlock block : blocks) { - if(!block.getName().contains("南市")){ + if(!block.getName().contains("鍗楀競")){ continue; } calculator.calc(new CityKey(city, region.getName(), block.getName()), weekend); @@ -91,7 +91,7 @@ public class CitySellCalculator implements Calculator { } }); - /****聚类实现方式***/ + /****鑱氱被瀹炵幇鏂瑰紡***/ List samplePoints = new ArrayList(); if(points.size() >= 10) { samplePoints.addAll(points.subList((int) (points.size() * 0.30), (int) (points.size() * 0.70))); diff --git a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/city/CitySellOperator.java b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/city/CitySellOperator.java index ebe3cdeb3..739438fe8 100644 --- a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/city/CitySellOperator.java +++ b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/city/CitySellOperator.java @@ -14,7 +14,7 @@ import com.mongodb.BasicDBObject; import com.mongodb.DBObject; /** - * 城市均价处理实现 + * 鍩庡競鍧囦环澶勭悊瀹炵幇 * * @author duxiaoyu * @@ -38,17 +38,17 @@ public class CitySellOperator implements Operator { regionStat.setCity(k.getCity()); regionStat.setRegion(null); regionStat.setBlock(null); - regionStat.setCat("城市"); + regionStat.setCat("鍩庡競"); } else if (k.isRegion()) { regionStat.setCity(k.getCity()); regionStat.setRegion(k.getRegion()); regionStat.setBlock(null); - regionStat.setCat("区域"); + regionStat.setCat("鍖哄煙"); } else if (k.isBlock()) { regionStat.setCity(k.getCity()); regionStat.setRegion(k.getRegion()); regionStat.setBlock(k.getBlock()); - regionStat.setCat("板块"); + regionStat.setCat("鏉垮潡"); } // int steadyValue = keepSteadyValue(k.getCity(), k.getRegion(), k.getBlock(), r.getValue(), r.getCalcDate()); @@ -79,14 +79,14 @@ public class CitySellOperator implements Operator { // int consVal = AveragerUtil.makeHashCode(new CityKey(city, region, block), calcDate, FangjiaCalcEnum.SELL); // double markup = (double) (value - lastStat.getAvgPrice()) / (double) lastStat.getAvgPrice(); // -// // 如果涨跌幅为0,为了保证曲线有起有落,所以为其定制一个很小的涨跌幅 +// // 濡傛灉娑ㄨ穼骞呬负0锛屼负浜嗕繚璇佹洸绾挎湁璧锋湁钀斤紝鎵�浠ヤ负鍏跺畾鍒朵竴涓緢灏忕殑娑ㄨ穼骞� // if (Math.abs(markup) == 0) { // value += value * (double) ((consVal % 60) / 100.0 / 100.0) * ((consVal % 2 == 0) ? 1 : -1); // } else { -// // 最近一个季度的平均涨跌幅 +// // 鏈�杩戜竴涓搴︾殑骞冲潎娑ㄨ穼骞� // double avgMarkup = regionStatDao.findLatestStatAvgMarkup(city, region, block, calcDate, 13); // if (!isValidMarkup(markup, avgMarkup)) { -// // 对平均涨跌幅进行最大涨跌150% +// // 瀵瑰钩鍧囨定璺屽箙杩涜鏈�澶ф定璺�150% // double rmarkup = (avgMarkup + avgMarkup * ((double) (consVal % 150) / 100d)) * (markup >= 0 ? 1 : -1); // value = (int) (lastStat.getAvgPrice() + lastStat.getAvgPrice() * rmarkup); // } @@ -120,19 +120,19 @@ public class CitySellOperator implements Operator { } // /** -// * 检查涨跌幅是否正常 +// * 妫�鏌ユ定璺屽箙鏄惁姝e父 // * // * @param markup // * @param avgMarkup // * @return // */ // private boolean isValidMarkup(double markup, double avgMarkup) { -// // 每周涨跌1.5%以下属于正常 +// // 姣忓懆娑ㄨ穼1.5%浠ヤ笅灞炰簬姝e父 // if (Math.abs(markup) < 0.015) { // return true; // } // -// // 大于平均涨跌幅的0.35倍属于不正常,这样会造成曲线波动很大 +// // 澶т簬骞冲潎娑ㄨ穼骞呯殑0.35鍊嶅睘浜庝笉姝e父,杩欐牱浼氶�犳垚鏇茬嚎娉㈠姩寰堝ぇ // if (Math.abs(markup) > (avgMarkup + avgMarkup * 0.35)) { // return false; // } diff --git a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/city/CitySellPoint.java b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/city/CitySellPoint.java index 47ec5ff24..eb54ff6c6 100644 --- a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/city/CitySellPoint.java +++ b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/city/CitySellPoint.java @@ -5,7 +5,7 @@ import java.util.Date; import com.fangjia.analysis.core.Point; /** - * 城市、区域、板块的计算的原始样本点 + * 鍩庡競銆佸尯鍩熴�佹澘鍧楃殑璁$畻鐨勫師濮嬫牱鏈偣 * * @author duxiaoyu * diff --git a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/city/CitySellProvider.java b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/city/CitySellProvider.java index ea56b5a6a..220ef0735 100644 --- a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/city/CitySellProvider.java +++ b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/city/CitySellProvider.java @@ -28,7 +28,7 @@ import com.mongodb.BasicDBObject; import com.mongodb.DBObject; /** - * 城市数据提供者实现 + * 鍩庡競鏁版嵁鎻愪緵鑰呭疄鐜� * * @author duxiaoyu * @@ -37,7 +37,7 @@ public class CitySellProvider implements Provider { private static CitySellProvider instance = new CitySellProvider(); private SeaweedDao seaweedDao = SeaweedDao.getInstance(); private DistrictStatDao districtStatDao = DistrictStatDao.getInstance(); - //此处时间是为了兼容老版本的均价计算方法 + //姝ゅ鏃堕棿鏄负浜嗗吋瀹硅�佺増鏈殑鍧囦环璁$畻鏂规硶 private static final Date NEW_VERSION_DATE = DateUtil.parseDate("2014-09-13", "yyyy-MM-dd"); public static final String[] DISTRICT_FIELDS = { "city", "region", "block", "name", "estate_type2" }; CitySellProvider() { @@ -90,9 +90,9 @@ public class CitySellProvider implements Provider { continue; } - // 如果是新版均价使用可信度 + // 濡傛灉鏄柊鐗堝潎浠蜂娇鐢ㄥ彲淇″害 if (calcDate.after(NEW_VERSION_DATE)) { - // 通过自身样板计算出来的小区均价 + // 閫氳繃鑷韩鏍锋澘璁$畻鍑烘潵鐨勫皬鍖哄潎浠� if (districtStat.getCredit() > Constants.CALC_OWN_BASE_CREDIT) { CitySellPoint point = new CitySellPoint(); point.setValue(districtStat.getAvgPrice()); @@ -100,7 +100,7 @@ public class CitySellProvider implements Provider { point.setDate(weekend); ret.add(point); } - } else {// 如果是在新版本之前的价格计算,则只是用自身样本的小区 + } else {// 濡傛灉鏄湪鏂扮増鏈箣鍓嶇殑浠锋牸璁$畻锛屽垯鍙槸鐢ㄨ嚜韬牱鏈殑灏忓尯 if (districtStat.getSampleType() != null && "own".equals(districtStat.getSampleType().toLowerCase())) { CitySellPoint point = new CitySellPoint(); point.setValue(districtStat.getAvgPrice()); diff --git a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/city/CitySellResult.java b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/city/CitySellResult.java index 55e30bb02..89fa36a00 100644 --- a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/city/CitySellResult.java +++ b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/city/CitySellResult.java @@ -5,16 +5,16 @@ import java.util.Date; import com.fangjia.analysis.core.Result; /** - * 城市、区域、板块计算结果 + * 鍩庡競銆佸尯鍩熴�佹澘鍧楄绠楃粨鏋� * * @author duxiaoyu * */ public class CitySellResult implements Result { - private int value; // 运算出的值 - private Date calcDate; // 计算日期 - private double credit; // 可信度 - private double coverage; // 小区覆盖率 + private int value; // 杩愮畻鍑虹殑鍊� + private Date calcDate; // 璁$畻鏃ユ湡 + private double credit; // 鍙俊搴� + private double coverage; // 灏忓尯瑕嗙洊鐜� public int getValue() { return value; diff --git a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/district/Constants.java b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/district/Constants.java index 4936558e6..9d9fdfaeb 100644 --- a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/district/Constants.java +++ b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/district/Constants.java @@ -4,20 +4,20 @@ import java.util.HashMap; import java.util.Map; /** - * 计算小区均价的常量定义 + * 璁$畻灏忓尯鍧囦环鐨勫父閲忓畾涔� * * @author xiaoyu */ public class Constants { /** - * 计算小区均价的样本获取量 + * 璁$畻灏忓尯鍧囦环鐨勬牱鏈幏鍙栭噺 * DistrictSellConfigProvider.getSampleFetchCount(String city, String region) */ public static final int SELL_POINT_FETCH_COUNT = 1000; /** - * 小区有序队列的区间范围 + * 灏忓尯鏈夊簭闃熷垪鐨勫尯闂磋寖鍥� * DistrictSellConfigProvider.getSampleQueueRange(String city, String region) */ public static final double MIN_EXTREME_VALUE_PERCENT = 0.35; @@ -25,37 +25,37 @@ public class Constants { /** - * 样本的最大最小值 + * 鏍锋湰鐨勬渶澶ф渶灏忓�� * DistrictSellConfigProvider.getSampleValueRange(String city, String region) */ public static final double SAMPLE_MIN_VALUE = 1000; public static final double SAMPLE_MAX_VALUE = 300000; /** - * 周边小区均价的周边半径(米) + * 鍛ㄨ竟灏忓尯鍧囦环鐨勫懆杈瑰崐寰勶紙绫筹級 * DistrictSellConfigProvider.getAroundRadius */ public static final int ARROUND_RADIUS_METERS = 1500; /** - * 周边小区数量限定数量 + * 鍛ㄨ竟灏忓尯鏁伴噺闄愬畾鏁伴噺 * DistrictSellConfigProvider.getAroundLimit */ public static final int AROUND_DISTRICT_LIMIT = 10; /** - * 强制价格调整系数 + * 寮哄埗浠锋牸璋冩暣绯绘暟 */ public static final double HARD_PERCENT = 1.0; /** - * 主小区影响从小区可信度衰减比例 + * 涓诲皬鍖哄奖鍝嶄粠灏忓尯鍙俊搴﹁“鍑忔瘮渚� */ public static final double MASTER_INTERVENE_PERCENT = 0.90; /** - * 样本时间权重设置 + * 鏍锋湰鏃堕棿鏉冮噸璁剧疆 * DistrictSellConfigProvider.getTimeWeights */ public static final Map TIME_WEIGHTS_MAP = new HashMap(); @@ -66,85 +66,85 @@ public class Constants { } -/*********************************************以上都能进行后台设置************************************************************************************/ +/*********************************************浠ヤ笂閮借兘杩涜鍚庡彴璁剧疆************************************************************************************/ /** - * 小区的二手房成交记录的获取数量 + * 灏忓尯鐨勪簩鎵嬫埧鎴愪氦璁板綍鐨勮幏鍙栨暟閲� */ public static final int DEAL_PRICE_FETCH_COUNT = 1000; /** - * 最多参与第三方价格对比的数量 + * 鏈�澶氬弬涓庣涓夋柟浠锋牸瀵规瘮鐨勬暟閲� */ public static final int SELL_VALUE_THIRD_COUNT = 10; /** - * 价格点和平衡值的最大差比例 + * 浠锋牸鐐瑰拰骞宠 鍊肩殑鏈�澶у樊姣斾緥 */ public static final double MAX_PERCENT_SPOT_BALANCE = 0.03d; /** - * 与第三方价格的最大差异 + * 涓庣涓夋柟浠锋牸鐨勬渶澶у樊寮� */ public static final double MAX_PERCENT_THIRD_DIFF = 0.2d; /** - * 超过MAX_PERCENT_BALANCE_SPOT的差比部分的紧缩比例 + * 瓒呰繃MAX_PERCENT_BALANCE_SPOT鐨勫樊姣旈儴鍒嗙殑绱х缉姣斾緥 */ public static final double ABUT_PERCENT_SPOT_BALANCE = 0.25d; /** - * 指导价计算出来的基础可信度值 + * 鎸囧浠疯绠楀嚭鏉ョ殑鍩虹鍙俊搴﹀�� */ public static final double CALC_GUI_BASE_CREDIT = 0.8d; /** - * 自身样本计算出来的基础可信度值 + * 鑷韩鏍锋湰璁$畻鍑烘潵鐨勫熀纭�鍙俊搴﹀�� */ public static final double CALC_OWN_BASE_CREDIT = 0.6d; /** - * 第三方价格计算出来的基础可信度值 + * 绗笁鏂逛环鏍艰绠楀嚭鏉ョ殑鍩虹鍙俊搴﹀�� */ public static final double CALC_THIRD_BASE_CREDIT = 0.5d; /** - * 周边样本计算出来的基础可信度值 + * 鍛ㄨ竟鏍锋湰璁$畻鍑烘潵鐨勫熀纭�鍙俊搴﹀�� */ public static final double CALC_AROUND_BASE_CREDIT = 0.4d; /** - * 周边推算的基础可信度值 + * 鍛ㄨ竟鎺ㄧ畻鐨勫熀纭�鍙俊搴﹀�� */ public static final double CALC_DEDUCTION_BASE_CREDIT = 0.3d; /** - * 通过一个点推导出来的基础可信度值 + * 閫氳繃涓�涓偣鎺ㄥ鍑烘潵鐨勫熀纭�鍙俊搴﹀�� */ public static final double CALC_DERIVATION_BASE_CREDIT = 0.2d; /** - * 通过第三方价格的调整的影响系数 + * 閫氳繃绗笁鏂逛环鏍肩殑璋冩暣鐨勫奖鍝嶇郴鏁� */ public static final double CALC_THIRD_REGULATION_FACTOR = 0.1d; /** - * 按时间影响,每天衰减的可信度(以20年价格进行设计,即:如果一个指导价是20年前添加的,那么可信度+0) + * 鎸夋椂闂村奖鍝嶏紝姣忓ぉ琛板噺鐨勫彲淇″害(浠�20骞翠环鏍艰繘琛岃璁★紝鍗筹細濡傛灉涓�涓寚瀵间环鏄�20骞村墠娣诲姞鐨勶紝閭d箞鍙俊搴�+0) */ public static final double CREDIT_DECAY_FACTOR = (1.0 - CALC_GUI_BASE_CREDIT) / (365.0 * 20.0); /** - * 指导价过期天数 + * 鎸囧浠疯繃鏈熷ぉ鏁� */ public static final int GUIDING_PRICE_EXPIRATION_DAY = 720; /** - * 样本换算需要间隔时间 + * 鏍锋湰鎹㈢畻闇�瑕侀棿闅旀椂闂� */ public static final int UNCOMFORABLE_SAMPLE_DAY = 360; /** - * 样本与周边对比的最小相差比例 + * 鏍锋湰涓庡懆杈瑰姣旂殑鏈�灏忕浉宸瘮渚� */ public static final int AROUND_DIFF_MIN_PERCENT = 300; /** - * 样本与周边对比的最大相差比例 + * 鏍锋湰涓庡懆杈瑰姣旂殑鏈�澶х浉宸瘮渚� */ public static final int AROUND_DIFF_MAX_PERCENT = 300; } diff --git a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/district/DistrictAveragerDerivation.java b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/district/DistrictAveragerDerivation.java index aa4e0d8b6..1adbe74d3 100644 --- a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/district/DistrictAveragerDerivation.java +++ b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/district/DistrictAveragerDerivation.java @@ -12,7 +12,7 @@ import com.fangjia.mongo.dao.RegionStatDao; import com.fangjia.mongo.model.RegionStat; /** - * 小区均价推导算法实现 + * 灏忓尯鍧囦环鎺ㄥ绠楁硶瀹炵幇 * * @author xiaoyu * @@ -31,7 +31,7 @@ public class DistrictAveragerDerivation { } /** - * 通过两端的参照点,产生一个指定日期的值 + * 閫氳繃涓ょ鐨勫弬鐓х偣锛屼骇鐢熶竴涓寚瀹氭棩鏈熺殑鍊� * * @param calcDate * @param k @@ -57,14 +57,14 @@ public class DistrictAveragerDerivation { double r = (double) (consVal % 50) / 100.0; int val = 0; - // 说明整体曲线呈上涨趋势 + // 璇存槑鏁翠綋鏇茬嚎鍛堜笂娑ㄨ秼鍔� if (startPoint.getVal().intValue() < endPoint.getVal().intValue()) { if (consVal % 3 < 2) { val = startPoint.getVal().intValue() + (int) (ladderValue * (double) (gcw - 1)) + (int) (ladderValue * (1.0 + r)); } else { val = startPoint.getVal().intValue() + (int) (ladderValue * (double) (gcw - 1)) - (int) (ladderValue * (1.0 - r)); } - } else if (startPoint.getVal().intValue() > endPoint.getVal().intValue()) {// 说明整体曲线呈下落趋势 + } else if (startPoint.getVal().intValue() > endPoint.getVal().intValue()) {// 璇存槑鏁翠綋鏇茬嚎鍛堜笅钀借秼鍔� if (consVal % 3 < 2) { val = startPoint.getVal().intValue() - (int) (ladderValue * (double) (gcw - 1)) - (int) (ladderValue * (1.0 + r)); } else { @@ -83,7 +83,7 @@ public class DistrictAveragerDerivation { } /** - * 通过一个指导价格,推导出指定日期的价格 + * 閫氳繃涓�涓寚瀵间环鏍硷紝鎺ㄥ鍑烘寚瀹氭棩鏈熺殑浠锋牸 * * @param calcDate * @param city @@ -100,7 +100,7 @@ public class DistrictAveragerDerivation { int ret = -1; if (region != null) { - // 优先利用区域均价进行推算 + // 浼樺厛鍒╃敤鍖哄煙鍧囦环杩涜鎺ㄧ畻 ret = doDerivation(city, region, calcDate, guidDate, guidVal); if (ret <= 0) { ret = doDerivation(city, null, calcDate, guidDate, guidVal); diff --git a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/district/DistrictDealProvider.java b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/district/DistrictDealProvider.java index 193df6dd8..d1a4ad00f 100644 --- a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/district/DistrictDealProvider.java +++ b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/district/DistrictDealProvider.java @@ -20,7 +20,7 @@ import com.google.common.cache.LoadingCache; import com.google.common.collect.MapMaker; /** - * 交易房源提供者 + * 浜ゆ槗鎴挎簮鎻愪緵鑰� * * @author dxy * diff --git a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/district/DistrictSellAroundCalculator.java b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/district/DistrictSellAroundCalculator.java index 5e0be7598..2fe1a2068 100644 --- a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/district/DistrictSellAroundCalculator.java +++ b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/district/DistrictSellAroundCalculator.java @@ -86,7 +86,7 @@ public class DistrictSellAroundCalculator implements Calculator 0) { - capd = (int) (regionAvgPrice * 0.005);//以上海为例:均价约为40000,每1KM差距200元 + capd = (int) (regionAvgPrice * 0.005);//浠ヤ笂娴蜂负渚嬶細鍧囦环绾︿负40000锛屾瘡1KM宸窛200鍏� }else { if(cityLevel <= 1) { capd = 200; diff --git a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/district/DistrictSellCalculator.java b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/district/DistrictSellCalculator.java index c3d7458d2..fb635b6b2 100644 --- a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/district/DistrictSellCalculator.java +++ b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/district/DistrictSellCalculator.java @@ -39,7 +39,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; /** - * 小区二手房均价计算器 + * 灏忓尯浜屾墜鎴垮潎浠疯绠楀櫒 * * @author xiaoyu * @@ -67,9 +67,9 @@ public class DistrictSellCalculator implements Calculator dates = new ArrayList(guiRes.getGuidingMap().keySet()); @@ -127,8 +127,8 @@ public class DistrictSellCalculator implements Calculator - * 以最近一年只有(0.010*SELL_POINT_FETCH_COUNT)的自身房源计算的最低质量得分,作为借助于第三方的依据(一年的房源质量得分打7折) - * (等价于一个小区有10套房源,且距今全部为360天,如果房源得分低于这个值,那么会作为第三方价格介入的依据) + * 浠ユ渶杩戜竴骞村彧鏈�(0.010*SELL_POINT_FETCH_COUNT)鐨勮嚜韬埧婧愯绠楃殑鏈�浣庤川閲忓緱鍒嗭紝浣滀负鍊熷姪浜庣涓夋柟鐨勪緷鎹�(涓�骞寸殑鎴挎簮璐ㄩ噺寰楀垎鎵�7鎶�) + * (绛変环浜庝竴涓皬鍖烘湁10濂楁埧婧愶紝涓旇窛浠婂叏閮ㄤ负360澶╋紝濡傛灉鎴挎簮寰楀垎浣庝簬杩欎釜鍊硷紝閭d箞浼氫綔涓虹涓夋柟浠锋牸浠嬪叆鐨勪緷鎹�) * */ double qualityMinMeddleScore = (0.1d / Constants.SELL_POINT_FETCH_COUNT) * (Constants.SELL_POINT_FETCH_COUNT * 0.010d) * 0.7d; @@ -150,25 +150,25 @@ public class DistrictSellCalculator implements Calculator masRes.getCredit() * masterIntervenePercent) { res = subRes; - }else {//使用主名计算的价格,需要降低可信度 + }else {//浣跨敤涓诲悕璁$畻鐨勪环鏍硷紝闇�瑕侀檷浣庡彲淇″害 masRes.setValue(generateSubPriceByMasResult(thisKey, masRes)); masRes.setCredit((int)(masRes.getCredit() * masterIntervenePercent * 100000.0) / 100000.0); res = masRes; @@ -260,12 +260,12 @@ public class DistrictSellCalculator implements Calculator newPoints = new ArrayList(); - //根据网站进行系数涨跌 + //鏍规嵁缃戠珯杩涜绯绘暟娑ㄨ穼 for (E dsp : points) { if (dsp instanceof DistrictSellPoint) { try { @@ -434,7 +434,7 @@ public class DistrictSellCalculator implements Calculator clonePoints = new ArrayList(); - //网站权重设置 + //缃戠珯鏉冮噸璁剧疆 for (E dsp : newPoints) { if(dsp instanceof DistrictSellPoint) { String site = DataUtil.urlToSiteName(((DistrictSellPoint)dsp).getUrl()); @@ -456,7 +456,7 @@ public class DistrictSellCalculator implements Calculator sames = new ArrayList(); @@ -469,7 +469,7 @@ public class DistrictSellCalculator implements Calculator ret = new ArrayList(); int cityLevel = serverAreaDao.getCityLevel(k.getCity()); - //最近一个月城市和区域的平均均价 + //鏈�杩戜竴涓湀鍩庡競鍜屽尯鍩熺殑骞冲潎鍧囦环 int cityBalanceValue = regionStatService.findRegionStatBalanceValue(k.getCity(), null, null, calcDate, DateUtil.getBeforeDay(calcDate, 31)); int regionBalanceValue = regionStatService.findRegionStatBalanceValue(k.getCity(), k.getRegion(), null, calcDate, DateUtil.getBeforeDay(calcDate, 31)); - //样本需要通过城市均价进行涨跌的天数限制 + //鏍锋湰闇�瑕侀�氳繃鍩庡競鍧囦环杩涜娑ㄨ穼鐨勫ぉ鏁伴檺鍒� int uncomforableSampleDay = districtSellConfigProvider.getUncomforableSampleDay(k.getCity(), k.getRegion(), k.getName()); LOGGER.error("UNCOMFORABLE_SAMPLE_DAY:" + uncomforableSampleDay); ThreadLocalContainer.getInstance().put("cityBalanceValue", cityBalanceValue); @@ -499,15 +499,15 @@ public class DistrictSellCalculator implements Calculator uncomforableSampleDay * DAY_MILLS) { double yearMarkup = getYearMarkup(k.getCity(), k.getRegion(), dsp.getDate(), calcDate); val = (int) (dsp.getValue() + dsp.getValue() * yearMarkup); - LOGGER.debug("涨跌幅:{}->{}", new int[]{orgVal, val}); + LOGGER.debug("娑ㄨ穼骞�:{}->{}", new int[]{orgVal, val}); } val = (int)(val * hardPercent); @@ -515,7 +515,7 @@ public class DistrictSellCalculator implements Calculator 0 && (val < cityBalanceValue / 10 || val > cityBalanceValue * 10)) { continue; } - }else if(cityLevel == 2) {//二线城市 + }else if(cityLevel == 2) {//浜岀嚎鍩庡競 if (cityBalanceValue > 0 && (val < cityBalanceValue / 7.5 || val > cityBalanceValue * 7.5)) { continue; } @@ -523,21 +523,21 @@ public class DistrictSellCalculator implements Calculator 0 && (val < cityBalanceValue / 6 || val > cityBalanceValue * 6)) { continue; } if (regionBalanceValue > 0 && (val < regionBalanceValue / 4 || val > regionBalanceValue * 4)) { continue; } - }else if(cityLevel == 4) {//四线城市 + }else if(cityLevel == 4) {//鍥涚嚎鍩庡競 if (cityBalanceValue > 0 && (val < cityBalanceValue / 4 || val > cityBalanceValue * 4)) { continue; } if (regionBalanceValue > 0 && (val < regionBalanceValue / 3 || val > regionBalanceValue * 3)) { continue; } - }else if(cityLevel == 5) {//五线城市 + }else if(cityLevel == 5) {//浜旂嚎鍩庡競 if (cityBalanceValue > 0 && (val < cityBalanceValue / 3.5 || val > cityBalanceValue * 3.5)) { continue; } @@ -546,17 +546,17 @@ public class DistrictSellCalculator implements Calculator 0) { int randCode = AveragerUtil.makeHashCode(k, dsp.getDate(), FangjiaCalcEnum.SELL); for (int i = 0; i < weightValue; i++) { - ret.add(val + (randCode % (i + 6)));//随机产生一个和原始值差不多的数字 + ret.add(val + (randCode % (i + 6)));//闅忔満浜х敓涓�涓拰鍘熷鍊煎樊涓嶅鐨勬暟瀛� } } } - // 使均值往一端偏移 + // 浣垮潎鍊煎線涓�绔亸绉� if (ret.size() > 10) { Collections.sort(ret); AbstractConfigProvider.Range sampleQueueRange = districtSellConfigProvider.getSampleQueueRange(k.getCity(), k.getRegion(), k.getName()); @@ -584,7 +584,7 @@ public class DistrictSellCalculator implements Calculator guidingMap = new HashMap(); for (GuidingPrice gp : guidingPrices) { long diffTime = Math.abs(gp.getGuidingDate().getTime() - calcDate.getTime()); - //根据系数检查该指导价是否可以使用 + //鏍规嵁绯绘暟妫�鏌ヨ鎸囧浠锋槸鍚﹀彲浠ヤ娇鐢� if(diffTime < guidingPriceExpirDay * DAY_MILLS) { guidingMap.put(DateUtil.formatToTightYYYYMMDD(gp.getGuidingDate()), gp.getGuidingValue()); } @@ -630,14 +630,14 @@ public class DistrictSellCalculator implements Calculator 0 && (avgPrice < districtBalanceValue / 2 || avgPrice > districtBalanceValue * 2)) { // return null; // } - //根据不同的城市级别进行数据过滤 + //鏍规嵁涓嶅悓鐨勫煄甯傜骇鍒繘琛屾暟鎹繃婊� // if(cityLevel <= 1) { // if (cityBalanceValue > 0 && (avgPrice < cityBalanceValue / 12 || avgPrice > cityBalanceValue * 12)) { // return null; @@ -681,28 +681,28 @@ public class DistrictSellCalculator implements Calculator 0 && (avgPrice < regionBalanceValue / 8 || avgPrice > regionBalanceValue * 8)) { // return null; // } -// }else if(cityLevel == 2) {//二线城市 +// }else if(cityLevel == 2) {//浜岀嚎鍩庡競 // if (cityBalanceValue > 0 && (avgPrice < cityBalanceValue / 7.5 || avgPrice > cityBalanceValue * 7.5)) { // return null; // } // if (regionBalanceValue > 0 && (avgPrice < regionBalanceValue / 5.5 || avgPrice > regionBalanceValue * 5.5)) { // return null; // } -// }else if(cityLevel == 3) {//三线城市 +// }else if(cityLevel == 3) {//涓夌嚎鍩庡競 // if (cityBalanceValue > 0 && (avgPrice < cityBalanceValue / 6 || avgPrice > cityBalanceValue * 6)) { // return null; // } // if (regionBalanceValue > 0 && (avgPrice < regionBalanceValue / 4 || avgPrice > regionBalanceValue * 4)) { // return null; // } -// }else if(cityLevel == 4) {//四线城市 +// }else if(cityLevel == 4) {//鍥涚嚎鍩庡競 // if (cityBalanceValue > 0 && (avgPrice < cityBalanceValue / 4 || avgPrice > cityBalanceValue * 4)) { // return null; // } // if (regionBalanceValue > 0 && (avgPrice < regionBalanceValue / 3 || avgPrice > regionBalanceValue * 3)) { // return null; // } -// }else if(cityLevel == 5) {//五线城市 +// }else if(cityLevel == 5) {//浜旂嚎鍩庡競 // if (cityBalanceValue > 0 && (avgPrice < cityBalanceValue / 3.5 || avgPrice > cityBalanceValue * 3.5)) { // return null; // } @@ -717,28 +717,28 @@ public class DistrictSellCalculator implements Calculator dealPoints = dealProvider.fetch(k, calcDate); - // 交易数据的计算值 + // 浜ゆ槗鏁版嵁鐨勮绠楀�� int dealValue = 0; - // 超过3个交易数据,则进行交易数据聚类 + // 瓒呰繃3涓氦鏄撴暟鎹紝鍒欒繘琛屼氦鏄撴暟鎹仛绫� if (dealPoints.size() > 3) { for (DistrictDealPoint ddp : dealPoints) { - // 如果是交易中心的价格,上浮5% + // 濡傛灉鏄氦鏄撲腑蹇冪殑浠锋牸锛屼笂娴�5% if (ddp.getSource() != null && ddp.getSource().indexOf(SourceEnum.JIAOYIZHONGXIN.getCategory()) > -1) { ddp.setValue((int) (ddp.getValue() * 1.05)); } } - // 预处理交易数据 + // 棰勫鐞嗕氦鏄撴暟鎹� List points = processingPoint(k, calcDate, dealPoints); Cluster cluster = DataCluster.cluster(points); @@ -761,14 +761,14 @@ public class DistrictSellCalculator implements Calculator> thirdpartDetails = averageStatisticsDao.findThirdpartsAveragers(k.getCity(), k.getRegion(), k.getName(), "district", calcDate); List orgThirdPoints = getThridpartPoint(thirdpartDetails); @@ -782,7 +782,7 @@ public class DistrictSellCalculator implements Calculator thirdPoints = new ArrayList(); for(Integer p : orgThirdPoints) { - //根据不同的城市级别进行数据过滤 + //鏍规嵁涓嶅悓鐨勫煄甯傜骇鍒繘琛屾暟鎹繃婊� if (cityLevel <= 1) { if (cityBalanceValue > 0 && (p < cityBalanceValue / 10 || p > cityBalanceValue * 10)) { continue; @@ -790,28 +790,28 @@ public class DistrictSellCalculator implements Calculator 0 && (p < regionBalanceValue / 7 || p > regionBalanceValue * 7)) { continue; } - } else if (cityLevel == 2) {//二线城市 + } else if (cityLevel == 2) {//浜岀嚎鍩庡競 if (cityBalanceValue > 0 && (p < cityBalanceValue / 7.5 || p > cityBalanceValue * 7.5)) { continue; } if (regionBalanceValue > 0 && (p < regionBalanceValue / 5.5 || p > regionBalanceValue * 5.5)) { continue; } - } else if (cityLevel == 3) {//三线城市 + } else if (cityLevel == 3) {//涓夌嚎鍩庡競 if (cityBalanceValue > 0 && (p < cityBalanceValue / 6 || p > cityBalanceValue * 6)) { continue; } if (regionBalanceValue > 0 && (p < regionBalanceValue / 4 || p > regionBalanceValue * 4)) { continue; } - } else if (cityLevel == 4) {//四线城市 + } else if (cityLevel == 4) {//鍥涚嚎鍩庡競 if (cityBalanceValue > 0 && (p < cityBalanceValue / 4 || p > cityBalanceValue * 4)) { continue; } if (regionBalanceValue > 0 && (p < regionBalanceValue / 3 || p > regionBalanceValue * 3)) { continue; } - } else if (cityLevel == 5) {//五线城市 + } else if (cityLevel == 5) {//浜旂嚎鍩庡競 if (cityBalanceValue > 0 && (p < cityBalanceValue / 3.5 || p > cityBalanceValue * 3.5)) { continue; } @@ -827,7 +827,7 @@ public class DistrictSellCalculator implements Calculator dealPoints, Date calcDate) { - double c1 = ownSampleAmountCredit(dealPoints, Constants.SELL_POINT_FETCH_COUNT) / 2.0;// 最高分0.05 - double c2 = ownSampleQualityCredit(dealPoints, calcDate, Constants.SELL_POINT_FETCH_COUNT) / 2.0;// 最高分0.05 + double c1 = ownSampleAmountCredit(dealPoints, Constants.SELL_POINT_FETCH_COUNT) / 2.0;// 鏈�楂樺垎0.05 + double c2 = ownSampleQualityCredit(dealPoints, calcDate, Constants.SELL_POINT_FETCH_COUNT) / 2.0;// 鏈�楂樺垎0.05 return Constants.CALC_THIRD_BASE_CREDIT + (c1 + c2); } /** - * 数量得分(最高得分0.1) + * 鏁伴噺寰楀垎(鏈�楂樺緱鍒�0.1) * * @param points * @return @@ -1020,14 +1020,14 @@ public class DistrictSellCalculator implements Calculator 0.1 ? 0.1 : c1); return c1; } /** - * 质量得分(最高得分0.1) + * 璐ㄩ噺寰楀垎(鏈�楂樺緱鍒�0.1) * * @param points * @return @@ -1043,21 +1043,21 @@ public class DistrictSellCalculator implements Calculator thirdPoints, double amountCredit, double qualityCredit) { - if (thirdPoints == null || thirdPoints.size() == 0) {// 如果没有第三方,则忽略这次投票 + if (thirdPoints == null || thirdPoints.size() == 0) {// 濡傛灉娌℃湁绗笁鏂癸紝鍒欏拷鐣ヨ繖娆℃姇绁� return null; } - List ayes = new ArrayList(); // 支持者 - List nays = new ArrayList(); // 反对者 + List ayes = new ArrayList(); // 鏀寔鑰� + List nays = new ArrayList(); // 鍙嶅鑰� for (Integer val : thirdPoints) { if (Math.abs((double) (value - val) / (double) value) < Constants.MAX_PERCENT_THIRD_DIFF) { @@ -1140,13 +1140,13 @@ public class DistrictSellCalculator implements Calculator - * 以最近一年只有(0.05*SELL_POINT_FETCH_COUNT)的自身房源计算的最低质量得分,作为借助于第三方的依据(一年的房源质量得分打7折) - * (等价于一个小区有5套房源,且距今全部为360天,如果房源得分低于这个值,那么会作为第三方价格介入的依据) + * 浠ユ渶杩戜竴骞村彧鏈�(0.05*SELL_POINT_FETCH_COUNT)鐨勮嚜韬埧婧愯绠楃殑鏈�浣庤川閲忓緱鍒嗭紝浣滀负鍊熷姪浜庣涓夋柟鐨勪緷鎹�(涓�骞寸殑鎴挎簮璐ㄩ噺寰楀垎鎵�7鎶�) + * (绛変环浜庝竴涓皬鍖烘湁5濂楁埧婧愶紝涓旇窛浠婂叏閮ㄤ负360澶╋紝濡傛灉鎴挎簮寰楀垎浣庝簬杩欎釜鍊硷紝閭d箞浼氫綔涓虹涓夋柟浠锋牸浠嬪叆鐨勪緷鎹�) * */ double meddleScore = (0.1d / Constants.SELL_POINT_FETCH_COUNT) * (Constants.SELL_POINT_FETCH_COUNT * 0.005d) * 0.7d; @@ -1154,56 +1154,56 @@ public class DistrictSellCalculator implements Calculator= 1.0) {// 获得了第三方价格的支持 + if (thirdPoints.size() == 1) {// 濡傛灉鍙湁1寮犻�夌エ + if (percOfAyes >= 1.0) {// 鑾峰緱浜嗙涓夋柟浠锋牸鐨勬敮鎸� isElected = true; } - double perc = (double) (100 + hashCode % 100) / 100.0 / 100.0; // 涨跌2.00%-5.00% + double perc = (double) (100 + hashCode % 100) / 100.0 / 100.0; // 娑ㄨ穼2.00%-5.00% if (thirdPoints.get(0) > value) { nval = (int) (value + value * perc); } else { nval = (int) (value - value * perc); } - } else if (thirdPoints.size() == 2 && percOfAyes <= 0) {// 只有2张,并且这2张票全部丢失 - if (qualityCredit < meddleScore) {// 质量得分是否低于第三方介入最低标准 + } else if (thirdPoints.size() == 2 && percOfAyes <= 0) {// 鍙湁2寮狅紝骞朵笖杩�2寮犵エ鍏ㄩ儴涓㈠け + if (qualityCredit < meddleScore) {// 璐ㄩ噺寰楀垎鏄惁浣庝簬绗笁鏂逛粙鍏ユ渶浣庢爣鍑� double dp = (double) (nays.get(0) - nays.get(1)) / (double) nays.get(0); - if (Math.abs(dp) <= Constants.MAX_PERCENT_THIRD_DIFF) {// 判断这两票的意见是否一致 - nval = (nays.get(0) + nays.get(1)) / 2; // 意见基本一致的话,直接采用这两个价格的平均值 + if (Math.abs(dp) <= Constants.MAX_PERCENT_THIRD_DIFF) {// 鍒ゆ柇杩欎袱绁ㄧ殑鎰忚鏄惁涓�鑷� + nval = (nays.get(0) + nays.get(1)) / 2; // 鎰忚鍩烘湰涓�鑷寸殑璇濓紝鐩存帴閲囩敤杩欎袱涓环鏍肩殑骞冲潎鍊� } } - } else if (thirdPoints.size() == 2 && percOfAyes >= 1.0) {// 只有2张,并且这2张票全部支持 - isElected = true; // 获得了第三方价格的支持 - double perc = (double) (200 + hashCode % 300) / 100.0 / 100.0; // 涨跌2.00%-5.00% - if (isSmallest(ayes, value)) {// 小于所有支持者,适当上调 + } else if (thirdPoints.size() == 2 && percOfAyes >= 1.0) {// 鍙湁2寮狅紝骞朵笖杩�2寮犵エ鍏ㄩ儴鏀寔 + isElected = true; // 鑾峰緱浜嗙涓夋柟浠锋牸鐨勬敮鎸� + double perc = (double) (200 + hashCode % 300) / 100.0 / 100.0; // 娑ㄨ穼2.00%-5.00% + if (isSmallest(ayes, value)) {// 灏忎簬鎵�鏈夋敮鎸佽�咃紝閫傚綋涓婅皟 nval = (int) (value + value * perc); - } else if (isBiggest(ayes, value)) {// 大于所有支持者,适当下调 + } else if (isBiggest(ayes, value)) {// 澶т簬鎵�鏈夋敮鎸佽�咃紝閫傚綋涓嬭皟 nval = (int) (value - value * perc); } } else if (thirdPoints.size() == 3) { - if (percOfAyes >= 0.33) {//如果3个中有1个支持,那么就会大于33% + if (percOfAyes >= 0.33) {//濡傛灉3涓腑鏈�1涓敮鎸侊紝閭d箞灏变細澶т簬33% } else { - if (qualityCredit < meddleScore) {// 质量得分是否低于第三方介入最低标准 - if (pointSimilarityScorer(nays) > 0.7) {// 判断这些反对者,是否意见保持一致 + if (qualityCredit < meddleScore) {// 璐ㄩ噺寰楀垎鏄惁浣庝簬绗笁鏂逛粙鍏ユ渶浣庢爣鍑� + if (pointSimilarityScorer(nays) > 0.7) {// 鍒ゆ柇杩欎簺鍙嶅鑰咃紝鏄惁鎰忚淇濇寔涓�鑷� nval = getMeanvalue(nays, true); } } } - } else {// 总票数>=3票 - if (percOfAyes <= 0.1) {// 得票率太低<=0.1,说明绝大部分第三方价格与计算值差异较大 + } else {// 鎬荤エ鏁�>=3绁� + if (percOfAyes <= 0.1) {// 寰楃エ鐜囧お浣�<=0.1,璇存槑缁濆ぇ閮ㄥ垎绗笁鏂逛环鏍间笌璁$畻鍊煎樊寮傝緝澶� nval = getMeanvalue(thirdPoints, true); - } else if (percOfAyes >= 0.5) {// 得票率过半>=0.5,则信任计算值,仅仅做必要的微调 - isElected = true; // 获得了第三方价格的支持 - double perc = (double) (200 + hashCode % 300) / 100.0 / 100.0; // 涨跌2.00%-5.00% - if (isSmallest(ayes, value)) {// 小于所有支持者,适当上调 + } else if (percOfAyes >= 0.5) {// 寰楃エ鐜囪繃鍗�>=0.5锛屽垯淇′换璁$畻鍊硷紝浠呬粎鍋氬繀瑕佺殑寰皟 + isElected = true; // 鑾峰緱浜嗙涓夋柟浠锋牸鐨勬敮鎸� + double perc = (double) (200 + hashCode % 300) / 100.0 / 100.0; // 娑ㄨ穼2.00%-5.00% + if (isSmallest(ayes, value)) {// 灏忎簬鎵�鏈夋敮鎸佽�咃紝閫傚綋涓婅皟 nval = (int) (value + value * perc); - } else if (isBiggest(ayes, value)) {// 大于所有支持者,适当下调 + } else if (isBiggest(ayes, value)) {// 澶т簬鎵�鏈夋敮鎸佽�咃紝閫傚綋涓嬭皟 nval = (int) (value - value * perc); } - } else {// 0.1<得票率<0.5,说明超过半数的第三方价格与计算值差异较大 - if (qualityCredit < meddleScore) {// 质量得分是否低于第三方介入最低标准 - if (pointSimilarityScorer(nays) > 0.7) {// 判断这些反对者,是否意见保持一致 + } else {// 0.1<寰楃エ鐜�<0.5,璇存槑瓒呰繃鍗婃暟鐨勭涓夋柟浠锋牸涓庤绠楀�煎樊寮傝緝澶� + if (qualityCredit < meddleScore) {// 璐ㄩ噺寰楀垎鏄惁浣庝簬绗笁鏂逛粙鍏ユ渶浣庢爣鍑� + if (pointSimilarityScorer(nays) > 0.7) {// 鍒ゆ柇杩欎簺鍙嶅鑰咃紝鏄惁鎰忚淇濇寔涓�鑷� nval = getMeanvalue(nays, true); } } @@ -1221,7 +1221,7 @@ public class DistrictSellCalculator implements Calculator a = new ArrayList(); // 支持者 - List n = new ArrayList(); // 反对者 + List a = new ArrayList(); // 鏀寔鑰� + List n = new ArrayList(); // 鍙嶅鑰� for (Integer val : list) { if (Math.abs((double) (mv - val) / (double) mv) < Constants.MAX_PERCENT_THIRD_DIFF) { a.add(val); @@ -1274,11 +1274,11 @@ public class DistrictSellCalculator implements Calculator list, double maxDiffPercent) { @@ -1318,11 +1318,11 @@ public class DistrictSellCalculator implements Calculator list, boolean isExtremal) { @@ -1356,15 +1356,15 @@ public class DistrictSellCalculator implements Calculator alls; // 全部票数 - private final List ayes; // 赞成票 - private final List nays; // 反对票 + private final List alls; // 鍏ㄩ儴绁ㄦ暟 + private final List ayes; // 璧炴垚绁� + private final List nays; // 鍙嶅绁� public VotingResult(List alls, List ayes, List nays) { this.alls = alls; @@ -1394,14 +1394,14 @@ public class DistrictSellCalculator implements Calculator clonePoints = new ArrayList(); - //网站权重设置 + //缃戠珯鏉冮噸璁剧疆 for (DistrictSellPoint dsp : points) { if(dsp instanceof DistrictSellPoint) { String site = DataUtil.urlToSiteName(((DistrictSellPoint)dsp).getUrl()); @@ -1446,7 +1446,7 @@ public class DistrictSellCalculator implements Calculator sames = new ArrayList(); for (DistrictSellPoint p : clonePoints) { @@ -1458,7 +1458,7 @@ public class DistrictSellCalculator implements Calculator ret = new ArrayList(); int cityLevel = serverAreaDao.getCityLevel(k.getCity()); - //最近一个月城市和区域的平均均价 + //鏈�杩戜竴涓湀鍩庡競鍜屽尯鍩熺殑骞冲潎鍧囦环 int cityBalanceValue = regionStatService.findRegionStatBalanceValue(k.getCity(), null, null, calcDate, DateUtil.getBeforeDay(calcDate, 31)); int regionBalanceValue = regionStatService.findRegionStatBalanceValue(k.getCity(), k.getRegion(), null, calcDate, DateUtil.getBeforeDay(calcDate, 31)); - //样本需要通过城市均价进行涨跌的天数限制 + //鏍锋湰闇�瑕侀�氳繃鍩庡競鍧囦环杩涜娑ㄨ穼鐨勫ぉ鏁伴檺鍒� int uncomforableSampleDay = districtSellConfigProvider.getUncomforableSampleDay(k.getCity(), k.getRegion(), k.getName()); LOGGER.error("UNCOMFORABLE_SAMPLE_DAY:" + uncomforableSampleDay); - //时间权重设置 + //鏃堕棿鏉冮噸璁剧疆 for (DistrictSellPoint dsp : clonePoints) { int val = dsp.getValue(); - // 一年之外的样本按照城市均价进行涨跌 + // 涓�骞翠箣澶栫殑鏍锋湰鎸夌収鍩庡競鍧囦环杩涜娑ㄨ穼 if(Math.abs(calcDate.getTime() - dsp.getDate().getTime()) > uncomforableSampleDay * DAY_MILLS) { double yearMarkup = getYearMarkup(k.getCity(),k.getRegion(), dsp.getDate(), calcDate); val = (int) (dsp.getValue() + dsp.getValue() * yearMarkup); @@ -1498,28 +1498,28 @@ public class DistrictSellCalculator implements Calculator 0 && (val < cityBalanceValue / 10 || val > cityBalanceValue * 10)) { continue; } - }else if(cityLevel == 2) {//二线城市 + }else if(cityLevel == 2) {//浜岀嚎鍩庡競 if (cityBalanceValue > 0 && (val < cityBalanceValue / 7.5 || val > cityBalanceValue * 7.5)) { continue; } if (regionBalanceValue > 0 && (val < regionBalanceValue / 5.5 || val > regionBalanceValue * 5.5)) { continue; } - }else if(cityLevel == 3) {//三线城市 + }else if(cityLevel == 3) {//涓夌嚎鍩庡競 if (cityBalanceValue > 0 && (val < cityBalanceValue / 6 || val > cityBalanceValue * 6)) { continue; } if (regionBalanceValue > 0 && (val < regionBalanceValue / 4 || val > regionBalanceValue * 4)) { continue; } - }else if(cityLevel == 4) {//四线城市 + }else if(cityLevel == 4) {//鍥涚嚎鍩庡競 if (cityBalanceValue > 0 && (val < cityBalanceValue / 4 || val > cityBalanceValue * 4)) { continue; } if (regionBalanceValue > 0 && (val < regionBalanceValue / 3 || val > regionBalanceValue * 3)) { continue; } - }else if(cityLevel == 5) {//五线城市 + }else if(cityLevel == 5) {//浜旂嚎鍩庡競 if (cityBalanceValue > 0 && (val < cityBalanceValue / 3.5 || val > cityBalanceValue * 3.5)) { continue; } @@ -1530,13 +1530,13 @@ public class DistrictSellCalculator implements Calculator 0) { int randCode = AveragerUtil.makeHashCode(k, dsp.getDate(), FangjiaCalcEnum.SELL); for (int i = 0; i < weightValue; i++) { dsp.setValue(val + (randCode % (i + 6))); - ret.add(dsp);//随机产生一个和原始值差不多的数字 + ret.add(dsp);//闅忔満浜х敓涓�涓拰鍘熷鍊煎樊涓嶅鐨勬暟瀛� } } } diff --git a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/district/DistrictSellOperator.java b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/district/DistrictSellOperator.java index 329eed5c3..f6c4bf624 100644 --- a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/district/DistrictSellOperator.java +++ b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/district/DistrictSellOperator.java @@ -20,7 +20,7 @@ import org.slf4j.LoggerFactory; import java.util.Date; /** - * 小区二手房均价结算结果处理实现 + * 灏忓尯浜屾墜鎴垮潎浠风粨绠楃粨鏋滃鐞嗗疄鐜� * * @author xiaoyu * @@ -34,17 +34,17 @@ public class DistrictSellOperator implements Operator - * 如果假定最近计算的价格更加准确的话,那么calc_district_stat中的数据应该是相对准确,而district_stat中的数据相对平稳 - * 建议在做走势图的时候使用district_stat表中的数据,而估价或者数据调查时使用calc_district_stat中的数据 + * 濡傛灉鍋囧畾鏈�杩戣绠楃殑浠锋牸鏇村姞鍑嗙‘鐨勮瘽锛岄偅涔坈alc_district_stat涓殑鏁版嵁搴旇鏄浉瀵瑰噯纭紝鑰宒istrict_stat涓殑鏁版嵁鐩稿骞崇ǔ + * 寤鸿鍦ㄥ仛璧板娍鍥剧殑鏃跺�欎娇鐢╠istrict_stat琛ㄤ腑鐨勬暟鎹紝鑰屼及浠锋垨鑰呮暟鎹皟鏌ユ椂浣跨敤calc_district_stat涓殑鏁版嵁 * - * 这两张表的主要区别如下: - * 1.district_stat中的estate_type值"小区"等同于"普通住宅"(最新定义为"普通住宅","别墅") - * 2.district_stat有周涨跌幅(weekend_markup),calc_district_stat没有 - * 3.calc_district_stat中保存有该小区均价计算时的关键信息。如:guiding_map,around_object_count等 - * 4.calc_district_stat保存的是原始的计算数据,可能会有忽高忽低的情况;而district_stat会对每个计算点的值进行涨跌控制,以保证走势的平稳。 + * 杩欎袱寮犺〃鐨勪富瑕佸尯鍒涓�: + * 1.district_stat涓殑estate_type鍊�"灏忓尯"绛夊悓浜�"鏅�氫綇瀹�"(鏈�鏂板畾涔変负"鏅�氫綇瀹�","鍒") + * 2.district_stat鏈夊懆娑ㄨ穼骞�(weekend_markup),calc_district_stat娌℃湁 + * 3.calc_district_stat涓繚瀛樻湁璇ュ皬鍖哄潎浠疯绠楁椂鐨勫叧閿俊鎭�傚:guiding_map,around_object_count绛� + * 4.calc_district_stat淇濆瓨鐨勬槸鍘熷鐨勮绠楁暟鎹紝鍙兘浼氭湁蹇介珮蹇戒綆鐨勬儏鍐碉紱鑰宒istrict_stat浼氬姣忎釜璁$畻鐐圭殑鍊艰繘琛屾定璺屾帶鍒讹紝浠ヤ繚璇佽蛋鍔跨殑骞崇ǔ銆� * * * @@ -60,7 +60,7 @@ public class DistrictSellOperator implements Operator -1) { - estateType = "别墅"; + if (estateType.indexOf("鍒") > -1) { + estateType = "鍒"; } else { - estateType = "小区"; + estateType = "灏忓尯"; } DBObject q = new BasicDBObject(); @@ -105,15 +105,15 @@ public class DistrictSellOperator implements Operator= 0 ? 1 : // -1); @@ -258,19 +258,19 @@ public class DistrictSellOperator implements Operator (avgMarkup + avgMarkup * 2)) { // return false; // } diff --git a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/district/DistrictSellPoint.java b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/district/DistrictSellPoint.java index 1934bd448..d649617fd 100644 --- a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/district/DistrictSellPoint.java +++ b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/district/DistrictSellPoint.java @@ -6,7 +6,7 @@ import com.fangjia.analysis.core.Point; import org.apache.commons.lang.StringUtils; /** - * 二手房原始数据点 + * 浜屾墜鎴垮師濮嬫暟鎹偣 * * @author xiaoyu */ @@ -133,18 +133,18 @@ public class DistrictSellPoint implements Point, Cloneable { this.url = url; } - public static final String[] TAGS = {"独栋", "联排", "叠加", "双拼", "花园面积", "泳池", "别墅", "带花园"}; + public static final String[] TAGS = {"鐙爧", "鑱旀帓", "鍙犲姞", "鍙屾嫾", "鑺卞洯闈㈢Н", "娉虫睜", "鍒", "甯﹁姳鍥�"}; /** - * 是否是普通住宅 + * 鏄惁鏄櫘閫氫綇瀹� * @return */ public boolean isDistrict() { - return !isVilla(); //只要不是别墅,就判定为普通住宅 + return !isVilla(); //鍙涓嶆槸鍒锛屽氨鍒ゅ畾涓烘櫘閫氫綇瀹� } /** - * 是否是别墅 + * 鏄惁鏄埆澧� * @return */ public boolean isVilla() { diff --git a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/district/DistrictSellProvider.java b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/district/DistrictSellProvider.java index 1e7745689..9464da180 100644 --- a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/district/DistrictSellProvider.java +++ b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/district/DistrictSellProvider.java @@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory; import java.util.*; /** - * 小区二手房均价数据提供者实现 + * 灏忓尯浜屾墜鎴垮潎浠锋暟鎹彁渚涜�呭疄鐜� * * @author xiaoyu */ @@ -83,7 +83,7 @@ public class DistrictSellProvider implements Provider -1 ? Seaweed.EstateTypeEnum.VILLA : Seaweed.EstateTypeEnum.DISTRICT); + Seaweed.EstateTypeEnum masterEstate = (masterSeaweed.getEstateType2().indexOf("鍒") > -1 ? Seaweed.EstateTypeEnum.VILLA : Seaweed.EstateTypeEnum.DISTRICT); if(!masterEstate.equals(k.getEstateTypeEnum())) { List subpoints = DistrictSellProvider.getInstance().doFetch( new DistrictKey(masterSeaweed.getCity(), masterSeaweed.getRegion(), masterSeaweed.getName(), k.getEstateTypeEnum()), lineDate, isCaseReigon, true, true); @@ -103,13 +103,13 @@ public class DistrictSellProvider implements Provider doFetch(DistrictKey districtKey, Date calcDate, boolean isCaseRegion, boolean isUseRegionAlias, boolean isUseAlias) { @@ -125,7 +125,7 @@ public class DistrictSellProvider implements Provider seawaterList = null; if(!isCaseRegion) { seawaterList = seawaterDao.findAll(query, new BasicDBObject("p_date", -1), 0, fetchCount, FIELDS); @@ -165,7 +165,7 @@ public class DistrictSellProvider implements Provider convertSeawaterToDistrictSellPoint(DistrictKey districtKey, Date calcDate, List seawaterList) { AbstractConfigProvider.Range sampleValueRange = DistrictSellConfigProvider.getInstance().getSampleValueRange(districtKey.getCity(), districtKey.getRegion(), districtKey.getName()); int cityLevel = serverAreaDao.getCityLevel(districtKey.getCity()); - //最近一个月城市和区域的平均均价 + //鏈�杩戜竴涓湀鍩庡競鍜屽尯鍩熺殑骞冲潎鍧囦环 int cityBalanceValue = regionStatService.findRegionStatBalanceValue(districtKey.getCity(), null, null, calcDate, DateUtil.getBeforeDay(calcDate, 31)); int regionBalanceValue = regionStatService.findRegionStatBalanceValue(districtKey.getCity(), districtKey.getRegion(), null, calcDate, DateUtil.getBeforeDay(calcDate, 31)); int districtBalanceValue = districtStatService.findAroundDistrictStat(districtKey, 500, calcDate); Integer thirdSitePrice = averageStatisticsDao.findThirdpartsGuidePrice(districtKey.getCity(), districtKey.getRegion(), districtKey.getName(), "district", DateUtil.getBeforeDay(calcDate, 31)); List ret = new ArrayList(); - /**被第三方均价过滤的点*/ + /**琚涓夋柟鍧囦环杩囨护鐨勭偣*/ List thirdSiteNameUnapprovedPoints = new ArrayList(); - /**别墅样本*/ + /**鍒鏍锋湰*/ List villaPoints = new ArrayList(); - /**小区样本*/ + /**灏忓尯鏍锋湰*/ List districtPoints = new ArrayList(); Set keys = new HashSet(); for (Seawater sw : seawaterList) { - //去除明显异常的数据 + //鍘婚櫎鏄庢樉寮傚父鐨勬暟鎹� if (!isValidData(sw)) { continue; } @@ -200,14 +200,14 @@ public class DistrictSellProvider implements Provider sampleValueRange.getRight().intValue()) { LOGGER.debug("miss left:" + sampleValueRange.getLeft().intValue() + "mis:right:" + sampleValueRange.getRight().intValue() + "-->" + avgPrice); continue; } ThreadLocalContainer.getInstance().put("sampleValueRange", sampleValueRange.getLeft() + "-" + sampleValueRange.getRight()); - //根据不同的城市级别进行数据过滤 + //鏍规嵁涓嶅悓鐨勫煄甯傜骇鍒繘琛屾暟鎹繃婊� if(cityLevel <= 1) { if (cityBalanceValue > 0 && (avgPrice < cityBalanceValue / 10 || avgPrice > cityBalanceValue * 10)) { LOGGER.debug("miss cityBalanceValue:" + cityBalanceValue ); @@ -217,28 +217,28 @@ public class DistrictSellProvider implements Provider 0 && (avgPrice < cityBalanceValue / 7.5 || avgPrice > cityBalanceValue * 7.5)) { continue; } if (regionBalanceValue > 0 && (avgPrice < regionBalanceValue / 5.5 || avgPrice > regionBalanceValue * 5.5)) { continue; } - }else if(cityLevel == 3) {//三线城市 + }else if(cityLevel == 3) {//涓夌嚎鍩庡競 if (cityBalanceValue > 0 && (avgPrice < cityBalanceValue / 6 || avgPrice > cityBalanceValue * 6)) { continue; } if (regionBalanceValue > 0 && (avgPrice < regionBalanceValue / 4 || avgPrice > regionBalanceValue * 4)) { continue; } - }else if(cityLevel == 4) {//四线城市 + }else if(cityLevel == 4) {//鍥涚嚎鍩庡競 if (cityBalanceValue > 0 && (avgPrice < cityBalanceValue / 4 || avgPrice > cityBalanceValue * 4)) { continue; } if (regionBalanceValue > 0 && (avgPrice < regionBalanceValue / 3 || avgPrice > regionBalanceValue * 3)) { continue; } - }else if(cityLevel == 5) {//五线城市 + }else if(cityLevel == 5) {//浜旂嚎鍩庡競 if (cityBalanceValue > 0 && (avgPrice < cityBalanceValue / 3.5 || avgPrice > cityBalanceValue * 3.5)) { continue; } @@ -276,7 +276,7 @@ public class DistrictSellProvider implements Provider 0 && thirdSiteNameUnapprovedPoints.size()/(double)seawaterList.size() > 0.2){ for(DistrictSellPoint dsp : thirdSiteNameUnapprovedPoints){ if(dsp.isVilla()){ @@ -301,7 +301,7 @@ public class DistrictSellProvider implements Provider namesList = new LinkedHashSet(); namesList.add(inputName); - //是否使用别名 + //鏄惁浣跨敤鍒悕 if (isUseAlias) { Seaweed district = districtService.findByPrimaryKey(inputCity, inputRegion, inputName); if (district != null && district.getAlias() != null) { @@ -329,7 +329,7 @@ public class DistrictSellProvider implements Provider regionsList = new LinkedHashSet(); regionsList.add(inputRegion); - //只有进行区域区分,才可以使用区域别名 + //鍙湁杩涜鍖哄煙鍖哄垎锛屾墠鍙互浣跨敤鍖哄煙鍒悕 if (isCaseRegion && isUseRegionAlias) { RegionBlock regionBlock = regionBlockDao.findRegion(inputCity, inputRegion); if (regionBlock != null && regionBlock.getPattern() != null) { @@ -384,7 +384,7 @@ public class DistrictSellProvider implements Provider> thirdpartDetails; - private Integer aroundObjectCount; // 周边对象数量 - private Integer aroundSampleCount; // 周边样本数量 - private Integer aroundMinDistance; // 最近对象距离 - private Integer aroundMaxDistance; // 最远对象距离 - private Map guidingMap; // 指导价 + private Integer aroundObjectCount; // 鍛ㄨ竟瀵硅薄鏁伴噺 + private Integer aroundSampleCount; // 鍛ㄨ竟鏍锋湰鏁伴噺 + private Integer aroundMinDistance; // 鏈�杩戝璞¤窛绂� + private Integer aroundMaxDistance; // 鏈�杩滃璞¤窛绂� + private Map guidingMap; // 鎸囧浠� private Map sampleDetailMap; @@ -38,20 +38,20 @@ public class DistrictSellResult implements Result { private Map tmpMap2; /** - * 均价计算类型 + * 鍧囦环璁$畻绫诲瀷 * * @author dxy * */ public enum ValueTypeEnum { - GUIDING(1, "指导价"), // - OWN(2, "自身样本"), // - THIRD(3, "第三方"), // - DEAL(4, "交易数据"), // - AROUND(5, "周边楼盘"), // - DERI(6, "推导"), // - DEDU(7, "周边推算"), // - NOWAY(10, "无方式"), // + GUIDING(1, "鎸囧浠�"), // + OWN(2, "鑷韩鏍锋湰"), // + THIRD(3, "绗笁鏂�"), // + DEAL(4, "浜ゆ槗鏁版嵁"), // + AROUND(5, "鍛ㄨ竟妤肩洏"), // + DERI(6, "鎺ㄥ"), // + DEDU(7, "鍛ㄨ竟鎺ㄧ畻"), // + NOWAY(10, "鏃犳柟寮�"), // ; private final int type; diff --git a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/district/Test.java b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/district/Test.java index 26b1b873a..9af262821 100644 --- a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/district/Test.java +++ b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/sell/district/Test.java @@ -36,10 +36,10 @@ public class Test { private void test() throws CalcException, FetchException { DBObject q = new BasicDBObject(); - q.put("city", "北京"); + q.put("city", "鍖椾含"); q.put("visible", 0); q.put("cat", "district"); - q.put("name", "公安小区"); + q.put("name", "鍏畨灏忓尯"); Iterator iter = seaweedDao.iteratorAll(q, new String[]{"_id", "city", "region", "name", "estate_type2"}); DistrictSellCalculator calculator = new DistrictSellCalculator(); int c = 0; @@ -63,7 +63,7 @@ public class Test { // private void test222() throws CalcException, FetchException { // DBObject q = new BasicDBObject(); -// q.put("city", "上海"); +// q.put("city", "涓婃捣"); // q.put("visible", 0); // q.put("cat", "district"); // Iterator iter = seaweedDao.iteratorAll(q, new String[]{"_id", "city", "region", "name", "estate_type2"}); diff --git a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/service/AbstractConfigProvider.java b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/service/AbstractConfigProvider.java index 7d1de1ce9..43f8d3a49 100644 --- a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/service/AbstractConfigProvider.java +++ b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/service/AbstractConfigProvider.java @@ -15,7 +15,7 @@ import java.util.List; import java.util.Map; /** - * 均价调整系数提供者 + * 鍧囦环璋冩暣绯绘暟鎻愪緵鑰� */ public abstract class AbstractConfigProvider { private final Map CONFIGS_MAP = new HashMap(); @@ -71,7 +71,7 @@ public abstract class AbstractConfigProvider { } /** - * 范围对象 + * 鑼冨洿瀵硅薄 */ public class Range { private Number left; diff --git a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/service/CalcCommandService.java b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/service/CalcCommandService.java index 114bd95fa..5df44615f 100644 --- a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/service/CalcCommandService.java +++ b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/service/CalcCommandService.java @@ -27,12 +27,12 @@ public class CalcCommandService { } public void updateToFail(String id) { - //无法计算的指令直接删除 + //鏃犳硶璁$畻鐨勬寚浠ょ洿鎺ュ垹闄� calcCommandDao.deleteById(id); } public void updateToSuc(String id) { - //处理成功的指令直接删除 + //澶勭悊鎴愬姛鐨勬寚浠ょ洿鎺ュ垹闄� calcCommandDao.deleteById(id); } diff --git a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/service/DistrictSellConfigProvider.java b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/service/DistrictSellConfigProvider.java index eb541994b..c626bc8b0 100644 --- a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/service/DistrictSellConfigProvider.java +++ b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/service/DistrictSellConfigProvider.java @@ -12,7 +12,7 @@ import org.slf4j.LoggerFactory; import java.util.*; /** - * 二手房均价系数调整 + * 浜屾墜鎴垮潎浠风郴鏁拌皟鏁� */ public class DistrictSellConfigProvider extends AbstractConfigProvider { @@ -36,7 +36,7 @@ public class DistrictSellConfigProvider extends AbstractConfigProvider { /** - * 样本获取数量 + * 鏍锋湰鑾峰彇鏁伴噺 * * @param city * @param region @@ -64,7 +64,7 @@ public class DistrictSellConfigProvider extends AbstractConfigProvider { /** - * 样本取值范围 + * 鏍锋湰鍙栧�艰寖鍥� * * @param city * @param region @@ -111,7 +111,7 @@ public class DistrictSellConfigProvider extends AbstractConfigProvider { } /** - * 自身计算的最低样本数量要求 + * 鑷韩璁$畻鐨勬渶浣庢牱鏈暟閲忚姹� * * @param city * @param region @@ -137,7 +137,7 @@ public class DistrictSellConfigProvider extends AbstractConfigProvider { } /** - * 样本有序队列的取值区间 + * 鏍锋湰鏈夊簭闃熷垪鐨勫彇鍊煎尯闂� * * @param city * @param region @@ -184,7 +184,7 @@ public class DistrictSellConfigProvider extends AbstractConfigProvider { /** - * 周边计算的最大半径 + * 鍛ㄨ竟璁$畻鐨勬渶澶у崐寰� * * @param city * @param region @@ -207,7 +207,7 @@ public class DistrictSellConfigProvider extends AbstractConfigProvider { } /** - * 周边计算采用的小区数量 + * 鍛ㄨ竟璁$畻閲囩敤鐨勫皬鍖烘暟閲� * * @param city * @param region @@ -230,11 +230,11 @@ public class DistrictSellConfigProvider extends AbstractConfigProvider { } /** - * 获取时间影响的权重值 + * 鑾峰彇鏃堕棿褰卞搷鐨勬潈閲嶅�� * * @param city * @param region - * @param diffTime 匹配 + * @param diffTime 鍖归厤 * @return */ public Integer getTimeWeights(String city, String region, String name, long diffTime) { @@ -242,7 +242,7 @@ public class DistrictSellConfigProvider extends AbstractConfigProvider { } /** - * 时间权重 + * 鏃堕棿鏉冮噸 * * @param city * @param region @@ -303,7 +303,7 @@ public class DistrictSellConfigProvider extends AbstractConfigProvider { } /** - * 价格强制调整系数 + * 浠锋牸寮哄埗璋冩暣绯绘暟 * * @param city * @param region @@ -328,7 +328,7 @@ public class DistrictSellConfigProvider extends AbstractConfigProvider { } /** - * 主小区影响从小区可信度衰减比例 + * 涓诲皬鍖哄奖鍝嶄粠灏忓尯鍙俊搴﹁“鍑忔瘮渚� * * @param city * @param region @@ -353,7 +353,7 @@ public class DistrictSellConfigProvider extends AbstractConfigProvider { } /** - * 是否把区域作为识别小区的必要条件 + * 鏄惁鎶婂尯鍩熶綔涓鸿瘑鍒皬鍖虹殑蹇呰鏉′欢 * * @return */ @@ -377,7 +377,7 @@ public class DistrictSellConfigProvider extends AbstractConfigProvider { } /** - * 获取网站权重 + * 鑾峰彇缃戠珯鏉冮噸 * * @param city * @param region @@ -403,7 +403,7 @@ public class DistrictSellConfigProvider extends AbstractConfigProvider { } /** - * 获取网站值的涨跌系数 + * 鑾峰彇缃戠珯鍊肩殑娑ㄨ穼绯绘暟 * * @param city * @param region @@ -430,12 +430,12 @@ public class DistrictSellConfigProvider extends AbstractConfigProvider { } /** - * 使用类簇的取值类型 + * 浣跨敤绫荤皣鐨勫彇鍊肩被鍨� * * @param city * @param region * @param name - * @return 0-默认 1-中位数 2-最大值 3-最小值 + * @return 0-榛樿 1-涓綅鏁� 2-鏈�澶у�� 3-鏈�灏忓�� */ public Integer getValueCluType(String city, String region, String name) { AveragerConfig averagerConfig = getAveragerConfig(city, region, name); @@ -454,7 +454,7 @@ public class DistrictSellConfigProvider extends AbstractConfigProvider { } /** - * 指导价的过期时间 + * 鎸囧浠风殑杩囨湡鏃堕棿 * * @param city * @param region @@ -479,7 +479,7 @@ public class DistrictSellConfigProvider extends AbstractConfigProvider { } /** - * 样本换算需要间隔时间 + * 鏍锋湰鎹㈢畻闇�瑕侀棿闅旀椂闂� * * @param city * @param region @@ -505,7 +505,7 @@ public class DistrictSellConfigProvider extends AbstractConfigProvider { /** - * 样本与周边对比的相差比例区间 + * 鏍锋湰涓庡懆杈瑰姣旂殑鐩稿樊姣斾緥鍖洪棿 * * @param city * @param region @@ -553,7 +553,7 @@ public class DistrictSellConfigProvider extends AbstractConfigProvider { } public static void main(String[] args) { - DistrictSellConfigProvider.getInstance().getTimeWeights("深圳", "福田", "嘉葆润金座", 89 * 24 * 3600 * 1000L); + DistrictSellConfigProvider.getInstance().getTimeWeights("娣卞湷", "绂忕敯", "鍢夎憜娑﹂噾搴�", 89 * 24 * 3600 * 1000L); } diff --git a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/service/DistrictService.java b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/service/DistrictService.java index 22e5516dc..30032bce3 100644 --- a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/service/DistrictService.java +++ b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/service/DistrictService.java @@ -18,7 +18,7 @@ import java.util.regex.Pattern; /** - * 小区查询 + * 灏忓尯鏌ヨ */ public class DistrictService { public static final String CATEGORY = Seaweed.CategoryEnum.DISTRICT.getCategory(); @@ -75,7 +75,7 @@ public class DistrictService { List nearestDistricts = findNearestDistrictWithCalcType(city, region, name, calcType, radiusMeters, limit); Map districtMap = new LinkedHashMap(); - if (year1 == null && year2 == null) {// 如果竣工时间和入住时间都不存在,则直接返回同类型的附近小区 + if (year1 == null && year2 == null) {// 濡傛灉绔e伐鏃堕棿鍜屽叆浣忔椂闂撮兘涓嶅瓨鍦紝鍒欑洿鎺ヨ繑鍥炲悓绫诲瀷鐨勯檮杩戝皬鍖� return new ArrayList(nearestDistricts); } else if (year1 != null && year2 == null) { for (Seaweed nd : nearestDistricts) { @@ -97,7 +97,7 @@ public class DistrictService { districtMap.put(nd.getId(), nd); } } - } else {// 如果竣工时间和入住时间都存在,则优先选择竣工时间 + } else {// 濡傛灉绔e伐鏃堕棿鍜屽叆浣忔椂闂撮兘瀛樺湪锛屽垯浼樺厛閫夋嫨绔e伐鏃堕棿 for (Seaweed nd : nearestDistricts) { Integer y = parseStringToYear(nd.getFinishBuildingDate()); if (y == null) { @@ -130,7 +130,7 @@ public class DistrictService { } /** - * 根据建筑年代获取周边相似的小区 + * 鏍规嵁寤虹瓚骞翠唬鑾峰彇鍛ㄨ竟鐩镐技鐨勫皬鍖� * * @param centerLng * @param centerLat @@ -219,7 +219,7 @@ public class DistrictService { public Seaweed findMasterDistrict(String city, String region, String name, String category) { Seaweed object = findByPrimaryKey(city, region, name); - //是一个小区的分期名称 + //鏄竴涓皬鍖虹殑鍒嗘湡鍚嶇О if(object != null && StringUtils.isNotBlank(object.getMasterDistrictName()) && !object.getMasterDistrictName().equals(name)) { Seaweed masterObject = findByPrimaryKey(city, region, object.getMasterDistrictName()); if(masterObject != null) { @@ -230,7 +230,7 @@ public class DistrictService { } /** - * 根据价格计算类型和指定小区,获取该小区半径之内的数据 + * 鏍规嵁浠锋牸璁$畻绫诲瀷鍜屾寚瀹氬皬鍖猴紝鑾峰彇璇ュ皬鍖哄崐寰勪箣鍐呯殑鏁版嵁 * * @param city * @param region @@ -267,7 +267,7 @@ public class DistrictService { } /** - * 获取指定小区半径之内的小区 + * 鑾峰彇鎸囧畾灏忓尯鍗婂緞涔嬪唴鐨勫皬鍖� * * @param city * @param region @@ -304,7 +304,7 @@ public class DistrictService { /** - * 获取指定经纬度半径之内的小区 + * 鑾峰彇鎸囧畾缁忕含搴﹀崐寰勪箣鍐呯殑灏忓尯 * * @param centerLng * @param centerLat @@ -317,7 +317,7 @@ public class DistrictService { } /** - * 获取给定条件下、给定经纬度半径之内的小区 + * 鑾峰彇缁欏畾鏉′欢涓嬨�佺粰瀹氱粡绾害鍗婂緞涔嬪唴鐨勫皬鍖� * @param fieldQuery * @param centerLng * @param centerLat @@ -341,7 +341,7 @@ public class DistrictService { return seaweedDao.findAll(q, limit); } - Pattern PATT = Pattern.compile(".*(\\d{4})[年\\-].*"); + Pattern PATT = Pattern.compile(".*(\\d{4})[骞碶\-].*"); private Integer parseStringToYear(String s) { if (s == null) { return null; diff --git a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/service/RegionStatService.java b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/service/RegionStatService.java index 9f7066d3d..2650b06e0 100644 --- a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/service/RegionStatService.java +++ b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/service/RegionStatService.java @@ -166,7 +166,7 @@ public class RegionStatService { return (int) CITY_STAT_CACHE2.size(); } /** - * 计算出城市所有价格的一个平均线 + * 璁$畻鍑哄煄甯傛墍鏈変环鏍肩殑涓�涓钩鍧囩嚎 * * @param city * @param region @@ -250,7 +250,7 @@ public class RegionStatService { /** - * 获取一段时间的平均均价 + * 鑾峰彇涓�娈垫椂闂寸殑骞冲潎鍧囦环 * * @param city * @param weekend @@ -305,7 +305,7 @@ public class RegionStatService { return (int) (tval / t); } - //查询所有城市均价数据 + //鏌ヨ鎵�鏈夊煄甯傚潎浠锋暟鎹� public List findCityAvgPriceData(String city ,Date weekend) { Map allCityRegionStatMap = new HashMap(); List bos = new ArrayList(); diff --git a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/service/ServerAreaService.java b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/service/ServerAreaService.java index 9638ee07d..ecfb498b9 100644 --- a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/service/ServerAreaService.java +++ b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/service/ServerAreaService.java @@ -14,7 +14,7 @@ public class ServerAreaService { return instance; } - //查询ServerAre + //鏌ヨServerAre public ServerArea getServerArea(String display) { ServerArea serverArea = ServerAreaDao.getInstance().findServerArea(display); return serverArea; diff --git a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/test/Test.java b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/test/Test.java index 0469ce70a..9376b5250 100644 --- a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/test/Test.java +++ b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/test/Test.java @@ -49,8 +49,8 @@ public class Test { // // } - RegionStatService.getInstance().findRegionStatBalanceValue("上海", "长宁", null, calcDate, DateUtil.getBeforeDay(calcDate, 35)); - RegionStatService.getInstance().findRegionStatBalanceValue("上海", "长宁", null, calcDate, DateUtil.getBeforeDay(calcDate, 43)); + RegionStatService.getInstance().findRegionStatBalanceValue("涓婃捣", "闀垮畞", null, calcDate, DateUtil.getBeforeDay(calcDate, 35)); + RegionStatService.getInstance().findRegionStatBalanceValue("涓婃捣", "闀垮畞", null, calcDate, DateUtil.getBeforeDay(calcDate, 43)); } @@ -103,7 +103,7 @@ public class Test { List nearestDistricts = findNearestDistrict(seaweedList, seaweed, radiusMeters); Map districtMap = new LinkedHashMap(); - if (year1 == null && year2 == null) {// 如果竣工时间和入住时间都不存在,则直接返回同类型的附近小区 + if (year1 == null && year2 == null) {// 濡傛灉绔e伐鏃堕棿鍜屽叆浣忔椂闂撮兘涓嶅瓨鍦紝鍒欑洿鎺ヨ繑鍥炲悓绫诲瀷鐨勯檮杩戝皬鍖� return new ArrayList(nearestDistricts); } else if (year1 != null && year2 == null) { for (Seaweed nd : nearestDistricts) { @@ -125,7 +125,7 @@ public class Test { districtMap.put(nd.getId(), nd); } } - } else {// 如果竣工时间和入住时间都存在,则优先选择竣工时间 + } else {// 濡傛灉绔e伐鏃堕棿鍜屽叆浣忔椂闂撮兘瀛樺湪锛屽垯浼樺厛閫夋嫨绔e伐鏃堕棿 for (Seaweed nd : nearestDistricts) { Integer y = parseStringToYear(nd.getFinishBuildingDate()); if (y == null) { @@ -233,7 +233,7 @@ public class Test { return ret; } - static Pattern PATT = Pattern.compile(".*(\\d{4})[年\\-].*"); + static Pattern PATT = Pattern.compile(".*(\\d{4})[骞碶\-].*"); private static Integer parseStringToYear(String s) { if (s == null) { @@ -306,9 +306,9 @@ public class Test { public static void maineer(String[] args) throws Exception { Test test = new Test(); - String city = "上海"; - String region = "松江"; - String name = "南场一村"; + String city = "涓婃捣"; + String region = "鏉炬睙"; + String name = "鍗楀満涓�鏉�"; DBObject basicQ = new BasicDBObject(); basicQ.put("city", city); @@ -322,9 +322,9 @@ public class Test { } public void process(String city, String region, double targetLng, double targetLat) { -// String city = "上海"; -// String region = "松江"; -// String name = "南场一村"; +// String city = "涓婃捣"; +// String region = "鏉炬睙"; +// String name = "鍗楀満涓�鏉�"; DBObject basicQ = new BasicDBObject(); basicQ.put("city", city); @@ -464,14 +464,14 @@ public class Test { private void process2() throws IOException, FetchException { - String city = "苏州"; + String city = "鑻忓窞"; Date endDate = DateUtil.truncateDay(new Date()); Date startDate = DateUtil.getBeforeDay(endDate, 45); Date calcDate = DateUtil.parseDate("2015-09-20", "yyyy-MM-dd"); DBObject q = new BasicDBObject("city", city).append("cat", "district").append("visible", 0); -// q.put("region", "吴中"); -// q.put("name", "月浜三村"); +// q.put("region", "鍚翠腑"); +// q.put("name", "鏈堟禍涓夋潙"); String[] fields = new String[]{"city", "region", "name", "estate_type2"}; Iterator iter = SeaweedDao.getInstance().iteratorAll(q, fields); int c = 0; diff --git a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/test/Test1.java b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/test/Test1.java index 5721811ee..1e383a0ad 100644 --- a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/test/Test1.java +++ b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/test/Test1.java @@ -60,13 +60,13 @@ public class Test1 { } public void task(){ - String city = "上海"; - List> datas = ExcelUtils.read("e:\\数据\\上海聚类样本.xlsx"); + String city = "涓婃捣"; + List> datas = ExcelUtils.read("e:\\鏁版嵁\\涓婃捣鑱氱被鏍锋湰.xlsx"); System.out.println(datas.size()); List districtKeys = findDistricts(city, datas); List> rets = findSamples(districtKeys); - writeExcel(rets, "e:\\数据\\上海聚类结果.xls"); + writeExcel(rets, "e:\\鏁版嵁\\涓婃捣鑱氱被缁撴灉.xls"); } @@ -110,7 +110,7 @@ public class Test1 { continue; } - //判断是否达到最低样本要求 + //鍒ゆ柇鏄惁杈惧埌鏈�浣庢牱鏈姹� if(sellPoints.size() < districtSellConfigProvider.getOwnTypeLimit(k.getCity(), k.getRegion(), k.getName())) { result.add(map); continue; @@ -118,9 +118,9 @@ public class Test1 { List points = calculator.processingPoint2(k, calcDate, sellPoints); - // 使均值往一端偏移 + // 浣垮潎鍊煎線涓�绔亸绉� if (points.size() > 10) { - //排序 + //鎺掑簭 Collections.sort(points,new Comparator(){ public int compare(DistrictSellPoint a, DistrictSellPoint b) { int one = a.getValue(); @@ -289,17 +289,17 @@ public class Test1 { private void writeExcel(List> rets, String path){ - // 第一步,创建一个webbook,对应一个Excel文件 + // 绗竴姝ワ紝鍒涘缓涓�涓獁ebbook锛屽搴斾竴涓狤xcel鏂囦欢 HSSFWorkbook wb = new HSSFWorkbook(); - // 第二步,在webbook中添加一个sheet,对应Excel文件中的sheet - HSSFSheet sheet = wb.createSheet("结果"); - // 第三步,在sheet中添加表头第0行,注意老版本poi对Excel的行数列数有限制short + // 绗簩姝ワ紝鍦╳ebbook涓坊鍔犱竴涓猻heet,瀵瑰簲Excel鏂囦欢涓殑sheet + HSSFSheet sheet = wb.createSheet("缁撴灉"); + // 绗笁姝ワ紝鍦╯heet涓坊鍔犺〃澶寸0琛�,娉ㄦ剰鑰佺増鏈琾oi瀵笶xcel鐨勮鏁板垪鏁版湁闄愬埗short HSSFRow row = sheet.createRow((int) 0); - // 第四步,创建单元格,并设置值表头 设置表头居中 + // 绗洓姝ワ紝鍒涘缓鍗曞厓鏍硷紝骞惰缃�艰〃澶� 璁剧疆琛ㄥご灞呬腑 HSSFCellStyle style = wb.createCellStyle(); - style.setAlignment(HSSFCellStyle.ALIGN_CENTER); // 创建一个居中格式 + style.setAlignment(HSSFCellStyle.ALIGN_CENTER); // 鍒涘缓涓�涓眳涓牸寮� - String[] columns ={"区域","名称","面积(最多)","0_60","61_80","81_100","101_120","121_150","151_1000"}; + String[] columns ={"鍖哄煙","鍚嶇О","闈㈢Н锛堟渶澶氾級","0_60","61_80","81_100","101_120","121_150","151_1000"}; for(int i=0;i regionBlocks = regionBlockDao.findRegions(city); List> ret = new ArrayList>(); @@ -401,7 +401,7 @@ public class Test1 { ret.add(map); } - writeExcel2(ret, "e:\\数据\\上海区域租售比.xls"); + writeExcel2(ret, "e:\\鏁版嵁\\涓婃捣鍖哄煙绉熷敭姣�.xls"); } @@ -409,12 +409,12 @@ public class Test1 { private void writeExcel2(List> rets, String path){ HSSFWorkbook wb = new HSSFWorkbook(); - HSSFSheet sheet = wb.createSheet("结果"); + HSSFSheet sheet = wb.createSheet("缁撴灉"); HSSFRow row = sheet.createRow((int) 0); HSSFCellStyle style = wb.createCellStyle(); - style.setAlignment(HSSFCellStyle.ALIGN_CENTER); // 创建一个居中格式 + style.setAlignment(HSSFCellStyle.ALIGN_CENTER); // 鍒涘缓涓�涓眳涓牸寮� - String[] columns ={"城市","区域","均价","平米租金","租售比"}; + String[] columns ={"鍩庡競","鍖哄煙","鍧囦环","骞崇背绉熼噾","绉熷敭姣�"}; for(int i=0;i list = new ArrayList(); - // 如果第一个聚类超过一半,就使用这个聚类 + // 濡傛灉绗竴涓仛绫昏秴杩囦竴鍗婏紝灏变娇鐢ㄨ繖涓仛绫� if (cluters[0].length >= sampleSize * 0.5) { for (int i = 0; i < cluters[0].length; i++) { list.add(cluters[0][i]); @@ -63,7 +63,7 @@ public final class Cluster { } } - // 如果有两个以上的聚簇,并且第二个聚簇的占比超过35%,说明改聚类有较大的分歧,所以需要把第二聚簇作为次要值考虑 + // 濡傛灉鏈変袱涓互涓婄殑鑱氱皣锛屽苟涓旂浜屼釜鑱氱皣鐨勫崰姣旇秴杩�35%锛岃鏄庢敼鑱氱被鏈夎緝澶х殑鍒嗘锛屾墍浠ラ渶瑕佹妸绗簩鑱氱皣浣滀负娆¤鍊艰�冭檻 if (cluters.length >= 2) { if (cluters[1].length >= sampleSize * 0.35) { long stc = 0; @@ -111,7 +111,7 @@ public final class Cluster { /** - * 参与聚类的样本量 + * 鍙備笌鑱氱被鐨勬牱鏈噺 * * @return */ @@ -120,7 +120,7 @@ public final class Cluster { } /** - * 主要类簇的值的加权平均 + * 涓昏绫荤皣鐨勫�肩殑鍔犳潈骞冲潎 * * @return */ @@ -129,7 +129,7 @@ public final class Cluster { } /** - * 所有点加权平均 + * 鎵�鏈夌偣鍔犳潈骞冲潎 * * @return */ @@ -138,7 +138,7 @@ public final class Cluster { } /** - * 聚类详细数据 + * 鑱氱被璇︾粏鏁版嵁 * * @return */ @@ -147,7 +147,7 @@ public final class Cluster { } /** - * 最大类簇的中位数 + * 鏈�澶х被绨囩殑涓綅鏁� * * @return */ diff --git a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/util/DataCluster.java b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/util/DataCluster.java index 98f6ac03d..22448db19 100644 --- a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/util/DataCluster.java +++ b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/util/DataCluster.java @@ -8,20 +8,20 @@ import java.util.List; public class DataCluster { - // 聚类桶宽百分比 + // 鑱氱被妗跺鐧惧垎姣� public static final int CLUSTER_PERCENT = 5; - // 聚类中最小的成员数 + // 鑱氱被涓渶灏忕殑鎴愬憳鏁� public static final int MIN_SUPPORT_COUNT = 3; - // 聚类中最大值与最小值的比差 + // 鑱氱被涓渶澶у�间笌鏈�灏忓�肩殑姣斿樊 public static final double HIGH_DIFFERENCE_PERCENT = 1.2; - // 小区聚类的最小聚类簇个数 + // 灏忓尯鑱氱被鐨勬渶灏忚仛绫荤皣涓暟 public static final int MIN_CLUSTER_COUNT = 1; - // 区域聚类的聚类簇个数 + // 鍖哄煙鑱氱被鐨勮仛绫荤皣涓暟 public static final int REGION_CLUSTER_SIZE = 3; /** - * 聚类算法 + * 鑱氱被绠楁硶 * * @param values * @return List @@ -48,7 +48,7 @@ public class DataCluster { /** - * 聚类算法 + * 鑱氱被绠楁硶 * * @param values * @return List @@ -76,16 +76,16 @@ public class DataCluster { /** * * @param allAvgs - * 数值列表 + * 鏁板�煎垪琛� * @param minCluster - * 最少聚出的类个数 + * 鏈�灏戣仛鍑虹殑绫讳釜鏁� * @param percent - * 聚类间距 + * 鑱氱被闂磋窛 * @param minSize - * 聚类中最小的成员数 + * 鑱氱被涓渶灏忕殑鎴愬憳鏁� * @param heightDifferencePercent - * 如果聚类中最大值与最小值的比差,只在聚出一个类,并且最小聚类大于一的情况下使用 - * @return 聚类列表 + * 濡傛灉鑱氱被涓渶澶у�间笌鏈�灏忓�肩殑姣斿樊,鍙湪鑱氬嚭涓�涓被,骞朵笖鏈�灏忚仛绫诲ぇ浜庝竴鐨勬儏鍐典笅浣跨敤 + * @return 鑱氱被鍒楄〃 */ private static double[][] cluster(List allAvgs, int minCluster, int percent, int minSize, double heightDifferencePercent) { @@ -110,10 +110,10 @@ public class DataCluster { allClusterSep += allAvgs.get(i); } - int clusterSep = NumberUtils.round(allClusterSep * percent * 1.0d / (100 * (allAvgs.size() - startfrom)));// 平均数量大小,总值 - compStep = NumberUtils.round(clusterSep * 0.5);// 增量 - compAvg = allAvgs.get(startfrom) + compStep;// 初始均价大小 - startfrom_temp = startfrom;// 起始点 + int clusterSep = NumberUtils.round(allClusterSep * percent * 1.0d / (100 * (allAvgs.size() - startfrom)));// 骞冲潎鏁伴噺澶у皬锛屾�诲�� + compStep = NumberUtils.round(clusterSep * 0.5);// 澧為噺 + compAvg = allAvgs.get(startfrom) + compStep;// 鍒濆鍧囦环澶у皬 + startfrom_temp = startfrom;// 璧峰鐐� ArrayList clusters = new ArrayList(); ArrayList historyClusters = new ArrayList(); @@ -138,14 +138,14 @@ public class DataCluster { } if (end - start + 1 >= minSize) { historyClusters.add(new int[] { start, end }); - if (clusters.isEmpty()) {// 新加组 + if (clusters.isEmpty()) {// 鏂板姞缁� clusters.add(new int[] { start, end }); } else { int[] before = clusters.get(clusters.size() - 1); - if (start <= before[1]) {// 合并 + if (start <= before[1]) {// 鍚堝苟 before[1] = end; - } else {// 新加组 + } else {// 鏂板姞缁� clusters.add(new int[] { start, end }); } } @@ -210,7 +210,7 @@ public class DataCluster { } /** - * 对大簇进行划分 + * 瀵瑰ぇ绨囪繘琛屽垝鍒� * * @param cluster * @param minCluster @@ -230,7 +230,7 @@ public class DataCluster { int clusterLength = cluster.length; - int compStep = NumberUtils.round(clusterSep * 0.5);// 增量 + int compStep = NumberUtils.round(clusterSep * 0.5);// 澧為噺 int compAvg = allAvgs.get(cluster[0]) + compStep; while (compAvg <= allAvgs.get(cluster[clusterLength - 1])) { @@ -276,7 +276,7 @@ public class DataCluster { int bs = b[1] - b[0]; int cs = c[1] - c[0]; - if (bs > as && bs > cs) {// 波峰 + if (bs > as && bs > cs) {// 娉㈠嘲 int avg = 0; for (int k = b[0]; k <= b[1]; k++) { avg += allAvgs.get(k); @@ -286,17 +286,17 @@ public class DataCluster { topWaveMarkCount++; flag = 0; - } else if (bs < as && bs < cs) {// 波谷 + } else if (bs < as && bs < cs) {// 娉㈣胺 waveMark.add(new int[] { i * -1, 0 }); bottomWaveMarkCount++; flag = 0; - } else if (bs > as && bs == cs) {// 波峰开始 + } else if (bs > as && bs == cs) {// 娉㈠嘲寮�濮� flag = 1; - } else if (bs < as && bs == cs) {// 波谷开始 + } else if (bs < as && bs == cs) {// 娉㈣胺寮�濮� flag = -1; - } else if (flag == 1 && (bs == as && bs > cs)) {// 波峰 - // 下降通道 + } else if (flag == 1 && (bs == as && bs > cs)) {// 娉㈠嘲 + // 涓嬮檷閫氶亾 int avg = 0; for (int k = b[0]; k <= b[1]; k++) { avg += allAvgs.get(k); @@ -306,13 +306,13 @@ public class DataCluster { topWaveMarkCount++; flag = 0; - } else if (flag == -1 && (bs == as && bs < cs)) {// 波谷 - // 上升通道 + } else if (flag == -1 && (bs == as && bs < cs)) {// 娉㈣胺 + // 涓婂崌閫氶亾 waveMark.add(new int[] { i * -1, 0 }); bottomWaveMarkCount++; flag = 0; - } else if (bs == as && bs == cs) {// 平滑区 + } else if (bs == as && bs == cs) {// 骞虫粦鍖� } else { flag = 0; @@ -322,11 +322,11 @@ public class DataCluster { List bottomMark = new ArrayList(); - // 取出(minCluster-1)个波谷,断裂 + // 鍙栧嚭(minCluster-1)涓尝璋�,鏂 if (bottomWaveMarkCount > 0) { clusters.clear(); - if (topWaveMarkCount > minCluster) {// 按波峰之间的距离选取聚类 + if (topWaveMarkCount > minCluster) {// 鎸夋尝宄颁箣闂寸殑璺濈閫夊彇鑱氱被 int startIndex = 2; @@ -338,12 +338,12 @@ public class DataCluster { int count = 0; for (int i = startIndex; i < waveMark.size(); i += 2) { - x[count][0] = waveMark.get(i)[1] - waveMark.get(i - 2)[1]; // 均价间距 - x[count][1] = i - 1; // 记录波谷位置 + x[count][0] = waveMark.get(i)[1] - waveMark.get(i - 2)[1]; // 鍧囦环闂磋窛 + x[count][1] = i - 1; // 璁板綍娉㈣胺浣嶇疆 count++; } - // 按间距排序 + // 鎸夐棿璺濇帓搴� Arrays.sort(x, new Comparator() { public int compare(int[] o1, int[] o2) { @@ -370,14 +370,14 @@ public class DataCluster { Collections.sort(bottomMark); - // 合并 + // 鍚堝苟 int lastIndex = 0; for (int i = 0; i <= bottomMark.size(); i++) { int start = Integer.MAX_VALUE; int end = 0; - // 求峰值的平均值,往两边扩散 + // 姹傚嘲鍊肩殑骞冲潎鍊�,寰�涓よ竟鎵╂暎 int bottomIndex = 0; if (i == bottomMark.size()) bottomIndex = waveMark.size(); diff --git a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/util/ExcelUtils.java b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/util/ExcelUtils.java index f5cfe558e..5f282dff7 100644 --- a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/util/ExcelUtils.java +++ b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/util/ExcelUtils.java @@ -16,10 +16,10 @@ import org.apache.poi.ss.usermodel.WorkbookFactory; public class ExcelUtils{ /** - * 读取Excel 数据 + * 璇诲彇Excel 鏁版嵁 * @param file - * @param sheetIndex 数据所在Sheet索引下标 - * @param skipRow 要跳过的列数,默认跳过第一列 + * @param sheetIndex 鏁版嵁鎵�鍦⊿heet绱㈠紩涓嬫爣 + * @param skipRow 瑕佽烦杩囩殑鍒楁暟锛岄粯璁よ烦杩囩涓�鍒� * @return * @throws InvalidFormatException */ @@ -31,7 +31,7 @@ public class ExcelUtils{ Workbook workbook = WorkbookFactory.create(inp); workbook.setForceFormulaRecalculation(true); Sheet sheet = workbook.getSheetAt(0); - //行号 + //琛屽彿 int rowIndex = 0; for(Row row : sheet){ rowIndex ++; diff --git a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/util/NumberUtils.java b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/util/NumberUtils.java index 2ebf6c56b..0045d84f1 100644 --- a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/util/NumberUtils.java +++ b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/analysis/util/NumberUtils.java @@ -12,7 +12,7 @@ public class NumberUtils { } /** - * 判断是否是正数 + * 鍒ゆ柇鏄惁鏄鏁� * @return */ public static boolean isPositive(Number num) { diff --git a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/bkoff/controllers/AvgPriceUpdateController.java b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/bkoff/controllers/AvgPriceUpdateController.java index 5ec90b0be..0ba7a9d0d 100644 --- a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/bkoff/controllers/AvgPriceUpdateController.java +++ b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/bkoff/controllers/AvgPriceUpdateController.java @@ -33,7 +33,7 @@ public class AvgPriceUpdateController { public Object houseAvgPriceAction(AvgPriceUpdateModel model) { Date weekend = DateUtil.getFirstDayOfWeek(new Date()); - //城市区域都为空 + //鍩庡競鍖哄煙閮戒负绌� if(StringUtils.isEmpty(model.getCity())&&StringUtils.isEmpty(model.getRegion())){ List avgUpdateBoList = regionStatService.findCityAvgPriceData(null, weekend); for (AvgUpdateBo avgUpdateBo : avgUpdateBoList) { @@ -61,7 +61,7 @@ public class AvgPriceUpdateController { model.setAvgUpdateBos(avgUpdateBoList); } - //城市不为空,区域为空 + //鍩庡競涓嶄负绌猴紝鍖哄煙涓虹┖ if(StringUtils.isNotEmpty(model.getCity())&&StringUtils.isEmpty(model.getRegion())){ model.setSta(1); List regions = null; @@ -80,7 +80,7 @@ public class AvgPriceUpdateController { } model.setAvgUpdateBos(avgUpdateBoList); } - //城市区域都不为空 + //鍩庡競鍖哄煙閮戒笉涓虹┖ if(StringUtils.isNotEmpty(model.getCity())&&StringUtils.isNotEmpty(model.getRegion())){ model.setSta(2); List avgUpdateBoList = regionStatService.findRegionBlockAvgPriceData(model.getCity(), model.getRegion(), weekend); diff --git a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/bkoff/controllers/CommandController.java b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/bkoff/controllers/CommandController.java index 981ab5d0b..e12da6ee4 100644 --- a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/bkoff/controllers/CommandController.java +++ b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/bkoff/controllers/CommandController.java @@ -21,7 +21,7 @@ public class CommandController { RestfulModelAndView mav = new RestfulModelAndView(); if (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getRegion()) || StringUtils.isBlank(model.getName()) || StringUtils.isBlank(model.getEstateType()) || StringUtils.isBlank(model.getNewCity()) || StringUtils.isBlank(model.getNewRegion()) || StringUtils.isBlank(model.getNewName()) || StringUtils.isBlank(model.getNewEstateType())) { - mav.setModel(BasicModel.badRequest("参数缺失")); + mav.setModel(BasicModel.badRequest("鍙傛暟缂哄け")); return mav; } diff --git a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/bkoff/controllers/Controller.java b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/bkoff/controllers/Controller.java index 0f7e8380e..3d85a9ee6 100644 --- a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/bkoff/controllers/Controller.java +++ b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/bkoff/controllers/Controller.java @@ -26,7 +26,7 @@ public class Controller { Map result = new HashMap(); result.put("success", true); jsonModel.setJsonModel(result); - LOGGER.error("刷新缓存"); + LOGGER.error("鍒锋柊缂撳瓨"); return jsonModel; } diff --git a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/bkoff/controllers/TaskController.java b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/bkoff/controllers/TaskController.java index 3f9ad2517..57480f1a6 100644 --- a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/bkoff/controllers/TaskController.java +++ b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/bkoff/controllers/TaskController.java @@ -65,7 +65,7 @@ public class TaskController { Test test = new Test(); - test.process("上海", "青浦", model.getLng(), model.getLat()); + test.process("涓婃捣", "闈掓郸", model.getLng(), model.getLat()); return ret; } @@ -99,7 +99,7 @@ public class TaskController { JsonModel ret = new JsonModel(); List> datas = new ArrayList>(); DBCollection coll = getColl(); - DBCursor cur = coll.find(new BasicDBObject("city", "上海").append("keyword", "学校")); + DBCursor cur = coll.find(new BasicDBObject("city", "涓婃捣").append("keyword", "瀛︽牎")); while(cur.hasNext()) { DBObject dbo = cur.next(); Map data = new HashMap(); diff --git a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/bkoff/model/AveragerModel.java b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/bkoff/model/AveragerModel.java index 7ea299810..0a4961377 100644 --- a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/bkoff/model/AveragerModel.java +++ b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/bkoff/model/AveragerModel.java @@ -15,7 +15,7 @@ public class AveragerModel extends BaseModel { private String name; private String estateType; private String block; - private Date weekend; // 计算日期 + private Date weekend; // 璁$畻鏃ユ湡 private List cityBoList; public String getId() { diff --git a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/bkoff/model/BaseModel.java b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/bkoff/model/BaseModel.java index fdc6cc1cd..e9da2adfc 100644 --- a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/bkoff/model/BaseModel.java +++ b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/bkoff/model/BaseModel.java @@ -106,7 +106,7 @@ public class BaseModel extends ModelAndViewSupport { ret = new LinkedHashMap>(); for (ServerArea sa : serverAreas) { - if (sa.getDisplay().equals("全国")) { + if (sa.getDisplay().equals("鍏ㄥ浗")) { continue; } String w = String.valueOf(sa.getSpell().charAt(0)).toUpperCase(); diff --git a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/bkoff/model/BasicModel.java b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/bkoff/model/BasicModel.java index ae026c8c8..4e98413ca 100644 --- a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/bkoff/model/BasicModel.java +++ b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/bkoff/model/BasicModel.java @@ -5,9 +5,9 @@ public class BasicModel { public enum HttpStatusCodeEnum { OK(200, "ok"), - BAD_REQUEST(400, "请求参数错误"), - UN_AUTHORIZED(401, "请求未被授权"), - SERVER_ERROR(500, "服务器内部错误"); + BAD_REQUEST(400, "璇锋眰鍙傛暟閿欒"), + UN_AUTHORIZED(401, "璇锋眰鏈鎺堟潈"), + SERVER_ERROR(500, "鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�"); private final Integer code; private final String msg; diff --git a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/bkoff/model/CommandModel.java b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/bkoff/model/CommandModel.java index e53675dc7..c604c029a 100644 --- a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/bkoff/model/CommandModel.java +++ b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/bkoff/model/CommandModel.java @@ -13,7 +13,7 @@ public class CommandModel extends BaseModel { private String estateType; private String block; - private Date weekend; // 计算日期 + private Date weekend; // 璁$畻鏃ユ湡 private int priority; private String newCity; diff --git a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/dal/common/QueryParam.java b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/dal/common/QueryParam.java index cc2f1596a..69a773172 100644 --- a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/dal/common/QueryParam.java +++ b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/dal/common/QueryParam.java @@ -2,7 +2,7 @@ package com.fangjia.dal.common; /** - * query 参数, 比如a>b + * query 鍙傛暟, 姣斿a>b * * @author Administrator * diff --git a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/dal/common/ServerAreaData.java b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/dal/common/ServerAreaData.java index 238eacddc..4a795e2a2 100644 --- a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/dal/common/ServerAreaData.java +++ b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/dal/common/ServerAreaData.java @@ -20,7 +20,7 @@ public class ServerAreaData { public static ServerArea defaultServerArea; protected static Map homeMapCities = Collections.emptyMap(); protected static Map> sectionMap = Collections.emptyMap(); - protected static Map> sortedServerAreaMapGroupByFirstSpell = Collections.emptyMap();// 按首字母分组,排序号排序 + protected static Map> sortedServerAreaMapGroupByFirstSpell = Collections.emptyMap();// 鎸夐瀛楁瘝鍒嗙粍,鎺掑簭鍙锋帓搴� protected static Map nameMap = Collections.emptyMap(); protected static Map spellMap = Collections.emptyMap(); protected static Map displayMap = Collections.emptyMap(); @@ -36,10 +36,10 @@ public class ServerAreaData { /*****************************************************************************************************/ /** - * 根据name或spell获取ServerArea对象 + * 鏍规嵁name鎴杝pell鑾峰彇ServerArea瀵硅薄 * *

- * 若name匹配到,则返回ServerArea对象,否则返回spell匹配到的ServerArea对象 + * 鑻ame鍖归厤鍒帮紝鍒欒繑鍥濻erverArea瀵硅薄锛屽惁鍒欒繑鍥瀞pell鍖归厤鍒扮殑ServerArea瀵硅薄 *

* * @param str @@ -59,7 +59,7 @@ public class ServerAreaData { } /** - * 找不到 ,返回NULL + * 鎵句笉鍒� 锛岃繑鍥濶ULL * * @param display * @return @@ -79,7 +79,7 @@ public class ServerAreaData { } /** - * 通过全拼查找城市 + * 閫氳繃鍏ㄦ嫾鏌ユ壘鍩庡競 * * @param spell * @return @@ -95,10 +95,10 @@ public class ServerAreaData { } /** - * 根据name或spell获取ServerArea对象 + * 鏍规嵁name鎴杝pell鑾峰彇ServerArea瀵硅薄 * *

- * 若name匹配到,则返回ServerArea对象,否则返回spell匹配到的ServerArea对象 + * 鑻ame鍖归厤鍒帮紝鍒欒繑鍥濻erverArea瀵硅薄锛屽惁鍒欒繑鍥瀞pell鍖归厤鍒扮殑ServerArea瀵硅薄 *

* * @param str @@ -113,10 +113,10 @@ public class ServerAreaData { } /** - * 根据name或spell获取ServerArea对象 + * 鏍规嵁name鎴杝pell鑾峰彇ServerArea瀵硅薄 * *

- * 若name匹配到,则返回ServerArea对象,否则返回spell匹配到的ServerArea对象 + * 鑻ame鍖归厤鍒帮紝鍒欒繑鍥濻erverArea瀵硅薄锛屽惁鍒欒繑鍥瀞pell鍖归厤鍒扮殑ServerArea瀵硅薄 *

* * @param str @@ -131,7 +131,7 @@ public class ServerAreaData { } /** - * 通过name得到ServerArea对象,找不到返回 defaultServerArea + * 閫氳繃name寰楀埌ServerArea瀵硅薄锛屾壘涓嶅埌杩斿洖 defaultServerArea * * @param spell * @return @@ -150,7 +150,7 @@ public class ServerAreaData { } /** - * 通过spell得到ServerArea对象,找不到返回null + * 閫氳繃spell寰楀埌ServerArea瀵硅薄锛屾壘涓嶅埌杩斿洖null * * @param spell * @return @@ -166,7 +166,7 @@ public class ServerAreaData { } /** - * 根据输入的字符串中包含某个城市名称就认为就是那个城市的 比如输入的字符串为浙江省杭州市就认为是杭州市的 如果没有找到某个城市则返回null + * 鏍规嵁杈撳叆鐨勫瓧绗︿覆涓寘鍚煇涓煄甯傚悕绉板氨璁や负灏辨槸閭d釜鍩庡競鐨� 姣斿杈撳叆鐨勫瓧绗︿覆涓烘禉姹熺渷鏉窞甯傚氨璁や负鏄澀宸炲競鐨� 濡傛灉娌℃湁鎵惧埌鏌愪釜鍩庡競鍒欒繑鍥瀗ull * * @param country * @return @@ -241,7 +241,7 @@ public class ServerAreaData { } /** - * 获取N个城市名 + * 鑾峰彇N涓煄甯傚悕 * * @param size * @return @@ -259,7 +259,7 @@ public class ServerAreaData { } /** - * 获取支持短租的城市列表 + * 鑾峰彇鏀寔鐭鐨勫煄甯傚垪琛� * * @return */ diff --git a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/dal/common/TemplateUtils.java b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/dal/common/TemplateUtils.java index c616ee7dc..832882847 100644 --- a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/dal/common/TemplateUtils.java +++ b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/dal/common/TemplateUtils.java @@ -20,13 +20,13 @@ import java.util.List; import java.util.Map; /** - * 模板工具类 + * 妯℃澘宸ュ叿绫� * * @author liupei */ public final class TemplateUtils { /** - * 清理指定字符串中的特殊字符 + * 娓呯悊鎸囧畾瀛楃涓蹭腑鐨勭壒娈婂瓧绗� * * @author liupei */ @@ -35,7 +35,7 @@ public final class TemplateUtils { } /** - * 清理特定的某个字符串 + * 娓呯悊鐗瑰畾鐨勬煇涓瓧绗︿覆 * * @author */ @@ -49,14 +49,14 @@ public final class TemplateUtils { } /** - * 截取字符串 + * 鎴彇瀛楃涓� * - * 若原始字符串的长度小于最大截取长度,则直接返回原始字符串 + * 鑻ュ師濮嬪瓧绗︿覆鐨勯暱搴﹀皬浜庢渶澶ф埅鍙栭暱搴︼紝鍒欑洿鎺ヨ繑鍥炲師濮嬪瓧绗︿覆 * * @param str - * 原始字符串 + * 鍘熷瀛楃涓� * @param targetLength - * 截取长度 + * 鎴彇闀垮害 * @return */ public static String cutString(String str, int targetLength) { @@ -64,12 +64,12 @@ public final class TemplateUtils { } /** - * 按字节截取字符串 + * 鎸夊瓧鑺傛埅鍙栧瓧绗︿覆 * * @param str - * 原始字符串 + * 鍘熷瀛楃涓� * @param targetLength - * 截取长度 + * 鎴彇闀垮害 * @return */ public static String bCutString(String str, int targetLength) { @@ -81,7 +81,7 @@ public final class TemplateUtils { } /** - * 截取字符串 + * 鎴彇瀛楃涓� * * @param str * @param beginIndex @@ -93,7 +93,7 @@ public final class TemplateUtils { } /** - * 截取字符串 + * 鎴彇瀛楃涓� * * @param str * @param targetLength @@ -105,7 +105,7 @@ public final class TemplateUtils { } /** - * 获取字符在字符串中的index + * 鑾峰彇瀛楃鍦ㄥ瓧绗︿覆涓殑index * * @param str * @param strChar @@ -116,7 +116,7 @@ public final class TemplateUtils { } /** - * 加密图片url + * 鍔犲瘑鍥剧墖url * * @param u * @param s @@ -134,9 +134,9 @@ public final class TemplateUtils { } /** - * 格式化均价 + * 鏍煎紡鍖栧潎浠� * - * 将个位和十位直接变为0 + * 灏嗕釜浣嶅拰鍗佷綅鐩存帴鍙樹负0 * * @param avgPirce * @return @@ -146,7 +146,7 @@ public final class TemplateUtils { } /** - * 去掉str中的html标记 + * 鍘绘帀str涓殑html鏍囪 * * @param str * @return @@ -156,7 +156,7 @@ public final class TemplateUtils { } /** - * 移除HTML中的标记 + * 绉婚櫎HTML涓殑鏍囪 * * @param htmlDes * @return @@ -166,7 +166,7 @@ public final class TemplateUtils { } /** - * 全角转半角 + * 鍏ㄨ杞崐瑙� * * @param input * @return @@ -176,7 +176,7 @@ public final class TemplateUtils { } /** - * 转换时间 + * 杞崲鏃堕棿 * * @param input * @return @@ -186,7 +186,7 @@ public final class TemplateUtils { } /** - * 转换时间 + * 杞崲鏃堕棿 * * @param input * @return _tyler @@ -196,7 +196,7 @@ public final class TemplateUtils { } /** - * 去除不支持的编码字符 + * 鍘婚櫎涓嶆敮鎸佺殑缂栫爜瀛楃 * * @param input * @return @@ -206,7 +206,7 @@ public final class TemplateUtils { } /** - * 格式化板块 + * 鏍煎紡鍖栨澘鍧� * * @param block * @return @@ -216,7 +216,7 @@ public final class TemplateUtils { } /** - * 编码 + * 缂栫爜 * * @param s * @return @@ -227,7 +227,7 @@ public final class TemplateUtils { } /** - * 格式化日期 + * 鏍煎紡鍖栨棩鏈� * */ public static String dateFormat(Date date, String pattern) { @@ -238,7 +238,7 @@ public final class TemplateUtils { } /** - * 获取date前days天的日期 + * 鑾峰彇date鍓峝ays澶╃殑鏃ユ湡 * * @param date * @param days @@ -255,16 +255,16 @@ public final class TemplateUtils { return StringUtils.replace(text, searchString, replacement); } - private static final String[] STRONG_KEYS = new String[] { "房价" }; - private static final String[] STRONG_VALUES = new String[] { "房价" }; - private static final String[] STRONG_CLASS_VALUES = new String[] { "房价" }; + private static final String[] STRONG_KEYS = new String[] { "鎴夸环" }; + private static final String[] STRONG_VALUES = new String[] { "鎴夸环" }; + private static final String[] STRONG_CLASS_VALUES = new String[] { "鎴夸环" }; /** - * 关键字加strong格式 + * 鍏抽敭瀛楀姞strong鏍煎紡 * * @param text * @param isNeedClass - * true:带样式yhua;false:不带class + * true:甯︽牱寮弝hua;false:涓嶅甫class * @return */ public static String strong(String text, boolean isNeedClass) { @@ -284,7 +284,7 @@ public final class TemplateUtils { } /** - * 获取1~size的随机数 + * 鑾峰彇1~size鐨勯殢鏈烘暟 * * @param size * @return @@ -303,13 +303,13 @@ public final class TemplateUtils { if (publishDate.after(range[0]) && publishDate.before(range[1])) { int diffHour = DateUtil.getHour(new Date()) - DateUtil.getHour(publishDate); if (diffHour > 0) { - return diffHour + "小时前"; + return diffHour + "灏忔椂鍓�"; } else { int diffMinute = DateUtil.getMinute(new Date()) - DateUtil.getMinute(publishDate); if (diffMinute <= 0) { diffMinute = 1; } - return diffMinute + "分钟前"; + return diffMinute + "鍒嗛挓鍓�"; } } else { diff --git a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/service/bo/AvgUpdateBo.java b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/service/bo/AvgUpdateBo.java index db8a53ae7..54af8fc33 100644 --- a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/service/bo/AvgUpdateBo.java +++ b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/service/bo/AvgUpdateBo.java @@ -17,14 +17,14 @@ public class AvgUpdateBo implements Serializable { private String weekend; private Integer avgPrice; private int weekendMarkup; - private double credit; // 可信度 - private Integer valueType; // 计算类型 - private double coverage; // 小区覆盖率 + private double credit; // 鍙俊搴� + private Integer valueType; // 璁$畻绫诲瀷 + private double coverage; // 灏忓尯瑕嗙洊鐜� private int calcValue; private String estateType; - private String statStartDate; // 理论上开始计算价格日期 - private String sampleStartDate;// 可供计算的样本开始时间 - private String calcStartDate; // 均价数据中的开始时间 + private String statStartDate; // 鐞嗚涓婂紑濮嬭绠椾环鏍兼棩鏈� + private String sampleStartDate;// 鍙緵璁$畻鐨勬牱鏈紑濮嬫椂闂� + private String calcStartDate; // 鍧囦环鏁版嵁涓殑寮�濮嬫椂闂� private List alias; private int cityGrade; diff --git a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/servlet/CalcCommandConsumerServlet.java b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/servlet/CalcCommandConsumerServlet.java index 38ff92191..e0ccd6b00 100644 --- a/projects/fangjia-priceanalysis/src/main/java/com/fangjia/servlet/CalcCommandConsumerServlet.java +++ b/projects/fangjia-priceanalysis/src/main/java/com/fangjia/servlet/CalcCommandConsumerServlet.java @@ -37,7 +37,7 @@ public class CalcCommandConsumerServlet extends HttpServlet { LOGGER.info("start " + consumer.getName()); } - //曲线检查启动 + //鏇茬嚎妫�鏌ュ惎鍔� if("true".equals(System.getProperty("trendMonitor", "true"))) { TrendMonitorConsumer.getInstance().start(); LOGGER.info("start TrendMonitorConsumer"); @@ -45,7 +45,7 @@ public class CalcCommandConsumerServlet extends HttpServlet { LOGGER.info("no TrendMonitorConsumer"); } - //数据迁移启动 + //鏁版嵁杩佺Щ鍚姩 if("true".equals(System.getProperty("transferData", "true"))) { TransferDataConsumer.getInstance().start(); LOGGER.info("start TransferDataConsumer"); diff --git a/projects/fangjia-script/pom.xml b/projects/fangjia-script/pom.xml index 47c367a58..db5a70962 100644 --- a/projects/fangjia-script/pom.xml +++ b/projects/fangjia-script/pom.xml @@ -7,7 +7,7 @@ 0.0.1-SNAPSHOT fangjia-script - GBK + UTF-8 fangjia-script @@ -19,7 +19,7 @@ 1.8 1.8 - GBK + UTF-8 diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/BaseBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/BaseBatch.groovy index 183a4ccf9..9daa2258a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/BaseBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/BaseBatch.groovy @@ -10,17 +10,17 @@ import org.bson.types.ObjectId import org.springframework.core.annotation.AnnotationUtils /** - * 继承这个类,实现process(args)方法 - * 写main方法 + * 缁ф壙杩欎釜绫伙紝瀹炵幇process(args)鏂规硶 + * 鍐檓ain鏂规硶 * static void main(args){ * runBatch(new MyBatch(), args) * } - * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - * !!!!!任何由process方法抛出的异常都会被监测到,并发出错误警报!!!!! - * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + * 锛侊紒锛侊紒锛侊紒锛侊紒锛侊紒锛侊紒锛侊紒锛侊紒锛侊紒锛侊紒锛侊紒锛侊紒锛侊紒锛侊紒锛侊紒锛侊紒锛侊紒锛侊紒锛侊紒 + * 锛侊紒锛侊紒锛佷换浣曠敱process鏂规硶鎶涘嚭鐨勫紓甯搁兘浼氳鐩戞祴鍒帮紝骞跺彂鍑洪敊璇鎶ワ紒锛侊紒锛侊紒 + * 锛侊紒锛侊紒锛侊紒锛侊紒锛侊紒锛侊紒锛侊紒锛侊紒锛侊紒锛侊紒锛侊紒锛侊紒锛侊紒锛侊紒锛侊紒锛侊紒锛侊紒锛侊紒锛侊紒 * - * 也可以手动调用jms.monitor(name, message, exception)方法发出错误警报 - * 在启动时添加 -DuseRollingPrintLog=true 的java参数可以生成滚动日志 + * 涔熷彲浠ユ墜鍔ㄨ皟鐢╦ms.monitor(name, message, exception)鏂规硶鍙戝嚭閿欒璀︽姤 + * 鍦ㄥ惎鍔ㄦ椂娣诲姞 -DuseRollingPrintLog=true 鐨刯ava鍙傛暟鍙互鐢熸垚婊氬姩鏃ュ織 * @author velna * */ @@ -29,11 +29,11 @@ abstract class BaseBatch { private static final Jms __jms = Jms.create('tcp://monitor.jms.db.fangjia.com:61616') //private static final NacosProperties properties = NacosProperties.getInstance() - private static final BATCH_CONFIG = [singleProcess : false, //是否只可单进程运行,默认true - reprocessOnException : false, //在发生异常后是否重新执行,默认false - exceptionDelay : 10000, //在发生异常后延迟多少毫秒重新执行,默认10000 - warnIfProcessNotExit : false, //对singleProcess的程序,如果发现有一个进程还在运行,则发出一个警报 - isSystemExit : true //运行之后是否执行System.exit(); + private static final BATCH_CONFIG = [singleProcess : false, //鏄惁鍙彲鍗曡繘绋嬭繍琛岋紝榛樿true + reprocessOnException : false, //鍦ㄥ彂鐢熷紓甯稿悗鏄惁閲嶆柊鎵ц锛岄粯璁alse + exceptionDelay : 10000, //鍦ㄥ彂鐢熷紓甯稿悗寤惰繜澶氬皯姣閲嶆柊鎵ц锛岄粯璁�10000 + warnIfProcessNotExit : false, //瀵箂ingleProcess鐨勭▼搴忥紝濡傛灉鍙戠幇鏈変竴涓繘绋嬭繕鍦ㄨ繍琛岋紝鍒欏彂鍑轰竴涓鎶� + isSystemExit : true //杩愯涔嬪悗鏄惁鎵цSystem.exit(); ] def logger = new PrintLogger(this.getClass()) @@ -41,16 +41,16 @@ abstract class BaseBatch { private static final DBCollection TASK = MongoUtils.getCollectionByName("fangjia_batch", "task", "log.mongo.db.fangjia.com", 52002) /** - * 执行batch - * @param args main方法的参数 + * 鎵цbatch + * @param args main鏂规硶鐨勫弬鏁� */ abstract void process(args); /** - * 运行batch - * @param batch 要运行的batch - * @param args 传给process方法的参数,通常为main方法的参数 - * @param batchConfig 见BATCH_CONFIG定义 + * 杩愯batch + * @param batch 瑕佽繍琛岀殑batch + * @param args 浼犵粰process鏂规硶鐨勫弬鏁帮紝閫氬父涓簃ain鏂规硶鐨勫弬鏁� + * @param batchConfig 瑙丅ATCH_CONFIG瀹氫箟 */ static def runBatch(BaseBatch batch, args, batchConfig = BATCH_CONFIG){ def myBatchConfig = [:] @@ -74,7 +74,7 @@ abstract class BaseBatch { } } task.describe = getBatchDescribe(batch) - task.status = "运行中" + task.status = "杩愯涓�" TASK.save(task) checkUseRollingPrintLog(batch.getClass().getSimpleName()) if(myBatchConfig.singleProcess){ @@ -96,7 +96,7 @@ abstract class BaseBatch { exception = true e.printStackTrace() __jms.monitor(batchName, '', extraData, e) - def msg = "脚本发生异常错误 BatchName:${batchName}\t" + def msg = "鑴氭湰鍙戠敓寮傚父閿欒 BatchName:${batchName}\t" def batchOwner = getBatchOwner(batch) if(batchOwner && batchOwner.size() > 0){ def owner = null @@ -134,9 +134,9 @@ abstract class BaseBatch { sleep(myBatchConfig.exceptionDelay) } if(exception){ - task.status = "发生异常" + task.status = "鍙戠敓寮傚父" }else{ - task.status = "成功" + task.status = "鎴愬姛" } task.finish_date = new Date() TASK.save(task) @@ -167,10 +167,10 @@ abstract class BaseBatch { ret.put(it.name(), it.toMap()) } }else{ - bb.logWarn('!!!请使用'+BatchOwner.class.getName()+'注解标明本Batch的拥有者!!!') + bb.logWarn('锛侊紒锛佽浣跨敤'+BatchOwner.class.getName()+'娉ㄨВ鏍囨槑鏈珺atch鐨勬嫢鏈夎�咃紒锛侊紒') } }catch(Exception e) { - bb.logWarn('!!!请使用'+BatchOwner.class.getName()+'注解标明本Batch的拥有者!!!', e) + bb.logWarn('锛侊紒锛佽浣跨敤'+BatchOwner.class.getName()+'娉ㄨВ鏍囨槑鏈珺atch鐨勬嫢鏈夎�咃紒锛侊紒', e) } return ret } @@ -187,10 +187,10 @@ abstract class BaseBatch { } } } else { - bb.logWarn('!!!请使用' + BatchOwner.class.getName() + '注解标明本Batch的拥有者!!!') + bb.logWarn('锛侊紒锛佽浣跨敤' + BatchOwner.class.getName() + '娉ㄨВ鏍囨槑鏈珺atch鐨勬嫢鏈夎�咃紒锛侊紒') } } catch (Exception e) { - bb.logWarn('!!!解析BatchOwner失败!!!', e) + bb.logWarn('锛侊紒锛佽В鏋怋atchOwner澶辫触锛侊紒锛�', e) } return phones[0] ? phones[0] : "" } @@ -203,7 +203,7 @@ abstract class BaseBatch { return annotation.describe() } }catch(Exception e) { - bb.logWarn('!!!请使用'+BatchOwner.class.getName()+'注解标明本Batch的拥有者!!!', e) + bb.logWarn('锛侊紒锛佽浣跨敤'+BatchOwner.class.getName()+'娉ㄨВ鏍囨槑鏈珺atch鐨勬嫢鏈夎�咃紒锛侊紒', e) } return null } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ExportDistrictData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ExportDistrictData.groovy index 1cd61e5e9..7a6c84c37 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ExportDistrictData.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ExportDistrictData.groovy @@ -111,7 +111,7 @@ import org.apache.poi.hssf.usermodel.HSSFSheet import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.Row import org.apache.poi.ss.usermodel.Sheet; -//导出开盘时间需要调查的数据 +//瀵煎嚭寮�鐩樻椂闂撮渶瑕佽皟鏌ョ殑鏁版嵁 class ExportDistrictData { private final static String datastoreDomain = "seaweed.db.fangjia.com" @@ -167,13 +167,13 @@ class ExportDistrictData { } if(site.size() > 50){ - sbu.append("总量"+"\t"); + sbu.append("鎬婚噺"+"\t"); sbu.append(total+"\t"); - sbu.append("开盘时间不存在数量"+"\t"); + sbu.append("寮�鐩樻椂闂翠笉瀛樺湪鏁伴噺"+"\t"); sbu.append(site.size()+"\n"); - sbu2.append("总量"+"\t"); + sbu2.append("鎬婚噺"+"\t"); sbu2.append(total+"\t"); - sbu2.append("开盘时间不存在数量"+"\t"); + sbu2.append("寮�鐩樻椂闂翠笉瀛樺湪鏁伴噺"+"\t"); sbu2.append(site.size()+"\n"); for(int i = 0; i<50 ; i++){ int max = site.size()-1; @@ -213,7 +213,7 @@ class ExportDistrictData { public static def getAllCitiesObject() { DBObject q = new BasicDBObject() q.put('status', new BasicDBObject('$lte', 2)) - q.put('display', "荆州") + q.put('display', "鑽嗗窞") DBObject sq = new BasicDBObject() sq.put('city_grade', 1) sq.put('sequence', 1) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/FccsNewHouse.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/FccsNewHouse.groovy index 961efe561..15bd7a6c3 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/FccsNewHouse.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/FccsNewHouse.groovy @@ -76,10 +76,10 @@ class FccsNewHouse { BasicDBObject query = new BasicDBObject() query.put("url", detailUrl) - query.put("city", "银川") + query.put("city", "閾跺窛") query.put("category", "district") - query.put("site_name", "中国房产超市网") - query.put("page_name", "简介") + query.put("site_name", "涓浗鎴夸骇瓒呭競缃�") + query.put("page_name", "绠�浠�") DBObject entity = webpage.findOne(query) if (entity != null){ DBObject data = new BasicDBObject() @@ -90,10 +90,10 @@ class FccsNewHouse { } else { DBObject data = new BasicDBObject() data.put("url", detailUrl) - data.put("city", "银川") + data.put("city", "閾跺窛") data.put("category", "district") - data.put("site_name", "中国房产超市网") - data.put("page_name", "简介") + data.put("site_name", "涓浗鎴夸骇瓒呭競缃�") + data.put("page_name", "绠�浠�") data.put("content", DataUtil.zip(detailContent)) data.put("c_date", new Date()) data.put("m_date", new Date()) @@ -107,6 +107,6 @@ class FccsNewHouse { e.printStackTrace(); } } - println "总共新增${countSave}总共更新${countUpdate}" + println "鎬诲叡鏂板${countSave}鎬诲叡鏇存柊${countUpdate}" } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/FccsSell.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/FccsSell.groovy index cd9a71e9f..a91c813a8 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/FccsSell.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/FccsSell.groovy @@ -61,10 +61,10 @@ class FccsSell { // file << detailContent BasicDBObject query = new BasicDBObject() query.put("url", detailUrl) - query.put("city", "银川") + query.put("city", "閾跺窛") query.put("category", "district") - query.put("site_name", "中国房产超市网") - query.put("page_name", "概况") + query.put("site_name", "涓浗鎴夸骇瓒呭競缃�") + query.put("page_name", "姒傚喌") DBObject entity = webpage.findOne(query) if (entity != null){ DBObject data = new BasicDBObject() @@ -75,10 +75,10 @@ class FccsSell { } else { DBObject data = new BasicDBObject() data.put("url", detailUrl) - data.put("city", "银川") + data.put("city", "閾跺窛") data.put("category", "district") - data.put("site_name", "中国房产超市网") - data.put("page_name", "概况") + data.put("site_name", "涓浗鎴夸骇瓒呭競缃�") + data.put("page_name", "姒傚喌") data.put("content", DataUtil.zip(detailContent)) data.put("c_date", new Date()) data.put("m_date", new Date()) @@ -92,7 +92,7 @@ class FccsSell { e.printStackTrace(); } } - println "总共新增${countSave}总共更新${countUpdate}" + println "鎬诲叡鏂板${countSave}鎬诲叡鏇存柊${countUpdate}" } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/He/Enlight.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/He/Enlight.groovy index 415a06c3f..afa56d93d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/He/Enlight.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/He/Enlight.groovy @@ -16,23 +16,23 @@ class Enlight { private static final DBCollection COMMAND_COLL = MongoUtils.getCollectionByName("fangjia_log", "crawl_command", "log.mongo.db.fangjia.com"); /* public static final def JOBS = [ - '5588f2f7e4b0a7ef70e98edb' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'赶集', cat:'rent'],//赶集 - '5588ec3be4b0ffa7d5e23dad' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'58同城', cat:'rent'],//58同城 - '5588fbfce4b0a7ef70e98ef3' : [isEncodingUrl:true, encoding:'GBK', enable:true, jobName:'搜房', cat:'rent'],//搜房 - '5589057ee4b0a7ef70e98f48' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'安居客', cat:'rent'],//安居客 - '55890362e4b0a7ef70e98f36' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'我爱我家', cat:'rent'],//我爱我家 - '55890f74e4b0a7ef70e98f87' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'515房产网', cat:'rent'],//515房产网 - '55892150e4b0a7ef70e98fc4' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'带看网', cat:'rent'],//带看网 - '558923f5e4b0a7ef70e98fdb' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'购房者', cat:'rent'],//购房者 - '5589256de4b0a7ef70e98ff3' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'城市房产网', cat:'rent'],//城市房产网 - '558925bce4b0a7ef70e9903b' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'百姓网', cat:'rent'],//百姓网 - '563c202ee4b0126639288c3f' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'新浪', cat:'rent'],//新浪 + '5588f2f7e4b0a7ef70e98edb' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'璧堕泦', cat:'rent'],//璧堕泦 + '5588ec3be4b0ffa7d5e23dad' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'58鍚屽煄', cat:'rent'],//58鍚屽煄 + '5588fbfce4b0a7ef70e98ef3' : [isEncodingUrl:true, encoding:'GBK', enable:true, jobName:'鎼滄埧', cat:'rent'],//鎼滄埧 + '5589057ee4b0a7ef70e98f48' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'瀹夊眳瀹�', cat:'rent'],//瀹夊眳瀹� + '55890362e4b0a7ef70e98f36' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'鎴戠埍鎴戝', cat:'rent'],//鎴戠埍鎴戝 + '55890f74e4b0a7ef70e98f87' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'515鎴夸骇缃�', cat:'rent'],//515鎴夸骇缃� + '55892150e4b0a7ef70e98fc4' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'甯︾湅缃�', cat:'rent'],//甯︾湅缃� + '558923f5e4b0a7ef70e98fdb' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'璐埧鑰�', cat:'rent'],//璐埧鑰� + '5589256de4b0a7ef70e98ff3' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'鍩庡競鎴夸骇缃�', cat:'rent'],//鍩庡競鎴夸骇缃� + '558925bce4b0a7ef70e9903b' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'鐧惧缃�', cat:'rent'],//鐧惧缃� + '563c202ee4b0126639288c3f' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'鏂版氮', cat:'rent'],//鏂版氮 ] */ static main(args) { /* - File f = new File("D:/乌鲁木齐.txt") + File f = new File("D:/涔岄瞾鏈ㄩ綈.txt") JOBS.each {jobId, conf-> if(!conf.get('enable')) { return false; @@ -49,29 +49,29 @@ class Enlight { vars = "keyword:${line}"; } - String conditions = "city:乌鲁木齐"; + String conditions = "city:涔岄瞾鏈ㄩ綈"; JSONObject res = addTemplateJobUrl(jobId, vars, conditions) } } */ - def list = ['昆重小区', -'邮政小区', -'中央华冠', -'瑞源棕榈泉', -'卧云仙居', -'隆格兰花园', -'和风颐园', -'半山七哩溪', -'培星东岸', -'小吉坡小区', -'水电设计院小区', + def list = ['鏄嗛噸灏忓尯', +'閭斂灏忓尯', +'涓ぎ鍗庡啝', +'鐟炴簮妫曟娉�', +'鍗т簯浠欏眳', +'闅嗘牸鍏拌姳鍥�', +'鍜岄棰愬洯', +'鍗婂北涓冨摡婧�', +'鍩规槦涓滃哺', +'灏忓悏鍧″皬鍖�', +'姘寸數璁捐闄㈠皬鍖�', ] list.each {item-> def encoded = URLEncoder.encode(item, "UTF-8") - addTemplateJobUrl("5588ec3be4b0ffa7d5e23dad","keyword:${encoded}","city:昆明") + addTemplateJobUrl("5588ec3be4b0ffa7d5e23dad","keyword:${encoded}","city:鏄嗘槑") } @@ -79,11 +79,11 @@ class Enlight { /** - * 向抓取系统添加抓取任务 - * @param jobId 任务号 - * @param vars 变量 - * @param conditions 查询条件 - * @return 200:成功 100:任务已停止 >400任务号错误或不存在 -1:其他错误 + * 鍚戞姄鍙栫郴缁熸坊鍔犳姄鍙栦换鍔� + * @param jobId 浠诲姟鍙� + * @param vars 鍙橀噺 + * @param conditions 鏌ヨ鏉′欢 + * @return 200:鎴愬姛 100:浠诲姟宸插仠姝� >400浠诲姟鍙烽敊璇垨涓嶅瓨鍦� -1:鍏朵粬閿欒 */ protected static JSONObject addTemplateJobUrl(String jobId, String vars, String conditions) { def result = ATTEMIS_HTTP.invoke("/api/addTemplateJobUrl", [jobId : jobId, vars: vars, conditions:conditions], 'UTF-8') diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/HeExtends.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/HeExtends.groovy index 3f5231bd3..1c2a82c93 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/HeExtends.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/HeExtends.groovy @@ -16,8 +16,8 @@ class HeExtends { static main(args) { DBCollection COMMAND_COLL = MongoUtils.getCollectionByName("fangjia_log", "crawl_command_monitor", "log.mongo.db.fangjia.com"); DBObject fields = new BasicDBObject() - fields.put("city","长沙") - fields.put("keyword", "龙塘小区") + fields.put("city","闀挎矙") + fields.put("keyword", "榫欏灏忓尯") fields.put("job_id", "559f237de4b0e6f33e2bbb68") fields.put("session_id", "56726578e4b07da06f2efd6b") DBCursor cursor = COMMAND_COLL.find(fields) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/HeTests.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/HeTests.groovy index aa623ad0d..fd3c46124 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/HeTests.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/HeTests.groovy @@ -12,34 +12,34 @@ class HeTests { public static final def JOBS = [ - '559f237de4b0e6f33e2bbb68' : [isEncodingUrl:true, encoding:'GBK', enable:true, jobName:'搜房', cat:'sell'],//搜房 - '559f277ee4b0133c041de396' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'58同城', cat:'sell'],//58同城 - '559f288ee4b0133c041de3b3' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'赶集网', cat:'sell'],//赶集网 - '559f2a7be4b0133c041de3d6' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'安居客', cat:'sell'],//安居客 - '559f2dc6e4b0133c041de42a' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'搜狐焦点', cat:'sell'],//搜狐焦点 - '559f309ce4b0133c041dea84' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'链家在线', cat:'sell'],//链家在线 - '559f31c8e4b0133c041df42a' : [isEncodingUrl:true, encoding:'GBK', enable:true, jobName:'新浪乐居', cat:'sell'],//新浪乐居 - '559f32bbe4b0133c041dfaf7' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'吉屋网', cat:'sell'],//吉屋网 - '559f37b6e4b0133c041e0e2d' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'515房产网', cat:'sell'],//515房产网 - '559f3918e4b0133c041e1521' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'我爱我家', cat:'sell'],//我爱我家 - '559f3a7de4b0133c041e1c41' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'楼盘网', cat:'sell'],//楼盘网 - '559f3b52e4b0133c041e1f0f' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'好房在线', cat:'sell'],//好房在线 - '559f3ca8e4b0133c041e247f' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'百度乐居', cat:'sell'],//百度乐居 - '559f3d91e4b0133c041e27ae' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'带看网', cat:'sell'],//带看网 - '559f3e6ce4b0133c041e29f4' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'百姓网', cat:'sell'],//百姓网 - '559f3f61e4b0133c041e2cce' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'城市房产网', cat:'sell'],//城市房产网 + '559f237de4b0e6f33e2bbb68' : [isEncodingUrl:true, encoding:'GBK', enable:true, jobName:'鎼滄埧', cat:'sell'],//鎼滄埧 + '559f277ee4b0133c041de396' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'58鍚屽煄', cat:'sell'],//58鍚屽煄 + '559f288ee4b0133c041de3b3' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'璧堕泦缃�', cat:'sell'],//璧堕泦缃� + '559f2a7be4b0133c041de3d6' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'瀹夊眳瀹�', cat:'sell'],//瀹夊眳瀹� + '559f2dc6e4b0133c041de42a' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'鎼滅嫄鐒︾偣', cat:'sell'],//鎼滅嫄鐒︾偣 + '559f309ce4b0133c041dea84' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'閾惧鍦ㄧ嚎', cat:'sell'],//閾惧鍦ㄧ嚎 + '559f31c8e4b0133c041df42a' : [isEncodingUrl:true, encoding:'GBK', enable:true, jobName:'鏂版氮涔愬眳', cat:'sell'],//鏂版氮涔愬眳 + '559f32bbe4b0133c041dfaf7' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'鍚夊眿缃�', cat:'sell'],//鍚夊眿缃� + '559f37b6e4b0133c041e0e2d' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'515鎴夸骇缃�', cat:'sell'],//515鎴夸骇缃� + '559f3918e4b0133c041e1521' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'鎴戠埍鎴戝', cat:'sell'],//鎴戠埍鎴戝 + '559f3a7de4b0133c041e1c41' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'妤肩洏缃�', cat:'sell'],//妤肩洏缃� + '559f3b52e4b0133c041e1f0f' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'濂芥埧鍦ㄧ嚎', cat:'sell'],//濂芥埧鍦ㄧ嚎 + '559f3ca8e4b0133c041e247f' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'鐧惧害涔愬眳', cat:'sell'],//鐧惧害涔愬眳 + '559f3d91e4b0133c041e27ae' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'甯︾湅缃�', cat:'sell'],//甯︾湅缃� + '559f3e6ce4b0133c041e29f4' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'鐧惧缃�', cat:'sell'],//鐧惧缃� + '559f3f61e4b0133c041e2cce' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'鍩庡競鎴夸骇缃�', cat:'sell'],//鍩庡競鎴夸骇缃� - '5588f2f7e4b0a7ef70e98edb' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'赶集', cat:'rent'],//赶集 - '5588ec3be4b0ffa7d5e23dad' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'58同城', cat:'rent'],//58同城 - '5588fbfce4b0a7ef70e98ef3' : [isEncodingUrl:true, encoding:'GBK', enable:true, jobName:'搜房', cat:'rent'],//搜房 - '5589057ee4b0a7ef70e98f48' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'安居客', cat:'rent'],//安居客 - '55890362e4b0a7ef70e98f36' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'我爱我家', cat:'rent'],//我爱我家 - '55890f74e4b0a7ef70e98f87' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'515房产网', cat:'rent'],//515房产网 - '55892150e4b0a7ef70e98fc4' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'带看网', cat:'rent'],//带看网 - '558923f5e4b0a7ef70e98fdb' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'购房者', cat:'rent'],//购房者 - '5589256de4b0a7ef70e98ff3' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'城市房产网', cat:'rent'],//城市房产网 - '558925bce4b0a7ef70e9903b' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'百姓网', cat:'rent'],//百姓网 - '563c202ee4b0126639288c3f' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'新浪', cat:'rent'],//新浪 + '5588f2f7e4b0a7ef70e98edb' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'璧堕泦', cat:'rent'],//璧堕泦 + '5588ec3be4b0ffa7d5e23dad' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'58鍚屽煄', cat:'rent'],//58鍚屽煄 + '5588fbfce4b0a7ef70e98ef3' : [isEncodingUrl:true, encoding:'GBK', enable:true, jobName:'鎼滄埧', cat:'rent'],//鎼滄埧 + '5589057ee4b0a7ef70e98f48' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'瀹夊眳瀹�', cat:'rent'],//瀹夊眳瀹� + '55890362e4b0a7ef70e98f36' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'鎴戠埍鎴戝', cat:'rent'],//鎴戠埍鎴戝 + '55890f74e4b0a7ef70e98f87' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'515鎴夸骇缃�', cat:'rent'],//515鎴夸骇缃� + '55892150e4b0a7ef70e98fc4' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'甯︾湅缃�', cat:'rent'],//甯︾湅缃� + '558923f5e4b0a7ef70e98fdb' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'璐埧鑰�', cat:'rent'],//璐埧鑰� + '5589256de4b0a7ef70e98ff3' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'鍩庡競鎴夸骇缃�', cat:'rent'],//鍩庡競鎴夸骇缃� + '558925bce4b0a7ef70e9903b' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'鐧惧缃�', cat:'rent'],//鐧惧缃� + '563c202ee4b0126639288c3f' : [isEncodingUrl:true, encoding:'UTF-8', enable:true, jobName:'鏂版氮', cat:'rent'],//鏂版氮 ] public static void main(String[] args) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/IntroTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/IntroTest.groovy index 5f77aedb5..58349610f 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/IntroTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/IntroTest.groovy @@ -19,7 +19,7 @@ class IntroTest { // } // newList.each { item -> println item } - Table table = DatabaseBuilder.open(new File("d:\\profile.accdb")).getTable("基本查询"); + Table table = DatabaseBuilder.open(new File("d:\\profile.accdb")).getTable("鍩烘湰鏌ヨ"); for(Row row : table) { String name = row.get("name").toString(); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/LatitudeTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/LatitudeTest.groovy index 8d89b1f54..f46adc271 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/LatitudeTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/LatitudeTest.groovy @@ -20,7 +20,7 @@ class LatitudeTest { def suspectedListNames = [] def filePath = "d:\\suspected.xls" field.append("name",1) - query.append("city","上海") + query.append("city","涓婃捣") field.append("region", 1) field.append("value_type", 5) // seaweed.find(query, field).limit(10).each {item -> diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/LoudongOnce.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/LoudongOnce.groovy index 755125e3b..1f0877e0b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/LoudongOnce.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/LoudongOnce.groovy @@ -167,7 +167,7 @@ class LoudongOnce { Iterator iter = elements.iterator() while(iter.hasNext()) { Element ele = iter.next() - if(ele.html().indexOf("详情") > -1) { + if(ele.html().indexOf("璇︽儏") > -1) { continue; } String a = ele.getElementsByAttribute("href").toString(); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/OnceTestThird.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/OnceTestThird.groovy index 2034e0aac..ac0bac3f8 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/OnceTestThird.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/OnceTestThird.groovy @@ -120,14 +120,14 @@ public class OnceTestThird { public static final String[] VILLA_TYPE = [ - "别墅", - "独栋", - "联排", - "双拼", - "叠加" + "鍒", + "鐙爧", + "鑱旀帓", + "鍙屾嫾", + "鍙犲姞" ]; - public static final String[] DIS_TYPE = ["住宅", "公寓", "小区", "商住"]; + public static final String[] DIS_TYPE = ["浣忓畢", "鍏瘬", "灏忓尯", "鍟嗕綇"]; public static final String ALI_PROD_DOMAIN = "192.168.0.60"; public static String ALI_DATA_DB_NAME = "ali_trade_data_prod1"; @@ -142,35 +142,35 @@ public class OnceTestThird { static HttpHelper HH = new HttpHelper(HOST) public static final DBCollection SERVER_AREA_COLL = MongoUtils.getCollectionByName("fangjia", "server_area", "mongo.db.fangjia.com") public static Map cityMap=[ - "临夏州": "临夏", - "甘南州": "甘南", - "黔南州": "黔南", - "黔东南州": "黔东南", - "黔西南州": "黔西南", - "恩施州": "恩施", - "湘西州": "湘西", - "延边州": "延边", - "红河州": "红河", - "楚雄州": "楚雄", - "大理州": "大理", - "山南地区": "山南", - "那曲地区": "那曲", - "昌都地区": "昌都", - "日喀则地区": "日喀则", - "阿里地区": "阿里", - "林芝地区": "林芝", - "大兴安岭地区": "大兴安岭", - "吐鲁番地区": "吐鲁番", - "哈密地区": "哈密", - "昌吉州": "昌吉", - "伊犁州": "伊犁", - "博尔塔拉州": "博尔塔拉", - "巴音郭楞州": "巴音郭楞", - "克孜勒苏柯尔克孜州": "克孜勒苏", - "阿克苏地区": "阿克苏", - "喀什地区": "喀什", - "和田地区": "和田", - "阿勒泰地区": "阿勒泰" + "涓村宸�": "涓村", + "鐢樺崡宸�": "鐢樺崡", + "榛斿崡宸�": "榛斿崡", + "榛斾笢鍗楀窞": "榛斾笢鍗�", + "榛旇タ鍗楀窞": "榛旇タ鍗�", + "鎭╂柦宸�": "鎭╂柦", + "婀樿タ宸�": "婀樿タ", + "寤惰竟宸�": "寤惰竟", + "绾㈡渤宸�": "绾㈡渤", + "妤氶泟宸�": "妤氶泟", + "澶х悊宸�": "澶х悊", + "灞卞崡鍦板尯": "灞卞崡", + "閭f洸鍦板尯": "閭f洸", + "鏄岄兘鍦板尯": "鏄岄兘", + "鏃ュ杸鍒欏湴鍖�": "鏃ュ杸鍒�", + "闃块噷鍦板尯": "闃块噷", + "鏋楄姖鍦板尯": "鏋楄姖", + "澶у叴瀹夊箔鍦板尯": "澶у叴瀹夊箔", + "鍚愰瞾鐣湴鍖�": "鍚愰瞾鐣�", + "鍝堝瘑鍦板尯": "鍝堝瘑", + "鏄屽悏宸�": "鏄屽悏", + "浼婄妬宸�": "浼婄妬", + "鍗氬皵濉旀媺宸�": "鍗氬皵濉旀媺", + "宸撮煶閮宸�": "宸撮煶閮", + "鍏嬪瓬鍕掕嫃鏌皵鍏嬪瓬宸�": "鍏嬪瓬鍕掕嫃", + "闃垮厠鑻忓湴鍖�": "闃垮厠鑻�", + "鍠�浠�鍦板尯": "鍠�浠�", + "鍜岀敯鍦板尯": "鍜岀敯", + "闃垮嫆娉板湴鍖�": "闃垮嫆娉�" ] public static void main(String[] args) { @@ -195,7 +195,7 @@ public class OnceTestThird { udata.put("display", cityMap.get(oldCity)); SERVER_AREA_COLL.update(new BasicDBObject("_id", dbObject.get("_id")), new BasicDBObject('$set', udata)); - println "城市:\t"+oldCity+"/"+cityMap.get(oldCity)+"\t省份:"+province+ "\t"+updateCount+"\t/"+totalCount + println "鍩庡競:\t"+oldCity+"/"+cityMap.get(oldCity)+"\t鐪佷唤锛�"+province+ "\t"+updateCount+"\t/"+totalCount println udata } @@ -224,8 +224,8 @@ public class OnceTestThird { private static DBCollection on_line_stat = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", MongoUtils.MongoDB_Domain_mongo) private static Integer findDistrictstat(String city, String region, String name, String estateType) { - if(estateType.indexOf('别墅') == -1) { - estateType = '小区' + if(estateType.indexOf('鍒') == -1) { + estateType = '灏忓尯' } Date date=DateUtil.getFirstDayOfWeek(new Date()); DBObject query = new BasicDBObject(); @@ -383,10 +383,10 @@ public class OnceTestThird { } Date result = null; String parse = null; - //parse=parse.replaceFirst("^.*?[0-9]{4}(年)?([^0-9]?)", "yyyy$1"); - //parse=parse.replaceFirst("([^0-9]?)[0-9]{1,2}(月)?([^0-9]?)", "$1MM$2"); + //parse=parse.replaceFirst("^.*?[0-9]{4}(骞�)?([^0-9]?)", "yyyy$1"); + //parse=parse.replaceFirst("([^0-9]?)[0-9]{1,2}(鏈�)?([^0-9]?)", "$1MM$2"); //parse=parse.replaceFirst("([^0-9]?)[0-9]{1,2}( ?)", "$1dd$2"); - Pattern p=Pattern.compile("(\\d{4})[-|年|.]?(\\d{1,2})?[-|月|.]?(\\d{1,2})?日?"); + Pattern p=Pattern.compile("(\\d{4})[-|骞磡.]?(\\d{1,2})?[-|鏈坾.]?(\\d{1,2})?鏃�?"); Matcher m=p.matcher(date); if(m.find()){ @@ -421,7 +421,7 @@ public class OnceTestThird { public static void mainf5sdfsd3f(String[] args) { DSCollection ddColl = new DataStore(datastoreDomain, 27007).getCollection("fangjia.seaweed") - def cities = ["上海"] + def cities = ["涓婃捣"] int tc = 0 for(String city : cities) { DBObject query = new BasicDBObject() @@ -449,35 +449,35 @@ public class OnceTestThird { String estateType2 = dbo.get('estate_type2') DBObject udata = new BasicDBObject() - if (StringUtils.indexOfAny(estateType2, (String[])["商业综合体", "城市综合体", "综合体"].toArray()) > -1) { - udata.put("estate_type2", "商业综合体"); - } else if (StringUtils.indexOfAny(estateType2, (String[])["百货购物中心商铺", "百货商场", "购物中心"].toArray()) > -1) { - udata.put("estate_type2", "百货购物中心商铺"); - } else if (StringUtils.indexOfAny(estateType2, (String[])["商业街商铺", "商业街"].toArray()) > -1) { - udata.put("estate_type2", "商业街商铺"); - } else if (StringUtils.indexOfAny(estateType2, (String[])["主题", "市场"].toArray()) > -1) { - udata.put("estate_type2", "市场类商铺"); - } else if (StringUtils.indexOfAny(estateType2, (String[])["社区内铺", "社区"].toArray()) > -1) { - udata.put("estate_type2", "社区内铺"); - } else if (StringUtils.indexOfAny(estateType2, (String[])["住宅底商", "住宅底商", "裙楼"].toArray()) > -1) { - udata.put("estate_type2", "住宅底商"); + if (StringUtils.indexOfAny(estateType2, (String[])["鍟嗕笟缁煎悎浣�", "鍩庡競缁煎悎浣�", "缁煎悎浣�"].toArray()) > -1) { + udata.put("estate_type2", "鍟嗕笟缁煎悎浣�"); + } else if (StringUtils.indexOfAny(estateType2, (String[])["鐧捐揣璐墿涓績鍟嗛摵", "鐧捐揣鍟嗗満", "璐墿涓績"].toArray()) > -1) { + udata.put("estate_type2", "鐧捐揣璐墿涓績鍟嗛摵"); + } else if (StringUtils.indexOfAny(estateType2, (String[])["鍟嗕笟琛楀晢閾�", "鍟嗕笟琛�"].toArray()) > -1) { + udata.put("estate_type2", "鍟嗕笟琛楀晢閾�"); + } else if (StringUtils.indexOfAny(estateType2, (String[])["涓婚", "甯傚満"].toArray()) > -1) { + udata.put("estate_type2", "甯傚満绫诲晢閾�"); + } else if (StringUtils.indexOfAny(estateType2, (String[])["绀惧尯鍐呴摵", "绀惧尯"].toArray()) > -1) { + udata.put("estate_type2", "绀惧尯鍐呴摵"); + } else if (StringUtils.indexOfAny(estateType2, (String[])["浣忓畢搴曞晢", "浣忓畢搴曞晢", "瑁欐ゼ"].toArray()) > -1) { + udata.put("estate_type2", "浣忓畢搴曞晢"); } else if (StringUtils.indexOfAny(estateType2, (String[])[ - "商务区商铺", - "酒店", - "酒店", - "旅游", - "写字楼" + "鍟嗗姟鍖哄晢閾�", + "閰掑簵", + "閰掑簵", + "鏃呮父", + "鍐欏瓧妤�" ].toArray()) > -1) { - udata.put("estate_type2", "商务区商铺"); + udata.put("estate_type2", "鍟嗗姟鍖哄晢閾�"); } else if (StringUtils.indexOfAny(estateType2, (String[])[ - "交通设施商铺", - "地铁站", - "火车站", - "机场" + "浜ら�氳鏂藉晢閾�", + "鍦伴搧绔�", + "鐏溅绔�", + "鏈哄満" ].toArray()) > -1) { - udata.put("estate_type2", "交通设施商铺"); - } else if (StringUtils.indexOfAny(estateType2, (String[])["独立式商铺"].toArray()) > -1) { - udata.put("estate_type2", "独立式商铺"); + udata.put("estate_type2", "浜ら�氳鏂藉晢閾�"); + } else if (StringUtils.indexOfAny(estateType2, (String[])["鐙珛寮忓晢閾�"].toArray()) > -1) { + udata.put("estate_type2", "鐙珛寮忓晢閾�"); }else { udata.put("estate_type2", null); } @@ -520,8 +520,8 @@ public class OnceTestThird { query.put("cat", 'district') query.put("visible", 0) query.put("city", city) - // query.put("region", '宝山') - // query.put("name", '慧华东苑(未满三年动迁房)') + // query.put("region", '瀹濆北') + // query.put("name", '鎱у崕涓滆嫅锛堟湭婊′笁骞村姩杩佹埧锛�') DBObject fields = new BasicDBObject() fields.put("city", 1) @@ -536,7 +536,7 @@ public class OnceTestThird { String region = dbo.get('region') String name = dbo.get('name') - String s = name.replaceAll("[A-Za-z0-9\\(\\)()]+", "").replaceAll("[A-Za-z0-9]+", "").replaceAll("[\u4E00-\u9FA5]", "") + String s = name.replaceAll("[A-Za-z0-9\\(\\)锛堬級]+", "").replaceAll("[A-Za-z0-9]+", "").replaceAll("[\u4E00-\u9FA5]", "") if(s.length() > 0) { tc++ @@ -575,11 +575,11 @@ public class OnceTestThird { while(iter.hasNext()) { DBObject dbo = iter.next() def et = getDistrictType(dbo.get('kind'), dbo.get('estate_type')) - if(et.indexOf('别墅') > -1) { + if(et.indexOf('鍒') > -1) { vallaCount ++ } - if(et.indexOf('别墅') == -1) { + if(et.indexOf('鍒') == -1) { districtCount ++ } @@ -609,15 +609,15 @@ public class OnceTestThird { DBCursor cur = coll.find(q) println cur.count() def map = [ - "杭州" : 'hz.fangjia.com', - "绍兴" : 'shaoxing.fangjia.com', - "湖州" : 'huzhou.fangjia.com', - "嘉兴" : 'jiaxing.fangjia.com', - "金华" : 'jinhua.fangjia.com', - "宁波" : 'nb.fangjia.com', - "衢州" : 'ganzhou.fangjia.com', - "台州" : 'tzh.fangjia.com', - "温州" : 'wz.fangjia.com' + "鏉窞" : 'hz.fangjia.com', + "缁嶅叴" : 'shaoxing.fangjia.com', + "婀栧窞" : 'huzhou.fangjia.com', + "鍢夊叴" : 'jiaxing.fangjia.com', + "閲戝崕" : 'jinhua.fangjia.com', + "瀹佹尝" : 'nb.fangjia.com', + "琛㈠窞" : 'ganzhou.fangjia.com', + "鍙板窞" : 'tzh.fangjia.com', + "娓╁窞" : 'wz.fangjia.com' ] def countMap = [:] @@ -646,33 +646,33 @@ public class OnceTestThird { public static String getDistrictType(String kind, String estateType) { if (StringUtils.isNotBlank(kind)) { - if(kind.indexOf('小区') > -1 || kind.indexOf('公寓') > -1) { - return '小区' + if(kind.indexOf('灏忓尯') > -1 || kind.indexOf('鍏瘬') > -1) { + return '灏忓尯' } } Set ret = new HashSet(); if (StringUtils.isNotBlank(estateType)) { - if (StringUtils.indexOfAny(estateType, (String[])(["别墅", "独栋", "联排", "双拼", "叠加"].toArray())) > -1) { - ret.add("别墅"); + if (StringUtils.indexOfAny(estateType, (String[])(["鍒", "鐙爧", "鑱旀帓", "鍙屾嫾", "鍙犲姞"].toArray())) > -1) { + ret.add("鍒"); } - if (StringUtils.indexOfAny(estateType, (String[])(["住宅", "公寓", "小区", "商住"].toArray())) > -1) { - ret.add("小区"); + if (StringUtils.indexOfAny(estateType, (String[])(["浣忓畢", "鍏瘬", "灏忓尯", "鍟嗕綇"].toArray())) > -1) { + ret.add("灏忓尯"); } } if (ret.size() == 0) { - return "小区"; + return "灏忓尯"; } String s = StringUtils.join(ret, ","); - if (s != null && s.indexOf("小区") > -1) { - return "小区"; + if (s != null && s.indexOf("灏忓尯") > -1) { + return "灏忓尯"; } - return "别墅"; + return "鍒"; } @@ -685,7 +685,7 @@ public class OnceTestThird { int grade = dbo.get('city_grade') int status = dbo.get('status') String display = dbo.get('display') - if(display == '全国') { + if(display == '鍏ㄥ浗') { continue; } @@ -770,664 +770,664 @@ public class OnceTestThird { public static final def _CITY_MAP = [ - "上海" :["上海市"], - "北京" :["北京市"], - "重庆" :["重庆市"], - "天津" :["天津市"], - "安徽省":[ - "合肥市", - "毫州市", - "芜湖市", - "马鞍山市", - "池州市", - "黄山市", - "滁州市", - "安庆市", - "淮南市", - "淮北市", - "蚌埠市", - "巢湖市", - "宿州市", - "宣城市", - "六安市", - "阜阳市", - "铜陵市", - "明光市", - "天长市", - "宁国市", - "界首市", - "桐城市" + "涓婃捣" :["涓婃捣甯�"], + "鍖椾含" :["鍖椾含甯�"], + "閲嶅簡" :["閲嶅簡甯�"], + "澶╂触" :["澶╂触甯�"], + "瀹夊窘鐪�":[ + "鍚堣偉甯�", + "姣窞甯�", + "鑺滄箹甯�", + "椹瀺灞卞競", + "姹犲窞甯�", + "榛勫北甯�", + "婊佸窞甯�", + "瀹夊簡甯�", + "娣崡甯�", + "娣寳甯�", + "铓屽煚甯�", + "宸㈡箹甯�", + "瀹垮窞甯�", + "瀹e煄甯�", + "鍏畨甯�", + "闃滈槼甯�", + "閾滈櫟甯�", + "鏄庡厜甯�", + "澶╅暱甯�", + "瀹佸浗甯�", + "鐣岄甯�", + "妗愬煄甯�" ], - "福建省":[ - "福州市", - "厦门市", - "泉州市", - "漳州市", - "南平市", - "三明市", - "龙岩市", - "莆田市", - "宁德市", - "建瓯市", - "武夷山市", - "长乐市", - "福清市", - "晋江市", - "南安市", - "福安市", - "龙海市", - "邵武市", - "石狮市", - "福鼎市", - "建阳市", - "漳平市", - "永安市" + "绂忓缓鐪�":[ + "绂忓窞甯�", + "鍘﹂棬甯�", + "娉夊窞甯�", + "婕冲窞甯�", + "鍗楀钩甯�", + "涓夋槑甯�", + "榫欏博甯�", + "鑾嗙敯甯�", + "瀹佸痉甯�", + "寤虹摨甯�", + "姝﹀し灞卞競", + "闀夸箰甯�", + "绂忔竻甯�", + "鏅嬫睙甯�", + "鍗楀畨甯�", + "绂忓畨甯�", + "榫欐捣甯�", + "閭垫甯�", + "鐭崇嫯甯�", + "绂忛紟甯�", + "寤洪槼甯�", + "婕冲钩甯�", + "姘稿畨甯�" ], - "甘肃省":[ - "兰州市", - "白银市", - "武威市", - "金昌市", - "平凉市", - "张掖市", - "嘉峪关市", - "酒泉市", - "庆阳市", - "定西市", - "陇南市", - "天水市", - "玉门市", - "临夏市", - "合作市", - "敦煌市", - "甘南州" + "鐢樿們鐪�":[ + "鍏板窞甯�", + "鐧介摱甯�", + "姝﹀▉甯�", + "閲戞槍甯�", + "骞冲噳甯�", + "寮犳帠甯�", + "鍢夊唱鍏冲競", + "閰掓硥甯�", + "搴嗛槼甯�", + "瀹氳タ甯�", + "闄囧崡甯�", + "澶╂按甯�", + "鐜夐棬甯�", + "涓村甯�", + "鍚堜綔甯�", + "鏁︾厡甯�", + "鐢樺崡宸�" ], - "广西省":[ - "南宁市", - "贺州市", - "玉林市", - "桂林市", - "柳州市", - "梧州市", - "北海市", - "钦州市", - "百色市", - "防城港市", - "贵港市", - "河池市", - "崇左市", - "来宾市", - "东兴市", - "桂平市", - "北流市", - "岑溪市", - "合山市", - "凭祥市", - "宜州市" + "骞胯タ鐪�":[ + "鍗楀畞甯�", + "璐哄窞甯�", + "鐜夋灄甯�", + "妗傛灄甯�", + "鏌冲窞甯�", + "姊у窞甯�", + "鍖楁捣甯�", + "閽﹀窞甯�", + "鐧捐壊甯�", + "闃插煄娓競", + "璐垫腐甯�", + "娌虫睜甯�", + "宕囧乏甯�", + "鏉ュ甯�", + "涓滃叴甯�", + "妗傚钩甯�", + "鍖楁祦甯�", + "宀戞邯甯�", + "鍚堝北甯�", + "鍑ゥ甯�", + "瀹滃窞甯�" ], - "贵州省":[ - "贵阳市", - "安顺市", - "遵义市", - "六盘水市", - "兴义市", - "都匀市", - "凯里市", - "毕节市", - "清镇市", - "铜仁市", - "赤水市", - "仁怀市", - "福泉市" + "璐靛窞鐪�":[ + "璐甸槼甯�", + "瀹夐『甯�", + "閬典箟甯�", + "鍏洏姘村競", + "鍏翠箟甯�", + "閮藉寑甯�", + "鍑噷甯�", + "姣曡妭甯�", + "娓呴晣甯�", + "閾滀粊甯�", + "璧ゆ按甯�", + "浠佹��甯�", + "绂忔硥甯�" ], - "海南省":[ - "海口市", - "三亚市", - "万宁市", - "文昌市", - "儋州市", - "琼海市", - "东方市", - "五指山市" + "娴峰崡鐪�":[ + "娴峰彛甯�", + "涓変簹甯�", + "涓囧畞甯�", + "鏂囨槍甯�", + "鍎嬪窞甯�", + "鐞兼捣甯�", + "涓滄柟甯�", + "浜旀寚灞卞競" ], - "河北省":[ - "石家庄市", - "保定市", - "唐山市", - "邯郸市", - "邢台市", - "沧州市", - "衡水市", - "廊坊市", - "承德市", - "迁安市", - "鹿泉市", - "秦皇岛市", - "南宫市", - "任丘市", - "叶城市", - "辛集市", - "涿州市", - "定州市", - "晋州市", - "霸州市", - "黄骅市", - "遵化市", - "张家口市", - "沙河市", - "三河市", - "冀州市", - "武安市", - "河间市", - "深州市", - "新乐市", - "泊头市", - "安国市", - "双滦区", - "高碑店市" + "娌冲寳鐪�":[ + "鐭冲搴勫競", + "淇濆畾甯�", + "鍞愬北甯�", + "閭兏甯�", + "閭㈠彴甯�", + "娌у窞甯�", + "琛℃按甯�", + "寤婂潑甯�", + "鎵垮痉甯�", + "杩佸畨甯�", + "楣挎硥甯�", + "绉︾殗宀涘競", + "鍗楀甯�", + "浠讳笜甯�", + "鍙跺煄甯�", + "杈涢泦甯�", + "娑垮窞甯�", + "瀹氬窞甯�", + "鏅嬪窞甯�", + "闇稿窞甯�", + "榛勯獏甯�", + "閬靛寲甯�", + "寮犲鍙e競", + "娌欐渤甯�", + "涓夋渤甯�", + "鍐�宸炲競", + "姝﹀畨甯�", + "娌抽棿甯�", + "娣卞窞甯�", + "鏂颁箰甯�", + "娉婂ご甯�", + "瀹夊浗甯�", + "鍙屾沪鍖�", + "楂樼搴楀競" ], - "河南省":[ - "郑州市", - "洛阳市", - "焦作市", - "商丘市", - "信阳市", - "周口市", - "鹤壁市", - "安阳市", - "濮阳市", - "驻马店市", - "南阳市", - "开封市", - "漯河市", - "许昌市", - "新乡市", - "济源市", - "灵宝市", - "偃师市", - "邓州市", - "登封市", - "三门峡市", - "新郑市", - "禹州市", - "巩义市", - "永城市", - "长葛市", - "义马市", - "林州市", - "项城市", - "汝州市", - "荥阳市", - "平顶山市", - "卫辉市", - "辉县市", - "舞钢市", - "新密市", - "孟州市", - "沁阳市", - "郏县" + "娌冲崡鐪�":[ + "閮戝窞甯�", + "娲涢槼甯�", + "鐒︿綔甯�", + "鍟嗕笜甯�", + "淇¢槼甯�", + "鍛ㄥ彛甯�", + "楣ゅ甯�", + "瀹夐槼甯�", + "婵槼甯�", + "椹婚┈搴楀競", + "鍗楅槼甯�", + "寮�灏佸競", + "婕渤甯�", + "璁告槍甯�", + "鏂颁埂甯�", + "娴庢簮甯�", + "鐏靛疂甯�", + "鍋冨笀甯�", + "閭撳窞甯�", + "鐧诲皝甯�", + "涓夐棬宄″競", + "鏂伴儜甯�", + "绂瑰窞甯�", + "宸╀箟甯�", + "姘稿煄甯�", + "闀胯憶甯�", + "涔夐┈甯�", + "鏋楀窞甯�", + "椤瑰煄甯�", + "姹濆窞甯�", + "鑽ラ槼甯�", + "骞抽《灞卞競", + "鍗緣甯�", + "杈夊幙甯�", + "鑸為挗甯�", + "鏂板瘑甯�", + "瀛熷窞甯�", + "娌侀槼甯�", + "閮忓幙" ], - "黑龙江省":[ - "哈尔滨市", - "伊春市", - "牡丹江市", - "大庆市", - "鸡西市", - "鹤岗市", - "绥化市", - "齐齐哈尔市", - "黑河市", - "富锦市", - "虎林市密山市", - "佳木斯市", - "双鸭山市", - "海林市", - "铁力市", - "北安市", - "五大连池市", - "阿城市", - "尚志市", - "五常市", - "安达市", - "七台河市", - "绥芬河市", - "双城市", - "海伦市", - "宁安市", - "讷河市", - "穆棱市", - "同江市", - "肇东市" + "榛戦緳姹熺渷":[ + "鍝堝皵婊ㄥ競", + "浼婃槬甯�", + "鐗′腹姹熷競", + "澶у簡甯�", + "楦¤タ甯�", + "楣ゅ矖甯�", + "缁ュ寲甯�", + "榻愰綈鍝堝皵甯�", + "榛戞渤甯�", + "瀵岄敠甯�", + "铏庢灄甯傚瘑灞卞競", + "浣虫湪鏂競", + "鍙岄腑灞卞競", + "娴锋灄甯�", + "閾佸姏甯�", + "鍖楀畨甯�", + "浜斿ぇ杩炴睜甯�", + "闃垮煄甯�", + "灏氬織甯�", + "浜斿父甯�", + "瀹夎揪甯�", + "涓冨彴娌冲競", + "缁ヨ姮娌冲競", + "鍙屽煄甯�", + "娴蜂鸡甯�", + "瀹佸畨甯�", + "璁锋渤甯�", + "绌嗘1甯�", + "鍚屾睙甯�", + "鑲囦笢甯�" ], - "湖北省":[ - "武汉市", - "荆门市", - "咸宁市", - "襄阳市", - "荆州市", - "黄石市", - "宜昌市", - "随州市", - "鄂州市", - "孝感市", - "黄冈市", - "十堰市枣阳市", - "老河口市", - "恩施市", - "仙桃市", - "天门市", - "钟祥市", - "潜江市", - "麻城市", - "洪湖市", - "汉川市", - "赤壁市", - "松滋市", - "丹江口市", - "武穴市", - "广水市", - "石首市大冶市", - "枝江市", - "应城市", - "宜城市", - "当阳市", - "安陆市", - "宜都市", - "利川市" + "婀栧寳鐪�":[ + "姝︽眽甯�", + "鑽嗛棬甯�", + "鍜稿畞甯�", + "瑗勯槼甯�", + "鑽嗗窞甯�", + "榛勭煶甯�", + "瀹滄槍甯�", + "闅忓窞甯�", + "閯傚窞甯�", + "瀛濇劅甯�", + "榛勫唸甯�", + "鍗佸牥甯傛灒闃冲競", + "鑰佹渤鍙e競", + "鎭╂柦甯�", + "浠欐甯�", + "澶╅棬甯�", + "閽熺ゥ甯�", + "娼滄睙甯�", + "楹诲煄甯�", + "娲箹甯�", + "姹夊窛甯�", + "璧ゅ甯�", + "鏉炬粙甯�", + "涓规睙鍙e競", + "姝︾┐甯�", + "骞挎按甯�", + "鐭抽甯傚ぇ鍐跺競", + "鏋濇睙甯�", + "搴斿煄甯�", + "瀹滃煄甯�", + "褰撻槼甯�", + "瀹夐檰甯�", + "瀹滈兘甯�", + "鍒╁窛甯�" ], - "湖南省":[ - "长沙市", - "张家界市", - "郴州市", - "益阳市", - "娄底市", - "株洲市", - "衡阳市", - "湘潭市", - "岳阳市", - "常德市", - "邵阳市", - "永州市", - "张家界市", - "浏阳市", - "醴陵市", - "湘乡市", - "耒阳市", - "沅江市", - "涟源市", - "常宁市", - "吉首市", - "津市市", - "冷水江市", - "临湘市", - "汨罗市", - "武冈市", - "韶山市", - "安化县湘西州" + "婀栧崡鐪�":[ + "闀挎矙甯�", + "寮犲鐣屽競", + "閮村窞甯�", + "鐩婇槼甯�", + "濞勫簳甯�", + "鏍床甯�", + "琛¢槼甯�", + "婀樻江甯�", + "宀抽槼甯�", + "甯稿痉甯�", + "閭甸槼甯�", + "姘稿窞甯�", + "寮犲鐣屽競", + "娴忛槼甯�", + "閱撮櫟甯�", + "婀樹埂甯�", + "鑰掗槼甯�", + "娌呮睙甯�", + "娑熸簮甯�", + "甯稿畞甯�", + "鍚夐甯�", + "娲ュ競甯�", + "鍐锋按姹熷競", + "涓存箻甯�", + "姹ㄧ綏甯�", + "姝﹀唸甯�", + "闊跺北甯�", + "瀹夊寲鍘挎箻瑗垮窞" ], - "吉林省":[ - "长春市", - "吉林市", - "通化市", - "白城市", - "四平市", - "辽源市", - "松原市", - "白山市", - "集安市", - "梅河口市", - "双辽市", - "延吉市九台市", - "桦甸市", - "榆树市", - "蛟河市", - "磐石市", - "大安市", - "德惠市", - "洮南市", - "龙井市", - "珲春市", - "公主岭市", - "图们市", - "舒兰市", - "和龙市", - "临江市敦化市" + "鍚夋灄鐪�":[ + "闀挎槬甯�", + "鍚夋灄甯�", + "閫氬寲甯�", + "鐧藉煄甯�", + "鍥涘钩甯�", + "杈芥簮甯�", + "鏉惧師甯�", + "鐧藉北甯�", + "闆嗗畨甯�", + "姊呮渤鍙e競", + "鍙岃窘甯�", + "寤跺悏甯備節鍙板競", + "妗︾敻甯�", + "姒嗘爲甯�", + "铔熸渤甯�", + "纾愮煶甯�", + "澶у畨甯�", + "寰锋儬甯�", + "娲崡甯�", + "榫欎簳甯�", + "鐝叉槬甯�", + "鍏富宀競", + "鍥句滑甯�", + "鑸掑叞甯�", + "鍜岄緳甯�", + "涓存睙甯傛暒鍖栧競" ], - "江苏省":[ - "南京市", - "无锡市", - "常州市", - "扬州市", - "徐州市", - "苏州市", - "连云港市", - "盐城市", - "淮安市", - "宿迁市", - "镇江市", - "南通市", - "泰州市", - "兴化市", - "东台市", - "常熟市", - "江阴市", - "张家港市", - "通州市", - "宜兴市", - "邳州市", - "海门市", - "大丰市", - "溧阳市", - "泰兴市", - "如", - "市", - "昆山市", - "启东市", - "江都市", - "丹阳市", - "吴江市", - "靖江市", - "扬中市", - "新沂市", - "仪征市", - "太仓市", - "姜堰市", - "高邮市", - "金坛市", - "句容市", - "灌南县" + "姹熻嫃鐪�":[ + "鍗椾含甯�", + "鏃犻敗甯�", + "甯稿窞甯�", + "鎵窞甯�", + "寰愬窞甯�", + "鑻忓窞甯�", + "杩炰簯娓競", + "鐩愬煄甯�", + "娣畨甯�", + "瀹胯縼甯�", + "闀囨睙甯�", + "鍗楅�氬競", + "娉板窞甯�", + "鍏村寲甯�", + "涓滃彴甯�", + "甯哥啛甯�", + "姹熼槾甯�", + "寮犲娓競", + "閫氬窞甯�", + "瀹滃叴甯�", + "閭冲窞甯�", + "娴烽棬甯�", + "澶т赴甯�", + "婧ч槼甯�", + "娉板叴甯�", + "濡�", + "甯�", + "鏄嗗北甯�", + "鍚笢甯�", + "姹熼兘甯�", + "涓归槼甯�", + "鍚存睙甯�", + "闈栨睙甯�", + "鎵腑甯�", + "鏂版矀甯�", + "浠緛甯�", + "澶粨甯�", + "濮滃牥甯�", + "楂橀偖甯�", + "閲戝潧甯�", + "鍙ュ甯�", + "鐏屽崡鍘�" ], - "江西省":[ - "南昌市", - "赣州市", - "上饶市", - "宜春市", - "景德镇市", - "亲余市", - "九江市", - "萍乡市", - "抚州市", - "鹰潭市", - "吉安市", - "丰城市", - "樟树市", - "德兴市", - "瑞金市", - "井冈山市", - "高安市", - "乐平市", - "南康市", - "贵溪市", - "瑞昌市", - "东乡县", - "广丰县", - "信州区", - "三清山" + "姹熻タ鐪�":[ + "鍗楁槍甯�", + "璧e窞甯�", + "涓婇ザ甯�", + "瀹滄槬甯�", + "鏅痉闀囧競", + "浜蹭綑甯�", + "涔濇睙甯�", + "钀嶄埂甯�", + "鎶氬窞甯�", + "楣版江甯�", + "鍚夊畨甯�", + "涓板煄甯�", + "妯熸爲甯�", + "寰峰叴甯�", + "鐟為噾甯�", + "浜曞唸灞卞競", + "楂樺畨甯�", + "涔愬钩甯�", + "鍗楀悍甯�", + "璐垫邯甯�", + "鐟炴槍甯�", + "涓滀埂鍘�", + "骞夸赴鍘�", + "淇″窞鍖�", + "涓夋竻灞�" ], - "辽宁省":[ - "沈阳市", - "葫芦岛市", - "大连市", - "盘锦市", - "鞍山市", - "铁岭市", - "本溪市", - "丹东市", - "抚顺市", - "锦州市", - "辽阳市", - "阜新市调兵山市", - "朝阳市", - "海城市", - "北票市", - "盖州市", - "凤城市", - "庄河市", - "凌源市", - "开原市", - "兴城市", - "新民市", - "大石桥市", - "东港市", - "北宁市", - "瓦房店市", - "普兰店市", - "凌海市", - "灯塔市", - "营口市" + "杈藉畞鐪�":[ + "娌堥槼甯�", + "钁姦宀涘競", + "澶ц繛甯�", + "鐩橀敠甯�", + "闉嶅北甯�", + "閾佸箔甯�", + "鏈邯甯�", + "涓逛笢甯�", + "鎶氶『甯�", + "閿﹀窞甯�", + "杈介槼甯�", + "闃滄柊甯傝皟鍏靛北甯�", + "鏈濋槼甯�", + "娴峰煄甯�", + "鍖楃エ甯�", + "鐩栧窞甯�", + "鍑ゅ煄甯�", + "搴勬渤甯�", + "鍑屾簮甯�", + "寮�鍘熷競", + "鍏村煄甯�", + "鏂版皯甯�", + "澶х煶妗ュ競", + "涓滄腐甯�", + "鍖楀畞甯�", + "鐡︽埧搴楀競", + "鏅叞搴楀競", + "鍑屾捣甯�", + "鐏甯�", + "钀ュ彛甯�" ], - "内蒙古":[ - "呼和浩特市", - "呼伦贝尔市", - "赤峰市", - "扎兰屯市", - "鄂尔多斯市", - "乌兰察布市", - "巴彦淖尔市", - "二连浩特市", - "霍林郭勒市", - "包头市", - "乌海市", - "阿尔山市", - "乌兰浩特市", - "锡林浩特市", - "根河市", - "满洲里市", - "额尔古纳市", - "牙克石市", - "临河市", - "丰镇市", - "通辽市" + "鍐呰挋鍙�":[ + "鍛煎拰娴╃壒甯�", + "鍛间鸡璐濆皵甯�", + "璧ゅ嘲甯�", + "鎵庡叞灞競", + "閯傚皵澶氭柉甯�", + "涔屽叞瀵熷竷甯�", + "宸村溅娣栧皵甯�", + "浜岃繛娴╃壒甯�", + "闇嶆灄閮嫆甯�", + "鍖呭ご甯�", + "涔屾捣甯�", + "闃垮皵灞卞競", + "涔屽叞娴╃壒甯�", + "閿℃灄娴╃壒甯�", + "鏍规渤甯�", + "婊℃床閲屽競", + "棰濆皵鍙ょ撼甯�", + "鐗欏厠鐭冲競", + "涓存渤甯�", + "涓伴晣甯�", + "閫氳窘甯�" ], - "宁夏省":[ - "银川市", - "固原市", - "石嘴山市", - "青铜峡市", - "中卫市", - "吴忠市", - "灵武市" + "瀹佸鐪�":[ + "閾跺窛甯�", + "鍥哄師甯�", + "鐭冲槾灞卞競", + "闈掗摐宄″競", + "涓崼甯�", + "鍚村繝甯�", + "鐏垫甯�" ], - "青海省":["西宁市", "格尔木市", "德令哈市"], - "山东省":[ - "济南市", - "青岛市", - "威海市", - "潍坊市", - "菏泽市", - "济宁市", - "莱芜市", - "东营市", - "烟台市", - "淄博市", - "枣庄市", - "泰安市", - "临沂市", - "日照市", - "德州市", - "聊城市", - "滨州市", - "乐陵市", - "兖州市", - "诸城市", - "邹城市", - "滕州市", - "肥城市", - "新泰市", - "胶州市", - "胶南市", - "即墨市", - "龙口市", - "平度市", - "莱西市" + "闈掓捣鐪�":["瑗垮畞甯�", "鏍煎皵鏈ㄥ競", "寰蜂护鍝堝競"], + "灞变笢鐪�":[ + "娴庡崡甯�", + "闈掑矝甯�", + "濞佹捣甯�", + "娼嶅潑甯�", + "鑿忔辰甯�", + "娴庡畞甯�", + "鑾辫姕甯�", + "涓滆惀甯�", + "鐑熷彴甯�", + "娣勫崥甯�", + "鏋e簞甯�", + "娉板畨甯�", + "涓存矀甯�", + "鏃ョ収甯�", + "寰峰窞甯�", + "鑱婂煄甯�", + "婊ㄥ窞甯�", + "涔愰櫟甯�", + "鍏栧窞甯�", + "璇稿煄甯�", + "閭瑰煄甯�", + "婊曞窞甯�", + "鑲ュ煄甯�", + "鏂版嘲甯�", + "鑳跺窞甯�", + "鑳跺崡甯�", + "鍗冲ⅷ甯�", + "榫欏彛甯�", + "骞冲害甯�", + "鑾辫タ甯�" ], - "山西省":[ - "太原市", - "大同市", - "阳泉市", - "长治市", - "临汾市", - "晋中市", - "运城市", - "忻州市", - "朔州市", - "吕梁市", - "古交市", - "高平市", - "永济市", - "孝义市", - "侯马市", - "霍州市", - "介休市", - "河津市", - "汾阳市", - "原平市", - "潞城市" + "灞辫タ鐪�":[ + "澶師甯�", + "澶у悓甯�", + "闃虫硥甯�", + "闀挎不甯�", + "涓存本甯�", + "鏅嬩腑甯�", + "杩愬煄甯�", + "蹇诲窞甯�", + "鏈斿窞甯�", + "鍚曟甯�", + "鍙や氦甯�", + "楂樺钩甯�", + "姘告祹甯�", + "瀛濅箟甯�", + "渚┈甯�", + "闇嶅窞甯�", + "浠嬩紤甯�", + "娌虫触甯�", + "姹鹃槼甯�", + "鍘熷钩甯�", + "娼炲煄甯�" ], - "陕西省":[ - "西安市", - "咸阳市", - "榆林市", - "宝鸡市", - "铜川市", - "渭南市", - "汉中市", - "安康市", - "商洛市", - "延安市", - "韩城市", - "兴平市", - "华阴市" + "闄曡タ鐪�":[ + "瑗垮畨甯�", + "鍜搁槼甯�", + "姒嗘灄甯�", + "瀹濋浮甯�", + "閾滃窛甯�", + "娓崡甯�", + "姹変腑甯�", + "瀹夊悍甯�", + "鍟嗘礇甯�", + "寤跺畨甯�", + "闊╁煄甯�", + "鍏村钩甯�", + "鍗庨槾甯�" ], - "四川省":[ - "成都市", - "广安市", - "德阳市", - "乐山市", - "巴中市", - "内江市", - "宜宾市", - "南充市", - "都江堰市", - "自贡市", - "泸洲市", - "广元市", - "达州市", - "资阳市", - "绵阳市", - "眉山市", - "遂宁市", - "雅安市", - "阆中市", - "攀枝花市", - "广汉市", - "绵竹市", - "万源市", - "华蓥市", - "江油市", - "西昌市", - "彭州市", - "简阳市", - "崇州市", - "什邡市", - "峨眉山市", - "邛崃市", - "双流县" + "鍥涘窛鐪�":[ + "鎴愰兘甯�", + "骞垮畨甯�", + "寰烽槼甯�", + "涔愬北甯�", + "宸翠腑甯�", + "鍐呮睙甯�", + "瀹滃甯�", + "鍗楀厖甯�", + "閮芥睙鍫板競", + "鑷础甯�", + "娉告床甯�", + "骞垮厓甯�", + "杈惧窞甯�", + "璧勯槼甯�", + "缁甸槼甯�", + "鐪夊北甯�", + "閬傚畞甯�", + "闆呭畨甯�", + "闃嗕腑甯�", + "鏀�鏋濊姳甯�", + "骞挎眽甯�", + "缁电甯�", + "涓囨簮甯�", + "鍗庤摜甯�", + "姹熸补甯�", + "瑗挎槍甯�", + "褰窞甯�", + "绠�闃冲競", + "宕囧窞甯�", + "浠�閭″競", + "宄ㄧ湁灞卞競", + "閭涘磧甯�", + "鍙屾祦鍘�" ], - "广东省":[ - "广州市", - "汕头市", - "湛江市", - "江门市", - "佛山市", - "韶关市", - "茂名市", - "肇庆市", - "惠州市", - "珠海市", - "深圳市", - "潮州市", - "中山市", - "东莞市", - "汕尾市", - "阳江市", - "河源市", - "梅州市", - "清远市", - "揭阳市", - "云浮市", - "增城市" + "骞夸笢鐪�":[ + "骞垮窞甯�", + "姹曞ご甯�", + "婀涙睙甯�", + "姹熼棬甯�", + "浣涘北甯�", + "闊跺叧甯�", + "鑼傚悕甯�", + "鑲囧簡甯�", + "鎯犲窞甯�", + "鐝犳捣甯�", + "娣卞湷甯�", + "娼窞甯�", + "涓北甯�", + "涓滆帪甯�", + "姹曞熬甯�", + "闃虫睙甯�", + "娌虫簮甯�", + "姊呭窞甯�", + "娓呰繙甯�", + "鎻槼甯�", + "浜戞诞甯�", + "澧炲煄甯�" ], - "西藏":["拉萨市", "日喀则市"], - "新疆":[ - "乌鲁木齐市", - "石河子市", - "喀什市", - "阿勒泰市", - "阜康市", - "库尔勒市", - "阿克苏市", - "阿拉尔市", - "哈密市", - "克拉玛依市", - "昌吉市", - "奎屯市", - "米泉市", - "和田市" + "瑗胯棌":["鎷夎惃甯�", "鏃ュ杸鍒欏競"], + "鏂扮枂":[ + "涔岄瞾鏈ㄩ綈甯�", + "鐭虫渤瀛愬競", + "鍠�浠�甯�", + "闃垮嫆娉板競", + "闃滃悍甯�", + "搴撳皵鍕掑競", + "闃垮厠鑻忓競", + "闃挎媺灏斿競", + "鍝堝瘑甯�", + "鍏嬫媺鐜涗緷甯�", + "鏄屽悏甯�", + "濂庡悲甯�", + "绫虫硥甯�", + "鍜岀敯甯�" ], - "云南省":[ - "昆明市", - "玉溪市", - "大理市", - "曲靖市", - "昭通市", - "保山市", - "丽江市", - "临沧市", - "楚雄市", - "开远市", - "个旧市", - "景洪市", - "安宁市", - "宣威市" + "浜戝崡鐪�":[ + "鏄嗘槑甯�", + "鐜夋邯甯�", + "澶х悊甯�", + "鏇查潠甯�", + "鏄�氬競", + "淇濆北甯�", + "涓芥睙甯�", + "涓存钵甯�", + "妤氶泟甯�", + "寮�杩滃競", + "涓棫甯�", + "鏅椽甯�", + "瀹夊畞甯�", + "瀹e▉甯�" ], - "浙江省":[ - "杭州市", - "宁波市", - "绍兴市", - "温州市", - "台州市", - "湖州市", - "嘉兴市", - "金华市", - "舟山市", - "衢州市", - "丽水市", - "余姚市", - "乐清市", - "临海市", - "温岭市", - "永康市", - "瑞安市", - "慈溪市", - "义乌市", - "上虞市", - "诸暨市", - "海宁市", - "桐乡市", - "兰溪市", - "龙泉市", - "建德市", - "富德市", - "富阳市", - "平湖市东阳市", - "东阳市", - "嵊州市", - "奉化市", - "临安市", - "江山市", - "宁海市" + "娴欐睙鐪�":[ + "鏉窞甯�", + "瀹佹尝甯�", + "缁嶅叴甯�", + "娓╁窞甯�", + "鍙板窞甯�", + "婀栧窞甯�", + "鍢夊叴甯�", + "閲戝崕甯�", + "鑸熷北甯�", + "琛㈠窞甯�", + "涓芥按甯�", + "浣欏甯�", + "涔愭竻甯�", + "涓存捣甯�", + "娓╁箔甯�", + "姘稿悍甯�", + "鐟炲畨甯�", + "鎱堟邯甯�", + "涔変箤甯�", + "涓婅櫈甯�", + "璇告毃甯�", + "娴峰畞甯�", + "妗愪埂甯�", + "鍏版邯甯�", + "榫欐硥甯�", + "寤哄痉甯�", + "瀵屽痉甯�", + "瀵岄槼甯�", + "骞虫箹甯備笢闃冲競", + "涓滈槼甯�", + "宓婂窞甯�", + "濂夊寲甯�", + "涓村畨甯�", + "姹熷北甯�", + "瀹佹捣甯�" ], - "台湾省":["台北市", "台南市", "台中市高雄市", "桃源市"]] + "鍙版咕鐪�":["鍙板寳甯�", "鍙板崡甯�", "鍙颁腑甯傞珮闆勫競", "妗冩簮甯�"]] } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/Polygon.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/Polygon.groovy index 881186b3c..ebff01715 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/Polygon.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/Polygon.groovy @@ -125,23 +125,23 @@ public class Polygon { int nCross = 0; for (int i = 0; i < verticesCount; ++ i) { Mpoint p1 = vertices.get(i); - Mpoint p2 = vertices.get((i + 1) % verticesCount);// 求解 y=p.y 与 p1 p2 的交点 - if ( p1.getMapLoationY() == p2.getMapLoationY() ) { // p1p2 与 y=p0.y平行 + Mpoint p2 = vertices.get((i + 1) % verticesCount);// 姹傝В y=p.y 涓� p1 p2 鐨勪氦鐐� + if ( p1.getMapLoationY() == p2.getMapLoationY() ) { // p1p2 涓� y=p0.y骞宠 continue; } - if ( lat < Math.min(p1.getY(), p2.getY()) ) { // 交点在p1p2延长线上 + if ( lat < Math.min(p1.getY(), p2.getY()) ) { // 浜ょ偣鍦╬1p2寤堕暱绾夸笂 continue; } - if ( lat >= Math.max(p1.getY(), p2.getY()) ) { // 交点在p1p2延长线上 + if ( lat >= Math.max(p1.getY(), p2.getY()) ) { // 浜ょ偣鍦╬1p2寤堕暱绾夸笂 continue; } - // 求交点的 X 坐标 + // 姹備氦鐐圭殑 X 鍧愭爣 double x = (lat - p1.getMapLoationY()) * (p2.getMapLoationX() - p1.getMapLoationX()) / (p2.getMapLoationY() - p1.getMapLoationY()) + p1.getMapLoationX(); - if ( x > lng) { // 只统计单边交点 + if ( x > lng) { // 鍙粺璁″崟杈逛氦鐐� nCross++; } } - // 单边交点为偶数,点在多边形之外 + // 鍗曡竟浜ょ偣涓哄伓鏁帮紝鐐瑰湪澶氳竟褰箣澶� return (nCross%2==1); } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/PoseidonOnce.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/PoseidonOnce.groovy index 48b616432..a110c0fc4 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/PoseidonOnce.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/PoseidonOnce.groovy @@ -13,25 +13,25 @@ class PoseidonOnce { static def poseidonConn = Sql.newInstance("jdbc:mysql://192.168.0.132:4306/poseidon?useUnicode=true&characterEncoding=utf-8&autoReconnect=true", "sa", "G00jia", "com.mysql.jdbc.Driver") static def soufunRegionMap = [ - "030" : "宝山", - "020" : "长宁", - "0996" : "崇明", - "032" : "奉贤", - "023" : "虹口", - "024" : "黄埔", - "029" : "嘉定", - "035" : "金山", - "021" : "静安", - "022" : "卢湾", - "018" : "闵行", - "031" : "青浦", - "0586" : "松江", - "019" : "徐汇", - "026" : "杨浦", - "027" : "闸北", - "01046" : "上海周边", - "028" : "普陀", - "025" : "浦东" + "030" : "瀹濆北", + "020" : "闀垮畞", + "0996" : "宕囨槑", + "032" : "濂夎搐", + "023" : "铏瑰彛", + "024" : "榛勫煍", + "029" : "鍢夊畾", + "035" : "閲戝北", + "021" : "闈欏畨", + "022" : "鍗㈡咕", + "018" : "闂佃", + "031" : "闈掓郸", + "0586" : "鏉炬睙", + "019" : "寰愭眹", + "026" : "鏉ㄦ郸", + "027" : "闂稿寳", + "01046" : "涓婃捣鍛ㄨ竟", + "028" : "鏅檧", + "025" : "娴︿笢" ] public static void main(String[] args) { @@ -111,7 +111,7 @@ class PoseidonOnce { } /** - * 从crawl_request移除数据 + * 浠巆rawl_request绉婚櫎鏁版嵁 * @return */ public static def removeDataFromCrawlRequest() { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/SaveToWebpage.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/SaveToWebpage.groovy index bb60069f8..1b74b0e63 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/SaveToWebpage.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/SaveToWebpage.groovy @@ -19,16 +19,16 @@ class SaveToWebpage { println url saveToWebpage(url,fileContents) } - println "总共新增${countSave}总共更新${countUpdate}" + println "鎬诲叡鏂板${countSave}鎬诲叡鏇存柊${countUpdate}" } static void saveToWebpage(String detailUrl, String detailContent){ BasicDBObject query = new BasicDBObject() query.put("url", detailUrl) - query.put("city", "嘉兴") + query.put("city", "鍢夊叴") query.put("category", "district") - query.put("site_name", "中国房产超市网") - query.put("page_name", "概况") + query.put("site_name", "涓浗鎴夸骇瓒呭競缃�") + query.put("page_name", "姒傚喌") DBObject entity = webpage.findOne(query) if (entity != null){ DBObject data = new BasicDBObject() @@ -39,10 +39,10 @@ class SaveToWebpage { } else { DBObject data = new BasicDBObject() data.put("url", detailUrl) - data.put("city", "嘉兴") + data.put("city", "鍢夊叴") data.put("category", "district") - data.put("site_name", "中国房产超市网") - data.put("page_name", "概况") + data.put("site_name", "涓浗鎴夸骇瓒呭競缃�") + data.put("page_name", "姒傚喌") data.put("content", DataUtil.zip(detailContent)) data.put("c_date", new Date()) data.put("m_date", new Date()) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/SellDataAddSighterBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/SellDataAddSighterBatch.groovy index 8ddebbbba..0c2f9c6cc 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/SellDataAddSighterBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/SellDataAddSighterBatch.groovy @@ -11,7 +11,7 @@ class SellDataAddSighterBatch extends BaseBatch{ private static final DBCollection HOUSE_COLL = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "mongo.db.fangjia.com") private static final DBCollection TOBEGRABBED = MongoUtils.getCollectionByName("fangjia_log", "artemis_message", "mongo.db.fangjia.com") - //假设在周一时运行 + //鍋囪鍦ㄥ懆涓�鏃惰繍琛� Date d = new Date() - 6; @@ -26,12 +26,12 @@ class SellDataAddSighterBatch extends BaseBatch{ // String[] attrs = line.split("\t") // println attrs[0] + ":" + attrs[1] // DBObject addDbo = new BasicDBObject() -// addDbo.put("city","绍兴") +// addDbo.put("city","缁嶅叴") // addDbo.put("c_date", new Date()) // addDbo.put("name", attrs[1]) // addDbo.put("region",attrs[0]) // addDbo.put("status", 0) -// addDbo.put("user_name", "机器") +// addDbo.put("user_name", "鏈哄櫒") // addDbo.put("category", "sell") // TOBEGRABBED.save(addDbo) // } @@ -57,7 +57,7 @@ class SellDataAddSighterBatch extends BaseBatch{ addDbo.put("name", dbo.get('district_name')) addDbo.put("region",dbo.get('region')) addDbo.put("status", 0) - addDbo.put("user_name", "贺绿源") + addDbo.put("user_name", "璐虹豢婧�") addDbo.put("category", "sell") TOBEGRABBED.save(addDbo) i++ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/TransferTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/TransferTest.groovy index f22f7b7ce..bfd4a267b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/TransferTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/TransferTest.groovy @@ -21,7 +21,7 @@ class TransferTest { static main(args) { int c = 0 DBObject query = new BasicDBObject() - query.put("city","深圳") + query.put("city","娣卞湷") DBCursor dbCursor=LOUDONG_CONN_TEST.find(query) dbCursor.setOptions(Bytes.QUERYOPTION_NOTIMEOUT) while (dbCursor.hasNext()) { @@ -29,7 +29,7 @@ class TransferTest { c++ DBObject obj = dbCursor.next() DBObject queryOnline = new BasicDBObject() - queryOnline.put("city","深圳") + queryOnline.put("city","娣卞湷") queryOnline.put("region", obj.get("region")) queryOnline.put("name", obj.get("name")) queryOnline.put("house_num", obj.get("house_num")) @@ -60,7 +60,7 @@ class TransferTest { }else { DBObject insertObj = new BasicDBObject() - insertObj.put("city", '深圳') + insertObj.put("city", '娣卞湷') insertObj.put("name", obj.get("name")) insertObj.put("region", obj.get("region")) insertObj.put("c_date", obj.get("c_date")) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/UpdateData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/UpdateData.groovy index 90ff424ec..b9b4c8160 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/UpdateData.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/UpdateData.groovy @@ -9,20 +9,20 @@ import com.mongodb.DBObject class UpdateData { public static final String[] estateType2s = [ - "商业街商铺", - "市场类商铺", - "社区内铺", - "住宅底商", - "百货购物中心商铺", - "商业综合体", - "商务区商铺", - "交通设施商铺" + "鍟嗕笟琛楀晢閾�", + "甯傚満绫诲晢閾�", + "绀惧尯鍐呴摵", + "浣忓畢搴曞晢", + "鐧捐揣璐墿涓績鍟嗛摵", + "鍟嗕笟缁煎悎浣�", + "鍟嗗姟鍖哄晢閾�", + "浜ら�氳鏂藉晢閾�" ]; static main(args) { DSCollection ddColl = new DataStore("seaweed.db.fangjia.com", 27007).getCollection("fangjia.seaweed") DBObject query = new BasicDBObject() -// query.put('city', '上海') +// query.put('city', '涓婃捣') query.put('cat', 'shop') query.put('visible', 0) @@ -33,8 +33,8 @@ class UpdateData { DBObject dbo = iter.next() String et2 = dbo.get('estate_type2') println dbo.get('name') -// if(et2.equals('内铺')) { -// et2 = '社区内铺' +// if(et2.equals('鍐呴摵')) { +// et2 = '绀惧尯鍐呴摵' // } if(estateType2Compare(et2)) { DBObject uq = new BasicDBObject() diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/Watcher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/Watcher.groovy index 40fe526e8..43feb5b85 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/Watcher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/Watcher.groovy @@ -1,7 +1,7 @@ package com.fangjia.script public enum Watcher { - //离职同事 + //绂昏亴鍚屼簨 LiuPeiPei('13621626685', 'wangwenyan@fangjia.com'), YanZhou('13621626685','wangwenyan@fangjia.com'), HuangXiaoHu('13621626685', 'wangwenyan@fangjia.com'), @@ -18,7 +18,7 @@ public enum Watcher { FangRui('17717680589','wangwenyan@fangjia.com'), DuXiaoYu('13621626685', 'wangwenyan@fangjia.com'), - //在职同事 + //鍦ㄨ亴鍚屼簨 LiXue('13311649646','wangwenyan@fangjia.com'), WangWenYan('13916076378','wangwenyan@fangjia.com'), GaoJuan('15021384995','gaojuan@fangjia.com'), diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/addrepo/AddMapData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/addrepo/AddMapData.groovy index a847f3afd..9b92c53bc 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/addrepo/AddMapData.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/addrepo/AddMapData.groovy @@ -14,7 +14,7 @@ class AddMapData { static main(args) { DBObject obj = new BasicDBObject() obj.put("cityCode",21); - obj.put("name", "三沙"); + obj.put("name", "涓夋矙"); obj.put("lat",16.838987d); obj.put("lng",112.340047d); obj.put("zoom", 15); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/addrepo/AddressParserService.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/addrepo/AddressParserService.groovy index b05dee79f..09a781c7c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/addrepo/AddressParserService.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/addrepo/AddressParserService.groovy @@ -43,16 +43,16 @@ class AddressParserService { ret.cat = djson.cat if (djson.precise == 0) { - // 匹配到小区 + // 鍖归厤鍒板皬鍖� ret.cla = djson.cat ret.qw = djson.cat if (ret.cat[0] == 'district') { - ret.catStr = '小区' + ret.catStr = '灏忓尯' } else if (ret.cat[0] == 'office') { - ret.catStr = '写字楼' + ret.catStr = '鍐欏瓧妤�' } else if (ret.cat[0] == 'shop') { - ret.catStr = '商铺' + ret.catStr = '鍟嗛摵' } } else if (djson.precise == 1) { ret.cla = djson.cla @@ -60,13 +60,13 @@ class AddressParserService { for (c in ret.cla) { if (isDistrict(c)) { - ret.catStr = '小区' + ret.catStr = '灏忓尯' break } else if (isOffice(c)) { - ret.catStr = '写字楼' + ret.catStr = '鍐欏瓧妤�' break } else if (isShop(c)) { - ret.catStr = '商铺' + ret.catStr = '鍟嗛摵' break } } @@ -80,9 +80,9 @@ class AddressParserService { return ret } - private final static List DISTRICT_CLAS = Arrays.asList("地产小区", "小区/楼盘", "别墅"); - private final static List OFFICE_CLAS = Arrays.asList("商务大厦", "办公大厦"); - private final static List SHOP_CLAS = Arrays.asList("综合商场/购物中心", "购物"); + private final static List DISTRICT_CLAS = Arrays.asList("鍦颁骇灏忓尯", "灏忓尯/妤肩洏", "鍒"); + private final static List OFFICE_CLAS = Arrays.asList("鍟嗗姟澶у帵", "鍔炲叕澶у帵"); + private final static List SHOP_CLAS = Arrays.asList("缁煎悎鍟嗗満/璐墿涓績", "璐墿"); private boolean isDistrict(String cla) { for (String c : DISTRICT_CLAS) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/addrepo/BaiduAPIService.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/addrepo/BaiduAPIService.groovy index b1b78b80e..d0fd10107 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/addrepo/BaiduAPIService.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/addrepo/BaiduAPIService.groovy @@ -129,10 +129,10 @@ class BaiduAPIService { static main(args) { BaiduAPIService s = new BaiduAPIService() -// println s.geocoder('上海', '一二八纪念路933弄') +// println s.geocoder('涓婃捣', '涓�浜屽叓绾康璺�933寮�') // println s.geoconv6To5('13510836.5,3661517.3') - println s.roundSearch(121.48175256075, 31.25314063543, 300, '学校', 10, 0, 1) + println s.roundSearch(121.48175256075, 31.25314063543, 300, '瀛︽牎', 10, 0, 1) } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/addrepo/Bianmen.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/addrepo/Bianmen.groovy index f6f236517..30a2e31d7 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/addrepo/Bianmen.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/addrepo/Bianmen.groovy @@ -11,13 +11,13 @@ class Bianmen { static DSCollection ADDREPO = new DataStore("seaweed.db.fangjia.com", 27007).getCollection("fangjia.addrepo"); static main(args) { - // 处理边门 - def p0 = Pattern.compile('.*[0-9一二三四五六七八九]号门[))]?$') - def p1 = Pattern.compile('.*[东南西北]+[1-9一二三四五六七八九]?[大小]?门[))]?$') - def p2 = Pattern.compile('.*[前后正边侧大小路]门[))]?$') - def p = Pattern.compile('.*[东南西北]+[1-9一二三四五六七八九]?[大小]?[前后]?(号)?(边)?门$') - println p.matcher("XXXX南一门").matches() -// DBObject d = new BasicDBObject('$set', new BasicDBObject('std_tag', '出入口')) + // 澶勭悊杈归棬 + def p0 = Pattern.compile('.*[0-9涓�浜屼笁鍥涗簲鍏竷鍏節]鍙烽棬[锛�)]?$') + def p1 = Pattern.compile('.*[涓滃崡瑗垮寳]+[1-9涓�浜屼笁鍥涗簲鍏竷鍏節]?[澶у皬]?闂╗锛�)]?$') + def p2 = Pattern.compile('.*[鍓嶅悗姝h竟渚уぇ灏忚矾]闂╗锛�)]?$') + def p = Pattern.compile('.*[涓滃崡瑗垮寳]+[1-9涓�浜屼笁鍥涗簲鍏竷鍏節]?[澶у皬]?[鍓嶅悗]?(鍙�)?(杈�)?闂�$') + println p.matcher("XXXX鍗椾竴闂�").matches() +// DBObject d = new BasicDBObject('$set', new BasicDBObject('std_tag', '鍑哄叆鍙�')) // // def index = 0 // ADDREPO.find().batchSize(100).bulk(false).each { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/addrepo/CnTokenizer2.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/addrepo/CnTokenizer2.groovy index 9eef2f93d..50be0d78e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/addrepo/CnTokenizer2.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/addrepo/CnTokenizer2.groovy @@ -18,7 +18,7 @@ class CnTokenizer2 extends CnTokenizer { private static Logger LOGGER = LoggerFactory.getLogger(CnTokenizer2.class); /** - * 分词结果 + * 鍒嗚瘝缁撴灉 * * @param k * @return @@ -83,7 +83,7 @@ class CnTokenizer2 extends CnTokenizer { return Collections.EMPTY_LIST; } - private final static Pattern ALPHA_PATTERN = Pattern.compile("[a-zA-Z\\d\\-负一二三四五六七八九十零两个百千万亿]+(#|弄|号楼?|[甲乙丙丁]?室|幢|橦|栋|座|口|楼|房|单元|区|层)?") + private final static Pattern ALPHA_PATTERN = Pattern.compile("[a-zA-Z\\d\\-璐熶竴浜屼笁鍥涗簲鍏竷鍏節鍗侀浂涓や釜鐧惧崈涓囦嚎]+(#|寮剕鍙锋ゼ?|[鐢蹭箼涓欎竵]?瀹骞姗鏍媩搴鍙妤紎鎴縷鍗曞厓|鍖簗灞�)?") private static String fetchAlpha(List ret, String t) { Matcher m = ALPHA_PATTERN.matcher(t); def value = "" diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/addrepo/ExcelParser.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/addrepo/ExcelParser.groovy index 8dad14ed7..783dd6046 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/addrepo/ExcelParser.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/addrepo/ExcelParser.groovy @@ -7,7 +7,7 @@ import org.apache.poi.xssf.usermodel.XSSFFormulaEvaluator import org.apache.poi.xssf.usermodel.XSSFWorkbook /** - * apache poi excel解析器 + * apache poi excel瑙f瀽鍣� * Created by yk on 2014/4/24. */ class ExcelParser { @@ -89,12 +89,12 @@ class ExcelParser { try { CellValue cellValue; cellValue = evaluator.evaluate(cell); - switch (cellValue.getCellType()) { //判断公式类型 + switch (cellValue.getCellType()) { //鍒ゆ柇鍏紡绫诲瀷 case Cell.CELL_TYPE_BOOLEAN: value = cellValue.getBooleanValue(); break; case Cell.CELL_TYPE_NUMERIC: - // 处理日期 + // 澶勭悊鏃ユ湡 if (DateUtil.isCellDateFormatted(cell)) { value = cell.getDateCellValue(); } else { @@ -136,7 +136,7 @@ class ExcelParser { } public static void main(String[]args) { - def filename = 'C:\\Users\\yk\\Desktop\\yongjia\\永嘉地址数据(上海)_V1.xlsx' + def filename = 'C:\\Users\\yk\\Desktop\\yongjia\\姘稿槈鍦板潃鏁版嵁锛堜笂娴凤級_V1.xlsx' ExcelParser parser = new ExcelParser(filename) def (headers, rows) = parser.parse() println 'Headers' diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/addrepo/ExportBaiDuMapCrawlarResult.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/addrepo/ExportBaiDuMapCrawlarResult.groovy index fbb4da81e..6d7cdaeb3 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/addrepo/ExportBaiDuMapCrawlarResult.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/addrepo/ExportBaiDuMapCrawlarResult.groovy @@ -23,8 +23,8 @@ class ExportBaiDuMapCrawlarResult { } def run(){ - def citys = readTxt("e:\\数据导出\\城市列表\\citys.txt") - def keyword = "住宅区,小区,公寓,别墅" + def citys = readTxt("e:\\鏁版嵁瀵煎嚭\\鍩庡競鍒楄〃\\citys.txt") + def keyword = "浣忓畢鍖�,灏忓尯,鍏瘬,鍒" def rets = []; def index = 0; for(def city : citys){ @@ -39,7 +39,7 @@ class ExportBaiDuMapCrawlarResult { rets << ret println index +" " + ret } - export(rets, "e:\\数据导出\\百度抓取\\百度抓取结果.xlsx") + export(rets, "e:\\鏁版嵁瀵煎嚭\\鐧惧害鎶撳彇\\鐧惧害鎶撳彇缁撴灉.xlsx") } @@ -87,7 +87,7 @@ class ExportBaiDuMapCrawlarResult { def WORK_BOOK = null; try { if (file.exists()) { - FileInputStream fs=new FileInputStream(path); //获取d://test.xls + FileInputStream fs=new FileInputStream(path); //鑾峰彇d://test.xls WORK_BOOK = WorkbookFactory.create(fs) WORK_BOOK.setForceFormulaRecalculation(true) sheet = WORK_BOOK.getSheetAt(0); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/addrepo/InvokeHttpRequest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/addrepo/InvokeHttpRequest.groovy index 9f21cc139..9db88d9e8 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/addrepo/InvokeHttpRequest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/addrepo/InvokeHttpRequest.groovy @@ -21,12 +21,12 @@ class InvokeHttpRequest { private final static int reCount = 10 private final static List PROXY_HOSTS = [ - // 物理机 + // 鐗╃悊鏈� new HttpHost("192.168.0.99", 3234), new HttpHost("192.168.0.98", 3234), new HttpHost("192.168.0.96", 3234) - // 虚拟机 + // 铏氭嫙鏈� // "192.168.0.102", // "192.168.0.101", // "192.168.0.103", @@ -44,7 +44,7 @@ class InvokeHttpRequest { private static synchronized HttpHost changeProxyHost() { def now = new Date().getTime() if (null != lastChangeTime && now - lastChangeTime < 120000) { - // 间隔小于2分钟的不处理 + // 闂撮殧灏忎簬2鍒嗛挓鐨勪笉澶勭悊 return } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/addrepo/Publish.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/addrepo/Publish.groovy index e20231090..c815f474b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/addrepo/Publish.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/addrepo/Publish.groovy @@ -16,7 +16,7 @@ class Publish { static main(args) { def index = 0 - // 按城市上线 289是城市代码 上海 + // 鎸夊煄甯備笂绾� 289鏄煄甯備唬鐮� 涓婃捣 DBCursor cursor = DB_3.find(new BasicDBObject('cityCode', 131)).batchSize(100) cursor.setOptions(Bytes.QUERYOPTION_NOTIMEOUT) cursor.each { @@ -25,7 +25,7 @@ class Publish { return } - it.city = '北京' + it.city = '鍖椾含' def orgRegion = it.region it.region = RegionData.formatRegion(it.city, orgRegion) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/addrepo/Test.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/addrepo/Test.groovy index d3ee63785..46007fef7 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/addrepo/Test.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/addrepo/Test.groovy @@ -8,14 +8,14 @@ class Test { static main(args) { // CnDictionary.init() -// List tokens = CnTokenizer2.tokenizer('上海市闵行长宁罗阳路莲花河畔景苑19号801室', true) +// List tokens = CnTokenizer2.tokenizer('涓婃捣甯傞椀琛岄暱瀹佺綏闃宠矾鑾茶姳娌崇晹鏅嫅19鍙�801瀹�', true) // println tokens -// Pattern p = Pattern.compile("[a-zA-Z\\d\\-负一二三四五六七八九十零两个百千万亿]+(#|弄|号楼?|[甲乙丙丁]?室|幢|橦|栋|座|口|楼|房|单元|区|层)?") +// Pattern p = Pattern.compile("[a-zA-Z\\d\\-璐熶竴浜屼笁鍥涗簲鍏竷鍏節鍗侀浂涓や釜鐧惧崈涓囦嚎]+(#|寮剕鍙锋ゼ?|[鐢蹭箼涓欎竵]?瀹骞姗鏍媩搴鍙妤紎鎴縷鍗曞厓|鍖簗灞�)?") // -// BufferedReader reader = new File('C:\\Users\\yk\\Desktop\\yongjia\\永嘉上海0730.txt').newReader('UTF-8') +// BufferedReader reader = new File('C:\\Users\\yk\\Desktop\\yongjia\\姘稿槈涓婃捣0730.txt').newReader('UTF-8') // reader.eachLine { line -> // if (!line) { // return diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/addrepo/Yongjia.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/addrepo/Yongjia.groovy index 91d8d9908..9a5cc0a96 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/addrepo/Yongjia.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/addrepo/Yongjia.groovy @@ -17,43 +17,43 @@ import com.mongodb.DBObject import com.mongodb.Mongo class Yongjia { - def final static QUANJIAO = ['0' : '0', - '1' : '1', - '2' : '2', - '3' : '3', - '4' : '4', - '5' : '5', - '6' : '6', - '7' : '7', - '8' : '8', - '9' : '9', - 'A' : 'A', - 'B' : 'B', - 'C' : 'C', - 'D' : 'D', - 'E' : 'E', - 'F' : 'F', - 'G' : 'G', - 'H' : 'H', - 'I' : 'I', - 'J' : 'J', - 'K' : 'K', - 'L' : 'L', - 'M' : 'M', - 'N' : 'N', - 'O' : 'O', - 'P' : 'P', - 'Q' : 'Q', - 'R' : 'R', - 'S' : 'S', - 'T' : 'T', - 'U' : 'U', - 'V' : 'V', - 'W' : 'W', - 'X' : 'X', - 'Y' : 'Y', - 'Z' : 'Z', - '#' : '#'] + def final static QUANJIAO = ['锛�' : '0', + '锛�' : '1', + '锛�' : '2', + '锛�' : '3', + '锛�' : '4', + '锛�' : '5', + '锛�' : '6', + '锛�' : '7', + '锛�' : '8', + '锛�' : '9', + '锛�' : 'A', + '锛�' : 'B', + '锛�' : 'C', + '锛�' : 'D', + '锛�' : 'E', + '锛�' : 'F', + '锛�' : 'G', + '锛�' : 'H', + '锛�' : 'I', + '锛�' : 'J', + '锛�' : 'K', + '锛�' : 'L', + '锛�' : 'M', + '锛�' : 'N', + '锛�' : 'O', + '锛�' : 'P', + '锛�' : 'Q', + '锛�' : 'R', + '锛�' : 'S', + '锛�' : 'T', + '锛�' : 'U', + '锛�' : 'V', + '锛�' : 'W', + '锛�' : 'X', + '锛�' : 'Y', + '锛�' : 'Z', + '锛�' : '#'] def final static QUANJIAOKEYS = QUANJIAO.keySet() @@ -66,56 +66,56 @@ class Yongjia { final static token = "FF231CF2F7268316D937374DB96AC91ED7478F663E9D233D7389B1F0A809038F59F52B983E627AD8E95FB644D8C43601E5FEE7F107B3BFD8F5AF2D73853591F481A34E26723B657C2DD2D05684DB12F69C37447B272F857EFE2BEC49BADB44A3A2DBDB7CDBE2AA25" - def static c00 = 0 // 两个地址都没匹配 - def static c01 = 0 // 家庭地址没匹配,单位地址匹配 - def static c10 = 0 // 家庭地址匹配,单位地址没匹配 - def static c11 = 0 // 两个地址都匹配 + def static c00 = 0 // 涓や釜鍦板潃閮芥病鍖归厤 + def static c01 = 0 // 瀹跺涵鍦板潃娌″尮閰嶏紝鍗曚綅鍦板潃鍖归厤 + def static c10 = 0 // 瀹跺涵鍦板潃鍖归厤锛屽崟浣嶅湴鍧�娌″尮閰� + def static c11 = 0 // 涓や釜鍦板潃閮藉尮閰� public static void main(args) { - ExcelParser parser = new ExcelParser('C:\\Users\\yk\\Desktop\\yongjia\\永嘉数据-0910.xlsx') + ExcelParser parser = new ExcelParser('C:\\Users\\yk\\Desktop\\yongjia\\姘稿槈鏁版嵁-0910.xlsx') def (headers, rows) = parser.parse() /* - BufferedWriter writer = new File('C:\\Users\\yk\\Desktop\\yongjia\\test\\上海-0730.txt').newWriter('GBK') + BufferedWriter writer = new File('C:\\Users\\yk\\Desktop\\yongjia\\test\\涓婃捣-0730.txt').newWriter('GBK') for(row in rows){ def map = parser.toMap(headers, row) - def a = replace(map['家庭地址']) + def a = replace(map['瀹跺涵鍦板潃']) if (a && a.length() > 0) writer.writeLine(a) - a = replace(map['单位地址']) + a = replace(map['鍗曚綅鍦板潃']) if (a && a.length() > 0) writer.writeLine(a) } writer.close() */ - File file = new File("C:\\Users\\yk\\Desktop\\yongjia\\永嘉地址数据(上海)-done.csv"); + File file = new File("C:\\Users\\yk\\Desktop\\yongjia\\姘稿槈鍦板潃鏁版嵁锛堜笂娴凤級-done.csv"); if (file.exists()){ file.delete(); } - file.append("家庭地址,", CHARSET) - file.append("名称,", CHARSET) - file.append("类型,", CHARSET) - file.append("周边,", CHARSET) - file.append("均价,", CHARSET) - file.append("面积,", CHARSET) - file.append("估价,", CHARSET) - file.append("开发商,", CHARSET) - file.append("物业公司,", CHARSET) - file.append("小区户数,", CHARSET) + file.append("瀹跺涵鍦板潃,", CHARSET) + file.append("鍚嶇О,", CHARSET) + file.append("绫诲瀷,", CHARSET) + file.append("鍛ㄨ竟,", CHARSET) + file.append("鍧囦环,", CHARSET) + file.append("闈㈢Н,", CHARSET) + file.append("浼颁环,", CHARSET) + file.append("寮�鍙戝晢,", CHARSET) + file.append("鐗╀笟鍏徃,", CHARSET) + file.append("灏忓尯鎴锋暟,", CHARSET) - file.append("单位地址,", CHARSET) - file.append("名称,", CHARSET) - file.append("类型,", CHARSET) - file.append("上班距离 KM,", CHARSET) + file.append("鍗曚綅鍦板潃,", CHARSET) + file.append("鍚嶇О,", CHARSET) + file.append("绫诲瀷,", CHARSET) + file.append("涓婄彮璺濈 KM,", CHARSET) file.append(System.getProperty("line.separator")) for(row in rows){ def map = parser.toMap(headers, row) - process(map, file, '上海') + process(map, file, '涓婃捣') } println c00 @@ -125,16 +125,16 @@ class Yongjia { } def static process(map, csvFile, city) { - def orgAddr1 = map['家庭地址'] + def orgAddr1 = map['瀹跺涵鍦板潃'] println orgAddr1 - def orgAddr2 = map['单位地址'] + def orgAddr2 = map['鍗曚綅鍦板潃'] def newAddr1 = replace(orgAddr1) def newAddr2 = replace(orgAddr2) - // 家庭地址 + // 瀹跺涵鍦板潃 csvFile.append("${orgAddr1},", CHARSET) - // 新旧地址都为空 + // 鏂版棫鍦板潃閮戒负绌� if (!newAddr1 && !newAddr2) { csvFile.append(",", CHARSET) csvFile.append(",", CHARSET) @@ -161,14 +161,14 @@ class Yongjia { def b0 = false def b1 = false if (newAddr1) { - // 匹配小区 + // 鍖归厤灏忓尯 start = System.currentTimeMillis() parseRet = addressParserService.parseOneDistrict(city, newAddr1, 'district') - println '小区:' + (System.currentTimeMillis() - start) + println '灏忓尯锛�' + (System.currentTimeMillis() - start) if (parseRet && parseRet.name) { start = System.currentTimeMillis() parseRet = getDistrictInfo(parseRet) - println '价格:' + (System.currentTimeMillis() - start) + println '浠锋牸锛�' + (System.currentTimeMillis() - start) } else { parseRet = addressParserService.parseOneDistrict(city, newAddr1, 'office') @@ -188,17 +188,17 @@ class Yongjia { - // 经纬度 + // 缁忕含搴� start = System.currentTimeMillis() latlng = baiduAPIService.geocoder(city, newAddr1) - println '经纬度:' + (System.currentTimeMillis() - start) + println '缁忕含搴︼細' + (System.currentTimeMillis() - start) if (latlng) { - // 周边 + // 鍛ㄨ竟 start = System.currentTimeMillis() - def s1 = "小区: ${roundSerach(latlng[0], latlng[1], '小区')}\r\n\r\n" - def s2 = "办公楼: ${roundSerach(latlng[0], latlng[1], '写字楼')}\r\n\r\n" - def s3 = "银行: ${roundSerach(latlng[0], latlng[1], '银行')}" - println '周边:' + (System.currentTimeMillis() - start) + def s1 = "灏忓尯: ${roundSerach(latlng[0], latlng[1], '灏忓尯')}\r\n\r\n" + def s2 = "鍔炲叕妤�: ${roundSerach(latlng[0], latlng[1], '鍐欏瓧妤�')}\r\n\r\n" + def s3 = "閾惰: ${roundSerach(latlng[0], latlng[1], '閾惰')}" + println '鍛ㄨ竟锛�' + (System.currentTimeMillis() - start) csvFile.append("\"${s1 + s2 + s3}\",", CHARSET) } else { csvFile.append(",", CHARSET) @@ -209,11 +209,11 @@ class Yongjia { csvFile.append(",", CHARSET) } - // 均价 + // 鍧囦环 if(parseRet && parseRet.avgPrice){ csvFile.append(parseRet.avgPrice+ ",","gbk") - // 估价 + // 浼颁环 if (parseRet.area && parseRet.fangjiaTotalPrice) { csvFile.append("${parseRet.area},","gbk") csvFile.append("${parseRet.fangjiaTotalPrice},","gbk") @@ -227,7 +227,7 @@ class Yongjia { csvFile.append(",","gbk") } - // 开发商、物业、绿化率、人口 + // 寮�鍙戝晢銆佺墿涓氥�佺豢鍖栫巼銆佷汉鍙� if (parseRet && parseRet.precise == 0) { def district = SEAWEED.findOne(new BasicDBObject('city', parseRet.city).append('region', parseRet.region).append('name', parseRet.name).append('cat', parseRet.qw[0])) if (district) { @@ -245,7 +245,7 @@ class Yongjia { csvFile.append(",", CHARSET) } - // 单位地址 + // 鍗曚綅鍦板潃 csvFile.append("\"${orgAddr2}\",", CHARSET) if (newAddr2) { @@ -267,14 +267,14 @@ class Yongjia { csvFile.append(",", CHARSET) } - // 经纬度 + // 缁忕含搴� latlng2 = baiduAPIService.geocoder(city, newAddr2) } else { csvFile.append(",", CHARSET) csvFile.append(",", CHARSET) } - // 距离 + // 璺濈 if (latlng && latlng2) { def d = GeoUtils.calculateDistance(latlng[0], latlng[1], latlng2[0], latlng2[1]) @@ -313,9 +313,9 @@ class Yongjia { for (s in QUANJIAOKEYS) { str = str.replaceAll(s, QUANJIAO[s]) } - str = str.replaceAll('无+', '').replaceAll('^0$', '').replaceAll('^-+$', '') - .replaceAll('(上海)+', '上海').replaceAll('^上海$', '') - .replaceAll('【', '').replaceAll('\\*+', '').replaceAll('[\\s ]+', '') + str = str.replaceAll('鏃�+', '').replaceAll('^0$', '').replaceAll('^-+$', '') + .replaceAll('(涓婃捣)+', '涓婃捣').replaceAll('^涓婃捣$', '') + .replaceAll('銆�', '').replaceAll('\\*+', '').replaceAll('[\\s銆�]+', '') return str } @@ -344,7 +344,7 @@ class Yongjia { } } - //房价网估价 + //鎴夸环缃戜及浠� // m.fangjiaTotalPrice = evaluation(m, token); // if(!m.fangjiaTotalPrice && m.avgPrice){ // m.fangjiaTotalPrice = (m.avgPrice * m.area).toInteger(); @@ -352,7 +352,7 @@ class Yongjia { //m.rentPrice = queryRentPriceRange(m.city, m.region, m.name, lastMonth); - //其它网站均价 + //鍏跺畠缃戠珯鍧囦环 // def otherWebsiteMap = CommonDatautils.queryOtherWebsitePrice(m.city, m.name); // m.sunfunPrice = otherWebsiteMap.price_soufun // m.anjukePrice = otherWebsiteMap.price_anjuke @@ -391,7 +391,7 @@ class Yongjia { } - //println "周边均价:" + totalPrice +"【${url_str}】" + //println "鍛ㄨ竟鍧囦环锛�" + totalPrice +"銆�${url_str}銆�" return totalPrice; } @@ -407,7 +407,7 @@ class Yongjia { conn.setRequestMethod("GET"); conn.doOutput = true inputStream = conn.getInputStream(); - BufferedReader buf = new BufferedReader(new InputStreamReader(inputStream,"UTF-8"));// 创建UTF-8的BufferedReader + BufferedReader buf = new BufferedReader(new InputStreamReader(inputStream,"UTF-8"));// 鍒涘缓UTF-8鐨凚ufferedReader while((line = buf.readLine())!=null){ sb.append(line); } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/addrepo/Yongjia2.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/addrepo/Yongjia2.groovy index 723cb4596..3301f0aff 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/addrepo/Yongjia2.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/addrepo/Yongjia2.groovy @@ -28,25 +28,25 @@ class Yongjia2 { final static token = "FF231CF2F7268316D937374DB96AC91ED7478F663E9D233D7389B1F0A809038F59F52B983E627AD8E95FB644D8C43601E5FEE7F107B3BFD8F5AF2D73853591F481A34E26723B657C2DD2D05684DB12F69C37447B272F857EFE2BEC49BADB44A3A2DBDB7CDBE2AA25" public static void main(args) { - BufferedReader reader = new File('C:\\Users\\yk\\Desktop\\yongjia\\test\\上海-0730.txt').newReader('UTF-8') + BufferedReader reader = new File('C:\\Users\\yk\\Desktop\\yongjia\\test\\涓婃捣-0730.txt').newReader('UTF-8') - File file = new File("C:\\Users\\yk\\Desktop\\yongjia\\test\\永嘉地址数据(上海)-done.csv"); + File file = new File("C:\\Users\\yk\\Desktop\\yongjia\\test\\姘稿槈鍦板潃鏁版嵁锛堜笂娴凤級-done.csv"); if (file.exists()){ file.delete(); } - file.append("地址,", CHARSET) - file.append("名称,", CHARSET) - file.append("类型,", CHARSET) - file.append("地址,", CHARSET) - file.append("楼号,", CHARSET) - file.append("单元号,", CHARSET) - file.append("楼层,", CHARSET) - file.append("室号,", CHARSET) + file.append("鍦板潃,", CHARSET) + file.append("鍚嶇О,", CHARSET) + file.append("绫诲瀷,", CHARSET) + file.append("鍦板潃,", CHARSET) + file.append("妤煎彿,", CHARSET) + file.append("鍗曞厓鍙�,", CHARSET) + file.append("妤煎眰,", CHARSET) + file.append("瀹ゅ彿,", CHARSET) file.append(System.getProperty("line.separator")) reader.eachLine { line -> - process(line, file, '上海') + process(line, file, '涓婃捣') } } @@ -58,11 +58,11 @@ class Yongjia2 { return } - // 家庭地址 + // 瀹跺涵鍦板潃 csvFile.append("${orgAddr1},", CHARSET) - // 匹配小区 + // 鍖归厤灏忓尯 def parseRet = addressParserService.parseOneDistrict(city, orgAddr1, 'district') if (parseRet && parseRet.name) { @@ -123,7 +123,7 @@ class Yongjia2 { } } - //房价网估价 + //鎴夸环缃戜及浠� // m.fangjiaTotalPrice = evaluation(m, token); // if(!m.fangjiaTotalPrice && m.avgPrice){ // m.fangjiaTotalPrice = (m.avgPrice * m.area).toInteger(); @@ -131,7 +131,7 @@ class Yongjia2 { //m.rentPrice = queryRentPriceRange(m.city, m.region, m.name, lastMonth); - //其它网站均价 + //鍏跺畠缃戠珯鍧囦环 // def otherWebsiteMap = CommonDatautils.queryOtherWebsitePrice(m.city, m.name); // m.sunfunPrice = otherWebsiteMap.price_soufun // m.anjukePrice = otherWebsiteMap.price_anjuke @@ -170,7 +170,7 @@ class Yongjia2 { } - //println "周边均价:" + totalPrice +"【${url_str}】" + //println "鍛ㄨ竟鍧囦环锛�" + totalPrice +"銆�${url_str}銆�" return totalPrice; } @@ -186,7 +186,7 @@ class Yongjia2 { conn.setRequestMethod("GET"); conn.doOutput = true inputStream = conn.getInputStream(); - BufferedReader buf = new BufferedReader(new InputStreamReader(inputStream,"UTF-8"));// 创建UTF-8的BufferedReader + BufferedReader buf = new BufferedReader(new InputStreamReader(inputStream,"UTF-8"));// 鍒涘缓UTF-8鐨凚ufferedReader while((line = buf.readLine())!=null){ sb.append(line); } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/address/AddressAnalysisJob.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/address/AddressAnalysisJob.groovy index 7990ca95f..722dafb31 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/address/AddressAnalysisJob.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/address/AddressAnalysisJob.groovy @@ -10,7 +10,7 @@ import java.util.concurrent.Executors import java.util.concurrent.TimeUnit /** - * 地址分析任务 + * 鍦板潃鍒嗘瀽浠诲姟 */ public class AddressAnalysisJob implements Runnable{ @@ -34,7 +34,7 @@ public class AddressAnalysisJob implements Runnable{ @Override void run() { long startTime = System.currentTimeMillis() - logger.info("Job ${taskId} 开始运行") + logger.info("Job ${taskId} 寮�濮嬭繍琛�") def alreadyAnalyAddressSeq = [] // def limit = ADDRESS_DETAIL.count(new BasicDBObject("task_id", taskId)) def limit = 100 @@ -83,12 +83,12 @@ public class AddressAnalysisJob implements Runnable{ }catch (Exception e){ e.printStackTrace() } - logger.info("Job ${taskId} 运行结束") + logger.info("Job ${taskId} 杩愯缁撴潫") long endTime = System.currentTimeMillis() - println("Job ${taskId} 运行结束,分析记录数:${total} 耗时:${endTime - startTime}毫秒") + println("Job ${taskId} 杩愯缁撴潫,鍒嗘瀽璁板綍鏁�:${total} 鑰楁椂:${endTime - startTime}姣") } /** - * 清理历史数据 + * 娓呯悊鍘嗗彶鏁版嵁 * @param taskId */ void clearHistory(String taskId){ @@ -96,7 +96,7 @@ public class AddressAnalysisJob implements Runnable{ ANALYTICS_OVERVIEW.remove(new BasicDBObject("task_id", taskId)) } /** - * 统计小区区域范围分布 + * 缁熻灏忓尯鍖哄煙鑼冨洿鍒嗗竷 * @param taskId */ void regionDistrictCount(String taskId){ @@ -117,7 +117,7 @@ public class AddressAnalysisJob implements Runnable{ } } /** - * 统计匹配的小区数量 + * 缁熻鍖归厤鐨勫皬鍖烘暟閲� * @param taskId */ void countMatchCount(String taskId){ @@ -129,7 +129,7 @@ public class AddressAnalysisJob implements Runnable{ } /** - * 分析物业类型占比 + * 鍒嗘瀽鐗╀笟绫诲瀷鍗犳瘮 * @param taskId */ void analyEstateType(String taskId){ @@ -147,7 +147,7 @@ public class AddressAnalysisJob implements Runnable{ } /** - * 分析总价分布 + * 鍒嗘瀽鎬讳环鍒嗗竷 * @param taskId */ void analyTotalPrice(String taskId){ @@ -196,20 +196,20 @@ public class AddressAnalysisJob implements Runnable{ ANALYTICS_OVERVIEW.update(new BasicDBObject("task_id", taskId), new BasicDBObject('$set', data), true, false) } /** - * 计算总价区间标签 + * 璁$畻鎬讳环鍖洪棿鏍囩 * @param totalPrice * @return */ def calTotalPriceLabel(long totalPrice){ if(totalPrice > 2000 * 10000){ - return "大于2000" + return "澶т簬2000" } int offset = 100 * 10000 int multiple = (int)(totalPrice / offset) return "${multiple * 100}-${(multiple + 1) * 100}" } /** - * 产生总价标签 + * 浜х敓鎬讳环鏍囩 * @return */ def genTotalPriceSerial(){ @@ -217,7 +217,7 @@ public class AddressAnalysisJob implements Runnable{ for(int i = 0 ; i < 20; i++){ serial << "${i * 100}-${(i + 1) * 100}" } - serial << "大于2000" + serial << "澶т簬2000" } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/address/AddressAnalyzer.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/address/AddressAnalyzer.groovy index 538b12adf..df5871f21 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/address/AddressAnalyzer.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/address/AddressAnalyzer.groovy @@ -15,7 +15,7 @@ import org.apache.log4j.Logger import java.util.regex.Pattern /** - * 地址分析器 + * 鍦板潃鍒嗘瀽鍣� */ public class AddressAnalyzer implements Runnable{ @@ -28,8 +28,8 @@ public class AddressAnalyzer implements Runnable{ final BasicDBObject addressDetail final BasicDBObject task - final TASK_TYPE_FENG_KONG = "风控" - final TASK_TYPE_YING_XIAO = "营销" + final TASK_TYPE_FENG_KONG = "椋庢帶" + final TASK_TYPE_YING_XIAO = "钀ラ攢" public AddressAnalyzer(BasicDBObject addressDetail,BasicDBObject task){ this.addressDetail = addressDetail @@ -58,10 +58,10 @@ public class AddressAnalyzer implements Runnable{ onFinish() return } - if(city.endsWith("市")){ - city = city.replaceAll("市\$", "") + if(city.endsWith("甯�")){ + city = city.replaceAll("甯俓$", "") } - if(city != "上海"){ + if(city != "涓婃捣"){ onFinish() return } @@ -87,7 +87,7 @@ public class AddressAnalyzer implements Runnable{ double lng = matchResult.lng double lat = matchResult.lat BasicDBObject district = DbUtils.seaweed.findById(matchResult.getString("id"), new BasicDBObject("estate_type2", 1)) - /**匹配接口使用缓存,一天内被删除的小区有可能查不到*/ + /**鍖归厤鎺ュ彛浣跨敤缂撳瓨锛屼竴澶╁唴琚垹闄ょ殑灏忓尯鏈夊彲鑳芥煡涓嶅埌*/ if(district == null){ onFinish() return @@ -135,13 +135,13 @@ public class AddressAnalyzer implements Runnable{ JSONObject newest = totalPrices.get(totalPrices.size() - 1) def lastMonth = DateUtil.add(new Date(), Calendar.MONTH, -1).format("yyyy-MM") def thisMonth = new Date().format("yyyy-MM") - if(newest.getString("date") == lastMonth || newest.getString("date") == thisMonth){//防止月初还未计算出均价 + if(newest.getString("date") == lastMonth || newest.getString("date") == thisMonth){//闃叉鏈堝垵杩樻湭璁$畻鍑哄潎浠� result.totalPrice = newest.getLong("totalPrice") } } - def now = OpenApiClient.evaluateDistrictPrice(matchCity, matchRegion, name, result.area, estateType == "普通住宅"? 0 : 1, new Date()) - def oneYearAge = OpenApiClient.evaluateDistrictPrice(matchCity, matchRegion, name, result.area, estateType == "普通住宅"? 0 : 1, DateUtil.add(new Date(), Calendar.YEAR, -1)) + def now = OpenApiClient.evaluateDistrictPrice(matchCity, matchRegion, name, result.area, estateType == "鏅�氫綇瀹�"? 0 : 1, new Date()) + def oneYearAge = OpenApiClient.evaluateDistrictPrice(matchCity, matchRegion, name, result.area, estateType == "鏅�氫綇瀹�"? 0 : 1, DateUtil.add(new Date(), Calendar.YEAR, -1)) if(now && oneYearAge){ def markUp = DataUtil.roundDouble((now.getLong("totalPrice") - oneYearAge.getLong("totalPrice")) * 100/oneYearAge.getLong("totalPrice"), 2) result.append("mark_up", markUp) @@ -161,11 +161,11 @@ public class AddressAnalyzer implements Runnable{ e.printStackTrace() } long end = System.currentTimeMillis() -// println("消耗时间:" + (end - s) + "毫秒") +// println("娑堣�楁椂闂�:" + (end - s) + "姣") } /** - * 计算房屋面积 + * 璁$畻鎴垮眿闈㈢Н * @param city * @param region * @param name @@ -230,7 +230,7 @@ public class AddressAnalyzer implements Runnable{ } private String parseBuildingNumber(String buildingNumber){ - Pattern pattern = Pattern.compile("\\w+(栋|幢|座)") + Pattern pattern = Pattern.compile("\\w+(鏍媩骞搴�)") def matcher = pattern.matcher(buildingNumber) if(matcher.find()){ return matcher.group().substring(0, matcher.group().length() - 1) @@ -239,7 +239,7 @@ public class AddressAnalyzer implements Runnable{ } private String parseUnitNumber(String buildingNumber){ - Pattern pattern = Pattern.compile("\\w+单元") + Pattern pattern = Pattern.compile("\\w+鍗曞厓") def matcher = pattern.matcher(buildingNumber) if(matcher.find()){ return matcher.group().substring(0, matcher.group().length() - 2) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/address/AddressStandardization.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/address/AddressStandardization.groovy index 3f8dcba2d..b4bac2d94 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/address/AddressStandardization.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/address/AddressStandardization.groovy @@ -9,8 +9,8 @@ import com.mongodb.DBObject /** * - * 说明:地址标准化处理脚本 - * @author 王文艳 + * 璇存槑锛氬湴鍧�鏍囧噯鍖栧鐞嗚剼鏈� + * @author 鐜嬫枃鑹� * */ class AddressStandardization { @@ -22,13 +22,13 @@ class AddressStandardization { static def handlers = [new ShengShiQuRemoveHandler(),new DuplicateRemovalHandler(),new SymbolRemoveHandler(),new RegionRemoveHandler()]; public static void main(String[] args){ - districtAddressStandard("district","舟山"); + districtAddressStandard("district","鑸熷北"); } /** * - * @param category 建筑物类型 - * @param city 城市 + * @param category 寤虹瓚鐗╃被鍨� + * @param city 鍩庡競 * @return */ static def districtAddressStandard(String category,String city){ @@ -45,9 +45,9 @@ class AddressStandardization { fields.put("region", 1) fields.put("name", 1) fields.put("address", 1) - def file = new File("D:\\data\\logs\\地名修正日志.log"); - file.append("开始执行地址标准化,开始时间:"+new Date().format("yyyy年MM月dd日 HH:mm:ss ")+"\n"); - file.append("处理条件:"+query+"\n"); + def file = new File("D:\\data\\logs\\鍦板悕淇鏃ュ織.log"); + file.append("寮�濮嬫墽琛屽湴鍧�鏍囧噯鍖�,寮�濮嬫椂闂�:"+new Date().format("yyyy骞碝M鏈坉d鏃� HH:mm:ss ")+"\n"); + file.append("澶勭悊鏉′欢:"+query+"\n"); DSCursor cur = ddColl.find(query, fields) Iterator iter = cur.iterator(); DBObject dbObject; @@ -72,7 +72,7 @@ class AddressStandardization { println ""+dbObject.get("_id")+"("+dbObject.get("name")+")"+":"+dbObject.get("address")+"---->" + request.getAddress(); } } - file.append("地名标准化结束,结束时间:"+new Date().format("yyyy年MM月dd日 HH:mm:ss ")+"总记录:"+totalCount+",标准化记录:"+countRecord+",标准化百分比:"+((int)(countRecord/totalCount)*100))+""+"\n"; + file.append("鍦板悕鏍囧噯鍖栫粨鏉�,缁撴潫鏃堕棿:"+new Date().format("yyyy骞碝M鏈坉d鏃� HH:mm:ss ")+"鎬昏褰曪細"+totalCount+",鏍囧噯鍖栬褰曪細"+countRecord+",鏍囧噯鍖栫櫨鍒嗘瘮:"+((int)(countRecord/totalCount)*100))+""+"\n"; } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/address/AddressToBaiduLngLat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/address/AddressToBaiduLngLat.groovy index 48f54e80a..df11d5128 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/address/AddressToBaiduLngLat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/address/AddressToBaiduLngLat.groovy @@ -43,13 +43,13 @@ class AddressToBaiduLngLat { def task = new AddressToBaiduLngLat(); //task.run(); - def citys = ["红河"]//task.readTxt("H:\\", "citys2.txt");//读文件//["遵义"]//CommonDatautils.findAllCity();//所有城市 + def citys = ["绾㈡渤"]//task.readTxt("H:\\", "citys2.txt");//璇绘枃浠�//["閬典箟"]//CommonDatautils.findAllCity();//鎵�鏈夊煄甯� def cat = "district"; def index = 0; for(def city : citys){ index++; task.districtAddressCover(city, cat); - println "${index} "+city + "完成......." + println "${index} "+city + "瀹屾垚......." } } @@ -68,7 +68,7 @@ class AddressToBaiduLngLat { def districtAddressCover(city, cat){ def ret = getAllDistricts(city, cat); - println city + " 共:"+ret.size() + println city + " 鍏憋細"+ret.size() def index = 0; def total = ret.size(); def row = 0; @@ -108,7 +108,7 @@ class AddressToBaiduLngLat { long lat = abcLngLatMap.lat * 10000000000L index ++; - //println "["+row+"]"+obj.region +" "+obj.district_name+" 新baidu:"+m.baiduLat + " "+m.baiduLng+" 新mapabc:"+lng +" "+lat+" "+distance + //println "["+row+"]"+obj.region +" "+obj.district_name+" 鏂癰aidu:"+m.baiduLat + " "+m.baiduLng+" 鏂癿apabc锛�"+lng +" "+lat+" "+distance if(index%100==0){ print "." } @@ -124,9 +124,9 @@ class AddressToBaiduLngLat { } } - println "【${city}】index : "+index; - println "【${city}】noLatLngIndex :"+noLatLngIndex; - println "【${city}】total : "+total + println "銆�${city}銆慽ndex : "+index; + println "銆�${city}銆憂oLatLngIndex :"+noLatLngIndex; + println "銆�${city}銆憈otal : "+total } @@ -235,7 +235,7 @@ class AddressToBaiduLngLat { for(poi in poiList){ def level = poi.level.text() if (isFirst){ - //如果是第一次,则以第一次作为优先选择 + //濡傛灉鏄涓�娆★紝鍒欎互绗竴娆′綔涓轰紭鍏堥�夋嫨 getDataFromPoi(ret, poi) isFirst = false } @@ -290,380 +290,380 @@ class AddressToBaiduLngLat { static { - CITY_CODE_MAP.put("北京", "010") - CITY_CODE_MAP.put("广州", "020") - CITY_CODE_MAP.put("重庆", "023") - CITY_CODE_MAP.put("南京", "025") - CITY_CODE_MAP.put("武汉", "027") - CITY_CODE_MAP.put("成都", "028") - CITY_CODE_MAP.put("保定", "0312") - CITY_CODE_MAP.put("承德", "0314") - CITY_CODE_MAP.put("唐山", "0315") - CITY_CODE_MAP.put("廊坊", "0316") - CITY_CODE_MAP.put("秦皇岛", "0335") - CITY_CODE_MAP.put("新乡", "0373") - CITY_CODE_MAP.put("洛阳", "0379") - CITY_CODE_MAP.put("大连", "0411") - CITY_CODE_MAP.put("鞍山", "0412") - CITY_CODE_MAP.put("抚顺", "0413") - CITY_CODE_MAP.put("本溪", "0414") - CITY_CODE_MAP.put("丹东", "0415") - CITY_CODE_MAP.put("辽阳", "0419") - CITY_CODE_MAP.put("葫芦岛", "0429") - CITY_CODE_MAP.put("长春", "0431") - CITY_CODE_MAP.put("哈尔滨", "0451") - CITY_CODE_MAP.put("佳木斯", "0454") - CITY_CODE_MAP.put("包头", "0472") - CITY_CODE_MAP.put("镇江", "0511") - CITY_CODE_MAP.put("苏州", "0512") - CITY_CODE_MAP.put("昆山", "0512") - CITY_CODE_MAP.put("南通", "0513") - CITY_CODE_MAP.put("扬州", "0514") - CITY_CODE_MAP.put("徐州", "0516") - CITY_CODE_MAP.put("常州", "0519") - CITY_CODE_MAP.put("济南", "0531") - CITY_CODE_MAP.put("青岛", "0532") - CITY_CODE_MAP.put("蚌埠", "0552") - CITY_CODE_MAP.put("黄山", "0559") - CITY_CODE_MAP.put("杭州", "0571") - CITY_CODE_MAP.put("湖州", "0572") - CITY_CODE_MAP.put("台州", "0576") - CITY_CODE_MAP.put("温州", "0577") - CITY_CODE_MAP.put("福州", "0591") - CITY_CODE_MAP.put("厦门", "0592") - CITY_CODE_MAP.put("宁德", "0593") - CITY_CODE_MAP.put("莆田", "0594") - CITY_CODE_MAP.put("泉州", "0595") - CITY_CODE_MAP.put("漳州", "0596") - CITY_CODE_MAP.put("威海", "0631") - CITY_CODE_MAP.put("汕尾", "0660") - CITY_CODE_MAP.put("汕尾岛", "0660") - CITY_CODE_MAP.put("阳江", "0662") - CITY_CODE_MAP.put("揭阳", "0663") - CITY_CODE_MAP.put("茂名", "0668") - CITY_CODE_MAP.put("襄阳", "0710") - CITY_CODE_MAP.put("黄石", "0714") - CITY_CODE_MAP.put("宜昌", "0717") - CITY_CODE_MAP.put("十堰", "0719") - CITY_CODE_MAP.put("荆门", "0724") - CITY_CODE_MAP.put("岳阳", "0730") - CITY_CODE_MAP.put("长沙", "0731") - CITY_CODE_MAP.put("湘潭", "0732") - CITY_CODE_MAP.put("株洲", "0733") - CITY_CODE_MAP.put("常德", "0736") - CITY_CODE_MAP.put("江门", "0750") - CITY_CODE_MAP.put("汕头", "0754") - CITY_CODE_MAP.put("深圳", "0755") - CITY_CODE_MAP.put("珠海", "0756") - CITY_CODE_MAP.put("湛江", "0759") - CITY_CODE_MAP.put("中山", "0760") - CITY_CODE_MAP.put("防城港", "0770") - CITY_CODE_MAP.put("南宁", "0771") - CITY_CODE_MAP.put("桂林", "0773") - CITY_CODE_MAP.put("北海", "0779") - CITY_CODE_MAP.put("南昌", "0791") - CITY_CODE_MAP.put("九江", "0792") - CITY_CODE_MAP.put("景德镇", "0798") - CITY_CODE_MAP.put("自贡", "0813") - CITY_CODE_MAP.put("泸州", "0830") - CITY_CODE_MAP.put("宜宾", "0831") - CITY_CODE_MAP.put("内江", "01832") - CITY_CODE_MAP.put("眉山", "0833") - CITY_CODE_MAP.put("贵阳", "0851") - CITY_CODE_MAP.put("三亚", "0899") - CITY_CODE_MAP.put("咸阳", "0910") - CITY_CODE_MAP.put("延安", "0911") - CITY_CODE_MAP.put("延边朝鲜族自治州", "0433") - CITY_CODE_MAP.put("七台河", "0464") - CITY_CODE_MAP.put("三明", "0598") - CITY_CODE_MAP.put("三门峡", "0398") - CITY_CODE_MAP.put("上海", "021") - CITY_CODE_MAP.put("上饶", "0793") - CITY_CODE_MAP.put("东莞", "0769") - CITY_CODE_MAP.put("东营", "0546") - CITY_CODE_MAP.put("中卫", "01953") - CITY_CODE_MAP.put("临夏回族自治州", "0930") - CITY_CODE_MAP.put("临汾", "0357") - CITY_CODE_MAP.put("临沂", "0539") - CITY_CODE_MAP.put("丽水", "0578") - CITY_CODE_MAP.put("乌兰察布", "0474") - CITY_CODE_MAP.put("乌海", "0473") - CITY_CODE_MAP.put("乌鲁木齐", "0991") - CITY_CODE_MAP.put("乐山", "0833") - CITY_CODE_MAP.put("云浮", "0766") - CITY_CODE_MAP.put("亳州", "0558") - CITY_CODE_MAP.put("仙桃", "0728") - CITY_CODE_MAP.put("伊春", "0458") - CITY_CODE_MAP.put("伊犁哈萨克自治州", "0999") - CITY_CODE_MAP.put("佛山", "0757") - CITY_CODE_MAP.put("信阳", "0376") - CITY_CODE_MAP.put("克拉玛依", "0990") - CITY_CODE_MAP.put("六安", "0564") - CITY_CODE_MAP.put("兰州", "0931") - CITY_CODE_MAP.put("兴安盟", "0482") - CITY_CODE_MAP.put("凉山彝族自治州", "0834") - CITY_CODE_MAP.put("南充", "0817") - CITY_CODE_MAP.put("南平", "0599") - CITY_CODE_MAP.put("南阳", "0377") - CITY_CODE_MAP.put("博尔塔拉蒙古自治州", "0909") - CITY_CODE_MAP.put("双鸭山", "0469") - CITY_CODE_MAP.put("合肥", "0551") - CITY_CODE_MAP.put("吉安", "0796") - CITY_CODE_MAP.put("吉林", "0432") - CITY_CODE_MAP.put("吐鲁番地区", "0995") - CITY_CODE_MAP.put("吕梁", "0358") - CITY_CODE_MAP.put("吴忠", "0953") - CITY_CODE_MAP.put("周口", "0394") - CITY_CODE_MAP.put("呼伦贝尔", "0470") - CITY_CODE_MAP.put("呼和浩特", "0471") - CITY_CODE_MAP.put("咸宁", "0715") - CITY_CODE_MAP.put("商丘", "0370") - CITY_CODE_MAP.put("商洛", "0914") - CITY_CODE_MAP.put("嘉兴", "0573") - CITY_CODE_MAP.put("四平", "0434") - CITY_CODE_MAP.put("塔城地区", "0901") - CITY_CODE_MAP.put("大兴安岭地区", "0457") - CITY_CODE_MAP.put("大同", "0352") - CITY_CODE_MAP.put("大庆", "0459") - CITY_CODE_MAP.put("大理白族自治州", "0872") - CITY_CODE_MAP.put("天水", "0938") - CITY_CODE_MAP.put("天津", "022") - CITY_CODE_MAP.put("天门", "01728") - CITY_CODE_MAP.put("太原", "0351") - CITY_CODE_MAP.put("娄底", "0738") - CITY_CODE_MAP.put("孝感", "0712") - CITY_CODE_MAP.put("宁波", "0574") - CITY_CODE_MAP.put("安庆", "0556") - CITY_CODE_MAP.put("安康", "0915") - CITY_CODE_MAP.put("安阳", "0372") - CITY_CODE_MAP.put("安顺", "0853") - CITY_CODE_MAP.put("定西", "0932") - CITY_CODE_MAP.put("宜春", "0795") - CITY_CODE_MAP.put("宝鸡", "0917") - CITY_CODE_MAP.put("宣城", "0563") - CITY_CODE_MAP.put("宿州", "0557") - CITY_CODE_MAP.put("宿迁", "0527") - CITY_CODE_MAP.put("山南地区", "0893") - CITY_CODE_MAP.put("崇左", "01771") - CITY_CODE_MAP.put("巢湖", "0565") - CITY_CODE_MAP.put("巴中", "0827") - CITY_CODE_MAP.put("平凉", "0933") - CITY_CODE_MAP.put("平顶山", "0375") - CITY_CODE_MAP.put("广元", "0839") - CITY_CODE_MAP.put("广安", "0826") - CITY_CODE_MAP.put("庆阳", "0934") - CITY_CODE_MAP.put("开封", "0378") - CITY_CODE_MAP.put("张家口", "0313") - CITY_CODE_MAP.put("张家界", "0744") - CITY_CODE_MAP.put("张掖", "0936") - CITY_CODE_MAP.put("德州", "0534") - CITY_CODE_MAP.put("德阳", "0838") - CITY_CODE_MAP.put("忻州", "0350") - CITY_CODE_MAP.put("怀化", "0745") - CITY_CODE_MAP.put("恩施土家族苗族自治州", "0718") - CITY_CODE_MAP.put("惠州", "0752") - CITY_CODE_MAP.put("抚州", "0794") - CITY_CODE_MAP.put("拉萨", "0891") - CITY_CODE_MAP.put("攀枝花", "0812") - CITY_CODE_MAP.put("新余", "0790") - CITY_CODE_MAP.put("无锡", "0510") - CITY_CODE_MAP.put("日喀则地区", "0892") - CITY_CODE_MAP.put("日照", "0633") - CITY_CODE_MAP.put("昆明", "0871") - CITY_CODE_MAP.put("昌吉回族自治州", "0994") - CITY_CODE_MAP.put("昭通", "0870") - CITY_CODE_MAP.put("晋中", "0354") - CITY_CODE_MAP.put("晋城", "0356") - CITY_CODE_MAP.put("曲靖", "0874") - CITY_CODE_MAP.put("朔州", "0349") - CITY_CODE_MAP.put("朝阳", "0421") - CITY_CODE_MAP.put("来宾", "01772") - CITY_CODE_MAP.put("松原", "0438") - CITY_CODE_MAP.put("枣庄", "0632") - CITY_CODE_MAP.put("柳州", "0772") - CITY_CODE_MAP.put("梅州", "0753") - CITY_CODE_MAP.put("梧州", "0774") - CITY_CODE_MAP.put("楚雄彝族自治州", "0878") - CITY_CODE_MAP.put("榆林", "0912") - CITY_CODE_MAP.put("武威", "01935") - CITY_CODE_MAP.put("毕节地区", "0857") - CITY_CODE_MAP.put("永州", "0746") - CITY_CODE_MAP.put("汉中", "0916") - CITY_CODE_MAP.put("池州", "0566") - CITY_CODE_MAP.put("沈阳", "024") - CITY_CODE_MAP.put("沧州", "0317") - CITY_CODE_MAP.put("河池", "0778") - CITY_CODE_MAP.put("河源", "0762") - CITY_CODE_MAP.put("泰安", "0538") - CITY_CODE_MAP.put("泰州", "0523") - CITY_CODE_MAP.put("济宁", "0537") - CITY_CODE_MAP.put("济源", "01391") - CITY_CODE_MAP.put("海东地区", "0972") - CITY_CODE_MAP.put("海北藏族自治州", "0970") - CITY_CODE_MAP.put("海南藏族自治州", "0974") - CITY_CODE_MAP.put("海口", "0898") - CITY_CODE_MAP.put("淄博", "0533") - CITY_CODE_MAP.put("淮北", "0561") - CITY_CODE_MAP.put("淮南", "0554") - CITY_CODE_MAP.put("淮安", "0517") - CITY_CODE_MAP.put("清远", "0763") - CITY_CODE_MAP.put("渭南", "0913") - CITY_CODE_MAP.put("湘西土家族苗族自治州", "0743") - CITY_CODE_MAP.put("滁州", "0550") - CITY_CODE_MAP.put("滨州", "0543") - CITY_CODE_MAP.put("漯河", "0395") - CITY_CODE_MAP.put("潍坊", "0536") - CITY_CODE_MAP.put("潜江", "02728") - CITY_CODE_MAP.put("潮州", "0768") - CITY_CODE_MAP.put("濮阳", "0393") - CITY_CODE_MAP.put("烟台", "0535") - CITY_CODE_MAP.put("焦作", "0391") - CITY_CODE_MAP.put("牡丹江", "0453") - CITY_CODE_MAP.put("玉林", "0775") - CITY_CODE_MAP.put("玉溪", "0877") - CITY_CODE_MAP.put("甘孜藏族自治州", "0836") - CITY_CODE_MAP.put("白城", "0436") - CITY_CODE_MAP.put("白山", "0439") - CITY_CODE_MAP.put("白银", "0943") - CITY_CODE_MAP.put("益阳", "0737") - CITY_CODE_MAP.put("盐城", "0515") - CITY_CODE_MAP.put("盘锦", "0427") - CITY_CODE_MAP.put("石嘴山", "0952") - CITY_CODE_MAP.put("石家庄", "0311") - CITY_CODE_MAP.put("石河子", "0993") - CITY_CODE_MAP.put("神农架林区", "01719") - CITY_CODE_MAP.put("红河哈尼族彝族自治州", "0873") - CITY_CODE_MAP.put("绍兴", "0575") - CITY_CODE_MAP.put("绥化", "0455") - CITY_CODE_MAP.put("绵阳", "0816") - CITY_CODE_MAP.put("聊城", "0635") - CITY_CODE_MAP.put("肇庆", "0758") - CITY_CODE_MAP.put("舟山", "0580") - CITY_CODE_MAP.put("芜湖", "0553") - CITY_CODE_MAP.put("荆州", "0716") - CITY_CODE_MAP.put("莱芜", "0634") - CITY_CODE_MAP.put("菏泽", "0530") - CITY_CODE_MAP.put("萍乡", "0799") - CITY_CODE_MAP.put("营口", "0417") - CITY_CODE_MAP.put("衡水", "0318") - CITY_CODE_MAP.put("衡阳", "0734") - CITY_CODE_MAP.put("衢州", "0570") - CITY_CODE_MAP.put("西双版纳傣族自治州", "0691") - CITY_CODE_MAP.put("西宁", "0971") - CITY_CODE_MAP.put("西安", "029") - CITY_CODE_MAP.put("许昌", "0374") - CITY_CODE_MAP.put("贵港", "01755") - CITY_CODE_MAP.put("贺州", "01774") - CITY_CODE_MAP.put("资阳", "0832") - CITY_CODE_MAP.put("赣州", "0797") - CITY_CODE_MAP.put("赤峰", "0476") - CITY_CODE_MAP.put("辽源", "0437") - CITY_CODE_MAP.put("达州", "0818") - CITY_CODE_MAP.put("运城", "0359") - CITY_CODE_MAP.put("连云港", "0518") - CITY_CODE_MAP.put("通化", "0435") - CITY_CODE_MAP.put("通辽", "0475") - CITY_CODE_MAP.put("遂宁", "0825") - CITY_CODE_MAP.put("遵义", "0852") - CITY_CODE_MAP.put("邢台", "0319") - CITY_CODE_MAP.put("邯郸", "0310") - CITY_CODE_MAP.put("邵阳", "0739") - CITY_CODE_MAP.put("郑州", "0371") - CITY_CODE_MAP.put("郴州", "0735") - CITY_CODE_MAP.put("鄂尔多斯", "0477") - CITY_CODE_MAP.put("鄂州", "0711") - CITY_CODE_MAP.put("酒泉", "0937") - CITY_CODE_MAP.put("金华", "0579") - CITY_CODE_MAP.put("金昌", "0935") - CITY_CODE_MAP.put("钦州", "0777") - CITY_CODE_MAP.put("铁岭", "0410") - CITY_CODE_MAP.put("铜仁地区", "0856") - CITY_CODE_MAP.put("铜川", "0919") - CITY_CODE_MAP.put("铜陵", "0562") - CITY_CODE_MAP.put("银川", "0951") - CITY_CODE_MAP.put("锦州", "0416") - CITY_CODE_MAP.put("长治", "0355") - CITY_CODE_MAP.put("阜新", "0418") - CITY_CODE_MAP.put("阜阳", "01558") - CITY_CODE_MAP.put("阳泉", "0353") - CITY_CODE_MAP.put("阿坝藏族羌族自治州", "0837") - CITY_CODE_MAP.put("陇南", "02935") - CITY_CODE_MAP.put("随州", "0722") - CITY_CODE_MAP.put("雅安", "0835") - CITY_CODE_MAP.put("韶关", "0751") - CITY_CODE_MAP.put("马鞍山", "0555") - CITY_CODE_MAP.put("驻马店", "0396") - CITY_CODE_MAP.put("鸡西", "0467") - CITY_CODE_MAP.put("鹤壁", "0392") - CITY_CODE_MAP.put("鹤岗", "0468") - CITY_CODE_MAP.put("鹰潭", "0701") - CITY_CODE_MAP.put("黄冈", "0713") - CITY_CODE_MAP.put("黑河", "0456") - CITY_CODE_MAP.put("黔东南苗族侗族自治州", "0855") - CITY_CODE_MAP.put("黔南布依族苗族自治州", "0854") - CITY_CODE_MAP.put("齐齐哈尔", "0452") - CITY_CODE_MAP.put("龙岩", "0597") - CITY_CODE_MAP.put("甘南藏族自治州", "0941") - CITY_CODE_MAP.put("嘉峪关", "1937") - CITY_CODE_MAP.put("百色", "0776") - CITY_CODE_MAP.put("六盘水", "0858") - CITY_CODE_MAP.put("黔西南布依族苗族自治州", "0859") - CITY_CODE_MAP.put("白沙黎族自治县", "0802") - CITY_CODE_MAP.put("保亭黎族苗族自治县", "0801") - CITY_CODE_MAP.put("昌江黎族自治县", "0803") - CITY_CODE_MAP.put("澄迈县", "0804") - CITY_CODE_MAP.put("定安县", "0806") - CITY_CODE_MAP.put("东方", "0807") - CITY_CODE_MAP.put("东沙群岛", "0808") - CITY_CODE_MAP.put("乐东黎族自治县", "2802") - CITY_CODE_MAP.put("临高县", "1896") - CITY_CODE_MAP.put("陵水黎族自治县", "0809") - CITY_CODE_MAP.put("南沙群岛", "1891") - CITY_CODE_MAP.put("琼海", "1894") - CITY_CODE_MAP.put("琼中黎族苗族自治县", "1899") - CITY_CODE_MAP.put("屯昌县", "1892") - CITY_CODE_MAP.put("万宁", "1898") - CITY_CODE_MAP.put("文昌", "1893") - CITY_CODE_MAP.put("五指山", "1897") - CITY_CODE_MAP.put("西沙群岛", "1895") - CITY_CODE_MAP.put("中沙群岛", "2801") - CITY_CODE_MAP.put("儋州", "0805") - CITY_CODE_MAP.put("阿拉善盟", "0483") - CITY_CODE_MAP.put("巴彦淖尔市", "0478") - CITY_CODE_MAP.put("锡林郭勒盟", "0479") - CITY_CODE_MAP.put("固原", "0954") - CITY_CODE_MAP.put("果洛藏族自治州", "0975") - CITY_CODE_MAP.put("海西蒙古族藏族自治州", "0977") - CITY_CODE_MAP.put("黄南藏族自治州", "0973") - CITY_CODE_MAP.put("玉树藏族自治州", "0976") - CITY_CODE_MAP.put("阿里地区", "0897") - CITY_CODE_MAP.put("昌都地区", "0895") - CITY_CODE_MAP.put("林芝地区", "0894") - CITY_CODE_MAP.put("那曲地区", "0896") - CITY_CODE_MAP.put("阿克苏地区", "0997") - CITY_CODE_MAP.put("阿勒泰地区", "0906") - CITY_CODE_MAP.put("巴音郭楞蒙古自治州", "0996") - CITY_CODE_MAP.put("哈密地区", "0902") - CITY_CODE_MAP.put("和田地区", "0903") - CITY_CODE_MAP.put("喀什地区", "0998") - CITY_CODE_MAP.put("克孜勒苏柯尔克孜自治州", "0908") - CITY_CODE_MAP.put("保山", "0875") - CITY_CODE_MAP.put("德宏傣族景颇族自治州", "0692") - CITY_CODE_MAP.put("迪庆藏族自治州", "0887") - CITY_CODE_MAP.put("丽江", "0888") - CITY_CODE_MAP.put("临沧市", "0883") - CITY_CODE_MAP.put("怒江傈僳族自治州", "0886") - CITY_CODE_MAP.put("普洱", "0879") - CITY_CODE_MAP.put("文山壮族苗族自治州", "0876") - CITY_CODE_MAP.put("香港", "1852") - CITY_CODE_MAP.put("澳门", "1853") - CITY_CODE_MAP.put("五家渠市", "652300") - CITY_CODE_MAP.put("阿拉尔市", "652900") - CITY_CODE_MAP.put("图木舒克市", "653000") + CITY_CODE_MAP.put("鍖椾含", "010") + CITY_CODE_MAP.put("骞垮窞", "020") + CITY_CODE_MAP.put("閲嶅簡", "023") + CITY_CODE_MAP.put("鍗椾含", "025") + CITY_CODE_MAP.put("姝︽眽", "027") + CITY_CODE_MAP.put("鎴愰兘", "028") + CITY_CODE_MAP.put("淇濆畾", "0312") + CITY_CODE_MAP.put("鎵垮痉", "0314") + CITY_CODE_MAP.put("鍞愬北", "0315") + CITY_CODE_MAP.put("寤婂潑", "0316") + CITY_CODE_MAP.put("绉︾殗宀�", "0335") + CITY_CODE_MAP.put("鏂颁埂", "0373") + CITY_CODE_MAP.put("娲涢槼", "0379") + CITY_CODE_MAP.put("澶ц繛", "0411") + CITY_CODE_MAP.put("闉嶅北", "0412") + CITY_CODE_MAP.put("鎶氶『", "0413") + CITY_CODE_MAP.put("鏈邯", "0414") + CITY_CODE_MAP.put("涓逛笢", "0415") + CITY_CODE_MAP.put("杈介槼", "0419") + CITY_CODE_MAP.put("钁姦宀�", "0429") + CITY_CODE_MAP.put("闀挎槬", "0431") + CITY_CODE_MAP.put("鍝堝皵婊�", "0451") + CITY_CODE_MAP.put("浣虫湪鏂�", "0454") + CITY_CODE_MAP.put("鍖呭ご", "0472") + CITY_CODE_MAP.put("闀囨睙", "0511") + CITY_CODE_MAP.put("鑻忓窞", "0512") + CITY_CODE_MAP.put("鏄嗗北", "0512") + CITY_CODE_MAP.put("鍗楅��", "0513") + CITY_CODE_MAP.put("鎵窞", "0514") + CITY_CODE_MAP.put("寰愬窞", "0516") + CITY_CODE_MAP.put("甯稿窞", "0519") + CITY_CODE_MAP.put("娴庡崡", "0531") + CITY_CODE_MAP.put("闈掑矝", "0532") + CITY_CODE_MAP.put("铓屽煚", "0552") + CITY_CODE_MAP.put("榛勫北", "0559") + CITY_CODE_MAP.put("鏉窞", "0571") + CITY_CODE_MAP.put("婀栧窞", "0572") + CITY_CODE_MAP.put("鍙板窞", "0576") + CITY_CODE_MAP.put("娓╁窞", "0577") + CITY_CODE_MAP.put("绂忓窞", "0591") + CITY_CODE_MAP.put("鍘﹂棬", "0592") + CITY_CODE_MAP.put("瀹佸痉", "0593") + CITY_CODE_MAP.put("鑾嗙敯", "0594") + CITY_CODE_MAP.put("娉夊窞", "0595") + CITY_CODE_MAP.put("婕冲窞", "0596") + CITY_CODE_MAP.put("濞佹捣", "0631") + CITY_CODE_MAP.put("姹曞熬", "0660") + CITY_CODE_MAP.put("姹曞熬宀�", "0660") + CITY_CODE_MAP.put("闃虫睙", "0662") + CITY_CODE_MAP.put("鎻槼", "0663") + CITY_CODE_MAP.put("鑼傚悕", "0668") + CITY_CODE_MAP.put("瑗勯槼", "0710") + CITY_CODE_MAP.put("榛勭煶", "0714") + CITY_CODE_MAP.put("瀹滄槍", "0717") + CITY_CODE_MAP.put("鍗佸牥", "0719") + CITY_CODE_MAP.put("鑽嗛棬", "0724") + CITY_CODE_MAP.put("宀抽槼", "0730") + CITY_CODE_MAP.put("闀挎矙", "0731") + CITY_CODE_MAP.put("婀樻江", "0732") + CITY_CODE_MAP.put("鏍床", "0733") + CITY_CODE_MAP.put("甯稿痉", "0736") + CITY_CODE_MAP.put("姹熼棬", "0750") + CITY_CODE_MAP.put("姹曞ご", "0754") + CITY_CODE_MAP.put("娣卞湷", "0755") + CITY_CODE_MAP.put("鐝犳捣", "0756") + CITY_CODE_MAP.put("婀涙睙", "0759") + CITY_CODE_MAP.put("涓北", "0760") + CITY_CODE_MAP.put("闃插煄娓�", "0770") + CITY_CODE_MAP.put("鍗楀畞", "0771") + CITY_CODE_MAP.put("妗傛灄", "0773") + CITY_CODE_MAP.put("鍖楁捣", "0779") + CITY_CODE_MAP.put("鍗楁槍", "0791") + CITY_CODE_MAP.put("涔濇睙", "0792") + CITY_CODE_MAP.put("鏅痉闀�", "0798") + CITY_CODE_MAP.put("鑷础", "0813") + CITY_CODE_MAP.put("娉稿窞", "0830") + CITY_CODE_MAP.put("瀹滃", "0831") + CITY_CODE_MAP.put("鍐呮睙", "01832") + CITY_CODE_MAP.put("鐪夊北", "0833") + CITY_CODE_MAP.put("璐甸槼", "0851") + CITY_CODE_MAP.put("涓変簹", "0899") + CITY_CODE_MAP.put("鍜搁槼", "0910") + CITY_CODE_MAP.put("寤跺畨", "0911") + CITY_CODE_MAP.put("寤惰竟鏈濋矞鏃忚嚜娌诲窞", "0433") + CITY_CODE_MAP.put("涓冨彴娌�", "0464") + CITY_CODE_MAP.put("涓夋槑", "0598") + CITY_CODE_MAP.put("涓夐棬宄�", "0398") + CITY_CODE_MAP.put("涓婃捣", "021") + CITY_CODE_MAP.put("涓婇ザ", "0793") + CITY_CODE_MAP.put("涓滆帪", "0769") + CITY_CODE_MAP.put("涓滆惀", "0546") + CITY_CODE_MAP.put("涓崼", "01953") + CITY_CODE_MAP.put("涓村鍥炴棌鑷不宸�", "0930") + CITY_CODE_MAP.put("涓存本", "0357") + CITY_CODE_MAP.put("涓存矀", "0539") + CITY_CODE_MAP.put("涓芥按", "0578") + CITY_CODE_MAP.put("涔屽叞瀵熷竷", "0474") + CITY_CODE_MAP.put("涔屾捣", "0473") + CITY_CODE_MAP.put("涔岄瞾鏈ㄩ綈", "0991") + CITY_CODE_MAP.put("涔愬北", "0833") + CITY_CODE_MAP.put("浜戞诞", "0766") + CITY_CODE_MAP.put("浜冲窞", "0558") + CITY_CODE_MAP.put("浠欐", "0728") + CITY_CODE_MAP.put("浼婃槬", "0458") + CITY_CODE_MAP.put("浼婄妬鍝堣惃鍏嬭嚜娌诲窞", "0999") + CITY_CODE_MAP.put("浣涘北", "0757") + CITY_CODE_MAP.put("淇¢槼", "0376") + CITY_CODE_MAP.put("鍏嬫媺鐜涗緷", "0990") + CITY_CODE_MAP.put("鍏畨", "0564") + CITY_CODE_MAP.put("鍏板窞", "0931") + CITY_CODE_MAP.put("鍏村畨鐩�", "0482") + CITY_CODE_MAP.put("鍑夊北褰濇棌鑷不宸�", "0834") + CITY_CODE_MAP.put("鍗楀厖", "0817") + CITY_CODE_MAP.put("鍗楀钩", "0599") + CITY_CODE_MAP.put("鍗楅槼", "0377") + CITY_CODE_MAP.put("鍗氬皵濉旀媺钂欏彜鑷不宸�", "0909") + CITY_CODE_MAP.put("鍙岄腑灞�", "0469") + CITY_CODE_MAP.put("鍚堣偉", "0551") + CITY_CODE_MAP.put("鍚夊畨", "0796") + CITY_CODE_MAP.put("鍚夋灄", "0432") + CITY_CODE_MAP.put("鍚愰瞾鐣湴鍖�", "0995") + CITY_CODE_MAP.put("鍚曟", "0358") + CITY_CODE_MAP.put("鍚村繝", "0953") + CITY_CODE_MAP.put("鍛ㄥ彛", "0394") + CITY_CODE_MAP.put("鍛间鸡璐濆皵", "0470") + CITY_CODE_MAP.put("鍛煎拰娴╃壒", "0471") + CITY_CODE_MAP.put("鍜稿畞", "0715") + CITY_CODE_MAP.put("鍟嗕笜", "0370") + CITY_CODE_MAP.put("鍟嗘礇", "0914") + CITY_CODE_MAP.put("鍢夊叴", "0573") + CITY_CODE_MAP.put("鍥涘钩", "0434") + CITY_CODE_MAP.put("濉斿煄鍦板尯", "0901") + CITY_CODE_MAP.put("澶у叴瀹夊箔鍦板尯", "0457") + CITY_CODE_MAP.put("澶у悓", "0352") + CITY_CODE_MAP.put("澶у簡", "0459") + CITY_CODE_MAP.put("澶х悊鐧芥棌鑷不宸�", "0872") + CITY_CODE_MAP.put("澶╂按", "0938") + CITY_CODE_MAP.put("澶╂触", "022") + CITY_CODE_MAP.put("澶╅棬", "01728") + CITY_CODE_MAP.put("澶師", "0351") + CITY_CODE_MAP.put("濞勫簳", "0738") + CITY_CODE_MAP.put("瀛濇劅", "0712") + CITY_CODE_MAP.put("瀹佹尝", "0574") + CITY_CODE_MAP.put("瀹夊簡", "0556") + CITY_CODE_MAP.put("瀹夊悍", "0915") + CITY_CODE_MAP.put("瀹夐槼", "0372") + CITY_CODE_MAP.put("瀹夐『", "0853") + CITY_CODE_MAP.put("瀹氳タ", "0932") + CITY_CODE_MAP.put("瀹滄槬", "0795") + CITY_CODE_MAP.put("瀹濋浮", "0917") + CITY_CODE_MAP.put("瀹e煄", "0563") + CITY_CODE_MAP.put("瀹垮窞", "0557") + CITY_CODE_MAP.put("瀹胯縼", "0527") + CITY_CODE_MAP.put("灞卞崡鍦板尯", "0893") + CITY_CODE_MAP.put("宕囧乏", "01771") + CITY_CODE_MAP.put("宸㈡箹", "0565") + CITY_CODE_MAP.put("宸翠腑", "0827") + CITY_CODE_MAP.put("骞冲噳", "0933") + CITY_CODE_MAP.put("骞抽《灞�", "0375") + CITY_CODE_MAP.put("骞垮厓", "0839") + CITY_CODE_MAP.put("骞垮畨", "0826") + CITY_CODE_MAP.put("搴嗛槼", "0934") + CITY_CODE_MAP.put("寮�灏�", "0378") + CITY_CODE_MAP.put("寮犲鍙�", "0313") + CITY_CODE_MAP.put("寮犲鐣�", "0744") + CITY_CODE_MAP.put("寮犳帠", "0936") + CITY_CODE_MAP.put("寰峰窞", "0534") + CITY_CODE_MAP.put("寰烽槼", "0838") + CITY_CODE_MAP.put("蹇诲窞", "0350") + CITY_CODE_MAP.put("鎬�鍖�", "0745") + CITY_CODE_MAP.put("鎭╂柦鍦熷鏃忚嫍鏃忚嚜娌诲窞", "0718") + CITY_CODE_MAP.put("鎯犲窞", "0752") + CITY_CODE_MAP.put("鎶氬窞", "0794") + CITY_CODE_MAP.put("鎷夎惃", "0891") + CITY_CODE_MAP.put("鏀�鏋濊姳", "0812") + CITY_CODE_MAP.put("鏂颁綑", "0790") + CITY_CODE_MAP.put("鏃犻敗", "0510") + CITY_CODE_MAP.put("鏃ュ杸鍒欏湴鍖�", "0892") + CITY_CODE_MAP.put("鏃ョ収", "0633") + CITY_CODE_MAP.put("鏄嗘槑", "0871") + CITY_CODE_MAP.put("鏄屽悏鍥炴棌鑷不宸�", "0994") + CITY_CODE_MAP.put("鏄��", "0870") + CITY_CODE_MAP.put("鏅嬩腑", "0354") + CITY_CODE_MAP.put("鏅嬪煄", "0356") + CITY_CODE_MAP.put("鏇查潠", "0874") + CITY_CODE_MAP.put("鏈斿窞", "0349") + CITY_CODE_MAP.put("鏈濋槼", "0421") + CITY_CODE_MAP.put("鏉ュ", "01772") + CITY_CODE_MAP.put("鏉惧師", "0438") + CITY_CODE_MAP.put("鏋e簞", "0632") + CITY_CODE_MAP.put("鏌冲窞", "0772") + CITY_CODE_MAP.put("姊呭窞", "0753") + CITY_CODE_MAP.put("姊у窞", "0774") + CITY_CODE_MAP.put("妤氶泟褰濇棌鑷不宸�", "0878") + CITY_CODE_MAP.put("姒嗘灄", "0912") + CITY_CODE_MAP.put("姝﹀▉", "01935") + CITY_CODE_MAP.put("姣曡妭鍦板尯", "0857") + CITY_CODE_MAP.put("姘稿窞", "0746") + CITY_CODE_MAP.put("姹変腑", "0916") + CITY_CODE_MAP.put("姹犲窞", "0566") + CITY_CODE_MAP.put("娌堥槼", "024") + CITY_CODE_MAP.put("娌у窞", "0317") + CITY_CODE_MAP.put("娌虫睜", "0778") + CITY_CODE_MAP.put("娌虫簮", "0762") + CITY_CODE_MAP.put("娉板畨", "0538") + CITY_CODE_MAP.put("娉板窞", "0523") + CITY_CODE_MAP.put("娴庡畞", "0537") + CITY_CODE_MAP.put("娴庢簮", "01391") + CITY_CODE_MAP.put("娴蜂笢鍦板尯", "0972") + CITY_CODE_MAP.put("娴峰寳钘忔棌鑷不宸�", "0970") + CITY_CODE_MAP.put("娴峰崡钘忔棌鑷不宸�", "0974") + CITY_CODE_MAP.put("娴峰彛", "0898") + CITY_CODE_MAP.put("娣勫崥", "0533") + CITY_CODE_MAP.put("娣寳", "0561") + CITY_CODE_MAP.put("娣崡", "0554") + CITY_CODE_MAP.put("娣畨", "0517") + CITY_CODE_MAP.put("娓呰繙", "0763") + CITY_CODE_MAP.put("娓崡", "0913") + CITY_CODE_MAP.put("婀樿タ鍦熷鏃忚嫍鏃忚嚜娌诲窞", "0743") + CITY_CODE_MAP.put("婊佸窞", "0550") + CITY_CODE_MAP.put("婊ㄥ窞", "0543") + CITY_CODE_MAP.put("婕渤", "0395") + CITY_CODE_MAP.put("娼嶅潑", "0536") + CITY_CODE_MAP.put("娼滄睙", "02728") + CITY_CODE_MAP.put("娼窞", "0768") + CITY_CODE_MAP.put("婵槼", "0393") + CITY_CODE_MAP.put("鐑熷彴", "0535") + CITY_CODE_MAP.put("鐒︿綔", "0391") + CITY_CODE_MAP.put("鐗′腹姹�", "0453") + CITY_CODE_MAP.put("鐜夋灄", "0775") + CITY_CODE_MAP.put("鐜夋邯", "0877") + CITY_CODE_MAP.put("鐢樺瓬钘忔棌鑷不宸�", "0836") + CITY_CODE_MAP.put("鐧藉煄", "0436") + CITY_CODE_MAP.put("鐧藉北", "0439") + CITY_CODE_MAP.put("鐧介摱", "0943") + CITY_CODE_MAP.put("鐩婇槼", "0737") + CITY_CODE_MAP.put("鐩愬煄", "0515") + CITY_CODE_MAP.put("鐩橀敠", "0427") + CITY_CODE_MAP.put("鐭冲槾灞�", "0952") + CITY_CODE_MAP.put("鐭冲搴�", "0311") + CITY_CODE_MAP.put("鐭虫渤瀛�", "0993") + CITY_CODE_MAP.put("绁炲啘鏋舵灄鍖�", "01719") + CITY_CODE_MAP.put("绾㈡渤鍝堝凹鏃忓綕鏃忚嚜娌诲窞", "0873") + CITY_CODE_MAP.put("缁嶅叴", "0575") + CITY_CODE_MAP.put("缁ュ寲", "0455") + CITY_CODE_MAP.put("缁甸槼", "0816") + CITY_CODE_MAP.put("鑱婂煄", "0635") + CITY_CODE_MAP.put("鑲囧簡", "0758") + CITY_CODE_MAP.put("鑸熷北", "0580") + CITY_CODE_MAP.put("鑺滄箹", "0553") + CITY_CODE_MAP.put("鑽嗗窞", "0716") + CITY_CODE_MAP.put("鑾辫姕", "0634") + CITY_CODE_MAP.put("鑿忔辰", "0530") + CITY_CODE_MAP.put("钀嶄埂", "0799") + CITY_CODE_MAP.put("钀ュ彛", "0417") + CITY_CODE_MAP.put("琛℃按", "0318") + CITY_CODE_MAP.put("琛¢槼", "0734") + CITY_CODE_MAP.put("琛㈠窞", "0570") + CITY_CODE_MAP.put("瑗垮弻鐗堢撼鍌f棌鑷不宸�", "0691") + CITY_CODE_MAP.put("瑗垮畞", "0971") + CITY_CODE_MAP.put("瑗垮畨", "029") + CITY_CODE_MAP.put("璁告槍", "0374") + CITY_CODE_MAP.put("璐垫腐", "01755") + CITY_CODE_MAP.put("璐哄窞", "01774") + CITY_CODE_MAP.put("璧勯槼", "0832") + CITY_CODE_MAP.put("璧e窞", "0797") + CITY_CODE_MAP.put("璧ゅ嘲", "0476") + CITY_CODE_MAP.put("杈芥簮", "0437") + CITY_CODE_MAP.put("杈惧窞", "0818") + CITY_CODE_MAP.put("杩愬煄", "0359") + CITY_CODE_MAP.put("杩炰簯娓�", "0518") + CITY_CODE_MAP.put("閫氬寲", "0435") + CITY_CODE_MAP.put("閫氳窘", "0475") + CITY_CODE_MAP.put("閬傚畞", "0825") + CITY_CODE_MAP.put("閬典箟", "0852") + CITY_CODE_MAP.put("閭㈠彴", "0319") + CITY_CODE_MAP.put("閭兏", "0310") + CITY_CODE_MAP.put("閭甸槼", "0739") + CITY_CODE_MAP.put("閮戝窞", "0371") + CITY_CODE_MAP.put("閮村窞", "0735") + CITY_CODE_MAP.put("閯傚皵澶氭柉", "0477") + CITY_CODE_MAP.put("閯傚窞", "0711") + CITY_CODE_MAP.put("閰掓硥", "0937") + CITY_CODE_MAP.put("閲戝崕", "0579") + CITY_CODE_MAP.put("閲戞槍", "0935") + CITY_CODE_MAP.put("閽﹀窞", "0777") + CITY_CODE_MAP.put("閾佸箔", "0410") + CITY_CODE_MAP.put("閾滀粊鍦板尯", "0856") + CITY_CODE_MAP.put("閾滃窛", "0919") + CITY_CODE_MAP.put("閾滈櫟", "0562") + CITY_CODE_MAP.put("閾跺窛", "0951") + CITY_CODE_MAP.put("閿﹀窞", "0416") + CITY_CODE_MAP.put("闀挎不", "0355") + CITY_CODE_MAP.put("闃滄柊", "0418") + CITY_CODE_MAP.put("闃滈槼", "01558") + CITY_CODE_MAP.put("闃虫硥", "0353") + CITY_CODE_MAP.put("闃垮潩钘忔棌缇屾棌鑷不宸�", "0837") + CITY_CODE_MAP.put("闄囧崡", "02935") + CITY_CODE_MAP.put("闅忓窞", "0722") + CITY_CODE_MAP.put("闆呭畨", "0835") + CITY_CODE_MAP.put("闊跺叧", "0751") + CITY_CODE_MAP.put("椹瀺灞�", "0555") + CITY_CODE_MAP.put("椹婚┈搴�", "0396") + CITY_CODE_MAP.put("楦¤タ", "0467") + CITY_CODE_MAP.put("楣ゅ", "0392") + CITY_CODE_MAP.put("楣ゅ矖", "0468") + CITY_CODE_MAP.put("楣版江", "0701") + CITY_CODE_MAP.put("榛勫唸", "0713") + CITY_CODE_MAP.put("榛戞渤", "0456") + CITY_CODE_MAP.put("榛斾笢鍗楄嫍鏃忎緱鏃忚嚜娌诲窞", "0855") + CITY_CODE_MAP.put("榛斿崡甯冧緷鏃忚嫍鏃忚嚜娌诲窞", "0854") + CITY_CODE_MAP.put("榻愰綈鍝堝皵", "0452") + CITY_CODE_MAP.put("榫欏博", "0597") + CITY_CODE_MAP.put("鐢樺崡钘忔棌鑷不宸�", "0941") + CITY_CODE_MAP.put("鍢夊唱鍏�", "1937") + CITY_CODE_MAP.put("鐧捐壊", "0776") + CITY_CODE_MAP.put("鍏洏姘�", "0858") + CITY_CODE_MAP.put("榛旇タ鍗楀竷渚濇棌鑻楁棌鑷不宸�", "0859") + CITY_CODE_MAP.put("鐧芥矙榛庢棌鑷不鍘�", "0802") + CITY_CODE_MAP.put("淇濅涵榛庢棌鑻楁棌鑷不鍘�", "0801") + CITY_CODE_MAP.put("鏄屾睙榛庢棌鑷不鍘�", "0803") + CITY_CODE_MAP.put("婢勮繄鍘�", "0804") + CITY_CODE_MAP.put("瀹氬畨鍘�", "0806") + CITY_CODE_MAP.put("涓滄柟", "0807") + CITY_CODE_MAP.put("涓滄矙缇ゅ矝", "0808") + CITY_CODE_MAP.put("涔愪笢榛庢棌鑷不鍘�", "2802") + CITY_CODE_MAP.put("涓撮珮鍘�", "1896") + CITY_CODE_MAP.put("闄垫按榛庢棌鑷不鍘�", "0809") + CITY_CODE_MAP.put("鍗楁矙缇ゅ矝", "1891") + CITY_CODE_MAP.put("鐞兼捣", "1894") + CITY_CODE_MAP.put("鐞间腑榛庢棌鑻楁棌鑷不鍘�", "1899") + CITY_CODE_MAP.put("灞槍鍘�", "1892") + CITY_CODE_MAP.put("涓囧畞", "1898") + CITY_CODE_MAP.put("鏂囨槍", "1893") + CITY_CODE_MAP.put("浜旀寚灞�", "1897") + CITY_CODE_MAP.put("瑗挎矙缇ゅ矝", "1895") + CITY_CODE_MAP.put("涓矙缇ゅ矝", "2801") + CITY_CODE_MAP.put("鍎嬪窞", "0805") + CITY_CODE_MAP.put("闃挎媺鍠勭洘", "0483") + CITY_CODE_MAP.put("宸村溅娣栧皵甯�", "0478") + CITY_CODE_MAP.put("閿℃灄閮嫆鐩�", "0479") + CITY_CODE_MAP.put("鍥哄師", "0954") + CITY_CODE_MAP.put("鏋滄礇钘忔棌鑷不宸�", "0975") + CITY_CODE_MAP.put("娴疯タ钂欏彜鏃忚棌鏃忚嚜娌诲窞", "0977") + CITY_CODE_MAP.put("榛勫崡钘忔棌鑷不宸�", "0973") + CITY_CODE_MAP.put("鐜夋爲钘忔棌鑷不宸�", "0976") + CITY_CODE_MAP.put("闃块噷鍦板尯", "0897") + CITY_CODE_MAP.put("鏄岄兘鍦板尯", "0895") + CITY_CODE_MAP.put("鏋楄姖鍦板尯", "0894") + CITY_CODE_MAP.put("閭f洸鍦板尯", "0896") + CITY_CODE_MAP.put("闃垮厠鑻忓湴鍖�", "0997") + CITY_CODE_MAP.put("闃垮嫆娉板湴鍖�", "0906") + CITY_CODE_MAP.put("宸撮煶閮钂欏彜鑷不宸�", "0996") + CITY_CODE_MAP.put("鍝堝瘑鍦板尯", "0902") + CITY_CODE_MAP.put("鍜岀敯鍦板尯", "0903") + CITY_CODE_MAP.put("鍠�浠�鍦板尯", "0998") + CITY_CODE_MAP.put("鍏嬪瓬鍕掕嫃鏌皵鍏嬪瓬鑷不宸�", "0908") + CITY_CODE_MAP.put("淇濆北", "0875") + CITY_CODE_MAP.put("寰峰畯鍌f棌鏅鏃忚嚜娌诲窞", "0692") + CITY_CODE_MAP.put("杩簡钘忔棌鑷不宸�", "0887") + CITY_CODE_MAP.put("涓芥睙", "0888") + CITY_CODE_MAP.put("涓存钵甯�", "0883") + CITY_CODE_MAP.put("鎬掓睙鍌堝兂鏃忚嚜娌诲窞", "0886") + CITY_CODE_MAP.put("鏅幢", "0879") + CITY_CODE_MAP.put("鏂囧北澹棌鑻楁棌鑷不宸�", "0876") + CITY_CODE_MAP.put("棣欐腐", "1852") + CITY_CODE_MAP.put("婢抽棬", "1853") + CITY_CODE_MAP.put("浜斿娓犲競", "652300") + CITY_CODE_MAP.put("闃挎媺灏斿競", "652900") + CITY_CODE_MAP.put("鍥炬湪鑸掑厠甯�", "653000") } /** - * 从poi中获得需要的数据 + * 浠巔oi涓幏寰楅渶瑕佺殑鏁版嵁 * @param ret * @param poi */ @@ -688,7 +688,7 @@ class AddressToBaiduLngLat { m.mabc_lat = o[1]; }else{ index++; - println "["+index+"]"+m.address +" 没有解析出经纬度 "+m.id + println "["+index+"]"+m.address +" 娌℃湁瑙f瀽鍑虹粡绾害 "+m.id } @@ -727,7 +727,7 @@ class AddressToBaiduLngLat { conn.setRequestMethod("GET"); conn.doOutput = true inputStream = conn.getInputStream(); - BufferedReader buf = new BufferedReader(new InputStreamReader(inputStream,"UTF-8"));// 创建UTF-8的BufferedReader + BufferedReader buf = new BufferedReader(new InputStreamReader(inputStream,"UTF-8"));// 鍒涘缓UTF-8鐨凚ufferedReader while((line = buf.readLine())!=null){ sb.append(line); } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/address/AnShouDataTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/address/AnShouDataTest.groovy index d45ba0e3e..77b7d8484 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/address/AnShouDataTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/address/AnShouDataTest.groovy @@ -35,18 +35,18 @@ class AnShouDataTest { def task = new AnShouDataTest(); def token = task.getToken(); println token -// task.run("E:\\数据测试\\数据\\", "安硕测试数据.txt"); -// task.batchTestApi("E:\\数据测试\\数据\\", "安硕测试数据", ".txt"); +// task.run("E:\\鏁版嵁娴嬭瘯\\鏁版嵁\\", "瀹夌娴嬭瘯鏁版嵁.txt"); +// task.batchTestApi("E:\\鏁版嵁娴嬭瘯\\鏁版嵁\\", "瀹夌娴嬭瘯鏁版嵁", ".txt"); } def batchTestApi(def path, def fileName, def fileType){ - def ret = readTxt(path, fileName+fileType);//读文件 + def ret = readTxt(path, fileName+fileType);//璇绘枃浠� def result = []; def index = 0; for(def m : ret){ - if(m.estateType=="住房"){ + if(m.estateType=="浣忔埧"){ index ++; @@ -83,28 +83,28 @@ class AnShouDataTest { } } - //writeCSV2("E:\\数据测试\\结果\\", "批量地址测试.csv", result); - writeCSV("E:\\数据测试\\结果\\", fileName+"(新).csv", result); + //writeCSV2("E:\\鏁版嵁娴嬭瘯\\缁撴灉\\", "鎵归噺鍦板潃娴嬭瘯.csv", result); + writeCSV("E:\\鏁版嵁娴嬭瘯\\缁撴灉\\", fileName+"(鏂�).csv", result); } def run(def path, def fileName){ - def ret = readTxt(path, fileName);//读文件 - def citys = CommonDatautils.findAllCity();//所有城市 - def regionMap = CommonDatautils.getAllCityRegions();//所有城市 - def provinces = CommonDatautils.findAllCityProvince();//城市所对省 - def sroucesData = selectDistrict("住房", ret, citys);//选取住宅类型 - println "住宅共:"+sroucesData.size(); - def results = getResult(sroucesData, provinces, citys, regionMap);//填充结果 - writeCSV("E:\\数据测试\\结果\\", "安硕住宅数据测试结果.csv", results); - //writeCSV3("E:\\数据测试\\结果\\", "安硕住宅数据测试结果(6-13).csv", results); + def ret = readTxt(path, fileName);//璇绘枃浠� + def citys = CommonDatautils.findAllCity();//鎵�鏈夊煄甯� + def regionMap = CommonDatautils.getAllCityRegions();//鎵�鏈夊煄甯� + def provinces = CommonDatautils.findAllCityProvince();//鍩庡競鎵�瀵圭渷 + def sroucesData = selectDistrict("浣忔埧", ret, citys);//閫夊彇浣忓畢绫诲瀷 + println "浣忓畢鍏憋細"+sroucesData.size(); + def results = getResult(sroucesData, provinces, citys, regionMap);//濉厖缁撴灉 + writeCSV("E:\\鏁版嵁娴嬭瘯\\缁撴灉\\", "瀹夌浣忓畢鏁版嵁娴嬭瘯缁撴灉.csv", results); + //writeCSV3("E:\\鏁版嵁娴嬭瘯\\缁撴灉\\", "瀹夌浣忓畢鏁版嵁娴嬭瘯缁撴灉(6-13).csv", results); } def getResult(def sroucesData, def provinces, def citys, def regionMap){ def token = getToken(); def index = 0; def matchIndex = 0; - // def lastMonth = CommonDatautils.findLastMonth("上海"); + // def lastMonth = CommonDatautils.findLastMonth("涓婃捣"); for(def m : sroucesData){ index++; @@ -115,9 +115,9 @@ class AnShouDataTest { // continue; // } - println "【${index}】 old:"+m.oldAddress + println "銆�${index}銆� old:"+m.oldAddress m = selectCity(m, citys); - //省 + //鐪� if(m.city){ m.address = AddressParserUtils.filterCity(m.city, m.oldAddress); m.province = provinces.get(m.city); @@ -127,9 +127,9 @@ class AnShouDataTest { def numMap = AddressParserUtils.selectHouseNumAndRoom(m.address?m.address:m.oldAddress); - println "【旧方法】"+numMap + println "銆愭棫鏂规硶銆�"+numMap def numMap2 = AddressParserUtils.selectHouseNumAndRoom2(m.address?m.address:m.oldAddress); - println "【新方法】"+numMap2 + println "銆愭柊鏂规硶銆�"+numMap2 m.houseNum = numMap.houseNum; m.roomNum = numMap.roomNum; m.unitNum = numMap.unitNum; @@ -145,12 +145,12 @@ class AnShouDataTest { m.address1 = numMap2.s1?numMap2.s1:numMap2.s2; m.distName1 = numMap2.s2; - //地址匹配 + //鍦板潃鍖归厤 def rett = null; if(m.address){ rett = getNameByAPI(m.city, m.address, token); } - //地址没匹配上,如果能提出小区名,用city+name查找 + //鍦板潃娌″尮閰嶄笂锛屽鏋滆兘鎻愬嚭灏忓尯鍚嶏紝鐢╟ity+name鏌ユ壘 if(!rett && m.distName){ rett = getNameByAPI(m.city, m.distName, token); if(!rett){ @@ -176,7 +176,7 @@ class AnShouDataTest { if(!m.address){ m.address = rett.address }else{ - if((rett.address.indexOf("弄")!=-1||rett.address.indexOf("号")!=-1||rett.address.indexOf("街")!=-1)&&m.address.indexOf("号")==-1&&m.address.indexOf("路")==-1){ + if((rett.address.indexOf("寮�")!=-1||rett.address.indexOf("鍙�")!=-1||rett.address.indexOf("琛�")!=-1)&&m.address.indexOf("鍙�")==-1&&m.address.indexOf("璺�")==-1){ m.address = rett.address } } @@ -195,24 +195,24 @@ class AnShouDataTest { m = getDistrictInfo(m); if(m.address){ - m.address = m.address.replace("#", "#").replaceAll(",", "、"); + m.address = m.address.replace("锛�", "#").replaceAll(",", "銆�"); } if(m.address){ - m.address = m.address.replace("#", "#").replaceAll(",", "、"); + m.address = m.address.replace("锛�", "#").replaceAll(",", "銆�"); } //if(m.houseNum ||m.roomNum){ - println "结果1: 【${m.name}】【${m.houseNum}】【${m.unitNum}】【${m.roomNum}】" - println "结果1: 【${m.name}】【${numMap2.houseNum}】【${numMap2.unitNum}】【${numMap2.roomNum}】" - println "结果2:【${m.address}】【${m.distName}】【${m.houseInfo}】【${m.baiduMatch}】【${m.baiduAddress}】" + println "缁撴灉1锛� 銆�${m.name}銆戙��${m.houseNum}銆戙��${m.unitNum}銆戙��${m.roomNum}銆�" + println "缁撴灉1锛� 銆�${m.name}銆戙��${numMap2.houseNum}銆戙��${numMap2.unitNum}銆戙��${numMap2.roomNum}銆�" + println "缁撴灉2锛氥��${m.address}銆戙��${m.distName}銆戙��${m.houseInfo}銆戙��${m.baiduMatch}銆戙��${m.baiduAddress}銆�" println "..................................................." // } } - println "能匹配上的有:[ "+matchIndex+" ]"; + println "鑳藉尮閰嶄笂鐨勬湁锛歔 "+matchIndex+" ]"; return sroucesData; } @@ -230,7 +230,7 @@ class AnShouDataTest { m.avgPrice = CommonDatautils.queryDistrictPrice(m.city, m.region, m.name, weekend, m.cat); } - //房价网估价 + //鎴夸环缃戜及浠� m.fangjiaTotalPrice = evaluation(m, token); if(!m.fangjiaTotalPrice && m.avgPrice){ m.fangjiaTotalPrice = (m.avgPrice * m.area).toInteger(); @@ -238,7 +238,7 @@ class AnShouDataTest { //m.rentPrice = queryRentPriceRange(m.city, m.region, m.name, lastMonth); - //其它网站均价 + //鍏跺畠缃戠珯鍧囦环 def otherWebsiteMap = CommonDatautils.queryOtherWebsitePrice(m.city, m.name); m.sunfunPrice = otherWebsiteMap.price_soufun m.anjukePrice = otherWebsiteMap.price_anjuke @@ -267,7 +267,7 @@ class AnShouDataTest { m.city = m.oldCity; return m; }else{ - def city = m.oldAddress.substring(0, m.oldAddress.indexOf("市")); + def city = m.oldAddress.substring(0, m.oldAddress.indexOf("甯�")); if(city != m.oldCity){ m.city = city; } @@ -281,8 +281,8 @@ class AnShouDataTest { } def selectRegion(def m){ def address = m.oldAddress; - if(address.indexOf("市")!=-1 && address.indexOf("区")!=-1){ - m.region = address.substring(address.indexOf("市")+1, address.indexOf("区")); + if(address.indexOf("甯�")!=-1 && address.indexOf("鍖�")!=-1){ + m.region = address.substring(address.indexOf("甯�")+1, address.indexOf("鍖�")); } return m; } @@ -291,25 +291,25 @@ class AnShouDataTest { m.roomNum = filterRoomNum(m.roomNum); m.unitNum = selectUnitNum(m.address!=null?m.address:m.oldAddress); - //所在楼层 + //鎵�鍦ㄦゼ灞� //m = selectHouseFloor(m); m = standardAddress(m); return m; } def selectUnitNum(def address){ - def ret = findPattern(address, "[幢|栋|楼](\\d+|\\w+|\\S)[单元|座]",0); + def ret = findPattern(address, "[骞鏍媩妤糫(\\d+|\\w+|\\S)[鍗曞厓|搴",0); if(!ret.num1){ - ret = findPattern(address, "[层](\\d+|\\w+|\\S)[单元|座]",0); + ret = findPattern(address, "[灞俔(\\d+|\\w+|\\S)[鍗曞厓|搴",0); } if(!ret.num1){ - ret = findPattern(address, "(\\d+|\\w+|\\S)[单元|座]",0); + ret = findPattern(address, "(\\d+|\\w+|\\S)[鍗曞厓|搴",0); } if(ret.num1){ - ret.num1 = ret.num1.replace("一", "1").replace("二", "2").replace("三", "3").replace("四", "4").replace("五", "5").replace("六", "6").replace("七", "7").replace("八", "8").replace("九", "9").replace("十", "10") + ret.num1 = ret.num1.replace("涓�", "1").replace("浜�", "2").replace("涓�", "3").replace("鍥�", "4").replace("浜�", "5").replace("鍏�", "6").replace("涓�", "7").replace("鍏�", "8").replace("涔�", "9").replace("鍗�", "10") } return ret.num1; } @@ -334,8 +334,8 @@ class AnShouDataTest { def address = m.address!=null?m.address:m.oldAddress; - if(!m.region && address.indexOf("县")!=-1){ - m.region = address.substring(0, address.indexOf("县")); + if(!m.region && address.indexOf("鍘�")!=-1){ + m.region = address.substring(0, address.indexOf("鍘�")); if(m.region){ m.address = address.substring(address.indexOf(m.region)+m.region.length() + 1, address.length()); } @@ -343,15 +343,15 @@ class AnShouDataTest { } - if(!m.region && address.indexOf("区")!=-1){ - m.region = address.substring(0, address.indexOf("区")+1); + if(!m.region && address.indexOf("鍖�")!=-1){ + m.region = address.substring(0, address.indexOf("鍖�")+1); if(m.region){ m.address = address.substring(address.indexOf(m.region)+m.region.length(), address.length()); - def index = m.address.indexOf("区"); + def index = m.address.indexOf("鍖�"); if(index!=-1){ - def end = m.address.indexOf("街"); + def end = m.address.indexOf("琛�"); if(end==-1){ - end = m.address.indexOf("路"); + end = m.address.indexOf("璺�"); } if(index < end){ @@ -362,22 +362,22 @@ class AnShouDataTest { m.region = findStandardRegion(m.city, m.region, regionMap); } - if(!m.region && address.indexOf("市")!=-1){ - m.region = address.substring(0, address.indexOf("市")); + if(!m.region && address.indexOf("甯�")!=-1){ + m.region = address.substring(0, address.indexOf("甯�")); if(m.region){ m.address = address.substring(address.indexOf(m.region)+m.region.length() + 1, address.length()); } m.region = findStandardRegion(m.city, m.region, regionMap); } - m.oldAddress = m.oldAddress.replaceAll(",", "、"); - m.address = m.address.replace("#", "#").replaceAll(",", "、"); + m.oldAddress = m.oldAddress.replaceAll(",", "銆�"); + m.address = m.address.replace("锛�", "#").replaceAll(",", "銆�"); return m; } def standardAddress(def m){ - if(m.address.indexOf("号")!=-1){ - m.address = m.address.substring(0, m.address.indexOf("号")+1); + if(m.address.indexOf("鍙�")!=-1){ + m.address = m.address.substring(0, m.address.indexOf("鍙�")+1); }else if(m.houseNum){ m.address = m.address.substring(0, m.address.indexOf(m.houseNum)); }else if(m.roomNum){ @@ -391,53 +391,53 @@ class AnShouDataTest { def selectHouseNumAndRoom(def map){ def address = map.address?map.address:map.oldAddress; - def ret = findPattern(address, "[弄|区](\\d+)[号|幢|栋](\\w{2,4})?[室]?",1); + def ret = findPattern(address, "[寮剕鍖篯(\\d+)[鍙穦骞鏍媇(\\w{2,4})?[瀹?",1); map.houseNum = ret.num1; map.roomNum = ret.num2; if(!map.houseNum){ address = map.address?map.address:map.oldAddress; - ret = findPattern(address, "号(\\d+)[幢|栋](\\d+)?[室|房]", 1); + ret = findPattern(address, "鍙�(\\d+)[骞鏍媇(\\d+)?[瀹鎴縘", 1); map.houseNum = ret.num1; map.roomNum = ret.num2; } if(!map.houseNum){ address = map.address?map.address:map.oldAddress; - ret = findPattern(address, "(\\d+|\\w+)[幢|栋]", 0); + ret = findPattern(address, "(\\d+|\\w+)[骞鏍媇", 0); map.houseNum = ret.num1; } if(!map.houseNum){ address = map.address?map.address:map.oldAddress; - ret = findPattern(address, "(\\d+|\\w+)号楼", 0); + ret = findPattern(address, "(\\d+|\\w+)鍙锋ゼ", 0); map.houseNum = ret.num1; } if(!map.houseNum){ address = map.address?map.address:map.oldAddress; - ret = findPattern(address, "(\\d+)#楼", 0); + ret = findPattern(address, "(\\d+)#妤�", 0); map.houseNum = ret.num1; } if(!map.roomNum){ address = map.address?map.address:map.oldAddress; - ret = findPattern(address, "(\\w{1,4}|\\d+)[室|房]",0); + ret = findPattern(address, "(\\w{1,4}|\\d+)[瀹鎴縘",0); map.roomNum = ret.num1; } if(!map.roomNum){ address = map.address?map.address:map.oldAddress; - ret = findPattern(address, "单元(\\w{1,4})[号|室]",0); + ret = findPattern(address, "鍗曞厓(\\w{1,4})[鍙穦瀹",0); map.roomNum = ret.num1; } - if(!map.houseNum&&!map.roomNum && map.oldAddress.indexOf("路")==-1 && map.oldAddress.indexOf("街")==-1){ - ret = findPattern(map.oldAddress, "(\\d+)[号|幢|栋](\\w{2,4})?[室]?",0); + if(!map.houseNum&&!map.roomNum && map.oldAddress.indexOf("璺�")==-1 && map.oldAddress.indexOf("琛�")==-1){ + ret = findPattern(map.oldAddress, "(\\d+)[鍙穦骞鏍媇(\\w{2,4})?[瀹?",0); map.houseNum = ret.num1; map.roomNum = ret.num2; @@ -446,7 +446,7 @@ class AnShouDataTest { if(!map.roomNum){ address = map.address?map.address:map.oldAddress; - ret = findPattern(address, "[座|号楼|梯|层](\\d{3,5})",0); + ret = findPattern(address, "[搴鍙锋ゼ|姊瘄灞俔(\\d{3,5})",0); map.roomNum = ret.num1; } @@ -456,7 +456,7 @@ class AnShouDataTest { map.houseNum = ret.num1; map.roomNum = ret.num2; } - //println map.oldAddress+" 楼栋号结果:["+map.houseNum+"]["+map.roomNum+"]["+map.address+"]"; + //println map.oldAddress+" 妤兼爧鍙风粨鏋滐細["+map.houseNum+"]["+map.roomNum+"]["+map.address+"]"; return map; } @@ -478,7 +478,7 @@ class AnShouDataTest { } if(!map.floor){ def address = map.address?map.address:map.oldAddress; - def ret = findPattern(address, "(\\d+)[层|F|f]", 0); + def ret = findPattern(address, "(\\d+)[灞倈F|f]", 0); map.floor = ret.num1; if(ret.address){ map.address = ret.address; @@ -492,7 +492,7 @@ class AnShouDataTest { if(!map.floor){ map.floor = null; } - //println map.oldAddress +" 结果:"+map.floor+" ["+map.address+"]"; + //println map.oldAddress +" 缁撴灉锛�"+map.floor+" ["+map.address+"]"; return map; } @@ -575,7 +575,7 @@ class AnShouDataTest { } - //println "周边均价:" + totalPrice +"【${url_str}】" + //println "鍛ㄨ竟鍧囦环锛�" + totalPrice +"銆�${url_str}銆�" return totalPrice; } @@ -592,7 +592,7 @@ class AnShouDataTest { List vs = vo.get("cla"); for(String[] o : vs){ String s = o[1]; - if(s.indexOf("小区")!=-1||s.indexOf("楼盘")!=-1){ + if(s.indexOf("灏忓尯")!=-1||s.indexOf("妤肩洏")!=-1){ address = vo.get("addr"); break; } @@ -705,7 +705,7 @@ class AnShouDataTest { conn.setRequestMethod("GET"); conn.doOutput = true inputStream = conn.getInputStream(); - BufferedReader buf = new BufferedReader(new InputStreamReader(inputStream,"UTF-8"));// 创建UTF-8的BufferedReader + BufferedReader buf = new BufferedReader(new InputStreamReader(inputStream,"UTF-8"));// 鍒涘缓UTF-8鐨凚ufferedReader while((line = buf.readLine())!=null){ sb.append(line); } @@ -743,14 +743,14 @@ class AnShouDataTest { for(def m : ret){ if(m.estateType == estateType){ result << m; -// if(m.address.indexOf("市")!=-1){ -// def city = m.address.substring(0, m.address.lastIndexOf("市")); -// if(city.indexOf("市")!=-1){ -// def tempCity = city.substring(city.indexOf("市")+1, city.length()); +// if(m.address.indexOf("甯�")!=-1){ +// def city = m.address.substring(0, m.address.lastIndexOf("甯�")); +// if(city.indexOf("甯�")!=-1){ +// def tempCity = city.substring(city.indexOf("甯�")+1, city.length()); // if(citys.contains(tempCity)){ // city = tempCity; // }else{ -// city = m.address.substring(0, m.address.indexOf("市")) +// city = m.address.substring(0, m.address.indexOf("甯�")) // } // } // if(city){ @@ -784,11 +784,11 @@ class AnShouDataTest { String estateType = arrs[4] def m = [:]; m.cid = cid; - if(estateType=="住房"){ + if(estateType=="浣忔埧"){ m.cat = "district"; - }else if(estateType=='写字楼'){ + }else if(estateType=='鍐欏瓧妤�'){ m.cat = "office"; - }else if(estateType=="商铺"){ + }else if(estateType=="鍟嗛摵"){ m.cat = "shop"; }else{ m.cat = "other"; @@ -811,16 +811,16 @@ class AnShouDataTest { } - file.append("城市,") - file.append("地址,") - file.append("楼盘名称,") - file.append("省,") - file.append("楼盘地址,") - file.append("别名,") - file.append("楼号,") - file.append("室号,") - file.append("单元号,") - file.append("状态,") + file.append("鍩庡競,") + file.append("鍦板潃,") + file.append("妤肩洏鍚嶇О,") + file.append("鐪�,") + file.append("妤肩洏鍦板潃,") + file.append("鍒悕,") + file.append("妤煎彿,") + file.append("瀹ゅ彿,") + file.append("鍗曞厓鍙�,") + file.append("鐘舵��,") file.append(System.getProperty("line.separator")); ret.each{ @@ -864,29 +864,29 @@ class AnShouDataTest { } - file.append("房产编号,") - file.append("房产地址,") - file.append("城市,") - file.append("建筑面积,") - file.append("抵押物类型,") - file.append("标准化-省,") - file.append("标准化-区,") - file.append("标准化-市,") - file.append("标准化-板块,") - file.append("标准化-楼盘,") - file.append("标准化-楼盘地址,") - file.append("楼栋,") - file.append("单元(号),") - file.append("房号,") - file.append("楼盘单价,") - file.append("批量估值(精准),") - file.append("搜房网楼盘单价,") - file.append("搜房网精确估值,") - file.append("安居客楼盘价格,") - //file.append("匹配状态,") - //file.append("别名,") - file.append("安居客精确估值,") - // file.append("租金,") + file.append("鎴夸骇缂栧彿,") + file.append("鎴夸骇鍦板潃,") + file.append("鍩庡競,") + file.append("寤虹瓚闈㈢Н,") + file.append("鎶垫娂鐗╃被鍨�,") + file.append("鏍囧噯鍖�-鐪�,") + file.append("鏍囧噯鍖�-鍖�,") + file.append("鏍囧噯鍖�-甯�,") + file.append("鏍囧噯鍖�-鏉垮潡,") + file.append("鏍囧噯鍖�-妤肩洏,") + file.append("鏍囧噯鍖�-妤肩洏鍦板潃,") + file.append("妤兼爧,") + file.append("鍗曞厓锛堝彿锛�,") + file.append("鎴垮彿,") + file.append("妤肩洏鍗曚环,") + file.append("鎵归噺浼板�硷紙绮惧噯锛�,") + file.append("鎼滄埧缃戞ゼ鐩樺崟浠�,") + file.append("鎼滄埧缃戠簿纭及鍊�,") + file.append("瀹夊眳瀹㈡ゼ鐩樹环鏍�,") + //file.append("鍖归厤鐘舵��,") + //file.append("鍒悕,") + file.append("瀹夊眳瀹㈢簿纭及鍊�,") + // file.append("绉熼噾,") file.append(System.getProperty("line.separator")); ret.each{ file.append(it.cid + ",","gbk") @@ -993,17 +993,17 @@ class AnShouDataTest { } - file.append("房产地址,") - file.append("标准化-区,") - file.append("标准化-板块,") - file.append("标准化-楼盘,") - file.append("标准化-楼盘地址,") - file.append("楼栋,") - //file.append("楼栋-新,") - file.append("单元(号),") - //file.append("单元(号)-新,") - file.append("房号,") - //file.append("房号-新,") + file.append("鎴夸骇鍦板潃,") + file.append("鏍囧噯鍖�-鍖�,") + file.append("鏍囧噯鍖�-鏉垮潡,") + file.append("鏍囧噯鍖�-妤肩洏,") + file.append("鏍囧噯鍖�-妤肩洏鍦板潃,") + file.append("妤兼爧,") + //file.append("妤兼爧-鏂�,") + file.append("鍗曞厓锛堝彿锛�,") + //file.append("鍗曞厓锛堝彿锛�-鏂�,") + file.append("鎴垮彿,") + //file.append("鎴垮彿-鏂�,") file.append(System.getProperty("line.separator")); ret.each{ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/address/BulkAddressAnalyBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/address/BulkAddressAnalyBatch.groovy index bd94a9772..1b6a46620 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/address/BulkAddressAnalyBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/address/BulkAddressAnalyBatch.groovy @@ -12,7 +12,7 @@ import java.util.concurrent.ExecutorService import java.util.concurrent.Executors /** - *批量地址分析脚本 + *鎵归噺鍦板潃鍒嗘瀽鑴氭湰 */ @BatchOwner(Watcher.WangWenYan) public class BulkAddressAnalyBatch extends BaseBatch{ @@ -41,7 +41,7 @@ public class BulkAddressAnalyBatch extends BaseBatch{ } } /** - * 恢复被打断的任务 + * 鎭㈠琚墦鏂殑浠诲姟 */ void resumeInterrtuptedTask(){ @@ -57,7 +57,7 @@ public class BulkAddressAnalyBatch extends BaseBatch{ task.status = TaskStatus.TASK_STATUS_DOING TASK.save(task) executorService.submit(new AddressAnalysisJob(task, false)) - logger.info("提交任务:${task._id.toString()}") + logger.info("鎻愪氦浠诲姟:${task._id.toString()}") } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/address/BulkEvaluationForTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/address/BulkEvaluationForTest.groovy index cec145689..ee721f035 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/address/BulkEvaluationForTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/address/BulkEvaluationForTest.groovy @@ -69,7 +69,7 @@ public class BulkEvaluationForTest extends BaseBatch{ def findNewTask(MqProvider mqProvider){ ADDRESS_COLL.find(new BasicDBObject("finish_mark",0)).sort(new BasicDBObject("version", -1)).each {BasicDBObject dbo-> ADDRESS_COLL.update(new BasicDBObject("_id", dbo._id), new BasicDBObject('$set', new BasicDBObject("finish_mark", 1).append("send_date", new Date()))) - println("${new Date().format("yyyy-MM-dd HH:mm:ss")}提交任务${dbo.city} ${dbo.address}") + println("${new Date().format("yyyy-MM-dd HH:mm:ss")}鎻愪氦浠诲姟${dbo.city} ${dbo.address}") mqProvider.send(dbo.get("_id").toString()) //executorService.submit(new BulkEvaluationTask(dbo)) //new BulkEvaluationTask(dbo); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/address/BulkEvaluationTask.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/address/BulkEvaluationTask.groovy index 8feda2f30..4fc77cbd3 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/address/BulkEvaluationTask.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/address/BulkEvaluationTask.groovy @@ -53,7 +53,7 @@ public class BulkEvaluationTask implements Runnable { Integer height = task.height String build_date = task.build_date String buildDate = null - String estateType = "普通住宅" + String estateType = "鏅�氫綇瀹�" if(StringUtils.isNotBlank(build_date)){ Pattern pattern = Pattern.compile("^\\d\\d\\d\\d"); def matcher = pattern.matcher(build_date) @@ -62,15 +62,15 @@ public class BulkEvaluationTask implements Runnable { } } if (StringUtils.isBlank(city) || area == null || area <= 0 || area > 1000) { - task.msg = "参数非法" + task.msg = "鍙傛暟闈炴硶" finishTask() return } - if (city.endsWith("市")) { - city = city.replaceAll("市\$", "") + if (city.endsWith("甯�")) { + city = city.replaceAll("甯俓$", "") } - if((districtName && districtName.contains("别墅")) || (address && address.contains("别墅"))){ - estateType = "别墅" + if((districtName && districtName.contains("鍒")) || (address && address.contains("鍒"))){ + estateType = "鍒" } JSONObject matchResult = null @@ -117,7 +117,7 @@ public class BulkEvaluationTask implements Runnable { BasicDBObject district = DbUtils.seaweed.findById(matchResult.getString("id")); def propertyType = null; if(district){ - if(district.estate_type2.contains("别墅")){ + if(district.estate_type2.contains("鍒")){ propertyType = 1; }else{ propertyType = 0; @@ -198,7 +198,7 @@ public class BulkEvaluationTask implements Runnable { task.fjw_price = (task.total_price/task.area).toInteger(); } - //房估估价格 + //鎴夸及浼颁环鏍� if(task.match_city && task.match_region && task.match_name){ def priceObj = findFangguguAndYungujiaPrice(task.match_city, task.match_region, task.match_name); if(priceObj){ @@ -211,7 +211,7 @@ public class BulkEvaluationTask implements Runnable { } - //其它网站价格 + //鍏跺畠缃戠珯浠锋牸 def startDate = DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyy-MM"), -6, "yyyy-MM"); startDate = startDate.replace("-", "") @@ -300,7 +300,7 @@ public class BulkEvaluationTask implements Runnable { } catch (Exception e) { e.printStackTrace() } - println("${new Date().format("yyyy-MM-dd HH:mm:ss")}估价完成") + println("${new Date().format("yyyy-MM-dd HH:mm:ss")}浼颁环瀹屾垚") } def findFangguguAndYungujiaPrice(def city, def region, def name){ @@ -514,7 +514,7 @@ public class BulkEvaluationTask implements Runnable { def values = []; def fjw_price = fjwPrice; - //找出最小差 + //鎵惧嚭鏈�灏忓樊 for(def i=0;i0){ @@ -345,11 +345,11 @@ class JinDongDataTest { def getPoiCount(def rett){ if(rett.lng2 && rett.lat2){ - rett.hspt_count = CommonDatautils.findPoiCount("医院", rett.lat2, rett.lng2) - rett.bank_count = CommonDatautils.findPoiCount("银行", rett.lat2, rett.lng2) - rett.school_count = CommonDatautils.findPoiCount("学校", rett.lat2, rett.lng2) - rett.bus_count = CommonDatautils.findPoiCount("公交", rett.lat2, rett.lng2) - rett.subway_count = CommonDatautils.findPoiCount("地铁", rett.lat2, rett.lng2) + rett.hspt_count = CommonDatautils.findPoiCount("鍖婚櫌", rett.lat2, rett.lng2) + rett.bank_count = CommonDatautils.findPoiCount("閾惰", rett.lat2, rett.lng2) + rett.school_count = CommonDatautils.findPoiCount("瀛︽牎", rett.lat2, rett.lng2) + rett.bus_count = CommonDatautils.findPoiCount("鍏氦", rett.lat2, rett.lng2) + rett.subway_count = CommonDatautils.findPoiCount("鍦伴搧", rett.lat2, rett.lng2) } return rett; @@ -425,21 +425,21 @@ class JinDongDataTest { def getDistrictKind(def rett){ if(rett.type){ - if(rett.type.indexOf("写字楼")!=-1){ - rett.kind = "写字楼"; - }else if(rett.type.indexOf("商铺")!=-1){ - rett.kind = "商铺"; + if(rett.type.indexOf("鍐欏瓧妤�")!=-1){ + rett.kind = "鍐欏瓧妤�"; + }else if(rett.type.indexOf("鍟嗛摵")!=-1){ + rett.kind = "鍟嗛摵"; }else{ if(rett.estateType){ - if(rett.estateType.indexOf("别墅")!=-1){ - rett.kind = "别墅"; + if(rett.estateType.indexOf("鍒")!=-1){ + rett.kind = "鍒"; } } } } if(!rett.kind){ - rett.kind = "小区"; + rett.kind = "灏忓尯"; } return rett; } @@ -487,7 +487,7 @@ class JinDongDataTest { } - //println "周边均价:" + totalPrice +"【${url_str}】" + //println "鍛ㄨ竟鍧囦环锛�" + totalPrice +"銆�${url_str}銆�" return totalPrice; } @@ -504,7 +504,7 @@ class JinDongDataTest { conn.setRequestMethod("GET"); conn.doOutput = true inputStream = conn.getInputStream(); - BufferedReader buf = new BufferedReader(new InputStreamReader(inputStream,"UTF-8"));// 创建UTF-8的BufferedReader + BufferedReader buf = new BufferedReader(new InputStreamReader(inputStream,"UTF-8"));// 鍒涘缓UTF-8鐨凚ufferedReader while((line = buf.readLine())!=null){ sb.append(line); } @@ -531,11 +531,11 @@ class JinDongDataTest { if (file.exists()){ file.delete(); } - file.append("序号,") - file.append("地址,") - file.append("经度,") - file.append("纬度,") - file.append("周边餐饮的人均消费,") + file.append("搴忓彿,") + file.append("鍦板潃,") + file.append("缁忓害,") + file.append("绾害,") + file.append("鍛ㄨ竟椁愰ギ鐨勪汉鍧囨秷璐�,") file.append(System.getProperty("line.separator")); ret.each{ file.append(it.id + ",","gbk") @@ -570,47 +570,47 @@ class JinDongDataTest { } - file.append("序号,") - file.append("地址,") - file.append("地址属性,") - file.append("标准化-省,") - file.append("城市,") - file.append("区域,") - file.append("板块,") - file.append("数据库类型,") - file.append("楼盘名称,") - file.append("匹配楼盘名称,") - file.append("地址中楼盘名称,") - file.append("物业地址,") - file.append("物业类型,") - file.append("经度,") - file.append("纬度,") - file.append("户数,") - file.append("产权性质,") - file.append("竣工时间,") - file.append("开发商,") - file.append("物业公司,") - file.append("物业费,") - file.append("建筑面积,") - file.append("楼盘单价,") - file.append("城市均价,") - file.append("月城市均价涨跌幅,") - file.append("租房均价,") - file.append("小区月均价涨跌幅,") - file.append("一年内小区历史最高价,") - file.append("一年内小区历史最低价,") - file.append("未来一年房价预测,") - file.append("周边餐饮的人均消费,") - file.append("板块均价排名,") - file.append("板块楼盘个数,") - file.append("区域均价排名,") - file.append("区域楼盘个数,") - file.append("写字楼数量,") - file.append("医院数量,") - file.append("银行数量,") - file.append("学校数量,") - file.append("公交车站数量,") - file.append("地铁数量,") + file.append("搴忓彿,") + file.append("鍦板潃,") + file.append("鍦板潃灞炴��,") + file.append("鏍囧噯鍖�-鐪�,") + file.append("鍩庡競,") + file.append("鍖哄煙,") + file.append("鏉垮潡,") + file.append("鏁版嵁搴撶被鍨�,") + file.append("妤肩洏鍚嶇О,") + file.append("鍖归厤妤肩洏鍚嶇О,") + file.append("鍦板潃涓ゼ鐩樺悕绉�,") + file.append("鐗╀笟鍦板潃,") + file.append("鐗╀笟绫诲瀷,") + file.append("缁忓害,") + file.append("绾害,") + file.append("鎴锋暟,") + file.append("浜ф潈鎬ц川,") + file.append("绔e伐鏃堕棿,") + file.append("寮�鍙戝晢,") + file.append("鐗╀笟鍏徃,") + file.append("鐗╀笟璐�,") + file.append("寤虹瓚闈㈢Н,") + file.append("妤肩洏鍗曚环,") + file.append("鍩庡競鍧囦环,") + file.append("鏈堝煄甯傚潎浠锋定璺屽箙,") + file.append("绉熸埧鍧囦环,") + file.append("灏忓尯鏈堝潎浠锋定璺屽箙,") + file.append("涓�骞村唴灏忓尯鍘嗗彶鏈�楂樹环,") + file.append("涓�骞村唴灏忓尯鍘嗗彶鏈�浣庝环,") + file.append("鏈潵涓�骞存埧浠烽娴�,") + file.append("鍛ㄨ竟椁愰ギ鐨勪汉鍧囨秷璐�,") + file.append("鏉垮潡鍧囦环鎺掑悕,") + file.append("鏉垮潡妤肩洏涓暟,") + file.append("鍖哄煙鍧囦环鎺掑悕,") + file.append("鍖哄煙妤肩洏涓暟,") + file.append("鍐欏瓧妤兼暟閲�,") + file.append("鍖婚櫌鏁伴噺,") + file.append("閾惰鏁伴噺,") + file.append("瀛︽牎鏁伴噺,") + file.append("鍏氦杞︾珯鏁伴噺,") + file.append("鍦伴搧鏁伴噺,") file.append(System.getProperty("line.separator")); ret.each{ file.append(it.id + ",","gbk") @@ -888,7 +888,7 @@ class JinDongDataTest { Map params = new HashMap(); params.put("city", city); params.put("address", address); - params.put("businessMatch", "1");//没有找到,进行商铺写字楼匹配 + params.put("businessMatch", "1");//娌℃湁鎵惧埌锛岃繘琛屽晢閾哄啓瀛楁ゼ鍖归厤 params.put("token", "FF231CF2F7268316D937374DB96AC91ED7478F663E9D233D7389B1F0A809038F59F52B983E627AD8E95FB644D8C43601E5FEE7F107B3BFD8F5AF2D73853591F481A34E26723B657C2DD2D05684DB12F69C37447B272F857EFE2BEC49BADB44A3A2DBDB7CDBE2AA25"); HttpRequest http = new HttpRequest(); Map map = null; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/address/OfficeLivePrecent.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/address/OfficeLivePrecent.groovy index be3a4cf2d..e2ce0b8c5 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/address/OfficeLivePrecent.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/address/OfficeLivePrecent.groovy @@ -14,14 +14,14 @@ class OfficeLivePrecent { static main(args) { def task = new OfficeLivePrecent(); - task.run("上海", "E:\\数据测试\\数据\\", "写字楼.txt"); + task.run("涓婃捣", "E:\\鏁版嵁娴嬭瘯\\鏁版嵁\\", "鍐欏瓧妤�.txt"); } def run(def city, def path, def fileName){ def ret = readTxt(path, fileName); def offices = findOffice(city); def results = matchOffice(ret, offices); - writeCSV("E:\\数据测试\\结果\\", "写字楼.csv", results); + writeCSV("E:\\鏁版嵁娴嬭瘯\\缁撴灉\\", "鍐欏瓧妤�.csv", results); } def matchOffice(def ret, def offices){ @@ -67,8 +67,8 @@ class OfficeLivePrecent { if (file.exists()){ file.delete(); } - file.append("名称,") - file.append("入住率,") + file.append("鍚嶇О,") + file.append("鍏ヤ綇鐜�,") file.append(System.getProperty("line.separator")); list.each{m-> diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/address/RegionRemoveHandler.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/address/RegionRemoveHandler.groovy index 8ebcf3df7..4b54ba00d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/address/RegionRemoveHandler.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/address/RegionRemoveHandler.groovy @@ -21,8 +21,8 @@ public class RegionRemoveHandler extends AddressStandardizeHandler { } public static void main(String[] args){ - Request request = new Request("普陀普陀鲁家峙岛东南涂鲁海路与鲁滨南路交界处"); - request.setRegion("普陀"); + Request request = new Request("鏅檧鏅檧椴佸宄欏矝涓滃崡娑傞瞾娴疯矾涓庨瞾婊ㄥ崡璺氦鐣屽"); + request.setRegion("鏅檧"); new RegionRemoveHandler().handleRequest(request); println request.getAddress(); } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/address/ShengShiQuRemoveHandler.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/address/ShengShiQuRemoveHandler.groovy index 2be1c0ac8..c22373915 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/address/ShengShiQuRemoveHandler.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/address/ShengShiQuRemoveHandler.groovy @@ -6,14 +6,14 @@ import java.util.regex.Pattern class ShengShiQuRemoveHandler extends AddressStandardizeHandler { - static final Pattern PATTERN = ~/^[\u4e00-\u9fa5]+?["省|市|县|区"]{1}?/; + static final Pattern PATTERN = ~/^[\u4e00-\u9fa5]+?["鐪亅甯倈鍘縷鍖�"]{1}?/; @Override public void handleRequest(Request request) { try{ request.setAddress(removeShengShi(request.getAddress())); }catch(Exception e){ - println "ShengShiQuRemoveHandler: " + request.getAddress()+" 处理失败,message:"+e.getMessage(); + println "ShengShiQuRemoveHandler: " + request.getAddress()+" 澶勭悊澶辫触,message:"+e.getMessage(); } } @@ -32,3193 +32,3193 @@ class ShengShiQuRemoveHandler extends AddressStandardizeHandler { } public static void main(String[] args){ - Request request = new Request("亳州市安徽省安徽省亳州市银海区北海市广东南路与杭州路交界处"); + Request request = new Request("浜冲窞甯傚畨寰界渷瀹夊窘鐪佷撼宸炲競閾舵捣鍖哄寳娴峰競骞夸笢鍗楄矾涓庢澀宸炶矾浜ょ晫澶�"); new ShengShiQuRemoveHandler().handleRequest(request); println request.getAddress(); } final Set DISTRICT= [ - "察布查尔锡伯自治县", - "察哈尔右翼中旗", - "昌江黎族自治县", - "长白朝鲜族自治县", - "鹤山区", - "宁江区", - "碧江区", - "自治区直辖县级行政区划", - "阿里地区", - "原阳县", - "桓台县", - "伽师县", - "隆阳区", - "望江县", - "烟台市", - "振兴区", - "上杭县", - "宁城县", - "南木林县", - "额济纳旗", - "城东区", - "清远市", - "渭滨区", - "余庆县", - "措勤县", - "谢家集区", - "赵县", - "石峰区", - "遂溪县", - "兴海县", - "硚口区", - "浈江区", - "襄城区", - "弋阳县", - "林芝县", - "通山县", - "铜鼓县", - "同心县", - "凤城市", - "牟平区", - "明水县", - "丹徒区", - "雨湖区", - "旌德县", - "康县", - "德令哈市", - "连山壮族瑶族自治县", - "郁南县", - "郯城县", - "融水苗族自治县", - "邓州市", - "井陉矿区", - "印江土家族苗族自治县", - "哈密市", - "道真仡佬族苗族自治县", - "威海市", - "桂东县", - "黎平县", - "安阳县", - "绍兴县", - "蒲城县", - "南通市", - "武山县", - "琼中黎族苗族自治县", - "龙泉驿区", - "三门县", - "千阳县", - "宁南县", - "文山壮族苗族自治州", - "洛江区", - "西藏自治区", - "广丰县", - "红星区", - "桐城市", - "荷塘区", - "龙泉市", - "潮州市", - "奎屯市", - "崇川区", - "溧水县", - "甘孜藏族自治州", - "平房区", - "清镇市", - "天津市", - "淮上区", - "海伦市", - "瓦房店市", - "襄城县", - "通渭县", - "彝良县", - "广汉市", - "宁阳县", - "江陵县", - "阿克塞哈萨克族自治县", - "固安县", - "郧县", - "古城区", - "临夏市", - "辽中县", - "开福区", - "中宁县", - "桃城区", - "市辖区", - "浦东新区", - "盘县", - "三山区", - "兴义市", - "江口县", - "洛扎县", - "吴中区", - "遂昌县", - "阿图什市", - "新干县", - "鄂尔多斯市", - "罗定市", - "富蕴县", - "磁县", - "开江县", - "迎江区", - "泉山区", - "永春县", - "普格县", - "长泰县", - "太原市", - "元谋县", - "满洲里市", - "孝南区", - "定远县", - "贵阳市", - "洛隆县", - "兰山区", - "武穴市", - "兴国县", - "郎溪县", - "永仁县", - "南城县", - "大通区", - "西秀区", - "越西县", - "茂名市", - "新兴区", - "岱岳区", - "山东省", - "信阳市", - "大荔县", - "义县", - "灵璧县", - "舟曲县", - "临清市", - "宁波市", - "镇沅彝族哈尼族拉祜族自治县", - "酒泉市", - "洛阳市", - "曹妃甸区", - "鸠江区", - "二道区", - "江城区", - "关岭布依族苗族自治县", - "恭城瑶族自治县", - "陵水黎族自治县", - "克孜勒苏柯尔克孜自治州", - "扎囊县", - "道里区", - "托克逊县", - "梅江区", - "兰溪市", - "泰山区", - "瑞丽市", - "铁山区", - "港闸区", - "扶绥县", - "全椒县", - "冠县", - "桂平市", - "灵石县", - "寿阳县", - "乌拉特前旗", - "蜀山区", - "横山县", - "郓城县", - "通辽市", - "开鲁县", - "珲春市", - "河池市", - "蓝山县", - "莱芜市", - "天河区", - "水磨沟区", - "乌达区", - "湖滨区", - "开封县", - "海陵区", - "德惠市", - "益阳市", - "务川仡佬族苗族自治县", - "确山县", - "丹江口市", - "临潭县", - "玉树藏族自治州", - "雨城区", - "多伦县", - "长沙市", - "永靖县", - "康马县", - "宕昌县", - "平塘县", - "河源市", - "城中区", - "泗县", - "达县", - "京口区", - "荔波县", - "东辽县", - "镇安县", - "夏津县", - "新青区", - "贵池区", - "五指山市", - "阿坝藏族羌族自治州", - "名山区", - "丰满区", - "凭祥市", - "廊坊市", - "紫云苗族布依族自治县", - "平和县", - "孟州市", - "金东区", - "黄山区", - "策勒县", - "房县", - "邵东县", - "乌兰浩特市", - "琼山区", - "南沙群岛", - "清徐县", - "蛟河市", - "田阳县", - "三门峡市", - "渝中区", - "六合区", - "南溪区", - "册亨县", - "长顺县", - "秀峰区", - "绵竹市", - "水富县", - "徽县", - "黑水县", - "福安市", - "徐州市", - "洛浦县", - "安多县", - "岷县", - "前进区", - "逊克县", - "三明市", - "易县", - "荆州市", - "江阴市", - "雨花区", - "兴平市", - "昭觉县", - "铜山区", - "港南区", - "贡觉县", - "隆昌县", - "应城市", - "容城县", - "嵩明县", - "禹会区", - "澳门特别行政区", - "奎文区", - "蒲县", - "晋中市", - "衡水市", - "高唐县", - "壶关县", - "都昌县", - "新兴县", - "精河县", - "天峨县", - "武昌区", - "自流井区", - "库车县", - "余杭区", - "珙县", - "霍林郭勒市", - "邵阳县", - "修文县", - "藤县", - "邗江区", - "望谟县", - "肥西县", - "高邑县", - "北碚区", - "武邑县", - "苏家屯区", - "西和县", - "永泰县", - "连山区", - "资源县", - "威信县", - "来凤县", - "集安市", - "城固县", - "曲阜市", - "郧西县", - "京山县", - "甘南藏族自治州", - "龙文区", - "抚远县", - "达尔罕茂明安联合旗", - "美溪区", - "金水区", - "铁锋区", - "马关县", - "大同市", - "黄冈市", - "昆明市", - "项城市", - "朔州市", - "阳江市", - "白银市", - "曲靖市", - "麻章区", - "户县", - "灵武市", - "东陵区", - "塔城市", - "宿豫区", - "称多县", - "喀喇沁旗", - "盐湖区", - "兴城市", - "昌都县", - "山丹县", - "射洪县", - "靖江市", - "凌云县", - "吉首市", - "惠水县", - "呼伦贝尔市", - "沅江市", - "城关区", - "景谷傣族彝族自治县", - "厦门市", - "商城县", - "广东省", - "榆树市", - "坡头区", - "贵南县", - "长兴县", - "龙川县", - "来宾市", - "子长县", - "乌恰县", - "赛罕区", - "木里藏族自治县", - "襄阳市", - "灌南县", - "巴马瑶族自治县", - "召陵区", - "七星区", - "鸡冠区", - "周宁县", - "玉泉区", - "乐山市", - "宜秀区", - "郏县", - "滨湖区", - "龙州县", - "黄陂区", - "宣城市", - "铁东区", - "余干县", - "新昌县", - "木垒哈萨克自治县", - "玛沁县", - "雨山区", - "金湖县", - "蠡县", - "随县", - "临县", - "海州区", - "松桃苗族自治县", - "梨树县", - "万州区", - "霞山区", - "河口瑶族自治县", - "铜梁县", - "盂县", - "冷水滩区", - "美姑县", - "随州市", - "陇南市", - "察雅县", - "高港区", - "门源回族自治县", - "瓜州县", - "万柏林区", - "定安县", - "疏附县", - "市南区", - "将乐县", - "金湾区", - "昭苏县", - "安宁区", - "山南地区", - "乐亭县", - "江干区", - "龙陵县", - "平安县", - "普宁市", - "江宁区", - "宜良县", - "怀安县", - "永宁县", - "嘉陵区", - "依兰县", - "赣州市", - "北京市", - "宜黄县", - "东山县", - "丰县", - "南华县", - "公主岭市", - "通化市", - "梨树区", - "积石山保安族东乡族撒拉族自治县", - "北流市", - "九原区", - "竹溪县", - "盐边县", - "金堂县", - "黔南布依族苗族自治州", - "马尾区", - "东莞市", - "元江哈尼族彝族傣族自治县", - "滁州市", - "鲅鱼圈区", - "邛崃市", - "云安县", - "调兵山市", - "祁东县", - "张北县", - "信丰县", - "宣汉县", - "衢江区", - "新都区", - "石龙区", - "营山县", - "监利县", - "博湖县", - "濠江区", - "天等县", - "遵义县", - "浦口区", - "鸡东县", - "砀山县", - "且末县", - "惠阳区", - "当阳市", - "乌当区", - "德阳市", - "盘龙区", - "莱阳市", - "宾阳县", - "阿城区", - "尚义县", - "和林格尔县", - "罗田县", - "康乐县", - "临安市", - "陕县", - "广饶县", - "泰兴市", - "南票区", - "连云港市", - "张店区", - "东山区", - "驻马店市", - "郊区", - "昌乐县", - "东西湖区", - "芝罘区", - "株洲市", - "宁陕县", - "岑巩县", - "右玉县", - "固原市", - "江西省", - "茂南区", - "杭锦后旗", - "贺州市", - "德兴市", - "江岸区", - "石狮市", - "望城区", - "柳城县", - "禹王台区", - "昌邑市", - "萍乡市", - "祁阳县", - "东阳市", - "合阳县", - "晋城市市辖区", - "遂宁市", - "六安市", - "德清县", - "历城区", - "广德县", - "开原市", - "上饶市", - "泰和县", - "海城市", - "嘉鱼县", - "河北省", - "城口县", - "阿勒泰地区", - "松溪县", - "合作市", - "大祥区", - "松阳县", - "东安区", - "天台县", - "高陵县", - "黄平县", - "乐清市", - "承德市", - "云梦县", - "五华县", - "泾县", - "攸县", - "泰来县", - "辉南县", - "乐平市", - "伊犁哈萨克自治州", - "怀宁县", - "宣州区", - "定边县", - "栖霞区", - "乐安县", - "博乐市", - "渑池县", - "高淳县", - "即墨市", - "新乡县", - "萝岗区", - "云阳县", - "岚县", - "突泉县", - "都兰县", - "贞丰县", - "沙依巴克区", - "杭州市", - "五营区", - "南谯区", - "天水市", - "常熟市", - "辽阳县", - "文登市", - "崂山区", - "会东县", - "法库县", - "淮滨县", - "彭水苗族土家族自治县", - "上高县", - "鹤庆县", - "白城市", - "汉川市", - "隆回县", - "锦屏县", - "大冶市", - "五华区", - "南京市", - "漾濞彝族自治县", - "大连市", - "峨眉山市", - "襄垣县", - "秀英区", - "米易县", - "江安县", - "牟定县", - "璧山县", - "巩义市", - "工农区", - "东宁县", - "罗甸县", - "洪雅县", - "商洛市", - "汉源县", - "钟楼区", - "长子县", - "镇宁布依族苗族自治县", - "三沙市", - "高县", - "息烽县", - "青秀区", - "东昌府区", - "桦甸市", - "荥经县", - "白河县", - "甘孜县", - "金平苗族瑶族傣族自治县", - "邱县", - "墨脱县", - "大武口区", - "金寨县", - "福鼎市", - "广水市", - "邵武市", - "垣曲县", - "埇桥区", - "温岭市", - "袁州区", - "富平县", - "瓮安县", - "沽源县", - "高要市", - "万安县", - "忻城县", - "巫溪县", - "白玉县", - "泸县", - "梁河县", - "忠县", - "延寿县", - "乌尔禾区", - "台州市", - "三元区", - "吕梁市", - "盈江县", - "越秀区", - "海门市", - "乌拉特中旗", - "防城港市", - "罗湖区", - "特克斯县", - "赣县", - "礼泉县", - "章贡区", - "莘县", - "寿光市", - "临川区", - "庄河市", - "梅州市", - "同德县", - "长丰县", - "北戴河区", - "陆河县", - "东平县", - "永清县", - "汾阳市", - "瑞金市", - "萨迦县", - "芙蓉区", - "黄埔区", - "留坝县", - "濮阳市", - "盖州市", - "资溪县", - "洛川县", - "民丰县", - "横县", - "榆中县", - "泸西县", - "三河市", - "平遥县", - "武平县", - "稻城县", - "临潼区", - "班玛县", - "沁源县", - "滦县", - "古丈县", - "安徽省", - "罗江县", - "汨罗市", - "连平县", - "隆尧县", - "宣威市", - "镜湖区", - "高平市", - "雁塔区", - "杨陵区", - "台江区", - "南山区", - "峨山彝族自治县", - "老城区", - "海北藏族自治州", - "戚墅堰区", - "中山市", - "奉化市", - "霍山县", - "长清区", - "平昌县", - "天柱县", - "青川县", - "秦安县", - "老边区", - "兴县", - "尼木县", - "阿瓦提县", - "金山屯区", - "东区", - "沁水县", - "亚东县", - "塔河县", - "海安县", - "洛宁县", - "共和县", - "丛台区", - "淳化县", - "乌海市", - "泾源县", - "南澳县", - "陇西县", - "九江市", - "乃东县", - "青岛市", - "麻阳苗族自治县", - "长阳土家族自治县", - "边坝县", - "博爱县", - "槐荫区", - "安平县", - "乾安县", - "广安市", - "秦都区", - "浑江区", - "伊宁县", - "霍城县", - "兰考县", - "眉山市", - "大通回族土族自治县", - "台江县", - "扎鲁特旗", - "惠民县", - "琅琊区", - "蔡甸区", - "惠山区", - "新和县", - "陵县", - "鄂托克前旗", - "黄岛区", - "抚顺市", - "会宁县", - "蓬安县", - "工布江达县", - "中山区", - "浔阳区", - "建宁县", - "宽甸满族自治县", - "新沂市", - "渭南市", - "宁武县", - "石家庄市", - "扶风县", - "吐鲁番市", - "赤壁市", - "未央区", - "玛多县", - "芦溪县", - "清水县", - "蒙自市", - "池州市", - "仁和区", - "宁津县", - "永修县", - "张家界市", - "阜阳市", - "玉田县", - "高台县", - "莒县", - "花垣县", - "正定县", - "潼南县", - "石林彝族自治县", - "长治县", - "大方县", - "莲都区", - "洞头县", - "宁化县", - "新野县", - "金平区", - "东兴市", - "昭平县", - "东河区", - "钟山区", - "科尔沁区", - "新华区", - "江孜县", - "乌兰县", - "利通区", - "汕尾市", - "河曲县", - "泾川县", - "攀枝花市", - "曲阳县", - "茶陵县", - "新源县", - "新荣区", - "岳阳市", - "兴隆台区", - "玛曲县", - "正阳县", - "泉州市", - "龙凤区", - "兴宾区", - "芗城区", - "红河哈尼族彝族自治州", - "宜都市", - "涞水县", - "莲湖区", - "高明区", - "成县", - "芜湖市", - "东台市", - "黄陵县", - "赤坎区", - "鹿泉市", - "盐源县", - "韶山市", - "雁江区", - "哈密地区", - "瑞昌市", - "高坪区", - "林口县", - "庆云县", - "周至县", - "全南县", - "崇阳县", - "福贡县", - "王益区", - "岚山区", - "浠水县", - "新晃侗族自治县", - "石城县", - "临澧县", - "成武县", - "甘泉县", - "连江县", - "四子王旗", - "济宁市", - "迁安市", - "白下区", - "夹江县", - "西岗区", - "宁陵县", - "渠县", - "湄潭县", - "韶关市", - "新抚区", - "源城区", - "长宁区", - "藁城市", - "永嘉县", - "海勃湾区", - "锡林郭勒盟", - "建始县", - "蒙阴县", - "龙游县", - "青县", - "岭东区", - "麟游县", - "仓山区", - "上蔡县", - "宁县", - "彬县", - "溧阳市", - "开阳县", - "恩施市", - "红花岗区", - "增城市", - "伊春区", - "罗城仫佬族自治县", - "海西蒙古族藏族自治州", - "蓬江区", - "繁峙县", - "铜陵县", - "泗洪县", - "昆山市", - "漠河县", - "岳塘区", - "咸阳市", - "岐山县", - "扎兰屯市", - "葫芦岛市", - "西湖区", - "宁远县", - "安义县", - "江阳区", - "疏勒县", - "都江堰市", - "龙山区", - "乡宁县", - "清水河县", - "友谊县", - "普陀区", - "龙港区", - "临沭县", - "李沧区", - "信州区", - "桐梓县", - "芮城县", - "文圣区", - "文水县", - "腾冲县", - "勐海县", - "安岳县", - "贵港市", - "昌吉回族自治州", - "缙云县", - "金溪县", - "长洲区", - "乌鲁木齐市", - "玉山县", - "剑河县", - "屯昌县", - "德州市", - "邢台县", - "建湖县", - "东明县", - "景县", - "杜集区", - "任县", - "黄岩区", - "东方市", - "红旗区", - "天全县", - "奈曼旗", - "张掖市", - "晋江市", - "易门县", - "江门市", - "铜官山区", - "四川省", - "光山县", - "延平区", - "东风区", - "凤县", - "化州市", - "贺兰县", - "华坪县", - "定西市", - "左权县", - "莱城区", - "于田县", - "北关区", - "青神县", - "襄州区", - "微山县", - "永川区", - "龙山县", - "小金县", - "利州区", - "林州市", - "独山子区", - "清流县", - "安县", - "老河口市", - "福田区", - "临淄区", - "井冈山市", - "文安县", - "炉霍县", - "湘潭县", - "伍家岗区", - "阳朔县", - "巩留县", - "洪湖市", - "松北区", - "宛城区", - "洪江市", - "南宫市", - "仪陇县", - "陕西省", - "阜平县", - "西夏区", - "阜新市", - "炎陵县", - "安定区", - "吉水县", - "西青区", - "牙克石市", - "颍州区", - "宜昌市", - "庆阳市", - "咸宁市", - "大理市", - "禅城区", - "布尔津县", - "札达县", - "凌源市", - "比如县", - "泊头市", - "改则县", - "青浦区", - "太仆寺旗", - "湟源县", - "宁晋县", - "陇县", - "卫辉市", - "柳北区", - "江东区", - "灯塔市", - "正宁县", - "宝山区", - "合水县", - "江夏区", - "忻府区", - "洪山区", - "于都县", - "马龙县", - "从江县", - "民乐县", - "吉安县", - "东昌区", - "宝清县", - "沂源县", - "镶黄旗", - "布拖县", - "淅川县", - "广安区", - "黑河市", - "雨花台区", - "鄂温克族自治旗", - "渝水区", - "江洲区", - "托里县", - "港北区", - "墨竹工卡县", - "澄江县", - "安阳市", - "吉隆县", - "阆中市", - "丰顺县", - "临江市", - "南关区", - "惠州市", - "合川区", - "枝江市", - "峨边彝族自治县", - "株洲县", - "长春市", - "桥东区", - "梁园区", - "禹城市", - "正镶白旗", - "四方区", - "保定市", - "海沧区", - "盐田区", - "双台子区", - "永康市", - "黄骅市", - "顺城区", - "尖草坪区", - "金坛市", - "弋江区", - "宜州市", - "合山市", - "延庆县", - "胶州市", - "长葛市", - "头屯河区", - "武都区", - "民和回族土族自治县", - "万载县", - "仙游县", - "莱西市", - "西平县", - "奉贤区", - "资阳区", - "垦利县", - "临河区", - "兴隆县", - "正安县", - "盱眙县", - "博罗县", - "双桥区", - "五河县", - "裕华区", - "拜泉县", - "台前县", - "广宁县", - "莆田市", - "阿拉善盟", - "绍兴市", - "涡阳县", - "安庆市", - "玉溪市", - "镇原县", - "澄海区", - "桃江县", - "巨野县", - "良庆区", - "平定县", - "岗巴县", - "镇坪县", - "双阳区", - "盐池县", - "齐齐哈尔市", - "道孚县", - "宁蒗彝族自治县", - "岚皋县", - "孝义市", - "梅列区", - "常山县", - "新河县", - "肃北蒙古族自治县", - "溪湖区", - "毕节市", - "金门县", - "中牟县", - "长宁县", - "浦城县", - "马村区", - "翠峦区", - "秦皇岛市", - "万全县", - "林甸县", - "秦州区", - "东营区", - "沁阳市", - "皇姑区", - "阳明区", - "桦南县", - "蒲江县", - "岢岚县", - "茄子河区", - "永定区", - "洋县", - "镇巴县", - "铁西区", - "措美县", - "神池县", - "习水县", - "八宿县", - "巴州区", - "当涂县", - "泗阳县", - "薛城区", - "梅河口市", - "太康县", - "九台市", - "云岩区", - "杭锦旗", - "伊金霍洛旗", - "五原县", - "尖扎县", - "朝阳市", - "贡山独龙族怒族自治县", - "眉县", - "武功县", - "环翠区", - "温县", - "兴文县", - "长安区", - "宾川县", - "东乌珠穆沁旗", - "勉县", - "潍城区", - "洛龙区", - "萧山区", - "新丰县", - "月湖区", - "新蔡县", - "塔什库尔干塔吉克自治县", - "钟山县", - "金城江区", - "海淀区", - "洞口县", - "远安县", - "察哈尔右翼后旗", - "永定县", - "涟水县", - "鸡泽县", - "临湘市", - "中方县", - "封丘县", - "四会市", - "巴南区", - "华亭县", - "晴隆县", - "东至县", - "汶川县", - "西安区", - "宝兴县", - "掇刀区", - "河津市", - "回民区", - "紫阳县", - "西充县", - "湘东区", - "绩溪县", - "矿区", - "二道江区", - "泽州县", - "霍州市", - "肇庆市", - "儋州市", - "玉门市", - "上街区", - "新邵县", - "安远县", - "绥芬河市", - "坊子区", - "革吉县", - "成华区", - "花山区", - "鼎城区", - "衡阳市", - "元宝山区", - "凤冈县", - "麻城市", - "和县", - "西乡塘区", - "长乐市", - "祥云县", - "榆阳区", - "孙吴县", - "虎丘区", - "新城区", - "方正县", - "湘阴县", - "祁县", - "光泽县", - "临邑县", - "肇源县", - "牡丹区", - "阳高县", - "玛纳斯县", - "山西省", - "登封市", - "卢龙县", - "淇滨区", - "略阳县", - "苍南县", - "广宗县", - "武威市", - "独山县", - "邹平县", - "新罗区", - "吉木萨尔县", - "深圳市", - "昭通市", - "代县", - "临朐县", - "崇安区", - "太子河区", - "临高县", - "固镇县", - "泰顺县", - "富裕县", - "郸城县", - "阳西县", - "张家川回族自治县", - "扬州市", - "定陶县", - "丰台区", - "陆川县", - "新龙县", - "云城区", - "宝坻区", - "黄州区", - "定结县", - "平度市", - "崇义县", - "澄迈县", - "康平县", - "哈尔滨市", - "丰泽区", - "巴塘县", - "平潭县", - "赞皇县", - "安陆市", - "阿拉尔市", - "安吉县", - "剑川县", - "新密市", - "沙河口区", - "佛冈县", - "秀屿区", - "大丰市", - "青田县", - "建德市", - "洮北区", - "濮阳县", - "左贡县", - "上海市", - "兴宁市", - "当雄县", - "杞县", - "太湖县", - "恩施土家族苗族自治州", - "礼县", - "安泽县", - "乌马河区", - "怀仁县", - "东坡区", - "静海县", - "凤阳县", - "九龙坡区", - "天长市", - "延边朝鲜族自治州", - "应县", - "辉县市", - "栾川县", - "墨玉县", - "平顶山市", - "海宁市", - "衡南县", - "环县", - "润州区", - "包头市", - "惠城区", - "巴中市", - "澄城县", - "新邱区", - "长治市", - "漳县", - "孝昌县", - "尧都区", - "肃南裕固族自治县", - "山亭区", - "宜兴市", - "周口市", - "鹿城区", - "楚雄彝族自治州", - "宜阳县", - "白朗县", - "和田地区", - "怀柔区", - "丹东市", - "石渠县", - "城厢区", - "叶县", - "诏安县", - "喀喇沁左翼蒙古族自治县", - "分宜县", - "莲花县", - "虎林市", - "南充市", - "河南省", - "梅县", - "肇东市", - "弥渡县", - "聂拉木县", - "阿尔山市", - "汉中市", - "浮梁县", - "涿鹿县", - "乡城县", - "上犹县", - "德保县", - "科尔沁右翼中旗", - "象山县", - "北仑区", - "社旗县", - "和田市", - "黄山市", - "长岭县", - "鄂州市", - "海晏县", - "内乡县", - "宁河县", - "桐柏县", - "乳源瑶族自治县", - "泌阳县", - "资中县", - "广河县", - "湖口县", - "焦作市", - "遂平县", - "新会区", - "兴安盟", - "江津区", - "丽水市", - "潢川县", - "果洛藏族自治州", - "呼玛县", - "虞城县", - "蓟县", - "尉犁县", - "修水县", - "珠晖区", - "西固区", - "无棣县", - "湘西土家族苗族自治州", - "龙潭区", - "安乡县", - "斗门区", - "樟树市", - "北票市", - "迁西县", - "西山区", - "宿松县", - "昌吉市", - "狮子山区", - "泸水县", - "天峻县", - "嘉定区", - "文成县", - "肇州县", - "肃宁县", - "安图县", - "钟祥市", - "龙岗区", - "雁峰区", - "苍梧县", - "龙湖区", - "上栗县", - "阳曲县", - "黄石市", - "南雄市", - "万宁市", - "周村区", - "龙子湖区", - "鄞州区", - "文山市", - "昌江区", - "石台县", - "象山区", - "遵化市", - "武夷山市", - "满城县", - "三水区", - "永吉县", - "惠来县", - "巴里坤哈萨克自治县", - "扶沟县", - "阿克苏地区", - "重庆市", - "静乐县", - "元坝区", - "玉树县", - "绥宁县", - "文昌市", - "芒市", - "潮安县", - "珠海市", - "贵州省", - "廉江市", - "富拉尔基区", - "都匀市", - "南明区", - "崆峒区", - "商河县", - "义乌市", - "新巴尔虎右旗", - "邻水县", - "嘉兴市", - "师宗县", - "振安区", - "香格里拉县", - "巢湖市", - "班戈县", - "大化瑶族自治县", - "枣庄市", - "无锡市", - "谢通门县", - "沧源佤族自治县", - "诸暨市", - "浦北县", - "巴彦淖尔市", - "安宁市", - "丰都县", - "黄浦区", - "休宁县", - "九龙县", - "古冶区", - "南昌县", - "兰州市", - "梧州市", - "北海市", - "偏关县", - "哈巴河县", - "北川羌族自治县", - "青山湖区", - "嫩江县", - "漳平市", - "格尔木市", - "汉台区", - "阜南县", - "禄劝彝族苗族自治县", - "和政县", - "景泰县", - "白碱滩区", - "博野县", - "克山县", - "鄢陵县", - "海丰县", - "茂港区", - "鼎湖区", - "大石桥市", - "贡井区", - "仙桃市", - "治多县", - "东胜区", - "江达县", - "昂仁县", - "南皮县", - "阳泉市", - "嵩县", - "晋州市", - "秀山土家族苗族自治县", - "唐河县", - "泸定县", - "鹤城区", - "潍坊市", - "渭城区", - "通化县", - "铜仁市", - "广陵区", - "和硕县", - "唐山市", - "阜城县", - "阿巴嘎旗", - "秀洲区", - "子洲县", - "二连浩特市", - "黔西县", - "明光市", - "江城哈尼族彝族自治县", - "海城区", - "轮台县", - "罗源县", - "绥德县", - "柳江县", - "船山区", - "德宏傣族景颇族自治州", - "榕城区", - "浏阳市", - "文县", - "鄂城区", - "汉滨区", - "会泽县", - "耿马傣族佤族自治县", - "抚州市", - "宿迁市", - "亳州市", - "合江县", - "塔城地区", - "城区", - "久治县", - "孟连傣族拉祜族佤族自治县", - "德安县", - "广西壮族自治区", - "三穗县", - "亭湖区", - "晋源区", - "千山区", - "图们市", - "万荣县", - "纳溪区", - "嵊泗县", - "宾县", - "香河县", - "乌拉特后旗", - "通许县", - "江永县", - "黔东南苗族侗族自治州", - "宁安市", - "广元市", - "旬邑县", - "闽侯县", - "甘州区", - "龙安区", - "涞源县", - "勃利县", - "长岛县", - "娄底市", - "南和县", - "隆子县", - "叠彩区", - "荣成市", - "麦积区", - "水城县", - "府谷县", - "贾汪区", - "平坝县", - "凉城县", - "凤山县", - "勐腊县", - "太仓市", - "许昌县", - "徐闻县", - "南涧彝族自治县", - "惠济区", - "泰宁县", - "永福县", - "淳安县", - "商南县", - "景德镇市", - "乐昌市", - "容县", - "灵山县", - "沾化县", - "珠山区", - "祁连县", - "澜沧拉祜族自治县", - "密云县", - "黟县", - "古县", - "昭阳区", - "吉州区", - "漯河市", - "麒麟区", - "武江区", - "沈阳市", - "密山市", - "南沙区", - "海阳市", - "江油市", - "三江侗族自治县", - "包河区", - "获嘉县", - "托克托县", - "麻山区", - "殷都区", - "仁怀市", - "福海县", - "乌审旗", - "杏花岭区", - "建瓯市", - "达州市", - "榆次区", - "平凉市", - "西昌市", - "金明区", - "宁国市", - "南长区", - "瀍河回族区", - "五莲县", - "松滋市", - "江海区", - "镇康县", - "兴业县", - "维西傈僳族自治县", - "射阳县", - "巧家县", - "湛河区", - "海南藏族自治州", - "宣恩县", - "玉林市", - "富县", - "石嘴山市", - "柳河县", - "彰武县", - "银海区", - "抚顺县", - "白沙黎族自治县", - "红古区", - "汝阳县", - "双清区", - "六枝特区", - "丹凤县", - "阳山县", - "新民市", - "无为县", - "夷陵区", - "湘桥区", - "宁乡县", - "金华市", - "邳州市", - "舒城县", - "南召县", - "凉州区", - "彭阳县", - "四平市", - "黑山县", - "安达市", - "莎车县", - "萧县", - "黎城县", - "简阳市", - "田林县", - "马边彝族自治县", - "玉州区", - "深泽县", - "刚察县", - "沙河市", - "凯里市", - "凤庆县", - "思明区", - "卓尼县", - "绵阳市", - "富源县", - "锦州市", - "奉新县", - "福山区", - "鹤岗市", - "港口区", - "端州区", - "两当县", - "巴林右旗", - "和平县", - "阳原县", - "华池县", - "南陵县", - "昌邑区", - "海盐县", - "环江毛南族自治县", - "原平市", - "北塔区", - "宜宾县", - "张家口市", - "建昌县", - "利川市", - "舟山市", - "五台县", - "潮阳区", - "皋兰县", - "鹿邑县", - "清河门区", - "桐庐县", - "昌都地区", - "沙洋县", - "黑龙江省", - "凌海市", - "镇海区", - "铅山县", - "三亚市", - "黔江区", - "汤旺河区", - "旺苍县", - "西乡县", - "顺平县", - "平顺县", - "夏河县", - "南海区", - "晋安区", - "沭阳县", - "无极县", - "定州市", - "陇川县", - "龙湾区", - "荥阳市", - "肥城市", - "洱源县", - "昌宁县", - "永顺县", - "华阴市", - "宽城区", - "土默特左旗", - "拉孜县", - "江南区", - "管城回族区", - "加查县", - "洪泽县", - "台安县", - "北塘区", - "新巴尔虎左旗", - "合肥市", - "肥乡县", - "石阡县", - "和平区", - "博望区", - "双塔区", - "丹棱县", - "钦北区", - "琼结县", - "克拉玛依市", - "泽普县", - "喀什市", - "丰镇市", - "广灵县", - "河口区", - "望都县", - "瑞安市", - "南平市", - "庄浪县", - "古塔区", - "绥滨县", - "横峰县", - "英山县", - "南江县", - "岑溪市", - "靖远县", - "广阳区", - "尚志市", - "安龙县", - "双滦区", - "银川市", - "梓潼县", - "曲周县", - "宝塔区", - "湛江市", - "枣强县", - "团风县", - "凤台县", - "武陵源区", - "泰安市", - "鹰手营子矿区", - "武安市", - "双江拉祜族佤族布朗族傣族自治县", - "金秀瑶族自治县", - "邯郸县", - "河东区", - "田家庵区", - "如东县", - "保德县", - "金阳县", - "宜章县", - "青白江区", - "定日县", - "黎川县", - "贵定县", - "邕宁区", - "延长县", - "临沧市", - "临翔区", - "会同县", - "大竹县", - "永新县", - "寿宁县", - "长武县", - "阳信县", - "嘉善县", - "巴青县", - "太谷县", - "盘山县", - "大宁县", - "柳南区", - "于洪区", - "曲沃县", - "民勤县", - "喜德县", - "大足区", - "新市区", - "永安市", - "姚安县", - "张家港市", - "林芝地区", - "奉节县", - "屏山县", - "通道侗族自治县", - "凤泉区", - "温宿县", - "从化市", - "南部县", - "西双版纳傣族自治州", - "高密市", - "涧西区", - "鹿寨县", - "鄱阳县", - "宜君县", - "海南区", - "迪庆藏族自治州", - "鹰潭市", - "科尔沁右翼前旗", - "巴林左旗", - "舞阳县", - "岳麓区", - "盐亭县", - "商州区", - "遵义市", - "电白县", - "茂县", - "连云区", - "博白县", - "汉寿县", - "孟村回族自治县", - "怀化市", - "游仙区", - "祁门县", - "开平区", - "德庆县", - "淄川区", - "景宁畲族自治县", - "那曲县", - "聂荣县", - "白山市", - "合浦县", - "安丘市", - "滨州市", - "任城区", - "永兴县", - "德江县", - "伊通满族自治县", - "宁德市", - "石屏县", - "博山区", - "南阳市", - "蓝田县", - "渝北区", - "云霄县", - "九江县", - "宁都县", - "铁岭市", - "广平县", - "辽源市", - "永丰县", - "柘城县", - "马鞍山市", - "墨江哈尼族自治县", - "那坡县", - "绥阳县", - "城阳区", - "施秉县", - "福清市", - "固阳县", - "荔湾区", - "涪陵区", - "临泽县", - "平果县", - "烈山区", - "青海省", - "龙沙区", - "囊谦县", - "城北区", - "姑苏区", - "谯城区", - "津南区", - "滨城区", - "鹤峰县", - "齐河县", - "卫东区", - "那曲地区", - "宁明县", - "荔浦县", - "武川县", - "江都区", - "西吉县", - "汕头市", - "筠连县", - "五大连池市", - "金口河区", - "友好区", - "武侯区", - "浚县", - "大兴区", - "前郭尔罗斯蒙古族自治县", - "碾子山区", - "沙雅县", - "杂多县", - "山阳区", - "滦平县", - "馆陶县", - "乐业县", - "集美区", - "彭山县", - "丁青县", - "岳阳县", - "卢氏县", - "天桥区", - "中江县", - "苏仙区", - "德昌县", - "卫滨区", - "索县", - "范县", - "巍山彝族回族自治县", - "双鸭山市", - "道县", - "寒亭区", - "南乐县", - "梁山县", - "百色市", - "万秀区", - "仁化县", - "库尔勒市", - "霸州市", - "威宁彝族回族苗族自治县", - "龙城区", - "岳阳楼区", - "泸溪县", - "仪征市", - "湖里区", - "三都水族自治县", - "内蒙古自治区", - "武冈市", - "武强县", - "越城区", - "安化县", - "庐山区", - "新泰市", - "麻栗坡县", - "尉氏县", - "西沙群岛", - "小店区", - "莱山区", - "苍山县", - "日照市", - "舒兰市", - "海东地区", - "丹阳市", - "夏邑县", - "介休市", - "揭东县", - "剑阁县", - "白水县", - "大田县", - "荆州区", - "立山区", - "常德市", - "黄梅县", - "顺庆区", - "榆林市", - "沾益县", - "阿克陶县", - "汝州市", - "禹州市", - "天山区", - "四方台区", - "仲巴县", - "新平彝族傣族自治县", - "嘉荫县", - "启东市", - "泸州市", - "内江市", - "七台河市", - "海口市", - "永城市", - "滨海县", - "武汉市", - "南昌市", - "静安区", - "武进区", - "武胜县", - "阿拉善左旗", - "猇亭区", - "南安市", - "富顺县", - "西陵区", - "临泉县", - "临夏县", - "甘井子区", - "永德县", - "禄丰县", - "嵊州市", - "蝶山区", - "同仁县", - "南芬区", - "万源市", - "新北区", - "辛集市", - "普兰县", - "黄龙县", - "谷城县", - "清浦区", - "宣化区", - "彭泽县", - "芷江侗族自治县", - "大厂回族自治县", - "闸北区", - "阿鲁科尔沁旗", - "沐川县", - "和龙市", - "平鲁区", - "大关县", - "泰州市", - "灵台县", - "纳雍县", - "双牌县", - "平武县", - "徽州区", - "神农架林区", - "连南瑶族自治县", - "都安瑶族自治县", - "江川县", - "顺昌县", - "威远县", - "乐至县", - "静宁县", - "铁山港区", - "方城县", - "官渡区", - "太和区", - "个旧市", - "岫岩满族自治县", - "浉河区", - "张湾区", - "绛县", - "开远市", - "淮安市", - "隆林各族自治县", - "雷州市", - "漳浦县", - "蒙城县", - "城子河区", - "龙江县", - "土默特右旗", - "西盟佤族自治县", - "乌鲁木齐县", - "内丘县", - "船营区", - "洪洞县", - "松原市", - "六盘水市", - "恒山区", - "朝天区", - "余姚市", - "石楼县", - "芜湖县", - "苏尼特左旗", - "中沙群岛的岛礁及其海域", - "兴山县", - "崇礼县", - "富阳市", - "开封市", - "东川区", - "保山市", - "西乌珠穆沁旗", - "相山区", - "吐鲁番地区", - "共青城市", - "太和县", - "沙坡头区", - "潜山县", - "北市区", - "扶余县", - "武乡县", - "思茅区", - "南宁市", - "宜春市", - "徐水县", - "同江市", - "耀州区", - "旅顺口区", - "兰西县", - "鹤壁市", - "龙井市", - "郴州市", - "西林区", - "鄂托克旗", - "金山区", - "绥中县", - "吴川市", - "阜宁县", - "玉屏侗族自治县", - "闻喜县", - "灵丘县", - "万年县", - "来安县", - "台山市", - "兴山区", - "让胡路区", - "吴忠市", - "巴彦县", - "大安区", - "昔阳县", - "高州市", - "峰峰矿区", - "资兴市", - "门头沟区", - "河间市", - "旬阳县", - "古蔺县", - "潘集区", - "旌阳区", - "饶河县", - "清河区", - "高安市", - "东营市", - "乐东黎族自治县", - "始兴县", - "咸丰县", - "天元区", - "青阳县", - "米林县", - "椒江区", - "雷波县", - "安康市", - "泽库县", - "新化县", - "全州县", - "涉县", - "许昌市", - "铜川市", - "左云县", - "平桥区", - "象州县", - "怒江傈僳族自治州", - "西林县", - "弥勒县", - "覃塘区", - "海港区", - "东乡县", - "滴道区", - "浦江县", - "平乡县", - "东港市", - "宝安区", - "瓯海区", - "沿滩区", - "德城区", - "琼海市", - "石柱土家族自治县", - "宏伟区", - "民权县", - "荣昌县", - "鲁甸县", - "兴宁区", - "清河县", - "龙门县", - "广昌县", - "柯城区", - "萨尔图区", - "安顺市", - "界首市", - "县", - "绿春县", - "江华瑶族自治县", - "大洼县", - "喀什地区", - "章丘市", - "钦州市", - "镇赉县", - "商都县", - "青山区", - "陆良县", - "靖西县", - "濉溪县", - "永登县", - "讷河市", - "集贤县", - "沧县", - "邹城市", - "商丘市", - "华龙区", - "庆安县", - "武义县", - "站前区", - "三台县", - "历下区", - "昌黎县", - "七星关区", - "玉环县", - "永寿县", - "桂阳县", - "路南区", - "东乡族自治县", - "甘德县", - "金沙县", - "施甸县", - "寿县", - "防城区", - "含山县", - "平川区", - "南漳县", - "米脂县", - "大余县", - "延津县", - "农安县", - "望奎县", - "嘉祥县", - "顺河回族区", - "南浔区", - "湘潭市", - "长海县", - "襄汾县", - "平江县", - "叙永县", - "呼图壁县", - "通江县", - "铜陵市", - "湖北省", - "鄄城县", - "鸡西市", - "解放区", - "庐阳区", - "通城县", - "清新县", - "松江区", - "红塔区", - "君山区", - "九寨沟县", - "泗水县", - "桑日县", - "天心区", - "内黄县", - "达日县", - "湾里区", - "舞钢市", - "清丰县", - "西区", - "点军区", - "赫章县", - "迭部县", - "上虞市", - "巴楚县", - "福泉市", - "沛县", - "锡林浩特市", - "岳西县", - "西丰县", - "蔚县", - "新浦区", - "兴安区", - "嘉黎县", - "魏县", - "文峰区", - "凤翔县", - "怀来县", - "龙胜各族自治县", - "衡东县", - "平利县", - "扎赉特旗", - "北林区", - "阿拉善右旗", - "沙市区", - "龙南县", - "湟中县", - "东海县", - "蒙山县", - "吉木乃县", - "句容市", - "马尔康县", - "临汾市", - "大东区", - "循化撒拉族自治县", - "渭源县", - "虹口区", - "平远县", - "玉龙纳西族自治县", - "八步区", - "金牛区", - "海拉尔区", - "建华区", - "东源县", - "姜堰市", - "柳州市", - "凌河区", - "营口市", - "灌云县", - "河北区", - "新疆维吾尔自治区", - "石鼓区", - "枣阳市", - "敦化市", - "皮山县", - "保亭黎族苗族自治县", - "成都市", - "常州市", - "兖州市", - "巨鹿县", - "徐汇区", - "吴江区", - "忻州市", - "松潘县", - "汾西县", - "兴安县", - "色达县", - "岱山县", - "博兴县", - "浪卡子县", - "集宁区", - "下陆区", - "上思县", - "新县", - "临海市", - "修武县", - "临沂市", - "山海关区", - "双城市", - "沙县", - "陆丰市", - "嘉峪关市", - "宣化县", - "紫金县", - "错那县", - "锡山区", - "融安县", - "钢城区", - "平乐县", - "长汀县", - "丽江市", - "行唐县", - "丰宁满族自治县", - "富锦市", - "瑶海区", - "西城区", - "田东县", - "平谷区", - "西工区", - "昌平区", - "景东彝族自治县", - "江汉区", - "公安县", - "隆安县", - "利辛县", - "宁海县", - "木兰县", - "潼关县", - "新宾满族自治县", - "诸城市", - "河南蒙古族自治县", - "云和县", - "永和县", - "冷水江市", - "金台区", - "蕲春县", - "平山区", - "锦江区", - "隆化县", - "吴桥县", - "康保县", - "衡阳县", - "孝感市", - "盐都区", - "雄县", - "扬中市", - "翠屏区", - "蕉城区", - "铁岭县", - "信宜市", - "阿坝县", - "连城县", - "醴陵市", - "临洮县", - "犍为县", - "鄂伦春自治旗", - "红寺堡区", - "永善县", - "上甘岭区", - "右江区", - "宜城市", - "清苑县", - "龙华区", - "汉阳区", - "景洪市", - "房山区", - "大同区", - "安仁县", - "二七区", - "遂川县", - "英德市", - "颍泉区", - "克什克腾旗", - "桥西区", - "根河市", - "凉山彝族自治州", - "鱼峰区", - "西华县", - "洮南市", - "下关区", - "申扎县", - "费县", - "武陟县", - "石拐区", - "抚松县", - "通榆县", - "相城区", - "壤塘县", - "兴庆区", - "香港特别行政区", - "石景山区", - "乌什县", - "曾都区", - "阳新县", - "汪清县", - "麦盖提县", - "汤阴县", - "红河县", - "富川瑶族自治县", - "霞浦县", - "城步苗族自治县", - "南岗区", - "会理县", - "和布克赛尔蒙古自治县", - "龙马潭区", - "三原县", - "镇平县", - "大名县", - "曲水县", - "大悟县", - "白云区", - "华县", - "华蓥市", - "茅箭区", - "寻乌县", - "中原区", - "中阳县", - "大同县", - "东洲区", - "梁子湖区", - "云县", - "绥化市", - "佛坪县", - "丰城市", - "婺城区", - "平舆县", - "罗平县", - "苍溪县", - "平南县", - "化隆回族自治县", - "蒸湘区", - "通州区", - "科尔沁左翼后旗", - "顺义区", - "绥棱县", - "永济市", - "红安县", - "小河区", - "淮安区", - "宿城区", - "阿合奇县", - "稷山县", - "贵溪市", - "带岭区", - "抚宁县", - "东安县", - "万山区", - "通川区", - "江山市", - "若羌县", - "丰润区", - "滕州市", - "茌平县", - "嘉禾县", - "鱼台县", - "南康市", - "济源市", - "本溪满族自治县", - "武清区", - "江北区", - "尼勒克县", - "济南市", - "赤城县", - "睢县", - "睢阳区", - "武定县", - "南岔区", - "明溪县", - "汶上县", - "贵德县", - "焉耆回族自治县", - "翼城县", - "丹寨县", - "韩城市", - "华容区", - "滨海新区", - "平山县", - "若尔盖县", - "佳木斯市", - "莒南县", - "栖霞市", - "南县", - "余江县", - "富民县", - "白银区", - "淮阳县", - "细河区", - "仁布县", - "峡江县", - "霍邱县", - "十堰市", - "神木县", - "福建省", - "石泉县", - "复兴区", - "安国市", - "安福县", - "龙岩市", - "南湖区", - "苏州市", - "肥东县", - "阜新蒙古族自治县", - "广南县", - "东光县", - "市中区", - "云溪区", - "镇雄县", - "大姚县", - "单县", - "福州市", - "桃源县", - "长垣县", - "林西县", - "繁昌县", - "大新县", - "什邡市", - "临颍县", - "安次区", - "娄星区", - "惠东县", - "永胜县", - "怀集县", - "沈丘县", - "息县", - "华容县", - "潜江市", - "英吉沙县", - "漳州市", - "柳林县", - "裕安区", - "南靖县", - "庆城县", - "淮阴区", - "武城县", - "济阳县", - "上城区", - "靖安县", - "拜城县", - "赣榆县", - "兴和县", - "双柏县", - "胶南市", - "察隅县", - "汇川区", - "西塞山区", - "灌阳县", - "沁县", - "赤峰市", - "揭阳市", - "崇州市", - "涿州市", - "吴起县", - "邯山区", - "路桥区", - "朗县", - "长沙县", - "自贡市", - "秦淮区", - "围场满族蒙古族自治县", - "钦南区", - "龙海市", - "蓬莱市", - "山城区", - "衡山县", - "平湖市", - "新安县", - "井陉县", - "柯坪县", - "普兰店市", - "沙坪坝区", - "理县", - "沙湾区", - "竹山县", - "巫山县", - "慈利县", - "贡嘎县", - "武宣县", - "德格县", - "和田县", - "阿荣旗", - "屯留县", - "吉林省", - "酉阳土家族苗族自治县", - "长寿区", - "广州市", - "宜宾市", - "吴兴区", - "元宝区", - "江苏省", - "罗庄区", - "五通桥区", - "綦江区", - "银州区", - "桓仁满族自治县", - "封开县", - "峄城区", - "湖州市", - "明山区", - "荆门市", - "温泉县", - "东阿县", - "柘荣县", - "金乡县", - "平罗县", - "川汇区", - "聊城市", - "雅江县", - "北安市", - "天祝藏族自治县", - "安新县", - "新乡市", - "乐陵市", - "涵江区", - "和顺县", - "伊川县", - "镇江市", - "青龙满族自治县", - "蚌山区", - "黄南藏族自治州", - "黄石港区", - "保靖县", - "赫山区", - "青羊区", - "克拉玛依区", - "海珠区", - "岳普湖县", - "五峰土家族自治县", - "曲麻莱县", - "滨江区", - "林周县", - "宝应县", - "元阳县", - "惠安县", - "石门县", - "沈河区", - "香洲区", - "汉阴县", - "汤原县", - "拱墅区", - "台湾省", - "香坊区", - "海原县", - "东宝区", - "道外区", - "邵阳市", - "红原县", - "青州市", - "本溪市", - "云龙县", - "通海县", - "平泉县", - "砚山县", - "定海区", - "双流县", - "新宁县", - "青原区", - "安源区", - "铁力市", - "婺源县", - "南开区", - "石首市", - "定襄县", - "卧龙区", - "乾县", - "盘锦市", - "星子县", - "雷山县", - "昆都仑区", - "察哈尔右翼前旗", - "朔城区", - "交口县", - "故城县", - "芒康县", - "乳山市", - "昌图县", - "翁源县", - "临桂县", - "下花园区", - "天宁区", - "得荣县", - "达坂城区", - "西市区", - "青云谱区", - "宝鸡市", - "浙江省", - "兴化市", - "桃山区", - "屯溪区", - "延安市", - "思南县", - "卓资县", - "阳城县", - "佛山市", - "呼兰区", - "红岗区", - "凤凰县", - "冕宁县", - "如皋市", - "淮南市", - "郾城区", - "太白县", - "甘南县", - "磐石市", - "东港区", - "沙湾县", - "云龙区", - "南市区", - "靖宇县", - "温江区", - "克东县", - "碌曲县", - "中站区", - "金昌市", - "零陵区", - "夏县", - "运城市", - "开化县", - "饶平县", - "五常市", - "灞桥区", - "萝北县", - "金安区", - "平邑县", - "云南省", - "山阳县", - "蓬溪县", - "海林市", - "灵川县", - "大观区", - "汉南区", - "昂昂溪区", - "安塞县", - "爱民区", - "松山区", - "武隆县", - "临渭区", - "清涧县", - "山阴县", - "崇仁县", - "溆浦县", - "平原县", - "大庆市", - "中卫市", - "伊吾县", - "东兴区", - "东兰县", - "偃师市", - "鼓楼区", - "安居区", - "西宁市", - "普安县", - "保康县", - "南丹县", - "怀远县", - "西峰区", - "互助土族自治县", - "七里河区", - "沂南县", - "建水县", - "颍东区", - "波密县", - "淄博市", - "临猗县", - "蕉岭县", - "呼和浩特市", - "辽阳市", - "辽宁省", - "沂水县", - "大埔县", - "淮北市", - "莱州市", - "石棉县", - "孟津县", - "乌苏市", - "晋城市", - "达拉特旗", - "甘谷县", - "威县", - "台儿庄区", - "政和县", - "古浪县", - "高邮市", - "榕江县", - "耒阳市", - "南岸区", - "阿克苏市", - "平阴县", - "芦山县", - "莫力达瓦达斡尔族自治旗", - "上饶县", - "临西县", - "海曙区", - "侯马市", - "高阳县", - "盐津县", - "靖边县", - "闵行区", - "饶阳县", - "新乐市", - "海兴县", - "番禺区", - "尤溪县", - "石河子市", - "鲁山县", - "开平市", - "大城县", - "平阳县", - "吴堡县", - "岳池县", - "鄯善县", - "乐都县", - "金川县", - "歙县", - "日土县", - "新田县", - "裕民县", - "河西区", - "新绛县", - "海南省", - "乌兰察布市", - "东城区", - "崇明县", - "库伦旗", - "浮山县", - "宁洱哈尼族彝族自治县", - "淇县", - "鹤山市", - "绥江县", - "绿园区", - "涪城区", - "科尔沁左翼中旗", - "宝丰县", - "郫县", - "奇台县", - "乌伊岭区", - "辰溪县", - "图木舒克市", - "新郑市", - "龙亭区", - "金州区", - "芦淞区", - "方山县", - "大兴安岭地区", - "尖山区", - "柞水县", - "常宁市", - "镇远县", - "普洱市", - "金川区", - "省直辖县级行政区划", - "金凤区", - "闽清县", - "进贤县", - "魏都区", - "麻江县", - "衢州市", - "城西区", - "沅陵县", - "崇左市", - "灵宝市", - "娄烦县", - "曲松县", - "桐乡市", - "磴口县", - "丹巴县", - "临漳县", - "花都区", - "金塔县", - "西安市", - "任丘市", - "延吉市", - "深州市", - "义马市", - "崇信县", - "堆龙德庆县", - "市北区", - "吉县", - "滦南县", - "雁山区", - "朝阳县", - "南郑县", - "高碑店市", - "永年县", - "临城县", - "惠农区", - "盐城市", - "梅里斯达斡尔族区", - "康定县", - "牧野区", - "庐江县", - "邢台市", - "准格尔旗", - "高青县", - "青铜峡市", - "黔西南布依族苗族自治州", - "阳东县", - "敦煌市", - "通河县", - "永昌县", - "汝城县", - "日喀则市", - "阳谷县", - "永州市", - "印台区", - "青河县", - "磐安县", - "迎泽区", - "爱辉区", - "颍上县", - "南岳区", - "曲江区", - "响水县", - "陈巴尔虎旗", - "江源区", - "垫江县", - "桂林市", - "荔城区", - "鲤城区", - "枞阳县", - "朝阳区", - "睢宁县", - "和静县", - "丰南区", - "鞍山市", - "上林县", - "肃州区", - "大安市", - "正蓝旗", - "曹县", - "吉利区", - "宽城满族自治县", - "澧县", - "武宁县", - "泉港区", - "栾城县", - "南川区", - "甘肃省", - "宁夏回族自治区", - "清原满族自治县", - "荣县", - "隰县", - "苏尼特右旗", - "榆社县", - "富宁县", - "浑源县", - "建平县", - "洛南县", - "达孜县", - "冀州市", - "北镇市", - "新洲区", - "额敏县", - "兰坪白族普米族自治县", - "延川县", - "驿城区", - "咸安区", - "晋宁县", - "华安县", - "献县", - "永平县", - "德钦县", - "定兴县", - "桦川县", - "潞城市", - "翔安区", - "温州市", - "北辰区", - "东丽区", - "资阳市", - "五寨县", - "源汇区", - "湘乡市", - "普定县", - "庆元县", - "五家渠市", - "兴仁县", - "太平区", - "呈贡区", - "灵寿县", - "寻甸回族彝族自治县", - "陈仓区", - "离石区", - "古交市", - "宿州市", - "津市市", - "临夏回族自治州", - "下城区", - "双峰县", - "沿河土家族自治县", - "穆棱市", - "天镇县", - "伊春市", - "顺德区", - "南郊区", - "武陵区", - "揭西县", - "龙口市", - "清城区", - "巴音郭楞蒙古自治州", - "巴东县", - "理塘县", - "古田县", - "美兰区", - "天门市", - "双辽市", - "敖汉旗", - "米东区", - "大英县", - "西峡县", - "汝南县", - "樊城区", - "盐山县", - "望花区", - "利津县", - "志丹县", - "成安县", - "湖南省", - "平陆县", - "开县", - "大邑县", - "彭州市", - "承德县", - "涟源市", - "佳县", - "建邺区", - "蚌埠市", - "沈北新区", - "新余市", - "恩平市", - "依安县", - "宜丰县", - "定南县", - "甘洛县", - "八公山区", - "阜康市", - "屏边苗族自治县", - "连州市", - "大渡口区", - "红桥区", - "雅安市", - "马山县", - "宜川县", - "吉安市", - "叶城县", - "尼玛县", - "新津县", - "云浮市", - "安溪县", - "唐县", - "德化县", - "赤水市", - "东湖区", - "新建县", - "楚雄市", - "运河区", - "伊宁市", - "华宁县", - "阿勒泰市", - "会昌县", - "红山区", - "滑县", - "类乌齐县", - "博尔塔拉蒙古自治州", - "隆德县", - "阎良区", - "北湖区", - "原州区", - "日喀则地区", - "邯郸市", - "南丰县", - "东丰县", - "宁强县", - "元氏县", - "武鸣县", - "仁寿县", - "同安区", - "陵川县", - "泾阳县", - "交城县", - "靖州苗族侗族自治县", - "白塔区", - "桑植县", - "化德县", - "青冈县", - "织金县", - "西畴县", - "白云鄂博矿区", - "吉林市", - "拉萨市", - "仙居县", - "碑林区", - "额尔古纳市", - "萨嘎县", - "秭归县", - "柏乡县", - "弓长岭区", - "临武县", - "翁牛特旗", - "路北区", - "建阳市", - "井研县", - "慈溪市", - "大理白族自治州", - "杨浦区", - "菏泽市", - "龙里县", - "固始县", - "屏南县", - "杜尔伯特蒙古族自治县", - "沧州市", - "阳春市", - "噶尔县", - "丘北县", - "牡丹江市", - "罗山县", - "郑州市", - "花溪区", - "梁平县", - "向阳区", - "商水县", - "玄武区", - "招远市", - "潮南区" + "瀵熷竷鏌ュ皵閿′集鑷不鍘�", + "瀵熷搱灏斿彸缈间腑鏃�", + "鏄屾睙榛庢棌鑷不鍘�", + "闀跨櫧鏈濋矞鏃忚嚜娌诲幙", + "楣ゅ北鍖�", + "瀹佹睙鍖�", + "纰ф睙鍖�", + "鑷不鍖虹洿杈栧幙绾ц鏀垮尯鍒�", + "闃块噷鍦板尯", + "鍘熼槼鍘�", + "妗撳彴鍘�", + "浼藉笀鍘�", + "闅嗛槼鍖�", + "鏈涙睙鍘�", + "鐑熷彴甯�", + "鎸叴鍖�", + "涓婃澀鍘�", + "瀹佸煄鍘�", + "鍗楁湪鏋楀幙", + "棰濇祹绾虫棗", + "鍩庝笢鍖�", + "娓呰繙甯�", + "娓花鍖�", + "浣欏簡鍘�", + "鎺嫟鍘�", + "璋㈠闆嗗尯", + "璧靛幙", + "鐭冲嘲鍖�", + "閬傛邯鍘�", + "鍏存捣鍘�", + "纭氬彛鍖�", + "娴堟睙鍖�", + "瑗勫煄鍖�", + "寮嬮槼鍘�", + "鏋楄姖鍘�", + "閫氬北鍘�", + "閾滈紦鍘�", + "鍚屽績鍘�", + "鍑ゅ煄甯�", + "鐗熷钩鍖�", + "鏄庢按鍘�", + "涓瑰緬鍖�", + "闆ㄦ箹鍖�", + "鏃屽痉鍘�", + "搴峰幙", + "寰蜂护鍝堝競", + "杩炲北澹棌鐟舵棌鑷不鍘�", + "閮佸崡鍘�", + "閮煄鍘�", + "铻嶆按鑻楁棌鑷不鍘�", + "閭撳窞甯�", + "浜曢檳鐭垮尯", + "鍗版睙鍦熷鏃忚嫍鏃忚嚜娌诲幙", + "鍝堝瘑甯�", + "閬撶湡浠′浆鏃忚嫍鏃忚嚜娌诲幙", + "濞佹捣甯�", + "妗備笢鍘�", + "榛庡钩鍘�", + "瀹夐槼鍘�", + "缁嶅叴鍘�", + "钂插煄鍘�", + "鍗楅�氬競", + "姝﹀北鍘�", + "鐞间腑榛庢棌鑻楁棌鑷不鍘�", + "榫欐硥椹垮尯", + "涓夐棬鍘�", + "鍗冮槼鍘�", + "瀹佸崡鍘�", + "鏂囧北澹棌鑻楁棌鑷不宸�", + "娲涙睙鍖�", + "瑗胯棌鑷不鍖�", + "骞夸赴鍘�", + "绾㈡槦鍖�", + "妗愬煄甯�", + "鑽峰鍖�", + "榫欐硥甯�", + "娼窞甯�", + "濂庡悲甯�", + "宕囧窛鍖�", + "婧ф按鍘�", + "鐢樺瓬钘忔棌鑷不宸�", + "骞虫埧鍖�", + "娓呴晣甯�", + "澶╂触甯�", + "娣笂鍖�", + "娴蜂鸡甯�", + "鐡︽埧搴楀競", + "瑗勫煄鍘�", + "閫氭腑鍘�", + "褰濊壇鍘�", + "骞挎眽甯�", + "瀹侀槼鍘�", + "姹熼櫟鍘�", + "闃垮厠濉炲搱钀ㄥ厠鏃忚嚜娌诲幙", + "鍥哄畨鍘�", + "閮у幙", + "鍙ゅ煄鍖�", + "涓村甯�", + "杈戒腑鍘�", + "寮�绂忓尯", + "涓畞鍘�", + "妗冨煄鍖�", + "甯傝緰鍖�", + "娴︿笢鏂板尯", + "鐩樺幙", + "涓夊北鍖�", + "鍏翠箟甯�", + "姹熷彛鍘�", + "娲涙墡鍘�", + "鍚翠腑鍖�", + "閬傛槍鍘�", + "闃垮浘浠�甯�", + "鏂板共鍘�", + "閯傚皵澶氭柉甯�", + "缃楀畾甯�", + "瀵岃暣鍘�", + "纾佸幙", + "寮�姹熷幙", + "杩庢睙鍖�", + "娉夊北鍖�", + "姘告槬鍘�", + "鏅牸鍘�", + "闀挎嘲鍘�", + "澶師甯�", + "鍏冭皨鍘�", + "婊℃床閲屽競", + "瀛濆崡鍖�", + "瀹氳繙鍘�", + "璐甸槼甯�", + "娲涢殕鍘�", + "鍏板北鍖�", + "姝︾┐甯�", + "鍏村浗鍘�", + "閮庢邯鍘�", + "姘镐粊鍘�", + "鍗楀煄鍘�", + "澶ч�氬尯", + "瑗跨鍖�", + "瓒婅タ鍘�", + "鑼傚悕甯�", + "鏂板叴鍖�", + "宀卞渤鍖�", + "灞变笢鐪�", + "淇¢槼甯�", + "澶ц崝鍘�", + "涔夊幙", + "鐏电挧鍘�", + "鑸熸洸鍘�", + "涓存竻甯�", + "瀹佹尝甯�", + "闀囨矃褰濇棌鍝堝凹鏃忔媺绁滄棌鑷不鍘�", + "閰掓硥甯�", + "娲涢槼甯�", + "鏇瑰鐢稿尯", + "楦犳睙鍖�", + "浜岄亾鍖�", + "姹熷煄鍖�", + "鍏冲箔甯冧緷鏃忚嫍鏃忚嚜娌诲幙", + "鎭煄鐟舵棌鑷不鍘�", + "闄垫按榛庢棌鑷不鍘�", + "鍏嬪瓬鍕掕嫃鏌皵鍏嬪瓬鑷不宸�", + "鎵庡泭鍘�", + "閬撻噷鍖�", + "鎵樺厠閫婂幙", + "姊呮睙鍖�", + "鍏版邯甯�", + "娉板北鍖�", + "鐟炰附甯�", + "閾佸北鍖�", + "娓椄鍖�", + "鎵剁互鍘�", + "鍏ㄦ鍘�", + "鍐犲幙", + "妗傚钩甯�", + "鐏电煶鍘�", + "瀵块槼鍘�", + "涔屾媺鐗瑰墠鏃�", + "铚�灞卞尯", + "妯北鍘�", + "閮撳煄鍘�", + "閫氳窘甯�", + "寮�椴佸幙", + "鐝叉槬甯�", + "娌虫睜甯�", + "钃濆北鍘�", + "鑾辫姕甯�", + "澶╂渤鍖�", + "姘寸(娌熷尯", + "涔岃揪鍖�", + "婀栨花鍖�", + "寮�灏佸幙", + "娴烽櫟鍖�", + "寰锋儬甯�", + "鐩婇槼甯�", + "鍔″窛浠′浆鏃忚嫍鏃忚嚜娌诲幙", + "纭北鍘�", + "涓规睙鍙e競", + "涓存江鍘�", + "鐜夋爲钘忔棌鑷不宸�", + "闆ㄥ煄鍖�", + "澶氫鸡鍘�", + "闀挎矙甯�", + "姘搁潠鍘�", + "搴烽┈鍘�", + "瀹曟槍鍘�", + "骞冲鍘�", + "娌虫簮甯�", + "鍩庝腑鍖�", + "娉楀幙", + "杈惧幙", + "浜彛鍖�", + "鑽旀尝鍘�", + "涓滆窘鍘�", + "闀囧畨鍘�", + "澶忔触鍘�", + "鏂伴潚鍖�", + "璐垫睜鍖�", + "浜旀寚灞卞競", + "闃垮潩钘忔棌缇屾棌鑷不宸�", + "鍚嶅北鍖�", + "涓版弧鍖�", + "鍑ゥ甯�", + "寤婂潑甯�", + "绱簯鑻楁棌甯冧緷鏃忚嚜娌诲幙", + "骞冲拰鍘�", + "瀛熷窞甯�", + "閲戜笢鍖�", + "榛勫北鍖�", + "绛栧嫆鍘�", + "鎴垮幙", + "閭典笢鍘�", + "涔屽叞娴╃壒甯�", + "鐞煎北鍖�", + "鍗楁矙缇ゅ矝", + "娓呭緪鍘�", + "铔熸渤甯�", + "鐢伴槼鍘�", + "涓夐棬宄″競", + "娓濅腑鍖�", + "鍏悎鍖�", + "鍗楁邯鍖�", + "鍐屼酣鍘�", + "闀块『鍘�", + "绉�宄板尯", + "缁电甯�", + "姘村瘜鍘�", + "寰藉幙", + "榛戞按鍘�", + "绂忓畨甯�", + "寰愬窞甯�", + "娲涙郸鍘�", + "瀹夊鍘�", + "宀峰幙", + "鍓嶈繘鍖�", + "閫婂厠鍘�", + "涓夋槑甯�", + "鏄撳幙", + "鑽嗗窞甯�", + "姹熼槾甯�", + "闆ㄨ姳鍖�", + "鍏村钩甯�", + "鏄鍘�", + "閾滃北鍖�", + "娓崡鍖�", + "璐¤鍘�", + "闅嗘槍鍘�", + "搴斿煄甯�", + "瀹瑰煄鍘�", + "宓╂槑鍘�", + "绂逛細鍖�", + "婢抽棬鐗瑰埆琛屾斂鍖�", + "濂庢枃鍖�", + "钂插幙", + "鏅嬩腑甯�", + "琛℃按甯�", + "楂樺攼鍘�", + "澹跺叧鍘�", + "閮芥槍鍘�", + "鏂板叴鍘�", + "绮炬渤鍘�", + "澶╁敞鍘�", + "姝︽槍鍖�", + "鑷祦浜曞尯", + "搴撹溅鍘�", + "浣欐澀鍖�", + "鐝欏幙", + "闇嶆灄閮嫆甯�", + "閭甸槼鍘�", + "淇枃鍘�", + "钘ゅ幙", + "閭楁睙鍖�", + "鏈涜盁鍘�", + "鑲ヨタ鍘�", + "楂橀倯鍘�", + "鍖楃鍖�", + "姝﹂倯鍘�", + "鑻忓灞尯", + "瑗垮拰鍘�", + "姘告嘲鍘�", + "杩炲北鍖�", + "璧勬簮鍘�", + "濞佷俊鍘�", + "鏉ュ嚖鍘�", + "闆嗗畨甯�", + "鍩庡浐鍘�", + "鏇查槣甯�", + "閮цタ鍘�", + "浜北鍘�", + "鐢樺崡钘忔棌鑷不宸�", + "榫欐枃鍖�", + "鎶氳繙鍘�", + "杈惧皵缃曡寕鏄庡畨鑱斿悎鏃�", + "缇庢邯鍖�", + "閲戞按鍖�", + "閾侀攱鍖�", + "椹叧鍘�", + "澶у悓甯�", + "榛勫唸甯�", + "鏄嗘槑甯�", + "椤瑰煄甯�", + "鏈斿窞甯�", + "闃虫睙甯�", + "鐧介摱甯�", + "鏇查潠甯�", + "楹荤珷鍖�", + "鎴峰幙", + "鐏垫甯�", + "涓滈櫟鍖�", + "濉斿煄甯�", + "瀹胯鲍鍖�", + "绉板鍘�", + "鍠�鍠囨瞾鏃�", + "鐩愭箹鍖�", + "鍏村煄甯�", + "鏄岄兘鍘�", + "灞变腹鍘�", + "灏勬椽鍘�", + "闈栨睙甯�", + "鍑屼簯鍘�", + "鍚夐甯�", + "鎯犳按鍘�", + "鍛间鸡璐濆皵甯�", + "娌呮睙甯�", + "鍩庡叧鍖�", + "鏅胺鍌f棌褰濇棌鑷不鍘�", + "鍘﹂棬甯�", + "鍟嗗煄鍘�", + "骞夸笢鐪�", + "姒嗘爲甯�", + "鍧″ご鍖�", + "璐靛崡鍘�", + "闀垮叴鍘�", + "榫欏窛鍘�", + "鏉ュ甯�", + "瀛愰暱鍘�", + "涔屾伆鍘�", + "璧涚綍鍖�", + "鏈ㄩ噷钘忔棌鑷不鍘�", + "瑗勯槼甯�", + "鐏屽崡鍘�", + "宸撮┈鐟舵棌鑷不鍘�", + "鍙櫟鍖�", + "涓冩槦鍖�", + "楦″啝鍖�", + "鍛ㄥ畞鍘�", + "鐜夋硥鍖�", + "涔愬北甯�", + "瀹滅鍖�", + "閮忓幙", + "婊ㄦ箹鍖�", + "榫欏窞鍘�", + "榛勯檪鍖�", + "瀹e煄甯�", + "閾佷笢鍖�", + "浣欏共鍘�", + "鏂版槍鍘�", + "鏈ㄥ瀿鍝堣惃鍏嬭嚜娌诲幙", + "鐜涙瞾鍘�", + "闆ㄥ北鍖�", + "閲戞箹鍘�", + "锠″幙", + "闅忓幙", + "涓村幙", + "娴峰窞鍖�", + "鏉炬鑻楁棌鑷不鍘�", + "姊ㄦ爲鍘�", + "涓囧窞鍖�", + "闇炲北鍖�", + "娌冲彛鐟舵棌鑷不鍘�", + "閾滄鍘�", + "鐩傚幙", + "鍐锋按婊╁尯", + "缇庡鍘�", + "闅忓窞甯�", + "闄囧崡甯�", + "瀵熼泤鍘�", + "楂樻腐鍖�", + "闂ㄦ簮鍥炴棌鑷不鍘�", + "鐡滃窞鍘�", + "涓囨煆鏋楀尯", + "瀹氬畨鍘�", + "鐤忛檮鍘�", + "甯傚崡鍖�", + "灏嗕箰鍘�", + "閲戞咕鍖�", + "鏄嫃鍘�", + "瀹夊畞鍖�", + "灞卞崡鍦板尯", + "涔愪涵鍘�", + "姹熷共鍖�", + "榫欓櫟鍘�", + "骞冲畨鍘�", + "鏅畞甯�", + "姹熷畞鍖�", + "瀹滆壇鍘�", + "鎬�瀹夊幙", + "姘稿畞鍘�", + "鍢夐櫟鍖�", + "渚濆叞鍘�", + "璧e窞甯�", + "鍖椾含甯�", + "瀹滈粍鍘�", + "涓滃北鍘�", + "涓板幙", + "鍗楀崕鍘�", + "鍏富宀競", + "閫氬寲甯�", + "姊ㄦ爲鍖�", + "绉煶灞变繚瀹夋棌涓滀埂鏃忔拻鎷夋棌鑷不鍘�", + "鍖楁祦甯�", + "涔濆師鍖�", + "绔规邯鍘�", + "鐩愯竟鍘�", + "閲戝爞鍘�", + "榛斿崡甯冧緷鏃忚嫍鏃忚嚜娌诲窞", + "椹熬鍖�", + "涓滆帪甯�", + "鍏冩睙鍝堝凹鏃忓綕鏃忓偅鏃忚嚜娌诲幙", + "婊佸窞甯�", + "椴呴奔鍦堝尯", + "閭涘磧甯�", + "浜戝畨鍘�", + "璋冨叺灞卞競", + "绁佷笢鍘�", + "寮犲寳鍘�", + "淇′赴鍘�", + "瀹f眽鍘�", + "琛㈡睙鍖�", + "鏂伴兘鍖�", + "鐭抽緳鍖�", + "钀ュ北鍘�", + "鐩戝埄鍘�", + "鍗氭箹鍘�", + "婵犳睙鍖�", + "澶╃瓑鍘�", + "閬典箟鍘�", + "娴﹀彛鍖�", + "楦′笢鍘�", + "鐮�灞卞幙", + "涓旀湯鍘�", + "鎯犻槼鍖�", + "褰撻槼甯�", + "涔屽綋鍖�", + "寰烽槼甯�", + "鐩橀緳鍖�", + "鑾遍槼甯�", + "瀹鹃槼鍘�", + "闃垮煄鍖�", + "灏氫箟鍘�", + "鍜屾灄鏍煎皵鍘�", + "缃楃敯鍘�", + "搴蜂箰鍘�", + "涓村畨甯�", + "闄曞幙", + "骞块ザ鍘�", + "娉板叴甯�", + "鍗楃エ鍖�", + "杩炰簯娓競", + "寮犲簵鍖�", + "涓滃北鍖�", + "椹婚┈搴楀競", + "閮婂尯", + "鏄屼箰鍘�", + "涓滆タ婀栧尯", + "鑺濈綐鍖�", + "鏍床甯�", + "瀹侀檿鍘�", + "宀戝珐鍘�", + "鍙崇帀鍘�", + "鍥哄師甯�", + "姹熻タ鐪�", + "鑼傚崡鍖�", + "鏉敠鍚庢棗", + "璐哄窞甯�", + "寰峰叴甯�", + "姹熷哺鍖�", + "鐭崇嫯甯�", + "鏈涘煄鍖�", + "鏌冲煄鍘�", + "绂圭帇鍙板尯", + "鏄岄倯甯�", + "钀嶄埂甯�", + "绁侀槼鍘�", + "涓滈槼甯�", + "鍚堥槼鍘�", + "鏅嬪煄甯傚競杈栧尯", + "閬傚畞甯�", + "鍏畨甯�", + "寰锋竻鍘�", + "鍘嗗煄鍖�", + "骞垮痉鍘�", + "寮�鍘熷競", + "涓婇ザ甯�", + "娉板拰鍘�", + "娴峰煄甯�", + "鍢夐奔鍘�", + "娌冲寳鐪�", + "鍩庡彛鍘�", + "闃垮嫆娉板湴鍖�", + "鏉炬邯鍘�", + "鍚堜綔甯�", + "澶хゥ鍖�", + "鏉鹃槼鍘�", + "涓滃畨鍖�", + "澶╁彴鍘�", + "楂橀櫟鍘�", + "榛勫钩鍘�", + "涔愭竻甯�", + "鎵垮痉甯�", + "浜戞ⅵ鍘�", + "浜斿崕鍘�", + "娉惧幙", + "鏀稿幙", + "娉版潵鍘�", + "杈夊崡鍘�", + "涔愬钩甯�", + "浼婄妬鍝堣惃鍏嬭嚜娌诲窞", + "鎬�瀹佸幙", + "瀹e窞鍖�", + "瀹氳竟鍘�", + "鏍栭湠鍖�", + "涔愬畨鍘�", + "鍗氫箰甯�", + "娓戞睜鍘�", + "楂樻烦鍘�", + "鍗冲ⅷ甯�", + "鏂颁埂鍘�", + "钀濆矖鍖�", + "浜戦槼鍘�", + "宀氬幙", + "绐佹硥鍘�", + "閮藉叞鍘�", + "璐炰赴鍘�", + "娌欎緷宸村厠鍖�", + "鏉窞甯�", + "浜旇惀鍖�", + "鍗楄隘鍖�", + "澶╂按甯�", + "甯哥啛甯�", + "杈介槼鍘�", + "鏂囩櫥甯�", + "宕傚北鍖�", + "浼氫笢鍘�", + "娉曞簱鍘�", + "娣花鍘�", + "褰按鑻楁棌鍦熷鏃忚嚜娌诲幙", + "涓婇珮鍘�", + "楣ゅ簡鍘�", + "鐧藉煄甯�", + "姹夊窛甯�", + "闅嗗洖鍘�", + "閿﹀睆鍘�", + "澶у喍甯�", + "浜斿崕鍖�", + "鍗椾含甯�", + "婕炬繛褰濇棌鑷不鍘�", + "澶ц繛甯�", + "宄ㄧ湁灞卞競", + "瑗勫灒鍘�", + "绉�鑻卞尯", + "绫虫槗鍘�", + "姹熷畨鍘�", + "鐗熷畾鍘�", + "鐠у北鍘�", + "宸╀箟甯�", + "宸ュ啘鍖�", + "涓滃畞鍘�", + "缃楃敻鍘�", + "娲泤鍘�", + "鍟嗘礇甯�", + "姹夋簮鍘�", + "閽熸ゼ鍖�", + "闀垮瓙鍘�", + "闀囧畞甯冧緷鏃忚嫍鏃忚嚜娌诲幙", + "涓夋矙甯�", + "楂樺幙", + "鎭兘鍘�", + "闈掔鍖�", + "涓滄槍搴滃尯", + "妗︾敻甯�", + "鑽ョ粡鍘�", + "鐧芥渤鍘�", + "鐢樺瓬鍘�", + "閲戝钩鑻楁棌鐟舵棌鍌f棌鑷不鍘�", + "閭卞幙", + "澧ㄨ劚鍘�", + "澶ф鍙e尯", + "閲戝鍘�", + "绂忛紟甯�", + "骞挎按甯�", + "閭垫甯�", + "鍨f洸鍘�", + "鍩囨ˉ鍖�", + "娓╁箔甯�", + "琚佸窞鍖�", + "瀵屽钩鍘�", + "鐡畨鍘�", + "娌芥簮鍘�", + "楂樿甯�", + "涓囧畨鍘�", + "蹇诲煄鍘�", + "宸邯鍘�", + "鐧界帀鍘�", + "娉稿幙", + "姊佹渤鍘�", + "蹇犲幙", + "寤跺鍘�", + "涔屽皵绂惧尯", + "鍙板窞甯�", + "涓夊厓鍖�", + "鍚曟甯�", + "鐩堟睙鍘�", + "瓒婄鍖�", + "娴烽棬甯�", + "涔屾媺鐗逛腑鏃�", + "闃插煄娓競", + "缃楁箹鍖�", + "鐗瑰厠鏂幙", + "璧e幙", + "绀兼硥鍘�", + "绔犺础鍖�", + "鑾樺幙", + "瀵垮厜甯�", + "涓村窛鍖�", + "搴勬渤甯�", + "姊呭窞甯�", + "鍚屽痉鍘�", + "闀夸赴鍘�", + "鍖楁埓娌冲尯", + "闄嗘渤鍘�", + "涓滃钩鍘�", + "姘告竻鍘�", + "姹鹃槼甯�", + "鐟為噾甯�", + "钀ㄨ喀鍘�", + "鑺欒搲鍖�", + "榛勫煍鍖�", + "鐣欏潩鍘�", + "婵槼甯�", + "鐩栧窞甯�", + "璧勬邯鍘�", + "娲涘窛鍘�", + "姘戜赴鍘�", + "妯幙", + "姒嗕腑鍘�", + "娉歌タ鍘�", + "涓夋渤甯�", + "骞抽仴鍘�", + "姝﹀钩鍘�", + "绋诲煄鍘�", + "涓存郊鍖�", + "鐝帥鍘�", + "娌佹簮鍘�", + "婊﹀幙", + "鍙や笀鍘�", + "瀹夊窘鐪�", + "缃楁睙鍘�", + "姹ㄧ綏甯�", + "杩炲钩鍘�", + "闅嗗哀鍘�", + "瀹e▉甯�", + "闀滄箹鍖�", + "楂樺钩甯�", + "闆佸鍖�", + "鏉ㄩ櫟鍖�", + "鍙版睙鍖�", + "鍗楀北鍖�", + "宄ㄥ北褰濇棌鑷不鍘�", + "鑰佸煄鍖�", + "娴峰寳钘忔棌鑷不宸�", + "鎴氬鍫板尯", + "涓北甯�", + "濂夊寲甯�", + "闇嶅北鍘�", + "闀挎竻鍖�", + "骞虫槍鍘�", + "澶╂煴鍘�", + "闈掑窛鍘�", + "绉﹀畨鍘�", + "鑰佽竟鍖�", + "鍏村幙", + "灏兼湪鍘�", + "闃跨摝鎻愬幙", + "閲戝北灞尯", + "涓滃尯", + "娌佹按鍘�", + "浜氫笢鍘�", + "濉旀渤鍘�", + "娴峰畨鍘�", + "娲涘畞鍘�", + "鍏卞拰鍘�", + "涓涘彴鍖�", + "娣冲寲鍘�", + "涔屾捣甯�", + "娉炬簮鍘�", + "鍗楁境鍘�", + "闄囪タ鍘�", + "涔濇睙甯�", + "涔冧笢鍘�", + "闈掑矝甯�", + "楹婚槼鑻楁棌鑷不鍘�", + "闀块槼鍦熷鏃忚嚜娌诲幙", + "杈瑰潩鍘�", + "鍗氱埍鍘�", + "妲愯崼鍖�", + "瀹夊钩鍘�", + "涔惧畨鍘�", + "骞垮畨甯�", + "绉﹂兘鍖�", + "娴戞睙鍖�", + "浼婂畞鍘�", + "闇嶅煄鍘�", + "鍏拌�冨幙", + "鐪夊北甯�", + "澶ч�氬洖鏃忓湡鏃忚嚜娌诲幙", + "鍙版睙鍘�", + "鎵庨瞾鐗规棗", + "鎯犳皯鍘�", + "鐞呯悐鍖�", + "钄$敻鍖�", + "鎯犲北鍖�", + "鏂板拰鍘�", + "闄靛幙", + "閯傛墭鍏嬪墠鏃�", + "榛勫矝鍖�", + "鎶氶『甯�", + "浼氬畞鍘�", + "钃畨鍘�", + "宸ュ竷姹熻揪鍘�", + "涓北鍖�", + "娴旈槼鍖�", + "寤哄畞鍘�", + "瀹界敻婊℃棌鑷不鍘�", + "鏂版矀甯�", + "娓崡甯�", + "瀹佹鍘�", + "鐭冲搴勫競", + "鎵堕鍘�", + "鍚愰瞾鐣競", + "璧ゅ甯�", + "鏈ぎ鍖�", + "鐜涘鍘�", + "鑺︽邯鍘�", + "娓呮按鍘�", + "钂欒嚜甯�", + "姹犲窞甯�", + "浠佸拰鍖�", + "瀹佹触鍘�", + "姘镐慨鍘�", + "寮犲鐣屽競", + "闃滈槼甯�", + "鐜夌敯鍘�", + "楂樺彴鍘�", + "鑾掑幙", + "鑺卞灒鍘�", + "姝e畾鍘�", + "娼煎崡鍘�", + "鐭虫灄褰濇棌鑷不鍘�", + "闀挎不鍘�", + "澶ф柟鍘�", + "鑾查兘鍖�", + "娲炲ご鍘�", + "瀹佸寲鍘�", + "鏂伴噹鍘�", + "閲戝钩鍖�", + "涓滃叴甯�", + "鏄钩鍘�", + "涓滄渤鍖�", + "閽熷北鍖�", + "绉戝皵娌佸尯", + "鏂板崕鍖�", + "姹熷瓬鍘�", + "涔屽叞鍘�", + "鍒╅�氬尯", + "姹曞熬甯�", + "娌虫洸鍘�", + "娉惧窛鍘�", + "鏀�鏋濊姳甯�", + "鏇查槼鍘�", + "鑼堕櫟鍘�", + "鏂版簮鍘�", + "鏂拌崳鍖�", + "宀抽槼甯�", + "鍏撮殕鍙板尯", + "鐜涙洸鍘�", + "姝i槼鍘�", + "娉夊窞甯�", + "榫欏嚖鍖�", + "鍏村鍖�", + "鑺楀煄鍖�", + "绾㈡渤鍝堝凹鏃忓綕鏃忚嚜娌诲窞", + "瀹滈兘甯�", + "娑炴按鍘�", + "鑾叉箹鍖�", + "楂樻槑鍖�", + "鎴愬幙", + "鑺滄箹甯�", + "涓滃彴甯�", + "榛勯櫟鍘�", + "璧ゅ潕鍖�", + "楣挎硥甯�", + "鐩愭簮鍘�", + "闊跺北甯�", + "闆佹睙鍖�", + "鍝堝瘑鍦板尯", + "鐟炴槍甯�", + "楂樺潽鍖�", + "鏋楀彛鍘�", + "搴嗕簯鍘�", + "鍛ㄨ嚦鍘�", + "鍏ㄥ崡鍘�", + "宕囬槼鍘�", + "绂忚础鍘�", + "鐜嬬泭鍖�", + "宀氬北鍖�", + "娴犳按鍘�", + "鏂版檭渚楁棌鑷不鍘�", + "鐭冲煄鍘�", + "涓存晶鍘�", + "鎴愭鍘�", + "鐢樻硥鍘�", + "杩炴睙鍘�", + "鍥涘瓙鐜嬫棗", + "娴庡畞甯�", + "杩佸畨甯�", + "鐧戒笅鍖�", + "澶规睙鍘�", + "瑗垮矖鍖�", + "瀹侀櫟鍘�", + "娓犲幙", + "婀勬江鍘�", + "闊跺叧甯�", + "鏂版姎鍖�", + "婧愬煄鍖�", + "闀垮畞鍖�", + "钘佸煄甯�", + "姘稿槈鍘�", + "娴峰媰婀惧尯", + "閿℃灄閮嫆鐩�", + "寤哄鍘�", + "钂欓槾鍘�", + "榫欐父鍘�", + "闈掑幙", + "宀笢鍖�", + "楹熸父鍘�", + "浠撳北鍖�", + "涓婅敗鍘�", + "瀹佸幙", + "褰幙", + "婧ч槼甯�", + "寮�闃冲幙", + "鎭╂柦甯�", + "绾㈣姳宀楀尯", + "澧炲煄甯�", + "浼婃槬鍖�", + "缃楀煄浠浆鏃忚嚜娌诲幙", + "娴疯タ钂欏彜鏃忚棌鏃忚嚜娌诲窞", + "钃睙鍖�", + "绻佸硻鍘�", + "閾滈櫟鍘�", + "娉楁椽鍘�", + "鏄嗗北甯�", + "婕犳渤鍘�", + "宀冲鍖�", + "鍜搁槼甯�", + "宀愬北鍘�", + "鎵庡叞灞競", + "钁姦宀涘競", + "瑗挎箹鍖�", + "瀹佽繙鍘�", + "瀹変箟鍘�", + "姹熼槼鍖�", + "鐤忓嫆鍘�", + "閮芥睙鍫板競", + "榫欏北鍖�", + "涔″畞鍘�", + "娓呮按娌冲幙", + "鍙嬭皧鍘�", + "鏅檧鍖�", + "榫欐腐鍖�", + "涓存箔鍘�", + "鏉庢钵鍖�", + "淇″窞鍖�", + "妗愭鍘�", + "鑺煄鍘�", + "鏂囧湥鍖�", + "鏂囨按鍘�", + "鑵惧啿鍘�", + "鍕愭捣鍘�", + "瀹夊渤鍘�", + "璐垫腐甯�", + "鏄屽悏鍥炴棌鑷不宸�", + "缂欎簯鍘�", + "閲戞邯鍘�", + "闀挎床鍖�", + "涔岄瞾鏈ㄩ綈甯�", + "鐜夊北鍘�", + "鍓戞渤鍘�", + "灞槍鍘�", + "寰峰窞甯�", + "閭㈠彴鍘�", + "寤烘箹鍘�", + "涓滄槑鍘�", + "鏅幙", + "鏉滈泦鍖�", + "浠诲幙", + "榛勫博鍖�", + "涓滄柟甯�", + "绾㈡棗鍖�", + "澶╁叏鍘�", + "濂堟浖鏃�", + "寮犳帠甯�", + "鏅嬫睙甯�", + "鏄撻棬鍘�", + "姹熼棬甯�", + "閾滃畼灞卞尯", + "鍥涘窛鐪�", + "鍏夊北鍘�", + "寤跺钩鍖�", + "涓滈鍖�", + "鍑ゅ幙", + "鍖栧窞甯�", + "璐哄叞鍘�", + "鍗庡潽鍘�", + "瀹氳タ甯�", + "宸︽潈鍘�", + "鑾卞煄鍖�", + "浜庣敯鍘�", + "鍖楀叧鍖�", + "闈掔鍘�", + "瑗勫窞鍖�", + "寰北鍘�", + "姘稿窛鍖�", + "榫欏北鍘�", + "灏忛噾鍘�", + "鍒╁窞鍖�", + "鏋楀窞甯�", + "鐙北瀛愬尯", + "娓呮祦鍘�", + "瀹夊幙", + "鑰佹渤鍙e競", + "绂忕敯鍖�", + "涓存穭鍖�", + "浜曞唸灞卞競", + "鏂囧畨鍘�", + "鐐夐湇鍘�", + "婀樻江鍘�", + "浼嶅宀楀尯", + "闃虫湐鍘�", + "宸╃暀鍘�", + "娲箹甯�", + "鏉惧寳鍖�", + "瀹涘煄鍖�", + "娲睙甯�", + "鍗楀甯�", + "浠檱鍘�", + "闄曡タ鐪�", + "闃滃钩鍘�", + "瑗垮鍖�", + "闃滄柊甯�", + "鐐庨櫟鍘�", + "瀹夊畾鍖�", + "鍚夋按鍘�", + "瑗块潚鍖�", + "鐗欏厠鐭冲競", + "棰嶅窞鍖�", + "瀹滄槍甯�", + "搴嗛槼甯�", + "鍜稿畞甯�", + "澶х悊甯�", + "绂呭煄鍖�", + "甯冨皵娲ュ幙", + "鏈揪鍘�", + "鍑屾簮甯�", + "姣斿鍘�", + "娉婂ご甯�", + "鏀瑰垯鍘�", + "闈掓郸鍖�", + "澶粏瀵烘棗", + "婀熸簮鍘�", + "瀹佹檵鍘�", + "闄囧幙", + "鍗緣甯�", + "鏌冲寳鍖�", + "姹熶笢鍖�", + "鐏甯�", + "姝e畞鍘�", + "瀹濆北鍖�", + "鍚堟按鍘�", + "姹熷鍖�", + "蹇诲簻鍖�", + "娲北鍖�", + "浜庨兘鍘�", + "椹緳鍘�", + "浠庢睙鍘�", + "姘戜箰鍘�", + "鍚夊畨鍘�", + "涓滄槍鍖�", + "瀹濇竻鍘�", + "娌傛簮鍘�", + "闀堕粍鏃�", + "甯冩嫋鍘�", + "娣呭窛鍘�", + "骞垮畨鍖�", + "榛戞渤甯�", + "闆ㄨ姳鍙板尯", + "閯傛俯鍏嬫棌鑷不鏃�", + "娓濇按鍖�", + "姹熸床鍖�", + "鎵橀噷鍘�", + "娓寳鍖�", + "澧ㄧ宸ュ崱鍘�", + "婢勬睙鍘�", + "瀹夐槼甯�", + "鍚夐殕鍘�", + "闃嗕腑甯�", + "涓伴『鍘�", + "涓存睙甯�", + "鍗楀叧鍖�", + "鎯犲窞甯�", + "鍚堝窛鍖�", + "鏋濇睙甯�", + "宄ㄨ竟褰濇棌鑷不鍘�", + "鏍床鍘�", + "闀挎槬甯�", + "妗ヤ笢鍖�", + "姊佸洯鍖�", + "绂瑰煄甯�", + "姝i暥鐧芥棗", + "鍥涙柟鍖�", + "淇濆畾甯�", + "娴锋钵鍖�", + "鐩愮敯鍖�", + "鍙屽彴瀛愬尯", + "姘稿悍甯�", + "榛勯獏甯�", + "椤哄煄鍖�", + "灏栬崏鍧尯", + "閲戝潧甯�", + "寮嬫睙鍖�", + "瀹滃窞甯�", + "鍚堝北甯�", + "寤跺簡鍘�", + "鑳跺窞甯�", + "闀胯憶甯�", + "澶村悲娌冲尯", + "姝﹂兘鍖�", + "姘戝拰鍥炴棌鍦熸棌鑷不鍘�", + "涓囪浇鍘�", + "浠欐父鍘�", + "鑾辫タ甯�", + "瑗垮钩鍘�", + "濂夎搐鍖�", + "璧勯槼鍖�", + "鍨﹀埄鍘�", + "涓存渤鍖�", + "鍏撮殕鍘�", + "姝e畨鍘�", + "鐩辩湙鍘�", + "鍗氱綏鍘�", + "鍙屾ˉ鍖�", + "浜旀渤鍘�", + "瑁曞崕鍖�", + "鎷滄硥鍘�", + "鍙板墠鍘�", + "骞垮畞鍘�", + "鑾嗙敯甯�", + "闃挎媺鍠勭洘", + "缁嶅叴甯�", + "娑¢槼鍘�", + "瀹夊簡甯�", + "鐜夋邯甯�", + "闀囧師鍘�", + "婢勬捣鍖�", + "妗冩睙鍘�", + "宸ㄩ噹鍘�", + "鑹簡鍖�", + "骞冲畾鍘�", + "宀楀反鍘�", + "闀囧潽鍘�", + "鍙岄槼鍖�", + "鐩愭睜鍘�", + "榻愰綈鍝堝皵甯�", + "閬撳瓪鍘�", + "瀹佽挆褰濇棌鑷不鍘�", + "宀氱殝鍘�", + "瀛濅箟甯�", + "姊呭垪鍖�", + "甯稿北鍘�", + "鏂版渤鍘�", + "鑲冨寳钂欏彜鏃忚嚜娌诲幙", + "婧箹鍖�", + "姣曡妭甯�", + "閲戦棬鍘�", + "涓墴鍘�", + "闀垮畞鍘�", + "娴﹀煄鍘�", + "椹潙鍖�", + "缈犲肠鍖�", + "绉︾殗宀涘競", + "涓囧叏鍘�", + "鏋楃敻鍘�", + "绉﹀窞鍖�", + "涓滆惀鍖�", + "娌侀槼甯�", + "鐨囧鍖�", + "闃虫槑鍖�", + "妗﹀崡鍘�", + "钂叉睙鍘�", + "宀㈠矚鍘�", + "鑼勫瓙娌冲尯", + "姘稿畾鍖�", + "娲嬪幙", + "闀囧反鍘�", + "閾佽タ鍖�", + "鎺編鍘�", + "绁炴睜鍘�", + "涔犳按鍘�", + "鍏鍘�", + "宸村窞鍖�", + "褰撴秱鍘�", + "娉楅槼鍘�", + "钖涘煄鍖�", + "姊呮渤鍙e競", + "澶悍鍘�", + "涔濆彴甯�", + "浜戝博鍖�", + "鏉敠鏃�", + "浼婇噾闇嶆礇鏃�", + "浜斿師鍘�", + "灏栨墡鍘�", + "鏈濋槼甯�", + "璐″北鐙緳鏃忔�掓棌鑷不鍘�", + "鐪夊幙", + "姝﹀姛鍘�", + "鐜繝鍖�", + "娓╁幙", + "鍏存枃鍘�", + "闀垮畨鍖�", + "瀹惧窛鍘�", + "涓滀箤鐝犵﹩娌佹棗", + "鍕夊幙", + "娼嶅煄鍖�", + "娲涢緳鍖�", + "钀у北鍖�", + "鏂颁赴鍘�", + "鏈堟箹鍖�", + "鏂拌敗鍘�", + "濉斾粈搴撳皵骞插鍚夊厠鑷不鍘�", + "閽熷北鍘�", + "閲戝煄姹熷尯", + "娴锋穩鍖�", + "娲炲彛鍘�", + "杩滃畨鍘�", + "瀵熷搱灏斿彸缈煎悗鏃�", + "姘稿畾鍘�", + "娑熸按鍘�", + "楦℃辰鍘�", + "涓存箻甯�", + "涓柟鍘�", + "灏佷笜鍘�", + "鍥涗細甯�", + "宸村崡鍖�", + "鍗庝涵鍘�", + "鏅撮殕鍘�", + "涓滆嚦鍘�", + "姹跺窛鍘�", + "瑗垮畨鍖�", + "瀹濆叴鍘�", + "鎺囧垁鍖�", + "娌虫触甯�", + "鍥炴皯鍖�", + "绱槼鍘�", + "瑗垮厖鍘�", + "婀樹笢鍖�", + "缁╂邯鍘�", + "鐭垮尯", + "浜岄亾姹熷尯", + "娉藉窞鍘�", + "闇嶅窞甯�", + "鑲囧簡甯�", + "鍎嬪窞甯�", + "鐜夐棬甯�", + "涓婅鍖�", + "鏂伴偟鍘�", + "瀹夎繙鍘�", + "缁ヨ姮娌冲競", + "鍧婂瓙鍖�", + "闈╁悏鍘�", + "鎴愬崕鍖�", + "鑺卞北鍖�", + "榧庡煄鍖�", + "琛¢槼甯�", + "鍏冨疂灞卞尯", + "鍑ゅ唸鍘�", + "楹诲煄甯�", + "鍜屽幙", + "瑗夸埂濉樺尯", + "闀夸箰甯�", + "绁ヤ簯鍘�", + "姒嗛槼鍖�", + "瀛欏惔鍘�", + "铏庝笜鍖�", + "鏂板煄鍖�", + "鏂规鍘�", + "婀橀槾鍘�", + "绁佸幙", + "鍏夋辰鍘�", + "涓撮倯鍘�", + "鑲囨簮鍘�", + "鐗′腹鍖�", + "闃抽珮鍘�", + "鐜涚撼鏂幙", + "灞辫タ鐪�", + "鐧诲皝甯�", + "鍗㈤緳鍘�", + "娣囨花鍖�", + "鐣ラ槼鍘�", + "鑻嶅崡鍘�", + "骞垮畻鍘�", + "姝﹀▉甯�", + "鐙北鍘�", + "閭瑰钩鍘�", + "鏂扮綏鍖�", + "鍚夋湪钀ㄥ皵鍘�", + "娣卞湷甯�", + "鏄�氬競", + "浠e幙", + "涓存湊鍘�", + "宕囧畨鍖�", + "澶瓙娌冲尯", + "涓撮珮鍘�", + "鍥洪晣鍘�", + "娉伴『鍘�", + "瀵岃鍘�", + "閮稿煄鍘�", + "闃宠タ鍘�", + "寮犲宸濆洖鏃忚嚜娌诲幙", + "鎵窞甯�", + "瀹氶櫠鍘�", + "涓板彴鍖�", + "闄嗗窛鍘�", + "鏂伴緳鍘�", + "浜戝煄鍖�", + "瀹濆澔鍖�", + "榛勫窞鍖�", + "瀹氱粨鍘�", + "骞冲害甯�", + "宕囦箟鍘�", + "婢勮繄鍘�", + "搴峰钩鍘�", + "鍝堝皵婊ㄥ競", + "涓版辰鍖�", + "宸村鍘�", + "骞虫江鍘�", + "璧炵殗鍘�", + "瀹夐檰甯�", + "闃挎媺灏斿競", + "瀹夊悏鍘�", + "鍓戝窛鍘�", + "鏂板瘑甯�", + "娌欐渤鍙e尯", + "浣涘唸鍘�", + "绉�灞垮尯", + "澶т赴甯�", + "闈掔敯鍘�", + "寤哄痉甯�", + "娲寳鍖�", + "婵槼鍘�", + "宸﹁础鍘�", + "涓婃捣甯�", + "鍏村畞甯�", + "褰撻泟鍘�", + "鏉炲幙", + "澶箹鍘�", + "鎭╂柦鍦熷鏃忚嫍鏃忚嚜娌诲窞", + "绀煎幙", + "瀹夋辰鍘�", + "涔岄┈娌冲尯", + "鎬�浠佸幙", + "涓滃潯鍖�", + "闈欐捣鍘�", + "鍑ら槼鍘�", + "涔濋緳鍧″尯", + "澶╅暱甯�", + "寤惰竟鏈濋矞鏃忚嚜娌诲窞", + "搴斿幙", + "杈夊幙甯�", + "鏍惧窛鍘�", + "澧ㄧ帀鍘�", + "骞抽《灞卞競", + "娴峰畞甯�", + "琛″崡鍘�", + "鐜幙", + "娑﹀窞鍖�", + "鍖呭ご甯�", + "鎯犲煄鍖�", + "宸翠腑甯�", + "婢勫煄鍘�", + "鏂伴偙鍖�", + "闀挎不甯�", + "婕冲幙", + "瀛濇槍鍘�", + "灏ч兘鍖�", + "鑲冨崡瑁曞浐鏃忚嚜娌诲幙", + "灞变涵鍖�", + "瀹滃叴甯�", + "鍛ㄥ彛甯�", + "楣垮煄鍖�", + "妤氶泟褰濇棌鑷不宸�", + "瀹滈槼鍘�", + "鐧芥湕鍘�", + "鍜岀敯鍦板尯", + "鎬�鏌斿尯", + "涓逛笢甯�", + "鐭虫笭鍘�", + "鍩庡帰鍖�", + "鍙跺幙", + "璇忓畨鍘�", + "鍠�鍠囨瞾宸︾考钂欏彜鏃忚嚜娌诲幙", + "鍒嗗疁鍘�", + "鑾茶姳鍘�", + "铏庢灄甯�", + "鍗楀厖甯�", + "娌冲崡鐪�", + "姊呭幙", + "鑲囦笢甯�", + "寮ユ浮鍘�", + "鑱傛媺鏈ㄥ幙", + "闃垮皵灞卞競", + "姹変腑甯�", + "娴鍘�", + "娑块箍鍘�", + "涔″煄鍘�", + "涓婄姽鍘�", + "寰蜂繚鍘�", + "绉戝皵娌佸彸缈间腑鏃�", + "璞″北鍘�", + "鍖椾粦鍖�", + "绀炬棗鍘�", + "鍜岀敯甯�", + "榛勫北甯�", + "闀垮箔鍘�", + "閯傚窞甯�", + "娴锋檹鍘�", + "鍐呬埂鍘�", + "瀹佹渤鍘�", + "妗愭煆鍘�", + "涔虫簮鐟舵棌鑷不鍘�", + "娉岄槼鍘�", + "璧勪腑鍘�", + "骞挎渤鍘�", + "婀栧彛鍘�", + "鐒︿綔甯�", + "閬傚钩鍘�", + "鏂颁細鍖�", + "鍏村畨鐩�", + "姹熸触鍖�", + "涓芥按甯�", + "娼㈠窛鍘�", + "鏋滄礇钘忔棌鑷不宸�", + "鍛肩帥鍘�", + "铏炲煄鍘�", + "钃熷幙", + "灏夌妬鍘�", + "淇按鍘�", + "鐝犳櫀鍖�", + "瑗垮浐鍖�", + "鏃犳#鍘�", + "婀樿タ鍦熷鏃忚嫍鏃忚嚜娌诲窞", + "榫欐江鍖�", + "瀹変埂鍘�", + "鏂楅棬鍖�", + "妯熸爲甯�", + "鍖楃エ甯�", + "杩佽タ鍘�", + "瑗垮北鍖�", + "瀹挎澗鍘�", + "鏄屽悏甯�", + "鐙瓙灞卞尯", + "娉告按鍘�", + "澶╁郴鍘�", + "鍢夊畾鍖�", + "鏂囨垚鍘�", + "鑲囧窞鍘�", + "鑲冨畞鍘�", + "瀹夊浘鍘�", + "閽熺ゥ甯�", + "榫欏矖鍖�", + "闆佸嘲鍖�", + "鑻嶆ⅶ鍘�", + "榫欐箹鍖�", + "涓婃牀鍘�", + "闃虫洸鍘�", + "榛勭煶甯�", + "鍗楅泟甯�", + "涓囧畞甯�", + "鍛ㄦ潙鍖�", + "榫欏瓙婀栧尯", + "閯炲窞鍖�", + "鏂囧北甯�", + "鏄屾睙鍖�", + "鐭冲彴鍘�", + "璞″北鍖�", + "閬靛寲甯�", + "姝﹀し灞卞競", + "婊″煄鍘�", + "涓夋按鍖�", + "姘稿悏鍘�", + "鎯犳潵鍘�", + "宸撮噷鍧ゅ搱钀ㄥ厠鑷不鍘�", + "鎵舵矡鍘�", + "闃垮厠鑻忓湴鍖�", + "閲嶅簡甯�", + "闈欎箰鍘�", + "鍏冨潩鍖�", + "鐜夋爲鍘�", + "缁ュ畞鍘�", + "鏂囨槍甯�", + "鑺掑競", + "娼畨鍘�", + "鐝犳捣甯�", + "璐靛窞鐪�", + "寤夋睙甯�", + "瀵屾媺灏斿熀鍖�", + "閮藉寑甯�", + "鍗楁槑鍖�", + "宕嗗硳鍖�", + "鍟嗘渤鍘�", + "涔変箤甯�", + "鏂板反灏旇檸鍙虫棗", + "閭绘按鍘�", + "鍢夊叴甯�", + "甯堝畻鍘�", + "鎸畨鍖�", + "棣欐牸閲屾媺鍘�", + "宸㈡箹甯�", + "鐝垐鍘�", + "澶у寲鐟舵棌鑷不鍘�", + "鏋e簞甯�", + "鏃犻敗甯�", + "璋㈤�氶棬鍘�", + "娌ф簮浣ゆ棌鑷不鍘�", + "璇告毃甯�", + "娴﹀寳鍘�", + "宸村溅娣栧皵甯�", + "瀹夊畞甯�", + "涓伴兘鍘�", + "榛勬郸鍖�", + "浼戝畞鍘�", + "涔濋緳鍘�", + "鍙ゅ喍鍖�", + "鍗楁槍鍘�", + "鍏板窞甯�", + "姊у窞甯�", + "鍖楁捣甯�", + "鍋忓叧鍘�", + "鍝堝反娌冲幙", + "鍖楀窛缇屾棌鑷不鍘�", + "闈掑北婀栧尯", + "瀚╂睙鍘�", + "婕冲钩甯�", + "鏍煎皵鏈ㄥ競", + "姹夊彴鍖�", + "闃滃崡鍘�", + "绂勫姖褰濇棌鑻楁棌鑷不鍘�", + "鍜屾斂鍘�", + "鏅嘲鍘�", + "鐧界⒈婊╁尯", + "鍗氶噹鍘�", + "鍏嬪北鍘�", + "閯㈤櫟鍘�", + "娴蜂赴鍘�", + "鑼傛腐鍖�", + "榧庢箹鍖�", + "澶х煶妗ュ競", + "璐′簳鍖�", + "浠欐甯�", + "娌诲鍘�", + "涓滆儨鍖�", + "姹熻揪鍘�", + "鏄備粊鍘�", + "鍗楃毊鍘�", + "闃虫硥甯�", + "宓╁幙", + "鏅嬪窞甯�", + "绉�灞卞湡瀹舵棌鑻楁棌鑷不鍘�", + "鍞愭渤鍘�", + "娉稿畾鍘�", + "楣ゅ煄鍖�", + "娼嶅潑甯�", + "娓煄鍖�", + "閫氬寲鍘�", + "閾滀粊甯�", + "骞块櫟鍖�", + "鍜岀鍘�", + "鍞愬北甯�", + "闃滃煄鍘�", + "闃垮反鍢庢棗", + "绉�娲插尯", + "瀛愭床鍘�", + "浜岃繛娴╃壒甯�", + "榛旇タ鍘�", + "鏄庡厜甯�", + "姹熷煄鍝堝凹鏃忓綕鏃忚嚜娌诲幙", + "娴峰煄鍖�", + "杞彴鍘�", + "缃楁簮鍘�", + "缁ュ痉鍘�", + "鏌虫睙鍘�", + "鑸瑰北鍖�", + "寰峰畯鍌f棌鏅鏃忚嚜娌诲窞", + "姒曞煄鍖�", + "娴忛槼甯�", + "鏂囧幙", + "閯傚煄鍖�", + "姹夋花鍖�", + "浼氭辰鍘�", + "鑰块┈鍌f棌浣ゆ棌鑷不鍘�", + "鎶氬窞甯�", + "瀹胯縼甯�", + "浜冲窞甯�", + "鍚堟睙鍘�", + "濉斿煄鍦板尯", + "鍩庡尯", + "涔呮不鍘�", + "瀛熻繛鍌f棌鎷夌鏃忎饯鏃忚嚜娌诲幙", + "寰峰畨鍘�", + "骞胯タ澹棌鑷不鍖�", + "涓夌鍘�", + "浜箹鍖�", + "鏅嬫簮鍖�", + "鍗冨北鍖�", + "鍥句滑甯�", + "涓囪崳鍘�", + "绾虫邯鍖�", + "宓婃硹鍘�", + "瀹惧幙", + "棣欐渤鍘�", + "涔屾媺鐗瑰悗鏃�", + "閫氳鍘�", + "姹熸案鍘�", + "榛斾笢鍗楄嫍鏃忎緱鏃忚嚜娌诲窞", + "瀹佸畨甯�", + "骞垮厓甯�", + "鏃倯鍘�", + "闂戒警鍘�", + "鐢樺窞鍖�", + "榫欏畨鍖�", + "娑炴簮鍘�", + "鍕冨埄鍘�", + "闀垮矝鍘�", + "濞勫簳甯�", + "鍗楀拰鍘�", + "闅嗗瓙鍘�", + "鍙犲僵鍖�", + "鑽f垚甯�", + "楹︾Н鍖�", + "姘村煄鍘�", + "搴滆胺鍘�", + "璐炬豹鍖�", + "骞冲潩鍘�", + "鍑夊煄鍘�", + "鍑ゅ北鍘�", + "鍕愯厞鍘�", + "澶粨甯�", + "璁告槍鍘�", + "寰愰椈鍘�", + "鍗楁锭褰濇棌鑷不鍘�", + "鎯犳祹鍖�", + "娉板畞鍘�", + "姘哥鍘�", + "娣冲畨鍘�", + "鍟嗗崡鍘�", + "鏅痉闀囧競", + "涔愭槍甯�", + "瀹瑰幙", + "鐏靛北鍘�", + "娌惧寲鍘�", + "鐝犲北鍖�", + "绁佽繛鍘�", + "婢滄钵鎷夌鏃忚嚜娌诲幙", + "瀵嗕簯鍘�", + "榛熷幙", + "鍙ゅ幙", + "鏄槼鍖�", + "鍚夊窞鍖�", + "婕渤甯�", + "楹掗簾鍖�", + "姝︽睙鍖�", + "娌堥槼甯�", + "瀵嗗北甯�", + "鍗楁矙鍖�", + "娴烽槼甯�", + "姹熸补甯�", + "涓夋睙渚楁棌鑷不鍘�", + "鍖呮渤鍖�", + "鑾峰槈鍘�", + "鎵樺厠鎵樺幙", + "楹诲北鍖�", + "娈烽兘鍖�", + "浠佹��甯�", + "绂忔捣鍘�", + "涔屽鏃�", + "鏉忚姳宀尯", + "寤虹摨甯�", + "杈惧窞甯�", + "姒嗘鍖�", + "骞冲噳甯�", + "瑗挎槍甯�", + "閲戞槑鍖�", + "瀹佸浗甯�", + "鍗楅暱鍖�", + "鐎嶆渤鍥炴棌鍖�", + "浜旇幉鍘�", + "鏉炬粙甯�", + "姹熸捣鍖�", + "闀囧悍鍘�", + "鍏翠笟鍘�", + "缁磋タ鍌堝兂鏃忚嚜娌诲幙", + "灏勯槼鍘�", + "宸у鍘�", + "婀涙渤鍖�", + "娴峰崡钘忔棌鑷不宸�", + "瀹f仼鍘�", + "鐜夋灄甯�", + "瀵屽幙", + "鐭冲槾灞卞競", + "鏌虫渤鍘�", + "褰版鍘�", + "閾舵捣鍖�", + "鎶氶『鍘�", + "鐧芥矙榛庢棌鑷不鍘�", + "绾㈠彜鍖�", + "姹濋槼鍘�", + "鍙屾竻鍖�", + "鍏灊鐗瑰尯", + "涓瑰嚖鍘�", + "闃冲北鍘�", + "鏂版皯甯�", + "鏃犱负鍘�", + "澶烽櫟鍖�", + "婀樻ˉ鍖�", + "瀹佷埂鍘�", + "閲戝崕甯�", + "閭冲窞甯�", + "鑸掑煄鍘�", + "鍗楀彫鍘�", + "鍑夊窞鍖�", + "褰槼鍘�", + "鍥涘钩甯�", + "榛戝北鍘�", + "瀹夎揪甯�", + "鑾庤溅鍘�", + "钀у幙", + "榛庡煄鍘�", + "绠�闃冲競", + "鐢版灄鍘�", + "椹竟褰濇棌鑷不鍘�", + "鐜夊窞鍖�", + "娣辨辰鍘�", + "鍒氬療鍘�", + "娌欐渤甯�", + "鍑噷甯�", + "鍑ゅ簡鍘�", + "鎬濇槑鍖�", + "鍗撳凹鍘�", + "缁甸槼甯�", + "瀵屾簮鍘�", + "閿﹀窞甯�", + "濂夋柊鍘�", + "绂忓北鍖�", + "楣ゅ矖甯�", + "娓彛鍖�", + "绔窞鍖�", + "涓ゅ綋鍘�", + "宸存灄鍙虫棗", + "鍜屽钩鍘�", + "闃冲師鍘�", + "鍗庢睜鍘�", + "鍗楅櫟鍘�", + "鏄岄倯鍖�", + "娴风洂鍘�", + "鐜睙姣涘崡鏃忚嚜娌诲幙", + "鍘熷钩甯�", + "鍖楀鍖�", + "瀹滃鍘�", + "寮犲鍙e競", + "寤烘槍鍘�", + "鍒╁窛甯�", + "鑸熷北甯�", + "浜斿彴鍘�", + "娼槼鍖�", + "鐨嬪叞鍘�", + "楣块倯鍘�", + "娓呮渤闂ㄥ尯", + "妗愬簮鍘�", + "鏄岄兘鍦板尯", + "娌欐磱鍘�", + "榛戦緳姹熺渷", + "鍑屾捣甯�", + "闀囨捣鍖�", + "閾呭北鍘�", + "涓変簹甯�", + "榛旀睙鍖�", + "姹ゆ椇娌冲尯", + "鏃鸿媿鍘�", + "瑗夸埂鍘�", + "椤哄钩鍘�", + "骞抽『鍘�", + "澶忔渤鍘�", + "鍗楁捣鍖�", + "鏅嬪畨鍖�", + "娌槼鍘�", + "鏃犳瀬鍘�", + "瀹氬窞甯�", + "闄囧窛鍘�", + "榫欐咕鍖�", + "鑽ラ槼甯�", + "鑲ュ煄甯�", + "娲辨簮鍘�", + "鏄屽畞鍘�", + "姘搁『鍘�", + "鍗庨槾甯�", + "瀹藉煄鍖�", + "鍦熼粯鐗瑰乏鏃�", + "鎷夊瓬鍘�", + "姹熷崡鍖�", + "绠″煄鍥炴棌鍖�", + "鍔犳煡鍘�", + "娲辰鍘�", + "鍙板畨鍘�", + "鍖楀鍖�", + "鏂板反灏旇檸宸︽棗", + "鍚堣偉甯�", + "鑲ヤ埂鍘�", + "鐭抽槨鍘�", + "鍜屽钩鍖�", + "鍗氭湜鍖�", + "鍙屽鍖�", + "涓规1鍘�", + "閽﹀寳鍖�", + "鐞肩粨鍘�", + "鍏嬫媺鐜涗緷甯�", + "娉芥櫘鍘�", + "鍠�浠�甯�", + "涓伴晣甯�", + "骞跨伒鍘�", + "娌冲彛鍖�", + "鏈涢兘鍘�", + "鐟炲畨甯�", + "鍗楀钩甯�", + "搴勬氮鍘�", + "鍙ゅ鍖�", + "缁ユ花鍘�", + "妯嘲鍘�", + "鑻卞北鍘�", + "鍗楁睙鍘�", + "宀戞邯甯�", + "闈栬繙鍘�", + "骞块槼鍖�", + "灏氬織甯�", + "瀹夐緳鍘�", + "鍙屾沪鍖�", + "閾跺窛甯�", + "姊撴郊鍘�", + "鏇插懆鍘�", + "瀹濆鍖�", + "婀涙睙甯�", + "鏋e己鍘�", + "鍥㈤鍘�", + "鍑ゅ彴鍘�", + "姝﹂櫟婧愬尯", + "娉板畨甯�", + "楣版墜钀ュ瓙鐭垮尯", + "姝﹀畨甯�", + "鍙屾睙鎷夌鏃忎饯鏃忓竷鏈楁棌鍌f棌鑷不鍘�", + "閲戠鐟舵棌鑷不鍘�", + "閭兏鍘�", + "娌充笢鍖�", + "鐢板搴靛尯", + "濡備笢鍘�", + "淇濆痉鍘�", + "閲戦槼鍘�", + "瀹滅珷鍘�", + "闈掔櫧姹熷尯", + "瀹氭棩鍘�", + "榛庡窛鍘�", + "璐靛畾鍘�", + "閭曞畞鍖�", + "寤堕暱鍘�", + "涓存钵甯�", + "涓寸繑鍖�", + "浼氬悓鍘�", + "澶х鍘�", + "姘告柊鍘�", + "瀵垮畞鍘�", + "闀挎鍘�", + "闃充俊鍘�", + "鍢夊杽鍘�", + "宸撮潚鍘�", + "澶胺鍘�", + "鐩樺北鍘�", + "澶у畞鍘�", + "鏌冲崡鍖�", + "浜庢椽鍖�", + "鏇叉矁鍘�", + "姘戝嫟鍘�", + "鍠滃痉鍘�", + "澶ц冻鍖�", + "鏂板競鍖�", + "姘稿畨甯�", + "濮氬畨鍘�", + "寮犲娓競", + "鏋楄姖鍦板尯", + "濂夎妭鍘�", + "灞忓北鍘�", + "閫氶亾渚楁棌鑷不鍘�", + "鍑ゆ硥鍖�", + "娓╁鍘�", + "浠庡寲甯�", + "鍗楅儴鍘�", + "瑗垮弻鐗堢撼鍌f棌鑷不宸�", + "楂樺瘑甯�", + "娑цタ鍖�", + "楣垮鍘�", + "閯遍槼鍘�", + "瀹滃悰鍘�", + "娴峰崡鍖�", + "杩簡钘忔棌鑷不宸�", + "楣版江甯�", + "绉戝皵娌佸彸缈煎墠鏃�", + "宸存灄宸︽棗", + "鑸為槼鍘�", + "宀抽簱鍖�", + "鐩愪涵鍘�", + "鍟嗗窞鍖�", + "閬典箟甯�", + "鐢电櫧鍘�", + "鑼傚幙", + "杩炰簯鍖�", + "鍗氱櫧鍘�", + "姹夊鍘�", + "瀛熸潙鍥炴棌鑷不鍘�", + "鎬�鍖栧競", + "娓镐粰鍖�", + "绁侀棬鍘�", + "寮�骞冲尯", + "寰峰簡鍘�", + "娣勫窛鍖�", + "鏅畞鐣叉棌鑷不鍘�", + "閭f洸鍘�", + "鑱傝崳鍘�", + "鐧藉北甯�", + "鍚堟郸鍘�", + "瀹変笜甯�", + "婊ㄥ窞甯�", + "浠诲煄鍖�", + "姘稿叴鍘�", + "寰锋睙鍘�", + "浼婇�氭弧鏃忚嚜娌诲幙", + "瀹佸痉甯�", + "鐭冲睆鍘�", + "鍗氬北鍖�", + "鍗楅槼甯�", + "钃濈敯鍘�", + "娓濆寳鍖�", + "浜戦渼鍘�", + "涔濇睙鍘�", + "瀹侀兘鍘�", + "閾佸箔甯�", + "骞垮钩鍘�", + "杈芥簮甯�", + "姘镐赴鍘�", + "鏌樺煄鍘�", + "椹瀺灞卞競", + "澧ㄦ睙鍝堝凹鏃忚嚜娌诲幙", + "閭e潯鍘�", + "缁ラ槼鍘�", + "鍩庨槼鍖�", + "鏂界鍘�", + "绂忔竻甯�", + "鍥洪槼鍘�", + "鑽旀咕鍖�", + "娑櫟鍖�", + "涓存辰鍘�", + "骞虫灉鍘�", + "鐑堝北鍖�", + "闈掓捣鐪�", + "榫欐矙鍖�", + "鍥婅唉鍘�", + "鍩庡寳鍖�", + "濮戣嫃鍖�", + "璋煄鍖�", + "娲ュ崡鍖�", + "婊ㄥ煄鍖�", + "楣ゅ嘲鍘�", + "榻愭渤鍘�", + "鍗笢鍖�", + "閭f洸鍦板尯", + "瀹佹槑鍘�", + "鑽旀郸鍘�", + "姝﹀窛鍘�", + "姹熼兘鍖�", + "瑗垮悏鍘�", + "姹曞ご甯�", + "绛犺繛鍘�", + "浜斿ぇ杩炴睜甯�", + "閲戝彛娌冲尯", + "鍙嬪ソ鍖�", + "姝︿警鍖�", + "娴氬幙", + "澶у叴鍖�", + "鍓嶉儹灏旂綏鏂挋鍙ゆ棌鑷不鍘�", + "纰惧瓙灞卞尯", + "娌欓泤鍘�", + "鏉傚鍘�", + "灞遍槼鍖�", + "婊﹀钩鍘�", + "棣嗛櫠鍘�", + "涔愪笟鍘�", + "闆嗙編鍖�", + "褰北鍘�", + "涓侀潚鍘�", + "宀抽槼鍘�", + "鍗㈡皬鍘�", + "澶╂ˉ鍖�", + "涓睙鍘�", + "鑻忎粰鍖�", + "寰锋槍鍘�", + "鍗花鍖�", + "绱㈠幙", + "鑼冨幙", + "宸嶅北褰濇棌鍥炴棌鑷不鍘�", + "鍙岄腑灞卞競", + "閬撳幙", + "瀵掍涵鍖�", + "鍗椾箰鍘�", + "姊佸北鍘�", + "鐧捐壊甯�", + "涓囩鍖�", + "浠佸寲鍘�", + "搴撳皵鍕掑競", + "闇稿窞甯�", + "濞佸畞褰濇棌鍥炴棌鑻楁棌鑷不鍘�", + "榫欏煄鍖�", + "宀抽槼妤煎尯", + "娉告邯鍘�", + "浠緛甯�", + "婀栭噷鍖�", + "涓夐兘姘存棌鑷不鍘�", + "鍐呰挋鍙よ嚜娌诲尯", + "姝﹀唸甯�", + "姝﹀己鍘�", + "瓒婂煄鍖�", + "瀹夊寲鍘�", + "搴愬北鍖�", + "鏂版嘲甯�", + "楹绘牀鍧″幙", + "灏夋皬鍘�", + "瑗挎矙缇ゅ矝", + "灏忓簵鍖�", + "鑾卞北鍖�", + "鑻嶅北鍘�", + "鏃ョ収甯�", + "鑸掑叞甯�", + "娴蜂笢鍦板尯", + "涓归槼甯�", + "澶忛倯鍘�", + "浠嬩紤甯�", + "鎻笢鍘�", + "鍓戦榿鍘�", + "鐧芥按鍘�", + "澶х敯鍘�", + "鑽嗗窞鍖�", + "绔嬪北鍖�", + "甯稿痉甯�", + "榛勬鍘�", + "椤哄簡鍖�", + "姒嗘灄甯�", + "娌剧泭鍘�", + "闃垮厠闄跺幙", + "姹濆窞甯�", + "绂瑰窞甯�", + "澶╁北鍖�", + "鍥涙柟鍙板尯", + "浠插反鍘�", + "鏂板钩褰濇棌鍌f棌鑷不鍘�", + "鍢夎崼鍘�", + "鍚笢甯�", + "娉稿窞甯�", + "鍐呮睙甯�", + "涓冨彴娌冲競", + "娴峰彛甯�", + "姘稿煄甯�", + "婊ㄦ捣鍘�", + "姝︽眽甯�", + "鍗楁槍甯�", + "闈欏畨鍖�", + "姝﹁繘鍖�", + "姝﹁儨鍘�", + "闃挎媺鍠勫乏鏃�", + "鐚囦涵鍖�", + "鍗楀畨甯�", + "瀵岄『鍘�", + "瑗块櫟鍖�", + "涓存硥鍘�", + "涓村鍘�", + "鐢樹簳瀛愬尯", + "姘稿痉鍘�", + "绂勪赴鍘�", + "宓婂窞甯�", + "铦跺北鍖�", + "鍚屼粊鍘�", + "鍗楄姮鍖�", + "涓囨簮甯�", + "鏂板寳鍖�", + "杈涢泦甯�", + "鏅叞鍘�", + "榛勯緳鍘�", + "璋峰煄鍘�", + "娓呮郸鍖�", + "瀹e寲鍖�", + "褰辰鍘�", + "鑺锋睙渚楁棌鑷不鍘�", + "澶у巶鍥炴棌鑷不鍘�", + "闂稿寳鍖�", + "闃块瞾绉戝皵娌佹棗", + "娌愬窛鍘�", + "鍜岄緳甯�", + "骞抽瞾鍖�", + "澶у叧鍘�", + "娉板窞甯�", + "鐏靛彴鍘�", + "绾抽泹鍘�", + "鍙岀墝鍘�", + "骞虫鍘�", + "寰藉窞鍖�", + "绁炲啘鏋舵灄鍖�", + "杩炲崡鐟舵棌鑷不鍘�", + "閮藉畨鐟舵棌鑷不鍘�", + "姹熷窛鍘�", + "椤烘槍鍘�", + "濞佽繙鍘�", + "涔愯嚦鍘�", + "闈欏畞鍘�", + "閾佸北娓尯", + "鏂瑰煄鍘�", + "瀹樻浮鍖�", + "澶拰鍖�", + "涓棫甯�", + "宀博婊℃棌鑷不鍘�", + "娴夋渤鍖�", + "寮犳咕鍖�", + "缁涘幙", + "寮�杩滃競", + "娣畨甯�", + "闅嗘灄鍚勬棌鑷不鍘�", + "闆峰窞甯�", + "婕虫郸鍘�", + "钂欏煄鍘�", + "鍩庡瓙娌冲尯", + "榫欐睙鍘�", + "鍦熼粯鐗瑰彸鏃�", + "瑗跨洘浣ゆ棌鑷不鍘�", + "涔岄瞾鏈ㄩ綈鍘�", + "鍐呬笜鍘�", + "鑸硅惀鍖�", + "娲礊鍘�", + "鏉惧師甯�", + "鍏洏姘村競", + "鎭掑北鍖�", + "鏈濆ぉ鍖�", + "浣欏甯�", + "鐭虫ゼ鍘�", + "鑺滄箹鍘�", + "鑻忓凹鐗瑰乏鏃�", + "涓矙缇ゅ矝鐨勫矝绀佸強鍏舵捣鍩�", + "鍏村北鍘�", + "宕囩ぜ鍘�", + "瀵岄槼甯�", + "寮�灏佸競", + "涓滃窛鍖�", + "淇濆北甯�", + "瑗夸箤鐝犵﹩娌佹棗", + "鐩稿北鍖�", + "鍚愰瞾鐣湴鍖�", + "鍏遍潚鍩庡競", + "澶拰鍘�", + "娌欏潯澶村尯", + "娼滃北鍘�", + "鍖楀競鍖�", + "鎵朵綑鍘�", + "姝︿埂鍘�", + "鎬濊寘鍖�", + "鍗楀畞甯�", + "瀹滄槬甯�", + "寰愭按鍘�", + "鍚屾睙甯�", + "鑰�宸炲尯", + "鏃呴『鍙e尯", + "鍏拌タ鍘�", + "楣ゅ甯�", + "榫欎簳甯�", + "閮村窞甯�", + "瑗挎灄鍖�", + "閯傛墭鍏嬫棗", + "閲戝北鍖�", + "缁ヤ腑鍘�", + "鍚村窛甯�", + "闃滃畞鍘�", + "鐜夊睆渚楁棌鑷不鍘�", + "闂诲枩鍘�", + "鐏典笜鍘�", + "涓囧勾鍘�", + "鏉ュ畨鍘�", + "鍙板北甯�", + "鍏村北鍖�", + "璁╄儭璺尯", + "鍚村繝甯�", + "宸村溅鍘�", + "澶у畨鍖�", + "鏄旈槼鍘�", + "楂樺窞甯�", + "宄板嘲鐭垮尯", + "璧勫叴甯�", + "闂ㄥご娌熷尯", + "娌抽棿甯�", + "鏃槼鍘�", + "鍙よ敽鍘�", + "娼橀泦鍖�", + "鏃岄槼鍖�", + "楗舵渤鍘�", + "娓呮渤鍖�", + "楂樺畨甯�", + "涓滆惀甯�", + "涔愪笢榛庢棌鑷不鍘�", + "濮嬪叴鍘�", + "鍜镐赴鍘�", + "澶╁厓鍖�", + "闈掗槼鍘�", + "绫虫灄鍘�", + "妞掓睙鍖�", + "闆锋尝鍘�", + "瀹夊悍甯�", + "娉藉簱鍘�", + "鏂板寲鍘�", + "鍏ㄥ窞鍘�", + "娑夊幙", + "璁告槍甯�", + "閾滃窛甯�", + "宸︿簯鍘�", + "骞虫ˉ鍖�", + "璞″窞鍘�", + "鎬掓睙鍌堝兂鏃忚嚜娌诲窞", + "瑗挎灄鍘�", + "寮ュ嫆鍘�", + "瑕冨鍖�", + "娴锋腐鍖�", + "涓滀埂鍘�", + "婊撮亾鍖�", + "娴︽睙鍘�", + "骞充埂鍘�", + "涓滄腐甯�", + "瀹濆畨鍖�", + "鐡捣鍖�", + "娌挎哗鍖�", + "寰峰煄鍖�", + "鐞兼捣甯�", + "鐭虫煴鍦熷鏃忚嚜娌诲幙", + "瀹忎紵鍖�", + "姘戞潈鍘�", + "鑽f槍鍘�", + "椴佺敻鍘�", + "鍏村畞鍖�", + "娓呮渤鍘�", + "榫欓棬鍘�", + "骞挎槍鍘�", + "鏌煄鍖�", + "钀ㄥ皵鍥惧尯", + "瀹夐『甯�", + "鐣岄甯�", + "鍘�", + "缁挎槬鍘�", + "姹熷崕鐟舵棌鑷不鍘�", + "澶ф醇鍘�", + "鍠�浠�鍦板尯", + "绔犱笜甯�", + "閽﹀窞甯�", + "闀囪祲鍘�", + "鍟嗛兘鍘�", + "闈掑北鍖�", + "闄嗚壇鍘�", + "闈栬タ鍘�", + "婵夋邯鍘�", + "姘哥櫥鍘�", + "璁锋渤甯�", + "闆嗚搐鍘�", + "娌у幙", + "閭瑰煄甯�", + "鍟嗕笜甯�", + "鍗庨緳鍖�", + "搴嗗畨鍘�", + "姝︿箟鍘�", + "绔欏墠鍖�", + "涓夊彴鍘�", + "鍘嗕笅鍖�", + "鏄岄粠鍘�", + "涓冩槦鍏冲尯", + "鐜夌幆鍘�", + "姘稿鍘�", + "妗傞槼鍘�", + "璺崡鍖�", + "涓滀埂鏃忚嚜娌诲幙", + "鐢樺痉鍘�", + "閲戞矙鍘�", + "鏂界敻鍘�", + "瀵垮幙", + "闃插煄鍖�", + "鍚北鍘�", + "骞冲窛鍖�", + "鍗楁汲鍘�", + "绫宠剛鍘�", + "澶т綑鍘�", + "寤舵触鍘�", + "鍐滃畨鍘�", + "鏈涘鍘�", + "鍢夌ゥ鍘�", + "椤烘渤鍥炴棌鍖�", + "鍗楁禂鍖�", + "婀樻江甯�", + "闀挎捣鍘�", + "瑗勬本鍘�", + "骞虫睙鍘�", + "鍙欐案鍘�", + "鍛煎浘澹佸幙", + "閫氭睙鍘�", + "閾滈櫟甯�", + "婀栧寳鐪�", + "閯勫煄鍘�", + "楦¤タ甯�", + "瑙f斁鍖�", + "搴愰槼鍖�", + "閫氬煄鍘�", + "娓呮柊鍘�", + "鏉炬睙鍖�", + "绾㈠鍖�", + "鍚涘北鍖�", + "涔濆娌熷幙", + "娉楁按鍘�", + "妗戞棩鍘�", + "澶╁績鍖�", + "鍐呴粍鍘�", + "杈炬棩鍘�", + "婀鹃噷鍖�", + "鑸為挗甯�", + "娓呬赴鍘�", + "瑗垮尯", + "鐐瑰啗鍖�", + "璧珷鍘�", + "杩儴鍘�", + "涓婅櫈甯�", + "宸存鍘�", + "绂忔硥甯�", + "娌涘幙", + "閿℃灄娴╃壒甯�", + "宀宠タ鍘�", + "瑗夸赴鍘�", + "钄氬幙", + "鏂版郸鍖�", + "鍏村畨鍖�", + "鍢夐粠鍘�", + "榄忓幙", + "鏂囧嘲鍖�", + "鍑ょ繑鍘�", + "鎬�鏉ュ幙", + "榫欒儨鍚勬棌鑷不鍘�", + "琛′笢鍘�", + "骞冲埄鍘�", + "鎵庤祲鐗规棗", + "鍖楁灄鍖�", + "闃挎媺鍠勫彸鏃�", + "娌欏競鍖�", + "榫欏崡鍘�", + "婀熶腑鍘�", + "涓滄捣鍘�", + "钂欏北鍘�", + "鍚夋湪涔冨幙", + "鍙ュ甯�", + "椹皵搴峰幙", + "涓存本甯�", + "澶т笢鍖�", + "寰寲鎾掓媺鏃忚嚜娌诲幙", + "娓簮鍘�", + "铏瑰彛鍖�", + "骞宠繙鍘�", + "鐜夐緳绾宠タ鏃忚嚜娌诲幙", + "鍏鍖�", + "閲戠墰鍖�", + "娴锋媺灏斿尯", + "寤哄崕鍖�", + "涓滄簮鍘�", + "濮滃牥甯�", + "鏌冲窞甯�", + "鍑屾渤鍖�", + "钀ュ彛甯�", + "鐏屼簯鍘�", + "娌冲寳鍖�", + "鏂扮枂缁村惥灏旇嚜娌诲尯", + "鐭抽紦鍖�", + "鏋i槼甯�", + "鏁﹀寲甯�", + "鐨北鍘�", + "淇濅涵榛庢棌鑻楁棌鑷不鍘�", + "鎴愰兘甯�", + "甯稿窞甯�", + "鍏栧窞甯�", + "宸ㄩ箍鍘�", + "寰愭眹鍖�", + "鍚存睙鍖�", + "蹇诲窞甯�", + "鏉炬綐鍘�", + "姹捐タ鍘�", + "鍏村畨鍘�", + "鑹茶揪鍘�", + "宀卞北鍘�", + "鍗氬叴鍘�", + "娴崱瀛愬幙", + "闆嗗畞鍖�", + "涓嬮檰鍖�", + "涓婃�濆幙", + "鏂板幙", + "涓存捣甯�", + "淇鍘�", + "涓存矀甯�", + "灞辨捣鍏冲尯", + "鍙屽煄甯�", + "娌欏幙", + "闄嗕赴甯�", + "鍢夊唱鍏冲競", + "瀹e寲鍘�", + "绱噾鍘�", + "閿欓偅鍘�", + "閿″北鍖�", + "铻嶅畨鍘�", + "閽㈠煄鍖�", + "骞充箰鍘�", + "闀挎眬鍘�", + "涓芥睙甯�", + "琛屽攼鍘�", + "涓板畞婊℃棌鑷不鍘�", + "瀵岄敠甯�", + "鐟舵捣鍖�", + "瑗垮煄鍖�", + "鐢颁笢鍘�", + "骞宠胺鍖�", + "瑗垮伐鍖�", + "鏄屽钩鍖�", + "鏅笢褰濇棌鑷不鍘�", + "姹熸眽鍖�", + "鍏畨鍘�", + "闅嗗畨鍘�", + "鍒╄緵鍘�", + "瀹佹捣鍘�", + "鏈ㄥ叞鍘�", + "娼煎叧鍘�", + "鏂板婊℃棌鑷不鍘�", + "璇稿煄甯�", + "娌冲崡钂欏彜鏃忚嚜娌诲幙", + "浜戝拰鍘�", + "姘稿拰鍘�", + "鍐锋按姹熷競", + "閲戝彴鍖�", + "钑叉槬鍘�", + "骞冲北鍖�", + "閿︽睙鍖�", + "闅嗗寲鍘�", + "鍚存ˉ鍘�", + "搴蜂繚鍘�", + "琛¢槼鍘�", + "瀛濇劅甯�", + "鐩愰兘鍖�", + "闆勫幙", + "鎵腑甯�", + "缈犲睆鍖�", + "钑夊煄鍖�", + "閾佸箔鍘�", + "淇″疁甯�", + "闃垮潩鍘�", + "杩炲煄鍘�", + "閱撮櫟甯�", + "涓存串鍘�", + "鐘嶄负鍘�", + "閯備鸡鏄ヨ嚜娌绘棗", + "绾㈠鍫″尯", + "姘稿杽鍘�", + "涓婄敇宀尯", + "鍙虫睙鍖�", + "瀹滃煄甯�", + "娓呰嫅鍘�", + "榫欏崕鍖�", + "姹夐槼鍖�", + "鏅椽甯�", + "鎴垮北鍖�", + "澶у悓鍖�", + "瀹変粊鍘�", + "浜屼竷鍖�", + "閬傚窛鍘�", + "鑻卞痉甯�", + "棰嶆硥鍖�", + "鍏嬩粈鍏嬭吘鏃�", + "妗ヨタ鍖�", + "鏍规渤甯�", + "鍑夊北褰濇棌鑷不宸�", + "楸煎嘲鍖�", + "瑗垮崕鍘�", + "娲崡甯�", + "涓嬪叧鍖�", + "鐢虫墡鍘�", + "璐瑰幙", + "姝﹂櫉鍘�", + "鐭虫嫄鍖�", + "鎶氭澗鍘�", + "閫氭鍘�", + "鐩稿煄鍖�", + "澹ゅ鍘�", + "鍏村簡鍖�", + "棣欐腐鐗瑰埆琛屾斂鍖�", + "鐭虫櫙灞卞尯", + "涔屼粈鍘�", + "鏇鹃兘鍖�", + "闃虫柊鍘�", + "姹竻鍘�", + "楹︾洊鎻愬幙", + "姹ら槾鍘�", + "绾㈡渤鍘�", + "瀵屽窛鐟舵棌鑷不鍘�", + "闇炴郸鍘�", + "鍩庢鑻楁棌鑷不鍘�", + "鍗楀矖鍖�", + "浼氱悊鍘�", + "鍜屽竷鍏嬭禌灏旇挋鍙よ嚜娌诲幙", + "榫欓┈娼尯", + "涓夊師鍘�", + "闀囧钩鍘�", + "澶у悕鍘�", + "鏇叉按鍘�", + "澶ф偀鍘�", + "鐧戒簯鍖�", + "鍗庡幙", + "鍗庤摜甯�", + "鑼呯鍖�", + "瀵讳箤鍘�", + "涓師鍖�", + "涓槼鍘�", + "澶у悓鍘�", + "涓滄床鍖�", + "姊佸瓙婀栧尯", + "浜戝幙", + "缁ュ寲甯�", + "浣涘潽鍘�", + "涓板煄甯�", + "濠哄煄鍖�", + "骞宠垎鍘�", + "缃楀钩鍘�", + "鑻嶆邯鍘�", + "骞冲崡鍘�", + "鍖栭殕鍥炴棌鑷不鍘�", + "钂告箻鍖�", + "閫氬窞鍖�", + "绉戝皵娌佸乏缈煎悗鏃�", + "椤轰箟鍖�", + "缁ユ1鍘�", + "姘告祹甯�", + "绾㈠畨鍘�", + "灏忔渤鍖�", + "娣畨鍖�", + "瀹垮煄鍖�", + "闃垮悎濂囧幙", + "绋峰北鍘�", + "璐垫邯甯�", + "甯﹀箔鍖�", + "鎶氬畞鍘�", + "涓滃畨鍘�", + "涓囧北鍖�", + "閫氬窛鍖�", + "姹熷北甯�", + "鑻ョ緦鍘�", + "涓版鼎鍖�", + "婊曞窞甯�", + "鑼屽钩鍘�", + "鍢夌鍘�", + "楸煎彴鍘�", + "鍗楀悍甯�", + "娴庢簮甯�", + "鏈邯婊℃棌鑷不鍘�", + "姝︽竻鍖�", + "姹熷寳鍖�", + "灏煎嫆鍏嬪幙", + "娴庡崡甯�", + "璧ゅ煄鍘�", + "鐫㈠幙", + "鐫㈤槼鍖�", + "姝﹀畾鍘�", + "鍗楀矓鍖�", + "鏄庢邯鍘�", + "姹朵笂鍘�", + "璐靛痉鍘�", + "鐒夎�嗗洖鏃忚嚜娌诲幙", + "缈煎煄鍘�", + "涓瑰鍘�", + "闊╁煄甯�", + "鍗庡鍖�", + "婊ㄦ捣鏂板尯", + "骞冲北鍘�", + "鑻ュ皵鐩栧幙", + "浣虫湪鏂競", + "鑾掑崡鍘�", + "鏍栭湠甯�", + "鍗楀幙", + "浣欐睙鍘�", + "瀵屾皯鍘�", + "鐧介摱鍖�", + "娣槼鍘�", + "缁嗘渤鍖�", + "浠佸竷鍘�", + "宄℃睙鍘�", + "闇嶉偙鍘�", + "鍗佸牥甯�", + "绁炴湪鍘�", + "绂忓缓鐪�", + "鐭虫硥鍘�", + "澶嶅叴鍖�", + "瀹夊浗甯�", + "瀹夌鍘�", + "榫欏博甯�", + "鍗楁箹鍖�", + "鑻忓窞甯�", + "鑲ヤ笢鍘�", + "闃滄柊钂欏彜鏃忚嚜娌诲幙", + "骞垮崡鍘�", + "涓滃厜鍘�", + "甯備腑鍖�", + "浜戞邯鍖�", + "闀囬泟鍘�", + "澶у鍘�", + "鍗曞幙", + "绂忓窞甯�", + "妗冩簮鍘�", + "闀垮灒鍘�", + "鏋楄タ鍘�", + "绻佹槍鍘�", + "澶ф柊鍘�", + "浠�閭″競", + "涓撮鍘�", + "瀹夋鍖�", + "濞勬槦鍖�", + "鎯犱笢鍘�", + "姘歌儨鍘�", + "鎬�闆嗗幙", + "娌堜笜鍘�", + "鎭幙", + "鍗庡鍘�", + "娼滄睙甯�", + "鑻卞悏娌欏幙", + "婕冲窞甯�", + "鏌虫灄鍘�", + "瑁曞畨鍖�", + "鍗楅潠鍘�", + "搴嗗煄鍘�", + "娣槾鍖�", + "姝﹀煄鍘�", + "娴庨槼鍘�", + "涓婂煄鍖�", + "闈栧畨鍘�", + "鎷滃煄鍘�", + "璧f鍘�", + "鍏村拰鍘�", + "鍙屾煆鍘�", + "鑳跺崡甯�", + "瀵熼殔鍘�", + "姹囧窛鍖�", + "瑗垮灞卞尯", + "鐏岄槼鍘�", + "娌佸幙", + "璧ゅ嘲甯�", + "鎻槼甯�", + "宕囧窞甯�", + "娑垮窞甯�", + "鍚磋捣鍘�", + "閭北鍖�", + "璺ˉ鍖�", + "鏈楀幙", + "闀挎矙鍘�", + "鑷础甯�", + "绉︽樊鍖�", + "鍥村満婊℃棌钂欏彜鏃忚嚜娌诲幙", + "閽﹀崡鍖�", + "榫欐捣甯�", + "钃幈甯�", + "灞卞煄鍖�", + "琛″北鍘�", + "骞虫箹甯�", + "鏂板畨鍘�", + "浜曢檳鍘�", + "鏌潽鍘�", + "鏅叞搴楀競", + "娌欏潽鍧濆尯", + "鐞嗗幙", + "娌欐咕鍖�", + "绔瑰北鍘�", + "宸北鍘�", + "鎱堝埄鍘�", + "璐″槑鍘�", + "姝﹀鍘�", + "寰锋牸鍘�", + "鍜岀敯鍘�", + "闃胯崳鏃�", + "灞暀鍘�", + "鍚夋灄鐪�", + "閰夐槼鍦熷鏃忚嫍鏃忚嚜娌诲幙", + "闀垮鍖�", + "骞垮窞甯�", + "瀹滃甯�", + "鍚村叴鍖�", + "鍏冨疂鍖�", + "姹熻嫃鐪�", + "缃楀簞鍖�", + "浜旈�氭ˉ鍖�", + "缍︽睙鍖�", + "閾跺窞鍖�", + "妗撲粊婊℃棌鑷不鍘�", + "灏佸紑鍘�", + "宄勫煄鍖�", + "婀栧窞甯�", + "鏄庡北鍖�", + "鑽嗛棬甯�", + "娓╂硥鍘�", + "涓滈樋鍘�", + "鏌樿崳鍘�", + "閲戜埂鍘�", + "骞崇綏鍘�", + "宸濇眹鍖�", + "鑱婂煄甯�", + "闆呮睙鍘�", + "鍖楀畨甯�", + "澶╃钘忔棌鑷不鍘�", + "瀹夋柊鍘�", + "鏂颁埂甯�", + "涔愰櫟甯�", + "娑垫睙鍖�", + "鍜岄『鍘�", + "浼婂窛鍘�", + "闀囨睙甯�", + "闈掗緳婊℃棌鑷不鍘�", + "铓屽北鍖�", + "榛勫崡钘忔棌鑷不宸�", + "榛勭煶娓尯", + "淇濋潠鍘�", + "璧北鍖�", + "闈掔緤鍖�", + "鍏嬫媺鐜涗緷鍖�", + "娴风彔鍖�", + "宀虫櫘婀栧幙", + "浜斿嘲鍦熷鏃忚嚜娌诲幙", + "鏇查夯鑾卞幙", + "婊ㄦ睙鍖�", + "鏋楀懆鍘�", + "瀹濆簲鍘�", + "鍏冮槼鍘�", + "鎯犲畨鍘�", + "鐭抽棬鍘�", + "娌堟渤鍖�", + "棣欐床鍖�", + "姹夐槾鍘�", + "姹ゅ師鍘�", + "鎷卞鍖�", + "鍙版咕鐪�", + "棣欏潑鍖�", + "娴峰師鍘�", + "涓滃疂鍖�", + "閬撳鍖�", + "閭甸槼甯�", + "绾㈠師鍘�", + "闈掑窞甯�", + "鏈邯甯�", + "浜戦緳鍘�", + "閫氭捣鍘�", + "骞虫硥鍘�", + "鐮氬北鍘�", + "瀹氭捣鍖�", + "鍙屾祦鍘�", + "鏂板畞鍘�", + "闈掑師鍖�", + "瀹夋簮鍖�", + "閾佸姏甯�", + "濠烘簮鍘�", + "鍗楀紑鍖�", + "鐭抽甯�", + "瀹氳鍘�", + "鍗ч緳鍖�", + "涔惧幙", + "鐩橀敠甯�", + "鏄熷瓙鍘�", + "闆峰北鍘�", + "鏄嗛兘浠戝尯", + "瀵熷搱灏斿彸缈煎墠鏃�", + "鏈斿煄鍖�", + "浜ゅ彛鍘�", + "鏁呭煄鍘�", + "鑺掑悍鍘�", + "涔冲北甯�", + "鏄屽浘鍘�", + "缈佹簮鍘�", + "涓存鍘�", + "涓嬭姳鍥尯", + "澶╁畞鍖�", + "寰楄崳鍘�", + "杈惧潅鍩庡尯", + "瑗垮競鍖�", + "闈掍簯璋卞尯", + "瀹濋浮甯�", + "娴欐睙鐪�", + "鍏村寲甯�", + "妗冨北鍖�", + "灞邯鍖�", + "寤跺畨甯�", + "鎬濆崡鍘�", + "鍗撹祫鍘�", + "闃冲煄鍘�", + "浣涘北甯�", + "鍛煎叞鍖�", + "绾㈠矖鍖�", + "鍑ゅ嚢鍘�", + "鍐曞畞鍘�", + "濡傜殝甯�", + "娣崡甯�", + "閮惧煄鍖�", + "澶櫧鍘�", + "鐢樺崡鍘�", + "纾愮煶甯�", + "涓滄腐鍖�", + "娌欐咕鍘�", + "浜戦緳鍖�", + "鍗楀競鍖�", + "闈栧畤鍘�", + "娓╂睙鍖�", + "鍏嬩笢鍘�", + "纰屾洸鍘�", + "涓珯鍖�", + "閲戞槍甯�", + "闆堕櫟鍖�", + "澶忓幙", + "杩愬煄甯�", + "寮�鍖栧幙", + "楗跺钩鍘�", + "浜斿父甯�", + "鐏炴ˉ鍖�", + "钀濆寳鍘�", + "閲戝畨鍖�", + "骞抽倯鍘�", + "浜戝崡鐪�", + "灞遍槼鍘�", + "钃邯鍘�", + "娴锋灄甯�", + "鐏靛窛鍘�", + "澶ц鍖�", + "姹夊崡鍖�", + "鏄傛槀婧尯", + "瀹夊鍘�", + "鐖辨皯鍖�", + "鏉惧北鍖�", + "姝﹂殕鍘�", + "涓存腑鍖�", + "娓呮锭鍘�", + "灞遍槾鍘�", + "宕囦粊鍘�", + "婧嗘郸鍘�", + "骞冲師鍘�", + "澶у簡甯�", + "涓崼甯�", + "浼婂惥鍘�", + "涓滃叴鍖�", + "涓滃叞鍘�", + "鍋冨笀甯�", + "榧撴ゼ鍖�", + "瀹夊眳鍖�", + "瑗垮畞甯�", + "鏅畨鍘�", + "淇濆悍鍘�", + "鍗椾腹鍘�", + "鎬�杩滃幙", + "瑗垮嘲鍖�", + "浜掑姪鍦熸棌鑷不鍘�", + "涓冮噷娌冲尯", + "娌傚崡鍘�", + "寤烘按鍘�", + "棰嶄笢鍖�", + "娉㈠瘑鍘�", + "娣勫崥甯�", + "涓寸寳鍘�", + "钑夊箔鍘�", + "鍛煎拰娴╃壒甯�", + "杈介槼甯�", + "杈藉畞鐪�", + "娌傛按鍘�", + "澶у煍鍘�", + "娣寳甯�", + "鑾卞窞甯�", + "鐭虫鍘�", + "瀛熸触鍘�", + "涔岃嫃甯�", + "鏅嬪煄甯�", + "杈炬媺鐗规棗", + "鐢樿胺鍘�", + "濞佸幙", + "鍙板効搴勫尯", + "鏀垮拰鍘�", + "鍙ゆ氮鍘�", + "楂橀偖甯�", + "姒曟睙鍘�", + "鑰掗槼甯�", + "鍗楀哺鍖�", + "闃垮厠鑻忓競", + "骞抽槾鍘�", + "鑺﹀北鍘�", + "鑾姏杈剧摝杈炬枴灏旀棌鑷不鏃�", + "涓婇ザ鍘�", + "涓磋タ鍘�", + "娴锋洐鍖�", + "渚┈甯�", + "楂橀槼鍘�", + "鐩愭触鍘�", + "闈栬竟鍘�", + "闂佃鍖�", + "楗堕槼鍘�", + "鏂颁箰甯�", + "娴峰叴鍘�", + "鐣鍖�", + "灏ゆ邯鍘�", + "鐭虫渤瀛愬競", + "椴佸北鍘�", + "寮�骞冲競", + "澶у煄鍘�", + "骞抽槼鍘�", + "鍚村牎鍘�", + "宀虫睜鍘�", + "閯杽鍘�", + "涔愰兘鍘�", + "閲戝窛鍘�", + "姝欏幙", + "鏃ュ湡鍘�", + "鏂扮敯鍘�", + "瑁曟皯鍘�", + "娌宠タ鍖�", + "鏂扮粵鍘�", + "娴峰崡鐪�", + "涔屽叞瀵熷竷甯�", + "涓滃煄鍖�", + "宕囨槑鍘�", + "搴撲鸡鏃�", + "娴北鍘�", + "瀹佹幢鍝堝凹鏃忓綕鏃忚嚜娌诲幙", + "娣囧幙", + "楣ゅ北甯�", + "缁ユ睙鍘�", + "缁垮洯鍖�", + "娑煄鍖�", + "绉戝皵娌佸乏缈间腑鏃�", + "瀹濅赴鍘�", + "閮幙", + "濂囧彴鍘�", + "涔屼紛宀尯", + "杈版邯鍘�", + "鍥炬湪鑸掑厠甯�", + "鏂伴儜甯�", + "榫欎涵鍖�", + "閲戝窞鍖�", + "鑺︽窞鍖�", + "鏂瑰北鍘�", + "澶у叴瀹夊箔鍦板尯", + "灏栧北鍖�", + "鏌炴按鍘�", + "甯稿畞甯�", + "闀囪繙鍘�", + "鏅幢甯�", + "閲戝窛鍖�", + "鐪佺洿杈栧幙绾ц鏀垮尯鍒�", + "閲戝嚖鍖�", + "闂芥竻鍘�", + "杩涜搐鍘�", + "榄忛兘鍖�", + "楹绘睙鍘�", + "琛㈠窞甯�", + "鍩庤タ鍖�", + "娌呴櫟鍘�", + "宕囧乏甯�", + "鐏靛疂甯�", + "濞勭儲鍘�", + "鏇叉澗鍘�", + "妗愪埂甯�", + "纾村彛鍘�", + "涓瑰反鍘�", + "涓存汲鍘�", + "鑺遍兘鍖�", + "閲戝鍘�", + "瑗垮畨甯�", + "浠讳笜甯�", + "寤跺悏甯�", + "娣卞窞甯�", + "涔夐┈甯�", + "宕囦俊鍘�", + "鍫嗛緳寰峰簡鍘�", + "甯傚寳鍖�", + "鍚夊幙", + "婊﹀崡鍘�", + "闆佸北鍖�", + "鏈濋槼鍘�", + "鍗楅儜鍘�", + "楂樼搴楀競", + "姘稿勾鍘�", + "涓村煄鍘�", + "鎯犲啘鍖�", + "鐩愬煄甯�", + "姊呴噷鏂揪鏂″皵鏃忓尯", + "搴峰畾鍘�", + "鐗ч噹鍖�", + "搴愭睙鍘�", + "閭㈠彴甯�", + "鍑嗘牸灏旀棗", + "楂橀潚鍘�", + "闈掗摐宄″競", + "榛旇タ鍗楀竷渚濇棌鑻楁棌鑷不宸�", + "闃充笢鍘�", + "鏁︾厡甯�", + "閫氭渤鍘�", + "姘告槍鍘�", + "姹濆煄鍘�", + "鏃ュ杸鍒欏競", + "闃宠胺鍘�", + "姘稿窞甯�", + "鍗板彴鍖�", + "闈掓渤鍘�", + "纾愬畨鍘�", + "杩庢辰鍖�", + "鐖辫緣鍖�", + "棰嶄笂鍘�", + "鍗楀渤鍖�", + "鏇叉睙鍖�", + "鍝嶆按鍘�", + "闄堝反灏旇檸鏃�", + "姹熸簮鍖�", + "鍨睙鍘�", + "妗傛灄甯�", + "鑽斿煄鍖�", + "椴ゅ煄鍖�", + "鏋為槼鍘�", + "鏈濋槼鍖�", + "鐫㈠畞鍘�", + "鍜岄潤鍘�", + "涓板崡鍖�", + "闉嶅北甯�", + "涓婃灄鍘�", + "鑲冨窞鍖�", + "澶у畨甯�", + "姝h摑鏃�", + "鏇瑰幙", + "鍚夊埄鍖�", + "瀹藉煄婊℃棌鑷不鍘�", + "婢у幙", + "姝﹀畞鍘�", + "娉夋腐鍖�", + "鏍惧煄鍘�", + "鍗楀窛鍖�", + "鐢樿們鐪�", + "瀹佸鍥炴棌鑷不鍖�", + "娓呭師婊℃棌鑷不鍘�", + "鑽e幙", + "闅板幙", + "鑻忓凹鐗瑰彸鏃�", + "姒嗙ぞ鍘�", + "瀵屽畞鍘�", + "娴戞簮鍘�", + "寤哄钩鍘�", + "娲涘崡鍘�", + "杈惧瓬鍘�", + "鍐�宸炲競", + "鍖楅晣甯�", + "鏂版床鍖�", + "棰濇晱鍘�", + "鍏板潽鐧芥棌鏅背鏃忚嚜娌诲幙", + "寤跺窛鍘�", + "椹垮煄鍖�", + "鍜稿畨鍖�", + "鏅嬪畞鍘�", + "鍗庡畨鍘�", + "鐚幙", + "姘稿钩鍘�", + "寰烽挦鍘�", + "瀹氬叴鍘�", + "妗﹀窛鍘�", + "娼炲煄甯�", + "缈斿畨鍖�", + "娓╁窞甯�", + "鍖楄景鍖�", + "涓滀附鍖�", + "璧勯槼甯�", + "浜斿鍘�", + "婧愭眹鍖�", + "婀樹埂甯�", + "鏅畾鍘�", + "搴嗗厓鍘�", + "浜斿娓犲競", + "鍏翠粊鍘�", + "澶钩鍖�", + "鍛堣础鍖�", + "鐏靛鍘�", + "瀵荤敻鍥炴棌褰濇棌鑷不鍘�", + "闄堜粨鍖�", + "绂荤煶鍖�", + "鍙や氦甯�", + "瀹垮窞甯�", + "娲ュ競甯�", + "涓村鍥炴棌鑷不宸�", + "涓嬪煄鍖�", + "鍙屽嘲鍘�", + "娌挎渤鍦熷鏃忚嚜娌诲幙", + "绌嗘1甯�", + "澶╅晣鍘�", + "浼婃槬甯�", + "椤哄痉鍖�", + "鍗楅儕鍖�", + "姝﹂櫟鍖�", + "鎻タ鍘�", + "榫欏彛甯�", + "娓呭煄鍖�", + "宸撮煶閮钂欏彜鑷不宸�", + "宸翠笢鍘�", + "鐞嗗鍘�", + "鍙ょ敯鍘�", + "缇庡叞鍖�", + "澶╅棬甯�", + "鍙岃窘甯�", + "鏁栨眽鏃�", + "绫充笢鍖�", + "澶ц嫳鍘�", + "瑗垮场鍘�", + "姹濆崡鍘�", + "妯婂煄鍖�", + "鐩愬北鍘�", + "鏈涜姳鍖�", + "鍒╂触鍘�", + "蹇椾腹鍘�", + "鎴愬畨鍘�", + "婀栧崡鐪�", + "骞抽檰鍘�", + "寮�鍘�", + "澶ч倯鍘�", + "褰窞甯�", + "鎵垮痉鍘�", + "娑熸簮甯�", + "浣冲幙", + "寤洪偤鍖�", + "铓屽煚甯�", + "娌堝寳鏂板尯", + "鏂颁綑甯�", + "鎭╁钩甯�", + "渚濆畨鍘�", + "瀹滀赴鍘�", + "瀹氬崡鍘�", + "鐢樻礇鍘�", + "鍏叕灞卞尯", + "闃滃悍甯�", + "灞忚竟鑻楁棌鑷不鍘�", + "杩炲窞甯�", + "澶ф浮鍙e尯", + "绾㈡ˉ鍖�", + "闆呭畨甯�", + "椹北鍘�", + "瀹滃窛鍘�", + "鍚夊畨甯�", + "鍙跺煄鍘�", + "灏肩帥鍘�", + "鏂版触鍘�", + "浜戞诞甯�", + "瀹夋邯鍘�", + "鍞愬幙", + "寰峰寲鍘�", + "璧ゆ按甯�", + "涓滄箹鍖�", + "鏂板缓鍘�", + "妤氶泟甯�", + "杩愭渤鍖�", + "浼婂畞甯�", + "鍗庡畞鍘�", + "闃垮嫆娉板競", + "浼氭槍鍘�", + "绾㈠北鍖�", + "婊戝幙", + "绫讳箤榻愬幙", + "鍗氬皵濉旀媺钂欏彜鑷不宸�", + "闅嗗痉鍘�", + "闃庤壇鍖�", + "鍖楁箹鍖�", + "鍘熷窞鍖�", + "鏃ュ杸鍒欏湴鍖�", + "閭兏甯�", + "鍗椾赴鍘�", + "涓滀赴鍘�", + "瀹佸己鍘�", + "鍏冩皬鍘�", + "姝﹂福鍘�", + "浠佸鍘�", + "鍚屽畨鍖�", + "闄靛窛鍘�", + "娉鹃槼鍘�", + "浜ゅ煄鍘�", + "闈栧窞鑻楁棌渚楁棌鑷不鍘�", + "鐧藉鍖�", + "妗戞鍘�", + "鍖栧痉鍘�", + "闈掑唸鍘�", + "缁囬噾鍘�", + "瑗跨暣鍘�", + "鐧戒簯閯傚崥鐭垮尯", + "鍚夋灄甯�", + "鎷夎惃甯�", + "浠欏眳鍘�", + "纰戞灄鍖�", + "棰濆皵鍙ょ撼甯�", + "钀ㄥ槑鍘�", + "绉綊鍘�", + "鏌忎埂鍘�", + "寮撻暱宀尯", + "涓存鍘�", + "缈佺墰鐗规棗", + "璺寳鍖�", + "寤洪槼甯�", + "浜曠爺鍘�", + "鎱堟邯甯�", + "澶х悊鐧芥棌鑷不宸�", + "鏉ㄦ郸鍖�", + "鑿忔辰甯�", + "榫欓噷鍘�", + "鍥哄鍘�", + "灞忓崡鍘�", + "鏉滃皵浼壒钂欏彜鏃忚嚜娌诲幙", + "娌у窞甯�", + "闃虫槬甯�", + "鍣跺皵鍘�", + "涓樺寳鍘�", + "鐗′腹姹熷競", + "缃楀北鍘�", + "閮戝窞甯�", + "鑺辨邯鍖�", + "姊佸钩鍘�", + "鍚戦槼鍖�", + "鍟嗘按鍘�", + "鐜勬鍖�", + "鎷涜繙甯�", + "娼崡鍖�" ]; } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/address/ShopAddressBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/address/ShopAddressBatch.groovy index bfa8c72b3..c36a33930 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/address/ShopAddressBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/address/ShopAddressBatch.groovy @@ -21,7 +21,7 @@ class ShopAddressBatch { def run(){ - def data = readExcel("E:\\数据导出\\商铺\\201412.xlsx"); + def data = readExcel("E:\\鏁版嵁瀵煎嚭\\鍟嗛摵\\201412.xlsx"); data = getLatLng(data); saveData(data,"2014-12"); } @@ -30,7 +30,7 @@ class ShopAddressBatch { for(def row : data){ DBObject obj = new BasicDBObject() - obj.city = "上海"; + obj.city = "涓婃捣"; obj.region = row[0]; obj.block = row[1]; obj.name = row[2]; @@ -81,17 +81,17 @@ class ShopAddressBatch { def rowCount = workbook.getSheetAt(0).getLastRowNum(); def sheet1=workbook.getSheetAt(0); def rett = []; - //循环行 + //寰幆琛� sheet1.eachWithIndex {row, index-> if(index>0){ - def cells = row.physicalNumberOfCells;//取得列数 + def cells = row.physicalNumberOfCells;//鍙栧緱鍒楁暟 if(cells>1){ def ret = []; for(def i=0;i<10;i++){ def value = row.getCell(i); def name = value.toString(); - if(name.indexOf("E")!=-1&&!name.contains("路")){ + if(name.indexOf("E")!=-1&&!name.contains("璺�")){ BigDecimal db = new BigDecimal(name); name = db.toPlainString()+".0" } @@ -135,7 +135,7 @@ class ShopAddressBatch { for(def row : data){ def address = row[3]; - def map = getLonLngV2("上海市"+address); + def map = getLonLngV2("涓婃捣甯�"+address); if(map){ row << map.lat @@ -175,7 +175,7 @@ class ShopAddressBatch { conn.setRequestMethod("GET"); conn.doOutput = true inputStream = conn.getInputStream(); - BufferedReader buf = new BufferedReader(new InputStreamReader(inputStream,"UTF-8"));// 创建UTF-8的BufferedReader + BufferedReader buf = new BufferedReader(new InputStreamReader(inputStream,"UTF-8"));// 鍒涘缓UTF-8鐨凚ufferedReader while((line = buf.readLine())!=null){ sb.append(line); } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/address/SymbolRemoveHandler.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/address/SymbolRemoveHandler.groovy index ffcca25f7..5740c7875 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/address/SymbolRemoveHandler.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/address/SymbolRemoveHandler.groovy @@ -4,14 +4,14 @@ class SymbolRemoveHandler extends AddressStandardizeHandler { - String[] SYMBOLS = ["...", "?", ",", ".", ",", "。", ";", "-", "?"]; + String[] SYMBOLS = ["...", "锛�", ",", ".", "锛�", "銆�", ";", "-", "?"]; @Override public void handleRequest(Request request) { try{ request.setAddress(removeEllipsis(request.getAddress())); }catch(Exception e){ - println "SymbolRemoveHandler: " + request.getAddress()+" 处理失败,message:"+e.getMessage(); + println "SymbolRemoveHandler: " + request.getAddress()+" 澶勭悊澶辫触,message:"+e.getMessage(); } } @@ -33,6 +33,6 @@ class SymbolRemoveHandler extends AddressStandardizeHandler { } public static void main(String[] arhs){ - print new SymbolRemoveHandler().removeEllipsis("...?ssss........?,,"); + print new SymbolRemoveHandler().removeEllipsis("...?ssss........锛�,锛�"); } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/address/Test.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/address/Test.groovy index bf3cc730d..f5513c794 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/address/Test.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/address/Test.groovy @@ -8,14 +8,14 @@ import com.fangjia.core.util.DateUtil; class Test { - private static final Pattern shihaoPattern = Pattern.compile("(\\w+)[幢|栋|号楼|号|单元|楼|座](\\w+||\\d{3,4})室?"); + private static final Pattern shihaoPattern = Pattern.compile("(\\w+)[骞鏍媩鍙锋ゼ|鍙穦鍗曞厓|妤紎搴(\\w+||\\d{3,4})瀹�?"); static main(args) { -// println CosineSimilarAlgorithm.getSimilarity("沪太路1700弄","沪太路1700弄小区") -// println CosineSimilarAlgorithm.getSimilarity("沪太路1700弄","沪太路631弄", ) -// println CosineSimilarAlgorithm.getSimilarity("沪太路1700弄","沪太路951号") -// println CosineSimilarAlgorithm.getSimilarity("证大立方大厦","富庆国定大厦") -// println CosineSimilarAlgorithm.getSimilarity("紫光大厦","元福大厦") +// println CosineSimilarAlgorithm.getSimilarity("娌お璺�1700寮�","娌お璺�1700寮勫皬鍖�") +// println CosineSimilarAlgorithm.getSimilarity("娌お璺�1700寮�","娌お璺�631寮�", ) +// println CosineSimilarAlgorithm.getSimilarity("娌お璺�1700寮�","娌お璺�951鍙�") +// println CosineSimilarAlgorithm.getSimilarity("璇佸ぇ绔嬫柟澶у帵","瀵屽簡鍥藉畾澶у帵") +// println CosineSimilarAlgorithm.getSimilarity("绱厜澶у帵","鍏冪澶у帵") // def month = 360; @@ -26,12 +26,12 @@ class Test { // println getPayMonth1(9360000, month, rate, 0.5); // println getPayMonth1(9360000, month, rate, 0.6); -// def map = parseLouDouInfo("新泾三村A栋1501"); +// def map = parseLouDouInfo("鏂版尘涓夋潙A鏍�1501"); // println map - def obj = "发布时间:2016/4/9" - obj = obj.substring(obj.indexOf("发布时间")); - obj = obj.replace("发布时间:", "").replace("发布时间", "").replace("发布", "").replace("/","-") + def obj = "鍙戝竷鏃堕棿锛�2016/4/9" + obj = obj.substring(obj.indexOf("鍙戝竷鏃堕棿")); + obj = obj.replace("鍙戝竷鏃堕棿锛�", "").replace("鍙戝竷鏃堕棿", "").replace("鍙戝竷", "").replace("/","-") def pattern = ~/\d{4}-\d{1,2}-\d{1,2}/ def matcher = pattern.matcher(obj) if (matcher.find()) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/address/YongjiaDataTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/address/YongjiaDataTest.groovy index d6d0e6b01..8297c7d09 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/address/YongjiaDataTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/address/YongjiaDataTest.groovy @@ -31,20 +31,20 @@ class YongjiaDataTest { static main(args) { def task = new YongjiaDataTest() - task.batchTestApi("上海", "C:\\Users\\yk\\Desktop\\yongjia\\上海-0730.txt") + task.batchTestApi("涓婃捣", "C:\\Users\\yk\\Desktop\\yongjia\\涓婃捣-0730.txt") } def batchTestApi(def city, def fileName){ def result = [] def index = 0 - File file = new File("C:\\Users\\yk\\Desktop\\yongjia\\上海-0730.csv") + File file = new File("C:\\Users\\yk\\Desktop\\yongjia\\涓婃捣-0730.csv") if (file.exists()){ file.delete(); } - file.append("房产地址,") - file.append("标准化-楼盘,") - file.append("楼盘单价,") + file.append("鎴夸骇鍦板潃,") + file.append("鏍囧噯鍖�-妤肩洏,") + file.append("妤肩洏鍗曚环,") file.append(System.getProperty("line.separator")); BufferedReader reader = new File(fileName).newReader('utf-8') @@ -90,7 +90,7 @@ class YongjiaDataTest { m.avgPrice = CommonDatautils.queryDistrictPrice(m.city, m.region, m.name, weekend, m.cat); } - //房价网估价 + //鎴夸环缃戜及浠� // m.fangjiaTotalPrice = evaluation(m, token); // if(!m.fangjiaTotalPrice && m.avgPrice){ // m.fangjiaTotalPrice = (m.avgPrice * m.area).toInteger(); @@ -98,7 +98,7 @@ class YongjiaDataTest { //m.rentPrice = queryRentPriceRange(m.city, m.region, m.name, lastMonth); - //其它网站均价 + //鍏跺畠缃戠珯鍧囦环 // def otherWebsiteMap = CommonDatautils.queryOtherWebsitePrice(m.city, m.name); // m.sunfunPrice = otherWebsiteMap.price_soufun // m.anjukePrice = otherWebsiteMap.price_anjuke @@ -137,7 +137,7 @@ class YongjiaDataTest { } - //println "周边均价:" + totalPrice +"【${url_str}】" + //println "鍛ㄨ竟鍧囦环锛�" + totalPrice +"銆�${url_str}銆�" return totalPrice; } @@ -153,7 +153,7 @@ class YongjiaDataTest { conn.setRequestMethod("GET"); conn.doOutput = true inputStream = conn.getInputStream(); - BufferedReader buf = new BufferedReader(new InputStreamReader(inputStream,"UTF-8"));// 创建UTF-8的BufferedReader + BufferedReader buf = new BufferedReader(new InputStreamReader(inputStream,"UTF-8"));// 鍒涘缓UTF-8鐨凚ufferedReader while((line = buf.readLine())!=null){ sb.append(line); } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/agent/HouseLoudongAna.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/agent/HouseLoudongAna.groovy index 20202c3a0..d4ebc8fe8 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/agent/HouseLoudongAna.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/agent/HouseLoudongAna.groovy @@ -29,7 +29,7 @@ class HouseLoudongAnaBatch extends BaseBatch { } /** - * 从楼栋表分析出小区楼号、室号信息 + * 浠庢ゼ鏍嬭〃鍒嗘瀽鍑哄皬鍖烘ゼ鍙枫�佸鍙蜂俊鎭� */ private anaHouseLoudong() { def index = 0; @@ -44,7 +44,7 @@ class HouseLoudongAnaBatch extends BaseBatch { query.put('region', house.region); query.put('name', house.name); - // 处理小区内楼号 + // 澶勭悊灏忓尯鍐呮ゼ鍙� DBObject districtHouse = DB_2.findOne(query); if (districtHouse) { BasicDBList houseNums = districtHouse.house_nums; @@ -73,7 +73,7 @@ class HouseLoudongAnaBatch extends BaseBatch { DB_2.save(obj); } - // 处理同一楼号内的室号 + // 澶勭悊鍚屼竴妤煎彿鍐呯殑瀹ゅ彿 query.put('house_num', houseNumStr); DBObject houseRoom = DB_3.findOne(query); if (houseRoom) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/agent/SortDistrictPics.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/agent/SortDistrictPics.groovy index 1b60ff181..1a822ef5e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/agent/SortDistrictPics.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/agent/SortDistrictPics.groovy @@ -23,211 +23,211 @@ class SortDistrictPics { def final static DEL_HEIGHT = 82 static main(args) { -// process('shop', '上海') - process('office', '上海') +// process('shop', '涓婃捣') + process('office', '涓婃捣') -// process('district', '上海') -// process('district', '北京') -// process('district', '广州') -// process('district', '深圳') -// process('district', '贵阳') -// process('district', '乌鲁木齐') -// process('district', '泰州') -// process('district', '江门') -// process('district', '秦皇岛') -// process('district', '温州') -// process('district', '台州') -// process('district', '大庆') -// process('district', '无锡') -// process('district', '清远') -// process('district', '珠海') -// process('district', '兰州') -// process('district', '佛山') -// process('district', '柳州') -// process('district', '西安') -// process('district', '湛江') -// process('district', '镇江') -// process('district', '武汉') -// process('district', '湖州') -// process('district', '南通') -// process('district', '赣州') -// process('district', '丹东') -// process('district', '咸阳') -// process('district', '丽江') -// process('district', '张家界') -// process('district', '银川') -// process('district', '大理') -// process('district', '宿迁') -// process('district', '襄阳') -// process('district', '唐山') -// process('district', '大连') -// process('district', '芜湖') -// process('district', '马鞍山') -// process('district', '惠州') -// process('district', '玉林') -// process('district', '潍坊') -// process('district', '南昌') -// process('district', '哈尔滨') -// process('district', '连云港') -// process('district', '太原') -// process('district', '延安') -// process('district', '宁波') -// process('district', '九江') -// process('district', '三亚') -// process('district', '南京') -// process('district', '海口') -// process('district', '济南') -// process('district', '宜昌') -// process('district', '烟台') -// process('district', '东莞') -// process('district', '天津') -// process('district', '常州') -// process('district', '威海') -// process('district', '六盘水') -// process('district', '沈阳') -// process('district', '吉林') -// process('district', '徐州') -// process('district', '鞍山') -// process('district', '保定') -// process('district', '宜宾') -// process('district', '莆田') -// process('district', '金华') -// process('district', '西宁') -// process('district', '郑州') -// process('district', '盐城') -// process('district', '自贡') -// process('district', '石家庄') -// process('district', '绍兴') -// process('district', '昆明') -// process('district', '淄博') -// process('district', '攀枝花') -// process('district', '南宁') -// process('district', '衢州') -// process('district', '扬州') -// process('district', '泉州') -// process('district', '长春') -// process('district', '苏州') -// process('district', '邯郸') -// process('district', '北海') -// process('district', '合肥') -// process('district', '青岛') -// process('district', '廊坊') -// process('district', '洛阳') -// process('district', '呼和浩特') -// process('district', '嘉兴') -// process('district', '中山') -// process('district', '桂林') -// process('district', '长沙') -// process('district', '株洲') -// process('district', '湘潭') -// process('district', '成都') -// process('district', '重庆') -// process('district', '杭州') -// process('district', '厦门') -// process('district', '福州') -// process('district', '绵阳') +// process('district', '涓婃捣') +// process('district', '鍖椾含') +// process('district', '骞垮窞') +// process('district', '娣卞湷') +// process('district', '璐甸槼') +// process('district', '涔岄瞾鏈ㄩ綈') +// process('district', '娉板窞') +// process('district', '姹熼棬') +// process('district', '绉︾殗宀�') +// process('district', '娓╁窞') +// process('district', '鍙板窞') +// process('district', '澶у簡') +// process('district', '鏃犻敗') +// process('district', '娓呰繙') +// process('district', '鐝犳捣') +// process('district', '鍏板窞') +// process('district', '浣涘北') +// process('district', '鏌冲窞') +// process('district', '瑗垮畨') +// process('district', '婀涙睙') +// process('district', '闀囨睙') +// process('district', '姝︽眽') +// process('district', '婀栧窞') +// process('district', '鍗楅��') +// process('district', '璧e窞') +// process('district', '涓逛笢') +// process('district', '鍜搁槼') +// process('district', '涓芥睙') +// process('district', '寮犲鐣�') +// process('district', '閾跺窛') +// process('district', '澶х悊') +// process('district', '瀹胯縼') +// process('district', '瑗勯槼') +// process('district', '鍞愬北') +// process('district', '澶ц繛') +// process('district', '鑺滄箹') +// process('district', '椹瀺灞�') +// process('district', '鎯犲窞') +// process('district', '鐜夋灄') +// process('district', '娼嶅潑') +// process('district', '鍗楁槍') +// process('district', '鍝堝皵婊�') +// process('district', '杩炰簯娓�') +// process('district', '澶師') +// process('district', '寤跺畨') +// process('district', '瀹佹尝') +// process('district', '涔濇睙') +// process('district', '涓変簹') +// process('district', '鍗椾含') +// process('district', '娴峰彛') +// process('district', '娴庡崡') +// process('district', '瀹滄槍') +// process('district', '鐑熷彴') +// process('district', '涓滆帪') +// process('district', '澶╂触') +// process('district', '甯稿窞') +// process('district', '濞佹捣') +// process('district', '鍏洏姘�') +// process('district', '娌堥槼') +// process('district', '鍚夋灄') +// process('district', '寰愬窞') +// process('district', '闉嶅北') +// process('district', '淇濆畾') +// process('district', '瀹滃') +// process('district', '鑾嗙敯') +// process('district', '閲戝崕') +// process('district', '瑗垮畞') +// process('district', '閮戝窞') +// process('district', '鐩愬煄') +// process('district', '鑷础') +// process('district', '鐭冲搴�') +// process('district', '缁嶅叴') +// process('district', '鏄嗘槑') +// process('district', '娣勫崥') +// process('district', '鏀�鏋濊姳') +// process('district', '鍗楀畞') +// process('district', '琛㈠窞') +// process('district', '鎵窞') +// process('district', '娉夊窞') +// process('district', '闀挎槬') +// process('district', '鑻忓窞') +// process('district', '閭兏') +// process('district', '鍖楁捣') +// process('district', '鍚堣偉') +// process('district', '闈掑矝') +// process('district', '寤婂潑') +// process('district', '娲涢槼') +// process('district', '鍛煎拰娴╃壒') +// process('district', '鍢夊叴') +// process('district', '涓北') +// process('district', '妗傛灄') +// process('district', '闀挎矙') +// process('district', '鏍床') +// process('district', '婀樻江') +// process('district', '鎴愰兘') +// process('district', '閲嶅簡') +// process('district', '鏉窞') +// process('district', '鍘﹂棬') +// process('district', '绂忓窞') +// process('district', '缁甸槼') // // -// process('new_district', '上海') -// process('new_district', '北京') -// process('new_district', '广州') -// process('new_district', '深圳') -// process('new_district', '贵阳') -// process('new_district', '乌鲁木齐') -// process('new_district', '泰州') -// process('new_district', '江门') -// process('new_district', '秦皇岛') -// process('new_district', '温州') -// process('new_district', '台州') -// process('new_district', '大庆') -// process('new_district', '无锡') -// process('new_district', '清远') -// process('new_district', '珠海') -// process('new_district', '兰州') -// process('new_district', '佛山') -// process('new_district', '柳州') -// process('new_district', '西安') -// process('new_district', '湛江') -// process('new_district', '镇江') -// process('new_district', '武汉') -// process('new_district', '湖州') -// process('new_district', '南通') -// process('new_district', '赣州') -// process('new_district', '丹东') -// process('new_district', '咸阳') -// process('new_district', '丽江') -// process('new_district', '张家界') -// process('new_district', '银川') -// process('new_district', '大理') -// process('new_district', '宿迁') -// process('new_district', '襄阳') -// process('new_district', '唐山') -// process('new_district', '大连') -// process('new_district', '芜湖') -// process('new_district', '马鞍山') -// process('new_district', '惠州') -// process('new_district', '玉林') -// process('new_district', '潍坊') -// process('new_district', '南昌') -// process('new_district', '哈尔滨') -// process('new_district', '连云港') -// process('new_district', '太原') -// process('new_district', '延安') -// process('new_district', '宁波') -// process('new_district', '九江') -// process('new_district', '三亚') -// process('new_district', '南京') -// process('new_district', '海口') -// process('new_district', '济南') -// process('new_district', '宜昌') -// process('new_district', '烟台') -// process('new_district', '东莞') -// process('new_district', '天津') -// process('new_district', '常州') -// process('new_district', '威海') -// process('new_district', '六盘水') -// process('new_district', '沈阳') -// process('new_district', '吉林') -// process('new_district', '徐州') -// process('new_district', '鞍山') -// process('new_district', '保定') -// process('new_district', '宜宾') -// process('new_district', '莆田') -// process('new_district', '金华') -// process('new_district', '西宁') -// process('new_district', '郑州') -// process('new_district', '盐城') -// process('new_district', '自贡') -// process('new_district', '石家庄') -// process('new_district', '绍兴') -// process('new_district', '昆明') -// process('new_district', '淄博') -// process('new_district', '攀枝花') -// process('new_district', '南宁') -// process('new_district', '衢州') -// process('new_district', '扬州') -// process('new_district', '泉州') -// process('new_district', '长春') -// process('new_district', '苏州') -// process('new_district', '邯郸') -// process('new_district', '北海') -// process('new_district', '合肥') -// process('new_district', '青岛') -// process('new_district', '廊坊') -// process('new_district', '洛阳') -// process('new_district', '呼和浩特') -// process('new_district', '嘉兴') -// process('new_district', '中山') -// process('new_district', '桂林') -// process('new_district', '长沙') -// process('new_district', '株洲') -// process('new_district', '湘潭') -// process('new_district', '成都') -// process('new_district', '重庆') -// process('new_district', '杭州') -// process('new_district', '厦门') -// process('new_district', '福州') -// process('new_district', '绵阳') +// process('new_district', '涓婃捣') +// process('new_district', '鍖椾含') +// process('new_district', '骞垮窞') +// process('new_district', '娣卞湷') +// process('new_district', '璐甸槼') +// process('new_district', '涔岄瞾鏈ㄩ綈') +// process('new_district', '娉板窞') +// process('new_district', '姹熼棬') +// process('new_district', '绉︾殗宀�') +// process('new_district', '娓╁窞') +// process('new_district', '鍙板窞') +// process('new_district', '澶у簡') +// process('new_district', '鏃犻敗') +// process('new_district', '娓呰繙') +// process('new_district', '鐝犳捣') +// process('new_district', '鍏板窞') +// process('new_district', '浣涘北') +// process('new_district', '鏌冲窞') +// process('new_district', '瑗垮畨') +// process('new_district', '婀涙睙') +// process('new_district', '闀囨睙') +// process('new_district', '姝︽眽') +// process('new_district', '婀栧窞') +// process('new_district', '鍗楅��') +// process('new_district', '璧e窞') +// process('new_district', '涓逛笢') +// process('new_district', '鍜搁槼') +// process('new_district', '涓芥睙') +// process('new_district', '寮犲鐣�') +// process('new_district', '閾跺窛') +// process('new_district', '澶х悊') +// process('new_district', '瀹胯縼') +// process('new_district', '瑗勯槼') +// process('new_district', '鍞愬北') +// process('new_district', '澶ц繛') +// process('new_district', '鑺滄箹') +// process('new_district', '椹瀺灞�') +// process('new_district', '鎯犲窞') +// process('new_district', '鐜夋灄') +// process('new_district', '娼嶅潑') +// process('new_district', '鍗楁槍') +// process('new_district', '鍝堝皵婊�') +// process('new_district', '杩炰簯娓�') +// process('new_district', '澶師') +// process('new_district', '寤跺畨') +// process('new_district', '瀹佹尝') +// process('new_district', '涔濇睙') +// process('new_district', '涓変簹') +// process('new_district', '鍗椾含') +// process('new_district', '娴峰彛') +// process('new_district', '娴庡崡') +// process('new_district', '瀹滄槍') +// process('new_district', '鐑熷彴') +// process('new_district', '涓滆帪') +// process('new_district', '澶╂触') +// process('new_district', '甯稿窞') +// process('new_district', '濞佹捣') +// process('new_district', '鍏洏姘�') +// process('new_district', '娌堥槼') +// process('new_district', '鍚夋灄') +// process('new_district', '寰愬窞') +// process('new_district', '闉嶅北') +// process('new_district', '淇濆畾') +// process('new_district', '瀹滃') +// process('new_district', '鑾嗙敯') +// process('new_district', '閲戝崕') +// process('new_district', '瑗垮畞') +// process('new_district', '閮戝窞') +// process('new_district', '鐩愬煄') +// process('new_district', '鑷础') +// process('new_district', '鐭冲搴�') +// process('new_district', '缁嶅叴') +// process('new_district', '鏄嗘槑') +// process('new_district', '娣勫崥') +// process('new_district', '鏀�鏋濊姳') +// process('new_district', '鍗楀畞') +// process('new_district', '琛㈠窞') +// process('new_district', '鎵窞') +// process('new_district', '娉夊窞') +// process('new_district', '闀挎槬') +// process('new_district', '鑻忓窞') +// process('new_district', '閭兏') +// process('new_district', '鍖楁捣') +// process('new_district', '鍚堣偉') +// process('new_district', '闈掑矝') +// process('new_district', '寤婂潑') +// process('new_district', '娲涢槼') +// process('new_district', '鍛煎拰娴╃壒') +// process('new_district', '鍢夊叴') +// process('new_district', '涓北') +// process('new_district', '妗傛灄') +// process('new_district', '闀挎矙') +// process('new_district', '鏍床') +// process('new_district', '婀樻江') +// process('new_district', '鎴愰兘') +// process('new_district', '閲嶅簡') +// process('new_district', '鏉窞') +// process('new_district', '鍘﹂棬') +// process('new_district', '绂忓窞') +// process('new_district', '缁甸槼') // def floors = ['http://img1.soufunimg.com/agents1/2011_05/23/17/53/94/sh/houseinfo/404243101600.jpg', @@ -423,7 +423,7 @@ class SortDistrictPics { DBObject query = new BasicDBObject('_id', district._id); DBObject data = new BasicDBObject(); - // 图片总数超过上限,则取top + // 鍥剧墖鎬绘暟瓒呰繃涓婇檺锛屽垯鍙杢op if (retFloors.size() + retOuts.size() > maxSize) { if (retFloors.size() > (maxSize / 2)) { data.put('floorplan_pics', getTop(retFloors, maxSize / 2)); @@ -433,7 +433,7 @@ class SortDistrictPics { data.put('out_pics', getTop(retOuts, maxSize - data.floorplan_pics.size())); } else { - // 没超过上限,全部保留 + // 娌¤秴杩囦笂闄愶紝鍏ㄩ儴淇濈暀 data.put('floorplan_pics', retFloors); data.put('out_pics', retOuts); } @@ -587,7 +587,7 @@ class SortDistrictPics { } /** - * 取得fs中不存在的图片URL + * 鍙栧緱fs涓笉瀛樺湪鐨勫浘鐗嘦RL */ static remove404Pics(picInfos) { def ret = []; @@ -603,7 +603,7 @@ class SortDistrictPics { static doSort(picInfos) { // Collections.sort(picInfos, new Comparator() { // public int compare(PicInfo info1, PicInfo info2) { -// // 图片不存在或者没正确读取信息,往后排 +// // 鍥剧墖涓嶅瓨鍦ㄦ垨鑰呮病姝g‘璇诲彇淇℃伅锛屽線鍚庢帓 // if (info1.is404 == true || info1.isEmpty == true || info1.isSmall == true) { // return 1; // } @@ -611,7 +611,7 @@ class SortDistrictPics { // return -1; // } // -// // 图片长宽比较大,往后排 +// // 鍥剧墖闀垮姣旇緝澶э紝寰�鍚庢帓 // if (info1.hdw < 0.5 || info1.hdw > 2) { // return 1; // } @@ -626,7 +626,7 @@ class SortDistrictPics { // }); picInfos.sort { info1, info2 -> - // 图片不存在或者没正确读取信息,往后排 + // 鍥剧墖涓嶅瓨鍦ㄦ垨鑰呮病姝g‘璇诲彇淇℃伅锛屽線鍚庢帓 if (info1.isF0f() || info1.isSmall()) { return 1; } @@ -634,7 +634,7 @@ class SortDistrictPics { return -1; } - // 图片长宽比较大,往后排 + // 鍥剧墖闀垮姣旇緝澶э紝寰�鍚庢帓 if (info1.getHdw() < 0.5 || info1.getHdw() > 2) { return 1; } @@ -663,7 +663,7 @@ class SortDistrictPics { } /** - * 房型图列表转换为string列表 + * 鎴垮瀷鍥惧垪琛ㄨ浆鎹负string鍒楄〃 * * @param srcs * @return @@ -709,19 +709,19 @@ class SortDistrictPics { // if(directories.hasNext()){ // Directory directory = (Directory) directories.next(); // -// // 如果 imageInfo中无法读取,从exif中读取dpi +// // 濡傛灉 imageInfo涓棤娉曡鍙栵紝浠巈xif涓鍙杁pi // if(imageInfo.getPhysicalWidthDpi() <= 0 || imageInfo.getPhysicalHeightDpi() <= 0){ // dipx = new BigDecimal(directory.getString(ExifDirectory.TAG_X_RESOLUTION)); // dipy = new BigDecimal(directory.getString(ExifDirectory.TAG_Y_RESOLUTION)); // if(dipx.equals(new BigDecimal(72)) || dipy.equals(new BigDecimal(72))) { -// // 如果dpi为72的话,抛出错误,因为暂时无法确定从exif中读出的数据是对的 +// // 濡傛灉dpi涓�72鐨勮瘽锛屾姏鍑洪敊璇紝鍥犱负鏆傛椂鏃犳硶纭畾浠巈xif涓鍑虹殑鏁版嵁鏄鐨� // } else{ // dipx = new BigDecimal(imageInfo.getPhysicalWidthDpi()); // dipy = new BigDecimal(imageInfo.getPhysicalHeightDpi()); // } // } // } -// } catch (Exception e) { // 处理出错 +// } catch (Exception e) { // 澶勭悊鍑洪敊 //// e.printStackTrace(); // } @@ -732,12 +732,12 @@ class SortDistrictPics { public static class PicInfo { private String imgUrl; - private int hxw; // 图片高度*宽度(像素) - private double hdw; // 图片高度÷宽度(像素) - private double dpi; // 图片DPI - private boolean f0f; // fs库中不存在 - private boolean small; // 是否小于120*82 - private boolean vertical; // 是否竖向图片 + private int hxw; // 鍥剧墖楂樺害*瀹藉害锛堝儚绱狅級 + private double hdw; // 鍥剧墖楂樺害梅瀹藉害锛堝儚绱狅級 + private double dpi; // 鍥剧墖DPI + private boolean f0f; // fs搴撲腑涓嶅瓨鍦� + private boolean small; // 鏄惁灏忎簬120*82 + private boolean vertical; // 鏄惁绔栧悜鍥剧墖 public double score; public String getImgUrl() { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/AnalyDistrictLog.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/AnalyDistrictLog.groovy index 03f0dd420..93df4c352 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/AnalyDistrictLog.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/AnalyDistrictLog.groovy @@ -30,8 +30,8 @@ import java.util.concurrent.atomic.AtomicInteger import java.util.regex.Pattern /** - * 对解析好的网页进行分析 - * 获取小区解析的网站数量 + * 瀵硅В鏋愬ソ鐨勭綉椤佃繘琛屽垎鏋� + * 鑾峰彇灏忓尯瑙f瀽鐨勭綉绔欐暟閲� * @author gaojuan * */ @@ -46,23 +46,23 @@ class AnalyDistrictLog extends BaseBatch { public static final DBCollection VERIFY_RULE_COLL = MongoUtils.getCollectionByName("coredata", "verify_rule", "coredata.mongo.db.fangjia.com") public static final DSCollection SEABIRD = new DataStore("datastore.db.fangjia.com").getCollection("fangjia.seabird") public static final DSCollection seawater = new DataStore("192.168.0.65", 27777).getCollection("fangjia.seawater") - /**人工删除*/ + /**浜哄伐鍒犻櫎*/ private static final int MANUAL_DELETE = 1; - /**区域错误删除*/ + /**鍖哄煙閿欒鍒犻櫎*/ private static final int REGION_ERROR_DELETE = 2; - /**别名关联删除*/ + /**鍒悕鍏宠仈鍒犻櫎*/ private static final int ALIAS_RELATE_DELETE = 3; - /**名称非法删除*/ + /**鍚嶇О闈炴硶鍒犻櫎*/ private static final int NAME_ILLEGAL_DELETE = 4; - /**通过百度API判定类型不合法删除*/ + /**閫氳繃鐧惧害API鍒ゅ畾绫诲瀷涓嶅悎娉曞垹闄�*/ private static final int BAIDU_JUDGE_DELETE = 5; - /**CPDB已经删除*/ + /**CPDB宸茬粡鍒犻櫎*/ private static final int CPDB_DELETE = 6; - /**正常数据*/ + /**姝e父鏁版嵁*/ private static final int NORMAL_DATA = 0; private static final int MACHINE_DETELE = 8 - /**数据抓取失败标示*/ + /**鏁版嵁鎶撳彇澶辫触鏍囩ず*/ private static final int ANALY_ROAD_STATUS_ERROR = 2; private Date now = new Date() private int THREE_MONTHS_AGO = DateUtil.add(now, Calendar.MONTH, -6).format("yyyyMMdd").toInteger() @@ -73,14 +73,14 @@ class AnalyDistrictLog extends BaseBatch { private static List districtUnContainsWords = [] - static List illegalDistirctNamePatterns = [Pattern.compile(".*地图定位.*"), Pattern.compile(".*地块.*"), Pattern.compile(".*售罄.*"), - Pattern.compile(".*-\$"), Pattern.compile(".*….*"), Pattern.compile(".*\\d#.*") - , /.*(东|南|西|北|一|二|三|四|五|正|前|后)+门.*/, /.*出售.*/, /.*(\d|一|二|三|四|五)号楼$/] + static List illegalDistirctNamePatterns = [Pattern.compile(".*鍦板浘瀹氫綅.*"), Pattern.compile(".*鍦板潡.*"), Pattern.compile(".*鍞絼.*"), + Pattern.compile(".*-\$"), Pattern.compile(".*鈥�.*"), Pattern.compile(".*\\d#.*") + , /.*(涓渱鍗梶瑗縷鍖梶涓�|浜寍涓墊鍥泑浜攟姝鍓峾鍚�)+闂�.*/, /.*鍑哄敭.*/, /.*(\d|涓�|浜寍涓墊鍥泑浜�)鍙锋ゼ$/] static main(args) { def s = System.currentTimeMillis() runBatch(new AnalyDistrictLog(), args) - println("运行时间:${(int) ((System.currentTimeMillis() - s)) / (1000 * 60)}分钟") + println("杩愯鏃堕棿:${(int) ((System.currentTimeMillis() - s)) / (1000 * 60)}鍒嗛挓") } @Override @@ -90,8 +90,8 @@ class AnalyDistrictLog extends BaseBatch { districtUnContainsWords << dbo.getString("value") } def allCity = CommonUtils.findAllCity() - if (SystemUtils.IS_OS_WINDOWS) {//本地手动跑特定城市数据 - allCity = ["南京"] + if (SystemUtils.IS_OS_WINDOWS) {//鏈湴鎵嬪姩璺戠壒瀹氬煄甯傛暟鎹� + allCity = ["鍗椾含"] }else{ updateTempData() } @@ -102,19 +102,19 @@ class AnalyDistrictLog extends BaseBatch { def index = 1; for (def city : allCity) { def s = System.currentTimeMillis() - println "[${index}]开始分析 ${city} ${new Date().format('yyyy/MM/dd HH:mm:ss')}" + println "[${index}]寮�濮嬪垎鏋� ${city} ${new Date().format('yyyy/MM/dd HH:mm:ss')}" for (def dataType : dataTypes) { process(city, dataType); -// if(allOfflineCity.contains(city) && dataType == "district"){//统计线下城市房源 +// if(allOfflineCity.contains(city) && dataType == "district"){//缁熻绾夸笅鍩庡競鎴挎簮 // calcHouseCount(city) // } } index++; - println "[${index}]分析结束 ${city} ${new Date().format('yyyy/MM/dd HH:mm:ss')} 耗时:${(int) ((System.currentTimeMillis() - s) / (1000 * 60))}分钟" + println "[${index}]鍒嗘瀽缁撴潫 ${city} ${new Date().format('yyyy/MM/dd HH:mm:ss')} 鑰楁椂:${(int) ((System.currentTimeMillis() - s) / (1000 * 60))}鍒嗛挓" } } - /*统计线下城市房源的数量*/ + /*缁熻绾夸笅鍩庡競鎴挎簮鐨勬暟閲�*/ def calcHouseCount(def city){ def startDate = DateUtil.add(new Date(), Calendar.MONTH, -6).format("yyyyMMdd").toInteger() @@ -132,10 +132,10 @@ class AnalyDistrictLog extends BaseBatch { long count = (long) seawater.count(houseQuery) ANALY_SITE_COLL.update(new BasicDBObject("_id",dbo._id), new BasicDBObject('$set',new BasicDBObject('house_num',count))) if(idx % 100 == 0){ - println("${city}统计进度:${DataUtil.roundDouble((idx *100)/total,2)}%") + println("${city}缁熻杩涘害:${DataUtil.roundDouble((idx *100)/total,2)}%") } } - println("${city}分析结束") + println("${city}鍒嗘瀽缁撴潫") } /** @@ -152,7 +152,7 @@ class AnalyDistrictLog extends BaseBatch { query.append("version", new BasicDBObject('$lt', version)) DBCursor cursor = ANALY_SITE_COLL.find(query, new BasicDBObject("city", 1).append("region", 1).append("district_name", 1).append("cat", 1)).addOption(Bytes.QUERYOPTION_NOTIMEOUT).batchSize(300) while (cursor.hasNext()) { - println("删除:${cursor.next()}") + println("鍒犻櫎:${cursor.next()}") } ANALY_SITE_COLL.remove(query) query.removeField("version") @@ -182,13 +182,13 @@ class AnalyDistrictLog extends BaseBatch { updater.put("region", formateRegion) } } - String key = city + JOIN_SEPARATOR + formateRegion + JOIN_SEPARATOR + name.toLowerCase().replaceAll(' ', " ").replaceAll(" ", " ").replaceAll('(^\\s+)|(\\s+$)', ''); + String key = city + JOIN_SEPARATOR + formateRegion + JOIN_SEPARATOR + name.toLowerCase().replaceAll('銆�', " ").replaceAll("銆�", " ").replaceAll('(^\\s+)|(\\s+$)', ''); - int audit_status = analySite.getInt("audit_status", 0)//审阅状态 0:未审核 1:已审核 4:已审阅 + int audit_status = analySite.getInt("audit_status", 0)//瀹¢槄鐘舵�� 0:鏈鏍� 1:宸插鏍� 4:宸插闃� int data_status = analySite.getInt("data_status", NORMAL_DATA) int exists def district = allRightData.get(key); - //判断小区是否在CPDB库中 + //鍒ゆ柇灏忓尯鏄惁鍦–PDB搴撲腑 if (district != null) { exists = 1 } else { @@ -215,7 +215,7 @@ class AnalyDistrictLog extends BaseBatch { } else if (deletedData.containsKey(key)) { data_status = CPDB_DELETE audit_status = 1 - } else if (name.endsWith("宿舍") && analySite.containsField("map_compare_result") && analySite.getString("map_compare_result") == "not_exist") { + } else if (name.endsWith("瀹胯垗") && analySite.containsField("map_compare_result") && analySite.getString("map_compare_result") == "not_exist") { data_status = NAME_ILLEGAL_DELETE audit_status = 1 } else { @@ -240,7 +240,7 @@ class AnalyDistrictLog extends BaseBatch { ANALY_SITE_COLL.update(new BasicDBObject("_id", analySite._id), new BasicDBObject('$set', updater)) } if (progress % 1000 == 0) { - println("状态进度:${DataUtil.roundDouble((progress / count) * 100, 1)}%") + println("鐘舵�佽繘搴�:${DataUtil.roundDouble((progress / count) * 100, 1)}%") } } } @@ -277,10 +277,10 @@ class AnalyDistrictLog extends BaseBatch { */ public def process(def city, def cat) { - def analyRoads = findAnalyRoads(city, cat);//查找抓取数据 + def analyRoads = findAnalyRoads(city, cat);//鏌ユ壘鎶撳彇鏁版嵁 if (analyRoads.size() > 0) { def districts = getAllDistricts(city, cat); - //按网页合并 + //鎸夌綉椤靛悎骞� def List mergedRoad = analyzeAnalyRoads(analyRoads); saveAnalySite(mergedRoad, cat, city); updateOldVersionAnalySiteDataStatus(city, cat, districts) @@ -288,7 +288,7 @@ class AnalyDistrictLog extends BaseBatch { } /** - * 通过城市区域小区名对Road数据进行分组 + * 閫氳繃鍩庡競鍖哄煙灏忓尯鍚嶅Road鏁版嵁杩涜鍒嗙粍 * @param analyRoads * @return */ @@ -314,7 +314,7 @@ class AnalyDistrictLog extends BaseBatch { item.get("site_names") << analyRoad.site_name } if (progress % 10000 == 0) { - println("分组进度:${DataUtil.roundDouble((progress / analyRoads.size()) * 100, 0)}%") + println("鍒嗙粍杩涘害:${DataUtil.roundDouble((progress / analyRoads.size()) * 100, 0)}%") } } @@ -326,7 +326,7 @@ class AnalyDistrictLog extends BaseBatch { dbo.put("site_count", siteNames.size()) result << dbo } - println "[analyzeAnalyRoads]耗时:${System.currentTimeMillis() - start}" + println "[analyzeAnalyRoads]鑰楁椂:${System.currentTimeMillis() - start}" return result; } @@ -344,7 +344,7 @@ class AnalyDistrictLog extends BaseBatch { def item = new BasicDBObject() if(!obj.primary_map){ ANALY_ROAD_TEMP_COLL.remove(new BasicDBObject("_id", obj._id)) - println("移除TEMP:" + obj.toString()) + println("绉婚櫎TEMP:" + obj.toString()) continue } BasicDBObject primaryMap = obj.get("primary_map") @@ -397,7 +397,7 @@ class AnalyDistrictLog extends BaseBatch { def name = obj.getString("name"); List alias = obj.get("alias"); def status = obj.getInt("status", 0); - String key = city + JOIN_SEPARATOR + region + JOIN_SEPARATOR + name.toLowerCase().replaceAll(' ', " ").replaceAll(" ", " ").replaceAll('(^\\s+)|(\\s+$)', ''); + String key = city + JOIN_SEPARATOR + region + JOIN_SEPARATOR + name.toLowerCase().replaceAll('銆�', " ").replaceAll("銆�", " ").replaceAll('(^\\s+)|(\\s+$)', ''); if (0 != status) { deletedData.put(key, obj) } else { @@ -406,7 +406,7 @@ class AnalyDistrictLog extends BaseBatch { if (alias) { for (String aliaName : alias) { if (StringUtils.isNotBlank(aliaName) && aliaName != name) { - key = city + JOIN_SEPARATOR + region + JOIN_SEPARATOR + aliaName.toLowerCase().replaceAll(' ', " ").replaceAll(" ", " ").replaceAll('(^\\s+)|(\\s+$)', ''); + key = city + JOIN_SEPARATOR + region + JOIN_SEPARATOR + aliaName.toLowerCase().replaceAll('銆�', " ").replaceAll("銆�", " ").replaceAll('(^\\s+)|(\\s+$)', ''); if (0 != status) { deletedData.put(key, obj); } else { @@ -417,7 +417,7 @@ class AnalyDistrictLog extends BaseBatch { } } } - //移除拥有和正常数据一样KEY的被删除数据 + //绉婚櫎鎷ユ湁鍜屾甯告暟鎹竴鏍稫EY鐨勮鍒犻櫎鏁版嵁 for (String k : allRightData.keySet()) { deletedData.remove(k) } @@ -495,7 +495,7 @@ class AnalyDistrictLog extends BaseBatch { } progress.getAndIncrement() if (progress.get() % 1000 == 0) { - println("入库进度:${DataUtil.roundDouble((progress.get() / mergedRoads.size()) * 100, 1)}%") + println("鍏ュ簱杩涘害:${DataUtil.roundDouble((progress.get() / mergedRoads.size()) * 100, 1)}%") } } }) @@ -520,7 +520,7 @@ class AnalyDistrictLog extends BaseBatch { if (StringUtils.isBlank(region)) { return false; } - if (region.contains("周边") || region.contains("其他")) { + if (region.contains("鍛ㄨ竟") || region.contains("鍏朵粬")) { return false; } return RegionData.isRegion(city, region) @@ -528,7 +528,7 @@ class AnalyDistrictLog extends BaseBatch { def updateTempData() { - println("开始更新临时数据") + println("寮�濮嬫洿鏂颁复鏃舵暟鎹�") DBObject query = new BasicDBObject(); query.append("status", new BasicDBObject('$ne', ANALY_ROAD_STATUS_ERROR)) query.append("c_date", new BasicDBObject('$gt', DateUtil.add(now, Calendar.DATE, -2))) @@ -572,10 +572,10 @@ class AnalyDistrictLog extends BaseBatch { } } if(sb.length() > 0 && sb.length() < 10000){ - sendEmail("zhoutongyun@fangjia.com", "疑似解析错误小区", sb.toString()) - sendEmail("wangwenyan@fangjia.com", "疑似解析错误小区", sb.toString()) + sendEmail("zhoutongyun@fangjia.com", "鐤戜技瑙f瀽閿欒灏忓尯", sb.toString()) + sendEmail("wangwenyan@fangjia.com", "鐤戜技瑙f瀽閿欒灏忓尯", sb.toString()) } - println("临时数据更新结束") + println("涓存椂鏁版嵁鏇存柊缁撴潫") } def assembleObj(BasicDBObject srcDbo) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/AnalyDistrictLogTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/AnalyDistrictLogTest.groovy index 8008d096f..e559638db 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/AnalyDistrictLogTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/AnalyDistrictLogTest.groovy @@ -27,8 +27,8 @@ import java.util.concurrent.atomic.AtomicInteger import java.util.regex.Pattern /** - * 对解析好的网页进行分析 - * 获取小区解析的网站数量 + * 瀵硅В鏋愬ソ鐨勭綉椤佃繘琛屽垎鏋� + * 鑾峰彇灏忓尯瑙f瀽鐨勭綉绔欐暟閲� * @author gaojuan * */ @@ -42,21 +42,21 @@ class AnalyDistrictLogTest extends BaseBatch{ public static final DBCollection REGION_BLOCK_COLL = MongoUtils.getCollectionByName("fangjia", "region_block", "mongo.db.fangjia.com") public static final DBCollection VERIFY_RULE_COLL = MongoUtils.getCollectionByName("coredata", "verify_rule", "coredata.mongo.db.fangjia.com") public static DSCollection seaweed = new DataStore("192.168.0.251", 27007).getCollection("fangjia.seaweed") - /**人工删除*/ + /**浜哄伐鍒犻櫎*/ private static final int MANUAL_DELETE = 1; - /**区域错误删除*/ + /**鍖哄煙閿欒鍒犻櫎*/ private static final int REGION_ERROR_DELETE = 2; - /**别名关联删除*/ + /**鍒悕鍏宠仈鍒犻櫎*/ private static final int ALIAS_RELATE_DELETE = 3; - /**名称非法删除*/ + /**鍚嶇О闈炴硶鍒犻櫎*/ private static final int NAME_ILLEGAL_DELETE = 4; - /**通过百度API判定类型不合法删除*/ + /**閫氳繃鐧惧害API鍒ゅ畾绫诲瀷涓嶅悎娉曞垹闄�*/ private static final int BAIDU_JUDGE_DELETE = 5; - /**CPDB已经删除*/ + /**CPDB宸茬粡鍒犻櫎*/ private static final int CPDB_DELETE = 6; - /**正常数据*/ + /**姝e父鏁版嵁*/ private static final int NORMAL_DATA = 0; - /**数据抓取失败标示*/ + /**鏁版嵁鎶撳彇澶辫触鏍囩ず*/ private static final int ANALY_ROAD_STATUS_ERROR = 2; private Date now = new Date() @@ -66,14 +66,14 @@ class AnalyDistrictLogTest extends BaseBatch{ private static List districtUnContainsWords = [] - static List illegalDistirctNamePatterns = [Pattern.compile(".*地图定位.*"),Pattern.compile(".*地块.*"),Pattern.compile(".*售罄.*"), - Pattern.compile(".*-\$"),Pattern.compile(".*….*"),Pattern.compile(".*\\d#.*") - ,/.*(东|南|西|北|一|二|三|四|五|正|前|后)+门.*/,/.*出售.*/,/.*(\d|一|二|三|四|五)号楼$/] + static List illegalDistirctNamePatterns = [Pattern.compile(".*鍦板浘瀹氫綅.*"),Pattern.compile(".*鍦板潡.*"),Pattern.compile(".*鍞絼.*"), + Pattern.compile(".*-\$"),Pattern.compile(".*鈥�.*"),Pattern.compile(".*\\d#.*") + ,/.*(涓渱鍗梶瑗縷鍖梶涓�|浜寍涓墊鍥泑浜攟姝鍓峾鍚�)+闂�.*/,/.*鍑哄敭.*/,/.*(\d|涓�|浜寍涓墊鍥泑浜�)鍙锋ゼ$/] static main(args) { def s = System.currentTimeMillis() runBatch(new AnalyDistrictLogTest(), args) - println("运行时间:${(int)((System.currentTimeMillis() - s))/(1000*60)}分钟") + println("杩愯鏃堕棿:${(int)((System.currentTimeMillis() - s))/(1000*60)}鍒嗛挓") } @Override @@ -84,19 +84,19 @@ class AnalyDistrictLogTest extends BaseBatch{ } def allCity = CommonUtils.findAllCity() updateTempData() - if(SystemUtils.IS_OS_WINDOWS){//本地手动跑特定城市数据 - allCity = ["石家庄", "沈阳", "上海", "杭州", "济南", "青岛", "广州", "重庆", "成都", "西安"] + if(SystemUtils.IS_OS_WINDOWS){//鏈湴鎵嬪姩璺戠壒瀹氬煄甯傛暟鎹� + allCity = ["鐭冲搴�", "娌堥槼", "涓婃捣", "鏉窞", "娴庡崡", "闈掑矝", "骞垮窞", "閲嶅簡", "鎴愰兘", "瑗垮畨"] } def dataTypes = ["district","office"]; def index = 1; for(def city : allCity){ def s = System.currentTimeMillis() - println "[${index}]开始分析 ${city} ${new Date().format('yyyy/MM/dd HH:mm:ss')}" + println "[${index}]寮�濮嬪垎鏋� ${city} ${new Date().format('yyyy/MM/dd HH:mm:ss')}" for(def dataType : dataTypes){ process(city, dataType); } index ++; - println "[${index}]分析结束 ${city} ${new Date().format('yyyy/MM/dd HH:mm:ss')} 耗时:${(int)((System.currentTimeMillis() - s)/(1000 * 60))}分钟" + println "[${index}]鍒嗘瀽缁撴潫 ${city} ${new Date().format('yyyy/MM/dd HH:mm:ss')} 鑰楁椂:${(int)((System.currentTimeMillis() - s)/(1000 * 60))}鍒嗛挓" } } @@ -115,7 +115,7 @@ class AnalyDistrictLogTest extends BaseBatch{ query.append("version",new BasicDBObject('$lt',version)) DBCursor cursor = ANALY_SITE_COLL.find(query,new BasicDBObject("city", 1).append("region",1).append("district_name",1).append("cat",1)).addOption(Bytes.QUERYOPTION_NOTIMEOUT).batchSize(300) while(cursor.hasNext()){ - println("删除:${cursor.next()}") + println("鍒犻櫎:${cursor.next()}") } ANALY_SITE_COLL.remove(query) query.removeField("version") @@ -145,13 +145,13 @@ class AnalyDistrictLogTest extends BaseBatch{ updater.put("region",formateRegion) } } - String key = city + JOIN_SEPARATOR + formateRegion + JOIN_SEPARATOR + name.toLowerCase().replaceAll(' '," ").replaceAll(" "," ").replaceAll('(^\\s+)|(\\s+$)',''); + String key = city + JOIN_SEPARATOR + formateRegion + JOIN_SEPARATOR + name.toLowerCase().replaceAll('銆�'," ").replaceAll("銆�"," ").replaceAll('(^\\s+)|(\\s+$)',''); - int audit_status = analySite.getInt("audit_status",0)//审阅状态 0:未审核 1:已审核 4:已审阅 + int audit_status = analySite.getInt("audit_status",0)//瀹¢槄鐘舵�� 0:鏈鏍� 1:宸插鏍� 4:宸插闃� int data_status = analySite.getInt("data_status",NORMAL_DATA) int exists def district = allRightData.get(key); - //判断小区是否在CPDB库中 + //鍒ゆ柇灏忓尯鏄惁鍦–PDB搴撲腑 if(district != null){ exists = 1 }else{ @@ -200,7 +200,7 @@ class AnalyDistrictLogTest extends BaseBatch{ ANALY_SITE_COLL.update(new BasicDBObject("_id",analySite._id), new BasicDBObject('$set',updater)) } if(progress % 1000 == 0){ - println("状态进度:${DataUtil.roundDouble((progress/count)*100,1)}%") + println("鐘舵�佽繘搴�:${DataUtil.roundDouble((progress/count)*100,1)}%") } } } @@ -212,10 +212,10 @@ class AnalyDistrictLogTest extends BaseBatch{ */ public def process(def city, def cat){ - def analyRoads = findAnalyRoads(city, cat);//查找抓取数据 + def analyRoads = findAnalyRoads(city, cat);//鏌ユ壘鎶撳彇鏁版嵁 if(analyRoads.size() > 0){ def districts = getAllDistricts(city, cat); - //按网页合并 + //鎸夌綉椤靛悎骞� def List mergedRoad = analyzeAnalyRoads(analyRoads); saveAnalySite(mergedRoad,cat); updateOldVersionAnalySiteDataStatus(city,cat,districts) @@ -223,7 +223,7 @@ class AnalyDistrictLogTest extends BaseBatch{ } /** - * 通过城市区域小区名对Road数据进行分组 + * 閫氳繃鍩庡競鍖哄煙灏忓尯鍚嶅Road鏁版嵁杩涜鍒嗙粍 * @param analyRoads * @return */ @@ -249,7 +249,7 @@ class AnalyDistrictLogTest extends BaseBatch{ item.get("site_names") << analyRoad.site_name } if(progress % 10000 == 0){ - println("分组进度:${DataUtil.roundDouble((progress/analyRoads.size())*100,0)}%") + println("鍒嗙粍杩涘害:${DataUtil.roundDouble((progress/analyRoads.size())*100,0)}%") } } @@ -261,7 +261,7 @@ class AnalyDistrictLogTest extends BaseBatch{ dbo.put("site_count",siteNames.size()) result << dbo } - println "[analyzeAnalyRoads]耗时:${System.currentTimeMillis() - start}" + println "[analyzeAnalyRoads]鑰楁椂:${System.currentTimeMillis() - start}" return result; } @@ -327,7 +327,7 @@ class AnalyDistrictLogTest extends BaseBatch{ def name = obj.getString("name"); List alias = obj.get("alias"); def status = obj.getInt("status", 0); - String key = city + JOIN_SEPARATOR + region + JOIN_SEPARATOR + name.toLowerCase().replaceAll(' '," ").replaceAll(" "," ").replaceAll('(^\\s+)|(\\s+$)',''); + String key = city + JOIN_SEPARATOR + region + JOIN_SEPARATOR + name.toLowerCase().replaceAll('銆�'," ").replaceAll("銆�"," ").replaceAll('(^\\s+)|(\\s+$)',''); if(0 != status){ deletedData.put(key,obj) }else{ @@ -336,7 +336,7 @@ class AnalyDistrictLogTest extends BaseBatch{ if(alias){ for(String aliaName : alias){ if(StringUtils.isNotBlank(aliaName) && aliaName != name){ - key = city + JOIN_SEPARATOR +region+ JOIN_SEPARATOR + aliaName.toLowerCase().replaceAll(' '," ").replaceAll(" "," ").replaceAll('(^\\s+)|(\\s+$)',''); + key = city + JOIN_SEPARATOR +region+ JOIN_SEPARATOR + aliaName.toLowerCase().replaceAll('銆�'," ").replaceAll("銆�"," ").replaceAll('(^\\s+)|(\\s+$)',''); if(0 != status){ deletedData.put(key,obj); }else{ @@ -347,7 +347,7 @@ class AnalyDistrictLogTest extends BaseBatch{ } } } - //移除拥有和正常数据一样KEY的被删除数据 + //绉婚櫎鎷ユ湁鍜屾甯告暟鎹竴鏍稫EY鐨勮鍒犻櫎鏁版嵁 for(String k : allRightData.keySet()){ deletedData.remove(k) } @@ -415,7 +415,7 @@ class AnalyDistrictLogTest extends BaseBatch{ } progress.getAndIncrement() if(progress.get() % 1000 == 0){ - println("入库进度:${DataUtil.roundDouble((progress.get()/mergedRoads.size())*100,1)}%") + println("鍏ュ簱杩涘害:${DataUtil.roundDouble((progress.get()/mergedRoads.size())*100,1)}%") } } }) @@ -438,7 +438,7 @@ class AnalyDistrictLogTest extends BaseBatch{ if(StringUtils.isBlank(region)){ return false; } - if(region.contains("周边")||region.contains("其他")){ + if(region.contains("鍛ㄨ竟")||region.contains("鍏朵粬")){ return false; } if(regions.containsKey(region)){ @@ -455,7 +455,7 @@ class AnalyDistrictLogTest extends BaseBatch{ def updateTempData(){ - println("开始更新临时数据") + println("寮�濮嬫洿鏂颁复鏃舵暟鎹�") DBObject query = new BasicDBObject(); query.append("status",new BasicDBObject('$ne',ANALY_ROAD_STATUS_ERROR)) query.append("c_date", new BasicDBObject('$gt',DateUtil.add(now, Calendar.DATE, -2))) @@ -488,7 +488,7 @@ class AnalyDistrictLogTest extends BaseBatch{ println(count) } } - println("临时数据更新结束") + println("涓存椂鏁版嵁鏇存柊缁撴潫") } def assembleObj(BasicDBObject srcDbo){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/AutoAddDistrict.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/AutoAddDistrict.groovy index 8adc2525e..2a07536a5 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/AutoAddDistrict.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/AutoAddDistrict.groovy @@ -39,12 +39,12 @@ class AutoAddDistrict { } def run(){ - def ret = findNeedAddDistrict("南京","玄武"); - println "玄武:" + ret.size(); + def ret = findNeedAddDistrict("鍗椾含","鐜勬"); + println "鐜勬锛�" + ret.size(); def distRet = findAnalyRoads(ret); - def ret1 = findNeedAddDistrict("南京","建邺"); - println "建邺:" + ret1.size(); + def ret1 = findNeedAddDistrict("鍗椾含","寤洪偤"); + println "寤洪偤锛�" + ret1.size(); def distRet1 = findAnalyRoads(ret1); //updateDistrict(distRet); } @@ -96,8 +96,8 @@ class AutoAddDistrict { for(def m : rett){ def siteName = m.key; def values = m.values; - if(siteName=='网上房地产'){ - println "网上房地产" + if(siteName=='缃戜笂鎴垮湴浜�'){ + println "缃戜笂鎴垮湴浜�" }else{ for(def field : fields){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/AutoAddSouFangDistrict.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/AutoAddSouFangDistrict.groovy index b132bf14f..a14b99db6 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/AutoAddSouFangDistrict.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/AutoAddSouFangDistrict.groovy @@ -17,9 +17,9 @@ public class AutoAddSouFangDistrict{ DBCollection analySiteColl = MongoUtils.getCollectionByName("coredata","analy_site", "coredata.mongo.db.fangjia.com",27017) - def static citys = ["温州","金华","衢州","湖州","绍兴","嘉兴","舟山","泰州","徐州","镇江","淮安","连云港","宿迁","扬州","盐城","南通","无锡","丽水","重庆","佛山","江门","珠海","郑州","洛阳","许昌","新乡","开封","安阳","大连","鞍山","营口","丹东","西安","榆林","渭南","宝鸡","太原","忻州","运城","朔州","长治","晋中","哈尔滨","齐齐哈尔","大庆","南宁","柳州","桂林","呼和浩特","鄂尔多斯","呼伦贝尔","包头"] + def static citys = ["娓╁窞","閲戝崕","琛㈠窞","婀栧窞","缁嶅叴","鍢夊叴","鑸熷北","娉板窞","寰愬窞","闀囨睙","娣畨","杩炰簯娓�","瀹胯縼","鎵窞","鐩愬煄","鍗楅��","鏃犻敗","涓芥按","閲嶅簡","浣涘北","姹熼棬","鐝犳捣","閮戝窞","娲涢槼","璁告槍","鏂颁埂","寮�灏�","瀹夐槼","澶ц繛","闉嶅北","钀ュ彛","涓逛笢","瑗垮畨","姒嗘灄","娓崡","瀹濋浮","澶師","蹇诲窞","杩愬煄","鏈斿窞","闀挎不","鏅嬩腑","鍝堝皵婊�","榻愰綈鍝堝皵","澶у簡","鍗楀畞","鏌冲窞","妗傛灄","鍛煎拰娴╃壒","閯傚皵澶氭柉","鍛间鸡璐濆皵","鍖呭ご"] def static final DBCollection ANALY_ROAD_COLL = MongoUtils.getCollectionByName("coredata", "analy_road", "coredata.mongo.db.fangjia.com") - def districtNameNoise = [".","·","。","#","@"," ","?"] + def districtNameNoise = [".","路","銆�","#","@"," ","?"] def static main(args){ def obj = new AutoAddSouFangDistrict() citys.each { @@ -34,7 +34,7 @@ public class AutoAddSouFangDistrict{ },new BasicDBObject("city",1).append("region",1).append("name",1)) def keys = new BasicDBObject("city",1).append("region",1).append("district_name",1).append("site_names",1).append("site_count",1) - DBCursor cursor = analySiteColl.find(new BasicDBObject("city",city).append("cat","district").append("exists",0).append("audit_status",0).append("data_status",0),keys)//append("site_names",Pattern.compile(".*搜房.*") + DBCursor cursor = analySiteColl.find(new BasicDBObject("city",city).append("cat","district").append("exists",0).append("audit_status",0).append("data_status",0),keys)//append("site_names",Pattern.compile(".*鎼滄埧.*") cursor.batchSize(10000) cursor.addOption(Bytes.QUERYOPTION_NOTIMEOUT) cursor.each {BasicDBObject dbo -> @@ -43,10 +43,10 @@ public class AutoAddSouFangDistrict{ def name = formatName(orgName) def validSite = isSelectedSites(dbo); if(!validSite){ - println("网站不合法:" + dbo) + println("缃戠珯涓嶅悎娉�:" + dbo) } if(validSite && !isEndsWith(name) && !isContainsChars(name)){ - name = name.replaceAll("\\(|(","#").replaceAll("\\)|)","@") + name = name.replaceAll("\\(|锛�","#").replaceAll("\\)|锛�","@") if(name.indexOf("#") > 0 && name.indexOf("@") > 0){ name = name.substring(0,name.indexOf("#")) } @@ -68,8 +68,8 @@ public class AutoAddSouFangDistrict{ seaweed.append("status",0) def info = findDistrictInfo(city,region,name) def baiDuEstateType = getBaiDuEstateType(city,name) - if(info[0] == "写字楼"|| "写字楼" == baiDuEstateType || "商铺" == baiDuEstateType){ - println("写字楼/商铺:" + seaweed) + if(info[0] == "鍐欏瓧妤�"|| "鍐欏瓧妤�" == baiDuEstateType || "鍟嗛摵" == baiDuEstateType){ + println("鍐欏瓧妤�/鍟嗛摵:" + seaweed) }else{ seaweed.append("estate_type2",info[0]) if(StringUtils.isNotBlank(info[1])){ @@ -92,10 +92,10 @@ public class AutoAddSouFangDistrict{ if(dbo.getInt("site_count") > 2){ return true; } - if(dbo.getInt("site_count") == 1 &&(dbo.getString("site_names").contains("图吧") || dbo.getString("site_names").contains("千万间"))){ + if(dbo.getInt("site_count") == 1 &&(dbo.getString("site_names").contains("鍥惧惂") || dbo.getString("site_names").contains("鍗冧竾闂�"))){ return false } - if(dbo.getInt("site_count") == 2 && dbo.getString("site_names").contains("图吧") && dbo.getString("site_names").contains("千万间")){ + if(dbo.getInt("site_count") == 2 && dbo.getString("site_names").contains("鍥惧惂") && dbo.getString("site_names").contains("鍗冧竾闂�")){ return false } return true; @@ -120,9 +120,9 @@ public class AutoAddSouFangDistrict{ if(StringUtils.isNotBlank(estate_type)){ estateTypes << estate_type } - if(dbo.getString("site_name") == "搜房" && address == null){ + if(dbo.getString("site_name") == "鎼滄埧" && address == null){ address = result.get("address") - }else if(otherAddress == null ||(result.get("address") && result.getString("address") ==~ /.*\d+号.*/)){ + }else if(otherAddress == null ||(result.get("address") && result.getString("address") ==~ /.*\d+鍙�.*/)){ otherAddress = result.get("address") } @@ -133,16 +133,16 @@ public class AutoAddSouFangDistrict{ int liangYongCount = 0 int zhuZhaiCount = 0 estateTypes.each { - if(it.contains("商铺") || it.contains("写字楼") || it.contains("商业") || it.contains("办公")){ + if(it.contains("鍟嗛摵") || it.contains("鍐欏瓧妤�") || it.contains("鍟嗕笟") || it.contains("鍔炲叕")){ officeCount ++ } - if(it.contains("别墅")){ + if(it.contains("鍒")){ bieshuCount ++ } - if(it.contains("商住两用")){ + if(it.contains("鍟嗕綇涓ょ敤")){ liangYongCount ++ } - if(it.contains("住宅")){ + if(it.contains("浣忓畢")){ zhuZhaiCount ++ } } @@ -151,29 +151,29 @@ public class AutoAddSouFangDistrict{ } if(zhuZhaiCount > 0){ if(bieshuCount > 0){ - return ["别墅",address] + return ["鍒",address] }else if(liangYongCount > 0){ - return ["商住两用",address] + return ["鍟嗕綇涓ょ敤",address] } - return ["普通住宅",address] + return ["鏅�氫綇瀹�",address] }else if(officeCount > zhuZhaiCount){ - return ["写字楼",address] + return ["鍐欏瓧妤�",address] }else if(bieshuCount > 0){ - return ["别墅",address] + return ["鍒",address] }else if(liangYongCount > 0){ - return ["商住两用",address] + return ["鍟嗕綇涓ょ敤",address] }else{ - return ["普通住宅",address] + return ["鏅�氫綇瀹�",address] } } def formateAddress(String city,String address){ - if(address.endsWith("交汇")){ + if(address.endsWith("浜ゆ眹")){ return address } String orgAddress = address if(address ==~ /.*\d+$/){ - address += "号" + address += "鍙�" } JSONObject result = OpenApiClient.addressStandardize(city, address) String formateAddr; @@ -183,7 +183,7 @@ public class AutoAddSouFangDistrict{ formateAddr += result.getString("streetNumber") } } - if(formateAddr && (formateAddr.contains("市") || formateAddr.contains("县"))){ + if(formateAddr && (formateAddr.contains("甯�") || formateAddr.contains("鍘�"))){ result = OpenApiClient.addressStandardize(city, formateAddr) if(result.containsKey("street")){ formateAddr = result.getString("street") @@ -198,7 +198,7 @@ public class AutoAddSouFangDistrict{ formateAddr = addrs[0] + addrs[1] return formateAddr }else if(addrs.size() == 3){ - formateAddr = addrs[0] + "与" + addrs[1].replaceFirst("^(与|和)","") + "交汇" + formateAddr = addrs[0] + "涓�" + addrs[1].replaceFirst("^(涓巪鍜�)","") + "浜ゆ眹" return formateAddr } } @@ -214,12 +214,12 @@ public class AutoAddSouFangDistrict{ if(item.containsKey("detail_info") && item.getString("name") == name){ String tag = item.getJSONObject("detail_info")?.get("tag")?.toString(); if (StringUtils.isNotBlank(tag)) { - if(tag.contains("写字楼")){ - return "写字楼" - }else if(tag.contains("商场") || tag.contains("购物") || tag.contains("商铺")){ - return "商铺" - }else if(tag.contains("住宅区")){ - return "普通住宅" + if(tag.contains("鍐欏瓧妤�")){ + return "鍐欏瓧妤�" + }else if(tag.contains("鍟嗗満") || tag.contains("璐墿") || tag.contains("鍟嗛摵")){ + return "鍟嗛摵" + }else if(tag.contains("浣忓畢鍖�")){ + return "鏅�氫綇瀹�" } } } @@ -233,22 +233,22 @@ public class AutoAddSouFangDistrict{ districtNameNoise.each { name = name.replace(it,"") } - if(name ==~ /.*(村|小区)\d+号$/){ - name = name.replaceAll("\\d+号\$","") + if(name ==~ /.*(鏉憒灏忓尯)\d+鍙�$/){ + name = name.replaceAll("\\d+鍙穃$","") } - if(name ==~ /.*路\d+号$/){ - name = name + "小区" + if(name ==~ /.*璺痋d+鍙�$/){ + name = name + "灏忓尯" } - name = name.replaceAll("\\d+幢\$","") + name = name.replaceAll("\\d+骞$","") return name; } def isEndsWith(def s){ - def endChars = ["路","街","店","贸区","巷","村","设计院","社区","地块","交易中心","综合大楼","附近","对面","安置房"]; + def endChars = ["璺�","琛�","搴�","璐稿尯","宸�","鏉�","璁捐闄�","绀惧尯","鍦板潡","浜ゆ槗涓績","缁煎悎澶фゼ","闄勮繎","瀵归潰","瀹夌疆鎴�"]; def flag = false; for(def key : endChars){ if(s.endsWith(key)){ - if(key=="村"||key=="巷"){ + if(key=="鏉�"||key=="宸�"){ if(s.length()<=3){ flag = true; } @@ -263,7 +263,7 @@ public class AutoAddSouFangDistrict{ } def isContainsChars(s) { - def chars = ["世贸中心", "商务中心", "家具中心", "商业中心", "建材市场", "生活广场", "购物广场", "商城", "电器城"] + def chars = ["涓栬锤涓績", "鍟嗗姟涓績", "瀹跺叿涓績", "鍟嗕笟涓績", "寤烘潗甯傚満", "鐢熸椿骞垮満", "璐墿骞垮満", "鍟嗗煄", "鐢靛櫒鍩�"] def flag = false; for (def key : chars) { if (s.indexOf(key) != -1) { @@ -276,7 +276,7 @@ public class AutoAddSouFangDistrict{ def List splitAddress(String addr){ List addres = [] - def keys = ["街道","大道","国道","道路","路","街","线"] + def keys = ["琛楅亾","澶ч亾","鍥介亾","閬撹矾","璺�","琛�","绾�"] String remain = addr; while(true){ int p = Integer.MAX_VALUE diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/AutoDistrict.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/AutoDistrict.groovy index 53971f1d1..079130a0d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/AutoDistrict.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/AutoDistrict.groovy @@ -25,7 +25,7 @@ class AutoDistrict { public static void main(String[] args){ def task = new AutoDistrict(); - task.run(["西安", "成都"]);//"北京", + task.run(["瑗垮畨", "鎴愰兘"]);//"鍖椾含", } @@ -154,7 +154,7 @@ class AutoDistrict { s = s + " "+ estateType; } } - if(s.indexOf("写字楼")!=-1||s.indexOf("办字楼")!=-1||s.indexOf("商铺")!=-1||s.indexOf("商住楼")!=-1){ + if(s.indexOf("鍐欏瓧妤�")!=-1||s.indexOf("鍔炲瓧妤�")!=-1||s.indexOf("鍟嗛摵")!=-1||s.indexOf("鍟嗕綇妤�")!=-1){ return false; } return true; @@ -233,7 +233,7 @@ class AutoDistrict { } def writeCSV(city, results, fields){ - File file = new File("e:\\自动入库("+city+").csv"); + File file = new File("e:\\鑷姩鍏ュ簱锛�"+city+"锛�.csv"); if (file.exists()){ file.delete(); } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/CityAnaDataBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/CityAnaDataBatch.groovy index c5e610e55..53f5d2b70 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/CityAnaDataBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/CityAnaDataBatch.groovy @@ -13,7 +13,7 @@ class CityAnaDataBatch extends BaseBatch { DBCollection CITY_SELL_STAT = MongoUtils.getCollectionByName("fangjia_stat", "city_sell_stat", "mongo.db.fangjia.com") DBCollection CITY_ANA_DATA = MongoUtils.getCollectionByName("fangjia_stat", "city_ana_data", "mongo.db.fangjia.com") - List CENTER_CITY = ["石家庄","太原","呼和浩特","沈阳","长春","哈尔滨","南京","杭州","合肥","福州","南昌","济南","郑州","武汉","长沙","广州","南宁","海口","成都","贵阳","昆明","拉萨","西安","兰州","西宁","银川","乌鲁木齐","台北"] + List CENTER_CITY = ["鐭冲搴�","澶師","鍛煎拰娴╃壒","娌堥槼","闀挎槬","鍝堝皵婊�","鍗椾含","鏉窞","鍚堣偉","绂忓窞","鍗楁槍","娴庡崡","閮戝窞","姝︽眽","闀挎矙","骞垮窞","鍗楀畞","娴峰彛","鎴愰兘","璐甸槼","鏄嗘槑","鎷夎惃","瑗垮畨","鍏板窞","瑗垮畞","閾跺窛","涔岄瞾鏈ㄩ綈","鍙板寳"] static void main(String[] args) { runBatch(new CityAnaDataBatch(), args) @@ -21,7 +21,7 @@ class CityAnaDataBatch extends BaseBatch { @Override void process(Object args) { - Integer yearMonth = CITY_SELL_STAT.find(new BasicDBObject("city", "上海")).sort(new BasicDBObject("date", -1)).limit(1).toList()[0].date + Integer yearMonth = CITY_SELL_STAT.find(new BasicDBObject("city", "涓婃捣")).sort(new BasicDBObject("date", -1)).limit(1).toList()[0].date List orders = [] CITY_SELL_STAT.find(new BasicDBObject("date", yearMonth)).each {BasicDBObject dbo-> orders << new CityOrderItem(dbo.city, dbo.avg_price) @@ -31,11 +31,11 @@ class CityAnaDataBatch extends BaseBatch { CityOrderItem item = orders.get(i - 1) def data = new BasicDBObject('city_rank', i).append("city_total_rank", orders.size()).append("avg_price", item.avgPrice) if(ProvinceData.isGovernmentCity(item.city)){ - data.put("level", "直辖市") + data.put("level", "鐩磋緰甯�") }else if(CENTER_CITY.contains(item.city)){ - data.put("level", "省会城市") + data.put("level", "鐪佷細鍩庡競") }else{ - data.put("level", "地址市") + data.put("level", "鍦板潃甯�") } CITY_ANA_DATA.update(new BasicDBObject("city", item.city), new BasicDBObject('$set', data), true,true) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/CityAndRegionAverageConsume.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/CityAndRegionAverageConsume.groovy index 73e4fa42d..9202b2eb3 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/CityAndRegionAverageConsume.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/CityAndRegionAverageConsume.groovy @@ -11,7 +11,7 @@ import com.mongodb.BasicDBObject import com.mongodb.DBCollection /** - * 城市区域人均消费统计脚本 + * 鍩庡競鍖哄煙浜哄潎娑堣垂缁熻鑴氭湰 * @author */ @BatchOwner(Watcher.WangWenYan) @@ -38,7 +38,7 @@ public class CityAndRegionAverageConsume extends BaseBatch{ def analyRegionAverageConsume(def city, def region){ List numbers = new ArrayList(); - BUSINESS_SHOP_COLL.find(new BasicDBObject("business_type", "美食").append("city", city).append("region", region), new BasicDBObject("consumption", 1)).each {BasicDBObject dbo-> + BUSINESS_SHOP_COLL.find(new BasicDBObject("business_type", "缇庨").append("city", city).append("region", region), new BasicDBObject("consumption", 1)).each {BasicDBObject dbo-> if(dbo.consumption && dbo.consumption > 0){ numbers << dbo.consumption } @@ -59,7 +59,7 @@ public class CityAndRegionAverageConsume extends BaseBatch{ def analyCityAverageConsume(def city){ List numbers = new ArrayList(); - BUSINESS_SHOP_COLL.find(new BasicDBObject("business_type", "美食").append("city", city), new BasicDBObject("consumption", 1)).each {BasicDBObject dbo-> + BUSINESS_SHOP_COLL.find(new BasicDBObject("business_type", "缇庨").append("city", city), new BasicDBObject("consumption", 1)).each {BasicDBObject dbo-> if(dbo.consumption && dbo.consumption > 0){ numbers << dbo.consumption } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/ClickHouseDistrictStatMarkupCalcBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/ClickHouseDistrictStatMarkupCalcBatch.groovy index bf662b6ea..f6c4e567d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/ClickHouseDistrictStatMarkupCalcBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/ClickHouseDistrictStatMarkupCalcBatch.groovy @@ -15,8 +15,8 @@ import java.sql.Connection import java.sql.DriverManager /** - * 小区均价涨跌幅纠正脚本 - * 功能说明: + * 灏忓尯鍧囦环娑ㄨ穼骞呯籂姝h剼鏈� + * 鍔熻兘璇存槑: */ @BatchOwner(Watcher.WangWenYan) class ClickHouseDistrictStatMarkupCalcBatch extends BaseBatch { @@ -39,10 +39,10 @@ class ClickHouseDistrictStatMarkupCalcBatch extends BaseBatch { query.city = district.city query.region = district.region query.district_name = district.name - if(district.estate_type2 && "别墅" == district.estate_type2){ - query.estate_type = "别墅" + if(district.estate_type2 && "鍒" == district.estate_type2){ + query.estate_type = "鍒" }else{ - query.estate_type = "小区" + query.estate_type = "灏忓尯" } List items = DISTRICT_STAT.find(query, new BasicDBObject("avg_price", 1).append("weekend_markup", 1).append("weekend", 1)).batchSize(2000).addOption(Bytes.QUERYOPTION_SLAVEOK).sort(new BasicDBObject("weekend", 1)).toList() if(items.size() < 2){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/CountOfflineCityHouseAmount.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/CountOfflineCityHouseAmount.groovy index 31bdbbd7f..d55be7479 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/CountOfflineCityHouseAmount.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/CountOfflineCityHouseAmount.groovy @@ -11,7 +11,7 @@ import com.mongodb.DBCollection /** * Created by wenyan on 2016/1/22. */ -def cityList = ["南昌","包头","安庆","泸州","遵义","常德","南充","牡丹江","锦州","岳阳","韶关","济宁","平顶山"] +def cityList = ["鍗楁槍","鍖呭ご","瀹夊簡","娉稿窞","閬典箟","甯稿痉","鍗楀厖","鐗′腹姹�","閿﹀窞","宀抽槼","闊跺叧","娴庡畞","骞抽《灞�"] DBCollection ANALY_SITE_COLL = MongoUtils.getCollectionByName("coredata", "analy_site", "coredata.mongo.db.fangjia.com") DSCollection seawater = new DataStore("192.168.0.65", 27777).getCollection("fangjia.seawater") def startDate = DateUtil.add(new Date(), Calendar.MONTH, -6).format("yyyyMMdd").toInteger() @@ -30,9 +30,9 @@ cityList.each {def city-> long count = (long) seawater.count(houseQuery) ANALY_SITE_COLL.update(new BasicDBObject("_id",dbo._id), new BasicDBObject('$set',new BasicDBObject('house_num',count))) if(idx % 100 == 0){ - println("${city}统计进度:${DataUtil.roundDouble((idx *100)/total,2)}%") + println("${city}缁熻杩涘害:${DataUtil.roundDouble((idx *100)/total,2)}%") } } - println("${city}分析结束") + println("${city}鍒嗘瀽缁撴潫") } \ No newline at end of file diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/CoverPrecent.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/CoverPrecent.groovy index 99176c92a..62aceccc0 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/CoverPrecent.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/CoverPrecent.groovy @@ -18,8 +18,8 @@ class CoverPrecent { public static final DBCollection OFFICE_STAT_COLL = MongoUtils.getCollectionByName("fangjia", "office_stat", "mongo.db.fangjia.com") static main(args) { - //def citys = ["天津","重庆","成都","大连","沈阳","哈尔滨","牡丹江","大庆","齐齐哈尔","佳木斯","伊春","鸡西","鹤岗","双鸭山","七台河","绥化","黑河"]; - def citys = ["上海"] + //def citys = ["澶╂触","閲嶅簡","鎴愰兘","澶ц繛","娌堥槼","鍝堝皵婊�","鐗′腹姹�","澶у簡","榻愰綈鍝堝皵","浣虫湪鏂�","浼婃槬","楦¤タ","楣ゅ矖","鍙岄腑灞�","涓冨彴娌�","缁ュ寲","榛戞渤"]; + def citys = ["涓婃捣"] def cat = "office"; def weekend = "2014-11-16"; @@ -41,7 +41,7 @@ class CoverPrecent { result << ret; } - task.writeCSV3("E:\\数据测试\\结果\\商铺写字楼覆盖率\\","覆盖率-"+cat+".csv", result) + task.writeCSV3("E:\\鏁版嵁娴嬭瘯\\缁撴灉\\鍟嗛摵鍐欏瓧妤艰鐩栫巼\\","瑕嗙洊鐜�-"+cat+".csv", result) } @@ -52,18 +52,18 @@ class CoverPrecent { } - file.append("城市,") - file.append("楼盘数量,") - file.append("售价数量,") - file.append("租金数量,") - file.append("售价占比,") - file.append("租金占比,") - file.append("租房房源数,") - file.append("租房房源小区量,") - file.append("出售房源数,") - file.append("出售房源小区量,") - file.append("出租房源小区占比,") - file.append("出售房源小区占比,") + file.append("鍩庡競,") + file.append("妤肩洏鏁伴噺,") + file.append("鍞环鏁伴噺,") + file.append("绉熼噾鏁伴噺,") + file.append("鍞环鍗犳瘮,") + file.append("绉熼噾鍗犳瘮,") + file.append("绉熸埧鎴挎簮鏁�,") + file.append("绉熸埧鎴挎簮灏忓尯閲�,") + file.append("鍑哄敭鎴挎簮鏁�,") + file.append("鍑哄敭鎴挎簮灏忓尯閲�,") + file.append("鍑虹鎴挎簮灏忓尯鍗犳瘮,") + file.append("鍑哄敭鎴挎簮灏忓尯鍗犳瘮,") file.append(System.getProperty("line.separator")); ret.each{ map-> file.append(map.city+ ",","gbk") @@ -87,9 +87,9 @@ class CoverPrecent { def totalCount = findTotalCount(city, cat); def kind = ""; if(cat == "shop"){ - kind = "商铺"; + kind = "鍟嗛摵"; }else if(cat == "office"){ - kind = "写字楼"; + kind = "鍐欏瓧妤�"; } def sellCount = findSellPriceCountByCat(city, kind, weekend); def rentCount = findRentPriceCountByCat(city, kind, weekend); @@ -107,7 +107,7 @@ class CoverPrecent { ret.rentCount = rentCount; ret.sellCoverPecent = DataUtil.getRound(2, sellCoverPecent) ; ret.rentCoverPecent = DataUtil.getRound(2, rentCoverPecent) ; - println "【${city}】:"+totalCount+" sellCount:"+sellCount+" rentCount:"+rentCount+" sellCoverPecent:"+sellCoverPecent+" rentCoverPecent:"+rentCoverPecent + println "銆�${city}銆�:"+totalCount+" sellCount:"+sellCount+" rentCount:"+rentCount+" sellCoverPecent:"+sellCoverPecent+" rentCoverPecent:"+rentCoverPecent return ret; } @@ -134,7 +134,7 @@ class CoverPrecent { DBObject q = new BasicDBObject(); q.put("city", city); q.put('weekend', DateUtils.parseFromTightYYYYMMDD(weekend)); - if(kind == '商铺'){ + if(kind == '鍟嗛摵'){ return SHOP_STAT_COLL.count(q); }else{ return OFFICE_STAT_COLL.count(q); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/DatabaseStatWatcherBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/DatabaseStatWatcherBatch.groovy index 25296b2a6..a46737fcb 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/DatabaseStatWatcherBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/DatabaseStatWatcherBatch.groovy @@ -13,7 +13,7 @@ import com.mongodb.Mongo import com.mongodb.MongoURI /** - * 功能说明:监控数据库数据量 + * 鍔熻兘璇存槑:鐩戞帶鏁版嵁搴撴暟鎹噺 */ @BatchOwner(Watcher.WangWenYan) class DatabaseStatWatcherBatch extends BaseBatch { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/DistrictAroundDataAnaly.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/DistrictAroundDataAnaly.groovy index 6fc4bbbc8..124138729 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/DistrictAroundDataAnaly.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/DistrictAroundDataAnaly.groovy @@ -16,7 +16,7 @@ import com.mongodb.DBObject import java.util.concurrent.ConcurrentHashMap /** - * 小区周边数据统计脚本 + * 灏忓尯鍛ㄨ竟鏁版嵁缁熻鑴氭湰 */ @BatchOwner(Watcher.WangWenYan) public class DistrictAroundDataAnaly extends BaseBatch { @@ -58,7 +58,7 @@ public class DistrictAroundDataAnaly extends BaseBatch { DbUtils.multiThreadingExecuteQueryOnSeaweed(new BasicDBObject("city", city).append("cat", "district").append("visible", 0), { BasicDBObject dbo -> def data = new BasicDBObject() if (dbo.lng && polygonMap.size() > 0) { - def economics = ["中心城区", "普通城区", "郊区"] + def economics = ["涓績鍩庡尯", "鏅�氬煄鍖�", "閮婂尯"] for (def economic : economics) { def latlngs = polygonMap.get(economic) if (latlngs != null) { @@ -75,10 +75,10 @@ public class DistrictAroundDataAnaly extends BaseBatch { } } if (!data.containsField("economic")) { - data.put("economic", "郊外") + data.put("economic", "閮婂") } } - def types = ["商场": "060101", "麦当劳": "050302", "肯德基": "050301", "星巴克": "050501", "地铁站": "150500", "小学": "141202", "中学": "141203", "市中心": "190500"] + def types = ["鍟嗗満": "060101", "楹﹀綋鍔�": "050302", "鑲痉鍩�": "050301", "鏄熷反鍏�": "050501", "鍦伴搧绔�": "150500", "灏忓": "141202", "涓": "141203", "甯備腑蹇�": "190500"] if (dbo.lng) { def nearest_classic_pois = [] types.each { def type, def code -> @@ -98,7 +98,7 @@ public class DistrictAroundDataAnaly extends BaseBatch { AMAP_POI_COLL.find(query, new BasicDBObject("name", 1).append("lat", 1).append("lng", 1)).limit(1).each { BasicDBObject poi -> def classicPoi = new BasicDBObject() classicPoi.code = code - classicPoi.name = poi.name.toString().replaceAll("((|\\().*()|\\))", "") + classicPoi.name = poi.name.toString().replaceAll("(锛坾\\().*(锛墊\\))", "") classicPoi.lng = poi.lng classicPoi.lat = poi.lat classicPoi.distance = GeoUtils.calculateDistance(dbo.lng / 10000000000d, dbo.lat / 10000000000d, classicPoi.lng, classicPoi.lat) @@ -186,7 +186,7 @@ public class DistrictAroundDataAnaly extends BaseBatch { def query = new BasicDBObject() query.append('lat', new BasicDBObject('$gte', arr[0]).append('$lte', arr[1])) query.append('lng', new BasicDBObject('$gte', arr[2]).append('$lte', arr[3])) - query.append("business_type", "美食") + query.append("business_type", "缇庨") def keys = new BasicDBObject("consumption", 1) List numbers = new ArrayList(); BUSINESS_SHOP_COLL.find(query, keys).each { BasicDBObject dbo -> diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/DistrictBackupReset.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/DistrictBackupReset.groovy index f49a0c9c3..12a85027b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/DistrictBackupReset.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/DistrictBackupReset.groovy @@ -31,14 +31,14 @@ class DistrictBackupReset { def startDate = "2014-12-07"; def index = 0; for(def city : citys){ - if(city!="上海"){ + if(city!="涓婃捣"){ index ++; def backUpMap = findBackUp(city); - println "【${city}】备份数据:"+backUpMap.size(); + println "銆�${city}銆戝浠芥暟鎹細"+backUpMap.size(); def districts = findUpdateDistrictData(city, startDate) - println "【${city}】可能修改的小区数据有:"+districts.size(); + println "銆�${city}銆戝彲鑳戒慨鏀圭殑灏忓尯鏁版嵁鏈夛細"+districts.size(); updateDistrict(districts, backUpMap); - println "${index} 更新完成..........................." + println "${index} 鏇存柊瀹屾垚..........................." } } @@ -58,8 +58,8 @@ class DistrictBackupReset { }else{ index ++; - println "[${index}]当前:"+obj; - println "[${index}]备份:"+map; + println "[${index}]褰撳墠锛�"+obj; + println "[${index}]澶囦唤锛�"+map; DBObject udata = new BasicDBObject(); udata.put("m_date", new Date()); @@ -134,7 +134,7 @@ class DistrictBackupReset { if(cursor){ for(def dbo : cursor){ def city = dbo.get("display"); - if(city!='全国'){ + if(city!='鍏ㄥ浗'){ citys << city; } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/DistrictFinishDateCover.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/DistrictFinishDateCover.groovy index f25fd7d67..f009117be 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/DistrictFinishDateCover.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/DistrictFinishDateCover.groovy @@ -11,7 +11,7 @@ import com.fangjia.script.util.MongoUtils import com.fangjia.core.util.DateUtil; import com.fangjia.core.util.DataUtil /** - * 分期竣工时间覆盖率 + * 鍒嗘湡绔e伐鏃堕棿瑕嗙洊鐜� * @author gaojuan * */ @@ -25,7 +25,7 @@ class DistrictFinishDateCover { } def run(){ - def citys = ["上海"];//findAllCity() + def citys = ["涓婃捣"];//findAllCity() for(def city : citys){ def districts = getAllDistricts(city, "district"); findFenQiData(districts); @@ -43,24 +43,24 @@ class DistrictFinishDateCover { def findFenQiData(districts){ def fenqiDatas = []; - //查找分期数据 + //鏌ユ壘鍒嗘湡鏁版嵁 if(districts && districts.size() > 0){ for(def map : districts){ def keys = map.key def dbo = map.value; def name = dbo.name; - if(name.indexOf("期")!=-1){ + if(name.indexOf("鏈�")!=-1){ fenqiDatas << dbo; } } } - //查找总小区 + //鏌ユ壘鎬诲皬鍖� def dists = []; for(def dbo : fenqiDatas){ def name = dbo.name def region = dbo.region - name = name.replaceAll("[一|二|三|四|五|六|七|八|九|十]期", "") + name = name.replaceAll("[涓�|浜寍涓墊鍥泑浜攟鍏瓅涓億鍏珅涔潀鍗乚鏈�", "") def obj = districts.get(region + "@"+name); if(obj){ if(!dists.contains(obj)){ @@ -103,8 +103,8 @@ class DistrictFinishDateCover { def rett1 = calDateCover(dists); //def rett2 = calDateCover(rets); - writeCSV("E:\\数据测试\\结果\\","上海分期(总).csv", rett1) - //writeCSV("E:\\数据测试\\结果\\","上海分期.csv", rett2) + writeCSV("E:\\鏁版嵁娴嬭瘯\\缁撴灉\\","涓婃捣鍒嗘湡(鎬�).csv", rett1) + //writeCSV("E:\\鏁版嵁娴嬭瘯\\缁撴灉\\","涓婃捣鍒嗘湡.csv", rett2) } def calDateCover(dists){ @@ -160,8 +160,8 @@ class DistrictFinishDateCover { def count = haveTimeDists.size(); def precent = count * 100/total; precent = DataUtil.getRound(2,precent); - println "覆盖率:" + precent - println "共:" + total + println "瑕嗙洊鐜囷細" + precent + println "鍏憋細" + total return haveTimeDists; } @@ -172,9 +172,9 @@ class DistrictFinishDateCover { } - file.append("区域,") - file.append("名称,") - file.append("时间,") + file.append("鍖哄煙,") + file.append("鍚嶇О,") + file.append("鏃堕棿,") file.append(System.getProperty("line.separator")); ret.each{ map-> @@ -217,7 +217,7 @@ class DistrictFinishDateCover { if(cursor){ for(def dbo : cursor){ def city = dbo.get("display"); - if(city!='全国'){ + if(city!='鍏ㄥ浗'){ citys << city; } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/DistrictPriceRatingBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/DistrictPriceRatingBatch.groovy index f34dc1923..540186994 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/DistrictPriceRatingBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/DistrictPriceRatingBatch.groovy @@ -58,7 +58,7 @@ class DistrictPriceRatingBatch extends BaseBatch { if(item.maxArea && item.maxArea < 40){ continue } - item.tag = "豪华住宅" + item.tag = "璞崕浣忓畢" haoHuaList << item } list.removeAll(haoHuaList) @@ -78,19 +78,19 @@ class DistrictPriceRatingBatch extends BaseBatch { if(item.maxArea && item.maxArea < 60){ continue } - item.tag = "高档住宅" + item.tag = "楂樻。浣忓畢" gaoDangList << item } for(int i = regionList.size() * 0.75 ; i <= regionList.size(); i++){ DistrictPriceOrderItem item = regionList.get(i - 1) - item.tag = "低档住宅" + item.tag = "浣庢。浣忓畢" diDangList << item } } list.removeAll(gaoDangList) list.removeAll(diDangList) list.each {DistrictPriceOrderItem item-> - item.tag = "普通住宅" + item.tag = "鏅�氫綇瀹�" } haoHuaList.each { DISTRICT_ANALY_DATA_COLL.update(new BasicDBObject("city", city).append("region", it.region).append("district_name", it.name), new BasicDBObject('$set', new BasicDBObject('tag', it.tag)), true, true) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/DistrictStatMarkupCalcBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/DistrictStatMarkupCalcBatch.groovy index 32afa22f9..6d9fe9a9f 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/DistrictStatMarkupCalcBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/DistrictStatMarkupCalcBatch.groovy @@ -12,8 +12,8 @@ import com.mongodb.Bytes import com.mongodb.DBCollection /** - * 小区均价涨跌幅纠正脚本 - * 功能说明: + * 灏忓尯鍧囦环娑ㄨ穼骞呯籂姝h剼鏈� + * 鍔熻兘璇存槑: */ @BatchOwner(Watcher.WangWenYan) class DistrictStatMarkupCalcBatch extends BaseBatch { @@ -29,19 +29,19 @@ class DistrictStatMarkupCalcBatch extends BaseBatch { @Override void process(Object args) { def cityList = CommonUtils.findAllCity() - cityList =["北海"] + cityList =["鍖楁捣"] int total = cityList.size() int count = 1 cityList.each {def city -> - DbUtils.multiThreadingExecuteQueryOnSeaweed(DbUtils.buildSeaweedQuery(city,"海城","东旭华庭"),{BasicDBObject district-> + DbUtils.multiThreadingExecuteQueryOnSeaweed(DbUtils.buildSeaweedQuery(city,"娴峰煄","涓滄棴鍗庡涵"),{BasicDBObject district-> def query = new BasicDBObject() query.city = district.city query.region = district.region query.district_name = district.name - if(district.estate_type2 && "别墅" == district.estate_type2){ - query.estate_type = "别墅" + if(district.estate_type2 && "鍒" == district.estate_type2){ + query.estate_type = "鍒" }else{ - query.estate_type = "小区" + query.estate_type = "灏忓尯" } List items = DISTRICT_STAT.find(query, new BasicDBObject("avg_price", 1).append("weekend_markup", 1).append("weekend", 1)).batchSize(2000).addOption(Bytes.QUERYOPTION_SLAVEOK).sort(new BasicDBObject("weekend", 1)).toList() if(items.size() < 2){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/DistrictStatRankBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/DistrictStatRankBatch.groovy index a11b60d8d..f30bc1eb4 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/DistrictStatRankBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/DistrictStatRankBatch.groovy @@ -37,7 +37,7 @@ class DistrictStatRankBatch extends BaseBatch { public void process(Object args) { - def cities = ["深圳"]//ServerAreaMap.findAllCities() + def cities = ["娣卞湷"]//ServerAreaMap.findAllCities() for(String city : cities) { // DISTRICT_STAT_MAP.clear() // Map> regions = RegionData.getAllRegions(city) @@ -187,7 +187,7 @@ class DistrictStatRankBatch extends BaseBatch { String city = district.city String region = district.region String name = district.name - String estateType = (district.estate_type2 != null && district.estate_type2.indexOf('别墅') > -1 ? '别墅' : '小区') + String estateType = (district.estate_type2 != null && district.estate_type2.indexOf('鍒') > -1 ? '鍒' : '灏忓尯') Date momWeekend = DateUtil.getThisSunday(DateUtil.getBeforeDay(new Date(), 30)) Date sosWeekend = DateUtil.getThisSunday(DateUtil.getBeforeDay(new Date(), 90)) @@ -339,9 +339,9 @@ class DistrictStatRankBatch extends BaseBatch { } public static int calculatePercentile(def values, def targetValue) { - // 找出数字在List中的排名 + // 鎵惧嚭鏁板瓧鍦↙ist涓殑鎺掑悕 def rank = values.indexOf(targetValue) + 1 - // 计算百分位数 + // 璁$畻鐧惧垎浣嶆暟 def percentile = (int)((rank / values.size()) * 100) return percentile; } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/EstateTypeChange.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/EstateTypeChange.groovy index 5c8cbcbc6..93b971bf5 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/EstateTypeChange.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/EstateTypeChange.groovy @@ -25,7 +25,7 @@ class EstateTypeChange { def offices = getAllDistricts(city, "office"); updateEstateType("office", offices); - println "【${city}】 完成......" + println "銆�${city}銆� 瀹屾垚......" } } @@ -38,21 +38,21 @@ class EstateTypeChange { def new_estate_type2 = ""; if(cat == "shop"){ - if(estate_type2 == "市场类商铺"||estate_type2 == "专项卖场"){ - new_estate_type2 = "专业市场"; - }else if(estate_type2 == "百货购物中心商铺" || estate_type2 == "商业综合体" || estate_type2 == "商务区商铺"){ - new_estate_type2 = "商场商铺"; - }else if(estate_type2 == "社区内铺"){ - new_estate_type2 = "社区商铺"; + if(estate_type2 == "甯傚満绫诲晢閾�"||estate_type2 == "涓撻」鍗栧満"){ + new_estate_type2 = "涓撲笟甯傚満"; + }else if(estate_type2 == "鐧捐揣璐墿涓績鍟嗛摵" || estate_type2 == "鍟嗕笟缁煎悎浣�" || estate_type2 == "鍟嗗姟鍖哄晢閾�"){ + new_estate_type2 = "鍟嗗満鍟嗛摵"; + }else if(estate_type2 == "绀惧尯鍐呴摵"){ + new_estate_type2 = "绀惧尯鍟嗛摵"; } }else if(cat == "office"){ - if(estate_type2 == "园区写字楼"){ - new_estate_type2 = "创意园区"; - }else if(estate_type2 == "酒店商务楼" || estate_type2 == "商业综合楼"){ - new_estate_type2 = "标准写字楼"; - }else if(estate_type2 == "商住两用楼"){ - new_estate_type2 = "商住两用"; + if(estate_type2 == "鍥尯鍐欏瓧妤�"){ + new_estate_type2 = "鍒涙剰鍥尯"; + }else if(estate_type2 == "閰掑簵鍟嗗姟妤�" || estate_type2 == "鍟嗕笟缁煎悎妤�"){ + new_estate_type2 = "鏍囧噯鍐欏瓧妤�"; + }else if(estate_type2 == "鍟嗕綇涓ょ敤妤�"){ + new_estate_type2 = "鍟嗕綇涓ょ敤"; } } @@ -69,10 +69,10 @@ class EstateTypeChange { } // else{ -// if(estate_type2!="社区商铺" && estate_type2!="商务区商铺" && estate_type2!="商业街商铺"){ +// if(estate_type2!="绀惧尯鍟嗛摵" && estate_type2!="鍟嗗姟鍖哄晢閾�" && estate_type2!="鍟嗕笟琛楀晢閾�"){ // println "[ ${index} ]"+ estate_type2+" " // } -// if(estate_type2!="标准写字楼"){ +// if(estate_type2!="鏍囧噯鍐欏瓧妤�"){ // println "[ ${index} ]"+ estate_type2+" " // } // diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/FindStageDistrictBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/FindStageDistrictBatch.groovy index a46baf30a..cad74efc7 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/FindStageDistrictBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/FindStageDistrictBatch.groovy @@ -10,12 +10,12 @@ import com.mongodb.BasicDBObject import org.apache.commons.lang.StringUtils import java.util.regex.Pattern -// 分期分区与主小区映射关系表 +// 鍒嗘湡鍒嗗尯涓庝富灏忓尯鏄犲皠鍏崇郴琛� @BatchOwner(Watcher.WangWenYan) class FindStageDistrictBatch extends BaseBatch { - Pattern STAGE_PATTERN = Pattern.compile("(([一二三四五六七八九十百千\\d]+)期?[,、至到]?)?([一二三四五六七八九十百千\\d]+)期\$"); - Pattern PARTITION_PATTERN = Pattern.compile("(\\w|东|南|北|中|西|甲|乙|丙|丁|一|二|三|四|五|六|七|八|九|十)区\$"); + Pattern STAGE_PATTERN = Pattern.compile("(([涓�浜屼笁鍥涗簲鍏竷鍏節鍗佺櫨鍗僜\d]+)鏈�?[锛屻�佽嚦鍒癩?)?([涓�浜屼笁鍥涗簲鍏竷鍏節鍗佺櫨鍗僜\d]+)鏈焅$"); + Pattern PARTITION_PATTERN = Pattern.compile("(\\w|涓渱鍗梶鍖梶涓瓅瑗縷鐢瞸涔檤涓檤涓亅涓�|浜寍涓墊鍥泑浜攟鍏瓅涓億鍏珅涔潀鍗�)鍖篭$"); static void main(String[] args) { @@ -27,14 +27,14 @@ class FindStageDistrictBatch extends BaseBatch { CommonUtils.findAllCity().each { def city -> CommonDatautils.SEAWEED_COLL.find(DbUtils.buildSeaweedQuery2(city), new BasicDBObject("region", 1).append("name", 1).append("master_district_name", 1).append("city", 1)).each { BasicDBObject dbo -> if (dbo.name =~ STAGE_PATTERN && StringUtils.isBlank(dbo.master_district_name)) { - def mainName = dbo.name.toString().replaceAll("([一二三四五六七八九十百千\\d]+)期\$", "") + def mainName = dbo.name.toString().replaceAll("([涓�浜屼笁鍥涗簲鍏竷鍏節鍗佺櫨鍗僜\d]+)鏈焅$", "") def query = DbUtils.buildSeaweedQuery(city, dbo.region, mainName) if (DbUtils.seaweed.count(query) != 0) { DbUtils.executeUpdateOnSeaweed(new BasicDBObject("_id", dbo._id), new BasicDBObject("master_district_name", mainName)) println(dbo) } } else if (dbo.name =~ PARTITION_PATTERN && StringUtils.isBlank(dbo.master_district_name)) { - def mainName = dbo.name.toString().replaceAll("(\\w|东|南|北|中|西|甲|乙|丙|丁|一|二|三|四|五|六|七|八|九|十)区\$", "") + def mainName = dbo.name.toString().replaceAll("(\\w|涓渱鍗梶鍖梶涓瓅瑗縷鐢瞸涔檤涓檤涓亅涓�|浜寍涓墊鍥泑浜攟鍏瓅涓億鍏珅涔潀鍗�)鍖篭$", "") def query = DbUtils.buildSeaweedQuery(city, dbo.region, mainName) if (DbUtils.seaweed.count(query) != 0) { DbUtils.executeUpdateOnSeaweed(new BasicDBObject("_id", dbo._id), new BasicDBObject("master_district_name", mainName)) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/ManualOperationDataStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/ManualOperationDataStat.groovy index 796f9b27b..197cdd367 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/ManualOperationDataStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/ManualOperationDataStat.groovy @@ -59,13 +59,13 @@ public class ManualOperationDataStat extends BaseBatch{ aliasAddQuery.append("cat", "district") aliasAddQuery.append("c_date", new BasicDBObject('$gte', startDate).append('$lt', endDate)) aliasAddQuery.append("city", city) - aliasAddQuery.append("opt", "添加") + aliasAddQuery.append("opt", "娣诲姞") def aliasRemoveQuery = new BasicDBObject() aliasRemoveQuery.append("cat", "district") aliasRemoveQuery.append("c_date", new BasicDBObject('$gte', startDate).append('$lt', endDate)) aliasRemoveQuery.append("city", city) - aliasRemoveQuery.append("opt", "删除") + aliasRemoveQuery.append("opt", "鍒犻櫎") data << [city, DbUtils.seaweed.count(createQuery), DbUtils.seaweed.count(removeQuery), ALIAS_UPDATE_OPERATION.count(aliasAddQuery), ALIAS_UPDATE_OPERATION.count(aliasRemoveQuery)] println([city, DbUtils.seaweed.count(createQuery), DbUtils.seaweed.count(removeQuery), ALIAS_UPDATE_OPERATION.count(aliasAddQuery), ALIAS_UPDATE_OPERATION.count(aliasRemoveQuery)]) @@ -122,15 +122,15 @@ public class ManualOperationDataStat extends BaseBatch{ def content = sd.getContent(map) println(content) - sendEmail(Watcher.WangWenYan.email, "后台统计量", content) - sendEmail("wangchencen@fangjia.com", "后台统计量", content) -// sendEmail("caoyuyan@fangjia.com", "后台统计量", content) -// sendEmail("shenyuan@fangjia.com", "后台统计量", content) -// sendEmail("xuminxia@fangjia.com", "后台统计量", content) -// sendEmail("huangcunliang@fangjia.com", "后台统计量", content) -// sendEmail("yaojingmeng@fangjia.com", "后台统计量", content) -// sendEmail("muliangshu@fangjia.com", "后台统计量", content) -// sendEmail("sunjian@fangjia.com", "后台统计量", content) + sendEmail(Watcher.WangWenYan.email, "鍚庡彴缁熻閲�", content) + sendEmail("wangchencen@fangjia.com", "鍚庡彴缁熻閲�", content) +// sendEmail("caoyuyan@fangjia.com", "鍚庡彴缁熻閲�", content) +// sendEmail("shenyuan@fangjia.com", "鍚庡彴缁熻閲�", content) +// sendEmail("xuminxia@fangjia.com", "鍚庡彴缁熻閲�", content) +// sendEmail("huangcunliang@fangjia.com", "鍚庡彴缁熻閲�", content) +// sendEmail("yaojingmeng@fangjia.com", "鍚庡彴缁熻閲�", content) +// sendEmail("muliangshu@fangjia.com", "鍚庡彴缁熻閲�", content) +// sendEmail("sunjian@fangjia.com", "鍚庡彴缁熻閲�", content) } } \ No newline at end of file diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/MongoAccessLogAnalyzer.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/MongoAccessLogAnalyzer.groovy index 1eb26a108..dd71ff170 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/MongoAccessLogAnalyzer.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/MongoAccessLogAnalyzer.groovy @@ -13,7 +13,7 @@ import com.mongodb.DBCollection import java.util.regex.Pattern /** - *MongoDB慢日志分析脚本 + *MongoDB鎱㈡棩蹇楀垎鏋愯剼鏈� */ @BatchOwner(Watcher.WangWenYan) class MongoAccessLogAnalyzer extends BaseBatch { @@ -49,7 +49,7 @@ class MongoAccessLogAnalyzer extends BaseBatch { MONGO_SLOW_LOG.save(dbo) } }catch (Exception e){ - println(line + "\t\t发生异常") + println(line + "\t\t鍙戠敓寮傚父") e.printStackTrace() } @@ -129,9 +129,9 @@ class MongoAccessLogAnalyzer extends BaseBatch { map.put('totalCount', totalCount) map.put('avgTime', totalCountTime/totalCount) def content = sd.getContent(map) - sendEmail(Watcher.WangWenYan.email, DateUtil.add(new Date(), Calendar.DATE, -1).format("yyyy年MM月dd日")+ "超时日志报表", content) - sendEmail(Watcher.DuXiaoYu.email, DateUtil.add(new Date(), Calendar.DATE, -1).format("yyyy年MM月dd日")+ "超时日志报表", content) - sendEmail("joe@fangjia.com", DateUtil.add(new Date(), Calendar.DATE, -1).format("yyyy年MM月dd日")+ "超时日志报表", content) + sendEmail(Watcher.WangWenYan.email, DateUtil.add(new Date(), Calendar.DATE, -1).format("yyyy骞碝M鏈坉d鏃�")+ "瓒呮椂鏃ュ織鎶ヨ〃", content) + sendEmail(Watcher.DuXiaoYu.email, DateUtil.add(new Date(), Calendar.DATE, -1).format("yyyy骞碝M鏈坉d鏃�")+ "瓒呮椂鏃ュ織鎶ヨ〃", content) + sendEmail("joe@fangjia.com", DateUtil.add(new Date(), Calendar.DATE, -1).format("yyyy骞碝M鏈坉d鏃�")+ "瓒呮椂鏃ュ織鎶ヨ〃", content) } static final COUNTERS_PATTERNS = ['ntoreturn': Pattern.compile('ntoreturn:\\d+'), 'ntoskip': Pattern.compile('ntoskip:\\d+'), diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/PriceStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/PriceStat.groovy index 37de687cf..13f19a483 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/PriceStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/PriceStat.groovy @@ -26,14 +26,14 @@ class PriceStat { static main(args) { def task = new PriceStat(); - //task.run("南京", "shop"); - //task.houseCountStat("北京","写字楼"); - def citys = ["天津","重庆","成都","大连","沈阳","哈尔滨","牡丹江","大庆","齐齐哈尔","佳木斯","伊春","鸡西","鹤岗","双鸭山","七台河","绥化","黑河"]; + //task.run("鍗椾含", "shop"); + //task.houseCountStat("鍖椾含","鍐欏瓧妤�"); + def citys = ["澶╂触","閲嶅簡","鎴愰兘","澶ц繛","娌堥槼","鍝堝皵婊�","鐗′腹姹�","澶у簡","榻愰綈鍝堝皵","浣虫湪鏂�","浼婃槬","楦¤タ","楣ゅ矖","鍙岄腑灞�","涓冨彴娌�","缁ュ寲","榛戞渤"]; -// task.run("上海", "district"); +// task.run("涓婃捣", "district"); -// def citys = ["重庆","大连","哈尔滨","沈阳","大庆","牡丹江","齐齐哈尔"]; +// def citys = ["閲嶅簡","澶ц繛","鍝堝皵婊�","娌堥槼","澶у簡","鐗′腹姹�","榻愰綈鍝堝皵"]; // for(def city : citys){ // task.backupStat(city, "district"); // } @@ -55,7 +55,7 @@ class PriceStat { def backupStat(def city, def cat, def prefix){ def resultMap = getAllDistricts(city, cat); def ret = resultMap.ret; - println "[${city}] "+cat + " 共"+ret.size(); + println "[${city}] "+cat + " 鍏�"+ret.size(); //def detail = houseBackupStat(city); def detail = houseStat(city, cat +"_"+ prefix); def res = []; @@ -69,7 +69,7 @@ class PriceStat { def result = [:]; result.put(prefix+"HouseCount", ret.size()); result.put(prefix+"HouseDistCount", res.size()); - println "[${city}]"+" 共:"+ret.size()+" 有房源的[${cat}]:"+res.size(); + println "[${city}]"+" 鍏憋細"+ret.size()+" 鏈夋埧婧愮殑[${cat}]锛�"+res.size(); return result; } @@ -169,15 +169,15 @@ class PriceStat { } -// println "共"+index; -// println "有售价共:"+sellIndex -// println "有租价共:"+rentIndex -// println "竣工时间共:"+finishDateIndex -// println "建筑时间共:"+buildDateIndex -// println "居住时间共:"+liveDateIndex -// println "有时间共:"+dateIndex -// println "经纬度共:"+latlngIndex -// println "图片共:"+picIndex +// println "鍏�"+index; +// println "鏈夊敭浠峰叡锛�"+sellIndex +// println "鏈夌浠峰叡锛�"+rentIndex +// println "绔e伐鏃堕棿鍏憋細"+finishDateIndex +// println "寤虹瓚鏃堕棿鍏憋細"+buildDateIndex +// println "灞呬綇鏃堕棿鍏憋細"+liveDateIndex +// println "鏈夋椂闂村叡锛�"+dateIndex +// println "缁忕含搴﹀叡锛�"+latlngIndex +// println "鍥剧墖鍏憋細"+picIndex resultMap.sellPriceOffices = sellPriceOffices; resultMap.ret = ret; @@ -199,7 +199,7 @@ class PriceStat { detail << key; } - println "参与计算的共:"+sum+"房源!" + println "鍙備笌璁$畻鐨勫叡锛�"+sum+"鎴挎簮锛�" return detail; } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/RegionAnaDataBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/RegionAnaDataBatch.groovy index 95110db59..697e672b9 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/RegionAnaDataBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/RegionAnaDataBatch.groovy @@ -22,7 +22,7 @@ class RegionAnaDataBatch extends BaseBatch { @Override void process(Object args) { - Integer yearMonth = REGION_SELL_STAT.find(new BasicDBObject("city", "上海").append("region", "长宁")).sort(new BasicDBObject("date", -1)).limit(1).toList()[0].date + Integer yearMonth = REGION_SELL_STAT.find(new BasicDBObject("city", "涓婃捣").append("region", "闀垮畞")).sort(new BasicDBObject("date", -1)).limit(1).toList()[0].date CommonUtils.findAllCity().each {def city-> List orders = [] for(def region : RegionData.getAllRegions(city).keySet()){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/RegionRepair.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/RegionRepair.groovy index c2b8a024b..9113d2898 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/RegionRepair.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/RegionRepair.groovy @@ -37,7 +37,7 @@ public boolean isLegalRegion(String city,String region){ if(StringUtils.isBlank(region)){ return false; } - if(region.contains("周边")||region.contains("其他")){ + if(region.contains("鍛ㄨ竟")||region.contains("鍏朵粬")){ return false; } if(regions.containsKey(region)){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/SeaweedFieldStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/SeaweedFieldStat.groovy index 7bd26e459..9f7492019 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/SeaweedFieldStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/SeaweedFieldStat.groovy @@ -14,9 +14,9 @@ import org.bson.types.ObjectId class SeaweedFieldStat { DSCollection dataStoreConnection = null; public static final DBCollection SERVER_AREA_COLL = MongoUtils.getCollectionByName("fangjia", "server_area", "mongo.db.fangjia.com") - def distTypes = ["多层","小高层","超高层","高层","花园洋房","老洋房","四合院"]; - def villaTypes = ["独栋","双拼","联排","叠加"]; - def shopTypes = ["多层","小高层","超高层","高层","独栋","双拼","联排","叠加"]; + def distTypes = ["澶氬眰","灏忛珮灞�","瓒呴珮灞�","楂樺眰","鑺卞洯娲嬫埧","鑰佹磱鎴�","鍥涘悎闄�"]; + def villaTypes = ["鐙爧","鍙屾嫾","鑱旀帓","鍙犲姞"]; + def shopTypes = ["澶氬眰","灏忛珮灞�","瓒呴珮灞�","楂樺眰","鐙爧","鍙屾嫾","鑱旀帓","鍙犲姞"]; static main(args) { @@ -25,7 +25,7 @@ class SeaweedFieldStat { } def run(){ - def citys = ["上海"]//findAllCity(); + def citys = ["涓婃捣"]//findAllCity(); for(def city : citys){ def districts = getAllDistricts(city, "district"); //processEstateType(districts); @@ -46,7 +46,7 @@ class SeaweedFieldStat { public def statBlock(districts){ - println "小区共:"+districts.size(); + println "灏忓尯鍏憋細"+districts.size(); def index=0; for(def district : districts){ @@ -55,7 +55,7 @@ class SeaweedFieldStat { index++; } } - println "无block:"+index; + println "鏃燽lock:"+index; } public def getAllDistricts(def city, def cat){ DBObject q = new BasicDBObject(); @@ -91,35 +91,35 @@ class SeaweedFieldStat { for(def map : districts){ def estate_type2 = map.estate_type; if(estate_type2){ - if(!estate_type2.equals("普通住宅")&&!estate_type2.equals("别墅")&&!estate_type2.equals("商住")){ + if(!estate_type2.equals("鏅�氫綇瀹�")&&!estate_type2.equals("鍒")&&!estate_type2.equals("鍟嗕綇")){ DBObject udata = new BasicDBObject(); udata.put("m_date", new Date()); - udata.put("estate_type2", "普通住宅"); + udata.put("estate_type2", "鏅�氫綇瀹�"); DBObject q = new BasicDBObject(); q.put("_id", map.id); println "update ${map.id} "+estate_type2 getDataStoreConnection().update(q, new BasicDBObject('$set', udata)) } - }else{//物业类弄为空 + }else{//鐗╀笟绫诲紕涓虹┖ def name = map.name; - if(name.indexOf("别墅")!=-1){ + if(name.indexOf("鍒")!=-1){ DBObject udata = new BasicDBObject(); udata.put("m_date", new Date()); - udata.put("estate_type2", "别墅"); + udata.put("estate_type2", "鍒"); DBObject q = new BasicDBObject(); q.put("_id", map.id); - println "update ${map.id} 改为:别墅" + println "update ${map.id} 鏀逛负锛氬埆澧�" getDataStoreConnection().update(q, new BasicDBObject('$set', udata)) }else{ DBObject udata = new BasicDBObject(); udata.put("m_date", new Date()); - udata.put("estate_type2", "普通住宅"); + udata.put("estate_type2", "鏅�氫綇瀹�"); DBObject q = new BasicDBObject(); q.put("_id", map.id); - println "update ${map.id} 无物业类型" + println "update ${map.id} 鏃犵墿涓氱被鍨�" getDataStoreConnection().update(q, new BasicDBObject('$set', udata)) } @@ -132,15 +132,15 @@ class SeaweedFieldStat { for(def map : districts){ def build_type = map.build_type; def estate_type2 = map.estate_type; - if(map.name == "佘山东郡"){ + if(map.name == "浣樺北涓滈儭"){ println "ssssss" } def result ; - if(estate_type2 == "普通住宅"){ + if(estate_type2 == "鏅�氫綇瀹�"){ result = changeValue(estate_type2, build_type, distTypes); - }else if(estate_type2 == "别墅"){ + }else if(estate_type2 == "鍒"){ result = changeValue(estate_type2, build_type, villaTypes); - }else if(estate_type2 == "商住"){ + }else if(estate_type2 == "鍟嗕綇"){ result = changeValue(estate_type2, build_type, shopTypes); } if(build_type != result){ @@ -159,50 +159,50 @@ class SeaweedFieldStat { if(buildType && buildType!='null'){ def tempBuildTypes = []; - println "(${estate_type2})处理前:"+buildType; + println "(${estate_type2})澶勭悊鍓嶏細"+buildType; - if(buildType.indexOf("别墅")!=-1){ - buildType = buildType.replace("别墅",""); + if(buildType.indexOf("鍒")!=-1){ + buildType = buildType.replace("鍒",""); } - if(buildType.indexOf("叠拼")!=-1){ - buildType = buildType.replace("叠拼",""); + if(buildType.indexOf("鍙犳嫾")!=-1){ + buildType = buildType.replace("鍙犳嫾",""); } - if(buildType.indexOf("(")!=-1){ - def startIndex = buildType.indexOf("("); - def endIndex = buildType.indexOf(")")+1; + if(buildType.indexOf("锛�")!=-1){ + def startIndex = buildType.indexOf("锛�"); + def endIndex = buildType.indexOf("锛�")+1; def s = buildType.substring(startIndex, endIndex) buildType = buildType.replace(s, ""); } - if(buildType.indexOf(",")!=-1||buildType.indexOf(",")!=-1||buildType.indexOf(";")!=-1||buildType.indexOf(";")!=-1||buildType.indexOf(" ")!=-1||buildType.indexOf("、")!=-1||buildType.indexOf("|")!=-1){ - tempBuildTypes = buildType.split(",|;| |、|,|;||") + if(buildType.indexOf(",")!=-1||buildType.indexOf("锛�")!=-1||buildType.indexOf(";")!=-1||buildType.indexOf("锛�")!=-1||buildType.indexOf(" ")!=-1||buildType.indexOf("銆�")!=-1||buildType.indexOf("|")!=-1){ + tempBuildTypes = buildType.split(",|;| |銆亅锛寍锛泑|") }else{ tempBuildTypes << buildType } if(tempBuildTypes.size()==1 && buildType.length() > 5){ - println "可能含有其它分隔符......" + println "鍙兘鍚湁鍏跺畠鍒嗛殧绗�......" } if(tempBuildTypes.size() > 0){ buildType = standardType(tempBuildTypes, types); - println "处理后:"+buildType; + println "澶勭悊鍚庯細"+buildType; if(!buildType){ - println "不合要求" + println "涓嶅悎瑕佹眰" } } }else{ - if(estate_type2 == "普通住宅"){ - buildType = "小高层"; - println "默认 " - }else if(estate_type2 == "别墅"){ - buildType = "联排"; - println "默认 " - }else if(estate_type2 == "商住"){ - buildType = "小高层"; - println "默认 " + if(estate_type2 == "鏅�氫綇瀹�"){ + buildType = "灏忛珮灞�"; + println "榛樿 " + }else if(estate_type2 == "鍒"){ + buildType = "鑱旀帓"; + println "榛樿 " + }else if(estate_type2 == "鍟嗕綇"){ + buildType = "灏忛珮灞�"; + println "榛樿 " } } return buildType; @@ -228,7 +228,7 @@ class SeaweedFieldStat { if(cursor){ for(def dbo : cursor){ def city = dbo.get("display"); - if(city!='全国'){ + if(city!='鍏ㄥ浗'){ citys << city; } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/SeedsScore.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/SeedsScore.groovy index a01a6abf0..f860937c6 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/SeedsScore.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/SeedsScore.groovy @@ -24,7 +24,7 @@ class SeedsScore { private def run(){ - // def ids = findWebsitByScope("全国类"); + // def ids = findWebsitByScope("鍏ㄥ浗绫�"); // updateSeedsScoreByParentId(ids, 0); // def ret = readText("anjuke.txt"); // def ret = readText("focus.txt"); @@ -74,12 +74,12 @@ class SeedsScore { private def readText(def fileName){ File file = new File('h:\\'+fileName) def ret = []; - //对文件内容的每一行进行分割处理,比较常用在处理csv文件 + //瀵规枃浠跺唴瀹圭殑姣忎竴琛岃繘琛屽垎鍓插鐞嗭紝姣旇緝甯哥敤鍦ㄥ鐞哻sv鏂囦欢 file.splitEachLine(" ") { def temp = it ret << temp; } - //转为Writable对象,可重定向输出 + //杞负Writable瀵硅薄锛屽彲閲嶅畾鍚戣緭鍑� file.asWritable() return ret; } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/SmsUsageMonitorBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/SmsUsageMonitorBatch.groovy index df55acb56..9f3b469c0 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/SmsUsageMonitorBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/SmsUsageMonitorBatch.groovy @@ -12,8 +12,8 @@ import com.mongodb.DBCollection /** - * @author 文艳 - * 短息使用量监控脚本 + * @author 鏂囪壋 + * 鐭伅浣跨敤閲忕洃鎺ц剼鏈� */ @BatchOwner(Watcher.WangWenYan) public class SmsUsageMonitorBatch extends BaseBatch{ @@ -34,21 +34,21 @@ public class SmsUsageMonitorBatch extends BaseBatch{ for(int i = 0; i < 7; i++){ def date = calendar.getTime(); def item = [:] - item.day = date.format("yyyy年MM月dd日") + item.day = date.format("yyyy骞碝M鏈坉d鏃�") item.count = countUsageByDay(date) weekUsage << item calendar.add(Calendar.DATE, 1); } - /**获取剩余短信数量*/ + /**鑾峰彇鍓╀綑鐭俊鏁伴噺*/ int remain = (int)(SingletonClient.getClient().balance * 10) EmailTemplate sd = new EmailTemplate("smsUsage.ftl") Map map = new HashMap() map.put('weekUsage', weekUsage) map.put('remain', remain) def content = sd.getContent(map) - sendEmail(Watcher.WangWenYan.email, "短信近期使用情况", content) - sendEmail(Watcher.DuXiaoYu.email, "短信近期使用情况", content) - sendEmail("yangqixing@fangjia.com", "短信近期使用情况", content) + sendEmail(Watcher.WangWenYan.email, "鐭俊杩戞湡浣跨敤鎯呭喌", content) + sendEmail(Watcher.DuXiaoYu.email, "鐭俊杩戞湡浣跨敤鎯呭喌", content) + sendEmail("yangqixing@fangjia.com", "鐭俊杩戞湡浣跨敤鎯呭喌", content) } def countUsageByDay(Date date){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/SplitWebsiteTable.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/SplitWebsiteTable.groovy index 5042b0482..e73e79857 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/SplitWebsiteTable.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/SplitWebsiteTable.groovy @@ -33,7 +33,7 @@ class SplitWebsiteTable { def task = new SplitWebsiteTable(); // task.run(); - String s="周围商场:超市、便利商店等一应俱全,国美电器、易初莲花休闲生活:中小学:新城小学侨光中学,川沙中学华夏西校 商场:超市、便利商店等一应俱全,国美电器、易初莲花 医院:安平医院、川沙镇中心医院 邮局:中国邮政唐镇邮政所(浦东新区川沙分局) 银行:交通银行、工商银行、建设银行、农业银行 其他:六团邮政所、唐镇邮政所、避风塘茶楼、川沙体育场羽毛球馆餐饮设施:暂无资料周围学校:暂无资料医院:安平医院、川沙镇中心医院" + String s="鍛ㄥ洿鍟嗗満锛氳秴甯傘�佷究鍒╁晢搴楃瓑涓�搴斾勘鍏紝鍥界編鐢靛櫒銆佹槗鍒濊幉鑺变紤闂茬敓娲伙細涓皬瀛︼細鏂板煄灏忓渚ㄥ厜涓,宸濇矙涓鍗庡瑗挎牎 鍟嗗満锛氳秴甯傘�佷究鍒╁晢搴楃瓑涓�搴斾勘鍏紝鍥界編鐢靛櫒銆佹槗鍒濊幉鑺� 鍖婚櫌锛氬畨骞冲尰闄€�佸窛娌欓晣涓績鍖婚櫌 閭眬锛氫腑鍥介偖鏀垮攼闀囬偖鏀挎墍(娴︿笢鏂板尯宸濇矙鍒嗗眬) 閾惰锛氫氦閫氶摱琛屻�佸伐鍟嗛摱琛屻�佸缓璁鹃摱琛屻�佸啘涓氶摱琛� 鍏朵粬锛氬叚鍥㈤偖鏀挎墍銆佸攼闀囬偖鏀挎墍銆侀伩椋庡鑼舵ゼ銆佸窛娌欎綋鑲插満缇芥瘺鐞冮椁愰ギ璁炬柦锛氭殏鏃犺祫鏂欏懆鍥村鏍★細鏆傛棤璧勬枡鍖婚櫌锛氬畨骞冲尰闄€�佸窛娌欓晣涓績鍖婚櫌" def ss = task.test2(s); println ss ; } @@ -41,27 +41,27 @@ class SplitWebsiteTable { def test2(obj){ String s = obj.toString(); String ret = ""; - if(s=='周围商场:休闲生活:餐饮设施:周围学校:医院:'){ + if(s=='鍛ㄥ洿鍟嗗満锛氫紤闂茬敓娲伙細椁愰ギ璁炬柦锛氬懆鍥村鏍★細鍖婚櫌锛�'){ return ""; }else{ - String s1 = s.substring(0, s.indexOf("休闲生活:")); - String s2 = s.substring(s.indexOf("休闲生活:"), s.indexOf("餐饮设施:")); - String s3 = s.substring(s.indexOf("餐饮设施:"), s.indexOf("周围学校:")); - String s4 = s.substring(s.indexOf("周围学校:"), s.indexOf("医院:")); - String s5 = s.substring(s.indexOf("医院:"), s.length()); - if(s1!="周围商场:"){ + String s1 = s.substring(0, s.indexOf("浼戦棽鐢熸椿锛�")); + String s2 = s.substring(s.indexOf("浼戦棽鐢熸椿锛�"), s.indexOf("椁愰ギ璁炬柦锛�")); + String s3 = s.substring(s.indexOf("椁愰ギ璁炬柦锛�"), s.indexOf("鍛ㄥ洿瀛︽牎锛�")); + String s4 = s.substring(s.indexOf("鍛ㄥ洿瀛︽牎锛�"), s.indexOf("鍖婚櫌锛�")); + String s5 = s.substring(s.indexOf("鍖婚櫌锛�"), s.length()); + if(s1!="鍛ㄥ洿鍟嗗満锛�"){ ret = s1+"
"; } - if(s2!="休闲生活:"){ + if(s2!="浼戦棽鐢熸椿锛�"){ ret = ret + s2 +"
"; } - if(s3!="餐饮设施:"){ + if(s3!="椁愰ギ璁炬柦锛�"){ ret = ret + s3 +"
"; } - if(s4!="周围学校:"){ + if(s4!="鍛ㄥ洿瀛︽牎锛�"){ ret = ret + s4 +"
"; } - if(s5!="医院:"){ + if(s5!="鍖婚櫌锛�"){ ret = ret + s5 +"
"; } } @@ -73,19 +73,19 @@ class SplitWebsiteTable { def test(obj){ String s = obj.toString(); String ret = ""; - String[] traffices = s.split("周围商场:"); + String[] traffices = s.split("鍛ㄥ洿鍟嗗満锛�"); String traffice = traffices[0]; - if(traffice=='公交线路:地铁线路:'){ + if(traffice=='鍏氦绾胯矾锛氬湴閾佺嚎璺細'){ return ""; }else{ - String[] arr = traffice.split("地铁线路:"); - if(arr[0]!='公交线路:'){ + String[] arr = traffice.split("鍦伴搧绾胯矾锛�"); + if(arr[0]!='鍏氦绾胯矾锛�'){ ret = arr[0]+"
"; } if(arr.length==2){ arr[1] = arr[1].trim(); if(arr[1].length()>2){ - ret = ret +"地铁线路:"+arr[1]; + ret = ret +"鍦伴搧绾胯矾锛�"+arr[1]; } } @@ -126,9 +126,9 @@ class SplitWebsiteTable { private List> relatedJobs; - def siteScores = ["搜房网":9,"新浪乐居":9,"安居客":8.5,"搜狐焦点":8.5,"网上房地产":10,"网易":8, - "链家在线":8,"带看":8,"腾讯":7.5,"推推99房产网":7.5,"淘房屋":7,"我来房产":6.5,"星空地产网":6,"百度乐居":6,"房之窗":5,"房产之门":5,"上海热线":5,"吉屋网":4,"楼盘网":4,"聊宅网":3.5,"爱易网":3.5,"淘房":3, - "房王":3,"赶集":2,"58同城":2,"猎房网":1]; + def siteScores = ["鎼滄埧缃�":9,"鏂版氮涔愬眳":9,"瀹夊眳瀹�":8.5,"鎼滅嫄鐒︾偣":8.5,"缃戜笂鎴垮湴浜�":10,"缃戞槗":8, + "閾惧鍦ㄧ嚎":8,"甯︾湅":8,"鑵捐":7.5,"鎺ㄦ帹99鎴夸骇缃�":7.5,"娣樻埧灞�":7,"鎴戞潵鎴夸骇":6.5,"鏄熺┖鍦颁骇缃�":6,"鐧惧害涔愬眳":6,"鎴夸箣绐�":5,"鎴夸骇涔嬮棬":5,"涓婃捣鐑嚎":5,"鍚夊眿缃�":4,"妤肩洏缃�":4,"鑱婂畢缃�":3.5,"鐖辨槗缃�":3.5,"娣樻埧":3, + "鎴跨帇":3,"璧堕泦":2,"58鍚屽煄":2,"鐚庢埧缃�":1]; public def saveNewData(website){ for(def obj : website){ DBObject udata = new BasicDBObject(); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/Test.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/Test.groovy index 95859320b..4be91da92 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/Test.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/Test.groovy @@ -39,8 +39,8 @@ public class Test { public static void main(String[] ars){ def test = new Test(); // test.test(); -// //test.run("district", "上海"); -// test.analyDistrictPk("district", "天津");//小区统计与小区的对比 +// //test.run("district", "涓婃捣"); +// test.analyDistrictPk("district", "澶╂触");//灏忓尯缁熻涓庡皬鍖虹殑瀵规瘮 // println new Date(new ObjectId('5469bb4cda29ee73010fa577').getTime()) // test.addTestData(); test.findRepeatGuidingPrice() @@ -62,16 +62,16 @@ public class Test { } def datas = [] - datas << ["id", "城市","区域","名称","添加人","指导价","日期"] + datas << ["id", "鍩庡競","鍖哄煙","鍚嶇О","娣诲姞浜�","鎸囧浠�","鏃ユ湡"] map.each{key,list-> if(list.size()>1){ def userNames = [] for(def ret : list){ userNames << ret.guiding_person } - if(userNames.contains("付贵生")){ + if(userNames.contains("浠樿吹鐢�")){ for(def r : list){ - if(r.guiding_person!="付贵生"){ + if(r.guiding_person!="浠樿吹鐢�"){ GUIDING_PRICE_COLL.remove(new BasicDBObject("_id", r._id)) } } @@ -80,15 +80,15 @@ public class Test { } } -// ExcelUtils.write("d:\\数据\\福州\\指导价.xlsx",datas, "datas") +// ExcelUtils.write("d:\\鏁版嵁\\绂忓窞\\鎸囧浠�.xlsx",datas, "datas") } public void addTestData(){ DBObject obj = new BasicDBObject(); - obj.put("city", "北京"); - obj.put("region", "朝阳"); - obj.put("name", "朝阳广场"); + obj.put("city", "鍖椾含"); + obj.put("region", "鏈濋槼"); + obj.put("name", "鏈濋槼骞垮満"); obj.put("guiding_date", new Date()); obj.put("guiding_value", 60000); obj.put("category", "office"); @@ -99,7 +99,7 @@ public class Test { } public void test(){ - // 所有城市 + // 鎵�鏈夊煄甯� def allCitys = [:]; SERVER_AREA_CONN.find(new BasicDBObject('status', new BasicDBObject('$in', [0, 2]))).each { allCitys.put(it.display, it); } @@ -108,7 +108,7 @@ public class Test { citys << k.toString(); } - // 当期周末 + // 褰撴湡鍛ㄦ湯 Date weekend = DateUtil.getFirstDayOfWeek(new Date()); DBObject q = new BasicDBObject(); q.put("weekend", weekend); @@ -132,8 +132,8 @@ public class Test { public analyDistrictPk(def cat, def city){ def seaweedDists = findDistrictIds(cat, city); def districtInfos = findDistrictInfo(city, "2014-10-26"); - println "小区数:"+seaweedDists.size(); - println "小区分析表数:"+districtInfos.size(); + println "灏忓尯鏁帮細"+seaweedDists.size(); + println "灏忓尯鍒嗘瀽琛ㄦ暟锛�"+districtInfos.size(); def index = 0; for(def dist : districtInfos){ if(!seaweedDists.contains(dist)){ @@ -191,13 +191,13 @@ public class Test { } public String run(def cat, def city) { - def analyDists = findAnalySiteDistrict(cat, city);//分析表 + def analyDists = findAnalySiteDistrict(cat, city);//鍒嗘瀽琛� - def surplusDists = findSurplusDistrict(cat, city);//不存在小区表 + def surplusDists = findSurplusDistrict(cat, city);//涓嶅瓨鍦ㄥ皬鍖鸿〃 analyDists = analyDists + surplusDists; - def seaweedDists = CommonDatautils.getSimpleDistricts(cat, city);//总小区表 + def seaweedDists = CommonDatautils.getSimpleDistricts(cat, city);//鎬诲皬鍖鸿〃 println analyDists.size() println seaweedDists.size(); def index = 0; @@ -205,14 +205,14 @@ public class Test { if(!seaweedDists.contains(site)){ index++; - println "[${index}] 不在小区表:"+site; + println "[${index}] 涓嶅湪灏忓尯琛細"+site; } } for(def dist : seaweedDists){ if(!analyDists.contains(dist)){ index++; - println "[${index}] 小区不在分析表:"+dist; + println "[${index}] 灏忓尯涓嶅湪鍒嗘瀽琛細"+dist; } } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/UpdateCityLevel.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/UpdateCityLevel.groovy index ad2b533e1..b6eb2d251 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/UpdateCityLevel.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/UpdateCityLevel.groovy @@ -39,7 +39,7 @@ class UpdateCityLevel { def arr = line.split("\t"); def map = [:]; map.city = arr[0]; - map.level = arr[1].replace("级", "").replace("一", "1").replace("二", "2").replace("三", "3").replace("四", "4").replace("五", "5").replace("六", "6") + map.level = arr[1].replace("绾�", "").replace("涓�", "1").replace("浜�", "2").replace("涓�", "3").replace("鍥�", "4").replace("浜�", "5").replace("鍏�", "6") ret << map; } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/UserAgentAnalysisBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/UserAgentAnalysisBatch.groovy index 0d1a63693..1b87a6f3b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/UserAgentAnalysisBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/UserAgentAnalysisBatch.groovy @@ -53,7 +53,7 @@ public class UserAgentAnalysisBatch extends BaseBatch{ int times = 3 while(!logFile.exists() && times > 0){ - println("${new Date().format("yyyy-MM-dd HH:mm:ss")}\t${logFile.getAbsolutePath()} 未找到!!!!!") + println("${new Date().format("yyyy-MM-dd HH:mm:ss")}\t${logFile.getAbsolutePath()} 鏈壘鍒帮紒锛侊紒锛侊紒") Thread.sleep(1000 * 60 * 60) times -- } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/WeBankHouseAnalyBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/WeBankHouseAnalyBatch.groovy index e1a817061..06e95cefe 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/WeBankHouseAnalyBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/WeBankHouseAnalyBatch.groovy @@ -18,7 +18,7 @@ import java.util.concurrent.Executors import java.util.concurrent.TimeUnit /** - * 微众银行房源统计脚本 + * 寰紬閾惰鎴挎簮缁熻鑴氭湰 */ @BatchOwner(Watcher.WangWenYan) class WeBankHouseAnalyBatch extends BaseBatch { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/analy/AnalyCommonUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/analy/AnalyCommonUtils.groovy index 1c6e1e696..b8b03e892 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/analy/AnalyCommonUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/analy/AnalyCommonUtils.groovy @@ -20,8 +20,8 @@ class AnalyCommonUtils { public static final DBCollection ANALY_TASK_COLL = MongoUtils.getCollectionByName("coredata", "analy_task", "coredata.mongo.db.fangjia.com") public static final DBCollection ANALY_ROAD_COLL = MongoUtils.getCollectionByName("coredata", "analy_road", "coredata.mongo.db.fangjia.com") - static def villas = ["独栋","联排","双拼","叠加"] - static def districts = ["多层","小高层","高层","超高层","花园洋房","老洋房","四合院"]; + static def villas = ["鐙爧","鑱旀帓","鍙屾嫾","鍙犲姞"] + static def districts = ["澶氬眰","灏忛珮灞�","楂樺眰","瓒呴珮灞�","鑺卞洯娲嬫埧","鑰佹磱鎴�","鍥涘悎闄�"]; static def standardRegion(def regionMap,def region){ def lastRegion = ""; @@ -154,7 +154,7 @@ class AnalyCommonUtils { if(taskId!="null"&&taskId){ saveAnalyRoad(city, ret, taskId, site_name, page_name, cat); }else{ - println "没有相对应该的task_id"; + println "娌℃湁鐩稿搴旇鐨則ask_id"; } return taskId; } @@ -247,7 +247,7 @@ class AnalyCommonUtils { def newEstateType = ""; def newBuildType = ""; if(build_type){ - def buildTypes = build_type.split(",|、|;") + def buildTypes = build_type.split(",|銆亅;") def distTypes = [] def villaTypes = [] for(def type : buildTypes){ @@ -260,35 +260,35 @@ class AnalyCommonUtils { } } - if(estate_type2.indexOf("别墅")!=-1 && estate_type2.indexOf("普通住宅")!=-1){ + if(estate_type2.indexOf("鍒")!=-1 && estate_type2.indexOf("鏅�氫綇瀹�")!=-1){ if(villaTypes.size() > 0){ - newEstateType = "别墅"; + newEstateType = "鍒"; newBuildType = villaTypes.unique().join(","); }else{ - newEstateType = "普通住宅"; + newEstateType = "鏅�氫綇瀹�"; if(distTypes.size() > 0){ newBuildType = distTypes.unique().join(","); } } - }else if(estate_type2.indexOf("别墅")==-1 && estate_type2.indexOf("普通住宅")!=-1){ - newEstateType = "普通住宅"; + }else if(estate_type2.indexOf("鍒")==-1 && estate_type2.indexOf("鏅�氫綇瀹�")!=-1){ + newEstateType = "鏅�氫綇瀹�"; if(distTypes.size() > 0){ newBuildType = distTypes.unique().join(","); } - }else if(estate_type2.indexOf("别墅")!=-1 && estate_type2.indexOf("普通住宅")==-1){ - newEstateType = "别墅"; + }else if(estate_type2.indexOf("鍒")!=-1 && estate_type2.indexOf("鏅�氫綇瀹�")==-1){ + newEstateType = "鍒"; if(villaTypes.size()>0){ newBuildType = villaTypes.unique().join(","); } }else{ - newEstateType = "普通住宅"; + newEstateType = "鏅�氫綇瀹�"; } }else{ - if(estate_type2.indexOf("别墅")!=-1){ - newEstateType = "别墅"; + if(estate_type2.indexOf("鍒")!=-1){ + newEstateType = "鍒"; }else{ - newEstateType = "普通住宅"; + newEstateType = "鏅�氫綇瀹�"; } } @@ -301,7 +301,7 @@ class AnalyCommonUtils { def index = 1; for(def map : results){ updateDistrict(map, city); - println "[ "+city+" ]"+index +" 修改完成....." + println "[ "+city+" ]"+index +" 淇敼瀹屾垚....." index++; } } @@ -327,7 +327,7 @@ class AnalyCommonUtils { if (!dbValue ) { udata.put(k, v); }else{ - if(dbValue.toString().indexOf("暂无")!=-1){ + if(dbValue.toString().indexOf("鏆傛棤")!=-1){ udata.put(k, v); } } @@ -343,7 +343,7 @@ class AnalyCommonUtils { udata.put("estate_type2", typeMap.estate_type); udata.put("build_type", typeMap.build_type); } - println id.toString() + " " + obj.get("region") + " " + obj.get("name") + " 修改的值 :" + udata + println id.toString() + " " + obj.get("region") + " " + obj.get("name") + " 淇敼鐨勫�� 锛�" + udata udata.put("m_date", new Date()); getDataStoreConnection().update(q, new BasicDBObject('$set', udata)) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/analy/BkoffActionSelectAnaly.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/analy/BkoffActionSelectAnaly.groovy index 56af2f80a..412b91654 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/analy/BkoffActionSelectAnaly.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/analy/BkoffActionSelectAnaly.groovy @@ -36,7 +36,7 @@ class BkoffActionSelectAnaly{ char[] chars = new char[1]; chars[0] = str.charAt(0); String temp = new String(chars); - if (chars[0] >= 'A' && chars[0] <= 'Z') {//当为字母时,则转换为小写 + if (chars[0] >= 'A' && chars[0] <= 'Z') {//褰撲负瀛楁瘝鏃讹紝鍒欒浆鎹负灏忓啓 return str.replaceFirst(temp, temp.toLowerCase()); } return str; @@ -91,7 +91,7 @@ class BkoffActionSelectAnaly{ files << tempList[i]; } // if (tempList[i].isDirectory()) { -// System.out.println("文件夹:"+tempList[i]); +// System.out.println("鏂囦欢澶癸細"+tempList[i]); // } } return files; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/analy/DistrictFeatureAnalyBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/analy/DistrictFeatureAnalyBatch.groovy index aca381ea3..c5d02554b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/analy/DistrictFeatureAnalyBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/analy/DistrictFeatureAnalyBatch.groovy @@ -26,7 +26,7 @@ import static com.mongodb.client.model.Projections.include import static com.mongodb.client.model.Updates.combine import static com.mongodb.client.model.Updates.set -@BatchOwner(value = Watcher.WangWenYan, describe = "分析小区特征") +@BatchOwner(value = Watcher.WangWenYan, describe = "鍒嗘瀽灏忓尯鐗瑰緛") class DistrictFeatureAnalyBatch extends BaseBatch { @@ -51,7 +51,7 @@ class DistrictFeatureAnalyBatch extends BaseBatch { keys.finish_building_date = 1 UpdateOptions options = new UpdateOptions() options.upsert(true) - ["佛山", "济南", "北京", "广州", "深圳"].each { def city -> + ["浣涘北", "娴庡崡", "鍖椾含", "骞垮窞", "娣卞湷"].each { def city -> println(city) def statMap = new ConcurrentHashMap<>() def query = and(eq("city", city), eq("weekend", DateUtil.getThisSunday(new Date()))) @@ -108,8 +108,8 @@ class DistrictFeatureAnalyBatch extends BaseBatch { sqlBuffer.append("SELECT count(*) as count from esf_deal_price_lansi WHERE 1=1") sqlBuffer.append(" and fjCity = '${city}'") sqlBuffer.append(" and fjRegion ='${region}'") - sqlBuffer.append(" and (districtType != '写字楼' and districtType != '商铺' and districtType != '办公' and districtType !='工厂' and districtType != '其它' " + - " and houseType != '写字楼' and houseType != '商铺' and houseType != '办公' and houseType !='工厂' and houseType != '其它')") + sqlBuffer.append(" and (districtType != '鍐欏瓧妤�' and districtType != '鍟嗛摵' and districtType != '鍔炲叕' and districtType !='宸ュ巶' and districtType != '鍏跺畠' " + + " and houseType != '鍐欏瓧妤�' and houseType != '鍟嗛摵' and houseType != '鍔炲叕' and houseType !='宸ュ巶' and houseType != '鍏跺畠')") List namePars = new ArrayList() for (String alia : names) { if (StringUtils.isNotBlank(alia) && alia.trim().length() > 1) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/analy/EvaluationAnaly.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/analy/EvaluationAnaly.groovy index cd26eec8c..3b8fa766c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/analy/EvaluationAnaly.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/analy/EvaluationAnaly.groovy @@ -5,7 +5,7 @@ import com.mongodb.DBCollection; import com.mongodb.DBObject import com.fangjia.script.util.MongoUtils import com.fangjia.script.util.DateUtils -//估价数据分析 +//浼颁环鏁版嵁鍒嗘瀽 class EvaluationAnaly{ public static final DBCollection EVALUATION_COLL = MongoUtils.getCollectionByName("fangjia", "evaluation", "mongo.db.fangjia.com") @@ -32,7 +32,7 @@ class EvaluationAnaly{ map.put(ip, detailMap) } - //ip估价次数统计 + //ip浼颁环娆℃暟缁熻 def totalCount = detailMap.get("total_count"); if(!totalCount){ detailMap.put("total_count", 1) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/analy/FangJiaIndexPageDataAnalyBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/analy/FangJiaIndexPageDataAnalyBatch.groovy index 4e61a9570..d49d94b9b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/analy/FangJiaIndexPageDataAnalyBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/analy/FangJiaIndexPageDataAnalyBatch.groovy @@ -8,8 +8,8 @@ import com.mongodb.BasicDBObject import com.mongodb.DBCollection /** - * 房价网首页 - * 估价记录和API总量统计 + * 鎴夸环缃戦椤� + * 浼颁环璁板綍鍜孉PI鎬婚噺缁熻 * */ @BatchOwner(Watcher.WangWenYan) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/analy/NewKerEsfCrawlTask.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/analy/NewKerEsfCrawlTask.groovy index 92d988339..7abc9d402 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/analy/NewKerEsfCrawlTask.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/analy/NewKerEsfCrawlTask.groovy @@ -19,7 +19,7 @@ import org.jsoup.select.Elements; import com.fangjia.script.BatchOwner import com.fangjia.script.Watcher /** - * 解析克而瑞小区概况页(二手小区) + * 瑙f瀽鍏嬭�岀憺灏忓尯姒傚喌椤�(浜屾墜灏忓尯) * @author gaojuan * */ @@ -39,25 +39,25 @@ class NewKerEsfCrawlTask extends BaseBatch{ @Override public void process(Object args) { - run(["沈阳","大连","天津","成都","重庆"]); + run(["娌堥槼","澶ц繛","澶╂触","鎴愰兘","閲嶅簡"]); } def run(def citys){ - def site_name = "克而瑞房价"; - def page_name = "首页"; + def site_name = "鍏嬭�岀憺鎴夸环"; + def page_name = "棣栭〉"; def cat = "district" for(def city : citys){ def webpages = findWebpages(site_name, page_name, city, cat); - println "【${city}】共找到搜房 "+webpages.size()+"个网页"; + println "銆�${city}銆戝叡鎵惧埌鎼滄埧 "+webpages.size()+"涓綉椤�"; def regions = AnalyCommonUtils.findRegion(city); def blocks = AnalyCommonUtils.findRegionBlock(city); def ret = analyWebpages(city, webpages, regions, blocks); - AnalyCommonUtils.addAnalyRoad(site_name, "概况", city, ret, cat); + AnalyCommonUtils.addAnalyRoad(site_name, "姒傚喌", city, ret, cat); } @@ -78,22 +78,22 @@ class NewKerEsfCrawlTask extends BaseBatch{ def doc = Jsoup.parse(s); resultMap.city = city; - def alias = doc.select(".esgrid_left p:contains(别名:) em").text().trim() + def alias = doc.select(".esgrid_left p:contains(鍒悕锛�) em").text().trim() def ele = doc.select(".descr_cont_info") - resultMap.name = ele.select("li:contains(小区名称) a").text().trim() - def addressInfo = ele.select("li:contains(小区地址) cite").text().trim(); - resultMap.build_area = AnalyCommonUtils.getNumeric(ele.select("li:contains(建筑面积) cite").text().replace("-", "").replace(",", "").trim(), "(\\d+)"); - resultMap.developer = ele.select("li:contains(开发商) cite").text().replace("-", "").trim(); - resultMap.estate_company = ele.select("li:contains(物业公司) cite").text().replace("-", "").trim(); - resultMap.virescence_percent = AnalyCommonUtils.getNumeric(ele.select("li:contains(绿化率) cite").text().replace("-", "").replace("%", "").trim(), "(\\d+[\\.]?[\\d+]?(\\S+)(.*)?)"); - resultMap.cubage_percent = AnalyCommonUtils.getNumeric(ele.select("li:contains(容积率) cite").text().replace("-", "").trim(), "(\\d+[\\.]?[\\d+]?(\\S+)(.*)?)"); + resultMap.name = ele.select("li:contains(灏忓尯鍚嶇О) a").text().trim() + def addressInfo = ele.select("li:contains(灏忓尯鍦板潃) cite").text().trim(); + resultMap.build_area = AnalyCommonUtils.getNumeric(ele.select("li:contains(寤虹瓚闈㈢Н) cite").text().replace("-", "").replace(",", "").trim(), "(\\d+)"); + resultMap.developer = ele.select("li:contains(寮�鍙戝晢) cite").text().replace("-", "").trim(); + resultMap.estate_company = ele.select("li:contains(鐗╀笟鍏徃) cite").text().replace("-", "").trim(); + resultMap.virescence_percent = AnalyCommonUtils.getNumeric(ele.select("li:contains(缁垮寲鐜�) cite").text().replace("-", "").replace("%", "").trim(), "(\\d+[\\.]?[\\d+]?(\\S+)(.*)?)"); + resultMap.cubage_percent = AnalyCommonUtils.getNumeric(ele.select("li:contains(瀹圭Н鐜�) cite").text().replace("-", "").trim(), "(\\d+[\\.]?[\\d+]?(\\S+)(.*)?)"); if(alias){ def aliasList = []; aliasList << alias; resultMap.alias = aliasList; } - //区域及地址解析 + //鍖哄煙鍙婂湴鍧�瑙f瀽 if(addressInfo){ def region = addressInfo.substring(addressInfo.indexOf("[")+1, addressInfo.indexOf("]")); resultMap.region = AnalyCommonUtils.standardRegion(regions, region); @@ -108,8 +108,8 @@ class NewKerEsfCrawlTask extends BaseBatch{ resultMap.address = addressInfo.substring(addressInfo.lastIndexOf("]")+1, addressInfo.size()); } - //物业费解析 - def estate_charge = ele.select("li:contains(物业费) cite").text().replace("元/㎡/月", "").trim(); + //鐗╀笟璐硅В鏋� + def estate_charge = ele.select("li:contains(鐗╀笟璐�) cite").text().replace("鍏�/銕�/鏈�", "").trim(); if(estate_charge){ if(estate_charge.indexOf("-")==-1){ resultMap.estate_charge = estate_charge; @@ -125,8 +125,8 @@ class NewKerEsfCrawlTask extends BaseBatch{ } - //建造时间解析 - def houseAge = ele.select("li:contains(小区房龄) cite").text().replace("年", "").trim(); + //寤洪�犳椂闂磋В鏋� + def houseAge = ele.select("li:contains(灏忓尯鎴块緞) cite").text().replace("骞�", "").trim(); if(houseAge && AnalyCommonUtils.isNumeric(houseAge)){ def age = houseAge.toInteger(); if(age > 1000){ @@ -139,18 +139,18 @@ class NewKerEsfCrawlTask extends BaseBatch{ } - //户数解析 - def houseInfo = ele.select("li:contains(小区房源) cite").text().replace("-", "").trim(); + //鎴锋暟瑙f瀽 + def houseInfo = ele.select("li:contains(灏忓尯鎴挎簮) cite").text().replace("-", "").trim(); if(houseInfo){ - def household_count = AnalyCommonUtils.getNumeric(houseInfo, "共(\\d+)套") + def household_count = AnalyCommonUtils.getNumeric(houseInfo, "鍏�(\\d+)濂�") resultMap.household_count = household_count; } - //页面异步加载,拿不到相关信息 - //交通 + //椤甸潰寮傛鍔犺浇锛屾嬁涓嶅埌鐩稿叧淇℃伅 + //浜ら�� // resultMap.traffic = doc.select("#data_list_station") // -// //周边配套 +// //鍛ㄨ竟閰嶅 // def facilities = ""; // def facilities_edu = doc.select("#data_list_edu cite") // def facilities_life = doc.select("#data_list_life cite") @@ -175,24 +175,24 @@ class NewKerEsfCrawlTask extends BaseBatch{ resultMap.url = url+"_des"; resultMap = AnalyCommonUtils.filerValueIsNull(resultMap); - println "【 ${index} 】"+resultMap; + println "銆� ${index} 銆�"+resultMap; if(resultMap.name){ sucCount++; results << resultMap; }else{ failCount++; - println "小区名称没解析出来" + println "灏忓尯鍚嶇О娌¤В鏋愬嚭鏉�" } }else{ failCount++; - println "没有网页内容" + println "娌℃湁缃戦〉鍐呭" } } - println "失败:"+failCount - println "成功:"+sucCount + println "澶辫触锛�"+failCount + println "鎴愬姛锛�"+sucCount return results; } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/analy/NewKerXfCrawlTask.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/analy/NewKerXfCrawlTask.groovy index a67087cc4..e41251e9b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/analy/NewKerXfCrawlTask.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/analy/NewKerXfCrawlTask.groovy @@ -17,7 +17,7 @@ import org.jsoup.nodes.Document import org.jsoup.select.Elements; /** - * 克而瑞新房抓取,解析,空值替换 + * 鍏嬭�岀憺鏂版埧鎶撳彇锛岃В鏋愶紝绌哄�兼浛鎹� * @author gaojuan * */ @@ -34,11 +34,11 @@ class NewKerXfCrawlTask { static main(args) { def task = new NewKerXfCrawlTask(); def ret = [ - "沈阳":"http://www.fangjiadp.com/shenyang/advanced/search", - "大连":"http://www.fangjiadp.com/dalian/advanced/search", - "天津":"http://www.fangjiadp.com/tianjin/advanced/search", - "成都":"http://www.fangjiadp.com/chengdu/advanced/search", - "重庆":"http://www.fangjiadp.com/chongqing/advanced/search" + "娌堥槼":"http://www.fangjiadp.com/shenyang/advanced/search", + "澶ц繛":"http://www.fangjiadp.com/dalian/advanced/search", + "澶╂触":"http://www.fangjiadp.com/tianjin/advanced/search", + "鎴愰兘":"http://www.fangjiadp.com/chengdu/advanced/search", + "閲嶅簡":"http://www.fangjiadp.com/chongqing/advanced/search" ]; task.run(ret, "district"); } @@ -61,14 +61,14 @@ class NewKerXfCrawlTask { def blocks = AnalyCommonUtils.findRegionBlock(city); def ret = analyWebpages(city, detailUrls, regions, blocks); - AnalyCommonUtils.addAnalyRoad("克而瑞房价", "详情", city, ret, cat); + AnalyCommonUtils.addAnalyRoad("鍏嬭�岀憺鎴夸环", "璇︽儏", city, ret, cat); } def getNextPageLink(def url, def urls){ String s = http.get(url, [:], "utf-8"); if(s){ def doc = Jsoup.parse(s); - def nextPageElement = doc.select("a:contains(下一页)"); + def nextPageElement = doc.select("a:contains(涓嬩竴椤�)"); if(nextPageElement){ def nextPageUrl = nextPageElement.attr("href"); def newUrl = "http://www.fangjiadp.com/"+nextPageUrl; @@ -108,7 +108,7 @@ class NewKerXfCrawlTask { String s = http.get(url, [:], "utf-8"); if(s){ def doc = Jsoup.parse(s); - def detailUrl = doc.select("a:contains(楼盘详情)"); + def detailUrl = doc.select("a:contains(妤肩洏璇︽儏)"); if(detailUrl){ detailUrl = detailUrl.attr("href"); allUrls << "http://www.fangjiadp.com" + detailUrl; @@ -140,30 +140,30 @@ class NewKerXfCrawlTask { def doc = Jsoup.parse(s); resultMap.city = city; - resultMap.name = doc.select("li:contains(楼盘名称:) cite,.a_t").text().trim(); - resultMap.address = doc.select(".property_m>dl:contains(地址:)>dd").text().replace(";", "").trim(); - resultMap.estate_type2 = doc.select(".property_f>ul>li:contains(物业类型:)>span").text().replace(";", "").trim(); + resultMap.name = doc.select("li:contains(妤肩洏鍚嶇О锛�) cite,.a_t").text().trim(); + resultMap.address = doc.select(".property_m>dl:contains(鍦板潃锛�)>dd").text().replace(";", "").trim(); + resultMap.estate_type2 = doc.select(".property_f>ul>li:contains(鐗╀笟绫诲瀷锛�)>span").text().replace(";", "").trim(); - resultMap.live_date = doc.select(".property_f>ul>li:contains(交房日期:)>span").text().trim(); - resultMap.developer = doc.select(".property_f>ul>li:contains(开发商:)>span").text().replace("-", "").trim(); - resultMap.build_area = AnalyCommonUtils.getNumeric(doc.select(".property_f>ul>li:contains(建筑面积:)>span").text().replace("-", "").replace(",", "").trim(), "(\\d+)"); - resultMap.build_type = doc.select(".property_f>ul>li:contains(建筑形态:)>span").text().trim(); - resultMap.household_count = AnalyCommonUtils.getNumeric(doc.select(".property_f>ul>li:contains(规划户数:)>span").text().trim(), "(\\d+)"); - resultMap.property_life = doc.select("li:contains(产权信息:) cite").text().replace(";", "").trim(); - resultMap.fitment = doc.select(".property_f>ul>li:contains(装修情况:)>span").text().replace(";", "").trim(); - resultMap.fitment_level = doc.select(".property_f>ul>li:contains(装修标准:)>span").text().replace("-元/㎡", "").trim(); - resultMap.virescence_percent = AnalyCommonUtils.getNumeric(doc.select(".property_f>ul>li:contains(绿化率:)>span").text().replace("-", "").replace("%", "").trim(), "(\\d+[\\.]?[\\d+]?(\\S+)(.*)?)"); - resultMap.cubage_percent = AnalyCommonUtils.getNumeric(doc.select(".property_f>ul>li:contains(容积率:)>span").text().replace("-", "").trim(), "(\\d+[\\.]?[\\d+]?(\\S+)(.*)?)"); - resultMap.estate_company = doc.select(".property_f>ul>li:contains(物业公司:)>span").text().trim(); + resultMap.live_date = doc.select(".property_f>ul>li:contains(浜ゆ埧鏃ユ湡锛�)>span").text().trim(); + resultMap.developer = doc.select(".property_f>ul>li:contains(寮�鍙戝晢锛�)>span").text().replace("-", "").trim(); + resultMap.build_area = AnalyCommonUtils.getNumeric(doc.select(".property_f>ul>li:contains(寤虹瓚闈㈢Н锛�)>span").text().replace("-", "").replace(",", "").trim(), "(\\d+)"); + resultMap.build_type = doc.select(".property_f>ul>li:contains(寤虹瓚褰㈡�侊細)>span").text().trim(); + resultMap.household_count = AnalyCommonUtils.getNumeric(doc.select(".property_f>ul>li:contains(瑙勫垝鎴锋暟锛�)>span").text().trim(), "(\\d+)"); + resultMap.property_life = doc.select("li:contains(浜ф潈淇℃伅锛�) cite").text().replace(";", "").trim(); + resultMap.fitment = doc.select(".property_f>ul>li:contains(瑁呬慨鎯呭喌锛�)>span").text().replace(";", "").trim(); + resultMap.fitment_level = doc.select(".property_f>ul>li:contains(瑁呬慨鏍囧噯锛�)>span").text().replace("-鍏�/銕�", "").trim(); + resultMap.virescence_percent = AnalyCommonUtils.getNumeric(doc.select(".property_f>ul>li:contains(缁垮寲鐜囷細)>span").text().replace("-", "").replace("%", "").trim(), "(\\d+[\\.]?[\\d+]?(\\S+)(.*)?)"); + resultMap.cubage_percent = AnalyCommonUtils.getNumeric(doc.select(".property_f>ul>li:contains(瀹圭Н鐜囷細)>span").text().replace("-", "").trim(), "(\\d+[\\.]?[\\d+]?(\\S+)(.*)?)"); + resultMap.estate_company = doc.select(".property_f>ul>li:contains(鐗╀笟鍏徃锛�)>span").text().trim(); - resultMap.car_site = doc.select(".property_f>ul>li:contains(车位数:)>span").text().trim(); - resultMap.sell_address = doc.select(".property_f>ul>li:contains(售楼处:)>span").text().trim(); - resultMap.mobile = doc.select(".property_f>ul>li:contains(售楼电话:)>span").text().trim(); + resultMap.car_site = doc.select(".property_f>ul>li:contains(杞︿綅鏁帮細)>span").text().trim(); + resultMap.sell_address = doc.select(".property_f>ul>li:contains(鍞ゼ澶勶細)>span").text().trim(); + resultMap.mobile = doc.select(".property_f>ul>li:contains(鍞ゼ鐢佃瘽锛�)>span").text().trim(); - def regionHtml = doc.select(".property_m>dl:contains(区域:)>dd").html(); + def regionHtml = doc.select(".property_m>dl:contains(鍖哄煙锛�)>dd").html(); - //区域板块及环线 + //鍖哄煙鏉垮潡鍙婄幆绾� if(regionHtml){ def array = regionHtml.split("") if(array.size()>=1){ @@ -185,8 +185,8 @@ class NewKerXfCrawlTask { } } - //物业费解析 - def estate_charge = doc.select(".property_f>ul>li:contains(物业费用:)>span").text().replace("元/㎡/月", "").trim(); + //鐗╀笟璐硅В鏋� + def estate_charge = doc.select(".property_f>ul>li:contains(鐗╀笟璐圭敤锛�)>span").text().replace("鍏�/銕�/鏈�", "").trim(); if(estate_charge){ if(estate_charge.indexOf("-")==-1){ resultMap.estate_charge = estate_charge; @@ -202,30 +202,30 @@ class NewKerXfCrawlTask { } - //开盘时间 - def open_date_str = doc.select(".property_f>ul>li:contains(开盘日期:)>span").text().trim(); + //寮�鐩樻椂闂� + def open_date_str = doc.select(".property_f>ul>li:contains(寮�鐩樻棩鏈燂細)>span").text().trim(); if(open_date_str){ resultMap.open_date = DateUtil.parseStringToDate(open_date_str) } resultMap.url = url; resultMap = AnalyCommonUtils.filerValueIsNull(resultMap); - println "【 ${index} 】"+resultMap; + println "銆� ${index} 銆�"+resultMap; if(resultMap.name){ sucCount++; results << resultMap; }else{ failCount++; - println "小区名称没解析出来" + println "灏忓尯鍚嶇О娌¤В鏋愬嚭鏉�" } }else{ failCount++; - println "没有网页内容" + println "娌℃湁缃戦〉鍐呭" } } - println "失败:"+failCount - println "成功:"+sucCount + println "澶辫触锛�"+failCount + println "鎴愬姛锛�"+sucCount return results; } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/analy/Test.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/analy/Test.groovy index 7d97306bf..adc5f801d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/analy/Test.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/analy/Test.groovy @@ -15,7 +15,7 @@ class Test { def task = new Test(); - def obj = "23平米" + def obj = "23骞崇背" Pattern pa = Pattern.compile("(\\d+(.\\d+)?)") def ma=pa.matcher(obj) def value = null; @@ -27,10 +27,10 @@ class Test { println value -// def names = task.findDistricts("shop", "北京", "房山"); -// println "库中:"+ names.size(); +// def names = task.findDistricts("shop", "鍖椾含", "鎴垮北"); +// println "搴撲腑锛�"+ names.size(); // def ret = task.readTxt("H:\\", "shop.txt"); -// println "Excel:"+ ret.size(); +// println "Excel锛�"+ ret.size(); // // def index = 0; // for(def exclName : ret){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/analy/Test_Weilei.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/analy/Test_Weilei.groovy index 12b6507a9..f7d253b7e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/analy/Test_Weilei.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/analy/Test_Weilei.groovy @@ -87,13 +87,13 @@ return; //// } // // String h = new String(s.getBytes("iso-8859-1"),"UTF-8"); -// if(StringUtils.contains(h, "opt:更新")){ +// if(StringUtils.contains(h, "opt:鏇存柊")){ // count_update++; -// } else if(StringUtils.contains(h, "opt:放弃")){ +// } else if(StringUtils.contains(h, "opt:鏀惧純")){ // count_abort++; -// } else if(StringUtils.contains(h, "opt:保存")){ +// } else if(StringUtils.contains(h, "opt:淇濆瓨")){ // count_save++; -// } else if(StringUtils.contains(h, "opt:过滤")){ +// } else if(StringUtils.contains(h, "opt:杩囨护")){ // count_filter++; // } // diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/analy/WebAnalyLogBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/analy/WebAnalyLogBatch.groovy index 708debc4a..3e2d228e2 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/analy/WebAnalyLogBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/analy/WebAnalyLogBatch.groovy @@ -42,14 +42,14 @@ class WebAnalyLogBatch extends BaseBatch { if (file.exists()) { def retMap = analyFile(filePath); - println fileName + " 文件分析完成......" + println fileName + " 鏂囦欢鍒嗘瀽瀹屾垚......" saveToDB(retMap, yesterDay); - //移除10天前的文件 + //绉婚櫎10澶╁墠鐨勬枃浠� removeFile(path); } else { - println fileName + " 没有找到文件!"; + println fileName + " 娌℃湁鎵惧埌鏂囦欢锛�"; } } @@ -63,9 +63,9 @@ class WebAnalyLogBatch extends BaseBatch { if (file.exists()) { file.delete(); - println "删除文件 ......" + fileName; + println "鍒犻櫎鏂囦欢 ......" + fileName; } else { - println "要删的文件不存在 ......" + fileName; + println "瑕佸垹鐨勬枃浠朵笉瀛樺湪 ......" + fileName; } } @@ -92,29 +92,29 @@ class WebAnalyLogBatch extends BaseBatch { obj.put("city", keys[1]); obj.put("site_name", keys[2]); obj.put("stat_date", DateUtils.parseFromTightYYYYMMDD(yesterDay)); - if (v.getAt("总量")) { - obj.put("total_count", v.getAt("总量")); + if (v.getAt("鎬婚噺")) { + obj.put("total_count", v.getAt("鎬婚噺")); } - if (v.getAt("保存")) { - obj.put("add_count", v.getAt("保存")); + if (v.getAt("淇濆瓨")) { + obj.put("add_count", v.getAt("淇濆瓨")); } - if (v.getAt("更新")) { - obj.put("update_count", v.getAt("更新")); + if (v.getAt("鏇存柊")) { + obj.put("update_count", v.getAt("鏇存柊")); } - if (v.getAt("过滤")) { - obj.put("filter_count", v.getAt("过滤")); + if (v.getAt("杩囨护")) { + obj.put("filter_count", v.getAt("杩囨护")); } - if (v.getAt("异常")) { - obj.put("error_count", v.getAt("异常")); + if (v.getAt("寮傚父")) { + obj.put("error_count", v.getAt("寮傚父")); } - if (v.getAt("放弃")) { - obj.put("lost_count", v.getAt("放弃")); + if (v.getAt("鏀惧純")) { + obj.put("lost_count", v.getAt("鏀惧純")); } obj.put("c_date", new Date()); @@ -132,7 +132,7 @@ class WebAnalyLogBatch extends BaseBatch { } def writeTxt(def s, def day) { - FileUtils.writeStringToFile(new File("E:\\数据\\logs\\结果\\" + day + ".txt"), s, "GBK") + FileUtils.writeStringToFile(new File("E:\\鏁版嵁\\logs\\缁撴灉\\" + day + ".txt"), s, "GBK") } def printlnBaseInfo(retMap) { @@ -143,7 +143,7 @@ class WebAnalyLogBatch extends BaseBatch { def readTxt1(def file) { - //方式一 + //鏂瑰紡涓� def retMap = [:]; FileInputStream fis = new FileInputStream(file); RandomAccessFile raf = new RandomAccessFile(new File(file), "r"); @@ -173,11 +173,11 @@ class WebAnalyLogBatch extends BaseBatch { def s = line.substring(line.indexOf("-") + 2, line.length()); def infoMap = splitToMap(s) // def array = s.split("\\s+"); - //房源类型 + //鎴挎簮绫诲瀷 def cat = infoMap['cat']; - //城市详情 + //鍩庡競璇︽儏 def city = infoMap['city']; - //解析操作 + //瑙f瀽鎿嶄綔 def optType = infoMap['opt']; /*if(array[5].toString().endsWith('"city":"')){ array[5] = array[5] + array[6]; @@ -191,14 +191,14 @@ class WebAnalyLogBatch extends BaseBatch { detailMap = [:] retMap.putAt(key, detailMap); } - //房源类型总量 - def totalCount = detailMap["总量"]; + //鎴挎簮绫诲瀷鎬婚噺 + def totalCount = detailMap["鎬婚噺"]; if (!totalCount) { totalCount = 0; } - detailMap.put("总量", totalCount + 1); + detailMap.put("鎬婚噺", totalCount + 1); - //各种操作类型统计 + //鍚勭鎿嶄綔绫诲瀷缁熻 def count = detailMap.get(optType); if (!count) { count = 0; @@ -244,13 +244,13 @@ class WebAnalyLogBatch extends BaseBatch { webDetailMap.put(key, infoMap); } - def totalCount = infoMap.get("总量"); + def totalCount = infoMap.get("鎬婚噺"); if (!totalCount) { totalCount = 0; } - infoMap.put("总量", totalCount + 1); + infoMap.put("鎬婚噺", totalCount + 1); - //解析操作 + //瑙f瀽鎿嶄綔 def optType = getOptionType(array[0]); def count = infoMap.get(optType); if (!count) { @@ -288,7 +288,7 @@ class WebAnalyLogBatch extends BaseBatch { def readTxt3(def file) { Charset charset = Charset.forName("UTF-8"); -//Java.nio.charset.Charset处理了字符转换问题。它通过构造CharsetEncoder和CharsetDecoder将字符序列转换成字节和逆转换。 +//Java.nio.charset.Charset澶勭悊浜嗗瓧绗﹁浆鎹㈤棶棰樸�傚畠閫氳繃鏋勯�燙harsetEncoder鍜孋harsetDecoder灏嗗瓧绗﹀簭鍒楄浆鎹㈡垚瀛楄妭鍜岄�嗚浆鎹€�� CharsetDecoder decoder = charset.newDecoder(); FileInputStream fis = null; def retMap = [:]; @@ -319,7 +319,7 @@ class WebAnalyLogBatch extends BaseBatch { println byteBuffer.toString(); - if (charBuffer.toString().contains("[1009 10:39:22 711 INFO ] [exe1] - opt:异")) { + if (charBuffer.toString().contains("[1009 10:39:22 711 INFO ] [exe1] - opt:寮�")) { println "sss" } while (true) { @@ -429,7 +429,7 @@ class WebAnalyLogBatch extends BaseBatch { def readTxt4(def file) { // try { // BufferedInputStream bis = new BufferedInputStream(new FileInputStream(new File(file))); - // BufferedReader ino = new BufferedReader(new InputStreamReader(bis, "utf-8"), 10 * 1024 * 1024);//10M缓存 + // BufferedReader ino = new BufferedReader(new InputStreamReader(bis, "utf-8"), 10 * 1024 * 1024);//10M缂撳瓨 // int index = 0; // while(ino.ready()) { // String line = ino.readLine(); @@ -446,7 +446,7 @@ class WebAnalyLogBatch extends BaseBatch { // ex.printStackTrace(); // } // - //非一行一行读取 + //闈炰竴琛屼竴琛岃鍙� // File inFile = new File(file); // FileChannel inFileChannel = new FileInputStream(inFile).getChannel(); // byte[] bs = new byte[1024]; @@ -460,7 +460,7 @@ class WebAnalyLogBatch extends BaseBatch { // buffer.flip(); // def s = charset.decode(buffer); // sb.append(s); - // if(s.contains("[1009 10:39:22 711 INFO ] [exe1] - opt:异")){ + // if(s.contains("[1009 10:39:22 711 INFO ] [exe1] - opt:寮�")){ // println "sss" // } // println "[${index}]"+s; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/analy/XingyeDataBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/analy/XingyeDataBatch.groovy index bb15f9d53..08eca3ab0 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/analy/XingyeDataBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/analy/XingyeDataBatch.groovy @@ -36,10 +36,10 @@ class XingyeDataBatch { public static void main(String[] args) { List cities = ServerAreaMap.findAllCities() - List> rows = ExcelUtils.read("D:/房产测试合并数据21.xls", 0, 0) - //新序号 序号 地区 楼宇名称 房产地址 建筑面积 单价 总价值 城市 名称 地址 经度 纬度 - rows.get(0).add('计算类型') - rows.get(0).add('可信度') + List> rows = ExcelUtils.read("D:/鎴夸骇娴嬭瘯鍚堝苟鏁版嵁21.xls", 0, 0) + //鏂板簭鍙� 搴忓彿 鍦板尯 妤煎畤鍚嶇О 鎴夸骇鍦板潃 寤虹瓚闈㈢Н 鍗曚环 鎬讳环鍊� 鍩庡競 鍚嶇О 鍦板潃 缁忓害 绾害 + rows.get(0).add('璁$畻绫诲瀷') + rows.get(0).add('鍙俊搴�') for (int i = 1; i < rows.size(); i++) { println rows.get(i).get(0) List cloumns = rows.get(i) @@ -57,15 +57,15 @@ class XingyeDataBatch { String realCity = cloumns.get(11).toString().trim() realCity = formatCity(realCity, cities) - //todo 过滤掉不是小区的数据 - if('其他' == cat || StringUtils.isBlank(realCity) || !cities.contains(realCity)) { + //todo 杩囨护鎺変笉鏄皬鍖虹殑鏁版嵁 + if('鍏朵粬' == cat || StringUtils.isBlank(realCity) || !cities.contains(realCity)) { rows.get(i).add('') rows.get(i).add('') }else { Res res = null; - if ('商铺' == cat) { + if ('鍟嗛摵' == cat) { res = getShopPriceResult(realCity, realName, address, lng, lat) - } else if ('写字楼' == cat) { + } else if ('鍐欏瓧妤�' == cat) { res = getOfficePriceResult(realCity, realName, address, lng, lat) } else { res = getDistrictPriceResult(realCity, realName, address, lng, lat) @@ -85,7 +85,7 @@ class XingyeDataBatch { } } - ExcelUtils.write("D:/房产测试合并数据21-output.xls", rows, "数据") + ExcelUtils.write("D:/鎴夸骇娴嬭瘯鍚堝苟鏁版嵁21-output.xls", rows, "鏁版嵁") } private static String formatCity(String city, List cities) { @@ -93,8 +93,8 @@ class XingyeDataBatch { return city } - if(city.endsWith('市')) { - city = StringUtils.substringBeforeLast(city, "市") + if(city.endsWith('甯�')) { + city = StringUtils.substringBeforeLast(city, "甯�") if(cities.contains(city)) { return city } @@ -121,13 +121,13 @@ class XingyeDataBatch { } } - /**推测真正的正式名*/ + /**鎺ㄦ祴鐪熸鐨勬寮忓悕*/ static String speculateCityNameByRegion(String province, String orgName){ List foundCityList = new ArrayList(); - /**根据区域推测所在的城市*/ + /**鏍规嵁鍖哄煙鎺ㄦ祴鎵�鍦ㄧ殑鍩庡競*/ String temp; for(Map.Entry> entry : CITY_REGION_MAP.entrySet()){ - temp = orgName.replaceFirst("^" + entry.getKey(),"");//排除无"市"标示的城市信息干扰 如:北京海定区 + temp = orgName.replaceFirst("^" + entry.getKey(),"");//鎺掗櫎鏃�"甯�"鏍囩ず鐨勫煄甯備俊鎭共鎵� 濡傦細鍖椾含娴峰畾鍖� if(entry.getValue().contains(temp)){ if(province == null){ foundCityList.add(entry.getKey()); @@ -183,10 +183,10 @@ class XingyeDataBatch { private static Res getDistrictPriceResult(String realCity, String realName, String realAddr, Double lng, Double lat) { Res res = null; DBObject district = chooseDistrict(realCity, realName, realAddr, 'district') - if(district != null) {//利用计算的均价 + if(district != null) {//鍒╃敤璁$畻鐨勫潎浠� String proRegion = district.get('region') String proName = district.get('name') - String proEstateType = (district.get('estate_type2') != null && district.get('estate_type2').indexOf('别墅') > -1 ? '别墅' : '小区'); + String proEstateType = (district.get('estate_type2') != null && district.get('estate_type2').indexOf('鍒') > -1 ? '鍒' : '灏忓尯'); DBObject statq = new BasicDBObject() statq.put('city', realCity) statq.put('region', proRegion) @@ -200,7 +200,7 @@ class XingyeDataBatch { } } - //利用样本房源进行计算 + //鍒╃敤鏍锋湰鎴挎簮杩涜璁$畻 if(res == null) { List houses = fetchHousesInSeawater(realCity, realName, 1000) if(houses != null && houses.size() > 10) { @@ -212,7 +212,7 @@ class XingyeDataBatch { } } - //利用周边计算 + //鍒╃敤鍛ㄨ竟璁$畻 if(res == null && lat != null && lng != null) { String js = HTTP.invoke('/evaluation/lngLatEvaluate', [city : realCity, lng:lng, lat:lat, lngLatType:1], "UTF-8") if(js != null) { @@ -241,7 +241,7 @@ class XingyeDataBatch { } /** - * 在seaweed中选择一个最优的小区 + * 鍦╯eaweed涓�夋嫨涓�涓渶浼樼殑灏忓尯 * @param city * @param name * @param address @@ -341,7 +341,7 @@ class XingyeDataBatch { /** - * 数量得分(最高得分0.1) + * 鏁伴噺寰楀垎(鏈�楂樺緱鍒�0.1) * * @param points * @return @@ -350,14 +350,14 @@ class XingyeDataBatch { if (points.size() == 0) { return 0; } - // 每10个样本=0.01 + // 姣�10涓牱鏈�=0.01 double c1 = (double) points.size() / 10.0 / 100.0; c1 = (c1 > 0.1 ? 0.1 : c1); return c1; } /** - * 质量得分(最高得分0.1) + * 璐ㄩ噺寰楀垎(鏈�楂樺緱鍒�0.1) * * @param points * @return @@ -373,21 +373,21 @@ class XingyeDataBatch { for (DBObject p : points) { Date d = p.get('publish_date') long diff = calcDate.getTime() - d.getTime(); - if (diff <= 30 * 24 * 3600 * 1000) {// 一个月内 + if (diff <= 30 * 24 * 3600 * 1000) {// 涓�涓湀鍐� c2 = c2 + perc * 1.00d; - } else if (diff <= 60 * 24 * 3600 * 1000) {// 两个月内 + } else if (diff <= 60 * 24 * 3600 * 1000) {// 涓や釜鏈堝唴 c2 = c2 + perc * 0.90d; - } else if (diff <= 90 * 24 * 3600 * 1000) {// 三个月内 + } else if (diff <= 90 * 24 * 3600 * 1000) {// 涓変釜鏈堝唴 c2 = c2 + perc * 0.85d; - } else if (diff <= 180 * 24 * 3600 * 1000) {// 半年内 + } else if (diff <= 180 * 24 * 3600 * 1000) {// 鍗婂勾鍐� c2 = c2 + perc * 0.80d; - } else if (diff <= 365 * 24 * 3600 * 1000) {// 一年内 + } else if (diff <= 365 * 24 * 3600 * 1000) {// 涓�骞村唴 c2 = c2 + perc * 0.70d; - } else if (diff <= 540 * 24 * 3600 * 1000) {// 一年半内 + } else if (diff <= 540 * 24 * 3600 * 1000) {// 涓�骞村崐鍐� c2 = c2 + perc * 0.60d; - } else if (diff <= 720 * 24 * 3600 * 1000) {// 两年内 + } else if (diff <= 720 * 24 * 3600 * 1000) {// 涓ゅ勾鍐� c2 = c2 + perc * 0.40d; - } else {// 超过两年 + } else {// 瓒呰繃涓ゅ勾 c2 = c2 + perc * 0.10d; } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/analy/XingyeDataPrice.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/analy/XingyeDataPrice.groovy index 738c92f8f..ffd2d821f 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/analy/XingyeDataPrice.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/analy/XingyeDataPrice.groovy @@ -24,7 +24,7 @@ class XingyeDataPrice { public static HttpHelper HTTP = new HttpHelper("192.168.10.66:7180"); public static void main(String[] args) { - String fileName = "介入数据跑价格补城市价格"; + String fileName = "浠嬪叆鏁版嵁璺戜环鏍艰ˉ鍩庡競浠锋牸"; List cities = ServerAreaMap.findAllCities() List> rows = ExcelUtils.read("D:/${fileName}.xls", 0, 0) for (int i = 1; i < rows.size(); i++) { @@ -78,14 +78,14 @@ class XingyeDataPrice { cloumns.set(16, "0.01") } - ExcelUtils.write("D:/${fileName}-final.xls", rows, "数据") + ExcelUtils.write("D:/${fileName}-final.xls", rows, "鏁版嵁") } public static void maindd3(String[] args) { - List idList = FileUtils.readLines(new File("D:/介入ID.txt")) + List idList = FileUtils.readLines(new File("D:/浠嬪叆ID.txt")) - String fileName = "房价调查完成合并数据0324终-final16"; + String fileName = "鎴夸环璋冩煡瀹屾垚鍚堝苟鏁版嵁0324缁�-final16"; List cities = ServerAreaMap.findAllCities() List> rows = ExcelUtils.read("D:/${fileName}.xls", 0, 0) List> newRows = [rows.get(0)]; @@ -161,10 +161,10 @@ class XingyeDataPrice { } - ExcelUtils.write("D:/${fileName}-final.xls", newRows, "数据") + ExcelUtils.write("D:/${fileName}-final.xls", newRows, "鏁版嵁") } public static void maind(String[] args) { - String fileName = "其他类"; + String fileName = "鍏朵粬绫�"; List cities = ServerAreaMap.findAllCities() List> rows = ExcelUtils.read("D:/${fileName}.xlsx", 0, 0) def eschars = [] as String[] @@ -243,7 +243,7 @@ class XingyeDataPrice { cloumns.set(16, "0.01") } - ExcelUtils.write("D:/${fileName}-final.xlsx", rows, "数据") + ExcelUtils.write("D:/${fileName}-final.xlsx", rows, "鏁版嵁") } @@ -252,8 +252,8 @@ class XingyeDataPrice { return city } - if(city.endsWith('市')) { - city = StringUtils.substringBeforeLast(city, "市") + if(city.endsWith('甯�')) { + city = StringUtils.substringBeforeLast(city, "甯�") if(cities.contains(city)) { return city } @@ -279,13 +279,13 @@ class XingyeDataPrice { } } - /**推测真正的正式名*/ + /**鎺ㄦ祴鐪熸鐨勬寮忓悕*/ static String speculateCityNameByRegion(String province, String orgName){ List foundCityList = new ArrayList(); - /**根据区域推测所在的城市*/ + /**鏍规嵁鍖哄煙鎺ㄦ祴鎵�鍦ㄧ殑鍩庡競*/ String temp; for(Map.Entry> entry : CITY_REGION_MAP.entrySet()){ - temp = orgName.replaceFirst("^" + entry.getKey(),"");//排除无"市"标示的城市信息干扰 如:北京海定区 + temp = orgName.replaceFirst("^" + entry.getKey(),"");//鎺掗櫎鏃�"甯�"鏍囩ず鐨勫煄甯備俊鎭共鎵� 濡傦細鍖椾含娴峰畾鍖� if(entry.getValue().contains(temp)){ if(province == null){ foundCityList.add(entry.getKey()); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/anshuo/DistrictExportBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/anshuo/DistrictExportBatch.groovy index e7b011edc..172565c38 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/anshuo/DistrictExportBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/anshuo/DistrictExportBatch.groovy @@ -28,95 +28,95 @@ import com.mongodb.QueryOperators class DistrictExportBatch { public static final FILELD_MAP = [ - "_id":"楼盘编号", - "city":"所在城市", - "region":"所在地区", - "block":"所在板块", - "name":"楼盘名称", - "estate_type2":"物业类型", - "build_type":"建筑类型", - "live_date":"竣工时间(建成年份)", - "lng2":"经度", - "lat2":"纬度", - "developer":"开发商名称", - "estate_company":"物业公司", - "estate_charge":"物业费", - "licence":"商品房销售许可证号", - "address":"楼盘地址", - "area":"面积", - "avg_price":"楼盘单价", - "totalPrice":"评估总价", - "city_price":"城市均价", - "city_price_markup":"近半年城市均价涨跌幅", - "rent_price":"租房均价", - "year_markup":"均价涨跌幅", - "month_markup":"环比上月", - "max_price":"历史最高单价", - "min_price":"历史最低单价", - "futrue_price":"未来一年房价预测", - "futrue_markup":"未来一年房价涨跌幅预测", - "last_month_house_count":"上个月挂牌量", - "half_year_house_count":"半年挂牌量", - "attention_level":"近三个月买家关注度", - "block_rank":"板块排名", - "block_count":"板块个数", - "region_rank":"区域排名", - "region_count":"区域个数", - "consumption":"周边餐饮的人均消费", - "consumption_level":"综合消费水平高于所属城市的楼盘数", + "_id":"妤肩洏缂栧彿", + "city":"鎵�鍦ㄥ煄甯�", + "region":"鎵�鍦ㄥ湴鍖�", + "block":"鎵�鍦ㄦ澘鍧�", + "name":"妤肩洏鍚嶇О", + "estate_type2":"鐗╀笟绫诲瀷", + "build_type":"寤虹瓚绫诲瀷", + "live_date":"绔e伐鏃堕棿(寤烘垚骞翠唤)", + "lng2":"缁忓害", + "lat2":"绾害", + "developer":"寮�鍙戝晢鍚嶇О", + "estate_company":"鐗╀笟鍏徃", + "estate_charge":"鐗╀笟璐�", + "licence":"鍟嗗搧鎴块攢鍞鍙瘉鍙�", + "address":"妤肩洏鍦板潃", + "area":"闈㈢Н", + "avg_price":"妤肩洏鍗曚环", + "totalPrice":"璇勪及鎬讳环", + "city_price":"鍩庡競鍧囦环", + "city_price_markup":"杩戝崐骞村煄甯傚潎浠锋定璺屽箙", + "rent_price":"绉熸埧鍧囦环", + "year_markup":"鍧囦环娑ㄨ穼骞�", + "month_markup":"鐜瘮涓婃湀", + "max_price":"鍘嗗彶鏈�楂樺崟浠�", + "min_price":"鍘嗗彶鏈�浣庡崟浠�", + "futrue_price":"鏈潵涓�骞存埧浠烽娴�", + "futrue_markup":"鏈潵涓�骞存埧浠锋定璺屽箙棰勬祴", + "last_month_house_count":"涓婁釜鏈堟寕鐗岄噺", + "half_year_house_count":"鍗婂勾鎸傜墝閲�", + "attention_level":"杩戜笁涓湀涔板鍏虫敞搴�", + "block_rank":"鏉垮潡鎺掑悕", + "block_count":"鏉垮潡涓暟", + "region_rank":"鍖哄煙鎺掑悕", + "region_count":"鍖哄煙涓暟", + "consumption":"鍛ㄨ竟椁愰ギ鐨勪汉鍧囨秷璐�", + "consumption_level":"缁煎悎娑堣垂姘村钩楂樹簬鎵�灞炲煄甯傜殑妤肩洏鏁�", - "KTV_count":"KTV数量", - "cinema_count":"电影院数量", - "jianshen_count":"健身中心数量", - "zhonghesc_count":"综合商场数量", - "spa_count":"美容院数量", - "hotel_count":"星级酒店数量", - "bigmarket_count":"大型超市数量", - "gef_count":"高尔夫球场数量", - "slschool_count":"私立学校数量", - "zrzx_count":"整容整形数量", - "coffee_count":"咖啡厅数量", - "bath_count":"洗浴数量", - "office_count":"写字楼数量", - "hspt_count":"医院数量", - "bank_count":"银行数量", - "atm_count":"ATM数量", - "park_count":"公园绿地数量", - "comm_count":"商圈数量", - "bus_count":"公交车站数量", - "subway_count":"地铁数量", - "school_count":"学校数量", - "air_count":"机场数量", - "market_count":"超市数量", - "wb_count":"网吧数量", - "ywss_count":"厌恶设施数量", - "all_area":"楼盘占地总面积", - "build_area":"楼盘建筑总面积", - "household_count":"总套数", -// "":"可售套数", -// "":"所在省份", -// "alias1":"楼盘别名1", -// "alias2":"楼盘别名2", -// "alias3":"楼盘别名3", - "kind":"小区类型", - "virescence_percent":"绿化率", - "cubage_percent":"容积率", -// "facilities":"配套信息", - "traffic":"交通情况", - "household_count":"户数", - "car_site":"车位情况", -// "":"具体楼盘号", - "property_life":"产权性质", - "build_structure":"房屋结构", - "open_date":"开盘时间", - "sell_address":"售楼地址", - "discount":"折扣信息", -// "fitment_materials":"建材装修", - "floor_info":"楼层状况", - "description":"描述", -// "c_date":"登记日期", -// "m_date":"更新日期", -// "out_pics":"外景图", + "KTV_count":"KTV鏁伴噺", + "cinema_count":"鐢靛奖闄㈡暟閲�", + "jianshen_count":"鍋ヨ韩涓績鏁伴噺", + "zhonghesc_count":"缁煎悎鍟嗗満鏁伴噺", + "spa_count":"缇庡闄㈡暟閲�", + "hotel_count":"鏄熺骇閰掑簵鏁伴噺", + "bigmarket_count":"澶у瀷瓒呭競鏁伴噺", + "gef_count":"楂樺皵澶悆鍦烘暟閲�", + "slschool_count":"绉佺珛瀛︽牎鏁伴噺", + "zrzx_count":"鏁村鏁村舰鏁伴噺", + "coffee_count":"鍜栧暋鍘呮暟閲�", + "bath_count":"娲楁荡鏁伴噺", + "office_count":"鍐欏瓧妤兼暟閲�", + "hspt_count":"鍖婚櫌鏁伴噺", + "bank_count":"閾惰鏁伴噺", + "atm_count":"ATM鏁伴噺", + "park_count":"鍏洯缁垮湴鏁伴噺", + "comm_count":"鍟嗗湀鏁伴噺", + "bus_count":"鍏氦杞︾珯鏁伴噺", + "subway_count":"鍦伴搧鏁伴噺", + "school_count":"瀛︽牎鏁伴噺", + "air_count":"鏈哄満鏁伴噺", + "market_count":"瓒呭競鏁伴噺", + "wb_count":"缃戝惂鏁伴噺", + "ywss_count":"鍘屾伓璁炬柦鏁伴噺", + "all_area":"妤肩洏鍗犲湴鎬婚潰绉�", + "build_area":"妤肩洏寤虹瓚鎬婚潰绉�", + "household_count":"鎬诲鏁�", +// "":"鍙敭濂楁暟", +// "":"鎵�鍦ㄧ渷浠�", +// "alias1":"妤肩洏鍒悕1", +// "alias2":"妤肩洏鍒悕2", +// "alias3":"妤肩洏鍒悕3", + "kind":"灏忓尯绫诲瀷", + "virescence_percent":"缁垮寲鐜�", + "cubage_percent":"瀹圭Н鐜�", +// "facilities":"閰嶅淇℃伅", + "traffic":"浜ら�氭儏鍐�", + "household_count":"鎴锋暟", + "car_site":"杞︿綅鎯呭喌", +// "":"鍏蜂綋妤肩洏鍙�", + "property_life":"浜ф潈鎬ц川", + "build_structure":"鎴垮眿缁撴瀯", + "open_date":"寮�鐩樻椂闂�", + "sell_address":"鍞ゼ鍦板潃", + "discount":"鎶樻墸淇℃伅", +// "fitment_materials":"寤烘潗瑁呬慨", + "floor_info":"妤煎眰鐘跺喌", + "description":"鎻忚堪", +// "c_date":"鐧昏鏃ユ湡", +// "m_date":"鏇存柊鏃ユ湡", +// "out_pics":"澶栨櫙鍥�", ] public static final DBCollection DIST_STAT_COLL = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "mongo.db.fangjia.com") public static final DBCollection DIST_STAT_RENT_COLL = MongoUtils.getCollectionByName("fangjia", "district_stat_rent", "mongo.db.fangjia.com") @@ -134,7 +134,7 @@ class DistrictExportBatch { public static def radius = 1000; public static void main(String[] args) { - for(String city : ["上海"]) {//"北京",, + for(String city : ["涓婃捣"]) {//"鍖椾含",, areas = []; StringBuilder builder = new StringBuilder() FILELD_MAP.each() {column, display-> @@ -160,7 +160,7 @@ class DistrictExportBatch { c ++ def kind = dbo.get("kind").toString(); - if(kind.indexOf("别墅")!=-1){ + if(kind.indexOf("鍒")!=-1){ continue; } if(!dbo.get("lng2") || !dbo.get("lat2")){ @@ -170,7 +170,7 @@ class DistrictExportBatch { //if(!regions.contains(dbo.get("region"))){ // regions << dbo.get("region").toString() - //房子估价 + //鎴垮瓙浼颁环 def params = findLoudongInfo(city, dbo.get("region"), dbo.get("name")); params.city = city; params.region = dbo.get("region") @@ -180,33 +180,33 @@ class DistrictExportBatch { continue; } - //最近城市均价 + //鏈�杩戝煄甯傚潎浠� def nearCityPrice = findCityPrice(city, null); - //半年前最近的城市均价 + //鍗婂勾鍓嶆渶杩戠殑鍩庡競鍧囦环 def weekend = DateUtil.formatByPattern(DateUtil.getFirstDayOfWeek(new Date()), "yyyy-MM-dd"); def halfYearAgo = DateUtils.add(weekend, -180); def halfYearAgoPrice = findCityPrice(city, halfYearAgo); - //租金价格 + //绉熼噾浠锋牸 def endMonthDate = DateUtils.add(DateUtils.formatToYYYYMMDD(DateUtils.getFirstDayOfMonth(new Date())),-1); def houseTypePriceMap = findDistrictRentStat(city, dbo.get("region"), dbo.get("name"),endMonthDate); - //最近期小区均价 + //鏈�杩戞湡灏忓尯鍧囦环 def nearDistAvgPrice = queryDistrictPrice(city, dbo.get("region"), dbo.get("name"), null, 1); - //一前内小区均价 + //涓�鍓嶅唴灏忓尯鍧囦环 def oneYearAgo = DateUtils.add(weekend, -365); def oneYearPriceList = queryDistrictPrices(city, dbo.get("region"), dbo.get("name"), oneYearAgo, weekend); - //小区在所在区域或板块中的点击量排名 + //灏忓尯鍦ㄦ墍鍦ㄥ尯鍩熸垨鏉垮潡涓殑鐐瑰嚮閲忔帓鍚� def clickRank = findRegionBlockRank(city, dbo.get("region"), dbo.get("name")); - //某板块中的小区量 + //鏌愭澘鍧椾腑鐨勫皬鍖洪噺 def blockCount = findRegionBlockDistrictCount(city, dbo.get("region"), dbo.get("block")); - //某区域中的小区量 + //鏌愬尯鍩熶腑鐨勫皬鍖洪噺 def regionCount = findRegionBlockDistrictCount(city, dbo.get("region"), null); - //一年后的预测价格 + //涓�骞村悗鐨勯娴嬩环鏍� def futurePrice = findPricePredict(city, dbo.get("region"), dbo.get("name")); - //人均消费水平 + //浜哄潎娑堣垂姘村钩 def avgConsumption = 0; FILELD_MAP.each() {column, display-> @@ -216,15 +216,15 @@ class DistrictExportBatch { val = '' }else if(column == 'address'){ def address = dbo.get("address"); - if(address.indexOf("号")!=-1){ - val = address + params.houseNumber +"栋"+params.roomNumber+"室"; + if(address.indexOf("鍙�")!=-1){ + val = address + params.houseNumber +"鏍�"+params.roomNumber+"瀹�"; }else{ - val = address + params.houseNumber +"号"+params.roomNumber+"室"; + val = address + params.houseNumber +"鍙�"+params.roomNumber+"瀹�"; } }else if(column == 'area'){ val = params.area }else if(column == 'totalPrice'){ - val = DataUtil.getRound(2, totalPrice*1.0/10000) +"万元"; + val = DataUtil.getRound(2, totalPrice*1.0/10000) +"涓囧厓"; }else if(column.startsWith('alias')) { if(dbo.get('alias')) { List aliList = (List)dbo.get('alias'); @@ -247,7 +247,7 @@ class DistrictExportBatch { }else if(column == 'estate_charge'){ def s = dbo.get(column); if(s){ - val = s.toString().replaceAll("元/㎡/月","").replaceAll("元/月/平米","") + val = s.toString().replaceAll("鍏�/銕�/鏈�","").replaceAll("鍏�/鏈�/骞崇背","") }else{ val = ""; } @@ -309,20 +309,20 @@ class DistrictExportBatch { def three_room = houseTypePriceMap.get("3"); val = ""; if(one_room){ - val = "1室:"+one_room+"元"; + val = "1瀹わ細"+one_room+"鍏�"; } if(two_room){ if(val){ val = val + " "; } - val = val + "2室:"+two_room+"元"; + val = val + "2瀹わ細"+two_room+"鍏�"; } if(three_room){ if(val){ val = val + " "; } - val = val + "3室:"+three_room+"元"; + val = val + "3瀹わ細"+three_room+"鍏�"; } @@ -330,11 +330,11 @@ class DistrictExportBatch { if(clickRank){ def attent = clickRank.get("region_click_rank")/regionCount * 1.0 if(attent<=0.3){ - val = "高"; + val = "楂�"; }else if(attent>0.3 && attent<=0.7){ - val = "一般" + val = "涓�鑸�" }else{ - val = "较低"; + val = "杈冧綆"; } }else{ val = ""; @@ -353,11 +353,11 @@ class DistrictExportBatch { val = ""; } - }else if(column.indexOf("_count")!=-1 && display.indexOf("数量")!=-1){ + }else if(column.indexOf("_count")!=-1 && display.indexOf("鏁伴噺")!=-1){ if(dbo.get("lng2") && dbo.get("lat2")){ def lat = (double)dbo.get("lat2") / 10000000000.0 def lng = (double)dbo.get("lng2") / 10000000000.0 - val = findPoiCount(display.toString(), lat.toString(), lng.toString()) +"个"; + val = findPoiCount(display.toString(), lat.toString(), lng.toString()) +"涓�"; }else{ val = ""; } @@ -380,7 +380,7 @@ class DistrictExportBatch { } }else if(column == "month_markup"){ - //一个月以前最近的小区均价 + //涓�涓湀浠ュ墠鏈�杩戠殑灏忓尯鍧囦环 def monthAgo = DateUtils.add(weekend, -30); def monthAgoAvgPrice = queryDistrictPrice(city, dbo.get("region"), dbo.get("name"), monthAgo, 1); if(oneYearPriceList.size()>0 && monthAgoAvgPrice>0){ @@ -551,7 +551,7 @@ class DistrictExportBatch { public static def findPoiCount(display, lat, lng){ - display = display.toString().replaceAll("数量",""); + display = display.toString().replaceAll("鏁伴噺",""); def ret = 0; def page_num = 0; @@ -591,7 +591,7 @@ class DistrictExportBatch { conn.setRequestMethod("GET"); conn.doOutput = true inputStream = conn.getInputStream(); - BufferedReader buf = new BufferedReader(new InputStreamReader(inputStream,"UTF-8"));// 创建UTF-8的BufferedReader + BufferedReader buf = new BufferedReader(new InputStreamReader(inputStream,"UTF-8"));// 鍒涘缓UTF-8鐨凚ufferedReader while((line = buf.readLine())!=null){ sb.append(line); } @@ -703,7 +703,7 @@ class DistrictExportBatch { public static def findBusinessShop(city, maxLat, minLat, maxLng, minLng){ DBObject q = new BasicDBObject() q.put("city", city); - q.put("business_type", "餐厅"); + q.put("business_type", "椁愬巺"); q.put("consumption", new BasicDBObject(QueryOperators.GT, 0)); q.put('lat', new BasicDBObject(QueryOperators.LTE, maxLat).append(QueryOperators.GTE, minLat)); q.put('lng', new BasicDBObject(QueryOperators.LTE, maxLng).append(QueryOperators.GTE, minLng)); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/anshuo/HouseLoudongExportBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/anshuo/HouseLoudongExportBatch.groovy index cb84deb69..8dabdeb71 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/anshuo/HouseLoudongExportBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/anshuo/HouseLoudongExportBatch.groovy @@ -57,12 +57,12 @@ class HouseLoudongExportBatch { static final String XML_FILE_NAME = "fangzi" static def FOCUS_FIELDS = [ - "city":"城市", "region":"区域", "name":"小区名", "house_area":"面积", "house_num":"房号", "room_num":"室号", "house_num_unit":"单元", - "house_height":"楼高", "house_floor":"所在楼层", "room":"几室", "hall":"几厅", "toilet":"几卫", "direction":"朝向", "build_type":"建筑类型", - "garden_area":"花园面积", "outer_area":"露台面积", "attic_area":"阁楼面积", "worry_facility":"厌恶设施", - "noise":"噪音情况", "sight":"景观情况", "inside_pos":"小区位置", "house_property":"产权性质", - "fitment_cost":"装修花费", "fitment_age":"装修年限", "fitment_rank":"装修级别", "lighting_ventilation":"采光通风" - //"basement_area":"地下室面积", "sideset":"边套设施","car_port":"", + "city":"鍩庡競", "region":"鍖哄煙", "name":"灏忓尯鍚�", "house_area":"闈㈢Н", "house_num":"鎴垮彿", "room_num":"瀹ゅ彿", "house_num_unit":"鍗曞厓", + "house_height":"妤奸珮", "house_floor":"鎵�鍦ㄦゼ灞�", "room":"鍑犲", "hall":"鍑犲巺", "toilet":"鍑犲崼", "direction":"鏈濆悜", "build_type":"寤虹瓚绫诲瀷", + "garden_area":"鑺卞洯闈㈢Н", "outer_area":"闇插彴闈㈢Н", "attic_area":"闃佹ゼ闈㈢Н", "worry_facility":"鍘屾伓璁炬柦", + "noise":"鍣煶鎯呭喌", "sight":"鏅鎯呭喌", "inside_pos":"灏忓尯浣嶇疆", "house_property":"浜ф潈鎬ц川", + "fitment_cost":"瑁呬慨鑺辫垂", "fitment_age":"瑁呬慨骞撮檺", "fitment_rank":"瑁呬慨绾у埆", "lighting_ventilation":"閲囧厜閫氶" + //"basement_area":"鍦颁笅瀹ら潰绉�", "sideset":"杈瑰璁炬柦","car_port":"", ] private static final String API_HOST = "open.fangjia.com"//"sha-66.qa.fangjia.com/fangjia-open"; @@ -76,7 +76,7 @@ class HouseLoudongExportBatch { static HttpClient client = null public static void main(String[] args) { - def cities = ['北京'] + def cities = ['鍖椾含'] for(String city : cities) { exportLoudong(city) } @@ -142,7 +142,7 @@ class HouseLoudongExportBatch { List elementList = new ArrayList() int inx = 1 - String fileName = "D:/安硕数据/${XML_FILE_NAME}_${city}(${inx}).xml" + String fileName = "D:/瀹夌鏁版嵁/${XML_FILE_NAME}_${city}(${inx}).xml" while(cur.hasNext()) { cc++ @@ -186,7 +186,7 @@ class HouseLoudongExportBatch { String kind = getDistrictKind(city, region, districtName) if(!kind) { - kind = "小区" + kind = "灏忓尯" } Date currentWeekend = DateUtil.getThisSunday(new Date()) @@ -251,7 +251,7 @@ class HouseLoudongExportBatch { if(c % 300000 == 0) { inx ++ - fileName = "D:/安硕数据/${XML_FILE_NAME}_${city}(${inx}).xml" + fileName = "D:/瀹夌鏁版嵁/${XML_FILE_NAME}_${city}(${inx}).xml" } } @@ -267,9 +267,9 @@ class HouseLoudongExportBatch { } private static def getFromEvaluation(String city, String region, String districtName, double area, String houseNum, String roomNum, String kind) { - String buildType = "公寓" - if(kind == '小区') { - buildType = "公寓" + String buildType = "鍏瘬" + if(kind == '灏忓尯') { + buildType = "鍏瘬" }else { buildType = kind } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/api/ApiUserDeadTimeMonitorBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/api/ApiUserDeadTimeMonitorBatch.groovy index 2325eed13..83861b738 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/api/ApiUserDeadTimeMonitorBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/api/ApiUserDeadTimeMonitorBatch.groovy @@ -9,7 +9,7 @@ import groovy.sql.Sql import net.sf.json.JSONObject /** - * 功能说明: + * 鍔熻兘璇存槑: */ @BatchOwner(Watcher.WangWenYan) class ApiUserDeadTimeMonitorBatch extends BaseBatch { @@ -24,11 +24,11 @@ class ApiUserDeadTimeMonitorBatch extends BaseBatch { void process(Object args) { def sql = Sql.newInstance("jdbc:mysql://mysql.db.fangjia.com:4306/fangjia", "sa", "G00jia", "com.mysql.jdbc.Driver") def tenDayAgo = DateUtil.add(new Date(), Calendar.DATE, 10).format("yyyy-MM-dd") - String body = "API用户到期通知:\n\n" + String body = "API鐢ㄦ埛鍒版湡閫氱煡:\n\n" int count = 0 sql.eachRow("select ID,COMPANY,DEAD_TIME from fangjia.api_user where status = 0 and DEAD_TIME = '${tenDayAgo}'",{row-> println(row) - String msg = "通知:用户ID为${row['ID']},用户名为:${row['COMPANY']}的API账户将于${((Date)row['DEAD_TIME']).format("yyyy年MM月dd日")}到期!" + String msg = "閫氱煡锛氱敤鎴稩D涓�${row['ID']}锛岀敤鎴峰悕涓�:${row['COMPANY']}鐨凙PI璐︽埛灏嗕簬${((Date)row['DEAD_TIME']).format("yyyy骞碝M鏈坉d鏃�")}鍒版湡!" body = body + msg + "\n\n" println(msg) count++ @@ -37,7 +37,7 @@ class ApiUserDeadTimeMonitorBatch extends BaseBatch { JSONObject requestBody = new JSONObject() requestBody.put("msgtype", "markdown") JSONObject markdown = new JSONObject() - markdown.put("title", "API监控") + markdown.put("title", "API鐩戞帶") markdown.put("text", body) requestBody.put("markdown", markdown) println(requestBody.toString()) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/api/OpenApiUseStatMonitorBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/api/OpenApiUseStatMonitorBatch.groovy index 711386fb3..10787cddc 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/api/OpenApiUseStatMonitorBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/api/OpenApiUseStatMonitorBatch.groovy @@ -12,7 +12,7 @@ import groovy.sql.Sql import net.sf.json.JSONObject /** - * 功能说明:API使用状态监控脚本 + * 鍔熻兘璇存槑:API浣跨敤鐘舵�佺洃鎺ц剼鏈� */ @BatchOwner(Watcher.WangWenYan) class OpenApiUseStatMonitorBatch extends BaseBatch { @@ -55,8 +55,8 @@ class OpenApiUseStatMonitorBatch extends BaseBatch { } } - def title = "API性能监控" - String body = """失败过多警报[${startDate.format("HH:mm")}-${endDate.format("HH:mm")}]\n""" + def title = "API鎬ц兘鐩戞帶" + String body = """澶辫触杩囧璀︽姤[${startDate.format("HH:mm")}-${endDate.format("HH:mm")}]\n""" def hasWarn = false def sql = Sql.newInstance("jdbc:mysql://mysql.db.fangjia.com:4306/fangjia", "sa", "G00jia", "com.mysql.jdbc.Driver") statMap.each {String userId,List logs-> @@ -84,9 +84,9 @@ class OpenApiUseStatMonitorBatch extends BaseBatch { if(!name){ name = userId } - item = "> - 用户ID:${userId},用户名:${name}, 访问异常,访问次数:${sucCount + errCount},失败次数:${errCount},失败率:${errRate}\n\n" + item = "> - 鐢ㄦ埛ID:${userId},鐢ㄦ埛鍚嶏細${name}, 璁块棶寮傚父,璁块棶娆℃暟:${sucCount + errCount},澶辫触娆℃暟:${errCount},澶辫触鐜�:${errRate}\n\n" }else{ - item = "> - 用户ID:${userId},访问异常,访问次数:${sucCount + errCount},失败次数:${errCount},失败率:${errRate}\n\n" + item = "> - 鐢ㄦ埛ID:${userId},璁块棶寮傚父,璁块棶娆℃暟:${sucCount + errCount},澶辫触娆℃暟:${errCount},澶辫触鐜�:${errRate}\n\n" } body = body + item hasWarn = true diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/auto/AddDistrictLouDongCount.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/auto/AddDistrictLouDongCount.groovy index fe20fb335..d565199f9 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/auto/AddDistrictLouDongCount.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/auto/AddDistrictLouDongCount.groovy @@ -11,7 +11,7 @@ import com.fangjia.core.RegionData import com.fangjia.script.util.DbUtils /** - * 填充小区的楼栋总数 + * 濉厖灏忓尯鐨勬ゼ鏍嬫�绘暟 * @author gaojuan * */ @@ -28,10 +28,10 @@ class AddDistrictLouDongCount { def allCity = CommonUtils.findAllCity(); def cat = "district"; def field = ["city","region","name", "loudong_count", "alias"] - def siteNames = ["链家在线","搜狐焦点"] + def siteNames = ["閾惧鍦ㄧ嚎","鎼滅嫄鐒︾偣"] for(def city : allCity){ def ret = CommonDatautils.findAllDistricts(city, "district", field); - println "[ ${city} ] : "+ret.count(); + println "[ ${city} ]銆�: "+ret.count(); def distIndex = 0; for(def m : ret){ distIndex++; @@ -187,9 +187,9 @@ class AddDistrictLouDongCount { } def getNewValue(result){ - def values = result.get("链家在线"); + def values = result.get("閾惧鍦ㄧ嚎"); if(!values){ - values = result.get("搜狐焦点"); + values = result.get("鎼滅嫄鐒︾偣"); } return values[0]; } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/auto/AutoAddApiCountBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/auto/AutoAddApiCountBatch.groovy index 4bdf2709b..8bac9ef97 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/auto/AutoAddApiCountBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/auto/AutoAddApiCountBatch.groovy @@ -10,7 +10,7 @@ import com.mongodb.DBCursor import com.mongodb.DBObject import org.bson.types.ObjectId /** - * api调用量每半个月自动添加一次 + * api璋冪敤閲忔瘡鍗婁釜鏈堣嚜鍔ㄦ坊鍔犱竴娆� * @author gaojuan * */ @@ -28,11 +28,11 @@ class AutoAddApiCountBatch extends BaseBatch{ println "running date:"+new Date(); - //查询相关接口自增配置 + //鏌ヨ鐩稿叧鎺ュ彛鑷閰嶇疆 def addMap = getApiAddPrecent(); - //查询所有接口调用量 + //鏌ヨ鎵�鏈夋帴鍙h皟鐢ㄩ噺 def allRows = findApiCount(); - //获取新调用量 + //鑾峰彇鏂拌皟鐢ㄩ噺 allRows = autoAddCalCount(allRows, addMap); saveResult(allRows); @@ -69,7 +69,7 @@ class AutoAddApiCountBatch extends BaseBatch{ println retMap.service_id +" " +addCount+" " }else{ - println "没找到相关自增配置:"+retMap.service_id + println "娌℃壘鍒扮浉鍏宠嚜澧為厤缃細"+retMap.service_id } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/auto/AutoBackup.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/auto/AutoBackup.groovy index 7a6ca6e0f..76a42f129 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/auto/AutoBackup.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/auto/AutoBackup.groovy @@ -43,12 +43,12 @@ class AutoBackup { if(names && !names.contains(region+"@"+name)){ - println "删除【"+city+"@"+name+"]" + println "鍒犻櫎銆�"+city+"@"+name+"]" districts.remove(map); catCity.remove("district_"+city); } }else{ - println "没有小区......"+dbo.get("_id") + println "娌℃湁灏忓尯......"+dbo.get("_id") } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/auto/AutoDataBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/auto/AutoDataBatch.groovy index 72eeefe5e..a2a02bc70 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/auto/AutoDataBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/auto/AutoDataBatch.groovy @@ -114,7 +114,7 @@ class AutoDataBatch { public static def keywordToFile(fileName, idFileName) { // BasicDBObject query = new BasicDBObject(); // query.put("cat", "district") -// query.put("city", "上海") +// query.put("city", "涓婃捣") // DSCursor cursor = autoCollection.find(query) DSCursor cursor = autoCollection.find() Iterator iter = cursor.iterator(); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/auto/CityInfoEmailSender.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/auto/CityInfoEmailSender.groovy index 323ce415b..591c83fa6 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/auto/CityInfoEmailSender.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/auto/CityInfoEmailSender.groovy @@ -15,7 +15,7 @@ import org.bson.types.ObjectId /** * @author wenyan - * 城市统计信息邮件发送脚本 + * 鍩庡競缁熻淇℃伅閭欢鍙戦�佽剼鏈� */ @BatchOwner(Watcher.WangWenYan) class CityInfoEmailSender extends BaseBatch{ @@ -51,9 +51,9 @@ class CityInfoEmailSender extends BaseBatch{ file.put("_id", idGenerator(id, "o")) fsDB.save(file) def href = DataUtil.encodePicUrl(id, "o", "upload") - href = "点击下载邮件" + href = "鐐瑰嚮涓嬭浇閭欢" emails.each {receiver-> - jms.sendMail(receiver,"${weekend}城市覆盖率统计", href) + jms.sendMail(receiver,"${weekend}鍩庡競瑕嗙洊鐜囩粺璁�", href) } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/auto/DistrictAutoFindBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/auto/DistrictAutoFindBatch.groovy index 47cce68f5..563a2351f 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/auto/DistrictAutoFindBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/auto/DistrictAutoFindBatch.groovy @@ -15,7 +15,7 @@ import net.sf.json.JSONObject import org.apache.commons.lang.StringUtils /** - *小区发现爬虫解析任务启动脚本 + *灏忓尯鍙戠幇鐖櫕瑙f瀽浠诲姟鍚姩鑴氭湰 */ @BatchOwner(Watcher.WangWenYan) public class DistrictAutoFindBatch extends BaseBatch{ @@ -117,7 +117,7 @@ public class DistrictAutoFindBatch extends BaseBatch{ task.append("city", city) task.append("analy_fields", FIELD) task.append("status", 0) - task.append("create_way", "脚本") + task.append("create_way", "鑴氭湰") tasks << task } } @@ -141,7 +141,7 @@ public class DistrictAutoFindBatch extends BaseBatch{ if(new Date().format("yyyyMMdd") == c.getTime().format("yyyyMMdd")){ JOBS.each { String jobId-> startArtemisJob(jobId) - println("启动任务:${jobId}") + println("鍚姩浠诲姟:${jobId}") } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/auto/ParseTaskMonitor.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/auto/ParseTaskMonitor.groovy index 3e22db1b7..99c6fdf6e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/auto/ParseTaskMonitor.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/auto/ParseTaskMonitor.groovy @@ -11,7 +11,7 @@ import com.mongodb.BasicDBObject import com.mongodb.DBCollection /** - * 解析任务监控脚本 + * 瑙f瀽浠诲姟鐩戞帶鑴氭湰 */ @BatchOwner(Watcher.WangWenYan) public class ParseTaskMonitor extends BaseBatch{ @@ -37,7 +37,7 @@ public class ParseTaskMonitor extends BaseBatch{ def query = new BasicDBObject(); query.append("done_date", new BasicDBObject('$gte', startDate).append('$lt', endDate)) query.append("category", "district") - query.append("create_way","脚本") + query.append("create_way","鑴氭湰") def tasks = [] ANALY_TASK_COLL.find(query).each {BasicDBObject dbo-> int totalCount = dbo.getInt("total_count", 0) @@ -52,7 +52,7 @@ public class ParseTaskMonitor extends BaseBatch{ Map map = new HashMap() map.put('tasks', tasks) def content = sd.getContent(map) - sendEmail(Watcher.ZhouTongYun.email, "解析任务警报", content) + sendEmail(Watcher.ZhouTongYun.email, "瑙f瀽浠诲姟璀︽姤", content) } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/auto/Test.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/auto/Test.groovy index 3ae12b8ff..6ec85b714 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/auto/Test.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/auto/Test.groovy @@ -37,13 +37,13 @@ class Test { } public static def testSaveOrUpdate() { - def o1 = ["city" : "上海", "region" : "长宁", "block" : "", "address" : "剑河路998弄"] + def o1 = ["city" : "涓婃捣", "region" : "闀垮畞", "block" : "", "address" : "鍓戞渤璺�998寮�"] JSONObject jo = new JSONObject() jo.put("district", [o1]) def catCity = new ArrayList(); - catCity.add("district_上海") -// println ht.saveOrAppendAuto("北顾小区", catCity.join(","), jo.toString()) - println ht.saveOrUpdateAuto("北顾小区", catCity.join(","), jo.toString()) + catCity.add("district_涓婃捣") +// println ht.saveOrAppendAuto("鍖楅【灏忓尯", catCity.join(","), jo.toString()) + println ht.saveOrUpdateAuto("鍖楅【灏忓尯", catCity.join(","), jo.toString()) } @@ -63,7 +63,7 @@ class Test { def catCity = [] def cities = dbo.get("city") for(c in cities) { - if(c == "全国") { + if(c == "鍏ㄥ浗") { continue; } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/auto/UtmGifKeywordDetailBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/auto/UtmGifKeywordDetailBatch.groovy index 8bd6b65b1..2e2dd252e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/auto/UtmGifKeywordDetailBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/auto/UtmGifKeywordDetailBatch.groovy @@ -53,7 +53,7 @@ class UtmGifKeywordDetailBatch extends BaseBatch { def void process(args) { def dates = [] BasicDBObject query = null; - //默认运行前一天的数据 + //榛樿杩愯鍓嶄竴澶╃殑鏁版嵁 if(args && args.length > 0) { def argMap = ParamsUtil.parseArgs(args, ["date"]) if(argMap && argMap.date) { @@ -101,7 +101,7 @@ class UtmGifKeywordDetailBatch extends BaseBatch { continue; } - //判断URL类型 + //鍒ゆ柇URL绫诲瀷 if(requestUrl.indexOf("ershoufang/") > 0 || requestUrl.indexOf("zufang/") > 0 || requestUrl.indexOf("xiaoqu/") > 0 || requestUrl.indexOf("xinwen/") > 0) { def tmpMap = getCategoryAndKeyword(requestUrl) def cat = tmpMap["cat"] @@ -114,7 +114,7 @@ class UtmGifKeywordDetailBatch extends BaseBatch { } if(cat == "news") { - city = "全国"; + city = "鍏ㄥ浗"; } def uid = dbo.get("uid") @@ -252,10 +252,10 @@ class UtmGifKeywordDetailBatch extends BaseBatch { obj.put("city_search_count", ["${params.city}" : 1]) obj.put("city_cat_result", ["${params.city}_${params.cat}" : params.resultCount]) }else { - obj.put("city", ["全国"]) - obj.put("city_uid_count", ["全国" : 1]) - obj.put("city_search_count", ["全国" : 1]) - obj.put("city_cat_result", ["全国_${params.cat}" : params.resultCount]) + obj.put("city", ["鍏ㄥ浗"]) + obj.put("city_uid_count", ["鍏ㄥ浗" : 1]) + obj.put("city_search_count", ["鍏ㄥ浗" : 1]) + obj.put("city_cat_result", ["鍏ㄥ浗_${params.cat}" : params.resultCount]) } obj.put("request_url", params.requestUrl) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/averager/AveragerQualityReportBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/averager/AveragerQualityReportBatch.groovy index 4a40e6cb9..26f856fb4 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/averager/AveragerQualityReportBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/averager/AveragerQualityReportBatch.groovy @@ -16,7 +16,7 @@ import com.mongodb.DBObject /** * Created by dxy on 2015/8/7. - * 由于每个周末计算均价,改程序需要定时在周一凌晨运行,对上周的价格进行分析统计 + * 鐢变簬姣忎釜鍛ㄦ湯璁$畻鍧囦环锛屾敼绋嬪簭闇�瑕佸畾鏃跺湪鍛ㄤ竴鍑屾櫒杩愯锛屽涓婂懆鐨勪环鏍艰繘琛屽垎鏋愮粺璁� */ @@ -57,7 +57,7 @@ public class AveragerQualityReportBatch extends BaseBatch { def cities = ServerAreaMap.findAllCities() int week = Integer.parseInt(DateUtil.formatByPattern(weekend, "yyyyMMdd")); println "" - println "===================开始统计" + DateUtil.formatToYYYYMMDD(weekend) + "=====================" + println "===================寮�濮嬬粺璁�" + DateUtil.formatToYYYYMMDD(weekend) + "=====================" for (String city : cities) { print "[" + DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) + "]\t" + city List districtList = getAllDistricts(city) @@ -72,7 +72,7 @@ public class AveragerQualityReportBatch extends BaseBatch { } DBObject countryEntity = new BasicDBObject() - countryEntity.put("city", "全国") + countryEntity.put("city", "鍏ㄥ浗") countryEntity.put("weekend", week) for (String city : cities) { DBObject aqr = AQR_COLL.findOne(new BasicDBObject('city', city).append('weekend', week)) @@ -90,7 +90,7 @@ public class AveragerQualityReportBatch extends BaseBatch { countryEntity.put("around_credit", round(countryEntity.get("around_credit") / (double)cities.size())) countryEntity.put("deri_credit", round(countryEntity.get("deri_credit") / (double)cities.size())) countryEntity.put("c_date", new Date()) - AQR_COLL.update(new BasicDBObject('city', "全国").append('weekend', week), new BasicDBObject('$set', countryEntity), true, true) + AQR_COLL.update(new BasicDBObject('city', "鍏ㄥ浗").append('weekend', week), new BasicDBObject('$set', countryEntity), true, true) } private double round(double a) { @@ -98,7 +98,7 @@ public class AveragerQualityReportBatch extends BaseBatch { } /** - * 把小区按照计算类型进行统计 + * 鎶婂皬鍖烘寜鐓ц绠楃被鍨嬭繘琛岀粺璁� * @param districts * @param weekend * @return @@ -124,7 +124,7 @@ public class AveragerQualityReportBatch extends BaseBatch { String city = dbo.get('city') String region = dbo.get('region') String name = dbo.get('name') - String estateType = (dbo.get('estate_type2') && dbo.get('estate_type2').indexOf('别墅') > -1) ? '别墅' : '普通住宅' + String estateType = (dbo.get('estate_type2') && dbo.get('estate_type2').indexOf('鍒') > -1) ? '鍒' : '鏅�氫綇瀹�' DBObject statObj = STAT_COLL.findOne(new BasicDBObject('city', city).append('region', region).append('name', name).append('estate_type', estateType).append("weekend", weekend)) int vt = 0; @@ -302,7 +302,7 @@ public class AveragerQualityReportBatch extends BaseBatch { int grade = dbo.get('city_grade') int status = dbo.get('status') String display = dbo.get('display') - if(display == '全国') { + if(display == '鍏ㄥ浗') { continue; } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/averager/AvgpriceExporter.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/averager/AvgpriceExporter.groovy index f79aa1d60..6ef91d027 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/averager/AvgpriceExporter.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/averager/AvgpriceExporter.groovy @@ -23,7 +23,7 @@ class AvgpriceExporter { public static void main(String[] args) { Date weekend = DateUtil.parseDate("2015-12-13", 'yyyy-MM-dd') - def cities = ["绍兴"]//getAllCities() + def cities = ["缁嶅叴"]//getAllCities() process(cities, weekend) } @@ -46,12 +46,12 @@ class AvgpriceExporter { HSSFWorkbook WORK_BOOK = new HSSFWorkbook(); def valueTypes = [ - "-1" : '无法计算', - "1" : '指导价', - "2" : '样本计算', - "3" : '第三方', - "4" : '交易数据', - "5" : '周边楼盘', + "-1" : '鏃犳硶璁$畻', + "1" : '鎸囧浠�', + "2" : '鏍锋湰璁$畻', + "3" : '绗笁鏂�', + "4" : '浜ゆ槗鏁版嵁', + "5" : '鍛ㄨ竟妤肩洏', ] // def valueTpyeCount = [:] @@ -83,10 +83,10 @@ class AvgpriceExporter { String name = dbo.get('name') String estateType = dbo.get('estate_type2') List alias = dbo.get('alias') - if(estateType && estateType.indexOf('别墅') > -1) { - estateType = '别墅' + if(estateType && estateType.indexOf('鍒') > -1) { + estateType = '鍒' }else { - estateType = '小区' + estateType = '灏忓尯' } def avgPrice = null; @@ -105,7 +105,7 @@ class AvgpriceExporter { if(statObj) { avgPrice = statObj.get('avg_price') } - DBObject statq2 = new BasicDBObject('city', city).append('region', region).append('name', name).append('estate_type', (estateType && estateType.indexOf('别墅') > -1) ? '别墅' : '普通住宅').append("weekend", weekend) + DBObject statq2 = new BasicDBObject('city', city).append('region', region).append('name', name).append('estate_type', (estateType && estateType.indexOf('鍒') > -1) ? '鍒' : '鏅�氫綇瀹�').append("weekend", weekend) DBObject calcStatObj = calcStatColl.findOne(statq2) if(calcStatObj) { credit = calcStatObj.get('credit') @@ -115,19 +115,19 @@ class AvgpriceExporter { } if(vt == 1) { - valueType = "指导价"; + valueType = "鎸囧浠�"; }else if(vt == 2) { - valueType = "自身样本"; + valueType = "鑷韩鏍锋湰"; }else if(vt == 3) { - valueType = "第三方"; + valueType = "绗笁鏂�"; }else if(vt == 4) { - valueType = "交易数据"; + valueType = "浜ゆ槗鏁版嵁"; }else if(vt == 5) { - valueType = "周边楼盘"; + valueType = "鍛ㄨ竟妤肩洏"; }else if(vt == 6) { - valueType = "推导"; + valueType = "鎺ㄥ"; }else { - valueType = "无法计算"; + valueType = "鏃犳硶璁$畻"; } } @@ -164,7 +164,7 @@ class AvgpriceExporter { int cj = 0; for (String tname : names) { if (StringUtils.isNotBlank(tname)) { - if (tname.indexOf("(") > -1 || tname.indexOf(")") > -1 || tname.indexOf("(") > -1 || tname.indexOf(")") > -1 + if (tname.indexOf("锛�") > -1 || tname.indexOf("锛�") > -1 || tname.indexOf("(") > -1 || tname.indexOf(")") > -1 | tname.indexOf("[") > -1 || tname.indexOf("]") > -1 || tname.indexOf("-") > -1 || tname.indexOf("{") > -1 || tname.indexOf("}") > -1 || tname.indexOf("{") > -1 || tname.indexOf("}") > -1 || tname.indexOf(":") > -1 || tname.indexOf("~") > -1 || tname.indexOf("*") > -1 @@ -207,7 +207,7 @@ class AvgpriceExporter { DBObject tpobj = thirdpartColl.findOne(new BasicDBObject('city', city).append('region', region).append('name', name).append('category', 'district').append('s_date', DateUtil.formatByPattern(weekend, "yyyyMM").toInteger())) - //创建第rowIndex行 + //鍒涘缓绗瑀owIndex琛� HSSFRow row = citySheet.createRow(c); HSSFCell cell0 = row.createCell(0); @@ -272,15 +272,15 @@ class AvgpriceExporter { cell19.setCellValue(valueType); HSSFCell cell20 = row.createCell(20); - cell20.setCellValue(estateType && estateType.indexOf('别墅') > -1 ? '别墅' : '普通住宅'); + cell20.setCellValue(estateType && estateType.indexOf('鍒') > -1 ? '鍒' : '鏅�氫綇瀹�'); } println c } -// D:\数据分析和处理\均价系统\调查导出 - File file = new File("D:\\数据分析和处理\\均价系统\\调查导出\\" + city + "-" + DateUtil.formatByPattern(weekend, "yyyyMMdd") + ".xls"); +// D:\鏁版嵁鍒嗘瀽鍜屽鐞哱鍧囦环绯荤粺\璋冩煡瀵煎嚭 + File file = new File("D:\\鏁版嵁鍒嗘瀽鍜屽鐞哱\鍧囦环绯荤粺\\璋冩煡瀵煎嚭\\" + city + "-" + DateUtil.formatByPattern(weekend, "yyyyMMdd") + ".xls"); if (file.exists()) { file.delete(); } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/averager/FenQiAveragerProcess.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/averager/FenQiAveragerProcess.groovy index 2a767aac5..18c63a105 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/averager/FenQiAveragerProcess.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/averager/FenQiAveragerProcess.groovy @@ -22,7 +22,7 @@ import org.apache.commons.lang.StringUtils; import org.apache.lucene.index.Term; /** - * 分期历史价格批量处理 + * 鍒嗘湡鍘嗗彶浠锋牸鎵归噺澶勭悊 * @author gaojuan * */ @@ -34,7 +34,7 @@ class FenQiAveragerProcess { public final static DBCollection STAT_COLL = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", MongoUtils.MongoDB_Domain_mongo) public static final DSCollection SEAWEED_COLL = new DataStore("seaweed.db.fangjia.com", 27007).getCollection("fangjia.seaweed") public static final DSCollection SEAWATER_COLL = new DataStore("192.168.0.65", 27777).getCollection("fangjia.seawater") - //计算均价的最低样本要求 + //璁$畻鍧囦环鐨勬渶浣庢牱鏈姹� public static final int MIN_SAMPLE_SUPPORT_COUNT = 10 final Date nearestDate = new Date(0,0,1) @@ -44,12 +44,12 @@ class FenQiAveragerProcess { task.run(); } def run(){ - //"广州","北京","深圳","哈尔滨","大连","天津","南京","郑州","杭州","青岛","乌鲁木齐", - //"西安","厦门","南昌","呼和浩特","重庆","沈阳","合肥","兰州","济南","宁波","泉州","武汉","佛山","太原","成都", - //"长沙","石家庄","福州","东莞","长春","无锡","苏州","昆明","贵阳","烟台" - def citys = ["天津","南京","郑州","杭州","青岛","乌鲁木齐","西安","厦门","南昌","呼和浩特","重庆","沈阳","合肥","兰州","济南","泉州","武汉","佛山","太原","成都","长沙","石家庄","福州","东莞","长春","无锡","苏州","昆明","贵阳"]; + //"骞垮窞","鍖椾含","娣卞湷","鍝堝皵婊�","澶ц繛","澶╂触","鍗椾含","閮戝窞","鏉窞","闈掑矝","涔岄瞾鏈ㄩ綈", + //"瑗垮畨","鍘﹂棬","鍗楁槍","鍛煎拰娴╃壒","閲嶅簡","娌堥槼","鍚堣偉","鍏板窞","娴庡崡","瀹佹尝","娉夊窞","姝︽眽","浣涘北","澶師","鎴愰兘", + //"闀挎矙","鐭冲搴�","绂忓窞","涓滆帪","闀挎槬","鏃犻敗","鑻忓窞","鏄嗘槑","璐甸槼","鐑熷彴" + def citys = ["澶╂触","鍗椾含","閮戝窞","鏉窞","闈掑矝","涔岄瞾鏈ㄩ綈","瑗垮畨","鍘﹂棬","鍗楁槍","鍛煎拰娴╃壒","閲嶅簡","娌堥槼","鍚堣偉","鍏板窞","娴庡崡","娉夊窞","姝︽眽","浣涘北","澶師","鎴愰兘","闀挎矙","鐭冲搴�","绂忓窞","涓滆帪","闀挎槬","鏃犻敗","鑻忓窞","鏄嗘槑","璐甸槼"]; - //def citys = ["宁波"]; + //def citys = ["瀹佹尝"]; for(def city : citys){ def districts = getAllDistricts(city, "district"); def fqMap = findFenQiData(districts); @@ -64,27 +64,27 @@ class FenQiAveragerProcess { def findFenQiData(districts){ def fenqiDatas = []; - //查找分期数据 + //鏌ユ壘鍒嗘湡鏁版嵁 if(districts && districts.size() > 0){ for(def map : districts){ def keys = map.key def dbo = map.value; def name = dbo.name; - if(name.indexOf("期")!=-1){ + if(name.indexOf("鏈�")!=-1){ fenqiDatas << dbo; } } } - //查找总小区 [region@总小区名:[分期小区1,分期小区2.....]] + //鏌ユ壘鎬诲皬鍖� [region@鎬诲皬鍖哄悕锛歔鍒嗘湡灏忓尯1,鍒嗘湡灏忓尯2.....]] def dists = []; def fqGroups = [:]; for(def dbo : fenqiDatas){ def name = dbo.name def region = dbo.region - name = name.replaceAll("十一期", "").replaceAll("十二期", "").replaceAll("十三期", "").replaceAll("十四期", "").replaceAll("十五期", "").replaceAll("十六期", "").replaceAll("十七期", "") - name = name.replaceAll("[一|二|三|四|五|六|七|八|九|十]期", "") + name = name.replaceAll("鍗佷竴鏈�", "").replaceAll("鍗佷簩鏈�", "").replaceAll("鍗佷笁鏈�", "").replaceAll("鍗佸洓鏈�", "").replaceAll("鍗佷簲鏈�", "").replaceAll("鍗佸叚鏈�", "").replaceAll("鍗佷竷鏈�", "") + name = name.replaceAll("[涓�|浜寍涓墊鍥泑浜攟鍏瓅涓億鍏珅涔潀鍗乚鏈�", "") def key = region + "@"+name; def obj = districts.get(key); if(!obj){ @@ -164,7 +164,7 @@ class FenQiAveragerProcess { // } // // if(obj.startDate){ -// obj.startDate = obj.startDate.replace("年",""); +// obj.startDate = obj.startDate.replace("骞�",""); // if(obj.startDate.indexOf("0000")!=-1){ // obj.startDate = ""; // }else if(obj.startDate.length()>=7 && obj.startDate.length()<10){ @@ -192,7 +192,7 @@ class FenQiAveragerProcess { } def findAvgPriceStartDate(def obj){ - if(obj.name.indexOf("矮柳小区")!=-1){ + if(obj.name.indexOf("鐭煶灏忓尯")!=-1){ println obj.name; } def openDate = obj.open_date @@ -235,7 +235,7 @@ class FenQiAveragerProcess { } if(obj.startDate){ - obj.startDate = obj.startDate.replace("年",""); + obj.startDate = obj.startDate.replace("骞�",""); if(obj.startDate.indexOf("0000")!=-1){ obj.startDate = ""; }else if(obj.startDate.length()>=7 && obj.startDate.length()<10){ @@ -272,7 +272,7 @@ class FenQiAveragerProcess { def minDateStr = DateUtil.formatToYYYYMMDD(initDate); if(minDateStr != initDateStr){ obj.startDate = minDateStr; - println "最终:"+minDateStr + println "鏈�缁堬細"+minDateStr println "--------------------------------------------" } } @@ -299,7 +299,7 @@ class FenQiAveragerProcess { DBObject obj = CONFIG_COLL.findOne(q) if(obj){ - //实际计算均价开始日期 + //瀹為檯璁$畻鍧囦环寮�濮嬫棩鏈� Date calcStartDate = getCalcStatStartDate(v.city, v.region, v.name) DBObject udata = new BasicDBObject(); @@ -309,13 +309,13 @@ class FenQiAveragerProcess { if(calcStartDate){ udata.put('calc_start_date', calcStartDate) } - println "存在:"+udata+" "+q; + println "瀛樺湪锛�"+udata+" "+q; println "-------------------------------------------" CONFIG_COLL.update(q, new BasicDBObject('$set', udata), false, true); }else{ - //实际计算均价开始日期 + //瀹為檯璁$畻鍧囦环寮�濮嬫棩鏈� Date calcStartDate = getCalcStatStartDate(v.city, v.region, v.name) - //样本开始日期 + //鏍锋湰寮�濮嬫棩鏈� Date sampleStartDate = getSampleStartDate(v.city, v.region, v.name) DBObject object = new BasicDBObject() @@ -327,11 +327,11 @@ class FenQiAveragerProcess { object.put('stat_start_date', stat_start_date) object.put('calc_start_date', calcStartDate) object.put('sample_start_date', sampleStartDate) - object.put('auto_flag', 0) //0-机器自动 1-人工修改 + object.put('auto_flag', 0) //0-鏈哄櫒鑷姩 1-浜哄伐淇敼 object.put('c_date', new Date()) object.put('m_date', new Date()) CONFIG_COLL.save(object) - println "不存在:"+object; + println "涓嶅瓨鍦細"+object; println "-------------------------------------------" } @@ -372,7 +372,7 @@ class FenQiAveragerProcess { cmd.put("category", "sell") cmd.put("priority", 1) cmd.put("status", 0) - cmd.put("remark", 'userName:高娟,ip:192.168.10.53') + cmd.put("remark", 'userName:楂樺,ip:192.168.10.53') cmd.put("c_date", new Date()) COMMAND_COLL.save(cmd) @@ -414,8 +414,8 @@ class FenQiAveragerProcess { while(iters.hasNext()) { def dbo = iters.next(); def estate_type = dbo.estate_type2; - if(estate_type != "别墅" && estate_type != "普通住宅" ){ - dbo.estate_type2 = "普通住宅"; + if(estate_type != "鍒" && estate_type != "鏅�氫綇瀹�" ){ + dbo.estate_type2 = "鏅�氫綇瀹�"; } map.put(dbo.get("region") + "@"+dbo.get("name"), dbo); } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/averager/FenqiDistrictAnalyzerBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/averager/FenqiDistrictAnalyzerBatch.groovy index 5e5fdb46e..8a6db72e0 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/averager/FenqiDistrictAnalyzerBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/averager/FenqiDistrictAnalyzerBatch.groovy @@ -65,8 +65,8 @@ public class FenqiDistrictAnalyzerBatch extends BaseBatch { } - String masterEstateType = (masterDistrict.get('estate_type2') && masterDistrict.get('estate_type2').indexOf('别墅') > -1) ? '别墅' : '小区'; - String subEstateType = (subDistrict.get('estate_type2') && subDistrict.get('estate_type2').indexOf('别墅') > -1) ? '别墅' : '小区'; + String masterEstateType = (masterDistrict.get('estate_type2') && masterDistrict.get('estate_type2').indexOf('鍒') > -1) ? '鍒' : '灏忓尯'; + String subEstateType = (subDistrict.get('estate_type2') && subDistrict.get('estate_type2').indexOf('鍒') > -1) ? '鍒' : '灏忓尯'; if(!masterEstateType.equals(subEstateType)) { return; } @@ -82,7 +82,7 @@ public class FenqiDistrictAnalyzerBatch extends BaseBatch { subAvgPriceProcess(weekend, subDistrict, masterAvgPrice, -1) } else { if (subStatObj.get('credit') != null && subStatObj.get('credit') > 0.62) { - //如果分期小区的可信度超过标准,就不需要推测了 + //濡傛灉鍒嗘湡灏忓尯鐨勫彲淇″害瓒呰繃鏍囧噯锛屽氨涓嶉渶瑕佹帹娴嬩簡 } else { int subAvgPrice = subStatObj.get("avg_price") if (Math.abs(subAvgPrice - masterAvgPrice) / (double) subAvgPrice > 0.2) { @@ -110,7 +110,7 @@ public class FenqiDistrictAnalyzerBatch extends BaseBatch { String region = subDistrict.get('region') String name = subDistrict.get('name') String estateType = subDistrict.get('estate_type2') - estateType = (estateType && estateType.indexOf('别墅') > -1) ? '别墅' : '小区'; + estateType = (estateType && estateType.indexOf('鍒') > -1) ? '鍒' : '灏忓尯'; STAT_COLL.update(new BasicDBObject('city', city).append('region', region).append('district_name', name).append('estate_type', estateType).append("weekend", weekend), new BasicDBObject('$set', new BasicDBObject('avg_price', newAvgPrice).append('credit', 0.5d).append('value_type', 6)), false, true) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/averager/HouseChangingMonitorBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/averager/HouseChangingMonitorBatch.groovy index 2f785e37c..db2c3b0e2 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/averager/HouseChangingMonitorBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/averager/HouseChangingMonitorBatch.groovy @@ -37,7 +37,7 @@ class HouseChangingMonitorBatch extends BaseBatch { } public void process(Object args) { - def cities = ['重庆']//ServerAreaMap.findAllCities() + def cities = ['閲嶅簡']//ServerAreaMap.findAllCities() def reports = [] Date sunday = DateUtil.getThisSunday(new Date()) @@ -62,7 +62,7 @@ class HouseChangingMonitorBatch extends BaseBatch { rootMap.put('weekend', DateUtil.formatToYYYYMMDD(sunday)) String emailContent = emailTemplate.getContent(rootMap) for(String email : EMAILS) { - jms.sendMail(email, "网络房源预警系统(" + DateUtil.formatToYYYYMMDD(sunday) + ")", emailContent) + jms.sendMail(email, "缃戠粶鎴挎簮棰勮绯荤粺(" + DateUtil.formatToYYYYMMDD(sunday) + ")", emailContent) } } @@ -189,13 +189,13 @@ class HouseChangingMonitorBatch extends BaseBatch { Cluster clu = DataCluster.cluster(pricesList) - //所有数的平均值 + //鎵�鏈夋暟鐨勫钩鍧囧�� int allMean = clu.getMean() - //所有数的中位数 + //鎵�鏈夋暟鐨勪腑浣嶆暟 int allMedian = clu.getMedian(pricesList) - //最大类簇的平均值 + //鏈�澶х被绨囩殑骞冲潎鍊� int cluValue = clu.getValue(); - //最大类型的中位数 + //鏈�澶х被鍨嬬殑涓綅鏁� int cluMedian = clu.getMedian(); DBObject entity = new BasicDBObject() @@ -217,7 +217,7 @@ class HouseChangingMonitorBatch extends BaseBatch { int weekend; double weekendMarkup; double monthMarkup; - int riseFalls; //连续涨的期次 + int riseFalls; //杩炵画娑ㄧ殑鏈熸 ChangingReport(String city, String region, int weekend, double weekendMarkup, double monthMarkup, int riseFalls) { this.city = city this.region = region diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/averager/InsertMonitorCalcCommandBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/averager/InsertMonitorCalcCommandBatch.groovy index 5721fa6e0..b55400159 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/averager/InsertMonitorCalcCommandBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/averager/InsertMonitorCalcCommandBatch.groovy @@ -16,7 +16,7 @@ import com.google.common.collect.Maps import com.mongodb.* import org.bson.types.ObjectId /** - * 通知计算二手房均价 + * 閫氱煡璁$畻浜屾墜鎴垮潎浠� * @author duxiaoyu * */ @@ -53,13 +53,13 @@ class InsertMonitorCalcCommandBatch extends BaseBatch { int blockCount = 0 int districtCount = 0 int appliesCount = 0 - //开始时间 + //寮�濮嬫椂闂� final Date startDate = new Date(); for (String city : cities) { List allDistrict = getAllDistrict(city) logInfo(city + ":" + allDistrict.size()) - //生成计算小区队列 + //鐢熸垚璁$畻灏忓尯闃熷垪 for (DBObject district : allDistrict) { if (!districtHasPrice((String)district.get('city'), (String)district.get('region'), weekend, (String)district.get('name'))) { String region = (String)district.get('region') @@ -72,14 +72,14 @@ class InsertMonitorCalcCommandBatch extends BaseBatch { } } } - //监控小区计算均价队列 + //鐩戞帶灏忓尯璁$畻鍧囦环闃熷垪 monitorCalcCommand(weekend) while (!isCalcFinish()) { Thread.sleep(1000 * 5) - println("${new Date().format("yyyyMMdd HH:mm:ss")} 等待均价计算完成") + println("${new Date().format("yyyyMMdd HH:mm:ss")} 绛夊緟鍧囦环璁$畻瀹屾垚") } for (String city : cities) { - //计算该城市的城市、区域、板块均价 + //璁$畻璇ュ煄甯傜殑鍩庡競銆佸尯鍩熴�佹澘鍧楀潎浠� List regions = getRegions(city) for (DBObject regionObj : regions) { String region = regionObj.get("name") @@ -107,13 +107,13 @@ class InsertMonitorCalcCommandBatch extends BaseBatch { monitorCalcCommand(weekend) while (!isCalcFinish()) { Thread.sleep(1000 * 5) - println("${new Date().format("yyyyMMdd HH:mm:ss")} 等待均价计算完成") + println("${new Date().format("yyyyMMdd HH:mm:ss")} 绛夊緟鍧囦环璁$畻瀹屾垚") } //DisSync206To43(startDate); int cityRegionCount = 0 for (String city : cities) { - //计算该城市的城市、区域、板块均价 + //璁$畻璇ュ煄甯傜殑鍩庡競銆佸尯鍩熴�佹澘鍧楀潎浠� List regions = getRegions(city) for (DBObject regionObj : regions) { String region = regionObj.get("name") @@ -130,13 +130,13 @@ class InsertMonitorCalcCommandBatch extends BaseBatch { } } final Date endDate = new Date(); - // 计算用时 + // 璁$畻鐢ㄦ椂 def time = (long) ((endDate.getTime() - startDate.getTime()) / 1000l) - //小区均价涨跌幅超过4%小区数量 + //灏忓尯鍧囦环娑ㄨ穼骞呰秴杩�4%灏忓尯鏁伴噺 def query = new BasicDBObject() //query.append('district_name', new BasicDBObject('$ne', null)) query.append("weekend", weekend) - BasicDBObject keys = new BasicDBObject();//指定需要显示列 + BasicDBObject keys = new BasicDBObject();//鎸囧畾闇�瑕佹樉绀哄垪 keys.put("weekend_markup", 1) keys.put("district_name", 1) keys.put("city", 1) @@ -176,13 +176,13 @@ class InsertMonitorCalcCommandBatch extends BaseBatch { bigMarkupCount++ } } - //计算本周小区均价计算量 + //璁$畻鏈懆灏忓尯鍧囦环璁$畻閲� query = new BasicDBObject() query.append("weekend", weekend) districtCount = DISTRICT_STAT_COLL.count(query); println districtCount - //本周城市均价计算量 + //鏈懆鍩庡競鍧囦环璁$畻閲� query = new BasicDBObject() query.append("weekend", weekend) query.append('city', new BasicDBObject('$ne', null)) @@ -190,7 +190,7 @@ class InsertMonitorCalcCommandBatch extends BaseBatch { query.append('region', null) cityCount = REGION_STAT_COLL.count(query); - //本周区域均价计算量 + //鏈懆鍖哄煙鍧囦环璁$畻閲� query = new BasicDBObject() query.append("weekend", weekend) query.append('city', new BasicDBObject('$ne', null)) @@ -198,30 +198,30 @@ class InsertMonitorCalcCommandBatch extends BaseBatch { query.append("block", null) regionCount = REGION_STAT_COLL.count(query); - //计算本周小板块均价计算量 + //璁$畻鏈懆灏忔澘鍧楀潎浠疯绠楅噺 query = new BasicDBObject() query.append("weekend", weekend) query.append("block", new BasicDBObject('$ne', null)) blockCount = REGION_STAT_COLL.count(query); - def msg = "本周小区均价计算量:" + districtCount + ";本周城市均价计算量:" + cityCount + ";本周区域均价计算量:" + regionCount + ";本周板块均价计算量:" + blockCount + ";本周小区均价涨跌幅超过4%小区数量:" + appliesCount + ";计算均价超过10%小区量:" + bigMarkupCount+ ";运行时间:" + secondToTime(time) + "."; - //发送钉钉提示 + def msg = "鏈懆灏忓尯鍧囦环璁$畻閲�:" + districtCount + ";鏈懆鍩庡競鍧囦环璁$畻閲�:" + cityCount + ";鏈懆鍖哄煙鍧囦环璁$畻閲�:" + regionCount + ";鏈懆鏉垮潡鍧囦环璁$畻閲�:" + blockCount + ";鏈懆灏忓尯鍧囦环娑ㄨ穼骞呰秴杩�4%灏忓尯鏁伴噺:" + appliesCount + ";璁$畻鍧囦环瓒呰繃10%灏忓尯閲忥細" + bigMarkupCount+ ";杩愯鏃堕棿:" + secondToTime(time) + "."; + //鍙戦�侀拤閽夋彁绀� DingDingMessageUtil.sendTextMessage(TOKEN, msg) EmailTemplate sd = new EmailTemplate("mixedZone.ftl") Map map = new HashMap() map.put('applies', applies) def content = sd.getContent(map) - //发送邮件 + //鍙戦�侀偖浠� if (appliesCount != 0) { - sendEmail(Watcher.WangWenYan.email, "本周均价涨跌幅超过4%的小区", content) - sendEmail(Watcher.JiangYaHui.email, "本周均价涨跌幅超过4%的小区", content) + sendEmail(Watcher.WangWenYan.email, "鏈懆鍧囦环娑ㄨ穼骞呰秴杩�4%鐨勫皬鍖�", content) + sendEmail(Watcher.JiangYaHui.email, "鏈懆鍧囦环娑ㄨ穼骞呰秴杩�4%鐨勫皬鍖�", content) } - //监控上周能计算出均价本周不能计算出均价的小区 + //鐩戞帶涓婂懆鑳借绠楀嚭鍧囦环鏈懆涓嶈兘璁$畻鍑哄潎浠风殑灏忓尯 query = new BasicDBObject() weekend = DateUtil.add(weekend, Calendar.DAY_OF_MONTH, -7) println(DateUtil.formatByPattern(weekend, "yyyy.MM.dd HH:mm ")) query.append("weekend", weekend) - keys = new BasicDBObject();//指定需要显示列 + keys = new BasicDBObject();//鎸囧畾闇�瑕佹樉绀哄垪 keys.put("district_name", 1) keys.put("city", 1) keys.put("region", 1) @@ -239,9 +239,9 @@ class InsertMonitorCalcCommandBatch extends BaseBatch { Iterator iter = leftMap.entrySet().iterator(); while (iter.hasNext()) { Map.Entry entry = (Map.Entry) iter.next(); - // 获取key + // 鑾峰彇key String key = (String) entry.getKey(); - // 获取value + // 鑾峰彇value String val = (String) entry.getValue(); String[] vs = val.split(";") def item = [:] @@ -256,14 +256,14 @@ class InsertMonitorCalcCommandBatch extends BaseBatch { map = new HashMap() map.put('thisWeekNoData', thisWeekNoData) content = sd.getContent(map) - //发送邮件 + //鍙戦�侀偖浠� if (thisWeekNoData.size() > 0) { - sendEmail(Watcher.WangWenYan.email, "上周能计算出均价本周不能计算出均价的小区", content) - sendEmail(Watcher.JiangYaHui.email, "上周能计算出均价本周不能计算出均价的小区", content) + sendEmail(Watcher.WangWenYan.email, "涓婂懆鑳借绠楀嚭鍧囦环鏈懆涓嶈兘璁$畻鍑哄潎浠风殑灏忓尯", content) + sendEmail(Watcher.JiangYaHui.email, "涓婂懆鑳借绠楀嚭鍧囦环鏈懆涓嶈兘璁$畻鍑哄潎浠风殑灏忓尯", content) } } /** - * 均价是否计算完成 + * 鍧囦环鏄惁璁$畻瀹屾垚 * @return */ boolean isCalcFinish(){ @@ -272,7 +272,7 @@ class InsertMonitorCalcCommandBatch extends BaseBatch { } /** - * 是否已经存在均价 + * 鏄惁宸茬粡瀛樺湪鍧囦环 * @param city * @param region * @param weekend @@ -287,7 +287,7 @@ class InsertMonitorCalcCommandBatch extends BaseBatch { return REGION_STAT_COLL.count(query) > 0 } /** - * 是否已经存在均价 + * 鏄惁宸茬粡瀛樺湪鍧囦环 * @param city * @param region * @param weekend @@ -306,44 +306,44 @@ class InsertMonitorCalcCommandBatch extends BaseBatch { return false } String secondToTime(long second){ - long days = second / 86400; //转换天数 - second = second % 86400; //剩余秒数 - long hours = second / 3600; //转换小时 - second = second % 3600; //剩余秒数 - long minutes = second /60; //转换分钟 - second = second % 60; //剩余秒数 + long days = second / 86400; //杞崲澶╂暟 + second = second % 86400; //鍓╀綑绉掓暟 + long hours = second / 3600; //杞崲灏忔椂 + second = second % 3600; //鍓╀綑绉掓暟 + long minutes = second /60; //杞崲鍒嗛挓 + second = second % 60; //鍓╀綑绉掓暟 if(days>0){ - return days + "天" + hours + "小时" + minutes + "分" + second + "秒"; + return days + "澶�" + hours + "灏忔椂" + minutes + "鍒�" + second + "绉�"; }else{ - return hours + "小时" + minutes + "分" + second + "秒"; + return hours + "灏忔椂" + minutes + "鍒�" + second + "绉�"; } } private void monitorCalcCommand(Date weekend) { final DBObject q = new BasicDBObject() q.put("calc_date", weekend) - q.put('status', new BasicDBObject('$in', [0,1,102])) // 0-初始状态 1-处理中 102-计算完成 2-完成 3-处理错误 4-处理异常 + q.put('status', new BasicDBObject('$in', [0,1,102])) // 0-鍒濆鐘舵�� 1-澶勭悊涓� 102-璁$畻瀹屾垚 2-瀹屾垚 3-澶勭悊閿欒 4-澶勭悊寮傚父 while(true) { sleep(5 * 60 * 1000) def c = COMMAND_COLL.count(q) logInfo("calc command: " + c) if(c <= 0) { - //重试一次 + //閲嶈瘯涓�娆� sleep(10 * 1000) c = COMMAND_COLL.count(q) if(c <= 0) { - q.put('status', 2)//完成 + q.put('status', 2)//瀹屾垚 def c2 = COMMAND_COLL.count(q) - q.put('status', 3)//错误 + q.put('status', 3)//閿欒 def c3 = COMMAND_COLL.count(q) - q.put('status', 4)//异常 + q.put('status', 4)//寮傚父 def c4 = COMMAND_COLL.count(q) sendSms("${DateUtil.formatToYYYYMMDD(weekend)} calc over [suc:${c2},err:${c3},exp:${c4}]") sleep(3 * 1000) - //退出 + //閫�鍑� break; } } @@ -434,7 +434,7 @@ class InsertMonitorCalcCommandBatch extends BaseBatch { if(estateType) { cmd.put('estate_type', estateType) }else { - cmd.put('estate_type', '普通住宅') + cmd.put('estate_type', '鏅�氫綇瀹�') } cmd.put("calc_date", weekend) cmd.put("calc_type", 0) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/averager/InsertMonitorSquareRentCalcCommandBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/averager/InsertMonitorSquareRentCalcCommandBatch.groovy index 884f5a1e6..98ae75203 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/averager/InsertMonitorSquareRentCalcCommandBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/averager/InsertMonitorSquareRentCalcCommandBatch.groovy @@ -20,8 +20,8 @@ import org.apache.commons.lang.StringUtils import org.bson.types.ObjectId /** - * 通知计算二手房均价 - * 发送平米租金命令 + * 閫氱煡璁$畻浜屾墜鎴垮潎浠� + * 鍙戦�佸钩绫崇閲戝懡浠� * @author duxiaoyu * */ @@ -68,13 +68,13 @@ class InsertMonitorSquareRentCalcCommandBatch extends BaseBatch { int regionCount = 0 int blockCount = 0 int districtCount = 0 - //开始时间 + //寮�濮嬫椂闂� final Date startDate = new Date() for (String city : cities) { List districts = getAllDistricts(city) logInfo(city + ":" + districts.size()) def buffer = [] - //生成计算小区队列 + //鐢熸垚璁$畻灏忓尯闃熷垪 for (BasicDBObject district : districts) { String region = district.get('region') String name = district.get('name') @@ -94,15 +94,15 @@ class InsertMonitorSquareRentCalcCommandBatch extends BaseBatch { } } - //监控小区计算均价队列 + //鐩戞帶灏忓尯璁$畻鍧囦环闃熷垪 monitorCalcCommand(weekend) while (!isCalcFinish()) { Thread.sleep(1000 * 5) - println("${new Date().format("yyyyMMdd HH:mm:ss")} 等待均价计算完成") + println("${new Date().format("yyyyMMdd HH:mm:ss")} 绛夊緟鍧囦环璁$畻瀹屾垚") } for (String city : cities) { - //计算该城市的城市、区域、板块均价 + //璁$畻璇ュ煄甯傜殑鍩庡競銆佸尯鍩熴�佹澘鍧楀潎浠� List regions = getRegions(city) for (DBObject regionObj : regions) { String region = regionObj.get("name") @@ -127,36 +127,36 @@ class InsertMonitorSquareRentCalcCommandBatch extends BaseBatch { monitorCalcCommand(weekend) while (!isCalcFinish()) { Thread.sleep(1000 * 5) - println("${new Date().format("yyyyMMdd HH:mm:ss")} 等待均价计算完成") + println("${new Date().format("yyyyMMdd HH:mm:ss")} 绛夊緟鍧囦环璁$畻瀹屾垚") } final Date endDate = new Date(); - // 计算用时 + // 璁$畻鐢ㄦ椂 def time = (long) ((endDate.getTime() - startDate.getTime()) / 1000l) - //本月小区平米租金计算量 + //鏈湀灏忓尯骞崇背绉熼噾璁$畻閲� def query = new BasicDBObject() query.append("weekend", weekend) query.append("cat", "district") districtCount = SQMETRE_RENT_COLL.count(query) - //本月城市平米租金计算量 + //鏈湀鍩庡競骞崇背绉熼噾璁$畻閲� query = new BasicDBObject() query.append("weekend", weekend) query.append("cat", "city") cityCount = SQMETRE_RENT_COLL.count(query) - //本月区域平米租金计算量 + //鏈湀鍖哄煙骞崇背绉熼噾璁$畻閲� query = new BasicDBObject() query.append("weekend", weekend) query.append("cat", "region") regionCount = SQMETRE_RENT_COLL.count(query) - //本月版块平米租金计算量 + //鏈湀鐗堝潡骞崇背绉熼噾璁$畻閲� query = new BasicDBObject() query.append("weekend", weekend) query.append("cat", "block") blockCount = SQMETRE_RENT_COLL.count(query) - def msg = "本月(${weekend.format("yyyyMM")})小区平米租金计算量:".toString() + districtCount + ";本月城市平米租金计算量:" + cityCount + ";本月区域平米租金计算量:" + regionCount + ";本月版块平米租金计算量:" + blockCount + ";运行时间:" + secondToTime(time) + "." + def msg = "鏈湀(${weekend.format("yyyyMM")})灏忓尯骞崇背绉熼噾璁$畻閲�:".toString() + districtCount + ";鏈湀鍩庡競骞崇背绉熼噾璁$畻閲�:" + cityCount + ";鏈湀鍖哄煙骞崇背绉熼噾璁$畻閲�:" + regionCount + ";鏈湀鐗堝潡骞崇背绉熼噾璁$畻閲�:" + blockCount + ";杩愯鏃堕棿:" + secondToTime(time) + "." sendDingDingMsg(TOKEN, msg, "13916076378") } /** - * 均价是否计算完成 + * 鍧囦环鏄惁璁$畻瀹屾垚 * @return */ boolean isCalcFinish(){ @@ -166,16 +166,16 @@ class InsertMonitorSquareRentCalcCommandBatch extends BaseBatch { } String secondToTime(long second){ - long days = second / 86400; //转换天数 - second = second % 86400; //剩余秒数 - long hours = second / 3600; //转换小时 - second = second % 3600; //剩余秒数 - long minutes = second /60; //转换分钟 - second = second % 60; //剩余秒数 + long days = second / 86400; //杞崲澶╂暟 + second = second % 86400; //鍓╀綑绉掓暟 + long hours = second / 3600; //杞崲灏忔椂 + second = second % 3600; //鍓╀綑绉掓暟 + long minutes = second /60; //杞崲鍒嗛挓 + second = second % 60; //鍓╀綑绉掓暟 if(days>0){ - return days + "天" + hours + "小时" + minutes + "分" + second + "秒"; + return days + "澶�" + hours + "灏忔椂" + minutes + "鍒�" + second + "绉�"; }else{ - return hours + "小时" + minutes + "分" + second + "秒"; + return hours + "灏忔椂" + minutes + "鍒�" + second + "绉�"; } } @@ -183,27 +183,27 @@ class InsertMonitorSquareRentCalcCommandBatch extends BaseBatch { final DBObject q = new BasicDBObject() q.put("calc_date", weekend) q.put("category", CALC_CATEGORY) - q.put('status', new BasicDBObject('$in', [0,1,102])) // 0-初始状态 1-处理中 102-计算完成 2-完成 3-处理错误 4-处理异常 + q.put('status', new BasicDBObject('$in', [0,1,102])) // 0-鍒濆鐘舵�� 1-澶勭悊涓� 102-璁$畻瀹屾垚 2-瀹屾垚 3-澶勭悊閿欒 4-澶勭悊寮傚父 while(true) { def c = COMMAND_COLL.count(q) logInfo("calc command: " + c) if(c <= 0) { - //重试一次 + //閲嶈瘯涓�娆� sleep(10 * 1000) c = COMMAND_COLL.count(q) if(c <= 0) { - q.put('status', 2)//完成 + q.put('status', 2)//瀹屾垚 def c2 = COMMAND_COLL.count(q) - q.put('status', 3)//错误 + q.put('status', 3)//閿欒 def c3 = COMMAND_COLL.count(q) - q.put('status', 4)//异常 + q.put('status', 4)//寮傚父 def c4 = COMMAND_COLL.count(q) sendSms("${DateUtil.formatToYYYYMMDD(weekend)} calc over [suc:${c2},err:${c3},exp:${c4}]") sleep(3 * 1000) - //退出 + //閫�鍑� break; } } @@ -307,7 +307,7 @@ class InsertMonitorSquareRentCalcCommandBatch extends BaseBatch { if(estateType) { cmd.put('estate_type', estateType) }else { - cmd.put('estate_type', '普通住宅') + cmd.put('estate_type', '鏅�氫綇瀹�') } cmd.put("calc_date", weekend) cmd.put("calc_type", 0) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/averager/InsertMonitorTestCalcCommandBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/averager/InsertMonitorTestCalcCommandBatch.groovy index 96e61ca66..e82eada75 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/averager/InsertMonitorTestCalcCommandBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/averager/InsertMonitorTestCalcCommandBatch.groovy @@ -15,11 +15,11 @@ import org.apache.commons.lang.StringUtils import org.bson.types.ObjectId /** - * 通知计算二手房均价 + * 閫氱煡璁$畻浜屾墜鎴垮潎浠� * @author duxiaoyu * */ -@BatchOwner(value = Watcher.WangWenYan, describe = "发送均价计算测试命令") +@BatchOwner(value = Watcher.WangWenYan, describe = "鍙戦�佸潎浠疯绠楁祴璇曞懡浠�") class InsertMonitorTestCalcCommandBatch extends BaseBatch { @@ -50,13 +50,13 @@ class InsertMonitorTestCalcCommandBatch extends BaseBatch { println weekend int districtCount = 0 int appliesCount = 0 - //开始时间 + //寮�濮嬫椂闂� final Date startDate = new Date(); for (String city : cities) { List idList = getAllDistrictIds(city) logInfo(city + ":" + idList.size()) - //生成计算小区队列 + //鐢熸垚璁$畻灏忓尯闃熷垪 for (String id : idList) { DBObject fields = new BasicDBObject() @@ -77,19 +77,19 @@ class InsertMonitorTestCalcCommandBatch extends BaseBatch { } } } - //监控小区计算均价队列 + //鐩戞帶灏忓尯璁$畻鍧囦环闃熷垪 monitorCalcCommand(weekend) while (!isCalcFinish()) { Thread.sleep(1000 * 5) - println("${new Date().format("yyyyMMdd HH:mm:ss")} 等待均价计算完成") + println("${new Date().format("yyyyMMdd HH:mm:ss")} 绛夊緟鍧囦环璁$畻瀹屾垚") } final Date endDate = new Date(); - // 计算用时 + // 璁$畻鐢ㄦ椂 def time = (long) ((endDate.getTime() - startDate.getTime()) / 1000l) - //小区均价涨跌幅超过4%小区数量 + //灏忓尯鍧囦环娑ㄨ穼骞呰秴杩�4%灏忓尯鏁伴噺 def query = new BasicDBObject() query.append("weekend", weekend) - BasicDBObject keys = new BasicDBObject()//指定需要显示列 + BasicDBObject keys = new BasicDBObject()//鎸囧畾闇�瑕佹樉绀哄垪 keys.put("weekend_markup", 1) keys.put("district_name", 1) keys.put("city", 1) @@ -111,17 +111,17 @@ class InsertMonitorTestCalcCommandBatch extends BaseBatch { appliesCount++ } } - //计算本周小区均价计算量 + //璁$畻鏈懆灏忓尯鍧囦环璁$畻閲� query = new BasicDBObject() query.append("weekend", weekend) districtCount = DISTRICT_STAT_COLL.count(query) println districtCount - def msg = "本周小区均价计算量:" + districtCount + ";本周小区均价涨跌幅超过4%小区数量:" + appliesCount + ";运行时间:" + secondToTime(time) + "." + def msg = "鏈懆灏忓尯鍧囦环璁$畻閲�:" + districtCount + ";鏈懆灏忓尯鍧囦环娑ㄨ穼骞呰秴杩�4%灏忓尯鏁伴噺:" + appliesCount + ";杩愯鏃堕棿:" + secondToTime(time) + "." println(msg) sendDingDingMsg(TOKEN, msg); } /** - * 均价是否计算完成 + * 鍧囦环鏄惁璁$畻瀹屾垚 * @return */ boolean isCalcFinish() { @@ -130,7 +130,7 @@ class InsertMonitorTestCalcCommandBatch extends BaseBatch { } /** - * 是否已经存在均价 + * 鏄惁宸茬粡瀛樺湪鍧囦环 * @param city * @param region * @param weekend @@ -145,7 +145,7 @@ class InsertMonitorTestCalcCommandBatch extends BaseBatch { return REGION_STAT_COLL.count(query) > 0 } /** - * 是否已经存在均价 + * 鏄惁宸茬粡瀛樺湪鍧囦环 * @param city * @param region * @param weekend @@ -165,44 +165,44 @@ class InsertMonitorTestCalcCommandBatch extends BaseBatch { } String secondToTime(long second) { - long days = second / 86400; //转换天数 - second = second % 86400; //剩余秒数 - long hours = second / 3600; //转换小时 - second = second % 3600; //剩余秒数 - long minutes = second / 60; //转换分钟 - second = second % 60; //剩余秒数 + long days = second / 86400; //杞崲澶╂暟 + second = second % 86400; //鍓╀綑绉掓暟 + long hours = second / 3600; //杞崲灏忔椂 + second = second % 3600; //鍓╀綑绉掓暟 + long minutes = second / 60; //杞崲鍒嗛挓 + second = second % 60; //鍓╀綑绉掓暟 if (days > 0) { - return days + "天" + hours + "小时" + minutes + "分" + second + "秒"; + return days + "澶�" + hours + "灏忔椂" + minutes + "鍒�" + second + "绉�"; } else { - return hours + "小时" + minutes + "分" + second + "秒"; + return hours + "灏忔椂" + minutes + "鍒�" + second + "绉�"; } } private void monitorCalcCommand(Date weekend) { final DBObject q = new BasicDBObject() q.put("calc_date", weekend) - q.put('status', new BasicDBObject('$in', [0, 1, 102])) // 0-初始状态 1-处理中 102-计算完成 2-完成 3-处理错误 4-处理异常 + q.put('status', new BasicDBObject('$in', [0, 1, 102])) // 0-鍒濆鐘舵�� 1-澶勭悊涓� 102-璁$畻瀹屾垚 2-瀹屾垚 3-澶勭悊閿欒 4-澶勭悊寮傚父 while (true) { sleep(5 * 60 * 1000) def c = COMMAND_COLL.count(q) logInfo("calc command: " + c) if (c <= 0) { - //重试一次 + //閲嶈瘯涓�娆� sleep(10 * 1000) c = COMMAND_COLL.count(q) if (c <= 0) { - q.put('status', 2)//完成 + q.put('status', 2)//瀹屾垚 def c2 = COMMAND_COLL.count(q) - q.put('status', 3)//错误 + q.put('status', 3)//閿欒 def c3 = COMMAND_COLL.count(q) - q.put('status', 4)//异常 + q.put('status', 4)//寮傚父 def c4 = COMMAND_COLL.count(q) sendSms("${DateUtil.formatToYYYYMMDD(weekend)} calc over [suc:${c2},err:${c3},exp:${c4}]") sleep(3 * 1000) - //退出 + //閫�鍑� break; } } @@ -304,7 +304,7 @@ class InsertMonitorTestCalcCommandBatch extends BaseBatch { if (estateType) { cmd.put('estate_type', estateType) } else { - cmd.put('estate_type', '普通住宅') + cmd.put('estate_type', '鏅�氫綇瀹�') } cmd.put("calc_date", weekend) cmd.put("calc_type", 0) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/averager/LianjiaAvgPriceCrawler.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/averager/LianjiaAvgPriceCrawler.groovy index c947fca69..68a9ae65e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/averager/LianjiaAvgPriceCrawler.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/averager/LianjiaAvgPriceCrawler.groovy @@ -24,47 +24,47 @@ class LianjiaAvgPriceCrawler extends BaseBatch { public static final DBCollection CRAWL_COLL = MongoUtils.getCollectionByName("artemis", "metadata", "metadata.mongo.db.fangjia.com", 55007) public final def crawls = [ - //[city:"上海", url:"http://sh.lianjia.com/xiaoqu", referUrl:"http://sh.lianjia.com/", regionPath:".option-list.gio_district>a", blockPath:".option-list.sub-option-list.gio_plate>a", nextPagePath:".list-head.clear>h2 span"], - [city:"北京", url:"http://bj.lianjia.com/xiaoqu", referUrl:"http://bj.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], - /*[city:"成都", url:"http://cd.lianjia.com/xiaoqu/", referUrl:"http://cd.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], - [city:"重庆", url:"http://cq.lianjia.com/xiaoqu/", referUrl:"http://cq.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], - [city:"长沙", url:"http://cs.lianjia.com/xiaoqu/", referUrl:"http://cs.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], - [city:"大连", url:"http://dl.lianjia.com/xiaoqu/", referUrl:"http://dl.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], - [city:"东莞", url:"http://dg.lianjia.com/xiaoqu/", referUrl:"http://dg.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], - [city:"佛山", url:"http://fs.lianjia.com/xiaoqu/", referUrl:"http://fs.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], - [city:"广州", url:"http://gz.lianjia.com/xiaoqu/", referUrl:"http://gz.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], - [city:"杭州", url:"http://hz.lianjia.com/xiaoqu/", referUrl:"http://hz.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], - [city:"惠州", url:"http://hui.lianjia.com/xiaoqu/", referUrl:"http://hui.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], - [city:"海口", url:"http://hk.lianjia.com/xiaoqu/", referUrl:"http://hk.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], - [city:"济南", url:"http://jn.lianjia.com/xiaoqu/", referUrl:"http://jn.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], - [city:"南京", url:"http://nj.lianjia.com/xiaoqu/", referUrl:"http://nj.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], - [city:"深圳", url:"http://sz.lianjia.com/xiaoqu/", referUrl:"http://sz.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], - [city:"苏州", url:"http://su.lianjia.com/xiaoqu/", referUrl:"http://su.lianjia.com/", regionPath:".option-list.gio_district a", blockPath:".option-list.sub-option-list.gio_plate>a", nextPagePath:".list-head.clear>h2>span"], - [city:"石家庄", url:"http://sjz.lianjia.com/xiaoqu/", referUrl:"http://sjz.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], - [city:"沈阳", url:"http://sy.lianjia.com/xiaoqu/", referUrl:"http://sy.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], - [city:"天津", url:"http://tj.lianjia.com/xiaoqu/", referUrl:"http://tj.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], - [city:"武汉", url:"http://wh.lianjia.com/xiaoqu/", referUrl:"http://wh.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], - [city:"无锡", url:"http://wx.lianjia.com/xiaoqu/", referUrl:"http://wx.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], - [city:"厦门", url:"http://xm.lianjia.com/xiaoqu/", referUrl:"http://xm.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], - [city:"西安", url:"http://xa.lianjia.com/xiaoqu/", referUrl:"http://xa.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], - [city:"烟台", url:"http://yt.lianjia.com/xiaoqu/", referUrl:"http://yt.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"],*/ -// [city:"徐州", url:"http://xz.lianjia.com/xiaoqu/", referUrl:"http://xz.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], -// [city:"文昌", url:"http://wc.lianjia.com/xiaoqu/", referUrl:"http://wc.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], -// [city:"万宁", url:"http://wn.lianjia.com/xiaoqu/", referUrl:"http://wn.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], -// [city:"扬州", url:"http://yz.lianjia.com/xiaoqu/", referUrl:"http://yz.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], -// [city:"中山", url:"http://zs.lianjia.com/xiaoqu/", referUrl:"http://zs.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], -// [city:"嘉兴", url:"http://jx.lianjia.com/xiaoqu/", referUrl:"http://jx.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], -// [city:"临沂", url:"http://lin.lianjia.com/xiaoqu/", referUrl:"http://lin.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], -// [city:"陵水", url:"http://ls.lianjia.com/xiaoqu/", referUrl:"http://ls.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], -// [city:"南通", url:"http://nt.lianjia.com/xiaoqu/", referUrl:"http://nt.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], -// [city:"青岛", url:"http://qd.lianjia.com/xiaoqu/", referUrl:"http://qd.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], -// [city:"琼海", url:"http://qh.lianjia.com/xiaoqu/", referUrl:"http://qh.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], -// [city:"温州", url:"http://wz.lianjia.com/xiaoqu/", referUrl:"http://wz.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], -// [city:"潍坊", url:"http://wf.lianjia.com/xiaoqu/", referUrl:"http://wf.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], -// [city:"唐山", url:"http://ts.lianjia.com/xiaoqu/", referUrl:"http://ts.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], -// [city:"太原", url:"http://ty.lianjia.com/xiaoqu/", referUrl:"http://ty.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], -// [city:"三亚", url:"http://san.lianjia.com/xiaoqu/", referUrl:"http://san.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], -// [city:"珠海", url:"http://zh.lianjia.com/xiaoqu/", referUrl:"http://zh.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"] + //[city:"涓婃捣", url:"http://sh.lianjia.com/xiaoqu", referUrl:"http://sh.lianjia.com/", regionPath:".option-list.gio_district>a", blockPath:".option-list.sub-option-list.gio_plate>a", nextPagePath:".list-head.clear>h2 span"], + [city:"鍖椾含", url:"http://bj.lianjia.com/xiaoqu", referUrl:"http://bj.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], + /*[city:"鎴愰兘", url:"http://cd.lianjia.com/xiaoqu/", referUrl:"http://cd.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], + [city:"閲嶅簡", url:"http://cq.lianjia.com/xiaoqu/", referUrl:"http://cq.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], + [city:"闀挎矙", url:"http://cs.lianjia.com/xiaoqu/", referUrl:"http://cs.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], + [city:"澶ц繛", url:"http://dl.lianjia.com/xiaoqu/", referUrl:"http://dl.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], + [city:"涓滆帪", url:"http://dg.lianjia.com/xiaoqu/", referUrl:"http://dg.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], + [city:"浣涘北", url:"http://fs.lianjia.com/xiaoqu/", referUrl:"http://fs.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], + [city:"骞垮窞", url:"http://gz.lianjia.com/xiaoqu/", referUrl:"http://gz.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], + [city:"鏉窞", url:"http://hz.lianjia.com/xiaoqu/", referUrl:"http://hz.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], + [city:"鎯犲窞", url:"http://hui.lianjia.com/xiaoqu/", referUrl:"http://hui.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], + [city:"娴峰彛", url:"http://hk.lianjia.com/xiaoqu/", referUrl:"http://hk.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], + [city:"娴庡崡", url:"http://jn.lianjia.com/xiaoqu/", referUrl:"http://jn.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], + [city:"鍗椾含", url:"http://nj.lianjia.com/xiaoqu/", referUrl:"http://nj.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], + [city:"娣卞湷", url:"http://sz.lianjia.com/xiaoqu/", referUrl:"http://sz.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], + [city:"鑻忓窞", url:"http://su.lianjia.com/xiaoqu/", referUrl:"http://su.lianjia.com/", regionPath:".option-list.gio_district a", blockPath:".option-list.sub-option-list.gio_plate>a", nextPagePath:".list-head.clear>h2>span"], + [city:"鐭冲搴�", url:"http://sjz.lianjia.com/xiaoqu/", referUrl:"http://sjz.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], + [city:"娌堥槼", url:"http://sy.lianjia.com/xiaoqu/", referUrl:"http://sy.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], + [city:"澶╂触", url:"http://tj.lianjia.com/xiaoqu/", referUrl:"http://tj.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], + [city:"姝︽眽", url:"http://wh.lianjia.com/xiaoqu/", referUrl:"http://wh.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], + [city:"鏃犻敗", url:"http://wx.lianjia.com/xiaoqu/", referUrl:"http://wx.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], + [city:"鍘﹂棬", url:"http://xm.lianjia.com/xiaoqu/", referUrl:"http://xm.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], + [city:"瑗垮畨", url:"http://xa.lianjia.com/xiaoqu/", referUrl:"http://xa.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], + [city:"鐑熷彴", url:"http://yt.lianjia.com/xiaoqu/", referUrl:"http://yt.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"],*/ +// [city:"寰愬窞", url:"http://xz.lianjia.com/xiaoqu/", referUrl:"http://xz.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], +// [city:"鏂囨槍", url:"http://wc.lianjia.com/xiaoqu/", referUrl:"http://wc.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], +// [city:"涓囧畞", url:"http://wn.lianjia.com/xiaoqu/", referUrl:"http://wn.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], +// [city:"鎵窞", url:"http://yz.lianjia.com/xiaoqu/", referUrl:"http://yz.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], +// [city:"涓北", url:"http://zs.lianjia.com/xiaoqu/", referUrl:"http://zs.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], +// [city:"鍢夊叴", url:"http://jx.lianjia.com/xiaoqu/", referUrl:"http://jx.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], +// [city:"涓存矀", url:"http://lin.lianjia.com/xiaoqu/", referUrl:"http://lin.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], +// [city:"闄垫按", url:"http://ls.lianjia.com/xiaoqu/", referUrl:"http://ls.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], +// [city:"鍗楅��", url:"http://nt.lianjia.com/xiaoqu/", referUrl:"http://nt.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], +// [city:"闈掑矝", url:"http://qd.lianjia.com/xiaoqu/", referUrl:"http://qd.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], +// [city:"鐞兼捣", url:"http://qh.lianjia.com/xiaoqu/", referUrl:"http://qh.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], +// [city:"娓╁窞", url:"http://wz.lianjia.com/xiaoqu/", referUrl:"http://wz.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], +// [city:"娼嶅潑", url:"http://wf.lianjia.com/xiaoqu/", referUrl:"http://wf.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], +// [city:"鍞愬北", url:"http://ts.lianjia.com/xiaoqu/", referUrl:"http://ts.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], +// [city:"澶師", url:"http://ty.lianjia.com/xiaoqu/", referUrl:"http://ty.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], +// [city:"涓変簹", url:"http://san.lianjia.com/xiaoqu/", referUrl:"http://san.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"], +// [city:"鐝犳捣", url:"http://zh.lianjia.com/xiaoqu/", referUrl:"http://zh.lianjia.com/", regionPath:".position dl div a", blockPath:".position dl div div:eq(1) a", nextPagePath:".total.fl>span"] ]; static main(args) { runBatch(new LianjiaAvgPriceCrawler(), args); @@ -99,7 +99,7 @@ class LianjiaAvgPriceCrawler extends BaseBatch { for (Element link:links){ def text = link.text(); - if(text!="不限"){ + if(text!="涓嶉檺"){ def rMap = [:]; def hrefStr = link.attr("href"); rMap.url = prefix + hrefStr; @@ -151,7 +151,7 @@ class LianjiaAvgPriceCrawler extends BaseBatch { DBObject obj = new BasicDBObject(); obj.put("job_id" , jobId); obj.put("referer" , detailMap.referUrl); - obj.put("cat" , "均价"); + obj.put("cat" , "鍧囦环"); obj.put("c_date" , new Date()); obj.put("url" , detailMap.url); obj.put("status" , 0); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/averager/SampleQualityReportBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/averager/SampleQualityReportBatch.groovy index 0bd1d1e48..1bc111eec 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/averager/SampleQualityReportBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/averager/SampleQualityReportBatch.groovy @@ -16,7 +16,7 @@ import com.mongodb.DBObject /** * Created by dxy on 2015/8/7. - * 由于每个周末计算均价,该程序需要定时在周一凌晨运行,对上周的价格进行分析统计 + * 鐢变簬姣忎釜鍛ㄦ湯璁$畻鍧囦环锛岃绋嬪簭闇�瑕佸畾鏃跺湪鍛ㄤ竴鍑屾櫒杩愯锛屽涓婂懆鐨勪环鏍艰繘琛屽垎鏋愮粺璁� */ @@ -44,7 +44,7 @@ public class SampleQualityReportBatch extends BaseBatch { def cities = ServerAreaMap.findAllCities() int week = Integer.parseInt(DateUtil.formatByPattern(weekend, "yyyyMMdd")); println "" - println "===================开始统计" + DateUtil.formatToYYYYMMDD(weekend) + "=====================" + println "===================寮�濮嬬粺璁�" + DateUtil.formatToYYYYMMDD(weekend) + "=====================" for (String city : cities) { List districtIdList = getAllDistrictIds(city) println "[" + DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) + "]\t" + city + "\t" + districtIdList.size() @@ -60,7 +60,7 @@ public class SampleQualityReportBatch extends BaseBatch { } DBObject entity = new BasicDBObject() - entity.put("city", "全国") + entity.put("city", "鍏ㄥ浗") entity.put("weekend", Integer.parseInt(DateUtil.formatByPattern(weekend, "yyyyMMdd"))) entity.put("district_count", 0) entity.put("month_count1", 0) @@ -100,7 +100,7 @@ public class SampleQualityReportBatch extends BaseBatch { } entity.put("c_date", new Date()) - AQR_COLL.update(new BasicDBObject('city', "全国").append('weekend', week), new BasicDBObject('$set', entity), true, true) + AQR_COLL.update(new BasicDBObject('city', "鍏ㄥ浗").append('weekend', week), new BasicDBObject('$set', entity), true, true) } private DBObject processByCityEntity(List districtIdList, Date weekend) { @@ -125,7 +125,7 @@ public class SampleQualityReportBatch extends BaseBatch { String city = district.get('city') String region = district.get('region') String name = district.get('name') - String estateType = (district.get('estate_type2') && district.get('estate_type2').indexOf('别墅') > -1) ? '别墅' : '普通住宅'; + String estateType = (district.get('estate_type2') && district.get('estate_type2').indexOf('鍒') > -1) ? '鍒' : '鏅�氫綇瀹�'; DBObject statObj = STAT_COLL.findOne(new BasicDBObject('city', city).append('region', region).append('name', name).append('estate_type', estateType).append("weekend", weekend)); def monthCount = 0; @@ -222,7 +222,7 @@ public class SampleQualityReportBatch extends BaseBatch { int grade = dbo.get('city_grade') int status = dbo.get('status') String display = dbo.get('display') - if(display == '全国') { + if(display == '鍏ㄥ浗') { continue; } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/averager/SellAveragerCalcConfigBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/averager/SellAveragerCalcConfigBatch.groovy index d241d5d48..88aa235b2 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/averager/SellAveragerCalcConfigBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/averager/SellAveragerCalcConfigBatch.groovy @@ -64,13 +64,13 @@ class SellAveragerCalcConfigBatch extends BaseBatch{ def region = district.region; def name = district.name; String estateType = district.estate_type2 - if(estateType != null && estateType.indexOf('别墅') > -1) { - estateType = '别墅' + if(estateType != null && estateType.indexOf('鍒') > -1) { + estateType = '鍒' }else { - estateType = '普通住宅' + estateType = '鏅�氫綇瀹�' } - //理论均价开始日期 + //鐞嗚鍧囦环寮�濮嬫棩鏈� Date statStartDate = parseStatStartDate(district) saveToCalcConfig(city, region, name, estateType, statStartDate, repeatNameMap.get(name)) c++ @@ -104,7 +104,7 @@ class SellAveragerCalcConfigBatch extends BaseBatch{ } /** - * 小区的开始时间,均价的理论开始时间 + * 灏忓尯鐨勫紑濮嬫椂闂达紝鍧囦环鐨勭悊璁哄紑濮嬫椂闂� * @param district * @return */ @@ -137,7 +137,7 @@ class SellAveragerCalcConfigBatch extends BaseBatch{ } /** - * 保存并通知修改 + * 淇濆瓨骞堕�氱煡淇敼 * @param city * @param region * @param name @@ -185,7 +185,7 @@ class SellAveragerCalcConfigBatch extends BaseBatch{ Date result = null; String parse = null; - Pattern p=Pattern.compile("(\\d{4})[-|年|.]?(\\d{1,2})?[-|月|.]?(\\d{1,2})?日?"); + Pattern p=Pattern.compile("(\\d{4})[-|骞磡.]?(\\d{1,2})?[-|鏈坾.]?(\\d{1,2})?鏃�?"); Matcher m=p.matcher(date); if(m.find()){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/averager/Test_weilei.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/averager/Test_weilei.groovy index 393eecd5a..948902376 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/averager/Test_weilei.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/averager/Test_weilei.groovy @@ -29,7 +29,7 @@ Date endDate = DateUtil.parseDate("20181001", "yyyyMMdd"); def cityList = CommonUtils.findAllCity(); if(CollectionUtils.isNotEmpty(cityList)){ for(String city : cityList){ -// if(!StringUtils.equalsIgnoreCase("上海" , city)){ +// if(!StringUtils.equalsIgnoreCase("涓婃捣" , city)){ // continue; // } @@ -68,10 +68,10 @@ static void recalculationAverage(DBCollection COMMAND_COLL, String city, String Date weekend = calcDate; //com.fangjia.core.util.DateUtil.getFirstDayOfWeek(calcDate) - if(estateType && estateType.contains("别墅")){ - estateType = "别墅" + if(estateType && estateType.contains("鍒")){ + estateType = "鍒" }else if(estateType){ - estateType = "小区" + estateType = "灏忓尯" } DBObject cmd = new BasicDBObject() cmd.put("city", city) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/averager/WebAveragerAnalyzerBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/averager/WebAveragerAnalyzerBatch.groovy index 4d2b2f4e1..ce0b9fd86 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/averager/WebAveragerAnalyzerBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/averager/WebAveragerAnalyzerBatch.groovy @@ -73,30 +73,30 @@ class WebAveragerAnalyzerBatch extends BaseBatch { "gaojuan@fangjia.com", ] - //{任务号:[status:任务状态, field:任务对应的修改字段]} (status:0-无 1-运行中 2-完成或停止 3-暂停) + //{浠诲姟鍙�:[status:浠诲姟鐘舵��, field:浠诲姟瀵瑰簲鐨勪慨鏀瑰瓧娈礭} (status:0-鏃� 1-杩愯涓� 2-瀹屾垚鎴栧仠姝� 3-鏆傚仠) public static def JOB_CONFIG_MAP = [ - "54b35441e4b0b4e2823ce4b7" : [status:0, display:'搜房新房', stat_field:'soufang_new_price', mapping_field:'soufang_new'] ,//搜房新房 - "54af943ee4b0b4e2823916da" : [status:0, display:'搜房二手房', stat_field:'soufang_esf_price', mapping_field:'soufang_esf'], //搜房二手房 - "54b35a29e4b0b4e2823ce523" : [status:0, display:'安居客新房', stat_field:'anjuke_new_price', mapping_field:'anjuke_new'], //安居客新房 - "54b357f2e4b0b4e2823ce4bd" : [status:0, display:'安居客二手房', stat_field:'anjuke_esf_price', mapping_field:'anjuke_esf'], //安居客二手房 - "54b36ce2e4b0b4e2823ce687" : [status:0, display:'新浪新房', stat_field:'sina_new_price', mapping_field:'sina_new'], //新浪新房 - "54b3718ee4b0b4e2823ce7aa" : [status:0, display:'新浪二手房', stat_field:'sina_esf_price', mapping_field:'sina_esf'], //新浪二手房 - "54b33ea7e4b0b4e2823ce2bf" : [status:0, display:'赶集二手房', stat_field:'ganji_esf_price', mapping_field:'ganji_esf'], //赶集二手房 - //"5527325ce4b0ca8c0247c220" : [status:0, display:'克尔瑞新房', stat_field:'cric_new_price', mapping_field:'cric_new'], //克尔瑞新房 - //"552730a7e4b0ca8c0247c1ff" : [status:0, display:'克尔瑞二手房', stat_field:'cric_esf_price', mapping_field:'cric_esf'], //克尔瑞二手房 - "57eb7acce4b0ea1c9b2491af" : [status:0, display:'链家二手房', stat_field:'lianjia_esf_price', mapping_field:'lianjia_esf'], //克尔瑞二手房 - "5a1e42dde4b0743282732ec4" : [status:0, display:'诸葛找房二手房', stat_field:'zhugezhaofang_esf_price', mapping_field:'zhugezhaofang_esf'], //诸葛二手房 - "5a7bbcaae4b01b7d0eb22191" : [status:0, display:'诸葛找房小区', stat_field:'zhugezhaofang_esf_price', mapping_field:'zhugezhaofang_esf'], //诸葛二手房 - "5a3341c5e4b0e452ecb4cef3" : [status:0, display:'兔博士二手房', stat_field:'tuboshi_esf_price', mapping_field:'tuboshi_esf'], //兔博士 - "5a3358aee4b0e452ecb4cf0d" : [status:0, display:'兔博士新房', stat_field:'tuboshi_new_price', mapping_field:'tuboshi_new'], //兔博士 + "54b35441e4b0b4e2823ce4b7" : [status:0, display:'鎼滄埧鏂版埧', stat_field:'soufang_new_price', mapping_field:'soufang_new'] ,//鎼滄埧鏂版埧 + "54af943ee4b0b4e2823916da" : [status:0, display:'鎼滄埧浜屾墜鎴�', stat_field:'soufang_esf_price', mapping_field:'soufang_esf'], //鎼滄埧浜屾墜鎴� + "54b35a29e4b0b4e2823ce523" : [status:0, display:'瀹夊眳瀹㈡柊鎴�', stat_field:'anjuke_new_price', mapping_field:'anjuke_new'], //瀹夊眳瀹㈡柊鎴� + "54b357f2e4b0b4e2823ce4bd" : [status:0, display:'瀹夊眳瀹簩鎵嬫埧', stat_field:'anjuke_esf_price', mapping_field:'anjuke_esf'], //瀹夊眳瀹簩鎵嬫埧 + "54b36ce2e4b0b4e2823ce687" : [status:0, display:'鏂版氮鏂版埧', stat_field:'sina_new_price', mapping_field:'sina_new'], //鏂版氮鏂版埧 + "54b3718ee4b0b4e2823ce7aa" : [status:0, display:'鏂版氮浜屾墜鎴�', stat_field:'sina_esf_price', mapping_field:'sina_esf'], //鏂版氮浜屾墜鎴� + "54b33ea7e4b0b4e2823ce2bf" : [status:0, display:'璧堕泦浜屾墜鎴�', stat_field:'ganji_esf_price', mapping_field:'ganji_esf'], //璧堕泦浜屾墜鎴� + //"5527325ce4b0ca8c0247c220" : [status:0, display:'鍏嬪皵鐟炴柊鎴�', stat_field:'cric_new_price', mapping_field:'cric_new'], //鍏嬪皵鐟炴柊鎴� + //"552730a7e4b0ca8c0247c1ff" : [status:0, display:'鍏嬪皵鐟炰簩鎵嬫埧', stat_field:'cric_esf_price', mapping_field:'cric_esf'], //鍏嬪皵鐟炰簩鎵嬫埧 + "57eb7acce4b0ea1c9b2491af" : [status:0, display:'閾惧浜屾墜鎴�', stat_field:'lianjia_esf_price', mapping_field:'lianjia_esf'], //鍏嬪皵鐟炰簩鎵嬫埧 + "5a1e42dde4b0743282732ec4" : [status:0, display:'璇歌憶鎵炬埧浜屾墜鎴�', stat_field:'zhugezhaofang_esf_price', mapping_field:'zhugezhaofang_esf'], //璇歌憶浜屾墜鎴� + "5a7bbcaae4b01b7d0eb22191" : [status:0, display:'璇歌憶鎵炬埧灏忓尯', stat_field:'zhugezhaofang_esf_price', mapping_field:'zhugezhaofang_esf'], //璇歌憶浜屾墜鎴� + "5a3341c5e4b0e452ecb4cef3" : [status:0, display:'鍏斿崥澹簩鎵嬫埧', stat_field:'tuboshi_esf_price', mapping_field:'tuboshi_esf'], //鍏斿崥澹� + "5a3358aee4b0e452ecb4cf0d" : [status:0, display:'鍏斿崥澹柊鎴�', stat_field:'tuboshi_new_price', mapping_field:'tuboshi_new'], //鍏斿崥澹� ] public static def OTHER_JOB_MAP = [ - "57f868d77b9ad2b00d32ef36":[status:0, display:'链家二手房', stat_field:'lianjia_esf_price', mapping_field:'lianjia_esf']//链家二手房 + "57f868d77b9ad2b00d32ef36":[status:0, display:'閾惧浜屾墜鎴�', stat_field:'lianjia_esf_price', mapping_field:'lianjia_esf']//閾惧浜屾墜鎴� ] - //对比价时间 + //瀵规瘮浠锋椂闂� public static final SHORT_DATE = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM")); public static void main(String[] args){ @@ -106,13 +106,13 @@ class WebAveragerAnalyzerBatch extends BaseBatch { public void process(Object args) { def argsMap = ParamsUtil.parseArgs(args, ["env"]) if("1".equals(argsMap.get('env'))) { - //启动抓取任务 + //鍚姩鎶撳彇浠诲姟 startJobs(); } Thread t1 = new Thread(new Runnable() { @Override public void run() { - //检查任务是否完成 + //妫�鏌ヤ换鍔℃槸鍚﹀畬鎴� moniterJobs(); } }); @@ -122,15 +122,15 @@ class WebAveragerAnalyzerBatch extends BaseBatch { - //网页处理 + //缃戦〉澶勭悊 Map> statMap = processJobWebpage(); - //处理完成后,发送或记录信息 + //澶勭悊瀹屾垚鍚�,鍙戦�佹垨璁板綍淇℃伅 doSendMessage(statMap); } /** - * 处理网页主程序 + * 澶勭悊缃戦〉涓荤▼搴� * * @return */ @@ -162,7 +162,7 @@ class WebAveragerAnalyzerBatch extends BaseBatch { int metadataCount = CRAWL_COLL.count(new BasicDBObject('job_id', jobId)) if(metadataCount <= 0 && JOB_CONFIG_MAP[jobId]['status'] == 2) { processingJobIds.remove(jobId) - println DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) + " " + JOB_CONFIG_MAP[jobId]['display'] + "\t分析任务已完成" + println DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) + " " + JOB_CONFIG_MAP[jobId]['display'] + "\t鍒嗘瀽浠诲姟宸插畬鎴�" } } } @@ -175,7 +175,7 @@ class WebAveragerAnalyzerBatch extends BaseBatch { /** - * 按任务进行页面处理 + * 鎸変换鍔¤繘琛岄〉闈㈠鐞� * * @param jobId * @return @@ -202,7 +202,7 @@ class WebAveragerAnalyzerBatch extends BaseBatch { String city = data.get('city') String content = data.get('content'); AnalyzerResult analyzerResult = doAnalyzerWebpage(statField, city, url, content) - //页面无法解析 + //椤甸潰鏃犳硶瑙f瀽 if(analyzerResult == null || !analyzerResult.isValid()) { statMap.put("error_pages", statMap.get('error_pages') + 1) }else { @@ -220,7 +220,7 @@ class WebAveragerAnalyzerBatch extends BaseBatch { continue } - //保存价格对比 + //淇濆瓨浠锋牸瀵规瘮 if(result.getAvgPrice() != null && result.getAvgPrice() > 1000 && result.getAvgPrice() < 300000) { DBObject uquery = new BasicDBObject() @@ -250,7 +250,7 @@ class WebAveragerAnalyzerBatch extends BaseBatch { } } - //保存URL映射表 + //淇濆瓨URL鏄犲皠琛� if(result.getHref() != null && result.getHref().startsWith("http://")) { DBObject uquery = new BasicDBObject() uquery.put("city", formatKey.getCity()) @@ -268,16 +268,16 @@ class WebAveragerAnalyzerBatch extends BaseBatch { pageObj.put("s_date", SHORT_DATE) pageObj.put("category", CATEGORY) pageObj.put("url", url) - pageObj.put("status", ((analyzerResult == null || !analyzerResult.isValid()) ? 1 : 0))//1为页面出错 + pageObj.put("status", ((analyzerResult == null || !analyzerResult.isValid()) ? 1 : 0))//1涓洪〉闈㈠嚭閿� if(content){ pageObj.put("content", zip(content.getBytes())) } pageObj.put("c_date", new Date()) - //保存入日志 + //淇濆瓨鍏ユ棩蹇� LIST_WEBPAGE_COLL.save(pageObj) } - //删除metadata + //鍒犻櫎metadata CRAWL_COLL.remove(new BasicDBObject('_id', new BasicDBObject('$in', metadataIdList))) return statMap; } @@ -296,8 +296,8 @@ class WebAveragerAnalyzerBatch extends BaseBatch { } /** - * 网页分析程序入口 - * @param field 网页类型,对应更新数据表的字段类型 + * 缃戦〉鍒嗘瀽绋嬪簭鍏ュ彛 + * @param field 缃戦〉绫诲瀷锛屽搴旀洿鏂版暟鎹〃鐨勫瓧娈电被鍨� * @param city * @param url * @param content @@ -346,7 +346,7 @@ class WebAveragerAnalyzerBatch extends BaseBatch { /** - * 搜房新房解析 + * 鎼滄埧鏂版埧瑙f瀽 * @param city * @param url * @param content @@ -385,7 +385,7 @@ class WebAveragerAnalyzerBatch extends BaseBatch { } if(StringUtils.isNotBlank(price)){ - price = price.replace("价格待定", "") + price = price.replace("浠锋牸寰呭畾", "") } @@ -412,7 +412,7 @@ class WebAveragerAnalyzerBatch extends BaseBatch { /** - * 搜房二手房列表分析页面程序 + * 鎼滄埧浜屾墜鎴垮垪琛ㄥ垎鏋愰〉闈㈢▼搴� * @param field * @param jobId */ @@ -453,7 +453,7 @@ class WebAveragerAnalyzerBatch extends BaseBatch { } /** - * 安居客新房 + * 瀹夊眳瀹㈡柊鎴� * * @param city * @param url @@ -501,7 +501,7 @@ class WebAveragerAnalyzerBatch extends BaseBatch { } /** - * 安居客二手房 + * 瀹夊眳瀹簩鎵嬫埧 * @param city * @param url * @param content @@ -523,8 +523,8 @@ class WebAveragerAnalyzerBatch extends BaseBatch { String priceDesc = JQueryUtils.selectText([".sp2"], doc) if(StringUtils.isNotBlank(region)){ - if(region.contains("[")){ - region = region.substring(region.indexOf("[")+1, region.indexOf("]")) + if(region.contains("锛�")){ + region = region.substring(region.indexOf("锛�")+1, region.indexOf("锛�")) if(region.contains("-")){ region = region.substring(0, region.indexOf("-")); } @@ -560,7 +560,7 @@ class WebAveragerAnalyzerBatch extends BaseBatch { /** - * 新浪新房 + * 鏂版氮鏂版埧 * * @param city * @param url @@ -604,7 +604,7 @@ class WebAveragerAnalyzerBatch extends BaseBatch { } /** - * 新浪二手房 + * 鏂版氮浜屾墜鎴� * @param city * @param url * @param content @@ -629,7 +629,7 @@ class WebAveragerAnalyzerBatch extends BaseBatch { region = region.substring(0, region.indexOf("-")); } if(StringUtils.isNotBlank(price)){ - price = price.replace("元/平", ""); + price = price.replace("鍏�/骞�", ""); } Elements ele = JQueryUtils.select([".community-main-one>a"], doc) @@ -655,7 +655,7 @@ class WebAveragerAnalyzerBatch extends BaseBatch { } /** - * 赶集二手房 + * 璧堕泦浜屾墜鎴� * @param city * @param url * @param content @@ -663,7 +663,7 @@ class WebAveragerAnalyzerBatch extends BaseBatch { */ private AnalyzerResult analyzerGanjiEsf(String city, String url, String content) { Document document = Jsoup.parse(content); - String region = JQueryUtils.selectText(["dt:contains(区域:) + dd a.cur:not(:has(em))"], document); + String region = JQueryUtils.selectText(["dt:contains(鍖哄煙:) + dd a.cur:not(:has(em))"], document); Elements elements = JQueryUtils.select([".listBox ul li"], document) if(elements == null || elements.isEmpty() || StringUtils.isEmpty(region)) { return new AnalyzerResult(false) @@ -698,7 +698,7 @@ class WebAveragerAnalyzerBatch extends BaseBatch { } /** - * 克尔瑞新房 + * 鍏嬪皵鐟炴柊鎴� * @param city * @param url * @param content @@ -750,7 +750,7 @@ class WebAveragerAnalyzerBatch extends BaseBatch { } /** - * 克尔瑞二手房 + * 鍏嬪皵鐟炰簩鎵嬫埧 * @param city * @param url * @param content @@ -812,7 +812,7 @@ class WebAveragerAnalyzerBatch extends BaseBatch { /** - * 链家二手房 + * 閾惧浜屾墜鎴� * @param city * @param url * @param content @@ -900,7 +900,7 @@ class WebAveragerAnalyzerBatch extends BaseBatch { } /** - * 诸葛找房 + * 璇歌憶鎵炬埧 * @param city * @param url * @param content @@ -972,7 +972,7 @@ class WebAveragerAnalyzerBatch extends BaseBatch { } /** - * 兔博士 + * 鍏斿崥澹� * @param city * @param url * @param content @@ -992,8 +992,8 @@ class WebAveragerAnalyzerBatch extends BaseBatch { Document doc = Jsoup.parse(element.toString()); String name = JQueryUtils.selectText([".er-list .zt1"], doc); - if(name.contains("(新房)")){ - name = name.replace("(新房)",""); + if(name.contains("(鏂版埧)")){ + name = name.replace("(鏂版埧)",""); } String regionInfo = JQueryUtils.selectText([".er-list .zt1+span"], doc); @@ -1003,8 +1003,8 @@ class WebAveragerAnalyzerBatch extends BaseBatch { } Integer price = null; String priceStr = JQueryUtils.selectText([".er-list div:eq(1) div:eq(1) div:eq(0)"], doc); - if(priceStr && priceStr.contains("元/㎡")){ - priceStr = priceStr.substring(0, priceStr.indexOf("元/㎡")) + if(priceStr && priceStr.contains("鍏�/銕�")){ + priceStr = priceStr.substring(0, priceStr.indexOf("鍏�/銕�")) if(priceStr != null){ price = priceStr.toInteger(); } @@ -1027,8 +1027,8 @@ class WebAveragerAnalyzerBatch extends BaseBatch { } /** - * 获取抓取任务的状态 - * 1-运行中 2-完成或停止 3-暂停 + * 鑾峰彇鎶撳彇浠诲姟鐨勭姸鎬� + * 1-杩愯涓� 2-瀹屾垚鎴栧仠姝� 3-鏆傚仠 * @param jobId * @return */ @@ -1096,7 +1096,7 @@ class WebAveragerAnalyzerBatch extends BaseBatch { } /** - * 所有任务是否已经完成 + * 鎵�鏈変换鍔℃槸鍚﹀凡缁忓畬鎴� * * @return */ @@ -1110,24 +1110,24 @@ class WebAveragerAnalyzerBatch extends BaseBatch { } /** - * 启动任务 + * 鍚姩浠诲姟 */ public void startJobs() { - //0-无 1-运行中 2-完成 3-暂停 + //0-鏃� 1-杩愯涓� 2-瀹屾垚 3-鏆傚仠 for(String jobId : JOB_CONFIG_MAP.keySet()) { - //判断是否任务正在运行 + //鍒ゆ柇鏄惁浠诲姟姝e湪杩愯 if(getArtemisJobState(jobId) != 1) { - //停止任务 + //鍋滄浠诲姟 stopArtemisJob(jobId) sleep(3*1000) - //清理任务 + //娓呯悊浠诲姟 cleanArtemisJobData(jobId); sleep(3*1000) - //开始任务 + //寮�濮嬩换鍔� startArtemisJob(jobId); - println DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) + " " + JOB_CONFIG_MAP[jobId]['display'] + "\t抓取任务被启动" + println DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) + " " + JOB_CONFIG_MAP[jobId]['display'] + "\t鎶撳彇浠诲姟琚惎鍔�" }else { - println DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) + " " + JOB_CONFIG_MAP[jobId]['display'] + "\t抓取任务已启动" + println DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) + " " + JOB_CONFIG_MAP[jobId]['display'] + "\t鎶撳彇浠诲姟宸插惎鍔�" } JOB_CONFIG_MAP[jobId]['status'] = 1 sleep(10*1000) @@ -1135,10 +1135,10 @@ class WebAveragerAnalyzerBatch extends BaseBatch { } /** - * 检查任务 + * 妫�鏌ヤ换鍔� */ public void moniterJobs() { - //检查任务是否运行完成 + //妫�鏌ヤ换鍔℃槸鍚﹁繍琛屽畬鎴� while(true) { if(isAllJobDone()) { break; @@ -1151,11 +1151,11 @@ class WebAveragerAnalyzerBatch extends BaseBatch { if(getArtemisJobState(jobId) == 2) { JOB_CONFIG_MAP[jobId]['status'] = 2 - println DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) + " " + JOB_CONFIG_MAP[jobId]['display'] + "\t抓取任务已完成" + println DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) + " " + JOB_CONFIG_MAP[jobId]['display'] + "\t鎶撳彇浠诲姟宸插畬鎴�" } } - //每5分钟检查一次 + //姣�5鍒嗛挓妫�鏌ヤ竴娆� sleep(5 * 1000) } } @@ -1177,7 +1177,7 @@ class WebAveragerAnalyzerBatch extends BaseBatch { return ret } - if (name.indexOf("(") > -1 || name.indexOf(")") > -1 || name.indexOf("..") > -1 + if (name.indexOf("锛�") > -1 || name.indexOf("锛�") > -1 || name.indexOf("..") > -1 | name.indexOf("[") > -1 || name.indexOf("]") > -1 || name.indexOf("-") > -1 || name.indexOf("{") > -1 || name.indexOf("}") > -1 || name.indexOf("{") > -1 || name.indexOf("}") > -1 || name.indexOf(":") > -1) { return ret @@ -1226,14 +1226,14 @@ class WebAveragerAnalyzerBatch extends BaseBatch { } } }catch(Exception e){ - println "异常....." + println "寮傚父....." } return ret; } /** - * 发送或者输出日志信息 + * 鍙戦�佹垨鑰呰緭鍑烘棩蹇椾俊鎭� * @param jobStatMap */ private void doSendMessage(Map> jobStatMap) { @@ -1247,7 +1247,7 @@ class WebAveragerAnalyzerBatch extends BaseBatch { ${printContent.toString()} ############################################# """ - String title = SHORT_DATE + "均价对比详细分析情况"; + String title = SHORT_DATE + "鍧囦环瀵规瘮璇︾粏鍒嗘瀽鎯呭喌"; StringBuilder emailContent = new StringBuilder() emailContent.append("") @@ -1255,17 +1255,17 @@ ${printContent.toString()} emailContent.append("") emailContent.append("") emailContent.append("") - emailContent.append(""); + emailContent.append(""); - emailContent.append(""); - emailContent.append(""); - emailContent.append(""); - emailContent.append(""); + emailContent.append(""); + emailContent.append(""); + emailContent.append(""); + emailContent.append(""); - emailContent.append(""); - emailContent.append(""); - emailContent.append(""); - emailContent.append(""); + emailContent.append(""); + emailContent.append(""); + emailContent.append(""); + emailContent.append(""); emailContent.append("") for(String jobId : jobStatMap.keySet()) { emailContent.append("") @@ -1296,7 +1296,7 @@ ${printContent.toString()} } /** - * 压缩 + * 鍘嬬缉 * * @param content * @return @@ -1402,15 +1402,15 @@ ${printContent.toString()} def getMatchName(def city, def region, def disName){ def cat = "district"; - //查询房价网是否存在该小区 + //鏌ヨ鎴夸环缃戞槸鍚﹀瓨鍦ㄨ灏忓尯 def dbo = CommonDatautils.findSeaweed(city, region, disName, cat); if(!dbo){ - //别名 + //鍒悕 def distrs = CommonDatautils.findSeaweedByAlias(city, region, disName, cat); if(distrs){ dbo = distrs } - //地址 + //鍦板潃 if(!dbo){ def result = CommonDatautils.findSeaweedByAddress(city, region, disName, cat) if(result.size()==1){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/averager/WebAveragerDiffBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/averager/WebAveragerDiffBatch.groovy index 360df550e..1167bc449 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/averager/WebAveragerDiffBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/averager/WebAveragerDiffBatch.groovy @@ -48,7 +48,7 @@ class WebAveragerDiffBatch extends BaseBatch { /** - * 导入本月第一个周日的数据 + * 瀵煎叆鏈湀绗竴涓懆鏃ョ殑鏁版嵁 */ public void statisticFangjiaWangAverage(String city) { DBObject q=new BasicDBObject(); @@ -71,10 +71,10 @@ class WebAveragerDiffBatch extends BaseBatch { String region = dbo.get("region"); String name = dbo.get("name"); String estateType = null - if(dbo.get('estate_type2') && dbo.get('estate_type2').toString().indexOf('别墅') !=-1){ - estateType="别墅"; + if(dbo.get('estate_type2') && dbo.get('estate_type2').toString().indexOf('鍒') !=-1){ + estateType="鍒"; }else{ - estateType="小区"; + estateType="灏忓尯"; } DBObject obj = new BasicDBObject(); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/AddAvgPriceRunTask.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/AddAvgPriceRunTask.groovy index 9d751e549..05428fc54 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/AddAvgPriceRunTask.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/AddAvgPriceRunTask.groovy @@ -15,15 +15,15 @@ import com.mongodb.DBObject import com.mongodb.Mongo /** - * 新增商铺写字楼计算均价与租金的任务 - * 每周日运行一次 + * 鏂板鍟嗛摵鍐欏瓧妤艰绠楀潎浠蜂笌绉熼噾鐨勪换鍔� + * 姣忓懆鏃ヨ繍琛屼竴娆� * @author gaojuan * */ class AddAvgPriceRunTask extends BaseBatch{ public final static DBCollection COMMAND_COLL = new Mongo("mongo.db.fangjia.com", 27017).getDB('fangjia_log').getCollection('calc_command'); - public final static def citys = ["上海","北京","南京","天津","重庆","成都","大连","沈阳","哈尔滨","牡丹江","大庆","齐齐哈尔","佳木斯","伊春","鸡西","鹤岗","双鸭山","七台河","绥化","黑河"]; + public final static def citys = ["涓婃捣","鍖椾含","鍗椾含","澶╂触","閲嶅簡","鎴愰兘","澶ц繛","娌堥槼","鍝堝皵婊�","鐗′腹姹�","澶у簡","榻愰綈鍝堝皵","浣虫湪鏂�","浼婃槬","楦¤タ","楣ゅ矖","鍙岄腑灞�","涓冨彴娌�","缁ュ寲","榛戞渤"]; static main(args) { runBatch(new AddAvgPriceRunTask(), args) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/AddRentPriceRunTask.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/AddRentPriceRunTask.groovy index 34a0dd787..4b079be8c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/AddRentPriceRunTask.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/AddRentPriceRunTask.groovy @@ -59,7 +59,7 @@ class AddRentPriceRunTask extends BaseBatch{ if(cursor){ for(def dbo : cursor){ def city = dbo.get("display"); - if(city!='全国'){ + if(city!='鍏ㄥ浗'){ citys << city; } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/AveragePriceStatistics.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/AveragePriceStatistics.groovy index 4536f44ad..1b7bc7761 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/AveragePriceStatistics.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/AveragePriceStatistics.groovy @@ -40,21 +40,21 @@ class AveragePriceStatistics extends BaseBatch { public static final DBCollection LABOR_COLL = MongoUtils.getCollectionByName("fangjia", "average_statistics", "mongo.db.fangjia.com") public static final DBCollection AVERAGE_ANALYSIS = MongoUtils.getCollectionByName("fangjia", "average_analysis", "mongo.db.fangjia.com") - //搜房网 新房均价检测JOB_ID + //鎼滄埧缃� 鏂版埧鍧囦环妫�娴婮OB_ID private static String SOUFUN_JOB_ID_NEW_HOUSE="53c48f40e4b0da17b9c0c4d0"; - //搜房网二手房均价检测JOB_ID + //鎼滄埧缃戜簩鎵嬫埧鍧囦环妫�娴婮OB_ID private static String SOUFUN_JOB_ID_ESF="53c7903be4b0da17b9c106d7"; - //安居客 新房均价检测JOB_ID + //瀹夊眳瀹� 鏂版埧鍧囦环妫�娴婮OB_ID public static final String ANJUKE_JOB_ID_NEW_HOUSE = "53c48ec3e4b0da17b9c0c4ce" - //安居客二手房均价检测JOB_ID + //瀹夊眳瀹簩鎵嬫埧鍧囦环妫�娴婮OB_ID public static final String ANJUKE_JOB_ID_ESF = "53c6297ae4b0da17b9c0de61" - //新浪乐居二手房均价检测JOB_ID + //鏂版氮涔愬眳浜屾墜鎴垮潎浠锋娴婮OB_ID public static final String SINA_JOB_ID_ESF = "53c75dc9e4b0da17b9c10632" - //新浪乐居新房房均价检测JOB_ID + //鏂版氮涔愬眳鏂版埧鎴垮潎浠锋娴婮OB_ID public static final String SINA_JOB_ID_NEW_HOUSE = "53c4a48de4b0da17b9c0c5f9" static Jms jms = Jms.create('tcp://jms.db.fangjia.com:61616'); - /*忽略的价格*/ - private static final List IGNORED_PRICES = ["售价待定", "价格待定"] + /*蹇界暐鐨勪环鏍�*/ + private static final List IGNORED_PRICES = ["鍞环寰呭畾", "浠锋牸寰呭畾"] public int shortDate = DateUtil.getFirstDayOfMonth(new Date()).format("yyyyMM").toInteger(); public static StringBuilder sb =new StringBuilder(); static final String CATEGORY = "district" @@ -66,62 +66,62 @@ class AveragePriceStatistics extends BaseBatch { statisticFangjiaWangAverage() }catch(Exception e){ ex = e - log("房价网数据导入失败:"+e.getMessage()) + log("鎴夸环缃戞暟鎹鍏ュけ璐�:"+e.getMessage()) } try{ statisticAnjukeNewHouseAverage(); }catch(Exception e){ ex = e - log("安居客新房数据导入失败:"+e.getMessage()) + log("瀹夊眳瀹㈡柊鎴挎暟鎹鍏ュけ璐�:"+e.getMessage()) } try{ statisticAnjukeEsfAverage(); }catch(Exception e){ ex = e - log("安居客二手房数据导入失败:"+e.getMessage()) + log("瀹夊眳瀹簩鎵嬫埧鏁版嵁瀵煎叆澶辫触:"+e.getMessage()) } try{ statisticSinaNewHouseAverage(); }catch(Exception e){ ex = e - log("新浪乐居新房数据导入失败:"+e.getMessage()) + log("鏂版氮涔愬眳鏂版埧鏁版嵁瀵煎叆澶辫触:"+e.getMessage()) } try{ statisticSinaEsfAverage(); }catch(Exception e){ ex = e - log("新浪乐居二手房数据导入失败:"+e.getMessage()) + log("鏂版氮涔愬眳浜屾墜鎴挎暟鎹鍏ュけ璐�:"+e.getMessage()) } try{ statisticSoufunNewHouseAverage(); }catch(Exception e){ ex = e - log("搜房网新房数据导入失败:"+e.getMessage()) + log("鎼滄埧缃戞柊鎴挎暟鎹鍏ュけ璐�:"+e.getMessage()) } try{ statisticSoufunEsfAverage(); }catch(Exception e){ ex = e - log("搜房网二手房数据导入失败:"+e.getMessage()) + log("鎼滄埧缃戜簩鎵嬫埧鏁版嵁瀵煎叆澶辫触:"+e.getMessage()) } try{ statisticCricNewHouseAverage(); }catch(Exception e){ ex = e - log("克尔瑞数据导入失败:"+e.getMessage()) + log("鍏嬪皵鐟炴暟鎹鍏ュけ璐�:"+e.getMessage()) } try{ computeDiff(); }catch(Exception e){ ex = e - log("差比数据计算失败:"+e.getMessage()) + log("宸瘮鏁版嵁璁$畻澶辫触:"+e.getMessage()) } try{ analyze(); }catch(Exception e){ ex = e - log("数据分析失败:"+e.getMessage()) + log("鏁版嵁鍒嗘瀽澶辫触:"+e.getMessage()) } if(ex == null){ CRAWL_COLL.remove(new BasicDBObject('job_id', SOUFUN_JOB_ID_NEW_HOUSE)) @@ -130,9 +130,9 @@ class AveragePriceStatistics extends BaseBatch { CRAWL_COLL.remove(new BasicDBObject('job_id', ANJUKE_JOB_ID_ESF)) CRAWL_COLL.remove(new BasicDBObject('job_id', SINA_JOB_ID_ESF)) CRAWL_COLL.remove(new BasicDBObject('job_id', SINA_JOB_ID_NEW_HOUSE)) - log("抓取系统数据删除成功") + log("鎶撳彇绯荤粺鏁版嵁鍒犻櫎鎴愬姛") } - jms.sendMail('wangwenyan@fangjia.com',"住宅均价统计结果反馈",sb.toString()); + jms.sendMail('wangwenyan@fangjia.com',"浣忓畢鍧囦环缁熻缁撴灉鍙嶉",sb.toString()); } public static void main(String[] args) { @@ -140,13 +140,13 @@ class AveragePriceStatistics extends BaseBatch { } /** - * 导入本月第一个周日的数据 + * 瀵煎叆鏈湀绗竴涓懆鏃ョ殑鏁版嵁 */ public void statisticFangjiaWangAverage() { - log("开始导入房价网数据:"+new Date().format("yyyy年MM月dd日 HH:mm:ss")) + log("寮�濮嬪鍏ユ埧浠风綉鏁版嵁:"+new Date().format("yyyy骞碝M鏈坉d鏃� HH:mm:ss")) DBObject query = new BasicDBObject() query.put("weekend", DateUtil.truncateDay(DateUtil.getLastSunday(new Date()))); - query.put("estate_type","小区"); + query.put("estate_type","灏忓尯"); DBObject keys = new BasicDBObject(); keys.put("district_name",true); keys.put("city",true); @@ -171,14 +171,14 @@ class AveragePriceStatistics extends BaseBatch { obj.put('m_date', new Date()) LABOR_COLL.update(new BasicDBObject('city', city).append('name', districtName).append("s_date",shortDate).append("region", region).append("category", CATEGORY), new BasicDBObject('$set', obj), true, true) } - log("房价网数据导入结束:"+new Date().format("yyyy年MM月dd日 HH:mm:ss")+"共导入 $total 条数据") + log("鎴夸环缃戞暟鎹鍏ョ粨鏉�:"+new Date().format("yyyy骞碝M鏈坉d鏃� HH:mm:ss")+"鍏卞鍏� $total 鏉℃暟鎹�") } /** - * 统计搜房网新房价格 + * 缁熻鎼滄埧缃戞柊鎴夸环鏍� */ public void statisticSoufunNewHouseAverage() { - log("开始分析搜房新房数据-> 时间:"+new Date().format("yyyy年MM月dd日 HH:mm:ss")) + log("寮�濮嬪垎鏋愭悳鎴挎柊鎴挎暟鎹�-> 鏃堕棿:"+new Date().format("yyyy骞碝M鏈坉d鏃� HH:mm:ss")) DBCursor cur = CRAWL_COLL.find(new BasicDBObject('job_id', SOUFUN_JOB_ID_NEW_HOUSE)).addOption(Bytes.QUERYOPTION_NOTIMEOUT) int total = 0; int availableCount = 0; @@ -201,13 +201,13 @@ class AveragePriceStatistics extends BaseBatch { for (Element element : elements) { total++ String eleContent = element.toString(); - if(eleContent.contains("dotzz.gif")){//过滤再租房源 + if(eleContent.contains("dotzz.gif")){//杩囨护鍐嶇鎴挎簮 continue } - if(eleContent.contains("dot10.gif")){//过滤售完楼盘 + if(eleContent.contains("dot10.gif")){//杩囨护鍞畬妤肩洏 continue } - if(!eleContent.contains("住宅")&&!eleContent.contains("别墅")){//过滤非住宅且非别墅小区 + if(!eleContent.contains("浣忓畢")&&!eleContent.contains("鍒")){//杩囨护闈炰綇瀹呬笖闈炲埆澧呭皬鍖� continue } String name = selectText(".f14px .snblue", eleContent) @@ -220,11 +220,11 @@ class AveragePriceStatistics extends BaseBatch { try { DBObject obj = new BasicDBObject() if(!IGNORED_PRICES.contains(price)){ - if(priceDesc.endsWith("元/平方米")){ + if(priceDesc.endsWith("鍏�/骞虫柟绫�")){ obj.put('soufang_new_price',extractPrice(price)) } } - if(obj.get("soufang_new_price")==null){//没有价格 + if(obj.get("soufang_new_price")==null){//娌℃湁浠锋牸 continue } obj.put('city', city) @@ -244,14 +244,14 @@ class AveragePriceStatistics extends BaseBatch { } - log("搜房新房数据分析结束-> 时间:"+new Date().format("yyyy年MM月dd日 HH:mm:ss")+ "网页总数:"+webPageCount +"有效网页数:"+availableWebPageCount +"小区总数:$total 有效小区总数:$availableCount "+(int)(availableCount*100/total)+"%") + log("鎼滄埧鏂版埧鏁版嵁鍒嗘瀽缁撴潫-> 鏃堕棿:"+new Date().format("yyyy骞碝M鏈坉d鏃� HH:mm:ss")+ "缃戦〉鎬绘暟:"+webPageCount +"鏈夋晥缃戦〉鏁�:"+availableWebPageCount +"灏忓尯鎬绘暟:$total 鏈夋晥灏忓尯鎬绘暟:$availableCount "+(int)(availableCount*100/total)+"%") } /** - * 统计搜房网二手房价格 + * 缁熻鎼滄埧缃戜簩鎵嬫埧浠锋牸 */ public void statisticSoufunEsfAverage() { - log("开始分析搜房二手房数据-> 时间:"+new Date().format("yyyy年MM月dd日 HH:mm:ss")) + log("寮�濮嬪垎鏋愭悳鎴夸簩鎵嬫埧鏁版嵁-> 鏃堕棿:"+new Date().format("yyyy骞碝M鏈坉d鏃� HH:mm:ss")) DBCursor cur = CRAWL_COLL.find(new BasicDBObject('job_id', SOUFUN_JOB_ID_ESF)).addOption(Bytes.QUERYOPTION_NOTIMEOUT) int total = 0; int availableCount = 0; @@ -279,27 +279,27 @@ class AveragePriceStatistics extends BaseBatch { } String name = selectText("dl>dt>a", eleContent) if(StringUtils.isBlank(name)){ - name = selectText(".gray6.mt15>a>span", eleContent)//中山 + name = selectText(".gray6.mt15>a>span", eleContent)//涓北 } String price = selectText(".danjia", eleContent) String priceDesc = selectText(".danjia", eleContent) if(StringUtils.isBlank(price)){ - price = selectText(".price a", eleContent)//中山 - priceDesc = selectText(".price a", eleContent)//中山 + price = selectText(".price a", eleContent)//涓北 + priceDesc = selectText(".price a", eleContent)//涓北 } if(StringUtils.isBlank(name) || StringUtils.isBlank(price) || StringUtils.isBlank(priceDesc)){ - println "解析出错 $url $name" + println "瑙f瀽鍑洪敊 $url $name" continue; } try { DBObject obj = new BasicDBObject() if(!IGNORED_PRICES.contains(price)){ - if(priceDesc.contains("元/")){ + if(priceDesc.contains("鍏�/")){ obj.put('soufang_esf_price',extractPrice(price)) } } - if(obj.get("soufang_esf_price")==null){//没有价格 + if(obj.get("soufang_esf_price")==null){//娌℃湁浠锋牸 continue } obj.put('city', city) @@ -319,15 +319,15 @@ class AveragePriceStatistics extends BaseBatch { } - log("搜房二手房数据分析结束-> 时间:"+new Date().format("yyyy年MM月dd日 HH:mm:ss")+ "网页总数:"+webPageCount +"有效网页数:"+availableWebPageCount +"小区总数:$total 有效小区总数:$availableCount "+(int)(availableCount*100/total)+"%") + log("鎼滄埧浜屾墜鎴挎暟鎹垎鏋愮粨鏉�-> 鏃堕棿:"+new Date().format("yyyy骞碝M鏈坉d鏃� HH:mm:ss")+ "缃戦〉鎬绘暟:"+webPageCount +"鏈夋晥缃戦〉鏁�:"+availableWebPageCount +"灏忓尯鎬绘暟:$total 鏈夋晥灏忓尯鎬绘暟:$availableCount "+(int)(availableCount*100/total)+"%") } /** - * 统计安居客新房价格 + * 缁熻瀹夊眳瀹㈡柊鎴夸环鏍� */ public void statisticAnjukeNewHouseAverage() { - log("开始分析安居客新房数据-> 时间:"+new Date().format("yyyy年MM月dd日 HH:mm:ss")) + log("寮�濮嬪垎鏋愬畨灞呭鏂版埧鏁版嵁-> 鏃堕棿:"+new Date().format("yyyy骞碝M鏈坉d鏃� HH:mm:ss")) DBCursor cur = CRAWL_COLL.find(new BasicDBObject('job_id', ANJUKE_JOB_ID_NEW_HOUSE)).addOption(Bytes.QUERYOPTION_NOTIMEOUT) int total = 0; int availableCount = 0; @@ -341,11 +341,11 @@ class AveragePriceStatistics extends BaseBatch { String content = data.get('content') String region = data.get("region") String url = dbo.get('url') - int flg = 1;//上海模式 + int flg = 1;//涓婃捣妯″紡 Elements elements = JQueryUtils.select(".list-contents .item-mod", content); if(elements.isEmpty()){ elements= JQueryUtils.select(".loupans .loupan_list_item", content) - flg = 2;//大连模式 + flg = 2;//澶ц繛妯″紡 } if(elements == null || elements.isEmpty()){ continue; @@ -393,14 +393,14 @@ class AveragePriceStatistics extends BaseBatch { } } - log("安居客新房数据分析结束-> 时间:"+new Date().format("yyyy年MM月dd日 HH:mm:ss")+ "网页总数:"+webPageCount +"有效网页数:"+availableWebPageCount +"小区总数:$total 有效小区总数:$availableCount "+(int)(availableCount*100/total)+"%") + log("瀹夊眳瀹㈡柊鎴挎暟鎹垎鏋愮粨鏉�-> 鏃堕棿:"+new Date().format("yyyy骞碝M鏈坉d鏃� HH:mm:ss")+ "缃戦〉鎬绘暟:"+webPageCount +"鏈夋晥缃戦〉鏁�:"+availableWebPageCount +"灏忓尯鎬绘暟:$total 鏈夋晥灏忓尯鎬绘暟:$availableCount "+(int)(availableCount*100/total)+"%") } /** - * 统计安居客二手房价格 + * 缁熻瀹夊眳瀹簩鎵嬫埧浠锋牸 */ public void statisticAnjukeEsfAverage() { - log("开始分析安居客二手房价格-> 时间:"+new Date().format("yyyy年MM月dd日 HH:mm:ss")) + log("寮�濮嬪垎鏋愬畨灞呭浜屾墜鎴夸环鏍�-> 鏃堕棿:"+new Date().format("yyyy骞碝M鏈坉d鏃� HH:mm:ss")) DBCursor cur = CRAWL_COLL.find(new BasicDBObject('job_id', ANJUKE_JOB_ID_ESF)).addOption(Bytes.QUERYOPTION_NOTIMEOUT) int total = 0; int availableCount = 0; @@ -431,7 +431,7 @@ class AveragePriceStatistics extends BaseBatch { try { DBObject obj = new BasicDBObject() if(!IGNORED_PRICES.contains(price)){ - if(priceDesc.contains("元/平米")){ + if(priceDesc.contains("鍏�/骞崇背")){ obj.put('anjuke_esf_price', extractPrice(price)) } } @@ -454,14 +454,14 @@ class AveragePriceStatistics extends BaseBatch { } } - log("安居客二手房数据分析结束-> 时间:"+new Date().format("yyyy年MM月dd日 HH:mm:ss")+ "网页总数:"+webPageCount +"有效网页数:"+availableWebPageCount +"小区总数:$total 有效小区总数:$availableCount "+(int)(availableCount*100/total)+"%") + log("瀹夊眳瀹簩鎵嬫埧鏁版嵁鍒嗘瀽缁撴潫-> 鏃堕棿:"+new Date().format("yyyy骞碝M鏈坉d鏃� HH:mm:ss")+ "缃戦〉鎬绘暟:"+webPageCount +"鏈夋晥缃戦〉鏁�:"+availableWebPageCount +"灏忓尯鎬绘暟:$total 鏈夋晥灏忓尯鎬绘暟:$availableCount "+(int)(availableCount*100/total)+"%") } /** - * 统计新浪乐居新房价格 + * 缁熻鏂版氮涔愬眳鏂版埧浠锋牸 */ public void statisticSinaNewHouseAverage() { - log("开始分析新浪乐居新房房价格-> 时间:"+new Date().format("yyyy年MM月dd日 HH:mm:ss")) + log("寮�濮嬪垎鏋愭柊娴箰灞呮柊鎴挎埧浠锋牸-> 鏃堕棿:"+new Date().format("yyyy骞碝M鏈坉d鏃� HH:mm:ss")) DBCursor cur = CRAWL_COLL.find(new BasicDBObject('job_id', SINA_JOB_ID_NEW_HOUSE)).addOption(Bytes.QUERYOPTION_NOTIMEOUT) int total = 0; int availableCount = 0; @@ -477,7 +477,7 @@ class AveragePriceStatistics extends BaseBatch { String url = dbo.get('url') Elements elements = JQueryUtils.select(".result_list li", content) if(elements == null || elements.isEmpty()){ - println "新浪乐居新房->没有解析出小区 URL:$url" + println "鏂版氮涔愬眳鏂版埧->娌℃湁瑙f瀽鍑哄皬鍖� URL:$url" continue; } availableWebPageCount++ @@ -495,8 +495,8 @@ class AveragePriceStatistics extends BaseBatch { try { DBObject obj = new BasicDBObject() if(!IGNORED_PRICES.contains(price)&&!price.contains("-")){ - if(price.contains("元/平米")){ - price = price.replaceAll("元/平米", "").replaceAll("均价", "").replaceAll("起价","").trim(); + if(price.contains("鍏�/骞崇背")){ + price = price.replaceAll("鍏�/骞崇背", "").replaceAll("鍧囦环", "").replaceAll("璧蜂环","").trim(); obj.put('sina_new_price', extractPrice(price)) } } @@ -518,14 +518,14 @@ class AveragePriceStatistics extends BaseBatch { } } } - log("新浪乐居新房数据分析结束-> 时间:"+new Date().format("yyyy年MM月dd日 HH:mm:ss")+ "网页总数:"+webPageCount +"有效网页数:"+availableWebPageCount +"小区总数:$total 有效小区总数:$availableCount "+(int)(availableCount*100/total)+"%") + log("鏂版氮涔愬眳鏂版埧鏁版嵁鍒嗘瀽缁撴潫-> 鏃堕棿:"+new Date().format("yyyy骞碝M鏈坉d鏃� HH:mm:ss")+ "缃戦〉鎬绘暟:"+webPageCount +"鏈夋晥缃戦〉鏁�:"+availableWebPageCount +"灏忓尯鎬绘暟:$total 鏈夋晥灏忓尯鎬绘暟:$availableCount "+(int)(availableCount*100/total)+"%") } /** - * 统计新浪乐居二手房价格 + * 缁熻鏂版氮涔愬眳浜屾墜鎴夸环鏍� */ public void statisticSinaEsfAverage() { - log("开始分析新浪乐居二手房价格-> 时间:"+new Date().format("yyyy年MM月dd日 HH:mm:ss")) + log("寮�濮嬪垎鏋愭柊娴箰灞呬簩鎵嬫埧浠锋牸-> 鏃堕棿:"+new Date().format("yyyy骞碝M鏈坉d鏃� HH:mm:ss")) DBCursor cur = CRAWL_COLL.find(new BasicDBObject('job_id', SINA_JOB_ID_ESF)).addOption(Bytes.QUERYOPTION_NOTIMEOUT) int total = 0; int availableCount = 0; @@ -540,21 +540,21 @@ class AveragePriceStatistics extends BaseBatch { String region = data.get("region") String url = dbo.get('url') /* - * 新浪二手房北京:.lists>ul>li - * 新浪二手房杭州:#siteHouseList div + * 鏂版氮浜屾墜鎴垮寳浜�:.lists>ul>li + * 鏂版氮浜屾墜鎴挎澀宸�:#siteHouseList div */ String type; Elements elements = JQueryUtils.select(".lists>ul>li", content) if(elements.size()>0){ - type = "北京"; + type = "鍖椾含"; }else{ elements = JQueryUtils.select("#siteHouseList div", content) if(elements.size()>0){ - type = "杭州" + type = "鏉窞" } } if(elements == null || elements.isEmpty()){ - println "新浪乐居二手房->没有解析出小区 URL:$url" + println "鏂版氮涔愬眳浜屾墜鎴�->娌℃湁瑙f瀽鍑哄皬鍖� URL:$url" continue; } availableWebPageCount++ @@ -564,13 +564,13 @@ class AveragePriceStatistics extends BaseBatch { String name = null; String price = null; String priceDesc = null; - if(type=="北京"){ + if(type=="鍖椾含"){ name = selectText(".title>a",eleContent) priceDesc = selectText(".price", eleContent) - if(priceDesc.contains("元/")||priceDesc.contains("均价:")){ + if(priceDesc.contains("鍏�/")||priceDesc.contains("鍧囦环锛�")){ price = selectText(".price>span", eleContent); } - }else if(type=="杭州"){ + }else if(type=="鏉窞"){ name = selectText(".c_default.f14",eleContent) priceDesc = selectText(".i-infos>p:eq(0)", eleContent) if(StringUtils.isNotBlank(name)){ @@ -578,11 +578,11 @@ class AveragePriceStatistics extends BaseBatch { if(names.length > 0){ name = names[0]; }else{ - println "新浪乐居二手房->小区名解析失败$name"; + println "鏂版氮涔愬眳浜屾墜鎴�->灏忓尯鍚嶈В鏋愬け璐�$name"; name = null; } } - if(priceDesc.contains("元/")||priceDesc.contains("均价:")){ + if(priceDesc.contains("鍏�/")||priceDesc.contains("鍧囦环锛�")){ price =selectText(".c_red.bold", eleContent); } } @@ -612,16 +612,16 @@ class AveragePriceStatistics extends BaseBatch { } } - log("新新浪乐居二手房数据分析结束-> 时间:"+new Date().format("yyyy年MM月dd日 HH:mm:ss")+ "网页总数:"+webPageCount +"有效网页数:"+availableWebPageCount +"小区总数:$total 有效小区总数:$availableCount "+(int)(availableCount*100/total)+"%") + log("鏂版柊娴箰灞呬簩鎵嬫埧鏁版嵁鍒嗘瀽缁撴潫-> 鏃堕棿:"+new Date().format("yyyy骞碝M鏈坉d鏃� HH:mm:ss")+ "缃戦〉鎬绘暟:"+webPageCount +"鏈夋晥缃戦〉鏁�:"+availableWebPageCount +"灏忓尯鎬绘暟:$total 鏈夋晥灏忓尯鎬绘暟:$availableCount "+(int)(availableCount*100/total)+"%") } public void statisticCricNewHouseAverage(){ - log("开始分析克尔瑞数据:"+new Date().format("yyyy年MM月dd日 HH:mm:ss")) + log("寮�濮嬪垎鏋愬厠灏旂憺鏁版嵁:"+new Date().format("yyyy骞碝M鏈坉d鏃� HH:mm:ss")) Document doc = getDocFromUrl("http://www.fangjiadp.com/index"); Elements ele= doc.select(".txt_info a") Map cityUrlMap = [:] ele.each { - if(it.text().indexOf("新房")>0){ - cityUrlMap.put(it.text().replaceAll("新房", "").trim(), "http://www.fangjiadp.com"+it.attr("href")) + if(it.text().indexOf("鏂版埧")>0){ + cityUrlMap.put(it.text().replaceAll("鏂版埧", "").trim(), "http://www.fangjiadp.com"+it.attr("href")) } } DBObject query = new BasicDBObject() @@ -650,7 +650,7 @@ class AveragePriceStatistics extends BaseBatch { } executor.shutdown(); executor.awaitTermination(Long.MAX_VALUE, TimeUnit.DAYS); - log("克尔瑞数据分析结束:"+new Date().format("yyyy年MM月dd日 HH:mm:ss")) + log("鍏嬪皵鐟炴暟鎹垎鏋愮粨鏉�:"+new Date().format("yyyy骞碝M鏈坉d鏃� HH:mm:ss")) } private void parseCricData(url,city,name,region){ @@ -696,7 +696,7 @@ class AveragePriceStatistics extends BaseBatch { } public void computeDiff(){ - log("开始计算住宅均价差比:"+new Date().format("yyyy年MM月dd日 HH:mm:ss")) + log("寮�濮嬭绠椾綇瀹呭潎浠峰樊姣�:"+new Date().format("yyyy骞碝M鏈坉d鏃� HH:mm:ss")) DBObject query = new BasicDBObject() query.put("s_date", shortDate); DBCursor cursor= LABOR_COLL.find(query).addOption(Bytes.QUERYOPTION_NOTIMEOUT); @@ -759,11 +759,11 @@ class AveragePriceStatistics extends BaseBatch { } LABOR_COLL.save(dbo); } - log("住宅均价差比计算结束:"+new Date().format("yyyy年MM月dd日 HH:mm:ss")) + log("浣忓畢鍧囦环宸瘮璁$畻缁撴潫:"+new Date().format("yyyy骞碝M鏈坉d鏃� HH:mm:ss")) } public void analyze(){ - log("开始分析住宅均价:"+new Date().format("yyyy年MM月dd日 HH:mm:ss")) + log("寮�濮嬪垎鏋愪綇瀹呭潎浠�:"+new Date().format("yyyy骞碝M鏈坉d鏃� HH:mm:ss")) DBObject query = new BasicDBObject() query.put("s_date", shortDate); DBCursor cursor= LABOR_COLL.find(query).addOption(Bytes.QUERYOPTION_NOTIMEOUT); @@ -945,7 +945,7 @@ class AveragePriceStatistics extends BaseBatch { AVERAGE_ANALYSIS.update(new BasicDBObject('city', _city).append("s_date",shortDate).append("category",CATEGORY), new BasicDBObject('$set', obj), true, true) } } - log("住宅均价计算结束:"+new Date().format("yyyy年MM月dd日 HH:mm:ss")) + log("浣忓畢鍧囦环璁$畻缁撴潫:"+new Date().format("yyyy骞碝M鏈坉d鏃� HH:mm:ss")) } private String genertorKey(double diff){ @@ -997,7 +997,7 @@ class AveragePriceStatistics extends BaseBatch { try{ if(repeatTimes>0){ Thread.sleep(1000); - println "准备尝试第"+(repeatTimes+1)+"次请求:$url"; + println "鍑嗗灏濊瘯绗�"+(repeatTimes+1)+"娆¤姹�:$url"; } doc = Jsoup.parse(new URL(url), 5*1000); if(doc != null){ @@ -1009,7 +1009,7 @@ class AveragePriceStatistics extends BaseBatch { } if(doc==null){ - println "检测到不可访问链接:$url"; + println "妫�娴嬪埌涓嶅彲璁块棶閾炬帴:$url"; } return doc; } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/AveragerWorstExporter.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/AveragerWorstExporter.groovy index 7e0119a39..766e4b9b1 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/AveragerWorstExporter.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/AveragerWorstExporter.groovy @@ -33,9 +33,9 @@ class AveragerWorstExporter extends BaseBatch{ @Override public void process(Object args) { - def cities = ['上海'] + def cities = ['涓婃捣'] - File file = new File("D:/均价数据/小区价格可信度TOP${TOP_NUMBER}_${DateUtil.formatToTightYYYYMMDD(new Date())}.xls") + File file = new File("D:/鍧囦环鏁版嵁/灏忓尯浠锋牸鍙俊搴OP${TOP_NUMBER}_${DateUtil.formatToTightYYYYMMDD(new Date())}.xls") if(file.exists()) { file.delete(); } @@ -62,7 +62,7 @@ class AveragerWorstExporter extends BaseBatch{ fields.put("estate_type2", 1) DBObject query =new BasicDBObject('cat', 'district').append("visible", 0).append("city", city) -// query.put("name", '欧泊圣堡苑') +// query.put("name", '娆ф硦鍦e牎鑻�') DSCursor dscur = seaweedColl.find(query, fields).batchSize(2000)//.limit(2000) Iterator iter = dscur.iterator() @@ -83,10 +83,10 @@ class AveragerWorstExporter extends BaseBatch{ q.put("city", city) q.put("region", region) q.put("district_name", name) -// if(district.get('estate_type2').indexOf('别墅') > -1) { -// q.put("estate_type", '别墅') +// if(district.get('estate_type2').indexOf('鍒') > -1) { +// q.put("estate_type", '鍒') // }else { -// q.put("estate_type", '小区') +// q.put("estate_type", '灏忓尯') // } q.put("weekend", weekend) DBObject statObj = statColl.findOne(q) @@ -144,58 +144,58 @@ class AveragerWorstExporter extends BaseBatch{ HSSFRow row0 = sheet.createRow(0) HSSFCell cell0 = row0.createCell(0); - cell0.setCellValue("序号"); + cell0.setCellValue("搴忓彿"); cell0 = row0.createCell(1); - cell0.setCellValue("城市"); + cell0.setCellValue("鍩庡競"); cell0 = row0.createCell(2); - cell0.setCellValue("区域"); + cell0.setCellValue("鍖哄煙"); cell0 = row0.createCell(3); - cell0.setCellValue("名称"); + cell0.setCellValue("鍚嶇О"); cell0 = row0.createCell(4); - cell0.setCellValue("可信度"); + cell0.setCellValue("鍙俊搴�"); cell0 = row0.createCell(5); - cell0.setCellValue("时间"); + cell0.setCellValue("鏃堕棿"); cell0 = row0.createCell(6); - cell0.setCellValue("房价网"); + cell0.setCellValue("鎴夸环缃�"); cell0 = row0.createCell(7); - cell0.setCellValue("搜房网/新房"); + cell0.setCellValue("鎼滄埧缃�/鏂版埧"); cell0 = row0.createCell(8); - cell0.setCellValue("搜房网/二手房"); + cell0.setCellValue("鎼滄埧缃�/浜屾墜鎴�"); cell0 = row0.createCell(9); - cell0.setCellValue("安居客/新房"); + cell0.setCellValue("瀹夊眳瀹�/鏂版埧"); cell0 = row0.createCell(10); - cell0.setCellValue("安居客/二手房"); + cell0.setCellValue("瀹夊眳瀹�/浜屾墜鎴�"); cell0 = row0.createCell(11); - cell0.setCellValue("新浪乐居/新房"); + cell0.setCellValue("鏂版氮涔愬眳/鏂版埧"); cell0 = row0.createCell(12); - cell0.setCellValue("新浪乐居/二手房"); + cell0.setCellValue("鏂版氮涔愬眳/浜屾墜鎴�"); cell0 = row0.createCell(13); - cell0.setCellValue("克尔瑞/新房"); + cell0.setCellValue("鍏嬪皵鐟�/鏂版埧"); cell0 = row0.createCell(14); - cell0.setCellValue("克尔瑞/二手房"); + cell0.setCellValue("鍏嬪皵鐟�/浜屾墜鎴�"); cell0 = row0.createCell(15); - cell0.setCellValue("卖家价"); + cell0.setCellValue("鍗栧浠�"); cell0 = row0.createCell(16); - cell0.setCellValue("买家价"); + cell0.setCellValue("涔板浠�"); cell0 = row0.createCell(17); - cell0.setCellValue("调查人"); + cell0.setCellValue("璋冩煡浜�"); int rowIndex = 1 for(String k : newCreditMap.keySet()) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/AvgPriceCoverageExport.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/AvgPriceCoverageExport.groovy index 2357bfe1a..e1598720d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/AvgPriceCoverageExport.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/AvgPriceCoverageExport.groovy @@ -15,15 +15,15 @@ def map = [:] CITY_INFO.find(new BasicDBObject("weekend", DateUtil.getFirstDayOfWeek(new Date())),new BasicDBObject("city", 1).append("price_coverage",1)).each {BasicDBObject dbObject-> map.put(dbObject.city,dbObject.price_coverage) } -def data = ExcelUtils.read("E:\\Users\\wenyan\\Desktop\\均价覆盖率(2).xlsx" ,0 , 0) +def data = ExcelUtils.read("E:\\Users\\wenyan\\Desktop\\鍧囦环瑕嗙洊鐜�(2).xlsx" ,0 , 0) data.eachWithIndex { List item, int i -> if(i != 0){ - if(item[1] == "延边朝鲜族自治州"){ - item[2] = map.get("延边") + if(item[1] == "寤惰竟鏈濋矞鏃忚嚜娌诲窞"){ + item[2] = map.get("寤惰竟") }else{ item[2] = map.get(item[1]) } } println(item) } -ExcelUtils.write("E:\\Users\\wenyan\\Desktop\\均价覆盖率(2).xlsx",data,"均价覆盖率") +ExcelUtils.write("E:\\Users\\wenyan\\Desktop\\鍧囦环瑕嗙洊鐜�(2).xlsx",data,"鍧囦环瑕嗙洊鐜�") diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/AvgPriceStatTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/AvgPriceStatTest.groovy index 7c55f0762..55588e1b6 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/AvgPriceStatTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/AvgPriceStatTest.groovy @@ -12,8 +12,8 @@ import com.fangjia.script.util.DateUtils import com.mongodb.QueryOperators import com.mongodb.Bytes; /** - * 临时脚本 - * 作用:查询某一日期与上一期计算出均价的数量差 + * 涓存椂鑴氭湰 + * 浣滅敤锛氭煡璇㈡煇涓�鏃ユ湡涓庝笂涓�鏈熻绠楀嚭鍧囦环鐨勬暟閲忓樊 * @author gaojuan * */ @@ -28,14 +28,14 @@ class AvgPriceStatTest { } def run(){ - def city = "重庆"; + def city = "閲嶅簡"; def districts = getAllDistricts(city, "district"); - println "共有小区数:"+districts.size(); + println "鍏辨湁灏忓尯鏁帮細"+districts.size(); def prices1 = queryDistrictPrice(city, "2014-12-14"); - println "2014-12-14 共计算均价数:"+prices1.size(); + println "2014-12-14 鍏辫绠楀潎浠锋暟锛�"+prices1.size(); def dist1 = calDistrictPrices(prices1, districts); def prices2 = queryDistrictPrice(city, "2014-12-07"); - println "2014-12-07 共计算均价数:"+prices2.size(); + println "2014-12-07 鍏辫绠楀潎浠锋暟锛�"+prices2.size(); def dist2 = calDistrictPrices(prices2, districts); def ret = noCalDist(prices1, prices2, districts); def index = 0; @@ -56,8 +56,8 @@ class AvgPriceStatTest { } } } - println "上期不存在的小区:"+ret.size(); - println "上期不存在的小区(去重后):"+ret.unique().size(); + println "涓婃湡涓嶅瓨鍦ㄧ殑灏忓尯锛�"+ret.size(); + println "涓婃湡涓嶅瓨鍦ㄧ殑灏忓尯(鍘婚噸鍚�)锛�"+ret.unique().size(); return ret; } def calDistrictPrices(prices, districts){ @@ -67,9 +67,9 @@ class AvgPriceStatTest { sameDists << s1; } } - println "共计算小区量:"+sameDists.size(); + println "鍏辫绠楀皬鍖洪噺锛�"+sameDists.size(); def count = sameDists.unique().size(); - println "共计算小区量(去重):"+count; + println "鍏辫绠楀皬鍖洪噺(鍘婚噸)锛�"+count; return sameDists; } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/DataMigration.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/DataMigration.groovy index 7f1f66d47..83acbbcb0 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/DataMigration.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/DataMigration.groovy @@ -47,14 +47,14 @@ class DataMigration { for(def dl : dealpriceCursor){ if(dl.get("hall")){ if(dl.get("hall") instanceof String){ - println dl._id.toString() +" hall 为字符串" + println dl._id.toString() +" hall 涓哄瓧绗︿覆" def dbo = new BasicDBObject() dbo.put("hall", dl.get("hall").toString().toInteger()) DEAL_PRICE_COLL.update(new BasicDBObject("_id", dl._id), new BasicDBObject('$set', dbo)) } }else{ if(!dl.get("area")){ - println dl._id.toString() +" 面积为空" + println dl._id.toString() +" 闈㈢Н涓虹┖" DEAL_PRICE_COLL.remove(new BasicDBObject("_id", dl._id)) } } @@ -91,7 +91,7 @@ class DataMigration { static regression(){ SimpleRegression s = new SimpleRegression(); BasicDBObject query= new BasicDBObject(); - query.append("district_name", "名光大厦"); + query.append("district_name", "鍚嶅厜澶у帵"); DBCursor cursor = STA.find(query).sort(new BasicDBObject("c_date", 1)); BasicDBObject dbo; while(cursor.hasNext()){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/DistrictRentStatistics.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/DistrictRentStatistics.groovy index 537faab80..db46b1724 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/DistrictRentStatistics.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/DistrictRentStatistics.groovy @@ -27,7 +27,7 @@ class DistrictRentStatistics extends BaseBatch{ public static final DBCollection CRAWL_COLL = MongoUtils.getCollectionByName("artemis", "metadata", "192.168.0.56", 55007) public static final DBCollection REGION_BLOCK_COLL = MongoUtils.getCollectionByName("fangjia", "region_block", "mongo.db.fangjia.com") public static final DBCollection RENT_COLL = MongoUtils.getCollectionByName("fangjia", "dist_rent_statistics", "mongo.db.fangjia.com") - //搜房网 小区租金JOB_ID + //鎼滄埧缃� 灏忓尯绉熼噾JOB_ID private static String SOUFUN_JOB_ID_DISTRICT_RENT = "541fbfb0e4b0ba18b478ac00"; private static def stat_date = DateUtils.truncateDay(DateUtils.getLastDayOfMonth(new Date())); @@ -51,7 +51,7 @@ class DistrictRentStatistics extends BaseBatch{ } -// def city = "上海"; +// def city = "涓婃捣"; // def regionMap = findRegion(city); // def blockMap = findRegionBlock(city); // analyFangDistrictRent(regionMap, blockMap); @@ -76,7 +76,7 @@ class DistrictRentStatistics extends BaseBatch{ } def name = document.select("#pgy_B02_01").attr("title"); - def s = document.select("#projinfodetail dd:contains(所在区域:)").text().replace("所在区域:", ""); + def s = document.select("#projinfodetail dd:contains(鎵�鍦ㄥ尯鍩燂細)").text().replace("鎵�鍦ㄥ尯鍩燂細", ""); def array = s.split(" "); region = standardRegion(regionMap, array[0].trim()); @@ -94,7 +94,7 @@ class DistrictRentStatistics extends BaseBatch{ udata.put("c_date", new Date()); udata.put("stat_date", stat_date); - def priceStr = document.select("p:contains("+name+"租金指导价:)").text(); + def priceStr = document.select("p:contains("+name+"绉熼噾鎸囧浠凤細)").text(); def priceArray = priceStr.split(","); if(priceArray.length > 0){ @@ -105,21 +105,21 @@ class DistrictRentStatistics extends BaseBatch{ def price = extractPrice(priceArray[i]); def houstType = 0; if(price){ - if(priceArray[i].indexOf("一居")!=-1){ + if(priceArray[i].indexOf("涓�灞�")!=-1){ houstType = 1; - }else if(priceArray[i].indexOf("二居")!=-1){ + }else if(priceArray[i].indexOf("浜屽眳")!=-1){ houstType = 2; - }else if(priceArray[i].indexOf("三居")!=-1){ + }else if(priceArray[i].indexOf("涓夊眳")!=-1){ houstType = 3; - }else if(priceArray[i].indexOf("四居")!=-1){ + }else if(priceArray[i].indexOf("鍥涘眳")!=-1){ houstType = 4; - }else if(priceArray[i].indexOf("五居")!=-1){ + }else if(priceArray[i].indexOf("浜斿眳")!=-1){ houstType = 5; - }else if(priceArray[i].indexOf("六居")!=-1){ + }else if(priceArray[i].indexOf("鍏眳")!=-1){ houstType = 6; - }else if(priceArray[i].indexOf("七居")!=-1){ + }else if(priceArray[i].indexOf("涓冨眳")!=-1){ houstType = 7; - }else if(priceArray[i].indexOf("单间")!=-1){ + }else if(priceArray[i].indexOf("鍗曢棿")!=-1){ houstType = 0; } @@ -146,7 +146,7 @@ class DistrictRentStatistics extends BaseBatch{ public Integer extractPrice(String priceDesc){ - Pattern p=Pattern.compile("(\\d+)元"); + Pattern p=Pattern.compile("(\\d+)鍏�"); Matcher m=p.matcher(priceDesc); if(m.find()){ return m.group(1).toInteger() diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/ExportAvgPrice.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/ExportAvgPrice.groovy index fb9821df4..e12822bce 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/ExportAvgPrice.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/ExportAvgPrice.groovy @@ -17,7 +17,7 @@ import com.mongodb.Bytes; import com.fangjia.script.util.DateUtils import com.mongodb.QueryOperators /** - * 导出某月的城市,区域,板块,小区均价 + * 瀵煎嚭鏌愭湀鐨勫煄甯傦紝鍖哄煙锛屾澘鍧楋紝灏忓尯鍧囦环 * @author gaojuan * */ @@ -31,13 +31,13 @@ public class ExportAvgPrice { static main(args) { def task = new ExportAvgPrice(); def weekends = ["2023-04-01","2023-03-01","2023-02-01","2023-01-01","2022-12-01","2022-11-01","2022-10-01","2022-09-01","2022-08-01","2022-07-01","2022-06-01","2022-05-01","2022-04-01","2022-03-01","2022-02-01","2022-01-01","2021-12-01","2021-11-01","2021-10-01","2021-09-01","2021-08-01","2021-07-01","2021-06-01","2021-05-01","2021-04-01"] - def citys = ["上海"];//findAllCity(); -// task.exportAllCity(citys, weekends, "D:\\数据\\小区\\全国城市季度均价.csv"); -// task.exportRegion(citys, weekends, "D:\\数据\\小区\\区域季度均价.csv"); -// task.exportBlock(citys, weekends, "e:\\区域板块季度均价.csv"); - task.exportDistrict(citys, weekends, "D:\\数据\\小区\\小区季度均价.csv"); + def citys = ["涓婃捣"];//findAllCity(); +// task.exportAllCity(citys, weekends, "D:\\鏁版嵁\\灏忓尯\\鍏ㄥ浗鍩庡競瀛e害鍧囦环.csv"); +// task.exportRegion(citys, weekends, "D:\\鏁版嵁\\灏忓尯\\鍖哄煙瀛e害鍧囦环.csv"); +// task.exportBlock(citys, weekends, "e:\\鍖哄煙鏉垮潡瀛e害鍧囦环.csv"); + task.exportDistrict(citys, weekends, "D:\\鏁版嵁\\灏忓尯\\灏忓尯瀛e害鍧囦环.csv"); -// task.exportRegionPrice("江苏"); +// task.exportRegionPrice("姹熻嫃"); } public void exportAllCity(citys, weekends, path){ @@ -161,7 +161,7 @@ public class ExportAvgPrice { } }else{ - println "计算均价"+ s + println "璁$畻鍧囦环"+ s } @@ -182,7 +182,7 @@ public class ExportAvgPrice { q.put("visible", 0); q.put("cat", "district"); q.put("city", city); -// q.put("name", "龙柏二村") +// q.put("name", "榫欐煆浜屾潙") DSCursor cursor = getDataStoreConnection().find(q).sort(new BasicDBObject('bscore', -1)); Iterator iters = cursor.iterator() @@ -194,13 +194,13 @@ public class ExportAvgPrice { def name = obj.get("name"); def kind = obj.get("kind"); if(kind){ - if(kind.indexOf("别墅")!=-1){ - kind = "别墅"; + if(kind.indexOf("鍒")!=-1){ + kind = "鍒"; }else{ - kind ="小区"; + kind ="灏忓尯"; } }else{ - kind ="小区"; + kind ="灏忓尯"; println region +"@" + name+"@"+kind+"@"+block; } @@ -223,7 +223,7 @@ public class ExportAvgPrice { def regions = []; for(DBObject obj : dbCursor){ def region = obj.get("name"); - if(region.indexOf("周边")==-1 && region.indexOf("其他")==-1) { + if(region.indexOf("鍛ㄨ竟")==-1 && region.indexOf("鍏朵粬")==-1) { regions << region; } } @@ -241,7 +241,7 @@ public class ExportAvgPrice { for(DBObject obj : dbCursor){ def block = obj.get("name"); def region = obj.get("parent"); -// if(region.indexOf("周边")==-1 && region.indexOf("其他")==-1) { +// if(region.indexOf("鍛ㄨ竟")==-1 && region.indexOf("鍏朵粬")==-1) { // regions << region; // } @@ -255,10 +255,10 @@ public class ExportAvgPrice { if (file.exists()){ file.delete(); } - file.append("城市,") + file.append("鍩庡競,") for(def weekend : weekends){ def date = DateUtils.formatDateByPattern(DateUtils.parseFromTightYYYYMMDD(weekend), "yyyy-MM") - file.append(date + "均价,") + file.append(date + "鍧囦环,") } file.append(System.getProperty("line.separator")); @@ -280,11 +280,11 @@ public class ExportAvgPrice { if (file.exists()){ file.delete(); } - file.append("城市,") - file.append("区域,") + file.append("鍩庡競,") + file.append("鍖哄煙,") for(def weekend : weekends){ def date = DateUtils.formatDateByPattern(DateUtils.parseFromTightYYYYMMDD(weekend), "yyyy-MM") - file.append(date + "月,") + file.append(date + "鏈�,") } file.append(System.getProperty("line.separator")); @@ -308,12 +308,12 @@ public class ExportAvgPrice { if (file.exists()){ file.delete(); } - file.append("城市,") - file.append("区域,") - file.append("板块,") + file.append("鍩庡競,") + file.append("鍖哄煙,") + file.append("鏉垮潡,") for(def weekend : weekends){ def date = DateUtils.formatDateByPattern(DateUtils.parseFromTightYYYYMMDD(weekend), "yyyy-MM") - file.append(date + "均价,") + file.append(date + "鍧囦环,") } file.append(System.getProperty("line.separator")); list.each{d-> @@ -337,14 +337,14 @@ public class ExportAvgPrice { if (file.exists()){ file.delete(); } - file.append("城市,") - file.append("区域,") - file.append("板块,") - file.append("楼盘名称,") - file.append("类型,") + file.append("鍩庡競,") + file.append("鍖哄煙,") + file.append("鏉垮潡,") + file.append("妤肩洏鍚嶇О,") + file.append("绫诲瀷,") for(def weekend : weekends){ def date = DateUtils.formatDateByPattern(DateUtils.parseFromTightYYYYMMDD(weekend), "yyyy-MM") - file.append(date + "均价,") + file.append(date + "鍧囦环,") } file.append(System.getProperty("line.separator")); def index = 0; @@ -461,7 +461,7 @@ public class ExportAvgPrice { if(cursor){ for(def dbo : cursor){ def city = dbo.get("display"); - if(city!='全国'){ + if(city!='鍏ㄥ浗'){ citys << city; } } @@ -480,7 +480,7 @@ public class ExportAvgPrice { ret = findRegionPrice(city, ret, regions, weekends); } - writeExcelRegion(ret, weekends, "e:\\数据导出\\江苏省均价.csv"); + writeExcelRegion(ret, weekends, "e:\\鏁版嵁瀵煎嚭\\姹熻嫃鐪佸潎浠�.csv"); } @@ -492,7 +492,7 @@ public class ExportAvgPrice { if(cursor){ for(def dbo : cursor){ def city = dbo.get("display"); - if(city!='全国'){ + if(city!='鍏ㄥ浗'){ citys << city; } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/ExportNearestAvgPrice.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/ExportNearestAvgPrice.groovy index 4d1847be2..25c9a9f1b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/ExportNearestAvgPrice.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/ExportNearestAvgPrice.groovy @@ -15,7 +15,7 @@ import com.mongodb.Bytes; import com.fangjia.script.util.DateUtils import com.mongodb.QueryOperators /** - * 导出最近几期的城市,区域,板块,小区均价 + * 瀵煎嚭鏈�杩戝嚑鏈熺殑鍩庡競锛屽尯鍩燂紝鏉垮潡锛屽皬鍖哄潎浠� * @author gaojuan * */ @@ -29,14 +29,14 @@ public class ExportNearestAvgPrice { static main(args) { - def citys = ["重庆"]//findAllCity(); + def citys = ["閲嶅簡"]//findAllCity(); def task = new ExportNearestAvgPrice(); - def weekends = task.findWeekends(12);//日期最近的X期 + def weekends = task.findWeekends(12);//鏃ユ湡鏈�杩戠殑X鏈� -// task.exportAllCity(citys, weekends, "e:\\全国城市均价.csv"); - task.exportRegion(citys, weekends, "D:\\数据\\区域均价.csv"); -// task.exportBlock(citys, weekends, "D:\\数据\\区域板块均价.xlsx"); -// task.exportDistrict(citys, weekends,"e:\\小区均价.csv"); +// task.exportAllCity(citys, weekends, "e:\\鍏ㄥ浗鍩庡競鍧囦环.csv"); + task.exportRegion(citys, weekends, "D:\\鏁版嵁\\鍖哄煙鍧囦环.csv"); +// task.exportBlock(citys, weekends, "D:\\鏁版嵁\\鍖哄煙鏉垮潡鍧囦环.xlsx"); +// task.exportDistrict(citys, weekends,"e:\\灏忓尯鍧囦环.csv"); } @@ -72,7 +72,7 @@ public class ExportNearestAvgPrice { ret = findRegionPrice(city, ret, regions, weekends); } writeExcelRegion(ret, weekends, path); -// ExcelUtils.write(path, ret, "月均价") +// ExcelUtils.write(path, ret, "鏈堝潎浠�") } @@ -123,13 +123,13 @@ public class ExportNearestAvgPrice { def name = obj.get("name"); def kind = obj.get("kind"); if(kind){ - if(kind.indexOf("别墅")!=-1){ - kind = "别墅"; + if(kind.indexOf("鍒")!=-1){ + kind = "鍒"; }else{ - kind ="小区"; + kind ="灏忓尯"; } }else{ - kind ="小区"; + kind ="灏忓尯"; println region +"@" + name+"@"+kind+"@"+block; } @@ -152,7 +152,7 @@ public class ExportNearestAvgPrice { def regions = []; for(DBObject obj : dbCursor){ def region = obj.get("name"); - if(region.indexOf("周边")==-1 && region.indexOf("其他")==-1) { + if(region.indexOf("鍛ㄨ竟")==-1 && region.indexOf("鍏朵粬")==-1) { regions << region; } } @@ -170,7 +170,7 @@ public class ExportNearestAvgPrice { for(DBObject obj : dbCursor){ def block = obj.get("name"); def region = obj.get("parent"); -// if(region.indexOf("周边")==-1 && region.indexOf("其他")==-1) { +// if(region.indexOf("鍛ㄨ竟")==-1 && region.indexOf("鍏朵粬")==-1) { // regions << region; // } @@ -184,9 +184,9 @@ public class ExportNearestAvgPrice { if (file.exists()){ file.delete(); } - file.append("城市,") + file.append("鍩庡競,") for(def weekend : weekends){ - file.append(weekend + "均价,") + file.append(weekend + "鍧囦环,") } @@ -209,10 +209,10 @@ public class ExportNearestAvgPrice { if (file.exists()){ file.delete(); } - file.append("城市,") - file.append("区域,") + file.append("鍩庡競,") + file.append("鍖哄煙,") for(def weekend : weekends){ - file.append(weekend + "均价,") + file.append(weekend + "鍧囦环,") } file.append(System.getProperty("line.separator")); @@ -236,11 +236,11 @@ public class ExportNearestAvgPrice { if (file.exists()){ file.delete(); } - file.append("城市,") - file.append("区域,") - file.append("板块,") + file.append("鍩庡競,") + file.append("鍖哄煙,") + file.append("鏉垮潡,") for(def weekend : weekends){ - file.append(weekend + "均价,") + file.append(weekend + "鍧囦环,") } file.append(System.getProperty("line.separator")); list.each{d-> @@ -264,13 +264,13 @@ public class ExportNearestAvgPrice { if (file.exists()){ file.delete(); } - file.append("城市,") - file.append("区域,") - file.append("板块,") - file.append("楼盘名称,") - file.append("类型,") + file.append("鍩庡競,") + file.append("鍖哄煙,") + file.append("鏉垮潡,") + file.append("妤肩洏鍚嶇О,") + file.append("绫诲瀷,") for(def weekend : weekends){ - file.append(weekend + "均价,") + file.append(weekend + "鍧囦环,") } file.append(System.getProperty("line.separator")); list.each{d-> @@ -420,7 +420,7 @@ public class ExportNearestAvgPrice { } }else{ - println "计算均价"+ s + println "璁$畻鍧囦环"+ s } if(index==100){ break; @@ -502,7 +502,7 @@ public class ExportNearestAvgPrice { if(cursor){ for(def dbo : cursor){ def city = dbo.get("display"); - if(city!='全国'){ + if(city!='鍏ㄥ浗'){ citys << city; } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/HistoricalAverageRevaluationTask.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/HistoricalAverageRevaluationTask.groovy index c62639177..08387f217 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/HistoricalAverageRevaluationTask.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/HistoricalAverageRevaluationTask.groovy @@ -17,7 +17,7 @@ import java.sql.Statement /** * - * 历史均价计算 + * 鍘嗗彶鍧囦环璁$畻 * * */ @@ -42,7 +42,7 @@ class HistoricalAverageRevaluationTask extends BaseBatch{ connectionProperties.put("user","developer") connectionProperties.put("password","5e8edd851d2fdfbd7415232c67367cc3") dataSource.setProperties(connectionProperties) - //周末列表 + //鍛ㄦ湯鍒楄〃 def betweenDates = DateUtil.getWeekendBetweenDates(DateUtil.parseDate("20170101","yyyyMMdd"),new Date()); CommonUtils.findAllCity().each { def city-> DbUtils.multiThreadingExecuteQueryOnSeaweed(DbUtils.buildSeaweedQuery(city),{ BasicDBObject district-> @@ -51,10 +51,10 @@ class HistoricalAverageRevaluationTask extends BaseBatch{ def address = district.address def regions = [r] def estate_type = null; - if(district.estate_type2.toString().contains("别墅")){ - estate_type = "别墅" + if(district.estate_type2.toString().contains("鍒")){ + estate_type = "鍒" }else{ - estate_type = "小区" + estate_type = "灏忓尯" } BasicDBObject query = new BasicDBObject() query.append("weekend", new BasicDBObject('$gte',betweenDates[0]).append('$lte',new Date())) @@ -62,7 +62,7 @@ class HistoricalAverageRevaluationTask extends BaseBatch{ query.append("region", r) query.append("district_name", name) query.append("estate_type", estate_type) - BasicDBObject keys=new BasicDBObject();//指定需要显示列 + BasicDBObject keys=new BasicDBObject();//鎸囧畾闇�瑕佹樉绀哄垪 keys.put("weekend",1) DBCursor districts = DISTRICT_STAT_COLL.find(query,keys).addOption(Bytes.QUERYOPTION_NOTIMEOUT) //println("districts"+districts); @@ -119,7 +119,7 @@ class HistoricalAverageRevaluationTask extends BaseBatch{ Statement statement = connection.createStatement() // println("sqlBuffer.toString()"+sqlBuffer.toString()) ResultSet rs = statement.executeQuery(sqlBuffer.toString()) - //if 没有价格 and 最近两年有房源 + //if 娌℃湁浠锋牸 and 鏈�杩戜袱骞存湁鎴挎簮 while (rs.next()) { def c = rs.getInt("c") @@ -128,7 +128,7 @@ class HistoricalAverageRevaluationTask extends BaseBatch{ // DBObject db = findResult(city,r,name,date,estate_type) // if(db != null) { // Date d = db.get("c_date") -// //是否相差一个月 +// //鏄惁鐩稿樊涓�涓湀 // if (new Date().getTime() - d.getTime()>=1000*60*60*24*30){ // saveNoprice(city, r, name, address, date,estate_type); // CommonUtils.recalculationAverage(city,r,name,estate_type,0,date); @@ -142,7 +142,7 @@ class HistoricalAverageRevaluationTask extends BaseBatch{ } }) - println(city+"统计完成!!!") + println(city+"缁熻瀹屾垚锛侊紒锛�") } } @@ -154,14 +154,14 @@ class HistoricalAverageRevaluationTask extends BaseBatch{ query.append("district_name", district_name) query.append("weekend", weekend) query.append("estate_type", estate_type) - BasicDBObject keys=new BasicDBObject();//指定需要显示列 + BasicDBObject keys=new BasicDBObject();//鎸囧畾闇�瑕佹樉绀哄垪 keys.put("c_date",1) return NOPRICE_DISTRICT_STAT_COLL.findOne(query) } /** - * 添加记录 + * 娣诲姞璁板綍 * @param city * @param region * @param district_name diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/MonthlyDistrictStatCalcBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/MonthlyDistrictStatCalcBatch.groovy index 3f477bd30..b5fb9e26e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/MonthlyDistrictStatCalcBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/MonthlyDistrictStatCalcBatch.groovy @@ -59,9 +59,9 @@ class Calculator extends Thread{ @Override void run() { - def estate_type = "小区" - if(district.estate_type2 && district.estate_type2.toString().contains("别墅")){ - estate_type = "别墅" + def estate_type = "灏忓尯" + if(district.estate_type2 && district.estate_type2.toString().contains("鍒")){ + estate_type = "鍒" } def statMap = [:] diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/MonthlyRegionStatCalcBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/MonthlyRegionStatCalcBatch.groovy index ce268cfa7..3fac447a7 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/MonthlyRegionStatCalcBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/MonthlyRegionStatCalcBatch.groovy @@ -34,11 +34,11 @@ class MonthlyRegionStatCalcBatch extends BaseBatch { dbRegions.each {String r-> if(!regions.contains(r)){ REGION_STAT_TREND.remove(new BasicDBObject("city", city).append("region", r)) - println("删除 $city $r 删除") + println("鍒犻櫎 $city $r 鍒犻櫎") } } regions.each {def region -> - REGION_STAT.find(new BasicDBObject("city", city).append("region", region).append("block", null).append("cat", "区域")).sort(new BasicDBObject("weekend", 1)).each { BasicDBObject dbo-> + REGION_STAT.find(new BasicDBObject("city", city).append("region", region).append("block", null).append("cat", "鍖哄煙")).sort(new BasicDBObject("weekend", 1)).each { BasicDBObject dbo-> Date weekend = dbo.weekend if(DateUtil.isLastSundayOfMonth(weekend)){ def trend = new BasicDBObject("city", city) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/NewHouseAvgPrice.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/NewHouseAvgPrice.groovy index b05ada9fe..70968f42f 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/NewHouseAvgPrice.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/NewHouseAvgPrice.groovy @@ -26,7 +26,7 @@ import com.mongodb.DBCollection import com.mongodb.DBCursor import com.mongodb.DBObject /** - * 新房楼盘均价统计 + * 鏂版埧妤肩洏鍧囦环缁熻 * @author user * */ @@ -43,18 +43,18 @@ class NewHouseAvgPrice extends BaseBatch{ // public static final DBCollection LABOR_COLL = MongoUtils.getCollectionByName("fangjia", "web_average", "localhost") - //搜房网 新房均价检测JOB_ID + //鎼滄埧缃� 鏂版埧鍧囦环妫�娴婮OB_ID public static final String SOUFUN_JOB_ID = "5391275ee4b0a3c75adbb4dd" - //安居客 新房均价检测JOB_ID + //瀹夊眳瀹� 鏂版埧鍧囦环妫�娴婮OB_ID public static final String ANJUKE_JOB_ID = "539154bde4b0a3c75adbb53e" public static final double DIFF_RANGE = 0.1 - public static final def CITIES = ["上海", "成都", "北京", "广州", "深圳"] + public static final def CITIES = ["涓婃捣", "鎴愰兘", "鍖椾含", "骞垮窞", "娣卞湷"] - /*忽略的价格*/ - public static final List IGNORED_PRICES = ["售价待定", "价格待定"] + /*蹇界暐鐨勪环鏍�*/ + public static final List IGNORED_PRICES = ["鍞环寰呭畾", "浠锋牸寰呭畾"] public static final def EMAILS = [Watcher.WangWenYan.email] @@ -81,7 +81,7 @@ class NewHouseAvgPrice extends BaseBatch{ } for(String email : EMAILS) { - jms.sendMail(email, "新房网络均价检测" + DateUtil.formatToTightYYYYMMDDhhmmss(new Date()), "程序处理完毕") + jms.sendMail(email, "鏂版埧缃戠粶鍧囦环妫�娴�" + DateUtil.formatToTightYYYYMMDDhhmmss(new Date()), "绋嬪簭澶勭悊瀹屾瘯") } } @@ -135,7 +135,7 @@ class NewHouseAvgPrice extends BaseBatch{ } } catch (Exception e) { - println dbo.get("anjuke_new_house_price")+"不可计算房价"; + println dbo.get("anjuke_new_house_price")+"涓嶅彲璁$畻鎴夸环"; } try { @@ -143,7 +143,7 @@ class NewHouseAvgPrice extends BaseBatch{ soufangNewHousePrice = Integer.valueOf(dbo.get("soufang_new_house_price").toString()); } } catch (Exception e) { - println dbo.get("soufang_new_house_price")+"不可计算房价"; + println dbo.get("soufang_new_house_price")+"涓嶅彲璁$畻鎴夸环"; } if(priceFangjia == null || city == null || name == null) { @@ -208,7 +208,7 @@ class NewHouseAvgPrice extends BaseBatch{ obj.put('name', name) obj.put('weekend', NEXT_WEEKEND) if(!IGNORED_PRICES.contains(price)){ - if(priceDesc.contains("元/平米")){ + if(priceDesc.contains("鍏�/骞崇背")){ obj.put('anjuke_new_house_price', price.toInteger()) }else{ println url+":"+ priceDesc+"-->"+extractPrice(priceDesc); @@ -244,7 +244,7 @@ class NewHouseAvgPrice extends BaseBatch{ } /** - * 从抓取系统中取出网页 + * 浠庢姄鍙栫郴缁熶腑鍙栧嚭缃戦〉 */ public void exportSoufunNewHouseAverage() { DBCursor cur = CRAWL_COLL.find(new BasicDBObject('job_id', SOUFUN_JOB_ID)) @@ -272,7 +272,7 @@ class NewHouseAvgPrice extends BaseBatch{ obj.put('city', city) obj.put('name', name) if(!IGNORED_PRICES.contains(price)){ - if(priceDesc.endsWith("元/平方米")){ + if(priceDesc.endsWith("鍏�/骞虫柟绫�")){ obj.put('soufang_new_house_price',price.toInteger()) }else{ println url+":"+ priceDesc+"-->"+extractPrice(priceDesc); @@ -306,7 +306,7 @@ class NewHouseAvgPrice extends BaseBatch{ /** - * 导出最新一期的均价 + * 瀵煎嚭鏈�鏂颁竴鏈熺殑鍧囦环 */ public void exportFangjiaAverage() { for(String city : CITIES) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/NoSampleAverageRevaluationTask.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/NoSampleAverageRevaluationTask.groovy index e093d6d29..f9d48aa93 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/NoSampleAverageRevaluationTask.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/NoSampleAverageRevaluationTask.groovy @@ -12,7 +12,7 @@ import com.fangjia.script.util.MongoUtils import com.mongodb.* /** - * 无样本小区历史遗漏数据补充 + * 鏃犳牱鏈皬鍖哄巻鍙查仐婕忔暟鎹ˉ鍏� */ @BatchOwner(Watcher.JiangYaHui) class NoSampleAverageRevaluationTask extends BaseBatch{ @@ -37,7 +37,7 @@ class NoSampleAverageRevaluationTask extends BaseBatch{ } def run(){ - //周末列表 + //鍛ㄦ湯鍒楄〃 def betweenDates = DateUtil.getWeekendBetweenDates(DateUtil.parseDate("20170101","yyyyMMdd"),new Date()); CommonUtils.findAllCity().each { def city-> Set redrawtrendDisSet = new HashSet() @@ -46,10 +46,10 @@ class NoSampleAverageRevaluationTask extends BaseBatch{ def name = district.name def address = district.address def estate_type = null; - if(district.estate_type2.toString().contains("别墅")){ - estate_type = "别墅" + if(district.estate_type2.toString().contains("鍒")){ + estate_type = "鍒" }else{ - estate_type = "小区" + estate_type = "灏忓尯" } BasicDBObject query = new BasicDBObject() query.append("weekend", new BasicDBObject('$gte',betweenDates[0]).append('$lte',new Date())) @@ -57,7 +57,7 @@ class NoSampleAverageRevaluationTask extends BaseBatch{ query.append("region", r) query.append("district_name", name) query.append("estate_type", estate_type) - BasicDBObject keys=new BasicDBObject();//指定需要显示列 + BasicDBObject keys=new BasicDBObject();//鎸囧畾闇�瑕佹樉绀哄垪 keys.put("weekend",1) DBCursor districts = DISTRICT_STAT_COLL.find(query,keys).addOption(Bytes.QUERYOPTION_NOTIMEOUT) def dis = []; @@ -81,7 +81,7 @@ class NoSampleAverageRevaluationTask extends BaseBatch{ monitorCalcCommand() while (!isCalcFinish()) { Thread.sleep(1000 * 5) - println("${new Date().format("yyyyMMdd HH:mm:ss")} 等待均价计算完成") + println("${new Date().format("yyyyMMdd HH:mm:ss")} 绛夊緟鍧囦环璁$畻瀹屾垚") } redrawtrendDisSet.each { d-> String [] str = d.split (",") @@ -104,10 +104,10 @@ class NoSampleAverageRevaluationTask extends BaseBatch{ static void redrawtrendAverages(String city, String region, String name, String estateType){ Date weekend = getCalcWeekend() println("weekend=="+com.fangjia.core.util.DateUtil.formatByPattern(weekend,"yyyyMMdd")) - if(estateType && estateType.contains("别墅")){ - estateType = "别墅" + if(estateType && estateType.contains("鍒")){ + estateType = "鍒" }else if(estateType){ - estateType = "小区" + estateType = "灏忓尯" } DBObject cmd = new BasicDBObject() cmd.put("city", city) @@ -130,10 +130,10 @@ class NoSampleAverageRevaluationTask extends BaseBatch{ static void recalculationAverage_(String city, String region, String name, String estateType, int calc_type = 1, Date calcDate = new Date()){ Date weekend = com.fangjia.core.util.DateUtil.getFirstDayOfWeek(calcDate) - if(estateType && estateType.contains("别墅")){ - estateType = "别墅" + if(estateType && estateType.contains("鍒")){ + estateType = "鍒" }else if(estateType){ - estateType = "小区" + estateType = "灏忓尯" } @@ -158,7 +158,7 @@ class NoSampleAverageRevaluationTask extends BaseBatch{ /** - * 均价是否计算完成 + * 鍧囦环鏄惁璁$畻瀹屾垚 * @return */ boolean isCalcFinish(){ @@ -171,28 +171,28 @@ class NoSampleAverageRevaluationTask extends BaseBatch{ private void monitorCalcCommand() { final DBObject q = new BasicDBObject() q.put("isnosample", 1) - q.put('status', new BasicDBObject('$in', [0,1,102])) // 0-初始状态 1-处理中 102-计算完成 2-完成 3-处理错误 4-处理异常 + q.put('status', new BasicDBObject('$in', [0,1,102])) // 0-鍒濆鐘舵�� 1-澶勭悊涓� 102-璁$畻瀹屾垚 2-瀹屾垚 3-澶勭悊閿欒 4-澶勭悊寮傚父 while(true) { sleep(5 * 60 * 1000) def c = COMMAND_COLL.count(q) logInfo("calc command: " + c) if(c <= 0) { - //重试一次 + //閲嶈瘯涓�娆� sleep(10 * 1000) c = COMMAND_COLL.count(q) if(c <= 0) { - q.put('status', 2)//完成 + q.put('status', 2)//瀹屾垚 def c2 = COMMAND_COLL.count(q) - q.put('status', 3)//错误 + q.put('status', 3)//閿欒 def c3 = COMMAND_COLL.count(q) - q.put('status', 4)//异常 + q.put('status', 4)//寮傚父 def c4 = COMMAND_COLL.count(q) sleep(3 * 1000) - //退出 + //閫�鍑� break; } } @@ -204,7 +204,7 @@ class NoSampleAverageRevaluationTask extends BaseBatch{ /** - * 添加记录 + * 娣诲姞璁板綍 * @param city * @param region * @param district_name diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/OfficeSeaweedSynch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/OfficeSeaweedSynch.groovy index a188724c0..63512aa67 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/OfficeSeaweedSynch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/OfficeSeaweedSynch.groovy @@ -30,7 +30,7 @@ import com.fangjia.script.util.DateUtils; @BatchOwner(Watcher.Tomzhao) public class OfficeSeaweedSynch extends BaseBatch { public int shortDate = DateUtil.getFirstDayOfMonth(new Date()).format("yyyyMM").toInteger(); - def cityIds = ["上海","广州","天津","重庆","成都"] + def cityIds = ["涓婃捣","骞垮窞","澶╂触","閲嶅簡","鎴愰兘"] public static final DBCollection OFFICE_STAT_COLL = MongoUtils.getCollectionByName("fangjia", "office_stat", "mongo.db.fangjia.com") public static final DBCollection RENT_COLL = MongoUtils.getCollectionByName("fangjia", "rent_stat", "mongo.db.fangjia.com") public static final DBCollection LABOR_COLL = MongoUtils.getCollectionByName("fangjia", "average_statistics", "mongo.db.fangjia.com") @@ -62,7 +62,7 @@ public class OfficeSeaweedSynch extends BaseBatch { def fangjiaOfficePriceDataImport(String city){ - log("开始导入房价网写字楼数据:"+new Date().format("yyyy年MM月dd日 HH:mm:ss"),true); + log("寮�濮嬪鍏ユ埧浠风綉鍐欏瓧妤兼暟鎹�:"+new Date().format("yyyy骞碝M鏈坉d鏃� HH:mm:ss"),true); DBObject q=new BasicDBObject(); q.put("city", city); q.put("cat", CATEGORY); @@ -71,7 +71,7 @@ public class OfficeSeaweedSynch extends BaseBatch { fields.put("region",1); fields.put("name",1); - def dscur = seaweedColl.find(q,fields).batchSize(2000);//设置游标不要超时 + def dscur = seaweedColl.find(q,fields).batchSize(2000);//璁剧疆娓告爣涓嶈瓒呮椂 Set idSet = new HashSet() Iterator iter=dscur.iterator(); while(iter.hasNext()){ @@ -145,7 +145,7 @@ public class OfficeSeaweedSynch extends BaseBatch { rquery.put("region", region) rquery.put("name", districtName) rquery.put("weekend", WEEKEND) - rquery.put("kind","写字楼"); + rquery.put("kind","鍐欏瓧妤�"); def entity = RENT_COLL.findOne(rquery); if(entity !=null){ def price = entity.get("weekend_avgprice").toDouble(); @@ -170,12 +170,12 @@ public class OfficeSeaweedSynch extends BaseBatch { e.printStackTrace(); } } - log("房价网写字楼售价数据导入完成:"+new Date().format("yyyy年MM月dd日 HH:mm:ss")+"共导入 $total 条数据",true) + log("鎴夸环缃戝啓瀛楁ゼ鍞环鏁版嵁瀵煎叆瀹屾垚:"+new Date().format("yyyy骞碝M鏈坉d鏃� HH:mm:ss")+"鍏卞鍏� $total 鏉℃暟鎹�",true) } public void analyze(){ - log("开始分析写字楼数据:"+new Date().format("yyyy年MM月dd日 HH:mm:ss"),true) + log("寮�濮嬪垎鏋愬啓瀛楁ゼ鏁版嵁:"+new Date().format("yyyy骞碝M鏈坉d鏃� HH:mm:ss"),true) long time = System.currentTimeMillis(); DBObject query = new BasicDBObject() query.put("s_date", shortDate); @@ -330,7 +330,7 @@ public class OfficeSeaweedSynch extends BaseBatch { AVERAGE_ANALYSIS.update(new BasicDBObject('city', _city).append("s_date",shortDate).append("category",CATEGORY), new BasicDBObject('$set', obj), true, true) } } - log("写字楼数据分析结束:"+new Date().format("yyyy年MM月dd日 HH:mm:ss"),true) + log("鍐欏瓧妤兼暟鎹垎鏋愮粨鏉�:"+new Date().format("yyyy骞碝M鏈坉d鏃� HH:mm:ss"),true) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/PredictFuturePriceBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/PredictFuturePriceBatch.groovy index 6dd9ab35d..04ce345b9 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/PredictFuturePriceBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/PredictFuturePriceBatch.groovy @@ -20,10 +20,10 @@ import com.mongodb.WriteResult * Created with IntelliJ IDEA. * User: Albert Yan * Date: 13-1-25 - * Time: 下午12:58 + * Time: 涓嬪崍12:58 * Description: - * 预测未来一年的价格走势 - * 每月的第一个周末运行一次 + * 棰勬祴鏈潵涓�骞寸殑浠锋牸璧板娍 + * 姣忔湀鐨勭涓�涓懆鏈繍琛屼竴娆� */ @BatchOwner(value =[Watcher.DuXiaoYu,Watcher.WangWenYan]) class PredictFuturePriceBatch extends BaseBatch { @@ -34,14 +34,14 @@ class PredictFuturePriceBatch extends BaseBatch { static final DBCollection PRICE_PREDICT_COLL = MongoUtils.getCollectionByName("fangjia", "price_predict", HOST) static final DBCollection offline61ParamsPriceColl = DBHelper.offline61PriceDevDb.getCollection("price_params"); final DBCollection offline61ParamsPriceNewColl = DBHelper.offline61PriceDevDb.getCollection("price_params_new"); - static final def PREDICT_DISTRICT_CITIES = ["北京" , "上海"] + static final def PREDICT_DISTRICT_CITIES = ["鍖椾含" , "涓婃捣"] Map cal_params = ["GDP":6.9]; /** - * 取出当前期的计算结果[原始小区均价,原始城市均价] - * 遍历每个小区 - * 取出上个月的线上价格 - * 计算横向平均比率 + * 鍙栧嚭褰撳墠鏈熺殑璁$畻缁撴灉[鍘熷灏忓尯鍧囦环锛屽師濮嬪煄甯傚潎浠穄 + * 閬嶅巻姣忎釜灏忓尯 + * 鍙栧嚭涓婁釜鏈堢殑绾夸笂浠锋牸 + * 璁$畻妯悜骞冲潎姣旂巼 */ static void main(args) { runBatch(new PredictFuturePriceBatch(), args); @@ -49,8 +49,8 @@ class PredictFuturePriceBatch extends BaseBatch { @Override void process(args) { - Date weekend = DateUtil.getFirstDayOfWeek(new Date()) //当前计算周期 - def cities = ["北京","上海"]; + Date weekend = DateUtil.getFirstDayOfWeek(new Date()) //褰撳墠璁$畻鍛ㄦ湡 + def cities = ["鍖椾含","涓婃捣"]; cities.each {def city-> predictDistrict(city, weekend); predictCity(city, weekend); @@ -78,14 +78,14 @@ class PredictFuturePriceBatch extends BaseBatch { regions.each { BasicDBObject region = it; println "${region.key}" - double manualRatio = 1.0;//手工控制指数 + double manualRatio = 1.0;//鎵嬪伐鎺у埗鎸囨暟 double socialRatio = 0.01 // def paramsValue = getParamsValue(district.name,district.region,city,"predict_region"); // if (paramsValue){ -// manualRatio = paramsValue.get("manual_ratio");//手工控制指数 -// socialRatio = paramsValue.get("social_ratio");//通过采集当前互联网上有关房价的信心指数 +// manualRatio = paramsValue.get("manual_ratio");//鎵嬪伐鎺у埗鎸囨暟 +// socialRatio = paramsValue.get("social_ratio");//閫氳繃閲囬泦褰撳墠浜掕仈缃戜笂鏈夊叧鎴夸环鐨勪俊蹇冩寚鏁� // } -// double horizontalRatio = 0.0;//默认的水平涨跌幅度 +// double horizontalRatio = 0.0;//榛樿鐨勬按骞虫定璺屽箙搴� // int lastPrice = getRegionWeekendPrice(city,region.region,lastWeekend); // if (lastPrice){ // horizontalRatio = (region.weekendPrice-lastPrice)*1.0/lastPrice; @@ -121,14 +121,14 @@ class PredictFuturePriceBatch extends BaseBatch { blocks.each { BasicDBObject block = it; println "${block.key}" - double manualRatio = 1.0;//手工控制指数 + double manualRatio = 1.0;//鎵嬪伐鎺у埗鎸囨暟 double socialRatio = 0.01 // def paramsValue = getParamsValue(district.name,district.region,city,"predict_region"); // if (paramsValue){ -// manualRatio = paramsValue.get("manual_ratio");//手工控制指数 -// socialRatio = paramsValue.get("social_ratio");//通过采集当前互联网上有关房价的信心指数 +// manualRatio = paramsValue.get("manual_ratio");//鎵嬪伐鎺у埗鎸囨暟 +// socialRatio = paramsValue.get("social_ratio");//閫氳繃閲囬泦褰撳墠浜掕仈缃戜笂鏈夊叧鎴夸环鐨勪俊蹇冩寚鏁� // } -// double horizontalRatio = 0.0;//默认的水平涨跌幅度 +// double horizontalRatio = 0.0;//榛樿鐨勬按骞虫定璺屽箙搴� // int lastPrice = getBlockWeekendPrice(city,block.region,block.block,lastWeekend); // if (lastPrice){ // horizontalRatio = (block.weekendPrice-lastPrice)*1.0/lastPrice; @@ -160,14 +160,14 @@ class PredictFuturePriceBatch extends BaseBatch { Date endWeekend = weekend; println "${DateUtil.dateToString(startWeekend)}--${DateUtil.dateToString(endWeekend)}" removeFuturePrices(city, monthDate, "city"); - double manualRatio = 1.0;//手工控制指数 + double manualRatio = 1.0;//鎵嬪伐鎺у埗鎸囨暟 double socialRatio = 0.01 def paramsValue = getParamsValue(city, null, city, "predict_city"); if (paramsValue) { - manualRatio = paramsValue.get("manual_ratio");//手工控制指数 - socialRatio = paramsValue.get("social_ratio");//通过采集当前互联网上有关房价的信心指数 + manualRatio = paramsValue.get("manual_ratio");//鎵嬪伐鎺у埗鎸囨暟 + socialRatio = paramsValue.get("social_ratio");//閫氳繃閲囬泦褰撳墠浜掕仈缃戜笂鏈夊叧鎴夸环鐨勪俊蹇冩寚鏁� } - double horizontalRatio = 0.0;//默认的水平涨跌幅度 + double horizontalRatio = 0.0;//榛樿鐨勬按骞虫定璺屽箙搴� int curPrice = getCityWeekendPrice(city, weekend); // int lastPrice = getCityWeekendPrice(city,lastWeekend); // if (lastPrice){ @@ -193,20 +193,20 @@ class PredictFuturePriceBatch extends BaseBatch { int interval = 12; calendar.add(Calendar.MONTH, interval); Date endWeekend = weekend; - println "${startWeekend.format("yyyy年MM月dd日")}--${DateUtil.dateToString(endWeekend)}" + println "${startWeekend.format("yyyy骞碝M鏈坉d鏃�")}--${DateUtil.dateToString(endWeekend)}" removeFuturePrices(city, monthDate, "district"); List districts = getDistrictsByWeekend(city, weekend); districts.each { BasicDBObject district = it; println "${district.key}" - double manualRatio = 1.0;//手工控制指数 + double manualRatio = 1.0;//鎵嬪伐鎺у埗鎸囨暟 double socialRatio = 0.01 def paramsValue = getParamsValue(district.name, district.region, city, "predict_district"); if (paramsValue) { - manualRatio = paramsValue.get("manual_ratio");//手工控制指数 - socialRatio = paramsValue.get("social_ratio");//通过采集当前互联网上有关房价的信心指数 + manualRatio = paramsValue.get("manual_ratio");//鎵嬪伐鎺у埗鎸囨暟 + socialRatio = paramsValue.get("social_ratio");//閫氳繃閲囬泦褰撳墠浜掕仈缃戜笂鏈夊叧鎴夸环鐨勪俊蹇冩寚鏁� } -// double horizontalRatio = 0.0;//默认的水平涨跌幅度 +// double horizontalRatio = 0.0;//榛樿鐨勬按骞虫定璺屽箙搴� // int lastPrice = getDistrictWeekendPrice(district,lastWeekend); // if (lastPrice){ // horizontalRatio = (district.weekendPrice-lastPrice)*1.0/lastPrice; @@ -227,7 +227,7 @@ class PredictFuturePriceBatch extends BaseBatch { } /** - * 获取参数值 + * 鑾峰彇鍙傛暟鍊� * @param name * @param region * @param city @@ -274,7 +274,7 @@ class PredictFuturePriceBatch extends BaseBatch { } /** - * 获取线上当前期的小区均价列表 + * 鑾峰彇绾夸笂褰撳墠鏈熺殑灏忓尯鍧囦环鍒楄〃 * @param city * @param weekend * @return @@ -299,7 +299,7 @@ class PredictFuturePriceBatch extends BaseBatch { } /** - * 获取线上当前期的区域均价列表 + * 鑾峰彇绾夸笂褰撳墠鏈熺殑鍖哄煙鍧囦环鍒楄〃 * @param city * @param region * @param weekend @@ -324,7 +324,7 @@ class PredictFuturePriceBatch extends BaseBatch { } /** - * 获取线上当前期的板块均价列表 + * 鑾峰彇绾夸笂褰撳墠鏈熺殑鏉垮潡鍧囦环鍒楄〃 * @param city * @param region * @param weekend @@ -343,7 +343,7 @@ class PredictFuturePriceBatch extends BaseBatch { blockStat.region = d.get("region"); blockStat.block = d.get("block"); blockStat.city = city; - if (d.block.indexOf("浦西") != -1) { + if (d.block.indexOf("娴﹁タ") != -1) { println d.block } blockStat.weekendPrice = d.get("avg_price"); @@ -353,10 +353,10 @@ class PredictFuturePriceBatch extends BaseBatch { } /** - * 保存预测的小区价格 + * 淇濆瓨棰勬祴鐨勫皬鍖轰环鏍� * @param district * @param monthDate - * @param list 预测的小区价格列表,时间由近到远 + * @param list 棰勬祴鐨勫皬鍖轰环鏍煎垪琛紝鏃堕棿鐢辫繎鍒拌繙 */ void saveDistrictFuturePrices(BasicDBObject district, Date monthDate, List list) { DBObject dbObject = new BasicDBObject(); @@ -381,7 +381,7 @@ class PredictFuturePriceBatch extends BaseBatch { dbObject.put("region", null); dbObject.put("block", null); dbObject.put("city", city); - dbObject.put("kind", "城市"); + dbObject.put("kind", "鍩庡競"); dbObject.put("month_date", monthDate) def futurePrices = new BasicDBList(); futurePrices.addAll(list); @@ -398,7 +398,7 @@ class PredictFuturePriceBatch extends BaseBatch { dbObject.put("region", region); dbObject.put("block", null); dbObject.put("city", city); - dbObject.put("kind", "区域"); + dbObject.put("kind", "鍖哄煙"); dbObject.put("month_date", monthDate) def futurePrices = new BasicDBList(); futurePrices.addAll(list); @@ -415,7 +415,7 @@ class PredictFuturePriceBatch extends BaseBatch { dbObject.put("region", region); dbObject.put("block", block); dbObject.put("city", city); - dbObject.put("kind", "板块"); + dbObject.put("kind", "鏉垮潡"); dbObject.put("month_date", monthDate) def futurePrices = new BasicDBList(); futurePrices.addAll(list); @@ -456,7 +456,7 @@ class PredictFuturePriceBatch extends BaseBatch { } /** - * 获取某一时间段内的小区平均价格 + * 鑾峰彇鏌愪竴鏃堕棿娈靛唴鐨勫皬鍖哄钩鍧囦环鏍� * @param district * @param startWeekend * @param endWeekend @@ -488,7 +488,7 @@ class PredictFuturePriceBatch extends BaseBatch { } /** - * 获取对应的价格区间的均价增长幅度 + * 鑾峰彇瀵瑰簲鐨勪环鏍煎尯闂寸殑鍧囦环澧為暱骞呭害 * @param district * @param startWeekend * @param endWeekend @@ -496,7 +496,7 @@ class PredictFuturePriceBatch extends BaseBatch { * @return */ Map getBetweenDatePerMonthPrices(BasicDBObject district, Date startWeekend, Date endWeekend, int interval) { - interval = interval + 1;//丢弃0位置 + interval = interval + 1;//涓㈠純0浣嶇疆 DBObject dbObject = new BasicDBObject(); dbObject.put("district_name", district.name); dbObject.put("region", district.region); @@ -509,7 +509,7 @@ class PredictFuturePriceBatch extends BaseBatch { for (int i = 0; i < interval - 1; i++) { percentPriceMap.put(i, 0.0); } - if (total > 0) {//有价格段 + if (total > 0) {//鏈変环鏍兼 int index = 0; Map> pricesMap = new HashMap>(interval); for (def d : dbCursor) { @@ -529,7 +529,7 @@ class PredictFuturePriceBatch extends BaseBatch { index++; } - if (pricesMap.size() < interval) {//价格区间不完整 + if (pricesMap.size() < interval) {//浠锋牸鍖洪棿涓嶅畬鏁� for (int i = 1; i < interval; i++) { if (!pricesMap.containsKey(i)) { pricesMap.put(i, pricesMap.get(i - 1)) @@ -537,7 +537,7 @@ class PredictFuturePriceBatch extends BaseBatch { } } - //计算均价段内均值 + //璁$畻鍧囦环娈靛唴鍧囧�� Map finMap = new HashMap(); for (int i = 0; i < interval; i++) { finMap.put(i, getAvgPrice(pricesMap.get(i))); @@ -552,7 +552,7 @@ class PredictFuturePriceBatch extends BaseBatch { } Map getBetweenDatePerMonthPrices(String city, String region, String block, Date startWeekend, Date endWeekend, int interval) { - interval = interval + 1;//丢弃0位置 + interval = interval + 1;//涓㈠純0浣嶇疆 DBObject dbObject = new BasicDBObject(); dbObject.put("weekend", new BasicDBObject(QueryOperators.GT, startWeekend).append(QueryOperators.LT, endWeekend)); dbObject.put("region", region); @@ -564,7 +564,7 @@ class PredictFuturePriceBatch extends BaseBatch { for (int i = 0; i < interval - 1; i++) { percentPriceMap.put(i, 0.0); } - if (total > 0) {//有价格段 + if (total > 0) {//鏈変环鏍兼 int index = 0; Map> pricesMap = new HashMap>(interval); for (def d : dbCursor) { @@ -584,7 +584,7 @@ class PredictFuturePriceBatch extends BaseBatch { index++; } - if (pricesMap.size() < interval) {//价格区间不完整 + if (pricesMap.size() < interval) {//浠锋牸鍖洪棿涓嶅畬鏁� for (int i = 1; i < interval; i++) { if (!pricesMap.containsKey(i)) { pricesMap.put(i, pricesMap.get(i - 1)) @@ -592,7 +592,7 @@ class PredictFuturePriceBatch extends BaseBatch { } } - //计算均价段内均值 + //璁$畻鍧囦环娈靛唴鍧囧�� Map finMap = new HashMap(); for (int i = 0; i < interval; i++) { finMap.put(i, getAvgPrice(pricesMap.get(i))); @@ -618,7 +618,7 @@ class PredictFuturePriceBatch extends BaseBatch { } /** - * 获取weekend的 周均价 + * 鑾峰彇weekend鐨� 鍛ㄥ潎浠� * @param district * @param weekend * @return @@ -639,7 +639,7 @@ class PredictFuturePriceBatch extends BaseBatch { } /** - * 获取weekend的 周均价 + * 鑾峰彇weekend鐨� 鍛ㄥ潎浠� * @param district * @param weekend * @return @@ -659,7 +659,7 @@ class PredictFuturePriceBatch extends BaseBatch { } /** - * 获取weekend的 周均价 + * 鑾峰彇weekend鐨� 鍛ㄥ潎浠� * @param district * @param weekend * @return @@ -679,7 +679,7 @@ class PredictFuturePriceBatch extends BaseBatch { } /** - * 获取weekend的 周均价 + * 鑾峰彇weekend鐨� 鍛ㄥ潎浠� * @param district * @param weekend * @return diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/RecalculationOfRegionalPricesTask.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/RecalculationOfRegionalPricesTask.groovy index 7b124aab9..85d746bb8 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/RecalculationOfRegionalPricesTask.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/RecalculationOfRegionalPricesTask.groovy @@ -21,7 +21,7 @@ import com.mongodb.DBObject import com.mongodb.Mongo /** - * 重算区域价格 + * 閲嶇畻鍖哄煙浠锋牸 */ @BatchOwner(Watcher.JiangYaHui) class RecalculationOfRegionalPricesTask extends BaseBatch { @@ -59,35 +59,35 @@ class RecalculationOfRegionalPricesTask extends BaseBatch { - bc_district_price("上海"); - // zdf_district("上海") - // nihe_district("上海") + bc_district_price("涓婃捣"); + // zdf_district("涓婃捣") + // nihe_district("涓婃捣") // zdf_district(city) return; - //bc_district_price("临汾"); + //bc_district_price("涓存本"); //return; // bcc(); - //zdf_region("洛阳") + //zdf_region("娲涢槼") // return; - //duanqi_bc_region("长治") + //duanqi_bc_region("闀挎不") // sync(); - //duanqi_region("邵阳"); - //recalculationAverage("延安", "延长", null, null, DateUtil.truncateDay(DateUtil.getFirstDayOfWeek(DateUtil.parseDate("20190127","yyyyMMdd")))) - //recalculationAverage("延安", "延长", null, null, DateUtil.parseDate("20190127","yyyyMMdd")); + //duanqi_region("閭甸槼"); + //recalculationAverage("寤跺畨", "寤堕暱", null, null, DateUtil.truncateDay(DateUtil.getFirstDayOfWeek(DateUtil.parseDate("20190127","yyyyMMdd")))) + //recalculationAverage("寤跺畨", "寤堕暱", null, null, DateUtil.parseDate("20190127","yyyyMMdd")); //del_test_info(); //return; -// monitorCalcCommand("保定","涞源") +// monitorCalcCommand("淇濆畾","娑炴簮") // return; // -// List> list = ExcelUtils.read("D:\\区域涨跌幅排序_20190222.xlsx",1); +// List> list = ExcelUtils.read("D:\\鍖哄煙娑ㄨ穼骞呮帓搴廮20190222.xlsx",1); // list.each { // l-> // def city =l["A"]; @@ -96,7 +96,7 @@ class RecalculationOfRegionalPricesTask extends BaseBatch { // query.put("city",city); // query.put("region",region); // query.put("block",null); -// query.put("cat","区域"); +// query.put("cat","鍖哄煙"); // // println("city="+city+"==region="+region) // DBCursor cursor = REGION_STAT_COLL.find(query).limit(1).sort(new BasicDBObject("weekend",1)) // for(BasicDBObject db :cursor) { @@ -109,21 +109,21 @@ class RecalculationOfRegionalPricesTask extends BaseBatch { //-- // BasicDBObject query = new BasicDBObject(); -// query.put("city","青岛"); -// query.put("region","黄岛"); +// query.put("city","闈掑矝"); +// query.put("region","榛勫矝"); // query.put("block",null); -// query.put("cat","区域"); +// query.put("cat","鍖哄煙"); // DBCursor cursor = REGION_STAT_COLL.find(query).limit(1).sort(new BasicDBObject("weekend",1)) // for(BasicDBObject db :cursor) { // re1(db.city,db.region,db.weekend) // // } - // bc("呼和浩特") + // bc("鍛煎拰娴╃壒") - // re("宿迁","沭阳",DateUtil.parseDate("20111201","yyyyMMdd")) - // re("宿迁","沭阳",DateUtil.parseDate("20111201","yyyyMMdd")) - //re1("呼和浩特"); + // re("瀹胯縼","娌槼",DateUtil.parseDate("20111201","yyyyMMdd")) + // re("瀹胯縼","娌槼",DateUtil.parseDate("20111201","yyyyMMdd")) + //re1("鍛煎拰娴╃壒"); // return; // bcc(); @@ -135,13 +135,13 @@ class RecalculationOfRegionalPricesTask extends BaseBatch { Set ss = new HashSet(); allCity.each { def city -> i++ - //补充cat + //琛ュ厖cat //bc_cat(city) - //去重city + //鍘婚噸city //qc_city(city); - //去重block + //鍘婚噸block //qc_block(city); - //去重 region + //鍘婚噸 region //qc_region(city); bc_district_price(city); //zdf_district(city) @@ -164,8 +164,8 @@ class RecalculationOfRegionalPricesTask extends BaseBatch { return; - //duanqi_bc_region("成都") - //zdf_region("上海") + //duanqi_bc_region("鎴愰兘") + //zdf_region("涓婃捣") // println("ss"+ss); // monitorCalcCommand(null, null, null); @@ -185,17 +185,17 @@ class RecalculationOfRegionalPricesTask extends BaseBatch { // recalculationAverage(sb[0], sb[1], null, null, DateUtil.truncateDay(DateUtil.getFirstDayOfWeek(new Date()))) // } - //duanqi_bc_region("上海"); - // data_region.addAll(duanqi_region("上海")); + //duanqi_bc_region("涓婃捣"); + // data_region.addAll(duanqi_region("涓婃捣")); // println(data_region.size()) //ExcelUtils.write("C:\\Users\\Administrator\\Desktop\\error.xlsx", data_region, "region20190304_1"); // ExcelUtils.write("C:\\Users\\Administrator\\Desktop\\error.xlsx",data_block,"block1"); - //zdf_city("上海") - // duanqi_bc_city("来宾") + //zdf_city("涓婃捣") + // duanqi_bc_city("鏉ュ") // return; // def allCity = CommonUtils.findAllCity() // int i = 0 -// // run("苏州") +// // run("鑻忓窞") // allCity.each { def city -> // i++ // // run(city) @@ -210,10 +210,10 @@ class RecalculationOfRegionalPricesTask extends BaseBatch { def name = district.name def address = district.address def estate_type = null; - if (district.estate_type2.toString().contains("别墅")) { - estate_type = "别墅" + if (district.estate_type2.toString().contains("鍒")) { + estate_type = "鍒" } else { - estate_type = "小区" + estate_type = "灏忓尯" } BasicDBObject query = new BasicDBObject(); @@ -222,7 +222,7 @@ class RecalculationOfRegionalPricesTask extends BaseBatch { query.append("district_name", name) query.append("estate_type", estate_type) - BasicDBObject keys = new BasicDBObject();//指定需要显示列 + BasicDBObject keys = new BasicDBObject();//鎸囧畾闇�瑕佹樉绀哄垪 keys.put("weekend",1) keys.put("avg_price",1) keys.put("weekend_markup",1) @@ -271,10 +271,10 @@ class RecalculationOfRegionalPricesTask extends BaseBatch { def name = district.name def address = district.address def estate_type = null; - if (district.estate_type2.toString().contains("别墅")) { - estate_type = "别墅" + if (district.estate_type2.toString().contains("鍒")) { + estate_type = "鍒" } else { - estate_type = "小区" + estate_type = "灏忓尯" } BasicDBObject query = new BasicDBObject(); @@ -283,7 +283,7 @@ class RecalculationOfRegionalPricesTask extends BaseBatch { query.append("district_name", name) query.append("estate_type", estate_type) - BasicDBObject keys = new BasicDBObject();//指定需要显示列 + BasicDBObject keys = new BasicDBObject();//鎸囧畾闇�瑕佹樉绀哄垪 keys.put("weekend",1) keys.put("avg_price",1) keys.put("weekend_markup",1) @@ -324,8 +324,8 @@ class RecalculationOfRegionalPricesTask extends BaseBatch { BasicDBObject query = new BasicDBObject(); query.put("city", city); - query.put("cat", "区域"); - BasicDBObject keys = new BasicDBObject();//指定需要显示列 + query.put("cat", "鍖哄煙"); + BasicDBObject keys = new BasicDBObject();//鎸囧畾闇�瑕佹樉绀哄垪 keys.put("city",1) keys.put("region",1) keys.put("weekend",1) @@ -339,24 +339,24 @@ class RecalculationOfRegionalPricesTask extends BaseBatch { } int ff =0; - DbUtils.executeQueryOnSeaweed(DbUtils.buildSeaweedQuery(city,"闵行","盛世明珠园"), { BasicDBObject district -> + DbUtils.executeQueryOnSeaweed(DbUtils.buildSeaweedQuery(city,"闂佃","鐩涗笘鏄庣彔鍥�"), { BasicDBObject district -> def r = district.region def name = district.name def address = district.address def estate_type = null; - if (district.estate_type2.toString().contains("别墅")) { - estate_type = "别墅" + if (district.estate_type2.toString().contains("鍒")) { + estate_type = "鍒" } else { - estate_type = "小区" + estate_type = "灏忓尯" } query = new BasicDBObject() query.append("city", city) query.append("region", r) query.append("district_name", name) query.append("estate_type", estate_type) - keys = new BasicDBObject();//指定需要显示列 + keys = new BasicDBObject();//鎸囧畾闇�瑕佹樉绀哄垪 keys.put("district_name",1) keys.put("city",1) keys.put("region",1) @@ -373,7 +373,7 @@ class RecalculationOfRegionalPricesTask extends BaseBatch { - //排序("从大到小") + //鎺掑簭("浠庡ぇ鍒板皬") try { Collections.sort(dbs, new Comparator() { @Override @@ -441,7 +441,7 @@ class RecalculationOfRegionalPricesTask extends BaseBatch { // // } // } else { - //移动平均 + //绉诲姩骞冲潎 List basicDBObjects = lists_.subList(n-5==0?0:n-5,(n+5)>lists_.size()-1?lists_.size():n+5); List ls = new ArrayList<>(); @@ -484,7 +484,7 @@ class RecalculationOfRegionalPricesTask extends BaseBatch { } catch (Exception e) { try { - //通过涨跌幅计算 + //閫氳繃娑ㄨ穼骞呰绠� Integer price1 = 0; price1 = next_db.avg_price; if (tmp != 0) { @@ -512,7 +512,7 @@ class RecalculationOfRegionalPricesTask extends BaseBatch { insert_infos.add(data); } } catch (Exception ex) { - println("无法计算来的时间:${city}-${db.region}-${db.district_name}-${DateUtil.formatByPattern(d, "yyyyMMdd")}") + println("鏃犳硶璁$畻鏉ョ殑鏃堕棿:${city}-${db.region}-${db.district_name}-${DateUtil.formatByPattern(d, "yyyyMMdd")}") ex.printStackTrace(); } } @@ -566,7 +566,7 @@ class RecalculationOfRegionalPricesTask extends BaseBatch { query.put("city", city); query.put("region", region); query.put("weekend", date); - query.put("cat", "区域"); + query.put("cat", "鍖哄煙"); // println("city="+city+"==region="+region) DBCursor cursor = REGION_STAT_COLL.find(query); for (BasicDBObject db : cursor) { @@ -598,13 +598,13 @@ class RecalculationOfRegionalPricesTask extends BaseBatch { } /** - * 价格去重-区域 + * 浠锋牸鍘婚噸-鍖哄煙 * @param city */ private static void qc_region(def city) { BasicDBObject query = new BasicDBObject(); query.put("city", city); - query.put("cat", "区域"); + query.put("cat", "鍖哄煙"); DBCursor cursor = REGION_STAT_COLL.find(query) Map m = new HashMap(); Set citys = new HashSet<>(); @@ -628,13 +628,13 @@ class RecalculationOfRegionalPricesTask extends BaseBatch { } /** - * 价格去重-板块 + * 浠锋牸鍘婚噸-鏉垮潡 * @param city */ private static void qc_block(def city) { BasicDBObject query = new BasicDBObject(); query.put("city", city); - query.put("cat", "板块"); + query.put("cat", "鏉垮潡"); DBCursor cursor = REGION_STAT_COLL.find(query) Map m = new HashMap(); Set citys = new HashSet<>(); @@ -658,13 +658,13 @@ class RecalculationOfRegionalPricesTask extends BaseBatch { } /** - * 价格去重-城市 + * 浠锋牸鍘婚噸-鍩庡競 * @param city */ private static void qc_city(def city) { BasicDBObject query = new BasicDBObject(); query.put("city", city); - query.put("cat", "城市"); + query.put("cat", "鍩庡競"); DBCursor cursor = REGION_STAT_COLL.find(query) Map m = new HashMap(); Set citys = new HashSet<>(); @@ -689,13 +689,13 @@ class RecalculationOfRegionalPricesTask extends BaseBatch { } /** - * 计算涨跌幅-城市 + * 璁$畻娑ㄨ穼骞�-鍩庡競 * @param city */ private static void zdf_city(def city) { BasicDBObject query = new BasicDBObject(); query.put("city", city); - query.put("cat", "城市"); + query.put("cat", "鍩庡競"); DBCursor cursor = REGION_STAT_COLL.find(query) List lists = new ArrayList<>(); @@ -735,13 +735,13 @@ class RecalculationOfRegionalPricesTask extends BaseBatch { } /** - * 计算涨跌幅-区域 + * 璁$畻娑ㄨ穼骞�-鍖哄煙 * @param city */ private static void zdf_region(def city) { BasicDBObject query = new BasicDBObject(); query.put("city", city); - query.put("cat", "区域"); + query.put("cat", "鍖哄煙"); DBCursor cursor = REGION_STAT_COLL.find(query) Map> map = new HashMap<>(); for (BasicDBObject db : cursor) { @@ -790,7 +790,7 @@ class RecalculationOfRegionalPricesTask extends BaseBatch { private static void duanqi_bc_city(def city) { BasicDBObject query = new BasicDBObject(); query.put("city", city); - query.put("cat", "城市"); + query.put("cat", "鍩庡競"); //query.put("c_date", new BasicDBObject('$gte', DateUtil.parseDate("2019-02-27 00:00:00","yyyy-MM-dd HH:mm:ss")).append('$lte',DateUtil.parseDate("2019-02-27 23:59:59","yyyy-MM-dd HH:mm:ss"))); // println("city="+city+"==region="+region) DBCursor cursor = REGION_STAT_COLL.find(query).sort(new BasicDBObject("weekend", 1)) @@ -838,7 +838,7 @@ class RecalculationOfRegionalPricesTask extends BaseBatch { Integer price = Math.round(ls.sum() / ls.size()); BasicDBObject data = new BasicDBObject(); data.put("city", city); - data.put("cat", "城市"); + data.put("cat", "鍩庡競"); data.put("weekend", fr); data.put("avg_price", price); data.put("c_date", new Date()); @@ -857,7 +857,7 @@ class RecalculationOfRegionalPricesTask extends BaseBatch { private static List leftOrRight(List dbs, int i) { - //大-> 小 + //澶�-> 灏� List dbs_ = new ArrayList<>(); for (int n = dbs.size() - 1; n >= 0; n--) { if (n >= i - 5 && n < i + 5) { @@ -876,7 +876,7 @@ class RecalculationOfRegionalPricesTask extends BaseBatch { BasicDBObject query = new BasicDBObject(); query.put("city", city); - query.put("cat", "城市"); + query.put("cat", "鍩庡競"); // println("city="+city+"==region="+region) DBCursor cursor = REGION_STAT_COLL.find(query).sort(new BasicDBObject("weekend", 1)) Date weekend = null; @@ -924,7 +924,7 @@ class RecalculationOfRegionalPricesTask extends BaseBatch { } } if (count > 0) { - str.add("总共缺少:" + count + "期"); + str.add("鎬诲叡缂哄皯:" + count + "鏈�"); } str.each { s -> @@ -950,7 +950,7 @@ class RecalculationOfRegionalPricesTask extends BaseBatch { BasicDBObject query = new BasicDBObject(); query.put("city", city); - query.put("cat", "区域"); + query.put("cat", "鍖哄煙"); DBCursor cursor = REGION_STAT_COLL.find(query) Map> map = new HashMap<>(); @@ -1023,7 +1023,7 @@ class RecalculationOfRegionalPricesTask extends BaseBatch { // query.put("city", city); // query.put("region", da); // query.put("block", null); -// query.put("cat", "区域"); +// query.put("cat", "鍖哄煙"); // cursor = REGION_STAT_COLL.find(query).limit(1).sort(new BasicDBObject("weekend", 1)) // for (BasicDBObject db : cursor) { // @@ -1037,7 +1037,7 @@ class RecalculationOfRegionalPricesTask extends BaseBatch { private static List> duanqi_region(def city) { BasicDBObject query = new BasicDBObject(); query.put("city", city); - query.put("cat", "区域"); + query.put("cat", "鍖哄煙"); // println("city="+city+"==region="+region) DBCursor cursor = REGION_STAT_COLL.find(query) Date weekend = null; @@ -1115,7 +1115,7 @@ class RecalculationOfRegionalPricesTask extends BaseBatch { } if (count > 0) { - str.add("总共缺少:_" + count + "期"); + str.add("鎬诲叡缂哄皯:_" + count + "鏈�"); str.add("") } //data.add(str); @@ -1151,14 +1151,14 @@ class RecalculationOfRegionalPricesTask extends BaseBatch { private static List> duanqi_bc_region(def city) { BasicDBObject query = new BasicDBObject(); query.put("city", city); - query.put("cat", new BasicDBObject('$in', ["城市", "区域"])); + query.put("cat", new BasicDBObject('$in', ["鍩庡競", "鍖哄煙"])); DBCursor cursor = REGION_STAT_COLL.find(query).sort(new BasicDBObject("weekend", -1)) Map> map = new HashMap<>(); //Map city_infos = new HashMap(); Map city_infos = new TreeMap( new Comparator() { public int compare(Date obj1, Date obj2) { - // 降序排序 + // 闄嶅簭鎺掑簭 return obj2.compareTo(obj1); } }); @@ -1166,13 +1166,13 @@ class RecalculationOfRegionalPricesTask extends BaseBatch { Map city_infos_tmp = new TreeMap( new Comparator() { public int compare(Date obj1, Date obj2) { - // 降序排序 + // 闄嶅簭鎺掑簭 return obj2.compareTo(obj1); } }); def city_infos_list = []; for (BasicDBObject db : cursor) { - if (db.cat.equals("区域")) { + if (db.cat.equals("鍖哄煙")) { if (!map.containsKey(db.region)) { map.put(db.region, [db]); } else { @@ -1180,7 +1180,7 @@ class RecalculationOfRegionalPricesTask extends BaseBatch { list << db map.put(db.region, list); } - } else if (db.cat.equals("城市")) { + } else if (db.cat.equals("鍩庡競")) { city_infos_list << db; city_infos.put(db.weekend, db.avg_price); city_infos_tmp.put(db.weekend, db); @@ -1220,7 +1220,7 @@ class RecalculationOfRegionalPricesTask extends BaseBatch { betweenDates.remove(next_db.weekend) betweenDates.remove(db.weekend) List tempp = new ArrayList<>(); - //换位置 + //鎹綅缃� if (betweenDates.size() > 4) { for (Map.Entry city_info : city_infos.entrySet()) { Date key = city_info.getKey(); @@ -1256,7 +1256,7 @@ class RecalculationOfRegionalPricesTask extends BaseBatch { // println(price) // } // } else { - //移动平均 + //绉诲姩骞冲潎 List ls = leftOrRight(lists_, n); price = Math.round(ls.sum() / ls.size()); BasicDBObject bc = new BasicDBObject(); @@ -1272,7 +1272,7 @@ class RecalculationOfRegionalPricesTask extends BaseBatch { // } BasicDBObject data = new BasicDBObject(); data.put("city", city); - data.put("cat", "区域"); + data.put("cat", "鍖哄煙"); data.put("region", m.getKey()); data.put("weekend", d); data.put("avg_price", price); @@ -1296,7 +1296,7 @@ class RecalculationOfRegionalPricesTask extends BaseBatch { println("price11=======" + price); BasicDBObject data = new BasicDBObject(); data.put("city", city); - data.put("cat", "区域"); + data.put("cat", "鍖哄煙"); data.put("region", m.getKey()); data.put("weekend", d); data.put("avg_price", price); @@ -1322,7 +1322,7 @@ class RecalculationOfRegionalPricesTask extends BaseBatch { BasicDBObject query = new BasicDBObject(); query.put("city", city); - query.put("cat", "板块"); + query.put("cat", "鏉垮潡"); // println("city="+city+"==region="+region) DBCursor cursor = REGION_STAT_COLL.find(query).sort(new BasicDBObject("weekend", 1)) Date weekend = null; @@ -1384,7 +1384,7 @@ class RecalculationOfRegionalPricesTask extends BaseBatch { } } if (count > 0) { - str.add("总共缺少:" + count + "期"); + str.add("鎬诲叡缂哄皯:" + count + "鏈�"); str.add("") } List> data = new ArrayList<>(); @@ -1411,13 +1411,13 @@ class RecalculationOfRegionalPricesTask extends BaseBatch { } /** - * 计算涨跌幅-板块 + * 璁$畻娑ㄨ穼骞�-鏉垮潡 * @param city */ private static void zdf_block(def city) { BasicDBObject query = new BasicDBObject(); query.put("city", city); - query.put("cat", "板块"); + query.put("cat", "鏉垮潡"); DBCursor cursor = REGION_STAT_COLL.find(query) Map> map = new HashMap<>(); for (BasicDBObject db : cursor) { @@ -1466,7 +1466,7 @@ class RecalculationOfRegionalPricesTask extends BaseBatch { } /** - * 重算价格 + * 閲嶇畻浠锋牸 * @param city * @param region * @param block @@ -1497,27 +1497,27 @@ class RecalculationOfRegionalPricesTask extends BaseBatch { // q.put("city", city) // q.put("region", region) // q.put("block", block) - q.put('status', new BasicDBObject('$in', [0, 1, 102])) // 0-初始状态 1-处理中 102-计算完成 2-完成 3-处理错误 4-处理异常 + q.put('status', new BasicDBObject('$in', [0, 1, 102])) // 0-鍒濆鐘舵�� 1-澶勭悊涓� 102-璁$畻瀹屾垚 2-瀹屾垚 3-澶勭悊閿欒 4-澶勭悊寮傚父 while (true) { sleep(3 * 1000) def c = COMMAND_COLL.count(q) if (c <= 0) { - //重试一次 + //閲嶈瘯涓�娆� sleep(10 * 1000) c = COMMAND_COLL.count(q) if (c <= 0) { - q.put('status', 2)//完成 + q.put('status', 2)//瀹屾垚 def c2 = COMMAND_COLL.count(q) - q.put('status', 3)//错误 + q.put('status', 3)//閿欒 def c3 = COMMAND_COLL.count(q) - q.put('status', 4)//异常 + q.put('status', 4)//寮傚父 def c4 = COMMAND_COLL.count(q) sleep(3 * 1000) - //退出 + //閫�鍑� break; } } @@ -1528,7 +1528,7 @@ class RecalculationOfRegionalPricesTask extends BaseBatch { static void bcc1() { BasicDBObject query = new BasicDBObject(); - query.put("cat", "区域"); + query.put("cat", "鍖哄煙"); DBCursor cursor = REGION_STAT_COLL.find(query) for (BasicDBObject db : cursor) { Calendar today = Calendar.getInstance(); @@ -1550,7 +1550,7 @@ class RecalculationOfRegionalPricesTask extends BaseBatch { static void bcc() { BasicDBObject query = new BasicDBObject(); - query.put("cat", "区域"); + query.put("cat", "鍖哄煙"); DBCursor cursor = REGION_STAT_COLL.find(query).sort(new BasicDBObject("weekend", -1)) Set set = new HashSet(); for (BasicDBObject db : cursor) { @@ -1569,7 +1569,7 @@ class RecalculationOfRegionalPricesTask extends BaseBatch { query.put("city", str[0]); query.put("region", str[1]); query.put("block", null); - query.put("cat", "区域"); + query.put("cat", "鍖哄煙"); // println("city="+city+"==region="+region) cursor = REGION_STAT_COLL.find(query).limit(1).sort(new BasicDBObject("weekend", -1)) Date weekend = null; @@ -1591,10 +1591,10 @@ class RecalculationOfRegionalPricesTask extends BaseBatch { if (!com.fangjia.core.util.DateUtil.isSunday(calcDate)) { calcDate = com.fangjia.core.util.DateUtil.getFirstDayOfWeek(calcDate) } - if (estateType && estateType.contains("别墅")) { - estateType = "别墅" + if (estateType && estateType.contains("鍒")) { + estateType = "鍒" } else if (estateType) { - estateType = "小区" + estateType = "灏忓尯" } DBObject cmd = new BasicDBObject() @@ -1640,7 +1640,7 @@ class RecalculationOfRegionalPricesTask extends BaseBatch { if (db.city != null && db.region != null && db.block == null) { DBObject q = new BasicDBObject("_id", db.get("_id")); DBObject cmd = new BasicDBObject() - cmd.put("cat", "区域") + cmd.put("cat", "鍖哄煙") REGION_STAT_COLL.update(q, new BasicDBObject('$set', cmd), true, false) @@ -1660,7 +1660,7 @@ class RecalculationOfRegionalPricesTask extends BaseBatch { if (db.city != null && db.region != null && db.block == null) { DBObject q = new BasicDBObject("_id", db.get("_id")); DBObject cmd = new BasicDBObject() - cmd.put("cat", "区域") + cmd.put("cat", "鍖哄煙") REGION_STAT_COLL.update(q, new BasicDBObject('$set', cmd), true, false) @@ -1668,7 +1668,7 @@ class RecalculationOfRegionalPricesTask extends BaseBatch { DBObject q = new BasicDBObject("_id", db.get("_id")); DBObject cmd = new BasicDBObject() - cmd.put("cat", "城市") + cmd.put("cat", "鍩庡競") REGION_STAT_COLL.update(q, new BasicDBObject('$set', cmd), true, false) @@ -1676,7 +1676,7 @@ class RecalculationOfRegionalPricesTask extends BaseBatch { DBObject q = new BasicDBObject("_id", db.get("_id")); DBObject cmd = new BasicDBObject() - cmd.put("cat", "板块") + cmd.put("cat", "鏉垮潡") REGION_STAT_COLL.update(q, new BasicDBObject('$set', cmd), true, false) } //} @@ -1701,7 +1701,7 @@ class RecalculationOfRegionalPricesTask extends BaseBatch { } count++ if (count % 10000 == 0) { - println("region_stat_同步进度:" + DataUtil.roundDouble((count * 100) / total, 2) + "%") + println("region_stat_鍚屾杩涘害:" + DataUtil.roundDouble((count * 100) / total, 2) + "%") } } try { @@ -1721,7 +1721,7 @@ class RecalculationOfRegionalPricesTask extends BaseBatch { BasicDBObject query = new BasicDBObject(); query.put("city", city); query.put("region", region); - query.put("cat", "区域"); + query.put("cat", "鍖哄煙"); query.put("weekend", d); DBCursor cursor = REGION_STAT_COLL.find(query).sort(new BasicDBObject("c_date", -1)) def cus = []; @@ -1744,7 +1744,7 @@ class RecalculationOfRegionalPricesTask extends BaseBatch { d -> BasicDBObject query = new BasicDBObject(); query.put("city", city); - query.put("cat", "城市"); + query.put("cat", "鍩庡競"); query.put("weekend", d); DBCursor cursor = REGION_STAT_COLL.find(query).sort(new BasicDBObject("c_date", -1)) def cus = []; @@ -1770,7 +1770,7 @@ class RecalculationOfRegionalPricesTask extends BaseBatch { query.put("city", city); query.put("region", region); query.put("block", block); - query.put("cat", "板块"); + query.put("cat", "鏉垮潡"); query.put("weekend", d); DBCursor cursor = REGION_STAT_COLL.find(query).sort(new BasicDBObject("c_date", -1)) def cus = []; @@ -1791,7 +1791,7 @@ class RecalculationOfRegionalPricesTask extends BaseBatch { List betweenDates = DateUtil.getWeekendBetweenDates(DateUtil.parseDate("20090710", "yyyyMMdd"), DateUtil.parseDate("20130101", "yyyyMMdd")); BasicDBObject query = new BasicDBObject(); query.put("city", city); - query.put("cat", "区域"); + query.put("cat", "鍖哄煙"); query.put("weekend", new BasicDBObject('$gte', DateUtil.parseDate("20180101", "yyyyMMdd")).append('$lte', new Date())); DBCursor cursor = REGION_STAT_COLL.find(query); def prices = [:]; @@ -1830,7 +1830,7 @@ class RecalculationOfRegionalPricesTask extends BaseBatch { println(city + "_" + region + "_" + date + "_" + value + "_" + DateUtil.formatByPattern(weekend, "yyyy-MM-dd") + "_" + last_price + "_" + ups) - // println("region:"+region+";时间:"+date+";weekend:"+DateUtil.formatByPattern(weekend,"yyyy-MM-dd")+";value:"+value+";last_price:"+last_price+";ups:"+ups) + // println("region:"+region+";鏃堕棿:"+date+";weekend:"+DateUtil.formatByPattern(weekend,"yyyy-MM-dd")+";value:"+value+";last_price:"+last_price+";ups:"+ups) } // if(ups<0){ // diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/ShopSeaweedSynch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/ShopSeaweedSynch.groovy index 1f1269ad2..4b4b4cd4f 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/ShopSeaweedSynch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/ShopSeaweedSynch.groovy @@ -25,7 +25,7 @@ import com.mongodb.DBObject import com.mongodb.WriteResult /** * - * 说明:商铺均价统计脚本 + * 璇存槑:鍟嗛摵鍧囦环缁熻鑴氭湰 * */ @BatchOwner(Watcher.Tomzhao) @@ -56,7 +56,7 @@ public class ShopSeaweedSynch extends BaseBatch { def fangjiaShopPriceDataImport(String city){ - log("开始导入房价网商铺售价数据:"+new Date().format("yyyy年MM月dd日 HH:mm:ss"),true); + log("寮�濮嬪鍏ユ埧浠风綉鍟嗛摵鍞环鏁版嵁:"+new Date().format("yyyy骞碝M鏈坉d鏃� HH:mm:ss"),true); DBObject q=new BasicDBObject(); q.put("city", city); @@ -66,7 +66,7 @@ public class ShopSeaweedSynch extends BaseBatch { fields.put("region",1); fields.put("name",1); - def dscur = seaweedColl.find(q,fields).batchSize(2000);//设置游标不要超时 + def dscur = seaweedColl.find(q,fields).batchSize(2000);//璁剧疆娓告爣涓嶈瓒呮椂 Set idSet = new HashSet() Iterator iter=dscur.iterator(); while(iter.hasNext()){ @@ -133,7 +133,7 @@ public class ShopSeaweedSynch extends BaseBatch { rquery.put("region", region) rquery.put("district_name", districtName) rquery.put("weekend", WEEKEND) - rquery.put("kind","商铺"); + rquery.put("kind","鍟嗛摵"); def entity = RENT_COLL.findOne(rquery); if(entity !=null){ def price = entity.get("weekend_avgprice").toDouble(); @@ -156,13 +156,13 @@ public class ShopSeaweedSynch extends BaseBatch { e.printStackTrace(); } } - log("房价网商铺售价数据导入完成:"+new Date().format("yyyy年MM月dd日 HH:mm:ss")+"共导入 $total 条数据",true) + log("鎴夸环缃戝晢閾哄敭浠锋暟鎹鍏ュ畬鎴�:"+new Date().format("yyyy骞碝M鏈坉d鏃� HH:mm:ss")+"鍏卞鍏� $total 鏉℃暟鎹�",true) } public void analyze(){ - log("开始分析商铺数据:"+new Date().format("yyyy年MM月dd日 HH:mm:ss"),true) + log("寮�濮嬪垎鏋愬晢閾烘暟鎹�:"+new Date().format("yyyy骞碝M鏈坉d鏃� HH:mm:ss"),true) long time = System.currentTimeMillis(); DBObject query = new BasicDBObject() query.put("s_date", shortDate); @@ -279,7 +279,7 @@ public class ShopSeaweedSynch extends BaseBatch { AVERAGE_ANALYSIS.update(new BasicDBObject('city', _city).append("s_date",shortDate).append("category",CATEGORY), new BasicDBObject('$set', obj), true, true) } } - log("商铺数据分析结束:"+new Date().format("yyyy年MM月dd日 HH:mm:ss"),true) + log("鍟嗛摵鏁版嵁鍒嗘瀽缁撴潫:"+new Date().format("yyyy骞碝M鏈坉d鏃� HH:mm:ss"),true) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/ThirdpartyAverageDiffComputeBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/ThirdpartyAverageDiffComputeBatch.groovy index 460af805b..e515944c2 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/ThirdpartyAverageDiffComputeBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/ThirdpartyAverageDiffComputeBatch.groovy @@ -15,7 +15,7 @@ import com.mongodb.* import org.apache.commons.lang.StringUtils /** - * 第三方均价差比计算脚本 + * 绗笁鏂瑰潎浠峰樊姣旇绠楄剼鏈� */ @BatchOwner(Watcher.WangWenYan) class ThirdpartyAverageDiffComputeBatch extends BaseBatch { @@ -40,21 +40,21 @@ class ThirdpartyAverageDiffComputeBatch extends BaseBatch { @Override void process(Object args) { - /*更新房价网均价*/ + /*鏇存柊鎴夸环缃戝潎浠�*/ updateFangJiaPrice() // -// //房估估 -// // fangguguProcess();//旧表 - fangguguProcess2(); //新表 -//// //云估价 +// //鎴夸及浼� +// // fangguguProcess();//鏃ц〃 + fangguguProcess2(); //鏂拌〃 +//// //浜戜及浠� // yungujiaProcess(); - //诸葛房 + //璇歌憶鎴� zhugezhaofangProcess(); -// /*匹配库中的主小区,并补充房价网价格*/ +// /*鍖归厤搴撲腑鐨勪富灏忓尯锛屽苟琛ュ厖鎴夸环缃戜环鏍�*/ matchMainDistrict() -// /*计算差比*/ +// /*璁$畻宸瘮*/ computeDiff() - //计算价格评级 + //璁$畻浠锋牸璇勭骇 calculateLevel(); } @@ -117,17 +117,17 @@ class ThirdpartyAverageDiffComputeBatch extends BaseBatch { disName = projectname } - if(disName.contains("(")||disName.contains("(")){ + if(disName.contains("锛�")||disName.contains("(")){ def temp = null; - if(disName.contains("(")){ - temp = disName.substring(disName.indexOf("(")+1, disName.length()-1) + if(disName.contains("锛�")){ + temp = disName.substring(disName.indexOf("锛�")+1, disName.length()-1) } if(disName.contains("(")){ temp = disName.substring(disName.indexOf("(")+1,disName.length()-1) } - if(temp.contains("期")||temp.contains("别墅")){ - disName = disName.replace("(", "").replace(")", "").replace("(", "").replace(")", "") + if(temp.contains("鏈�")||temp.contains("鍒")){ + disName = disName.replace("锛�", "").replace("锛�", "").replace("(", "").replace(")", "") }else{ disName = disName.substring(0, disName.lastIndexOf(temp)-1) @@ -247,15 +247,15 @@ class ThirdpartyAverageDiffComputeBatch extends BaseBatch { def getMatchName(def city, def region, def disName){ def cat = "district"; - //查询房价网是否存在该小区 + //鏌ヨ鎴夸环缃戞槸鍚﹀瓨鍦ㄨ灏忓尯 def dbo = CommonDatautils.findSeaweed(city, region, disName, cat); if(!dbo){ - //别名 + //鍒悕 def distrs = CommonDatautils.findSeaweedByAlias(city, region, disName, cat); if(distrs && distrs.size()==1){ dbo = distrs[0] } - //地址 + //鍦板潃 if(!dbo){ def result = CommonDatautils.findSeaweedByAddress(city, region, disName, cat) if(result.size()==1){ @@ -289,7 +289,7 @@ class ThirdpartyAverageDiffComputeBatch extends BaseBatch { } AVERAGE_STATISTICS.save(dbo) if(count % 100 == 0){ - println("${new Date().format("yyyy/MM/dd HH:mm:ss")} 差比计算进度:${DataUtil.roundDouble((count * 100)/(double)total, 2)}") + println("${new Date().format("yyyy/MM/dd HH:mm:ss")} 宸瘮璁$畻杩涘害锛�${DataUtil.roundDouble((count * 100)/(double)total, 2)}") } } } @@ -322,7 +322,7 @@ class ThirdpartyAverageDiffComputeBatch extends BaseBatch { } } } - println("加载小区:${city}") + println("鍔犺浇灏忓尯:${city}") } def keys = new BasicDBObject() @@ -360,7 +360,7 @@ class ThirdpartyAverageDiffComputeBatch extends BaseBatch { } if(count % 10000 == 0){ - println("${new Date().format("yyyy/MM/dd HH:mm:ss")} 主名匹配进度:${DataUtil.roundDouble((count * 100)/(double)total, 2)}") + println("${new Date().format("yyyy/MM/dd HH:mm:ss")} 涓诲悕鍖归厤杩涘害锛�${DataUtil.roundDouble((count * 100)/(double)total, 2)}") } } } @@ -376,7 +376,7 @@ class ThirdpartyAverageDiffComputeBatch extends BaseBatch { def weekend = DateUtils.getFirstDayOfWeek(new Date()); for(def city : allCity){ updatingFJWPrice(city, weekend); - println city +" 更新价格完成......" + println city +" 鏇存柊浠锋牸瀹屾垚......" } } @@ -414,7 +414,7 @@ class ThirdpartyAverageDiffComputeBatch extends BaseBatch { obj.put("estate_type", dbo.estate_type) AVERAGE_STATISTICS.update(new BasicDBObject('city', city).append('name', districtName).append("s_date",shortDate).append("region", region).append("category", CAT), new BasicDBObject('$set', obj), true, true) if(count % 10000 == 0){ - println("${new Date().format("yyyy/MM/dd HH:mm:ss")} 房价网均价更新进度:${DataUtil.roundDouble((count * 100)/(double)total, 2)}") + println("${new Date().format("yyyy/MM/dd HH:mm:ss")} 鎴夸环缃戝潎浠锋洿鏂拌繘搴︼細${DataUtil.roundDouble((count * 100)/(double)total, 2)}") } } } @@ -428,7 +428,7 @@ class ThirdpartyAverageDiffComputeBatch extends BaseBatch { query.put("city", city) query.put("s_date", shortDate) AVERAGE_STATISTICS.find(query).addOption(Bytes.QUERYOPTION_NOTIMEOUT).each {o-> -// if(o.name=="竹韵天府"){ +// if(o.name=="绔归煹澶╁簻"){ // println "ssss" def priceMap = getPriceMap(o); def fjw_price = o.fangjia_price @@ -463,11 +463,11 @@ class ThirdpartyAverageDiffComputeBatch extends BaseBatch { list.sort(); def minValue = list[0] if(minValue==v1){ - return "房估估" + return "鎴夸及浼�" }else if(minValue==v2){ - return "房价网" + return "鎴夸环缃�" }else if(minValue==v3){ - return "云估价" + return "浜戜及浠�" } return ""; } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/WebAverageLabor.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/WebAverageLabor.groovy index fdf9f1e5c..c9ed28732 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/WebAverageLabor.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/WebAverageLabor.groovy @@ -29,7 +29,7 @@ class WebAverageLabor extends BaseBatch{ public static final DBCollection LABOR_COLL = MongoUtils.getCollectionByName("fangjia", "web_average", "mongo.db.fangjia.com") - //抓取系统的搜房网d的任务ID + //鎶撳彇绯荤粺鐨勬悳鎴跨綉d鐨勪换鍔D public static final String SOUFUN_JOB_ID = "51ef625ee4b03cf76cc2a0bc" public static final String ANJUKE_JOB_ID = "51ef986de4b03cf76cc2aea2" @@ -37,7 +37,7 @@ class WebAverageLabor extends BaseBatch{ public static final double DIFF_RANGE = 0.1 - public static final def CITIES = ["上海", "成都", "北京", "广州", "深圳"] + public static final def CITIES = ["涓婃捣", "鎴愰兘", "鍖椾含", "骞垮窞", "娣卞湷"] public static final def EMAILS = ["wangwenyan@fangjia.com"] @@ -67,7 +67,7 @@ class WebAverageLabor extends BaseBatch{ } for(String email : EMAILS) { - jms.sendMail(email, "网络均价检测报告" + DateUtil.formatToTightYYYYMMDDhhmmss(new Date()), emailContent) + jms.sendMail(email, "缃戠粶鍧囦环妫�娴嬫姤鍛�" + DateUtil.formatToTightYYYYMMDDhhmmss(new Date()), emailContent) } } @@ -150,7 +150,7 @@ class WebAverageLabor extends BaseBatch{ String diffSoufunPercent = roundDouble(1.0 - (double)(total - diffSoufunTotal) / (double)total) * 100 + "%" String diffAnjukePercent = roundDouble(1.0 - (double)(total - diffAnjukeTotal) / (double)total) * 100 + "%" - return city + " 共检测" + total + "个小区, 价差超过" + (DIFF_RANGE * 100) + "%的小区共" + diffTotal + "个(" + diffPercent + "), 其中soufun有" + diffSoufunTotal + "个(" + diffSoufunPercent + "), anjuke有" + diffAnjukeTotal + "个(" + diffAnjukePercent + ")"; + return city + " 鍏辨娴�" + total + "涓皬鍖�, 浠峰樊瓒呰繃" + (DIFF_RANGE * 100) + "%鐨勫皬鍖哄叡" + diffTotal + "涓�(" + diffPercent + "), 鍏朵腑soufun鏈�" + diffSoufunTotal + "涓�(" + diffSoufunPercent + "), anjuke鏈�" + diffAnjukeTotal + "涓�(" + diffAnjukePercent + ")"; } @@ -171,7 +171,7 @@ class WebAverageLabor extends BaseBatch{ Elements elements = JQueryUtils.select(".list li", content) if (elements != null && elements.size() > 0) { for (Element element : elements) { - if(element.toString().indexOf('二手房') > 0) { + if(element.toString().indexOf('浜屾墜鎴�') > 0) { String name = selectText(".details div.t_b a", element.toString()) name = DataUtil.encoding(name).replace('?', '').trim() String price = selectText(".price span.sp1", element.toString()) @@ -213,7 +213,7 @@ class WebAverageLabor extends BaseBatch{ } /** - * 从抓取系统中取出网页 + * 浠庢姄鍙栫郴缁熶腑鍙栧嚭缃戦〉 */ public void exportSoufunAverage() { DBCursor cur = CRAWL_COLL.find(new BasicDBObject('job_id', SOUFUN_JOB_ID)) @@ -272,7 +272,7 @@ class WebAverageLabor extends BaseBatch{ /** - * 导出最新一期的均价 + * 瀵煎嚭鏈�鏂颁竴鏈熺殑鍧囦环 */ public void exportFangjiaAverage() { for(String city : CITIES) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/WebOfficeAvgPriceStatistics.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/WebOfficeAvgPriceStatistics.groovy index 6739d853a..f41488781 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/WebOfficeAvgPriceStatistics.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/WebOfficeAvgPriceStatistics.groovy @@ -41,7 +41,7 @@ import com.mongodb.DBObject @BatchOwner(Watcher.GaoJuan) public class WebOfficeAvgPriceStatistics extends BaseBatch { public int shortDate = DateUtil.getFirstDayOfMonth(new Date()).format("yyyyMM").toInteger(); - def cityIds = ["上海","广州","天津","重庆","成都"] + def cityIds = ["涓婃捣","骞垮窞","澶╂触","閲嶅簡","鎴愰兘"] public static final DBCollection STAT_COLL = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "mongo.db.fangjia.com") public static final DBCollection OFFICE_STAT_COLL = MongoUtils.getCollectionByName("fangjia", "office_stat", "mongo.db.fangjia.com") public static final DBCollection RENT_COLL = MongoUtils.getCollectionByName("fangjia", "rent_stat", "mongo.db.fangjia.com") @@ -61,9 +61,9 @@ public class WebOfficeAvgPriceStatistics extends BaseBatch { static final String CATEGORY = "office"; private static final Long dateNow=DateUtils.getDateyyyyMMdd(); public static final double DEFAULT_DOUBLE_VALUE = -888888888; - /**最大均价*/ + /**鏈�澶у潎浠�*/ private static final int MAX_AVG_PRICE = 300000 - /**最小均价*/ + /**鏈�灏忓潎浠�*/ private static final int MIN_AVG_PRICE = 1000 static List sbuilders=new ArrayList(); @@ -84,10 +84,10 @@ public class WebOfficeAvgPriceStatistics extends BaseBatch { public static final def jobMap = [ - FANG_JOB_ID : [status:0, display:'搜房新房'] ,//搜房新房 - FANG_ESF_JOB_ID : [status:0, display:'搜房二手房'], //搜房二手房 - ANJUKE_JOB_ID : [status:0, display:'安居客新房'], //安居客 - CHINESE_OFFICE_JOB_ID : [status:0, display:'中国写字楼'], //中国写字楼 + FANG_JOB_ID : [status:0, display:'鎼滄埧鏂版埧'] ,//鎼滄埧鏂版埧 + FANG_ESF_JOB_ID : [status:0, display:'鎼滄埧浜屾墜鎴�'], //鎼滄埧浜屾墜鎴� + ANJUKE_JOB_ID : [status:0, display:'瀹夊眳瀹㈡柊鎴�'], //瀹夊眳瀹� + CHINESE_OFFICE_JOB_ID : [status:0, display:'涓浗鍐欏瓧妤�'], //涓浗鍐欏瓧妤� ] @Override @@ -100,7 +100,7 @@ public class WebOfficeAvgPriceStatistics extends BaseBatch { Thread t1 = new Thread(new Runnable() { @Override public void run() { - //检查任务是否完成 + //妫�鏌ヤ换鍔℃槸鍚﹀畬鎴� moniterJobs(); } }); @@ -128,7 +128,7 @@ public class WebOfficeAvgPriceStatistics extends BaseBatch { CRAWL_COLL.remove(new BasicDBObject('job_id', FANG_NEW_JOB_ID)); CRAWL_COLL.remove(new BasicDBObject('job_id', FANG_ESF_JOB_ID)); CRAWL_COLL.remove(new BasicDBObject('job_id', CHINESE_OFFICE_JOB_ID)) - log("抓取系统数据删除成功",true) + log("鎶撳彇绯荤粺鏁版嵁鍒犻櫎鎴愬姛",true) } } @@ -168,13 +168,13 @@ public class WebOfficeAvgPriceStatistics extends BaseBatch { StringBuilder emailContent = new StringBuilder(); if("soufang_new_price".equals(statField)){ - emailContent.append("") + emailContent.append("") }else if("soufang_esf_price".equals(statField)){ - emailContent.append("") + emailContent.append("") }else if("anjuke_price".equals(statField)){ - emailContent.append("") + emailContent.append("") }else if("chinese_office_price".equals(statField)){ - emailContent.append("") + emailContent.append("") } emailContent.append("") emailContent.append("") @@ -227,15 +227,15 @@ public class WebOfficeAvgPriceStatistics extends BaseBatch { String priceDesc = JQueryUtils.selectText([".l3 table>tbody>tr>td"], doc); priceDesc = DataUtil.encoding(priceDesc) - priceDesc = priceDesc.replaceAll("\\?", "").replaceAll("元M/日", "").replaceAll("元/M","").replaceAll("/日", "").replaceAll(",", ""); + priceDesc = priceDesc.replaceAll("\\?", "").replaceAll("鍏僊/鏃�", "").replaceAll("鍏�/M","").replaceAll("/鏃�", "").replaceAll(",", ""); if(StringUtils.isBlank(name) || StringUtils.isBlank(priceDesc)) { errorCount++; continue; } - int rentPosition = priceDesc.indexOf("租:"); - int pricePosition = priceDesc.indexOf("售:"); + int rentPosition = priceDesc.indexOf("绉燂細"); + int pricePosition = priceDesc.indexOf("鍞細"); def rent = null; def price = null if(rentPosition>-1){ @@ -341,7 +341,7 @@ public class WebOfficeAvgPriceStatistics extends BaseBatch { def analyzerNewSoufun(city, url, content){ Document document = Jsoup.parse(content); - String region = JQueryUtils.selectText(["span:contains(区):contains(域) + .con_cy>span, li:contains(区域) + li a.hui, .s1:contains(区域:) + .s3>span"], document); + String region = JQueryUtils.selectText(["span:contains(鍖�):contains(鍩�) + .con_cy>span, li:contains(鍖哄煙) + li a.hui, .s1:contains(鍖哄煙:) + .s3>span"], document); region = regionBlockDao.formatRegion(city, region); Elements elements = JQueryUtils.select([".sslalone"], document) if(elements == null || elements.isEmpty() || StringUtils.isBlank(region)) { @@ -393,7 +393,7 @@ public class WebOfficeAvgPriceStatistics extends BaseBatch { def analyzerAnjuke(city, url, content){ Document document = Jsoup.parse(content); - String region = JQueryUtils.selectText([".search_p>p:contains(区):contains(域:)>a.unlimited"], document); + String region = JQueryUtils.selectText([".search_p>p:contains(鍖�):contains(鍩燂細)>a.unlimited"], document); region = regionBlockDao.formatRegion(city, region); Elements elements = JQueryUtils.select([".bdlis_mid_cent li"], document) if(elements == null || elements.isEmpty() || StringUtils.isBlank(region)) { @@ -416,58 +416,58 @@ public class WebOfficeAvgPriceStatistics extends BaseBatch { Element p =ps.get(0); def desc = p.text(); desc = DataUtil.encoding(desc).replace("?", ""); - if(desc.contains("租金:")){ - if(desc.contains("元/平米月")){ - def rent = desc.replaceAll("元/平米月", "").replaceAll("租金:", "").trim(); + if(desc.contains("绉熼噾锛�")){ + if(desc.contains("鍏�/骞崇背鏈�")){ + def rent = desc.replaceAll("鍏�/骞崇背鏈�", "").replaceAll("绉熼噾锛�", "").trim(); rent = DataUtil.roundDouble(rent.toDouble()/30,2) if(rent != 0){ upd.put("anjuke_rent",rent); } - }else if(desc.contains("元/平米天")){ - def rent = desc.replaceAll("元/平米天", "").replaceAll("租金:", "").trim().toDouble(); + }else if(desc.contains("鍏�/骞崇背澶�")){ + def rent = desc.replaceAll("鍏�/骞崇背澶�", "").replaceAll("绉熼噾锛�", "").trim().toDouble(); if(rent != 0){ upd.put("anjuke_rent",DataUtil.roundDouble(rent,2)); } }else{ - log("非法租金 :"+desc) + log("闈炴硶绉熼噾 :"+desc) } - }else if(desc.contains("售价:")&&desc.contains("元/平米")){ - def price = desc.replaceAll("售价:", "").replaceAll("元/平米", "") + }else if(desc.contains("鍞环锛�")&&desc.contains("鍏�/骞崇背")){ + def price = desc.replaceAll("鍞环锛�", "").replaceAll("鍏�/骞崇背", "") price = price.toDouble().toInteger() if(price!=0){ upd.put("anjuke_price",price); } }else{ - log("非法租金或售价 :"+desc) + log("闈炴硶绉熼噾鎴栧敭浠� :"+desc) } }else if(ps.size()==2){ def priceDesc = DataUtil.encoding(ps.get(0).text()).replace("?", ""); def rentDesc = DataUtil.encoding(ps.get(1).text()).replace("?", ""); - if(rentDesc.contains("元/平米月")){ - def rent = rentDesc.replaceAll("元/平米月", "").replaceAll("租金:", "").trim(); + if(rentDesc.contains("鍏�/骞崇背鏈�")){ + def rent = rentDesc.replaceAll("鍏�/骞崇背鏈�", "").replaceAll("绉熼噾锛�", "").trim(); rent = DataUtil.roundDouble(rent.toDouble()/30,2) if(rent != 0){ upd.put("anjuke_rent",rent); } - }else if(rentDesc.contains("元/平米天")){ - def rent = rentDesc.replaceAll("元/平米天", "").replaceAll("租金:", "").trim().toDouble(); + }else if(rentDesc.contains("鍏�/骞崇背澶�")){ + def rent = rentDesc.replaceAll("鍏�/骞崇背澶�", "").replaceAll("绉熼噾锛�", "").trim().toDouble(); if(rent != 0){ upd.put("anjuke_rent",DataUtil.roundDouble(rent,2)); } }else{ - log("非法租金 :"+rentDesc) + log("闈炴硶绉熼噾 :"+rentDesc) } - if(priceDesc.contains("元/平米")){ - def price = priceDesc.replaceAll("售价:", "").replaceAll("元/平米", "") + if(priceDesc.contains("鍏�/骞崇背")){ + def price = priceDesc.replaceAll("鍞环锛�", "").replaceAll("鍏�/骞崇背", "") price = price.toDouble().toInteger() if(price!=0){ upd.put("anjuke_price",price); } } }else{ - log("非法数据 $url $name ") + log("闈炴硶鏁版嵁 $url $name ") } if(upd.get("anjuke_rent")!=null||upd.get("anjuke_price")!=null){ upd.put("city", city) @@ -514,7 +514,7 @@ public class WebOfficeAvgPriceStatistics extends BaseBatch { return ret } - if (name.indexOf("(") > -1 || name.indexOf(")") > -1 || name.indexOf("..") > -1 + if (name.indexOf("锛�") > -1 || name.indexOf("锛�") > -1 || name.indexOf("..") > -1 | name.indexOf("[") > -1 || name.indexOf("]") > -1 || name.indexOf("-") > -1 || name.indexOf("{") > -1 || name.indexOf("}") > -1 || name.indexOf("{") > -1 || name.indexOf("}") > -1 || name.indexOf(":") > -1) { return ret @@ -559,19 +559,19 @@ public class WebOfficeAvgPriceStatistics extends BaseBatch { } def chineseOfficeNotBeijingDataParse(){ - log("開始分析中国写字楼网(非北京)数据",true) + log("闁嬪鍒嗘瀽涓浗鍐欏瓧妤肩綉(闈炲寳浜�)鏁版嵁",true) ExecutorService executor =Executors.newFixedThreadPool(10); cityIds.each { executor.execute(new Crawler(it)); } executor.shutdown(); executor.awaitTermination(Long.MAX_VALUE, TimeUnit.DAYS); - log("中国写字楼网(非北京)数据",true) + log("涓浗鍐欏瓧妤肩綉(闈炲寳浜�)鏁版嵁",true) } static class Crawler extends Thread{ public int shortDate = DateUtil.getFirstDayOfMonth(new Date()).format("yyyyMM").toInteger(); - private static Map cityIds = ["上海":"3","广州":"5","天津":"2","重庆":"7","成都":"32"] - private static Map cityUrl = ["上海":"http://shanghai.chineseoffice.com.cn","广州":"http://guangzhou.chineseoffice.com.cn","天津":"http://tianjin.chineseoffice.com.cn","重庆":"http://chongqing.chineseoffice.com.cn","成都":"http://chengdu.chineseoffice.com.cn"] + private static Map cityIds = ["涓婃捣":"3","骞垮窞":"5","澶╂触":"2","閲嶅簡":"7","鎴愰兘":"32"] + private static Map cityUrl = ["涓婃捣":"http://shanghai.chineseoffice.com.cn","骞垮窞":"http://guangzhou.chineseoffice.com.cn","澶╂触":"http://tianjin.chineseoffice.com.cn","閲嶅簡":"http://chongqing.chineseoffice.com.cn","鎴愰兘":"http://chengdu.chineseoffice.com.cn"] private static Map>> regionCache = new HashMap>>(); private String city; public Crawler(city){ @@ -619,15 +619,15 @@ public class WebOfficeAvgPriceStatistics extends BaseBatch { Elements items = listPage.select("ul.list"); for(Element item:items){ String name = item.select("div>ul>li>strong>a").get(0).text(); - name = name.replace("★", ".").replace("?", "·"); + name = name.replace("鈽�", ".").replace("?", "路"); String priceDesc = item.select(".l3 table>tbody>tr>td").text(); priceDesc = DataUtil.encoding(priceDesc) - priceDesc = priceDesc.replaceAll("\\?", "").replaceAll("元M/日", "").replaceAll("元/M","").replaceAll("/日", "").replaceAll(",", ""); + priceDesc = priceDesc.replaceAll("\\?", "").replaceAll("鍏僊/鏃�", "").replaceAll("鍏�/M","").replaceAll("/鏃�", "").replaceAll(",", ""); if(StringUtils.isBlank(priceDesc)){ continue } - int rentPosition = priceDesc.indexOf("租:"); - int pricePosition = priceDesc.indexOf("售:"); + int rentPosition = priceDesc.indexOf("绉燂細"); + int pricePosition = priceDesc.indexOf("鍞細"); def rent = null; def price = null if(rentPosition>-1){ @@ -779,24 +779,24 @@ public class WebOfficeAvgPriceStatistics extends BaseBatch { } private void doSendMessage() { StringBuilder printContent = new StringBuilder() - String title = "写字楼均价对比详细分析情况"; + String title = "鍐欏瓧妤煎潎浠峰姣旇缁嗗垎鏋愭儏鍐�"; StringBuilder emailContent = new StringBuilder() emailContent.append("
${title}
网站名称缃戠珯鍚嶇О总页面数成功页面数失败页面数页面成功率鎬婚〉闈㈡暟鎴愬姛椤甸潰鏁�澶辫触椤甸潰鏁�椤甸潰鎴愬姛鐜�总分析数成功分析数失败分析数分析有效率鎬诲垎鏋愭暟鎴愬姛鍒嗘瀽鏁�澶辫触鍒嗘瀽鏁�鍒嗘瀽鏈夋晥鐜�
搜房新房抓取统计鎼滄埧鏂版埧鎶撳彇缁熻搜房二手房抓取统计鎼滄埧浜屾墜鎴挎姄鍙栫粺璁�安居客抓取统计瀹夊眳瀹㈡姄鍙栫粺璁�中国写字楼抓取统计涓浗鍐欏瓧妤兼姄鍙栫粺璁�${statMap['total_pages']}${statMap['total_pages'] - statMap['error_pages']}
") emailContent.append("") emailContent.append("") emailContent.append("") emailContent.append("") - emailContent.append(""); + emailContent.append(""); - emailContent.append(""); - emailContent.append(""); - emailContent.append(""); - emailContent.append(""); + emailContent.append(""); + emailContent.append(""); + emailContent.append(""); + emailContent.append(""); - emailContent.append(""); - emailContent.append(""); - emailContent.append(""); - emailContent.append(""); + emailContent.append(""); + emailContent.append(""); + emailContent.append(""); + emailContent.append(""); emailContent.append("") for(StringBuilder job : sbuilders) { emailContent.append("") @@ -811,7 +811,7 @@ public class WebOfficeAvgPriceStatistics extends BaseBatch { /** - * 所有任务是否已经完成 + * 鎵�鏈変换鍔℃槸鍚﹀凡缁忓畬鎴� * * @return */ @@ -825,24 +825,24 @@ public class WebOfficeAvgPriceStatistics extends BaseBatch { } /** - * 启动任务 + * 鍚姩浠诲姟 */ public void startJobs() { - //0-无 1-运行中 2-完成 3-暂停 + //0-鏃� 1-杩愯涓� 2-瀹屾垚 3-鏆傚仠 for(String jobId : jobMap.keySet()) { - //判断是否任务正在运行 + //鍒ゆ柇鏄惁浠诲姟姝e湪杩愯 if(getArtemisJobState(jobId) != 1) { - //停止任务 + //鍋滄浠诲姟 stopArtemisJob(jobId) sleep(3*1000) - //清理任务 + //娓呯悊浠诲姟 cleanArtemisJobData(jobId); sleep(3*1000) - //开始任务 + //寮�濮嬩换鍔� startArtemisJob(jobId); - println DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) + " " + jobMap[jobId]['display'] + "\t抓取任务被启动" + println DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) + " " + jobMap[jobId]['display'] + "\t鎶撳彇浠诲姟琚惎鍔�" }else { - println DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) + " " + jobMap[jobId]['display'] + "\t抓取任务已启动" + println DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) + " " + jobMap[jobId]['display'] + "\t鎶撳彇浠诲姟宸插惎鍔�" } jobMap[jobId]['status'] = 1 sleep(10*1000) @@ -850,10 +850,10 @@ public class WebOfficeAvgPriceStatistics extends BaseBatch { } /** - * 检查任务 + * 妫�鏌ヤ换鍔� */ public void moniterJobs() { - //检查任务是否运行完成 + //妫�鏌ヤ换鍔℃槸鍚﹁繍琛屽畬鎴� while(true) { if(isAllJobDone()) { break; @@ -866,18 +866,18 @@ public class WebOfficeAvgPriceStatistics extends BaseBatch { if(getArtemisJobState(jobId) == 2) { jobMap[jobId]['status'] = 2 - println DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) + " " + jobMap[jobId]['display'] + "\t抓取任务已完成" + println DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) + " " + jobMap[jobId]['display'] + "\t鎶撳彇浠诲姟宸插畬鎴�" } } - //每5分钟检查一次 + //姣�5鍒嗛挓妫�鏌ヤ竴娆� sleep(5 * 1000) } } /** - * 获取抓取任务的状态 - * 1-运行中 2-完成或停止 3-暂停 + * 鑾峰彇鎶撳彇浠诲姟鐨勭姸鎬� + * 1-杩愯涓� 2-瀹屾垚鎴栧仠姝� 3-鏆傚仠 * @param jobId * @return */ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/WebShopAvgPriceStatistics.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/WebShopAvgPriceStatistics.groovy index 9239121f2..6eae52674 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/WebShopAvgPriceStatistics.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/WebShopAvgPriceStatistics.groovy @@ -47,7 +47,7 @@ import org.jsoup.nodes.Document import org.jsoup.select.Elements; /** * - * 说明:商铺均价统计脚本 + * 璇存槑:鍟嗛摵鍧囦环缁熻鑴氭湰 * */ @BatchOwner(Watcher.GaoJuan) @@ -73,9 +73,9 @@ public class WebShopAvgPriceStatistics extends BaseBatch { static List sbuilders=new ArrayList(); public static Map idMap=new HashMap(); - /**最大均价*/ + /**鏈�澶у潎浠�*/ private static final int MAX_AVG_PRICE = 300000 - /**最小均价*/ + /**鏈�灏忓潎浠�*/ private static final int MIN_AVG_PRICE = 1000 final static def EMAILS = [ @@ -88,9 +88,9 @@ public class WebShopAvgPriceStatistics extends BaseBatch { } public static final def jobMap = [ - "54c72145e4b0250efead10ac" : [status:0, display:'搜房新房'] ,///搜房新房 - "54c7212ae4b0250efead10aa" : [status:0, display:'搜房二手房'], //搜房二手房 - "54c6fdeee4b0250efead104b" : [status:0, display:'安居客新房'], //安居客新房 + "54c72145e4b0250efead10ac" : [status:0, display:'鎼滄埧鏂版埧'] ,///鎼滄埧鏂版埧 + "54c7212ae4b0250efead10aa" : [status:0, display:'鎼滄埧浜屾墜鎴�'], //鎼滄埧浜屾墜鎴� + "54c6fdeee4b0250efead104b" : [status:0, display:'瀹夊眳瀹㈡柊鎴�'], //瀹夊眳瀹㈡柊鎴� ] @Override @@ -103,7 +103,7 @@ public class WebShopAvgPriceStatistics extends BaseBatch { Thread t1 = new Thread(new Runnable() { @Override public void run() { - //检查任务是否完成 + //妫�鏌ヤ换鍔℃槸鍚﹀畬鎴� moniterJobs(); } }); @@ -126,7 +126,7 @@ public class WebShopAvgPriceStatistics extends BaseBatch { CRAWL_COLL.remove(new BasicDBObject('job_id', ANJUKE_JOB_ID)) CRAWL_COLL.remove(new BasicDBObject('job_id', FANG_JOB_ID)); CRAWL_COLL.remove(new BasicDBObject('job_id', FANG_ESF_JOB_ID)) - log("抓取系统数据删除成功",true) + log("鎶撳彇绯荤粺鏁版嵁鍒犻櫎鎴愬姛",true) } break; } @@ -169,11 +169,11 @@ public class WebShopAvgPriceStatistics extends BaseBatch { StringBuilder emailContent = new StringBuilder(); if("soufang_new_price".equals(statField)){ - emailContent.append("") + emailContent.append("") }else if("soufang_esf_price".equals(statField)){ - emailContent.append("") + emailContent.append("") }else if("anjuke_price".equals(statField)){ - emailContent.append("") + emailContent.append("") } emailContent.append("") emailContent.append("") @@ -195,24 +195,24 @@ public class WebShopAvgPriceStatistics extends BaseBatch { } private void doSendMessage() { StringBuilder printContent = new StringBuilder() - String title = "商铺均价对比详细分析情况"; + String title = "鍟嗛摵鍧囦环瀵规瘮璇︾粏鍒嗘瀽鎯呭喌"; StringBuilder emailContent = new StringBuilder() emailContent.append("
${title}
网站名称缃戠珯鍚嶇О总页面数成功页面数失败页面数页面成功率鎬婚〉闈㈡暟鎴愬姛椤甸潰鏁�澶辫触椤甸潰鏁�椤甸潰鎴愬姛鐜�总分析数成功分析数失败分析数分析有效率鎬诲垎鏋愭暟鎴愬姛鍒嗘瀽鏁�澶辫触鍒嗘瀽鏁�鍒嗘瀽鏈夋晥鐜�
搜房新房抓取统计鎼滄埧鏂版埧鎶撳彇缁熻搜房二手房抓取统计鎼滄埧浜屾墜鎴挎姄鍙栫粺璁�安居客抓取统计瀹夊眳瀹㈡姄鍙栫粺璁�${statMap['total_pages']}${statMap['total_pages'] - statMap['error_pages']}
") emailContent.append("") emailContent.append("") emailContent.append("") emailContent.append("") - emailContent.append(""); + emailContent.append(""); - emailContent.append(""); - emailContent.append(""); - emailContent.append(""); - emailContent.append(""); + emailContent.append(""); + emailContent.append(""); + emailContent.append(""); + emailContent.append(""); - emailContent.append(""); - emailContent.append(""); - emailContent.append(""); - emailContent.append(""); + emailContent.append(""); + emailContent.append(""); + emailContent.append(""); + emailContent.append(""); emailContent.append("") for(StringBuilder job : sbuilders) { emailContent.append("") @@ -301,7 +301,7 @@ public class WebShopAvgPriceStatistics extends BaseBatch { def analyzerNewSoufun(city, url, content){ Document document = Jsoup.parse(content); - String region = JQueryUtils.selectText(["span:contains(区):contains(域) + .con_cy>span, li:contains(区域) + li a.hui, .s1:contains(区域:) + .s3>span",".dingwei .hui"], document); + String region = JQueryUtils.selectText(["span:contains(鍖�):contains(鍩�) + .con_cy>span, li:contains(鍖哄煙) + li a.hui, .s1:contains(鍖哄煙:) + .s3>span",".dingwei .hui"], document); region = regionBlockDao.formatRegion(city, region); Elements elements = JQueryUtils.select([".sslalone"], document) if(elements == null || elements.isEmpty() || StringUtils.isBlank(region)) { @@ -357,7 +357,7 @@ public class WebShopAvgPriceStatistics extends BaseBatch { } def analyzerAnjuke(city, url, content){ Document document = Jsoup.parse(content); - String region = JQueryUtils.selectText([".search_p>p:contains(区):contains(域:)>a.unlimited"], document); + String region = JQueryUtils.selectText([".search_p>p:contains(鍖�):contains(鍩燂細)>a.unlimited"], document); region = regionBlockDao.formatRegion(city, region); Elements elements = JQueryUtils.select([".bdlis_mid_cent li"], document) if(elements == null || elements.isEmpty() || StringUtils.isBlank(region)) { @@ -392,49 +392,49 @@ public class WebShopAvgPriceStatistics extends BaseBatch { Element p =ps.get(0); def desc = p.text(); desc = DataUtil.encoding(desc).replace("?", ""); - if(desc.contains("租金:")){ - if(desc.contains("元/平米月")){ - def rent = desc.replaceAll("元/平米月", "").replaceAll("租金:", "").trim(); + if(desc.contains("绉熼噾锛�")){ + if(desc.contains("鍏�/骞崇背鏈�")){ + def rent = desc.replaceAll("鍏�/骞崇背鏈�", "").replaceAll("绉熼噾锛�", "").trim(); rent = DataUtil.roundDouble(rent.toDouble()/30,2) if(rent != 0){ upd.put("anjuke_rent",rent); } - }else if(desc.contains("元/平米天")){ - def rent = desc.replaceAll("元/平米天", "").replaceAll("租金:", "").trim().toDouble(); + }else if(desc.contains("鍏�/骞崇背澶�")){ + def rent = desc.replaceAll("鍏�/骞崇背澶�", "").replaceAll("绉熼噾锛�", "").trim().toDouble(); if(rent != 0){ upd.put("anjuke_rent",DataUtil.roundDouble(rent,2)); } }else{ - log("非法租金 :"+desc) + log("闈炴硶绉熼噾 :"+desc) } - }else if(desc.contains("售价:")&&desc.contains("元/平米")){ - def price = desc.replaceAll("售价:", "").replaceAll("元/平米", "") + }else if(desc.contains("鍞环锛�")&&desc.contains("鍏�/骞崇背")){ + def price = desc.replaceAll("鍞环锛�", "").replaceAll("鍏�/骞崇背", "") price = price.toDouble().toInteger() if(price!=0){ upd.put("anjuke_price",price); } }else{ - log("非法租金或售价 :"+desc) + log("闈炴硶绉熼噾鎴栧敭浠� :"+desc) } }else if(ps.size()==2){ def priceDesc = DataUtil.encoding(ps.get(0).text()).replace("?", ""); def rentDesc = DataUtil.encoding(ps.get(1).text()).replace("?", ""); - if(rentDesc.contains("元/平米月")){ - def rent = rentDesc.replaceAll("元/平米月", "").replaceAll("租金:", "").trim(); + if(rentDesc.contains("鍏�/骞崇背鏈�")){ + def rent = rentDesc.replaceAll("鍏�/骞崇背鏈�", "").replaceAll("绉熼噾锛�", "").trim(); rent = DataUtil.roundDouble(rent.toDouble()/30,2) if(rent != 0){ upd.put("anjuke_rent",rent); } - }else if(rentDesc.contains("元/平米天")){ - def rent = rentDesc.replaceAll("元/平米天", "").replaceAll("租金:", "").trim().toDouble(); + }else if(rentDesc.contains("鍏�/骞崇背澶�")){ + def rent = rentDesc.replaceAll("鍏�/骞崇背澶�", "").replaceAll("绉熼噾锛�", "").trim().toDouble(); if(rent != 0){ upd.put("anjuke_rent",DataUtil.roundDouble(rent,2)); } }else{ - log("非法租金 :"+rentDesc) + log("闈炴硶绉熼噾 :"+rentDesc) } - if(priceDesc.contains("元/平米")){ - def price = priceDesc.replaceAll("售价:", "").replaceAll("元/平米", "") + if(priceDesc.contains("鍏�/骞崇背")){ + def price = priceDesc.replaceAll("鍞环锛�", "").replaceAll("鍏�/骞崇背", "") price = price.toDouble().toInteger() if(price!=0){ upd.put("anjuke_price",price); @@ -517,7 +517,7 @@ public class WebShopAvgPriceStatistics extends BaseBatch { return ret } - if (name.indexOf("(") > -1 || name.indexOf(")") > -1 || name.indexOf("..") > -1 + if (name.indexOf("锛�") > -1 || name.indexOf("锛�") > -1 || name.indexOf("..") > -1 | name.indexOf("[") > -1 || name.indexOf("]") > -1 || name.indexOf("-") > -1 || name.indexOf("{") > -1 || name.indexOf("}") > -1 || name.indexOf("{") > -1 || name.indexOf("}") > -1 || name.indexOf(":") > -1) { return ret @@ -586,7 +586,7 @@ public class WebShopAvgPriceStatistics extends BaseBatch { /** - * 所有任务是否已经完成 + * 鎵�鏈変换鍔℃槸鍚﹀凡缁忓畬鎴� * * @return */ @@ -600,24 +600,24 @@ public class WebShopAvgPriceStatistics extends BaseBatch { } /** - * 启动任务 + * 鍚姩浠诲姟 */ public void startJobs() { - //0-无 1-运行中 2-完成 3-暂停 + //0-鏃� 1-杩愯涓� 2-瀹屾垚 3-鏆傚仠 for(String jobId : jobMap.keySet()) { - //判断是否任务正在运行 + //鍒ゆ柇鏄惁浠诲姟姝e湪杩愯 if(getArtemisJobState(jobId) != 1) { - //停止任务 + //鍋滄浠诲姟 stopArtemisJob(jobId) sleep(3*1000) - //清理任务 + //娓呯悊浠诲姟 cleanArtemisJobData(jobId); sleep(3*1000) - //开始任务 + //寮�濮嬩换鍔� startArtemisJob(jobId); - println DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) + " " + jobMap[jobId]['display'] + "\t抓取任务被启动" + println DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) + " " + jobMap[jobId]['display'] + "\t鎶撳彇浠诲姟琚惎鍔�" }else { - println DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) + " " + jobMap[jobId]['display'] + "\t抓取任务已启动" + println DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) + " " + jobMap[jobId]['display'] + "\t鎶撳彇浠诲姟宸插惎鍔�" } jobMap[jobId]['status'] = 1 sleep(10*1000) @@ -625,10 +625,10 @@ public class WebShopAvgPriceStatistics extends BaseBatch { } /** - * 检查任务 + * 妫�鏌ヤ换鍔� */ public void moniterJobs() { - //检查任务是否运行完成 + //妫�鏌ヤ换鍔℃槸鍚﹁繍琛屽畬鎴� while(true) { if(isAllJobDone()) { break; @@ -641,18 +641,18 @@ public class WebShopAvgPriceStatistics extends BaseBatch { if(getArtemisJobState(jobId) == 2) { jobMap[jobId]['status'] = 2 - println DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) + " " + jobMap[jobId]['display'] + "\t抓取任务已完成" + println DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) + " " + jobMap[jobId]['display'] + "\t鎶撳彇浠诲姟宸插畬鎴�" } } - //每5分钟检查一次 + //姣�5鍒嗛挓妫�鏌ヤ竴娆� sleep(5 * 1000) } } /** - * 获取抓取任务的状态 - * 1-运行中 2-完成或停止 3-暂停 + * 鑾峰彇鎶撳彇浠诲姟鐨勭姸鎬� + * 1-杩愯涓� 2-瀹屾垚鎴栧仠姝� 3-鏆傚仠 * @param jobId * @return */ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/backup/HouseToEsBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/backup/HouseToEsBatch.groovy index 0ed39cbbf..860525ac6 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/backup/HouseToEsBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/backup/HouseToEsBatch.groovy @@ -47,14 +47,14 @@ public class HouseToEsBatch extends BaseBatch { //DSCollection SEABIRD = new DataStore("seaweed.db.fangjia.com").getCollection("fangjia.seabird") //DSCollection SEAWATER = new DataStore("192.168.0.206", 27777).getCollection("fangjia.seawater") - //数字类型的字段 + //鏁板瓧绫诲瀷鐨勫瓧娈� static def NUMBER_FIELDS = ["total_price", "area", "height", "floor", "room", "hall", "toilet", "age"] - //文本类型的字段 + //鏂囨湰绫诲瀷鐨勫瓧娈� static def TEXT_FIELDS = ["name", "address", "block","fitment", "estate_type", "mobile", "build_type", "build_date", "company", "direction", "contact_people", "rent_type", "floor_info", "house_number","down_payment", "only_one","buy_year", "unit_number","unit_type","owner_attitude","service_desc","community_support", "description", "check_in_time", "house_allocation", "house_require", "house_advantage", "pay_type", "metro", "line", "subject", "agency"] - //其他类型的字段 + //鍏朵粬绫诲瀷鐨勫瓧娈� static def OTHER_FIELDS = ["user_id", "publish_date"] static List CONTENT_FIELDS = ["address", "area", "block", "build_date", "build_type", "cat", "city", "company", "contact_people", "direction", "district_name", "estate_charge", "estate_type", "fitment", "floor", "floor_info", "hall", "height", "mobile", "name", "region", "rent_type", "room", "status", "toilet", "total_price", "url", "user_id"] @@ -145,7 +145,7 @@ public class HouseToEsBatch extends BaseBatch { this.importData2Elastic(standardData.toMap()); } }else { - println("放弃:" + dbo.toString()) + println("鏀惧純:" + dbo.toString()) fc++; } if(batchDelList.size() >= 50) { @@ -299,7 +299,7 @@ public class HouseToEsBatch extends BaseBatch { standardObj.put("p_date", DateUtil.formatToTightYYYYMMDD(dbo.get("publish_date")).toInteger()) standardObj.put("c_date", DateUtil.formatToTightYYYYMMDD(dbo.get("c_date")).toInteger()) - //数字类型的字段 + //鏁板瓧绫诲瀷鐨勫瓧娈� for(String key : NUMBER_FIELDS) { Object val = dbo.get(key) if(val != null && val instanceof Number) { @@ -307,16 +307,16 @@ public class HouseToEsBatch extends BaseBatch { } } - //文本类型的字段 + //鏂囨湰绫诲瀷鐨勫瓧娈� for(String key : TEXT_FIELDS) { Object val = dbo.get(key) - //判断文本字段如果太长,就不保存该字段 + //鍒ゆ柇鏂囨湰瀛楁濡傛灉澶暱锛屽氨涓嶄繚瀛樿瀛楁 if(val != null && val instanceof String && val.length() <= 1024) { standardObj.put(key, val) } } - //其他字段 + //鍏朵粬瀛楁 for(String key : OTHER_FIELDS) { Object val = dbo.get(key) if(val != null) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/backup/HouseToStorehouseBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/backup/HouseToStorehouseBatch.groovy index 7413344f1..1f11a8f79 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/backup/HouseToStorehouseBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/backup/HouseToStorehouseBatch.groovy @@ -25,14 +25,14 @@ public class HouseToStorehouseBatch extends BaseBatch { DSCollection SEABIRD = new DataStore("seaweed.db.fangjia.com").getCollection("fangjia.seabird") DSCollection SEAWATER = new DataStore("192.168.0.206", 27777).getCollection("fangjia.seawater") - //数字类型的字段 + //鏁板瓧绫诲瀷鐨勫瓧娈� static def NUMBER_FIELDS = ["total_price", "area", "height", "floor", "room", "hall", "toilet", "age"] - //文本类型的字段 + //鏂囨湰绫诲瀷鐨勫瓧娈� static def TEXT_FIELDS = ["name", "address", "block","fitment", "estate_type", "mobile", "build_type", "build_date", "company", "direction", "contact_people", "rent_type", "floor_info", "house_number","down_payment", "only_one","buy_year", "unit_number","unit_type","owner_attitude","service_desc","community_support", "description", "check_in_time", "house_allocation", "house_require", "house_advantage", "pay_type", "metro", "line", "subject", "agency"] - //其他类型的字段 + //鍏朵粬绫诲瀷鐨勫瓧娈� static def OTHER_FIELDS = ["user_id"] static List CONTENT_FIELDS = ["address", "area", "block", "build_date", "build_type", "cat", "city", "company", "contact_people", "direction", "district_name", "estate_charge", "estate_type", "fitment", "floor", "floor_info", "hall", "height", "mobile", "name", "region", "rent_type", "room", "status", "toilet", "total_price", "url", "user_id"] @@ -108,7 +108,7 @@ public class HouseToStorehouseBatch extends BaseBatch { } } }else { - println("放弃:" + dbo.toString()) + println("鏀惧純:" + dbo.toString()) fc++; } if(batchDelList.size() >= 50) { @@ -176,7 +176,7 @@ public class HouseToStorehouseBatch extends BaseBatch { standardObj.put("p_date", DateUtil.formatToTightYYYYMMDD(dbo.get("publish_date")).toInteger()) standardObj.put("c_date", DateUtil.formatToTightYYYYMMDD(dbo.get("c_date")).toInteger()) - //数字类型的字段 + //鏁板瓧绫诲瀷鐨勫瓧娈� for(String key : NUMBER_FIELDS) { Object val = dbo.get(key) if(val != null && val instanceof Number) { @@ -184,16 +184,16 @@ public class HouseToStorehouseBatch extends BaseBatch { } } - //文本类型的字段 + //鏂囨湰绫诲瀷鐨勫瓧娈� for(String key : TEXT_FIELDS) { Object val = dbo.get(key) - //判断文本字段如果太长,就不保存该字段 + //鍒ゆ柇鏂囨湰瀛楁濡傛灉澶暱锛屽氨涓嶄繚瀛樿瀛楁 if(val != null && val instanceof String && val.length() <= 1024) { standardObj.put(key, val) } } - //其他字段 + //鍏朵粬瀛楁 for(String key : OTHER_FIELDS) { Object val = dbo.get(key) if(val != null) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/backup/MysqlHouseToMongodb.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/backup/MysqlHouseToMongodb.groovy index 3ba3a60bd..73788e5c5 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/backup/MysqlHouseToMongodb.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/backup/MysqlHouseToMongodb.groovy @@ -84,10 +84,10 @@ public class MysqlHouseToMongodb { if(district.get("region")) { String region = district.get("region") - if(region.startsWith("浦东")) { - region = "浦东" + if(region.startsWith("娴︿笢")) { + region = "娴︿笢" }else { - if(region.endsWith("区") && region.length() >= 3) { + if(region.endsWith("鍖�") && region.length() >= 3) { region = region.substring(0, region.length() - 1) } } @@ -97,7 +97,7 @@ public class MysqlHouseToMongodb { if(district.get("block")) { String block = district.get("block") if(block) { - dbo.put("block", block.replace("板块", "")) + dbo.put("block", block.replace("鏉垮潡", "")) } } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/backup/ShopPriceBackup.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/backup/ShopPriceBackup.groovy index bcf89221e..ab11b457a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/backup/ShopPriceBackup.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/backup/ShopPriceBackup.groovy @@ -28,7 +28,7 @@ class ShopPriceBackup { // def cur = task.findShopPrice() // task.saveSellSHop(cur); - def rentCur = task.findShopRentPrice("商铺") + def rentCur = task.findShopRentPrice("鍟嗛摵") task.saveRentSHop(rentCur); } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/backup/StorehouseCorrectorBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/backup/StorehouseCorrectorBatch.groovy index 8a0cf5df8..8b34fed59 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/backup/StorehouseCorrectorBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/backup/StorehouseCorrectorBatch.groovy @@ -56,7 +56,7 @@ class StorehouseCorrectorBatch extends BaseBatch { println tc + "\t" + DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) } - Pattern PATT = Pattern.compile(".+[一|二|三|四|五|六|七|八|九|十]期.*") + Pattern PATT = Pattern.compile(".+[涓�|浜寍涓墊鍥泑浜攟鍏瓅涓億鍏珅涔潀鍗乚鏈�.*") private boolean isNeedParse(String districtName) { if(districtName.length() <= 10) { return false; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/backup/TmpBatch2.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/backup/TmpBatch2.groovy index cc60a8220..91988537b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/backup/TmpBatch2.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/backup/TmpBatch2.groovy @@ -22,7 +22,7 @@ public class TmpBatch2 { public static void main(String[] args) { - String city = "上海"; + String city = "涓婃捣"; def districtMap = getDistrictMap(city) Date weekend = DateUtil.parseDate("2013-06-23", 'yyyy-MM-dd') diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/baidu/AnjukeHouseProcessor.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/baidu/AnjukeHouseProcessor.groovy index 8d91d0c08..6167c10a0 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/baidu/AnjukeHouseProcessor.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/baidu/AnjukeHouseProcessor.groovy @@ -9,7 +9,7 @@ import net.sf.json.JSONObject import org.apache.commons.lang.StringUtils /** - * 功能说明: + * 鍔熻兘璇存槑: */ class AnjukeHouseProcessor implements HouseProcessor { @@ -23,15 +23,15 @@ class AnjukeHouseProcessor implements HouseProcessor { Boolean process(BasicDBObject orgHouse, BasicDBObject destHouse) { try{ List pics = processPics(orgHouse) - //处理后的水印放入destHouse + //澶勭悊鍚庣殑姘村嵃鏀惧叆destHouse destHouse.pics = pics processBroker(orgHouse, destHouse); if(!orgHouse.mobile){ - throw new Exception("无法获取经纪人信息,url:"+orgHouse.url); + throw new Exception("鏃犳硶鑾峰彇缁忕邯浜轰俊鎭紝url:"+orgHouse.url); } return true }catch(Exception e){ - throw new Exception("安居客处理失败,error:"+e.getMessage()); + throw new Exception("瀹夊眳瀹㈠鐞嗗け璐ワ紝error锛�"+e.getMessage()); } } @@ -64,9 +64,9 @@ class AnjukeHouseProcessor implements HouseProcessor { return orgHouse; } - //抓取经纪人手机号 + //鎶撳彇缁忕邯浜烘墜鏈哄彿 def brokerCrawl(def url) { - def errors = ["访问验证-安居客"] + def errors = ["璁块棶楠岃瘉-瀹夊眳瀹�"] def responseMap = getResponseValue(url, errors, "UTF-8"); def mobile = null; if(responseMap){ @@ -101,7 +101,7 @@ class AnjukeHouseProcessor implements HouseProcessor { return cookieAuth; } - //js参数截取 + //js鍙傛暟鎴彇 def getBorkerParams(def document){ def s = document.toString() def s1 = s.substring(s.indexOf("new ajk.InquirePhoneNum({"), s.length()); @@ -122,19 +122,19 @@ class AnjukeHouseProcessor implements HouseProcessor { responseMap = ABuYunUtil.doPostResponse(url, null, null, charset, false) content = responseMap.get("response") }catch (Exception e){ - println "getResponseValue 发生异常" + println "getResponseValue 鍙戠敓寮傚父" } if(errorMsgs){ def stop = true; for(def errorMsg : errorMsgs){ if(!content || content.indexOf(errorMsg)>-1){ count++; - println "内容不合格" + println "鍐呭涓嶅悎鏍�" println "["+count+"]"+ url stop = false; if(count>100){ responseMap = null; - println url + "访问了100次都访问不到,放弃了....." + println url + "璁块棶浜�100娆¢兘璁块棶涓嶅埌锛屾斁寮冧簡....." stop = true; } break; @@ -161,7 +161,7 @@ class AnjukeHouseProcessor implements HouseProcessor { responseMap = ABuYunUtil.doPostResponse(url, params, headers, charset, false) response = responseMap.get("response") }catch (Exception e){ - println "getAjaxValues 发生异常" + println "getAjaxValues 鍙戠敓寮傚父" } @@ -182,7 +182,7 @@ class AnjukeHouseProcessor implements HouseProcessor { tryCount ++; } } - println "第[ "+tryCount+" ]次尝试" + println "绗琜 "+tryCount+" ]娆″皾璇�" } return value; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/baidu/BaiduPOIFetchBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/baidu/BaiduPOIFetchBatch.groovy index 4c5c05aaa..d5f7b9954 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/baidu/BaiduPOIFetchBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/baidu/BaiduPOIFetchBatch.groovy @@ -36,8 +36,8 @@ class BaiduPOIFetchBatch extends BaseBatch { ] public static final KEYWORDS = [ - "码头","飞机场","火车站",'商场',"KTV","电影院","健身中心","美容院", '大型超市',"私立学校","洗浴中心","酒店","咖啡厅",'餐饮',"游乐场", - "旅游景点","医院","学校","公园","体育场","图书馆","写字楼","银行","ATM","停车场","便利店","网吧" + "鐮佸ご","椋炴満鍦�","鐏溅绔�",'鍟嗗満',"KTV","鐢靛奖闄�","鍋ヨ韩涓績","缇庡闄�", '澶у瀷瓒呭競',"绉佺珛瀛︽牎","娲楁荡涓績","閰掑簵","鍜栧暋鍘�",'椁愰ギ',"娓镐箰鍦�", + "鏃呮父鏅偣","鍖婚櫌","瀛︽牎","鍏洯","浣撹偛鍦�","鍥句功棣�","鍐欏瓧妤�","閾惰","ATM","鍋滆溅鍦�","渚垮埄搴�","缃戝惂" ] public static final DBCollection POI_COLL = MongoUtils.getCollectionByName("fangjia_base", "baidu_place_poi", "192.168.0.61", 27017) @@ -85,7 +85,7 @@ class BaiduPOIFetchBatch extends BaseBatch { continue; } - //获取第一页数据 + //鑾峰彇绗竴椤垫暟鎹� countMap.put(keyword, 0) JSONObject result = fetchPOIData(bounds, keyword, 0) @@ -99,7 +99,7 @@ class BaiduPOIFetchBatch extends BaseBatch { } countMap.put(keyword, countMap.get(keyword) + total) if (total > PAGE_SIZE) { - //分页获取 + //鍒嗛〉鑾峰彇 int totalPage = (total % PAGE_SIZE == 0 ? total / PAGE_SIZE : total / PAGE_SIZE + 1) for (int i = 1; i < totalPage; i++) { result = fetchPOIData(bounds, keyword, i) @@ -128,15 +128,15 @@ class BaiduPOIFetchBatch extends BaseBatch { List calcCityBounds(String city) { DBObject latlng = LATLNG_COLL.findOne(new BasicDBObject('name', city)) if(latlng == null) { - println city + " -> 没有经纬度图形" + println city + " -> 娌℃湁缁忕含搴﹀浘褰�" return null; } def ret = [] - //数据库的城市bounds,是按照西北和东南点进行定位 + //鏁版嵁搴撶殑鍩庡競bounds,鏄寜鐓цタ鍖楀拰涓滃崡鐐硅繘琛屽畾浣� def arr = latlng.get('bounds').replaceAll('\\[|\\]','').split(',') Bounds cityBounds = new Bounds(arr[0].toDouble(), arr[3].toDouble(), arr[2].toDouble(), arr[1].toDouble()) - //将城市西南点作为起始点,从左至右,从下至上进行区块遍历 + //灏嗗煄甯傝タ鍗楃偣浣滀负璧峰鐐�,浠庡乏鑷冲彸锛屼粠涓嬭嚦涓婅繘琛屽尯鍧楅亶鍘� def boundsList = getBoundsList(cityBounds, 1000); int k = 0 for (int i = 0; i < boundsList.size(); i++) { @@ -162,14 +162,14 @@ class BaiduPOIFetchBatch extends BaseBatch { } /** - * 区块数据 - * @param cityBounds 城市bounds - * @param offset 偏移距离(米) - * @return 以row/column的方式返回Bounds数组 + * 鍖哄潡鏁版嵁 + * @param cityBounds 鍩庡競bounds + * @param offset 鍋忕Щ璺濈(绫�) + * @return 浠ow/column鐨勬柟寮忚繑鍥濨ounds鏁扮粍 */ List> getBoundsList(Bounds cityBounds, int offset) { // println city + "\t" + cityBounds.toString() - //将城市西南点作为起始点,从左至右,从下至上进去区块遍历 + //灏嗗煄甯傝タ鍗楃偣浣滀负璧峰鐐�,浠庡乏鑷冲彸锛屼粠涓嬭嚦涓婅繘鍘诲尯鍧楅亶鍘� double seedLng = cityBounds.getWS()[0] double seedLat = cityBounds.getWS()[1] @@ -178,8 +178,8 @@ class BaiduPOIFetchBatch extends BaseBatch { Bounds bounds = null; def columns = [] while (seedLng < cityBounds.getMaxLng()) { - double[] esp = GeoUtils.getLatLon(seedLng, seedLat, offset, 90) // 右侧OFFSET处的经纬度 - double[] wnp = GeoUtils.getLatLon(seedLng, seedLat, offset, 360) // 上方OFFSET处的经纬度 + double[] esp = GeoUtils.getLatLon(seedLng, seedLat, offset, 90) // 鍙充晶OFFSET澶勭殑缁忕含搴� + double[] wnp = GeoUtils.getLatLon(seedLng, seedLat, offset, 360) // 涓婃柟OFFSET澶勭殑缁忕含搴� bounds = new Bounds(wnp[0], esp[1], esp[0], wnp[1]) columns << bounds seedLng = bounds.getES()[0] @@ -253,7 +253,7 @@ class BaiduPOIFetchBatch extends BaseBatch { def ak = getEnableAk() def params = [:]; - //注意百度最多支持10个关键字搜索,这里的keywords不要超过10个 + //娉ㄦ剰鐧惧害鏈�澶氭敮鎸�10涓叧閿瓧鎼滅储,杩欓噷鐨刱eywords涓嶈瓒呰繃10涓� params.q = keyword params.output = "json" params.scope = '2'; @@ -279,10 +279,10 @@ class BaiduPOIFetchBatch extends BaseBatch { AKS[ak] = false; continue; } else { - println status + "\t状态错误\t" + bounds.toString() + println status + "\t鐘舵�侀敊璇痋t" + bounds.toString() } } catch (Exception e) { - println "*****程序退出******" + println "*****绋嬪簭閫�鍑�******" throw e; } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/baidu/BrokerProcessor.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/baidu/BrokerProcessor.groovy index 73daa33a7..4e06ba87e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/baidu/BrokerProcessor.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/baidu/BrokerProcessor.groovy @@ -21,8 +21,8 @@ class BrokerProcessor implements HouseProcessor{ } /** - * 注册经纪人逻辑 - * 先查询是否有注册记录, 如果没有注册调用百度接口注册+保存注册记录 + * 娉ㄥ唽缁忕邯浜洪�昏緫 + * 鍏堟煡璇㈡槸鍚︽湁娉ㄥ唽璁板綍, 濡傛灉娌℃湁娉ㄥ唽璋冪敤鐧惧害鎺ュ彛娉ㄥ唽+淇濆瓨娉ㄥ唽璁板綍 * @param orgHouse * @param destHouse * @return @@ -30,20 +30,20 @@ class BrokerProcessor implements HouseProcessor{ @Override Boolean process(BasicDBObject orgHouse, BasicDBObject destHouse) { try{ - //查找该经纪人是否注册过, 此时传入的destHouse中mobile已经在AnjukeHouseProcessor processer中抓取后直接赋过值了 + //鏌ユ壘璇ョ粡绾汉鏄惁娉ㄥ唽杩�, 姝ゆ椂浼犲叆鐨刣estHouse涓璵obile宸茬粡鍦ˋnjukeHouseProcessor processer涓姄鍙栧悗鐩存帴璧嬭繃鍊间簡 orgHouse.mobile = orgHouse.mobile.replaceAll("\\s*", ""); BasicDBObject dbo = BROKER_COLL.findOne(new BasicDBObject("mobile", orgHouse.mobile).append("contact_people", orgHouse.contact_people)) - //如果不存在经纪人, 调用百度接口注册 + 记录 + //濡傛灉涓嶅瓨鍦ㄧ粡绾汉, 璋冪敤鐧惧害鎺ュ彛娉ㄥ唽 + 璁板綍 if(!dbo){ - //拿原始对象数据注册 + //鎷垮師濮嬪璞℃暟鎹敞鍐� def userId = accountReg(orgHouse.contact_people, orgHouse.mobile); if(StringUtils.isNotEmpty(userId)){ - println('注册经纪人为:' + orgHouse.contact_people + ', 手机号为' + orgHouse.mobile + ', 注册成功,返回userId为: '+ userId) - // 注册完成进行注册认证 + println('娉ㄥ唽缁忕邯浜轰负锛�' + orgHouse.contact_people + ', 鎵嬫満鍙蜂负' + orgHouse.mobile + ', 娉ㄥ唽鎴愬姛锛岃繑鍥瀠serId涓�: '+ userId) + // 娉ㄥ唽瀹屾垚杩涜娉ㄥ唽璁よ瘉 def resFlag = authentication(orgHouse.contact_people, orgHouse.mobile, userId, orgHouse, destHouse) if(resFlag){ - println('注册认证经纪人为:' + orgHouse.contact_people + ', 手机号为' + orgHouse.mobile + ', 认证注册成功,返回resFlag为true') - // 把注册后的经纪人ID 放入推送的destHouse中 + println('娉ㄥ唽璁よ瘉缁忕邯浜轰负锛�' + orgHouse.contact_people + ', 鎵嬫満鍙蜂负' + orgHouse.mobile + ', 璁よ瘉娉ㄥ唽鎴愬姛锛岃繑鍥瀝esFlag涓簍rue') + // 鎶婃敞鍐屽悗鐨勭粡绾汉ID 鏀惧叆鎺ㄩ�佺殑destHouse涓� destHouse.userId = userId; def obj = new BasicDBObject(); obj.put("mobile", orgHouse.mobile); @@ -53,26 +53,26 @@ class BrokerProcessor implements HouseProcessor{ BROKER_COLL.save(obj) return Boolean.TRUE }else{ - println('注册认证经纪人为:' + orgHouse.contact_people + ', 手机号为' + orgHouse.mobile + ', 认证注册失败,返回resFlag为false') - throw new Exception("注册经纪人失败,返回resFlag为false"); + println('娉ㄥ唽璁よ瘉缁忕邯浜轰负锛�' + orgHouse.contact_people + ', 鎵嬫満鍙蜂负' + orgHouse.mobile + ', 璁よ瘉娉ㄥ唽澶辫触锛岃繑鍥瀝esFlag涓篺alse') + throw new Exception("娉ㄥ唽缁忕邯浜哄け璐ワ紝杩斿洖resFlag涓篺alse"); } }else{ - println('注册经纪人为:' + orgHouse.contact_people + ', 手机号为' + orgHouse.mobile + ', 注册失败,返回userId为null') - throw new Exception("注册经纪人失败,返回userId为null"); + println('娉ㄥ唽缁忕邯浜轰负锛�' + orgHouse.contact_people + ', 鎵嬫満鍙蜂负' + orgHouse.mobile + ', 娉ㄥ唽澶辫触锛岃繑鍥瀠serId涓簄ull') + throw new Exception("娉ㄥ唽缁忕邯浜哄け璐ワ紝杩斿洖userId涓簄ull"); } }else{ - //赋值 - println('该经纪人为:' + orgHouse.contact_people + ', 手机号为' + orgHouse.mobile + '已经注册过且认证注册成功, 直接返回userId为:' +dbo.user_id +'!!!') + //璧嬪�� + println('璇ョ粡绾汉涓猴細' + orgHouse.contact_people + ', 鎵嬫満鍙蜂负' + orgHouse.mobile + '宸茬粡娉ㄥ唽杩囦笖璁よ瘉娉ㄥ唽鎴愬姛, 鐩存帴杩斿洖userId涓�:' +dbo.user_id +'!!!') destHouse.userId = dbo.user_id return Boolean.TRUE } }catch(Exception e){ - throw new Exception("经纪人注册失败,error:"+e.getMessage()); + throw new Exception("缁忕邯浜烘敞鍐屽け璐�,error:"+e.getMessage()); } } /** - * 经纪人注册 + * 缁忕邯浜烘敞鍐� * @param name * @param mobile * @return @@ -84,22 +84,22 @@ class BrokerProcessor implements HouseProcessor{ request.putOtherTextParam("nopAppId", "0vJQDft3Nn"); request.putOtherTextParam("nickName", name); def userId = null - //第三步,走你 + //绗笁姝ワ紝璧颁綘 try { JSONObject json = NuomiApiUtils.execute(request) - System.out.println("调用百度经纪人注册 bnuoapi.fang.accountReg 接口, 返回数据为:"+json.toString()); + System.out.println("璋冪敤鐧惧害缁忕邯浜烘敞鍐� bnuoapi.fang.accountReg 鎺ュ彛, 杩斿洖鏁版嵁涓�:"+json.toString()); if(json && json.res && (json.code == 0)){ userId = json.res.userId } } catch (ApiException e) { - System.out.println("调用百度经纪人注册 bnuoapi.fang.accountReg 接口, 发生异常,异常信息为:" + e.getErrMsg()); + System.out.println("璋冪敤鐧惧害缁忕邯浜烘敞鍐� bnuoapi.fang.accountReg 鎺ュ彛, 鍙戠敓寮傚父锛屽紓甯镐俊鎭负:" + e.getErrMsg()); System.out.println("error:"+e.getErrMsg()); } return userId } /** - * 经纪人入驻和认证接口 + * 缁忕邯浜哄叆椹诲拰璁よ瘉鎺ュ彛 * @param name * @param mobile * @return @@ -111,14 +111,14 @@ class BrokerProcessor implements HouseProcessor{ request.putOtherTextParam("userId", userId); request.putOtherTextParam("phone", mobile); request.putOtherTextParam("name", name); - //抓取不到, 暂时固定 + //鎶撳彇涓嶅埌, 鏆傛椂鍥哄畾 request.putOtherTextParam("idNumber", "210603199105196046"); request.putOtherTextParam("cityId", destHouse.cityId.toString()); request.putOtherTextParam("cityName", destHouse.cityName); request.putOtherTextParam("nopAppId", "0vJQDft3Nn"); if(StringUtils.isEmpty(orgHouse.agency)){ - request.putOtherTextParam("companyName", '独立经纪人'); - request.putOtherTextParam("poiName", '独立经纪人'); + request.putOtherTextParam("companyName", '鐙珛缁忕邯浜�'); + request.putOtherTextParam("poiName", '鐙珛缁忕邯浜�'); } else{ request.putOtherTextParam("companyName", orgHouse.agency); request.putOtherTextParam("poiName", orgHouse.agency); @@ -127,12 +127,12 @@ class BrokerProcessor implements HouseProcessor{ request.putOtherTextParam("regionName", destHouse.districtName); try { JSONObject json = NuomiApiUtils.execute(request) - System.out.println("调用百度经纪人入驻和认证接口 bnuoapi.fang.authentication 接口, 返回数据为:"+json.toString()); + System.out.println("璋冪敤鐧惧害缁忕邯浜哄叆椹诲拰璁よ瘉鎺ュ彛 bnuoapi.fang.authentication 鎺ュ彛, 杩斿洖鏁版嵁涓�:"+json.toString()); if(json && (json.msg == 'success') && (json.code == 0)){ resFlag = true } } catch (ApiException e) { - System.out.println("调用百度经纪人入驻和认证接口 bnuoapi.fang.authentication 接口, 发生异常,异常信息为:" + e.getErrMsg()); + System.out.println("璋冪敤鐧惧害缁忕邯浜哄叆椹诲拰璁よ瘉鎺ュ彛 bnuoapi.fang.authentication 鎺ュ彛, 鍙戠敓寮傚父锛屽紓甯镐俊鎭负:" + e.getErrMsg()); System.out.println("error:"+e.getErrMsg()); } return resFlag diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/baidu/CityLatlngBox.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/baidu/CityLatlngBox.groovy index 631b76733..eb6590ad0 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/baidu/CityLatlngBox.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/baidu/CityLatlngBox.groovy @@ -23,7 +23,7 @@ class CityLatlngBox { } void process() { - def cities = ["白沙","阿坝州","甘孜州","阿勒泰","临沧","那曲","三沙","喀什","昌吉","迪庆州","普洱","德宏州","湘西","塔城","凉山州","屯昌","山南","海西州","阿拉善盟","乐东","定安","怒江州","黄山","图木舒克","楚雄","临高","乌兰察布","延边","文山州","锡林郭勒盟","陵水","天门","淮北","黔东南","万宁","湘潭","海北州","琼中","吐鲁番","惠州","巴音郭楞","恩施","铜仁","黔南","西双版纳州","潜江","林芝","文昌","仙桃","神农架","和田","黔西南","果洛州","儋州","哈密","大理","东方","日喀则","兴安盟","昌江","澄迈","保亭","济源","五指山","阿拉尔","伊犁","临夏","海南州","琼海","石河子","昌都","五家渠","玉树州","博尔塔拉","东营","铜陵","黄南州","廊坊","嘉峪关","马鞍山","宁波","广安","中山","克孜勒苏","厦门","莱芜","鄂州","东莞","海口","鹤壁","六盘水","漯河","三亚","珠海","深圳","乌海","淮南","北海","双鸭山","襄阳","新余","汕头","克拉玛依","鹰潭","盘锦","镇江","石嘴山","嘉兴","铜川","焦作","芜湖","潮州","萍乡","红河","黄石","辽源","辽阳","枣庄","毕节","许昌","阳泉","自贡","遂宁","景德镇","营口","日照","莆田"]//CommonUtils.findAllCity() + def cities = ["鐧芥矙","闃垮潩宸�","鐢樺瓬宸�","闃垮嫆娉�","涓存钵","閭f洸","涓夋矙","鍠�浠�","鏄屽悏","杩簡宸�","鏅幢","寰峰畯宸�","婀樿タ","濉斿煄","鍑夊北宸�","灞槍","灞卞崡","娴疯タ宸�","闃挎媺鍠勭洘","涔愪笢","瀹氬畨","鎬掓睙宸�","榛勫北","鍥炬湪鑸掑厠","妤氶泟","涓撮珮","涔屽叞瀵熷竷","寤惰竟","鏂囧北宸�","閿℃灄閮嫆鐩�","闄垫按","澶╅棬","娣寳","榛斾笢鍗�","涓囧畞","婀樻江","娴峰寳宸�","鐞间腑","鍚愰瞾鐣�","鎯犲窞","宸撮煶閮","鎭╂柦","閾滀粊","榛斿崡","瑗垮弻鐗堢撼宸�","娼滄睙","鏋楄姖","鏂囨槍","浠欐","绁炲啘鏋�","鍜岀敯","榛旇タ鍗�","鏋滄礇宸�","鍎嬪窞","鍝堝瘑","澶х悊","涓滄柟","鏃ュ杸鍒�","鍏村畨鐩�","鏄屾睙","婢勮繄","淇濅涵","娴庢簮","浜旀寚灞�","闃挎媺灏�","浼婄妬","涓村","娴峰崡宸�","鐞兼捣","鐭虫渤瀛�","鏄岄兘","浜斿娓�","鐜夋爲宸�","鍗氬皵濉旀媺","涓滆惀","閾滈櫟","榛勫崡宸�","寤婂潑","鍢夊唱鍏�","椹瀺灞�","瀹佹尝","骞垮畨","涓北","鍏嬪瓬鍕掕嫃","鍘﹂棬","鑾辫姕","閯傚窞","涓滆帪","娴峰彛","楣ゅ","鍏洏姘�","婕渤","涓変簹","鐝犳捣","娣卞湷","涔屾捣","娣崡","鍖楁捣","鍙岄腑灞�","瑗勯槼","鏂颁綑","姹曞ご","鍏嬫媺鐜涗緷","楣版江","鐩橀敠","闀囨睙","鐭冲槾灞�","鍢夊叴","閾滃窛","鐒︿綔","鑺滄箹","娼窞","钀嶄埂","绾㈡渤","榛勭煶","杈芥簮","杈介槼","鏋e簞","姣曡妭","璁告槍","闃虫硥","鑷础","閬傚畞","鏅痉闀�","钀ュ彛","鏃ョ収","鑾嗙敯"]//CommonUtils.findAllCity() for (String city : cities) { println city BOUNDS_COLL.remove(new BasicDBObject('city', city)) @@ -34,10 +34,10 @@ class CityLatlngBox { void processByCity(String city) { DBObject latlng = LATLNG_COLL.findOne(new BasicDBObject('name', city)) if(latlng == null) { - println city + " -> 没有经纬度图形" + println city + " -> 娌℃湁缁忕含搴﹀浘褰�" return; } - //数据库的城市bounds,是按照西北和东南点进行定位 + //鏁版嵁搴撶殑鍩庡競bounds,鏄寜鐓цタ鍖楀拰涓滃崡鐐硅繘琛屽畾浣� def arrBD = latlng.get('bounds').replaceAll('\\[|\\]','').split(',') def arrQQ = latlng.get('bounds_qq').replaceAll('\\[|\\]','').split(',') def arrGD = latlng.get('bounds_gaode').replaceAll('\\[|\\]','').split(',') @@ -46,18 +46,18 @@ class CityLatlngBox { Bounds cityBoundQQ = new Bounds(arrQQ[0].toDouble(), arrQQ[3].toDouble(), arrQQ[2].toDouble(), arrQQ[1].toDouble()) Bounds cityBoundGD = new Bounds(arrGD[0].toDouble(), arrGD[3].toDouble(), arrGD[2].toDouble(), arrGD[1].toDouble()) - //将城市西南点作为起始点,从左至右,从下至上进行区块遍历 + //灏嗗煄甯傝タ鍗楃偣浣滀负璧峰鐐�,浠庡乏鑷冲彸锛屼粠涓嬭嚦涓婅繘琛屽尯鍧楅亶鍘� calcAndSaveBounds(city, cityBoundBD, cityBoundQQ, cityBoundGD, 1000); } /** - * 区块数据 - * @param cityBounds 城市bounds - * @param offset 偏移距离(米) - * @return 以row/column的方式返回Bounds数组 + * 鍖哄潡鏁版嵁 + * @param cityBounds 鍩庡競bounds + * @param offset 鍋忕Щ璺濈(绫�) + * @return 浠ow/column鐨勬柟寮忚繑鍥濨ounds鏁扮粍 */ void calcAndSaveBounds(String city, Bounds cityBoundBD, Bounds cityBoundQQ, Bounds cityBoundGD, int offset) { - //将城市西南点作为起始点,从左至右,从下至上进去区块遍历 + //灏嗗煄甯傝タ鍗楃偣浣滀负璧峰鐐�,浠庡乏鑷冲彸锛屼粠涓嬭嚦涓婅繘鍘诲尯鍧楅亶鍘� double seedLngBD = cityBoundBD.getWS()[0] double seedLatBD = cityBoundBD.getWS()[1] @@ -78,14 +78,14 @@ class CityLatlngBox { Bounds boundsGD = null; while (seedLngGD < cityBoundGD.getMaxLng()) { - double[] espBD = GeoUtils.getLatLon(seedLngBD, seedLatBD, offset, 90) // 右侧OFFSET处的经纬度 - double[] wnpBD = GeoUtils.getLatLon(seedLngBD, seedLatBD, offset, 360) // 上方OFFSET处的经纬度 + double[] espBD = GeoUtils.getLatLon(seedLngBD, seedLatBD, offset, 90) // 鍙充晶OFFSET澶勭殑缁忕含搴� + double[] wnpBD = GeoUtils.getLatLon(seedLngBD, seedLatBD, offset, 360) // 涓婃柟OFFSET澶勭殑缁忕含搴� - double[] espQQ = GeoUtils.getLatLon(seedLngQQ, seedLatQQ, offset, 90) // 右侧OFFSET处的经纬度 - double[] wnpQQ = GeoUtils.getLatLon(seedLngQQ, seedLatQQ, offset, 360) // 上方OFFSET处的经纬度 + double[] espQQ = GeoUtils.getLatLon(seedLngQQ, seedLatQQ, offset, 90) // 鍙充晶OFFSET澶勭殑缁忕含搴� + double[] wnpQQ = GeoUtils.getLatLon(seedLngQQ, seedLatQQ, offset, 360) // 涓婃柟OFFSET澶勭殑缁忕含搴� - double[] espGD = GeoUtils.getLatLon(seedLngGD, seedLatGD, offset, 90) // 右侧OFFSET处的经纬度 - double[] wnpGD = GeoUtils.getLatLon(seedLngGD, seedLatGD, offset, 360) // 上方OFFSET处的经纬度 + double[] espGD = GeoUtils.getLatLon(seedLngGD, seedLatGD, offset, 90) // 鍙充晶OFFSET澶勭殑缁忕含搴� + double[] wnpGD = GeoUtils.getLatLon(seedLngGD, seedLatGD, offset, 360) // 涓婃柟OFFSET澶勭殑缁忕含搴� boundsBD = new Bounds(wnpBD[0], espBD[1], espBD[0], wnpBD[1]) boundsQQ = new Bounds(wnpQQ[0], espQQ[1], espQQ[0], wnpQQ[1]) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/baidu/CommonProcessor.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/baidu/CommonProcessor.groovy index 388da54a1..ec862d310 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/baidu/CommonProcessor.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/baidu/CommonProcessor.groovy @@ -17,7 +17,7 @@ import org.apache.lucene.search.BooleanQuery import org.apache.lucene.search.TermQuery /** - * 功能说明: + * 鍔熻兘璇存槑: */ class CommonProcessor implements HouseProcessor { @@ -26,11 +26,11 @@ class CommonProcessor implements HouseProcessor { DBCollection DISTRICT_TAG = MongoUtils.getCollectionByName("fangjia_stat", "fsh.district_tag", "mongo.db.fangjia.com", 27017) DBCollection DISTRICT_FACILITYS = MongoUtils.getCollectionByName("fangjia", "district_facilitys", "mongo.db.fangjia.com", 27017) - private static final String DEFAULT_SELL_DES ="开发商原始装修的交房,采光时间长,高层视野无遮挡,现在租客住,但是保持的非常好,可以直接入住,家里非常干净,现在卖房是为了换房,业主人特别好,我们认识很长时间了,关系力足够。"; - private static final String DEFAULT_RENT_DES ="小区环境好,配套相对完善,交通方便,是您居住的不错选择"; - private static final String DEFAULT_OWNER_ATTITUDE="业主诚心出售此房,欢迎您看房,如需了解其他信息请与我联系。"; - private static final String DEFAULT_COMMUNITY_SUPPORT="小区地理位置好,配套设施齐全,交通便利,居民素质高。"; - private static final String DEFAULT_SERVICE_DESC="本人做房产多年,一直本着专业的房产知识,为您服务,我会在短的时间内帮您买好满意的房子,不让您错失任何好房子,更不让您每天为买房的事烦心,欢迎随时拨打我电话。"; + private static final String DEFAULT_SELL_DES ="寮�鍙戝晢鍘熷瑁呬慨鐨勪氦鎴匡紝閲囧厜鏃堕棿闀匡紝楂樺眰瑙嗛噹鏃犻伄鎸★紝鐜板湪绉熷浣忥紝浣嗘槸淇濇寔鐨勯潪甯稿ソ锛屽彲浠ョ洿鎺ュ叆浣忥紝瀹堕噷闈炲父骞插噣锛岀幇鍦ㄥ崠鎴挎槸涓轰簡鎹㈡埧锛屼笟涓讳汉鐗瑰埆濂斤紝鎴戜滑璁よ瘑寰堥暱鏃堕棿浜嗭紝鍏崇郴鍔涜冻澶熴��"; + private static final String DEFAULT_RENT_DES ="灏忓尯鐜濂斤紝閰嶅鐩稿瀹屽杽锛屼氦閫氭柟渚匡紝鏄偍灞呬綇鐨勪笉閿欓�夋嫨"; + private static final String DEFAULT_OWNER_ATTITUDE="涓氫富璇氬績鍑哄敭姝ゆ埧锛屾杩庢偍鐪嬫埧锛屽闇�浜嗚В鍏朵粬淇℃伅璇蜂笌鎴戣仈绯汇��"; + private static final String DEFAULT_COMMUNITY_SUPPORT="灏忓尯鍦扮悊浣嶇疆濂斤紝閰嶅璁炬柦榻愬叏锛屼氦閫氫究鍒╋紝灞呮皯绱犺川楂樸��"; + private static final String DEFAULT_SERVICE_DESC="鏈汉鍋氭埧浜у骞达紝涓�鐩存湰鐫�涓撲笟鐨勬埧浜х煡璇嗭紝涓烘偍鏈嶅姟锛屾垜浼氬湪鐭殑鏃堕棿鍐呭府鎮ㄤ拱濂芥弧鎰忕殑鎴垮瓙锛屼笉璁╂偍閿欏け浠讳綍濂芥埧瀛愶紝鏇翠笉璁╂偍姣忓ぉ涓轰拱鎴跨殑浜嬬儲蹇冿紝娆㈣繋闅忔椂鎷ㄦ墦鎴戠數璇濄��"; private static final Integer MAX_YEAR = 2900 private static final Integer MIN_YEAR = 2000 static def errorCount = 0; @@ -42,43 +42,43 @@ class CommonProcessor implements HouseProcessor { @Override Boolean process(BasicDBObject orgHouse, BasicDBObject destHouse) { - destHouse.put("nopAppId", "0vJQDft3Nn")//糯米合作方唯一标识 - destHouse.put("userId", "mlihmrmmohcab")//经纪人账号ID,注册接口生成并返回 - destHouse.put("tpHouseId", orgHouse._id)//合作方标识房源的唯一标识 + destHouse.put("nopAppId", "0vJQDft3Nn")//绯背鍚堜綔鏂瑰敮涓�鏍囪瘑 + destHouse.put("userId", "mlihmrmmohcab")//缁忕邯浜鸿处鍙稩D锛屾敞鍐屾帴鍙g敓鎴愬苟杩斿洖 + destHouse.put("tpHouseId", orgHouse._id)//鍚堜綔鏂规爣璇嗘埧婧愮殑鍞竴鏍囪瘑 def city = orgHouse.city def region = orgHouse.region def districtName = orgHouse.district_name BasicDBObject area = findAreaItem(city, region) if(area == null){ - println "【过滤】城市区域编码" - throw new Exception("无城市区域编码,business.area_item--city:"+city+",region:"+region); + println "銆愯繃婊ゃ�戝煄甯傚尯鍩熺紪鐮�" + throw new Exception("鏃犲煄甯傚尯鍩熺紪鐮�,business.area_item--city:"+city+",region:"+region); //return Boolean.FALSE } - destHouse.cityId = area.parent_area_id//百度的房源城市ID - destHouse.districtId = area.area_id//行政区id - destHouse.districtName = area.area_name//行政区名称 - destHouse.cityName = area.area_city//百度的房源城市名称 + destHouse.cityId = area.parent_area_id//鐧惧害鐨勬埧婧愬煄甯侷D + destHouse.districtId = area.area_id//琛屾斂鍖篿d + destHouse.districtName = area.area_name//琛屾斂鍖哄悕绉� + destHouse.cityName = area.area_city//鐧惧害鐨勬埧婧愬煄甯傚悕绉� BasicDBObject seaweed = findSeaweed(city, region, districtName) if(seaweed == null){ - println "【过滤】小区找不到,city:"+city+",region:"+region+",district_name:"+districtName - throw new Exception("无小区,fangjia.seaweed---city:"+city+",region:"+region+",district_name:"+districtName); + println "銆愯繃婊ゃ�戝皬鍖烘壘涓嶅埌,city:"+city+",region:"+region+",district_name:"+districtName + throw new Exception("鏃犲皬鍖�,fangjia.seaweed---city:"+city+",region:"+region+",district_name:"+districtName); //return Boolean.FALSE } - destHouse.oid = seaweed._id.toString()//合作方自己的小区id - destHouse.poiName = seaweed.name//合作方小区名称 + destHouse.oid = seaweed._id.toString()//鍚堜綔鏂硅嚜宸辩殑灏忓尯id + destHouse.poiName = seaweed.name//鍚堜綔鏂瑰皬鍖哄悕绉� if(seaweed.lng2 && seaweed.lng2 != 0){ destHouse.longitude = seaweed.lng2/10000000000f destHouse.latitude = seaweed.lat2/10000000000f } if(!destHouse.longitude||!destHouse.latitude){ - throw new Exception("无经纬度,fangjia.seaweed---longitude:"+destHouse.longitude+",latitude:"+destHouse.latitude); + throw new Exception("鏃犵粡绾害,fangjia.seaweed---longitude:"+destHouse.longitude+",latitude:"+destHouse.latitude); } destHouse.address = seaweed.address - destHouse.tags = findDistrictTags(seaweed.city, seaweed.region, seaweed.name)//小区标签 + destHouse.tags = findDistrictTags(seaweed.city, seaweed.region, seaweed.name)//灏忓尯鏍囩 destHouse.propertyCompany = seaweed.estate_company destHouse.developers = seaweed.developer - destHouse.tpHouseType = seaweed.estate_type2//住宅类型 + destHouse.tpHouseType = seaweed.estate_type2//浣忓畢绫诲瀷 destHouse.buildingYear = seaweed.property_life destHouse.commuDescription = seaweed.description destHouse.school = seaweed.schools @@ -110,25 +110,25 @@ class CommonProcessor implements HouseProcessor { if(!destHouse.bathRoomNum){ destHouse.bathRoomNum=0; } - //处理厅卧卫不能同时为0 + //澶勭悊鍘呭崸鍗笉鑳藉悓鏃朵负0 if(destHouse.bedRoomNum==0&&destHouse.livingRoomNum==0&&destHouse.bathRoomNum==0){ destHouse.bedRoomNum=1; } - destHouse.decoration = getFitmentCode(orgHouse.fitment)//装修程度,如精装修,简装 - destHouse.roomOrientation = getDirectionCode(orgHouse.direction)//房屋朝向,如朝南 + destHouse.decoration = getFitmentCode(orgHouse.fitment)//瑁呬慨绋嬪害锛屽绮捐淇紝绠�瑁� + destHouse.roomOrientation = getDirectionCode(orgHouse.direction)//鎴垮眿鏈濆悜锛屽鏈濆崡 if(!destHouse.roomOrientation){ - destHouse.roomOrientation = 10002;//默认朝南 + destHouse.roomOrientation = 10002;//榛樿鏈濆崡 } destHouse.totalFloor = orgHouse.height if(orgHouse.height){ String floorInfo = orgHouse.floor_info if(orgHouse.floor){ destHouse.floor = orgHouse.floor - }else if(floorInfo && floorInfo.contains("高")){ + }else if(floorInfo && floorInfo.contains("楂�")){ destHouse.floor = orgHouse.height - }else if(floorInfo && floorInfo.contains("中")){ + }else if(floorInfo && floorInfo.contains("涓�")){ destHouse.floor = (int)(orgHouse.height/2) - }else if(floorInfo && floorInfo.contains("低")){ + }else if(floorInfo && floorInfo.contains("浣�")){ destHouse.floor = 1 } } @@ -136,99 +136,99 @@ class CommonProcessor implements HouseProcessor { destHouse.floor = 1 } if(destHouse.floor == null || destHouse.totalFloor == null ){ - println "【过滤】所在楼层与总楼层" + println "銆愯繃婊ゃ�戞墍鍦ㄦゼ灞備笌鎬绘ゼ灞�" //return Boolean.FALSE - throw new Exception("无总楼层,totalFloor:"+orgHouse.height); + throw new Exception("鏃犳�绘ゼ灞傦紝totalFloor:"+orgHouse.height); } destHouse.area = orgHouse.area destHouse.title = orgHouse.name //destHouse.cat = orgHouse.cat - String default_title = destHouse.poiName + destHouse.bedRoomNum+"室"+destHouse.livingRoomNum+"厅"+destHouse.bathRoomNum+"卫"; + String default_title = destHouse.poiName + destHouse.bedRoomNum+"瀹�"+destHouse.livingRoomNum+"鍘�"+destHouse.bathRoomNum+"鍗�"; if(orgHouse.cat == "sell"){ - //二手房源才有此字段 + //浜屾墜鎴挎簮鎵嶆湁姝ゅ瓧娈� destHouse.houseDesc = fromatDes(DataUtil.removeHtml(orgHouse.description), 20, 300, DEFAULT_SELL_DES) - destHouse.buildingNumber = 1//楼号 - destHouse.buildingType = 100001//楼号类型,如栋、幢 - destHouse.unitNumber =1//单元号 - destHouse.unitType = 110001//单元号类型 - destHouse.roomNumber = destHouse.floor+"01";//卧室号 - destHouse.ownerAttitude=fromatDes(DataUtil.removeHtml(orgHouse.owner_attitude), 20, 300, DEFAULT_OWNER_ATTITUDE)//业主心态 - destHouse.communitySupport = fromatDes(DataUtil.removeHtml(orgHouse.community_support), 20, 300, DEFAULT_COMMUNITY_SUPPORT)//社区配套 - destHouse.serviceDesc = fromatDes(DataUtil.removeHtml(orgHouse.service_desc), 20, 300, DEFAULT_SERVICE_DESC)//服务介绍 + destHouse.buildingNumber = 1//妤煎彿 + destHouse.buildingType = 100001//妤煎彿绫诲瀷锛屽鏍嬨�佸耿 + destHouse.unitNumber =1//鍗曞厓鍙� + destHouse.unitType = 110001//鍗曞厓鍙风被鍨� + destHouse.roomNumber = destHouse.floor+"01";//鍗у鍙� + destHouse.ownerAttitude=fromatDes(DataUtil.removeHtml(orgHouse.owner_attitude), 20, 300, DEFAULT_OWNER_ATTITUDE)//涓氫富蹇冩�� + destHouse.communitySupport = fromatDes(DataUtil.removeHtml(orgHouse.community_support), 20, 300, DEFAULT_COMMUNITY_SUPPORT)//绀惧尯閰嶅 + destHouse.serviceDesc = fromatDes(DataUtil.removeHtml(orgHouse.service_desc), 20, 300, DEFAULT_SERVICE_DESC)//鏈嶅姟浠嬬粛 destHouse.price = (int)(orgHouse.total_price/10000) destHouse.houseType = getHouseTypeCode(StringUtils.isBlank(orgHouse.estate_type.toString())?seaweed.estate_type2:orgHouse.estate_type) destHouse.buildYear = getBuildDate(seaweed) if(!destHouse.buildYear){ - throw new Exception("无建筑年代,buildYear:"+destHouse.buildYear); + throw new Exception("鏃犲缓绛戝勾浠o紝buildYear:"+destHouse.buildYear); } destHouse.buildYear = destHouse.buildYear.toString(); if(destHouse.buildYear.length()>4){ destHouse.buildYear = destHouse.buildYear.substring(0, 4); } - destHouse.buyYear = 90003//房屋已购买时间,例如满5年、满两年、不满两年----待定 - destHouse.onlyOne = 1//是否唯一住房,0不是1是----待定 - destHouse.commissionRate= "0.02"//佣金比例(0-0.05之间) - destHouse.downPayment = "" + destHouse.price*0.3;//首付金额 + destHouse.buyYear = 90003//鎴垮眿宸茶喘涔版椂闂达紝渚嬪婊�5骞淬�佹弧涓ゅ勾銆佷笉婊′袱骞�----寰呭畾 + destHouse.onlyOne = 1//鏄惁鍞竴浣忔埧锛�0涓嶆槸1鏄�----寰呭畾 + destHouse.commissionRate= "0.02"//浣i噾姣斾緥锛�0-0.05涔嬮棿锛� + destHouse.downPayment = "" + destHouse.price*0.3;//棣栦粯閲戦 if(!destHouse.ownerAttitude || !destHouse.communitySupport || !destHouse.serviceDesc){ - println "【过滤】小区环境" + println "銆愯繃婊ゃ�戝皬鍖虹幆澧�" //return Boolean.FALSE -// throw new Exception("无小区环境,ownerAttitude:"+orgHouse.owner_attitude+",communitySupport:" +// throw new Exception("鏃犲皬鍖虹幆澧冿紝ownerAttitude:"+orgHouse.owner_attitude+",communitySupport:" // +orgHouse.community_support+",serviceDesc:"+orgHouse.service_desc); if(!destHouse.ownerAttitude){ - destHouse.ownerAttitude="业主诚心出售此房,欢迎您看房,如需了解其他信息请与我联系。"; + destHouse.ownerAttitude="涓氫富璇氬績鍑哄敭姝ゆ埧锛屾杩庢偍鐪嬫埧锛屽闇�浜嗚В鍏朵粬淇℃伅璇蜂笌鎴戣仈绯汇��"; } if(!destHouse.communitySupport){ - destHouse.communitySupport="小区地理位置好,配套设施齐全,交通便利,居民素质高。"; + destHouse.communitySupport="灏忓尯鍦扮悊浣嶇疆濂斤紝閰嶅璁炬柦榻愬叏锛屼氦閫氫究鍒╋紝灞呮皯绱犺川楂樸��"; } if(!destHouse.serviceDesc){ - destHouse.serviceDesc="本人做房产多年,一直本着专业的房产知识,为您服务,我会在短的时间内帮您买好满意的房子,不让您错失任何好房子,更不让您每天为买房的事烦心,欢迎随时拨打我电话。"; + destHouse.serviceDesc="鏈汉鍋氭埧浜у骞达紝涓�鐩存湰鐫�涓撲笟鐨勬埧浜х煡璇嗭紝涓烘偍鏈嶅姟锛屾垜浼氬湪鐭殑鏃堕棿鍐呭府鎮ㄤ拱濂芥弧鎰忕殑鎴垮瓙锛屼笉璁╂偍閿欏け浠讳綍濂芥埧瀛愶紝鏇翠笉璁╂偍姣忓ぉ涓轰拱鎴跨殑浜嬬儲蹇冿紝娆㈣繋闅忔椂鎷ㄦ墦鎴戠數璇濄��"; } } destHouse.title = fromatDes(DataUtil.removeHtml(destHouse.title), 8, 60, default_title) }else if(orgHouse.cat == "rent"){ //TODO 2 - destHouse.rentType = getRentCode(orgHouse.rent_type);//租房方式,0整租1合租 + destHouse.rentType = getRentCode(orgHouse.rent_type);//绉熸埧鏂瑰紡锛�0鏁寸1鍚堢 if(!destHouse.rentType){ - println "【过滤】租房方式,rent_type:"+orgHouse.rent_type + println "銆愯繃婊ゃ�戠鎴挎柟寮�,rent_type:"+orgHouse.rent_type destHouse.rentType = 1 //return Boolean.FALSE - //throw new Exception("无租房方式,rentType:"+orgHouse.rent_type); + //throw new Exception("鏃犵鎴挎柟寮忥紝rentType:"+orgHouse.rent_type); } - destHouse.payType = getPayCode(orgHouse.pay_type); //付款方式,如押一付一,存储元数据id + destHouse.payType = getPayCode(orgHouse.pay_type); //浠樻鏂瑰紡锛屽鎶间竴浠樹竴锛屽瓨鍌ㄥ厓鏁版嵁id if(!destHouse.payType){ - println "【过滤】付款方式,pay_type:"+orgHouse.pay_type + println "銆愯繃婊ゃ�戜粯娆炬柟寮�,pay_type:"+orgHouse.pay_type destHouse.payType = 30003 } - destHouse.roomType = getRoomTypeCode(destHouse.rentType, destHouse.title, orgHouse.description);//房间类型,合租时该字段必传,主要存储主卧、次卧等房间类型id. eg - // 入住时间为空, 默认当前日期 + destHouse.roomType = getRoomTypeCode(destHouse.rentType, destHouse.title, orgHouse.description);//鎴块棿绫诲瀷锛屽悎绉熸椂璇ュ瓧娈靛繀浼狅紝涓昏瀛樺偍涓诲崸銆佹鍗х瓑鎴块棿绫诲瀷id. eg + // 鍏ヤ綇鏃堕棿涓虹┖, 榛樿褰撳墠鏃ユ湡 def checkTime = DateUtil.formatToYYYYMMDD(new Date()) def checkTime_ = DateUtil.convertToStandardDate(MAX_YEAR, MIN_YEAR, orgHouse.check_in_time) if(!checkTime_){ - //格式不正确 - destHouse.checkInTime = checkTime//可入住时间 + //鏍煎紡涓嶆纭� + destHouse.checkInTime = checkTime//鍙叆浣忔椂闂� }else { - destHouse.checkInTime = DateUtil.formatToYYYYMMDD(checkTime_)//可入住时间 + destHouse.checkInTime = DateUtil.formatToYYYYMMDD(checkTime_)//鍙叆浣忔椂闂� } - destHouse.rentPrice = orgHouse.total_price//月租金,单位元 - //租金默认物业费 - destHouse.houseChargeDetail = [70001]//租金包含项,如水电费、宽带费,存储json数组 - //先赋值 在替换 + destHouse.rentPrice = orgHouse.total_price//鏈堢閲戯紝鍗曚綅鍏� + //绉熼噾榛樿鐗╀笟璐� + destHouse.houseChargeDetail = [70001]//绉熼噾鍖呭惈椤癸紝濡傛按鐢佃垂銆佸甯﹁垂锛屽瓨鍌╦son鏁扮粍 + //鍏堣祴鍊� 鍦ㄦ浛鎹� destHouse.houseAllocation = [40001, 40002, 40003] if(StringUtils.isNotEmpty(orgHouse.house_allocation) && !orgHouse.house_allocation.equals("[]")){ - destHouse.houseAllocation = getHouseAllocationCode(orgHouse.house_allocation); //房屋配置,如冰箱、洗衣机等,存储json数组 + destHouse.houseAllocation = getHouseAllocationCode(orgHouse.house_allocation); //鎴垮眿閰嶇疆锛屽鍐扮銆佹礂琛f満绛夛紝瀛樺偍json鏁扮粍 } destHouse.houseRequire = [60004] if(StringUtils.isNotEmpty(orgHouse.houseRequire) && !orgHouse.houseRequire.equals("[]")){ - destHouse.houseRequire = getHouseRequireCode(orgHouse.houseRequire); //房屋要求,如仅限女生等,存储json数组 + destHouse.houseRequire = getHouseRequireCode(orgHouse.houseRequire); //鎴垮眿瑕佹眰锛屽浠呴檺濂崇敓绛夛紝瀛樺偍json鏁扮粍 } destHouse.houseAdvantage = [50001, 50002] if(StringUtils.isNotEmpty(orgHouse.houseAdvantage) && !orgHouse.houseAdvantage.equals("[]")){ - destHouse.houseAdvantage = getHouseAdvantageCode(orgHouse.houseAdvantage); //房屋亮点,如电梯,南北通透等,存储json数组 + destHouse.houseAdvantage = getHouseAdvantageCode(orgHouse.houseAdvantage); //鎴垮眿浜偣锛屽鐢垫锛屽崡鍖楅�氶�忕瓑锛屽瓨鍌╦son鏁扮粍 } - //描述信息赋值 + //鎻忚堪淇℃伅璧嬪�� destHouse.description = fromatDes(DataUtil.removeHtml(orgHouse.description), 20, 300, DEFAULT_RENT_DES) - destHouse.title = fromatDes(DataUtil.removeHtml(destHouse.title), 8, 60, destHouse.rentType == 1?"合租":"整租" +default_title) + destHouse.title = fromatDes(DataUtil.removeHtml(destHouse.title), 8, 60, destHouse.rentType == 1?"鍚堢":"鏁寸" +default_title) } destHouse.title = fromatDes(DataUtil.removeHtml(destHouse.title), 8, 60, default_title) return Boolean.TRUE @@ -250,28 +250,28 @@ class CommonProcessor implements HouseProcessor { private def getHouseAdvantageCode(def s){ def code = [] if(s) { - if (s.contains("随时看房")) { + if (s.contains("闅忔椂鐪嬫埧")) { code << 50001 } - if (s.contains("南北通透")) { + if (s.contains("鍗楀寳閫氶��")) { code << 50002 } - if (s.contains("可短租")) { + if (s.contains("鍙煭绉�")) { code << 50004 } - if (s.contains("首次出租")) { + if (s.contains("棣栨鍑虹")) { code << 50005 } - if (s.contains("电梯")) { + if (s.contains("鐢垫")) { code << 50006 } - if (s.contains("阳台")) { + if (s.contains("闃冲彴")) { code << 50007 } - if (s.contains("独立卫生间")) { + if (s.contains("鐙珛鍗敓闂�")) { code << 50008 } - if (s.contains("集中取暖")) { + if (s.contains("闆嗕腑鍙栨殩")) { code << 50003 } } @@ -281,22 +281,22 @@ class CommonProcessor implements HouseProcessor { private def getHouseRequireCode(def s){ def code = [] if(s){ - if(s.contains("中介勿扰")){ + if(s.contains("涓粙鍕挎壈")){ code << 60004 } - if(s.contains("禁止宠物")){ + if(s.contains("绂佹瀹犵墿")){ code << 60002 } - if(s.contains("租户稳定")){ + if(s.contains("绉熸埛绋冲畾")){ code << 60003 } - if(s.contains("半年起租")){ + if(s.contains("鍗婂勾璧风")){ code << 60005 } - if(s.contains("一年起租")){ + if(s.contains("涓�骞磋捣绉�")){ code << 60006 } - if(s.contains("只限女生")){ + if(s.contains("鍙檺濂崇敓")){ code << 60001 } } @@ -306,34 +306,34 @@ class CommonProcessor implements HouseProcessor { private def getHouseAllocationCode(def s){ def code = []; if(s){ - if(s.contains("床")){ + if(s.contains("搴�")){ code << 40001 } - if(s.contains("衣柜")){ + if(s.contains("琛f煖")){ code << 40002 } - if(s.contains("沙发")){ + if(s.contains("娌欏彂")){ code << 40003 } - if(s.contains("电视")){ + if(s.contains("鐢佃")){ code << 40004 } - if(s.contains("冰箱")){ + if(s.contains("鍐扮")){ code << 40005 } - if(s.contains("洗衣机")){ + if(s.contains("娲楄。鏈�")){ code << 40006 } - if(s.contains("空调")){ + if(s.contains("绌鸿皟")){ code << 40007 } - if(s.contains("热水器")){ + if(s.contains("鐑按鍣�")){ code << 40008 } - if(s.contains("宽带")){ + if(s.contains("瀹藉甫")){ code << 40009 } - if(s.contains("暖气")){ + if(s.contains("鏆栨皵")){ code << 40010 } } @@ -343,11 +343,11 @@ class CommonProcessor implements HouseProcessor { private def getRoomTypeCode(def typeCode, def title, def description){ def code = ""; if(typeCode==1){ - if(title?.contains("主卧") || description?.contains("主卧")){ + if(title?.contains("涓诲崸") || description?.contains("涓诲崸")){ code = "80001" - }else if(title?.contains("次卧") || description?.contains("次卧") ){ + }else if(title?.contains("娆″崸") || description?.contains("娆″崸") ){ code = "80002" - }else if(title?.contains("隔断") || description?.contains("隔断") ){ + }else if(title?.contains("闅旀柇") || description?.contains("闅旀柇") ){ code = "80003" } else{ code = "80001" @@ -359,31 +359,31 @@ class CommonProcessor implements HouseProcessor { private Integer getPayCode(def s){ def code = null if(s){ - if(s.contains("押1付1")){ + if(s.contains("鎶�1浠�1")){ code = 30001 - }else if(s.contains("押1付2")){ + }else if(s.contains("鎶�1浠�2")){ code = 30002 - }else if(s.contains("押1付3")){ + }else if(s.contains("鎶�1浠�3")){ code = 30003 - }else if(s.contains("押2付1")){ + }else if(s.contains("鎶�2浠�1")){ code = 30004 - }else if(s.contains("押2付2")){ + }else if(s.contains("鎶�2浠�2")){ code = 30005 - }else if(s.contains("押2付3")){ + }else if(s.contains("鎶�2浠�3")){ code = 30006 - }else if(s.contains("半年付押1")){ + }else if(s.contains("鍗婂勾浠樻娂1")){ code = 30009 - }else if(s.contains("半年付不押")){ + }else if(s.contains("鍗婂勾浠樹笉鎶�")){ code = 30010 - }else if(s.contains("年付不押")){ + }else if(s.contains("骞翠粯涓嶆娂")){ code = 30011 - }else if(s.contains("年付押1")){ + }else if(s.contains("骞翠粯鎶�1")){ code = 30012 - }else if(s.contains("半年付")){ + }else if(s.contains("鍗婂勾浠�")){ code = 30007 - }else if(s.contains("半年")){ + }else if(s.contains("鍗婂勾")){ code = 30008 - }else if(s.contains("面议")){ + }else if(s.contains("闈㈣")){ code = 30013 } } @@ -391,9 +391,9 @@ class CommonProcessor implements HouseProcessor { } private Integer getRentCode(def rentType){ if(rentType){ - if(rentType.contains("整租")){ + if(rentType.contains("鏁寸")){ return 0; - }else if(rentType.contains("合租")){ + }else if(rentType.contains("鍚堢")){ return 1; } } @@ -404,13 +404,13 @@ class CommonProcessor implements HouseProcessor { if(StringUtils.isBlank(houseType)){ return 120006 } - if(houseType.contains("公寓")){ + if(houseType.contains("鍏瘬")){ return 120002 - }else if(houseType.contains("别墅")){ + }else if(houseType.contains("鍒")){ return 120003 - }else if(houseType.contains("平房")){ + }else if(houseType.contains("骞虫埧")){ return 120004 - }else if(houseType.contains("四合院")){ + }else if(houseType.contains("鍥涘悎闄�")){ return 120005 } return 120006 @@ -442,13 +442,13 @@ class CommonProcessor implements HouseProcessor { private Integer getFitmentCode(String fitment){ fitment = HouseValidator.fetchFitmentInfo(fitment) - if("毛坯" == fitment){ + if("姣涘澂" == fitment){ return 20001 - }else if("简装" == fitment){ + }else if("绠�瑁�" == fitment){ return 20002 - }else if("精装" == fitment){ + }else if("绮捐" == fitment){ return 20004 - }else if("豪装" == fitment){ + }else if("璞" == fitment){ return 20005 }else{ return 20003 @@ -467,7 +467,7 @@ class CommonProcessor implements HouseProcessor { private Integer getDirectionCode(String direction){ direction = HouseValidator.fetchDirectionInfo(direction) if(direction){ - return HOUSE_ITEM.findOne(new BasicDBObject("item_name", "朝向").append("item_value", direction))?.item_key + return HOUSE_ITEM.findOne(new BasicDBObject("item_name", "鏈濆悜").append("item_value", direction))?.item_key } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/baidu/FangHouseProcessor.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/baidu/FangHouseProcessor.groovy index 0242c497a..1f57a659b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/baidu/FangHouseProcessor.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/baidu/FangHouseProcessor.groovy @@ -12,7 +12,7 @@ import org.apache.commons.lang.StringUtils import java.util.regex.Pattern /** - * 功能说明: + * 鍔熻兘璇存槑: */ class FangHouseProcessor implements HouseProcessor { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/baidu/HousePicsEncryptProcessor.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/baidu/HousePicsEncryptProcessor.groovy index 756f45ab6..260f7c7cc 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/baidu/HousePicsEncryptProcessor.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/baidu/HousePicsEncryptProcessor.groovy @@ -8,7 +8,7 @@ import org.apache.http.client.methods.HttpGet import java.util.HashSet /** - * 功能说明: + * 鍔熻兘璇存槑: */ class HousePicsEncryptProcessor implements HouseProcessor { @@ -31,7 +31,7 @@ class HousePicsEncryptProcessor implements HouseProcessor { def isTop = 1 def pics = [] if(!destHouse.pics){ - throw new Exception("缺少图片"); + throw new Exception("缂哄皯鍥剧墖"); } def urls = [] for(String picUrl : destHouse.pics){ @@ -59,7 +59,7 @@ class HousePicsEncryptProcessor implements HouseProcessor { } } if(pics.size() < 3){ - throw new Exception("图片少于3张图片"); + throw new Exception("鍥剧墖灏戜簬3寮犲浘鐗�"); } JSONObject picJson = new JSONObject() picJson.put("data", pics) @@ -67,7 +67,7 @@ class HousePicsEncryptProcessor implements HouseProcessor { println(picJson.toString()) return Boolean.TRUE }catch(Exception e){ - throw new Exception("图片处理失败,error:"+e.getMessage()); + throw new Exception("鍥剧墖澶勭悊澶辫触,error:"+e.getMessage()); } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/baidu/MainCase.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/baidu/MainCase.groovy index 51924f8ab..bf8f23b2e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/baidu/MainCase.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/baidu/MainCase.groovy @@ -15,10 +15,10 @@ class MainCase { } static void fangSellPush(){ - //第一步,创建GalaxyClient + //绗竴姝ワ紝鍒涘缓GalaxyClient GalaxyClient client = new DefaultGalaxyClient("0vJQDft3Nn", "ff347a0344f794bfc4f1132f26edf9cc", "http://nop.nuomi.com/nop/server/rest"); - //第二步,创建一个接口请求 + //绗簩姝ワ紝鍒涘缓涓�涓帴鍙h姹� GalaxyRequest request = new GalaxyRequest(); request.setApiMethodName("bnuoapi.fang.createOrUpdate") request.putOtherTextParam("nopAppId", '0vJQDft3Nn'); @@ -26,21 +26,21 @@ class MainCase { request.putOtherTextParam("tpHouseId", '5b5922b2047e1b974c1a4961'); request.putOtherTextParam("cityId", '100010000'); request.putOtherTextParam("districtId", '394'); - request.putOtherTextParam("districtName", '东城区'); - request.putOtherTextParam("cityName", '北京市'); + request.putOtherTextParam("districtName", '涓滃煄鍖�'); + request.putOtherTextParam("cityName", '鍖椾含甯�'); request.putOtherTextParam("oid", '4e648f1e6652ddf0fd3ab73f'); - request.putOtherTextParam("poiName", '新景家园'); + request.putOtherTextParam("poiName", '鏂版櫙瀹跺洯'); request.putOtherTextParam("longitude", '116.43347'); request.putOtherTextParam("latitude", '39.901688'); - request.putOtherTextParam("address", '西花市大街8号'); - request.putOtherTextParam("tags", '近地铁'); - request.putOtherTextParam("propertyCompany", '北京新世界物业管理有限公司'); - request.putOtherTextParam("developers", '北京崇文·新世界房地产发展有限公司'); - request.putOtherTextParam("tpHouseType", '普通住宅'); - request.putOtherTextParam("buildingYear", '70年'); + request.putOtherTextParam("address", '瑗胯姳甯傚ぇ琛�8鍙�'); + request.putOtherTextParam("tags", '杩戝湴閾�'); + request.putOtherTextParam("propertyCompany", '鍖椾含鏂颁笘鐣岀墿涓氱鐞嗘湁闄愬叕鍙�'); + request.putOtherTextParam("developers", '鍖椾含宕囨枃路鏂颁笘鐣屾埧鍦颁骇鍙戝睍鏈夐檺鍏徃'); + request.putOtherTextParam("tpHouseType", '鏅�氫綇瀹�'); + request.putOtherTextParam("buildingYear", '70骞�'); request.putOtherTextParam("commuDescription", '111111111111111111111111111111111111111');//TODO 2 -// request.putOtherTextParam("school", '[ "北京市东城区新景小学"]'); - request.putOtherTextParam("contactPeople", '池历伟'); +// request.putOtherTextParam("school", '[ "鍖椾含甯備笢鍩庡尯鏂版櫙灏忓"]'); + request.putOtherTextParam("contactPeople", '姹犲巻浼�'); request.putOtherTextParam("bedRoomNum", '1'); request.putOtherTextParam("livingRoomNum", '1'); request.putOtherTextParam("bathRoomNum", '1'); @@ -49,7 +49,7 @@ class MainCase { request.putOtherTextParam("totalFloor", '16'); request.putOtherTextParam("floor", '2'); request.putOtherTextParam("area", '58.05'); - request.putOtherTextParam("title", '两梯四户有钥匙两梯四户有钥匙'); + request.putOtherTextParam("title", '涓ゆ鍥涙埛鏈夐挜鍖欎袱姊洓鎴锋湁閽ュ寵'); request.putOtherTextParam("houseDesc", """111111111111111111111111111111111111111""");//TODO 1 request.putOtherTextParam("cat", 'sell'); request.putOtherTextParam("buildingNumber", '1'); @@ -57,8 +57,8 @@ class MainCase { request.putOtherTextParam("unitNumber", '1'); request.putOtherTextParam("unitType", '110001'); request.putOtherTextParam("roomNumber", '201'); - request.putOtherTextParam("ownerAttitude", '欢迎您看业主诚心出售此房房业主诚心出售此房业主诚心出售此房业主诚心出售此房'); - request.putOtherTextParam("communitySupport", '小区地理位置好配套设施齐全交通便利居民素质高'); + request.putOtherTextParam("ownerAttitude", '娆㈣繋鎮ㄧ湅涓氫富璇氬績鍑哄敭姝ゆ埧鎴夸笟涓昏瘹蹇冨嚭鍞鎴夸笟涓昏瘹蹇冨嚭鍞鎴夸笟涓昏瘹蹇冨嚭鍞鎴�'); + request.putOtherTextParam("communitySupport", '灏忓尯鍦扮悊浣嶇疆濂介厤濂楄鏂介綈鍏ㄤ氦閫氫究鍒╁眳姘戠礌璐ㄩ珮'); request.putOtherTextParam("serviceDesc", '111111111111111111111111111111111111111'); request.putOtherTextParam("price", '650'); request.putOtherTextParam("houseType", '120006'); @@ -68,7 +68,7 @@ class MainCase { request.putOtherTextParam("commissionRate", '0.02'); request.putOtherTextParam("downPayment", '195.0'); request.putOtherTextParam("tpDetailImageIds", '{"data":[{"busType":1,"imageType":1,"isTop":1,"imageUrl":"https://pic1.ajkimg.com/display/anjuke/59f66a-%E9%AA%84%E9%98%B3%E5%9C%B0%E4%BA%A7/973c41421712669ebea281b88240d2e2-599x450.jpg?t=1"},{"busType":1,"imageType":1,"isTop":0,"imageUrl":"https://pic1.ajkimg.com/display/anjuke/b3efc2-%E9%AA%84%E9%98%B3%E5%9C%B0%E4%BA%A7/8e4f134337ec269977b8971c02b2baa2-599x450.jpg?t=1"},{"busType":1,"imageType":1,"isTop":0,"imageUrl":"https://pic1.ajkimg.com/display/anjuke/6fb74b-%E9%AA%84%E9%98%B3%E5%9C%B0%E4%BA%A7/1de3361db73beded1b73f7362819a295-599x450.jpg?t=1"},{"busType":1,"imageType":1,"isTop":0,"imageUrl":"https://pic1.ajkimg.com/display/anjuke/130b53-%E9%AA%84%E9%98%B3%E5%9C%B0%E4%BA%A7/cab5e115b29d51889f7aa4aa8d11f3b8-599x450.jpg?t=1"},{"busType":1,"imageType":1,"isTop":0,"imageUrl":"https://pic1.ajkimg.com/display/anjuke/91a34a-%E9%AA%84%E9%98%B3%E5%9C%B0%E4%BA%A7/62b7c004384334c9a815e3d8e0c1c2c1-599x450.jpg?t=1"},{"busType":1,"imageType":1,"isTop":0,"imageUrl":"https://pic1.ajkimg.com/display/anjuke/eb94a7-%E9%AA%84%E9%98%B3%E5%9C%B0%E4%BA%A7/061153ff76e3d6a6e0bdc2265da0d17d-599x450.jpg?t=1"},{"busType":1,"imageType":1,"isTop":0,"imageUrl":"https://pic1.ajkimg.com/display/anjuke/4653a1-%E9%AA%84%E9%98%B3%E5%9C%B0%E4%BA%A7/1624a39080d3de36984214a711f68260-599x450.jpg?t=1"},{"busType":1,"imageType":1,"isTop":0,"imageUrl":"https://pic1.ajkimg.com/display/anjuke/8dd50b-%E9%AA%84%E9%98%B3%E5%9C%B0%E4%BA%A7/87ac673fb03e664b81dc643edc540e23-599x450.jpg?t=1"},{"busType":1,"imageType":1,"isTop":0,"imageUrl":"https://pic1.ajkimg.com/display/anjuke/a962a7-%E9%AA%84%E9%98%B3%E5%9C%B0%E4%BA%A7/4cbbc736b39a5421f015d909e55fb81c-599x450.jpg?t=1"}]}'); - //第三步,走你 + //绗笁姝ワ紝璧颁綘 try { client.setReadTimeout(50000) client.setConnectTimeout(100000) @@ -80,26 +80,26 @@ class MainCase { } static void fangRentPush(){ - //第一步,创建GalaxyClient + //绗竴姝ワ紝鍒涘缓GalaxyClient GalaxyClient client = new DefaultGalaxyClient("0vJQDft3Nn", "ff347a0344f794bfc4f1132f26edf9cc", "http://nop.nuomi.com/nop/server/rest"); - //第二步,创建一个接口请求 + //绗簩姝ワ紝鍒涘缓涓�涓帴鍙h姹� GalaxyRequest request = new GalaxyRequest(); request.setApiMethodName("bnuoapi.fang.rent") request.putOtherTextParam("nopAppId", "0vJQDft3Nn"); request.putOtherTextParam("userId", "mlilmilpoicab"); request.putOtherTextParam("tpHouseId", "5b51a5d1047e2555a4a67cc7"); request.putOtherTextParam("cityId", "2400030000"); - request.putOtherTextParam("cityName", "萍乡市"); + request.putOtherTextParam("cityName", "钀嶄埂甯�"); request.putOtherTextParam("districtId", "4055"); - request.putOtherTextParam("districtName", "安源区"); + request.putOtherTextParam("districtName", "瀹夋簮鍖�"); request.putOtherTextParam("oid", "57d611dd047e78a4461c3d25"); - request.putOtherTextParam("poiName", "泰安小区"); + request.putOtherTextParam("poiName", "娉板畨灏忓尯"); request.putOtherTextParam("longitude", "113.858185"); request.putOtherTextParam("latitude", "27.645325"); - request.putOtherTextParam("address", "山下路72号"); - request.putOtherTextParam("tags", "公交多 买菜做饭 商超便利 爱逛街 在外面吃 近医疗 近幼儿园 近小学 近中学"); - request.putOtherTextParam("tpHouseType", "普通住宅"); + request.putOtherTextParam("address", "灞变笅璺�72鍙�"); + request.putOtherTextParam("tags", "鍏氦澶� 涔拌彍鍋氶キ 鍟嗚秴渚垮埄 鐖遍�涜 鍦ㄥ闈㈠悆 杩戝尰鐤� 杩戝辜鍎垮洯 杩戝皬瀛� 杩戜腑瀛�"); + request.putOtherTextParam("tpHouseType", "鏅�氫綇瀹�"); request.putOtherTextParam("bedRoomNum", "1"); request.putOtherTextParam("livingRoomNum", "1"); request.putOtherTextParam("bathRoomNum", "1"); @@ -108,7 +108,7 @@ class MainCase { request.putOtherTextParam("totalFloor", "16"); request.putOtherTextParam("floor", "2"); request.putOtherTextParam("area", "61.0"); - request.putOtherTextParam("title", "泰安小区家具家电齐全"); + request.putOtherTextParam("title", "娉板畨灏忓尯瀹跺叿瀹剁數榻愬叏"); request.putOtherTextParam("rentType", "1"); request.putOtherTextParam("roomType", "80002"); request.putOtherTextParam("payType", "30003"); @@ -118,10 +118,10 @@ class MainCase { request.putOtherTextParam("houseAllocation", "[40001, 40002, 40003]"); request.putOtherTextParam("houseRequire", "[60004]"); request.putOtherTextParam("houseAdvantage", "[50001, 50002]"); - request.putOtherTextParam("description", "安源区萍乡市安源区山下路与德铭路交叉口南50米,用心打造全京基温馨整洁安全环保的家,愿入住的人平安喜乐健康生活,用心打造全京基温馨整洁安全环保的家,愿入住的人平安喜乐健康生活"); + request.putOtherTextParam("description", "瀹夋簮鍖鸿悕涔″競瀹夋簮鍖哄北涓嬭矾涓庡痉閾矾浜ゅ弶鍙e崡锛曪紣绫筹紝鐢ㄥ績鎵撻�犲叏浜熀娓╅Θ鏁存磥瀹夊叏鐜繚鐨勫锛屾効鍏ヤ綇鐨勪汉骞冲畨鍠滀箰鍋ュ悍鐢熸椿锛岀敤蹇冩墦閫犲叏浜熀娓╅Θ鏁存磥瀹夊叏鐜繚鐨勫锛屾効鍏ヤ綇鐨勪汉骞冲畨鍠滀箰鍋ュ悍鐢熸椿"); request.putOtherTextParam("tpDetailImageIds", '{"data":[{"busType":2,"imageType":1,"isTop":1,"imageUrl":"http://static.fangjia.com/stc/fs/00132C5DB8F70D6D1CCDEBD4EEF3F30EC72651C114884E0056759EA89172869364AB69C76DDD57D21D8C085354636DB4A3003E65A4FE20F880350CDD200A0A1ABB11A66D30751173C7AFC607F23D2AC7CB22B267FB91CAB4C53DCF987FC1D91D10B85AB6C7C8FFC5B592301194DF0007"},{"busType":1,"imageType":1,"isTop":0,"imageUrl":"http://static.fangjia.com/stc/fs/00132C5DB8F70D6D1CCDEBD4EEF3F30EC72651C114884E0056759EA89172869364AB69C76DDD57D21D8C085354636DB4ED975904BFAA13F8BF8B6742738D14F5491706B5F144FBE19446ECBB9A94526E554AF34A77193BE4C53DCF987FC1D91D10B85AB6C7C8FFC5B592301194DF0007"},{"busType":2,"imageType":1,"isTop":0,"imageUrl":"http://static.fangjia.com/stc/fs/00132C5DB8F70D6D1CCDEBD4EEF3F30EC72651C114884E0056759EA89172869364AB69C76DDD57D21D8C085354636DB481FE20E257D50C5BB882E889AD39F1D296FD8DCD55304221315D356BE20C964C26691D5062580175C53DCF987FC1D91D10B85AB6C7C8FFC5B592301194DF0007"},{"busType":2,"imageType":1,"isTop":0,"imageUrl":"http://static.fangjia.com/stc/fs/00132C5DB8F70D6D1CCDEBD4EEF3F30EC72651C114884E0056759EA89172869364AB69C76DDD57D25477DB12A756666380EA55B23D5FC4C055A9095C7C6FB578E0A87ECB8A3240591ED75BB4DA2D062C88D54FF09087715A6246C2CEB742309C10922C4D9E8E99AAD6F05542A980BB1B147F204C3B2D398053B1304A2B1580DD58CF8903E3C39C296BC62A6447E2671B10AE26EC05B89FEC3E6B19AE507B3B112DB7A2CE373600F1013E75B109F5B5901FC788E7A27A96FF1391275178CD218D216D7636931FC7B4069A6943BD60C73F989B9D6A4F7B2194"},{"busType":2,"imageType":1,"isTop":0,"imageUrl":"http://static.fangjia.com/stc/fs/00132C5DB8F70D6D1CCDEBD4EEF3F30EC72651C114884E0056759EA89172869364AB69C76DDD57D25477DB12A7566663A77113EDAED0C49D342179A5560D1EAFE0A87ECB8A3240591ED75BB4DA2D062C88D54FF09087715A6246C2CEB742309C10922C4D9E8E99AAD6F05542A980BB1B147F204C3B2D398053B1304A2B1580DD58CF8903E3C39C296BC62A6447E2671B10AE26EC05B89FECA985E4E57F86BDF6166C5FA7E76204C1F5C8BA4E3CFF788C216F8407832301FE190564E8D9A7631B216D7636931FC7B4069A6943BD60C73F989B9D6A4F7B2194"}]}'); - //第三步,走你 + //绗笁姝ワ紝璧颁綘 try { String res = client.execute(request); System.out.println("info2:"+JSONObject.fromObject(res).toString()); @@ -131,25 +131,25 @@ class MainCase { } static void fangAuthentication(){ - //第一步,创建GalaxyClient + //绗竴姝ワ紝鍒涘缓GalaxyClient GalaxyClient client = new DefaultGalaxyClient("0vJQDft3Nn", "ff347a0344f794bfc4f1132f26edf9cc", "http://nop.nuomi.com/nop/server/rest"); - //第二步,创建一个接口请求 + //绗簩姝ワ紝鍒涘缓涓�涓帴鍙h姹� GalaxyRequest request = new GalaxyRequest(); request.setApiMethodName("bnuoapi.fang.fangAuthentication"); request.putOtherTextParam("userId", "mlihmrmmohcab"); request.putOtherTextParam("phone", "13916076378"); - request.putOtherTextParam("name", '晚上 '); //URLEncoder.encode("张三", "UTF-8") + request.putOtherTextParam("name", '鏅氫笂 '); //URLEncoder.encode("寮犱笁", "UTF-8") request.putOtherTextParam("idNumber", "210603199105196046"); request.putOtherTextParam("cityId", "200010000"); - request.putOtherTextParam("cityName", 'shanghai');//URLEncoder.encode("上海市", "UTF-8") + request.putOtherTextParam("cityName", 'shanghai');//URLEncoder.encode("涓婃捣甯�", "UTF-8") request.putOtherTextParam("nopAppId", "0vJQDft3Nn"); - request.putOtherTextParam("companyName", "独立经纪人"); //URLEncoder.encode("独立经纪人", "UTF-8") - request.putOtherTextParam("poiName", "独立经纪人"); // URLEncoder.encode("独立经纪人", "UTF-8") + request.putOtherTextParam("companyName", "鐙珛缁忕邯浜�"); //URLEncoder.encode("鐙珛缁忕邯浜�", "UTF-8") + request.putOtherTextParam("poiName", "鐙珛缁忕邯浜�"); // URLEncoder.encode("鐙珛缁忕邯浜�", "UTF-8") request.putOtherTextParam("regionId", "370"); - request.putOtherTextParam("regionName", 'changning'); //URLEncoder.encode("长宁区", "UTF-8") + request.putOtherTextParam("regionName", 'changning'); //URLEncoder.encode("闀垮畞鍖�", "UTF-8") - //第三步,走你 + //绗笁姝ワ紝璧颁綘 try { String res = client.execute(request); System.out.println("info2:"+JSONObject.fromObject(res).toString()); @@ -159,19 +159,19 @@ class MainCase { } /** - * 经纪人注册 + * 缁忕邯浜烘敞鍐� */ static void accountReg() { - //第一步,创建GalaxyClient + //绗竴姝ワ紝鍒涘缓GalaxyClient GalaxyClient client = new DefaultGalaxyClient("0vJQDft3Nn", "ff347a0344f794bfc4f1132f26edf9cc", "http://nop.nuomi.com/nop/server/rest"); - //第二步,创建一个接口请求 + //绗簩姝ワ紝鍒涘缓涓�涓帴鍙h姹� GalaxyRequest request = new GalaxyRequest(); request.setApiMethodName("bnuoapi.fang.accountReg"); request.putOtherTextParam("phoneNumber", "15997302951"); request.putOtherTextParam("nopAppId", "0vJQDft3Nn"); request.putOtherTextParam("nickName", "test"); - //第三步,走你 + //绗笁姝ワ紝璧颁綘 try { String res = client.execute(request); System.out.println("info1:"+JSONObject.fromObject(res).toString()); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/baidu/NuomiApiUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/baidu/NuomiApiUtils.groovy index 9d5ddb7dd..b29371331 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/baidu/NuomiApiUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/baidu/NuomiApiUtils.groovy @@ -10,7 +10,7 @@ import com.galaxy.GalaxyRequest import net.sf.json.JSONObject /** - * 功能说明: + * 鍔熻兘璇存槑: */ class NuomiApiUtils{ @@ -20,10 +20,10 @@ class NuomiApiUtils{ try { GalaxyClient client = new DefaultGalaxyClient("0vJQDft3Nn", "ff347a0344f794bfc4f1132f26edf9cc", "http://nop.nuomi.com/nop/server/rest"); String res = client.execute(request) - println "res结果:"+res + println "res缁撴灉锛�"+res return JSONObject.fromObject(res) } catch (ApiException e) { - println('JSONObject execute(GalaxyRequest request) throws ApiException{} 发生异常, 异常信息为' + e) + println('JSONObject execute(GalaxyRequest request) throws ApiException{} 鍙戠敓寮傚父锛� 寮傚父淇℃伅涓�' + e) throw e; } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/baidu/NuomiHousePushBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/baidu/NuomiHousePushBatch.groovy index 78f5180f6..990848957 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/baidu/NuomiHousePushBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/baidu/NuomiHousePushBatch.groovy @@ -14,7 +14,7 @@ import com.mongodb.DBCollection import com.fangjia.script.util.MongoUtils /** - * 功能说明:百度糯米房源推送脚本 + * 鍔熻兘璇存槑:鐧惧害绯背鎴挎簮鎺ㄩ�佽剼鏈� */ @BatchOwner(Watcher.WangWenYan) class NuomiHousePushBatch extends BaseBatch { @@ -44,12 +44,12 @@ class NuomiHousePushBatch extends BaseBatch { query.append("website_name",new BasicDBObject('$in', roots)) query.append("publish_date", new BasicDBObject('$gt', DateUtil.truncateDay(startDate)).append('$lt', DateUtil.truncateDay(new Date()))) def it = seabird.find(query).iterator() - println "共"+ seabird.find(query).count()+ "套房源" + println "鍏�"+ seabird.find(query).count()+ "濂楁埧婧�" def index = 0; while (it.hasNext()){ index++; - println "【${index}】" - BasicDBObject house2 = it.next()//为便于日志保存,使用house2 + println "銆�${index}銆�" + BasicDBObject house2 = it.next()//涓轰究浜庢棩蹇椾繚瀛橈紝浣跨敤house2 def house = house2; def cat = house.cat; def url = house.url; @@ -79,24 +79,24 @@ class NuomiHousePushBatch extends BaseBatch { house.put("result_json", result); baidu_house__send_log.save(house); }else{ - println "异常返回result为空,result:"+result; + println "寮傚父杩斿洖result涓虹┖,result:"+result; house.put("c_date", new Date()); - house.put("error_log", "异常返回result为空,result:"+result) + house.put("error_log", "寮傚父杩斿洖result涓虹┖,result:"+result) try{ baidu_house__error_log.save(house); }catch(Exception e1){ - println "error_log保存失败,e1:"+e1; + println "error_log淇濆瓨澶辫触,e1:"+e1; } } }else{ - println "异常,处理后house为null"; + println "寮傚父锛屽鐞嗗悗house涓簄ull"; house2.put("c_date", new Date()); house2.put("houseId", houseId); - house2.put("error_log", "异常,处理后house为null,house:"+house) + house2.put("error_log", "寮傚父锛屽鐞嗗悗house涓簄ull,house:"+house) try{ baidu_house__error_log.save(house2); }catch(Exception e1){ - println "error_log保存失败,e1:"+e1; + println "error_log淇濆瓨澶辫触,e1:"+e1; } } }catch(Exception e){ @@ -109,7 +109,7 @@ class NuomiHousePushBatch extends BaseBatch { try{ baidu_house__error_log.save(house); }catch(Exception e1){ - println "error_log保存失败,e1:"+e1; + println "error_log淇濆瓨澶辫触,e1:"+e1; } } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/baidu/UpdateAreaItemNew.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/baidu/UpdateAreaItemNew.groovy index c312d679e..7eb78eb3e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/baidu/UpdateAreaItemNew.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/baidu/UpdateAreaItemNew.groovy @@ -50,22 +50,22 @@ public class UpdateAreaItemNew extends BaseBatch{ def name = area.get("area_name"); def level = area.get("level"); def parent_area_id = area.get("parent_area_id"); - println "name:"+name+"level:"+level+"===开始匹配"; + println "name:"+name+"level:"+level+"===寮�濮嬪尮閰�"; try{ if(2==level){ String city = RegionData.formatCity(name); - //匹配城市 + //鍖归厤鍩庡競 if(city){ def id = area.get("_id"); DBObject udata = new BasicDBObject() udata.put("city_name", city); AREA_ITME_COLL.update(new BasicDBObject("_id", id), new BasicDBObject('$set', udata)); - println "name:"+name+"level:"+level+"===城市匹配成功"; + println "name:"+name+"level:"+level+"===鍩庡競鍖归厤鎴愬姛"; }else{ - println "name:"+name+"level:"+level+"===城市匹配不成功"; + println "name:"+name+"level:"+level+"===鍩庡競鍖归厤涓嶆垚鍔�"; } }else if(3==level){ - //匹配区域 + //鍖归厤鍖哄煙 DBObject qdata2 = new BasicDBObject() qdata2.put("area_id" , parent_area_id); def area2 = AREA_ITME_COLL.findOne(qdata2); @@ -80,18 +80,18 @@ public class UpdateAreaItemNew extends BaseBatch{ udata.put("city_name", city2); udata.put("region_name", region2); AREA_ITME_COLL.update(new BasicDBObject("_id", id), new BasicDBObject('$set', udata)); - println "name:"+name+"level:"+level+"===区域匹配成功"; + println "name:"+name+"level:"+level+"===鍖哄煙鍖归厤鎴愬姛"; }else{ - println "name:"+name+"level:"+level+"===区域匹配不成功"; + println "name:"+name+"level:"+level+"===鍖哄煙鍖归厤涓嶆垚鍔�"; } }else{ - println "name:"+name+"parent_area_id:"+parent_area_id+"===区域匹配异常,无parentCity"; + println "name:"+name+"parent_area_id:"+parent_area_id+"===鍖哄煙鍖归厤寮傚父锛屾棤parentCity"; } }else{ - println "省级单位不匹配" + println "鐪佺骇鍗曚綅涓嶅尮閰�" } }catch(Exception e){ - println "name:"+name+"level:"+level+"==匹配失败" + println "name:"+name+"level:"+level+"==鍖归厤澶辫触" println e; } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/bhapitest/BhApiTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/bhapitest/BhApiTest.groovy index 275691bc2..2c94c3c36 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/bhapitest/BhApiTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/bhapitest/BhApiTest.groovy @@ -44,24 +44,24 @@ class BhApiTest { def getData2(timestamp, nonce){ List list = new ArrayList(); Map params = new HashMap(); - def queryFullAddr = "叶联路699弄" + def queryFullAddr = "鍙惰仈璺�699寮�" params.put("queryFullAddr",queryFullAddr); params.put("preCode", "sh1190323"); - params.put("preName", "南山雨果/西郊水岸馨苑(公寓)"); + params.put("preName", "鍗楀北闆ㄦ灉/瑗块儕姘村哺棣ㄨ嫅(鍏瘬)"); params.put("countryCode", "310118000000"); - params.put("buildName", "叶联路666弄/叶联路699弄"); + params.put("buildName", "鍙惰仈璺�666寮�/鍙惰仈璺�699寮�"); params.put("floor", "2"); params.put("totalFloor", "11"); // params.put("houseNo",ev.getRoomNum()); params.put("groundArea", "88.71"); - params.put("orientName", "南"); + params.put("orientName", "鍗�"); params.put("buildYear", "2014"); params.put("dealPriceTotal", "5500000"); params.put("userName", "test"); // params.put("userPhone", "17740818975"); // params.put("userMail", ""); - params.put("groupName", "测试"); + params.put("groupName", "娴嬭瘯"); def lists = ["queryFullAddr", "preCode", "preName", "countryCode", "buildName", "unitCode","floor","totalFloor","houseNo","groundArea","undergroundArea","orientName","buildYear","dealPriceTotal","specialNo","userName","userPhone","userMail","groupName"] @@ -78,7 +78,7 @@ class BhApiTest { Integer date1 = (int)(new Date().getTime()/1000); String str = "bohaifangjiatest" + date1.toString()+nonce+ s1 - println "拼接: "+str + println "鎷兼帴: "+str String md5str2 = MD5Util.encrypt(str,"utf-8"); println "md5:"+md5str2 @@ -108,8 +108,8 @@ class BhApiTest { def getData(md5str, timestamp, nonce){ def params = [:] -// params.put("keyword",URLEncoder.encode("中潭路99弄", "UTF-8")) - params.put("keyword","中山二路125弄") +// params.put("keyword",URLEncoder.encode("涓江璺�99寮�", "UTF-8")) + params.put("keyword","涓北浜岃矾125寮�") def headers = [:] headers.put("timestamp", timestamp) headers.put("sign", md5str) @@ -146,7 +146,7 @@ class BhApiTest { List list = new ArrayList(); Map params = new HashMap(); params.put("queryId","cdadc441-8917-33b6-8787-8d894bf088b4"); - params.put("userName", "测试"); + params.put("userName", "娴嬭瘯"); def lists = ["queryId", "userName"] @@ -164,7 +164,7 @@ class BhApiTest { Integer date1 = (int)(new Date().getTime()/1000); String str = "bohaifangjiatest" + date1.toString()+nonce+ s1 - println "拼接: "+str + println "鎷兼帴: "+str String md5str2 = MD5Util.encrypt(str,"utf-8"); println "md5:"+md5str2 diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/build/FangjiaBuild.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/build/FangjiaBuild.groovy index 269a0b369..29c62ca67 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/build/FangjiaBuild.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/build/FangjiaBuild.groovy @@ -40,7 +40,7 @@ class FangjiaBuild { } } - //更新css文件中的图片版本号 + //鏇存柊css鏂囦欢涓殑鍥剧墖鐗堟湰鍙� new File(staticDir).eachFileRecurse(){file -> if(file.name.endsWith('.css')){ def writer = new StringWriter() @@ -52,7 +52,7 @@ class FangjiaBuild { def imgFile = staticDir + "/images/" + matcher.group(1) def versionNumber = getVersionNumber(branch, imgFile, file) if (versionNumber == 0){ - //如果没有在版本库中找到则保持原样 + //濡傛灉娌℃湁鍦ㄧ増鏈簱涓壘鍒板垯淇濇寔鍘熸牱 return it } def cssFileVersion = getVersionNumber(branch, file.toString(), file) @@ -74,7 +74,7 @@ class FangjiaBuild { } } - //更新jsp和ftl文件中的css和js的版本号 + //鏇存柊jsp鍜宖tl鏂囦欢涓殑css鍜宩s鐨勭増鏈彿 templateDirs.each{templateDir-> new File(templateDir).eachFileRecurse(){file -> if (file.name.endsWith(".jsp") || file.name.endsWith(".ftl")){ @@ -87,7 +87,7 @@ class FangjiaBuild { def cssFile = staticDir + "/" + matcher.group(1) + ".css" def versionNumber = getVersionNumber(branch, cssFile, file) if (versionNumber == 0){ - //如果没有在版本库中找到则保持原样 + //濡傛灉娌℃湁鍦ㄧ増鏈簱涓壘鍒板垯淇濇寔鍘熸牱 return it } def ret = it.replaceFirst('v=\\$\\{version\\}', "v=${versionNumber}") @@ -99,7 +99,7 @@ class FangjiaBuild { def jsFile = staticDir + "/" + matcher.group(1) + ".js" def versionNumber = getVersionNumber(branch, jsFile, file) if (versionNumber == 0){ - //如果没有在版本库中找到则保持原样 + //濡傛灉娌℃湁鍦ㄧ増鏈簱涓壘鍒板垯淇濇寔鍘熸牱 return it } def ret = it.replaceFirst('v=\\$\\{version\\}', "v=${versionNumber}") @@ -116,7 +116,7 @@ class FangjiaBuild { } } - //css和js压缩 + //css鍜宩s鍘嬬缉 new File(staticDir).eachFileRecurse(){file -> if(file.name.endsWith('.css')){ println "Compress:\t${relativeName(file)}" diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/build/FangjiatongBuild.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/build/FangjiatongBuild.groovy index 62dc427f2..3cd345ebd 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/build/FangjiatongBuild.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/build/FangjiatongBuild.groovy @@ -12,7 +12,7 @@ class FangjiatongBuild { static def process(branch, templateDirs) { def versionNumber = new Date().getTime(); - //更新css文件中的图片版本号 + //鏇存柊css鏂囦欢涓殑鍥剧墖鐗堟湰鍙� new File(templateDirs).eachFileRecurse(){file -> if(file.name.endsWith('.css')){ def writer = new StringWriter() diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/businessshop/ClassifyShops.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/businessshop/ClassifyShops.groovy index 9d5d0a95a..0b485643b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/businessshop/ClassifyShops.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/businessshop/ClassifyShops.groovy @@ -16,7 +16,7 @@ class ClassifyShops { def final static DBCollection DB_1 = new Mongo("mongo.db.fangjia.com", 27017).getDB('fangjia').getCollection('business_shop'); static main(args) { - String city = "上海"; + String city = "涓婃捣"; Map mallInfo = loadMallInfo(city); // Map districtInfo = loadDistrictInfo(city); @@ -42,14 +42,14 @@ class ClassifyShops { // def district = districtInfo.get(ar.getAddress()); // if (null != district) { -// addShop(city, district.name + "商铺", ar.getAddress(), "社区内铺", shop); +// addShop(city, district.name + "鍟嗛摵", ar.getAddress(), "绀惧尯鍐呴摵", shop); //// updateBizShop(shop._id, mall._id.toString(), mall.name, mall.estate_type2); // c1++ // return; // } // -// // 新增seaweed shop -// addShop(city, ar.getAddress() + '商铺', ar.getAddress(), "沿街商铺", shop); +// // 鏂板seaweed shop +// addShop(city, ar.getAddress() + '鍟嗛摵', ar.getAddress(), "娌胯鍟嗛摵", shop); // c2++ } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/businessshop/DianpingCrawlShop.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/businessshop/DianpingCrawlShop.groovy index 0ea62dc90..365e620aa 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/businessshop/DianpingCrawlShop.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/businessshop/DianpingCrawlShop.groovy @@ -41,22 +41,22 @@ class DianpingCrawlShop { static Pattern pattern_price = Pattern.compile("([\\d\\.]+)") static Pattern pattern_commentTime= Pattern.compile("(([\\d]{2}\\-)?[\\d]{2}\\-[\\d]{2})\\s*") - def categorys=["美食": "10", - "休闲娱乐": "30", - "购物": "20", - "丽人": "50", - "结婚": "55", - "亲子": "70", - "运动健身": "45", - "酒店": "60", - "家装": "90", - "爱车": "65", - "生活服务": "80"] + def categorys=["缇庨": "10", + "浼戦棽濞变箰": "30", + "璐墿": "20", + "涓戒汉": "50", + "缁撳": "55", + "浜插瓙": "70", + "杩愬姩鍋ヨ韩": "45", + "閰掑簵": "60", + "瀹惰": "90", + "鐖辫溅": "65", + "鐢熸椿鏈嶅姟": "80"] - def cityCodes=["上海": "1", - "北京": "2", - "广州": "4", - "昆山": "6"] + def cityCodes=["涓婃捣": "1", + "鍖椾含": "2", + "骞垮窞": "4", + "鏄嗗北": "6"] ExecutorService executorService=new ThreadPoolExecutor(5, 5, 3000L, TimeUnit.MILLISECONDS, @@ -73,15 +73,15 @@ class DianpingCrawlShop { static main(args){ DianpingCrawlShop crawl=new DianpingCrawlShop() - crawl.process("上海") + crawl.process("涓婃捣") // crawl.exportSeaweedMall() // crawl.procInvalidBusinessShop2() // crawl.rankBusinessShop() // crawl.parseWebPage() // crawl.importWebPage("5333851ae4b0370f56553bc8") -// crawl.relationShop2Mall("上海"); -// crawl.process2("上海", "http://www.dianping.com/search/category/1/10/r842") -// crawl.processDetail("上海", "http://www.dianping.com/shop/5311681") +// crawl.relationShop2Mall("涓婃捣"); +// crawl.process2("涓婃捣", "http://www.dianping.com/search/category/1/10/r842") +// crawl.processDetail("涓婃捣", "http://www.dianping.com/shop/5311681") } @@ -135,7 +135,7 @@ class DianpingCrawlShop { println "${city} no city code" return } - categorys=["美食":"10"] + categorys=["缇庨":"10"] def params=crawlInit(cityCode) def subCatParams=params[0] @@ -169,7 +169,7 @@ class DianpingCrawlShop { processItem(city, retxt, enterUrl) - Element elP=JQueryUtils.select("div.Pages a:contains(下一页)", retxt).first() + Element elP=JQueryUtils.select("div.Pages a:contains(涓嬩竴椤�)", retxt).first() int pageCount=1 if(elP){ elP=elP.previousElementSibling() @@ -274,7 +274,7 @@ class DianpingCrawlShop { shop.address=ele.attr("title") } ele=JQueryUtils.select("span[itemprop=tel]", retxt).first() - if(ele && ele.text().indexOf("添加")==-1){ + if(ele && ele.text().indexOf("娣诲姞")==-1){ shop.telephone=ele.text() } def coord=mapabcService.parseBaiduCoord(city, shop.name, shop.address) @@ -287,10 +287,10 @@ class DianpingCrawlShop { for(Element el: eles){ shop.feature << el.text() } - ele=JQueryUtils.select(".desc-list li:contains(简介)", retxt).first() + ele=JQueryUtils.select(".desc-list li:contains(绠�浠�)", retxt).first() if(ele){ String str=ele.text() - int index=str.indexOf("简介:") + int index=str.indexOf("绠�浠嬶細") if(index!=-1) shop.introduction=str.substring(index+3); } @@ -522,7 +522,7 @@ class DianpingCrawlShop { /** - * 压缩 + * 鍘嬬缉 * * @param content * @return @@ -542,7 +542,7 @@ class DianpingCrawlShop { } /** - * 解压 + * 瑙e帇 * * @param content * @return @@ -607,7 +607,7 @@ class DianpingCrawlShop { int index=0; int lastConsumption=0; int rank=0; - shopDb.find(DataUtil.map2DBObject([business_type: "餐厅", consumption: [$ne: null]])).setOptions(Bytes.QUERYOPTION_NOTIMEOUT) + shopDb.find(DataUtil.map2DBObject([business_type: "椁愬巺", consumption: [$ne: null]])).setOptions(Bytes.QUERYOPTION_NOTIMEOUT) .sort(DataUtil.map2DBObject([consumption:-1])).each { doc-> int consumption=doc.consumption; @@ -628,7 +628,7 @@ class DianpingCrawlShop { public void procInvalidBusinessShop(){ int index=0; - String city="上海" + String city="涓婃捣" shopDb.find(DataUtil.map2DBObject([business_type: null])).setOptions(Bytes.QUERYOPTION_NOTIMEOUT) .sort(DataUtil.map2DBObject([_id:1])).each { shop-> diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/AddShDealData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/AddShDealData.groovy index 3bb3e7b81..68aa88dfe 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/AddShDealData.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/AddShDealData.groovy @@ -6,10 +6,10 @@ import com.fangjia.script.util.MongoUtils import com.mongodb.BasicDBObject import com.mongodb.DBCollection /** - * 深圳公众号成交数据录入 + * 娣卞湷鍏紬鍙锋垚浜ゆ暟鎹綍鍏� */ -def datas = ExcelUtils.read("D:\\数据\\建行\\房产估值\\成交\\上海7月成交.xlsx", 0, 1) +def datas = ExcelUtils.read("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鎴愪氦\\涓婃捣7鏈堟垚浜�.xlsx", 0, 1) def lineUrl = "mongodb://developer:G00IDCDEV12385@mongo.db.fangjia.com:28017"; DBCollection DEAL_PRICE_COLL = MongoUtils.getCollectionByName2("fangjia", "deal_price", lineUrl) @@ -21,10 +21,10 @@ for(def d : datas){ // if(count && count.toString().toDouble()>1){ // continue // } - map.city = "上海" + map.city = "涓婃捣" map.district_name = d['B'] map.region = d['A'] - map.total_price = (int)(d['G'].toString().replace("万","").toDouble().toInteger()*10000) + map.total_price = (int)(d['G'].toString().replace("涓�","").toDouble().toInteger()*10000) map.avg_price = (int)(d['F'].toString().toDouble()) map.area = com.fangjia.script.common.DataHandleUtils.getDoubleRound(2, map.total_price/map.avg_price) @@ -39,7 +39,7 @@ for(def d : datas){ map.trade_date = DateUtils.parseFromTightByPattern(trade_date1, "yyyy-MM-dd") } - map.source = "沪上地产" + map.source = "娌笂鍦颁骇" map.create_date = new Date() map.m_date = new Date() println map 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 b083e01da..2370264c2 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 @@ -6,18 +6,18 @@ import com.fangjia.script.util.MongoUtils import com.mongodb.BasicDBObject import com.mongodb.DBCollection /** - * 深圳公众号成交数据录入 + * 娣卞湷鍏紬鍙锋垚浜ゆ暟鎹綍鍏� */ -def datas = ExcelUtils.read("D:\\数据\\建行\\房产估值\\成交\\深圳12月成交数据.xlsx", 0, 1) +def datas = ExcelUtils.read("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鎴愪氦\\娣卞湷12鏈堟垚浜ゆ暟鎹�.xlsx", 0, 1) def lineUrl = "mongodb://developer:G00IDCDEV12385@mongo.db.fangjia.com:28017"; DBCollection DEAL_PRICE_COLL = MongoUtils.getCollectionByName2("fangjia", "deal_price", lineUrl) -//没有成交时间,随机生成 +//娌℃湁鎴愪氦鏃堕棿锛岄殢鏈虹敓鎴� //for(def d : datas){ // def map = new BasicDBObject() -// map.city = "深圳" +// map.city = "娣卞湷" // map.district_name = d['D'] // map.region = d['B'] // def roomStr = d['E'] @@ -37,7 +37,7 @@ DBCollection DEAL_PRICE_COLL = MongoUtils.getCollectionByName2("fangjia", "deal_ // map.avg_price = (int)(d['H'].toString().toDouble()*10000) // def trade_date = DateUtils.getRandomDate("2023-04-01", "2023-04-30") // map.trade_date = DateUtils.parseFromTightByPattern(trade_date, "yyyy-MM-dd") -// map.source = "深房家族" +// map.source = "娣辨埧瀹舵棌" // map.create_date = new Date() // map.m_date = new Date() // DEAL_PRICE_COLL.save(map) @@ -47,7 +47,7 @@ DBCollection DEAL_PRICE_COLL = MongoUtils.getCollectionByName2("fangjia", "deal_ for(def d : datas){ def map = new BasicDBObject() - map.city = "深圳" + map.city = "娣卞湷" map.district_name = d['D'] map.region = d['B'] def roomStr = d['E'] @@ -77,7 +77,7 @@ for(def d : datas){ map.total_price = (int)(d['G'].toString().toDouble().toInteger()*10000) map.avg_price = (int)(d['H'].toString().toDouble()) if(d['I']){ - map.sell_price = (int)(d['I'].toString().replace("万","").toDouble()*10000) + map.sell_price = (int)(d['I'].toString().replace("涓�","").toDouble()*10000) } map.trade_date = d['J'] @@ -90,7 +90,7 @@ for(def d : datas){ // map.trade_date = DateUtils.parseFromTightByPattern(trade_date1, "yyyy-MM-dd") // } - map.source = "深房家族" + map.source = "娣辨埧瀹舵棌" map.create_date = new Date() map.m_date = new Date() println map diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/AddThirdPartyPrice.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/AddThirdPartyPrice.groovy index e0da72624..1364b07da 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/AddThirdPartyPrice.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/AddThirdPartyPrice.groovy @@ -18,7 +18,7 @@ class AddThirdPartyPrice { def run(){ // - def citys = ["林芝","海西州","天门","大兴安岭","儋州","鹤岗","日喀则","吐鲁番", "阿勒泰","迪庆州","潜江","塔城","克孜勒苏","和田","嘉峪关"] + def citys = ["鏋楄姖","娴疯タ宸�","澶╅棬","澶у叴瀹夊箔","鍎嬪窞","楣ゅ矖","鏃ュ杸鍒�","鍚愰瞾鐣�", "闃垮嫆娉�","杩簡宸�","娼滄睙","濉斿煄","鍏嬪瓬鍕掕嫃","鍜岀敯","鍢夊唱鍏�"] def rows = [] def cityCodeDatas = CcbCommonUtils.findCityCodeValue() for(def c : citys){ @@ -34,7 +34,7 @@ class AddThirdPartyPrice { def fileName = "/home/goojia/ccb/BIGDATA_THIRD_PARTY_PRICE_GJ.dat" if(CommonDatautils.isWindow()){ - fileName = "d:\\数据\\建行\\房产估值\\数据文件\\txt\\BIGDATA_THIRD_PARTY_PRICE_GJ.dat" + fileName = "d:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\BIGDATA_THIRD_PARTY_PRICE_GJ.dat" } def header = [] @@ -64,7 +64,7 @@ class AddThirdPartyPrice { ret << d._id.toString() ret << d.name ret << "18" - ret << "21世纪" + ret << "21涓栫邯" ret << 202209 ret << avgPrice ret << "" diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/AddThirdPriceSample.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/AddThirdPriceSample.groovy index 195dc1183..a90121bb2 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/AddThirdPriceSample.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/AddThirdPriceSample.groovy @@ -14,7 +14,7 @@ import java.util.concurrent.Executors import java.util.concurrent.atomic.AtomicLong /** - * 将国信达及成交对标数据加入到第三方均价表,做为均价参考 + * 灏嗗浗淇¤揪鍙婃垚浜ゅ鏍囨暟鎹姞鍏ュ埌绗笁鏂瑰潎浠疯〃锛屽仛涓哄潎浠峰弬鑰� */ class AddThirdPriceSample { @@ -28,8 +28,8 @@ class AddThirdPriceSample { static main(args) { def task = new AddThirdPriceSample() -// task.run() //添加第三方 fccs->保存的是国信达的参考价格 csjj->保存的是国信达的成交数据 - task.addTrade() //添加成交 +// task.run() //娣诲姞绗笁鏂� fccs->淇濆瓨鐨勬槸鍥戒俊杈剧殑鍙傝�冧环鏍� csjj->淇濆瓨鐨勬槸鍥戒俊杈剧殑鎴愪氦鏁版嵁 + task.addTrade() //娣诲姞鎴愪氦 // task.matchOldData() // task.noInCcbCity() @@ -37,7 +37,7 @@ class AddThirdPriceSample { } def run(){ for(def i=0;i<1;i++){ - ExcelUtils.multiThreadingModify("D:\\数据\\建行\\房产估值\\国信达指导价录入-1024.xlsx",{d-> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鍥戒俊杈炬寚瀵间环褰曞叆-1024.xlsx",{d-> if(d['A'] && d['B']){ def dist = CommonDatautils.findDistrictById(d['A'].toString().trim()) if(dist){ @@ -46,7 +46,7 @@ class AddThirdPriceSample { def udata = new BasicDBObject("fccs_esf_price", d['B'].toString().toDouble().toInteger()) AVERAGE_STATISTICS.update(q,new BasicDBObject('$set', udata),false, false) }else{ - println d['A'] +" 没查到" + println d['A'] +" 娌℃煡鍒�" } } }, i) @@ -57,14 +57,14 @@ class AddThirdPriceSample { } def addTrade(){ -// def citys = ["武汉","南京","杭州","长沙","郑州","合肥","宁波","南通","嘉兴","珠海","泉州","绍兴","湖州","镇江"] +// def citys = ["姝︽眽","鍗椾含","鏉窞","闀挎矙","閮戝窞","鍚堣偉","瀹佹尝","鍗楅��","鍢夊叴","鐝犳捣","娉夊窞","缁嶅叴","婀栧窞","闀囨睙"] def rets = findTrades() DEAL_PRICE_COLL.insert(rets) } def findTrades(){ def q = new BasicDBObject() - q.put("ccb_price_remark","建行无此城市成交") + q.put("ccb_price_remark","寤鸿鏃犳鍩庡競鎴愪氦") // q.put("city", new BasicDBObject('$in', citys)) // q.put("flag", 1) def dbcursor = NO_PRICE_DEAL_PRICE_COLL.find(q) @@ -116,7 +116,7 @@ class AddThirdPriceSample { udata.put("match_region",db.match_region) udata.put("match_name",db.match_name) udata.put("match_id",db.match_id) - udata.put("price_flag", "国信达成交-推导") + udata.put("price_flag", "鍥戒俊杈炬垚浜�-鎺ㄥ") // DEAL_PRICE_COLL.save(udata) println index @@ -126,7 +126,7 @@ class AddThirdPriceSample { } def matchOldData(){ - def q = new BasicDBObject("source","贝壳找房").append("trade_date", new BasicDBObject('$gte', DateUtils.parseFromTightByPattern("2024-09-01","yyyy-MM-dd"))) + def q = new BasicDBObject("source","璐濆3鎵炬埧").append("trade_date", new BasicDBObject('$gte', DateUtils.parseFromTightByPattern("2024-09-01","yyyy-MM-dd"))) def list = DEAL_PRICE_COLL.find(q).toList() def totalCount = new AtomicLong() final CountDownLatch latch = new CountDownLatch(list.size()) @@ -140,7 +140,7 @@ class AddThirdPriceSample { def obj = NO_PRICE_DEAL_PRICE_COLL.findOne(query) if(obj){ def update = new BasicDBObject() - update.put("price_remark", "有价格") + update.put("price_remark", "鏈変环鏍�") NO_PRICE_DEAL_PRICE_COLL.update(new BasicDBObject("_id",obj._id), new BasicDBObject('$set', update), false,false) } println totalCount.get() @@ -158,14 +158,14 @@ class AddThirdPriceSample { } def noInCcbCity(){ - def citys = ["大理","苏州","无锡","通辽","绵阳","吉安","潍坊","襄阳","济宁","张家口","泸州","乐山","赣州","九江","眉山","桂林","雅安","广州","景德镇","上海","运城","内江","金华","濮阳","丹东","淄博","新乡","廊坊","烟台","邯郸","萍乡","宜宾","咸阳","许昌","德阳","银川","洛阳","天津","湛江","长沙","深圳","湘西","信阳","成都","威海","福州","上饶","常州","宜春","天水","平顶山","常德","吉林","盐城","杭州","赤峰","南京","周口","济南","株洲","大连","徐州","泰安","太原","凉山","兰州","承德","广元","台州","南昌","乌鲁木齐","海口","北京","淮安","清远","临沂","柳州","衢州","攀枝花","呼和浩特","昆明","岳阳","衡阳","温州","石家庄","连云港","保定","阜阳","遂宁","菏泽","青岛","唐山","开封","漳州","贵阳","驻马店","宝鸡","达州","汉中","南充","遵义","包头","南宁","沈阳","重庆","芜湖","厦门","大同"] + def citys = ["澶х悊","鑻忓窞","鏃犻敗","閫氳窘","缁甸槼","鍚夊畨","娼嶅潑","瑗勯槼","娴庡畞","寮犲鍙�","娉稿窞","涔愬北","璧e窞","涔濇睙","鐪夊北","妗傛灄","闆呭畨","骞垮窞","鏅痉闀�","涓婃捣","杩愬煄","鍐呮睙","閲戝崕","婵槼","涓逛笢","娣勫崥","鏂颁埂","寤婂潑","鐑熷彴","閭兏","钀嶄埂","瀹滃","鍜搁槼","璁告槍","寰烽槼","閾跺窛","娲涢槼","澶╂触","婀涙睙","闀挎矙","娣卞湷","婀樿タ","淇¢槼","鎴愰兘","濞佹捣","绂忓窞","涓婇ザ","甯稿窞","瀹滄槬","澶╂按","骞抽《灞�","甯稿痉","鍚夋灄","鐩愬煄","鏉窞","璧ゅ嘲","鍗椾含","鍛ㄥ彛","娴庡崡","鏍床","澶ц繛","寰愬窞","娉板畨","澶師","鍑夊北","鍏板窞","鎵垮痉","骞垮厓","鍙板窞","鍗楁槍","涔岄瞾鏈ㄩ綈","娴峰彛","鍖椾含","娣畨","娓呰繙","涓存矀","鏌冲窞","琛㈠窞","鏀�鏋濊姳","鍛煎拰娴╃壒","鏄嗘槑","宀抽槼","琛¢槼","娓╁窞","鐭冲搴�","杩炰簯娓�","淇濆畾","闃滈槼","閬傚畞","鑿忔辰","闈掑矝","鍞愬北","寮�灏�","婕冲窞","璐甸槼","椹婚┈搴�","瀹濋浮","杈惧窞","姹変腑","鍗楀厖","閬典箟","鍖呭ご","鍗楀畞","娌堥槼","閲嶅簡","鑺滄箹","鍘﹂棬","澶у悓"] def q = new BasicDBObject() - q.put("price_remark",new BasicDBObject('$ne', "有价格")) + q.put("price_remark",new BasicDBObject('$ne', "鏈変环鏍�")) q.put("trade_date", new BasicDBObject('$gte', DateUtils.parseFromTightByPattern("2024-09-01","yyyy-MM-dd"))) q.put("avg_price",new BasicDBObject('$gt', 0)) q.put("match_id",new BasicDBObject('$exists', true)) def list = NO_PRICE_DEAL_PRICE_COLL.find(q).toList() - println "共:"+list.size() + println "鍏憋細"+list.size() def totalCount = new AtomicLong() final CountDownLatch latch = new CountDownLatch(list.size()) for(def i=0;i=1) { -// ret << obj.elevators//电梯数 +// ret << obj.elevators//鐢垫鏁� // }else{ // ret << "" // } 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 e6e02e23d..ed0d2c12c 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 @@ -15,8 +15,8 @@ import java.util.concurrent.Executors import java.util.concurrent.atomic.AtomicLong /** - * 建行模型估值项目 - * 小区建筑类型数据同步 + * 寤鸿妯″瀷浼板�奸」鐩� + * 灏忓尯寤虹瓚绫诲瀷鏁版嵁鍚屾 */ @BatchOwner(Watcher.GaoJuan) class BigdataCommbuildtypeBatch extends BaseBatch{ @@ -55,13 +55,13 @@ class BigdataCommbuildtypeBatch extends BaseBatch{ def fileName = "/home/goojia/ccb/BIGDATA_COMMBUILDTYPE_GJ.dat" if(CommonDatautils.isWindow()){ - fileName = "d:\\数据\\建行\\房产估值\\数据文件\\txt\\BIGDATA_COMMBUILDTYPE_GJ.dat" + fileName = "d:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\BIGDATA_COMMBUILDTYPE_GJ.dat" } - def headers = []//["城市ID","小区ID"," 建筑类型","备注","创建时间","更新时间","来源公司","数据时间"] + def headers = []//["鍩庡競ID","灏忓尯ID"," 寤虹瓚绫诲瀷","澶囨敞","鍒涘缓鏃堕棿","鏇存柊鏃堕棿","鏉ユ簮鍏徃","鏁版嵁鏃堕棿"] FileUtils.batchCreateFile(rets, fileName,headers, "utf-8", false); - println "txt 生成->导Oracle" + println "txt 鐢熸垚->瀵糘racle" delPgData() saveToPgSql(rets) @@ -120,7 +120,7 @@ class BigdataCommbuildtypeBatch extends BaseBatch{ def delPgData(){ sqlInstance.execute("delete from base.t0831_bigdata_commbuildtype_gj_h") - println "base.t0831_bigdata_commbuildtype_gj_h 数据已删除" + println "base.t0831_bigdata_commbuildtype_gj_h 鏁版嵁宸插垹闄�" } 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 7f955fddb..7d6ea5fa6 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 @@ -18,8 +18,8 @@ import java.util.concurrent.ExecutorService import java.util.concurrent.Executors import java.util.concurrent.atomic.AtomicLong /** - * 建行模型估值项目 - * 小区数据同步 + * 寤鸿妯″瀷浼板�奸」鐩� + * 灏忓尯鏁版嵁鍚屾 */ @BatchOwner(Watcher.GaoJuan) @@ -41,15 +41,15 @@ class BigdataCommunityBatch extends BaseBatch{ def citys = CcbCommonUtils.getRunningCitys(args) def rows = [] - def headers = []//["城市ID","行政区ID","小区ID","行政区名称","小区名称","详细地址","纬度","经度","占地总面积","建筑总面积","绿化率","容积率","车位数量","建筑年代","房屋用途", - //"总套数","数据时间","更新标记","更新时间","小区类型","小区曾用名","街道","门牌号","是否新盘","小区介绍","备注","创建时间","来源公司", - //"乡镇/街道办","逻辑行政区划代码","逻辑行政区划"] + def headers = []//["鍩庡競ID","琛屾斂鍖篒D","灏忓尯ID","琛屾斂鍖哄悕绉�","灏忓尯鍚嶇О","璇︾粏鍦板潃","绾害","缁忓害","鍗犲湴鎬婚潰绉�","寤虹瓚鎬婚潰绉�","缁垮寲鐜�","瀹圭Н鐜�","杞︿綅鏁伴噺","寤虹瓚骞翠唬","鎴垮眿鐢ㄩ��", + //"鎬诲鏁�","鏁版嵁鏃堕棿","鏇存柊鏍囪","鏇存柊鏃堕棿","灏忓尯绫诲瀷","灏忓尯鏇剧敤鍚�","琛楅亾","闂ㄧ墝鍙�","鏄惁鏂扮洏","灏忓尯浠嬬粛","澶囨敞","鍒涘缓鏃堕棿","鏉ユ簮鍏徃", + //"涔¢晣/琛楅亾鍔�","閫昏緫琛屾斂鍖哄垝浠g爜","閫昏緫琛屾斂鍖哄垝"] def cityCodeDataMap = CcbCommonUtils.findCityCodeValue() def index = 0 def today = new Date().getDate() - println "starting 。。。。。。。。。" + println "starting 銆傘�傘�傘�傘�傘�傘�傘�傘��" def allDists = CcbCommonUtils.findAllDistrictByCity(null, "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"], null) for(def d : allDists){ @@ -61,43 +61,43 @@ class BigdataCommunityBatch extends BaseBatch{ def distCodeMap = CcbCommonUtils.findAllDistrictCodeValue(city) def dists = CcbCommonUtils.findAllDistrictByCity(city, "district", ["city","region", "name", "address","lat", "lng","all_area","build_area","virescence_percent","cubage_percent","car_site_count","finish_building_date","estate_type2","household_count","status","c_date","m_date","name_cat","street","street_number"], null) - println "加载建行小区量" + println "鍔犺浇寤鸿灏忓尯閲�" def ccbMaps = null if(today<=10){ - ccbMaps = CcbCommonUtils.findCcbDistrict(cityCodeDataMap.get(city)) //融合导数时使用 + ccbMaps = CcbCommonUtils.findCcbDistrict(cityCodeDataMap.get(city)) //铻嶅悎瀵兼暟鏃朵娇鐢� }else{ - ccbMaps = CcbCommonUtils.findPgCcbDistrict(cityCodeDataMap.get(city)) //估值导数时使用 + ccbMaps = CcbCommonUtils.findPgCcbDistrict(cityCodeDataMap.get(city)) //浼板�煎鏁版椂浣跨敤 } - println "组装新数据" + println "缁勮鏂版暟鎹�" def rets = createCityDatas(cityCodeDataMap, distCodeMap, dists) rets = addDeleteDist(dists, ccbMaps, rets) rows.addAll(rets) - println "[${index}] "+city +" 小区量:"+dists.size()+" 总:"+rets.size()+" 结果:"+rows.size() + println "[${index}] "+city +" 灏忓尯閲忥細"+dists.size()+" 鎬伙細"+rets.size()+" 缁撴灉锛�"+rows.size() -// FileUtils.batchCreateFile(rets, "d:\\数据\\建行\\房产估值\\数据文件\\txt\\bigdata_community_${city}.txt",headers, "utf-8", false); +// FileUtils.batchCreateFile(rets, "d:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\bigdata_community_${city}.txt",headers, "utf-8", false); } def fileName = "/home/goojia/ccb/BIGDATA_COMMUNITY_GJ.dat" if(CommonDatautils.isWindow()){ - fileName = "d:\\数据\\建行\\房产估值\\数据文件\\txt\\BIGDATA_COMMUNITY_GJ.dat" + fileName = "d:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\BIGDATA_COMMUNITY_GJ.dat" } def allDatas = [] allDatas << headers allDatas.addAll(rows) FileUtils.batchCreateFile(rows, fileName,headers, "utf-8", false); - println "txt 生成->导Oracle" + println "txt 鐢熸垚->瀵糘racle" if(today > 10){ delPgData() saveToPgSql(rows) - //更新静态数据表 + //鏇存柊闈欐�佹暟鎹〃 updateVersion(DateUtils.formatDateByPattern(new Date(), "yyyy-MM")+"-28") } -// ExcelUtils.write("d:\\数据\\建行\\房产估值\\数据文件\\excel\\bigdata_community.xlsx", allDatas, "数据") -// def datas = readTxt("d:\\数据\\建行\\房产估值\\数据文件\\txt\\BIGDATA_COMMUNITY_GJ.dat") +// ExcelUtils.write("d:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\excel\\bigdata_community.xlsx", allDatas, "鏁版嵁") +// def datas = readTxt("d:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\BIGDATA_COMMUNITY_GJ.dat") // delPgData() // saveToPgSql2(datas) @@ -106,7 +106,7 @@ class BigdataCommunityBatch extends BaseBatch{ def addDeleteDist(dists, ccbMaps, rets){ - println "房价网小区:"+fangjiaDists.size()+" 建行小区:"+rets.size() + println "鎴夸环缃戝皬鍖猴細"+fangjiaDists.size()+" 寤鸿灏忓尯锛�"+rets.size() def ccbDists = ccbMaps.keySet() for(def ccbId : ccbDists){ if(!fangjiaDists.contains(ccbId)){ @@ -115,7 +115,7 @@ class BigdataCommunityBatch extends BaseBatch{ rets << datas } } - println "添加删除状态小区:"+rets.size() + println "娣诲姞鍒犻櫎鐘舵�佸皬鍖猴細"+rets.size() return rets } @@ -151,7 +151,7 @@ class BigdataCommunityBatch extends BaseBatch{ try{ def data = distCodeMap.get(dist.region) if(!data){ - println dist.city +" "+dist.region +" "+dist.name+" 没有找到对应的区域" + println dist.city +" "+dist.region +" "+dist.name+" 娌℃湁鎵惧埌瀵瑰簲鐨勫尯鍩�" return ret; } @@ -251,7 +251,7 @@ class BigdataCommunityBatch extends BaseBatch{ def delPgData(){ sqlInstance.execute("delete from base.t0831_bigdata_community_gj_h") - println "base.t0831_bigdata_community_gj_h 数据已删除" + println "base.t0831_bigdata_community_gj_h 鏁版嵁宸插垹闄�" } def saveToPgSql(rows){ 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 77f92137f..518d45f89 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 @@ -25,8 +25,8 @@ import java.util.concurrent.atomic.AtomicInteger import java.util.concurrent.atomic.AtomicLong import java.util.regex.Pattern /** - * 建行模型估值项目 - * 成交数据同步 + * 寤鸿妯″瀷浼板�奸」鐩� + * 鎴愪氦鏁版嵁鍚屾 */ @BatchOwner(Watcher.GaoJuan) class BigdataDealBatch extends BaseBatch{ @@ -36,7 +36,7 @@ class BigdataDealBatch extends BaseBatch{ def curDate = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMMdd"), -1, "yyyyMMdd")); public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(30) - def sourceMap = ["贝壳找房":"ke.com","我爱我家":"5i5j.com","链家在线":"lianjia.com","房天下":"fang.com","中原地产":"centanet.com","福州不动产":"","搜房":"fang.com", "幸福里":"xflapp.com"] + def sourceMap = ["璐濆3鎵炬埧":"ke.com","鎴戠埍鎴戝":"5i5j.com","閾惧鍦ㄧ嚎":"lianjia.com","鎴垮ぉ涓�":"fang.com","涓師鍦颁骇":"centanet.com","绂忓窞涓嶅姩浜�":"","鎼滄埧":"fang.com", "骞哥閲�":"xflapp.com"] public static final def offlineUrl = "mongodb://developer:G00IDCDEV12385@192.168.0.136:28017"; public static final DBCollection youda_esfhouse_coll = MongoUtils.getCollectionByName2("business", "res_esfdealprice", offlineUrl) @@ -71,10 +71,10 @@ class BigdataDealBatch extends BaseBatch{ for(def city : allCitys){ addDealPriceMatch(city); } -// updateCrawlTradeDate()//修改后抓取的成交,将时间改为本月 +// updateCrawlTradeDate()//淇敼鍚庢姄鍙栫殑鎴愪氦锛屽皢鏃堕棿鏀逛负鏈湀 def rows = [] - def headers = []//["城市ID","成交ID","城市名称","行政区ID","行政区名称","街道","门牌号","小区ID","小区名称","楼栋ID","楼栋编号","楼栋名称","单元ID","单元编号","单元名称","户ID","详细地址","建筑年代","权属","权属年限","期数","所在楼层","层类型","总楼层数","建筑类型","建筑结构","建筑面积","套内面积","户型","室","厅","厨","卫","房屋用途","室内结构","朝向","装修情况","评估编号","成交单价","成交总价","申报总价","评估总价","网签合同编号","交易日期","交易类型","出售付款方式","成交周期","是否有电梯","赠送面积(地面花园)","赠送面积(露台)","赠送面积(阳台)","赠送面积(飘窗)","赠送面积(阁楼)","赠送面积(车库)","赠送面积(地下室)","赠送面积(其他)","房源数据来源","中介公司ID","中介公司名称","备注","创建时间","更新时间","来源公司","成交金额","数据时间"] + def headers = []//["鍩庡競ID","鎴愪氦ID","鍩庡競鍚嶇О","琛屾斂鍖篒D","琛屾斂鍖哄悕绉�","琛楅亾","闂ㄧ墝鍙�","灏忓尯ID","灏忓尯鍚嶇О","妤兼爧ID","妤兼爧缂栧彿","妤兼爧鍚嶇О","鍗曞厓ID","鍗曞厓缂栧彿","鍗曞厓鍚嶇О","鎴稩D","璇︾粏鍦板潃","寤虹瓚骞翠唬","鏉冨睘","鏉冨睘骞撮檺","鏈熸暟","鎵�鍦ㄦゼ灞�","灞傜被鍨�","鎬绘ゼ灞傛暟","寤虹瓚绫诲瀷","寤虹瓚缁撴瀯","寤虹瓚闈㈢Н","濂楀唴闈㈢Н","鎴峰瀷","瀹�","鍘�","鍘�","鍗�","鎴垮眿鐢ㄩ��","瀹ゅ唴缁撴瀯","鏈濆悜","瑁呬慨鎯呭喌","璇勪及缂栧彿","鎴愪氦鍗曚环","鎴愪氦鎬讳环","鐢虫姤鎬讳环","璇勪及鎬讳环","缃戠鍚堝悓缂栧彿","浜ゆ槗鏃ユ湡","浜ゆ槗绫诲瀷","鍑哄敭浠樻鏂瑰紡","鎴愪氦鍛ㄦ湡","鏄惁鏈夌數姊�","璧犻�侀潰绉紙鍦伴潰鑺卞洯锛�","璧犻�侀潰绉紙闇插彴锛�","璧犻�侀潰绉紙闃冲彴锛�","璧犻�侀潰绉紙椋樼獥锛�","璧犻�侀潰绉紙闃佹ゼ锛�","璧犻�侀潰绉紙杞﹀簱锛�","璧犻�侀潰绉紙鍦颁笅瀹わ級","璧犻�侀潰绉紙鍏朵粬锛�","鎴挎簮鏁版嵁鏉ユ簮","涓粙鍏徃ID","涓粙鍏徃鍚嶇О","澶囨敞","鍒涘缓鏃堕棿","鏇存柊鏃堕棿","鏉ユ簮鍏徃","鎴愪氦閲戦","鏁版嵁鏃堕棿"] def cityCodeDataMap = CcbCommonUtils.findCityCodeValue() def index = 0 for(def city : citys){ @@ -83,9 +83,9 @@ class BigdataDealBatch extends BaseBatch{ def ppeDists = [:] def dealIds = findHistoryDealIds(CcbCommonUtils.getCcbCity(city)) - println "历史id加载量:"+dealIds.size() + println "鍘嗗彶id鍔犺浇閲忥細"+dealIds.size() def statMap = [:]//getDistrictStatByCity(city, weekend) - if(city=="上海"){ + if(city=="涓婃捣"){ def youDataTrade = getYouDaData(statMap) def youdaDatas = createData(city, youDataTrade, cityCodeDataMap, distCodeMap, "youda", dealIds) rows.addAll(youdaDatas) @@ -96,7 +96,7 @@ class BigdataDealBatch extends BaseBatch{ if(trades){ def rets = createData(city, trades, cityCodeDataMap, distCodeMap, "other", dealIds) rows.addAll(rets) - println "【${index}】"+city +" 成交共:"+rets.size() + println "銆�${index}銆�"+city +" 鎴愪氦鍏憋細"+rets.size() def cityDatas = [] cityDatas << headers @@ -107,16 +107,16 @@ class BigdataDealBatch extends BaseBatch{ def fileName = "/home/goojia/ccb/BIGDATA_DEAL_GJ.dat" if(CommonDatautils.isWindow()){ - fileName = "d:\\数据\\建行\\房产估值\\数据文件\\txt\\BIGDATA_DEAL_GJ.dat" + fileName = "d:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\BIGDATA_DEAL_GJ.dat" } FileUtils.batchCreateFile(rows, fileName,headers, "utf-8", false); - println "txt 生成 " + rows.size() + println "txt 鐢熸垚 " + rows.size() // delPgData() saveToPgSql(rows) -// def datas = readTxt("D:\\数据\\建行\\建行成交\\MODEL_000000_000000_BIGDATA_DEAL_GJ_ADD_20230928_0001.dat") +// def datas = readTxt("D:\\鏁版嵁\\寤鸿\\寤鸿鎴愪氦\\MODEL_000000_000000_BIGDATA_DEAL_GJ_ADD_20230928_0001.dat") // saveToPgSql2(datas) } @@ -139,13 +139,13 @@ class BigdataDealBatch extends BaseBatch{ def totalCount = new AtomicLong() final CountDownLatch latch = new CountDownLatch(rets.size()) -// def lianjiaPriceMap = findThirdPartyPrice("上海") +// def lianjiaPriceMap = findThirdPartyPrice("涓婃捣") // def startDate = DateUtils.parseFromTightByPattern(DateUtils.addMonth(new Date(),-2),'yyyy-MM-dd') -// def lianjiaPriceMap = getDistrictStatByCity("上海", startDate) +// def lianjiaPriceMap = getDistrictStatByCity("涓婃捣", startDate) def ccbPriceMap = null - if(city == "上海"){ - ccbPriceMap = getCommunityPrices("上海") + if(city == "涓婃捣"){ + ccbPriceMap = getCommunityPrices("涓婃捣") } for(def i=0;i> FITMENTS_TYPES_MAPS = new HashMap>() static{ - FITMENTS_TYPES_MAPS.put("毛坯", ["毛坯", "清水", "无装修", "独栋毛坯", "毛胚", "白坯", "旧装", "坯", "原房", "毛坏"]) - FITMENTS_TYPES_MAPS.put("简装", ["简装", "普通装修", "普通", "简单装修", "简易装修", "普装", "一般装修", "一般", "简", "粗装修"]) - FITMENTS_TYPES_MAPS.put("精装", ["精装", "全装修", "全装", "中等装修", "中装", "中档装修", "精致装修", "中档", "中等", "精", "中修", "优质装修", "时尚装修", "良装", "中高挡"]) - FITMENTS_TYPES_MAPS.put("豪装", ["豪华装修", "高档", "豪华", "豪装", "高级装修", "高装", "奢侈"]) + FITMENTS_TYPES_MAPS.put("姣涘澂", ["姣涘澂", "娓呮按", "鏃犺淇�", "鐙爧姣涘澂", "姣涜儦", "鐧藉澂", "鏃ц", "鍧�", "鍘熸埧", "姣涘潖"]) + FITMENTS_TYPES_MAPS.put("绠�瑁�", ["绠�瑁�", "鏅�氳淇�", "鏅��", "绠�鍗曡淇�", "绠�鏄撹淇�", "鏅", "涓�鑸淇�", "涓�鑸�", "绠�", "绮楄淇�"]) + FITMENTS_TYPES_MAPS.put("绮捐", ["绮捐", "鍏ㄨ淇�", "鍏ㄨ", "涓瓑瑁呬慨", "涓", "涓。瑁呬慨", "绮捐嚧瑁呬慨", "涓。", "涓瓑", "绮�", "涓慨", "浼樿川瑁呬慨", "鏃跺皻瑁呬慨", "鑹", "涓珮鎸�"]) + FITMENTS_TYPES_MAPS.put("璞", ["璞崕瑁呬慨", "楂樻。", "璞崕", "璞", "楂樼骇瑁呬慨", "楂樿", "濂緢"]) } - public static final String[] TAGS = ["独栋", "联排", "叠加", "双拼", "花园面积", "泳池", "别墅", "带花园", "洋房", "叠拼", "独院", "联体", "微墅", "大平墅"]; + public static final String[] TAGS = ["鐙爧", "鑱旀帓", "鍙犲姞", "鍙屾嫾", "鑺卞洯闈㈢Н", "娉虫睜", "鍒", "甯﹁姳鍥�", "娲嬫埧", "鍙犳嫾", "鐙櫌", "鑱斾綋", "寰", "澶у钩澧�"]; public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(60) public static ExecutorService fixedThreadPool2 = Executors.newFixedThreadPool(200) @@ -79,7 +79,7 @@ class BigdataForsaleBatch extends BaseBatch{ @Override public void process(Object args) { - //目前查询库中是否已存在,用的是Oracle + //鐩墠鏌ヨ搴撲腑鏄惁宸插瓨鍦紝鐢ㄧ殑鏄疧racle def index = 0 def citys = CcbCommonUtils.getRunningCitys(args) @@ -88,7 +88,7 @@ class BigdataForsaleBatch extends BaseBatch{ def startDate = lastMonth+"18" def endDate = curMonth+"19" - println "房源时间:"+startDate+" "+endDate + println "鎴挎簮鏃堕棿锛�"+startDate+" "+endDate def houseIdsfilter = findAllHouseIdsByCity() @@ -100,14 +100,14 @@ class BigdataForsaleBatch extends BaseBatch{ def districts = CcbCommonUtils.findAllDistrictByCity(city, "district", ["city", "region", "name", "lng","estate_type2","name_cat","address", "alias", "finish_building_date", "house_property", "property_life", "build_type", "build_structure"], null); // exportSellCSV(index, city, cityCodeDataMap, distCodeMap, districts, 20230118, 20230219); exportSellCSV(index, city, cityCodeDataMap, distCodeMap, districts, startDate.toInteger(), endDate.toInteger(), houseIdsfilter); - //测试通过匹配接口配房源效果 + //娴嬭瘯閫氳繃鍖归厤鎺ュ彛閰嶆埧婧愭晥鏋� // exportSellCSV(index, city, cityCodeDataMap, distCodeMap, districts, 20201201, 20211118) } } def statCity(def citys){ - def datas = ExcelUtils.read("C:\\Users\\gaojuan\\Desktop\\无房源城市.xlsx",0,1) + def datas = ExcelUtils.read("C:\\Users\\gaojuan\\Desktop\\鏃犳埧婧愬煄甯�.xlsx",0,1) def houseCitys = [] for(def d : datas){ houseCitys << d['C'] @@ -125,16 +125,16 @@ class BigdataForsaleBatch extends BaseBatch{ def exportSellCSV(index,city, cityCodeDataMap, distCodeMap, districts, startDate, endDate, houseIdsfilter){ def retMap = findAllCommHouse(index,city, cityCodeDataMap, distCodeMap, districts, startDate, endDate, houseIdsfilter) - println city + "(原)房源总量:"+retMap.size() + println city + "(鍘�)鎴挎簮鎬婚噺锛�"+retMap.size() def allDatas = retMap.values() // // allDatas = repeatHouseId(allDatas) -// println city + "(新)房源总量:"+allDatas.size() +// println city + "(鏂�)鎴挎簮鎬婚噺锛�"+allDatas.size() def fileName = "/home/goojia/ccb/BIGDATA_FORSALE_GJ.dat" if(CommonDatautils.isWindow()){ - fileName = "d:\\数据\\建行\\房产估值\\数据文件\\txt\\BIGDATA_FORSALE_GJ.dat" + fileName = "d:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\BIGDATA_FORSALE_GJ.dat" } @@ -142,10 +142,10 @@ class BigdataForsaleBatch extends BaseBatch{ def headers = [] // if(index == 1){ -// headers = ["城市ID","出售ID","挂牌房屋ID","城市名称","行政区ID","行政区名称","小区ID","小区名称","楼栋ID","楼栋编号","楼栋名称","单元ID","单元编号","单元名称","户ID","详细地址","建筑年代","权属","权属年限","单价","总价","出售付款方式","所在楼层","总楼层","建筑类型","室内结构","建筑结构","建筑面积","套内面积","户型","室","厅","厨","卫","朝向","装修情况","是否有电梯","几梯几户","发布时间","到期时间","是否首发","房源数据来源","中介公司ID","中介公司名称","发布人","发布人电话","描述信息","备注","创建时间","更新时间","来源公司","附加信息"] +// headers = ["鍩庡競ID","鍑哄敭ID","鎸傜墝鎴垮眿ID","鍩庡競鍚嶇О","琛屾斂鍖篒D","琛屾斂鍖哄悕绉�","灏忓尯ID","灏忓尯鍚嶇О","妤兼爧ID","妤兼爧缂栧彿","妤兼爧鍚嶇О","鍗曞厓ID","鍗曞厓缂栧彿","鍗曞厓鍚嶇О","鎴稩D","璇︾粏鍦板潃","寤虹瓚骞翠唬","鏉冨睘","鏉冨睘骞撮檺","鍗曚环","鎬讳环","鍑哄敭浠樻鏂瑰紡","鎵�鍦ㄦゼ灞�","鎬绘ゼ灞�","寤虹瓚绫诲瀷","瀹ゅ唴缁撴瀯","寤虹瓚缁撴瀯","寤虹瓚闈㈢Н","濂楀唴闈㈢Н","鎴峰瀷","瀹�","鍘�","鍘�","鍗�","鏈濆悜","瑁呬慨鎯呭喌","鏄惁鏈夌數姊�","鍑犳鍑犳埛","鍙戝竷鏃堕棿","鍒版湡鏃堕棿","鏄惁棣栧彂","鎴挎簮鏁版嵁鏉ユ簮","涓粙鍏徃ID","涓粙鍏徃鍚嶇О","鍙戝竷浜�","鍙戝竷浜虹數璇�","鎻忚堪淇℃伅","澶囨敞","鍒涘缓鏃堕棿","鏇存柊鏃堕棿","鏉ユ簮鍏徃","闄勫姞淇℃伅"] // } FileUtils.batchCreateFile(allDatas, fileName, headers, "utf-8", true); - println "txt文件生成->手动导入到Oracle " + println "txt鏂囦欢鐢熸垚->鎵嬪姩瀵煎叆鍒癘racle " saveToPgSql(allDatas) } @@ -153,7 +153,7 @@ class BigdataForsaleBatch extends BaseBatch{ def findAllCommHouse(index,city, cityCodeDataMap, distCodeMap, districts, startDate, endDate, houseIdsfilter){ def totalCount = new AtomicLong() final CountDownLatch latch = new CountDownLatch(districts.size()) - println city +" 小区量:"+districts.size() + println city +" 灏忓尯閲忥細"+districts.size() @@ -170,7 +170,7 @@ class BigdataForsaleBatch extends BaseBatch{ def ret = findHouses(city, rMap.region, "sell", startDate,endDate, rMap.name, rMap.alias, rMap.estate_type2, commId, cityCodeDataMap) //def ret = findHousesByDistId(city, commId, "sell", startDate,endDate) -// if(ret && ret.size()<100){//导历史房源需要,以后不需要 +// if(ret && ret.size()<100){//瀵煎巻鍙叉埧婧愰渶瑕侊紝浠ュ悗涓嶉渶瑕� // ret = findHouses(city, rMap.region, "sell", 20190701, endDate, rMap.name, rMap.alias) // } if(ret){ @@ -204,15 +204,15 @@ class BigdataForsaleBatch extends BaseBatch{ m.source = "FJW" retMap.put(m.houseId, converData(m)) }else{ - println city +" "+m.houseId+" 已存在" + println city +" "+m.houseId+" 宸插瓨鍦�" } } }else{ - println city +" "+rMap.region+" 没有找到对应的区域" + println city +" "+rMap.region+" 娌℃湁鎵惧埌瀵瑰簲鐨勫尯鍩�" } } - println totalCount.get() +" "+city+" "+rMap.region+" "+rMap.name+" 原始:"+ret.size()+" 过滤后:"+retMap.size() + println totalCount.get() +" "+city+" "+rMap.region+" "+rMap.name+" 鍘熷:"+ret.size()+" 杩囨护鍚庯細"+retMap.size() } catch (Exception e) { e.printStackTrace() @@ -240,7 +240,7 @@ class BigdataForsaleBatch extends BaseBatch{ totalCount.addAndGet(1) def count = isExistFromHouse(houseInfo[1]) if(count){ - println houseInfo[1]+" 已存在 "+totalCount.get() + println houseInfo[1]+" 宸插瓨鍦� "+totalCount.get() }else{ rets << houseInfo } @@ -263,7 +263,7 @@ class BigdataForsaleBatch extends BaseBatch{ def totalCount = new AtomicLong() final CountDownLatch latch = new CountDownLatch(values.size()) - println city +"总房源量:"+values.size() + println city +"鎬绘埧婧愰噺锛�"+values.size() def datas = Collections.synchronizedList(new ArrayList()); for(def i=0;i>> it = FITMENTS_TYPES_MAPS @@ -1055,7 +1055,7 @@ class BigdataForsaleBatch extends BaseBatch{ if (directionDesc == null) { return null } - directionDesc = directionDesc.replaceAll("(\\(|(|《|\"|“|【|〔).+?(\\)|》|)|\"|”|】|〕)", "#_#") + directionDesc = directionDesc.replaceAll("(\\(|锛坾銆妡\"|鈥渱銆恷銆�).+?(\\)|銆媩锛墊\"|鈥潀銆憒銆�)", "#_#") StringBuffer sb = new StringBuffer() for (int i = 0; i < directionDesc.length(); i++) { String c = directionDesc.substring(i, i + 1) @@ -1085,7 +1085,7 @@ class BigdataForsaleBatch extends BaseBatch{ def marge(){ - File file = new File("D:\\数据\\建行\\新建文本文档.txt"); + File file = new File("D:\\鏁版嵁\\寤鸿\\鏂板缓鏂囨湰鏂囨。.txt"); def ids = new HashSet(); def index = 0 @@ -1114,7 +1114,7 @@ class BigdataForsaleBatch extends BaseBatch{ } def findAllHouseIdsByCity(){ - // 创建布隆过滤器对象 + // 鍒涘缓甯冮殕杩囨护鍣ㄥ璞� BloomFilter filter = BloomFilter.create(Funnels.stringFunnel(StandardCharsets.UTF_8), 200000000, 0.000001); // def houseIds = new HashSet() pgsqlInstance.eachRow("SELECT gujia_sell_id FROM base.t0831_bigdata_forsale_gj_h",{it-> diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataPoiBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataPoiBatch.groovy index 08653a46a..01df0046c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataPoiBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataPoiBatch.groovy @@ -17,7 +17,7 @@ import java.util.concurrent.Executors import java.util.concurrent.atomic.AtomicLong import org.bson.types.ObjectId /** - * 建行数据poi同步 + * 寤鸿鏁版嵁poi鍚屾 */ @BatchOwner(Watcher.GaoJuan) class BigdataPoiBatch extends BaseBatch{ @@ -34,51 +34,51 @@ class BigdataPoiBatch extends BaseBatch{ def citys = CcbCommonUtils.citys_252 -// def dealDatas = ExcelUtils.read("D:\\数据\\建行\\房产估值\\poi\\POI数据_丧葬设施_252.xlsx", 0,1) -// def hosptialDatas = ExcelUtils.read("D:\\数据\\建行\\房产估值\\poi\\POI数据_医院_聚类2_252.xlsx", 0,1) -// def subwaydatas = ExcelUtils.read("D:\\数据\\建行\\房产估值\\poi\\POI数据_地铁_252.xlsx", 0,1) -// def busDatas = ExcelUtils.read("D:\\数据\\建行\\房产估值\\poi\\POI数据_公交_252.xlsx", 0,1) -// def bankDatas = ExcelUtils.read("D:\\数据\\建行\\房产估值\\poi\\POI数据_银行_252.xlsx", 0,1) +// def dealDatas = ExcelUtils.read("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\poi\\POI鏁版嵁_涓ц懍璁炬柦_252.xlsx", 0,1) +// def hosptialDatas = ExcelUtils.read("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\poi\\POI鏁版嵁_鍖婚櫌_鑱氱被2_252.xlsx", 0,1) +// def subwaydatas = ExcelUtils.read("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\poi\\POI鏁版嵁_鍦伴搧_252.xlsx", 0,1) +// def busDatas = ExcelUtils.read("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\poi\\POI鏁版嵁_鍏氦_252.xlsx", 0,1) +// def bankDatas = ExcelUtils.read("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\poi\\POI鏁版嵁_閾惰_252.xlsx", 0,1) - def schoolDatas = ExcelUtils.read("D:\\数据\\建行\\房产估值\\poi\\POI数据_学校_252.xlsx", 0,1) -// def hosptialDatas = ExcelUtils.read("D:\\数据\\建行\\房产估值\\poi\\八城市医院(二次审核).xlsx", 0,1) + def schoolDatas = ExcelUtils.read("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\poi\\POI鏁版嵁_瀛︽牎_252.xlsx", 0,1) +// def hosptialDatas = ExcelUtils.read("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\poi\\鍏煄甯傚尰闄�(浜屾瀹℃牳).xlsx", 0,1) def rets = [] -// def rows1 = createDatas(citys, cityCodeDataMap, hosptialDatas, "医院") +// def rows1 = createDatas(citys, cityCodeDataMap, hosptialDatas, "鍖婚櫌") // rets.addAll(rows1) // -// def rows2 = createDatas(citys, cityCodeDataMap, busDatas, "公交") +// def rows2 = createDatas(citys, cityCodeDataMap, busDatas, "鍏氦") // rets.addAll(rows2) // -// def rows3 = createDatas(citys, cityCodeDataMap, bankDatas, "银行") +// def rows3 = createDatas(citys, cityCodeDataMap, bankDatas, "閾惰") // rets.addAll(rows3) //// -// def rows4 = createDatas(citys, cityCodeDataMap, dealDatas, "丧葬服务") +// def rows4 = createDatas(citys, cityCodeDataMap, dealDatas, "涓ц懍鏈嶅姟") // rets.addAll(rows4) // - def rows6 = createDatas(citys, cityCodeDataMap, schoolDatas, "学校") + def rows6 = createDatas(citys, cityCodeDataMap, schoolDatas, "瀛︽牎") rets.addAll(rows6) -// def rows5 = createDatas(citys, cityCodeDataMap, subwaydatas, "地铁") +// def rows5 = createDatas(citys, cityCodeDataMap, subwaydatas, "鍦伴搧") // rets.addAll(rows5) // - def headers = []//["城市ID","行政区ID","ID","Poi名称","类型","类型编码","纬度","经度","备注","创建时间","更新时间","性质","级别","来源公司"] + def headers = []//["鍩庡競ID","琛屾斂鍖篒D","ID","Poi鍚嶇О","绫诲瀷","绫诲瀷缂栫爜","绾害","缁忓害","澶囨敞","鍒涘缓鏃堕棿","鏇存柊鏃堕棿","鎬ц川","绾у埆","鏉ユ簮鍏徃"] def fileName = "/home/goojia/ccb/BIGDATA_POI_GJ.dat" if(CommonDatautils.isWindow()){ - fileName = "d:\\数据\\建行\\房产估值\\数据文件\\txt\\BIGDATA_POI_GJ.dat" + fileName = "d:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\BIGDATA_POI_GJ.dat" } FileUtils.batchCreateFile(rets, fileName, headers, "utf-8", false); - println "txt 生成" + println "txt 鐢熸垚" -// def headers1 = ["城市ID","城市","行政区ID","区域名称","经度","纬度","创建时间","来源公司"] -// def regionCenterDatas = ExcelUtils.read("D:\\数据\\建行\\房产估值\\poi\\行政区中心点经纬度.xlsx", 0,1) +// def headers1 = ["鍩庡競ID","鍩庡競","琛屾斂鍖篒D","鍖哄煙鍚嶇О","缁忓害","绾害","鍒涘缓鏃堕棿","鏉ユ簮鍏徃"] +// def regionCenterDatas = ExcelUtils.read("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\poi\\琛屾斂鍖轰腑蹇冪偣缁忕含搴�.xlsx", 0,1) // def regionRets = createRegionCenters(regionCenterDatas) -// FileUtils.batchCreateFile(regionRets, "d:\\数据\\建行\\房产估值\\数据文件\\txt\\region_center.txt", headers1, "utf-8", false); -// println "行政区域中心txt 生成" +// FileUtils.batchCreateFile(regionRets, "d:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\region_center.txt", headers1, "utf-8", false); +// println "琛屾斂鍖哄煙涓績txt 鐢熸垚" } @@ -169,7 +169,7 @@ class BigdataPoiBatch extends BaseBatch{ ret << distObj.district_code }else{ ret << "" - println d['E']+" " + region+" 无对应的区域编码 "+d['F'] + println d['E']+" " + region+" 鏃犲搴旂殑鍖哄煙缂栫爜 "+d['F'] } }else{ ret << "" @@ -185,17 +185,17 @@ class BigdataPoiBatch extends BaseBatch{ ret << d['G'] ret << type - if(type=="地铁"){ + if(type=="鍦伴搧"){ ret << "cz125" - }else if(type=="公交"){ + }else if(type=="鍏氦"){ ret << "cz123" - }else if(type=="医院"){ + }else if(type=="鍖婚櫌"){ ret << "hp111" - }else if(type == "银行"){ + }else if(type == "閾惰"){ ret << "se118" - }else if(type =="丧葬服务"){ + }else if(type =="涓ц懍鏈嶅姟"){ ret << "ob101" - }else if(type =="学校"){ + }else if(type =="瀛︽牎"){ if(d['B'].contains("141202")){ ret << "ed138" }else if(d['B'].contains("141203")){ @@ -241,7 +241,7 @@ class BigdataPoiBatch extends BaseBatch{ ret << distObj.district_code }else{ ret << "" - println d['D']+" " + d['E']+" 无对应的区域编码 "+d['F'] + println d['D']+" " + d['E']+" 鏃犲搴旂殑鍖哄煙缂栫爜 "+d['F'] } }else{ ret << "" @@ -250,20 +250,20 @@ class BigdataPoiBatch extends BaseBatch{ ret << d['F'] ret << type - if(type=="地铁"){ + if(type=="鍦伴搧"){ ret << "cz125" - }else if(type=="公交"){ + }else if(type=="鍏氦"){ ret << "cz123" - }else if(type=="医院"){ + }else if(type=="鍖婚櫌"){ ret << "hp111" - }else if(type == "银行"){ + }else if(type == "閾惰"){ ret << "se118" - }else if(type =="丧葬服务"){ + }else if(type =="涓ц懍鏈嶅姟"){ ret << "ob101" - }else if(type =="学校"){ - if(d['B'].contains("中学")){ + }else if(type =="瀛︽牎"){ + if(d['B'].contains("涓")){ ret << "ed138" - }else if(d['B'].contains("小学")){ + }else if(d['B'].contains("灏忓")){ ret << "ed114" } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataSynchPrice.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataSynchPrice.groovy index 900485bd0..a2fe0ad4d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataSynchPrice.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataSynchPrice.groovy @@ -5,7 +5,7 @@ import com.fangjia.script.util.DateUtils import groovy.sql.Sql /*** - * 同步上个月城市,区域,小区价格到base库中 + * 鍚屾涓婁釜鏈堝煄甯傦紝鍖哄煙锛屽皬鍖轰环鏍煎埌base搴撲腑 */ class BigdataSynchPrice extends BaseBatch{ @@ -65,7 +65,7 @@ class BigdataSynchPrice extends BaseBatch{ - println "同步城市均价 start: "+new Date() + println "鍚屾鍩庡競鍧囦环 start: "+new Date() def sql = "insert into base.t0831_city_price_gj_h values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)" pgsqlInstance.withBatch(500, sql){ ps-> @@ -115,7 +115,7 @@ class BigdataSynchPrice extends BaseBatch{ }); } - println "同步区域均价 start: "+new Date() + println "鍚屾鍖哄煙鍧囦环 start: "+new Date() def sql = "insert into base.t0831_district_price_gj_h values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)" pgsqlInstance.withBatch(1000, sql){ ps-> @@ -173,7 +173,7 @@ class BigdataSynchPrice extends BaseBatch{ } - println "同步小区价格 start: "+new Date() + println "鍚屾灏忓尯浠锋牸 start: "+new Date() def sql = "insert into base.t0831_community_base_price_gj_h values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)" pgsqlInstance.withBatch(50000, sql){ ps-> diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/CcbCommonUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/CcbCommonUtils.groovy index e327733ab..51c10aa43 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/CcbCommonUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/CcbCommonUtils.groovy @@ -17,13 +17,13 @@ import java.nio.charset.StandardCharsets class CcbCommonUtils { - public static def citys_fjw_all = ["长春","上海","扬州","北京","重庆","天津","成都","深圳","沈阳","大连","安庆","西宁","日照","武汉","西安","乌鲁木齐","苏州","广州","南京","青岛","济南","宁波","长沙","石家庄","佛山","嘉兴","银川","南通","廊坊","中山","郑州","哈尔滨","烟台", "徐州","绍兴","厦门","昆明","南昌","贵阳","珠海","东莞","镇江","洛阳","温州","兰州","福州","惠州","呼和浩特","常州","唐山","淮安","湖州","九江","太原","北海","株洲","淄博","盐城","海口","南宁","常德","台州","金华","吉林","岳阳","柳州","清远","湛江","张家口","保定","杭州","合肥","无锡","泉州","遵义","肇庆","漳州","宜昌","芜湖","泰州","汕头","三亚","秦皇岛","马鞍山","连云港","沧州","拉萨","锦州","大同","文昌","保亭","陵水","潍坊","临沂","邯郸","济宁","威海","绵阳","梅州","平顶山","江门","赣州","泰安","襄阳","南阳","桂林","聊城","临汾","德州","商丘","衡阳","宿迁","包头","渭南","咸阳","许昌","滨州","邢台","南充","安阳","新乡","枣庄","滁州","龙岩","宝鸡","信阳","运城","衡水","东营","晋中","孝感","长治","阜阳","韶关","菏泽","德阳","宁德","荆州","乐山","驻马店","南平","汉中","榆林","宜春","鞍山","开封","周口","绥化","湘潭","黄冈","承德","焦作","牡丹江","莆田","上饶","眉山","齐齐哈尔","郴州","营口","蚌埠","大庆","赤峰","河源","吕梁","遂宁","漯河","三明","茂名","濮阳","曲靖","平凉","鄂尔多斯","十堰","吉安","黄石","佳木斯","三门峡","揭阳","忻州","通辽","泸州","六安","潮州","衢州","淮南","荆门","永州","呼伦贝尔","葫芦岛","丹东","延边","宣城","宜宾","庆阳","晋城","阳江","宿州","延安","咸宁","怀化","黄山","舟山","汕尾","盘锦","朝阳","丽水","抚州","铁岭","红河","陇南","广安","抚顺","自贡","达州","玉林","玉溪","白银","亳州","邵阳","广元","昌吉","益阳","张掖","娄底","阳泉","天水","随州","朔州","大理","通化","楚雄","巴彦淖尔","乌兰察布","新余","景德镇","松原","辽阳","阜新","酒泉","黔南","淮北","四平","梧州","黔东南","巴中","鹤壁","鸡西","内江","钦州","池州","仙桃","恩施","本溪","资阳","六盘水","百色","白城","临夏","伊犁","贵港","白山","双鸭山","吴忠","鄂州","丽江","安康","毕节","云浮","巴音郭楞","安顺","阿克苏","黑河","铜陵","雅安","石嘴山","萍乡","鹤岗","锡林郭勒盟","铜仁","防城港","喀什","兴安盟","河池","铜川","普洱","保山","凉山州","鹰潭","定西","伊春","中卫","黔西南","商洛","乌海","武威","海西州","来宾","昭通","湘西","哈密","张家界","西双版纳州","七台河","固原","攀枝花","德宏州","崇左","辽源","嘉峪关","克拉玛依","临沧","潜江","贺州","天门","海东","塔城","儋州","金昌","博尔塔拉","吐鲁番","大兴安岭","阿勒泰","和田","迪庆州","日喀则","林芝","阿坝州","阿拉善盟","阿里","昌都","甘南","甘孜州","果洛州","海北州","海南州","黄南州","克孜勒苏","那曲","怒江州","三沙","山南","神农架","文山州","玉树州","白沙","北屯","昌江","澄迈","定安","东方","济源","可克达拉","昆玉","乐东","临高","琼海","琼中","石河子","双河","铁门关","图木舒克","屯昌","万宁","五家渠","五指山","阿拉尔"] + public static def citys_fjw_all = ["闀挎槬","涓婃捣","鎵窞","鍖椾含","閲嶅簡","澶╂触","鎴愰兘","娣卞湷","娌堥槼","澶ц繛","瀹夊簡","瑗垮畞","鏃ョ収","姝︽眽","瑗垮畨","涔岄瞾鏈ㄩ綈","鑻忓窞","骞垮窞","鍗椾含","闈掑矝","娴庡崡","瀹佹尝","闀挎矙","鐭冲搴�","浣涘北","鍢夊叴","閾跺窛","鍗楅��","寤婂潑","涓北","閮戝窞","鍝堝皵婊�","鐑熷彴", "寰愬窞","缁嶅叴","鍘﹂棬","鏄嗘槑","鍗楁槍","璐甸槼","鐝犳捣","涓滆帪","闀囨睙","娲涢槼","娓╁窞","鍏板窞","绂忓窞","鎯犲窞","鍛煎拰娴╃壒","甯稿窞","鍞愬北","娣畨","婀栧窞","涔濇睙","澶師","鍖楁捣","鏍床","娣勫崥","鐩愬煄","娴峰彛","鍗楀畞","甯稿痉","鍙板窞","閲戝崕","鍚夋灄","宀抽槼","鏌冲窞","娓呰繙","婀涙睙","寮犲鍙�","淇濆畾","鏉窞","鍚堣偉","鏃犻敗","娉夊窞","閬典箟","鑲囧簡","婕冲窞","瀹滄槍","鑺滄箹","娉板窞","姹曞ご","涓変簹","绉︾殗宀�","椹瀺灞�","杩炰簯娓�","娌у窞","鎷夎惃","閿﹀窞","澶у悓","鏂囨槍","淇濅涵","闄垫按","娼嶅潑","涓存矀","閭兏","娴庡畞","濞佹捣","缁甸槼","姊呭窞","骞抽《灞�","姹熼棬","璧e窞","娉板畨","瑗勯槼","鍗楅槼","妗傛灄","鑱婂煄","涓存本","寰峰窞","鍟嗕笜","琛¢槼","瀹胯縼","鍖呭ご","娓崡","鍜搁槼","璁告槍","婊ㄥ窞","閭㈠彴","鍗楀厖","瀹夐槼","鏂颁埂","鏋e簞","婊佸窞","榫欏博","瀹濋浮","淇¢槼","杩愬煄","琛℃按","涓滆惀","鏅嬩腑","瀛濇劅","闀挎不","闃滈槼","闊跺叧","鑿忔辰","寰烽槼","瀹佸痉","鑽嗗窞","涔愬北","椹婚┈搴�","鍗楀钩","姹変腑","姒嗘灄","瀹滄槬","闉嶅北","寮�灏�","鍛ㄥ彛","缁ュ寲","婀樻江","榛勫唸","鎵垮痉","鐒︿綔","鐗′腹姹�","鑾嗙敯","涓婇ザ","鐪夊北","榻愰綈鍝堝皵","閮村窞","钀ュ彛","铓屽煚","澶у簡","璧ゅ嘲","娌虫簮","鍚曟","閬傚畞","婕渤","涓夋槑","鑼傚悕","婵槼","鏇查潠","骞冲噳","閯傚皵澶氭柉","鍗佸牥","鍚夊畨","榛勭煶","浣虫湪鏂�","涓夐棬宄�","鎻槼","蹇诲窞","閫氳窘","娉稿窞","鍏畨","娼窞","琛㈠窞","娣崡","鑽嗛棬","姘稿窞","鍛间鸡璐濆皵","钁姦宀�","涓逛笢","寤惰竟","瀹e煄","瀹滃","搴嗛槼","鏅嬪煄","闃虫睙","瀹垮窞","寤跺畨","鍜稿畞","鎬�鍖�","榛勫北","鑸熷北","姹曞熬","鐩橀敠","鏈濋槼","涓芥按","鎶氬窞","閾佸箔","绾㈡渤","闄囧崡","骞垮畨","鎶氶『","鑷础","杈惧窞","鐜夋灄","鐜夋邯","鐧介摱","浜冲窞","閭甸槼","骞垮厓","鏄屽悏","鐩婇槼","寮犳帠","濞勫簳","闃虫硥","澶╂按","闅忓窞","鏈斿窞","澶х悊","閫氬寲","妤氶泟","宸村溅娣栧皵","涔屽叞瀵熷竷","鏂颁綑","鏅痉闀�","鏉惧師","杈介槼","闃滄柊","閰掓硥","榛斿崡","娣寳","鍥涘钩","姊у窞","榛斾笢鍗�","宸翠腑","楣ゅ","楦¤タ","鍐呮睙","閽﹀窞","姹犲窞","浠欐","鎭╂柦","鏈邯","璧勯槼","鍏洏姘�","鐧捐壊","鐧藉煄","涓村","浼婄妬","璐垫腐","鐧藉北","鍙岄腑灞�","鍚村繝","閯傚窞","涓芥睙","瀹夊悍","姣曡妭","浜戞诞","宸撮煶閮","瀹夐『","闃垮厠鑻�","榛戞渤","閾滈櫟","闆呭畨","鐭冲槾灞�","钀嶄埂","楣ゅ矖","閿℃灄閮嫆鐩�","閾滀粊","闃插煄娓�","鍠�浠�","鍏村畨鐩�","娌虫睜","閾滃窛","鏅幢","淇濆北","鍑夊北宸�","楣版江","瀹氳タ","浼婃槬","涓崼","榛旇タ鍗�","鍟嗘礇","涔屾捣","姝﹀▉","娴疯タ宸�","鏉ュ","鏄��","婀樿タ","鍝堝瘑","寮犲鐣�","瑗垮弻鐗堢撼宸�","涓冨彴娌�","鍥哄師","鏀�鏋濊姳","寰峰畯宸�","宕囧乏","杈芥簮","鍢夊唱鍏�","鍏嬫媺鐜涗緷","涓存钵","娼滄睙","璐哄窞","澶╅棬","娴蜂笢","濉斿煄","鍎嬪窞","閲戞槍","鍗氬皵濉旀媺","鍚愰瞾鐣�","澶у叴瀹夊箔","闃垮嫆娉�","鍜岀敯","杩簡宸�","鏃ュ杸鍒�","鏋楄姖","闃垮潩宸�","闃挎媺鍠勭洘","闃块噷","鏄岄兘","鐢樺崡","鐢樺瓬宸�","鏋滄礇宸�","娴峰寳宸�","娴峰崡宸�","榛勫崡宸�","鍏嬪瓬鍕掕嫃","閭f洸","鎬掓睙宸�","涓夋矙","灞卞崡","绁炲啘鏋�","鏂囧北宸�","鐜夋爲宸�","鐧芥矙","鍖楀悲","鏄屾睙","婢勮繄","瀹氬畨","涓滄柟","娴庢簮","鍙厠杈炬媺","鏄嗙帀","涔愪笢","涓撮珮","鐞兼捣","鐞间腑","鐭虫渤瀛�","鍙屾渤","閾侀棬鍏�","鍥炬湪鑸掑厠","灞槍","涓囧畞","浜斿娓�","浜旀寚灞�","闃挎媺灏�"] - public static def citys_all = ["乌鲁木齐","上海","长春","扬州","北京","重庆","天津","成都","沈阳","大连","安庆","西宁","日照","武汉","西安","苏州","广州","南京","青岛","济南","宁波","长沙","石家庄","佛山","嘉兴","银川","南通","廊坊","中山","郑州","哈尔滨","烟台","徐州","绍兴","厦门","昆明","南昌","贵阳","珠海","东莞","镇江","洛阳","温州","兰州","福州","惠州","呼和浩特","常州","唐山","淮安","湖州","九江","太原","北海","株洲","淄博","盐城","海口","南宁","常德","台州","金华","吉林","岳阳","柳州","清远","湛江","张家口","保定","深圳","杭州","合肥","无锡","泉州","遵义","肇庆","漳州","宜昌","芜湖","泰州","汕头","三亚","秦皇岛","马鞍山","连云港","沧州","拉萨","锦州","大同","文昌","保亭","陵水","潍坊","临沂","邯郸","济宁","威海","绵阳","梅州","平顶山","江门","赣州","泰安","襄阳","南阳","桂林","聊城","临汾","德州","商丘","衡阳","宿迁","包头","渭南","咸阳","许昌","滨州","邢台","南充","安阳","新乡","枣庄","滁州","龙岩","宝鸡","信阳","运城","衡水","东营","晋中","孝感","长治","阜阳","韶关","菏泽","德阳","宁德","荆州","乐山","驻马店","南平","汉中","榆林","宜春","鞍山","开封","周口","绥化","湘潭","黄冈","承德","焦作","牡丹江","莆田","上饶","眉山","齐齐哈尔","郴州","营口","蚌埠","大庆","赤峰","河源","吕梁","遂宁","漯河","三明","茂名","濮阳","曲靖","平凉","鄂尔多斯","十堰","吉安","黄石","佳木斯","三门峡","揭阳","忻州","通辽","泸州","六安","潮州","衢州","淮南","荆门","永州","呼伦贝尔","葫芦岛","丹东","延边","宣城","宜宾","庆阳","晋城","阳江","宿州","延安","咸宁","怀化","黄山","舟山","汕尾","盘锦","朝阳","丽水","抚州","铁岭","红河","陇南","广安","抚顺","自贡","达州","玉林","玉溪","白银","亳州","邵阳","广元","昌吉","益阳","张掖","娄底","阳泉","天水","随州","朔州","大理","通化","楚雄","巴彦淖尔","乌兰察布","新余","景德镇","松原","辽阳","阜新","酒泉","黔南","淮北","四平","梧州","黔东南","巴中","鹤壁","鸡西","内江","钦州","池州","仙桃","恩施","本溪","资阳","六盘水","百色","白城","临夏","伊犁","贵港","白山","双鸭山","吴忠","鄂州","丽江","安康","毕节","云浮","巴音郭楞","安顺","阿克苏","黑河","铜陵","雅安","石嘴山","萍乡","鹤岗","锡林郭勒盟","铜仁","防城港","喀什","兴安盟","河池","铜川","普洱","保山","凉山州","鹰潭","定西","伊春","中卫","黔西南","商洛","乌海","武威","海西州","来宾","昭通","湘西","哈密","张家界","西双版纳州","七台河","固原","攀枝花","德宏州","崇左","辽源","嘉峪关","克拉玛依","临沧","潜江","贺州","天门","海东","塔城","儋州","金昌","博尔塔拉","吐鲁番","大兴安岭","阿勒泰","和田","迪庆州","日喀则","林芝"] - public static def citys_92 = [ "上海","扬州","北京","重庆","天津","成都","沈阳","大连","安庆","西宁","日照","长春","武汉","西安","苏州","广州","南京","青岛","济南","宁波","长沙","石家庄","佛山","嘉兴","银川","南通","廊坊","中山","郑州","哈尔滨","烟台","徐州","绍兴","厦门","昆明","南昌","贵阳","珠海","东莞","镇江","洛阳","温州","兰州","福州","惠州","呼和浩特","常州","唐山","淮安","湖州","九江","太原","北海","株洲","淄博","盐城","乌鲁木齐","海口","南宁","常德","台州","金华","吉林","岳阳","柳州","清远","湛江","张家口","保定","深圳","杭州","合肥","无锡","泉州","遵义","肇庆","漳州","宜昌","芜湖","泰州","汕头","三亚","秦皇岛","马鞍山","连云港","沧州","拉萨","锦州","大同","文昌","保亭","陵水"] - public static def citys_252 = ["潍坊","临沂","邯郸","济宁","威海","绵阳","梅州","平顶山","江门","赣州","泰安","襄阳","南阳","桂林","聊城","临汾","德州","商丘","衡阳","宿迁","包头","渭南","咸阳","许昌","滨州","邢台","南充","安阳","新乡","枣庄","滁州","龙岩","宝鸡","信阳","运城","衡水","东营","晋中","孝感","长治","阜阳","韶关","菏泽","德阳","宁德","荆州","乐山","驻马店","南平","汉中","榆林","宜春","鞍山","开封","周口","绥化","湘潭","黄冈","承德","焦作","牡丹江","莆田","上饶","眉山","齐齐哈尔","郴州","营口","蚌埠","大庆","赤峰","河源","吕梁","遂宁","漯河","三明","茂名","濮阳","曲靖","平凉","鄂尔多斯","十堰","吉安","黄石","佳木斯","三门峡","揭阳","忻州","通辽","泸州","六安","潮州","衢州","淮南","荆门","永州","呼伦贝尔","葫芦岛","丹东","延边","宣城","宜宾","庆阳","晋城","阳江","宿州","延安","咸宁","怀化","黄山","舟山","汕尾","盘锦","朝阳","丽水","抚州","铁岭","红河","陇南","广安","抚顺","自贡","达州","玉林","玉溪","白银","亳州","邵阳","广元","昌吉","益阳","张掖","娄底","阳泉","天水","随州","朔州","大理","通化","楚雄","巴彦淖尔","乌兰察布","新余","景德镇","松原","辽阳","阜新","酒泉","黔南","淮北","四平","梧州","黔东南","巴中","鹤壁","鸡西","内江","钦州","池州","仙桃","恩施","本溪","资阳","六盘水","百色","白城","临夏","伊犁","贵港","白山","双鸭山","吴忠","鄂州","丽江","安康","毕节","云浮","巴音郭楞","安顺","阿克苏","黑河","铜陵","雅安","石嘴山","萍乡","鹤岗","锡林郭勒盟","铜仁","防城港","喀什","兴安盟","河池","铜川","普洱","保山","凉山州","鹰潭","定西","伊春","中卫","黔西南","商洛","乌海","武威","海西州","来宾","昭通","湘西","哈密","张家界","西双版纳州","七台河","固原","攀枝花","德宏州","崇左","辽源","嘉峪关","克拉玛依","临沧","潜江","贺州","天门","海东","塔城","儋州","金昌","博尔塔拉","吐鲁番","大兴安岭","阿勒泰","和田","迪庆州","日喀则","林芝","阿坝州","阿拉善盟","阿里","昌都","甘南","甘孜州","果洛州","海北州","海南州","黄南州","克孜勒苏","那曲","怒江州","三沙","山南","神农架","文山州","玉树州"] + public static def citys_all = ["涔岄瞾鏈ㄩ綈","涓婃捣","闀挎槬","鎵窞","鍖椾含","閲嶅簡","澶╂触","鎴愰兘","娌堥槼","澶ц繛","瀹夊簡","瑗垮畞","鏃ョ収","姝︽眽","瑗垮畨","鑻忓窞","骞垮窞","鍗椾含","闈掑矝","娴庡崡","瀹佹尝","闀挎矙","鐭冲搴�","浣涘北","鍢夊叴","閾跺窛","鍗楅��","寤婂潑","涓北","閮戝窞","鍝堝皵婊�","鐑熷彴","寰愬窞","缁嶅叴","鍘﹂棬","鏄嗘槑","鍗楁槍","璐甸槼","鐝犳捣","涓滆帪","闀囨睙","娲涢槼","娓╁窞","鍏板窞","绂忓窞","鎯犲窞","鍛煎拰娴╃壒","甯稿窞","鍞愬北","娣畨","婀栧窞","涔濇睙","澶師","鍖楁捣","鏍床","娣勫崥","鐩愬煄","娴峰彛","鍗楀畞","甯稿痉","鍙板窞","閲戝崕","鍚夋灄","宀抽槼","鏌冲窞","娓呰繙","婀涙睙","寮犲鍙�","淇濆畾","娣卞湷","鏉窞","鍚堣偉","鏃犻敗","娉夊窞","閬典箟","鑲囧簡","婕冲窞","瀹滄槍","鑺滄箹","娉板窞","姹曞ご","涓変簹","绉︾殗宀�","椹瀺灞�","杩炰簯娓�","娌у窞","鎷夎惃","閿﹀窞","澶у悓","鏂囨槍","淇濅涵","闄垫按","娼嶅潑","涓存矀","閭兏","娴庡畞","濞佹捣","缁甸槼","姊呭窞","骞抽《灞�","姹熼棬","璧e窞","娉板畨","瑗勯槼","鍗楅槼","妗傛灄","鑱婂煄","涓存本","寰峰窞","鍟嗕笜","琛¢槼","瀹胯縼","鍖呭ご","娓崡","鍜搁槼","璁告槍","婊ㄥ窞","閭㈠彴","鍗楀厖","瀹夐槼","鏂颁埂","鏋e簞","婊佸窞","榫欏博","瀹濋浮","淇¢槼","杩愬煄","琛℃按","涓滆惀","鏅嬩腑","瀛濇劅","闀挎不","闃滈槼","闊跺叧","鑿忔辰","寰烽槼","瀹佸痉","鑽嗗窞","涔愬北","椹婚┈搴�","鍗楀钩","姹変腑","姒嗘灄","瀹滄槬","闉嶅北","寮�灏�","鍛ㄥ彛","缁ュ寲","婀樻江","榛勫唸","鎵垮痉","鐒︿綔","鐗′腹姹�","鑾嗙敯","涓婇ザ","鐪夊北","榻愰綈鍝堝皵","閮村窞","钀ュ彛","铓屽煚","澶у簡","璧ゅ嘲","娌虫簮","鍚曟","閬傚畞","婕渤","涓夋槑","鑼傚悕","婵槼","鏇查潠","骞冲噳","閯傚皵澶氭柉","鍗佸牥","鍚夊畨","榛勭煶","浣虫湪鏂�","涓夐棬宄�","鎻槼","蹇诲窞","閫氳窘","娉稿窞","鍏畨","娼窞","琛㈠窞","娣崡","鑽嗛棬","姘稿窞","鍛间鸡璐濆皵","钁姦宀�","涓逛笢","寤惰竟","瀹e煄","瀹滃","搴嗛槼","鏅嬪煄","闃虫睙","瀹垮窞","寤跺畨","鍜稿畞","鎬�鍖�","榛勫北","鑸熷北","姹曞熬","鐩橀敠","鏈濋槼","涓芥按","鎶氬窞","閾佸箔","绾㈡渤","闄囧崡","骞垮畨","鎶氶『","鑷础","杈惧窞","鐜夋灄","鐜夋邯","鐧介摱","浜冲窞","閭甸槼","骞垮厓","鏄屽悏","鐩婇槼","寮犳帠","濞勫簳","闃虫硥","澶╂按","闅忓窞","鏈斿窞","澶х悊","閫氬寲","妤氶泟","宸村溅娣栧皵","涔屽叞瀵熷竷","鏂颁綑","鏅痉闀�","鏉惧師","杈介槼","闃滄柊","閰掓硥","榛斿崡","娣寳","鍥涘钩","姊у窞","榛斾笢鍗�","宸翠腑","楣ゅ","楦¤タ","鍐呮睙","閽﹀窞","姹犲窞","浠欐","鎭╂柦","鏈邯","璧勯槼","鍏洏姘�","鐧捐壊","鐧藉煄","涓村","浼婄妬","璐垫腐","鐧藉北","鍙岄腑灞�","鍚村繝","閯傚窞","涓芥睙","瀹夊悍","姣曡妭","浜戞诞","宸撮煶閮","瀹夐『","闃垮厠鑻�","榛戞渤","閾滈櫟","闆呭畨","鐭冲槾灞�","钀嶄埂","楣ゅ矖","閿℃灄閮嫆鐩�","閾滀粊","闃插煄娓�","鍠�浠�","鍏村畨鐩�","娌虫睜","閾滃窛","鏅幢","淇濆北","鍑夊北宸�","楣版江","瀹氳タ","浼婃槬","涓崼","榛旇タ鍗�","鍟嗘礇","涔屾捣","姝﹀▉","娴疯タ宸�","鏉ュ","鏄��","婀樿タ","鍝堝瘑","寮犲鐣�","瑗垮弻鐗堢撼宸�","涓冨彴娌�","鍥哄師","鏀�鏋濊姳","寰峰畯宸�","宕囧乏","杈芥簮","鍢夊唱鍏�","鍏嬫媺鐜涗緷","涓存钵","娼滄睙","璐哄窞","澶╅棬","娴蜂笢","濉斿煄","鍎嬪窞","閲戞槍","鍗氬皵濉旀媺","鍚愰瞾鐣�","澶у叴瀹夊箔","闃垮嫆娉�","鍜岀敯","杩簡宸�","鏃ュ杸鍒�","鏋楄姖"] + public static def citys_92 = [ "涓婃捣","鎵窞","鍖椾含","閲嶅簡","澶╂触","鎴愰兘","娌堥槼","澶ц繛","瀹夊簡","瑗垮畞","鏃ョ収","闀挎槬","姝︽眽","瑗垮畨","鑻忓窞","骞垮窞","鍗椾含","闈掑矝","娴庡崡","瀹佹尝","闀挎矙","鐭冲搴�","浣涘北","鍢夊叴","閾跺窛","鍗楅��","寤婂潑","涓北","閮戝窞","鍝堝皵婊�","鐑熷彴","寰愬窞","缁嶅叴","鍘﹂棬","鏄嗘槑","鍗楁槍","璐甸槼","鐝犳捣","涓滆帪","闀囨睙","娲涢槼","娓╁窞","鍏板窞","绂忓窞","鎯犲窞","鍛煎拰娴╃壒","甯稿窞","鍞愬北","娣畨","婀栧窞","涔濇睙","澶師","鍖楁捣","鏍床","娣勫崥","鐩愬煄","涔岄瞾鏈ㄩ綈","娴峰彛","鍗楀畞","甯稿痉","鍙板窞","閲戝崕","鍚夋灄","宀抽槼","鏌冲窞","娓呰繙","婀涙睙","寮犲鍙�","淇濆畾","娣卞湷","鏉窞","鍚堣偉","鏃犻敗","娉夊窞","閬典箟","鑲囧簡","婕冲窞","瀹滄槍","鑺滄箹","娉板窞","姹曞ご","涓変簹","绉︾殗宀�","椹瀺灞�","杩炰簯娓�","娌у窞","鎷夎惃","閿﹀窞","澶у悓","鏂囨槍","淇濅涵","闄垫按"] + public static def citys_252 = ["娼嶅潑","涓存矀","閭兏","娴庡畞","濞佹捣","缁甸槼","姊呭窞","骞抽《灞�","姹熼棬","璧e窞","娉板畨","瑗勯槼","鍗楅槼","妗傛灄","鑱婂煄","涓存本","寰峰窞","鍟嗕笜","琛¢槼","瀹胯縼","鍖呭ご","娓崡","鍜搁槼","璁告槍","婊ㄥ窞","閭㈠彴","鍗楀厖","瀹夐槼","鏂颁埂","鏋e簞","婊佸窞","榫欏博","瀹濋浮","淇¢槼","杩愬煄","琛℃按","涓滆惀","鏅嬩腑","瀛濇劅","闀挎不","闃滈槼","闊跺叧","鑿忔辰","寰烽槼","瀹佸痉","鑽嗗窞","涔愬北","椹婚┈搴�","鍗楀钩","姹変腑","姒嗘灄","瀹滄槬","闉嶅北","寮�灏�","鍛ㄥ彛","缁ュ寲","婀樻江","榛勫唸","鎵垮痉","鐒︿綔","鐗′腹姹�","鑾嗙敯","涓婇ザ","鐪夊北","榻愰綈鍝堝皵","閮村窞","钀ュ彛","铓屽煚","澶у簡","璧ゅ嘲","娌虫簮","鍚曟","閬傚畞","婕渤","涓夋槑","鑼傚悕","婵槼","鏇查潠","骞冲噳","閯傚皵澶氭柉","鍗佸牥","鍚夊畨","榛勭煶","浣虫湪鏂�","涓夐棬宄�","鎻槼","蹇诲窞","閫氳窘","娉稿窞","鍏畨","娼窞","琛㈠窞","娣崡","鑽嗛棬","姘稿窞","鍛间鸡璐濆皵","钁姦宀�","涓逛笢","寤惰竟","瀹e煄","瀹滃","搴嗛槼","鏅嬪煄","闃虫睙","瀹垮窞","寤跺畨","鍜稿畞","鎬�鍖�","榛勫北","鑸熷北","姹曞熬","鐩橀敠","鏈濋槼","涓芥按","鎶氬窞","閾佸箔","绾㈡渤","闄囧崡","骞垮畨","鎶氶『","鑷础","杈惧窞","鐜夋灄","鐜夋邯","鐧介摱","浜冲窞","閭甸槼","骞垮厓","鏄屽悏","鐩婇槼","寮犳帠","濞勫簳","闃虫硥","澶╂按","闅忓窞","鏈斿窞","澶х悊","閫氬寲","妤氶泟","宸村溅娣栧皵","涔屽叞瀵熷竷","鏂颁綑","鏅痉闀�","鏉惧師","杈介槼","闃滄柊","閰掓硥","榛斿崡","娣寳","鍥涘钩","姊у窞","榛斾笢鍗�","宸翠腑","楣ゅ","楦¤タ","鍐呮睙","閽﹀窞","姹犲窞","浠欐","鎭╂柦","鏈邯","璧勯槼","鍏洏姘�","鐧捐壊","鐧藉煄","涓村","浼婄妬","璐垫腐","鐧藉北","鍙岄腑灞�","鍚村繝","閯傚窞","涓芥睙","瀹夊悍","姣曡妭","浜戞诞","宸撮煶閮","瀹夐『","闃垮厠鑻�","榛戞渤","閾滈櫟","闆呭畨","鐭冲槾灞�","钀嶄埂","楣ゅ矖","閿℃灄閮嫆鐩�","閾滀粊","闃插煄娓�","鍠�浠�","鍏村畨鐩�","娌虫睜","閾滃窛","鏅幢","淇濆北","鍑夊北宸�","楣版江","瀹氳タ","浼婃槬","涓崼","榛旇タ鍗�","鍟嗘礇","涔屾捣","姝﹀▉","娴疯タ宸�","鏉ュ","鏄��","婀樿タ","鍝堝瘑","寮犲鐣�","瑗垮弻鐗堢撼宸�","涓冨彴娌�","鍥哄師","鏀�鏋濊姳","寰峰畯宸�","宕囧乏","杈芥簮","鍢夊唱鍏�","鍏嬫媺鐜涗緷","涓存钵","娼滄睙","璐哄窞","澶╅棬","娴蜂笢","濉斿煄","鍎嬪窞","閲戞槍","鍗氬皵濉旀媺","鍚愰瞾鐣�","澶у叴瀹夊箔","闃垮嫆娉�","鍜岀敯","杩簡宸�","鏃ュ杸鍒�","鏋楄姖","闃垮潩宸�","闃挎媺鍠勭洘","闃块噷","鏄岄兘","鐢樺崡","鐢樺瓬宸�","鏋滄礇宸�","娴峰寳宸�","娴峰崡宸�","榛勫崡宸�","鍏嬪瓬鍕掕嫃","閭f洸","鎬掓睙宸�","涓夋矙","灞卞崡","绁炲啘鏋�","鏂囧北宸�","鐜夋爲宸�"] - public static def provCityMap = ["河北":"石家庄" ,"山西":"太原" ,"陕西":"西安" ,"山东":"济南","河南":"郑州" ,"辽宁":"沈阳" ,"吉林":"长春" ,"黑龙江":"哈尔滨" ,"江苏":"南京" ,"浙江":"杭州" ,"安徽":"合肥","江西":"南昌" ,"福建":"福州" ,"湖北":"武汉","湖南":"长沙" ,"四川":"成都" ,"贵州":"贵阳" ,"云南":"昆明" ,"广东":"广州" ,"海南":"海口" ,"甘肃":"兰州" ,"青海":"西宁" ,"台湾":"台北","内蒙古":"呼和浩特" ,"新疆":"乌鲁木齐" ,"西藏":"拉萨","广西":"南宁","宁夏":"银川","香港":"香港","澳门":"澳门"] + public static def provCityMap = ["娌冲寳":"鐭冲搴�" ,"灞辫タ":"澶師" ,"闄曡タ":"瑗垮畨" ,"灞变笢":"娴庡崡","娌冲崡":"閮戝窞" ,"杈藉畞":"娌堥槼" ,"鍚夋灄":"闀挎槬" ,"榛戦緳姹�":"鍝堝皵婊�" ,"姹熻嫃":"鍗椾含" ,"娴欐睙":"鏉窞" ,"瀹夊窘":"鍚堣偉","姹熻タ":"鍗楁槍" ,"绂忓缓":"绂忓窞" ,"婀栧寳":"姝︽眽","婀栧崡":"闀挎矙" ,"鍥涘窛":"鎴愰兘" ,"璐靛窞":"璐甸槼" ,"浜戝崡":"鏄嗘槑" ,"骞夸笢":"骞垮窞" ,"娴峰崡":"娴峰彛" ,"鐢樿們":"鍏板窞" ,"闈掓捣":"瑗垮畞" ,"鍙版咕":"鍙板寳","鍐呰挋鍙�":"鍛煎拰娴╃壒" ,"鏂扮枂":"涔岄瞾鏈ㄩ綈" ,"瑗胯棌":"鎷夎惃","骞胯タ":"鍗楀畞","瀹佸":"閾跺窛","棣欐腐":"棣欐腐","婢抽棬":"婢抽棬"] // public static final DBCollection FANGJIA_OFFICIAL_AREA_MAP = MongoUtils.getCollectionByName("business", "fangjia_official_area_map_2020", "mongo.db.fangjia.com") @@ -44,7 +44,7 @@ class CcbCommonUtils { public static def rootMap = ["lianjia.com":"1","anjuke.com":"2","fang.com":"3","ke.com":"4","58.com":"5","leju.com":"6","fccs.com":"7","c21.com.cn":"8","qfang.com":"9","ganji.com":"10","leyoujia.com":"11","fangdd.com":"12","5i5j.com":"13","centanet.com":"14","zhuge.com":"15","baixing.com":"16","house365.com":"17","izhiliao.com":"18","wkzf.com":"19","jiwu.com":"20","xyfcw.com":"21","917.com":"22","0597house.com":"23","xmfish.com":"24","rongyizhaofang.com":"25","rz0375.com":"26","596fc.com":"27","zhen22.com":"28","taotaoju.vip":"29","kaifc.cn":"30","zhongmou.cc":"31","0391fc.com":"32","hualongxiang.com":"33","fangtan007.com":"34","h0591.com":"35","0598yu.com":"36","zfgou.cn":"37","0597ok.com":"38","second.cc":"39","rent.cc":"40","ssfcw.net":"41","czfcw.com":"42","xflapp.com":"43"] - public static def specialCityMap = ["阿坝州":"阿坝","阿拉善盟":"阿拉善","黄南州":"黄南","巴音郭楞":"巴州","兴安盟":"兴安","锡林郭勒盟":"锡林郭勒","凉山州":"凉山","西双版纳州":"西双版纳","德宏州":"德宏","迪庆州":"迪庆","海北州":"海北","海西州":"海西","博尔塔拉":"博州","甘孜州":"甘孜","玉树州":"玉树","果洛州":"果洛","文山州":"文山","怒江州":"怒江","克孜勒苏":"克州"] + public static def specialCityMap = ["闃垮潩宸�":"闃垮潩","闃挎媺鍠勭洘":"闃挎媺鍠�","榛勫崡宸�":"榛勫崡","宸撮煶閮":"宸村窞","鍏村畨鐩�":"鍏村畨","閿℃灄閮嫆鐩�":"閿℃灄閮嫆","鍑夊北宸�":"鍑夊北","瑗垮弻鐗堢撼宸�":"瑗垮弻鐗堢撼","寰峰畯宸�":"寰峰畯","杩簡宸�":"杩簡","娴峰寳宸�":"娴峰寳","娴疯タ宸�":"娴疯タ","鍗氬皵濉旀媺":"鍗氬窞","鐢樺瓬宸�":"鐢樺瓬","鐜夋爲宸�":"鐜夋爲","鏋滄礇宸�":"鏋滄礇","鏂囧北宸�":"鏂囧北","鎬掓睙宸�":"鎬掓睙","鍏嬪瓬鍕掕嫃":"鍏嬪窞"] public static DSCollection dataStoreConnection = null; @@ -52,13 +52,13 @@ class CcbCommonUtils { public static def pgsqlInstance = null //Sql.newInstance("jdbc:postgresql://192.168.0.236:5432/warehouse","postgres", "postgres", "org.postgresql.Driver") - //235为房价网内部计算均价的库 + //235涓烘埧浠风綉鍐呴儴璁$畻鍧囦环鐨勫簱 public static def pgsqlInstance235 = Sql.newInstance("jdbc:postgresql://192.168.0.235:5433/fangjia?stringtype=unspecified", "postgres", "Goojia123456", "org.postgresql.Driver") public static def getRunningCitys(def args){ def citys = [] - println "args 参数:"+args.toString() + println "args 鍙傛暟锛�"+args.toString() if(args){ def countStr = args[0] if(countStr=="344"){ @@ -83,7 +83,7 @@ class CcbCommonUtils { // sqlInstance = Sql.newInstance("jdbc:oracle:thin:@192.168.0.236:1521:orcl", // "GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver") } - println "运行城市数量:"+citys.size() + println "杩愯鍩庡競鏁伴噺锛�"+citys.size() return citys; } @@ -96,7 +96,7 @@ class CcbCommonUtils { cityCodeMap.put(it.fjw_city, it.city_code.toString()) } } -// def oldCityCodeMap = ["武汉":"420100","西安":"610100","苏州":"320500","大连":"210200","广州":"440100","重庆":"500000","南京":"320100","沈阳":"210100","青岛":"370200","天津":"120000","济南":"370100","宁波":"330200","长沙":"430100","石家庄":"130100","佛山":"440600","嘉兴":"330400","银川":"640100","南通":"320600","长春":"220100","廊坊":"131000","中山":"442000","郑州":"410100","哈尔滨":"230100","烟台":"370600","徐州":"320300","绍兴":"330600","厦门":"350200","昆明":"530100","南昌":"360100","贵阳":"520100","珠海":"440400","东莞":"441900","镇江":"321100","洛阳":"410300","温州":"330300","兰州":"620100","福州":"350100","惠州":"441300","呼和浩特":"150100","常州":"320400","唐山":"130200","淮安":"320800","湖州":"330500","九江":"360400","太原":"140100","北海":"450500","株洲":"430200","淄博":"370300","盐城":"320900","乌鲁木齐":"650100","海口":"460100","南宁":"450100","常德":"430700","台州":"331000","金华":"330700","吉林":"220200","岳阳":"430600","柳州":"450200","清远":"441800","湛江":"440800","张家口":"130700","保定":"130600","北京":"110000","成都":"510100","深圳":"440300","上海":"310000","杭州":"330100","合肥":"340100","扬州":"321000","无锡":"320200","泉州":"350500","遵义":"520300","肇庆":"441200","漳州":"350600","宜昌":"420500","芜湖":"340200","泰州":"321200","汕头":"440500","三亚":"460200","秦皇岛":"130300","马鞍山":"340500","连云港":"320700","沧州":"130900","安庆":"340800","西宁":"630100","日照":"371100","拉萨":"540100","锦州":"210700","大同":"140200","文昌":"469005","陵水":"469028","保亭":"469029"] +// def oldCityCodeMap = ["姝︽眽":"420100","瑗垮畨":"610100","鑻忓窞":"320500","澶ц繛":"210200","骞垮窞":"440100","閲嶅簡":"500000","鍗椾含":"320100","娌堥槼":"210100","闈掑矝":"370200","澶╂触":"120000","娴庡崡":"370100","瀹佹尝":"330200","闀挎矙":"430100","鐭冲搴�":"130100","浣涘北":"440600","鍢夊叴":"330400","閾跺窛":"640100","鍗楅��":"320600","闀挎槬":"220100","寤婂潑":"131000","涓北":"442000","閮戝窞":"410100","鍝堝皵婊�":"230100","鐑熷彴":"370600","寰愬窞":"320300","缁嶅叴":"330600","鍘﹂棬":"350200","鏄嗘槑":"530100","鍗楁槍":"360100","璐甸槼":"520100","鐝犳捣":"440400","涓滆帪":"441900","闀囨睙":"321100","娲涢槼":"410300","娓╁窞":"330300","鍏板窞":"620100","绂忓窞":"350100","鎯犲窞":"441300","鍛煎拰娴╃壒":"150100","甯稿窞":"320400","鍞愬北":"130200","娣畨":"320800","婀栧窞":"330500","涔濇睙":"360400","澶師":"140100","鍖楁捣":"450500","鏍床":"430200","娣勫崥":"370300","鐩愬煄":"320900","涔岄瞾鏈ㄩ綈":"650100","娴峰彛":"460100","鍗楀畞":"450100","甯稿痉":"430700","鍙板窞":"331000","閲戝崕":"330700","鍚夋灄":"220200","宀抽槼":"430600","鏌冲窞":"450200","娓呰繙":"441800","婀涙睙":"440800","寮犲鍙�":"130700","淇濆畾":"130600","鍖椾含":"110000","鎴愰兘":"510100","娣卞湷":"440300","涓婃捣":"310000","鏉窞":"330100","鍚堣偉":"340100","鎵窞":"321000","鏃犻敗":"320200","娉夊窞":"350500","閬典箟":"520300","鑲囧簡":"441200","婕冲窞":"350600","瀹滄槍":"420500","鑺滄箹":"340200","娉板窞":"321200","姹曞ご":"440500","涓変簹":"460200","绉︾殗宀�":"130300","椹瀺灞�":"340500","杩炰簯娓�":"320700","娌у窞":"130900","瀹夊簡":"340800","瑗垮畞":"630100","鏃ョ収":"371100","鎷夎惃":"540100","閿﹀窞":"210700","澶у悓":"140200","鏂囨槍":"469005","闄垫按":"469028","淇濅涵":"469029"] return cityCodeMap; } @@ -110,7 +110,7 @@ class CcbCommonUtils { public static def findAllDistrictCodeValue(city){ def q = new BasicDBObject() q.put("fjw_city", city) - //q.put("district", new BasicDBObject('$ne',"市辖区")) + //q.put("district", new BasicDBObject('$ne',"甯傝緰鍖�")) def dbcursor = FANGJIA_AREA_CODE.find(q).sort(new BasicDBObject("_id", 1)) def map = [:] for(def db : dbcursor){ @@ -184,8 +184,8 @@ class CcbCommonUtils { alias << dist.name } - if(dist.name.endsWith("弄小区") || dist.name.endsWith("小区") ){ - def name = dist.name.replace("弄小区","弄").replace("小区","") + if(dist.name.endsWith("寮勫皬鍖�") || dist.name.endsWith("灏忓尯") ){ + def name = dist.name.replace("寮勫皬鍖�","寮�").replace("灏忓尯","") if(!alias.contains(name)){ alias << name } @@ -229,7 +229,7 @@ class CcbCommonUtils { q.put("avg_price", new BasicDBObject('$gt', 0)) q.put("trade_date", new BasicDBObject('$gte', startDate).append('$lte',endDate)) q.put("match_id", dist._id.toString()) - q.put("type", new BasicDBObject('$ne','车位')) + q.put("type", new BasicDBObject('$ne','杞︿綅')) def dbcursor = DEAL_PRICE_COLL.find(q) def total = dbcursor.count() def rets = new HashSet() @@ -389,7 +389,7 @@ class CcbCommonUtils { detailMap.put(r.COMMID, map) }); }catch(Exception e){ - println "错误:"+e.getMessage() + println "閿欒锛�"+e.getMessage() } return detailMap @@ -430,7 +430,7 @@ class CcbCommonUtils { sqlInstance = Sql.newInstance("jdbc:oracle:thin:@192.168.0.100:31521:orcl", "GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver") findAllDistrictsByOracle(cityid) - println "错误:"+e.getMessage() + println "閿欒锛�"+e.getMessage() } return rows @@ -445,10 +445,10 @@ class CcbCommonUtils { q.put("city", city); } -// q.put("c_date", new BasicDBObject('$lt', DateUtils.parseFromTightYYYYMMDD("2023-05-01")))//因5月1日新增过多,所以暂且先去掉 此批数据改为name_cat=13 -// q.put("name","登高西路安置小区C区") +// q.put("c_date", new BasicDBObject('$lt', DateUtils.parseFromTightYYYYMMDD("2023-05-01")))//鍥�5鏈�1鏃ユ柊澧炶繃澶氾紝鎵�浠ユ殏涓斿厛鍘绘帀 姝ゆ壒鏁版嵁鏀逛负name_cat=13 +// q.put("name","鐧婚珮瑗胯矾瀹夌疆灏忓尯C鍖�") // q.put("name_cat", 0); -// q.put("name", new BasicDBObject('$in', ["中信泰富又一城一期","中信泰富又一城"])) +// q.put("name", new BasicDBObject('$in', ["涓俊娉板瘜鍙堜竴鍩庝竴鏈�","涓俊娉板瘜鍙堜竴鍩�"])) DBObject keys = new BasicDBObject(); if(fields){ @@ -457,7 +457,7 @@ class CcbCommonUtils { } } def dbsour = SEAWEED_MONGO_COLL.find(q,keys).batchSize(2000) - println "[${city}] 原始:"+dbsour.count() + println "[${city}] 鍘熷:"+dbsour.count() def rets = new HashSet() def ids = new HashSet() @@ -471,7 +471,7 @@ class CcbCommonUtils { rets << d } }else{ - if(d.name_cat == 0 && d.lng && ["普通住宅","商住"].contains(d.estate_type2) && !d.name.contains("洋房") && !d.name.contains("公房")){ + if(d.name_cat == 0 && d.lng && ["鏅�氫綇瀹�","鍟嗕綇"].contains(d.estate_type2) && !d.name.contains("娲嬫埧") && !d.name.contains("鍏埧")){ if(d.address){ d.address = d.address.replaceAll("\r|\n|\\s", ""); } @@ -482,7 +482,7 @@ class CcbCommonUtils { } } } - println "[${city}] 小区量:"+rets.size() + println "[${city}] 灏忓尯閲忥細"+rets.size() return rets; } @@ -494,9 +494,9 @@ class CcbCommonUtils { q.put("cat", cat); q.put("city", city); q.put("region", region) -// q.put("name","鸣翠蓝湾") +// q.put("name","楦g繝钃濇咕") // q.put("name_cat", 0); -// q.put("estate_type2", new BasicDBObject('$in', ["普通住宅","商住"])) +// q.put("estate_type2", new BasicDBObject('$in', ["鏅�氫綇瀹�","鍟嗕綇"])) DBObject keys = new BasicDBObject(); if(fields){ @@ -506,17 +506,17 @@ class CcbCommonUtils { } // def dbsour = getDataStoreConnection().find(q, keys).batchSize(2000) def dbsour = SEAWEED_MONGO_COLL.find(q,keys).batchSize(2000) - println "原始:"+dbsour.count() + println "鍘熷:"+dbsour.count() def rets = [] for(def d : dbsour){ - if(d.name_cat == 0 && d.lng && ["普通住宅","商住"].contains(d.estate_type2) && !d.name.contains("洋房") && !d.name.contains("公房")){ + if(d.name_cat == 0 && d.lng && ["鏅�氫綇瀹�","鍟嗕綇"].contains(d.estate_type2) && !d.name.contains("娲嬫埧") && !d.name.contains("鍏埧")){ if(d.address){ d.address = d.address.replaceAll("\r|\n|\\s", ""); } rets << d } } - println "小区量:"+rets.size() + println "灏忓尯閲忥細"+rets.size() return rets; } @@ -534,7 +534,7 @@ class CcbCommonUtils { DSCursor cursor = getDataStoreConnection().find(q); if(cursor){ for(def d : cursor){ - if(d.name_cat == 0 && ["普通住宅","商住"].contains(d.estate_type2)){ + if(d.name_cat == 0 && ["鏅�氫綇瀹�","鍟嗕綇"].contains(d.estate_type2)){ if(d.address){ d.address = d.address.replaceAll("\r|\n|\\s", ""); } @@ -640,8 +640,8 @@ class CcbCommonUtils { q.put("city", city) q.put("trade_date", new BasicDBObject('$gte', startDate)) q.put("match_id", new BasicDBObject('$exists', false)) -// q.put("district_name","新明胡同") -// q.put("address","桂苑大道135号") +// q.put("district_name","鏂版槑鑳″悓") +// q.put("address","妗傝嫅澶ч亾135鍙�") def dbcursor = DEAL_PRICE_COLL.find(q) def total = dbcursor.count() def rets = new HashSet() @@ -694,7 +694,7 @@ class CcbCommonUtils { public static def findGuiDingIdsByCity(){ - // 创建布隆过滤器对象 + // 鍒涘缓甯冮殕杩囨护鍣ㄥ璞� BloomFilter filter = BloomFilter.create(Funnels.stringFunnel(StandardCharsets.UTF_8), 200000000, 0.000001); pgsqlInstance.eachRow("SELECT gujia_fsid FROM base.t0831_guided_price_gj_h",{it-> filter.put(it.gujia_fsid) @@ -721,11 +721,11 @@ class CcbCommonUtils { map.month = r.gujiabds_clc_yrmo_val map.credit_value = r.gujia_bds_cfdc_dgr if(r.gujia_bds_clmtd == 1){ - map.calc_type = "人工估值" + map.calc_type = "浜哄伐浼板��" }else if(r.gujia_bds_clmtd == 2){ - map.calc_type = "样本计算" + map.calc_type = "鏍锋湰璁$畻" }else if(r.gujia_bds_clmtd == 3){ - map.calc_type = "神经网络" + map.calc_type = "绁炵粡缃戠粶" } }) return map @@ -741,11 +741,11 @@ class CcbCommonUtils { map.month = r.gujiabds_clc_yrmo_val map.credit_value = r.gujia_bds_cfdc_dgr if(r.gujia_bds_clmtd == 1){ - map.calc_type = "人工估值" + map.calc_type = "浜哄伐浼板��" }else if(r.gujia_bds_clmtd == 2){ - map.calc_type = "样本计算" + map.calc_type = "鏍锋湰璁$畻" }else if(r.gujia_bds_clmtd == 3){ - map.calc_type = "神经网络" + map.calc_type = "绁炵粡缃戠粶" } }) return map @@ -761,7 +761,7 @@ class CcbCommonUtils { def udata = new BasicDBObject() udata.put("trade_date", endDate) udata.put("m_date", new Date()) - udata.put("flag", "补漏变更成交时间") + udata.put("flag", "琛ユ紡鍙樻洿鎴愪氦鏃堕棿") DEAL_PRICE_COLL.updateMulti(q, new BasicDBObject('$set',udata)) } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/CcbFtpTestUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/CcbFtpTestUtils.groovy index 00ed6bf6e..0087923d9 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/CcbFtpTestUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/CcbFtpTestUtils.groovy @@ -20,7 +20,7 @@ class CcbFtpTestUtils { static def ftpUpload(type,outputPath_dist, month){ - //上传到ftp + //涓婁紶鍒癴tp sftpChannel = reConnect(); if(type && type=="rh"){ sftp.upload(ftpPath_rh+ month+"/", outputPath_dist, sftpChannel); @@ -44,34 +44,34 @@ class CcbFtpTestUtils { static def reConnect(){ if(sftpChannel == null){ - println "sftpChannel 为空,需重连....." + println "sftpChannel 涓虹┖锛岄渶閲嶈繛....." if(sftp == null){ sftp = new SFTP(); } sftpChannel = sftp.connect(ftpServer, ftpPort, ftpUser, ftpPassword); }else{ - println "sftpChannel 正常....." + println "sftpChannel 姝e父....." } return sftpChannel; } static def uploadSha512Data(def sb, def dataCodeFileName, def charset){ - String sha512HexStr= DigestUtils.sha512Hex(sb.getBytes())//生成加密码码 - DataHandleUtils.outPutFile(dataCodeFileName, sha512HexStr,charset);//生成加密码文件 - ftpUpload(dataCodeFileName)//上传加密码文件到FTP + String sha512HexStr= DigestUtils.sha512Hex(sb.getBytes())//鐢熸垚鍔犲瘑鐮佺爜 + DataHandleUtils.outPutFile(dataCodeFileName, sha512HexStr,charset);//鐢熸垚鍔犲瘑鐮佹枃浠� + ftpUpload(dataCodeFileName)//涓婁紶鍔犲瘑鐮佹枃浠跺埌FTP } static def uploadSha512Data2(def dataFileName, def dataCodeFileName, def charset){ def data = new FileInputStream(new File(dataFileName)) - String sha512HexStr= DigestUtils.sha512Hex(data)//生成加密码码 - DataHandleUtils.outPutFile(dataCodeFileName, sha512HexStr,charset);//生成加密码文件 - ftpUpload(dataCodeFileName)//上传加密码文件到FTP + String sha512HexStr= DigestUtils.sha512Hex(data)//鐢熸垚鍔犲瘑鐮佺爜 + DataHandleUtils.outPutFile(dataCodeFileName, sha512HexStr,charset);//鐢熸垚鍔犲瘑鐮佹枃浠� + ftpUpload(dataCodeFileName)//涓婁紶鍔犲瘑鐮佹枃浠跺埌FTP } static def listFileNames(type, month){ - //上传到ftp + //涓婁紶鍒癴tp sftpChannel = reConnect(); Vector files = null; if(type && type=="rh"){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/CcbFtpUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/CcbFtpUtils.groovy index 124911f34..fa63f23af 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/CcbFtpUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/CcbFtpUtils.groovy @@ -21,7 +21,7 @@ class CcbFtpUtils { static def ftpUpload(type,outputPath_dist, month){ - //上传到ftp + //涓婁紶鍒癴tp sftpChannel = reConnect(); if(type && type=="rh"){ sftp.upload(ftpPath_rh+ month+"/", outputPath_dist, sftpChannel); @@ -33,33 +33,33 @@ class CcbFtpUtils { static def reConnect(){ if(sftpChannel == null){ - println "sftpChannel 为空,需重连....." + println "sftpChannel 涓虹┖锛岄渶閲嶈繛....." if(sftp == null){ sftp = new SFTP(); } sftpChannel = sftp.connect(ftpServer, ftpPort, ftpUser, ftpPassword); }else{ - println "sftpChannel 正常....." + println "sftpChannel 姝e父....." } return sftpChannel; } static def uploadSha512Data(def sb, def dataCodeFileName, def charset){ - String sha512HexStr= DigestUtils.sha512Hex(sb.getBytes())//生成加密码码 - DataHandleUtils.outPutFile(dataCodeFileName, sha512HexStr,charset);//生成加密码文件 - ftpUpload(dataCodeFileName)//上传加密码文件到FTP + String sha512HexStr= DigestUtils.sha512Hex(sb.getBytes())//鐢熸垚鍔犲瘑鐮佺爜 + DataHandleUtils.outPutFile(dataCodeFileName, sha512HexStr,charset);//鐢熸垚鍔犲瘑鐮佹枃浠� + ftpUpload(dataCodeFileName)//涓婁紶鍔犲瘑鐮佹枃浠跺埌FTP } static def uploadSha512Data2(def dataFileName, def dataCodeFileName, def charset){ def data = new FileInputStream(new File(dataFileName)) - String sha512HexStr= DigestUtils.sha512Hex(data)//生成加密码码 - DataHandleUtils.outPutFile(dataCodeFileName, sha512HexStr,charset);//生成加密码文件 - ftpUpload(dataCodeFileName)//上传加密码文件到FTP + String sha512HexStr= DigestUtils.sha512Hex(data)//鐢熸垚鍔犲瘑鐮佺爜 + DataHandleUtils.outPutFile(dataCodeFileName, sha512HexStr,charset);//鐢熸垚鍔犲瘑鐮佹枃浠� + ftpUpload(dataCodeFileName)//涓婁紶鍔犲瘑鐮佹枃浠跺埌FTP } static def listFileNames(month){ - //上传到ftp + //涓婁紶鍒癴tp sftpChannel = reConnect(); Vector files = sftp.listFiles(ftpPath+ month+"/", sftpChannel); return files diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/CityBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/CityBatch.groovy index db72da8b5..2c3af7047 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/CityBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/CityBatch.groovy @@ -10,8 +10,8 @@ import com.fangjia.script.util.ExcelUtils import com.mongodb.BasicDBObject /** - * 建行模型估值项目 - * 城市数据同步 + * 寤鸿妯″瀷浼板�奸」鐩� + * 鍩庡競鏁版嵁鍚屾 */ @BatchOwner(Watcher.GaoJuan) class CityBatch extends BaseBatch{ @@ -46,13 +46,13 @@ class CityBatch extends BaseBatch{ } def allDatas = createDatas(rows) - def headers = ["城市ID","城市名称","城市名称拼音","省份ID","国标码","城市级别","显示顺序","是否省会","是否直辖市","备注","创建时间","更新时间","来源公司"] + def headers = ["鍩庡競ID","鍩庡競鍚嶇О","鍩庡競鍚嶇О鎷奸煶","鐪佷唤ID","鍥芥爣鐮�","鍩庡競绾у埆","鏄剧ず椤哄簭","鏄惁鐪佷細","鏄惁鐩磋緰甯�","澶囨敞","鍒涘缓鏃堕棿","鏇存柊鏃堕棿","鏉ユ簮鍏徃"] def rets = [] rets << headers rets.addAll(allDatas) - ExcelUtils.write("d:\\数据\\建行\\房产估值\\数据文件\\bigdata_city.xlsx", rets, "数据") - FileUtils.batchCreateFile(allDatas, "d:\\数据\\建行\\房产估值\\数据文件\\bigdata_city.dat",headers, "utf-8", false); + ExcelUtils.write("d:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\bigdata_city.xlsx", rets, "鏁版嵁") + FileUtils.batchCreateFile(allDatas, "d:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\bigdata_city.dat",headers, "utf-8", false); } def createDatas(rows){ @@ -86,15 +86,15 @@ class CityBatch extends BaseBatch{ def isCapital(def prov, def city){ def provCity = CcbCommonUtils.provCityMap.get(prov) if(provCity && provCity==city){ - return "是" + return "鏄�" } - return "否" + return "鍚�" } def ifMunicipal(def city){ - if(["上海", "北京", "天津", "重庆"].contains(city)){ - return "是" + if(["涓婃捣", "鍖椾含", "澶╂触", "閲嶅簡"].contains(city)){ + return "鏄�" } - return "否" + return "鍚�" } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/DealAndThirdPriceDataProcess.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/DealAndThirdPriceDataProcess.groovy index d2c8a1f84..7f6c879d9 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/DealAndThirdPriceDataProcess.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/DealAndThirdPriceDataProcess.groovy @@ -14,7 +14,7 @@ import java.util.concurrent.ExecutorService import java.util.concurrent.Executors /** - * 建行成交数据表优化 + * 寤鸿鎴愪氦鏁版嵁琛ㄤ紭鍖� */ class DealPriceDataProcess { @@ -33,10 +33,10 @@ class DealPriceDataProcess { static main(args) { def task = new DealPriceDataProcess() -// task.process()//运当成交pe值不好时行,拉升成交价格及删除pe太大数据 +// task.process()//杩愬綋鎴愪氦pe鍊间笉濂芥椂琛岋紝鎷夊崌鎴愪氦浠锋牸鍙婂垹闄e澶ぇ鏁版嵁 // task.addLianJiaPrice(); - task.deleteThirdPartyData()//删除第三方 -// task.delDealByPe()//删除成交 + task.deleteThirdPartyData()//鍒犻櫎绗笁鏂� +// task.delDealByPe()//鍒犻櫎鎴愪氦 // task.delDealData() // task.exportThirdParty() @@ -55,7 +55,7 @@ class DealPriceDataProcess { // for(def r : list){ // deletThirdPrice(r, thirdMonth) // } -// def datas = ExcelUtils.read("D:\\数据\\建行\\房产估值\\估值模型测试202201_1221 - 副本.xlsx",0,1) +// def datas = ExcelUtils.read("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\浼板�兼ā鍨嬫祴璇�202201_1221 - 鍓湰.xlsx",0,1) // for(def d : datas){ //// if(d['G']){ //// def rets = findDealByPe(d['A'], yearMonth, d['G']) @@ -92,11 +92,11 @@ class DealPriceDataProcess { void process() { def yearMonth = 202111 - def cityPeMap = getCityPPeIndex("D:\\数据\\建行\\房产估值\\成交对标标准.xlsx") + def cityPeMap = getCityPPeIndex("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鎴愪氦瀵规爣鏍囧噯.xlsx") def citys = CcbCommonUtils.citys; def calcutePpeMap = findCaluateCityPPE(yearMonth) cityPeMap.each{c,v-> -// if(c=="呼和浩特"){ +// if(c=="鍛煎拰娴╃壒"){ def retMap = calcutePpeMap.get(c) if(retMap && retMap.ppe_val){ def ppe = retMap.ppe_val @@ -139,7 +139,7 @@ class DealPriceDataProcess { } def pre = (commCount + count)*100/(totalCount) - println "修改价格:"+count+" ppe:"+pre + println "淇敼浠锋牸锛�"+count+" ppe:"+pre if(pre < v){ rets = rets.reverse() def delIndex = 0 @@ -148,7 +148,7 @@ class DealPriceDataProcess { deleteDealPrice(r) delIndex++ pre = (commCount + count)*100/(totalCount -delIndex) - println "删除成交:"+delIndex+" ppe:"+pre + println "鍒犻櫎鎴愪氦锛�"+delIndex+" ppe:"+pre if(pre >= v){ break; } @@ -176,7 +176,7 @@ class DealPriceDataProcess { } def findLtePPeCount(city, year_month){ - def sql = "select count(*) as count from avm_evaluation_item_gj where year_month=${year_month} and cityname='${city}' and data_type='成交' and pe<=15"; + def sql = "select count(*) as count from avm_evaluation_item_gj where year_month=${year_month} and cityname='${city}' and data_type='鎴愪氦' and pe<=15"; def count = 0 sqlInstance2.eachRow(sql,{r-> count = r.count @@ -185,7 +185,7 @@ class DealPriceDataProcess { } def findAllDealByPe(yearMonth, peVal){ - def sql = "select gujia_comm_id as commid,gujiabds_valt_unitprc as unit_price,gujiabds_to_mkprc_mny as target_avg_price,gujia_area as buildarea,to_char(mdl_dt,'yyyy-mm-dd') as dealdate from t_app_p9pha_plda.avm_evaluation_item_gj_h where urbn_nm in ('昆明','南京','苏州','重庆') and gujiabds_clc_yrmo_val=${yearMonth} and gujia_data_tp='成交' and gujia_mns_rto>${peVal} "; + def sql = "select gujia_comm_id as commid,gujiabds_valt_unitprc as unit_price,gujiabds_to_mkprc_mny as target_avg_price,gujia_area as buildarea,to_char(mdl_dt,'yyyy-mm-dd') as dealdate from t_app_p9pha_plda.avm_evaluation_item_gj_h where urbn_nm in ('鏄嗘槑','鍗椾含','鑻忓窞','閲嶅簡') and gujiabds_clc_yrmo_val=${yearMonth} and gujia_data_tp='鎴愪氦' and gujia_mns_rto>${peVal} "; def rets = [] pgsqlInstance.eachRow(sql,{r-> def map = [:] @@ -200,7 +200,7 @@ class DealPriceDataProcess { } def findDealByPe(city, yearMonth, peVal){ - def sql = "select cityid,cityname,distid,commid,commname,unit_price,target_avg_price,pe,buildarea,to_char(dealdate,'yyyy-mm-dd') as dealdate from avm_evaluation_item_gj where year_month=${yearMonth} and cityname='${city}' and data_type='成交' and pe>${peVal}"; + def sql = "select cityid,cityname,distid,commid,commname,unit_price,target_avg_price,pe,buildarea,to_char(dealdate,'yyyy-mm-dd') as dealdate from avm_evaluation_item_gj where year_month=${yearMonth} and cityname='${city}' and data_type='鎴愪氦' and pe>${peVal}"; def rets = [] sqlInstance236.eachRow(sql,{r-> def map = [:] @@ -221,7 +221,7 @@ class DealPriceDataProcess { def findAllThirdByPe(yearMonth, peVal){ - def sql = "select year_month, commid, target_avg_price from avm_evaluation_item_gj where year_month=${yearMonth} and data_type='第三方' and pe>${peVal}"; + def sql = "select year_month, commid, target_avg_price from avm_evaluation_item_gj where year_month=${yearMonth} and data_type='绗笁鏂�' and pe>${peVal}"; def rets = [] sqlInstance236.eachRow(sql,{r-> def map = [:] @@ -234,7 +234,7 @@ class DealPriceDataProcess { } def findThirdByPe(city, yearMonth, peVal){ - def sql = "select year_month, commid, target_avg_price from avm_evaluation_item_gj where year_month=${yearMonth} and cityname='${city}' and data_type='第三方' and pe>${peVal}"; + def sql = "select year_month, commid, target_avg_price from avm_evaluation_item_gj where year_month=${yearMonth} and cityname='${city}' and data_type='绗笁鏂�' and pe>${peVal}"; def rets = [] sqlInstance236.eachRow(sql,{r-> def map = [:] @@ -248,7 +248,7 @@ class DealPriceDataProcess { def findAllGtePPeDatas(city, yearMonth){ - def sql = "select cityid,cityname,distid,commid,commname,unit_price,target_avg_price,pe,buildarea,to_char(dealdate,'yyyy-mm-dd') as dealdate from avm_evaluation_item_gj where year_month=${yearMonth} and cityname='${city}' and data_type='成交' and pe>15 order by pe asc"; + def sql = "select cityid,cityname,distid,commid,commname,unit_price,target_avg_price,pe,buildarea,to_char(dealdate,'yyyy-mm-dd') as dealdate from avm_evaluation_item_gj where year_month=${yearMonth} and cityname='${city}' and data_type='鎴愪氦' and pe>15 order by pe asc"; def rets = [] sqlInstance2.eachRow(sql,{r-> def map = [:] @@ -282,7 +282,7 @@ class DealPriceDataProcess { def findCityByPpeRange(def cityname, def yearMonth, ppeStart, ppeEnd){ - def sql = "select cityid,cityname,distid,commid,commname,unit_price,target_avg_price,pe,buildarea,to_char(dealdate,'yyyy-mm-dd') as dealdate from avm_evaluation_item_gj where cityname='${cityname}' and year_month=${yearMonth} and data_type='成交' and pe>${ppeStart} and pe<${ppeEnd}"; + def sql = "select cityid,cityname,distid,commid,commname,unit_price,target_avg_price,pe,buildarea,to_char(dealdate,'yyyy-mm-dd') as dealdate from avm_evaluation_item_gj where cityname='${cityname}' and year_month=${yearMonth} and data_type='鎴愪氦' and pe>${ppeStart} and pe<${ppeEnd}"; def rets = [] sqlInstance236.eachRow(sql,{r-> def map = [:] @@ -313,7 +313,7 @@ class DealPriceDataProcess { def addLianJiaPrice(){ - def citys = ["杭州","广州","东莞"] + def citys = ["鏉窞","骞垮窞","涓滆帪"] def cityCodeDataMap = CcbCommonUtils.findCityCodeValue() def publishTime = '2021-10-01' def month = 202110 @@ -337,7 +337,7 @@ class DealPriceDataProcess { ret << commid ret << distDetailMap['commname'] ret << "04" - ret << "链家" + ret << "閾惧" ret << month ret << avg_price ret << "" @@ -352,7 +352,7 @@ class DealPriceDataProcess { def fileName = "/home/goojia/ccb/BIGDATA_THIRD_PARTY_PRICE_GJ_2.dat" if(CommonDatautils.isWindow()){ - fileName = "d:\\数据\\建行\\房产估值\\数据文件\\txt\\TBIGDATA_THIRD_PARTY_PRICE_GJ_2.dat" + fileName = "d:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\TBIGDATA_THIRD_PARTY_PRICE_GJ_2.dat" } def header = [] FileUtils.batchCreateFile(rows, fileName, header, "utf-8", false); @@ -360,7 +360,7 @@ class DealPriceDataProcess { } def findExistsThirdPartyPrice(cityid, yearMonth){ - def sql = "select commid from BIGDATA_THIRD_PARTY_PRICE_GJ where cityid='${cityid}' and price_date=${yearMonth} and data_source='链家'" + def sql = "select commid from BIGDATA_THIRD_PARTY_PRICE_GJ where cityid='${cityid}' and price_date=${yearMonth} and data_source='閾惧'" def commids = [] sqlInstance.eachRow(sql,{r-> commids << r.commid @@ -381,7 +381,7 @@ class DealPriceDataProcess { def exportThirdParty(){ def citys = CcbCommonUtils.citys_all def results = [] - results << ['城市id','城市名称','第三方id','区域','小区id','小区名称','计算类型','计算价格','成交价格','PPE'] + results << ['鍩庡競id','鍩庡競鍚嶇О','绗笁鏂筰d','鍖哄煙','灏忓尯id','灏忓尯鍚嶇О','璁$畻绫诲瀷','璁$畻浠锋牸','鎴愪氦浠锋牸','PPE'] for(def city : citys) { def rets = findPeGteThirdParty3(city, 202306) for(def map : rets){ @@ -390,14 +390,14 @@ class DealPriceDataProcess { println city +" "+ rets.size() } - ExcelUtils.write("D:\\数据\\建行\\房产估值\\第三方\\202305第三方测试偏差较大案例统计数据.xlsx", results,"第三方") + ExcelUtils.write("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\绗笁鏂筡\202305绗笁鏂规祴璇曞亸宸緝澶ф渚嬬粺璁℃暟鎹�.xlsx", results,"绗笁鏂�") } def deleteThirdPartyData(){ -// ,"陵水","塔城","保亭","长沙","苏州","南昌","沧州","文昌","衡水" +// ,"闄垫按","濉斿煄","淇濅涵","闀挎矙","鑻忓窞","鍗楁槍","娌у窞","鏂囨槍","琛℃按" // def citys = ["310000","440100","500000","410100","430100","330100","340100","320100","370200","320500","120000","442000","320300","350200","360100","320400","210200","530100","469005","469028","469029","230700","610700","533400","650400","511100","131100"]//CcbCommonUtils.citys_all def citys = CcbCommonUtils.citys_all - def month = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM"));//上个月日期 + def month = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM"));//涓婁釜鏈堟棩鏈� def rows = [] def cityCodeDatas = CcbCommonUtils.findCityCodeValue() def set = new HashSet() @@ -409,7 +409,7 @@ class DealPriceDataProcess { } println index +" "+city def cityid = cityCodeDatas.get(city) - def rets = findPeGteThirdParty2(cityid, DateUtils.formatDateByPattern(new Date(),"yyyyMM"))//当前月日期 + def rets = findPeGteThirdParty2(cityid, DateUtils.formatDateByPattern(new Date(),"yyyyMM"))//褰撳墠鏈堟棩鏈� println city +" "+rets.size() if(rets){ set.add(city) @@ -437,7 +437,7 @@ class DealPriceDataProcess { total = r.count }) if(total>0){ - println city +" "+m.commid+" (按价格)删除:"+total + println city +" "+m.commid+" (鎸変环鏍�)鍒犻櫎锛�"+total def sql = "delete from base.t0831_bigdata_third_party_price_gj_h where urbn_id='${cityid}' and gujia_bds_id='${m.commid}' and gujiabds_avprc_dt_val=${month} and gujia_bds_comm_avprc=${m.price}" pgsqlInstance.executeUpdate(sql) }else{ @@ -447,7 +447,7 @@ class DealPriceDataProcess { total = r.count }) if(total>0){ - println city +" "+m.commid+" (按小区)删除:"+total + println city +" "+m.commid+" (鎸夊皬鍖�)鍒犻櫎锛�"+total def sql = "delete from base.t0831_bigdata_third_party_price_gj_h where urbn_id='${cityid}' and gujia_bds_id='${m.commid}' and gujiabds_avprc_dt_val=${month} " pgsqlInstance.executeUpdate(sql) } @@ -477,7 +477,7 @@ class DealPriceDataProcess { } def findPeGteThirdParty(cityName, yearmonth){ - def sql = "select commid,target_avg_price from avm_evaluation_item_gj where year_month=${yearmonth} and data_type='第三方' and cityname='${cityName}' and pe>25" + def sql = "select commid,target_avg_price from avm_evaluation_item_gj where year_month=${yearmonth} and data_type='绗笁鏂�' and cityname='${cityName}' and pe>25" def rets = [] sqlInstance236.eachRow(sql,{r-> def map = [:] @@ -489,7 +489,7 @@ class DealPriceDataProcess { } def findPeGteThirdParty2(cityid, yearmonth){ - def sql = "SELECT gujia_comm_id,gujiabds_to_mkprc_mny from t_app_p9pha_plda.avm_evaluation_item_gj_h where gujiabds_clc_yrmo_val=${yearmonth} and gujia_data_tp='第三方' and urbn_id='${cityid}' and gujia_mns_rto>25" + def sql = "SELECT gujia_comm_id,gujiabds_to_mkprc_mny from t_app_p9pha_plda.avm_evaluation_item_gj_h where gujiabds_clc_yrmo_val=${yearmonth} and gujia_data_tp='绗笁鏂�' and urbn_id='${cityid}' and gujia_mns_rto>25" def rets = [] pgsqlInstance.eachRow(sql,{r-> def map = [:] @@ -500,10 +500,10 @@ class DealPriceDataProcess { return rets } - //城市id 城市名称 成交id 区域 小区id 小区名称 计算类型 计算价格 成交价格 PPE + //鍩庡競id 鍩庡競鍚嶇О 鎴愪氦id 鍖哄煙 灏忓尯id 灏忓尯鍚嶇О 璁$畻绫诲瀷 璁$畻浠锋牸 鎴愪氦浠锋牸 PPE def findPeGteThirdParty3(cityName, yearmonth){ - def sql = "SELECT urbn_id, urbn_nm, gujia_fsid,gujia_rgon_nm, gujia_comm_id,gujia_comm_nm,gujia_bds_clc_tp,gujia_bds_avprc,gujiabds_to_mkprc_mny,gujia_mns_rto from t_app_p9pha_plda.avm_evaluation_item_gj_h where gujiabds_clc_yrmo_val=${yearmonth} and gujia_data_tp='第三方' and urbn_nm='${cityName}' and gujia_mns_rto>15" + def sql = "SELECT urbn_id, urbn_nm, gujia_fsid,gujia_rgon_nm, gujia_comm_id,gujia_comm_nm,gujia_bds_clc_tp,gujia_bds_avprc,gujiabds_to_mkprc_mny,gujia_mns_rto from t_app_p9pha_plda.avm_evaluation_item_gj_h where gujiabds_clc_yrmo_val=${yearmonth} and gujia_data_tp='绗笁鏂�' and urbn_nm='${cityName}' and gujia_mns_rto>15" def rets = [] pgsqlInstance.eachRow(sql,{r-> def map = [:] @@ -524,7 +524,7 @@ class DealPriceDataProcess { def delDealData(){ - ExcelUtils.modify("D:\\数据\\建行\\房产估值\\成交\\杭州成交删除12-23.xlsx", { d -> + ExcelUtils.modify("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鎴愪氦\\鏉窞鎴愪氦鍒犻櫎12-23.xlsx", { d -> if(d['A']){ def count = delDealDataByid(d['A'],d['K'].toString().toDouble(), d['H'].toString().toDouble().toInteger()) println d['B']+" "+count @@ -544,7 +544,7 @@ class DealPriceDataProcess { } def statPpe(){ - def path = "C:\\Users\\gaojuan\\Desktop\\估值数据统计.xlsx" + 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 = [] diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/DistrictDelete.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/DistrictDelete.groovy index a7681d9f0..0c1eb2464 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/DistrictDelete.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/DistrictDelete.groovy @@ -58,9 +58,9 @@ class DistrictDelete { // task.processRegion() } def processRegion(){ - ExcelUtils.multiThreadingModify("C:\\Users\\gaojuan\\Desktop\\重庆3个月房源.xlsx",{d-> + ExcelUtils.multiThreadingModify("C:\\Users\\gaojuan\\Desktop\\閲嶅簡3涓湀鎴挎簮.xlsx",{d-> if(d['B']){ - def region = RegionData.formatRegion("重庆",d['B']) + def region = RegionData.formatRegion("閲嶅簡",d['B']) if(region){ d['B'] = region } @@ -69,18 +69,18 @@ class DistrictDelete { } def addThirdPartyStat(){ - def datas= ExcelUtils.read("C:\\Users\\gaojuan\\Desktop\\上海12月房源.xlsx",0,1) + def datas= ExcelUtils.read("C:\\Users\\gaojuan\\Desktop\\涓婃捣12鏈堟埧婧�.xlsx",0,1) def idMaps = [:] for(def d : datas){ def id = d['A'] idMaps.put(id, d['D']) } - def dists = CcbCommonUtils.findAllDistrictByCity("上海", "district", ["city","region", "name", "alias","address","lng","build_type","finish_building_date","estate_type2","name_cat"]) + def dists = CcbCommonUtils.findAllDistrictByCity("涓婃捣", "district", ["city","region", "name", "alias","address","lng","build_type","finish_building_date","estate_type2","name_cat"]) def totalCount = new AtomicLong() - def map = findThirdPartyPrice("上海") + def map = findThirdPartyPrice("涓婃捣") final CountDownLatch latch = new CountDownLatch(dists.size()) def thirdLists = Collections.synchronizedList(new ArrayList()); - thirdLists << ["ID","区域","名称","总量"] + thirdLists << ["ID","鍖哄煙","鍚嶇О","鎬婚噺"] for(def i=0;i + ExcelUtils.modify("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\瑕佸垹闄ゅ皬鍖� (5).xlsx",{d-> if(d['G']){ def id = d['G'] BasicDBObject q=new BasicDBObject('name_cat',1) @@ -324,7 +324,7 @@ class DistrictDelete { } def deleteDistrict(){ - ExcelUtils.multiThreadingModify("D:\\数据\\建行\\房产估值\\要删除小区.xlsx",{d-> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\瑕佸垹闄ゅ皬鍖�.xlsx",{d-> if(d['G']){ def id = d['G'] BasicDBObject q=new BasicDBObject('name_cat',1) @@ -343,7 +343,7 @@ class DistrictDelete { } def deleteCommPrice(){ - ExcelUtils.modify("D:\\数据\\建行\\房产估值\\均价删除.xlsx",{d-> + ExcelUtils.modify("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鍧囦环鍒犻櫎.xlsx",{d-> if(d['B']){ def id = d['B'] println id @@ -355,7 +355,7 @@ class DistrictDelete { def deleteByCommid(tableName, commid){ def sql = "delete from "+tableName+" where commid='${commid}'"; sqlInstance.execute(sql) - println "删除:"+tableName+" "+commid + println "鍒犻櫎锛�"+tableName+" "+commid } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/DistrictGuidePriceBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/DistrictGuidePriceBatch.groovy index fdf28955b..f749c6e09 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/DistrictGuidePriceBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/DistrictGuidePriceBatch.groovy @@ -24,7 +24,7 @@ class DistrictGuidePriceBatch extends BaseBatch{ def cityCodeDatas = CcbCommonUtils.findCityCodeValue() def distCodeMap = CcbCommonUtils.findAllDistrictCodeValue(city) - //添加自己库中的人工指导价 + //娣诲姞鑷繁搴撲腑鐨勪汉宸ユ寚瀵间环 def prices = CcbCommonUtils.findGuidePrice(city, "2022-03-1", "2022-04-1") if(prices){ def distMap = getDistrictMap(city) @@ -34,8 +34,8 @@ class DistrictGuidePriceBatch extends BaseBatch{ } } - def headers = ["第三方均价ID","楼盘ID","小区名称","城市ID","城市名称","行政区ID","行政区名称","指导价格","类型","备注","创建时间","更新时间","来源公司"] - FileUtils.batchCreateFile(rows, "d:\\数据\\建行\\房产估值\\数据文件\\txt\\COMMUNITY_GUIDE_PRICE_GJ.dat", headers, "utf-8", false); + def headers = ["绗笁鏂瑰潎浠稩D","妤肩洏ID","灏忓尯鍚嶇О","鍩庡競ID","鍩庡競鍚嶇О","琛屾斂鍖篒D","琛屾斂鍖哄悕绉�","鎸囧浠锋牸","绫诲瀷","澶囨敞","鍒涘缓鏃堕棿","鏇存柊鏃堕棿","鏉ユ簮鍏徃"] + FileUtils.batchCreateFile(rows, "d:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\COMMUNITY_GUIDE_PRICE_GJ.dat", headers, "utf-8", false); } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/EvaluateRateBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/EvaluateRateBatch.groovy index afae30ba4..1f34a497d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/EvaluateRateBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/EvaluateRateBatch.groovy @@ -9,8 +9,8 @@ import com.fangjia.script.util.ExcelUtils import groovy.sql.Sql /** - * 建行模型估值项目 - * 估价系数数据同步 + * 寤鸿妯″瀷浼板�奸」鐩� + * 浼颁环绯绘暟鏁版嵁鍚屾 */ @BatchOwner(Watcher.GaoJuan) class EvaluateRateBatch extends BaseBatch{ @@ -25,24 +25,24 @@ class EvaluateRateBatch extends BaseBatch{ public void process(Object args) { def allDatas = createDatas(findEvaluationRate()) - def headers = ["系数ID","系数类型","系数","排序","城市","备注","创建时间","更新时间","来源公司"] + def headers = ["绯绘暟ID","绯绘暟绫诲瀷","绯绘暟","鎺掑簭","鍩庡競","澶囨敞","鍒涘缓鏃堕棿","鏇存柊鏃堕棿","鏉ユ簮鍏徃"] def rets = [] rets << headers rets.addAll(allDatas) - ExcelUtils.write("d:\\数据\\建行\\房产估值\\数据文件\\excel\\EVALUATE_RATE_GJ.xlsx", rets, "数据") - FileUtils.batchCreateFile(allDatas, "d:\\数据\\建行\\房产估值\\数据文件\\txt\\EVALUATE_RATE_GJ.dat",headers, "utf-8", false); + ExcelUtils.write("d:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\excel\\EVALUATE_RATE_GJ.xlsx", rets, "鏁版嵁") + FileUtils.batchCreateFile(allDatas, "d:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\EVALUATE_RATE_GJ.dat",headers, "utf-8", false); } def createDatas(def datas){ def allRows = [] datas.each { m -> - if(m.rank_remark!="开发商装修"){ + if(m.rank_remark!="寮�鍙戝晢瑁呬慨"){ def data = [] data << m.id.toString() data << m.rate_type data << m.rate data << m.rank - data << "全国" + data << "鍏ㄥ浗" data << converFitment(m.rank_remark) data << DateUtils.formatDateByPattern(new Date(), "yyyy-MM-dd HH:mm:ss") data << DateUtils.formatDateByPattern(new Date(), "yyyy-MM-dd HH:mm:ss") @@ -55,19 +55,19 @@ class EvaluateRateBatch extends BaseBatch{ private def converFitment(rank_remark){ if(rank_remark){ - if(rank_remark.contains("简单装修")){ - return "简装" - }else if(rank_remark.contains("精装修")){ - return "精装" - }else if(rank_remark.contains("豪华装修")){ - return "豪装" + if(rank_remark.contains("绠�鍗曡淇�")){ + return "绠�瑁�" + }else if(rank_remark.contains("绮捐淇�")){ + return "绮捐" + }else if(rank_remark.contains("璞崕瑁呬慨")){ + return "璞" } } return rank_remark } private def findEvaluationRate(){ - def sql = "SELECT id, rate_type, rate, rank, rank_remark,date_created, last_updated FROM rate WHERE TYPE = '小区'"; + def sql = "SELECT id, rate_type, rate, rank, rank_remark,date_created, last_updated FROM rate WHERE TYPE = '灏忓尯'"; def rets = [] sqlInstance.eachRow(sql,{ rets << ["id":it.id, "rate_type":it.rate_type, "rate":it.rate, "rank":it.rank,"rank_remark":it.rank_remark,"c_date":it.date_created, "m_date":it.last_updated] diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleAllDataTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleAllDataTest.groovy index 8c765a987..aa0f0bc8c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleAllDataTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleAllDataTest.groovy @@ -13,7 +13,7 @@ import org.apache.commons.codec.digest.DigestUtils import java.sql.ResultSet -//估值 新版 导出所有数据 +//浼板�� 鏂扮増 瀵煎嚭鎵�鏈夋暟鎹� class ExportOracleAllDataTest { def sqlInstance = Sql.newInstance("jdbc:oracle:thin:@192.168.0.236:1521:orcl", @@ -33,12 +33,12 @@ class ExportOracleAllDataTest { // def dists = CommonDatautils.findAllDistrictByCity(c, "district", ["city","region", "name"]) // rows << [c, dists.size()] // } -// ExcelUtils.write("D:\\数据\\建行\\房产估值\\数据文件\\txt\\252城小区量统计.xlsx", rows, "数量") +// ExcelUtils.write("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\252鍩庡皬鍖洪噺缁熻.xlsx", rows, "鏁伴噺") } def run(args) { - citys = CcbCommonUtils.getRunningCitys(args)//["潍坊","济宁","威海","临沂","绵阳","陇南","塔城","阿勒泰","迪庆州","日喀则"] //CcbCommonUtils.getRunningCitys(args) + citys = CcbCommonUtils.getRunningCitys(args)//["娼嶅潑","娴庡畞","濞佹捣","涓存矀","缁甸槼","闄囧崡","濉斿煄","闃垮嫆娉�","杩簡宸�","鏃ュ杸鍒�"] //CcbCommonUtils.getRunningCitys(args) def curMonth = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), 0, "yyyyMM")); def lastMonth = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM")); def lastMonthStr = DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyy-MM"), -1, "yyyy-MM") @@ -46,26 +46,26 @@ class ExportOracleAllDataTest { // exportBigdataForsale(new_dists) //2022-07-19 // -// //不会变 10.25 +// //涓嶄細鍙� 10.25 // exportEvaluationRateData() // exportBigdataPoiData()// // exportBigdataDistrictData()// // -// exportGuidedPrice()//随人工改变// -// exportCommunityGuidedPrice(lastMonth.toString()+"28")//随政策// +// exportGuidedPrice()//闅忎汉宸ユ敼鍙�// +// exportCommunityGuidedPrice(lastMonth.toString()+"28")//闅忔斂绛�// // -// //处理小区情况 +// //澶勭悊灏忓尯鎯呭喌 // exportBigdataCommunity()// -// exportCommunityStaging()//没cityid +// exportCommunityStaging()//娌ityid // exportCommunityBuileType()// // // exportThirdPartyPrice2(new_dists)// // exportBigdataDeal( new_dists) //2022-07-01 //// -//// //第三方网站权重表 +//// //绗笁鏂圭綉绔欐潈閲嶈〃 // exportWebsiteRate(); //// -//// //计算结果相关 +//// //璁$畻缁撴灉鐩稿叧 // exportAvmEvaluationGJNB()// // exportAVMEvaluationItemGJNB()// // @@ -78,7 +78,7 @@ class ExportOracleAllDataTest { // exportCommunityPdescribeGj()// // exportCommCaseDetailGj()// -// // ok文件 +// // ok鏂囦欢 // exportInOk() // SSHHelperTest jschCommand = new SSHHelperTest(); // System.out.println(jschCommand.executeCommand("sh /home/ccb_evaluation/output/eval_package.sh ${curDate}")); @@ -105,13 +105,13 @@ class ExportOracleAllDataTest { def fileName = "/ccb_evaluation/MODEL_000000_000000_EVALUATE_RATE_GJ_ALL_${curDate}_0001.dat" if (CommonDatautils.isWindow()) { - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_EVALUATE_RATE_GJ_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_EVALUATE_RATE_GJ_ALL_${curDate}_0001.dat" } - def headers = []//["系数ID","系数类型","系数","排序","城市","备注","创建时间","更新时间","来源公司"] + def headers = []//["绯绘暟ID","绯绘暟绫诲瀷","绯绘暟","鎺掑簭","鍩庡競","澶囨敞","鍒涘缓鏃堕棿","鏇存柊鏃堕棿","鏉ユ簮鍏徃"] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); - println "数据文件输出完成......" + println "鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpTestUtils.ftpUpload(null, fileName, curDate) - println "上传Ftp完成......" + println "涓婁紶Ftp瀹屾垚......" } @@ -135,13 +135,13 @@ class ExportOracleAllDataTest { def fileName = "/ccb_evaluation/MODEL_000000_000000_WEBSITE_CONFIG_GJ_ALL_${curDate}_0001.dat" if (CommonDatautils.isWindow()) { - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_WEBSITE_CONFIG_GJ_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_WEBSITE_CONFIG_GJ_ALL_${curDate}_0001.dat" } - def headers = []//["系数ID","系数类型","系数","排序","城市","备注","创建时间","更新时间","来源公司"] + def headers = []//["绯绘暟ID","绯绘暟绫诲瀷","绯绘暟","鎺掑簭","鍩庡競","澶囨敞","鍒涘缓鏃堕棿","鏇存柊鏃堕棿","鏉ユ簮鍏徃"] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); - println "数据文件输出完成......" + println "鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpTestUtils.ftpUpload(null, fileName, curDate) - println "上传Ftp完成......" + println "涓婁紶Ftp瀹屾垚......" } @@ -169,14 +169,14 @@ class ExportOracleAllDataTest { } def fileName = "/ccb_evaluation/MODEL_000000_000000_BIGDATA_POI_GJ_ALL_${curDate}_0001.dat" if (CommonDatautils.isWindow()) { - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_POI_GJ_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_POI_GJ_ALL_${curDate}_0001.dat" } - def headers = []//["城市ID","行政区ID","ID","Poi名称","类型","类型编码","纬度","经度","备注","创建时间","更新时间","来源公司"] + def headers = []//["鍩庡競ID","琛屾斂鍖篒D","ID","Poi鍚嶇О","绫诲瀷","绫诲瀷缂栫爜","绾害","缁忓害","澶囨敞","鍒涘缓鏃堕棿","鏇存柊鏃堕棿","鏉ユ簮鍏徃"] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); - println "BIGDATA_POI_GJ 数据文件输出完成......" + println "BIGDATA_POI_GJ 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpTestUtils.ftpUpload(null, fileName, curDate) - println "BIGDATA_POI_GJ 上传Ftp完成......" + println "BIGDATA_POI_GJ 涓婁紶Ftp瀹屾垚......" } def exportCommunityStaging() { @@ -196,18 +196,18 @@ class ExportOracleAllDataTest { }); def fileName = "/ccb_evaluation/MODEL_000000_000000_COMMUNITY_STAGING_GJ_ALL_${curDate}_0001.dat" if (CommonDatautils.isWindow()) { - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_COMMUNITY_STAGING_GJ_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_COMMUNITY_STAGING_GJ_ALL_${curDate}_0001.dat" } - def headers = []//["分期ID","小区ID","小区主期ID","备注","创建时间","更新时间","来源公司"] + def headers = []//["鍒嗘湡ID","灏忓尯ID","灏忓尯涓绘湡ID","澶囨敞","鍒涘缓鏃堕棿","鏇存柊鏃堕棿","鏉ユ簮鍏徃"] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); - println "COMMUNITY_STAGING_GJ 数据文件输出完成......" + println "COMMUNITY_STAGING_GJ 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpTestUtils.ftpUpload(null, fileName, curDate) - println "COMMUNITY_STAGING_GJ 上传Ftp完成......" + println "COMMUNITY_STAGING_GJ 涓婁紶Ftp瀹屾垚......" } def exportCommunityBuileType() { -// def citys = [ "上海","扬州","北京","重庆","天津","成都","沈阳","大连","安庆","西宁","日照","长春","武汉","西安","苏州","广州","南京","青岛","济南","宁波","长沙","石家庄","佛山","嘉兴","银川","南通","廊坊","中山","郑州","哈尔滨","烟台","徐州","绍兴","厦门","昆明","南昌","贵阳","珠海","东莞","镇江","洛阳","温州","兰州","福州","惠州","呼和浩特","常州","唐山","淮安","湖州","九江","太原","北海","株洲","淄博","盐城","乌鲁木齐","海口","南宁","常德","台州","金华","吉林","岳阳","柳州","清远","湛江","张家口","保定","深圳","杭州","合肥","无锡","泉州","遵义","肇庆","漳州","宜昌","芜湖","泰州","汕头","三亚","秦皇岛","马鞍山","连云港","沧州","拉萨","锦州","大同","文昌","保亭","陵水"] +// def citys = [ "涓婃捣","鎵窞","鍖椾含","閲嶅簡","澶╂触","鎴愰兘","娌堥槼","澶ц繛","瀹夊簡","瑗垮畞","鏃ョ収","闀挎槬","姝︽眽","瑗垮畨","鑻忓窞","骞垮窞","鍗椾含","闈掑矝","娴庡崡","瀹佹尝","闀挎矙","鐭冲搴�","浣涘北","鍢夊叴","閾跺窛","鍗楅��","寤婂潑","涓北","閮戝窞","鍝堝皵婊�","鐑熷彴","寰愬窞","缁嶅叴","鍘﹂棬","鏄嗘槑","鍗楁槍","璐甸槼","鐝犳捣","涓滆帪","闀囨睙","娲涢槼","娓╁窞","鍏板窞","绂忓窞","鎯犲窞","鍛煎拰娴╃壒","甯稿窞","鍞愬北","娣畨","婀栧窞","涔濇睙","澶師","鍖楁捣","鏍床","娣勫崥","鐩愬煄","涔岄瞾鏈ㄩ綈","娴峰彛","鍗楀畞","甯稿痉","鍙板窞","閲戝崕","鍚夋灄","宀抽槼","鏌冲窞","娓呰繙","婀涙睙","寮犲鍙�","淇濆畾","娣卞湷","鏉窞","鍚堣偉","鏃犻敗","娉夊窞","閬典箟","鑲囧簡","婕冲窞","瀹滄槍","鑺滄箹","娉板窞","姹曞ご","涓変簹","绉︾殗宀�","椹瀺灞�","杩炰簯娓�","娌у窞","鎷夎惃","閿﹀窞","澶у悓","鏂囨槍","淇濅涵","闄垫按"] // def cityCodeDataMap = CcbCommonUtils.findCityCodeValue() def allRows = [] for(def city : citys) { @@ -229,14 +229,14 @@ class ExportOracleAllDataTest { def fileName = "/ccb_evaluation/MODEL_000000_000000_BIGDATA_COMMBUILDTYPE_GJ_ALL_${curDate}_0001.dat" if (CommonDatautils.isWindow()) { - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_COMMBUILDTYPE_GJ_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_COMMBUILDTYPE_GJ_ALL_${curDate}_0001.dat" } - def headers = []//["城市ID","小区ID"," 建筑类型","备注","创建时间","更新时间","来源公司","数据时间"] + def headers = []//["鍩庡競ID","灏忓尯ID"," 寤虹瓚绫诲瀷","澶囨敞","鍒涘缓鏃堕棿","鏇存柊鏃堕棿","鏉ユ簮鍏徃","鏁版嵁鏃堕棿"] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); - println "BIGDATA_COMMBUILDTYPE_GJ 数据文件输出完成......" + println "BIGDATA_COMMBUILDTYPE_GJ 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpTestUtils.ftpUpload(null, fileName, curDate) - println "BIGDATA_COMMBUILDTYPE_GJ 上传Ftp完成......" + println "BIGDATA_COMMBUILDTYPE_GJ 涓婁紶Ftp瀹屾垚......" } def exportBigdataDistrictData() { @@ -266,15 +266,15 @@ class ExportOracleAllDataTest { } def fileName = "/ccb_evaluation/MODEL_000000_000000_BIGDATA_DISTRICT_GJ_ALL_${curDate}_0001.dat" if (CommonDatautils.isWindow()) { - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_DISTRICT_GJ_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_DISTRICT_GJ_ALL_${curDate}_0001.dat" } def headers = [] -//["行政区ID","行政区名称","行政区名称拼音","城市ID","国标码","显示顺序","行政区类别","备注","创建时间","更新时间","来源公司","逻辑行政区","逻辑行政区划代码","行政区划代码","数据时间"] +//["琛屾斂鍖篒D","琛屾斂鍖哄悕绉�","琛屾斂鍖哄悕绉版嫾闊�","鍩庡競ID","鍥芥爣鐮�","鏄剧ず椤哄簭","琛屾斂鍖虹被鍒�","澶囨敞","鍒涘缓鏃堕棿","鏇存柊鏃堕棿","鏉ユ簮鍏徃","閫昏緫琛屾斂鍖�","閫昏緫琛屾斂鍖哄垝浠g爜","琛屾斂鍖哄垝浠g爜","鏁版嵁鏃堕棿"] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); - println "BIGDATA_DISTRICT_GJ 数据文件输出完成......" + println "BIGDATA_DISTRICT_GJ 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpTestUtils.ftpUpload(null, fileName, curDate) - println "BIGDATA_DISTRICT_GJ 上传Ftp完成......" + println "BIGDATA_DISTRICT_GJ 涓婁紶Ftp瀹屾垚......" } @@ -304,14 +304,14 @@ class ExportOracleAllDataTest { } def fileName = "/ccb_evaluation/MODEL_000000_000000_GUIDED_PRICE_GJ_ALL_${curDate}_0001.dat" if (CommonDatautils.isWindow()) { - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_GUIDED_PRICE_GJ_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_GUIDED_PRICE_GJ_ALL_${curDate}_0001.dat" } def headers = [] -//["第三方均价ID","楼盘ID","小区名称","城市ID","城市名称","行政区ID","行政区名称","指导日期","指导价格","添加人","备注","创建时间","更新时间","来源公司"] +//["绗笁鏂瑰潎浠稩D","妤肩洏ID","灏忓尯鍚嶇О","鍩庡競ID","鍩庡競鍚嶇О","琛屾斂鍖篒D","琛屾斂鍖哄悕绉�","鎸囧鏃ユ湡","鎸囧浠锋牸","娣诲姞浜�","澶囨敞","鍒涘缓鏃堕棿","鏇存柊鏃堕棿","鏉ユ簮鍏徃"] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); - println "GUIDED_PRICE_GJ 数据文件输出完成......" + println "GUIDED_PRICE_GJ 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpTestUtils.ftpUpload(null, fileName, curDate) - println "GUIDED_PRICE_GJ 上传Ftp完成......" + println "GUIDED_PRICE_GJ 涓婁紶Ftp瀹屾垚......" } def exportCommunityGuidedPrice(def date) { @@ -339,14 +339,14 @@ class ExportOracleAllDataTest { } def fileName = "/ccb_evaluation/MODEL_000000_000000_COMMUNITY_GUIDE_PRICE_GJ_ADD_${curDate}_0001.dat" if (CommonDatautils.isWindow()) { - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_COMMUNITY_GUIDE_PRICE_GJ_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_COMMUNITY_GUIDE_PRICE_GJ_ADD_${curDate}_0001.dat" } - def headers = []//["第三方均价ID","楼盘ID","小区名称","城市ID","城市名称","行政区ID","行政区名称","指导价格","类型","备注","创建时间","更新时间","来源公司"] + def headers = []//["绗笁鏂瑰潎浠稩D","妤肩洏ID","灏忓尯鍚嶇О","鍩庡競ID","鍩庡競鍚嶇О","琛屾斂鍖篒D","琛屾斂鍖哄悕绉�","鎸囧浠锋牸","绫诲瀷","澶囨敞","鍒涘缓鏃堕棿","鏇存柊鏃堕棿","鏉ユ簮鍏徃"] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); - println "COMMUNITY_GUIDE_PRICE_GJ 数据文件输出完成......" + println "COMMUNITY_GUIDE_PRICE_GJ 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpTestUtils.ftpUpload(null, fileName, curDate) - println "COMMUNITY_GUIDE_PRICE_GJ 上传Ftp完成......" + println "COMMUNITY_GUIDE_PRICE_GJ 涓婁紶Ftp瀹屾垚......" } def exportBigdataDeal(def new_dists) { @@ -383,13 +383,13 @@ class ExportOracleAllDataTest { def fileName = "/ccb_evaluation/MODEL_000000_000000_BIGDATA_DEAL_GJ_ADD_${curDate}_0001.dat" if (CommonDatautils.isWindow()) { - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_DEAL_GJ_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_DEAL_GJ_ADD_${curDate}_0001.dat" } def headers = [] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); - println "BIGDATA_DEAL_GJ 数据文件输出完成......" + println "BIGDATA_DEAL_GJ 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpTestUtils.ftpUpload(null, fileName, curDate) - println "BIGDATA_DEAL_GJ 上传Ftp完成......" + println "BIGDATA_DEAL_GJ 涓婁紶Ftp瀹屾垚......" } @@ -503,15 +503,15 @@ class ExportOracleAllDataTest { }) def fileName = "/ccb_evaluation/MODEL_000000_000000_THIRD_PARTY_PRICE_GJ_ADD_${curDate}_0001.dat" if (CommonDatautils.isWindow()) { - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_THIRD_PARTY_PRICE_GJ_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_THIRD_PARTY_PRICE_GJ_ADD_${curDate}_0001.dat" } def headers = [] -//["第三方均价ID","楼盘ID","小区名称","城市ID","城市名称","行政区ID","行政区名称","均价对应的月份","诸葛找房均价","安居客均价","房天下均价","链家均价","城市房产均价","麦田均价","贝壳均价","淘房365","中原均价","兔博士均价","Q房均价","房探均价","房多多均价","我爱我家均价","创建时间","更新时间","来源公司"] +//["绗笁鏂瑰潎浠稩D","妤肩洏ID","灏忓尯鍚嶇О","鍩庡競ID","鍩庡競鍚嶇О","琛屾斂鍖篒D","琛屾斂鍖哄悕绉�","鍧囦环瀵瑰簲鐨勬湀浠�","璇歌憶鎵炬埧鍧囦环","瀹夊眳瀹㈠潎浠�","鎴垮ぉ涓嬪潎浠�","閾惧鍧囦环","鍩庡競鎴夸骇鍧囦环","楹︾敯鍧囦环","璐濆3鍧囦环","娣樻埧365","涓師鍧囦环","鍏斿崥澹潎浠�","Q鎴垮潎浠�","鎴挎帰鍧囦环","鎴垮澶氬潎浠�","鎴戠埍鎴戝鍧囦环","鍒涘缓鏃堕棿","鏇存柊鏃堕棿","鏉ユ簮鍏徃"] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); - println "THIRD_PARTY_PRICE_GJ 数据文件输出完成......" + println "THIRD_PARTY_PRICE_GJ 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpTestUtils.ftpUpload(null, fileName, curDate) - println "THIRD_PARTY_PRICE_GJ 上传数据文件完成......" + println "THIRD_PARTY_PRICE_GJ 涓婁紶鏁版嵁鏂囦欢瀹屾垚......" } @@ -519,7 +519,7 @@ class ExportOracleAllDataTest { def fileName = "/ccb_evaluation/MODEL_000000_000000_BIGDATA_THIRD_PARTY_PRICE_GJ_ADD_${curDate}_0001.dat" if (CommonDatautils.isWindow()) { - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_THIRD_PARTY_PRICE_GJ_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_THIRD_PARTY_PRICE_GJ_ADD_${curDate}_0001.dat" // fileName = "D:\\MODEL_000000_000000_BIGDATA_THIRD_PARTY_PRICE_GJ_ADD_${curDate}_0001.dat" } def headers = [] @@ -554,7 +554,7 @@ class ExportOracleAllDataTest { } } - println "BIGDATA_THIRD_PARTY_PRICE_GJ 数据文件输出完成......" + println "BIGDATA_THIRD_PARTY_PRICE_GJ 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpTestUtils.ftpUpload(null, fileName, curDate) } @@ -626,24 +626,24 @@ class ExportOracleAllDataTest { def fileName = "/ccb_evaluation/MODEL_000000_000000_BIGDATA_COMMUNITY_GJ_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_COMMUNITY_GJ_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_COMMUNITY_GJ_ALL_${curDate}_0001.dat" } - def headers = []//["城市ID","行政区ID","小区ID","行政区名称","小区名称","详细地址","纬度","经度","占地总面积","建筑总面积","绿化率","容积率","车位数量","建筑年代","房屋用途", - //"总套数","数据时间","更新标记","更新时间","小区类型","小区曾用名","街道","门牌号","是否新盘","小区介绍","备注","创建时间","来源公司", - //"乡镇/街道办","逻辑行政区划代码","逻辑行政区划","状态"] + def headers = []//["鍩庡競ID","琛屾斂鍖篒D","灏忓尯ID","琛屾斂鍖哄悕绉�","灏忓尯鍚嶇О","璇︾粏鍦板潃","绾害","缁忓害","鍗犲湴鎬婚潰绉�","寤虹瓚鎬婚潰绉�","缁垮寲鐜�","瀹圭Н鐜�","杞︿綅鏁伴噺","寤虹瓚骞翠唬","鎴垮眿鐢ㄩ��", + //"鎬诲鏁�","鏁版嵁鏃堕棿","鏇存柊鏍囪","鏇存柊鏃堕棿","灏忓尯绫诲瀷","灏忓尯鏇剧敤鍚�","琛楅亾","闂ㄧ墝鍙�","鏄惁鏂扮洏","灏忓尯浠嬬粛","澶囨敞","鍒涘缓鏃堕棿","鏉ユ簮鍏徃", + //"涔¢晣/琛楅亾鍔�","閫昏緫琛屾斂鍖哄垝浠g爜","閫昏緫琛屾斂鍖哄垝","鐘舵��"] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); - println "BIGDATA_COMMUNITY_GJ 数据文件输出完成......" + println "BIGDATA_COMMUNITY_GJ 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpTestUtils.ftpUpload(null, fileName, curDate) - println "BIGDATA_COMMUNITY_GJ 上传Ftp完成......" + println "BIGDATA_COMMUNITY_GJ 涓婁紶Ftp瀹屾垚......" } def exportBigdataForsale(new_dists){ - //["北京","上海"] + //["鍖椾含","涓婃捣"] def fileName = "/ccb_evaluation/MODEL_000000_000000_BIGDATA_FORSALE_GJ_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_FORSALE_GJ_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_FORSALE_GJ_ADD_${curDate}_0001.dat" } - def headers = []//["城市ID","出售ID","挂牌房屋ID","城市名称","行政区ID","行政区名称","小区ID","小区名称","楼栋ID","楼栋编号","楼栋名称","单元ID","单元编号","单元名称","户ID","详细地址","建筑年代","权属","权属年限","单价","总价","出售付款方式","所在楼层","总楼层","建筑类型","室内结构","建筑结构","建筑面积","套内面积","户型","室","厅","厨","卫","朝向","装修情况","是否有电梯","几梯几户","发布时间","到期时间","是否首发","房源数据来源","中介公司ID","中介公司名称","发布人","发布人电话","描述信息","备注","创建时间","更新时间","来源公司","附加信息"] + def headers = []//["鍩庡競ID","鍑哄敭ID","鎸傜墝鎴垮眿ID","鍩庡競鍚嶇О","琛屾斂鍖篒D","琛屾斂鍖哄悕绉�","灏忓尯ID","灏忓尯鍚嶇О","妤兼爧ID","妤兼爧缂栧彿","妤兼爧鍚嶇О","鍗曞厓ID","鍗曞厓缂栧彿","鍗曞厓鍚嶇О","鎴稩D","璇︾粏鍦板潃","寤虹瓚骞翠唬","鏉冨睘","鏉冨睘骞撮檺","鍗曚环","鎬讳环","鍑哄敭浠樻鏂瑰紡","鎵�鍦ㄦゼ灞�","鎬绘ゼ灞�","寤虹瓚绫诲瀷","瀹ゅ唴缁撴瀯","寤虹瓚缁撴瀯","寤虹瓚闈㈢Н","濂楀唴闈㈢Н","鎴峰瀷","瀹�","鍘�","鍘�","鍗�","鏈濆悜","瑁呬慨鎯呭喌","鏄惁鏈夌數姊�","鍑犳鍑犳埛","鍙戝竷鏃堕棿","鍒版湡鏃堕棿","鏄惁棣栧彂","鎴挎簮鏁版嵁鏉ユ簮","涓粙鍏徃ID","涓粙鍏徃鍚嶇О","鍙戝竷浜�","鍙戝竷浜虹數璇�","鎻忚堪淇℃伅","澶囨敞","鍒涘缓鏃堕棿","鏇存柊鏃堕棿","鏉ユ簮鍏徃","闄勫姞淇℃伅"] def index = 0 for(def city : citys){ def cityCode = cityCodeMap.get(city) @@ -676,7 +676,7 @@ class ExportOracleAllDataTest { } } - if(new_dists){//补充被修区域的数据 + if(new_dists){//琛ュ厖琚慨鍖哄煙鐨勬暟鎹� def newstr = "('"+new_dists.join("','")+"')" def sql2 = "select CITYID,FORSALEID,PROPCODE,CITYNAME,DISTID,DISTNAME,COMMID,COMMNAME, BUILDID,BUILDNO, BUILDNAME,UNITID,UNITNO,UNITNAME,HOUSEID,ADDRESS,BUILDYEAR,PROPTYPE,PROPYEARS,UNITPRICE,TOTALPRICE,PAYTYPE,FLOORNUM,FLOORCNT,\n" + " BUILDTYPE, HOUSESTRU,BUILDSTRU,BUILDAREA,LIVINGAREA,HOUSESTYLE,ROOMCNT,LIVINGROOMCNT,KITCHENCNT, BATHROOMCNT,HOUSEASPECT,FITMENT,IFELEVATOR,ELEVATORHOUSE,to_char(PUBLISHTIME,'yyyy-mm-dd hh24:mi:ss') as PUBLISHTIME,to_char(EXPIRETIME,'yyyy-mm-dd hh24:mi:ss') as EXPIRETIME,\n" + @@ -687,9 +687,9 @@ class ExportOracleAllDataTest { FileUtils.batchCreateFile(rets2, fileName, headers, "utf-8", true); } } - println "BIGDATA_FORSALE_GJ 数据文件输出完成......" + println "BIGDATA_FORSALE_GJ 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpTestUtils.ftpUpload(null, fileName, curDate) - println "BIGDATA_FORSALE_GJ 上传Ftp完成......" + println "BIGDATA_FORSALE_GJ 涓婁紶Ftp瀹屾垚......" } def getHouseDatas(sql, fileName){ @@ -772,8 +772,8 @@ class ExportOracleAllDataTest { def fileName = "/ccb_evaluation/MODEL_000000_000000_AVM_EVALUATION_GJNB_ADD_${curDate}_0001.dat" def fileName1 = "/ccb_evaluation/MODEL_000000_000000_AVM_EVALUATION_GJ_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_AVM_EVALUATION_GJNB_ADD_${curDate}_0001.dat" - fileName1 = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_AVM_EVALUATION_GJ_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_AVM_EVALUATION_GJNB_ADD_${curDate}_0001.dat" + fileName1 = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_AVM_EVALUATION_GJ_ADD_${curDate}_0001.dat" } def allRows = [] @@ -826,18 +826,18 @@ class ExportOracleAllDataTest { def headers = [] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); FileUtils.batchCreateFile(allRows, fileName1, headers, "utf-8", false); - println "AVM_EVALUATION_GJNB 数据文件输出完成......" + println "AVM_EVALUATION_GJNB 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpTestUtils.ftpUpload(null, fileName, curDate) CcbFtpTestUtils.ftpUpload(null, fileName1, curDate) - println "AVM_EVALUATION_GJNB 上传Ftp完成......" + println "AVM_EVALUATION_GJNB 涓婁紶Ftp瀹屾垚......" } def exportAVMEvaluationItemGJNB(){ def fileName = "/ccb_evaluation/MODEL_000000_000000_AVM_EVALUATION_ITEM_GJNB_ADD_${curDate}_0001.dat" def fileName1 = "/ccb_evaluation/MODEL_000000_000000_AVM_EVALUATION_ITEM_GJ_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_AVM_EVALUATION_ITEM_GJNB_ADD_${curDate}_0001.dat" - fileName1 = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_AVM_EVALUATION_ITEM_GJ_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_AVM_EVALUATION_ITEM_GJNB_ADD_${curDate}_0001.dat" + fileName1 = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_AVM_EVALUATION_ITEM_GJ_ADD_${curDate}_0001.dat" } def allRows = [] for(def city : citys) { @@ -877,10 +877,10 @@ class ExportOracleAllDataTest { def headers = []//["ID","CITYID","CITYNAME","DISTID","DISTNAME","COMMID","COMMNAME","YEAR_MONTH","CALC_AVG_PRICE","AVG_PRICE","CALC_TYPE","CONFIDENCE","TARGET_AVG_PRICE","DEALDATE","UNIT_PRICE","BUILDAREA","FITMENT","HOUSEASPECT","FLOORNUM","FLOORCNT","DATA_TYPE","RATE","PE","CREATETIME"] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); FileUtils.batchCreateFile(allRows, fileName1, headers, "utf-8", false); - println "AVM_EVALUATION_ITEM_GJNB 数据文件输出完成......" + println "AVM_EVALUATION_ITEM_GJNB 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpTestUtils.ftpUpload(null, fileName, curDate) CcbFtpTestUtils.ftpUpload(null, fileName1, curDate) - println "AVM_EVALUATION_ITEM_GJNB 上传Ftp完成......" + println "AVM_EVALUATION_ITEM_GJNB 涓婁紶Ftp瀹屾垚......" } def exportCommunityBasePrice(){ @@ -889,8 +889,8 @@ class ExportOracleAllDataTest { def fileName = "/ccb_evaluation/MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJNB_ADD_${curDate}_0001.dat" def fileName1 = "/ccb_evaluation/MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJ_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJNB_ADD_${curDate}_0001.dat" - fileName1 = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJ_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJNB_ADD_${curDate}_0001.dat" + fileName1 = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJ_ADD_${curDate}_0001.dat" } def headers = []//["ID","CITYID","CITYNAME","DISTID","DISTNAME","COMMID","COMMNAME","YEAR_MONTH","CALC_AVG_PRICE","AVG_PRICE","CALC_TYPE","FAKE_RATE","DIFF_RATE","CONFI_RATE","CORR_RATE","CONFIDENCE","CREATETIME","UPDATETIME","SOURCECODE"] @@ -932,17 +932,17 @@ class ExportOracleAllDataTest { FileUtils.batchCreateFile(allRows, fileName1, headers, "utf-8", true); } - println "COMMUNITY_BASE_PRICE_GJNB 数据文件输出完成......" + println "COMMUNITY_BASE_PRICE_GJNB 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpTestUtils.ftpUpload(null, fileName, curDate) CcbFtpTestUtils.ftpUpload(null, fileName1, curDate) - println "COMMUNITY_BASE_PRICE_GJNB 上传Ftp完成......" + println "COMMUNITY_BASE_PRICE_GJNB 涓婁紶Ftp瀹屾垚......" } def exportCommunityBasePriceGj(){ def allRows = [] def fileName = "/ccb_evaluation/MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJ_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJ_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJ_ADD_${curDate}_0001.dat" } def headers = []//["ID","CITYID","CITYNAME","DISTID","DISTNAME","COMMID","COMMNAME","YEAR_MONTH","CALC_AVG_PRICE","AVG_PRICE","CALC_TYPE","FAKE_RATE","DIFF_RATE","CONFI_RATE","CORR_RATE","CONFIDENCE","CREATETIME","UPDATETIME","SOURCECODE"] for(def city : citys) { @@ -981,9 +981,9 @@ class ExportOracleAllDataTest { FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", true); } - println "COMMUNITY_BASE_PRICE_GJ 数据文件输出完成......" + println "COMMUNITY_BASE_PRICE_GJ 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpTestUtils.ftpUpload(null, fileName, curDate) - println "COMMUNITY_BASE_PRICE_GJ 上传Ftp完成......" + println "COMMUNITY_BASE_PRICE_GJ 涓婁紶Ftp瀹屾垚......" } def exportCityPrice(){ @@ -1008,13 +1008,13 @@ class ExportOracleAllDataTest { } def fileName = "/ccb_evaluation/MODEL_000000_000000_CITY_PRICE_GJ_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_CITY_PRICE_GJ_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_CITY_PRICE_GJ_ADD_${curDate}_0001.dat" } def headers = []//["ID","CITYID","CITYNAME","DISTID","DISTNAME","COMMID","COMMNAME","YEAR_MONTH","CALC_AVG_PRICE","AVG_PRICE","CALC_TYPE","FAKE_RATE","DIFF_RATE","CONFI_RATE","CORR_RATE","CONFIDENCE","CREATETIME","UPDATETIME","SOURCECODE"] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); - println "CITY_PRICE_GJ 数据文件输出完成......" + println "CITY_PRICE_GJ 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpTestUtils.ftpUpload(null, fileName, curDate) - println "CITY_PRICE_GJ 上传Ftp完成......" + println "CITY_PRICE_GJ 涓婁紶Ftp瀹屾垚......" } def exportRegionPrice(){ @@ -1040,20 +1040,20 @@ class ExportOracleAllDataTest { } def fileName = "/ccb_evaluation/MODEL_000000_000000_DISTRICT_PRICE_GJ_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_DISTRICT_PRICE_GJ_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_DISTRICT_PRICE_GJ_ADD_${curDate}_0001.dat" } def headers = []//["ID","CITYID","CITYNAME","DISTID","DISTNAME","COMMID","COMMNAME","YEAR_MONTH","CALC_AVG_PRICE","AVG_PRICE","CALC_TYPE","FAKE_RATE","DIFF_RATE","CONFI_RATE","CORR_RATE","CONFIDENCE","CREATETIME","UPDATETIME","SOURCECODE"] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); - println "DISTRICT_PRICE_GJ 数据文件输出完成......" + println "DISTRICT_PRICE_GJ 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpTestUtils.ftpUpload(null, fileName, curDate) - println "DISTRICT_PRICE_GJ 上传Ftp完成......" + println "DISTRICT_PRICE_GJ 涓婁紶Ftp瀹屾垚......" } def exportCommunityPdescribeGj(){ def fileName = "/ccb_evaluation/MODEL_000000_000000_COMMUNITY_P_DESCRIBE_GJ_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_COMMUNITY_P_DESCRIBE_GJ_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_COMMUNITY_P_DESCRIBE_GJ_ADD_${curDate}_0001.dat" } def headers = [] @@ -1118,16 +1118,16 @@ class ExportOracleAllDataTest { FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", true); allRows.clear() } - println "community_p_describe_gj 数据文件输出完成......" + println "community_p_describe_gj 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpTestUtils.ftpUpload(null, fileName, curDate) - println "community_p_describe_gj 上传Ftp完成......" + println "community_p_describe_gj 涓婁紶Ftp瀹屾垚......" } def exportCommCaseDetailGj(){ def fileName = "/ccb_evaluation/MODEL_000000_000000_COMM_CASE_DETAIL_GJ_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_COMM_CASE_DETAIL_GJ_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_COMM_CASE_DETAIL_GJ_ADD_${curDate}_0001.dat" } def headers = [] def allRows = [] @@ -1155,15 +1155,15 @@ class ExportOracleAllDataTest { FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", true); allRows.clear() } - println "comm_case_detail_gj 数据文件输出完成......" + println "comm_case_detail_gj 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpTestUtils.ftpUpload(null, fileName, curDate) - println "comm_case_detail_gj 上传Ftp完成......" + println "comm_case_detail_gj 涓婁紶Ftp瀹屾垚......" } def exportLastFile(){ def dataCodeFileName = "/ccb_evaluation/${curDate}.ok" if(CommonDatautils.isWindow()){ - dataCodeFileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\${curDate}.ok" + dataCodeFileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\${curDate}.ok" } FileUtils.batchCreateFile([], dataCodeFileName, [], "utf-8", false); CcbFtpTestUtils.ftpUpload(null, dataCodeFileName, curDate) @@ -1172,7 +1172,7 @@ class ExportOracleAllDataTest { def exportOkFile(){ def dataCodeFileName = "/ccb_evaluation/${curDate}.ok" if(CommonDatautils.isWindow()){ - dataCodeFileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\${curDate}.ok" + dataCodeFileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\${curDate}.ok" } FileUtils.batchCreateFile([], dataCodeFileName, [], "utf-8", false); CcbFtpTestUtils.ftpUpload(null, dataCodeFileName, curDate) @@ -1191,11 +1191,11 @@ class ExportOracleAllDataTest { } def fileName = "/ccb_evaluation/${curDate}.ok" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\${curDate}.ok" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\${curDate}.ok" } FileUtils.createTxtFile(fileRows, fileName, "utf-8", false); CcbFtpTestUtils.ftpUpload(null, fileName, curDate) - println "统计文件长度ok文件 上传Ftp完成......" + println "缁熻鏂囦欢闀垮害ok鏂囦欢 涓婁紶Ftp瀹屾垚......" } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleData.groovy index b25c4efbd..7e975f292 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleData.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleData.groovy @@ -29,36 +29,36 @@ class ExportOracleData { def lastMonth = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM")); def lastMonthStr = DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyy-MM"), -1, "yyyy-MM") def new_dists = [] - //不会变 10.25 + //涓嶄細鍙� 10.25 exportEvaluationRateData() exportBigdataPoiData()// exportBigdataDistrictData()// - exportGuidedPrice()//随人工改变// - exportCommunityGuidedPrice(lastMonth.toString()+"28")//随政策// + exportGuidedPrice()//闅忎汉宸ユ敼鍙�// + exportCommunityGuidedPrice(lastMonth.toString()+"28")//闅忔斂绛�// -// //处理小区情况 +// //澶勭悊灏忓尯鎯呭喌 exportBigdataCommunity()// - exportCommunityStaging()//没cityid + exportCommunityStaging()//娌ityid exportCommunityBuileType()// exportThirdPartyPrice2(lastMonth, new_dists)// -// exportBigdataForsale(lastMonthStr +"-19", new_dists) //2022-07-19 之前按publish_date导出 - exportBigdataForsale(lastMonthStr +"-18", new_dists) //现在按updatetime导出 +// exportBigdataForsale(lastMonthStr +"-19", new_dists) //2022-07-19 涔嬪墠鎸塸ublish_date瀵煎嚭 + exportBigdataForsale(lastMonthStr +"-18", new_dists) //鐜板湪鎸塽pdatetime瀵煎嚭 exportBigdataDeal(lastMonthStr + "-01", new_dists) //2022-07-01 - //第三方网站权重表 + //绗笁鏂圭綉绔欐潈閲嶈〃 exportWebsiteRate(); // // -// //计算结果相关 +// //璁$畻缁撴灉鐩稿叧 // exportAvmEvaluationGJNB(curMonth) // exportAVMEvaluationItemGJNB(curMonth) // // exportCityPrice(curMonth) // exportRegionPrice(curMonth) // -// exportCommunityBasePriceGj(curMonth)//已合下面的合并 +// exportCommunityBasePriceGj(curMonth)//宸插悎涓嬮潰鐨勫悎骞� // exportCommunityBasePrice(curMonth) // // exportCommunityPdescribeGj(curMonth) @@ -67,7 +67,7 @@ class ExportOracleData { // def curDate = curMonth.toString()+"28" // SSHHelper jschCommand = new SSHHelper(); // System.out.println(jschCommand.executeCommand("sh /home/ccb/output/gz_package.sh ${curDate}")); -//// ok文件 +//// ok鏂囦欢 // exportLastFile() } @@ -92,13 +92,13 @@ class ExportOracleData { def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28"; def fileName = "/ccb/MODEL_000000_000000_EVALUATE_RATE_GJ_ALL_${curDate}_0001.dat" if (CommonDatautils.isWindow()) { - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_EVALUATE_RATE_GJ_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_EVALUATE_RATE_GJ_ALL_${curDate}_0001.dat" } - def headers = []//["系数ID","系数类型","系数","排序","城市","备注","创建时间","更新时间","来源公司"] + def headers = []//["绯绘暟ID","绯绘暟绫诲瀷","绯绘暟","鎺掑簭","鍩庡競","澶囨敞","鍒涘缓鏃堕棿","鏇存柊鏃堕棿","鏉ユ簮鍏徃"] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); - println "数据文件输出完成......" + println "鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpUtils.ftpUpload(null, fileName, curDate) - println "上传Ftp完成......" + println "涓婁紶Ftp瀹屾垚......" } @@ -123,13 +123,13 @@ class ExportOracleData { def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28"; def fileName = "/ccb/MODEL_000000_000000_WEBSITE_CONFIG_GJ_ALL_${curDate}_0001.dat" if (CommonDatautils.isWindow()) { - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_WEBSITE_CONFIG_GJ_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_WEBSITE_CONFIG_GJ_ALL_${curDate}_0001.dat" } - def headers = []//["系数ID","系数类型","系数","排序","城市","备注","创建时间","更新时间","来源公司"] + def headers = []//["绯绘暟ID","绯绘暟绫诲瀷","绯绘暟","鎺掑簭","鍩庡競","澶囨敞","鍒涘缓鏃堕棿","鏇存柊鏃堕棿","鏉ユ簮鍏徃"] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); - println "数据文件输出完成......" + println "鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpUtils.ftpUpload(null, fileName, curDate) - println "上传Ftp完成......" + println "涓婁紶Ftp瀹屾垚......" } @@ -161,14 +161,14 @@ class ExportOracleData { def fileName = "/ccb/MODEL_000000_000000_BIGDATA_POI_GJ_ALL_${curDate}_0001.dat" if (CommonDatautils.isWindow()) { - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_POI_GJ_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_POI_GJ_ALL_${curDate}_0001.dat" } - def headers = []//["城市ID","行政区ID","ID","Poi名称","类型","类型编码","纬度","经度","备注","创建时间","更新时间","来源公司"] + def headers = []//["鍩庡競ID","琛屾斂鍖篒D","ID","Poi鍚嶇О","绫诲瀷","绫诲瀷缂栫爜","绾害","缁忓害","澶囨敞","鍒涘缓鏃堕棿","鏇存柊鏃堕棿","鏉ユ簮鍏徃"] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); - println "BIGDATA_POI_GJ 数据文件输出完成......" + println "BIGDATA_POI_GJ 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpUtils.ftpUpload(null, fileName, curDate) - println "BIGDATA_POI_GJ 上传Ftp完成......" + println "BIGDATA_POI_GJ 涓婁紶Ftp瀹屾垚......" } def exportCommunityStaging() { @@ -189,18 +189,18 @@ class ExportOracleData { def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28"; def fileName = "/ccb/MODEL_000000_000000_COMMUNITY_STAGING_GJ_ALL_${curDate}_0001.dat" if (CommonDatautils.isWindow()) { - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_COMMUNITY_STAGING_GJ_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_COMMUNITY_STAGING_GJ_ALL_${curDate}_0001.dat" } - def headers = []//["分期ID","小区ID","小区主期ID","备注","创建时间","更新时间","来源公司"] + def headers = []//["鍒嗘湡ID","灏忓尯ID","灏忓尯涓绘湡ID","澶囨敞","鍒涘缓鏃堕棿","鏇存柊鏃堕棿","鏉ユ簮鍏徃"] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); - println "COMMUNITY_STAGING_GJ 数据文件输出完成......" + println "COMMUNITY_STAGING_GJ 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpUtils.ftpUpload(null, fileName, curDate) - println "COMMUNITY_STAGING_GJ 上传Ftp完成......" + println "COMMUNITY_STAGING_GJ 涓婁紶Ftp瀹屾垚......" } def exportCommunityBuileType() { -// def citys = [ "上海","扬州","北京","重庆","天津","成都","沈阳","大连","安庆","西宁","日照","长春","武汉","西安","苏州","广州","南京","青岛","济南","宁波","长沙","石家庄","佛山","嘉兴","银川","南通","廊坊","中山","郑州","哈尔滨","烟台","徐州","绍兴","厦门","昆明","南昌","贵阳","珠海","东莞","镇江","洛阳","温州","兰州","福州","惠州","呼和浩特","常州","唐山","淮安","湖州","九江","太原","北海","株洲","淄博","盐城","乌鲁木齐","海口","南宁","常德","台州","金华","吉林","岳阳","柳州","清远","湛江","张家口","保定","深圳","杭州","合肥","无锡","泉州","遵义","肇庆","漳州","宜昌","芜湖","泰州","汕头","三亚","秦皇岛","马鞍山","连云港","沧州","拉萨","锦州","大同","文昌","保亭","陵水"] +// def citys = [ "涓婃捣","鎵窞","鍖椾含","閲嶅簡","澶╂触","鎴愰兘","娌堥槼","澶ц繛","瀹夊簡","瑗垮畞","鏃ョ収","闀挎槬","姝︽眽","瑗垮畨","鑻忓窞","骞垮窞","鍗椾含","闈掑矝","娴庡崡","瀹佹尝","闀挎矙","鐭冲搴�","浣涘北","鍢夊叴","閾跺窛","鍗楅��","寤婂潑","涓北","閮戝窞","鍝堝皵婊�","鐑熷彴","寰愬窞","缁嶅叴","鍘﹂棬","鏄嗘槑","鍗楁槍","璐甸槼","鐝犳捣","涓滆帪","闀囨睙","娲涢槼","娓╁窞","鍏板窞","绂忓窞","鎯犲窞","鍛煎拰娴╃壒","甯稿窞","鍞愬北","娣畨","婀栧窞","涔濇睙","澶師","鍖楁捣","鏍床","娣勫崥","鐩愬煄","涔岄瞾鏈ㄩ綈","娴峰彛","鍗楀畞","甯稿痉","鍙板窞","閲戝崕","鍚夋灄","宀抽槼","鏌冲窞","娓呰繙","婀涙睙","寮犲鍙�","淇濆畾","娣卞湷","鏉窞","鍚堣偉","鏃犻敗","娉夊窞","閬典箟","鑲囧簡","婕冲窞","瀹滄槍","鑺滄箹","娉板窞","姹曞ご","涓変簹","绉︾殗宀�","椹瀺灞�","杩炰簯娓�","娌у窞","鎷夎惃","閿﹀窞","澶у悓","鏂囨槍","淇濅涵","闄垫按"] // def cityCodeDataMap = CcbCommonUtils.findCityCodeValue() def allRows = [] for(def city : citys) { @@ -224,14 +224,14 @@ class ExportOracleData { def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28"; def fileName = "/ccb/MODEL_000000_000000_BIGDATA_COMMBUILDTYPE_GJ_ALL_${curDate}_0001.dat" if (CommonDatautils.isWindow()) { - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_COMMBUILDTYPE_GJ_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_COMMBUILDTYPE_GJ_ALL_${curDate}_0001.dat" } - def headers = []//["城市ID","小区ID"," 建筑类型","备注","创建时间","更新时间","来源公司","数据时间"] + def headers = []//["鍩庡競ID","灏忓尯ID"," 寤虹瓚绫诲瀷","澶囨敞","鍒涘缓鏃堕棿","鏇存柊鏃堕棿","鏉ユ簮鍏徃","鏁版嵁鏃堕棿"] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); - println "BIGDATA_COMMBUILDTYPE_GJ 数据文件输出完成......" + println "BIGDATA_COMMBUILDTYPE_GJ 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpUtils.ftpUpload(null, fileName, curDate) - println "BIGDATA_COMMBUILDTYPE_GJ 上传Ftp完成......" + println "BIGDATA_COMMBUILDTYPE_GJ 涓婁紶Ftp瀹屾垚......" } def exportBigdataDistrictData() { @@ -263,15 +263,15 @@ class ExportOracleData { def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28"; def fileName = "/ccb/MODEL_000000_000000_BIGDATA_DISTRICT_GJ_ALL_${curDate}_0001.dat" if (CommonDatautils.isWindow()) { - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_DISTRICT_GJ_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_DISTRICT_GJ_ALL_${curDate}_0001.dat" } def headers = [] -//["行政区ID","行政区名称","行政区名称拼音","城市ID","国标码","显示顺序","行政区类别","备注","创建时间","更新时间","来源公司","逻辑行政区","逻辑行政区划代码","行政区划代码","数据时间"] +//["琛屾斂鍖篒D","琛屾斂鍖哄悕绉�","琛屾斂鍖哄悕绉版嫾闊�","鍩庡競ID","鍥芥爣鐮�","鏄剧ず椤哄簭","琛屾斂鍖虹被鍒�","澶囨敞","鍒涘缓鏃堕棿","鏇存柊鏃堕棿","鏉ユ簮鍏徃","閫昏緫琛屾斂鍖�","閫昏緫琛屾斂鍖哄垝浠g爜","琛屾斂鍖哄垝浠g爜","鏁版嵁鏃堕棿"] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); - println "BIGDATA_DISTRICT_GJ 数据文件输出完成......" + println "BIGDATA_DISTRICT_GJ 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpUtils.ftpUpload(null, fileName, curDate) - println "BIGDATA_DISTRICT_GJ 上传Ftp完成......" + println "BIGDATA_DISTRICT_GJ 涓婁紶Ftp瀹屾垚......" } @@ -303,14 +303,14 @@ class ExportOracleData { def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28"; def fileName = "/ccb/MODEL_000000_000000_GUIDED_PRICE_GJ_ALL_${curDate}_0001.dat" if (CommonDatautils.isWindow()) { - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_GUIDED_PRICE_GJ_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_GUIDED_PRICE_GJ_ALL_${curDate}_0001.dat" } def headers = [] -//["第三方均价ID","楼盘ID","小区名称","城市ID","城市名称","行政区ID","行政区名称","指导日期","指导价格","添加人","备注","创建时间","更新时间","来源公司"] +//["绗笁鏂瑰潎浠稩D","妤肩洏ID","灏忓尯鍚嶇О","鍩庡競ID","鍩庡競鍚嶇О","琛屾斂鍖篒D","琛屾斂鍖哄悕绉�","鎸囧鏃ユ湡","鎸囧浠锋牸","娣诲姞浜�","澶囨敞","鍒涘缓鏃堕棿","鏇存柊鏃堕棿","鏉ユ簮鍏徃"] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); - println "GUIDED_PRICE_GJ 数据文件输出完成......" + println "GUIDED_PRICE_GJ 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpUtils.ftpUpload(null, fileName, curDate) - println "GUIDED_PRICE_GJ 上传Ftp完成......" + println "GUIDED_PRICE_GJ 涓婁紶Ftp瀹屾垚......" } def exportCommunityGuidedPrice(def date) { @@ -340,14 +340,14 @@ class ExportOracleData { def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28"; def fileName = "/ccb/MODEL_000000_000000_COMMUNITY_GUIDE_PRICE_GJ_ADD_${curDate}_0001.dat" if (CommonDatautils.isWindow()) { - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_COMMUNITY_GUIDE_PRICE_GJ_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_COMMUNITY_GUIDE_PRICE_GJ_ADD_${curDate}_0001.dat" } - def headers = []//["第三方均价ID","楼盘ID","小区名称","城市ID","城市名称","行政区ID","行政区名称","指导价格","类型","备注","创建时间","更新时间","来源公司"] + def headers = []//["绗笁鏂瑰潎浠稩D","妤肩洏ID","灏忓尯鍚嶇О","鍩庡競ID","鍩庡競鍚嶇О","琛屾斂鍖篒D","琛屾斂鍖哄悕绉�","鎸囧浠锋牸","绫诲瀷","澶囨敞","鍒涘缓鏃堕棿","鏇存柊鏃堕棿","鏉ユ簮鍏徃"] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); - println "COMMUNITY_GUIDE_PRICE_GJ 数据文件输出完成......" + println "COMMUNITY_GUIDE_PRICE_GJ 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpUtils.ftpUpload(null, fileName, curDate) - println "COMMUNITY_GUIDE_PRICE_GJ 上传Ftp完成......" + println "COMMUNITY_GUIDE_PRICE_GJ 涓婁紶Ftp瀹屾垚......" } def exportBigdataDeal(def dealDate, def new_dists) { @@ -385,13 +385,13 @@ class ExportOracleData { def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28"; def fileName = "/ccb/MODEL_000000_000000_BIGDATA_DEAL_GJ_ADD_${curDate}_0001.dat" if (CommonDatautils.isWindow()) { - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_DEAL_GJ_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_DEAL_GJ_ADD_${curDate}_0001.dat" } def headers = [] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); - println "BIGDATA_DEAL_GJ 数据文件输出完成......" + println "BIGDATA_DEAL_GJ 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpUtils.ftpUpload(null, fileName, curDate) - println "BIGDATA_DEAL_GJ 上传Ftp完成......" + println "BIGDATA_DEAL_GJ 涓婁紶Ftp瀹屾垚......" } @@ -506,15 +506,15 @@ class ExportOracleData { def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28"; def fileName = "/ccb/MODEL_000000_000000_THIRD_PARTY_PRICE_GJ_ADD_${curDate}_0001.dat" if (CommonDatautils.isWindow()) { - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_THIRD_PARTY_PRICE_GJ_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_THIRD_PARTY_PRICE_GJ_ADD_${curDate}_0001.dat" } def headers = [] -//["第三方均价ID","楼盘ID","小区名称","城市ID","城市名称","行政区ID","行政区名称","均价对应的月份","诸葛找房均价","安居客均价","房天下均价","链家均价","城市房产均价","麦田均价","贝壳均价","淘房365","中原均价","兔博士均价","Q房均价","房探均价","房多多均价","我爱我家均价","创建时间","更新时间","来源公司"] +//["绗笁鏂瑰潎浠稩D","妤肩洏ID","灏忓尯鍚嶇О","鍩庡競ID","鍩庡競鍚嶇О","琛屾斂鍖篒D","琛屾斂鍖哄悕绉�","鍧囦环瀵瑰簲鐨勬湀浠�","璇歌憶鎵炬埧鍧囦环","瀹夊眳瀹㈠潎浠�","鎴垮ぉ涓嬪潎浠�","閾惧鍧囦环","鍩庡競鎴夸骇鍧囦环","楹︾敯鍧囦环","璐濆3鍧囦环","娣樻埧365","涓師鍧囦环","鍏斿崥澹潎浠�","Q鎴垮潎浠�","鎴挎帰鍧囦环","鎴垮澶氬潎浠�","鎴戠埍鎴戝鍧囦环","鍒涘缓鏃堕棿","鏇存柊鏃堕棿","鏉ユ簮鍏徃"] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); - println "THIRD_PARTY_PRICE_GJ 数据文件输出完成......" + println "THIRD_PARTY_PRICE_GJ 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpUtils.ftpUpload(null, fileName, curDate) - println "THIRD_PARTY_PRICE_GJ 上传数据文件完成......" + println "THIRD_PARTY_PRICE_GJ 涓婁紶鏁版嵁鏂囦欢瀹屾垚......" } @@ -523,7 +523,7 @@ class ExportOracleData { def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28"; def fileName = "/ccb/MODEL_000000_000000_BIGDATA_THIRD_PARTY_PRICE_GJ_ADD_${curDate}_0001.dat" if (CommonDatautils.isWindow()) { - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_THIRD_PARTY_PRICE_GJ_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_THIRD_PARTY_PRICE_GJ_ADD_${curDate}_0001.dat" // fileName = "D:\\MODEL_000000_000000_BIGDATA_THIRD_PARTY_PRICE_GJ_ADD_${curDate}_0001.dat" } def headers = [] @@ -558,7 +558,7 @@ class ExportOracleData { } } - println "BIGDATA_THIRD_PARTY_PRICE_GJ 数据文件输出完成......" + println "BIGDATA_THIRD_PARTY_PRICE_GJ 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpUtils.ftpUpload(null, fileName, curDate) } @@ -631,25 +631,25 @@ class ExportOracleData { def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28"; def fileName = "/ccb/MODEL_000000_000000_BIGDATA_COMMUNITY_GJ_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_COMMUNITY_GJ_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_COMMUNITY_GJ_ALL_${curDate}_0001.dat" } - def headers = []//["城市ID","行政区ID","小区ID","行政区名称","小区名称","详细地址","纬度","经度","占地总面积","建筑总面积","绿化率","容积率","车位数量","建筑年代","房屋用途", - //"总套数","数据时间","更新标记","更新时间","小区类型","小区曾用名","街道","门牌号","是否新盘","小区介绍","备注","创建时间","来源公司", - //"乡镇/街道办","逻辑行政区划代码","逻辑行政区划","状态"] + def headers = []//["鍩庡競ID","琛屾斂鍖篒D","灏忓尯ID","琛屾斂鍖哄悕绉�","灏忓尯鍚嶇О","璇︾粏鍦板潃","绾害","缁忓害","鍗犲湴鎬婚潰绉�","寤虹瓚鎬婚潰绉�","缁垮寲鐜�","瀹圭Н鐜�","杞︿綅鏁伴噺","寤虹瓚骞翠唬","鎴垮眿鐢ㄩ��", + //"鎬诲鏁�","鏁版嵁鏃堕棿","鏇存柊鏍囪","鏇存柊鏃堕棿","灏忓尯绫诲瀷","灏忓尯鏇剧敤鍚�","琛楅亾","闂ㄧ墝鍙�","鏄惁鏂扮洏","灏忓尯浠嬬粛","澶囨敞","鍒涘缓鏃堕棿","鏉ユ簮鍏徃", + //"涔¢晣/琛楅亾鍔�","閫昏緫琛屾斂鍖哄垝浠g爜","閫昏緫琛屾斂鍖哄垝","鐘舵��"] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); - println "BIGDATA_COMMUNITY_GJ 数据文件输出完成......" + println "BIGDATA_COMMUNITY_GJ 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpUtils.ftpUpload(null, fileName, curDate) - println "BIGDATA_COMMUNITY_GJ 上传Ftp完成......" + println "BIGDATA_COMMUNITY_GJ 涓婁紶Ftp瀹屾垚......" } def exportBigdataForsale(publishDate, new_dists){ - //["北京","上海"] + //["鍖椾含","涓婃捣"] def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28"; def fileName = "/ccb/MODEL_000000_000000_BIGDATA_FORSALE_GJ_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_FORSALE_GJ_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_FORSALE_GJ_ADD_${curDate}_0001.dat" } - def headers = []//["城市ID","出售ID","挂牌房屋ID","城市名称","行政区ID","行政区名称","小区ID","小区名称","楼栋ID","楼栋编号","楼栋名称","单元ID","单元编号","单元名称","户ID","详细地址","建筑年代","权属","权属年限","单价","总价","出售付款方式","所在楼层","总楼层","建筑类型","室内结构","建筑结构","建筑面积","套内面积","户型","室","厅","厨","卫","朝向","装修情况","是否有电梯","几梯几户","发布时间","到期时间","是否首发","房源数据来源","中介公司ID","中介公司名称","发布人","发布人电话","描述信息","备注","创建时间","更新时间","来源公司","附加信息"] + def headers = []//["鍩庡競ID","鍑哄敭ID","鎸傜墝鎴垮眿ID","鍩庡競鍚嶇О","琛屾斂鍖篒D","琛屾斂鍖哄悕绉�","灏忓尯ID","灏忓尯鍚嶇О","妤兼爧ID","妤兼爧缂栧彿","妤兼爧鍚嶇О","鍗曞厓ID","鍗曞厓缂栧彿","鍗曞厓鍚嶇О","鎴稩D","璇︾粏鍦板潃","寤虹瓚骞翠唬","鏉冨睘","鏉冨睘骞撮檺","鍗曚环","鎬讳环","鍑哄敭浠樻鏂瑰紡","鎵�鍦ㄦゼ灞�","鎬绘ゼ灞�","寤虹瓚绫诲瀷","瀹ゅ唴缁撴瀯","寤虹瓚缁撴瀯","寤虹瓚闈㈢Н","濂楀唴闈㈢Н","鎴峰瀷","瀹�","鍘�","鍘�","鍗�","鏈濆悜","瑁呬慨鎯呭喌","鏄惁鏈夌數姊�","鍑犳鍑犳埛","鍙戝竷鏃堕棿","鍒版湡鏃堕棿","鏄惁棣栧彂","鎴挎簮鏁版嵁鏉ユ簮","涓粙鍏徃ID","涓粙鍏徃鍚嶇О","鍙戝竷浜�","鍙戝竷浜虹數璇�","鎻忚堪淇℃伅","澶囨敞","鍒涘缓鏃堕棿","鏇存柊鏃堕棿","鏉ユ簮鍏徃","闄勫姞淇℃伅"] def index = 0 for(def city : citys){ def cityCode = cityCodeMap.get(city) @@ -680,7 +680,7 @@ class ExportOracleData { } } - if(new_dists){//补充被修区域的数据 + if(new_dists){//琛ュ厖琚慨鍖哄煙鐨勬暟鎹� def newstr = "('"+new_dists.join("','")+"')" def sql2 = "select CITYID,FORSALEID,PROPCODE,CITYNAME,DISTID,DISTNAME,COMMID,COMMNAME, BUILDID,BUILDNO, BUILDNAME,UNITID,UNITNO,UNITNAME,HOUSEID,ADDRESS,BUILDYEAR,PROPTYPE,PROPYEARS,UNITPRICE,TOTALPRICE,PAYTYPE,FLOORNUM,FLOORCNT,\n" + " BUILDTYPE, HOUSESTRU,BUILDSTRU,BUILDAREA,LIVINGAREA,HOUSESTYLE,ROOMCNT,LIVINGROOMCNT,KITCHENCNT, BATHROOMCNT,HOUSEASPECT,FITMENT,IFELEVATOR,ELEVATORHOUSE,to_char(PUBLISHTIME,'yyyy-mm-dd hh24:mi:ss') as PUBLISHTIME,to_char(EXPIRETIME,'yyyy-mm-dd hh24:mi:ss') as EXPIRETIME,\n" + @@ -691,9 +691,9 @@ class ExportOracleData { FileUtils.batchCreateFile(rets2, fileName, headers, "utf-8", true); } } - println "BIGDATA_FORSALE_GJ 数据文件输出完成......" + println "BIGDATA_FORSALE_GJ 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpUtils.ftpUpload(null, fileName, curDate) - println "BIGDATA_FORSALE_GJ 上传Ftp完成......" + println "BIGDATA_FORSALE_GJ 涓婁紶Ftp瀹屾垚......" } def getHouseDatas(sql){ @@ -814,18 +814,18 @@ class ExportOracleData { def fileName = "/ccb/MODEL_000000_000000_AVM_EVALUATION_GJNB_ADD_${curDate}_0001.dat" def fileName1 = "/ccb/MODEL_000000_000000_AVM_EVALUATION_GJ_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_AVM_EVALUATION_GJNB_ADD_${curDate}_0001.dat" - fileName1 = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_AVM_EVALUATION_GJ_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_AVM_EVALUATION_GJNB_ADD_${curDate}_0001.dat" + fileName1 = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_AVM_EVALUATION_GJ_ADD_${curDate}_0001.dat" } def headers = []//["ID","CITYID","CITYNAME","YEAR_MONTH","COMMUNITY_NUM","HAS_PRICE_COMMUNITY_NUM","PRICE_COVERAGE","ARTIFICIAL_CALC_NUM","ARTIFICIAL_CALC_COVERAGE","SAMPLE_CALC_NUM","SAMPLE_CALC_COVERAGE", //"ANN_CALC_NUM","ANN_CALC_COVERAGE","TEST_NUM","TEST_COMM_NUM","TEST_COMM_COVERAGE","PPE15_COVERAGE","RATE_MEDIAN","COEFFICIENT","DEAL_TEST_CASE_NUM","DEAL_TEST_COMM_NUM","DEAL_TEST_COMM_COVERAGE","DEAL_PPE15_COVERAGE", //"DEAL_COEFFICIENT","DEAL_RATE_MEDIAN","THIRD_TEST_CASE_NUM","THIRD_TEST_COMM_NUM","THIRD_TEST_COMM_COVERAGE","THIRD_PPE15_COVERAGE","THIRD_COEFFICIENT","THIRD_RATE_MEDIAN","CREATETIME","UPDATETIME","SOURCECODE"] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); FileUtils.batchCreateFile(allRows, fileName1, headers, "utf-8", false); - println "AVM_EVALUATION_GJNB 数据文件输出完成......" + println "AVM_EVALUATION_GJNB 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpUtils.ftpUpload(null, fileName, curDate) CcbFtpUtils.ftpUpload(null, fileName1, curDate) - println "AVM_EVALUATION_GJNB 上传Ftp完成......" + println "AVM_EVALUATION_GJNB 涓婁紶Ftp瀹屾垚......" } def exportAVMEvaluationItemGJNB(yearMonth){ @@ -866,16 +866,16 @@ class ExportOracleData { def fileName = "/ccb/MODEL_000000_000000_AVM_EVALUATION_ITEM_GJNB_ADD_${curDate}_0001.dat" def fileName1 = "/ccb/MODEL_000000_000000_AVM_EVALUATION_ITEM_GJ_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_AVM_EVALUATION_ITEM_GJNB_ADD_${curDate}_0001.dat" - fileName1 = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_AVM_EVALUATION_ITEM_GJ_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_AVM_EVALUATION_ITEM_GJNB_ADD_${curDate}_0001.dat" + fileName1 = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_AVM_EVALUATION_ITEM_GJ_ADD_${curDate}_0001.dat" } def headers = []//["ID","CITYID","CITYNAME","DISTID","DISTNAME","COMMID","COMMNAME","YEAR_MONTH","CALC_AVG_PRICE","AVG_PRICE","CALC_TYPE","CONFIDENCE","TARGET_AVG_PRICE","DEALDATE","UNIT_PRICE","BUILDAREA","FITMENT","HOUSEASPECT","FLOORNUM","FLOORCNT","DATA_TYPE","RATE","PE","CREATETIME"] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); FileUtils.batchCreateFile(allRows, fileName1, headers, "utf-8", false); - println "AVM_EVALUATION_ITEM_GJNB 数据文件输出完成......" + println "AVM_EVALUATION_ITEM_GJNB 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpUtils.ftpUpload(null, fileName, curDate) CcbFtpUtils.ftpUpload(null, fileName1, curDate) - println "AVM_EVALUATION_ITEM_GJNB 上传Ftp完成......" + println "AVM_EVALUATION_ITEM_GJNB 涓婁紶Ftp瀹屾垚......" } def exportCommunityBasePrice(yearMonth){ @@ -909,16 +909,16 @@ class ExportOracleData { def fileName = "/ccb/MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJNB_ADD_${curDate}_0001.dat" def fileName1 = "/ccb/MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJ_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJNB_ADD_${curDate}_0001.dat" - fileName1 = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJ_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJNB_ADD_${curDate}_0001.dat" + fileName1 = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJ_ADD_${curDate}_0001.dat" } def headers = []//["ID","CITYID","CITYNAME","DISTID","DISTNAME","COMMID","COMMNAME","YEAR_MONTH","CALC_AVG_PRICE","AVG_PRICE","CALC_TYPE","FAKE_RATE","DIFF_RATE","CONFI_RATE","CORR_RATE","CONFIDENCE","CREATETIME","UPDATETIME","SOURCECODE"] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); FileUtils.batchCreateFile(allRows, fileName1, headers, "utf-8", false); - println "COMMUNITY_BASE_PRICE_GJNB 数据文件输出完成......" + println "COMMUNITY_BASE_PRICE_GJNB 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpUtils.ftpUpload(null, fileName, curDate) CcbFtpUtils.ftpUpload(null, fileName1, curDate) - println "COMMUNITY_BASE_PRICE_GJNB 上传Ftp完成......" + println "COMMUNITY_BASE_PRICE_GJNB 涓婁紶Ftp瀹屾垚......" } def exportCommunityBasePriceGj(yearMonth){ @@ -951,13 +951,13 @@ class ExportOracleData { def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28"; def fileName = "/ccb/MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJ_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJ_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJ_ADD_${curDate}_0001.dat" } def headers = []//["ID","CITYID","CITYNAME","DISTID","DISTNAME","COMMID","COMMNAME","YEAR_MONTH","CALC_AVG_PRICE","AVG_PRICE","CALC_TYPE","FAKE_RATE","DIFF_RATE","CONFI_RATE","CORR_RATE","CONFIDENCE","CREATETIME","UPDATETIME","SOURCECODE"] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); - println "COMMUNITY_BASE_PRICE_GJ 数据文件输出完成......" + println "COMMUNITY_BASE_PRICE_GJ 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpUtils.ftpUpload(null, fileName, curDate) - println "COMMUNITY_BASE_PRICE_GJ 上传Ftp完成......" + println "COMMUNITY_BASE_PRICE_GJ 涓婁紶Ftp瀹屾垚......" } def exportCityPrice(month){ @@ -980,13 +980,13 @@ class ExportOracleData { def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28" def fileName = "/ccb/MODEL_000000_000000_CITY_PRICE_GJ_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_CITY_PRICE_GJ_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_CITY_PRICE_GJ_ALL_${curDate}_0001.dat" } def headers = []//["ID","CITYID","CITYNAME","DISTID","DISTNAME","COMMID","COMMNAME","YEAR_MONTH","CALC_AVG_PRICE","AVG_PRICE","CALC_TYPE","FAKE_RATE","DIFF_RATE","CONFI_RATE","CORR_RATE","CONFIDENCE","CREATETIME","UPDATETIME","SOURCECODE"] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); - println "CITY_PRICE_GJ 数据文件输出完成......" + println "CITY_PRICE_GJ 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpUtils.ftpUpload(null, fileName, curDate) - println "CITY_PRICE_GJ 上传Ftp完成......" + println "CITY_PRICE_GJ 涓婁紶Ftp瀹屾垚......" } def exportRegionPrice(month){ @@ -1011,13 +1011,13 @@ class ExportOracleData { def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28" def fileName = "/ccb/MODEL_000000_000000_DISTRICT_PRICE_GJ_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_DISTRICT_PRICE_GJ_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_DISTRICT_PRICE_GJ_ALL_${curDate}_0001.dat" } def headers = []//["ID","CITYID","CITYNAME","DISTID","DISTNAME","COMMID","COMMNAME","YEAR_MONTH","CALC_AVG_PRICE","AVG_PRICE","CALC_TYPE","FAKE_RATE","DIFF_RATE","CONFI_RATE","CORR_RATE","CONFIDENCE","CREATETIME","UPDATETIME","SOURCECODE"] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); - println "DISTRICT_PRICE_GJ 数据文件输出完成......" + println "DISTRICT_PRICE_GJ 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpUtils.ftpUpload(null, fileName, curDate) - println "DISTRICT_PRICE_GJ 上传Ftp完成......" + println "DISTRICT_PRICE_GJ 涓婁紶Ftp瀹屾垚......" } def exportCommunityPdescribeGj(month){ @@ -1027,7 +1027,7 @@ class ExportOracleData { def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28" def fileName = "/ccb/MODEL_000000_000000_COMMUNITY_P_DESCRIBE_GJ_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_COMMUNITY_P_DESCRIBE_GJ_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_COMMUNITY_P_DESCRIBE_GJ_ADD_${curDate}_0001.dat" } def headers = [] // @@ -1083,9 +1083,9 @@ class ExportOracleData { println allRows.size() FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); // } - println "community_p_describe_gj 数据文件输出完成......" + println "community_p_describe_gj 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpUtils.ftpUpload(null, fileName, curDate) - println "community_p_describe_gj 上传Ftp完成......" + println "community_p_describe_gj 涓婁紶Ftp瀹屾垚......" } def exportCommCaseDetailGj(month){ @@ -1096,7 +1096,7 @@ class ExportOracleData { def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28" def fileName = "/ccb/MODEL_000000_000000_COMM_CASE_DETAIL_GJ_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_COMM_CASE_DETAIL_GJ_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_COMM_CASE_DETAIL_GJ_ADD_${curDate}_0001.dat" } def headers = [] @@ -1123,16 +1123,16 @@ class ExportOracleData { } } - println "comm_case_detail_gj 数据文件输出完成......" + println "comm_case_detail_gj 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpUtils.ftpUpload(null, fileName, curDate) - println "comm_case_detail_gj 上传Ftp完成......" + println "comm_case_detail_gj 涓婁紶Ftp瀹屾垚......" } def exportLastFile(){ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28" def dataCodeFileName = "/ccb/${curDate}.ok" if(CommonDatautils.isWindow()){ - dataCodeFileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\${curDate}.ok" + dataCodeFileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\${curDate}.ok" } FileUtils.batchCreateFile([], dataCodeFileName, [], "utf-8", false); CcbFtpUtils.ftpUpload(null, dataCodeFileName, curDate) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleDataTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleDataTest.groovy index 2c727edfa..01e74035f 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleDataTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleDataTest.groovy @@ -12,7 +12,7 @@ import org.apache.commons.codec.digest.DigestUtils import java.sql.ResultSet -//导出估值 增量数据 新版 +//瀵煎嚭浼板�� 澧為噺鏁版嵁 鏂扮増 class ExportOracleDataTest { def sqlInstance = Sql.newInstance("jdbc:oracle:thin:@192.168.0.236:1521:orcl", @@ -32,41 +32,41 @@ class ExportOracleDataTest { def lastMonth = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM")); def lastMonthStr = DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyy-MM"), -1, "yyyy-MM") def new_dists = [] - //不会变 10.25 + //涓嶄細鍙� 10.25 exportEvaluationRateData() exportBigdataPoiData()// exportBigdataDistrictData()// - exportGuidedPrice()//随人工改变// - exportCommunityGuidedPrice(lastMonth.toString()+"28")//随政策// + exportGuidedPrice()//闅忎汉宸ユ敼鍙�// + exportCommunityGuidedPrice(lastMonth.toString()+"28")//闅忔斂绛�// - //处理小区情况 + //澶勭悊灏忓尯鎯呭喌 exportBigdataCommunity()// - exportCommunityStaging()//没cityid + exportCommunityStaging()//娌ityid exportCommunityBuileType()// exportThirdPartyPrice2(lastMonth, new_dists)// - exportBigdataForsale(lastMonthStr +"-18", new_dists) //2022-07-19 按更新时间导出数据 + exportBigdataForsale(lastMonthStr +"-18", new_dists) //2022-07-19 鎸夋洿鏂版椂闂村鍑烘暟鎹� exportBigdataDeal(lastMonthStr + "-01", new_dists) //2022-07-01 - //第三方网站权重表 + //绗笁鏂圭綉绔欐潈閲嶈〃 exportWebsiteRate(); - //计算结果相关 - exportAvmEvaluationGJNB(curMonth)//无城市区分 - exportAVMEvaluationItemGJNB(curMonth)//无城市区分 + //璁$畻缁撴灉鐩稿叧 + exportAvmEvaluationGJNB(curMonth)//鏃犲煄甯傚尯鍒� + exportAVMEvaluationItemGJNB(curMonth)//鏃犲煄甯傚尯鍒� - exportCityPrice(curMonth)//无城市区分 - exportRegionPrice(curMonth)//无城市区分 + exportCityPrice(curMonth)//鏃犲煄甯傚尯鍒� + exportRegionPrice(curMonth)//鏃犲煄甯傚尯鍒� -// exportCommunityBasePriceGj(curMonth)//已合下面的合并 //无城市区分 - exportCommunityBasePrice(curMonth)//无城市区分 +// exportCommunityBasePriceGj(curMonth)//宸插悎涓嬮潰鐨勫悎骞� //鏃犲煄甯傚尯鍒� + exportCommunityBasePrice(curMonth)//鏃犲煄甯傚尯鍒� - exportCommunityPdescribeGj(curMonth)//无城市区分 - exportCommCaseDetailGj(curMonth)//无城市区分 + exportCommunityPdescribeGj(curMonth)//鏃犲煄甯傚尯鍒� + exportCommCaseDetailGj(curMonth)//鏃犲煄甯傚尯鍒� def curDate = curMonth.toString()+"28" - // ok文件 + // ok鏂囦欢 exportInOk() SSHHelperTest jschCommand = new SSHHelperTest(); System.out.println(jschCommand.executeCommand("sh /home/ccb_evaluation/output/eval_package.sh ${curDate}")); @@ -94,13 +94,13 @@ class ExportOracleDataTest { def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28"; def fileName = "/ccb_evaluation/MODEL_000000_000000_EVALUATE_RATE_GJ_ALL_${curDate}_0001.dat" if (CommonDatautils.isWindow()) { - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_EVALUATE_RATE_GJ_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_EVALUATE_RATE_GJ_ALL_${curDate}_0001.dat" } - def headers = []//["系数ID","系数类型","系数","排序","城市","备注","创建时间","更新时间","来源公司"] + def headers = []//["绯绘暟ID","绯绘暟绫诲瀷","绯绘暟","鎺掑簭","鍩庡競","澶囨敞","鍒涘缓鏃堕棿","鏇存柊鏃堕棿","鏉ユ簮鍏徃"] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); - println "数据文件输出完成......" + println "鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpTestUtils.ftpUpload(null, fileName, curDate) - println "上传Ftp完成......" + println "涓婁紶Ftp瀹屾垚......" } @@ -125,13 +125,13 @@ class ExportOracleDataTest { def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28"; def fileName = "/ccb_evaluation/MODEL_000000_000000_WEBSITE_CONFIG_GJ_ALL_${curDate}_0001.dat" if (CommonDatautils.isWindow()) { - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_WEBSITE_CONFIG_GJ_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_WEBSITE_CONFIG_GJ_ALL_${curDate}_0001.dat" } - def headers = []//["系数ID","系数类型","系数","排序","城市","备注","创建时间","更新时间","来源公司"] + def headers = []//["绯绘暟ID","绯绘暟绫诲瀷","绯绘暟","鎺掑簭","鍩庡競","澶囨敞","鍒涘缓鏃堕棿","鏇存柊鏃堕棿","鏉ユ簮鍏徃"] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); - println "数据文件输出完成......" + println "鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpTestUtils.ftpUpload(null, fileName, curDate) - println "上传Ftp完成......" + println "涓婁紶Ftp瀹屾垚......" } @@ -160,14 +160,14 @@ class ExportOracleDataTest { def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28"; def fileName = "/ccb_evaluation/MODEL_000000_000000_BIGDATA_POI_GJ_ALL_${curDate}_0001.dat" if (CommonDatautils.isWindow()) { - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_POI_GJ_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_POI_GJ_ALL_${curDate}_0001.dat" } - def headers = []//["城市ID","行政区ID","ID","Poi名称","类型","类型编码","纬度","经度","备注","创建时间","更新时间","来源公司"] + def headers = []//["鍩庡競ID","琛屾斂鍖篒D","ID","Poi鍚嶇О","绫诲瀷","绫诲瀷缂栫爜","绾害","缁忓害","澶囨敞","鍒涘缓鏃堕棿","鏇存柊鏃堕棿","鏉ユ簮鍏徃"] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); - println "BIGDATA_POI_GJ 数据文件输出完成......" + println "BIGDATA_POI_GJ 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpTestUtils.ftpUpload(null, fileName, curDate) - println "BIGDATA_POI_GJ 上传Ftp完成......" + println "BIGDATA_POI_GJ 涓婁紶Ftp瀹屾垚......" } def exportCommunityStaging() { @@ -188,18 +188,18 @@ class ExportOracleDataTest { def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28"; def fileName = "/ccb_evaluation/MODEL_000000_000000_COMMUNITY_STAGING_GJ_ALL_${curDate}_0001.dat" if (CommonDatautils.isWindow()) { - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_COMMUNITY_STAGING_GJ_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_COMMUNITY_STAGING_GJ_ALL_${curDate}_0001.dat" } - def headers = []//["分期ID","小区ID","小区主期ID","备注","创建时间","更新时间","来源公司"] + def headers = []//["鍒嗘湡ID","灏忓尯ID","灏忓尯涓绘湡ID","澶囨敞","鍒涘缓鏃堕棿","鏇存柊鏃堕棿","鏉ユ簮鍏徃"] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); - println "COMMUNITY_STAGING_GJ 数据文件输出完成......" + println "COMMUNITY_STAGING_GJ 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpTestUtils.ftpUpload(null, fileName, curDate) - println "COMMUNITY_STAGING_GJ 上传Ftp完成......" + println "COMMUNITY_STAGING_GJ 涓婁紶Ftp瀹屾垚......" } def exportCommunityBuileType() { -// def citys = [ "上海","扬州","北京","重庆","天津","成都","沈阳","大连","安庆","西宁","日照","长春","武汉","西安","苏州","广州","南京","青岛","济南","宁波","长沙","石家庄","佛山","嘉兴","银川","南通","廊坊","中山","郑州","哈尔滨","烟台","徐州","绍兴","厦门","昆明","南昌","贵阳","珠海","东莞","镇江","洛阳","温州","兰州","福州","惠州","呼和浩特","常州","唐山","淮安","湖州","九江","太原","北海","株洲","淄博","盐城","乌鲁木齐","海口","南宁","常德","台州","金华","吉林","岳阳","柳州","清远","湛江","张家口","保定","深圳","杭州","合肥","无锡","泉州","遵义","肇庆","漳州","宜昌","芜湖","泰州","汕头","三亚","秦皇岛","马鞍山","连云港","沧州","拉萨","锦州","大同","文昌","保亭","陵水"] +// def citys = [ "涓婃捣","鎵窞","鍖椾含","閲嶅簡","澶╂触","鎴愰兘","娌堥槼","澶ц繛","瀹夊簡","瑗垮畞","鏃ョ収","闀挎槬","姝︽眽","瑗垮畨","鑻忓窞","骞垮窞","鍗椾含","闈掑矝","娴庡崡","瀹佹尝","闀挎矙","鐭冲搴�","浣涘北","鍢夊叴","閾跺窛","鍗楅��","寤婂潑","涓北","閮戝窞","鍝堝皵婊�","鐑熷彴","寰愬窞","缁嶅叴","鍘﹂棬","鏄嗘槑","鍗楁槍","璐甸槼","鐝犳捣","涓滆帪","闀囨睙","娲涢槼","娓╁窞","鍏板窞","绂忓窞","鎯犲窞","鍛煎拰娴╃壒","甯稿窞","鍞愬北","娣畨","婀栧窞","涔濇睙","澶師","鍖楁捣","鏍床","娣勫崥","鐩愬煄","涔岄瞾鏈ㄩ綈","娴峰彛","鍗楀畞","甯稿痉","鍙板窞","閲戝崕","鍚夋灄","宀抽槼","鏌冲窞","娓呰繙","婀涙睙","寮犲鍙�","淇濆畾","娣卞湷","鏉窞","鍚堣偉","鏃犻敗","娉夊窞","閬典箟","鑲囧簡","婕冲窞","瀹滄槍","鑺滄箹","娉板窞","姹曞ご","涓変簹","绉︾殗宀�","椹瀺灞�","杩炰簯娓�","娌у窞","鎷夎惃","閿﹀窞","澶у悓","鏂囨槍","淇濅涵","闄垫按"] // def cityCodeDataMap = CcbCommonUtils.findCityCodeValue() def allRows = [] for(def city : citys) { @@ -223,14 +223,14 @@ class ExportOracleDataTest { def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28"; def fileName = "/ccb_evaluation/MODEL_000000_000000_BIGDATA_COMMBUILDTYPE_GJ_ALL_${curDate}_0001.dat" if (CommonDatautils.isWindow()) { - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_COMMBUILDTYPE_GJ_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_COMMBUILDTYPE_GJ_ALL_${curDate}_0001.dat" } - def headers = []//["城市ID","小区ID"," 建筑类型","备注","创建时间","更新时间","来源公司","数据时间"] + def headers = []//["鍩庡競ID","灏忓尯ID"," 寤虹瓚绫诲瀷","澶囨敞","鍒涘缓鏃堕棿","鏇存柊鏃堕棿","鏉ユ簮鍏徃","鏁版嵁鏃堕棿"] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); - println "BIGDATA_COMMBUILDTYPE_GJ 数据文件输出完成......" + println "BIGDATA_COMMBUILDTYPE_GJ 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpTestUtils.ftpUpload(null, fileName, curDate) - println "BIGDATA_COMMBUILDTYPE_GJ 上传Ftp完成......" + println "BIGDATA_COMMBUILDTYPE_GJ 涓婁紶Ftp瀹屾垚......" } def exportBigdataDistrictData() { @@ -262,15 +262,15 @@ class ExportOracleDataTest { def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28"; def fileName = "/ccb_evaluation/MODEL_000000_000000_BIGDATA_DISTRICT_GJ_ALL_${curDate}_0001.dat" if (CommonDatautils.isWindow()) { - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_DISTRICT_GJ_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_DISTRICT_GJ_ALL_${curDate}_0001.dat" } def headers = [] -//["行政区ID","行政区名称","行政区名称拼音","城市ID","国标码","显示顺序","行政区类别","备注","创建时间","更新时间","来源公司","逻辑行政区","逻辑行政区划代码","行政区划代码","数据时间"] +//["琛屾斂鍖篒D","琛屾斂鍖哄悕绉�","琛屾斂鍖哄悕绉版嫾闊�","鍩庡競ID","鍥芥爣鐮�","鏄剧ず椤哄簭","琛屾斂鍖虹被鍒�","澶囨敞","鍒涘缓鏃堕棿","鏇存柊鏃堕棿","鏉ユ簮鍏徃","閫昏緫琛屾斂鍖�","閫昏緫琛屾斂鍖哄垝浠g爜","琛屾斂鍖哄垝浠g爜","鏁版嵁鏃堕棿"] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); - println "BIGDATA_DISTRICT_GJ 数据文件输出完成......" + println "BIGDATA_DISTRICT_GJ 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpTestUtils.ftpUpload(null, fileName, curDate) - println "BIGDATA_DISTRICT_GJ 上传Ftp完成......" + println "BIGDATA_DISTRICT_GJ 涓婁紶Ftp瀹屾垚......" } @@ -302,14 +302,14 @@ class ExportOracleDataTest { def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28"; def fileName = "/ccb_evaluation/MODEL_000000_000000_GUIDED_PRICE_GJ_ALL_${curDate}_0001.dat" if (CommonDatautils.isWindow()) { - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_GUIDED_PRICE_GJ_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_GUIDED_PRICE_GJ_ALL_${curDate}_0001.dat" } def headers = [] -//["第三方均价ID","楼盘ID","小区名称","城市ID","城市名称","行政区ID","行政区名称","指导日期","指导价格","添加人","备注","创建时间","更新时间","来源公司"] +//["绗笁鏂瑰潎浠稩D","妤肩洏ID","灏忓尯鍚嶇О","鍩庡競ID","鍩庡競鍚嶇О","琛屾斂鍖篒D","琛屾斂鍖哄悕绉�","鎸囧鏃ユ湡","鎸囧浠锋牸","娣诲姞浜�","澶囨敞","鍒涘缓鏃堕棿","鏇存柊鏃堕棿","鏉ユ簮鍏徃"] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); - println "GUIDED_PRICE_GJ 数据文件输出完成......" + println "GUIDED_PRICE_GJ 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpTestUtils.ftpUpload(null, fileName, curDate) - println "GUIDED_PRICE_GJ 上传Ftp完成......" + println "GUIDED_PRICE_GJ 涓婁紶Ftp瀹屾垚......" } def exportCommunityGuidedPrice(def date) { @@ -339,14 +339,14 @@ class ExportOracleDataTest { def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28"; def fileName = "/ccb_evaluation/MODEL_000000_000000_COMMUNITY_GUIDE_PRICE_GJ_ADD_${curDate}_0001.dat" if (CommonDatautils.isWindow()) { - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_COMMUNITY_GUIDE_PRICE_GJ_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_COMMUNITY_GUIDE_PRICE_GJ_ADD_${curDate}_0001.dat" } - def headers = []//["第三方均价ID","楼盘ID","小区名称","城市ID","城市名称","行政区ID","行政区名称","指导价格","类型","备注","创建时间","更新时间","来源公司"] + def headers = []//["绗笁鏂瑰潎浠稩D","妤肩洏ID","灏忓尯鍚嶇О","鍩庡競ID","鍩庡競鍚嶇О","琛屾斂鍖篒D","琛屾斂鍖哄悕绉�","鎸囧浠锋牸","绫诲瀷","澶囨敞","鍒涘缓鏃堕棿","鏇存柊鏃堕棿","鏉ユ簮鍏徃"] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); - println "COMMUNITY_GUIDE_PRICE_GJ 数据文件输出完成......" + println "COMMUNITY_GUIDE_PRICE_GJ 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpTestUtils.ftpUpload(null, fileName, curDate) - println "COMMUNITY_GUIDE_PRICE_GJ 上传Ftp完成......" + println "COMMUNITY_GUIDE_PRICE_GJ 涓婁紶Ftp瀹屾垚......" } def exportBigdataDeal(def dealDate, def new_dists) { @@ -384,13 +384,13 @@ class ExportOracleDataTest { def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28"; def fileName = "/ccb_evaluation/MODEL_000000_000000_BIGDATA_DEAL_GJ_ADD_${curDate}_0001.dat" if (CommonDatautils.isWindow()) { - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_DEAL_GJ_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_DEAL_GJ_ADD_${curDate}_0001.dat" } def headers = [] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); - println "BIGDATA_DEAL_GJ 数据文件输出完成......" + println "BIGDATA_DEAL_GJ 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpTestUtils.ftpUpload(null, fileName, curDate) - println "BIGDATA_DEAL_GJ 上传Ftp完成......" + println "BIGDATA_DEAL_GJ 涓婁紶Ftp瀹屾垚......" } @@ -505,15 +505,15 @@ class ExportOracleDataTest { def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28"; def fileName = "/ccb_evaluation/MODEL_000000_000000_THIRD_PARTY_PRICE_GJ_ADD_${curDate}_0001.dat" if (CommonDatautils.isWindow()) { - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_THIRD_PARTY_PRICE_GJ_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_THIRD_PARTY_PRICE_GJ_ADD_${curDate}_0001.dat" } def headers = [] -//["第三方均价ID","楼盘ID","小区名称","城市ID","城市名称","行政区ID","行政区名称","均价对应的月份","诸葛找房均价","安居客均价","房天下均价","链家均价","城市房产均价","麦田均价","贝壳均价","淘房365","中原均价","兔博士均价","Q房均价","房探均价","房多多均价","我爱我家均价","创建时间","更新时间","来源公司"] +//["绗笁鏂瑰潎浠稩D","妤肩洏ID","灏忓尯鍚嶇О","鍩庡競ID","鍩庡競鍚嶇О","琛屾斂鍖篒D","琛屾斂鍖哄悕绉�","鍧囦环瀵瑰簲鐨勬湀浠�","璇歌憶鎵炬埧鍧囦环","瀹夊眳瀹㈠潎浠�","鎴垮ぉ涓嬪潎浠�","閾惧鍧囦环","鍩庡競鎴夸骇鍧囦环","楹︾敯鍧囦环","璐濆3鍧囦环","娣樻埧365","涓師鍧囦环","鍏斿崥澹潎浠�","Q鎴垮潎浠�","鎴挎帰鍧囦环","鎴垮澶氬潎浠�","鎴戠埍鎴戝鍧囦环","鍒涘缓鏃堕棿","鏇存柊鏃堕棿","鏉ユ簮鍏徃"] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); - println "THIRD_PARTY_PRICE_GJ 数据文件输出完成......" + println "THIRD_PARTY_PRICE_GJ 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpTestUtils.ftpUpload(null, fileName, curDate) - println "THIRD_PARTY_PRICE_GJ 上传数据文件完成......" + println "THIRD_PARTY_PRICE_GJ 涓婁紶鏁版嵁鏂囦欢瀹屾垚......" } @@ -522,7 +522,7 @@ class ExportOracleDataTest { def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28"; def fileName = "/ccb_evaluation/MODEL_000000_000000_BIGDATA_THIRD_PARTY_PRICE_GJ_ADD_${curDate}_0001.dat" if (CommonDatautils.isWindow()) { - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_THIRD_PARTY_PRICE_GJ_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_THIRD_PARTY_PRICE_GJ_ADD_${curDate}_0001.dat" // fileName = "D:\\MODEL_000000_000000_BIGDATA_THIRD_PARTY_PRICE_GJ_ADD_${curDate}_0001.dat" } def headers = [] @@ -557,7 +557,7 @@ class ExportOracleDataTest { } } - println "BIGDATA_THIRD_PARTY_PRICE_GJ 数据文件输出完成......" + println "BIGDATA_THIRD_PARTY_PRICE_GJ 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpTestUtils.ftpUpload(null, fileName, curDate) } @@ -630,25 +630,25 @@ class ExportOracleDataTest { def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28"; def fileName = "/ccb_evaluation/MODEL_000000_000000_BIGDATA_COMMUNITY_GJ_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_COMMUNITY_GJ_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_COMMUNITY_GJ_ALL_${curDate}_0001.dat" } - def headers = []//["城市ID","行政区ID","小区ID","行政区名称","小区名称","详细地址","纬度","经度","占地总面积","建筑总面积","绿化率","容积率","车位数量","建筑年代","房屋用途", - //"总套数","数据时间","更新标记","更新时间","小区类型","小区曾用名","街道","门牌号","是否新盘","小区介绍","备注","创建时间","来源公司", - //"乡镇/街道办","逻辑行政区划代码","逻辑行政区划","状态"] + def headers = []//["鍩庡競ID","琛屾斂鍖篒D","灏忓尯ID","琛屾斂鍖哄悕绉�","灏忓尯鍚嶇О","璇︾粏鍦板潃","绾害","缁忓害","鍗犲湴鎬婚潰绉�","寤虹瓚鎬婚潰绉�","缁垮寲鐜�","瀹圭Н鐜�","杞︿綅鏁伴噺","寤虹瓚骞翠唬","鎴垮眿鐢ㄩ��", + //"鎬诲鏁�","鏁版嵁鏃堕棿","鏇存柊鏍囪","鏇存柊鏃堕棿","灏忓尯绫诲瀷","灏忓尯鏇剧敤鍚�","琛楅亾","闂ㄧ墝鍙�","鏄惁鏂扮洏","灏忓尯浠嬬粛","澶囨敞","鍒涘缓鏃堕棿","鏉ユ簮鍏徃", + //"涔¢晣/琛楅亾鍔�","閫昏緫琛屾斂鍖哄垝浠g爜","閫昏緫琛屾斂鍖哄垝","鐘舵��"] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); - println "BIGDATA_COMMUNITY_GJ 数据文件输出完成......" + println "BIGDATA_COMMUNITY_GJ 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpTestUtils.ftpUpload(null, fileName, curDate) - println "BIGDATA_COMMUNITY_GJ 上传Ftp完成......" + println "BIGDATA_COMMUNITY_GJ 涓婁紶Ftp瀹屾垚......" } def exportBigdataForsale(publishDate, new_dists){ - //["北京","上海"] + //["鍖椾含","涓婃捣"] def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28"; def fileName = "/ccb_evaluation/MODEL_000000_000000_BIGDATA_FORSALE_GJ_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_FORSALE_GJ_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_FORSALE_GJ_ADD_${curDate}_0001.dat" } - def headers = []//["城市ID","出售ID","挂牌房屋ID","城市名称","行政区ID","行政区名称","小区ID","小区名称","楼栋ID","楼栋编号","楼栋名称","单元ID","单元编号","单元名称","户ID","详细地址","建筑年代","权属","权属年限","单价","总价","出售付款方式","所在楼层","总楼层","建筑类型","室内结构","建筑结构","建筑面积","套内面积","户型","室","厅","厨","卫","朝向","装修情况","是否有电梯","几梯几户","发布时间","到期时间","是否首发","房源数据来源","中介公司ID","中介公司名称","发布人","发布人电话","描述信息","备注","创建时间","更新时间","来源公司","附加信息"] + def headers = []//["鍩庡競ID","鍑哄敭ID","鎸傜墝鎴垮眿ID","鍩庡競鍚嶇О","琛屾斂鍖篒D","琛屾斂鍖哄悕绉�","灏忓尯ID","灏忓尯鍚嶇О","妤兼爧ID","妤兼爧缂栧彿","妤兼爧鍚嶇О","鍗曞厓ID","鍗曞厓缂栧彿","鍗曞厓鍚嶇О","鎴稩D","璇︾粏鍦板潃","寤虹瓚骞翠唬","鏉冨睘","鏉冨睘骞撮檺","鍗曚环","鎬讳环","鍑哄敭浠樻鏂瑰紡","鎵�鍦ㄦゼ灞�","鎬绘ゼ灞�","寤虹瓚绫诲瀷","瀹ゅ唴缁撴瀯","寤虹瓚缁撴瀯","寤虹瓚闈㈢Н","濂楀唴闈㈢Н","鎴峰瀷","瀹�","鍘�","鍘�","鍗�","鏈濆悜","瑁呬慨鎯呭喌","鏄惁鏈夌數姊�","鍑犳鍑犳埛","鍙戝竷鏃堕棿","鍒版湡鏃堕棿","鏄惁棣栧彂","鎴挎簮鏁版嵁鏉ユ簮","涓粙鍏徃ID","涓粙鍏徃鍚嶇О","鍙戝竷浜�","鍙戝竷浜虹數璇�","鎻忚堪淇℃伅","澶囨敞","鍒涘缓鏃堕棿","鏇存柊鏃堕棿","鏉ユ簮鍏徃","闄勫姞淇℃伅"] def index = 0 for(def city : citys){ def cityCode = cityCodeMap.get(city) @@ -679,7 +679,7 @@ class ExportOracleDataTest { } } - if(new_dists){//补充被修区域的数据 + if(new_dists){//琛ュ厖琚慨鍖哄煙鐨勬暟鎹� def newstr = "('"+new_dists.join("','")+"')" def sql2 = "select CITYID,FORSALEID,PROPCODE,CITYNAME,DISTID,DISTNAME,COMMID,COMMNAME, BUILDID,BUILDNO, BUILDNAME,UNITID,UNITNO,UNITNAME,HOUSEID,ADDRESS,BUILDYEAR,PROPTYPE,PROPYEARS,UNITPRICE,TOTALPRICE,PAYTYPE,FLOORNUM,FLOORCNT,\n" + " BUILDTYPE, HOUSESTRU,BUILDSTRU,BUILDAREA,LIVINGAREA,HOUSESTYLE,ROOMCNT,LIVINGROOMCNT,KITCHENCNT, BATHROOMCNT,HOUSEASPECT,FITMENT,IFELEVATOR,ELEVATORHOUSE,to_char(PUBLISHTIME,'yyyy-mm-dd hh24:mi:ss') as PUBLISHTIME,to_char(EXPIRETIME,'yyyy-mm-dd hh24:mi:ss') as EXPIRETIME,\n" + @@ -690,9 +690,9 @@ class ExportOracleDataTest { FileUtils.batchCreateFile(rets2, fileName, headers, "utf-8", true); } } - println "BIGDATA_FORSALE_GJ 数据文件输出完成......" + println "BIGDATA_FORSALE_GJ 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpTestUtils.ftpUpload(null, fileName, curDate) - println "BIGDATA_FORSALE_GJ 上传Ftp完成......" + println "BIGDATA_FORSALE_GJ 涓婁紶Ftp瀹屾垚......" } def getHouseDatas(sql){ @@ -813,18 +813,18 @@ class ExportOracleDataTest { def fileName = "/ccb_evaluation/MODEL_000000_000000_AVM_EVALUATION_GJNB_ADD_${curDate}_0001.dat" def fileName1 = "/ccb_evaluation/MODEL_000000_000000_AVM_EVALUATION_GJ_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_AVM_EVALUATION_GJNB_ADD_${curDate}_0001.dat" - fileName1 = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_AVM_EVALUATION_GJ_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_AVM_EVALUATION_GJNB_ADD_${curDate}_0001.dat" + fileName1 = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_AVM_EVALUATION_GJ_ADD_${curDate}_0001.dat" } def headers = []//["ID","CITYID","CITYNAME","YEAR_MONTH","COMMUNITY_NUM","HAS_PRICE_COMMUNITY_NUM","PRICE_COVERAGE","ARTIFICIAL_CALC_NUM","ARTIFICIAL_CALC_COVERAGE","SAMPLE_CALC_NUM","SAMPLE_CALC_COVERAGE", //"ANN_CALC_NUM","ANN_CALC_COVERAGE","TEST_NUM","TEST_COMM_NUM","TEST_COMM_COVERAGE","PPE15_COVERAGE","RATE_MEDIAN","COEFFICIENT","DEAL_TEST_CASE_NUM","DEAL_TEST_COMM_NUM","DEAL_TEST_COMM_COVERAGE","DEAL_PPE15_COVERAGE", //"DEAL_COEFFICIENT","DEAL_RATE_MEDIAN","THIRD_TEST_CASE_NUM","THIRD_TEST_COMM_NUM","THIRD_TEST_COMM_COVERAGE","THIRD_PPE15_COVERAGE","THIRD_COEFFICIENT","THIRD_RATE_MEDIAN","CREATETIME","UPDATETIME","SOURCECODE"] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); FileUtils.batchCreateFile(allRows, fileName1, headers, "utf-8", false); - println "AVM_EVALUATION_GJNB 数据文件输出完成......" + println "AVM_EVALUATION_GJNB 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpTestUtils.ftpUpload(null, fileName, curDate) CcbFtpTestUtils.ftpUpload(null, fileName1, curDate) - println "AVM_EVALUATION_GJNB 上传Ftp完成......" + println "AVM_EVALUATION_GJNB 涓婁紶Ftp瀹屾垚......" } def exportAVMEvaluationItemGJNB(yearMonth){ @@ -865,16 +865,16 @@ class ExportOracleDataTest { def fileName = "/ccb_evaluation/MODEL_000000_000000_AVM_EVALUATION_ITEM_GJNB_ADD_${curDate}_0001.dat" def fileName1 = "/ccb_evaluation/MODEL_000000_000000_AVM_EVALUATION_ITEM_GJ_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_AVM_EVALUATION_ITEM_GJNB_ADD_${curDate}_0001.dat" - fileName1 = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_AVM_EVALUATION_ITEM_GJ_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_AVM_EVALUATION_ITEM_GJNB_ADD_${curDate}_0001.dat" + fileName1 = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_AVM_EVALUATION_ITEM_GJ_ADD_${curDate}_0001.dat" } def headers = []//["ID","CITYID","CITYNAME","DISTID","DISTNAME","COMMID","COMMNAME","YEAR_MONTH","CALC_AVG_PRICE","AVG_PRICE","CALC_TYPE","CONFIDENCE","TARGET_AVG_PRICE","DEALDATE","UNIT_PRICE","BUILDAREA","FITMENT","HOUSEASPECT","FLOORNUM","FLOORCNT","DATA_TYPE","RATE","PE","CREATETIME"] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); FileUtils.batchCreateFile(allRows, fileName1, headers, "utf-8", false); - println "AVM_EVALUATION_ITEM_GJNB 数据文件输出完成......" + println "AVM_EVALUATION_ITEM_GJNB 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpTestUtils.ftpUpload(null, fileName, curDate) CcbFtpTestUtils.ftpUpload(null, fileName1, curDate) - println "AVM_EVALUATION_ITEM_GJNB 上传Ftp完成......" + println "AVM_EVALUATION_ITEM_GJNB 涓婁紶Ftp瀹屾垚......" } def exportCommunityBasePrice(yearMonth){ @@ -908,16 +908,16 @@ class ExportOracleDataTest { def fileName = "/ccb_evaluation/MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJNB_ADD_${curDate}_0001.dat" def fileName1 = "/ccb_evaluation/MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJ_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJNB_ADD_${curDate}_0001.dat" - fileName1 = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJ_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJNB_ADD_${curDate}_0001.dat" + fileName1 = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJ_ADD_${curDate}_0001.dat" } def headers = []//["ID","CITYID","CITYNAME","DISTID","DISTNAME","COMMID","COMMNAME","YEAR_MONTH","CALC_AVG_PRICE","AVG_PRICE","CALC_TYPE","FAKE_RATE","DIFF_RATE","CONFI_RATE","CORR_RATE","CONFIDENCE","CREATETIME","UPDATETIME","SOURCECODE"] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); FileUtils.batchCreateFile(allRows, fileName1, headers, "utf-8", false); - println "COMMUNITY_BASE_PRICE_GJNB 数据文件输出完成......" + println "COMMUNITY_BASE_PRICE_GJNB 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpTestUtils.ftpUpload(null, fileName, curDate) CcbFtpTestUtils.ftpUpload(null, fileName1, curDate) - println "COMMUNITY_BASE_PRICE_GJNB 上传Ftp完成......" + println "COMMUNITY_BASE_PRICE_GJNB 涓婁紶Ftp瀹屾垚......" } def exportCommunityBasePriceGj(yearMonth){ @@ -950,13 +950,13 @@ class ExportOracleDataTest { def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28"; def fileName = "/ccb_evaluation/MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJ_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJ_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJ_ADD_${curDate}_0001.dat" } def headers = []//["ID","CITYID","CITYNAME","DISTID","DISTNAME","COMMID","COMMNAME","YEAR_MONTH","CALC_AVG_PRICE","AVG_PRICE","CALC_TYPE","FAKE_RATE","DIFF_RATE","CONFI_RATE","CORR_RATE","CONFIDENCE","CREATETIME","UPDATETIME","SOURCECODE"] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); - println "COMMUNITY_BASE_PRICE_GJ 数据文件输出完成......" + println "COMMUNITY_BASE_PRICE_GJ 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpTestUtils.ftpUpload(null, fileName, curDate) - println "COMMUNITY_BASE_PRICE_GJ 上传Ftp完成......" + println "COMMUNITY_BASE_PRICE_GJ 涓婁紶Ftp瀹屾垚......" } def exportCityPrice(month){ @@ -979,13 +979,13 @@ class ExportOracleDataTest { def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28" def fileName = "/ccb_evaluation/MODEL_000000_000000_CITY_PRICE_GJ_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_CITY_PRICE_GJ_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_CITY_PRICE_GJ_ADD_${curDate}_0001.dat" } def headers = []//["ID","CITYID","CITYNAME","DISTID","DISTNAME","COMMID","COMMNAME","YEAR_MONTH","CALC_AVG_PRICE","AVG_PRICE","CALC_TYPE","FAKE_RATE","DIFF_RATE","CONFI_RATE","CORR_RATE","CONFIDENCE","CREATETIME","UPDATETIME","SOURCECODE"] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); - println "CITY_PRICE_GJ 数据文件输出完成......" + println "CITY_PRICE_GJ 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpTestUtils.ftpUpload(null, fileName, curDate) - println "CITY_PRICE_GJ 上传Ftp完成......" + println "CITY_PRICE_GJ 涓婁紶Ftp瀹屾垚......" } def exportRegionPrice(month){ @@ -1010,13 +1010,13 @@ class ExportOracleDataTest { def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28" def fileName = "/ccb_evaluation/MODEL_000000_000000_DISTRICT_PRICE_GJ_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_DISTRICT_PRICE_GJ_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_DISTRICT_PRICE_GJ_ADD_${curDate}_0001.dat" } def headers = []//["ID","CITYID","CITYNAME","DISTID","DISTNAME","COMMID","COMMNAME","YEAR_MONTH","CALC_AVG_PRICE","AVG_PRICE","CALC_TYPE","FAKE_RATE","DIFF_RATE","CONFI_RATE","CORR_RATE","CONFIDENCE","CREATETIME","UPDATETIME","SOURCECODE"] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); - println "DISTRICT_PRICE_GJ 数据文件输出完成......" + println "DISTRICT_PRICE_GJ 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpTestUtils.ftpUpload(null, fileName, curDate) - println "DISTRICT_PRICE_GJ 上传Ftp完成......" + println "DISTRICT_PRICE_GJ 涓婁紶Ftp瀹屾垚......" } def exportCommunityPdescribeGj(month){ @@ -1026,7 +1026,7 @@ class ExportOracleDataTest { def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28" def fileName = "/ccb_evaluation/MODEL_000000_000000_COMMUNITY_P_DESCRIBE_GJ_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_COMMUNITY_P_DESCRIBE_GJ_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_COMMUNITY_P_DESCRIBE_GJ_ADD_${curDate}_0001.dat" } def headers = [] // @@ -1083,9 +1083,9 @@ class ExportOracleDataTest { println allRows.size() FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); // } - println "community_p_describe_gj 数据文件输出完成......" + println "community_p_describe_gj 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpTestUtils.ftpUpload(null, fileName, curDate) - println "community_p_describe_gj 上传Ftp完成......" + println "community_p_describe_gj 涓婁紶Ftp瀹屾垚......" } def exportCommCaseDetailGj(month){ @@ -1096,7 +1096,7 @@ class ExportOracleDataTest { def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28" def fileName = "/ccb_evaluation/MODEL_000000_000000_COMM_CASE_DETAIL_GJ_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_COMM_CASE_DETAIL_GJ_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_COMM_CASE_DETAIL_GJ_ADD_${curDate}_0001.dat" } def headers = [] @@ -1123,16 +1123,16 @@ class ExportOracleDataTest { } } - println "comm_case_detail_gj 数据文件输出完成......" + println "comm_case_detail_gj 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpTestUtils.ftpUpload(null, fileName, curDate) - println "comm_case_detail_gj 上传Ftp完成......" + println "comm_case_detail_gj 涓婁紶Ftp瀹屾垚......" } def exportLastFile(){ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28" def dataCodeFileName = "/ccb_evaluation/${curDate}.ok" if(CommonDatautils.isWindow()){ - dataCodeFileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\${curDate}.ok" + dataCodeFileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\${curDate}.ok" } FileUtils.batchCreateFile([], dataCodeFileName, [], "utf-8", false); CcbFtpTestUtils.ftpUpload(null, dataCodeFileName, curDate) @@ -1142,7 +1142,7 @@ class ExportOracleDataTest { def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28" def dataCodeFileName = "/ccb_evaluation/${curDate}.ok" if(CommonDatautils.isWindow()){ - dataCodeFileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\${curDate}.ok" + dataCodeFileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\${curDate}.ok" } FileUtils.batchCreateFile([], dataCodeFileName, [], "utf-8", false); CcbFtpTestUtils.ftpUpload(null, dataCodeFileName, curDate) @@ -1162,11 +1162,11 @@ class ExportOracleDataTest { } def fileName = "/ccb_evaluation/${curDate}.ok" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\${curDate}.ok" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\${curDate}.ok" } FileUtils.createTxtFile(fileRows, fileName, "utf-8", false); CcbFtpTestUtils.ftpUpload(null, fileName, curDate) - println "统计文件长度ok文件 上传Ftp完成......" + println "缁熻鏂囦欢闀垮害ok鏂囦欢 涓婁紶Ftp瀹屾垚......" } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleEvaluationData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleEvaluationData.groovy index 513e7025c..25b4ea59f 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleEvaluationData.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleEvaluationData.groovy @@ -24,25 +24,25 @@ class ExportOracleEvaluationData { citys = CcbCommonUtils.getRunningCitys(args) def curMonth = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), 0, "yyyyMM")); - //计算结果相关 + //璁$畻缁撴灉鐩稿叧 exportAvmEvaluationGJNB(curMonth) exportAVMEvaluationItemGJNB(curMonth) exportCityPrice(curMonth) exportRegionPrice(curMonth) - // exportCommunityBasePriceGj(curMonth)//已合下面的合并 + // exportCommunityBasePriceGj(curMonth)//宸插悎涓嬮潰鐨勫悎骞� exportCommunityBasePrice(curMonth) exportCommunityPdescribeGj(curMonth) exportCommCaseDetailGj(curMonth) def curDate = curMonth.toString()+"28" -// 生成MD5文件 +// 鐢熸垚MD5鏂囦欢 exportMd5() SSHHelper jschCommand = new SSHHelper(); System.out.println(jschCommand.executeCommand("sh /home/ccb/output/gz_package.sh ${curDate}")); -// ok文件 +// ok鏂囦欢 exportOkFile() } @@ -99,18 +99,18 @@ class ExportOracleEvaluationData { def fileName = "/ccb/MODEL_000000_000000_AVM_EVALUATION_GJNB_ADD_${curDate}_0001.dat" def fileName1 = "/ccb/MODEL_000000_000000_AVM_EVALUATION_GJ_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_AVM_EVALUATION_GJNB_ADD_${curDate}_0001.dat" - fileName1 = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_AVM_EVALUATION_GJ_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_AVM_EVALUATION_GJNB_ADD_${curDate}_0001.dat" + fileName1 = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_AVM_EVALUATION_GJ_ADD_${curDate}_0001.dat" } def headers = []//["ID","CITYID","CITYNAME","YEAR_MONTH","COMMUNITY_NUM","HAS_PRICE_COMMUNITY_NUM","PRICE_COVERAGE","ARTIFICIAL_CALC_NUM","ARTIFICIAL_CALC_COVERAGE","SAMPLE_CALC_NUM","SAMPLE_CALC_COVERAGE", //"ANN_CALC_NUM","ANN_CALC_COVERAGE","TEST_NUM","TEST_COMM_NUM","TEST_COMM_COVERAGE","PPE15_COVERAGE","RATE_MEDIAN","COEFFICIENT","DEAL_TEST_CASE_NUM","DEAL_TEST_COMM_NUM","DEAL_TEST_COMM_COVERAGE","DEAL_PPE15_COVERAGE", //"DEAL_COEFFICIENT","DEAL_RATE_MEDIAN","THIRD_TEST_CASE_NUM","THIRD_TEST_COMM_NUM","THIRD_TEST_COMM_COVERAGE","THIRD_PPE15_COVERAGE","THIRD_COEFFICIENT","THIRD_RATE_MEDIAN","CREATETIME","UPDATETIME","SOURCECODE"] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); FileUtils.batchCreateFile(allRows, fileName1, headers, "utf-8", false); - println "AVM_EVALUATION_GJNB 数据文件输出完成......" + println "AVM_EVALUATION_GJNB 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpUtils.ftpUpload(null, fileName, curDate) CcbFtpUtils.ftpUpload(null, fileName1, curDate) - println "AVM_EVALUATION_GJNB 上传Ftp完成......" + println "AVM_EVALUATION_GJNB 涓婁紶Ftp瀹屾垚......" } def exportAVMEvaluationItemGJNB(yearMonth){ @@ -156,16 +156,16 @@ class ExportOracleEvaluationData { def fileName = "/ccb/MODEL_000000_000000_AVM_EVALUATION_ITEM_GJNB_ADD_${curDate}_0001.dat" def fileName1 = "/ccb/MODEL_000000_000000_AVM_EVALUATION_ITEM_GJ_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_AVM_EVALUATION_ITEM_GJNB_ADD_${curDate}_0001.dat" - fileName1 = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_AVM_EVALUATION_ITEM_GJ_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_AVM_EVALUATION_ITEM_GJNB_ADD_${curDate}_0001.dat" + fileName1 = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_AVM_EVALUATION_ITEM_GJ_ADD_${curDate}_0001.dat" } def headers = []//["ID","CITYID","CITYNAME","DISTID","DISTNAME","COMMID","COMMNAME","YEAR_MONTH","CALC_AVG_PRICE","AVG_PRICE","CALC_TYPE","CONFIDENCE","TARGET_AVG_PRICE","DEALDATE","UNIT_PRICE","BUILDAREA","FITMENT","HOUSEASPECT","FLOORNUM","FLOORCNT","DATA_TYPE","RATE","PE","CREATETIME"] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); FileUtils.batchCreateFile(allRows, fileName1, headers, "utf-8", false); - println "AVM_EVALUATION_ITEM_GJNB 数据文件输出完成......" + println "AVM_EVALUATION_ITEM_GJNB 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpUtils.ftpUpload(null, fileName, curDate) CcbFtpUtils.ftpUpload(null, fileName1, curDate) - println "AVM_EVALUATION_ITEM_GJNB 上传Ftp完成......" + println "AVM_EVALUATION_ITEM_GJNB 涓婁紶Ftp瀹屾垚......" } def exportCommunityBasePrice(yearMonth){ @@ -203,16 +203,16 @@ class ExportOracleEvaluationData { def fileName = "/ccb/MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJNB_ADD_${curDate}_0001.dat" def fileName1 = "/ccb/MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJ_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJNB_ADD_${curDate}_0001.dat" - fileName1 = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJ_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJNB_ADD_${curDate}_0001.dat" + fileName1 = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJ_ADD_${curDate}_0001.dat" } def headers = []//["ID","CITYID","CITYNAME","DISTID","DISTNAME","COMMID","COMMNAME","YEAR_MONTH","CALC_AVG_PRICE","AVG_PRICE","CALC_TYPE","FAKE_RATE","DIFF_RATE","CONFI_RATE","CORR_RATE","CONFIDENCE","CREATETIME","UPDATETIME","SOURCECODE"] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); FileUtils.batchCreateFile(allRows, fileName1, headers, "utf-8", false); - println "COMMUNITY_BASE_PRICE_GJNB 数据文件输出完成......" + println "COMMUNITY_BASE_PRICE_GJNB 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpUtils.ftpUpload(null, fileName, curDate) CcbFtpUtils.ftpUpload(null, fileName1, curDate) - println "COMMUNITY_BASE_PRICE_GJNB 上传Ftp完成......" + println "COMMUNITY_BASE_PRICE_GJNB 涓婁紶Ftp瀹屾垚......" } def exportCommunityBasePriceGj(yearMonth){ @@ -250,13 +250,13 @@ class ExportOracleEvaluationData { def fileName = "/ccb/MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJ_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJ_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJ_ADD_${curDate}_0001.dat" } def headers = []//["ID","CITYID","CITYNAME","DISTID","DISTNAME","COMMID","COMMNAME","YEAR_MONTH","CALC_AVG_PRICE","AVG_PRICE","CALC_TYPE","FAKE_RATE","DIFF_RATE","CONFI_RATE","CORR_RATE","CONFIDENCE","CREATETIME","UPDATETIME","SOURCECODE"] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); - println "COMMUNITY_BASE_PRICE_GJ 数据文件输出完成......" + println "COMMUNITY_BASE_PRICE_GJ 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpUtils.ftpUpload(null, fileName, curDate) - println "COMMUNITY_BASE_PRICE_GJ 上传Ftp完成......" + println "COMMUNITY_BASE_PRICE_GJ 涓婁紶Ftp瀹屾垚......" } def exportCityPrice(month){ @@ -282,13 +282,13 @@ class ExportOracleEvaluationData { def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28" def fileName = "/ccb/MODEL_000000_000000_CITY_PRICE_GJ_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_CITY_PRICE_GJ_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_CITY_PRICE_GJ_ALL_${curDate}_0001.dat" } def headers = []//["ID","CITYID","CITYNAME","DISTID","DISTNAME","COMMID","COMMNAME","YEAR_MONTH","CALC_AVG_PRICE","AVG_PRICE","CALC_TYPE","FAKE_RATE","DIFF_RATE","CONFI_RATE","CORR_RATE","CONFIDENCE","CREATETIME","UPDATETIME","SOURCECODE"] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); - println "CITY_PRICE_GJ 数据文件输出完成......" + println "CITY_PRICE_GJ 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpUtils.ftpUpload(null, fileName, curDate) - println "CITY_PRICE_GJ 上传Ftp完成......" + println "CITY_PRICE_GJ 涓婁紶Ftp瀹屾垚......" } def exportRegionPrice(month){ @@ -317,13 +317,13 @@ class ExportOracleEvaluationData { def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28" def fileName = "/ccb/MODEL_000000_000000_DISTRICT_PRICE_GJ_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_DISTRICT_PRICE_GJ_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_DISTRICT_PRICE_GJ_ALL_${curDate}_0001.dat" } def headers = []//["ID","CITYID","CITYNAME","DISTID","DISTNAME","COMMID","COMMNAME","YEAR_MONTH","CALC_AVG_PRICE","AVG_PRICE","CALC_TYPE","FAKE_RATE","DIFF_RATE","CONFI_RATE","CORR_RATE","CONFIDENCE","CREATETIME","UPDATETIME","SOURCECODE"] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); - println "DISTRICT_PRICE_GJ 数据文件输出完成......" + println "DISTRICT_PRICE_GJ 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpUtils.ftpUpload(null, fileName, curDate) - println "DISTRICT_PRICE_GJ 上传Ftp完成......" + println "DISTRICT_PRICE_GJ 涓婁紶Ftp瀹屾垚......" } def exportCommunityPdescribeGj(month){ @@ -331,7 +331,7 @@ class ExportOracleEvaluationData { def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28" def fileName = "/ccb/MODEL_000000_000000_COMMUNITY_P_DESCRIBE_GJ_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_COMMUNITY_P_DESCRIBE_GJ_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_COMMUNITY_P_DESCRIBE_GJ_ADD_${curDate}_0001.dat" } def headers = [] def allRows = [] @@ -389,9 +389,9 @@ class ExportOracleEvaluationData { println allRows.size() FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); - println "community_p_describe_gj 数据文件输出完成......" + println "community_p_describe_gj 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpUtils.ftpUpload(null, fileName, curDate) - println "community_p_describe_gj 上传Ftp完成......" + println "community_p_describe_gj 涓婁紶Ftp瀹屾垚......" } def exportCommCaseDetailGj(month){ @@ -400,7 +400,7 @@ class ExportOracleEvaluationData { def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28" def fileName = "/ccb/MODEL_000000_000000_COMM_CASE_DETAIL_GJ_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_COMM_CASE_DETAIL_GJ_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_COMM_CASE_DETAIL_GJ_ADD_${curDate}_0001.dat" } def headers = [] @@ -427,16 +427,16 @@ class ExportOracleEvaluationData { } } - println "comm_case_detail_gj 数据文件输出完成......" + println "comm_case_detail_gj 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpUtils.ftpUpload(null, fileName, curDate) - println "comm_case_detail_gj 上传Ftp完成......" + println "comm_case_detail_gj 涓婁紶Ftp瀹屾垚......" } def exportOkFile(){ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28" def dataCodeFileName = "/ccb/${curDate}.ok" if(CommonDatautils.isWindow()){ - dataCodeFileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\${curDate}.ok" + dataCodeFileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\${curDate}.ok" } FileUtils.batchCreateFile([], dataCodeFileName, [], "utf-8", false); CcbFtpUtils.ftpUpload(null, dataCodeFileName, curDate) @@ -455,10 +455,10 @@ class ExportOracleEvaluationData { } def fileName = "/ccb/md5.txt" if(CommonDatautils.isWindow()){ - fileName = "D:\\房价网\\md5.txt" + fileName = "D:\\鎴夸环缃慭\md5.txt" } FileUtils.createTxtFile(fileRows, fileName, "utf-8", false); CcbFtpUtils.ftpUpload(null, fileName, curDate) - println "md5.txt 上传Ftp完成......" + println "md5.txt 涓婁紶Ftp瀹屾垚......" } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/FjwPricePkCcbPrice.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/FjwPricePkCcbPrice.groovy index 60e475036..1f3354ed6 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/FjwPricePkCcbPrice.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/FjwPricePkCcbPrice.groovy @@ -42,8 +42,8 @@ class FjwPricePkCcbPrice { // task.exportFjwPriceAndCcbPrice() // task.addNewDistPrice() -// task.addCcbPrice2()//按id查 -// task.addCcbPrice3()//按city,region,name查 +// task.addCcbPrice2()//鎸塱d鏌� +// task.addCcbPrice3()//鎸塩ity,region,name鏌� // task.standRegion() // task.addGuidPrice() } @@ -51,7 +51,7 @@ class FjwPricePkCcbPrice { def addCcbPrice2(){ def cityCodeMap = CcbCommonUtils.findCityCodeValue() - ExcelUtils.multiThreadingModify("D:\\数据\\建行\\房产估值\\指导价\\深圳政府指导价_补充.xlsx", { d -> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鎸囧浠穃\娣卞湷鏀垮簻鎸囧浠穇琛ュ厖.xlsx", { d -> if(d['C']){ def map = findAvgPrice(d['C'], cityCodeMap.get(d['E'])) if(map){ @@ -66,7 +66,7 @@ class FjwPricePkCcbPrice { def addGuidPrice(){ def cityCodeMap = CcbCommonUtils.findCityCodeValue() - ExcelUtils.multiThreadingModify("D:\\数据\\建行\\房产估值\\指导价\\深圳政府指导价_230421.xlsx", { d -> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鎸囧浠穃\娣卞湷鏀垮簻鎸囧浠穇230421.xlsx", { d -> if(d['M']){ def map = findGuidePrice(d['C'], d['E']) if(map){ @@ -79,7 +79,7 @@ class FjwPricePkCcbPrice { def addCcbPrice3(){ def cityCodeMap = CcbCommonUtils.findCityCodeValue() - ExcelUtils.multiThreadingModify("D:\\数据\\瑞丰\\金华、绍兴国信达查价_最新建行价格.xlsx", { d -> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\鐟炰赴\\閲戝崕銆佺粛鍏村浗淇¤揪鏌ヤ环_鏈�鏂板缓琛屼环鏍�.xlsx", { d -> if(d['A']){ def dist = CommonDatautils.findDistrict(d['A'], d['B'], d['C'], "district") if(dist){ @@ -96,7 +96,7 @@ class FjwPricePkCcbPrice { } def addMarketPrice(){ - ExcelUtils.modify("C:\\Users\\gaojuan\\Desktop\\拍卖南京.xlsx",{d-> + ExcelUtils.modify("C:\\Users\\gaojuan\\Desktop\\鎷嶅崠鍗椾含.xlsx",{d-> if(d['D']) { d['K'] = d['D'] }else if(d['H']){ @@ -107,20 +107,20 @@ class FjwPricePkCcbPrice { } def addNewDistPrice(){ - ExcelUtils.multiThreadingModify("D:\\数据\\建行\\房产估值\\指导价\\新楼盘添加指导价.xlsx",{d-> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鎸囧浠穃\鏂版ゼ鐩樻坊鍔犳寚瀵间环.xlsx",{d-> // def map = findCommunityByEs(d['B'], d['C'], d['D']) // if(map){ -// if(map.get("安居客-新房")){ -// def dbo = map.get("安居客-新房") +// if(map.get("瀹夊眳瀹�-鏂版埧")){ +// def dbo = map.get("瀹夊眳瀹�-鏂版埧") // d['F'] = dbo.avg_price // d['G'] = dbo.open_date // } -// if(map.get("贝壳找房-新房")){ -// def dbo = map.get("贝壳找房-新房") +// if(map.get("璐濆3鎵炬埧-鏂版埧")){ +// def dbo = map.get("璐濆3鎵炬埧-鏂版埧") // d['H'] = dbo.avg_price // d['I'] = dbo.open_date -// }else if(map.get("楼盘网-新房")){ -// def dbo = map.get("楼盘网-新房") +// }else if(map.get("妤肩洏缃�-鏂版埧")){ +// def dbo = map.get("妤肩洏缃�-鏂版埧") // d['J'] = dbo.avg_price // d['K'] = dbo.open_date // } @@ -131,21 +131,21 @@ class FjwPricePkCcbPrice { d['N'] = dbo.avg_price if(dbo.value_type == 1){ - d['O'] = "指导价" + d['O'] = "鎸囧浠�" }else if(dbo.value_type == 2){ - d['O'] = "自身样本" + d['O'] = "鑷韩鏍锋湰" }else if(dbo.value_type == 3){ - d['O'] = "第三方" + d['O'] = "绗笁鏂�" }else if(dbo.value_type == 4){ - d['O'] = "交易数据" + d['O'] = "浜ゆ槗鏁版嵁" }else if(dbo.value_type == 5){ - d['O'] = "周边楼盘" + d['O'] = "鍛ㄨ竟妤肩洏" }else if(dbo.value_type == 6){ - d['O'] = "推导" + d['O'] = "鎺ㄥ" }else if(dbo.value_type == 9){ - d['O'] = "神经网络" + d['O'] = "绁炵粡缃戠粶" }else if(dbo.value_type == 10){ - d['O'] = "无方式" + d['O'] = "鏃犳柟寮�" }else{ d['O'] = "" } @@ -164,7 +164,7 @@ class FjwPricePkCcbPrice { def addCcbPrice(){ def cityCodeDataMap = CcbCommonUtils.findCityCodeValue() - ExcelUtils.multiThreadingModify("D:\\数据\\建行\\房产估值\\指导价\\新老算法价格差异大小区.xlsx",{d-> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鎸囧浠穃\鏂拌�佺畻娉曚环鏍煎樊寮傚ぇ灏忓尯.xlsx",{d-> if(d['B']){ def cityId = cityCodeDataMap.get(d['B']) def dist = CommonDatautils.findDistrict(d['B'], d['C'], d['D'], "district") @@ -187,7 +187,7 @@ class FjwPricePkCcbPrice { def addCcbPriceFromGuided(){ def cityCodeDataMap = CcbCommonUtils.findCityCodeValue() - ExcelUtils.multiThreadingModify("D:\\数据\\建行\\二期\\人工指导价2.xls",{d-> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\寤鸿\\浜屾湡\\浜哄伐鎸囧浠�2.xls",{d-> if(d['B'] && !d['O']){ def cityId = d['D'] def dist = CommonDatautils.findDistrictById(d['B']) @@ -206,7 +206,7 @@ class FjwPricePkCcbPrice { def updatePrice(){ def index = 0 - ExcelUtils.multiThreadingModify("D:\\数据\\建行\\测试\\ccb.xlsx",{d-> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\寤鸿\\娴嬭瘯\\ccb.xlsx",{d-> index++ println index def dbo = CommonDatautils.queryDistrictPrice(d['B'], d['C'], d['D'], DateUtils.parseFromTightByPattern('2022-09-04','yyyy-MM-dd')) @@ -217,7 +217,7 @@ class FjwPricePkCcbPrice { } def addFjwPrice(){ - ExcelUtils.multiThreadingModify("D:\\数据\\建行\\房产估值\\指导价\\录入人工指导价_0526.xlsx",{d-> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鎸囧浠穃\褰曞叆浜哄伐鎸囧浠穇0526.xlsx",{d-> if(!d['N']){ def dist = CommonDatautils.findDistrictById(d['E']) if(dist){ @@ -234,7 +234,7 @@ class FjwPricePkCcbPrice { } def standRegion(){ - ExcelUtils.multiThreadingModify("C:\\Users\\gaojuan\\Downloads\\高德写字楼.xlsx",{d-> + ExcelUtils.multiThreadingModify("C:\\Users\\gaojuan\\Downloads\\楂樺痉鍐欏瓧妤�.xlsx",{d-> if(d['A']){ def city = RegionData.formatCity(d['A']) if(city){ @@ -249,9 +249,9 @@ class FjwPricePkCcbPrice { def run(){ def ccbPrices = getCommunityBasePriceGj(202208) - println "ccb总量:"+ccbPrices.size() + println "ccb鎬婚噺锛�"+ccbPrices.size() def fjwPriceMap = CommonDatautils.queryAllDistrictPrice(DateUtils.parseFromTightByPattern('2022-09-04','yyyy-MM-dd')) - println "fjw总量:"+ccbPrices.size() + println "fjw鎬婚噺锛�"+ccbPrices.size() def totalCount = new AtomicLong() final CountDownLatch latch = new CountDownLatch(ccbPrices.size()) @@ -283,21 +283,21 @@ class FjwPricePkCcbPrice { row << fjwCalPrice if(priceMap && priceMap.value_type){ if(priceMap.value_type == 1){ - row << "指导价" + row << "鎸囧浠�" }else if(priceMap.value_type == 2){ - row << "自身样本" + row << "鑷韩鏍锋湰" }else if(priceMap.value_type == 3){ - row << "第三方" + row << "绗笁鏂�" }else if(priceMap.value_type == 4){ - row << "交易数据" + row << "浜ゆ槗鏁版嵁" }else if(priceMap.value_type == 5){ - row << "周边楼盘" + row << "鍛ㄨ竟妤肩洏" }else if(priceMap.value_type == 6){ - row << "推导" + row << "鎺ㄥ" }else if(priceMap.value_type == 9){ - row << "神经网络" + row << "绁炵粡缃戠粶" }else if(priceMap.value_type == 10){ - row << "无方式" + row << "鏃犳柟寮�" }else{ row << "" } @@ -316,7 +316,7 @@ class FjwPricePkCcbPrice { rets << row }else{ - println rMap.commId + " 没找到小区" + println rMap.commId + " 娌℃壘鍒板皬鍖�" } println totalCount.get()+" "+ rMap.cityname +" "+rMap.commname } catch (Exception e) { @@ -330,8 +330,8 @@ class FjwPricePkCcbPrice { latch.await(); - def headers = ["小区ID","城市","区域","小区名","房价网价格","房价网预期价格","房价网计算方式","建行价格","建行计算方式","价格差比(房价网价格-建行价格)*100/建行价格"] - batchCreateFile(rets, "D:\\数据\\建行\\测试\\房价网与建行均价比对.csv",headers,"GBK") + def headers = ["灏忓尯ID","鍩庡競","鍖哄煙","灏忓尯鍚�","鎴夸环缃戜环鏍�","鎴夸环缃戦鏈熶环鏍�","鎴夸环缃戣绠楁柟寮�","寤鸿浠锋牸","寤鸿璁$畻鏂瑰紡","浠锋牸宸瘮(鎴夸环缃戜环鏍�-寤鸿浠锋牸)*100/寤鸿浠锋牸"] + batchCreateFile(rets, "D:\\鏁版嵁\\寤鸿\\娴嬭瘯\\鎴夸环缃戜笌寤鸿鍧囦环姣斿.csv",headers,"GBK") } @@ -348,14 +348,14 @@ class FjwPricePkCcbPrice { map.year_month = r.YEAR_MONTH map.calc_avg_price = r.CALC_AVG_PRICE map.avg_price = r.AVG_PRICE - // 计算类型,1:人工估值 2:样本计算 3:神经网络 + // 璁$畻绫诲瀷,1:浜哄伐浼板�� 2:鏍锋湰璁$畻 3:绁炵粡缃戠粶 if(r.CALC_TYPE){ if(r.CALC_TYPE == 1){ - map.calc_type = "人工估值" + map.calc_type = "浜哄伐浼板��" }else if(r.CALC_TYPE == 2){ - map.calc_type = "样本计算" + map.calc_type = "鏍锋湰璁$畻" }else if(r.CALC_TYPE == 3){ - map.calc_type = "神经网络" + map.calc_type = "绁炵粡缃戠粶" } } allRows << map @@ -369,14 +369,14 @@ class FjwPricePkCcbPrice { def map = [:] sqlInstance236.eachRow(sql, { r -> map.avg_price = r.AVG_PRICE - // 计算类型,1:人工估值 2:样本计算 3:神经网络 + // 璁$畻绫诲瀷,1:浜哄伐浼板�� 2:鏍锋湰璁$畻 3:绁炵粡缃戠粶 if(r.CALC_TYPE){ if(r.CALC_TYPE == 1){ - map.calc_type = "人工估值" + map.calc_type = "浜哄伐浼板��" }else if(r.CALC_TYPE == 2){ - map.calc_type = "样本计算" + map.calc_type = "鏍锋湰璁$畻" }else if(r.CALC_TYPE == 3){ - map.calc_type = "神经网络" + map.calc_type = "绁炵粡缃戠粶" } } map.credit = r.CONFIDENCE @@ -403,10 +403,10 @@ class FjwPricePkCcbPrice { println index if(index%10000==0){ - println index+"开始写入CSV "+new Date().toLocaleString() + println index+"寮�濮嬪啓鍏SV "+new Date().toLocaleString() out.write(sb.toString().getBytes(charset)); sb.setLength(0) - println index+"结束写入CSV "+new Date().toLocaleString() + println index+"缁撴潫鍐欏叆CSV "+new Date().toLocaleString() } } @@ -419,14 +419,14 @@ class FjwPricePkCcbPrice { } def exportFjwPriceAndCcbPrice(){ - def citys = ["杭州"] + def citys = ["鏉窞"] for(def c : citys){ def districts = CommonDatautils.findAllDistricts(c, "district", ["city", "region", "name"]); println c +" "+districts.size() def fjwPriceMap = CommonDatautils.queryAllDistrictPrice(DateUtils.parseFromTightByPattern('2023-03-05','yyyy-MM-dd')) def cityCodeMap = CcbCommonUtils.findCityCodeValue() def rets = [] - rets << ["城市","区域","名称","房价网价格","房价网计算方式","建行价格","建行计算方式","建行计算时间"] + rets << ["鍩庡競","鍖哄煙","鍚嶇О","鎴夸环缃戜环鏍�","鎴夸环缃戣绠楁柟寮�","寤鸿浠锋牸","寤鸿璁$畻鏂瑰紡","寤鸿璁$畻鏃堕棿"] for(def dist : districts ){ def priceMap = fjwPriceMap.get(dist.city+"##"+dist.region+"##"+dist.name) def ret = [] @@ -436,21 +436,21 @@ class FjwPricePkCcbPrice { if(priceMap){ ret << priceMap.avg_price if(priceMap.value_type == 1){ - ret << "指导价" + ret << "鎸囧浠�" }else if(priceMap.value_type == 2){ - ret << "自身样本" + ret << "鑷韩鏍锋湰" }else if(priceMap.value_type == 3){ - ret << "第三方" + ret << "绗笁鏂�" }else if(priceMap.value_type == 4){ - ret << "交易数据" + ret << "浜ゆ槗鏁版嵁" }else if(priceMap.value_type == 5){ - ret << "周边楼盘" + ret << "鍛ㄨ竟妤肩洏" }else if(priceMap.value_type == 6){ - ret << "推导" + ret << "鎺ㄥ" }else if(priceMap.value_type == 9){ - ret << "神经网络" + ret << "绁炵粡缃戠粶" }else if(priceMap.value_type == 10){ - ret << "无方式" + ret << "鏃犳柟寮�" }else{ ret << "" } @@ -467,8 +467,8 @@ class FjwPricePkCcbPrice { } rets << ret } - ExcelUtils.write("d:\\数据\\瑞丰\\杭州价格.xlsx",rets, c) - println c+" 导出完成" + ExcelUtils.write("d:\\鏁版嵁\\鐟炰赴\\鏉窞浠锋牸.xlsx",rets, c) + println c+" 瀵煎嚭瀹屾垚" } } @@ -482,11 +482,11 @@ class FjwPricePkCcbPrice { map.month = r.gujiabds_clc_yrmo_val map.credit_value = r.gujia_bds_cfdc_dgr if(r.gujia_bds_clmtd == 1){ - map.calc_type = "人工估值" + map.calc_type = "浜哄伐浼板��" }else if(r.gujia_bds_clmtd == 2){ - map.calc_type = "样本计算" + map.calc_type = "鏍锋湰璁$畻" }else if(r.gujia_bds_clmtd == 3){ - map.calc_type = "神经网络" + map.calc_type = "绁炵粡缃戠粶" } }) 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 0dd9765b2..8aea229c3 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 @@ -20,8 +20,8 @@ import java.util.concurrent.Executors import java.util.concurrent.atomic.AtomicLong import org.bson.types.ObjectId /** - * 建行模型估值项目 - * 人工指导价同步 + * 寤鸿妯″瀷浼板�奸」鐩� + * 浜哄伐鎸囧浠峰悓姝� */ @BatchOwner(Watcher.GaoJuan) @@ -53,10 +53,10 @@ class GuiDingPriceBatch extends BaseBatch{ def cityCodeDatas = CcbCommonUtils.findCityCodeValue() def distCodeMap = CcbCommonUtils.findAllDistrictCodeValue(city) - //添加自己库中的人工指导价 + //娣诲姞鑷繁搴撲腑鐨勪汉宸ユ寚瀵间环 // def prices = CcbCommonUtils.findPersonPrice(city, "2024-05-24", "2024-06-27") // def prices = CcbCommonUtils.findPersonPrice(city, "2022-01-01", "2022-11-22") - //近3个月人工指导价 + //杩�3涓湀浜哄伐鎸囧浠� def end = DateUtils.add(DateUtils.formatDateByPattern(new Date(),"yyyy-MM-dd"), 1) def start = DateUtils.add(DateUtils.formatDateByPattern(new Date(),"yyyy-MM-dd"), -90) def prices = CcbCommonUtils.findPersonPrice(city, start, end) @@ -67,14 +67,14 @@ class GuiDingPriceBatch extends BaseBatch{ println city + " " + rets.size() } - //添加搜房的参考价 + //娣诲姞鎼滄埧鐨勫弬鑰冧环 // def districts = CcbCommonUtils.findAllDistrictByCity(city, "district", ["city", "region", "name", "lng","estate_type2","name_cat", "alias"]); // def datas = findFangDatas(districts) // def fangRets = createDatas(cityCodeDatas, distCodeMap, datas) // rows.addAll(fangRets) - //添加保亭文昌的指导价 -// def cityDatas = ExcelUtils.read("D:\\数据\\建行\\房产估值\\文昌-保亭待调查小区价格 - 210902(1).xlsx") + //娣诲姞淇濅涵鏂囨槍鐨勬寚瀵间环 +// def cityDatas = ExcelUtils.read("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏂囨槍-淇濅涵寰呰皟鏌ュ皬鍖轰环鏍� - 210902(1).xlsx") // def cityDataMap = [:] // for(def d : cityDatas){ // cityDataMap.put(d['A'], d['E']) @@ -85,9 +85,9 @@ class GuiDingPriceBatch extends BaseBatch{ } - def headers = []//["第三方均价ID","楼盘ID","小区名称","城市ID","城市名称","行政区ID","行政区名称","指导日期","指导价格","添加人","备注","创建时间","更新时间","来源公司"] - println "人工指导价总计:"+rows.size() -// FileUtils.batchCreateFile(rows, "d:\\数据\\建行\\房产估值\\数据文件\\txt\\GUIDED_PRICE_GJ.dat", headers, "utf-8", false); + def headers = []//["绗笁鏂瑰潎浠稩D","妤肩洏ID","灏忓尯鍚嶇О","鍩庡競ID","鍩庡競鍚嶇О","琛屾斂鍖篒D","琛屾斂鍖哄悕绉�","鎸囧鏃ユ湡","鎸囧浠锋牸","娣诲姞浜�","澶囨敞","鍒涘缓鏃堕棿","鏇存柊鏃堕棿","鏉ユ簮鍏徃"] + println "浜哄伐鎸囧浠锋�昏锛�"+rows.size() +// FileUtils.batchCreateFile(rows, "d:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\GUIDED_PRICE_GJ.dat", headers, "utf-8", false); saveToPgSql(rows) // @@ -98,7 +98,7 @@ class GuiDingPriceBatch extends BaseBatch{ def findFangDatas(def districts){ def totalCount = new AtomicLong() final CountDownLatch latch = new CountDownLatch(districts.size()) - println " 小区量:"+districts.size() + println " 灏忓尯閲忥細"+districts.size() def result = Collections.synchronizedList(new ArrayList()); for(def i=0;i def newRegion = RegionData.formatRegion(city, d['A']) if(newRegion){ @@ -137,7 +137,7 @@ class LoadGuide { o.match_city = d['D'] o.match_region = d['E'] o.match_name = d['F'] - o.source_type = 1 //1:成交参考价 2:参考价 + o.source_type = 1 //1:鎴愪氦鍙傝�冧环 2锛氬弬鑰冧环 o.c_date = new Date() rets << o } @@ -162,7 +162,7 @@ class LoadGuide { o.match_region = d['F'] o.match_name = d['G'] // o.house_count = d['C'].toString().toDouble().toInteger() - o.source_type = 1 //1:成交参考价 2:参考价 + o.source_type = 1 //1:鎴愪氦鍙傝�冧环 2锛氬弬鑰冧环 o.c_date = new Date() rets << o } @@ -185,7 +185,7 @@ class LoadGuide { o.match_city = d['E'] o.match_region = d['F'] o.match_name = d['G'] - o.source_type = 1 //1:成交参考价 2:参考价 + o.source_type = 1 //1:鎴愪氦鍙傝�冧环 2锛氬弬鑰冧环 o.c_date = new Date() rets << o } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/LocationUpdate.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/LocationUpdate.groovy index a34e7f2d7..4c6d78428 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/LocationUpdate.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/LocationUpdate.groovy @@ -17,7 +17,7 @@ class LocationUpdate { def run(){ def index = 0 - ExcelUtils.modify("D:\\数据\\建行\\房产估值\\经纬度\\经纬度人工核实结果_0923.xlsx",{d-> + ExcelUtils.modify("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\缁忕含搴\缁忕含搴︿汉宸ユ牳瀹炵粨鏋淿0923.xlsx",{d-> index++ if(d['C']){ @@ -45,7 +45,7 @@ class LocationUpdate { DbUtils.seaweed.update(new BasicDBObject('_id',obj._id),new BasicDBObject('$set',q)) }else{ - println d['A']+" "+d['B']+" "+d['C']+" 没找到小区" + println d['A']+" "+d['B']+" "+d['C']+" 娌℃壘鍒板皬鍖�" } }else{ def obj = CommonDatautils.findDistrict(d['A'], region, d['C'], "district") @@ -54,7 +54,7 @@ class LocationUpdate { q.put("m_date", new Date()) DbUtils.seaweed.update(new BasicDBObject('_id',obj._id),new BasicDBObject('$set',q)) }else{ - println d['A']+" "+d['B']+" "+d['C']+" 没找到小区" + println d['A']+" "+d['B']+" "+d['C']+" 娌℃壘鍒板皬鍖�" } } @@ -65,7 +65,7 @@ class LocationUpdate { q.put("m_date", new Date()) DbUtils.seaweed.update(new BasicDBObject('_id',obj._id),new BasicDBObject('$set',q)) }else{ - println d['A']+" "+d['B']+" "+d['C']+" 没找到小区" + println d['A']+" "+d['B']+" "+d['C']+" 娌℃壘鍒板皬鍖�" } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/OracleDistrict2Mongo85.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/OracleDistrict2Mongo85.groovy index 93f18dfce..72ac06f1d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/OracleDistrict2Mongo85.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/OracleDistrict2Mongo85.groovy @@ -30,7 +30,7 @@ import java.util.concurrent.Executors import java.util.concurrent.atomic.AtomicLong /** - * oracle中小区统计数据同步至85中 + * oracle涓皬鍖虹粺璁℃暟鎹悓姝ヨ嚦85涓� */ class OracleDistrict2Mongo85 { @@ -40,7 +40,7 @@ class OracleDistrict2Mongo85 { static final DBCollection communityPoiConn = MongoUtils.getCollectionByName("fangjia_stat", "community_poi_gj", "192.168.0.85", 28017) static main(args) { - // 只写入重庆市数据 + // 鍙啓鍏ラ噸搴嗗競鏁版嵁 def sql = "select cityid, distname, commid, commname, subway, traffic, bank, primary, junior, hospital, funeral from COMMUNITY_POI_GJ" def count = 0 sqlInstance.eachRow(sql, { r -> @@ -60,7 +60,7 @@ class OracleDistrict2Mongo85 { communityPoiConn.update(dbObject, updateObject, true, false) count++; if (count % 500 == 0) { - println "已写入" + count + "条小区数据" + println "宸插啓鍏�" + count + "鏉″皬鍖烘暟鎹�" } }); } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/OracleDistrictBasePrice2Mongo85.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/OracleDistrictBasePrice2Mongo85.groovy index a824a3d7e..8ff54a8cc 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/OracleDistrictBasePrice2Mongo85.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/OracleDistrictBasePrice2Mongo85.groovy @@ -17,7 +17,7 @@ import com.mongodb.DBObject import groovy.sql.Sql /** - * oracle中小区置信度数据同步至85中 + * oracle涓皬鍖虹疆淇″害鏁版嵁鍚屾鑷�85涓� */ class OracleDistrictBasePrice2Mongo85 { @@ -42,10 +42,10 @@ class OracleDistrictBasePrice2Mongo85 { communityBasePriceConn.update(dbObject, updateObject, true, false) count++; } else { - print "置信度为空:" + r.toString() + print "缃俊搴︿负绌�:" + r.toString() } if (count % 500 == 0) { - println "已写入" + count + "条小区数据" + println "宸插啓鍏�" + count + "鏉″皬鍖烘暟鎹�" } }); } 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 0a1584be9..2ae4d3f71 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 @@ -3,7 +3,7 @@ package com.fangjia.script.ccbevaluation import groovy.sql.Sql /** - * 建行使用 + * 寤鸿浣跨敤 */ class PgsqlCommUtils { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/StagingDistrictBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/StagingDistrictBatch.groovy index 82d2c96c0..2c455686b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/StagingDistrictBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/StagingDistrictBatch.groovy @@ -13,8 +13,8 @@ import groovy.sql.Sql import org.bson.types.ObjectId /** - * 建行模型估值项目 - * 分期数据同步 + * 寤鸿妯″瀷浼板�奸」鐩� + * 鍒嗘湡鏁版嵁鍚屾 */ @BatchOwner(Watcher.GaoJuan) class StagingDistrictBatch extends BaseBatch{ @@ -35,20 +35,20 @@ class StagingDistrictBatch extends BaseBatch{ def fenQiMap = getFenQiMap(dists); def rets = createCityData(dists, fenQiMap) rows.addAll(rets) - println city +" 分期量:"+rets.size() + println city +" 鍒嗘湡閲忥細"+rets.size() } def fileName = "/home/goojia/ccb/COMMUNITY_STAGING_GJ.dat" if(CommonDatautils.isWindow()){ - fileName = "d:\\数据\\建行\\房产估值\\数据文件\\txt\\COMMUNITY_STAGING_GJ.dat" + fileName = "d:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\COMMUNITY_STAGING_GJ.dat" } def results =[] - def headers = []//["分期ID","小区ID","小区主期ID","备注","创建时间","更新时间","来源公司"] + def headers = []//["鍒嗘湡ID","灏忓尯ID","灏忓尯涓绘湡ID","澶囨敞","鍒涘缓鏃堕棿","鏇存柊鏃堕棿","鏉ユ簮鍏徃"] results << headers results.addAll(rows) - //ExcelUtils.write("d:\\数据\\建行\\房产估值\\数据文件\\excel\\COMMUNITY_STAGING_GJ.xlsx", results, "数据") + //ExcelUtils.write("d:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\excel\\COMMUNITY_STAGING_GJ.xlsx", results, "鏁版嵁") FileUtils.batchCreateFile(rows, fileName,headers, "utf-8", false); saveToPgSql(rows) 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 ce47aa8db..4f53b5281 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 @@ -50,11 +50,11 @@ def DBCollection youda_esfhouse_coll = MongoUtils.getCollectionByName2("business def pgsqlInstance = Sql.newInstance("jdbc:postgresql://192.168.0.236:5432/warehouse", "postgres", "postgres", "org.postgresql.Driver") -//def citys = ["山南","黄南州","甘南","克孜勒苏","嘉峪关","海北州","阿拉善盟","怒江州","和田","日喀则","昌都","海南州","玉树州","吐鲁番","阿勒泰","三沙","塔城","甘孜州","果洛州","林芝","那曲","阿坝州","神农架"] +//def citys = ["灞卞崡","榛勫崡宸�","鐢樺崡","鍏嬪瓬鍕掕嫃","鍢夊唱鍏�","娴峰寳宸�","闃挎媺鍠勭洘","鎬掓睙宸�","鍜岀敯","鏃ュ杸鍒�","鏄岄兘","娴峰崡宸�","鐜夋爲宸�","鍚愰瞾鐣�","闃垮嫆娉�","涓夋矙","濉斿煄","鐢樺瓬宸�","鏋滄礇宸�","鏋楄姖","閭f洸","闃垮潩宸�","绁炲啘鏋�"] //def cityCodeDataMap = CcbCommonUtils.findCityCodeValue() -//ExcelUtils.multiThreadingModify("D:\\数据\\小区\\小区地址名单_估家科技V2 (3).xlsx",{d-> +//ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\灏忓尯\\灏忓尯鍦板潃鍚嶅崟_浼板绉戞妧V2 (3).xlsx",{d-> // if(d['J']){ // def cityId = cityCodeDataMap.get(d['H']) // def map = findCcbPriceCredit(sqlInstance236, cityId, d['J']) @@ -102,7 +102,7 @@ def pgsqlInstance = Sql.newInstance("jdbc:postgresql://192.168.0.236:5432/wareho //} def findThirdPriceBySource(sqlInstance, cityid, commid){ - def sql = "select * from (select data_source, price_date, community_price,commid from bigdata_third_party_price_gj where cityid='${cityid}' and commid='${commid}' and data_source in ('贝壳','链家') \n" + + def sql = "select * from (select data_source, price_date, community_price,commid from bigdata_third_party_price_gj where cityid='${cityid}' and commid='${commid}' and data_source in ('璐濆3','閾惧') \n" + "order by price_date desc) WHERE ROWNUM <= 1" def map = [:] sqlInstance.eachRow(sql,{r-> @@ -152,7 +152,7 @@ def findAllPriceDist(sqlInstance236, cityid, yearMonth){ }) return commids } -//def citys = ['苏州','杭州','宁波','温州','嘉兴','湖州','绍兴','金华','衢州','舟山','台州','丽水'] +//def citys = ['鑻忓窞','鏉窞','瀹佹尝','娓╁窞','鍢夊叴','婀栧窞','缁嶅叴','閲戝崕','琛㈠窞','鑸熷北','鍙板窞','涓芥按'] // //def cityCodeDataMap = CcbCommonUtils.findCityCodeValue() //def rets = [] @@ -186,7 +186,7 @@ def findAllPriceDist(sqlInstance236, cityid, yearMonth){ // rets << [c, totalCount, landAreaPre, buildAreaPre, greeningratePre, plotratioPre] //} // -//ExcelUtils.write("D:\\数据\\建行\\测试\\12城覆盖率统计.xlsx",rets, "覆盖率") +//ExcelUtils.write("D:\\鏁版嵁\\寤鸿\\娴嬭瘯\\12鍩庤鐩栫巼缁熻.xlsx",rets, "瑕嗙洊鐜�") def findAllData(sqlInstance236, citycode){ def sql = "select landarea,buildarea,greeningrate,plotratio from bigdata_community_fjw where cityid='${citycode}'" @@ -199,7 +199,7 @@ def findAllData(sqlInstance236, citycode){ } -//ExcelUtils.modify("D:\\数据\\建行\\保定202406.xlsx", { d -> +//ExcelUtils.modify("D:\\鏁版嵁\\寤鸿\\淇濆畾202406.xlsx", { d -> // if(d['G']){ // def obj = CommonDatautils.findDistrictById(d['G']) // if(obj){ @@ -214,12 +214,12 @@ def findAllData(sqlInstance236, citycode){ ////def s = DataHandleUtils.findMatchPattern(name, "https://\\w+.anjuke.com") ////println s // -////def districts = CommonDatautils.findAllFiledDistrict("district", "南宁") +////def districts = CommonDatautils.findAllFiledDistrict("district", "鍗楀畞") ////for(def d : districts){ //// println d.name ////} // -////def dists = CommonDatautils.findAllDistrictByCity("南宁", "district", ["city","region","name"]) +////def dists = CommonDatautils.findAllDistrictByCity("鍗楀畞", "district", ["city","region","name"]) ////for(def d : dists){ //// def o = CommonDatautils.findDistrictById(d._id.toString()) //// println o._id.toString() + " "+o.name @@ -239,8 +239,8 @@ def findAllData(sqlInstance236, citycode){ //// println city +" "+count ////} // -////def fileName = "d:\\数据\\建行\\房产估值\\基础数据交付情况_0927(1).xlsx" -////def datas = ExcelUtils.read("d:\\数据\\建行\\房产估值\\7月成交.xlsx",0,1) +////def fileName = "d:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鍩虹鏁版嵁浜や粯鎯呭喌_0927(1).xlsx" +////def datas = ExcelUtils.read("d:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\7鏈堟垚浜�.xlsx",0,1) ////def dealMap = [:] ////for(def d : datas){ //// dealMap.put(d['A'], d['B']) @@ -254,9 +254,9 @@ def findAllData(sqlInstance236, citycode){ // // // -////def fileName = "d:\\数据\\建行\\房产估值\\基础数据交付情况_0910.xlsx" +////def fileName = "d:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鍩虹鏁版嵁浜や粯鎯呭喌_0910.xlsx" // -////def datas = ExcelUtils.read("d:\\数据\\建行\\房产估值\\小区字段.xlsx",0,1) +////def datas = ExcelUtils.read("d:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\灏忓尯瀛楁.xlsx",0,1) ////def dealMap = [:] ////for(def d : datas){ //// def map = [:] @@ -272,7 +272,7 @@ def findAllData(sqlInstance236, citycode){ ////} // ////def cityCodeDatas = CcbCommonUtils.findCityCodeValue() -//////小区量 +//////灏忓尯閲� ////ExcelUtils.multiThreadingModify(fileName, { d -> //// def city = d['B'] //// if (city) { @@ -282,7 +282,7 @@ def findAllData(sqlInstance236, citycode){ //// } ////},0) // -//////小区字段覆盖率 +//////灏忓尯瀛楁瑕嗙洊鐜� ////ExcelUtils.multiThreadingModify(fileName,{d-> //// def city = d['A'] //// if(city){ @@ -323,7 +323,7 @@ def findAllData(sqlInstance236, citycode){ //// } ////},1) // -////def fileName = "D:\\数据\\建行\\房产估值\\上海成交.xlsx" +////def fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\涓婃捣鎴愪氦.xlsx" ////def datas =ExcelUtils.read(fileName,0,1) ////def index = 0 ////def rows = [] @@ -358,8 +358,8 @@ def findAllData(sqlInstance236, citycode){ ////// } ////// } ////} -////ExcelUtils.write("D:\\数据\\建行\\房产估值\\成交本次未使用的记录.xlsx", rows, "数据") -////println "共查到:"+index +////ExcelUtils.write("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鎴愪氦鏈鏈娇鐢ㄧ殑璁板綍.xlsx", rows, "鏁版嵁") +////println "鍏辨煡鍒帮細"+index // // //def index = 0 @@ -368,11 +368,11 @@ def findAllData(sqlInstance236, citycode){ ////cityCodeDatas.each{city,cityId-> //// //// deleteThirdByCityId(cityId, 202207, sqlInstance236) -//// println city + "完成" +//// println city + "瀹屾垚" ////} // // -//def lines = org.apache.commons.io.FileUtils.readLines(new File("D:\\数据\\建行\\房产估值\\数据文件\\txt\\GUIDED_PRICE_GJ.dat")) +//def lines = org.apache.commons.io.FileUtils.readLines(new File("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\GUIDED_PRICE_GJ.dat")) //for(line in lines) { // def arrs = line.toString().split("\\|@\\|") // if(arrs){ @@ -385,20 +385,20 @@ def findAllData(sqlInstance236, citycode){ // def sql = "delete from bigdata_third_party_price_gj where cityid='${cityId}' and price_date=${price_date}" // sqlInstance236.executeUpdate(sql) //} -////ExcelUtils.multiThreadingModify("D:\\数据\\建行\\删除小区2022-8-23.xlsx", { d -> +////ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\寤鸿\\鍒犻櫎灏忓尯2022-8-23.xlsx", { d -> //// if (d['C']) { //// index ++T //// def cityId = cityCodeDatas.get(d['A']) //// def sources = findThirdSource(cityId, d['C'], 202207, sqlInstance236) //// if(sources.size()>1){ -//// if(sources.contains("安居客") && sources.contains("58同城")){ -//// sources.remove("58同城") -//// }else if(sources.contains("链家") && sources.contains("贝壳")){ -//// sources.remove("贝壳") +//// if(sources.contains("瀹夊眳瀹�") && sources.contains("58鍚屽煄")){ +//// sources.remove("58鍚屽煄") +//// }else if(sources.contains("閾惧") && sources.contains("璐濆3")){ +//// sources.remove("璐濆3") //// } //// } //// if(sources.size()==1){ -//// println index +" 删除 "+ d['C']+" ${d['A']}:"+ cityId +//// println index +" 鍒犻櫎 "+ d['C']+" ${d['A']}:"+ cityId //// deleteThirdParty(cityId, d['C'], 202207, sqlInstance236) //// } //// } @@ -436,7 +436,7 @@ def findAllData(sqlInstance236, citycode){ // // //def findAvmData(sqlInstance, def region, def name, def area, def price, def dealdate){ -// def sql = "select count(*) as count from avm_evaluation_item_gj where year_month=202106 and data_type='成交' and cityname='上海' and distname='${region}' and commname='${name}' and buildarea=${area} and dealdate=to_date('${dealdate}','yyyy-MM-dd') and target_avg_price=${price}" +// def sql = "select count(*) as count from avm_evaluation_item_gj where year_month=202106 and data_type='鎴愪氦' and cityname='涓婃捣' and distname='${region}' and commname='${name}' and buildarea=${area} and dealdate=to_date('${dealdate}','yyyy-MM-dd') and target_avg_price=${price}" // def count = 0 // sqlInstance.eachRow(sql,{r-> // count = r.count @@ -474,7 +474,7 @@ def findAllData(sqlInstance236, citycode){ //} // // -////def fileName = "D:\\数据\\建行\\房产估值\\成交\\成交数据_1222 - 副本.xlsx" +////def fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鎴愪氦\\鎴愪氦鏁版嵁_1222 - 鍓湰.xlsx" ////def dealMap = findDealCount(sqlInstance236, "2022-02-01", "2022-03-01") ////def testMap = findCaluateCityPPE(sqlInstance236, 202203) ////ExcelUtils.modify(fileName,{d-> @@ -495,7 +495,7 @@ def findAllData(sqlInstance236, citycode){ //// datas< +////ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\灏忓尯\\5涓煄甯傚皬鍖哄垪琛�0723(1).xlsx",{d-> //// if(d['I'] && d['K']){ -//// def dist = CommonDatautils.findDistrict("上海",d['I'], d['K'], "district") +//// def dist = CommonDatautils.findDistrict("涓婃捣",d['I'], d['K'], "district") //// if(dist){ //// d['S'] = dist._id.toString() //// } //// } ////},0) // -////0-正常 1-非小区,2-地块, 3-无效小区,7-自然村 9-高德比对王一期不存在删除 -////ExcelUtils.multiThreadingModify("D:\\数据\\建行\\房产估值\\小区\\27城一期数据.xlsx",{d-> +////0-姝e父 1-闈炲皬鍖猴紝2-鍦板潡锛� 3-鏃犳晥灏忓尯锛�7-鑷劧鏉� 9-楂樺痉姣斿鐜嬩竴鏈熶笉瀛樺湪鍒犻櫎 +////ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\灏忓尯\\27鍩庝竴鏈熸暟鎹�.xlsx",{d-> //// if(d['A']){ //// def obj = CommonDatautils.findDistrictById(d['A']) -//// if(obj && obj.name.contains("一期")){ -//// def newName = obj.name.toString().substring(0, obj.name.indexOf("一期")) +//// if(obj && obj.name.contains("涓�鏈�")){ +//// def newName = obj.name.toString().substring(0, obj.name.indexOf("涓�鏈�")) //// if(newName){ //// def masterDist = CommonDatautils.findDistrict(obj.city, obj.region, newName, "district") //// if(masterDist && masterDist.name_cat==0){ @@ -538,7 +538,7 @@ def findAllData(sqlInstance236, citycode){ //// q.put("_id", obj._id) //// DbUtils.seaweed.update(q, new BasicDBObject('$set', udata)) //// }else{ -//// d['D'] = "主名不存在" +//// d['D'] = "涓诲悕涓嶅瓨鍦�" //// } //// } //// } @@ -546,7 +546,7 @@ def findAllData(sqlInstance236, citycode){ ////},0) // ////def index = 0 -////ExcelUtils.modify("D:\\数据\\建行\\房产估值\\小区\\人工核实需删除数据\\是否独有及第三方是否存在20220217\\9370300_淄博_是否独有及第三方是否存在(删除383).xlsx",{d-> +////ExcelUtils.modify("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\灏忓尯\\浜哄伐鏍稿疄闇�鍒犻櫎鏁版嵁\\鏄惁鐙湁鍙婄涓夋柟鏄惁瀛樺湪20220217\\9370300_娣勫崥_鏄惁鐙湁鍙婄涓夋柟鏄惁瀛樺湪锛堝垹闄�383锛�.xlsx",{d-> //// def flag = d['M'] //// if(flag==0.0){ //// if(d['D']){ @@ -564,7 +564,7 @@ def findAllData(sqlInstance236, citycode){ //// ////},0) // -////ExcelUtils.modify("D:\\数据\\建行\\二期\\重庆无效小区_3159.xlsx",{d-> +////ExcelUtils.modify("D:\\鏁版嵁\\寤鸿\\浜屾湡\\閲嶅簡鏃犳晥灏忓尯_3159.xlsx",{d-> //// if(d['A']){ ////// def region = d['B'] ////// def newRegion = RegionData.formatRegion(d['A'], region) @@ -588,7 +588,7 @@ def findAllData(sqlInstance236, citycode){ ////},0) // // -////ExcelUtils.modify("D:\\数据\\建行\\二期\\重庆无效小区_3159.xlsx",{d-> +////ExcelUtils.modify("D:\\鏁版嵁\\寤鸿\\浜屾湡\\閲嶅簡鏃犳晥灏忓尯_3159.xlsx",{d-> //// if(d['A']){ ////// def region = d['B'] ////// def newRegion = RegionData.formatRegion(d['A'], region) @@ -612,7 +612,7 @@ def findAllData(sqlInstance236, citycode){ ////},0) // -//ExcelUtils.multiThreadingModify("D:\\数据\\建行\\房产估值\\删除小区.xlsx",{d-> +//ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鍒犻櫎灏忓尯.xlsx",{d-> // if(d['A']){ // def dbo = CommonDatautils.findDistrictById(d['A']) // if(dbo){ @@ -625,13 +625,13 @@ def findAllData(sqlInstance236, citycode){ // q.put("_id", dbo._id) // DbUtils.seaweed.update(q, new BasicDBObject('$set', udata)) // }else{ -// println dbo._id.toString() +" 没找到" +// println dbo._id.toString() +" 娌℃壘鍒�" // } // } //},0) -//ExcelUtils.modify("D:\\数据\\建行\\房产估值\\添加别名.xlsx",{d-> +//ExcelUtils.modify("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\娣诲姞鍒悕.xlsx",{d-> // if(d['A'] && d['B']){ // def dbo = CommonDatautils.findDistrictById(d['A']) // if(dbo){ @@ -653,23 +653,23 @@ def findAllData(sqlInstance236, citycode){ // q.put("_id", dbo._id) // DbUtils.seaweed.update(q, new BasicDBObject('$set', udata)) // }else{ -// println d['A']+" "+"别名已存在" +// println d['A']+" "+"鍒悕宸插瓨鍦�" // } // // }else{ -// println dbo._id.toString() +" 没找到" +// println dbo._id.toString() +" 娌℃壘鍒�" // } // } //}) -//def citys = ["海口","三亚","三沙","五指山","琼海","儋州","文昌","万宁","东方","定安","屯昌","澄迈","临高","白沙","昌江","乐东","陵水","保亭","琼中"] +//def citys = ["娴峰彛","涓変簹","涓夋矙","浜旀寚灞�","鐞兼捣","鍎嬪窞","鏂囨槍","涓囧畞","涓滄柟","瀹氬畨","灞槍","婢勮繄","涓撮珮","鐧芥矙","鏄屾睙","涔愪笢","闄垫按","淇濅涵","鐞间腑"] //for(def c : citys){ // def districts = CommonDatautils.findAllDistrictByCity(c, "district", ["city","name"]) // println c +" "+districts.size() //} //def cityCodeMap = CcbCommonUtils.findCityCodeValue() -//ExcelUtils.multiThreadingModify("C:\\Users\\gaojuan\\Desktop\\252城第三方均价.xlsx", { d -> +//ExcelUtils.multiThreadingModify("C:\\Users\\gaojuan\\Desktop\\252鍩庣涓夋柟鍧囦环.xlsx", { d -> //// cityCodeMap.each {k,v-> //// if(d['A'].toString()==v){ //// d['C'] = k @@ -684,7 +684,7 @@ def findAllData(sqlInstance236, citycode){ //}); //def citys = CcbCommonUtils.citys_252 -//def runCitys = ['聊城','宝鸡','韶关','阜阳','宜春','周口','河源','忻州','三门峡','永州','衢州','盘锦','白银','玉溪','达州','景德镇','鹤壁','辽阳','六盘水','张家界','海西州','兴安盟','阿坝州','那曲','西双版纳州','辽源','邯郸','平顶山','南阳','商丘','南平','黄冈','鄂尔多斯','泸州','六安','葫芦岛','潮州','宿州','庆阳','怀化','张掖','黔东南','云浮','本溪','百色','伊春','昭通','锡林郭勒盟','克拉玛依','天门','博尔塔拉','大兴安岭','潍坊','绵阳','梅州','襄阳','包头','枣庄','东营','信阳','晋中','开封','承德','茂名','荆门','红河','陇南','铁岭','黄山','咸宁','延安','广元','乌兰察布','随州','益阳','阳泉','内江','酒泉','毕节','安顺','丽江','商洛','来宾','黔西南','防城港','铜仁','儋州','崇左','衡阳','咸阳','新乡','南充','荆州','德阳','汉中','湘潭','赤峰','佳木斯','丹东','淮南','抚州','丽水','广安','亳州','昌吉','鄂州','白城','恩施','伊犁','铜陵','林芝','海东','桂林','临汾','渭南','滨州','菏泽','孝感','营口','濮阳','抚顺','自贡','新余','鸡西','钦州','淮北','安康','资阳','乌海','中卫','鹤岗','石嘴山','日喀则','昌都','德宏州','吐鲁番','阿勒泰','临沂','威海','泰安','宿迁','德州','安阳','驻马店','绥化','上饶','莆田','蚌埠','大庆','漯河','十堰','晋城','宣城','舟山','邵阳','大理','楚雄','天水','池州','松原','阜新','巴音郭楞','仙桃','武威','普洱','河池','铜川','迪庆州','潜江','贺州','塔城','济宁','江门','赣州','许昌','滁州','龙岩','运城','长治','乐山','郴州','遂宁','曲靖','呼伦贝尔','阳江','朝阳','巴彦淖尔','朔州','娄底','梧州','巴中','黔南','吴忠','临夏','凉山州','定西','萍乡','甘南','攀枝花','克孜勒苏','山南','临沧','金昌','邢台','衡水','宁德','榆林','鞍山','焦作','牡丹江','齐齐哈尔','眉山','三明','吕梁','吉安','平凉','通辽','揭阳','黄石','宜宾','延边','汕尾','玉林','通化','四平','阿克苏','贵港','白山','双鸭山','湘西','哈密','保山','鹰潭','喀什','雅安','黑河','和田','固原','阿拉善盟','七台河','嘉峪关'] +//def runCitys = ['鑱婂煄','瀹濋浮','闊跺叧','闃滈槼','瀹滄槬','鍛ㄥ彛','娌虫簮','蹇诲窞','涓夐棬宄�','姘稿窞','琛㈠窞','鐩橀敠','鐧介摱','鐜夋邯','杈惧窞','鏅痉闀�','楣ゅ','杈介槼','鍏洏姘�','寮犲鐣�','娴疯タ宸�','鍏村畨鐩�','闃垮潩宸�','閭f洸','瑗垮弻鐗堢撼宸�','杈芥簮','閭兏','骞抽《灞�','鍗楅槼','鍟嗕笜','鍗楀钩','榛勫唸','閯傚皵澶氭柉','娉稿窞','鍏畨','钁姦宀�','娼窞','瀹垮窞','搴嗛槼','鎬�鍖�','寮犳帠','榛斾笢鍗�','浜戞诞','鏈邯','鐧捐壊','浼婃槬','鏄��','閿℃灄閮嫆鐩�','鍏嬫媺鐜涗緷','澶╅棬','鍗氬皵濉旀媺','澶у叴瀹夊箔','娼嶅潑','缁甸槼','姊呭窞','瑗勯槼','鍖呭ご','鏋e簞','涓滆惀','淇¢槼','鏅嬩腑','寮�灏�','鎵垮痉','鑼傚悕','鑽嗛棬','绾㈡渤','闄囧崡','閾佸箔','榛勫北','鍜稿畞','寤跺畨','骞垮厓','涔屽叞瀵熷竷','闅忓窞','鐩婇槼','闃虫硥','鍐呮睙','閰掓硥','姣曡妭','瀹夐『','涓芥睙','鍟嗘礇','鏉ュ','榛旇タ鍗�','闃插煄娓�','閾滀粊','鍎嬪窞','宕囧乏','琛¢槼','鍜搁槼','鏂颁埂','鍗楀厖','鑽嗗窞','寰烽槼','姹変腑','婀樻江','璧ゅ嘲','浣虫湪鏂�','涓逛笢','娣崡','鎶氬窞','涓芥按','骞垮畨','浜冲窞','鏄屽悏','閯傚窞','鐧藉煄','鎭╂柦','浼婄妬','閾滈櫟','鏋楄姖','娴蜂笢','妗傛灄','涓存本','娓崡','婊ㄥ窞','鑿忔辰','瀛濇劅','钀ュ彛','婵槼','鎶氶『','鑷础','鏂颁綑','楦¤タ','閽﹀窞','娣寳','瀹夊悍','璧勯槼','涔屾捣','涓崼','楣ゅ矖','鐭冲槾灞�','鏃ュ杸鍒�','鏄岄兘','寰峰畯宸�','鍚愰瞾鐣�','闃垮嫆娉�','涓存矀','濞佹捣','娉板畨','瀹胯縼','寰峰窞','瀹夐槼','椹婚┈搴�','缁ュ寲','涓婇ザ','鑾嗙敯','铓屽煚','澶у簡','婕渤','鍗佸牥','鏅嬪煄','瀹e煄','鑸熷北','閭甸槼','澶х悊','妤氶泟','澶╂按','姹犲窞','鏉惧師','闃滄柊','宸撮煶閮','浠欐','姝﹀▉','鏅幢','娌虫睜','閾滃窛','杩簡宸�','娼滄睙','璐哄窞','濉斿煄','娴庡畞','姹熼棬','璧e窞','璁告槍','婊佸窞','榫欏博','杩愬煄','闀挎不','涔愬北','閮村窞','閬傚畞','鏇查潠','鍛间鸡璐濆皵','闃虫睙','鏈濋槼','宸村溅娣栧皵','鏈斿窞','濞勫簳','姊у窞','宸翠腑','榛斿崡','鍚村繝','涓村','鍑夊北宸�','瀹氳タ','钀嶄埂','鐢樺崡','鏀�鏋濊姳','鍏嬪瓬鍕掕嫃','灞卞崡','涓存钵','閲戞槍','閭㈠彴','琛℃按','瀹佸痉','姒嗘灄','闉嶅北','鐒︿綔','鐗′腹姹�','榻愰綈鍝堝皵','鐪夊北','涓夋槑','鍚曟','鍚夊畨','骞冲噳','閫氳窘','鎻槼','榛勭煶','瀹滃','寤惰竟','姹曞熬','鐜夋灄','閫氬寲','鍥涘钩','闃垮厠鑻�','璐垫腐','鐧藉北','鍙岄腑灞�','婀樿タ','鍝堝瘑','淇濆北','楣版江','鍠�浠�','闆呭畨','榛戞渤','鍜岀敯','鍥哄師','闃挎媺鍠勭洘','涓冨彴娌�','鍢夊唱鍏�'] //for(def c : citys){ // if(!runCitys.contains(c)){ // def code = cityCodeMap.get(c) @@ -702,9 +702,9 @@ def findAllData(sqlInstance236, citycode){ //// def count = CommonDatautils.findSeaweeds(city, "district", 1) //// rets << [city, count] ////} -////ExcelUtils.write("D:\\数据\\建行\\房产估值\\小区\\统计.xlsx", rets, "数据") +////ExcelUtils.write("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\灏忓尯\\缁熻.xlsx", rets, "鏁版嵁") // -////def citys = ["广州","重庆","深圳","上海","北京","南京","泉州"] +////def citys = ["骞垮窞","閲嶅簡","娣卞湷","涓婃捣","鍖椾含","鍗椾含","娉夊窞"] ////for(def city : citys){ //// def districts = CommonDatautils.findAllDistrictByCity(city, "district", ["name_cat"]) //// def index = 0 @@ -724,7 +724,7 @@ def findAllData(sqlInstance236, citycode){ ////} // // -////ExcelUtils.multiThreadingModify("D:\\数据\\建行\\房产估值\\小区\\价格过滤的小区.xlsx",{d-> +////ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\灏忓尯\\浠锋牸杩囨护鐨勫皬鍖�.xlsx",{d-> //// if(d['C']){ ////// def udata = new BasicDBObject() ////// udata.put("name_cat", 0) @@ -742,7 +742,7 @@ def findAllData(sqlInstance236, citycode){ // // ////def index = 0 -////ExcelUtils.multiThreadingModify("D:\\数据\\建行\\房产估值\\小区\\重庆反查数据_669(审核完毕).xlsx",{d-> +////ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\灏忓尯\\閲嶅簡鍙嶆煡鏁版嵁_669(瀹℃牳瀹屾瘯).xlsx",{d-> //// if(d['A']){ //// def dist = CommonDatautils.findDistrictById(d['A']) //// if(dist){ @@ -750,8 +750,8 @@ def findAllData(sqlInstance236, citycode){ //// def alias = [] //// if(d['H'] && d['H']!=dist.name){ //// alias << d['H'] -//// if(d['H'].contains("·")){ -//// alias << d['H'].replace("·", "") +//// if(d['H'].contains("路")){ +//// alias << d['H'].replace("路", "") //// } //// if(dist.alias){ //// for(def aliasName : dist.alias){ @@ -817,7 +817,7 @@ def findAllData(sqlInstance236, citycode){ // // // -////def fileName = "C:\\Users\\gaojuan\\Desktop\\分期分区小区.xlsx" +////def fileName = "C:\\Users\\gaojuan\\Desktop\\鍒嗘湡鍒嗗尯灏忓尯.xlsx" ////def cityCodeDataMap = CcbCommonUtils.findCityCodeValue() ////ExcelUtils.multiThreadingModify(fileName,{d-> //// def obj = CommonDatautils.findDistrictFieldById(d['C'],["alias"]) @@ -835,20 +835,20 @@ def findAllData(sqlInstance236, citycode){ // // // -////def fileName = "D:\\数据\\建行\\房产估值\\数据文件\\成交未入库人工部分城市统计.xlsx" +////def fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\鎴愪氦鏈叆搴撲汉宸ラ儴鍒嗗煄甯傜粺璁�.xlsx" ////def datas = ExcelUtils.read(fileName, 0, 1) ////def dealMap = [:] ////for(def d : datas){ //// dealMap.put(d['A'], d['B']) ////} -////ExcelUtils.multiThreadingModify("D:\\数据\\建行\\房产估值\\数据文件\\8月成交统计.xlsx",{d-> +////ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\8鏈堟垚浜ょ粺璁�.xlsx",{d-> //// if(d['A']){ //// d['W'] = dealMap.get(d['A']) //// } ////},0) // // -////def fileName = "d:\\数据\\建行\\房产估值\\经纬度错误数据修正.xlsx" +////def fileName = "d:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\缁忕含搴﹂敊璇暟鎹慨姝�.xlsx" ////def updateIndex = 0 ////def deleteIndex = 0 ////ExcelUtils.modify(fileName,{d-> @@ -874,20 +874,20 @@ def findAllData(sqlInstance236, citycode){ //// println updateIndex +" "+dist.city +" "+ dist.name+" "+dist.region+"("+region+")" //// } //// }else{ -//// println d['D']+" 不存在" +//// println d['D']+" 涓嶅瓨鍦�" //// } //// } ////},0) // ////def index = 0 -////ExcelUtils.modify("D:\\数据\\建行\\房产估值\\小区\\小区信息修正的数据(3897)_0118.xlsx", { d -> +////ExcelUtils.modify("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\灏忓尯\\灏忓尯淇℃伅淇鐨勬暟鎹紙3897锛塤0118.xlsx", { d -> //// if(d['A']){ //// def dist = CommonDatautils.findDistrictById(d['A']) //// if(dist){ //// if(d['K']){ //// def formatAddress = AddressUtil.formatAddress(d['B'], d['K']) //// def address = null -//// if(formatAddress && formatAddress.endsWith("号")) { +//// if(formatAddress && formatAddress.endsWith("鍙�")) { //// address = formatAddress //// } //// @@ -945,7 +945,7 @@ def findAllData(sqlInstance236, citycode){ // // //def findTradePpeData(def sqlInstance){ -// def sql = "SELECT commid,buildarea,to_char(dealdate,'yyyy-mm-dd') as dealdate,target_avg_price FROM avm_evaluation_item_gj where year_month=202203 and data_type='成交'"; +// def sql = "SELECT commid,buildarea,to_char(dealdate,'yyyy-mm-dd') as dealdate,target_avg_price FROM avm_evaluation_item_gj where year_month=202203 and data_type='鎴愪氦'"; // def rows = new HashSet() // sqlInstance.eachRow(sql,{r-> // rows< // if(d['A']){ @@ -1289,17 +1289,17 @@ def findAvgPrice(def commid, def pgsqlInstance, def cityid){ map.type = r.gujia_bds_clmtd map.month = r.gujiabds_clc_yrmo_val if(r.gujia_bds_clmtd == 1){ - map.calc_type = "人工估值" + map.calc_type = "浜哄伐浼板��" }else if(r.gujia_bds_clmtd == 2){ - map.calc_type = "样本计算" + map.calc_type = "鏍锋湰璁$畻" }else if(r.gujia_bds_clmtd == 3){ - map.calc_type = "神经网络" + map.calc_type = "绁炵粡缃戠粶" } }) return map } -//def fileName = "D:\\数据\\建行\\房产估值\\指导价\\0922入库数据.xlsx" +//def fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鎸囧浠穃\0922鍏ュ簱鏁版嵁.xlsx" //def datas = ExcelUtils.read(fileName, 0, 1) //def keys = [] //for(def d : datas){ @@ -1307,7 +1307,7 @@ def findAvgPrice(def commid, def pgsqlInstance, def cityid){ // keys << key //} // -//def fileName1 = "D:\\数据\\建行\\房产估值\\指导价\\moban_ccb_0922.xlsx" +//def fileName1 = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鎸囧浠穃\moban_ccb_0922.xlsx" //def datas1 = ExcelUtils.read(fileName1, 0, 1) //def keys1 = [] //for(def d : datas1){ @@ -1323,7 +1323,7 @@ def findAvgPrice(def commid, def pgsqlInstance, def cityid){ -//def fileName = "D:\\数据\\建行\\房产估值\\6个城市待优化_9月xlsx.xlsx" +//def fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\6涓煄甯傚緟浼樺寲_9鏈坸lsx.xlsx" //// //ExcelUtils.multiThreadingModify(fileName, {d-> // if(d['G']){ @@ -1353,7 +1353,7 @@ def findAvgPrice(def commid, def pgsqlInstance, def cityid){ //},0) -def fileName = "D:\\数据\\建行\\房产估值\\指导价\\更新人工指导价_0314.xlsx" +def fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鎸囧浠穃\鏇存柊浜哄伐鎸囧浠穇0314.xlsx" ExcelUtils.multiThreadingModify(fileName, { d -> def dist = CommonDatautils.findDistrictById(d['A']) if(dist){ @@ -1365,7 +1365,7 @@ ExcelUtils.multiThreadingModify(fileName, { d -> }) -//def file = "D:\\数据\\建行\\房产估值\\指导价\\5城价格翻新6-21.xlsx" +//def file = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鎸囧浠穃\5鍩庝环鏍肩炕鏂�6-21.xlsx" //ExcelUtils.multiThreadingModify(file, { d -> // if(d['A']){ // def dist = CommonDatautils.findDistrictById(d['A']) @@ -1378,7 +1378,7 @@ ExcelUtils.multiThreadingModify(fileName, { d -> // } // } //}) -//def filePath = "D:\\数据\\建行\\房产估值\\小区\\估家独家数据打标签.xlsx" +//def filePath = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\灏忓尯\\浼板鐙鏁版嵁鎵撴爣绛�.xlsx" //ExcelUtils.multiThreadingModify(filePath, { d -> // if(d['B']){ // @@ -1389,7 +1389,7 @@ ExcelUtils.multiThreadingModify(fileName, { d -> // markMap = [:] // } // def data = new BasicDBObject() -// markMap.put("exclusive", "是") +// markMap.put("exclusive", "鏄�") // data.put("mark_map", markMap) // data.put("m_date", new Date()) // DbUtils.seaweed.update(new BasicDBObject('_id',new ObjectId(d['B'])), new BasicDBObject('$set', data)) @@ -1399,7 +1399,7 @@ ExcelUtils.multiThreadingModify(fileName, { d -> //}) // -//def filePath = "D:\\数据\\数据建设\\小区\\嘉峪关处理.xlsx" +//def filePath = "D:\\鏁版嵁\\鏁版嵁寤鸿\\灏忓尯\\鍢夊唱鍏冲鐞�.xlsx" //ExcelUtils.modify(filePath, { d -> // if(d['A']){ //// def obj = CommonDatautils.findDistrictById(d['A']) @@ -1415,14 +1415,14 @@ ExcelUtils.multiThreadingModify(fileName, { d -> // DbUtils.seaweed.update(new BasicDBObject('_id',dbo._id), new BasicDBObject('$set', data)) // } // }else{ -// println d['C'] +" 有多个" +// println d['C'] +" 鏈夊涓�" // } // } //// if(obj){ //// def lng = d['G'] //// def lat =d['H'] //// -//// // 高德转百度 +//// // 楂樺痉杞櫨搴� //// def baidu = BaiDuApiUtils.geoconv(d['G'].toString().toDouble(), d['H'].toString().toDouble(), 3) //// def lng2 = baidu.x //// def lat2 = baidu.y @@ -1449,7 +1449,7 @@ ExcelUtils.multiThreadingModify(fileName, { d -> -//def fileName = "D:\\数据\\建行\\房产估值\\指导价\\2024-04-08修改人工指导价.xlsx" +//def fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鎸囧浠穃\2024-04-08淇敼浜哄伐鎸囧浠�.xlsx" //ExcelUtils.multiThreadingModify(fileName, { d -> // if(d['B'] && !d['D']){ // def jsonObject = FangjiaClientUtils.newMatch(d['A'], d['B'], "property", "district") @@ -1462,7 +1462,7 @@ ExcelUtils.multiThreadingModify(fileName, { d -> // d['G'] = dbo.status // d['H'] = dbo.name_cat // d['I'] = dbo.estate_type2 -// d['J'] = "接口匹配" +// d['J'] = "鎺ュ彛鍖归厤" // } // } // @@ -1479,7 +1479,7 @@ ExcelUtils.multiThreadingModify(fileName, { d -> //// d['G'] = o.status //// d['H'] = o.name_cat //// d['I'] = o.estate_type2 -//// d['J'] = "别名" +//// d['J'] = "鍒悕" //// } //// } // @@ -1487,7 +1487,7 @@ ExcelUtils.multiThreadingModify(fileName, { d -> // } //}) -//def fileName = "D:\\数据\\建行\\建行成交\\咸阳成交.xlsx" +//def fileName = "D:\\鏁版嵁\\寤鸿\\寤鸿鎴愪氦\\鍜搁槼鎴愪氦.xlsx" //ExcelUtils.multiThreadingModify(fileName, { d -> //// def count = CommonDatautils.findDistrictCount(null, d['B'], d['C'], "district") //// if(count && count==1){ @@ -1518,12 +1518,12 @@ ExcelUtils.multiThreadingModify(fileName, { d -> -//ExcelUtils.modify("D:\\数据\\建行\\二期\\付.xlsx",{d-> +//ExcelUtils.modify("D:\\鏁版嵁\\寤鸿\\浜屾湡\\浠�.xlsx",{d-> // def obj = CommonDatautils.findDistrict(d['D'],d['L'], d['K'], "district") // if(obj){ // def count = findGuidedPrice(sqlInstance236, obj._id.toString()) // if(count){ -// d['M'] = "存在" +// d['M'] = "瀛樺湪" // } // d['N'] = obj.name_cat // d['O'] = obj.estate_type2 @@ -1558,7 +1558,7 @@ def findPgDealPrice(c, pgsqlInstance, startDate){ //def dates = [202208,202209,202210,202211,202212,202301,202302,202303,202304,202305,202306] //def rows = [] //def headers = [] -//headers << "城市" +//headers << "鍩庡競" //headers.addAll(dates) //rows << headers //for(def c : citys){ @@ -1575,7 +1575,7 @@ def findPgDealPrice(c, pgsqlInstance, startDate){ //// } // rows << row //} -//ExcelUtils.write("D:\\数据\\建行\\数据统计结果\\成交占比统计-年.xlsx", rows, "第三方") +//ExcelUtils.write("D:\\鏁版嵁\\寤鸿\\鏁版嵁缁熻缁撴灉\\鎴愪氦鍗犳瘮缁熻-骞�.xlsx", rows, "绗笁鏂�") @@ -1593,16 +1593,16 @@ def findSampleRate(pgsqlInstance, cityName, yearmonth){ -//ExcelUtils.multiThreadingModify("D:\\数据\\建行\\房产估值\\房源\\仙桃.xlsx", {d-> +//ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鎴挎簮\\浠欐.xlsx", {d-> // def dist = CommonDatautils.findDistrict(d['A'],d['B'],d['C'], "district") // def flag = null; // if(!dist){ // dist = CommonDatautils.findSeaweedByMappingAlias(d['A'],d['B'],d['C'],"district") -// flag = "映射别名匹配" +// flag = "鏄犲皠鍒悕鍖归厤" // if(!dist) { // def rets = CommonDatautils.findDistrictByAlias(d['A'],d['B'],d['C'], "district") // if(rets && rets.size()==1){ -// flag = "别名匹配" +// flag = "鍒悕鍖归厤" // dist = rets[0] // } // } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/TestExport.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/TestExport.groovy index f84530d3d..86f1b8ddb 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/TestExport.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/TestExport.groovy @@ -3,7 +3,7 @@ package com.fangjia.script.ccbevaluation import com.fangjia.script.commData.CommonDatautils import com.fangjia.script.util.ExcelUtils -ExcelUtils.modify("D:\\数据\\建行\\东莞202406.xlsx", { d -> +ExcelUtils.modify("D:\\鏁版嵁\\寤鸿\\涓滆帪202406.xlsx", { d -> if(d['G'] && d['G'] instanceof String){ def obj = CommonDatautils.findDistrictById(d['G']) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/TestRepeat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/TestRepeat.groovy index b2e287b7c..f827099c0 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/TestRepeat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/TestRepeat.groovy @@ -27,7 +27,7 @@ class TestRepeat { def run(){ def q = new BasicDBObject() q.put("cat", "sell") - q.put("city", "襄阳") + q.put("city", "瑗勯槼") def count = seabird.count(q) println count // for(def d : dbcursor){ @@ -41,7 +41,7 @@ class TestRepeat { def totalCount = new AtomicLong() final CountDownLatch latch = new CountDownLatch(newHouses.size()) - println " 房源量:"+newHouses.size() + println " 鎴挎簮閲忥細"+newHouses.size() def retMap = new ConcurrentHashMap() for(def i=0;i - if(value && value.size()>1){ //csjj_esf_price 国信达成交 + if(value && value.size()>1){ //csjj_esf_price 鍥戒俊杈炬垚浜� if(value.size()==2 && !value.lianjia_esf_price && !value.beike_esf_price && !value.csjj_esf_price){ def price = statMap.get(key) if(price){ 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 73c6676eb..36cd44c41 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 @@ -20,7 +20,7 @@ import java.util.concurrent.Executors import java.util.concurrent.atomic.AtomicLong /*** - * 建行成交抓取统计 + * 寤鸿鎴愪氦鎶撳彇缁熻 */ class TradeStatLog { @@ -44,11 +44,11 @@ class TradeStatLog { static main(args) { def task = new TradeStatLog() -// task.run()//统计最近3个月抓取的成交数据量 -// task.exportTrade()//导出未入库成交 +// task.run()//缁熻鏈�杩�3涓湀鎶撳彇鐨勬垚浜ゆ暟鎹噺 +// task.exportTrade()//瀵煎嚭鏈叆搴撴垚浜� -// task.exportTrade2()//导出未入库成交 - task.updateDealPriceRegion()//修改成交区域数据 +// task.exportTrade2()//瀵煎嚭鏈叆搴撴垚浜� + task.updateDealPriceRegion()//淇敼鎴愪氦鍖哄煙鏁版嵁 // task.thirdPartyStat() // println Calendar.getInstance().get(Calendar.YEAR) // task.averageStat() @@ -82,7 +82,7 @@ class TradeStatLog { def statTableCount(){ def sql = "SELECT * FROM all_tables WHERE OWNER = 'GOOJIA' and table_name not like '%FJW%' ORDER BY table_name" def rets = [] - rets << ["表","库中总记录数","dat文件总数"] + rets << ["琛�","搴撲腑鎬昏褰曟暟","dat鏂囦欢鎬绘暟"] def tables = [] sqlInstance.eachRow(sql,{r-> tables << r.TABLE_NAME @@ -94,14 +94,14 @@ class TradeStatLog { rets << [tn, r.count, ""] }) } - ExcelUtils.write("D:\\数据\\建行\\房产估值\\数据文件\\数据量统计1.xlsx", rets,"总量统计") + ExcelUtils.write("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\鏁版嵁閲忕粺璁�1.xlsx", rets,"鎬婚噺缁熻") } def run(){ def citys = CcbCommonUtils.citys_all; def rets = [] - rets << ["城市","23年10月总量","23年11月总量","23年12月总量","占比","贝壳","链家", "我爱我家","幸福里APP","中原"] - def sources = ["贝壳找房","链家在线","我爱我家","房天下","中原地产"] + rets << ["鍩庡競","23骞�10鏈堟�婚噺","23骞�11鏈堟�婚噺","23骞�12鏈堟�婚噺","鍗犳瘮","璐濆3","閾惧", "鎴戠埍鎴戝","骞哥閲孉PP","涓師"] + def sources = ["璐濆3鎵炬埧","閾惧鍦ㄧ嚎","鎴戠埍鎴戝","鎴垮ぉ涓�","涓師鍦颁骇"] //def startDate = "2021-05-01" def startDate = "2023-10-01" def date = "2023-11-01" @@ -116,7 +116,7 @@ class TradeStatLog { def ret = [] ret << city - if(city == "上海"){ + if(city == "涓婃捣"){ def lastMonthYoudaCount = getYouDaData(DateUtils.parseFromTightByPattern(startDate,"yyyy-MM-dd"), DateUtils.parseFromTightByPattern(date,"yyyy-MM-dd")) def curMonthYoudaCount = getYouDaData(DateUtils.parseFromTightByPattern(date,"yyyy-MM-dd"), DateUtils.parseFromTightByPattern(endDate,"yyyy-MM-dd")) def nearMonthYoudaCount = getYouDaData(DateUtils.parseFromTightByPattern(endDate,"yyyy-MM-dd"), DateUtils.parseFromTightByPattern(newDate,"yyyy-MM-dd")) @@ -156,8 +156,8 @@ class TradeStatLog { } - ExcelUtils.write("D:\\数据\\建行\\房产估值\\成交\\${newDate}成交统计.xlsx", rets, "数据") - println "表格生成完成" + ExcelUtils.write("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鎴愪氦\\${newDate}鎴愪氦缁熻.xlsx", rets, "鏁版嵁") + println "琛ㄦ牸鐢熸垚瀹屾垚" } @@ -165,15 +165,15 @@ class TradeStatLog { def citys = CcbCommonUtils.citys; def rets = [] // def cityCodeDataMap = CcbCommonUtils.findCityCodeValue() - rets << ["城市","小区总量","有第三方的总量","1家占比","2家占比","3家占比","4家占比","5家占比","6家占比","7家占比","8家占比","9家占比","10家占比","11家占比","12家占比","13家占比","14家占比"] + rets << ["鍩庡競","灏忓尯鎬婚噺","鏈夌涓夋柟鐨勬�婚噺","1瀹跺崰姣�","2瀹跺崰姣�","3瀹跺崰姣�","4瀹跺崰姣�","5瀹跺崰姣�","6瀹跺崰姣�","7瀹跺崰姣�","8瀹跺崰姣�","9瀹跺崰姣�","10瀹跺崰姣�","11瀹跺崰姣�","12瀹跺崰姣�","13瀹跺崰姣�","14瀹跺崰姣�"] for(def city : citys){ def districts = CcbCommonUtils.findAllDistrictByCity(city, "district", ["city", "region", "name", "estate_type2", "name_cat","lng"]); def m = getThirdPartyPricePrecent(city) rets << [city, districts.size(), m.total, m.count1, m.count2, m.count3, m.count4, m.count5, m.count6, m.count7, m.count8, m.count9, m.count10, m.count11, m.count12, m.count13, m.count14] println rets.get(rets.size()-1) } - ExcelUtils.write("D:\\数据\\建行\\房产估值\\数据文件\\第三方均价统计0927.xlsx", rets, "数据") - println "表格生成完成" + ExcelUtils.write("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\绗笁鏂瑰潎浠风粺璁�0927.xlsx", rets, "鏁版嵁") + println "琛ㄦ牸鐢熸垚瀹屾垚" } @@ -369,7 +369,7 @@ class TradeStatLog { def averageStat(){ - def citys = ["北京","上海","广州","深圳","重庆","杭州","苏州","厦门","大连","呼和浩特"] + def citys = ["鍖椾含","涓婃捣","骞垮窞","娣卞湷","閲嶅簡","鏉窞","鑻忓窞","鍘﹂棬","澶ц繛","鍛煎拰娴╃壒"] def map = [:] for(def city : citys){ @@ -381,7 +381,7 @@ class TradeStatLog { } println map - ExcelUtils.modify("D:\\数据\\建行\\房产估值\\估值测试数据覆盖率占比.xlsx",{d-> + ExcelUtils.modify("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\浼板�兼祴璇曟暟鎹鐩栫巼鍗犳瘮.xlsx",{d-> def city = d['A'] def count = map.get(city) def distCount = map.get(city+"-count") @@ -503,7 +503,7 @@ class TradeStatLog { def citys = CcbCommonUtils.citys; // def weekend = DateUtils.parseFromTightByPattern("2021-07-25","yyyy-MM-dd") - def headers = ["ID", "城市", "区域", "名称", "来源","价格", "面积","地址", "成交时间","过滤原因"] + def headers = ["ID", "鍩庡競", "鍖哄煙", "鍚嶇О", "鏉ユ簮","浠锋牸", "闈㈢Н","鍦板潃", "鎴愪氦鏃堕棿","杩囨护鍘熷洜"] def rets = [] rets << headers def startDate = "2024-04-01" @@ -526,14 +526,14 @@ class TradeStatLog { if(!ids.contains(t._id.toString())){ def distId = nameMap.get(t.city +"##"+t.region+"##"+t.district_name) - if(!distId && (t.district_name.toString().endsWith("弄") || t.district_name.toString().endsWith("号"))){ - distId = nameMap.get(t.city +"##"+t.region+"##"+t.district_name+"小区") + if(!distId && (t.district_name.toString().endsWith("寮�") || t.district_name.toString().endsWith("鍙�"))){ + distId = nameMap.get(t.city +"##"+t.region+"##"+t.district_name+"灏忓尯") } - if(!distId && t.district_name.toString().endsWith("小区")){ - distId = nameMap.get(t.city +"##"+t.region+"##"+t.district_name.replace("小区","")) + if(!distId && t.district_name.toString().endsWith("灏忓尯")){ + distId = nameMap.get(t.city +"##"+t.region+"##"+t.district_name.replace("灏忓尯","")) } if(!distId){ - def flag = t.district_name.matches('^[\u4e00-\u9fa5]+?(路|大道|街).+[弄号]$') + def flag = t.district_name.matches('^[\u4e00-\u9fa5]+?(璺瘄澶ч亾|琛�).+[寮勫彿]$') if(flag){ def datas = CommonDatautils.findDistrictByAddress2(t.city, t.region, t.district_name, "district") if(datas && datas.size()==1){ @@ -549,10 +549,10 @@ class TradeStatLog { // def startPrice = null // def endPrice = null // if(price){ -// if(dist.city=="上海"){ +// if(dist.city=="涓婃捣"){ // startPrice = (int)(price - price*0.1) // endPrice = (int)(price*0.5 + price) -// }else if(dist.city=="杭州"){ +// }else if(dist.city=="鏉窞"){ // startPrice = (int)(price - price*0.15) // endPrice = (int)(price*0.15 + price) // }else{ @@ -561,23 +561,23 @@ class TradeStatLog { // } // } // if(t.avg_priceendPrice){ -// reason = "价格过滤" +// reason = "浠锋牸杩囨护" // } if(!dist.name_cat && dist.name_cat!=0){ - reason = "无name_cat" + reason = "鏃爊ame_cat" } - if(dist.name_cat != 0 || !dist.lng || !["普通住宅","商住"].contains(dist.estate_type2) || dist.name.contains("洋房") || dist.name.contains("公房")){ - reason = "小区过滤" + if(dist.name_cat != 0 || !dist.lng || !["鏅�氫綇瀹�","鍟嗕綇"].contains(dist.estate_type2) || dist.name.contains("娲嬫埧") || dist.name.contains("鍏埧")){ + reason = "灏忓尯杩囨护" } if(!reason){ def key=t.city+"##"+dist.region+"##"+dist.name+"##"+t.area+"##"+t.avg_price+"##"+DateUtils.formatDateByPattern(t.trade_date,"yyyy-MM-dd") if(details.contains(key)){ - reason = "数据重复" + reason = "鏁版嵁閲嶅" } } if(!reason && t.area<20){ - reason = "面积过小" + reason = "闈㈢Н杩囧皬" } } @@ -588,7 +588,7 @@ class TradeStatLog { } println city +" "+rets.size() } - ExcelUtils.write("D:\\数据\\建行\\房产估值\\成交\\成交未入库记录(1月).xlsx", rets,"数据") + ExcelUtils.write("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鎴愪氦\\鎴愪氦鏈叆搴撹褰�(1鏈�).xlsx", rets,"鏁版嵁") } @@ -598,23 +598,23 @@ class TradeStatLog { // def endDate = "2024-07-01" def ids = findAllDealIds(); println ids.size() - ExcelUtils.multiThreadingModify("D:\\数据\\建行\\建行成交\\廊坊.xlsx",{d-> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\寤鸿\\寤鸿鎴愪氦\\寤婂潑.xlsx",{d-> if(ids.contains(d['A'])){ - d['V'] = "供" + d['V'] = "渚�" } if(d['S'] && !d['W']){ def dist = CommonDatautils.findDistrictById(d['S']) if(!dist.name_cat && dist.name_cat!=0){ - d['W'] = "name_cat过滤" + d['W'] = "name_cat杩囨护" } - if(dist.name_cat != 0 || !dist.lng || !["普通住宅","商住"].contains(dist.estate_type2) || dist.name.contains("洋房") || dist.name.contains("公房")){ - d['W'] = "小区过滤" + if(dist.name_cat != 0 || !dist.lng || !["鏅�氫綇瀹�","鍟嗕綇"].contains(dist.estate_type2) || dist.name.contains("娲嬫埧") || dist.name.contains("鍏埧")){ + d['W'] = "灏忓尯杩囨护" } def key = d['B']+"##"+d['Q']+"##"+d['R']+"##"+d['D']+"##"+d['E'].toString().toDouble().toInteger()+"##"+d['J'].toString().substring(0,10) def map = findDealByCommId(d['B'], d['S']) def count = map.get(key) if(count>=2){ - d['W'] = "重复" + d['W'] = "閲嶅" } } println d['A'] @@ -622,7 +622,7 @@ class TradeStatLog { } def deleteDistrict(){ - ExcelUtils.multiThreadingModify("D:\\数据\\建行\\房产估值\\要删除小区.xlsx",{d-> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\瑕佸垹闄ゅ皬鍖�.xlsx",{d-> if(d['G']){ def id = d['G'] BasicDBObject q=new BasicDBObject('name_cat',1) @@ -643,21 +643,21 @@ class TradeStatLog { def deleteByCommid(tableName, commid){ def sql = "delete from "+tableName+" where commid='${commid}'"; sqlInstance.execute(sql) - println "删除:"+tableName+" "+commid + println "鍒犻櫎锛�"+tableName+" "+commid } def getYouDaData() { def startDate = DateUtils.getFirstDayOfMonth(DateUtils.parseFromTightByPattern("2021-07-01", "yyyy-MM-dd")) def endDate = DateUtils.parseFromTightByPattern("2021-08-01", "yyyy-MM-dd") def q = new BasicDBObject() -// q.put("premisesName","共富一村") +// q.put("premisesName","鍏卞瘜涓�鏉�") q.put("contractTime", new BasicDBObject('$gte', startDate));//.append('$lt', endDate) def dbcursor = youda_esfhouse_coll.find(q).batchSize(2000) def trades = [] for(def db : dbcursor){ def map = [:] map._id=db._id.toString() - map.city = "上海" + map.city = "涓婃捣" map.region = db.region if(db.districtName && db.districtName!="null"){ map.district_name=db.districtName @@ -675,7 +675,7 @@ class TradeStatLog { } def findAllDealIds(){ - def sql = "select gujia_bds_mdl_id from base.t0831_bigdata_deal_gj_h where urbn_nm='廊坊'" + def sql = "select gujia_bds_mdl_id from base.t0831_bigdata_deal_gj_h where urbn_nm='寤婂潑'" def ids = [] pssqlInstance.eachRow(sql,{r-> if(!ids.contains(r.gujia_bds_mdl_id)){ @@ -727,7 +727,7 @@ class TradeStatLog { public static def findTradesDetail(city, startDate, endDate){ def q = new BasicDBObject() q.put("city", city) -// q.put("district_name","长隆住宅小区") +// q.put("district_name","闀块殕浣忓畢灏忓尯") q.put("trade_date", new BasicDBObject('$gte', startDate).append('$lt',endDate)) def dbcursor = DEAL_PRICE_COLL.find(q) def rets = [] @@ -775,7 +775,7 @@ class TradeStatLog { sqlInstance.eachRow(sql,{r-> if(!commIds.contains(r.commid)){ if(!delIds.contains(r.commid)){ - println "不存在:"+ r.commid + println "涓嶅瓨鍦細"+ r.commid sqlInstance.executeUpdate("delete from bigdata_deal_gj where commid=${r.commid}") } } @@ -792,18 +792,18 @@ class TradeStatLog { } def filterTrade(){ - ExcelUtils.modify("D:\\数据\\建行\\房产估值\\成交\\成交未入库记录(1月).xlsx",{d-> + ExcelUtils.modify("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鎴愪氦\\鎴愪氦鏈叆搴撹褰�(1鏈�).xlsx",{d-> if(!d['J']){ def count = findTradeById(d['A']) if(count){ - d['J'] = "其它原因过滤" + d['J'] = "鍏跺畠鍘熷洜杩囨护" } } },0) } def updateDealPriceRegion(){ - ExcelUtils.modify("D:\\数据\\建行\\建行成交\\成交待修改区域数据.xlsx",{d-> + ExcelUtils.modify("D:\\鏁版嵁\\寤鸿\\寤鸿鎴愪氦\\鎴愪氦寰呬慨鏀瑰尯鍩熸暟鎹�.xlsx",{d-> if(d['A'] && d['G']){ def region = RegionData.formatRegion(d['D'], d['G']) if(region){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/UpdateData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/UpdateData.groovy index 640b024b9..685b1b6e9 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/UpdateData.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/UpdateData.groovy @@ -36,12 +36,12 @@ class UpdateData { } def run(){ - def city = "东莞" + def city = "涓滆帪" def cityCodeDataMap = CcbCommonUtils.findCityCodeValue() 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","quality"]) - println city +" 小区量:"+dists.size() + println city +" 灏忓尯閲忥細"+dists.size() def commids = findOracleData(cityCodeDataMap.get(city)) - println "oracle 数量:"+commids.size() + println "oracle 鏁伴噺锛�"+commids.size() def index = 0 for(def dist : dists){ if(!commids.contains(dist._id.toString()) && dist.quality){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/UpdateHouseRegion.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/UpdateHouseRegion.groovy index 74164d43e..01c4d5324 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/UpdateHouseRegion.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/UpdateHouseRegion.groovy @@ -56,15 +56,15 @@ class UpdateHouseRegion { for(def city : citys){ def dists = CommonDatautils.findAllDistrictByCity(city, "district",["city","region","name","alias"]) addFenQiAlias(dists) - println city +" 处理完成" + println city +" 澶勭悊瀹屾垚" } } def addFenQiAlias(dists){ for(def dist : dists){ - def s1 = DataUtil.match(dist.name, Pattern.compile("[一|二|三|四|五|六|七|八|九|十|十一|十二|十三|十四|十五|十六|十七|十八|\\w+](期|区)\$")) + def s1 = DataUtil.match(dist.name, Pattern.compile("[涓�|浜寍涓墊鍥泑浜攟鍏瓅涓億鍏珅涔潀鍗亅鍗佷竴|鍗佷簩|鍗佷笁|鍗佸洓|鍗佷簲|鍗佸叚|鍗佷竷|鍗佸叓|\\w+](鏈焲鍖�)\$")) if(s1){ - def newName = dist.name.replace("Ⅰ","1").replace("Ⅱ","2").replace("A区","a区").replace("B区","b区").replace("C区","c区").replace("D区","d区").replace("E区","e区").replace("F区","f区").replace("一期","1期").replace("二期","2期").replace("三期","3期").replace("四期","4期").replace("五期","5期").replace("六期","6期").replace("七期","7期").replace("八期","8期").replace("九期","9期").replace("十期","10期").replace("十一期","11期").replace("十二期","12期") + def newName = dist.name.replace("鈪�","1").replace("鈪�","2").replace("A鍖�","a鍖�").replace("B鍖�","b鍖�").replace("C鍖�","c鍖�").replace("D鍖�","d鍖�").replace("E鍖�","e鍖�").replace("F鍖�","f鍖�").replace("涓�鏈�","1鏈�").replace("浜屾湡","2鏈�").replace("涓夋湡","3鏈�").replace("鍥涙湡","4鏈�").replace("浜旀湡","5鏈�").replace("鍏湡","6鏈�").replace("涓冩湡","7鏈�").replace("鍏湡","8鏈�").replace("涔濇湡","9鏈�").replace("鍗佹湡","10鏈�").replace("鍗佷竴鏈�","11鏈�").replace("鍗佷簩鏈�","12鏈�") if(newName!=dist.name){ def alias = dist.alias if(!alias){ @@ -75,7 +75,7 @@ class UpdateHouseRegion { def udata = new BasicDBObject() udata.put("alias", alias) DbUtils.seaweed.update(new BasicDBObject('_id', dist.get("_id")), new BasicDBObject('$set', udata)) - println dist.city +" "+dist.name+" "+dist.alias+" 新:"+alias + println dist.city +" "+dist.name+" "+dist.alias+" 鏂帮細"+alias } } } @@ -87,7 +87,7 @@ class UpdateHouseRegion { for(def city : citys){ def dists = CommonDatautils.findAllDistrictByCity(city, "district",["city","region","name","alias"]) addDistricts(dists) - println city +" 处理完成" + println city +" 澶勭悊瀹屾垚" } } @@ -98,8 +98,8 @@ class UpdateHouseRegion { def oldCount = alias.size() def newAlias = [] for(def aliasName : alias){ - if(aliasName.contains("·") || aliasName.contains(".")){ - def newName = aliasName.replace("·","").replace(".","") + if(aliasName.contains("路") || aliasName.contains(".")){ + def newName = aliasName.replace("路","").replace(".","") newAlias << aliasName if(!newAlias.contains(newName)){ if(newName!=dist.name){ @@ -117,7 +117,7 @@ class UpdateHouseRegion { def udata = new BasicDBObject() udata.put("alias", newAlias) DbUtils.seaweed.update(new BasicDBObject('_id', dist.get("_id")), new BasicDBObject('$set', udata)) - println dist.city +" "+dist.name+" "+dist.alias+" 新:"+newAlias + println dist.city +" "+dist.name+" "+dist.alias+" 鏂帮細"+newAlias } @@ -127,7 +127,7 @@ class UpdateHouseRegion { def updateThirdPartyRegion(){ - def city = "东莞" + def city = "涓滆帪" def rets = findThirdPartyPrice(city) batchThirdPartyUpdate(city, rets); @@ -160,7 +160,7 @@ class UpdateHouseRegion { } def updateDealRegion(){ - def city = "东莞" + def city = "涓滆帪" def datas = findDealData(city) batchDealRegion(city, datas) } @@ -170,7 +170,7 @@ class UpdateHouseRegion { def curCount = new AtomicLong() def totalCount = datas.size(); final CountDownLatch latch = new CountDownLatch(totalCount) - println city +" 成交总量:"+totalCount + println city +" 鎴愪氦鎬婚噺锛�"+totalCount for(def i=0;i - if(d['K'] && d['K']=='区域错误'){ + ExcelUtils.modify("D:\\鏁版嵁\\寤鸿\\寤鸿鎴愪氦\\鎴愪氦鏈叆搴撹褰昣9鏈� - 10.25鍖哄煙閿欒.xlsx",{d-> + if(d['K'] && d['K']=='鍖哄煙閿欒'){ def city = d['B'] def region = d['C'] def name = d['D'] @@ -222,7 +222,7 @@ class UpdateHouseRegion { def udata = new BasicDBObject() udata.put("region", dist.region) DEAL_PRICE_COLL.update(new BasicDBObject('_id', new ObjectId(d['A'])), new BasicDBObject('$set', udata)) - d['M'] = "原数据区域修改("+dist.region+")" + d['M'] = "鍘熸暟鎹尯鍩熶慨鏀癸紙"+dist.region+"锛�" println d['A']+" "+region +" "+dist.region } } @@ -232,7 +232,7 @@ class UpdateHouseRegion { } def updateSeawaterRegion(){ - def city = "东莞" + def city = "涓滆帪" def rets = findHouseSource(city, 20190701, 20211001) batchUpdate(city, rets); } @@ -243,7 +243,7 @@ class UpdateHouseRegion { def curCount = new AtomicLong() def totalCount = thirdDatas.size(); final CountDownLatch latch = new CountDownLatch(totalCount) - println city +" 第三方总量:"+totalCount + println city +" 绗笁鏂规�婚噺锛�"+totalCount for(def i=0;i - def roads = findThirdPartyPrice(d['A'], d['B'], d['C'], "链家") + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\灏忓尯鍦板潃鎷嗗垎\\灏忓尯鍦板潃鍒囧垎(缁撴灉)_1.xlsx", { d -> + def roads = findThirdPartyPrice(d['A'], d['B'], d['C'], "閾惧") if(roads){ d['O'] = roads[0] } @@ -133,18 +133,18 @@ class AddressCut extends BaseBatch{ def roadMatch(){ def cityRoadsMap = queryPoiMap() - println "道路加载完成....." - ExcelUtils.modify("D:\\数据\\建行\\房产估值\\小区地址拆分\\小区地址切分(结果)_1.xlsx", { d -> + println "閬撹矾鍔犺浇瀹屾垚....." + ExcelUtils.modify("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\灏忓尯鍦板潃鎷嗗垎\\灏忓尯鍦板潃鍒囧垎(缁撴灉)_1.xlsx", { d -> def roads = cityRoadsMap.get(d['A']) // if (roads && roads.contains(d['E'])) { -// d['L'] = "是" +// d['L'] = "鏄�" // println d['A'] + " " + d['E'] // } if(roads){ for(def road : roads){ if(!d['L'] && d['E'] && d['E'].toString().contains(road)){ - d['L'] = "中间包含" + d['L'] = "涓棿鍖呭惈" d['M'] = road println d['A'] + " " + d['E'] break; @@ -188,9 +188,9 @@ class AddressCut extends BaseBatch{ def keys = new HashSet() for(def d : rets){ if(d.name){ - def name = d.name.replace("一期","").replace("二期","").replace("三期","").replace("四期","").replace("五期","").replace("六期","").replace("七期","").replace("八期","").replace("九期","").replace("十期","").replace("一区","").replace("二区","").replace("三区","").replace("四区","").replace("五区","").replace("六区","").replace("七区","").replace("八区","").replace("九区","").replace("十区","").replace("A区","").replace("B区","").replace("C区","").replace("D区","") - .replace("十一街区","").replace("十二街区","").replace("十三街区","").replace("十四街区","").replace("十五街区","").replace("十六街区","").replace("十七街区","").replace("十八街区","").replace("十九街区","").replace("一街区","").replace("二街区","").replace("三街区","").replace("四街区","").replace("五街区","").replace("六街区","").replace("七街区","").replace("八街区","").replace("九街区","").replace("十街区","") - .replace("公寓","").replace("别墅","").replace("商住楼","").replace("花园","").replace("南区","").replace("北区","").replace("东区","").replace("西区","") + def name = d.name.replace("涓�鏈�","").replace("浜屾湡","").replace("涓夋湡","").replace("鍥涙湡","").replace("浜旀湡","").replace("鍏湡","").replace("涓冩湡","").replace("鍏湡","").replace("涔濇湡","").replace("鍗佹湡","").replace("涓�鍖�","").replace("浜屽尯","").replace("涓夊尯","").replace("鍥涘尯","").replace("浜斿尯","").replace("鍏尯","").replace("涓冨尯","").replace("鍏尯","").replace("涔濆尯","").replace("鍗佸尯","").replace("A鍖�","").replace("B鍖�","").replace("C鍖�","").replace("D鍖�","") + .replace("鍗佷竴琛楀尯","").replace("鍗佷簩琛楀尯","").replace("鍗佷笁琛楀尯","").replace("鍗佸洓琛楀尯","").replace("鍗佷簲琛楀尯","").replace("鍗佸叚琛楀尯","").replace("鍗佷竷琛楀尯","").replace("鍗佸叓琛楀尯","").replace("鍗佷節琛楀尯","").replace("涓�琛楀尯","").replace("浜岃鍖�","").replace("涓夎鍖�","").replace("鍥涜鍖�","").replace("浜旇鍖�","").replace("鍏鍖�","").replace("涓冭鍖�","").replace("鍏鍖�","").replace("涔濊鍖�","").replace("鍗佽鍖�","") + .replace("鍏瘬","").replace("鍒","").replace("鍟嗕綇妤�","").replace("鑺卞洯","").replace("鍗楀尯","").replace("鍖楀尯","").replace("涓滃尯","").replace("瑗垮尯","") keys << d.region +"##"+ name } } @@ -205,9 +205,9 @@ class AddressCut extends BaseBatch{ } } } - //ExcelUtils.write("D:\\数据\\小区\\同地址小区.xlsx", sameAddrList, "相同地址小区") - FileUtils.batchCreateFile(sameAddrList, "D:\\数据\\小区\\同地址小区.txt", null, "utf-8", false); - println "完成" + //ExcelUtils.write("D:\\鏁版嵁\\灏忓尯\\鍚屽湴鍧�灏忓尯.xlsx", sameAddrList, "鐩稿悓鍦板潃灏忓尯") + FileUtils.batchCreateFile(sameAddrList, "D:\\鏁版嵁\\灏忓尯\\鍚屽湴鍧�灏忓尯.txt", null, "utf-8", false); + println "瀹屾垚" } @@ -217,7 +217,7 @@ class AddressCut extends BaseBatch{ def fileName = "/home/goojia/gj/address_split.txt" if (CommonDatautils.isWindow()) { - fileName = "D:\\数据\\address_split.txt" + fileName = "D:\\鏁版嵁\\address_split.txt" } for(def c : citys) { index++ @@ -279,9 +279,9 @@ class AddressCut extends BaseBatch{ sqlBuffer.append("SELECT cityname,name,type FROM amap_poi WHERE 1=1") // sqlBuffer.append(" and cityname = '" + city + "'") // sqlBuffer.append(" and name = '" + name + "'") - sqlBuffer.append(" and type like '%道路名%'") + sqlBuffer.append(" and type like '%閬撹矾鍚�%'") // sqlBuffer.append(" and MATCH(name,'${name}')") -// sqlBuffer.append(" and source = '高德' order by score() desc") +// sqlBuffer.append(" and source = '楂樺痉' order by score() desc") ResultSet rs = dataSource.connection.createStatement().executeQuery(sqlBuffer.toString()) def cityMap = [:] while (rs.next()) { 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 3b095eb3c..0f9f1fc99 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 @@ -35,14 +35,14 @@ class CcbDataStat { println c +" "+r +" "+count } } - ExcelUtils.write("d:\\数据\\建行\\区域小区量统计.xlsx", rows, "统计") + ExcelUtils.write("d:\\鏁版嵁\\寤鸿\\鍖哄煙灏忓尯閲忕粺璁�.xlsx", rows, "缁熻") } def tradeRun(){ def ccbCitys = CcbCommonUtils.citys; def startDate = DateUtils.parseFromTightByPattern("2021-01-01","yyyy-MM-dd") def endDate = DateUtils.parseFromTightByPattern("2022-01-01","yyyy-MM-dd") - ExcelUtils.multiThreadingModify("D:\\数据\\建行\\成交案例统计_0531.xlsx", { d -> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\寤鸿\\鎴愪氦妗堜緥缁熻_0531.xlsx", { d -> if(d['A']){ if(ccbCitys.contains(d['A'])){ d['D'] = findOracleTotalCount(d['A']) @@ -128,7 +128,7 @@ class CcbDataStat { def citys = CcbCommonUtils.getRunningCitys(args) def cityCodeDataMap = CcbCommonUtils.findCityCodeValue() def rets = [] - rets << ["城市","经纬度","物业类型","建筑年代","建筑类型","绿化率","容积率"] + rets << ["鍩庡競","缁忕含搴�","鐗╀笟绫诲瀷","寤虹瓚骞翠唬","寤虹瓚绫诲瀷","缁垮寲鐜�","瀹圭Н鐜�"] for(def c : citys){ def ret = [] ret << c @@ -154,7 +154,7 @@ class CcbDataStat { rets << ret } - ExcelUtils.write("D:\\数据\\建行\\房产估值\\建行供数重要字段覆盖率.xlsx", rets, "统计") + ExcelUtils.write("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\寤鸿渚涙暟閲嶈瀛楁瑕嗙洊鐜�.xlsx", rets, "缁熻") } def findTotalCount(citycode){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/CcbDistNameMatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/CcbDistNameMatch.groovy index 32725d092..4545697ed 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/CcbDistNameMatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/CcbDistNameMatch.groovy @@ -18,28 +18,28 @@ class CcbDistNameMatch { } def run1(){ - ExcelUtils.multiThreadingModify("D:\\数据\\建行\\新增映射别名.xlsx", { d -> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\寤鸿\\鏂板鏄犲皠鍒悕.xlsx", { d -> if (d['A']) { def region = d['B'] def newRegion = RegionData.formatRegion(d['A'], region) if (newRegion) { - if(d['D'].contains("、")){ + if(d['D'].contains("銆�")){ println d['D'] } - def arrs = d['D'].split("、") + def arrs = d['D'].split("銆�") def list = [] def flags = [] for(def s : arrs){ def dist = CommonDatautils.findDistrict(d['A'], newRegion, s, "district") if(dist){ list << dist.name - flags << "完全一致" + flags << "瀹屽叏涓�鑷�" }else{ def jsonObject = OpenApiClient.addressMatch(d['A'], s, "property", false, newRegion) if(jsonObject != null && jsonObject.precise!=-1) { if(jsonObject.get("district") == newRegion){ list << jsonObject.get("name") - flags << "匹配接口" + flags << "鍖归厤鎺ュ彛" } } } @@ -56,7 +56,7 @@ class CcbDistNameMatch { } def run(){ - ExcelUtils.multiThreadingModify("D:\\数据\\建行\\不同小区.xlsx", { d -> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\寤鸿\\涓嶅悓灏忓尯.xlsx", { d -> def regionCode = null if (d['A']) { def region = d['B'] @@ -76,7 +76,7 @@ class CcbDistNameMatch { def rets = CommonDatautils.findDistrictByAlias(d['A'], newRegion, d['C'], "district") if (rets) { if(rets.size()>1){ - d['E'] = "别名-多个" + d['E'] = "鍒悕-澶氫釜" }else{ dist = rets[0] d['E'] = d['C'] +"--"+dist.name diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/CcbDistrictToDB.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/CcbDistrictToDB.groovy index 2ee14adc4..a2cbd4655 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/CcbDistrictToDB.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/CcbDistrictToDB.groovy @@ -36,7 +36,7 @@ class CcbDistrictToDB { } def sendCalPrice(){ - def dists = CommonDatautils.findAllDistrictByCity("东莞", "district", ["city","region","name","estate_type2"]) + def dists = CommonDatautils.findAllDistrictByCity("涓滆帪", "district", ["city","region","name","estate_type2"]) def startDate = DateUtils.parseFromTightYYYYMMDD("2022-05-27") def endDate = DateUtils.parseFromTightYYYYMMDD("2022-06-14") for(def data : dists){ @@ -46,7 +46,7 @@ class CcbDistrictToDB { def updateDongguangRegion(){ def cDate = DateUtils.parseFromTightByPattern("2022-04-27","yyyy-MM-dd") - def dist = CommonDatautils.findAllDistrictByCity("东莞", "district", ["city","region","name","c_date","estate_type2"]) + def dist = CommonDatautils.findAllDistrictByCity("涓滆帪", "district", ["city","region","name","c_date","estate_type2"]) for(def d : dist){ def t = d.c_date if(t.getTime()>cDate.getTime()){ @@ -56,7 +56,7 @@ class CcbDistrictToDB { } def updateDistrict(){ - def citys = ["惠州","东莞","金华","苏州","桂林","潮州","廊坊","临沧","通辽","雅安"] + def citys = ["鎯犲窞","涓滆帪","閲戝崕","鑻忓窞","妗傛灄","娼窞","寤婂潑","涓存钵","閫氳窘","闆呭畨"] def cDate = DateUtils.parseFromTightByPattern("2022-04-27","yyyy-MM-dd") def index = 0 for(def city : citys){ @@ -97,14 +97,14 @@ class CcbDistrictToDB { def index = 0 def addIndex = 0 def keys = new CopyOnWriteArrayList() - ExcelUtils.modify("D:\\数据\\建行\\二期\\新增小区_2155.xlsx", { d -> + ExcelUtils.modify("D:\\鏁版嵁\\寤鸿\\浜屾湡\\鏂板灏忓尯_2155.xlsx", { d -> index++ if(d['A']){ def city = d['A'] def mapInfo = getStreetInfo(d['L']+","+d['M']) def newRegion = null if(mapInfo){ - if(d['A']=="东莞"){ + if(d['A']=="涓滆帪"){ newRegion = mapInfo.township }else{ newRegion = mapInfo.district @@ -121,19 +121,19 @@ class CcbDistrictToDB { } - def estateType2 = "普通住宅" + def estateType2 = "鏅�氫綇瀹�" if(name){ - if(name.contains("别墅")){ - estateType2 = "别墅" - }else if(name.contains("商住")){ - estateType2 = "商住" + if(name.contains("鍒")){ + estateType2 = "鍒" + }else if(name.contains("鍟嗕綇")){ + estateType2 = "鍟嗕綇" }else{ def type = d['K'] if(type){ - if(type.contains("别墅")){ - estateType2 = "别墅" - }else if(type.contains("商住")){ - estateType2 = "商住" + if(type.contains("鍒")){ + estateType2 = "鍒" + }else if(type.contains("鍟嗕綇")){ + estateType2 = "鍟嗕綇" } } } @@ -183,7 +183,7 @@ class CcbDistrictToDB { data.put("lng2", blng) } def markMap = [:] - markMap.put("data_source", "机器入库") + markMap.put("data_source", "鏈哄櫒鍏ュ簱") data.put("mark_map", markMap) index++ DbUtils.seaweed.save(data); @@ -240,7 +240,7 @@ class CcbDistrictToDB { } }else{ - println d['A']+" "+d['B']+" "+d['C'] +" 经纬度所在区:"+newRegion + println d['A']+" "+d['B']+" "+d['C'] +" 缁忕含搴︽墍鍦ㄥ尯锛�"+newRegion } } }); @@ -248,7 +248,7 @@ class CcbDistrictToDB { def meituanSqrentRun(){ def index = 0 - ExcelUtils.modify("D:\\数据\\美团\\美团待入库.xlsx", { d -> + ExcelUtils.modify("D:\\鏁版嵁\\缇庡洟\\缇庡洟寰呭叆搴�.xlsx", { d -> index++ println index+" "+d['H'] def city = d['F'] @@ -259,18 +259,18 @@ class CcbDistrictToDB { name = nameFileter(name) if(name){ - def estateType2 = "普通住宅" - if(name.contains("别墅")){ - estateType2 = "别墅" - }else if(name.contains("商住")){ - estateType2 = "商住" + def estateType2 = "鏅�氫綇瀹�" + if(name.contains("鍒")){ + estateType2 = "鍒" + }else if(name.contains("鍟嗕綇")){ + estateType2 = "鍟嗕綇" }else{ def type = d['I'] if(type){ - if(type.contains("别墅")){ - estateType2 = "别墅" - }else if(type.contains("商住")){ - estateType2 = "商住" + if(type.contains("鍒")){ + estateType2 = "鍒" + }else if(type.contains("鍟嗕綇")){ + estateType2 = "鍟嗕綇" } } } @@ -282,10 +282,10 @@ class CcbDistrictToDB { } def meituanRun(){ - def index = 0//美团需入库小区合并后.xlsx + def index = 0//缇庡洟闇�鍏ュ簱灏忓尯鍚堝苟鍚�.xlsx def keys = new CopyOnWriteArrayList() - ExcelUtils.multiThreadingModify("D:\\数据\\美团\\美团待入库.xlsx", { d -> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\缇庡洟\\缇庡洟寰呭叆搴�.xlsx", { d -> index++ println index+" "+d['H'] def city = d['F'] @@ -301,16 +301,16 @@ class CcbDistrictToDB { formatAddress = AddressUtil.formatAddress(city, d['I']) } -// if(!formatAddress || (formatAddress && !formatAddress.contains("号") && !formatAddress.contains("交叉"))){ +// if(!formatAddress || (formatAddress && !formatAddress.contains("鍙�") && !formatAddress.contains("浜ゅ弶"))){ // def rets = OpenApiUtils.getGaoDeSearchLocation(city, region, name) // def map = findStandardObject2(city,region, name, d['E'], rets); // if(map && map.address){ // formatAddress = AddressUtil.formatAddress(city, map.address) // if(!formatAddress){ -// if(map.address.contains("交叉口")){ -// formatAddress = map.address.substring(0, map.address.toString().indexOf("交叉口")+3) -// }else if(map.address.contains("交叉")){ -// formatAddress = map.address.substring(0, map.address.toString().indexOf("交叉")+2) +// if(map.address.contains("浜ゅ弶鍙�")){ +// formatAddress = map.address.substring(0, map.address.toString().indexOf("浜ゅ弶鍙�")+3) +// }else if(map.address.contains("浜ゅ弶")){ +// formatAddress = map.address.substring(0, map.address.toString().indexOf("浜ゅ弶")+2) // } // } // } @@ -329,18 +329,18 @@ class CcbDistrictToDB { blat = baidu.y * 10000000000L } - def estateType2 = "普通住宅" - if (name.contains("别墅")) { - estateType2 = "别墅" - } else if (name.contains("商住")) { - estateType2 = "商住" + def estateType2 = "鏅�氫綇瀹�" + if (name.contains("鍒")) { + estateType2 = "鍒" + } else if (name.contains("鍟嗕綇")) { + estateType2 = "鍟嗕綇" } else { def type = d['J'] if (type) { - if (type.contains("别墅")) { - estateType2 = "别墅" - } else if (type.contains("商住")) { - estateType2 = "商住" + if (type.contains("鍒")) { + estateType2 = "鍒" + } else if (type.contains("鍟嗕綇")) { + estateType2 = "鍟嗕綇" } } } @@ -368,7 +368,7 @@ class CcbDistrictToDB { data.put("lng2", blng) } def markMap = [:] - markMap.put("data_source", "机器入库") + markMap.put("data_source", "鏈哄櫒鍏ュ簱") data.put("mark_map", markMap) index++ DbUtils.seaweed.save(data); @@ -388,7 +388,7 @@ class CcbDistrictToDB { } } }else{ - println city +" "+region +" 区域无法标准化" + println city +" "+region +" 鍖哄煙鏃犳硶鏍囧噯鍖�" } },0); } @@ -406,7 +406,7 @@ class CcbDistrictToDB { def index = 0 - ExcelUtils.multiThreadingModify("D:\\数据\\建行\\房产估值\\小区\\新增小区数据_1236.xlsx", { d -> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\灏忓尯\\鏂板灏忓尯鏁版嵁_1236.xlsx", { d -> def city = d['A'] def region = d['B'] def newRegion = RegionData.formatRegion(city, region) @@ -447,11 +447,11 @@ class CcbDistrictToDB { blat = baidu.y * 10000000000L } - def estateType2 = "普通住宅" - if(name.contains("别墅")){ - estateType2 = "别墅" - }else if(name.contains("商住")){ - estateType2 = "商住" + def estateType2 = "鏅�氫綇瀹�" + if(name.contains("鍒")){ + estateType2 = "鍒" + }else if(name.contains("鍟嗕綇")){ + estateType2 = "鍟嗕綇" } if(name){ @@ -480,7 +480,7 @@ class CcbDistrictToDB { } def markMap = [:] - markMap.put("data_source", "机器入库") + markMap.put("data_source", "鏈哄櫒鍏ュ簱") data.put("mark_map",markMap) index++ DbUtils.seaweed.save(data); @@ -493,11 +493,11 @@ class CcbDistrictToDB { } def run(){ - def files = ["北京融合匹配_1215.xlsx","广州融合匹配_1215.xlsx","杭州融合匹配_1216.xlsx","合肥融合匹配_1216.xlsx","深圳融合匹配_1215.xlsx","石家庄融合匹配_1216.xlsx","苏州融合匹配_1216.xlsx","武汉融合匹配_1216.xlsx","西安融合匹配_1216.xlsx","重庆融合匹配_1215.xlsx"] + def files = ["鍖椾含铻嶅悎鍖归厤_1215.xlsx","骞垮窞铻嶅悎鍖归厤_1215.xlsx","鏉窞铻嶅悎鍖归厤_1216.xlsx","鍚堣偉铻嶅悎鍖归厤_1216.xlsx","娣卞湷铻嶅悎鍖归厤_1215.xlsx","鐭冲搴勮瀺鍚堝尮閰峗1216.xlsx","鑻忓窞铻嶅悎鍖归厤_1216.xlsx","姝︽眽铻嶅悎鍖归厤_1216.xlsx","瑗垮畨铻嶅悎鍖归厤_1216.xlsx","閲嶅簡铻嶅悎鍖归厤_1215.xlsx"] def index = 0 for(def f : files){ - ExcelUtils.modify("D:\\数据\\建行\\房产估值\\小区\\融合\\10个城市新增小区\\" + f, { d -> -// if(d['I']=="棠德花苑新社区"){ + ExcelUtils.modify("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\灏忓尯\\铻嶅悎\\10涓煄甯傛柊澧炲皬鍖篭\" + f, { d -> +// if(d['I']=="妫犲痉鑺辫嫅鏂扮ぞ鍖�"){ def city = d['A'] def region = d['C'] def newRegion = RegionData.formatRegion(city, region) @@ -557,11 +557,11 @@ class CcbDistrictToDB { } } - def estateType2 = "普通住宅" - if(name.contains("别墅")){ - estateType2 = "别墅" - }else if(name.contains("商住")){ - estateType2 = "商住" + def estateType2 = "鏅�氫綇瀹�" + if(name.contains("鍒")){ + estateType2 = "鍒" + }else if(name.contains("鍟嗕綇")){ + estateType2 = "鍟嗕綇" } if(name){ @@ -589,7 +589,7 @@ class CcbDistrictToDB { } def markMap = [:] - markMap.put("data_source", "机器入库") + markMap.put("data_source", "鏈哄櫒鍏ュ簱") data.put("mark_map",markMap) index++ DbUtils.seaweed.save(data); @@ -604,9 +604,9 @@ class CcbDistrictToDB { def nameFileter(def name){ if(name){ - name = name.replace("·","").replace(".","").replace("|","") - name = name.replace("1期","一期").replace("2期","二期").replace("3期","三期").replace("4期","四期").replace("5期","五期").replace("6期","6期") - name = name.replace("1区","一区").replace("2区","二区").replace("3区","三区").replace("4区","四区").replace("5区","五区").replace("6区","六区") + name = name.replace("路","").replace(".","").replace("|","") + name = name.replace("1鏈�","涓�鏈�").replace("2鏈�","浜屾湡").replace("3鏈�","涓夋湡").replace("4鏈�","鍥涙湡").replace("5鏈�","浜旀湡").replace("6鏈�","6鏈�") + name = name.replace("1鍖�","涓�鍖�").replace("2鍖�","浜屽尯").replace("3鍖�","涓夊尯").replace("4鍖�","鍥涘尯").replace("5鍖�","浜斿尯").replace("6鍖�","鍏尯") } return name; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/CcbRegionCode.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/CcbRegionCode.groovy index b2541547c..7520297b9 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/CcbRegionCode.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/CcbRegionCode.groovy @@ -8,7 +8,7 @@ import com.mongodb.DBCollection DBCollection FANGJIA_AREA_CODE = MongoUtils.getCollectionByName("business", "fangjia_area_code", "mongo.db.fangjia.com") -def datas = ExcelUtils.read("D:\\数据\\建行\\二期\\建行最终区域编码.xlsx", 0, 1) +def datas = ExcelUtils.read("D:\\鏁版嵁\\寤鸿\\浜屾湡\\寤鸿鏈�缁堝尯鍩熺紪鐮�.xlsx", 0, 1) for(def d : datas){ def dbo = new BasicDBObject() dbo.put("province",d['C']) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/DistrictMarge.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/DistrictMarge.groovy index 99e779ac6..01b4b71af 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/DistrictMarge.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/DistrictMarge.groovy @@ -21,7 +21,7 @@ class DistrictMarge { task.addMappingAlias() } def updateAddress(){ - ExcelUtils.multiThreadingModify("D:\\数据\\建行\\更新小区地址_0608.xlsx", { d -> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\寤鸿\\鏇存柊灏忓尯鍦板潃_0608.xlsx", { d -> if (d['A']) { def region = d['B'].trim() def newRegion = RegionData.formatRegion(d['A'], region) @@ -34,14 +34,14 @@ class DistrictMarge { DbUtils.seaweed.update(new BasicDBObject('_id', dist._id),new BasicDBObject('$set', udata)) } }else{ - println d['A'] + " 格式化失败 "+d['B'] + println d['A'] + " 鏍煎紡鍖栧け璐� "+d['B'] } } }); } def removeDist(){ - ExcelUtils.modify("D:\\数据\\建行\\删除小区数据_245_0608.xlsx", { d -> + ExcelUtils.modify("D:\\鏁版嵁\\寤鸿\\鍒犻櫎灏忓尯鏁版嵁_245_0608.xlsx", { d -> if (d['A']) { def region = d['B'] def newRegion = RegionData.formatRegion(d['A'], region) @@ -53,10 +53,10 @@ class DistrictMarge { udata.put("m_date", new Date()) DbUtils.seaweed.update(new BasicDBObject('_id', dist._id),new BasicDBObject('$set', udata)) }else{ - println d['A']+" "+d['C']+" 不存在" + println d['A']+" "+d['C']+" 涓嶅瓨鍦�" } }else{ - println d['A'] + " 格式化失败 "+d['B'] + println d['A'] + " 鏍煎紡鍖栧け璐� "+d['B'] } } }) @@ -64,7 +64,7 @@ class DistrictMarge { def addMappingAlias(){ def index = 0 - ExcelUtils.multiThreadingModify("D:\\数据\\建行\\新增映射别名_0608.xlsx", { d -> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\寤鸿\\鏂板鏄犲皠鍒悕_0608.xlsx", { d -> index ++ if (d['A']) { def region = d['B'].trim() @@ -77,7 +77,7 @@ class DistrictMarge { mapping_alias = [] } def alias = d['D'] - def arrs = alias.split("、") + def arrs = alias.split("銆�") for(def s : arrs){ if(!mapping_alias.contains(s)){ mapping_alias << s @@ -89,7 +89,7 @@ class DistrictMarge { DbUtils.seaweed.update(new BasicDBObject('_id', dist._id),new BasicDBObject('$set', udata)) } }else{ - println d['A'] + " 格式化失败 "+d['B'] + println d['A'] + " 鏍煎紡鍖栧け璐� "+d['B'] } } }) @@ -106,7 +106,7 @@ class DistrictMarge { def map = [:] for(def d : districts){ if(d.name_cat == 0 && d.lng){ - if(d.address && d.address.contains("号")){ + if(d.address && d.address.contains("鍙�")){ def list = map.get(d.address) if(!list){ list = [] @@ -132,13 +132,13 @@ class DistrictMarge { def names = [] for(def d : vals){ def newKey = d.name - if(d.name.contains("小区")){ - newKey = d.name.toString().replace("小区", "") + if(d.name.contains("灏忓尯")){ + newKey = d.name.toString().replace("灏忓尯", "") } if(!names.contains(newKey)){ names << newKey }else{ - d.flag = "删除" + d.flag = "鍒犻櫎" def udata = new BasicDBObject() udata.put("name_cat", 11) udata.put("m_date",new Date()) @@ -170,8 +170,8 @@ class DistrictMarge { } results << rows } - // ExcelUtils.write("d:\\数据\\小区\\删除重复地址(${city}).xlsx", results, "sheet") - println "${city} 共:"+map.size()+" 2个以上:"+newMap.size()+" delcount:"+delcount + // ExcelUtils.write("d:\\鏁版嵁\\灏忓尯\\鍒犻櫎閲嶅鍦板潃(${city}).xlsx", results, "sheet") + println "${city} 鍏憋細"+map.size()+" 2涓互涓婏細"+newMap.size()+" delcount:"+delcount } @@ -213,7 +213,7 @@ class DistrictMarge { if(obj['D']){ addAlias << obj['D'] } - //0-正常 1-非小区,2-地块, 3-无效小区,7-自然村 8:建行整理删除(单一来源或其它) 9-高德比对王一期不存在删除 10:小区重复合并删除 11:人工整理删除 + //0-姝e父 1-闈炲皬鍖猴紝2-鍦板潡锛� 3-鏃犳晥灏忓尯锛�7-鑷劧鏉� 8:寤鸿鏁寸悊鍒犻櫎锛堝崟涓�鏉ユ簮鎴栧叾瀹冿級 9-楂樺痉姣斿鐜嬩竴鏈熶笉瀛樺湪鍒犻櫎 10锛氬皬鍖洪噸澶嶅悎骞跺垹闄� 11锛氫汉宸ユ暣鐞嗗垹闄� def udata = new BasicDBObject() udata.put("name_cat", 10) udata.put("m_date",new Date()) @@ -222,7 +222,7 @@ class DistrictMarge { q.put("_id", new ObjectId(obj['A'])); DbUtils.seaweed.update(q, new BasicDBObject('$set', udata)) deleteIndex++ - println "删除:"+obj['A'] + println "鍒犻櫎锛�"+obj['A'] } } @@ -263,21 +263,21 @@ class DistrictMarge { DbUtils.seaweed.update(q, new BasicDBObject('$set', mudata)) updateIndex++ - println "修改:"+updateObj['A'] + " "+ mudata + println "淇敼锛�"+updateObj['A'] + " "+ mudata }else{ - println amap_id+" 此组无更新" + println amap_id+" 姝ょ粍鏃犳洿鏂�" } } } } - println "组:"+rets.size() - println "删:"+deleteIndex - println "修:"+updateIndex + println "缁勶細"+rets.size() + println "鍒狅細"+deleteIndex + println "淇細"+updateIndex } def getDatas(){ - def datas = ExcelUtils.read("D:\\数据\\建行\\房产估值\\小区\\重庆反查数据_669(审核完毕)(1).xlsx",0,1) + def datas = ExcelUtils.read("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\灏忓尯\\閲嶅簡鍙嶆煡鏁版嵁_669(瀹℃牳瀹屾瘯)(1).xlsx",0,1) def map = [:] for(def d : datas){ if(d['E']){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/ExcelDataTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/ExcelDataTest.groovy index f23121d0c..2ada98fbb 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/ExcelDataTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/ExcelDataTest.groovy @@ -38,7 +38,7 @@ ExcelUtils.multiThreadingModify("C:\\Users\\gaojuan\\Desktop\\city.xlsx",{d-> //d['C'] = avg_price // def q = new BasicDBObject() -// q.put("area_name",new BasicDBObject( '$regex' , d['B'].replace("州","")+/.*$/)) +// q.put("area_name",new BasicDBObject( '$regex' , d['B'].replace("宸�","")+/.*$/)) // def obj = COMMUNITY_CONN.findOne(q) // if(obj){ // d['D'] = obj.area_code @@ -118,7 +118,7 @@ def findDistrictPriceCount(def city, def weekend, def CITY_INFO){ -//ExcelUtils.multiThreadingModify("D:\\数据\\建行\\房产估值\\小区\\人工核实_8511.xlsx", { d -> +//ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\灏忓尯\\浜哄伐鏍稿疄_8511.xlsx", { d -> // def newRegion = RegionData.formatRegion(d['A'], d['B']) // if(newRegion && !d['K']) { // def rMap = SeaweedDataMatchProcess.doMatch(d['A'], newRegion, d['C'], d['D']+d['E']); @@ -135,19 +135,19 @@ def findDistrictPriceCount(def city, def weekend, def CITY_INFO){ //}); -//ExcelUtils.multiThreadingModify("D:\\数据\\建行\\房产估值\\小区\\人工审核_3016结果.xlsx",{d-> +//ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\灏忓尯\\浜哄伐瀹℃牳_3016缁撴灉.xlsx",{d-> // def newRegion = RegionData.formatRegion(d['A'], d['B']) // if(newRegion && !d['K']){ // // def dist = CommonDatautils.findDistrict(d['A'], newRegion, d['C'],"district") // if(dist){ -// d['K']="完全一致" +// d['K']="瀹屽叏涓�鑷�" // d['L'] = dist.estate_type2 // d['M'] = dist.name_cat // }else{ // dist = CommonDatautils.findSeaweedByMappingAlias(d['A'], newRegion, d['C'],"district") // if(dist){ -// d['K']="映射别名" +// d['K']="鏄犲皠鍒悕" // d['L'] = dist.estate_type2 // d['M'] = dist.name_cat // }else{ @@ -156,7 +156,7 @@ def findDistrictPriceCount(def city, def weekend, def CITY_INFO){ // dist = rets[0] // } // if(rets){ -// d['K']="别名" +// d['K']="鍒悕" // d['L'] = dist.estate_type2 // d['M'] = dist.name_cat // } @@ -166,19 +166,19 @@ def findDistrictPriceCount(def city, def weekend, def CITY_INFO){ // //},0) -//ExcelUtils.multiThreadingModify("D:\\数据\\建行\\房产估值\\小区\\人工审核_3016结果.xlsx",{d-> +//ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\灏忓尯\\浜哄伐瀹℃牳_3016缁撴灉.xlsx",{d-> // def newRegion = RegionData.formatRegion(d['A'], d['B']) // if(newRegion && !d['K'] && d['G']){ // // def dist = CommonDatautils.findDistrict(d['A'], newRegion, d['G'],"district") // if(dist){ -// d['K']="完全一致(高德)" +// d['K']="瀹屽叏涓�鑷�(楂樺痉)" // d['L'] = dist.estate_type2 // d['M'] = dist.name_cat // }else{ // dist = CommonDatautils.findSeaweedByMappingAlias(d['A'], newRegion, d['G'],"district") // if(dist){ -// d['K']="映射别名(高德)" +// d['K']="鏄犲皠鍒悕(楂樺痉)" // d['L'] = dist.estate_type2 // d['M'] = dist.name_cat // }else{ @@ -187,7 +187,7 @@ def findDistrictPriceCount(def city, def weekend, def CITY_INFO){ // dist = rets[0] // } // if(rets){ -// d['K']="别名(高德)" +// d['K']="鍒悕(楂樺痉)" // d['L'] = dist.estate_type2 // d['M'] = dist.name_cat // } @@ -198,7 +198,7 @@ def findDistrictPriceCount(def city, def weekend, def CITY_INFO){ //},0) -//ExcelUtils.multiThreadingModify("D:\\数据\\建行\\房产估值\\小区\\价格过滤小区融合情况_1209.xlsx",{d-> +//ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\灏忓尯\\浠锋牸杩囨护灏忓尯铻嶅悎鎯呭喌_1209.xlsx",{d-> // def dist = CommonDatautils.findDistrictFieldById(d['F'], ["address","lat","lng"]) // if(dist){ // d['Z'] = dist.address @@ -209,7 +209,7 @@ def findDistrictPriceCount(def city, def weekend, def CITY_INFO){ // } //},0) -//def cityDatas = ExcelUtils.read("D:\\数据\\建行\\房产估值\\小区\\重庆高德反查数据_1529.xlsx",0,1) +//def cityDatas = ExcelUtils.read("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\灏忓尯\\閲嶅簡楂樺痉鍙嶆煡鏁版嵁_1529.xlsx",0,1) //def cityDataMap = [:] //for(def row : cityDatas){ // if(row['D']){ @@ -217,7 +217,7 @@ def findDistrictPriceCount(def city, def weekend, def CITY_INFO){ // } //} // -//ExcelUtils.multiThreadingModify("D:\\数据\\建行\\房产估值\\小区\\高德反查数据_1529.xlsx",{d-> +//ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\灏忓尯\\楂樺痉鍙嶆煡鏁版嵁_1529.xlsx",{d-> // // def newRegion = RegionData.formatRegion(d['A'], d['B']) // def key = d['A']+"##"+newRegion+"##"+d['C'] @@ -233,8 +233,8 @@ def findDistrictPriceCount(def city, def weekend, def CITY_INFO){ // } //},0) -def city = "广州" -//ExcelUtils.modify("D:\\数据\\广发\\楼盘评级测试案例.xlsx",{d-> +def city = "骞垮窞" +//ExcelUtils.modify("D:\\鏁版嵁\\骞垮彂\\妤肩洏璇勭骇娴嬭瘯妗堜緥.xlsx",{d-> // def newRegion = RegionData.formatRegion(city, d['A']) // if(newRegion){ // def rMap = SeaweedDataMatchProcess.doMatch(city, newRegion, d['B'], null); @@ -246,7 +246,7 @@ def city = " // //},0) -//ExcelUtils.multiThreadingModify("D:\\数据\\建行\\房产估值\\小区\\融合\\广州 - 副本.xlsx",{d-> +//ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\灏忓尯\\铻嶅悎\\骞垮窞 - 鍓湰.xlsx",{d-> // def newRegion = RegionData.formatRegion(city, d['E']) // if(newRegion){ // def rMap = SeaweedDataMatchProcess.doMatch(city, newRegion, d['F'], null); @@ -257,14 +257,14 @@ def city = " // } //},0) -//def datas = ExcelUtils.read("D:\\数据\\建行\\房产估值\\小区\\融合\\广州 - 副本.xlsx",0, 1) +//def datas = ExcelUtils.read("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\灏忓尯\\铻嶅悎\\骞垮窞 - 鍓湰.xlsx",0, 1) //def idMaps = [:] //for(def d : datas){ // if(d['L']){ // idMaps.put(d['L']+"##"+d['M'], d) // } //} -//ExcelUtils.modify("D:\\数据\\广发\\楼盘评级测试案例.xlsx",{d-> +//ExcelUtils.modify("D:\\鏁版嵁\\骞垮彂\\妤肩洏璇勭骇娴嬭瘯妗堜緥.xlsx",{d-> // if(d['C']){ // def key = d['C']+"##"+d['D'] // def rows = idMaps.get(key) @@ -277,8 +277,8 @@ def city = " //},0) -//ExcelUtils.modify("D:\\数据\\广发\\楼盘评级测试案例(合并).xlsx",{d-> -// def obj = CommonDatautils.findDistrict("广州", d['C'], d['D'], "district") +//ExcelUtils.modify("D:\\鏁版嵁\\骞垮彂\\妤肩洏璇勭骇娴嬭瘯妗堜緥(鍚堝苟).xlsx",{d-> +// def obj = CommonDatautils.findDistrict("骞垮窞", d['C'], d['D'], "district") // if(obj){ //// def year = CommonUtils.getDistrictAge(obj) //// if(year){ @@ -294,19 +294,19 @@ def city = " // } //},0) -//def data1s = ExcelUtils.read("D:\\数据\\广发\\图片转换汇总1.8.xlsx",0, 1) +//def data1s = ExcelUtils.read("D:\\鏁版嵁\\骞垮彂\\鍥剧墖杞崲姹囨��1.8.xlsx",0, 1) //def scoreMap = [:] //for(def d : data1s){ // scoreMap.put(d['B'], d) //} // -//def data2s = ExcelUtils.read("D:\\数据\\广发\\图片转换汇总1.8.xlsx",1, 1) +//def data2s = ExcelUtils.read("D:\\鏁版嵁\\骞垮彂\\鍥剧墖杞崲姹囨��1.8.xlsx",1, 1) //def levelMap = [:] //for(def d : data2s){ // levelMap.put(d['E'], d) //} // -//ExcelUtils.modify("D:\\数据\\广发\\楼盘评级测试案例.xlsx",{d-> +//ExcelUtils.modify("D:\\鏁版嵁\\骞垮彂\\妤肩洏璇勭骇娴嬭瘯妗堜緥.xlsx",{d-> // if(d['E']){ // def row = scoreMap.get(d['E']) // if(row){ @@ -332,14 +332,14 @@ def city = " // } //},0) -//ExcelUtils.modify("D:\\数据\\成交\\福州成交.xlsx",{d-> +//ExcelUtils.modify("D:\\鏁版嵁\\鎴愪氦\\绂忓窞鎴愪氦.xlsx",{d-> // def o = new BasicDBObject() // o.area = d['D'].toDouble() // o.avg_price = d['F'].toInteger() -// o.city = "福州" +// o.city = "绂忓窞" // o.district_name = d['C'] // o.region = d['B'] -// o.source = "贝壳找房" +// o.source = "璐濆3鎵炬埧" // o.trade_date = DateUtils.parseFromTightYYYYMMDD(d['M']) // o.total_price = d['E'].toInteger()*10000 // if(d['I']){ @@ -358,8 +358,8 @@ def city = " //},0) -//ExcelUtils.multiThreadingModify("D:\\数据\\建行\\房产估值\\小区\\新增数据_1269.xlsx", { d -> -// if(d['K'] && d['K']=="别名"){ +//ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\灏忓尯\\鏂板鏁版嵁_1269.xlsx", { d -> +// if(d['K'] && d['K']=="鍒悕"){ // def newRegion = RegionData.formatRegion(d['A'], d['B']) // if(newRegion){ // def rets = CommonDatautils.findDistrictByAlias(d['A'], newRegion, d['C'],"district") @@ -384,8 +384,8 @@ def city = " //}); -//ExcelUtils.modify("D:\\数据\\建行\\房产估值\\小区\\新增数据_1269.xlsx", { d -> -// if(d['K'] && d['K']=="映射别名(高德)" && d['G']){ +//ExcelUtils.modify("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\灏忓尯\\鏂板鏁版嵁_1269.xlsx", { d -> +// if(d['K'] && d['K']=="鏄犲皠鍒悕(楂樺痉)" && d['G']){ // def newRegion = RegionData.formatRegion(d['A'], d['B']) // if(newRegion){ // dist = CommonDatautils.findSeaweedByMappingAlias(d['A'], newRegion, d['G'],"district") @@ -406,8 +406,8 @@ def city = " //}); -//ExcelUtils.modify("D:\\数据\\建行\\房产估值\\小区\\新增数据_1269.xlsx", { d -> -// if(d['K'] && d['K']=="别名(高德)" && d['G']){ +//ExcelUtils.modify("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\灏忓尯\\鏂板鏁版嵁_1269.xlsx", { d -> +// if(d['K'] && d['K']=="鍒悕(楂樺痉)" && d['G']){ // def newRegion = RegionData.formatRegion(d['A'], d['B']) // if(newRegion){ // def rets = CommonDatautils.findDistrictByAlias(d['A'], newRegion, d['G'],"district") @@ -434,8 +434,8 @@ def city = " //def rets = [] -//ExcelUtils.modify("D:\\数据\\建行\\房产估值\\小区\\国信达名字加入映射别名.xlsx", { d -> -// if(d['A'] && d['E'].toString().contains("鑫康花园北区")){ +//ExcelUtils.modify("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\灏忓尯\\鍥戒俊杈惧悕瀛楀姞鍏ユ槧灏勫埆鍚�.xlsx", { d -> +// if(d['A'] && d['E'].toString().contains("閼悍鑺卞洯鍖楀尯")){ // def newRegion = RegionData.formatRegion(d['A'], d['B']) // if(newRegion){ // def dist = CommonDatautils.findDistrict(d['A'], newRegion, d['C'], "district") @@ -457,11 +457,11 @@ def city = " // } // } //}) -//ExcelUtils.write("D:\\数据\\建行\\房产估值\\小区\\新增映射别名.xlsx", rets,"数据") +//ExcelUtils.write("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\灏忓尯\\鏂板鏄犲皠鍒悕.xlsx", rets,"鏁版嵁") //def rets = [] -//ExcelUtils.modify("D:\\数据\\建行\\房产估值\\小区\\查询别名表,将国信达数据增加到映射别名表里.xlsx", { d -> +//ExcelUtils.modify("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\灏忓尯\\鏌ヨ鍒悕琛紝灏嗗浗淇¤揪鏁版嵁澧炲姞鍒版槧灏勫埆鍚嶈〃閲�.xlsx", { d -> // if(d['A']){ // def newRegion = RegionData.formatRegion(d['A'], d['B']) // if(newRegion){ @@ -488,10 +488,10 @@ def city = " // } // } //}) -//ExcelUtils.write("D:\\数据\\建行\\房产估值\\小区\\新增映射别名_2.xlsx", rets,"数据") +//ExcelUtils.write("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\灏忓尯\\鏂板鏄犲皠鍒悕_2.xlsx", rets,"鏁版嵁") -//ExcelUtils.modify("D:\\数据\\建行\\房产估值\\小区\\修改状态的数据.xlsx", { d -> +//ExcelUtils.modify("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\灏忓尯\\淇敼鐘舵�佺殑鏁版嵁.xlsx", { d -> // if(d['A']) { // def newRegion = RegionData.formatRegion(d['A'], d['B']) // if (newRegion) { @@ -502,9 +502,9 @@ def city = " // } // } //}) -//ExcelUtils.write("D:\\数据\\建行\\房产估值\\小区\\映射别名存在——修改状态.xlsx", rets,"数据") +//ExcelUtils.write("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\灏忓尯\\鏄犲皠鍒悕瀛樺湪鈥斺�斾慨鏀圭姸鎬�.xlsx", rets,"鏁版嵁") -//ExcelUtils.multiThreadingModify("D:\\数据\\建行\\房产估值\\小区\\修改后结果数据.xlsx",{d-> +//ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\灏忓尯\\淇敼鍚庣粨鏋滄暟鎹�.xlsx",{d-> // if(d['A']){ // def dist = CommonDatautils.findDistrictById(d['B']) // if(dist){ @@ -519,7 +519,7 @@ def city = " //}) -//ExcelUtils.multiThreadingModify("D:\\数据\\建行\\房产估值\\小区\\修改后结果数据.xlsx",{d-> +//ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\灏忓尯\\淇敼鍚庣粨鏋滄暟鎹�.xlsx",{d-> // if(d['B']) { // def sql = "select count(*) as count from bigdata_community_gj where commid='${d['B']}'"; // def count = 0; @@ -527,13 +527,13 @@ def city = " // count = r.count // }) // if(count>=1){ -// d['J'] = "oracle存在" +// d['J'] = "oracle瀛樺湪" // } // } //}) //def index = 0 -//ExcelUtils.modify("D:\\数据\\建行\\房产估值\\小区\\漏映射别名.xlsx", { d -> +//ExcelUtils.modify("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\灏忓尯\\婕忔槧灏勫埆鍚�.xlsx", { d -> // if (d['B']) { // def dist = CommonDatautils.findDistrictFieldById(d['B'],["city","region","name","mapping_alias"]) // if(dist){ @@ -553,7 +553,7 @@ def city = " // } //}) -//ExcelUtils.modify("D:\\数据\\小区\\评级小区.xls", { d -> +//ExcelUtils.modify("D:\\鏁版嵁\\灏忓尯\\璇勭骇灏忓尯.xls", { d -> // if(d['A']){ // try{ // def dist = CommonDatautils.findDistrictFieldById(d['A'],["city","region","name"]) @@ -573,7 +573,7 @@ def city = " // //}) -//ExcelUtils.modify("D:\\数据\\建行\\房产估值\\小区\\删除映射别名数据的副本.xlsx", { d -> +//ExcelUtils.modify("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\灏忓尯\\鍒犻櫎鏄犲皠鍒悕鏁版嵁鐨勫壇鏈�.xlsx", { d -> // if(d['A']){ // def dist = CommonDatautils.findDistrictById(d['A']) // if(dist){ @@ -586,13 +586,13 @@ def city = " // udata.put("m_date", new Date()); // DbUtils.seaweed.update(new BasicDBObject("_id", d['A']), new BasicDBObject('$set', udata)) // }else{ -// println d['A']+"无映射别名" +// println d['A']+"鏃犳槧灏勫埆鍚�" // } // }else{ -// println d['A']+"映射别名为空" +// println d['A']+"鏄犲皠鍒悕涓虹┖" // } // }else{ -// println d['A']+"没找到" +// println d['A']+"娌℃壘鍒�" // } // } //}) \ No newline at end of file diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/MapAddressMatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/MapAddressMatch.groovy index 00efe7807..338167443 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/MapAddressMatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/MapAddressMatch.groovy @@ -13,19 +13,19 @@ class MapAddressMatch { } def run(){ - def city = "北京" + def city = "鍖椾含" def index = 0 - ExcelUtils.multiThreadingModify("D:\\数据\\建行\\房产估值\\小区\\北京地址重复数据.xlsx", { d -> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\灏忓尯\\鍖椾含鍦板潃閲嶅鏁版嵁.xlsx", { d -> index++ println index +" "+ d['D']+" "+d['E'] if(!d['G']){ -// def gdData = FangjiaClientUtils.getMapData(city, d['D'],d['E'], d['K'],"", "高德") +// def gdData = FangjiaClientUtils.getMapData(city, d['D'],d['E'], d['K'],"", "楂樺痉") // if(gdData){ // d['F'] = gdData.district // d['G'] = gdData.name // d['H'] = gdData.address // d['I'] = gdData.type -// d['J'] = "高德" +// d['J'] = "楂樺痉" // }else{ def rets = OpenApiUtils.getGaoDeSearchLocation(city,d['D'],d['E']) def map = findStandardObject(city,d['D'],d['E'], rets); @@ -62,7 +62,7 @@ class MapAddressMatch { if (rets) { if (rets.size() >= 1) { for (def mapObj : rets) { - if(mapObj.name && (mapObj.name.contains("(公交站)")||mapObj.name.contains("门)")||mapObj.name.contains("停车场"))){ + if(mapObj.name && (mapObj.name.contains("(鍏氦绔�)")||mapObj.name.contains("闂�)")||mapObj.name.contains("鍋滆溅鍦�"))){ continue; } // if((mapObj.adname && mapObj.adname.contains(region)) || (mapObj.region && mapObj.region.contains(region))){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/MatchDealPriceRegion.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/MatchDealPriceRegion.groovy index 903a4b107..e5532f9ad 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/MatchDealPriceRegion.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/MatchDealPriceRegion.groovy @@ -22,7 +22,7 @@ class MatchDealPriceRegion { def run(){ def index = 0 - ExcelUtils.multiThreadingModify("D:\\数据\\建行\\房产估值\\成交\\部分未匹配成交.xlsx",{d-> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鎴愪氦\\閮ㄥ垎鏈尮閰嶆垚浜�.xlsx",{d-> def newRegion = null if(d['C']){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/MatchMapData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/MatchMapData.groovy index a62cf530f..a2dc6270a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/MatchMapData.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/MatchMapData.groovy @@ -42,7 +42,7 @@ class MatchMapData { } def run5(){ - ExcelUtils.multiThreadingModify("D:\\数据\\建行\\数据核实.xlsx", { d -> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\寤鸿\\鏁版嵁鏍稿疄.xlsx", { d -> if (d['A']) { def region = d['B'] def newRegion = RegionData.formatRegion(d['A'], region) @@ -68,7 +68,7 @@ class MatchMapData { } def run4() { - ExcelUtils.multiThreadingModify("D:\\数据\\建行\\房产估值\\小区\\核实小区是否存在.xlsx", { d -> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\灏忓尯\\鏍稿疄灏忓尯鏄惁瀛樺湪.xlsx", { d -> def regionCode = null if (d['A']) { def region = d['B'] @@ -77,14 +77,14 @@ class MatchMapData { regionCode = getRegionCode(newRegion) def dist = CommonDatautils.findDistrict(d['A'], newRegion, d['C'], "district") if (dist) { - d['F'] = "完全一致" + d['F'] = "瀹屽叏涓�鑷�" d['E'] = dist.name d['D'] = dist.name_cat d['G'] = dist.estate_type2 } else { dist = CommonDatautils.findSeaweedByMappingAlias(d['A'], newRegion, d['C'], "district") if (dist) { - d['F'] = "映射别名" + d['F'] = "鏄犲皠鍒悕" d['E'] = dist.name d['D'] = dist.name_cat d['G'] = dist.estate_type2 @@ -92,16 +92,16 @@ class MatchMapData { def rets = CommonDatautils.findDistrictByAlias(d['A'], newRegion, d['C'], "district") if (rets) { if(rets.size()>1){ - d['F'] = "别名-多个" + d['F'] = "鍒悕-澶氫釜" }else{ - d['F'] = "别名" + d['F'] = "鍒悕" } } if (rets) { dist = rets[0] } if (dist) { - d['F'] = "完全一致" + d['F'] = "瀹屽叏涓�鑷�" d['E'] = dist.name d['D'] = dist.name_cat d['G'] = dist.estate_type2 @@ -116,25 +116,25 @@ class MatchMapData { def run3(){ - def files = ["合肥融合匹配_1215.xlsx"] + def files = ["鍚堣偉铻嶅悎鍖归厤_1215.xlsx"] for(def fn : files){ - ExcelUtils.multiThreadingModify("D:\\数据\\建行\\房产估值\\小区\\融合匹配房源\\"+fn,{d-> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\灏忓尯\\铻嶅悎鍖归厤鎴挎簮\\"+fn,{d-> def city = d['A'] def region = d['D'] def newRegion = RegionData.formatRegion(city, region) if(newRegion){ def count = findHouses2(city, newRegion, "sell", 20160101, d['E']); if(count){ - d['O'] = "有" + d['O'] = "鏈�" }else{ count = findThirdParty(city, newRegion, d['E']); if(count){ - d['O'] = "有" + d['O'] = "鏈�" }else{ count = findThirdParty(city, region, d['E']); if(count){ - d['O'] = "有" + d['O'] = "鏈�" } } } @@ -144,18 +144,18 @@ class MatchMapData { } def run2(){ - ExcelUtils.modify("D:\\数据\\建行\\房产估值\\小区\\重庆反查数据_669(审核完毕).xlsx",{d-> + ExcelUtils.modify("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\灏忓尯\\閲嶅簡鍙嶆煡鏁版嵁_669(瀹℃牳瀹屾瘯).xlsx",{d-> def dist = CommonDatautils.findDistrictById(d['A']) println dist.name },0) } def run1(){ - //"合肥","北京","广州","杭州","上海","深圳","石家庄","天津","武汉", - def files = ["苏州"] + //"鍚堣偉","鍖椾含","骞垮窞","鏉窞","涓婃捣","娣卞湷","鐭冲搴�","澶╂触","姝︽眽", + def files = ["鑻忓窞"] for(def f : files){ def city = f - ExcelUtils.multiThreadingModify("D:\\数据\\建行\\房产估值\\小区\\融合\\"+f+".xlsx",{d-> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\灏忓尯\\铻嶅悎\\"+f+".xlsx",{d-> if(d['E']){ def region = d['E'] def newRegion = RegionData.formatRegion(city, region) @@ -176,7 +176,7 @@ class MatchMapData { d['R'] = dist.lat/10000000000.0 def count = findHouses(dist.city, dist.region, "rent", 20210801, 20210901, dist.name, dist.alias); if(count){ - d['V'] = "有" + d['V'] = "鏈�" } } @@ -203,7 +203,7 @@ class MatchMapData { def match(city, region, d){ def rMap = SeaweedDataMatchProcess.doMatch(city, region, d['F'], null); if(!rMap && d['G']){ - def addrFlag = d['G'].toString().matches('^[\u4e00-\u9fa5]+?(路|大道|街).+[弄号]$') + def addrFlag = d['G'].toString().matches('^[\u4e00-\u9fa5]+?(璺瘄澶ч亾|琛�).+[寮勫彿]$') if(addrFlag){ rMap = SeaweedDataMatchProcess.doMatch(city, region, d['G'], null); } @@ -212,9 +212,9 @@ class MatchMapData { } def run(){ - //"广州", + //"骞垮窞", def weekend = DateUtils.getFirstDayOfWeek(new Date()); - def files = ["合肥","广州","上海","北京","杭州","深圳","石家庄","天津","武汉","西安","重庆","苏州"] + def files = ["鍚堣偉","骞垮窞","涓婃捣","鍖椾含","鏉窞","娣卞湷","鐭冲搴�","澶╂触","姝︽眽","瑗垮畨","閲嶅簡","鑻忓窞"] for(def f : files){ def city = f.replace("-2","") def lastYear = DateUtils.add(DateUtils.formatDateByPattern(new Date(), "yyyy-MM-dd"), -365) @@ -227,8 +227,8 @@ class MatchMapData { def levelMap = calcuteLevel(priceDatas); def datas = new CopyOnWriteArrayList() - datas << ["城市编码","区域编码","ID","小区名","Wgs85经度","Wgs84纬度","租售比","小区涨跌幅","物业类型","评级","均价"] - ExcelUtils.multiThreadingModify("D:\\数据\\建行\\房产估值\\小区\\融合\\租售比\\"+f+".xlsx",{d-> + datas << ["鍩庡競缂栫爜","鍖哄煙缂栫爜","ID","灏忓尯鍚�","Wgs85缁忓害","Wgs84绾害","绉熷敭姣�","灏忓尯娑ㄨ穼骞�","鐗╀笟绫诲瀷","璇勭骇","鍧囦环"] + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\灏忓尯\\铻嶅悎\\绉熷敭姣擻\"+f+".xlsx",{d-> def regionCode = null if(d['E']){ def region = d['E'] @@ -237,17 +237,17 @@ class MatchMapData { regionCode = getRegionCode(newRegion) def dist = CommonDatautils.findDistrict(city, newRegion, d['F'],"district") if(dist){ - d['K']="完全一致" + d['K']="瀹屽叏涓�鑷�" d['L'] = dist.name_cat }else{ dist = CommonDatautils.findSeaweedByMappingAlias(city, newRegion, d['F'],"district") if(dist){ - d['K']="映射别名" + d['K']="鏄犲皠鍒悕" d['L'] = dist.name_cat }else{ def rets = CommonDatautils.findDistrictByAlias(city, newRegion, d['F'],"district") if(rets){ - d['K']="别名" + d['K']="鍒悕" } if(rets){ dist = rets[0] @@ -278,7 +278,7 @@ class MatchMapData { def dbo = levelMap.get(dist.city+"##"+dist.region+"##"+dist.name) - if(dist.name == "绿苑公寓"){ + if(dist.name == "缁胯嫅鍏瘬"){ println dbo } if(dbo){ @@ -287,7 +287,7 @@ class MatchMapData { } } }else{ - d['M'] = "区域无法标准化" + d['M'] = "鍖哄煙鏃犳硶鏍囧噯鍖�" } } @@ -295,7 +295,7 @@ class MatchMapData { },0) - ExcelUtils.write("D:\\数据\\建行\\房产估值\\小区\\融合\\租售比\\详情2\\"+city+".xlsx", datas, "数据") + ExcelUtils.write("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\灏忓尯\\铻嶅悎\\绉熷敭姣擻\璇︽儏2\\"+city+".xlsx", datas, "鏁版嵁") } } @@ -327,8 +327,8 @@ class MatchMapData { } - if(name.contains("弄小区")){ - def newName = name.replace("弄小区","弄") + if(name.contains("寮勫皬鍖�")){ + def newName = name.replace("寮勫皬鍖�","寮�") if(!alias.contains(newName)){ alias << newName } @@ -364,15 +364,15 @@ class MatchMapData { } - if(name.contains("弄小区")){ - def newName = name.replace("弄小区","弄") + if(name.contains("寮勫皬鍖�")){ + def newName = name.replace("寮勫皬鍖�","寮�") if(!alias.contains(newName)){ alias << newName } } - if(name.contains("号小区")){ - def newName = name.replace("号小区","号") + if(name.contains("鍙峰皬鍖�")){ + def newName = name.replace("鍙峰皬鍖�","鍙�") if(!alias.contains(newName)){ alias << newName } @@ -389,7 +389,7 @@ class MatchMapData { def houses = ElasticUtils.executeSimpleQuery("192.168.0.206", "seawater-20*", queryBuilder); - println "[房源] "+city +" "+region+" "+ name +" "+houses.size() + println "[鎴挎簮] "+city +" "+region+" "+ name +" "+houses.size() return houses.size(); } @@ -400,21 +400,21 @@ class MatchMapData { q.put("region",region) q.put("name",name) def count = thirdPartyColl.count(q) - println "[第三方] "+city +" "+region+" "+ name +" "+count + println "[绗笁鏂筣 "+city +" "+region+" "+ name +" "+count return count } def exportHouse(){ - //"合肥","石家庄","北京","广州","杭州","上海","深圳","天津","武汉","西安","重庆", - def files = ["苏州","合肥"] + //"鍚堣偉","鐭冲搴�","鍖椾含","骞垮窞","鏉窞","涓婃捣","娣卞湷","澶╂触","姝︽眽","瑗垮畨","閲嶅簡", + def files = ["鑻忓窞","鍚堣偉"] for(def f : files) { def city = f def rets = [] - rets << ["建行小区id", "房价网小区id","城市","区域","楼盘名称","单价","月租金","面积","室","厅","卫","出租方式","朝向","楼屋","装修","发布时间"] - ExcelUtils.multiThreadingModify("D:\\数据\\建行\\房产估值\\小区\\融合\\" + f + ".xlsx", { d -> + rets << ["寤鸿灏忓尯id", "鎴夸环缃戝皬鍖篿d","鍩庡競","鍖哄煙","妤肩洏鍚嶇О","鍗曚环","鏈堢閲�","闈㈢Н","瀹�","鍘�","鍗�","鍑虹鏂瑰紡","鏈濆悜","妤煎眿","瑁呬慨","鍙戝竷鏃堕棿"] + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\灏忓尯\\铻嶅悎\\" + f + ".xlsx", { d -> def flag = d['K'] - if(flag && flag =="完全一致" && !d['J']){ + if(flag && flag =="瀹屽叏涓�鑷�" && !d['J']){ def obj = CommonDatautils.findDistrict(city, d['M'], d['N'], "district") if(obj){ def houses = findHouses3(d['D'], obj._id.toString(), city, d['M'], "rent", 20210801, 20211101, d['N'], null); @@ -426,7 +426,7 @@ class MatchMapData { } },0) - ExcelUtils.write("D:\\数据\\建行\\房产估值\\小区\\融合\\租房3\\"+city+"_rent.xlsx", rets, "数据") + ExcelUtils.write("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\灏忓尯\\铻嶅悎\\绉熸埧3\\"+city+"_rent.xlsx", rets, "鏁版嵁") } } @@ -449,8 +449,8 @@ class MatchMapData { } - if(name.contains("弄小区")){ - def newName = name.replace("弄小区","弄") + if(name.contains("寮勫皬鍖�")){ + def newName = name.replace("寮勫皬鍖�","寮�") if(!alias.contains(newName)){ alias << newName } @@ -479,7 +479,7 @@ class MatchMapData { def addDistrictLevel(){ // - def files = ["合肥","苏州","上海","北京","广州","杭州","深圳","石家庄","天津","武汉","西安","重庆"] + def files = ["鍚堣偉","鑻忓窞","涓婃捣","鍖椾含","骞垮窞","鏉窞","娣卞湷","鐭冲搴�","澶╂触","姝︽眽","瑗垮畨","閲嶅簡"] def dataMap = null @@ -492,7 +492,7 @@ class MatchMapData { dataMap = getDataMap(fn); - ExcelUtils.multiThreadingModify("D:\\数据\\建行\\房产估值\\小区\\融合\\租售比\\评级10级\\"+fn+".xlsx",{d-> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\灏忓尯\\铻嶅悎\\绉熷敭姣擻\璇勭骇10绾\"+fn+".xlsx",{d-> def region = dataMap.get(d['C']) if(region){ @@ -578,7 +578,7 @@ class MatchMapData { } def dataMap = [:] for(def d : datas){ - if(d.name=="绿苑公寓"){ + if(d.name=="缁胯嫅鍏瘬"){ println d } dataMap.put(d.city+"##"+d.region+"##"+d.name, d) @@ -587,7 +587,7 @@ class MatchMapData { } def getDataMap(city){ - def datas = ExcelUtils.read("D:\\数据\\建行\\房产估值\\小区\\融合\\租售比\\"+city+".xlsx",0,1) + def datas = ExcelUtils.read("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\灏忓尯\\铻嶅悎\\绉熷敭姣擻\"+city+".xlsx",0,1) def map = [:] for(def d : datas){ map.put(d['D'], d['E']) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/OracleHouse.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/OracleHouse.groovy index ebb9c165b..2c5f4c431 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/OracleHouse.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/OracleHouse.groovy @@ -54,7 +54,7 @@ class OracleHouse { println totalCount.get()+" "+ arrs[0] +" "+flag if(flag){ def dist = CommonDatautils.findDistrictById(arrs[1]) - if(dist && dist.estate_type2=="普通住宅"){ + if(dist && dist.estate_type2=="鏅�氫綇瀹�"){ removeHouse(arrs[0]) } @@ -78,7 +78,7 @@ class OracleHouse { def houses = ElasticUtils.executeSimpleQuery("192.168.0.206", "district_comp_potential", queryBuilder); def delFlag = false for(def h : houses){ - if(h.estate_type && (h.estate_type.contains("商") || h.estate_type.contains("办"))){ + if(h.estate_type && (h.estate_type.contains("鍟�") || h.estate_type.contains("鍔�"))){ println id+" "+h.estate_type delFlag = true } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/TestData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/TestData.groovy index 857b62715..2cf61ea1a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/TestData.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/TestData.groovy @@ -16,10 +16,10 @@ class TestData { } def update(){ - ExcelUtils.modify("C:\\Users\\gaojuan\\Desktop\\龙岩1.xlsx", { d -> + ExcelUtils.modify("C:\\Users\\gaojuan\\Desktop\\榫欏博1.xlsx", { d -> def dist = CommonDatautils.findDistrictById(d['A']) if(dist){ - if(d['E'] && d['G']=="人工"){ + if(d['E'] && d['G']=="浜哄伐"){ def q = new BasicDBObject() def baidu = BaiDuApiUtils.geoconv(d['E'].toString().toDouble(), d['F'].toString().toDouble(), 3) def lng2 = baidu.x @@ -42,7 +42,7 @@ class TestData { } def run(){ - ExcelUtils.modify("C:\\Users\\gaojuan\\Desktop\\龙岩.xlsx", { d -> + ExcelUtils.modify("C:\\Users\\gaojuan\\Desktop\\榫欏博.xlsx", { d -> def dist = CommonDatautils.findDistrictById(d['A']) if(dist){ def loc = getLocation(dist.city, dist.region, dist.name) @@ -54,7 +54,7 @@ class TestData { } // if(!d['E']){ -// def loc = getAmapLocation("龙岩市", d['B'], d['C']) +// def loc = getAmapLocation("榫欏博甯�", d['B'], d['C']) // if(loc){ // d['E'] = loc.x // d['F'] = loc.y diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/TradeDistrictToDB.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/TradeDistrictToDB.groovy index 274497135..621dc3679 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/TradeDistrictToDB.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/TradeDistrictToDB.groovy @@ -22,7 +22,7 @@ class TradeDistrictToDB { def run1(){ def index = 0 def keys = [] - ExcelUtils.modify("D:\\数据\\建行\\建行成交\\成交未入库记录(12月)-新增.xlsx", { d -> + ExcelUtils.modify("D:\\鏁版嵁\\寤鸿\\寤鸿鎴愪氦\\鎴愪氦鏈叆搴撹褰曪紙12鏈堬級-鏂板.xlsx", { d -> if(d['D']){ def key = d['A']+"##"+d['D']+"##"+d['C'] if(!keys.contains(key)){ @@ -43,12 +43,12 @@ class TradeDistrictToDB { blat = baidu.y * 10000000000L } - def name = d['C'].replace("·","").replace("II","二") - def estateType2 = "普通住宅" - if(name.contains("别墅")){ - estateType2 = "别墅" - }else if(name.contains("商住")){ - estateType2 = "商住" + def name = d['C'].replace("路","").replace("II","浜�") + def estateType2 = "鏅�氫綇瀹�" + if(name.contains("鍒")){ + estateType2 = "鍒" + }else if(name.contains("鍟嗕綇")){ + estateType2 = "鍟嗕綇" } keys << key @@ -74,7 +74,7 @@ class TradeDistrictToDB { } def markMap = [:] - markMap.put("data_source", "机器入库") + markMap.put("data_source", "鏈哄櫒鍏ュ簱") data.put("mark_map",markMap) index++ DbUtils.seaweed.save(data); @@ -89,7 +89,7 @@ class TradeDistrictToDB { } def run() { def index = 0 - ExcelUtils.multiThreadingModify("D:\\数据\\建行\\建行成交\\成交未入库记录(12月)-新增.xlsx", { d -> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\寤鸿\\寤鸿鎴愪氦\\鎴愪氦鏈叆搴撹褰曪紙12鏈堬級-鏂板.xlsx", { d -> def city = d['A'] def region = d['B'] def newRegion = RegionData.formatRegion(city, region) 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 c11a472af..77458f212 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 @@ -21,7 +21,7 @@ class ExportAllPgData { def database = "t_app_p9pha_plda." def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28"; def linux_prefix = "/home/goojia/ccb_data/evaluation/" - def win_prefix = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\evaluation\\${curDate}\\" + def win_prefix = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\evaluation\\${curDate}\\" def testCitys = ['110000','130200','140200','150200','320500','320800','330100','420900','440100','610100'] @@ -38,23 +38,23 @@ class ExportAllPgData { // exportBigdataPoiData() // exportBigdataDistrictData() ////// -////// //第三方网站权重表 +////// //绗笁鏂圭綉绔欐潈閲嶈〃 // exportWebsiteRate(); //// -// exportGuidedPrice()//随人工改变// -// exportCommunityGuidedPrice()//随政策// -//// //处理小区情况 -// exportCommunityStaging()//没cityid +// exportGuidedPrice()//闅忎汉宸ユ敼鍙�// +// exportCommunityGuidedPrice()//闅忔斂绛�// +//// //澶勭悊灏忓尯鎯呭喌 +// exportCommunityStaging()//娌ityid // exportBigdataCommunity()// //// // exportCommunityBuildType()// //// // exportThirdPartyPrice2(new_dists)// -// exportBigdataForsale(new_dists) //现在按updatetime导出 +// exportBigdataForsale(new_dists) //鐜板湪鎸塽pdatetime瀵煎嚭 // exportBigdataDeal(new_dists) //2022-07-01 // // -// //计算结果相关 +// //璁$畻缁撴灉鐩稿叧 // exportAvmEvaluationGJNB() // exportAVMEvaluationItemGJNB() //// @@ -393,7 +393,7 @@ class ExportAllPgData { } } - println "BIGDATA_THIRD_PARTY_PRICE_GJ 数据文件输出完成......" + println "BIGDATA_THIRD_PARTY_PRICE_GJ 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpTestUtils.ftpUpload(null, fileName, curDate) } @@ -560,7 +560,7 @@ class ExportAllPgData { } } - if(new_dists){//补充被修区域的数据 + 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 base.t0831_bigdata_forsale_gj_h where gujia_admndiv_id in ${newstr}" @@ -569,9 +569,9 @@ class ExportAllPgData { FileUtils.batchCreateFile(rets2, fileName, [], "utf-8", true); } } - println "BIGDATA_FORSALE_GJ 数据文件输出完成......" + println "BIGDATA_FORSALE_GJ 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpTestUtils.ftpUpload(null, fileName, curDate) - println "BIGDATA_FORSALE_GJ 上传Ftp完成......" + println "BIGDATA_FORSALE_GJ 涓婁紶Ftp瀹屾垚......" } def getHouseDatas(sql){ @@ -1030,14 +1030,14 @@ class ExportAllPgData { FileUtils.createTxtFile(fileRows, fileName, "utf-8", false); CcbFtpTestUtils.ftpUpload(null, fileName, curDate) - println "ok文件上传Ftp完成......" + println "ok鏂囦欢涓婁紶Ftp瀹屾垚......" } def createFileToFtp(tableName,allRows, fileName, curDate, isAppend){ FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", isAppend); - println tableName+" 数据文件输出完成......" + println tableName+" 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpTestUtils.ftpUpload(null, fileName, curDate) - println tableName+" 上传Ftp完成......" + println tableName+" 涓婁紶Ftp瀹屾垚......" } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/pgsql/ExportPgsqlBaseEvaluation.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/pgsql/ExportPgsqlBaseEvaluation.groovy index 87dc977a5..a40dd7b6d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/pgsql/ExportPgsqlBaseEvaluation.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/pgsql/ExportPgsqlBaseEvaluation.groovy @@ -18,7 +18,7 @@ class ExportPgsqlBaseEvaluation { def database = "base" def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28"; def linux_prefix = "/home/goojia/ccb_data/evaluation/" - def win_prefix = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\evaluation\\${curDate}\\" + def win_prefix = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\evaluation\\${curDate}\\" static main(args) { def task = new ExportPgsqlBaseEvaluation() @@ -37,19 +37,19 @@ class ExportPgsqlBaseEvaluation { exportBigdataPoiData() exportBigdataDistrictData() // -// //第三方网站权重表 +// //绗笁鏂圭綉绔欐潈閲嶈〃 exportWebsiteRate(); - exportGuidedPrice()//随人工改变// - exportCommunityGuidedPrice(lastMonth.toString()+"28")//随政策// - //处理小区情况 - exportCommunityStaging()//没cityid + exportGuidedPrice()//闅忎汉宸ユ敼鍙�// + exportCommunityGuidedPrice(lastMonth.toString()+"28")//闅忔斂绛�// + //澶勭悊灏忓尯鎯呭喌 + exportCommunityStaging()//娌ityid exportBigdataCommunity()// exportCommunityBuildType()// exportThirdPartyPrice2(lastMonth, new_dists)// - exportBigdataForsale(DateUtils.formatDateByPattern(new Date(), "yyyy-MM") +"-18", new_dists) //现在按updatetime导出 + exportBigdataForsale(DateUtils.formatDateByPattern(new Date(), "yyyy-MM") +"-18", new_dists) //鐜板湪鎸塽pdatetime瀵煎嚭 exportBigdataDeal(lastMonthStr + "-01", new_dists) //2022-07-01 } @@ -366,7 +366,7 @@ class ExportPgsqlBaseEvaluation { } } - println "BIGDATA_THIRD_PARTY_PRICE_GJ 数据文件输出完成......" + println "BIGDATA_THIRD_PARTY_PRICE_GJ 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpTestUtils.ftpUpload(null, fileName, curDate) } @@ -531,7 +531,7 @@ class ExportPgsqlBaseEvaluation { } } - if(new_dists){//补充被修区域的数据 + 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}" @@ -540,9 +540,9 @@ class ExportPgsqlBaseEvaluation { FileUtils.batchCreateFile(rets2, fileName, [], "utf-8", true); } } - println "BIGDATA_FORSALE_GJ 数据文件输出完成......" + println "BIGDATA_FORSALE_GJ 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpTestUtils.ftpUpload(null, fileName, curDate) - println "BIGDATA_FORSALE_GJ 上传Ftp完成......" + println "BIGDATA_FORSALE_GJ 涓婁紶Ftp瀹屾垚......" } def getHouseDatas(sql){ @@ -615,8 +615,8 @@ class ExportPgsqlBaseEvaluation { def createFileToFtp(tableName,allRows, fileName, curDate, isAppend){ FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", isAppend); - println tableName+" 数据文件输出完成......" + println tableName+" 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpTestUtils.ftpUpload(null, fileName, curDate) - println tableName+" 上传Ftp完成......" + println tableName+" 涓婁紶Ftp瀹屾垚......" } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/pgsql/ExportPgsqlEvaluationResult.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/pgsql/ExportPgsqlEvaluationResult.groovy index e38b64b94..85419c7b9 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/pgsql/ExportPgsqlEvaluationResult.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/pgsql/ExportPgsqlEvaluationResult.groovy @@ -22,7 +22,7 @@ class ExportPgsqlEvaluationResult { def database = "t_app_p9pha_plda." def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28"; def linux_prefix = "/home/goojia/ccb_data/evaluation/" - def win_prefix = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\evaluation\\${curDate}\\" + def win_prefix = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\evaluation\\${curDate}\\" static main(args) { def task = new ExportPgsqlEvaluationResult() @@ -33,7 +33,7 @@ class ExportPgsqlEvaluationResult { citys = CcbCommonUtils.getRunningCitys(args) def curMonth = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), 0, "yyyyMM")); - //计算结果相关 + //璁$畻缁撴灉鐩稿叧 exportAvmEvaluationGJNB(curMonth) exportAVMEvaluationItemGJNB(curMonth) @@ -429,15 +429,15 @@ class ExportPgsqlEvaluationResult { FileUtils.createTxtFile(fileRows, fileName, "utf-8", false); CcbFtpTestUtils.ftpUpload(null, fileName, curDate) - println "ok文件上传Ftp完成......" + println "ok鏂囦欢涓婁紶Ftp瀹屾垚......" } def createFileToFtp(tableName,allRows, fileName, curDate, isAppend){ FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", isAppend); - println tableName+" 数据文件输出完成......" + println tableName+" 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpTestUtils.ftpUpload(null, fileName, curDate) - println tableName+" 上传Ftp完成......" + println tableName+" 涓婁紶Ftp瀹屾垚......" } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/pgsql/ExportPgsqlRonghe.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/pgsql/ExportPgsqlRonghe.groovy index 5a4068b7c..8156a54c0 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/pgsql/ExportPgsqlRonghe.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/pgsql/ExportPgsqlRonghe.groovy @@ -22,7 +22,7 @@ class ExportPgsqlRonghe { def curDate = DateUtils.formatDateByPattern(new Date()+1, "yyyyMMdd") def linux_prefix = "/ccb_ronghe/${curDate}/" - def win_prefix = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_ronghe\\${curDate}\\" + def win_prefix = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_ronghe\\${curDate}\\" static main(args) { def task = new ExportPgsqlRonghe() @@ -32,7 +32,7 @@ class ExportPgsqlRonghe { def run(args) { def new_dists = [] citys = CcbCommonUtils.getRunningCitys(args) - //按天导(每天一个文件夹) + //鎸夊ぉ瀵硷紙姣忓ぉ涓�涓枃浠跺す锛� exportBigdataDealFJW2(curDate, DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date() + 1, -1), "yyyy-MM-dd"), new_dists) if (curDate.toString().endsWith("10")) { @@ -54,7 +54,7 @@ class ExportPgsqlRonghe { exportBigdataAliasFJW()// - //本12.10上传10,11月所有数据,23年1月需改为所有城市按日期同步一期数据 + //鏈�12.10涓婁紶10锛�11鏈堟墍鏈夋暟鎹紝23骞�1鏈堥渶鏀逛负鎵�鏈夊煄甯傛寜鏃ユ湡鍚屾涓�鏈熸暟鎹� def queryDate = DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM").toInteger() // exportBigdataCityPrice(queryDate) // exportBigdataDistPrice(queryDate) @@ -544,7 +544,7 @@ class ExportPgsqlRonghe { } CcbFtpTestUtils.ftpUpload("rh",fileName, curDate) - println "BIGDATA_BUILDING_FJW 上传Ftp完成......" + println "BIGDATA_BUILDING_FJW 涓婁紶Ftp瀹屾垚......" } def exportBigdataCityPrice(queryDate){ @@ -606,13 +606,13 @@ class ExportPgsqlRonghe { if(CommonDatautils.isWindow()){ fileName = win_prefix + "${curDate}.ok" } - createFileToFtp("融合统计文件长度ok文件", fileRows, fileName, curDate, false) + createFileToFtp("铻嶅悎缁熻鏂囦欢闀垮害ok鏂囦欢", fileRows, fileName, curDate, false) } def createFileToFtp(tableName,allRows, fileName, curDate, isAppend){ FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", isAppend); - println tableName+" 数据文件输出完成......" + println tableName+" 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpTestUtils.ftpUpload("rh", fileName, curDate) - println tableName+" 上传Ftp完成......" + println tableName+" 涓婁紶Ftp瀹屾垚......" } } 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 1a3e54049..0ea63af6e 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 @@ -23,7 +23,7 @@ import java.util.concurrent.atomic.AtomicLong class BigdataCitypriceBatch extends BaseBatch{ - public static final String[] TAGS = ["独栋", "联排", "叠加", "双拼", "花园面积", "泳池", "别墅", "带花园", "洋房", "叠拼", "独院", "联体", "微墅", "大平墅"]; + public static final String[] TAGS = ["鐙爧", "鑱旀帓", "鍙犲姞", "鍙屾嫾", "鑺卞洯闈㈢Н", "娉虫睜", "鍒", "甯﹁姳鍥�", "娲嬫埧", "鍙犳嫾", "鐙櫌", "鑱斾綋", "寰", "澶у钩澧�"]; public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(80) @@ -51,7 +51,7 @@ class BigdataCitypriceBatch extends BaseBatch{ curDate = DateUtils.parseFromTightByPattern(dateStr,"yyyy-MM-dd")//2022-03-01 } - println "args 参数:"+args.toString() +" 城市数量:"+citys.size()+" curDate: "+ curDate + println "args 鍙傛暟锛�"+args.toString() +" 鍩庡競鏁伴噺锛�"+citys.size()+" curDate: "+ curDate curRunDate = DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(curDate,-1), "yyyyMM").toInteger(); def startDate = DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(curDate,-1), "yyyyMMdd").toInteger(); @@ -73,17 +73,17 @@ class BigdataCitypriceBatch extends BaseBatch{ if(row){ rets << row } - println "[ ${index} ]"+city+" 完成 " + println "[ ${index} ]"+city+" 瀹屾垚 " } def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "10"; def fileName = "/ccb/MODEL_000000_000000_BIGDATA_CITYPRICE.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_CITYPRICE.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_CITYPRICE.dat" } def headers = [] FileUtils.batchCreateFile(rets, fileName, headers, "utf-8", false); - println "txt 生成-> BIGDATA_CITYPRICE" + println "txt 鐢熸垚-> BIGDATA_CITYPRICE" // saveToPgSqlCityPrice(rets) } @@ -156,11 +156,11 @@ class BigdataCitypriceBatch extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "10"; def fileName = "/ccb/MODEL_000000_000000_BIGDATA_DISTPRICE.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_DISTPRICE.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_DISTPRICE.dat" } def headers = [] FileUtils.batchCreateFile(rets, fileName, headers, "utf-8", false); - println "txt 生成-> BIGDATA_DISTPRICE" + println "txt 鐢熸垚-> BIGDATA_DISTPRICE" // saveToPgSqlRegionPrice(rets) } @@ -259,11 +259,11 @@ class BigdataCitypriceBatch extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "10"; def fileName = "/ccb/MODEL_000000_000000_BIGDATA_COMMPRICE.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_COMMPRICE.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_COMMPRICE.dat" } def headers = [] FileUtils.batchCreateFile(rets, fileName, headers, "utf-8", false); - println "txt 生成->BIGDATA_COMMPRICE" + println "txt 鐢熸垚->BIGDATA_COMMPRICE" // saveToPgSqlDistrictPrice(rets) } @@ -333,7 +333,7 @@ class BigdataCitypriceBatch extends BaseBatch{ def createDistDate(dist, startDate, endDate, cityCodeDataMap, allCcbPriceMap, allRentMap, dealCountMap, allCityRankMap, allRegionRankMap, allDistCityPreMap, allDistRegionPreMap, allLastMonthMap, allLastYearMap, allCcbPriceCaseCountMap){ def sellDataType = 1 def rentDataType = 1 - //房源查询是否按建行均价筛选房源 + //鎴挎簮鏌ヨ鏄惁鎸夊缓琛屽潎浠风瓫閫夋埧婧� def sellMap = null//findHouses(dist.city, dist.region, "sell", startDate, endDate, dist.name, dist.alias, dist.estate_type2) def sell_avg_price = null def sell_avg_area = null @@ -411,7 +411,7 @@ class BigdataCitypriceBatch extends BaseBatch{ } } - //三个月,半年都没有数据时,用房价网价格,这块是否改为 建行价格 + //涓変釜鏈堬紝鍗婂勾閮芥病鏈夋暟鎹椂锛岀敤鎴夸环缃戜环鏍硷紝杩欏潡鏄惁鏀逛负 寤鸿浠锋牸 // if(!sell_avg_price){ // sell_avg_price = allPriceMap.get(dist.city +"##"+ dist.region +"##"+ dist.name) // } @@ -463,7 +463,7 @@ class BigdataCitypriceBatch extends BaseBatch{ } else { row << '' } - if(dist.estate_type2 && dist.estate_type2=="商住"){ + if(dist.estate_type2 && dist.estate_type2=="鍟嗕綇"){ row << '11' }else{ row << '13' @@ -484,7 +484,7 @@ class BigdataCitypriceBatch extends BaseBatch{ row << 1 row << 'FJW' - //成交样本量,成交样本量同比, 成交样本量环比 + //鎴愪氦鏍锋湰閲�,鎴愪氦鏍锋湰閲忓悓姣�, 鎴愪氦鏍锋湰閲忕幆姣� if(dealCountMap){ def dealCount = dealCountMap.get(dist._id.toString()) row << dealCount?dealCount:'' @@ -518,7 +518,7 @@ class BigdataCitypriceBatch extends BaseBatch{ row << '' } - //出售平均单价的同比,环比 + //鍑哄敭骞冲潎鍗曚环鐨勫悓姣旓紝鐜瘮 if(sell_avg_price){ def markup = '' if(allLastMonthMap){ @@ -543,7 +543,7 @@ class BigdataCitypriceBatch extends BaseBatch{ row << '' } - //出售样本量同比,环比 + //鍑哄敭鏍锋湰閲忓悓姣旓紝鐜瘮 if(sell_count){ def markup = '' if(allLastMonthMap){ @@ -568,7 +568,7 @@ class BigdataCitypriceBatch extends BaseBatch{ row << '' } - //出租房源量同比,环比 + //鍑虹鎴挎簮閲忓悓姣旓紝鐜瘮 if(rent_count){ def markup = '' if(allLastMonthMap){ @@ -592,7 +592,7 @@ class BigdataCitypriceBatch extends BaseBatch{ row << '' row << '' } - //小区价格城市排名 + //灏忓尯浠锋牸鍩庡競鎺掑悕 if(allCityRankMap){ def cityRank = allCityRankMap.get(dist._id.toString()) if(cityRank){ @@ -603,7 +603,7 @@ class BigdataCitypriceBatch extends BaseBatch{ }else{ row << '' } - //小区价格区域排名 + //灏忓尯浠锋牸鍖哄煙鎺掑悕 if(allRegionRankMap){ def regionRank = allRegionRankMap.get(dist._id.toString()) if(regionRank){ @@ -614,7 +614,7 @@ class BigdataCitypriceBatch extends BaseBatch{ }else{ row << '' } - //高于区县平均价比率 + //楂樹簬鍖哄幙骞冲潎浠锋瘮鐜� if(allDistRegionPreMap){ def regionRadio = allDistRegionPreMap.get(dist._id.toString()) if(regionRadio){ @@ -626,7 +626,7 @@ class BigdataCitypriceBatch extends BaseBatch{ row << '' } - //高于城市平均价比率 + //楂樹簬鍩庡競骞冲潎浠锋瘮鐜� if(allDistCityPreMap){ def cityRadio = allDistCityPreMap.get(dist._id.toString()) if(cityRadio){ @@ -809,12 +809,12 @@ class BigdataCitypriceBatch extends BaseBatch{ def totalPrices = [] ElasticUtils.executeSqlQuery(sql,{ seawater-> def flag = true - if(estate_type2 && estate_type2=="普通住宅"){ - if(seawater.estate_type && (seawater.estate_type.contains("商住") || seawater.estate_type.contains("商业") || seawater.estate_type.contains("商务"))){ + if(estate_type2 && estate_type2=="鏅�氫綇瀹�"){ + if(seawater.estate_type && (seawater.estate_type.contains("鍟嗕綇") || seawater.estate_type.contains("鍟嗕笟") || seawater.estate_type.contains("鍟嗗姟"))){ flag = false } - if(seawater.estate_type&& seawater.estate_type.contains("别墅")){ + if(seawater.estate_type&& seawater.estate_type.contains("鍒")){ flag = false } @@ -869,8 +869,8 @@ class BigdataCitypriceBatch extends BaseBatch{ alias.add(name) } - if(name.contains("弄小区")){ - def newName = name.replace("弄小区","弄") + if(name.contains("寮勫皬鍖�")){ + def newName = name.replace("寮勫皬鍖�","寮�") if(!alias.contains(newName)){ alias << newName } @@ -896,13 +896,13 @@ class BigdataCitypriceBatch extends BaseBatch{ def map = houses[k]; DBObject seawater = new BasicDBObject(map) - if(estate_type2 && estate_type2=="普通住宅"){ - if(seawater.estate_type && (seawater.estate_type.contains("商住") || seawater.estate_type.contains("商业") || seawater.estate_type.contains("商务"))){ + if(estate_type2 && estate_type2=="鏅�氫綇瀹�"){ + if(seawater.estate_type && (seawater.estate_type.contains("鍟嗕綇") || seawater.estate_type.contains("鍟嗕笟") || seawater.estate_type.contains("鍟嗗姟"))){ println city +" "+name+" "+seawater._id.toString()+" "+seawater.estate_type continue; } - if(seawater.estate_type&& seawater.estate_type.contains("别墅")){ + if(seawater.estate_type&& seawater.estate_type.contains("鍒")){ println city +" "+name+" "+seawater._id.toString()+" "+seawater.estate_type continue; } @@ -937,7 +937,7 @@ class BigdataCitypriceBatch extends BaseBatch{ } /** - * 是否是别墅 + * 鏄惁鏄埆澧� * @return */ public boolean isVilla(area, name, height, room) { @@ -1112,7 +1112,7 @@ class BigdataCitypriceBatch extends BaseBatch{ def val = (m.avg_price-regionAvgPrice)*100/regionAvgPrice distRegionRateMap.put(m.comm_id, DataHandleUtils.getDoubleRound(4, val)) }else{ - println m.region+" 无区域均价" + println m.region+" 鏃犲尯鍩熷潎浠�" } } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/BigdataCommunityGJRHBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/BigdataCommunityGJRHBatch.groovy index 286172afd..9ff8f5542 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/BigdataCommunityGJRHBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/BigdataCommunityGJRHBatch.groovy @@ -24,7 +24,7 @@ import java.util.regex.Pattern /** - * 建行融合——小区表 + * 寤鸿铻嶅悎鈥斺�斿皬鍖鸿〃 */ @BatchOwner(Watcher.GaoJuan) class BigdataCommunityGJRHBatch extends BaseBatch { @@ -86,27 +86,27 @@ class BigdataCommunityGJRHBatch extends BaseBatch { dist.buildyear = CcbCodeUtils.getBuildYear(obj.finish_building_date); dist.houseuse = CcbCodeUtils.getUseTypeCode(obj.estate_type2)//"11" dist.buildtype = CcbCodeUtils.parseBuildType(dist.build_type) - dist.compid = new ObjectId() //物业公司id + dist.compid = new ObjectId() //鐗╀笟鍏徃id dist.estatecharge = CcbCodeUtils.processEstateCharge(dist.city, obj.estate_charge, obj.estate_type2) } } - println index +" "+city +" 小区加载完成 "+districts.size() + println index +" "+city +" 灏忓尯鍔犺浇瀹屾垚 "+districts.size() addBigdataCommunityGJRH(districts, cityCodeDataMap.get(city)) - println index +" "+city +" 1.小区表完成" + println index +" "+city +" 1.灏忓尯琛ㄥ畬鎴�" addBigdataCommbuildstruGJ(districts, cityCodeDataMap.get(city)) - println index +" "+city +" 2.小区建筑结构表" + println index +" "+city +" 2.灏忓尯寤虹瓚缁撴瀯琛�" addBigdataCommhousetypeGJ(districts, cityCodeDataMap.get(city)) - println index +" "+city +" 3.小区房屋类型表" + println index +" "+city +" 3.灏忓尯鎴垮眿绫诲瀷琛�" addBigdataCommbuildyearGj(districts, cityCodeDataMap.get(city)) - println index +" "+city +" 4.小区建筑年代表" + println index +" "+city +" 4.灏忓尯寤虹瓚骞翠唬琛�" addBigdataCommfeeGj(districts, cityCodeDataMap.get(city)) - println index +" "+city +" 5.小区费用表" + println index +" "+city +" 5.灏忓尯璐圭敤琛�" addBigdataCommhouseuseGJ(districts, cityCodeDataMap.get(city)) - println index +" "+city +" 6.小区房屋用途表" + println index +" "+city +" 6.灏忓尯鎴垮眿鐢ㄩ�旇〃" addBigdataPositionGJ(districts, cityCodeDataMap.get(city), citySeqnoMap) - println index +" "+ city + " 7.地理位置表" + println index +" "+ city + " 7.鍦扮悊浣嶇疆琛�" -// addDealFieldInfo(distMap, cityCodeDataMap.get(city));//修改成交记录housestyle 一定要运行 +// addDealFieldInfo(distMap, cityCodeDataMap.get(city));//淇敼鎴愪氦璁板綍housestyle 涓�瀹氳杩愯 } } @@ -161,11 +161,11 @@ class BigdataCommunityGJRHBatch extends BaseBatch { def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"; def fileName = "/ccb/${curDate}/MODEL_000000_000000_BIGDATA_COMMUNITY_FJW.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_COMMUNITY_FJW.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_COMMUNITY_FJW.dat" } def headers = [] FileUtils.batchCreateFile(rets, fileName, headers, "utf-8", true); - println "BIGDATA_COMMUNITY_FJW 数据文件输出完成......" + println "BIGDATA_COMMUNITY_FJW 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" // sqlInstance.withBatch(batchsize) { stmt -> @@ -248,11 +248,11 @@ class BigdataCommunityGJRHBatch extends BaseBatch { def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"; def fileName = "/ccb/${curDate}/MODEL_000000_000000_BIGDATA_COMMBUILDSTRU_FJW.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_COMMBUILDSTRU_FJW.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_COMMBUILDSTRU_FJW.dat" } def headers = [] FileUtils.batchCreateFile(rets, fileName, headers, "utf-8", true); - println "BIGDATA_COMMBUILDSTRU_FJW 数据文件输出完成......" + println "BIGDATA_COMMBUILDSTRU_FJW 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" // sqlInstance.executeUpdate("delete from BIGDATA_COMMBUILDSTRU_FJW where CITYID='${cityid}'") // sqlInstance.withBatch(batchsize) { stmt -> @@ -306,11 +306,11 @@ class BigdataCommunityGJRHBatch extends BaseBatch { def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"; def fileName = "/ccb/${curDate}/MODEL_000000_000000_BIGDATA_COMMHOUSETYPE_FJW.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_COMMHOUSETYPE_FJW.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_COMMHOUSETYPE_FJW.dat" } def headers = [] FileUtils.batchCreateFile(rets, fileName, headers, "utf-8", true); - println "BIGDATA_COMMHOUSETYPE_FJW 数据文件输出完成......" + println "BIGDATA_COMMHOUSETYPE_FJW 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" // sqlInstance.executeUpdate("delete from BIGDATA_COMMHOUSETYPE_FJW where CITYID='${cityid}'") @@ -364,11 +364,11 @@ class BigdataCommunityGJRHBatch extends BaseBatch { def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"; def fileName = "/ccb/${curDate}/MODEL_000000_000000_BIGDATA_COMMBUILDYEAR_FJW.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_COMMBUILDYEAR_FJW.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_COMMBUILDYEAR_FJW.dat" } def headers = [] FileUtils.batchCreateFile(rets, fileName, headers, "utf-8", true); - println "BIGDATA_COMMBUILDYEAR_FJW 数据文件输出完成......" + println "BIGDATA_COMMBUILDYEAR_FJW 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" // sqlInstance.executeUpdate("delete from BIGDATA_COMMBUILDYEAR_FJW where CITYID='${cityid}'") // @@ -427,11 +427,11 @@ class BigdataCommunityGJRHBatch extends BaseBatch { def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"; def fileName = "/ccb/${curDate}/MODEL_000000_000000_BIGDATA_COMMFEE_FJW.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_COMMFEE_FJW.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_COMMFEE_FJW.dat" } def headers = [] FileUtils.batchCreateFile(rets, fileName, headers, "utf-8", true); - println "BIGDATA_COMMFEE_FJW 数据文件输出完成......" + println "BIGDATA_COMMFEE_FJW 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" // sqlInstance.executeUpdate("delete from BIGDATA_COMMFEE_FJW where CITYID='${cityid}'") @@ -506,11 +506,11 @@ class BigdataCommunityGJRHBatch extends BaseBatch { def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"; def fileName = "/ccb/${curDate}/MODEL_000000_000000_BIGDATA_COMMHOUSEUSE_FJW.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_COMMHOUSEUSE_FJW.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_COMMHOUSEUSE_FJW.dat" } def headers = [] FileUtils.batchCreateFile(rets, fileName, headers, "utf-8", true); - println "BIGDATA_COMMHOUSEUSE_FJW 数据文件输出完成......" + println "BIGDATA_COMMHOUSEUSE_FJW 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" // sqlInstance.executeUpdate("delete from BIGDATA_COMMHOUSEUSE_FJW where CITYID='${cityid}'") // @@ -592,11 +592,11 @@ class BigdataCommunityGJRHBatch extends BaseBatch { def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"; def fileName = "/ccb/${curDate}/MODEL_000000_000000_BIGDATA_POSITION_FJW.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_POSITION_FJW.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_POSITION_FJW.dat" } def headers = [] FileUtils.batchCreateFile(rets, fileName, headers, "utf-8", true); - println "BIGDATA_POSITION_FJW 数据文件输出完成......" + println "BIGDATA_POSITION_FJW 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" } def findSeqno(cityid, commid, citySeqnoMap){ @@ -618,7 +618,7 @@ class BigdataCommunityGJRHBatch extends BaseBatch { } } }else{ - println cityid+" 没有该城市的小区序号" + println cityid+" 娌℃湁璇ュ煄甯傜殑灏忓尯搴忓彿" } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/CcbRHDealFileCreateBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/CcbRHDealFileCreateBatch.groovy index 3d892d834..ed12ff295 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/CcbRHDealFileCreateBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/CcbRHDealFileCreateBatch.groovy @@ -19,10 +19,10 @@ class CcbRHDealFileCreateBatch extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/ccb_rh/${curDate}/${cityCode}/FJW_000000_${cityCode}_BIGDATA_COMMFEE_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\${cityCode}\\FJW_000000_${cityCode}_BIGDATA_COMMFEE_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_rh\\${curDate}\\${cityCode}\\FJW_000000_${cityCode}_BIGDATA_COMMFEE_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile([], fileName, [], "utf-8", false); CcbFtpUtils.ftpUpload(fileName, curDate+"/${cityCode}") - println "BIGDATA_COMMFEE_FJW 上传Ftp完成......" + println "BIGDATA_COMMFEE_FJW 涓婁紶Ftp瀹屾垚......" } } 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 1521d4e0b..686bc84aa 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 @@ -11,7 +11,7 @@ import com.fangjia.script.util.DateUtils import groovy.sql.Sql /** - * 建行融合数据导出 + * 寤鸿铻嶅悎鏁版嵁瀵煎嚭 */ @BatchOwner(Watcher.GaoJuan) class ExportDistrictRongHe extends BaseBatch{ @@ -41,7 +41,7 @@ class ExportDistrictRongHe extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date()+1, "yyyyMMdd") def new_dists = []//["350604","350605","410307","410308","450181"] - //按天导(每天一个文件夹) + //鎸夊ぉ瀵硷紙姣忓ぉ涓�涓枃浠跺す锛� // exportBigdataDealFJW2(curDate, DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date()+1,-2), "yyyy-MM-dd"), new_dists) exportPgBigdataDealFJW(curDate, DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date()+1,-2), "yyyy-MM-dd"), new_dists) @@ -50,7 +50,7 @@ class ExportDistrictRongHe extends BaseBatch{ exportBigdataBuildingFJW()// exportBigdataCommfeeGj()// - exportGuidedPrice()//10月10号再同步数据 + exportGuidedPrice()//10鏈�10鍙峰啀鍚屾鏁版嵁 exportBigdataCommbuildstruGJ()// exportBigdataCommhousetypeGJ()// @@ -67,26 +67,26 @@ class ExportDistrictRongHe extends BaseBatch{ exportBigdataCityPrice(queryDate) exportBigdataDistPrice(queryDate) exportBigdataCommPrice(queryDate) - // 新增两张数据表 + // 鏂板涓ゅ紶鏁版嵁琛� // avm_evaluate_rate_city_gj_h // avm_evaluate_rate_comm_gj_h exportEvaluateRateCity(queryDate) exportEvaluateRateComm(queryDate) - //1月10日 新增5张表,导92城,增量数据,2月10日导344城,其中252城所有历史数据,92城增量,3月后可能不用提供数据 + //1鏈�10鏃� 鏂板5寮犺〃锛屽92鍩庯紝澧為噺鏁版嵁锛�2鏈�10鏃ュ344鍩庯紝鍏朵腑252鍩庢墍鏈夊巻鍙叉暟鎹紝92鍩庡閲忥紝3鏈堝悗鍙兘涓嶇敤鎻愪緵鏁版嵁 // exportCommunityBasePrice(lastMonth) // exportCommunityPdescribeGj(lastMonth) // exportGuideStatistics(lastMonth) // exportBigdataSupplierStatistics(lastMonth) // exportBigdataModelingBase(lastMonth) - //2月8号 临时导出苏州一年的数据 - exportPgBigdataForsale(houseStartDate,DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date()), "yyyy-MM-dd"),new_dists)//融合按发布时间导,估值按updatetime导出 + //2鏈�8鍙� 涓存椂瀵煎嚭鑻忓窞涓�骞寸殑鏁版嵁 + exportPgBigdataForsale(houseStartDate,DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date()), "yyyy-MM-dd"),new_dists)//铻嶅悎鎸夊彂甯冩椂闂村锛屼及鍊兼寜updatetime瀵煎嚭 } if(curDate.toString().endsWith("28")){ exportPgBigdataSupplierStatistics(curMonth) - //因为融合暂不切库,所以需要加传一张第三方均价表到融合中, 从1月10日开始传输,长期供 + //鍥犱负铻嶅悎鏆備笉鍒囧簱锛屾墍浠ラ渶瑕佸姞浼犱竴寮犵涓夋柟鍧囦环琛ㄥ埌铻嶅悎涓紝 浠�1鏈�10鏃ュ紑濮嬩紶杈擄紝闀挎湡渚� def thirdPartyMonth = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM")); // exportThirdPartyPrice2(thirdPartyMonth, new_dists) exportPgThirdPartyPrice2(thirdPartyMonth, new_dists) @@ -108,14 +108,14 @@ class ExportDistrictRongHe extends BaseBatch{ // def cityCodeDataMap = CcbCommonUtils.findCityCodeValue() // // -//// //检查ok文件是否上传 +//// //妫�鏌k鏂囦欢鏄惁涓婁紶 //// exportAllBigdataDealFJW() //// for(def city : citys) { //// def cityCode = cityCodeDataMap.get(city) //// -// //按天导(一个文件夹下) +// //鎸夊ぉ瀵�(涓�涓枃浠跺す涓�) // //exportBigdataDealFJW(DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(),-2), "yyyy-MM-dd")) -// //按天导(每天一个文件夹) +// //鎸夊ぉ瀵硷紙姣忓ぉ涓�涓枃浠跺す锛� // exportBigdataDealFJW2(DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(),-2), "yyyy-MM-dd")) // //// exportBigdataCommunityGJRH(cityCode) @@ -148,7 +148,7 @@ class ExportDistrictRongHe extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/home/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMUNITY_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMUNITY_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMUNITY_FJW_ALL_${curDate}_0001.dat" } def index = 0 for(def city : citys){ @@ -190,9 +190,9 @@ class ExportDistrictRongHe extends BaseBatch{ } } - println "BIGDATA_COMMUNITY_FJW 数据文件输出完成......" + println "BIGDATA_COMMUNITY_FJW 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpUtils.ftpUpload("rh",fileName, curDate) - println "BIGDATA_COMMUNITY_FJW 上传Ftp完成......" + println "BIGDATA_COMMUNITY_FJW 涓婁紶Ftp瀹屾垚......" } def exportGuidedPrice() { @@ -223,14 +223,14 @@ class ExportDistrictRongHe extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/home/ccb_rh/${curDate}/FJW_000000_000000_COMMUNITY_PRICE_GJ_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_COMMUNITY_PRICE_GJ_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_COMMUNITY_PRICE_GJ_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); - println "GUIDED_PRICE_GJ 数据文件输出完成......" + println "GUIDED_PRICE_GJ 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpUtils.ftpUpload("rh",fileName, curDate) - println "GUIDED_PRICE_GJ 上传Ftp完成......" + println "GUIDED_PRICE_GJ 涓婁紶Ftp瀹屾垚......" } // avm_evaluate_rate_city_gj_h gujia_clc_yrmo_val =202402 and gujia_clc_yrmo_val<=202403 gujia_clc_yrmo_val>=to_date('${startDateStr}','yyyy-MM-dd') and gujia_clc_yrmo_val<=to_date('${endDateStr}','yyyy-MM-dd') def exportEvaluateRateCity(queryDate){ @@ -255,14 +255,14 @@ class ExportDistrictRongHe extends BaseBatch{ // FJW_000000_000000_EVALUATE_RATE_CITY_FLW_ADD_ def fileName = "/home/ccb_rh/${curDate}/FJW_000000_000000_EVALUATE_RATE_CITY_FJW_HIS_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_EVALUATE_RATE_CITY_FJW_HIS_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_EVALUATE_RATE_CITY_FJW_HIS_ADD_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); - println "EVALUATE_RATE_CITY_FJW_HIS_ADD 数据文件输出完成......" + println "EVALUATE_RATE_CITY_FJW_HIS_ADD 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpUtils.ftpUpload("rh",fileName, curDate) - println "EVALUATE_RATE_CITY_FJW_HIS_ADD 上传Ftp完成......" + println "EVALUATE_RATE_CITY_FJW_HIS_ADD 涓婁紶Ftp瀹屾垚......" } def exportEvaluateRateComm(queryDate){ @@ -297,14 +297,14 @@ class ExportDistrictRongHe extends BaseBatch{ // FJW_000000_000000_EVALUATE_RATE_COMM_FLW_ADD_ avm_evaluate_rate_comm_gj_h def fileName = "/home/ccb_rh/${curDate}/FJW_000000_000000_EVALUATE_RATE_COMM_FJW_HIS_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_EVALUATE_RATE_COMM_FJW_HIS_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_EVALUATE_RATE_COMM_FJW_HIS_ADD_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); - println "FJW_000000_000000_EVALUATE_RATE_COMM_FJW_HIS_ADD_ 数据文件输出完成......" + println "FJW_000000_000000_EVALUATE_RATE_COMM_FJW_HIS_ADD_ 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpUtils.ftpUpload("rh",fileName, curDate) - println "FJW_000000_000000_EVALUATE_RATE_COMM_FJW_HIS_ADD_ 上传Ftp完成......" + println "FJW_000000_000000_EVALUATE_RATE_COMM_FJW_HIS_ADD_ 涓婁紶Ftp瀹屾垚......" } @@ -329,11 +329,11 @@ class ExportDistrictRongHe extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/home/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMBUILDSTRU_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMBUILDSTRU_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMBUILDSTRU_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); CcbFtpUtils.ftpUpload("rh",fileName, curDate) - println "BIGDATA_COMMBUILDSTRU_FJW 上传Ftp完成......" + println "BIGDATA_COMMBUILDSTRU_FJW 涓婁紶Ftp瀹屾垚......" } def exportBigdataCommhousetypeGJ(){ @@ -358,11 +358,11 @@ class ExportDistrictRongHe extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/home/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMHOUSETYPE_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMHOUSETYPE_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMHOUSETYPE_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); CcbFtpUtils.ftpUpload("rh",fileName, curDate) - println "BIGDATA_COMMHOUSETYPE_FJW 上传Ftp完成......" + println "BIGDATA_COMMHOUSETYPE_FJW 涓婁紶Ftp瀹屾垚......" } def exportBigdataCommbuildyearGj(){ @@ -386,11 +386,11 @@ class ExportDistrictRongHe extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/home/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMBUILDYEAR_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMBUILDYEAR_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMBUILDYEAR_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); CcbFtpUtils.ftpUpload("rh", fileName, curDate) - println "BIGDATA_COMMBUILDYEAR_FJW 上传Ftp完成......" + println "BIGDATA_COMMBUILDYEAR_FJW 涓婁紶Ftp瀹屾垚......" } def exportBigdataCommfeeGj(){ @@ -424,11 +424,11 @@ class ExportDistrictRongHe extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/home/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMFEE_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMFEE_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMFEE_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); CcbFtpUtils.ftpUpload("rh",fileName, curDate) - println "BIGDATA_COMMFEE_FJW 上传Ftp完成......" + println "BIGDATA_COMMFEE_FJW 涓婁紶Ftp瀹屾垚......" } @@ -454,11 +454,11 @@ class ExportDistrictRongHe extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/home/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMHOUSEUSE_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMHOUSEUSE_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMHOUSEUSE_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); CcbFtpUtils.ftpUpload("rh",fileName, curDate) - println "BIGDATA_COMMHOUSEUSE_FJW 上传Ftp完成......" + println "BIGDATA_COMMHOUSEUSE_FJW 涓婁紶Ftp瀹屾垚......" } def exportBigdataPositionGJ(){ @@ -487,11 +487,11 @@ class ExportDistrictRongHe extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/home/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_POSITION_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_POSITION_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_POSITION_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); CcbFtpUtils.ftpUpload("rh",fileName, curDate) - println "BIGDATA_POSITION_FJW 上传Ftp完成......" + println "BIGDATA_POSITION_FJW 涓婁紶Ftp瀹屾垚......" } def exportBigdataDistrictFJW(){ @@ -519,11 +519,11 @@ class ExportDistrictRongHe extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/home/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_DISTRICT_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_DISTRICT_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_DISTRICT_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); CcbFtpUtils.ftpUpload("rh", fileName, curDate) - println "BIGDATA_DISTRICT_FJW 上传Ftp完成......" + println "BIGDATA_DISTRICT_FJW 涓婁紶Ftp瀹屾垚......" } def exportBigdataAliasFJW(){ @@ -554,11 +554,11 @@ class ExportDistrictRongHe extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/home/ccb_rh/${curDate}/FJW_000000_000000_ADDRESS_ALIAS_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_ADDRESS_ALIAS_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_ADDRESS_ALIAS_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); CcbFtpUtils.ftpUpload("rh",fileName, curDate) - println "ADDRESS_ALIAS_FJW 上传Ftp完成......" + println "ADDRESS_ALIAS_FJW 涓婁紶Ftp瀹屾垚......" } def exportBigdataDealFJW(dealdate){ @@ -578,7 +578,7 @@ class ExportDistrictRongHe extends BaseBatch{ def fileName = "/home/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curStartStr.replace("-","")}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curStartStr.replace("-","")}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curStartStr.replace("-","")}_0001.dat" } def allRows = [] @@ -663,7 +663,7 @@ class ExportDistrictRongHe extends BaseBatch{ } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); CcbFtpUtils.ftpUpload("rh", fileName, curDate) - println "BIGDATA_DEAL_FJW 上传Ftp完成......${curStartStr}" + println "BIGDATA_DEAL_FJW 涓婁紶Ftp瀹屾垚......${curStartStr}" def curEndStr = DateUtils.add(curStartStr, 1) curStartDateStr = curEndStr } @@ -678,7 +678,7 @@ class ExportDistrictRongHe extends BaseBatch{ def fileName = "/home/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat" } def allRows = [] @@ -707,7 +707,7 @@ class ExportDistrictRongHe extends BaseBatch{ FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); CcbFtpUtils.ftpUpload("rh",fileName, curDate) - println "BIGDATA_DEAL_FJW 上传Ftp完成......${endDateStr}" + println "BIGDATA_DEAL_FJW 涓婁紶Ftp瀹屾垚......${endDateStr}" } def exportPgBigdataDealFJW(curDate, dealdate, new_dists){ @@ -718,7 +718,7 @@ class ExportDistrictRongHe extends BaseBatch{ def fileName = "/home/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat" } def allRows = [] @@ -747,7 +747,7 @@ class ExportDistrictRongHe extends BaseBatch{ FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); CcbFtpUtils.ftpUpload("rh",fileName, curDate) - println "BIGDATA_DEAL_FJW 上传Ftp完成......${endDateStr}" + println "BIGDATA_DEAL_FJW 涓婁紶Ftp瀹屾垚......${endDateStr}" } def createDeal(sql){ @@ -989,10 +989,10 @@ class ExportDistrictRongHe extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/home/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); - println "BIGDATA_DEAL_FJW 导出完成......" + println "BIGDATA_DEAL_FJW 瀵煎嚭瀹屾垚......" } @@ -1000,7 +1000,7 @@ class ExportDistrictRongHe extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/home/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_BUILDING_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_BUILDING_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_BUILDING_FJW_ALL_${curDate}_0001.dat" } def index = 0 for(def city : citys) { @@ -1050,7 +1050,7 @@ class ExportDistrictRongHe extends BaseBatch{ } CcbFtpUtils.ftpUpload("rh",fileName, curDate) - println "BIGDATA_BUILDING_FJW 上传Ftp完成......" + println "BIGDATA_BUILDING_FJW 涓婁紶Ftp瀹屾垚......" } @@ -1074,11 +1074,11 @@ class ExportDistrictRongHe extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/home/ccb_rh/${curDate}/FJW_000000_000000_EVALUATE_RATE_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_EVALUATE_RATE_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_EVALUATE_RATE_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); CcbFtpUtils.ftpUpload("rh",fileName, curDate) - println "EVALUATE_RATE_FJW 上传Ftp完成......" + println "EVALUATE_RATE_FJW 涓婁紶Ftp瀹屾垚......" } def exportThirdPartyPrice2(price_date, new_dists) { @@ -1086,7 +1086,7 @@ class ExportDistrictRongHe extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "10"; def fileName = "/home/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_THIRD_PARTY_PRICE_GJ_ADD_${curDate}_0001.dat" if (CommonDatautils.isWindow()) { - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_THIRD_PARTY_PRICE_GJ_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_THIRD_PARTY_PRICE_GJ_ADD_${curDate}_0001.dat" } def headers = [] def index = 0 @@ -1125,7 +1125,7 @@ class ExportDistrictRongHe extends BaseBatch{ } } - println "BIGDATA_THIRD_PARTY_PRICE_GJ 数据文件输出完成......" + println "BIGDATA_THIRD_PARTY_PRICE_GJ 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpUtils.ftpUpload('rh', fileName, curDate) } @@ -1134,7 +1134,7 @@ class ExportDistrictRongHe extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28"; def fileName = "/home/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_THIRD_PARTY_PRICE_GJ_ADD_${curDate}_0001.dat" if (CommonDatautils.isWindow()) { - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_THIRD_PARTY_PRICE_GJ_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_THIRD_PARTY_PRICE_GJ_ADD_${curDate}_0001.dat" } def headers = [] def index = 0 @@ -1166,7 +1166,7 @@ class ExportDistrictRongHe extends BaseBatch{ } } - println "BIGDATA_THIRD_PARTY_PRICE_GJ 数据文件输出完成......" + println "BIGDATA_THIRD_PARTY_PRICE_GJ 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpUtils.ftpUpload('rh', fileName, curDate) } @@ -1217,11 +1217,11 @@ class ExportDistrictRongHe extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/home/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_BUILDPROJ_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_BUILDPROJ_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_BUILDPROJ_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile([], fileName, [], "utf-8", false); CcbFtpUtils.ftpUpload("rh",fileName, curDate) - println "BIGDATA_BUILDPROJ_FJW 上传Ftp完成......" + println "BIGDATA_BUILDPROJ_FJW 涓婁紶Ftp瀹屾垚......" } def exportCommunityBasePrice(yearMonth){ @@ -1263,13 +1263,13 @@ class ExportDistrictRongHe extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/home/ccb_rh/${curDate}/FJW_000000_000000_COMMUNITY_BASE_PRICE_GJNB_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_COMMUNITY_BASE_PRICE_GJNB_ADD_${curDate}_0001.dat" } def headers = [] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); - println "COMMUNITY_BASE_PRICE_GJNB 数据文件输出完成......" + println "COMMUNITY_BASE_PRICE_GJNB 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpUtils.ftpUpload("rh", fileName, curDate) - println "COMMUNITY_BASE_PRICE_GJNB 上传Ftp完成......" + println "COMMUNITY_BASE_PRICE_GJNB 涓婁紶Ftp瀹屾垚......" } def exportPgCommunityBasePrice(yearMonth){ @@ -1306,13 +1306,13 @@ class ExportDistrictRongHe extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28" def fileName = "/home/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_COMM_BASE_PRICE_GJ_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_GJ 数据文件输出完成......" + println "COMMUNITY_BASE_PRICE_GJ 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpUtils.ftpUpload("rh", fileName, curDate) - println "COMMUNITY_BASE_PRICE_GJ 上传Ftp完成......" + println "COMMUNITY_BASE_PRICE_GJ 涓婁紶Ftp瀹屾垚......" } @@ -1321,7 +1321,7 @@ class ExportDistrictRongHe extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/home/ccb_rh/${curDate}/FJW_000000_000000_COMMUNITY_P_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_COMMUNITY_P_DESCRIBE_GJ_ADD_${curDate}_0001.dat" } def headers = [] def allRows = [] @@ -1384,9 +1384,9 @@ class ExportDistrictRongHe extends BaseBatch{ println allRows.size() FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); - println "community_p_describe_gj 数据文件输出完成......" + println "community_p_describe_gj 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpUtils.ftpUpload("rh", fileName, curDate) - println "community_p_describe_gj 上传Ftp完成......" + println "community_p_describe_gj 涓婁紶Ftp瀹屾垚......" } @@ -1395,7 +1395,7 @@ class ExportDistrictRongHe extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28" def fileName = "/home/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_COMM_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 = [] @@ -1452,9 +1452,9 @@ class ExportDistrictRongHe extends BaseBatch{ println allRows.size() FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); - println "community_p_describe_gj 数据文件输出完成......" + println "community_p_describe_gj 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpUtils.ftpUpload("rh", fileName, curDate) - println "community_p_describe_gj 上传Ftp完成......" + println "community_p_describe_gj 涓婁紶Ftp瀹屾垚......" } // def exportGuideStatistics(time){ @@ -1462,7 +1462,7 @@ class ExportDistrictRongHe extends BaseBatch{ // def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" // def fileName = "/home/ccb_rh/${curDate}/FJW_000000_000000_GUIDE_STATISTICS_ADD_${curDate}_0001.dat" // if(CommonDatautils.isWindow()){ -// fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_GUIDE_STATISTICS_ADD_${curDate}_0001.dat" +// fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_GUIDE_STATISTICS_ADD_${curDate}_0001.dat" // } // def headers = [] // def allRows = [] @@ -1492,9 +1492,9 @@ class ExportDistrictRongHe extends BaseBatch{ // println allRows.size() // FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); // -// println "guide_statistics 数据文件输出完成......" +// println "guide_statistics 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" // CcbFtpUtils.ftpUpload("rh", fileName, curDate) -// println "guide_statistics 上传Ftp完成......" +// println "guide_statistics 涓婁紶Ftp瀹屾垚......" // } @@ -1503,7 +1503,7 @@ class ExportDistrictRongHe extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28" def fileName = "/home/ccb_rh/${curDate}/FJW_000000_000000_GUIDE_STATISTICS_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_GUIDE_STATISTICS_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_GUIDE_STATISTICS_ADD_${curDate}_0001.dat" } def headers = [] def allRows = [] @@ -1528,9 +1528,9 @@ class ExportDistrictRongHe extends BaseBatch{ println allRows.size() FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); - println "guide_statistics 数据文件输出完成......" + println "guide_statistics 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpUtils.ftpUpload("rh", fileName, curDate) - println "guide_statistics 上传Ftp完成......" + println "guide_statistics 涓婁紶Ftp瀹屾垚......" } @@ -1539,7 +1539,7 @@ class ExportDistrictRongHe extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28" def fileName = "/home/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_SUPPLIER_STATISTICS_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_SUPPLIER_STATISTICS_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_SUPPLIER_STATISTICS_ADD_${curDate}_0001.dat" } def headers = [] def allRows = [] @@ -1561,9 +1561,9 @@ class ExportDistrictRongHe extends BaseBatch{ println allRows.size() FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); - println "bigdata_supplier_statistics 数据文件输出完成......" + println "bigdata_supplier_statistics 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpUtils.ftpUpload("rh", fileName, curDate) - println "bigdata_supplier_statistics 上传Ftp完成......" + println "bigdata_supplier_statistics 涓婁紶Ftp瀹屾垚......" } @@ -1572,7 +1572,7 @@ class ExportDistrictRongHe extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/home/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_SUPPLIER_STATISTICS_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_SUPPLIER_STATISTICS_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_SUPPLIER_STATISTICS_ADD_${curDate}_0001.dat" } def headers = [] def allRows = [] @@ -1600,9 +1600,9 @@ class ExportDistrictRongHe extends BaseBatch{ println allRows.size() FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); - println "bigdata_supplier_statistics 数据文件输出完成......" + println "bigdata_supplier_statistics 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpUtils.ftpUpload("rh", fileName, curDate) - println "bigdata_supplier_statistics 上传Ftp完成......" + println "bigdata_supplier_statistics 涓婁紶Ftp瀹屾垚......" } @@ -1611,7 +1611,7 @@ class ExportDistrictRongHe extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/home/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_MODELING_BASE_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_MODELING_BASE_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_MODELING_BASE_ADD_${curDate}_0001.dat" } def headers = [] def allRows = [] @@ -1644,9 +1644,9 @@ class ExportDistrictRongHe extends BaseBatch{ println allRows.size() FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); - println "bigdata_modeling_base 数据文件输出完成......" + println "bigdata_modeling_base 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpUtils.ftpUpload("rh", fileName, curDate) - println "bigdata_modeling_base 上传Ftp完成......" + println "bigdata_modeling_base 涓婁紶Ftp瀹屾垚......" } def exportPgBigdataModelingBase(time){ @@ -1654,7 +1654,7 @@ class ExportDistrictRongHe extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28" def fileName = "/home/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_MODELING_BASE_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_MODELING_BASE_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_MODELING_BASE_ADD_${curDate}_0001.dat" } def headers = [] def allRows = [] @@ -1682,16 +1682,16 @@ class ExportDistrictRongHe extends BaseBatch{ println allRows.size() FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); - println "bigdata_modeling_base 数据文件输出完成......" + println "bigdata_modeling_base 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpUtils.ftpUpload("rh", fileName, curDate) - println "bigdata_modeling_base 上传Ftp完成......" + println "bigdata_modeling_base 涓婁紶Ftp瀹屾垚......" } def exportBigdataCityPrice(queryDate){ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/home/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_CITYPRICE_FJW_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_CITYPRICE_FJW_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_CITYPRICE_FJW_ADD_${curDate}_0001.dat" } def allRows = [] for(def city : citys) { @@ -1731,7 +1731,7 @@ class ExportDistrictRongHe extends BaseBatch{ FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); CcbFtpUtils.ftpUpload("rh",fileName, curDate) - println "BIGDATA_CITYPRICE 上传Ftp完成......" + println "BIGDATA_CITYPRICE 涓婁紶Ftp瀹屾垚......" } @@ -1739,7 +1739,7 @@ class ExportDistrictRongHe extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/home/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_DISTPRICE_FJW_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_DISTPRICE_FJW_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_DISTPRICE_FJW_ADD_${curDate}_0001.dat" } def allRows = [] for(def city : citys) { @@ -1778,7 +1778,7 @@ class ExportDistrictRongHe extends BaseBatch{ FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); CcbFtpUtils.ftpUpload("rh",fileName, curDate) - println "BIGDATA_DISTPRICE 上传Ftp完成......" + println "BIGDATA_DISTPRICE 涓婁紶Ftp瀹屾垚......" } @@ -1786,7 +1786,7 @@ class ExportDistrictRongHe extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/home/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMPRICE_FJW_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_COMMPRICE_FJW_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_COMMPRICE_FJW_ADD_${curDate}_0001.dat" } def allRows = [] for(def city : citys) { @@ -1838,7 +1838,7 @@ class ExportDistrictRongHe extends BaseBatch{ FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); CcbFtpUtils.ftpUpload("rh",fileName, curDate) - println "BIGDATA_COMMPRICE 上传Ftp完成......" + println "BIGDATA_COMMPRICE 涓婁紶Ftp瀹屾垚......" } @@ -1847,24 +1847,24 @@ class ExportDistrictRongHe extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/home/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMLAYOUTPIC_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMLAYOUTPIC_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMLAYOUTPIC_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile([], fileName, [], "utf-8", false); CcbFtpUtils.ftpUpload("rh",fileName, curDate) - println "BIGDATA_COMMLAYOUTPIC_FJW 上传Ftp完成......" + println "BIGDATA_COMMLAYOUTPIC_FJW 涓婁紶Ftp瀹屾垚......" } def exportBigdataForsale(publishDate, new_dists){ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/home/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_FORSALE_FJW_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_FORSALE_FJW_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_FORSALE_FJW_ADD_${curDate}_0001.dat" } - def headers = []//["城市ID","出售ID","挂牌房屋ID","城市名称","行政区ID","行政区名称","小区ID","小区名称","楼栋ID","楼栋编号","楼栋名称","单元ID","单元编号","单元名称","户ID","详细地址","建筑年代","权属","权属年限","单价","总价","出售付款方式","所在楼层","总楼层","建筑类型","室内结构","建筑结构","建筑面积","套内面积","户型","室","厅","厨","卫","朝向","装修情况","是否有电梯","几梯几户","发布时间","到期时间","是否首发","房源数据来源","中介公司ID","中介公司名称","发布人","发布人电话","描述信息","备注","创建时间","更新时间","来源公司","附加信息"] + def headers = []//["鍩庡競ID","鍑哄敭ID","鎸傜墝鎴垮眿ID","鍩庡競鍚嶇О","琛屾斂鍖篒D","琛屾斂鍖哄悕绉�","灏忓尯ID","灏忓尯鍚嶇О","妤兼爧ID","妤兼爧缂栧彿","妤兼爧鍚嶇О","鍗曞厓ID","鍗曞厓缂栧彿","鍗曞厓鍚嶇О","鎴稩D","璇︾粏鍦板潃","寤虹瓚骞翠唬","鏉冨睘","鏉冨睘骞撮檺","鍗曚环","鎬讳环","鍑哄敭浠樻鏂瑰紡","鎵�鍦ㄦゼ灞�","鎬绘ゼ灞�","寤虹瓚绫诲瀷","瀹ゅ唴缁撴瀯","寤虹瓚缁撴瀯","寤虹瓚闈㈢Н","濂楀唴闈㈢Н","鎴峰瀷","瀹�","鍘�","鍘�","鍗�","鏈濆悜","瑁呬慨鎯呭喌","鏄惁鏈夌數姊�","鍑犳鍑犳埛","鍙戝竷鏃堕棿","鍒版湡鏃堕棿","鏄惁棣栧彂","鎴挎簮鏁版嵁鏉ユ簮","涓粙鍏徃ID","涓粙鍏徃鍚嶇О","鍙戝竷浜�","鍙戝竷浜虹數璇�","鎻忚堪淇℃伅","澶囨敞","鍒涘缓鏃堕棿","鏇存柊鏃堕棿","鏉ユ簮鍏徃","闄勫姞淇℃伅"] def index = 0 for(def city : citys){ def cityCode = cityCodeMap.get(city) - if(city=="苏州"){ + if(city=="鑻忓窞"){ continue } @@ -1894,7 +1894,7 @@ class ExportDistrictRongHe extends BaseBatch{ } } - if(new_dists){//补充被修区域的数据 + if(new_dists){//琛ュ厖琚慨鍖哄煙鐨勬暟鎹� def newstr = "('"+new_dists.join("','")+"')" def sql2 = "select CITYID,FORSALEID,PROPCODE,CITYNAME,DISTID,DISTNAME,COMMID,COMMNAME, BUILDID,BUILDNO, BUILDNAME,UNITID,UNITNO,UNITNAME,HOUSEID,ADDRESS,BUILDYEAR,PROPTYPE,PROPYEARS,UNITPRICE,TOTALPRICE,PAYTYPE,FLOORNUM,FLOORCNT,\n" + " BUILDTYPE, HOUSESTRU,BUILDSTRU,BUILDAREA,LIVINGAREA,HOUSESTYLE,ROOMCNT,LIVINGROOMCNT,KITCHENCNT, BATHROOMCNT,HOUSEASPECT,FITMENT,IFELEVATOR,ELEVATORHOUSE,to_char(PUBLISHTIME,'yyyy-mm-dd hh24:mi:ss') as PUBLISHTIME,to_char(EXPIRETIME,'yyyy-mm-dd hh24:mi:ss') as EXPIRETIME,\n" + @@ -1905,9 +1905,9 @@ class ExportDistrictRongHe extends BaseBatch{ FileUtils.batchCreateFile(rets2, fileName, headers, "utf-8", true); } } - println "融合 BIGDATA_FORSALE_GJ 数据文件输出完成......" + println "铻嶅悎 BIGDATA_FORSALE_GJ 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpUtils.ftpUpload("rh",fileName, curDate) - println "融合 BIGDATA_FORSALE_GJ 上传Ftp完成......" + println "铻嶅悎 BIGDATA_FORSALE_GJ 涓婁紶Ftp瀹屾垚......" } @@ -1915,9 +1915,9 @@ class ExportDistrictRongHe extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/home/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_FORSALE_FJW_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_FORSALE_FJW_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_FORSALE_FJW_ADD_${curDate}_0001.dat" } - def headers = []//["城市ID","出售ID","挂牌房屋ID","城市名称","行政区ID","行政区名称","小区ID","小区名称","楼栋ID","楼栋编号","楼栋名称","单元ID","单元编号","单元名称","户ID","详细地址","建筑年代","权属","权属年限","单价","总价","出售付款方式","所在楼层","总楼层","建筑类型","室内结构","建筑结构","建筑面积","套内面积","户型","室","厅","厨","卫","朝向","装修情况","是否有电梯","几梯几户","发布时间","到期时间","是否首发","房源数据来源","中介公司ID","中介公司名称","发布人","发布人电话","描述信息","备注","创建时间","更新时间","来源公司","附加信息"] + def headers = []//["鍩庡競ID","鍑哄敭ID","鎸傜墝鎴垮眿ID","鍩庡競鍚嶇О","琛屾斂鍖篒D","琛屾斂鍖哄悕绉�","灏忓尯ID","灏忓尯鍚嶇О","妤兼爧ID","妤兼爧缂栧彿","妤兼爧鍚嶇О","鍗曞厓ID","鍗曞厓缂栧彿","鍗曞厓鍚嶇О","鎴稩D","璇︾粏鍦板潃","寤虹瓚骞翠唬","鏉冨睘","鏉冨睘骞撮檺","鍗曚环","鎬讳环","鍑哄敭浠樻鏂瑰紡","鎵�鍦ㄦゼ灞�","鎬绘ゼ灞�","寤虹瓚绫诲瀷","瀹ゅ唴缁撴瀯","寤虹瓚缁撴瀯","寤虹瓚闈㈢Н","濂楀唴闈㈢Н","鎴峰瀷","瀹�","鍘�","鍘�","鍗�","鏈濆悜","瑁呬慨鎯呭喌","鏄惁鏈夌數姊�","鍑犳鍑犳埛","鍙戝竷鏃堕棿","鍒版湡鏃堕棿","鏄惁棣栧彂","鎴挎簮鏁版嵁鏉ユ簮","涓粙鍏徃ID","涓粙鍏徃鍚嶇О","鍙戝竷浜�","鍙戝竷浜虹數璇�","鎻忚堪淇℃伅","澶囨敞","鍒涘缓鏃堕棿","鏇存柊鏃堕棿","鏉ユ簮鍏徃","闄勫姞淇℃伅"] def index = 0 for(def city : citys){ def cityCode = cityCodeMap.get(city) @@ -1944,7 +1944,7 @@ class ExportDistrictRongHe extends BaseBatch{ } } - if(new_dists){//补充被修区域的数据 + 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 base.t0831_bigdata_forsale_gj_h where gujia_admndiv_id in ${newstr}" @@ -1953,9 +1953,9 @@ class ExportDistrictRongHe extends BaseBatch{ FileUtils.batchCreateFile(rets2, fileName, headers, "utf-8", true); } } - println "融合 BIGDATA_FORSALE_GJ 数据文件输出完成......" + println "铻嶅悎 BIGDATA_FORSALE_GJ 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpUtils.ftpUpload("rh",fileName, curDate) - println "融合 BIGDATA_FORSALE_GJ 上传Ftp完成......" + println "铻嶅悎 BIGDATA_FORSALE_GJ 涓婁紶Ftp瀹屾垚......" } def getHouseDatas(sql){ @@ -2016,7 +2016,7 @@ class ExportDistrictRongHe extends BaseBatch{ data << r.CREATETIME data << r.UPDATETIME data << r.SOURCECODE -// data << r.ATTACH //融合房源没有这个字段 +// data << r.ATTACH //铻嶅悎鎴挎簮娌℃湁杩欎釜瀛楁 allRows << data // if(allRows.size()%200000==0){ // FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", true); @@ -2085,7 +2085,7 @@ class ExportDistrictRongHe extends BaseBatch{ data << r.data_crt_tm data << r.data_udt_tm data << r.gujia_src_co -// data << r.ATTACH //融合房源没有这个字段 +// data << r.ATTACH //铻嶅悎鎴挎簮娌℃湁杩欎釜瀛楁 allRows << data // if(allRows.size()%200000==0){ // FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", true); @@ -2100,7 +2100,7 @@ class ExportDistrictRongHe extends BaseBatch{ // def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMMdd") def dataCodeFileName = "/home/ccb_rh/${curDate}/${curDate}.ok" if(CommonDatautils.isWindow()){ - dataCodeFileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\${curDate}.ok" + dataCodeFileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_rh\\${curDate}\\${curDate}.ok" } FileUtils.batchCreateFile([], dataCodeFileName, [], "utf-8", false); CcbFtpUtils.ftpUpload("rh",dataCodeFileName, curDate) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/ExportDistrictRongHeTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/ExportDistrictRongHeTest.groovy index 66f2cc491..cf9500bf2 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/ExportDistrictRongHeTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/ExportDistrictRongHeTest.groovy @@ -32,7 +32,7 @@ class ExportDistrictRongHeTest extends BaseBatch{ citys = CcbCommonUtils.getRunningCitys(args) def curDate = DateUtils.formatDateByPattern(new Date()+1, "yyyyMMdd") def new_dists = []//["350604","350605","410307","410308","450181"] - //按天导(每天一个文件夹) + //鎸夊ぉ瀵硷紙姣忓ぉ涓�涓枃浠跺す锛� // exportBigdataDealFJW2(curDate, DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date()+1,-1), "yyyy-MM-dd"), new_dists) exportPgBigdataDealFJW(curDate, DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date()+1,-2), "yyyy-MM-dd"), new_dists) @@ -56,7 +56,7 @@ class ExportDistrictRongHeTest extends BaseBatch{ exportBigdataAliasFJW()// - //本12.10上传10,11月所有数据,23年1月需改为所有城市按日期同步一期数据 + //鏈�12.10涓婁紶10锛�11鏈堟墍鏈夋暟鎹紝23骞�1鏈堥渶鏀逛负鎵�鏈夊煄甯傛寜鏃ユ湡鍚屾涓�鏈熸暟鎹� def queryDate = DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM").toInteger() exportBigdataCityPrice(queryDate) exportBigdataDistPrice(queryDate) @@ -77,7 +77,7 @@ class ExportDistrictRongHeTest extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/ccb_ronghe/${curDate}/FJW_000000_000000_BIGDATA_COMMUNITY_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_COMMUNITY_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_COMMUNITY_FJW_ALL_${curDate}_0001.dat" } def index = 0 for(def city : citys){ @@ -119,9 +119,9 @@ class ExportDistrictRongHeTest extends BaseBatch{ } } - println "BIGDATA_COMMUNITY_FJW 数据文件输出完成......" + println "BIGDATA_COMMUNITY_FJW 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpTestUtils.ftpUpload("rh",fileName, curDate) - println "BIGDATA_COMMUNITY_FJW 上传Ftp完成......" + println "BIGDATA_COMMUNITY_FJW 涓婁紶Ftp瀹屾垚......" } def exportBigdataCommbuildstruGJ(){ def allRows = [] @@ -144,11 +144,11 @@ class ExportDistrictRongHeTest extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/ccb_ronghe/${curDate}/FJW_000000_000000_BIGDATA_COMMBUILDSTRU_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_COMMBUILDSTRU_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_COMMBUILDSTRU_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); CcbFtpTestUtils.ftpUpload("rh",fileName, curDate) - println "BIGDATA_COMMBUILDSTRU_FJW 上传Ftp完成......" + println "BIGDATA_COMMBUILDSTRU_FJW 涓婁紶Ftp瀹屾垚......" } def exportBigdataCommhousetypeGJ(){ @@ -173,11 +173,11 @@ class ExportDistrictRongHeTest extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/ccb_ronghe/${curDate}/FJW_000000_000000_BIGDATA_COMMHOUSETYPE_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_COMMHOUSETYPE_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_COMMHOUSETYPE_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); CcbFtpTestUtils.ftpUpload("rh",fileName, curDate) - println "BIGDATA_COMMHOUSETYPE_FJW 上传Ftp完成......" + println "BIGDATA_COMMHOUSETYPE_FJW 涓婁紶Ftp瀹屾垚......" } def exportBigdataCommbuildyearGj(){ @@ -201,11 +201,11 @@ class ExportDistrictRongHeTest extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/ccb_ronghe/${curDate}/FJW_000000_000000_BIGDATA_COMMBUILDYEAR_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_COMMBUILDYEAR_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_COMMBUILDYEAR_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); CcbFtpTestUtils.ftpUpload("rh", fileName, curDate) - println "BIGDATA_COMMBUILDYEAR_FJW 上传Ftp完成......" + println "BIGDATA_COMMBUILDYEAR_FJW 涓婁紶Ftp瀹屾垚......" } def exportBigdataCommfeeGj(){ @@ -239,11 +239,11 @@ class ExportDistrictRongHeTest extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/ccb_ronghe/${curDate}/FJW_000000_000000_BIGDATA_COMMFEE_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_COMMFEE_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_COMMFEE_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); CcbFtpTestUtils.ftpUpload("rh",fileName, curDate) - println "BIGDATA_COMMFEE_FJW 上传Ftp完成......" + println "BIGDATA_COMMFEE_FJW 涓婁紶Ftp瀹屾垚......" } @@ -269,11 +269,11 @@ class ExportDistrictRongHeTest extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/ccb_ronghe/${curDate}/FJW_000000_000000_BIGDATA_COMMHOUSEUSE_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_COMMHOUSEUSE_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_COMMHOUSEUSE_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); CcbFtpTestUtils.ftpUpload("rh",fileName, curDate) - println "BIGDATA_COMMHOUSEUSE_FJW 上传Ftp完成......" + println "BIGDATA_COMMHOUSEUSE_FJW 涓婁紶Ftp瀹屾垚......" } def exportBigdataPositionGJ(){ @@ -302,11 +302,11 @@ class ExportDistrictRongHeTest extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/ccb_ronghe/${curDate}/FJW_000000_000000_BIGDATA_POSITION_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_POSITION_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_POSITION_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); CcbFtpTestUtils.ftpUpload("rh",fileName, curDate) - println "BIGDATA_POSITION_FJW 上传Ftp完成......" + println "BIGDATA_POSITION_FJW 涓婁紶Ftp瀹屾垚......" } def exportBigdataDistrictFJW(){ @@ -334,11 +334,11 @@ class ExportDistrictRongHeTest extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/ccb_ronghe/${curDate}/FJW_000000_000000_BIGDATA_DISTRICT_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_DISTRICT_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_DISTRICT_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); CcbFtpTestUtils.ftpUpload("rh", fileName, curDate) - println "BIGDATA_DISTRICT_FJW 上传Ftp完成......" + println "BIGDATA_DISTRICT_FJW 涓婁紶Ftp瀹屾垚......" } def exportBigdataAliasFJW(){ @@ -369,11 +369,11 @@ class ExportDistrictRongHeTest extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/ccb_ronghe/${curDate}/FJW_000000_000000_ADDRESS_ALIAS_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_ADDRESS_ALIAS_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_ADDRESS_ALIAS_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); CcbFtpTestUtils.ftpUpload("rh",fileName, curDate) - println "ADDRESS_ALIAS_FJW 上传Ftp完成......" + println "ADDRESS_ALIAS_FJW 涓婁紶Ftp瀹屾垚......" } def exportBigdataDealFJW(dealdate){ @@ -393,7 +393,7 @@ class ExportDistrictRongHeTest extends BaseBatch{ def fileName = "/ccb_ronghe/${curDate}/FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curStartStr.replace("-","")}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curStartStr.replace("-","")}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curStartStr.replace("-","")}_0001.dat" } def allRows = [] @@ -478,7 +478,7 @@ class ExportDistrictRongHeTest extends BaseBatch{ } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); CcbFtpTestUtils.ftpUpload("ccb_ronghe", fileName, curDate) - println "BIGDATA_DEAL_FJW 上传Ftp完成......${curStartStr}" + println "BIGDATA_DEAL_FJW 涓婁紶Ftp瀹屾垚......${curStartStr}" def curEndStr = DateUtils.add(curStartStr, 1) curStartDateStr = curEndStr } @@ -493,7 +493,7 @@ class ExportDistrictRongHeTest extends BaseBatch{ def fileName = "/ccb_ronghe/${curDate}/FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat" } def allRows = [] @@ -530,7 +530,7 @@ class ExportDistrictRongHeTest extends BaseBatch{ FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); CcbFtpTestUtils.ftpUpload("rh",fileName, curDate) - println "BIGDATA_DEAL_FJW 上传Ftp完成......${endDateStr}" + println "BIGDATA_DEAL_FJW 涓婁紶Ftp瀹屾垚......${endDateStr}" } @@ -543,7 +543,7 @@ class ExportDistrictRongHeTest extends BaseBatch{ def fileName = "/ccb_ronghe/${curDate}/FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat" } @@ -573,7 +573,7 @@ class ExportDistrictRongHeTest extends BaseBatch{ FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); CcbFtpTestUtils.ftpUpload("rh",fileName, curDate) - println "BIGDATA_DEAL_FJW 上传Ftp完成......${endDateStr}" + println "BIGDATA_DEAL_FJW 涓婁紶Ftp瀹屾垚......${endDateStr}" } @@ -816,10 +816,10 @@ class ExportDistrictRongHeTest extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/ccb_ronghe/${curDate}/FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); - println "BIGDATA_DEAL_FJW 导出完成......" + println "BIGDATA_DEAL_FJW 瀵煎嚭瀹屾垚......" } @@ -827,7 +827,7 @@ class ExportDistrictRongHeTest extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/ccb_ronghe/${curDate}/FJW_000000_000000_BIGDATA_BUILDING_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_BUILDING_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_BUILDING_FJW_ALL_${curDate}_0001.dat" } def index = 0 for(def city : citys) { @@ -877,14 +877,14 @@ class ExportDistrictRongHeTest extends BaseBatch{ } CcbFtpTestUtils.ftpUpload("rh",fileName, curDate) - println "BIGDATA_BUILDING_FJW 上传Ftp完成......" + println "BIGDATA_BUILDING_FJW 涓婁紶Ftp瀹屾垚......" } def exportBigdataCityPrice(queryDate){ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/ccb_ronghe/${curDate}/FJW_000000_000000_BIGDATA_CITYPRICE_FJW_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_CITYPRICE_FJW_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_CITYPRICE_FJW_ADD_${curDate}_0001.dat" } def allRows = [] for(def city : citys) { @@ -924,7 +924,7 @@ class ExportDistrictRongHeTest extends BaseBatch{ FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); CcbFtpTestUtils.ftpUpload("rh",fileName, curDate) - println "BIGDATA_CITYPRICE 上传Ftp完成......" + println "BIGDATA_CITYPRICE 涓婁紶Ftp瀹屾垚......" } @@ -932,7 +932,7 @@ class ExportDistrictRongHeTest extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/ccb_ronghe/${curDate}/FJW_000000_000000_BIGDATA_DISTPRICE_FJW_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_DISTPRICE_FJW_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_DISTPRICE_FJW_ADD_${curDate}_0001.dat" } def allRows = [] for(def city : citys) { @@ -971,7 +971,7 @@ class ExportDistrictRongHeTest extends BaseBatch{ FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); CcbFtpTestUtils.ftpUpload("rh",fileName, curDate) - println "BIGDATA_DISTPRICE 上传Ftp完成......" + println "BIGDATA_DISTPRICE 涓婁紶Ftp瀹屾垚......" } @@ -979,7 +979,7 @@ class ExportDistrictRongHeTest extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/ccb_ronghe/${curDate}/FJW_000000_000000_BIGDATA_COMMPRICE_FJW_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_COMMPRICE_FJW_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_COMMPRICE_FJW_ADD_${curDate}_0001.dat" } def allRows = [] for(def city : citys) { @@ -1018,7 +1018,7 @@ class ExportDistrictRongHeTest extends BaseBatch{ FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); CcbFtpTestUtils.ftpUpload("rh",fileName, curDate) - println "BIGDATA_COMMPRICE 上传Ftp完成......" + println "BIGDATA_COMMPRICE 涓婁紶Ftp瀹屾垚......" } @@ -1042,33 +1042,33 @@ class ExportDistrictRongHeTest extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/ccb_ronghe/${curDate}/FJW_000000_000000_EVALUATE_RATE_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_EVALUATE_RATE_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_EVALUATE_RATE_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); CcbFtpTestUtils.ftpUpload("rh",fileName, curDate) - println "EVALUATE_RATE_FJW 上传Ftp完成......" + println "EVALUATE_RATE_FJW 涓婁紶Ftp瀹屾垚......" } def exportBigdataBuildprojFjw(){ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/ccb_ronghe/${curDate}/FJW_000000_000000_BIGDATA_BUILDPROJ_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_BUILDPROJ_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_BUILDPROJ_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile([], fileName, [], "utf-8", false); CcbFtpTestUtils.ftpUpload("rh",fileName, curDate) - println "BIGDATA_BUILDPROJ_FJW 上传Ftp完成......" + println "BIGDATA_BUILDPROJ_FJW 涓婁紶Ftp瀹屾垚......" } def exportBigdataCommlayoutpicFjw(){ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/ccb_ronghe/${curDate}/FJW_000000_000000_BIGDATA_COMMLAYOUTPIC_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_COMMLAYOUTPIC_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_COMMLAYOUTPIC_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile([], fileName, [], "utf-8", false); CcbFtpTestUtils.ftpUpload("rh",fileName, curDate) - println "BIGDATA_COMMLAYOUTPIC_FJW 上传Ftp完成......" + println "BIGDATA_COMMLAYOUTPIC_FJW 涓婁紶Ftp瀹屾垚......" } @@ -1086,11 +1086,11 @@ class ExportDistrictRongHeTest extends BaseBatch{ } def fileName = "/ccb_ronghe/${curDate}/${curDate}.ok" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_ronghe\\${curDate}\\${curDate}.ok" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_ronghe\\${curDate}\\${curDate}.ok" } FileUtils.createTxtFile(fileRows, fileName, "utf-8", false); CcbFtpTestUtils.ftpUpload("rh", fileName, curDate) - println "融合统计文件长度ok文件 上传Ftp完成......" + println "铻嶅悎缁熻鏂囦欢闀垮害ok鏂囦欢 涓婁紶Ftp瀹屾垚......" } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/NoFenCity.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/NoFenCity.groovy index 11270dab3..915a99335 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/NoFenCity.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/NoFenCity.groovy @@ -28,7 +28,7 @@ class ExportDistrictRongHeTest extends BaseBatch{ def curDate = 20220310//DateUtils.formatDateByPattern(new Date()+1, "yyyyMMdd") def fileName = "/ccb_rh/${curDate}" // if(CommonDatautils.isWindow()){ -// fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}" +// fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_rh\\${curDate}" // } CcbFtpTestUtils.delete(fileName) @@ -63,14 +63,14 @@ class ExportDistrictRongHeTest extends BaseBatch{ // def cityCodeDataMap = CcbCommonUtils.findCityCodeValue() // // -//// //检查ok文件是否上传 +//// //妫�鏌k鏂囦欢鏄惁涓婁紶 //// exportAllBigdataDealFJW() //// for(def city : citys) { //// def cityCode = cityCodeDataMap.get(city) //// -// //按天导(一个文件夹下) +// //鎸夊ぉ瀵�(涓�涓枃浠跺す涓�) // //exportBigdataDealFJW(DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(),-2), "yyyy-MM-dd")) -// //按天导(每天一个文件夹) +// //鎸夊ぉ瀵硷紙姣忓ぉ涓�涓枃浠跺す锛� // exportBigdataDealFJW2(DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(),-2), "yyyy-MM-dd")) // //// exportBigdataCommunityGJRH(cityCode) @@ -128,12 +128,12 @@ class ExportDistrictRongHeTest extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMUNITY_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMUNITY_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMUNITY_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); - println "BIGDATA_COMMUNITY_FJW 数据文件输出完成......" + println "BIGDATA_COMMUNITY_FJW 鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" CcbFtpTestUtils.ftpUpload("rh",fileName, curDate) - println "BIGDATA_COMMUNITY_FJW 上传Ftp完成......" + println "BIGDATA_COMMUNITY_FJW 涓婁紶Ftp瀹屾垚......" } def exportBigdataCommbuildstruGJ(){ def sql = "select CITYID,COMMID,BUILDSTRU,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from BIGDATA_COMMBUILDSTRU_FJW";// where CITYID='${cityCode}' @@ -152,11 +152,11 @@ class ExportDistrictRongHeTest extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMBUILDSTRU_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMBUILDSTRU_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMBUILDSTRU_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); CcbFtpTestUtils.ftpUpload("rh",fileName, curDate) - println "BIGDATA_COMMBUILDSTRU_FJW 上传Ftp完成......" + println "BIGDATA_COMMBUILDSTRU_FJW 涓婁紶Ftp瀹屾垚......" } def exportBigdataCommhousetypeGJ(cityCode){ @@ -176,11 +176,11 @@ class ExportDistrictRongHeTest extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMHOUSETYPE_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMHOUSETYPE_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMHOUSETYPE_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); CcbFtpTestUtils.ftpUpload("rh",fileName, curDate) - println "BIGDATA_COMMHOUSETYPE_FJW 上传Ftp完成......" + println "BIGDATA_COMMHOUSETYPE_FJW 涓婁紶Ftp瀹屾垚......" } def exportBigdataCommbuildyearGj(){ @@ -200,11 +200,11 @@ class ExportDistrictRongHeTest extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMBUILDYEAR_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMBUILDYEAR_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMBUILDYEAR_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); CcbFtpTestUtils.ftpUpload("rh", fileName, curDate) - println "BIGDATA_COMMBUILDYEAR_FJW 上传Ftp完成......" + println "BIGDATA_COMMBUILDYEAR_FJW 涓婁紶Ftp瀹屾垚......" } def exportBigdataCommfeeGj(){ @@ -234,11 +234,11 @@ class ExportDistrictRongHeTest extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMFEE_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMFEE_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMFEE_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); CcbFtpTestUtils.ftpUpload("rh",fileName, curDate) - println "BIGDATA_COMMFEE_FJW 上传Ftp完成......" + println "BIGDATA_COMMFEE_FJW 涓婁紶Ftp瀹屾垚......" } @@ -260,11 +260,11 @@ class ExportDistrictRongHeTest extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMHOUSEUSE_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMHOUSEUSE_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMHOUSEUSE_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); CcbFtpTestUtils.ftpUpload("rh",fileName, curDate) - println "BIGDATA_COMMHOUSEUSE_FJW 上传Ftp完成......" + println "BIGDATA_COMMHOUSEUSE_FJW 涓婁紶Ftp瀹屾垚......" } def exportBigdataPositionGJ(){ @@ -289,11 +289,11 @@ class ExportDistrictRongHeTest extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_POSITION_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_POSITION_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_POSITION_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); CcbFtpTestUtils.ftpUpload("rh",fileName, curDate) - println "BIGDATA_POSITION_FJW 上传Ftp完成......" + println "BIGDATA_POSITION_FJW 涓婁紶Ftp瀹屾垚......" } def exportBigdataDistrictFJW(){ @@ -317,11 +317,11 @@ class ExportDistrictRongHeTest extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_DISTRICT_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_DISTRICT_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_DISTRICT_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); CcbFtpTestUtils.ftpUpload("rh", fileName, curDate) - println "BIGDATA_DISTRICT_FJW 上传Ftp完成......" + println "BIGDATA_DISTRICT_FJW 涓婁紶Ftp瀹屾垚......" } def exportBigdataAliasFJW(){ @@ -348,11 +348,11 @@ class ExportDistrictRongHeTest extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_ADDRESS_ALIAS_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_ADDRESS_ALIAS_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_ADDRESS_ALIAS_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); CcbFtpTestUtils.ftpUpload("rh",fileName, curDate) - println "ADDRESS_ALIAS_FJW 上传Ftp完成......" + println "ADDRESS_ALIAS_FJW 涓婁紶Ftp瀹屾垚......" } def exportBigdataDealFJW(dealdate){ @@ -372,7 +372,7 @@ class ExportDistrictRongHeTest extends BaseBatch{ def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curStartStr.replace("-","")}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curStartStr.replace("-","")}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curStartStr.replace("-","")}_0001.dat" } def allRows = [] @@ -457,7 +457,7 @@ class ExportDistrictRongHeTest extends BaseBatch{ } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); CcbFtpTestUtils.ftpUpload("rh", fileName, curDate) - println "BIGDATA_DEAL_FJW 上传Ftp完成......${curStartStr}" + println "BIGDATA_DEAL_FJW 涓婁紶Ftp瀹屾垚......${curStartStr}" def curEndStr = DateUtils.add(curStartStr, 1) curStartDateStr = curEndStr } @@ -472,7 +472,7 @@ class ExportDistrictRongHeTest extends BaseBatch{ def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat" } def allRows = [] @@ -552,7 +552,7 @@ class ExportDistrictRongHeTest extends BaseBatch{ }); FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); CcbFtpTestUtils.ftpUpload("rh",fileName, curDate) - println "BIGDATA_DEAL_FJW 上传Ftp完成......${endDateStr}" + println "BIGDATA_DEAL_FJW 涓婁紶Ftp瀹屾垚......${endDateStr}" } def exportAllBigdataDealFJW(){ @@ -634,10 +634,10 @@ class ExportDistrictRongHeTest extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); - println "BIGDATA_DEAL_FJW 导出完成......" + println "BIGDATA_DEAL_FJW 瀵煎嚭瀹屾垚......" } @@ -677,11 +677,11 @@ class ExportDistrictRongHeTest extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_BUILDING_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_BUILDING_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_BUILDING_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); CcbFtpTestUtils.ftpUpload("rh",fileName, curDate) - println "BIGDATA_BUILDING_FJW 上传Ftp完成......" + println "BIGDATA_BUILDING_FJW 涓婁紶Ftp瀹屾垚......" } @@ -705,40 +705,40 @@ class ExportDistrictRongHeTest extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_EVALUATE_RATE_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_EVALUATE_RATE_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_EVALUATE_RATE_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); CcbFtpTestUtils.ftpUpload("rh",fileName, curDate) - println "EVALUATE_RATE_FJW 上传Ftp完成......" + println "EVALUATE_RATE_FJW 涓婁紶Ftp瀹屾垚......" } def exportBigdataBuildprojFjw(){ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_BUILDPROJ_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_BUILDPROJ_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_BUILDPROJ_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile([], fileName, [], "utf-8", false); CcbFtpTestUtils.ftpUpload("rh",fileName, curDate) - println "BIGDATA_BUILDPROJ_FJW 上传Ftp完成......" + println "BIGDATA_BUILDPROJ_FJW 涓婁紶Ftp瀹屾垚......" } def exportBigdataCommlayoutpicFjw(){ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMLAYOUTPIC_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMLAYOUTPIC_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMLAYOUTPIC_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile([], fileName, [], "utf-8", false); CcbFtpTestUtils.ftpUpload("rh",fileName, curDate) - println "BIGDATA_COMMLAYOUTPIC_FJW 上传Ftp完成......" + println "BIGDATA_COMMLAYOUTPIC_FJW 涓婁紶Ftp瀹屾垚......" } def exportOk(curDate){ // def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMMdd") def dataCodeFileName = "/ccb_rh/${curDate}/${curDate}.ok" if(CommonDatautils.isWindow()){ - dataCodeFileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\${curDate}.ok" + dataCodeFileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鏁版嵁鏂囦欢\\txt\\ccb_rh\\${curDate}\\${curDate}.ok" } FileUtils.batchCreateFile([], dataCodeFileName, [], "utf-8", false); CcbFtpTestUtils.ftpUpload("rh",dataCodeFileName, curDate) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/SSHHelper.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/SSHHelper.groovy index 705a5c1f1..b8d51494f 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/SSHHelper.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/SSHHelper.groovy @@ -22,7 +22,7 @@ class SSHHelper { private String sftpPassword = "ccb!@#"; private int timeout = 30000; /** - * 获取连接 + * 鑾峰彇杩炴帴 * @return */ private ChannelExec getChannelExec() { @@ -52,7 +52,7 @@ class SSHHelper { } /** - * 关闭连接 + * 鍏抽棴杩炴帴 */ private void closeChannel() { try { @@ -70,7 +70,7 @@ class SSHHelper { } /** - * 执行服务器端命令 + * 鎵ц鏈嶅姟鍣ㄧ鍛戒护 */ public boolean executeCommand(String command) { boolean flag = false; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/SSHHelperTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/SSHHelperTest.groovy index 07d453ef7..d95c80f61 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/SSHHelperTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/SSHHelperTest.groovy @@ -22,7 +22,7 @@ class SSHHelperTest { private String sftpPassword = "ccb!@#"; private int timeout = 30000; /** - * 获取连接 + * 鑾峰彇杩炴帴 * @return */ private ChannelExec getChannelExec() { @@ -52,7 +52,7 @@ class SSHHelperTest { } /** - * 关闭连接 + * 鍏抽棴杩炴帴 */ private void closeChannel() { try { @@ -70,7 +70,7 @@ class SSHHelperTest { } /** - * 执行服务器端命令 + * 鎵ц鏈嶅姟鍣ㄧ鍛戒护 */ public boolean executeCommand(String command) { boolean flag = false; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/centanet/CentanetHouseImportBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/centanet/CentanetHouseImportBatch.groovy index 8e5380888..5ab213078 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/centanet/CentanetHouseImportBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/centanet/CentanetHouseImportBatch.groovy @@ -21,8 +21,8 @@ import com.mongodb.DBObject class CentanetHouseImportBatch extends BaseBatch { final static def DSCollection dsCollection = new DataStore("datastore.db.fangjia.com").getCollection("fangjia.seabird") - final static def reTry = 3 //出现异常时重试3次 - final static def reTryDelay = 10000; //异常出现后,等待10秒后重试 + final static def reTry = 3 //鍑虹幇寮傚父鏃堕噸璇�3娆� + final static def reTryDelay = 10000; //寮傚父鍑虹幇鍚庯紝绛夊緟10绉掑悗閲嶈瘯 public static void main(args) { runBatch(new CentanetHouseImportBatch(), args) @@ -48,7 +48,7 @@ class CentanetHouseImportBatch extends BaseBatch { logInfo "agentXmlFile:${agentXmlFile}, propertiesXmlFile:${propertiesXmlFile}, districtsXmlFile:${regionsXmlFile}" - // 更新status + // 鏇存柊status FastDateFormat fdf = FastDateFormat.getInstance("yyMMddHHmmssSSS") String currentVersion = fdf.format(new Date()) DBObject versionObj = new BasicDBObject() @@ -68,17 +68,17 @@ class CentanetHouseImportBatch extends BaseBatch { dsCollection.update(query, new BasicDBObject('$set', data), true) - // 解析得分 + // 瑙f瀽寰楀垎 def scoreCalculator = new CentanetHouseScoreCalculator(propertiesXmlFile) logInfo scoreCalculator - // 解析经纪人、区域 + // 瑙f瀽缁忕邯浜恒�佸尯鍩� def agentMap = getAgentMap(agentXmlFile) def regionMap = getRegionMap(regionsXmlFile) logInfo "agentMap.size: ${agentMap.size()}, regionMap.size: ${regionMap.size()}, properties.size: ${scoreCalculator.getHouseSize()}" - // 解析房源,并处理 + // 瑙f瀽鎴挎簮锛屽苟澶勭悊 def handler = new HouseImportHandler(agentMap:agentMap, regionMap:regionMap, scoreCalculator:scoreCalculator) def reader = SAXParserFactory.newInstance().newSAXParser().XMLReader reader.setContentHandler(handler) @@ -98,8 +98,8 @@ class CentanetHouseImportBatch extends BaseBatch { } /** - * 获取经纪人 - * @param agentXmlFile 文件路径 + * 鑾峰彇缁忕邯浜� + * @param agentXmlFile 鏂囦欢璺緞 * @return */ private def getAgentMap(agentXmlFile){ @@ -112,8 +112,8 @@ class CentanetHouseImportBatch extends BaseBatch { } /** - * 获取区域 - * @param regionsXmlFile 文件路径 + * 鑾峰彇鍖哄煙 + * @param regionsXmlFile 鏂囦欢璺緞 * @return */ private def getRegionMap(regionsXmlFile){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/centanet/CentanetHouseScoreCalculator.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/centanet/CentanetHouseScoreCalculator.groovy index 0a1eac71e..c4514e13d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/centanet/CentanetHouseScoreCalculator.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/centanet/CentanetHouseScoreCalculator.groovy @@ -21,11 +21,11 @@ class CentanetHouseScoreCalculator { // Mongo mongo = new Mongo('mongo.db.goojia.com') public CentanetHouseScoreCalculator(propertiesXmlFile){ - //CPC房源得分区间,以后可能需要动态计算 + //CPC鎴挎簮寰楀垎鍖洪棿锛屼互鍚庡彲鑳介渶瑕佸姩鎬佽绠� houseScoreRange = [700000000, 1300000000]//getScoreRange('solr_index.house_score') rentHouseScoreRange = [700000000, 1300000000]//getScoreRange('solr_index.rent_house_score') - // 解析房源文件中的房源得分 + // 瑙f瀽鎴挎簮鏂囦欢涓殑鎴挎簮寰楀垎 def handler = new ScoreHandler() def reader = SAXParserFactory.newInstance().newSAXParser().XMLReader reader.setContentHandler(handler) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/centanet/HousePublishService.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/centanet/HousePublishService.groovy index 0c41308d6..38da2e077 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/centanet/HousePublishService.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/centanet/HousePublishService.groovy @@ -11,30 +11,30 @@ import com.mongodb.DBCursor import com.mongodb.DBObject class HousePublishService { - static final def DIRECTIONS = new HashSet(['东','东南','东北','东西','全朝南','南北通','西','西北','北']) - static final def DIRECTIONS_ALIAS = ['南' : '全朝南', - '南北' : '南北通'] + static final def DIRECTIONS = new HashSet(['涓�','涓滃崡','涓滃寳','涓滆タ','鍏ㄦ湞鍗�','鍗楀寳閫�','瑗�','瑗垮寳','鍖�']) + static final def DIRECTIONS_ALIAS = ['鍗�' : '鍏ㄦ湞鍗�', + '鍗楀寳' : '鍗楀寳閫�'] - static final def FITMENTS = new HashSet(['毛坯','普装','精装修','豪装']) - static final def FITMENTS_ALIAS = ['精装' : '精装修', - '中装' : '普装', - '简装' : '普装'] + static final def FITMENTS = new HashSet(['姣涘澂','鏅','绮捐淇�','璞']) + static final def FITMENTS_ALIAS = ['绮捐' : '绮捐淇�', + '涓' : '鏅', + '绠�瑁�' : '鏅'] - static final def ESTATE_TYPES = new HashSet(['多层','小高层','高层','独立别墅','双拼别墅','联体别墅','叠加别墅']) - static final def ESTATE_TYPES_ALIAS = ['别墅' : '独立别墅', - '联排别墅' : '联体别墅', - '独立式别墅' : '独立别墅', - '花园洋房' : '独立别墅'] - static final def ESTATE_TYPES_ALIAS2= ['公寓' : '多层', - '多类型' : '多层', - '普通单位' : '多层', - '商品房' : '多层', - '老公房' : '多层', - '住宅' : '多层', - '错层' : '多层', - '裙楼' : '多层', - '普通住宅' : '多层', - '高档住宅' : '高层'] + static final def ESTATE_TYPES = new HashSet(['澶氬眰','灏忛珮灞�','楂樺眰','鐙珛鍒','鍙屾嫾鍒','鑱斾綋鍒','鍙犲姞鍒']) + static final def ESTATE_TYPES_ALIAS = ['鍒' : '鐙珛鍒', + '鑱旀帓鍒' : '鑱斾綋鍒', + '鐙珛寮忓埆澧�' : '鐙珛鍒', + '鑺卞洯娲嬫埧' : '鐙珛鍒'] + static final def ESTATE_TYPES_ALIAS2= ['鍏瘬' : '澶氬眰', + '澶氱被鍨�' : '澶氬眰', + '鏅�氬崟浣�' : '澶氬眰', + '鍟嗗搧鎴�' : '澶氬眰', + '鑰佸叕鎴�' : '澶氬眰', + '浣忓畢' : '澶氬眰', + '閿欏眰' : '澶氬眰', + '瑁欐ゼ' : '澶氬眰', + '鏅�氫綇瀹�' : '澶氬眰', + '楂樻。浣忓畢' : '楂樺眰'] final static def DSCollection dsCollection = new DataStore("datastore.db.fangjia.com").getCollection("fangjia.seabird") final static def mongoDomain = "mongo.db.fangjia.com" @@ -61,13 +61,13 @@ class HousePublishService { city = city?.trim() def errorContext = [] - // 常规数据校验 + // 甯歌鏁版嵁鏍¢獙 validateCommon(house, houseCpcDetail, city, errorContext) if(isHouse){ - // 二手房数据校验 + // 浜屾墜鎴挎暟鎹牎楠� validateHouse(house, city, errorContext) }else{ - // 租房数据校验 + // 绉熸埧鏁版嵁鏍¢獙 validateRentHouse(house, city, errorContext) } if(errorContext.size()>0){ @@ -76,17 +76,17 @@ class HousePublishService { } def cityCode = CityMap.findCity(city) - // 填充常规信息 + // 濉厖甯歌淇℃伅 fillCommonFields(house) if(isHouse){ - // 填充二手房信息 + // 濉厖浜屾墜鎴夸俊鎭� fillHouseFields(house, city) }else{ - // 租房信息 + // 绉熸埧淇℃伅 fillRentHouseFields(house, city) } - // 校验房源是否已存在 + // 鏍¢獙鎴挎簮鏄惁宸插瓨鍦� DBObject query = new BasicDBObject() query.put("url", house.url) @@ -99,17 +99,17 @@ class HousePublishService { update = true } if(!hc && update){ - return [code:'404',message:"房源不存在",url:house.url] + return [code:'404',message:"鎴挎簮涓嶅瓨鍦�",url:house.url] } def houseId = hc ? hc._id : null try{ def now = new Date() if(update && houseId){ - // 更新 + // 鏇存柊 house.remove('c_date') updateHouseById(houseId, house) }else{ - // 新增 + // 鏂板 DBObject saveHouse = new BasicDBObject(house) dsCollection.save(saveHouse) houseId = saveHouse._id @@ -169,10 +169,10 @@ class HousePublishService { DBCursor cursor = cpc_detail_coll.find(query, fields); if (cursor.hasNext()) { - // 保留第一条记录,用来更新 + // 淇濈暀绗竴鏉¤褰曪紝鐢ㄦ潵鏇存柊 def updateHcd = cursor.next() - // 删除其他记录 + // 鍒犻櫎鍏朵粬璁板綍 DBObject delQuery = new BasicDBObject() def delIds = [] while (cursor.hasNext()) { @@ -184,7 +184,7 @@ class HousePublishService { cpc_detail_coll.remove(new BasicDBObject("_id", delQuery)) } - // 更新 + // 鏇存柊 DBObject updQuery = new BasicDBObject() updQuery.put('_id', updateHcd._id) @@ -205,7 +205,7 @@ class HousePublishService { cpc_detail_coll.update(updQuery, new BasicDBObject('$set', updData)) } } else { - // 新增 + // 鏂板 DBObject saveHcd = new BasicDBObject(houseCpcDetail) saveHcd.put("relate_id", houseId) saveHcd.put("category", category) @@ -243,15 +243,15 @@ class HousePublishService { private def validateCommon(house, houseCpcDetail, city, errorContext){ validateCity(city, errorContext) //house - house.floor = checkIntField(house.floor, '楼层', errorContext, [canNull:true,minValue:0]) - house.height = checkIntField(house.height, '总楼层', errorContext, [canNull:true,minValue:(null==house.floor?1:house.floor)]) + house.floor = checkIntField(house.floor, '妤煎眰', errorContext, [canNull:true,minValue:0]) + house.height = checkIntField(house.height, '鎬绘ゼ灞�', errorContext, [canNull:true,minValue:(null==house.floor?1:house.floor)]) def estateType = normalizeEstateType(house.estate_type, house.height); if(null==estateType){ - errorContext.add("无效的类型[${house.estate_type}]") + errorContext.add("鏃犳晥鐨勭被鍨媅${house.estate_type}]") }else{ - house.estate_type = checkStringField(estateType, '类型', errorContext, [canNull:false,minSize:1,maxSize:50]) + house.estate_type = checkStringField(estateType, '绫诲瀷', errorContext, [canNull:false,minSize:1,maxSize:50]) } - house.area = checkDoubleField(house.area, '面积', errorContext, [canNull:false,minValue:1]) + house.area = checkDoubleField(house.area, '闈㈢Н', errorContext, [canNull:false,minValue:1]) if(house.direction && !DIRECTIONS.contains(house.direction)){ def dir = DIRECTIONS_ALIAS.get(house.direction) if(null==dir){ @@ -266,41 +266,41 @@ class HousePublishService { house.fitment = null==fitment ? house.fitment : fitment } //TODO: buildDate - house.room = checkIntField(house.room, '室数量', errorContext, [canNull:false,minValue:0]) - house.hall = checkIntField(house.hall, '厅数量', errorContext, [canNull:false,minValue:0]) - house.toilet = checkIntField(house.toilet, '厕数量', errorContext, [canNull:false,minValue:0]) - house.publisher_type = checkIntField(house.publisher_type, '发布者类型', errorContext, [canNull:false,minValue:0,maxValue:3]) - house.description = checkStringField(house.description?.trim(), '描述', errorContext, [canNull:true,minSize:0,maxSize:65535]) - house.name = checkStringField(house.name,'房源标题', errorContext, [canNull:false,minSize:1,maxSize:100]) + house.room = checkIntField(house.room, '瀹ゆ暟閲�', errorContext, [canNull:false,minValue:0]) + house.hall = checkIntField(house.hall, '鍘呮暟閲�', errorContext, [canNull:false,minValue:0]) + house.toilet = checkIntField(house.toilet, '鍘曟暟閲�', errorContext, [canNull:false,minValue:0]) + house.publisher_type = checkIntField(house.publisher_type, '鍙戝竷鑰呯被鍨�', errorContext, [canNull:false,minValue:0,maxValue:3]) + house.description = checkStringField(house.description?.trim(), '鎻忚堪', errorContext, [canNull:true,minSize:0,maxSize:65535]) + house.name = checkStringField(house.name,'鎴挎簮鏍囬', errorContext, [canNull:false,minSize:1,maxSize:100]) //house contact - house.contact_people = checkStringField(house.contact_people, '联系人', errorContext, [canNull:false,minSize:1,maxSize:100]) + house.contact_people = checkStringField(house.contact_people, '鑱旂郴浜�', errorContext, [canNull:false,minSize:1,maxSize:100]) def mobiles = PhoneNormalizer.normalize(CityMap.findCity(city), house.mobile) if(mobiles.size()>0){ house.mobile = mobiles.iterator().next() }else{ - errorContext.add("无效的联系人手机[${house.mobile}]") + errorContext.add("鏃犳晥鐨勮仈绯讳汉鎵嬫満[${house.mobile}]") } - house.company = checkStringField(house.company, '公司名', errorContext, [canNull:true,minSize:0,maxSize:255]) - house.shop = checkStringField(house.shop, '公司门店', errorContext, [canNull:true,minSize:0,maxSize:255]) - house.url = checkStringField(house.url, '抓取URL', errorContext, [canNull:false,minSize:1,maxSize:2048]) - house.district_name = checkStringField(house.district_name, '小区名', errorContext, [canNull:false,minSize:1,maxSize:255]) - house.address = checkStringField(house.address, '地址', errorContext, [canNull:true,minSize:0,maxSize:900]) - house.region = checkStringField(house.region, '区域', errorContext, [canNull:true,minSize:0,maxSize:20]) - house.block = checkStringField(house.block, '板块', errorContext, [canNull:true,minSize:0,maxSize:20]) - house.partner = checkStringField(house.partner, '合作公司代码', errorContext, [canNull:true,minSize:0,maxSize:50]) + house.company = checkStringField(house.company, '鍏徃鍚�', errorContext, [canNull:true,minSize:0,maxSize:255]) + house.shop = checkStringField(house.shop, '鍏徃闂ㄥ簵', errorContext, [canNull:true,minSize:0,maxSize:255]) + house.url = checkStringField(house.url, '鎶撳彇URL', errorContext, [canNull:false,minSize:1,maxSize:2048]) + house.district_name = checkStringField(house.district_name, '灏忓尯鍚�', errorContext, [canNull:false,minSize:1,maxSize:255]) + house.address = checkStringField(house.address, '鍦板潃', errorContext, [canNull:true,minSize:0,maxSize:900]) + house.region = checkStringField(house.region, '鍖哄煙', errorContext, [canNull:true,minSize:0,maxSize:20]) + house.block = checkStringField(house.block, '鏉垮潡', errorContext, [canNull:true,minSize:0,maxSize:20]) + house.partner = checkStringField(house.partner, '鍚堜綔鍏徃浠g爜', errorContext, [canNull:true,minSize:0,maxSize:50]) if(houseCpcDetail){ - houseCpcDetail.site_name = checkStringField(houseCpcDetail.site_name, 'CPC站点名', errorContext, [canNull:true,minSize:1,maxSize:100]) - houseCpcDetail.url = checkStringField(houseCpcDetail.url, 'CPC跳转URL', errorContext, [canNull:false,minSize:1,maxSize:2048]) + houseCpcDetail.site_name = checkStringField(houseCpcDetail.site_name, 'CPC绔欑偣鍚�', errorContext, [canNull:true,minSize:1,maxSize:100]) + houseCpcDetail.url = checkStringField(houseCpcDetail.url, 'CPC璺宠浆URL', errorContext, [canNull:false,minSize:1,maxSize:2048]) } - house.avatar = checkStringField(house.avatar, '用户头像图片原始路径', errorContext, [canNull:true,minSize:0,maxSize:1024]) + house.avatar = checkStringField(house.avatar, '鐢ㄦ埛澶村儚鍥剧墖鍘熷璺緞', errorContext, [canNull:true,minSize:0,maxSize:1024]) def floorplanPics = house.floorplan_pics if (null != floorplanPics) { floorplanPics.each{pic-> - pic = checkStringField(pic, '图片原始路径', errorContext, [canNull:true,minSize:0,maxSize:1024]) + pic = checkStringField(pic, '鍥剧墖鍘熷璺緞', errorContext, [canNull:true,minSize:0,maxSize:1024]) } } house.floorplan_pics = floorplanPics @@ -308,25 +308,25 @@ class HousePublishService { def pics = house.pics if (null != pics) { pics.each{pic-> - pic = checkStringField(pic, '图片原始路径', errorContext, [canNull:true,minSize:0,maxSize:1024]) + pic = checkStringField(pic, '鍥剧墖鍘熷璺緞', errorContext, [canNull:true,minSize:0,maxSize:1024]) } } house.pics = pics } private def validateHouse(house, city, errorContext){ - house.total_price = checkIntField(house.total_price, '售价', errorContext, [canNull:false,minValue:1]) + house.total_price = checkIntField(house.total_price, '鍞环', errorContext, [canNull:false,minValue:1]) } private def validateRentHouse(house, city, errorContext){ - house.total_price = checkIntField(house.total_price, '租金', errorContext, [canNull:false,minValue:1]) + house.total_price = checkIntField(house.total_price, '绉熼噾', errorContext, [canNull:false,minValue:1]) } private def checkIntField(field, fieldDescription, errorContext, spec=[defaultValue:null,canNull:false]){//, canNull=false, minValue, maxValue def ret = null field = field?.toString()?:null if(!spec.canNull && null==field){ - errorContext.add("${fieldDescription}不能为空") + errorContext.add("${fieldDescription}涓嶈兘涓虹┖") ret = null }else if(null==field){ ret = spec.defaultValue @@ -334,15 +334,15 @@ class HousePublishService { try{ ret = (int)(field.toDouble()) if(spec.minValue!=null && retspec.maxValue){ - errorContext.add("${fieldDescription}必须小于等于${spec.maxValue}") + errorContext.add("${fieldDescription}蹇呴』灏忎簬绛変簬${spec.maxValue}") ret = null } }catch(e){ - errorContext.add("${fieldDescription}[${field}]不是一个有效的整数") + errorContext.add("${fieldDescription}[${field}]涓嶆槸涓�涓湁鏁堢殑鏁存暟") ret = null } } @@ -353,7 +353,7 @@ class HousePublishService { def ret = null field = field?.toString()?:null if(!spec.canNull && null==field){ - errorContext.add("${fieldDescription}不能为空") + errorContext.add("${fieldDescription}涓嶈兘涓虹┖") ret = null }else if(null==field){ ret = spec.defaultValue @@ -361,15 +361,15 @@ class HousePublishService { try{ ret = field.toDouble() if(spec.minValue!=null && retspec.maxValue){ - errorContext.add("${fieldDescription}必须小于等于${spec.maxValue}") + errorContext.add("${fieldDescription}蹇呴』灏忎簬绛変簬${spec.maxValue}") ret = null } }catch(e){ - errorContext.add("${fieldDescription}[${field}]不是一个有效的Double") + errorContext.add("${fieldDescription}[${field}]涓嶆槸涓�涓湁鏁堢殑Double") ret = null } } @@ -379,18 +379,18 @@ class HousePublishService { private def checkStringField(field, fieldDescription, errorContext, spec=[defaultValue:null,canNull:false,minSize:-1,maxSize:-1]){//canNull=false, minSize=-1, maxSize=-1 if(!spec.canNull){ if(field==null){ - errorContext.add("${fieldDescription}不能为空") + errorContext.add("${fieldDescription}涓嶈兘涓虹┖") return null } }else if(field==null){ return spec.defaultValue } if(spec.minSize>=0 && field.size()=0 && field.size()>spec.maxSize){ - errorContext.add("${fieldDescription}必须小于等于${spec.maxSize}个字符") + errorContext.add("${fieldDescription}蹇呴』灏忎簬绛変簬${spec.maxSize}涓瓧绗�") return null } return null==field ? spec.defaultValue : field @@ -403,16 +403,16 @@ class HousePublishService { def ret = null if(!ESTATE_TYPES.contains(estateType)){ ret = ESTATE_TYPES_ALIAS.get(estateType) - if(null==ret && estateType.indexOf('别墅')>=0){ - ret = '独立别墅' + if(null==ret && estateType.indexOf('鍒')>=0){ + ret = '鐙珛鍒' } if(null==ret && null!=houseHeight){ if(houseHeight>=5 && houseHeight<=7){ - ret = '多层' + ret = '澶氬眰' }else if(houseHeight>=8 && houseHeight<=16){ - ret = '小高层' + ret = '灏忛珮灞�' }else if(houseHeight>=17){ - ret = '高层' + ret = '楂樺眰' } } if(null==ret){ @@ -432,10 +432,10 @@ class HousePublishService { } private def validateCity(city, errorContext){ - checkStringField(city,'城市', errorContext, [canNull:false,minSize:1,maxSize:100]) + checkStringField(city,'鍩庡競', errorContext, [canNull:false,minSize:1,maxSize:100]) def cityCode = CityMap.findCity(city) if(null == cityCode || "".equals(cityCode)){ - errorContext.add("无法识别的城市[${city}]") + errorContext.add("鏃犳硶璇嗗埆鐨勫煄甯俒${city}]") } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/centanet/sax/AgentHandler.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/centanet/sax/AgentHandler.groovy index 2e0262285..3f4efa2c5 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/centanet/sax/AgentHandler.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/centanet/sax/AgentHandler.groovy @@ -5,13 +5,13 @@ import org.xml.sax.Attributes import org.xml.sax.helpers.DefaultHandler; /** - *

解析中原经纪人XML文件

+ *

瑙f瀽涓師缁忕邯浜篨ML鏂囦欢

* - * 文件示例 + * 鏂囦欢绀轰緥 * - * - * - * + * + * + * * * * @author yukai diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/centanet/sax/HouseImportHandler.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/centanet/sax/HouseImportHandler.groovy index 3c3d2bae2..64bff7fed 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/centanet/sax/HouseImportHandler.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/centanet/sax/HouseImportHandler.groovy @@ -11,7 +11,7 @@ import org.xml.sax.Attributes; import org.xml.sax.helpers.DefaultHandler; /** -*

解析中原房源XML文件--导入

+*

瑙f瀽涓師鎴挎簮XML鏂囦欢--瀵煎叆

* * @author yukai * @@ -20,7 +20,7 @@ class HouseImportHandler extends DefaultHandler { def logger = new PrintLogger(this.getClass()) static final SimpleDateFormat DATE_PATTERN = new SimpleDateFormat("yyyy-MM-dd") - static final SimpleDateFormat DATE_PATTERN_CHS = new SimpleDateFormat("yyyy年MM月") + static final SimpleDateFormat DATE_PATTERN_CHS = new SimpleDateFormat("yyyy骞碝M鏈�") static final def PIC_TYPE_MAP = ['EXTERIOR':'1', 'WINDOWVIEW':'3', @@ -35,36 +35,36 @@ class HouseImportHandler extends DefaultHandler { HousePublishService housePublishService = new HousePublishService() - // 当前房屋序号,从0开始 + // 褰撳墠鎴垮眿搴忓彿锛屼粠0寮�濮� private def currentIndex = 0 - // 当前房屋 + // 褰撳墠鎴垮眿 private def currentHouse - // 当前house_cpc_detail + // 褰撳墠house_cpc_detail private def currentHouseCpcDetail - // 当前文本信息,节点首尾间的文本,如精装中的“精装” + // 褰撳墠鏂囨湰淇℃伅锛岃妭鐐归灏鹃棿鐨勬枃鏈紝濡�绮捐涓殑鈥滅簿瑁呪�� private def currentMessage - // 当前房源的一些原始信息 + // 褰撳墠鎴挎簮鐨勪竴浜涘師濮嬩俊鎭� private def currentHouseOrgInfo - // 当前图片列表 + // 褰撳墠鍥剧墖鍒楄〃 private def floorplanPics private def pics - // 经纪人map,实例化类时赋值 + // 缁忕邯浜簃ap锛屽疄渚嬪寲绫绘椂璧嬪�� def agentMap - // 区域map,实例化类时赋值 + // 鍖哄煙map锛屽疄渚嬪寲绫绘椂璧嬪�� def regionMap - // 得分计算器,实例化时赋值 + // 寰楀垎璁$畻鍣紝瀹炰緥鍖栨椂璧嬪�� def scoreCalculator void startElement(String ns, String localName, String qName, Attributes atts) { - // 按节点处理 + // 鎸夎妭鐐瑰鐞� switch (qName) { case 'property': processPropertyStart(atts) @@ -151,12 +151,12 @@ class HouseImportHandler extends DefaultHandler { } /** - * 一个新的房源信息开始 + * 涓�涓柊鐨勬埧婧愪俊鎭紑濮� */ def processPropertyStart(Attributes atts) { def id = atts.getValue('id')?.trim() if (!id) { - logInfo "${currentIndex}\t" + [code:'401', message:'id不能为空'] + logInfo "${currentIndex}\t" + [code:'401', message:'id涓嶈兘涓虹┖'] initCurrentData() return } @@ -203,11 +203,11 @@ class HouseImportHandler extends DefaultHandler { if (!currentHouse) return - // 所在城市 + // 鎵�鍦ㄥ煄甯� def city = atts.getValue('city')?.trim() def cityCode = CityMap.findCity(city) if (null == cityCode || "".equals(cityCode)) { - logInfo "${currentIndex}\t" + [code:'401', message:"不支持的城市[${city}]".toString()] + logInfo "${currentIndex}\t" + [code:'401', message:"涓嶆敮鎸佺殑鍩庡競[${city}]".toString()] initCurrentData() return } @@ -270,7 +270,7 @@ class HouseImportHandler extends DefaultHandler { if (agent) { currentHouse.contact_people = agent.name?.trim() currentHouse.mobile = agent.mobile?.trim() - currentHouse.company = '中原地产' + currentHouse.company = '涓師鍦颁骇' currentHouse.shop = agent.branch?.trim() currentHouse.avatar = agent.photoUrl?.trim() } else { @@ -292,14 +292,14 @@ class HouseImportHandler extends DefaultHandler { } /** - * 当前房源信息结束 + * 褰撳墠鎴挎簮淇℃伅缁撴潫 */ def processPropertyEnd() { - // 继续处理房源信息(类型) + // 缁х画澶勭悊鎴挎簮淇℃伅锛堢被鍨嬶級 if (currentHouse && currentHouseOrgInfo) processHouseType() - // 序号自增,各数据置null + // 搴忓彿鑷锛屽悇鏁版嵁缃畁ull currentIndex++ initCurrentData() } @@ -358,7 +358,7 @@ class HouseImportHandler extends DefaultHandler { } def processHouseType() { - //房源类型 + //鎴挎簮绫诲瀷 def sourceType = currentHouseOrgInfo.sourceType def score = Double.parseDouble(currentHouseOrgInfo.score) def cityCode = currentHouseOrgInfo.cityCode @@ -372,7 +372,7 @@ class HouseImportHandler extends DefaultHandler { currentHouseCpcDetail.city = city if ('Sale' == sourceType) { //S - if ('深圳' == city) { //特殊处理中原的深圳数据 + if ('娣卞湷' == city) { //鐗规畩澶勭悊涓師鐨勬繁鍦虫暟鎹� currentHouseCpcDetail.url = "http://${cityCode}.centanet.com/Prop/S_${district}_${refNo}.aspx".toString() } else { currentHouseCpcDetail.url = "http://${cityCode}.centanet.com/findproperty/property/S/${district}/${district}/${refNo}.aspx".toString() @@ -382,7 +382,7 @@ class HouseImportHandler extends DefaultHandler { publishHouse() } else if ('Lease' == sourceType) { //R - if ('深圳' == city) { //特殊处理中原的深圳数据 + if ('娣卞湷' == city) { //鐗规畩澶勭悊涓師鐨勬繁鍦虫暟鎹� currentHouseCpcDetail.url = "http://${cityCode}.centanet.com/Prop/R_${district}_${refNo}.aspx".toString() } else { currentHouseCpcDetail.url = "http://${cityCode}.centanet.com/findproperty/property/R/${district}/${district}/${refNo}.aspx".toString() @@ -392,7 +392,7 @@ class HouseImportHandler extends DefaultHandler { publishHouse() } else if ('Both' == sourceType) { //B - if ('深圳' == city) { //特殊处理中原的深圳数据 (Both == Sale) + if ('娣卞湷' == city) { //鐗规畩澶勭悊涓師鐨勬繁鍦虫暟鎹� (Both == Sale) currentHouseCpcDetail.url = "http://${cityCode}.centanet.com/Prop/S_${district}_${refNo}.aspx".toString() } else { currentHouseCpcDetail.url = "http://${cityCode}.centanet.com/findproperty/property/S/${district}/${district}/${refNo}.aspx".toString() @@ -404,12 +404,12 @@ class HouseImportHandler extends DefaultHandler { fillAsRentHouse(currentHouseCpcDetail.url) publishHouse() } else { - logInfo "${currentIndex}\t" + [code:'401',message:"不支持的房源类型[${sourceType}]".toString()] + logInfo "${currentIndex}\t" + [code:'401',message:"涓嶆敮鎸佺殑鎴挎簮绫诲瀷[${sourceType}]".toString()] } } def publishHouse(update=false) { - def ret = [code:'501',message:'未知错误'] + def ret = [code:'501',message:'鏈煡閿欒'] def ret1, ret2 def cat = currentHouse.cat def city = currentHouse.city diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/centanet/sax/RegionHandler.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/centanet/sax/RegionHandler.groovy index 01d28e663..e9a241698 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/centanet/sax/RegionHandler.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/centanet/sax/RegionHandler.groovy @@ -5,13 +5,13 @@ import org.xml.sax.Attributes; import org.xml.sax.helpers.DefaultHandler; /** - *

解析中原区域XML文件

+ *

瑙f瀽涓師鍖哄煙XML鏂囦欢

* - * 文件示例 + * 鏂囦欢绀轰緥 * - * 北辰区 - * 不限 - * 大港区 + * 鍖楄景鍖� + * 涓嶉檺 + * 澶ф腐鍖� * * * @author yukai diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/centanet/sax/ScoreHandler.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/centanet/sax/ScoreHandler.groovy index 3e72ae842..75240302a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/centanet/sax/ScoreHandler.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/centanet/sax/ScoreHandler.groovy @@ -5,7 +5,7 @@ import org.xml.sax.Attributes; import org.xml.sax.helpers.DefaultHandler; /** - * 解析中原房源XML文件中的房源得分情况,解析结果为houseScoreList和rentHouseScoreList + * 瑙f瀽涓師鎴挎簮XML鏂囦欢涓殑鎴挎簮寰楀垎鎯呭喌锛岃В鏋愮粨鏋滀负houseScoreList鍜宺entHouseScoreList * @author yukai * */ @@ -18,7 +18,7 @@ class ScoreHandler extends DefaultHandler { private def currentData void startElement(String ns, String localName, String qName, Attributes atts) { - // 按节点处理 + // 鎸夎妭鐐瑰鐞� switch (qName) { case 'property': processPropertyStart(atts) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/BlankEvaluationBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/BlankEvaluationBatch.groovy index 06213a708..503a921e0 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/BlankEvaluationBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/BlankEvaluationBatch.groovy @@ -17,7 +17,7 @@ import groovy.sql.Sql import org.apache.lucene.queryparser.classic.QueryParser /** - * 重庆估值测试--2小时 + * 閲嶅簡浼板�兼祴璇�--2灏忔椂 */ class EvaluationBatch { @@ -37,7 +37,7 @@ class EvaluationBatch { def startDate = DateUtils.parseFromTightYYYYMMDD("2021-01-01") def endDate = DateUtils.parseFromTightYYYYMMDD("2022-04-07") def weekends = DateUtils.getWeekendBetweenDates(startDate, endDate) - ExcelUtils.modify("D:\\数据\\重庆农商行\\2022-04-02\\重庆房屋交易信息V1.xlsx", { row -> + ExcelUtils.modify("D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\2022-04-02\\閲嶅簡鎴垮眿浜ゆ槗淇℃伅V1.xlsx", { row -> if(row['N'] && row['N'].toString().toDouble()>=20){ println row['F'] +" "+row['N'] def dist = CommonDatautils.findDistrictById(row['C']) @@ -50,8 +50,8 @@ class EvaluationBatch { } def run1(){ - def city = "重庆" - ExcelUtils.multiThreadingModify("D:\\数据\\重庆农商行\\2022-04-02\\重庆房屋交易信息V2.xlsx", { row -> + def city = "閲嶅簡" + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\2022-04-02\\閲嶅簡鎴垮眿浜ゆ槗淇℃伅V2.xlsx", { row -> def region = row['E'] def name = row['F'] def id = row['C'] @@ -112,8 +112,8 @@ class EvaluationBatch { def run(){ - def city = "重庆" - ExcelUtils.multiThreadingModify("D:\\数据\\重庆农商行\\2022-04-02\\重庆估值交易信息V2.xlsx", { row -> + def city = "閲嶅簡" + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\2022-04-02\\閲嶅簡浼板�间氦鏄撲俊鎭疺2.xlsx", { row -> def region = row['E'] def name = row['F'] def id = row['C'] @@ -159,8 +159,8 @@ class EvaluationBatch { def q = new BasicDBObject() q.put("city", dist.city) q.put("region", dist.region) - // q.put("source", "链家在线") - q.put("source", new BasicDBObject('$in', ["链家在线","贝壳找房"])) + // q.put("source", "閾惧鍦ㄧ嚎") + q.put("source", new BasicDBObject('$in', ["閾惧鍦ㄧ嚎","璐濆3鎵炬埧"])) def alias = [] if(dist.alias){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/BlankMatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/BlankMatch.groovy index 77b853dad..f3ef626d3 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/BlankMatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/BlankMatch.groovy @@ -16,11 +16,11 @@ class BlankMatch { def run() { //rMap = SeaweedDataMatchProcess.doMatch(city, region, d['G'], null); - //def path = "D:\\数据\\重庆农商行\\2022-04-02\\重庆样本匹配结果V3.xlsx"; - def path = "D:\\数据\\重庆农商行\\2022-04-02\\测试.xlsx" + //def path = "D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\2022-04-02\\閲嶅簡鏍锋湰鍖归厤缁撴灉V3.xlsx"; + def path = "D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\2022-04-02\\娴嬭瘯.xlsx" ExcelUtils.multiThreadingModify(path, { row -> if(!row['C']){ - def jsonObject = OpenApiClient.addressMatch("重庆", row['B'], "property", false, null, null) + def jsonObject = OpenApiClient.addressMatch("閲嶅簡", row['B'], "property", false, null, null) if(jsonObject != null && jsonObject.precise!=-1) { row['C'] = jsonObject.get("id") row['D'] = jsonObject.get("city") @@ -34,9 +34,9 @@ class BlankMatch { def run1() { //rMap = SeaweedDataMatchProcess.doMatch(city, region, d['G'], null); - ExcelUtils.multiThreadingModify("D:\\数据\\重庆农商行\\2022-04-02\\重庆样本匹配不上(合并).xlsx", { row -> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\2022-04-02\\閲嶅簡鏍锋湰鍖归厤涓嶄笂锛堝悎骞讹級.xlsx", { row -> if(row['F']){ - def jsonObject = OpenApiClient.addressMatch("重庆", row['F'], "property", false, row['E'], null) + def jsonObject = OpenApiClient.addressMatch("閲嶅簡", row['F'], "property", false, row['E'], null) if(jsonObject != null && jsonObject.precise!=-1) { row['C'] = jsonObject.get("id") row['D'] = jsonObject.get("city") @@ -44,7 +44,7 @@ class BlankMatch { } } -// def jsonObject = OpenApiClient.addressMatch("重庆", row['B'], "property", false, null, null) +// def jsonObject = OpenApiClient.addressMatch("閲嶅簡", row['B'], "property", false, null, null) // if(jsonObject != null && jsonObject.precise!=-1) { // row['C'] = jsonObject.get("id") // row['D'] = jsonObject.get("city") @@ -56,9 +56,9 @@ class BlankMatch { } def run3(){ - ExcelUtils.multiThreadingModify("D:\\数据\\重庆农商行\\2022-04-02\\重庆样本匹配结果V3.xlsx", { row -> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\2022-04-02\\閲嶅簡鏍锋湰鍖归厤缁撴灉V3.xlsx", { row -> if(!row['C']){ - def dist = CommonDatautils.findDistrict("重庆", row['E'], row['F'], "district") + def dist = CommonDatautils.findDistrict("閲嶅簡", row['E'], row['F'], "district") if(dist){ row['C'] = dist._id.toString() } @@ -66,8 +66,8 @@ class BlankMatch { },0) } def run2(){ - def datas = ExcelUtils.read("D:\\数据\\重庆农商行\\2022-04-02\\重庆样本匹配不上(合并).xlsx",0,1) - ExcelUtils.multiThreadingModify("D:\\数据\\重庆农商行\\2022-04-02\\重庆样本匹配结果V3.xlsx", { row -> + def datas = ExcelUtils.read("D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\2022-04-02\\閲嶅簡鏍锋湰鍖归厤涓嶄笂锛堝悎骞讹級.xlsx",0,1) + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\2022-04-02\\閲嶅簡鏍锋湰鍖归厤缁撴灉V3.xlsx", { row -> if(!row['C']){ for(def d : datas){ if(d['B'] == row['B']){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/CzMatchDistrict.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/CzMatchDistrict.groovy index 399a4615f..86c85a514 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/CzMatchDistrict.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/CzMatchDistrict.groovy @@ -11,8 +11,8 @@ class CzMatchDistrict { } def run(){ -// match("C:\\Users\\gaojuan\\Desktop\\有样本小区 .xlsx") - addFlag("C:\\Users\\gaojuan\\Desktop\\有样本小区 .xlsx") +// match("C:\\Users\\gaojuan\\Desktop\\鏈夋牱鏈皬鍖� .xlsx") + addFlag("C:\\Users\\gaojuan\\Desktop\\鏈夋牱鏈皬鍖� .xlsx") } def addFlag(path){ @@ -22,13 +22,13 @@ class CzMatchDistrict { // def newValue = row['C'].replace("(","").replace(")","") // row['J'] = newValue // if(newValue == row['H'] && row['B'] == row['G']){ -// row['K'] = "加别名1" +// row['K'] = "鍔犲埆鍚�1" // } // } - if (!row['K'] && row['C'].toString().endsWith("花园") && row['H']) { - def newValue = row['C'].replace("花园", "") + if (!row['K'] && row['C'].toString().endsWith("鑺卞洯") && row['H']) { + def newValue = row['C'].replace("鑺卞洯", "") if (newValue && newValue == row['H']) { - row['K'] = "加别名3" + row['K'] = "鍔犲埆鍚�3" } } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/Des3.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/Des3.groovy index 012ddd921..ea81b21cb 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/Des3.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/Des3.groovy @@ -19,25 +19,25 @@ class Des3 { try { String key = "111036369260679051122113"; String iv = "23235645";//IV length must be 8 bytes long - //加密 + //鍔犲瘑 String encryptStr = "Lk+AtbEWoNF0eQNrSsGoNJjRFuvnCaRKaypcAnaRvGpHtc2KmMOMbufut+JDWP5Rq/4qNAWsEch0iZgE5z2CTnAwCjoRTUl0"//encode("test", key, iv); - System.out.println("密文: " + encryptStr); - //解密 + System.out.println("瀵嗘枃: " + encryptStr); + //瑙e瘑 String decryptStr = decode(encryptStr, key, iv); - System.out.println("明文: " + decryptStr); + System.out.println("鏄庢枃: " + decryptStr); } catch (Exception e) { e.printStackTrace(); } } /** - * 方法描述:3DES加密 + * 鏂规硶鎻忚堪锛�3DES鍔犲瘑 * @author hyang * - * @param plainText 明文 - * @param secretKey 密钥 - * @param iv 加密向量 - * @return String 密文 + * @param plainText 鏄庢枃 + * @param secretKey 瀵嗛挜 + * @param iv 鍔犲瘑鍚戦噺 + * @return String 瀵嗘枃 * @throws Exception */ public static String encode(String plainText, String secretKey, String iv) @@ -54,13 +54,13 @@ class Des3 { } /** - * 方法描述: 3DES解密 + * 鏂规硶鎻忚堪锛� 3DES瑙e瘑 * @author hyang * - * @param encryptText 密文 - * @param secretKey 密钥 - * @param iv 加密向量 - * @return String 明文 + * @param encryptText 瀵嗘枃 + * @param secretKey 瀵嗛挜 + * @param iv 鍔犲瘑鍚戦噺 + * @return String 鏄庢枃 * @throws Exception */ public static String decode(String encryptText, String secretKey, String iv) @@ -72,7 +72,7 @@ class Des3 { DESedeKeySpec spec = new DESedeKeySpec(secretKey.getBytes()); SecretKeyFactory keyfactory = SecretKeyFactory.getInstance("desede"); deskey = keyfactory.generateSecret(spec); - Cipher cipher = Cipher.getInstance("desede/CBC/NoPadding"); //desede/CBC/NoPadding 无填充 desede/CBC/PKCS5Padding 加密需要填充,解密一般加不加都结果一致 + Cipher cipher = Cipher.getInstance("desede/CBC/NoPadding"); //desede/CBC/NoPadding 鏃犲~鍏� desede/CBC/PKCS5Padding 鍔犲瘑闇�瑕佸~鍏咃紝瑙e瘑涓�鑸姞涓嶅姞閮界粨鏋滀竴鑷� IvParameterSpec ips = new IvParameterSpec(iv.getBytes()); cipher.init(Cipher.DECRYPT_MODE, deskey, ips); byte[] decryptData = cipher.doFinal(Base64.decode(encryptText)); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/Des3Test.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/Des3Test.groovy index a9a798124..84da90a0a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/Des3Test.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/Des3Test.groovy @@ -7,21 +7,21 @@ import javax.crypto.SecretKey import javax.crypto.spec.SecretKeySpec class Des3Test { - //定义加密算法,有DES、DESede(即3DES)、Blowfish + //瀹氫箟鍔犲瘑绠楁硶锛屾湁DES銆丏ESede(鍗�3DES)銆丅lowfish private static final String Algorithm = "DESede"; private static final String PASSWORD_CRYPT_KEY = "111036369260679051122113"; /** - * 加密方法 - * @param src 源数据的字节数组 + * 鍔犲瘑鏂规硶 + * @param src 婧愭暟鎹殑瀛楄妭鏁扮粍 * @return */ public static byte[] encryptMode(byte[] src) { try { - SecretKey deskey = new SecretKeySpec(build3DesKey(PASSWORD_CRYPT_KEY), Algorithm); //生成密钥 - Cipher c1 = Cipher.getInstance(Algorithm); //实例化负责加密/解密的Cipher工具类 - c1.init(Cipher.ENCRYPT_MODE, deskey); //初始化为加密模式 + SecretKey deskey = new SecretKeySpec(build3DesKey(PASSWORD_CRYPT_KEY), Algorithm); //鐢熸垚瀵嗛挜 + Cipher c1 = Cipher.getInstance(Algorithm); //瀹炰緥鍖栬礋璐e姞瀵�/瑙e瘑鐨凜ipher宸ュ叿绫� + c1.init(Cipher.ENCRYPT_MODE, deskey); //鍒濆鍖栦负鍔犲瘑妯″紡 return c1.doFinal(src); } catch (java.security.NoSuchAlgorithmException e1) { e1.printStackTrace(); @@ -35,15 +35,15 @@ class Des3Test { /** - * 解密函数 - * @param src 密文的字节数组 + * 瑙e瘑鍑芥暟 + * @param src 瀵嗘枃鐨勫瓧鑺傛暟缁� * @return */ public static byte[] decryptMode(byte[] src) { try { SecretKey deskey = new SecretKeySpec(build3DesKey(PASSWORD_CRYPT_KEY), Algorithm); Cipher c1 = Cipher.getInstance(Algorithm); - c1.init(Cipher.DECRYPT_MODE, deskey); //初始化为解密模式 + c1.init(Cipher.DECRYPT_MODE, deskey); //鍒濆鍖栦负瑙e瘑妯″紡 return c1.doFinal(src); } catch (java.security.NoSuchAlgorithmException e1) { e1.printStackTrace(); @@ -57,24 +57,24 @@ class Des3Test { /* - * 根据字符串生成密钥字节数组 - * @param keyStr 密钥字符串 + * 鏍规嵁瀛楃涓茬敓鎴愬瘑閽ュ瓧鑺傛暟缁� + * @param keyStr 瀵嗛挜瀛楃涓� * @return * @throws UnsupportedEncodingException */ public static byte[] build3DesKey(String keyStr) throws UnsupportedEncodingException{ - byte[] key = new byte[24]; //声明一个24位的字节数组,默认里面都是0 - byte[] temp = keyStr.getBytes("UTF-8"); //将字符串转成字节数组 + byte[] key = new byte[24]; //澹版槑涓�涓�24浣嶇殑瀛楄妭鏁扮粍锛岄粯璁ら噷闈㈤兘鏄�0 + byte[] temp = keyStr.getBytes("UTF-8"); //灏嗗瓧绗︿覆杞垚瀛楄妭鏁扮粍 /* - * 执行数组拷贝 - * System.arraycopy(源数组,从源数组哪里开始拷贝,目标数组,拷贝多少位) + * 鎵ц鏁扮粍鎷疯礉 + * System.arraycopy(婧愭暟缁勶紝浠庢簮鏁扮粍鍝噷寮�濮嬫嫹璐濓紝鐩爣鏁扮粍锛屾嫹璐濆灏戜綅) */ if(key.length > temp.length){ - //如果temp不够24位,则拷贝temp数组整个长度的内容到key数组中 + //濡傛灉temp涓嶅24浣嶏紝鍒欐嫹璐漷emp鏁扮粍鏁翠釜闀垮害鐨勫唴瀹瑰埌key鏁扮粍涓� System.arraycopy(temp, 0, key, 0, temp.length); }else{ - //如果temp大于24位,则拷贝temp数组24个长度的内容到key数组中 + //濡傛灉temp澶т簬24浣嶏紝鍒欐嫹璐漷emp鏁扮粍24涓暱搴︾殑鍐呭鍒発ey鏁扮粍涓� System.arraycopy(temp, 0, key, 0, key.length); } return key; @@ -84,17 +84,17 @@ class Des3Test { * @param args */ public static void main(String[] args) { - String msg = "3DES加密解密案例"; - System.out.println("【加密前】:" + msg); + String msg = "3DES鍔犲瘑瑙e瘑妗堜緥"; + System.out.println("銆愬姞瀵嗗墠銆戯細" + msg); - //加密 + //鍔犲瘑 // byte[] secretArr = Des3Test.encryptMode(msg.getBytes()); -// System.out.println("【加密后】:" + new String(secretArr)); +// System.out.println("銆愬姞瀵嗗悗銆戯細" + new String(secretArr)); String s = "Lk+AtbEWoNF0eQNrSsGoNJjRFuvnCaRKaypcAnaRvGpHtc2KmMOMbufut+JDWP5Rq/4qNAWsEch0iZgE5z2CTnAwCjoRTUl0" - //解密 + //瑙e瘑 byte[] myMsgArr = Des3Test.decryptMode(s.getBytes("UTF-8")); - System.out.println("【解密后】:" + new String(myMsgArr)); + System.out.println("銆愯В瀵嗗悗銆戯細" + new String(myMsgArr)); } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/FieldAddValue.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/FieldAddValue.groovy index 01ca3f3be..41f64c373 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/FieldAddValue.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/FieldAddValue.groovy @@ -15,7 +15,7 @@ class FieldAddValue { def run(){ //16991 14360 - def districts = CommonDatautils.findAllDistrictByCity("重庆", "district", ["region","name","alias","is_elevator"]) + def districts = CommonDatautils.findAllDistrictByCity("閲嶅簡", "district", ["region","name","alias","is_elevator"]) def index = 0 def updateIndex = 0 for(def d : districts){ @@ -27,7 +27,7 @@ class FieldAddValue { alias = [] } alias << d.name - def maxHeight = findHouseHeight("重庆", d.region, alias, 20220101) + def maxHeight = findHouseHeight("閲嶅簡", d.region, alias, 20220101) if(maxHeight && maxHeight>6){ updateIndex++ def udata = new BasicDBObject() 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 7f992095b..ef63d0167 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 @@ -28,7 +28,7 @@ class FumingTest { } def run() { - def path = "D:\\数据\\富民\\富民测试500-v7.xlsx" + def path = "D:\\鏁版嵁\\瀵屾皯\\瀵屾皯娴嬭瘯500-v7.xlsx" // match(path) // addPrice(path) addThirdPrice(path) @@ -52,14 +52,14 @@ class FumingTest { /** - * 一公里小区数量 + * 涓�鍏噷灏忓尯鏁伴噺 */ def getNearByDistrictLevel(def id, def price){ BasicDBObject district = DbUtils.seaweed.findById(id); def level = null if(district){ List list = DbUtils.findAroundDistrict(district); - println id +" 共:"+list.size()+" "+ price + println id +" 鍏憋細"+list.size()+" "+ price if(list!=null&&list.size()>0){ for(def obj : list){ def summary = findCommunitySummary(obj._id.toString()) @@ -142,7 +142,7 @@ class FumingTest { def addThirdPrice(path){ -// def citys = ['昆明','廊坊','东莞','西安','南宁','成都','佛山','广州','重庆','珠海','长沙','中山','张家口','武汉','苏州','南通','贵阳','天津','大连'] +// def citys = ['鏄嗘槑','寤婂潑','涓滆帪','瑗垮畨','鍗楀畞','鎴愰兘','浣涘北','骞垮窞','閲嶅簡','鐝犳捣','闀挎矙','涓北','寮犲鍙�','姝︽眽','鑻忓窞','鍗楅��','璐甸槼','澶╂触','澶ц繛'] def allMap = [:] // for(def c : citys){ // def cityMap = findThirdPartyPrice(c) @@ -179,7 +179,7 @@ class FumingTest { def addCcbPrice2(){ def cityCodeMap = CcbCommonUtils.findCityCodeValue() - ExcelUtils.multiThreadingModify("D:\\数据\\建行\\房产估值\\指导价\\深圳政府指导价_补充.xlsx", { d -> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鎸囧浠穃\娣卞湷鏀垮簻鎸囧浠穇琛ュ厖.xlsx", { d -> if(d['C']){ def map = findAvgPrice(d['C'], cityCodeMap.get(d['E'])) if(map){ @@ -239,11 +239,11 @@ class FumingTest { map.month = r.gujiabds_clc_yrmo_val map.credit_value = r.gujia_bds_cfdc_dgr if(r.gujia_bds_clmtd == 1){ - map.calc_type = "人工估值" + map.calc_type = "浜哄伐浼板��" }else if(r.gujia_bds_clmtd == 2){ - map.calc_type = "样本计算" + map.calc_type = "鏍锋湰璁$畻" }else if(r.gujia_bds_clmtd == 3){ - map.calc_type = "神经网络" + map.calc_type = "绁炵粡缃戠粶" } }) return map diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/GZIPUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/GZIPUtils.groovy index 7cada0b13..81ac2c23d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/GZIPUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/GZIPUtils.groovy @@ -133,7 +133,7 @@ public class GZIPUtils { } /** - * 字符串转化成为16进制字符串 + * 瀛楃涓茶浆鍖栨垚涓�16杩涘埗瀛楃涓� * @param s * @return */ @@ -152,13 +152,13 @@ public class GZIPUtils { String s = "123"; println "result: "+strTo16(s) - System.out.println("字符串长度:"+s.length()); + System.out.println("瀛楃涓查暱搴︼細"+s.length()); println compress(s) - System.out.println("解压后:"+uncompress(compress(s)).length); + System.out.println("瑙e帇鍚庯細"+uncompress(compress(s)).length); - System.out.println("解压字符串后::"+uncompressToString(compress(s)).length()); + System.out.println("瑙e帇瀛楃涓插悗锛氾細"+uncompressToString(compress(s)).length()); } 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 55cf2b8dd..130e977d0 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 @@ -28,13 +28,13 @@ import java.util.regex.Pattern class HailanTest { - static def DIRECTIONS = ["东北", "西北", "东南", "西南", "南北", "东西", "东", "南", "西", "北"] + 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("豪装", ["豪华装修", "高档", "豪华", "豪装", "高级装修", "高装", "奢侈"]) + FITMENTS_TYPES_MAPS.put("姣涘澂", ["姣涘澂", "娓呮按", "鏃犺淇�", "鐙爧姣涘澂", "姣涜儦", "鐧藉澂", "鏃ц", "鍧�", "鍘熸埧", "姣涘潖"]) + FITMENTS_TYPES_MAPS.put("绠�瑁�", ["绠�瑁�", "鏅�氳淇�", "鏅��", "绠�鍗曡淇�", "绠�鏄撹淇�", "鏅", "涓�鑸淇�", "涓�鑸�", "绠�", "绮楄淇�"]) + FITMENTS_TYPES_MAPS.put("绮捐", ["绮捐", "鍏ㄨ淇�", "鍏ㄨ", "涓瓑瑁呬慨", "涓", "涓。瑁呬慨", "绮捐嚧瑁呬慨", "涓。", "涓瓑", "绮�", "涓慨", "浼樿川瑁呬慨", "鏃跺皻瑁呬慨", "鑹", "涓珮鎸�"]) + FITMENTS_TYPES_MAPS.put("璞", ["璞崕瑁呬慨", "楂樻。", "璞崕", "璞", "楂樼骇瑁呬慨", "楂樿", "濂緢"]) } static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(80) @@ -48,13 +48,13 @@ class HailanTest { } def run(){ - def inputfile = "D:\\数据\\微元素\\排查表-价格对比-新.xlsx" + def inputfile = "D:\\鏁版嵁\\寰厓绱燶\鎺掓煡琛�-浠锋牸瀵规瘮-鏂�.xlsx" // addThirdPrice(inputfile) // match(inputfile) // tradeAvgPrice(inputfile) // caluateTotalPrice(inputfile) // addPrice(inputfile) -// addCommId("D:\\数据\\海南\\匹配上的合并数据.xlsx") +// addCommId("D:\\鏁版嵁\\娴峰崡\\鍖归厤涓婄殑鍚堝苟鏁版嵁.xlsx") // addHouse(inputfile) // stat(inputfile) // hailanStat(inputfile) @@ -65,8 +65,8 @@ class HailanTest { def addHouse(inputfile){ def datas = [] - datas << ["类型(住宅/别墅)","行政区划","详细地址","房号","小区名称","建筑面积","所在楼层","详细地址","小区名","交易日居住用房价格指数","评估日居住用房价格指数","是否有电梯","所在楼层","总楼层","内部装修","平面布置","朝向", - "景观","建筑结构","建筑面积(平方米)","房屋可使用年限","房屋已使用年限","评估价(单价)","挂牌价(单价)","成交价(单价)","小区/楼盘均价(单价)"] + datas << ["绫诲瀷(浣忓畢/鍒锛�","琛屾斂鍖哄垝","璇︾粏鍦板潃","鎴垮彿","灏忓尯鍚嶇О","寤虹瓚闈㈢Н","鎵�鍦ㄦゼ灞�","璇︾粏鍦板潃","灏忓尯鍚�","浜ゆ槗鏃ュ眳浣忕敤鎴夸环鏍兼寚鏁�","璇勪及鏃ュ眳浣忕敤鎴夸环鏍兼寚鏁�","鏄惁鏈夌數姊�","鎵�鍦ㄦゼ灞�","鎬绘ゼ灞�","鍐呴儴瑁呬慨","骞抽潰甯冪疆","鏈濆悜", + "鏅","寤虹瓚缁撴瀯","寤虹瓚闈㈢Н锛堝钩鏂圭背锛�","鎴垮眿鍙娇鐢ㄥ勾闄�","鎴垮眿宸蹭娇鐢ㄥ勾闄�","璇勪及浠凤紙鍗曚环锛�","鎸傜墝浠凤紙鍗曚环锛�","鎴愪氦浠凤紙鍗曚环锛�","灏忓尯/妤肩洏鍧囦环锛堝崟浠凤級"] def index = 0 ExcelUtils.multiThreadingModify(inputfile, { row -> if(row['L']){ @@ -84,7 +84,7 @@ class HailanTest { continue; } } - if(row['A'] && row['A']=="别墅"){ + if(row['A'] && row['A']=="鍒"){ def inputAare = row['F'].toString().toDouble() def minArea = inputAare + 50 def maxArea = inputAare + 100 @@ -124,9 +124,9 @@ class HailanTest { data << "" if(lr.height){ if(lr.height>6){ - data << "是" + data << "鏄�" }else{ - data << "否" + data << "鍚�" } }else{ data << "" @@ -142,15 +142,15 @@ class HailanTest { data << dist.property_life // def year = dist.create_year // if(year){ -// data << getHouseYear(year.toInteger())//已使用年限 +// data << getHouseYear(year.toInteger())//宸蹭娇鐢ㄥ勾闄� // }else{ -// data << ""//已使用年限 +// data << ""//宸蹭娇鐢ㄥ勾闄� // } data << getHouseYear(dist.create_year , lr.build_date, dist.build_date) - data << getEvalutaionPrice(lr, dist)//评估价(单价) + data << getEvalutaionPrice(lr, dist)//璇勪及浠凤紙鍗曚环锛� data << lr.avg_price - data << getDealPrice(dist)//成交单价 + data << getDealPrice(dist)//鎴愪氦鍗曚环 data << row['M'] datas << data } @@ -158,7 +158,7 @@ class HailanTest { } } }) - ExcelUtils.write("D:\\数据\\海南\\海南样本数据.xlsx", datas, "样本数据") + ExcelUtils.write("D:\\鏁版嵁\\娴峰崡\\娴峰崡鏍锋湰鏁版嵁.xlsx", datas, "鏍锋湰鏁版嵁") } def getDealPrice(dist){ @@ -220,7 +220,7 @@ class HailanTest { params.put("size", String.valueOf(house.area)); if(house.height) { params.put("maxFloor", dist.house_height.toString()); - params.put("direction", getDirectionCode(house.direction).toString());//朝向 + params.put("direction", getDirectionCode(house.direction).toString());//鏈濆悜 if (house.house_floor) { params.put("floor", house.house_floor.toString()); } @@ -228,7 +228,7 @@ class HailanTest { def fitmentCode = null if(house.fitment){ fitmentCode = getFitmentCode(house.fitment) - params.put("decoration", fitmentCode.toString());//装修 + params.put("decoration", fitmentCode.toString());//瑁呬慨 } params.put("scope", "1") def result = OpenApiClient.evaluateDistrictPrice(params); @@ -241,18 +241,18 @@ class HailanTest { def getDirectionCode(def s){ - def directMap = ["西南":1, "东南":2, "南":3, "西北":4, "东北":5, "东":6, "西":7, "北":8, "东西":9, "南北":10] + def directMap = ["瑗垮崡":1, "涓滃崡":2, "鍗�":3, "瑗垮寳":4, "涓滃寳":5, "涓�":6, "瑗�":7, "鍖�":8, "涓滆タ":9, "鍗楀寳":10] return directMap.get(s); } def getFitmentCode(def s){ if(s){ - if(["毛坯"].contains(s)){ + if(["姣涘澂"].contains(s)){ return 1; - }else if(["简单装修","简装"].contains(s)){ + }else if(["绠�鍗曡淇�","绠�瑁�"].contains(s)){ return 2; - }else if(["精装修","精装"].contains(s)){ + }else if(["绮捐淇�","绮捐"].contains(s)){ return 3; - }else if(["豪华装修","豪装"].contains(s)){ + }else if(["璞崕瑁呬慨","璞"].contains(s)){ return 4; } } @@ -298,13 +298,13 @@ class HailanTest { def map = houses[k]; DBObject seawater = new BasicDBObject(map) - if(estate_type2 && estate_type2=="普通住宅"){ - if(seawater.estate_type && (seawater.estate_type.contains("商住") || seawater.estate_type.contains("商业") || seawater.estate_type.contains("商务"))){ + if(estate_type2 && estate_type2=="鏅�氫綇瀹�"){ + if(seawater.estate_type && (seawater.estate_type.contains("鍟嗕綇") || seawater.estate_type.contains("鍟嗕笟") || seawater.estate_type.contains("鍟嗗姟"))){ println city +" "+name+" "+seawater._id.toString()+" "+seawater.estate_type continue; } - if(seawater.estate_type&& seawater.estate_type.contains("别墅")){ + if(seawater.estate_type&& seawater.estate_type.contains("鍒")){ println city +" "+name+" "+seawater._id.toString()+" "+seawater.estate_type continue; } @@ -423,27 +423,27 @@ class HailanTest { if(floorDesc){ floorDesc = floorDesc.replaceAll("[\\s ]+", "") if(floorDesc){ - Pattern pat1 = Pattern.compile("第(\\d{1,2})层"); + 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)?"); + 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.contains("楂樻ゼ灞�") || floorDesc.contains("楂樺眰")){ +// return "楂樺眰" // } // // -// if(floorDesc.contains("低楼层") || floorDesc.contains("低层")){ -// return "低层" +// if(floorDesc.contains("浣庢ゼ灞�") || floorDesc.contains("浣庡眰")){ +// return "浣庡眰" // } if(floorDesc.isNumber()){ return floorDesc; @@ -457,7 +457,7 @@ class HailanTest { if (directionDesc == null) { return null } - directionDesc = directionDesc.replaceAll("(\\(|(|《|\"|“|【|〔).+?(\\)|》|)|\"|”|】|〕)", "#_#") + directionDesc = directionDesc.replaceAll("(\\(|锛坾銆妡\"|鈥渱銆恷銆�).+?(\\)|銆媩锛墊\"|鈥潀銆憒銆�)", "#_#") StringBuffer sb = new StringBuffer() for (int i = 0; i < directionDesc.length(); i++) { String c = directionDesc.substring(i, i + 1) @@ -488,7 +488,7 @@ class HailanTest { return null } fitmentDesc = fitmentDesc.replaceAll("[\\s ]+", "") - if (fitmentDesc.equals("非毛坯")) { + if (fitmentDesc.equals("闈炴瘺鍧�")) { return null } Iterator>> it = FITMENTS_TYPES_MAPS @@ -541,7 +541,7 @@ class HailanTest { def match(path){ ExcelUtils.multiThreadingModify(path, { row -> if(row['A']){ - String city = "福州"//RegionData.formatCity(row['B']) + String city = "绂忓窞"//RegionData.formatCity(row['B']) if(city){ def address = row['A'] // def region = row['C'] @@ -577,7 +577,7 @@ class HailanTest { def distLists = [] def villaLists = [] for(def d : dists){ - if(d.estate_type2=="别墅"){ + if(d.estate_type2=="鍒"){ villaLists << d }else{ distLists << d @@ -604,8 +604,8 @@ class HailanTest { def buildStructureTotal = 0 // ExcelUtils.modify(path, { row -> // if (row['L'] && !row['K']) { - //"海口","三亚","三沙","儋州", - def citys = ["五指山","琼海","文昌","万宁","东方","定安","屯昌","澄迈","临高","白沙","昌江","乐东","陵水","保亭","琼中"] + //"娴峰彛","涓変簹","涓夋矙","鍎嬪窞", + def citys = ["浜旀寚灞�","鐞兼捣","鏂囨槍","涓囧畞","涓滄柟","瀹氬畨","灞槍","婢勮繄","涓撮珮","鐧芥矙","鏄屾睙","涔愪笢","闄垫按","淇濅涵","鐞间腑"] for(def city : citys) { def dists = null @@ -617,7 +617,7 @@ class HailanTest { def distLists = [] def villaLists = [] for (def d : dists) { - if (d.estate_type2 == "别墅") { + if (d.estate_type2 == "鍒") { villaLists << d } else { distLists << d @@ -653,7 +653,7 @@ class HailanTest { def findHaveHouseDist(districts){ def totalCount = new AtomicLong() final CountDownLatch latch = new CountDownLatch(districts.size()) - println "小区量:"+districts.size() + println "灏忓尯閲忥細"+districts.size() def rets = new CopyOnWriteArrayList() @@ -729,8 +729,8 @@ class HailanTest { ExcelUtils.multiThreadingModify(path, { row -> - def cityMap = CommonDatautils.findThirdPartyPrice("福州", row['F'], row['G'], startDate, endDate) - def priceMap = cityMap.get("福州"+"##"+row['F']+"##"+row['G']) + 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) @@ -753,7 +753,7 @@ class HailanTest { 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")) + def dbo = CommonDatautils.queryDistrictPrice("绂忓窞", d['F'], d['G'], DateUtils.parseFromTightByPattern("2023-07-02","yyyy-MM-dd")) if(dbo){ d['Q'] = dbo.avg_price_2b } @@ -765,7 +765,7 @@ class HailanTest { ExcelUtils.modify(inputfile, { row -> if(row['B']) { def q = new BasicDBObject() - q.put("city", "福州") + q.put("city", "绂忓窞") q.put("region", row['A']) q.put("name", row['B']) q.put("month", 202304) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/MatchEvaluateRegionTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/MatchEvaluateRegionTest.groovy index 9ac21fba3..47fc77892 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/MatchEvaluateRegionTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/MatchEvaluateRegionTest.groovy @@ -38,14 +38,14 @@ class MatchEvaluateRegionTest { def sqlInstance = Sql.newInstance("jdbc:oracle:thin:@192.168.0.236:1521:orcl", "GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver") - def path = "D:\\数据\\美团\\10城小区明细-V10.xlsx" + def path = "D:\\鏁版嵁\\缇庡洟\\10鍩庡皬鍖烘槑缁�-V10.xlsx" def total = 1500 static main(args) { def task = new MatchEvaluateRegionTest() -// task.run()//小区匹配 -// task.run1()//地图匹配 -// task.addDistrict();//新增人工处理小区,原文件匹配不上的去除 +// task.run()//灏忓尯鍖归厤 +// task.run1()//鍦板浘鍖归厤 +// task.addDistrict();//鏂板浜哄伐澶勭悊灏忓尯,鍘熸枃浠跺尮閰嶄笉涓婄殑鍘婚櫎 // task.addPrice() // task.addArroundPrice() // task.addArroundPriceByLat() @@ -106,7 +106,7 @@ class MatchEvaluateRegionTest { def obj = CommonDatautils.queryDistrictPrice(row['G'], row['H'], row['I'], DateUtils.parseFromTightByPattern("2022-05-22","yyyy-MM-dd")) if(!obj){ row['R'] = '' - row['S'] = "无最新价" + row['S'] = "鏃犳渶鏂颁环" } } }); @@ -139,7 +139,7 @@ class MatchEvaluateRegionTest { } def addRentRate(){ - def citys = ["昆明","南宁","郑州","长沙","贵阳","乌鲁木齐","中山","湛江","南昌","海口"] + def citys = ["鏄嗘槑","鍗楀畞","閮戝窞","闀挎矙","璐甸槼","涔岄瞾鏈ㄩ綈","涓北","婀涙睙","鍗楁槍","娴峰彛"] def radioMap = [:] for(def city : citys) { def lastMonthDay = DateUtil.truncateDay(DateUtil.getLastDayOfMonth(new Date(), -1)); @@ -153,7 +153,7 @@ class MatchEvaluateRegionTest { def avg_rent_radio = radioMap.get(city) if(avg_rent_radio){ row['P'] = (int)(row['O']/avg_rent_radio) - row['S'] = "租金推算1" + row['S'] = "绉熼噾鎺ㄧ畻1" } } }) @@ -167,14 +167,14 @@ class MatchEvaluateRegionTest { def priceObj = arroundObj.result row['O'] = priceObj.unitPrice // row['N'] = (int) (priceObj.unitPrice * row['E']) - row['S'] = "周边价格" + row['S'] = "鍛ㄨ竟浠锋牸" } } }); } def addAuthor(){ - def authors = ["丁世菁","王文艳","董彦均","曹玉彦","高娟","姚静梦","付贵生","赵灵芝","沈健","许镕杰","徐鹤","徐翔翔","穆良书","沈燕芳"] + def authors = ["涓佷笘鑿�","鐜嬫枃鑹�","钁e溅鍧�","鏇圭帀褰�","楂樺","濮氶潤姊�","浠樿吹鐢�","璧电伒鑺�","娌堝仴","璁搁晻鏉�","寰愰工","寰愮繑缈�","绌嗚壇涔�","娌堢嚂鑺�"] def personTotal = authors.size() def avg = Math.ceil(total/personTotal) @@ -196,7 +196,7 @@ class MatchEvaluateRegionTest { def addDistrict(){ - def path = "D:\\数据\\重庆农商行\\2022-05-06\\需新增小区.xlsx" + def path = "D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\2022-05-06\\闇�鏂板灏忓尯.xlsx" def keys = new CopyOnWriteArrayList() def index = 0 ExcelUtils.modify(path, { d-> @@ -214,10 +214,10 @@ class MatchEvaluateRegionTest { if(address){ formatAddress = AddressUtil.formatAddress(city, address) if(!formatAddress){ - if(address.contains("交叉口")){ - formatAddress = address.substring(0, address.toString().indexOf("交叉口")+3) - }else if(address.contains("交叉")){ - formatAddress = address.substring(0, address.toString().indexOf("交叉")+2) + if(address.contains("浜ゅ弶鍙�")){ + formatAddress = address.substring(0, address.toString().indexOf("浜ゅ弶鍙�")+3) + }else if(address.contains("浜ゅ弶")){ + formatAddress = address.substring(0, address.toString().indexOf("浜ゅ弶")+2) } } } @@ -234,18 +234,18 @@ class MatchEvaluateRegionTest { blat = baidu.y * 10000000000L } - def estateType2 = "普通住宅" - if(name.contains("别墅")){ - estateType2 = "别墅" - }else if(name.contains("商住")){ - estateType2 = "商住" + def estateType2 = "鏅�氫綇瀹�" + if(name.contains("鍒")){ + estateType2 = "鍒" + }else if(name.contains("鍟嗕綇")){ + estateType2 = "鍟嗕綇" }else{ def type = d['I'] if(type){ - if(type.contains("别墅")){ - estateType2 = "别墅" - }else if(type.contains("商住")){ - estateType2 = "商住" + if(type.contains("鍒")){ + estateType2 = "鍒" + }else if(type.contains("鍟嗕綇")){ + estateType2 = "鍟嗕綇" } } } @@ -273,7 +273,7 @@ class MatchEvaluateRegionTest { data.put("lng2",blng) } def markMap = [:] - markMap.put("data_source", "机器入库") + markMap.put("data_source", "鏈哄櫒鍏ュ簱") data.put("mark_map",markMap) index++ DbUtils.seaweed.save(data); @@ -282,7 +282,7 @@ class MatchEvaluateRegionTest { } } }else{ - println city +" "+region +" 区域无法标准化" + println city +" "+region +" 鍖哄煙鏃犳硶鏍囧噯鍖�" } } },0) @@ -300,9 +300,9 @@ class MatchEvaluateRegionTest { def nameFileter(def name){ - name = name.replace("·","").replace(".","").replace("|","") - name = name.replace("1期","一期").replace("2期","二期").replace("3期","三期").replace("4期","四期").replace("5期","五期").replace("6期","6期") - name = name.replace("1区","一区").replace("2区","二区").replace("3区","三区").replace("4区","四区").replace("5区","五区").replace("6区","六区") + name = name.replace("路","").replace(".","").replace("|","") + name = name.replace("1鏈�","涓�鏈�").replace("2鏈�","浜屾湡").replace("3鏈�","涓夋湡").replace("4鏈�","鍥涙湡").replace("5鏈�","浜旀湡").replace("6鏈�","6鏈�") + name = name.replace("1鍖�","涓�鍖�").replace("2鍖�","浜屽尯").replace("3鍖�","涓夊尯").replace("4鍖�","鍥涘尯").replace("5鍖�","浜斿尯").replace("6鍖�","鍏尯") if(name.contains("(")){ def delstr = name.substring(name.indexOf("("), name.indexOf(")")+1) name = name.replace(delstr,"") @@ -361,7 +361,7 @@ class MatchEvaluateRegionTest { } def arround_score =(int)(scores.sum()/scores.size()) d['R'] = arround_score - d['T'] = "周边小区评分2" + d['T'] = "鍛ㄨ竟灏忓尯璇勫垎2" } } } @@ -371,7 +371,7 @@ class MatchEvaluateRegionTest { def addArroundPriceByLat(){ ExcelUtils.multiThreadingModify(path, { d -> - if(!d['O'] && d['F'] && (d['K'].contains("住宅") || d['K'].contains("商住") ||d['K'].contains("别墅"))){ + if(!d['O'] && d['F'] && (d['K'].contains("浣忓畢") || d['K'].contains("鍟嗕綇") ||d['K'].contains("鍒"))){ def dist = null if(d['F'].toString().size()>16){ dist = CommonDatautils.findDistrictById(d['F']) @@ -401,7 +401,7 @@ class MatchEvaluateRegionTest { if(prices){ def arround_price =(int)(prices.sum()/prices.size()) d['O'] = arround_price - d['S'] = "周边均价3" + d['S'] = "鍛ㄨ竟鍧囦环3" } } } @@ -418,12 +418,12 @@ class MatchEvaluateRegionTest { nb.distance = distance newList << nb } - //排序 + //鎺掑簭 Collections.sort(newList, new Comparator() { @Override int compare(Object o1, Object o2) { if(o1.distance > o2.distance) - return 1;//第二个元素(o1)比第一个元素(o2)大,返回-1 + return 1;//绗簩涓厓绱狅紙o1锛夋瘮绗竴涓厓绱狅紙o2锛夊ぇ锛岃繑鍥�-1 if(o1.distance == o2.distance) return 0; return -1; @@ -450,7 +450,7 @@ class MatchEvaluateRegionTest { def addLevel() { - def citys = ["昆明","南宁","郑州","长沙","贵阳","乌鲁木齐","中山","湛江","南昌","海口"]// + def citys = ["鏄嗘槑","鍗楀畞","閮戝窞","闀挎矙","璐甸槼","涔岄瞾鏈ㄩ綈","涓北","婀涙睙","鍗楁槍","娴峰彛"]// def weekend = DateUtils.getFirstDayOfWeek(new Date()); def cityLevelMap = [:] for(def city : citys){ @@ -459,7 +459,7 @@ class MatchEvaluateRegionTest { def datas = addPriceData(dists, priceMap); datas = calcuteLevel(datas); cityLevelMap.put(city, ["price":priceMap, "level":datas]) - println city +" 楼盘评级同步完成" + println city +" 妤肩洏璇勭骇鍚屾瀹屾垚" } ExcelUtils.multiThreadingModify(path, { row -> @@ -467,7 +467,7 @@ class MatchEvaluateRegionTest { def address = row['E'] def city = RegionData.formatCity(row['A']) - if(row['K'] && !row['K'].contains("住宅") && !row['K'].contains("商住") && !row['K'].contains("别墅")){ + if(row['K'] && !row['K'].contains("浣忓畢") && !row['K'].contains("鍟嗕綇") && !row['K'].contains("鍒")){ if(city){ def map = cityLevelMap.get(city) def rMap = null diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/MatchEvaluateTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/MatchEvaluateTest.groovy index 30997779c..e71790da4 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/MatchEvaluateTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/MatchEvaluateTest.groovy @@ -23,14 +23,14 @@ class MatchEvaluateTest { def sqlInstance = Sql.newInstance("jdbc:oracle:thin:@192.168.0.236:1521:orcl", "GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver") - def path = "D:\\数据\\重庆农商行\\2022-05-06\\模拟_测试数据.xlsx" + def path = "D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\2022-05-06\\妯℃嫙_娴嬭瘯鏁版嵁.xlsx" def total = 1500 static main(args) { def task = new MatchEvaluateTest() - task.run()//小区匹配 - task.run1()//地图匹配 -// task.addDistrict();//新增人工处理小区,原文件匹配不上的去除 + task.run()//灏忓尯鍖归厤 + task.run1()//鍦板浘鍖归厤 +// task.addDistrict();//鏂板浜哄伐澶勭悊灏忓尯,鍘熸枃浠跺尮閰嶄笉涓婄殑鍘婚櫎 task.addPrice() task.addArroundPrice() task.addAuthor() @@ -46,7 +46,7 @@ class MatchEvaluateTest { def priceObj = arroundObj.result row['K'] = priceObj.unitPrice row['L'] = (int) (priceObj.unitPrice * row['C']) - row['O'] = "周边价格" + row['O'] = "鍛ㄨ竟浠锋牸" } } }); @@ -54,10 +54,10 @@ class MatchEvaluateTest { def run(){ -// def path = "D:\\数据\\重庆农商行\\2022-05-06\\test.xlsx" +// def path = "D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\2022-05-06\\test.xlsx" ExcelUtils.multiThreadingModify(path, { row -> if(!row['D'] && row['B']){ - def jsonObject = OpenApiClient.addressMatch5("重庆", row['B'], "property", false) + def jsonObject = OpenApiClient.addressMatch5("閲嶅簡", row['B'], "property", false) if(jsonObject != null && jsonObject.precise!=-1) { row['D'] = jsonObject.get("id") row['E'] = jsonObject.get("city") @@ -74,10 +74,10 @@ class MatchEvaluateTest { } def run1(){ -// def path = "D:\\数据\\重庆农商行\\2022-05-06\\test.xlsx" +// def path = "D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\2022-05-06\\test.xlsx" ExcelUtils.multiThreadingModify(path, { row -> if(!row['D'] && row['B']){ - def jsonObject = OpenApiClient.addressMatch("重庆", row['B'], null, true) + def jsonObject = OpenApiClient.addressMatch("閲嶅簡", row['B'], null, true) if(jsonObject != null && jsonObject.precise!=-1) { row['D'] = jsonObject.get("id") row['E'] = jsonObject.get("city") @@ -94,7 +94,7 @@ class MatchEvaluateTest { } def addPrice(){ -// def path = "D:\\数据\\重庆农商行\\2022-05-06\\test.xlsx" +// def path = "D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\2022-05-06\\test.xlsx" ExcelUtils.multiThreadingModify(path, { row -> if(!row['J'] && row['E']){ def priceObj = CommonDatautils.findDistrictPrice(row['E'], row['F'], row['G']) @@ -116,8 +116,8 @@ class MatchEvaluateTest { } def addAuthor(){ -// def path = "D:\\数据\\重庆农商行\\2022-05-06\\test.xlsx" - def authors = ["丁世菁","王文艳","董彦均","曹玉彦","高娟","姚静梦","付贵生","赵灵芝","沈健","许镕杰","徐鹤","徐翔翔","穆良书","沈燕芳"] +// def path = "D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\2022-05-06\\test.xlsx" + def authors = ["涓佷笘鑿�","鐜嬫枃鑹�","钁e溅鍧�","鏇圭帀褰�","楂樺","濮氶潤姊�","浠樿吹鐢�","璧电伒鑺�","娌堝仴","璁搁晻鏉�","寰愰工","寰愮繑缈�","绌嗚壇涔�","娌堢嚂鑺�"] def personTotal = authors.size() def avg = Math.ceil(total/personTotal) @@ -139,7 +139,7 @@ class MatchEvaluateTest { def addDistrict(){ - def path = "D:\\数据\\重庆农商行\\2022-05-06\\需新增小区.xlsx" + def path = "D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\2022-05-06\\闇�鏂板灏忓尯.xlsx" def keys = new CopyOnWriteArrayList() def index = 0 ExcelUtils.modify(path, { d-> @@ -157,10 +157,10 @@ class MatchEvaluateTest { if(address){ formatAddress = AddressUtil.formatAddress(city, address) if(!formatAddress){ - if(address.contains("交叉口")){ - formatAddress = address.substring(0, address.toString().indexOf("交叉口")+3) - }else if(address.contains("交叉")){ - formatAddress = address.substring(0, address.toString().indexOf("交叉")+2) + if(address.contains("浜ゅ弶鍙�")){ + formatAddress = address.substring(0, address.toString().indexOf("浜ゅ弶鍙�")+3) + }else if(address.contains("浜ゅ弶")){ + formatAddress = address.substring(0, address.toString().indexOf("浜ゅ弶")+2) } } } @@ -177,18 +177,18 @@ class MatchEvaluateTest { blat = baidu.y * 10000000000L } - def estateType2 = "普通住宅" - if(name.contains("别墅")){ - estateType2 = "别墅" - }else if(name.contains("商住")){ - estateType2 = "商住" + def estateType2 = "鏅�氫綇瀹�" + if(name.contains("鍒")){ + estateType2 = "鍒" + }else if(name.contains("鍟嗕綇")){ + estateType2 = "鍟嗕綇" }else{ def type = d['I'] if(type){ - if(type.contains("别墅")){ - estateType2 = "别墅" - }else if(type.contains("商住")){ - estateType2 = "商住" + if(type.contains("鍒")){ + estateType2 = "鍒" + }else if(type.contains("鍟嗕綇")){ + estateType2 = "鍟嗕綇" } } } @@ -216,7 +216,7 @@ class MatchEvaluateTest { data.put("lng2",blng) } def markMap = [:] - markMap.put("data_source", "机器入库") + markMap.put("data_source", "鏈哄櫒鍏ュ簱") data.put("mark_map",markMap) index++ DbUtils.seaweed.save(data); @@ -225,7 +225,7 @@ class MatchEvaluateTest { } } }else{ - println city +" "+region +" 区域无法标准化" + println city +" "+region +" 鍖哄煙鏃犳硶鏍囧噯鍖�" } } },0) @@ -243,9 +243,9 @@ class MatchEvaluateTest { def nameFileter(def name){ - name = name.replace("·","").replace(".","").replace("|","") - name = name.replace("1期","一期").replace("2期","二期").replace("3期","三期").replace("4期","四期").replace("5期","五期").replace("6期","6期") - name = name.replace("1区","一区").replace("2区","二区").replace("3区","三区").replace("4区","四区").replace("5区","五区").replace("6区","六区") + name = name.replace("路","").replace(".","").replace("|","") + name = name.replace("1鏈�","涓�鏈�").replace("2鏈�","浜屾湡").replace("3鏈�","涓夋湡").replace("4鏈�","鍥涙湡").replace("5鏈�","浜旀湡").replace("6鏈�","6鏈�") + name = name.replace("1鍖�","涓�鍖�").replace("2鍖�","浜屽尯").replace("3鍖�","涓夊尯").replace("4鍖�","鍥涘尯").replace("5鍖�","浜斿尯").replace("6鍖�","鍏尯") if(name.contains("(")){ def delstr = name.substring(name.indexOf("("), name.indexOf(")")+1) name = name.replace(delstr,"") @@ -263,7 +263,7 @@ class MatchEvaluateTest { } def stat(){ - def datas = ExcelUtils.read("D:\\数据\\重庆农商行\\2022-05-06\\模拟_测试数据_合并后 (1).xlsx",0,1) + def datas = ExcelUtils.read("D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\2022-05-06\\妯℃嫙_娴嬭瘯鏁版嵁_鍚堝苟鍚� (1).xlsx",0,1) ExcelUtils.multiThreadingModify(path, { d -> if(d['B']){ for(def row : datas){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/MeituanStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/MeituanStat.groovy index aff0e94e9..dbbfd18e6 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/MeituanStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/MeituanStat.groovy @@ -55,25 +55,25 @@ class MeituanStat { // println s // println str // println r -// def citys = ["北京","上海","保定","成都","广州","杭州","南京","深圳","天津","武汉","西安","重庆","吉林","常州","大连","东莞","佛山","福州","贵阳","哈尔滨","合肥","济南","昆明","南宁","宁波","青岛","厦门","沈阳","石家庄","苏州","太原","温州","无锡","长春","长沙","郑州","鞍山","包头","大庆","大同","海口","邯郸","衡阳","呼和浩特","湖州","淮安","惠州","济宁","嘉兴","江门","金华","荆州","兰州","连云港","临沂","柳州","洛阳","绵阳","南昌","南通","南阳","莆田","秦皇岛","泉州","三亚","汕头","绍兴","台州","泰州","唐山","威海","潍坊","乌鲁木齐","芜湖","襄阳","徐州","烟台","盐城","扬州","宜昌","银川","岳阳","湛江","镇江","中山","珠海","株洲","淄博"] -// def path = "D:\\数据\\美团\\美团88个城市统计.xlsx" +// def citys = ["鍖椾含","涓婃捣","淇濆畾","鎴愰兘","骞垮窞","鏉窞","鍗椾含","娣卞湷","澶╂触","姝︽眽","瑗垮畨","閲嶅簡","鍚夋灄","甯稿窞","澶ц繛","涓滆帪","浣涘北","绂忓窞","璐甸槼","鍝堝皵婊�","鍚堣偉","娴庡崡","鏄嗘槑","鍗楀畞","瀹佹尝","闈掑矝","鍘﹂棬","娌堥槼","鐭冲搴�","鑻忓窞","澶師","娓╁窞","鏃犻敗","闀挎槬","闀挎矙","閮戝窞","闉嶅北","鍖呭ご","澶у簡","澶у悓","娴峰彛","閭兏","琛¢槼","鍛煎拰娴╃壒","婀栧窞","娣畨","鎯犲窞","娴庡畞","鍢夊叴","姹熼棬","閲戝崕","鑽嗗窞","鍏板窞","杩炰簯娓�","涓存矀","鏌冲窞","娲涢槼","缁甸槼","鍗楁槍","鍗楅��","鍗楅槼","鑾嗙敯","绉︾殗宀�","娉夊窞","涓変簹","姹曞ご","缁嶅叴","鍙板窞","娉板窞","鍞愬北","濞佹捣","娼嶅潑","涔岄瞾鏈ㄩ綈","鑺滄箹","瑗勯槼","寰愬窞","鐑熷彴","鐩愬煄","鎵窞","瀹滄槍","閾跺窛","宀抽槼","婀涙睙","闀囨睙","涓北","鐝犳捣","鏍床","娣勫崥"] +// def path = "D:\\鏁版嵁\\缇庡洟\\缇庡洟88涓煄甯傜粺璁�.xlsx" // def rets =[] -// rets << ["城市", "楼盘总量"] +// rets << ["鍩庡競", "妤肩洏鎬婚噺"] // for(def c : citys){ // def count = CommonDatautils.findAllDistrictCount("district", c) // rets << [c, count] // } -// ExcelUtils.write(path, rets, "总量") +// ExcelUtils.write(path, rets, "鎬婚噺") } def run1(){ - def citys = ["北京","上海","保定","成都","广州","杭州","南京","深圳","天津","武汉","西安","重庆","吉林","常州","大连","东莞","佛山","福州","贵阳","哈尔滨","合肥","济南","昆明","南宁","宁波","青岛","厦门","沈阳","石家庄","苏州","太原","温州","无锡","长春","长沙","郑州","鞍山","包头","大庆","大同","海口","邯郸","衡阳","呼和浩特","湖州","淮安","惠州","济宁","嘉兴","江门","金华","荆州","兰州","连云港","临沂","柳州","洛阳","绵阳","南昌","南通","南阳","莆田","秦皇岛","泉州","三亚","汕头","绍兴","台州","泰州","唐山","威海","潍坊","乌鲁木齐","芜湖","襄阳","徐州","烟台","盐城","扬州","宜昌","银川","岳阳","湛江","镇江","中山","珠海","株洲","淄博"] - def path = "D:\\数据\\美团\\美团88个城市统计.xlsx" + def citys = ["鍖椾含","涓婃捣","淇濆畾","鎴愰兘","骞垮窞","鏉窞","鍗椾含","娣卞湷","澶╂触","姝︽眽","瑗垮畨","閲嶅簡","鍚夋灄","甯稿窞","澶ц繛","涓滆帪","浣涘北","绂忓窞","璐甸槼","鍝堝皵婊�","鍚堣偉","娴庡崡","鏄嗘槑","鍗楀畞","瀹佹尝","闈掑矝","鍘﹂棬","娌堥槼","鐭冲搴�","鑻忓窞","澶師","娓╁窞","鏃犻敗","闀挎槬","闀挎矙","閮戝窞","闉嶅北","鍖呭ご","澶у簡","澶у悓","娴峰彛","閭兏","琛¢槼","鍛煎拰娴╃壒","婀栧窞","娣畨","鎯犲窞","娴庡畞","鍢夊叴","姹熼棬","閲戝崕","鑽嗗窞","鍏板窞","杩炰簯娓�","涓存矀","鏌冲窞","娲涢槼","缁甸槼","鍗楁槍","鍗楅��","鍗楅槼","鑾嗙敯","绉︾殗宀�","娉夊窞","涓変簹","姹曞ご","缁嶅叴","鍙板窞","娉板窞","鍞愬北","濞佹捣","娼嶅潑","涔岄瞾鏈ㄩ綈","鑺滄箹","瑗勯槼","寰愬窞","鐑熷彴","鐩愬煄","鎵窞","瀹滄槍","閾跺窛","宀抽槼","婀涙睙","闀囨睙","涓北","鐝犳捣","鏍床","娣勫崥"] + def path = "D:\\鏁版嵁\\缇庡洟\\缇庡洟88涓煄甯傜粺璁�.xlsx" def rets =[] - rets << ["城市","ID","区域","小区名","小区别名","地址","地址别名","物业类型","建筑类型","经度","纬度","板块","开发商","物业公司", - "环线","商圈","楼栋总数","户数","物业费","占地面积","建筑面积","容积率","绿化率","停车位","停车位(描述)","产权年限", - "产权性质","建成年代","开工时间","开盘时间","竣工时间","交房时间","装修情况","建筑结构","周边配套","交通状况","相关信息", - "描述","售楼地址","售楼电话","折扣信息","预售许可证","房产评级","房产均价","租金均价"] + rets << ["鍩庡競","ID","鍖哄煙","灏忓尯鍚�","灏忓尯鍒悕","鍦板潃","鍦板潃鍒悕","鐗╀笟绫诲瀷","寤虹瓚绫诲瀷","缁忓害","绾害","鏉垮潡","寮�鍙戝晢","鐗╀笟鍏徃", + "鐜嚎","鍟嗗湀","妤兼爧鎬绘暟","鎴锋暟","鐗╀笟璐�","鍗犲湴闈㈢Н","寤虹瓚闈㈢Н","瀹圭Н鐜�","缁垮寲鐜�","鍋滆溅浣�","鍋滆溅浣嶏紙鎻忚堪锛�","浜ф潈骞撮檺", + "浜ф潈鎬ц川","寤烘垚骞翠唬","寮�宸ユ椂闂�","寮�鐩樻椂闂�","绔e伐鏃堕棿","浜ゆ埧鏃堕棿","瑁呬慨鎯呭喌","寤虹瓚缁撴瀯","鍛ㄨ竟閰嶅","浜ら�氱姸鍐�","鐩稿叧淇℃伅", + "鎻忚堪","鍞ゼ鍦板潃","鍞ゼ鐢佃瘽","鎶樻墸淇℃伅","棰勫敭璁稿彲璇�","鎴夸骇璇勭骇","鎴夸骇鍧囦环","绉熼噾鍧囦环"] for(def c : citys){ def dists = CommonDatautils.findAllDistrictByCity(c, "district", ["lat","lng","loudong_count","mobile","car_site","fitment","relate_info","description","sell_address","discount","facilities","traffic","region","name"]) def rMap = statFacilices(dists, c) @@ -194,13 +194,13 @@ class MeituanStat { loopLineInfo,businessQuarter,loudong,householdCount,estateCharge,allArea,buildArea,cubagePercent,virescencePercent,carSite,carSiteStr,propertyLife, houseProperty,buildDate,startBuildingDate,openDate,finishBuildingDate,liveDate,fitment,buildStructure,arround,traffic,relateInfo, description,sellAddress,mobile,discount,licence,level,price,rentPrie, db_bus, db_fc] - println c +" 完成" + println c +" 瀹屾垚" } - ExcelUtils.write(path, rets, "覆盖率") + ExcelUtils.write(path, rets, "瑕嗙洊鐜�") } def run2(){ - ExcelUtils.modify("D:\\数据\\美团\\美团88个城市统计.xlsx",{d-> + ExcelUtils.modify("D:\\鏁版嵁\\缇庡洟\\缇庡洟88涓煄甯傜粺璁�.xlsx",{d-> def dists = CommonDatautils.findAllDistrictByCity(d['A'], "district", ["name","lat","lng"]) def rMap = statFacilices(dists) if(rMap){ @@ -229,7 +229,7 @@ class MeituanStat { def count = 0 for(def d : dists){ def val = d.get(field) - if(val && !val.toString().contains("暂无")){ + if(val && !val.toString().contains("鏆傛棤")){ count++ } } @@ -324,7 +324,7 @@ class MeituanStat { def bus = 0 def fc = 0 if(d.type){ - if(d.type.contains("公交") || d.type.contains("地铁")){ + if(d.type.contains("鍏氦") || d.type.contains("鍦伴搧")){ bus = 1 fc = 1 }else{ @@ -402,7 +402,7 @@ class MeituanStat { conn.connect(); - //输出流 + //杈撳嚭娴� if (StringUtils.isNotEmpty(param)) { mWriter = new BufferedWriter(new OutputStreamWriter(conn.getOutputStream(), charset)); mWriter.write(param); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/MingShenPocStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/MingShenPocStat.groovy index d1e0db444..e23a8bc6e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/MingShenPocStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/MingShenPocStat.groovy @@ -35,7 +35,7 @@ class MingShenPocStat { } def officeRun(){ - def path = "D:\\数据\\民生\\抽样-写字楼类.xlsx" + def path = "D:\\鏁版嵁\\姘戠敓\\鎶芥牱-鍐欏瓧妤肩被.xlsx" def datas = [] ExcelUtils.modify(path, { d -> if(d['B']){ @@ -107,12 +107,12 @@ class MingShenPocStat { } }) - ExcelUtils.write("D:\\数据\\民生\\抽样-写字楼类-样本.xlsx", datas, "样本") + ExcelUtils.write("D:\\鏁版嵁\\姘戠敓\\鎶芥牱-鍐欏瓧妤肩被-鏍锋湰.xlsx", datas, "鏍锋湰") } def run(){ - def path = "D:\\数据\\民生\\样本字段覆盖率.xlsx" -// def datas = ExcelUtils.read("C:\\Users\\gaojuan\\Downloads\\二期估值数据每周统计\\二期估值数据每周统计\\估值数据统计结果20230112.xlsx", 0 , 1) + def path = "D:\\鏁版嵁\\姘戠敓\\鏍锋湰瀛楁瑕嗙洊鐜�.xlsx" +// def datas = ExcelUtils.read("C:\\Users\\gaojuan\\Downloads\\浜屾湡浼板�兼暟鎹瘡鍛ㄧ粺璁\浜屾湡浼板�兼暟鎹瘡鍛ㄧ粺璁\浼板�兼暟鎹粺璁$粨鏋�20230112.xlsx", 0 , 1) // // ExcelUtils.modify(path, { row -> // if(row['C']) { @@ -133,15 +133,15 @@ class MingShenPocStat { // } // }) - def totalcount = findHouseTotal("大连") - def count = findHouseCount("大连", "height") + def totalcount = findHouseTotal("澶ц繛") + def count = findHouseCount("澶ц繛", "height") println DataHandleUtils.getDoubleRound(2, count*100/totalcount) // ExcelUtils.multiThreadingModify(path, { row -> // if(row['C']) { //def districts = CommonDatautils.findAllDistrictByCity(row['C'],"district",["city", "region", "name", "alias"]) -// def districts = CommonDatautils.findDistrictByCityAndRegions("大连","district",["旅顺口"], ["city", "region", "name", "alias"]) +// def districts = CommonDatautils.findDistrictByCityAndRegions("澶ц繛","district",["鏃呴『鍙�"], ["city", "region", "name", "alias"]) // def total = districts.size() // if(total){ // def house_dist_count = findHouseStat(districts) @@ -189,7 +189,7 @@ class MingShenPocStat { def getNewDist(city){ - String sql = "select count(*) as count from community where city='${city}' and source='贝壳找房-新房' " + String sql = "select count(*) as count from community where city='${city}' and source='璐濆3鎵炬埧-鏂版埧' " def count = null ElasticUtils.executeSqlQuery(sql,{ data-> count = data.count @@ -208,7 +208,7 @@ class MingShenPocStat { def findHouseStat(districts){ def totalCount = new AtomicLong() final CountDownLatch latch = new CountDownLatch(districts.size()) - println "小区量:"+districts.size() + println "灏忓尯閲忥細"+districts.size() def rets = new CopyOnWriteArrayList() @@ -270,8 +270,8 @@ class MingShenPocStat { } - if(name.contains("弄小区")){ - def newName = name.replace("弄小区","弄") + if(name.contains("寮勫皬鍖�")){ + def newName = name.replace("寮勫皬鍖�","寮�") if(!alias.contains(newName)){ alias << newName } @@ -317,8 +317,8 @@ class MingShenPocStat { /** - * 转义字符串中的特殊字符 - * 仅过滤Lucene regexps, 其他的勿用 + * 杞箟瀛楃涓蹭腑鐨勭壒娈婂瓧绗� + * 浠呰繃婊ucene regexps, 鍏朵粬鐨勫嬁鐢� * @param keyword * @return */ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/MingShenPocTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/MingShenPocTest.groovy index 50db279aa..efdabeb5d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/MingShenPocTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/MingShenPocTest.groovy @@ -24,11 +24,11 @@ class MingShenPocTest { task.run() } def run(){ - def path = "D:\\数据\\民生\\poc测试.xlsx" - //9级标准化 - structureV2(path)//针对海南poc地址数据此接口不合适使用 - //省市区拆分 -// ner(path)//城市,区域带市带区 + def path = "D:\\鏁版嵁\\姘戠敓\\poc娴嬭瘯.xlsx" + //9绾ф爣鍑嗗寲 + structureV2(path)//閽堝娴峰崡poc鍦板潃鏁版嵁姝ゆ帴鍙d笉鍚堥�備娇鐢� + //鐪佸競鍖烘媶鍒� +// ner(path)//鍩庡競锛屽尯鍩熷甫甯傚甫鍖� // match(path) // addPrice(path) // addLatLng(path) @@ -49,7 +49,7 @@ class MingShenPocTest { if(jsonObj.result.city){ def cityStr = null - if(jsonObj.result.city=="市辖区"){ + if(jsonObj.result.city=="甯傝緰鍖�"){ cityStr = jsonObj.result.province }else{ cityStr = jsonObj.result.city @@ -92,7 +92,7 @@ class MingShenPocTest { }); } - //可以根据测试数据添加 推荐楼盘名 + //鍙互鏍规嵁娴嬭瘯鏁版嵁娣诲姞 鎺ㄨ崘妤肩洏鍚� def match(path){ ExcelUtils.multiThreadingModify(path, { row -> if(row['C'] && !row['E']){ @@ -144,7 +144,7 @@ class MingShenPocTest { params.put("size", String.valueOf(house.area)); if(house.height) { params.put("maxFloor", dist.house_height.toString()); - params.put("direction", getDirectionCode(house.direction).toString());//朝向 + params.put("direction", getDirectionCode(house.direction).toString());//鏈濆悜 if (house.house_floor) { params.put("floor", house.house_floor.toString()); } @@ -152,7 +152,7 @@ class MingShenPocTest { def fitmentCode = null if(house.fitment){ fitmentCode = getFitmentCode(house.fitment) - params.put("decoration", fitmentCode.toString());//装修 + params.put("decoration", fitmentCode.toString());//瑁呬慨 } params.put("scope", "1") def result = OpenApiClient.evaluateDistrictPrice(params); @@ -165,18 +165,18 @@ class MingShenPocTest { def getDirectionCode(def s){ - def directMap = ["西南":1, "东南":2, "南":3, "西北":4, "东北":5, "东":6, "西":7, "北":8, "东西":9, "南北":10] + def directMap = ["瑗垮崡":1, "涓滃崡":2, "鍗�":3, "瑗垮寳":4, "涓滃寳":5, "涓�":6, "瑗�":7, "鍖�":8, "涓滆タ":9, "鍗楀寳":10] return directMap.get(s); } def getFitmentCode(def s){ if(s){ - if(["毛坯"].contains(s)){ + if(["姣涘澂"].contains(s)){ return 1; - }else if(["简单装修","简装"].contains(s)){ + }else if(["绠�鍗曡淇�","绠�瑁�"].contains(s)){ return 2; - }else if(["精装修","精装"].contains(s)){ + }else if(["绮捐淇�","绮捐"].contains(s)){ return 3; - }else if(["豪华装修","豪装"].contains(s)){ + }else if(["璞崕瑁呬慨","璞"].contains(s)){ return 4; } } @@ -185,7 +185,7 @@ class MingShenPocTest { def addLatLng(path){ ExcelUtils.multiThreadingModify(path, { d -> - if(!d['J'] && d['H'] && (d['H']=="普通住宅" || d['H']=="商住" || d['H']=="别墅")) { + if(!d['J'] && d['H'] && (d['H']=="鏅�氫綇瀹�" || d['H']=="鍟嗕綇" || d['H']=="鍒")) { def json = BaiduMapUtils.searchByAddress(d['A']) if(json && json.location){ d['K'] = json.location.lng @@ -204,7 +204,7 @@ class MingShenPocTest { dist.city = city dist.lng = d['K'].toString().toDouble()*10000000000L dist.lat = d['L'].toString().toDouble()*10000000000L - dist.estateType = "普通住宅"//d['H'] + dist.estateType = "鏅�氫綇瀹�"//d['H'] if(dist.lat) { List list = DbUtils.findAroundDistrictByRadius(dist, 1000) if (list) { @@ -236,12 +236,12 @@ class MingShenPocTest { def distance = GeoHelper.GetDistance(d.lat/10000000000.0, d.lng/10000000000.0, nb.lat/10000000000.0, nb.lng/10000000000.0) nb.distance = distance } - //排序 + //鎺掑簭 Collections.sort(list, new Comparator() { @Override int compare(Object o1, Object o2) { if(o1.distance > o2.distance) - return 1;//第二个元素(o1)比第一个元素(o2)大,返回-1 + return 1;//绗簩涓厓绱狅紙o1锛夋瘮绗竴涓厓绱狅紙o2锛夊ぇ锛岃繑鍥�-1 if(o1.distance == o2.distance) return 0; return -1; @@ -252,7 +252,7 @@ class MingShenPocTest { def addAuthor(def path){ - def authors = ["董彦均","曹玉彦","付贵生","沈燕芳","Catherine", "王蕾","吉珉", "张宝剑"] + def authors = ["钁e溅鍧�","鏇圭帀褰�","浠樿吹鐢�","娌堢嚂鑺�","Catherine", "鐜嬭暰","鍚夌弶", "寮犲疂鍓�"] def personTotal = authors.size() def avg = Math.ceil(total/personTotal) @@ -300,7 +300,7 @@ class MingShenPocTest { } }); - ExcelUtils.write("D:\\数据\\民生\\民生样本数据.xlsx", datas, "样本数据") + ExcelUtils.write("D:\\鏁版嵁\\姘戠敓\\姘戠敓鏍锋湰鏁版嵁.xlsx", datas, "鏍锋湰鏁版嵁") } def findHouses(def city, def region, def cat, def startDate, def endDate, def name, def alias, def estate_type2){ @@ -336,13 +336,13 @@ class MingShenPocTest { def map = houses[k]; DBObject seawater = new BasicDBObject(map) - if(estate_type2 && estate_type2=="普通住宅"){ - if(seawater.estate_type && (seawater.estate_type.contains("商住") || seawater.estate_type.contains("商业") || seawater.estate_type.contains("商务"))){ + if(estate_type2 && estate_type2=="鏅�氫綇瀹�"){ + if(seawater.estate_type && (seawater.estate_type.contains("鍟嗕綇") || seawater.estate_type.contains("鍟嗕笟") || seawater.estate_type.contains("鍟嗗姟"))){ println city +" "+name+" "+seawater._id.toString()+" "+seawater.estate_type continue; } - if(seawater.estate_type&& seawater.estate_type.contains("别墅")){ + if(seawater.estate_type&& seawater.estate_type.contains("鍒")){ println city +" "+name+" "+seawater._id.toString()+" "+seawater.estate_type continue; } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/PocSampleTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/PocSampleTest.groovy index 509e35e88..1c809de37 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/PocSampleTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/PocSampleTest.groovy @@ -14,13 +14,13 @@ class PocSampleTest { } def run(){ -// match("D:\\数据\\重庆农商行\\poc\\抽样_1000.xlsx") -// addPrice("D:\\数据\\重庆农商行\\poc\\抽样_1000.xlsx") -// addArroundPrice("D:\\数据\\重庆农商行\\poc\\抽样_1000.xlsx") -// addRentRate("D:\\数据\\重庆农商行\\poc\\抽样_1000.xlsx") +// match("D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\poc\\鎶芥牱_1000.xlsx") +// addPrice("D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\poc\\鎶芥牱_1000.xlsx") +// addArroundPrice("D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\poc\\鎶芥牱_1000.xlsx") +// addRentRate("D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\poc\\鎶芥牱_1000.xlsx") -// matchResult("D:\\数据\\美团\\抽样_1000_结果.xlsx") - existsDist("D:\\数据\\美团\\抽样_1000_结果.xlsx") +// matchResult("D:\\鏁版嵁\\缇庡洟\\鎶芥牱_1000_缁撴灉.xlsx") + existsDist("D:\\鏁版嵁\\缇庡洟\\鎶芥牱_1000_缁撴灉.xlsx") } def existsDist(path){ @@ -28,14 +28,14 @@ class PocSampleTest { if(row['P']){ def dist = CommonDatautils.findDistrictById(row['P']) if(!dist){ - row['S'] = "不存在" + row['S'] = "涓嶅瓨鍦�" } } }) } def matchResult(path){ - def datas = ExcelUtils.read("D:\\数据\\美团\\美团金融小区测试list-所有数据-优化租金评级.xlsx", 0 ,1) + def datas = ExcelUtils.read("D:\\鏁版嵁\\缇庡洟\\缇庡洟閲戣瀺灏忓尯娴嬭瘯list-鎵�鏈夋暟鎹�-浼樺寲绉熼噾璇勭骇.xlsx", 0 ,1) def map = [:] for(def r : datas){ map.put(r['D'], r) @@ -71,7 +71,7 @@ class PocSampleTest { row['H'] = jsonObject.get("name") row['G'] = jsonObject.get("id") row['I'] = jsonObject.get("address") - row['L'] = "地图匹配(名称当地址)" + row['L'] = "鍦板浘鍖归厤(鍚嶇О褰撳湴鍧�)" row['M'] = jsonObject.get("propertyType") } } @@ -107,14 +107,14 @@ class PocSampleTest { if (arroundObj && arroundObj.msgCode == 200 && arroundObj.result) { def priceObj = arroundObj.result row['J'] = priceObj.unitPrice - row['N'] = "周边均价" + row['N'] = "鍛ㄨ竟鍧囦环" } } }); } def addRentRate(path){ - def citys = ["东莞","苏州","郑州","长沙"] + def citys = ["涓滆帪","鑻忓窞","閮戝窞","闀挎矙"] def radioMap = [:] for(def city : citys) { def lastMonthDay = DateUtil.truncateDay(DateUtil.getLastDayOfMonth(new Date(), -1)); @@ -125,11 +125,11 @@ class PocSampleTest { ExcelUtils.multiThreadingModify(path, { row -> def city = row['D'] if (city && row['J'] && !row['K']) { - city = city.replace("市","") + city = city.replace("甯�","") def avg_rent_radio = radioMap.get(city) if(avg_rent_radio){ row['K'] = (int)(row['J']/avg_rent_radio) - row['O'] = "租金推算" + row['O'] = "绉熼噾鎺ㄧ畻" } } }) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/PocStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/PocStat.groovy index 3d8bc3152..67d3ca3ce 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/PocStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/PocStat.groovy @@ -62,7 +62,7 @@ class PocStat { def f_all_roomCount = 0 - def zRegions = ["渝中","大渡口","江北","沙坪坝","九龙坡","南岸","北碚","渝北","巴南"] + def zRegions = ["娓濅腑","澶ф浮鍙�","姹熷寳","娌欏潽鍧�","涔濋緳鍧�","鍗楀哺","鍖楃","娓濆寳","宸村崡"] def z_count = 0 def f_count = 0 @@ -198,16 +198,16 @@ class PocStat { println "elevator "+ elevatorNum_prec def rets = [] - rets << ["城区","楼栋号","楼栋ID","物业类型","主朝向","地上层数","地下层数","竣工日期","梯","户","总户数","景观"] - rets << ["主城区",100,100,100,0,floor_prec,0,year_prec,elevatorNum_prec,roomcount_prec,households_prec,0] - rets << ["非主城区",100,100,100,0,f_floor_prec,0,f_year_prec,f_elevatorNum_prec,f_roomcount_prec,f_households_prec,0] - ExcelUtils.write("D:\\数据\\重庆农商行\\poc\\底层数据统计.xlsx",rets, "楼栋") + rets << ["鍩庡尯","妤兼爧鍙�","妤兼爧ID","鐗╀笟绫诲瀷","涓绘湞鍚�","鍦颁笂灞傛暟","鍦颁笅灞傛暟","绔e伐鏃ユ湡","姊�","鎴�","鎬绘埛鏁�","鏅"] + rets << ["涓诲煄鍖�",100,100,100,0,floor_prec,0,year_prec,elevatorNum_prec,roomcount_prec,households_prec,0] + rets << ["闈炰富鍩庡尯",100,100,100,0,f_floor_prec,0,f_year_prec,f_elevatorNum_prec,f_roomcount_prec,f_households_prec,0] + ExcelUtils.write("D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\poc\\搴曞眰鏁版嵁缁熻.xlsx",rets, "妤兼爧") } def houseLoudongStat2(){ - def zRegions = ["渝中","大渡口","江北","沙坪坝","九龙坡","南岸","北碚","渝北","巴南"] - def dists = CommonDatautils.findAllDistrictByCity("重庆","district", ["city","region","name"]) + def zRegions = ["娓濅腑","澶ф浮鍙�","姹熷寳","娌欏潽鍧�","涔濋緳鍧�","鍗楀哺","鍖楃","娓濆寳","宸村崡"] + def dists = CommonDatautils.findAllDistrictByCity("閲嶅簡","district", ["city","region","name"]) def z_count = 0 def f_count = 0 @@ -262,15 +262,15 @@ class PocStat { def f_direct_prec = DataHandleUtils.getDoubleRound(2, f_directionCount*100/f_count) def f_sight_prec = DataHandleUtils.getDoubleRound(2, f_sightCount*100/f_count) def rets = [] - rets << ["城区","户号","户ID","主朝向","景观","户型结构"] - rets << ["主城区",100,100,z_direct_prec, z_sight_prec, 100] - rets << ["非主城区",100,100, f_direct_prec, f_sight_prec, 100] - ExcelUtils.write("D:\\数据\\重庆农商行\\poc\\底层数据统计.xlsx",rets, "户1") + rets << ["鍩庡尯","鎴峰彿","鎴稩D","涓绘湞鍚�","鏅","鎴峰瀷缁撴瀯"] + rets << ["涓诲煄鍖�",100,100,z_direct_prec, z_sight_prec, 100] + rets << ["闈炰富鍩庡尯",100,100, f_direct_prec, f_sight_prec, 100] + ExcelUtils.write("D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\poc\\搴曞眰鏁版嵁缁熻.xlsx",rets, "鎴�1") } def houseLoudongStat(){ def map = getAllHouseLoudong() - def zRegions = ["渝中","大渡口","江北","沙坪坝","九龙坡","南岸","北碚","渝北","巴南"] + def zRegions = ["娓濅腑","澶ф浮鍙�","姹熷寳","娌欏潽鍧�","涔濋緳鍧�","鍗楀哺","鍖楃","娓濆寳","宸村崡"] def z_count = 0 def f_count = 0 @@ -321,15 +321,15 @@ class PocStat { def f_direct_prec = DataHandleUtils.getDoubleRound(2, f_directionCount*100/f_count) def f_sight_prec = DataHandleUtils.getDoubleRound(2, f_sightCount*100/f_count) def rets = [] - rets << ["城区","户号","户ID","主朝向","景观","户型结构"] - rets << ["主城区",100,100,z_direct_prec, z_sight_prec, 100] - rets << ["非主城区",100,100, f_direct_prec, f_sight_prec, 100] - ExcelUtils.write("D:\\数据\\重庆农商行\\poc\\底层数据统计.xlsx",rets, "户") + rets << ["鍩庡尯","鎴峰彿","鎴稩D","涓绘湞鍚�","鏅","鎴峰瀷缁撴瀯"] + rets << ["涓诲煄鍖�",100,100,z_direct_prec, z_sight_prec, 100] + rets << ["闈炰富鍩庡尯",100,100, f_direct_prec, f_sight_prec, 100] + ExcelUtils.write("D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\poc\\搴曞眰鏁版嵁缁熻.xlsx",rets, "鎴�") } def getAllHouseLoudong(){ def q = new BasicDBObject() - q.put("city","重庆") + q.put("city","閲嶅簡") q.put("district_id", new BasicDBObject(QueryOperators.EXISTS, true)) def keys = new BasicDBObject() @@ -355,7 +355,7 @@ class PocStat { def getAllHouseLoudong2(districtId){ def q = new BasicDBObject() - q.put("city","重庆") + q.put("city","閲嶅簡") q.put("district_id", districtId) def keys = new BasicDBObject() @@ -372,7 +372,7 @@ class PocStat { def getAllLouDong(){ def q = new BasicDBObject() - q.put("city","重庆") + q.put("city","閲嶅簡") q.put("id_in_seaweed", new BasicDBObject(QueryOperators.EXISTS, true)) def dbcursor = LOUDONG_LINE_COLL.find(q).batchSize(5000) def retMap = [:] @@ -428,7 +428,7 @@ class PocStat { def findAllLouDong(){ def q = new BasicDBObject() - q.put("city","重庆") + q.put("city","閲嶅簡") q.put("id_in_seaweed", new BasicDBObject(QueryOperators.EXISTS, true)) def dbcursor = LOUDONG_LINE_COLL.find(q) def keys = new HashSet() @@ -447,7 +447,7 @@ class PocStat { def findHouseLouDongRoom(def arrs){ def q = new BasicDBObject() - q.put("city","重庆") + q.put("city","閲嶅簡") q.put("district_id", arrs[0]) q.put("house_num", arrs[1]) if(arrs.size()>2){ @@ -471,7 +471,7 @@ class PocStat { return max_room; } def removeDelete(){ - def dists = CommonDatautils.findAllDistrictByCity("重庆","district", ["city","region","name", "name_cat"]) + def dists = CommonDatautils.findAllDistrictByCity("閲嶅簡","district", ["city","region","name", "name_cat"]) for(def obj : dists){ def name_cat = obj.name_cat; if(name_cat==12){ @@ -485,11 +485,11 @@ class PocStat { } def regionDistStat(){ - def city = "重庆" + def city = "閲嶅簡" def regionMap = CommonDatautils.getRegionsByCity(city) def set =regionMap.keySet(); def rows = [] - rows << ["区域","小区量"] + rows << ["鍖哄煙","灏忓尯閲�"] def dists = CommonDatautils.findAllDistrictByCity(city, "district", ["city","region","name"]) for(def region : set){ def count = CommonDatautils.findDistrictCountByRegionBlock(city, region, null, "district") @@ -510,17 +510,17 @@ class PocStat { // } // } rows << [region, count] - println region +" 完成" + println region +" 瀹屾垚" } - ExcelUtils.write("D:\\数据\\重庆农商行\\poc\\底层数据统计.xlsx",rows, "各区楼盘量统计1") + ExcelUtils.write("D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\poc\\搴曞眰鏁版嵁缁熻.xlsx",rows, "鍚勫尯妤肩洏閲忕粺璁�1") } def sampleStat(){ - def dists = CommonDatautils.findAllDistrictByCity("重庆", "district", ["city","region","name"]) + def dists = CommonDatautils.findAllDistrictByCity("閲嶅簡", "district", ["city","region","name"]) final CountDownLatch latch = new CountDownLatch(dists.size()) - def zRegions = ["渝中","大渡口","江北","沙坪坝","九龙坡","南岸","北碚","渝北","巴南"] + def zRegions = ["娓濅腑","澶ф浮鍙�","姹熷寳","娌欏潽鍧�","涔濋緳鍧�","鍗楀哺","鍖楃","娓濆寳","宸村崡"] def zCityDistTotal = new AtomicLong() def fCityDistTotal = new AtomicLong() //[0, 1), [1, 5), [5, 20), [20, 50), [50,+) @@ -537,7 +537,7 @@ class PocStat { def fHLevel5 = new AtomicLong() def rets = [] - rets << ["城区","小区量","[0, 1)","[1, 5)","[5, 20)","[20, 50)","[50,+)"] + rets << ["鍩庡尯","灏忓尯閲�","[0, 1)","[1, 5)","[5, 20)","[20, 50)","[50,+)"] def index = new AtomicLong() @@ -549,7 +549,7 @@ class PocStat { index.addAndGet(1) // println index +" "+d.name def commid = d._id.toString() - //房源 + //鎴挎簮 def jsonObject1 = OpenApiClient.houseList(commid,"20220201",60) if(jsonObject1 && jsonObject1.result) { def results = jsonObject1.result @@ -602,20 +602,20 @@ class PocStat { }) } latch.await() - def ret1 = ["主城区", zCityDistTotal.get(), zHLevel1.get(), zHLevel2.get(), zHLevel3.get(), zHLevel4.get(), zHLevel5.get()] - def ret2 = ["非主城区", fCityDistTotal.get(), fHLevel1.get(), fHLevel2.get(), fHLevel3.get(), fHLevel4.get(), fHLevel5.get()] + def ret1 = ["涓诲煄鍖�", zCityDistTotal.get(), zHLevel1.get(), zHLevel2.get(), zHLevel3.get(), zHLevel4.get(), zHLevel5.get()] + def ret2 = ["闈炰富鍩庡尯", fCityDistTotal.get(), fHLevel1.get(), fHLevel2.get(), fHLevel3.get(), fHLevel4.get(), fHLevel5.get()] rets.add(ret1) rets.add(ret2) - ExcelUtils.write("D:\\数据\\重庆农商行\\poc\\底层数据统计.xlsx", rets, "案例数量分布-样本") + ExcelUtils.write("D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\poc\\搴曞眰鏁版嵁缁熻.xlsx", rets, "妗堜緥鏁伴噺鍒嗗竷-鏍锋湰") } def tradeStat(){ - def dists = CommonDatautils.findAllDistrictByCity("重庆", "district", ["city","region","name"]) + def dists = CommonDatautils.findAllDistrictByCity("閲嶅簡", "district", ["city","region","name"]) final CountDownLatch latch = new CountDownLatch(dists.size()) - def zRegions = ["渝中","大渡口","江北","沙坪坝","九龙坡","南岸","北碚","渝北","巴南"] + def zRegions = ["娓濅腑","澶ф浮鍙�","姹熷寳","娌欏潽鍧�","涔濋緳鍧�","鍗楀哺","鍖楃","娓濆寳","宸村崡"] def zCityDistTotal = new AtomicLong() def fCityDistTotal = new AtomicLong() //[0, 1), [1, 5), [5, 20), [20, 50), [50,+) @@ -632,7 +632,7 @@ class PocStat { def fTLevel5 = new AtomicLong() def rets = [] - rets << ["城区","小区量","[0, 1)","[1, 5)","[5, 20)","[20, 50)","[50,+)"] + rets << ["鍩庡尯","灏忓尯閲�","[0, 1)","[1, 5)","[5, 20)","[20, 50)","[50,+)"] def index = new AtomicLong() @@ -644,7 +644,7 @@ class PocStat { index.addAndGet(1) println index +" "+d.name def commid = d._id.toString() - //房源 + //鎴挎簮 def jsonObject1 = OpenApiClient.searchDealPrice(commid,"20220201",60) if(jsonObject1 && jsonObject1.result) { def results = jsonObject1.result @@ -695,20 +695,20 @@ class PocStat { }) } latch.await() - def ret1 = ["主城区", zCityDistTotal.get(), zTLevel1.get(), zTLevel2.get(), zTLevel3.get(), zTLevel4.get(), zTLevel5.get()] - def ret2 = ["非主城区", fCityDistTotal.get(), fTLevel1.get(), fTLevel2.get(), fTLevel3.get(), fTLevel4.get(), fTLevel5.get()] + def ret1 = ["涓诲煄鍖�", zCityDistTotal.get(), zTLevel1.get(), zTLevel2.get(), zTLevel3.get(), zTLevel4.get(), zTLevel5.get()] + def ret2 = ["闈炰富鍩庡尯", fCityDistTotal.get(), fTLevel1.get(), fTLevel2.get(), fTLevel3.get(), fTLevel4.get(), fTLevel5.get()] rets.add(ret1) rets.add(ret2) - ExcelUtils.write("D:\\数据\\重庆农商行\\poc\\底层数据统计.xlsx", rets, "案例数量分布-成交") - println "成交案例统计完成" + ExcelUtils.write("D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\poc\\搴曞眰鏁版嵁缁熻.xlsx", rets, "妗堜緥鏁伴噺鍒嗗竷-鎴愪氦") + println "鎴愪氦妗堜緥缁熻瀹屾垚" } def paimaiStat(){ - def dists = CommonDatautils.findAllDistrictByCity("重庆", "district", ["city","region","name"]) + def dists = CommonDatautils.findAllDistrictByCity("閲嶅簡", "district", ["city","region","name"]) final CountDownLatch latch = new CountDownLatch(dists.size()) - def zRegions = ["渝中","大渡口","江北","沙坪坝","九龙坡","南岸","北碚","渝北","巴南"] + def zRegions = ["娓濅腑","澶ф浮鍙�","姹熷寳","娌欏潽鍧�","涔濋緳鍧�","鍗楀哺","鍖楃","娓濆寳","宸村崡"] def zCityDistTotal = new AtomicLong() def fCityDistTotal = new AtomicLong() //[0, 1), [1, 5), [5, 20), [20, 50), [50,+) @@ -725,7 +725,7 @@ class PocStat { def fPLevel5 = new AtomicLong() def rets = [] - rets << ["城区","小区量","[0, 1)","[1, 5)","[5, 20)","[20, 50)","[50,+)"] + rets << ["鍩庡尯","灏忓尯閲�","[0, 1)","[1, 5)","[5, 20)","[20, 50)","[50,+)"] def index = new AtomicLong() @@ -737,7 +737,7 @@ class PocStat { index.addAndGet(1) println index +" "+d.name def commid = d._id.toString() - //房源 + //鎴挎簮 def jsonObject1 = OpenApiClient.searchPaimais(d.city, d.region, d.name,"20220201",100) if(jsonObject1 && jsonObject1.result) { def results = jsonObject1.result @@ -788,19 +788,19 @@ class PocStat { }) } latch.await() - def ret1 = ["主城区", zCityDistTotal.get(), zPLevel1.get(), zPLevel2.get(), zPLevel3.get(), zPLevel4.get(), zPLevel5.get()] - def ret2 = ["非主城区", fCityDistTotal.get(), fPLevel1.get(), fPLevel2.get(), fPLevel3.get(), fPLevel4.get(), fPLevel5.get()] + def ret1 = ["涓诲煄鍖�", zCityDistTotal.get(), zPLevel1.get(), zPLevel2.get(), zPLevel3.get(), zPLevel4.get(), zPLevel5.get()] + def ret2 = ["闈炰富鍩庡尯", fCityDistTotal.get(), fPLevel1.get(), fPLevel2.get(), fPLevel3.get(), fPLevel4.get(), fPLevel5.get()] rets.add(ret1) rets.add(ret2) - ExcelUtils.write("D:\\数据\\重庆农商行\\poc\\底层数据统计.xlsx", rets, "案例数量分布-拍卖") - println "拍卖案例统计完成" + ExcelUtils.write("D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\poc\\搴曞眰鏁版嵁缁熻.xlsx", rets, "妗堜緥鏁伴噺鍒嗗竷-鎷嶅崠") + println "鎷嶅崠妗堜緥缁熻瀹屾垚" } def evalStat(){ - def dists = CommonDatautils.findAllDistrictByCity("重庆", "district", ["city","region","name"]) + def dists = CommonDatautils.findAllDistrictByCity("閲嶅簡", "district", ["city","region","name"]) final CountDownLatch latch = new CountDownLatch(dists.size()) - def zRegions = ["渝中","大渡口","江北","沙坪坝","九龙坡","南岸","北碚","渝北","巴南"] + def zRegions = ["娓濅腑","澶ф浮鍙�","姹熷寳","娌欏潽鍧�","涔濋緳鍧�","鍗楀哺","鍖楃","娓濆寳","宸村崡"] def zCityDistTotal = new AtomicLong() def fCityDistTotal = new AtomicLong() //[0, 1), [1, 5), [5, 20), [20, 50), [50,+) @@ -817,7 +817,7 @@ class PocStat { def fELevel5 = new AtomicLong() def rets = [] - rets << ["城区","小区量","[0, 1)","[1, 5)","[5, 20)","[20, 50)","[50,+)"] + rets << ["鍩庡尯","灏忓尯閲�","[0, 1)","[1, 5)","[5, 20)","[20, 50)","[50,+)"] def index = new AtomicLong() @@ -829,7 +829,7 @@ class PocStat { index.addAndGet(1) println index +" "+d.name def commid = d._id.toString() - //房源 + //鎴挎簮 def jsonObject1 = OpenApiClient.evaluaionList(commid,"20220201",60) if(jsonObject1 && jsonObject1.result) { def results = jsonObject1.result @@ -880,18 +880,18 @@ class PocStat { }) } latch.await() - def ret1 = ["主城区", zCityDistTotal.get(), zELevel1.get(), zELevel2.get(), zELevel3.get(), zELevel4.get(), zELevel5.get()] - def ret2 = ["非主城区", fCityDistTotal.get(), fELevel1.get(), fELevel2.get(), fELevel3.get(), fELevel4.get(), fELevel5.get()] + def ret1 = ["涓诲煄鍖�", zCityDistTotal.get(), zELevel1.get(), zELevel2.get(), zELevel3.get(), zELevel4.get(), zELevel5.get()] + def ret2 = ["闈炰富鍩庡尯", fCityDistTotal.get(), fELevel1.get(), fELevel2.get(), fELevel3.get(), fELevel4.get(), fELevel5.get()] rets.add(ret1) rets.add(ret2) - ExcelUtils.write("D:\\数据\\重庆农商行\\poc\\底层数据统计.xlsx", rets, "案例数量分布-评估") - println "评估案例统计完成" + ExcelUtils.write("D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\poc\\搴曞眰鏁版嵁缁熻.xlsx", rets, "妗堜緥鏁伴噺鍒嗗竷-璇勪及") + println "璇勪及妗堜緥缁熻瀹屾垚" } def fileldStat(){ - def dists = CommonDatautils.findAllDistrictByCity("重庆", "district", ["city","region","name"]) + def dists = CommonDatautils.findAllDistrictByCity("閲嶅簡", "district", ["city","region","name"]) final CountDownLatch latch = new CountDownLatch(dists.size()) - def zRegions = ["渝中","大渡口","江北","沙坪坝","九龙坡","南岸","北碚","渝北","巴南"] + def zRegions = ["娓濅腑","澶ф浮鍙�","姹熷寳","娌欏潽鍧�","涔濋緳鍧�","鍗楀哺","鍖楃","娓濆寳","宸村崡"] def alias_count = new AtomicLong() def address_count = new AtomicLong() def block_count = new AtomicLong() @@ -962,53 +962,53 @@ class PocStat { if(jsonObject.get("address")){ address_count.addAndGet(1) } - if(jsonObject.get("commercialArea")){//板块 + if(jsonObject.get("commercialArea")){//鏉垮潡 block_count.addAndGet(1) } - if(jsonObject.get("township")){//街道*********** + if(jsonObject.get("township")){//琛楅亾*********** township_count.addAndGet(1) } - if(jsonObject.get("avgPrice")) {//基准价 + if(jsonObject.get("avgPrice")) {//鍩哄噯浠� price_count.addAndGet(1) } - if(jsonObject.get("lng")){//经纬度 + if(jsonObject.get("lng")){//缁忕含搴� lng_count.addAndGet(1) } - if(jsonObject.get("finishBuildTime")){//竣工时间 + if(jsonObject.get("finishBuildTime")){//绔e伐鏃堕棿 finishBuildTime_count.addAndGet(1) } - if(jsonObject.get("developer")){//开发商名称 + if(jsonObject.get("developer")){//寮�鍙戝晢鍚嶇О developer_count.addAndGet(1) } - def green = SeaweedUtils.formatVirescencePercent(jsonObject.get("greenPercentage"))//绿化率 + def green = SeaweedUtils.formatVirescencePercent(jsonObject.get("greenPercentage"))//缁垮寲鐜� if(green){ green_count.addAndGet(1) } - def ratio = SeaweedUtils.formatCubagePercent(jsonObject.get("plotRatio"))//容积率 + def ratio = SeaweedUtils.formatCubagePercent(jsonObject.get("plotRatio"))//瀹圭Н鐜� if(ratio){ ratio_count.addAndGet(1) } - def carsite = SeaweedUtils.formatCarSiteCount(jsonObject.get("parking"))//车位个数 + def carsite = SeaweedUtils.formatCarSiteCount(jsonObject.get("parking"))//杞︿綅涓暟 if(carsite){ carsite_count.addAndGet(1) } - if(jsonObject.get("propertyManagement")){//物业公司 + if(jsonObject.get("propertyManagement")){//鐗╀笟鍏徃 propertyManagement_count.addAndGet(1) } - if(jsonObject.get("managementFee")){//物业费 + if(jsonObject.get("managementFee")){//鐗╀笟璐� managementFee_count.addAndGet(1) } - if(jsonObject.get("buildingCount")){//住宅幢数 + if(jsonObject.get("buildingCount")){//浣忓畢骞㈡暟 building_count.addAndGet(1) } - def holed = SeaweedUtils.formatHouseholdCount(jsonObject.get("totalUnitCount"))//总户数 + def holed = SeaweedUtils.formatHouseholdCount(jsonObject.get("totalUnitCount"))//鎬绘埛鏁� if(holed){ holed_count.addAndGet(1) } if(carsite && holed){ car_holed_count.addAndGet(1) } - def all_area = SeaweedUtils.formatAllArea(jsonObject.get("floorSpace"))//占地面积 + def all_area = SeaweedUtils.formatAllArea(jsonObject.get("floorSpace"))//鍗犲湴闈㈢Н if(all_area){ all_area_count.addAndGet(1) } @@ -1021,53 +1021,53 @@ class PocStat { if(jsonObject.get("address")){ f_address_count.addAndGet(1) } - if(jsonObject.get("commercialArea")){//板块 + if(jsonObject.get("commercialArea")){//鏉垮潡 f_block_count.addAndGet(1) } - if(jsonObject.get("township")){//街道*********** + if(jsonObject.get("township")){//琛楅亾*********** f_township_count.addAndGet(1) } - if(jsonObject.get("avgPrice")) {//基准价 + if(jsonObject.get("avgPrice")) {//鍩哄噯浠� f_price_count.addAndGet(1) } - if(jsonObject.get("lng")){//经纬度 + if(jsonObject.get("lng")){//缁忕含搴� f_lng_count.addAndGet(1) } - if(jsonObject.get("finishBuildTime")){//竣工时间 + if(jsonObject.get("finishBuildTime")){//绔e伐鏃堕棿 f_finishBuildTime_count.addAndGet(1) } - if(jsonObject.get("developer")){//开发商名称 + if(jsonObject.get("developer")){//寮�鍙戝晢鍚嶇О f_developer_count.addAndGet(1) } - def green = SeaweedUtils.formatVirescencePercent(jsonObject.get("greenPercentage"))//绿化率 + def green = SeaweedUtils.formatVirescencePercent(jsonObject.get("greenPercentage"))//缁垮寲鐜� if(green){ f_green_count.addAndGet(1) } - def ratio = SeaweedUtils.formatCubagePercent(jsonObject.get("plotRatio"))//容积率 + def ratio = SeaweedUtils.formatCubagePercent(jsonObject.get("plotRatio"))//瀹圭Н鐜� if(ratio){ f_ratio_count.addAndGet(1) } - def carsite = SeaweedUtils.formatCarSiteCount(jsonObject.get("parking"))//车位个数 + def carsite = SeaweedUtils.formatCarSiteCount(jsonObject.get("parking"))//杞︿綅涓暟 if(carsite){ f_carsite_count.addAndGet(1) } - if(jsonObject.get("propertyManagement")){//物业公司 + if(jsonObject.get("propertyManagement")){//鐗╀笟鍏徃 f_propertyManagement_count.addAndGet(1) } - if(jsonObject.get("managementFee")){//物业费 + if(jsonObject.get("managementFee")){//鐗╀笟璐� f_managementFee_count.addAndGet(1) } - if(jsonObject.get("buildingCount")){//住宅幢数 + if(jsonObject.get("buildingCount")){//浣忓畢骞㈡暟 f_building_count.addAndGet(1) } - def holed = SeaweedUtils.formatHouseholdCount(jsonObject.get("totalUnitCount"))//总户数 + def holed = SeaweedUtils.formatHouseholdCount(jsonObject.get("totalUnitCount"))//鎬绘埛鏁� if(holed){ f_holed_count.addAndGet(1) } if(carsite && holed){ f_car_holed_count.addAndGet(1) } - def all_area = SeaweedUtils.formatAllArea(jsonObject.get("floorSpace"))//占地面积 + def all_area = SeaweedUtils.formatAllArea(jsonObject.get("floorSpace"))//鍗犲湴闈㈢Н if(all_area){ f_all_area_count.addAndGet(1) } @@ -1153,7 +1153,7 @@ class PocStat { } latch.await() def rets = [] - rets << ["城区","小区名称","小区id","小区量","别名","地址","板块","街道","基准价","经纬度","竣工时间","开发商名称","绿化率","容积率","车位个数","物业公司","物业费","住宅幢数","总户数","车位配比","占地面积","是否学区","周边教育","周边交通","周边商业","周边医院","周边金融机构","楼盘每月均价走势","板块每月均价走势","行政区每月均价走势","城市每月均价走势"] + rets << ["鍩庡尯","灏忓尯鍚嶇О","灏忓尯id","灏忓尯閲�","鍒悕","鍦板潃","鏉垮潡","琛楅亾","鍩哄噯浠�","缁忕含搴�","绔e伐鏃堕棿","寮�鍙戝晢鍚嶇О","缁垮寲鐜�","瀹圭Н鐜�","杞︿綅涓暟","鐗╀笟鍏徃","鐗╀笟璐�","浣忓畢骞㈡暟","鎬绘埛鏁�","杞︿綅閰嶆瘮","鍗犲湴闈㈢Н","鏄惁瀛﹀尯","鍛ㄨ竟鏁欒偛","鍛ㄨ竟浜ら��","鍛ㄨ竟鍟嗕笟","鍛ㄨ竟鍖婚櫌","鍛ㄨ竟閲戣瀺鏈烘瀯","妤肩洏姣忔湀鍧囦环璧板娍","鏉垮潡姣忔湀鍧囦环璧板娍","琛屾斂鍖烘瘡鏈堝潎浠疯蛋鍔�","鍩庡競姣忔湀鍧囦环璧板娍"] def alias_pre = DataHandleUtils.getDoubleRound(2, 100-alias_count*100/zCityDistTotal) def addr_pre = DataHandleUtils.getDoubleRound(2, 100-address_count*100/zCityDistTotal) @@ -1178,7 +1178,7 @@ class PocStat { def market_pre = DataHandleUtils.getDoubleRound(2, 100-market_count*100/zCityDistTotal) def hosp_pre = DataHandleUtils.getDoubleRound(2, 100-hospital_count*100/zCityDistTotal) def bank_pre = DataHandleUtils.getDoubleRound(2, 100-bank_count*100/zCityDistTotal) - def ret1 = ["主城区","0" ,"0",zCityDistTotal.get(), alias_pre,addr_pre,block_pre,town_pre,price_pre,lat_pre, + def ret1 = ["涓诲煄鍖�","0" ,"0",zCityDistTotal.get(), alias_pre,addr_pre,block_pre,town_pre,price_pre,lat_pre, finish_pre,developer_pre,green_pre,ratio_pre,carsite_pre,pm_pre,mf_pre,building_pre, holed_pre,car_holed_pre,all_area_pre,key_school_pre,school_pre,traffic_pre,market_pre, hosp_pre,bank_pre,price_pre,0,0,0] @@ -1208,14 +1208,14 @@ class PocStat { def f_hosp_pre = DataHandleUtils.getDoubleRound(2, 100-f_hospital_count*100/zCityDistTotal) def f_bank_pre = DataHandleUtils.getDoubleRound(2, 100-f_bank_count*100/zCityDistTotal) - def ret2 = ["非主城区","0" ,"0",fCityDistTotal.get(), f_alias_pre,f_addr_pre,f_block_pre,f_town_pre,f_price_pre,f_lat_pre, + def ret2 = ["闈炰富鍩庡尯","0" ,"0",fCityDistTotal.get(), f_alias_pre,f_addr_pre,f_block_pre,f_town_pre,f_price_pre,f_lat_pre, f_finish_pre,f_developer_pre,f_green_pre,f_ratio_pre,f_carsite_pre,f_pm_pre,f_mf_pre,f_building_pre, f_holed_pre,f_car_holed_pre,f_all_area_pre,f_key_school_pre,f_school_pre,f_traffic_pre,f_market_pre, f_hosp_pre,f_bank_pre,f_price_pre,0,0,0] rets.add(ret1) rets.add(ret2) - ExcelUtils.write("D:\\数据\\重庆农商行\\poc\\底层数据统计.xlsx", rets, "字段-安") - println "字段统计完成" + ExcelUtils.write("D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\poc\\搴曞眰鏁版嵁缁熻.xlsx", rets, "瀛楁-瀹�") + println "瀛楁缁熻瀹屾垚" } } 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 180d2b09f..ed4e437b7 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 @@ -26,7 +26,7 @@ class PocTest { def export(){ - ExcelUtils.modify("D:\\数据\\其它\\广州.xlsx", { row -> + ExcelUtils.modify("D:\\鏁版嵁\\鍏跺畠\\骞垮窞.xlsx", { row -> def dist = CommonDatautils.findDistrictById(row["B"]) row['F'] = dist.address row['G'] = dist.lng/10000000000.0 @@ -45,16 +45,16 @@ class PocTest { /** - * A 序号 - * B 城市 - * C 区域 - * D 地址 - * E 面积 + * A 搴忓彿 + * B 鍩庡競 + * C 鍖哄煙 + * D 鍦板潃 + * E 闈㈢Н * @return */ def run(){ -// def inputfile = "D:\\数据\\重庆农商行\\poc\\test.xls" - def inputfile = "D:\\数据\\其它\\广州.xlsx" +// def inputfile = "D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\poc\\test.xls" + def inputfile = "D:\\鏁版嵁\\鍏跺畠\\骞垮窞.xlsx" // match(inputfile) addPrice(inputfile) // addArroundPrice(inputfile) @@ -69,13 +69,13 @@ class PocTest { // addPpeValue(inputfile) // matchMap(inputfile) -// addDetail(inputfile, "D:\\数据\\重庆农商行\\poc\\楼盘详情.xlsx") +// addDetail(inputfile, "D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\poc\\妤肩洏璇︽儏.xlsx") // -// createLoudong(inputfile,"D:\\数据\\重庆农商行\\poc\\底层数据-楼栋-户.xlsx") -// createPaimai(inputfile,"D:\\数据\\重庆农商行\\poc\\法拍案例.xlsx") -// createHouse(inputfile,"D:\\数据\\重庆农商行\\poc\\挂牌成交评估案例.xlsx") -// createDealPrice(inputfile,"D:\\数据\\重庆农商行\\poc\\挂牌成交评估案例.xlsx") -// createEvaluation(inputfile,"D:\\数据\\重庆农商行\\poc\\挂牌成交评估案例.xlsx") +// createLoudong(inputfile,"D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\poc\\搴曞眰鏁版嵁-妤兼爧-鎴�.xlsx") +// createPaimai(inputfile,"D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\poc\\娉曟媿妗堜緥.xlsx") +// createHouse(inputfile,"D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\poc\\鎸傜墝鎴愪氦璇勪及妗堜緥.xlsx") +// createDealPrice(inputfile,"D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\poc\\鎸傜墝鎴愪氦璇勪及妗堜緥.xlsx") +// createEvaluation(inputfile,"D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\poc\\鎸傜墝鎴愪氦璇勪及妗堜緥.xlsx") } def addPpeValue(inputfile){ @@ -135,7 +135,7 @@ class PocTest { def jsonObject = OpenApiClient.addressMatch(city, address, null, true, region, null) if(jsonObject != null && jsonObject.precise!=-1) { def propertyType = jsonObject.get("propertyType") - if(propertyType && (propertyType.contains("住宅") || propertyType.contains("别墅") || propertyType.contains("商住"))){ + if(propertyType && (propertyType.contains("浣忓畢") || propertyType.contains("鍒") || propertyType.contains("鍟嗕綇"))){ row['Q'] = jsonObject.get("name") row['R'] = new ObjectId().toString() row['W'] = propertyType @@ -177,7 +177,7 @@ class PocTest { if (arroundObj && arroundObj.msgCode == 200 && arroundObj.result) { def priceObj = arroundObj.result row['F'] = priceObj.unitPrice - row['W'] = "周边均价" + row['W'] = "鍛ㄨ竟鍧囦环" } } }); @@ -243,7 +243,7 @@ class PocTest { def createLoudong(path, output){ def rets = new CopyOnWriteArrayList() def datas = ExcelUtils.read(path, 0, 1) - rets << ["输入城市","输入区域","输入地址","面积","楼栋号","楼栋ID","物业类型","主朝向","地上层数","地下层数","竣工日期","梯","户","总户数","景观","户号","户ID","主朝向","景观","户型结构"] + rets << ["杈撳叆鍩庡競","杈撳叆鍖哄煙","杈撳叆鍦板潃","闈㈢Н","妤兼爧鍙�","妤兼爧ID","鐗╀笟绫诲瀷","涓绘湞鍚�","鍦颁笂灞傛暟","鍦颁笅灞傛暟","绔e伐鏃ユ湡","姊�","鎴�","鎬绘埛鏁�","鏅","鎴峰彿","鎴稩D","涓绘湞鍚�","鏅","鎴峰瀷缁撴瀯"] for(def row : datas){ def data = [] data << row['B'] @@ -256,27 +256,27 @@ class PocTest { def obj = jsonObject.result[0] data << obj.houseNumber data << obj.id - data << obj.type// 物业类型 - data << ""//主朝向 - data << obj.floors//地上层数 - data << ""//地下层数 - data << obj.buildYear;//竣工日期 - data << ""//梯 - data << ""//户 - data << obj.households//总户数 - data << ""//景观 + data << obj.type// 鐗╀笟绫诲瀷 + data << ""//涓绘湞鍚� + data << obj.floors//鍦颁笂灞傛暟 + data << ""//鍦颁笅灞傛暟 + data << obj.buildYear;//绔e伐鏃ユ湡 + data << ""//姊� + data << ""//鎴� + data << obj.households//鎬绘埛鏁� + data << ""//鏅 }else{ data << "" data << "" - data << ""// 物业类型 - data << ""//主朝向 - data << ""//地上层数 - data << ""//地下层数 - data << ""//竣工日期 - data << ""//梯 - data << ""//户 - data << ""//总户数 - data << ""//景观 + data << ""// 鐗╀笟绫诲瀷 + data << ""//涓绘湞鍚� + data << ""//鍦颁笂灞傛暟 + data << ""//鍦颁笅灞傛暟 + data << ""//绔e伐鏃ユ湡 + data << ""//姊� + data << ""//鎴� + data << ""//鎬绘埛鏁� + data << ""//鏅 } if(row['P']){ @@ -285,14 +285,14 @@ class PocTest { if(jsonObject1.result.size()>=1){ def obj = jsonObject1.result[0] - data << obj.roomNum//户号 - data << obj.id//户ID - data << obj.direction//主 - data << obj.sight//景观 - if(obj.roomNum && obj.roomNum.contains("跃")){ - data << "跃式"//户型结构 + data << obj.roomNum//鎴峰彿 + data << obj.id//鎴稩D + data << obj.direction//涓� + data << obj.sight//鏅 + if(obj.roomNum && obj.roomNum.contains("璺�")){ + data << "璺冨紡"//鎴峰瀷缁撴瀯 }else{ - data << ""//户型结构 + data << ""//鎴峰瀷缁撴瀯 } } @@ -301,13 +301,13 @@ class PocTest { } rets << data } - ExcelUtils.write(output, rets, "底层数据-楼栋-户") + ExcelUtils.write(output, rets, "搴曞眰鏁版嵁-妤兼爧-鎴�") } def addDetail(path, output){ def datas = ExcelUtils.read(path, 0, 1) def rows = [] - rows << ["输入城市","输入区域","输入地址","小区名称","小区ID","小区别名","小区地址","板块","街道","基准价","经纬度","竣工时间","开发商名称","绿化率","容积率","车位个数","物业公司","物业费","住宅幢数","总户数","车位配比","占地面积","是否学区","周边教育","周边交通","周边商业","周边医院","周边金融机构"] + rows << ["杈撳叆鍩庡競","杈撳叆鍖哄煙","杈撳叆鍦板潃","灏忓尯鍚嶇О","灏忓尯ID","灏忓尯鍒悕","灏忓尯鍦板潃","鏉垮潡","琛楅亾","鍩哄噯浠�","缁忕含搴�","绔e伐鏃堕棿","寮�鍙戝晢鍚嶇О","缁垮寲鐜�","瀹圭Н鐜�","杞︿綅涓暟","鐗╀笟鍏徃","鐗╀笟璐�","浣忓畢骞㈡暟","鎬绘埛鏁�","杞︿綅閰嶆瘮","鍗犲湴闈㈢Н","鏄惁瀛﹀尯","鍛ㄨ竟鏁欒偛","鍛ㄨ竟浜ら��","鍛ㄨ竟鍟嗕笟","鍛ㄨ竟鍖婚櫌","鍛ㄨ竟閲戣瀺鏈烘瀯"] for(def d : datas){ def commid = d['R'] println "[addDetail] commid:"+commid @@ -321,30 +321,30 @@ class PocTest { row << d['B'] row << d['C'] row << d['D'] - row << jsonObject.get("name")//小区名称 - row << commid//小区ID + row << jsonObject.get("name")//灏忓尯鍚嶇О + row << commid//灏忓尯ID if(jsonObject.get("alias")){ - row << jsonObject.get("alias").join(",").replace('"',"")//小区别名 + row << jsonObject.get("alias").join(",").replace('"',"")//灏忓尯鍒悕 }else{ row << "" } - row << jsonObject.get("address")//小区地址 - row << jsonObject.get("commercialArea")//板块 - row << jsonObject.get("township")//街道*********** - row << jsonObject.get("avgPrice")//基准价 - row << jsonObject.get("lng").toString()+","+jsonObject.get("lat").toString()//经纬度 - row << jsonObject.get("finishBuildTime")//竣工时间 - row << jsonObject.get("developer")//开发商名称 - row << SeaweedUtils.formatVirescencePercent(jsonObject.get("greenPercentage"))//绿化率 - row << SeaweedUtils.formatCubagePercent(jsonObject.get("plotRatio"))//容积率 - row << SeaweedUtils.formatCarSiteCount(jsonObject.get("parking"))//车位个数 - row << jsonObject.get("propertyManagement")//物业公司 - row << jsonObject.get("managementFee")//物业费 - row << jsonObject.get("buildingCount")//住宅幢数 - row << SeaweedUtils.formatHouseholdCount(jsonObject.get("totalUnitCount"))//总户数 - row << SeaweedUtils.calcCarAndHouseholdRadio(jsonObject.get("parking"), jsonObject.get("totalUnitCount"))//车位配比********* - row << SeaweedUtils.formatAllArea(jsonObject.get("floorSpace"))//占地面积 + row << jsonObject.get("address")//灏忓尯鍦板潃 + row << jsonObject.get("commercialArea")//鏉垮潡 + row << jsonObject.get("township")//琛楅亾*********** + row << jsonObject.get("avgPrice")//鍩哄噯浠� + row << jsonObject.get("lng").toString()+","+jsonObject.get("lat").toString()//缁忕含搴� + row << jsonObject.get("finishBuildTime")//绔e伐鏃堕棿 + row << jsonObject.get("developer")//寮�鍙戝晢鍚嶇О + row << SeaweedUtils.formatVirescencePercent(jsonObject.get("greenPercentage"))//缁垮寲鐜� + row << SeaweedUtils.formatCubagePercent(jsonObject.get("plotRatio"))//瀹圭Н鐜� + row << SeaweedUtils.formatCarSiteCount(jsonObject.get("parking"))//杞︿綅涓暟 + row << jsonObject.get("propertyManagement")//鐗╀笟鍏徃 + row << jsonObject.get("managementFee")//鐗╀笟璐� + row << jsonObject.get("buildingCount")//浣忓畢骞㈡暟 + row << SeaweedUtils.formatHouseholdCount(jsonObject.get("totalUnitCount"))//鎬绘埛鏁� + row << SeaweedUtils.calcCarAndHouseholdRadio(jsonObject.get("parking"), jsonObject.get("totalUnitCount"))//杞︿綅閰嶆瘮********* + row << SeaweedUtils.formatAllArea(jsonObject.get("floorSpace"))//鍗犲湴闈㈢Н } @@ -352,7 +352,7 @@ class PocTest { if(facilityObj && facilityObj.result){ def result = facilityObj.result if(result.keySchool){ - row << '是' + row << '鏄�' }else { row << "" } @@ -399,13 +399,13 @@ class PocTest { } } } - ExcelUtils.write(output, rows, "底层数据-小区") + ExcelUtils.write(output, rows, "搴曞眰鏁版嵁-灏忓尯") } def createPaimai(path, output){ def datas = ExcelUtils.read(path, 0, 1) def rows = [] - rows << ["输入城市","输入区域","输入地址","小区名称","标的名称","楼栋","户号","面积","案例时间","类型","状态","成交单价","评估单价"] + rows << ["杈撳叆鍩庡競","杈撳叆鍖哄煙","杈撳叆鍦板潃","灏忓尯鍚嶇О","鏍囩殑鍚嶇О","妤兼爧","鎴峰彿","闈㈢Н","妗堜緥鏃堕棿","绫诲瀷","鐘舵��","鎴愪氦鍗曚环","璇勪及鍗曚环"] def keys = [] for(def d : datas){ def commid = d['R'] @@ -449,13 +449,13 @@ class PocTest { } } } - ExcelUtils.write(output, rows, "拍卖案例") + ExcelUtils.write(output, rows, "鎷嶅崠妗堜緥") } def createHouse(path, output){ def datas = ExcelUtils.read(path, 0, 1) def rows = [] - rows << ["案例类型","小区名称","物业类型","户型","面积","装修","案例时间","成交周期","单价","总价","当前层","总楼层","朝向","来源"] + rows << ["妗堜緥绫诲瀷","灏忓尯鍚嶇О","鐗╀笟绫诲瀷","鎴峰瀷","闈㈢Н","瑁呬慨","妗堜緥鏃堕棿","鎴愪氦鍛ㄦ湡","鍗曚环","鎬讳环","褰撳墠灞�","鎬绘ゼ灞�","鏈濆悜","鏉ユ簮"] def keys = [] for(def d : datas) { def commid = d['R'] @@ -471,7 +471,7 @@ class PocTest { def results = jsonObject.result for (def r : results) { def row = [] - row << "挂牌" + row << "鎸傜墝" row << r.districtName if(r.estateType){ row << r.estateType @@ -484,9 +484,9 @@ class PocTest { } if(r.room){ - def roomStr = r.room+"室" + def roomStr = r.room+"瀹�" if(r.hall){ - roomStr = roomStr +r.hall+"厅" + roomStr = roomStr +r.hall+"鍘�" } row << roomStr }else{ @@ -518,13 +518,13 @@ class PocTest { } } } - ExcelUtils.write(output, rows, "挂牌案例") + ExcelUtils.write(output, rows, "鎸傜墝妗堜緥") } def createEvaluation(path, output){ def datas = ExcelUtils.read(path, 0, 1) def rows = [] - rows << ["案例类型","小区名称","物业类型","户型","面积","装修","案例时间","成交周期","单价","总价","当前层","总楼层","朝向","来源"] + rows << ["妗堜緥绫诲瀷","灏忓尯鍚嶇О","鐗╀笟绫诲瀷","鎴峰瀷","闈㈢Н","瑁呬慨","妗堜緥鏃堕棿","鎴愪氦鍛ㄦ湡","鍗曚环","鎬讳环","褰撳墠灞�","鎬绘ゼ灞�","鏈濆悜","鏉ユ簮"] def keys = [] for(def d : datas) { def commid= d['R'] @@ -539,14 +539,14 @@ class PocTest { def results = jsonObject.result for (def r : results) { def row = [] - row << "评估" + row << "璇勪及" row << r.commName row << "" if(r.roomcnt){ - def roomStr = r.roomcnt+"室" + def roomStr = r.roomcnt+"瀹�" if(r.livingroomcnt){ - roomStr = roomStr +r.livingroomcnt+"厅" + roomStr = roomStr +r.livingroomcnt+"鍘�" } row << roomStr }else{ @@ -569,13 +569,13 @@ class PocTest { row << "" } - if(r.houseaspect && !r.houseaspect.contains("暂")){ + if(r.houseaspect && !r.houseaspect.contains("鏆�")){ row << r.houseaspect }else{ row << "" } - row << "房价网" + row << "鎴夸环缃�" rows << row } @@ -583,14 +583,14 @@ class PocTest { } } } - ExcelUtils.write(output, rows, "评估案例") + ExcelUtils.write(output, rows, "璇勪及妗堜緥") } def createDealPrice(path, output){ def datas = ExcelUtils.read(path, 0, 1) def rows = [] - rows << ["案例类型","小区名称","物业类型","户型","面积","装修","案例时间","成交周期","单价","总价","当前层","总楼层","朝向","来源"] + rows << ["妗堜緥绫诲瀷","灏忓尯鍚嶇О","鐗╀笟绫诲瀷","鎴峰瀷","闈㈢Н","瑁呬慨","妗堜緥鏃堕棿","鎴愪氦鍛ㄦ湡","鍗曚环","鎬讳环","褰撳墠灞�","鎬绘ゼ灞�","鏈濆悜","鏉ユ簮"] def keys = [] for(def d : datas) { def commid= d['R'] @@ -605,7 +605,7 @@ class PocTest { def results = jsonObject.result for (def r : results) { def row = [] - row << "成交" + row << "鎴愪氦" row << r.districtName if(r.type){ row << r.type @@ -614,9 +614,9 @@ class PocTest { } if(r.room){ - def roomStr = r.room+"室" + def roomStr = r.room+"瀹�" if(r.hall){ - roomStr = roomStr +r.hall+"厅" + roomStr = roomStr +r.hall+"鍘�" } row << roomStr }else{ @@ -639,7 +639,7 @@ class PocTest { row << "" } - if(r.direction && !r.direction.contains("暂")){ + if(r.direction && !r.direction.contains("鏆�")){ row << r.direction }else{ row << "" @@ -653,11 +653,11 @@ class PocTest { } } } - ExcelUtils.write(output, rows, "成交案例") + ExcelUtils.write(output, rows, "鎴愪氦妗堜緥") } def addAuthor(def path){ - def authors = ["丁世菁","王文艳","董彦均","曹玉彦","姚静梦","付贵生","赵灵芝","沈健","许镕杰","徐鹤","穆良书","沈燕芳"] + def authors = ["涓佷笘鑿�","鐜嬫枃鑹�","钁e溅鍧�","鏇圭帀褰�","濮氶潤姊�","浠樿吹鐢�","璧电伒鑺�","娌堝仴","璁搁晻鏉�","寰愰工","绌嗚壇涔�","娌堢嚂鑺�"] def personTotal = authors.size() def avg = Math.ceil(total/personTotal) 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 index c067c7694..d3a5198de 100644 --- 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 @@ -25,7 +25,7 @@ class RuiFenPocTest { } def run(){ - def inputfile = "D:\\数据\\瑞丰\\房产信息-地址V3-1.xlsx" + def inputfile = "D:\\鏁版嵁\\鐟炰赴\\鎴夸骇淇℃伅-鍦板潃V3-1.xlsx" // match(inputfile) // addValue(inputfile) @@ -103,7 +103,7 @@ class RuiFenPocTest { def match(path) { ExcelUtils.multiThreadingModify(path, { row -> - def city = "绍兴" + def city = "缁嶅叴" if (row['B'] && !row["D"]) { def address = row['B'] println "[match] city:" + city + " address:" + address @@ -183,11 +183,11 @@ class RuiFenPocTest { map.month = r.gujiabds_clc_yrmo_val map.credit_value = r.gujia_bds_cfdc_dgr if(r.gujia_bds_clmtd == 1){ - map.calc_type = "人工估值" + map.calc_type = "浜哄伐浼板��" }else if(r.gujia_bds_clmtd == 2){ - map.calc_type = "样本计算" + map.calc_type = "鏍锋湰璁$畻" }else if(r.gujia_bds_clmtd == 3){ - map.calc_type = "神经网络" + map.calc_type = "绁炵粡缃戠粶" } }) return map diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/ThreeDESUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/ThreeDESUtils.groovy index 3d685a1a5..63d0322e0 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/ThreeDESUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/ThreeDESUtils.groovy @@ -9,60 +9,60 @@ import javax.crypto.spec.SecretKeySpec; import java.util.Base64; /** - * 3DES加密工具类 + * 3DES鍔犲瘑宸ュ叿绫� * @author qzz */ public class ThreeDESUtils { /** - * 加解密统一编码方式 + * 鍔犺В瀵嗙粺涓�缂栫爜鏂瑰紡 */ private final static String ENCODING = "utf-8"; /** - * 加解密方式 + * 鍔犺В瀵嗘柟寮� */ private final static String ALGORITHM = "DESede"; /** - *加密模式及填充方式 + *鍔犲瘑妯″紡鍙婂~鍏呮柟寮� */ private final static String PATTERN = "DESede/ECB/pkcs5padding"; /** - * 3DES加密 + * 3DES鍔犲瘑 * - * @param plainText 普通文本 - * @param sK 秘钥(24位密码) + * @param plainText 鏅�氭枃鏈� + * @param sK 绉橀挜锛�24浣嶅瘑鐮侊級 * @return * @throws Exception */ public static String encode(String plainText,String sK) throws Exception { SecretKey secretKey = new SecretKeySpec(sK.getBytes(ENCODING), ALGORITHM); - // 3DES加密采用pkcs5padding填充 + // 3DES鍔犲瘑閲囩敤pkcs5padding濉厖 Cipher cipher = Cipher.getInstance(PATTERN); - // 用密匙初始化Cipher对象 + // 鐢ㄥ瘑鍖欏垵濮嬪寲Cipher瀵硅薄 cipher.init(Cipher.ENCRYPT_MODE, secretKey); - // 执行加密操作 + // 鎵ц鍔犲瘑鎿嶄綔 byte[] encryptData = cipher.doFinal(plainText.getBytes(ENCODING)); return Base64.getEncoder().encodeToString(encryptData); } /** - * 3DES解密 + * 3DES瑙e瘑 * - * @param encryptText 加密文本 + * @param encryptText 鍔犲瘑鏂囨湰 * @return * @throws Exception */ public static String decode(String encryptText, String sK) throws Exception { SecretKey secretKey = new SecretKeySpec(sK.getBytes(ENCODING), ALGORITHM); - // 3DES加密采用pkcs5padding填充 + // 3DES鍔犲瘑閲囩敤pkcs5padding濉厖 Cipher cipher = Cipher.getInstance(PATTERN); - // 用密匙初始化Cipher对象 + // 鐢ㄥ瘑鍖欏垵濮嬪寲Cipher瀵硅薄 cipher.init(Cipher.DECRYPT_MODE, secretKey); - // 正式执行解密操作 + // 姝e紡鎵ц瑙e瘑鎿嶄綔 byte[] decryptData = cipher.doFinal(Base64.getDecoder().decode(encryptText)); return new String(decryptData, ENCODING); } @@ -70,7 +70,7 @@ public class ThreeDESUtils { public static void main(String[] args) throws Exception { def rets = [] - def datas = readTxt("D:\\数据\\民生\\抽样-住宅类(普通住宅、公寓).txt") + def datas = readTxt("D:\\鏁版嵁\\姘戠敓\\鎶芥牱-浣忓畢绫伙紙鏅�氫綇瀹呫�佸叕瀵擄級.txt") def index = 0 for(def d : datas){ index++ @@ -82,12 +82,12 @@ public class ThreeDESUtils { row << str.substring(0, str.indexOf(id)) rets << row } - ExcelUtils.write("D:\\数据\\民生\\民生银行测试数据.xlsx", rets, "抽样-住宅类(普通住宅、公寓)") + ExcelUtils.write("D:\\鏁版嵁\\姘戠敓\\姘戠敓閾惰娴嬭瘯鏁版嵁.xlsx", rets, "鎶芥牱-浣忓畢绫伙紙鏅�氫綇瀹呫�佸叕瀵擄級") -// ExcelUtils.multiThreadingModify("D:\\数据\\民生\\加密数据.xlsx", { row -> -// //加密 +// ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\姘戠敓\\鍔犲瘑鏁版嵁.xlsx", { row -> +// //鍔犲瘑 // String str = row['A'] -// //解密 +// //瑙e瘑 // row['B'] = (decode(str,"111036369260679051122113")); // }); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/clickhouse/SeawaterMongo2Clickhouse.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/clickhouse/SeawaterMongo2Clickhouse.groovy index 6c8460f9e..495dae463 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/clickhouse/SeawaterMongo2Clickhouse.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/clickhouse/SeawaterMongo2Clickhouse.groovy @@ -132,9 +132,9 @@ class SeawaterMongo2Clickhouse extends BaseBatch{ batchAddList = new LinkedList<>(); } - String sqlDB = "show databases";//查询数据库 - String sqlTab = "show tables";//查看表 - String sqlCount = "select count(*) count from ontime";//查询ontime数据量 + String sqlDB = "show databases";//鏌ヨ鏁版嵁搴� + String sqlTab = "show tables";//鏌ョ湅琛� + String sqlCount = "select count(*) count from ontime";//鏌ヨontime鏁版嵁閲� // dal.exeSql(sqlDB); // dal.exeSql(sqlTab); // dal.exeSql(sqlCount); @@ -295,7 +295,7 @@ class SeawaterMongo2Clickhouse extends BaseBatch{ long begin = System.currentTimeMillis(); results = statement.executeUpdate(sql); long end = System.currentTimeMillis(); - System.out.println("执行("+sql+")耗时:"+(end-begin)+"ms"); + System.out.println("鎵ц锛�"+sql+"锛夎�楁椂锛�"+(end-begin)+"ms"); } catch (Exception e) { e.printStackTrace(); }finally { @@ -325,7 +325,7 @@ class SeawaterMongo2Clickhouse extends BaseBatch{ long begin = System.currentTimeMillis(); results = statement.executeQuery(sql); long end = System.currentTimeMillis(); - System.out.println("执行("+sql+")耗时:"+(end-begin)+"ms"); + System.out.println("鎵ц锛�"+sql+"锛夎�楁椂锛�"+(end-begin)+"ms"); ResultSetMetaData rsmd = results.getMetaData(); List list = new ArrayList(); while(results.next()){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/cn8684/BusData8684FetchBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/cn8684/BusData8684FetchBatch.groovy index 596938c21..09ad0abb4 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/cn8684/BusData8684FetchBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/cn8684/BusData8684FetchBatch.groovy @@ -40,312 +40,312 @@ class BusData8684FetchBatch extends BaseBatch { private static int count = 0; public static def CITY_CONFIG = [ - /* '上海' : [domain:"shanghai", code:2], - '北京' : [domain:"beijing", code:6], - '广州' : [domain:"guangzhou", code:8], - '深圳' : [domain:"shenzhen", code:16], - '天津' : [domain:"tianjin", code:3], - '重庆' : [domain:"chongqing", code:17], - '成都' : [domain:"chengdu", code:11], - '武汉' : [domain:"wuhan", code:14], - '杭州' : [domain:"hangzhou", code:4], - '苏州' : [domain:"suzhou", code:15], - '南京' : [domain:"nanjing", code:1], - '长沙' : [domain:"changsha", code:52], - '西安' : [domain:"xian", code:5], - '沈阳' : [domain:"shenyang", code:13], - '厦门' : [domain:"xiamen", code:10], - '福州' : [domain:"fuzhou", code:53], - '宁波' : [domain:"ningbo", code:30], - '大连' : [domain:"dalian", code:9], - '三亚' : [domain:"sanya", code:327], - '郑州' : [domain:"zhengzhou", code:51], - '石家庄' : [domain:"shijiazhuang", code:46], - '青岛' : [domain:"qingdao", code:140], - '济南' : [domain:"jinan", code:50], - '太原' : [domain:"taiyuan", code:47], - '长春' : [domain:"changchun", code:21], - '哈尔滨' : [domain:"haerbin", code:18], - '合肥' : [domain:"hefei", code:19], - '南昌' : [domain:"nanchang", code:61], - '南宁' : [domain:"nanning", code:73], - '昆明' : [domain:"kunming", code:7], - '贵阳' : [domain:"guiyang", code:77], - '银川' : [domain:"yinchuan", code:72], - '无锡' : [domain:"wuxi", code:32], - '常州' : [domain:"changzhou", code:20], - '佛山' : [domain:"foshan", code:80], - '温州' : [domain:"wenzhou", code:39], - '西宁' : [domain:"xining", code:76], - '乌鲁木齐' : [domain:"wulumuqi", code:26], - '呼和浩特' : [domain:"huhehaote", code:48], - '东莞' : [domain:"dongguan", code:78], - '珠海' : [domain:"zhuhai", code:45], - '岳阳' : [domain:"yueyang", code:180], - '鞍山' : [domain:"anshan", code:102], - '保定' : [domain:"baoding", code:169], - '兰州' : [domain:"lanzhou", code:12], - '烟台' : [domain:"yantai", code:137], - '泉州' : [domain:"quanzhou", code:58], - '包头' : [domain:"baotou", code:285], - '齐齐哈尔' : [domain:"qiqihaer", code:28], - '大同' : [domain:"datong", code:205], - '扬州' : [domain:"yangzhou", code:31], - '绵阳' : [domain:"mianyang", code:108], - '威海' : [domain:"weihai", code:131], - '吉林' : [domain:"jilin", code:308], - '邯郸' : [domain:"handan", code:178], - '中山' : [domain:"zhongshan", code:79], - '湛江' : [domain:"zhanjiang", code:340], - '潍坊' : [domain:"weifang", code:136], - '秦皇岛' : [domain:"qinhuangdao", code:175], - '宜昌' : [domain:"yichang", code:114], - '嘉兴' : [domain:"jiaxing", code:24], - '大庆' : [domain:"daqing", code:320], - '徐州' : [domain:"xuzhou", code:27], - '株洲' : [domain:"zhuzhou", code:184], - '镇江' : [domain:"zhenjiang", code:33], - '赣州' : [domain:"ganzhou", code:70], - '芜湖' : [domain:"wuhu", code:151], - '南通' : [domain:"nantong", code:23], - '九江' : [domain:"jiujiang", code:63], - '泰州' : [domain:"taizhou", code:29], - '台州' : [domain:"taizhou2", code:42], - '洛阳' : [domain:"luoyang", code:163], - '湖州' : [domain:"huzhou", code:37], - '惠州' : [domain:"huizhou", code:81], - '绍兴' : [domain:"shaoxing", code:38], - '江门' : [domain:"jiangmen", code:82] - '海口' : [domain:"haikou", code:49], - '金华' : [domain:"jinhua", code:41], - '连云港' : [domain:"lianyungang", code:22], - '桂林' : [domain:"guilin", code:75], - '马鞍山' : [domain:"maanshan", code:25], - '柳州' : [domain:"liuzhou", code:333], - '淄博' : [domain:"zibo", code:190], - '盐城' : [domain:"yancheng", code:35], - '本溪' : [domain:"benxi", code:94], - '汕头' : [domain:"shantou", code:85], - '衡阳' : [domain:"hengyang", code:187], - '揭阳' : [domain:"jieyang", code:409], - '茂名' : [domain:"maoming", code:83], - '牡丹江' : [domain:"mudanjiang", code:319], - '舟山' : [domain:"zhoushan", code:40], - '平顶山' : [domain:"pingdingshan", code:160], - '安阳' : [domain:"anyang", code:159], - '许昌' : [domain:"xuchang", code:167], - '四平' : [domain:"siping", code:310], - '淮南' : [domain:"huainan", code:149], - '淮安' : [domain:"huaian", code:34], - '赤峰' : [domain:"chifeng", code:287], - '佳木斯' : [domain:"jiamusi", code:322], - '南阳' : [domain:"nanyang", code:158], - '临沂' : [domain:"linyi", code:130], - '临汾' : [domain:"linfen", code:365], - '榆林' : [domain:"yulin", code:125], - '咸阳' : [domain:"xianyang", code:120], - '唐山' : [domain:"tangshan", code:170], - '宜宾' : [domain:"yibin", code:104], - '自贡' : [domain:"zigong", code:109], - '廊坊' : [domain:"langfang", code:171], - '攀枝花' : [domain:"panzhihua", code:193], - '延安' : [domain:"yanan", code:124], - '襄阳' : [domain:"xiangfan", code:118], - '丽江' : [domain:"lijiang", code:213], - '大理' : [domain:"dali", code:214], - '六盘水' : [domain:"liupanshui", code:195], - '湘潭' : [domain:"xiangtan", code:225], - '清远' : [domain:"qingyuan", code:341], - '衢州' : [domain:"quzhou", code:43], - '宿迁' : [domain:"suqian", code:36], - '北海' : [domain:"beihai", code:334], - '莆田' : [domain:"putian", code:55], - '玉林' : [domain:"yulin2", code:335], - '张家界' : [domain:"zhangjiajie", code:182], - '云浮' : [domain:"yunfu", code:423], - '玉溪' : [domain:"yuxi", code:217], - '肇庆' : [domain:"zhaoqing", code:88], - '新乡' : [domain:"xinxiang", code:162], - '营口' : [domain:"yingkou", code:96], - '潮州' : [domain:"chaozhou", code:87], - '黄石' : [domain:"huangshi", code:314], - '焦作' : [domain:"jiaozuo", code:166], - '盘锦' : [domain:"panjin", code:95], - '梅州' : [domain:"meizhou", code:84], - '曲靖' : [domain:"qujing", code:215], - '阳江' : [domain:"yangjiang", code:89], - '韶关' : [domain:"shaoguan", code:90], - '河源' : [domain:"heyuan", code:86], - '吐鲁番' : [domain:"tulufan", code:199], - '哈密' : [domain:"hami", code:200], - '和田' : [domain:"hetian", code:250], - '昌吉' : [domain:"changji", code:252], - '黔南' : [domain:"qiannan", code:387], - '伊犁' : [domain:"yili", code:197], - '双鸭山' : [domain:"shuangyashan", code:323], - '日喀则' : [domain:"rikaze", code:256], - '山南' : [domain:"shannan", code:404] - '遵义' : [domain:"zunyi", code:194], - '武威' : [domain:"wuwei", code:347], - '铁岭' : [domain:"tieling", code:99], - '天水' : [domain:"tianshui", code:346], - '泰安' : [domain:"taian", code:134], - '黄冈' : [domain:"huanggang", code:119], - '广元' : [domain:"guangyuan", code:105], - '阜阳' : [domain:"fuyang", code:154], - '定西' : [domain:"dingxi", code:398], - '辽源西' : [domain:"liaoyuan", code:312], - '丽水' : [domain:"lishui", code:44], - '乐山' : [domain:"leshan", code:258], - '菏泽' : [domain:"heze", code:139], - '锦州' : [domain:"jinzhou", code:100], - '汉中' : [domain:"hanzhong", code:126], - '黄山' : [domain:"huangshan", code:155], - '白山' : [domain:"baishan", code:311], - '安顺' : [domain:"anshun", code:196], - '安康' : [domain:"ankang", code:122], - '绥化' : [domain:"suihua", code:437], - '钦州' : [domain:"qinzhou", code:336], - '鄂尔多斯' : [domain:"eerduosi", code:370], - '梧州' : [domain:"wuzhou", code:219], - '百色' : [domain:"baise", code:424], - '鸡西' : [domain:"jixi", code:383], - '白城' : [domain:"baicheng", code:376], - '朝阳' : [domain:"chaoyang", code:93], - '亳州' : [domain:"bozhou", code:224], - '安庆' : [domain:"anqing", code:143], - '六安' : [domain:"liuan", code:142], - '宁德' : [domain:"ningde", code:54], - '临沧' : [domain:"lincang", code:212], - '拉萨' : [domain:"lasa", code:74], - '南充' : [domain:"nanchong", code:103], - '泸州' : [domain:"luzhou", code:107], - '资阳' : [domain:"ziyang", code:440], - '乌海' : [domain:"wuhai", code:366], - '开封' : [domain:"kaifeng", code:161], - '固原' : [domain:"guyuan", code:284], - '朔州' : [domain:"shuozhou", code:208], - '平凉' : [domain:"pingliang", code:351], - '白银' : [domain:"baiyin", code:349], - '吉安' : [domain:"jian", code:64], - '通化' : [domain:"tonghua", code:422], - '景德镇' : [domain:"jingdezhen", code:68], - '鹤岗' : [domain:"hegang", code:434], - '铜仁' : [domain:"tongren", code:386], - '南平' : [domain:"nanping", code:57], - '贵港' : [domain:"guigang", code:337], - '商洛' : [domain:"shangluo", code:121], - '吴忠' : [domain:"wuzhong", code:408], - '晋城' : [domain:"jincheng", code:207], - '阿克苏' : [domain:"akesu", code:203], - '黑河' : [domain:"heihe", code:435], - '阜新' : [domain:"fuxin", code:101], - '抚顺' : [domain:"fushun", code:92], - '葫芦岛' : [domain:"huludao", code:97], - '张家口' : [domain:"zhangjiakou", code:172], - '衡水' : [domain:"hengshui", code:176], - '邢台' : [domain:"xingtai", code:177], - '济宁' : [domain:"jining", code:135], - '日照' : [domain:"rizhao", code:141], - '聊城' : [domain:"liaocheng", code:138], - '滨州' : [domain:"binzhou", code:268], - '淮北' : [domain:"huaibei", code:148], - '宣城' : [domain:"xuancheng", code:144], - '三明' : [domain:"sanming", code:56], - '宿州' : [domain:"suzhou2", code:145], - '龙岩' : [domain:"longyan", code:60], - '保山' : [domain:"baoshan", code:245], - '池州' : [domain:"chizhou", code:147], - '乌兰察布' : [domain:"wulanchabu", code:414], - '内江' : [domain:"neijiang", code:220], - '达州' : [domain:"dazhou", code:111], - '贺州' : [domain:"hezhou", code:427], - '巴中' : [domain:"bazhong", code:261], - '昭通' : [domain:"zhaotong", code:246], - '怀化' : [domain:"huaihua", code:183], - '鄂州' : [domain:"ezhou", code:494], - '伊春' : [domain:"yichun2", code:321], - '毕节' : [domain:"bijie", code:428], - '十堰' : [domain:"shiyan", code:113], - '遂宁' : [domain:"suining", code:259], - '漯河' : [domain:"luohe", code:164], - '松原' : [domain:"songyuan", code:377], - '眉山' : [domain:"meishan", code:260], - '鹤壁' : [domain:"hebi", code:168], - '忻州' : [domain:"xinzhou", code:206], - '郴州' : [domain:"chenzhou", code:189], - '晋中' : [domain:"jinzhong", code:265], - '益阳' : [domain:"yiyang", code:186], - '辽阳' : [domain:"liaoyang", code:98], - '宝鸡' : [domain:"baoji", code:123], - '酒泉' : [domain:"jiuquan", code:350], - '张掖' : [domain:"zhangye", code:348] - '随州' : [domain:"suizhou", code:317], - '承德' : [domain:"chengde", code:173], - '鹰潭' : [domain:"yingtan", code:71], - '新余' : [domain:"xinyu", code:67], - '孝感' : [domain:"xiaogan", code:438], - '枣庄' : [domain:"zaozhuang", code:133], - '周口' : [domain:"zhoukou", code:324], - '濮阳' : [domain:"puyang", code:165], - '莱芜' : [domain:"laiwu", code:269], - '阳泉' : [domain:"yangquan", code:211], - '运城' : [domain:"yuncheng", code:209], - '蚌埠' : [domain:"bengbu", code:152], - '渭南' : [domain:"weinan", code:127], - '滁州' : [domain:"chuzhou", code:150], - '铜陵' : [domain:"tongling", code:153], - '嘉峪关' : [domain:"jiayuguan", code:400], - '漳州' : [domain:"zhangzhou", code:59], - '庆阳' : [domain:"qingyang", code:352], - '汕尾' : [domain:"shanwei", code:416], - '上饶' : [domain:"shangrao", code:62], - '沧州' : [domain:"cangzhou", code:174], - '宜春' : [domain:"yichun", code:65], - '德阳' : [domain:"deyang", code:106], - '东营' : [domain:"dongying", code:129], - '广安' : [domain:"guangan", code:257], - '德州' : [domain:"dezhou", code:132], - '雅安' : [domain:"yaan", code:112], - '永州' : [domain:"yongzhou", code:185], - '娄底' : [domain:"loudi", code:179], - '荆州' : [domain:"jingzhou", code:116], - '咸宁' : [domain:"xianning", code:315], - '三门峡' : [domain:"sanmenxia", code:156], - '商丘' : [domain:"shangqiu", code:218], - '长治' : [domain:"changzhi", code:210], - '吕梁' : [domain:"lvliang", code:204], - '金昌' : [domain:"jinchang", code:401], - '陇南' : [domain:"longnan", code:510], - '萍乡' : [domain:"pingxiang", code:69], - '抚州' : [domain:"fuzhou2", code:66], - '通辽' : [domain:"tongliao", code:288], - '楚雄' : [domain:"chuxiong", code:216], - '临夏' : [domain:"linxia", code:391], - '湘西' : [domain:"xiangxi", code:439], - '延边' : [domain:"yanbian", code:378], - '巴彦淖尔' : [domain:"bayannaoer", code:420], - '来宾' : [domain:"laibin", code:338], - '信阳' : [domain:"xinyang", code:157], - '克拉玛依' : [domain:"kelamayi", code:198], - '河池' : [domain:"hechi", code:425], - '邵阳' : [domain:"shaoyang", code:188], - '荆门' : [domain:"jingmen", code:117], - '防城港' : [domain:"fangchenggang", code:389], - '驻马店' : [domain:"zhumadian", code:325], - '铜川' : [domain:"tongchuan", code:128], - '崇左' : [domain:"chongzuo", code:339], - '呼伦贝尔' : [domain:"hulunbeier", code:415], - '喀什' : [domain:"kashen", code:251], - '恩施' : [domain:"enshi", code:115], - '塔城' : [domain:"tacheng", code:201], - '丹东' : [domain:"dandong", code:91], - '石河子' : [domain:"shihezi", code:202], - '济源' : [domain:"jiyuan", code:388], - '仙桃' : [domain:"xiantao", code:318], - '潜江' : [domain:"qianjiang", code:492], - '天门' : [domain:"tianmen", code:381], - '琼海' : [domain:"qionghai", code:328]*/ + /* '涓婃捣' : [domain:"shanghai", code:2], + '鍖椾含' : [domain:"beijing", code:6], + '骞垮窞' : [domain:"guangzhou", code:8], + '娣卞湷' : [domain:"shenzhen", code:16], + '澶╂触' : [domain:"tianjin", code:3], + '閲嶅簡' : [domain:"chongqing", code:17], + '鎴愰兘' : [domain:"chengdu", code:11], + '姝︽眽' : [domain:"wuhan", code:14], + '鏉窞' : [domain:"hangzhou", code:4], + '鑻忓窞' : [domain:"suzhou", code:15], + '鍗椾含' : [domain:"nanjing", code:1], + '闀挎矙' : [domain:"changsha", code:52], + '瑗垮畨' : [domain:"xian", code:5], + '娌堥槼' : [domain:"shenyang", code:13], + '鍘﹂棬' : [domain:"xiamen", code:10], + '绂忓窞' : [domain:"fuzhou", code:53], + '瀹佹尝' : [domain:"ningbo", code:30], + '澶ц繛' : [domain:"dalian", code:9], + '涓変簹' : [domain:"sanya", code:327], + '閮戝窞' : [domain:"zhengzhou", code:51], + '鐭冲搴�' : [domain:"shijiazhuang", code:46], + '闈掑矝' : [domain:"qingdao", code:140], + '娴庡崡' : [domain:"jinan", code:50], + '澶師' : [domain:"taiyuan", code:47], + '闀挎槬' : [domain:"changchun", code:21], + '鍝堝皵婊�' : [domain:"haerbin", code:18], + '鍚堣偉' : [domain:"hefei", code:19], + '鍗楁槍' : [domain:"nanchang", code:61], + '鍗楀畞' : [domain:"nanning", code:73], + '鏄嗘槑' : [domain:"kunming", code:7], + '璐甸槼' : [domain:"guiyang", code:77], + '閾跺窛' : [domain:"yinchuan", code:72], + '鏃犻敗' : [domain:"wuxi", code:32], + '甯稿窞' : [domain:"changzhou", code:20], + '浣涘北' : [domain:"foshan", code:80], + '娓╁窞' : [domain:"wenzhou", code:39], + '瑗垮畞' : [domain:"xining", code:76], + '涔岄瞾鏈ㄩ綈' : [domain:"wulumuqi", code:26], + '鍛煎拰娴╃壒' : [domain:"huhehaote", code:48], + '涓滆帪' : [domain:"dongguan", code:78], + '鐝犳捣' : [domain:"zhuhai", code:45], + '宀抽槼' : [domain:"yueyang", code:180], + '闉嶅北' : [domain:"anshan", code:102], + '淇濆畾' : [domain:"baoding", code:169], + '鍏板窞' : [domain:"lanzhou", code:12], + '鐑熷彴' : [domain:"yantai", code:137], + '娉夊窞' : [domain:"quanzhou", code:58], + '鍖呭ご' : [domain:"baotou", code:285], + '榻愰綈鍝堝皵' : [domain:"qiqihaer", code:28], + '澶у悓' : [domain:"datong", code:205], + '鎵窞' : [domain:"yangzhou", code:31], + '缁甸槼' : [domain:"mianyang", code:108], + '濞佹捣' : [domain:"weihai", code:131], + '鍚夋灄' : [domain:"jilin", code:308], + '閭兏' : [domain:"handan", code:178], + '涓北' : [domain:"zhongshan", code:79], + '婀涙睙' : [domain:"zhanjiang", code:340], + '娼嶅潑' : [domain:"weifang", code:136], + '绉︾殗宀�' : [domain:"qinhuangdao", code:175], + '瀹滄槍' : [domain:"yichang", code:114], + '鍢夊叴' : [domain:"jiaxing", code:24], + '澶у簡' : [domain:"daqing", code:320], + '寰愬窞' : [domain:"xuzhou", code:27], + '鏍床' : [domain:"zhuzhou", code:184], + '闀囨睙' : [domain:"zhenjiang", code:33], + '璧e窞' : [domain:"ganzhou", code:70], + '鑺滄箹' : [domain:"wuhu", code:151], + '鍗楅��' : [domain:"nantong", code:23], + '涔濇睙' : [domain:"jiujiang", code:63], + '娉板窞' : [domain:"taizhou", code:29], + '鍙板窞' : [domain:"taizhou2", code:42], + '娲涢槼' : [domain:"luoyang", code:163], + '婀栧窞' : [domain:"huzhou", code:37], + '鎯犲窞' : [domain:"huizhou", code:81], + '缁嶅叴' : [domain:"shaoxing", code:38], + '姹熼棬' : [domain:"jiangmen", code:82] + '娴峰彛' : [domain:"haikou", code:49], + '閲戝崕' : [domain:"jinhua", code:41], + '杩炰簯娓�' : [domain:"lianyungang", code:22], + '妗傛灄' : [domain:"guilin", code:75], + '椹瀺灞�' : [domain:"maanshan", code:25], + '鏌冲窞' : [domain:"liuzhou", code:333], + '娣勫崥' : [domain:"zibo", code:190], + '鐩愬煄' : [domain:"yancheng", code:35], + '鏈邯' : [domain:"benxi", code:94], + '姹曞ご' : [domain:"shantou", code:85], + '琛¢槼' : [domain:"hengyang", code:187], + '鎻槼' : [domain:"jieyang", code:409], + '鑼傚悕' : [domain:"maoming", code:83], + '鐗′腹姹�' : [domain:"mudanjiang", code:319], + '鑸熷北' : [domain:"zhoushan", code:40], + '骞抽《灞�' : [domain:"pingdingshan", code:160], + '瀹夐槼' : [domain:"anyang", code:159], + '璁告槍' : [domain:"xuchang", code:167], + '鍥涘钩' : [domain:"siping", code:310], + '娣崡' : [domain:"huainan", code:149], + '娣畨' : [domain:"huaian", code:34], + '璧ゅ嘲' : [domain:"chifeng", code:287], + '浣虫湪鏂�' : [domain:"jiamusi", code:322], + '鍗楅槼' : [domain:"nanyang", code:158], + '涓存矀' : [domain:"linyi", code:130], + '涓存本' : [domain:"linfen", code:365], + '姒嗘灄' : [domain:"yulin", code:125], + '鍜搁槼' : [domain:"xianyang", code:120], + '鍞愬北' : [domain:"tangshan", code:170], + '瀹滃' : [domain:"yibin", code:104], + '鑷础' : [domain:"zigong", code:109], + '寤婂潑' : [domain:"langfang", code:171], + '鏀�鏋濊姳' : [domain:"panzhihua", code:193], + '寤跺畨' : [domain:"yanan", code:124], + '瑗勯槼' : [domain:"xiangfan", code:118], + '涓芥睙' : [domain:"lijiang", code:213], + '澶х悊' : [domain:"dali", code:214], + '鍏洏姘�' : [domain:"liupanshui", code:195], + '婀樻江' : [domain:"xiangtan", code:225], + '娓呰繙' : [domain:"qingyuan", code:341], + '琛㈠窞' : [domain:"quzhou", code:43], + '瀹胯縼' : [domain:"suqian", code:36], + '鍖楁捣' : [domain:"beihai", code:334], + '鑾嗙敯' : [domain:"putian", code:55], + '鐜夋灄' : [domain:"yulin2", code:335], + '寮犲鐣�' : [domain:"zhangjiajie", code:182], + '浜戞诞' : [domain:"yunfu", code:423], + '鐜夋邯' : [domain:"yuxi", code:217], + '鑲囧簡' : [domain:"zhaoqing", code:88], + '鏂颁埂' : [domain:"xinxiang", code:162], + '钀ュ彛' : [domain:"yingkou", code:96], + '娼窞' : [domain:"chaozhou", code:87], + '榛勭煶' : [domain:"huangshi", code:314], + '鐒︿綔' : [domain:"jiaozuo", code:166], + '鐩橀敠' : [domain:"panjin", code:95], + '姊呭窞' : [domain:"meizhou", code:84], + '鏇查潠' : [domain:"qujing", code:215], + '闃虫睙' : [domain:"yangjiang", code:89], + '闊跺叧' : [domain:"shaoguan", code:90], + '娌虫簮' : [domain:"heyuan", code:86], + '鍚愰瞾鐣�' : [domain:"tulufan", code:199], + '鍝堝瘑' : [domain:"hami", code:200], + '鍜岀敯' : [domain:"hetian", code:250], + '鏄屽悏' : [domain:"changji", code:252], + '榛斿崡' : [domain:"qiannan", code:387], + '浼婄妬' : [domain:"yili", code:197], + '鍙岄腑灞�' : [domain:"shuangyashan", code:323], + '鏃ュ杸鍒�' : [domain:"rikaze", code:256], + '灞卞崡' : [domain:"shannan", code:404] + '閬典箟' : [domain:"zunyi", code:194], + '姝﹀▉' : [domain:"wuwei", code:347], + '閾佸箔' : [domain:"tieling", code:99], + '澶╂按' : [domain:"tianshui", code:346], + '娉板畨' : [domain:"taian", code:134], + '榛勫唸' : [domain:"huanggang", code:119], + '骞垮厓' : [domain:"guangyuan", code:105], + '闃滈槼' : [domain:"fuyang", code:154], + '瀹氳タ' : [domain:"dingxi", code:398], + '杈芥簮瑗�' : [domain:"liaoyuan", code:312], + '涓芥按' : [domain:"lishui", code:44], + '涔愬北' : [domain:"leshan", code:258], + '鑿忔辰' : [domain:"heze", code:139], + '閿﹀窞' : [domain:"jinzhou", code:100], + '姹変腑' : [domain:"hanzhong", code:126], + '榛勫北' : [domain:"huangshan", code:155], + '鐧藉北' : [domain:"baishan", code:311], + '瀹夐『' : [domain:"anshun", code:196], + '瀹夊悍' : [domain:"ankang", code:122], + '缁ュ寲' : [domain:"suihua", code:437], + '閽﹀窞' : [domain:"qinzhou", code:336], + '閯傚皵澶氭柉' : [domain:"eerduosi", code:370], + '姊у窞' : [domain:"wuzhou", code:219], + '鐧捐壊' : [domain:"baise", code:424], + '楦¤タ' : [domain:"jixi", code:383], + '鐧藉煄' : [domain:"baicheng", code:376], + '鏈濋槼' : [domain:"chaoyang", code:93], + '浜冲窞' : [domain:"bozhou", code:224], + '瀹夊簡' : [domain:"anqing", code:143], + '鍏畨' : [domain:"liuan", code:142], + '瀹佸痉' : [domain:"ningde", code:54], + '涓存钵' : [domain:"lincang", code:212], + '鎷夎惃' : [domain:"lasa", code:74], + '鍗楀厖' : [domain:"nanchong", code:103], + '娉稿窞' : [domain:"luzhou", code:107], + '璧勯槼' : [domain:"ziyang", code:440], + '涔屾捣' : [domain:"wuhai", code:366], + '寮�灏�' : [domain:"kaifeng", code:161], + '鍥哄師' : [domain:"guyuan", code:284], + '鏈斿窞' : [domain:"shuozhou", code:208], + '骞冲噳' : [domain:"pingliang", code:351], + '鐧介摱' : [domain:"baiyin", code:349], + '鍚夊畨' : [domain:"jian", code:64], + '閫氬寲' : [domain:"tonghua", code:422], + '鏅痉闀�' : [domain:"jingdezhen", code:68], + '楣ゅ矖' : [domain:"hegang", code:434], + '閾滀粊' : [domain:"tongren", code:386], + '鍗楀钩' : [domain:"nanping", code:57], + '璐垫腐' : [domain:"guigang", code:337], + '鍟嗘礇' : [domain:"shangluo", code:121], + '鍚村繝' : [domain:"wuzhong", code:408], + '鏅嬪煄' : [domain:"jincheng", code:207], + '闃垮厠鑻�' : [domain:"akesu", code:203], + '榛戞渤' : [domain:"heihe", code:435], + '闃滄柊' : [domain:"fuxin", code:101], + '鎶氶『' : [domain:"fushun", code:92], + '钁姦宀�' : [domain:"huludao", code:97], + '寮犲鍙�' : [domain:"zhangjiakou", code:172], + '琛℃按' : [domain:"hengshui", code:176], + '閭㈠彴' : [domain:"xingtai", code:177], + '娴庡畞' : [domain:"jining", code:135], + '鏃ョ収' : [domain:"rizhao", code:141], + '鑱婂煄' : [domain:"liaocheng", code:138], + '婊ㄥ窞' : [domain:"binzhou", code:268], + '娣寳' : [domain:"huaibei", code:148], + '瀹e煄' : [domain:"xuancheng", code:144], + '涓夋槑' : [domain:"sanming", code:56], + '瀹垮窞' : [domain:"suzhou2", code:145], + '榫欏博' : [domain:"longyan", code:60], + '淇濆北' : [domain:"baoshan", code:245], + '姹犲窞' : [domain:"chizhou", code:147], + '涔屽叞瀵熷竷' : [domain:"wulanchabu", code:414], + '鍐呮睙' : [domain:"neijiang", code:220], + '杈惧窞' : [domain:"dazhou", code:111], + '璐哄窞' : [domain:"hezhou", code:427], + '宸翠腑' : [domain:"bazhong", code:261], + '鏄��' : [domain:"zhaotong", code:246], + '鎬�鍖�' : [domain:"huaihua", code:183], + '閯傚窞' : [domain:"ezhou", code:494], + '浼婃槬' : [domain:"yichun2", code:321], + '姣曡妭' : [domain:"bijie", code:428], + '鍗佸牥' : [domain:"shiyan", code:113], + '閬傚畞' : [domain:"suining", code:259], + '婕渤' : [domain:"luohe", code:164], + '鏉惧師' : [domain:"songyuan", code:377], + '鐪夊北' : [domain:"meishan", code:260], + '楣ゅ' : [domain:"hebi", code:168], + '蹇诲窞' : [domain:"xinzhou", code:206], + '閮村窞' : [domain:"chenzhou", code:189], + '鏅嬩腑' : [domain:"jinzhong", code:265], + '鐩婇槼' : [domain:"yiyang", code:186], + '杈介槼' : [domain:"liaoyang", code:98], + '瀹濋浮' : [domain:"baoji", code:123], + '閰掓硥' : [domain:"jiuquan", code:350], + '寮犳帠' : [domain:"zhangye", code:348] + '闅忓窞' : [domain:"suizhou", code:317], + '鎵垮痉' : [domain:"chengde", code:173], + '楣版江' : [domain:"yingtan", code:71], + '鏂颁綑' : [domain:"xinyu", code:67], + '瀛濇劅' : [domain:"xiaogan", code:438], + '鏋e簞' : [domain:"zaozhuang", code:133], + '鍛ㄥ彛' : [domain:"zhoukou", code:324], + '婵槼' : [domain:"puyang", code:165], + '鑾辫姕' : [domain:"laiwu", code:269], + '闃虫硥' : [domain:"yangquan", code:211], + '杩愬煄' : [domain:"yuncheng", code:209], + '铓屽煚' : [domain:"bengbu", code:152], + '娓崡' : [domain:"weinan", code:127], + '婊佸窞' : [domain:"chuzhou", code:150], + '閾滈櫟' : [domain:"tongling", code:153], + '鍢夊唱鍏�' : [domain:"jiayuguan", code:400], + '婕冲窞' : [domain:"zhangzhou", code:59], + '搴嗛槼' : [domain:"qingyang", code:352], + '姹曞熬' : [domain:"shanwei", code:416], + '涓婇ザ' : [domain:"shangrao", code:62], + '娌у窞' : [domain:"cangzhou", code:174], + '瀹滄槬' : [domain:"yichun", code:65], + '寰烽槼' : [domain:"deyang", code:106], + '涓滆惀' : [domain:"dongying", code:129], + '骞垮畨' : [domain:"guangan", code:257], + '寰峰窞' : [domain:"dezhou", code:132], + '闆呭畨' : [domain:"yaan", code:112], + '姘稿窞' : [domain:"yongzhou", code:185], + '濞勫簳' : [domain:"loudi", code:179], + '鑽嗗窞' : [domain:"jingzhou", code:116], + '鍜稿畞' : [domain:"xianning", code:315], + '涓夐棬宄�' : [domain:"sanmenxia", code:156], + '鍟嗕笜' : [domain:"shangqiu", code:218], + '闀挎不' : [domain:"changzhi", code:210], + '鍚曟' : [domain:"lvliang", code:204], + '閲戞槍' : [domain:"jinchang", code:401], + '闄囧崡' : [domain:"longnan", code:510], + '钀嶄埂' : [domain:"pingxiang", code:69], + '鎶氬窞' : [domain:"fuzhou2", code:66], + '閫氳窘' : [domain:"tongliao", code:288], + '妤氶泟' : [domain:"chuxiong", code:216], + '涓村' : [domain:"linxia", code:391], + '婀樿タ' : [domain:"xiangxi", code:439], + '寤惰竟' : [domain:"yanbian", code:378], + '宸村溅娣栧皵' : [domain:"bayannaoer", code:420], + '鏉ュ' : [domain:"laibin", code:338], + '淇¢槼' : [domain:"xinyang", code:157], + '鍏嬫媺鐜涗緷' : [domain:"kelamayi", code:198], + '娌虫睜' : [domain:"hechi", code:425], + '閭甸槼' : [domain:"shaoyang", code:188], + '鑽嗛棬' : [domain:"jingmen", code:117], + '闃插煄娓�' : [domain:"fangchenggang", code:389], + '椹婚┈搴�' : [domain:"zhumadian", code:325], + '閾滃窛' : [domain:"tongchuan", code:128], + '宕囧乏' : [domain:"chongzuo", code:339], + '鍛间鸡璐濆皵' : [domain:"hulunbeier", code:415], + '鍠�浠�' : [domain:"kashen", code:251], + '鎭╂柦' : [domain:"enshi", code:115], + '濉斿煄' : [domain:"tacheng", code:201], + '涓逛笢' : [domain:"dandong", code:91], + '鐭虫渤瀛�' : [domain:"shihezi", code:202], + '娴庢簮' : [domain:"jiyuan", code:388], + '浠欐' : [domain:"xiantao", code:318], + '娼滄睙' : [domain:"qianjiang", code:492], + '澶╅棬' : [domain:"tianmen", code:381], + '鐞兼捣' : [domain:"qionghai", code:328]*/ ] @@ -363,15 +363,15 @@ class BusData8684FetchBatch extends BaseBatch { long version = Long.parseLong(DateUtil.formatToTightYYYYMMDD(new Date())) String cityDomain = config['domain'] String cityCode = config['code'] - //获取8684的网页数据 + //鑾峰彇8684鐨勭綉椤垫暟鎹� doFetchAndSaveBusData(city, cityDomain, cityCode) - //解析数据 + //瑙f瀽鏁版嵁 doAnalytisBusData(city) } } /** - * 解析数据 + * 瑙f瀽鏁版嵁 * @param city */ private void doAnalytisBusData(String city) { @@ -402,7 +402,7 @@ class BusData8684FetchBatch extends BaseBatch { } /** - * 获取数据 + * 鑾峰彇鏁版嵁 * * @param city * @param cityDomain @@ -432,7 +432,7 @@ class BusData8684FetchBatch extends BaseBatch { DATA_COLL.remove(new BasicDBObject("city", city).append("version", new BasicDBObject('$lt', version))) } - public static final def LINE_TYPES = ["去程", "回程", "环线", "环行"] as String[] + public static final def LINE_TYPES = ["鍘荤▼", "鍥炵▼", "鐜嚎", "鐜"] as String[] private DBObject saveBusLine(String city, String lineidX,String datas) { String[] varsArray = StringUtils.substringsBetween(datas, "\"", "\""); DBObject busLine = null; @@ -480,7 +480,7 @@ class BusData8684FetchBatch extends BaseBatch { for (int i = 7; i < list.size(); i++) { String[] details = list[i].split("\\|") if (details.length != 3) { - println "站点数据结构变化。。。" + println "绔欑偣鏁版嵁缁撴瀯鍙樺寲銆傘�傘��" // System.exit(0) } else { double[] lngLat = decryptLatLng(details[0]) @@ -489,7 +489,7 @@ class BusData8684FetchBatch extends BaseBatch { busStation.put("city", city) busStation.put("line_id", lineidX) busStation.put("station", stationName) - busStation.put("kind", roundType)//回程\去程 + busStation.put("kind", roundType)//鍥炵▼\鍘荤▼ busStation.put("lng", lngLat[0]) busStation.put("lat", lngLat[1]) busStation.put("c_date", new Date()) @@ -513,7 +513,7 @@ class BusData8684FetchBatch extends BaseBatch { Document document = Jsoup.parse(content); - //获取起始页的所有车次 + //鑾峰彇璧峰椤电殑鎵�鏈夎溅娆� Elements elements = JQueryUtils.select("#con_site_1 a", document) if(elements != null) { for (int i = 0; i < elements.size(); i++) { @@ -523,15 +523,15 @@ class BusData8684FetchBatch extends BaseBatch { } } - //线路分类列表页(限制在10个分类以下,因为后面的分类列表不是很重要) + //绾胯矾鍒嗙被鍒楄〃椤�(闄愬埗鍦�10涓垎绫讳互涓嬶紝鍥犱负鍚庨潰鐨勫垎绫诲垪琛ㄤ笉鏄緢閲嶈) Elements linesElements = JQueryUtils.select(".stie_nav_name a", document) - //第一个作为起始页已经获取过 + //绗竴涓綔涓鸿捣濮嬮〉宸茬粡鑾峰彇杩� for (int i = 1; i < linesElements.size() && i < 10; i++) { Element element = linesElements.get(i) String subContent = getContent("http://${cityDomain}.8684.cn" + element.attr("href")) if(subContent != null) { Document subDocument = Jsoup.parse(subContent); - //获取起始页的所有车次 + //鑾峰彇璧峰椤电殑鎵�鏈夎溅娆� Elements subElements = JQueryUtils.select("#con_site_1 a", subDocument) if(subElements != null) { for (int j = 0; j < subElements.size(); j++) { @@ -559,13 +559,13 @@ class BusData8684FetchBatch extends BaseBatch { try { URL url = new URL(seedUrl); HttpURLConnection conn = (HttpURLConnection)url.openConnection(); - //设置超时间为3秒 + //璁剧疆瓒呮椂闂翠负3绉� conn.setConnectTimeout(6*1000); - //防止屏蔽程序抓取而返回403错误 + //闃叉灞忚斀绋嬪簭鎶撳彇鑰岃繑鍥�403閿欒 conn.setRequestProperty("User-Agent", "Mozilla/4.0 (compatible; MSIE 5.0; Windows NT; DigExt)"); - //得到输入流 + //寰楀埌杈撳叆娴� InputStream inputStream = conn.getInputStream(); - //获取自己数组 + //鑾峰彇鑷繁鏁扮粍 content = new String(IOUtils.toByteArray(inputStream), "UTF-8") break; }catch (Exception e) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/cnAnalyzer/CnDictionary.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/cnAnalyzer/CnDictionary.groovy index f9bc6004a..a1e1b6661 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/cnAnalyzer/CnDictionary.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/cnAnalyzer/CnDictionary.groovy @@ -14,7 +14,7 @@ import org.slf4j.Logger import org.slf4j.LoggerFactory /** - * 房价网词典 + * 鎴夸环缃戣瘝鍏� * * @author duxiaoyu * @@ -25,7 +25,7 @@ public class CnDictionary { private static CnDictionary singleton = null; /** - * 得到实例之前应该先调用init方法 + * 寰楀埌瀹炰緥涔嬪墠搴旇鍏堣皟鐢╥nit鏂规硶 * * @return * @throws Exception @@ -41,9 +41,9 @@ public class CnDictionary { } /** - * 初始化 + * 鍒濆鍖� *

- * 默认会从fangjia.dictionary中读取 + * 榛樿浼氫粠fangjia.dictionary涓鍙� *

* * @throws Exception @@ -60,10 +60,10 @@ public class CnDictionary { } /** - * 以词典文件初始化 + * 浠ヨ瘝鍏告枃浠跺垵濮嬪寲 * * @param dictionaryPath - * 指定词典位置 + * 鎸囧畾璇嶅吀浣嶇疆 */ public static void init(String dictionaryPath) { if (singleton == null) { @@ -201,7 +201,7 @@ public class CnDictionary { } /** - * 词语类型匹配 默认多类型匹配 + * 璇嶈绫诲瀷鍖归厤 榛樿澶氱被鍨嬪尮閰� * * @param keyword * @return @@ -211,7 +211,7 @@ public class CnDictionary { } /** - * 词语类型匹配 + * 璇嶈绫诲瀷鍖归厤 * * @param keyword * @param mutiMatch diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/cnAnalyzer/CnTokenizer.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/cnAnalyzer/CnTokenizer.groovy index b51818f3a..9591ca7d3 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/cnAnalyzer/CnTokenizer.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/cnAnalyzer/CnTokenizer.groovy @@ -20,7 +20,7 @@ import com.goojia.solr.ganalytics.IKSegmentation; import com.goojia.solr.ganalytics.Lexeme; /** - * 房价网分词器 + * 鎴夸环缃戝垎璇嶅櫒 * * @author duxiaoyu * @@ -29,7 +29,7 @@ public class CnTokenizer { private static Logger LOGGER = LoggerFactory.getLogger(CnTokenizer.class); /** - * 简单分词 + * 绠�鍗曞垎璇� * * @param k * @return @@ -43,7 +43,7 @@ public class CnTokenizer { } /** - * 详细分词结果 + * 璇︾粏鍒嗚瘝缁撴灉 * * @param k * @return @@ -53,7 +53,7 @@ public class CnTokenizer { } /** - * 分词结果 + * 鍒嗚瘝缁撴灉 * * @param k * @return @@ -120,7 +120,7 @@ public class CnTokenizer { } /** - * 词语匹配到的类型 + * 璇嶈鍖归厤鍒扮殑绫诲瀷 * * @param k * @return @@ -147,12 +147,12 @@ public class CnTokenizer { return 0; } Map AlgorithmMap = new HashMap(); - // 将两个字符串中的中文字符以及出现的总数封装到,AlgorithmMap中 + // 灏嗕袱涓瓧绗︿覆涓殑涓枃瀛楃浠ュ強鍑虹幇鐨勬�绘暟灏佽鍒帮紝AlgorithmMap涓� for (int i = 0; i < doc1.length(); i++) { char d1 = doc1.charAt(i); if (isHanZi(d1)) { - int charIndex = getGB2312Id(d1); // ch在GB2312中的位置 + int charIndex = getGB2312Id(d1); // ch鍦℅B2312涓殑浣嶇疆 if (charIndex != -1) { int[] fq = AlgorithmMap.get(charIndex); if (fq != null && fq.length == 2) { @@ -199,7 +199,7 @@ public class CnTokenizer { } private static boolean isHanZi(char ch) { - // 判断是否汉字 + // 鍒ゆ柇鏄惁姹夊瓧 return (ch >= 0x4E00 && ch <= 0x9FA5); } @@ -207,11 +207,11 @@ public class CnTokenizer { try { byte[] buffer = Character.toString(ch).getBytes("GB2312"); if (buffer.length != 2) { - // 正常情况下buffer应该是两个字节,否则说明ch不属于GB2312编码,故返回'?',此时说明不认识该字符 + // 姝e父鎯呭喌涓媌uffer搴旇鏄袱涓瓧鑺傦紝鍚﹀垯璇存槑ch涓嶅睘浜嶨B2312缂栫爜锛屾晠杩斿洖'?'锛屾鏃惰鏄庝笉璁よ瘑璇ュ瓧绗� return -1; } - int b0 = (int) (buffer[0] & 0x0FF) - 161; // 编码从A1开始,因此减去0xA1=161 - int b1 = (int) (buffer[1] & 0x0FF) - 161; // 第一个字符和最后一个字符没有汉字,因此每个区只收16*6-2=94个汉字 + int b0 = (int) (buffer[0] & 0x0FF) - 161; // 缂栫爜浠嶢1寮�濮嬶紝鍥犳鍑忓幓0xA1=161 + int b1 = (int) (buffer[1] & 0x0FF) - 161; // 绗竴涓瓧绗﹀拰鏈�鍚庝竴涓瓧绗︽病鏈夋眽瀛楋紝鍥犳姣忎釜鍖哄彧鏀�16*6-2=94涓眽瀛� return (short) (b0 * 94 + b1); } catch (UnsupportedEncodingException e) { @@ -222,6 +222,6 @@ public class CnTokenizer { public static void main(String[] args) { CnDictionary.init() - println tokenizer('古镇镇', true) + println tokenizer('鍙ら晣闀�', true) } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/cnAnalyzer/KeywordEnum.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/cnAnalyzer/KeywordEnum.groovy index 98bbcc5e7..772ecaad9 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/cnAnalyzer/KeywordEnum.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/cnAnalyzer/KeywordEnum.groovy @@ -1,22 +1,22 @@ package com.fangjia.script.cnAnalyzer; public enum KeywordEnum { - none, // 没有任何匹配 - stopword, // 停止词 - hfword, // 高频词 - district, // 小区 - city, // 城市名 - region, // 区域 - block, // 板块 - road, // 道路名 - metro, // 地铁: 1号线 - station, // 地铁站名 - alias, // 小区别名 - address, // 地址 - estate, // 房产类 - channel, // 房价网频道 - house_number, // 室号 - town,//乡镇 + none, // 娌℃湁浠讳綍鍖归厤 + stopword, // 鍋滄璇� + hfword, // 楂橀璇� + district, // 灏忓尯 + city, // 鍩庡競鍚� + region, // 鍖哄煙 + block, // 鏉垮潡 + road, // 閬撹矾鍚� + metro, // 鍦伴搧: 1鍙风嚎 + station, // 鍦伴搧绔欏悕 + alias, // 灏忓尯鍒悕 + address, // 鍦板潃 + estate, // 鎴夸骇绫� + channel, // 鎴夸环缃戦閬� + house_number, // 瀹ゅ彿 + town,//涔¢晣 number_cn, total_price, room, area, hall, toilet, alpha; public static KeywordEnum parse(String val) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/cnAnalyzer/NumberHandler.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/cnAnalyzer/NumberHandler.groovy index a98a05062..f009b752c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/cnAnalyzer/NumberHandler.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/cnAnalyzer/NumberHandler.groovy @@ -11,24 +11,24 @@ public class NumberHandler { static Map numMap = new HashMap(); static { - unitMap.put('个', 1L);// 仅在数据存储时使用 - unitMap.put('十', 10L); - unitMap.put('百', 100L); - unitMap.put('千', 1000L); - unitMap.put('万', 10000L); - unitMap.put('亿', 100000000L); + unitMap.put('涓�', 1L);// 浠呭湪鏁版嵁瀛樺偍鏃朵娇鐢� + unitMap.put('鍗�', 10L); + unitMap.put('鐧�', 100L); + unitMap.put('鍗�', 1000L); + unitMap.put('涓�', 10000L); + unitMap.put('浜�', 100000000L); - numMap.put('零', 0L); - numMap.put('一', 1L); - numMap.put('二', 2L); - numMap.put('两', 2L); - numMap.put('三', 3L); - numMap.put('四', 4L); - numMap.put('五', 5L); - numMap.put('六', 6L); - numMap.put('七', 7L); - numMap.put('八', 8L); - numMap.put('九', 9L); + numMap.put('闆�', 0L); + numMap.put('涓�', 1L); + numMap.put('浜�', 2L); + numMap.put('涓�', 2L); + numMap.put('涓�', 3L); + numMap.put('鍥�', 4L); + numMap.put('浜�', 5L); + numMap.put('鍏�', 6L); + numMap.put('涓�', 7L); + numMap.put('鍏�', 8L); + numMap.put('涔�', 9L); } public static Long getNum(String numStr) { @@ -54,7 +54,7 @@ public class NumberHandler { } /* - * 从数字串解析解析数字 + * 浠庢暟瀛椾覆瑙f瀽瑙f瀽鏁板瓧 */ public static String parseNum(String numStr) { numStr = PreProcessStr(numStr); @@ -78,7 +78,7 @@ public class NumberHandler { } /* - * 从汉字串解析数字 + * 浠庢眽瀛椾覆瑙f瀽鏁板瓧 */ public static Long parseCHNNum(String chnNum) { Long num = null; @@ -96,7 +96,7 @@ public class NumberHandler { } /* - * 从汉字串解析数字序列 + * 浠庢眽瀛椾覆瑙f瀽鏁板瓧搴忓垪 */ public static Long chn2NumSeq(String chnNum) { Long seq = null; @@ -106,8 +106,8 @@ public class NumberHandler { } if (chnNum.length() > 1 - && (chnNum.indexOf('十') == -1 && chnNum.indexOf('百') == -1 && chnNum.indexOf('千') == -1 - && chnNum.indexOf('万') == -1 && chnNum.indexOf('亿') == -1)) { + && (chnNum.indexOf('鍗�') == -1 && chnNum.indexOf('鐧�') == -1 && chnNum.indexOf('鍗�') == -1 + && chnNum.indexOf('涓�') == -1 && chnNum.indexOf('浜�') == -1)) { seq = 0L; for (int m = chnNum.length() - 1; m > -1; m--) { char ch = chnNum.charAt(m); @@ -126,7 +126,7 @@ public class NumberHandler { } /* - * 从汉字串解析数值, 最大4百亿亿. + * 浠庢眽瀛椾覆瑙f瀽鏁板��, 鏈�澶�4鐧句嚎浜�. */ public static Long chn2Digit(String chnNum) { Long num = null; @@ -135,7 +135,7 @@ public class NumberHandler { return null; } - // 从低位向前解析数据。 + // 浠庝綆浣嶅悜鍓嶈В鏋愭暟鎹�� long digit = 0; long lastUnitValue = 1; @@ -144,10 +144,10 @@ public class NumberHandler { char ch = chnNum.charAt(m); // System.out.println(ch); Long curUnitValue = unitMap.get(ch); - // 位运算 + // 浣嶈繍绠� // - // 降位时升数量级: 三千5百万亿 - // 升位不升数量级: 一万四千 + // 闄嶄綅鏃跺崌鏁伴噺绾э細 涓夊崈5鐧句竾浜� + // 鍗囦綅涓嶅崌鏁伴噺绾э細 涓�涓囧洓鍗� if (curUnitValue != null) { if (curUnitValue <= lastUnitValue) { @@ -158,7 +158,7 @@ public class NumberHandler { lastUnitValue = curUnitValue; } - // 值运算 + // 鍊艰繍绠� // else { Long bit = numMap.get(ch); @@ -166,7 +166,7 @@ public class NumberHandler { if (bit > 0) { digit += bit * lastUnitValue * relaUnitValue; } else { - if (m < chnNum.length() - 1 && chnNum.charAt(m + 1) == '十') { + if (m < chnNum.length() - 1 && chnNum.charAt(m + 1) == '鍗�') { digit += 1 * lastUnitValue * relaUnitValue; } } @@ -174,8 +174,8 @@ public class NumberHandler { } } - // 特殊处理: 以十开头的数字串。 - if (chnNum.charAt(0) == '十') { + // 鐗规畩澶勭悊锛� 浠ュ崄寮�澶寸殑鏁板瓧涓层�� + if (chnNum.charAt(0) == '鍗�') { digit += 1 * lastUnitValue * relaUnitValue; } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/cnAnalyzer/PatternTokenizer.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/cnAnalyzer/PatternTokenizer.groovy index 87a161ebb..b76ace396 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/cnAnalyzer/PatternTokenizer.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/cnAnalyzer/PatternTokenizer.groovy @@ -6,35 +6,35 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; public class PatternTokenizer { - private static Pattern reg_area; // 匹配面积 - private static Pattern reg_price; // 匹配价格 - private static Pattern reg_room; // 匹配房型"3室/房" + private static Pattern reg_area; // 鍖归厤闈㈢Н + private static Pattern reg_price; // 鍖归厤浠锋牸 + private static Pattern reg_room; // 鍖归厤鎴垮瀷"3瀹�/鎴�" private static Pattern reg_hall; private static Pattern reg_toilet; - private static Pattern reg_house_number; // 匹配"5号301室" - private static Pattern REG_RANGE_PATT; // 匹配"5号301室" - private static Pattern REG_NUMBER_CN; // 匹配面积 + private static Pattern reg_house_number; // 鍖归厤"5鍙�301瀹�" + private static Pattern REG_RANGE_PATT; // 鍖归厤"5鍙�301瀹�" + private static Pattern REG_NUMBER_CN; // 鍖归厤闈㈢Н - private static final String REG_NUM = "(((,|\\.|\\d| )*\\d)|(一|二|三|四|五|六|七|八|九|十|零|两|个|十|百|千|万|亿| )+)"; - private static final String REG_RANGE_SPLITTER = "(-|~|~|-|到|至| )"; + private static final String REG_NUM = "(((,|\\.|\\d| )*\\d)|(涓�|浜寍涓墊鍥泑浜攟鍏瓅涓億鍏珅涔潀鍗亅闆秥涓涓獆鍗亅鐧緗鍗億涓噟浜縷 )+)"; + private static final String REG_RANGE_SPLITTER = "(-|~|锝瀨锛峾鍒皘鑷硘 )"; static { - reg_area = Pattern.compile("(" + REG_NUM + "(平米|平)以上)|(" + REG_NUM + "(平米|平)以下)|(" + "(" + REG_NUM + "(平米|平){0,1}" - + REG_RANGE_SPLITTER + REG_NUM + "(平米|平){1}" + ")" + ")|(" + REG_NUM + "(平米|平))"); - reg_price = Pattern.compile("(" + REG_NUM + "(万元|万|W|w|元)以上)|(" + REG_NUM + "(万元|万|W|w|元)以下)|(" + "(" + REG_NUM - + "(万元|万|W|w|元){0,1}" + REG_RANGE_SPLITTER + REG_NUM + "(万元|万|W|w|元){1}" + ")" + ")|(" + REG_NUM - + "(万元|万|W|w|元))"); - reg_house_number = Pattern.compile(REG_NUM + "(号)" + REG_NUM + "(室)"); - reg_room = Pattern.compile(REG_NUM + "(室|房)"); - reg_hall = Pattern.compile(REG_NUM + "厅"); - reg_toilet = Pattern.compile(REG_NUM + "卫"); + reg_area = Pattern.compile("(" + REG_NUM + "(骞崇背|骞�)浠ヤ笂)|(" + REG_NUM + "(骞崇背|骞�)浠ヤ笅)|(" + "(" + REG_NUM + "(骞崇背|骞�){0,1}" + + REG_RANGE_SPLITTER + REG_NUM + "(骞崇背|骞�){1}" + ")" + ")|(" + REG_NUM + "(骞崇背|骞�))"); + reg_price = Pattern.compile("(" + REG_NUM + "(涓囧厓|涓噟W|w|鍏�)浠ヤ笂)|(" + REG_NUM + "(涓囧厓|涓噟W|w|鍏�)浠ヤ笅)|(" + "(" + REG_NUM + + "(涓囧厓|涓噟W|w|鍏�){0,1}" + REG_RANGE_SPLITTER + REG_NUM + "(涓囧厓|涓噟W|w|鍏�){1}" + ")" + ")|(" + REG_NUM + + "(涓囧厓|涓噟W|w|鍏�))"); + reg_house_number = Pattern.compile(REG_NUM + "(鍙�)" + REG_NUM + "(瀹�)"); + reg_room = Pattern.compile(REG_NUM + "(瀹鎴�)"); + reg_hall = Pattern.compile(REG_NUM + "鍘�"); + reg_toilet = Pattern.compile(REG_NUM + "鍗�"); REG_RANGE_PATT = Pattern.compile(REG_RANGE_SPLITTER); - REG_NUMBER_CN = Pattern.compile(REG_NUM + "(弄|号|栋|厅|卫)"); + REG_NUMBER_CN = Pattern.compile(REG_NUM + "(寮剕鍙穦鏍媩鍘厊鍗�)"); } public static void main(String[] args) { - String t = "中潭路99弄##一厅"; + String t = "涓江璺�99寮�##涓�鍘�"; List tokens = new ArrayList(); parseNumberCn(tokens, t); System.out.println(t + "---> " + tokens); @@ -52,13 +52,13 @@ public class PatternTokenizer { } public static String tokenizers(List tokens, String k) { - // 面积 + // 闈㈢Н k = parseArea(tokens, k); - // 房型 + // 鎴垮瀷 k = parseRoom(tokens, k); k = parseHall(tokens, k); k = parseToilet(tokens, k); - // 总价 + // 鎬讳环 k = parsePrice(tokens, k); k = parseNumberCn(tokens, k); @@ -151,38 +151,38 @@ public class PatternTokenizer { Long min = null; Long max = null; - if (s.indexOf("万元以上") > -1 || s.indexOf("万以上") > -1 || s.indexOf("W以上") > -1 || s.indexOf("w以上") > -1) { - Long price = NumberHandler.getNum(s.replace("万元以上", "").replace("万以上", "").replace("W以上", "").replace("w以上", "")); + if (s.indexOf("涓囧厓浠ヤ笂") > -1 || s.indexOf("涓囦互涓�") > -1 || s.indexOf("W浠ヤ笂") > -1 || s.indexOf("w浠ヤ笂") > -1) { + Long price = NumberHandler.getNum(s.replace("涓囧厓浠ヤ笂", "").replace("涓囦互涓�", "").replace("W浠ヤ笂", "").replace("w浠ヤ笂", "")); if (price != null) { min = price * 10000; max = 1000000000L; } - } else if (s.indexOf("元以上") > -1) { - Long price = NumberHandler.getNum(s.replace("元以上", "")); + } else if (s.indexOf("鍏冧互涓�") > -1) { + Long price = NumberHandler.getNum(s.replace("鍏冧互涓�", "")); if (price != null) { min = price; max = 1000000000L; } - } else if (s.indexOf("万元以下") > -1 || s.indexOf("万以下") > -1 || s.indexOf("W以下") > -1 || s.indexOf("w以下") > -1) { - Long price = NumberHandler.getNum(s.replace("万元以下", "").replace("万以下", "").replace("W以下", "").replace("w以下", "")); + } else if (s.indexOf("涓囧厓浠ヤ笅") > -1 || s.indexOf("涓囦互涓�") > -1 || s.indexOf("W浠ヤ笅") > -1 || s.indexOf("w浠ヤ笅") > -1) { + Long price = NumberHandler.getNum(s.replace("涓囧厓浠ヤ笅", "").replace("涓囦互涓�", "").replace("W浠ヤ笅", "").replace("w浠ヤ笅", "")); if (price != null) { min = 1L; max = price * 10000; } - } else if (s.indexOf("元以下") > -1) { - Long price = NumberHandler.getNum(s.replace("元以下", "")); + } else if (s.indexOf("鍏冧互涓�") > -1) { + Long price = NumberHandler.getNum(s.replace("鍏冧互涓�", "")); if (price != null) { min = 1L; max = price; } - } else if (s.indexOf("万元") > -1 || s.indexOf("万") > -1 || s.indexOf("W") > -1 || s.indexOf("w") > -1) { - Long price = NumberHandler.getNum(s.replace("万元", "").replace("万", "").replace("W", "").replace("w", "")); + } else if (s.indexOf("涓囧厓") > -1 || s.indexOf("涓�") > -1 || s.indexOf("W") > -1 || s.indexOf("w") > -1) { + Long price = NumberHandler.getNum(s.replace("涓囧厓", "").replace("涓�", "").replace("W", "").replace("w", "")); if (price != null) { min = price * 10000 - 10000; max = price * 10000 + 10000; } - } else if (s.indexOf("元") > -1) { - Long price = NumberHandler.getNum(s.replace("元", "")); + } else if (s.indexOf("鍏�") > -1) { + Long price = NumberHandler.getNum(s.replace("鍏�", "")); if (price != null) { if (price < 1000) { min = price - 10; @@ -212,14 +212,14 @@ public class PatternTokenizer { public static Range stringToArea(String s) { Long min = null; Long max = null; - if (s.indexOf("平米以上") > -1 || s.indexOf("平以上") > -1) { - Long area = NumberHandler.getNum(s.replace("平米以上", "").replace("平以上", "")); + if (s.indexOf("骞崇背浠ヤ笂") > -1 || s.indexOf("骞充互涓�") > -1) { + Long area = NumberHandler.getNum(s.replace("骞崇背浠ヤ笂", "").replace("骞充互涓�", "")); if (area != null) { min = area; max = 10000L; } - } else if (s.indexOf("平米以下") > -1 || s.indexOf("平以下") > -1) { - Long area = NumberHandler.getNum(s.replace("平米以下", "").replace("平以下", "")); + } else if (s.indexOf("骞崇背浠ヤ笅") > -1 || s.indexOf("骞充互涓�") > -1) { + Long area = NumberHandler.getNum(s.replace("骞崇背浠ヤ笅", "").replace("骞充互涓�", "")); if (area != null) { min = 1L; max = area; @@ -227,7 +227,7 @@ public class PatternTokenizer { } else if (REG_RANGE_PATT.matcher(s).matches()) { } else { - Long area = NumberHandler.getNum(s.replace("平米", "").replace("平", "")); + Long area = NumberHandler.getNum(s.replace("骞崇背", "").replace("骞�", "")); if (area != null) { min = area - 3; max = area + 3; @@ -238,7 +238,7 @@ public class PatternTokenizer { } public static Long stringToRoom(String s) { - s = s.replace("室", "").replace("房", ""); + s = s.replace("瀹�", "").replace("鎴�", ""); Long r = NumberHandler.getNum(s); if (r != null) { if (r < 10 && r > 0) { @@ -249,7 +249,7 @@ public class PatternTokenizer { } public static String[] stringHouseNumber(String s) { - s = s.trim().replace("号", "-").replace("室", "-"); + s = s.trim().replace("鍙�", "-").replace("瀹�", "-"); return s.split("-"); } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/cnAnalyzer/TownProc.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/cnAnalyzer/TownProc.groovy index d2db9065e..96c139b3d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/cnAnalyzer/TownProc.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/cnAnalyzer/TownProc.groovy @@ -10,7 +10,7 @@ import org.bson.Document //MongoCollection DICTIONARY = Mongo3Utils.getDbCollection(Constants.FANGJIA_MONGO_URI, "fangjia", "dictionary") // //def list = [] -//ExcelUtils.read("D:\\乡镇数据.xlsx").each {List item-> +//ExcelUtils.read("D:\\涔¢晣鏁版嵁.xlsx").each {List item-> // Document doc = new Document() // doc.append("cat", "town") // doc.append("name", item["B"]) @@ -21,7 +21,7 @@ import org.bson.Document //MongoCollection ADMIN_AREA = Mongo3Utils.getDbCollection(Constants.FANGJIA_CRAWL_MONGO_URI, "vip_site", "admin_area") // -//ExcelUtils.multiThreadingModify("D:\\乡镇数据.xlsx", {List item-> +//ExcelUtils.multiThreadingModify("D:\\涔¢晣鏁版嵁.xlsx", {List item-> // String code = item["C"] //// def city = ADMIN_AREA.find(new Document("code", code.substring(0, 4).padRight(12, '0'))).first().name //// city = RegionData.formatCity(city) @@ -30,7 +30,7 @@ import org.bson.Document //// } //// item["E"] = com.fangjia.core.RegionData.formatCity(city) // if(item["E"]){ -// if(item["E"] == "上海"){ +// if(item["E"] == "涓婃捣"){ // println(item) // } // def region = ADMIN_AREA.find(new Document("code", code.substring(0, 6).padRight(12, '0'))).first().name @@ -44,21 +44,21 @@ import org.bson.Document //}) MongoCollection TOWN = Mongo3Utils.getDbCollection(Constants.FANGJIA_MONGO_URI, "fangjia", "town") -ExcelUtils.multiThreadingModify("D:\\乡镇数据.xlsx", {List item-> +ExcelUtils.multiThreadingModify("D:\\涔¢晣鏁版嵁.xlsx", {List item-> def city = item["E"] def region = item["F"] def name = item["B"] if( city && region){ if(!TOWN.find(new Document("city", city).append("region", region)).first()){ Document doc = new Document() - doc.append("city", city).append("region", region).append("name", name).append("short_name", name.replaceAll("(镇|乡|(街道)|(街道办事处))\$", "")) + doc.append("city", city).append("region", region).append("name", name).append("short_name", name.replaceAll("(闀噟涔(琛楅亾)|(琛楅亾鍔炰簨澶�))\$", "")) TOWN.insertOne(doc) println(doc) } }else if(city){ if(!TOWN.find(new Document("city", city)).first()){ Document doc = new Document() - doc.append("city", city).append("name", name).append("short_name", name.replaceAll("(镇|乡|(街道))\$", "")) + doc.append("city", city).append("name", name).append("short_name", name.replaceAll("(闀噟涔(琛楅亾))\$", "")) TOWN.insertOne(doc) println(doc) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/commData/CommMapData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/commData/CommMapData.groovy index 2648f2730..44dc37ffe 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/commData/CommMapData.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/commData/CommMapData.groovy @@ -53,8 +53,8 @@ class CommMapData extends BaseBatch{ public static final DBCollection ONLINE_HOUSE_STAT_COLL = MongoUtils.getCollectionByName("geluke", "house_stat", production) static Pattern pattern_date_1 = Pattern.compile("(20[\\d]{2})\\s?\\-\\s?([0-9]{1,2})\\s?(\\-\\s?([0-9]{1,2}))?"); - static Pattern pattern_date_2 = Pattern.compile("((20[\\d]{2})\\s?年)?\\s?([0-9]{1,2})\\s?月\\s?(([0-9]{1,2})日?)?"); - static Pattern pattern_date_3 = Pattern.compile("(20[\\d]{2})年?"); + static Pattern pattern_date_2 = Pattern.compile("((20[\\d]{2})\\s?骞�)?\\s?([0-9]{1,2})\\s?鏈圽\s?(([0-9]{1,2})鏃�?)?"); + static Pattern pattern_date_3 = Pattern.compile("(20[\\d]{2})骞�?"); static main(args) { runBatch(new CommMapData(), args) @@ -97,9 +97,9 @@ class CommMapData extends BaseBatch{ defOffLineCommData(city,cat_array); def shopStatWeekend = getShopLastWeekend(city); def shopMap = getAllDistricts("shop", city, regions); - println "商铺共:"+shopMap.size()+" 个" + println "鍟嗛摵鍏憋細"+shopMap.size()+" 涓�" def shopPriceMap = findAllShopStats(shopStatWeekend, city); - def shopRentMap = findAllOfficeOrShopRent(shopStatWeekend, city, "商铺"); + def shopRentMap = findAllOfficeOrShopRent(shopStatWeekend, city, "鍟嗛摵"); shopPriceMap = mergerShopPrice(shopMap, shopPriceMap); shopPriceMap = mergerShopRent(shopPriceMap, shopRentMap); saveData(city, shopPriceMap, "shop", version); @@ -160,7 +160,7 @@ class CommMapData extends BaseBatch{ def officeStatWeekend = getOfficeLastWeekend(city); def officeMap = getAllDistricts("office", city, regions); - println "写字楼共:"+officeMap.size()+" 个" + println "鍐欏瓧妤煎叡锛�"+officeMap.size()+" 涓�" def officePriceMap = findAllOfficeStat(officeStatWeekend, city); def officeRentMap = findAllOfficeRent(officeStatWeekend, city); officePriceMap = mergerOfficePrice(officeMap, officePriceMap); @@ -309,7 +309,7 @@ class CommMapData extends BaseBatch{ if(cursor){ for(def dbo : cursor){ def city = dbo.get("display"); - if(city!='全国'){ + if(city!='鍏ㄥ浗'){ citys << city; } } @@ -354,7 +354,7 @@ class CommMapData extends BaseBatch{ def region = obj.get("region"); def tempOfficeDistrict = []; - if(regions.contains(region)||regions.size()==0||(city=='西安'&®ion=='曲江')||(city=='成都'&®ion=='高新西')||(city=='金华'&&(region=='江南'||region=='江北'))||(city=='嘉兴'&&(region=='中心城'||region=='运河'))||(city=="深圳"&&(region=='龙华新区'||region=='光明新区'||region=='坪山新区'||region=='大鹏新区'))){ + if(regions.contains(region)||regions.size()==0||(city=='瑗垮畨'&®ion=='鏇叉睙')||(city=='鎴愰兘'&®ion=='楂樻柊瑗�')||(city=='閲戝崕'&&(region=='姹熷崡'||region=='姹熷寳'))||(city=='鍢夊叴'&&(region=='涓績鍩�'||region=='杩愭渤'))||(city=="娣卞湷"&&(region=='榫欏崕鏂板尯'||region=='鍏夋槑鏂板尯'||region=='鍧北鏂板尯'||region=='澶ч箯鏂板尯'))){ def name = obj.get("name"); def build_area = obj.get("build_area"); def live_date = obj.get("live_date"); @@ -384,16 +384,16 @@ class CommMapData extends BaseBatch{ index ++; - println ""+region + " [ "+obj.get("name")+" ] 正常" + println ""+region + " [ "+obj.get("name")+" ] 姝e父" tempOfficeDistrict << region tempOfficeDistrict << obj.get("name") - tempOfficeDistrict << "正常" + tempOfficeDistrict << "姝e父" }else{ - println ""+region + " [ "+obj.get("name")+" ] 被过滤" + println ""+region + " [ "+obj.get("name")+" ] 琚繃婊�" tempOfficeDistrict << region tempOfficeDistrict << obj.get("name") - tempOfficeDistrict << "被过滤" + tempOfficeDistrict << "琚繃婊�" } officeDistrict << tempOfficeDistrict @@ -411,9 +411,9 @@ class CommMapData extends BaseBatch{ if (file.exists()){ file.delete(); } - file.append("区域,") - file.append("楼盘名称,") - file.append("状态,") + file.append("鍖哄煙,") + file.append("妤肩洏鍚嶇О,") + file.append("鐘舵��,") file.append(System.getProperty("line.separator")); list.each{ def tempLine = it; @@ -430,30 +430,30 @@ class CommMapData extends BaseBatch{ private def getKind(build_type, cat){ def kinds = []; if(cat == 'office'){ - kinds << "写字楼"; + kinds << "鍐欏瓧妤�"; }else if(cat == 'shop'){ - kinds << "商铺"; + kinds << "鍟嗛摵"; }else{ if(!build_type){ - kinds << "小区"; + kinds << "灏忓尯"; }else{ - if(build_type.indexOf("别墅")!=-1){ - kinds << "别墅"; + if(build_type.indexOf("鍒")!=-1){ + kinds << "鍒"; } - if(build_type.indexOf("公寓")!=-1||build_type.indexOf("多层")!=-1||build_type.indexOf("小区")!=-1||build_type.indexOf("板楼")!=-1||build_type.indexOf("高层")!=-1||build_type.indexOf("住宅")!=-1){ - kinds << "小区"; + if(build_type.indexOf("鍏瘬")!=-1||build_type.indexOf("澶氬眰")!=-1||build_type.indexOf("灏忓尯")!=-1||build_type.indexOf("鏉挎ゼ")!=-1||build_type.indexOf("楂樺眰")!=-1||build_type.indexOf("浣忓畢")!=-1){ + kinds << "灏忓尯"; } } if(kinds.size()==0){ - kinds << "小区"; + kinds << "灏忓尯"; } } return kinds.join(","); } private int calLivePecent(String liveDate){ if(liveDate){ - if(liveDate.equals("暂无资料")){ + if(liveDate.equals("鏆傛棤璧勬枡")){ return 0; }else{ String start = ""; @@ -570,9 +570,9 @@ class CommMapData extends BaseBatch{ private int handleOfficeBuildArea(def old_build_area){ if(old_build_area){ - String buildArea = old_build_area.replace("暂无资料", ""); + String buildArea = old_build_area.replace("鏆傛棤璧勬枡", ""); if(buildArea){ - buildArea = patternParse(buildArea, "([0-9\\.]+)[平方米|平方|平米|㎡]?"); + buildArea = patternParse(buildArea, "([0-9\\.]+)[骞虫柟绫硘骞虫柟|骞崇背|銕?"); int buildAreaNum = isNumber(buildArea, old_build_area); if(buildAreaNum > 0){ int houseCount = 0; @@ -693,10 +693,10 @@ class CommMapData extends BaseBatch{ } if(year){ - if(openDateStr.contains("年底")){ + if(openDateStr.contains("骞村簳")){ month = "12" day = "30" - }else if(openDateStr.contains("年初")){ + }else if(openDateStr.contains("骞村垵")){ month = "1" day = "1" } @@ -704,7 +704,7 @@ class CommMapData extends BaseBatch{ } } - if(openDateStr.contains("现房")){ + if(openDateStr.contains("鐜版埧")){ def curYear = new Date().getYear()+1900 year = curYear.toString(); month = "1" @@ -714,13 +714,13 @@ class CommMapData extends BaseBatch{ if(month){ year=year?year:"2013" if(!day){ - if(openDateStr.contains("月底")){ + if(openDateStr.contains("鏈堝簳")){ day="30" - }else if(openDateStr.contains("上旬")){ + }else if(openDateStr.contains("涓婃棳")){ day="1" - }else if(openDateStr.contains("中旬")){ + }else if(openDateStr.contains("涓棳")){ day="10" - }else if(openDateStr.contains("下旬")){ + }else if(openDateStr.contains("涓嬫棳")){ day="20" }else{ day="1" @@ -757,9 +757,9 @@ class CommMapData extends BaseBatch{ if(lasePecent > 1){ lasePecent = 1; } - String buildArea = old_build_area.replace("暂无资料", ""); + String buildArea = old_build_area.replace("鏆傛棤璧勬枡", ""); if(buildArea&&buildArea!='null'){ - buildArea = patternParse(buildArea, "([0-9\\.]+)[平方米|平方|平米|㎡]?"); + buildArea = patternParse(buildArea, "([0-9\\.]+)[骞虫柟绫硘骞虫柟|骞崇背|銕?"); int buildAreaNum = isNumber(buildArea, old_build_area); if(buildAreaNum >0){ @@ -827,7 +827,7 @@ class CommMapData extends BaseBatch{ } /** - * 将String类型的日期转换成yyyy-mm-dd格式 + * 灏哠tring绫诲瀷鐨勬棩鏈熻浆鎹㈡垚yyyy-mm-dd鏍煎紡 * @param dateString * @return */ @@ -841,14 +841,14 @@ class CommMapData extends BaseBatch{ def stringToDate2(dateString){ try { - return new SimpleDateFormat("yyyy年MM月").parse(dateString); + return new SimpleDateFormat("yyyy骞碝M鏈�").parse(dateString); } catch (Exception e) { return null; } } def stringToDate3(dateString){ try { - return new SimpleDateFormat("yyyy年").parse(dateString); + return new SimpleDateFormat("yyyy骞�").parse(dateString); } catch (Exception e) { return null; } @@ -863,7 +863,7 @@ class CommMapData extends BaseBatch{ def regions = []; for(DBObject obj : dbCursor){ def region = obj.get("name"); - if(region.indexOf("周边")==-1 && region.indexOf("其他")==-1) { + if(region.indexOf("鍛ㄨ竟")==-1 && region.indexOf("鍏朵粬")==-1) { regions << region; } } @@ -872,8 +872,8 @@ class CommMapData extends BaseBatch{ public def getLastWeekend(){ DBObject queryCondition = new BasicDBObject() - queryCondition.put("city", "上海"); -// queryCondition.put("estate_type", "小区"); + queryCondition.put("city", "涓婃捣"); +// queryCondition.put("estate_type", "灏忓尯"); def dbCursor = STAT_COLL.find(queryCondition).sort(new BasicDBObject("weekend", -1)).limit(1) def weekend = null; if(dbCursor){ @@ -924,9 +924,9 @@ class CommMapData extends BaseBatch{ def estate_type = obj.get("estate_type"); def typeKey = "district_price"; - if(estate_type == '别墅'){ + if(estate_type == '鍒'){ typeKey = "villa_price"; - }else if(estate_type == '写字楼'||estate_type == '商铺'){ + }else if(estate_type == '鍐欏瓧妤�'||estate_type == '鍟嗛摵'){ continue; } def region = obj.get("region"); @@ -955,7 +955,7 @@ class CommMapData extends BaseBatch{ DBObject queryCondition = new BasicDBObject() queryCondition.put("weekend", weekend); queryCondition.put("city", city); - queryCondition.put("kind", "写字楼"); + queryCondition.put("kind", "鍐欏瓧妤�"); DBCursor cur = OFFICE_RENT_STAT_COLL.find(queryCondition); def resultMap = [:]; @@ -1020,22 +1020,22 @@ class CommMapData extends BaseBatch{ index ++; println array[0] + " " + array[1] - println "房子库房子数:"+totalCount; + println "鎴垮瓙搴撴埧瀛愭暟锛�"+totalCount; if(map){ household_count = map.get("household_count"); - println "其它网站抓取户数:"+household_count + println "鍏跺畠缃戠珯鎶撳彇鎴锋暟锛�"+household_count if(totalCount <100){ if(!household_count){ def build_area = map.get("build_area"); - println "建筑面积:"+build_area + println "寤虹瓚闈㈢Н:"+build_area if(build_area){ def buildAreaNum = parserBuildArea(build_area); if(buildAreaNum){ //area_count = calcuteHouseCount(city, array[0], array[1], buildAreaNum); area_count = calcuteHousePeopleCount(city, array[0], array[1], buildAreaNum); - println "面积户数:"+area_count.toInteger(); + println "闈㈢Н鎴锋暟:"+area_count.toInteger(); } } } @@ -1091,9 +1091,9 @@ class CommMapData extends BaseBatch{ def parserBuildArea(build_area){ int buildAreaNum = 0; if(build_area){ - build_area = build_area.replace("暂无资料", ""); + build_area = build_area.replace("鏆傛棤璧勬枡", ""); if(build_area){ - def temp_buildArea = patternParse(build_area, "([0-9\\.]+)[万平方米|平方米|平方|平米|㎡]"); + def temp_buildArea = patternParse(build_area, "([0-9\\.]+)[涓囧钩鏂圭背|骞虫柟绫硘骞虫柟|骞崇背|銕"); buildAreaNum = isNumber(temp_buildArea, build_area); } @@ -1107,7 +1107,7 @@ class CommMapData extends BaseBatch{ try{ double d = Double.valueOf(value); - if(buildArea.indexOf("万")!=-1){ + if(buildArea.indexOf("涓�")!=-1){ d = d * 10000; } int a = (int) d; @@ -1202,13 +1202,13 @@ class CommMapData extends BaseBatch{ } if(sum){ avgArea = sum / result.size(); - println "平均面积:"+avgArea + println "骞冲潎闈㈢Н锛�"+avgArea } count = buildArea / avgArea; }else{ def avgArea = 90; count = buildArea / avgArea; - println "没有房源" + println "娌℃湁鎴挎簮" } return count; @@ -1346,7 +1346,7 @@ class CommMapData extends BaseBatch{ public def filterWord(def districtName){ - def words = ["一期","二期","三期","四期","五期","六期","七期","八期","九期","十期"]; + def words = ["涓�鏈�","浜屾湡","涓夋湡","鍥涙湡","浜旀湡","鍏湡","涓冩湡","鍏湡","涔濇湡","鍗佹湡"]; for(def word : words){ if(districtName.endsWith(word)){ districtName = districtName.replace(word, ""); @@ -1472,11 +1472,11 @@ class CommMapData extends BaseBatch{ } private savaCityHouseStat(city, total_district_count, total_house_count){ - def obj = findHouseStatData(city, "全市"); + def obj = findHouseStatData(city, "鍏ㄥ競"); if(!obj){ obj = new BasicDBObject() obj.put("city", city); - obj.put("region", "全市"); + obj.put("region", "鍏ㄥ競"); obj.put("rate", 3); } obj.put("district_count", total_district_count); 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 384cba709..8289ac0a0 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 @@ -31,7 +31,7 @@ import java.util.zip.GZIPInputStream class CommonDatautils { - public static final String[] TAGS = ["独栋", "联排", "叠加", "双拼", "花园面积", "泳池", "别墅", "带花园", "洋房", "叠拼", "独院", "联体", "微墅", "大平墅"]; + public static final String[] TAGS = ["鐙爧", "鑱旀帓", "鍙犲姞", "鍙屾嫾", "鑺卞洯闈㈢Н", "娉虫睜", "鍒", "甯﹁姳鍥�", "娲嬫埧", "鍙犳嫾", "鐙櫌", "鑱斾綋", "寰", "澶у钩澧�"]; public static final def mongoDbUrl = "mongodb://developer:G00IDCDEV12385@mongo.db.fangjia.com:28017"; @@ -69,7 +69,7 @@ class CommonDatautils { public static final DBCollection BUS_STATION_COLL = MongoUtils.getCollectionByName2("fangjia", "bus_station", mongoDbUrl) public static final DBCollection BUS_LINE_COLL = MongoUtils.getCollectionByName2("fangjia", "bus_line", mongoDbUrl) public static final DBCollection thirdpartColl = MongoUtils.getCollectionByName2("fangjia", "average_statistics", mongoDbUrl) - public static def arroundPoiMap = ["ktv":["kTV","ktv","KTV","量贩"], "电影院":["电影院","影城"], "健身中心":["健身"], "综合商场":["商场"], "美容院":["美容"],"星级酒店":["酒店"],"高尔夫球场":["高尔夫"],"整容整形":["整形","整容"],"咖啡厅":["星巴克","咖啡"],"洗浴":["洗浴","休闲"],"医院":["医院","卫生","诊所"],"学校":["幼儿园","小学","中学","大学","职业技术"],"写字楼":["广场","大厦","写字楼"],"银行/ATM":["银行","ATM", "atm"],"超市":["超市","商场"],"公园/绿地":["公园"],"停车场":["停车场"],"机场":["机场"],"网吧":["网吧","网咖"]] + public static def arroundPoiMap = ["ktv":["kTV","ktv","KTV","閲忚穿"], "鐢靛奖闄�":["鐢靛奖闄�","褰卞煄"], "鍋ヨ韩涓績":["鍋ヨ韩"], "缁煎悎鍟嗗満":["鍟嗗満"], "缇庡闄�":["缇庡"],"鏄熺骇閰掑簵":["閰掑簵"],"楂樺皵澶悆鍦�":["楂樺皵澶�"],"鏁村鏁村舰":["鏁村舰","鏁村"],"鍜栧暋鍘�":["鏄熷反鍏�","鍜栧暋"],"娲楁荡":["娲楁荡","浼戦棽"],"鍖婚櫌":["鍖婚櫌","鍗敓","璇婃墍"],"瀛︽牎":["骞煎効鍥�","灏忓","涓","澶у","鑱屼笟鎶�鏈�"],"鍐欏瓧妤�":["骞垮満","澶у帵","鍐欏瓧妤�"],"閾惰/ATM":["閾惰","ATM", "atm"],"瓒呭競":["瓒呭競","鍟嗗満"],"鍏洯/缁垮湴":["鍏洯"],"鍋滆溅鍦�":["鍋滆溅鍦�"],"鏈哄満":["鏈哄満"],"缃戝惂":["缃戝惂","缃戝挅"]] public static final DBCollection POI_COLL = MongoUtils.getCollectionByName2("fangjia_base", "baidu_place_poi", mongoDbUrl) public static final DBCollection DEAL_PRICE_COLL = MongoUtils.getCollectionByName2("fangjia", "deal_price", mongoDbUrl) @@ -92,13 +92,13 @@ class CommonDatautils { public static final DBCollection SEAWEED_MONGO_COLL = MongoUtils.getCollectionByName("fangjia", "seaweed", "mongo.db.fangjia.com") - static def DIRECTIONS = ["东北", "西北", "东南", "西南", "南北", "东西", "东", "南", "西", "北"] + 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("豪装", ["豪华装修", "高档", "豪华", "豪装", "高级装修", "高装", "奢侈"]) + FITMENTS_TYPES_MAPS.put("姣涘澂", ["姣涘澂", "娓呮按", "鏃犺淇�", "鐙爧姣涘澂", "姣涜儦", "鐧藉澂", "鏃ц", "鍧�", "鍘熸埧", "姣涘潖"]) + FITMENTS_TYPES_MAPS.put("绠�瑁�", ["绠�瑁�", "鏅�氳淇�", "鏅��", "绠�鍗曡淇�", "绠�鏄撹淇�", "鏅", "涓�鑸淇�", "涓�鑸�", "绠�", "绮楄淇�"]) + FITMENTS_TYPES_MAPS.put("绮捐", ["绮捐", "鍏ㄨ淇�", "鍏ㄨ", "涓瓑瑁呬慨", "涓", "涓。瑁呬慨", "绮捐嚧瑁呬慨", "涓。", "涓瓑", "绮�", "涓慨", "浼樿川瑁呬慨", "鏃跺皻瑁呬慨", "鑹", "涓珮鎸�"]) + FITMENTS_TYPES_MAPS.put("璞", ["璞崕瑁呬慨", "楂樻。", "璞崕", "璞", "楂樼骇瑁呬慨", "楂樿", "濂緢"]) } public static final DBCollection COMMUNITY_CONN = MongoUtils.getCollectionByName2("fangjia", "community", "mongodb://admin:G00MONGOADMIN@192.168.0.100:30009") @@ -131,7 +131,7 @@ class CommonDatautils { def cursor = SERVER_AREA_COLL.find(new BasicDBObject()).sort(new BasicDBObject('city_grade', 1).append('sequence', 1)); def rets = [] for(def dbo : cursor){ - if(dbo.display!="全国"){ + if(dbo.display!="鍏ㄥ浗"){ rets << dbo } } @@ -148,7 +148,7 @@ class CommonDatautils { if(cursor){ for(def dbo : cursor){ def city = dbo.get("display"); - if(city!='全国'){ + if(city!='鍏ㄥ浗'){ citys << city; } } @@ -170,7 +170,7 @@ class CommonDatautils { for(def dbo : cursor){ def city = dbo.get("display"); def province = dbo.get("province"); - if(city!='全国'){ + if(city!='鍏ㄥ浗'){ cityInfos.put(city, province); } } @@ -194,7 +194,7 @@ class CommonDatautils { if(cursor){ for(def dbo : cursor){ def city = dbo.get("display"); - if(city!='全国'){ + if(city!='鍏ㄥ浗'){ citys << city; } } @@ -211,7 +211,7 @@ class CommonDatautils { for(def dbo : cursor){ def city = dbo.get("display"); - if(city!='全国'){ + if(city!='鍏ㄥ浗'){ def alias = [] if(dbo.alias){ alias.addAll(dbo.alias) @@ -270,7 +270,7 @@ class CommonDatautils { q.put("status", 0); q.put("cat", cat); q.put("city", city); -// q.put("name","新泾三村") +// q.put("name","鏂版尘涓夋潙") DBObject keys = new BasicDBObject(); if(fields){ @@ -340,7 +340,7 @@ class CommonDatautils { } /** - * 获取城市中小区的经纬度 + * 鑾峰彇鍩庡競涓皬鍖虹殑缁忕含搴� * @param city * @return */ @@ -514,7 +514,7 @@ class CommonDatautils { } } DSCursor cursor = getDataStoreConnection().find(q, keys).batchSize(2000); - //def cursor = SEAWEED_COLL.find(q, keys).batchSize(2000);//线下测试库 + //def cursor = SEAWEED_COLL.find(q, keys).batchSize(2000);//绾夸笅娴嬭瘯搴� Iterator iters = cursor.iterator() def resultMap = [:]; try{ @@ -566,7 +566,7 @@ class CommonDatautils { keys.put(field, 1); } } - def cursor = SEAWEED_COLL.find(q, keys).batchSize(2000);//线下测试库 + def cursor = SEAWEED_COLL.find(q, keys).batchSize(2000);//绾夸笅娴嬭瘯搴� def results = []; try{ while(cursor.hasNext()) { @@ -589,7 +589,7 @@ class CommonDatautils { def dbCursor = getDataStoreConnection().find(q); for(def obj : dbCursor){ def date = obj.build_date; - if(date && date.indexOf("暂无")==-1){ + if(date && date.indexOf("鏆傛棤")==-1){ return date; } } @@ -792,7 +792,7 @@ class CommonDatautils { DBObject q = new BasicDBObject(); q.put("status",0) q.put("cat", cat); -// q.put("name", "中兴智汇大厦") +// q.put("name", "涓叴鏅烘眹澶у帵") DBObject keys = new BasicDBObject(); if(fields){ @@ -821,7 +821,7 @@ class CommonDatautils { q.put("city", city) // q.put("loop_line_info",new BasicDBObject('$exists',false)) -// q.put("name","扬州北街8号") +// q.put("name","鎵窞鍖楄8鍙�") DBObject keys = new BasicDBObject(); if(fields){ @@ -848,7 +848,7 @@ class CommonDatautils { q.put("city", city) q.put("m_date", new BasicDBObject('$gte', DateUtils.parseFromTightYYYYMMDD(startDate))) // q.put("loop_line_info",new BasicDBObject('$exists',false)) -// q.put("name","扬州北街8号") +// q.put("name","鎵窞鍖楄8鍙�") DBObject keys = new BasicDBObject(); if(fields){ @@ -918,7 +918,7 @@ class CommonDatautils { q.put("cat", cat); q.put("city", city) // q.put("loop_line_info",new BasicDBObject('$exists',false)) -// q.put("name","经纬天地园二期") +// q.put("name","缁忕含澶╁湴鍥簩鏈�") DBObject keys = new BasicDBObject(); if(fields){ @@ -942,7 +942,7 @@ class CommonDatautils { // q.put("status",0) // q.put("cat", cat); // q.put("city", city); -//// q.put("name","万达华府一期") +//// q.put("name","涓囪揪鍗庡簻涓�鏈�") // // DBObject keys = new BasicDBObject(); // if(fields){ @@ -1334,7 +1334,7 @@ class CommonDatautils { q.put("visible", 0); q.put("cat", cat); q.put("city", city); - //q.put("name", "大华阳城花园七期"); + //q.put("name", "澶у崕闃冲煄鑺卞洯涓冩湡"); DBObject keys = new BasicDBObject(); keys.put("region", 1); keys.put("name", 1); @@ -1779,7 +1779,7 @@ class CommonDatautils { def regions = []; for(DBObject obj : dbCursor){ def region = obj.get("name"); - if(region.indexOf("周边")==-1 && region.indexOf("其他")==-1) { + if(region.indexOf("鍛ㄨ竟")==-1 && region.indexOf("鍏朵粬")==-1) { regions << region; } } @@ -1809,7 +1809,7 @@ class CommonDatautils { def city = obj.get("city"); def region = obj.get("name"); def pattern = obj.get("pattern"); - if(region.indexOf("周边")==-1 && region.indexOf("其他")==-1) { + if(region.indexOf("鍛ㄨ竟")==-1 && region.indexOf("鍏朵粬")==-1) { def r_map = regionMap.get(city); if(!r_map){ r_map = [:] @@ -1837,7 +1837,7 @@ class CommonDatautils { def city = obj.get("city"); def region = obj.get("name"); def pattern = obj.get("pattern"); - if(region.indexOf("周边")==-1 && region.indexOf("其他")==-1) { + if(region.indexOf("鍛ㄨ竟")==-1 && region.indexOf("鍏朵粬")==-1) { def r_map = regionMap.get(city); if(!r_map){ r_map = [:] @@ -1963,25 +1963,25 @@ class CommonDatautils { while(cur.hasNext()) { dbo = cur.next() if(dbo.value_type == 1){ - dbo.cal_type = "指导价" + dbo.cal_type = "鎸囧浠�" }else if(dbo.value_type == 2){ - dbo.cal_type = "自身样本" + dbo.cal_type = "鑷韩鏍锋湰" }else if(dbo.value_type == 3){ - dbo.cal_type = "第三方" + dbo.cal_type = "绗笁鏂�" }else if(dbo.value_type == 4){ - dbo.cal_type = "交易数据" + dbo.cal_type = "浜ゆ槗鏁版嵁" }else if(dbo.value_type == 5){ - dbo.cal_type = "周边楼盘" + dbo.cal_type = "鍛ㄨ竟妤肩洏" }else if(dbo.value_type == 6){ - dbo.cal_type = "推导" + dbo.cal_type = "鎺ㄥ" }else if(dbo.value_type == 7){ - dbo.cal_type = "周边推算" + dbo.cal_type = "鍛ㄨ竟鎺ㄧ畻" }else if(dbo.value_type == 8){ - dbo.cal_type = "新模型" + dbo.cal_type = "鏂版ā鍨�" }else if(dbo.value_type == 9){ - dbo.cal_type = "神经网络" + dbo.cal_type = "绁炵粡缃戠粶" }else if(dbo.value_type == 10){ - dbo.cal_type = "无方式" + dbo.cal_type = "鏃犳柟寮�" }else{ dbo.cal_type = "" } @@ -2026,12 +2026,12 @@ class CommonDatautils { if(cat == "district"){ BasicDBObject queryObj = new BasicDBObject(); - queryObj.putAt(QueryOperators.IN, ["小区","别墅"]); + queryObj.putAt(QueryOperators.IN, ["灏忓尯","鍒"]); queryCondition.put("estate_type", queryObj); }else if(cat == "office"){ - queryCondition.put("estate_type", "写字楼"); + queryCondition.put("estate_type", "鍐欏瓧妤�"); }else if(cat == "shop"){ - queryCondition.put("estate_type", "商铺"); + queryCondition.put("estate_type", "鍟嗛摵"); } @@ -2150,12 +2150,12 @@ class CommonDatautils { if(cat == "district"){ BasicDBObject queryObj = new BasicDBObject(); - queryObj.putAt(QueryOperators.IN, ["小区","别墅"]); + queryObj.putAt(QueryOperators.IN, ["灏忓尯","鍒"]); queryCondition.put("estate_type", queryObj); }else if(cat == "office"){ - queryCondition.put("estate_type", "写字楼"); + queryCondition.put("estate_type", "鍐欏瓧妤�"); }else if(cat == "shop"){ - queryCondition.put("estate_type", "商铺"); + queryCondition.put("estate_type", "鍟嗛摵"); } DBCursor cur = DIST_STAT_COLL.find(queryCondition).sort(new BasicDBObject().append("weekend", -1)).limit(limit) @@ -2500,9 +2500,9 @@ class CommonDatautils { q.put("city", city); if(region){ q.put("region", region); - q.put("cat", "区域") + q.put("cat", "鍖哄煙") }else{ - q.put("cat", "城市") + q.put("cat", "鍩庡競") } q.put('weekend', weekend); def dbCursor = REGION_STAT_COLL.find(q).sort(new BasicDBObject().append("weekend", -1)).limit(1); @@ -2649,7 +2649,7 @@ class CommonDatautils { } - //println "周边均价:" + totalPrice +"【${url_str}】" + //println "鍛ㄨ竟鍧囦环锛�" + totalPrice +"銆�${url_str}銆�" return avgPrice; } @@ -2727,11 +2727,11 @@ class CommonDatautils { DBObject q = new BasicDBObject() q.put('city', city) q.put('region', region) - q.put("estate_type" , "商铺") - if(name.indexOf("商铺")!=-1){ + q.put("estate_type" , "鍟嗛摵") + if(name.indexOf("鍟嗛摵")!=-1){ def names = []; names << name; - names << name.replace("商铺",""); + names << name.replace("鍟嗛摵",""); BasicDBObject query = new BasicDBObject(); query.putAt(QueryOperators.IN, names); q.put("district_name", query); @@ -2751,7 +2751,7 @@ class CommonDatautils { DBObject q = new BasicDBObject() q.put('city', city) q.put('region', region) - q.put("estate_type" , "商铺") + q.put("estate_type" , "鍟嗛摵") if(alias){ BasicDBObject query = new BasicDBObject(); query.putAt(QueryOperators.IN, alias); @@ -2906,7 +2906,7 @@ class CommonDatautils { q.put("city", city); BasicDBObject queryObj = new BasicDBObject(); - queryObj.putAt(QueryOperators.IN, ["餐厅","美食"]); + queryObj.putAt(QueryOperators.IN, ["椁愬巺","缇庨"]); q.put("business_type", queryObj); q.put("consumption", new BasicDBObject(QueryOperators.GT, 0)); @@ -2935,7 +2935,7 @@ class CommonDatautils { q.put("region", region); } BasicDBObject queryObj = new BasicDBObject(); - queryObj.putAt(QueryOperators.IN, ["餐厅","美食"]); + queryObj.putAt(QueryOperators.IN, ["椁愬巺","缇庨"]); q.put("business_type", queryObj); q.put("consumption", new BasicDBObject(QueryOperators.GT, 0)); @@ -3006,7 +3006,7 @@ class CommonDatautils { public static def findPoiCount(display, lat, lng){ - display = display.toString().replaceAll("数量",""); + display = display.toString().replaceAll("鏁伴噺",""); def ret = 0; def page_num = 0; @@ -3032,7 +3032,7 @@ class CommonDatautils { public static def findPoiCount(display, lat, lng, radius){ - display = display.toString().replaceAll("数量",""); + display = display.toString().replaceAll("鏁伴噺",""); def ret = 0; def page_num = 0; @@ -3057,7 +3057,7 @@ class CommonDatautils { } public static def findPoiDetail(display, lat, lng){ - display = display.toString().replaceAll("数量",""); + display = display.toString().replaceAll("鏁伴噺",""); def ret = []; def page_num = 0; @@ -3117,7 +3117,7 @@ class CommonDatautils { public static def findFilterPoiCount(display, lat, lng, radius){ - display = display.toString().replaceAll("数量",""); + display = display.toString().replaceAll("鏁伴噺",""); def ret = 0; def page_num = 0; @@ -3187,7 +3187,7 @@ class CommonDatautils { static def qqkeys = ["NPPBZ-N3BRP-A2UDB-V3JHM-XBY56-NRF6Y","FOGBZ-CKTWU-476VT-B2IC2-UR5JF-JPBTD","RJ2BZ-HOF2K-4WKJE-ASQ67-MIAC7-MHFHU","Z6MBZ-A7XAU-BXBVS-BP5QS-PH7NS-R3BTC"] public static def findQQPoiCount(display, lat, lng, radius){ Thread.sleep(500); - display = display.toString().replaceAll("数量",""); + display = display.toString().replaceAll("鏁伴噺",""); def ret = 0; def url = "http://apis.map.qq.com/ws/place/v1/search?boundary=nearby("+lat+","+lng+","+radius+")&keyword="+URLEncoder.encode(display,"UTF-8")+"&page_size=20&page_index=1&orderby=_distance&key="+qqkeys[keyIndex]; def content = getContentFromUrl(url); @@ -3217,7 +3217,7 @@ class CommonDatautils { public static def findQQPoiLists(display, lat, lng, radius, maxPage){ - display = display.toString().replaceAll("数量",""); + display = display.toString().replaceAll("鏁伴噺",""); def count = 0; def page_num = 1; @@ -3275,7 +3275,7 @@ class CommonDatautils { return province; } }else{ - return "无结果" + return "鏃犵粨鏋�" } }catch(Exception e){ @@ -3305,7 +3305,7 @@ class CommonDatautils { conn.setRequestMethod("GET"); conn.doOutput = true inputStream = conn.getInputStream(); - BufferedReader buf = new BufferedReader(new InputStreamReader(inputStream,"UTF-8"));// 创建UTF-8的BufferedReader + BufferedReader buf = new BufferedReader(new InputStreamReader(inputStream,"UTF-8"));// 鍒涘缓UTF-8鐨凚ufferedReader while((line = buf.readLine())!=null){ sb.append(line); } @@ -3351,7 +3351,7 @@ class CommonDatautils { } public static def changeAK(){ - System.out.println("更换AK "+AK); + System.out.println("鏇存崲AK "+AK); def AKS = ["hj5KqPjaGA3uivtg8uS8XfAnj9X1kPMr", "xjFg7DfDqvQleIZasM3ph8Zi2Lw8kgCg", "4pb6fzrWIzvibDu8L1o8DGoY2h1wRIUq", "ZzX6mRFfE5GKn4cpUp24Q3OyUIHnfQAR", "79ac4ea49e7dedbf80b0ecd475d07784", "9E99D3540e4dafb7894f7b9fe27fa6b5", "W3M5uHfcrmlAdhQjf6v93LCI", "C8bb035aacf602551e829e4c64575224", @@ -3422,7 +3422,7 @@ class CommonDatautils { for(def obj : cur){ lineIds << obj.line_id; // def line_name = findLineName(obj.line_id); -// if(line_name.contains("轨道交通")){ +// if(line_name.contains("杞ㄩ亾浜ら��")){ // if(!subways.contains(line_name)){ // subways << line_name; // } @@ -3435,7 +3435,7 @@ class CommonDatautils { def lineNames = findLineNames(lineIds); if(lineNames){ for(def line_name : lineNames){ - if(line_name.contains("轨道交通")){ + if(line_name.contains("杞ㄩ亾浜ら��")){ if(!subways.contains(line_name)){ subways << line_name; } @@ -3581,9 +3581,9 @@ class CommonDatautils { queryCondition.put("city", city); if(region){ queryCondition.put("region", region); - queryCondition.put("cat", "区域") + queryCondition.put("cat", "鍖哄煙") }else{ - queryCondition.put("cat", "城市") + queryCondition.put("cat", "鍩庡競") } DBCursor cur = REGION_STAT_COLL.find(queryCondition).sort(new BasicDBObject().append("weekend", sort)).limit(1) cur.setOptions(Bytes.QUERYOPTION_NOTIMEOUT) @@ -3663,7 +3663,7 @@ class CommonDatautils { static def queryCityPriceByWeekend(city, weekend){ DBObject queryCondition = new BasicDBObject() queryCondition.put("city", city); - queryCondition.put("cat", "城市"); + queryCondition.put("cat", "鍩庡競"); queryCondition.put('weekend', DateUtils.parseFromTightYYYYMMDD(weekend)); def obj = REGION_STAT_COLL.findOne(queryCondition) @@ -4036,13 +4036,13 @@ class CommonDatautils { def map = houses[k]; DBObject seawater = new BasicDBObject(map) - if(estate_type2 && estate_type2=="普通住宅"){ - if(seawater.estate_type && (seawater.estate_type.contains("商住") || seawater.estate_type.contains("商业") || seawater.estate_type.contains("商务"))){ + if(estate_type2 && estate_type2=="鏅�氫綇瀹�"){ + if(seawater.estate_type && (seawater.estate_type.contains("鍟嗕綇") || seawater.estate_type.contains("鍟嗕笟") || seawater.estate_type.contains("鍟嗗姟"))){ // println city +" "+name+" "+seawater._id.toString()+" "+seawater.estate_type continue; } -// if(seawater.estate_type&& seawater.estate_type.contains("别墅")){ +// if(seawater.estate_type&& seawater.estate_type.contains("鍒")){ //// println city +" "+name+" "+seawater._id.toString()+" "+seawater.estate_type // continue; // } @@ -4163,8 +4163,8 @@ class CommonDatautils { alias.add(name) } - if(name.contains("弄小区")){ - def newName = name.replace("弄小区","弄") + if(name.contains("寮勫皬鍖�")){ + def newName = name.replace("寮勫皬鍖�","寮�") if(!alias.contains(newName)){ alias << newName } @@ -4190,13 +4190,13 @@ class CommonDatautils { def map = houses[k]; DBObject seawater = new BasicDBObject(map) - if(estate_type2 && estate_type2=="普通住宅"){ - if(seawater.estate_type && (seawater.estate_type.contains("商住") || seawater.estate_type.contains("商业") || seawater.estate_type.contains("商务"))){ + if(estate_type2 && estate_type2=="鏅�氫綇瀹�"){ + if(seawater.estate_type && (seawater.estate_type.contains("鍟嗕綇") || seawater.estate_type.contains("鍟嗕笟") || seawater.estate_type.contains("鍟嗗姟"))){ println city +" "+name+" "+seawater._id.toString()+" "+seawater.estate_type continue; } - if(seawater.estate_type&& seawater.estate_type.contains("别墅")){ + if(seawater.estate_type&& seawater.estate_type.contains("鍒")){ println city +" "+name+" "+seawater._id.toString()+" "+seawater.estate_type continue; } @@ -4231,7 +4231,7 @@ class CommonDatautils { } static def findHousesByLocation(city, region, cat, startDate, endDate, startPrice, endPrice, lng, lat, radius){ - // 构建ElasticSearch查询 + // 鏋勫缓ElasticSearch鏌ヨ QueryBuilder dateRange = QueryBuilders.rangeQuery("p_date") .from(startDate) .to(endDate) @@ -4241,7 +4241,7 @@ class CommonDatautils { BoolQueryBuilder boolQuery = QueryBuilders.boolQuery() .must(dateRange) - // 地理范围查询 + // 鍦扮悊鑼冨洿鏌ヨ if (lng && radius) { QueryBuilder geoQuery = QueryBuilders.geoDistanceQuery("location") .point(lat, lng) @@ -4249,7 +4249,7 @@ class CommonDatautils { boolQuery.must(geoQuery) } - // 价格范围 + // 浠锋牸鑼冨洿 if (startPrice || endPrice) { QueryBuilder priceRange = QueryBuilders.rangeQuery("avg_price") if (startPrice) { @@ -4261,22 +4261,22 @@ class CommonDatautils { boolQuery.must(priceRange) } - // 分类 + // 鍒嗙被 if (cat) { boolQuery.must(QueryBuilders.termQuery("cat", cat)) } boolQuery.must(QueryBuilders.termQuery("city", city)) boolQuery.must(QueryBuilders.termQuery("region", region)) - // 执行查询 + // 鎵ц鏌ヨ 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(hosts.size()) - // 如果需要排序 + // 濡傛灉闇�瑕佹帓搴� def sortBuilder = SortBuilders.fieldSort("p_date").order( SortOrder.DESC) - // 执行查询(假设ElasticUtils支持排序和分页) + // 鎵ц鏌ヨ锛堝亣璁綞lasticUtils鏀寔鎺掑簭鍜屽垎椤碉級 // def result = ElasticUtils.executeQuery(hosts[index],"seawater-20*",boolQuery) def result = ElasticUtils.executeSimpleQuery(hosts[index], "seawater-20*", boolQuery); @@ -4319,8 +4319,8 @@ class CommonDatautils { alias.add(name) } - if(name.contains("弄小区")){ - def newName = name.replace("弄小区","弄") + if(name.contains("寮勫皬鍖�")){ + def newName = name.replace("寮勫皬鍖�","寮�") if(!alias.contains(newName)){ alias << newName } @@ -4358,8 +4358,8 @@ class CommonDatautils { alias.add(name) } - if(name.contains("弄小区")){ - def newName = name.replace("弄小区","弄") + if(name.contains("寮勫皬鍖�")){ + def newName = name.replace("寮勫皬鍖�","寮�") if(!alias.contains(newName)){ alias << newName } @@ -4391,7 +4391,7 @@ class CommonDatautils { static def findNewPoiDatas(city){ - String sql = "select cityname,adname,name,address,location from poi_amap_2024 where (cityname='烟台市' or cityname='北京市') and typecode=120201" + String sql = "select cityname,adname,name,address,location from poi_amap_2024 where (cityname='鐑熷彴甯�' or cityname='鍖椾含甯�') and typecode=120201" def rets = [] def index= 0 ElasticUtils.executeSqlQuery(sql, { map-> @@ -4408,7 +4408,7 @@ class CommonDatautils { def rets = [] def index= 0 ElasticUtils.executeSqlQuery(sql, { map-> -// if(map.address && map.address.contains("五角场")){ +// if(map.address && map.address.contains("浜旇鍦�")){ index++ rets << ["map_id":map.id,"province":map.pname,"city":map.cityname, "district":map.adname, "name":map.name, "address":map.address, "cat":map.type,"lng":map.location.x, "lat":map.location.y, "parent_id":map.parent] // } @@ -4421,7 +4421,7 @@ class CommonDatautils { def index= 0 String sql = "select cityname,adname,name,address,location,type,id,parent from amap_poi_2024 where cityname='${city}'" ElasticUtils.executeSqlQuery(sql, { map-> -// if(map.address && map.address.contains("五角场")){ +// if(map.address && map.address.contains("浜旇鍦�")){ index++ rets << ["map_id":map.id,"province":map.pname,"city":map.cityname, "district":map.adname, "name":map.name, "address":map.address, "cat":map.type,"lng":map.location.x, "lat":map.location.y, "parent_id":map.parent] // } @@ -4456,7 +4456,7 @@ class CommonDatautils { static def findThirdNetWorkOffice(){ - String sql = "select city,region,name,address,location from office where city='烟台' or city='北京'" + String sql = "select city,region,name,address,location from office where city='鐑熷彴' or city='鍖椾含'" def rets = [] def index= 0 ElasticUtils.executeSqlQuery(sql, { map-> @@ -4472,7 +4472,7 @@ class CommonDatautils { return rets; } /** - * 是否是别墅 + * 鏄惁鏄埆澧� * @return */ public static boolean isVilla(Double area, String name, Integer height, Integer room) { @@ -4515,27 +4515,27 @@ class CommonDatautils { if(floorDesc){ floorDesc = floorDesc.replaceAll("[\\s ]+", "") if(floorDesc){ - Pattern pat1 = Pattern.compile("第(\\d{1,2})层"); + 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)?"); + 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.contains("楂樻ゼ灞�") || floorDesc.contains("楂樺眰")){ +// return "楂樺眰" // } // // -// if(floorDesc.contains("低楼层") || floorDesc.contains("低层")){ -// return "低层" +// if(floorDesc.contains("浣庢ゼ灞�") || floorDesc.contains("浣庡眰")){ +// return "浣庡眰" // } if(floorDesc.isNumber()){ return floorDesc; @@ -4549,7 +4549,7 @@ class CommonDatautils { if (directionDesc == null) { return null } - directionDesc = directionDesc.replaceAll("(\\(|(|《|\"|“|【|〔).+?(\\)|》|)|\"|”|】|〕)", "#_#") + directionDesc = directionDesc.replaceAll("(\\(|锛坾銆妡\"|鈥渱銆恷銆�).+?(\\)|銆媩锛墊\"|鈥潀銆憒銆�)", "#_#") StringBuffer sb = new StringBuffer() for (int i = 0; i < directionDesc.length(); i++) { String c = directionDesc.substring(i, i + 1) @@ -4580,7 +4580,7 @@ class CommonDatautils { return null } fitmentDesc = fitmentDesc.replaceAll("[\\s ]+", "") - if (fitmentDesc.equals("非毛坯")) { + if (fitmentDesc.equals("闈炴瘺鍧�")) { return null } Iterator>> it = FITMENTS_TYPES_MAPS @@ -4602,7 +4602,7 @@ class CommonDatautils { } /** - * 是否是别墅 + * 鏄惁鏄埆澧� * @return */ public boolean isVilla(area, name, height, room) { @@ -4692,7 +4692,7 @@ class CommonDatautils { /** - * 根据经纬度获取区域 + * 鏍规嵁缁忕含搴﹁幏鍙栧尯鍩� * @param city * @param location * @return @@ -4726,7 +4726,7 @@ class CommonDatautils { files << tempList[i]; } if (tempList[i].isDirectory()) { - System.out.println("文件夹:" + tempList[i]); + System.out.println("鏂囦欢澶癸細" + tempList[i]); } } return files; @@ -4780,7 +4780,7 @@ class CommonDatautils { def map = houses[k]; if(map.parameter_map){ def pMap = map.parameter_map; - if((pMap.keyword && pMap.keyword.contains("紫金山蘭园")) || (pMap.name && pMap.name.contains("紫金山蘭园"))){ + if((pMap.keyword && pMap.keyword.contains("绱噾灞辫槶鍥�")) || (pMap.name && pMap.name.contains("绱噾灞辫槶鍥�"))){ println map } } @@ -4806,7 +4806,7 @@ class CommonDatautils { String sql = "select * from amap_poi where cityname='${city}' and status=0" def rets = [] ElasticUtils.executeSqlQuery(sql,{data-> -// if(data.name.contains('华山小区G栋')){ +// if(data.name.contains('鍗庡北灏忓尯G鏍�')){ def point = data.location // def tag = null // if(data.get("business.keytag")){ @@ -4827,7 +4827,7 @@ class CommonDatautils { } - //用sql有些字段取不出来 + //鐢╯ql鏈変簺瀛楁鍙栦笉鍑烘潵 static def findDetailLogsBySql(userId, requestUri){ String sql = "select * from open_uri_log where user_id=${userId} and request_uri='${requestUri}' and code!=200" @@ -4938,7 +4938,7 @@ class CommonDatautils { conn.connect(); //println param.toString() - //输出流 + //杈撳嚭娴� if (StringUtils.isNotEmpty(param)) { mWriter = new BufferedWriter(new OutputStreamWriter(conn.getOutputStream(), charset)); mWriter.write(param); @@ -4964,7 +4964,7 @@ class CommonDatautils { /** - * 获取小区周边一公里小区数量 + * 鑾峰彇灏忓尯鍛ㄨ竟涓�鍏噷灏忓尯鏁伴噺 * @param city * @param lng * @param lat @@ -4976,7 +4976,7 @@ class CommonDatautils { query.append("cat", "district") query.append("city", city) query.append("visible", 0) - query.append("name", "长城大厦") + query.append("name", "闀垮煄澶у帵") DBObject sdq = new BasicDBObject(); sdq.put("sd.point", lat + "," + lng); sdq.put("sd.sfield", "lat_lng"); @@ -5105,18 +5105,18 @@ class CommonDatautils { def retMap = [:] for(def d : dbcursor){ def fjwcity = null - if(d.level == "城市"){ + if(d.level == "鍩庡競"){ fjwcity = RegionData.formatCity(d.city) if(!fjwcity){ - if(d.city == "市辖区"){ + if(d.city == "甯傝緰鍖�"){ fjwcity = RegionData.formatCity(d.province) if(fjwcity){ d.city = d.province } } } - }else if(d.level == "区域"){ - if(d.administer == "省直辖县级行政区划"){ + }else if(d.level == "鍖哄煙"){ + if(d.administer == "鐪佺洿杈栧幙绾ц鏀垮尯鍒�"){ fjwcity = RegionData.formatCity(d.city) if(fjwcity){ d.city = d.district @@ -5126,7 +5126,7 @@ class CommonDatautils { if(fjwcity){ retMap.put(fjwcity, d) }else{ - println d.toString() +" 格式化不成功!" + println d.toString() +" 鏍煎紡鍖栦笉鎴愬姛锛�" } } return retMap; @@ -5135,7 +5135,7 @@ class CommonDatautils { static def queryFullNameByCity(){ def q = new BasicDBObject() - q.put("type","城市") + q.put("type","鍩庡競") def dbcursor = ADMINISTRATIVE_MAPPING_COLL.find(q) def cityMap = [:] for(def d : dbcursor){ @@ -5143,7 +5143,7 @@ class CommonDatautils { if(city){ cityMap.put(city, d) }else{ - //println d.city +" 格式化不出" + //println d.city +" 鏍煎紡鍖栦笉鍑�" } } @@ -5152,7 +5152,7 @@ class CommonDatautils { static def findFullNameCitys(){ def q = new BasicDBObject() - q.put("type","城市") + q.put("type","鍩庡競") def keys = new BasicDBObject() keys.put("city", 1) @@ -5168,7 +5168,7 @@ class CommonDatautils { static def queryDistNameByCity(){ def q = new BasicDBObject() - q.put("type","区域") + q.put("type","鍖哄煙") q.put("district_diff",1) def keys = new BasicDBObject() @@ -5190,11 +5190,11 @@ class CommonDatautils { regions << d regionMap.put(d.city, regions) }else{ - println d.province+" "+d.district +" 格式化不出民政部区域" + println d.province+" "+d.district +" 鏍煎紡鍖栦笉鍑烘皯鏀块儴鍖哄煙" } } - println "区域加载完成" + println "鍖哄煙鍔犺浇瀹屾垚" return regionMap } @@ -5216,7 +5216,7 @@ class CommonDatautils { static def queryAllRegionNameByCity(){ def q = new BasicDBObject() - q.put("type","区域") + q.put("type","鍖哄煙") q.put("district_diff",1) def keys = new BasicDBObject() @@ -5239,7 +5239,7 @@ class CommonDatautils { static def getRegionShortName(city){ def q = new BasicDBObject() - q.put("type","区域") + q.put("type","鍖哄煙") q.put("district_diff",1) q.put("city", city) @@ -5257,7 +5257,7 @@ class CommonDatautils { static def queryAllRegionFullNameByCity(){ def q = new BasicDBObject() - q.put("type","区域") + q.put("type","鍖哄煙") q.put("district_diff",1) def keys = new BasicDBObject() @@ -5282,7 +5282,7 @@ class CommonDatautils { static def queryAllStreetNameByCity(city){ def q = new BasicDBObject() - q.put("type","乡镇街道") + q.put("type","涔¢晣琛楅亾") q.put("city", city) def keys = new BasicDBObject() @@ -5300,9 +5300,9 @@ class CommonDatautils { static def queryCommunityByCity(){ def q = new BasicDBObject() - q.put("type","乡镇街道") -// q.put("province",new BasicDBObject('$in', ['浙江省','江苏省','山东省'])) - q.put("city",new BasicDBObject('$in', ["深圳市"])) + q.put("type","涔¢晣琛楅亾") +// q.put("province",new BasicDBObject('$in', ['娴欐睙鐪�','姹熻嫃鐪�','灞变笢鐪�'])) + q.put("city",new BasicDBObject('$in', ["娣卞湷甯�"])) def keys = new BasicDBObject() keys.put("province",1) @@ -5323,13 +5323,13 @@ class CommonDatautils { townMap.put(key, list) } - println "乡镇街道 加载完成" + println "涔¢晣琛楅亾 鍔犺浇瀹屾垚" return townMap } static def queryMzbRegion(city){ def q = new BasicDBObject() - q.put("type","区域") + q.put("type","鍖哄煙") q.put("city",city) def keys = new BasicDBObject() keys.put("district",1) @@ -5346,7 +5346,7 @@ class CommonDatautils { static def queryTownByCity(city, fields, mzbRegionMap){ def q = new BasicDBObject() - q.put("type","乡镇街道") + q.put("type","涔¢晣琛楅亾") q.put("city",city) def keys = new BasicDBObject() @@ -5365,14 +5365,14 @@ class CommonDatautils { townMap.put(key, list) } - println "[${city}] 乡镇街道 加载完成 "+new Date().format("yyyy-MM-dd HH:mm:ss") + println "[${city}] 涔¢晣琛楅亾 鍔犺浇瀹屾垚 "+new Date().format("yyyy-MM-dd HH:mm:ss") return townMap } static def queryTownByCity(city, fields){ def q = new BasicDBObject() - q.put("type","乡镇街道") + q.put("type","涔¢晣琛楅亾") q.put("city",city) def keys = new BasicDBObject() @@ -5397,7 +5397,7 @@ class CommonDatautils { townMap.put(distName, list) } } -// println "[${city}] 乡镇街道 加载完成 "+new Date().format("yyyy-MM-dd HH:mm:ss") +// println "[${city}] 涔¢晣琛楅亾 鍔犺浇瀹屾垚 "+new Date().format("yyyy-MM-dd HH:mm:ss") return townMap } @@ -5406,7 +5406,7 @@ class CommonDatautils { static def queryAllTown(fields){ def q = new BasicDBObject() - q.put("type","乡镇街道") + q.put("type","涔¢晣琛楅亾") def keys = new BasicDBObject() for(def key : fields){ @@ -5436,7 +5436,7 @@ class CommonDatautils { townMap.put(distName, list) } } -// println "[${city}] 乡镇街道 加载完成 "+new Date().format("yyyy-MM-dd HH:mm:ss") +// println "[${city}] 涔¢晣琛楅亾 鍔犺浇瀹屾垚 "+new Date().format("yyyy-MM-dd HH:mm:ss") return cityMap } @@ -5445,7 +5445,7 @@ class CommonDatautils { static def queryFullRegionTownByCity(city, fields){ def q = new BasicDBObject() - q.put("type","乡镇街道") + q.put("type","涔¢晣琛楅亾") q.put("city",city) def keys = new BasicDBObject() @@ -5464,7 +5464,7 @@ class CommonDatautils { townMap.put(d.district, list) } } - println "[${city}] 乡镇街道 加载完成 "+new Date().format("yyyy-MM-dd HH:mm:ss") + println "[${city}] 涔¢晣琛楅亾 鍔犺浇瀹屾垚 "+new Date().format("yyyy-MM-dd HH:mm:ss") return townMap } @@ -5474,7 +5474,7 @@ class CommonDatautils { static def queryTownByCity(city){ def q = new BasicDBObject() - q.put("type","乡镇街道") + q.put("type","涔¢晣琛楅亾") q.put("city",city) def keys = new BasicDBObject() @@ -5496,7 +5496,7 @@ class CommonDatautils { townMap.put(key, list) } - println "[${city}] 乡镇街道 加载完成 "+new Date().format("yyyy-MM-dd HH:mm:ss") + println "[${city}] 涔¢晣琛楅亾 鍔犺浇瀹屾垚 "+new Date().format("yyyy-MM-dd HH:mm:ss") return townMap } @@ -5504,7 +5504,7 @@ class CommonDatautils { static def queryNewTownByCity(){ def q = new BasicDBObject() - q.put("type","乡镇街道") + q.put("type","涔¢晣琛楅亾") def keys = new BasicDBObject() @@ -5533,13 +5533,13 @@ class CommonDatautils { static def queryDistNameCity(){ def q = new BasicDBObject() - q.put("level","区域") + q.put("level","鍖哄煙") def dbcursor = administrative_division_100_CONN.find(q) def retMap = [:] for(def d : dbcursor){ - if(d.city == "省直辖县级行政区划"){ + if(d.city == "鐪佺洿杈栧幙绾ц鏀垮尯鍒�"){ continue - }else if(d.city == "市辖区"){ + }else if(d.city == "甯傝緰鍖�"){ def fjwcity = RegionData.formatCity(d.province) if(fjwcity){ def fjwdist = RegionData.formatRegion(fjwcity, d.district) @@ -5559,7 +5559,7 @@ class CommonDatautils { static def queryDistNameCityByMapping(){ def q = new BasicDBObject() - q.put("type","区域") + q.put("type","鍖哄煙") q.put("district_diff", 1) def dbcursor = ADMINISTRATIVE_MAPPING_COLL.find(q) def retMap = [:] @@ -5592,7 +5592,7 @@ class CommonDatautils { for(def d : dbsour){ rets << d } - println "[${city}] 小区量:"+rets.size() + println "[${city}] 灏忓尯閲忥細"+rets.size() return rets; } @@ -5637,7 +5637,7 @@ class CommonDatautils { if(addressComponent.city.size()>0){ city = addressComponent.city }else{ - if(addressComponent.province && (addressComponent.province.endsWith("省") || addressComponent.province.endsWith("自治区"))){ + if(addressComponent.province && (addressComponent.province.endsWith("鐪�") || addressComponent.province.endsWith("鑷不鍖�"))){ city = addressComponent.district }else{ city = addressComponent.province @@ -5770,11 +5770,11 @@ class CommonDatautils { if(!retMap.get("cityhouse") && d.get("cityhouse_esf_price")){ retMap.put("cityhouse", d.get("cityhouse_esf_price")) } - if(!retMap.get("jiwu") && d.get("jiwu_esf_price")){//使用吉屋替换房探 待抓取 + if(!retMap.get("jiwu") && d.get("jiwu_esf_price")){//浣跨敤鍚夊眿鏇挎崲鎴挎帰 寰呮姄鍙� retMap.put("jiwu", d.get("jiwu_esf_price")) } - if(!retMap.get("house365") && d.get("365house_esf_price")){//使用淘房365替换房多多 + if(!retMap.get("house365") && d.get("365house_esf_price")){//浣跨敤娣樻埧365鏇挎崲鎴垮澶� retMap.put("house365", d.get("365house_esf_price")) } @@ -5820,7 +5820,7 @@ class CommonDatautils { def rets = [] def index= 0 ElasticUtils89.executeQuery("192.168.0.89", "gaode_map_poi_2024", queryBuilder, { String id, Map map-> -// if(map.address && map.address.contains("五角场")){ +// if(map.address && map.address.contains("浜旇鍦�")){ index++ rets << ["map_id":map.data_id,"province":map.province,"city":map.city, "district":map.district, "name":map.name, "address":map.address, "cat":map.type,"lng":map.location.lon, "lat":map.location.lat, "parent_id":map.parent] @@ -5877,7 +5877,7 @@ class CommonDatautils { HttpRequest request = new HttpRequest() String res = request.postWithBody(seawaterUrl, JSONObject.fromObject(body.toString()), header, "UTF-8") def response = new JsonSlurper().parseText(res) -// if(name=="河北河间经济开发区"){ +// if(name=="娌冲寳娌抽棿缁忔祹寮�鍙戝尯"){ // println name // } def esObj = null @@ -5885,21 +5885,21 @@ class CommonDatautils { def hits = response.hits.hits if(hits){ def d = hits[0] -// if(d._source.cat.contains("住宅")){ +// if(d._source.cat.contains("浣忓畢")){ def source = d._source def newName = source.name if(newName == name){ esObj = source - }else if (newName.contains("开发区") && name.contains("开发区") && (newName.contains(name) || name.contains(newName))){ + }else if (newName.contains("寮�鍙戝尯") && name.contains("寮�鍙戝尯") && (newName.contains(name) || name.contains(newName))){ esObj = source - }else if(newName.contains("园区") && name.contains("园区") && (newName.contains(name) || name.contains(newName))){ + }else if(newName.contains("鍥尯") && name.contains("鍥尯") && (newName.contains(name) || name.contains(newName))){ esObj = source - }else if(newName.contains("示范区") && name.contains("示范区") && (newName.contains(name) || name.contains(newName))){ + }else if(newName.contains("绀鸿寖鍖�") && name.contains("绀鸿寖鍖�") && (newName.contains(name) || name.contains(newName))){ esObj = source }else{ - if(name.contains("开发区")){ - name = name.replace("国家高新技术产业开发区","").replace("高新技术产业开发区","").replace("经济技术开发区","").replace("经济开发区", "") - newName = newName.replace("国家高新技术产业开发区","").replace("高新技术产业开发区","").replace("经济技术开发区","").replace("经济开发区", "") + if(name.contains("寮�鍙戝尯")){ + name = name.replace("鍥藉楂樻柊鎶�鏈骇涓氬紑鍙戝尯","").replace("楂樻柊鎶�鏈骇涓氬紑鍙戝尯","").replace("缁忔祹鎶�鏈紑鍙戝尯","").replace("缁忔祹寮�鍙戝尯", "") + newName = newName.replace("鍥藉楂樻柊鎶�鏈骇涓氬紑鍙戝尯","").replace("楂樻柊鎶�鏈骇涓氬紑鍙戝尯","").replace("缁忔祹鎶�鏈紑鍙戝尯","").replace("缁忔祹寮�鍙戝尯", "") } if(newName == name){ esObj = source @@ -5916,7 +5916,7 @@ class CommonDatautils { q.put("city", city) q.put("district", district) q.put("name", name) - q.put('std_tag', '房地产;住宅区') + q.put('std_tag', '鎴垮湴浜�;浣忓畢鍖�') def dbcursor = BAIDU_POI_COLL.find(q) def address = null diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/commData/DataStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/commData/DataStat.groovy index 0b847cc97..09a01ef0b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/commData/DataStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/commData/DataStat.groovy @@ -46,11 +46,11 @@ class DataStat { println shopPrices.rent println officePrices.sell println officePrices.rent - writeExcelCity(city, carHouseMap,avg_consumption,avg_build_area,roomPrices, shopPrices, officePrices,"e:\\统计数据.cvs"); + writeExcelCity(city, carHouseMap,avg_consumption,avg_build_area,roomPrices, shopPrices, officePrices,"e:\\缁熻鏁版嵁.cvs"); } } - //市均停车位比例 + //甯傚潎鍋滆溅浣嶆瘮渚� def carSiteAndHouseCountProportion(def city, def ret){ def car_sites = []; @@ -81,7 +81,7 @@ class DataStat { return map; } - //市场餐饮人均消费 + //甯傚満椁愰ギ浜哄潎娑堣垂 def personConsumption(def city){ def prices = findBusinessShopConsumption(city); if(prices.size()>0){ @@ -92,7 +92,7 @@ class DataStat { return 0; } - //市均商场建筑面积 + //甯傚潎鍟嗗満寤虹瓚闈㈢Н def shopBuildArea(def city, def ret){ def buildAreas = []; @@ -107,7 +107,7 @@ class DataStat { def avg_build_area = getMidValue(buildAreas); return avg_build_area; } - //城市平均租金--住宅 + //鍩庡競骞冲潎绉熼噾--浣忓畢 def districtAvgRent(def city){ def weekend = DateUtils.add(DateUtils.formatToYYYYMMDD(DateUtils.getFirstDayOfMonth(new Date())),-1); def price1s = findDistrictRentStatAvgPrice(city, weekend, 1) @@ -121,7 +121,7 @@ class DataStat { map.room4 = getAvgValue(price4s).toInteger(); return map; } - //城市平均租金--商铺 + //鍩庡競骞冲潎绉熼噾--鍟嗛摵 def shopAvgRent(def city){ def shop_sell_avg_price = findCityAvgRent(city, "shop_sell"); def shop_rent_avg_price = findCityAvgRent(city, "shop_rent"); @@ -130,7 +130,7 @@ class DataStat { map.rent = shop_rent_avg_price; return map; } - //城市平均租金--写字楼 + //鍩庡競骞冲潎绉熼噾--鍐欏瓧妤� def officeAvgRent(def city){ def office_sell_avg_price = findCityAvgRent(city, "office_sell"); def office_rent_avg_price = findCityAvgRent(city, "office_rent"); @@ -156,7 +156,7 @@ class DataStat { def findBusinessShopConsumption(def city){ DBObject q = new BasicDBObject() q.put("city", city); - q.put("business_type", "餐厅"); + q.put("business_type", "椁愬巺"); q.put("consumption", new BasicDBObject(QueryOperators.GT, 10)); DBObject keys = new BasicDBObject() @@ -205,10 +205,10 @@ class DataStat { } def parserBuildArea(def old_build_area){ - String buildArea = old_build_area.replace("暂无资料", ""); + String buildArea = old_build_area.replace("鏆傛棤璧勬枡", ""); def area = 0; if(buildArea){ - buildArea = patternParse(buildArea, "([0-9\\.]+)[平方米|平方|平米|㎡]?"); + buildArea = patternParse(buildArea, "([0-9\\.]+)[骞虫柟绫硘骞虫柟|骞崇背|銕?"); int buildAreaNum = isNumber(buildArea, old_build_area); area = buildAreaNum; } @@ -232,7 +232,7 @@ class DataStat { try{ double d = Double.valueOf(value); - if(buildArea.indexOf("万")!=-1){ + if(buildArea.indexOf("涓�")!=-1){ d = d * 10000; } int a = (int) d; @@ -249,7 +249,7 @@ class DataStat { - //日平均房源发布量 + //鏃ュ钩鍧囨埧婧愬彂甯冮噺 def houseCountStat(){ def days = findNearDay(10); @@ -286,17 +286,17 @@ class DataStat { if (file.exists()){ file.delete(); } - file.append("城市,") - file.append("市均停车位占比,") - file.append("市均餐饮人均消费,") - file.append("市二手房1室租金,") - file.append("市二手房2室租金,") - file.append("市二手房3室租金,") - file.append("市二手房4室租金,") - file.append("商铺市平均租金,") - file.append("商铺市平均售价,") - file.append("写字楼市平均租金,") - file.append("写字楼市平均售价,") + file.append("鍩庡競,") + file.append("甯傚潎鍋滆溅浣嶅崰姣�,") + file.append("甯傚潎椁愰ギ浜哄潎娑堣垂,") + file.append("甯備簩鎵嬫埧1瀹ょ閲�,") + file.append("甯備簩鎵嬫埧2瀹ょ閲�,") + file.append("甯備簩鎵嬫埧3瀹ょ閲�,") + file.append("甯備簩鎵嬫埧4瀹ょ閲�,") + file.append("鍟嗛摵甯傚钩鍧囩閲�,") + file.append("鍟嗛摵甯傚钩鍧囧敭浠�,") + file.append("鍐欏瓧妤煎競骞冲潎绉熼噾,") + file.append("鍐欏瓧妤煎競骞冲潎鍞环,") file.append(System.getProperty("line.separator")); def index = 0; @@ -319,7 +319,7 @@ class DataStat { } def test(){ - def citys = ["齐齐哈尔","常德","大同","银川","西宁","绵阳","吉林","邯郸","湛江","潍坊","保定","秦皇岛","宜昌","鞍山","大庆","徐州","株洲","赣州","芜湖","九江","泰州","洛阳","湖州","江门","珠海","连云港","桂林","马鞍山","柳州","淄博","盐城","本溪","汕头","衡阳","揭阳","茂名","牡丹江","平顶山","和田","昌吉","阿勒泰","昌都","林芝","锡林郭勒盟","阿拉善盟","三沙","阿克苏","毕节","楚雄","临夏","海北州","黄南州","果洛州","玉树州","海西州","阿坝州","凉山州","怒江州","迪庆州","西双版纳州","德宏州","喀什","塔城","神农架","定安","屯昌","澄迈","临高"]; + def citys = ["榻愰綈鍝堝皵","甯稿痉","澶у悓","閾跺窛","瑗垮畞","缁甸槼","鍚夋灄","閭兏","婀涙睙","娼嶅潑","淇濆畾","绉︾殗宀�","瀹滄槍","闉嶅北","澶у簡","寰愬窞","鏍床","璧e窞","鑺滄箹","涔濇睙","娉板窞","娲涢槼","婀栧窞","姹熼棬","鐝犳捣","杩炰簯娓�","妗傛灄","椹瀺灞�","鏌冲窞","娣勫崥","鐩愬煄","鏈邯","姹曞ご","琛¢槼","鎻槼","鑼傚悕","鐗′腹姹�","骞抽《灞�","鍜岀敯","鏄屽悏","闃垮嫆娉�","鏄岄兘","鏋楄姖","閿℃灄閮嫆鐩�","闃挎媺鍠勭洘","涓夋矙","闃垮厠鑻�","姣曡妭","妤氶泟","涓村","娴峰寳宸�","榛勫崡宸�","鏋滄礇宸�","鐜夋爲宸�","娴疯タ宸�","闃垮潩宸�","鍑夊北宸�","鎬掓睙宸�","杩簡宸�","瑗垮弻鐗堢撼宸�","寰峰畯宸�","鍠�浠�","濉斿煄","绁炲啘鏋�","瀹氬畨","灞槍","婢勮繄","涓撮珮"]; for(def city : citys){ DBObject q = new BasicDBObject() q.put("city", city); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/commData/DeleteWebpage.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/commData/DeleteWebpage.groovy index f93ea4f67..912bdd077 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/commData/DeleteWebpage.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/commData/DeleteWebpage.groovy @@ -9,7 +9,7 @@ class DeleteWebpage { public static final DBCollection WEBPAGE_COLL = MongoUtils.getCollectionByName("fangjia", "webpage", "webpage.mongo.db.fangjia.com", 27001) static main(args) { - DeleteWebpage.process("搜房", "首页", "shop"); + DeleteWebpage.process("鎼滄埧", "棣栭〉", "shop"); println "delete finish..............." } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/commData/MaiDangLaoData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/commData/MaiDangLaoData.groovy index 7daa69d23..2bf36220f 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/commData/MaiDangLaoData.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/commData/MaiDangLaoData.groovy @@ -81,7 +81,7 @@ class MaiDangLaoData { conn.setRequestMethod("GET"); conn.doOutput = true inputStream = conn.getInputStream(); - BufferedReader buf = new BufferedReader(new InputStreamReader(inputStream,"UTF-8"));// 创建UTF-8的BufferedReader + BufferedReader buf = new BufferedReader(new InputStreamReader(inputStream,"UTF-8"));// 鍒涘缓UTF-8鐨凚ufferedReader while((line = buf.readLine())!=null){ sb.append(line); } @@ -102,7 +102,7 @@ class MaiDangLaoData { private def writeCSV(def list){ - File file = new File("e:\\mdl(原始).csv"); + File file = new File("e:\\mdl(鍘熷).csv"); if (file.exists()){ file.delete(); } @@ -127,8 +127,8 @@ class MaiDangLaoData { def getMDLData(){ DBObject q = new BasicDBObject(); - q.put("city", "上海"); - q.put("kind", "麦当劳"); + q.put("city", "涓婃捣"); + q.put("kind", "楹﹀綋鍔�"); def dbcursor = ONLINE_DATA_COLL.find(q) def list = []; for(def obj : dbcursor){ 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 5edea094e..e12f856d2 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 @@ -160,11 +160,11 @@ class DataHandleUtils { } /** - * 求给定双精度数组中值的方差 + * 姹傜粰瀹氬弻绮惧害鏁扮粍涓�肩殑鏂瑰樊 * * @param inputData - * 输入数据数组 - * @return 运算结果 + * 杈撳叆鏁版嵁鏁扮粍 + * @return 杩愮畻缁撴灉 */ public static double getVariance(def inputData) { int count = getCount(inputData); @@ -178,11 +178,11 @@ class DataHandleUtils { /** - * 求给定双精度数组中值的数目 + * 姹傜粰瀹氬弻绮惧害鏁扮粍涓�肩殑鏁扮洰 * * @param input - * Data 输入数据数组 - * @return 运算结果 + * Data 杈撳叆鏁版嵁鏁扮粍 + * @return 杩愮畻缁撴灉 */ public static int getCount(def inputData) { if (inputData == null) @@ -193,11 +193,11 @@ class DataHandleUtils { /** - * 求给定双精度数组中值的平方和 + * 姹傜粰瀹氬弻绮惧害鏁扮粍涓�肩殑骞虫柟鍜� * * @param inputData - * 输入数据数组 - * @return 运算结果 + * 杈撳叆鏁版嵁鏁扮粍 + * @return 杩愮畻缁撴灉 */ public static double getSquareSum(def inputData) { if(inputData==null||inputData.size()==0) @@ -214,11 +214,11 @@ class DataHandleUtils { /** - * 求给定双精度数组中值的平均值 + * 姹傜粰瀹氬弻绮惧害鏁扮粍涓�肩殑骞冲潎鍊� * * @param inputData - * 输入数据数组 - * @return 运算结果 + * 杈撳叆鏁版嵁鏁扮粍 + * @return 杩愮畻缁撴灉 */ public static double getAverage(def inputData) { if (inputData == null || inputData.size() == 0) @@ -232,11 +232,11 @@ class DataHandleUtils { /** - * 求给定双精度数组中值的和 + * 姹傜粰瀹氬弻绮惧害鏁扮粍涓�肩殑鍜� * * @param inputData - * 输入数据数组 - * @return 运算结果 + * 杈撳叆鏁版嵁鏁扮粍 + * @return 杩愮畻缁撴灉 */ public static double getSum(def inputData) { if (inputData == null || inputData.size() == 0) @@ -253,7 +253,7 @@ class DataHandleUtils { public static isStandardRoad(def s){ - def pattern = Pattern.compile("[路|街道|大道|巷|胡同|街|坊]\\d+(-\\d+)?(号|弄)"); + def pattern = Pattern.compile("[璺瘄琛楅亾|澶ч亾|宸穦鑳″悓|琛梶鍧奭\\d+(-\\d+)?(鍙穦寮�)"); def matcher = pattern.matcher(s) if(matcher.find()){ return true; @@ -265,7 +265,7 @@ class DataHandleUtils { static main(args) { - def a = isStandardRoad("杨桥西路236号") + def a = isStandardRoad("鏉ㄦˉ瑗胯矾236鍙�") println a } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/common/OtherPriceUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/common/OtherPriceUtils.groovy index 2c3880ef2..a2e6a9a1c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/common/OtherPriceUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/common/OtherPriceUtils.groovy @@ -19,7 +19,7 @@ class OtherPriceUtils { if(city && region && name){ def priceObj = findFangguguAndYungujiaPrice(city, region, name); - //其它网站价格 + //鍏跺畠缃戠珯浠锋牸 def rMap = findNetworkPrice(city, region, name, startDate.toInteger()); if(priceObj){ @@ -309,9 +309,9 @@ class OtherPriceUtils { /** * - * @param retMap 等级map - * @param otherPriceRets 第三方价格 - * @param credit 均价可信度 + * @param retMap 绛夌骇map + * @param otherPriceRets 绗笁鏂逛环鏍� + * @param credit 鍧囦环鍙俊搴� * @return */ public static Integer fatchLastAvgPrice(Map retMap, Map otherPriceRets, def credit){ @@ -383,7 +383,7 @@ class OtherPriceUtils { List> values = new ArrayList>(); int fjw_price = avgPrice; - //找出最小差 + //鎵惧嚭鏈�灏忓樊 for(int i=0;i", "").replace("", "").replace("eval(y.replace(/\\b\\w+\\b/g, function(y){return x[f(y,z)-1]}));", "y.replace(/\\b\\w+\\b/g, function(y){return x[f(y,z)-1]})"); try { - //得到解密后的js + //寰楀埌瑙e瘑鍚庣殑js js = js.replace("document.cookie","var cookie") js = js.replace("location.href=location.pathname+location.search", "") engine.eval(js); @@ -448,17 +448,17 @@ class GsxtCrawl { def getJsContent2(def page){ ScriptEngineManager manager = new ScriptEngineManager(); -//得到脚本引擎 +//寰楀埌鑴氭湰寮曟搸 ScriptEngine engine = manager.getEngineByName("javascript"); -//处理加密js +//澶勭悊鍔犲瘑js String js = page.trim().replace("", "").replace("eval(y.replace(/\\b\\w+\\b/g, function(y){return x[f(y,z)-1]}));", "y.replace(/\\b\\w+\\b/g, function(y){return x[f(y,z)-1]})"); try { - //得到解密后的js - //得到解密后的js + //寰楀埌瑙e瘑鍚庣殑js + //寰楀埌瑙e瘑鍚庣殑js String result = (String) engine.eval(js); result = result.substring(result.indexOf("var cd"),result.indexOf("dc+=cd;")+7); result = result.replaceAll("document*.*toLowerCase\\(\\)", "'x'"); - //得到cookie + //寰楀埌cookie String jsl = (String) engine.eval(result); return jsl; } catch (ScriptException e) { @@ -470,36 +470,36 @@ class GsxtCrawl { /** - * 通过破解动态JavaScript脚本, - * 获取cookie名为 __jsl_clearance的值 + * 閫氳繃鐮磋В鍔ㄦ�丣avaScript鑴氭湰, + * 鑾峰彇cookie鍚嶄负 __jsl_clearance鐨勫�� * - * @param body 相应内容(一般为第一次请求获取到的动态js字符串) - * @return cookie名为 __jsl_clearance的值 + * @param body 鐩稿簲鍐呭(涓�鑸负绗竴娆¤姹傝幏鍙栧埌鐨勫姩鎬乯s瀛楃涓�) + * @return cookie鍚嶄负 __jsl_clearance鐨勫�� */ private static String getJslClearance(String body) { - //V8:谷歌开源的运行JavaScript脚本的库. 参数:globalAlias=window, 表示window为全局别名, - // 告诉V8在运行JavaScript代码时, 不要从代码里找window的定义. + //V8:璋锋瓕寮�婧愮殑杩愯JavaScript鑴氭湰鐨勫簱. 鍙傛暟:globalAlias=window, 琛ㄧずwindow涓哄叏灞�鍒悕, + // 鍛婅瘔V8鍦ㄨ繍琛孞avaScript浠g爜鏃�, 涓嶈浠庝唬鐮侀噷鎵緒indow鐨勫畾涔�. V8 runtime = V8.createV8Runtime("window"); - //将第一次请求pdf资源时获取到的字符串提取成V8可执行的JavaScript代码 + //灏嗙涓�娆¤姹俻df璧勬簮鏃惰幏鍙栧埌鐨勫瓧绗︿覆鎻愬彇鎴怴8鍙墽琛岀殑JavaScript浠g爜 body = body.trim() .replace("", "") .replace("eval(y.replace(/\\b\\w+\\b/g, function(y){return x[f(y,z)-1]||(\"_\"+y)}))", "y.replace(/\\b\\w+\\b/g, function(y){return x[f(y,z)-1]||(\"_\"+y)})"); - //用V8执行该段代码获取新的动态JavaScript脚本 + //鐢╒8鎵ц璇ユ浠g爜鑾峰彇鏂扮殑鍔ㄦ�丣avaScript鑴氭湰 String result = runtime.executeStringScript(body); - //获取 jsl_clearance 的第一段, 格式形如: 1543915851.312|0| + //鑾峰彇 jsl_clearance 鐨勭涓�娈�, 鏍煎紡褰㈠: 1543915851.312|0| String startStr = "document.cookie='"; int i1 = result.indexOf(startStr) + startStr.length(); int i2 = result.indexOf("|0|"); String cookie1 = result.substring(i1, i2 + 3); /* - 获取 jsl_clearance 的第二段,格式形如: DW2jqgJO5Bo45yYRKLlFbnqQuD0%3D。 - 主要原理是: 新的动态JavaScript脚本是为浏览器设置cookie, 且cookie名为__jsl_clearance - 其中第一段值(格式形如:1543915851.312|0|)已经明文写好, 用字符串处理方法即可获取. - 第二段则是一段JavaScript函数, 需要有V8运行返回, - 该函数代码需要通过一些字符串定位, 提取出来, 交给V8运行. + 鑾峰彇 jsl_clearance 鐨勭浜屾,鏍煎紡褰㈠: DW2jqgJO5Bo45yYRKLlFbnqQuD0%3D銆� + 涓昏鍘熺悊鏄�: 鏂扮殑鍔ㄦ�丣avaScript鑴氭湰鏄负娴忚鍣ㄨ缃甤ookie, 涓攃ookie鍚嶄负__jsl_clearance + 鍏朵腑绗竴娈靛��(鏍煎紡褰㈠:1543915851.312|0|)宸茬粡鏄庢枃鍐欏ソ, 鐢ㄥ瓧绗︿覆澶勭悊鏂规硶鍗冲彲鑾峰彇. + 绗簩娈靛垯鏄竴娈礘avaScript鍑芥暟, 闇�瑕佹湁V8杩愯杩斿洖, + 璇ュ嚱鏁颁唬鐮侀渶瑕侀�氳繃涓�浜涘瓧绗︿覆瀹氫綅, 鎻愬彇鍑烘潵, 浜ょ粰V8杩愯. */ startStr = "|0|'+(function(){"; int i3 = result.indexOf(startStr) + startStr.length(); @@ -508,19 +508,19 @@ class GsxtCrawl { String cookie2 = runtime.executeStringScript(code); /* - 拼接两段字符串, 返回jsl_clearance的完整的值. - 格式形如: 1543915851.312|0|DW2jqgJO5Bo45yYRKLlFbnqQuD0%3D + 鎷兼帴涓ゆ瀛楃涓�, 杩斿洖jsl_clearance鐨勫畬鏁寸殑鍊�. + 鏍煎紡褰㈠: 1543915851.312|0|DW2jqgJO5Bo45yYRKLlFbnqQuD0%3D */ return cookie1 + cookie2; } /** - * 将HTTP响应体转换为字符串返回 + * 灏咹TTP鍝嶅簲浣撹浆鎹负瀛楃涓茶繑鍥� * - * @param response HTTP响应 - * @return 响应体的字符串形式 - * @throws IOException IO异常 + * @param response HTTP鍝嶅簲 + * @return 鍝嶅簲浣撶殑瀛楃涓插舰寮� + * @throws IOException IO寮傚父 */ private static String getResponseBodyAsString(HttpResponse response) throws IOException { return IOUtils.toString(response.getEntity().getContent(), "UTF-8"); @@ -543,7 +543,7 @@ class GsxtCrawl { def fristCrawl(){ def responseMap = [:] try { - //headers信息 + //headers淇℃伅 Map headers = new LinkedHashMap() headers.put("Host","www.gsxt.gov.cn") headers.put("Connection","keep-alive") @@ -570,7 +570,7 @@ class GsxtCrawl { def url = "http://www.gsxt.gov.cn/corp-query-search-1.html " for(def key : companyKeys){ - // def queryBody = "tab=ent_tab&province=&geetest_challenge=1f31bf4565a8f89b93f4f4b25bb2143a&geetest_validate=9584ff51b3aff476fcac55248ec14459&geetest_seccode=9584ff51b3aff476fcac55248ec14459%7Cjordan&token=115406527&searchword="+ URLEncoder.encode("宏美", "utf-8") + // def queryBody = "tab=ent_tab&province=&geetest_challenge=1f31bf4565a8f89b93f4f4b25bb2143a&geetest_validate=9584ff51b3aff476fcac55248ec14459&geetest_seccode=9584ff51b3aff476fcac55248ec14459%7Cjordan&token=115406527&searchword="+ URLEncoder.encode("瀹忕編", "utf-8") def queryBody = "tab=ent_tab&province=&geetest_challenge=daa40fb7efec814ff072b12ee12bb25a&geetest_validate=009a8748b31392ffdfb626fbbdccb4be&geetest_seccode=009a8748b31392ffdfb626fbbdccb4be%7Cjordan&token=115394764&searchword="+ URLEncoder.encode(key, "utf-8") def s = crawl(url, queryBody); if(s){ @@ -600,7 +600,7 @@ class GsxtCrawl { def static crawl(url, bodyquery){ def responseMap = [:] try { - //headers信息 + //headers淇℃伅 Map headers = new LinkedHashMap() headers.put("Host","www.gsxt.gov.cn") headers.put("Connection","keep-alive") @@ -636,23 +636,23 @@ class GsxtCrawl { checkAbuyun(true); def responseMap = [:] - // 创建代理服务器地址对象 + // 鍒涘缓浠g悊鏈嶅姟鍣ㄥ湴鍧�瀵硅薄 InetSocketAddress addr = new InetSocketAddress(proxyServer, proxyPort); - // 创建HTTP类型代理对象 + // 鍒涘缓HTTP绫诲瀷浠g悊瀵硅薄 Proxy proxy = new Proxy(Proxy.Type.HTTP, addr); URL url = new URL(strUrl); - //通过调用url.openConnection()来获得一个新的URLConnection对象,并且将其结果强制转换为HttpURLConnection. + //閫氳繃璋冪敤url.openConnection()鏉ヨ幏寰椾竴涓柊鐨刄RLConnection瀵硅薄锛屽苟涓斿皢鍏剁粨鏋滃己鍒惰浆鎹负HttpURLConnection. HttpURLConnection urlConnection = (HttpURLConnection) url.openConnection(); urlConnection.setRequestMethod("POST"); - //设置连接的超时值为30000毫秒,超时将抛出SocketTimeoutException异常 + //璁剧疆杩炴帴鐨勮秴鏃跺�间负30000姣锛岃秴鏃跺皢鎶涘嚭SocketTimeoutException寮傚父 urlConnection.setConnectTimeout(30000); - //设置读取的超时值为30000毫秒,超时将抛出SocketTimeoutException异常 + //璁剧疆璇诲彇鐨勮秴鏃跺�间负30000姣锛岃秴鏃跺皢鎶涘嚭SocketTimeoutException寮傚父 urlConnection.setReadTimeout(30000); - //将url连接用于输出,这样才能使用getOutputStream()。getOutputStream()返回的输出流用于传输数据 + //灏唘rl杩炴帴鐢ㄤ簬杈撳嚭锛岃繖鏍锋墠鑳戒娇鐢╣etOutputStream()銆俫etOutputStream()杩斿洖鐨勮緭鍑烘祦鐢ㄤ簬浼犺緭鏁版嵁 urlConnection.setDoOutput(true); urlConnection.setDoInput(true); - //设置通用请求属性为默认浏览器编码类型 + //璁剧疆閫氱敤璇锋眰灞炴�т负榛樿娴忚鍣ㄧ紪鐮佺被鍨� // urlConnection.setRequestProperty("content-type", "application/x-www-form-urlencoded"); @@ -661,14 +661,14 @@ class GsxtCrawl { urlConnection.setRequestProperty(head, headers.get(head)); } } - //getOutputStream()返回的输出流,用于写入参数数据。 + //getOutputStream()杩斿洖鐨勮緭鍑烘祦锛岀敤浜庡啓鍏ュ弬鏁版暟鎹�� outputStream = urlConnection.getOutputStream(); if(content){ outputStream.write(content.getBytes()); } outputStream.flush(); outputStream.close(); - //此时将调用接口方法。getInputStream()返回的输入流可以读取返回的数据。 + //姝ゆ椂灏嗚皟鐢ㄦ帴鍙f柟娉曘�俫etInputStream()杩斿洖鐨勮緭鍏ユ祦鍙互璇诲彇杩斿洖鐨勬暟鎹�� inputStream = urlConnection.getInputStream(); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/coredata/model/VerifyField.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/coredata/model/VerifyField.groovy index 3de2886e4..2ee4e2b04 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/coredata/model/VerifyField.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/coredata/model/VerifyField.groovy @@ -5,7 +5,7 @@ import java.util.Date; class VerifyField { String id; - String field; // 字段 - String fieldName; // 字段描述 + String field; // 瀛楁 + String fieldName; // 瀛楁鎻忚堪 Date creationDate; } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/coredata/model/VerifyRule.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/coredata/model/VerifyRule.groovy index 0acef2127..e3b150583 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/coredata/model/VerifyRule.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/coredata/model/VerifyRule.groovy @@ -4,40 +4,40 @@ import java.util.Date; public class VerifyRule{ String id; - String fieldId; // 字段Id - int type; // 匹配类型 + String fieldId; // 瀛楁Id + int type; // 鍖归厤绫诲瀷 String value; // - Number minValue; // 数值型的最小值 - Number maxValue; // 数值型的最大值 - int sequence = 1000; // 序号,小的靠前 - // private int order; // 逻辑命令 0:and;1:or - double score; // 0-1之间的值 + Number minValue; // 鏁板�煎瀷鐨勬渶灏忓�� + Number maxValue; // 鏁板�煎瀷鐨勬渶澶у�� + int sequence = 1000; // 搴忓彿锛屽皬鐨勯潬鍓� + // private int order; // 閫昏緫鍛戒护 0锛歛nd锛�1锛歰r + double score; // 0-1涔嬮棿鐨勫�� Date creationDate; Date modificationDate; public enum TypeEnum { /** - * 正则 + * 姝e垯 */ REGULAR(0), /** - * 以***开头 + * 浠�***寮�澶� */ STARTSWITH(1), /** - * 以***结尾 + * 浠�***缁撳熬 */ ENDWITH(2), /** - * 包含 + * 鍖呭惈 */ CONTAINS(3), /** - * 全等 + * 鍏ㄧ瓑 */ EQUALS(4), /** - * 数值 + * 鏁板�� */ Numberic(5); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/coredata/util/CollectionUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/coredata/util/CollectionUtils.groovy index 6e885f31a..c9bb2f43b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/coredata/util/CollectionUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/coredata/util/CollectionUtils.groovy @@ -11,7 +11,7 @@ import java.util.Set; public class CollectionUtils extends org.apache.commons.collections.CollectionUtils { /** - * 对一个列表进行分组 + * 瀵逛竴涓垪琛ㄨ繘琛屽垎缁� * * @param * @param @@ -37,7 +37,7 @@ public class CollectionUtils extends org.apache.commons.collections.CollectionUt } /** - * 对一个列表进行分组 + * 瀵逛竴涓垪琛ㄨ繘琛屽垎缁� * * @param * @param @@ -60,7 +60,7 @@ public class CollectionUtils extends org.apache.commons.collections.CollectionUt } /** - * 将一个列表转换成另一个列表 + * 灏嗕竴涓垪琛ㄨ浆鎹㈡垚鍙︿竴涓垪琛� * * @param * @param @@ -83,7 +83,7 @@ public class CollectionUtils extends org.apache.commons.collections.CollectionUt } /** - * 将一个列表转换成另一个列表。如果closure的execute方法返回null则丢弃当前结果 + * 灏嗕竴涓垪琛ㄨ浆鎹㈡垚鍙︿竴涓垪琛ㄣ�傚鏋渃losure鐨別xecute鏂规硶杩斿洖null鍒欎涪寮冨綋鍓嶇粨鏋� * * @param * @param diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/coredata/util/LackStages.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/coredata/util/LackStages.groovy index 2fad1a19f..1137cbd21 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/coredata/util/LackStages.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/coredata/util/LackStages.groovy @@ -20,20 +20,20 @@ import freemarker.core.ReturnInstruction.Return; public class LackStages { def public static NAMECHECKED - def public static WRITEPATH = "D:/数据统计结果${DateUtil.formatToYYYYMMDDhhmmss(new Date())}.xls" - def public static CHINESE = ['一期', '二期', '三期', '四期', '五期',] + def public static WRITEPATH = "D:/鏁版嵁缁熻缁撴灉${DateUtil.formatToYYYYMMDDhhmmss(new Date())}.xls" + def public static CHINESE = ['涓�鏈�', '浜屾湡', '涓夋湡', '鍥涙湡', '浜旀湡',] static main(args) { - def cities = ['杭州'] + def cities = ['鏉窞'] for (String city : cities) { def datas = [] - datas << ['城市名', '小区名', '数量'] + datas << ['鍩庡競鍚�', '灏忓尯鍚�', '鏁伴噺'] def districtNameList = findDistrictNames(city); println city + "\t" + districtNameList.size() int k = 0 for (String districtName : districtNameList) { k++ - if ((districtName ==~ /.*(一|二|三|五|六|七|八|九|十|\d)+期.*/)) { + if ((districtName ==~ /.*(涓�|浜寍涓墊浜攟鍏瓅涓億鍏珅涔潀鍗亅\d)+鏈�.*/)) { districtName = districtName.substring(0, districtName.size() - 2) } println "${k}\t${city}\t${districtName}\t" + DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) @@ -45,14 +45,14 @@ public class LackStages { } } if (k == districtNameList.size()) { - println "${city}校验完成!" + println "${city}鏍¢獙瀹屾垚锛�" } } ExcelUtils.write(WRITEPATH, datas, city) } - //3.百度搜索校验 + //3.鐧惧害鎼滅储鏍¢獙 public static int baiduCheck(String city, def districtName) { Boolean cityChangeFlag = false def cityChange = null @@ -69,7 +69,7 @@ public class LackStages { for (int i = 0; i < eles.size(); i++) { Element ele = eles.get(i) String text = ele.toString() - if (text.indexOf(districtName) > -1 && text.indexOf(city) > -1 && !(text.indexOf("更多关于${districtName}") > -1) && !(text.indexOf("${districtName}的最新相关信息") > -1)) { + if (text.indexOf(districtName) > -1 && text.indexOf(city) > -1 && !(text.indexOf("鏇村鍏充簬${districtName}") > -1) && !(text.indexOf("${districtName}鐨勬渶鏂扮浉鍏充俊鎭�") > -1)) { coun++ } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/coredata/util/NumToChinese.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/coredata/util/NumToChinese.groovy index 8d34dd511..bf6f4fe33 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/coredata/util/NumToChinese.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/coredata/util/NumToChinese.groovy @@ -22,35 +22,35 @@ import freemarker.core.ReturnInstruction.Return; public class NumToChinese { def public static NAMECHECKED - def public static WRITEPATH="D:/数据统计结果${DateUtil.formatToYYYYMMDDhhmmss(new Date())}.xls" + def public static WRITEPATH="D:/鏁版嵁缁熻缁撴灉${DateUtil.formatToYYYYMMDDhhmmss(new Date())}.xls" def public static CHINESE = [ - '一期','二期','三期','四期','五期', + '涓�鏈�','浜屾湡','涓夋湡','鍥涙湡','浜旀湡', ] static main(args) { def cities = [ - //'三亚','泸州','北京', - //'天津','石家庄','北京', - //'太原','呼和浩特','沈阳','大连', - //'长春','哈尔滨','上海', - //'南京','杭州','宁波', - '合肥','福州','厦门', - '南昌','济南','青岛','郑州','武汉','长沙','广州','深圳','南宁','海口', - '重庆','成都','贵阳','昆明','西安','兰州','西宁','银川','乌鲁木齐', - '唐山','秦皇岛','包头','丹东','锦州','吉林','牡丹江','无锡','扬州', - '徐州','温州','金华','蚌埠','安庆','泉州','九江','赣州','烟台','济宁','洛阳', - '平顶山','宜昌','襄阳','岳阳','常德','惠州','湛江','韶关','桂林','北海', - '南充','遵义','大理' + //'涓変簹','娉稿窞','鍖椾含', + //'澶╂触','鐭冲搴�','鍖椾含', + //'澶師','鍛煎拰娴╃壒','娌堥槼','澶ц繛', + //'闀挎槬','鍝堝皵婊�','涓婃捣', + //'鍗椾含','鏉窞','瀹佹尝', + '鍚堣偉','绂忓窞','鍘﹂棬', + '鍗楁槍','娴庡崡','闈掑矝','閮戝窞','姝︽眽','闀挎矙','骞垮窞','娣卞湷','鍗楀畞','娴峰彛', + '閲嶅簡','鎴愰兘','璐甸槼','鏄嗘槑','瑗垮畨','鍏板窞','瑗垮畞','閾跺窛','涔岄瞾鏈ㄩ綈', + '鍞愬北','绉︾殗宀�','鍖呭ご','涓逛笢','閿﹀窞','鍚夋灄','鐗′腹姹�','鏃犻敗','鎵窞', + '寰愬窞','娓╁窞','閲戝崕','铓屽煚','瀹夊簡','娉夊窞','涔濇睙','璧e窞','鐑熷彴','娴庡畞','娲涢槼', + '骞抽《灞�','瀹滄槍','瑗勯槼','宀抽槼','甯稿痉','鎯犲窞','婀涙睙','闊跺叧','妗傛灄','鍖楁捣', + '鍗楀厖','閬典箟','澶х悊' ] for(String city : cities) { def datas = [] - datas << ['城市名','小区名','数量'] + datas << ['鍩庡競鍚�','灏忓尯鍚�','鏁伴噺'] def districtNameList = findDistrictNames(city); println city + "\t" + districtNameList.size() int k = 0 for(String districtName : districtNameList) { k++ - if((districtName ==~/.*(一|二|三|四|五|六|七|八|九|\d)+期*/)){ + if((districtName ==~/.*(涓�|浜寍涓墊鍥泑浜攟鍏瓅涓億鍏珅涔潀\d)+鏈�*/)){ districtName=districtName.substring(0, districtName.size()-2) } println "${k}\t${city}\t${districtName}\t" + DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) @@ -66,7 +66,7 @@ public class NumToChinese { } } if(k==districtNameList.size()){ - println "${city}已完成" + println "${city}宸插畬鎴�" } } @@ -74,7 +74,7 @@ public class NumToChinese { } } - //3.百度校验 + //3.鐧惧害鏍¢獙 public static int baiduCheck(String city, def districtName) { Boolean cityChangeFlag=false def cityChange=null @@ -91,7 +91,7 @@ public class NumToChinese { for(int i=0; i -1 && text.indexOf(city) > -1&&!(text.indexOf("更多关于${districtName}")>-1)&&!(text.indexOf("${districtName}的最新相关信息")>-1)) { + if(text.indexOf(districtName) > -1 && text.indexOf(city) > -1&&!(text.indexOf("鏇村鍏充簬${districtName}")>-1)&&!(text.indexOf("${districtName}鐨勬渶鏂扮浉鍏充俊鎭�")>-1)) { coun++ } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/coredata/verify/FieldValidator.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/coredata/verify/FieldValidator.groovy index 8abdfef6c..f91e98948 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/coredata/verify/FieldValidator.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/coredata/verify/FieldValidator.groovy @@ -61,13 +61,13 @@ public class FieldValidator { } /** - * 字段验证,须先在后台添加字段验证器 + * 瀛楁楠岃瘉锛岄』鍏堝湪鍚庡彴娣诲姞瀛楁楠岃瘉鍣� * * @param field - * 字段名 + * 瀛楁鍚� * @param obj - * 待验证的值 - * @return 验证得分。100:没有该字段的验证规则 + * 寰呴獙璇佺殑鍊� + * @return 楠岃瘉寰楀垎銆�100锛氭病鏈夎瀛楁鐨勯獙璇佽鍒� */ public static double score(String field, Object obj) { while (isloading) { @@ -83,7 +83,7 @@ public class FieldValidator { } String str = obj.toString(); - str = null == str ? "" : str.replaceAll('^[\\s ]*|[\\s ]*$', ""); + str = null == str ? "" : str.replaceAll('^[\\s銆�]*|[\\s ]*$', ""); str = str.trim(); if ("".equals(str)) { return 1; @@ -184,10 +184,10 @@ public class FieldValidator { public static void main(String[] args) { - System.out.println(score("all_area", "49950.00 平米")); - System.out.println(score("build_area", "200000.00 平米")); + System.out.println(score("all_area", "49950.00 骞崇背")); + System.out.println(score("build_area", "200000.00 骞崇背")); -// Pattern p = Pattern.compile("^\\d{2,4}(\\-|\\/|\\.|年)?(\\d{1,2}(\\-|\\/|\\.|月))?(\\d{1,2}(日|号)?)?$"); +// Pattern p = Pattern.compile("^\\d{2,4}(\\-|\\/|\\.|骞�)?(\\d{1,2}(\\-|\\/|\\.|鏈�))?(\\d{1,2}(鏃鍙�)?)?$"); // System.out.println(p.matcher("1999").matches()); } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/cover/DistrictCoverInfo.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/cover/DistrictCoverInfo.groovy index e7cea1582..7e8c51c7f 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/cover/DistrictCoverInfo.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/cover/DistrictCoverInfo.groovy @@ -20,14 +20,14 @@ import com.mongodb.DBObject; import com.mongodb.Mongo; /** - * 小区字段覆盖率报告定时任务 + * 灏忓尯瀛楁瑕嗙洊鐜囨姤鍛婂畾鏃朵换鍔� * @author ruanyadong * */ @BatchOwner(Watcher.YuKai) class DistrictCoverInfo extends BaseBatch { - final static String NO_THING = "暂无资料"; + final static String NO_THING = "鏆傛棤璧勬枡"; final static String datastoreDomain = "datastore.db.fangjia.com" static DBCollection coverCollection = MongoUtils.getCollectionByName("fangjia", "district_cover", MongoUtils.MongoDB_Domain_mongo) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/cover/DistrictDataCoverBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/cover/DistrictDataCoverBatch.groovy index 083b4973d..d69ddc1e6 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/cover/DistrictDataCoverBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/cover/DistrictDataCoverBatch.groovy @@ -37,34 +37,34 @@ class DistrictDataCoverBatch extends BaseBatch { ] static def FIELDS_MAP = [ - "address":"地址", + "address":"鍦板潃", "lat":"lat", "lng":"lng", - "developer":"开发商", - "estate_company":"物业公司", - "cubage_percent":"容积率", - "virescence_percent":"绿化率", - "kindergarten":"幼儿园", - "primary_school":"小学", - "middle_school":"中学", - "university":"大学", - "hospital":"医院", - "supermarket":"超市", - "food_shop":"美食店", - "bus":"公交", - "metro":"地铁", - "bank":"银行", + "developer":"寮�鍙戝晢", + "estate_company":"鐗╀笟鍏徃", + "cubage_percent":"瀹圭Н鐜�", + "virescence_percent":"缁垮寲鐜�", + "kindergarten":"骞煎効鍥�", + "primary_school":"灏忓", + "middle_school":"涓", + "university":"澶у", + "hospital":"鍖婚櫌", + "supermarket":"瓒呭競", + "food_shop":"缇庨搴�", + "bus":"鍏氦", + "metro":"鍦伴搧", + "bank":"閾惰", "atm":"ATM", - "car_site":"车位", - "car_site_tmp":"车位(小区表)", - "car_site_des":"车位描述", - "inner_facilities":"内部配套", - "floorplan_pics":"室内图", - "out_pics":"外景图", + "car_site":"杞︿綅", + "car_site_tmp":"杞︿綅(灏忓尯琛�)", + "car_site_des":"杞︿綅鎻忚堪", + "inner_facilities":"鍐呴儴閰嶅", + "floorplan_pics":"瀹ゅ唴鍥�", + "out_pics":"澶栨櫙鍥�", ]; public static void main(String[] args) { - runBatch(new DistrictDataCoverBatch(), ['上海']) + runBatch(new DistrictDataCoverBatch(), ['涓婃捣']) } @Override @@ -82,7 +82,7 @@ class DistrictDataCoverBatch extends BaseBatch { println "send email to " + EMAILS for(String email : EMAILS) { - jms.sendMail(email, "小区字段覆盖率详细报告", content.toString()) + jms.sendMail(email, "灏忓尯瀛楁瑕嗙洊鐜囪缁嗘姤鍛�", content.toString()) } println "over" } @@ -106,13 +106,13 @@ class DistrictDataCoverBatch extends BaseBatch { increaseData(fieldIncreaseMap, "address", isFieldValueValid(dbo.get('address'))) increaseData(fieldIncreaseMap, "lat", isFieldValueValid(dbo.get('lat'))) increaseData(fieldIncreaseMap, "lng", isFieldValueValid(dbo.get('lng'))) - increaseData(fieldIncreaseMap, "developer", isFieldValueValid(dbo.get('developer'))) //开发商 - increaseData(fieldIncreaseMap, "estate_company", isFieldValueValid(dbo.get('estate_company'))) //物业公司 - increaseData(fieldIncreaseMap, "cubage_percent", isFieldValueValid(dbo.get('cubage_percent'))) //容积率 - increaseData(fieldIncreaseMap, "virescence_percent", isFieldValueValid(dbo.get('virescence_percent'))) //绿化率 - increaseData(fieldIncreaseMap, "floorplan_pics", isFieldValueValid(dbo.get('floorplan_pics'))) //室内图 - increaseData(fieldIncreaseMap, "out_pics", isFieldValueValid(dbo.get('out_pics'))) //外景图 - increaseData(fieldIncreaseMap, "car_site_tmp", isFieldValueValid(dbo.get('car_site'))) //外景图 + increaseData(fieldIncreaseMap, "developer", isFieldValueValid(dbo.get('developer'))) //寮�鍙戝晢 + increaseData(fieldIncreaseMap, "estate_company", isFieldValueValid(dbo.get('estate_company'))) //鐗╀笟鍏徃 + increaseData(fieldIncreaseMap, "cubage_percent", isFieldValueValid(dbo.get('cubage_percent'))) //瀹圭Н鐜� + increaseData(fieldIncreaseMap, "virescence_percent", isFieldValueValid(dbo.get('virescence_percent'))) //缁垮寲鐜� + increaseData(fieldIncreaseMap, "floorplan_pics", isFieldValueValid(dbo.get('floorplan_pics'))) //瀹ゅ唴鍥� + increaseData(fieldIncreaseMap, "out_pics", isFieldValueValid(dbo.get('out_pics'))) //澶栨櫙鍥� + increaseData(fieldIncreaseMap, "car_site_tmp", isFieldValueValid(dbo.get('car_site'))) //澶栨櫙鍥� DBObject facilityObj = findDistrictFacilitys(city, region, name) increaseData(fieldIncreaseMap, "kindergarten", facilityObj ? isFieldValueValid(facilityObj.get('kindergarten')) : false) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/cover/DistrictFieldCoverBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/cover/DistrictFieldCoverBatch.groovy index 9b187a3f5..dc3ca5eec 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/cover/DistrictFieldCoverBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/cover/DistrictFieldCoverBatch.groovy @@ -21,14 +21,14 @@ import com.mongodb.DBObject; import com.mongodb.Mongo; /** -* 小区字段覆盖率报告定时任务 +* 灏忓尯瀛楁瑕嗙洊鐜囨姤鍛婂畾鏃朵换鍔� * @author ruanyadong * */ @BatchOwner(Watcher.RuanYaDong) class DistrictFieldCoverBatch extends BaseBatch { - final static String NO_THING = "暂无资料"; + final static String NO_THING = "鏆傛棤璧勬枡"; final static String mongoDomain = "mongo.db.fangjia.com" final static String coverDomain = "mongo.db.fangjia.com" final static String datastoreDomain = "seaweed.db.fangjia.com" @@ -220,7 +220,7 @@ class DistrictFieldCoverBatch extends BaseBatch { private void sendEmail(List reports, DBObject lastReport) { String content = toMail(reports, lastReport); String dateString = DateUtil.formatToYYYYMMDD(new Date()); - String subject = dateString + " 小区字段覆盖率报告"; + String subject = dateString + " 灏忓尯瀛楁瑕嗙洊鐜囨姤鍛�"; for(email in emails) { sendEmail(email, subject, content); } @@ -232,7 +232,7 @@ class DistrictFieldCoverBatch extends BaseBatch { sb.append("
") sb.append("") sb.append("") DBObject lastMap = null; DBObject lastCountMap = null; @@ -240,27 +240,27 @@ class DistrictFieldCoverBatch extends BaseBatch { lastMap = (DBObject)lastReport.get("reports"); lastCountMap = (DBObject)lastReport.get("districtCounts"); sb.append("") } sb.append("") sb.append("") sb.append("") if (lastReport != null) { sb.append("") sb.append("") } sb.append("") sb.append("") sb.append("") sb.append("") @@ -308,7 +308,7 @@ class DistrictFieldCoverBatch extends BaseBatch { } /** - * 发送邮件 + * 鍙戦�侀偖浠� */ private sendEmail(email, subject, content) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/cover/LoudongDataCoverBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/cover/LoudongDataCoverBatch.groovy index 63fbf843d..a62c24d43 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/cover/LoudongDataCoverBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/cover/LoudongDataCoverBatch.groovy @@ -37,30 +37,30 @@ class LoudongDataCoverBatch extends BaseBatch { ] static def FIELDS_MAP = [ - "worry_facility":"厌恶设施", - "sideset":"边套装置", - "carport":"停车位", - "noise":"噪声", - "sight":"景观", - "fitment_rank":"装修", - "direction":"朝向", - "build_type":"建筑类型", - "room":"室", - "hall":"厅", - "toilet":"卫", - "house_floor":"楼层", - "fitment_age":"房龄", - "house_height":"楼高", - "house_area":"面积", - "basement_area":"地下室", - "outer_area":"露台", - "garden_area":"花园", - "attic_area":"阁楼", - "fitment_cost":"装修花费", + "worry_facility":"鍘屾伓璁炬柦", + "sideset":"杈瑰瑁呯疆", + "carport":"鍋滆溅浣�", + "noise":"鍣0", + "sight":"鏅", + "fitment_rank":"瑁呬慨", + "direction":"鏈濆悜", + "build_type":"寤虹瓚绫诲瀷", + "room":"瀹�", + "hall":"鍘�", + "toilet":"鍗�", + "house_floor":"妤煎眰", + "fitment_age":"鎴块緞", + "house_height":"妤奸珮", + "house_area":"闈㈢Н", + "basement_area":"鍦颁笅瀹�", + "outer_area":"闇插彴", + "garden_area":"鑺卞洯", + "attic_area":"闃佹ゼ", + "fitment_cost":"瑁呬慨鑺辫垂", ]; public static void main(String[] args) { - runBatch(new LoudongDataCoverBatch(), ['上海','北京','广州','深圳','成都']) + runBatch(new LoudongDataCoverBatch(), ['涓婃捣','鍖椾含','骞垮窞','娣卞湷','鎴愰兘']) } @Override @@ -78,7 +78,7 @@ class LoudongDataCoverBatch extends BaseBatch { println "send email to " + EMAILS for(String email : EMAILS) { - jms.sendMail(email, "房子数据库字段覆盖率详细报告", content.toString()) + jms.sendMail(email, "鎴垮瓙鏁版嵁搴撳瓧娈佃鐩栫巼璇︾粏鎶ュ憡", content.toString()) } println "over" } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/cpc/CpcClickStatBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/cpc/CpcClickStatBatch.groovy index 10f428f8a..791f54b52 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/cpc/CpcClickStatBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/cpc/CpcClickStatBatch.groovy @@ -18,45 +18,45 @@ import com.mongodb.Mongo import com.mongodb.WriteConcern /** * - * 统计 一天的数据 完成 + * 缁熻 涓�澶╃殑鏁版嵁 瀹屾垚 * */ @BatchOwner(Watcher.DuXiaoYu) class CpcClickStatBatch extends BaseBatch{ /** - * 点击量统计 6 + * 鐐瑰嚮閲忕粺璁� 6 */ static final def DIANJILIANG = "6" /** - * 点击量分析 7 + * 鐐瑰嚮閲忓垎鏋� 7 */ static final def DIANJILIANGFENXI = "7" /** - * 面积分布 0 + * 闈㈢Н鍒嗗竷 0 */ static final def MIANJIFENBU = "0" /** - * 价格分布 1 + * 浠锋牸鍒嗗竷 1 */ static final def JIAGEFENBU = "1" /** - * 时间分布 3 + * 鏃堕棿鍒嗗竷 3 */ static final def SHIJIANFENBU = "3" /** - * 区域分布 2 + * 鍖哄煙鍒嗗竷 2 */ static final def QUYUFENBU = "2" /** - * TOP10小区 5 + * TOP10灏忓尯 5 */ static final def TOP10 = "5" /** - * 经纪人分布 8 + * 缁忕邯浜哄垎甯� 8 */ static final def JINGJIRENFENBU = "8" /** - * 房型分布 9 + * 鎴垮瀷鍒嗗竷 9 */ static final def FANGXINFENBU = "9" @@ -211,7 +211,7 @@ class CpcClickStatBatch extends BaseBatch{ result["cost"] += cost } /** - * 二手房 租房 商业地产 + * 浜屾墜鎴� 绉熸埧 鍟嗕笟鍦颁骇 * @param result * @param detail_log * @param statDate @@ -229,7 +229,7 @@ class CpcClickStatBatch extends BaseBatch{ } def mianji = getMainJi(hoseid,house_type,city) if(mianji){ - //总计 + //鎬昏 def city_zh = CityMap.findCityName(city) if(!result.containsKey(city_zh)){ result[city_zh] = [:] @@ -239,7 +239,7 @@ class CpcClickStatBatch extends BaseBatch{ } result[city_zh][mianji] = result[city_zh][mianji] + 1 if(region){ - //各区 + //鍚勫尯 if(!result.containsKey(region)){ result[region] = [:] } @@ -251,7 +251,7 @@ class CpcClickStatBatch extends BaseBatch{ } } /** - * 二手房 租房 商业地产 + * 浜屾墜鎴� 绉熸埧 鍟嗕笟鍦颁骇 * @param result * @param detail_log * @param statDate @@ -270,7 +270,7 @@ class CpcClickStatBatch extends BaseBatch{ def price_scope = getJiaGe(sqlInstance,hoseid,house_type,city) //println "mainji : "+ mianji if(price_scope){ - //总计 + //鎬昏 def city_zh = CityMap.findCityName(city) if(!result.containsKey(city_zh)){ result[city_zh] = [:] @@ -307,12 +307,12 @@ class CpcClickStatBatch extends BaseBatch{ def hoseid = detail_log.house_id def house_type = detail_log.house_type def city = detail_log.city - //区域 = 于房屋类型 + //鍖哄煙 = 浜庢埧灞嬬被鍨� if(!region && (house_type != 'ershoufang' && house_type != 'zufang')){ region = house_type } if(region){ - //预算 + //棰勭畻 if(!result.containsKey(region)){ result[region] = ['click':0] } @@ -321,17 +321,17 @@ class CpcClickStatBatch extends BaseBatch{ /** * add */ - if(!result.containsKey("其它")){ - result["其它"] = ['click':0] + if(!result.containsKey("鍏跺畠")){ + result["鍏跺畠"] = ['click':0] } - result["其它"]["click"] += 1 + result["鍏跺畠"]["click"] += 1 /** * add */ } } /** - * 租房 二手房 + * 绉熸埧 浜屾墜鎴� * @param result * @param detail_log * @param statDate @@ -344,16 +344,16 @@ class CpcClickStatBatch extends BaseBatch{ def house_type = detail_log.house_type def city = detail_log.city def region = null - //小区的名字 + //灏忓尯鐨勫悕瀛� def district_name if(house_type == 'ershoufang' || house_type == 'zufang'){ def district_location = getDistrictLocation(sqlInstance,hoseid,house_type,city) region = district_location?.region district_name = district_location?.district_name } - //没有区域的不做统计 + //娌℃湁鍖哄煙鐨勪笉鍋氱粺璁� if(region){ - //总计 + //鎬昏 def city_zh = CityMap.findCityName(city) if(!result.containsKey(city_zh)){ result[city_zh] = [:] @@ -362,7 +362,7 @@ class CpcClickStatBatch extends BaseBatch{ result[city_zh][district_name] = 0 } result[city_zh][district_name] = result[city_zh][district_name] + 1 - //各区 + //鍚勫尯 if(!result.containsKey(region)){ result[region] = [:] } @@ -373,7 +373,7 @@ class CpcClickStatBatch extends BaseBatch{ } } /** - * 二手房 租房 商业地产 + * 浜屾墜鎴� 绉熸埧 鍟嗕笟鍦颁骇 * @param result * @param detail_log * @param statDate @@ -398,7 +398,7 @@ class CpcClickStatBatch extends BaseBatch{ } } /** - * 二手房 租房 + * 浜屾墜鎴� 绉熸埧 * @param result * @param detail_log * @param statDate @@ -435,7 +435,7 @@ class CpcClickStatBatch extends BaseBatch{ } /** - * 包括商业地产 + * 鍖呮嫭鍟嗕笟鍦颁骇 * @param sqlInstance * @param hoseid * @param house_type @@ -462,7 +462,7 @@ class CpcClickStatBatch extends BaseBatch{ } /******************************************************************************** - * 取得当日预算 + * 鍙栧緱褰撴棩棰勭畻 * @param cpc_setting_log * @param cpc_user_id * @param house_type @@ -488,7 +488,7 @@ class CpcClickStatBatch extends BaseBatch{ return -1 } /** - * 取得区域 + * 鍙栧緱鍖哄煙 * @param sqlInstance * @param hoseid * @param house_type @@ -521,7 +521,7 @@ class CpcClickStatBatch extends BaseBatch{ return null; } /** - * 二手房,商业地产 为总价 租房,商业地产租 为价格 + * 浜屾墜鎴�,鍟嗕笟鍦颁骇 涓烘�讳环 绉熸埧,鍟嗕笟鍦颁骇绉� 涓轰环鏍� * @param sqlInstance * @param hoseid * @param house_type @@ -555,7 +555,7 @@ class CpcClickStatBatch extends BaseBatch{ return price_scope } /** - * 取得小区名字 + * 鍙栧緱灏忓尯鍚嶅瓧 * @param sqlInstance * @param hoseid * @param house_type @@ -601,7 +601,7 @@ class CpcClickStatBatch extends BaseBatch{ } } /** - * 租房 二手房 商业地产 + * 绉熸埧 浜屾墜鎴� 鍟嗕笟鍦颁骇 * @param sqlInstance * @param hoseid * @param house_type @@ -641,7 +641,7 @@ class CpcClickStatBatch extends BaseBatch{ return 0 } /** - * 二手房 租房 + * 浜屾墜鎴� 绉熸埧 * @param sqlInstance * @param hoseid * @param house_type diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/cpc/CpcConsumerBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/cpc/CpcConsumerBatch.groovy index 62538397f..6db95dd05 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/cpc/CpcConsumerBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/cpc/CpcConsumerBatch.groovy @@ -7,8 +7,8 @@ import com.fangjia.script.util.DateUtils import com.mongodb.BasicDBObject import com.mongodb.Mongo /** - * 用于CPC用户每日费用结算 - * 每天1:50分运行 + * 鐢ㄤ簬CPC鐢ㄦ埛姣忔棩璐圭敤缁撶畻 + * 姣忓ぉ1:50鍒嗚繍琛� * */ @BatchOwner(Watcher.DuXiaoYu) @@ -57,14 +57,14 @@ class CpcConsumerBatch extends BaseBatch{ def totalAlready = dbConn.firstRow('SELECT sum(cpc_money) AS total FROM cpc_consumer_log where cpc_user_id = ? and category = 1 and stat_date = ? and account_type in (0,1)', [cpcUsers.id, statDate])?.total?:0 def totalOffset = totalCost - totalAlready if(totalOffset!=0){ - cpcUserAccountService.modify(cpcUsers.id, [1, 0], totalOffset, statDate, totalAlready==0 ? null : '消费结算调整', 1, 0) + cpcUserAccountService.modify(cpcUsers.id, [1, 0], totalOffset, statDate, totalAlready==0 ? null : '娑堣垂缁撶畻璋冩暣', 1, 0) } - //试用期费用结算 + //璇曠敤鏈熻垂鐢ㄧ粨绠� def testAlready = dbConn.firstRow('SELECT sum(cpc_money) AS total FROM cpc_consumer_log where cpc_user_id = ? and category = 1 and stat_date = ? and account_type=2', [cpcUsers.id, statDate])?.total?:0 def testOffset = testCost - testAlready if(testOffset!=0){ - cpcUserAccountService.modify(cpcUsers.id, [2], testOffset, statDate, totalAlready==0 ? null : '消费结算调整', 1, 0) + cpcUserAccountService.modify(cpcUsers.id, [2], testOffset, statDate, totalAlready==0 ? null : '娑堣垂缁撶畻璋冩暣', 1, 0) } } logInfo 'end' diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/cpc/CpcHouseRefBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/cpc/CpcHouseRefBatch.groovy index 5b32cf9f8..1766f5915 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/cpc/CpcHouseRefBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/cpc/CpcHouseRefBatch.groovy @@ -88,7 +88,7 @@ class CpcHouseRefBatch extends BaseBatch { def house = dsCollection.findById(cpcClickLog.house_id.toString()) if (house) { - //二手房 + //浜屾墜鎴� if (house.contact_people) { if(house.contact_people.length() > 200){ insertSql += ", contact_name = '${house.contact_people.substring(0,200)}'" @@ -107,13 +107,13 @@ class CpcHouseRefBatch extends BaseBatch { } def house_type = "" if (house.room) { - house_type += "${house.room}室" + house_type += "${house.room}瀹�" } if (house.hall) { - house_type += "${house.hall}厅" + house_type += "${house.hall}鍘�" } if (house.toilet) { - house_type += "${house.toilet}卫" + house_type += "${house.toilet}鍗�" } if (house_type != "") { insertSql += ", house_type = '${house_type}'" @@ -134,7 +134,7 @@ class CpcHouseRefBatch extends BaseBatch { // fields.put('relate_id', 1) // def cpcDetail = houseCpcDetailColl.findOne(query, fields) - //租房 + //绉熸埧 def house_rent = dsCollection.findById(cpcClickLog.house_id.toString()) if (house_rent) { if (house_rent.contact_people) { @@ -155,13 +155,13 @@ class CpcHouseRefBatch extends BaseBatch { } def house_type = "" if (house_rent.room) { - house_type += "${house_rent.room}室" + house_type += "${house_rent.room}瀹�" } if (house_rent.hall) { - house_type += "${house_rent.hall}厅" + house_type += "${house_rent.hall}鍘�" } if (house_rent.toilet) { - house_type += "${house_rent.toilet}卫" + house_type += "${house_rent.toilet}鍗�" } if (house_type != "") { insertSql += ", house_type = '${house_type}'" diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/cpc/CpcHouseSortBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/cpc/CpcHouseSortBatch.groovy index c8c68c9dd..e110f8122 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/cpc/CpcHouseSortBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/cpc/CpcHouseSortBatch.groovy @@ -10,9 +10,9 @@ import com.fangjia.script.util.Jms import com.mongodb.BasicDBObject import com.mongodb.Mongo /** - * 用于CPC房源排序 + * 鐢ㄤ簬CPC鎴挎簮鎺掑簭 * - * 检查cpc是否成立,如不成立,通知索引,更改排序 + * 妫�鏌pc鏄惁鎴愮珛锛屽涓嶆垚绔嬶紝閫氱煡绱㈠紩锛屾洿鏀规帓搴� * */ @BatchOwner(Watcher.DuXiaoYu) @@ -29,88 +29,88 @@ class CpcHouseSortBatch extends BaseBatch { logInfo 'start' dbConn.eachRow("select id, cpc_user_id, cpc_site_id, city, house_type, valid, status, test_start_date, test_end_date from cpc_fee_setting"){cpcFeeSetting-> - //网站状态检查 + //缃戠珯鐘舵�佹鏌� def cpcSite = dbConn.firstRow("select id, site_name, status from cpc_site where id=?", [cpcFeeSetting.cpc_site_id]) - if(!cpcSite || cpcSite.status!=0){//网站不存在或已禁用 + if(!cpcSite || cpcSite.status!=0){//缃戠珯涓嶅瓨鍦ㄦ垨宸茬鐢� if(checkCpcFeeSetting(cpcFeeSetting, cpcSite, 1)){ logInfo "${cpcFeeSetting.id} -> 1\tinvalid site: ${cpcSite?.status}" } return } - //付费设置状态检查 - if(cpcFeeSetting.status!=0){//已禁用 + //浠樿垂璁剧疆鐘舵�佹鏌� + if(cpcFeeSetting.status!=0){//宸茬鐢� if(checkCpcFeeSetting(cpcFeeSetting, cpcSite, 2)){ logInfo "${cpcFeeSetting.id} -> 2\tinvalid status: ${cpcFeeSetting.status}" } return } - if(!testAccountCheck(cpcFeeSetting)){//测试账户已过期 + if(!testAccountCheck(cpcFeeSetting)){//娴嬭瘯璐︽埛宸茶繃鏈� if(checkCpcFeeSetting(cpcFeeSetting, cpcSite, 3)){ logInfo "${cpcFeeSetting.id} -> 3\tinvalid test account: ${cpcFeeSetting.test_start_date} ~ ${cpcFeeSetting.test_end_date}" } return } - //用户状态检查 + //鐢ㄦ埛鐘舵�佹鏌� def cpcUsers = dbConn.firstRow('select id, cpc_balance, status from cpc_users where id=?', [cpcFeeSetting.cpc_user_id]) - if(!cpcUsers || cpcUsers.status!=0){//用户不存在或已禁用 + if(!cpcUsers || cpcUsers.status!=0){//鐢ㄦ埛涓嶅瓨鍦ㄦ垨宸茬鐢� if(checkCpcFeeSetting(cpcFeeSetting, cpcSite, 4)){ logInfo "${cpcFeeSetting.id} -> 4\tinvalid user: ${cpcUsers?.status}" } return } - //余额检查 + //浣欓妫�鏌� def balance = cpcUsers.cpc_balance if(isTestAccount(cpcFeeSetting)){ balance = dbConn.firstRow('select balance from cpc_user_account where cpc_user_id=? and account_type=2', [cpcUsers.id])?.balance?:0 } - if(!hasBalance(cpcUsers.id, balance)){//余额不足 + if(!hasBalance(cpcUsers.id, balance)){//浣欓涓嶈冻 if(checkCpcFeeSetting(cpcFeeSetting, cpcSite, 5)){ logInfo "${cpcFeeSetting.id} -> 5\tout of balance: ${balance}" } return } - //推广设置检查start - //分类型推广设置检查 + //鎺ㄥ箍璁剧疆妫�鏌tart + //鍒嗙被鍨嬫帹骞胯缃鏌� def cpcSettings = dbConn.firstRow('select id, cpc_user_id, cpc_site_id, city, house_type, status, day_money, remark from cpc_settings where cpc_site_id=? and city=? and house_type=? and category=2', [cpcFeeSetting.cpc_site_id, cpcFeeSetting.city, cpcFeeSetting.house_type]) - if(!cpcSettings || cpcSettings.status!=0){//相应推广不存在或已暂停 + if(!cpcSettings || cpcSettings.status!=0){//鐩稿簲鎺ㄥ箍涓嶅瓨鍦ㄦ垨宸叉殏鍋� if(checkCpcFeeSetting(cpcFeeSetting, cpcSite, 6)){ logInfo "${cpcFeeSetting.id} -> 6\tinvalid settings: ${cpcSettings?.status}" } return } - if (!isValidTime(cpcSettings.remark)) {//不在推广时间 + if (!isValidTime(cpcSettings.remark)) {//涓嶅湪鎺ㄥ箍鏃堕棿 if(checkCpcFeeSetting(cpcFeeSetting, cpcSite, 7)){ logInfo "${cpcFeeSetting.id} -> 7\tinvalid time: ${cpcSettings.remark}" } return } - if(isOutOfHouseTypeDayMoney(cpcSettings)){//超过本日推广上限 + if(isOutOfHouseTypeDayMoney(cpcSettings)){//瓒呰繃鏈棩鎺ㄥ箍涓婇檺 if(checkCpcFeeSetting(cpcFeeSetting, cpcSite, 8)){ logInfo "${cpcFeeSetting.id} -> 8\tout of house_type day money: ${cpcSettings.day_money}" } return } - //城市推广设置检查 + //鍩庡競鎺ㄥ箍璁剧疆妫�鏌� cpcSettings = dbConn.firstRow('select id, cpc_user_id, cpc_site_id, city, house_type, status, day_money, remark from cpc_settings where cpc_user_id=? and cpc_site_id=? and city=? and category=1', [cpcFeeSetting.cpc_user_id, cpcFeeSetting.cpc_site_id, cpcFeeSetting.city]) - if(cpcSettings && cpcSettings.status!=0){//相应推广存在,且已暂停或已过试用期 + if(cpcSettings && cpcSettings.status!=0){//鐩稿簲鎺ㄥ箍瀛樺湪锛屼笖宸叉殏鍋滄垨宸茶繃璇曠敤鏈� if(checkCpcFeeSetting(cpcFeeSetting, cpcSite, 9)){ logInfo "${cpcFeeSetting.id} -> 9\tinvalid settings: ${cpcSettings?.status}" } return } - if(cpcSettings && isOutOfCityDayMoney(cpcSettings)){//超过本日推广上限 + if(cpcSettings && isOutOfCityDayMoney(cpcSettings)){//瓒呰繃鏈棩鎺ㄥ箍涓婇檺 if(checkCpcFeeSetting(cpcFeeSetting, cpcSite, 10)){ logInfo "${cpcFeeSetting.id} -> 10\tout of city day money: ${cpcSettings.day_money}" } return } - //推广设置检查end + //鎺ㄥ箍璁剧疆妫�鏌nd - //有效 + //鏈夋晥 if(checkCpcFeeSetting(cpcFeeSetting, cpcSite, 0)){ logInfo "${cpcFeeSetting.id} -> 0\tok" } @@ -119,12 +119,12 @@ class CpcHouseSortBatch extends BaseBatch { } def isOutOfHouseTypeDayMoney(cpcSettings) { - //取当天当前指定城市的点击量 + //鍙栧綋澶╁綋鍓嶆寚瀹氬煄甯傜殑鐐瑰嚮閲� if(cpcSettings.day_money<0){ return false } def moneyCount = 0 - //计算总消耗金额 + //璁$畻鎬绘秷鑰楅噾棰� BasicDBObject query = new BasicDBObject() query.put('cpc_site_id', cpcSettings.cpc_site_id) query.put('category', 1) @@ -142,12 +142,12 @@ class CpcHouseSortBatch extends BaseBatch { } def isOutOfCityDayMoney(cpcSettings) { - //取当天当前指定城市的点击量 + //鍙栧綋澶╁綋鍓嶆寚瀹氬煄甯傜殑鐐瑰嚮閲� if(cpcSettings.day_money<0){ return false } def moneyCount = 0 - //计算总消耗金额 + //璁$畻鎬绘秷鑰楅噾棰� BasicDBObject query = new BasicDBObject() query.put('category', 2) query.put('cpc_user_id', cpcSettings.cpc_user_id) @@ -222,7 +222,7 @@ class CpcHouseSortBatch extends BaseBatch { private boolean testAccountCheck(cpcFeeSetting) { if (null != cpcFeeSetting.test_start_date - && null != cpcFeeSetting.test_end_date) {// 是试用账户 + && null != cpcFeeSetting.test_end_date) {// 鏄瘯鐢ㄨ处鎴� Date now = new Date(); return now.after(cpcFeeSetting.test_start_date) && now.before(cpcFeeSetting.test_end_date); } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/cpc/MenuFieldParser.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/cpc/MenuFieldParser.groovy index 9ff17d986..82bccaed9 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/cpc/MenuFieldParser.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/cpc/MenuFieldParser.groovy @@ -1,5 +1,5 @@ /** - * 根据menu定义的文件获得对应字段的定义,用于创建此字段的索引 + * 鏍规嵁menu瀹氫箟鐨勬枃浠惰幏寰楀搴斿瓧娈电殑瀹氫箟锛岀敤浜庡垱寤烘瀛楁鐨勭储寮� */ package com.fangjia.script.cpc @@ -15,7 +15,7 @@ public class MenuFieldParser { static def menuGroupMap = [:] /** - * 读取menu xml 文件中的内容 + * 璇诲彇menu xml 鏂囦欢涓殑鍐呭 */ static def getMenuXml(menuXmlFileName){ def ret = menu_cache.get(menuXmlFileName) @@ -42,7 +42,7 @@ public class MenuFieldParser { /** - * 得到指定group + * 寰楀埌鎸囧畾group */ static def getMenuGroupByName(city, category, groupName) { // groupName = "model." + groupName @@ -106,8 +106,8 @@ public class MenuFieldParser { } /** - * 获取区间值 - * 如getFieldValue(123, "HOUSEAREARANGE", "sh", "ershoufang") -> 5 + * 鑾峰彇鍖洪棿鍊� + * 濡俫etFieldValue(123, "HOUSEAREARANGE", "sh", "ershoufang") -> 5 */ static def getFieldValue(val, groupName, city, category){ def itemMap = parseFieldValue(city, groupName, category) @@ -148,7 +148,7 @@ public class MenuFieldParser { } /** - * 该字段是否有值,如果没有再看nikename属性 + * 璇ュ瓧娈垫槸鍚︽湁鍊硷紝濡傛灉娌℃湁鍐嶇湅nikename灞炴�� */ public static def findFiledValue(groupName, filedValue, city, category) { if(groupName == null || filedValue == null ){ @@ -181,7 +181,7 @@ public class MenuFieldParser { /** - * 补全区域 + * 琛ュ叏鍖哄煙 */ public static def mendRegion(orgValue, city, category) { if(orgValue == null || orgValue == "" || city == null || category == null ){ @@ -242,14 +242,14 @@ public class MenuFieldParser { println getNameValueCaption(2600000, "TOTALPRICERANGE", "cq", "ershoufang") println getNameValueCaption(1800000, "TOTALPRICERANGE", "cs", "ershoufang") -// println findFiledValue("region", "崇明县", "sh", "ershoufang") -// println findFiledValue("region", "浦东新区", "sh", "ershoufang") -// println findFiledValue("region", "徐汇区", "sh", "ershoufang") -// println findFiledValue("region", "虹口区", "sh", "ershoufang") +// println findFiledValue("region", "宕囨槑鍘�", "sh", "ershoufang") +// println findFiledValue("region", "娴︿笢鏂板尯", "sh", "ershoufang") +// println findFiledValue("region", "寰愭眹鍖�", "sh", "ershoufang") +// println findFiledValue("region", "铏瑰彛鍖�", "sh", "ershoufang") // println "==========" -// println findFiledValue("region", "渝北区", "cq", "ershoufang") -// println findFiledValue("region", "九龙坡区", "cq", "ershoufang") -// println findFiledValue("region", "南岸区", "cq", "ershoufang") +// println findFiledValue("region", "娓濆寳鍖�", "cq", "ershoufang") +// println findFiledValue("region", "涔濋緳鍧″尯", "cq", "ershoufang") +// println findFiledValue("region", "鍗楀哺鍖�", "cq", "ershoufang") // println getItemCaptionByName("RENTPRICERANGE", "cq", "zufang", "5") } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/cpc/UpdateCpcClickStatBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/cpc/UpdateCpcClickStatBatch.groovy index 6864568b4..02b7da644 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/cpc/UpdateCpcClickStatBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/cpc/UpdateCpcClickStatBatch.groovy @@ -11,20 +11,20 @@ import com.mongodb.DBCollection import com.mongodb.Mongo /** - * 点击量统计 6 - * 点击量分析 7 - * 面积分布 0 - * 价格分布 1 - * 时间分布 3 - * 区域分布 2 - * TOP10小区 5 - * 经纪人分布 8 - * 房型分布 9 + * 鐐瑰嚮閲忕粺璁� 6 + * 鐐瑰嚮閲忓垎鏋� 7 + * 闈㈢Н鍒嗗竷 0 + * 浠锋牸鍒嗗竷 1 + * 鏃堕棿鍒嗗竷 3 + * 鍖哄煙鍒嗗竷 2 + * TOP10灏忓尯 5 + * 缁忕邯浜哄垎甯� 8 + * 鎴垮瀷鍒嗗竷 9 */ /** * - * 出现问题运行一次 - * 用于同步 CPC统计数据和知识库同步,解决统计显示中会出现 浦东 和 浦东新区 的问题 + * 鍑虹幇闂杩愯涓�娆� + * 鐢ㄤ簬鍚屾 CPC缁熻鏁版嵁鍜岀煡璇嗗簱鍚屾锛岃В鍐崇粺璁℃樉绀轰腑浼氬嚭鐜� 娴︿笢 鍜� 娴︿笢鏂板尯 鐨勯棶棰� * */ @BatchOwner(Watcher.DuXiaoYu) @@ -60,7 +60,7 @@ class UpdateCpcClickStatBatch extends BaseBatch { new_stat_data << [(ret[0]):data.value] }else{ new_stat_data << [(data.key):data.value] - logInfo "${city} : ${data.key} 没有匹配到 " + logInfo "${city} : ${data.key} 娌℃湁鍖归厤鍒� " } } catch (Exception e) { } @@ -85,7 +85,7 @@ class UpdateCpcClickStatBatch extends BaseBatch { new_stat_data << [(ret[0]):data.value] }else{ new_stat_data << [(data.key):data.value] - logInfo "${data.key} 没有匹配到 " + logInfo "${data.key} 娌℃湁鍖归厤鍒� " } } catch (Exception e) { } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/AnjukeUrl.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/AnjukeUrl.groovy index 5e45599b7..b01a06563 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/AnjukeUrl.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/AnjukeUrl.groovy @@ -5,26 +5,26 @@ import com.mongodb.BasicDBObject import com.mongodb.DBCollection import com.mongodb.DBObject class AnjukeUrl { - //种子表 + //绉嶅瓙琛� public static final DBCollection SEED_COLL = MongoUtils.getCollectionByName("artemis", "seed", "artemis.db.fangjia.com", 27017) public static void main(String[] args){ def task = new AnjukeUrl(); def sh_urls = task.sh_run(); - task.saveUrl("上海", "UTF-8","51ef986de4b03cf76cc2aea2", sh_urls) + task.saveUrl("涓婃捣", "UTF-8","51ef986de4b03cf76cc2aea2", sh_urls) def bj_urls = task.bj_run(); - task.saveUrl("北京", "UTF-8","51ef986de4b03cf76cc2aea2", bj_urls) + task.saveUrl("鍖椾含", "UTF-8","51ef986de4b03cf76cc2aea2", bj_urls) def cd_urls = task.cd_run(); - task.saveUrl("成都", "UTF-8","51ef986de4b03cf76cc2aea2", cd_urls) + task.saveUrl("鎴愰兘", "UTF-8","51ef986de4b03cf76cc2aea2", cd_urls) def gz_urls = task.gz_run(); - task.saveUrl("广州", "UTF-8","51ef986de4b03cf76cc2aea2", gz_urls) + task.saveUrl("骞垮窞", "UTF-8","51ef986de4b03cf76cc2aea2", gz_urls) def sz_urls = task.sz_run(); - task.saveUrl("深圳", "UTF-8","51ef986de4b03cf76cc2aea2", sz_urls) + task.saveUrl("娣卞湷", "UTF-8","51ef986de4b03cf76cc2aea2", sz_urls) } public def sh_run(){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/AutoAddSeedsBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/AutoAddSeedsBatch.groovy index ceccf3bbc..bcdc6a451 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/AutoAddSeedsBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/AutoAddSeedsBatch.groovy @@ -20,7 +20,7 @@ import com.fangjia.script.newDistrict.InvokeHttpRequest import com.fangjia.script.BatchOwner import com.fangjia.script.Watcher /** - * 从城市列表添加种子 + * 浠庡煄甯傚垪琛ㄦ坊鍔犵瀛� * @author gaojuan */ @BatchOwner(Watcher.GaoJuan) @@ -30,10 +30,10 @@ import com.mongodb.DBCollection; class AutoAddSeedsBatch extends BaseBatch{ - //种子库 + //绉嶅瓙搴� public static final DBCollection SEED_COLL = MongoUtils.getCollectionByName("artemis", "seed", "artemis.db.fangjia.com", 27017) - public static def CITYS = CommonDatautils.findAllCity();//所有城市 + public static def CITYS = CommonDatautils.findAllCity();//鎵�鏈夊煄甯� final static def EMAILS = ["gaojuan@fangjia.com"] @@ -48,63 +48,63 @@ class AutoAddSeedsBatch extends BaseBatch{ @Override public void process(Object args) { - souFunRun("搜房"); + souFunRun("鎼滄埧"); // tc58Run("58"); -// ganjiRun("赶集"); +// ganjiRun("璧堕泦"); -// zufangRun("租房网"); +// zufangRun("绉熸埧缃�"); -// baiXingRun("百姓网"); -// sinaRun("新浪"); -// anjukeRun("安居客"); +// baiXingRun("鐧惧缃�"); +// sinaRun("鏂版氮"); +// anjukeRun("瀹夊眳瀹�"); -// jintiRun("今题"); -// goufangRun("购房网") +// jintiRun("浠婇"); +// goufangRun("璐埧缃�") // -// cityHouseRun("城市房产"); +// cityHouseRun("鍩庡競鎴夸骇"); -// fangxun86Run("86房讯网"); -// letfindRun("猎房网"); +// fangxun86Run("86鎴胯缃�"); +// letfindRun("鐚庢埧缃�"); -// soufyRun("搜房源网") +// soufyRun("鎼滄埧婧愮綉") -// tuitui99Run("推推99房") +// tuitui99Run("鎺ㄦ帹99鎴�") -// qqRun("腾讯"); -// xBaiXingRun("小百姓网") -// zhaofangwRun("找房网w"); -// lieBiaoRun("列表网"); -// qwjianRun("千万间") +// qqRun("鑵捐"); +// xBaiXingRun("灏忕櫨濮撶綉") +// zhaofangwRun("鎵炬埧缃憌"); +// lieBiaoRun("鍒楄〃缃�"); +// qwjianRun("鍗冧竾闂�") // go007Run("go007"); -// fccsRun("房产超市网"); -// znz98Run("98指南针") -// eDengRun("易登网"); -// qu114Run("去114"); -// qd8Run("快点8"); -// ohqlyRun("千里眼"); -// fcwlmRun("房产网联盟"); -// lianjiaRun("链家地产"); -// qfang("Q房网"); -// fzg360("房掌柜");//文件 -// fdcRun("亿房网"); -// yfbRun("亿房宝"); -// efangWangRun("e房网"); -// fangtooRun("房途网"); -// fangboxRun("房宝箱"); -// loushiRun("第一楼市"); -// pinganfang("平安好房"); +// fccsRun("鎴夸骇瓒呭競缃�"); +// znz98Run("98鎸囧崡閽�") +// eDengRun("鏄撶櫥缃�"); +// qu114Run("鍘�114"); +// qd8Run("蹇偣8"); +// ohqlyRun("鍗冮噷鐪�"); +// fcwlmRun("鎴夸骇缃戣仈鐩�"); +// lianjiaRun("閾惧鍦颁骇"); +// qfang("Q鎴跨綉"); +// fzg360("鎴挎帉鏌�");//鏂囦欢 +// fdcRun("浜挎埧缃�"); +// yfbRun("浜挎埧瀹�"); +// efangWangRun("e鎴跨綉"); +// fangtooRun("鎴块�旂綉"); +// fangboxRun("鎴垮疂绠�"); +// loushiRun("绗竴妤煎競"); +// pinganfang("骞冲畨濂芥埧"); -// koofangRun("酷房"); -// baiduRun("百度乐居"); -// jiwuRun("吉屋"); -// tuitui99Run("推推99房") -// dichan365Run("365地产") +// koofangRun("閰锋埧"); +// baiduRun("鐧惧害涔愬眳"); +// jiwuRun("鍚夊眿"); +// tuitui99Run("鎺ㄦ帹99鎴�") +// dichan365Run("365鍦颁骇") -// distCityHouse("城市房产"); +// distCityHouse("鍩庡競鎴夸骇"); -// dist163com("网易") -// distFccs("中国房产超市网"); +// dist163com("缃戞槗") +// distFccs("涓浗鎴夸骇瓒呭競缃�"); // sendEmails(); @@ -115,24 +115,24 @@ class AutoAddSeedsBatch extends BaseBatch{ } def test(){ - def obj = '
  • 4元/平米/天
  • 107平米
  • 纯写字楼
  • 太平洋企业中心
  • 长宁- 中山公园长宁延安西路889号
  • '; + def obj = '
  • 4鍏�/骞崇背/澶�
  • 107骞崇背
  • 绾啓瀛楁ゼ
  • 澶钩娲嬩紒涓氫腑蹇�
  • 闀垮畞- 涓北鍏洯闀垮畞寤跺畨瑗胯矾889鍙�
  • '; Document document = Jsoup.parse(obj); Elements elements = JQueryUtils.select(["li"], document) def day_price = 0; def area = 0; for (Element element : elements) { def text = element.text(); - if(text.indexOf("价格:")!=-1){ + if(text.indexOf("浠锋牸锛�")!=-1){ def eles = element.select("span"); if(eles.size()>=1){ def p = eles.first().text(); - day_price = p.replace("元/平米/天","").toDouble() + day_price = p.replace("鍏�/骞崇背/澶�","").toDouble() } - }else if(text.indexOf("面积:")!=-1){ + }else if(text.indexOf("闈㈢Н锛�")!=-1){ def eles = element.select("span"); if(eles.size()>=1){ def a = eles.first().text(); - area = a.replace("平米","").toDouble() + area = a.replace("骞崇背","").toDouble() } } @@ -148,10 +148,10 @@ class AutoAddSeedsBatch extends BaseBatch{ def urlMaps = findAllCityLinks("http://www.centaline.com.cn/", ".all-city>dl>dd>a", charset); if(cat == "sell"){ - urlMaps = getUrls(urlMaps, CITYS, charset, ".column:contains(二手房)", ""); + urlMaps = getUrls(urlMaps, CITYS, charset, ".column:contains(浜屾墜鎴�)", ""); }else{ - urlMaps = getUrls(urlMaps, CITYS, charset, ".fang-eara a:contains(租房)", ""); + urlMaps = getUrls(urlMaps, CITYS, charset, ".fang-eara a:contains(绉熸埧)", ""); } if(is_template){ @@ -188,7 +188,7 @@ class AutoAddSeedsBatch extends BaseBatch{ def addSinaSeeds(def websitName, def url, charset, jobId, cat, is_template){ def urlMaps = findAllCityLinks(url, ".g-line>dd>a", charset); - urlMaps = getUrls(urlMaps, CITYS, charset, "a:contains(小区房价)", ""); + urlMaps = getUrls(urlMaps, CITYS, charset, "a:contains(灏忓尯鎴夸环)", ""); urlMaps = filterCity(urlMaps, CITYS); @@ -200,10 +200,10 @@ class AutoAddSeedsBatch extends BaseBatch{ def urlMaps = findAllCityLinks(url, ".all-city>dl>dd>a", charset); if(cat == "sell"){ - urlMaps = getUrls(urlMaps, CITYS, charset, ".column:contains(二手房)", ""); + urlMaps = getUrls(urlMaps, CITYS, charset, ".column:contains(浜屾墜鎴�)", ""); }else{ - urlMaps = getUrls(urlMaps, CITYS, charset, ".fang-eara a:contains(租房)", ""); + urlMaps = getUrls(urlMaps, CITYS, charset, ".fang-eara a:contains(绉熸埧)", ""); } if(is_template){ @@ -221,7 +221,7 @@ class AutoAddSeedsBatch extends BaseBatch{ def addZufangSeeds(def websitName, def url, charset, jobId, cat, is_template){ def urlMaps = findAllCityLinks(url, ".ct a", charset); - urlMaps = getUrls(urlMaps, CITYS, charset, ".navBar a:contains(租房)", ""); + urlMaps = getUrls(urlMaps, CITYS, charset, ".navBar a:contains(绉熸埧)", ""); urlMaps = filterCity(urlMaps, CITYS); @@ -251,7 +251,7 @@ class AutoAddSeedsBatch extends BaseBatch{ saveUrls(websitName , urlMaps, charset, jobId, is_template, cat); } - //搜房 + //鎼滄埧 def souFunRun(def websitName){ def cityUrls = ["sell":"http://esf.taizhou.fang.com/newsecond/esfcities.aspx","rent":"http://zu.fang.com/cities.aspx"]; def jobIds = ["sell":"51025d0ae4b0bc9fcbe08173","rent":"514fba96e4b02fd984cd4195"] @@ -264,7 +264,7 @@ class AutoAddSeedsBatch extends BaseBatch{ def urlMaps = findAllCityLinks2(url, "#c01 a"); if(cat == "sell"){ - urlMaps = getRentUrls2(urlMaps, CITYS, charset, [".listBox a:contains(出售房源)"], ""); + urlMaps = getRentUrls2(urlMaps, CITYS, charset, [".listBox a:contains(鍑哄敭鎴挎簮)"], ""); } if(is_template){ @@ -277,7 +277,7 @@ class AutoAddSeedsBatch extends BaseBatch{ } - //安居客 + //瀹夊眳瀹� def anjukeRun(def website){ def cityUrls = ["sell":"http://www.anjuke.com/sy-city.html","rent":"http://www.anjuke.com/sy-city.html"]; def jobIds = ["sell":"50c367dc4d60fd41bdae29b6","rent":"54101c5ae4b09e392f5bb99e"] @@ -292,11 +292,11 @@ class AutoAddSeedsBatch extends BaseBatch{ def urlMaps = [:] if(cat == "sell"){ urlMaps = findAllCityLinks(url, ".cities_boxer a", charset); - urlMaps = getUrls(urlMaps, CITYS, charset, ".a_navnew:contains(二手房)", ""); + urlMaps = getUrls(urlMaps, CITYS, charset, ".a_navnew:contains(浜屾墜鎴�)", ""); }else{ urlMaps = findAllCityLinks(url, ".cities_boxer a", charset); - urlMaps = getUrls(urlMaps, CITYS, charset, "li:contains(租 房) .a_navnew", ""); + urlMaps = getUrls(urlMaps, CITYS, charset, "li:contains(绉� 鎴�) .a_navnew", ""); } if(is_template){ @@ -321,7 +321,7 @@ class AutoAddSeedsBatch extends BaseBatch{ def addKoofangSeeds(def websitName, def url, charset, jobId, cat, is_template){ def urlMaps = findAllCityLinks(url, "#city_01 a", charset); if(cat == "sell"){ - urlMaps = getUrls(urlMaps, CITYS, charset, ".nav_athree:contains(二手房)", ""); + urlMaps = getUrls(urlMaps, CITYS, charset, ".nav_athree:contains(浜屾墜鎴�)", ""); } urlMaps = filterCity(urlMaps, CITYS); saveUrls(websitName, urlMaps, charset, jobId,is_template, cat); @@ -338,9 +338,9 @@ class AutoAddSeedsBatch extends BaseBatch{ def addBaiduSeeds(def websitName, def url, charset, jobId, cat, is_template){ def urlMaps = findAllCityLinks(url, ".city-letter a", charset); if(cat == "sell"){ - urlMaps = getUrls(urlMaps, CITYS, charset, ".top-bar a:contains(二手房)", ""); + urlMaps = getUrls(urlMaps, CITYS, charset, ".top-bar a:contains(浜屾墜鎴�)", ""); }else{ - urlMaps = getUrls(urlMaps, CITYS, charset, ".top-bar a:contains(租房)", ""); + urlMaps = getUrls(urlMaps, CITYS, charset, ".top-bar a:contains(绉熸埧)", ""); } urlMaps = filterCity(urlMaps, CITYS); saveUrls(websitName, urlMaps, charset, jobId,is_template, cat); @@ -358,7 +358,7 @@ class AutoAddSeedsBatch extends BaseBatch{ def addJiwuSeeds(def websitName, def url, charset, jobId, cat, is_template){ def urlMaps = findAllCityLinks(url, ".section-four-a2>li>a", charset); if(cat == "sell"){ - urlMaps = getUrls(urlMaps, CITYS, charset, ".index-banner-r2 a:contains(二手房源)", ""); + urlMaps = getUrls(urlMaps, CITYS, charset, ".index-banner-r2 a:contains(浜屾墜鎴挎簮)", ""); } urlMaps = filterCity(urlMaps, CITYS); saveUrls(websitName, urlMaps, charset, jobId,is_template, cat); @@ -374,9 +374,9 @@ class AutoAddSeedsBatch extends BaseBatch{ def addTuitui99Seeds(def websitName, def url, charset, jobId, cat, is_template){ def urlMaps = findAllCityLinks(url, "#CityList a", charset); if(cat == "sell"){ - urlMaps = getUrls(urlMaps, CITYS, charset, ".nav_yszt a:contains(二手房)", ""); + urlMaps = getUrls(urlMaps, CITYS, charset, ".nav_yszt a:contains(浜屾墜鎴�)", ""); }else{ - urlMaps = getUrls(urlMaps, CITYS, charset, ".nav_yszt a:contains(租房)", ""); + urlMaps = getUrls(urlMaps, CITYS, charset, ".nav_yszt a:contains(绉熸埧)", ""); } urlMaps = filterCity(urlMaps, CITYS); saveUrls(websitName, urlMaps, charset, jobId,is_template, cat); @@ -422,9 +422,9 @@ class AutoAddSeedsBatch extends BaseBatch{ def addGoufangSeeds(def websitName, def url, charset, jobId, cat, is_template){ def urlMaps = [:]; if(cat == "sell"){ - urlMaps = findAllCityLinks(url, ".onecitybar>ul>li>a:contains(二手房)", charset); + urlMaps = findAllCityLinks(url, ".onecitybar>ul>li>a:contains(浜屾墜鎴�)", charset); }else{ - urlMaps = findAllCityLinks(url, ".onecitybar>ul>li>a:contains(租房)", charset); + urlMaps = findAllCityLinks(url, ".onecitybar>ul>li>a:contains(绉熸埧)", charset); } urlMaps = filterCity(urlMaps, CITYS); saveUrls(websitName, urlMaps, charset, jobId,is_template, cat); @@ -432,7 +432,7 @@ class AutoAddSeedsBatch extends BaseBatch{ def fc515Run(def url, charset, jobId, is_template){ - def citys = CommonDatautils.findAllCity();//所有城市 + def citys = CommonDatautils.findAllCity();//鎵�鏈夊煄甯� def urlMaps = findAllCityLinks(url, ".sm_sf_d em a", charset); if(is_template){ @@ -444,7 +444,7 @@ class AutoAddSeedsBatch extends BaseBatch{ } - //添加百姓网 + //娣诲姞鐧惧缃� def baiXingRun(def websitName){ def cityUrls = ["sell":"http://www.baixing.com/?changeLocation=yes&return=%2Fershoufang%2F%3Fafo%3DQhx","rent":"http://www.baixing.com/?changeLocation=yes&return=%2Fzhengzu%2F"]; def jobIds = ["sell":"546ed21ae4b024a890322e26","rent":"546afd95e4b0e6ab76cf8027"] @@ -472,7 +472,7 @@ class AutoAddSeedsBatch extends BaseBatch{ } - //城市房产 + //鍩庡競鎴夸骇 def cityHouseRun(def websitName){ def cityUrls = ["sell":"http://www.cityhouse.cn/city.html", "rent":"http://www.cityhouse.cn/city.html"]; def jobIds = ["sell":"5478329be4b08f109484a4b4","rent":"546ef86be4b024a8903230d5"] @@ -487,9 +487,9 @@ class AutoAddSeedsBatch extends BaseBatch{ def urlMaps = findAllCityLinks(url, ".m_d_zx>a", charset); if(cat == "sell"){ - urlMaps = getUrls(urlMaps, CITYS, charset, ".head-nav a:contains(二手房)", ""); + urlMaps = getUrls(urlMaps, CITYS, charset, ".head-nav a:contains(浜屾墜鎴�)", ""); }else{ - urlMaps = getUrls(urlMaps, CITYS, charset, ".head-nav .a_nav:contains(租房)", ""); + urlMaps = getUrls(urlMaps, CITYS, charset, ".head-nav .a_nav:contains(绉熸埧)", ""); } urlMaps = filterCity(urlMaps, CITYS); @@ -528,16 +528,16 @@ class AutoAddSeedsBatch extends BaseBatch{ def jobIds = ["rent":"57a2b354e4b04e8f306b5d8a"] def charset = "UTF-8"; - addSeeds(websitName, cityUrls.rent, charset, jobIds.rent, "rent", false, "#city-panel a", ".main-nav a:contains(租房)"); + addSeeds(websitName, cityUrls.rent, charset, jobIds.rent, "rent", false, "#city-panel a", ".main-nav a:contains(绉熸埧)"); } - //搜房源网 + //鎼滄埧婧愮綉 def soufyRun(def websitName){ def cityUrls = [ "rent":"http://www.soufy.cn/index.htm"]; def jobIds = ["rent":"57a2b393e4b04e8f306b5d8d"] def charset = "UTF-8"; - addSeeds(websitName, cityUrls.rent, charset, jobIds.rent, "rent", false, "#letter-list a", "#nav a:contains(租房)"); + addSeeds(websitName, cityUrls.rent, charset, jobIds.rent, "rent", false, "#letter-list a", "#nav a:contains(绉熸埧)"); } def tuitui99Run(def websitName){ @@ -545,7 +545,7 @@ class AutoAddSeedsBatch extends BaseBatch{ def jobIds = ["rent":"57a2b991e4b04e8f306b5d9c"] def charset = "UTF-8"; - addSeeds(websitName, cityUrls.rent, charset, jobIds.rent, "rent", false, "#CityList a", ".nav a:contains(租房)"); + addSeeds(websitName, cityUrls.rent, charset, jobIds.rent, "rent", false, "#CityList a", ".nav a:contains(绉熸埧)"); } def qqRun(def websitName){ @@ -553,7 +553,7 @@ class AutoAddSeedsBatch extends BaseBatch{ def jobIds = ["rent":"57a2b991e4b04e8f306b5d9c"] def charset = "gbk"; - addSeeds(websitName, cityUrls.rent, charset, jobIds.rent, "rent", false, "#scrollBox a", "#promotionTab a:contains(热门租房)"); + addSeeds(websitName, cityUrls.rent, charset, jobIds.rent, "rent", false, "#scrollBox a", "#promotionTab a:contains(鐑棬绉熸埧)"); } def xBaiXingRun(def websitName){ @@ -561,13 +561,13 @@ class AutoAddSeedsBatch extends BaseBatch{ def jobIds = ["rent":"57a2ec8be4b04e8f306b61a7"] def charset = "UTF-8"; - addSeeds(websitName, cityUrls.rent, charset, jobIds.rent, "rent", false, "#list>dd>a", ".s_key a:contains(租房)"); + addSeeds(websitName, cityUrls.rent, charset, jobIds.rent, "rent", false, "#list>dd>a", ".s_key a:contains(绉熸埧)"); } def zhaofangwRun(def websitName){ def charset = "UTF-8"; def jobIds = ["rent":"57a2efffe4b04e8f306b61a9"] - def urlMaps = readTxt("E:\\高娟\\找房网w.txt"); + def urlMaps = readTxt("E:\\楂樺\\鎵炬埧缃憌.txt"); urlMaps = filterCity(urlMaps, CITYS); saveUrls(websitName, urlMaps, charset, jobIds.rent, false, "rent"); } @@ -577,7 +577,7 @@ class AutoAddSeedsBatch extends BaseBatch{ def jobIds = ["rent":"57a2f0e9e4b04e8f306b61ad"] def charset = "UTF-8"; - addSeeds(websitName, cityUrls.rent, charset, jobIds.rent, "rent", false, ".box.w_d>dl>dd>a", "a:contains(整租房)"); + addSeeds(websitName, cityUrls.rent, charset, jobIds.rent, "rent", false, ".box.w_d>dl>dd>a", "a:contains(鏁寸鎴�)"); } def qwjianRun(def websitName){ @@ -593,7 +593,7 @@ class AutoAddSeedsBatch extends BaseBatch{ def jobIds = ["rent":"57a302f9e4b04e8f306b64c3"] def charset = "UTF-8"; - addSeeds(websitName, cityUrls.rent, charset, jobIds.rent, "rent", false, ".cities>li>a", ".lista>a:contains(房屋出租)"); + addSeeds(websitName, cityUrls.rent, charset, jobIds.rent, "rent", false, ".cities>li>a", ".lista>a:contains(鎴垮眿鍑虹)"); } def znz98Run(def websitName){ @@ -601,7 +601,7 @@ class AutoAddSeedsBatch extends BaseBatch{ def jobIds = ["rent":"57a31528e4b04e8f306b665b"] def charset = "UTF-8"; - addSeeds(websitName, cityUrls.rent, charset, jobIds.rent, "rent", false, ".fblue>a", ".navBar a:contains(租房)"); + addSeeds(websitName, cityUrls.rent, charset, jobIds.rent, "rent", false, ".fblue>a", ".navBar a:contains(绉熸埧)"); } def eDengRun(def websitName){ @@ -609,7 +609,7 @@ class AutoAddSeedsBatch extends BaseBatch{ def jobIds = ["rent":"57a318a6e4b04e8f306b6669"] def charset = "UTF-8"; - addSeeds(websitName, cityUrls.rent, charset, jobIds.rent, "rent", false, ".map_name>a", ".edhp_info a:contains(租房):eq(0)"); + addSeeds(websitName, cityUrls.rent, charset, jobIds.rent, "rent", false, ".map_name>a", ".edhp_info a:contains(绉熸埧):eq(0)"); } @@ -618,7 +618,7 @@ class AutoAddSeedsBatch extends BaseBatch{ def jobIds = ["rent":"57a319d7e4b04e8f306b666b"] def charset = "UTF-8"; - addSeeds(websitName, cityUrls.rent, charset, jobIds.rent, "rent", false, "#clist dd a", "a:contains(房屋出租)"); + addSeeds(websitName, cityUrls.rent, charset, jobIds.rent, "rent", false, "#clist dd a", "a:contains(鎴垮眿鍑虹)"); } def qd8Run(def websitName){ @@ -626,14 +626,14 @@ class AutoAddSeedsBatch extends BaseBatch{ def jobIds = ["rent":"57a31c63e4b04e8f306b666d"] def charset = "UTF-8"; - addSeeds(websitName, cityUrls.rent, charset, jobIds.rent, "rent", false, "#tblist a", ".module a:contains(整租房)"); + addSeeds(websitName, cityUrls.rent, charset, jobIds.rent, "rent", false, "#tblist a", ".module a:contains(鏁寸鎴�)"); } def ohqlyRun(def websitName){ def jobIds = ["rent":"57a31dd1e4b04e8f306b6670"] def charset = "UTF-8"; - def urlMaps = readTxt("E:\\高娟\\千里眼.txt"); + def urlMaps = readTxt("E:\\楂樺\\鍗冮噷鐪�.txt"); urlMaps = filterCity(urlMaps, CITYS); saveUrls(websitName, urlMaps, charset, jobIds.rent, false, "rent"); } @@ -642,7 +642,7 @@ class AutoAddSeedsBatch extends BaseBatch{ def jobIds = ["rent":"57a4065ae4b04e8f306eb7b4"] def charset = "GBK"; - def urlMaps = readTxt("E:\\高娟\\房产网联盟.txt"); + def urlMaps = readTxt("E:\\楂樺\\鎴夸骇缃戣仈鐩�.txt"); urlMaps = filterCity(urlMaps, CITYS); saveUrls(websitName, urlMaps, charset, jobIds.rent, false, "rent"); } @@ -652,7 +652,7 @@ class AutoAddSeedsBatch extends BaseBatch{ def jobIds = ["rent":"57a427c9e4b04e8f30765470"] def charset = "UTF-8"; - addSeeds(websitName, cityUrls.rent, charset, jobIds.rent, "rent", false, ".fc-main a", ".nav a:contains(租房)"); + addSeeds(websitName, cityUrls.rent, charset, jobIds.rent, "rent", false, ".fc-main a", ".nav a:contains(绉熸埧)"); } def qfang(def websitName){ @@ -660,7 +660,7 @@ class AutoAddSeedsBatch extends BaseBatch{ def jobIds = ["rent":"57a430c3e4b04e8f30787e4a"] def charset = "UTF-8"; - addSeeds(websitName, cityUrls.rent, charset, jobIds.rent, "rent", false, ".cities-opts a", ".nav-link>a:contains(租房)"); + addSeeds(websitName, cityUrls.rent, charset, jobIds.rent, "rent", false, ".cities-opts a", ".nav-link>a:contains(绉熸埧)"); } def fdcRun(def websitName){ @@ -668,7 +668,7 @@ class AutoAddSeedsBatch extends BaseBatch{ def jobIds = ["rent":"57a43a7ae4b04e8f307added"] def charset = "UTF-8"; - addSeeds(websitName, cityUrls.rent, charset, jobIds.rent, "rent", false, ".fz_nav>a", ".navBox a:contains(房屋出租)"); + addSeeds(websitName, cityUrls.rent, charset, jobIds.rent, "rent", false, ".fz_nav>a", ".navBox a:contains(鎴垮眿鍑虹)"); } def yfbRun(def websitName){ @@ -676,7 +676,7 @@ class AutoAddSeedsBatch extends BaseBatch{ def jobIds = ["rent":"57a43fd2e4b04e8f307c21b8"] def charset = "GBK"; - addSeeds(websitName, cityUrls.rent, charset, jobIds.rent, "rent", false, "table div a", "a:contains(租)"); + addSeeds(websitName, cityUrls.rent, charset, jobIds.rent, "rent", false, "table div a", "a:contains(绉�)"); } def efangWangRun(def websitName){ @@ -684,7 +684,7 @@ class AutoAddSeedsBatch extends BaseBatch{ def jobIds = ["rent":"57a445f5e4b04e8f307d790d"] def charset = "GBK"; - addSeeds(websitName, cityUrls.rent, charset, jobIds.rent, "rent", false, ".More a", "#Nav a:contains(租房)"); + addSeeds(websitName, cityUrls.rent, charset, jobIds.rent, "rent", false, ".More a", "#Nav a:contains(绉熸埧)"); } def fangtooRun(def websitName){ @@ -692,7 +692,7 @@ class AutoAddSeedsBatch extends BaseBatch{ def jobIds = ["rent":"57a4486ae4b04e8f307df3be"] def charset = "UTF-8"; - addSeeds(websitName, cityUrls.rent, charset, jobIds.rent, "rent", false, ".city-name>a", ".nav>a:contains(租房)"); + addSeeds(websitName, cityUrls.rent, charset, jobIds.rent, "rent", false, ".city-name>a", ".nav>a:contains(绉熸埧)"); } def fangboxRun(def websitName){ @@ -700,7 +700,7 @@ class AutoAddSeedsBatch extends BaseBatch{ def jobIds = ["rent":"57a4702ae4b04e8f3084cd6a"] def charset = "GBK"; - addSeeds(websitName, cityUrls.rent, charset, jobIds.rent, "rent", false, ".allcitylist a", ".nav-bar a:contains(出租):eq(0)"); + addSeeds(websitName, cityUrls.rent, charset, jobIds.rent, "rent", false, ".allcitylist a", ".nav-bar a:contains(鍑虹):eq(0)"); } def loushiRun(def websitName){ @@ -708,7 +708,7 @@ class AutoAddSeedsBatch extends BaseBatch{ def jobIds = ["rent":"57a7f3c8e4b0d3c905779dc3"] def charset = "UTF-8"; - addSeeds(websitName, cityUrls.rent, charset, jobIds.rent, "rent", false, ".cli a", ".a_nav:contains(出租)"); + addSeeds(websitName, cityUrls.rent, charset, jobIds.rent, "rent", false, ".cli a", ".a_nav:contains(鍑虹)"); } def pinganfang(def websitName){ @@ -716,28 +716,28 @@ class AutoAddSeedsBatch extends BaseBatch{ def jobIds = ["rent":"57a80135e4b0d3c905779e65"] def charset = "UTF-8"; - addSeeds(websitName, cityUrls.rent, charset, jobIds.rent, "rent", false, ".choose-area .a", "#J_navList>li>a:contains(安安租)"); + addSeeds(websitName, cityUrls.rent, charset, jobIds.rent, "rent", false, ".choose-area .a", "#J_navList>li>a:contains(瀹夊畨绉�)"); } def distCityHouse(def websitName){ def jobId = "577c79a5e4b04ccfabd95488" def charset = "UTF-8"; def url = "http://www.cityhouse.cn/city.html"; - addSeeds(websitName, url, charset, jobId, "district", false, ".fz_12", ".a_nav:contains(新楼盘)"); + addSeeds(websitName, url, charset, jobId, "district", false, ".fz_12", ".a_nav:contains(鏂版ゼ鐩�)"); } def dist163com(def websitName){ def jobId = "577c79f2e4b04ccfabd95498" def charset = "UTF-8"; def url = "http://gz.house.163.com/"; - addSeeds(websitName, url, charset, jobId, "district", false, ".down>a", ".nav4 a:contains(楼盘)"); + addSeeds(websitName, url, charset, jobId, "district", false, ".down>a", ".nav4 a:contains(妤肩洏)"); } def distFccs(def websitName){ def jobId = "577c79cae4b04ccfabd9548f" def charset = "GBK"; - def urlMaps = readTxt("E:\\高娟\\房产超市.txt"); + def urlMaps = readTxt("E:\\楂樺\\鎴夸骇瓒呭競.txt"); urlMaps = filterCity(urlMaps, CITYS); saveUrls(websitName, urlMaps, charset, jobId, false, "district"); } @@ -746,7 +746,7 @@ class AutoAddSeedsBatch extends BaseBatch{ def jobIds = ["rent":"57a435c5e4b04e8f3079b03e"] def charset = "GBK"; - def urlMaps = readTxt("E:\\高娟\\房掌柜.txt"); + def urlMaps = readTxt("E:\\楂樺\\鎴挎帉鏌�.txt"); urlMaps = filterCity(urlMaps, CITYS); saveUrls(websitName, urlMaps, charset, jobIds.rent, false, "rent"); } @@ -756,7 +756,7 @@ class AutoAddSeedsBatch extends BaseBatch{ def jobIds = ["rent":"57a31099e4b04e8f306b6651"] def charset = "gbk"; - def urlMaps = readTxt("E:\\高娟\\中国房产超市网.txt"); + def urlMaps = readTxt("E:\\楂樺\\涓浗鎴夸骇瓒呭競缃�.txt"); urlMaps = filterCity(urlMaps, CITYS); saveUrls(websitName, urlMaps, charset, jobIds.rent, false, "rent"); @@ -772,7 +772,7 @@ class AutoAddSeedsBatch extends BaseBatch{ saveUrls(websitName, urlMaps, charset, jobId, is_template, cat); } - //今题 + //浠婇 def jintiRun(def websitName){ def cityUrls = ["sell":"http://www.jinti.com/fangchan/selectcity/", "rent":"http://www.jinti.com/fangchan/selectcity/"]; def jobIds = ["sell":"555f010ee4b0216fa40a5cba","rent":"5423ca0de4b0ba18b478b489"] @@ -787,9 +787,9 @@ class AutoAddSeedsBatch extends BaseBatch{ def urlMaps = findAllCityLinks(url, ".mBox.zoom.a-z>dl>dd>a", charset); if(cat == "sell"){ - urlMaps = getUrls(urlMaps, CITYS, charset, ".nav a:contains(二手房)", ""); + urlMaps = getUrls(urlMaps, CITYS, charset, ".nav a:contains(浜屾墜鎴�)", ""); }else{ - urlMaps = getUrls(urlMaps, CITYS, charset, ".nav a:contains(租房)", ""); + urlMaps = getUrls(urlMaps, CITYS, charset, ".nav a:contains(绉熸埧)", ""); } urlMaps = filterCity(urlMaps, CITYS); @@ -812,7 +812,7 @@ class AutoAddSeedsBatch extends BaseBatch{ if(url.contains("www.pinganfang.com")){ href = "http://www.pinganfang.com"+ href; } - ret.put(city.replace("租房", "").replace("站", "").replace("房价楼市", ""), href); + ret.put(city.replace("绉熸埧", "").replace("绔�", "").replace("鎴夸环妤煎競", ""), href); } return ret; } @@ -856,7 +856,7 @@ class AutoAddSeedsBatch extends BaseBatch{ try{ s = http.get(v, [:], chartset); }catch(Exception e){ - println v +" 请求出错!" + println v +" 璇锋眰鍑洪敊!" } Document document = Jsoup.parse(s); Elements elements = JQueryUtils.select([xpath], document) @@ -888,7 +888,7 @@ class AutoAddSeedsBatch extends BaseBatch{ }else{ - println k + "无租房" + println k + "鏃犵鎴�" } } @@ -933,7 +933,7 @@ class AutoAddSeedsBatch extends BaseBatch{ } }else{ - println k + "无租房" + println k + "鏃犵鎴�" } } @@ -950,15 +950,15 @@ class AutoAddSeedsBatch extends BaseBatch{ def lastResultMap = [:]; urlMaps.each {city,url-> - city = city.replace("租房","").replace("二手房","") + city = city.replace("绉熸埧","").replace("浜屾墜鎴�","") if(citys.contains(city)){ lastResultMap.put(city, url); }else{ - if(citys.contains(city + "州")){ - city = city + "州"; + if(citys.contains(city + "宸�")){ + city = city + "宸�"; lastResultMap.put(city, url); }else{ - println "[ ${city} ] 暂未开通!" + println "[ ${city} ] 鏆傛湭寮�閫氾紒" } } } @@ -1055,10 +1055,10 @@ class AutoAddSeedsBatch extends BaseBatch{ StringBuffer sb=new StringBuffer(); sb.append("
    ${title}
    网站名称缃戠珯鍚嶇О总页面数成功页面数失败页面数页面成功率鎬婚〉闈㈡暟鎴愬姛椤甸潰鏁�澶辫触椤甸潰鏁�椤甸潰鎴愬姛鐜�总分析数成功分析数失败分析数分析有效率鎬诲垎鏋愭暟鎴愬姛鍒嗘瀽鏁�澶辫触鍒嗘瀽鏁�鍒嗘瀽鏈夋晥鐜�
    ") - sb.append("城市") + sb.append("鍩庡競") sb.append("") - sb.append("上次报告时间:").append(DateUtil.formatToTightYYYYMMDDhhmmss((Date)lastReport.get("_id"))); + sb.append("涓婃鎶ュ憡鏃堕棿锛�").append(DateUtil.formatToTightYYYYMMDDhhmmss((Date)lastReport.get("_id"))); sb.append("") - sb.append("此次报告时间:").append(DateUtil.formatToTightYYYYMMDDhhmmss(new Date())); + sb.append("姝ゆ鎶ュ憡鏃堕棿锛�").append(DateUtil.formatToTightYYYYMMDDhhmmss(new Date())); sb.append("
    ") - sb.append("检出小区个数"); + sb.append("妫�鍑哄皬鍖轰釜鏁�"); sb.append("") - sb.append("覆盖率"); + sb.append("瑕嗙洊鐜�"); sb.append("") - sb.append("检出小区个数"); + sb.append("妫�鍑哄皬鍖轰釜鏁�"); sb.append("") - sb.append("覆盖率"); + sb.append("瑕嗙洊鐜�"); sb.append("
    ") sb.append("") - sb.append("") - sb.append("") - sb.append("") - sb.append("") + sb.append("") + sb.append("") + sb.append("") + sb.append("") sb.append("") seedsList.each{ map -> sb.append(""); @@ -1081,7 +1081,7 @@ class AutoAddSeedsBatch extends BaseBatch{ sb.append("
    网站新增种子数修改种子数类型缃戠珯鏂板绉嶅瓙鏁�淇敼绉嶅瓙鏁�绫诲瀷
    "); for(def email:EMAILS){ - jms.sendMail(email,"自动添加城市种子",sb.toString()); + jms.sendMail(email,"鑷姩娣诲姞鍩庡競绉嶅瓙",sb.toString()); } } @@ -1100,15 +1100,15 @@ class AutoAddSeedsBatch extends BaseBatch{ if(lastUrl){ urlMaps.put(city, lastUrl); }else{ - println city + "内容为空......" + println city + "鍐呭涓虹┖......" } }else{ - println city + "不存在......" + println city + "涓嶅瓨鍦�......" } } - saveUrls("大众点评",urlMaps, charset, jobId, false,"商家"); + saveUrls("澶т紬鐐硅瘎",urlMaps, charset, jobId, false,"鍟嗗"); } @@ -1116,7 +1116,7 @@ class AutoAddSeedsBatch extends BaseBatch{ def s = InvokeHttpRequest.get(url , charset, refer_url); Document document = Jsoup.parse(s); - Elements elements = JQueryUtils.select([".primary-category:contains(美食) .item"], document) + Elements elements = JQueryUtils.select([".primary-category:contains(缇庨) .item"], document) def ret = [:]; def lastUrl = ""; for (Element element : elements) { @@ -1134,7 +1134,7 @@ class AutoAddSeedsBatch extends BaseBatch{ if(s){ Document document = Jsoup.parse(s); - Elements elements = JQueryUtils.select([".def:contains(不限)"], document) + Elements elements = JQueryUtils.select([".def:contains(涓嶉檺)"], document) def lastUrl = ""; for (Element element : elements) { lastUrl = "http://www.dianping.com"+element.attr("href") diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/CrawlCommandConsumerBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/CrawlCommandConsumerBatch.groovy index 08c63b9ff..35d9612c3 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/CrawlCommandConsumerBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/CrawlCommandConsumerBatch.groovy @@ -40,7 +40,7 @@ class CrawlCommandConsumerBatch extends BaseBatch { @Override void process(Object args) { while(true) { - //获取待处理的指令 + //鑾峰彇寰呭鐞嗙殑鎸囦护 DBCursor cur = COMMAND_COLL.find(new BasicDBObject('status', CommandStatus.INIT)).sort(new BasicDBObject('c_date', 1)).limit(1000) if (cur.count() <= 0) { sleep(60 * 1000) @@ -54,7 +54,7 @@ class CrawlCommandConsumerBatch extends BaseBatch { String cat = dbo.get('category') println "city:" + city + ",keyword:" + keyword + "\t" + DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) int affectJobCount = addTemplateToSpiders(dbo.get('_id').toString(), city, keyword, cat, dbo.get('jobs')) - //更新指令为已处理 + //鏇存柊鎸囦护涓哄凡澶勭悊 COMMAND_COLL.update(new BasicDBObject('_id', dbo.get('_id')), new BasicDBObject('$set', new BasicDBObject('status', CommandStatus.PROCESSED)), false, true) } } @@ -62,7 +62,7 @@ class CrawlCommandConsumerBatch extends BaseBatch { /** - * 执行抓取模板 + * 鎵ц鎶撳彇妯℃澘 * @param city * @param districtName * @return @@ -130,7 +130,7 @@ class CrawlCommandConsumerBatch extends BaseBatch { if(StringUtils.isNotBlank(res)){ JSONObject obj =JSONObject.fromObject(res); int status = obj.getInt("status") - if(status == 100 || status == 200){//100-正在运行 200-启动成功 + if(status == 100 || status == 200){//100-姝e湪杩愯 200-鍚姩鎴愬姛 return true; } } @@ -142,11 +142,11 @@ class CrawlCommandConsumerBatch extends BaseBatch { } /** - * 向抓取系统添加抓取任务 - * @param jobId 任务号 - * @param vars 变量 - * @param conditions 查询条件 - * @return 200:成功 100:任务已停止 >400任务号错误或不存在 -1:其他错误 + * 鍚戞姄鍙栫郴缁熸坊鍔犳姄鍙栦换鍔� + * @param jobId 浠诲姟鍙� + * @param vars 鍙橀噺 + * @param conditions 鏌ヨ鏉′欢 + * @return 200:鎴愬姛 100:浠诲姟宸插仠姝� >400浠诲姟鍙烽敊璇垨涓嶅瓨鍦� -1:鍏朵粬閿欒 */ protected JSONObject addTemplateJobUrl(String jobId, String vars, String conditions) { def result = ATTEMIS_HTTP.invoke("/api/addTemplateJobUrl", [jobId : jobId, vars: vars, conditions:conditions], 'UTF-8') diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/CrawlCommandGeneratorBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/CrawlCommandGeneratorBatch.groovy index 5a16a58fe..ceb0c4fa2 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/CrawlCommandGeneratorBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/CrawlCommandGeneratorBatch.groovy @@ -104,7 +104,7 @@ class CrawlCommandGeneratorBatch extends BaseBatch { q.put('cat', 'district') q.put('city', city) q.put('visible', 0) - //value_type=3 第三方 + //value_type=3 绗笁鏂� q.put('value_type', 3) DSCursor cur = SEAWEED.find(q, fields).batchSize(2000) Iterator iter = cur.iterator() diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/CrawlCommandGeneratorBatchRent.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/CrawlCommandGeneratorBatchRent.groovy index 969656ebc..6f9b3b86c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/CrawlCommandGeneratorBatchRent.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/CrawlCommandGeneratorBatchRent.groovy @@ -69,7 +69,7 @@ class CrawlCommandGeneratorBatchRent extends BaseBatch { q.put('cat', 'district') q.put('city', city) q.put('visible', 0) - //value_type=3 第三方 + //value_type=3 绗笁鏂� q.put('value_type', 3) DSCursor cur = SEAWEED.find(q, fields).batchSize(2000) Iterator iter = cur.iterator() diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/CrawlCommandMonitorBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/CrawlCommandMonitorBatch.groovy index 0fcacdce2..08ef2a2e4 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/CrawlCommandMonitorBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/CrawlCommandMonitorBatch.groovy @@ -24,15 +24,15 @@ class CrawlCommandMonitorBatch extends BaseBatch { class MonitorStatus { public static final int INIT = 0; - public static final int DOING = 1; //该任务正在进行 - public static final int DONE = 2; //处理成功 - public static final int FAIL = 3; //处理失败 - public static final int ERR_500 = 500;//无法追踪结果 - public static final int ERR_501 = 501;//API请求错误 - public static final int ERR_502 = 502;//模板设置错误 - public static final int ERR_503 = 503;//添加模板错误 - public static final int ERR_504 = 504;//程序异常 - public static final int ERR_505 = 505;//抓取或处理错误 + public static final int DOING = 1; //璇ヤ换鍔℃鍦ㄨ繘琛� + public static final int DONE = 2; //澶勭悊鎴愬姛 + public static final int FAIL = 3; //澶勭悊澶辫触 + public static final int ERR_500 = 500;//鏃犳硶杩借釜缁撴灉 + public static final int ERR_501 = 501;//API璇锋眰閿欒 + public static final int ERR_502 = 502;//妯℃澘璁剧疆閿欒 + public static final int ERR_503 = 503;//娣诲姞妯℃澘閿欒 + public static final int ERR_504 = 504;//绋嬪簭寮傚父 + public static final int ERR_505 = 505;//鎶撳彇鎴栧鐞嗛敊璇� } public static void main(String[] args) { @@ -69,9 +69,9 @@ class CrawlCommandMonitorBatch extends BaseBatch { // int commandSize = 1000; // while(true) { -// //获取已经监测过,但是没有完成监测的指令 +// //鑾峰彇宸茬粡鐩戞祴杩囷紝浣嗘槸娌℃湁瀹屾垚鐩戞祴鐨勬寚浠� // List commandsList1 = COMMAND_COLL.find(new BasicDBObject('status', CrawlCommandConsumerBatch.CommandStatus.UNFINISH)).sort(new BasicDBObject('c_date', 1)).limit(300).toArray() -// //获取已经处理过,但是没有监测过的指令 +// //鑾峰彇宸茬粡澶勭悊杩囷紝浣嗘槸娌℃湁鐩戞祴杩囩殑鎸囦护 // List commandsList2 = COMMAND_COLL.find(new BasicDBObject('status', CrawlCommandConsumerBatch.CommandStatus.PROCESSED)).sort(new BasicDBObject('c_date', 1)).limit(commandSize - commandsList1.size()).toArray() // // List commandsList = new ArrayList(); @@ -92,7 +92,7 @@ class CrawlCommandMonitorBatch extends BaseBatch { // unfinished++ // } // -// //如果很多没有完成,那么可以退出,等一会再监测 +// //濡傛灉寰堝娌℃湁瀹屾垚锛岄偅涔堝彲浠ラ��鍑猴紝绛変竴浼氬啀鐩戞祴 // if(unfinished > 200) { // sleep(60 * 1000) // break; @@ -124,7 +124,7 @@ class CrawlCommandMonitorBatch extends BaseBatch { for (DBObject monitor : monitorsList) { try { int status = applyMonitor(monitor) - //如果这个是monitor中还有一个正在进行的,那么需要标记command为未完成 + //濡傛灉杩欎釜鏄痬onitor涓繕鏈変竴涓鍦ㄨ繘琛岀殑锛岄偅涔堥渶瑕佹爣璁癱ommand涓烘湭瀹屾垚 if(status == MonitorStatus.DOING) { isDone = false } @@ -149,36 +149,36 @@ class CrawlCommandMonitorBatch extends BaseBatch { String charset = monitorEntity.get('charset') JSONObject res = getUrlRoads(jobId, sessionId, requestUrl) - if(res == null) {//请求的API错误,报程序错误 + if(res == null) {//璇锋眰鐨凙PI閿欒锛屾姤绋嬪簭閿欒 MONITOR_COLL.update(new BasicDBObject("_id", monitorEntity.get('_id')), new BasicDBObject('$set', new BasicDBObject('status', MonitorStatus.ERR_501)), false, true) return MonitorStatus.ERR_501; } - if(res.getInt("status") != 200) { //设置该指令的模板异常 + if(res.getInt("status") != 200) { //璁剧疆璇ユ寚浠ょ殑妯℃澘寮傚父 MONITOR_COLL.update(new BasicDBObject("_id", monitorEntity.get('_id')), new BasicDBObject('$set', new BasicDBObject('status', MonitorStatus.ERR_502)), false, true) return MonitorStatus.ERR_502; } - if(res.getJSONObject("detail") == null) {//请求的API结果错误,报程序错误 + if(res.getJSONObject("detail") == null) {//璇锋眰鐨凙PI缁撴灉閿欒锛屾姤绋嬪簭閿欒 MONITOR_COLL.update(new BasicDBObject("_id", monitorEntity.get('_id')), new BasicDBObject('$set', new BasicDBObject('status', MonitorStatus.ERR_501)), false, true) return MonitorStatus.ERR_501; } JSONObject detailObject = res.getJSONObject("detail") JSONArray roads = detailObject.getJSONArray('roads') - if(roads == null || roads.size() <= 0) {//url_road中没有数据,说明这条数据已经无法监测 + if(roads == null || roads.size() <= 0) {//url_road涓病鏈夋暟鎹紝璇存槑杩欐潯鏁版嵁宸茬粡鏃犳硶鐩戞祴 MONITOR_COLL.update(new BasicDBObject("_id", monitorEntity.get('_id')), new BasicDBObject('$set', new BasicDBObject('status', MonitorStatus.ERR_500)), false, true) return MonitorStatus.ERR_500; } String stat = detailObject.getString('stat') String jobStat = detailObject.getString('jobStat'); - if(stat == null || jobStat == null) {//API的返回结果中是定义了stat字段,如果没有,报程序错误 + if(stat == null || jobStat == null) {//API鐨勮繑鍥炵粨鏋滀腑鏄畾涔変簡stat瀛楁锛屽鏋滄病鏈夛紝鎶ョ▼搴忛敊璇� MONITOR_COLL.update(new BasicDBObject("_id", monitorEntity.get('_id')), new BasicDBObject('$set', new BasicDBObject('status', MonitorStatus.ERR_501)), false, true) return MonitorStatus.ERR_501; } - if("CRAWLING".equalsIgnoreCase(stat) && ("RUNNING".equalsIgnoreCase(jobStat) || "SUSPEND".equalsIgnoreCase(jobStat))) {//这条指令系统已经在处理,但是还没有处理完成,所以标记这条记录为正在进行 + if("CRAWLING".equalsIgnoreCase(stat) && ("RUNNING".equalsIgnoreCase(jobStat) || "SUSPEND".equalsIgnoreCase(jobStat))) {//杩欐潯鎸囦护绯荤粺宸茬粡鍦ㄥ鐞嗭紝浣嗘槸杩樻病鏈夊鐞嗗畬鎴愶紝鎵�浠ユ爣璁拌繖鏉¤褰曚负姝e湪杩涜 MONITOR_COLL.update(new BasicDBObject("_id", monitorEntity.get('_id')), new BasicDBObject('$set', new BasicDBObject('status', MonitorStatus.DOING)), false, true) return MonitorStatus.DOING; } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/FewerHouseDistrictCrawlCommandBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/FewerHouseDistrictCrawlCommandBatch.groovy index 34d890e67..daabd96a8 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/FewerHouseDistrictCrawlCommandBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/FewerHouseDistrictCrawlCommandBatch.groovy @@ -17,7 +17,7 @@ import com.mongodb.DBObject import org.apache.commons.lang.StringUtils /** - * 功能说明:较少房源小区房源抓取任务生成脚本 + * 鍔熻兘璇存槑:杈冨皯鎴挎簮灏忓尯鎴挎簮鎶撳彇浠诲姟鐢熸垚鑴氭湰 */ @BatchOwner(Watcher.WangWenYan) class FewerHouseDistrictCrawlCommandBatch extends BaseBatch { @@ -33,8 +33,8 @@ class FewerHouseDistrictCrawlCommandBatch extends BaseBatch { void process(Object args) { Date weekend = DateUtil.getFirstDayOfWeek(new Date()); - ARTEMIS_COLL.remove(new BasicDBObject("user_name", "机器")) -// def citys = ["无锡", "合肥", "上海"]; + ARTEMIS_COLL.remove(new BasicDBObject("user_name", "鏈哄櫒")) +// def citys = ["鏃犻敗", "鍚堣偉", "涓婃捣"]; CommonUtils.findAllCity().each { def city -> // citys.each { def city -> def query = new BasicDBObject(); @@ -73,7 +73,7 @@ class FewerHouseDistrictCrawlCommandBatch extends BaseBatch { // cmd.append("city", city) // cmd.append("name", district.name) // cmd.append("status", 0) -// cmd.append("user_name", "机器") +// cmd.append("user_name", "鏈哄櫒") // cmd.append("category", "sell") // cmd.append("region", district.region) // ARTEMIS_COLL.save(cmd) @@ -85,7 +85,7 @@ class FewerHouseDistrictCrawlCommandBatch extends BaseBatch { // cmd.append("city", city) // cmd.append("name", district.name) // cmd.append("status", 0) -// cmd.append("user_name", "机器") +// cmd.append("user_name", "鏈哄櫒") // cmd.append("category", "rent") // cmd.append("region", district.region) // ARTEMIS_COLL.save(cmd) @@ -104,7 +104,7 @@ class FewerHouseDistrictCrawlCommandBatch extends BaseBatch { cmd.append("city", city) cmd.append("name", district.name) cmd.append("status", 0) - cmd.append("user_name", "机器") + cmd.append("user_name", "鏈哄櫒") cmd.append("category", "rent") cmd.append("region", district.region) ARTEMIS_COLL.save(cmd) @@ -120,7 +120,7 @@ class FewerHouseDistrictCrawlCommandBatch extends BaseBatch { cmd.append("city", city) cmd.append("name", name) cmd.append("status", 0) - cmd.append("user_name", "机器") + cmd.append("user_name", "鏈哄櫒") cmd.append("category", "sell") cmd.append("region", region) ARTEMIS_COLL.save(cmd) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/JQueryUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/JQueryUtils.groovy index 85cb00a89..322973cae 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/JQueryUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/JQueryUtils.groovy @@ -67,7 +67,7 @@ public class JQueryUtils { try { if (repeatTimes > 0) { Thread.sleep(1000); - println "准备尝试第" + (repeatTimes + 1) + "次请求:$url"; + println "鍑嗗灏濊瘯绗�" + (repeatTimes + 1) + "娆¤姹�:$url"; } doc = Jsoup.parse(new URL(url), 5 * 1000); if (doc != null) { @@ -79,7 +79,7 @@ public class JQueryUtils { } if (doc == null) { - println "检测到不可访问链接:$url"; + println "妫�娴嬪埌涓嶅彲璁块棶閾炬帴:$url"; } return doc; } @@ -91,7 +91,7 @@ public class JQueryUtils { try { if (repeatTimes > 0) { Thread.sleep(1000); - println "准备尝试第" + (repeatTimes + 1) + "次请求:$url"; + println "鍑嗗灏濊瘯绗�" + (repeatTimes + 1) + "娆¤姹�:$url"; } URL _url = new URL(url) input = _url.openStream(); @@ -109,7 +109,7 @@ public class JQueryUtils { } if (doc == null) { - println "检测到不可访问链接:$url"; + println "妫�娴嬪埌涓嶅彲璁块棶閾炬帴:$url"; } return doc; } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/LandIndexCrawl.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/LandIndexCrawl.groovy index 47355315f..fc181896d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/LandIndexCrawl.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/LandIndexCrawl.groovy @@ -11,7 +11,7 @@ import com.mongodb.DBCollection; import com.mongodb.DBObject import com.fangjia.script.util.MongoUtils /** - * 地价指数抓取 + * 鍦颁环鎸囨暟鎶撳彇 * @author gaojuan * */ @@ -26,10 +26,10 @@ class LandIndexCrawl { def run(){ def url = "http://182.50.1.185/L_LandPriceMonitor.aspx?Menu_ID=5&PID=1&ColumnID=0"; - //获取城市编码 + //鑾峰彇鍩庡競缂栫爜 def cityCodeMap = getCityCode(url); - //获取指数 + //鑾峰彇鎸囨暟 def cityIndexMap = getCityPriceIndex(cityCodeMap); saveLandPriceIndex(cityIndexMap); @@ -40,8 +40,8 @@ class LandIndexCrawl { def cityIndexMap = [:]; cityCodeMap.each {city, code-> - if(city == "佛山顺德"){ - city == "顺德"; + if(city == "浣涘北椤哄痉"){ + city == "椤哄痉"; } def yearIndexMap = cityIndexMap.get(city); if(!yearIndexMap){ @@ -150,7 +150,7 @@ class LandIndexCrawl { COLL.save(data); } - println city +" 保存完成......" + println city +" 淇濆瓨瀹屾垚......" } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/ManagementCompanyCrawler.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/ManagementCompanyCrawler.groovy index db56da505..e3755d953 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/ManagementCompanyCrawler.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/ManagementCompanyCrawler.groovy @@ -45,17 +45,17 @@ public class ManagementCompanyCrawler { String openContent = invoke.get(windowUrl, "GBK") // FileUtils.writeStringToFile(new File("d:/todel-1234.html"), openContent, "GBK") - String name = getText(".listtable tr:contains(企业名称) td:eq(1)", openContent) - String address = getText(".listtable tr:contains(注册地址) td:eq(1)", openContent) - String number = getText(".listtable tr:contains(证书编号) td:eq(3)", openContent) + String name = getText(".listtable tr:contains(浼佷笟鍚嶇О) td:eq(1)", openContent) + String address = getText(".listtable tr:contains(娉ㄥ唽鍦板潃) td:eq(1)", openContent) + String number = getText(".listtable tr:contains(璇佷功缂栧彿) td:eq(3)", openContent) - String level = getText(".listtable tr:contains(资质等级) td:eq(1)", openContent) - String publishDate = getText(".listtable tr:contains(发证日期) td:eq(3)", openContent) + String level = getText(".listtable tr:contains(璧勮川绛夌骇) td:eq(1)", openContent) + String publishDate = getText(".listtable tr:contains(鍙戣瘉鏃ユ湡) td:eq(3)", openContent) - String lawyer = getText(".listtable tr:contains(法人代表) td:eq(1)", openContent) - String postCode = getText(".listtable tr:contains(邮政编码) td:eq(3)", openContent) + String lawyer = getText(".listtable tr:contains(娉曚汉浠h〃) td:eq(1)", openContent) + String postCode = getText(".listtable tr:contains(閭斂缂栫爜) td:eq(3)", openContent) - String districts = getText("table.3tdoutline:contains(序号)", openContent) + String districts = getText("table.3tdoutline:contains(搴忓彿)", openContent) if(name && !isExists(name)) { DBObject dbo = new BasicDBObject() dbo.put('name', name) @@ -85,7 +85,7 @@ public class ManagementCompanyCrawler { def projects = [] if(districts) { - String str = StringUtils.substringAfter(districts, "序号 项目名称").trim() + String str = StringUtils.substringAfter(districts, "搴忓彿 椤圭洰鍚嶇О").trim() String[] arrays = str.split(' ') for(int j=0;j= 400) { job.put("enable", false) - println "jobId:" + jobId + " 任务错误,已放弃该任务" + println "jobId:" + jobId + " 浠诲姟閿欒锛屽凡鏀惧純璇ヤ换鍔�" } if(status == 200) { @@ -155,8 +155,8 @@ class RentDataSighterBatch extends BaseBatch { } /** - * 获取抓取任务的状态 - * 1-运行中 2-完成或停止 3-暂停 + * 鑾峰彇鎶撳彇浠诲姟鐨勭姸鎬� + * 1-杩愯涓� 2-瀹屾垚鎴栧仠姝� 3-鏆傚仠 * @param jobId * @return */ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/SchoolLocation.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/SchoolLocation.groovy index 534a844e7..615b1eb34 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/SchoolLocation.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/SchoolLocation.groovy @@ -20,7 +20,7 @@ class SchoolLocation { def run(){ def query = new BasicDBObject() - query.put("province","江苏") + query.put("province","姹熻嫃") //query.put("lat",null) query.put("lat",new BasicDBObject('$exists',false)) def cursor = school_parse_coll.find(query) @@ -31,11 +31,11 @@ class SchoolLocation { if(datas){ for(def ret : datas){ def addr = d.address - if(d.address.contains(d.city+"市")){ - def cityStr = d.city+"市" + if(d.address.contains(d.city+"甯�")){ + def cityStr = d.city+"甯�" addr = d.address.substring(d.address.indexOf(cityStr)+cityStr.size()) } - if(ret.name == d.name || (d.address.contains("号") && (ret.address.contains(addr) || addr.contains(ret.address)))){ + if(ret.name == d.name || (d.address.contains("鍙�") && (ret.address.contains(addr) || addr.contains(ret.address)))){ def udata = new BasicDBObject() udata.put("lat", ret.lat.toString().toDouble()) udata.put("lng", ret.lng.toString().toDouble()) @@ -53,8 +53,8 @@ class SchoolLocation { if(StringUtils.isEmpty(city) || StringUtils.isEmpty(address)){ return null; } - address = address.trim().replace(" ","").replace("?","").replace(" ","") - String url = "https://restapi.amap.com/v3/place/text?keywords=" + address + "&types=学校&city=" + city + "&output=json&offset=5&page=1&key=4e9592208336433ee1b7aa4d1d434418&extensions=all" + address = address.trim().replace(" ","").replace("?","").replace("銆�","") + String url = "https://restapi.amap.com/v3/place/text?keywords=" + address + "&types=瀛︽牎&city=" + city + "&output=json&offset=5&page=1&key=4e9592208336433ee1b7aa4d1d434418&extensions=all" List poiList = null; com.alibaba.fastjson.JSONObject result = null; @@ -134,19 +134,19 @@ class SchoolLocation { jo.put("lng", arrs[0]) } - if(type && type.contains("出入口")){ - println "X 高德地图:【"+jo_item.getString("cityname")+"-"+jo_item.getString("adname")+"-"+jo_item.getString("name")+"-"+jo_item.getString("address")+"】" +" 搜索:【"+city+"-"+name+"-"+address+"】-${type}" + if(type && type.contains("鍑哄叆鍙�")){ + println "X 楂樺痉鍦板浘锛氥��"+jo_item.getString("cityname")+"-"+jo_item.getString("adname")+"-"+jo_item.getString("name")+"-"+jo_item.getString("address")+"銆�" +" 鎼滅储锛氥��"+city+"-"+name+"-"+address+"銆�-${type}" }else{ - println "√高德地图:【"+jo_item.getString("cityname")+"-"+jo_item.getString("adname")+"-"+jo_item.getString("name")+"-"+jo_item.getString("address")+"】" +" 搜索:【"+city+"-"+name+"-"+address+"】" + println "鈭氶珮寰峰湴鍥撅細銆�"+jo_item.getString("cityname")+"-"+jo_item.getString("adname")+"-"+jo_item.getString("name")+"-"+jo_item.getString("address")+"銆�" +" 鎼滅储锛氥��"+city+"-"+name+"-"+address+"銆�" poiList.add(jo); } }else{ - println "X 高德地图:【"+jo_item.getString("cityname")+"-"+jo_item.getString("adname")+"-"+jo_item.getString("name")+"-"+jo_item.getString("address")+"】" +" 搜索:【"+city+"-"+address+"】" + println "X 楂樺痉鍦板浘锛氥��"+jo_item.getString("cityname")+"-"+jo_item.getString("adname")+"-"+jo_item.getString("name")+"-"+jo_item.getString("address")+"銆�" +" 鎼滅储锛氥��"+city+"-"+address+"銆�" } } }else{ - println "X 高德地图 ( "+city+"-"+address+" )无结果!" + println "X 楂樺痉鍦板浘 ( "+city+"-"+address+" )鏃犵粨鏋滐紒" } } } catch (Exception e) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/SellDataSighterBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/SellDataSighterBatch.groovy index 6ad1913b7..c4a7d9aff 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/SellDataSighterBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/SellDataSighterBatch.groovy @@ -29,29 +29,29 @@ class SellDataSighterBatch extends BaseBatch { private static final DBCollection ARTEMIS_COLL = MongoUtils.getCollectionByName("fangjia_log", "artemis_message", "mongo.db.fangjia.com") public static final def JOBS = [ - [jobId : '559f237de4b0e6f33e2bbb68',isEncodingUrl:true, encoding:'GBK', enable:true],//搜房 - [jobId : '559f277ee4b0133c041de396',isEncodingUrl:true, encoding:'UTF-8', enable:true],//58同城 - [jobId : '559f288ee4b0133c041de3b3',isEncodingUrl:true, encoding:'UTF-8', enable:true],//赶集网 - [jobId : '559f2a7be4b0133c041de3d6',isEncodingUrl:true, encoding:'UTF-8', enable:true],//安居客 - [jobId : '559f2dc6e4b0133c041de42a',isEncodingUrl:true, encoding:'UTF-8', enable:true],//搜狐焦点 -// [jobId : '559f2ea3e4b0133c041de455',isEncodingUrl:true, encoding:'GBK', enable:false],//淘房屋 - [jobId : '559f2bd1e4b0133c041de3f8',isEncodingUrl:true, encoding:'UTF-8', enable:true],//酷房网 - [jobId : '559f309ce4b0133c041dea84',isEncodingUrl:true, encoding:'UTF-8', enable:true],//链家在线 - [jobId : '559f31c8e4b0133c041df42a',isEncodingUrl:true, encoding:'GBK', enable:true],//新浪乐居 - [jobId : '559f32bbe4b0133c041dfaf7',isEncodingUrl:true, encoding:'UTF-8', enable:true],//吉屋网 - [jobId : '559f3918e4b0133c041e1521',isEncodingUrl:true, encoding:'UTF-8', enable:true],//我爱我家 - [jobId : '559f3a7de4b0133c041e1c41',isEncodingUrl:true, encoding:'UTF-8', enable:true],//楼盘网 - [jobId : '559f3d91e4b0133c041e27ae',isEncodingUrl:true, encoding:'UTF-8', enable:true],//带看网 - [jobId : '559f3e6ce4b0133c041e29f4',isEncodingUrl:true, encoding:'UTF-8', enable:true],//百姓网 - [jobId : '559f3f61e4b0133c041e2cce',isEncodingUrl:true, encoding:'UTF-8', enable:true],//城市房产网 - [jobId : '59c37efce4b006dfb6424568',isEncodingUrl:true, encoding:'UTF-8', enable:true],//诸葛找房网房源抓取 - [jobId : '559f401ee4b0133c041e2ff3',isEncodingUrl:true, encoding:'UTF-8', enable:true],//中原地产 - [jobId : '559f40c9e4b0133c041e3316',isEncodingUrl:true, encoding:'UTF-8', enable:true],//365地产家居网 - [jobId : '559f41cee4b0133c041e372c',isEncodingUrl:true, encoding:'GBK', enable:true],//房掌柜 -// [jobId : '559f54aae4b0133c041e7f1b',isEncodingUrl:true, encoding:'UTF-8', enable:true],//中原地产 深圳 - [jobId : '559f55fae4b0133c041e8684',isEncodingUrl:true, encoding:'UTF-8', enable:true],//房王 - [jobId : '559f5a82e4b0133c041e95a6',isEncodingUrl:true, encoding:'GBK', enable:true],//猎房网 全站 二手房 搜索 - [jobId : '559f7d50e4b0133c041efcf8',isEncodingUrl:true, encoding:'GBK', enable:true],// 今题网 全站 二手房 搜索 + [jobId : '559f237de4b0e6f33e2bbb68',isEncodingUrl:true, encoding:'GBK', enable:true],//鎼滄埧 + [jobId : '559f277ee4b0133c041de396',isEncodingUrl:true, encoding:'UTF-8', enable:true],//58鍚屽煄 + [jobId : '559f288ee4b0133c041de3b3',isEncodingUrl:true, encoding:'UTF-8', enable:true],//璧堕泦缃� + [jobId : '559f2a7be4b0133c041de3d6',isEncodingUrl:true, encoding:'UTF-8', enable:true],//瀹夊眳瀹� + [jobId : '559f2dc6e4b0133c041de42a',isEncodingUrl:true, encoding:'UTF-8', enable:true],//鎼滅嫄鐒︾偣 +// [jobId : '559f2ea3e4b0133c041de455',isEncodingUrl:true, encoding:'GBK', enable:false],//娣樻埧灞� + [jobId : '559f2bd1e4b0133c041de3f8',isEncodingUrl:true, encoding:'UTF-8', enable:true],//閰锋埧缃� + [jobId : '559f309ce4b0133c041dea84',isEncodingUrl:true, encoding:'UTF-8', enable:true],//閾惧鍦ㄧ嚎 + [jobId : '559f31c8e4b0133c041df42a',isEncodingUrl:true, encoding:'GBK', enable:true],//鏂版氮涔愬眳 + [jobId : '559f32bbe4b0133c041dfaf7',isEncodingUrl:true, encoding:'UTF-8', enable:true],//鍚夊眿缃� + [jobId : '559f3918e4b0133c041e1521',isEncodingUrl:true, encoding:'UTF-8', enable:true],//鎴戠埍鎴戝 + [jobId : '559f3a7de4b0133c041e1c41',isEncodingUrl:true, encoding:'UTF-8', enable:true],//妤肩洏缃� + [jobId : '559f3d91e4b0133c041e27ae',isEncodingUrl:true, encoding:'UTF-8', enable:true],//甯︾湅缃� + [jobId : '559f3e6ce4b0133c041e29f4',isEncodingUrl:true, encoding:'UTF-8', enable:true],//鐧惧缃� + [jobId : '559f3f61e4b0133c041e2cce',isEncodingUrl:true, encoding:'UTF-8', enable:true],//鍩庡競鎴夸骇缃� + [jobId : '59c37efce4b006dfb6424568',isEncodingUrl:true, encoding:'UTF-8', enable:true],//璇歌憶鎵炬埧缃戞埧婧愭姄鍙� + [jobId : '559f401ee4b0133c041e2ff3',isEncodingUrl:true, encoding:'UTF-8', enable:true],//涓師鍦颁骇 + [jobId : '559f40c9e4b0133c041e3316',isEncodingUrl:true, encoding:'UTF-8', enable:true],//365鍦颁骇瀹跺眳缃� + [jobId : '559f41cee4b0133c041e372c',isEncodingUrl:true, encoding:'GBK', enable:true],//鎴挎帉鏌� +// [jobId : '559f54aae4b0133c041e7f1b',isEncodingUrl:true, encoding:'UTF-8', enable:true],//涓師鍦颁骇 娣卞湷 + [jobId : '559f55fae4b0133c041e8684',isEncodingUrl:true, encoding:'UTF-8', enable:true],//鎴跨帇 + [jobId : '559f5a82e4b0133c041e95a6',isEncodingUrl:true, encoding:'GBK', enable:true],//鐚庢埧缃� 鍏ㄧ珯 浜屾墜鎴� 鎼滅储 + [jobId : '559f7d50e4b0133c041efcf8',isEncodingUrl:true, encoding:'GBK', enable:true],// 浠婇缃� 鍏ㄧ珯 浜屾墜鎴� 鎼滅储 ] @@ -121,19 +121,19 @@ class SellDataSighterBatch extends BaseBatch { } String conditions = "city:${city}" int status = addTemplateJobUrl(jobId, vars, conditions) - if(status == 100) {//任务已停止 - if(startArtemisJob(jobId)) {//启动任务,再次尝试加入 + if(status == 100) {//浠诲姟宸插仠姝� + if(startArtemisJob(jobId)) {//鍚姩浠诲姟锛屽啀娆″皾璇曞姞鍏� status = addTemplateJobUrl(jobId, vars, conditions) }else { job.put("enable", false) - println "jobId:" + jobId + " 无法启动,已放弃该任务" + println "jobId:" + jobId + " 鏃犳硶鍚姩锛屽凡鏀惧純璇ヤ换鍔�" } }else if(status == 404) { job.put("enable", false) - println "jobId:" + jobId + " 与指定城市不匹配" + println "jobId:" + jobId + " 涓庢寚瀹氬煄甯備笉鍖归厤" }else if(status >= 400) { job.put("enable", false) - println "jobId:" + jobId + " 任务错误,已放弃该任务" + println "jobId:" + jobId + " 浠诲姟閿欒锛屽凡鏀惧純璇ヤ换鍔�" } if(status == 200) { @@ -146,8 +146,8 @@ class SellDataSighterBatch extends BaseBatch { } /** - * 获取抓取任务的状态 - * 1-运行中 2-完成或停止 3-暂停 + * 鑾峰彇鎶撳彇浠诲姟鐨勭姸鎬� + * 1-杩愯涓� 2-瀹屾垚鎴栧仠姝� 3-鏆傚仠 * @param jobId * @return */ @@ -167,7 +167,7 @@ class SellDataSighterBatch extends BaseBatch { if(StringUtils.isNotBlank(res)){ JSONObject obj =JSONObject.fromObject(res) int status = obj.getInt("status") - if(status == 100 || status == 200){//100-正在运行 200-启动成功 + if(status == 100 || status == 200){//100-姝e湪杩愯 200-鍚姩鎴愬姛 return true } } @@ -179,11 +179,11 @@ class SellDataSighterBatch extends BaseBatch { } /** - * 向抓取系统添加抓取任务 - * @param jobId 任务号 - * @param vars 变量 - * @param conditions 查询条件 - * @return 200:成功 100:任务已停止 >400任务号错误或不存在 -1:其他错误 + * 鍚戞姄鍙栫郴缁熸坊鍔犳姄鍙栦换鍔� + * @param jobId 浠诲姟鍙� + * @param vars 鍙橀噺 + * @param conditions 鏌ヨ鏉′欢 + * @return 200:鎴愬姛 100:浠诲姟宸插仠姝� >400浠诲姟鍙烽敊璇垨涓嶅瓨鍦� -1:鍏朵粬閿欒 */ protected int addTemplateJobUrl(String jobId, String vars, String conditions) { def result = ATTEMIS_HTTP.invoke("/api/addTemplateJobUrl", [jobId : jobId, vars: vars, conditions:conditions], 'UTF-8') diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/SendSpecifySpider.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/SendSpecifySpider.groovy index 63641151f..425d790f1 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/SendSpecifySpider.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/SendSpecifySpider.groovy @@ -31,7 +31,7 @@ import org.bson.types.ObjectId DBCollection ARTEMIS_COLL = MongoUtils.getCollectionByName("fangjia_log", "artemis_message", "mongo.db.fangjia.com") -String filePath = "D:\\work\\artemis\\daily\\1128\\华润万家测试城市列表 11.27.xlsx"; +String filePath = "D:\\work\\artemis\\daily\\1128\\鍗庢鼎涓囧娴嬭瘯鍩庡競鍒楄〃 11.27.xlsx"; List> list = ExcelUtils.read(filePath) def sum = 0; RentDataSighterBatch rentDataSighterBatch = new RentDataSighterBatch(); @@ -49,7 +49,7 @@ for(List row in list) { cmd.append("city", city) cmd.append("name", district.name) cmd.append("status", 0) - cmd.append("user_name", "机器") + cmd.append("user_name", "鏈哄櫒") cmd.append("category", "rent") cmd.append("region", district.region) ARTEMIS_COLL.save(cmd) @@ -65,7 +65,7 @@ DBCollection SEAWATER_206_2017 = MongoUtils.getCollectionByName("fangjia", "seaw DBCollection SEAWATER_206_2018 = MongoUtils.getCollectionByName("fangjia", "seawater-2018", "192.168.0.206"); DBObject query_seawater = new BasicDBObject(); -query_seawater.put("city", "杭州"); +query_seawater.put("city", "鏉窞"); query_seawater.put("cat", "rent"); DBCursor cursor_seawater = SEAWATER_206_2018.find(query_seawater); println cursor_seawater.size(); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/daily/20181129.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/daily/20181129.groovy index 6c5b62131..f1c42c209 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/daily/20181129.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/daily/20181129.groovy @@ -22,7 +22,7 @@ import java.util.concurrent.TimeUnit DBCollection col_metadata = MongoUtils.getCollectionByName("artemis", "metadata", "192.168.0.209", 55007); ExecutorService es = Executors.newFixedThreadPool(30); -String filePath = "D:\\work\\artemis\\daily\\1128\\华润万家测试城市列表 11.27_1129.xlsx"; +String filePath = "D:\\work\\artemis\\daily\\1128\\鍗庢鼎涓囧娴嬭瘯鍩庡競鍒楄〃 11.27_1129.xlsx"; List> list = ExcelUtils.read(filePath); List futureList = new ArrayList<>(); for (List row in list) { @@ -45,24 +45,24 @@ return; class CLZ20181129 implements Callable { static DBCollection ARTEMIS_COLL = MongoUtils.getCollectionByName("fangjia_log", "artemis_message", "mongo.db.fangjia.com") static def JOBS = [ - [jobId: '5588f2f7e4b0a7ef70e98edb', isEncodingUrl: true, encoding: 'UTF-8', enable: true],//赶集 - [jobId: '5588ec3be4b0ffa7d5e23dad', isEncodingUrl: true, encoding: 'UTF-8', enable: true],//58同城 - [jobId: '5588fbfce4b0a7ef70e98ef3', isEncodingUrl: true, encoding: 'GBK', enable: true],//搜房 - [jobId: '5589057ee4b0a7ef70e98f48', isEncodingUrl: true, encoding: 'UTF-8', enable: true],//安居客 - [jobId: '55890362e4b0a7ef70e98f36', isEncodingUrl: true, encoding: 'UTF-8', enable: true],//我爱我家 - [jobId: '558925bce4b0a7ef70e9903b', isEncodingUrl: true, encoding: 'UTF-8', enable: true],//百姓网 - [jobId: '563c202ee4b0126639288c3f', isEncodingUrl: true, encoding: 'UTF-8', enable: true],//新浪 - [jobId: '55890a6be4b0a7ef70e98f63', isEncodingUrl: true, encoding: 'UTF-8', enable: true],//今题网 - [jobId: '5589177fe4b0a7ef70e98f9c', isEncodingUrl: true, encoding: 'UTF-8', enable: true],//楼盘网 - [jobId: '55892abbe4b0a7ef70e9904f', isEncodingUrl: true, encoding: 'UTF-8', enable: true],//租房网 + [jobId: '5588f2f7e4b0a7ef70e98edb', isEncodingUrl: true, encoding: 'UTF-8', enable: true],//璧堕泦 + [jobId: '5588ec3be4b0ffa7d5e23dad', isEncodingUrl: true, encoding: 'UTF-8', enable: true],//58鍚屽煄 + [jobId: '5588fbfce4b0a7ef70e98ef3', isEncodingUrl: true, encoding: 'GBK', enable: true],//鎼滄埧 + [jobId: '5589057ee4b0a7ef70e98f48', isEncodingUrl: true, encoding: 'UTF-8', enable: true],//瀹夊眳瀹� + [jobId: '55890362e4b0a7ef70e98f36', isEncodingUrl: true, encoding: 'UTF-8', enable: true],//鎴戠埍鎴戝 + [jobId: '558925bce4b0a7ef70e9903b', isEncodingUrl: true, encoding: 'UTF-8', enable: true],//鐧惧缃� + [jobId: '563c202ee4b0126639288c3f', isEncodingUrl: true, encoding: 'UTF-8', enable: true],//鏂版氮 + [jobId: '55890a6be4b0a7ef70e98f63', isEncodingUrl: true, encoding: 'UTF-8', enable: true],//浠婇缃� + [jobId: '5589177fe4b0a7ef70e98f9c', isEncodingUrl: true, encoding: 'UTF-8', enable: true],//妤肩洏缃� + [jobId: '55892abbe4b0a7ef70e9904f', isEncodingUrl: true, encoding: 'UTF-8', enable: true],//绉熸埧缃� - [jobId: '5bfe2aefe4b02c365dab5d51', isEncodingUrl: true, encoding: 'UTF-8', enable: true],// 链家在线 - [jobId: '5bfe285fe4b02c365dab5d2f', isEncodingUrl: true, encoding: 'UTF-8', enable: true],// 巴乐兔 - [jobId: '5bfe30afe4b02c365dab5d7a', isEncodingUrl: true, encoding: 'UTF-8', enable: true],// c21在线 - [jobId: '5bfe33bde4b02c365dab5db6', isEncodingUrl: true, encoding: 'UTF-8', enable: true],// 诸葛找房 - [jobId: '5bfe3bcde4b02c365dab5fa3', isEncodingUrl: true, encoding: 'UTF-8', enable: true],// 搜房源网 - [jobId: '5bfe3765e4b02c365dab5f05', isEncodingUrl: true, encoding: 'UTF-8', enable: true],// 中国房产超市网 - [jobId: '5bfe3f93e4b02c365dab6261', isEncodingUrl: true, encoding: 'UTF-8', enable: true]// 爱屋吉屋 + [jobId: '5bfe2aefe4b02c365dab5d51', isEncodingUrl: true, encoding: 'UTF-8', enable: true],// 閾惧鍦ㄧ嚎 + [jobId: '5bfe285fe4b02c365dab5d2f', isEncodingUrl: true, encoding: 'UTF-8', enable: true],// 宸翠箰鍏� + [jobId: '5bfe30afe4b02c365dab5d7a', isEncodingUrl: true, encoding: 'UTF-8', enable: true],// c21鍦ㄧ嚎 + [jobId: '5bfe33bde4b02c365dab5db6', isEncodingUrl: true, encoding: 'UTF-8', enable: true],// 璇歌憶鎵炬埧 + [jobId: '5bfe3bcde4b02c365dab5fa3', isEncodingUrl: true, encoding: 'UTF-8', enable: true],// 鎼滄埧婧愮綉 + [jobId: '5bfe3765e4b02c365dab5f05', isEncodingUrl: true, encoding: 'UTF-8', enable: true],// 涓浗鎴夸骇瓒呭競缃� + [jobId: '5bfe3f93e4b02c365dab6261', isEncodingUrl: true, encoding: 'UTF-8', enable: true]// 鐖卞眿鍚夊眿 ] static HttpHelper ATTEMIS_HTTP = new HttpHelper("192.168.0.221"); @@ -96,7 +96,7 @@ class CLZ20181129 implements Callable { cmd.append("city", this.city) cmd.append("name", district.name) cmd.append("status", 0) - cmd.append("user_name", "机器") + cmd.append("user_name", "鏈哄櫒") cmd.append("category", "rent") cmd.append("region", district.region) ARTEMIS_COLL.save(cmd) @@ -116,7 +116,7 @@ class CLZ20181129 implements Callable { println affectJobCount + "/" + JOBS.size() + " " + i + "/" + tasks.size() + " " + city + "-" + districtName + "\t" + DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) String user_name = tasks.get(i).get("user_name"); - if (StringUtils.equalsIgnoreCase("机器", user_name) == false) { + if (StringUtils.equalsIgnoreCase("鏈哄櫒", user_name) == false) { DBObject entity = new BasicDBObject(); entity.put('status', 1); entity.put('m_date', new Date()) @@ -166,19 +166,19 @@ class CLZ20181129 implements Callable { String conditions = "city:${city}"; int status = addTemplateJobUrl(jobId, vars, conditions) - if (status == 100) {//任务已停止 - if (startArtemisJob(jobId)) {//启动任务,再次尝试加入 + if (status == 100) {//浠诲姟宸插仠姝� + if (startArtemisJob(jobId)) {//鍚姩浠诲姟锛屽啀娆″皾璇曞姞鍏� status = addTemplateJobUrl(jobId, vars, conditions) } else { job.put("enable", false) - println "jobId:" + jobId + " 无法启动,已放弃该任务" + println "jobId:" + jobId + " 鏃犳硶鍚姩锛屽凡鏀惧純璇ヤ换鍔�" } } else if (status == 404) { job.put("enable", false) - println "jobId:" + jobId + " 与指定城市不匹配" + println "jobId:" + jobId + " 涓庢寚瀹氬煄甯備笉鍖归厤" } else if (status >= 400) { job.put("enable", false) - println "jobId:" + jobId + " 任务错误,已放弃该任务" + println "jobId:" + jobId + " 浠诲姟閿欒锛屽凡鏀惧純璇ヤ换鍔�" } if (status == 200) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/daily/20190520.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/daily/20190520.groovy index 16546c7de..af7bc6570 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/daily/20190520.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/daily/20190520.groovy @@ -7,19 +7,19 @@ import com.mongodb.DBCollection import com.mongodb.DBObject -String filePath = "D:\\work\\无样本小区\\北京小区租金抓取_20190520.xlsx"; +String filePath = "D:\\work\\鏃犳牱鏈皬鍖篭\鍖椾含灏忓尯绉熼噾鎶撳彇_20190520.xlsx"; List> list = ExcelUtils.read(filePath); DBCollection COMMAND_COLL = MongoUtils.getCollectionByName("fangjia_log", "crawl_command", "log.mongo.db.fangjia.com"); for (List row in list) { try{ - String city = "北京"; + String city = "鍖椾含"; String region = row[0]; String district = row[1]; DBObject entity = new BasicDBObject() entity.put('city', city) entity.put("keyword", array[2]) - entity.put('from', 1)//租房 + entity.put('from', 1)//绉熸埧 entity.put('status', 0) entity.put('c_date', new Date()) COMMAND_COLL.save(entity); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/updateSeekParams.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/updateSeekParams.groovy index 57488fc1d..c73cfc5e6 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/updateSeekParams.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/updateSeekParams.groovy @@ -8,13 +8,13 @@ import com.mongodb.DBObject import com.fangjia.script.util.MongoUtils class updateSeekParams { - //种子表 + //绉嶅瓙琛� public static final DBCollection SEED_COLL = MongoUtils.getCollectionByName("artemis", "seed", "artemis.db.fangjia.com", 27017) public static void main(String[] args){ def task = new updateSeekParams(); - //task.run("54b35441e4b0b4e2823ce4b7","city:宝鸡"); + //task.run("54b35441e4b0b4e2823ce4b7","city:瀹濋浮"); task.updateUrl("59a8be54e4b006dfb6349bab"); - println "更新完成...." + println "鏇存柊瀹屾垚...." } def run(job_id, addParsmString){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawlstore/BabelaCrawlStore.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawlstore/BabelaCrawlStore.groovy index 135b95d12..2cb400a6b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawlstore/BabelaCrawlStore.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawlstore/BabelaCrawlStore.groovy @@ -10,20 +10,20 @@ import org.jsoup.nodes.Element import org.jsoup.select.Elements /** - * 巴贝拉 + * 宸磋礉鎷� * @author johnson * */ class BabelaCrawlStore extends BaseCrawlStore { - static def citys=["上海", "北京","杭州", "宁波", "南京"]; + static def citys=["涓婃捣", "鍖椾含","鏉窞", "瀹佹尝", "鍗椾含"]; static Pattern regExp_coord=Pattern.compile("baidu_map\\(([\\d\\.]+),([\\d\\.]+),"); static void main(args){ BabelaCrawlStore crawl=new BabelaCrawlStore(); crawl.procCitys(); -// crawl.proc("上海", "http://www.saizeriya.com.cn/cn/shopsearch/index_02.asp"); +// crawl.proc("涓婃捣", "http://www.saizeriya.com.cn/cn/shopsearch/index_02.asp"); } def procCitys(){ @@ -48,7 +48,7 @@ class BabelaCrawlStore extends BaseCrawlStore { MerchantInfo info=new MerchantInfo(); info.city=city; - info.kind="巴贝拉"; + info.kind="宸磋礉鎷�"; info.from="official"; Element elTd=els1[0]; @@ -69,7 +69,7 @@ class BabelaCrawlStore extends BaseCrawlStore { saveMerchantInfo(info); println info; } - el=JQueryUtils.select("div.page_nav a:contains(下一页)", res, url).first(); + el=JQueryUtils.select("div.page_nav a:contains(涓嬩竴椤�)", res, url).first(); if(el){ url=el.absUrl("href"); println url; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawlstore/BaseCrawlStore.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawlstore/BaseCrawlStore.groovy index 7332f841c..b58d3fef6 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawlstore/BaseCrawlStore.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawlstore/BaseCrawlStore.groovy @@ -29,7 +29,7 @@ class BaseCrawlStore { def importToOnline(){ DBCollection online_merchantInfoDb=glkdb43.getCollection("baisheng_data"); - merchantInfoDb.find(DataUtil.map2DBObject([kind:"亲子购物"])).each{doc -> + merchantInfoDb.find(DataUtil.map2DBObject([kind:"浜插瓙璐墿"])).each{doc -> def d=[:]; d.name=doc.name; d.city=doc.city; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawlstore/ConsumeInfoCrawlStore.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawlstore/ConsumeInfoCrawlStore.groovy index 0211f4a7b..314026555 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawlstore/ConsumeInfoCrawlStore.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawlstore/ConsumeInfoCrawlStore.groovy @@ -34,7 +34,7 @@ import org.jsoup.select.Elements /** * @author create by wyh on - * @date 2016年1月27日 上午11:29:40 + * @date 2016骞�1鏈�27鏃� 涓婂崍11:29:40 * */ @BatchOwner(Watcher.WangYuHui) @@ -42,7 +42,7 @@ class ConsumeInfoCrawlStore extends BaseBatch { public static String JOB_ID = "5333851ae4b0370f56553bc8" HttpHelper ATTEMIS_HTTP = new HttpHelper("192.168.0.63/artemis-bkoff"); DBCollection metaColl = MongoUtils.getCollectionByName('artemis','metadata','metadata.mongo.db.fangjia.com',55007) - DBCollection collInsert = MongoUtils.getCollectionByName('fangjia', 'business_shop', 'mongo.db.fangjia.com',27017)//线上DB + DBCollection collInsert = MongoUtils.getCollectionByName('fangjia', 'business_shop', 'mongo.db.fangjia.com',27017)//绾夸笂DB MapabcService mapabcSerice = new MapabcService() static main(args) { @@ -58,20 +58,20 @@ class ConsumeInfoCrawlStore extends BaseBatch { updateLatLng(JOB_ID, null) // boolean isStarted = startArtemisJob(JOB_ID) -// if(isStarted) {//启动成功 -// println JOB_ID + "\t抓取任务启动成功\t" + DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) -// //检测任务是否完成 +// if(isStarted) {//鍚姩鎴愬姛 +// println JOB_ID + "\t鎶撳彇浠诲姟鍚姩鎴愬姛\t" + DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) +// //妫�娴嬩换鍔℃槸鍚﹀畬鎴� // boolean isJobDone = artemisJobState(JOB_ID) // if(isJobDone) { // analyticsWebpage(JOB_ID) // } // }else { -// println JOB_ID + "\t启动失败\t" + DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) +// println JOB_ID + "\t鍚姩澶辫触\t" + DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) // } } /** - * 启动抓取任务 + * 鍚姩鎶撳彇浠诲姟 * @param jobId * @return */ @@ -82,7 +82,7 @@ class ConsumeInfoCrawlStore extends BaseBatch { // if(StringUtils.isNotBlank(res)){ // JSONObject obj =JSONObject.fromObject(res); // int status = obj.getInt("status") -// if(status == 100 || status == 200){//100-正在运行 200-启动成功 +// if(status == 100 || status == 200){//100-姝e湪杩愯 200-鍚姩鎴愬姛 // return true; // } // } @@ -94,7 +94,7 @@ class ConsumeInfoCrawlStore extends BaseBatch { // } /** - * 检测抓取任务状态 + * 妫�娴嬫姄鍙栦换鍔$姸鎬� * @param jobId * @return */ @@ -106,12 +106,12 @@ class ConsumeInfoCrawlStore extends BaseBatch { // JSONObject obj =JSONObject.fromObject(res); // int status = obj.getInt("status") // if(status == 200 && obj.getInt('job_status') == 2) { -// println jobId + "\t抓取完成, 数量:"+obj.getInt("crawl_count")+"时间:"+obj.getString("start_date")+ "-" +obj.getString("end_date") + "\t" + DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) +// println jobId + "\t鎶撳彇瀹屾垚, 鏁伴噺:"+obj.getInt("crawl_count")+"鏃堕棿:"+obj.getString("start_date")+ "-" +obj.getString("end_date") + "\t" + DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) // return true; // } // } // -// println jobId + "\t任务未完成\t" + DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) +// println jobId + "\t浠诲姟鏈畬鎴怽t" + DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) // sleep(5 * 60 * 1000); // } // }catch(Exception e) { @@ -122,7 +122,7 @@ class ConsumeInfoCrawlStore extends BaseBatch { // } /** - * 解析网页 + * 瑙f瀽缃戦〉 * @param jobId * @return */ @@ -138,7 +138,7 @@ class ConsumeInfoCrawlStore extends BaseBatch { results.put("url",true) DBCursor iter = metaColl.find(query, results).addOption(Bytes.QUERYOPTION_NOTIMEOUT)//.batchSize(500); int totalCount = iter.count() - println jobCity + "解析网页量:" + totalCount + "\t" + DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) + println jobCity + "瑙f瀽缃戦〉閲�:" + totalCount + "\t" + DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) while(iter.hasNext()) { DBObject dboject = iter.next() String url=dboject.get("url") @@ -168,16 +168,16 @@ class ConsumeInfoCrawlStore extends BaseBatch { Elements eles = JQueryUtils.select(".breadcrumb a", content) String region = RegionData.formatRegion(city, eles.get(1).text()) def eleCount = eles.size()-1; - String type = RegionData.formatRegion(city, eles.get(eleCount).text())//美食类型 + String type = RegionData.formatRegion(city, eles.get(eleCount).text())//缇庨绫诲瀷 - String address = JQueryUtils.selectText(".address span.item", content)//地址1 - String comment_count = JQueryUtils.selectText(".brief-info .item:contains(评论)", content).replace("条评论", "")//评论数量1 - String consumption=JQueryUtils.selectText(".brief-info .item:contains(人均:)",content).replace("人均:","").replace("元", "")//人均消费1 - String product_score=JQueryUtils.selectText(".brief-info .item:contains(口味:)",content).replace("口味:","")//口味1 - String environment_score=JQueryUtils.selectText(".brief-info .item:contains(环境:)",content).replace("环境:","")//环境1 - String service_score=JQueryUtils.selectText(".brief-info .item:contains(服务:)",content).replace("服务:","")//1服务 - String telephone=JQueryUtils.select(".tel span.item", content).text()//1电话 - String name=JQueryUtils.select(".shop-name", content).text().replace(" 添加分店","")//店名1 + String address = JQueryUtils.selectText(".address span.item", content)//鍦板潃1 + String comment_count = JQueryUtils.selectText(".brief-info .item:contains(璇勮)", content).replace("鏉¤瘎璁�", "")//璇勮鏁伴噺1 + String consumption=JQueryUtils.selectText(".brief-info .item:contains(浜哄潎锛�)",content).replace("浜哄潎锛�","").replace("鍏�", "")//浜哄潎娑堣垂1 + String product_score=JQueryUtils.selectText(".brief-info .item:contains(鍙e懗锛�)",content).replace("鍙e懗锛�","")//鍙e懗1 + String environment_score=JQueryUtils.selectText(".brief-info .item:contains(鐜锛�)",content).replace("鐜锛�","")//鐜1 + String service_score=JQueryUtils.selectText(".brief-info .item:contains(鏈嶅姟锛�)",content).replace("鏈嶅姟锛�","")//1鏈嶅姟 + String telephone=JQueryUtils.select(".tel span.item", content).text()//1鐢佃瘽 + String name=JQueryUtils.select(".shop-name", content).text().replace(" 娣诲姞鍒嗗簵","")//搴楀悕1 def startIndex = content.indexOf('

    alias String business_hours try { - if(eles2.get(0).text().contains("别")){ + if(eles2.get(0).text().contains("鍒�")){ alia=eles2.get(0).getElementsByClass("item").text() business_hours=eles2.get(1).getElementsByClass("item").text() }else{ @@ -217,12 +217,12 @@ class ConsumeInfoCrawlStore extends BaseBatch { if(alia!=null){ alias=alia.split(",") } - List in_pics=[]//图片, + List in_pics=[]//鍥剧墖, Elements labels =JQueryUtils.select("#basic-info .J-other p",content) List tags=[] def tag for(def label in labels){ - if(label.text().contains("分类标签")){ + if(label.text().contains("鍒嗙被鏍囩")){ tag = label.select(".item a") break; } @@ -230,11 +230,11 @@ class ConsumeInfoCrawlStore extends BaseBatch { if(tag){ tags << tag.text() } - String business_scope//经营范围-1 - String business_type=JQueryUtils.select(".J-current-category", content).text()//经营类型 美食 购物-1 - String parking_info//停车信息---原表为null - List feature//特点---原表为null - String traffic_info//交通信息---原表为null + String business_scope//缁忚惀鑼冨洿-1 + String business_type=JQueryUtils.select(".J-current-category", content).text()//缁忚惀绫诲瀷 缇庨 璐墿-1 + String parking_info//鍋滆溅淇℃伅---鍘熻〃涓簄ull + List feature//鐗圭偣---鍘熻〃涓簄ull + String traffic_info//浜ら�氫俊鎭�---鍘熻〃涓簄ull if(StringUtils.isBlank(region) || StringUtils.isBlank(name) || StringUtils.isBlank(address)) { @@ -333,7 +333,7 @@ class ConsumeInfoCrawlStore extends BaseBatch { } /** - * 保存到数据库 + * 淇濆瓨鍒版暟鎹簱 * @param obj1 * @return */ @@ -355,7 +355,7 @@ class ConsumeInfoCrawlStore extends BaseBatch { } /** - * 更新经纬度 + * 鏇存柊缁忕含搴� * */ boolean updateLatLng(String jobId, String jobCity){ def i =0 @@ -383,8 +383,8 @@ class ConsumeInfoCrawlStore extends BaseBatch { } def coord=mapabcSerice.parseBaiduCoord(city, name, address) if(coord){ - lng=coord[0]//经度 - lat=coord[1]//纬度 + lng=coord[0]//缁忓害 + lat=coord[1]//绾害 } if(lng <= 0 || lat <= 0) { return null; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawlstore/CostaCrawlStore.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawlstore/CostaCrawlStore.groovy index 41de5606a..2e6b9198e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawlstore/CostaCrawlStore.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawlstore/CostaCrawlStore.groovy @@ -7,7 +7,7 @@ import org.jsoup.nodes.Element import org.jsoup.select.Elements /** - * 萨莉亚 + * 钀ㄨ帀浜� * @author johnson * */ @@ -46,7 +46,7 @@ class CostaCrawlStore extends BaseCrawlStore { info.name= e.select("dt h4").first().text().trim(); Element e2=e.select("dd[class=address]").first(); - info.address=e2.text().replace("地址:", "").trim(); + info.address=e2.text().replace("鍦板潃:", "").trim(); String str=e2.attr("data-address"); String[] strs=str.split(","); if(strs && strs.length==2){ @@ -58,7 +58,7 @@ class CostaCrawlStore extends BaseCrawlStore { info.lat2=coord2[1]*10000000000; } e2=e.select("dd[class=tel]").first(); - info.telphone=e2.text().replace("电话:", "").trim(); + info.telphone=e2.text().replace("鐢佃瘽:", "").trim(); if(info.lng==0){ crawlCoord(info); } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawlstore/DianpingShopCrawlStore.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawlstore/DianpingShopCrawlStore.groovy index e5135008f..845bf65b4 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawlstore/DianpingShopCrawlStore.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawlstore/DianpingShopCrawlStore.groovy @@ -29,26 +29,26 @@ class DianpingShopCrawlStore extends BaseCrawlStore{ static Pattern pattern_Brand = Pattern.compile("([^\\(^\\)]+)") static Pattern pattern_Name = Pattern.compile("\\((.*)\\)") - def categorys=["美食": "10", - "休闲娱乐": "30", - "购物": "20", - "丽人": "50", - "结婚": "55", - "亲子": "70", - "运动健身": "45", - "酒店": "60", - "家装": "90", - "爱车": "65", - "生活服务": "80"] + def categorys=["缇庨": "10", + "浼戦棽濞变箰": "30", + "璐墿": "20", + "涓戒汉": "50", + "缁撳": "55", + "浜插瓙": "70", + "杩愬姩鍋ヨ韩": "45", + "閰掑簵": "60", + "瀹惰": "90", + "鐖辫溅": "65", + "鐢熸椿鏈嶅姟": "80"] def cityCodes=[ - "上海": "1" -// "北京": "2" -// "广州": "4", -// "昆山": "6" + "涓婃捣": "1" +// "鍖椾含": "2" +// "骞垮窞": "4", +// "鏄嗗北": "6" ]; - def keywords=["亲子购物"]; + def keywords=["浜插瓙璐墿"]; ExecutorService executorService=new ThreadPoolExecutor(10, 10, 3000L, TimeUnit.MILLISECONDS, @@ -60,11 +60,11 @@ class DianpingShopCrawlStore extends BaseCrawlStore{ static main(args){ DianpingShopCrawlStore crawl=new DianpingShopCrawlStore() -// crawl.procByCat("上海"); +// crawl.procByCat("涓婃捣"); crawl.procCitys(); -// crawl.process2("上海", "http://www.dianping.com/search/category/1/10/r842") +// crawl.process2("涓婃捣", "http://www.dianping.com/search/category/1/10/r842") // println crawl.crawlInit("1") -// crawl.processDetail("上海", "http://www.dianping.com/shop/1901062") +// crawl.processDetail("涓婃捣", "http://www.dianping.com/shop/1901062") // println InvokeHttpRequest.get("http://www.dianping.com/search/category/1/10/g118r5962", "utf-8") } @@ -127,7 +127,7 @@ class DianpingShopCrawlStore extends BaseCrawlStore{ println "${city} no city code" return } - categorys=["亲子":"70"] + categorys=["浜插瓙":"70"] def params=crawlInit(cityCode) def subCatParams=params[0] @@ -156,7 +156,7 @@ class DianpingShopCrawlStore extends BaseCrawlStore{ println "${city} no city code" return } - categorys=["亲子":"70"] + categorys=["浜插瓙":"70"] for(def keyword: keywords){ @@ -179,7 +179,7 @@ class DianpingShopCrawlStore extends BaseCrawlStore{ processItem(city, retxt, enterUrl, keyword) - Element elP=JQueryUtils.select("div.Pages a:contains(下一页)", retxt).first() + Element elP=JQueryUtils.select("div.Pages a:contains(涓嬩竴椤�)", retxt).first() int pageCount=1 if(elP){ elP=elP.previousElementSibling() @@ -252,13 +252,13 @@ class DianpingShopCrawlStore extends BaseCrawlStore{ if(ele){ shop.address=ele.text() } - ele=JQueryUtils.select(".shop-info-location li:contains(电话)", retxt).first() + ele=JQueryUtils.select(".shop-info-location li:contains(鐢佃瘽)", retxt).first() if(ele){ - shop.telphone=ele.text().replace("电话:", "").replace("无 添加", "").trim(); + shop.telphone=ele.text().replace("鐢佃瘽锛�", "").replace("鏃� 娣诲姞", "").trim(); } - ele=JQueryUtils.select(".shop-info-location li:contains(营业时间)", retxt).first() + ele=JQueryUtils.select(".shop-info-location li:contains(钀ヤ笟鏃堕棿)", retxt).first() if(ele){ - shop.opening_time=ele.text().replace("营业时间:", "").replace("修改", "").replace("尚无营业时间添加", "").trim(); + shop.opening_time=ele.text().replace("钀ヤ笟鏃堕棿锛�", "").replace("淇敼", "").replace("灏氭棤钀ヤ笟鏃堕棿娣诲姞", "").trim(); } crawlCoord(shop); saveMerchantInfo(shop); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawlstore/DominosCrawlStore.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawlstore/DominosCrawlStore.groovy index e76fc124e..454436482 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawlstore/DominosCrawlStore.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawlstore/DominosCrawlStore.groovy @@ -10,7 +10,7 @@ import org.jsoup.nodes.Element import org.jsoup.select.Elements /** - * 达美乐 + * 杈剧編涔� * @author johnson * */ @@ -22,8 +22,8 @@ class DominosCrawlStore extends BaseCrawlStore { } def procCitys(){ - def city_params=["上海":"ctl00\$ContentPlaceHolder1\$LinkButton1" - , "北京": "ctl00\$ContentPlaceHolder1\$LinkButton2"]; + def city_params=["涓婃捣":"ctl00\$ContentPlaceHolder1\$LinkButton1" + , "鍖椾含": "ctl00\$ContentPlaceHolder1\$LinkButton2"]; for(def d: city_params){ String url="http://www.dominos.com.cn/Store_Locator.aspx?lang=sc"; def params=["__EVENTARGUMENT":"", "__EVENTTARGET":"", "${d.value}":"" @@ -51,7 +51,7 @@ class DominosCrawlStore extends BaseCrawlStore { for(Element el: els){ MerchantInfo info=new MerchantInfo(); info.city=city; - info.kind="达美乐"; + info.kind="杈剧編涔�"; info.from="official"; Element el2=el.select(">span").first() diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawlstore/MrpizzaCrawlStore.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawlstore/MrpizzaCrawlStore.groovy index 6f46d81bd..4502dbbc8 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawlstore/MrpizzaCrawlStore.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawlstore/MrpizzaCrawlStore.groovy @@ -11,19 +11,19 @@ import org.jsoup.select.Elements /** * - * 米斯特比萨 + * 绫虫柉鐗规瘮钀� */ class MrpizzaCrawlStore extends BaseCrawlStore { - static def citys=["上海", "北京","杭州", "宁波", "南京"]; + static def citys=["涓婃捣", "鍖椾含","鏉窞", "瀹佹尝", "鍗椾含"]; static Pattern regExp_coord=Pattern.compile("baidu_map\\(([\\d\\.]+),([\\d\\.]+),"); static void main(args){ MrpizzaCrawlStore crawl=new MrpizzaCrawlStore(); crawl.procCitys(); -// crawl.proc("上海", "http://www.saizeriya.com.cn/cn/shopsearch/index_02.asp"); +// crawl.proc("涓婃捣", "http://www.saizeriya.com.cn/cn/shopsearch/index_02.asp"); } def procCitys(){ @@ -53,12 +53,12 @@ class MrpizzaCrawlStore extends BaseCrawlStore { MerchantInfo info=new MerchantInfo(); // info.city=city; - info.kind="米斯特比萨"; + info.kind="绫虫柉鐗规瘮钀�"; info.from="official"; Element el2=el.select(".marketName").first() String str=el2.text().trim(); - int index1=str.indexOf("│"); + int index1=str.indexOf("鈹�"); info.city=str.substring(0, index1).trim(); info.name=str.substring(index1+1).trim(); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawlstore/PapajohnsCrawlStore.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawlstore/PapajohnsCrawlStore.groovy index 28106f18e..417a9102a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawlstore/PapajohnsCrawlStore.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawlstore/PapajohnsCrawlStore.groovy @@ -6,19 +6,19 @@ import com.fangjia.script.newDistrict.MapabcService; import org.jsoup.nodes.Element import org.jsoup.select.Elements /** - * 棒约翰 + * 妫掔害缈� * @author johnson * */ class PapajohnsCrawlStore extends BaseCrawlStore { - static def provinces=["北京", "福建", "广东", "河南", "湖北", "江苏", "江西", "山东", "上海", "陕西", "四川", "天津", "云南", "浙江", "重庆"]; + static def provinces=["鍖椾含", "绂忓缓", "骞夸笢", "娌冲崡", "婀栧寳", "姹熻嫃", "姹熻タ", "灞变笢", "涓婃捣", "闄曡タ", "鍥涘窛", "澶╂触", "浜戝崡", "娴欐睙", "閲嶅簡"]; static void main(args){ PapajohnsCrawlStore crawl=new PapajohnsCrawlStore(); crawl.procCitys(); -// crawl.proc("上海", "http://www.saizeriya.com.cn/cn/shopsearch/index_02.asp"); +// crawl.proc("涓婃捣", "http://www.saizeriya.com.cn/cn/shopsearch/index_02.asp"); } def procCitys(){ @@ -47,7 +47,7 @@ class PapajohnsCrawlStore extends BaseCrawlStore { } MerchantInfo info=new MerchantInfo(); info.city=city; - info.kind="棒约翰"; + info.kind="妫掔害缈�"; info.from="official"; info.name=el1.text().trim(); @@ -58,7 +58,7 @@ class PapajohnsCrawlStore extends BaseCrawlStore { el1=e.select(".wid250").first(); if(el1){ String str=el1.text().trim(); - int index1=str.indexOf("营业时间"); + int index1=str.indexOf("钀ヤ笟鏃堕棿"); info.telphone=str.substring(5, index1).trim(); info.opening_time=str.substring(index1+5).trim(); } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawlstore/PizzamarzanoCrawlStore.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawlstore/PizzamarzanoCrawlStore.groovy index 8eb8643e5..44d19b9db 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawlstore/PizzamarzanoCrawlStore.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawlstore/PizzamarzanoCrawlStore.groovy @@ -6,7 +6,7 @@ import com.fangjia.script.newDistrict.MapabcService; import org.jsoup.nodes.Element import org.jsoup.select.Elements /** - * 披萨马上诺 + * 鎶惃椹笂璇� * @author johnson * */ @@ -23,23 +23,23 @@ class PizzamarzanoCrawlStore extends BaseCrawlStore { * http://www.pizzamarzano.cn/sc/restaurants-xintiandi.php */ MerchantInfo info=new MerchantInfo(); - info.city="上海"; - info.kind="披萨马上诺"; + info.city="涓婃捣"; + info.kind="鎶惃椹笂璇�"; info.from="official"; - info.name="新天地"; - info.address="上海市黄陂南路380号,新天地南里广场"; + info.name="鏂板ぉ鍦�"; + info.address="涓婃捣甯傞粍闄傚崡璺�380鍙�,鏂板ぉ鍦板崡閲屽箍鍦�"; info.telphone="+86(21) 5383 3999"; - info.opening_time="周一至五 11:30 AM, 周六及日 11:00 AM"; + info.opening_time="鍛ㄤ竴鑷充簲 11:30 AM, 鍛ㄥ叚鍙婃棩 11:00 AM"; crawlCoord(info); saveMerchantInfo(info); println info; info=new MerchantInfo(); - info.city="上海"; - info.kind="披萨马上诺"; + info.city="涓婃捣"; + info.kind="鎶惃椹笂璇�"; info.from="official"; - info.name="上海商城"; - info.address="上海市南京西路1376号,上海商城西峰107单元"; + info.name="涓婃捣鍟嗗煄"; + info.address="涓婃捣甯傚崡浜タ璺�1376鍙�,涓婃捣鍟嗗煄瑗垮嘲107鍗曞厓"; info.telphone="+86(21) 6289 8733"; info.opening_time="11:00 AM"; crawlCoord(info); @@ -47,23 +47,23 @@ class PizzamarzanoCrawlStore extends BaseCrawlStore { println info; info=new MerchantInfo(); - info.city="上海"; - info.kind="披萨马上诺"; + info.city="涓婃捣"; + info.kind="鎶惃椹笂璇�"; info.from="official"; - info.name="永嘉庭"; - info.address="上海市永嘉路570号,永嘉庭111单元"; + info.name="姘稿槈搴�"; + info.address="涓婃捣甯傛案鍢夎矾570鍙�,姘稿槈搴�111鍗曞厓"; info.telphone="+86(21) 6467 8898"; - info.opening_time="周一至五 12:00 PM, 周六及日 11:00 AM"; + info.opening_time="鍛ㄤ竴鑷充簲 12:00 PM, 鍛ㄥ叚鍙婃棩 11:00 AM"; crawlCoord(info); saveMerchantInfo(info); println info; info=new MerchantInfo(); - info.city="上海"; - info.kind="披萨马上诺"; + info.city="涓婃捣"; + info.kind="鎶惃椹笂璇�"; info.from="official"; - info.name="港汇恒隆广场"; - info.address="上海市虹桥路1号,港汇恒隆广场5层507B/C单元"; + info.name="娓眹鎭掗殕骞垮満"; + info.address="涓婃捣甯傝櫣妗ヨ矾1鍙�,娓眹鎭掗殕骞垮満5灞�507B/C鍗曞厓"; info.telphone="+86(21) 6447 8880"; info.opening_time="10:00 AM"; crawlCoord(info); @@ -71,11 +71,11 @@ class PizzamarzanoCrawlStore extends BaseCrawlStore { println info; info=new MerchantInfo(); - info.city="上海"; - info.kind="披萨马上诺"; + info.city="涓婃捣"; + info.kind="鎶惃椹笂璇�"; info.from="official"; - info.name="K11 购物艺术中心"; - info.address="上海市淮海中路300号,K11购物艺术中心4层403单元"; + info.name="K11 璐墿鑹烘湳涓績"; + info.address="涓婃捣甯傛樊娴蜂腑璺�300鍙�,K11璐墿鑹烘湳涓績4灞�403鍗曞厓"; info.telphone="+86(21) 6333 6155"; info.opening_time="10:00 AM"; crawlCoord(info); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawlstore/SaizeriyaCrawlStore.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawlstore/SaizeriyaCrawlStore.groovy index 1564d9189..b97a01762 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawlstore/SaizeriyaCrawlStore.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawlstore/SaizeriyaCrawlStore.groovy @@ -7,7 +7,7 @@ import org.jsoup.nodes.Element import org.jsoup.select.Elements /** - * 萨莉亚 + * 钀ㄨ帀浜� * @author johnson * */ @@ -15,19 +15,19 @@ class SaizeriyaCrawlStore extends BaseCrawlStore { static def city_urls=[:]; static{ - city_urls["上海"]="http://www.saizeriya.com.cn/cn/shopsearch/index_02.asp"; - city_urls["北京"]="http://www.saizeriya.com.cn/cn/shopsearch/index_04.asp"; - city_urls["天津"]="http://www.saizeriya.com.cn/cn/shopsearch/index_06.asp"; - city_urls["广州"]="http://www.saizeriya.com.cn/cn/shopsearch/index_03.asp"; - city_urls["深圳"]="http://www.saizeriya.com.cn/cn/shopsearch/index_05.asp"; - city_urls["苏州"]="http://www.saizeriya.com.cn/cn/shopsearch/index_sz.asp"; - city_urls["南京"]="http://www.saizeriya.com.cn/cn/shopsearch/index_nj.asp"; + city_urls["涓婃捣"]="http://www.saizeriya.com.cn/cn/shopsearch/index_02.asp"; + city_urls["鍖椾含"]="http://www.saizeriya.com.cn/cn/shopsearch/index_04.asp"; + city_urls["澶╂触"]="http://www.saizeriya.com.cn/cn/shopsearch/index_06.asp"; + city_urls["骞垮窞"]="http://www.saizeriya.com.cn/cn/shopsearch/index_03.asp"; + city_urls["娣卞湷"]="http://www.saizeriya.com.cn/cn/shopsearch/index_05.asp"; + city_urls["鑻忓窞"]="http://www.saizeriya.com.cn/cn/shopsearch/index_sz.asp"; + city_urls["鍗椾含"]="http://www.saizeriya.com.cn/cn/shopsearch/index_nj.asp"; } static void main(args){ SaizeriyaCrawlStore crawl=new SaizeriyaCrawlStore(); crawl.procCitys(); -// crawl.proc("上海", "http://www.saizeriya.com.cn/cn/shopsearch/index_02.asp"); +// crawl.proc("涓婃捣", "http://www.saizeriya.com.cn/cn/shopsearch/index_02.asp"); } def procCitys(){ @@ -43,16 +43,16 @@ class SaizeriyaCrawlStore extends BaseCrawlStore { for(Element e: els){ String str= e.text(); - int index1=str.indexOf("地址"); + int index1=str.indexOf("鍦板潃"); if(index1==-1)continue; MerchantInfo info=new MerchantInfo(); info.city=city; - info.kind="萨莉亚" + info.kind="钀ㄨ帀浜�" info.name=str.substring(0, index1).trim(); - int index2=str.indexOf("电话"); + int index2=str.indexOf("鐢佃瘽"); info.address=str.substring(index1+3, index2).trim(); - int index3=str.indexOf("营业时间"); + int index3=str.indexOf("钀ヤ笟鏃堕棿"); info.telphone=str.substring(index2+3, index3); info.opening_time=str.substring(index3+5).trim(); info.from="official"; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawlstore/StarbucksCrawlStore.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawlstore/StarbucksCrawlStore.groovy index 8a6d063e4..a16fab3c8 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawlstore/StarbucksCrawlStore.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawlstore/StarbucksCrawlStore.groovy @@ -10,13 +10,13 @@ import org.jsoup.nodes.Element import org.jsoup.select.Elements /** - * 星巴克 + * 鏄熷反鍏� * @author johnson * */ class StarbucksCrawlStore extends BaseCrawlStore { - static def citys=["上海", "北京","杭州", "宁波", "南京"]; + static def citys=["涓婃捣", "鍖椾含","鏉窞", "瀹佹尝", "鍗椾含"]; static Pattern regExp_coord=Pattern.compile("baidu_map\\(([\\d\\.]+),([\\d\\.]+),"); @@ -42,11 +42,11 @@ class StarbucksCrawlStore extends BaseCrawlStore { if(els1.size()<6)continue; String city=els1[1].text().trim(); - if(!city.endsWith("市")){ + if(!city.endsWith("甯�")){ city=els1[2].text().trim(); } url=els1[5].select("a").first().absUrl("href"); - if(city.endsWith("市")){ + if(city.endsWith("甯�")){ city=city.substring(0, city.length()-1); } proc(city, url); @@ -63,7 +63,7 @@ class StarbucksCrawlStore extends BaseCrawlStore { MerchantInfo info=new MerchantInfo(); info.city=city; - info.kind="星巴克"; + info.kind="鏄熷反鍏�"; info.from="official"; Element el2=el.select("h1.title span").first() @@ -85,11 +85,11 @@ class StarbucksCrawlStore extends BaseCrawlStore { el2=el.select("h1.title input[name=address2]").first() info.address=el2.attr("value"); - el2=el.select(".store_info li:contains(联系电话)").first() + el2=el.select(".store_info li:contains(鑱旂郴鐢佃瘽)").first() if(el2){ info.telphone=el2.nextElementSibling().text().trim(); } - el2=el.select(".store_info li:contains(营业时间)").first() + el2=el.select(".store_info li:contains(钀ヤ笟鏃堕棿)").first() if(el2){ info.opening_time=el2.nextElementSibling().text().trim(); } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dailyCount/ApiDailyCount.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dailyCount/ApiDailyCount.groovy index a0ed5c281..0a02b6a0c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dailyCount/ApiDailyCount.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dailyCount/ApiDailyCount.groovy @@ -34,7 +34,7 @@ class ApiDailyCount extends BaseBatch{ static void main(String[] args){ def s = System.currentTimeMillis() runBatch(new ApiDailyCount(), args) - println("运行时间:${(int) ((System.currentTimeMillis() - s)) / (1000 * 60)}分钟") + println("杩愯鏃堕棿:${(int) ((System.currentTimeMillis() - s)) / (1000 * 60)}鍒嗛挓") } @Override @@ -46,24 +46,24 @@ class ApiDailyCount extends BaseBatch{ def static doStatistic(){ List> msgList = new ArrayList>() List objList = new ArrayList() - objList.add("用户ID") + objList.add("鐢ㄦ埛ID") objList.add('email') objList.add('COMPANY') - objList.add('用户查询总次数') - objList.add('昨日访问总次数') - objList.add('昨日访问失败次数') - objList.add('失败占比') - objList.add('url名称') - objList.add('uri总可访问量') - objList.add('uri总访问量') - objList.add('uri总访失败问量') - objList.add('uri总失败占比') - objList.add('昨日uri访问量') - objList.add('昨日uri访问失败数') - objList.add('昨日uri访问失败占比') + objList.add('鐢ㄦ埛鏌ヨ鎬绘鏁�') + objList.add('鏄ㄦ棩璁块棶鎬绘鏁�') + objList.add('鏄ㄦ棩璁块棶澶辫触娆℃暟') + objList.add('澶辫触鍗犳瘮') + objList.add('url鍚嶇О') + objList.add('uri鎬诲彲璁块棶閲�') + objList.add('uri鎬昏闂噺') + objList.add('uri鎬昏澶辫触闂噺') + objList.add('uri鎬诲け璐ュ崰姣�') + objList.add('鏄ㄦ棩uri璁块棶閲�') + objList.add('鏄ㄦ棩uri璁块棶澶辫触鏁�') + objList.add('鏄ㄦ棩uri璁块棶澶辫触鍗犳瘮') msgList.add(objList) - //昨日日期 + //鏄ㄦ棩鏃ユ湡 // Calendar c = Calendar.getInstance() // c.setTime(new Date()) // c.add(Calendar.DAY_OF_MONTH,-1) @@ -76,7 +76,7 @@ class ApiDailyCount extends BaseBatch{ // c.set(Calendar.SECOND,59) // Date endDate = c.getTime() - //因为8小时影响统计时间变为前两天中午到前一天结束(所有的数据都是00:00:00的,所以不影响准确性) + //鍥犱负8灏忔椂褰卞搷缁熻鏃堕棿鍙樹负鍓嶄袱澶╀腑鍗堝埌鍓嶄竴澶╃粨鏉燂紙鎵�鏈夌殑鏁版嵁閮芥槸00锛�00锛�00鐨勶紝鎵�浠ヤ笉褰卞搷鍑嗙‘鎬э級 Calendar c = Calendar.getInstance() c.setTime(new Date()) c.add(Calendar.DAY_OF_MONTH,-1) @@ -90,7 +90,7 @@ class ApiDailyCount extends BaseBatch{ c.set(Calendar.SECOND,0) Date startDate = c.getTime() - def rows = dbFangjia.rows("select id,email,COMPANY from api_user where IS_TEST = 1 ORDER BY id") //所有测试帐号 + def rows = dbFangjia.rows("select id,email,COMPANY from api_user where IS_TEST = 1 ORDER BY id") //鎵�鏈夋祴璇曞笎鍙� List ids = new ArrayList() println(rows.size()) for(def row : rows){ @@ -104,7 +104,7 @@ class ApiDailyCount extends BaseBatch{ userMsg.add(row.COMPANY) def totalRow = api_visit_count.group(new BasicDBObject("user_id",1), new BasicDBObject("user_id",String.valueOf(id)), - new BasicDBObject("total":0),"function Reduce(doc,out){out.total+=doc.visit_count}") //总查询次数 + new BasicDBObject("total":0),"function Reduce(doc,out){out.total+=doc.visit_count}") //鎬绘煡璇㈡鏁� if(totalRow[0]!=null){ userMsg.add(totalRow[0].total) }else{ @@ -121,14 +121,14 @@ class ApiDailyCount extends BaseBatch{ def yesDefeatVisit = yesTotalRow[0].yesDefeat userMsg.add(yesTotalVisit) userMsg.add(yesDefeatVisit) - def proportion = yesDefeatVisit/yesTotalVisit //失败占比 + def proportion = yesDefeatVisit/yesTotalVisit //澶辫触鍗犳瘮 userMsg.add(Math.round(proportion*100)/100) }else{ userMsg.add(null) userMsg.add(null) userMsg.add(null) } - msgList.add(userMsg) //不含各uri的统计 + msgList.add(userMsg) //涓嶅惈鍚剈ri鐨勭粺璁� def msg = api_user_authority.findOne(new BasicDBObject("user_id",id)) if(msg!=null){ def openUri = msg.open_resource_uris @@ -140,7 +140,7 @@ class ApiDailyCount extends BaseBatch{ userUriMsg.addAll(userMsg) userUriMsg.add(uri) if(total_count_map!=null){ - userUriMsg.add(total_count_map.get(uri)) //uri总可访问量 + userUriMsg.add(total_count_map.get(uri)) //uri鎬诲彲璁块棶閲� }else{ userUriMsg.add(null) } @@ -151,9 +151,9 @@ class ApiDailyCount extends BaseBatch{ if(totalUriRow[0]!=null){ def uriTotalvisit = totalUriRow[0].uriTotal def uriTotalDefeat = totalUriRow[0].uriDefeat - userUriMsg.add(uriTotalvisit) //uri总访问量 - userUriMsg.add(uriTotalDefeat) //uri总访失败问量 - def uriTotalProportion = uriTotalDefeat/uriTotalvisit //uri总失败占比 + userUriMsg.add(uriTotalvisit) //uri鎬昏闂噺 + userUriMsg.add(uriTotalDefeat) //uri鎬昏澶辫触闂噺 + def uriTotalProportion = uriTotalDefeat/uriTotalvisit //uri鎬诲け璐ュ崰姣� userUriMsg.add(Math.round(uriTotalProportion*100)/100) }else{ userUriMsg.add(null) @@ -165,10 +165,10 @@ class ApiDailyCount extends BaseBatch{ new BasicDBObject("yesUriTotal",0).append("yesUriDefeat",0), "function Reduce(doc,out){out.yesUriTotal+=doc.total_time;out.yesUriDefeat+=doc.defeat_time;}") if(yesTotalUriRow[0]!=null){ - userUriMsg.add(yesTotalUriRow[0].yesUriTotal) //昨日uri总访问量 - userUriMsg.add(yesTotalUriRow[0].yesUriDefeat) //昨日uri总访问失败数 - def uriProportion = yesTotalUriRow[0].yesUriDefeat/yesTotalUriRow[0].yesUriTotal //昨日uri失败占比 - userUriMsg.add(Math.round(uriProportion*100)/100) //昨日uri失败占比 + userUriMsg.add(yesTotalUriRow[0].yesUriTotal) //鏄ㄦ棩uri鎬昏闂噺 + userUriMsg.add(yesTotalUriRow[0].yesUriDefeat) //鏄ㄦ棩uri鎬昏闂け璐ユ暟 + def uriProportion = yesTotalUriRow[0].yesUriDefeat/yesTotalUriRow[0].yesUriTotal //鏄ㄦ棩uri澶辫触鍗犳瘮 + userUriMsg.add(Math.round(uriProportion*100)/100) //鏄ㄦ棩uri澶辫触鍗犳瘮 }else{ userUriMsg.add(null) userUriMsg.add(null) @@ -197,7 +197,7 @@ class ApiDailyCount extends BaseBatch{ String dateStr = DateUtils.formatToYYYYMMDD(new Date()) def fileName = getFilePath() + "ApiCount" + dateStr + ".xlsx" println(fileName) - ExcelUtils.write(fileName, msgs ,"Api调用统计") + ExcelUtils.write(fileName, msgs ,"Api璋冪敤缁熻") String id = ObjectId.get().toString() BasicDBObject file = new BasicDBObject() file.put("t", "upload") @@ -208,10 +208,10 @@ class ApiDailyCount extends BaseBatch{ fsDB.save(file) def href = DataUtil.encodePicUrl(id, "o", "upload") println(href) - href = "点击下载附件" + href = "鐐瑰嚮涓嬭浇闄勪欢" emails.each {receiver-> println(receiver) - jms.sendMail(receiver,"Api调用统计", href) + jms.sendMail(receiver,"Api璋冪敤缁熻", href) } } @@ -220,7 +220,7 @@ class ApiDailyCount extends BaseBatch{ return DigestUtils.md5Hex(key) + Math.abs(key.hashCode()) } /** - * 获取Excel文件存储路径 + * 鑾峰彇Excel鏂囦欢瀛樺偍璺緞 * @return */ static getFilePath() { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/AnalyOtherSiteNameUrlBath.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/AnalyOtherSiteNameUrlBath.groovy index e6120f84c..3b4d3f4ed 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/AnalyOtherSiteNameUrlBath.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/AnalyOtherSiteNameUrlBath.groovy @@ -12,7 +12,7 @@ import com.mongodb.DBCollection import com.mongodb.DBObject /** - * 分析其它网站抓取小区的url链接 + * 鍒嗘瀽鍏跺畠缃戠珯鎶撳彇灏忓尯鐨剈rl閾炬帴 * @author gaojuan * */ @@ -30,11 +30,11 @@ class AnalyOtherSiteNameUrlBath extends BaseBatch{ public void process(Object args) { def allCity = CommonUtils.findAllCity(); def cat = "district"; - def siteNames = ["链家在线","房估估","兔博士","中原地产"]; - def siteNameMap = ["链家在线":"lianjia_esf","房估估":"fanggugu_esf","兔博士":"tuboshi_esf","中原地产":"zhongyuan_esf"]; + def siteNames = ["閾惧鍦ㄧ嚎","鎴夸及浼�","鍏斿崥澹�","涓師鍦颁骇"]; + def siteNameMap = ["閾惧鍦ㄧ嚎":"lianjia_esf","鎴夸及浼�":"fanggugu_esf","鍏斿崥澹�":"tuboshi_esf","涓師鍦颁骇":"zhongyuan_esf"]; for(def city : allCity){ def analyRoads = findAnalyRoads(city, cat, siteNames); - //按网站分组 + //鎸夌綉绔欏垎缁� def retMap = roadsGroupBySiteName(siteNames, analyRoads); saveOrUpdateData(retMap, siteNameMap); } @@ -61,14 +61,14 @@ class AnalyOtherSiteNameUrlBath extends BaseBatch{ udata.put(sampleName, infos[1]); q.put("m_date", new Date()); MAPPING_URL_COLL.update(new BasicDBObject("_id", dbo._id), new BasicDBObject('$set', udata)) - println distInfos[0]+" "+distInfos[2]+" 修改:"+udata + println distInfos[0]+" "+distInfos[2]+" 淇敼锛�"+udata } }else{ q.put(sampleName, infos[1]); q.put("m_date", new Date()); q.put("c_date", new Date()); MAPPING_URL_COLL.save(q); - println distInfos[0]+" "+distInfos[2]+" 保存:" + infos[1] + println distInfos[0]+" "+distInfos[2]+" 淇濆瓨锛�" + infos[1] } } } @@ -87,7 +87,7 @@ class AnalyOtherSiteNameUrlBath extends BaseBatch{ results = [:]; retMap.put(siteName, results); } - //按名称分组 + //鎸夊悕绉板垎缁� def key = analyRoad.city +"@"+analyRoad.region+"@"+analyRoad.name; def urlLists = results.get(key); if(!urlLists){ @@ -98,7 +98,7 @@ class AnalyOtherSiteNameUrlBath extends BaseBatch{ } - //url按时间排序 + //url鎸夋椂闂存帓搴� if(retMap){ retMap.each{siteName, distMap-> println siteName @@ -129,7 +129,7 @@ class AnalyOtherSiteNameUrlBath extends BaseBatch{ List result = [] for (BasicDBObject obj : dbCursor) { def siteName = obj.site_name; - //分析需要分析的网站 + //鍒嗘瀽闇�瑕佸垎鏋愮殑缃戠珯 if(siteName && siteNames.contains(siteName)){ BasicDBObject primaryMap = obj.get("primary_map") def item = new BasicDBObject() diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/CityInfoAnaBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/CityInfoAnaBatch.groovy index 97c696de4..50bb25418 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/CityInfoAnaBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/CityInfoAnaBatch.groovy @@ -78,13 +78,13 @@ class CityInfoAnaBatch extends BaseBatch { lat : 'lat',lng : 'lng',lat2 : 'lat2',lng2 : 'lng2',township:'township',loop_line_info :'loopLineInfo',land_floor:'landFloor',underground_floor:'undergroundFloor',real_use_percent:'realUsePercent' ] - public static CITY_GRADE_MAP = [1000: "一线" , 1500 : "新一线" , 2000 : "二线" , 3000:"三线" ,4000 : "四线" ,5000 : "五线"] + public static CITY_GRADE_MAP = [1000: "涓�绾�" , 1500 : "鏂颁竴绾�" , 2000 : "浜岀嚎" , 3000:"涓夌嚎" ,4000 : "鍥涚嚎" ,5000 : "浜旂嚎"] - final static def COUNT_CITYS = ["滁州","黄山","马鞍山","芜湖","宿州","宣城","北京","白银","定西","甘南","金昌","兰州","临夏","陇南","平凉","庆阳","天水","武威","张掖","东莞","佛山","广州","惠州","江门","梅州","清远","深圳","玉林","安顺","贵阳","铜仁","三亚","海口","承德","邯郸","衡水","廊坊","秦皇岛","石家庄","开封","洛阳","大庆","鄂州","黄冈","十堰","武汉","宜昌","常德","长沙","常州","淮安","连云港","南京","南通","苏州","泰州","无锡","宿迁","徐州","盐城","扬州","镇江","景德镇","九江","上饶","鹰潭","抚顺","辽阳","盘锦","沈阳","铁岭","营口","呼和浩特","石嘴山","银川","海东","西宁","滨州","德州","济南","济宁","青岛","潍坊","淄博","太原","宝鸡","渭南","西安","咸阳","上海","成都","达州","德阳","乐山","凉山州","泸州","眉山","绵阳","南充","内江","遂宁","雅安","宜宾","资阳","自贡","天津","丽江","昭通","杭州","湖州","嘉兴","金华","丽水","宁波","衢州","绍兴","台州","温州","舟山","重庆"]; + final static def COUNT_CITYS = ["婊佸窞","榛勫北","椹瀺灞�","鑺滄箹","瀹垮窞","瀹e煄","鍖椾含","鐧介摱","瀹氳タ","鐢樺崡","閲戞槍","鍏板窞","涓村","闄囧崡","骞冲噳","搴嗛槼","澶╂按","姝﹀▉","寮犳帠","涓滆帪","浣涘北","骞垮窞","鎯犲窞","姹熼棬","姊呭窞","娓呰繙","娣卞湷","鐜夋灄","瀹夐『","璐甸槼","閾滀粊","涓変簹","娴峰彛","鎵垮痉","閭兏","琛℃按","寤婂潑","绉︾殗宀�","鐭冲搴�","寮�灏�","娲涢槼","澶у簡","閯傚窞","榛勫唸","鍗佸牥","姝︽眽","瀹滄槍","甯稿痉","闀挎矙","甯稿窞","娣畨","杩炰簯娓�","鍗椾含","鍗楅��","鑻忓窞","娉板窞","鏃犻敗","瀹胯縼","寰愬窞","鐩愬煄","鎵窞","闀囨睙","鏅痉闀�","涔濇睙","涓婇ザ","楣版江","鎶氶『","杈介槼","鐩橀敠","娌堥槼","閾佸箔","钀ュ彛","鍛煎拰娴╃壒","鐭冲槾灞�","閾跺窛","娴蜂笢","瑗垮畞","婊ㄥ窞","寰峰窞","娴庡崡","娴庡畞","闈掑矝","娼嶅潑","娣勫崥","澶師","瀹濋浮","娓崡","瑗垮畨","鍜搁槼","涓婃捣","鎴愰兘","杈惧窞","寰烽槼","涔愬北","鍑夊北宸�","娉稿窞","鐪夊北","缁甸槼","鍗楀厖","鍐呮睙","閬傚畞","闆呭畨","瀹滃","璧勯槼","鑷础","澶╂触","涓芥睙","鏄��","鏉窞","婀栧窞","鍢夊叴","閲戝崕","涓芥按","瀹佹尝","琛㈠窞","缁嶅叴","鍙板窞","娓╁窞","鑸熷北","閲嶅簡"]; final static def DIST_FACILITY_LIST = ["bank", "hospital", "bus", "shop", "university", "middle_school", "primary_school", "kindergarten", "food_shop", "supermarket","atm","school","subway"] /** - * 统计结果接收邮箱列表 + * 缁熻缁撴灉鎺ユ敹閭鍒楄〃 */ final static def receivers = [ "gaojuan@fangjia.com", @@ -100,48 +100,48 @@ class CityInfoAnaBatch extends BaseBatch { @Override public void process(Object args) { - // 当期周末 + // 褰撴湡鍛ㄦ湯 Date weekend = DateUtil.getFirstDayOfWeek(new Date()); - //周日开始跑,需要跑加上7天,周一跑不需要 + //鍛ㄦ棩寮�濮嬭窇锛岄渶瑕佽窇鍔犱笂7澶╋紝鍛ㄤ竴璺戜笉闇�瑕� // weekend = DateUtil.add(weekend, 7) Date laseWeekend = DateUtil.getFirstDayOfWeek(weekend); - println "开始分析:" + DateUtil.formatToTightYYYYMMDDhhmmss(weekend) + println "寮�濮嬪垎鏋愶細" + DateUtil.formatToTightYYYYMMDDhhmmss(weekend) DBObject cityQuery = new BasicDBObject('status', new BasicDBObject('$in', [0, 2])) -// cityQuery.put("display", "福州") - // 所有城市 +// cityQuery.put("display", "绂忓窞") + // 鎵�鏈夊煄甯� def allCitys = [:]; SERVER_AREA_CONN.find(cityQuery).each { allCitys.put(it.display, it); } allCitys.each {k,v -> -// if(["北京"].contains(k.toString())){ +// if(["鍖椾含"].contains(k.toString())){ CITYS << k.toString(); // } } - // 所有城市的人口信息 + // 鎵�鏈夊煄甯傜殑浜哄彛淇℃伅 def allHouseStats = [:]; DBObject query = new BasicDBObject(); - query.put("region", "全市"); + query.put("region", "鍏ㄥ競"); HOUSE_STAT_CONN.find(query).each { allHouseStats.put(it.city, it); } - // 城市小区数 + // 鍩庡競灏忓尯鏁� def allCityDisCount = [:]; BasicDBObject match = new BasicDBObject('$match', new BasicDBObject("status", 0).append("cat", "district")); DBObject groupFields = new BasicDBObject(); groupFields.put("_id", new BasicDBObject("city", '$city')) groupFields.put("count", new BasicDBObject('$sum', 1)); DBObject group = new BasicDBObject('$group', groupFields); - // 定义聚合管道,按 city 字段分组,并计算每个城市的数量 + // 瀹氫箟鑱氬悎绠¢亾锛屾寜 city 瀛楁鍒嗙粍锛屽苟璁$畻姣忎釜鍩庡競鐨勬暟閲� AggregationOutput output = SEAWEED.aggregate(Arrays.asList(match, group)); for (DBObject result : output.results()) { def obj = (DBObject ) result.get("_id"); allCityDisCount.put(obj.get("city"), result.get("count")) } - // 城市新盘数 + // 鍩庡競鏂扮洏鏁� def allCityNewDisCount = [:]; match = new BasicDBObject('$match', new BasicDBObject("status", 0).append("cat", "new_district")); output = SEAWEED.aggregate(Arrays.asList(match, group)); @@ -150,7 +150,7 @@ class CityInfoAnaBatch extends BaseBatch { allCityNewDisCount.put(obj.get("city"), result.get("count")) } - // 城市写字楼数 + // 鍩庡競鍐欏瓧妤兼暟 def allCityOfficeCount = [:]; match = new BasicDBObject('$match', new BasicDBObject("status", 0).append("cat", "office")); @@ -160,7 +160,7 @@ class CityInfoAnaBatch extends BaseBatch { allCityOfficeCount.put(obj.get("city"), result.get("count")) } - // 城市商铺数 + // 鍩庡競鍟嗛摵鏁� def allCityShopCount = [:]; match = new BasicDBObject('$match', new BasicDBObject("status", 0).append("cat", "shop")); @@ -170,7 +170,7 @@ class CityInfoAnaBatch extends BaseBatch { allCityShopCount.put(obj.get("city"), result.get("count")) } - // 城市均价 + // 鍩庡競鍧囦环 def allCityStats = [:]; query = new BasicDBObject(); query.put("region", null); @@ -184,7 +184,7 @@ class CityInfoAnaBatch extends BaseBatch { doProcess(allCitys.get(it), weekend, laseWeekend, allHouseStats, allCityDisCount, allCityNewDisCount, allCityOfficeCount, allCityShopCount, allCityStats); } -// //统计有楼栋的小区数和有房号的小区数 +// //缁熻鏈夋ゼ鏍嬬殑灏忓尯鏁板拰鏈夋埧鍙风殑灏忓尯鏁� //// countDistrictsHasLoudong(allCitys, weekend) // //countDistrictsHasLoudongNew(allCitys, weekend) // @@ -196,7 +196,7 @@ class CityInfoAnaBatch extends BaseBatch { fixedThreadPool.execute(new Runnable(){ void run() { try { - //楼栋统计 + //妤兼爧缁熻 CityInfoAnaBatch.statLoudongDetail(cityName, weekend) } catch (Exception e) { println e.getMessage() @@ -208,7 +208,7 @@ class CityInfoAnaBatch extends BaseBatch { }) } latch.await() - println "${DateUtil.formatToTightYYYYMMDDhhmmss(new Date())}\t楼栋覆盖率统计完成" + println "${DateUtil.formatToTightYYYYMMDDhhmmss(new Date())}\t妤兼爧瑕嗙洊鐜囩粺璁″畬鎴�" latch = new CountDownLatch(CITYS.size()) semaphore = new Semaphore(10) @@ -218,7 +218,7 @@ class CityInfoAnaBatch extends BaseBatch { fixedThreadPool.execute(new Runnable(){ void run() { try { - //房号统计 + //鎴垮彿缁熻 CityInfoAnaBatch.statHouseLoudongDetail(cityName, weekend) } catch (Exception e) { println e.getMessage() @@ -230,14 +230,14 @@ class CityInfoAnaBatch extends BaseBatch { }) } latch.await() - println "${DateUtil.formatToTightYYYYMMDDhhmmss(new Date())}\t房号覆盖率统计完成" + println "${DateUtil.formatToTightYYYYMMDDhhmmss(new Date())}\t鎴垮彿瑕嗙洊鐜囩粺璁″畬鎴�" - //71个城市的覆盖率统计 + //71涓煄甯傜殑瑕嗙洊鐜囩粺璁� sendCountData(weekend) - //最后统计之前因为太慢取消统计的本周估价次数 + //鏈�鍚庣粺璁′箣鍓嶅洜涓哄お鎱㈠彇娑堢粺璁$殑鏈懆浼颁环娆℃暟 latch = new CountDownLatch(CITYS.size()) semaphore = new Semaphore(10) CITYS.each { @@ -246,7 +246,7 @@ class CityInfoAnaBatch extends BaseBatch { fixedThreadPool.execute(new Runnable(){ void run() { try { - println cityName+"本周估价次数统计开始" + println cityName+"鏈懆浼颁环娆℃暟缁熻寮�濮�" DBObject q = new BasicDBObject(); q.put("city", cityName); q.put("weekend", weekend); @@ -261,7 +261,7 @@ class CityInfoAnaBatch extends BaseBatch { entity.put('price_to_eva', DataUtil.roundDouble(entity.get('price_total_count'), entity.get('evaluation_count'))); } CITY_INFO_CONN.save(entity) - println cityName+"本周估价次数统计完毕" + println cityName+"鏈懆浼颁环娆℃暟缁熻瀹屾瘯" } } catch (Exception e) { @@ -278,12 +278,12 @@ class CityInfoAnaBatch extends BaseBatch { } def sendCountData(def weekend) { - println "开始统计71个城市的覆盖率统计" + println "寮�濮嬬粺璁�71涓煄甯傜殑瑕嗙洊鐜囩粺璁�" DecimalFormat df = new DecimalFormat("0.00%") - String resultTitle = COUNT_CITYS.size() + "城市覆盖率统计结果" + String resultTitle = COUNT_CITYS.size() + "鍩庡競瑕嗙洊鐜囩粺璁$粨鏋�" def fileName = System.getProperty("java.io.tmpdir") + File.separator + "${resultTitle}-${DateUtil.formatToTightYYYYMMDD(weekend)}.xlsx" - def datas = [["城市", "小区量", "有楼栋小区量", "占比", "有房号小区量", "占比", "楼栋量", "房号量"]] + def datas = [["鍩庡競", "灏忓尯閲�", "鏈夋ゼ鏍嬪皬鍖洪噺", "鍗犳瘮", "鏈夋埧鍙峰皬鍖洪噺", "鍗犳瘮", "妤兼爧閲�", "鎴垮彿閲�"]] def totalDistrictCount = 0 def totalLoudongCount = 0 def totalFanghaoCount = 0 @@ -317,7 +317,7 @@ class CityInfoAnaBatch extends BaseBatch { // file.put("data", new File(fileName).getBytes()) // fsDB.save(file) // def href = DataUtil.encodePicUrl(id, "o", "upload") -// href = "点击下载附件" +// href = "鐐瑰嚮涓嬭浇闄勪欢" // receivers.each {receiver-> // jms.sendMail(receiver, resultTitle, href) // } @@ -400,7 +400,7 @@ class CityInfoAnaBatch extends BaseBatch { query.put("weekend", weekend); DBObject updateObj = new BasicDBObject('districts_has_loudong', loudongCount).append('district_has_fanghao', fanghaoCount).append('city', city).append('weekend', weekend) CITY_INFO_CONN.update(query, new BasicDBObject('$set', updateObj)) - println "${DateUtil.formatToTightYYYYMMDDhhmmss(new Date())}\t[$city] 有楼栋的小区数统计完成" + println "${DateUtil.formatToTightYYYYMMDDhhmmss(new Date())}\t[$city] 鏈夋ゼ鏍嬬殑灏忓尯鏁扮粺璁″畬鎴�" } } @@ -418,7 +418,7 @@ class CityInfoAnaBatch extends BaseBatch { } def countDistrictsHasLoudong(def allCitys, def weekend) { - println "${DateUtil.formatToTightYYYYMMDDhhmmss(new Date())}\t开始统计有楼栋的小区数" + println "${DateUtil.formatToTightYYYYMMDDhhmmss(new Date())}\t寮�濮嬬粺璁℃湁妤兼爧鐨勫皬鍖烘暟" def queryDistrict = new BasicDBObject() queryDistrict.put("visible", 0) queryDistrict.put("cat", "district") @@ -454,7 +454,7 @@ class CityInfoAnaBatch extends BaseBatch { if(findObj != null) { DBObject updateObj = new BasicDBObject('districts_has_loudong', loudongCount).append('district_has_fanghao', fanghaoCount) CITY_INFO_CONN.update(findObj, new BasicDBObject('$set', updateObj)) - println "${DateUtil.formatToTightYYYYMMDDhhmmss(new Date())}\t[$city] 有楼栋的小区数统计完成" + println "${DateUtil.formatToTightYYYYMMDDhhmmss(new Date())}\t[$city] 鏈夋ゼ鏍嬬殑灏忓尯鏁扮粺璁″畬鎴�" } queryDistrict.remove('city') } @@ -509,8 +509,8 @@ class CityInfoAnaBatch extends BaseBatch { query.put('city', cityName); query.put('weekend', weekend); BasicDBList values = new BasicDBList(); - values.add(new BasicDBObject("estate_type", '小区')); - values.add(new BasicDBObject("estate_type", '别墅')); + values.add(new BasicDBObject("estate_type", '灏忓尯')); + values.add(new BasicDBObject("estate_type", '鍒')); query.put('$or', values); int pc = DISTRICT_STAT_CONN.count(query); entity.put('price_coverage', roundDouble(pc, disCount)); @@ -546,7 +546,7 @@ class CityInfoAnaBatch extends BaseBatch { entity.put('district_detail', [:]); } - print "\t[${DateUtil.formatToTightYYYYMMDDhhmmss(new Date())} 小区完成]" + print "\t[${DateUtil.formatToTightYYYYMMDDhhmmss(new Date())} 灏忓尯瀹屾垚]" // if (allCityNewDisCount.get(cityName)) { @@ -562,7 +562,7 @@ class CityInfoAnaBatch extends BaseBatch { DBObject query = new BasicDBObject(); query.put('city', cityName); - //query.put('estate_type', '写字楼'); + //query.put('estate_type', '鍐欏瓧妤�'); query.put('weekend', weekend); def officePrices = OFFICE_STAT_CONN.distinct("district_name", query); if (officePrices) { @@ -588,7 +588,7 @@ class CityInfoAnaBatch extends BaseBatch { // if(curInfo){ // CITY_INFO_CONN.update(new BasicDBObject("_id", curInfo._id), new BasicDBObject('$set', entity)) -// print "\t[${DateUtil.formatToTightYYYYMMDDhhmmss(new Date())} 写字楼完成]" +// print "\t[${DateUtil.formatToTightYYYYMMDDhhmmss(new Date())} 鍐欏瓧妤煎畬鎴怾" // } @@ -607,7 +607,7 @@ class CityInfoAnaBatch extends BaseBatch { DBObject query = new BasicDBObject(); query.put('city', cityName); - //query.put('estate_type', '商铺'); + //query.put('estate_type', '鍟嗛摵'); query.put('weekend', weekend); def shopPrices = SHOP_STAT_CONN.distinct("district_name", query); if (shopPrices) { @@ -616,7 +616,7 @@ class CityInfoAnaBatch extends BaseBatch { query = new BasicDBObject(); query.put('city', cityName); - query.put('kind', '商铺'); + query.put('kind', '鍟嗛摵'); query.put('weekend', weekend); def shopRents = RENT_STAT_CONN.distinct("name", query); if (shopRents) { @@ -628,7 +628,7 @@ class CityInfoAnaBatch extends BaseBatch { }else { entity.put('shop_detail', [:]); } - print "\t[${DateUtil.formatToTightYYYYMMDDhhmmss(new Date())} 商铺完成]" + print "\t[${DateUtil.formatToTightYYYYMMDDhhmmss(new Date())} 鍟嗛摵瀹屾垚]" def cityStat = allCityStats.get(cityName); if (cityStat) { @@ -638,16 +638,16 @@ class CityInfoAnaBatch extends BaseBatch { DBObject query = new BasicDBObject(); query.put('city', cityName); query.put('c_date', new BasicDBObject('$gte', lastWeekend).append('$lte', weekend)); - //entity.put('evaluation_count', (int) EVALUATION_CONN.count(query));由于估价记录数据量大,查询慢,先去掉这个,最后面在用多线程统计 + //entity.put('evaluation_count', (int) EVALUATION_CONN.count(query));鐢变簬浼颁环璁板綍鏁版嵁閲忓ぇ锛屾煡璇㈡參锛屽厛鍘绘帀杩欎釜锛屾渶鍚庨潰鍦ㄧ敤澶氱嚎绋嬬粺璁� entity.put('price_total_count', (int) PRICE_JIUCUO_CONN.count(query)); - query.put('price_lev', '偏高'); + query.put('price_lev', '鍋忛珮'); entity.put('price_high_count', (int) PRICE_JIUCUO_CONN.count(query)); - query.put('price_lev', '偏低'); + query.put('price_lev', '鍋忎綆'); entity.put('price_low_count', (int) PRICE_JIUCUO_CONN.count(query)); - /*if (entity.get('evaluation_count')) {由于估价记录数据量大,查询慢,先去掉这个,最后面在用多线程统计 + /*if (entity.get('evaluation_count')) {鐢变簬浼颁环璁板綍鏁版嵁閲忓ぇ锛屾煡璇㈡參锛屽厛鍘绘帀杩欎釜锛屾渶鍚庨潰鍦ㄧ敤澶氱嚎绋嬬粺璁� entity.put('price_to_eva', roundDouble(entity.get('price_total_count'), entity.get('evaluation_count'))); }*/ @@ -655,7 +655,7 @@ class CityInfoAnaBatch extends BaseBatch { entity.put('low_to_high', roundDouble(entity.get('price_low_count'), entity.get('price_high_count'))); } - print "\t[${DateUtil.formatToTightYYYYMMDDhhmmss(new Date())} 估价完成]" + print "\t[${DateUtil.formatToTightYYYYMMDDhhmmss(new Date())} 浼颁环瀹屾垚]" // query = new BasicDBObject(); // query.put('city', cityName); @@ -683,56 +683,56 @@ class CityInfoAnaBatch extends BaseBatch { // entity.put('web_average', bg.setScale(4, BigDecimal.ROUND_HALF_UP).doubleValue()); // } // entity.put('loudong_detail', loudongDetail(cityName)); -// println "\t${DateUtil.formatToTightYYYYMMDDhhmmss(new Date())} 楼栋数据分析完成" +// println "\t${DateUtil.formatToTightYYYYMMDDhhmmss(new Date())} 妤兼爧鏁版嵁鍒嗘瀽瀹屾垚" entity.put('city_level', cityGrade); entity.put('c_date', new Date()); if(!entity.existing_office_count && !entity.existing_district_count && !entity.existing_shop_count){ -// println cityName + " 无 shop,office,district 数据........."; +// println cityName + " 鏃� shop,office,district 鏁版嵁........."; }else{ CITY_INFO_CONN.save(entity); } println "" - println "${DateUtil.formatToTightYYYYMMDDhhmmss(new Date())} ${cityName}完成\t小区:${entity.existing_district_count} 写字楼:${entity.existing_office_count} 商铺:${entity.existing_shop_count}" + println "${DateUtil.formatToTightYYYYMMDDhhmmss(new Date())} ${cityName}瀹屾垚\t灏忓尯:${entity.existing_district_count} 鍐欏瓧妤硷細${entity.existing_office_count} 鍟嗛摵锛�${entity.existing_shop_count}" } - //统计楼栋覆盖率 + //缁熻妤兼爧瑕嗙洊鐜� static statLoudongDetail(city, weekend) { - println "开始统计楼栋覆盖率:" + city + println "寮�濮嬬粺璁℃ゼ鏍嬭鐩栫巼锛�" + city def detail = [:] detail.put("loudong_count", LOUDONG_CONN.count(new BasicDBObject("city", city).append("status", 1))) def query = new BasicDBObject("cat", "district").append("visible", 0).append("city", city) def fields = new BasicDBObject("city", "1").append("region", 1).append("name", 1) - //有楼栋的小区数量 + //鏈夋ゼ鏍嬬殑灏忓尯鏁伴噺 def exists_loudong_dis_count = 0 - //有楼栋的小区楼栋号数量 + //鏈夋ゼ鏍嬬殑灏忓尯妤兼爧鍙锋暟閲� def loudong_num_count = 0 - //有楼栋的小区单元数量 + //鏈夋ゼ鏍嬬殑灏忓尯鍗曞厓鏁伴噺 def loudong_unit_count = 0 - //有楼栋的小区总楼层数量 + //鏈夋ゼ鏍嬬殑灏忓尯鎬绘ゼ灞傛暟閲� def loudong_height_count = 0 - //有楼栋的小区电梯数数量 + //鏈夋ゼ鏍嬬殑灏忓尯鐢垫鏁版暟閲� def elevatornumber_count = 0 - //有楼栋的小区户数数量 + //鏈夋ゼ鏍嬬殑灏忓尯鎴锋暟鏁伴噺 def households_count = 0 - //有楼栋的小区地址数量 + //鏈夋ゼ鏍嬬殑灏忓尯鍦板潃鏁伴噺 def address_count = 0 - //有楼栋的小区建筑类型数量 + //鏈夋ゼ鏍嬬殑灏忓尯寤虹瓚绫诲瀷鏁伴噺 def build_type_count = 0 - //有楼栋的小区建筑结构数量 + //鏈夋ゼ鏍嬬殑灏忓尯寤虹瓚缁撴瀯鏁伴噺 def structure_count = 0 - //有楼栋的小区建筑年代数量 + //鏈夋ゼ鏍嬬殑灏忓尯寤虹瓚骞翠唬鏁伴噺 def build_year_count = 0 - //有楼栋的小区楼栋用途数量 + //鏈夋ゼ鏍嬬殑灏忓尯妤兼爧鐢ㄩ�旀暟閲� def usage_count = 0 - //有楼栋的小区楼栋类型数量 + //鏈夋ゼ鏍嬬殑灏忓尯妤兼爧绫诲瀷鏁伴噺 def loudong_type_count = 0 - //有楼栋的小区建筑类型(按楼层)数量 + //鏈夋ゼ鏍嬬殑灏忓尯寤虹瓚绫诲瀷锛堟寜妤煎眰锛夋暟閲� def floor_type_count = 0 - //有楼栋的小区建筑性质数量 + //鏈夋ゼ鏍嬬殑灏忓尯寤虹瓚鎬ц川鏁伴噺 def archiNature_count = 0 - //有楼栋的小区建筑总面积数量 + //鏈夋ゼ鏍嬬殑灏忓尯寤虹瓚鎬婚潰绉暟閲� def totalAreas_count = 0 try { DbUtils.seaweed.find(query, fields).each { dis -> @@ -858,39 +858,39 @@ class CityInfoAnaBatch extends BaseBatch { DBObject updateObj = new BasicDBObject("loudong_detail", detail).append("districts_has_loudong", exists_loudong_dis_count) CITY_INFO_CONN.update(q, new BasicDBObject('$set', updateObj)) - println "${DateUtil.formatToTightYYYYMMDDhhmmss(new Date())}\t[$city] 有楼栋的小区数覆盖率统计完成" + println "${DateUtil.formatToTightYYYYMMDDhhmmss(new Date())}\t[$city] 鏈夋ゼ鏍嬬殑灏忓尯鏁拌鐩栫巼缁熻瀹屾垚" } - //统计房号覆盖率 + //缁熻鎴垮彿瑕嗙洊鐜� static statHouseLoudongDetail(city, weekend) { - println "开始统计房号覆盖率:" + city + println "寮�濮嬬粺璁℃埧鍙疯鐩栫巼锛�" + city def detail = [:] def hasHouseMap =[:] detail.put("house_count", HOUSE_LOUDONG_CONN.count(new BasicDBObject("city", city).append("status", new BasicDBObject('$in',[0,5])))) def query = new BasicDBObject("cat", "district").append("visible", 0).append("city", city) def fields = new BasicDBObject("city", "1").append("region", 1).append("name", 1).append("status",1) - //有房号的小区数量 + //鏈夋埧鍙风殑灏忓尯鏁伴噺 def exists_house_dis_count = 0 - //有房号小区中有楼号数量 + //鏈夋埧鍙峰皬鍖轰腑鏈夋ゼ鍙锋暟閲� def house_num_count = 0 - //有房号小区中有单元数量 + //鏈夋埧鍙峰皬鍖轰腑鏈夊崟鍏冩暟閲� def unit_num_count = 0 - //有房号小区中有室号数量 + //鏈夋埧鍙峰皬鍖轰腑鏈夊鍙锋暟閲� def room_num_count = 0 - //有房号小区中有面积数量 + //鏈夋埧鍙峰皬鍖轰腑鏈夐潰绉暟閲� def area_num_count = 0 - //有房号小区中有户型数量 + //鏈夋埧鍙峰皬鍖轰腑鏈夋埛鍨嬫暟閲� def room_info_count = 0 - //有房号小区中有户型结构数量 + //鏈夋埧鍙峰皬鍖轰腑鏈夋埛鍨嬬粨鏋勬暟閲� def hourse_structure_count = 0 - //有房号小区中有实际层数量 + //鏈夋埧鍙峰皬鍖轰腑鏈夊疄闄呭眰鏁伴噺 def actualFloor_count = 0 - //有房号小区中有名义层数量 + //鏈夋埧鍙峰皬鍖轰腑鏈夊悕涔夊眰鏁伴噺 def nominalFloor_count = 0 - //有房号小区中有建筑类型数量 + //鏈夋埧鍙峰皬鍖轰腑鏈夊缓绛戠被鍨嬫暟閲� def build_type_count = 0 - //有小区库名的房号数量 + //鏈夊皬鍖哄簱鍚嶇殑鎴垮彿鏁伴噺 def loudong_dis_count = 0 try { DbUtils.seaweed.find(query, fields).each { dis -> @@ -977,7 +977,7 @@ class CityInfoAnaBatch extends BaseBatch { DBObject updateObj = new BasicDBObject("house_loudong_detail", detail).append("district_has_fanghao", hasHouseMap.size()) CITY_INFO_CONN.update(q, new BasicDBObject('$set', updateObj)) - println "${DateUtil.formatToTightYYYYMMDDhhmmss(new Date())}\t[$city] 有房号的小区数覆盖率统计完成" + println "${DateUtil.formatToTightYYYYMMDDhhmmss(new Date())}\t[$city] 鏈夋埧鍙风殑灏忓尯鏁拌鐩栫巼缁熻瀹屾垚" } def findCurInfo(def city, def weekend) { @@ -1361,7 +1361,7 @@ class CityInfoAnaBatch extends BaseBatch { boolean findDistrictsHasFanghao(DBObject dbObject) { boolean find = false def count = 0 - //由于查询比较耗时,为防止出错,最多进行三次查询 + //鐢变簬鏌ヨ姣旇緝鑰楁椂锛屼负闃叉鍑洪敊锛屾渶澶氳繘琛屼笁娆℃煡璇� while (count < 3) { try { find = findInHouseLoudong(dbObject.city, dbObject.region, dbObject.name) @@ -1385,7 +1385,7 @@ class CityInfoAnaBatch extends BaseBatch { def findDistrictsHasLoudong(DBObject dbObject) { boolean find = false def count = 0 - //由于查询比较耗时,为防止出错,最多进行三次查询 + //鐢变簬鏌ヨ姣旇緝鑰楁椂锛屼负闃叉鍑洪敊锛屾渶澶氳繘琛屼笁娆℃煡璇� while (count < 3) { try { find = findInLoudong(dbObject.city, dbObject.region, dbObject.name) @@ -1483,7 +1483,7 @@ class CityInfoAnaBatch extends BaseBatch { return loudongDetail; } - def CONTAINS_KWS = ["...", "暂无", "待定", "未知"] + def CONTAINS_KWS = ["...", "鏆傛棤", "寰呭畾", "鏈煡"] def EQUALS_KWS = ["0.0", "-", "0.00", "0", "."] def isValid(def value) { if (!value) { @@ -1517,7 +1517,7 @@ class CityInfoAnaBatch extends BaseBatch { def findOfficeRent(cityName){ def query = new BasicDBObject(); query.put('city', cityName); -// query.put('kind', '写字楼'); +// query.put('kind', '鍐欏瓧妤�'); // query.put('weekend', weekend); // def officeRents = RENT_STAT_CONN.distinct("name", query); // if (officeRents) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/CityInfoExtendBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/CityInfoExtendBatch.groovy index 0957bda7a..b46bc54f0 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/CityInfoExtendBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/CityInfoExtendBatch.groovy @@ -18,7 +18,7 @@ import com.mongodb.Mongo import java.util.concurrent.CountDownLatch /** - * 统计有楼栋的小区数量和有房号的小区数量 + * 缁熻鏈夋ゼ鏍嬬殑灏忓尯鏁伴噺鍜屾湁鎴垮彿鐨勫皬鍖烘暟閲� * Created by linxsh on 2017/2/14. */ class CityInfoExtendBatch extends BaseBatch { @@ -34,10 +34,10 @@ class CityInfoExtendBatch extends BaseBatch { @Override void process(Object args) { - // 当期周末 + // 褰撴湡鍛ㄦ湯 Date weekend = getWeekend() - println "${DateUtil.formatToTightYYYYMMDDhhmmss(new Date())}\t开始统计有楼栋的小区数" - // 所有城市 + println "${DateUtil.formatToTightYYYYMMDDhhmmss(new Date())}\t寮�濮嬬粺璁℃湁妤兼爧鐨勫皬鍖烘暟" + // 鎵�鏈夊煄甯� final def CITYS = []; DBObject cityQuery = new BasicDBObject('status', new BasicDBObject('$in', [0, 2])) SERVER_AREA_CONN.find(cityQuery).each { CITYS << it.display} @@ -111,7 +111,7 @@ class CityInfoExtendBatch extends BaseBatch { query.put("weekend", weekend); DBObject updateObj = new BasicDBObject('districts_has_loudong', loudongCount).append('district_has_fanghao', fanghaoCount).append('city', city).append('weekend', weekend) CITY_INFO_CONN.update(query, new BasicDBObject('$set', updateObj), true, false) - println "${DateUtil.formatToTightYYYYMMDDhhmmss(new Date())}\t[$city] 有楼栋的小区数统计完成" + println "${DateUtil.formatToTightYYYYMMDDhhmmss(new Date())}\t[$city] 鏈夋ゼ鏍嬬殑灏忓尯鏁扮粺璁″畬鎴�" } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/DistrictInfoAnaBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/DistrictInfoAnaBatch.groovy index b2af062ab..122cd8716 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/DistrictInfoAnaBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/DistrictInfoAnaBatch.groovy @@ -36,17 +36,17 @@ class DistrictInfoAnaBatch extends BaseBatch { @Override public void process(Object args) { - // 所有城市 + // 鎵�鏈夊煄甯� def allCitys = []; SERVER_AREA_CONN.find(new BasicDBObject('status', new BasicDBObject('$in', [0, 2]))).each { allCitys << it; } - // 当期周末 + // 褰撴湡鍛ㄦ湯 Date weekend = DateUtil.getFirstDayOfWeek(new Date()); Date laseWeekend = DateUtil.getFirstDayOfWeek(weekend); allCitys.each { doProcess(it, weekend, laseWeekend); - println it.display + " 完成" + println it.display + " 瀹屾垚" } } @@ -62,7 +62,7 @@ class DistrictInfoAnaBatch extends BaseBatch { def allStats = [:]; DBObject query = new BasicDBObject(); query.put('city', cityName); - query.put('estate_type', new BasicDBObject('$in', ["小区", "别墅"])); + query.put('estate_type', new BasicDBObject('$in', ["灏忓尯", "鍒"])); query.put('weekend', weekend); DISTRICT_STAT_CONN.find(query).each { def key = it.city + "_" + it.region + "_" + it.district_name; @@ -101,7 +101,7 @@ class DistrictInfoAnaBatch extends BaseBatch { def region = district.region; def name = district.name; - //removeCurInfo(cityName, region, name, weekend);//此处按city + region + name去删除相同的,会造成这张表与小区列表数量不一致(原因:重复) + //removeCurInfo(cityName, region, name, weekend);//姝ゅ鎸塩ity + region + name鍘诲垹闄ょ浉鍚岀殑锛屼細閫犳垚杩欏紶琛ㄤ笌灏忓尯鍒楄〃鏁伴噺涓嶄竴鑷达紙鍘熷洜锛氶噸澶嶏級 removeCurInfo(district._id.toString(), weekend); def key = cityName + "_" + region + "_" + name; @@ -132,10 +132,10 @@ class DistrictInfoAnaBatch extends BaseBatch { def rs = allRentStats.get(key); if (rs) { rs.each { - if (StringUtils.equals("小区", it.estate_type)) { + if (StringUtils.equals("灏忓尯", it.estate_type)) { avgCount++; avgPriceCount += it.avg_price; - } else if (StringUtils.equals("别墅", it.estate_type)) { + } else if (StringUtils.equals("鍒", it.estate_type)) { villaAvgCount++; villaAvgPriceCount += it.avg_price; } @@ -283,9 +283,9 @@ class DistrictInfoAnaBatch extends BaseBatch { private int parserBuildArea(String buildArea) { int buildAreaNum = 0; if (StringUtils.isNotBlank(buildArea)) { - buildArea = buildArea.replace("暂无资料", ""); + buildArea = buildArea.replace("鏆傛棤璧勬枡", ""); if (StringUtils.isNotBlank(buildArea)) { - String temp_buildArea = patternParse(buildArea, "([0-9\\.]+)[万平方米|平方米|平方|平米|㎡]"); + String temp_buildArea = patternParse(buildArea, "([0-9\\.]+)[涓囧钩鏂圭背|骞虫柟绫硘骞虫柟|骞崇背|銕"); buildAreaNum = isNumber(temp_buildArea, buildArea); } } @@ -307,7 +307,7 @@ class DistrictInfoAnaBatch extends BaseBatch { private static int isNumber(String value, String buildArea) { try { double d = Double.valueOf(value); - if (buildArea.indexOf("万") != -1) { + if (buildArea.indexOf("涓�") != -1) { d = d * 10000; } int a = (int) d; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/DistrictMarge.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/DistrictMarge.groovy index 75b3f2d91..c685e7244 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/DistrictMarge.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/DistrictMarge.groovy @@ -13,7 +13,7 @@ class DistrictMarge { } def run(){ - def result = ExcelUtils.read("E:\\数据导出\\小区确认-处理 (1).xlsx"); + def result = ExcelUtils.read("E:\\鏁版嵁瀵煎嚭\\灏忓尯纭-澶勭悊 (1).xlsx"); def index = 0; for(def row : result){ def left_sid = row[1] @@ -26,14 +26,14 @@ class DistrictMarge { def way = row[17] index++; - println "[${index}] "+way - if(way == "合并左主"){ + println "[${index}]銆�"+way + if(way == "鍚堝苟宸︿富"){ margeLeft(left_sid, left_name, left_alias, right_sid, right_name, right_alias); - }else if(way == "合并右主"){ + }else if(way == "鍚堝苟鍙充富"){ margeRight(left_sid, left_name, left_alias, right_sid, right_name, right_alias); - }else if(way == "清除别名"){ + }else if(way == "娓呴櫎鍒悕"){ clearAlias(left_sid, left_name, left_alias, right_sid, right_name, right_alias); @@ -68,9 +68,9 @@ class DistrictMarge { } } } - //修改合并别名 + //淇敼鍚堝苟鍒悕 updateDB(right_sid, right_alias) - //删除已合并的小区 + //鍒犻櫎宸插悎骞剁殑灏忓尯 deleteDistrict(left_sid); } @@ -99,9 +99,9 @@ class DistrictMarge { } } } - //修改合并别名 + //淇敼鍚堝苟鍒悕 updateDB(left_sid, left_alias) - //删除已合并的小区 + //鍒犻櫎宸插悎骞剁殑灏忓尯 deleteDistrict(right_sid); } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/DistrictNameMapMatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/DistrictNameMapMatch.groovy index 58eebf8a7..4882e5a5f 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/DistrictNameMapMatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/DistrictNameMapMatch.groovy @@ -19,13 +19,13 @@ import java.util.concurrent.TimeUnit class DistrictNameMapMatch { - def cityCodeMap = ["襄阳":"420600","吉林":"220200","无锡":"320200","朝阳":"211300","沧州":"130000","东营":"370000","上海":"310000","德州":"371400", - "亳州":"341600","安庆":"340800","六安":"341500","宁德":"350900","三沙":"460300", - "临沧":"530900","拉萨":"540100","南充":"511300","泸州":"510500","上海":"330400", - "北京":"110000","天津":"120000","南京":"320100","杭州":"330100","广州":"440100","深圳":"440300","福州":"350100","成都":"510100","随州":"421300", - "资阳":"512000", "乌海":"150300", "邵阳":"430500", "克拉玛依":"650200", "巴彦淖尔":"150800", "荆门":"420800", "来宾":"451300", "开封":"410200", - "信阳":"411500", "固原":"640400","驻马店":"411700", "防城港":"450600","朔州":"140600","铜川":"610200", - "呼伦贝尔":"150700", "双鸭山":"230500",] + def cityCodeMap = ["瑗勯槼":"420600","鍚夋灄":"220200","鏃犻敗":"320200","鏈濋槼":"211300","娌у窞":"130000","涓滆惀":"370000","涓婃捣":"310000","寰峰窞":"371400", + "浜冲窞":"341600","瀹夊簡":"340800","鍏畨":"341500","瀹佸痉":"350900","涓夋矙":"460300", + "涓存钵":"530900","鎷夎惃":"540100","鍗楀厖":"511300","娉稿窞":"510500","涓婃捣":"330400", + "鍖椾含":"110000","澶╂触":"120000","鍗椾含":"320100","鏉窞":"330100","骞垮窞":"440100","娣卞湷":"440300","绂忓窞":"350100","鎴愰兘":"510100","闅忓窞":"421300", + "璧勯槼":"512000", "涔屾捣":"150300", "閭甸槼":"430500", "鍏嬫媺鐜涗緷":"650200", "宸村溅娣栧皵":"150800", "鑽嗛棬":"420800", "鏉ュ":"451300", "寮�灏�":"410200", + "淇¢槼":"411500", "鍥哄師":"640400","椹婚┈搴�":"411700", "闃插煄娓�":"450600","鏈斿窞":"140600","閾滃窛":"610200", + "鍛间鸡璐濆皵":"150700", "鍙岄腑灞�":"230500",] public static void main(String[] args) { @@ -43,14 +43,14 @@ class DistrictNameMapMatch { } def run(){ - def allCity = ["黄石","海口","郑州","武汉","宁波"]//CommonUtils.findAllCity(); + def allCity = ["榛勭煶","娴峰彛","閮戝窞","姝︽眽","瀹佹尝"]//CommonUtils.findAllCity(); def fields = ["city","region","name","sid","address"] //ExecutorService executorService = Executors.newFixedThreadPool(10) //def rets = Collections.synchronizedList([]) - //武汉,郑州,海口,黄石,宁波 + //姝︽眽,閮戝窞,娴峰彛,榛勭煶,瀹佹尝 def cityIndex = 0; for(def city : allCity){ cityIndex++; @@ -58,7 +58,7 @@ class DistrictNameMapMatch { def rets = []; def rows = []; - rows << ["城市","区域","小区名称","小区地址","百度地图小区名","百度地图地址","高德地图区域","高德地图小区名","高德地图地址","腾讯地图区域","腾讯地图小区名","腾讯地图地址" ] + rows << ["鍩庡競","鍖哄煙","灏忓尯鍚嶇О","灏忓尯鍦板潃","鐧惧害鍦板浘灏忓尯鍚�","鐧惧害鍦板浘鍦板潃","楂樺痉鍦板浘鍖哄煙","楂樺痉鍦板浘灏忓尯鍚�","楂樺痉鍦板浘鍦板潃","鑵捐鍦板浘鍖哄煙","鑵捐鍦板浘灏忓尯鍚�","鑵捐鍦板浘鍦板潃" ] def ret = CommonDatautils.findAllDistricts(city, "district", fields); def districts = []; @@ -132,8 +132,8 @@ class DistrictNameMapMatch { // executorService.awaitTermination(5, TimeUnit.MINUTES) rows.addAll(rets); - //ExcelUtils.write("D:\\数据\\结果\\地图数据-包含("+city+").xlsx", rows, "详情") - ExcelUtils.write("D:\\数据\\结果\\地图数据\\地图数据("+city+").xlsx", rows, "详情") + //ExcelUtils.write("D:\\鏁版嵁\\缁撴灉\\鍦板浘鏁版嵁-鍖呭惈("+city+").xlsx", rows, "璇︽儏") + ExcelUtils.write("D:\\鏁版嵁\\缁撴灉\\鍦板浘鏁版嵁\\鍦板浘鏁版嵁("+city+").xlsx", rows, "璇︽儏") } println "finish:"+new Date() } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/DistrictNetworkPriceTaskBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/DistrictNetworkPriceTaskBatch.groovy index 18f49ead0..95c332827 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/DistrictNetworkPriceTaskBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/DistrictNetworkPriceTaskBatch.groovy @@ -12,7 +12,7 @@ import com.mongodb.BasicDBObject import com.mongodb.DBCollection import com.mongodb.DBObject /** - * 处理人工编辑三家网站关联时,云估价与房估估的价格与小区名称 + * 澶勭悊浜哄伐缂栬緫涓夊缃戠珯鍏宠仈鏃讹紝浜戜及浠蜂笌鎴夸及浼扮殑浠锋牸涓庡皬鍖哄悕绉� * @author gaojuan * */ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/ExportNotInSeaweed.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/ExportNotInSeaweed.groovy index e746d04eb..4aed840e5 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/ExportNotInSeaweed.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/ExportNotInSeaweed.groovy @@ -18,9 +18,9 @@ import com.mongodb.* import com.fangjia.script.util.ExcelUtils; class ExportNotInSeaweed{ - //云估价 + //浜戜及浠� static DBCollection wx_gujia_proj_coll = MongoUtils.getCollectionByName("fangjia", "wx_gujia_proj", "192.168.0.61") - //房估估 + //鎴夸及浼� static DBCollection fanggugu_data_coll = MongoUtils.getCollectionByName("fangjia_tmp", "fanggugu_data", "192.168.0.61") static final DBCollection NETWORK_PRICE_COLL = MongoUtils.getCollectionByName("fangjia_stat", "district_network_price", "mongo.db.fangjia.com") @@ -35,7 +35,7 @@ class ExportNotInSeaweed{ def cat = "district"; def result = [] - result << ["城市","区域","小区名","小区自增编号","小区编号","房估估小区编号","房估估小区名称","云估价小区编号","云估价小区名称"] + result << ["鍩庡競","鍖哄煙","灏忓尯鍚�","灏忓尯鑷缂栧彿","灏忓尯缂栧彿","鎴夸及浼板皬鍖虹紪鍙�","鎴夸及浼板皬鍖哄悕绉�","浜戜及浠峰皬鍖虹紪鍙�","浜戜及浠峰皬鍖哄悕绉�"] for(def city : allCity){ def rets = findNetworkPriceByCity(city); @@ -77,22 +77,22 @@ class ExportNotInSeaweed{ println city +" "+rets.size() + " "+ result.size(); } - ExcelUtils.write("d:\\数据\\结果\\三家映射不存在.xlsx", result, "小区") + ExcelUtils.write("d:\\鏁版嵁\\缁撴灉\\涓夊鏄犲皠涓嶅瓨鍦�.xlsx", result, "灏忓尯") } def findDistrict(def city, def region, def distName, def cat){ - //查询房价网是否存在该小区 + //鏌ヨ鎴夸环缃戞槸鍚﹀瓨鍦ㄨ灏忓尯 def dbo = CommonDatautils.findSeaweed(city, region, distName, cat); if(!dbo){ - //别名 + //鍒悕 def result = CommonDatautils.findDistrictByAlias(city, region, distName, cat); if(result){ dbo = findSameName(result, distName); } - //地址 + //鍦板潃 if(!dbo){ result = CommonDatautils.findSeaweedByAddress(city, region, distName, cat) if(result){ @@ -157,17 +157,17 @@ class ExportNotInSeaweed{ disName = projectname } -// if(disName.contains("(")||disName.contains("(")){ +// if(disName.contains("锛�")||disName.contains("(")){ // def temp = null; -// if(disName.contains("(")){ -// temp = disName.substring(disName.indexOf("(")+1, disName.length()-1) +// if(disName.contains("锛�")){ +// temp = disName.substring(disName.indexOf("锛�")+1, disName.length()-1) // } // if(disName.contains("(")){ // temp = disName.substring(disName.indexOf("(")+1,disName.length()-1) // } // -// if(temp.contains("期")||temp.contains("别墅")){ -// disName = disName.replace("(", "").replace(")", "").replace("(", "").replace(")", "") +// if(temp.contains("鏈�")||temp.contains("鍒")){ +// disName = disName.replace("锛�", "").replace("锛�", "").replace("(", "").replace(")", "") // }else{ // // disName = disName.substring(0, disName.lastIndexOf(temp)-1) @@ -185,16 +185,16 @@ class ExportNotInSeaweed{ if (region && disName) { - //查询房价网是否存在该小区 + //鏌ヨ鎴夸环缃戞槸鍚﹀瓨鍦ㄨ灏忓尯 def dbo = CommonDatautils.findSeaweed(city, region, disName, cat); if(!dbo){ - //别名 + //鍒悕 def result = CommonDatautils.findDistrictByAlias(city, region, disName, cat); if(result){ dbo = findSameName(result, disName); } - //地址 + //鍦板潃 if(!dbo){ result = CommonDatautils.findSeaweedByAddress(city, region, disName, cat) if(result){ @@ -229,7 +229,7 @@ class ExportNotInSeaweed{ if(dbo){ - println "[${index}][云估价(已匹配)]:"+region+" "+ disName +" projectid:"+o.projectid+" [${dbo.region}-${dbo.name}]" + println "[${index}][浜戜及浠凤紙宸插尮閰嶏級]:"+region+" "+ disName +" projectid:"+o.projectid+" [${dbo.region}-${dbo.name}]" }else{ def newObject = [] newObject << city @@ -254,11 +254,11 @@ class ExportNotInSeaweed{ String region = RegionData.formatRegion(city , o.get("districtFullName_en") == null ? o.get("districtFullName") : o.get("districtFullName_en")) index++; if(region && disName){ - //查询房价网是否存在该小区 + //鏌ヨ鎴夸环缃戞槸鍚﹀瓨鍦ㄨ灏忓尯 def dbo = CommonDatautils.findSeaweed(city, region, disName, cat); if(!dbo){ dbo = CommonDatautils.findDistrictByAlias(city, region, disName, cat); - //地址 + //鍦板潃 if(!dbo){ def result = CommonDatautils.findSeaweedByAddress(city, region, disName, cat) if(result){ @@ -288,7 +288,7 @@ class ExportNotInSeaweed{ } if(dbo){ - println "[${index}][房估估(已匹配)]:"+region+" "+ disName +" "+o.residentialareaId + println "[${index}][鎴夸及浼帮紙宸插尮閰嶏級]:"+region+" "+ disName +" "+o.residentialareaId }else{ def newObject = [] newObject << city diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/FangguguAddressProcess.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/FangguguAddressProcess.groovy index 6108cf4a7..609c19da1 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/FangguguAddressProcess.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/FangguguAddressProcess.groovy @@ -18,9 +18,9 @@ class FangguguAddressProcess { } def run(){ - def file = "C:\\Users\\gaojuan\\Downloads\\房估估房价网都存在小区-_已处理_3.xlsx" + def file = "C:\\Users\\gaojuan\\Downloads\\鎴夸及浼版埧浠风綉閮藉瓨鍦ㄥ皬鍖�-_宸插鐞哶3.xlsx" def rets = []; - rets << ["城市","区域","小区名","地址","SID","包含地址","库中小区名","库中地址","格式化地址","否是精准地址","人工判断是否是精准地址"] + rets << ["鍩庡競","鍖哄煙","灏忓尯鍚�","鍦板潃","SID","鍖呭惈鍦板潃","搴撲腑灏忓尯鍚�","搴撲腑鍦板潃","鏍煎紡鍖栧湴鍧�","鍚︽槸绮惧噯鍦板潃","浜哄伐鍒ゆ柇鏄惁鏄簿鍑嗗湴鍧�"] def rows = ExcelUtils.read(file); @@ -44,15 +44,15 @@ class FangguguAddressProcess { } rets.addAll(rows) - ExcelUtils.write("E:\\数据导出\\房估估房价网都存在小区-_已处理_地址3.xlsx", rets, "住宅") + ExcelUtils.write("E:\\鏁版嵁瀵煎嚭\\鎴夸及浼版埧浠风綉閮藉瓨鍦ㄥ皬鍖�-_宸插鐞哶鍦板潃3.xlsx", rets, "浣忓畢") } def isStrandAddress(def address){ - def keys = ["路","街","巷"] - def returnString = "否" + def keys = ["璺�","琛�","宸�"] + def returnString = "鍚�" for(def key : keys){ - if(address.contains(key) && address.contains("号")){ - returnString = "是" + if(address.contains(key) && address.contains("鍙�")){ + returnString = "鏄�" break; } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/HouseFieldCoverage.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/HouseFieldCoverage.groovy index 0a0f048ef..0ad649c94 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/HouseFieldCoverage.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/HouseFieldCoverage.groovy @@ -27,7 +27,7 @@ class HouseFieldCoverage{ public static void main(String[] args) { def task = new HouseFieldCoverage(); - def city = "常州"; + def city = "甯稿窞"; def start = DateUtils.parseFromTightYYYYMMDD("2017-07-01") def end = DateUtils.parseFromTightYYYYMMDD("2017-08-01") @@ -38,7 +38,7 @@ class HouseFieldCoverage{ def districtHouseStat(city, start, end){ def dbcursor = CommonDatautils.findAllDistricts(city, "district", ["city","region","name","address","alias"]) - println "住宅共:"+dbcursor.count(); + println "浣忓畢鍏憋細"+dbcursor.count(); //def houses = []; def index = 0; def distIndex = 0; @@ -70,17 +70,17 @@ class HouseFieldCoverage{ executorService.shutdown() executorService.awaitTermination(5, TimeUnit.MINUTES) - println "住宅房源共:"+houses.size()+"条 有房源的小区共:"+distIndex+"条"; + println "浣忓畢鎴挎簮鍏憋細"+houses.size()+"鏉� 鏈夋埧婧愮殑灏忓尯鍏憋細"+distIndex+"鏉�"; def resultMap = statFieldCoverage(houses); printResult(resultMap); - createReport(resultMap,"住宅"); + createReport(resultMap,"浣忓畢"); } def shopHouseStat(city, start, end){ def dbcursor = CommonDatautils.findAllDistricts(city, "shop", ["city","region","name","address","alias"]) def houses = [] - println "商铺共:"+dbcursor.size(); + println "鍟嗛摵鍏憋細"+dbcursor.size(); def shops = []; @@ -100,13 +100,13 @@ class HouseFieldCoverage{ } } - println "商铺房源共:"+houses.size()+"条 有房源的商铺共:"+shopIndex+"个"; + println "鍟嗛摵鎴挎簮鍏憋細"+houses.size()+"鏉� 鏈夋埧婧愮殑鍟嗛摵鍏憋細"+shopIndex+"涓�"; - //writeExcel(houses, "商铺"); + //writeExcel(houses, "鍟嗛摵"); def resultMap = statFieldCoverage(houses); printResult(resultMap); - createReport(resultMap,"商铺"); + createReport(resultMap,"鍟嗛摵"); } def createReport(resultMap, sheetName){ @@ -127,7 +127,7 @@ class HouseFieldCoverage{ row << v rows << row } - ExcelUtils.write("d:\\数据\\结果\\常州房源统计.xls", rows, sheetName) + ExcelUtils.write("d:\\鏁版嵁\\缁撴灉\\甯稿窞鎴挎簮缁熻.xls", rows, sheetName) } def printResult(resultMap){ @@ -175,7 +175,7 @@ class HouseFieldCoverage{ rows << fileds.asList() rows.addAll(rets) - ExcelUtils.write("d:\\数据\\结果\\常州房源.xls", rows, sheetName) + ExcelUtils.write("d:\\鏁版嵁\\缁撴灉\\甯稿窞鎴挎簮.xls", rows, sheetName) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/KeKouKeLeData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/KeKouKeLeData.groovy index f135235ba..6fbc6de44 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/KeKouKeLeData.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/KeKouKeLeData.groovy @@ -30,12 +30,12 @@ class KeKouKeLeData { } def run(){ - def citys = readTxt("E:\\高娟\\可口可乐城市.txt") - def city70s = readTxt("E:\\高娟\\70个城市.txt") - def roads = readExcel("e:\\高娟\\可口可乐\\路号.xlsx"); + def citys = readTxt("E:\\楂樺\\鍙彛鍙箰鍩庡競.txt") + def city70s = readTxt("E:\\楂樺\\70涓煄甯�.txt") + def roads = readExcel("e:\\楂樺\\鍙彛鍙箰\\璺彿.xlsx"); def retMap = coverMap(roads); // for(def city : citys){ -// city = city.replace("市",""); +// city = city.replace("甯�",""); // if(!city70s.contains(city)){ // println city // } @@ -46,7 +46,7 @@ class KeKouKeLeData { def map = [:]; map.city = city; - city = city.replace("市",""); + city = city.replace("甯�",""); def dbo = findCover(city); map.district_count = dbo.existing_district_count; map.price_coverage = DataHandleUtils.getDoubleRound(2,dbo.price_coverage*100); @@ -71,7 +71,7 @@ class KeKouKeLeData { ret << map; } - exportExcel(ret, "e:\\高娟\\可口可乐\\覆盖率.xls"); + exportExcel(ret, "e:\\楂樺\\鍙彛鍙箰\\瑕嗙洊鐜�.xls"); } @@ -84,21 +84,21 @@ class KeKouKeLeData { FileOutputStream fos = null; try { HSSFWorkbook WORK_BOOK = new HSSFWorkbook(); - HSSFSheet sheet = WORK_BOOK.createSheet("覆盖率"); + HSSFSheet sheet = WORK_BOOK.createSheet("瑕嗙洊鐜�"); HSSFRow row0 = sheet.createRow(0); - row0.createCell(0).setCellValue("城市"); - row0.createCell(1).setCellValue("小区数量"); - row0.createCell(2).setCellValue("行政区"); - row0.createCell(3).setCellValue("道路"); - row0.createCell(4).setCellValue("门牌号"); - row0.createCell(5).setCellValue("建筑年代"); - row0.createCell(6).setCellValue("经度坐标"); - row0.createCell(7).setCellValue("纬度坐标"); - row0.createCell(8).setCellValue("开发商"); - row0.createCell(9).setCellValue("平均单价"); - row0.createCell(10).setCellValue("平均租金"); - row0.createCell(11).setCellValue("户数"); + row0.createCell(0).setCellValue("鍩庡競"); + row0.createCell(1).setCellValue("灏忓尯鏁伴噺"); + row0.createCell(2).setCellValue("琛屾斂鍖�"); + row0.createCell(3).setCellValue("閬撹矾"); + row0.createCell(4).setCellValue("闂ㄧ墝鍙�"); + row0.createCell(5).setCellValue("寤虹瓚骞翠唬"); + row0.createCell(6).setCellValue("缁忓害鍧愭爣"); + row0.createCell(7).setCellValue("绾害鍧愭爣"); + row0.createCell(8).setCellValue("寮�鍙戝晢"); + row0.createCell(9).setCellValue("骞冲潎鍗曚环"); + row0.createCell(10).setCellValue("骞冲潎绉熼噾"); + row0.createCell(11).setCellValue("鎴锋暟"); for(def i=0;i - def city = map.get("城市"); - def region = map.get("区域").replace(" ", ""); - def name = map.get("名称").replace(" ", ""); - def address = map.get("标准地址").replace(" ", ""); + def city = map.get("鍩庡競"); + def region = map.get("鍖哄煙").replace(" ", ""); + def name = map.get("鍚嶇О").replace(" ", ""); + def address = map.get("鏍囧噯鍦板潃").replace(" ", ""); def key = city + "#"+region+"#"+name; retMap.put(key, address); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/LianjiaAnalyBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/LianjiaAnalyBatch.groovy index 4483318e5..9ebaabb00 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/LianjiaAnalyBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/LianjiaAnalyBatch.groovy @@ -21,7 +21,7 @@ import org.apache.poi.hssf.usermodel.HSSFWorkbook import org.apache.poi.hssf.util.CellRangeAddress import org.apache.poi.ss.usermodel.CellStyle /** - * 与链家数据的差比 + * 涓庨摼瀹舵暟鎹殑宸瘮 * @author gaojuan * */ @@ -48,11 +48,11 @@ class LianjiaAnalyBatch extends BaseBatch{ for(def city : allCitys){ index++ println "[${index}] "+city; - def datas = findAllDatas(city, date.toInteger()); //第三方数据线上 - //def datas = findAllDatasTest(city, date.toInteger()); //第三方数据线下 + def datas = findAllDatas(city, date.toInteger()); //绗笁鏂规暟鎹嚎涓� + //def datas = findAllDatasTest(city, date.toInteger()); //绗笁鏂规暟鎹嚎涓� if(datas){ def resultMap = priceRangeGroup(datas); - println "跟链家对比有数据的记录数:"+datas.size()+" "+resultMap + println "璺熼摼瀹跺姣旀湁鏁版嵁鐨勮褰曟暟锛�"+datas.size()+" "+resultMap if(resultMap){ saveDatas(city, weekend, resultMap); } @@ -61,14 +61,14 @@ class LianjiaAnalyBatch extends BaseBatch{ } // def rets = findAllRows(); -// exportExcel("D:\\数据\\结果\\链家对比价.xls", rets); +// exportExcel("D:\\鏁版嵁\\缁撴灉\\閾惧瀵规瘮浠�.xls", rets); // synchLianjiaData(weekend, date); } - //查询有链家数据的记录 + //鏌ヨ鏈夐摼瀹舵暟鎹殑璁板綍 def findAllDatas(city, stat_date){ DBObject q = new BasicDBObject() q.put("city", city); @@ -90,7 +90,7 @@ class LianjiaAnalyBatch extends BaseBatch{ } - //查询有链家数据的记录 + //鏌ヨ鏈夐摼瀹舵暟鎹殑璁板綍 def findAllDatasTest(city, stat_date){ DBObject q = new BasicDBObject() q.put("city", city); @@ -258,14 +258,14 @@ class LianjiaAnalyBatch extends BaseBatch{ FileOutputStream fos = null; try { HSSFWorkbook WORK_BOOK = new HSSFWorkbook(); - HSSFSheet sheet = WORK_BOOK.createSheet("数据"); + HSSFSheet sheet = WORK_BOOK.createSheet("鏁版嵁"); HSSFRow row0 = sheet.createRow(0); - row0.createCell(0).setCellValue("城市") + row0.createCell(0).setCellValue("鍩庡競") sheet.addMergedRegion(new CellRangeAddress(0, 1, 0, 0)); - //row0.createCell(1).setCellValue("链家有均价的小区匹配数") + //row0.createCell(1).setCellValue("閾惧鏈夊潎浠风殑灏忓尯鍖归厤鏁�") //sheet.addMergedRegion(new CellRangeAddress(0, 1, 1, 1)); def weekends = datas.weekends; @@ -277,11 +277,11 @@ class LianjiaAnalyBatch extends BaseBatch{ sheet.addMergedRegion(cra); row0.createCell(start).setCellValue(weekends[i]); println start - row1.createCell(start).setCellValue("匹配小区量"); - row1.createCell(start+1).setCellValue("10%以内"); - row1.createCell(start+2).setCellValue("30%以内"); - row1.createCell(start+3).setCellValue("50%以内"); - row1.createCell(start+4).setCellValue("50%以上"); + row1.createCell(start).setCellValue("鍖归厤灏忓尯閲�"); + row1.createCell(start+1).setCellValue("10%浠ュ唴"); + row1.createCell(start+2).setCellValue("30%浠ュ唴"); + row1.createCell(start+3).setCellValue("50%浠ュ唴"); + row1.createCell(start+4).setCellValue("50%浠ヤ笂"); } @@ -336,7 +336,7 @@ class LianjiaAnalyBatch extends BaseBatch{ def synchLianjiaData(def weekend, def sDate){ - def citys = ["上海"] + def citys = ["涓婃捣"] for(def city : citys){ def datas = findLineLianjiaDatas(city, sDate); saveToOffline(datas); @@ -417,7 +417,7 @@ class LianjiaAnalyBatch extends BaseBatch{ OFFLINE_LABOR_COLL.update(new BasicDBObject("_id", dbo._id), new BasicDBObject('$set', update)) }else{ - println dbo.region + "#"+dbo.name+" 无价格......." + println dbo.region + "#"+dbo.name+" 鏃犱环鏍�......." } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/LianjiaAndFjwPriceTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/LianjiaAndFjwPriceTest.groovy index 8d6380d41..ea3e9caf8 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/LianjiaAndFjwPriceTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/LianjiaAndFjwPriceTest.groovy @@ -22,7 +22,7 @@ import org.apache.poi.hssf.util.CellRangeAddress import org.apache.poi.ss.usermodel.CellStyle import com.fangjia.script.common.DataHandleUtils; /** - * 与链家数据的差比 + * 涓庨摼瀹舵暟鎹殑宸瘮 * @author gaojuan * */ @@ -40,10 +40,10 @@ class LianjiaAndFjwPriceTest{ static main(args) { def task = new LianjiaAndFjwPriceTest(); - def city = "成都" + def city = "鎴愰兘" task.synchData(city); //task.run(); - //task.isCaluteFinish("上海"); + //task.isCaluteFinish("涓婃捣"); } def synchData(city){ @@ -64,38 +64,38 @@ class LianjiaAndFjwPriceTest{ def run(){ - def citys = ["成都"] + def citys = ["鎴愰兘"] def weekend = DateUtils.getFirstDayOfWeek(new Date()); String date = DateUtils.formatDateByPattern(weekend, "yyyyMM"); def params = getParamsGroup() - println "参数共:"+params.size()+" 种组合" + println "鍙傛暟鍏憋細"+params.size()+" 绉嶇粍鍚�" for(def city: citys){ - println "【${city}】starting..........." - //查询链家与房价网都存在的小区 + println "銆�${city}銆憇tarting..........." + //鏌ヨ閾惧涓庢埧浠风綉閮藉瓨鍦ㄧ殑灏忓尯 def ljDistricts = findLianjiaCoexistDistrict(city, date) - println "查询链家与房价网都存在的小区共:"+ljDistricts.size() - //链家数据保存 + println "鏌ヨ閾惧涓庢埧浠风綉閮藉瓨鍦ㄧ殑灏忓尯鍏憋細"+ljDistricts.size() + //閾惧鏁版嵁淇濆瓨 //saveToTempTable(ljDistricts); for(def paramMap : params){ - //计算参数修改 + //璁$畻鍙傛暟淇敼 updateAvgpriceParams(city, paramMap); refreshParams(); - println "设置参数:"+paramMap - //需重算小区 + println "璁剧疆鍙傛暟锛�"+paramMap + //闇�閲嶇畻灏忓尯 addCaluateDist(ljDistricts); - println "设入要重算的小区完成......" + println "璁惧叆瑕侀噸绠楃殑灏忓尯瀹屾垚......" - //判断均价是否结束 + //鍒ゆ柇鍧囦环鏄惁缁撴潫 def finish = isCaluteFinish(city) - //统计结果 + //缁熻缁撴灉 if(finish){ caluatePriceResult(city, weekend, date,paramMap); } - println "统计结果完成....." + println "缁熻缁撴灉瀹屾垚....." println "**************************************************" } @@ -151,8 +151,8 @@ class LianjiaAndFjwPriceTest{ q.put("city", city); DBObject udata = new BasicDBObject() - udata.put("sample_fetch_count", paramMap.house_count)//样本获取数量 - udata.put("uncomforable_sample_day", paramMap.day)//样本换算需要间隔时间 + udata.put("sample_fetch_count", paramMap.house_count)//鏍锋湰鑾峰彇鏁伴噺 + udata.put("uncomforable_sample_day", paramMap.day)//鏍锋湰鎹㈢畻闇�瑕侀棿闅旀椂闂� AVERAGER_CONFIG_COLL.update(q, new BasicDBObject('$set', udata), false, true) } @@ -160,7 +160,7 @@ class LianjiaAndFjwPriceTest{ def isCaluteFinish(city){ - def startFlag = false;//是否开始统计 + def startFlag = false;//鏄惁寮�濮嬬粺璁� while(startFlag==false){ startFlag = findAvgPriceIsFinish(city); if(startFlag == false){ @@ -173,7 +173,7 @@ class LianjiaAndFjwPriceTest{ def caluatePriceResult(city, weekend, date, paramMap){ def priceMap = findDistrictStat(city, weekend); calcuteDiff(city , priceMap); - println "计算diff完成...." + println "璁$畻diff瀹屾垚...." def result = priceRangeGroup(findAllDatasTest(city, date.toInteger())); saveCalcuteResult(city, result, paramMap); } @@ -221,7 +221,7 @@ class LianjiaAndFjwPriceTest{ q.put("status", 4); def dbCursor2 = CommonUtils.COMMAND_COLL.find(q); def count2 = dbCursor2.count(); - println "共:"+count1 + " error:"+count2 + println "鍏憋細"+count1 + " error:"+count2 if(count1 == count2){ return true; } @@ -242,7 +242,7 @@ class LianjiaAndFjwPriceTest{ priceMap.put(key, dbo.avg_price); } } - println "查均价:"+priceMap.size() + println "鏌ュ潎浠凤細"+priceMap.size() return priceMap; } @@ -283,7 +283,7 @@ class LianjiaAndFjwPriceTest{ } - //查询有链家数据的记录 + //鏌ヨ鏈夐摼瀹舵暟鎹殑璁板綍 def findAllDatasTest(city, stat_date){ DBObject q = new BasicDBObject() q.put("city", city); @@ -334,7 +334,7 @@ class LianjiaAndFjwPriceTest{ def new_values = [] for(def dbo : datas){ - //原二手房均价 + //鍘熶簩鎵嬫埧鍧囦环 if(dbo.lianjia_esf_price && dbo.lianjia_esf_diff){ esf_total_count++; int lianjia_esf_diff = Math.abs(dbo.lianjia_esf_diff)*100; @@ -353,7 +353,7 @@ class LianjiaAndFjwPriceTest{ } } - //新二手房均价 + //鏂颁簩鎵嬫埧鍧囦环 if(dbo.lianjia_esf_price && dbo.new_lianjia_esf_diff){ new_esf_total_count++; int new_lianjia_esf_diff = Math.abs(dbo.new_lianjia_esf_diff)*100; @@ -371,7 +371,7 @@ class LianjiaAndFjwPriceTest{ } } } - //新房老均价 + //鏂版埧鑰佸潎浠� /*if(dbo.lianjia_new_price && dbo.lianjia_new_diff){ new_total_count++ int lianjia_new_diff = Math.abs(dbo.lianjia_new_diff)*100; @@ -387,7 +387,7 @@ class LianjiaAndFjwPriceTest{ } } } - //新房新均价 + //鏂版埧鏂板潎浠� if(dbo.lianjia_new_price && dbo.new_lianjia_new_diff){ new_new_total_count++ int new_lianjia_new_diff = Math.abs(dbo.new_lianjia_new_diff)*100; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/LianjiaAvgpriceAnalyBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/LianjiaAvgpriceAnalyBatch.groovy index 75a5808e5..5af8527d3 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/LianjiaAvgpriceAnalyBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/LianjiaAvgpriceAnalyBatch.groovy @@ -14,7 +14,7 @@ import com.mongodb.QueryOperators import com.fangjia.core.util.DataUtil /** - * 链家与房价网均价差比统计 + * 閾惧涓庢埧浠风綉鍧囦环宸瘮缁熻 * @author gaojuan * */ @@ -143,7 +143,7 @@ class LianjiaAvgpriceAnalyBatch extends BaseBatch{ return result; } - //查询有链家数据的记录 + //鏌ヨ鏈夐摼瀹舵暟鎹殑璁板綍 def findAllDatas(def city, def stat_date){ DBObject q = new BasicDBObject() q.put("city", city); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/NetWorkDistrictConnectionBatch1.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/NetWorkDistrictConnectionBatch1.groovy index 3b56d0ec6..2da1b20e0 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/NetWorkDistrictConnectionBatch1.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/NetWorkDistrictConnectionBatch1.groovy @@ -18,15 +18,15 @@ import com.fangjia.script.util.MongoUtils import com.mongodb.* /** - * 网站小区比对 房估估,云估价,房价网 关联 + * 缃戠珯灏忓尯姣斿銆�鎴夸及浼帮紝浜戜及浠凤紝鎴夸环缃戙��鍏宠仈 * @author gaojuan * */ class NetWorkDistrictConnectionBatch1 extends BaseBatch{ - //云估价 + //浜戜及浠� static DBCollection wx_gujia_proj_coll = MongoUtils.getCollectionByName("fangjia", "wx_gujia_proj", "192.168.0.61") - //房估估 + //鎴夸及浼� static DBCollection fanggugu_data_coll = MongoUtils.getCollectionByName("fangjia_tmp", "fanggugu_data", "192.168.0.61") static DBCollection fanggugu_price_coll = MongoUtils.getCollectionByName("fangjia_tmp", "fanggugu_price2", "192.168.0.61") @@ -58,7 +58,7 @@ class NetWorkDistrictConnectionBatch1 extends BaseBatch{ } /** - * 更新小区网络对比价标示 + * 鏇存柊灏忓尯缃戠粶瀵规瘮浠锋爣绀� * @return */ def updateNetWorkAvgPrice(){ @@ -77,13 +77,13 @@ class NetWorkDistrictConnectionBatch1 extends BaseBatch{ if(dbo.avg_price && dbo.fgg_price){ def diff = Math.abs((dbo.getInt("fgg_price") - dbo.getInt("avg_price"))/dbo.getInt("avg_price")) if(diff < 0.15){ - networkAvgPrice["房"] = new Date() + networkAvgPrice["鎴�"] = new Date() } } if(dbo.avg_price && dbo.ygj_price){ def diff = Math.abs((dbo.getInt("ygj_price") - dbo.getInt("avg_price"))/dbo.getInt("avg_price")) if(diff < 0.15){ - networkAvgPrice["云"] = new Date() + networkAvgPrice["浜�"] = new Date() } } @@ -105,7 +105,7 @@ class NetWorkDistrictConnectionBatch1 extends BaseBatch{ } } if(count % 1000 == 0){ - println("updateNetWorkAvgPrice进度:${count}/${total}") + println("updateNetWorkAvgPrice杩涘害:${count}/${total}") } } @@ -126,7 +126,7 @@ class NetWorkDistrictConnectionBatch1 extends BaseBatch{ // continue; // } def ygj_dis_count = wx_gujia_proj_coll.count(new BasicDBObject("city", city)) - println "[${city}] 云估价:" + ygj_dis_count + println "[${city}] 浜戜及浠凤細" + ygj_dis_count def ygjMap = null; if (ygj_dis_count > 0) { @@ -134,7 +134,7 @@ class NetWorkDistrictConnectionBatch1 extends BaseBatch{ } def fgg_dis_count = fanggugu_data_coll.count(new BasicDBObject("city", city)) - println "[${city}] 房估估:" + fgg_dis_count + println "[${city}] 鎴夸及浼帮細" + fgg_dis_count def fggMap = null; if(fgg_dis_count > 0){ fggMap = findFangguguExistsDistricts(city, cat) @@ -231,17 +231,17 @@ class NetWorkDistrictConnectionBatch1 extends BaseBatch{ disName = projectname } - if(disName.contains("(")||disName.contains("(")){ + if(disName.contains("锛�")||disName.contains("(")){ def temp = null; - if(disName.contains("(")){ - temp = disName.substring(disName.indexOf("(")+1, disName.length()-1) + if(disName.contains("锛�")){ + temp = disName.substring(disName.indexOf("锛�")+1, disName.length()-1) } if(disName.contains("(")){ temp = disName.substring(disName.indexOf("(")+1,disName.length()-1) } - if(temp.contains("期")||temp.contains("别墅")){ - disName = disName.replace("(", "").replace(")", "").replace("(", "").replace(")", "") + if(temp.contains("鏈�")||temp.contains("鍒")){ + disName = disName.replace("锛�", "").replace("锛�", "").replace("(", "").replace(")", "") }else{ disName = disName.substring(0, disName.lastIndexOf(temp)-1) @@ -262,12 +262,12 @@ class NetWorkDistrictConnectionBatch1 extends BaseBatch{ if (region && disName) { - //查询房价网是否存在该小区 + //鏌ヨ鎴夸环缃戞槸鍚﹀瓨鍦ㄨ灏忓尯 def dbo = CommonDatautils.findSeaweed(city, region, disName, cat); if(!dbo){ - //别名 + //鍒悕 dbo = CommonDatautils.findDistrictByAlias(city, region, disName, cat); - //地址 + //鍦板潃 if(!dbo){ def result = CommonDatautils.findSeaweedByAddress(city, region, disName, cat) if(result){ @@ -319,11 +319,11 @@ class NetWorkDistrictConnectionBatch1 extends BaseBatch{ String region = RegionData.formatRegion(city , o.get("districtFullName_en") == null ? o.get("districtFullName") : o.get("districtFullName_en")) if(region && disName){ - //查询房价网是否存在该小区 + //鏌ヨ鎴夸环缃戞槸鍚﹀瓨鍦ㄨ灏忓尯 def dbo = CommonDatautils.findSeaweed(city, region, disName, cat); if(!dbo){ dbo = CommonDatautils.findDistrictByAlias(city, region, disName, cat); - //地址 + //鍦板潃 if(!dbo){ def result = CommonDatautils.findSeaweedByAddress(city, region, disName, cat) if(result){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/OfficeInfoAnaBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/OfficeInfoAnaBatch.groovy index 1bfc156c0..dc0453c77 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/OfficeInfoAnaBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/OfficeInfoAnaBatch.groovy @@ -34,11 +34,11 @@ class OfficeInfoAnaBatch extends BaseBatch { @Override public void process(Object args) { - // 所有城市 + // 鎵�鏈夊煄甯� def allCitys = []; SERVER_AREA_CONN.find(new BasicDBObject('status', new BasicDBObject('$in', [0, 2]))).each { allCitys << it; } - // 当期周末 + // 褰撴湡鍛ㄦ湯 Date weekend = DateUtil.getFirstDayOfWeek(new Date()); Date laseWeekend = DateUtil.getFirstDayOfWeek(weekend); @@ -58,7 +58,7 @@ class OfficeInfoAnaBatch extends BaseBatch { def allStats = [:]; DBObject query = new BasicDBObject(); query.put('city', cityName); - query.put('estate_type', '写字楼'); + query.put('estate_type', '鍐欏瓧妤�'); query.put('weekend', weekend); OFFICE_STAT_CONN.find(query).each { def key = it.city + "_" + it.region + "_" + it.district_name; @@ -68,7 +68,7 @@ class OfficeInfoAnaBatch extends BaseBatch { def allRentStats = [:] query = new BasicDBObject(); query.put('city', cityName); - query.put('kind', '写字楼'); + query.put('kind', '鍐欏瓧妤�'); query.put('weekend', weekend); RENT_STAT_CONN.find(query).each { def key = it.city + "_" + it.region + "_" + it.name; @@ -137,9 +137,9 @@ class OfficeInfoAnaBatch extends BaseBatch { private int parserBuildArea(String buildArea) { int buildAreaNum = 0; if (StringUtils.isNotBlank(buildArea)) { - buildArea = buildArea.replace("暂无资料", ""); + buildArea = buildArea.replace("鏆傛棤璧勬枡", ""); if (StringUtils.isNotBlank(buildArea)) { - String temp_buildArea = patternParse(buildArea, "([0-9\\.]+)[万平方米|平方米|平方|平米|㎡]"); + String temp_buildArea = patternParse(buildArea, "([0-9\\.]+)[涓囧钩鏂圭背|骞虫柟绫硘骞虫柟|骞崇背|銕"); buildAreaNum = isNumber(temp_buildArea, buildArea); } } @@ -173,7 +173,7 @@ class OfficeInfoAnaBatch extends BaseBatch { private static int isNumber(String value, String buildArea) { try { double d = Double.valueOf(value); - if (buildArea.indexOf("万") != -1) { + if (buildArea.indexOf("涓�") != -1) { d = d * 10000; } int a = (int) d; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/OtherNetworkDistictStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/OtherNetworkDistictStat.groovy index 496e70a9d..915412028 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/OtherNetworkDistictStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/OtherNetworkDistictStat.groovy @@ -8,11 +8,11 @@ import com.fangjia.script.util.ExcelUtils import com.fangjia.core.RegionData class OtherNetworkDistictStat { - //云估价 + //浜戜及浠� static DBCollection wx_gujia_proj_coll = MongoUtils.getCollectionByName("fangjia", "wx_gujia_proj", "192.168.0.61") - //房估估 + //鎴夸及浼� static DBCollection fanggugu_data_coll = MongoUtils.getCollectionByName("fangjia_tmp", "fanggugu_data", "192.168.0.61") - //优房闪贷 + //浼樻埧闂捶 static DBCollection yfsd_data_coll = MongoUtils.getCollectionByName("building", "yfsd_district", "192.168.0.61") static main(args) { @@ -21,10 +21,10 @@ class OtherNetworkDistictStat { } def run(){ - def citys = ["临汾","朔州","忻州","晋中","阳泉","运城","长治","吕梁","大同"] + def citys = ["涓存本","鏈斿窞","蹇诲窞","鏅嬩腑","闃虫硥","杩愬煄","闀挎不","鍚曟","澶у悓"] def result = []; - result << ["城市","云估价小区量","房估估小区量","优房闪贷小区量"] + result << ["鍩庡競","浜戜及浠峰皬鍖洪噺","鎴夸及浼板皬鍖洪噺","浼樻埧闂捶灏忓尯閲�"] def rows = []; for(def city : citys){ @@ -37,7 +37,7 @@ class OtherNetworkDistictStat { rows << rets; } result.addAll(rows) - ExcelUtils.write("d:\\数据\\结果\\竞争对手数据量统计.xls", result, "统计") + ExcelUtils.write("d:\\鏁版嵁\\缁撴灉\\绔炰簤瀵规墜鏁版嵁閲忕粺璁�.xls", result, "缁熻") } def queryYfsdCount(city){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/RegionInfoAnaBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/RegionInfoAnaBatch.groovy index 5ea2349d6..48a837e25 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/RegionInfoAnaBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/RegionInfoAnaBatch.groovy @@ -32,7 +32,7 @@ class RegionInfoAnaBatch extends BaseBatch { @Override public void process(Object args) { - // 所有城市下区域的人口信息 + // 鎵�鏈夊煄甯備笅鍖哄煙鐨勪汉鍙d俊鎭� def allHouseStats = [:]; HOUSE_STAT_CONN.find().each { def regionStats = allHouseStats.get(it.city); @@ -48,13 +48,13 @@ class RegionInfoAnaBatch extends BaseBatch { rateMap.put(it.city, it.rate); } - // 所有城市 + // 鎵�鏈夊煄甯� def allCitys = []; SERVER_AREA_CONN.find(new BasicDBObject('status', new BasicDBObject('$in', [0, 2]))).each { allCitys << it; } - // 当期周末 + // 褰撴湡鍛ㄦ湯 Date weekend = DateUtil.getFirstDayOfWeek(new Date()); - //周日开始跑,需要跑加上7天,周一跑不需要 + //鍛ㄦ棩寮�濮嬭窇锛岄渶瑕佽窇鍔犱笂7澶╋紝鍛ㄤ竴璺戜笉闇�瑕� weekend = DateUtil.add(weekend, 7) Date laseWeekend = DateUtil.getFirstDayOfWeek(weekend); @@ -79,7 +79,7 @@ class RegionInfoAnaBatch extends BaseBatch { allRegionHouseStats = [:]; } - // 区域小区数 + // 鍖哄煙灏忓尯鏁� def allRegionDisCount = [:]; LinkedHashMap facet = new LinkedHashMap(2); facet.put("fields", ["region"]); @@ -100,7 +100,7 @@ class RegionInfoAnaBatch extends BaseBatch { } } - // 城市均价 + // 鍩庡競鍧囦环 def allRegionStats = [:]; query = new BasicDBObject(); query.put("city", cityName); @@ -154,8 +154,8 @@ class RegionInfoAnaBatch extends BaseBatch { query.put('region', regionName); query.put('weekend', weekend); BasicDBList values = new BasicDBList(); - values.add(new BasicDBObject("estate_type", '小区')); - values.add(new BasicDBObject("estate_type", '别墅')); + values.add(new BasicDBObject("estate_type", '灏忓尯')); + values.add(new BasicDBObject("estate_type", '鍒')); query.put('$or', values); int pc = (int) DISTRICT_STAT_CONN.count(query); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/SiteNameDistrictAlignment.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/SiteNameDistrictAlignment.groovy index 5b81b4ac8..ec5acb825 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/SiteNameDistrictAlignment.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/SiteNameDistrictAlignment.groovy @@ -16,15 +16,15 @@ import com.fangjia.core.RegionData import com.fangjia.script.util.DateUtils import com.fangjia.script.util.ExcelUtils; /** - * 网站小区比对 房估估,云估价,房价网 都存在的小区(精确匹配) + * 缃戠珯灏忓尯姣斿銆�鎴夸及浼帮紝浜戜及浠凤紝鎴夸环缃戙��閮藉瓨鍦ㄧ殑灏忓尯(绮剧‘鍖归厤) * @author gaojuan * */ class SiteNameDistrictAlignment { - //云估价 + //浜戜及浠� static DBCollection wx_gujia_proj_coll = MongoUtils.getCollectionByName("fangjia", "wx_gujia_proj", "192.168.0.61") - //房估估 + //鎴夸及浼� static DBCollection fanggugu_data_coll = MongoUtils.getCollectionByName("fangjia_tmp", "fanggugu_data", "192.168.0.61") static final DBCollection DIST_STAT_COLL = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "mongo.db.fangjia.com") @@ -35,33 +35,33 @@ class SiteNameDistrictAlignment { } def run(){ - def allCity = ["长春","吉林"]//CommonUtils.findAllCity(); + def allCity = ["闀挎槬","鍚夋灄"]//CommonUtils.findAllCity(); def cat = "district"; def cityIndex = 0; for(def city : allCity){ cityIndex++; def ygj_dis_count = wx_gujia_proj_coll.count(new BasicDBObject("city", city)) - println "[${city}] 云估价:" + ygj_dis_count + println "[${city}] 浜戜及浠凤細" + ygj_dis_count if (ygj_dis_count > 0) { def fgg_dis_count = fanggugu_data_coll.count(new BasicDBObject("city", city)) - println "[${city}] 房估估:" + fgg_dis_count + println "[${city}] 鎴夸及浼帮細" + fgg_dis_count if(fgg_dis_count > 0){ def query = new BasicDBObject("cat", cat).append("visible", 0).append("city", city) def fangjia_dis_count = DbUtils.seaweed.count(query) - println "[${city}] 房价网:" + fangjia_dis_count + println "[${city}] 鎴夸环缃戯細" + fangjia_dis_count if(fangjia_dis_count > 0){ - //查询云估价与房价网都存在的小区 + //鏌ヨ浜戜及浠蜂笌鎴夸环缃戦兘瀛樺湪鐨勫皬鍖� def yugujiaRets = findYugujiaExistsDistricts(city, cat); - //查询房估估与房价网都存在的小区 + //鏌ヨ鎴夸及浼颁笌鎴夸环缃戦兘瀛樺湪鐨勫皬鍖� def fangguguRets = findFangguguExistsDistricts(city, cat); - //3个网站都存在的小区 + //3涓綉绔欓兘瀛樺湪鐨勫皬鍖� if(yugujiaRets.size()>0 && fangguguRets.size()>0){ def rets = getAllExistsDists(yugujiaRets, fangguguRets); - //查询小区均价可信度 + //鏌ヨ灏忓尯鍧囦环鍙俊搴� if(rets){ def creditMap = queryDistrictPriceCredit(city, "2017-07-09"); @@ -70,7 +70,7 @@ class SiteNameDistrictAlignment { def rows = []; - rows << ["编号 ", "城市", "区域","小区名","地址","可信度"] + rows << ["缂栧彿 ", "鍩庡競", "鍖哄煙","灏忓尯鍚�","鍦板潃","鍙俊搴�"] rets.each {m-> def row = []; row << m.sid @@ -81,8 +81,8 @@ class SiteNameDistrictAlignment { row << m.credit rows << row; } - ExcelUtils.write("E:\\数据导出\\云估价-房估估-房价网.xls", rows, city) - println "写入完成.................." + ExcelUtils.write("E:\\鏁版嵁瀵煎嚭\\浜戜及浠�-鎴夸及浼�-鎴夸环缃�.xls", rows, city) + println "鍐欏叆瀹屾垚.................." } } } @@ -122,12 +122,12 @@ class SiteNameDistrictAlignment { if (region && disName) { - //查询房价网是否存在该小区 + //鏌ヨ鎴夸环缃戞槸鍚﹀瓨鍦ㄨ灏忓尯 def dbo = CommonDatautils.findSeaweed(city, region, disName, cat); if(!dbo){ - //别名 + //鍒悕 dbo = CommonDatautils.findSeaweedByAlias(city, region, disName, cat); - //地址 + //鍦板潃 if(!dbo){ def result = CommonDatautils.findSeaweedByAddress(city, region, disName, cat) if(result.size()==1){ @@ -157,11 +157,11 @@ class SiteNameDistrictAlignment { String disName = o.get("residentialareaName_en") == null ? o.get("residentialareaName") : o.get("residentialareaName_en") String region = RegionData.formatRegion(city , o.get("districtFullName_en") == null ? o.get("districtFullName") : o.get("districtFullName_en")) if(region && disName){ - //查询房价网是否存在该小区 + //鏌ヨ鎴夸环缃戞槸鍚﹀瓨鍦ㄨ灏忓尯 def dbo = CommonDatautils.findSeaweed(city, region, disName, cat); if(!dbo){ dbo = CommonDatautils.findSeaweedByAlias(city, region, disName, cat); - //地址 + //鍦板潃 if(!dbo){ def result = CommonDatautils.findSeaweedByAddress(city, region, disName, cat) if(result.size()==1){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/Test.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/Test.groovy index 1cf95449c..4d2dac1a9 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/Test.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/Test.groovy @@ -41,7 +41,7 @@ class Test { } def run2(){ - def file = "C:\\Users\\gaojuan\\Downloads\\云估价-房估估-房价网.xls"; + def file = "C:\\Users\\gaojuan\\Downloads\\浜戜及浠�-鎴夸及浼�-鎴夸环缃�.xls"; def count = ExcelUtils.getSheetCount(file) def total = 0; for(def i=0;i-1||address.indexOf("与")>-1){ + if(address.indexOf("浜ゆ眹")>-1||address.indexOf("涓�")>-1){ return null; - }else if(address.indexOf("路")==-1&&address.indexOf("街")==-1&&address.indexOf("大道")==-1){ - if(address.indexOf(s+"号")>-1||address.indexOf(s+"弄")>-1){ - //防止".152弄" + }else if(address.indexOf("璺�")==-1&&address.indexOf("琛�")==-1&&address.indexOf("澶ч亾")==-1){ + if(address.indexOf(s+"鍙�")>-1||address.indexOf(s+"寮�")>-1){ + //闃叉".152寮�" def su = address.replace(s, ""); if(su.length()<3){ return null; }else{ - if(address.indexOf("地铁"+s)>-1){ + if(address.indexOf("鍦伴搧"+s)>-1){ return null; }else{ return s; @@ -206,20 +206,20 @@ class YungujiaDistrictProcess { def matcher1 = pattern1.matcher(address) if(matcher1.find()){ def ss = matcher1.group(); - if(address.indexOf(ss+"号")>-1||address.indexOf(ss+"弄")>-1){ + if(address.indexOf(ss+"鍙�")>-1||address.indexOf(ss+"寮�")>-1){ return ss; } } return null; } }else{ - if(address.indexOf(s+"号")==-1&&address.indexOf(s+"弄")==-1){ + if(address.indexOf(s+"鍙�")==-1&&address.indexOf(s+"寮�")==-1){ Pattern pattern2 = Pattern.compile("\\d+-\\d+"); def matcher2 = pattern2.matcher(address) if(matcher2.find()){ def sss = matcher2.group(); - if(address.indexOf(sss+"号")>-1||address.indexOf(sss+"弄")>-1){ + if(address.indexOf(sss+"鍙�")>-1||address.indexOf(sss+"寮�")>-1){ return sss; } } @@ -238,7 +238,7 @@ class YungujiaDistrictProcess { def isNumberStart(address){ Pattern pattern = Pattern.compile("^(\\d+)(.*)"); Matcher matcher = pattern.matcher(address); - if (matcher.matches()) {//数字开头 + if (matcher.matches()) {//鏁板瓧寮�澶� return matcher.group(); } return null; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/AddressClassifyBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/AddressClassifyBatch.groovy index 99cb324f3..fba90d691 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/AddressClassifyBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/AddressClassifyBatch.groovy @@ -6,7 +6,7 @@ import org.apache.poi.hssf.usermodel.HSSFRow import org.apache.poi.hssf.usermodel.HSSFSheet import org.apache.poi.hssf.usermodel.HSSFWorkbook /** - * 全国地址按精确地址,模糊地址,空地址进行数量统计 + * 鍏ㄥ浗鍦板潃鎸夌簿纭湴鍧�,妯$硦鍦板潃,绌哄湴鍧�杩涜鏁伴噺缁熻 * @author gaojuan * */ @@ -18,7 +18,7 @@ class AddressClassifyBatch { def task = new AddressClassifyBatch(); //task.run(); task.addressStat(); - //task.findPattern("安德里北街28-5号"); + //task.findPattern("瀹夊痉閲屽寳琛�28-5鍙�"); } def run(){ @@ -33,9 +33,9 @@ class AddressClassifyBatch { statMap.each {city, v-> println city + " "+ v } - writeExcel(resultMap.get("no-address"), "没有地址"); - writeExcel(resultMap.get("standard-address"), "精准地址"); - writeExcel(resultMap.get("common-address"), "模糊地址"); + writeExcel(resultMap.get("no-address"), "娌℃湁鍦板潃"); + writeExcel(resultMap.get("standard-address"), "绮惧噯鍦板潃"); + writeExcel(resultMap.get("common-address"), "妯$硦鍦板潃"); } @@ -93,7 +93,7 @@ class AddressClassifyBatch { address = address.trim(); } - //没地址 + //娌″湴鍧� if(!address){ def ret = resultMap.get("no-address"); if(!ret){ @@ -139,7 +139,7 @@ class AddressClassifyBatch { address = address.trim(); } - //没地址 + //娌″湴鍧� if(!address){ def ret = resultMap.get("no-address"); if(!ret){ @@ -179,17 +179,17 @@ class AddressClassifyBatch { def matcher = pattern.matcher(address) if(matcher.find()){ def s = matcher.group(); - if(address.indexOf("交汇")>-1||address.indexOf("与")>-1){ + if(address.indexOf("浜ゆ眹")>-1||address.indexOf("涓�")>-1){ return null; - }else if(address.indexOf("路")==-1&&address.indexOf("街")==-1&&address.indexOf("大道")==-1&&address.indexOf("巷")==-1){ + }else if(address.indexOf("璺�")==-1&&address.indexOf("琛�")==-1&&address.indexOf("澶ч亾")==-1&&address.indexOf("宸�")==-1){ return null; -// if(address.indexOf(s+"号")>-1||address.indexOf(s+"弄")>-1){ -// //防止".152弄" +// if(address.indexOf(s+"鍙�")>-1||address.indexOf(s+"寮�")>-1){ +// //闃叉".152寮�" // def su = address.replace(s, ""); // if(su.length()<3){ // return null; // }else{ -// if(address.indexOf("地铁"+s)>-1){ +// if(address.indexOf("鍦伴搧"+s)>-1){ // return null; // }else{ // return s; @@ -200,20 +200,20 @@ class AddressClassifyBatch { // def matcher1 = pattern1.matcher(address) // if(matcher1.find()){ // def ss = matcher1.group(); -// if(address.indexOf(ss+"号")>-1||address.indexOf(ss+"弄")>-1){ +// if(address.indexOf(ss+"鍙�")>-1||address.indexOf(ss+"寮�")>-1){ // return ss; // } // } // return null; // } }else{ -// if(address.indexOf(s+"号")==-1&&address.indexOf(s+"弄")==-1){ +// if(address.indexOf(s+"鍙�")==-1&&address.indexOf(s+"寮�")==-1){ // // Pattern pattern2 = Pattern.compile("\\d+-\\d+"); // def matcher2 = pattern2.matcher(address) // if(matcher2.find()){ // def sss = matcher2.group(); -// if(address.indexOf(sss+"号")>-1||address.indexOf(sss+"弄")>-1){ +// if(address.indexOf(sss+"鍙�")>-1||address.indexOf(sss+"寮�")>-1){ // return sss; // } // } @@ -231,7 +231,7 @@ class AddressClassifyBatch { def isNumberStart(address){ Pattern pattern = Pattern.compile("^(\\d+)(.*)"); Matcher matcher = pattern.matcher(address); - if (matcher.matches()) {//数字开头 + if (matcher.matches()) {//鏁板瓧寮�澶� return matcher.group(); } return null; @@ -250,7 +250,7 @@ class AddressClassifyBatch { } if(result.size()==60000 || i+1==ret.size()){ - export(result, "d:\\数据\\地址\\"+fileName+new Date().getTime()+".xls"); + export(result, "d:\\鏁版嵁\\鍦板潃\\"+fileName+new Date().getTime()+".xls"); result = []; } } @@ -266,14 +266,14 @@ class AddressClassifyBatch { FileOutputStream fos = null; try { HSSFWorkbook WORK_BOOK = new HSSFWorkbook(); - HSSFSheet sheet = WORK_BOOK.createSheet("数据"); + HSSFSheet sheet = WORK_BOOK.createSheet("鏁版嵁"); HSSFRow row0 = sheet.createRow(0); - row0.createCell(0).setCellValue("城市"); - row0.createCell(1).setCellValue("区域"); - row0.createCell(2).setCellValue("名称"); - row0.createCell(3).setCellValue("地址"); + row0.createCell(0).setCellValue("鍩庡競"); + row0.createCell(1).setCellValue("鍖哄煙"); + row0.createCell(2).setCellValue("鍚嶇О"); + row0.createCell(3).setCellValue("鍦板潃"); for(def i=0;i a.markup } - exportMarkup(ret, "e:\\数据\\涨幅前20小区.xls"); + exportMarkup(ret, "e:\\鏁版嵁\\娑ㄥ箙鍓�20灏忓尯.xls"); } @@ -346,15 +346,15 @@ class AllHistoryCityPriceExport { FileOutputStream fos = null; try { HSSFWorkbook WORK_BOOK = new HSSFWorkbook(); - HSSFSheet sheet = WORK_BOOK.createSheet("数据"); + HSSFSheet sheet = WORK_BOOK.createSheet("鏁版嵁"); HSSFRow row0 = sheet.createRow(0); - row0.createCell(0).setCellValue("城市"); - //row0.createCell(1).setCellValue("区域"); - //row0.createCell(2).setCellValue("名称"); - //row0.createCell(3).setCellValue("价格"); - row0.createCell(1).setCellValue("涨跌幅"); + row0.createCell(0).setCellValue("鍩庡競"); + //row0.createCell(1).setCellValue("鍖哄煙"); + //row0.createCell(2).setCellValue("鍚嶇О"); + //row0.createCell(3).setCellValue("浠锋牸"); + row0.createCell(1).setCellValue("娑ㄨ穼骞�"); for(def i=0;i HSSFSheet sheet = WORK_BOOK.createSheet(city); HSSFRow row0 = sheet.createRow(0); - row0.createCell(0).setCellValue("城市"); - row0.createCell(1).setCellValue("区域"); - row0.createCell(2).setCellValue("小区名称"); - row0.createCell(3).setCellValue("小区均价"); + row0.createCell(0).setCellValue("鍩庡競"); + row0.createCell(1).setCellValue("鍖哄煙"); + row0.createCell(2).setCellValue("灏忓尯鍚嶇О"); + row0.createCell(3).setCellValue("灏忓尯鍧囦环"); for(def i=0;i - HSSFSheet sheet = WORK_BOOK.createSheet("数据"); + HSSFSheet sheet = WORK_BOOK.createSheet("鏁版嵁"); HSSFRow row0 = sheet.createRow(0); - row0.createCell(0).setCellValue("城市"); - row0.createCell(1).setCellValue("区域"); - row0.createCell(2).setCellValue("小区名称"); - row0.createCell(3).setCellValue("地址"); - row0.createCell(4).setCellValue("小区均价"); + row0.createCell(0).setCellValue("鍩庡競"); + row0.createCell(1).setCellValue("鍖哄煙"); + row0.createCell(2).setCellValue("灏忓尯鍚嶇О"); + row0.createCell(3).setCellValue("鍦板潃"); + row0.createCell(4).setCellValue("灏忓尯鍧囦环"); for(def i=0;i if(map.region){ @@ -104,9 +104,9 @@ class AnalyShop { if(!names.contains(distName) && !result.contains(distName)){ if(distName.length()<15 && !isExistFilterKeyword(distName)){ - distName = distName.replace(",", "").replaceAll("-", "").replace("!", "").replace("。", "").replace("/", ""); + distName = distName.replace(",", "").replaceAll("-", "").replace("!", "").replace("銆�", "").replace("/", ""); - def filers = ["沿街商铺","购物中心","农贸市场","商业街商铺", "大脚丫"]; + def filers = ["娌胯鍟嗛摵","璐墿涓績","鍐滆锤甯傚満","鍟嗕笟琛楀晢閾�", "澶ц剼涓�"]; if(filers.contains(distName)){ continue; } @@ -134,7 +134,7 @@ class AnalyShop { continue; } - if(name.endsWith("路商铺")||name.endsWith("商业街")||name.endsWith("街商铺")){ + if(name.endsWith("璺晢閾�")||name.endsWith("鍟嗕笟琛�")||name.endsWith("琛楀晢閾�")){ println name; def detail = [:]; detail.name = name; @@ -154,9 +154,9 @@ class AnalyShop { continue; } if(baiduKeyword == name){ - if(tag.contains("购物")||tag.contains("商铺")){ + if(tag.contains("璐墿")||tag.contains("鍟嗛摵")){ - if(!result.contains(name) && !name.contains("店")&& !name.contains("租")&& !name.contains("转让")){ + if(!result.contains(name) && !name.contains("搴�")&& !name.contains("绉�")&& !name.contains("杞")){ def detail = [:]; detail.name = name; @@ -169,9 +169,9 @@ class AnalyShop { } }else if(baiduKeyword.contains(name)||name.contains(baiduKeyword)){ - if(tag.contains("购物")||tag.contains("商铺")){ - baiduKeyword = baiduKeyword.replace("常州", ""); - if(!names.contains(baiduKeyword) && !result.contains(baiduKeyword) && !name.contains("店")&& !name.contains("租")&& !name.contains("转让")){ + if(tag.contains("璐墿")||tag.contains("鍟嗛摵")){ + baiduKeyword = baiduKeyword.replace("甯稿窞", ""); + if(!names.contains(baiduKeyword) && !result.contains(baiduKeyword) && !name.contains("搴�")&& !name.contains("绉�")&& !name.contains("杞")){ def detail = [:]; detail.name = name; detail.region = baiduMap.region @@ -195,7 +195,7 @@ class AnalyShop { def isExistFilterKeyword(def name){ - def filters = ["对面","旁","附近", "酒店", "超市","个人","交界处", "加油站","小学","酒吧","菜场","菜市场","奶茶","水果","服装","窗帘","奶爸","食品"]; + def filters = ["瀵归潰","鏃�","闄勮繎", "閰掑簵", "瓒呭競","涓汉","浜ょ晫澶�", "鍔犳补绔�","灏忓","閰掑惂","鑿滃満","鑿滃競鍦�","濂惰尪","姘存灉","鏈嶈","绐楀笜","濂剁埜","椋熷搧"]; for(def keyword : filters){ if(name.contains(keyword)){ return true; @@ -241,7 +241,7 @@ class AnalyShop { String result = request.get("http://api.map.baidu.com/place/v2/search",params,"UTF-8"); JSONObject json = JSONObject.fromObject(result); if(json.getInt("status") >= 300){ - println "请求有问题啦 !" + println "璇锋眰鏈夐棶棰樺暒 锛�" } return json; }catch (Exception e){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/CZDataExportPool.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/CZDataExportPool.groovy index daa41c2c6..e3bcf3ccd 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/CZDataExportPool.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/CZDataExportPool.groovy @@ -56,7 +56,7 @@ import com.fangjia.script.util.OpenApiClient import com.mongodb.QueryOperators import com.mongodb.Bytes; /** - * 常州农商行数据导出 + * 甯稿窞鍐滃晢琛屾暟鎹鍑� * @author gaojuan * */ @@ -82,16 +82,16 @@ class CZLSHDataExportPool { public static final DBCollection REGION_BLOCK_COLL = MongoUtils.getCollectionByName("fangjia", "region_block", "mongo.db.fangjia.com") - def directionMap = [1:"南",2:"北",3:"南北",4:"东",5:"西",6:"东西",7:"东南",8:"西南",9:"东北",10:"西北"] - def fitmentMap = [1:"毛坯",2:"简装",3:"精装"]; + def directionMap = [1:"鍗�",2:"鍖�",3:"鍗楀寳",4:"涓�",5:"瑗�",6:"涓滆タ",7:"涓滃崡",8:"瑗垮崡",9:"涓滃寳",10:"瑗垮寳"] + def fitmentMap = [1:"姣涘澂",2:"绠�瑁�",3:"绮捐"]; - def directionMap1 = ["西南":1,"东南":2,"南":3,"西北":4,"东北":5,"东":6,"西":7,"北":8,"东西":9,"南北":10] + def directionMap1 = ["瑗垮崡":1,"涓滃崡":2,"鍗�":3,"瑗垮寳":4,"涓滃寳":5,"涓�":6,"瑗�":7,"鍖�":8,"涓滆タ":9,"鍗楀寳":10] def static FITMENTS_TYPES_MAPS = [:]; def lastRowNumber = 0; - def regionMap = ["江苏":"320000","常州":"320400","天宁":"320402","钟楼":"320404","戚墅堰":"320405","新北":"320411","武进":"320412","溧阳":"320481","金坛":"320482"]; + def regionMap = ["姹熻嫃":"320000","甯稿窞":"320400","澶╁畞":"320402","閽熸ゼ":"320404","鎴氬鍫�":"320405","鏂板寳":"320411","姝﹁繘":"320412","婧ч槼":"320481","閲戝潧":"320482"]; static main(args) { @@ -100,21 +100,21 @@ class CZLSHDataExportPool { def time = DateUtils.formatDateByPattern(new Date(),"yyyyMMdd"); - task.shopHouseRun("E:\\高娟\\常州人工商铺-发技术(修改层数).xls", "e:\\常州数据结果\\原始数据\\常州500个商铺.xls", "e:\\常州数据结果\\excel\\常州商铺房源数据.xls","e:\\常州数据结果\\dat\\easycms_shops_info_"+ time+".txt");//商铺 -// task.shopDistrictRun("E:\\高娟\\常州人工商铺-发技术(修改层数).xls","e:\\常州数据结果\\原始数据\\常州500个商铺.xls","e:\\常州数据结果\\excel\\常州600个商铺.xls","e:\\常州数据结果\\dat\\easycms_shops_market_"+ time+".txt"); + task.shopHouseRun("E:\\楂樺\\甯稿窞浜哄伐鍟嗛摵-鍙戞妧鏈紙淇敼灞傛暟锛�.xls", "e:\\甯稿窞鏁版嵁缁撴灉\\鍘熷鏁版嵁\\甯稿窞500涓晢閾�.xls", "e:\\甯稿窞鏁版嵁缁撴灉\\excel\\甯稿窞鍟嗛摵鎴挎簮鏁版嵁.xls","e:\\甯稿窞鏁版嵁缁撴灉\\dat\\easycms_shops_info_"+ time+".txt");//鍟嗛摵 +// task.shopDistrictRun("E:\\楂樺\\甯稿窞浜哄伐鍟嗛摵-鍙戞妧鏈紙淇敼灞傛暟锛�.xls","e:\\甯稿窞鏁版嵁缁撴灉\\鍘熷鏁版嵁\\甯稿窞500涓晢閾�.xls","e:\\甯稿窞鏁版嵁缁撴灉\\excel\\甯稿窞600涓晢閾�.xls","e:\\甯稿窞鏁版嵁缁撴灉\\dat\\easycms_shops_market_"+ time+".txt"); -// task.runDistrictHouse("e:\\常州数据结果\\常州需删除小区.xls", "e:\\常州数据结果\\excel\\常州小区房源数据.xlsx","e:\\常州数据结果\\dat\\easycms_house_info_"+ time+".txt");//房源 -// task.runDistrict("e:\\常州数据结果\\常州需删除小区.xls", "e:\\常州数据结果\\excel\\常州小区数据.xls","e:\\常州数据结果\\dat\\easycms_house_community_"+time +".txt");//住宅 +// task.runDistrictHouse("e:\\甯稿窞鏁版嵁缁撴灉\\甯稿窞闇�鍒犻櫎灏忓尯.xls", "e:\\甯稿窞鏁版嵁缁撴灉\\excel\\甯稿窞灏忓尯鎴挎簮鏁版嵁.xlsx","e:\\甯稿窞鏁版嵁缁撴灉\\dat\\easycms_house_info_"+ time+".txt");//鎴挎簮 +// task.runDistrict("e:\\甯稿窞鏁版嵁缁撴灉\\甯稿窞闇�鍒犻櫎灏忓尯.xls", "e:\\甯稿窞鏁版嵁缁撴灉\\excel\\甯稿窞灏忓尯鏁版嵁.xls","e:\\甯稿窞鏁版嵁缁撴灉\\dat\\easycms_house_community_"+time +".txt");//浣忓畢 } def runDistrict(def removeDistrictFile, def excelFile, def datFile){ - def city = "常州"; + def city = "甯稿窞"; initFitmentMap(); def removeDistricts = readRemoveDistrict(removeDistrictFile); def districtNames = [] def datas = findSeaweedData(city, "district"); - //小区 + //灏忓尯 def ret = standardData(datas, removeDistricts); export(ret, excelFile); outPutFile(datFile, appendResult(ret, "district", null)); @@ -124,22 +124,22 @@ class CZLSHDataExportPool { // initFitmentMap(); // def removeDistricts = readRemoveDistrict(removeDistrictFile); // def districtNames = [] -// def datas = findSeaweedData("常州", "district"); -// //小区房源 +// def datas = findSeaweedData("甯稿窞", "district"); +// //灏忓尯鎴挎簮 // findDistrictHouse(datas, districtNames, "2015-6-1", removeDistricts); - runOpenApiEvaluate();//房源估价 + runOpenApiEvaluate();//鎴挎簮浼颁环 -// exportDistrictHouse(removeDistrictFile, excelFile, datFile);//导出房源 +// exportDistrictHouse(removeDistrictFile, excelFile, datFile);//瀵煎嚭鎴挎簮 } def shopHouseRun(def oldFile100, def oldFile400, def newFile, def datFile){ - def city = "常州"; + def city = "甯稿窞"; initFitmentMap(); //def datas = findSeaweedData(city, "shop"); - //之前100个商铺 + //涔嬪墠100涓晢閾� def shopMap100 = readShopExcelMap100(oldFile100); def result100 = createShopHouse100(shopMap100, "2015-10-01",newFile); - //之后400个商铺 + //涔嬪悗400涓晢閾� def shopMap400 = readShopExcelMap400(oldFile400); def result400 = createShopHouse400(shopMap400, "2015-10-01",newFile); @@ -150,9 +150,9 @@ class CZLSHDataExportPool { } def shopDistrictRun(def oldFile100,def oldFile500, def newFile, def datFile){ - //之后100个商铺 + //涔嬪悗100涓晢閾� def shopMap100 = readShopExcelMap100(oldFile100); - //之后500个商铺 + //涔嬪悗500涓晢閾� def shopMap400 = readShopExcelMap400(oldFile500); def result = shopMap100 + shopMap400; //def result = readShopExcel(oldFile); @@ -235,7 +235,7 @@ class CZLSHDataExportPool { } def height = obj.height - if(!height||height==1 || (height>59 && obj.name!="凯纳商务广场")){ + if(!height||height==1 || (height>59 && obj.name!="鍑撼鍟嗗姟骞垮満")){ DBObject query = new BasicDBObject() query.put("city", obj.city); query.put("region", obj.region); @@ -293,7 +293,7 @@ class CZLSHDataExportPool { def code = getBuildTypeCode(null, null, height); - if(name.indexOf("别墅")!=-1 || house_area>=200){ + if(name.indexOf("鍒")!=-1 || house_area>=200){ code = "3"; if(height>6){ height = null @@ -329,9 +329,9 @@ class CZLSHDataExportPool { def initFitmentMap(){ - FITMENTS_TYPES_MAPS.put("毛坯", ["毛坯", "清水", "无装修", "独栋毛坯" ]); - FITMENTS_TYPES_MAPS.put("简装", ["简装", "普通装修", "普通","简单装修","简易装修","普装" ]); - FITMENTS_TYPES_MAPS.put("精装", ["精装","全装修", "全装", "中等装修", "中装","中档装修","精致装修","豪华装修","高档","豪华","豪装"]); + FITMENTS_TYPES_MAPS.put("姣涘澂", ["姣涘澂", "娓呮按", "鏃犺淇�", "鐙爧姣涘澂" ]); + FITMENTS_TYPES_MAPS.put("绠�瑁�", ["绠�瑁�", "鏅�氳淇�", "鏅��","绠�鍗曡淇�","绠�鏄撹淇�","鏅" ]); + FITMENTS_TYPES_MAPS.put("绮捐", ["绮捐","鍏ㄨ淇�", "鍏ㄨ", "涓瓑瑁呬慨", "涓","涓。瑁呬慨","绮捐嚧瑁呬慨","璞崕瑁呬慨","楂樻。","璞崕","璞"]); return FITMENTS_TYPES_MAPS; } @@ -345,7 +345,7 @@ class CZLSHDataExportPool { return dsCursor; } - //标准化数据 + //鏍囧噯鍖栨暟鎹� def standardData(datas, removeDistricts){ def result = []; def index = 0; @@ -368,50 +368,50 @@ class CZLSHDataExportPool { ret.name = dbo.get("name"); - //均价 + //鍧囦环 ret.avg_price = getDistrictPrice(dbo.city, dbo.region, dbo.name, dbo.address, dbo.block); - //省的码值 - ret.province = regionMap.get("江苏"); + //鐪佺殑鐮佸�� + ret.province = regionMap.get("姹熻嫃"); ret.city = regionMap.get(dbo.city); - //区 + //鍖� ret.section = regionMap.get(dbo.region); - //区域 + //鍖哄煙 ret.region = getRegionCode(dbo.region); ret.address = dbo.address; ret.build_date = getBuild_date(dbo); - //公共服务配套 + //鍏叡鏈嶅姟閰嶅 ret.publicServiceSetCode = getPublicServiceSetCode(dbo.lat2, dbo.lng2) - //基础设施 + //鍩虹璁炬柦 ret.facilitiesCode = "01"; - //居住社区成熟度 + //灞呬綇绀惧尯鎴愮啛搴� ret.sophisticationCode = getSophistication(dbo.city, dbo.lat2, dbo.lng2); - //交通条件 + //浜ら�氭潯浠� ret.trafficCode = getTrafficCode(dbo.city, dbo.lat2, dbo.lng2); - //泊车条件 + //娉婅溅鏉′欢 ret.stopCarCode = getStopCarCode(dbo); - //是否是学区房 + //鏄惁鏄鍖烘埧 ret.schoolCode = getSchoolCode(dbo.region, dbo.lat2, dbo.lng2); - //绿化率 + //缁垮寲鐜� ret.virescence_percent = getVirescencePercent(dbo.virescence_percent, ret.build_date); - //容积率 + //瀹圭Н鐜� ret.cubage_percent = getCubagePercent(dbo.cubage_percent, ret.build_date); - //参考租金 + //鍙傝�冪閲� //ret.rentPrices = getRentPrice(dbo); ret.rentPrices = getRentPrice2(dbo); - //物业公司 + //鐗╀笟鍏徃 ret.estate_company = getEstateCompany(dbo.estate_company); - //物业费 + //鐗╀笟璐� ret.estate_charge = getEstateCharge(dbo.estate_charge); @@ -544,7 +544,7 @@ class CZLSHDataExportPool { def getEstateCompany(def company){ if(company){ - company = company.replace("---","").replace("·",""); + company = company.replace("---","").replace("路",""); return company; } return ""; @@ -578,10 +578,10 @@ class CZLSHDataExportPool { return ""; } - //"1-有停车场 2-无停车场" + //"1-鏈夊仠杞﹀満 2-鏃犲仠杞﹀満" def getStopCarCode(def dbo){ if(dbo.car_site){ - if(dbo.car_site=="
    "||dbo.car_site=="待定"||dbo.car_site.indexOf("暂无")!=-1||dbo.car_site=="详询售楼处"){ + if(dbo.car_site=="
    "||dbo.car_site=="寰呭畾"||dbo.car_site.indexOf("鏆傛棤")!=-1||dbo.car_site=="璇﹁鍞ゼ澶�"){ dbo.car_site =""; } @@ -607,13 +607,13 @@ class CZLSHDataExportPool { }else if(year && year>0 && year<1980){ return "02"; }else{ - if(dbo.name.endsWith("期")||dbo.name.indexOf("别墅")!=-1){ + if(dbo.name.endsWith("鏈�")||dbo.name.indexOf("鍒")!=-1){ return "01"; }else{ - if(dbo.build_type && dbo.build_type.indexOf("高层")!=-1){ + if(dbo.build_type && dbo.build_type.indexOf("楂樺眰")!=-1){ return "01"; - }else if(dbo.estate_type && dbo.estate_type=="别墅"){ + }else if(dbo.estate_type && dbo.estate_type=="鍒"){ return "01"; }else{ @@ -633,7 +633,7 @@ class CZLSHDataExportPool { return "99" } - def endWithChar = ["村","宿舍","堂","弄"]; + def endWithChar = ["鏉�","瀹胯垗","鍫�","寮�"]; for(def s : endWithChar){ if(dbo.name.endsWith(s)){ return "02"; @@ -667,7 +667,7 @@ class CZLSHDataExportPool { if(price){ return price; }else{ - //样例估价 + //鏍蜂緥浼颁环 def s = OpenApiClient.evaluateDistrictPriceBySimilarHouse3(city, region, name, 100, false); try{ JSONObject jsonObject = JSONObject.fromObject(s); @@ -683,30 +683,30 @@ class CZLSHDataExportPool { } - //分期找总期 - if(name.toString().endsWith("期")){ - def tempname = name.toString().substring(0, name.toString().indexOf("期")-1) + //鍒嗘湡鎵炬�绘湡 + if(name.toString().endsWith("鏈�")){ + def tempname = name.toString().substring(0, name.toString().indexOf("鏈�")-1) price = findDistrictPrice(city, region, tempname); if(price){ return price+150; } } - if(name.toString().endsWith("区")){ - def tempname = name.toString().substring(0, name.toString().indexOf("区")-1) + if(name.toString().endsWith("鍖�")){ + def tempname = name.toString().substring(0, name.toString().indexOf("鍖�")-1) price = findDistrictPrice(city, region, tempname); if(price){ return price+100; } } - //周边均价 + //鍛ㄨ竟鍧囦环 // price = findAroundAvgPrice(city, address, 100); // if(price){ // return price.toString() // } - //板块均价 + //鏉垮潡鍧囦环 if(block){ price = queryCityRegionPrice(city, region, block); if(price){ @@ -714,7 +714,7 @@ class CZLSHDataExportPool { } } - //区域均价 + //鍖哄煙鍧囦环 if(!block||!price){ price = queryCityRegionPrice(city, region, null); if(price){ @@ -766,7 +766,7 @@ class CZLSHDataExportPool { } - //println "周边均价:" + totalPrice +"【${url_str}】" + //println "鍛ㄨ竟鍧囦环锛�" + totalPrice +"銆�${url_str}銆�" return avgPrice; } def getContentFromUrl(def url_str){ @@ -781,7 +781,7 @@ class CZLSHDataExportPool { conn.setRequestMethod("GET"); conn.doOutput = true inputStream = conn.getInputStream(); - BufferedReader buf = new BufferedReader(new InputStreamReader(inputStream,"UTF-8"));// 创建UTF-8的BufferedReader + BufferedReader buf = new BufferedReader(new InputStreamReader(inputStream,"UTF-8"));// 鍒涘缓UTF-8鐨凚ufferedReader while((line = buf.readLine())!=null){ sb.append(line); } @@ -867,7 +867,7 @@ class CZLSHDataExportPool { // def s = ""; // priceMap.each {k,v-> // -// if(estate_type=="别墅"){ +// if(estate_type=="鍒"){ // if(k>=2 && k<=8){ // s = s + k + ":"+v+" " // } @@ -946,13 +946,13 @@ class CZLSHDataExportPool { } return avgPrice; } - //1-主城区:天宁区、钟楼区 2-郊区:武进区、新北区、戚墅堰区 3-县级市:金坛市、溧阳市 + //1-涓诲煄鍖猴細澶╁畞鍖恒�侀挓妤煎尯 2-閮婂尯锛氭杩涘尯銆佹柊鍖楀尯銆佹垰澧呭牥鍖� 3-鍘跨骇甯傦細閲戝潧甯傘�佹骇闃冲競 def getRegionCode(def region){ - if(region.indexOf("天宁")!=-1||region.indexOf("钟楼")!=-1){ + if(region.indexOf("澶╁畞")!=-1||region.indexOf("閽熸ゼ")!=-1){ return "01"; - }else if(region.indexOf("武进")!=-1||region.indexOf("新北")!=-1||region.indexOf("戚墅堰")!=-1){ + }else if(region.indexOf("姝﹁繘")!=-1||region.indexOf("鏂板寳")!=-1||region.indexOf("鎴氬鍫�")!=-1){ return "02"; - }else if(region.indexOf("金坛")!=-1||region.indexOf("溧阳")!=-1){ + }else if(region.indexOf("閲戝潧")!=-1||region.indexOf("婧ч槼")!=-1){ return "03"; }else{ return "99"; @@ -964,28 +964,28 @@ class CZLSHDataExportPool { if(lng && lat){ lat = lat/10000000000; lng = lng/10000000000; - def hspt_count = CommonDatautils.findPoiCount("医院", lat, lng, 1000) - def bank_count = CommonDatautils.findPoiCount("银行", lat, lng, 1000) - def school_count = CommonDatautils.findPoiCount("学校", lat,lng, 1000) - def supermarket_count = CommonDatautils.findPoiCount("超市", lat,lng, 1000) + def hspt_count = CommonDatautils.findPoiCount("鍖婚櫌", lat, lng, 1000) + def bank_count = CommonDatautils.findPoiCount("閾惰", lat, lng, 1000) + def school_count = CommonDatautils.findPoiCount("瀛︽牎", lat,lng, 1000) + def supermarket_count = CommonDatautils.findPoiCount("瓒呭競", lat,lng, 1000) def yl_count1 = CommonDatautils.findPoiCount("KTV", lat,lng, 1000) - def yl_count2 = CommonDatautils.findPoiCount("电影院", lat,lng, 1000) - def yl_count3 = CommonDatautils.findPoiCount("网吧", lat,lng, 1000) - def yl_count4 = CommonDatautils.findPoiCount("健身中心", lat,lng, 1000) + def yl_count2 = CommonDatautils.findPoiCount("鐢靛奖闄�", lat,lng, 1000) + def yl_count3 = CommonDatautils.findPoiCount("缃戝惂", lat,lng, 1000) + def yl_count4 = CommonDatautils.findPoiCount("鍋ヨ韩涓績", lat,lng, 1000) if(hspt_count>=1 && bank_count>=1 && school_count>=1 && supermarket_count>=1 && (yl_count1>=1 || yl_count2>=1 || yl_count3>=1||yl_count4>=1)){ return "01"; }else{ - hspt_count = CommonDatautils.findPoiCount("医院", lat, lng, 2000) - bank_count = CommonDatautils.findPoiCount("银行", lat, lng, 2000) - school_count = CommonDatautils.findPoiCount("学校", lat,lng, 2000) - supermarket_count = CommonDatautils.findPoiCount("超市", lat,lng, 1000) + hspt_count = CommonDatautils.findPoiCount("鍖婚櫌", lat, lng, 2000) + bank_count = CommonDatautils.findPoiCount("閾惰", lat, lng, 2000) + school_count = CommonDatautils.findPoiCount("瀛︽牎", lat,lng, 2000) + supermarket_count = CommonDatautils.findPoiCount("瓒呭競", lat,lng, 1000) yl_count1 = CommonDatautils.findPoiCount("KTV", lat,lng, 2000) - yl_count2 = CommonDatautils.findPoiCount("电影院", lat,lng, 2000) - yl_count3 = CommonDatautils.findPoiCount("网吧", lat,lng, 2000) - yl_count4 = CommonDatautils.findPoiCount("健身中心", lat,lng, 2000) + yl_count2 = CommonDatautils.findPoiCount("鐢靛奖闄�", lat,lng, 2000) + yl_count3 = CommonDatautils.findPoiCount("缃戝惂", lat,lng, 2000) + yl_count4 = CommonDatautils.findPoiCount("鍋ヨ韩涓績", lat,lng, 2000) if(hspt_count>=1 && bank_count>=1 && school_count>=1 && supermarket_count>=1 && (yl_count1>=1 || yl_count2>=1 || yl_count3>=1||yl_count4>=1)){ return "02"; @@ -1006,11 +1006,11 @@ class CZLSHDataExportPool { if(lng && lat){ lat = lat/10000000000; lng = lng/10000000000; - def supermarket_count = CommonDatautils.findPoiCount("超市", lat,lng, 1000) + def supermarket_count = CommonDatautils.findPoiCount("瓒呭競", lat,lng, 1000) if(supermarket_count>=5){ return "01"; }else{ - supermarket_count = CommonDatautils.findPoiCount("超市", lat,lng, 2000) + supermarket_count = CommonDatautils.findPoiCount("瓒呭競", lat,lng, 2000) if(supermarket_count >= 5){ return "02"; }else{ @@ -1028,10 +1028,10 @@ class CZLSHDataExportPool { lat = lat/10000000000; lng = lng/10000000000; def redius = 3000; - if(region=="天宁"|| region=="钟楼" ){ + if(region=="澶╁畞"|| region=="閽熸ゼ" ){ redius = 1000; } - def school_count = CommonDatautils.findPoiCount("小学", lat, lng, redius) + def school_count = CommonDatautils.findPoiCount("灏忓", lat, lng, redius) if(school_count >= 1){ return 1; } @@ -1040,7 +1040,7 @@ class CZLSHDataExportPool { return 0; } - //1-周边公交线路≥10条;2-周边公交线路<10条但≥5条;3-周边公交线路<5条但≥2条;4-周边公交线路<2条 + //1-鍛ㄨ竟鍏氦绾胯矾鈮�10鏉★紱2-鍛ㄨ竟鍏氦绾胯矾锛�10鏉′絾鈮�5鏉★紱3-鍛ㄨ竟鍏氦绾胯矾锛�5鏉′絾鈮�2鏉★紱4-鍛ㄨ竟鍏氦绾胯矾锛�2鏉� def getTrafficCode(def city, def lat, def lng){ if(lng && lat){ lat = lat/10000000000; @@ -1114,7 +1114,7 @@ class CZLSHDataExportPool { return map; } - /*-----------------------------房源-----------------------------------*/ + /*-----------------------------鎴挎簮-----------------------------------*/ def findDistrictHouse(def datas, def districtNames, def dateStr, def removeDistricts){ def result = []; def index = 0; @@ -1141,7 +1141,7 @@ class CZLSHDataExportPool { def dbCursor = datastore.find(q); for(def obj : dbCursor){ def date = obj.build_date; - if(date && date.indexOf("暂无")==-1){ + if(date && date.indexOf("鏆傛棤")==-1){ return date; } @@ -1193,31 +1193,31 @@ class CZLSHDataExportPool { continue; } - if(obj.district_name.endsWith("别墅") && obj.height && obj.height>=10){ + if(obj.district_name.endsWith("鍒") && obj.height && obj.height>=10){ continue; } def m = [:]; - //小区名称 + //灏忓尯鍚嶇О m.name = dbo.name; m.city = obj.city; m.region = obj.region; m.district_id= dbo.get("_id").toString(); m.house_id = obj.get("_id").toString(); - //建筑物总楼层 + //寤虹瓚鐗╂�绘ゼ灞� m.height = obj.height>0?obj.height:null; - //所在楼层 + //鎵�鍦ㄦゼ灞� m.floor = getHouseFloor(obj.floor, m.height); - //建筑面积 + //寤虹瓚闈㈢Н m.house_area = obj.area; - //挂牌价 + //鎸傜墝浠� m.total_price = obj.total_price; def keys = m.region +"-"+ m.name+"-"+m.house_area+"-"+m.height+"-"+m.floor+"-"+m.total_price; if(!houses.contains(keys)){ houses << keys; }else{ - println "此房源已存在....." + println "姝ゆ埧婧愬凡瀛樺湪....." continue; } @@ -1225,31 +1225,31 @@ class CZLSHDataExportPool { m.room = obj.room; m.hall = obj.hall; m.estate_type = obj.estate_type2; - //建成年代 + //寤烘垚骞翠唬 m.build_date = getBuildDate(obj.build_date, dbo); - //总使用年限 + //鎬讳娇鐢ㄥ勾闄� m.property_life = getPropertyLife(dbo.property_life); - //朝向 + //鏈濆悜 m.direction = getDirectionCode(obj.direction, dbo.estate_type); - //建筑结构 + //寤虹瓚缁撴瀯 m.build_structure_code = getBuildStructureCode(dbo.build_date, dbo.build_structure); - //建筑类别 + //寤虹瓚绫诲埆 m.build_type_code = getBuildTypeCode(dbo.name, dbo.build_type, obj.height); if(m.build_type_code=='3' && m.height>6){ m.height = null } - //内部装修与成新度 + //鍐呴儴瑁呬慨涓庢垚鏂板害 m.fitment_code = getFitmentCode(obj.fitment); - //是否有电梯 + //鏄惁鏈夌數姊� m.elevator_code = getElevatorCode(obj.height, m.build_type_code); - //房价网评估价 + //鎴夸环缃戣瘎浼颁环 //m.evaluation_price = getEvaluationPrice(m); //println "[${index++}] "+new Date(); - //评估时间 + //璇勪及鏃堕棿 m.evaluation_date = DateUtils.formatDateByPattern(new Date(),"yyyyMMdd"); - //挂牌时间 + //鎸傜墝鏃堕棿 m.publish_date = DateUtils.formatDateByPattern(obj.publish_date,"yyyyMMdd"); m.house_id = obj.get("_id").toString(); @@ -1318,16 +1318,16 @@ class CZLSHDataExportPool { return year; } - //1-毛坯;2-简装;3-精装; + //1-姣涘澂锛�2-绠�瑁咃紱3-绮捐锛� def getFitmentCode(def fitment){ fitment = fetchFitmentInfo(fitment); if(fitment){ - if(fitment.indexOf("毛坯")!=-1){ + if(fitment.indexOf("姣涘澂")!=-1){ return "01"; - }else if(fitment.indexOf("简装")!=-1){ + }else if(fitment.indexOf("绠�瑁�")!=-1){ return "02"; - }else if(fitment.indexOf("精装")!=-1){ + }else if(fitment.indexOf("绮捐")!=-1){ return "03"; }else{ return "04"; @@ -1374,7 +1374,7 @@ class CZLSHDataExportPool { } - //"1-是;2-否;" + //"1-鏄紱2-鍚︼紱" def getElevatorCode(def height, def buildTypeCode){ if(height){ if(height>=7){ @@ -1396,34 +1396,34 @@ class CZLSHDataExportPool { } - //1-正南;2-正北;3-南北;4-正东;5-正西;6-东西;7-东南;8-西南;9-东北;10-西北; + //1-姝e崡锛�2-姝e寳锛�3-鍗楀寳锛�4-姝d笢锛�5-姝hタ锛�6-涓滆タ锛�7-涓滃崡锛�8-瑗垮崡锛�9-涓滃寳锛�10-瑗垮寳锛� def getDirectionCode(def direction, def estate_type){ if(direction){ - direction = direction.replace("朝向","").replace("朝", "").replace("通透", "").replace("正",""); + direction = direction.replace("鏈濆悜","").replace("鏈�", "").replace("閫氶��", "").replace("姝�",""); } - if(direction == "南"){ + if(direction == "鍗�"){ return "01"; - }else if(direction == "北"){ + }else if(direction == "鍖�"){ return "02"; - }else if(direction == "南北"){ + }else if(direction == "鍗楀寳"){ return "03"; - }else if(direction == "东"){ + }else if(direction == "涓�"){ return "04"; - }else if(direction == "西"){ + }else if(direction == "瑗�"){ return "05"; - }else if(direction == "东西"){ + }else if(direction == "涓滆タ"){ return "06"; - }else if(direction == "东南"){ + }else if(direction == "涓滃崡"){ return "07"; - }else if(direction == "西南"){ + }else if(direction == "瑗垮崡"){ return "08"; - }else if(direction == "东北"){ + }else if(direction == "涓滃寳"){ return "09"; - }else if(direction == "西北"){ + }else if(direction == "瑗垮寳"){ return "10"; }else{ - if(estate_type && estate_type.indexOf("别墅")!=-1){ + if(estate_type && estate_type.indexOf("鍒")!=-1){ return "03"; } return "01"; @@ -1431,19 +1431,19 @@ class CZLSHDataExportPool { return "01"; } - //1-钢混;2-钢和钢混;3-砖木结构;4-混合结构;5-其他结构; + //1-閽㈡贩锛�2-閽㈠拰閽㈡贩锛�3-鐮栨湪缁撴瀯锛�4-娣峰悎缁撴瀯锛�5-鍏朵粬缁撴瀯锛� def getBuildStructureCode(def buildDate, def build_structure){ if(build_structure){ - if(build_structure.indexOf("钢混")!=-1||build_structure.indexOf("钢筋混凝土")!=-1){ + if(build_structure.indexOf("閽㈡贩")!=-1||build_structure.indexOf("閽㈢瓔娣峰嚌鍦�")!=-1){ return "01"; - }else if(build_structure.indexOf("钢和钢混")!=-1){ + }else if(build_structure.indexOf("閽㈠拰閽㈡贩")!=-1){ return "02"; - }else if(build_structure.indexOf("砖木")!=-1){ + }else if(build_structure.indexOf("鐮栨湪")!=-1){ return "03"; - }else if(build_structure.indexOf("混合")!=-1){ + }else if(build_structure.indexOf("娣峰悎")!=-1){ return "04"; - }else if(build_structure.indexOf("钢结构")!=-1){ + }else if(build_structure.indexOf("閽㈢粨鏋�")!=-1){ return "05"; }else{ def year = getMatchContent(buildDate); @@ -1469,32 +1469,32 @@ class CZLSHDataExportPool { def getShopBuildStructureCode(def dbEstateType, def houseEstateType, def build_structure){ def map = [:]; - if(houseEstateType && houseEstateType!='商场商铺'){ + if(houseEstateType && houseEstateType!='鍟嗗満鍟嗛摵'){ map.value = houseEstateType; map.code = "01"; return map; }else{ if(dbEstateType){ - if(dbEstateType!='商场商铺'){ + if(dbEstateType!='鍟嗗満鍟嗛摵'){ map.value = dbEstateType; map.code = "01"; return map; }else{ if(build_structure){ map.value = build_structure; - if(build_structure.indexOf("钢混")!=-1||build_structure.indexOf("钢筋混凝土")!=-1){ + if(build_structure.indexOf("閽㈡贩")!=-1||build_structure.indexOf("閽㈢瓔娣峰嚌鍦�")!=-1){ map.code = "01"; return map; - }else if(build_structure.indexOf("钢和钢混")!=-1){ + }else if(build_structure.indexOf("閽㈠拰閽㈡贩")!=-1){ map.code = "02"; return map; - }else if(build_structure.indexOf("砖木")!=-1){ + }else if(build_structure.indexOf("鐮栨湪")!=-1){ map.code = "03"; return map; - }else if(build_structure.indexOf("混合")!=-1){ + }else if(build_structure.indexOf("娣峰悎")!=-1){ map.code = "04"; return map; - }else if(build_structure.indexOf("钢结构")!=-1){ + }else if(build_structure.indexOf("閽㈢粨鏋�")!=-1){ map.code = "05"; return map; }else{ @@ -1533,7 +1533,7 @@ class CZLSHDataExportPool { return null; } - //1-高层;2-小高层;3-多层; 多层小于等于6 小高层小于等于10 其他为高层 + //1-楂樺眰锛�2-灏忛珮灞傦紱3-澶氬眰锛� 澶氬眰灏忎簬绛変簬6 灏忛珮灞傚皬浜庣瓑浜�10 鍏朵粬涓洪珮灞� def getBuildTypeCode(def name, def build_type, def height){ if(height){ @@ -1546,27 +1546,27 @@ class CZLSHDataExportPool { } }else{ - if(name && name.indexOf("别墅")!=-1){ + if(name && name.indexOf("鍒")!=-1){ return "3"; } if(build_type){ def type = build_type.split(","); if(type.size()==1){ - if(build_type=="高层"||build_type=="超高层"){ + if(build_type=="楂樺眰"||build_type=="瓒呴珮灞�"){ return "1"; - }else if(build_type=="小高层"){ + }else if(build_type=="灏忛珮灞�"){ return "2"; - }else if(build_type=="多层"||build_type=="独栋"||build_type=="联排"||build_type=="双拼"){ + }else if(build_type=="澶氬眰"||build_type=="鐙爧"||build_type=="鑱旀帓"||build_type=="鍙屾嫾"){ return "3"; } }else{ def s = type[0]; - if(s=="小高层"){ + if(s=="灏忛珮灞�"){ return "2"; - }else if(s=="高层"||s=="超高层"){ + }else if(s=="楂樺眰"||s=="瓒呴珮灞�"){ return "1"; - }else if(s=="多层"||s=="独栋"||s=="联排"||s=="双拼"){ + }else if(s=="澶氬眰"||s=="鐙爧"||s=="鑱旀帓"||s=="鍙屾嫾"){ return "3"; } } @@ -1607,11 +1607,11 @@ class CZLSHDataExportPool { } if(m.estate_type){ - if(m.estate_type=='普通住宅'){ + if(m.estate_type=='鏅�氫綇瀹�'){ params.put("propertyType", "0"); - }else if(m.estate_type=='别墅'){ + }else if(m.estate_type=='鍒'){ params.put("propertyType", "1"); - }else if(m.estate_type=='商住'){ + }else if(m.estate_type=='鍟嗕綇'){ params.put("propertyType", "2"); } }else{ @@ -1757,7 +1757,7 @@ class CZLSHDataExportPool { def WORK_BOOK = null; try { if (file.exists()) { - FileInputStream fs=new FileInputStream(path); //获取d://test.xls + FileInputStream fs=new FileInputStream(path); //鑾峰彇d://test.xls WORK_BOOK = WorkbookFactory.create(fs) WORK_BOOK.setForceFormulaRecalculation(true) sheet = WORK_BOOK.getSheetAt(0); @@ -1783,7 +1783,7 @@ class CZLSHDataExportPool { FileOutputStream fos = null; try { HSSFWorkbook WORK_BOOK = new HSSFWorkbook(); - HSSFSheet sheet = WORK_BOOK.createSheet("小区"); + HSSFSheet sheet = WORK_BOOK.createSheet("灏忓尯"); int row = sheet.getLastRowNum(); HSSFCellStyle cellStyle = WORK_BOOK.createCellStyle(); createTableRow(sheet, ret, cellStyle); @@ -1808,10 +1808,10 @@ class CZLSHDataExportPool { DBObject q = new BasicDBObject() q.put('city', dbo.city) q.put("cat" , "shop_sell") - if(dbo.name.indexOf("商铺")!=-1&&dbo.name.indexOf("路")==-1){ + if(dbo.name.indexOf("鍟嗛摵")!=-1&&dbo.name.indexOf("璺�")==-1){ def names = []; names << dbo.name; - names << dbo.name.replace("商铺",""); + names << dbo.name.replace("鍟嗛摵",""); BasicDBObject query = new BasicDBObject(); query.putAt(QueryOperators.IN, names); q.put("district_name", query); @@ -1843,38 +1843,38 @@ class CZLSHDataExportPool { def m = [:]; m.shop_id = dbo.get("_id").toString() m.house_id = obj.get("_id").toString(); - //小区名称 + //灏忓尯鍚嶇О m.name = oldMap.name; - //建筑面积 + //寤虹瓚闈㈢Н m.house_area = obj.area; - //建筑物总楼层 + //寤虹瓚鐗╂�绘ゼ灞� m.height = getShopHeight(obj.height, obj.estate_type, dbo.estate_type, floorInfos); - //所在楼层 + //鎵�鍦ㄦゼ灞� m.floor = getInfloor(obj.floor, m.height, obj.estate_type, dbo.estate_type); - //挂牌价 + //鎸傜墝浠� m.total_price = obj.total_price; def keys = m.name+"-"+m.house_area+"-"+m.height+"-"+m.floor+"-"+m.total_price; if(!houses.contains(keys)){ houses << keys; }else{ - println "此房源已存在....." + println "姝ゆ埧婧愬凡瀛樺湪....." continue; } - //地址 + //鍦板潃 m.address = dbo.address - //建成年代 + //寤烘垚骞翠唬 m.build_date = getBuildDate(obj.build_date, dbo); - //总使用年限 + //鎬讳娇鐢ㄥ勾闄� m.property_life = "40"//getPropertyLife(dbo.property_life); - //建筑结构 + //寤虹瓚缁撴瀯 def typeMap = getShopBuildStructureCode(dbo.estate_type, obj.estate_type, dbo.build_structure); m.build_structure_code = typeMap.code; m.build_structure = typeMap.value; - //挂牌时间 + //鎸傜墝鏃堕棿 m.publish_date = DateUtils.formatDateByPattern(obj.publish_date,"yyyyMMdd"); ret << m; @@ -1892,10 +1892,10 @@ class CZLSHDataExportPool { DBObject q = new BasicDBObject() q.put('city', dbo.city) q.put("cat" , "shop_sell") - if(dbo.name.indexOf("商铺")!=-1&&dbo.name.indexOf("路")!=-1){ + if(dbo.name.indexOf("鍟嗛摵")!=-1&&dbo.name.indexOf("璺�")!=-1){ def names = []; names << dbo.name; - names << dbo.name.replace("商铺",""); + names << dbo.name.replace("鍟嗛摵",""); BasicDBObject query = new BasicDBObject(); query.putAt(QueryOperators.IN, names); q.put("district_name", query); @@ -1928,13 +1928,13 @@ class CZLSHDataExportPool { m.shop_id = dbo.get("_id").toString() m.house_id = obj.get("_id").toString(); - //小区名称 + //灏忓尯鍚嶇О m.name = oldMap.name; - //建筑面积 + //寤虹瓚闈㈢Н m.house_area = obj.area; - //建筑物总楼层 + //寤虹瓚鐗╂�绘ゼ灞� m.height = oldMap.height - //所在楼层 + //鎵�鍦ㄦゼ灞� m.floor_value = oldMap.floor; if(oldMap.floor.indexOf("-")!=-1){ m.floor = 1; @@ -1943,30 +1943,30 @@ class CZLSHDataExportPool { } - //挂牌价 + //鎸傜墝浠� m.total_price = obj.total_price; def keys = m.name+"-"+m.house_area+"-"+m.height+"-"+m.floor+"-"+m.total_price; if(!houses.contains(keys)){ houses << keys; }else{ - println "此房源已存在....." + println "姝ゆ埧婧愬凡瀛樺湪....." continue; } - //地址 + //鍦板潃 m.address = dbo.address - //建成年代 + //寤烘垚骞翠唬 m.build_date = oldMap.build_date; - //总使用年限 + //鎬讳娇鐢ㄥ勾闄� m.property_life = oldMap.property_life; - //建筑结构 + //寤虹瓚缁撴瀯 def typeMap = getShopBuildStructureCode(dbo.estate_type, obj.estate_type, dbo.build_structure); m.build_structure_code = "01"; m.build_structure = dbo.estate_type; - //挂牌时间 + //鎸傜墝鏃堕棿 m.publish_date = DateUtils.formatDateByPattern(obj.publish_date,"yyyyMMdd"); ret << m; @@ -1997,11 +1997,11 @@ class CZLSHDataExportPool { } } - if(house_estate_type && house_estate_type.indexOf("社区商铺")!=-1){ + if(house_estate_type && house_estate_type.indexOf("绀惧尯鍟嗛摵")!=-1){ return 1; } - if(district_estate_type && district_estate_type.indexOf("社区商铺")!=-1){ + if(district_estate_type && district_estate_type.indexOf("绀惧尯鍟嗛摵")!=-1){ return 1; } return null; @@ -2014,7 +2014,7 @@ class CZLSHDataExportPool { def WORK_BOOK = null; try { if (file.exists()) { - FileInputStream fs=new FileInputStream(path); //获取d://test.xls + FileInputStream fs=new FileInputStream(path); //鑾峰彇d://test.xls WORK_BOOK = WorkbookFactory.create(fs) sheet = WORK_BOOK.getSheetAt(0); }else{ @@ -2038,41 +2038,41 @@ class CZLSHDataExportPool { } public static void createTableRow(HSSFSheet citySheet,def ret, HSSFCellStyle cellStyle) { - //创建第rowIndex行 + //鍒涘缓绗瑀owIndex琛� HSSFRow row = citySheet.createRow(0); - row.createCell(0).setCellValue("楼盘编号"); - row.createCell(1).setCellValue("楼盘名称"); - row.createCell(2).setCellValue("楼盘均价"); - row.createCell(3).setCellValue("省"); - row.createCell(4).setCellValue("市"); - row.createCell(5).setCellValue("区"); - row.createCell(6).setCellValue("所属区域"); - row.createCell(7).setCellValue("地址"); - row.createCell(8).setCellValue("公共服务配套"); - row.createCell(9).setCellValue("基础设施"); - row.createCell(10).setCellValue("居住社区成熟度"); - row.createCell(11).setCellValue("交通条件"); - row.createCell(12).setCellValue("泊车条件"); - row.createCell(13).setCellValue("学区房类型"); - row.createCell(14).setCellValue("小区绿化率"); - row.createCell(15).setCellValue("容积率"); + row.createCell(0).setCellValue("妤肩洏缂栧彿"); + row.createCell(1).setCellValue("妤肩洏鍚嶇О"); + row.createCell(2).setCellValue("妤肩洏鍧囦环"); + row.createCell(3).setCellValue("鐪�"); + row.createCell(4).setCellValue("甯�"); + row.createCell(5).setCellValue("鍖�"); + row.createCell(6).setCellValue("鎵�灞炲尯鍩�"); + row.createCell(7).setCellValue("鍦板潃"); + row.createCell(8).setCellValue("鍏叡鏈嶅姟閰嶅"); + row.createCell(9).setCellValue("鍩虹璁炬柦"); + row.createCell(10).setCellValue("灞呬綇绀惧尯鎴愮啛搴�"); + row.createCell(11).setCellValue("浜ら�氭潯浠�"); + row.createCell(12).setCellValue("娉婅溅鏉′欢"); + row.createCell(13).setCellValue("瀛﹀尯鎴跨被鍨�"); + row.createCell(14).setCellValue("灏忓尯缁垮寲鐜�"); + row.createCell(15).setCellValue("瀹圭Н鐜�"); -// row.createCell(16).setCellValue("参考租金"); -// row.createCell(17).setCellValue("物业公司"); -// row.createCell(18).setCellValue("物业费(每月每平米)"); -// row.createCell(19).setCellValue("建筑年代"); -// row.createCell(20).setCellValue("物业类型"); +// row.createCell(16).setCellValue("鍙傝�冪閲�"); +// row.createCell(17).setCellValue("鐗╀笟鍏徃"); +// row.createCell(18).setCellValue("鐗╀笟璐癸紙姣忔湀姣忓钩绫筹級"); +// row.createCell(19).setCellValue("寤虹瓚骞翠唬"); +// row.createCell(20).setCellValue("鐗╀笟绫诲瀷"); HSSFCell cell = row.createCell(16); citySheet.addMergedRegion(new CellRangeAddress(0, 0, 16, 21)); - cell.setCellValue("参考租金") + cell.setCellValue("鍙傝�冪閲�") cellStyle.setAlignment(HSSFCellStyle.ALIGN_CENTER); cell.setCellStyle(cellStyle); - row.createCell(22).setCellValue("物业公司"); - row.createCell(23).setCellValue("物业费(每月每平米)"); - row.createCell(24).setCellValue("建筑年代"); - row.createCell(25).setCellValue("物业类型"); + row.createCell(22).setCellValue("鐗╀笟鍏徃"); + row.createCell(23).setCellValue("鐗╀笟璐癸紙姣忔湀姣忓钩绫筹級"); + row.createCell(24).setCellValue("寤虹瓚骞翠唬"); + row.createCell(25).setCellValue("鐗╀笟绫诲瀷"); for(def i=0;i\t"); - sb.append("楼盘名称\t\t"); - sb.append("楼盘均价\t\t"); - sb.append("省\t\t"); - sb.append("市\t\t"); - sb.append("区\t\t"); - sb.append("地址\t\t"); - sb.append("所属区域\t\t"); - sb.append("公共服务配套\t\t"); - sb.append("基础设施\t\t"); - sb.append("居住社区成熟度\t\t"); - sb.append("交通条件\t\t"); - sb.append("泊车条件\t\t"); - sb.append("学区房类型\t\t"); - sb.append("小区绿化率\t\t"); - sb.append("容积率\t\t"); - sb.append("参考租金(1室)\t\t"); - sb.append("参考租金(2室)\t\t"); - sb.append("参考租金(3室)\t\t"); - sb.append("参考租金(4室)\t\t"); - sb.append("参考租金(5室)\t\t"); - sb.append("参考租金(5室以上)\t\t"); - sb.append("物业公司\t\t"); - sb.append("物业费(每月每平米)<#r>\n"); + sb.append("妤肩洏缂栧彿\t\t"); + sb.append("妤肩洏鍚嶇О\t\t"); + sb.append("妤肩洏鍧囦环\t\t"); + sb.append("鐪乗t\t"); + sb.append("甯俓t\t"); + sb.append("鍖篭t\t"); + sb.append("鍦板潃\t\t"); + sb.append("鎵�灞炲尯鍩焅t\t"); + sb.append("鍏叡鏈嶅姟閰嶅\t\t"); + sb.append("鍩虹璁炬柦\t\t"); + sb.append("灞呬綇绀惧尯鎴愮啛搴t\t"); + sb.append("浜ら�氭潯浠禱t\t"); + sb.append("娉婅溅鏉′欢\t\t"); + sb.append("瀛﹀尯鎴跨被鍨媆t\t"); + sb.append("灏忓尯缁垮寲鐜嘰t\t"); + sb.append("瀹圭Н鐜嘰t\t"); + sb.append("鍙傝�冪閲�(1瀹�)\t\t"); + sb.append("鍙傝�冪閲�(2瀹�)\t\t"); + sb.append("鍙傝�冪閲�(3瀹�)\t\t"); + sb.append("鍙傝�冪閲�(4瀹�)\t\t"); + sb.append("鍙傝�冪閲�(5瀹�)\t\t"); + sb.append("鍙傝�冪閲�(5瀹や互涓�)\t\t"); + sb.append("鐗╀笟鍏徃\t\t"); + sb.append("鐗╀笟璐癸紙姣忔湀姣忓钩绫筹級<#r>\n"); for(def m : result){ sb.append(converValue(m.id.toString())+"\t\t"); @@ -2213,22 +2213,22 @@ class CZLSHDataExportPool { def getDistrictHouseString(def result, def removeDistricts){ def sb = new StringBuffer(); def index = 0; - sb.append("房源编号\t\t"); - sb.append("楼盘编号\t\t"); - sb.append("建成年代\t\t"); - sb.append("总使用年限\t\t"); - sb.append("建筑面积\t\t"); - sb.append("朝向\t\t"); - sb.append("建筑结构\t\t"); - sb.append("建筑类别\t\t"); - sb.append("内部装修与成新度\t\t"); - sb.append("所在楼层\t\t"); - sb.append("建筑物总楼层\t\t"); - sb.append("是否有电梯\t\t"); - sb.append("房价网评估价\t\t"); - sb.append("评估时间\t\t"); - sb.append("挂牌价\t\t"); - sb.append("挂牌时间<#r>\n"); + sb.append("鎴挎簮缂栧彿\t\t"); + sb.append("妤肩洏缂栧彿\t\t"); + sb.append("寤烘垚骞翠唬\t\t"); + sb.append("鎬讳娇鐢ㄥ勾闄怽t\t"); + sb.append("寤虹瓚闈㈢Н\t\t"); + sb.append("鏈濆悜\t\t"); + sb.append("寤虹瓚缁撴瀯\t\t"); + sb.append("寤虹瓚绫诲埆\t\t"); + sb.append("鍐呴儴瑁呬慨涓庢垚鏂板害\t\t"); + sb.append("鎵�鍦ㄦゼ灞俓t\t"); + sb.append("寤虹瓚鐗╂�绘ゼ灞俓t\t"); + sb.append("鏄惁鏈夌數姊痋t\t"); + sb.append("鎴夸环缃戣瘎浼颁环\t\t"); + sb.append("璇勪及鏃堕棿\t\t"); + sb.append("鎸傜墝浠穃t\t"); + sb.append("鎸傜墝鏃堕棿<#r>\n"); for(def m : result){ index++; if(removeDistricts.contains(m.name)){ @@ -2269,34 +2269,34 @@ class CZLSHDataExportPool { def getShopString(def result){ def sb = new StringBuffer(); def index = 0; - sb.append("商铺编号\t\t"); - sb.append("商铺名称\t\t"); - sb.append("楼盘均价\t\t"); - sb.append("省\t\t"); - sb.append("市\t\t"); - sb.append("区\t\t"); + sb.append("鍟嗛摵缂栧彿\t\t"); + sb.append("鍟嗛摵鍚嶇О\t\t"); + sb.append("妤肩洏鍧囦环\t\t"); + sb.append("鐪乗t\t"); + sb.append("甯俓t\t"); + sb.append("鍖篭t\t"); - sb.append("省(原值)\t\t"); - sb.append("市(原值)\t\t"); - sb.append("区(原值)\t\t"); + sb.append("鐪�(鍘熷��)\t\t"); + sb.append("甯�(鍘熷��)\t\t"); + sb.append("鍖�(鍘熷��)\t\t"); - sb.append("地址\t\t"); - sb.append("路\t\t"); + sb.append("鍦板潃\t\t"); + sb.append("璺痋t\t"); - sb.append("所属区域\t\t"); - sb.append("商铺类型\t\t"); + sb.append("鎵�灞炲尯鍩焅t\t"); + sb.append("鍟嗛摵绫诲瀷\t\t"); - sb.append("商铺类型(原值)\t\t"); + sb.append("鍟嗛摵绫诲瀷(鍘熷��)\t\t"); - sb.append("公共服务配套\t\t"); - sb.append("基础设施\t\t"); - sb.append("商业密度\t\t"); - sb.append("交通条件\t\t"); - sb.append("泊车条件\t\t"); - sb.append("临街道路\t\t"); - sb.append("租金\t\t"); - sb.append("物业公司\t\t"); - sb.append("物业费(每月每平米)<#r>\n"); + sb.append("鍏叡鏈嶅姟閰嶅\t\t"); + sb.append("鍩虹璁炬柦\t\t"); + sb.append("鍟嗕笟瀵嗗害\t\t"); + sb.append("浜ら�氭潯浠禱t\t"); + sb.append("娉婅溅鏉′欢\t\t"); + sb.append("涓磋閬撹矾\t\t"); + sb.append("绉熼噾\t\t"); + sb.append("鐗╀笟鍏徃\t\t"); + sb.append("鐗╀笟璐癸紙姣忔湀姣忓钩绫筹級<#r>\n"); for(def m : result){ sb.append(m.shop_id.toString()+"\t\t"); sb.append(m.name+"\t\t"); @@ -2305,9 +2305,9 @@ class CZLSHDataExportPool { sb.append(converValue(m.city)+"\t\t"); sb.append(converValue(m.region)+"\t\t"); - sb.append(converValue(m.province_old)+"\t\t");//新增 - sb.append(converValue(m.city_old)+"\t\t");//新增 - sb.append(converValue(m.region_old)+"\t\t");//新增 + sb.append(converValue(m.province_old)+"\t\t");//鏂板 + sb.append(converValue(m.city_old)+"\t\t");//鏂板 + sb.append(converValue(m.region_old)+"\t\t");//鏂板 sb.append(converValue(m.address)+"\t\t"); @@ -2340,23 +2340,23 @@ class CZLSHDataExportPool { def getShopHouseString(def result){ def sb = new StringBuffer(); def index = 0; - sb.append("房源编号\t\t"); - sb.append("商铺编号\t\t"); - sb.append("详细地址\t\t"); - sb.append("建成年代\t\t"); - sb.append("总使用年限\t\t"); - sb.append("建筑面积\t\t"); - sb.append("建筑结构\t\t"); + sb.append("鎴挎簮缂栧彿\t\t"); + sb.append("鍟嗛摵缂栧彿\t\t"); + sb.append("璇︾粏鍦板潃\t\t"); + sb.append("寤烘垚骞翠唬\t\t"); + sb.append("鎬讳娇鐢ㄥ勾闄怽t\t"); + sb.append("寤虹瓚闈㈢Н\t\t"); + sb.append("寤虹瓚缁撴瀯\t\t"); - sb.append("建筑结构(原值)\t\t"); + sb.append("寤虹瓚缁撴瀯(鍘熷��)\t\t"); - sb.append("所在楼层\t\t"); + sb.append("鎵�鍦ㄦゼ灞俓t\t"); - sb.append("所在楼层(原值)\t\t"); + sb.append("鎵�鍦ㄦゼ灞�(鍘熷��)\t\t"); - sb.append("建筑物总楼层\t\t"); - sb.append("挂牌价\t\t"); - sb.append("挂牌时间<#r>\n"); + sb.append("寤虹瓚鐗╂�绘ゼ灞俓t\t"); + sb.append("鎸傜墝浠穃t\t"); + sb.append("鎸傜墝鏃堕棿<#r>\n"); for(def m : result){ @@ -2416,11 +2416,11 @@ class CZLSHDataExportPool { } } - if(house_estate_type && house_estate_type.indexOf("社区商铺")!=-1){ + if(house_estate_type && house_estate_type.indexOf("绀惧尯鍟嗛摵")!=-1){ return 1; } - if(district_estate_type && district_estate_type.indexOf("社区商铺")!=-1){ + if(district_estate_type && district_estate_type.indexOf("绀惧尯鍟嗛摵")!=-1){ return 1; } return 1; @@ -2436,22 +2436,22 @@ class CZLSHDataExportPool { } def createShopHouseTableRow(HSSFSheet citySheet,def ret) { - //创建第rowIndex行 + //鍒涘缓绗瑀owIndex琛� int rowCount = citySheet.getLastRowNum(); if(rowCount<1){ HSSFRow row = citySheet.createRow(0); - row.createCell(0).setCellValue("商铺编号"); - row.createCell(1).setCellValue("房源编号"); - row.createCell(2).setCellValue("商铺名称"); - row.createCell(3).setCellValue("详细地址"); - row.createCell(4).setCellValue("建成年代"); - row.createCell(5).setCellValue("总使用年限"); - row.createCell(6).setCellValue("建筑面积"); - row.createCell(7).setCellValue("建筑结构"); - row.createCell(8).setCellValue("所在楼层"); - row.createCell(9).setCellValue("建筑物总楼层"); - row.createCell(10).setCellValue("挂牌价 "); - row.createCell(11).setCellValue("挂牌时间"); + row.createCell(0).setCellValue("鍟嗛摵缂栧彿"); + row.createCell(1).setCellValue("鎴挎簮缂栧彿"); + row.createCell(2).setCellValue("鍟嗛摵鍚嶇О"); + row.createCell(3).setCellValue("璇︾粏鍦板潃"); + row.createCell(4).setCellValue("寤烘垚骞翠唬"); + row.createCell(5).setCellValue("鎬讳娇鐢ㄥ勾闄�"); + row.createCell(6).setCellValue("寤虹瓚闈㈢Н"); + row.createCell(7).setCellValue("寤虹瓚缁撴瀯"); + row.createCell(8).setCellValue("鎵�鍦ㄦゼ灞�"); + row.createCell(9).setCellValue("寤虹瓚鐗╂�绘ゼ灞�"); + row.createCell(10).setCellValue("鎸傜墝浠� "); + row.createCell(11).setCellValue("鎸傜墝鏃堕棿"); } @@ -2480,27 +2480,27 @@ class CZLSHDataExportPool { def createHouseTableRow(def citySheet,def ret, def removeDistricts) { - //创建第rowIndex行 + //鍒涘缓绗瑀owIndex琛� int rowCount = citySheet.getLastRowNum();;// if(rowCount<1){ Row row = citySheet.createRow(0); - row.createCell(0).setCellValue("楼盘编号"); - row.createCell(1).setCellValue("房源编号"); - row.createCell(2).setCellValue("楼盘名称"); - row.createCell(3).setCellValue("建成年代"); - row.createCell(4).setCellValue("总使用年限"); - row.createCell(5).setCellValue("建筑面积"); - row.createCell(6).setCellValue("朝向"); - row.createCell(7).setCellValue("建筑结构"); - row.createCell(8).setCellValue("建筑类别"); - row.createCell(9).setCellValue("内部装修与成新度"); - row.createCell(10).setCellValue("所在楼层"); - row.createCell(11).setCellValue("建筑物总楼层"); - row.createCell(12).setCellValue("是否有电梯"); - row.createCell(13).setCellValue("房价网评估价"); - row.createCell(14).setCellValue("评估时间"); - row.createCell(15).setCellValue("挂牌价 "); - row.createCell(16).setCellValue("挂牌时间"); + row.createCell(0).setCellValue("妤肩洏缂栧彿"); + row.createCell(1).setCellValue("鎴挎簮缂栧彿"); + row.createCell(2).setCellValue("妤肩洏鍚嶇О"); + row.createCell(3).setCellValue("寤烘垚骞翠唬"); + row.createCell(4).setCellValue("鎬讳娇鐢ㄥ勾闄�"); + row.createCell(5).setCellValue("寤虹瓚闈㈢Н"); + row.createCell(6).setCellValue("鏈濆悜"); + row.createCell(7).setCellValue("寤虹瓚缁撴瀯"); + row.createCell(8).setCellValue("寤虹瓚绫诲埆"); + row.createCell(9).setCellValue("鍐呴儴瑁呬慨涓庢垚鏂板害"); + row.createCell(10).setCellValue("鎵�鍦ㄦゼ灞�"); + row.createCell(11).setCellValue("寤虹瓚鐗╂�绘ゼ灞�"); + row.createCell(12).setCellValue("鏄惁鏈夌數姊�"); + row.createCell(13).setCellValue("鎴夸环缃戣瘎浼颁环"); + row.createCell(14).setCellValue("璇勪及鏃堕棿"); + row.createCell(15).setCellValue("鎸傜墝浠� "); + row.createCell(16).setCellValue("鎸傜墝鏃堕棿"); } @@ -2548,13 +2548,13 @@ class CZLSHDataExportPool { File file = new File(path); if(file.exists()){ - FileInputStream fs=new FileInputStream(path); //获取d://test.xls + FileInputStream fs=new FileInputStream(path); //鑾峰彇d://test.xls def WORK_BOOK = WorkbookFactory.create(fs) def sheet = WORK_BOOK.getSheetAt(0); def ret = []; sheet.eachWithIndex {row, index-> if(index>0){ - if(row.getCell(0).toString()!="楼盘名称"){ + if(row.getCell(0).toString()!="妤肩洏鍚嶇О"){ if(!ret.contains(row.getCell(0).toString())){ ret<< row.getCell(0).toString(); } @@ -2575,7 +2575,7 @@ class CZLSHDataExportPool { def rowCount = workbook.getSheetAt(0).getLastRowNum(); def sheet1=workbook.getSheetAt(0); def result = []; - //循环行 + //寰幆琛� sheet1.eachWithIndex {row, index-> def rowNum = row.getRowNum(); @@ -2597,7 +2597,7 @@ class CZLSHDataExportPool { def heights = row.getCell(13).toString(); if(heights){ - def heightArray = heights.split("、") + def heightArray = heights.split("銆�") heightArray.sort(); def lists = []; for(def height : heightArray){ @@ -2625,8 +2625,8 @@ class CZLSHDataExportPool { def rowCount = workbook.getSheetAt(0).getLastRowNum(); def sheet1=workbook.getSheetAt(0); def result = []; - def regionMap = getAllRegionBlockByCityAndCat("常州","region") - //循环行 + def regionMap = getAllRegionBlockByCityAndCat("甯稿窞","region") + //寰幆琛� sheet1.eachWithIndex {row, index-> if(index>0){ @@ -2637,8 +2637,8 @@ class CZLSHDataExportPool { ret.address = row.getCell(2).toString(); - ret.proince = "江苏"; - ret.city = "常州"; + ret.proince = "姹熻嫃"; + ret.city = "甯稿窞"; def region = getStandardRegion(regionMap, row.getCell(0).toString()); @@ -2691,14 +2691,14 @@ class CZLSHDataExportPool { def rowCount = workbook.getSheetAt(0).getLastRowNum(); def sheet1=workbook.getSheetAt(0); def m = [:]; - //循环行 + //寰幆琛� sheet1.eachWithIndex {row, index-> def rowNum = row.getRowNum(); //if(index>0){ def heights = row.getCell(13).toString(); if(heights){ - def heightArray = heights.split("、") + def heightArray = heights.split("銆�") heightArray.sort(); def lists = []; for(def height : heightArray){ @@ -2753,8 +2753,8 @@ class CZLSHDataExportPool { def rowCount = workbook.getSheetAt(0).getLastRowNum(); def sheet1=workbook.getSheetAt(0); def result = []; - def regionMap = getAllRegionBlockByCityAndCat("常州","region") - //循环行 + def regionMap = getAllRegionBlockByCityAndCat("甯稿窞","region") + //寰幆琛� sheet1.eachWithIndex {row, index-> println row.cells; if(index>=1){ @@ -2803,7 +2803,7 @@ class CZLSHDataExportPool { def rowCount = workbook.getSheetAt(0).getLastRowNum(); def sheet1=workbook.getSheetAt(0); def result = []; - //循环行 + //寰幆琛� sheet1.eachWithIndex {row, index-> if(index > 0){ def map = [:]; @@ -2825,7 +2825,7 @@ class CZLSHDataExportPool { def names = []; names << name; - names << name.replace("商铺",""); + names << name.replace("鍟嗛摵",""); BasicDBObject query = new BasicDBObject(); query.putAt(QueryOperators.IN, names); q.put("alias", query); @@ -2848,10 +2848,10 @@ class CZLSHDataExportPool { q.put('city', city) q.put('region', region) q.put("cat" , cat) -// if(name.indexOf("商铺")!=-1){ +// if(name.indexOf("鍟嗛摵")!=-1){ // def names = []; // names << name; -// names << name.replace("商铺",""); +// names << name.replace("鍟嗛摵",""); // BasicDBObject query = new BasicDBObject(); // query.putAt(QueryOperators.IN, names); // q.put("district_name", query); @@ -2878,12 +2878,12 @@ class CZLSHDataExportPool { for(def row : result){ def m = [:]; index++; - m.province_old = "江苏"; - m.city_old = "常州"; + m.province_old = "姹熻嫃"; + m.city_old = "甯稿窞"; m.region_old = row.region; - m.province = regionMap.get("江苏"); - m.city = regionMap.get("常州"); + m.province = regionMap.get("姹熻嫃"); + m.city = regionMap.get("甯稿窞"); m.region = regionMap.get(row.region) m.name = row.name; @@ -2915,23 +2915,23 @@ class CZLSHDataExportPool { postionMap.lng = location.lng * 10000000000d; } } - //公共服务配套 + //鍏叡鏈嶅姟閰嶅 m.publicServiceSetCode = getPublicServiceSetCode(postionMap.lat, postionMap.lng) - //基础设施 + //鍩虹璁炬柦 m.facilitiesCode = "01"; - //居住社区成熟度 + //灞呬綇绀惧尯鎴愮啛搴� m.sophisticationCode = getSophistication(m.city_old, postionMap.lat, postionMap.lng); - //交通条件 + //浜ら�氭潯浠� m.trafficCode = getTrafficCode(m.city_old, postionMap.lat, postionMap.lng); m.estateType = getShopEstateTypeCode(row.estate_type); m.estateType_old = row.estate_type; - m.stopCarCode = getCarCode(row.carsite);//row[7]=="有"?"01":"02"; + m.stopCarCode = getCarCode(row.carsite);//row[7]=="鏈�"?"01":"02"; m.stopCarValue = row.carsite; m.streetCode = getStreetCode(row.name, row.traffic); @@ -2952,7 +2952,7 @@ class CZLSHDataExportPool { def getRoad(def address){ if(address){ - Pattern pattern = Pattern.compile("^.+(路|街道|街|弄|大道|巷|道|里|((一|二|三|四|五|六|七|八|九|十|东|南|西|北|复)线))(交汇|.段)?"); + Pattern pattern = Pattern.compile("^.+(璺瘄琛楅亾|琛梶寮剕澶ч亾|宸穦閬搢閲寍((涓�|浜寍涓墊鍥泑浜攟鍏瓅涓億鍏珅涔潀鍗亅涓渱鍗梶瑗縷鍖梶澶�)绾�))(浜ゆ眹|.娈�)?"); if(pattern == null || address == null){ return null; @@ -2973,7 +2973,7 @@ class CZLSHDataExportPool { def getCarCode(def carsite){ if(carsite){ - if(carsite=="有"){ + if(carsite=="鏈�"){ return "01"; }else{ return "02"; @@ -2984,7 +2984,7 @@ class CZLSHDataExportPool { def getShopPrice(def priceString, def city, def region, def name){ if(priceString){ - def avgPrice = priceString.replace("元/㎡","").replace("房源价", "").replace("房源", ""); + def avgPrice = priceString.replace("鍏�/銕�","").replace("鎴挎簮浠�", "").replace("鎴挎簮", ""); if(avgPrice.indexOf("-")!=-1){ def array = avgPrice.split("-") if(array.length>1){ @@ -2998,11 +2998,11 @@ class CZLSHDataExportPool { DBObject q = new BasicDBObject() q.put('city', city) q.put('region', region) - q.put("estate_type" , "商铺") - if(name.indexOf("商铺")!=-1){ + q.put("estate_type" , "鍟嗛摵") + if(name.indexOf("鍟嗛摵")!=-1){ def names = []; names << name; - names << name.replace("商铺",""); + names << name.replace("鍟嗛摵",""); BasicDBObject query = new BasicDBObject(); query.putAt(QueryOperators.IN, names); q.put("district_name", query); @@ -3020,10 +3020,10 @@ class CZLSHDataExportPool { def getRentNumber(def rentPrice,def city, def region, def name){ if(rentPrice){ rentPrice = rentPrice.toString(); - if(rentPrice.indexOf("元/㎡/天")!=-1){ - return rentPrice.replace("元/㎡/天",""); - }else if(rentPrice.indexOf("元/㎡/月")!=-1){ - def price = rentPrice.replace("元/㎡/月","").toString().trim(); + if(rentPrice.indexOf("鍏�/銕�/澶�")!=-1){ + return rentPrice.replace("鍏�/銕�/澶�",""); + }else if(rentPrice.indexOf("鍏�/銕�/鏈�")!=-1){ + def price = rentPrice.replace("鍏�/銕�/鏈�","").toString().trim(); price = price.toFloat(); price = price/30; return new DecimalFormat("######0.00").format(price); @@ -3035,7 +3035,7 @@ class CZLSHDataExportPool { q.put("city", city); q.put("region", region); q.put("name", name); - q.put("kind", "商铺"); + q.put("kind", "鍟嗛摵"); def dbCoursor = RENT_COLL.find(q).sort(new BasicDBObject("weekend",-1)).limit(1); @@ -3049,9 +3049,9 @@ class CZLSHDataExportPool { def getEstateChargeValue(def estateCharge){ if(estateCharge){ - if(estateCharge.indexOf("元/㎡/月")!=-1){ - return estateCharge.replace("元/㎡/月",""); - }else if(estateCharge.indexOf("不需缴纳物业费")!=-1){ + if(estateCharge.indexOf("鍏�/銕�/鏈�")!=-1){ + return estateCharge.replace("鍏�/銕�/鏈�",""); + }else if(estateCharge.indexOf("涓嶉渶缂寸撼鐗╀笟璐�")!=-1){ return 0; }else{ return estateCharge; @@ -3062,13 +3062,13 @@ class CZLSHDataExportPool { def getShopEstateTypeCode(def estateType){ if(estateType){ - if(estateType.indexOf("商场商铺")!=-1){ + if(estateType.indexOf("鍟嗗満鍟嗛摵")!=-1){ return 1; - }else if(estateType.indexOf("专业市场")!=-1){ + }else if(estateType.indexOf("涓撲笟甯傚満")!=-1){ return 2; - }else if(estateType.indexOf("商业街")!=-1){ + }else if(estateType.indexOf("鍟嗕笟琛�")!=-1){ return 3; - }else if(estateType.indexOf("社区商铺")!=-1){ + }else if(estateType.indexOf("绀惧尯鍟嗛摵")!=-1){ return 4; } } @@ -3077,18 +3077,18 @@ class CZLSHDataExportPool { def getStreetCode(def name, def val){ - if(name.indexOf("滆湖中路55号商铺")==-1&&name.indexOf("凯尔锋度花园商铺")==-1){ + if(name.indexOf("婊嗘箹涓矾55鍙峰晢閾�")==-1&&name.indexOf("鍑皵閿嬪害鑺卞洯鍟嗛摵")==-1){ return "1" }else{ return "3" } if(val){ - if(val == "无交通管制"){ + if(val == "鏃犱氦閫氱鍒�"){ return "1"; - }else if(val == "单行道"){ + }else if(val == "鍗曡閬�"){ return "2"; - }else if(val == "禁行"){ + }else if(val == "绂佽"){ return "3"; } } @@ -3104,7 +3104,7 @@ class CZLSHDataExportPool { FileOutputStream fos = null; try { HSSFWorkbook WORK_BOOK = new HSSFWorkbook(); - HSSFSheet sheet = WORK_BOOK.createSheet("商铺"); + HSSFSheet sheet = WORK_BOOK.createSheet("鍟嗛摵"); int row = sheet.getLastRowNum(); createShopExcel(sheet, ret); fos = new FileOutputStream(file); @@ -3122,32 +3122,32 @@ class CZLSHDataExportPool { } def createShopExcel(HSSFSheet citySheet,def ret) { - //创建第rowIndex行 + //鍒涘缓绗瑀owIndex琛� int rowCount = citySheet.getLastRowNum(); if(rowCount<1){ HSSFRow row = citySheet.createRow(0); - row.createCell(0).setCellValue("商铺编号"); - row.createCell(1).setCellValue("商铺名称"); - row.createCell(2).setCellValue("楼盘均价"); - row.createCell(3).setCellValue("地址"); - row.createCell(4).setCellValue("省"); - row.createCell(5).setCellValue("市"); - row.createCell(6).setCellValue("区"); - row.createCell(7).setCellValue("所属区域"); - row.createCell(8).setCellValue("公共服务配套"); - row.createCell(9).setCellValue("基础设施"); - row.createCell(10).setCellValue("商业密度"); - row.createCell(11).setCellValue("商铺类型"); - row.createCell(12).setCellValue("交通条件"); - row.createCell(13).setCellValue("泊车条件"); - row.createCell(14).setCellValue("临街道路"); - row.createCell(15).setCellValue("租金水平"); - row.createCell(16).setCellValue("物业公司"); - row.createCell(17).setCellValue("物业费(每月每平米)"); + row.createCell(0).setCellValue("鍟嗛摵缂栧彿"); + row.createCell(1).setCellValue("鍟嗛摵鍚嶇О"); + row.createCell(2).setCellValue("妤肩洏鍧囦环"); + row.createCell(3).setCellValue("鍦板潃"); + row.createCell(4).setCellValue("鐪�"); + row.createCell(5).setCellValue("甯�"); + row.createCell(6).setCellValue("鍖�"); + row.createCell(7).setCellValue("鎵�灞炲尯鍩�"); + row.createCell(8).setCellValue("鍏叡鏈嶅姟閰嶅"); + row.createCell(9).setCellValue("鍩虹璁炬柦"); + row.createCell(10).setCellValue("鍟嗕笟瀵嗗害"); + row.createCell(11).setCellValue("鍟嗛摵绫诲瀷"); + row.createCell(12).setCellValue("浜ら�氭潯浠�"); + row.createCell(13).setCellValue("娉婅溅鏉′欢"); + row.createCell(14).setCellValue("涓磋閬撹矾"); + row.createCell(15).setCellValue("绉熼噾姘村钩"); + row.createCell(16).setCellValue("鐗╀笟鍏徃"); + row.createCell(17).setCellValue("鐗╀笟璐癸紙姣忔湀姣忓钩绫筹級"); row.createCell(18).setCellValue(""); - row.createCell(19).setCellValue("总层数"); + row.createCell(19).setCellValue("鎬诲眰鏁�"); } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/CZLSHDataExport.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/CZLSHDataExport.groovy index e93d6f249..cea24b33d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/CZLSHDataExport.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/CZLSHDataExport.groovy @@ -63,7 +63,7 @@ import com.mongodb.Bytes; import org.apache.commons.io.FileUtils; import org.apache.commons.lang.math.RandomUtils; /** - * 常州农商行数据导出 + * 甯稿窞鍐滃晢琛屾暟鎹鍑� * @author gaojuan * */ @@ -90,16 +90,16 @@ class CZLSHDataExport { public static final DBCollection REGION_BLOCK_COLL = MongoUtils.getCollectionByName("fangjia", "region_block", "mongo.db.fangjia.com") - def directionMap = [1:"南",2:"北",3:"南北",4:"东",5:"西",6:"东西",7:"东南",8:"西南",9:"东北",10:"西北"] - def fitmentMap = [1:"毛坯",2:"简装",3:"精装"]; + def directionMap = [1:"鍗�",2:"鍖�",3:"鍗楀寳",4:"涓�",5:"瑗�",6:"涓滆タ",7:"涓滃崡",8:"瑗垮崡",9:"涓滃寳",10:"瑗垮寳"] + def fitmentMap = [1:"姣涘澂",2:"绠�瑁�",3:"绮捐"]; - def directionMap1 = ["西南":1,"东南":2,"南":3,"西北":4,"东北":5,"东":6,"西":7,"北":8,"东西":9,"南北":10] + def directionMap1 = ["瑗垮崡":1,"涓滃崡":2,"鍗�":3,"瑗垮寳":4,"涓滃寳":5,"涓�":6,"瑗�":7,"鍖�":8,"涓滆タ":9,"鍗楀寳":10] def static FITMENTS_TYPES_MAPS = [:]; def lastRowNumber = 0; - def regionMap = ["江苏":"320000","常州":"320400","天宁":"320402","钟楼":"320404","戚墅堰":"320405","新北":"320411","武进":"320412","溧阳":"320481","金坛":"320482"]; + def regionMap = ["姹熻嫃":"320000","甯稿窞":"320400","澶╁畞":"320402","閽熸ゼ":"320404","鎴氬鍫�":"320405","鏂板寳":"320411","姝﹁繘":"320412","婧ч槼":"320481","閲戝潧":"320482"]; static main(args) { @@ -107,26 +107,26 @@ class CZLSHDataExport { def time = DateUtils.formatDateByPattern(new Date(),"yyyyMMdd"); - task.shopHouseRun("E:\\常州数据结果\\原始数据\\常州江南银行商铺--更新ing(1).xls", "e:\\常州数据结果\\excel\\常州商铺房源数据.xls","e:\\常州数据结果\\dat\\easycms_shops_info_"+ time+".txt");//商铺 -// task.shopDistrictRun("e:\\常州数据结果\\原始数据\\常州江南银行商铺--更新ing(1).xls","e:\\常州数据结果\\excel\\常州商铺数据.xls","e:\\常州数据结果\\dat\\easycms_shops_market_"+ time+".txt"); + task.shopHouseRun("E:\\甯稿窞鏁版嵁缁撴灉\\鍘熷鏁版嵁\\甯稿窞姹熷崡閾惰鍟嗛摵--鏇存柊ing(1).xls", "e:\\甯稿窞鏁版嵁缁撴灉\\excel\\甯稿窞鍟嗛摵鎴挎簮鏁版嵁.xls","e:\\甯稿窞鏁版嵁缁撴灉\\dat\\easycms_shops_info_"+ time+".txt");//鍟嗛摵 +// task.shopDistrictRun("e:\\甯稿窞鏁版嵁缁撴灉\\鍘熷鏁版嵁\\甯稿窞姹熷崡閾惰鍟嗛摵--鏇存柊ing(1).xls","e:\\甯稿窞鏁版嵁缁撴灉\\excel\\甯稿窞鍟嗛摵鏁版嵁.xls","e:\\甯稿窞鏁版嵁缁撴灉\\dat\\easycms_shops_market_"+ time+".txt"); - task.runDistrict("e:\\常州数据结果\\原始数据\\常州江南银行住宅--更新ing.xls", "e:\\常州数据结果\\excel\\常州小区数据.xls","e:\\常州数据结果\\dat\\easycms_house_community_"+time +".txt");//住宅 -// task.runDistrictHouse("e:\\常州数据结果\\原始数据\\常州江南银行住宅--更新ing.xls", "e:\\常州数据结果\\dat\\easycms_house_info_"+ time+".txt");//房源 + task.runDistrict("e:\\甯稿窞鏁版嵁缁撴灉\\鍘熷鏁版嵁\\甯稿窞姹熷崡閾惰浣忓畢--鏇存柊ing.xls", "e:\\甯稿窞鏁版嵁缁撴灉\\excel\\甯稿窞灏忓尯鏁版嵁.xls","e:\\甯稿窞鏁版嵁缁撴灉\\dat\\easycms_house_community_"+time +".txt");//浣忓畢 +// task.runDistrictHouse("e:\\甯稿窞鏁版嵁缁撴灉\\鍘熷鏁版嵁\\甯稿窞姹熷崡閾惰浣忓畢--鏇存柊ing.xls", "e:\\甯稿窞鏁版嵁缁撴灉\\dat\\easycms_house_info_"+ time+".txt");//鎴挎簮 -// task.runNoExport("e:\\常州数据结果\\dat\\easycms_house_community_"+time +".txt"); +// task.runNoExport("e:\\甯稿窞鏁版嵁缁撴灉\\dat\\easycms_house_community_"+time +".txt"); } def runDistrict(def filePath, def excelFile, def datFile){ - def city = "常州"; + def city = "甯稿窞"; initFitmentMap(); def districts = readDistrict(filePath); def districtNames = [] //def datas = findSeaweedData(city, "district"); districts = findRepeatDatas(districts, "district"); - //小区 + //灏忓尯 def ret = standardData(districts); //export(ret, excelFile); outPutFile(datFile, appendResult(ret, "district", null)); @@ -135,10 +135,10 @@ class CZLSHDataExport { def runNoExport(def datFile){ - def removeDistricts = []//readRemoveDistrict("e:\\常州数据结果\\常州需删除小区.xls"); + def removeDistricts = []//readRemoveDistrict("e:\\甯稿窞鏁版嵁缁撴灉\\甯稿窞闇�鍒犻櫎灏忓尯.xls"); - def districts = findSeaweedData("常州","district"); - def ret = readTxt("E:\\常州数据结果\\dat\\easycms_house_community_20160215.txt"); + def districts = findSeaweedData("甯稿窞","district"); + def ret = readTxt("E:\\甯稿窞鏁版嵁缁撴灉\\dat\\easycms_house_community_20160215.txt"); def ids = []; def index = 0; for(def list : ret){ @@ -180,17 +180,17 @@ class CZLSHDataExport { // def removeDistricts = readRemoveDistrict(removeDistrictFile); // def districts = readDistrict(filePath); // def districtNames = [] -// def datas = findSeaweedData("常州", "district"); - //小区房源 +// def datas = findSeaweedData("甯稿窞", "district"); + //灏忓尯鎴挎簮 // findDistrictHouse(datas, districtNames, "2015-6-1", removeDistricts); // findDistrictHouse(districts, "2015-10-1", []); - runOpenApiEvaluate();//房源估价 + runOpenApiEvaluate();//鎴挎簮浼颁环 - exportDistrictHouse([], null, datFile);//导出房源 + exportDistrictHouse([], null, datFile);//瀵煎嚭鎴挎簮 } def shopHouseRun(def oldFile, def newFile, def datFile){ - def city = "常州"; + def city = "甯稿窞"; initFitmentMap(); //def datas = findSeaweedData(city, "shop"); //def shopMap = readShopExcelMap(oldFile); @@ -200,9 +200,9 @@ class CZLSHDataExport { } def shopDistrictRun(def filePath, def newFile, def datFile){ - //之后100个商铺 + //涔嬪悗100涓晢閾� //def shopMap100 = readShopExcelMap100(oldFile100); - //之后500个商铺 + //涔嬪悗500涓晢閾� //def shopMap400 = readShopExcelMap400(oldFile500); //def result = shopMap100 + shopMap400; //def result = readShopExcel(oldFile); @@ -229,15 +229,15 @@ class CZLSHDataExport { outPutFile(datFile, appendResult(dscursor, "district_house",[])); } - //去除重复数据 + //鍘婚櫎閲嶅鏁版嵁 def findRepeatDatas(def result, def cat){ def repeatDatas = [] def keys = []; def newResult = []; - println "未处理前共:"+result.size(); + println "鏈鐞嗗墠鍏憋細"+result.size(); for(def map : result){ -// if(map.name!="壹号广场"){ +// if(map.name!="澹瑰彿骞垮満"){ // continue; // } def dbo = findSeaweed(map.city, map.region, map.name, cat); @@ -251,14 +251,14 @@ class CZLSHDataExport { def key = dbo.region +"-"+dbo.name; if(keys.contains(key)){ - println "重复:"+key + println "閲嶅锛�"+key continue; }else{ keys << key; newResult << map; } } - println "处理后共:"+newResult.size(); + println "澶勭悊鍚庡叡锛�"+newResult.size(); return newResult; } @@ -304,7 +304,7 @@ class CZLSHDataExport { } def height = obj.height - if(!height||height==1 || (height>59 && obj.name!="凯纳商务广场")){ + if(!height||height==1 || (height>59 && obj.name!="鍑撼鍟嗗姟骞垮満")){ DBObject query = new BasicDBObject() query.put("city", obj.city); query.put("region", obj.region); @@ -362,7 +362,7 @@ class CZLSHDataExport { def code = getBuildTypeCode(null, null, height); - if(name.indexOf("别墅")!=-1 || house_area>=200){ + if(name.indexOf("鍒")!=-1 || house_area>=200){ code = "3"; if(height>6){ height = null @@ -398,9 +398,9 @@ class CZLSHDataExport { def initFitmentMap(){ - FITMENTS_TYPES_MAPS.put("毛坯", ["毛坯", "清水", "无装修", "独栋毛坯" ]); - FITMENTS_TYPES_MAPS.put("简装", ["简装", "普通装修", "普通","简单装修","简易装修","普装" ]); - FITMENTS_TYPES_MAPS.put("精装", ["精装","全装修", "全装", "中等装修", "中装","中档装修","精致装修","豪华装修","高档","豪华","豪装"]); + FITMENTS_TYPES_MAPS.put("姣涘澂", ["姣涘澂", "娓呮按", "鏃犺淇�", "鐙爧姣涘澂" ]); + FITMENTS_TYPES_MAPS.put("绠�瑁�", ["绠�瑁�", "鏅�氳淇�", "鏅��","绠�鍗曡淇�","绠�鏄撹淇�","鏅" ]); + FITMENTS_TYPES_MAPS.put("绮捐", ["绮捐","鍏ㄨ淇�", "鍏ㄨ", "涓瓑瑁呬慨", "涓","涓。瑁呬慨","绮捐嚧瑁呬慨","璞崕瑁呬慨","楂樻。","璞崕","璞"]); return FITMENTS_TYPES_MAPS; } @@ -414,7 +414,7 @@ class CZLSHDataExport { return dsCursor; } - //标准化数据 + //鏍囧噯鍖栨暟鎹� def standardData(datas){ def result = []; def index = 0; @@ -425,12 +425,12 @@ class CZLSHDataExport { // } println "[ ${index} ]"+ map.name; - map.city = "常州" + map.city = "甯稿窞" def m = [:]; m.region = map.region; m.name = map.name; -// if(m.name!="北直街小区"){ +// if(m.name!="鍖楃洿琛楀皬鍖�"){ // continue; // } @@ -455,61 +455,61 @@ class CZLSHDataExport { ret.name = dbo.get("name"); - //均价 - if(map.name=="壹号广场"){ + //鍧囦环 + if(map.name=="澹瑰彿骞垮満"){ ret.avg_price = 6000; - }else if(map.name=='荆川桃园'){ + }else if(map.name=='鑽嗗窛妗冨洯'){ ret.avg_price = 13000; }else{ ret.avg_price = getDistrictPrice(dbo.city, dbo.region, dbo.name, dbo.address, dbo.block); } - //省的码值 - ret.province = regionMap.get("江苏"); + //鐪佺殑鐮佸�� + ret.province = regionMap.get("姹熻嫃"); ret.city = regionMap.get(dbo.city); - ret.province_old_value = "江苏"; + ret.province_old_value = "姹熻嫃"; ret.city_old_value = dbo.city; - //区 + //鍖� ret.section = regionMap.get(dbo.region); ret.section_old_value = dbo.region; - //区域 + //鍖哄煙 ret.region = getRegionCode(dbo.region); ret.address = dbo.address; ret.build_date = getBuild_date(dbo); - //参考租金 + //鍙傝�冪閲� //ret.rentPrices = getRentPrice(dbo); ret.rentPrices = getRentPrice2(dbo); - //公共服务配套 + //鍏叡鏈嶅姟閰嶅 ret.publicServiceSetCode = getPublicServiceSetCode(dbo.lat2, dbo.lng2) - //基础设施 + //鍩虹璁炬柦 ret.facilitiesCode = "01"; - //居住社区成熟度 + //灞呬綇绀惧尯鎴愮啛搴� ret.sophisticationCode = getSophistication(dbo.city, dbo.lat2, dbo.lng2); - //交通条件 + //浜ら�氭潯浠� ret.trafficCode = getTrafficCode(dbo.city, dbo.lat2, dbo.lng2); - //泊车条件 + //娉婅溅鏉′欢 ret.stopCarCode = getStopCarCode(dbo); - //是否是学区房 + //鏄惁鏄鍖烘埧 ret.schoolCode = getSchoolCode(dbo.region, dbo.lat2, dbo.lng2); - //绿化率 + //缁垮寲鐜� ret.virescence_percent = getVirescencePercent(dbo.virescence_percent, ret.build_date); - //容积率 + //瀹圭Н鐜� ret.cubage_percent = getCubagePercent(dbo.cubage_percent, ret.build_date); - //物业公司 + //鐗╀笟鍏徃 ret.estate_company = getEstateCompany(dbo.estate_company); - //物业费 + //鐗╀笟璐� ret.estate_charge = getEstateCharge(dbo.estate_charge); @@ -647,7 +647,7 @@ class CZLSHDataExport { def getEstateCompany(def company){ if(company){ - company = company.replace("---","").replace("·",""); + company = company.replace("---","").replace("路",""); return company; } return ""; @@ -681,10 +681,10 @@ class CZLSHDataExport { return ""; } - //"1-有停车场 2-无停车场" + //"1-鏈夊仠杞﹀満 2-鏃犲仠杞﹀満" def getStopCarCode(def dbo){ if(dbo.car_site){ - if(dbo.car_site=="
    "||dbo.car_site=="待定"||dbo.car_site.indexOf("暂无")!=-1||dbo.car_site=="详询售楼处"){ + if(dbo.car_site=="
    "||dbo.car_site=="寰呭畾"||dbo.car_site.indexOf("鏆傛棤")!=-1||dbo.car_site=="璇﹁鍞ゼ澶�"){ dbo.car_site =""; } @@ -710,13 +710,13 @@ class CZLSHDataExport { }else if(year && year>0 && year<1980){ return "02"; }else{ - if(dbo.name.endsWith("期")||dbo.name.indexOf("别墅")!=-1){ + if(dbo.name.endsWith("鏈�")||dbo.name.indexOf("鍒")!=-1){ return "01"; }else{ - if(dbo.build_type && dbo.build_type.indexOf("高层")!=-1){ + if(dbo.build_type && dbo.build_type.indexOf("楂樺眰")!=-1){ return "01"; - }else if(dbo.estate_type && dbo.estate_type=="别墅"){ + }else if(dbo.estate_type && dbo.estate_type=="鍒"){ return "01"; }else{ @@ -736,7 +736,7 @@ class CZLSHDataExport { return "99" } - def endWithChar = ["村","宿舍","堂","弄"]; + def endWithChar = ["鏉�","瀹胯垗","鍫�","寮�"]; for(def s : endWithChar){ if(dbo.name.endsWith(s)){ return "02"; @@ -770,7 +770,7 @@ class CZLSHDataExport { if(price){ return price; }else{ - //样例估价 + //鏍蜂緥浼颁环 def s = OpenApiClient.evaluateDistrictPriceBySimilarHouse3(city, region, name, 100, false); try{ JSONObject jsonObject = JSONObject.fromObject(s); @@ -786,30 +786,30 @@ class CZLSHDataExport { } - //分期找总期 - if(name.toString().endsWith("期")){ - def tempname = name.toString().substring(0, name.toString().indexOf("期")-1) + //鍒嗘湡鎵炬�绘湡 + if(name.toString().endsWith("鏈�")){ + def tempname = name.toString().substring(0, name.toString().indexOf("鏈�")-1) price = findDistrictPrice(city, region, tempname); if(price){ return price+150; } } - if(name.toString().endsWith("区")){ - def tempname = name.toString().substring(0, name.toString().indexOf("区")-1) + if(name.toString().endsWith("鍖�")){ + def tempname = name.toString().substring(0, name.toString().indexOf("鍖�")-1) price = findDistrictPrice(city, region, tempname); if(price){ return price+100; } } - //周边均价 + //鍛ㄨ竟鍧囦环 // price = findAroundAvgPrice(city, address, 100); // if(price){ // return price.toString() // } - //板块均价 + //鏉垮潡鍧囦环 if(block){ price = queryCityRegionPrice(city, region, block); if(price){ @@ -817,7 +817,7 @@ class CZLSHDataExport { } } - //区域均价 + //鍖哄煙鍧囦环 if(!block||!price){ price = queryCityRegionPrice(city, region, null); if(price){ @@ -869,7 +869,7 @@ class CZLSHDataExport { } - //println "周边均价:" + totalPrice +"【${url_str}】" + //println "鍛ㄨ竟鍧囦环锛�" + totalPrice +"銆�${url_str}銆�" return avgPrice; } def getContentFromUrl(def url_str){ @@ -884,7 +884,7 @@ class CZLSHDataExport { conn.setRequestMethod("GET"); conn.doOutput = true inputStream = conn.getInputStream(); - BufferedReader buf = new BufferedReader(new InputStreamReader(inputStream,"UTF-8"));// 创建UTF-8的BufferedReader + BufferedReader buf = new BufferedReader(new InputStreamReader(inputStream,"UTF-8"));// 鍒涘缓UTF-8鐨凚ufferedReader while((line = buf.readLine())!=null){ sb.append(line); } @@ -970,7 +970,7 @@ class CZLSHDataExport { // def s = ""; // priceMap.each {k,v-> // -// if(estate_type=="别墅"){ +// if(estate_type=="鍒"){ // if(k>=2 && k<=8){ // s = s + k + ":"+v+" " // } @@ -991,7 +991,7 @@ class CZLSHDataExport { def findRegionRentPrice(def priceMap,def dbo){ if(!priceMap){ - if(dbo.estate_type2=="别墅"){ + if(dbo.estate_type2=="鍒"){ def room4 = getRegionRent(dbo.city, dbo.region, 4); if(room4){ def v = random(-100, 500) + 100; @@ -1026,7 +1026,7 @@ class CZLSHDataExport { if(priceMap.size()>1){ - if(dbo.estate_type2.contains("别墅")){ + if(dbo.estate_type2.contains("鍒")){ priceMap.remove(1); priceMap.remove(2); } @@ -1052,7 +1052,7 @@ class CZLSHDataExport { } } - //排序 + //鎺掑簭 prices.sort(); rooms.sort(); if(prices.size()>1){ @@ -1162,13 +1162,13 @@ class CZLSHDataExport { } return avgPrice; } - //1-主城区:天宁区、钟楼区 2-郊区:武进区、新北区、戚墅堰区 3-县级市:金坛市、溧阳市 + //1-涓诲煄鍖猴細澶╁畞鍖恒�侀挓妤煎尯 2-閮婂尯锛氭杩涘尯銆佹柊鍖楀尯銆佹垰澧呭牥鍖� 3-鍘跨骇甯傦細閲戝潧甯傘�佹骇闃冲競 def getRegionCode(def region){ - if(region.indexOf("天宁")!=-1||region.indexOf("钟楼")!=-1){ + if(region.indexOf("澶╁畞")!=-1||region.indexOf("閽熸ゼ")!=-1){ return "01"; - }else if(region.indexOf("武进")!=-1||region.indexOf("新北")!=-1||region.indexOf("戚墅堰")!=-1){ + }else if(region.indexOf("姝﹁繘")!=-1||region.indexOf("鏂板寳")!=-1||region.indexOf("鎴氬鍫�")!=-1){ return "02"; - }else if(region.indexOf("金坛")!=-1||region.indexOf("溧阳")!=-1){ + }else if(region.indexOf("閲戝潧")!=-1||region.indexOf("婧ч槼")!=-1){ return "03"; }else{ return "99"; @@ -1180,28 +1180,28 @@ class CZLSHDataExport { if(lng && lat){ lat = lat/10000000000; lng = lng/10000000000; - def hspt_count = CommonDatautils.findPoiCount("医院", lat, lng, 1000) - def bank_count = CommonDatautils.findPoiCount("银行", lat, lng, 1000) - def school_count = CommonDatautils.findPoiCount("学校", lat,lng, 1000) - def supermarket_count = CommonDatautils.findPoiCount("超市", lat,lng, 1000) + def hspt_count = CommonDatautils.findPoiCount("鍖婚櫌", lat, lng, 1000) + def bank_count = CommonDatautils.findPoiCount("閾惰", lat, lng, 1000) + def school_count = CommonDatautils.findPoiCount("瀛︽牎", lat,lng, 1000) + def supermarket_count = CommonDatautils.findPoiCount("瓒呭競", lat,lng, 1000) def yl_count1 = CommonDatautils.findPoiCount("KTV", lat,lng, 1000) - def yl_count2 = CommonDatautils.findPoiCount("电影院", lat,lng, 1000) - def yl_count3 = CommonDatautils.findPoiCount("网吧", lat,lng, 1000) - def yl_count4 = CommonDatautils.findPoiCount("健身中心", lat,lng, 1000) + def yl_count2 = CommonDatautils.findPoiCount("鐢靛奖闄�", lat,lng, 1000) + def yl_count3 = CommonDatautils.findPoiCount("缃戝惂", lat,lng, 1000) + def yl_count4 = CommonDatautils.findPoiCount("鍋ヨ韩涓績", lat,lng, 1000) if(hspt_count>=1 && bank_count>=1 && school_count>=1 && supermarket_count>=1 && (yl_count1>=1 || yl_count2>=1 || yl_count3>=1||yl_count4>=1)){ return "01"; }else{ - hspt_count = CommonDatautils.findPoiCount("医院", lat, lng, 2000) - bank_count = CommonDatautils.findPoiCount("银行", lat, lng, 2000) - school_count = CommonDatautils.findPoiCount("学校", lat,lng, 2000) - supermarket_count = CommonDatautils.findPoiCount("超市", lat,lng, 1000) + hspt_count = CommonDatautils.findPoiCount("鍖婚櫌", lat, lng, 2000) + bank_count = CommonDatautils.findPoiCount("閾惰", lat, lng, 2000) + school_count = CommonDatautils.findPoiCount("瀛︽牎", lat,lng, 2000) + supermarket_count = CommonDatautils.findPoiCount("瓒呭競", lat,lng, 1000) yl_count1 = CommonDatautils.findPoiCount("KTV", lat,lng, 2000) - yl_count2 = CommonDatautils.findPoiCount("电影院", lat,lng, 2000) - yl_count3 = CommonDatautils.findPoiCount("网吧", lat,lng, 2000) - yl_count4 = CommonDatautils.findPoiCount("健身中心", lat,lng, 2000) + yl_count2 = CommonDatautils.findPoiCount("鐢靛奖闄�", lat,lng, 2000) + yl_count3 = CommonDatautils.findPoiCount("缃戝惂", lat,lng, 2000) + yl_count4 = CommonDatautils.findPoiCount("鍋ヨ韩涓績", lat,lng, 2000) if(hspt_count>=1 && bank_count>=1 && school_count>=1 && supermarket_count>=1 && (yl_count1>=1 || yl_count2>=1 || yl_count3>=1||yl_count4>=1)){ return "02"; @@ -1222,11 +1222,11 @@ class CZLSHDataExport { if(lng && lat){ lat = lat/10000000000; lng = lng/10000000000; - def supermarket_count = CommonDatautils.findPoiCount("超市", lat,lng, 1000) + def supermarket_count = CommonDatautils.findPoiCount("瓒呭競", lat,lng, 1000) if(supermarket_count>=5){ return "01"; }else{ - supermarket_count = CommonDatautils.findPoiCount("超市", lat,lng, 2000) + supermarket_count = CommonDatautils.findPoiCount("瓒呭競", lat,lng, 2000) if(supermarket_count >= 5){ return "02"; }else{ @@ -1244,10 +1244,10 @@ class CZLSHDataExport { lat = lat/10000000000; lng = lng/10000000000; def redius = 3000; - if(region=="天宁"|| region=="钟楼" ){ + if(region=="澶╁畞"|| region=="閽熸ゼ" ){ redius = 1000; } - def school_count = CommonDatautils.findPoiCount("小学", lat, lng, redius) + def school_count = CommonDatautils.findPoiCount("灏忓", lat, lng, redius) if(school_count >= 1){ return 1; } @@ -1256,7 +1256,7 @@ class CZLSHDataExport { return 0; } - //1-周边公交线路≥10条;2-周边公交线路<10条但≥5条;3-周边公交线路<5条但≥2条;4-周边公交线路<2条 + //1-鍛ㄨ竟鍏氦绾胯矾鈮�10鏉★紱2-鍛ㄨ竟鍏氦绾胯矾锛�10鏉′絾鈮�5鏉★紱3-鍛ㄨ竟鍏氦绾胯矾锛�5鏉′絾鈮�2鏉★紱4-鍛ㄨ竟鍏氦绾胯矾锛�2鏉� def getTrafficCode(def city, def lat, def lng){ if(lng && lat){ lat = lat/10000000000; @@ -1330,7 +1330,7 @@ class CZLSHDataExport { return map; } - /*-----------------------------房源-----------------------------------*/ + /*-----------------------------鎴挎簮-----------------------------------*/ def findDistrictHouse(def datas, def dateStr, def removeDistricts){ def result = []; def index = 0; @@ -1339,7 +1339,7 @@ class CZLSHDataExport { //// continue; //// } // -// map.city = "常州" +// map.city = "甯稿窞" // // def c_id = map.c_id; // @@ -1379,7 +1379,7 @@ class CZLSHDataExport { def dbCursor = datastore.find(q); for(def obj : dbCursor){ def date = obj.build_date; - if(date && date.indexOf("暂无")==-1){ + if(date && date.indexOf("鏆傛棤")==-1){ return date; } } @@ -1437,31 +1437,31 @@ class CZLSHDataExport { continue; } - if(obj.district_name.endsWith("别墅") && obj.height && obj.height>=10){ + if(obj.district_name.endsWith("鍒") && obj.height && obj.height>=10){ continue; } def m = [:]; - //小区名称 + //灏忓尯鍚嶇О m.name = dbo.name; m.city = obj.city; m.region = obj.region; m.district_id= dbo.id.toString(); m.house_id = obj.get("_id").toString(); - //建筑物总楼层 + //寤虹瓚鐗╂�绘ゼ灞� m.height = obj.height>0?obj.height:null; - //所在楼层 + //鎵�鍦ㄦゼ灞� m.floor = getHouseFloor(obj.floor, m.height); - //建筑面积 + //寤虹瓚闈㈢Н m.house_area = obj.area; - //挂牌价 + //鎸傜墝浠� m.total_price = obj.total_price; def keys = m.region +"-"+ m.name+"-"+m.house_area+"-"+m.height+"-"+m.floor+"-"+m.total_price; if(!houses.contains(keys)){ houses << keys; }else{ - println "此房源已存在....." + println "姝ゆ埧婧愬凡瀛樺湪....." continue; } @@ -1469,31 +1469,31 @@ class CZLSHDataExport { m.room = obj.room; m.hall = obj.hall; m.estate_type = obj.estate_type2; - //建成年代 + //寤烘垚骞翠唬 m.build_date = getBuildDate(obj.build_date, dbo); - //总使用年限 + //鎬讳娇鐢ㄥ勾闄� m.property_life = getPropertyLife(dbo.property_life); - //朝向 + //鏈濆悜 m.direction = getDirectionCode(obj.direction, dbo.estate_type); - //建筑结构 + //寤虹瓚缁撴瀯 m.build_structure_code = getBuildStructureCode(dbo.build_date, dbo.build_structure); - //建筑类别 + //寤虹瓚绫诲埆 m.build_type_code = getBuildTypeCode(dbo.name, dbo.build_type, obj.height); if(m.build_type_code=='3' && m.height>6){ m.height = null } - //内部装修与成新度 + //鍐呴儴瑁呬慨涓庢垚鏂板害 m.fitment_code = getFitmentCode(obj.fitment); - //是否有电梯 + //鏄惁鏈夌數姊� m.elevator_code = getElevatorCode(obj.height, m.build_type_code); - //房价网评估价 + //鎴夸环缃戣瘎浼颁环 //m.evaluation_price = getEvaluationPrice(m); //println "[${index++}] "+new Date(); - //评估时间 + //璇勪及鏃堕棿 m.evaluation_date = DateUtils.formatDateByPattern(new Date(),"yyyyMMdd"); - //挂牌时间 + //鎸傜墝鏃堕棿 m.publish_date = DateUtils.formatDateByPattern(obj.publish_date,"yyyyMMdd"); m.house_id = obj.get("_id").toString(); @@ -1578,16 +1578,16 @@ class CZLSHDataExport { return year; } - //1-毛坯;2-简装;3-精装; + //1-姣涘澂锛�2-绠�瑁咃紱3-绮捐锛� def getFitmentCode(def fitment){ fitment = fetchFitmentInfo(fitment); if(fitment){ - if(fitment.indexOf("毛坯")!=-1){ + if(fitment.indexOf("姣涘澂")!=-1){ return "01"; - }else if(fitment.indexOf("简装")!=-1){ + }else if(fitment.indexOf("绠�瑁�")!=-1){ return "02"; - }else if(fitment.indexOf("精装")!=-1){ + }else if(fitment.indexOf("绮捐")!=-1){ return "03"; }else{ return "04"; @@ -1634,7 +1634,7 @@ class CZLSHDataExport { } - //"1-是;2-否;" + //"1-鏄紱2-鍚︼紱" def getElevatorCode(def height, def buildTypeCode){ if(height){ if(height>=7){ @@ -1656,34 +1656,34 @@ class CZLSHDataExport { } - //1-正南;2-正北;3-南北;4-正东;5-正西;6-东西;7-东南;8-西南;9-东北;10-西北; + //1-姝e崡锛�2-姝e寳锛�3-鍗楀寳锛�4-姝d笢锛�5-姝hタ锛�6-涓滆タ锛�7-涓滃崡锛�8-瑗垮崡锛�9-涓滃寳锛�10-瑗垮寳锛� def getDirectionCode(def direction, def estate_type){ if(direction){ - direction = direction.replace("朝向","").replace("朝", "").replace("通透", "").replace("正",""); + direction = direction.replace("鏈濆悜","").replace("鏈�", "").replace("閫氶��", "").replace("姝�",""); } - if(direction == "南"){ + if(direction == "鍗�"){ return "01"; - }else if(direction == "北"){ + }else if(direction == "鍖�"){ return "02"; - }else if(direction == "南北"){ + }else if(direction == "鍗楀寳"){ return "03"; - }else if(direction == "东"){ + }else if(direction == "涓�"){ return "04"; - }else if(direction == "西"){ + }else if(direction == "瑗�"){ return "05"; - }else if(direction == "东西"){ + }else if(direction == "涓滆タ"){ return "06"; - }else if(direction == "东南"){ + }else if(direction == "涓滃崡"){ return "07"; - }else if(direction == "西南"){ + }else if(direction == "瑗垮崡"){ return "08"; - }else if(direction == "东北"){ + }else if(direction == "涓滃寳"){ return "09"; - }else if(direction == "西北"){ + }else if(direction == "瑗垮寳"){ return "10"; }else{ - if(estate_type && estate_type.indexOf("别墅")!=-1){ + if(estate_type && estate_type.indexOf("鍒")!=-1){ return "03"; } return "01"; @@ -1691,19 +1691,19 @@ class CZLSHDataExport { return "01"; } - //1-钢混;2-钢和钢混;3-砖木结构;4-混合结构;5-其他结构; + //1-閽㈡贩锛�2-閽㈠拰閽㈡贩锛�3-鐮栨湪缁撴瀯锛�4-娣峰悎缁撴瀯锛�5-鍏朵粬缁撴瀯锛� def getBuildStructureCode(def buildDate, def build_structure){ if(build_structure){ - if(build_structure.indexOf("钢混")!=-1||build_structure.indexOf("钢筋混凝土")!=-1){ + if(build_structure.indexOf("閽㈡贩")!=-1||build_structure.indexOf("閽㈢瓔娣峰嚌鍦�")!=-1){ return "01"; - }else if(build_structure.indexOf("钢和钢混")!=-1){ + }else if(build_structure.indexOf("閽㈠拰閽㈡贩")!=-1){ return "02"; - }else if(build_structure.indexOf("砖木")!=-1){ + }else if(build_structure.indexOf("鐮栨湪")!=-1){ return "03"; - }else if(build_structure.indexOf("混合")!=-1){ + }else if(build_structure.indexOf("娣峰悎")!=-1){ return "04"; - }else if(build_structure.indexOf("钢结构")!=-1){ + }else if(build_structure.indexOf("閽㈢粨鏋�")!=-1){ return "05"; }else{ def year = getMatchContent(buildDate); @@ -1729,32 +1729,32 @@ class CZLSHDataExport { def getShopBuildStructureCode(def dbEstateType, def houseEstateType, def build_structure){ def map = [:]; - if(houseEstateType && houseEstateType!='商场商铺'){ + if(houseEstateType && houseEstateType!='鍟嗗満鍟嗛摵'){ map.value = houseEstateType; map.code = "01"; return map; }else{ if(dbEstateType){ - if(dbEstateType!='商场商铺'){ + if(dbEstateType!='鍟嗗満鍟嗛摵'){ map.value = dbEstateType; map.code = "01"; return map; }else{ if(build_structure){ map.value = build_structure; - if(build_structure.indexOf("钢混")!=-1||build_structure.indexOf("钢筋混凝土")!=-1){ + if(build_structure.indexOf("閽㈡贩")!=-1||build_structure.indexOf("閽㈢瓔娣峰嚌鍦�")!=-1){ map.code = "01"; return map; - }else if(build_structure.indexOf("钢和钢混")!=-1){ + }else if(build_structure.indexOf("閽㈠拰閽㈡贩")!=-1){ map.code = "02"; return map; - }else if(build_structure.indexOf("砖木")!=-1){ + }else if(build_structure.indexOf("鐮栨湪")!=-1){ map.code = "03"; return map; - }else if(build_structure.indexOf("混合")!=-1){ + }else if(build_structure.indexOf("娣峰悎")!=-1){ map.code = "04"; return map; - }else if(build_structure.indexOf("钢结构")!=-1){ + }else if(build_structure.indexOf("閽㈢粨鏋�")!=-1){ map.code = "05"; return map; }else{ @@ -1793,7 +1793,7 @@ class CZLSHDataExport { return null; } - //1-高层;2-小高层;3-多层; 多层小于等于6 小高层小于等于10 其他为高层 + //1-楂樺眰锛�2-灏忛珮灞傦紱3-澶氬眰锛� 澶氬眰灏忎簬绛変簬6 灏忛珮灞傚皬浜庣瓑浜�10 鍏朵粬涓洪珮灞� def getBuildTypeCode(def name, def build_type, def height){ if(height){ @@ -1806,27 +1806,27 @@ class CZLSHDataExport { } }else{ - if(name && name.indexOf("别墅")!=-1){ + if(name && name.indexOf("鍒")!=-1){ return "3"; } if(build_type){ def type = build_type.split(","); if(type.size()==1){ - if(build_type=="高层"||build_type=="超高层"){ + if(build_type=="楂樺眰"||build_type=="瓒呴珮灞�"){ return "1"; - }else if(build_type=="小高层"){ + }else if(build_type=="灏忛珮灞�"){ return "2"; - }else if(build_type=="多层"||build_type=="独栋"||build_type=="联排"||build_type=="双拼"){ + }else if(build_type=="澶氬眰"||build_type=="鐙爧"||build_type=="鑱旀帓"||build_type=="鍙屾嫾"){ return "3"; } }else{ def s = type[0]; - if(s=="小高层"){ + if(s=="灏忛珮灞�"){ return "2"; - }else if(s=="高层"||s=="超高层"){ + }else if(s=="楂樺眰"||s=="瓒呴珮灞�"){ return "1"; - }else if(s=="多层"||s=="独栋"||s=="联排"||s=="双拼"){ + }else if(s=="澶氬眰"||s=="鐙爧"||s=="鑱旀帓"||s=="鍙屾嫾"){ return "3"; } } @@ -1867,11 +1867,11 @@ class CZLSHDataExport { } if(m.estate_type){ - if(m.estate_type=='普通住宅'){ + if(m.estate_type=='鏅�氫綇瀹�'){ params.put("propertyType", "0"); - }else if(m.estate_type=='别墅'){ + }else if(m.estate_type=='鍒'){ params.put("propertyType", "1"); - }else if(m.estate_type=='商住'){ + }else if(m.estate_type=='鍟嗕綇'){ params.put("propertyType", "2"); } }else{ @@ -1914,7 +1914,7 @@ class CZLSHDataExport { for(def map : retMap){ -// if(map.name.indexOf("万达广场")!=-1){ +// if(map.name.indexOf("涓囪揪骞垮満")!=-1){ // continue; // } def dbo = findSeaweed(map.city, map.region, map.name, "shop"); @@ -2010,7 +2010,7 @@ class CZLSHDataExport { def WORK_BOOK = null; try { if (file.exists()) { - FileInputStream fs=new FileInputStream(path); //获取d://test.xls + FileInputStream fs=new FileInputStream(path); //鑾峰彇d://test.xls WORK_BOOK = WorkbookFactory.create(fs) WORK_BOOK.setForceFormulaRecalculation(true) sheet = WORK_BOOK.getSheetAt(0); @@ -2036,7 +2036,7 @@ class CZLSHDataExport { FileOutputStream fos = null; try { HSSFWorkbook WORK_BOOK = new HSSFWorkbook(); - HSSFSheet sheet = WORK_BOOK.createSheet("小区"); + HSSFSheet sheet = WORK_BOOK.createSheet("灏忓尯"); int row = sheet.getLastRowNum(); HSSFCellStyle cellStyle = WORK_BOOK.createCellStyle(); createTableRow(sheet, ret, cellStyle); @@ -2068,10 +2068,10 @@ class CZLSHDataExport { q.put('city', dbo.city) q.put('region', dbo.region) q.put("cat" , "shop_sell") - if(dbo.name.indexOf("商铺")!=-1&&dbo.name.indexOf("路")!=-1){ + if(dbo.name.indexOf("鍟嗛摵")!=-1&&dbo.name.indexOf("璺�")!=-1){ def names = []; names << dbo.name; - names << dbo.name.replace("商铺",""); + names << dbo.name.replace("鍟嗛摵",""); BasicDBObject query = new BasicDBObject(); query.putAt(QueryOperators.IN, names); q.put("district_name", query); @@ -2107,38 +2107,38 @@ class CZLSHDataExport { m.shop_id = dbo.get("_id").toString() } m.house_id = obj.get("_id").toString(); - //小区名称 + //灏忓尯鍚嶇О m.name = oldMap.name; - //建筑面积 + //寤虹瓚闈㈢Н m.house_area = obj.area; - //建筑物总楼层 + //寤虹瓚鐗╂�绘ゼ灞� m.height = getShopHeight(obj.height, obj.estate_type, dbo.estate_type, floorInfos); - //所在楼层 + //鎵�鍦ㄦゼ灞� m.floor = getInfloor(obj.floor, m.height, obj.estate_type, dbo.estate_type); - //挂牌价 + //鎸傜墝浠� m.total_price = obj.total_price; def keys = m.name+"-"+m.house_area+"-"+m.height+"-"+m.floor+"-"+m.total_price; if(!houses.contains(keys)){ houses << keys; }else{ - println "此房源已存在....." + println "姝ゆ埧婧愬凡瀛樺湪....." continue; } - //地址 + //鍦板潃 m.address = dbo.address - //建成年代 + //寤烘垚骞翠唬 m.build_date = getBuildDate(obj.build_date, dbo); - //总使用年限 + //鎬讳娇鐢ㄥ勾闄� m.property_life = 40//getShopPropertyLife(dbo.property_life); - //建筑结构 + //寤虹瓚缁撴瀯 def typeCodeMap = getShopBuildStructureCode(dbo.estate_type, obj.estate_type, dbo.build_structure); m.build_structure_code = typeCodeMap.code; m.build_structure = typeCodeMap.value; - //挂牌时间 + //鎸傜墝鏃堕棿 m.publish_date = DateUtils.formatDateByPattern(obj.publish_date,"yyyyMMdd"); @@ -2176,17 +2176,17 @@ class CZLSHDataExport { } } - if(house_estate_type && house_estate_type.indexOf("社区商铺")!=-1){ + if(house_estate_type && house_estate_type.indexOf("绀惧尯鍟嗛摵")!=-1){ return 1; } - if(district_estate_type && district_estate_type.indexOf("社区商铺")!=-1){ + if(district_estate_type && district_estate_type.indexOf("绀惧尯鍟嗛摵")!=-1){ return 1; } return null; } - //1-低区;2-中区;3-高区; + //1-浣庡尯锛�2-涓尯锛�3-楂樺尯锛� def getInfloor(def floor, def height, def house_estate_type, def district_estate_type){ if(floor && height){ if(floor > height){ @@ -2221,11 +2221,11 @@ class CZLSHDataExport { } } - if(house_estate_type && house_estate_type.indexOf("社区商铺")!=-1){ + if(house_estate_type && house_estate_type.indexOf("绀惧尯鍟嗛摵")!=-1){ return 1; } - if(district_estate_type && district_estate_type.indexOf("社区商铺")!=-1){ + if(district_estate_type && district_estate_type.indexOf("绀惧尯鍟嗛摵")!=-1){ return 1; } return 1; @@ -2238,7 +2238,7 @@ class CZLSHDataExport { def WORK_BOOK = null; try { if (file.exists()) { - FileInputStream fs=new FileInputStream(path); //获取d://test.xls + FileInputStream fs=new FileInputStream(path); //鑾峰彇d://test.xls WORK_BOOK = WorkbookFactory.create(fs) sheet = WORK_BOOK.getSheetAt(0); }else{ @@ -2262,41 +2262,41 @@ class CZLSHDataExport { } public static void createTableRow(HSSFSheet citySheet,def ret, HSSFCellStyle cellStyle) { - //创建第rowIndex行 + //鍒涘缓绗瑀owIndex琛� HSSFRow row = citySheet.createRow(0); - row.createCell(0).setCellValue("楼盘编号"); - row.createCell(1).setCellValue("楼盘名称"); - row.createCell(2).setCellValue("楼盘均价"); - row.createCell(3).setCellValue("省"); - row.createCell(4).setCellValue("市"); - row.createCell(5).setCellValue("区"); - row.createCell(6).setCellValue("所属区域"); - row.createCell(7).setCellValue("地址"); - row.createCell(8).setCellValue("公共服务配套"); - row.createCell(9).setCellValue("基础设施"); - row.createCell(10).setCellValue("居住社区成熟度"); - row.createCell(11).setCellValue("交通条件"); - row.createCell(12).setCellValue("泊车条件"); - row.createCell(13).setCellValue("学区房类型"); - row.createCell(14).setCellValue("小区绿化率"); - row.createCell(15).setCellValue("容积率"); + row.createCell(0).setCellValue("妤肩洏缂栧彿"); + row.createCell(1).setCellValue("妤肩洏鍚嶇О"); + row.createCell(2).setCellValue("妤肩洏鍧囦环"); + row.createCell(3).setCellValue("鐪�"); + row.createCell(4).setCellValue("甯�"); + row.createCell(5).setCellValue("鍖�"); + row.createCell(6).setCellValue("鎵�灞炲尯鍩�"); + row.createCell(7).setCellValue("鍦板潃"); + row.createCell(8).setCellValue("鍏叡鏈嶅姟閰嶅"); + row.createCell(9).setCellValue("鍩虹璁炬柦"); + row.createCell(10).setCellValue("灞呬綇绀惧尯鎴愮啛搴�"); + row.createCell(11).setCellValue("浜ら�氭潯浠�"); + row.createCell(12).setCellValue("娉婅溅鏉′欢"); + row.createCell(13).setCellValue("瀛﹀尯鎴跨被鍨�"); + row.createCell(14).setCellValue("灏忓尯缁垮寲鐜�"); + row.createCell(15).setCellValue("瀹圭Н鐜�"); -// row.createCell(16).setCellValue("参考租金"); -// row.createCell(17).setCellValue("物业公司"); -// row.createCell(18).setCellValue("物业费(每月每平米)"); -// row.createCell(19).setCellValue("建筑年代"); -// row.createCell(20).setCellValue("物业类型"); +// row.createCell(16).setCellValue("鍙傝�冪閲�"); +// row.createCell(17).setCellValue("鐗╀笟鍏徃"); +// row.createCell(18).setCellValue("鐗╀笟璐癸紙姣忔湀姣忓钩绫筹級"); +// row.createCell(19).setCellValue("寤虹瓚骞翠唬"); +// row.createCell(20).setCellValue("鐗╀笟绫诲瀷"); HSSFCell cell = row.createCell(16); citySheet.addMergedRegion(new CellRangeAddress(0, 0, 16, 21)); - cell.setCellValue("参考租金") + cell.setCellValue("鍙傝�冪閲�") cellStyle.setAlignment(HSSFCellStyle.ALIGN_CENTER); cell.setCellStyle(cellStyle); - row.createCell(22).setCellValue("物业公司"); - row.createCell(23).setCellValue("物业费(每月每平米)"); - row.createCell(24).setCellValue("建筑年代"); - row.createCell(25).setCellValue("物业类型"); + row.createCell(22).setCellValue("鐗╀笟鍏徃"); + row.createCell(23).setCellValue("鐗╀笟璐癸紙姣忔湀姣忓钩绫筹級"); + row.createCell(24).setCellValue("寤虹瓚骞翠唬"); + row.createCell(25).setCellValue("鐗╀笟绫诲瀷"); for(def i=0;i\t"); - sb.append("楼盘名称\t\t"); - sb.append("楼盘均价\t\t"); - sb.append("省\t\t"); -// sb.append("省(原值)\t\t"); - sb.append("市\t\t"); -// sb.append("市(原值)\t\t"); - sb.append("区\t\t"); -// sb.append("区(原值)\t\t"); - sb.append("地址\t\t"); - sb.append("所属区域\t\t"); - sb.append("公共服务配套\t\t"); - sb.append("基础设施\t\t"); - sb.append("居住社区成熟度\t\t"); - sb.append("交通条件\t\t"); - sb.append("泊车条件\t\t"); - sb.append("学区房类型\t\t"); - sb.append("小区绿化率\t\t"); - sb.append("容积率\t\t"); - sb.append("参考租金(1室)\t\t"); - sb.append("参考租金(2室)\t\t"); - sb.append("参考租金(3室)\t\t"); - sb.append("参考租金(4室)\t\t"); - sb.append("参考租金(5室)\t\t"); - sb.append("参考租金(5室以上)\t\t"); - sb.append("物业公司\t\t"); - sb.append("物业费(每月每平米)<#r>\n"); + sb.append("妤肩洏缂栧彿\t\t"); + sb.append("妤肩洏鍚嶇О\t\t"); + sb.append("妤肩洏鍧囦环\t\t"); + sb.append("鐪乗t\t"); +// sb.append("鐪�(鍘熷��)\t\t"); + sb.append("甯俓t\t"); +// sb.append("甯�(鍘熷��)\t\t"); + sb.append("鍖篭t\t"); +// sb.append("鍖�(鍘熷��)\t\t"); + sb.append("鍦板潃\t\t"); + sb.append("鎵�灞炲尯鍩焅t\t"); + sb.append("鍏叡鏈嶅姟閰嶅\t\t"); + sb.append("鍩虹璁炬柦\t\t"); + sb.append("灞呬綇绀惧尯鎴愮啛搴t\t"); + sb.append("浜ら�氭潯浠禱t\t"); + sb.append("娉婅溅鏉′欢\t\t"); + sb.append("瀛﹀尯鎴跨被鍨媆t\t"); + sb.append("灏忓尯缁垮寲鐜嘰t\t"); + sb.append("瀹圭Н鐜嘰t\t"); + sb.append("鍙傝�冪閲�(1瀹�)\t\t"); + sb.append("鍙傝�冪閲�(2瀹�)\t\t"); + sb.append("鍙傝�冪閲�(3瀹�)\t\t"); + sb.append("鍙傝�冪閲�(4瀹�)\t\t"); + sb.append("鍙傝�冪閲�(5瀹�)\t\t"); + sb.append("鍙傝�冪閲�(5瀹や互涓�)\t\t"); + sb.append("鐗╀笟鍏徃\t\t"); + sb.append("鐗╀笟璐癸紙姣忔湀姣忓钩绫筹級<#r>\n"); for(def m : result){ sb.append(converValue(m.id.toString())+"\t\t"); @@ -2443,22 +2443,22 @@ class CZLSHDataExport { def getDistrictHouseString(def result, def removeDistricts){ def sb = new StringBuffer(); def index = 0; - sb.append("房源编号\t\t"); - sb.append("楼盘编号\t\t"); - sb.append("建成年代\t\t"); - sb.append("总使用年限\t\t"); - sb.append("建筑面积\t\t"); - sb.append("朝向\t\t"); - sb.append("建筑结构\t\t"); - sb.append("建筑类别\t\t"); - sb.append("内部装修与成新度\t\t"); - sb.append("所在楼层\t\t"); - sb.append("建筑物总楼层\t\t"); - sb.append("是否有电梯\t\t"); - sb.append("房价网评估价\t\t"); - sb.append("评估时间\t\t"); - sb.append("挂牌价\t\t"); - sb.append("挂牌时间<#r>\n"); + sb.append("鎴挎簮缂栧彿\t\t"); + sb.append("妤肩洏缂栧彿\t\t"); + sb.append("寤烘垚骞翠唬\t\t"); + sb.append("鎬讳娇鐢ㄥ勾闄怽t\t"); + sb.append("寤虹瓚闈㈢Н\t\t"); + sb.append("鏈濆悜\t\t"); + sb.append("寤虹瓚缁撴瀯\t\t"); + sb.append("寤虹瓚绫诲埆\t\t"); + sb.append("鍐呴儴瑁呬慨涓庢垚鏂板害\t\t"); + sb.append("鎵�鍦ㄦゼ灞俓t\t"); + sb.append("寤虹瓚鐗╂�绘ゼ灞俓t\t"); + sb.append("鏄惁鏈夌數姊痋t\t"); + sb.append("鎴夸环缃戣瘎浼颁环\t\t"); + sb.append("璇勪及鏃堕棿\t\t"); + sb.append("鎸傜墝浠穃t\t"); + sb.append("鎸傜墝鏃堕棿<#r>\n"); for(def m : result){ index++; if(removeDistricts.contains(m.name)){ @@ -2499,32 +2499,32 @@ class CZLSHDataExport { def getShopString(def result){ def sb = new StringBuffer(); def index = 0; - sb.append("商铺编号\t\t"); - sb.append("商铺名称\t\t"); - sb.append("楼盘均价\t\t"); - sb.append("省\t\t"); - sb.append("市\t\t"); - sb.append("区\t\t"); + sb.append("鍟嗛摵缂栧彿\t\t"); + sb.append("鍟嗛摵鍚嶇О\t\t"); + sb.append("妤肩洏鍧囦环\t\t"); + sb.append("鐪乗t\t"); + sb.append("甯俓t\t"); + sb.append("鍖篭t\t"); -// sb.append("省(原值)\t\t"); -// sb.append("市(原值)\t\t"); -// sb.append("区(原值)\t\t"); +// sb.append("鐪�(鍘熷��)\t\t"); +// sb.append("甯�(鍘熷��)\t\t"); +// sb.append("鍖�(鍘熷��)\t\t"); - sb.append("地址\t\t"); - sb.append("所属区域\t\t"); - sb.append("商铺类型\t\t"); + sb.append("鍦板潃\t\t"); + sb.append("鎵�灞炲尯鍩焅t\t"); + sb.append("鍟嗛摵绫诲瀷\t\t"); -// sb.append("商铺类型(原值)\t\t"); +// sb.append("鍟嗛摵绫诲瀷(鍘熷��)\t\t"); - sb.append("公共服务配套\t\t"); - sb.append("基础设施\t\t"); - sb.append("商业密度\t\t"); - sb.append("交通条件\t\t"); - sb.append("泊车条件\t\t"); - sb.append("临街道路\t\t"); - sb.append("租金\t\t"); - sb.append("物业公司\t\t"); - sb.append("物业费(每月每平米)<#r>\n"); + sb.append("鍏叡鏈嶅姟閰嶅\t\t"); + sb.append("鍩虹璁炬柦\t\t"); + sb.append("鍟嗕笟瀵嗗害\t\t"); + sb.append("浜ら�氭潯浠禱t\t"); + sb.append("娉婅溅鏉′欢\t\t"); + sb.append("涓磋閬撹矾\t\t"); + sb.append("绉熼噾\t\t"); + sb.append("鐗╀笟鍏徃\t\t"); + sb.append("鐗╀笟璐癸紙姣忔湀姣忓钩绫筹級<#r>\n"); for(def m : result){ sb.append(m.shop_id.toString()+"\t\t"); sb.append(m.name+"\t\t"); @@ -2566,18 +2566,18 @@ class CZLSHDataExport { def getShopHouseString(def result){ def sb = new StringBuffer(); def index = 0; - sb.append("房源编号\t\t"); - sb.append("商铺编号\t\t"); - sb.append("详细地址\t\t"); - sb.append("建成年代\t\t"); - sb.append("总使用年限\t\t"); - sb.append("建筑面积\t\t"); - sb.append("建筑结构\t\t"); -// sb.append("建筑结构(原值)\t\t"); - sb.append("所在楼层\t\t"); - sb.append("建筑物总楼层\t\t"); - sb.append("挂牌价\t\t"); - sb.append("挂牌时间<#r>\n"); + sb.append("鎴挎簮缂栧彿\t\t"); + sb.append("鍟嗛摵缂栧彿\t\t"); + sb.append("璇︾粏鍦板潃\t\t"); + sb.append("寤烘垚骞翠唬\t\t"); + sb.append("鎬讳娇鐢ㄥ勾闄怽t\t"); + sb.append("寤虹瓚闈㈢Н\t\t"); + sb.append("寤虹瓚缁撴瀯\t\t"); +// sb.append("寤虹瓚缁撴瀯(鍘熷��)\t\t"); + sb.append("鎵�鍦ㄦゼ灞俓t\t"); + sb.append("寤虹瓚鐗╂�绘ゼ灞俓t\t"); + sb.append("鎸傜墝浠穃t\t"); + sb.append("鎸傜墝鏃堕棿<#r>\n"); for(def m : result){ @@ -2612,22 +2612,22 @@ class CZLSHDataExport { } def createShopHouseTableRow(HSSFSheet citySheet,def ret) { - //创建第rowIndex行 + //鍒涘缓绗瑀owIndex琛� int rowCount = citySheet.getLastRowNum(); if(rowCount<1){ HSSFRow row = citySheet.createRow(0); - row.createCell(0).setCellValue("商铺编号"); - row.createCell(1).setCellValue("房源编号"); - row.createCell(2).setCellValue("商铺名称"); - row.createCell(3).setCellValue("详细地址"); - row.createCell(4).setCellValue("建成年代"); - row.createCell(5).setCellValue("总使用年限"); - row.createCell(6).setCellValue("建筑面积"); - row.createCell(7).setCellValue("建筑结构"); - row.createCell(8).setCellValue("所在楼层"); - row.createCell(9).setCellValue("建筑物总楼层"); - row.createCell(10).setCellValue("挂牌价 "); - row.createCell(11).setCellValue("挂牌时间"); + row.createCell(0).setCellValue("鍟嗛摵缂栧彿"); + row.createCell(1).setCellValue("鎴挎簮缂栧彿"); + row.createCell(2).setCellValue("鍟嗛摵鍚嶇О"); + row.createCell(3).setCellValue("璇︾粏鍦板潃"); + row.createCell(4).setCellValue("寤烘垚骞翠唬"); + row.createCell(5).setCellValue("鎬讳娇鐢ㄥ勾闄�"); + row.createCell(6).setCellValue("寤虹瓚闈㈢Н"); + row.createCell(7).setCellValue("寤虹瓚缁撴瀯"); + row.createCell(8).setCellValue("鎵�鍦ㄦゼ灞�"); + row.createCell(9).setCellValue("寤虹瓚鐗╂�绘ゼ灞�"); + row.createCell(10).setCellValue("鎸傜墝浠� "); + row.createCell(11).setCellValue("鎸傜墝鏃堕棿"); } @@ -2656,27 +2656,27 @@ class CZLSHDataExport { def createHouseTableRow(def citySheet,def ret, def removeDistricts) { - //创建第rowIndex行 + //鍒涘缓绗瑀owIndex琛� int rowCount = citySheet.getLastRowNum();;// if(rowCount<1){ Row row = citySheet.createRow(0); - row.createCell(0).setCellValue("楼盘编号"); - row.createCell(1).setCellValue("房源编号"); - row.createCell(2).setCellValue("楼盘名称"); - row.createCell(3).setCellValue("建成年代"); - row.createCell(4).setCellValue("总使用年限"); - row.createCell(5).setCellValue("建筑面积"); - row.createCell(6).setCellValue("朝向"); - row.createCell(7).setCellValue("建筑结构"); - row.createCell(8).setCellValue("建筑类别"); - row.createCell(9).setCellValue("内部装修与成新度"); - row.createCell(10).setCellValue("所在楼层"); - row.createCell(11).setCellValue("建筑物总楼层"); - row.createCell(12).setCellValue("是否有电梯"); - row.createCell(13).setCellValue("房价网评估价"); - row.createCell(14).setCellValue("评估时间"); - row.createCell(15).setCellValue("挂牌价 "); - row.createCell(16).setCellValue("挂牌时间"); + row.createCell(0).setCellValue("妤肩洏缂栧彿"); + row.createCell(1).setCellValue("鎴挎簮缂栧彿"); + row.createCell(2).setCellValue("妤肩洏鍚嶇О"); + row.createCell(3).setCellValue("寤烘垚骞翠唬"); + row.createCell(4).setCellValue("鎬讳娇鐢ㄥ勾闄�"); + row.createCell(5).setCellValue("寤虹瓚闈㈢Н"); + row.createCell(6).setCellValue("鏈濆悜"); + row.createCell(7).setCellValue("寤虹瓚缁撴瀯"); + row.createCell(8).setCellValue("寤虹瓚绫诲埆"); + row.createCell(9).setCellValue("鍐呴儴瑁呬慨涓庢垚鏂板害"); + row.createCell(10).setCellValue("鎵�鍦ㄦゼ灞�"); + row.createCell(11).setCellValue("寤虹瓚鐗╂�绘ゼ灞�"); + row.createCell(12).setCellValue("鏄惁鏈夌數姊�"); + row.createCell(13).setCellValue("鎴夸环缃戣瘎浼颁环"); + row.createCell(14).setCellValue("璇勪及鏃堕棿"); + row.createCell(15).setCellValue("鎸傜墝浠� "); + row.createCell(16).setCellValue("鎸傜墝鏃堕棿"); } @@ -2724,13 +2724,13 @@ class CZLSHDataExport { File file = new File(path); if(file.exists()){ - FileInputStream fs=new FileInputStream(path); //获取d://test.xls + FileInputStream fs=new FileInputStream(path); //鑾峰彇d://test.xls def WORK_BOOK = WorkbookFactory.create(fs) def sheet = WORK_BOOK.getSheetAt(0); def ret = []; sheet.eachWithIndex {row, index-> if(index>0){ - if(row.getCell(0).toString()!="楼盘名称"){ + if(row.getCell(0).toString()!="妤肩洏鍚嶇О"){ if(!ret.contains(row.getCell(0).toString())){ ret<< row.getCell(0).toString(); } @@ -2751,7 +2751,7 @@ class CZLSHDataExport { def rowCount = workbook.getSheetAt(0).getLastRowNum(); def sheet1=workbook.getSheetAt(0); def result = []; - //循环行 + //寰幆琛� sheet1.eachWithIndex {row, index-> def rowNum = row.getRowNum(); def ret = [:]; @@ -2772,7 +2772,7 @@ class CZLSHDataExport { def heights = row.getCell(13).toString(); if(heights){ - def heightArray = heights.split("、") + def heightArray = heights.split("銆�") heightArray.sort(); def lists = []; for(def height : heightArray){ @@ -2799,14 +2799,14 @@ class CZLSHDataExport { def rowCount = workbook.getSheetAt(0).getLastRowNum(); def sheet1=workbook.getSheetAt(0); def m = [:]; - //循环行 + //寰幆琛� sheet1.eachWithIndex {row, index-> def rowNum = row.getRowNum(); //if(index>0){ def heights = row.getCell(13).toString(); if(heights){ - def heightArray = heights.split("、") + def heightArray = heights.split("銆�") heightArray.sort(); def lists = []; for(def height : heightArray){ @@ -2861,7 +2861,7 @@ class CZLSHDataExport { def rowCount = workbook.getSheetAt(0).getLastRowNum(); def sheet1=workbook.getSheetAt(0); def result = []; - //循环行 + //寰幆琛� sheet1.eachWithIndex {row, index-> if(index>1){ @@ -2909,12 +2909,12 @@ class CZLSHDataExport { def rowCount = workbook.getSheetAt(0).getLastRowNum(); def sheet1=workbook.getSheetAt(0); def result = []; - //循环行 + //寰幆琛� sheet1.eachWithIndex {row, index-> if(index > 0){ def map = [:]; map.c_id = row.getCell(0).toString(); - map.city = "常州" + map.city = "甯稿窞" map.region = row.getCell(1).toString(); map.name = row.getCell(2).toString(); result << map; @@ -2935,7 +2935,7 @@ class CZLSHDataExport { def names = []; names << name; - names << name.replace("商铺",""); + names << name.replace("鍟嗛摵",""); BasicDBObject query = new BasicDBObject(); query.putAt(QueryOperators.IN, names); q.put("alias", query); @@ -2969,10 +2969,10 @@ class CZLSHDataExport { q.put('region', region) q.put("cat" , cat) q.put("visible" , 0) -// if(name.indexOf("商铺")!=-1){ +// if(name.indexOf("鍟嗛摵")!=-1){ // def names = []; // names << name; -// names << name.replace("商铺",""); +// names << name.replace("鍟嗛摵",""); // BasicDBObject query = new BasicDBObject(); // query.putAt(QueryOperators.IN, names); // q.put("district_name", query); @@ -3009,12 +3009,12 @@ class CZLSHDataExport { for(def row : result){ def m = [:]; index++; - m.province_old = "江苏"; - m.city_old = "常州"; + m.province_old = "姹熻嫃"; + m.city_old = "甯稿窞"; m.region_old = row.region; - m.province = regionMap.get("江苏"); - m.city = regionMap.get("常州"); + m.province = regionMap.get("姹熻嫃"); + m.city = regionMap.get("甯稿窞"); m.region = regionMap.get(row.region) m.name = row.name; @@ -3048,16 +3048,16 @@ class CZLSHDataExport { postionMap.lng = location.lng * 10000000000d; } } - //公共服务配套 + //鍏叡鏈嶅姟閰嶅 m.publicServiceSetCode = getPublicServiceSetCode(postionMap.lat, postionMap.lng) - //基础设施 + //鍩虹璁炬柦 m.facilitiesCode = "01"; - //居住社区成熟度 + //灞呬綇绀惧尯鎴愮啛搴� m.sophisticationCode = getSophistication(row.city, postionMap.lat, postionMap.lng); - //交通条件 + //浜ら�氭潯浠� m.trafficCode = getTrafficCode(row.city, postionMap.lat, postionMap.lng); @@ -3088,7 +3088,7 @@ class CZLSHDataExport { def getShopPrice(def priceString, def city, def region, def name){ if(priceString){ - def avgPrice = priceString.replace("元/㎡","").replace("房源价", "").replace("房源", ""); + def avgPrice = priceString.replace("鍏�/銕�","").replace("鎴挎簮浠�", "").replace("鎴挎簮", ""); if(avgPrice.indexOf("-")!=-1){ def array = avgPrice.split("-") if(array.length>1){ @@ -3105,11 +3105,11 @@ class CZLSHDataExport { DBObject q = new BasicDBObject() q.put('city', city) q.put('region', region) - q.put("estate_type" , "商铺") - if(name.indexOf("商铺")!=-1){ + q.put("estate_type" , "鍟嗛摵") + if(name.indexOf("鍟嗛摵")!=-1){ def names = []; names << name; - names << name.replace("商铺",""); + names << name.replace("鍟嗛摵",""); BasicDBObject query = new BasicDBObject(); query.putAt(QueryOperators.IN, names); q.put("district_name", query); @@ -3135,10 +3135,10 @@ class CZLSHDataExport { def getRentNumber(def rentPrice,def city, def region, def name){ if(rentPrice){ - if(rentPrice.indexOf("元/㎡/天")!=-1){ - return rentPrice.replace("元/㎡/天",""); - }else if(rentPrice.indexOf("元/㎡/月")!=-1){ - def price = rentPrice.replace("元/㎡/月","").toString().trim(); + if(rentPrice.indexOf("鍏�/銕�/澶�")!=-1){ + return rentPrice.replace("鍏�/銕�/澶�",""); + }else if(rentPrice.indexOf("鍏�/銕�/鏈�")!=-1){ + def price = rentPrice.replace("鍏�/銕�/鏈�","").toString().trim(); price = price.toFloat(); price = price/30; return new DecimalFormat("######0.00").format(price); @@ -3153,7 +3153,7 @@ class CZLSHDataExport { q.put("city", city); q.put("region", region); q.put("name", name); - q.put("kind", "商铺"); + q.put("kind", "鍟嗛摵"); def dbCoursor = RENT_COLL.find(q).sort(new BasicDBObject("weekend",-1)).limit(1); @@ -3167,9 +3167,9 @@ class CZLSHDataExport { def getEstateChargeValue(def estateCharge){ if(estateCharge){ - if(estateCharge.indexOf("元/㎡/月")!=-1){ - return estateCharge.replace("元/㎡/月",""); - }else if(estateCharge.indexOf("不需缴纳物业费")!=-1){ + if(estateCharge.indexOf("鍏�/銕�/鏈�")!=-1){ + return estateCharge.replace("鍏�/銕�/鏈�",""); + }else if(estateCharge.indexOf("涓嶉渶缂寸撼鐗╀笟璐�")!=-1){ return 0; }else{ return estateCharge; @@ -3180,13 +3180,13 @@ class CZLSHDataExport { def getShopEstateTypeCode(def estateType){ if(estateType){ - if(estateType.indexOf("商场商铺")!=-1){ + if(estateType.indexOf("鍟嗗満鍟嗛摵")!=-1){ return 1; - }else if(estateType.indexOf("专业市场")!=-1){ + }else if(estateType.indexOf("涓撲笟甯傚満")!=-1){ return 2; - }else if(estateType.indexOf("商业街")!=-1){ + }else if(estateType.indexOf("鍟嗕笟琛�")!=-1){ return 3; - }else if(estateType.indexOf("社区商铺")!=-1){ + }else if(estateType.indexOf("绀惧尯鍟嗛摵")!=-1){ return 4; } } @@ -3195,11 +3195,11 @@ class CZLSHDataExport { def getStreetCode(def val){ if(val){ - if(val == "无交通管制"){ + if(val == "鏃犱氦閫氱鍒�"){ return 1; - }else if(val == "单行道"){ + }else if(val == "鍗曡閬�"){ return 2; - }else if(val == "禁行"){ + }else if(val == "绂佽"){ return 3; } return 1; @@ -3216,7 +3216,7 @@ class CZLSHDataExport { FileOutputStream fos = null; try { HSSFWorkbook WORK_BOOK = new HSSFWorkbook(); - HSSFSheet sheet = WORK_BOOK.createSheet("商铺"); + HSSFSheet sheet = WORK_BOOK.createSheet("鍟嗛摵"); int row = sheet.getLastRowNum(); createShopExcel(sheet, ret); fos = new FileOutputStream(file); @@ -3234,32 +3234,32 @@ class CZLSHDataExport { } def createShopExcel(HSSFSheet citySheet,def ret) { - //创建第rowIndex行 + //鍒涘缓绗瑀owIndex琛� int rowCount = citySheet.getLastRowNum(); if(rowCount<1){ HSSFRow row = citySheet.createRow(0); - row.createCell(0).setCellValue("商铺编号"); - row.createCell(1).setCellValue("商铺名称"); - row.createCell(2).setCellValue("楼盘均价"); - row.createCell(3).setCellValue("地址"); - row.createCell(4).setCellValue("省"); - row.createCell(5).setCellValue("市"); - row.createCell(6).setCellValue("区"); - row.createCell(7).setCellValue("所属区域"); - row.createCell(8).setCellValue("公共服务配套"); - row.createCell(9).setCellValue("基础设施"); - row.createCell(10).setCellValue("商业密度"); - row.createCell(11).setCellValue("商铺类型"); - row.createCell(12).setCellValue("交通条件"); - row.createCell(13).setCellValue("泊车条件"); - row.createCell(14).setCellValue("临街道路"); - row.createCell(15).setCellValue("租金水平"); - row.createCell(16).setCellValue("物业公司"); - row.createCell(17).setCellValue("物业费(每月每平米)"); + row.createCell(0).setCellValue("鍟嗛摵缂栧彿"); + row.createCell(1).setCellValue("鍟嗛摵鍚嶇О"); + row.createCell(2).setCellValue("妤肩洏鍧囦环"); + row.createCell(3).setCellValue("鍦板潃"); + row.createCell(4).setCellValue("鐪�"); + row.createCell(5).setCellValue("甯�"); + row.createCell(6).setCellValue("鍖�"); + row.createCell(7).setCellValue("鎵�灞炲尯鍩�"); + row.createCell(8).setCellValue("鍏叡鏈嶅姟閰嶅"); + row.createCell(9).setCellValue("鍩虹璁炬柦"); + row.createCell(10).setCellValue("鍟嗕笟瀵嗗害"); + row.createCell(11).setCellValue("鍟嗛摵绫诲瀷"); + row.createCell(12).setCellValue("浜ら�氭潯浠�"); + row.createCell(13).setCellValue("娉婅溅鏉′欢"); + row.createCell(14).setCellValue("涓磋閬撹矾"); + row.createCell(15).setCellValue("绉熼噾姘村钩"); + row.createCell(16).setCellValue("鐗╀笟鍏徃"); + row.createCell(17).setCellValue("鐗╀笟璐癸紙姣忔湀姣忓钩绫筹級"); row.createCell(18).setCellValue(""); - row.createCell(19).setCellValue("总层数"); + row.createCell(19).setCellValue("鎬诲眰鏁�"); } @@ -3319,7 +3319,7 @@ class CZLSHDataExport { def rowCount = workbook.getSheetAt(0).getLastRowNum(); def sheet1=workbook.getSheetAt(0); def result = []; - //循环行 + //寰幆琛� sheet1.eachWithIndex {row, index-> def rowNum = row.getRowNum(); @@ -3341,7 +3341,7 @@ class CZLSHDataExport { def heights = row.getCell(13).toString(); if(heights){ - def heightArray = heights.split("、") + def heightArray = heights.split("銆�") heightArray.sort(); def lists = []; for(def height : heightArray){ @@ -3369,16 +3369,16 @@ class CZLSHDataExport { def rowCount = workbook.getSheetAt(0).getLastRowNum(); def sheet1=workbook.getSheetAt(0); def result = []; - def regionMap = getAllRegionBlockByCityAndCat("常州","region") - //循环行 + def regionMap = getAllRegionBlockByCityAndCat("甯稿窞","region") + //寰幆琛� sheet1.eachWithIndex {row, index-> if(index>0){ def rowNum = row.getRowNum(); def ret = [:]; - ret.proince = "江苏"; - ret.city = "常州"; + ret.proince = "姹熻嫃"; + ret.city = "甯稿窞"; ret.c_id = row.getCell(1).toString() def region = getStandardRegion(regionMap, row.getCell(2).toString()); ret.region = region; @@ -3420,8 +3420,8 @@ class CZLSHDataExport { //ret.height = getDoubleRound(0,row.getCell(14).numericCellValue).toInteger(); def heights = row.getCell(14).toString(); if(heights){ - if(heights.contains("、")){ - ret.height = Arrays.asList(heights.split("、")) + if(heights.contains("銆�")){ + ret.height = Arrays.asList(heights.split("銆�")) }else{ def arr = [] if(heights.endsWith(".0")){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/CityFieldCoverInfo.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/CityFieldCoverInfo.groovy index bdb2eb6d4..c810de709 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/CityFieldCoverInfo.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/CityFieldCoverInfo.groovy @@ -28,11 +28,11 @@ class CityFieldCoverInfo { } def run(){ - def file = "D:\\数据导出\\东北师范大学49个城市字段覆盖率.xlsx" + def file = "D:\\鏁版嵁瀵煎嚭\\涓滃寳甯堣寖澶у49涓煄甯傚瓧娈佃鐩栫巼.xlsx" def rets = []; def rows2 = ExcelUtils.read(file); def index = 0; - rets << ["城市","小区数量","地址","物业类型","建筑类型","户数","物业费","停车位","产权年限","竣工日期","占地面积","建筑面积","绿化率","容积率","开发商","物业公司","经度","纬度","预售许可证"] + rets << ["鍩庡競","灏忓尯鏁伴噺","鍦板潃","鐗╀笟绫诲瀷","寤虹瓚绫诲瀷","鎴锋暟","鐗╀笟璐�","鍋滆溅浣�","浜ф潈骞撮檺","绔e伐鏃ユ湡","鍗犲湴闈㈢Н","寤虹瓚闈㈢Н","缁垮寲鐜�","瀹圭Н鐜�","寮�鍙戝晢","鐗╀笟鍏徃","缁忓害","绾害","棰勫敭璁稿彲璇�"] for(def rows : rows2){ @@ -41,7 +41,7 @@ class CityFieldCoverInfo { rets << ret } - ExcelUtils.write("D:\\数据导出\\结果\\东北师范大学49个城市字段覆盖率.xlsx", rets, "数据") + ExcelUtils.write("D:\\鏁版嵁瀵煎嚭\\缁撴灉\\涓滃寳甯堣寖澶у49涓煄甯傚瓧娈佃鐩栫巼.xlsx", rets, "鏁版嵁") } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/CityStatDataExpot.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/CityStatDataExpot.groovy index 690dd4659..e1cf31aeb 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/CityStatDataExpot.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/CityStatDataExpot.groovy @@ -28,7 +28,7 @@ class CityStatDataExpot { def run(){ def dates = DateUtils.getLastDayBetweenDates(DateUtils.parseFromTightYYYYMMDD("2010-01-01"), DateUtils.parseFromTightYYYYMMDD("2014-05-01")); - def city = "上海"; + def city = "涓婃捣"; def ret = []; for(def lastDate : dates){ def startDate = DateUtils.getFirstDayOfMonth(lastDate); @@ -50,14 +50,14 @@ class CityStatDataExpot { ret << map; } - exportCsv(ret, "E://数据导出//上海统计数据.csv"); + exportCsv(ret, "E://鏁版嵁瀵煎嚭//涓婃捣缁熻鏁版嵁.csv"); } def findCityPrice(def city, def startDate, def lastDate){ def query = new BasicDBObject("city",city); query.append("region",null); query.append("block",null); - //query.append("cat","城市"); + //query.append("cat","鍩庡競"); query.append("weekend",new BasicDBObject('$gte',startDate).append('$lte',lastDate)); def cursor = REGION_STAT_CONN.find(query).sort(new BasicDBObject("weekend", 1)); @@ -111,10 +111,10 @@ class CityStatDataExpot { if (file.exists()){ file.delete(); } - file.append("时间,") - file.append("均价,") - file.append("点击量,") - file.append("挂牌量") + file.append("鏃堕棿,") + file.append("鍧囦环,") + file.append("鐐瑰嚮閲�,") + file.append("鎸傜墝閲�") file.append(System.getProperty("line.separator")); ret.each{map-> diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/DistrictExport.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/DistrictExport.groovy index cf2793c16..6390ba23d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/DistrictExport.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/DistrictExport.groovy @@ -25,7 +25,7 @@ class DistrictExport { def final static DBCollection REGION_STAT_CONN = new Mongo("mongo.db.fangjia.com", 27017).getDB('fangjia').getCollection('region_stat'); def final static DBCollection REGION_STAT_RENT_CONN = new Mongo("mongo.db.fangjia.com", 27017).getDB('fangjia').getCollection('region_stat_rent'); - def final static String[] TABLE_HEADER = [ "小区名称", "小区地址", "城市", "小区均价", "小区租金" ]; + def final static String[] TABLE_HEADER = [ "灏忓尯鍚嶇О", "灏忓尯鍦板潃", "鍩庡競", "灏忓尯鍧囦环", "灏忓尯绉熼噾" ]; def final static int CELL_COUNT = TABLE_HEADER.length; def final static HSSFWorkbook WORK_BOOK = new HSSFWorkbook(); @@ -35,7 +35,7 @@ class DistrictExport { def static rentPriceCount = 0; static main(args) { - File file = new File("D:\\阿里小区-0930.xls"); + File file = new File("D:\\闃块噷灏忓尯-0930.xls"); if (file.exists()) { file.delete(); } @@ -56,7 +56,7 @@ class DistrictExport { } /** - * 创建整个Excel表 + * 鍒涘缓鏁翠釜Excel琛� * @throws SQLException * */ @@ -69,9 +69,9 @@ class DistrictExport { def allCitys = []; SERVER_AREA_CONN.find().sort(new BasicDBObject('city_grade', 1)).each { - if (it.display == '全国') + if (it.display == '鍏ㄥ浗') return; - if(it.display == '杭州') + if(it.display == '鏉窞') allCitys << it; } @@ -82,43 +82,43 @@ class DistrictExport { int cityIndex = 0; allCitys.each { HSSFSheet citySheet = WORK_BOOK.createSheet(it.display); - citySheet.setColumnWidth((short) 0, (short) 6000); //默认设置宽度 - citySheet.setColumnWidth((short) 1, (short) 6000); //默认设置宽度 - citySheet.setColumnWidth((short) 2, (short) 4000); //默认设置宽度 - citySheet.setColumnWidth((short) 3, (short) 6000); //默认设置宽度 - citySheet.setColumnWidth((short) 4, (short) 6000); //默认设置宽度 + citySheet.setColumnWidth((short) 0, (short) 6000); //榛樿璁剧疆瀹藉害 + citySheet.setColumnWidth((short) 1, (short) 6000); //榛樿璁剧疆瀹藉害 + citySheet.setColumnWidth((short) 2, (short) 4000); //榛樿璁剧疆瀹藉害 + citySheet.setColumnWidth((short) 3, (short) 6000); //榛樿璁剧疆瀹藉害 + citySheet.setColumnWidth((short) 4, (short) 6000); //榛樿璁剧疆瀹藉害 createTableHeader(citySheet); doProcess(citySheet, it.display, weekend, monthEndDate, cityIndex); cityIndex++; } - HSSFSheet sheet = WORK_BOOK.getSheet("总计"); + HSSFSheet sheet = WORK_BOOK.getSheet("鎬昏"); int row = sheet.getLastRowNum(); def data = []; - data << allCitys.size() + '个城市'; - data << disCount + '个小区'; + data << allCitys.size() + '涓煄甯�'; + data << disCount + '涓皬鍖�'; createTableRow(sheet, data, row + 1); data = []; - data << addressCount + '个小区有地址'; - data << priceCount + '个小区有均价'; - data << rentPriceCount + '个小区有租金'; + data << addressCount + '涓皬鍖烘湁鍦板潃'; + data << priceCount + '涓皬鍖烘湁鍧囦环'; + data << rentPriceCount + '涓皬鍖烘湁绉熼噾'; createTableRow(sheet, data, row + 2); -// HSSFSheet citySheet = WORK_BOOK.createSheet("上海"); -// citySheet.setColumnWidth((short) 0, (short) 6000); //默认设置宽度 -// citySheet.setColumnWidth((short) 1, (short) 6000); //默认设置宽度 -// citySheet.setColumnWidth((short) 2, (short) 4000); //默认设置宽度 -// citySheet.setColumnWidth((short) 3, (short) 6000); //默认设置宽度 -// citySheet.setColumnWidth((short) 4, (short) 6000); //默认设置宽度 +// HSSFSheet citySheet = WORK_BOOK.createSheet("涓婃捣"); +// citySheet.setColumnWidth((short) 0, (short) 6000); //榛樿璁剧疆瀹藉害 +// citySheet.setColumnWidth((short) 1, (short) 6000); //榛樿璁剧疆瀹藉害 +// citySheet.setColumnWidth((short) 2, (short) 4000); //榛樿璁剧疆瀹藉害 +// citySheet.setColumnWidth((short) 3, (short) 6000); //榛樿璁剧疆瀹藉害 +// citySheet.setColumnWidth((short) 4, (short) 6000); //榛樿璁剧疆瀹藉害 // createTableHeader(citySheet); -// doProcess(citySheet, "上海", weekend, monthEndDate); +// doProcess(citySheet, "涓婃捣", weekend, monthEndDate); } def static total(allCitys) { - HSSFSheet sheet = WORK_BOOK.createSheet("总计"); + HSSFSheet sheet = WORK_BOOK.createSheet("鎬昏"); def query = new BasicDBObject(); query.put('cat', 'district'); @@ -140,26 +140,26 @@ class DistrictExport { } // def data = []; -// data << allCitys.size() + '个城市'; -// data << disCount + '个小区'; +// data << allCitys.size() + '涓煄甯�'; +// data << disCount + '涓皬鍖�'; // createTableRow(sheet, data, row); } /** - * 创建行 + * 鍒涘缓琛� */ public static void createTableRow(HSSFSheet citySheet, List cells, int rowIndex) { - //创建第rowIndex行 + //鍒涘缓绗瑀owIndex琛� HSSFRow row = citySheet.createRow(rowIndex); for(short i = 0; i < cells.size(); i++) { - //创建第i个单元格 + //鍒涘缓绗琲涓崟鍏冩牸 HSSFCell cell = row.createCell(i); cell.setCellValue(cells.get(i)); } } /** - * 创建表头 + * 鍒涘缓琛ㄥご */ public static void createTableHeader(HSSFSheet citySheet) { HSSFRow headerRow = citySheet.createRow(0); @@ -170,7 +170,7 @@ class DistrictExport { } private static void doProcess(HSSFSheet citySheet, city, weekend, monthEndDate, cityIndex) { - // 获取城市下当期的所有均价 + // 鑾峰彇鍩庡競涓嬪綋鏈熺殑鎵�鏈夊潎浠� DBObject query = new BasicDBObject(); query.put('city', city); query.put('weekend', weekend); @@ -181,7 +181,7 @@ class DistrictExport { fields.put('estate_type', 1); fields.put('avg_price', 1); - def statMap = [:]; // 小区均价 [区域_小区名:[小区:小区均价,别墅:别墅均价]] + def statMap = [:]; // 灏忓尯鍧囦环 [鍖哄煙_灏忓尯鍚�:[灏忓尯:灏忓尯鍧囦环,鍒:鍒鍧囦环]] DISTRICT_STAT_CONN.find(query, fields).each { def key = it.region + "_" + it.district_name; @@ -194,7 +194,7 @@ class DistrictExport { statMap.put(key, disMap); } - // 获取城市下当期的所有租金均价 + // 鑾峰彇鍩庡競涓嬪綋鏈熺殑鎵�鏈夌閲戝潎浠� query = new BasicDBObject(); query.put('city', city); query.put('end_month_date', monthEndDate); @@ -206,7 +206,7 @@ class DistrictExport { fields.put('avg_price', 1); fields.put('house_type', 1); - def statRentMap = [:]; // [区域_小区名:[小区:[1:价格,2:价格...],别墅:[1:价格,2:价格...]]] + def statRentMap = [:]; // [鍖哄煙_灏忓尯鍚�:[灏忓尯:[1:浠锋牸,2:浠锋牸...],鍒:[1:浠锋牸,2:浠锋牸...]]] DISTRICT_STAT_RENT_CONN.find(query, fields).each { def key = it.region + "_" + it.district_name; @@ -288,10 +288,10 @@ class DistrictExport { SEAWEED = new DataStore("seaweed.db.fangjia.com", 27007).getCollection("fangjia.seaweed"); def rowIndex = 1; - HSSFSheet sheet = WORK_BOOK.getSheet("总计"); + HSSFSheet sheet = WORK_BOOK.getSheet("鎬昏"); int cityDisCount = 0; - query.put('name', '环东新村'); + query.put('name', '鐜笢鏂版潙'); SEAWEED.find(query, fields).each { if (StringUtils.isBlank(it.address) || "0" == it.address) { return; @@ -319,10 +319,10 @@ class DistrictExport { priceCount++; } else if (it.total_price && it.total_price > 10) { if (it.total_price <= 10000) { - data << it.total_price + '万/套'; + data << it.total_price + '涓�/濂�'; priceCount++; } else { - data << ((int) (it.total_price / 10000)) + '万/套'; + data << ((int) (it.total_price / 10000)) + '涓�/濂�'; priceCount++; } } else { @@ -333,10 +333,10 @@ class DistrictExport { data << price; } } else { - def xiaoqu = disStatMap.get('小区'); - def bieshu = disStatMap.get('别墅'); + def xiaoqu = disStatMap.get('灏忓尯'); + def bieshu = disStatMap.get('鍒'); if (null != xiaoqu && null != bieshu) { - data << "小区:" + xiaoqu + "\r\n别墅:" + bieshu; + data << "灏忓尯锛�" + xiaoqu + "\r\n鍒锛�" + bieshu; priceCount++; } else if (null != xiaoqu) { data << xiaoqu; @@ -356,8 +356,8 @@ class DistrictExport { if (null == regionRentRang || regionRentRang.length != 2 || regionRentRang[0] == Double.MAX_VALUE || regionRentRang[1] == Double.MIN_VALUE) { data << ''; } else { - def xiaoqu = disStatMap.get('小区'); - def bieshu = disStatMap.get('别墅'); + def xiaoqu = disStatMap.get('灏忓尯'); + def bieshu = disStatMap.get('鍒'); if (!xiaoqu && it.avg_price && it.avg_price > 2000) { xiaoqu = it.avg_price; @@ -373,19 +373,19 @@ class DistrictExport { def bieshuMin = (int) (regionRentRang[0] * bieshu); def bieshuMax = (int) (regionRentRang[1] * bieshu); - data << "小区:" + (xiaoquMin == xiaoquMax ? (xiaoquMin + '左右') : (xiaoquMin + "~" + xiaoquMax)) + "\r\n别墅:" + (bieshuMin == bieshuMax ? (bieshuMin + '左右') : (bieshuMin + "~" + bieshuMax)); + data << "灏忓尯锛�" + (xiaoquMin == xiaoquMax ? (xiaoquMin + '宸﹀彸') : (xiaoquMin + "~" + xiaoquMax)) + "\r\n鍒锛�" + (bieshuMin == bieshuMax ? (bieshuMin + '宸﹀彸') : (bieshuMin + "~" + bieshuMax)); rentPriceCount++; } else if (null != xiaoqu) { def min = (int) (regionRentRang[0] * xiaoqu); def max = (int) (regionRentRang[1] * xiaoqu); - data << (min == max ? (min + '左右') : (min + "~" + max)); + data << (min == max ? (min + '宸﹀彸') : (min + "~" + max)); rentPriceCount++; } else if (null != bieshu) { def min = (int) (regionRentRang[0] * bieshu); def max = (int) (regionRentRang[1] * bieshu); - data << (min == max ? (min + '左右') : (min + "~" + max)); + data << (min == max ? (min + '宸﹀彸') : (min + "~" + max)); rentPriceCount++; } else { data << ''; @@ -395,8 +395,8 @@ class DistrictExport { data << ''; } } else { - def xiaoqu = disRentMap.get('小区'); - def bieshu = disRentMap.get('别墅'); + def xiaoqu = disRentMap.get('灏忓尯'); + def bieshu = disRentMap.get('鍒'); if (null != xiaoqu && null != bieshu) { def xiaoquMin = Integer.MAX_VALUE; def xiaoquMax = Integer.MIN_VALUE; @@ -420,7 +420,7 @@ class DistrictExport { } } - data << "小区:" + (xiaoquMin == xiaoquMax ? (xiaoquMin + '左右') : (xiaoquMin + "~" + xiaoquMax)) + "\r\n别墅:" + (bieshuMin == bieshuMax ? (bieshuMin + '左右') : (bieshuMin + "~" + bieshuMax)); + data << "灏忓尯锛�" + (xiaoquMin == xiaoquMax ? (xiaoquMin + '宸﹀彸') : (xiaoquMin + "~" + xiaoquMax)) + "\r\n鍒锛�" + (bieshuMin == bieshuMax ? (bieshuMin + '宸﹀彸') : (bieshuMin + "~" + bieshuMax)); rentPriceCount++; } else if (null != xiaoqu) { def min = Integer.MAX_VALUE; @@ -433,7 +433,7 @@ class DistrictExport { min = b; } } - data << (min == max ? (min + '左右') : (min + "~" + max)); + data << (min == max ? (min + '宸﹀彸') : (min + "~" + max)); rentPriceCount++; } else if (null != bieshu) { def min = Integer.MAX_VALUE; @@ -446,7 +446,7 @@ class DistrictExport { min = b; } } - data << (min == max ? (min + '左右') : (min + "~" + max)); + data << (min == max ? (min + '宸﹀彸') : (min + "~" + max)); rentPriceCount++; } else { data << ''; @@ -470,11 +470,11 @@ class DistrictExport { // rowIndex++; // // data = []; -// data << "总计小区:" + disCount; -// data << "总计地址:" + addressCount; +// data << "鎬昏灏忓尯锛�" + disCount; +// data << "鎬昏鍦板潃锛�" + addressCount; // data << ""; -// data << "总计均价:" + priceCount; -// data << "总计租金:" + rentPriceCount; +// data << "鎬昏鍧囦环锛�" + priceCount; +// data << "鎬昏绉熼噾锛�" + rentPriceCount; // createTableRow(citySheet, data, rowIndex); } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/DistrictExport2.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/DistrictExport2.groovy index 80d1661e8..315ea7583 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/DistrictExport2.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/DistrictExport2.groovy @@ -34,7 +34,7 @@ class DistrictExport2 { def final static DBCollection RULE_CONN = new Mongo("coredata.mongo.db.fangjia.com", 27017).getDB('coredata').getCollection('verify_rule'); def final static DBCollection DISTRICT_PERIOD_CONN = new Mongo("192.168.0.136", 27017).getDB('fangjia').getCollection('district_period'); - def final static String[] TABLE_HEADER = [ "小区名称", "小区地址", "城市", "区域", "板块", "街道/社区", "小区占地面积", "小区建筑面积", "容积率", "绿化率", "小区停车位", "小区物业费", "房型", "房型价格", "房型面积", "出租套数", "挂牌套数", "是否是学区房", "小区类型", "小区均价", "期数", "竣工时间", "开发商", "小区物业公司", "小区租金", "小区地理位置", "成交活跃度", "租售比", "周边配套", "是否是地铁房", "经度", "纬度"]; + def final static String[] TABLE_HEADER = [ "灏忓尯鍚嶇О", "灏忓尯鍦板潃", "鍩庡競", "鍖哄煙", "鏉垮潡", "琛楅亾/绀惧尯", "灏忓尯鍗犲湴闈㈢Н", "灏忓尯寤虹瓚闈㈢Н", "瀹圭Н鐜�", "缁垮寲鐜�", "灏忓尯鍋滆溅浣�", "灏忓尯鐗╀笟璐�", "鎴垮瀷", "鎴垮瀷浠锋牸", "鎴垮瀷闈㈢Н", "鍑虹濂楁暟", "鎸傜墝濂楁暟", "鏄惁鏄鍖烘埧", "灏忓尯绫诲瀷", "灏忓尯鍧囦环", "鏈熸暟", "绔e伐鏃堕棿", "寮�鍙戝晢", "灏忓尯鐗╀笟鍏徃", "灏忓尯绉熼噾", "灏忓尯鍦扮悊浣嶇疆", "鎴愪氦娲昏穬搴�", "绉熷敭姣�", "鍛ㄨ竟閰嶅", "鏄惁鏄湴閾佹埧", "缁忓害", "绾害"]; def final static int CELL_COUNT = TABLE_HEADER.length; def final static HSSFWorkbook WORK_BOOK = new HSSFWorkbook(); def static HSSFCellStyle cellStyle; @@ -70,7 +70,7 @@ class DistrictExport2 { } } - File file = new File("D:\\阿里小区-1229.xls"); + File file = new File("D:\\闃块噷灏忓尯-1229.xls"); if (file.exists()) { file.delete(); } @@ -94,7 +94,7 @@ class DistrictExport2 { } /** - * 创建整个Excel表 + * 鍒涘缓鏁翠釜Excel琛� * @throws SQLException * */ @@ -107,12 +107,12 @@ class DistrictExport2 { def allCitys = []; SERVER_AREA_CONN.find().sort(new BasicDBObject('city_grade', 1)).each { - if (it.display == '全国') + if (it.display == '鍏ㄥ浗') return; allCitys << it; -// if (it.display == '上海') +// if (it.display == '涓婃捣') // allCitys << it; } @@ -122,60 +122,60 @@ class DistrictExport2 { allCitys.each { HSSFSheet citySheet = WORK_BOOK.createSheet(it.display); - citySheet.setColumnWidth((short) 0, (short) 6000); //默认设置宽度 - citySheet.setColumnWidth((short) 1, (short) 6000); //默认设置宽度 - citySheet.setColumnWidth((short) 2, (short) 4000); //默认设置宽度 - citySheet.setColumnWidth((short) 3, (short) 4000); //默认设置宽度 - citySheet.setColumnWidth((short) 4, (short) 4000); //默认设置宽度 - citySheet.setColumnWidth((short) 5, (short) 6000); //默认设置宽度 - citySheet.setColumnWidth((short) 6, (short) 6000); //默认设置宽度 - citySheet.setColumnWidth((short) 7, (short) 6000); //默认设置宽度 - citySheet.setColumnWidth((short) 8, (short) 4000); //默认设置宽度 - citySheet.setColumnWidth((short) 9, (short) 4000); //默认设置宽度 - citySheet.setColumnWidth((short) 10, (short) 4000); //默认设置宽度 - citySheet.setColumnWidth((short) 11, (short) 4000); //默认设置宽度 - citySheet.setColumnWidth((short) 12, (short) 4000); //默认设置宽度 - citySheet.setColumnWidth((short) 13, (short) 6000); //默认设置宽度 - citySheet.setColumnWidth((short) 14, (short) 4000); //默认设置宽度 - citySheet.setColumnWidth((short) 15, (short) 2000); //默认设置宽度 - citySheet.setColumnWidth((short) 16, (short) 2000); //默认设置宽度 - citySheet.setColumnWidth((short) 17, (short) 2000); //默认设置宽度 - citySheet.setColumnWidth((short) 18, (short) 4000); //默认设置宽度 - citySheet.setColumnWidth((short) 19, (short) 4000); //默认设置宽度 - citySheet.setColumnWidth((short) 20, (short) 4000); //默认设置宽度 - citySheet.setColumnWidth((short) 21, (short) 4000); //默认设置宽度 - citySheet.setColumnWidth((short) 22, (short) 6000); //默认设置宽度 - citySheet.setColumnWidth((short) 23, (short) 6000); //默认设置宽度 - citySheet.setColumnWidth((short) 24, (short) 4000); //默认设置宽度 - citySheet.setColumnWidth((short) 25, (short) 4000); //默认设置宽度 - citySheet.setColumnWidth((short) 26, (short) 4000); //默认设置宽度 - citySheet.setColumnWidth((short) 27, (short) 4000); //默认设置宽度 - citySheet.setColumnWidth((short) 28, (short) 15000); //默认设置宽度 - citySheet.setColumnWidth((short) 29, (short) 2000); //默认设置宽度 - citySheet.setColumnWidth((short) 30, (short) 4000); //默认设置宽度 - citySheet.setColumnWidth((short) 31, (short) 4000); //默认设置宽度 + citySheet.setColumnWidth((short) 0, (short) 6000); //榛樿璁剧疆瀹藉害 + citySheet.setColumnWidth((short) 1, (short) 6000); //榛樿璁剧疆瀹藉害 + citySheet.setColumnWidth((short) 2, (short) 4000); //榛樿璁剧疆瀹藉害 + citySheet.setColumnWidth((short) 3, (short) 4000); //榛樿璁剧疆瀹藉害 + citySheet.setColumnWidth((short) 4, (short) 4000); //榛樿璁剧疆瀹藉害 + citySheet.setColumnWidth((short) 5, (short) 6000); //榛樿璁剧疆瀹藉害 + citySheet.setColumnWidth((short) 6, (short) 6000); //榛樿璁剧疆瀹藉害 + citySheet.setColumnWidth((short) 7, (short) 6000); //榛樿璁剧疆瀹藉害 + citySheet.setColumnWidth((short) 8, (short) 4000); //榛樿璁剧疆瀹藉害 + citySheet.setColumnWidth((short) 9, (short) 4000); //榛樿璁剧疆瀹藉害 + citySheet.setColumnWidth((short) 10, (short) 4000); //榛樿璁剧疆瀹藉害 + citySheet.setColumnWidth((short) 11, (short) 4000); //榛樿璁剧疆瀹藉害 + citySheet.setColumnWidth((short) 12, (short) 4000); //榛樿璁剧疆瀹藉害 + citySheet.setColumnWidth((short) 13, (short) 6000); //榛樿璁剧疆瀹藉害 + citySheet.setColumnWidth((short) 14, (short) 4000); //榛樿璁剧疆瀹藉害 + citySheet.setColumnWidth((short) 15, (short) 2000); //榛樿璁剧疆瀹藉害 + citySheet.setColumnWidth((short) 16, (short) 2000); //榛樿璁剧疆瀹藉害 + citySheet.setColumnWidth((short) 17, (short) 2000); //榛樿璁剧疆瀹藉害 + citySheet.setColumnWidth((short) 18, (short) 4000); //榛樿璁剧疆瀹藉害 + citySheet.setColumnWidth((short) 19, (short) 4000); //榛樿璁剧疆瀹藉害 + citySheet.setColumnWidth((short) 20, (short) 4000); //榛樿璁剧疆瀹藉害 + citySheet.setColumnWidth((short) 21, (short) 4000); //榛樿璁剧疆瀹藉害 + citySheet.setColumnWidth((short) 22, (short) 6000); //榛樿璁剧疆瀹藉害 + citySheet.setColumnWidth((short) 23, (short) 6000); //榛樿璁剧疆瀹藉害 + citySheet.setColumnWidth((short) 24, (short) 4000); //榛樿璁剧疆瀹藉害 + citySheet.setColumnWidth((short) 25, (short) 4000); //榛樿璁剧疆瀹藉害 + citySheet.setColumnWidth((short) 26, (short) 4000); //榛樿璁剧疆瀹藉害 + citySheet.setColumnWidth((short) 27, (short) 4000); //榛樿璁剧疆瀹藉害 + citySheet.setColumnWidth((short) 28, (short) 15000); //榛樿璁剧疆瀹藉害 + citySheet.setColumnWidth((short) 29, (short) 2000); //榛樿璁剧疆瀹藉害 + citySheet.setColumnWidth((short) 30, (short) 4000); //榛樿璁剧疆瀹藉害 + citySheet.setColumnWidth((short) 31, (short) 4000); //榛樿璁剧疆瀹藉害 createTableHeader(citySheet); doProcess(citySheet, it.display, weekend, monthEndDate); } -// HSSFSheet sheet = WORK_BOOK.getSheet("总计"); +// HSSFSheet sheet = WORK_BOOK.getSheet("鎬昏"); // int row = sheet.getLastRowNum(); // // def data = []; -// data << allCitys.size() + '个城市'; -// data << disCount + '个小区'; +// data << allCitys.size() + '涓煄甯�'; +// data << disCount + '涓皬鍖�'; // createTableRow(sheet, data, row + 1); // data = []; -// data << addressCount + '个小区有地址'; -// data << priceCount + '个小区有均价'; -// data << rentPriceCount + '个小区有租金'; +// data << addressCount + '涓皬鍖烘湁鍦板潃'; +// data << priceCount + '涓皬鍖烘湁鍧囦环'; +// data << rentPriceCount + '涓皬鍖烘湁绉熼噾'; // createTableRow(sheet, data, row + 2); } /** - * 创建表头 + * 鍒涘缓琛ㄥご */ public static void createTableHeader(HSSFSheet citySheet) { HSSFRow headerRow = citySheet.createRow(0); @@ -186,13 +186,13 @@ class DistrictExport2 { } /** - * 创建行 + * 鍒涘缓琛� */ public static void createTableRow(HSSFSheet citySheet, List cells, int rowIndex) { - //创建第rowIndex行 + //鍒涘缓绗瑀owIndex琛� HSSFRow row = citySheet.createRow(rowIndex); for(short i = 0; i < cells.size(); i++) { - //创建第i个单元格 + //鍒涘缓绗琲涓崟鍏冩牸 HSSFCell cell = row.createCell(i); cell.setCellValue(cells.get(i)); cell.setCellStyle(cellStyle); @@ -200,10 +200,10 @@ class DistrictExport2 { } private static void doProcess(HSSFSheet citySheet, city, weekend, monthEndDate) { - // 获取城市下当期的所有均价 + // 鑾峰彇鍩庡競涓嬪綋鏈熺殑鎵�鏈夊潎浠� def statMap = getStatMap(city, weekend); - // 获取城市下当期的所有租金均价 + // 鑾峰彇鍩庡競涓嬪綋鏈熺殑鎵�鏈夌閲戝潎浠� def statRentMap = getRentStatMap(city, monthEndDate); def regionStatMap = getRegionStatMap(city, weekend); @@ -271,7 +271,7 @@ class DistrictExport2 { data << city; data << it.region; data << it.block; - // 街道社区 + // 琛楅亾绀惧尯 data << ""; data << DataUtil.removeHtml(it.all_area); data << DataUtil.removeHtml(it.build_area); @@ -290,11 +290,11 @@ class DistrictExport2 { def charge = convertToDouble(it.estate_charge); if (charge > 0) - data << charge + '元/平米·月'; + data << charge + '鍏�/骞崇背路鏈�'; else data << ''; - // 房型、房型价格、房型面积 + // 鎴垮瀷銆佹埧鍨嬩环鏍笺�佹埧鍨嬮潰绉� data << ""; data << ""; data << ""; @@ -303,18 +303,18 @@ class DistrictExport2 { data << rentData.get(key2); data << sellData.get(key2); - data << (schoolMap.containsKey(key) ? '是' : '否'); + data << (schoolMap.containsKey(key) ? '鏄�' : '鍚�'); data << DataUtil.removeHtml(it.estate_type); data << getPrice(it, statMap.get(key)); - // 处理房型价格 + // 澶勭悊鎴垮瀷浠锋牸 def price = getIntPrice(it, statMap.get(key)) fillHouseRoomType(city, it.region, it.name, data, price); - // 期数 + // 鏈熸暟 if (periodMap.get(key)) data << periodMap.get(key); else @@ -333,14 +333,14 @@ class DistrictExport2 { data << DataUtil.removeHtml(it.loop_line_info); - if (city == '上海') { - // 成交活跃度 + if (city == '涓婃捣') { + // 鎴愪氦娲昏穬搴� DBObject q2 = new BasicDBObject(); q2.put("city", city); q2.put("region", it.region); q2.put("district_name", it.name); q2.put("trade_date", new BasicDBObject('$gt', lastYear)); - q2.put("source","交易中心") + q2.put("source","浜ゆ槗涓績") def tradeLastYear = DbUtils.executeCountOnline('deal_price',q2); if (tradeLastYear >= 120) data << 5 @@ -358,13 +358,13 @@ class DistrictExport2 { data << ''; } - // 租售比 + // 绉熷敭姣� data << zsb(data, price); - // 周边配套 + // 鍛ㄨ竟閰嶅 data << DataUtil.removeHtml(it.facilities); - // 是否地铁房 - data << (isMetroDis(city, it.region, it.name) ? '是' : '否'); + // 鏄惁鍦伴搧鎴� + data << (isMetroDis(city, it.region, it.name) ? '鏄�' : '鍚�'); if (it.lat) data << new BigDecimal(it.lat / 10000000000.0).setScale(10, BigDecimal.ROUND_HALF_UP); @@ -425,8 +425,8 @@ class DistrictExport2 { if (rentPriceStr.indexOf('\r\n') > 0) { rentPriceStr = rentPriceStr.substring(0, rentPriceStr.indexOf('\r\n')); } - if (rentPriceStr.indexOf('左右') > 0) { - rentPriceStr = rentPriceStr.substring(0, rentPriceStr.indexOf('左右')); + if (rentPriceStr.indexOf('宸﹀彸') > 0) { + rentPriceStr = rentPriceStr.substring(0, rentPriceStr.indexOf('宸﹀彸')); rentPrice = convertToDouble(rentPriceStr); } else { def arr = rentPriceStr.split("~") @@ -481,10 +481,10 @@ class DistrictExport2 { if (it.area > 0) { def a = new BigDecimal(it.area).setScale(2, BigDecimal.ROUND_HALF_UP); - areas += a + '平米\r\n'; + areas += a + '骞崇背\r\n'; if (price) { - prices += ((int) (it.area * price)) + '元\r\n' + prices += ((int) (it.area * price)) + '鍏僜r\n' } else { prices += ' \r\n'; } @@ -508,16 +508,16 @@ class DistrictExport2 { ret = dis.avg_price; } else if (dis.total_price && dis.total_price > 10) { if (dis.total_price <= 10000) { - ret = dis.total_price + '万/套'; + ret = dis.total_price + '涓�/濂�'; } else { - ret = ((int) (dis.total_price / 10000)) + '万/套'; + ret = ((int) (dis.total_price / 10000)) + '涓�/濂�'; } } } else { - def xiaoqu = disStatMap.get('小区'); - def bieshu = disStatMap.get('别墅'); + def xiaoqu = disStatMap.get('灏忓尯'); + def bieshu = disStatMap.get('鍒'); if (null != xiaoqu && null != bieshu) { - ret = "小区:" + xiaoqu + "\r\n别墅:" + bieshu; + ret = "灏忓尯锛�" + xiaoqu + "\r\n鍒锛�" + bieshu; } else if (null != xiaoqu) { ret = xiaoqu; } else if (null != bieshu) { @@ -535,8 +535,8 @@ class DistrictExport2 { // } else if (dis.total_price && dis.total_price > 10) { // } // } else { -// def xiaoqu = disStatMap.get('小区'); -// def bieshu = disStatMap.get('别墅'); +// def xiaoqu = disStatMap.get('灏忓尯'); +// def bieshu = disStatMap.get('鍒'); // if (null != xiaoqu && null != bieshu) { // return xiaoqu; // } else if (null != xiaoqu) { @@ -549,8 +549,8 @@ class DistrictExport2 { // return null; def ret = ""; - if (null != disStatMap && disStatMap.get('小区') != null) { - def p = disStatMap.get('小区'); + if (null != disStatMap && disStatMap.get('灏忓尯') != null) { + def p = disStatMap.get('灏忓尯'); } @@ -565,8 +565,8 @@ class DistrictExport2 { def regionRentRang = regionRentMap.get(RegionData.formatRegion(dis.city, dis.region)); if (null == regionRentRang || regionRentRang.length != 2 || regionRentRang[0] == Double.MAX_VALUE || regionRentRang[1] == Double.MIN_VALUE) { } else { - def xiaoqu = disStatMap.get('小区'); - def bieshu = disStatMap.get('别墅'); + def xiaoqu = disStatMap.get('灏忓尯'); + def bieshu = disStatMap.get('鍒'); if (!xiaoqu && dis.avg_price && dis.avg_price > 2000) { xiaoqu = dis.avg_price; @@ -582,24 +582,24 @@ class DistrictExport2 { def bieshuMin = (int) (regionRentRang[0] * bieshu); def bieshuMax = (int) (regionRentRang[1] * bieshu); - ret = "小区:" + (xiaoquMin == xiaoquMax ? (xiaoquMin + '左右') : (xiaoquMin + "~" + xiaoquMax)) + "\r\n别墅:" + (bieshuMin == bieshuMax ? (bieshuMin + '左右') : (bieshuMin + "~" + bieshuMax)); + ret = "灏忓尯锛�" + (xiaoquMin == xiaoquMax ? (xiaoquMin + '宸﹀彸') : (xiaoquMin + "~" + xiaoquMax)) + "\r\n鍒锛�" + (bieshuMin == bieshuMax ? (bieshuMin + '宸﹀彸') : (bieshuMin + "~" + bieshuMax)); } else if (null != xiaoqu) { def min = (int) (regionRentRang[0] * xiaoqu); def max = (int) (regionRentRang[1] * xiaoqu); - ret = (min == max ? (min + '左右') : (min + "~" + max)); + ret = (min == max ? (min + '宸﹀彸') : (min + "~" + max)); } else if (null != bieshu) { def min = (int) (regionRentRang[0] * bieshu); def max = (int) (regionRentRang[1] * bieshu); - ret = (min == max ? (min + '左右') : (min + "~" + max)); + ret = (min == max ? (min + '宸﹀彸') : (min + "~" + max)); } else { } } } } else { - def xiaoqu = disRentMap.get('小区'); - def bieshu = disRentMap.get('别墅'); + def xiaoqu = disRentMap.get('灏忓尯'); + def bieshu = disRentMap.get('鍒'); if (null != xiaoqu && null != bieshu) { def xiaoquMin = Integer.MAX_VALUE; def xiaoquMax = Integer.MIN_VALUE; @@ -623,7 +623,7 @@ class DistrictExport2 { } } - ret = "小区:" + (xiaoquMin == xiaoquMax ? (xiaoquMin + '左右') : (xiaoquMin + "~" + xiaoquMax)) + "\r\n别墅:" + (bieshuMin == bieshuMax ? (bieshuMin + '左右') : (bieshuMin + "~" + bieshuMax)); + ret = "灏忓尯锛�" + (xiaoquMin == xiaoquMax ? (xiaoquMin + '宸﹀彸') : (xiaoquMin + "~" + xiaoquMax)) + "\r\n鍒锛�" + (bieshuMin == bieshuMax ? (bieshuMin + '宸﹀彸') : (bieshuMin + "~" + bieshuMax)); } else if (null != xiaoqu) { def min = Integer.MAX_VALUE; def max = Integer.MIN_VALUE; @@ -635,7 +635,7 @@ class DistrictExport2 { min = b; } } - ret = (min == max ? (min + '左右') : (min + "~" + max)); + ret = (min == max ? (min + '宸﹀彸') : (min + "~" + max)); } else if (null != bieshu) { def min = Integer.MAX_VALUE; def max = Integer.MIN_VALUE; @@ -647,7 +647,7 @@ class DistrictExport2 { min = b; } } - ret = (min == max ? (min + '左右') : (min + "~" + max)); + ret = (min == max ? (min + '宸﹀彸') : (min + "~" + max)); } else { } } @@ -665,7 +665,7 @@ class DistrictExport2 { fields.put('estate_type', 1); fields.put('avg_price', 1); - def statMap = [:]; // 小区均价 [区域_小区名:[小区:小区均价,别墅:别墅均价]] + def statMap = [:]; // 灏忓尯鍧囦环 [鍖哄煙_灏忓尯鍚�:[灏忓尯:灏忓尯鍧囦环,鍒:鍒鍧囦环]] DISTRICT_STAT_CONN.find(query, fields).each { def key = it.region + "_" + it.district_name; @@ -692,7 +692,7 @@ class DistrictExport2 { fields.put('avg_price', 1); fields.put('house_type', 1); - def statRentMap = [:]; // [区域_小区名:[小区:[1:价格,2:价格...],别墅:[1:价格,2:价格...]]] + def statRentMap = [:]; // [鍖哄煙_灏忓尯鍚�:[灏忓尯:[1:浠锋牸,2:浠锋牸...],鍒:[1:浠锋牸,2:浠锋牸...]]] DISTRICT_STAT_RENT_CONN.find(query, fields).each { def key = it.region + "_" + it.district_name; @@ -857,7 +857,7 @@ class DistrictExport2 { } /** - * 把字符串转换成Double类型 + * 鎶婂瓧绗︿覆杞崲鎴怐ouble绫诲瀷 * @param s * @return */ @@ -902,7 +902,7 @@ class DistrictExport2 { } /** - * 把字符串中有中文数字的转换成数字 + * 鎶婂瓧绗︿覆涓湁涓枃鏁板瓧鐨勮浆鎹㈡垚鏁板瓧 * @param s * @return */ @@ -914,26 +914,26 @@ class DistrictExport2 { } /** - * 获得中文数字映射表 - * key:中文数字 - * value:数字 + * 鑾峰緱涓枃鏁板瓧鏄犲皠琛� + * key:涓枃鏁板瓧 + * value:鏁板瓧 * @return */ private static Map getChineseNumberMap(){ Map chineseNumberMap = new HashMap(); - chineseNumberMap.put("一", "1"); - chineseNumberMap.put("两", "2"); - chineseNumberMap.put("二", "2"); - chineseNumberMap.put("三", "3"); - chineseNumberMap.put("四", "4"); - chineseNumberMap.put("五", "5"); - chineseNumberMap.put("六", "6"); - chineseNumberMap.put("七", "7"); + chineseNumberMap.put("涓�", "1"); + chineseNumberMap.put("涓�", "2"); + chineseNumberMap.put("浜�", "2"); + chineseNumberMap.put("涓�", "3"); + chineseNumberMap.put("鍥�", "4"); + chineseNumberMap.put("浜�", "5"); + chineseNumberMap.put("鍏�", "6"); + chineseNumberMap.put("涓�", "7"); return chineseNumberMap; } def static double score(String field, String str) { - str = null == str ? "" : str.replaceAll('^[\\s ]*|[\\s ]*$', ""); + str = null == str ? "" : str.replaceAll('^[\\s銆�]*|[\\s ]*$', ""); str = str.trim(); if ("".equals(str)) { return -1; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/DistrictExport3.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/DistrictExport3.groovy index b2296c7ac..27a3b3466 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/DistrictExport3.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/DistrictExport3.groovy @@ -49,39 +49,39 @@ class DistrictExport3 { public static final DBCollection ALI_DATA_CONN = MongoUtils.getCollectionByName("fangjia", "ali_trade_data", "192.168.0.60") def final static Map FIELDS_MAP = [ - "小区名称" : [field:'name', width:6000], - "小区地址" : [field:'address', width:6000], - "城市" : [field:'city', width:4000], - "区域" : [field:'region', width:4000], - "板块" : [field:'block', width:4000], - "街道/社区" : [field:'street_community', width:6000], - "小区占地面积" : [field:'all_area', width:6000], - "小区建筑面积" : [field:'build_area', width:6000], - "容积率" : [field:'cubage_percent', width:6000], - "绿化率" : [field:'virescence_percent', width:6000], - "小区停车位" : [field:'car_site', width:6000], - "小区物业费" : [field:'estate_charge', width:6000], - "房型" : [field:'house_type', width:6000], - "房型价格" : [field:'house_type_price', width:6000], - "房型面积" : [field:'house_type_area', width:6000], - "出租套数" : [field:'rent_count', width:6000], - "挂牌套数" : [field:'sell_count', width:6000], - "是否是学区房" : [field:'school_house', width:6000], - "物业类型" : [field:'estate_type2', width:6000], - "建筑类型" : [field:'build_type', width:6000], - "小区均价" : [field:'avg_price', width:6000], - "期数" : [field:'district_period', width:6000], - "竣工时间" : [field:'finish_building_date', width:6000], - "开发商" : [field:'developer', width:6000], - "小区物业公司" : [field:'estate_company', width:6000], - "小区租金" : [field:'rent_price', width:6000], - "小区地理位置" : [field:'loop_line_info', width:6000], - "成交活跃度" : [field:'trade_stat', width:6000], - "租售比" : [field:'rent_sell', width:6000], - "周边配套" : [field:'facilities', width:15000], - "是否是地铁房" : [field:'metro_house', width:6000], - "经度" : [field:'lat', width:6000], - "纬度" : [field:'lng', width:6000] + "灏忓尯鍚嶇О" : [field:'name', width:6000], + "灏忓尯鍦板潃" : [field:'address', width:6000], + "鍩庡競" : [field:'city', width:4000], + "鍖哄煙" : [field:'region', width:4000], + "鏉垮潡" : [field:'block', width:4000], + "琛楅亾/绀惧尯" : [field:'street_community', width:6000], + "灏忓尯鍗犲湴闈㈢Н" : [field:'all_area', width:6000], + "灏忓尯寤虹瓚闈㈢Н" : [field:'build_area', width:6000], + "瀹圭Н鐜�" : [field:'cubage_percent', width:6000], + "缁垮寲鐜�" : [field:'virescence_percent', width:6000], + "灏忓尯鍋滆溅浣�" : [field:'car_site', width:6000], + "灏忓尯鐗╀笟璐�" : [field:'estate_charge', width:6000], + "鎴垮瀷" : [field:'house_type', width:6000], + "鎴垮瀷浠锋牸" : [field:'house_type_price', width:6000], + "鎴垮瀷闈㈢Н" : [field:'house_type_area', width:6000], + "鍑虹濂楁暟" : [field:'rent_count', width:6000], + "鎸傜墝濂楁暟" : [field:'sell_count', width:6000], + "鏄惁鏄鍖烘埧" : [field:'school_house', width:6000], + "鐗╀笟绫诲瀷" : [field:'estate_type2', width:6000], + "寤虹瓚绫诲瀷" : [field:'build_type', width:6000], + "灏忓尯鍧囦环" : [field:'avg_price', width:6000], + "鏈熸暟" : [field:'district_period', width:6000], + "绔e伐鏃堕棿" : [field:'finish_building_date', width:6000], + "寮�鍙戝晢" : [field:'developer', width:6000], + "灏忓尯鐗╀笟鍏徃" : [field:'estate_company', width:6000], + "灏忓尯绉熼噾" : [field:'rent_price', width:6000], + "灏忓尯鍦扮悊浣嶇疆" : [field:'loop_line_info', width:6000], + "鎴愪氦娲昏穬搴�" : [field:'trade_stat', width:6000], + "绉熷敭姣�" : [field:'rent_sell', width:6000], + "鍛ㄨ竟閰嶅" : [field:'facilities', width:15000], + "鏄惁鏄湴閾佹埧" : [field:'metro_house', width:6000], + "缁忓害" : [field:'lat', width:6000], + "绾害" : [field:'lng', width:6000] ]; public static Date WEEKEND = null; @@ -92,7 +92,7 @@ class DistrictExport3 { List cities = sd.getAllCities(); WEEKEND = DateUtil.parseDate("2013-09-29", "yyyy-MM-dd") MONTHEND = DateUtil.getLastEndMonthDate(DateUtil.parseDate("2014-01-20", "yyyy-MM-dd")); - String filePath = "D:\\阿里数据\\详细数据\\tmp\\阿里数据-20140310.xls"; + String filePath = "D:\\闃块噷鏁版嵁\\璇︾粏鏁版嵁\\tmp\\闃块噷鏁版嵁-20140310.xls"; sd.createDataFile(filePath, cities, FIELDS_MAP) @@ -129,7 +129,7 @@ class DistrictExport3 { HSSFSheet citySheet = workBook.createSheet(city); int i=0 for(String f : fieldsMap.keySet()) { - citySheet.setColumnWidth((short) i, (short) fieldsMap.get(f).get('width')); //默认设置宽度 + citySheet.setColumnWidth((short) i, (short) fieldsMap.get(f).get('width')); //榛樿璁剧疆瀹藉害 citySheet.setDefaultRowHeight((short)420) i++ } @@ -179,7 +179,7 @@ class DistrictExport3 { }else if('sell_count'.equals(fieldName)) { val = getSellCount(city, region, name) }else if('school_house'.equals(fieldName)) { - val = (getSchoolHouse(city, region, name) == null ? "" : "是") + val = (getSchoolHouse(city, region, name) == null ? "" : "鏄�") }else if('avg_price'.equals(fieldName)) { val = getAvgPrice(city, region, name, dbo.get('avg_price'), dbo.get('total_price')) }else if('district_period'.equals(fieldName)) { @@ -201,7 +201,7 @@ class DistrictExport3 { val = String.valueOf(latLng) } }else if('metro_house'.equals(fieldName)) { - val = (getMetroHouse(city, region, name) ? "是" : "否") + val = (getMetroHouse(city, region, name) ? "鏄�" : "鍚�") }else { if(dbo.get(fieldName)) { val = DataUtil.removeHtml(String.valueOf(dbo.get(fieldName))) @@ -211,7 +211,7 @@ class DistrictExport3 { if(StringUtils.isBlank(val) || "null".equals(val) || "-1".equals(val)) { val = ""; } - if(val.indexOf('暂无') > -1 || val.indexOf('暂无资料') > -1) { + if(val.indexOf('鏆傛棤') > -1 || val.indexOf('鏆傛棤璧勬枡') > -1) { val = ""; } @@ -277,7 +277,7 @@ class DistrictExport3 { String key = city + "-" + region + "-" + name if(CITY_TRADE_MAP.get(city).containsKey(key)) { - return CITY_TRADE_MAP.get(city).get(key) + "套" + return CITY_TRADE_MAP.get(city).get(key) + "濂�" } return "" @@ -315,23 +315,23 @@ class DistrictExport3 { String ret = ""; if(statMap == null || statMap.size() == 0) { if (avgPrice && avgPrice > 2000) { - ret = avgPrice + "元" + ret = avgPrice + "鍏�" } else if (totalPrice && totalPrice > 10) { if (totalPrice <= 10000) { - ret = totalPrice + '万/套'; + ret = totalPrice + '涓�/濂�'; } else { - ret = ((int) (totalPrice / 10000)) + '万/套'; + ret = ((int) (totalPrice / 10000)) + '涓�/濂�'; } } }else { - def districtPrice = statMap.get('小区'); - def villaPrice = statMap.get('别墅'); + def districtPrice = statMap.get('灏忓尯'); + def villaPrice = statMap.get('鍒'); if (null != districtPrice && null != villaPrice) { - ret = "小区:" + districtPrice+"元" + "\r\n别墅:" + villaPrice + "元"; + ret = "灏忓尯:" + districtPrice+"鍏�" + "\r\n鍒:" + villaPrice + "鍏�"; } else if (null != districtPrice) { - ret = districtPrice + "元"; + ret = districtPrice + "鍏�"; } else if (null != villaPrice) { - ret = villaPrice + "元"; + ret = villaPrice + "鍏�"; } } @@ -412,8 +412,8 @@ class DistrictExport3 { def rentStatMap = getDistrictRentStat2(city, region, name) if(rentStatMap != null) { - def xiaoqu = rentStatMap.get('小区'); - def bieshu = rentStatMap.get('别墅'); + def xiaoqu = rentStatMap.get('灏忓尯'); + def bieshu = rentStatMap.get('鍒'); if (null != xiaoqu && null != bieshu) { def xiaoquMin = Integer.MAX_VALUE; def xiaoquMax = Integer.MIN_VALUE; @@ -437,7 +437,7 @@ class DistrictExport3 { } } - ret = "小区:" + (xiaoquMin == xiaoquMax ? (xiaoquMin + '左右') : (xiaoquMin + "~" + xiaoquMax)) + "\r\n别墅:" + (bieshuMin == bieshuMax ? (bieshuMin + '左右') : (bieshuMin + "~" + bieshuMax)); + ret = "灏忓尯锛�" + (xiaoquMin == xiaoquMax ? (xiaoquMin + '宸﹀彸') : (xiaoquMin + "~" + xiaoquMax)) + "\r\n鍒锛�" + (bieshuMin == bieshuMax ? (bieshuMin + '宸﹀彸') : (bieshuMin + "~" + bieshuMax)); } else if (null != xiaoqu) { def min = Integer.MAX_VALUE; def max = Integer.MIN_VALUE; @@ -449,7 +449,7 @@ class DistrictExport3 { min = b; } } - ret = (min == max ? (min + '左右') : (min + "~" + max)); + ret = (min == max ? (min + '宸﹀彸') : (min + "~" + max)); } else if (null != bieshu) { def min = Integer.MAX_VALUE; def max = Integer.MIN_VALUE; @@ -461,7 +461,7 @@ class DistrictExport3 { min = b; } } - ret = (min == max ? (min + '左右') : (min + "~" + max)); + ret = (min == max ? (min + '宸﹀彸') : (min + "~" + max)); } }else { def disStatMap = this.getDistrictStat2(city, region, name) @@ -472,8 +472,8 @@ class DistrictExport3 { if(disStatMap != null) { def regionRentRang = getRegionRatioRange(city, region) if (regionRentRang) { - def xiaoqu = disStatMap.get('小区'); - def bieshu = disStatMap.get('别墅'); + def xiaoqu = disStatMap.get('灏忓尯'); + def bieshu = disStatMap.get('鍒'); if (!xiaoqu && avgPrice && avgPrice > 2000) { xiaoqu = avgPrice; } @@ -486,15 +486,15 @@ class DistrictExport3 { def xiaoquMax = (int) (regionRentRang[1] * xiaoqu); def bieshuMin = (int) (regionRentRang[0] * bieshu); def bieshuMax = (int) (regionRentRang[1] * bieshu); - ret ="小区:" + (xiaoquMin == xiaoquMax ? (xiaoquMin + '左右') : (xiaoquMin + "~" + xiaoquMax)) + "\r\n别墅:" + (bieshuMin == bieshuMax ? (bieshuMin + '左右') : (bieshuMin + "~" + bieshuMax)); + ret ="灏忓尯锛�" + (xiaoquMin == xiaoquMax ? (xiaoquMin + '宸﹀彸') : (xiaoquMin + "~" + xiaoquMax)) + "\r\n鍒锛�" + (bieshuMin == bieshuMax ? (bieshuMin + '宸﹀彸') : (bieshuMin + "~" + bieshuMax)); } else if (null != xiaoqu) { def min = (int) (regionRentRang[0] * xiaoqu); def max = (int) (regionRentRang[1] * xiaoqu); - ret = (min == max ? (min + '左右') : (min + "~" + max)); + ret = (min == max ? (min + '宸﹀彸') : (min + "~" + max)); } else if (null != bieshu) { def min = (int) (regionRentRang[0] * bieshu); def max = (int) (regionRentRang[1] * bieshu); - ret = (min == max ? (min + '左右') : (min + "~" + max)); + ret = (min == max ? (min + '宸﹀彸') : (min + "~" + max)); } } } @@ -682,7 +682,7 @@ class DistrictExport3 { roomTypes = roomTypes.unique() for(String rt : roomTypes) { String[] arrs = rt.split("-") - ret.add(DataUtil.convertNumberToCn(arrs[0]) + "室" + DataUtil.convertNumberToCn(arrs[1]) + "厅") + ret.add(DataUtil.convertNumberToCn(arrs[0]) + "瀹�" + DataUtil.convertNumberToCn(arrs[1]) + "鍘�") } } @@ -693,7 +693,7 @@ class DistrictExport3 { def DISTRICT_ROOM_FACTOR_MAP = [:] private String getHouseTypePrice(String city, String region, String name) { def districtStatMap = getDistrictStat2(city, region, name) - if(districtStatMap == null || !districtStatMap.containsKey('小区')) {//因为只有"小区"有房型因子 + if(districtStatMap == null || !districtStatMap.containsKey('灏忓尯')) {//鍥犱负鍙湁"灏忓尯"鏈夋埧鍨嬪洜瀛� return null; } @@ -721,7 +721,7 @@ class DistrictExport3 { DISTRICT_ROOM_FACTOR_MAP.put(city, districtMap) } - int districtPrice = districtStatMap.get('小区'); + int districtPrice = districtStatMap.get('灏忓尯'); def ret = [] String key = city + "-" + region + "-" + name if(DISTRICT_ROOM_FACTOR_MAP.get(city).get(key) != null) { @@ -730,7 +730,7 @@ class DistrictExport3 { def room = fobj.get('room'); def factor = fobj.get('factor') int p = districtPrice * factor - ret.add(DataUtil.convertNumberToCn(String.valueOf(room)) + "室" + p + "元") + ret.add(DataUtil.convertNumberToCn(String.valueOf(room)) + "瀹�" + p + "鍏�") } } @@ -759,7 +759,7 @@ class DistrictExport3 { continue } - String k = DataUtil.convertNumberToCn(room + "") + "室" + DataUtil.convertNumberToCn(hall + "") + "厅" + String k = DataUtil.convertNumberToCn(room + "") + "瀹�" + DataUtil.convertNumberToCn(hall + "") + "鍘�" if(map.get(k)) { def list = map.get(k) list.add(area) @@ -771,7 +771,7 @@ class DistrictExport3 { def ret = [] for(String k : map.keySet()) { - ret.add(k + "[" + StringUtils.join(map.get(k), ",") + "]平米") + ret.add(k + "[" + StringUtils.join(map.get(k), ",") + "]骞崇背") } return StringUtils.join(ret, "\r\n") } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/DistrictExport5.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/DistrictExport5.groovy index f045b0e7c..71422e268 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/DistrictExport5.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/DistrictExport5.groovy @@ -33,8 +33,8 @@ import java.util.concurrent.TimeUnit class DistrictExport5 { - def final static String[] TABLE_HEADER = [ "城市", "区域","小区名", "小区地址", "物业类型", "建筑类型", "户数", "物业费", "停车位","产权年限","竣工日期","占地面积", "建筑面积","绿化率", "容积率", "开发商", "物业公司", "经度", "纬度","预售许可证"/*,"医院","学校","幼儿园","公园\\绿地","体育场馆","图书馆","写字楼","银行\\ATM","停车场","便利店","网吧","商场","KTV","剧场\\影院","健身中心","美容院","大型超市","私立学校","洗浴中心","酒店","咖啡厅","餐饮","游乐场","房产中介","旅游景点","地铁","码头","机场","火车站","小区均价1","小区均价2","小区均价3","小区均价4","区域住宅均价","城市住宅均价"*/]; - def final static String[] LOUDONG_TABLE_HEADER = ["城市", "区域","小区名","楼栋号","室号"]; + def final static String[] TABLE_HEADER = [ "鍩庡競", "鍖哄煙","灏忓尯鍚�", "灏忓尯鍦板潃", "鐗╀笟绫诲瀷", "寤虹瓚绫诲瀷", "鎴锋暟", "鐗╀笟璐�", "鍋滆溅浣�","浜ф潈骞撮檺","绔e伐鏃ユ湡","鍗犲湴闈㈢Н", "寤虹瓚闈㈢Н","缁垮寲鐜�", "瀹圭Н鐜�", "寮�鍙戝晢", "鐗╀笟鍏徃", "缁忓害", "绾害","棰勫敭璁稿彲璇�"/*,"鍖婚櫌","瀛︽牎","骞煎効鍥�","鍏洯\\缁垮湴","浣撹偛鍦洪","鍥句功棣�","鍐欏瓧妤�","閾惰\\ATM","鍋滆溅鍦�","渚垮埄搴�","缃戝惂","鍟嗗満","KTV","鍓у満\\褰遍櫌","鍋ヨ韩涓績","缇庡闄�","澶у瀷瓒呭競","绉佺珛瀛︽牎","娲楁荡涓績","閰掑簵","鍜栧暋鍘�","椁愰ギ","娓镐箰鍦�","鎴夸骇涓粙","鏃呮父鏅偣","鍦伴搧","鐮佸ご","鏈哄満","鐏溅绔�","灏忓尯鍧囦环1","灏忓尯鍧囦环2","灏忓尯鍧囦环3","灏忓尯鍧囦环4","鍖哄煙浣忓畢鍧囦环","鍩庡競浣忓畢鍧囦环"*/]; + def final static String[] LOUDONG_TABLE_HEADER = ["鍩庡競", "鍖哄煙","灏忓尯鍚�","妤兼爧鍙�","瀹ゅ彿"]; def static DSCollection SEAWEED = new DataStore("seaweed.db.fangjia.com", 27007).getCollection("fangjia.seaweed"); public static final DBCollection REGION_STAT_COLL = MongoUtils.getCollectionByName("fangjia", "region_stat", "mongo.db.fangjia.com") public static final DBCollection DIST_STAT_COLL = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "mongo.db.fangjia.com") @@ -44,15 +44,15 @@ class DistrictExport5 { def final static HSSFWorkbook WORK_BOOK = new HSSFWorkbook(); def static HSSFCellStyle cellStyle; - def static keys = ["医院","学校","幼儿园","公园\\绿地","体育场馆","图书馆","写字楼","银行\\ATM","停车场","便利店","网吧","商场","KTV","剧场\\影院","健身中心","美容院","大型超市","私立学校","洗浴中心","酒店","咖啡厅","餐饮","游乐场","房产中介","旅游景点","地铁","码头","机场","火车站"] + def static keys = ["鍖婚櫌","瀛︽牎","骞煎効鍥�","鍏洯\\缁垮湴","浣撹偛鍦洪","鍥句功棣�","鍐欏瓧妤�","閾惰\\ATM","鍋滆溅鍦�","渚垮埄搴�","缃戝惂","鍟嗗満","KTV","鍓у満\\褰遍櫌","鍋ヨ韩涓績","缇庡闄�","澶у瀷瓒呭競","绉佺珛瀛︽牎","娲楁荡涓績","閰掑簵","鍜栧暋鍘�","椁愰ギ","娓镐箰鍦�","鎴夸骇涓粙","鏃呮父鏅偣","鍦伴搧","鐮佸ご","鏈哄満","鐏溅绔�"] - //"深圳","广州","北京","上海","成都","金华","烟台","长沙","嘉兴","东莞","福州","西安","乌鲁木齐","洛阳","青岛","徐州","合肥","济南","沈阳","泉州","南宁","厦门","海口","贵阳","太原","重庆","杭州","惠州","宁波","珠海","昆明","温州","苏州","南京","潍坊","大连","哈尔滨","南昌","佛山","武汉","天津","南通","无锡","长春","常州","郑州","石家庄","汕头","扬州" + //"娣卞湷","骞垮窞","鍖椾含","涓婃捣","鎴愰兘","閲戝崕","鐑熷彴","闀挎矙","鍢夊叴","涓滆帪","绂忓窞","瑗垮畨","涔岄瞾鏈ㄩ綈","娲涢槼","闈掑矝","寰愬窞","鍚堣偉","娴庡崡","娌堥槼","娉夊窞","鍗楀畞","鍘﹂棬","娴峰彛","璐甸槼","澶師","閲嶅簡","鏉窞","鎯犲窞","瀹佹尝","鐝犳捣","鏄嗘槑","娓╁窞","鑻忓窞","鍗椾含","娼嶅潑","澶ц繛","鍝堝皵婊�","鍗楁槍","浣涘北","姝︽眽","澶╂触","鍗楅��","鏃犻敗","闀挎槬","甯稿窞","閮戝窞","鐭冲搴�","姹曞ご","鎵窞" static main(args) { def task = new DistrictExport5(); - // "深圳" - //"北京","广州","上海","成都","烟台","长沙","嘉兴","东莞", - def citys = ["杭州"] + // "娣卞湷" + //"鍖椾含","骞垮窞","涓婃捣","鎴愰兘","鐑熷彴","闀挎矙","鍢夊叴","涓滆帪", + def citys = ["鏉窞"] for(def city : citys){ //def districts = CommonDatautils.findAllDistricts(city, "district",["city","region","name","address", "lat","lng","lat2","lng2"]); //task.splitData(city, districts); @@ -63,19 +63,19 @@ class DistrictExport5 { - //task.exportDistrictField(city);//导出小区字段 + //task.exportDistrictField(city);//瀵煎嚭灏忓尯瀛楁 //task.exportPrice(city); //task.exportArroundInfo(city); - //查询楼栋 + //鏌ヨ妤兼爧 //def result = task.runLouDong(city, districts); - //task.exportLouDong(result, "d:\\杭州楼栋.xls"); + //task.exportLouDong(result, "d:\\鏉窞妤兼爧.xls"); - //城市均价 + //鍩庡競鍧囦环 // def weekends = "2017-07-02"; // def city_price = task.queryCityPrice(city, weekends); // -// //区域均价 +// //鍖哄煙鍧囦环 // def regions = task.getCityRegions(city); // def regionMap = [:]; // for(def region: regions){ @@ -86,21 +86,21 @@ class DistrictExport5 { // // -// //最近几周均价 -// def weekendArray = task.findWeekends(4);//日期最近的X期 +// //鏈�杩戝嚑鍛ㄥ潎浠� +// def weekendArray = task.findWeekends(4);//鏃ユ湡鏈�杩戠殑X鏈� // def datePriceMap = [:]; // for(def weekend : weekendArray){ // def priceMap = task.queryDistrictPrice(city, weekend); // datePriceMap[weekend] = priceMap; // } // -// //task.export(city_price, regionMap, priceMap, districts,"D:\\杭州小区-170703.xls"); -// task.export(city_price, regionMap, districts, arroundMap, datePriceMap,weekendArray,"D:\\"+city+"小区-170703.xls"); +// //task.export(city_price, regionMap, priceMap, districts,"D:\\鏉窞灏忓尯锛�170703.xls"); +// task.export(city_price, regionMap, districts, arroundMap, datePriceMap,weekendArray,"D:\\"+city+"灏忓尯锛�170703.xls"); } def splitData(city, datas){ def rows =[] - rows << ["城市","区域","名称","地址","高德纬度","高德经度","百度纬度","百度经度"]; + rows << ["鍩庡競","鍖哄煙","鍚嶇О","鍦板潃","楂樺痉绾害","楂樺痉缁忓害","鐧惧害绾害","鐧惧害缁忓害"]; for(def dist : datas){ def row = []; row << dist.city @@ -131,7 +131,7 @@ class DistrictExport5 { } rows << row } - ExcelUtils.write("D:\\数据\\结果\\东北师范大学\\小区("+city+").xlsx", rows, "小区") + ExcelUtils.write("D:\\鏁版嵁\\缁撴灉\\涓滃寳甯堣寖澶у\\灏忓尯("+city+").xlsx", rows, "灏忓尯") } @@ -140,7 +140,7 @@ class DistrictExport5 { def countPois(datas, city, lat, lng, keyword){ def names = [] def results; - if(keyword=="房产中介"){ + if(keyword=="鎴夸骇涓粙"){ if (lng && lat && lng > 0) { for(def data : datas){ double dis = GeoUtils.calculateDistance(lng, lat, Double.parseDouble(data.lng), Double.parseDouble(data.lat)) @@ -150,8 +150,8 @@ class DistrictExport5 { } } }else{ - if(keyword.indexOf("影院")!=-1){ - keyword = "电影院"; + if(keyword.indexOf("褰遍櫌")!=-1){ + keyword = "鐢靛奖闄�"; } double[] bounds = GeoUtils.getAround(lat,lng,1000) def query = new BasicDBObject() @@ -162,7 +162,7 @@ class DistrictExport5 { results = POI.find(query); results.each {BasicDBObject dbo-> if(GeoUtils.calculateDistance(lng, lat, dbo.lng, dbo.lat)){ - if(keyword == "地铁"){ + if(keyword == "鍦伴搧"){ names << dbo.address }else{ names << dbo.name @@ -180,7 +180,7 @@ class DistrictExport5 { def countPois2(datas, city, lat, lng, keyword, poiMap){ def names = [] def results; - if(keyword=="房产中介"){ + if(keyword=="鎴夸骇涓粙"){ if (lng && lat && lng > 0) { for(def data : datas){ double dis = GeoUtils.calculateDistance(lng, lat, Double.parseDouble(data.lng), Double.parseDouble(data.lat)) @@ -190,8 +190,8 @@ class DistrictExport5 { } } }else{ - if(keyword.indexOf("影院")!=-1){ - keyword = "电影院"; + if(keyword.indexOf("褰遍櫌")!=-1){ + keyword = "鐢靛奖闄�"; } def pois = poiMap.get(keyword); for(def map : pois){ @@ -225,7 +225,7 @@ class DistrictExport5 { def map = [:] map.lat = dbo.lat; map.lng = dbo.lng; - if(keyword == "地铁"){ + if(keyword == "鍦伴搧"){ map.name = dbo.address }else{ map.name = dbo.name @@ -352,7 +352,7 @@ class DistrictExport5 { FileOutputStream fos = null; try { HSSFWorkbook WORK_BOOK = new HSSFWorkbook(); - HSSFSheet sheet = WORK_BOOK.createSheet("数据"); + HSSFSheet sheet = WORK_BOOK.createSheet("鏁版嵁"); HSSFRow row0 = sheet.createRow(0); @@ -395,7 +395,7 @@ class DistrictExport5 { FileOutputStream fos = null; try { HSSFWorkbook WORK_BOOK = new HSSFWorkbook(); - HSSFSheet sheet = WORK_BOOK.createSheet("数据"); + HSSFSheet sheet = WORK_BOOK.createSheet("鏁版嵁"); HSSFRow row0 = sheet.createRow(0); @@ -504,7 +504,7 @@ class DistrictExport5 { def regions = []; for(DBObject obj : dbCursor){ def region = obj.get("name"); - if(region.indexOf("周边")==-1 && region.indexOf("其他")==-1) { + if(region.indexOf("鍛ㄨ竟")==-1 && region.indexOf("鍏朵粬")==-1) { regions << region; } } @@ -513,7 +513,7 @@ class DistrictExport5 { def createDistricts(city){ def districts = []; - def rows = readTxt("d:\\"+city+"小区.txt","UTF-8"); + def rows = readTxt("d:\\"+city+"灏忓尯.txt","UTF-8"); for(def row : rows){ @@ -555,7 +555,7 @@ class DistrictExport5 { def districts = CommonDatautils.findAllFiledDistrict("district", city); println "districts total is "+districts.count(); def rets = []; - rets << ["城市"," 区域","小区名","小区地址","物业类型","建筑类型","户数","物业费","停车位","产权年限","竣工日期","占地面积","建筑面积","绿化率","容积率","开发商","物业公司","经度","纬度","预售许可证"] + rets << ["鍩庡競"," 鍖哄煙","灏忓尯鍚�","灏忓尯鍦板潃","鐗╀笟绫诲瀷","寤虹瓚绫诲瀷","鎴锋暟","鐗╀笟璐�","鍋滆溅浣�","浜ф潈骞撮檺","绔e伐鏃ユ湡","鍗犲湴闈㈢Н","寤虹瓚闈㈢Н","缁垮寲鐜�","瀹圭Н鐜�","寮�鍙戝晢","鐗╀笟鍏徃","缁忓害","绾害","棰勫敭璁稿彲璇�"] def distDatas = []; @@ -592,7 +592,7 @@ class DistrictExport5 { } rets.addAll(distDatas) - ExcelUtils.write("D:\\数据\\结果\\"+city+"数据(东北师范大学).xls", rets, "字段信息") + ExcelUtils.write("D:\\鏁版嵁\\缁撴灉\\"+city+"鏁版嵁(涓滃寳甯堣寖澶у).xls", rets, "瀛楁淇℃伅") } @@ -620,7 +620,7 @@ class DistrictExport5 { def exportCityPrice(city, weekends){ def rets = []; def rows = []; - rows << ["城市","时间", "城市均价"] + rows << ["鍩庡競","鏃堕棿", "鍩庡競鍧囦环"] for(def weekend : weekends){ def ret = []; def startDate = DateUtils.formatToYYYYMMDD(DateUtils.getFirstDayOfMonth(DateUtils.parseFromTightYYYYMMDD(weekend))); @@ -634,13 +634,13 @@ class DistrictExport5 { } rows.addAll(rets) - ExcelUtils.write("D:\\数据\\结果\\东北师范大学---价格信息("+city+").xlsx", rows, "城市均价") + ExcelUtils.write("D:\\鏁版嵁\\缁撴灉\\涓滃寳甯堣寖澶у---浠锋牸淇℃伅("+city+").xlsx", rows, "鍩庡競鍧囦环") } def exportRegionPrice(city, weekends){ def rows = []; - def titles = ["城市","区域"] + def titles = ["鍩庡競","鍖哄煙"] for(def weekend : weekends){ titles << DateUtils.formatDateByPattern(DateUtils.parseFromTightYYYYMMDD(weekend), "yyyy-MM"); @@ -671,14 +671,14 @@ class DistrictExport5 { rows << titles rows.addAll(rets) - ExcelUtils.write("D:\\数据\\结果\\东北师范大学---价格信息("+city+").xlsx", rows, "区域均价") + ExcelUtils.write("D:\\鏁版嵁\\缁撴灉\\涓滃寳甯堣寖澶у---浠锋牸淇℃伅("+city+").xlsx", rows, "鍖哄煙鍧囦环") } def exportDistrictPrice(city, weekends, districts){ def rows = []; - def titles = ["城市","区域", "小区名称", "地址"] + def titles = ["鍩庡競","鍖哄煙", "灏忓尯鍚嶇О", "鍦板潃"] for(def weekend : weekends){ titles << DateUtils.formatDateByPattern(DateUtils.parseFromTightYYYYMMDD(weekend), "yyyy-MM"); @@ -726,14 +726,14 @@ class DistrictExport5 { rows << titles rows.addAll(rets) - ExcelUtils.write("D:\\数据\\结果\\东北师范大学---价格信息("+city+").xlsx", rows, "小区均价") + ExcelUtils.write("D:\\鏁版嵁\\缁撴灉\\涓滃寳甯堣寖澶у---浠锋牸淇℃伅("+city+").xlsx", rows, "灏忓尯鍧囦环") } def exportArroundInfo3(def city){ def rows = []; - def titles = ["城市","区域", "小区名称", "地址"] + def titles = ["鍩庡競","鍖哄煙", "灏忓尯鍚嶇О", "鍦板潃"] for(def key : keys){ titles << key } @@ -741,7 +741,7 @@ class DistrictExport5 { final def datas = loadData(city); - def list = ExcelUtils.read("D:\\数据\\结果\\东北师范大学\\小区("+city+")-1.xlsx"); + def list = ExcelUtils.read("D:\\鏁版嵁\\缁撴灉\\涓滃寳甯堣寖澶у\\灏忓尯("+city+")-1.xlsx"); def districts = []; for(def data : list){ @@ -786,7 +786,7 @@ class DistrictExport5 { rows << titles rows.addAll(rets) - ExcelUtils.write("D:\\数据\\结果\\东北师范大学\\东北师范大学---周边配套信息("+city+").xlsx", rows, "数据") + ExcelUtils.write("D:\\鏁版嵁\\缁撴灉\\涓滃寳甯堣寖澶у\\涓滃寳甯堣寖澶у---鍛ㄨ竟閰嶅淇℃伅("+city+").xlsx", rows, "鏁版嵁") } def getArroundInfo(def city, def dist, def datas){ @@ -812,7 +812,7 @@ class DistrictExport5 { // def pois = findAllPois(city); def rows = []; - def titles = ["城市","区域", "小区名称", "地址"] + def titles = ["鍩庡競","鍖哄煙", "灏忓尯鍚嶇О", "鍦板潃"] for(def key : keys){ titles << key } @@ -833,7 +833,7 @@ class DistrictExport5 { def newkey = key.replace("\\","/"); def details = countPois(datas, city, dist.lat/10000000000, dist.lng/10000000000, newkey);//CommonDatautils.findPoiDetail(key, dist.lat2, dist.lng2) -// if(!details && key!="机场" && key!="火车站"){ +// if(!details && key!="鏈哄満" && key!="鐏溅绔�"){ // newkey = key.replace("/",'$'); // details = CommonDatautils.findPoiDetail(newkey, dist.lat2, dist.lng2); // } @@ -844,13 +844,13 @@ class DistrictExport5 { }); rows << titles rows.addAll(rets) - ExcelUtils.write("D:\\数据\\结果\\东北师范大学\\东北师范大学---周边配套信息("+city+")-new.xlsx", rows, "数据") + ExcelUtils.write("D:\\鏁版嵁\\缁撴灉\\涓滃寳甯堣寖澶у\\涓滃寳甯堣寖澶у---鍛ㄨ竟閰嶅淇℃伅("+city+")-new.xlsx", rows, "鏁版嵁") } def exportArroundInfo(def city){ def rows = []; - def titles = ["城市","区域", "小区名称", "地址"] + def titles = ["鍩庡競","鍖哄煙", "灏忓尯鍚嶇О", "鍦板潃"] for(def key : keys){ titles << key } @@ -858,20 +858,20 @@ class DistrictExport5 { def datas = loadData(city); def districts = CommonDatautils.findAllDistricts(city, "district",["city","region","name","address", "lat","lng","lat2","lng2"]); println city + " "+districts.count() - //周边配套 + //鍛ㄨ竟閰嶅 def index = 0; def arroundMap = [:] ExecutorService executorService = Executors.newFixedThreadPool(10) def rets = Collections.synchronizedList([]) -// def rows2 = ExcelUtils.read("D:\\数据\\原数据\\成都小区.xlsx"); +// def rows2 = ExcelUtils.read("D:\\鏁版嵁\\鍘熸暟鎹甛\鎴愰兘灏忓尯.xlsx"); // def runedDists = [] // for(def row : rows2){ // def key = row[1]+"#"+row[2]; // runedDists << key // } -// println "已运行的小区:"+runedDists.size(); +// println "宸茶繍琛岀殑灏忓尯锛�"+runedDists.size(); def dists = []; def distIndex = 0; @@ -919,7 +919,7 @@ class DistrictExport5 { def newkey = key.replace("\\","/"); def details = countPois(datas, city, m.lat/10000000000, m.lng/10000000000, newkey);//CommonDatautils.findPoiDetail(key, dist.lat2, dist.lng2) - if(!details && key!="机场" && key!="火车站"){ + if(!details && key!="鏈哄満" && key!="鐏溅绔�"){ newkey = key.replace("/",'$'); details = CommonDatautils.findPoiDetail(newkey, m.lat2, m.lng2); } @@ -943,7 +943,7 @@ class DistrictExport5 { rows << titles rows.addAll(rets) - ExcelUtils.write("D:\\数据\\结果\\东北师范大学---周边配套信息("+city+").xlsx", rows, "小区均价") + ExcelUtils.write("D:\\鏁版嵁\\缁撴灉\\涓滃寳甯堣寖澶у---鍛ㄨ竟閰嶅淇℃伅("+city+").xlsx", rows, "灏忓尯鍧囦环") } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/DistrictExport6.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/DistrictExport6.groovy index 7fdb8832d..6bbf6e790 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/DistrictExport6.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/DistrictExport6.groovy @@ -33,7 +33,7 @@ class DistrictExport6 { } def runDetailInfo(){ - def excelPath = "D:\\数据导出\\样例\\福建山西-详情.xlsx" + def excelPath = "D:\\鏁版嵁瀵煎嚭\\鏍蜂緥\\绂忓缓灞辫タ-璇︽儏.xlsx" List> result = ExcelUtils.read(excelPath); def weekend = DateUtils.parseFromTightYYYYMMDD("2017-07-02"); def rowIndex = 0; @@ -53,15 +53,15 @@ class DistrictExport6 { list[9]=dbo.estate_type2 list[10]=dbo.property_life } - list[11] = getKeywordCount(city, "地铁", dbo.lat, dbo.lng, dbo.lat2, dbo.lng2); - list[12] = getKeywordCount(city, "学校", dbo.lat, dbo.lng, dbo.lat2, dbo.lng2); - list[13] = getKeywordCount(city, "公园", dbo.lat, dbo.lng, dbo.lat2, dbo.lng2); + list[11] = getKeywordCount(city, "鍦伴搧", dbo.lat, dbo.lng, dbo.lat2, dbo.lng2); + list[12] = getKeywordCount(city, "瀛︽牎", dbo.lat, dbo.lng, dbo.lat2, dbo.lng2); + list[13] = getKeywordCount(city, "鍏洯", dbo.lat, dbo.lng, dbo.lat2, dbo.lng2); } } - ExcelUtils.write("D:\\数据导出\\样例\\福建山西-详情(结果).xlsx", result, "详情"); + ExcelUtils.write("D:\\鏁版嵁瀵煎嚭\\鏍蜂緥\\绂忓缓灞辫タ-璇︽儏(缁撴灉).xlsx", result, "璇︽儏"); } @@ -77,8 +77,8 @@ class DistrictExport6 { int city_rank = dbo.get("city_rank") int city_rank_total = dbo.get("city_rank_total") float size = (float)city_rank/city_rank_total; - DecimalFormat df = new DecimalFormat("0.00");//格式化小数,不足的补0 - String filesize = df.format(size);//返回的是String类型的 + DecimalFormat df = new DecimalFormat("0.00");//鏍煎紡鍖栧皬鏁帮紝涓嶈冻鐨勮ˉ0 + String filesize = df.format(size);//杩斿洖鐨勬槸String绫诲瀷鐨� Double levelRate = Double.parseDouble(filesize); if(levelRate<0.01){ @@ -103,7 +103,7 @@ class DistrictExport6 { } def runSurveyInfo(){ - def excelPath = "d:\\数据导出\\样例\\福建山西-概况.xlsx" + def excelPath = "d:\\鏁版嵁瀵煎嚭\\鏍蜂緥\\绂忓缓灞辫タ-姒傚喌.xlsx" List> result = ExcelUtils.read(excelPath); def weekend = "2017-07-02"; def index = 0; @@ -117,7 +117,7 @@ class DistrictExport6 { index++; println index + " "+list } - ExcelUtils.write("d:\\数据导出\\样例\\福建山西-概况(结果).xlsx", result, "概况"); + ExcelUtils.write("d:\\鏁版嵁瀵煎嚭\\鏍蜂緥\\绂忓缓灞辫タ-姒傚喌(缁撴灉).xlsx", result, "姒傚喌"); } @@ -191,7 +191,7 @@ class DistrictExport6 { def results = POI.find(query); results.each {BasicDBObject dbo-> if(GeoUtils.calculateDistance(lng, lat, dbo.lng, dbo.lat)){ - if(keyword == "地铁"){ + if(keyword == "鍦伴搧"){ names << dbo.address }else{ names << dbo.name diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/DistrictExportToAli.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/DistrictExportToAli.groovy index 604b9d177..b1a7a8055 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/DistrictExportToAli.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/DistrictExportToAli.groovy @@ -49,39 +49,39 @@ class DistrictExportToAli { public static final DBCollection ALI_DATA_CONN = MongoUtils.getCollectionByName("fangjia", "ali_trade_data", "192.168.0.60") def final static Map FIELDS_MAP = [ - "小区名称" : [field:'name', width:6000], - "小区地址" : [field:'address', width:6000], - "城市" : [field:'city', width:4000], - "区域" : [field:'region', width:4000], - "板块" : [field:'block', width:4000], - "街道/社区" : [field:'street_community', width:6000], - "小区占地面积" : [field:'all_area', width:6000], - "小区建筑面积" : [field:'build_area', width:6000], - "容积率" : [field:'cubage_percent', width:6000], - "绿化率" : [field:'virescence_percent', width:6000], - "小区停车位" : [field:'car_site', width:6000], - "小区物业费" : [field:'estate_charge', width:6000], - "房型" : [field:'house_type', width:6000], - "房型价格" : [field:'house_type_price', width:6000], - "房型面积" : [field:'house_type_area', width:6000], - "出租套数" : [field:'rent_count', width:6000], - "挂牌套数" : [field:'sell_count', width:6000], - "是否是学区房" : [field:'school_house', width:6000], - "物业类型" : [field:'estate_type2', width:6000], - "建筑类型" : [field:'build_type', width:6000], - "小区均价" : [field:'avg_price', width:6000], - "期数" : [field:'district_period', width:6000], - "竣工时间" : [field:'finish_building_date', width:6000], - "开发商" : [field:'developer', width:6000], - "小区物业公司" : [field:'estate_company', width:6000], - "小区租金" : [field:'rent_price', width:6000], - "小区地理位置" : [field:'loop_line_info', width:6000], - "成交活跃度" : [field:'trade_stat', width:6000], - "租售比" : [field:'rent_sell', width:6000], - "周边配套" : [field:'facilities', width:15000], - "是否是地铁房" : [field:'metro_house', width:6000], - "经度" : [field:'lat', width:6000], - "纬度" : [field:'lng', width:6000] + "灏忓尯鍚嶇О" : [field:'name', width:6000], + "灏忓尯鍦板潃" : [field:'address', width:6000], + "鍩庡競" : [field:'city', width:4000], + "鍖哄煙" : [field:'region', width:4000], + "鏉垮潡" : [field:'block', width:4000], + "琛楅亾/绀惧尯" : [field:'street_community', width:6000], + "灏忓尯鍗犲湴闈㈢Н" : [field:'all_area', width:6000], + "灏忓尯寤虹瓚闈㈢Н" : [field:'build_area', width:6000], + "瀹圭Н鐜�" : [field:'cubage_percent', width:6000], + "缁垮寲鐜�" : [field:'virescence_percent', width:6000], + "灏忓尯鍋滆溅浣�" : [field:'car_site', width:6000], + "灏忓尯鐗╀笟璐�" : [field:'estate_charge', width:6000], + "鎴垮瀷" : [field:'house_type', width:6000], + "鎴垮瀷浠锋牸" : [field:'house_type_price', width:6000], + "鎴垮瀷闈㈢Н" : [field:'house_type_area', width:6000], + "鍑虹濂楁暟" : [field:'rent_count', width:6000], + "鎸傜墝濂楁暟" : [field:'sell_count', width:6000], + "鏄惁鏄鍖烘埧" : [field:'school_house', width:6000], + "鐗╀笟绫诲瀷" : [field:'estate_type2', width:6000], + "寤虹瓚绫诲瀷" : [field:'build_type', width:6000], + "灏忓尯鍧囦环" : [field:'avg_price', width:6000], + "鏈熸暟" : [field:'district_period', width:6000], + "绔e伐鏃堕棿" : [field:'finish_building_date', width:6000], + "寮�鍙戝晢" : [field:'developer', width:6000], + "灏忓尯鐗╀笟鍏徃" : [field:'estate_company', width:6000], + "灏忓尯绉熼噾" : [field:'rent_price', width:6000], + "灏忓尯鍦扮悊浣嶇疆" : [field:'loop_line_info', width:6000], + "鎴愪氦娲昏穬搴�" : [field:'trade_stat', width:6000], + "绉熷敭姣�" : [field:'rent_sell', width:6000], + "鍛ㄨ竟閰嶅" : [field:'facilities', width:15000], + "鏄惁鏄湴閾佹埧" : [field:'metro_house', width:6000], + "缁忓害" : [field:'lat', width:6000], + "绾害" : [field:'lng', width:6000] ]; public static Date WEEKEND = null; @@ -92,7 +92,7 @@ class DistrictExportToAli { List cities = sd.getAllCities(); WEEKEND = DateUtil.parseDate("2013-09-29", "yyyy-MM-dd") MONTHEND = DateUtil.getLastEndMonthDate(DateUtil.parseDate("2014-01-20", "yyyy-MM-dd")); - String filePath = "D:\\阿里数据\\详细数据\\tmp\\阿里数据-20140310.xls"; + String filePath = "D:\\闃块噷鏁版嵁\\璇︾粏鏁版嵁\\tmp\\闃块噷鏁版嵁-20140310.xls"; sd.createDataFile(filePath, cities, FIELDS_MAP) } @@ -127,7 +127,7 @@ class DistrictExportToAli { HSSFSheet citySheet = workBook.createSheet(city); int i=0 for(String f : fieldsMap.keySet()) { - citySheet.setColumnWidth((short) i, (short) fieldsMap.get(f).get('width')); //默认设置宽度 + citySheet.setColumnWidth((short) i, (short) fieldsMap.get(f).get('width')); //榛樿璁剧疆瀹藉害 citySheet.setDefaultRowHeight((short)420) i++ } @@ -177,7 +177,7 @@ class DistrictExportToAli { }else if('sell_count'.equals(fieldName)) { val = getSellCount(city, region, name) }else if('school_house'.equals(fieldName)) { - val = (getSchoolHouse(city, region, name) == null ? "" : "是") + val = (getSchoolHouse(city, region, name) == null ? "" : "鏄�") }else if('avg_price'.equals(fieldName)) { val = getAvgPrice(city, region, name, dbo.get('avg_price'), dbo.get('total_price')) }else if('district_period'.equals(fieldName)) { @@ -199,7 +199,7 @@ class DistrictExportToAli { val = String.valueOf(latLng) } }else if('metro_house'.equals(fieldName)) { - val = (getMetroHouse(city, region, name) ? "是" : "否") + val = (getMetroHouse(city, region, name) ? "鏄�" : "鍚�") }else { if(dbo.get(fieldName)) { val = DataUtil.removeHtml(String.valueOf(dbo.get(fieldName))) @@ -209,7 +209,7 @@ class DistrictExportToAli { if(StringUtils.isBlank(val) || "null".equals(val) || "-1".equals(val)) { val = ""; } - if(val.indexOf('暂无') > -1 || val.indexOf('暂无资料') > -1) { + if(val.indexOf('鏆傛棤') > -1 || val.indexOf('鏆傛棤璧勬枡') > -1) { val = ""; } @@ -275,7 +275,7 @@ class DistrictExportToAli { String key = city + "-" + region + "-" + name if(CITY_TRADE_MAP.get(city).containsKey(key)) { - return CITY_TRADE_MAP.get(city).get(key) + "套" + return CITY_TRADE_MAP.get(city).get(key) + "濂�" } return "" @@ -313,23 +313,23 @@ class DistrictExportToAli { String ret = ""; if(statMap == null || statMap.size() == 0) { if (avgPrice && avgPrice > 2000) { - ret = avgPrice + "元" + ret = avgPrice + "鍏�" } else if (totalPrice && totalPrice > 10) { if (totalPrice <= 10000) { - ret = totalPrice + '万/套'; + ret = totalPrice + '涓�/濂�'; } else { - ret = ((int) (totalPrice / 10000)) + '万/套'; + ret = ((int) (totalPrice / 10000)) + '涓�/濂�'; } } }else { - def districtPrice = statMap.get('小区'); - def villaPrice = statMap.get('别墅'); + def districtPrice = statMap.get('灏忓尯'); + def villaPrice = statMap.get('鍒'); if (null != districtPrice && null != villaPrice) { - ret = "小区:" + districtPrice+"元" + "\r\n别墅:" + villaPrice + "元"; + ret = "灏忓尯:" + districtPrice+"鍏�" + "\r\n鍒:" + villaPrice + "鍏�"; } else if (null != districtPrice) { - ret = districtPrice + "元"; + ret = districtPrice + "鍏�"; } else if (null != villaPrice) { - ret = villaPrice + "元"; + ret = villaPrice + "鍏�"; } } @@ -410,8 +410,8 @@ class DistrictExportToAli { def rentStatMap = getDistrictRentStat2(city, region, name) if(rentStatMap != null) { - def xiaoqu = rentStatMap.get('小区'); - def bieshu = rentStatMap.get('别墅'); + def xiaoqu = rentStatMap.get('灏忓尯'); + def bieshu = rentStatMap.get('鍒'); if (null != xiaoqu && null != bieshu) { def xiaoquMin = Integer.MAX_VALUE; def xiaoquMax = Integer.MIN_VALUE; @@ -435,7 +435,7 @@ class DistrictExportToAli { } } - ret = "小区:" + (xiaoquMin == xiaoquMax ? (xiaoquMin + '左右') : (xiaoquMin + "~" + xiaoquMax)) + "\r\n别墅:" + (bieshuMin == bieshuMax ? (bieshuMin + '左右') : (bieshuMin + "~" + bieshuMax)); + ret = "灏忓尯锛�" + (xiaoquMin == xiaoquMax ? (xiaoquMin + '宸﹀彸') : (xiaoquMin + "~" + xiaoquMax)) + "\r\n鍒锛�" + (bieshuMin == bieshuMax ? (bieshuMin + '宸﹀彸') : (bieshuMin + "~" + bieshuMax)); } else if (null != xiaoqu) { def min = Integer.MAX_VALUE; def max = Integer.MIN_VALUE; @@ -447,7 +447,7 @@ class DistrictExportToAli { min = b; } } - ret = (min == max ? (min + '左右') : (min + "~" + max)); + ret = (min == max ? (min + '宸﹀彸') : (min + "~" + max)); } else if (null != bieshu) { def min = Integer.MAX_VALUE; def max = Integer.MIN_VALUE; @@ -459,7 +459,7 @@ class DistrictExportToAli { min = b; } } - ret = (min == max ? (min + '左右') : (min + "~" + max)); + ret = (min == max ? (min + '宸﹀彸') : (min + "~" + max)); } }else { def disStatMap = this.getDistrictStat2(city, region, name) @@ -470,8 +470,8 @@ class DistrictExportToAli { if(disStatMap != null) { def regionRentRang = getRegionRatioRange(city, region) if (regionRentRang) { - def xiaoqu = disStatMap.get('小区'); - def bieshu = disStatMap.get('别墅'); + def xiaoqu = disStatMap.get('灏忓尯'); + def bieshu = disStatMap.get('鍒'); if (!xiaoqu && avgPrice && avgPrice > 2000) { xiaoqu = avgPrice; } @@ -484,15 +484,15 @@ class DistrictExportToAli { def xiaoquMax = (int) (regionRentRang[1] * xiaoqu); def bieshuMin = (int) (regionRentRang[0] * bieshu); def bieshuMax = (int) (regionRentRang[1] * bieshu); - ret ="小区:" + (xiaoquMin == xiaoquMax ? (xiaoquMin + '左右') : (xiaoquMin + "~" + xiaoquMax)) + "\r\n别墅:" + (bieshuMin == bieshuMax ? (bieshuMin + '左右') : (bieshuMin + "~" + bieshuMax)); + ret ="灏忓尯锛�" + (xiaoquMin == xiaoquMax ? (xiaoquMin + '宸﹀彸') : (xiaoquMin + "~" + xiaoquMax)) + "\r\n鍒锛�" + (bieshuMin == bieshuMax ? (bieshuMin + '宸﹀彸') : (bieshuMin + "~" + bieshuMax)); } else if (null != xiaoqu) { def min = (int) (regionRentRang[0] * xiaoqu); def max = (int) (regionRentRang[1] * xiaoqu); - ret = (min == max ? (min + '左右') : (min + "~" + max)); + ret = (min == max ? (min + '宸﹀彸') : (min + "~" + max)); } else if (null != bieshu) { def min = (int) (regionRentRang[0] * bieshu); def max = (int) (regionRentRang[1] * bieshu); - ret = (min == max ? (min + '左右') : (min + "~" + max)); + ret = (min == max ? (min + '宸﹀彸') : (min + "~" + max)); } } } @@ -680,7 +680,7 @@ class DistrictExportToAli { roomTypes = roomTypes.unique() for(String rt : roomTypes) { String[] arrs = rt.split("-") - ret.add(DataUtil.convertNumberToCn(arrs[0]) + "室" + DataUtil.convertNumberToCn(arrs[1]) + "厅") + ret.add(DataUtil.convertNumberToCn(arrs[0]) + "瀹�" + DataUtil.convertNumberToCn(arrs[1]) + "鍘�") } } @@ -691,7 +691,7 @@ class DistrictExportToAli { def DISTRICT_ROOM_FACTOR_MAP = [:] private String getHouseTypePrice(String city, String region, String name) { def districtStatMap = getDistrictStat2(city, region, name) - if(districtStatMap == null || !districtStatMap.containsKey('小区')) {//因为只有"小区"有房型因子 + if(districtStatMap == null || !districtStatMap.containsKey('灏忓尯')) {//鍥犱负鍙湁"灏忓尯"鏈夋埧鍨嬪洜瀛� return null; } @@ -719,7 +719,7 @@ class DistrictExportToAli { DISTRICT_ROOM_FACTOR_MAP.put(city, districtMap) } - int districtPrice = districtStatMap.get('小区'); + int districtPrice = districtStatMap.get('灏忓尯'); def ret = [] String key = city + "-" + region + "-" + name if(DISTRICT_ROOM_FACTOR_MAP.get(city).get(key) != null) { @@ -728,7 +728,7 @@ class DistrictExportToAli { def room = fobj.get('room'); def factor = fobj.get('factor') int p = districtPrice * factor - ret.add(DataUtil.convertNumberToCn(String.valueOf(room)) + "室" + p + "元") + ret.add(DataUtil.convertNumberToCn(String.valueOf(room)) + "瀹�" + p + "鍏�") } } @@ -757,7 +757,7 @@ class DistrictExportToAli { continue } - String k = DataUtil.convertNumberToCn(room + "") + "室" + DataUtil.convertNumberToCn(hall + "") + "厅" + String k = DataUtil.convertNumberToCn(room + "") + "瀹�" + DataUtil.convertNumberToCn(hall + "") + "鍘�" if(map.get(k)) { def list = map.get(k) list.add(area) @@ -769,7 +769,7 @@ class DistrictExportToAli { def ret = [] for(String k : map.keySet()) { - ret.add(k + "[" + StringUtils.join(map.get(k), ",") + "]平米") + ret.add(k + "[" + StringUtils.join(map.get(k), ",") + "]骞崇背") } return StringUtils.join(ret, "\r\n") } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/DistrictExportToAliTmp.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/DistrictExportToAliTmp.groovy index d3a4ee8c7..654ad3b91 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/DistrictExportToAliTmp.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/DistrictExportToAliTmp.groovy @@ -76,30 +76,30 @@ class DistrictExportToAliTmp { public static void main(String[] args) { DistrictExportToAliTmp sd = new DistrictExportToAliTmp(); def cities = sd.getAllCities() -// //隐藏部分数据 +// //闅愯棌閮ㄥ垎鏁版嵁 // sd.processDataMissPercent() -// //成交活跃度 -// sd.processTrade() //最慢 -// //租售比 +// //鎴愪氦娲昏穬搴� +// sd.processTrade() //鏈�鎱� +// //绉熷敭姣� // sd.processRentSell() -// //均价历史 +// //鍧囦环鍘嗗彶 // sd.processDistrictHistoryStat() -// //租金历史 +// //绉熼噾鍘嗗彶 // sd.processDistrictRentHistoryStat() -// //租金补全 +// //绉熼噾琛ュ叏 // sd.subProcessDistrictRentStat() -// //租金模拟 +// //绉熼噾妯℃嫙 // sd.cloneDistrictRentStat('2014-06-30', '2014-09-30'); -// //更新seaweed中的最新数据 +// //鏇存柊seaweed涓殑鏈�鏂版暟鎹� // for(String city : cities) { // sd.refreshDistrictData(city) // sd.formatDistrictData(city) // } -// //创建XML文件 +// //鍒涘缓XML鏂囦欢 // sd.createXmlData() -// //导出错误数据的更新记录 +// //瀵煎嚭閿欒鏁版嵁鐨勬洿鏂拌褰� // sd.exportErrorData(); -// //导出均价 +// //瀵煎嚭鍧囦环 // sd.exportAvgPriceData(); println "----------------${DateUtil.formatToTightYYYYMMDDhhmmss(new Date())}\tdone----------------------" // sd.errPriceMarkup() @@ -157,7 +157,7 @@ class DistrictExportToAliTmp { DBCollection coll = MongoUtils.getCollectionByName("fangjia", ALI_DATA_DB_NAME, "192.168.0.60") DBCollection collHistory = MongoUtils.getCollectionByName("fangjia", "ali_trade_history", "192.168.0.60") - def lines = FileUtils.readLines(new File("D:\\阿里数据\\dev\\price-noprice-1.txt")) + def lines = FileUtils.readLines(new File("D:\\闃块噷鏁版嵁\\dev\\price-noprice-1.txt")) for(String line : lines) { String[] arrs = line.split("\t") String city = arrs[0] @@ -182,7 +182,7 @@ class DistrictExportToAliTmp { DBCollection coll = MongoUtils.getCollectionByName("fangjia", ALI_DATA_DB_NAME, "192.168.0.60") DBCollection collHistory = MongoUtils.getCollectionByName("fangjia", "ali_trade_history", "192.168.0.60") - def lines = FileUtils.readLines(new File("D:\\阿里数据\\dev\\price-noq4-1.txt")) + def lines = FileUtils.readLines(new File("D:\\闃块噷鏁版嵁\\dev\\price-noq4-1.txt")) int mc = 0 def dates = [] for(Date d : DATES) { @@ -241,7 +241,7 @@ class DistrictExportToAliTmp { DBCollection coll = MongoUtils.getCollectionByName("fangjia", ALI_DATA_DB_NAME, "192.168.0.60") DBCollection collHistory = MongoUtils.getCollectionByName("fangjia", "ali_trade_history", "192.168.0.60") - def lines = FileUtils.readLines(new File("D:\\阿里数据\\dev\\price-errmark-1.txt")) + def lines = FileUtils.readLines(new File("D:\\闃块噷鏁版嵁\\dev\\price-errmark-1.txt")) int mc = 0 StringBuilder builder = new StringBuilder() for(String line : lines) { @@ -279,7 +279,7 @@ class DistrictExportToAliTmp { public void errAddress() { DBCollection coll = MongoUtils.getCollectionByName("fangjia", ALI_DATA_DB_NAME, "192.168.0.60") - def lines = FileUtils.readLines(new File("D:\\阿里数据\\dev\\address-c-1.txt")) + def lines = FileUtils.readLines(new File("D:\\闃块噷鏁版嵁\\dev\\address-c-1.txt")) int ec = 0 int mc = 0 StringBuilder builder = new StringBuilder() @@ -296,7 +296,7 @@ class DistrictExportToAliTmp { query.put("name", name) DBObject dbo = coll.findOne(query) if(dbo == null) { - builder.append("\t").append("不存在") + builder.append("\t").append("涓嶅瓨鍦�") }else { builder.append("\t").append("") @@ -350,7 +350,7 @@ class DistrictExportToAliTmp { } println mc + "\t" + ec - FileUtils.writeStringToFile(new File("D:\\阿里数据\\dev\\address-c-1.dev.txt"), builder.toString()) + FileUtils.writeStringToFile(new File("D:\\闃块噷鏁版嵁\\dev\\address-c-1.dev.txt"), builder.toString()) } @@ -452,7 +452,7 @@ class DistrictExportToAliTmp { DBCollection coll = MongoUtils.getCollectionByName("fangjia", "ali_trade_data_prod1", "192.168.0.60") DBCollection collHistory = MongoUtils.getCollectionByName("fangjia", "ali_trade_history", "192.168.0.60") - File file = new File("D:\\阿里数据\\详细数据\\提交数据\\价格更新记录(2014-09).xls") + File file = new File("D:\\闃块噷鏁版嵁\\璇︾粏鏁版嵁\\鎻愪氦鏁版嵁\\浠锋牸鏇存柊璁板綍(2014-09).xls") if(file.exists()) { file.delete(); } @@ -463,29 +463,29 @@ class DistrictExportToAliTmp { HSSFSheet sheet = workBook.createSheet(city); HSSFRow row0 = sheet.createRow(0) HSSFCell cell0 = row0.createCell(0); - cell0.setCellValue('城市'); + cell0.setCellValue('鍩庡競'); cell0 = row0.createCell(1); - cell0.setCellValue('区域'); + cell0.setCellValue('鍖哄煙'); cell0 = row0.createCell(2); - cell0.setCellValue('小区名'); + cell0.setCellValue('灏忓尯鍚�'); cell0 = row0.createCell(3); - cell0.setCellValue('2013-12价格'); + cell0.setCellValue('2013-12浠锋牸'); cell0 = row0.createCell(4); - cell0.setCellValue('2014-03价格'); + cell0.setCellValue('2014-03浠锋牸'); cell0 = row0.createCell(5); - cell0.setCellValue('2014-06价格'); + cell0.setCellValue('2014-06浠锋牸'); cell0 = row0.createCell(6); - cell0.setCellValue('2014-09价格'); + cell0.setCellValue('2014-09浠锋牸'); cell0 = row0.createCell(7); - cell0.setCellValue('2013-12租金'); + cell0.setCellValue('2013-12绉熼噾'); cell0 = row0.createCell(8); - cell0.setCellValue('2014-03租金'); + cell0.setCellValue('2014-03绉熼噾'); cell0 = row0.createCell(9); - cell0.setCellValue('2014-06租金'); + cell0.setCellValue('2014-06绉熼噾'); cell0 = row0.createCell(10); - cell0.setCellValue('2014-09租金'); + cell0.setCellValue('2014-09绉熼噾'); def rowIndex = 1 @@ -555,30 +555,30 @@ class DistrictExportToAliTmp { String priceDate = '2013-12-29' - File file = new File("D:\\阿里数据\\详细数据\\提交数据\\更新数据\\更新记录.xls") + File file = new File("D:\\闃块噷鏁版嵁\\璇︾粏鏁版嵁\\鎻愪氦鏁版嵁\\鏇存柊鏁版嵁\\鏇存柊璁板綍.xls") if(file.exists()) { file.delete(); } HSSFWorkbook workBook = new HSSFWorkbook(); - HSSFSheet sheet = workBook.createSheet('详细数据情况'); + HSSFSheet sheet = workBook.createSheet('璇︾粏鏁版嵁鎯呭喌'); HSSFRow row0 = sheet.createRow(0) HSSFCell cell0 = row0.createCell(0); - cell0.setCellValue('城市'); + cell0.setCellValue('鍩庡競'); cell0 = row0.createCell(1); - cell0.setCellValue('区域'); + cell0.setCellValue('鍖哄煙'); cell0 = row0.createCell(2); - cell0.setCellValue('小区名'); + cell0.setCellValue('灏忓尯鍚�'); cell0 = row0.createCell(3); - cell0.setCellValue('价格情况'); + cell0.setCellValue('浠锋牸鎯呭喌'); cell0 = row0.createCell(4); - cell0.setCellValue('地址情况'); + cell0.setCellValue('鍦板潃鎯呭喌'); cell0 = row0.createCell(5); - cell0.setCellValue('Q1更新情况'); + cell0.setCellValue('Q1鏇存柊鎯呭喌'); // cell0 = row0.createCell(6); -// cell0.setCellValue('Q2更新情况'); +// cell0.setCellValue('Q2鏇存柊鎯呭喌'); int rowIndex = 1 @@ -640,7 +640,7 @@ class DistrictExportToAliTmp { String val = "" if(bool1 && bool2) { - val = "已处理" + val = "宸插鐞�" } cell = row.createCell(5) cell.setCellValue(val) @@ -650,7 +650,7 @@ class DistrictExportToAliTmp { if(priceObj && priceObj.get('stat_map')) { def statMap = priceObj.get('stat_map') if(statMap.get(priceDate) != null) { - val = "已处理" + val = "宸插鐞�" } } cell = row.createCell(5) @@ -661,7 +661,7 @@ class DistrictExportToAliTmp { if(obj && obj.get('address')) { String addr = analyzerStandardAddress(obj.get('address')) if(addr) { - val = "已处理" + val = "宸插鐞�" } } cell = row.createCell(5) @@ -739,19 +739,19 @@ class DistrictExportToAliTmp { if(k.equals('build_area') || k.equals('all_area')) { String value = String.valueOf(dbo.get(k)) - if(value.endsWith('万平方米')) { + if(value.endsWith('涓囧钩鏂圭背')) { umap.put(k, value.replaceAll('[^0-9\\.]', '').toDouble() * 10000) - }else if(value.endsWith('平方米') || value.endsWith('平') || value.endsWith('平米') || value.endsWith('㎡')) { + }else if(value.endsWith('骞虫柟绫�') || value.endsWith('骞�') || value.endsWith('骞崇背') || value.endsWith('銕�')) { try { umap.put(k, value.replaceAll('[^0-9\\.]', '').toDouble()) }catch(e) { } - }else if(value.endsWith('亩')) { + }else if(value.endsWith('浜�')) { umap.put(k, value.replaceAll('[^0-9\\.]', '').toDouble() * 666) - }else if(value.endsWith('万')) { + }else if(value.endsWith('涓�')) { umap.put(k, value.replaceAll('[^0-9\\.]', '').toDouble() * 10000) - }else if(value.endsWith('平方公里') || value.endsWith('平方千米')) { + }else if(value.endsWith('骞虫柟鍏噷') || value.endsWith('骞虫柟鍗冪背')) { umap.put(k, value.replaceAll('[^0-9\\.]', '').toDouble() * 1000) } }else if(k.equals('cubage_percent')) { @@ -801,7 +801,7 @@ class DistrictExportToAliTmp { umap.put('finish_building_date', '') } }else if(k.equals('loop_line_info')) { - if(dbo.get(k).equals('无')) { + if(dbo.get(k).equals('鏃�')) { umap.put('loop_line_info', '') } } @@ -812,7 +812,7 @@ class DistrictExportToAliTmp { } } } - //更新字段数据 + //鏇存柊瀛楁鏁版嵁 private void refreshDistrictData(String city) { DBCollection coll1 = MongoUtils.getCollectionByName("fangjia", ALI_DATA_DB_NAME, ALI_PROD_DOMAIN) DBCursor cur1 = coll1.find(new BasicDBObject("city", city)) @@ -864,20 +864,20 @@ class DistrictExportToAliTmp { udata.put('estate_charge', districtObj.get('estate_charge')) } - udata.put('estate_type', '普通住宅') + udata.put('estate_type', '鏅�氫綇瀹�') if(districtObj.get('estate_type') || districtObj.get('estate_type2')) { if(districtObj.get('estate_type2')) { - if(districtObj.get('estate_type2').indexOf('小区') > -1 || districtObj.get('estate_type2').indexOf('住宅') > -1) { - udata.put('estate_type', '普通住宅') + if(districtObj.get('estate_type2').indexOf('灏忓尯') > -1 || districtObj.get('estate_type2').indexOf('浣忓畢') > -1) { + udata.put('estate_type', '鏅�氫綇瀹�') }else { udata.put('estate_type', districtObj.get('estate_type2')) } }else if(districtObj.get('estate_type')) { String s = districtObj.get('estate_type'); - if(s.indexOf('别墅') > -1) { - udata.put('estate_type', '别墅') + if(s.indexOf('鍒') > -1) { + udata.put('estate_type', '鍒') }else { - udata.put('estate_type', '普通住宅') + udata.put('estate_type', '鏅�氫綇瀹�') } } } @@ -885,8 +885,8 @@ class DistrictExportToAliTmp { if(districtObj.get('build_type')) { udata.put('build_type', districtObj.get('build_type')) }else { - if(udata.get('estate_type') == '别墅') { - udata.put('build_type', '独栋') + if(udata.get('estate_type') == '鍒') { + udata.put('build_type', '鐙爧') }else { DBObject q = new BasicDBObject() q.put("city", city) @@ -908,11 +908,11 @@ class DistrictExportToAliTmp { if(heights.size() > 0) { int h = heights.get(heights.size() - 1) if(h > 0 && h <= 7) { - udata.put('build_type', '多层') + udata.put('build_type', '澶氬眰') }else if(h > 7 && h <= 12) { - udata.put('build_type', '小高层') + udata.put('build_type', '灏忛珮灞�') }else if(h > 12) { - udata.put('build_type', '高层') + udata.put('build_type', '楂樺眰') } } } @@ -1004,36 +1004,36 @@ class DistrictExportToAliTmp { } } - //小区地理位置 + //灏忓尯鍦扮悊浣嶇疆 if(districtObj.get('loop_line_info')) { udata.put('loop_line_info', districtObj.get('loop_line_info')) } - //房型 + //鎴垮瀷 String houseType = getHouseType(city, region, name) if(houseType) { udata.put('house_type', houseType) } - //房型价格 + //鎴垮瀷浠锋牸 String houseTypePrice = getHouseTypePrice(city, region, name, DATES.get(DATES.size() - 1)) if(houseTypePrice) { udata.put('house_type_price', houseTypePrice) } - //房型面积 + //鎴垮瀷闈㈢Н String houseTypeArea = getHouseTypeArea(city, region, name) if(houseTypeArea) { udata.put('house_type_area', houseTypeArea) } - //出售套数 + //鍑哄敭濂楁暟 udata.put("sell_count", getSellCount(city, region, name)) - //出租套数 + //鍑虹濂楁暟 udata.put("rent_count", getRentCount(city, region, name)) - //时候是学区房 - udata.put("school_house", (getSchoolHouse(city, region, name) == null ? "否" : "是")) - //时候是地铁房 - udata.put("metro_house", (getMetroHouse(city, region, name) ? "是" : "否")) - //小区期数 + //鏃跺�欐槸瀛﹀尯鎴� + udata.put("school_house", (getSchoolHouse(city, region, name) == null ? "鍚�" : "鏄�")) + //鏃跺�欐槸鍦伴搧鎴� + udata.put("metro_house", (getMetroHouse(city, region, name) ? "鏄�" : "鍚�")) + //灏忓尯鏈熸暟 String qishu = getDistrictPeriod(city, region, name) if(qishu) { udata.put("district_period", qishu) @@ -1074,7 +1074,7 @@ class DistrictExportToAliTmp { def tc = 0 def countMap = [:] for(String city : cities) { - File file = new File("D:/阿里数据/详细数据/xml/${city}.xml") + File file = new File("D:/闃块噷鏁版嵁/璇︾粏鏁版嵁/xml/${city}.xml") if(file.exists()) { file.delete(); } @@ -1105,7 +1105,7 @@ class DistrictExportToAliTmp { if(dbo.get(fieldName) == null || StringUtils.isBlank(dbo.get(fieldName).toString())) { continue; } - if("暂无".equals(dbo.get(fieldName)) || "暂无资料".equals(dbo.get(fieldName)) || "更新中".equals(dbo.get(fieldName)) || "资料更新中".equals(dbo.get(fieldName)) || "数据更新中".equals(dbo.get(fieldName))) { + if("鏆傛棤".equals(dbo.get(fieldName)) || "鏆傛棤璧勬枡".equals(dbo.get(fieldName)) || "鏇存柊涓�".equals(dbo.get(fieldName)) || "璧勬枡鏇存柊涓�".equals(dbo.get(fieldName)) || "鏁版嵁鏇存柊涓�".equals(dbo.get(fieldName))) { continue; } // if(dbo.get('miss_map') && dbo.get('miss_map').get(fieldName) == 1) { @@ -1133,9 +1133,9 @@ class DistrictExportToAliTmp { list.add(k + ":" + v) } if(list) { - String key = '小区均价' + String key = '灏忓尯鍧囦环' Element ele = new Element('column') - ele.setAttribute('name', "小区均价") + ele.setAttribute('name', "灏忓尯鍧囦环") ele.setText(StringUtils.join(list, ",")) element.addContent(ele) if(countMap.containsKey(key)) { @@ -1153,9 +1153,9 @@ class DistrictExportToAliTmp { list.add(k + ":" + v) } if(list) { - String key = '小区租金' + String key = '灏忓尯绉熼噾' Element ele = new Element('column') - ele.setAttribute('name', "小区租金") + ele.setAttribute('name', "灏忓尯绉熼噾") ele.setText(StringUtils.join(list, ",")) element.addContent(ele) if(countMap.containsKey(key)) { @@ -1190,7 +1190,7 @@ class DistrictExportToAliTmp { } } - //处理租售比 + //澶勭悊绉熷敭姣� private void processRentSell() { DBCollection coll1 = MongoUtils.getCollectionByName("fangjia", ALI_DATA_DB_NAME, ALI_PROD_DOMAIN) DBCursor cur1 = coll1.find().sort(new BasicDBObject("sequence", 1)) @@ -1235,14 +1235,14 @@ class DistrictExportToAliTmp { int avgPrice = 0 try { - avgPrice = price.replace("左右", "").replace("元", "").toInteger() + avgPrice = price.replace("宸﹀彸", "").replace("鍏�", "").toInteger() }catch(Exception e) { continue } def typeArea = getHouseTypeArea(city, region, name) def avgArea = 180 - if(!estateType || estateType.indexOf('住宅') > -1) { + if(!estateType || estateType.indexOf('浣忓畢') > -1) { avgArea= 93 } @@ -1263,7 +1263,7 @@ class DistrictExportToAliTmp { int p = 0 String[] arrs = rentPrice.split("~") if(arrs.length == 1) { - p = avgPrice / (arrs[0].replace("左右", "").toInteger() / avgArea) + p = avgPrice / (arrs[0].replace("宸﹀彸", "").toInteger() / avgArea) }else if(arrs.length == 2) { p = avgPrice / ((arrs[0].toInteger() + arrs[1].toInteger()) / 2 / avgArea) } @@ -1282,12 +1282,12 @@ class DistrictExportToAliTmp { } } - //处理交易信息,成交活跃度 + //澶勭悊浜ゆ槗淇℃伅,鎴愪氦娲昏穬搴� private void processTrade() { DBCollection coll1 = MongoUtils.getCollectionByName("fangjia", ALI_DATA_DB_NAME, ALI_PROD_DOMAIN) DBCollection collLoudong = MongoUtils.getCollectionByName("fangjia", "house_loudong", "mongo.db.fangjia.com") - DBCursor cur1 = coll1.find(new BasicDBObject("city", "上海")).sort(new BasicDBObject("sequence", 1)) + DBCursor cur1 = coll1.find(new BasicDBObject("city", "涓婃捣")).sort(new BasicDBObject("sequence", 1)) println cur1.count() def map = [:] while(cur1.hasNext()) { @@ -1363,7 +1363,7 @@ class DistrictExportToAliTmp { private void subProcessDistrictRentStat() { DBCollection collHistory = MongoUtils.getCollectionByName("fangjia", "ali_trade_history", "192.168.0.60") - //new BasicDBObject('name', '阳光时尚').append('city', '武汉') + //new BasicDBObject('name', '闃冲厜鏃跺皻').append('city', '姝︽眽') DBCursor curHistory = collHistory.find() int c = 0 int tc = 0 @@ -1415,7 +1415,7 @@ class DistrictExportToAliTmp { } } - //均价历史 + //鍧囦环鍘嗗彶 private void processDistrictHistoryStat() { DBCollection coll1 = MongoUtils.getCollectionByName("fangjia", ALI_DATA_DB_NAME, ALI_PROD_DOMAIN) DBCollection collHistory = MongoUtils.getCollectionByName("fangjia", "ali_trade_history", "192.168.0.60") @@ -1532,11 +1532,11 @@ class DistrictExportToAliTmp { private List getAllCities() { - return ["上海","北京","广州","深圳","天津","重庆","成都","西安","杭州","武汉","南京","沈阳","贵阳","宁波","石家庄","福州","大连","昆明","苏州","长沙","温州","银川","太原","厦门","无锡","咸阳","唐山","三亚","西宁","郑州","扬州","呼和浩特","兰州","哈尔滨","济南","佛山","长春","青岛","绵阳","东莞","威海","吉林","宜宾","自贡","邯郸","合肥","中山","乌鲁木齐","湛江","烟台","廊坊","潍坊","保定","攀枝花","南宁","秦皇岛","延安","常州","丽江","宜昌","鞍山","嘉兴","大庆","大理","徐州","镇江","丹东","六盘水","赣州","芜湖","南昌","南通","九江","泰州","洛阳","台州","惠州","湖州","泉州","清远","衢州","江门","绍兴","宿迁","海口","珠海","金华","连云港","桂林","马鞍山","北海","柳州","淄博","莆田","盐城","玉林","玉溪","本溪","汕头","肇庆","曲靖","衡阳","新乡","营口","河源","黄石","焦作","揭阳","茂名","牡丹江","盘锦","平顶山","韶关","阳江","梅州","昆山","襄阳","株洲","湘潭","张家界","潮州","常熟","安阳","云浮","增城","吴江","瑞安","乐清","慈溪","宁海","奉化","余姚","温岭","宜兴","义乌"] + return ["涓婃捣","鍖椾含","骞垮窞","娣卞湷","澶╂触","閲嶅簡","鎴愰兘","瑗垮畨","鏉窞","姝︽眽","鍗椾含","娌堥槼","璐甸槼","瀹佹尝","鐭冲搴�","绂忓窞","澶ц繛","鏄嗘槑","鑻忓窞","闀挎矙","娓╁窞","閾跺窛","澶師","鍘﹂棬","鏃犻敗","鍜搁槼","鍞愬北","涓変簹","瑗垮畞","閮戝窞","鎵窞","鍛煎拰娴╃壒","鍏板窞","鍝堝皵婊�","娴庡崡","浣涘北","闀挎槬","闈掑矝","缁甸槼","涓滆帪","濞佹捣","鍚夋灄","瀹滃","鑷础","閭兏","鍚堣偉","涓北","涔岄瞾鏈ㄩ綈","婀涙睙","鐑熷彴","寤婂潑","娼嶅潑","淇濆畾","鏀�鏋濊姳","鍗楀畞","绉︾殗宀�","寤跺畨","甯稿窞","涓芥睙","瀹滄槍","闉嶅北","鍢夊叴","澶у簡","澶х悊","寰愬窞","闀囨睙","涓逛笢","鍏洏姘�","璧e窞","鑺滄箹","鍗楁槍","鍗楅��","涔濇睙","娉板窞","娲涢槼","鍙板窞","鎯犲窞","婀栧窞","娉夊窞","娓呰繙","琛㈠窞","姹熼棬","缁嶅叴","瀹胯縼","娴峰彛","鐝犳捣","閲戝崕","杩炰簯娓�","妗傛灄","椹瀺灞�","鍖楁捣","鏌冲窞","娣勫崥","鑾嗙敯","鐩愬煄","鐜夋灄","鐜夋邯","鏈邯","姹曞ご","鑲囧簡","鏇查潠","琛¢槼","鏂颁埂","钀ュ彛","娌虫簮","榛勭煶","鐒︿綔","鎻槼","鑼傚悕","鐗′腹姹�","鐩橀敠","骞抽《灞�","闊跺叧","闃虫睙","姊呭窞","鏄嗗北","瑗勯槼","鏍床","婀樻江","寮犲鐣�","娼窞","甯哥啛","瀹夐槼","浜戞诞","澧炲煄","鍚存睙","鐟炲畨","涔愭竻","鎱堟邯","瀹佹捣","濂夊寲","浣欏","娓╁箔","瀹滃叴","涔変箤"] } - //隐藏部分数据 + //闅愯棌閮ㄥ垎鏁版嵁 private void processDataMissPercent(Map fieldsMap) { DBCollection currColl = MongoUtils.getCollectionByName("fangjia", ALI_DATA_DB_NAME, ALI_PROD_DOMAIN) DBCursor cur = currColl.find() @@ -1783,7 +1783,7 @@ class DistrictExportToAliTmp { roomTypes = roomTypes.unique() for(String rt : roomTypes) { String[] arrs = rt.split("-") - ret.add(DataUtil.convertNumberToCn(arrs[0]) + "室" + DataUtil.convertNumberToCn(arrs[1]) + "厅") + ret.add(DataUtil.convertNumberToCn(arrs[0]) + "瀹�" + DataUtil.convertNumberToCn(arrs[1]) + "鍘�") } } @@ -1794,7 +1794,7 @@ class DistrictExportToAliTmp { def DISTRICT_ROOM_FACTOR_MAP = [:] private String getHouseTypePrice(String city, String region, String name, Date weekend) { def districtStatMap = getDistrictStat2(city, region, name, weekend) - if(districtStatMap == null || !districtStatMap.containsKey('小区')) {//因为只有"小区"有房型因子 + if(districtStatMap == null || !districtStatMap.containsKey('灏忓尯')) {//鍥犱负鍙湁"灏忓尯"鏈夋埧鍨嬪洜瀛� return null; } @@ -1822,7 +1822,7 @@ class DistrictExportToAliTmp { DISTRICT_ROOM_FACTOR_MAP.put(city, districtMap) } - int districtPrice = districtStatMap.get('小区'); + int districtPrice = districtStatMap.get('灏忓尯'); def ret = [] String key = city + "-" + region + "-" + name if(DISTRICT_ROOM_FACTOR_MAP.get(city).get(key) != null) { @@ -1831,7 +1831,7 @@ class DistrictExportToAliTmp { def room = fobj.get('room'); def factor = fobj.get('factor') int p = districtPrice * factor - ret.add(DataUtil.convertNumberToCn(String.valueOf(room)) + "室" + p + "元") + ret.add(DataUtil.convertNumberToCn(String.valueOf(room)) + "瀹�" + p + "鍏�") } } @@ -1860,7 +1860,7 @@ class DistrictExportToAliTmp { continue } - String k = DataUtil.convertNumberToCn(room + "") + "室" + DataUtil.convertNumberToCn(hall + "") + "厅" + String k = DataUtil.convertNumberToCn(room + "") + "瀹�" + DataUtil.convertNumberToCn(hall + "") + "鍘�" if(map.get(k)) { def list = map.get(k) list.add(area) @@ -1872,7 +1872,7 @@ class DistrictExportToAliTmp { def ret = [] for(String k : map.keySet()) { - ret.add(k + "[" + StringUtils.join(map.get(k), ",") + "]平米") + ret.add(k + "[" + StringUtils.join(map.get(k), ",") + "]骞崇背") } return StringUtils.join(ret, ",") } @@ -1919,30 +1919,30 @@ class DistrictExportToAliTmp { Set ret = new HashSet(); if (StringUtils.isNotBlank(estateType)) { - if (StringUtils.indexOfAny(estateType, (String[])(["别墅", "独栋", "联排", "双拼", "叠加"].toArray())) > -1) { - ret.add("别墅"); + if (StringUtils.indexOfAny(estateType, (String[])(["鍒", "鐙爧", "鑱旀帓", "鍙屾嫾", "鍙犲姞"].toArray())) > -1) { + ret.add("鍒"); } - if (StringUtils.indexOfAny(estateType, (String[])(["住宅", "公寓", "小区", "商住"].toArray())) > -1) { - ret.add("小区"); + if (StringUtils.indexOfAny(estateType, (String[])(["浣忓畢", "鍏瘬", "灏忓尯", "鍟嗕綇"].toArray())) > -1) { + ret.add("灏忓尯"); } } if (ret.size() == 0) { - return "小区"; + return "灏忓尯"; } String s = StringUtils.join(ret, ","); - if (s != null && s.indexOf("别墅") > -1) { - return "别墅"; + if (s != null && s.indexOf("鍒") > -1) { + return "鍒"; } - return "小区"; + return "灏忓尯"; } private def processDistrictRentPrice(String city, Date weekend, Date monthEndDate) { - // 获取城市下当期的所有均价 + // 鑾峰彇鍩庡競涓嬪綋鏈熺殑鎵�鏈夊潎浠� DBObject query = new BasicDBObject(); query.put('city', city); query.put('weekend', weekend); @@ -1953,7 +1953,7 @@ class DistrictExportToAliTmp { fields.put('estate_type', 1); fields.put('avg_price', 1); - def statMap = [:]; // 小区均价 [区域_小区名:[小区:小区均价,别墅:别墅均价]] + def statMap = [:]; // 灏忓尯鍧囦环 [鍖哄煙_灏忓尯鍚�:[灏忓尯:灏忓尯鍧囦环,鍒:鍒鍧囦环]] DISTRICT_STAT_COLL.find(query, fields).each { def key = it.region + "_" + it.district_name; def disMap = statMap.get(key); @@ -1965,7 +1965,7 @@ class DistrictExportToAliTmp { statMap.put(key, disMap); } - // 获取城市下当期的所有租金均价 + // 鑾峰彇鍩庡競涓嬪綋鏈熺殑鎵�鏈夌閲戝潎浠� query = new BasicDBObject(); query.put('city', city); query.put('end_month_date', monthEndDate); @@ -1977,7 +1977,7 @@ class DistrictExportToAliTmp { fields.put('avg_price', 1); fields.put('house_type', 1); - def statRentMap = [:]; // [区域_小区名:[小区:[1:价格,2:价格...],别墅:[1:价格,2:价格...]]] + def statRentMap = [:]; // [鍖哄煙_灏忓尯鍚�:[灏忓尯:[1:浠锋牸,2:浠锋牸...],鍒:[1:浠锋牸,2:浠锋牸...]]] DISTRICT_RENT_STAT_COLL.find(query, fields).each { def key = it.region + "_" + it.district_name; @@ -2090,8 +2090,8 @@ class DistrictExportToAliTmp { if (null == regionRentRang || regionRentRang.length != 2 || regionRentRang[0] == Double.MAX_VALUE || regionRentRang[1] == Double.MIN_VALUE) { rentPriceStr = ''; } else { - def xiaoqu = disStatMap.get('小区'); - def bieshu = disStatMap.get('别墅'); + def xiaoqu = disStatMap.get('灏忓尯'); + def bieshu = disStatMap.get('鍒'); if (!xiaoqu && avgPrice && avgPrice > 2000) { xiaoqu = avgPrice; @@ -2107,17 +2107,17 @@ class DistrictExportToAliTmp { def bieshuMin = (int) (regionRentRang[0] * bieshu); def bieshuMax = (int) (regionRentRang[1] * bieshu); - rentPriceStr = "小区:" + (xiaoquMin == xiaoquMax ? (xiaoquMin + '左右') : (xiaoquMin + "~" + xiaoquMax)) + ",别墅:" + (bieshuMin == bieshuMax ? (bieshuMin + '左右') : (bieshuMin + "~" + bieshuMax)); + rentPriceStr = "灏忓尯:" + (xiaoquMin == xiaoquMax ? (xiaoquMin + '宸﹀彸') : (xiaoquMin + "~" + xiaoquMax)) + ",鍒:" + (bieshuMin == bieshuMax ? (bieshuMin + '宸﹀彸') : (bieshuMin + "~" + bieshuMax)); } else if (null != xiaoqu) { def min = (int) (regionRentRang[0] * xiaoqu); def max = (int) (regionRentRang[1] * xiaoqu); - rentPriceStr = (min == max ? (min + '左右') : (min + "~" + max)); + rentPriceStr = (min == max ? (min + '宸﹀彸') : (min + "~" + max)); } else if (null != bieshu) { def min = (int) (regionRentRang[0] * bieshu); def max = (int) (regionRentRang[1] * bieshu); - rentPriceStr = (min == max ? (min + '左右') : (min + "~" + max)); + rentPriceStr = (min == max ? (min + '宸﹀彸') : (min + "~" + max)); } else { rentPriceStr = ''; } @@ -2126,8 +2126,8 @@ class DistrictExportToAliTmp { rentPriceStr = ''; } } else { - def xiaoqu = disRentMap.get('小区'); - def bieshu = disRentMap.get('别墅'); + def xiaoqu = disRentMap.get('灏忓尯'); + def bieshu = disRentMap.get('鍒'); if (null != xiaoqu && null != bieshu) { def xiaoquMin = Integer.MAX_VALUE; def xiaoquMax = Integer.MIN_VALUE; @@ -2151,7 +2151,7 @@ class DistrictExportToAliTmp { } } - rentPriceStr = "小区:" + (xiaoquMin == xiaoquMax ? (xiaoquMin + '左右') : (xiaoquMin + "~" + xiaoquMax)) + ",别墅:" + (bieshuMin == bieshuMax ? (bieshuMin + '左右') : (bieshuMin + "~" + bieshuMax)); + rentPriceStr = "灏忓尯:" + (xiaoquMin == xiaoquMax ? (xiaoquMin + '宸﹀彸') : (xiaoquMin + "~" + xiaoquMax)) + ",鍒:" + (bieshuMin == bieshuMax ? (bieshuMin + '宸﹀彸') : (bieshuMin + "~" + bieshuMax)); } else if (null != xiaoqu) { def min = Integer.MAX_VALUE; def max = Integer.MIN_VALUE; @@ -2163,7 +2163,7 @@ class DistrictExportToAliTmp { min = b; } } - rentPriceStr = (min == max ? (min + '左右') : (min + "~" + max)); + rentPriceStr = (min == max ? (min + '宸﹀彸') : (min + "~" + max)); } else if (null != bieshu) { def min = Integer.MAX_VALUE; def max = Integer.MIN_VALUE; @@ -2175,7 +2175,7 @@ class DistrictExportToAliTmp { min = b; } } - rentPriceStr = (min == max ? (min + '左右') : (min + "~" + max)); + rentPriceStr = (min == max ? (min + '宸﹀彸') : (min + "~" + max)); } else { rentPriceStr = ''; } @@ -2193,8 +2193,8 @@ class DistrictExportToAliTmp { private String removeInvalidChar(String s) { s = DataUtil.removeHtml(DataUtil.balanceTags(s)) s = s.replace(' ', '').replace('·', '').replace('??', '').replace('\u000b', '') - if(s.indexOf("本段合作编辑者") > -1) { - s = StringUtils.substringBeforeLast(s, "本段合作编辑者") + if(s.indexOf("鏈鍚堜綔缂栬緫鑰�") > -1) { + s = StringUtils.substringBeforeLast(s, "鏈鍚堜綔缂栬緫鑰�") } s = decode(s) s = s.replace(' ', '').replace('·', '').replace('??', '') @@ -2234,7 +2234,7 @@ class DistrictExportToAliTmp { String rinx = ds[i].split("\\|")[1] String rtype = ds[i].split("\\|")[2] if(rtype.indexOf('road') > -1) { - Pattern patt = Pattern.compile(".*(" + rtoken + "\\d+(\\-\\d+)?[号|弄]).*") + Pattern patt = Pattern.compile(".*(" + rtoken + "\\d+(\\-\\d+)?[鍙穦寮刔).*") Matcher matcher = patt.matcher(address) if(matcher.find()) { return matcher.group(1) @@ -2248,37 +2248,37 @@ class DistrictExportToAliTmp { } def final static Map FIELDS_MAP = [ - "小区名称" : 'name', - "小区地址" : 'address', - "城市" : 'city', - "区域" : 'region', - "板块" : 'block', - "街道/社区" : 'street_community', - "小区占地面积" : 'all_area', - "小区建筑面积" : 'build_area', - "容积率" : 'cubage_percent', - "绿化率" : 'virescence_percent', - "小区停车位" : 'car_site', - "小区物业费" : 'estate_charge', - "房型" : 'house_type', - "房型价格" : 'house_type_price', - "房型面积" : 'house_type_area', - "出租套数" : 'rent_count', - "挂牌套数" : 'sell_count', - "是否是学区房" : 'school_house', - "物业类型" : 'estate_type', - "建筑类型" : 'build_type', - "期数" : 'district_period', - "竣工时间" : 'finish_building_date', - "开发商" : 'developer', - "小区物业公司" : 'estate_company', - "小区地理位置" : 'loop_line_info', - "成交活跃度" : 'trade_stat', - "租售比" : 'rent_sell', - "周边配套" : 'facilities', - "是否是地铁房" : 'metro_house', - "经度" : 'lat', - "纬度" : 'lng', + "灏忓尯鍚嶇О" : 'name', + "灏忓尯鍦板潃" : 'address', + "鍩庡競" : 'city', + "鍖哄煙" : 'region', + "鏉垮潡" : 'block', + "琛楅亾/绀惧尯" : 'street_community', + "灏忓尯鍗犲湴闈㈢Н" : 'all_area', + "灏忓尯寤虹瓚闈㈢Н" : 'build_area', + "瀹圭Н鐜�" : 'cubage_percent', + "缁垮寲鐜�" : 'virescence_percent', + "灏忓尯鍋滆溅浣�" : 'car_site', + "灏忓尯鐗╀笟璐�" : 'estate_charge', + "鎴垮瀷" : 'house_type', + "鎴垮瀷浠锋牸" : 'house_type_price', + "鎴垮瀷闈㈢Н" : 'house_type_area', + "鍑虹濂楁暟" : 'rent_count', + "鎸傜墝濂楁暟" : 'sell_count', + "鏄惁鏄鍖烘埧" : 'school_house', + "鐗╀笟绫诲瀷" : 'estate_type', + "寤虹瓚绫诲瀷" : 'build_type', + "鏈熸暟" : 'district_period', + "绔e伐鏃堕棿" : 'finish_building_date', + "寮�鍙戝晢" : 'developer', + "灏忓尯鐗╀笟鍏徃" : 'estate_company', + "灏忓尯鍦扮悊浣嶇疆" : 'loop_line_info', + "鎴愪氦娲昏穬搴�" : 'trade_stat', + "绉熷敭姣�" : 'rent_sell', + "鍛ㄨ竟閰嶅" : 'facilities', + "鏄惁鏄湴閾佹埧" : 'metro_house', + "缁忓害" : 'lat', + "绾害" : 'lng', ]; static final def DATES = [ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/DistrictExportToAliTmpBak.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/DistrictExportToAliTmpBak.groovy index e3a5808ba..ee883c554 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/DistrictExportToAliTmpBak.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/DistrictExportToAliTmpBak.groovy @@ -68,26 +68,26 @@ class DistrictExportToAliTmpBak { public static String CURR_DB_NAME = null; public static void main(String[] args) { - //均价日期 + //鍧囦环鏃ユ湡 WEEKEND = DateUtil.parseDate("2013-09-29", "yyyy-MM-dd") - //租金日期 + //绉熼噾鏃ユ湡 MONTHEND = DateUtil.getLastEndMonthDate(DateUtil.parseDate("2014-01-20", "yyyy-MM-dd")); - //本次导出库 + //鏈瀵煎嚭搴� CURR_DB_NAME = "ali_trade_data_prod1"; DistrictExportToAliTmpBak sd = new DistrictExportToAliTmpBak(); - //成交活跃度 - sd.processTrade() //最慢 - //租售比 + //鎴愪氦娲昏穬搴� + sd.processTrade() //鏈�鎱� + //绉熷敭姣� sd.processRentSell() - //均价历史 + //鍧囦环鍘嗗彶 sd.processDistrictHistoryStat() - //租金历史 + //绉熼噾鍘嗗彶 sd.processDistrictRentHistoryStat() - //更新seaweed中的最新数据 + //鏇存柊seaweed涓殑鏈�鏂版暟鎹� sd.updateDistrictData() - //创建XML文件 + //鍒涘缓XML鏂囦欢 sd.createXml() println "-----------------done---------------------- " + DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) @@ -143,16 +143,16 @@ class DistrictExportToAliTmpBak { udata.put('estate_charge', districtObj.get('estate_charge')) } - udata.put('estate_type', '普通住宅') + udata.put('estate_type', '鏅�氫綇瀹�') if(districtObj.get('estate_type') || districtObj.get('estate_type2')) { if(districtObj.get('estate_type2')) { udata.put('estate_type', districtObj.get('estate_type2')) }else if(districtObj.get('estate_type')) { String s = districtObj.get('estate_type'); - if(s.indexOf('别墅') > -1) { - udata.put('estate_type', '别墅') + if(s.indexOf('鍒') > -1) { + udata.put('estate_type', '鍒') }else { - udata.put('estate_type', '普通住宅') + udata.put('estate_type', '鏅�氫綇瀹�') } } } @@ -161,8 +161,8 @@ class DistrictExportToAliTmpBak { if(districtObj.get('build_type')) { udata.put('build_type', districtObj.get('build_type')) }else { - if(udata.get('estate_type') != '别墅') { - udata.put('build_type', '独栋') + if(udata.get('estate_type') != '鍒') { + udata.put('build_type', '鐙爧') }else { DBObject q = new BasicDBObject() q.put("city", city) @@ -184,11 +184,11 @@ class DistrictExportToAliTmpBak { if(heights.size() > 0) { int h = heights.get(heights.size() - 1) if(h > 0 && h <= 7) { - udata.put('build_type', '多层') + udata.put('build_type', '澶氬眰') }else if(h > 7 && h <= 12) { - udata.put('build_type', '小高层') + udata.put('build_type', '灏忛珮灞�') }else if(h > 12) { - udata.put('build_type', '高层') + udata.put('build_type', '楂樺眰') } } } @@ -275,8 +275,8 @@ class DistrictExportToAliTmpBak { String s = districtObj.get('facilities') s = DataUtil.removeHtml(DataUtil.balanceTags(s)) s = s.replace(' ', '').replace('·', '').replace('??', '') - if(s.indexOf("本段合作编辑者") > -1) { - s = StringUtils.substringBeforeLast(s, "本段合作编辑者") + if(s.indexOf("鏈鍚堜綔缂栬緫鑰�") > -1) { + s = StringUtils.substringBeforeLast(s, "鏈鍚堜綔缂栬緫鑰�") } s = decode(s) s = s.replace(' ', '').replace('·', '').replace('??', '') @@ -290,36 +290,36 @@ class DistrictExportToAliTmpBak { udata.put('lng', String.valueOf(districtObj.get('lng') / 10000000000d)) } - //小区地理位置 + //灏忓尯鍦扮悊浣嶇疆 if(districtObj.get('loop_line_info')) { udata.put('loop_line_info', districtObj.get('loop_line_info')) } - //房型 + //鎴垮瀷 String houseType = getHouseType(city, region, name) if(houseType) { udata.put('house_type', houseType) } - //房型价格 + //鎴垮瀷浠锋牸 String houseTypePrice = getHouseTypePrice(city, region, name) if(houseTypePrice) { udata.put('house_type_price', houseTypePrice) } - //房型面积 + //鎴垮瀷闈㈢Н String houseTypeArea = getHouseTypeArea(city, region, name) if(houseTypeArea) { udata.put('house_type_area', houseTypeArea) } - //出售套数 + //鍑哄敭濂楁暟 udata.put("sell_count", getSellCount(city, region, name)) - //出租套数 + //鍑虹濂楁暟 udata.put("rent_count", getRentCount(city, region, name)) - //时候是学区房 - udata.put("school_house", (getSchoolHouse(city, region, name) == null ? "" : "是")) - //时候是地铁房 - udata.put("metro_house", (getMetroHouse(city, region, name) ? "是" : "否")) - //小区期数 + //鏃跺�欐槸瀛﹀尯鎴� + udata.put("school_house", (getSchoolHouse(city, region, name) == null ? "" : "鏄�")) + //鏃跺�欐槸鍦伴搧鎴� + udata.put("metro_house", (getMetroHouse(city, region, name) ? "鏄�" : "鍚�")) + //灏忓尯鏈熸暟 String qishu = getDistrictPeriod(city, region, name) if(qishu) { udata.put("district_period", qishu) @@ -365,7 +365,7 @@ class DistrictExportToAliTmpBak { def tc = 0 def countMap = [:] for(String city : cities) { - File file = new File("D:/阿里数据/详细数据/xml/${city}.xml") + File file = new File("D:/闃块噷鏁版嵁/璇︾粏鏁版嵁/xml/${city}.xml") if(file.exists()) { file.delete(); } @@ -399,7 +399,7 @@ class DistrictExportToAliTmpBak { continue; } - if("暂无".equals(dbo.get(fieldName)) || "暂无资料".equals(dbo.get(fieldName))) { + if("鏆傛棤".equals(dbo.get(fieldName)) || "鏆傛棤璧勬枡".equals(dbo.get(fieldName))) { continue; } @@ -418,7 +418,7 @@ class DistrictExportToAliTmpBak { def statMap = statObj.get('stat_map') List list = new ArrayList(); statMap.each() {k,v-> - if(v.toString().endsWith("元")) { + if(v.toString().endsWith("鍏�")) { v = v.toString().substring(0, v.toString().length() - 1) } list.add(StringUtils.substringBeforeLast(k, "-") + ":" + v) @@ -439,16 +439,16 @@ class DistrictExportToAliTmpBak { if(arrs.length > 1) { String bs = null String xq = null - if(arrs[0].indexOf('别墅') > -1) { + if(arrs[0].indexOf('鍒') > -1) { bs = arrs[0] xq = arrs[1] }else { xq = arrs[0] bs = arrs[1] } - bs = bs.replace("别墅", "").replace(":", "").trim() - xq = xq.replace("小区", "").replace(":", "").trim() - if(dbo.get('estate_type2') && dbo.get('estate_type2').toString().indexOf('别墅') > -1) { + bs = bs.replace("鍒", "").replace(":", "").trim() + xq = xq.replace("灏忓尯", "").replace(":", "").trim() + if(dbo.get('estate_type2') && dbo.get('estate_type2').toString().indexOf('鍒') > -1) { list.add(StringUtils.substringBeforeLast(k, "-") + ":" + bs) }else { list.add(StringUtils.substringBeforeLast(k, "-") + ":" + xq) @@ -478,8 +478,8 @@ class DistrictExportToAliTmpBak { }else if(fieldName == 'facilities' || fieldName == 'car_site'){ value = DataUtil.removeHtml(DataUtil.balanceTags(dbo.get(fieldName).toString())) value = value.replace(' ', '').replace('·', '').replace('??', '') - if(value.indexOf("本段合作编辑者") > -1) { - value = StringUtils.substringBeforeLast(value, "本段合作编辑者") + if(value.indexOf("鏈鍚堜綔缂栬緫鑰�") > -1) { + value = StringUtils.substringBeforeLast(value, "鏈鍚堜綔缂栬緫鑰�") } value = decode(value) value = value.replace(' ', '').replace('·', '').replace('??', '') @@ -564,7 +564,7 @@ class DistrictExportToAliTmpBak { return; } - if(!price.endsWith("元")) { + if(!price.endsWith("鍏�")) { return; } @@ -575,7 +575,7 @@ class DistrictExportToAliTmpBak { int avgPrice = 0 try { - avgPrice = price.replace("左右", "").replace("元", "").toInteger() + avgPrice = price.replace("宸﹀彸", "").replace("鍏�", "").toInteger() }catch(Exception e) { return; } @@ -584,7 +584,7 @@ class DistrictExportToAliTmpBak { def typeArea = getHouseTypeArea(city, region, name) def avgArea = 93 - if(estateType.indexOf('住宅') == -1 || estateType.indexOf('小区') == -1) { + if(estateType.indexOf('浣忓畢') == -1 || estateType.indexOf('灏忓尯') == -1) { avgArea= 180 } @@ -623,7 +623,7 @@ class DistrictExportToAliTmpBak { DBCollection coll1 = MongoUtils.getCollectionByName("fangjia", "ali_trade_data_prod1", "192.168.0.60") DBCollection collLoudong = MongoUtils.getCollectionByName("fangjia", "house_loudong", "mongo.db.fangjia.com") - DBCursor cur1 = coll1.find(new BasicDBObject("city", "上海")).sort(new BasicDBObject("sequence", 1)) + DBCursor cur1 = coll1.find(new BasicDBObject("city", "涓婃捣")).sort(new BasicDBObject("sequence", 1)) println cur1.count() def map = [:] while(cur1.hasNext()) { @@ -654,7 +654,7 @@ class DistrictExportToAliTmpBak { for(Date d : DATES_RENT) { MONTHEND = d; WEEKEND = DateUtil.getLastSunday(d) - for(String city : ["长沙"]) { + for(String city : ["闀挎矙"]) { def rentStatMap = processDistrictRentPrice(city, WEEKEND, MONTHEND) println city + "\t" + DateUtil.formatToYYYYMMDD(MONTHEND) + "\t" + rentStatMap.size() if(rentStatMap.size() == 0) { @@ -716,7 +716,7 @@ class DistrictExportToAliTmpBak { String price = dbo.get('avg_price') int avgPrice = 0 try { - avgPrice = price.replace("左右", "").replace("元", "").toInteger() + avgPrice = price.replace("宸﹀彸", "").replace("鍏�", "").toInteger() }catch(Exception e) { continue } @@ -772,8 +772,8 @@ class DistrictExportToAliTmpBak { def statMap = getDistrictAvgPrice(city, region, name, estateType) if(statMap == null && avgPrice) { statMap = [:] - statMap.put("2013-09-29", avgPrice.replace("元", "")) - statMap.put("2013-12-29", avgPrice.replace("元", "")) + statMap.put("2013-09-29", avgPrice.replace("鍏�", "")) + statMap.put("2013-12-29", avgPrice.replace("鍏�", "")) } println dbo.get('sequence') + " " + city + "-" + region + "-" + name + "\t" + (statMap ? statMap.size() : 0) @@ -1001,7 +1001,7 @@ class DistrictExportToAliTmpBak { }else if('sell_count'.equals(fieldName)) { val = getSellCount(city, region, name) }else if('school_house'.equals(fieldName)) { - val = (getSchoolHouse(city, region, name) == null ? "" : "是") + val = (getSchoolHouse(city, region, name) == null ? "" : "鏄�") }else if('avg_price'.equals(fieldName)) { val = getAvgPrice(city, region, name, dbo.get('avg_price'), dbo.get('total_price')) }else if('district_period'.equals(fieldName)) { @@ -1023,7 +1023,7 @@ class DistrictExportToAliTmpBak { val = String.valueOf(latLng) } }else if('metro_house'.equals(fieldName)) { - val = (getMetroHouse(city, region, name) ? "是" : "否") + val = (getMetroHouse(city, region, name) ? "鏄�" : "鍚�") }else { if(dbo.get(fieldName)) { val = DataUtil.removeHtml(String.valueOf(dbo.get(fieldName))) @@ -1033,7 +1033,7 @@ class DistrictExportToAliTmpBak { if(StringUtils.isBlank(val) || "null".equals(val) || "-1".equals(val)) { val = ""; } - if(val.indexOf('暂无') > -1 || val.indexOf('暂无资料') > -1) { + if(val.indexOf('鏆傛棤') > -1 || val.indexOf('鏆傛棤璧勬枡') > -1) { val = ""; } @@ -1123,7 +1123,7 @@ class DistrictExportToAliTmpBak { private void createDataFile(String filePath, Map fieldsMap) { println "create data file to " + filePath - def cities = ["上海"];//this.getAllCities() + def cities = ["涓婃捣"];//this.getAllCities() File file = new File(filePath); if (file.exists()) { file.delete(); @@ -1153,7 +1153,7 @@ class DistrictExportToAliTmpBak { HSSFSheet citySheet = workBook.createSheet(city); int i=0 for(String f : fieldsMap.keySet()) { - citySheet.setColumnWidth((short) i, (short) fieldsMap.get(f).get('width')); //默认设置宽度 + citySheet.setColumnWidth((short) i, (short) fieldsMap.get(f).get('width')); //榛樿璁剧疆瀹藉害 citySheet.setDefaultRowHeight((short)420) i++ } @@ -1251,7 +1251,7 @@ class DistrictExportToAliTmpBak { String key = city + "-" + region + "-" + name if(CITY_TRADE_MAP.get(city).containsKey(key)) { - return CITY_TRADE_MAP.get(city).get(key) + "套" + return CITY_TRADE_MAP.get(city).get(key) + "濂�" } return "" @@ -1289,23 +1289,23 @@ class DistrictExportToAliTmpBak { String ret = ""; if(statMap == null || statMap.size() == 0) { if (avgPrice && avgPrice > 2000) { - ret = avgPrice + "元" + ret = avgPrice + "鍏�" } else if (totalPrice && totalPrice > 10) { if (totalPrice <= 10000) { - ret = totalPrice + '万/套'; + ret = totalPrice + '涓�/濂�'; } else { - ret = ((int) (totalPrice / 10000)) + '万/套'; + ret = ((int) (totalPrice / 10000)) + '涓�/濂�'; } } }else { - def districtPrice = statMap.get('小区'); - def villaPrice = statMap.get('别墅'); + def districtPrice = statMap.get('灏忓尯'); + def villaPrice = statMap.get('鍒'); if (null != districtPrice && null != villaPrice) { - ret = "小区:" + districtPrice+"元" + "\r\n别墅:" + villaPrice + "元"; + ret = "灏忓尯:" + districtPrice+"鍏�" + "\r\n鍒:" + villaPrice + "鍏�"; } else if (null != districtPrice) { - ret = districtPrice + "元"; + ret = districtPrice + "鍏�"; } else if (null != villaPrice) { - ret = villaPrice + "元"; + ret = villaPrice + "鍏�"; } } @@ -1386,8 +1386,8 @@ class DistrictExportToAliTmpBak { def rentStatMap = getDistrictRentStat2(city, region, name) if(rentStatMap != null) { - def xiaoqu = rentStatMap.get('小区'); - def bieshu = rentStatMap.get('别墅'); + def xiaoqu = rentStatMap.get('灏忓尯'); + def bieshu = rentStatMap.get('鍒'); if (null != xiaoqu && null != bieshu) { def xiaoquMin = Integer.MAX_VALUE; def xiaoquMax = Integer.MIN_VALUE; @@ -1411,7 +1411,7 @@ class DistrictExportToAliTmpBak { } } - ret = "小区:" + (xiaoquMin == xiaoquMax ? (xiaoquMin + '左右') : (xiaoquMin + "~" + xiaoquMax)) + "\r\n别墅:" + (bieshuMin == bieshuMax ? (bieshuMin + '左右') : (bieshuMin + "~" + bieshuMax)); + ret = "灏忓尯锛�" + (xiaoquMin == xiaoquMax ? (xiaoquMin + '宸﹀彸') : (xiaoquMin + "~" + xiaoquMax)) + "\r\n鍒锛�" + (bieshuMin == bieshuMax ? (bieshuMin + '宸﹀彸') : (bieshuMin + "~" + bieshuMax)); } else if (null != xiaoqu) { def min = Integer.MAX_VALUE; def max = Integer.MIN_VALUE; @@ -1423,7 +1423,7 @@ class DistrictExportToAliTmpBak { min = b; } } - ret = (min == max ? (min + '左右') : (min + "~" + max)); + ret = (min == max ? (min + '宸﹀彸') : (min + "~" + max)); } else if (null != bieshu) { def min = Integer.MAX_VALUE; def max = Integer.MIN_VALUE; @@ -1435,7 +1435,7 @@ class DistrictExportToAliTmpBak { min = b; } } - ret = (min == max ? (min + '左右') : (min + "~" + max)); + ret = (min == max ? (min + '宸﹀彸') : (min + "~" + max)); } }else { def disStatMap = this.getDistrictStat2(city, region, name) @@ -1446,22 +1446,22 @@ class DistrictExportToAliTmpBak { if(disStatMap != null && disStatMap.size() > 0) { def regionRentRang = getRegionRatioRange(city, region) if (regionRentRang) { - def xiaoqu = disStatMap.get('小区'); - def bieshu = disStatMap.get('别墅'); + def xiaoqu = disStatMap.get('灏忓尯'); + def bieshu = disStatMap.get('鍒'); if (null != xiaoqu && null != bieshu) { def xiaoquMin = (int) (regionRentRang[0] * xiaoqu); def xiaoquMax = (int) (regionRentRang[1] * xiaoqu); def bieshuMin = (int) (regionRentRang[0] * bieshu); def bieshuMax = (int) (regionRentRang[1] * bieshu); - ret ="小区:" + (xiaoquMin == xiaoquMax ? (xiaoquMin + '左右') : (xiaoquMin + "~" + xiaoquMax)) + "\r\n别墅:" + (bieshuMin == bieshuMax ? (bieshuMin + '左右') : (bieshuMin + "~" + bieshuMax)); + ret ="灏忓尯锛�" + (xiaoquMin == xiaoquMax ? (xiaoquMin + '宸﹀彸') : (xiaoquMin + "~" + xiaoquMax)) + "\r\n鍒锛�" + (bieshuMin == bieshuMax ? (bieshuMin + '宸﹀彸') : (bieshuMin + "~" + bieshuMax)); } else if (null != xiaoqu) { def min = (int) (regionRentRang[0] * xiaoqu); def max = (int) (regionRentRang[1] * xiaoqu); - ret = (min == max ? (min + '左右') : (min + "~" + max)); + ret = (min == max ? (min + '宸﹀彸') : (min + "~" + max)); } else if (null != bieshu) { def min = (int) (regionRentRang[0] * bieshu); def max = (int) (regionRentRang[1] * bieshu); - ret = (min == max ? (min + '左右') : (min + "~" + max)); + ret = (min == max ? (min + '宸﹀彸') : (min + "~" + max)); } } } @@ -1650,7 +1650,7 @@ class DistrictExportToAliTmpBak { roomTypes = roomTypes.unique() for(String rt : roomTypes) { String[] arrs = rt.split("-") - ret.add(DataUtil.convertNumberToCn(arrs[0]) + "室" + DataUtil.convertNumberToCn(arrs[1]) + "厅") + ret.add(DataUtil.convertNumberToCn(arrs[0]) + "瀹�" + DataUtil.convertNumberToCn(arrs[1]) + "鍘�") } } @@ -1661,7 +1661,7 @@ class DistrictExportToAliTmpBak { def DISTRICT_ROOM_FACTOR_MAP = [:] private String getHouseTypePrice(String city, String region, String name) { def districtStatMap = getDistrictStat2(city, region, name) - if(districtStatMap == null || !districtStatMap.containsKey('小区')) {//因为只有"小区"有房型因子 + if(districtStatMap == null || !districtStatMap.containsKey('灏忓尯')) {//鍥犱负鍙湁"灏忓尯"鏈夋埧鍨嬪洜瀛� return null; } @@ -1689,7 +1689,7 @@ class DistrictExportToAliTmpBak { DISTRICT_ROOM_FACTOR_MAP.put(city, districtMap) } - int districtPrice = districtStatMap.get('小区'); + int districtPrice = districtStatMap.get('灏忓尯'); def ret = [] String key = city + "-" + region + "-" + name if(DISTRICT_ROOM_FACTOR_MAP.get(city).get(key) != null) { @@ -1698,7 +1698,7 @@ class DistrictExportToAliTmpBak { def room = fobj.get('room'); def factor = fobj.get('factor') int p = districtPrice * factor - ret.add(DataUtil.convertNumberToCn(String.valueOf(room)) + "室" + p + "元") + ret.add(DataUtil.convertNumberToCn(String.valueOf(room)) + "瀹�" + p + "鍏�") } } @@ -1727,7 +1727,7 @@ class DistrictExportToAliTmpBak { continue } - String k = DataUtil.convertNumberToCn(room + "") + "室" + DataUtil.convertNumberToCn(hall + "") + "厅" + String k = DataUtil.convertNumberToCn(room + "") + "瀹�" + DataUtil.convertNumberToCn(hall + "") + "鍘�" if(map.get(k)) { def list = map.get(k) list.add(area) @@ -1739,7 +1739,7 @@ class DistrictExportToAliTmpBak { def ret = [] for(String k : map.keySet()) { - ret.add(k + "[" + StringUtils.join(map.get(k), ",") + "]平米") + ret.add(k + "[" + StringUtils.join(map.get(k), ",") + "]骞崇背") } return StringUtils.join(ret, ",") } @@ -1796,30 +1796,30 @@ class DistrictExportToAliTmpBak { Set ret = new HashSet(); if (StringUtils.isNotBlank(estateType)) { - if (StringUtils.indexOfAny(estateType, (String[])(["别墅", "独栋", "联排", "双拼", "叠加"].toArray())) > -1) { - ret.add("别墅"); + if (StringUtils.indexOfAny(estateType, (String[])(["鍒", "鐙爧", "鑱旀帓", "鍙屾嫾", "鍙犲姞"].toArray())) > -1) { + ret.add("鍒"); } - if (StringUtils.indexOfAny(estateType, (String[])(["住宅", "公寓", "小区", "商住"].toArray())) > -1) { - ret.add("小区"); + if (StringUtils.indexOfAny(estateType, (String[])(["浣忓畢", "鍏瘬", "灏忓尯", "鍟嗕綇"].toArray())) > -1) { + ret.add("灏忓尯"); } } if (ret.size() == 0) { - return "小区"; + return "灏忓尯"; } String s = StringUtils.join(ret, ","); - if (s != null && s.indexOf("别墅") > -1) { - return "别墅"; + if (s != null && s.indexOf("鍒") > -1) { + return "鍒"; } - return "小区"; + return "灏忓尯"; } private def processDistrictRentPrice(String city, Date weekend, Date monthEndDate) { - // 获取城市下当期的所有均价 + // 鑾峰彇鍩庡競涓嬪綋鏈熺殑鎵�鏈夊潎浠� DBObject query = new BasicDBObject(); query.put('city', city); query.put('weekend', weekend); @@ -1830,7 +1830,7 @@ class DistrictExportToAliTmpBak { fields.put('estate_type', 1); fields.put('avg_price', 1); - def statMap = [:]; // 小区均价 [区域_小区名:[小区:小区均价,别墅:别墅均价]] + def statMap = [:]; // 灏忓尯鍧囦环 [鍖哄煙_灏忓尯鍚�:[灏忓尯:灏忓尯鍧囦环,鍒:鍒鍧囦环]] DISTRICT_STAT_COLL.find(query, fields).each { def key = it.region + "_" + it.district_name; def disMap = statMap.get(key); @@ -1842,7 +1842,7 @@ class DistrictExportToAliTmpBak { statMap.put(key, disMap); } - // 获取城市下当期的所有租金均价 + // 鑾峰彇鍩庡競涓嬪綋鏈熺殑鎵�鏈夌閲戝潎浠� query = new BasicDBObject(); query.put('city', city); query.put('end_month_date', monthEndDate); @@ -1854,7 +1854,7 @@ class DistrictExportToAliTmpBak { fields.put('avg_price', 1); fields.put('house_type', 1); - def statRentMap = [:]; // [区域_小区名:[小区:[1:价格,2:价格...],别墅:[1:价格,2:价格...]]] + def statRentMap = [:]; // [鍖哄煙_灏忓尯鍚�:[灏忓尯:[1:浠锋牸,2:浠锋牸...],鍒:[1:浠锋牸,2:浠锋牸...]]] DISTRICT_RENT_STAT_COLL.find(query, fields).each { def key = it.region + "_" + it.district_name; @@ -1951,8 +1951,8 @@ class DistrictExportToAliTmpBak { if (null == regionRentRang || regionRentRang.length != 2 || regionRentRang[0] == Double.MAX_VALUE || regionRentRang[1] == Double.MIN_VALUE) { rentPriceStr = ''; } else { - def xiaoqu = disStatMap.get('小区'); - def bieshu = disStatMap.get('别墅'); + def xiaoqu = disStatMap.get('灏忓尯'); + def bieshu = disStatMap.get('鍒'); if (!xiaoqu && avgPrice && avgPrice > 2000) { xiaoqu = avgPrice; @@ -1968,17 +1968,17 @@ class DistrictExportToAliTmpBak { def bieshuMin = (int) (regionRentRang[0] * bieshu); def bieshuMax = (int) (regionRentRang[1] * bieshu); - rentPriceStr = "小区:" + (xiaoquMin == xiaoquMax ? (xiaoquMin + '左右') : (xiaoquMin + "~" + xiaoquMax)) + "\r\n别墅:" + (bieshuMin == bieshuMax ? (bieshuMin + '左右') : (bieshuMin + "~" + bieshuMax)); + rentPriceStr = "灏忓尯锛�" + (xiaoquMin == xiaoquMax ? (xiaoquMin + '宸﹀彸') : (xiaoquMin + "~" + xiaoquMax)) + "\r\n鍒锛�" + (bieshuMin == bieshuMax ? (bieshuMin + '宸﹀彸') : (bieshuMin + "~" + bieshuMax)); } else if (null != xiaoqu) { def min = (int) (regionRentRang[0] * xiaoqu); def max = (int) (regionRentRang[1] * xiaoqu); - rentPriceStr = (min == max ? (min + '左右') : (min + "~" + max)); + rentPriceStr = (min == max ? (min + '宸﹀彸') : (min + "~" + max)); } else if (null != bieshu) { def min = (int) (regionRentRang[0] * bieshu); def max = (int) (regionRentRang[1] * bieshu); - rentPriceStr = (min == max ? (min + '左右') : (min + "~" + max)); + rentPriceStr = (min == max ? (min + '宸﹀彸') : (min + "~" + max)); } else { rentPriceStr = ''; } @@ -1987,8 +1987,8 @@ class DistrictExportToAliTmpBak { rentPriceStr = ''; } } else { - def xiaoqu = disRentMap.get('小区'); - def bieshu = disRentMap.get('别墅'); + def xiaoqu = disRentMap.get('灏忓尯'); + def bieshu = disRentMap.get('鍒'); if (null != xiaoqu && null != bieshu) { def xiaoquMin = Integer.MAX_VALUE; def xiaoquMax = Integer.MIN_VALUE; @@ -2012,7 +2012,7 @@ class DistrictExportToAliTmpBak { } } - rentPriceStr = "小区:" + (xiaoquMin == xiaoquMax ? (xiaoquMin + '左右') : (xiaoquMin + "~" + xiaoquMax)) + "\r\n别墅:" + (bieshuMin == bieshuMax ? (bieshuMin + '左右') : (bieshuMin + "~" + bieshuMax)); + rentPriceStr = "灏忓尯锛�" + (xiaoquMin == xiaoquMax ? (xiaoquMin + '宸﹀彸') : (xiaoquMin + "~" + xiaoquMax)) + "\r\n鍒锛�" + (bieshuMin == bieshuMax ? (bieshuMin + '宸﹀彸') : (bieshuMin + "~" + bieshuMax)); } else if (null != xiaoqu) { def min = Integer.MAX_VALUE; def max = Integer.MIN_VALUE; @@ -2024,7 +2024,7 @@ class DistrictExportToAliTmpBak { min = b; } } - rentPriceStr = (min == max ? (min + '左右') : (min + "~" + max)); + rentPriceStr = (min == max ? (min + '宸﹀彸') : (min + "~" + max)); } else if (null != bieshu) { def min = Integer.MAX_VALUE; def max = Integer.MIN_VALUE; @@ -2036,7 +2036,7 @@ class DistrictExportToAliTmpBak { min = b; } } - rentPriceStr = (min == max ? (min + '左右') : (min + "~" + max)); + rentPriceStr = (min == max ? (min + '宸﹀彸') : (min + "~" + max)); } else { rentPriceStr = ''; } @@ -2133,38 +2133,38 @@ class DistrictExportToAliTmpBak { ] def final static Map FIELDS_MAP = [ - "小区名称" : [field:'name', width:6000], - "小区地址" : [field:'address', width:6000], - "城市" : [field:'city', width:4000], - "区域" : [field:'region', width:4000], - "板块" : [field:'block', width:4000], - "街道/社区" : [field:'street_community', width:6000], - "小区占地面积" : [field:'all_area', width:6000], - "小区建筑面积" : [field:'build_area', width:6000], - "容积率" : [field:'cubage_percent', width:6000], - "绿化率" : [field:'virescence_percent', width:6000], - "小区停车位" : [field:'car_site', width:6000], - "小区物业费" : [field:'estate_charge', width:6000], - "房型" : [field:'house_type', width:6000], - "房型价格" : [field:'house_type_price', width:6000], - "房型面积" : [field:'house_type_area', width:6000], - "出租套数" : [field:'rent_count', width:6000], - "挂牌套数" : [field:'sell_count', width:6000], - "是否是学区房" : [field:'school_house', width:6000], - "物业类型" : [field:'estate_type2', width:6000], - "建筑类型" : [field:'build_type', width:6000], - "小区均价" : [field:'avg_price', width:6000], - "期数" : [field:'district_period', width:6000], - "竣工时间" : [field:'finish_building_date', width:6000], - "开发商" : [field:'developer', width:6000], - "小区物业公司" : [field:'estate_company', width:6000], - "小区租金" : [field:'rent_price', width:6000], - "小区地理位置" : [field:'loop_line_info', width:6000], - "成交活跃度" : [field:'trade_stat', width:6000], - "租售比" : [field:'rent_sell', width:6000], - "周边配套" : [field:'facilities', width:15000], - "是否是地铁房" : [field:'metro_house', width:6000], - "经度" : [field:'lat', width:6000], - "纬度" : [field:'lng', width:6000] + "灏忓尯鍚嶇О" : [field:'name', width:6000], + "灏忓尯鍦板潃" : [field:'address', width:6000], + "鍩庡競" : [field:'city', width:4000], + "鍖哄煙" : [field:'region', width:4000], + "鏉垮潡" : [field:'block', width:4000], + "琛楅亾/绀惧尯" : [field:'street_community', width:6000], + "灏忓尯鍗犲湴闈㈢Н" : [field:'all_area', width:6000], + "灏忓尯寤虹瓚闈㈢Н" : [field:'build_area', width:6000], + "瀹圭Н鐜�" : [field:'cubage_percent', width:6000], + "缁垮寲鐜�" : [field:'virescence_percent', width:6000], + "灏忓尯鍋滆溅浣�" : [field:'car_site', width:6000], + "灏忓尯鐗╀笟璐�" : [field:'estate_charge', width:6000], + "鎴垮瀷" : [field:'house_type', width:6000], + "鎴垮瀷浠锋牸" : [field:'house_type_price', width:6000], + "鎴垮瀷闈㈢Н" : [field:'house_type_area', width:6000], + "鍑虹濂楁暟" : [field:'rent_count', width:6000], + "鎸傜墝濂楁暟" : [field:'sell_count', width:6000], + "鏄惁鏄鍖烘埧" : [field:'school_house', width:6000], + "鐗╀笟绫诲瀷" : [field:'estate_type2', width:6000], + "寤虹瓚绫诲瀷" : [field:'build_type', width:6000], + "灏忓尯鍧囦环" : [field:'avg_price', width:6000], + "鏈熸暟" : [field:'district_period', width:6000], + "绔e伐鏃堕棿" : [field:'finish_building_date', width:6000], + "寮�鍙戝晢" : [field:'developer', width:6000], + "灏忓尯鐗╀笟鍏徃" : [field:'estate_company', width:6000], + "灏忓尯绉熼噾" : [field:'rent_price', width:6000], + "灏忓尯鍦扮悊浣嶇疆" : [field:'loop_line_info', width:6000], + "鎴愪氦娲昏穬搴�" : [field:'trade_stat', width:6000], + "绉熷敭姣�" : [field:'rent_sell', width:6000], + "鍛ㄨ竟閰嶅" : [field:'facilities', width:15000], + "鏄惁鏄湴閾佹埧" : [field:'metro_house', width:6000], + "缁忓害" : [field:'lat', width:6000], + "绾害" : [field:'lng', width:6000] ]; } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/DistrictHouseTypeAvgPriceExport.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/DistrictHouseTypeAvgPriceExport.groovy index d76bf3942..6c17fb14d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/DistrictHouseTypeAvgPriceExport.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/DistrictHouseTypeAvgPriceExport.groovy @@ -40,7 +40,7 @@ class DistrictHouseTypeAvgPriceExport { def cityRun(){ def weekends = DateUtils.getMonthList(new Date(), 6); - def city = "上海"; + def city = "涓婃捣"; def ret = []; def dataMap = findCityHouseCount(city, "sell",weekends[0].replace("-","").toInteger()); @@ -95,21 +95,21 @@ class DistrictHouseTypeAvgPriceExport { ret << rows; } - exportExcel2(ret, "E:\\数据\\上海房型均价价格1000.xls", weekends); + exportExcel2(ret, "E:\\鏁版嵁\\涓婃捣鎴垮瀷鍧囦环浠锋牸1000.xls", weekends); } def run(){ def weekends = DateUtils.getMonthList(new Date(), 6); - def fileDatas = DataHandleUtils.readExcel("E:\\数据\\导出模板.xlsx"); + def fileDatas = DataHandleUtils.readExcel("E:\\鏁版嵁\\瀵煎嚭妯℃澘.xlsx"); def ret = []; def index = 0; for(def m : fileDatas){ index++; - def city = m.get("城市").replace("市", ""); - def region = m.get("区域"); - def name = m.get("小区名"); + def city = m.get("鍩庡競").replace("甯�", ""); + def region = m.get("鍖哄煙"); + def name = m.get("灏忓尯鍚�"); def resultMap = [:]; def prices = calcAvgPrice(city, region, name, weekends); @@ -123,8 +123,8 @@ class DistrictHouseTypeAvgPriceExport { } - //exportExcel(ret, "E:\\数据\\房型均价.xls", weekends); - exportExcel2(ret, "E:\\数据\\房型均价.xls", weekends); + //exportExcel(ret, "E:\\鏁版嵁\\鎴垮瀷鍧囦环.xls", weekends); + exportExcel2(ret, "E:\\鏁版嵁\\鎴垮瀷鍧囦环.xls", weekends); } @@ -308,7 +308,7 @@ class DistrictHouseTypeAvgPriceExport { FileOutputStream fos = null; try { HSSFWorkbook WORK_BOOK = new HSSFWorkbook(); - HSSFSheet sheet = WORK_BOOK.createSheet("数据"); + HSSFSheet sheet = WORK_BOOK.createSheet("鏁版嵁"); setExcelHeader(sheet, WORK_BOOK, weekends); @@ -365,18 +365,18 @@ class DistrictHouseTypeAvgPriceExport { sheet.addMergedRegion(new CellRangeAddress(0, 1, 0, 0)); HSSFCell cell0 = row.createCell(0); - cell0.setCellValue("城市") + cell0.setCellValue("鍩庡競") cell0.setCellStyle(cellStyle) sheet.addMergedRegion(new CellRangeAddress(0, 1, 1, 1)); HSSFCell cell1 = row.createCell(1); - cell1.setCellValue("区域") + cell1.setCellValue("鍖哄煙") cell1.setCellStyle(cellStyle) sheet.addMergedRegion(new CellRangeAddress(0, 1, 2, 2)); HSSFCell cell2 = row.createCell(2); - cell2.setCellValue("名称") + cell2.setCellValue("鍚嶇О") cell2.setCellStyle(cellStyle) def weekendCount = weekends.size(); @@ -409,15 +409,15 @@ class DistrictHouseTypeAvgPriceExport { for(int j=0;j<5;j++){ if(j==0){ - row1.createCell(j+start).setCellValue("1室"); + row1.createCell(j+start).setCellValue("1瀹�"); }else if(j==1){ - row1.createCell(j+start).setCellValue("2室"); + row1.createCell(j+start).setCellValue("2瀹�"); }else if(j==2){ - row1.createCell(j+start).setCellValue("3室"); + row1.createCell(j+start).setCellValue("3瀹�"); }else if(j==3){ - row1.createCell(j+start).setCellValue("4室"); + row1.createCell(j+start).setCellValue("4瀹�"); }else if(j==4){ - row1.createCell(j+start).setCellValue("5室"); + row1.createCell(j+start).setCellValue("5瀹�"); } } @@ -435,17 +435,17 @@ class DistrictHouseTypeAvgPriceExport { FileOutputStream fos = null; try { HSSFWorkbook WORK_BOOK = new HSSFWorkbook(); - HSSFSheet sheet = WORK_BOOK.createSheet("数据"); + HSSFSheet sheet = WORK_BOOK.createSheet("鏁版嵁"); //setExcelHeader(sheet, WORK_BOOK, weekends); HSSFRow row0 = sheet.createRow(0); - row0.createCell(0).setCellValue("城市"); - row0.createCell(1).setCellValue("时间"); - row0.createCell(2).setCellValue("1室"); - row0.createCell(3).setCellValue("2室"); - row0.createCell(4).setCellValue("3室"); - row0.createCell(5).setCellValue("4室"); - row0.createCell(6).setCellValue("5室"); + row0.createCell(0).setCellValue("鍩庡競"); + row0.createCell(1).setCellValue("鏃堕棿"); + row0.createCell(2).setCellValue("1瀹�"); + row0.createCell(3).setCellValue("2瀹�"); + row0.createCell(4).setCellValue("3瀹�"); + row0.createCell(5).setCellValue("4瀹�"); + row0.createCell(6).setCellValue("5瀹�"); for(int m=0;m - def ret = findDistrictPrice("上海", r, v, "2016-08-28"); + def ret = findDistrictPrice("涓婃捣", r, v, "2016-08-28"); result.addAll(ret); } - writeCsv(result, "e:\\数据\\小区均价.csv"); + writeCsv(result, "e:\\鏁版嵁\\灏忓尯鍧囦环.csv"); } @@ -59,10 +59,10 @@ class DistrictStatExport { if (file.exists()){ file.delete(); } - file.append("城市,") - file.append("区域,") - file.append("楼盘名称,") - file.append("价格,") + file.append("鍩庡競,") + file.append("鍖哄煙,") + file.append("妤肩洏鍚嶇О,") + file.append("浠锋牸,") file.append(System.getProperty("line.separator")); list.each{ def m = it; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/DistrictStatRentExport.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/DistrictStatRentExport.groovy index 327d9fddd..b63245997 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/DistrictStatRentExport.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/DistrictStatRentExport.groovy @@ -17,7 +17,7 @@ class DistrictStatRentExport { } def run(){ - def city = "深圳"; + def city = "娣卞湷"; def districts = CommonDatautils.findSeaweedData(city, "district"); def ret = []; def index = 0; @@ -27,7 +27,7 @@ class DistrictStatRentExport { def region = district.region; def name = district.name; -// if(name!="特发和平里"){ +// if(name!="鐗瑰彂鍜屽钩閲�"){ // continue; // } def end_month_date = DateUtils.parseFromTightYYYYMMDD("2016-06-30"); @@ -55,7 +55,7 @@ class DistrictStatRentExport { def start = price - price*0.08; def end = price + price * 0.08; if(start && end){ - m.room_price = start.toInteger() +"-"+end.toInteger()+"(上下浮)"; + m.room_price = start.toInteger() +"-"+end.toInteger()+"(涓婁笅娴�)"; } } } @@ -71,7 +71,7 @@ class DistrictStatRentExport { println index + "/"+districts.count()+" "+ m; ret << m; } - writeCSV(ret, "e:\\数据\\深圳样本租房.csv"); + writeCSV(ret, "e:\\鏁版嵁\\娣卞湷鏍锋湰绉熸埧.csv"); } def findHouse(def city, def region, def name){ @@ -102,11 +102,11 @@ class DistrictStatRentExport { if (file.exists()){ file.delete(); } - file.append("城市,") - file.append("区域,") - file.append("楼盘名称,") - file.append("2室价格,") - file.append("70-80平米价格范围,") + file.append("鍩庡競,") + file.append("鍖哄煙,") + file.append("妤肩洏鍚嶇О,") + file.append("2瀹や环鏍�,") + file.append("70-80骞崇背浠锋牸鑼冨洿,") file.append(System.getProperty("line.separator")); list.each{ def m = it; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/ExperCityStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/ExperCityStat.groovy index 5e851da37..2d95a0a5c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/ExperCityStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/ExperCityStat.groovy @@ -18,18 +18,18 @@ class ExperCityStat { } def run(){ - def lists = DataHandleUtils.readExcel("E:\\数据导出\\experian345个城市均价.xlsx"); + def lists = DataHandleUtils.readExcel("E:\\鏁版嵁瀵煎嚭\\experian345涓煄甯傚潎浠�.xlsx"); for(def map : lists){ - def city = map.get("规范名称"); - def cityString = map.get("导出城市"); - def type = map.get("类型"); + def city = map.get("瑙勮寖鍚嶇О"); + def cityString = map.get("瀵煎嚭鍩庡競"); + def type = map.get("绫诲瀷"); if(city){ if(cityString && type){ - def cityArray = cityString.split(","); + def cityArray = cityString.split("锛�"); - if(type=="城市"){ + if(type=="鍩庡競"){ def cityCount = 0; def sumPrice = 0; for(def tempCity : cityArray){ @@ -39,13 +39,13 @@ class ExperCityStat { println tempCity +" "+price cityCount++; }else{ - println tempCity +" 无价." + println tempCity +" 鏃犱环锛�" } } map.price = (sumPrice/cityCount).toInteger(); - }else if(type=="区域"){ + }else if(type=="鍖哄煙"){ def cityCount = 0; def sumPrice = 0; for(def tempRegion : cityArray){ @@ -55,7 +55,7 @@ class ExperCityStat { println city +" "+ tempRegion + " "+price cityCount++; }else{ - pritnln city +" "+ tempRegion +"无价" + pritnln city +" "+ tempRegion +"鏃犱环" } } @@ -69,7 +69,7 @@ class ExperCityStat { if(cityString){ }else{ - println "没城市" + println "娌″煄甯�" } } @@ -78,7 +78,7 @@ class ExperCityStat { } - exportCsv(lists, "E:\\数据导出\\experian345个城市均价.csv"); + exportCsv(lists, "E:\\鏁版嵁瀵煎嚭\\experian345涓煄甯傚潎浠�.csv"); } @@ -89,20 +89,20 @@ class ExperCityStat { } - file.append("省份,") - file.append("城市,") - file.append("规范名称,") - file.append("导出城市,") - file.append("类型,") - file.append("价格") + file.append("鐪佷唤,") + file.append("鍩庡競,") + file.append("瑙勮寖鍚嶇О,") + file.append("瀵煎嚭鍩庡競,") + file.append("绫诲瀷,") + file.append("浠锋牸") file.append(System.getProperty("line.separator")); ret.each{map-> - file.append(map.get("省份") + ",","gbk") - file.append(map.get("城市") + ",","gbk") - file.append(map.get("规范名称") + ",","gbk") - file.append(map.get("导出城市")+ ",","gbk") - file.append(map.get("类型")+ ",","gbk") + file.append(map.get("鐪佷唤") + ",","gbk") + file.append(map.get("鍩庡競") + ",","gbk") + file.append(map.get("瑙勮寖鍚嶇О") + ",","gbk") + file.append(map.get("瀵煎嚭鍩庡競")+ ",","gbk") + file.append(map.get("绫诲瀷")+ ",","gbk") file.append(map.price+ ",","gbk") file.append(System.getProperty("line.separator")); @@ -114,7 +114,7 @@ class ExperCityStat { def query = new BasicDBObject("city",city); query.append("region",null); query.append("block",null); - query.append("cat","城市"); + query.append("cat","鍩庡競"); def cursor = REGION_STAT_CONN.find(query).sort(new BasicDBObject("weekend", -1)).limit(1); def city_price = null; @@ -130,7 +130,7 @@ class ExperCityStat { def query = new BasicDBObject("city",city); query.append("region",region); query.append("block",null); - query.append("cat","区域"); + query.append("cat","鍖哄煙"); def cursor = REGION_STAT_CONN.find(query).sort(new BasicDBObject("weekend", -1)).limit(1); def region_price = null; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/ExportNoLation.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/ExportNoLation.groovy index 0f24fe1e5..807e8e97c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/ExportNoLation.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/ExportNoLation.groovy @@ -32,7 +32,7 @@ class ExportNoLation { def rows = []; - rows << ["编号 ", "城市", "区域","小区名","地址","物业类型","百度经度","百度纬度","高德经度","高德纬度","腾讯经度","腾讯纬度"] + rows << ["缂栧彿 ", "鍩庡競", "鍖哄煙","灏忓尯鍚�","鍦板潃","鐗╀笟绫诲瀷","鐧惧害缁忓害","鐧惧害绾害","楂樺痉缁忓害","楂樺痉绾害","鑵捐缁忓害","鑵捐绾害"] result.each {m-> def row = []; @@ -59,7 +59,7 @@ class ExportNoLation { rows << row; } - ExcelUtils.write("E:\\数据导出\\无经纬度小区.xls", rows, "住宅") + ExcelUtils.write("E:\\鏁版嵁瀵煎嚭\\鏃犵粡绾害灏忓尯.xls", rows, "浣忓畢") } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/ExportToOffline.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/ExportToOffline.groovy index 6b51e7c2f..c44e24abb 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/ExportToOffline.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/ExportToOffline.groovy @@ -29,7 +29,7 @@ class ExportToOffline extends BaseBatch { } /** - * 导均价 + * 瀵煎潎浠� * @param weekend */ def exportDistrictStat(Date weekend) { @@ -66,7 +66,7 @@ class ExportToOffline extends BaseBatch { DBCollection offlineColl = MongoUtils.getCollectionByName("fangjia_stat", "pds.house_quote_level", "192.168.0.136", 27017) def cities = ServerAreaMap.findAllCities() - for(String city : ['北京', '广州']) { + for(String city : ['鍖椾含', '骞垮窞']) { offlineColl.remove(new BasicDBObject("city", city)) DBCursor cur = onlineColl.find(new BasicDBObject('city', city)).addOption(Bytes.QUERYOPTION_NOTIMEOUT) println city + "\t" + cur.count() @@ -82,7 +82,7 @@ class ExportToOffline extends BaseBatch { DBCollection offlineColl = MongoUtils.getCollectionByName("fangjia_stat", "district_analy_data", "192.168.0.136", 27017) def cities = ServerAreaMap.findAllCities() - for(String city : ['北京', '广州', '上海']) { + for(String city : ['鍖椾含', '骞垮窞', '涓婃捣']) { offlineColl.remove(new BasicDBObject("city", city)) DBCursor cur = onlineColl.find(new BasicDBObject('city', city)).addOption(Bytes.QUERYOPTION_NOTIMEOUT) println city + "\t" + cur.count() diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/FjtData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/FjtData.groovy index 2199bfe49..827998aa3 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/FjtData.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/FjtData.groovy @@ -23,23 +23,23 @@ class FjtData { def run(){ // def ret = findEvaluation(191588); -// writeCVS(ret, "E:\\数据导出\\房价通数据\\估价记录(sh01@czbank.com).csv"); +// writeCVS(ret, "E:\\鏁版嵁瀵煎嚭\\鎴夸环閫氭暟鎹甛\浼颁环璁板綍(sh01@czbank.com).csv"); // def ret = findEvaluation(191589); -// writeCVS(ret, "E:\\数据导出\\房价通数据\\估价记录(wz01@czbank.com).csv"); +// writeCVS(ret, "E:\\鏁版嵁瀵煎嚭\\鎴夸环閫氭暟鎹甛\浼颁环璁板綍(wz01@czbank.com).csv"); // def ret = findDownedEvaluation(191588); -// writeCVS(ret, "E:\\数据导出\\房价通数据\\下载记录(sh01@czbank.com).csv"); +// writeCVS(ret, "E:\\鏁版嵁瀵煎嚭\\鎴夸环閫氭暟鎹甛\涓嬭浇璁板綍(sh01@czbank.com).csv"); // def ret = findDownedEvaluation(191589); -// writeCVS(ret, "E:\\数据导出\\房价通数据\\下载记录(wz01@czbank.com).csv"); +// writeCVS(ret, "E:\\鏁版嵁瀵煎嚭\\鎴夸环閫氭暟鎹甛\涓嬭浇璁板綍(wz01@czbank.com).csv"); // def ret = findAddressMatch("sh01@czbank.com"); -// writeCVS1(ret, "E:\\数据导出\\房价通数据\\匹配记录(sh01@czbank.com).csv"); +// writeCVS1(ret, "E:\\鏁版嵁瀵煎嚭\\鎴夸环閫氭暟鎹甛\鍖归厤璁板綍(sh01@czbank.com).csv"); def ret = findAddressMatch("wz01@czbank.com"); - writeCVS1(ret, "E:\\数据导出\\房价通数据\\匹配记录(wz01@czbank.com).csv"); + writeCVS1(ret, "E:\\鏁版嵁瀵煎嚭\\鎴夸环閫氭暟鎹甛\鍖归厤璁板綍(wz01@czbank.com).csv"); } def writeCVS(def ret, def path){ @@ -47,11 +47,11 @@ class FjtData { if (file.exists()){ file.delete(); } - file.append("城市,") - file.append("区域,") - file.append("楼盘名称,") - file.append("地址,") - file.append("估价时间,") + file.append("鍩庡競,") + file.append("鍖哄煙,") + file.append("妤肩洏鍚嶇О,") + file.append("鍦板潃,") + file.append("浼颁环鏃堕棿,") file.append(System.getProperty("line.separator")); def index = 0; @@ -73,11 +73,11 @@ class FjtData { if (file.exists()){ file.delete(); } - file.append("城市,") - file.append("用户输入,") - file.append("估价时间,") - file.append("匹配区域,") - file.append("匹配名称,") + file.append("鍩庡競,") + file.append("鐢ㄦ埛杈撳叆,") + file.append("浼颁环鏃堕棿,") + file.append("鍖归厤鍖哄煙,") + file.append("鍖归厤鍚嶇О,") file.append(System.getProperty("line.separator")); def index = 0; @@ -135,7 +135,7 @@ class FjtData { def findAddressMatch(def email){ DBObject q = new BasicDBObject(); - q.put("source", "房价通"); + q.put("source", "鎴夸环閫�"); q.put("user_name",email); def dbCursor = addressMatchLogColl.find(q) def ret = []; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/FjtDownLoad.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/FjtDownLoad.groovy index 8ed384542..5547c12ad 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/FjtDownLoad.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/FjtDownLoad.groovy @@ -51,7 +51,7 @@ class FjtDownLoad { rMap.down_date_created = it.date_created rMap.reconcile = it.reconcile if(it.charge){ - rMap.put("charge", it.charge + "元"); + rMap.put("charge", it.charge + "鍏�"); } def eval = onLineSqlInstance.firstRow("select * from evaluation where id="+evalautionId); @@ -73,12 +73,12 @@ class FjtDownLoad { if(audit){ rMap.put("user_name", audit.user_name); rMap.put("company",audit.company); - rMap.put("total_price", audit.total_price+ "万元"); + rMap.put("total_price", audit.total_price+ "涓囧厓"); if(audit.deal_price){ - rMap.put("deal_price", audit.deal_price + "万元"); + rMap.put("deal_price", audit.deal_price + "涓囧厓"); } if(audit.audit_price){ - rMap.put("audit_price",audit.audit_price + "万元"); + rMap.put("audit_price",audit.audit_price + "涓囧厓"); } if(audit.audit_date){ rMap.put("audit_date",audit.audit_date.toString().split(" ")[0]); @@ -92,7 +92,7 @@ class FjtDownLoad { }); - exportExcel(ret, "e:\\数据\\农行下载\\"+startDate+"("+email+").xls"); + exportExcel(ret, "e:\\鏁版嵁\\鍐滆涓嬭浇\\"+startDate+"("+email+").xls"); println startDate +"("+email+").xls" } @@ -105,9 +105,9 @@ class FjtDownLoad { File file = new File(path); try { - def columns = ["城市","输入","地址","用户名","公司","总价","估价日期","输入成交价","终审价格","审核时间","报告费用","下载时间","角色","主贷人","身份证","对账情况","面积"]; + def columns = ["鍩庡競","杈撳叆","鍦板潃","鐢ㄦ埛鍚�","鍏徃","鎬讳环","浼颁环鏃ユ湡","杈撳叆鎴愪氦浠�","缁堝浠锋牸","瀹℃牳鏃堕棿","鎶ュ憡璐圭敤","涓嬭浇鏃堕棿","瑙掕壊","涓昏捶浜�","韬唤璇�","瀵硅处鎯呭喌","闈㈢Н"]; HSSFWorkbook wb= new HSSFWorkbook(); - Sheet sheet = wb.createSheet("审核价格"); + Sheet sheet = wb.createSheet("瀹℃牳浠锋牸"); Row row = sheet.createRow(0); for(int i =0 ;i < columns.size() ; i++){ row.createCell(i).setCellValue(columns[i]); @@ -121,7 +121,7 @@ class FjtDownLoad { row.createCell(2).setCellValue(map.address); row.createCell(3).setCellValue(map.email); row.createCell(4).setCellValue(map.company); - row.createCell(5).setCellValue(map.total_price+ "万元"); + row.createCell(5).setCellValue(map.total_price+ "涓囧厓"); row.createCell(6).setCellValue(map.evaluation_date); row.createCell(7).setCellValue(map.deal_price); @@ -129,7 +129,7 @@ class FjtDownLoad { row.createCell(9).setCellValue(map.audit_date); row.createCell(10).setCellValue(map.charge); row.createCell(11).setCellValue(map.down_date_created); - row.createCell(12).setCellValue("农行"); + row.createCell(12).setCellValue("鍐滆"); row.createCell(13).setCellValue(map.leader); row.createCell(14).setCellValue(map.card_id); row.createCell(15).setCellValue(map.reconcile); @@ -152,10 +152,10 @@ class FjtDownLoad { address = address + eval.address; } if(eval.house_num){ - address = address + eval.house_num+"栋"; + address = address + eval.house_num+"鏍�"; } if(eval.room_num){ - address = address + eval.room_num+"室"; + address = address + eval.room_num+"瀹�"; } return address; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/HanFenExport.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/HanFenExport.groovy index 762bd9405..caba10d93 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/HanFenExport.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/HanFenExport.groovy @@ -36,7 +36,7 @@ class HanFenExport { } def districtRun(){ - def fileDatas = DataHandleUtils.readExcel("e:\\数据\\腾讯小区.xls"); + def fileDatas = DataHandleUtils.readExcel("e:\\鏁版嵁\\鑵捐灏忓尯.xls"); for(def m : fileDatas){ def dbo = CommonDatautils.findSeaweed(m.city, m.region, m.districtName, "district"); def lat = null; @@ -45,22 +45,22 @@ class HanFenExport { lat = dbo.lat/10000000000.0; lng = dbo.lng/10000000000.0; } - def total = CommonDatautils.findQQPoiCount("住宅",lat, lng, 1000); + def total = CommonDatautils.findQQPoiCount("浣忓畢",lat, lng, 1000); def maxPage = total/20; if(total%20>0){ maxPage = maxPage.toInteger() + 1 }else{ maxPage = maxPage.toInteger(); } - def datas = CommonDatautils.findQQPoiLists("住宅",lat, lng, 1000, maxPage) + def datas = CommonDatautils.findQQPoiLists("浣忓畢",lat, lng, 1000, maxPage) m.districts = datas; } - excelDistrict(fileDatas, "e:\\数据\\腾讯小区结果.xls"); + excelDistrict(fileDatas, "e:\\鏁版嵁\\鑵捐灏忓尯缁撴灉.xls"); } def addDataRun(){ - def fileDatas = DataHandleUtils.readExcel("e:\\数据\\新增小区20160825.xlsx"); + def fileDatas = DataHandleUtils.readExcel("e:\\鏁版嵁\\鏂板灏忓尯20160825.xlsx"); def citys = CommonDatautils.findAllCity(); def ret = []; for(def m : fileDatas){ @@ -75,33 +75,33 @@ class HanFenExport { city = standardCity(city, citys, county); } - def region = m.get("匹配区域"); - def districtName = m.get("匹配名称"); + def region = m.get("鍖归厤鍖哄煙"); + def districtName = m.get("鍖归厤鍚嶇О"); - if(!m.get("小区均价")){ - //小区均价 + if(!m.get("灏忓尯鍧囦环")){ + //灏忓尯鍧囦环 def avgPrice = findDistrictPrice(city, region, districtName); if(avgPrice){ - m.put("小区均价", avgPrice); + m.put("灏忓尯鍧囦环", avgPrice); } } - if(!m.get("租金(按户型)")){ + if(!m.get("绉熼噾锛堟寜鎴峰瀷锛�")){ def rent_price = findDistrictRent(city, region, districtName); if(rent_price){ - m.put("租金(按户型)", rent_price); + m.put("绉熼噾锛堟寜鎴峰瀷锛�", rent_price); } } - if(m.get("小区均价")){ - def markup = findDistrictPriceMarkup(city, region, districtName, m.get("小区均价")); + if(m.get("灏忓尯鍧囦环")){ + def markup = findDistrictPriceMarkup(city, region, districtName, m.get("灏忓尯鍧囦环")); if(markup){ - m.put("过去一年涨跌幅(均价)", markup); + m.put("杩囧幓涓�骞存定璺屽箙锛堝潎浠凤級", markup); } } - //物业类型 建造年代 开发商 物业公司 物业费 + //鐗╀笟绫诲瀷 寤洪�犲勾浠� 寮�鍙戝晢 鐗╀笟鍏徃 鐗╀笟璐� def estate_type = null; def build_date = null; def developer = null; @@ -134,11 +134,11 @@ class HanFenExport { } - m.put("物业类型",estate_type); - m.put("建造年代",build_date); - m.put("开发商",developer); - m.put("物业公司",estate_company); - m.put("物业费",estate_charge); + m.put("鐗╀笟绫诲瀷",estate_type); + m.put("寤洪�犲勾浠�",build_date); + m.put("寮�鍙戝晢",developer); + m.put("鐗╀笟鍏徃",estate_company); + m.put("鐗╀笟璐�",estate_charge); @@ -154,22 +154,22 @@ class HanFenExport { } m = getArroundPoiCount( lat, lng, 1000, m); - //周边1公里人均餐饮消费金额 + //鍛ㄨ竟1鍏噷浜哄潎椁愰ギ娑堣垂閲戦 - def avg_consum = findAroundAvgConsumption(lat, lng, "美食"); - m.put("周边1公里人均餐饮消费金额", avg_consum); + def avg_consum = findAroundAvgConsumption(lat, lng, "缇庨"); + m.put("鍛ㄨ竟1鍏噷浜哄潎椁愰ギ娑堣垂閲戦", avg_consum); ret << m; if(ret.size()==1){ break; } } - exportExcel2(ret, "e:\\数据\\憨分科技44.xls"); + exportExcel2(ret, "e:\\鏁版嵁\\鎲ㄥ垎绉戞妧44.xls"); } def run(){ - def fileDatas = DataHandleUtils.readExcel("e:\\数据\\房价网测试数据-憨分科技-原始副本.xlsx"); + def fileDatas = DataHandleUtils.readExcel("e:\\鏁版嵁\\鎴夸环缃戞祴璇曟暟鎹�-鎲ㄥ垎绉戞妧-鍘熷鍓湰.xlsx"); def citys = CommonDatautils.findAllCity(); DistrictAddressPOIBatch addressPoi = new DistrictAddressPOIBatch(); @@ -214,13 +214,13 @@ class HanFenExport { resultMap.address = address; resultMap.region = region; resultMap.districtName = districtName; - //小区均价 + //灏忓尯鍧囦环 resultMap.avgPrice = findDistrictPrice(city, region, districtName); - //当前城市均价 + //褰撳墠鍩庡競鍧囦环 resultMap.cityPrice = CommonDatautils.findCityPrice(city, null); - //租金(按户型) + //绉熼噾锛堟寜鎴峰瀷锛� resultMap.rent_price = findDistrictRent(city, region, districtName); - //过去一年涨跌幅(均价) + //杩囧幓涓�骞存定璺屽箙锛堝潎浠凤級 resultMap.markup = findDistrictPriceMarkup(city, region, districtName, resultMap.avgPrice); if(!lng && !lat){ @@ -235,11 +235,11 @@ class HanFenExport { } resultMap = getArroundPoiCount( lat, lng, 1000, resultMap); - //周边1公里人均餐饮消费金额 + //鍛ㄨ竟1鍏噷浜哄潎椁愰ギ娑堣垂閲戦 - resultMap.avg_consum = findAroundAvgConsumption(lat, lng, "美食"); + resultMap.avg_consum = findAroundAvgConsumption(lat, lng, "缇庨"); - //物业类型 建造年代 开发商 物业公司 物业费 + //鐗╀笟绫诲瀷 寤洪�犲勾浠� 寮�鍙戝晢 鐗╀笟鍏徃 鐗╀笟璐� def estate_type = null; def build_date = null; def developer = null; @@ -277,7 +277,7 @@ class HanFenExport { } - exportExcel(ret, "e:\\数据\\憨分科技.xls"); + exportExcel(ret, "e:\\鏁版嵁\\鎲ㄥ垎绉戞妧.xls"); } def findDistrictPrice(def city, def region, def name){ @@ -316,10 +316,10 @@ class HanFenExport { for(def map : roomPrices){ if(room == map.houseType){ if(roomInfo){ - roomInfo = roomInfo + " "+map.houseType +"室:"+map.price; + roomInfo = roomInfo + " "+map.houseType +"瀹�:"+map.price; break; }else{ - roomInfo = map.houseType +"室:"+map.price; + roomInfo = map.houseType +"瀹�:"+map.price; break; } } @@ -359,9 +359,9 @@ class HanFenExport { def standardCity(def city, def citys, def county){ - city = city.replace("藏族自治","").replace("彝族自治","").replace("傈僳族自治","") - if(city.toString().endsWith("市")){ - city = city.toString().substring(0, city.indexOf("市")); + city = city.replace("钘忔棌鑷不","").replace("褰濇棌鑷不","").replace("鍌堝兂鏃忚嚜娌�","") + if(city.toString().endsWith("甯�")){ + city = city.toString().substring(0, city.indexOf("甯�")); } if(citys.contains(city)){ @@ -411,32 +411,32 @@ class HanFenExport { } def getArroundPoiCount(lat, lng, radius, resultMap){ - //ktv 电影院 健身中心 综合商场 美容院 星级酒店 大型超市 高尔夫球场 私立学校 整容整形 - //咖啡厅 洗浴 地铁站 公交点 医院 学校 写字楼 银行/ATM 超市 公园/绿地 停车场 机场 网吧 + //ktv 鐢靛奖闄� 鍋ヨ韩涓績 缁煎悎鍟嗗満 缇庡闄� 鏄熺骇閰掑簵 澶у瀷瓒呭競 楂樺皵澶悆鍦� 绉佺珛瀛︽牎 鏁村鏁村舰 + //鍜栧暋鍘� 娲楁荡 鍦伴搧绔� 鍏氦鐐� 鍖婚櫌 瀛︽牎 鍐欏瓧妤� 閾惰/ATM 瓒呭競 鍏洯/缁垮湴 鍋滆溅鍦� 鏈哄満 缃戝惂 if(lat && lng){ resultMap.ktv_count = CommonDatautils.findQQPoiCount("ktv", lat, lng, radius); - resultMap.dianyinyuan_count = CommonDatautils.findQQPoiCount("电影院", lat, lng, radius); - resultMap.jianshen_count = CommonDatautils.findQQPoiCount("健身中心", lat, lng, radius); - resultMap.market_count = CommonDatautils.findQQPoiCount("综合商场", lat, lng, radius); - resultMap.meirong_count = CommonDatautils.findQQPoiCount("美容院", lat, lng, radius); - resultMap.hotal_count = CommonDatautils.findQQPoiCount("星级酒店", lat, lng, radius); - resultMap.supermarket_count = CommonDatautils.findQQPoiCount("大型超市", lat, lng, radius); - resultMap.gaoerfu_count = CommonDatautils.findQQPoiCount("高尔夫球场", lat, lng, radius); - resultMap.slschool_count = CommonDatautils.findQQPoiCount("私立学校", lat, lng, radius); - resultMap.coffe_count = CommonDatautils.findQQPoiCount("咖啡厅", lat, lng, radius); - resultMap.zrzx_count = CommonDatautils.findQQPoiCount("整容整形", lat, lng, radius); - resultMap.xiru_count = CommonDatautils.findQQPoiCount("洗浴", lat, lng, radius); - resultMap.subway_count = CommonDatautils.findQQPoiCount("地铁站", lat, lng, radius); - resultMap.bus_count = CommonDatautils.findQQPoiCount("公交点", lat, lng, radius); - resultMap.hosptail_count = CommonDatautils.findQQPoiCount("医院", lat, lng, radius); - resultMap.school_count = CommonDatautils.findQQPoiCount("学校", lat, lng, radius); - resultMap.office_count = CommonDatautils.findQQPoiCount("写字楼", lat, lng, radius); - resultMap.blank_count = CommonDatautils.findQQPoiCount("银行/ATM", lat, lng, radius); - resultMap.shop_count = CommonDatautils.findQQPoiCount("超市", lat, lng, radius); - resultMap.park_count = CommonDatautils.findQQPoiCount("公园/绿地", lat, lng, radius); - resultMap.stopcar_count = CommonDatautils.findQQPoiCount("停车场", lat, lng, radius); - resultMap.air_count = CommonDatautils.findQQPoiCount("机场", lat, lng, radius); - resultMap.wangba_count = CommonDatautils.findQQPoiCount("网吧", lat, lng, radius); + resultMap.dianyinyuan_count = CommonDatautils.findQQPoiCount("鐢靛奖闄�", lat, lng, radius); + resultMap.jianshen_count = CommonDatautils.findQQPoiCount("鍋ヨ韩涓績", lat, lng, radius); + resultMap.market_count = CommonDatautils.findQQPoiCount("缁煎悎鍟嗗満", lat, lng, radius); + resultMap.meirong_count = CommonDatautils.findQQPoiCount("缇庡闄�", lat, lng, radius); + resultMap.hotal_count = CommonDatautils.findQQPoiCount("鏄熺骇閰掑簵", lat, lng, radius); + resultMap.supermarket_count = CommonDatautils.findQQPoiCount("澶у瀷瓒呭競", lat, lng, radius); + resultMap.gaoerfu_count = CommonDatautils.findQQPoiCount("楂樺皵澶悆鍦�", lat, lng, radius); + resultMap.slschool_count = CommonDatautils.findQQPoiCount("绉佺珛瀛︽牎", lat, lng, radius); + resultMap.coffe_count = CommonDatautils.findQQPoiCount("鍜栧暋鍘�", lat, lng, radius); + resultMap.zrzx_count = CommonDatautils.findQQPoiCount("鏁村鏁村舰", lat, lng, radius); + resultMap.xiru_count = CommonDatautils.findQQPoiCount("娲楁荡", lat, lng, radius); + resultMap.subway_count = CommonDatautils.findQQPoiCount("鍦伴搧绔�", lat, lng, radius); + resultMap.bus_count = CommonDatautils.findQQPoiCount("鍏氦鐐�", lat, lng, radius); + resultMap.hosptail_count = CommonDatautils.findQQPoiCount("鍖婚櫌", lat, lng, radius); + resultMap.school_count = CommonDatautils.findQQPoiCount("瀛︽牎", lat, lng, radius); + resultMap.office_count = CommonDatautils.findQQPoiCount("鍐欏瓧妤�", lat, lng, radius); + resultMap.blank_count = CommonDatautils.findQQPoiCount("閾惰/ATM", lat, lng, radius); + resultMap.shop_count = CommonDatautils.findQQPoiCount("瓒呭競", lat, lng, radius); + resultMap.park_count = CommonDatautils.findQQPoiCount("鍏洯/缁垮湴", lat, lng, radius); + resultMap.stopcar_count = CommonDatautils.findQQPoiCount("鍋滆溅鍦�", lat, lng, radius); + resultMap.air_count = CommonDatautils.findQQPoiCount("鏈哄満", lat, lng, radius); + resultMap.wangba_count = CommonDatautils.findQQPoiCount("缃戝惂", lat, lng, radius); } return resultMap; @@ -483,7 +483,7 @@ class HanFenExport { FileOutputStream fos = null; try { HSSFWorkbook WORK_BOOK = new HSSFWorkbook(); - HSSFSheet sheet = WORK_BOOK.createSheet("数据"); + HSSFSheet sheet = WORK_BOOK.createSheet("鏁版嵁"); setExcelHeader(sheet, WORK_BOOK); @@ -588,105 +588,105 @@ class HanFenExport { sheet.addMergedRegion(new CellRangeAddress(0, 1, 5, 5)); HSSFCell cell5 = row.createCell(5); - cell5.setCellValue("小区均价") + cell5.setCellValue("灏忓尯鍧囦环") cell5.setCellStyle(cellStyle) sheet.addMergedRegion(new CellRangeAddress(0, 1, 6, 6)); HSSFCell cell6 = row.createCell(6); - cell6.setCellValue("当前城市均价") + cell6.setCellValue("褰撳墠鍩庡競鍧囦环") cell6.setCellStyle(cellStyle) sheet.addMergedRegion(new CellRangeAddress(0, 1, 7, 7)); HSSFCell cell7 = row.createCell(7); - cell7.setCellValue("租金(按户型)") + cell7.setCellValue("绉熼噾锛堟寜鎴峰瀷锛�") cell7.setCellStyle(cellStyle) sheet.addMergedRegion(new CellRangeAddress(0, 1, 8, 8)); HSSFCell cell8 = row.createCell(8); - cell8.setCellValue("过去一年涨跌幅(均价)") + cell8.setCellValue("杩囧幓涓�骞存定璺屽箙锛堝潎浠凤級") cell8.setCellStyle(cellStyle) sheet.addMergedRegion(new CellRangeAddress(0, 1, 9, 9)); HSSFCell cell9 = row.createCell(9); - cell9.setCellValue("周边1公里人均餐饮消费金额") + cell9.setCellValue("鍛ㄨ竟1鍏噷浜哄潎椁愰ギ娑堣垂閲戦") cell9.setCellStyle(cellStyle) sheet.addMergedRegion(new CellRangeAddress(0, 0, 10, 21)); HSSFCell cell10 = row.createCell(10); - cell10.setCellValue("周边1公里消费场所(返回对应的数量)") + cell10.setCellValue("鍛ㄨ竟1鍏噷娑堣垂鍦烘墍锛堣繑鍥炲搴旂殑鏁伴噺锛�") cell10.setCellStyle(cellStyle) HSSFRow row1 = sheet.createRow(1); row1.createCell(10).setCellValue("ktv"); - row1.createCell(11).setCellValue("电影院"); - row1.createCell(12).setCellValue("健身中心"); - row1.createCell(13).setCellValue("综合商场"); - row1.createCell(14).setCellValue("美容院"); - row1.createCell(15).setCellValue("星级酒店"); - row1.createCell(16).setCellValue("大型超市"); - row1.createCell(17).setCellValue("高尔夫球场"); - row1.createCell(18).setCellValue("私立学校"); - row1.createCell(19).setCellValue("整容整形"); - row1.createCell(20).setCellValue("咖啡厅"); - row1.createCell(21).setCellValue("洗浴"); + row1.createCell(11).setCellValue("鐢靛奖闄�"); + row1.createCell(12).setCellValue("鍋ヨ韩涓績"); + row1.createCell(13).setCellValue("缁煎悎鍟嗗満"); + row1.createCell(14).setCellValue("缇庡闄�"); + row1.createCell(15).setCellValue("鏄熺骇閰掑簵"); + row1.createCell(16).setCellValue("澶у瀷瓒呭競"); + row1.createCell(17).setCellValue("楂樺皵澶悆鍦�"); + row1.createCell(18).setCellValue("绉佺珛瀛︽牎"); + row1.createCell(19).setCellValue("鏁村鏁村舰"); + row1.createCell(20).setCellValue("鍜栧暋鍘�"); + row1.createCell(21).setCellValue("娲楁荡"); sheet.addMergedRegion(new CellRangeAddress(0, 0, 22, 32)); HSSFCell cell11 = row.createCell(22); - cell11.setCellValue("周边1公里配套场所(返回对应数量)") + cell11.setCellValue("鍛ㄨ竟1鍏噷閰嶅鍦烘墍锛堣繑鍥炲搴旀暟閲忥級") cell11.setCellStyle(cellStyle) - row1.createCell(22).setCellValue("地铁站"); - row1.createCell(23).setCellValue("公交点"); - row1.createCell(24).setCellValue("医院"); - row1.createCell(25).setCellValue("学校"); - row1.createCell(26).setCellValue("写字楼"); - row1.createCell(27).setCellValue("银行/ATM"); - row1.createCell(28).setCellValue("超市"); - row1.createCell(29).setCellValue("公园/绿地"); - row1.createCell(30).setCellValue("停车场"); - row1.createCell(31).setCellValue("机场"); - row1.createCell(32).setCellValue("网吧"); + row1.createCell(22).setCellValue("鍦伴搧绔�"); + row1.createCell(23).setCellValue("鍏氦鐐�"); + row1.createCell(24).setCellValue("鍖婚櫌"); + row1.createCell(25).setCellValue("瀛︽牎"); + row1.createCell(26).setCellValue("鍐欏瓧妤�"); + row1.createCell(27).setCellValue("閾惰/ATM"); + row1.createCell(28).setCellValue("瓒呭競"); + row1.createCell(29).setCellValue("鍏洯/缁垮湴"); + row1.createCell(30).setCellValue("鍋滆溅鍦�"); + row1.createCell(31).setCellValue("鏈哄満"); + row1.createCell(32).setCellValue("缃戝惂"); sheet.addMergedRegion(new CellRangeAddress(0, 1, 33, 33)); HSSFCell cell12 = row.createCell(33); - cell12.setCellValue("物业类型") + cell12.setCellValue("鐗╀笟绫诲瀷") cell12.setCellStyle(cellStyle) sheet.addMergedRegion(new CellRangeAddress(0, 1, 34, 34)); HSSFCell cell13 = row.createCell(34); - cell13.setCellValue("建造年代") + cell13.setCellValue("寤洪�犲勾浠�") cell13.setCellStyle(cellStyle) sheet.addMergedRegion(new CellRangeAddress(0, 1, 35, 35)); HSSFCell cell14 = row.createCell(35); - cell14.setCellValue("开发商") + cell14.setCellValue("寮�鍙戝晢") cell14.setCellStyle(cellStyle) sheet.addMergedRegion(new CellRangeAddress(0, 1, 36, 36)); HSSFCell cell15 = row.createCell(36); - cell15.setCellValue("物业公司") + cell15.setCellValue("鐗╀笟鍏徃") cell15.setCellStyle(cellStyle) sheet.addMergedRegion(new CellRangeAddress(0, 1, 37, 37)); HSSFCell cell16 = row.createCell(37); - cell16.setCellValue("物业费") + cell16.setCellValue("鐗╀笟璐�") cell16.setCellStyle(cellStyle) sheet.addMergedRegion(new CellRangeAddress(0, 1, 38, 38)); HSSFCell cell17 = row.createCell(38); - cell17.setCellValue("匹配区域") + cell17.setCellValue("鍖归厤鍖哄煙") cell17.setCellStyle(cellStyle) sheet.addMergedRegion(new CellRangeAddress(0, 1, 39, 39)); HSSFCell cell18 = row.createCell(39); - cell18.setCellValue("匹配名称") + cell18.setCellValue("鍖归厤鍚嶇О") cell18.setCellStyle(cellStyle) } @@ -723,7 +723,7 @@ class HanFenExport { conn.setRequestMethod("GET"); conn.doOutput = true inputStream = conn.getInputStream(); - BufferedReader buf = new BufferedReader(new InputStreamReader(inputStream,"UTF-8"));// 创建UTF-8的BufferedReader + BufferedReader buf = new BufferedReader(new InputStreamReader(inputStream,"UTF-8"));// 鍒涘缓UTF-8鐨凚ufferedReader while((line = buf.readLine())!=null){ sb.append(line); } @@ -763,7 +763,7 @@ class HanFenExport { FileOutputStream fos = null; try { HSSFWorkbook WORK_BOOK = new HSSFWorkbook(); - HSSFSheet sheet = WORK_BOOK.createSheet("数据"); + HSSFSheet sheet = WORK_BOOK.createSheet("鏁版嵁"); setExcelHeader(sheet, WORK_BOOK); @@ -777,11 +777,11 @@ class HanFenExport { row.createCell(2).setCellValue(resultMap.get("city_")) ; row.createCell(3).setCellValue(resultMap.get("county_")); row.createCell(4).setCellValue(resultMap.get("home_address_")); - row.createCell(5).setCellValue(resultMap.get("小区均价")); - row.createCell(6).setCellValue(resultMap.get("当前城市均价")); - row.createCell(7).setCellValue(resultMap.get("租金(按户型)")); - row.createCell(8).setCellValue(resultMap.get("过去一年涨跌幅(均价)")); - row.createCell(9).setCellValue(resultMap.get("周边1公里人均餐饮消费金额")); + row.createCell(5).setCellValue(resultMap.get("灏忓尯鍧囦环")); + row.createCell(6).setCellValue(resultMap.get("褰撳墠鍩庡競鍧囦环")); + row.createCell(7).setCellValue(resultMap.get("绉熼噾锛堟寜鎴峰瀷锛�")); + row.createCell(8).setCellValue(resultMap.get("杩囧幓涓�骞存定璺屽箙锛堝潎浠凤級")); + row.createCell(9).setCellValue(resultMap.get("鍛ㄨ竟1鍏噷浜哄潎椁愰ギ娑堣垂閲戦")); row.createCell(10).setCellValue(resultMap.ktv_count); row.createCell(11).setCellValue(resultMap.dianyinyuan_count); row.createCell(12).setCellValue(resultMap.jianshen_count); @@ -805,13 +805,13 @@ class HanFenExport { row.createCell(30).setCellValue(resultMap.stopcar_count); row.createCell(31).setCellValue(resultMap.air_count); row.createCell(32).setCellValue(resultMap.wangba_count); - row.createCell(33).setCellValue(resultMap.get("物业类型")!=null?resultMap.get("物业类型"):''); - row.createCell(34).setCellValue(resultMap.get("建造年代")!=null?resultMap.get("建造年代"):''); - row.createCell(35).setCellValue(resultMap.get("开发商")!=null?resultMap.get("开发商"):''); - row.createCell(36).setCellValue(resultMap.get("物业公司")!=null?resultMap.get("物业公司"):''); - row.createCell(37).setCellValue(resultMap.get("物业费")!=null?resultMap.get("物业费"):''); - row.createCell(38).setCellValue(resultMap.get("匹配区域")!=null?resultMap.get("匹配区域"):''); - row.createCell(39).setCellValue(resultMap.get("匹配名称")!=null?resultMap.get("匹配名称"):''); + row.createCell(33).setCellValue(resultMap.get("鐗╀笟绫诲瀷")!=null?resultMap.get("鐗╀笟绫诲瀷"):''); + row.createCell(34).setCellValue(resultMap.get("寤洪�犲勾浠�")!=null?resultMap.get("寤洪�犲勾浠�"):''); + row.createCell(35).setCellValue(resultMap.get("寮�鍙戝晢")!=null?resultMap.get("寮�鍙戝晢"):''); + row.createCell(36).setCellValue(resultMap.get("鐗╀笟鍏徃")!=null?resultMap.get("鐗╀笟鍏徃"):''); + row.createCell(37).setCellValue(resultMap.get("鐗╀笟璐�")!=null?resultMap.get("鐗╀笟璐�"):''); + row.createCell(38).setCellValue(resultMap.get("鍖归厤鍖哄煙")!=null?resultMap.get("鍖归厤鍖哄煙"):''); + row.createCell(39).setCellValue(resultMap.get("鍖归厤鍚嶇О")!=null?resultMap.get("鍖归厤鍚嶇О"):''); } fos = new FileOutputStream(file); @@ -836,14 +836,14 @@ class HanFenExport { FileOutputStream fos = null; try { HSSFWorkbook WORK_BOOK = new HSSFWorkbook(); - HSSFSheet sheet = WORK_BOOK.createSheet("数据"); + HSSFSheet sheet = WORK_BOOK.createSheet("鏁版嵁"); HSSFRow row0 = sheet.createRow(0); - row0.createCell(0).setCellValue("城市"); - row0.createCell(1).setCellValue("区域"); - row0.createCell(2).setCellValue("名称"); - row0.createCell(3).setCellValue("腾讯小区"); - row0.createCell(4).setCellValue("地址"); + row0.createCell(0).setCellValue("鍩庡競"); + row0.createCell(1).setCellValue("鍖哄煙"); + row0.createCell(2).setCellValue("鍚嶇О"); + row0.createCell(3).setCellValue("鑵捐灏忓尯"); + row0.createCell(4).setCellValue("鍦板潃"); for(def i=0;i if(index>=1){ def rowNum = row.getRowNum(); @@ -309,7 +309,7 @@ class ImportCZExcel { ret.name = row.getCell(1).toString(); def alias = row.getCell(2).toString(); - alias = alias.split(",") + alias = alias.split("锛�") ret.alias = Arrays.asList(alias); ret.address = row.getCell(3).toString(); @@ -375,21 +375,21 @@ class ImportCZExcel { ret << map; } - File file = new File("e:\\常州2016-07-01后新增小区.csv"); + File file = new File("e:\\甯稿窞2016-07-01鍚庢柊澧炲皬鍖�.csv"); if (file.exists()){ file.delete(); } - file.append("城市,") - file.append("区域,") - file.append("小区名称,") - file.append("地址,") - file.append("物业类型,") - file.append("物业费,") - file.append("绿化率,") - file.append("容积率,") - file.append("物业公司,") - file.append("开发商,") - file.append("创建时间,") + file.append("鍩庡競,") + file.append("鍖哄煙,") + file.append("灏忓尯鍚嶇О,") + file.append("鍦板潃,") + file.append("鐗╀笟绫诲瀷,") + file.append("鐗╀笟璐�,") + file.append("缁垮寲鐜�,") + file.append("瀹圭Н鐜�,") + file.append("鐗╀笟鍏徃,") + file.append("寮�鍙戝晢,") + file.append("鍒涘缓鏃堕棿,") file.append(System.getProperty("line.separator")); for(def m : ret){ @@ -447,10 +447,10 @@ class ImportCZExcel { if (file.exists()){ file.delete(); } - file.append("城市,") - file.append("区域,") - file.append("小区名称,") - file.append("数量,") + file.append("鍩庡競,") + file.append("鍖哄煙,") + file.append("灏忓尯鍚嶇О,") + file.append("鏁伴噺,") file.append(System.getProperty("line.separator")); for(def m : result){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/ImportDatastore.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/ImportDatastore.groovy index 9e1c4536a..b2a44231e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/ImportDatastore.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/ImportDatastore.groovy @@ -21,7 +21,7 @@ class ImportDatastore extends BaseBatch{ DBObject q1 = new BasicDBObject() q1.put('if_cpc', 1) q1.put('visible', 0) - q1.put('city', '北京') + q1.put('city', '鍖椾含') q1.put('cat', 'sell') def count = 0 diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/KeKouKeLeDataExport.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/KeKouKeLeDataExport.groovy index 447c481cb..8d9fa0371 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/KeKouKeLeDataExport.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/KeKouKeLeDataExport.groovy @@ -45,12 +45,12 @@ class KeKouKeLeDataExport { def task = new KeKouKeLeDataExport(); //task.run(); - //临时导某点周边小区数及房子数 + //涓存椂瀵兼煇鐐瑰懆杈瑰皬鍖烘暟鍙婃埧瀛愭暟 task.findArroundInfo(); } def run(){ - def citys = ["杭州"]//FileUtils.readLines(new File("E:\\高娟\\可口可乐城市.txt"),"utf-8") + def citys = ["鏉窞"]//FileUtils.readLines(new File("E:\\楂樺\\鍙彛鍙箰鍩庡競.txt"),"utf-8") createDatas(citys) } @@ -59,20 +59,20 @@ class KeKouKeLeDataExport { def index = 1; for(def city : citys){ - city = city.replace("市",""); - println city+" 小区 loading 开始...."+new Date(); + city = city.replace("甯�",""); + println city+" 灏忓尯銆�loading 寮�濮嬶紟锛庯紟锛�"+new Date(); def districts = CommonDatautils.getAllDistricts("district", city); - println city+" 小区 loading 完成...."+new Date(); + println city+" 灏忓尯銆�loading 瀹屾垚锛庯紟锛庯紟"+new Date(); def offices = CommonDatautils.getAllOffices("office", city); - println city+" 写字楼 loading 完成...."+new Date(); + println city+" 鍐欏瓧妤笺��loading 瀹屾垚锛庯紟锛庯紟"+new Date(); def commDists = findAllCommData(city, "district"); def commOffice = findAllCommData(city, "office"); - println city+" commonData loading 完成...."+new Date(); + println city+" commonData銆�loading 瀹屾垚锛庯紟锛庯紟"+new Date(); def rets = findResultDatas(districts, offices, commDists, commOffice); - exportExcel(rets, "E:\\高娟\\可口可乐\\"+city+".xls"); + exportExcel(rets, "E:\\楂樺\\鍙彛鍙箰\\"+city+".xls"); } } @@ -93,7 +93,7 @@ class KeKouKeLeDataExport { index++; m.num = index; m.name = dist.name; - m.kind = "物业小区"; + m.kind = "鐗╀笟灏忓尯"; m.region = dist.region; def num = DataHandleUtils.findPattern(dist.address, "(\\d+)"); @@ -107,7 +107,7 @@ class KeKouKeLeDataExport { m.buildDate = dist.build_date; - m.proType = "住宅"; + m.proType = "浣忓畢"; if(dist.lat2 && dist.lng2){ m.lat = dist.lat2/10000000000.0; m.lng = dist.lng2/10000000000.0; @@ -123,7 +123,7 @@ class KeKouKeLeDataExport { m.rentPrice = getDistrictRentRange(dist) m.total_office_count = findHouseCountInRangeInfos(dist.city, "office", m.lat, m.lng, offices, commDists, commOffice); m.total_house_count = findHouseCountInRangeInfos(dist.city, "district", m.lat, m.lng, districts, commDists, commOffice); - m.avg_consum = findAroundAvgConsumption(m.lat, m.lng, "餐厅"); + m.avg_consum = findAroundAvgConsumption(m.lat, m.lng, "椁愬巺"); println ".... "+new Date() ret << m; println "[${index}]"+m @@ -286,7 +286,7 @@ class KeKouKeLeDataExport { FileOutputStream fos = null; try { HSSFWorkbook WORK_BOOK = new HSSFWorkbook(); - HSSFSheet sheet = WORK_BOOK.createSheet("数据"); + HSSFSheet sheet = WORK_BOOK.createSheet("鏁版嵁"); setExcelHeader(sheet, WORK_BOOK); @@ -331,9 +331,9 @@ class KeKouKeLeDataExport { } -// 序号 小区名 分类 行政区 道路 门牌号 建筑年代 产品类型 经度坐标 -// 纬度坐标 开发商 住宅 户数 人口密集度 办公人口数 餐饮人均消费 消费评分 -// 平均单价 平均租金 +// 搴忓彿 灏忓尯鍚� 鍒嗙被 琛屾斂鍖� 閬撹矾 闂ㄧ墝鍙� 寤虹瓚骞翠唬 浜у搧绫诲瀷 缁忓害鍧愭爣 +// 绾害鍧愭爣 寮�鍙戝晢 浣忓畢 鎴锋暟 浜哄彛瀵嗛泦搴� 鍔炲叕浜哄彛鏁� 椁愰ギ浜哄潎娑堣垂 娑堣垂璇勫垎 +// 骞冲潎鍗曚环 骞冲潎绉熼噾 def setExcelHeader(def sheet, def wb){ @@ -349,109 +349,109 @@ class KeKouKeLeDataExport { sheet.addMergedRegion(new CellRangeAddress(0, 1, 0, 0)); HSSFCell cell0 = row.createCell(0); - cell0.setCellValue("序号") + cell0.setCellValue("搴忓彿") cell0.setCellStyle(cellStyle) sheet.addMergedRegion(new CellRangeAddress(0, 1, 1, 1)); HSSFCell cell1 = row.createCell(1); - cell1.setCellValue("小区名") + cell1.setCellValue("灏忓尯鍚�") cell1.setCellStyle(cellStyle) sheet.addMergedRegion(new CellRangeAddress(0, 1, 2, 2)); HSSFCell cell2 = row.createCell(2); - cell2.setCellValue("分类") + cell2.setCellValue("鍒嗙被") cell2.setCellStyle(cellStyle) sheet.addMergedRegion(new CellRangeAddress(0, 1, 3, 3)); HSSFCell cell3 = row.createCell(3); - cell3.setCellValue("行政区") + cell3.setCellValue("琛屾斂鍖�") cell3.setCellStyle(cellStyle) sheet.addMergedRegion(new CellRangeAddress(0, 1, 4, 4)); HSSFCell cell4 = row.createCell(4); - cell4.setCellValue("道路") + cell4.setCellValue("閬撹矾") cell4.setCellStyle(cellStyle) sheet.addMergedRegion(new CellRangeAddress(0, 1, 5, 5)); HSSFCell cell5 = row.createCell(5); - cell5.setCellValue("门牌号") + cell5.setCellValue("闂ㄧ墝鍙�") cell5.setCellStyle(cellStyle) sheet.addMergedRegion(new CellRangeAddress(0, 1, 6, 6)); HSSFCell cell6 = row.createCell(6); - cell6.setCellValue("建筑年代") + cell6.setCellValue("寤虹瓚骞翠唬") cell6.setCellStyle(cellStyle) sheet.addMergedRegion(new CellRangeAddress(0, 1, 7, 7)); HSSFCell cell7 = row.createCell(7); - cell7.setCellValue("产品类型") + cell7.setCellValue("浜у搧绫诲瀷") cell7.setCellStyle(cellStyle) sheet.addMergedRegion(new CellRangeAddress(0, 1, 8, 8)); HSSFCell cell8 = row.createCell(8); - cell8.setCellValue("经度坐标") + cell8.setCellValue("缁忓害鍧愭爣") cell8.setCellStyle(cellStyle) sheet.addMergedRegion(new CellRangeAddress(0, 1, 9, 9)); HSSFCell cell9 = row.createCell(9); - cell9.setCellValue("纬度坐标") + cell9.setCellValue("绾害鍧愭爣") cell9.setCellStyle(cellStyle) sheet.addMergedRegion(new CellRangeAddress(0, 1, 10, 10)); HSSFCell cell10 = row.createCell(10); - cell10.setCellValue("开发商") + cell10.setCellValue("寮�鍙戝晢") cell10.setCellStyle(cellStyle) sheet.addMergedRegion(new CellRangeAddress(0, 0, 11, 12)); HSSFCell cell101 = row.createCell(11); - cell101.setCellValue("住宅") + cell101.setCellValue("浣忓畢") cell101.setCellStyle(cellStyle) HSSFRow row1 = sheet.createRow(1); HSSFCell cell11 = row1.createCell(11); - cell11.setCellValue("平均单价") + cell11.setCellValue("骞冲潎鍗曚环") cell11.setCellStyle(cellStyle) HSSFCell cell12 = row1.createCell(12); - cell12.setCellValue("平均租金") + cell12.setCellValue("骞冲潎绉熼噾") cell12.setCellStyle(cellStyle) sheet.addMergedRegion(new CellRangeAddress(0, 1, 13, 13)); HSSFCell cell112 = row.createCell(13); - cell112.setCellValue("户数") + cell112.setCellValue("鎴锋暟") cell112.setCellStyle(cellStyle) sheet.addMergedRegion(new CellRangeAddress(0, 1, 14, 14)); HSSFCell cell13 = row.createCell(14); - cell13.setCellValue("一公里户数") + cell13.setCellValue("涓�鍏噷鎴锋暟") cell13.setCellStyle(cellStyle) sheet.addMergedRegion(new CellRangeAddress(0, 1, 15, 15)); HSSFCell cell14 = row.createCell(15); - cell14.setCellValue("人口密集度") + cell14.setCellValue("浜哄彛瀵嗛泦搴�") cell14.setCellStyle(cellStyle) sheet.addMergedRegion(new CellRangeAddress(0, 1, 16, 16)); HSSFCell cell15 = row.createCell(16); - cell15.setCellValue("办公人口数") + cell15.setCellValue("鍔炲叕浜哄彛鏁�") cell15.setCellStyle(cellStyle) sheet.addMergedRegion(new CellRangeAddress(0, 1, 17, 17)); HSSFCell cell16 = row.createCell(17); - cell16.setCellValue("餐饮人均消费") + cell16.setCellValue("椁愰ギ浜哄潎娑堣垂") cell16.setCellStyle(cellStyle) sheet.addMergedRegion(new CellRangeAddress(0, 1, 18, 18)); HSSFCell cell17 = row.createCell(18); - cell17.setCellValue("消费评分") + cell17.setCellValue("娑堣垂璇勫垎") cell17.setCellStyle(cellStyle) } @@ -462,18 +462,18 @@ class KeKouKeLeDataExport { if (file.exists()){ file.delete(); } - file.append("序号,") - file.append("小区名,") - file.append("分类,") - file.append("行政区,") - file.append("道路,") - file.append("门牌号,") - file.append("建筑年代,") - file.append("产品类型,") - file.append("经度坐标,") - file.append("纬度坐标,") - file.append("开发商,") - file.append("均价,") + file.append("搴忓彿,") + file.append("灏忓尯鍚�,") + file.append("鍒嗙被,") + file.append("琛屾斂鍖�,") + file.append("閬撹矾,") + file.append("闂ㄧ墝鍙�,") + file.append("寤虹瓚骞翠唬,") + file.append("浜у搧绫诲瀷,") + file.append("缁忓害鍧愭爣,") + file.append("绾害鍧愭爣,") + file.append("寮�鍙戝晢,") + file.append("鍧囦环,") file.append(System.getProperty("line.separator")); rets.each{m-> file.append(m.num + ",","gbk") @@ -496,8 +496,8 @@ class KeKouKeLeDataExport { def findArroundInfo(){ - def districts = CommonDatautils.getAllDistricts("district", "上海"); - def commDists = findAllCommData("上海", "district"); + def districts = CommonDatautils.getAllDistricts("district", "涓婃捣"); + def commDists = findAllCommData("涓婃捣", "district"); def radius = 1000; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/NoPriceDistrictStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/NoPriceDistrictStat.groovy index 14f2d6240..6de572ce3 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/NoPriceDistrictStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/NoPriceDistrictStat.groovy @@ -54,7 +54,7 @@ class NoPriceDistrictStat{ def key = dbo.city + "#"+dbo.region+"#"+dbo.name; def price = map.get(key); if(!price){ - if(dbo.estate_type2=="别墅"){ + if(dbo.estate_type2=="鍒"){ price = getVillaPrice(map, dbo.region, districtMap); if(price == 0){ price = getVillaPrice(map, null, districtMap); @@ -80,7 +80,7 @@ class NoPriceDistrictStat{ } - exportMoreSheet(rett, "e:\\数据\\均价\\无均价小区计算.xls"); + exportMoreSheet(rett, "e:\\鏁版嵁\\鍧囦环\\鏃犲潎浠峰皬鍖鸿绠�.xls"); } def getEstateType(def districts, def key){ @@ -103,13 +103,13 @@ class NoPriceDistrictStat{ def priceRegion = keys[1]; if(region == priceRegion){ def dbo = districtMap.get(k); - if(dbo && dbo.estate_type2=="别墅"){ + if(dbo && dbo.estate_type2=="鍒"){ prices << v; } } }else{ def dbo = districtMap.get(k); - if(dbo && dbo.estate_type2=="别墅"){ + if(dbo && dbo.estate_type2=="鍒"){ prices << v; } } @@ -168,7 +168,7 @@ class NoPriceDistrictStat{ if(cursor){ for(def dbo : cursor){ def city = dbo.get("display"); - if(city!='全国'){ + if(city!='鍏ㄥ浗'){ citys << city; } } @@ -186,13 +186,13 @@ class NoPriceDistrictStat{ try { HSSFWorkbook WORK_BOOK = new HSSFWorkbook(); - HSSFSheet sheet = WORK_BOOK.createSheet("数据"); + HSSFSheet sheet = WORK_BOOK.createSheet("鏁版嵁"); HSSFRow row0 = sheet.createRow(0); - row0.createCell(0).setCellValue("城市"); - row0.createCell(1).setCellValue("区域"); - row0.createCell(2).setCellValue("小区名称"); - row0.createCell(3).setCellValue("小区均价"); - row0.createCell(4).setCellValue("物业类型"); + row0.createCell(0).setCellValue("鍩庡競"); + row0.createCell(1).setCellValue("鍖哄煙"); + row0.createCell(2).setCellValue("灏忓尯鍚嶇О"); + row0.createCell(3).setCellValue("灏忓尯鍧囦环"); + row0.createCell(4).setCellValue("鐗╀笟绫诲瀷"); for(def i=0;i=200){ + if(dbo.name.indexOf("鍒")!=-1 || dbo.house_area>=200){ code = "3"; if(height>6){ height = null @@ -294,7 +294,7 @@ class ReadAndWriteExcel { DBObject udata = new BasicDBObject(); def code = getBuildTypeCode(null, null, maxHeight); - if(dbo.name.indexOf("别墅")!=-1 || dbo.house_area>=200){ + if(dbo.name.indexOf("鍒")!=-1 || dbo.house_area>=200){ code = "3"; if(maxHeight>6){ maxHeight = null @@ -318,7 +318,7 @@ class ReadAndWriteExcel { - //"1-是;2-否;" + //"1-鏄紱2-鍚︼紱" def getElevatorCode(def height, def buildTypeCode){ if(height){ if(height>=7){ @@ -341,7 +341,7 @@ class ReadAndWriteExcel { - //1-高层;2-小高层;3-多层; 多层小于等于6 小高层小于等于10 其他为高层 + //1-楂樺眰锛�2-灏忛珮灞傦紱3-澶氬眰锛� 澶氬眰灏忎簬绛変簬6 灏忛珮灞傚皬浜庣瓑浜�10 鍏朵粬涓洪珮灞� def getBuildTypeCode(def name, def build_type, def height){ if(height){ @@ -354,27 +354,27 @@ class ReadAndWriteExcel { } }else{ - if(name && name.indexOf("别墅")!=-1){ + if(name && name.indexOf("鍒")!=-1){ return "3"; } if(build_type){ def type = build_type.split(","); if(type.size()==1){ - if(build_type=="高层"||build_type=="超高层"){ + if(build_type=="楂樺眰"||build_type=="瓒呴珮灞�"){ return "1"; - }else if(build_type=="小高层"){ + }else if(build_type=="灏忛珮灞�"){ return "2"; - }else if(build_type=="多层"||build_type=="独栋"||build_type=="联排"||build_type=="双拼"){ + }else if(build_type=="澶氬眰"||build_type=="鐙爧"||build_type=="鑱旀帓"||build_type=="鍙屾嫾"){ return "3"; } }else{ def s = type[0]; - if(s=="小高层"){ + if(s=="灏忛珮灞�"){ return "2"; - }else if(s=="高层"||s=="超高层"){ + }else if(s=="楂樺眰"||s=="瓒呴珮灞�"){ return "1"; - }else if(s=="多层"||s=="独栋"||s=="联排"||s=="双拼"){ + }else if(s=="澶氬眰"||s=="鐙爧"||s=="鑱旀帓"||s=="鍙屾嫾"){ return "3"; } } @@ -447,7 +447,7 @@ class ReadAndWriteExcel { for(def dbo : dsCursor){ - if(dbo.name.indexOf("别墅")!=-1&&dbo.build_type_code!="3"){ + if(dbo.name.indexOf("鍒")!=-1&&dbo.build_type_code!="3"){ update(dbo.get("_id"), "3") continue; } @@ -507,7 +507,7 @@ class ReadAndWriteExcel { def ret = []; for(line in lines) { if(ret.contains(line)){ - println "重复:"+line; + println "閲嶅锛�"+line; }else{ ret << line; } @@ -516,8 +516,8 @@ class ReadAndWriteExcel { } def dataPk(){ - def ret1 = readTxt1("E:\\常州数据结果\\dat\\excel\\昨天.txt"); - def ret2 = readTxt1("E:\\常州数据结果\\dat\\excel\\今天.txt"); + def ret1 = readTxt1("E:\\甯稿窞鏁版嵁缁撴灉\\dat\\excel\\鏄ㄥぉ.txt"); + def ret2 = readTxt1("E:\\甯稿窞鏁版嵁缁撴灉\\dat\\excel\\浠婂ぉ.txt"); for(def s : ret1){ @@ -528,7 +528,7 @@ class ReadAndWriteExcel { } def deleteHouse(){ - def ret1 = readTxt1("d:\\常州数据结果\\删除房源.txt","UTF-8"); + def ret1 = readTxt1("d:\\甯稿窞鏁版嵁缁撴灉\\鍒犻櫎鎴挎簮.txt","UTF-8"); for(def s : ret1){ DBObject query = new BasicDBObject(); @@ -582,7 +582,7 @@ class ReadAndWriteExcel { def WORK_BOOK = null; try { if (file.exists()) { - FileInputStream fs=new FileInputStream(path); //获取d://test.xls + FileInputStream fs=new FileInputStream(path); //鑾峰彇d://test.xls WORK_BOOK = WorkbookFactory.create(fs) WORK_BOOK.setForceFormulaRecalculation(true) sheet = WORK_BOOK.getSheetAt(0); @@ -610,8 +610,8 @@ class ReadAndWriteExcel { def noExportDistrict(){ - def districts = findSeaweedData("常州","district"); - def ret = readTxt("E:\\常州数据结果\\dat\\easycms_house_community_20151020.txt"); + def districts = findSeaweedData("甯稿窞","district"); + def ret = readTxt("E:\\甯稿窞鏁版嵁缁撴灉\\dat\\easycms_house_community_20151020.txt"); def ids = []; def index = 0; for(def list : ret){ @@ -638,7 +638,7 @@ class ReadAndWriteExcel { result << row; } } - exportHouse(result, "E:\\常州数据结果\\剩余小区\\剩余小区.xlsx"); + exportHouse(result, "E:\\甯稿窞鏁版嵁缁撴灉\\鍓╀綑灏忓尯\\鍓╀綑灏忓尯.xlsx"); } @@ -695,30 +695,30 @@ class ReadAndWriteExcel { def getDistrictString(def result){ def sb = new StringBuffer(); def index = 0; - sb.append("楼盘编号\t\t"); - sb.append("楼盘名称\t\t"); - sb.append("楼盘均价\t\t"); - sb.append("省\t\t"); - sb.append("市\t\t"); - sb.append("区\t\t"); - sb.append("地址\t\t"); - sb.append("所属区域\t\t"); - sb.append("公共服务配套\t\t"); - sb.append("基础设施\t\t"); - sb.append("居住社区成熟度\t\t"); - sb.append("交通条件\t\t"); - sb.append("泊车条件\t\t"); - sb.append("学区房类型\t\t"); - sb.append("小区绿化率\t\t"); - sb.append("容积率\t\t"); - sb.append("参考租金(1室)\t\t"); - sb.append("参考租金(2室)\t\t"); - sb.append("参考租金(3室)\t\t"); - sb.append("参考租金(4室)\t\t"); - sb.append("参考租金(5室)\t\t"); - sb.append("参考租金(5室以上)\t\t"); - sb.append("物业公司\t\t"); - sb.append("物业费(每月每平米)<#r>\n"); + sb.append("妤肩洏缂栧彿\t\t"); + sb.append("妤肩洏鍚嶇О\t\t"); + sb.append("妤肩洏鍧囦环\t\t"); + sb.append("鐪乗t\t"); + sb.append("甯俓t\t"); + sb.append("鍖篭t\t"); + sb.append("鍦板潃\t\t"); + sb.append("鎵�灞炲尯鍩焅t\t"); + sb.append("鍏叡鏈嶅姟閰嶅\t\t"); + sb.append("鍩虹璁炬柦\t\t"); + sb.append("灞呬綇绀惧尯鎴愮啛搴t\t"); + sb.append("浜ら�氭潯浠禱t\t"); + sb.append("娉婅溅鏉′欢\t\t"); + sb.append("瀛﹀尯鎴跨被鍨媆t\t"); + sb.append("灏忓尯缁垮寲鐜嘰t\t"); + sb.append("瀹圭Н鐜嘰t\t"); + sb.append("鍙傝�冪閲�(1瀹�)\t\t"); + sb.append("鍙傝�冪閲�(2瀹�)\t\t"); + sb.append("鍙傝�冪閲�(3瀹�)\t\t"); + sb.append("鍙傝�冪閲�(4瀹�)\t\t"); + sb.append("鍙傝�冪閲�(5瀹�)\t\t"); + sb.append("鍙傝�冪閲�(5瀹や互涓�)\t\t"); + sb.append("鐗╀笟鍏徃\t\t"); + sb.append("鐗╀笟璐癸紙姣忔湀姣忓钩绫筹級<#r>\n"); for(def m : result){ sb.append(converValue(m.id.toString())+"\t\t"); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/RepeatDistrictExport.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/RepeatDistrictExport.groovy index 543b08b98..50ab99ca5 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/RepeatDistrictExport.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/RepeatDistrictExport.groovy @@ -16,7 +16,7 @@ class RepeatDistrictExport { } def run(){ - def citys = ["天津","南京","郑州","哈尔滨"]; + def citys = ["澶╂触","鍗椾含","閮戝窞","鍝堝皵婊�"]; for(def city : citys){ def districts = getAllDistricts(city, "district"); def repeatNameDists = findRepeatNameDistricts(city, districts); @@ -36,14 +36,14 @@ class RepeatDistrictExport { } } - println "[${city}] 重复名称的小区:"+repeatNames.size(); + println "[${city}] 閲嶅鍚嶇О鐨勫皬鍖�:"+repeatNames.size(); def i = 0; for(def s : repeatNames){ i++; println "[${i}] "+s; } - writeCSV3("E:\\数据测试\\结果\\重复小区\\", city+"(名称重复).csv", repeatNames, null); + writeCSV3("E:\\鏁版嵁娴嬭瘯\\缁撴灉\\閲嶅灏忓尯\\", city+"(鍚嶇О閲嶅).csv", repeatNames, null); return repeatNames; } @@ -52,7 +52,7 @@ class RepeatDistrictExport { def addressesMap = [:]; def map = [:]; for(def dist : districts){ - if(dist.address == '临夏路800弄'){ + if(dist.address == '涓村璺�800寮�'){ println "ssss" } @@ -78,14 +78,14 @@ class RepeatDistrictExport { } } - println "[${city}] 重复地址的小区:"+repeatAddress.size(); + println "[${city}] 閲嶅鍦板潃鐨勫皬鍖�:"+repeatAddress.size(); def j = 0; for(def s : repeatAddress){ j++; println "[${j}] "+s; } - writeCSV3("E:\\数据测试\\结果\\重复小区\\", city+"(地址重复).csv", repeatAddress, map); + writeCSV3("E:\\鏁版嵁娴嬭瘯\\缁撴灉\\閲嶅灏忓尯\\", city+"(鍦板潃閲嶅).csv", repeatAddress, map); return repeatAddress; } @@ -98,7 +98,7 @@ class RepeatDistrictExport { def reMap = [:]; for(def dist : districts){ def aliasList = dist.alias -// if((aliasList && aliasList.contains("龙湖蓝湖郡别墅") )||dist.name.indexOf("龙湖蓝湖郡别墅")!=-1){ +// if((aliasList && aliasList.contains("榫欐箹钃濇箹閮″埆澧�") )||dist.name.indexOf("榫欐箹钃濇箹閮″埆澧�")!=-1){ // println "wwww" // }else{ // continue; @@ -177,13 +177,13 @@ class RepeatDistrictExport { - println "[${city}] 别名重复的小区:"+repeatAlias.size(); + println "[${city}] 鍒悕閲嶅鐨勫皬鍖�:"+repeatAlias.size(); def k = 0; for(def s : repeatAlias){ k++; println "[${k}] "+s; } - writeCSV3("E:\\数据测试\\结果\\重复小区\\", city+"(别名重复).csv", repeatAlias, reMap); + writeCSV3("E:\\鏁版嵁娴嬭瘯\\缁撴灉\\閲嶅灏忓尯\\", city+"(鍒悕閲嶅).csv", repeatAlias, reMap); return repeatAlias; } @@ -233,9 +233,9 @@ class RepeatDistrictExport { } - file.append("名称/地址,") + file.append("鍚嶇О/鍦板潃,") if(map){ - file.append("小区名称,") + file.append("灏忓尯鍚嶇О,") } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/SellHouseStatisticsBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/SellHouseStatisticsBatch.groovy index 8985defb3..64d1b7cd5 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/SellHouseStatisticsBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/SellHouseStatisticsBatch.groovy @@ -21,14 +21,14 @@ class SellHouseStatisticsBatch extends BaseBatch{ } public void process(Object args) { - exportMonthStatistics('sell', '二手房月挂牌量') - exportMonthStatistics('rent', '出租月挂牌量') + exportMonthStatistics('sell', '浜屾墜鎴挎湀鎸傜墝閲�') + exportMonthStatistics('rent', '鍑虹鏈堟寕鐗岄噺') } private def exportMonthStatistics(catetory, fileName) { StringBuffer month = new StringBuffer(); for (def i = 1; i <= 12; i++) { - month.append(",").append(i + "月") + month.append(",").append(i + "鏈�") } StringBuffer data = new StringBuffer(); CityMap.CITY_MAP.each(){key, value-> @@ -36,7 +36,7 @@ class SellHouseStatisticsBatch extends BaseBatch{ data.append(city).append(",") Calendar cal = new GregorianCalendar(); cal.setTime(new Date()) - // 去年现在 + // 鍘诲勾鐜板湪 cal.set(Calendar.YEAR, cal.get(Calendar.YEAR) - 1); for (def i = 0; i < 12; i++) { cal.set(Calendar.MONTH, cal.get(Calendar.MONTH) + i) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/ShengWangStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/ShengWangStat.groovy index 7d9fec879..c38ce532a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/ShengWangStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/ShengWangStat.groovy @@ -11,7 +11,7 @@ class ShengWangStat { } def run(){ - def ret = readExcel("E:\\数据\\申万0303(1).xlsx"); + def ret = readExcel("E:\\鏁版嵁\\鐢充竾0303(1).xlsx"); //stat(ret); priceStat(ret); //markupStat(ret); @@ -21,7 +21,7 @@ class ShengWangStat { def addIndexStat(ret){ def resultMap = [:]; ret.each {map-> - def city = map.get("城市"); + def city = map.get("鍩庡競"); def detailMap = resultMap.get(city); if(!detailMap){ @@ -29,19 +29,19 @@ class ShengWangStat { resultMap.put(city, detailMap) } - def region = map.get("区域"); + def region = map.get("鍖哄煙"); def regionMap = detailMap.get(region); if(!regionMap){ regionMap = [:] detailMap.put(region, regionMap); } - def markup = map.get("财富增值指数"); + def markup = map.get("璐㈠瘜澧炲�兼寚鏁�"); if(!markup){ markup = null; } - def key = "无数据"; + def key = "鏃犳暟鎹�"; if(markup){ markup = markup.toDouble(); if(markup > 70){ @@ -71,13 +71,13 @@ class ShengWangStat { } } - exportAddIndex(resultMap, "e:\\数据\\增值指数统计.csv"); + exportAddIndex(resultMap, "e:\\鏁版嵁\\澧炲�兼寚鏁扮粺璁�.csv"); } def markupStat(def ret){ def resultMap = [:]; ret.each {map-> - def city = map.get("城市"); + def city = map.get("鍩庡競"); def detailMap = resultMap.get(city); if(!detailMap){ @@ -85,19 +85,19 @@ class ShengWangStat { resultMap.put(city, detailMap) } - def region = map.get("区域"); + def region = map.get("鍖哄煙"); def regionMap = detailMap.get(region); if(!regionMap){ regionMap = [:] detailMap.put(region, regionMap); } - def markup = map.get("涨跌幅"); + def markup = map.get("娑ㄨ穼骞�"); if(!markup){ markup = null; } - def key = "无数据"; + def key = "鏃犳暟鎹�"; if(markup){ markup = markup.toDouble(); if(markup > 40){ @@ -131,13 +131,13 @@ class ShengWangStat { } } - exportMarkup(resultMap, "e:\\数据\\涨跌幅统计.csv"); + exportMarkup(resultMap, "e:\\鏁版嵁\\娑ㄨ穼骞呯粺璁�.csv"); } def priceStat(def ret){ def resultMap = [:]; ret.each {map-> - def city = map.get("城市"); + def city = map.get("鍩庡競"); def detailMap = resultMap.get(city); if(!detailMap){ @@ -145,19 +145,19 @@ class ShengWangStat { resultMap.put(city, detailMap) } - def region = map.get("区域"); + def region = map.get("鍖哄煙"); def regionMap = detailMap.get(region); if(!regionMap){ regionMap = [:] detailMap.put(region, regionMap); } - def price = map.get("总价"); + def price = map.get("鎬讳环"); if(!price){ price = null; } - def key = "无数据"; + def key = "鏃犳暟鎹�"; if(price){ price = price.toLong(); if(price > 40000000){ @@ -191,7 +191,7 @@ class ShengWangStat { } } - exportPrice(resultMap, "e:\\数据\\价格统计.csv"); + exportPrice(resultMap, "e:\\鏁版嵁\\浠锋牸缁熻.csv"); } @@ -201,15 +201,15 @@ class ShengWangStat { if (file.exists()){ file.delete(); } - file.append("城市,") - file.append("区域,") - file.append("超过4000万,") - file.append("2000-4000万,") - file.append("1000-2000万,") - file.append("400-1000万,") - file.append("100-400万,") - file.append("少于100万,") - file.append("无数据,") + file.append("鍩庡競,") + file.append("鍖哄煙,") + file.append("瓒呰繃4000涓�,") + file.append("2000-4000涓�,") + file.append("1000-2000涓�,") + file.append("400-1000涓�,") + file.append("100-400涓�,") + file.append("灏戜簬100涓�,") + file.append("鏃犳暟鎹�,") file.append(System.getProperty("line.separator")); @@ -260,8 +260,8 @@ class ShengWangStat { file.append(",","gbk") } - if(v1.get("无数据")){ - file.append(v1.get("无数据")+ ",","gbk") + if(v1.get("鏃犳暟鎹�")){ + file.append(v1.get("鏃犳暟鎹�")+ ",","gbk") }else{ file.append(",","gbk") } @@ -280,13 +280,13 @@ class ShengWangStat { if (file.exists()){ file.delete(); } - file.append("城市,") - file.append("区域,") - file.append("超过70,") + file.append("鍩庡競,") + file.append("鍖哄煙,") + file.append("瓒呰繃70,") file.append("50-70,") file.append("25-50,") file.append("0-25,") - file.append("无数据,") + file.append("鏃犳暟鎹�,") file.append(System.getProperty("line.separator")); @@ -324,8 +324,8 @@ class ShengWangStat { } - if(v1.get("无数据")){ - file.append(v1.get("无数据")+ ",","gbk") + if(v1.get("鏃犳暟鎹�")){ + file.append(v1.get("鏃犳暟鎹�")+ ",","gbk") }else{ file.append(",","gbk") } @@ -344,15 +344,15 @@ class ShengWangStat { if (file.exists()){ file.delete(); } - file.append("城市,") - file.append("区域,") - file.append("超过40%,") + file.append("鍩庡競,") + file.append("鍖哄煙,") + file.append("瓒呰繃40%,") file.append("30-40%,") file.append("20-30%,") file.append("10-20%,") file.append("0-10%,") - file.append("跌,") - file.append("无数据,") + file.append("璺�,") + file.append("鏃犳暟鎹�,") file.append(System.getProperty("line.separator")); @@ -403,8 +403,8 @@ class ShengWangStat { file.append(",","gbk") } - if(v1.get("无数据")){ - file.append(v1.get("无数据")+ ",","gbk") + if(v1.get("鏃犳暟鎹�")){ + file.append(v1.get("鏃犳暟鎹�")+ ",","gbk") }else{ file.append(",","gbk") } @@ -422,7 +422,7 @@ class ShengWangStat { def resultMap = [:]; ret.each {map-> - def city = map.get("城市"); + def city = map.get("鍩庡競"); def detailMap = resultMap.get(city); if(!detailMap){ @@ -430,14 +430,14 @@ class ShengWangStat { resultMap.put(city, detailMap) } - def region = map.get("区域"); + def region = map.get("鍖哄煙"); def regionMap = detailMap.get(region); if(!regionMap){ regionMap = [:] detailMap.put(region, regionMap); } - def score = map.get("财富得分指数"); + def score = map.get("璐㈠瘜寰楀垎鎸囨暟"); if(!score){ score = 0; } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/ShopAndOfficeStatExport.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/ShopAndOfficeStatExport.groovy index 0fcf0a9d7..840573833 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/ShopAndOfficeStatExport.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/ShopAndOfficeStatExport.groovy @@ -17,8 +17,8 @@ class ShopAndOfficeStatExport { } def run(){ - //importShopInfoData(findStat("商铺")); - importOfficeInfoData(findStat("写字楼")); + //importShopInfoData(findStat("鍟嗛摵")); + importOfficeInfoData(findStat("鍐欏瓧妤�")); } def findStat(def estateType){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/ShopData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/ShopData.groovy index fd889eecb..4f02e3579 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/ShopData.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataExport/ShopData.groovy @@ -43,10 +43,10 @@ class ShopData { } def exportLoadShop(){ - def names = readTxt("E:\\常州数据结果\\原始数据\\商铺名称.txt"); + def names = readTxt("E:\\甯稿窞鏁版嵁缁撴灉\\鍘熷鏁版嵁\\鍟嗛摵鍚嶇О.txt"); DBObject q = new BasicDBObject(); - q.put("city", "常州"); + q.put("city", "甯稿窞"); def dbCursor = BUSINESS_SHOP_COLL.find(q).batchSize(1000) def it = dbCursor.iterator(); @@ -54,7 +54,7 @@ class ShopData { def map = [:]; while(it.hasNext()){ def dbo = it.next(); - if(dbo.address.contains("路")||dbo.address.contains("街")){ + if(dbo.address.contains("璺�")||dbo.address.contains("琛�")){ map = isContainsLoad(dbo.address, names, map, dbo.name); } @@ -64,13 +64,13 @@ class ShopData { } def writeExcel(def map){ - File file = new File("e:\\常州数据结果\\原始数据\\商铺.csv"); + File file = new File("e:\\甯稿窞鏁版嵁缁撴灉\\鍘熷鏁版嵁\\鍟嗛摵.csv"); if (file.exists()){ file.delete(); } - file.append("商铺名称,") - file.append("商铺,") - file.append("店名,") + file.append("鍟嗛摵鍚嶇О,") + file.append("鍟嗛摵,") + file.append("搴楀悕,") file.append(System.getProperty("line.separator")); map.each {k,v-> @@ -92,10 +92,10 @@ class ShopData { def isContainsLoad(address, names, map, businessName){ for(def shopName : names){ - def name = shopName.replace("商铺",""); + def name = shopName.replace("鍟嗛摵",""); if(address.contains(name)){ - if(address.contains("号")){ - def load = address.substring(0, address.indexOf("号")+1); + if(address.contains("鍙�")){ + def load = address.substring(0, address.indexOf("鍙�")+1); if(load){ def loads = map.get(shopName) @@ -129,9 +129,9 @@ class ShopData { } def matchHouse(){ - def dbResult = findShops("常州"); + def dbResult = findShops("甯稿窞"); - def ret = readExcel("E:\\高娟", "常州人工商铺.xlsx"); + def ret = readExcel("E:\\楂樺", "甯稿窞浜哄伐鍟嗛摵.xlsx"); def result = []; def index = 0; def houses = []; @@ -140,14 +140,14 @@ class ShopData { if(!ret.contains(name)){ index++; def count = findHouse(obj.city, name, null); - if(count == 0 && name.indexOf("商铺")!=-1){ - count = findHouse(obj.city, name.replace("商铺", ""), null); + if(count == 0 && name.indexOf("鍟嗛摵")!=-1){ + count = findHouse(obj.city, name.replace("鍟嗛摵", ""), null); } def regionCount = findHouse(obj.city, name, obj.region); - if(regionCount == 0 && name.indexOf("商铺")!=-1){ - regionCount = findHouse(obj.city, name.replace("商铺", ""), obj.region); + if(regionCount == 0 && name.indexOf("鍟嗛摵")!=-1){ + regionCount = findHouse(obj.city, name.replace("鍟嗛摵", ""), obj.region); } def map = [:]; map.city = obj.city; @@ -163,8 +163,8 @@ class ShopData { if(regionCount > 0){ def list = findDetailHouse(obj.city, name, obj.region); - if(list.size() == 0 && name.indexOf("商铺")!=-1){ - list = findDetailHouse(obj.city, name.replace("商铺", ""), obj.region); + if(list.size() == 0 && name.indexOf("鍟嗛摵")!=-1){ + list = findDetailHouse(obj.city, name.replace("鍟嗛摵", ""), obj.region); } houses.addAll(list) } @@ -174,7 +174,7 @@ class ShopData { } } - writeResult2("e:\\常州数据结果\\数据分析\\商铺500.xls",result); + writeResult2("e:\\甯稿窞鏁版嵁缁撴灉\\鏁版嵁鍒嗘瀽\\鍟嗛摵500.xls",result); println houses.size(); def heightIndex = 0; for(def obj : houses){ @@ -184,7 +184,7 @@ class ShopData { } } println heightIndex; - writeHouse("e:\\常州数据结果\\数据分析\\商铺房源.csv",houses); + writeHouse("e:\\甯稿窞鏁版嵁缁撴灉\\鏁版嵁鍒嗘瀽\\鍟嗛摵鎴挎簮.csv",houses); } @@ -193,10 +193,10 @@ class ShopData { if (file.exists()){ file.delete(); } - file.append("区域,") - file.append("楼盘名称,") - file.append("所在楼层,") - file.append("楼高,") + file.append("鍖哄煙,") + file.append("妤肩洏鍚嶇О,") + file.append("鎵�鍦ㄦゼ灞�,") + file.append("妤奸珮,") file.append(System.getProperty("line.separator")); list.each{ file.append(it.region + ",","gbk") @@ -211,11 +211,11 @@ class ShopData { DBObject q = new BasicDBObject() q.put('city', city) q.put('region', region) - q.put("estate_type" , "商铺") - if(name.indexOf("商铺")!=-1){ + q.put("estate_type" , "鍟嗛摵") + if(name.indexOf("鍟嗛摵")!=-1){ def names = []; names << name; - names << name.replace("商铺",""); + names << name.replace("鍟嗛摵",""); BasicDBObject query = new BasicDBObject(); query.putAt(QueryOperators.IN, names); q.put("district_name", query); @@ -232,7 +232,7 @@ class ShopData { q.put("city", city); q.put("region", region); q.put("name", name); - q.put("kind", "商铺"); + q.put("kind", "鍟嗛摵"); def dbCoursor = RENT_COLL.find(q).sort(new BasicDBObject("weekend",-1)).limit(1); @@ -242,11 +242,11 @@ class ShopData { } def run(){ - def city = "常州"; - def ret = readExcel("E:\\高娟", "常州100个商铺.xlsx"); + def city = "甯稿窞"; + def ret = readExcel("E:\\楂樺", "甯稿窞100涓晢閾�.xlsx"); ret = getHouseData(city,ret); - //writeResult("e:\\商铺(旧).xls",ret); + //writeResult("e:\\鍟嗛摵(鏃�).xls",ret); def dbResult = findShop(city); @@ -255,7 +255,7 @@ class ShopData { def dbShops = getTop100(city, dbResult.names, ret); def rett = createNewData(ret, dbShops, dbResult.detail); - writeResult("e:\\商铺(新).xls",rett); + writeResult("e:\\鍟嗛摵(鏂�).xls",rett); } @@ -382,8 +382,8 @@ class ShopData { } } - println "有房源的共:"+result.size(); - println "有房源且不在100个范围内:"+lastResult.size() + println "鏈夋埧婧愮殑鍏憋細"+result.size(); + println "鏈夋埧婧愪笖涓嶅湪100涓寖鍥村唴锛�"+lastResult.size() return lastResult; } @@ -401,7 +401,7 @@ class ShopData { row << flag; } - println "共:"+total + println "鍏憋細"+total ret << row; return ret; } @@ -497,10 +497,10 @@ class ShopData { def rowCount = workbook.getSheetAt(0).getLastRowNum(); def sheet1=workbook.getSheetAt(0); def ret = []; - //循环行 + //寰幆琛� sheet1.eachWithIndex {row, index-> - def cells = row.physicalNumberOfCells;//取得列数 + def cells = row.physicalNumberOfCells;//鍙栧緱鍒楁暟 for(def i=0;i<3;i++){ def value = getCellVal(row.getCell(i)); if(i==0){ @@ -588,13 +588,13 @@ class ShopData { public static void createTableRow(HSSFSheet citySheet,def ret) { - //创建第rowIndex行 + //鍒涘缓绗瑀owIndex琛� for(def i=0;i println CityMap.findCityName(city); findDistrict(city); - def startId = 0//每次ID的起始值 + def startId = 0//姣忔ID鐨勮捣濮嬪�� int saveCount = 0 int updateCount = 0 while(true){ @@ -113,7 +113,7 @@ class EvaluationToSeaBird { static def findDistrict(city) { - districtMap = [:]; //初始化Map + districtMap = [:]; //鍒濆鍖朚ap def cityDB= CityMap.getDbCityName("goojia", city); def sql = "select id, district_name,region, block from ${cityDB}.district_location" def rows = dbConn.rows(sql.toString()) @@ -123,229 +123,229 @@ class EvaluationToSeaBird { } /** - * 将MySQL中数据库转移到MongoDB中 - * @param dbConn 连接地址 - * @param row 行记录 - * @param city 所属城市 - * @return 无返回值 + * 灏哅ySQL涓暟鎹簱杞Щ鍒癕ongoDB涓� + * @param dbConn 杩炴帴鍦板潃 + * @param row 琛岃褰� + * @param city 鎵�灞炲煄甯� + * @return 鏃犺繑鍥炲�� */ static def saveToSeaBird(dbConn, row, city) { DBObject obj = new BasicDBObject() -// //小区ID +// //灏忓尯ID // def newDistrictId = getDistrictId(row.district_id, city) // if(newDistrictId == null) { // return; // } - //朝向 + //鏈濆悜 def newDirection = row.direction if(1 == newDirection){ - newDirection = "西南" + newDirection = "瑗垮崡" }else if(2 == newDirection){ - newDirection = "东南" + newDirection = "涓滃崡" }else if(3 == newDirection){ - newDirection = "南" + newDirection = "鍗�" }else if(4 == newDirection){ - newDirection = "西北" + newDirection = "瑗垮寳" }else if(5 == newDirection){ - newDirection = "东北" + newDirection = "涓滃寳" }else if(6 == newDirection){ - newDirection = "东" + newDirection = "涓�" }else if(7 == newDirection){ - newDirection = "西" + newDirection = "瑗�" }else if(8 == newDirection){ - newDirection = "北" + newDirection = "鍖�" }else if(9 == newDirection){ - newDirection = "东西" + newDirection = "涓滆タ" }else if(10 == newDirection){ - newDirection = "南北" + newDirection = "鍗楀寳" }else{ - newDirection = "南" + newDirection = "鍗�" } - //建筑类型 + //寤虹瓚绫诲瀷 def build_type = row.build_type.toString() //println build_type if("1" == build_type){ - build_type = "多层" + build_type = "澶氬眰" }else if("2" == build_type){ - build_type = "小高层" + build_type = "灏忛珮灞�" }else if("3" == build_type){ - build_type = "高层" + build_type = "楂樺眰" }else if("4" == build_type){ - build_type = "独立别墅" + build_type = "鐙珛鍒" }else if("5" == build_type){ - build_type = "双拼别墅" + build_type = "鍙屾嫾鍒" }else if("6" == build_type){ - build_type = "联排别墅" + build_type = "鑱旀帓鍒" }else if("7" == build_type){ - build_type = "叠加别墅" + build_type = "鍙犲姞鍒" }else{ - build_type = "公寓" + build_type = "鍏瘬" } - //装修情况 + //瑁呬慨鎯呭喌 def fitment = row.fitment.toString() if("1" == fitment){ - fitment = "毛坯" + fitment = "姣涘澂" }else if("3" == fitment){ - fitment = "一般装修" + fitment = "涓�鑸淇�" }else if("4" == fitment){ - fitment = "精装修" + fitment = "绮捐淇�" }else if("5" == fitment){ - fitment = "豪华装修" + fitment = "璞崕瑁呬慨" }else{ - fitment = "简单装修" + fitment = "绠�鍗曡淇�" } def house_property = row.house_property.toString() ; if ("1" == house_property) { - house_property = "个人产权"; + house_property = "涓汉浜ф潈"; } else if ("2" == house_property) { - house_property = "集体产权"; + house_property = "闆嗕綋浜ф潈"; } else if ("3" == house_property) { - house_property = "国有产权"; + house_property = "鍥芥湁浜ф潈"; } else { house_property =""; } def build_quality = row.build_quality.toString(); if ("1" == build_quality) { - build_quality = "有沉降"; + build_quality = "鏈夋矇闄�"; } else if ("2" == build_quality) { - build_quality = "有开裂"; + build_quality = "鏈夊紑瑁�"; } else if ("3" == build_quality) { - build_quality = "有渗水"; + build_quality = "鏈夋笚姘�"; } else { build_quality =""; } def worry_facility = row.worry_facility.toString(); if ("1" == worry_facility) { - worry_facility = "很近"; + worry_facility = "寰堣繎"; } else if ("2" == worry_facility) { - worry_facility = "较近"; + worry_facility = "杈冭繎"; } else if ("3" == worry_facility) { - worry_facility = "无"; + worry_facility = "鏃�"; } else { worry_facility =""; } def worry_factor = row.worry_factor.toString(); if ("1" == worry_factor) { - worry_factor = "变电站"; + worry_factor = "鍙樼數绔�"; } else if ("2" == worry_factor) { - worry_factor = "垃圾场"; + worry_factor = "鍨冨溇鍦�"; } else if ("3" == worry_factor) { - worry_factor = "高架噪音"; + worry_factor = "楂樻灦鍣煶"; } else if ("4" == worry_factor) { - worry_factor = "轨交噪音"; + worry_factor = "杞ㄤ氦鍣煶"; } else if ("5" == worry_factor) { - worry_factor = "发射塔"; + worry_factor = "鍙戝皠濉�"; } else { worry_factor =""; } def carport = row.carport.toString(); if ("1" == carport) { - carport = "有"; + carport = "鏈�"; } else if ("2" == carport) { - carport = "无"; + carport = "鏃�"; } else { carport =""; } def other_factor = row.other_factor.toString(); if ("1" == other_factor) { - other_factor = "紧邻主干道"; + other_factor = "绱ч偦涓诲共閬�"; } else if ("2" == other_factor) { - other_factor = "紧邻轻轨沿线"; + other_factor = "绱ч偦杞昏建娌跨嚎"; } else if ("3" == other_factor) { - other_factor = "紧邻嘈杂场所"; + other_factor = "绱ч偦鍢堟潅鍦烘墍"; } else { other_factor =""; } def facilities = row.facilities.toString(); if ("1" == facilities) { - facilities = "健身房"; + facilities = "鍋ヨ韩鎴�"; } else if ("2" == facilities) { - facilities = "游泳池"; + facilities = "娓告吵姹�"; } else if ("3" == facilities) { - facilities = "会所"; + facilities = "浼氭墍"; } else if ("4" == facilities) { - facilities = "网球场"; + facilities = "缃戠悆鍦�"; } else if ("5" == facilities) { - facilities = "球场"; + facilities = "鐞冨満"; } else if ("6" == facilities) { - facilities = "棋牌室"; + facilities = "妫嬬墝瀹�"; } else if ("7" == facilities) { - facilities = "停车场"; + facilities = "鍋滆溅鍦�"; } else if ("8" == facilities) { - facilities = "图书馆"; + facilities = "鍥句功棣�"; } else if ("9" == facilities) { - facilities = "活动中心"; + facilities = "娲诲姩涓績"; } else { facilities =""; } def insidepos = row.insidepos.toString(); if ("1" == insidepos) { - insidepos = "离小区出口近"; + insidepos = "绂诲皬鍖哄嚭鍙h繎"; } else if ("2" == insidepos) { - insidepos = "离小区出口远"; + insidepos = "绂诲皬鍖哄嚭鍙h繙"; } else if ("3" == insidepos) { - insidepos = "离小区出口距离适中"; + insidepos = "绂诲皬鍖哄嚭鍙h窛绂婚�備腑"; } else { insidepos =""; } def sight = row.sight.toString(); if ("1" == sight) { - sight = "景观房"; + sight = "鏅鎴�"; } else if ("2" == sight) { - sight = "侧景观房"; + sight = "渚ф櫙瑙傛埧"; } else if ("3" == sight) { - sight = "一般"; + sight = "涓�鑸�"; }else if ("4" == sight) { - sight = "差"; + sight = "宸�"; }else { sight =""; } def lighting_ventilation = row.lighting_ventilation.toString(); if ("1" == lighting_ventilation) { - lighting_ventilation = "无暗房/南北通风"; + lighting_ventilation = "鏃犳殫鎴�/鍗楀寳閫氶"; } else if ("2" == lighting_ventilation) { - lighting_ventilation = "南北通风"; + lighting_ventilation = "鍗楀寳閫氶"; } else if ("3" == lighting_ventilation) { - lighting_ventilation = "一般"; + lighting_ventilation = "涓�鑸�"; }else if ("4" == lighting_ventilation) { - lighting_ventilation = "差"; + lighting_ventilation = "宸�"; } else { lighting_ventilation =""; } def sideset = row.sideset.toString(); if ("1" == sideset) { - sideset = "非边套"; + sideset = "闈炶竟濂�"; } else if ("2" == sideset) { - sideset = "边套不带窗"; + sideset = "杈瑰涓嶅甫绐�"; } else if ("3" == sideset) { - sideset = "边套带窗"; + sideset = "杈瑰甯︾獥"; } else { sideset =""; } def noise = row.noise.toString(); if ("1" == noise) { - noise = "无噪音"; + noise = "鏃犲櫔闊�"; } else if ("2" == noise) { - noise = "噪音较小"; + noise = "鍣煶杈冨皬"; } else if ("3" == noise) { - noise = "噪音大"; + noise = "鍣煶澶�"; } else { noise =""; } @@ -433,7 +433,7 @@ class EvaluationToSeaBird { obj.put("c_date", row.creation_date) obj.put("m_date", row.modification_date) - //精评时添加的另外字段 + //绮捐瘎鏃舵坊鍔犵殑鍙﹀瀛楁 if (insidepos!=null && insidepos) { obj.put("insidepos",insidepos) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataImport/HouseCPCDetailToMongo.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataImport/HouseCPCDetailToMongo.groovy index 4a62d9691..a4ba00983 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataImport/HouseCPCDetailToMongo.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataImport/HouseCPCDetailToMongo.groovy @@ -8,7 +8,7 @@ import com.mongodb.DBObject import com.mongodb.Mongo /** - * house_cpc_detail数据迁移至mongodb中 + * house_cpc_detail鏁版嵁杩佺Щ鑷砿ongodb涓� * * @author liupei */ @@ -141,7 +141,7 @@ class HouseCPCDetailToMongo { } /** - * 获取house_cpc_detail关联的id对应到mongodb中对象的id + * 鑾峰彇house_cpc_detail鍏宠仈鐨刬d瀵瑰簲鍒癿ongodb涓璞$殑id * * @param org_id * @param cat diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataImport/HouseImport.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataImport/HouseImport.groovy index dd6570daf..73e8b4ebc 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataImport/HouseImport.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataImport/HouseImport.groovy @@ -22,13 +22,13 @@ class HouseImport extends BaseBatch { } public void process(args) { - //二手房导入 + //浜屾墜鎴垮鍏� // CityMap.eachDbNew(dbConfig){dbConn, city-> // def cityName = CityMap.findCityName(city) // run(cityName,'sell') // } - run('上海','sell') - // 出租房导入 + run('涓婃捣','sell') + // 鍑虹鎴垮鍏� // CityMap.eachDbNew(dbConfig){dbConn, city-> // def cityName = CityMap.findCityName(city) // run(cityName,'rent') @@ -41,20 +41,20 @@ class HouseImport extends BaseBatch { def dbName = null def tableName = null if(category=='sell'){ - dbName = city=='上海'?'goojia':"goojia_${cityCode}".toString() + dbName = city=='涓婃捣'?'goojia':"goojia_${cityCode}".toString() tableName = "house" }else if(category=='rent'){ - dbName = city=='上海'?'goojia_rent':"goojia_rent_${cityCode}".toString() + dbName = city=='涓婃捣'?'goojia_rent':"goojia_rent_${cityCode}".toString() tableName = "house_rent" }else{ println "invalid category:${category}" return } - def goojiaDbName = city=='上海'?'goojia':"goojia_${cityCode}".toString() + def goojiaDbName = city=='涓婃捣'?'goojia':"goojia_${cityCode}".toString() def start = System.currentTimeMillis() - // 导入所有 + // 瀵煎叆鎵�鏈� // def startId = dbConn.firstRow("select id from ${dbName}.${tableName} order by id limit 1".toString()).id - // 导入最近10000条 + // 瀵煎叆鏈�杩�10000鏉� def startId = dbConn.firstRow("select id from ${dbName}.${tableName} order by id desc limit 10000,1".toString()).id def maxId = dbConn.firstRow("select id from ${dbName}.${tableName} order by id desc limit 1".toString()).id println "startId:${startId}" @@ -137,16 +137,16 @@ class HouseImport extends BaseBatch { city : city, name : house.HOUSE_TITLE, description : house.DESCRIPTION, - direction : house.DIRECTION?house.DIRECTION.contains('东西')?'东西': - house.DIRECTION.contains('南北')?'南北': - house.DIRECTION.contains('东南')?'东南': - house.DIRECTION.contains('西南')?'西南': - house.DIRECTION.contains('东北')?'东北': - house.DIRECTION.contains('西北')?'西北': - house.DIRECTION.contains('东')?'东': - house.DIRECTION.contains('西')?'西': - house.DIRECTION.contains('南')?'南': - house.DIRECTION.contains('北')?'北': + direction : house.DIRECTION?house.DIRECTION.contains('涓滆タ')?'涓滆タ': + house.DIRECTION.contains('鍗楀寳')?'鍗楀寳': + house.DIRECTION.contains('涓滃崡')?'涓滃崡': + house.DIRECTION.contains('瑗垮崡')?'瑗垮崡': + house.DIRECTION.contains('涓滃寳')?'涓滃寳': + house.DIRECTION.contains('瑗垮寳')?'瑗垮寳': + house.DIRECTION.contains('涓�')?'涓�': + house.DIRECTION.contains('瑗�')?'瑗�': + house.DIRECTION.contains('鍗�')?'鍗�': + house.DIRECTION.contains('鍖�')?'鍖�': null:null, //district_id : house.LOCATION_ID, district_name : houseContact.DISTRICT_NAME, @@ -157,17 +157,17 @@ class HouseImport extends BaseBatch { area : (double)(house.HOUSE_AREA/100.0), height : house.HOUSE_HIGHT, floor : house.HOUSE_FLOOR, - fitment : house.FITMENT?house.FITMENT.contains('毛')?'毛坯': - house.FITMENT.contains('清')?'毛坯': - house.FITMENT.contains('无')?'毛坯': - house.FITMENT.contains('简')?'普通装修': - house.FITMENT.contains('一')?'普通装修': - house.FITMENT.contains('普')?'普通装修': - house.FITMENT.contains('中')?'普通装修': - house.FITMENT.contains('全')?'精装修': - house.FITMENT.contains('精')?'精装修': - house.FITMENT.contains('高')?'豪华装修': - house.FITMENT.contains('豪')?'豪华装修': + fitment : house.FITMENT?house.FITMENT.contains('姣�')?'姣涘澂': + house.FITMENT.contains('娓�')?'姣涘澂': + house.FITMENT.contains('鏃�')?'姣涘澂': + house.FITMENT.contains('绠�')?'鏅�氳淇�': + house.FITMENT.contains('涓�')?'鏅�氳淇�': + house.FITMENT.contains('鏅�')?'鏅�氳淇�': + house.FITMENT.contains('涓�')?'鏅�氳淇�': + house.FITMENT.contains('鍏�')?'绮捐淇�': + house.FITMENT.contains('绮�')?'绮捐淇�': + house.FITMENT.contains('楂�')?'璞崕瑁呬慨': + house.FITMENT.contains('璞�')?'璞崕瑁呬慨': null:null, estate_type : house.KIND, build_date : house.BUILD_DATE?.format("yyyy-MM-dd"), @@ -210,16 +210,16 @@ class HouseImport extends BaseBatch { city : city, name : house.HOUSE_TITLE, description : house.DESCRIPTION, - direction : house.DIRECTION?house.DIRECTION.contains('东西')?'东西': - house.DIRECTION.contains('南北')?'南北': - house.DIRECTION.contains('东南')?'东南': - house.DIRECTION.contains('西南')?'西南': - house.DIRECTION.contains('东北')?'东北': - house.DIRECTION.contains('西北')?'西北': - house.DIRECTION.contains('东')?'东': - house.DIRECTION.contains('西')?'西': - house.DIRECTION.contains('南')?'南': - house.DIRECTION.contains('北')?'北': + direction : house.DIRECTION?house.DIRECTION.contains('涓滆タ')?'涓滆タ': + house.DIRECTION.contains('鍗楀寳')?'鍗楀寳': + house.DIRECTION.contains('涓滃崡')?'涓滃崡': + house.DIRECTION.contains('瑗垮崡')?'瑗垮崡': + house.DIRECTION.contains('涓滃寳')?'涓滃寳': + house.DIRECTION.contains('瑗垮寳')?'瑗垮寳': + house.DIRECTION.contains('涓�')?'涓�': + house.DIRECTION.contains('瑗�')?'瑗�': + house.DIRECTION.contains('鍗�')?'鍗�': + house.DIRECTION.contains('鍖�')?'鍖�': null:null, //district_id : house.LOCATION_ID, district_name : houseContact.DISTRICT_NAME, @@ -227,21 +227,21 @@ class HouseImport extends BaseBatch { region : houseContact.REGION, block : houseContact.BLOCK, total_price : house.RENT_PRICE, - rent_type : house.RENT_TYPE==0?'整体出租':'合租', + rent_type : house.RENT_TYPE==0?'鏁翠綋鍑虹':'鍚堢', area : (double)(house.HOUSE_AREA/100.0), height : house.HOUSE_HIGHT, floor : house.HOUSE_FLOOR, - fitment : house.FITMENT?house.FITMENT.contains('毛')?'毛坯': - house.FITMENT.contains('清')?'毛坯': - house.FITMENT.contains('无')?'毛坯': - house.FITMENT.contains('简')?'普通装修': - house.FITMENT.contains('一')?'普通装修': - house.FITMENT.contains('普')?'普通装修': - house.FITMENT.contains('中')?'普通装修': - house.FITMENT.contains('全')?'精装修': - house.FITMENT.contains('精')?'精装修': - house.FITMENT.contains('高')?'豪华装修': - house.FITMENT.contains('豪')?'豪华装修': + fitment : house.FITMENT?house.FITMENT.contains('姣�')?'姣涘澂': + house.FITMENT.contains('娓�')?'姣涘澂': + house.FITMENT.contains('鏃�')?'姣涘澂': + house.FITMENT.contains('绠�')?'鏅�氳淇�': + house.FITMENT.contains('涓�')?'鏅�氳淇�': + house.FITMENT.contains('鏅�')?'鏅�氳淇�': + house.FITMENT.contains('涓�')?'鏅�氳淇�': + house.FITMENT.contains('鍏�')?'绮捐淇�': + house.FITMENT.contains('绮�')?'绮捐淇�': + house.FITMENT.contains('楂�')?'璞崕瑁呬慨': + house.FITMENT.contains('璞�')?'璞崕瑁呬慨': null:null, estate_type : house.ESTATE_TYPE, build_date : house.BUILD_DATE?.format("yyyy-MM-dd"), diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataImport/HousePriceToMongo.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataImport/HousePriceToMongo.groovy index 2a6424c3e..10006c50c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataImport/HousePriceToMongo.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataImport/HousePriceToMongo.groovy @@ -23,7 +23,7 @@ class HousePriceToMongo { } static def findDistrict(city) { - districtMap = [:]; //初始化Map + districtMap = [:]; //鍒濆鍖朚ap def cityDB= CityMap.getDbCityName("goojia", city); def sql = "select id, district_name,region, block from ${cityDB}.district_location" def rows = dbConn.rows(sql.toString()) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataImport/IdMapSearch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataImport/IdMapSearch.groovy index a1361877b..6515beec9 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataImport/IdMapSearch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataImport/IdMapSearch.groovy @@ -8,7 +8,7 @@ import com.mongodb.DBObject import com.mongodb.Mongo /** - * house_cpc_detail数据迁移至mongodb中 + * house_cpc_detail鏁版嵁杩佺Щ鑷砿ongodb涓� * * @author liupei */ @@ -34,7 +34,7 @@ class IdMapSearch { private static def getOrgId() { def orgIds = []; def query = new BasicDBObject() - query.put("city", "上海") + query.put("city", "涓婃捣") query.put("category", "sell") idMapCollection.find(query, new BasicDBObject(['new_id': 1, 'org_id' : 1])).each{row-> orgIds.add(row.org_id) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataImport/ImportCpcHouseByCityAndSitename.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataImport/ImportCpcHouseByCityAndSitename.groovy index b46709e03..a8dcf3093 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataImport/ImportCpcHouseByCityAndSitename.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataImport/ImportCpcHouseByCityAndSitename.groovy @@ -59,20 +59,20 @@ class ImportCpcHouseByCityAndSitename extends BaseBatch { def dbName = null def tableName = null if(category=='sell'){ - dbName = city=='上海'?'goojia':"goojia_${cityCode}".toString() + dbName = city=='涓婃捣'?'goojia':"goojia_${cityCode}".toString() tableName = "house" }else if(category=='rent'){ - dbName = city=='上海'?'goojia_rent':"goojia_rent_${cityCode}".toString() + dbName = city=='涓婃捣'?'goojia_rent':"goojia_rent_${cityCode}".toString() tableName = "house_rent" }else{ println "invalid category:${category}" return } - def goojiaDbName = city=='上海'?'goojia':"goojia_${cityCode}".toString() + def goojiaDbName = city=='涓婃捣'?'goojia':"goojia_${cityCode}".toString() def start = System.currentTimeMillis() - // 导入所有 + // 瀵煎叆鎵�鏈� // def startId = dbConn.firstRow("select id from ${dbName}.${tableName} order by id limit 1".toString()).id - // 导入最近10000条 + // 瀵煎叆鏈�杩�10000鏉� // def startId = dbConn.firstRow("select id from ${dbName}.${tableName} order by id desc limit 10000,1".toString()).id // def maxId = dbConn.firstRow("select id from ${dbName}.${tableName} order by id desc limit 1".toString()).id def startId = dbConn.firstRow("select id from ${dbName}.house_contact where site_name=? order by id limit 1".toString(), [siteName]).id @@ -110,7 +110,7 @@ class ImportCpcHouseByCityAndSitename extends BaseBatch { def repeatedCount = 0 def noIdMap = [] houseContactMap.each{houseId, houseContact-> - // 判断此URL的房源是否存在 + // 鍒ゆ柇姝RL鐨勬埧婧愭槸鍚﹀瓨鍦� DBObject query = new BasicDBObject() query.put('url', houseContact.URL) def red = dsCollection.findOne(query) @@ -167,7 +167,7 @@ class ImportCpcHouseByCityAndSitename extends BaseBatch { def cpcMap = getHouseCPCDetailsMap(idList, dbName.replaceAll('_rent', '')) idsMap = getIdsMapHcd(idList, city) cpcMap.each() {id, detail-> - // 判断此URL的房源是否存在 + // 鍒ゆ柇姝RL鐨勬埧婧愭槸鍚﹀瓨鍦� DBObject query = new BasicDBObject() query.put('url', detail.URL) if (hcdCollection.findOne(query)) { @@ -220,7 +220,7 @@ class ImportCpcHouseByCityAndSitename extends BaseBatch { def updateObjects = [:] def dbIdMaps = [] cpcMap.each() {id, detail-> - // 判断此URL的房源是否存在 + // 鍒ゆ柇姝RL鐨勬埧婧愭槸鍚﹀瓨鍦� DBObject query = new BasicDBObject() query.put('url', detail.URL) if (hcdCollection.findOne(query)) { @@ -349,16 +349,16 @@ class ImportCpcHouseByCityAndSitename extends BaseBatch { city : city, name : house.HOUSE_TITLE, description : house.DESCRIPTION, - direction : house.DIRECTION?house.DIRECTION.contains('东西')?'东西': - house.DIRECTION.contains('南北')?'南北': - house.DIRECTION.contains('东南')?'东南': - house.DIRECTION.contains('西南')?'西南': - house.DIRECTION.contains('东北')?'东北': - house.DIRECTION.contains('西北')?'西北': - house.DIRECTION.contains('东')?'东': - house.DIRECTION.contains('西')?'西': - house.DIRECTION.contains('南')?'南': - house.DIRECTION.contains('北')?'北': + direction : house.DIRECTION?house.DIRECTION.contains('涓滆タ')?'涓滆タ': + house.DIRECTION.contains('鍗楀寳')?'鍗楀寳': + house.DIRECTION.contains('涓滃崡')?'涓滃崡': + house.DIRECTION.contains('瑗垮崡')?'瑗垮崡': + house.DIRECTION.contains('涓滃寳')?'涓滃寳': + house.DIRECTION.contains('瑗垮寳')?'瑗垮寳': + house.DIRECTION.contains('涓�')?'涓�': + house.DIRECTION.contains('瑗�')?'瑗�': + house.DIRECTION.contains('鍗�')?'鍗�': + house.DIRECTION.contains('鍖�')?'鍖�': null:null, //district_id : house.LOCATION_ID, district_name : houseContact.DISTRICT_NAME, @@ -369,17 +369,17 @@ class ImportCpcHouseByCityAndSitename extends BaseBatch { area : (double)(house.HOUSE_AREA/100.0), height : house.HOUSE_HIGHT, floor : house.HOUSE_FLOOR, - fitment : house.FITMENT?house.FITMENT.contains('毛')?'毛坯': - house.FITMENT.contains('清')?'毛坯': - house.FITMENT.contains('无')?'毛坯': - house.FITMENT.contains('简')?'普通装修': - house.FITMENT.contains('一')?'普通装修': - house.FITMENT.contains('普')?'普通装修': - house.FITMENT.contains('中')?'普通装修': - house.FITMENT.contains('全')?'精装修': - house.FITMENT.contains('精')?'精装修': - house.FITMENT.contains('高')?'豪华装修': - house.FITMENT.contains('豪')?'豪华装修': + fitment : house.FITMENT?house.FITMENT.contains('姣�')?'姣涘澂': + house.FITMENT.contains('娓�')?'姣涘澂': + house.FITMENT.contains('鏃�')?'姣涘澂': + house.FITMENT.contains('绠�')?'鏅�氳淇�': + house.FITMENT.contains('涓�')?'鏅�氳淇�': + house.FITMENT.contains('鏅�')?'鏅�氳淇�': + house.FITMENT.contains('涓�')?'鏅�氳淇�': + house.FITMENT.contains('鍏�')?'绮捐淇�': + house.FITMENT.contains('绮�')?'绮捐淇�': + house.FITMENT.contains('楂�')?'璞崕瑁呬慨': + house.FITMENT.contains('璞�')?'璞崕瑁呬慨': null:null, estate_type : house.KIND, build_date : house.BUILD_DATE?.format("yyyy-MM-dd"), @@ -422,16 +422,16 @@ class ImportCpcHouseByCityAndSitename extends BaseBatch { city : city, name : house.HOUSE_TITLE, description : house.DESCRIPTION, - direction : house.DIRECTION?house.DIRECTION.contains('东西')?'东西': - house.DIRECTION.contains('南北')?'南北': - house.DIRECTION.contains('东南')?'东南': - house.DIRECTION.contains('西南')?'西南': - house.DIRECTION.contains('东北')?'东北': - house.DIRECTION.contains('西北')?'西北': - house.DIRECTION.contains('东')?'东': - house.DIRECTION.contains('西')?'西': - house.DIRECTION.contains('南')?'南': - house.DIRECTION.contains('北')?'北': + direction : house.DIRECTION?house.DIRECTION.contains('涓滆タ')?'涓滆タ': + house.DIRECTION.contains('鍗楀寳')?'鍗楀寳': + house.DIRECTION.contains('涓滃崡')?'涓滃崡': + house.DIRECTION.contains('瑗垮崡')?'瑗垮崡': + house.DIRECTION.contains('涓滃寳')?'涓滃寳': + house.DIRECTION.contains('瑗垮寳')?'瑗垮寳': + house.DIRECTION.contains('涓�')?'涓�': + house.DIRECTION.contains('瑗�')?'瑗�': + house.DIRECTION.contains('鍗�')?'鍗�': + house.DIRECTION.contains('鍖�')?'鍖�': null:null, //district_id : house.LOCATION_ID, district_name : houseContact.DISTRICT_NAME, @@ -439,21 +439,21 @@ class ImportCpcHouseByCityAndSitename extends BaseBatch { region : houseContact.REGION, block : houseContact.BLOCK, total_price : house.RENT_PRICE, - rent_type : house.RENT_TYPE==0?'整体出租':'合租', + rent_type : house.RENT_TYPE==0?'鏁翠綋鍑虹':'鍚堢', area : (double)(house.HOUSE_AREA/100.0), height : house.HOUSE_HIGHT, floor : house.HOUSE_FLOOR, - fitment : house.FITMENT?house.FITMENT.contains('毛')?'毛坯': - house.FITMENT.contains('清')?'毛坯': - house.FITMENT.contains('无')?'毛坯': - house.FITMENT.contains('简')?'普通装修': - house.FITMENT.contains('一')?'普通装修': - house.FITMENT.contains('普')?'普通装修': - house.FITMENT.contains('中')?'普通装修': - house.FITMENT.contains('全')?'精装修': - house.FITMENT.contains('精')?'精装修': - house.FITMENT.contains('高')?'豪华装修': - house.FITMENT.contains('豪')?'豪华装修': + fitment : house.FITMENT?house.FITMENT.contains('姣�')?'姣涘澂': + house.FITMENT.contains('娓�')?'姣涘澂': + house.FITMENT.contains('鏃�')?'姣涘澂': + house.FITMENT.contains('绠�')?'鏅�氳淇�': + house.FITMENT.contains('涓�')?'鏅�氳淇�': + house.FITMENT.contains('鏅�')?'鏅�氳淇�': + house.FITMENT.contains('涓�')?'鏅�氳淇�': + house.FITMENT.contains('鍏�')?'绮捐淇�': + house.FITMENT.contains('绮�')?'绮捐淇�': + house.FITMENT.contains('楂�')?'璞崕瑁呬慨': + house.FITMENT.contains('璞�')?'璞崕瑁呬慨': null:null, estate_type : house.ESTATE_TYPE, build_date : house.BUILD_DATE?.format("yyyy-MM-dd"), @@ -554,12 +554,12 @@ class ImportCpcHouseByCityAndSitename extends BaseBatch { } /** - * 获取关联信息的类型 + * 鑾峰彇鍏宠仈淇℃伅鐨勭被鍨� * - * 1==二手房 - * 2==租房 - * 其他暂不考虑 - * 参照com.goojia.dal.common.HouseCpcDetailEnum + * 1==浜屾墜鎴� + * 2==绉熸埧 + * 鍏朵粬鏆備笉鑰冭檻 + * 鍙傜収com.goojia.dal.common.HouseCpcDetailEnum * * @param category * @return @@ -575,7 +575,7 @@ class ImportCpcHouseByCityAndSitename extends BaseBatch { } /** - * 获取house_cpc_detail关联的id对应到mongodb中对象的id + * 鑾峰彇house_cpc_detail鍏宠仈鐨刬d瀵瑰簲鍒癿ongodb涓璞$殑id * * @param org_id * @param cat diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataImport/MatchedTypeEnum.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataImport/MatchedTypeEnum.groovy index 44adb5b19..c07634ba8 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataImport/MatchedTypeEnum.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataImport/MatchedTypeEnum.groovy @@ -2,15 +2,15 @@ package com.fangjia.script.dataImport enum MatchedTypeEnum { NONE(0, "none"), - DISTRICT(2, "districtName"), //小区 - CITY(3, "city"), //城市名 - REGION(4, "region"), //区域 - BLOCK(5, "block"), //板块 - ROAD(6, "road"), // 道路名 + DISTRICT(2, "districtName"), //灏忓尯 + CITY(3, "city"), //鍩庡競鍚� + REGION(4, "region"), //鍖哄煙 + BLOCK(5, "block"), //鏉垮潡 + ROAD(6, "road"), // 閬撹矾鍚� METRO(7, "metro"), - STATION(8, "station"), //地铁站名 - ALIAS(9, "districtName"), //小区别名 - ADDRESS(10, "address"); //地址 + STATION(8, "station"), //鍦伴搧绔欏悕 + ALIAS(9, "districtName"), //灏忓尯鍒悕 + ADDRESS(10, "address"); //鍦板潃 private final int category; private final String paramName; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataImport/NewsToSeabird.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataImport/NewsToSeabird.groovy index 7b3fef015..2c20d4246 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataImport/NewsToSeabird.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataImport/NewsToSeabird.groovy @@ -25,15 +25,15 @@ class NewsToSeabird { final static HttpHelper httpHelper = new HttpHelper("api.fangjia.com"); - final static kindMap = [1:'房价头条', - 2:'头条分析静态', - 3:'房价焦点静态', - 4:'小区新闻', - 5:'每日房价走势分析', - 6:'政策法规', - 7:'右侧静态', - 8:'小区快讯静态', - 9:'政策法规静态'] + final static kindMap = [1:'鎴夸环澶存潯', + 2:'澶存潯鍒嗘瀽闈欐��', + 3:'鎴夸环鐒︾偣闈欐��', + 4:'灏忓尯鏂伴椈', + 5:'姣忔棩鎴夸环璧板娍鍒嗘瀽', + 6:'鏀跨瓥娉曡', + 7:'鍙充晶闈欐��', + 8:'灏忓尯蹇闈欐��', + 9:'鏀跨瓥娉曡闈欐��'] static main(args) { @@ -42,7 +42,7 @@ class NewsToSeabird { } static def runSeabirdNews() { - // 海鸟新闻 + // 娴烽笩鏂伴椈 def startId = 0 int i = 0 while(true) { @@ -92,14 +92,14 @@ class NewsToSeabird { // keywords def keywordList = [] if (row.KEYWORD) { - keywordList.addAll(Arrays.asList(row.KEYWORD.split("[,|,| ]"))) + keywordList.addAll(Arrays.asList(row.KEYWORD.split("[,|锛寍 ]"))) } else { if (row.NEWS_CONTENT) { keywordList = computeNewsKeyword(DataUtil.removeHtml(row.NEWS_CONTENT)) } } - // 把小区名加入到keywords + // 鎶婂皬鍖哄悕鍔犲叆鍒発eywords if (row.OBJ_ID) { if (DISTRICTNAME_CACHE.get(city + "_" + row.OBJ_ID)) { keywordList.add(DISTRICTNAME_CACHE.get(city + "_" + row.OBJ_ID)) @@ -164,7 +164,7 @@ class NewsToSeabird { } } - // 把小区名加入到keywords + // 鎶婂皬鍖哄悕鍔犲叆鍒発eywords if (row.CITY && row.RELATED_IDS) { def districtIds = row.RELATED_IDS.split(",") def idList = [] @@ -226,8 +226,8 @@ class NewsToSeabird { } /** - * 根据内容计算关键字 - * @param content 纯文本,不包含任何标签 + * 鏍规嵁鍐呭璁$畻鍏抽敭瀛� + * @param content 绾枃鏈紝涓嶅寘鍚换浣曟爣绛� * @return */ static def computeNewsKeyword(content) { @@ -275,18 +275,18 @@ class NewsToSeabird { } /** - * 对Map的值排序 + * 瀵筂ap鐨勫�兼帓搴� */ static def Map sortMapByValue(Map targetMap) { Map ret = new LinkedHashMap(); List> infoIds = new ArrayList>(targetMap.entrySet()); - // 排序 + // 鎺掑簭 Collections.sort(infoIds, new Comparator>() { public int compare(Map.Entry o1, Map.Entry o2) { return (o2.getValue() - o1.getValue()); } }); - // 排序后 + // 鎺掑簭鍚� for (int i = 0; i < infoIds.size(); i++) { ret.put infoIds.get(i).getKey(), infoIds.get(i).getValue() } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataImport/RegionBlockDataImportFromKnowbaseByCity.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataImport/RegionBlockDataImportFromKnowbaseByCity.groovy index f0ba33418..551943979 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataImport/RegionBlockDataImportFromKnowbaseByCity.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataImport/RegionBlockDataImportFromKnowbaseByCity.groovy @@ -14,7 +14,7 @@ class RegionBlockDataImportFromKnowbaseByCity { static final Mongo knowbase_mongo = new Mongo('config.db.poseidon.com', 27017); public static void main(String[] args) { - def cityName = '三亚' + def cityName = '涓変簹' removeData(cityName) runMain(cityName) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataImport/RegionBlockLocationDataImport.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataImport/RegionBlockLocationDataImport.groovy index d18184b50..4a33353ac 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataImport/RegionBlockLocationDataImport.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataImport/RegionBlockLocationDataImport.groovy @@ -61,21 +61,21 @@ class RegionBlockLocationDataImport { dbo = new BasicDBObject(); dbo.put("city", city); if(cat=='region'){ - dbo.put("name", getRegion(row.region, city));//区域 - dbo.put("display", row.region);//区域 + dbo.put("name", getRegion(row.region, city));//鍖哄煙 + dbo.put("display", row.region);//鍖哄煙 }else{ - dbo.put("region", getRegion(row.region, city));//区域 - dbo.put("name", row.block);//板块 + dbo.put("region", getRegion(row.region, city));//鍖哄煙 + dbo.put("name", row.block);//鏉垮潡 } -// dbo.put("region_markup", row.region_markup);//区域均价增长幅度 - //dbo.put("markup", row.region_markup);//区域均价增长幅度 - dbo.put("lng", row.lng);//经度 - dbo.put("lat", row.lat);//纬度 +// dbo.put("region_markup", row.region_markup);//鍖哄煙鍧囦环澧為暱骞呭害 + //dbo.put("markup", row.region_markup);//鍖哄煙鍧囦环澧為暱骞呭害 + dbo.put("lng", row.lng);//缁忓害 + dbo.put("lat", row.lat);//绾害 if (row.description) { - dbo.put("description", row.description);//区县描述 + dbo.put("description", row.description);//鍖哄幙鎻忚堪 } - dbo.put("sequence", row.order_num);//显示顺序 -// flag visible:是否显示1:显示 0:不显示 + dbo.put("sequence", row.order_num);//鏄剧ず椤哄簭 +// flag visible:鏄惁鏄剧ず1:鏄剧ず 0锛氫笉鏄剧ず if (row.price_visi && row.price_visi == 1) { dbo.put("flag", [1]); } else { @@ -88,7 +88,7 @@ class RegionBlockLocationDataImport { collection.insert(dbo); - //保存 mysql 和mongoDB ID之间的映射 + //淇濆瓨 mysql 鍜宮ongoDB ID涔嬮棿鐨勬槧灏� DBObject idMapDbo = new BasicDBObject(); idMapDbo.put("org_id", row.id); idMapDbo.put("city", city); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataImport/RegionBlockLocationToSeabird.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataImport/RegionBlockLocationToSeabird.groovy index c1a940063..80800c778 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataImport/RegionBlockLocationToSeabird.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataImport/RegionBlockLocationToSeabird.groovy @@ -40,7 +40,7 @@ public class RegionBlockLocationToSeabird { object.put("parent", CityMap.findCityName(city)) object.put("category", "region") }else if(row.ID.toInteger() > 0 && row.block){ - object.put("name", row.block.replace("板块", "")) + object.put("name", row.block.replace("鏉垮潡", "")) def regions = httpHelper.findRegion(row.region, CityMap.findCityName(city)); if(regions) { object.put("parent", regions[0].toString()) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataImport/RegionStatToSeaBird.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataImport/RegionStatToSeaBird.groovy index 6b2506758..2079868db 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataImport/RegionStatToSeaBird.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataImport/RegionStatToSeaBird.groovy @@ -86,7 +86,7 @@ class RegionStatToSeaBird extends BaseBatch { } def findRegion(city) { - regionMap = [:]; //初始化Map + regionMap = [:]; //鍒濆鍖朚ap def cityDB= CityMap.getDbCityName("goojia", city); def sql = "select id, region, block from ${cityDB}.region_block_location" def rows = dbConn.rows(sql.toString()) @@ -120,8 +120,8 @@ class RegionStatToSeaBird extends BaseBatch { DBObject obj = new BasicDBObject() obj.put("city", city); def region = regionMap[row.region_block_location_id.toInteger()].region; - if ("高新区(虎丘区)".equals(region)) { - region = "高新区,虎丘区" + if ("楂樻柊鍖�(铏庝笜鍖�)".equals(region)) { + region = "楂樻柊鍖�,铏庝笜鍖�" } if (regionFormatMap.get(region + "_" + city)) { obj.put("region", regionFormatMap.get(region + "_" + city)) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataImport/ZjtDeleteHouseLogIdToMongo.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataImport/ZjtDeleteHouseLogIdToMongo.groovy index 4885b2ac6..29eecdf81 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataImport/ZjtDeleteHouseLogIdToMongo.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataImport/ZjtDeleteHouseLogIdToMongo.groovy @@ -13,7 +13,7 @@ import com.mongodb.DBCursor; import com.mongodb.DBObject; /** - * goojia_common.zjt_delete_house_log的id字段更新 + * goojia_common.zjt_delete_house_log鐨刬d瀛楁鏇存柊 * * @author */ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/datastore/DeadDataCleanner.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/datastore/DeadDataCleanner.groovy index 9d30b0c2f..2f5f0c499 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/datastore/DeadDataCleanner.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/datastore/DeadDataCleanner.groovy @@ -22,7 +22,7 @@ import com.mongodb.DBObject import com.mongodb.Mongo /** - * 清理datastore僵尸数据 + * 娓呯悊datastore鍍靛案鏁版嵁 * * @author yukai * @@ -37,15 +37,15 @@ class DeadDataCleanner extends BaseBatch { final static DBCollection fsDB = MongoUtils.getCollectionByName("fangjia_fs", "files", MongoUtils.MongoDB_Domain_fs_mongo, 27000) /** - * 房源类cat + * 鎴挎簮绫籧at */ final static def houseCats = ["sell", "rent", "shop_sell", "shop_rent", "office_sell", "office_rent"]; /** - * 资讯类cat + * 璧勮绫籧at */ final static def newsCats = ["zixun", "news", "weibo", "district_dynamics", "louping", "diary"]; /** - * 直接删除的cat + * 鐩存帴鍒犻櫎鐨刢at */ final static def deleteCats = ["block", "region"]; @@ -114,7 +114,7 @@ class DeadDataCleanner extends BaseBatch { def cat = line.cat; def id = line._id.toString(); if (!cat || deleteCats.contains(cat)) { - // 直接删除 + // 鐩存帴鍒犻櫎 seabirdDB.remove(new BasicDBObject("_id", id)); deleteCount++; } else if (houseCats.contains(cat)) { @@ -149,7 +149,7 @@ class DeadDataCleanner extends BaseBatch { } /** - * 检查索引是否存在 + * 妫�鏌ョ储寮曟槸鍚﹀瓨鍦� */ private checkIndex(id) { SolrQuery query = new SolrQuery("_id:" + id); @@ -170,10 +170,10 @@ class DeadDataCleanner extends BaseBatch { } /** - * 房源类数据 + * 鎴挎簮绫绘暟鎹� * - * 房源日期在21天内,无索引则重建,有索引不处理 - * 房源日期在21天前,无索引则删除,有索引不处理 + * 鎴挎簮鏃ユ湡鍦�21澶╁唴锛屾棤绱㈠紩鍒欓噸寤猴紝鏈夌储寮曚笉澶勭悊 + * 鎴挎簮鏃ユ湡鍦�21澶╁墠锛屾棤绱㈠紩鍒欏垹闄わ紝鏈夌储寮曚笉澶勭悊 */ private ProcessRet processHouseCats(house) { def id = house._id.toString(); @@ -193,16 +193,16 @@ class DeadDataCleanner extends BaseBatch { def isIndexExisted = checkIndex(id); if (!isIndexExisted) { - // 索引不存在 + // 绱㈠紩涓嶅瓨鍦� Date now = new Date(); Calendar ca = Calendar.getInstance(); ca.add(Calendar.DAY_OF_MONTH, -90); if (ca.getTime().before(houseDate)) { - // 90天内的房源 + // 90澶╁唴鐨勬埧婧� seabirdDB.reIndex(query); return ProcessRet.REINDEX; } else { - // 90天前的房源 + // 90澶╁墠鐨勬埧婧� removePics(house); seabirdDB.remove(query); return ProcessRet.DELETE; @@ -212,7 +212,7 @@ class DeadDataCleanner extends BaseBatch { } /** - * 删除房源图片 + * 鍒犻櫎鎴挎簮鍥剧墖 */ private void removePics(house) { if (!house) { @@ -236,9 +236,9 @@ class DeadDataCleanner extends BaseBatch { } /** - * 资讯类数据 + * 璧勮绫绘暟鎹� * - * 2011-01-01以前的直接删除;以后的无索引则重建,有索引不处理 + * 2011-01-01浠ュ墠鐨勭洿鎺ュ垹闄わ紱浠ュ悗鐨勬棤绱㈠紩鍒欓噸寤猴紝鏈夌储寮曚笉澶勭悊 */ private ProcessRet processNewsCats(news) { def id = news._id.toString(); @@ -255,7 +255,7 @@ class DeadDataCleanner extends BaseBatch { return ProcessRet.DELETE; } - // 直接删除newsLimitDate之前的资讯 + // 鐩存帴鍒犻櫎newsLimitDate涔嬪墠鐨勮祫璁� if (newsLimitDate.after(newsDate)) { seabirdDB.remove(query); return ProcessRet.DELETE; @@ -263,7 +263,7 @@ class DeadDataCleanner extends BaseBatch { def isIndexExisted = checkIndex(id); if (!isIndexExisted) { - // 索引不存在 + // 绱㈠紩涓嶅瓨鍦� seabirdDB.reIndex(query); return ProcessRet.REINDEX; } @@ -271,15 +271,15 @@ class DeadDataCleanner extends BaseBatch { } /** - * 其他cat + * 鍏朵粬cat * - * 无索引则重建,有索引不处理 + * 鏃犵储寮曞垯閲嶅缓锛屾湁绱㈠紩涓嶅鐞� */ private ProcessRet processOtherCats(other) { def id = other._id.toString(); def isIndexExisted = checkIndex(id); if (!isIndexExisted) { - // 索引不存在 + // 绱㈠紩涓嶅瓨鍦� seabirdDB.reIndex(new BasicDBObject("_id", id)); return ProcessRet.REINDEX; } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/datastore/DistrictFieldNumberic.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/datastore/DistrictFieldNumberic.groovy index 725d33b4b..96e554ae3 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/datastore/DistrictFieldNumberic.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/datastore/DistrictFieldNumberic.groovy @@ -19,7 +19,7 @@ class DistrictFieldNumberic { static main1(args) { DBObject q = new BasicDBObject(); q.put('cat', 'district'); - q.put("city", "上海"); + q.put("city", "涓婃捣"); def minAllArea = Double.MAX_VALUE def maxAllArea = Double.MIN_VALUE @@ -63,12 +63,12 @@ class DistrictFieldNumberic { static main(args) { DBObject q = new BasicDBObject(); q.put("cat", "district"); - q.put("city", "上海"); + q.put("city", "涓婃捣"); q.put("visible", 0); DBObject d = new BasicDBObject(); d.put('cat', 'district'); - d.put("city", "上海"); + d.put("city", "涓婃捣"); DB_1.remove(d); SEAWEED.find(q).batchSize(100).bulk(false).each { @@ -146,8 +146,8 @@ class DistrictFieldNumberic { /** * household_count * integer - * 户数 - * 仅限数字,数字不能低于10 + * 鎴锋暟 + * 浠呴檺鏁板瓧锛屾暟瀛椾笉鑳戒綆浜�10 */ private static def householdCountValidator(def household_count){ if(household_count){ @@ -158,8 +158,8 @@ class DistrictFieldNumberic { return null; } - // car_site string 车位描述 不受限制 - // car_site_count string 停车位 仅限数字,数字范围:10-100000 + // car_site string 杞︿綅鎻忚堪 涓嶅彈闄愬埗 + // car_site_count string 鍋滆溅浣� 浠呴檺鏁板瓧锛屾暟瀛楄寖鍥达細10-100000 private static def carSiteValidator(def car_site){ def value = checkValue(car_site); if(value){ @@ -174,7 +174,7 @@ class DistrictFieldNumberic { /** * string - * 绿化率 仅限数字,包括(小数)数字范围:10-100 + * 缁垮寲鐜� 浠呴檺鏁板瓧锛屽寘鎷紙灏忔暟锛夋暟瀛楄寖鍥达細10-100 * @param virescence_percent * @return */ @@ -195,7 +195,7 @@ class DistrictFieldNumberic { /** * string - * 容积率 仅限数字,包括(小数)数字范围:0.1-20 + * 瀹圭Н鐜� 浠呴檺鏁板瓧锛屽寘鎷紙灏忔暟锛夋暟瀛楄寖鍥达細0.1-20 * @param cubage_percent * @return */ @@ -216,15 +216,15 @@ class DistrictFieldNumberic { /** * string - * 占地面积 - * 仅限数字,包括(小数)数字不能低于1000-100000000 + * 鍗犲湴闈㈢Н + * 浠呴檺鏁板瓧锛屽寘鎷紙灏忔暟锛夋暟瀛椾笉鑳戒綆浜�1000-100000000 * @param all_area * @return */ private static def allAreaValidator(def all_area){ def value = checkValue(all_area); if(value){ - if(all_area.indexOf("万")!=-1){ + if(all_area.indexOf("涓�")!=-1){ value = value * 10000; value = value.toLong(); } @@ -242,7 +242,7 @@ class DistrictFieldNumberic { /** * string - * 物业费 仅限数字,包括(小数)数字范围:0-10 + * 鐗╀笟璐� 浠呴檺鏁板瓧锛屽寘鎷紙灏忔暟锛夋暟瀛楄寖鍥达細0-10 * @param estate_charge * @return */ @@ -263,8 +263,8 @@ class DistrictFieldNumberic { /** * string - * 竣工时间 - * 仅限数字: 2014-2-8、2014-2、2014,不含有“年、月、日、初、中、上旬、中旬、下旬、底等”中文字。 + * 绔e伐鏃堕棿 + * 浠呴檺鏁板瓧: 2014-2-8銆�2014-2銆�2014锛屼笉鍚湁鈥滃勾銆佹湀銆佹棩銆佸垵銆佷腑銆佷笂鏃�佷腑鏃�佷笅鏃�佸簳绛夆�濅腑鏂囧瓧銆� * @param finish_building_date * @return */ @@ -335,15 +335,15 @@ class DistrictFieldNumberic { /** * string - * 建筑面积 - * 仅限数字,包括(小数)数字不能低于10000-100000000 + * 寤虹瓚闈㈢Н + * 浠呴檺鏁板瓧锛屽寘鎷紙灏忔暟锛夋暟瀛椾笉鑳戒綆浜�10000-100000000 * @param build_area * @return */ public static def buildAreaValidator(def build_area){ def value = checkValue(build_area); if(value){ - if(build_area.indexOf("万")!=-1){ + if(build_area.indexOf("涓�")!=-1){ value = value * 10000; value = value.toLong(); } @@ -379,7 +379,7 @@ class DistrictFieldNumberic { return null; } } else{ - println value + "不是数字类型......"; + println value + "涓嶆槸鏁板瓧绫诲瀷......"; return null; } } @@ -388,7 +388,7 @@ class DistrictFieldNumberic { } /** - * 提取浮点数与整数 + * 鎻愬彇娴偣鏁颁笌鏁存暟 */ public static def getNumber(def input) { Pattern pattern = Pattern.compile("\\d+(\\.\\d+)?"); @@ -422,15 +422,15 @@ class DistrictFieldNumberic { } /** - * 正则表达式去掉多余的.与0 + * 姝e垯琛ㄨ揪寮忓幓鎺夊浣欑殑.涓�0 * @param s * @return */ private static def subZeroAndDot(String v){ // if(s.indexOf(".") > 0){ - // s = s.replaceAll(/0+?/, "");//去掉多余的0 + // s = s.replaceAll(/0+?/, "");//鍘绘帀澶氫綑鐨�0 // if(s.endsWith(".")){ - // s = s.replaceAll(/[.]/, "");//如最后一位是.则去掉 + // s = s.replaceAll(/[.]/, "");//濡傛渶鍚庝竴浣嶆槸.鍒欏幓鎺� // } // } if(v){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/datastore/FieldValidatorUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/datastore/FieldValidatorUtils.groovy index be5179a2e..224e2806b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/datastore/FieldValidatorUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/datastore/FieldValidatorUtils.groovy @@ -9,9 +9,9 @@ import com.fangjia.script.util.DataUtil; class FieldValidatorUtils { - static def filterWords = ["暂无","待定","未知","不详","数据更新中","未定","详情请见","搜房"]; + static def filterWords = ["鏆傛棤","寰呭畾","鏈煡","涓嶈","鏁版嵁鏇存柊涓�","鏈畾","璇︽儏璇疯","鎼滄埧"]; - static def eqWords = ["-","null","0","无","——","--","办理中"] + static def eqWords = ["-","null","0","鏃�","鈥斺��","--","鍔炵悊涓�"] static def isContainsFilterWord(def value){ def flag = false; @@ -42,8 +42,8 @@ class FieldValidatorUtils { } /** * string - * 物业公司 - * 包括括号()、不含有数字,20个字以内 + * 鐗╀笟鍏徃 + * 鍖呮嫭鎷彿锛堬級銆佷笉鍚湁鏁板瓧锛�20涓瓧浠ュ唴 * @param estate_company * @return */ @@ -67,8 +67,8 @@ class FieldValidatorUtils { } if(company.size()>40){ - if(company.indexOf("公司")!=-1){ - company = company.substring(0, company.indexOf("公司")+2); + if(company.indexOf("鍏徃")!=-1){ + company = company.substring(0, company.indexOf("鍏徃")+2); if(company.size()<=40){ return company; } @@ -90,7 +90,7 @@ class FieldValidatorUtils { /** * string - * 物业费 仅限数字,包括(小数)数字范围:0-10 + * 鐗╀笟璐� 浠呴檺鏁板瓧锛屽寘鎷紙灏忔暟锛夋暟瀛楄寖鍥达細0-10 * @param estate_charge * @return */ @@ -112,7 +112,7 @@ class FieldValidatorUtils { /** * string - * 绿化率 仅限数字,包括(小数)数字范围:10-100 + * 缁垮寲鐜� 浠呴檺鏁板瓧锛屽寘鎷紙灏忔暟锛夋暟瀛楄寖鍥达細10-100 * @param virescence_percent * @return */ @@ -131,7 +131,7 @@ class FieldValidatorUtils { /** * string - * 容积率 仅限数字,包括(小数)数字范围:0.1-20 + * 瀹圭Н鐜� 浠呴檺鏁板瓧锛屽寘鎷紙灏忔暟锛夋暟瀛楄寖鍥达細0.1-20 * @param cubage_percent * @return */ @@ -149,15 +149,15 @@ class FieldValidatorUtils { /** - * 占地面积 - * 仅限数字,包括(小数)数字不能低于1000-100000000 + * 鍗犲湴闈㈢Н + * 浠呴檺鏁板瓧锛屽寘鎷紙灏忔暟锛夋暟瀛椾笉鑳戒綆浜�1000-100000000 * @param all_area * @return */ static def allAreaValidator(def all_area){ def value = checkValue(all_area.toString()); if(value){ - if(all_area.indexOf("万")!=-1){ + if(all_area.indexOf("涓�")!=-1){ value = value * 10000; value = value.toLong(); if(value.toString().endsWith(".0")){ @@ -177,15 +177,15 @@ class FieldValidatorUtils { return null; } /** - * 建筑面积 - * 仅限数字,包括(小数)数字不能低于10000-100000000 + * 寤虹瓚闈㈢Н + * 浠呴檺鏁板瓧锛屽寘鎷紙灏忔暟锛夋暟瀛椾笉鑳戒綆浜�10000-100000000 * @param build_area * @return */ static def buildAreaValidator(def build_area){ def value = checkValue(build_area.toString()); if(value){ - if(build_area.indexOf("万")!=-1){ + if(build_area.indexOf("涓�")!=-1){ value = value * 10000; value = value.toLong(); if(value.toString().endsWith(".0")){ @@ -209,8 +209,8 @@ class FieldValidatorUtils { /** * household_count * integer - * 户数 - * 仅限数字,数字不能低于10 + * 鎴锋暟 + * 浠呴檺鏁板瓧锛屾暟瀛椾笉鑳戒綆浜�10 */ static def householdCountValidator(def household_count){ if(household_count){ @@ -223,7 +223,7 @@ class FieldValidatorUtils { } /** - * 电话号码 + * 鐢佃瘽鍙风爜 * @param mobile * @return */ @@ -240,7 +240,7 @@ class FieldValidatorUtils { /** * string - * 产权年限 70、50、40 + * 浜ф潈骞撮檺 70銆�50銆�40 * @param property_life * @return */ @@ -257,8 +257,8 @@ class FieldValidatorUtils { return value.toString(); } }else{ - if(property_life.indexOf("个人产权")!=-1){ - return "个人产权"; + if(property_life.indexOf("涓汉浜ф潈")!=-1){ + return "涓汉浜ф潈"; } } } @@ -266,7 +266,7 @@ class FieldValidatorUtils { } /** - * 预售许可证 + * 棰勫敭璁稿彲璇� * @param licence * @return */ @@ -283,7 +283,7 @@ class FieldValidatorUtils { /** - * 配套设施 + * 閰嶅璁炬柦 * @param licence * @return */ @@ -303,7 +303,7 @@ class FieldValidatorUtils { /** - * 交通情况 + *銆�浜ら�氭儏鍐� * @param licence * @return */ @@ -319,7 +319,7 @@ class FieldValidatorUtils { /** - * 描述 + *銆�鎻忚堪 * @param licence * @return */ @@ -337,7 +337,7 @@ class FieldValidatorUtils { /** - *售楼地址 + *鍞ゼ鍦板潃 * @param licence * @return */ @@ -382,7 +382,7 @@ class FieldValidatorUtils { } /** - * 楼层情况 + * 妤煎眰鎯呭喌 * @param floor_info * @return */ @@ -403,8 +403,8 @@ class FieldValidatorUtils { /** * string - * 入住时间 - * 仅限数字: 2014-2-8、2014-2、2014,不含有“年、月、日、初、中、上旬、中旬、下旬、底等”中文字。 + * 鍏ヤ綇鏃堕棿 + * 浠呴檺鏁板瓧: 2014-2-8銆�2014-2銆�2014锛屼笉鍚湁鈥滃勾銆佹湀銆佹棩銆佸垵銆佷腑銆佷笂鏃�佷腑鏃�佷笅鏃�佸簳绛夆�濅腑鏂囧瓧銆� * @param live_date * @return */ @@ -457,7 +457,7 @@ class FieldValidatorUtils { return null; } /** - * 仅限数字: 2014-2-8、2014-2、2014,不含有“年、月、日、初、中、上旬、中旬、下旬、底等”中文字。 + * 浠呴檺鏁板瓧: 2014-2-8銆�2014-2銆�2014锛屼笉鍚湁鈥滃勾銆佹湀銆佹棩銆佸垵銆佷腑銆佷笂鏃�佷腑鏃�佷笅鏃�佸簳绛夆�濅腑鏂囧瓧銆� * @param build_date * @return */ @@ -467,8 +467,8 @@ class FieldValidatorUtils { } /** * datetime - * 开盘时间 - * 仅限数字: 2014-2-8、2014-2、2014,不含有“年、月、日、初、中、上旬、中旬、下旬、底等”中文字。 + * 寮�鐩樻椂闂� + * 浠呴檺鏁板瓧: 2014-2-8銆�2014-2銆�2014锛屼笉鍚湁鈥滃勾銆佹湀銆佹棩銆佸垵銆佷腑銆佷笂鏃�佷腑鏃�佷笅鏃�佸簳绛夆�濅腑鏂囧瓧銆� * @param open_date * @return */ @@ -479,7 +479,7 @@ class FieldValidatorUtils { return open_date; }else if(open_date instanceof String){ - open_date = open_date.replace("年","-").replace("月","-").replace("日",""); + open_date = open_date.replace("骞�","-").replace("鏈�","-").replace("鏃�",""); try{ open_date = parseStringToDate(open_date, "yyyy-MM-dd"); if(open_date){ @@ -503,8 +503,8 @@ class FieldValidatorUtils { /** * string - * 开工时间 - * 仅限数字: 2014-2-8、2014-2、2014,不含有“年、月、日、初、中、上旬、中旬、下旬、底等”中文字。 + * 寮�宸ユ椂闂� + * 浠呴檺鏁板瓧: 2014-2-8銆�2014-2銆�2014锛屼笉鍚湁鈥滃勾銆佹湀銆佹棩銆佸垵銆佷腑銆佷笂鏃�佷腑鏃�佷笅鏃�佸簳绛夆�濅腑鏂囧瓧銆� * @param start_building_date * @return */ @@ -514,8 +514,8 @@ class FieldValidatorUtils { } /** * string - * 竣工时间 - * 仅限数字: 2014-2-8、2014-2、2014,不含有“年、月、日、初、中、上旬、中旬、下旬、底等”中文字。 + * 绔e伐鏃堕棿 + * 浠呴檺鏁板瓧: 2014-2-8銆�2014-2銆�2014锛屼笉鍚湁鈥滃勾銆佹湀銆佹棩銆佸垵銆佷腑銆佷笂鏃�佷腑鏃�佷笅鏃�佸簳绛夆�濅腑鏂囧瓧銆� * @param finish_building_date * @return */ @@ -575,7 +575,7 @@ class FieldValidatorUtils { return null; } } else{ - println value + "不是数字类型......"; + println value + "涓嶆槸鏁板瓧绫诲瀷......"; return null; } } @@ -585,15 +585,15 @@ class FieldValidatorUtils { /** - * 正则表达式去掉多余的.与0 + * 姝e垯琛ㄨ揪寮忓幓鎺夊浣欑殑.涓�0 * @param s * @return */ static def subZeroAndDot(String v){ // if(s.indexOf(".") > 0){ -// s = s.replaceAll(/0+?/, "");//去掉多余的0 +// s = s.replaceAll(/0+?/, "");//鍘绘帀澶氫綑鐨�0 // if(s.endsWith(".")){ -// s = s.replaceAll(/[.]/, "");//如最后一位是.则去掉 +// s = s.replaceAll(/[.]/, "");//濡傛渶鍚庝竴浣嶆槸.鍒欏幓鎺� // } // } if(v){ @@ -623,7 +623,7 @@ class FieldValidatorUtils { /** - * 提取浮点数与整数 + * 鎻愬彇娴偣鏁颁笌鏁存暟 */ static def getNumber(def input) { Pattern pattern = Pattern.compile("\\d+(\\.\\d+)?"); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/datastore/SeaweedFiedValidator.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/datastore/SeaweedFiedValidator.groovy index e412c137a..56346e4d4 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/datastore/SeaweedFiedValidator.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/datastore/SeaweedFiedValidator.groovy @@ -26,7 +26,7 @@ import com.mongodb.DBCollection; import com.mongodb.DBObject; import com.fangjia.script.util.MongoUtils /** - * 对seaweed表中的字段进行规范化 + * 瀵箂eaweed琛ㄤ腑鐨勫瓧娈佃繘琛岃鑼冨寲 * @author gaojuan * */ @@ -36,9 +36,9 @@ class SeaweedFiedValidator { public static final DBCollection SERVER_AREA_COLL = MongoUtils.getCollectionByName("fangjia", "server_area", "mongo.db.fangjia.com") public static final DBCollection REGION_BLOCK_COLL = MongoUtils.getCollectionByName("fangjia", "region_block", "mongo.db.fangjia.com") - static final xiaoqus = ["住宅","普通住宅","普通公寓","公寓","高层","小高层","多层","经济适用房","花园洋房","豪华住宅","住宅小区","小区","老公房","板楼","新里洋房"]; - static final biesus = ["别墅","叠拼别墅","叠加别墅","双拼别墅","独立别墅","独栋别墅"]; - static final shangzhus = ["商住","商住两用","商住楼","商住房","酒店式公寓","酒店公寓","高尚住宅","商业","商住公寓"]; + static final xiaoqus = ["浣忓畢","鏅�氫綇瀹�","鏅�氬叕瀵�","鍏瘬","楂樺眰","灏忛珮灞�","澶氬眰","缁忔祹閫傜敤鎴�","鑺卞洯娲嬫埧","璞崕浣忓畢","浣忓畢灏忓尯","灏忓尯","鑰佸叕鎴�","鏉挎ゼ","鏂伴噷娲嬫埧"]; + static final biesus = ["鍒","鍙犳嫾鍒","鍙犲姞鍒","鍙屾嫾鍒","鐙珛鍒","鐙爧鍒"]; + static final shangzhus = ["鍟嗕綇","鍟嗕綇涓ょ敤","鍟嗕綇妤�","鍟嗕綇鎴�","閰掑簵寮忓叕瀵�","閰掑簵鍏瘬","楂樺皻浣忓畢","鍟嗕笟","鍟嗕綇鍏瘬"]; public static void main(String[] args) { @@ -56,7 +56,7 @@ class SeaweedFiedValidator { // def blockMap = getBlock(city); // def districts = getAllDistricts(city, "district"); - println "【${city}】"+city_count + println "銆�${city}銆�"+city_count println "[ "+city_count+" "+city+" ]"+districts.size(); //def updateCount = fieldValidator(updateIndex, districts, regions, blockMap, supportBlockMap.get(city)); def updateCount = fieldValidator(updateIndex, districts, null, null, null); @@ -164,7 +164,7 @@ class SeaweedFiedValidator { def ret = [:]; for(def dbo : dbCursor){ def city = dbo.get("display"); - if(city!='全国'){ + if(city!='鍏ㄥ浗'){ def isSupportBlock = dbo.get("support_block"); ret.put(city, isSupportBlock); } @@ -179,7 +179,7 @@ class SeaweedFiedValidator { if(cursor){ for(def dbo : cursor){ def city = dbo.get("display"); - if(city!='全国'){ + if(city!='鍏ㄥ浗'){ citys << city; } } @@ -503,8 +503,8 @@ class SeaweedFiedValidator { /** * estate_type2 * string - * 物业类型 - * 按照标准:普通住宅、别墅 + * 鐗╀笟绫诲瀷 + * 鎸夌収鏍囧噯锛氭櫘閫氫綇瀹呫�佸埆澧� * @return */ private def estateTypeValidator(estate_type, cat){ @@ -513,40 +513,40 @@ class SeaweedFiedValidator { if(StringUtils.isNotBlank(estate_type)){ if(cat=="office"){ - def types = ["标准写字楼","商住两用楼 ","商业综合楼","酒店商务楼","园区写字楼"]; + def types = ["鏍囧噯鍐欏瓧妤�","鍟嗕綇涓ょ敤妤� ","鍟嗕笟缁煎悎妤�","閰掑簵鍟嗗姟妤�","鍥尯鍐欏瓧妤�"]; for(def type : types){ if(estate_type.indexOf(type)!=-1){ ret << type } } - if(estate_type.indexOf("住宅")!=-1&&estate_type.indexOf("写字楼")!=-1){ - if(!ret.contains("商住两用楼")){ - ret << "商住两用楼" + if(estate_type.indexOf("浣忓畢")!=-1&&estate_type.indexOf("鍐欏瓧妤�")!=-1){ + if(!ret.contains("鍟嗕綇涓ょ敤妤�")){ + ret << "鍟嗕綇涓ょ敤妤�" } - }else if(estate_type.indexOf("公寓")!=-1&&estate_type.indexOf("写字楼")!=-1||estate_type.indexOf("商住公寓")!=-1){ - if(!ret.contains("商住两用楼")){ - ret << "商住两用楼" + }else if(estate_type.indexOf("鍏瘬")!=-1&&estate_type.indexOf("鍐欏瓧妤�")!=-1||estate_type.indexOf("鍟嗕綇鍏瘬")!=-1){ + if(!ret.contains("鍟嗕綇涓ょ敤妤�")){ + ret << "鍟嗕綇涓ょ敤妤�" } } if(ret.size() > 0){ s = ret.join(",") } }else if(cat=="mall"){ - def types = ["商业街商铺","市场类商铺","社区内铺","住宅底商","百货购物中心商铺","商业综合体","商务区商铺","交通设施商铺"]; + def types = ["鍟嗕笟琛楀晢閾�","甯傚満绫诲晢閾�","绀惧尯鍐呴摵","浣忓畢搴曞晢","鐧捐揣璐墿涓績鍟嗛摵","鍟嗕笟缁煎悎浣�","鍟嗗姟鍖哄晢閾�","浜ら�氳鏂藉晢閾�"]; for(def type : types){ if(estate_type.indexOf(type)!=-1){ ret << type } } - if(estate_type.indexOf("综合体")!=-1||estate_type.indexOf("购物中心")!=-1){ - if(!ret.contains("百货购物中心商铺")){ - ret << "百货购物中心商铺" + if(estate_type.indexOf("缁煎悎浣�")!=-1||estate_type.indexOf("璐墿涓績")!=-1){ + if(!ret.contains("鐧捐揣璐墿涓績鍟嗛摵")){ + ret << "鐧捐揣璐墿涓績鍟嗛摵" } - }else if(estate_type.indexOf("社区商铺")!=-1){ - if(!ret.contains("社区内铺")){ - ret << "社区内铺" + }else if(estate_type.indexOf("绀惧尯鍟嗛摵")!=-1){ + if(!ret.contains("绀惧尯鍐呴摵")){ + ret << "绀惧尯鍐呴摵" } } @@ -555,11 +555,11 @@ class SeaweedFiedValidator { s = ret.join(",") } }else{ - if(estate_type.indexOf("别墅")!=-1){ - ret << "别墅" + if(estate_type.indexOf("鍒")!=-1){ + ret << "鍒" } - if(estate_type.indexOf("住宅")!=-1||estate_type.indexOf("商住公寓")!=-1){ - ret << "普通住宅" + if(estate_type.indexOf("浣忓畢")!=-1||estate_type.indexOf("鍟嗕綇鍏瘬")!=-1){ + ret << "鏅�氫綇瀹�" } if(ret.size()==2){ ret = ret.reverse(); @@ -574,15 +574,15 @@ class SeaweedFiedValidator { } /** - * 不低于2个字(或者“按照区域标准”) + * 涓嶄綆浜�2涓瓧锛堟垨鑰呪�滄寜鐓у尯鍩熸爣鍑嗏�濓級 */ private def regionValidator(def region, def regions){ if(region){ if(regions.contains(region)){ return region; }else{ - if(region.indexOf("区")!=-1){ - def tempRegion = region.replace("区",""); + if(region.indexOf("鍖�")!=-1){ + def tempRegion = region.replace("鍖�",""); if(tempRegion.size()>=2){ region = tempRegion; } @@ -603,18 +603,18 @@ class SeaweedFiedValidator { } /** * name - * 小区名称 - * 去除首尾空格 + * 灏忓尯鍚嶇О + * 鍘婚櫎棣栧熬绌烘牸 */ private def NameValidator(def name, def cat){ if(name){ - def keys = ["商业中心","车位","车库","酒店","购物中心","广场","国际广场","商务中心","地块","商务楼","百货","商用房","厂房","开发区"]; + def keys = ["鍟嗕笟涓績","杞︿綅","杞﹀簱","閰掑簵","璐墿涓績","骞垮満","鍥介檯骞垮満","鍟嗗姟涓績","鍦板潡","鍟嗗姟妤�","鐧捐揣","鍟嗙敤鎴�","鍘傛埧","寮�鍙戝尯"]; if(cat=="district"){ for(def key : keys){ - if(key=="酒店"&&name.indexOf("公寓")!=-1){ - def index1 = name.indexOf("公寓"); - def index2 = name.indexOf("酒店"); + if(key=="閰掑簵"&&name.indexOf("鍏瘬")!=-1){ + def index1 = name.indexOf("鍏瘬"); + def index2 = name.indexOf("閰掑簵"); if(index2 > index1){ return ""; } @@ -642,7 +642,7 @@ class SeaweedFiedValidator { } /** - * 不低于2个字(或者“按照板块标准”) + * 涓嶄綆浜�2涓瓧锛堟垨鑰呪�滄寜鐓ф澘鍧楁爣鍑嗏�濓級 * @param block * @return */ @@ -659,7 +659,7 @@ class SeaweedFiedValidator { if(blocks && blocks.contains(block)){ return block; }else{ - block = block.replace("板块","") + block = block.replace("鏉垮潡","") if(blocks && blocks.contains(block)){ return block; }else{ @@ -677,15 +677,15 @@ class SeaweedFiedValidator { /** * string - * 占地面积 - * 仅限数字,包括(小数)数字不能低于1000-100000000 + * 鍗犲湴闈㈢Н + * 浠呴檺鏁板瓧锛屽寘鎷紙灏忔暟锛夋暟瀛椾笉鑳戒綆浜�1000-100000000 * @param all_area * @return */ private def allAreaValidator(def all_area){ def value = checkValue(all_area); if(value){ - if(all_area.indexOf("万")!=-1){ + if(all_area.indexOf("涓�")!=-1){ value = value * 10000; value = value.toLong(); } @@ -702,15 +702,15 @@ class SeaweedFiedValidator { } /** * string - * 建筑面积 - * 仅限数字,包括(小数)数字不能低于10000-100000000 + * 寤虹瓚闈㈢Н + * 浠呴檺鏁板瓧锛屽寘鎷紙灏忔暟锛夋暟瀛椾笉鑳戒綆浜�10000-100000000 * @param build_area * @return */ private def buildAreaValidator(def build_area){ def value = checkValue(build_area); if(value){ - if(build_area.indexOf("万")!=-1){ + if(build_area.indexOf("涓�")!=-1){ value = value * 10000; value = value.toLong(); } @@ -728,7 +728,7 @@ class SeaweedFiedValidator { /** * string - * 容积率 仅限数字,包括(小数)数字范围:0.1-20 + * 瀹圭Н鐜� 浠呴檺鏁板瓧锛屽寘鎷紙灏忔暟锛夋暟瀛楄寖鍥达細0.1-20 * @param cubage_percent * @return */ @@ -749,7 +749,7 @@ class SeaweedFiedValidator { /** * string - * 绿化率 仅限数字,包括(小数)数字范围:10-100 + * 缁垮寲鐜� 浠呴檺鏁板瓧锛屽寘鎷紙灏忔暟锛夋暟瀛楄寖鍥达細10-100 * @param virescence_percent * @return */ @@ -770,7 +770,7 @@ class SeaweedFiedValidator { /** * string - * 物业费 仅限数字,包括(小数)数字范围:0-10 + * 鐗╀笟璐� 浠呴檺鏁板瓧锛屽寘鎷紙灏忔暟锛夋暟瀛楄寖鍥达細0-10 * @param estate_charge * @return */ @@ -790,8 +790,8 @@ class SeaweedFiedValidator { } - // car_site string 车位描述 不受限制 - // car_site_count string 停车位 仅限数字,数字范围:10-100000 + // car_site string 杞︿綅鎻忚堪 涓嶅彈闄愬埗 + // car_site_count string 鍋滆溅浣� 浠呴檺鏁板瓧锛屾暟瀛楄寖鍥达細10-100000 private def carSiteValidator(def car_site){ def value = checkValue(car_site); if(value){ @@ -806,13 +806,13 @@ class SeaweedFiedValidator { /** * string - * 街道社区 8个字以内 + * 琛楅亾绀惧尯 8涓瓧浠ュ唴 * @param street_community * @return */ private def streetValidator(def street){ if(StringUtils.isNotBlank(street)){ - def value = street.replace("街道","").replace("社区",""); + def value = street.replace("琛楅亾","").replace("绀惧尯",""); if(value){ if(value.size()<=8){ return value; @@ -827,7 +827,7 @@ class SeaweedFiedValidator { /** * loop_line_info * string - * 环线位置 6个字以内 + * 鐜嚎浣嶇疆 6涓瓧浠ュ唴 */ private def loopLineInfoValidator(def loop_line_info){ if(loop_line_info){ @@ -840,8 +840,8 @@ class SeaweedFiedValidator { /** * total_price - * 仅限数字,数字范围:10-10000 - * 单位:万元/套 + * 浠呴檺鏁板瓧锛屾暟瀛楄寖鍥达細10-10000 + * 鍗曚綅锛氫竾鍏�/濂� */ private def totalPriceValidator(def total_price){ if(total_price == -1){ @@ -864,7 +864,7 @@ class SeaweedFiedValidator { } /** - * avg_price 仅限数字,数字范围:1000-300000 + * avg_price 浠呴檺鏁板瓧锛屾暟瀛楄寖鍥达細1000-300000 */ private def avgPriceValidator(def avg_price){ if(avg_price <=0){ @@ -884,11 +884,11 @@ class SeaweedFiedValidator { /** * fitment - * 按照标准:精装、简装、毛坯 + * 鎸夌収鏍囧噯锛氱簿瑁呫�佺畝瑁呫�佹瘺鍧� */ private def fitmentValidator(def fitment){ if(fitment){ - def values = ["菜单式":"精装", "精装":"精装", "全装修":"精装","简装":"简装","基本装修":"简装","毛坯":"毛坯"]; + def values = ["鑿滃崟寮�":"绮捐", "绮捐":"绮捐", "鍏ㄨ淇�":"绮捐","绠�瑁�":"绠�瑁�","鍩烘湰瑁呬慨":"绠�瑁�","姣涘澂":"姣涘澂"]; def ret = []; def s = ""; for(def map : values){ @@ -910,7 +910,7 @@ class SeaweedFiedValidator { } /** - * developer 不含有数字,40个字以内 + * developer 涓嶅惈鏈夋暟瀛楋紝40涓瓧浠ュ唴 */ private def developerValidator(def developer){ if(developer){ @@ -921,17 +921,17 @@ class SeaweedFiedValidator { if(!developer){ return null; } - if(developer=="无"){ + if(developer=="鏃�"){ return null; } - if(developer.indexOf("暂无")!=-1||developer.indexOf("-")!=-1){ + if(developer.indexOf("鏆傛棤")!=-1||developer.indexOf("-")!=-1){ return null; } if(!developer){ return null; } - if(developer.contains("公司")&& developer.size()<=40){ + if(developer.contains("鍏徃")&& developer.size()<=40){ return developer; } @@ -951,8 +951,8 @@ class SeaweedFiedValidator { /** * string - * 物业公司 - * 包括括号()、不含有数字,20个字以内 + * 鐗╀笟鍏徃 + * 鍖呮嫭鎷彿锛堬級銆佷笉鍚湁鏁板瓧锛�20涓瓧浠ュ唴 * @param estate_company * @return */ @@ -964,8 +964,8 @@ class SeaweedFiedValidator { estate_company def value = checkValue(estate_company); if(value>0){ - if(estate_company.indexOf("公司")!=-1){ - estate_company = estate_company.substring(0, estate_company.indexOf("公司")+2); + if(estate_company.indexOf("鍏徃")!=-1){ + estate_company = estate_company.substring(0, estate_company.indexOf("鍏徃")+2); if(estate_company.size()<=40){ return estate_company; } @@ -974,12 +974,12 @@ class SeaweedFiedValidator { } }else{ - if(estate_company.indexOf("暂无")!=-1){ + if(estate_company.indexOf("鏆傛棤")!=-1){ return null; } if(estate_company.size()>40){ - if(estate_company.indexOf("公司")!=-1){ - estate_company = estate_company.substring(0, estate_company.indexOf("公司")+2); + if(estate_company.indexOf("鍏徃")!=-1){ + estate_company = estate_company.substring(0, estate_company.indexOf("鍏徃")+2); if(estate_company.size()<=40){ return estate_company; } @@ -996,7 +996,7 @@ class SeaweedFiedValidator { /** * string - * 产权年限 70、50、40 + * 浜ф潈骞撮檺 70銆�50銆�40 * @param property_life * @return */ @@ -1008,8 +1008,8 @@ class SeaweedFiedValidator { return value; } }else{ - if(property_life.indexOf("个人产权")!=-1){ - return "个人产权"; + if(property_life.indexOf("涓汉浜ф潈")!=-1){ + return "涓汉浜ф潈"; } } } @@ -1018,8 +1018,8 @@ class SeaweedFiedValidator { /** * string - * 特色 - * 不受限制,不低于2个字 + * 鐗硅壊 + * 涓嶅彈闄愬埗锛屼笉浣庝簬2涓瓧 * @param characteristic * @return */ @@ -1035,27 +1035,27 @@ class SeaweedFiedValidator { /** * string - * 建筑类型 - * 按照标准:多层、小高层、高层、超高层、独栋、双拼、联排、叠加、花园洋房、老洋房、四合院 + * 寤虹瓚绫诲瀷 + * 鎸夌収鏍囧噯锛氬灞傘�佸皬楂樺眰銆侀珮灞傘�佽秴楂樺眰銆佺嫭鏍嬨�佸弻鎷笺�佽仈鎺掋�佸彔鍔犮�佽姳鍥磱鎴裤�佽�佹磱鎴裤�佸洓鍚堥櫌 */ private def buildTypeValidator(def build_type){ if(build_type){ - def values = ["多层","独栋","双拼","联排","叠加","花园洋房","老洋房","四合院"]; + def values = ["澶氬眰","鐙爧","鍙屾嫾","鑱旀帓","鍙犲姞","鑺卞洯娲嬫埧","鑰佹磱鎴�","鍥涘悎闄�"]; def ret = []; def s = ""; - if(build_type.indexOf("小高层")!=-1){ - build_type = build_type.replace("小高层", ""); - ret << "小高层" + if(build_type.indexOf("灏忛珮灞�")!=-1){ + build_type = build_type.replace("灏忛珮灞�", ""); + ret << "灏忛珮灞�" } - if(build_type.indexOf("超高层")!=-1){ - build_type = build_type.replace("超高层", ""); - ret << "超高层" + if(build_type.indexOf("瓒呴珮灞�")!=-1){ + build_type = build_type.replace("瓒呴珮灞�", ""); + ret << "瓒呴珮灞�" } - if(build_type.indexOf("高层")!=-1){ - build_type = build_type.replace("高层", ""); - ret << "高层" + if(build_type.indexOf("楂樺眰")!=-1){ + build_type = build_type.replace("楂樺眰", ""); + ret << "楂樺眰" } for(def value : values){ @@ -1078,8 +1078,8 @@ class SeaweedFiedValidator { /** * business_quarter * string - * 商圈 - * 10个字以内 + * 鍟嗗湀 + * 10涓瓧浠ュ唴 */ private def businessQuarterValidator(def business_quarter){ if(business_quarter){ @@ -1093,8 +1093,8 @@ class SeaweedFiedValidator { /** * household_count * integer - * 户数 - * 仅限数字,数字不能低于10 + * 鎴锋暟 + * 浠呴檺鏁板瓧锛屾暟瀛椾笉鑳戒綆浜�10 */ private def householdCountValidator(def household_count){ if(household_count){ @@ -1108,25 +1108,25 @@ class SeaweedFiedValidator { /** * sell_address * string - * 售楼地址 - * 不含有“城市”和“区域”,最低3个字 + * 鍞ゼ鍦板潃 + * 涓嶅惈鏈夆�滃煄甯傗�濆拰鈥滃尯鍩熲�濓紝鏈�浣�3涓瓧 */ private def sellAddressValidator(def sell_address, def city, def regions){ if(sell_address){ - if(sell_address.indexOf("省")!=-1){ - sell_address = sell_address.substring(sell_address.indexOf("省")+1,sell_address.size()-1); + if(sell_address.indexOf("鐪�")!=-1){ + sell_address = sell_address.substring(sell_address.indexOf("鐪�")+1,sell_address.size()-1); } - sell_address = sell_address.toString().replace(city+"市", "").replace(city+"县", "").replace(city, ""); + sell_address = sell_address.toString().replace(city+"甯�", "").replace(city+"鍘�", "").replace(city, ""); for(def region : regions){ if(sell_address.contains(region)){ - if(region=='浦东'){ - sell_address = sell_address.replace(region+"新区", "") + if(region=='娴︿笢'){ + sell_address = sell_address.replace(region+"鏂板尯", "") } - sell_address = sell_address.replace(region+"区", "") - sell_address = sell_address.replace(region+"县", "") + sell_address = sell_address.replace(region+"鍖�", "") + sell_address = sell_address.replace(region+"鍘�", "") //def temp_sell_address = sell_address.replace(region, ""); -// if(!sell_address.startsWith("路")&&!temp_sell_address.startsWith("市")){ +// if(!sell_address.startsWith("璺�")&&!temp_sell_address.startsWith("甯�")){ // sell_address = sell_address; // } if(sell_address.size()>3){ @@ -1142,13 +1142,13 @@ class SeaweedFiedValidator { } /** - * 区号+数字:021-12345678 + * 鍖哄彿+鏁板瓧锛�021-12345678 * @param mobile * @return */ private def mobileValidator(def mobile){ if(mobile){ - if(mobile.indexOf("暂无")!=-1){ + if(mobile.indexOf("鏆傛棤")!=-1){ return null; }else{ return mobile; @@ -1157,7 +1157,7 @@ class SeaweedFiedValidator { // if(mobile.indexOf("-")!=-1){ // prefix = mobile.substring(0,mobile.indexOf("-")) // mobile = mobile.substring(mobile.indexOf("-")+1,mobile.size()-1) -// def arr = mobile.split("转") +// def arr = mobile.split("杞�") // if(arr.size()>0){ // def s1 = arr[0]; // s1 = s1.replace("-", ""); @@ -1180,8 +1180,8 @@ class SeaweedFiedValidator { /** * list - * 小区别名 - * 不含“地块”、“区域、板块、地址”,包括半角逗号或为空 + * 灏忓尯鍒悕 + * 涓嶅惈鈥滃湴鍧椻�濄�佲�滃尯鍩熴�佹澘鍧椼�佸湴鍧�鈥濓紝鍖呮嫭鍗婅閫楀彿鎴栦负绌� * @param alias * @return */ @@ -1190,7 +1190,7 @@ class SeaweedFiedValidator { def ret = []; if(cat == "district"){ for(def name : alias){ - if(name.indexOf("弄")==-1&&name.indexOf("路")==-1&&name.indexOf("号")==-1){ + if(name.indexOf("寮�")==-1&&name.indexOf("璺�")==-1&&name.indexOf("鍙�")==-1){ ret << name; } } @@ -1207,8 +1207,8 @@ class SeaweedFiedValidator { /** * string - * 入住时间 - * 仅限数字: 2014-2-8、2014-2、2014,不含有“年、月、日、初、中、上旬、中旬、下旬、底等”中文字。 + * 鍏ヤ綇鏃堕棿 + * 浠呴檺鏁板瓧: 2014-2-8銆�2014-2銆�2014锛屼笉鍚湁鈥滃勾銆佹湀銆佹棩銆佸垵銆佷腑銆佷笂鏃�佷腑鏃�佷笅鏃�佸簳绛夆�濅腑鏂囧瓧銆� * @param live_date * @return */ @@ -1261,7 +1261,7 @@ class SeaweedFiedValidator { return null; } /** - * 仅限数字: 2014-2-8、2014-2、2014,不含有“年、月、日、初、中、上旬、中旬、下旬、底等”中文字。 + * 浠呴檺鏁板瓧: 2014-2-8銆�2014-2銆�2014锛屼笉鍚湁鈥滃勾銆佹湀銆佹棩銆佸垵銆佷腑銆佷笂鏃�佷腑鏃�佷笅鏃�佸簳绛夆�濅腑鏂囧瓧銆� * @param build_date * @return */ @@ -1271,8 +1271,8 @@ class SeaweedFiedValidator { } /** * datetime - * 开盘时间 - * 仅限数字: 2014-2-8、2014-2、2014,不含有“年、月、日、初、中、上旬、中旬、下旬、底等”中文字。 + * 寮�鐩樻椂闂� + * 浠呴檺鏁板瓧: 2014-2-8銆�2014-2銆�2014锛屼笉鍚湁鈥滃勾銆佹湀銆佹棩銆佸垵銆佷腑銆佷笂鏃�佷腑鏃�佷笅鏃�佸簳绛夆�濅腑鏂囧瓧銆� * @param open_date * @return */ @@ -1284,8 +1284,8 @@ class SeaweedFiedValidator { } /** * string - * 开工时间 - * 仅限数字: 2014-2-8、2014-2、2014,不含有“年、月、日、初、中、上旬、中旬、下旬、底等”中文字。 + * 寮�宸ユ椂闂� + * 浠呴檺鏁板瓧: 2014-2-8銆�2014-2銆�2014锛屼笉鍚湁鈥滃勾銆佹湀銆佹棩銆佸垵銆佷腑銆佷笂鏃�佷腑鏃�佷笅鏃�佸簳绛夆�濅腑鏂囧瓧銆� * @param start_building_date * @return */ @@ -1295,8 +1295,8 @@ class SeaweedFiedValidator { } /** * string - * 竣工时间 - * 仅限数字: 2014-2-8、2014-2、2014,不含有“年、月、日、初、中、上旬、中旬、下旬、底等”中文字。 + * 绔e伐鏃堕棿 + * 浠呴檺鏁板瓧: 2014-2-8銆�2014-2銆�2014锛屼笉鍚湁鈥滃勾銆佹湀銆佹棩銆佸垵銆佷腑銆佷笂鏃�佷腑鏃�佷笅鏃�佸簳绛夆�濅腑鏂囧瓧銆� * @param finish_building_date * @return */ @@ -1305,7 +1305,7 @@ class SeaweedFiedValidator { } /** - * 提取浮点数与整数 + * 鎻愬彇娴偣鏁颁笌鏁存暟 */ public def getNumber(def input) { Pattern pattern = Pattern.compile("\\d+(\\.\\d+)?"); @@ -1359,7 +1359,7 @@ class SeaweedFiedValidator { return null; } } else{ - println value + "不是数字类型......"; + println value + "涓嶆槸鏁板瓧绫诲瀷......"; return null; } } @@ -1375,15 +1375,15 @@ class SeaweedFiedValidator { } /** - * 正则表达式去掉多余的.与0 + * 姝e垯琛ㄨ揪寮忓幓鎺夊浣欑殑.涓�0 * @param s * @return */ private def subZeroAndDot(String v){ // if(s.indexOf(".") > 0){ -// s = s.replaceAll(/0+?/, "");//去掉多余的0 +// s = s.replaceAll(/0+?/, "");//鍘绘帀澶氫綑鐨�0 // if(s.endsWith(".")){ -// s = s.replaceAll(/[.]/, "");//如最后一位是.则去掉 +// s = s.replaceAll(/[.]/, "");//濡傛渶鍚庝竴浣嶆槸.鍒欏幓鎺� // } // } if(v){ @@ -1413,7 +1413,7 @@ class SeaweedFiedValidator { /** - * 修改seaweed + * 淇敼seaweed * @param m * @param car_site_count * @param estate_type2 @@ -1570,7 +1570,7 @@ class SeaweedFiedValidator { } /** - * 将estate_type2标准化普通住宅,别墅,商住 + * 灏唀state_type2鏍囧噯鍖栨櫘閫氫綇瀹咃紝鍒锛屽晢浣� * @param estate_type * @return */ @@ -1580,7 +1580,7 @@ class SeaweedFiedValidator { def kind = ""; for(def xiaoqu : xiaoqus){ if(estate_type.indexOf(xiaoqu)!=-1){ - kind = "普通住宅"; + kind = "鏅�氫綇瀹�"; break; } } @@ -1590,7 +1590,7 @@ class SeaweedFiedValidator { if(kind.size()>1){ kind = kind + ","; } - kind = kind + "别墅"; + kind = kind + "鍒"; break; } } @@ -1600,7 +1600,7 @@ class SeaweedFiedValidator { if(kind.size()>1){ kind = kind + ","; } - kind = kind + "商住"; + kind = kind + "鍟嗕綇"; break; } } @@ -1611,7 +1611,7 @@ class SeaweedFiedValidator { /** - * 将任意字符串将成date + * 灏嗕换鎰忓瓧绗︿覆灏嗘垚date * @param date * @return */ @@ -1676,7 +1676,7 @@ class SeaweedFiedValidator { private def delHtmlTag(def htmlStr){ Pattern p_html = Pattern.compile("<[^>]+>?", Pattern.CASE_INSENSITIVE); Matcher m_html = p_html.matcher(htmlStr); - htmlStr = m_html.replaceAll(""); // 过滤html标签 + htmlStr = m_html.replaceAll(""); // 杩囨护html鏍囩 return htmlStr; } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/datastore/ShopFieldNumberic.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/datastore/ShopFieldNumberic.groovy index 05d130ea0..984566c6a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/datastore/ShopFieldNumberic.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/datastore/ShopFieldNumberic.groovy @@ -21,7 +21,7 @@ class ShopFieldNumberic { static main(args) { DBObject d = new BasicDBObject(); d.put('cat', 'district'); - d.put("city", "上海"); + d.put("city", "涓婃捣"); def c = 0; def s = 0; @@ -37,8 +37,8 @@ class ShopFieldNumberic { static main1(args) { DBObject d = new BasicDBObject(); - d.put('business_type', '餐厅'); - d.put("city", "上海"); + d.put('business_type', '椁愬巺'); + d.put("city", "涓婃捣"); def c = 0; def s = 0; @@ -55,12 +55,12 @@ class ShopFieldNumberic { static main2(args) { DBObject q = new BasicDBObject(); q.put("cat", "shop"); - q.put("city", "上海"); + q.put("city", "涓婃捣"); q.put("visible", 0); DBObject d = new BasicDBObject(); d.put('cat', 'shop'); - d.put("city", "上海"); + d.put("city", "涓婃捣"); DB_1.remove(d); SEAWEED.find(q).batchSize(100).bulk(false).each { @@ -109,8 +109,8 @@ class ShopFieldNumberic { } } - // car_site string 车位描述 不受限制 - // car_site_count string 停车位 仅限数字,数字范围:10-100000 + // car_site string 杞︿綅鎻忚堪 涓嶅彈闄愬埗 + // car_site_count string 鍋滆溅浣� 浠呴檺鏁板瓧锛屾暟瀛楄寖鍥达細10-100000 private static def carSiteValidator(def car_site){ def value = checkValue(car_site); if(value){ @@ -125,7 +125,7 @@ class ShopFieldNumberic { /** * string - * 物业费 仅限数字,包括(小数)数字范围:0-10 + * 鐗╀笟璐� 浠呴檺鏁板瓧锛屽寘鎷紙灏忔暟锛夋暟瀛楄寖鍥达細0-10 * @param estate_charge * @return */ @@ -146,8 +146,8 @@ class ShopFieldNumberic { /** * string - * 竣工时间 - * 仅限数字: 2014-2-8、2014-2、2014,不含有“年、月、日、初、中、上旬、中旬、下旬、底等”中文字。 + * 绔e伐鏃堕棿 + * 浠呴檺鏁板瓧: 2014-2-8銆�2014-2銆�2014锛屼笉鍚湁鈥滃勾銆佹湀銆佹棩銆佸垵銆佷腑銆佷笂鏃�佷腑鏃�佷笅鏃�佸簳绛夆�濅腑鏂囧瓧銆� * @param finish_building_date * @return */ @@ -218,15 +218,15 @@ class ShopFieldNumberic { /** * string - * 建筑面积 - * 仅限数字,包括(小数)数字不能低于10000-100000000 + * 寤虹瓚闈㈢Н + * 浠呴檺鏁板瓧锛屽寘鎷紙灏忔暟锛夋暟瀛椾笉鑳戒綆浜�10000-100000000 * @param build_area * @return */ public static def buildAreaValidator(def build_area){ def value = checkValue(build_area); if(value){ - if(build_area.indexOf("万")!=-1){ + if(build_area.indexOf("涓�")!=-1){ value = value * 10000; value = value.toLong(); } @@ -262,7 +262,7 @@ class ShopFieldNumberic { return null; } } else{ - println value + "不是数字类型......"; + println value + "涓嶆槸鏁板瓧绫诲瀷......"; return null; } } @@ -271,7 +271,7 @@ class ShopFieldNumberic { } /** - * 提取浮点数与整数 + * 鎻愬彇娴偣鏁颁笌鏁存暟 */ public static def getNumber(def input) { Pattern pattern = Pattern.compile("\\d+(\\.\\d+)?"); @@ -305,15 +305,15 @@ class ShopFieldNumberic { } /** - * 正则表达式去掉多余的.与0 + * 姝e垯琛ㄨ揪寮忓幓鎺夊浣欑殑.涓�0 * @param s * @return */ private static def subZeroAndDot(String v){ // if(s.indexOf(".") > 0){ - // s = s.replaceAll(/0+?/, "");//去掉多余的0 + // s = s.replaceAll(/0+?/, "");//鍘绘帀澶氫綑鐨�0 // if(s.endsWith(".")){ - // s = s.replaceAll(/[.]/, "");//如最后一位是.则去掉 + // s = s.replaceAll(/[.]/, "");//濡傛渶鍚庝竴浣嶆槸.鍒欏幓鎺� // } // } if(v){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/datastore/UpdateOpenDate.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/datastore/UpdateOpenDate.groovy index d469ec6e5..4adaef91c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/datastore/UpdateOpenDate.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/datastore/UpdateOpenDate.groovy @@ -33,7 +33,7 @@ class UpdateOpenDate { static main(args) { def task = new UpdateOpenDate(); - task.getAllDistricts("南京","district"); + task.getAllDistricts("鍗椾含","district"); } public DSCollection getDataStoreConnection(){ @@ -76,7 +76,7 @@ class UpdateOpenDate { DBObject query = new BasicDBObject(); query.put("_id", obj.get("_id")); getDataStoreConnection().update(query, new BasicDBObject('$set', udata)) - println index +" 修改。。。。"+obj.get("_id") + println index +" 淇敼銆傘�傘�傘��"+obj.get("_id") index ++; } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/datastore/UpdateSeaweedCat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/datastore/UpdateSeaweedCat.groovy index 678dcd14d..0c4b33116 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/datastore/UpdateSeaweedCat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/datastore/UpdateSeaweedCat.groovy @@ -69,7 +69,7 @@ class UpdateSeaweedCat { if(cursor){ for(def dbo : cursor){ def city = dbo.get("display"); - if(city!='全国'){ + if(city!='鍏ㄥ浗'){ citys << city; } } @@ -83,12 +83,12 @@ class UpdateSeaweedCat { for(def district : districts){ def estate_type = district.estate_type; if(estate_type){ - if(estate_type.indexOf("普通住宅")==-1&&estate_type.indexOf("别墅")==-1){ - if(estate_type.indexOf("购物中心")!=-1){ + if(estate_type.indexOf("鏅�氫綇瀹�")==-1&&estate_type.indexOf("鍒")==-1){ + if(estate_type.indexOf("璐墿涓績")!=-1){ DBObject q = new BasicDBObject(); q.put("_id", new ObjectId(district.id)); getDataStoreConnection().remove(q); - }else if(estate_type.equals("办公")||estate_type.equals("商业;办公")){ + }else if(estate_type.equals("鍔炲叕")||estate_type.equals("鍟嗕笟;鍔炲叕")){ DBObject q = new BasicDBObject(); q.put("_id", new ObjectId(district.id)); getDataStoreConnection().remove(q); @@ -101,10 +101,10 @@ class UpdateSeaweedCat { // def estate_type2 = district.estate_type2; // if(estate_type2){ // def cat = ""; -// if(estate_type2=="写字楼"||estate_type2=="办公楼"){ +// if(estate_type2=="鍐欏瓧妤�"||estate_type2=="鍔炲叕妤�"){ // cat = "office"; // } -// if(estate_type2=="商铺"){ +// if(estate_type2=="鍟嗛摵"){ // cat = "shop"; // } // if(cat){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/datastore/VillaSplit.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/datastore/VillaSplit.groovy index fc361362d..c805434d8 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/datastore/VillaSplit.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/datastore/VillaSplit.groovy @@ -23,7 +23,7 @@ class VillaSplit { Pattern p_html = Pattern.compile("<[^>]+>?", Pattern.CASE_INSENSITIVE); Matcher m_html = p_html.matcher(s); - s = m_html.replaceAll(""); // 过滤html标签 + s = m_html.replaceAll(""); // 杩囨护html鏍囩 println s } @@ -46,7 +46,7 @@ class VillaSplit { if(cursor){ for(def dbo : cursor){ def city = dbo.get("display"); - if(city!='全国'){ + if(city!='鍏ㄥ浗'){ citys << city; } } @@ -133,7 +133,7 @@ class VillaSplit { private def updateDistrict(district){ DBObject udata = new BasicDBObject(); udata.put("m_date", new Date()); - udata.put("estate_type2", "普通住宅"); + udata.put("estate_type2", "鏅�氫綇瀹�"); DBObject q = new BasicDBObject(); q.put("_id", new ObjectId(district.id)); @@ -142,8 +142,8 @@ class VillaSplit { private def saveDistrict(def district){ district.remove("id"); - district.name = district.name + "别墅"; - district.estate_type2 = "别墅"; + district.name = district.name + "鍒"; + district.estate_type2 = "鍒"; def obj = findDistrict(district.city, district.region, district.name); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/datastore/datastore_Test.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/datastore/datastore_Test.groovy index fd855d6d8..0c75dc7ae 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/datastore/datastore_Test.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/datastore/datastore_Test.groovy @@ -8,11 +8,11 @@ import com.mongodb.DBObject DSCollection seawater = new DataStore("192.168.10.11", 27777).getCollection("fangjia.seawater") BasicDBObject query = new BasicDBObject(); -query.put("city", "上海") -query.put("region", "浦东") +query.put("city", "涓婃捣") +query.put("region", "娴︿笢") //query.put("p_date", new BasicDBObject("$gte", startDate).append("$lt", endDate)); query.put("p_date", new BasicDBObject('$gte', 20170925)); -//query.put("district_name", "张江东区人才公寓") +//query.put("district_name", "寮犳睙涓滃尯浜烘墠鍏瘬") DSCursor cursor = seawater.find(query, new BasicDBObject("p_date", -1)).limit(100); Iterator it = cursor.iterator() def i = 0 diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/BaseDealPriceCrawlerBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/BaseDealPriceCrawlerBatch.groovy index 044048366..8c9d8a4f7 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/BaseDealPriceCrawlerBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/BaseDealPriceCrawlerBatch.groovy @@ -5,7 +5,7 @@ import com.fangjia.script.util.MongoUtils import com.mongodb.DBCollection /** - * 功能说明:成交数据基类 + * 鍔熻兘璇存槑:鎴愪氦鏁版嵁鍩虹被 */ abstract class BaseDealPriceCrawlerBatch extends BaseBatch { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/CCBdealPrice.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/CCBdealPrice.groovy index 195d342a8..799c7f3e2 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/CCBdealPrice.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/CCBdealPrice.groovy @@ -33,7 +33,7 @@ class CCBdealPrice { static void main(String[] args) { def t = new CCBdealPrice(); - def city = "上海" + def city = "涓婃捣" // t.esfRun(city); // t.esfRun2(); @@ -79,17 +79,17 @@ class CCBdealPrice { ret << dbo; if(ret.size()%60000==0){ esfPool2(city, ret); - println "6万执行完成......" + println "6涓囨墽琛屽畬鎴�......" ret = []; } } if(ret.size()>0){ - println "不足6万:"+ret.size(); + println "涓嶈冻6涓囷細"+ret.size(); esfPool2(city, ret); } //esfPool1(city, ret); - println "结束:"+new Date().toLocaleString() + println "缁撴潫锛�"+new Date().toLocaleString() } @@ -99,7 +99,7 @@ class CCBdealPrice { for(def dbo : ret){ index++; - println "【"+index + "】"+dbo._id.toString() + println "銆�"+index + "銆�"+dbo._id.toString() String region = RegionData.formatRegion(city, dbo.CJ_XQ) if(region){ dbo.CJ_XQ = region; @@ -115,7 +115,7 @@ class CCBdealPrice { dbo.CJ_JZMJ = dbo.CJ_JZMJ?dbo.CJ_JZMJ.toDouble():null; dbo.CJ_CJDJ = dbo.CJ_CJDJ?dbo.CJ_CJDJ.toDouble():null; // dbo.CJ_CS = dbo.CJ_CS?dbo.CJ_CS.toDouble():null; - if(dbo.CJ_HXWZ && dbo.CJ_HXWZ=="所有"){ + if(dbo.CJ_HXWZ && dbo.CJ_HXWZ=="鎵�鏈�"){ dbo.CJ_HXWZ = null; } if(dbo.CJ_CJDJ){ @@ -136,7 +136,7 @@ class CCBdealPrice { try{ dbo.CJ_JGRQ = DateUtils.parseFromTightYYYYMMDD(dbo.CJ_JGRQ) }catch(Exception ef){ - println "日期转换不了:"+dbo.CJ_JGRQ + println "鏃ユ湡杞崲涓嶄簡锛�"+dbo.CJ_JGRQ dbo.CJ_JGRQ = null; } @@ -175,23 +175,23 @@ class CCBdealPrice { dbo.SRRQ = null; } dbo.USE_TYPE = getStandarType(dbo.CJ_FWYT); - dbo.CJ_XXLB = setDefaultNullValue(["成交价","存量房地产","差价换房","北新泾西","房产之窗","成交楼市20","挂牌","四团","期房","收购","成交日期","批量成交","售后公房","交易所","中介","网上","补地价","成交2005/3","置换","交易网","未知","拍卖","成交均价","成交","淮海中路","机场","茶价换房","成交楼市","1"], dbo.XXLB); - dbo.CJ_CX = processCx( dbo.CJ_CX);//朝向 - dbo.CJ_FWJG = processJieGou(dbo.CJ_FWJG);//结构 - dbo.CJ_FWLX = processFWLX(dbo.CJ_FWLX);//房屋类型 - dbo.CJ_CS = processHeight(dbo.CJ_CS);//总楼层 + dbo.CJ_XXLB = setDefaultNullValue(["鎴愪氦浠�","瀛橀噺鎴垮湴浜�","宸环鎹㈡埧","鍖楁柊娉捐タ","鎴夸骇涔嬬獥","鎴愪氦妤煎競20","鎸傜墝","鍥涘洟","鏈熸埧","鏀惰喘","鎴愪氦鏃ユ湡","鎵归噺鎴愪氦","鍞悗鍏埧","浜ゆ槗鎵�","涓粙","缃戜笂","琛ュ湴浠�","鎴愪氦2005/3","缃崲","浜ゆ槗缃�","鏈煡","鎷嶅崠","鎴愪氦鍧囦环","鎴愪氦","娣捣涓矾","鏈哄満","鑼朵环鎹㈡埧","鎴愪氦妤煎競","1"], dbo.XXLB); + dbo.CJ_CX = processCx( dbo.CJ_CX);//鏈濆悜 + dbo.CJ_FWJG = processJieGou(dbo.CJ_FWJG);//缁撴瀯 + dbo.CJ_FWLX = processFWLX(dbo.CJ_FWLX);//鎴垮眿绫诲瀷 + dbo.CJ_CS = processHeight(dbo.CJ_CS);//鎬绘ゼ灞� def obj = ESF_DEAL_PRICE_COLL.findOne(new BasicDBObject("_id", dbo._id)); if(!obj){ ret << dbo } if(index%5000==0){ - println "第 "+(index/5000)+" 个"+ret.size() + println "绗� "+(index/5000)+" 涓�"+ret.size() ESF_DEAL_PRICE_COLL.insert(ret) ret = [] } } if(ret.size()>0){ - println "(最后) "+ret.size() + println "(鏈�鍚�) "+ret.size() ESF_DEAL_PRICE_COLL.insert(ret) } } @@ -235,7 +235,7 @@ class CCBdealPrice { dbo.CJ_JZMJ = dbo.CJ_JZMJ?dbo.CJ_JZMJ.toDouble():null; dbo.CJ_CJDJ = dbo.CJ_CJDJ?dbo.CJ_CJDJ.toDouble():null; // dbo.CJ_CS = dbo.CJ_CS?dbo.CJ_CS.toDouble():null; - if(dbo.CJ_HXWZ && dbo.CJ_HXWZ=="所有"){ + if(dbo.CJ_HXWZ && dbo.CJ_HXWZ=="鎵�鏈�"){ dbo.CJ_HXWZ = null; } if(dbo.CJ_CJDJ){ @@ -256,7 +256,7 @@ class CCBdealPrice { try{ dbo.CJ_JGRQ = DateUtils.parseFromTightYYYYMMDD(dbo.CJ_JGRQ) }catch(Exception ef){ - println "日期转换不了:"+dbo.CJ_JGRQ + println "鏃ユ湡杞崲涓嶄簡锛�"+dbo.CJ_JGRQ dbo.CJ_JGRQ = null; } @@ -295,11 +295,11 @@ class CCBdealPrice { dbo.SRRQ = null; } dbo.USE_TYPE = getStandarType(dbo.CJ_FWYT); - dbo.CJ_XXLB = setDefaultNullValue(["成交价","存量房地产","差价换房","北新泾西","房产之窗","成交楼市20","挂牌","四团","期房","收购","成交日期","批量成交","售后公房","交易所","中介","网上","补地价","成交2005/3","置换","交易网","未知","拍卖","成交均价","成交","淮海中路","机场","茶价换房","成交楼市","1"], dbo.XXLB); - dbo.CJ_CX = processCx( dbo.CJ_CX);//朝向 - dbo.CJ_FWJG = processJieGou(dbo.CJ_FWJG);//结构 - dbo.CJ_FWLX = processFWLX(dbo.CJ_FWLX);//房屋类型 - dbo.CJ_CS = processHeight(dbo.CJ_CS);//总楼层 + dbo.CJ_XXLB = setDefaultNullValue(["鎴愪氦浠�","瀛橀噺鎴垮湴浜�","宸环鎹㈡埧","鍖楁柊娉捐タ","鎴夸骇涔嬬獥","鎴愪氦妤煎競20","鎸傜墝","鍥涘洟","鏈熸埧","鏀惰喘","鎴愪氦鏃ユ湡","鎵归噺鎴愪氦","鍞悗鍏埧","浜ゆ槗鎵�","涓粙","缃戜笂","琛ュ湴浠�","鎴愪氦2005/3","缃崲","浜ゆ槗缃�","鏈煡","鎷嶅崠","鎴愪氦鍧囦环","鎴愪氦","娣捣涓矾","鏈哄満","鑼朵环鎹㈡埧","鎴愪氦妤煎競","1"], dbo.XXLB); + dbo.CJ_CX = processCx( dbo.CJ_CX);//鏈濆悜 + dbo.CJ_FWJG = processJieGou(dbo.CJ_FWJG);//缁撴瀯 + dbo.CJ_FWLX = processFWLX(dbo.CJ_FWLX);//鎴垮眿绫诲瀷 + dbo.CJ_CS = processHeight(dbo.CJ_CS);//鎬绘ゼ灞� ESF_DEAL_PRICE_COLL.save(dbo) } } @@ -315,7 +315,7 @@ class CCBdealPrice { while(dbsocur.hasNext()){ index++; def dbo = dbsocur.next(); - println "【"+index + "】"+dbo._id.toString() + println "銆�"+index + "銆�"+dbo._id.toString() String region = RegionData.formatRegion(city, dbo.QUXIAN) if(region){ dbo.QUXIAN = region; @@ -336,7 +336,7 @@ class CCBdealPrice { try{ dbo.CJRQ = DateUtils.parseFromTightYYYYMMDD(dbo.CJRQ) }catch(Exception ef){ - println "日期转换不了:"+dbo.CJRQ + println "鏃ユ湡杞崲涓嶄簡锛�"+dbo.CJRQ dbo.CJRQ = null; } } @@ -369,13 +369,13 @@ class CCBdealPrice { dbo.USE_TYPE = getStandarType(dbo.FWYT); ret << dbo if(index%5000==0){ - println "第 "+(index/5000)+" 个"+ret.size() + println "绗� "+(index/5000)+" 涓�"+ret.size() NEW_DEAL_PRICE_COLL.insert(ret) ret = [] } } if(ret.size()>0){ - println "(最后)"+ret.size() + println "(鏈�鍚�)"+ret.size() NEW_DEAL_PRICE_COLL.insert(ret) } @@ -393,35 +393,35 @@ class CCBdealPrice { DBObject newDbo = new BasicDBObject(); newDbo._id = dbo._id; newDbo.youdaId = dbo.ID; - //地址 + //鍦板潃 newDbo.address = dbo.ZH; - //单价(元) + //鍗曚环锛堝厓锛� newDbo.price = dbo.CJDJ; - //总价(万元) + //鎬讳环锛堜竾鍏冿級 newDbo.totalPrice = dbo.CJJE; - //成交时间 Date + //鎴愪氦鏃堕棿 Date newDbo.transactionTime = dbo.CJRQ; - //楼层 int + //妤煎眰 int newDbo.floor = dbo.LC; - //用途 + //鐢ㄩ�� newDbo.purpose = dbo.FWYT; - //区域 + //鍖哄煙 newDbo.region = dbo.QUXIAN; - //性质 + //鎬ц川 newDbo.nature = dbo.XINGZHI; - //房型 + //鎴垮瀷 newDbo.houseModel = dbo.FX?dbo.FX:''; - //面积 double + //闈㈢Н double newDbo.area = dbo.JZMJ; - //小区名 + //灏忓尯鍚� newDbo.districtName = dbo.MINGCHENG?dbo.MINGCHENG:''; - // 环线位置 + // 鐜嚎浣嶇疆 newDbo.loopPosition = dbo.HXWZ?dbo.HXWZ:''; - //板块 + //鏉垮潡 newDbo.block = dbo.BANKUAI?dbo.BANKUAI:''; - //室号 + //瀹ゅ彿 newDbo.roomNumber = dbo.SH?dbo.SH:''; - //房屋类型 + //鎴垮眿绫诲瀷 newDbo.houseType = dbo.USE_TYPE; newDbo.fjCity = dbo.fj_city?dbo.fj_city:''; newDbo.fjRegion = dbo.fj_region?dbo.fj_region:''; @@ -429,22 +429,22 @@ class CCBdealPrice { newDbo.fjAddress = dbo.fj_address?dbo.fj_address:''; ret << newDbo if(index%5000==0){ - println "第 "+(index/5000)+" 个"+ret.size() + println "绗� "+(index/5000)+" 涓�"+ret.size() NEW_DEAL_PRICE_FJ_COLL.insert(ret) ret = [] } } if(ret.size()>0){ - println "(最后)"+ret.size() + println "(鏈�鍚�)"+ret.size() NEW_DEAL_PRICE_FJ_COLL.insert(ret) } } def processCx(def cx){ if(cx){ - if(cx=="1012"||cx=="内"){ + if(cx=="1012"||cx=="鍐�"){ return null; - }else if(cx.toString().startsWith("、")){ + }else if(cx.toString().startsWith("銆�")){ cx = cx.toString().substring(1, cx.toString().length()) } } @@ -453,16 +453,16 @@ class CCBdealPrice { def processJieGou(def s){ if(s){ - if(s.indexOf("砖木")>-1){ - return "砖木" - }else if(s.indexOf("钢结构")>-1){ - return "钢结构"; - }else if(s.indexOf("砖混")>-1){ - return "砖混"; - }else if(s.indexOf("框架")>-1){ - return "框架"; - }else if(s.indexOf("混合")>-1){ - return "混合"; + if(s.indexOf("鐮栨湪")>-1){ + return "鐮栨湪" + }else if(s.indexOf("閽㈢粨鏋�")>-1){ + return "閽㈢粨鏋�"; + }else if(s.indexOf("鐮栨贩")>-1){ + return "鐮栨贩"; + }else if(s.indexOf("妗嗘灦")>-1){ + return "妗嗘灦"; + }else if(s.indexOf("娣峰悎")>-1){ + return "娣峰悎"; } } return null; @@ -481,7 +481,7 @@ class CCBdealPrice { } if(s){ - def types = ["室","\r","待定","2003","未知","内环以内","美元","外环以外","三房","成交"] + def types = ["瀹�","\r","寰呭畾","2003","鏈煡","鍐呯幆浠ュ唴","缇庡厓","澶栫幆浠ュ","涓夋埧","鎴愪氦"] s = setDefaultNullValue(types, s) } } @@ -529,83 +529,83 @@ class CCBdealPrice { } def getUseType(s){ - def type = "其它" - def type1 = ["公寓","别墅","新工房","老公房","花园住宅","里弄房", "旧式里弄","商品房","存量房"] - def type2 = ["办公","写字楼"] - def type3 = ["商住"] - def type4 = ["商业", "商场", "会所","店铺", "商铺"] - def type5 = ["综合"] - def type6 = ["绿化"] - def type7 = ["公共设施"] - def type8 = ["医疗"] - def type9 = ["集体建设用地"] - def type10 = ["教育"] - def type11 = ["工业"] - def type12 = ["国有农地"] - def type13 = ["集体农地"] - def type14 = ["宅基地"] + def type = "鍏跺畠" + def type1 = ["鍏瘬","鍒","鏂板伐鎴�","鑰佸叕鎴�","鑺卞洯浣忓畢","閲屽紕鎴�", "鏃у紡閲屽紕","鍟嗗搧鎴�","瀛橀噺鎴�"] + def type2 = ["鍔炲叕","鍐欏瓧妤�"] + def type3 = ["鍟嗕綇"] + def type4 = ["鍟嗕笟", "鍟嗗満", "浼氭墍","搴楅摵", "鍟嗛摵"] + def type5 = ["缁煎悎"] + def type6 = ["缁垮寲"] + def type7 = ["鍏叡璁炬柦"] + def type8 = ["鍖荤枟"] + def type9 = ["闆嗕綋寤鸿鐢ㄥ湴"] + def type10 = ["鏁欒偛"] + def type11 = ["宸ヤ笟"] + def type12 = ["鍥芥湁鍐滃湴"] + def type13 = ["闆嗕綋鍐滃湴"] + def type14 = ["瀹呭熀鍦�"] if(s){ if(isExists(type1, s)){ - type = "住宅" + type = "浣忓畢" }else if(isExists(type4, s)){ - type = "商业" + type = "鍟嗕笟" }else if(isExists(type5, s)){ - type = "综合" + type = "缁煎悎" }else if(isExists(type2, s)){ - type = "办公" + type = "鍔炲叕" }else if(isExists(type7, s)){ - type = "公共设施" + type = "鍏叡璁炬柦" }else if(isExists(type8, s)){ - type = "医疗" + type = "鍖荤枟" }else if(isExists(type6, s)){ - type = "绿化" + type = "缁垮寲" }else if(isExists(type9, s)){ - type = "集体建设用地" + type = "闆嗕綋寤鸿鐢ㄥ湴" }else if(isExists(type10, s)){ - type = "教育" + type = "鏁欒偛" }else if(isExists(type11, s)){ - type = "工业" + type = "宸ヤ笟" }else if(isExists(type12, s)){ - type = "国有农地" + type = "鍥芥湁鍐滃湴" }else if(isExists(type13, s)){ - type = "国有农地" + type = "鍥芥湁鍐滃湴" }else if(isExists(type14, s)){ - type = "宅基地" + type = "瀹呭熀鍦�" } } return type; } def getStandarType(s){ - def type = "其它"//特种服务 车库 旅馆 待定 - //居住 - def type1 = ["住宅","商品房", "配套房", "动迁房","公寓","别墅","新工房","老公房","花园住宅","洋房","里弄房","新式里弄", "旧式里弄","商品房","存量房","新公房","旧里","里弄","居住","复式","新里","跃层","多层","独幢","景观房","双拼","四房一厅","内销 商品","简屋"] - def type2 = ["办公","写字楼"] - def type3 = ["商住"] - def type4 = ["商业", "商场", "会所","医院"] - def type5 = ["店铺", "商铺","店面"] - def type6 = ["仓库","亭子间"] - def type7 = ["综合"] - def type8 = ["厂房","工厂","工业"] + def type = "鍏跺畠"//鐗圭鏈嶅姟 杞﹀簱 鏃呴 寰呭畾 + //灞呬綇 + def type1 = ["浣忓畢","鍟嗗搧鎴�", "閰嶅鎴�", "鍔ㄨ縼鎴�","鍏瘬","鍒","鏂板伐鎴�","鑰佸叕鎴�","鑺卞洯浣忓畢","娲嬫埧","閲屽紕鎴�","鏂板紡閲屽紕", "鏃у紡閲屽紕","鍟嗗搧鎴�","瀛橀噺鎴�","鏂板叕鎴�","鏃ч噷","閲屽紕","灞呬綇","澶嶅紡","鏂伴噷","璺冨眰","澶氬眰","鐙耿","鏅鎴�","鍙屾嫾","鍥涙埧涓�鍘�","鍐呴攢 鍟嗗搧","绠�灞�"] + def type2 = ["鍔炲叕","鍐欏瓧妤�"] + def type3 = ["鍟嗕綇"] + def type4 = ["鍟嗕笟", "鍟嗗満", "浼氭墍","鍖婚櫌"] + def type5 = ["搴楅摵", "鍟嗛摵","搴楅潰"] + def type6 = ["浠撳簱","浜瓙闂�"] + def type7 = ["缁煎悎"] + def type8 = ["鍘傛埧","宸ュ巶","宸ヤ笟"] if(s){ - if(s.indexOf("其他非住宅")>-1||s.indexOf("商品非住宅")>-1){ - type = "其它" + if(s.indexOf("鍏朵粬闈炰綇瀹�")>-1||s.indexOf("鍟嗗搧闈炰綇瀹�")>-1){ + type = "鍏跺畠" }else if(isExists(type1, s)){ - type = "住宅" + type = "浣忓畢" }else if(isExists(type3, s)){ - type = "商住" + type = "鍟嗕綇" }else if(isExists(type4, s)){ - type = "商业" + type = "鍟嗕笟" }else if(isExists(type5, s)){ - type = "商铺" + type = "鍟嗛摵" }else if(isExists(type2, s)){ - type = "办公" + type = "鍔炲叕" }else if(isExists(type7, s)){ - type = "综合" + type = "缁煎悎" }else if(isExists(type8, s)){ - type = "厂房" + type = "鍘傛埧" }else if(isExists(type6, s)){ - type = "仓库" + type = "浠撳簱" } } return type; @@ -617,7 +617,7 @@ class CCBdealPrice { DBObject q = new BasicDBObject(); q.put("CJ_CJJG", new BasicDBObject(QueryOperators.GTE, 10000)); def dbsocur = OLD_ESF_DEAL_PRICE_COLL.find(q).addOption(Bytes.QUERYOPTION_NOTIMEOUT) - println "共:"+dbsocur.count() + println "鍏憋細"+dbsocur.count() def index = 0; def ret = [] while(dbsocur.hasNext()){ @@ -630,29 +630,29 @@ class CCBdealPrice { def totalPrice2 = area*price; def mod = totalPrice2/totalPrice if(mod>10){ - println "[${index}]-不处理 【显示】totalPrice:"+totalPrice+" totalPrice2:"+totalPrice2 + println "[${index}]-涓嶅鐞� 銆愭樉绀恒�憈otalPrice:"+totalPrice+" totalPrice2:"+totalPrice2 }else{ def newTotalPrice = DataUtil.getRound(2,totalPrice2/10000.0) DBObject udata = new BasicDBObject(); udata.CJ_CJJG = newTotalPrice; OLD_ESF_DEAL_PRICE_COLL.update(new BasicDBObject("_id", dbo._id), new BasicDBObject('$set', udata), false, false) - println "[${index}]-处理 area:${area} price:${price} 【旧显示】totalPrice:"+totalPrice+" totalPrice2:"+totalPrice2+" 【新显示】newTotalPrice:"+newTotalPrice + println "[${index}]-澶勭悊 area:${area} price:${price} 銆愭棫鏄剧ず銆憈otalPrice:"+totalPrice+" totalPrice2:"+totalPrice2+" 銆愭柊鏄剧ず銆憂ewTotalPrice:"+newTotalPrice } } // ret << dbo; // if(ret.size()%60000==0){ -// println "6万执行完成......" +// println "6涓囨墽琛屽畬鎴�......" // NEW_ESF_DEAL_PRICE_COLL.insert(ret); // ret = []; // } } // if(ret.size()>0){ -// println "(最后) "+ret.size() +// println "(鏈�鍚�) "+ret.size() // NEW_ESF_DEAL_PRICE_COLL.insert(ret); // } - println "结束:"+new Date().toLocaleString() + println "缁撴潫锛�"+new Date().toLocaleString() } @@ -669,13 +669,13 @@ class CCBdealPrice { dbo.natureType = natureType; ret << dbo; if(ret.size()%10000==0){ - println "第 "+(index/10000)+" 个"+ret.size() + println "绗� "+(index/10000)+" 涓�"+ret.size() ESF_DEAL_PRICE_FJ_COLL100.insert(ret); ret = []; } } if(ret.size()>0){ - println "(最后) "+ret.size() + println "(鏈�鍚�) "+ret.size() ESF_DEAL_PRICE_FJ_COLL100.insert(ret); } } @@ -694,13 +694,13 @@ class CCBdealPrice { dbo.natureType = natureType; ret << dbo; if(ret.size()%60000==0){ - println "第 "+(index/60000)+" 个"+ret.size() + println "绗� "+(index/60000)+" 涓�"+ret.size() NEW_DEAL_PRICE_FJ_COLL100.insert(ret); ret = []; } } if(ret.size()>0){ - println "(最后) "+ret.size() + println "(鏈�鍚�) "+ret.size() NEW_DEAL_PRICE_FJ_COLL100.insert(ret); } } @@ -717,66 +717,66 @@ class CCBdealPrice { newDbo._id = dbo._id; newDbo.youdaId= dbo.CJ_XH newDbo.region = dbo.CJ_XQ ; - //地址 + //鍦板潃 newDbo.address = dbo.CJ_ZL; - //单价(元) + //鍗曚环锛堝厓锛� newDbo.price = dbo.CJ_CJDJ; - //总价(万元) + //鎬讳环锛堜竾鍏冿級 newDbo.totalPrice = dbo.CJ_CJJG; - //成交时间 Date + //鎴愪氦鏃堕棿 Date newDbo.transactionTime = dbo.CJ_CJRQ - //小区名 + //灏忓尯鍚� newDbo.districtName = dbo.CJ_LPMC; - //土地取得方式 + //鍦熷湴鍙栧緱鏂瑰紡 newDbo.acquisitionMode = dbo.CJ_TDQBFS; - //土地用途 + //鍦熷湴鐢ㄩ�� newDbo.landPurpose = dbo.CJ_TDYT; - //土地面积 + //鍦熷湴闈㈢Н newDbo.landArea = dbo.CJ_TDMJ; - //室号部位 + //瀹ゅ彿閮ㄤ綅 newDbo.roomPosition = dbo.CJ_SHBW; - //朝向 + //鏈濆悜 newDbo.orientation = dbo.CJ_CX; - // 房屋类型 + // 鎴垮眿绫诲瀷 newDbo.oldHouseType = dbo.CJ_FWLX; - //房屋用途 + //鎴垮眿鐢ㄩ�� newDbo.housePurpose = dbo.CJ_FWYT; newDbo.houseType = dbo.USE_TYPE; - //房屋结构 + //鎴垮眿缁撴瀯 newDbo.structure = dbo.CJ_FWJG; - //面积 + //闈㈢Н newDbo.area = dbo.CJ_JZMJ; - //楼层 + //妤煎眰 newDbo.floor = dbo.CJ_CS; - //竣工时间 + //绔e伐鏃堕棿 newDbo.completionTime = dbo.CJ_JGRQ; - //成交时间 + //鎴愪氦鏃堕棿 newDbo.transactionTime = dbo.CJ_CJRQ; newDbo.useTerm = dbo.CJ_SYQX; - //板块 + //鏉垮潡 newDbo.block = dbo.CJ_XXLB?dbo.CJ_XXLB:''; - //环线位置 + //鐜嚎浣嶇疆 newDbo.loopPosition = dbo.CJ_HXWZ?dbo.CJ_HXWZ:''; - // 录入人员 + // 褰曞叆浜哄憳 newDbo.entryPersonnel = dbo.CJR; - //更新时间 + //鏇存柊鏃堕棿 newDbo.updateTime = dbo.XGSJ; - //录入时间 + //褰曞叆鏃堕棿 newDbo.addTime = dbo.SRRQ; - //房屋类型 + //鎴垮眿绫诲瀷 newDbo.fjCity = dbo.fj_city?dbo.fj_city:''; newDbo.fjRegion = dbo.fj_region?dbo.fj_region:''; newDbo.fjName = dbo.fj_name?dbo.fj_name:''; newDbo.fjAddress = dbo.fj_address?dbo.fj_address:''; ret << newDbo if(index%10000==0){ - println "第 "+(index/10000)+" 个"+ret.size() + println "绗� "+(index/10000)+" 涓�"+ret.size() ESF_DEAL_PRICE_FJ_COLL.insert(ret) ret = [] } } if(ret.size()>0){ - println "(最后)"+ret.size() + println "(鏈�鍚�)"+ret.size() ESF_DEAL_PRICE_FJ_COLL.insert(ret) } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/CentanetDealPriceCrawler.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/CentanetDealPriceCrawler.groovy index 1f7b765d5..0bd61909c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/CentanetDealPriceCrawler.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/CentanetDealPriceCrawler.groovy @@ -15,7 +15,7 @@ import org.jsoup.nodes.Element import org.jsoup.select.Elements /** - * 中远地产成交数据抓取脚本 + * 涓繙鍦颁骇鎴愪氦鏁版嵁鎶撳彇鑴氭湰 */ @BatchOwner(Watcher.WangWenYan) class CentanetDealPriceCrawler extends BaseBatch{ @@ -38,13 +38,13 @@ class CentanetDealPriceCrawler extends BaseBatch{ processPage(metadata) } CRAWL_COLL.remove(new BasicDBObject("job_id",JOB_ID)) - jms.sendMail('caoyuyan@fangjia.com', "成交数据分析结果", "中原地产全量抓取抓取成交数据:$total"); - jms.sendMail('lixue@fangjia.com', "成交数据分析结果", "中原地产全量抓取抓取成交数据:$total"); + jms.sendMail('caoyuyan@fangjia.com', "鎴愪氦鏁版嵁鍒嗘瀽缁撴灉", "涓師鍦颁骇鍏ㄩ噺鎶撳彇鎶撳彇鎴愪氦鏁版嵁:$total"); + jms.sendMail('lixue@fangjia.com', "鎴愪氦鏁版嵁鍒嗘瀽缁撴灉", "涓師鍦颁骇鍏ㄩ噺鎶撳彇鎶撳彇鎴愪氦鏁版嵁:$total"); } /** - * 分析小区页面 + * 鍒嗘瀽灏忓尯椤甸潰 * @param metadata */ void processPage(BasicDBObject metadata){ @@ -73,7 +73,7 @@ class CentanetDealPriceCrawler extends BaseBatch{ dealPrice.append("city", city) dealPrice.append("region", region) dealPrice.append("district_name", name) - dealPrice.append("source", "中原地产") + dealPrice.append("source", "涓師鍦颁骇") if(isAvailableDealPrice(dealPrice)){ dealPrice.append("creator","lixue") @@ -86,7 +86,7 @@ class CentanetDealPriceCrawler extends BaseBatch{ println("url:" + url + "," + id) } /** - * 判断是否为可用的成交记录 + * 鍒ゆ柇鏄惁涓哄彲鐢ㄧ殑鎴愪氦璁板綍 * @param city * @param region * @param name @@ -101,13 +101,13 @@ class CentanetDealPriceCrawler extends BaseBatch{ if(dealPrice.area < 0 || dealPrice.area > 1000){ return false } - if (trade_date == null || dealPrice.area == null || StringUtils.isBlank(dealPrice.district_name)) {//不存在成交日期或者没有成交面积 + if (trade_date == null || dealPrice.area == null || StringUtils.isBlank(dealPrice.district_name)) {//涓嶅瓨鍦ㄦ垚浜ゆ棩鏈熸垨鑰呮病鏈夋垚浜ら潰绉� return false } - if (trade_date.format("yyyyMMdd").toInteger() < 20030101 || trade_date.after(new Date())) {//非正常日期 + if (trade_date.format("yyyyMMdd").toInteger() < 20030101 || trade_date.after(new Date())) {//闈炴甯告棩鏈� return false } - /**判断是否为遗漏的成交记录*/ + /**鍒ゆ柇鏄惁涓洪仐婕忕殑鎴愪氦璁板綍*/ BasicDBObject query = new BasicDBObject() query.append("city", dealPrice.city) query.append("region", dealPrice.region) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/DanxiaDealPriceCrawlerBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/DanxiaDealPriceCrawlerBatch.groovy index 2894d102c..aef7ba379 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/DanxiaDealPriceCrawlerBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/DanxiaDealPriceCrawlerBatch.groovy @@ -13,7 +13,7 @@ import org.apache.commons.lang.StringUtils import org.jsoup.Jsoup /** - * 功能说明:丹霞成交数据解析 + * 鍔熻兘璇存槑:涓归湠鎴愪氦鏁版嵁瑙f瀽 */ @BatchOwner(Watcher.LiXue) class DanxiaDealPriceCrawlerBatch extends BaseBatch { @@ -36,7 +36,7 @@ class DanxiaDealPriceCrawlerBatch extends BaseBatch { if(doc.select("body > div.wrap > div.container.interactCont.wfull > div.comLinkList > div.model.fix > p.msg > span")) { total = doc.select("body > div.wrap > div.container.interactCont.wfull > div.comLinkList > div.model.fix > p.msg > span").text() } - println("-----------------开始抓取第"+i+"页-----------------") + println("-----------------寮�濮嬫姄鍙栫"+i+"椤�-----------------") for(def link : links){ def detLink = link.attr("href") detLink = "http://danxia.com"+detLink @@ -45,9 +45,9 @@ class DanxiaDealPriceCrawlerBatch extends BaseBatch { } } - println("共抓取了"+count+"个小区") - jms.sendMail('lixue@fangjia.com', "丹厦网数据分析","共${total}条 总抓取${count}条记录".toString()) - jms.sendMail('wangchencen@fangjia.com', "丹厦网数据分析","共${total}条 总抓取${count}条记录".toString()) + println("鍏辨姄鍙栦簡"+count+"涓皬鍖�") + jms.sendMail('lixue@fangjia.com', "涓瑰帵缃戞暟鎹垎鏋�","鍏�${total}鏉� 鎬绘姄鍙�${count}鏉¤褰�".toString()) + jms.sendMail('wangchencen@fangjia.com', "涓瑰帵缃戞暟鎹垎鏋�","鍏�${total}鏉� 鎬绘姄鍙�${count}鏉¤褰�".toString()) } def detailParse(String url,carName) { @@ -59,11 +59,11 @@ class DanxiaDealPriceCrawlerBatch extends BaseBatch { def unitPrice = doc.select("body > div.wrap > div.container.interactCont.wfull > div.container.schoolMsg > div:nth-child(1) > div.textMsg.right > div:nth-child(3) > dl > dd").text() def tradeDate = doc.select("body > div.wrap > div.container.interactCont.wfull > div.container.schoolMsg > div:nth-child(1) > div.textMsg.right > div:nth-child(1)").text() def area = doc.select("body > div.wrap > div.container.interactCont.wfull > div.container.schoolMsg > div:nth-child(1) > div.textMsg.right > div.fix.smxinx > div:nth-child(2) > p").text() - def source = "丹夏网" - def city = "厦门" + def source = "涓瑰缃�" + def city = "鍘﹂棬" if(region&&name&&dealPrice&&unitPrice&&tradeDate){ - if(carName.toString().contains("车位")){ + if(carName.toString().contains("杞︿綅")){ name = carName } parseSave(city,region,name,dealPrice,unitPrice,area,source,tradeDate,cDate) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/DealPrice.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/DealPrice.groovy index b6aabda92..0c5d3143f 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/DealPrice.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/DealPrice.groovy @@ -1,6 +1,6 @@ package com.fangjia.script.dealPrice /** - * 成交数据实体 + * 鎴愪氦鏁版嵁瀹炰綋 */ class DealPrice { @@ -9,11 +9,11 @@ class DealPrice { String region Integer avgPrice String districtName - /**楼栋号*/ + /**妤兼爧鍙�*/ String houseNumber - /**单元号*/ + /**鍗曞厓鍙�*/ String unitNumber - /**室号*/ + /**瀹ゅ彿*/ String roomNumber Double area Integer totalPrice @@ -25,24 +25,24 @@ class DealPrice { Integer room Integer hall Integer toilet - /**总楼层*/ + /**鎬绘ゼ灞�*/ Integer height - /**当前楼层*/ + /**褰撳墠妤煎眰*/ Integer floor Date creationDate - /**创建者*/ + /**鍒涘缓鑰�*/ String creator - /**环线*/ + /**鐜嚎*/ String loopline - /**版块*/ + /**鐗堝潡*/ String block - /**房屋类型(澜思)*/ + /**鎴垮眿绫诲瀷(婢滄��)*/ String houseType - /**房屋性质*/ + /**鎴垮眿鎬ц川*/ String houseProperty - /**别名*/ + /**鍒悕*/ List alias - /**交房时间*/ + /**浜ゆ埧鏃堕棿*/ Date submittedDate diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/DealPriceMathBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/DealPriceMathBatch.groovy index 5c5aadd9e..daa1b90be 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/DealPriceMathBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/DealPriceMathBatch.groovy @@ -23,7 +23,7 @@ import java.util.concurrent.Executors import java.util.concurrent.atomic.AtomicInteger /** - * 小区成交价匹配 + * 灏忓尯鎴愪氦浠峰尮閰� */ @BatchOwner(Watcher.GaoJuan) class DealPriceMathBatch extends BaseBatch{ @@ -36,13 +36,13 @@ class DealPriceMathBatch extends BaseBatch{ public static DBCollection NO_MATCH_DEAL_PRICE_COLL = MongoUtils.getCollectionByName("fangjia", "deal_price_no_match", "mongo.db.fangjia.com") public static DBCollection MATCH_DEAL_PRICE_COLL = MongoUtils.getCollectionByName("fangjia", "deal_price_match", "mongo.db.fangjia.com") public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(20) - def static final statusMap = ["城市未匹配":1,"区域未匹配":2,"小区匹配失败":3,"小区匹配成功":4,"异常错误":5, "无价格":6] + def static final statusMap = ["鍩庡競鏈尮閰�":1,"鍖哄煙鏈尮閰�":2,"灏忓尯鍖归厤澶辫触":3,"灏忓尯鍖归厤鎴愬姛":4,"寮傚父閿欒":5, "鏃犱环鏍�":6] static { cityMap = CommonDatautils.findRelatedCity(); - println "城市加载完成:"+cityMap.size() + println "鍩庡競鍔犺浇瀹屾垚:"+cityMap.size() regionMap = CommonDatautils.getAllCityRegions(); - println "区域加载完成:"+regionMap.size() + println "鍖哄煙鍔犺浇瀹屾垚:"+regionMap.size() } static main(args) { @@ -59,8 +59,8 @@ class DealPriceMathBatch extends BaseBatch{ def endDate = DateUtil.getFirstDayOfMonth(new Date(), 1) cityMap.each{city,alias-> - println "开始加载【${city}】小区" - if(city != "昆玉"){ + println "寮�濮嬪姞杞姐��${city}銆戝皬鍖�" + if(city != "鏄嗙帀"){ def detailMap = CommonDatautils.findAllCityDistrictNameAndAlias(city, "district", ["city","region","name","address","alias","addr_alias","mapping_alias"]) districtMap.putAll(detailMap) } @@ -69,7 +69,7 @@ class DealPriceMathBatch extends BaseBatch{ // def endDate = DateUtil.getFirstDayOfMonth(DateUtil.parseDate("2021-04-30","yyyy-MM-dd")) while(flag){ - println "开始加载解析数据......" + println "寮�濮嬪姞杞借В鏋愭暟鎹�......" def datas = findAllNoMatchData(startDate, endDate); if(datas.size() > 0) { rowIndex++; @@ -77,7 +77,7 @@ class DealPriceMathBatch extends BaseBatch{ }else{ println new Date() Thread.sleep(1000 * 60 * 5) - flag = false;//停止 + flag = false;//鍋滄 } } } @@ -94,17 +94,17 @@ class DealPriceMathBatch extends BaseBatch{ new Runnable() { void run() { try{ - println "(${rowIndex}-${count}-${count_.incrementAndGet()})【${dbo.city}-${dbo.region}-${dbo.district_name}-${dbo.source}】" + println "(${rowIndex}-${count}-${count_.incrementAndGet()})銆�${dbo.city}-${dbo.region}-${dbo.district_name}-${dbo.source}銆�" if(dbo.avg_price){ - //标准化城市(包含region) + //鏍囧噯鍖栧煄甯�(鍖呭惈region) def data = standardCity(dbo); if(data){ - //匹配区域 + //鍖归厤鍖哄煙 data = standardRegion(data); if(data){ - //标准化小区名 + //鏍囧噯鍖栧皬鍖哄悕 def data3 = standardDistrict(data); if(data3){ successCount++; @@ -112,13 +112,13 @@ class DealPriceMathBatch extends BaseBatch{ } } }else{ - saveLog(dbo, "无价格"); - updateStatus(dbo,statusMap.get("无价格")) + saveLog(dbo, "鏃犱环鏍�"); + updateStatus(dbo,statusMap.get("鏃犱环鏍�")) } count++; }catch (Exception e){ - println "处理:【${dbo.city}-${dbo.region}-${dbo.district_name}】发生异常,异常信息为:"+e.printStackTrace() + println "澶勭悊锛氥��${dbo.city}-${dbo.region}-${dbo.district_name}銆戝彂鐢熷紓甯革紝寮傚父淇℃伅涓�:"+e.printStackTrace() }finally { latch.countDown() } @@ -130,7 +130,7 @@ class DealPriceMathBatch extends BaseBatch{ latch.await() long end = System.currentTimeMillis() - println "第【${rowIndex}】次中匹配成功的:"+successCount+" 个,耗时:"+ (end - start)+" "+ DateUtils.format(new Date(),"yyyy-MM-dd HH:mm:ss") + println "绗��${rowIndex}銆戞涓尮閰嶆垚鍔熺殑锛�"+successCount+" 涓紝鑰楁椂锛�"+ (end - start)+" "+ DateUtils.format(new Date(),"yyyy-MM-dd HH:mm:ss") } @@ -140,17 +140,17 @@ class DealPriceMathBatch extends BaseBatch{ for(def m : cityMap){ def city = m.key - if(data.city == city){//city名一致 + if(data.city == city){//city鍚嶄竴鑷� standardFlag = true; break; }else{ def alias = m.value - if(alias && alias.contains(data.city)){//city别名匹配,修改cityName + if(alias && alias.contains(data.city)){//city鍒悕鍖归厤锛屼慨鏀筩ityName data.city = city standardFlag = true; break; - }else{//city不匹配,查region + }else{//city涓嶅尮閰嶏紝鏌egion def cityRegionMap = regionMap.get(city); for(def crm : cityRegionMap){ def region = crm.key @@ -172,8 +172,8 @@ class DealPriceMathBatch extends BaseBatch{ } } if(!standardFlag){ - saveLog(data, "没匹配上相应的城市"); - updateStatus(data,statusMap.get("城市未匹配")); + saveLog(data, "娌″尮閰嶄笂鐩稿簲鐨勫煄甯�"); + updateStatus(data,statusMap.get("鍩庡競鏈尮閰�")); return null; } return data; @@ -185,7 +185,7 @@ class DealPriceMathBatch extends BaseBatch{ def rCity = rm.key; def cityRegionMap = rm.value; if(data.city == rCity){ - //判断区域是否是标准区域 + //鍒ゆ柇鍖哄煙鏄惁鏄爣鍑嗗尯鍩� for(def crm : cityRegionMap){ def region = crm.key def regionAlias = crm.value @@ -195,7 +195,7 @@ class DealPriceMathBatch extends BaseBatch{ break; } } - //判断板块是否是区域 + //鍒ゆ柇鏉垮潡鏄惁鏄尯鍩� if(!standardFlag && data.region!=data.block){ for(def crm : cityRegionMap){ def region = crm.key @@ -214,8 +214,8 @@ class DealPriceMathBatch extends BaseBatch{ } } if(!standardFlag){ - saveLog(data, "没匹配上相应的区域"); - updateStatus(data,statusMap.get("区域未匹配")); + saveLog(data, "娌″尮閰嶄笂鐩稿簲鐨勫尯鍩�"); + updateStatus(data,statusMap.get("鍖哄煙鏈尮閰�")); return null; } return data; @@ -247,14 +247,14 @@ class DealPriceMathBatch extends BaseBatch{ } def standardDistrict(def data){ - //名称匹配,名称别名匹配,地址别名匹配 + //鍚嶇О鍖归厤锛屽悕绉板埆鍚嶅尮閰嶏紝鍦板潃鍒悕鍖归厤 def district = getMatchNameFromMap(data.city, data.region, data.district_name, null) - if(!district && data.district_name.length()==2){//没有匹配上,小区名只有2个字就把小区名加“小区” - district = getMatchNameFromMap(data.city, data.region, data.district_name+"小区", null) + if(!district && data.district_name.length()==2){//娌℃湁鍖归厤涓婏紝灏忓尯鍚嶅彧鏈�2涓瓧灏辨妸灏忓尯鍚嶅姞鈥滃皬鍖衡�� + district = getMatchNameFromMap(data.city, data.region, data.district_name+"灏忓尯", null) } def type = 0; if(!district){ - def newName = filterSpacialChar(data.district_name);//包含特殊符号 + def newName = filterSpacialChar(data.district_name);//鍖呭惈鐗规畩绗﹀彿 if(!newName && data.district_name.indexOf(" ")>-1){ newName = data.district_name.toString().replaceAll(" ","_") } @@ -262,9 +262,9 @@ class DealPriceMathBatch extends BaseBatch{ district = getMatchNameFromMap(data.city, data.region, newName.replaceAll("_", ""), null) if(!district){ def s = newName.replaceAll("_", ""); - if(s.indexOf("期")>-1){ - s = s.replace("1期","一期").replace("2期","二期").replace("3期","三期").replace("4期","四期").replace("5期","五期").replace("6期","六期").replace("7期","七期").replace("8期","八期").replace("9期","九期").replace("10期","十期") - s = s.substring(0, s.indexOf("期")+1) + if(s.indexOf("鏈�")>-1){ + s = s.replace("1鏈�","涓�鏈�").replace("2鏈�","浜屾湡").replace("3鏈�","涓夋湡").replace("4鏈�","鍥涙湡").replace("5鏈�","浜旀湡").replace("6鏈�","鍏湡").replace("7鏈�","涓冩湡").replace("8鏈�","鍏湡").replace("9鏈�","涔濇湡").replace("10鏈�","鍗佹湡") + s = s.substring(0, s.indexOf("鏈�")+1) district = getMatchNameFromMap(data.city, data.region, s, null) } } @@ -277,12 +277,12 @@ class DealPriceMathBatch extends BaseBatch{ district = getMatchNameFromMap(data.city, data.region, n_names, null) if (district) { type = 3; - println "[部分匹配成功][${district.city}-${district.region}-${district.name}-${district.address}]" + println "[閮ㄥ垎鍖归厤鎴愬姛][${district.city}-${district.region}-${district.name}-${district.address}]" }else{ district = getMatchNameFromMap(data.city, null, n_names, null) if (district) { type = 5; - println "[部分匹配成功-区域不同][${district.city}-${district.region}-${district.name}-${district.address}]" + println "[閮ㄥ垎鍖归厤鎴愬姛-鍖哄煙涓嶅悓][${district.city}-${district.region}-${district.name}-${district.address}]" } } }else{ @@ -292,12 +292,12 @@ class DealPriceMathBatch extends BaseBatch{ district = getMatchNameFromMap(data.city, data.region, n_names, null) if (district) { type = 4; - println "[部分匹配成功-向前附加][${district.city}-${district.region}-${district.name}-${district.address}]" + println "[閮ㄥ垎鍖归厤鎴愬姛-鍚戝墠闄勫姞][${district.city}-${district.region}-${district.name}-${district.address}]" }else{ district = getMatchNameFromMap(data.city, null, n_names, null) if (district) { type = 6; - println "[部分匹配成功-区域不同][${district.city}-${district.region}-${district.name}-${district.address}]" + println "[閮ㄥ垎鍖归厤鎴愬姛-鍖哄煙涓嶅悓][${district.city}-${district.region}-${district.name}-${district.address}]" } } } @@ -322,12 +322,12 @@ class DealPriceMathBatch extends BaseBatch{ district = getOpenApiMatch(data.city, data.region, data.district_name); if(district){ if(data.region != district.region){ - //type = 12;//区域不同 + //type = 12;//鍖哄煙涓嶅悓 district = null; }else{ def score1 = CosineSimilarAlgorithm.getSimilarityRatio(data.district_name, district.name); if(score1 && score1 >=0.75){ - type = 13;//相似度在0.75以上 + type = 13;//鐩镐技搴﹀湪0.75浠ヤ笂 }else{ district = null; } @@ -341,12 +341,12 @@ class DealPriceMathBatch extends BaseBatch{ } if(district){ saveSuccessLog(data, district, type); - updateStatus(data,statusMap.get("小区匹配成功")) + updateStatus(data,statusMap.get("灏忓尯鍖归厤鎴愬姛")) println district.city+" "+district.name+" success" }else{ - println "[匹配失败]" - saveLog(data, "小区匹配失败"); - updateStatus(data,statusMap.get("小区匹配失败")) + println "[鍖归厤澶辫触]" + saveLog(data, "灏忓尯鍖归厤澶辫触"); + updateStatus(data,statusMap.get("灏忓尯鍖归厤澶辫触")) println data.city+" "+data.district_name+" fail" } return district; @@ -373,12 +373,12 @@ class DealPriceMathBatch extends BaseBatch{ MATCH_DEAL_PRICE_COLL.update(q, new BasicDBObject('$set', udata2), true, false); } - //查找出所有未进行匹配的数据 + //鏌ユ壘鍑烘墍鏈夋湭杩涜鍖归厤鐨勬暟鎹� def findAllNoMatchData(def startDate, def endDate){ DBObject qdata = new BasicDBObject(); -// qdata.put("city","上海") -// qdata.put("source","房天下") -// qdata.put("district_name","东茗苑") +// qdata.put("city","涓婃捣") +// qdata.put("source","鎴垮ぉ涓�") +// qdata.put("district_name","涓滆寳鑻�") qdata.put("trade_date", new BasicDBObject(QueryOperators.GTE, startDate).append(QueryOperators.LT, endDate)) // qdata.put("trade_date", new BasicDBObject(QueryOperators.GTE, startDate)) qdata.put("status", new BasicDBObject(QueryOperators.EXISTS, false)); @@ -386,7 +386,7 @@ class DealPriceMathBatch extends BaseBatch{ try{ def dbcursor = DEAL_PRICE_COLL.find(qdata).limit(5000).addOption(Bytes.QUERYOPTION_NOTIMEOUT) - println "共:"+dbcursor.count() + println "鍏憋細"+dbcursor.count() while(dbcursor.hasNext()) { DBObject dbo = dbcursor.next() ret << dbo @@ -401,10 +401,10 @@ class DealPriceMathBatch extends BaseBatch{ } def getMatchNameFromMap(def city, def region, def disName, def address){ - //查询房价网是否存在该小区 + //鏌ヨ鎴夸环缃戞槸鍚﹀瓨鍦ㄨ灏忓尯 def dbo = findSameNameFromMap(city, region, disName); if(!dbo){ - //别名 + //鍒悕 def distrs = findAliasNameFromMap(city, region, disName); if(distrs && distrs.size()==1){ dbo = distrs[0] @@ -418,7 +418,7 @@ class DealPriceMathBatch extends BaseBatch{ } } - //地址 + //鍦板潃 if(!dbo){ def result = findAddressFromMap(city, region, disName) if(result.size()==1){ @@ -439,7 +439,7 @@ class DealPriceMathBatch extends BaseBatch{ def cityMap = districtMap.get(city); def districts = []; if(cityMap){ - if(region){//有区域 + if(region){//鏈夊尯鍩� def regionMap = cityMap.get(region); if(regionMap){ regionMap.each{k,v-> @@ -454,7 +454,7 @@ class DealPriceMathBatch extends BaseBatch{ } } - }else{//无区域 + }else{//鏃犲尯鍩� cityMap.each{r,dMap-> dMap.each{k,v-> def arrays = k.split("###") @@ -473,7 +473,7 @@ class DealPriceMathBatch extends BaseBatch{ def districts = []; def district = null; if(cityMap){ - if(region){//有区域 + if(region){//鏈夊尯鍩� def regionMap = cityMap.get(region); if(regionMap){ regionMap.each{k,v-> @@ -483,7 +483,7 @@ class DealPriceMathBatch extends BaseBatch{ } } } - }else{//无区域 + }else{//鏃犲尯鍩� cityMap.each{r,dMap-> dMap.each{k,v-> def arrays = k.split("###") @@ -505,7 +505,7 @@ class DealPriceMathBatch extends BaseBatch{ def cityMap = districtMap.get(city); def districts = []; if(cityMap){ - if(region){//有区域 + if(region){//鏈夊尯鍩� def regionMap = cityMap.get(region); if(regionMap){ regionMap.each{k,v-> @@ -533,7 +533,7 @@ class DealPriceMathBatch extends BaseBatch{ } } - }else{//无区域 + }else{//鏃犲尯鍩� cityMap.each{r,dMap-> dMap.each{k,v-> def arrays = k.split("###") @@ -556,7 +556,7 @@ class DealPriceMathBatch extends BaseBatch{ } def filterSpacialChar(def s){ - def pattern = ~/[()!;\]\[【】()-]/ + def pattern = ~/[()!;\]\[銆愩�戯紙锛�-]/ def matcher = pattern.matcher(s) def count = matcher.getCount() if(count && count>0){ @@ -571,7 +571,7 @@ class DealPriceMathBatch extends BaseBatch{ def districts = []; def district = null; if(cityMap){ - if(region){//有区域 + if(region){//鏈夊尯鍩� def regionMap = cityMap.get(region); if(regionMap){ regionMap.each{k,v-> @@ -586,7 +586,7 @@ class DealPriceMathBatch extends BaseBatch{ } } } -// if(districts.size()==1 && address && address.matches(".+?(路|街|大道).+(号|弄)")){ +// if(districts.size()==1 && address && address.matches(".+?(璺瘄琛梶澶ч亾).+(鍙穦寮�)")){ // def tempDist = districts[0]; // def addrPy1 = com.fangjia.core.util.DataUtil.hanyuQuanpin(tempDist.address, " ") // def addrPy2 = com.fangjia.core.util.DataUtil.hanyuQuanpin(address, " ") diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/DealPriceStatBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/DealPriceStatBatch.groovy index 6d3dde500..cdf6c1a69 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/DealPriceStatBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/DealPriceStatBatch.groovy @@ -14,7 +14,7 @@ import com.mongodb.QueryOperators /** - * 城市成交量月统计 + * 鍩庡競鎴愪氦閲忔湀缁熻 */ @BatchOwner(Watcher.GaoJuan) class DealPriceStatBatch extends BaseBatch{ @@ -47,7 +47,7 @@ class DealPriceStatBatch extends BaseBatch{ void run(allCity, startDate, endDate, sDate){ def index = 0; - //分城市 + //鍒嗗煄甯� for(def city : allCity){ index++; def count = statCount(city, startDate, endDate); @@ -56,8 +56,8 @@ class DealPriceStatBatch extends BaseBatch{ } def count = statCount(null, startDate, endDate); - saveOrUpdate("全国", count, sDate); - //全国 + saveOrUpdate("鍏ㄥ浗", count, sDate); + //鍏ㄥ浗 def endDayDate1 = DateUtil.truncateDay(DateUtil.getLastDayOfMonth(startDate)); def endDayDate2 = DateUtil.add(endDayDate1, -4); def endDayDate3 = DateUtil.add(endDayDate2, -5); @@ -68,17 +68,17 @@ class DealPriceStatBatch extends BaseBatch{ def rets = [] def count1 = statCount(null, endDayDate2, DateUtil.add(endDayDate1, 1)); - rets << [city:"全国",count:count1, s_date:Integer.parseInt(DateUtil.formatByPattern(endDayDate1,"yyyyMMdd")), c_date:new Date()] + rets << [city:"鍏ㄥ浗",count:count1, s_date:Integer.parseInt(DateUtil.formatByPattern(endDayDate1,"yyyyMMdd")), c_date:new Date()] def count2 = statCount(null, endDayDate3, endDayDate2); - rets << [city:"全国",count:count2, s_date:Integer.parseInt(DateUtil.formatByPattern(endDayDate2,"yyyyMMdd")), c_date:new Date()] + rets << [city:"鍏ㄥ浗",count:count2, s_date:Integer.parseInt(DateUtil.formatByPattern(endDayDate2,"yyyyMMdd")), c_date:new Date()] def count3 = statCount(null, endDayDate4, endDayDate3); - rets << [city:"全国",count:count3, s_date:Integer.parseInt(DateUtil.formatByPattern(endDayDate3,"yyyyMMdd")), c_date:new Date()] + rets << [city:"鍏ㄥ浗",count:count3, s_date:Integer.parseInt(DateUtil.formatByPattern(endDayDate3,"yyyyMMdd")), c_date:new Date()] def count4 = statCount(null, endDayDate5, endDayDate4); - rets << [city:"全国",count:count4, s_date:Integer.parseInt(DateUtil.formatByPattern(endDayDate4,"yyyyMMdd")), c_date:new Date()] + rets << [city:"鍏ㄥ浗",count:count4, s_date:Integer.parseInt(DateUtil.formatByPattern(endDayDate4,"yyyyMMdd")), c_date:new Date()] def count5 = statCount(null, endDayDate6, endDayDate5); - rets << [city:"全国",count:count5, s_date:Integer.parseInt(DateUtil.formatByPattern(endDayDate5,"yyyyMMdd")), c_date:new Date()] + rets << [city:"鍏ㄥ浗",count:count5, s_date:Integer.parseInt(DateUtil.formatByPattern(endDayDate5,"yyyyMMdd")), c_date:new Date()] def count6 = statCount(null, endDayDate7, endDayDate6); - rets << [city:"全国",count:count6, s_date:Integer.parseInt(DateUtil.formatByPattern(endDayDate6,"yyyyMMdd")), c_date:new Date()] + rets << [city:"鍏ㄥ浗",count:count6, s_date:Integer.parseInt(DateUtil.formatByPattern(endDayDate6,"yyyyMMdd")), c_date:new Date()] saveDayTradeStat(rets); } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/DealPriceUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/DealPriceUtils.groovy index a96afc34b..9778a8b88 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/DealPriceUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/DealPriceUtils.groovy @@ -12,7 +12,7 @@ import org.apache.commons.lang.StringUtils import java.util.regex.Pattern /** - * 成交数据解析工具类 + * 鎴愪氦鏁版嵁瑙f瀽宸ュ叿绫� */ class DealPriceUtils { @@ -47,47 +47,47 @@ class DealPriceUtils { return DateUtil.parseDate(str, "yyyy-MM") }) - ROOM_RESOLVERS.put(Pattern.compile("\\d+室"),{String str-> - str = str.replace("室", '').trim() + ROOM_RESOLVERS.put(Pattern.compile("\\d+瀹�"),{String str-> + str = str.replace("瀹�", '').trim() return str.toInteger() }) - HALL_RESOLVERS.put(Pattern.compile("\\d+厅"),{String str-> - str = str.replace("厅", '').trim() + HALL_RESOLVERS.put(Pattern.compile("\\d+鍘�"),{String str-> + str = str.replace("鍘�", '').trim() return str.toInteger() }) - TOTAL_PRICE_RESOLVERS.put(Pattern.compile("\\d+(\\.\\d+)?万"),{String str-> - str = str.replace("万", '').trim() + TOTAL_PRICE_RESOLVERS.put(Pattern.compile("\\d+(\\.\\d+)?涓�"),{String str-> + str = str.replace("涓�", '').trim() return (str.toDouble() * 10000).toInteger() }) - UNIT_PRICE_RESOLVERS.put(Pattern.compile("\\d+(\\.\\d+)?元/㎡"),{String str-> - str = str.replace("元/㎡", '').trim() + UNIT_PRICE_RESOLVERS.put(Pattern.compile("\\d+(\\.\\d+)?鍏�/銕�"),{String str-> + str = str.replace("鍏�/銕�", '').trim() return str.toDouble().toInteger() }) - UNIT_PRICE_RESOLVERS.put(Pattern.compile("\\d+(\\.\\d+)?元/平"),{String str-> - str = str.replace("元/平", '').trim() + UNIT_PRICE_RESOLVERS.put(Pattern.compile("\\d+(\\.\\d+)?鍏�/骞�"),{String str-> + str = str.replace("鍏�/骞�", '').trim() return str.toDouble().toInteger() }) - AREA_RESOLVERS.put(Pattern.compile("\\d+(\\.\\d+)?平米"),{String str-> - str = str.replace("平米", '').trim() + AREA_RESOLVERS.put(Pattern.compile("\\d+(\\.\\d+)?骞崇背"),{String str-> + str = str.replace("骞崇背", '').trim() return str.toDouble() }) - AREA_RESOLVERS.put(Pattern.compile("\\d+(\\.\\d+)?平"),{String str-> - str = str.replace("平", '').trim() + AREA_RESOLVERS.put(Pattern.compile("\\d+(\\.\\d+)?骞�"),{String str-> + str = str.replace("骞�", '').trim() return str.toDouble() }) - AREA_RESOLVERS.put(Pattern.compile("\\d+(\\.\\d+)?㎡"),{String str-> - str = str.replace("㎡", '').trim() + AREA_RESOLVERS.put(Pattern.compile("\\d+(\\.\\d+)?銕�"),{String str-> + str = str.replace("銕�", '').trim() return str.toDouble() }) - HEIGHT_RESOLVERS.put(Pattern.compile("共\\d+层"),{String str-> - str = str.replace("共", '').replace('层', '') + HEIGHT_RESOLVERS.put(Pattern.compile("鍏盶\d+灞�"),{String str-> + str = str.replace("鍏�", '').replace('灞�', '') return str.toInteger() }) @@ -114,7 +114,7 @@ class DealPriceUtils { } /** - * 解析成交日期 + * 瑙f瀽鎴愪氦鏃ユ湡 * @param content * @return */ @@ -123,7 +123,7 @@ class DealPriceUtils { } /** - * 解析室数 + * 瑙f瀽瀹ゆ暟 * @param content * @return */ @@ -131,7 +131,7 @@ class DealPriceUtils { return parse(content, ROOM_RESOLVERS) } /** - * 解析厅数 + * 瑙f瀽鍘呮暟 * @param content * @return */ @@ -139,7 +139,7 @@ class DealPriceUtils { return parse(content, HALL_RESOLVERS) } /** - * 解析总价 + * 瑙f瀽鎬讳环 * @param content * @return */ @@ -147,7 +147,7 @@ class DealPriceUtils { return parse(content, TOTAL_PRICE_RESOLVERS) } /** - * 解析单价 + * 瑙f瀽鍗曚环 * @param content * @return */ @@ -155,7 +155,7 @@ class DealPriceUtils { return parse(content, UNIT_PRICE_RESOLVERS) } /** - * 解析面积 + * 瑙f瀽闈㈢Н * @param content * @return */ @@ -163,7 +163,7 @@ class DealPriceUtils { return parse(content, AREA_RESOLVERS) } /** - * 解析楼层 + * 瑙f瀽妤煎眰 * @param content * @return */ @@ -171,7 +171,7 @@ class DealPriceUtils { return parse(content, FLOOR_RESOLVERS) } /** - * 解析楼高 + * 瑙f瀽妤奸珮 * @param content * @return */ @@ -180,29 +180,29 @@ class DealPriceUtils { } /** - * 格式化小区名 + * 鏍煎紡鍖栧皬鍖哄悕 * @param name * @return */ static String formatName(String name){ - name = name.replace("-商住", "").replace("-别墅", "") - //汇福家园平安里(迁)2015-2017 + name = name.replace("-鍟嗕綇", "").replace("-鍒", "") + //姹囩瀹跺洯骞冲畨閲岋紙杩侊級2015-2017 name = name.replaceAll("\\d\\d\\d\\d-\\d\\d\\d\\d", "") - //国贸天悦一期2017 + //鍥借锤澶╂偊涓�鏈�2017 name = name.replaceAll("\\d\\d\\d\\d\$", "") - if(name ==~ /.+(\(|()[\d一二三四五六七八九十东南西北|\w]+(期|区)(\)|))$/){ - name = name.replaceAll("\\(|(|\\)|)", '') - }else if(name ==~ /.+(\(|()别墅(\)|))$/){ - name = name.replaceAll("\\(|(|\\)|)", '') - }else if(name ==~ /.+(\(|().+(\)|))$/){ - name = name.replaceAll("(\\(|().+(\\)|))", '') - }else if(name.contains("·") || (name.contains("-") && !(name ==~ /.*\d+-\d+.*/))){ + if(name ==~ /.+(\(|锛�)[\d涓�浜屼笁鍥涗簲鍏竷鍏節鍗佷笢鍗楄タ鍖梶\w]+(鏈焲鍖�)(\)|锛�)$/){ + name = name.replaceAll("\\(|锛坾\\)|锛�", '') + }else if(name ==~ /.+(\(|锛�)鍒(\)|锛�)$/){ + name = name.replaceAll("\\(|锛坾\\)|锛�", '') + }else if(name ==~ /.+(\(|锛�).+(\)|锛�)$/){ + name = name.replaceAll("(\\(|锛�).+(\\)|锛�)", '') + }else if(name.contains("路") || (name.contains("-") && !(name ==~ /.*\d+-\d+.*/))){ println("---------------------------->" + name) - name = name.replaceAll("·|-", '') + name = name.replaceAll("路|-", '') println(name) } - if(name ==~ /.{2,}路.{3,}$/ && !(name ==~ /.{2,}路.+号/) && !(name ==~ /.*小区$/)){ - name = name.replaceAll("^.{2,}路", "") + if(name ==~ /.{2,}璺�.{3,}$/ && !(name ==~ /.{2,}璺�.+鍙�/) && !(name ==~ /.*灏忓尯$/)){ + name = name.replaceAll("^.{2,}璺�", "") } return name } @@ -221,7 +221,7 @@ class DealPriceUtils { } /** - * 保存成交数据 + * 淇濆瓨鎴愪氦鏁版嵁 * @param dealPrice * @return */ @@ -239,30 +239,30 @@ class DealPriceUtils { } /** - * 验证成交数据是否合法 + * 楠岃瘉鎴愪氦鏁版嵁鏄惁鍚堟硶 * @param dealPrice - * @param forceCheck true:验证不通过,抛出异常, false:验证不用过不抛异常 + * @param forceCheck true:楠岃瘉涓嶉�氳繃锛屾姏鍑哄紓甯革紝 false锛氶獙璇佷笉鐢ㄨ繃涓嶆姏寮傚父 * @return */ static boolean isAvailableDealPrice(DealPrice dealPrice, forceCheck = false){ if(StringUtils.isBlank(dealPrice.city) || !CommonUtils.findAllCity().contains(dealPrice.city)){ if(forceCheck){ - throw new IllegalArgumentException("city非法:${dealPrice.city}") + throw new IllegalArgumentException("city闈炴硶:${dealPrice.city}") } return false } if(StringUtils.isBlank(dealPrice.region) || !RegionData.isRegion(dealPrice.city, dealPrice.region)){ if(forceCheck){ - throw new IllegalArgumentException("region非法:${dealPrice.region}") + throw new IllegalArgumentException("region闈炴硶:${dealPrice.region}") } return false } if(StringUtils.isBlank(dealPrice.districtName)){ if(forceCheck){ - throw new IllegalArgumentException("districtName非法:${dealPrice.districtName}") + throw new IllegalArgumentException("districtName闈炴硶:${dealPrice.districtName}") } return false } @@ -270,33 +270,33 @@ class DealPriceUtils { if(!dealPrice.area || dealPrice.area < 10 || dealPrice.area > 1000){ if(forceCheck){ - throw new IllegalArgumentException("area非法:${dealPrice.area}") + throw new IllegalArgumentException("area闈炴硶:${dealPrice.area}") } return false } if(!dealPrice.totalPrice || dealPrice.totalPrice <= 10000){ if(forceCheck){ - throw new IllegalArgumentException("totalPrice非法:${dealPrice.totalPrice}") + throw new IllegalArgumentException("totalPrice闈炴硶:${dealPrice.totalPrice}") } return false } if(!dealPrice.avgPrice || dealPrice.avgPrice < 1000 || dealPrice.avgPrice >= 50 * 10000){ if(forceCheck){ - throw new IllegalArgumentException("avgPrice非法:${dealPrice.avgPrice}") + throw new IllegalArgumentException("avgPrice闈炴硶:${dealPrice.avgPrice}") } return false } if (!dealPrice.tradeDate || dealPrice.tradeDate.format("yyyyMMdd").toInteger() < 20030101 || dealPrice.tradeDate.after(new Date())) { if(forceCheck){ - throw new IllegalArgumentException("tradeDate非法:${dealPrice.tradeDate}") + throw new IllegalArgumentException("tradeDate闈炴硶:${dealPrice.tradeDate}") } return false } BasicDBObject dealPriceDbObject = convertDealPrice2DbObject(dealPrice) - /**判断是否为遗漏的成交记录*/ + /**鍒ゆ柇鏄惁涓洪仐婕忕殑鎴愪氦璁板綍*/ BasicDBObject query = new BasicDBObject() query.append("city", dealPriceDbObject.city) query.append("region", dealPriceDbObject.region) @@ -306,7 +306,7 @@ class DealPriceUtils { query.append("area", dealPrice.area) query.append("avg_price", dealPrice.avgPrice) if (DEAL_PRICE_COLL.count(query) != 0) { - throw new IllegalArgumentException(query.toString() + "已存在") + throw new IllegalArgumentException(query.toString() + "宸插瓨鍦�") } return true @@ -314,7 +314,7 @@ class DealPriceUtils { /** - * 把DealPrice转换成BasicDbObject + * 鎶奃ealPrice杞崲鎴怋asicDbObject * @param dealPrice * @return */ @@ -356,7 +356,7 @@ class DealPriceUtils { /** - * 判断是否为可用的成交记录 + * 鍒ゆ柇鏄惁涓哄彲鐢ㄧ殑鎴愪氦璁板綍 * @param dealPrice * @return */ @@ -380,25 +380,25 @@ class DealPriceUtils { return false println("avg_price"+dealPrice.avg_price) } - if (trade_date == null || dealPrice.area == null || StringUtils.isBlank(dealPrice.district_name)) {//不存在成交日期或者没有成交面积 + if (trade_date == null || dealPrice.area == null || StringUtils.isBlank(dealPrice.district_name)) {//涓嶅瓨鍦ㄦ垚浜ゆ棩鏈熸垨鑰呮病鏈夋垚浜ら潰绉� return false println("trade_date"+dealPrice.trade_date) } - if (trade_date.format("yyyyMMdd").toInteger() < 20030101 || trade_date.after(new Date())) {//非正常日期 + if (trade_date.format("yyyyMMdd").toInteger() < 20030101 || trade_date.after(new Date())) {//闈炴甯告棩鏈� return false println("trade_date"+dealPrice.trade_date) } if(!(dealPrice.avg_price instanceof Integer)){ - throw new IllegalArgumentException("avg_price 格式错误!") + throw new IllegalArgumentException("avg_price 鏍煎紡閿欒!") } if(!(dealPrice.area instanceof Double)){ - throw new IllegalArgumentException("area 格式错误!") + throw new IllegalArgumentException("area 鏍煎紡閿欒!") } if(!(dealPrice.total_price instanceof Integer)){ - throw new IllegalArgumentException("total_price 格式错误!") + throw new IllegalArgumentException("total_price 鏍煎紡閿欒!") } - /**判断是否为遗漏的成交记录*/ + /**鍒ゆ柇鏄惁涓洪仐婕忕殑鎴愪氦璁板綍*/ BasicDBObject query = new BasicDBObject() query.append("city", dealPrice.city) query.append("region", dealPrice.region) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/DistrictTradeHouseStatBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/DistrictTradeHouseStatBatch.groovy index 6f6512322..239f205ea 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/DistrictTradeHouseStatBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/DistrictTradeHouseStatBatch.groovy @@ -16,7 +16,7 @@ import java.util.concurrent.Executors import java.util.concurrent.TimeUnit /** - * 小区成交量统计 + * 灏忓尯鎴愪氦閲忕粺璁� */ @BatchOwner(Watcher.GaoJuan) class DistrictTradeHouseStatBatch extends BaseBatch{ @@ -36,7 +36,7 @@ class DistrictTradeHouseStatBatch extends BaseBatch{ def startDate = DateUtils.truncateDay(DateUtils.getFirstDayOfMonth(new Date(), -1*index)); def endDate = DateUtils.truncateDay(DateUtils.getLastDayOfMonth(new Date(), -1*index)); def sDate = DateUtils.formatDateByPattern(startDate, "yyyyMM").toInteger() - println "sell 统计时间:"+sDate; + println "sell 缁熻鏃堕棿锛�"+sDate; calcuateTradeCount(citys, startDate, endDate, sDate); index++; } @@ -73,7 +73,7 @@ class DistrictTradeHouseStatBatch extends BaseBatch{ ret << udata; if(ret.size()%5000==0){ - println "第 "+(i/5000)+" 个"+ret.size() + println "绗� "+(i/5000)+" 涓�"+ret.size() DISTRICT_TRADE_STAT_COLL.insert(ret); ret = []; } @@ -111,9 +111,9 @@ class DistrictTradeHouseStatBatch extends BaseBatch{ for(def i=0; i< districts.size() ; i++){ def dist = districts[i]; - def estateType = "小区"; - if(dist.estate_type.indexOf("别墅")>-1){ - estateType = "别墅"; + def estateType = "灏忓尯"; + if(dist.estate_type.indexOf("鍒")>-1){ + estateType = "鍒"; } executorService.submit(new Runnable() { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/FangDealPriceCrawlerBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/FangDealPriceCrawlerBatch.groovy index 69215beff..db798faa0 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/FangDealPriceCrawlerBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/FangDealPriceCrawlerBatch.groovy @@ -7,13 +7,13 @@ import com.fangjia.script.dealPrice.parse.DealPriceResolver import com.fangjia.script.dealPrice.parse.FangDealPriceListPageResolver /** - * 功能说明:搜房成交数据抓取脚本 + * 鍔熻兘璇存槑:鎼滄埧鎴愪氦鏁版嵁鎶撳彇鑴氭湰 */ @BatchOwner(Watcher.LiXue) class FangDealPriceCrawlerBatch extends BaseDealPriceCrawlerBatch { private FangDealPriceCrawlerBatch() { - super("58774d63e4b0c77ebbf12579", "搜房") + super("58774d63e4b0c77ebbf12579", "鎼滄埧") } static void main(String[] args) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/FangTianXiaBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/FangTianXiaBatch.groovy index f620c60fc..6976e3598 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/FangTianXiaBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/FangTianXiaBatch.groovy @@ -55,7 +55,7 @@ class FangTianXiaBatch extends BaseBatch { } }; }) - if(city.equals("遵义")){ + if(city.equals("閬典箟")){ break } } @@ -66,7 +66,7 @@ class FangTianXiaBatch extends BaseBatch { String resultA=SpiderUtil.getResult(URLA) if(resultA!=null){ Document documen=Jsoup.parse(resultA) - String URL=documen.select(".listBox ul li a:contains(找学校)").attr("href"); + String URL=documen.select(".listBox ul li a:contains(鎵惧鏍�)").attr("href"); if(StringUtils.isNotBlank(URL)){ URL=URL.substring(0,URL.length()-1) String rel=SpiderUtil.getResult(URL+"/school/") @@ -97,11 +97,11 @@ class FangTianXiaBatch extends BaseBatch { doThird(link,documenSchool,region,URL,city) } boolean is=false - if(StringUtils.isNotBlank(document.select("a:contains(下一页)").toString())){ + if(StringUtils.isNotBlank(document.select("a:contains(涓嬩竴椤�)").toString())){ is=true } while(is){ - String link=URL+document.select("a:contains(下一页)").attr("href"); + String link=URL+document.select("a:contains(涓嬩竴椤�)").attr("href"); String content=SpiderUtil.getResult(link); Document doc=Jsoup.parse(content) Elements elementsm=doc.select(".title>a") @@ -114,7 +114,7 @@ class FangTianXiaBatch extends BaseBatch { Document documenSchool=Jsoup.parse(contenta) doThird(linka,documenSchool,region,URL,city) } - if(StringUtils.isNotBlank(doc.select("a:contains(下一页)").toString())){ + if(StringUtils.isNotBlank(doc.select("a:contains(涓嬩竴椤�)").toString())){ is=true document=doc }else { @@ -139,14 +139,14 @@ class FangTianXiaBatch extends BaseBatch { basicDBObject.put('region',region) basicDBObject.put('schoolnews',schoolnews) basicDBObject.put('schoolnews2',schoolnews2) - String link=URL+documenSchool.select("a:contains(招生简章)").attr("href") + String link=URL+documenSchool.select("a:contains(鎷涚敓绠�绔�)").attr("href") String content=SpiderUtil.getResult(link); if(content!=null){ Document doc=Jsoup.parse(content) Elements elements=doc.select(".rel.profileTxt>p") for(int i=0;i 时间:"+new Date().format("yyyy年MM月dd日 HH:mm:ss"),true) + log("寮�濮嬪垎鏋愭埧閫旂綉鎴愪氦鏁版嵁-> 鏃堕棿:"+new Date().format("yyyy骞碝M鏈坉d鏃� HH:mm:ss"),true) DBCursor cur = CRAWL_COLL.find(new BasicDBObject('job_id', JOB_ID)).addOption(Bytes.QUERYOPTION_NOTIMEOUT) int total = 0 while(cur.hasNext()){ @@ -68,7 +68,7 @@ public class FangtooTransactionPriceImportBatch extends BaseBatch{ trade.put("region",region) trade.put("district_name", item.ExName) trade.put("c_date", new Date()) - trade.put("source","房途网") + trade.put("source","鎴块�旂綉") if(item.getString("Area") ==~ /\d+(.\d+)?/){ trade.put("area",DataUtil.roundDouble(item.getString("Area").toDouble(), 2)) } @@ -86,7 +86,7 @@ public class FangtooTransactionPriceImportBatch extends BaseBatch{ } } if(trade.getInt("total_price", 0) > 10000){ - if(isAvailableTradeRecorde(city, region, item.ExName,trade.get("trade_date"),"房途网",trade.getDouble("area"))){ + if(isAvailableTradeRecorde(city, region, item.ExName,trade.get("trade_date"),"鎴块�旂綉",trade.getDouble("area"))){ total ++ trade.append("creator","lixue") DEAL_PRICE_COLL.save(trade) @@ -97,7 +97,7 @@ public class FangtooTransactionPriceImportBatch extends BaseBatch{ } } - log("房途网成交数据分析结束-> 共解析成交数据${total}条 时间:"+new Date().format("yyyy年MM月dd日 HH:mm:ss"),true) + log("鎴块�旂綉鎴愪氦鏁版嵁鍒嗘瀽缁撴潫-> 鍏辫В鏋愭垚浜ゆ暟鎹�${total}鏉� 鏃堕棿:"+new Date().format("yyyy骞碝M鏈坉d鏃� HH:mm:ss"),true) } @@ -166,11 +166,11 @@ public class FangtooTransactionPriceImportBatch extends BaseBatch{ break; } }else if(result.getInt("status") == 404){ - println("抓取错误(404):${url}") + println("鎶撳彇閿欒(404):${url}") break; }else{ Thread.sleep(1000); - println "准备尝试第"+(repeatTimes + 1)+"次请求:$url"; + println "鍑嗗灏濊瘯绗�"+(repeatTimes + 1)+"娆¤姹�:$url"; } repeatTimes ++ } @@ -192,7 +192,7 @@ public class FangtooTransactionPriceImportBatch extends BaseBatch{ } /** - * 判断是否为可用的成交记录 + * 鍒ゆ柇鏄惁涓哄彲鐢ㄧ殑鎴愪氦璁板綍 * @param city * @param region * @param name @@ -202,13 +202,13 @@ public class FangtooTransactionPriceImportBatch extends BaseBatch{ * @return */ private boolean isAvailableTradeRecorde(String city,String region,String name,Date date,String source,Double area){ - if(date == null || area == null || StringUtils.isBlank(name) || date == null){//不存在成交日期或者没有成交面积 + if(date == null || area == null || StringUtils.isBlank(name) || date == null){//涓嶅瓨鍦ㄦ垚浜ゆ棩鏈熸垨鑰呮病鏈夋垚浜ら潰绉� return false; } - if(date.format("yyyyMMdd").toInteger()< 20030101||date.after(new Date())){//非正常日期 + if(date.format("yyyyMMdd").toInteger()< 20030101||date.after(new Date())){//闈炴甯告棩鏈� return false; } - /**判断是否为遗漏的成交记录*/ + /**鍒ゆ柇鏄惁涓洪仐婕忕殑鎴愪氦璁板綍*/ BasicDBObject query = new BasicDBObject(); query.append("city", city); query.append("region", region); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/GouFangWebBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/GouFangWebBatch.groovy index e16df9afc..b3420258a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/GouFangWebBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/GouFangWebBatch.groovy @@ -48,16 +48,16 @@ class GouFangWebBatch extends BaseBatch{ String link=elements.get(i).attr("href") String name=elements.get(i).text() String str=elements1.get(i).text() - String region=StringUtils.substringBetween(str,"地址:[","] [") + String region=StringUtils.substringBetween(str,"鍦板潃锛歔","] [") doThird(link,city,region,name) } boolean is=false - if(StringUtils.isNotBlank(document.select("a:contains(下一页)").toString())){ + if(StringUtils.isNotBlank(document.select("a:contains(涓嬩竴椤�)").toString())){ is=true } while(is){ - String linka=document.select("a:contains(下一页)").attr("href"); + String linka=document.select("a:contains(涓嬩竴椤�)").attr("href"); String content=SpiderUtil.getResult(linka,"gbk"); if(content==null){ continue @@ -69,10 +69,10 @@ class GouFangWebBatch extends BaseBatch{ String link=elementsm.get(i).attr("href") String name=elementsm.get(i).text() String str=elementsm1.get(i).text() - String region=StringUtils.substringBetween(str,"地址:[","] [") + String region=StringUtils.substringBetween(str,"鍦板潃锛歔","] [") doThird(link,city,region,name) } - if(StringUtils.isNotBlank(doc.select("a:contains(下一页)").toString())){ + if(StringUtils.isNotBlank(doc.select("a:contains(涓嬩竴椤�)").toString())){ is=true document=doc }else { @@ -98,16 +98,16 @@ class GouFangWebBatch extends BaseBatch{ String date=elements0.get(0).text().trim() Date tradeDate=com.fangjia.core.util.DateUtil.parseDate(date,"yyyy-MM-dd") String huxing=elements0.get(1).text().trim() - int room=Integer.parseInt(StringUtils.substringBefore(huxing,"室")) - int hall=Integer.parseInt(StringUtils.substringBetween(huxing,"室","厅")) + int room=Integer.parseInt(StringUtils.substringBefore(huxing,"瀹�")) + int hall=Integer.parseInt(StringUtils.substringBetween(huxing,"瀹�","鍘�")) String mianji=elements0.get(2).text().trim() - double area=Double.parseDouble(StringUtils.substringBefore(mianji,"平")) + double area=Double.parseDouble(StringUtils.substringBefore(mianji,"骞�")) String avp=elements0.get(6).text().trim() - int avgPrice=(int)Double.parseDouble(StringUtils.substringBefore(avp,"元/平")) + int avgPrice=(int)Double.parseDouble(StringUtils.substringBefore(avp,"鍏�/骞�")) String sumprice=elements0.get(7).text().trim() int totalPrice=Integer.parseInt(sumprice)*10000 BasicDBObject basicDBObject=new BasicDBObject() - basicDBObject.put("creator","方锐") + basicDBObject.put("creator","鏂归攼") basicDBObject.put("city",city) basicDBObject.put("region",region) basicDBObject.put("districtName",name) @@ -118,13 +118,13 @@ class GouFangWebBatch extends BaseBatch{ basicDBObject.put("room",room) basicDBObject.put("hall",hall) basicDBObject.put("creationDate",new Date()) - basicDBObject.put("source","购房网") - basicDBObject.put("webline","购房网") - BasicDBObject basicDBObject1=COLL.findOne(new BasicDBObject("webline","购房网").append("city",city).append("region",region). + basicDBObject.put("source","璐埧缃�") + basicDBObject.put("webline","璐埧缃�") + BasicDBObject basicDBObject1=COLL.findOne(new BasicDBObject("webline","璐埧缃�").append("city",city).append("region",region). append("districtName",name).append("area",area).append("room",room).append("hall",hall)) if(basicDBObject1==null){ COLL.save(basicDBObject) - println('已入库'+count+'条!') + println('宸插叆搴�'+count+'鏉★紒') count++ } }catch (Exception e){ @@ -133,11 +133,11 @@ class GouFangWebBatch extends BaseBatch{ } boolean is=false - if(StringUtils.isNotBlank(document.select("a:contains(下一页)").toString())){ + if(StringUtils.isNotBlank(document.select("a:contains(涓嬩竴椤�)").toString())){ is=true } while(is){ - String linka=document.select("a:contains(下一页)").attr("href"); + String linka=document.select("a:contains(涓嬩竴椤�)").attr("href"); String contentA=SpiderUtil.getResult(linka,"gbk"); if(contentA==null){ continue @@ -150,16 +150,16 @@ class GouFangWebBatch extends BaseBatch{ String date=elements0.get(0).text().trim() Date tradeDate=com.fangjia.core.util.DateUtil.parseDate(date,"yyyy-MM-dd") String huxing=elements0.get(1).text().trim() - int room=Integer.parseInt(StringUtils.substringBefore(huxing,"室")) - int hall=Integer.parseInt(StringUtils.substringBetween(huxing,"室","厅")) + int room=Integer.parseInt(StringUtils.substringBefore(huxing,"瀹�")) + int hall=Integer.parseInt(StringUtils.substringBetween(huxing,"瀹�","鍘�")) String mianji=elements0.get(2).text().trim() - double area=Double.parseDouble(StringUtils.substringBefore(mianji,"平")) + double area=Double.parseDouble(StringUtils.substringBefore(mianji,"骞�")) String avp=elements0.get(6).text().trim() - int avgPrice=(int)Double.parseDouble(StringUtils.substringBefore(avp,"元/平")) + int avgPrice=(int)Double.parseDouble(StringUtils.substringBefore(avp,"鍏�/骞�")) String sumprice=elements0.get(7).text().trim() int totalPrice=Integer.parseInt(sumprice)*10000 BasicDBObject basicDBObject=new BasicDBObject() - basicDBObject.put("creator","方锐") + basicDBObject.put("creator","鏂归攼") basicDBObject.put("city",city) basicDBObject.put("region",region) basicDBObject.put("districtName",name) @@ -170,20 +170,20 @@ class GouFangWebBatch extends BaseBatch{ basicDBObject.put("room",room) basicDBObject.put("hall",hall) basicDBObject.put("creationDate",new Date()) - basicDBObject.put("source","购房网") - basicDBObject.put("webline","购房网") - BasicDBObject basicDBObject1=COLL.findOne(new BasicDBObject("webline","购房网").append("city",city).append("region",region). + basicDBObject.put("source","璐埧缃�") + basicDBObject.put("webline","璐埧缃�") + BasicDBObject basicDBObject1=COLL.findOne(new BasicDBObject("webline","璐埧缃�").append("city",city).append("region",region). append("districtName",name).append("area",area).append("room",room).append("hall",hall)) if(basicDBObject1==null){ COLL.save(basicDBObject) - println('已入库'+count+'条!') + println('宸插叆搴�'+count+'鏉★紒') count++ } }catch (Exception e){ } } - if(StringUtils.isNotBlank(doc.select("a:contains(下一页)").toString())){ + if(StringUtils.isNotBlank(doc.select("a:contains(涓嬩竴椤�)").toString())){ is=true document=doc }else { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/GuodaDealPriceCrawlerBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/GuodaDealPriceCrawlerBatch.groovy index daf57927b..dcddb155d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/GuodaDealPriceCrawlerBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/GuodaDealPriceCrawlerBatch.groovy @@ -13,7 +13,7 @@ import org.apache.commons.lang.StringUtils import org.jsoup.Jsoup /** - * 功能说明:国大地产二手成交数据抓取 + * 鍔熻兘璇存槑:鍥藉ぇ鍦颁骇浜屾墜鎴愪氦鏁版嵁鎶撳彇 */ @BatchOwner(Watcher.LiXue) class GuodaDealPriceCrawlerBatch extends BaseBatch { @@ -36,10 +36,10 @@ class GuodaDealPriceCrawlerBatch extends BaseBatch { def links = doc.select("div#tit_tex>a") def totalPage = doc.select("div.fany_box1").first().text() if(totalPage){ - total = StringUtils.substringBetween(totalPage,"共","页").toInteger() - println("总页数:"+total+"页") + total = StringUtils.substringBetween(totalPage,"鍏�","椤�").toInteger() + println("鎬婚〉鏁帮細"+total+"椤�") } - println("-----------------开始抓取第"+i+"页-----------------") + println("-----------------寮�濮嬫姄鍙栫"+i+"椤�-----------------") for(def link : links){ def detLink = link.attr("href") detLink = "http://www.guodafdc.com/"+detLink @@ -47,11 +47,11 @@ class GuodaDealPriceCrawlerBatch extends BaseBatch { count++ } } - println("共抓取了"+count+"个小区") - jms.sendMail('lixue@fangjia.com', "国大房产数据分析","总抓取${count}个小区".toString() - +"\n"+"共"+j+"条记录") - jms.sendMail('wangchencen@fangjia.com', "国大房产数据分析","总抓取${count}个小区".toString() - +"\n"+"共"+j+"条记录") + println("鍏辨姄鍙栦簡"+count+"涓皬鍖�") + jms.sendMail('lixue@fangjia.com', "鍥藉ぇ鎴夸骇鏁版嵁鍒嗘瀽","鎬绘姄鍙�${count}涓皬鍖�".toString() + +"\n"+"鍏�"+j+"鏉¤褰�") + jms.sendMail('wangchencen@fangjia.com', "鍥藉ぇ鎴夸骇鏁版嵁鍒嗘瀽","鎬绘姄鍙�${count}涓皬鍖�".toString() + +"\n"+"鍏�"+j+"鏉¤褰�") } void detailParse(def link){ @@ -62,7 +62,7 @@ class GuodaDealPriceCrawlerBatch extends BaseBatch { def name = doc.select("#fysm > span:nth-child(5) > a").text() for(def tr : trs) { def list = new ArrayList() - if (!tr.text().contains("户型")) { + if (!tr.text().contains("鎴峰瀷")) { def tds = tr.select("td") for (def td : tds) { if (td.text()) { @@ -72,12 +72,12 @@ class GuodaDealPriceCrawlerBatch extends BaseBatch { try { if(list.size()>4) { j++ - def city = "石家庄" + def city = "鐭冲搴�" region = RegionData.formatRegion(city,region) def roomInfo = list.get(0) int room = -1 int hall = -1 - if(roomInfo&&roomInfo.toString().contains("室")&&roomInfo.toString().contains("厅")){ + if(roomInfo&&roomInfo.toString().contains("瀹�")&&roomInfo.toString().contains("鍘�")){ room = roomInfo.toString().substring(0,1).toInteger() hall = roomInfo.toString().substring(2,3).toInteger() } @@ -98,7 +98,7 @@ class GuodaDealPriceCrawlerBatch extends BaseBatch { unitPrice = DealPriceUtils.parseUnitPrice(unitPrice.toString().replaceAll(",","")) DealPrice dealPrice = new DealPrice() - dealPrice.city = "石家庄" + dealPrice.city = "鐭冲搴�" dealPrice.region = region dealPrice.districtName = name if(room!=-1&&hall!=-1){ @@ -113,16 +113,16 @@ class GuodaDealPriceCrawlerBatch extends BaseBatch { } dealPrice.totalPrice = price dealPrice.avgPrice = unitPrice - dealPrice.source = "国大地产" + dealPrice.source = "鍥藉ぇ鍦颁骇" dealPrice.creationDate = cDate dealPrice.creator = "lixue" if(DealPriceUtils.isAvailableDealPrice(dealPrice)) { DealPriceUtils.save(dealPrice) -// CRAWL_COLL.save(new BasicDBObject("city", "石家庄").append("region", region).append("name", name) +// CRAWL_COLL.save(new BasicDBObject("city", "鐭冲搴�").append("region", region).append("name", name) // .append("room_info", list.get(0)).append("area", list.get(1)).append("tradeDate", list.get(2)) -// .append("dealPrice", list.get(3)).append("unitPrice", list.get(4)).append("source","国大地产")) +// .append("dealPrice", list.get(3)).append("unitPrice", list.get(4)).append("source","鍥藉ぇ鍦颁骇")) } } } catch (Exception e) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/IwjwTransactionPriceImportBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/IwjwTransactionPriceImportBatch.groovy index 692c8068b..5695f6102 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/IwjwTransactionPriceImportBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/IwjwTransactionPriceImportBatch.groovy @@ -23,7 +23,7 @@ import java.util.regex.Matcher import java.util.regex.Pattern /** - * 爱屋吉屋成交数据抓取解析 + * 鐖卞眿鍚夊眿鎴愪氦鏁版嵁鎶撳彇瑙f瀽 * Created by wenyan on 2015/10/10. */ @BatchOwner(Watcher.WangWenYan) @@ -44,15 +44,15 @@ public class IwjwTransactionPriceImportBatch extends BaseBatch{ void process(Object args) { parseDistrict() if(hasException){ - log("解析出现异常请注意检查!",true) + log("瑙f瀽鍑虹幇寮傚父璇锋敞鎰忔鏌�!",true) }else{ CRAWL_COLL.remove(new BasicDBObject('job_id', JOB_ID)) } - jms.sendMail('wangwenyan@fangjia.com',"爱屋吉屋成交数据分析结果",sb.toString()); + jms.sendMail('wangwenyan@fangjia.com',"鐖卞眿鍚夊眿鎴愪氦鏁版嵁鍒嗘瀽缁撴灉",sb.toString()); } def parseDistrict(){ - log("开始分析爱屋吉屋成交数据-> 时间:"+new Date().format("yyyy年MM月dd日 HH:mm:ss"),true) + log("寮�濮嬪垎鏋愮埍灞嬪悏灞嬫垚浜ゆ暟鎹�-> 鏃堕棿:"+new Date().format("yyyy骞碝M鏈坉d鏃� HH:mm:ss"),true) DBCursor cur = CRAWL_COLL.find(new BasicDBObject('job_id', JOB_ID)).addOption(Bytes.QUERYOPTION_NOTIMEOUT) int total = 0 while(cur.hasNext()){ @@ -71,8 +71,8 @@ public class IwjwTransactionPriceImportBatch extends BaseBatch{ Elements infoSpans= JQueryUtils.select(".contents-infos .sec",content) infoSpans.each {Element e -> def txt = selectText("i",e.toString()) - if(txt.contains("区域")){ - def regionBlock = e.text().replaceFirst("区域板块: ","").trim() + if(txt.contains("鍖哄煙")){ + def regionBlock = e.text().replaceFirst("鍖哄煙鏉垮潡锛� ","").trim() region = regionBlock.split("-")[0].trim() region = RegionData.formatRegion(city, region) if(!RegionData.isRegion(city, region)){ @@ -95,9 +95,9 @@ public class IwjwTransactionPriceImportBatch extends BaseBatch{ trade.put("region",region) trade.put("district_name",name) trade.put("c_date", new Date()) - trade.put("source","爱屋吉屋") + trade.put("source","鐖卞眿鍚夊眿") trade.put("area",item.getDouble("spaceArea")) - trade.put("avg_price",item.getString("unitPrice").replace("万/平","").toDouble() * 10000) + trade.put("avg_price",item.getString("unitPrice").replace("涓�/骞�","").toDouble() * 10000) trade.put("total_price",(item.getDouble("price") * 10000).toInteger()) if(item.containsKey("contract")){ trade.put("trade_date",DateUtil.parseDate(item.getString("contract"),"yyyy-MM-dd")) @@ -110,12 +110,12 @@ public class IwjwTransactionPriceImportBatch extends BaseBatch{ } if(item.containsKey("floorStr")){ String floorStr = item.getString("floorStr") - floorStr = getMatchString(floorStr,"\\d+层") + floorStr = getMatchString(floorStr,"\\d+灞�") if(floorStr != null){ - trade.put("height",floorStr.replace("层","").toInteger()) + trade.put("height",floorStr.replace("灞�","").toInteger()) } } - if(isAvailableTradeRecorde(city, region, name,trade.get("trade_date"),"爱屋吉屋",trade.getDouble("area"))){ + if(isAvailableTradeRecorde(city, region, name,trade.get("trade_date"),"鐖卞眿鍚夊眿",trade.getDouble("area"))){ total ++ DEAL_PRICE_COLL.save(trade) } @@ -127,7 +127,7 @@ public class IwjwTransactionPriceImportBatch extends BaseBatch{ hasException = true } } - log("爱屋吉屋成交数据分析结束-> 时间:"+ new Date().format("yyyy年MM月dd日 HH:mm:ss") + "新增成交数据量${total}",true) + log("鐖卞眿鍚夊眿鎴愪氦鏁版嵁鍒嗘瀽缁撴潫-> 鏃堕棿:"+ new Date().format("yyyy骞碝M鏈坉d鏃� HH:mm:ss") + "鏂板鎴愪氦鏁版嵁閲�${total}",true) } def List getTrades(housetype, estatecode){ @@ -192,11 +192,11 @@ public class IwjwTransactionPriceImportBatch extends BaseBatch{ break; } }else if(result.getInt("status") == 404){ - println("抓取错误(404):${url}") + println("鎶撳彇閿欒(404):${url}") break; }else{ Thread.sleep(1000); - println "准备尝试第"+(repeatTimes + 1)+"次请求:$url"; + println "鍑嗗灏濊瘯绗�"+(repeatTimes + 1)+"娆¤姹�:$url"; } repeatTimes ++ } @@ -218,7 +218,7 @@ public class IwjwTransactionPriceImportBatch extends BaseBatch{ } /** - * 判断是否为可用的成交记录 + * 鍒ゆ柇鏄惁涓哄彲鐢ㄧ殑鎴愪氦璁板綍 * @param city * @param region * @param name @@ -228,13 +228,13 @@ public class IwjwTransactionPriceImportBatch extends BaseBatch{ * @return */ private boolean isAvailableTradeRecorde(String city,String region,String name,Date date,String source,Double area){ - if(date == null || area == null){//不存在成交日期或者没有成交面积 + if(date == null || area == null){//涓嶅瓨鍦ㄦ垚浜ゆ棩鏈熸垨鑰呮病鏈夋垚浜ら潰绉� return false; } - if(date.format("yyyyMMdd").toInteger()<20030101||date.after(new Date())){//非正常日期 + if(date.format("yyyyMMdd").toInteger()<20030101||date.after(new Date())){//闈炴甯告棩鏈� return false; } - /**判断是否为遗漏的成交记录*/ + /**鍒ゆ柇鏄惁涓洪仐婕忕殑鎴愪氦璁板綍*/ BasicDBObject query = new BasicDBObject(); query.append("city", city); query.append("region", region); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/JJshunDealPriceCrawlerBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/JJshunDealPriceCrawlerBatch.groovy index dff2ea48a..79043a7c9 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/JJshunDealPriceCrawlerBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/JJshunDealPriceCrawlerBatch.groovy @@ -8,7 +8,7 @@ import com.fangjia.script.dealPrice.parse.DealPriceResolver import com.fangjia.script.dealPrice.parse.JJshunDealPriceListPageResolver /** - * 功能说明:家家顺成交数据解析 + * 鍔熻兘璇存槑:瀹跺椤烘垚浜ゆ暟鎹В鏋� */ @BatchOwner(Watcher.LiXue) class JJshunDealPriceCrawlerBatch extends BaseDealPriceCrawlerBatch { @@ -19,7 +19,7 @@ class JJshunDealPriceCrawlerBatch extends BaseDealPriceCrawlerBatch { } JJshunDealPriceCrawlerBatch() { - super("59bb91c9e4b006dfb63bb315", "家家顺") + super("59bb91c9e4b006dfb63bb315", "瀹跺椤�") } @Override void process() { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/LejuDealPriceCrawler.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/LejuDealPriceCrawler.groovy index d7c87cdba..de9cc24ee 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/LejuDealPriceCrawler.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/LejuDealPriceCrawler.groovy @@ -16,7 +16,7 @@ import com.mongodb.DBCollection import org.jsoup.Jsoup /** - * 功能说明:新浪乐居成交数据抓取(暂时无用) + * 鍔熻兘璇存槑:鏂版氮涔愬眳鎴愪氦鏁版嵁鎶撳彇(鏆傛椂鏃犵敤) */ @BatchOwner(Watcher.LiXue) class LejuDealPriceCrawler extends BaseBatch { @@ -34,16 +34,16 @@ class LejuDealPriceCrawler extends BaseBatch { getSeed() } static void crawlerListData(){ - DEAL_PRICE_SEED.find(new BasicDBObject("flag",false).append("source","新浪乐居")).addOption(Bytes.QUERYOPTION_NOTIMEOUT).batchSize(100).each { dbObj-> + DEAL_PRICE_SEED.find(new BasicDBObject("flag",false).append("source","鏂版氮涔愬眳")).addOption(Bytes.QUERYOPTION_NOTIMEOUT).batchSize(100).each { dbObj-> def city = dbObj.city def region = dbObj.region def url = dbObj.url parsegetList(city.toString(),region.toString(),url.toString()) DEAL_PRICE_SEED.update(new BasicDBObject("_id",dbObj._id),new BasicDBObject('$set',new BasicDBObject("flag",true))) } - def content = "本次入库量为"+saveCount+"条" - jms.sendMail(Watcher.LiXue.email, "新浪乐居成交数据抓取解析报告", content) - jms.sendMail("wangchencen@fangjia.com", "新浪乐居成交数据抓取解析报告", content) + def content = "鏈鍏ュ簱閲忎负"+saveCount+"鏉�" + jms.sendMail(Watcher.LiXue.email, "鏂版氮涔愬眳鎴愪氦鏁版嵁鎶撳彇瑙f瀽鎶ュ憡", content) + jms.sendMail("wangchencen@fangjia.com", "鏂版氮涔愬眳鎴愪氦鏁版嵁鎶撳彇瑙f瀽鎶ュ憡", content) } static def parsegetList(String city, String region, String url) { @@ -74,7 +74,7 @@ class LejuDealPriceCrawler extends BaseBatch { def avgPrice = DealPriceUtils.parseUnitPrice(unitPrice.text()) dealPrice.avgPrice = avgPrice dealPrice.creator = "lixue" - dealPrice.source = "链家在线" + dealPrice.source = "閾惧鍦ㄧ嚎" if (DealPriceUtils.save(dealPrice)) { saveCount++ } else { @@ -84,7 +84,7 @@ class LejuDealPriceCrawler extends BaseBatch { } }catch (Exception e){ - println("无法抓取:"+url) + println("鏃犳硶鎶撳彇锛�"+url) } } static def getSeed(){ @@ -110,22 +110,22 @@ class LejuDealPriceCrawler extends BaseBatch { region = RegionData.parseRegionFormAddress(city, region) if (RegionData.isRegion(city, region)) { try { - def page = regionDoc.select("span.no-b").text().replaceAll("共", "").replaceAll("页", "").toInteger() + def page = regionDoc.select("span.no-b").text().replaceAll("鍏�", "").replaceAll("椤�", "").toInteger() for (int i = 1; i <= page; i++) { def link = regionLink.replaceAll("community/", "community/n" + i + "-") println(city + " " + region + " " + link) - if(DEAL_PRICE_SEED.findOne(new BasicDBObject("city", city).append("url", link).append("region", region).append("flag", false).append("source", "新浪乐居"))==null) { - DEAL_PRICE_SEED.save(new BasicDBObject("city", city).append("url", link).append("region", region).append("flag", false).append("source", "新浪乐居")) + if(DEAL_PRICE_SEED.findOne(new BasicDBObject("city", city).append("url", link).append("region", region).append("flag", false).append("source", "鏂版氮涔愬眳"))==null) { + DEAL_PRICE_SEED.save(new BasicDBObject("city", city).append("url", link).append("region", region).append("flag", false).append("source", "鏂版氮涔愬眳")) } } } catch (Exception e) { - println(cityLink + "页数解析异常") + println(cityLink + "椤垫暟瑙f瀽寮傚父") } } } } catch (Exception e) { - println(cityUrl.text() + "网址解析异常") + println(cityUrl.text() + "缃戝潃瑙f瀽寮傚父") } } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/LianjiaDealPriceCrawlerBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/LianjiaDealPriceCrawlerBatch.groovy index bf0d2c07f..1ba6ea2e8 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/LianjiaDealPriceCrawlerBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/LianjiaDealPriceCrawlerBatch.groovy @@ -5,13 +5,13 @@ import com.fangjia.script.dealPrice.parse.DealPriceResolver import com.fangjia.script.dealPrice.parse.LianjiaDealPriceListPageResolver /** - * 功能说明: + * 鍔熻兘璇存槑: */ class LianjiaDealPriceCrawlerBatch extends BaseDealPriceCrawlerBatch { LianjiaDealPriceCrawlerBatch() { - super("53e492b7e4b09e392f5b3f63", "链家在线") + super("53e492b7e4b09e392f5b3f63", "閾惧鍦ㄧ嚎") } static void main(String[] args) { runBatch(new LianjiaDealPriceCrawlerBatch(), args) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/LianjiaDealPriceLoginCrawler.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/LianjiaDealPriceLoginCrawler.groovy index 7c84096b0..96a83160d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/LianjiaDealPriceLoginCrawler.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/LianjiaDealPriceLoginCrawler.groovy @@ -15,7 +15,7 @@ import com.mongodb.DBCollection import org.jsoup.Jsoup /** - * 功能说明:链家成交数据抓取 + * 鍔熻兘璇存槑:閾惧鎴愪氦鏁版嵁鎶撳彇 */ @BatchOwner(Watcher.LiXue) class LianjiaDealPriceLoginCrawler { @@ -24,22 +24,22 @@ class LianjiaDealPriceLoginCrawler { static int saveCount = 0 static Jms jms = Jms.create('tcp://jms.db.fangjia.com:61616'); static void main(String[] args) { -// getSeed()//获取种子 +// getSeed()//鑾峰彇绉嶅瓙 crawlerListData() } static void crawlerListData(){ - DEAL_PRICE_SEED.find(new BasicDBObject("flag",false).append("source","链家在线")).addOption(Bytes.QUERYOPTION_NOTIMEOUT).batchSize(100).each { dbObj-> + DEAL_PRICE_SEED.find(new BasicDBObject("flag",false).append("source","閾惧鍦ㄧ嚎")).addOption(Bytes.QUERYOPTION_NOTIMEOUT).batchSize(100).each { dbObj-> def city = dbObj.city def region = dbObj.region def url = dbObj.url parsegetList(city.toString(),region.toString(),url.toString()) DEAL_PRICE_SEED.update(new BasicDBObject("_id",dbObj._id),new BasicDBObject('$set',new BasicDBObject("flag",true))) } - def content = "本次入库量为"+saveCount+"条" - jms.sendMail(Watcher.LiXue.email, "链家成交数据抓取解析报告", content) - jms.sendMail("wangchencen@fangjia.com", "链家成交数据抓取解析报告", content) - DEAL_PRICE_SEED.update(new BasicDBObject("flag",false).append("source","链家在线"),new BasicDBObject('$set',new BasicDBObject("flag",false))) + def content = "鏈鍏ュ簱閲忎负"+saveCount+"鏉�" + jms.sendMail(Watcher.LiXue.email, "閾惧鎴愪氦鏁版嵁鎶撳彇瑙f瀽鎶ュ憡", content) + jms.sendMail("wangchencen@fangjia.com", "閾惧鎴愪氦鏁版嵁鎶撳彇瑙f瀽鎶ュ憡", content) + DEAL_PRICE_SEED.update(new BasicDBObject("flag",false).append("source","閾惧鍦ㄧ嚎"),new BasicDBObject('$set',new BasicDBObject("flag",false))) } static def parsegetList(String city, String region, String url) { @@ -50,7 +50,7 @@ class LianjiaDealPriceLoginCrawler { def result = HttpHelper.fetchPage(url,"utf-8",headers,null) def doc = Jsoup.parse(result) def listContents - if(city!="上海"){ + if(city!="涓婃捣"){ listContents = doc.select(".listContent li") for(def listContent : listContents){ def title = JQueryUtils.select(".title>a", listContent.toString()) @@ -71,7 +71,7 @@ class LianjiaDealPriceLoginCrawler { def avgPrice = DealPriceUtils.parseUnitPrice(unitPrice.text()) dealPrice.avgPrice = avgPrice dealPrice.creator = "lixue" - dealPrice.source = "链家在线" + dealPrice.source = "閾惧鍦ㄧ嚎" if(DealPriceUtils.save(dealPrice)){ saveCount++ }else { @@ -92,13 +92,13 @@ class LianjiaDealPriceLoginCrawler { def tradeDate = DealPriceUtils.parseDealDate(listContent.text()) dealPrice.tradeDate = tradeDate def totalPrice = JQueryUtils.select("span.strong-num", listContent.toString()) - def price = DealPriceUtils.parseTotalPrice(totalPrice.text() + "万") + def price = DealPriceUtils.parseTotalPrice(totalPrice.text() + "涓�") dealPrice.totalPrice = price def unitPrice = JQueryUtils.select("div.info-col.price-item.minor", listContent.toString()) - def avgPrice = DealPriceUtils.parseUnitPrice(unitPrice.text().replaceAll("单价", "")) + def avgPrice = DealPriceUtils.parseUnitPrice(unitPrice.text().replaceAll("鍗曚环", "")) dealPrice.avgPrice = avgPrice dealPrice.creator = "lixue" - dealPrice.source = "链家在线" + dealPrice.source = "閾惧鍦ㄧ嚎" if (DealPriceUtils.save(dealPrice)) { saveCount++ } else { @@ -107,7 +107,7 @@ class LianjiaDealPriceLoginCrawler { } } }catch (Exception e){ - println("无法抓取:"+url) + println("鏃犳硶鎶撳彇锛�"+url) } } @@ -136,7 +136,7 @@ class LianjiaDealPriceLoginCrawler { for (int i = 1; i <= 100; i++) { def link = regionLink + "pg" + i // println(city + " " + region + " " + link) - DEAL_PRICE_SEED.save(new BasicDBObject("city", city).append("url", link).append("region",region).append("flag", false).append("source", "链家在线")) + DEAL_PRICE_SEED.save(new BasicDBObject("city", city).append("url", link).append("region",region).append("flag", false).append("source", "閾惧鍦ㄧ嚎")) } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/MaiTianDealPriceCrawlerBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/MaiTianDealPriceCrawlerBatch.groovy index b315d9a91..ad1252c84 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/MaiTianDealPriceCrawlerBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/MaiTianDealPriceCrawlerBatch.groovy @@ -9,14 +9,14 @@ import com.fangjia.script.dealPrice.parse.MaiTianDealPriceListPageResolver import com.fangjia.script.dealPrice.parse.MytophomeDealPriceListPageResolver /** - * 功能说明:麦田成交数据解析 + * 鍔熻兘璇存槑:楹︾敯鎴愪氦鏁版嵁瑙f瀽 */ class MaiTianDealPriceCrawlerBatch extends BaseDealPriceCrawlerBatch { MaiTianDealPriceCrawlerBatch() { - super("589ad018e4b0c77ebbf36552", "麦田") + super("589ad018e4b0c77ebbf36552", "楹︾敯") } static void main(String[] args) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/MytophomeDealPriceCrawlerBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/MytophomeDealPriceCrawlerBatch.groovy index df40f2728..9a51cc5ba 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/MytophomeDealPriceCrawlerBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/MytophomeDealPriceCrawlerBatch.groovy @@ -7,14 +7,14 @@ import com.fangjia.script.dealPrice.parse.DealPriceResolver import com.fangjia.script.dealPrice.parse.MytophomeDealPriceListPageResolver /** - * 功能说明:满堂红成交数据解析 + * 鍔熻兘璇存槑:婊″爞绾㈡垚浜ゆ暟鎹В鏋� */ @BatchOwner(Watcher.LiXue) class MytophomeDealPriceCrawlerBatch extends BaseDealPriceCrawlerBatch { MytophomeDealPriceCrawlerBatch() { - super("53e4aba4e4b09e392f5b3fc0", "满堂红") + super("53e4aba4e4b09e392f5b3fc0", "婊″爞绾�") } static void main(String[] args) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/PinganfangDealPriceCrawlerBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/PinganfangDealPriceCrawlerBatch.groovy index 87f5e0542..988b73289 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/PinganfangDealPriceCrawlerBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/PinganfangDealPriceCrawlerBatch.groovy @@ -7,14 +7,14 @@ import com.fangjia.script.dealPrice.parse.DealPriceResolver import com.fangjia.script.dealPrice.parse.PingAnDealPriceResolver /** - * 功能说明:平安好房成交数据解析脚本 + * 鍔熻兘璇存槑:骞冲畨濂芥埧鎴愪氦鏁版嵁瑙f瀽鑴氭湰 */ @BatchOwner(Watcher.LiXue) class PinganfangDealPriceCrawlerBatch extends BaseDealPriceCrawlerBatch { PinganfangDealPriceCrawlerBatch() { - super("58b66280e4b04ce279f09284", "平安好房") + super("58b66280e4b04ce279f09284", "骞冲畨濂芥埧") } static void main(String[] args) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/ResDealPriceCrawlerBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/ResDealPriceCrawlerBatch.groovy index 7bbb649da..3bc98c552 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/ResDealPriceCrawlerBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/ResDealPriceCrawlerBatch.groovy @@ -18,7 +18,7 @@ import java.util.regex.Pattern import static com.mongodb.client.model.Filters.* -@BatchOwner(value = Watcher.WangWenYan, describe = "澜思成交数据入库") +@BatchOwner(value = Watcher.WangWenYan, describe = "婢滄�濇垚浜ゆ暟鎹叆搴�") class ResDealPriceCrawlerBatch extends BaseBatch { MongoCollection PROXY_HTML = Mongo3Utils.getDbCollection(Constants.FANGJIA_CRAWL_MONGO_URI, "fangjia_crawl", "proxy_html") @@ -52,9 +52,9 @@ class ResDealPriceCrawlerBatch extends BaseBatch { eq("region", lansi.region), eq("area", lansi.area), eq("totalPrice", lansi.totalPrice)) if(RES_NEWDEALPRICE.countDocuments(query) == 0){ RES_NEWDEALPRICE.insertOne(lansi) - println("保存:" + lansi) + println("淇濆瓨:" + lansi) }else{ - println("已存在:" + lansi) + println("宸插瓨鍦�:" + lansi) } } } @@ -73,9 +73,9 @@ class ResDealPriceCrawlerBatch extends BaseBatch { eq("region", lansi.region), eq("area", lansi.area), eq("totalPrice", lansi.totalPrice)) if(RES_ESFDEALPRICE.countDocuments(query) == 0){ RES_ESFDEALPRICE.insertOne(lansi) - println("保存:" + lansi) + println("淇濆瓨:" + lansi) }else{ - println("已存在:" + lansi) + println("宸插瓨鍦�:" + lansi) } } } @@ -89,8 +89,8 @@ class ResDealPriceCrawlerBatch extends BaseBatch { return null } def dealPrice = new DealPrice() - dealPrice.city = "上海" - dealPrice.region = RegionData.formatRegion("上海", doc.area) + dealPrice.city = "涓婃捣" + dealPrice.region = RegionData.formatRegion("涓婃捣", doc.area) List alias = [] if(doc.newdiskname){ dealPrice.districtName = DealPriceUtils.formatName(doc.newdiskname) @@ -104,7 +104,7 @@ class ResDealPriceCrawlerBatch extends BaseBatch { alias << doc.fullhousingname } alias.remove(dealPrice.districtName) - dealPrice.source = "澜斯" + dealPrice.source = "婢滄柉" dealPrice.tradeDate = DateUtil.parseDate(doc.signingdate, "yyyy-MM-dd HH:mm:ss") dealPrice.submittedDate = DateUtil.parseDate(doc.submitteddate, "yyyy-MM-dd HH:mm:ss") dealPrice.avgPrice = doc.resultprice @@ -125,13 +125,13 @@ class ResDealPriceCrawlerBatch extends BaseBatch { dealPrice.alias = alias dealPrice.creationDate = new Date() dealPrice.creator = "wenyan" - if(doc.address =~ /\d{3,4}室/){ - dealPrice.roomNumber = DataUtil.match(doc.address, Pattern.compile("\\d{3,4}室")).replace("室", "") + if(doc.address =~ /\d{3,4}瀹�/){ + dealPrice.roomNumber = DataUtil.match(doc.address, Pattern.compile("\\d{3,4}瀹�")).replace("瀹�", "") } return dealPrice } /** - * 澜思成交库 + * 婢滄�濇垚浜ゅ簱 * @param doc * @return */ @@ -140,7 +140,7 @@ class ResDealPriceCrawlerBatch extends BaseBatch { return null } def dealPrice = new Document() - dealPrice.city = "上海" + dealPrice.city = "涓婃捣" dealPrice.region = doc.area dealPrice.block = doc.plate dealPrice.loopPosition = doc.module @@ -165,7 +165,7 @@ class ResDealPriceCrawlerBatch extends BaseBatch { dealPrice.c_date = new Date() JSONObject json = OpenApiClient.addressMatch(dealPrice.city,doc.newdiskname, "property") if(json && json.getDouble("credit") > 0){ - dealPrice.fjCity = "上海" + dealPrice.fjCity = "涓婃捣" dealPrice.fjRegion = json.district dealPrice.fjName = json.name if(json.lat){ @@ -178,7 +178,7 @@ class ResDealPriceCrawlerBatch extends BaseBatch { } /** - * 澜思成交库 + * 婢滄�濇垚浜ゅ簱 * @param doc * @return */ @@ -187,7 +187,7 @@ class ResDealPriceCrawlerBatch extends BaseBatch { return null } def dealPrice = new Document() - dealPrice.city = "上海" + dealPrice.city = "涓婃捣" dealPrice.region = doc.area dealPrice.block = doc.plate dealPrice.loopPosition = doc.module @@ -218,8 +218,8 @@ class ResDealPriceCrawlerBatch extends BaseBatch { return null } def dealPrice = new DealPrice() - dealPrice.city = "上海" - dealPrice.region = RegionData.formatRegion("上海", doc.area) + dealPrice.city = "涓婃捣" + dealPrice.region = RegionData.formatRegion("涓婃捣", doc.area) List alias = [] if(doc.fullhousingname){ dealPrice.districtName = DealPriceUtils.formatName(doc.fullhousingname) @@ -233,7 +233,7 @@ class ResDealPriceCrawlerBatch extends BaseBatch { alias << doc.fullhousingname } alias.remove(dealPrice.districtName) - dealPrice.source = "澜斯" + dealPrice.source = "婢滄柉" dealPrice.tradeDate = DateUtil.parseDate(doc.signingdate, "yyyy-MM-dd HH:mm:ss") dealPrice.submittedDate = DateUtil.parseDate(doc.submitteddate, "yyyy-MM-dd HH:mm:ss") dealPrice.avgPrice = doc.unitprice @@ -252,8 +252,8 @@ class ResDealPriceCrawlerBatch extends BaseBatch { dealPrice.block = doc.plate dealPrice.address = com.fangjia.script.util.DataUtil.formateAddress(dealPrice.city, doc.houseaddress) dealPrice.alias = alias - if(doc.houseaddress =~ /\d{3,4}室/){ - dealPrice.roomNumber = DataUtil.match(doc.houseaddress, Pattern.compile("\\d{3,4}室")).replace("室", "") + if(doc.houseaddress =~ /\d{3,4}瀹�/){ + dealPrice.roomNumber = DataUtil.match(doc.houseaddress, Pattern.compile("\\d{3,4}瀹�")).replace("瀹�", "") } dealPrice.creationDate = new Date() dealPrice.creator = "wenyan" diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/ShKuFangBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/ShKuFangBatch.groovy index 6fc635318..466fe2863 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/ShKuFangBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/ShKuFangBatch.groovy @@ -38,23 +38,23 @@ class ShKuFangBatch extends BaseBatch { String result=SpiderUtil.getResult(url,'UTF-8'); Document document=Jsoup.parse(result); def map=new HashMap() - map.put("宝山","11") - map.put("崇明","17") - map.put("长宁","3") - map.put("奉贤","18") - map.put("虹口","6") - map.put("黄浦","8") - map.put("静安","10") - map.put("嘉定","13") - map.put("金山","14") - map.put("闵行","12") - map.put("南汇","19") - map.put("浦东","1") - map.put("普陀","4") - map.put("青浦","16") - map.put("松江","15") - map.put("徐汇","2") - map.put("杨浦","7") + map.put("瀹濆北","11") + map.put("宕囨槑","17") + map.put("闀垮畞","3") + map.put("濂夎搐","18") + map.put("铏瑰彛","6") + map.put("榛勬郸","8") + map.put("闈欏畨","10") + map.put("鍢夊畾","13") + map.put("閲戝北","14") + map.put("闂佃","12") + map.put("鍗楁眹","19") + map.put("娴︿笢","1") + map.put("鏅檧","4") + map.put("闈掓郸","16") + map.put("鏉炬睙","15") + map.put("寰愭眹","2") + map.put("鏉ㄦ郸","7") for(def o:map.keySet()){ Map headers=new HashMap() JSONObject params=new JSONObject() @@ -92,7 +92,7 @@ class ShKuFangBatch extends BaseBatch { continue; } for(JSONObject obj:jsonObj.PageData.Data){ - String city='上海' + String city='涓婃捣' String region=o String name=StringUtils.substringBefore(obj.CommunityName,'[') String address=obj.CommunityAddress @@ -102,7 +102,7 @@ class ShKuFangBatch extends BaseBatch { page++ } } - sendEmail("fangrui@fangjia.com","上海库房网本月抓取量:",count.toString()) + sendEmail("fangrui@fangjia.com","涓婃捣搴撴埧缃戞湰鏈堟姄鍙栭噺:",count.toString()) } public void doFirst(String city,String region,String name,String address,String id){ @@ -131,7 +131,7 @@ class ShKuFangBatch extends BaseBatch { } for(JSONObject obj:jsonObj.PageData.Data){ try{ - def creator='方锐' + def creator='鏂归攼' DealPrice dealPrice=new DealPrice() dealPrice.city=city dealPrice.region=region @@ -143,7 +143,7 @@ class ShKuFangBatch extends BaseBatch { dealPrice.room=obj.RoomNum dealPrice.hall=obj.LivingRoomNum dealPrice.creationDate=new Date() - dealPrice.source="上海酷房网" + dealPrice.source="涓婃捣閰锋埧缃�" BasicDBObject basicDBObject=new BasicDBObject() basicDBObject.put("creator",dealPrice.creator) basicDBObject.put("city",dealPrice.city) @@ -156,12 +156,12 @@ class ShKuFangBatch extends BaseBatch { basicDBObject.put("hall",dealPrice.hall) basicDBObject.put("creationDate",dealPrice.creationDate) basicDBObject.put("source",dealPrice.source) - basicDBObject.put("webline","上海酷房网") + basicDBObject.put("webline","涓婃捣閰锋埧缃�") basicDBObject.put("diff_id",obj.Id) - BasicDBObject basicDBObject1=COLL.findOne(new BasicDBObject('webline',"上海酷房网").append('diff_id',obj.Id)) + BasicDBObject basicDBObject1=COLL.findOne(new BasicDBObject('webline',"涓婃捣閰锋埧缃�").append('diff_id',obj.Id)) if(basicDBObject1==null){ COLL.save(basicDBObject) - println('已入库'+count+'条!') + println('宸插叆搴�'+count+'鏉★紒') count++ } }catch (Exception e){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/ShaoXinFangBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/ShaoXinFangBatch.groovy index bb7f13757..4aed01621 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/ShaoXinFangBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/ShaoXinFangBatch.groovy @@ -39,12 +39,12 @@ class ShaoXinFangBatch extends BaseBatch { for(int i=1;i= batchSize) { request.setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE); BulkResponse bulkResponse = client.bulk(request, RequestOptions.DEFAULT); if (bulkResponse.hasFailures()) { - // 处理错误 + // 澶勭悊閿欒 print "Bulk request has failures: " + bulkResponse.buildFailureMessage() } else { processedCount += request.numberOfActions(); @@ -127,7 +127,7 @@ class SynchDealPriceToEs extends BaseBatch{ request.setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE); BulkResponse bulkResponse = client.bulk(request, RequestOptions.DEFAULT); if (bulkResponse.hasFailures()) { - // 处理错误 + // 澶勭悊閿欒 println "Bulk request has failures: " + bulkResponse.buildFailureMessage() } else { processedCount += request.numberOfActions(); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/TaiWuWebBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/TaiWuWebBatch.groovy index 89b497144..d1c00bd78 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/TaiWuWebBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/TaiWuWebBatch.groovy @@ -36,7 +36,7 @@ class TaiWuWebBatch extends BaseBatch{ Elements elements1=document.select(".quyun-box-t>dd>a"); for(int i=1;i 时间:" + new Date().format("yyyy年MM月dd日 HH:mm:ss"), true) + log("寮�濮嬪垎鏋愭柊娴箰灞呮暟鎹�-> 鏃堕棿:" + new Date().format("yyyy骞碝M鏈坉d鏃� HH:mm:ss"), true) DBCursor cur = CRAWL_COLL.find(new BasicDBObject('job_id', SINA_JOB_ID)).addOption(Bytes.QUERYOPTION_NOTIMEOUT) int total = 0; int pageTotal = 0; @@ -175,7 +175,7 @@ class TransactionPriceImportBatch extends BaseBatch { if (dealDateStr != null) { tradeDate = Date.parse("yyyy-MM-dd", dealDateStr); } - } else if (txt ==~ /.*\d+元\/平.*/) { + } else if (txt ==~ /.*\d+鍏僜/骞�.*/) { def avgPriceStr = getMatchString(txt, "\\d+") if (avgPriceStr) { avgPrice = avgPriceStr.toDouble() @@ -193,32 +193,32 @@ class TransactionPriceImportBatch extends BaseBatch { String[] segments = desc.split("\\|") for (def s : segments) { s = s.replaceAll("\\s", "") - if (s ==~ /\d+室\d+厅/) { - def roomDesc = getMatchString(s, "(\\d+)室") + if (s ==~ /\d+瀹d+鍘�/) { + def roomDesc = getMatchString(s, "(\\d+)瀹�") if (roomDesc != null) { - recode.put("room", roomDesc.replace("室", "").toInteger()); + recode.put("room", roomDesc.replace("瀹�", "").toInteger()); } - def hallDesc = getMatchString(s, "(\\d+)厅") + def hallDesc = getMatchString(s, "(\\d+)鍘�") if (hallDesc != null) { - recode.put("hall", hallDesc.replace("厅", "").toInteger()); + recode.put("hall", hallDesc.replace("鍘�", "").toInteger()); } - } else if (s ==~ /\d+室/) { - def roomDesc = getMatchString(s, "(\\d+)室") + } else if (s ==~ /\d+瀹�/) { + def roomDesc = getMatchString(s, "(\\d+)瀹�") if (roomDesc != null) { - recode.put("room", roomDesc.replace("室", "").toInteger()); + recode.put("room", roomDesc.replace("瀹�", "").toInteger()); } - } else if (s ==~ /\d+厅/) { - def hallDesc = getMatchString(s, "(\\d+)厅") + } else if (s ==~ /\d+鍘�/) { + def hallDesc = getMatchString(s, "(\\d+)鍘�") if (hallDesc != null) { - recode.put("hall", hallDesc.replace("厅", "").toInteger()); + recode.put("hall", hallDesc.replace("鍘�", "").toInteger()); } - } else if (s ==~ /\d+(\.\d+)?平/) { - def area = s.replaceAll("平", "").toDouble() + } else if (s ==~ /\d+(\.\d+)?骞�/) { + def area = s.replaceAll("骞�", "").toDouble() recode.put("area", area) - } else if (s ==~ /.*(东|南|西|北)+.*/) { + } else if (s ==~ /.*(涓渱鍗梶瑗縷鍖�)+.*/) { recode.put("direction", HouseValidator.fetchDirectionInfo(s)); - } else if (s ==~ /\d+\/\d+层/) { - String[] louCengInfo = s.replace("层", "").trim().split("/"); + } else if (s ==~ /\d+\/\d+灞�/) { + String[] louCengInfo = s.replace("灞�", "").trim().split("/"); if (louCengInfo.length > 1) { def floor = louCengInfo[0].toInteger() def height = louCengInfo[1].toInteger() @@ -237,7 +237,7 @@ class TransactionPriceImportBatch extends BaseBatch { recode.put("city", city) recode.put("region", region) recode.put("district_name", name) - recode.put("source", "新浪") + recode.put("source", "鏂版氮") if (totalPrice == null || totalPrice < 10000) { continue } else { @@ -247,7 +247,7 @@ class TransactionPriceImportBatch extends BaseBatch { recode.put("avg_price", avgPrice) } - if (isAvailableTradeRecorde(city, region, name, tradeDate, "新浪", recode.get("area"))) { + if (isAvailableTradeRecorde(city, region, name, tradeDate, "鏂版氮", recode.get("area"))) { recode.put("trade_date", tradeDate); } else { continue @@ -264,11 +264,11 @@ class TransactionPriceImportBatch extends BaseBatch { } } DEAL_PRICE_COLL.insert(list); - log("新浪乐居成交数据分析结束(抓取网页数 $pageTotal 有效数据 $total )-> 时间:" + new Date().format("yyyy年MM月dd日 HH:mm:ss"), true) + log("鏂版氮涔愬眳鎴愪氦鏁版嵁鍒嗘瀽缁撴潫(鎶撳彇缃戦〉鏁� $pageTotal 鏈夋晥鏁版嵁 $total )-> 鏃堕棿:" + new Date().format("yyyy骞碝M鏈坉d鏃� HH:mm:ss"), true) } public def mytophome() { - log("开始分析满堂红成交数据-> 时间:" + new Date().format("yyyy年MM月dd日 HH:mm:ss"), true) + log("寮�濮嬪垎鏋愭弧鍫傜孩鎴愪氦鏁版嵁-> 鏃堕棿:" + new Date().format("yyyy骞碝M鏈坉d鏃� HH:mm:ss"), true) DBCursor cur = CRAWL_COLL.find(new BasicDBObject('job_id', MYTOPHOME_JOB_ID)).addOption(Bytes.QUERYOPTION_NOTIMEOUT) int total = 0; int pageTotal = 0; @@ -309,12 +309,12 @@ class TransactionPriceImportBatch extends BaseBatch { recode.put("city", city) recode.put("region", region) recode.put("district_name", name) - recode.put("source", "满堂红") + recode.put("source", "婊″爞绾�") recode.put("c_date", new Date()) recode.put("total_price", totalPrice) recode.put("area", area) recode.put("avg_price", avgPrice) - if (isAvailableTradeRecorde(city, region, name, trendDate, "满堂红", area)) { + if (isAvailableTradeRecorde(city, region, name, trendDate, "婊″爞绾�", area)) { total++ list.add(recode) println(recode) @@ -328,11 +328,11 @@ class TransactionPriceImportBatch extends BaseBatch { } } DEAL_PRICE_COLL.insert(list); - log("满堂红成交数据分析完成(抓取网页数 $pageTotal 有效数据 $total )-> 时间:" + new Date().format("yyyy年MM月dd日 HH:mm:ss"), true) + log("婊″爞绾㈡垚浜ゆ暟鎹垎鏋愬畬鎴�(鎶撳彇缃戦〉鏁� $pageTotal 鏈夋晥鏁版嵁 $total )-> 鏃堕棿:" + new Date().format("yyyy骞碝M鏈坉d鏃� HH:mm:ss"), true) } public def homelink() { - log("开始分析链家在线成交数据-> 时间:" + new Date().format("yyyy年MM月dd日 HH:mm:ss")) + log("寮�濮嬪垎鏋愰摼瀹跺湪绾挎垚浜ゆ暟鎹�-> 鏃堕棿:" + new Date().format("yyyy骞碝M鏈坉d鏃� HH:mm:ss")) DBCursor cur = CRAWL_COLL.find(new BasicDBObject('job_id', HOMELINK_JOB_ID)).addOption(Bytes.QUERYOPTION_NOTIMEOUT) int total = 0; int pageTotal = 0; @@ -361,7 +361,7 @@ class TransactionPriceImportBatch extends BaseBatch { item = e.toString(); recode.put("city", city) recode.put("region", region) - recode.put("source", "链家在线") + recode.put("source", "閾惧鍦ㄧ嚎") recode.put("c_date", new Date()); String title = selectText(".title>a", item).trim() if(StringUtils.isBlank(title)){ @@ -381,20 +381,20 @@ class TransactionPriceImportBatch extends BaseBatch { String name = title.substring(0, nameSpiltIndex) recode.put("district_name", name) - def roomText = getMatchString(title, "\\d+室") + def roomText = getMatchString(title, "\\d+瀹�") if(roomText != null){ - def room = roomText.replaceAll("室", "").toInteger() + def room = roomText.replaceAll("瀹�", "").toInteger() recode.put("room", room) } - def hallText = getMatchString(title, "\\d+厅") + def hallText = getMatchString(title, "\\d+鍘�") if(hallText != null){ - def hall = hallText.replaceAll("厅", "").toInteger() + def hall = hallText.replaceAll("鍘�", "").toInteger() recode.put("hall", hall) } - def areaText = getMatchString(title, "\\d+(\\.\\d+)?平米") + def areaText = getMatchString(title, "\\d+(\\.\\d+)?骞崇背") if(areaText != null){ - def area = areaText.replace("平米", "").replaceAll(",", "").toDouble(); + def area = areaText.replace("骞崇背", "").replaceAll(",", "").toDouble(); recode.put("area", area); } def tradeInfo = e.select(".totalPrice span").text() @@ -430,7 +430,7 @@ class TransactionPriceImportBatch extends BaseBatch { if(fitment){ recode.put("fitment", fitment) } - if(recode.get("avg_price") != null && isAvailableTradeRecorde(city, region, name, recode.trade_date, "链家在线", recode.area)){ + if(recode.get("avg_price") != null && isAvailableTradeRecorde(city, region, name, recode.trade_date, "閾惧鍦ㄧ嚎", recode.area)){ println(recode) total++ list.add(recode); @@ -447,11 +447,11 @@ class TransactionPriceImportBatch extends BaseBatch { } } DEAL_PRICE_COLL.insert(list); - log("链家在线成交数据分析完成(抓取网页数 $pageTotal 有效数据 $total )-> 时间:" + new Date().format("yyyy年MM月dd日 HH:mm:ss"), true) + log("閾惧鍦ㄧ嚎鎴愪氦鏁版嵁鍒嗘瀽瀹屾垚(鎶撳彇缃戦〉鏁� $pageTotal 鏈夋晥鏁版嵁 $total )-> 鏃堕棿:" + new Date().format("yyyy骞碝M鏈坉d鏃� HH:mm:ss"), true) } public def centanet() { - log("开始分析中原地产成交数据-> 时间:" + new Date().format("yyyy年MM月dd日 HH:mm:ss"), true) + log("寮�濮嬪垎鏋愪腑鍘熷湴浜ф垚浜ゆ暟鎹�-> 鏃堕棿:" + new Date().format("yyyy骞碝M鏈坉d鏃� HH:mm:ss"), true) DBCursor cur = CRAWL_COLL.find(new BasicDBObject('job_id', CENTANET_JOB_ID)).addOption(Bytes.QUERYOPTION_NOTIMEOUT) int total = 0; int pageTotal = 0; @@ -497,20 +497,20 @@ class TransactionPriceImportBatch extends BaseBatch { name = eles.get(0).text().trim() recode.put("district_name", name) String houseDesc = tds.get(1).text() - if (houseDesc.indexOf("室") > 0) { - recode.put("room", houseDesc.replace("室", "").toInteger()) + if (houseDesc.indexOf("瀹�") > 0) { + recode.put("room", houseDesc.replace("瀹�", "").toInteger()) } }else{ name = tds.get(1).text().replace("A ", ""); String houseDesc = tds.get(2).text() - if (houseDesc.indexOf("室") > 0) { - recode.put("room", houseDesc.replace("室", "").toInteger()) + if (houseDesc.indexOf("瀹�") > 0) { + recode.put("room", houseDesc.replace("瀹�", "").toInteger()) } } String areaDesc = tds.get(3).text().trim() def area = null - if (areaDesc ==~ /.*(平|平米)/) { - area = areaDesc.replaceAll("(平米)|(平)", "").toDouble(); + if (areaDesc ==~ /.*(骞硘骞崇背)/) { + area = areaDesc.replaceAll("(骞崇背)|(骞�)", "").toDouble(); } String trendDateTxt = tds.get(4).text(); Date tradeDate @@ -523,20 +523,20 @@ class TransactionPriceImportBatch extends BaseBatch { tradeDate = Date.parse("yyyy/MM/dd", trendDateTxt) } String dealPriceDesc = tds.get(5).text().trim() - if (dealPriceDesc.endsWith("万")) { - def price = dealPriceDesc.replace("万", "").toDouble() * 10000 + if (dealPriceDesc.endsWith("涓�")) { + def price = dealPriceDesc.replace("涓�", "").toDouble() * 10000 if (price != 0) { recode.put("total_price", price.toInteger()); } } String avgPriceDesc = tds.get(6).text().trim() - if (avgPriceDesc.endsWith("元/平")) { - if (avgPriceDesc.replace("元/平", "").toDouble() != 0) { - recode.put("avg_price", avgPriceDesc.replace("元/平", "").toDouble().toInteger()) + if (avgPriceDesc.endsWith("鍏�/骞�")) { + if (avgPriceDesc.replace("鍏�/骞�", "").toDouble() != 0) { + recode.put("avg_price", avgPriceDesc.replace("鍏�/骞�", "").toDouble().toInteger()) } } recode.put("district_name", name) - recode.put("source", "中原地产") + recode.put("source", "涓師鍦颁骇") recode.put("area", area) recode.put("trade_date", tradeDate) }else if(parseModel == 2){ @@ -546,13 +546,13 @@ class TransactionPriceImportBatch extends BaseBatch { } def name = spans.get(0).text().replaceAll("\\s", "") recode.put("district_name", name) - def roomInfo = getMatchString(spans.get(1).text(), "\\d室") + def roomInfo = getMatchString(spans.get(1).text(), "\\d瀹�") if(roomInfo){ - recode.append("room", roomInfo.replace("室", "").toInteger()) + recode.append("room", roomInfo.replace("瀹�", "").toInteger()) } - def areaInfo = getMatchString(spans.get(4).text(), "\\d+(\\.\\d+)?平") + def areaInfo = getMatchString(spans.get(4).text(), "\\d+(\\.\\d+)?骞�") if(areaInfo){ - areaInfo = areaInfo.replace("平", "") + areaInfo = areaInfo.replace("骞�", "") recode.put("area", areaInfo.toDouble()) } def dealDate = getMatchString(spans.get(5).text(), "\\d\\d/\\d\\d/\\d\\d") @@ -560,21 +560,21 @@ class TransactionPriceImportBatch extends BaseBatch { dealDate = "20" + dealDate recode.put("trade_date", DateUtil.parseDate(dealDate, "yyyy/MM/dd")) } - def totalPriceInfo = getMatchString(spans.get(6).text(), "\\d+万") + def totalPriceInfo = getMatchString(spans.get(6).text(), "\\d+涓�") if(totalPriceInfo){ - totalPriceInfo = totalPriceInfo.replace("万", "") + totalPriceInfo = totalPriceInfo.replace("涓�", "") recode.put("total_price", totalPriceInfo.toInteger() * 10000) } - def avgPriceInfo = getMatchString(spans.get(7).text(), "\\d+元/平") + def avgPriceInfo = getMatchString(spans.get(7).text(), "\\d+鍏�/骞�") if(avgPriceInfo){ - avgPriceInfo = avgPriceInfo.replace("元/平", "") + avgPriceInfo = avgPriceInfo.replace("鍏�/骞�", "") recode.put("avg_price", avgPriceInfo.toInteger() ) } } if(recode.district_name){ - recode.district_name = recode.getString("district_name").replaceAll("(\\(|().*(\\)|))?", '') + recode.district_name = recode.getString("district_name").replaceAll("(\\(|锛�).*(\\)|锛�)?", '') } - if (isAvailableTradeRecorde(city, region, recode.district_name, recode.trade_date, "中原地产", recode.area)) { + if (isAvailableTradeRecorde(city, region, recode.district_name, recode.trade_date, "涓師鍦颁骇", recode.area)) { total++ list.add(recode); println(recode) @@ -586,12 +586,12 @@ class TransactionPriceImportBatch extends BaseBatch { } } DEAL_PRICE_COLL.insert(list); - log("中原地产成交数据分析结束(抓取网页数 $pageTotal 有效数据 $total )-> 时间:" + new Date().format("yyyy年MM月dd日 HH:mm:ss"), true) + log("涓師鍦颁骇鎴愪氦鏁版嵁鍒嗘瀽缁撴潫(鎶撳彇缃戦〉鏁� $pageTotal 鏈夋晥鏁版嵁 $total )-> 鏃堕棿:" + new Date().format("yyyy骞碝M鏈坉d鏃� HH:mm:ss"), true) } public def soufang() { - log("开始分析搜房成交数据-> 时间:" + new Date().format("yyyy年MM月dd日 HH:mm:ss"), true) + log("寮�濮嬪垎鏋愭悳鎴挎垚浜ゆ暟鎹�-> 鏃堕棿:" + new Date().format("yyyy骞碝M鏈坉d鏃� HH:mm:ss"), true) DBCursor cur = CRAWL_COLL.find(new BasicDBObject('job_id', FANG_JOB_ID)).batchSize(2000).addOption(Bytes.QUERYOPTION_NOTIMEOUT) int total = 0; int pageTotal = 0; @@ -606,17 +606,17 @@ class TransactionPriceImportBatch extends BaseBatch { Elements elements = JQueryUtils.select(".dealSent tr", content) if (elements.size() > 1 ) { String name = selectText("#xqw_B01_12", content); - if (name.contains("弄小区网")) { - name = name.substring(0, name.indexOf("弄小区网") + 3); - } else if (name.contains("小区网")) { - name = name.substring(0, name.indexOf("小区网")); + if (name.contains("寮勫皬鍖虹綉")) { + name = name.substring(0, name.indexOf("寮勫皬鍖虹綉") + 3); + } else if (name.contains("灏忓尯缃�")) { + name = name.substring(0, name.indexOf("灏忓尯缃�")); } if (name == "") { Elements titles = Jsoup.parse(content).head().select("head>title") if (titles.size() > 0) { String title = titles.get(0).text() - if (title.indexOf("成交记录") > 0) { - name = title.substring(0, title.indexOf("成交记录")) + if (title.indexOf("鎴愪氦璁板綍") > 0) { + name = title.substring(0, title.indexOf("鎴愪氦璁板綍")) } } @@ -625,10 +625,10 @@ class TransactionPriceImportBatch extends BaseBatch { Elements titles = JQueryUtils.select("#xqw_B01_11", content) if (titles.size() > 0) { String title = titles.get(0).attr("title") - if (title.contains("弄小区网")) { - name = title.substring(0, title.indexOf("弄小区网") + 3); - } else if (title.contains("小区网")) { - name = title.substring(0, title.indexOf("小区网") + 3); + if (title.contains("寮勫皬鍖虹綉")) { + name = title.substring(0, title.indexOf("寮勫皬鍖虹綉") + 3); + } else if (title.contains("灏忓尯缃�")) { + name = title.substring(0, title.indexOf("灏忓尯缃�") + 3); } } } @@ -640,7 +640,7 @@ class TransactionPriceImportBatch extends BaseBatch { e = elements.get(i); recode.put("city", city) recode.put("region", region) - recode.put("source", "搜房") + recode.put("source", "鎼滄埧") recode.put("district_name", name) recode.put("c_date", new Date()); Elements spans = e.select("td") @@ -652,28 +652,28 @@ class TransactionPriceImportBatch extends BaseBatch { def text = span.text().trim() if (text ==~ /.*\d{4}-\d\d-\d\d.*/) { tradeDate = Date.parse("yyyy-MM-dd", text); - } else if (text ==~ /.*万.*套.*/) { - totalPrice = (text.replace("万/套", "").trim().toDouble() * 10000).toInteger() + } else if (text ==~ /.*涓�.*濂�.*/) { + totalPrice = (text.replace("涓�/濂�", "").trim().toDouble() * 10000).toInteger() recode.put("total_price", totalPrice) - } else if (text ==~ /\d+(.\d+)?万$/) { - totalPrice = (text.replace("万", "").trim().toDouble() * 10000).toInteger() + } else if (text ==~ /\d+(.\d+)?涓�$/) { + totalPrice = (text.replace("涓�", "").trim().toDouble() * 10000).toInteger() recode.put("total_price", totalPrice) - } else if (text ==~ /.*元.*平米.*/ || text ==~ /.*\d+元\/㎡$/) { - avgPrice = text.replaceAll("(元/平米)|(元/㎡)", "").trim().toDouble() + } else if (text ==~ /.*鍏�.*骞崇背.*/ || text ==~ /.*\d+鍏僜/銕�$/) { + avgPrice = text.replaceAll("(鍏�/骞崇背)|(鍏�/銕�)", "").trim().toDouble() recode.put("avg_price", avgPrice) - } else if (text ==~ /.*\d+室\d+厅.*/) { - def room = DataUtil.match(text, Pattern.compile("\\d+室")) - def hall = DataUtil.match(text, Pattern.compile("\\d+厅")) - recode.put("room", room.replace("室", "").toInteger()) - recode.put("hall", hall.replace("厅", "").toInteger()) - } else if (text ==~ /.*\d+(.\d+)?㎡/) { + } else if (text ==~ /.*\d+瀹d+鍘�.*/) { + def room = DataUtil.match(text, Pattern.compile("\\d+瀹�")) + def hall = DataUtil.match(text, Pattern.compile("\\d+鍘�")) + recode.put("room", room.replace("瀹�", "").toInteger()) + recode.put("hall", hall.replace("鍘�", "").toInteger()) + } else if (text ==~ /.*\d+(.\d+)?銕�/) { def areaText = getMatchString(text, "\\d+(.\\d+)?") if (StringUtils.isNotBlank(areaText)) { recode.put("area", areaText.toDouble()) } } } - if (isAvailableTradeRecorde(city, region, name, tradeDate, "搜房", recode.get("area"))) { + if (isAvailableTradeRecorde(city, region, name, tradeDate, "鎼滄埧", recode.get("area"))) { recode.put("trade_date", tradeDate) } if (StringUtils.isNotBlank(recode.getString("district_name")) && recode.get("avg_price") != null && recode.get("trade_date") != null) { @@ -696,11 +696,11 @@ class TransactionPriceImportBatch extends BaseBatch { } } DEAL_PRICE_COLL.insert(list); - log("搜房成交数据分析结束(抓取网页数 $pageTotal 有效数据 $total )-> 时间:" + new Date().format("yyyy年MM月dd日 HH:mm:ss"), true) + log("鎼滄埧鎴愪氦鏁版嵁鍒嗘瀽缁撴潫(鎶撳彇缃戦〉鏁� $pageTotal 鏈夋晥鏁版嵁 $total )-> 鏃堕棿:" + new Date().format("yyyy骞碝M鏈坉d鏃� HH:mm:ss"), true) } public def soufangHaiKou() { - log("开始分析搜房(海口)成交数据-> 时间:" + new Date().format("yyyy年MM月dd日 HH:mm:ss"), true) + log("寮�濮嬪垎鏋愭悳鎴�(娴峰彛)鎴愪氦鏁版嵁-> 鏃堕棿:" + new Date().format("yyyy骞碝M鏈坉d鏃� HH:mm:ss"), true) DBCursor cur = CRAWL_COLL.find(new BasicDBObject('job_id', FANG_HAIKOU_JOB_ID)).addOption(Bytes.QUERYOPTION_NOTIMEOUT) int total = 0; int pageTotal = 0; @@ -717,17 +717,17 @@ class TransactionPriceImportBatch extends BaseBatch { println(url) if (elements.size() > 1 ) { String name = selectText("#xqw_B01_12", content); - if (name.contains("弄小区网")) { - name = name.substring(0, name.indexOf("弄小区网") + 3); - } else if (name.contains("小区网")) { - name = name.substring(0, name.indexOf("小区网")); + if (name.contains("寮勫皬鍖虹綉")) { + name = name.substring(0, name.indexOf("寮勫皬鍖虹綉") + 3); + } else if (name.contains("灏忓尯缃�")) { + name = name.substring(0, name.indexOf("灏忓尯缃�")); } if (name == "") { Elements titles = Jsoup.parse(content).head().select("head>title") if (titles.size() > 0) { String title = titles.get(0).text() - if (title.indexOf("成交记录") > 0) { - name = title.substring(0, title.indexOf("成交记录")) + if (title.indexOf("鎴愪氦璁板綍") > 0) { + name = title.substring(0, title.indexOf("鎴愪氦璁板綍")) } } @@ -736,10 +736,10 @@ class TransactionPriceImportBatch extends BaseBatch { Elements titles = JQueryUtils.select("#xqw_B01_11", content) if (titles.size() > 0) { String title = titles.get(0).attr("title") - if (title.contains("弄小区网")) { - name = title.substring(0, title.indexOf("弄小区网") + 3); - } else if (title.contains("小区网")) { - name = title.substring(0, title.indexOf("小区网") + 3); + if (title.contains("寮勫皬鍖虹綉")) { + name = title.substring(0, title.indexOf("寮勫皬鍖虹綉") + 3); + } else if (title.contains("灏忓尯缃�")) { + name = title.substring(0, title.indexOf("灏忓尯缃�") + 3); } } } @@ -751,7 +751,7 @@ class TransactionPriceImportBatch extends BaseBatch { e = elements.get(i); recode.put("city", city) recode.put("region", region) - recode.put("source", "搜房") + recode.put("source", "鎼滄埧") recode.put("district_name", name) recode.put("c_date", new Date()); Elements spans = e.select("td") @@ -763,28 +763,28 @@ class TransactionPriceImportBatch extends BaseBatch { def text = span.text().trim() if (text ==~ /.*\d{4}-\d\d-\d\d.*/) { tradeDate = Date.parse("yyyy-MM-dd", text); - } else if (text ==~ /.*万.*套.*/) { - totalPrice = (text.replace("万/套", "").trim().toDouble() * 10000).toInteger() + } else if (text ==~ /.*涓�.*濂�.*/) { + totalPrice = (text.replace("涓�/濂�", "").trim().toDouble() * 10000).toInteger() recode.put("total_price", totalPrice) - } else if (text ==~ /\d+(.\d+)?万$/) { - totalPrice = (text.replace("万", "").trim().toDouble() * 10000).toInteger() + } else if (text ==~ /\d+(.\d+)?涓�$/) { + totalPrice = (text.replace("涓�", "").trim().toDouble() * 10000).toInteger() recode.put("total_price", totalPrice) - } else if (text ==~ /.*元.*平米.*/ || text ==~ /.*\d+元\/㎡$/) { - avgPrice = text.replaceAll("(元/平米)|(元/㎡)", "").trim().toDouble() + } else if (text ==~ /.*鍏�.*骞崇背.*/ || text ==~ /.*\d+鍏僜/銕�$/) { + avgPrice = text.replaceAll("(鍏�/骞崇背)|(鍏�/銕�)", "").trim().toDouble() recode.put("avg_price", avgPrice) - } else if (text ==~ /.*\d+室\d+厅.*/) { - def room = DataUtil.match(text, Pattern.compile("\\d+室")) - def hall = DataUtil.match(text, Pattern.compile("\\d+厅")) - recode.put("room", room.replace("室", "").toInteger()) - recode.put("hall", hall.replace("厅", "").toInteger()) - } else if (text ==~ /.*\d+(.\d+)?㎡/) { + } else if (text ==~ /.*\d+瀹d+鍘�.*/) { + def room = DataUtil.match(text, Pattern.compile("\\d+瀹�")) + def hall = DataUtil.match(text, Pattern.compile("\\d+鍘�")) + recode.put("room", room.replace("瀹�", "").toInteger()) + recode.put("hall", hall.replace("鍘�", "").toInteger()) + } else if (text ==~ /.*\d+(.\d+)?銕�/) { def areaText = getMatchString(text, "\\d+(.\\d+)?") if (StringUtils.isNotBlank(areaText)) { recode.put("area", areaText.toDouble()) } } } - if (isAvailableTradeRecorde(city, region, name, tradeDate, "搜房", recode.get("area"))) { + if (isAvailableTradeRecorde(city, region, name, tradeDate, "鎼滄埧", recode.get("area"))) { recode.put("trade_date", tradeDate) } if (StringUtils.isNotBlank(recode.getString("district_name")) && recode.get("avg_price") != null && recode.get("trade_date") != null) { @@ -807,7 +807,7 @@ class TransactionPriceImportBatch extends BaseBatch { } } DEAL_PRICE_COLL.insert(list); - log("搜房(海口)成交数据分析结束(抓取网页数 $pageTotal 有效数据 $total )-> 时间:" + new Date().format("yyyy年MM月dd日 HH:mm:ss"), true) + log("鎼滄埧(娴峰彛)鎴愪氦鏁版嵁鍒嗘瀽缁撴潫(鎶撳彇缃戦〉鏁� $pageTotal 鏈夋晥鏁版嵁 $total )-> 鏃堕棿:" + new Date().format("yyyy骞碝M鏈坉d鏃� HH:mm:ss"), true) } public Integer extractPrice(String priceDesc) { @@ -843,10 +843,10 @@ class TransactionPriceImportBatch extends BaseBatch { } /** - * 验证板块并返回该板块所在的区域 + * 楠岃瘉鏉垮潡骞惰繑鍥炶鏉垮潡鎵�鍦ㄧ殑鍖哄煙 * @param city * @param block - * @return 板块非法返回NULL,否则返回格式化有的数据 + * @return 鏉垮潡闈炴硶杩斿洖NULL锛屽惁鍒欒繑鍥炴牸寮忓寲鏈夌殑鏁版嵁 */ private String validateAndFormatBlock(String city, String block) { DBObject keys = new BasicDBObject(); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/TuboshiDealPriceCrawlerBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/TuboshiDealPriceCrawlerBatch.groovy index 1894e7951..f7a6efc68 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/TuboshiDealPriceCrawlerBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/TuboshiDealPriceCrawlerBatch.groovy @@ -14,7 +14,7 @@ import net.sf.json.JSONObject import org.jsoup.Jsoup /** - * 功能说明:兔博士成交数据抓取 + * 鍔熻兘璇存槑:鍏斿崥澹垚浜ゆ暟鎹姄鍙� */ @BatchOwner(Watcher.LiXue) class TuboshiDealPriceCrawlerBatch extends BaseBatch { @@ -25,23 +25,23 @@ class TuboshiDealPriceCrawlerBatch extends BaseBatch { static int saveCount = 24482 static Jms jms = Jms.create('tcp://jms.db.fangjia.com:61616'); static cityMap = new HashMap() {{ - put( "北京" , "604" ); - put( "上海" , "605" ); - put( "广州" , "606" ); - put( "深圳" , "607" ); - put( "成都" , "612" ); - put( "济南" , "618" ); - put( "武汉" , "621" ); - put( "长沙" , "622" ); - put( "南京" , "623" ); - put( "杭州" , "626" ); - put( "昆山" , "627" ); - put( "福州" , "628" ); - put( "天津" , "633" ); - put( "重庆" , "634" ); -// put( "苏州" , "604" ); - put( "东莞" , "638" ); - put( "厦门" , "640" ); + put( "鍖椾含" , "604" ); + put( "涓婃捣" , "605" ); + put( "骞垮窞" , "606" ); + put( "娣卞湷" , "607" ); + put( "鎴愰兘" , "612" ); + put( "娴庡崡" , "618" ); + put( "姝︽眽" , "621" ); + put( "闀挎矙" , "622" ); + put( "鍗椾含" , "623" ); + put( "鏉窞" , "626" ); + put( "鏄嗗北" , "627" ); + put( "绂忓窞" , "628" ); + put( "澶╂触" , "633" ); + put( "閲嶅簡" , "634" ); +// put( "鑻忓窞" , "604" ); + put( "涓滆帪" , "638" ); + put( "鍘﹂棬" , "640" ); }}; static void main(String[] args) { @@ -54,7 +54,7 @@ class TuboshiDealPriceCrawlerBatch extends BaseBatch { crawlerListData() } static void crawlerListData(){ - DEAL_PRICE_SEED.find(new BasicDBObject("flag",false).append("source","兔博士")).addOption(Bytes.QUERYOPTION_NOTIMEOUT).batchSize(100).each { dbObj-> + DEAL_PRICE_SEED.find(new BasicDBObject("flag",false).append("source","鍏斿崥澹�")).addOption(Bytes.QUERYOPTION_NOTIMEOUT).batchSize(100).each { dbObj-> def city = dbObj.city def region = dbObj.region def name = dbObj.name @@ -62,9 +62,9 @@ class TuboshiDealPriceCrawlerBatch extends BaseBatch { parsegetList(city.toString(),region.toString(),name.toString(),url.toString()) DEAL_PRICE_SEED.update(new BasicDBObject("_id",dbObj._id),new BasicDBObject('$set',new BasicDBObject("flag",true))) } - def content = "本次入库量为"+saveCount+"条" - jms.sendMail(Watcher.LiXue.email, "兔博士成交数据抓取解析报告", content) - jms.sendMail("wangchencen@fangjia.com", "兔博士成交数据抓取解析报告", content) + def content = "鏈鍏ュ簱閲忎负"+saveCount+"鏉�" + jms.sendMail(Watcher.LiXue.email, "鍏斿崥澹垚浜ゆ暟鎹姄鍙栬В鏋愭姤鍛�", content) + jms.sendMail("wangchencen@fangjia.com", "鍏斿崥澹垚浜ゆ暟鎹姄鍙栬В鏋愭姤鍛�", content) } static void crawlerSeed(){ def url = "https://gz.2boss.cn/estate/search" @@ -75,13 +75,13 @@ class TuboshiDealPriceCrawlerBatch extends BaseBatch { for(def cityUrl : cityUrls){ def city = cityUrl.text() if(cityMap.get(city)) { - println("----开始获取" + city + "种子----") + println("----寮�濮嬭幏鍙�" + city + "绉嶅瓙----") def dislist = getDisUrl(cityMap.get(city)) j = 0 for (def dis : dislist.keySet()) { try { def disUrl = cityUrl.attr("href") + dis - def source = "兔博士" + def source = "鍏斿崥澹�" def name = dislist.get(dis) if (city && name && disUrl) { j++ @@ -94,7 +94,7 @@ class TuboshiDealPriceCrawlerBatch extends BaseBatch { } } } - println("解析了"+j+"个小区种子") + println("瑙f瀽浜�"+j+"涓皬鍖虹瀛�") } } static Map getDisUrl(def cityId){ @@ -144,7 +144,7 @@ class TuboshiDealPriceCrawlerBatch extends BaseBatch { disList.put(estateId, houseName) } }catch (UnknownHostException e){ - println("尝试第二次请求") + println("灏濊瘯绗簩娆¤姹�") page-- } page++ @@ -153,7 +153,7 @@ class TuboshiDealPriceCrawlerBatch extends BaseBatch { break } } - println("page共:"+page) + println("page鍏�:"+page) return disList } static def parsegetList(def city, def region,def name,def url) { @@ -186,13 +186,13 @@ class TuboshiDealPriceCrawlerBatch extends BaseBatch { dealPrice.tradeDate = DealPriceUtils.parseDealDate(itemContent) def tds = table.select("td") for (def td : tds) { - if (td.text().contains("签约价格")) { + if (td.text().contains("绛剧害浠锋牸")) { dealPrice.totalPrice = DealPriceUtils.parseTotalPrice(td.text()) dealPrice.avgPrice = DealPriceUtils.parseUnitPrice(td.text()) } } dealPrice.height = DealPriceUtils.parseHeight(itemContent) - dealPrice.source = "兔博士" + dealPrice.source = "鍏斿崥澹�" dealPrice.creator = "lixue" if (DealPriceUtils.isAvailableDealPrice(dealPrice)) { @@ -206,7 +206,7 @@ class TuboshiDealPriceCrawlerBatch extends BaseBatch { times++ } }catch (Exception e){ - println("无法抓取链接:"+url) + println("鏃犳硶鎶撳彇閾炬帴:"+url) } } } \ No newline at end of file diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/WoIwJDealPriceCrawlerBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/WoIwJDealPriceCrawlerBatch.groovy index 097475ee5..af5a8a0de 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/WoIwJDealPriceCrawlerBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/WoIwJDealPriceCrawlerBatch.groovy @@ -18,7 +18,7 @@ import org.jsoup.nodes.Element import org.jsoup.select.Elements /** - * 功能说明:我爱我家成交数据抓取 + * 鍔熻兘璇存槑:鎴戠埍鎴戝鎴愪氦鏁版嵁鎶撳彇 */ @BatchOwner(Watcher.LiXue) class WoIwJDealPriceCrawlerBatch extends BaseBatch { @@ -49,11 +49,11 @@ class WoIwJDealPriceCrawlerBatch extends BaseBatch { def avgPrice = -1 for(def price:totalPrices){ try { - if (price.text().contains("万元") && !price.text().contains("平米")) { - totalPrice = (int)price.text().replaceAll("万元", "").toDouble()*10000 + if (price.text().contains("涓囧厓") && !price.text().contains("骞崇背")) { + totalPrice = (int)price.text().replaceAll("涓囧厓", "").toDouble()*10000 } - if (price.text().contains("万元/平米")) { - avgPrice = (int)(price.text().replaceAll("万元/平米", "").toDouble()*10000) + if (price.text().contains("涓囧厓/骞崇背")) { + avgPrice = (int)(price.text().replaceAll("涓囧厓/骞崇背", "").toDouble()*10000) } }catch (Exception e){ e.printStackTrace() @@ -72,7 +72,7 @@ class WoIwJDealPriceCrawlerBatch extends BaseBatch { dealPrice.totalPrice = totalPrice dealPrice.avgPrice = avgPrice dealPrice.height = DealPriceUtils.parseHeight(itemContent) - dealPrice.source = "我爱我家" + dealPrice.source = "鎴戠埍鎴戝" dealPrice.creator = "lixue" if(totalPrice!=-1&&avgPrice!=-1) { println(dealPrice) @@ -89,10 +89,10 @@ class WoIwJDealPriceCrawlerBatch extends BaseBatch { } DEAL_PRICE_SEED.update(new BasicDBObject("_id",dbObj._id),new BasicDBObject('$set',new BasicDBObject("flag",true))) } - def content = "本次入库量为"+saveCount+"条" - jms.sendMail(Watcher.LiXue.email, "我爱我家成交数据抓取解析报告", content) - jms.sendMail("wangchencen@fangjia.com", "我爱我家成交数据抓取解析报告", content) - DEAL_PRICE_SEED.update(new BasicDBObject("flag",false).append("source","链家在线"),new BasicDBObject('$set',new BasicDBObject("flag",false))) + def content = "鏈鍏ュ簱閲忎负"+saveCount+"鏉�" + jms.sendMail(Watcher.LiXue.email, "鎴戠埍鎴戝鎴愪氦鏁版嵁鎶撳彇瑙f瀽鎶ュ憡", content) + jms.sendMail("wangchencen@fangjia.com", "鎴戠埍鎴戝鎴愪氦鏁版嵁鎶撳彇瑙f瀽鎶ュ憡", content) + DEAL_PRICE_SEED.update(new BasicDBObject("flag",false).append("source","閾惧鍦ㄧ嚎"),new BasicDBObject('$set',new BasicDBObject("flag",false))) } private static void getEsfUrlList(){ @@ -103,8 +103,8 @@ class WoIwJDealPriceCrawlerBatch extends BaseBatch { Elements cityUrls = doc.select("ul.city-more-r a") for(Element cityUrl : cityUrls){ def city = cityUrl.text() - if(!city.contains("海外")){ - println("------开始分析"+city+"我爱我家数据------") + if(!city.contains("娴峰")){ + println("------寮�濮嬪垎鏋�"+city+"鎴戠埍鎴戝鏁版嵁------") def link = cityUrl.attr("href")+"/exchange/" def linkresult = HttpHelper.fetchPage(link) def linkdoc = Jsoup.parse(linkresult) @@ -131,14 +131,14 @@ class WoIwJDealPriceCrawlerBatch extends BaseBatch { break } } catch (Exception e) { - println("解析url:=======" + link) + println("瑙f瀽url:=======" + link) e.printStackTrace() } } } } - def content = "共解析"+j+"个小区URL" - jms.sendMail(Watcher.LiXue.email, "我爱我家成交数据抓取报告", content) + def content = "鍏辫В鏋�"+j+"涓皬鍖篣RL" + jms.sendMail(Watcher.LiXue.email, "鎴戠埍鎴戝鎴愪氦鏁版嵁鎶撳彇鎶ュ憡", content) } private static List getPageList(def url){ List docList = new ArrayList() @@ -170,7 +170,7 @@ class WoIwJDealPriceCrawlerBatch extends BaseBatch { docList.add(doc1) } }catch (Exception e){ - println("解析列表:======="+url) + println("瑙f瀽鍒楄〃:======="+url) e.printStackTrace() } if(docList){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/WuKongZhaoFangBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/WuKongZhaoFangBatch.groovy index 000dd396c..ca58610c2 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/WuKongZhaoFangBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/WuKongZhaoFangBatch.groovy @@ -56,11 +56,11 @@ class WhKongZhaoFangBatch extends BaseBatch { doThird(city,region,link) } boolean is=false - if(StringUtils.isNotBlank(document.select("a:contains(下一页)").toString())){ + if(StringUtils.isNotBlank(document.select("a:contains(涓嬩竴椤�)").toString())){ is=true } while (is){ - String lin="https://www.wkzf.com"+document.select("a:contains(下一页)").attr("href") + String lin="https://www.wkzf.com"+document.select("a:contains(涓嬩竴椤�)").attr("href") String content=SpiderUtil.getResult(lin); if(content==null){ continue @@ -71,7 +71,7 @@ class WhKongZhaoFangBatch extends BaseBatch { String link="https://www.wkzf.com"+element.attr("href") doThird(city,region,link) } - if(StringUtils.isNotBlank(doc.select("a:contains(下一页)").toString())){ + if(StringUtils.isNotBlank(doc.select("a:contains(涓嬩竴椤�)").toString())){ is=true document=doc }else { @@ -93,30 +93,30 @@ class WhKongZhaoFangBatch extends BaseBatch { try { String name=element.select("p>span").text() String areaStr=element.select("p").text() - areaStr=areaStr.replaceAll(name,"").replaceAll("㎡","").trim() + areaStr=areaStr.replaceAll(name,"").replaceAll("銕�","").trim() double area=Double.parseDouble(areaStr) Elements elements1=element.select("ul>li") String trandTimeStr=elements1.get(0).text() - trandTimeStr=trandTimeStr.replaceAll("网签时间:","").trim() + trandTimeStr=trandTimeStr.replaceAll("缃戠鏃堕棿锛�","").trim() Date tradeDate=DateUtil.parseDate(trandTimeStr,"yyyy-MM-dd") String avgPriceStr=elements1.get(1).text() - avgPriceStr=avgPriceStr.replaceAll("成交单价:","").replaceAll("元/㎡","").trim() + avgPriceStr=avgPriceStr.replaceAll("鎴愪氦鍗曚环锛�","").replaceAll("鍏�/銕�","").trim() int avgPrice=Integer.parseInt(avgPriceStr) String totalPriceStr=elements1.get(2).text() - totalPriceStr=totalPriceStr.replaceAll("成交总价:","").replaceAll("万","").trim() + totalPriceStr=totalPriceStr.replaceAll("鎴愪氦鎬讳环锛�","").replaceAll("涓�","").trim() int totalPrice=Integer.parseInt(totalPriceStr)*10000 BasicDBObject basicDBObject=new BasicDBObject() basicDBObject.append("city",city).append("region",region). append("districtName",name).append("area",area).append("tradeDate",tradeDate). append("avgPrice",avgPrice).append("totalPrice",totalPrice). - append("source","悟空找房").append("webline","悟空找房"). - append("creator","方锐") - BasicDBObject basicDBObject1=COLL.findOne(new BasicDBObject('webline','悟空找房').append('area',area). + append("source","鎮熺┖鎵炬埧").append("webline","鎮熺┖鎵炬埧"). + append("creator","鏂归攼") + BasicDBObject basicDBObject1=COLL.findOne(new BasicDBObject('webline','鎮熺┖鎵炬埧').append('area',area). append('avgPrice',avgPrice).append('totalPrice',totalPrice).append('city',city). append('region',region).append('districtName',name)) if(basicDBObject1==null){ COLL.save(basicDBObject) - println('已入库'+count+'条!') + println('宸插叆搴�'+count+'鏉★紒') count++ } }catch (Exception e){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/ZafDealPriceCrawlerBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/ZafDealPriceCrawlerBatch.groovy index dc2ce59bd..b6b0108af 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/ZafDealPriceCrawlerBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/ZafDealPriceCrawlerBatch.groovy @@ -7,14 +7,14 @@ import com.fangjia.script.dealPrice.parse.DealPriceResolver import com.fangjia.script.dealPrice.parse.ZafDealPriceResolver /** - * 功能说明:中安房成交数据抓取 + * 鍔熻兘璇存槑:涓畨鎴挎垚浜ゆ暟鎹姄鍙� */ @BatchOwner(Watcher.WangWenYan) class ZafDealPriceCrawlerBatch extends BaseDealPriceCrawlerBatch { ZafDealPriceCrawlerBatch() { - super("58ca095ee4b04ce27a1a27c3", "中安房") + super("58ca095ee4b04ce27a1a27c3", "涓畨鎴�") } static void main(String[] args) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/ZhuGeZhaoFangBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/ZhuGeZhaoFangBatch.groovy index 8b5bf65e7..7a75fa929 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/ZhuGeZhaoFangBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/ZhuGeZhaoFangBatch.groovy @@ -48,14 +48,14 @@ class ZhuGeZhaoFangBatch extends BaseBatch { } doSecond(link,city); } - sendEmail("fangrui@fangjia.com","诸葛找房本月抓取量:",count.toString()) + sendEmail("fangrui@fangjia.com","璇歌憶鎵炬埧鏈湀鎶撳彇閲�:",count.toString()) } void doSecond(String url,String city){ try{ String result=SpiderUtil.getResult(url,'gbk'); Document document=Jsoup.parse(result); - String link=url+document.select(".head-title-left-box>a:contains(二手房)").attr("href") + String link=url+document.select(".head-title-left-box>a:contains(浜屾墜鎴�)").attr("href") String res=SpiderUtil.getResult(link,'gbk'); Document doc=Jsoup.parse(res); Elements elements=doc.select(".list-screen-item-box").get(0).select("a") @@ -86,11 +86,11 @@ class ZhuGeZhaoFangBatch extends BaseBatch { doForth(link,city,region) } boolean is=false - if(StringUtils.isNotBlank(document.select("a:contains(下一页)").toString())){ + if(StringUtils.isNotBlank(document.select("a:contains(涓嬩竴椤�)").toString())){ is=true } while(is){ - String linka=url+document.select("a:contains(下一页)").attr("href"); + String linka=url+document.select("a:contains(涓嬩竴椤�)").attr("href"); String content=SpiderUtil.getResult(linka); if(content==null){ continue @@ -101,7 +101,7 @@ class ZhuGeZhaoFangBatch extends BaseBatch { String link=url+element.attr("href"); doForth(link,city,region) } - if(StringUtils.isNotBlank(doc.select("a:contains(下一页)").toString())){ + if(StringUtils.isNotBlank(doc.select("a:contains(涓嬩竴椤�)").toString())){ is=true document=doc }else { @@ -123,8 +123,8 @@ class ZhuGeZhaoFangBatch extends BaseBatch { String address=null; Elements elements=document.select(".col-12") for(Element element:elements){ - if(element.text()&&element.text().contains("位 置:")){ - address=StringUtils.substringAfter(element.text(),"位 置:") + if(element.text()&&element.text().contains("浣� 缃細")){ + address=StringUtils.substringAfter(element.text(),"浣� 缃細") break; } } @@ -153,7 +153,7 @@ class ZhuGeZhaoFangBatch extends BaseBatch { continue; } for(JSONObject obj:jsonObj.data){ - def creator='方锐' + def creator='鏂归攼' DealPrice dealPrice=new DealPrice() dealPrice.city=city dealPrice.region=region @@ -180,12 +180,12 @@ class ZhuGeZhaoFangBatch extends BaseBatch { basicDBObject.put("hall",dealPrice.hall) basicDBObject.put("creationDate",dealPrice.creationDate) basicDBObject.put("source",dealPrice.source) - basicDBObject.put("webline","诸葛找房") + basicDBObject.put("webline","璇歌憶鎵炬埧") basicDBObject.put("diff_id",obj.id) - BasicDBObject basicDBObject1=COLL.findOne(new BasicDBObject('webline',"诸葛找房").append('diff_id',obj.id)) + BasicDBObject basicDBObject1=COLL.findOne(new BasicDBObject('webline',"璇歌憶鎵炬埧").append('diff_id',obj.id)) if(basicDBObject1==null){ COLL.save(basicDBObject) - println('已入库'+count+'条!') + println('宸插叆搴�'+count+'鏉★紒') count++ } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/parse/BasicDealPriceJobParser.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/parse/BasicDealPriceJobParser.groovy index b58b40b1d..17b2db4e1 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/parse/BasicDealPriceJobParser.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/parse/BasicDealPriceJobParser.groovy @@ -19,7 +19,7 @@ import org.slf4j.Logger import org.slf4j.LoggerFactory /** - * 成交数据解析器基类 + * 鎴愪氦鏁版嵁瑙f瀽鍣ㄥ熀绫� */ class BasicDealPriceJobParser extends BasicFetchJobParser{ @@ -94,7 +94,7 @@ class BasicDealPriceJobParser extends BasicFetchJobParser{ } } if(!hasResolver){ - logger.error("无法解析Url:" + url ) + logger.error("鏃犳硶瑙f瀽Url:" + url ) } return null } @@ -102,11 +102,11 @@ class BasicDealPriceJobParser extends BasicFetchJobParser{ void emailNotify() { def result = "\n" + " \n" + - " \n" + + " \n" + " " + " \n" + - " \n" + - " \n" + + " \n" + + " \n" + " " for(def city : citys.keySet()){ result = result+"\n" + @@ -115,10 +115,10 @@ class BasicDealPriceJobParser extends BasicFetchJobParser{ " " } result = result + "
    ${source+"本月成交数据抓取结果统计"}${source+"鏈湀鎴愪氦鏁版嵁鎶撳彇缁撴灉缁熻"}
    城市抓取量鍩庡競鎶撳彇閲�
    " - String content = "${source}共抓取成效数据${saveCount}条"+"${result}" + String content = "${source}鍏辨姄鍙栨垚鏁堟暟鎹�${saveCount}鏉�"+"${result}" String creatorMail = "${DataUtil.hanyuQuanpin2(creator,'')}@fangjia.com" - jms.sendMail(creatorMail, "成交数据抓取报告", content) - jms.sendMail(Watcher.ZhouTongYun.email, "成交数据抓取报告", content) - jms.sendMail("wangchencen@fangjia.com", "成交数据抓取报告", content) + jms.sendMail(creatorMail, "鎴愪氦鏁版嵁鎶撳彇鎶ュ憡", content) + jms.sendMail(Watcher.ZhouTongYun.email, "鎴愪氦鏁版嵁鎶撳彇鎶ュ憡", content) + jms.sendMail("wangchencen@fangjia.com", "鎴愪氦鏁版嵁鎶撳彇鎶ュ憡", content) } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/parse/BasicFetchJobParser.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/parse/BasicFetchJobParser.groovy index 4169d431f..652ee7dfe 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/parse/BasicFetchJobParser.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/parse/BasicFetchJobParser.groovy @@ -12,8 +12,8 @@ import org.slf4j.Logger import org.slf4j.LoggerFactory /** - * 抓取网页解析器基类 - * @author 王文艳 + * 鎶撳彇缃戦〉瑙f瀽鍣ㄥ熀绫� + * @author 鐜嬫枃鑹� */ abstract class BasicFetchJobParser { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/parse/DealPriceResolver.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/parse/DealPriceResolver.groovy index 40fa91e9b..438124fde 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/parse/DealPriceResolver.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/parse/DealPriceResolver.groovy @@ -5,7 +5,7 @@ import com.fangjia.script.dealPrice.DealPriceUtils import org.jsoup.nodes.Element /** - * 成交数据解析器 + * 鎴愪氦鏁版嵁瑙f瀽鍣� */ abstract class DealPriceResolver implements Resolver { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/parse/DealPriceUnitUniteBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/parse/DealPriceUnitUniteBatch.groovy index 101cf2178..b1c90b2b3 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/parse/DealPriceUnitUniteBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/parse/DealPriceUnitUniteBatch.groovy @@ -11,7 +11,7 @@ import com.mongodb.BasicDBObject import com.mongodb.DBCollection /** - * 成交数据解析脚本 + * 鎴愪氦鏁版嵁瑙f瀽鑴氭湰 */ @BatchOwner(Watcher.WangWenYan) class DealPriceUnitUniteBatch extends BaseBatch{ @@ -36,24 +36,24 @@ class DealPriceUnitUniteBatch extends BaseBatch{ List listSelector = [] listSelector.add(new FangDealPriceListPageResolver()) - def souFangDealPriceResolver = new BasicDealPriceJobParser("58774d63e4b0c77ebbf12579" , "搜房", listSelector) + def souFangDealPriceResolver = new BasicDealPriceJobParser("58774d63e4b0c77ebbf12579" , "鎼滄埧", listSelector) souFangDealPriceResolver.parse() - sendMail("58774d63e4b0c77ebbf12579" , "搜房") + sendMail("58774d63e4b0c77ebbf12579" , "鎼滄埧") } void processPingFang(){ List listSelector = [] listSelector.add(new PingAnDealPriceResolver()) - def pingDealPriceParser = new BasicDealPriceJobParser("58b66280e4b04ce279f09284" , "平安好房", listSelector) + def pingDealPriceParser = new BasicDealPriceJobParser("58b66280e4b04ce279f09284" , "骞冲畨濂芥埧", listSelector) pingDealPriceParser.parse() - sendMail("58b66280e4b04ce279f09284" , "平安好房") + sendMail("58b66280e4b04ce279f09284" , "骞冲畨濂芥埧") } void processMaiTian(){ List listSelector = [] listSelector.add(new MaiTianDealPriceListPageResolver()) - def maiTianDealPriceResolver = new BasicDealPriceJobParser("589ad018e4b0c77ebbf36552" , "麦田在线", listSelector) + def maiTianDealPriceResolver = new BasicDealPriceJobParser("589ad018e4b0c77ebbf36552" , "楹︾敯鍦ㄧ嚎", listSelector) maiTianDealPriceResolver.parse() } @@ -61,17 +61,17 @@ class DealPriceUnitUniteBatch extends BaseBatch{ List listSelector = [] listSelector.add(new LianjiaDealPriceListPageResolver()) listSelector.add(new LianjiaShangHaiDealPriceListPageResolver()) - def lianJiaDealPriceResolver = new BasicDealPriceJobParser("53e492b7e4b09e392f5b3f63" , "链家在线", listSelector) + def lianJiaDealPriceResolver = new BasicDealPriceJobParser("53e492b7e4b09e392f5b3f63" , "閾惧鍦ㄧ嚎", listSelector) lianJiaDealPriceResolver.parse() - sendMail("53e492b7e4b09e392f5b3f63" , "链家在线") + sendMail("53e492b7e4b09e392f5b3f63" , "閾惧鍦ㄧ嚎") } void processZafJia(){ List listSelector = [] listSelector.add(new ZafDealPriceResolver()) - def lianJiaDealPriceResolver = new BasicDealPriceJobParser("58ca095ee4b04ce27a1a27c3" , "中安房", listSelector) + def lianJiaDealPriceResolver = new BasicDealPriceJobParser("58ca095ee4b04ce27a1a27c3" , "涓畨鎴�", listSelector) lianJiaDealPriceResolver.parse() - sendMail("58ca095ee4b04ce27a1a27c3" , "中安房") + sendMail("58ca095ee4b04ce27a1a27c3" , "涓畨鎴�") } @@ -92,9 +92,9 @@ class DealPriceUnitUniteBatch extends BaseBatch{ map["source"] = source map["stats"] = stats def content = sd.getContent(map) - sendEmail(Watcher.LiXue.email, "成交数据抓取报告", content) - sendEmail(Watcher.ZhouTongYun.email, "成交数据抓取报告", content) - sendEmail("wangchencen@fangjia.com", "成交数据抓取报告", content) + sendEmail(Watcher.LiXue.email, "鎴愪氦鏁版嵁鎶撳彇鎶ュ憡", content) + sendEmail(Watcher.ZhouTongYun.email, "鎴愪氦鏁版嵁鎶撳彇鎶ュ憡", content) + sendEmail("wangchencen@fangjia.com", "鎴愪氦鏁版嵁鎶撳彇鎶ュ憡", content) } def paramsTransverter(String params){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/parse/FangDealPriceListPageResolver.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/parse/FangDealPriceListPageResolver.groovy index 311030e7a..e82c572c1 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/parse/FangDealPriceListPageResolver.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/parse/FangDealPriceListPageResolver.groovy @@ -6,7 +6,7 @@ import com.fangjia.script.dealPrice.DealPrice import org.jsoup.nodes.Element /** - *房天下成交列表页解析器 + *鎴垮ぉ涓嬫垚浜ゅ垪琛ㄩ〉瑙f瀽鍣� */ class FangDealPriceListPageResolver extends DealPriceResolver { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/parse/JJshunDealPriceListPageResolver.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/parse/JJshunDealPriceListPageResolver.groovy index c6a9bfb91..82756ed82 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/parse/JJshunDealPriceListPageResolver.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/parse/JJshunDealPriceListPageResolver.groovy @@ -10,7 +10,7 @@ import org.apache.commons.lang.StringUtils import org.jsoup.nodes.Element /** - * 功能说明: + * 鍔熻兘璇存槑: */ class JJshunDealPriceListPageResolver extends DealPriceResolver { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/parse/LianjiaDealPriceListPageResolver.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/parse/LianjiaDealPriceListPageResolver.groovy index 1e5c68883..fed9d72aa 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/parse/LianjiaDealPriceListPageResolver.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/parse/LianjiaDealPriceListPageResolver.groovy @@ -7,7 +7,7 @@ import com.mongodb.BasicDBObject import org.jsoup.nodes.Element /** - * 链家成交数据解析器 + * 閾惧鎴愪氦鏁版嵁瑙f瀽鍣� */ class LianjiaDealPriceListPageResolver extends DealPriceResolver { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/parse/LianjiaShangHaiDealPriceListPageResolver.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/parse/LianjiaShangHaiDealPriceListPageResolver.groovy index 6ce7c7d3f..2b2361b8b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/parse/LianjiaShangHaiDealPriceListPageResolver.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/parse/LianjiaShangHaiDealPriceListPageResolver.groovy @@ -6,7 +6,7 @@ import com.mongodb.BasicDBObject import org.jsoup.nodes.Element /** - * 链家成交数据解析器 + * 閾惧鎴愪氦鏁版嵁瑙f瀽鍣� */ class LianjiaShangHaiDealPriceListPageResolver extends DealPriceResolver { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/parse/MaiTianDealPriceListPageResolver.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/parse/MaiTianDealPriceListPageResolver.groovy index ac571b73b..2a328424d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/parse/MaiTianDealPriceListPageResolver.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/parse/MaiTianDealPriceListPageResolver.groovy @@ -6,7 +6,7 @@ import com.mongodb.BasicDBObject import org.jsoup.nodes.Element /** - * 麦田在线成交数据列表页解析器 + * 楹︾敯鍦ㄧ嚎鎴愪氦鏁版嵁鍒楄〃椤佃В鏋愬櫒 */ class MaiTianDealPriceListPageResolver extends DealPriceResolver{ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/parse/MytophomeDealPriceListPageResolver.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/parse/MytophomeDealPriceListPageResolver.groovy index 9f6acfeb2..a464aabe9 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/parse/MytophomeDealPriceListPageResolver.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/parse/MytophomeDealPriceListPageResolver.groovy @@ -6,7 +6,7 @@ import org.jsoup.nodes.Element import org.jsoup.select.Elements /** - *房天下成交列表页解析器 + *鎴垮ぉ涓嬫垚浜ゅ垪琛ㄩ〉瑙f瀽鍣� */ class MytophomeDealPriceListPageResolver extends DealPriceResolver { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/parse/PingAnDealPriceResolver.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/parse/PingAnDealPriceResolver.groovy index d579390cb..e1f16d14b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/parse/PingAnDealPriceResolver.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/parse/PingAnDealPriceResolver.groovy @@ -6,18 +6,18 @@ import com.mongodb.BasicDBObject import org.jsoup.nodes.Element /** - * 平安好房成交数据解析器 + * 骞冲畨濂芥埧鎴愪氦鏁版嵁瑙f瀽鍣� */ class PingAnDealPriceResolver extends DealPriceResolver{ @Override boolean isApply(String content) { - return JQueryUtils.select(".xq-record-left>table>tbody>tr:contains(平)", content).size() > 0 + return JQueryUtils.select(".xq-record-left>table>tbody>tr:contains(骞�)", content).size() > 0 } @Override String listPageSelector() { - return ".xq-record-left>table>tbody>tr:contains(平)" + return ".xq-record-left>table>tbody>tr:contains(骞�)" } @Override diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/parse/Resolver.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/parse/Resolver.groovy index bab9a25a8..d7dbe33ec 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/parse/Resolver.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/parse/Resolver.groovy @@ -1,7 +1,7 @@ package com.fangjia.script.dealPrice.parse /** - * 网页解析器 + * 缃戦〉瑙f瀽鍣� */ interface Resolver { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/parse/ZafDealPriceResolver.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/parse/ZafDealPriceResolver.groovy index 1ce520d63..e078f9b8b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/parse/ZafDealPriceResolver.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/parse/ZafDealPriceResolver.groovy @@ -7,7 +7,7 @@ import org.apache.commons.lang.StringUtils import org.jsoup.nodes.Element /** - * 中安房成交数据解析器 + * 涓畨鎴挎垚浜ゆ暟鎹В鏋愬櫒 */ class ZafDealPriceResolver extends DealPriceResolver{ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dianping/CalculateKeliuliangDianping.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dianping/CalculateKeliuliangDianping.groovy index 6754026cd..27373dbc9 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dianping/CalculateKeliuliangDianping.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dianping/CalculateKeliuliangDianping.groovy @@ -32,7 +32,7 @@ class CalculateKeliuliangDianping { static main(args) { CalculateKeliuliangDianping calculator=new CalculateKeliuliangDianping() - calculator.process("上海") + calculator.process("涓婃捣") // println calculator.calculateShopPassengerFlow("52171ea008b064d4e60ce226") } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dianping/CrawlDianpingShop.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dianping/CrawlDianpingShop.groovy index 3833fb5aa..5ff432cf6 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dianping/CrawlDianpingShop.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dianping/CrawlDianpingShop.groovy @@ -34,22 +34,22 @@ class CrawlDianpingShop { static Pattern pattern_price = Pattern.compile("([\\d\\.]+)") static Pattern pattern_commentTime= Pattern.compile("(([\\d]{2}\\-)?[\\d]{2}\\-[\\d]{2})\\s*") - def categorys=["美食": "10", - "休闲娱乐": "30", - "购物": "20", - "丽人": "50", - "结婚": "55", - "亲子": "70", - "运动健身": "45", - "酒店": "60", - "家装": "90", - "爱车": "65", - "生活服务": "80"] + def categorys=["缇庨": "10", + "浼戦棽濞变箰": "30", + "璐墿": "20", + "涓戒汉": "50", + "缁撳": "55", + "浜插瓙": "70", + "杩愬姩鍋ヨ韩": "45", + "閰掑簵": "60", + "瀹惰": "90", + "鐖辫溅": "65", + "鐢熸椿鏈嶅姟": "80"] - def cityCodes=["上海": "1", - "北京": "2", - "广州": "4", - "昆山": "6"] + def cityCodes=["涓婃捣": "1", + "鍖椾含": "2", + "骞垮窞": "4", + "鏄嗗北": "6"] ExecutorService executorService=new ThreadPoolExecutor(10, 10, 3000L, TimeUnit.MILLISECONDS, @@ -60,10 +60,10 @@ class CrawlDianpingShop { static main(args){ CrawlDianpingShop crawl=new CrawlDianpingShop() - crawl.process("上海") -// crawl.process2("上海", "http://www.dianping.com/search/category/1/10/r842") + crawl.process("涓婃捣") +// crawl.process2("涓婃捣", "http://www.dianping.com/search/category/1/10/r842") // println crawl.crawlInit("1") -// crawl.processDetail("上海", "http://www.dianping.com/shop/1901062") +// crawl.processDetail("涓婃捣", "http://www.dianping.com/shop/1901062") // println InvokeHttpRequest.get("http://www.dianping.com/search/category/1/10/g118r5962", "utf-8") } @@ -118,7 +118,7 @@ class CrawlDianpingShop { println "${city} no city code" return } - categorys=["美食":"10"] + categorys=["缇庨":"10"] def params=crawlInit(cityCode) def subCatParams=params[0] @@ -152,7 +152,7 @@ class CrawlDianpingShop { processItem(city, retxt, enterUrl) - Element elP=JQueryUtils.select("div.Pages a:contains(下一页)", retxt).first() + Element elP=JQueryUtils.select("div.Pages a:contains(涓嬩竴椤�)", retxt).first() int pageCount=1 if(elP){ elP=elP.previousElementSibling() @@ -269,7 +269,7 @@ class CrawlDianpingShop { } int countIndex=0 countIndex=processComment(shop, _id, retxt, countIndex) - Element elP=JQueryUtils.select("div.Pages a:contains(下一页)", retxt).first() + Element elP=JQueryUtils.select("div.Pages a:contains(涓嬩竴椤�)", retxt).first() int pageCount=1 if(elP){ elP=elP.previousElementSibling() diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dianxing/DianXingDataAnaly.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dianxing/DianXingDataAnaly.groovy index 5bbeda7ee..ef1984867 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dianxing/DianXingDataAnaly.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dianxing/DianXingDataAnaly.groovy @@ -21,20 +21,20 @@ import java.util.concurrent.TimeUnit import com.fangjia.script.yinjihaun.amap.GaoDeApiUtils; /** - * 电信数据解析 + * 鐢典俊鏁版嵁瑙f瀽 * @author gaojuan * */ class DianXingDataAnaly { - public static final def citys = ["上海","杭州","宁波","温州","绍兴","萧山","义乌","金华","嘉兴","南京","苏州","无锡","常州","昆山","南通","常熟","厦门","福州","长沙","武汉","昆明"] + public static final def citys = ["涓婃捣","鏉窞","瀹佹尝","娓╁窞","缁嶅叴","钀у北","涔変箤","閲戝崕","鍢夊叴","鍗椾含","鑻忓窞","鏃犻敗","甯稿窞","鏄嗗北","鍗楅��","甯哥啛","鍘﹂棬","绂忓窞","闀挎矙","姝︽眽","鏄嗘槑"] public static final def cityRegionMap = [:]; - public static final def keywords = ["家宅","小区","园","苑","村","公寓","居","城","庭","家","大厦","宿舍","家族","府","大楼","社区","庄","墅","国际","家属","都","期","坊","湾","公房","邸"]; + public static final def keywords = ["瀹跺畢","灏忓尯","鍥�","鑻�","鏉�","鍏瘬","灞�","鍩�","搴�","瀹�","澶у帵","瀹胯垗","瀹舵棌","搴�","澶фゼ","绀惧尯","搴�","澧�","鍥介檯","瀹跺睘","閮�","鏈�","鍧�","婀�","鍏埧","閭�"]; //public static HttpRequest http = new HttpRequest(); - public static String SPACIAL_PATTERN = '[`~!@#$%^&*()+=|{}:;,\\[\\].<>/?~!@#¥%……&*()——+|{}【】‘;:”“’。,、?]'; + public static String SPACIAL_PATTERN = '[`~!@#$%^&*()+=|{}:;,\\[\\].<>/?~锛丂#锟�%鈥︹��&*锛堬級鈥斺��+|{}銆愩�戔�橈紱锛氣�濃�溾�欍�傦紝銆侊紵]'; AtomicInteger index = new AtomicInteger(); @@ -48,28 +48,28 @@ class DianXingDataAnaly { } def test(){ - def words = "上海市辖区蔡路镇[张吴(村243号"; + def words = "涓婃捣甯傝緰鍖鸿敗璺晣[寮犲惔(鏉�243鍙�"; println words.replaceAll(SPACIAL_PATTERN, ""); // formatDistrictName(words); -// Pattern p = Pattern.compile(".*[家宅|小区|园|苑|村|公寓|居|城|庭|家|大厦|宿舍|家族|府|大楼|社区|庄|墅|国际|家属|都|期|坊|湾|公房|邸].*") +// Pattern p = Pattern.compile(".*[瀹跺畢|灏忓尯|鍥瓅鑻憒鏉憒鍏瘬|灞厊鍩巪搴瓅瀹秥澶у帵|瀹胯垗|瀹舵棌|搴渱澶фゼ|绀惧尯|搴剕澧厊鍥介檯|瀹跺睘|閮絴鏈焲鍧妡婀緗鍏埧|閭竇.*") // Matcher m = p.matcher(words) // while (m.find()) { // print m.group() // } // initCityRegion(); -// def locationMap = createDatas("奉贤区", "奉贤区奉贤区胡桥镇花苑新村14号", null ); +// def locationMap = createDatas("濂夎搐鍖�", "濂夎搐鍖哄璐ゅ尯鑳℃ˉ闀囪姳鑻戞柊鏉�14鍙�", null ); // println locationMap } def addInfoRun(){ - def datas = CsvUtils.read("E:\\数据\\电信数据\\结果.csv"); + def datas = CsvUtils.read("E:\\鏁版嵁\\鐢典俊鏁版嵁\\缁撴灉.csv"); initCityRegion(); def ret = addValue(datas); repeatStat(ret); - writeCsv2(ret, "e:\\数据\\电信数据\\结果3.csv") + writeCsv2(ret, "e:\\鏁版嵁\\鐢典俊鏁版嵁\\缁撴灉3.csv") } def addValue(def datas){ @@ -85,7 +85,7 @@ class DianXingDataAnaly { def oldAddress = data[0] def city = data[1] def way = data[7] - if(way == "新增"){ + if(way == "鏂板"){ executorService.submit(new Runnable() { @Override @@ -114,7 +114,7 @@ class DianXingDataAnaly { nameKeys << name; } } - println "去重后:"+nameKeys.size()+"个"; + println "鍘婚噸鍚�:"+nameKeys.size()+"涓�"; } @@ -133,14 +133,14 @@ class DianXingDataAnaly { return data; } def run(){ - //def datas = DataHandleUtils.readExcel("E:\\数据\\电信数据\\addr1.xlsx"); - def datas = CsvUtils.read("E:\\数据\\电信数据\\Addr0.csv"); + //def datas = DataHandleUtils.readExcel("E:\\鏁版嵁\\鐢典俊鏁版嵁\\addr1.xlsx"); + def datas = CsvUtils.read("E:\\鏁版嵁\\鐢典俊鏁版嵁\\Addr0.csv"); println datas.size(); initCityRegion(); def result = running(datas); - writeCsv(result, "e:\\数据\\电信数据\\结果.csv") + writeCsv(result, "e:\\鏁版嵁\\鐢典俊鏁版嵁\\缁撴灉.csv") } @@ -182,7 +182,7 @@ class DianXingDataAnaly { def address = createAddress(CITY, ADDR1, ADDR2, ADDR3); - if(address.contains("勤俭新村16号")){ + if(address.contains("鍕や凯鏂版潙16鍙�")){ println address } def locationMap = createDatas(CITY, address,MAX_RSC ); @@ -224,13 +224,13 @@ class DianXingDataAnaly { if(MAX_RSC){ locationMap = getBuildType(locationMap, MAX_RSC.toInteger()) } - locationMap.mark = "新增"; + locationMap.mark = "鏂板"; } }else{ - locationMap.mark = "放弃,不提取"; + locationMap.mark = "鏀惧純锛屼笉鎻愬彇"; } }else{ - locationMap.mark = "城市不在范围内"; + locationMap.mark = "鍩庡競涓嶅湪鑼冨洿鍐�"; } return locationMap; @@ -258,15 +258,15 @@ class DianXingDataAnaly { def name = locationMap.name; def standAddress = locationMap.address; def miniAddress = locationMap.miniAddress; - if(miniAddress && miniAddress.indexOf("队")>-1){ - miniAddress = miniAddress.substring(miniAddress.indexOf("队")+1, miniAddress.length()) + if(miniAddress && miniAddress.indexOf("闃�")>-1){ + miniAddress = miniAddress.substring(miniAddress.indexOf("闃�")+1, miniAddress.length()) } if(!standAddress){ locationMap.address = ""; - locationMap.mark = "地址填充!" + locationMap.mark = "鍦板潃濉厖锛�" }else if(address.contains(name) || (standAddress && address.contains(standAddress))){ - }else if(address.indexOf("交汇")==-1){ + }else if(address.indexOf("浜ゆ眹")==-1){ def dbo = CommonDatautils.findDistrictById(locationMap.id); if(dbo){ def alias = dbo.alias; @@ -274,29 +274,29 @@ class DianXingDataAnaly { if(alias && addrAlias){ if(alias.contains(name) || alias.contains(standAddress) || addrAlias.contains(standAddress) || addrAlias.contains(alias)){ - locationMap.mark = "别名已存在,不处理" - }else if(miniAddress.indexOf("路")>-1 || miniAddress.indexOf("街")>-1){ - locationMap.mark = "需加地址别名" + locationMap.mark = "鍒悕宸插瓨鍦�,涓嶅鐞�" + }else if(miniAddress.indexOf("璺�")>-1 || miniAddress.indexOf("琛�")>-1){ + locationMap.mark = "闇�鍔犲湴鍧�鍒悕" }else{ - locationMap.mark = "需加名称别名" + locationMap.mark = "闇�鍔犲悕绉板埆鍚�" } }else if(alias || addrAlias){ if(alias && !alias.contains(name) && !alias.contains(standAddress)){ - if(miniAddress.indexOf("路")==-1 && miniAddress.indexOf("街")==-1){ - locationMap.mark = "需加名称别名" + if(miniAddress.indexOf("璺�")==-1 && miniAddress.indexOf("琛�")==-1){ + locationMap.mark = "闇�鍔犲悕绉板埆鍚�" } }else if(addrAlias && !alias.contains(name) && !alias.contains(standAddress)){ - if(miniAddress.indexOf("路")>-1 || miniAddress.indexOf("街")>-1){ - locationMap.mark = "需加地址别名" + if(miniAddress.indexOf("璺�")>-1 || miniAddress.indexOf("琛�")>-1){ + locationMap.mark = "闇�鍔犲湴鍧�鍒悕" } }else{ - locationMap.mark = "不添加别名" + locationMap.mark = "涓嶆坊鍔犲埆鍚�" } }else{ - if(miniAddress.indexOf("路")>-1 || miniAddress.indexOf("街")>-1){ - locationMap.mark = "需加地址别名" + if(miniAddress.indexOf("璺�")>-1 || miniAddress.indexOf("琛�")>-1){ + locationMap.mark = "闇�鍔犲湴鍧�鍒悕" }else{ - locationMap.mark = "不添加别名" + locationMap.mark = "涓嶆坊鍔犲埆鍚�" } } @@ -310,10 +310,10 @@ class DianXingDataAnaly { def getEstateType(locationMap){ if(locationMap && locationMap.name){ - if(locationMap.name && locationMap.name.contains("墅")){ - locationMap.estate_type = "别墅"; + if(locationMap.name && locationMap.name.contains("澧�")){ + locationMap.estate_type = "鍒"; }else{ - locationMap.estate_type = "普通住宅"; + locationMap.estate_type = "鏅�氫綇瀹�"; } } @@ -324,11 +324,11 @@ class DianXingDataAnaly { if(locationMap){ if(maxHeight){ if(maxHeight<=7){ - locationMap.build_type = "多层"; + locationMap.build_type = "澶氬眰"; }else if(maxHeight>7 && maxHeight<=18){ - locationMap.build_type = "小高层"; + locationMap.build_type = "灏忛珮灞�"; }else if(maxHeight>18 && maxHeight<40){ - locationMap.build_type = "高层"; + locationMap.build_type = "楂樺眰"; } } @@ -341,21 +341,21 @@ class DianXingDataAnaly { def location = [:]; - def city = cityString.replace("市辖区", ""); + def city = cityString.replace("甯傝緰鍖�", ""); - if(city.length() >= 3 && city.endsWith("市")){ - city = city.replace("市",""); + if(city.length() >= 3 && city.endsWith("甯�")){ + city = city.replace("甯�",""); } - if(city.length() >= 3 && city.endsWith("县")){ - city = city.replace("县",""); + if(city.length() >= 3 && city.endsWith("鍘�")){ + city = city.replace("鍘�",""); } if(city){ if(isContains(city)){ location.city = city; }else{ - //判断是否是区域 + //鍒ゆ柇鏄惁鏄尯鍩� location = findCityFromRegion(city); } } @@ -386,7 +386,7 @@ class DianXingDataAnaly { return location; } - //获取完整地址 + //鑾峰彇瀹屾暣鍦板潃 def createAddress(def city, def addr1, def addr2, def addr3){ def address = ""; if(city && !addr1.contains(city)){ @@ -408,7 +408,7 @@ class DianXingDataAnaly { } - //获取经纬度信息 + //鑾峰彇缁忕含搴︿俊鎭� def getLocation(def address){ def locationMap = [:]; def resp = BaiDuApiUtils.geocoder(null, address); @@ -474,7 +474,7 @@ class DianXingDataAnaly { map.region = regions[0]; return map; }else{ - //println "多个城市存在该区域!" + //println "澶氫釜鍩庡競瀛樺湪璇ュ尯鍩燂紒" println city; return [:]; } @@ -496,9 +496,9 @@ class DianXingDataAnaly { location.miniAddress = resultMap.miniAddress; location.orgKeywords = resultMap.orgKeywords; if(resultMap.precise ==1){ - location.mark = "地图库中存在,未入库!" + location.mark = "鍦板浘搴撲腑瀛樺湪锛屾湭鍏ュ簱锛�" }else if(resultMap.precise ==0){ - location.mark = "已存在,不处理!" + location.mark = "宸插瓨鍦紝涓嶅鐞嗭紒" } }else if(resultMap.keyword){ location.dbFlag = resultMap.precise; @@ -534,8 +534,8 @@ class DianXingDataAnaly { if(flag){ def name = formatDistrictName(words); if(name){ - if(name.endsWith("村") && name.length()<=3){ - locationMap.mark = "过滤"; + if(name.endsWith("鏉�") && name.length()<=3){ + locationMap.mark = "杩囨护"; return locationMap; }else{ locationMap.name = name; @@ -547,11 +547,11 @@ class DianXingDataAnaly { def formatDistrictName(String name) { String result = null - name = name.replaceAll("[,\\s(\\(\\))]", "") - if(name.matches('^.+(家宅|小区|园|苑|村|公寓|居|城|庭|家|大厦|宿舍|家族|府|大楼|社区|庄|墅|国际|家属|都|期|坊|湾|公房|邸)(\\w+(栋|幢|号楼?))?$')) { - result = name.replaceAll('(^.+(?:家宅|小区|园|苑|村|公寓|居|城|庭|家|大厦|宿舍|家族|府|大楼|社区|庄|墅|国际|家属|都|期|坊|湾|公房|邸))(?:\\w+(?:栋|幢|号楼?))?$', '$1') - if(result.matches("(?:.+市)?(?:.+[区县])?(?:.{1,5}镇)?(?:.{2,5}街道)?(.{2,}(?:家宅|小区|园|苑|村|公寓|居|城|庭|家|大厦|宿舍|家族|府|大楼|社区|庄|墅|国际|家属|都|期|坊|湾|公房|邸))")) { - result = result.replaceAll('(?:.+市)?(?:.+[区县])?(?:.{1,5}镇)?(?:.{2,5}街道)?(.{2,}(?:家宅|小区|园|苑|村|公寓|居|城|庭|家|大厦|宿舍|家族|府|大楼|社区|庄|墅|国际|家属|都|期|坊|湾|公房|邸))', '$1') + name = name.replaceAll("[,\\s锛圽\(\\)锛塢", "") + if(name.matches('^.+(瀹跺畢|灏忓尯|鍥瓅鑻憒鏉憒鍏瘬|灞厊鍩巪搴瓅瀹秥澶у帵|瀹胯垗|瀹舵棌|搴渱澶фゼ|绀惧尯|搴剕澧厊鍥介檯|瀹跺睘|閮絴鏈焲鍧妡婀緗鍏埧|閭�)(\\w+(鏍媩骞鍙锋ゼ?))?$')) { + result = name.replaceAll('(^.+(?:瀹跺畢|灏忓尯|鍥瓅鑻憒鏉憒鍏瘬|灞厊鍩巪搴瓅瀹秥澶у帵|瀹胯垗|瀹舵棌|搴渱澶фゼ|绀惧尯|搴剕澧厊鍥介檯|瀹跺睘|閮絴鏈焲鍧妡婀緗鍏埧|閭�))(?:\\w+(?:鏍媩骞鍙锋ゼ?))?$', '$1') + if(result.matches("(?:.+甯�)?(?:.+[鍖哄幙])?(?:.{1,5}闀�)?(?:.{2,5}琛楅亾)?(.{2,}(?:瀹跺畢|灏忓尯|鍥瓅鑻憒鏉憒鍏瘬|灞厊鍩巪搴瓅瀹秥澶у帵|瀹胯垗|瀹舵棌|搴渱澶фゼ|绀惧尯|搴剕澧厊鍥介檯|瀹跺睘|閮絴鏈焲鍧妡婀緗鍏埧|閭�))")) { + result = result.replaceAll('(?:.+甯�)?(?:.+[鍖哄幙])?(?:.{1,5}闀�)?(?:.{2,5}琛楅亾)?(.{2,}(?:瀹跺畢|灏忓尯|鍥瓅鑻憒鏉憒鍏瘬|灞厊鍩巪搴瓅瀹秥澶у帵|瀹胯垗|瀹舵棌|搴渱澶фゼ|绀惧尯|搴剕澧厊鍥介檯|瀹跺睘|閮絴鏈焲鍧妡婀緗鍏埧|閭�))', '$1') } } return result; @@ -699,7 +699,7 @@ class DianXingDataAnaly { } - //是否包含该城市 + //鏄惁鍖呭惈璇ュ煄甯� def isContains(city){ if(citys.contains(city)){ return true; @@ -719,15 +719,15 @@ class DianXingDataAnaly { if (file.exists()){ file.delete(); } - file.append("原始地址,") - file.append("城市,") - file.append("区域,") - file.append("楼盘名称,") - file.append("物业类型,") - file.append("建筑类型,") - file.append("数据状态,") - file.append("处理方式,") - file.append("关键词,") + file.append("鍘熷鍦板潃,") + file.append("鍩庡競,") + file.append("鍖哄煙,") + file.append("妤肩洏鍚嶇О,") + file.append("鐗╀笟绫诲瀷,") + file.append("寤虹瓚绫诲瀷,") + file.append("鏁版嵁鐘舵��,") + file.append("澶勭悊鏂瑰紡,") + file.append("鍏抽敭璇�,") file.append(System.getProperty("line.separator")); list.each{ @@ -787,17 +787,17 @@ class DianXingDataAnaly { if (file.exists()){ file.delete(); } - file.append("原始地址,") - file.append("城市,") - file.append("区域,") - file.append("楼盘名称,") - file.append("物业类型,") - file.append("建筑类型,") - file.append("数据状态,") - file.append("处理方式,") - file.append("关键词,") - file.append("百度地址,") - file.append("高德地址,") + file.append("鍘熷鍦板潃,") + file.append("鍩庡競,") + file.append("鍖哄煙,") + file.append("妤肩洏鍚嶇О,") + file.append("鐗╀笟绫诲瀷,") + file.append("寤虹瓚绫诲瀷,") + file.append("鏁版嵁鐘舵��,") + file.append("澶勭悊鏂瑰紡,") + file.append("鍏抽敭璇�,") + file.append("鐧惧害鍦板潃,") + file.append("楂樺痉鍦板潃,") file.append(System.getProperty("line.separator")); list.each{ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dianxing/Test.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dianxing/Test.groovy index 8896ed1a8..6438a1916 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dianxing/Test.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dianxing/Test.groovy @@ -14,31 +14,31 @@ class Test { static main(args) { DBObject obj = new BasicDBObject(); - /** 主贷款人省份证号 */ + /** 涓昏捶娆句汉鐪佷唤璇佸彿 */ obj.put("mian_id_code","420302199603025623"); - /** 共同贷款人省份证号集合 */ + /** 鍏卞悓璐锋浜虹渷浠借瘉鍙烽泦鍚� */ obj.put("deputy_id_codes",["420302199603025623"]); - /** 抵押品id集合 */ + /** 鎶垫娂鍝乮d闆嗗悎 */ obj.put("collateral_ids",["584a92fa7b9a5856a3970fbd","584a93177b9a7b9e6fc32184"]); - /** 抵押品总价 */ + /** 鎶垫娂鍝佹�讳环 */ obj.put("total_price",65620000); - /** 最大抵押率 */ + /** 鏈�澶ф姷鎶肩巼 */ obj.put("max_collateral_rate",60); - /** 可以贷款金额 */ + /** 鍙互璐锋閲戦 */ obj.put("lone_amount", 2930000); - /** 创建日期 */ + /** 鍒涘缓鏃ユ湡 */ obj.put("creat_date", new Date()); aonce_collateralColl.save(obj); // DBObject dbo = new BasicDBObject(); -// dbo.put("city","上海"); -// dbo.put("region","虹口"); -// dbo.put("district_name","鸿甸公寓"); +// dbo.put("city","涓婃捣"); +// dbo.put("region","铏瑰彛"); +// dbo.put("district_name","楦跨敻鍏瘬"); // dbo.put("floor", 1); // dbo.put("height", 6); // dbo.put("house_number","2"); // dbo.put("room_number","101"); -// dbo.put("estate_type","公寓"); +// dbo.put("estate_type","鍏瘬"); // double area = 36.9; // dbo.put("area",area); // dbo.put("main_lender_id_code","420302198203025623"); @@ -53,7 +53,7 @@ class Test { // dbo.put("cpdb_rank", 64); // dbo.put("city_rank", 56); // dbo.put("purchase_date", new Date()-3); -// dbo.put("usage", "经营"); +// dbo.put("usage", "缁忚惀"); // dbo.put("status", 0); // dbo.put("create_date",new Date()); // collateralColl.save(dbo); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dic/FindDict.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dic/FindDict.groovy index b4df684d9..4c8188ae1 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dic/FindDict.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dic/FindDict.groovy @@ -26,7 +26,7 @@ public abstract class FindDict extends BaseBatch { public void dictProcess() { println "[${DateUtil.formatToTightYYYYMMDDhhmmss(new Date())}] loading dictionary from ${DIC_MONGO_DOMAIN}" def dicMap = getAllDictionary() - println "词典共:"+dicMap.size(); + println "璇嶅吀鍏憋細"+dicMap.size(); println "[${DateUtil.formatToTightYYYYMMDDhhmmss(new Date())}] loading new data" def newTokens = splitOrFilter(getNewTokens()) println "[${DateUtil.formatToTightYYYYMMDDhhmmss(new Date())}] loading data success" diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dic/FindDistrictDict.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dic/FindDistrictDict.groovy index c756be2c9..4e6048847 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dic/FindDistrictDict.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dic/FindDistrictDict.groovy @@ -35,13 +35,13 @@ class FindDistrictDict extends FindDict { if(buffer.size() > 200){ dictionary.remove(new BasicDBObject("_id", new BasicDBObject('$in', buffer))) buffer.clear() - println("移除过时词典:" + i) + println("绉婚櫎杩囨椂璇嶅吀:" + i) } } if(buffer.size() > 0){ dictionary.remove(new BasicDBObject("_id", new BasicDBObject('$in', buffer))) } - println("词典更新完成") + println("璇嶅吀鏇存柊瀹屾垚") } Set getNewTokens() { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dingyue/DingyueBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dingyue/DingyueBatch.groovy index 20c500014..2cdad7916 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dingyue/DingyueBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dingyue/DingyueBatch.groovy @@ -29,7 +29,7 @@ import com.mongodb.DBObject import com.mongodb.Mongo /** - * 订阅邮件定时任务 + * 璁㈤槄閭欢瀹氭椂浠诲姟 * @author yukai * */ @@ -84,24 +84,24 @@ class DingyueBatch extends BaseBatch{ evaluationCollection.update(query, new BasicDBObject('$set', data)) - // ftl显示用的数据 + // ftl鏄剧ず鐢ㄧ殑鏁版嵁 evaluation.m_date = new Date() evaluation.avg_price = ((int)(districtAvgPrice / 100)) * 100 evaluation.total_price = ((int)(newTotalPrice / 10000)) * 10000 renderEvaluationMail(evaluation, dingyue, districtAddressMap, fileName) - def subject = evaluation.district_name + ' ' + ((int)evaluation.area) + '平米估价报告【订阅】' + def subject = evaluation.district_name + ' ' + ((int)evaluation.area) + '骞崇背浼颁环鎶ュ憡銆愯闃呫��' sendEmail(dingyue.email, subject, fileName) // } else if (startTime.before(evaluation.m_date)) { // renderEvaluationMail(evaluation, dingyue, districtAddressMap, fileName) -// def subject = evaluation.district_name + ' ' + ((int)evaluation.area) + '平米估价报告【订阅】' +// def subject = evaluation.district_name + ' ' + ((int)evaluation.area) + '骞崇背浼颁环鎶ュ憡銆愯闃呫��' // sendEmail(dingyue.email, subject, fileName) // } } } /** - * 生成邮件HTML + * 鐢熸垚閭欢HTML */ private renderEvaluationMail(evaluation, dingyue, districtAddressMap, fileName) { def dataMap = [:] @@ -133,7 +133,7 @@ class DingyueBatch extends BaseBatch{ } /** - * 发送邮件 + * 鍙戦�侀偖浠� */ private sendEmail(email, subject, fileName) { StringBuffer content = new StringBuffer() @@ -151,7 +151,7 @@ class DingyueBatch extends BaseBatch{ } /** - * 获取小区地址 + * 鑾峰彇灏忓尯鍦板潃 */ private getDistrictAddress(city, region, districtName) { DBObject query = new BasicDBObject() @@ -168,7 +168,7 @@ class DingyueBatch extends BaseBatch{ } /** - * 获取城市url + * 鑾峰彇鍩庡競url */ private getCityUrl(city) { def cityCode = CityMap.findCity(city) @@ -180,7 +180,7 @@ class DingyueBatch extends BaseBatch{ } /** - * 获取估价规则map + * 鑾峰彇浼颁环瑙勫垯map * @return */ private getEvaluationRates() { @@ -193,7 +193,7 @@ class DingyueBatch extends BaseBatch{ } /** - * 获取本周小区均价map + * 鑾峰彇鏈懆灏忓尯鍧囦环map * @return */ private getDistrictStat() { @@ -205,7 +205,7 @@ class DingyueBatch extends BaseBatch{ } /** - * 获取小区均价 + * 鑾峰彇灏忓尯鍧囦环 * @param districtAvgPrice * @param evaluation * @return @@ -213,9 +213,9 @@ class DingyueBatch extends BaseBatch{ private getDistrictAvgPrice(districtAvgPriceMap, evaluation) { String key = evaluation.city + '-' + evaluation.region + '-' + evaluation.district_name + '-' if (StringUtils.contains(evaluation.build_type, DistrictKindEnum.bieshu.getValue())) { - key += '别墅' + key += '鍒' } else { - key += '小区' + key += '灏忓尯' } if (districtAvgPriceMap.containsKey(key)) { @@ -225,10 +225,10 @@ class DingyueBatch extends BaseBatch{ } /** - * 估价 - * @param districtAvgPrice 小区均价 - * @param evaluation 估价报告实体 - * @param evaluationRateList 股价规则 + * 浼颁环 + * @param districtAvgPrice 灏忓尯鍧囦环 + * @param evaluation 浼颁环鎶ュ憡瀹炰綋 + * @param evaluationRateList 鑲′环瑙勫垯 * @return */ private reEvaluation(districtAvgPrice, evaluation, evaluationRateMap) { @@ -237,10 +237,10 @@ class DingyueBatch extends BaseBatch{ } long evaluatePrice = (long) (districtAvgPrice * (null == evaluation.area ? 0 : evaluation.area)); - // 楼层系数 + // 妤煎眰绯绘暟 float houseFloorRate = 0; String houseFloorRateType = null; - if (!StringUtils.contains(evaluation.build_type, DistrictKindEnum.bieshu.getValue())) {// 不是别墅 + if (!StringUtils.contains(evaluation.build_type, DistrictKindEnum.bieshu.getValue())) {// 涓嶆槸鍒 if (null != evaluation.height && 0 != evaluation.height && null != evaluation.floor && 0 != evaluation.floor) { houseFloorRateType = getHouseFloorRateType(evaluation.height); @@ -248,49 +248,49 @@ class DingyueBatch extends BaseBatch{ (null != evaluation.floor ? evaluation.floor : 0)); } } - // 房型 - String roomHall = String.valueOf(evaluation.room) + "室" + String.valueOf(evaluation.hall) + "厅"; - float chamberRate = getEvaluationRate(evaluationRateMap, "房型", roomHall); - // 朝向系数 - float directionRate = getEvaluationRate(evaluationRateMap, "朝向", evaluation.direction); - // 小区位置系数 - float insideposRate = getEvaluationRate(evaluationRateMap, "小区位置", evaluation.insidepos); - // 景观情况系数 - float sightRate = getEvaluationRate(evaluationRateMap, "景观", evaluation.sight); - // 采光通风系数 - float lightingVentilationRate = getEvaluationRate(evaluationRateMap, "采光通风", evaluation.lighting_ventilation); - // 噪音影响系数 - float noiseRate = getEvaluationRate(evaluationRateMap, "噪音", evaluation.noise); - // 边套装置系数 - float sidesetRate = getEvaluationRate(evaluationRateMap, "边套", evaluation.sideset); - // 厌恶设施系数 - float worryFacilityRate = getEvaluationRate(evaluationRateMap, "厌恶设施", evaluation.worry_facility); - // 车位系数 - float carportRate = getEvaluationRate(evaluationRateMap, "车位", evaluation.carport); - // 装修系数 - float fitmentRate = getEvaluationRate(evaluationRateMap, "装修情况", evaluation.fitment); + // 鎴垮瀷 + String roomHall = String.valueOf(evaluation.room) + "瀹�" + String.valueOf(evaluation.hall) + "鍘�"; + float chamberRate = getEvaluationRate(evaluationRateMap, "鎴垮瀷", roomHall); + // 鏈濆悜绯绘暟 + float directionRate = getEvaluationRate(evaluationRateMap, "鏈濆悜", evaluation.direction); + // 灏忓尯浣嶇疆绯绘暟 + float insideposRate = getEvaluationRate(evaluationRateMap, "灏忓尯浣嶇疆", evaluation.insidepos); + // 鏅鎯呭喌绯绘暟 + float sightRate = getEvaluationRate(evaluationRateMap, "鏅", evaluation.sight); + // 閲囧厜閫氶绯绘暟 + float lightingVentilationRate = getEvaluationRate(evaluationRateMap, "閲囧厜閫氶", evaluation.lighting_ventilation); + // 鍣煶褰卞搷绯绘暟 + float noiseRate = getEvaluationRate(evaluationRateMap, "鍣煶", evaluation.noise); + // 杈瑰瑁呯疆绯绘暟 + float sidesetRate = getEvaluationRate(evaluationRateMap, "杈瑰", evaluation.sideset); + // 鍘屾伓璁炬柦绯绘暟 + float worryFacilityRate = getEvaluationRate(evaluationRateMap, "鍘屾伓璁炬柦", evaluation.worry_facility); + // 杞︿綅绯绘暟 + float carportRate = getEvaluationRate(evaluationRateMap, "杞︿綅", evaluation.carport); + // 瑁呬慨绯绘暟 + float fitmentRate = getEvaluationRate(evaluationRateMap, "瑁呬慨鎯呭喌", evaluation.fitment); - // 装修年限系数 + // 瑁呬慨骞撮檺绯绘暟 String fitment = ""; if (null != evaluation.fitment_age) { if (evaluation.fitment_age <= 3) { - fitment = "装修年限为" + evaluation.fitment_age + "年"; + fitment = "瑁呬慨骞撮檺涓�" + evaluation.fitment_age + "骞�"; } else if (4 == evaluation.fitment_age) { - fitment = "装修年限" + evaluation.fitment_age + "年"; + fitment = "瑁呬慨骞撮檺" + evaluation.fitment_age + "骞�"; } else { - fitment = "装修年限4年以上"; + fitment = "瑁呬慨骞撮檺4骞翠互涓�"; } } - float fitmentAgeRate = getEvaluationRate(evaluationRateMap, "装修年限", fitment); + float fitmentAgeRate = getEvaluationRate(evaluationRateMap, "瑁呬慨骞撮檺", fitment); - // 赠送花园面积因素系数 - float gardenAreaRate = getEvaluationRate(evaluationRateMap, "赠送面积因素", "花园"); - // 赠送地下车库面积因素系数 - float basementArea = getEvaluationRate(evaluationRateMap, "赠送面积因素", "地下室"); - // 最后根据这些系数计算估价值 + // 璧犻�佽姳鍥潰绉洜绱犵郴鏁� + float gardenAreaRate = getEvaluationRate(evaluationRateMap, "璧犻�侀潰绉洜绱�", "鑺卞洯"); + // 璧犻�佸湴涓嬭溅搴撻潰绉洜绱犵郴鏁� + float basementArea = getEvaluationRate(evaluationRateMap, "璧犻�侀潰绉洜绱�", "鍦颁笅瀹�"); + // 鏈�鍚庢牴鎹繖浜涚郴鏁拌绠椾及浠峰�� if (houseFloorRateType != null) { - if (houseFloorRateType.equals("多层") || houseFloorRateType.equals("小高层") || houseFloorRateType.equals("高层")) { + if (houseFloorRateType.equals("澶氬眰") || houseFloorRateType.equals("灏忛珮灞�") || houseFloorRateType.equals("楂樺眰")) { evaluatePrice = (long) (evaluatePrice * houseFloorRate); } else { if (null != evaluation.floor && null != evaluation.height && evaluation.height > 0) { @@ -337,10 +337,10 @@ class DingyueBatch extends BaseBatch{ if (null != evaluation.fitment_age && evaluation.fitment_age > 0 && null != evaluation.fitment_charge && evaluation.fitment_charge > 0) { - // 输入了装修年限和装修价格 + // 杈撳叆浜嗚淇勾闄愬拰瑁呬慨浠锋牸 evaluatePrice = (long) (evaluatePrice + evaluation.fitment_charge * fitmentAgeRate); } else { - // 根据装修情况进行价格计算 + // 鏍规嵁瑁呬慨鎯呭喌杩涜浠锋牸璁$畻 if (fitmentRate > 0) { evaluatePrice = (long) (evaluatePrice * fitmentRate); } @@ -358,7 +358,7 @@ class DingyueBatch extends BaseBatch{ } /** - * 得到估价系数,先从小区修改的估价系数表中查找,有则使用,无则使用估价系数表中的记录 + * 寰楀埌浼颁环绯绘暟锛屽厛浠庡皬鍖轰慨鏀圭殑浼颁环绯绘暟琛ㄤ腑鏌ユ壘锛屾湁鍒欎娇鐢紝鏃犲垯浣跨敤浼颁环绯绘暟琛ㄤ腑鐨勮褰� * * @return */ @@ -371,35 +371,35 @@ class DingyueBatch extends BaseBatch{ } /** - * 根据总楼层得到楼层系数类型 多层:[1..7] 小高层:[1..15] + * 鏍规嵁鎬绘ゼ灞傚緱鍒版ゼ灞傜郴鏁扮被鍨� 澶氬眰:[1..7] 灏忛珮灞�:[1..15] * * @param houseHight * @return */ private String getHouseFloorRateType(int houseHight) { if (houseHight <= 7) { - return "多层"; + return "澶氬眰"; } else if (houseHight > 7 && houseHight <= 15) { - return "小高层"; + return "灏忛珮灞�"; } else if (houseHight > 15 && houseHight <= 32) { - return "高层"; + return "楂樺眰"; } else { - return "高层一"; + return "楂樺眰涓�"; } } /** - * 根据当前楼层和总楼层得到楼层系数 + * 鏍规嵁褰撳墠妤煎眰鍜屾�绘ゼ灞傚緱鍒版ゼ灞傜郴鏁� * * @param evaluationRateTable * @return */ private float getFloorRate(Map evaluationRateMap, String floorRateType, Integer houseFloor) { - // 得到楼层系数 - if (floorRateType.equals("多层") || floorRateType.equals("小高层") || floorRateType.equals("高层")) { - return getEvaluationRate(evaluationRateMap, floorRateType, "第" + houseFloor + "层"); + // 寰楀埌妤煎眰绯绘暟 + if (floorRateType.equals("澶氬眰") || floorRateType.equals("灏忛珮灞�") || floorRateType.equals("楂樺眰")) { + return getEvaluationRate(evaluationRateMap, floorRateType, "绗�" + houseFloor + "灞�"); } else { - return getEvaluationRate(evaluationRateMap, floorRateType, "第" + 1 + "层"); + return getEvaluationRate(evaluationRateMap, floorRateType, "绗�" + 1 + "灞�"); } } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dingyue/FreemarkerRender.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dingyue/FreemarkerRender.groovy index 10bfe5e0a..588b1d384 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dingyue/FreemarkerRender.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dingyue/FreemarkerRender.groovy @@ -12,11 +12,11 @@ class FreemarkerRender { } /** - * 生成静态文件 + * 鐢熸垚闈欐�佹枃浠� * - * @param templateFileName 模板文件名,相对templates路径,例如"/evaluation_mail.ftl" - * @param propMap 用于处理模板的属性Object映射 - * @param htmlFileName 要生成的文件名,全路径 + * @param templateFileName 妯℃澘鏂囦欢鍚�,鐩稿templates璺緞,渚嬪"/evaluation_mail.ftl" + * @param propMap 鐢ㄤ簬澶勭悊妯℃澘鐨勫睘鎬bject鏄犲皠 + * @param htmlFileName 瑕佺敓鎴愮殑鏂囦欢鍚�,鍏ㄨ矾寰� */ public renderHtml(templateFileName, propMap, htmlFileName) { try { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/AddressStandardBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/AddressStandardBatch.groovy index 0a706e8bf..c51f31b6c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/AddressStandardBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/AddressStandardBatch.groovy @@ -18,22 +18,22 @@ import com.mongodb.DBObject @BatchOwner(Watcher.DuXiaoYu) class AddressStandardBatch extends BaseBatch { - private static String REG_NUMBER = "[一二三四五六七八九十百千\\d]+"; + private static String REG_NUMBER = "[涓�浜屼笁鍥涗簲鍏竷鍏節鍗佺櫨鍗僜\d]+"; - private static String REG_UNIT = "[号|弄|支弄]+"; + private static String REG_UNIT = "[鍙穦寮剕鏀紕]+"; - private static String REG_ADDR1 = "[\u4e00-\u9fa5]{2,15}[路|巷|街|弄|街道|大道|大街|巷子|公路|马路]+"; + private static String REG_ADDR1 = "[\u4e00-\u9fa5]{2,15}[璺瘄宸穦琛梶寮剕琛楅亾|澶ч亾|澶ц|宸峰瓙|鍏矾|椹矾]+"; - private static String REG_ADDR2 = "[\u4e00-\u9fa5]{2,15}[直走|前方|后面|前面|向左|向右|左|右|向东|向南|向西|向北|以东|以南|以西|以北|向东北|向西北|向东南|向西南|南侧|北侧|东侧|西侧][一二三四五六七八九十百千\\d][米|千米|公里]+"; + private static String REG_ADDR2 = "[\u4e00-\u9fa5]{2,15}[鐩磋蛋|鍓嶆柟|鍚庨潰|鍓嶉潰|鍚戝乏|鍚戝彸|宸鍙硘鍚戜笢|鍚戝崡|鍚戣タ|鍚戝寳|浠ヤ笢|浠ュ崡|浠ヨタ|浠ュ寳|鍚戜笢鍖梶鍚戣タ鍖梶鍚戜笢鍗梶鍚戣タ鍗梶鍗椾晶|鍖椾晶|涓滀晶|瑗夸晶][涓�浜屼笁鍥涗簲鍏竷鍏節鍗佺櫨鍗僜\d][绫硘鍗冪背|鍏噷]+"; - private static String REG_ADDR3 = "[\u4e00-\u9fa5]{2,15}[交叉口|交汇处|交汇|交口|交界处|交界|交界口|对面|后面|前面|附近|旁边|之间|中间|东侧|西侧|南侧|北侧]+\$"; + private static String REG_ADDR3 = "[\u4e00-\u9fa5]{2,15}[浜ゅ弶鍙浜ゆ眹澶剕浜ゆ眹|浜ゅ彛|浜ょ晫澶剕浜ょ晫|浜ょ晫鍙瀵归潰|鍚庨潰|鍓嶉潰|闄勮繎|鏃佽竟|涔嬮棿|涓棿|涓滀晶|瑗夸晶|鍗椾晶|鍖椾晶]+\$"; private static DSCollection SEAWEED_COLL = new DataStore("seaweed.db.fangjia.com", 27007).getCollection("fangjia.seaweed"); public static def ADDR_PATT_MAP = [:] static { ADDR_PATT_MAP.put(100, Pattern.compile(REG_ADDR1 + REG_NUMBER + REG_UNIT)); - ADDR_PATT_MAP.put(85, Pattern.compile(REG_ADDR1 + REG_NUMBER + "(" +REG_UNIT + ")?" + "[~|-|--|至]" + REG_NUMBER + "(" +REG_UNIT + ")?")); + ADDR_PATT_MAP.put(85, Pattern.compile(REG_ADDR1 + REG_NUMBER + "(" +REG_UNIT + ")?" + "[~|-|--|鑷砞" + REG_NUMBER + "(" +REG_UNIT + ")?")); ADDR_PATT_MAP.put(80, Pattern.compile("[\u4e00-\u9fa5]{2,6}" + REG_NUMBER + REG_UNIT)); ADDR_PATT_MAP.put(75, Pattern.compile(REG_ADDR1 + "\\d+")); ADDR_PATT_MAP.put(65, Pattern.compile(REG_ADDR2)); @@ -46,7 +46,7 @@ class AddressStandardBatch extends BaseBatch { @Override public void process(Object args) { - def cities = ['北京']//getAllCities() + def cities = ['鍖椾含']//getAllCities() for(String category : ["district"]) { for(String city : cities) { processMain(city, category) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/BankUniversityMatchBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/BankUniversityMatchBatch.groovy index 388beaa97..6617acdcd 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/BankUniversityMatchBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/BankUniversityMatchBatch.groovy @@ -10,7 +10,7 @@ import com.mongodb.DBObject import com.mongodb.Mongo /** - * 大学、银行处理 + * 澶у銆侀摱琛屽鐞� * @author yukai * */ @@ -25,11 +25,11 @@ class BankUniversityMatchBatch extends BaseBatch { public void process(Object args) { DBObject q = new BasicDBObject(); - q.put("city", "上海"); - q.put("region", "青浦"); - q.put("district_name", "启航城"); + q.put("city", "涓婃捣"); + q.put("region", "闈掓郸"); + q.put("district_name", "鍚埅鍩�"); MONGO.find(q).each { line -> - // 处理银行 + // 澶勭悊閾惰 def formatedBank = []; if (line.bank && line.bank.size() > 0) { formatedBank = formatBank(line.bank); @@ -43,7 +43,7 @@ class BankUniversityMatchBatch extends BaseBatch { MONGO.update(bq, new BasicDBObject('$set', new BasicDBObject('bank', formatedBank))); } - // 处理大学 + // 澶勭悊澶у def formatedUniversity = []; if (line.university && line.university.size() > 0) { formatedUniversity = formatUniversity(line.university); @@ -83,7 +83,7 @@ class BankUniversityMatchBatch extends BaseBatch { private formatUniversity(universitys) { List retB = new ArrayList(); for (def u : universitys) { - if (u.indexOf("公司") > 0) { + if (u.indexOf("鍏徃") > 0) { continue; } @@ -110,7 +110,7 @@ class BankUniversityMatchBatch extends BaseBatch { } def dd = getFormatBankName(b); - if (dd.indexOf('分行') >= 0 || dd.indexOf('支行') >= 0 || dd.indexOf('总行') >= 0 || dd.indexOf('有限公司') >= 0) { + if (dd.indexOf('鍒嗚') >= 0 || dd.indexOf('鏀') >= 0 || dd.indexOf('鎬昏') >= 0 || dd.indexOf('鏈夐檺鍏徃') >= 0) { continue; } retB.add(dd); @@ -124,15 +124,15 @@ class BankUniversityMatchBatch extends BaseBatch { return false; } - if (bank.indexOf('典当') >= 0 || bank.indexOf('专卖店') >= 0 || bank.indexOf('拍卖行') >= 0 || bank.indexOf('证券') >= 0 || bank.indexOf('财务') >= 0) { + if (bank.indexOf('鍏稿綋') >= 0 || bank.indexOf('涓撳崠搴�') >= 0 || bank.indexOf('鎷嶅崠琛�') >= 0 || bank.indexOf('璇佸埜') >= 0 || bank.indexOf('璐㈠姟') >= 0) { return false; } - if (bank.indexOf('信用社') >= 0 || bank.indexOf('邮政储蓄') >= 0 || bank.indexOf('农村信用合作社') >= 0 || bank.indexOf('农村信用合作联社') >= 0) { + if (bank.indexOf('淇$敤绀�') >= 0 || bank.indexOf('閭斂鍌ㄨ搫') >= 0 || bank.indexOf('鍐滄潙淇$敤鍚堜綔绀�') >= 0 || bank.indexOf('鍐滄潙淇$敤鍚堜綔鑱旂ぞ') >= 0) { return true; } - if (bank.indexOf('行') == -1) { + if (bank.indexOf('琛�') == -1) { return false; } @@ -156,246 +156,246 @@ class BankUniversityMatchBatch extends BaseBatch { } - def final static ALL_BANKS = ['国家开发银行', '中国进出口银行', '中国农业发展银行', '中国工商银行', '中国农业银行', '中国银行', '中国建设银行', '交通银行', '中信银行', '中国光大银行', - '华夏银行', '广发银行', '平安银行', '招商银行', '上海浦东发展银行', '兴业银行', '民生银行', '恒丰银行', '浙商银行', '渤海银行', - '中国邮政储蓄银行', '北京银行', '天津银行', '沧州银行', '承德银行', '廊坊银行', '秦皇岛商行', '河北银行', '唐山商行', '张家口商行', - '邢台商行', '保定商行', '邯郸商行', '大同商行', '晋商银行', '长治商行', '晋城商行', '晋中商行', '阳泉商行', '包商银行', - '鄂尔多斯银行', '内蒙古银行', '乌海银行', '盛京银行', '鞍山商行', '抚顺商行', '丹东商行', '锦州银行', '营口银行', '阜新银行', - '辽阳银行', '铁岭商行', '朝阳银行', '葫芦岛银行', '吉林银行', '哈尔滨银行', '龙江银行', '上海银行', '江苏银行', '南京银行', - '杭州银行', '湖州银行', '嘉兴银行', '宁波银行', '绍兴银行', '台州商行', '温州银行', '民泰商行', '泰隆商行', '徽商银行', - '福建海峡银行', '泉州银行', '赣州商行', '九江银行', '南昌银行', '上饶银行', '稠州商行', '齐鲁银行', '齐商银行', '枣庄市商业银行', - '东营市商业银行', '潍坊银行', '济宁银行', '泰山市商业银行', '威海市商业银行', '日照银行', '莱商银行', '临商银行', '德州银行', '烟台银行', - '山东省城市商业银行合作联盟有限公司', '洛阳银行', '郑州银行', '开封市商业银行', '南阳市商业银行', '三门峡市商业银行', '信阳银行', '驻马店银行', '焦作市商业银行', '新乡银行', - '湖北银行', '汉口银行', '广州银行', '东莞银行', '广东南粤银行', '广东华兴银行', - '珠海华润银行', '广西北部湾银行', '柳州银行', '桂林银行', '重庆银行', '重庆三峡银行', '成都银行', '自贡市商业银行', '攀枝花市商业银行', '泸州市商业银行', - '德阳银行', '绵阳市商业银行', '乐山市商业银行', '南充市商业银行', '宜宾市商业银行', '凉山州商业银行', '遂宁市商业银行', '雅安市商业银行', '达州市商业银行', '贵阳商行', - '遵义商行', '富滇银行', '曲靖市商业银行', '玉溪市商业银行', '兰州银行', '青海银行股份有限公司', '宁夏银行', '昆仑银行股份有限公司', '乌鲁木齐商行', '大连银行', - '厦门银行', '北京农村商业银行股份有限公司', '天津农村商业银行', '天津滨海农村商业银行', '沧州融信农村商业银行股份有限公司', '鄂尔多斯市东胜农村商业银行股份有限公司', '吉林九台农村商业银行股份有限公司', '长春农村商业银行股份有限公司', '上海农商行', '无锡农村商业银行', - '江阴农村商业银行', '常熟农村商业银行', '张家港农村商业银行', '吴江农村商业银行', '苏州银行', '昆山农村商业银行', '太仓农村商业银行', '江苏射阳农村商业银行', '靖江农村商业银行', '赣榆农村商业银行', - '江南农村商业银行', '安徽马鞍山农村商业银行', '芜湖扬子农村商业银行', '合肥科技农村商业银行', '池州九华农村商业银行', '安庆独秀农村商业银行', '安徽肥西农村商业银行', '宣城皖南农村商业银行', '淮南淮河农村商业银行', '安徽无为农村商业银行', - '滁州皖东农村商业银行', '安徽歙县农村商业银行', '淮北农村商业银行', '阜阳颍东农村商业银行', '安徽南陵农村商业银行', '安徽泾县农村商业银行', '安徽旌德农村商业银行', '安徽潜山农村商业银行', '安徽石台农村商业银行', '安徽望江农村商业银行', - '安徽太湖农村商业银行', '铜陵皖江农村商业银行', '南昌洪都农村商业银行股份有限公司', '武汉农村商业银行', '广州农村商业银行股份有限公司', '佛山顺德农村商业银行股份有限公司', '东莞农村商业银行股份有限公司', '广东河源农村商业银行股份有限公司', '肇庆端州农村商业银行股份有限公司', '广东阳东农村商业银行股份有限公司', - '广东揭阳农村商业银行股份有限公司', '广东揭西农村商业银行股份有限公司', '广西资源农村商业银行股份有限公司', '广西田东农村商业银行股份有限公司', '广西融安农村商业银行股份有限公司', '广西蒙山农村商业银行股份有限公司', '广西田阳农村商业银行股份有限公司', '广西恭城农村商业银行股份有限公司', '广西龙胜农村商业银行股份有限公司', '广西灌阳农村商业银行股份有限公司', - '广西昭平农村商业银行股份有限公司', '广西凌云农村商业银行股份有限公司', '重庆农村商业银行', '成都农商银行', '宁夏黄河农村商业银行股份有限公司', '深圳农村商业银行股份有限公司', '安徽霍山农村合作银行', '安徽青阳农村合作银行', '铜陵铜都农村合作银行', '安徽绩溪农村合作银行', - '安徽舒城农村合作银行', '安徽天长农村合作银行', '安徽黟县农村合作银行', '安徽怀远农村合作银行', '安徽桐城农村合作银行', '安徽广德农村合作银行', '安徽休宁农村合作银行', '安徽长丰农村合作银行', '安徽肥东农村合作银行', '安徽泗县农村合作银行', - '淮南通商农村合作银行', '安徽东至农村合作银行', '安徽繁昌农村合作银行', '安徽叶集农村合作银行', '芜湖津盛农村合作银行', '安徽岳西农村合作银行', '安徽宿松农村合作银行', '黄山屯溪农村合作银行', '安徽怀宁农村合作银行', '黄山太平农村合作银行', - '黄山徽州农村合作银行', '安徽宁国农村合作银行', '安徽郎溪农村合作银行', '安徽和县农村合作银行', '毫州药都农村合作银行', '安徽明光农村合作银行', '安徽全椒农村合作银行', '河北省农村信用社联合社', '辽宁省农村信用社联合社', '蚌埠市区联社', - '枞阳县联社', '涡阳县联社', '蒙城县联社', '利辛县联社', '阜阳市颍泉区联社', '临泉县联社', '庐江县联社', '巢湖市居巢区联社', '六安市郊区联社', '寿县联社', - '金寨县联社', '濉溪县联社', '宿州市区联社', '含山县联社', '凤台县联社', '安徽省农村信用社联合社', '福建省农信联社(福建农信网)', '山东省农村信用社联合社', '湖北省农村信用社', '广东农村信用社', - '广西壮族自治区农村信用联社', '四川省农村信用联社', '云南省农村信用社联社', '厦门市农村信用合作联社', '崇明长江村镇银行', '奉贤浦发村镇银行', '松江民生村镇银行', '浦东江南村镇银行', '浦东建信村镇银行', '闵行上银村镇银行', - '嘉定民生村镇银行', '安徽长丰科源村镇银行', '安徽凤阳利民村镇银行', '安徽桐城江淮村镇银行', '安徽当涂新华村镇银行', '安徽繁昌建信村镇银行', '安徽黄山金桥村镇银行', '安徽舒城正兴村镇银行', '安徽裕安盛平村镇银行', '安徽肥西石银村镇银行', - '安徽绩溪农银村镇银行', '安徽无为徽银村镇银行', '安徽铜陵铜源村镇银行', '安徽泾县铜源村镇银行', '安徽郎溪新华村镇银行', '淮南凤台通商村镇银行', '安徽庐江惠民村镇银行', '安徽含山惠民村镇银行', '安徽肥东湖星村镇银行', '安徽枞阳泰业村镇银行', - '安徽休宁大地村镇银行', '安徽青阳九华村镇银行', '安徽和县新华村镇银行', '安徽定远民丰村镇银行', '安徽潜山江淮村镇银行', '安徽歙县嘉银村镇银行', '安徽望江新华村镇银行', '安徽宿松民丰村镇银行', '安徽五河永泰村镇银行', '安徽宿州淮海村镇银行', - '安徽明光民丰村镇银行', '安徽全椒中银富登村镇银行', '安徽来安中银富登村镇银行', '太湖县小池银燕农村资金互助社', '珠海横琴村镇银行', '始兴大众村镇银行', '东源泰业村镇银行', '中山小榄村镇银行', '广东恩平汇丰村镇银行', '惠州仲恺东盈村镇银行', - '广东澄海潮商村镇银行', '东莞长安村镇银行', '佛山高明顺银村镇银行', '三水珠江村镇银行', '广州番禺新华村镇银行', '德庆华润村镇银行', '梅县客家村镇银行', '鹤山珠江村镇银行', '中山东凤珠江村镇银行', '广州增城长江村镇银行', - '广西融水元宝山村镇银行股份有限公司', '广西柳江柳银村镇银行股份有限公司', '广西鱼峰信合村镇银行有限责任公司', '广西兴安民兴村镇银行股份有限公司', '桂林国民村镇银行有限责任公司', '灵川深通村镇银行有限责任公司', '广西藤县桂银村镇银行股份有限公司', '岑溪市北部湾村镇银行有限责任公司', '合浦国民村镇银行有限责任公司', '东兴国民村镇银行有限责任公司', - '灵山泰业村镇银行股份有限公司', '广西平南桂银村镇银行股份有限公司', '广西桂平桂银村镇银行股份有限公司', '广西容县桂银村镇银行股份有限公司', '广西北流柳银村镇银行股份有限公司', '广西兴业柳银村镇银行股份有限公司', '广西博白柳银村镇银行股份有限公司', '广西陆川柳银村镇银行股份有限公司', '平果国民村镇银行有限责任公司', '田东北部湾村镇银行有限责任公司', - '田阳兴阳村镇银行有限责任公司', '宜州深通村镇银行有限责任公司', '扶绥深通村镇银行有限责任公司', '汇丰银行', '东亚银行', '花旗银行', '渣打银行', '瑞穗实业银行', '三井住友银行', '恒生银行', - '星展银行', '永亨银行', '三菱东京日联银行', '荷兰银行', '华侨银行', '摩根士丹利国际银行', '摩根大通银行', '友利银行', '大华中国', '南洋商业银行', - '大华银行', '韩亚银行', '企业银行', '德意志银行', '协和银行', '宁波国际银行', '华美银行', '华商银行', '华一银行', '法国巴黎银行', - '法国兴业银行', '东方汇理银行', '厦门国际银行', '中信嘉华银行', '新韩银行', '大新银行', '外换银行', '盘谷银行', '首都银行', '正信银行有限公司', '华一银行', - '正信银行', '摩根士丹利国际银行', '厦门国际银行', '上海农村商业银行', '上海农商银行', '北京农商银行', '北京市商业银行', '广州市商业银行', '中国信合']; + def final static ALL_BANKS = ['鍥藉寮�鍙戦摱琛�', '涓浗杩涘嚭鍙i摱琛�', '涓浗鍐滀笟鍙戝睍閾惰', '涓浗宸ュ晢閾惰', '涓浗鍐滀笟閾惰', '涓浗閾惰', '涓浗寤鸿閾惰', '浜ら�氶摱琛�', '涓俊閾惰', '涓浗鍏夊ぇ閾惰', + '鍗庡閾惰', '骞垮彂閾惰', '骞冲畨閾惰', '鎷涘晢閾惰', '涓婃捣娴︿笢鍙戝睍閾惰', '鍏翠笟閾惰', '姘戠敓閾惰', '鎭掍赴閾惰', '娴欏晢閾惰', '娓ゆ捣閾惰', + '涓浗閭斂鍌ㄨ搫閾惰', '鍖椾含閾惰', '澶╂触閾惰', '娌у窞閾惰', '鎵垮痉閾惰', '寤婂潑閾惰', '绉︾殗宀涘晢琛�', '娌冲寳閾惰', '鍞愬北鍟嗚', '寮犲鍙e晢琛�', + '閭㈠彴鍟嗚', '淇濆畾鍟嗚', '閭兏鍟嗚', '澶у悓鍟嗚', '鏅嬪晢閾惰', '闀挎不鍟嗚', '鏅嬪煄鍟嗚', '鏅嬩腑鍟嗚', '闃虫硥鍟嗚', '鍖呭晢閾惰', + '閯傚皵澶氭柉閾惰', '鍐呰挋鍙ら摱琛�', '涔屾捣閾惰', '鐩涗含閾惰', '闉嶅北鍟嗚', '鎶氶『鍟嗚', '涓逛笢鍟嗚', '閿﹀窞閾惰', '钀ュ彛閾惰', '闃滄柊閾惰', + '杈介槼閾惰', '閾佸箔鍟嗚', '鏈濋槼閾惰', '钁姦宀涢摱琛�', '鍚夋灄閾惰', '鍝堝皵婊ㄩ摱琛�', '榫欐睙閾惰', '涓婃捣閾惰', '姹熻嫃閾惰', '鍗椾含閾惰', + '鏉窞閾惰', '婀栧窞閾惰', '鍢夊叴閾惰', '瀹佹尝閾惰', '缁嶅叴閾惰', '鍙板窞鍟嗚', '娓╁窞閾惰', '姘戞嘲鍟嗚', '娉伴殕鍟嗚', '寰藉晢閾惰', + '绂忓缓娴峰场閾惰', '娉夊窞閾惰', '璧e窞鍟嗚', '涔濇睙閾惰', '鍗楁槍閾惰', '涓婇ザ閾惰', '绋犲窞鍟嗚', '榻愰瞾閾惰', '榻愬晢閾惰', '鏋e簞甯傚晢涓氶摱琛�', + '涓滆惀甯傚晢涓氶摱琛�', '娼嶅潑閾惰', '娴庡畞閾惰', '娉板北甯傚晢涓氶摱琛�', '濞佹捣甯傚晢涓氶摱琛�', '鏃ョ収閾惰', '鑾卞晢閾惰', '涓村晢閾惰', '寰峰窞閾惰', '鐑熷彴閾惰', + '灞变笢鐪佸煄甯傚晢涓氶摱琛屽悎浣滆仈鐩熸湁闄愬叕鍙�', '娲涢槼閾惰', '閮戝窞閾惰', '寮�灏佸競鍟嗕笟閾惰', '鍗楅槼甯傚晢涓氶摱琛�', '涓夐棬宄″競鍟嗕笟閾惰', '淇¢槼閾惰', '椹婚┈搴楅摱琛�', '鐒︿綔甯傚晢涓氶摱琛�', '鏂颁埂閾惰', + '婀栧寳閾惰', '姹夊彛閾惰', '骞垮窞閾惰', '涓滆帪閾惰', '骞夸笢鍗楃菠閾惰', '骞夸笢鍗庡叴閾惰', + '鐝犳捣鍗庢鼎閾惰', '骞胯タ鍖楅儴婀鹃摱琛�', '鏌冲窞閾惰', '妗傛灄閾惰', '閲嶅簡閾惰', '閲嶅簡涓夊场閾惰', '鎴愰兘閾惰', '鑷础甯傚晢涓氶摱琛�', '鏀�鏋濊姳甯傚晢涓氶摱琛�', '娉稿窞甯傚晢涓氶摱琛�', + '寰烽槼閾惰', '缁甸槼甯傚晢涓氶摱琛�', '涔愬北甯傚晢涓氶摱琛�', '鍗楀厖甯傚晢涓氶摱琛�', '瀹滃甯傚晢涓氶摱琛�', '鍑夊北宸炲晢涓氶摱琛�', '閬傚畞甯傚晢涓氶摱琛�', '闆呭畨甯傚晢涓氶摱琛�', '杈惧窞甯傚晢涓氶摱琛�', '璐甸槼鍟嗚', + '閬典箟鍟嗚', '瀵屾粐閾惰', '鏇查潠甯傚晢涓氶摱琛�', '鐜夋邯甯傚晢涓氶摱琛�', '鍏板窞閾惰', '闈掓捣閾惰鑲′唤鏈夐檺鍏徃', '瀹佸閾惰', '鏄嗕粦閾惰鑲′唤鏈夐檺鍏徃', '涔岄瞾鏈ㄩ綈鍟嗚', '澶ц繛閾惰', + '鍘﹂棬閾惰', '鍖椾含鍐滄潙鍟嗕笟閾惰鑲′唤鏈夐檺鍏徃', '澶╂触鍐滄潙鍟嗕笟閾惰', '澶╂触婊ㄦ捣鍐滄潙鍟嗕笟閾惰', '娌у窞铻嶄俊鍐滄潙鍟嗕笟閾惰鑲′唤鏈夐檺鍏徃', '閯傚皵澶氭柉甯備笢鑳滃啘鏉戝晢涓氶摱琛岃偂浠芥湁闄愬叕鍙�', '鍚夋灄涔濆彴鍐滄潙鍟嗕笟閾惰鑲′唤鏈夐檺鍏徃', '闀挎槬鍐滄潙鍟嗕笟閾惰鑲′唤鏈夐檺鍏徃', '涓婃捣鍐滃晢琛�', '鏃犻敗鍐滄潙鍟嗕笟閾惰', + '姹熼槾鍐滄潙鍟嗕笟閾惰', '甯哥啛鍐滄潙鍟嗕笟閾惰', '寮犲娓啘鏉戝晢涓氶摱琛�', '鍚存睙鍐滄潙鍟嗕笟閾惰', '鑻忓窞閾惰', '鏄嗗北鍐滄潙鍟嗕笟閾惰', '澶粨鍐滄潙鍟嗕笟閾惰', '姹熻嫃灏勯槼鍐滄潙鍟嗕笟閾惰', '闈栨睙鍐滄潙鍟嗕笟閾惰', '璧f鍐滄潙鍟嗕笟閾惰', + '姹熷崡鍐滄潙鍟嗕笟閾惰', '瀹夊窘椹瀺灞卞啘鏉戝晢涓氶摱琛�', '鑺滄箹鎵瓙鍐滄潙鍟嗕笟閾惰', '鍚堣偉绉戞妧鍐滄潙鍟嗕笟閾惰', '姹犲窞涔濆崕鍐滄潙鍟嗕笟閾惰', '瀹夊簡鐙鍐滄潙鍟嗕笟閾惰', '瀹夊窘鑲ヨタ鍐滄潙鍟嗕笟閾惰', '瀹e煄鐨栧崡鍐滄潙鍟嗕笟閾惰', '娣崡娣渤鍐滄潙鍟嗕笟閾惰', '瀹夊窘鏃犱负鍐滄潙鍟嗕笟閾惰', + '婊佸窞鐨栦笢鍐滄潙鍟嗕笟閾惰', '瀹夊窘姝欏幙鍐滄潙鍟嗕笟閾惰', '娣寳鍐滄潙鍟嗕笟閾惰', '闃滈槼棰嶄笢鍐滄潙鍟嗕笟閾惰', '瀹夊窘鍗楅櫟鍐滄潙鍟嗕笟閾惰', '瀹夊窘娉惧幙鍐滄潙鍟嗕笟閾惰', '瀹夊窘鏃屽痉鍐滄潙鍟嗕笟閾惰', '瀹夊窘娼滃北鍐滄潙鍟嗕笟閾惰', '瀹夊窘鐭冲彴鍐滄潙鍟嗕笟閾惰', '瀹夊窘鏈涙睙鍐滄潙鍟嗕笟閾惰', + '瀹夊窘澶箹鍐滄潙鍟嗕笟閾惰', '閾滈櫟鐨栨睙鍐滄潙鍟嗕笟閾惰', '鍗楁槍娲兘鍐滄潙鍟嗕笟閾惰鑲′唤鏈夐檺鍏徃', '姝︽眽鍐滄潙鍟嗕笟閾惰', '骞垮窞鍐滄潙鍟嗕笟閾惰鑲′唤鏈夐檺鍏徃', '浣涘北椤哄痉鍐滄潙鍟嗕笟閾惰鑲′唤鏈夐檺鍏徃', '涓滆帪鍐滄潙鍟嗕笟閾惰鑲′唤鏈夐檺鍏徃', '骞夸笢娌虫簮鍐滄潙鍟嗕笟閾惰鑲′唤鏈夐檺鍏徃', '鑲囧簡绔窞鍐滄潙鍟嗕笟閾惰鑲′唤鏈夐檺鍏徃', '骞夸笢闃充笢鍐滄潙鍟嗕笟閾惰鑲′唤鏈夐檺鍏徃', + '骞夸笢鎻槼鍐滄潙鍟嗕笟閾惰鑲′唤鏈夐檺鍏徃', '骞夸笢鎻タ鍐滄潙鍟嗕笟閾惰鑲′唤鏈夐檺鍏徃', '骞胯タ璧勬簮鍐滄潙鍟嗕笟閾惰鑲′唤鏈夐檺鍏徃', '骞胯タ鐢颁笢鍐滄潙鍟嗕笟閾惰鑲′唤鏈夐檺鍏徃', '骞胯タ铻嶅畨鍐滄潙鍟嗕笟閾惰鑲′唤鏈夐檺鍏徃', '骞胯タ钂欏北鍐滄潙鍟嗕笟閾惰鑲′唤鏈夐檺鍏徃', '骞胯タ鐢伴槼鍐滄潙鍟嗕笟閾惰鑲′唤鏈夐檺鍏徃', '骞胯タ鎭煄鍐滄潙鍟嗕笟閾惰鑲′唤鏈夐檺鍏徃', '骞胯タ榫欒儨鍐滄潙鍟嗕笟閾惰鑲′唤鏈夐檺鍏徃', '骞胯タ鐏岄槼鍐滄潙鍟嗕笟閾惰鑲′唤鏈夐檺鍏徃', + '骞胯タ鏄钩鍐滄潙鍟嗕笟閾惰鑲′唤鏈夐檺鍏徃', '骞胯タ鍑屼簯鍐滄潙鍟嗕笟閾惰鑲′唤鏈夐檺鍏徃', '閲嶅簡鍐滄潙鍟嗕笟閾惰', '鎴愰兘鍐滃晢閾惰', '瀹佸榛勬渤鍐滄潙鍟嗕笟閾惰鑲′唤鏈夐檺鍏徃', '娣卞湷鍐滄潙鍟嗕笟閾惰鑲′唤鏈夐檺鍏徃', '瀹夊窘闇嶅北鍐滄潙鍚堜綔閾惰', '瀹夊窘闈掗槼鍐滄潙鍚堜綔閾惰', '閾滈櫟閾滈兘鍐滄潙鍚堜綔閾惰', '瀹夊窘缁╂邯鍐滄潙鍚堜綔閾惰', + '瀹夊窘鑸掑煄鍐滄潙鍚堜綔閾惰', '瀹夊窘澶╅暱鍐滄潙鍚堜綔閾惰', '瀹夊窘榛熷幙鍐滄潙鍚堜綔閾惰', '瀹夊窘鎬�杩滃啘鏉戝悎浣滈摱琛�', '瀹夊窘妗愬煄鍐滄潙鍚堜綔閾惰', '瀹夊窘骞垮痉鍐滄潙鍚堜綔閾惰', '瀹夊窘浼戝畞鍐滄潙鍚堜綔閾惰', '瀹夊窘闀夸赴鍐滄潙鍚堜綔閾惰', '瀹夊窘鑲ヤ笢鍐滄潙鍚堜綔閾惰', '瀹夊窘娉楀幙鍐滄潙鍚堜綔閾惰', + '娣崡閫氬晢鍐滄潙鍚堜綔閾惰', '瀹夊窘涓滆嚦鍐滄潙鍚堜綔閾惰', '瀹夊窘绻佹槍鍐滄潙鍚堜綔閾惰', '瀹夊窘鍙堕泦鍐滄潙鍚堜綔閾惰', '鑺滄箹娲ョ洓鍐滄潙鍚堜綔閾惰', '瀹夊窘宀宠タ鍐滄潙鍚堜綔閾惰', '瀹夊窘瀹挎澗鍐滄潙鍚堜綔閾惰', '榛勫北灞邯鍐滄潙鍚堜綔閾惰', '瀹夊窘鎬�瀹佸啘鏉戝悎浣滈摱琛�', '榛勫北澶钩鍐滄潙鍚堜綔閾惰', + '榛勫北寰藉窞鍐滄潙鍚堜綔閾惰', '瀹夊窘瀹佸浗鍐滄潙鍚堜綔閾惰', '瀹夊窘閮庢邯鍐滄潙鍚堜綔閾惰', '瀹夊窘鍜屽幙鍐滄潙鍚堜綔閾惰', '姣窞鑽兘鍐滄潙鍚堜綔閾惰', '瀹夊窘鏄庡厜鍐滄潙鍚堜綔閾惰', '瀹夊窘鍏ㄦ鍐滄潙鍚堜綔閾惰', '娌冲寳鐪佸啘鏉戜俊鐢ㄧぞ鑱斿悎绀�', '杈藉畞鐪佸啘鏉戜俊鐢ㄧぞ鑱斿悎绀�', '铓屽煚甯傚尯鑱旂ぞ', + '鏋為槼鍘胯仈绀�', '娑¢槼鍘胯仈绀�', '钂欏煄鍘胯仈绀�', '鍒╄緵鍘胯仈绀�', '闃滈槼甯傞娉夊尯鑱旂ぞ', '涓存硥鍘胯仈绀�', '搴愭睙鍘胯仈绀�', '宸㈡箹甯傚眳宸㈠尯鑱旂ぞ', '鍏畨甯傞儕鍖鸿仈绀�', '瀵垮幙鑱旂ぞ', + '閲戝鍘胯仈绀�', '婵夋邯鍘胯仈绀�', '瀹垮窞甯傚尯鑱旂ぞ', '鍚北鍘胯仈绀�', '鍑ゅ彴鍘胯仈绀�', '瀹夊窘鐪佸啘鏉戜俊鐢ㄧぞ鑱斿悎绀�', '绂忓缓鐪佸啘淇¤仈绀撅紙绂忓缓鍐滀俊缃戯級', '灞变笢鐪佸啘鏉戜俊鐢ㄧぞ鑱斿悎绀�', '婀栧寳鐪佸啘鏉戜俊鐢ㄧぞ', '骞夸笢鍐滄潙淇$敤绀�', + '骞胯タ澹棌鑷不鍖哄啘鏉戜俊鐢ㄨ仈绀�', '鍥涘窛鐪佸啘鏉戜俊鐢ㄨ仈绀�', '浜戝崡鐪佸啘鏉戜俊鐢ㄧぞ鑱旂ぞ', '鍘﹂棬甯傚啘鏉戜俊鐢ㄥ悎浣滆仈绀�', '宕囨槑闀挎睙鏉戦晣閾惰', '濂夎搐娴﹀彂鏉戦晣閾惰', '鏉炬睙姘戠敓鏉戦晣閾惰', '娴︿笢姹熷崡鏉戦晣閾惰', '娴︿笢寤轰俊鏉戦晣閾惰', '闂佃涓婇摱鏉戦晣閾惰', + '鍢夊畾姘戠敓鏉戦晣閾惰', '瀹夊窘闀夸赴绉戞簮鏉戦晣閾惰', '瀹夊窘鍑ら槼鍒╂皯鏉戦晣閾惰', '瀹夊窘妗愬煄姹熸樊鏉戦晣閾惰', '瀹夊窘褰撴秱鏂板崕鏉戦晣閾惰', '瀹夊窘绻佹槍寤轰俊鏉戦晣閾惰', '瀹夊窘榛勫北閲戞ˉ鏉戦晣閾惰', '瀹夊窘鑸掑煄姝e叴鏉戦晣閾惰', '瀹夊窘瑁曞畨鐩涘钩鏉戦晣閾惰', '瀹夊窘鑲ヨタ鐭抽摱鏉戦晣閾惰', + '瀹夊窘缁╂邯鍐滈摱鏉戦晣閾惰', '瀹夊窘鏃犱负寰介摱鏉戦晣閾惰', '瀹夊窘閾滈櫟閾滄簮鏉戦晣閾惰', '瀹夊窘娉惧幙閾滄簮鏉戦晣閾惰', '瀹夊窘閮庢邯鏂板崕鏉戦晣閾惰', '娣崡鍑ゅ彴閫氬晢鏉戦晣閾惰', '瀹夊窘搴愭睙鎯犳皯鏉戦晣閾惰', '瀹夊窘鍚北鎯犳皯鏉戦晣閾惰', '瀹夊窘鑲ヤ笢婀栨槦鏉戦晣閾惰', '瀹夊窘鏋為槼娉颁笟鏉戦晣閾惰', + '瀹夊窘浼戝畞澶у湴鏉戦晣閾惰', '瀹夊窘闈掗槼涔濆崕鏉戦晣閾惰', '瀹夊窘鍜屽幙鏂板崕鏉戦晣閾惰', '瀹夊窘瀹氳繙姘戜赴鏉戦晣閾惰', '瀹夊窘娼滃北姹熸樊鏉戦晣閾惰', '瀹夊窘姝欏幙鍢夐摱鏉戦晣閾惰', '瀹夊窘鏈涙睙鏂板崕鏉戦晣閾惰', '瀹夊窘瀹挎澗姘戜赴鏉戦晣閾惰', '瀹夊窘浜旀渤姘告嘲鏉戦晣閾惰', '瀹夊窘瀹垮窞娣捣鏉戦晣閾惰', + '瀹夊窘鏄庡厜姘戜赴鏉戦晣閾惰', '瀹夊窘鍏ㄦ涓摱瀵岀櫥鏉戦晣閾惰', '瀹夊窘鏉ュ畨涓摱瀵岀櫥鏉戦晣閾惰', '澶箹鍘垮皬姹犻摱鐕曞啘鏉戣祫閲戜簰鍔╃ぞ', '鐝犳捣妯惔鏉戦晣閾惰', '濮嬪叴澶т紬鏉戦晣閾惰', '涓滄簮娉颁笟鏉戦晣閾惰', '涓北灏忔鏉戦晣閾惰', '骞夸笢鎭╁钩姹囦赴鏉戦晣閾惰', '鎯犲窞浠叉伜涓滅泩鏉戦晣閾惰', + '骞夸笢婢勬捣娼晢鏉戦晣閾惰', '涓滆帪闀垮畨鏉戦晣閾惰', '浣涘北楂樻槑椤洪摱鏉戦晣閾惰', '涓夋按鐝犳睙鏉戦晣閾惰', '骞垮窞鐣鏂板崕鏉戦晣閾惰', '寰峰簡鍗庢鼎鏉戦晣閾惰', '姊呭幙瀹㈠鏉戦晣閾惰', '楣ゅ北鐝犳睙鏉戦晣閾惰', '涓北涓滃嚖鐝犳睙鏉戦晣閾惰', '骞垮窞澧炲煄闀挎睙鏉戦晣閾惰', + '骞胯タ铻嶆按鍏冨疂灞辨潙闀囬摱琛岃偂浠芥湁闄愬叕鍙�', '骞胯タ鏌虫睙鏌抽摱鏉戦晣閾惰鑲′唤鏈夐檺鍏徃', '骞胯タ楸煎嘲淇″悎鏉戦晣閾惰鏈夐檺璐d换鍏徃', '骞胯タ鍏村畨姘戝叴鏉戦晣閾惰鑲′唤鏈夐檺鍏徃', '妗傛灄鍥芥皯鏉戦晣閾惰鏈夐檺璐d换鍏徃', '鐏靛窛娣遍�氭潙闀囬摱琛屾湁闄愯矗浠诲叕鍙�', '骞胯タ钘ゅ幙妗傞摱鏉戦晣閾惰鑲′唤鏈夐檺鍏徃', '宀戞邯甯傚寳閮ㄦ咕鏉戦晣閾惰鏈夐檺璐d换鍏徃', '鍚堟郸鍥芥皯鏉戦晣閾惰鏈夐檺璐d换鍏徃', '涓滃叴鍥芥皯鏉戦晣閾惰鏈夐檺璐d换鍏徃', + '鐏靛北娉颁笟鏉戦晣閾惰鑲′唤鏈夐檺鍏徃', '骞胯タ骞冲崡妗傞摱鏉戦晣閾惰鑲′唤鏈夐檺鍏徃', '骞胯タ妗傚钩妗傞摱鏉戦晣閾惰鑲′唤鏈夐檺鍏徃', '骞胯タ瀹瑰幙妗傞摱鏉戦晣閾惰鑲′唤鏈夐檺鍏徃', '骞胯タ鍖楁祦鏌抽摱鏉戦晣閾惰鑲′唤鏈夐檺鍏徃', '骞胯タ鍏翠笟鏌抽摱鏉戦晣閾惰鑲′唤鏈夐檺鍏徃', '骞胯タ鍗氱櫧鏌抽摱鏉戦晣閾惰鑲′唤鏈夐檺鍏徃', '骞胯タ闄嗗窛鏌抽摱鏉戦晣閾惰鑲′唤鏈夐檺鍏徃', '骞虫灉鍥芥皯鏉戦晣閾惰鏈夐檺璐d换鍏徃', '鐢颁笢鍖楅儴婀炬潙闀囬摱琛屾湁闄愯矗浠诲叕鍙�', + '鐢伴槼鍏撮槼鏉戦晣閾惰鏈夐檺璐d换鍏徃', '瀹滃窞娣遍�氭潙闀囬摱琛屾湁闄愯矗浠诲叕鍙�', '鎵剁互娣遍�氭潙闀囬摱琛屾湁闄愯矗浠诲叕鍙�', '姹囦赴閾惰', '涓滀簹閾惰', '鑺辨棗閾惰', '娓f墦閾惰', '鐟炵瀹炰笟閾惰', '涓変簳浣忓弸閾惰', '鎭掔敓閾惰', + '鏄熷睍閾惰', '姘镐酣閾惰', '涓夎彵涓滀含鏃ヨ仈閾惰', '鑽峰叞閾惰', '鍗庝鲸閾惰', '鎽╂牴澹腹鍒╁浗闄呴摱琛�', '鎽╂牴澶ч�氶摱琛�', '鍙嬪埄閾惰', '澶у崕涓浗', '鍗楁磱鍟嗕笟閾惰', + '澶у崕閾惰', '闊╀簹閾惰', '浼佷笟閾惰', '寰锋剰蹇楅摱琛�', '鍗忓拰閾惰', '瀹佹尝鍥介檯閾惰', '鍗庣編閾惰', '鍗庡晢閾惰', '鍗庝竴閾惰', '娉曞浗宸撮粠閾惰', + '娉曞浗鍏翠笟閾惰', '涓滄柟姹囩悊閾惰', '鍘﹂棬鍥介檯閾惰', '涓俊鍢夊崕閾惰', '鏂伴煩閾惰', '澶ф柊閾惰', '澶栨崲閾惰', '鐩樿胺閾惰', '棣栭兘閾惰', '姝d俊閾惰鏈夐檺鍏徃', '鍗庝竴閾惰', + '姝d俊閾惰', '鎽╂牴澹腹鍒╁浗闄呴摱琛�', '鍘﹂棬鍥介檯閾惰', '涓婃捣鍐滄潙鍟嗕笟閾惰', '涓婃捣鍐滃晢閾惰', '鍖椾含鍐滃晢閾惰', '鍖椾含甯傚晢涓氶摱琛�', '骞垮窞甯傚晢涓氶摱琛�', '涓浗淇″悎']; -def final static BANK_MAP = ['工行': '中国工商银行', '建行': '中国建设银行', '农行': '中国农业银行', '交行': '交通银行', '中行': '中国银行', '邮政储蓄': '中国邮政储蓄银行', '光大银行': '中国光大银行', '浦发银行': '上海浦东发展银行', '深发展': '平安银行', '深圳发展银行': '平安银行', - '农发行': '中国农业发展银行', '浦东发展银行': '上海浦东发展银行']; +def final static BANK_MAP = ['宸ヨ': '涓浗宸ュ晢閾惰', '寤鸿': '涓浗寤鸿閾惰', '鍐滆': '涓浗鍐滀笟閾惰', '浜よ': '浜ら�氶摱琛�', '涓': '涓浗閾惰', '閭斂鍌ㄨ搫': '涓浗閭斂鍌ㄨ搫閾惰', '鍏夊ぇ閾惰': '涓浗鍏夊ぇ閾惰', '娴﹀彂閾惰': '涓婃捣娴︿笢鍙戝睍閾惰', '娣卞彂灞�': '骞冲畨閾惰', '娣卞湷鍙戝睍閾惰': '骞冲畨閾惰', + '鍐滃彂琛�': '涓浗鍐滀笟鍙戝睍閾惰', '娴︿笢鍙戝睍閾惰': '涓婃捣娴︿笢鍙戝睍閾惰']; -def final static ALL_UNIVERSITYS = ['北京大学', '中国人民大学', '清华大学', '北京交通大学', '北京科技大学', '中国石油大学', '北京邮电大学', '华北电力大学', '北京化工大学', '中国农业大学', - '北京林业大学', '北京中医药大学', '北京师范大学', '北京外国语大学', '北京语言大学', '对外经济贸易大学', '中央财经大学', '中国政法大学', '中央民族大学', '中国人民公安大学', - '北京协和医学院', '北京体育大学', '北京理工大学', '北京航空航天大学', '北京信息科技大学', '北京工商大学', '北京联合大学', '北京工业大学', '北方工业大学', '首都医科大学', - '首都师范大学', '首都经济贸易大学', '中国传媒大学', '国际关系学院', '中央美术学院', '中央戏剧学院', '中央音乐学院', '北京电子科技学院', '外交学院', '中国劳动关系学院', - '中国青年政治学院', '中华女子学院', '北京建筑工程学院', '北京服装学院', '北京印刷学院', '北京石油化工学院', '首钢工学院', '北京农学院', '首都体育学院', '北京第二外国语学院', - '北京物资学院', '北京警察学院', '中国音乐学院', '北京舞蹈学院', '中国戏曲学院', '北京电影学院', '北京城市学院', '北京青年政治学院', '北京工业职业技术学院', '北京科技经营管理学院', - '北京电子科技职业学院', '北京信息职业技术学院', '北京经济技术职业学院', '北京社会管理职业学院', '北京吉利大学', '北京农业职业学院', '北京科技职业学院', '北京北大方正软件职业技术学院', '北京现代职业技术学院', '北京经济管理职业学院', - '北京财贸职业学院', '北京政法职业学院', '北京交通职业技术学院', '北京新圆明职业学院', '北京汇佳职业学院', '北京培黎职业学院', '北京戏曲艺术职业学院', '北京京北职业技术学院', '北京劳动保障职业学院', '北京体育职业学院', - '北京经贸职业学院', '南开大学', '天津大学', '中国民航大学', '天津工业大学', '天津科技大学', '天津理工大学', '天津医科大学', '天津中医药大学', '天津师范大学', - '天津财经大学', '天津商业大学', '天津天狮学院', '天津城市建设学院', '天津农学院', '天津工程师范学院', '天津外国语学院', '天津体育学院', '天津音乐学院', '天津美术学院', - '天津医学高等专科学校', '天津机电职业技术学院', '天津现代职业技术学院', '天津轻工职业技术学院', '天津职业大学', '天津滨海职业学院', '天津公安警官职业学院', '天津渤海职业技术学院', '天津工程职业技术学院', '天津电子信息职业技术学院', - '天津城市建设管理职业技术学院', '天津广播影视职业学院', '天津国土资源和房屋职业学院', '天津海运职业学院', '天津中德职业技术学院', '天津石油职业技术学院', '天津艺术职业学院', '天津城市职业学院', '天津生物工程职业技术学院', '天津冶金职业技术学院', - '天津工艺美术职业学院', '天津铁道职业技术学院', '天津交通职业学院', '天津对外经济贸易职业学院', '天津青年职业学院', '天津开发区职业技术学院', '河北大学', '河北工业大学', '燕山大学', '河北理工大学', - '河北科技大学', '河北工程大学', '河北农业大学', '河北医科大学', '河北师范大学', '河北经贸大学', '中国人民武装警察部队学院', '中央司法警官学院', '防灾科技学院', '华北科技学院', - '石家庄铁道学院', '河北建筑工程学院', '北华航天工业学院', '石家庄经济学院', '华北煤炭医学院', '承德医学院', '河北科技师范学院', '邢台学院', '廊坊师范学院', '唐山师范学院', - '河北金融学院', '河北体育学院', '河北传媒学院', '石家庄学院', '保定学院', '衡水学院', '唐山学院', '河北北方学院', '邯郸学院', '沧州医学高等专科学校', - '河北工程技术高等专科学校', '承德石油高等专科学校', '石家庄人民医学高等专科学校', '石家庄医学高等专科学校', '邢台医学高等专科学校', '承德民族师范高等专科学校', '沧州师范专科学校', '河北化工医药职业技术学院', '沧州职业技术学院', '石家庄铁路职业技术学院', - '邢台职业技术学院', '石家庄职业技术学院', '保定职业技术学院', '河北能源职业技术学院', '河北工业职业技术学院', '邯郸职业技术学院', '张家口职业技术学院', '石家庄邮电职业技术学院', '河北女子职业技术学院', '石家庄计算机职业学院', - '河北建材职业技术学院', '河北软件职业技术学院', '河北外国语职业学院', '河北政法职业学院', '河北机电职业技术学院', '石家庄外经贸职业学院', '石家庄东方美术职业学院', '石家庄外语翻译职业学院', '石家庄外事职业学院', '石家庄科技信息职业学院', - '河北公安警察职业学院', '石家庄信息工程职业学院', '唐山科技职业技术学院', '石家庄工商职业学院', '保定电力职业技术学院', '廊坊职业技术学院', '河北劳动关系职业学院', '河北司法警官职业学院', '石家庄科技职业学院', '石家庄科技工程职业学院', - '冀中职业学院', '渤海石油职业学院', '廊坊东方职业技术学院', '河北石油职业技术学院', '宣化科技职业学院', '保定科技职业学院', '泊头职业学院', '河北交通职业技术学院', '唐山工业职业技术学院', '衡水职业技术学院', - '秦皇岛职业技术学院', '石家庄外国语职业学院', '河北旅游职业学院', '唐山职业技术学院', '石家庄法商职业学院', '河北省艺术职业学院', '石家庄理工职业学院', '山西大学', '太原理工大学', '中北大学', - '太原科技大学', '山西农业大学', '山西医科大学', '山西师范大学', '山西大同大学', '山西财经大学', '太原工业学院', '山西中医学院', '长治医学院', '运城学院', - '忻州师范学院', '太原师范学院', '晋中学院', '长治学院', '太原电力高等专科学校', '吕梁高等专科学校', '运城幼儿师范高等专科学校', '山西省财政税务专科学校', '山西警官高等专科学校', '太原大学', - '山西建筑职业技术学院', '山西轻工职业技术学院', '运城职业技术学院', '山西工商职业学院', '潞安职业技术学院', '山西交通职业技术学院', '山西煤炭职业技术学院', '北岳职业技术学院', '阳泉职业技术学院', '山西工程职业技术学院', - '山西艺术职业学院', '山西兴华职业学院', '临汾职业技术学院', '山西电力职业技术学院', '忻州职业技术学院', '山西信息职业技术学院', '长治职业技术学院', '山西管理职业学院', '山西旅游职业学院', '晋城职业技术学院', - '山西警官职业学院', '山西机电职业技术学院', '太原城市职业技术学院', '山西生物应用职业技术学院', '山西经贸职业学院', '山西水利职业技术学院', '山西金融职业学院', '山西综合职业技术学院', '太原旅游职业学院', '山西国际商务职业学院', - '山西老区职业技术学院', '山西同文外语职业学院', '山西体育职业学院', '山西戏剧职业学院', '山西财贸职业技术学院', '山西林业职业技术学院', '山西华澳商贸职业学院', '晋中职业技术学院', '山西运城农业职业技术学院', '朔州职业技术学院', - '内蒙古大学', '内蒙古科技大学', '内蒙古民族大学', '内蒙古工业大学', '内蒙古农业大学', '内蒙古师范大学', '内蒙古医学院', '呼伦贝尔学院', '呼和浩特民族学院', '赤峰学院', - '集宁师范学院', '内蒙古财经学院', '乌兰察布医学高等专科学校', '河套大学', '包头职业技术学院', '内蒙古建筑职业技术学院', '乌海职业技术学院', '包头钢铁职业技术学院', '科尔沁艺术职业学院', '包头铁道职业技术学院', - '内蒙古商贸职业学院', '鄂尔多斯职业学院', '内蒙古交通职业技术学院', '内蒙古机电职业技术学院', '内蒙古科技职业学院', '内蒙古电子信息职业技术学院', '锡林郭勒职业学院', '呼和浩特职业学院', '包头轻工职业技术学院', '乌兰察布职业学院', - '通辽职业学院', '内蒙古化工职业学院', '内蒙古经贸外语职业学院', '赤峰职业技术学院', '内蒙古北方职业技术学院', '兴安职业技术学院', '内蒙古体育职业学院', '内蒙古警察职业学院', '内蒙古丰州职业学院', '大连理工大学', - '东北大学', '大连海事大学', '辽宁大学', '大连大学', '沈阳大学', '沈阳理工大学', '辽宁工程技术大学', '沈阳工业大学', '沈阳建筑大学', '辽宁石油化工大学', - '大连交通大学', '辽宁科技大学', '辽宁工业大学', '大连工业大学', '沈阳农业大学', '中国医科大学', '大连医科大学', '辽宁中医药大学', '沈阳药科大学', '辽宁师范大学', - '沈阳师范大学', '渤海大学', '东北财经大学', '大连民族学院', '中国刑事警察学院', '沈阳化工学院', '沈阳航空工业学院', '沈阳工程学院', '辽宁科技学院', '大连东软信息学院', - '大连水产学院', '辽宁医学院', '沈阳医学院', '鞍山师范学院', '大连外国语学院', '辽宁财贸学院', '沈阳体育学院', '鲁迅美术学院', '沈阳音乐学院', '大连艺术学院', - '辽东学院', '辽宁对外经贸学院', '辽宁交通高等专科学校', '铁岭师范高等专科学校', '锦州师范高等专科学校', '抚顺师范高等专科学校', '朝阳师范高等专科学校', '辽宁税务高等专科学校', '辽宁警官高等专科学校', '阜新高等专科学校', - '大连职业技术学院', '抚顺职业技术学院', '营口职业技术学院', '辽宁农业职业技术学院', '大连商务职业学院', '盘锦职业技术学院', '渤海船舶职业学院', '辽阳职业技术学院', '辽宁信息职业技术学院', '辽宁金融职业学院', - '辽宁石化职业技术学院', '辽宁经济职业技术学院', '锦州商务职业学院', '辽宁机电职业技术学院', '辽宁铁道职业技术学院', '大连东软信息技术职业学院', '大连艺术职业学院', '辽宁建筑职业技术学院', '辽宁广告职业学院', '辽宁体育运动职业技术学院', - '沈阳职业技术学院', '大连软件职业学院', '大连翻译职业学院', '辽宁商贸职业学院', '大连枫叶职业技术学院', '辽宁地质工程职业学院', '辽宁装备制造职业技术学院', '辽宁职业学院', '辽宁林业职业技术学院', '大连装备制造职业技术学院', - '大连汽车职业技术学院', '辽宁现代服务职业技术学院', '大连航运职业技术学院', '辽宁美术职业学院', '沈阳航空职业技术学院', '辽河石油职业技术学院', '吉林大学', '东北师范大学', '延边大学', '北华大学', - '长春大学', '长春理工大学', '长春工业大学', '吉林农业大学', '长春中医药大学', '吉林师范大学', '东北电力大学', '长春工程学院', '吉林建筑工程学院', '吉林化工学院', - '吉林农业科技学院', '吉林医药学院', '吉林工程技术师范学院', '通化师范学院', '白城师范学院', '长春师范学院', '吉林华桥外国语学院', '长春税务学院', '吉林工商学院', '吉林体育学院', - '吉林艺术学院', '吉林动画学院', '白城医学高等专科学校', '长春汽车工业高等专科学校', '长春医学高等专科学校', '长春金融高等专科学校', '吉林公安高等专科学校', '四平职业大学', '吉林交通职业技术学院', '长春东方职业学院', - '辽源职业技术学院', '长白山职业技术学院', '吉林司法警官职业学院', '松原职业技术学院', '长春职业技术学院', '吉林农业工程职业技术学院', '吉林工业职业技术学院', '吉林电子信息职业技术学院', '长春信息技术职业学院', '吉林铁道职业技术学院', - '白城职业技术学院', '东北林业大学', '哈尔滨工业大学', '哈尔滨工程大学', '黑龙江大学', '佳木斯大学', '齐齐哈尔大学', '哈尔滨理工大学', '东北农业大学', '黑龙江八一农垦大学', - '哈尔滨医科大学', '黑龙江中医药大学', '哈尔滨师范大学', '哈尔滨商业大学', '大庆石油学院', '哈尔滨学院', '黑龙江工程学院', '黑龙江科技学院', '牡丹江医学院', '齐齐哈尔医学院', - '大庆师范学院', '牡丹江师范学院', '哈尔滨德强商务学院', '哈尔滨体育学院', '绥化学院', '黑龙江东方学院', '黑河学院', '大庆医学高等专科学校', '齐齐哈尔高等师范专科学校', '鹤岗师范高等专科学校', - '黑龙江幼儿师范高等专科学校', '哈尔滨金融高等专科学校', '黑龙江畜牧兽医职业学院', '黑龙江司法警官职业学院', '黑龙江林业职业技术学院', '黑龙江农业工程职业学院', '大庆职业学院', '齐齐哈尔职业学院', '鸡西大学', '伊春职业学院', - '牡丹江大学', '黑龙江建筑职业技术学院', '黑龙江农业职业技术学院', '黑龙江农垦职业学院', '黑龙江民族职业学院', '七台河职业学院', '哈尔滨应用职业技术学院', '哈尔滨现代公共关系职业学院', '黑龙江交通职业技术学院', '黑龙江北开职业技术学院', - '哈尔滨职业技术学院', '哈尔滨电力职业技术学院', '哈尔滨铁道职业技术学院', '黑龙江农业经济职业学院', '佳木斯职业学院', '黑龙江艺术职业学院', '黑龙江工商职业技术学院', '黑龙江粮食职业学院', '哈尔滨科学技术职业学院', '黑龙江商业职业学院', - '黑龙江农垦农业职业技术学院', '黑龙江农垦林业职业技术学院', '黑龙江公安警官职业学院', '黑龙江生物科技职业学院', '哈尔滨华夏计算机职业技术学院', '大兴安岭职业学院', '黑龙江煤炭职业技术学院', '黑龙江信息技术职业学院', '黑龙江旅游职业技术学院', '黑龙江三江美术职业学院', - '黑龙江生态工程职业学院', '复旦大学', '同济大学', '上海交通大学', '华东理工大学', '东华大学', '华东师范大学', '上海外国语大学', '上海财经大学', '上海大学', - '上海理工大学', '上海海事大学', '上海工程技术大学', '上海海洋大学', '上海中医药大学', '上海师范大学', '华东政法大学', '上海海关学院', '上海建桥学院', '上海政法学院', - '上海应用技术学院', '上海第二工业大学', '上海电机学院', '上海电力学院', '上海对外贸易学院', '上海金融学院', '上海立信会计学院', '上海体育学院', '上海音乐学院', '上海戏剧学院', - '上海商学院', '上海杉达学院', '上海医疗器械高等专科学校', '上海出版印刷高等专科学校', '上海医药高等专科学校', '上海旅游高等专科学校', '上海公安高等专科学校', '上海电影艺术职业学院', '上海新侨职业技术学院', '上海东海职业技术学院', - '上海电子信息职业技术学院', '上海工艺美术职业学院', '上海立达职业技术学院', '上海济光职业技术学院', '上海交通职业技术学院', '上海工商外国语职业学院', '上海海事职业技术学院', '上海科学技术职业学院', '上海城市管理职业技术学院', '上海震旦职业学院', - '上海中华职业技术学院', '上海行健职业学院', '上海工会管理职业学院', '上海托普信息技术职业学院', '上海邦德职业技术学院', '上海农林职业技术学院', '上海中侨职业技术学院', '上海思博职业技术学院', '上海欧华职业技术学院', '上海体育职业学院', - '上海民远职业技术学院', '上海建峰职业技术学院', '南京大学', '东南大学', '中国矿业大学', '河海大学', '江南大学', '南京农业大学', '中国药科大学', '南京理工大学', - '南京航空航天大学', '苏州大学', '扬州大学', '江苏大学', '南京邮电大学', '江苏科技大学', '南京工业大学', '南京林业大学', '南京医科大学', '南京中医药大学', - '南京师范大学', '徐州师范大学', '南京财经大学', '南通大学', '西交利物浦大学', '南京信息工程大学', '淮阴工学院', '徐州工程学院', '淮海工学院', '常州工学院', - '盐城工学院', '江苏工业学院', '金陵科技学院', '南京工程学院', '徐州医学院', '江苏技术师范学院', '淮阴师范学院', '南京晓庄学院', '盐城师范学院', '苏州科技学院', - '南京审计学院', '江苏警官学院', '南京体育学院', '南京艺术学院', '常熟理工学院', '三江学院', '南京森林公安高等专科学校', '连云港师范高等专科学校', '泰州师范高等专科学校', '镇江市高等专科学校', - '江苏畜牧兽医职业技术学院', '南通纺织职业技术学院', '南京工业职业技术学院', '无锡商业职业技术学院', '泰州职业技术学院', '南通航运职业技术学院', '徐州建筑职业技术学院', '无锡职业技术学院', '民办明达职业技术学院', '南通职业大学', - '沙洲职业工学院', '苏州工艺美术职业技术学院', '扬州市职业大学', '苏州职业大学', '连云港职业技术学院', '江苏城市职业学院', '苏州高博软件技术职业学院', '江阴职业技术学院', '钟山职业技术学院', '淮安信息职业技术学院', - '南京交通职业技术学院', '江苏建康职业学院', '宿迁职业技术学院', '苏州信息职业技术学院', '江苏食品职业技术学院', '太湖创意职业技术学院', '江苏海事职业技术学院', '江苏经贸职业技术学院', '南京信息职业技术学院', '常州工程职业技术学院', - '常州轻工职业技术学院', '徐州工业职业技术学院', '江苏农林职业技术学院', '江苏信息职业技术学院', '苏州港大思培科技职业学院', '昆山登云科技职业学院', '南京旅游职业学院', '苏州工业园区职业技术学院', '苏州经贸职业技术学院', '常州机电职业技术学院', - '江海职业技术学院', '南京化工职业技术学院', '盐城卫生职业技术学院', '常州信息职业技术学院', '正德职业技术学院', '炎黄职业技术学院', '九州职业技术学院', '无锡城市职业技术学院', '无锡工艺职业技术学院', '健雄职业技术学院', - '江苏财经职业技术学院', '盐城纺织职业技术学院', '常州纺织服装职业技术学院', '南京铁道职业技术学院', '苏州工业职业技术学院', '金山职业技术学院', '紫琅职业技术学院', '金肯职业技术学院', '江苏联合职业技术学院', '江南影视艺术职业学院', - '建东职业技术学院', '苏州托普信息职业技术学院', '应天职业技术学院', '无锡科技职业学院', '南通农业职业技术学院', '扬州环境资源职业技术学院', '扬州工业职业技术学院', '南京机电职业技术学院', '苏州农业职业技术学院', '南京视觉艺术职业学院', - '苏州卫生职业技术学院', '南京特殊教育职业技术学院', '无锡南洋职业技术学院', '硅湖职业技术学院', '浙江大学', '宁波大学', '浙江工业大学', '杭州电子科技大学', '浙江理工大学', '浙江中医药大学', - '浙江师范大学', '杭州师范大学', '浙江工商大学', '宁波诺丁汉大学', '温州大学', '宁波大红鹰学院', '浙江越秀外国语学院', '嘉兴学院', '中国计量学院', '浙江科技学院', - '宁波工程学院', '浙江海洋学院', '浙江林学院', '温州医学院', '湖州师范学院', '绍兴文理学院', '台州学院', '浙江传媒学院', '浙江财经学院', '浙江警察学院', - '中国美术学院', '浙江树人学院', '浙江万里学院', '丽水学院', '公安海警高等专科学校', '浙江水利水电专科学校', '浙江医学高等专科学校', '浙江医药高等专科学校', '金华职业技术学院', '宁波职业技术学院', - '温州职业技术学院', '浙江交通职业技术学院', '浙江金融职业学院', '杭州科技职业技术学院', '湖州职业技术学院', '浙江旅游职业学院', '台州职业技术学院', '浙江工贸职业技术学院', '浙江工业职业技术学院', '杭州万向职业技术学院', - '浙江工商职业技术学院', '浙江经济职业技术学院', '浙江机电职业技术学院', '衢州职业技术学院', '浙江东方职业技术学院', '义乌工商职业技术学院', '嘉兴南洋职业技术学院', '宁波城市职业技术学院', '浙江体育职业技术学院', '浙江电力职业技术学院', - '浙江同济科技职业学院', '浙江邮电职业技术学院', '台州科技职业学院', '温州科技职业学院', '绍兴托普信息职业技术学院', '浙江长征职业技术学院', '浙江汽车职业技术学院', '浙江纺织服装职业技术学院', '浙江国际海运职业技术学院', '浙江警官职业学院', - '浙江建设职业技术学院', '杭州职业技术学院', '宁波天一职业技术学院', '浙江商业职业技术学院', '浙江育英职业技术学院', '嘉兴职业技术学院', '浙江横店影视职业学院', '浙江广厦建设职业技术学院', '丽水职业技术学院', '浙江经贸职业技术学院', - '浙江艺术职业学院', '合肥工业大学', '中国科学技术大学', '安徽大学', '安徽理工大学', '安徽工业大学', '安徽农业大学', '安徽医科大学', '安徽师范大学', '安徽财经大学', - '安徽三联学院', '安徽工程科技学院', '安徽建筑工业学院', '安徽中医学院', '皖南医学院', '蚌埠医学院', '淮南师范学院', '淮北煤炭师范学院', '安庆师范学院', '安徽科技学院', - '阜阳师范学院', '合肥师范学院', '皖西学院', '池州学院', '合肥学院', '黄山学院', '蚌埠学院', '铜陵学院', '宿州学院', '滁州学院', - '巢湖学院', '安徽新华学院', '马鞍山师范高等专科学校', '安徽中医药高等专科学校', '安庆医药高等专科学校', '安徽医学高等专科学校', '亳州师范高等专科学校', '淮北职业技术学院', '安徽水利水电职业技术学院', '芜湖职业技术学院', - '铜陵职业技术学院', '安徽商贸职业技术学院', '淮南职业技术学院', '淮南联合大学', '安徽职业技术学院', '民办万博科技职业学院', '安徽警官职业学院', '安徽审计职业学院', '安徽矿业职业技术学院', '安徽邮电职业技术学院', - '安徽公安职业学院', '安徽工业职业技术学院', '民办安徽外国语职业技术学院', '合肥通用职业技术学院', '安徽工业经济职业技术学院', '安徽新闻出版职业技术学院', '巢湖职业技术学院', '民办安徽文达信息技术职业学院', '宿州职业技术学院', '安徽体育运动职业技术学院', - '民办合肥经济技术职业学院', '安徽电子信息职业技术学院', '民办合肥滨湖职业技术学院', '六安职业技术学院', '阜阳科技职业学院', '安徽机电职业技术学院', '安徽城市管理职业学院', '安徽艺术职业学院', '安徽国防科技职业学院', '安徽工商职业学院', - '安徽冶金科技职业学院', '民办安徽旅游职业学院', '安庆职业技术学院', '徽商职业学院', '蚌埠经济技术职业学院', '合肥共达职业技术学院', '安徽绿海商务职业学院', '安徽涉外经济职业学院', '合肥信息技术职业学院', '马鞍山职业技术学院', - '安徽工贸职业技术学院', '安徽电气工程职业技术学院', '安徽国际商务职业学院', '池州职业技术学院', '安徽交通职业技术学院', '宣城职业技术学院', '亳州职业技术学院', '安徽现代信息工程职业学院', '芜湖信息技术职业学院', '安徽财贸职业学院', - '安徽中澳科技职业学院', '滁州职业技术学院', '安徽广播影视职业技术学院', '安徽林业职业技术学院', '民办合肥财经职业学院', '阜阳职业技术学院', '厦门大学', '华侨大学', '福建农林大学', '集美大学', - '福州大学', '仰恩大学', '福建医科大学', '福建师范大学', '厦门理工学院', '闽南理工学院', '福建工程学院', '福建中医学院', '泉州师范学院', '漳州师范学院', - '福建警察学院', '武夷学院', '龙岩学院', '莆田学院', '闽江学院', '三明学院', '厦门医学高等专科学校', '泉州医学高等专科学校', '宁德师范高等专科学校', '福建商业高等专科学校', - '福建华南女子职业学院', '黎明职业大学', '福州英华职业学院', '福建交通职业技术学院', '泉州纺织服装职业学院', '漳州职业技术学院', '厦门华夏职业学院', '福州软件职业技术学院', '泉州轻工职业学院', '福州外语外贸职业技术学院', - '福州黎明职业技术学院', '福州海峡职业技术学院', '闽北职业技术学院', '厦门华天涉外职业技术学院', '福建金融职业技术学院', '福州科技职业技术学院', '德化陶瓷职业技术学院', '福建生物工程职业技术学院', '福建艺术职业学院', '三明职业技术学院', - '漳州城市职业学院', '福建警官职业学院', '闽西职业技术学院', '厦门软件职业技术学院', '厦门安防科技职业学院', '漳州卫生职业学院', '福州职业技术学院', '福建卫生职业技术学院', '泉州华光摄影艺术职业学院', '泉州信息职业技术学院', - '厦门城市职业学院', '厦门演艺职业学院', '宁德职业技术学院', '福建体育职业技术学院', '厦门兴才职业技术学院', '福建对外经济贸易职业技术学院', '湄洲湾职业技术学院', '泉州经贸职业技术学院', '泉州理工职业学院', '厦门东海职业技术学院', - '厦门南洋职业学院', '泉州泰山航海职业学院', '漳州天福茶职业技术学院', '漳州吉马印刷职业技术学院', '武夷山职业学院', '福建信息职业技术学院', '厦门海洋职业技术学院', '福建农业职业技术学院', '福建林业职业技术学院', '福建电力职业技术学院', - '福建水利电力职业技术学院', '南昌大学', '江西理工大学', '华东交通大学', '东华理工大学', '南昌航空大学', '江西农业大学', '江西师范大学', '江西财经大学', '井冈山大学', - '景德镇陶瓷学院', '南昌工程学院', '南昌理工学院', '江西中医学院', '赣南医学院', '赣南师范学院', '江西科技师范学院', '上饶师范学院', '九江学院', '江西蓝天学院', - '宜春学院', '南昌师范高等专科学校', '江西中医药高等专科学校', '江西公安专科学校', '新余高等专科学校', '景德镇高等专科学校', '萍乡高等专科学校', '江西护理职业技术学院', '江西工业职业技术学院', '九江职业大学', - '九江职业技术学院', '江西渝州科技职业学院', '江西经济管理职业学院', '江西建设职业技术学院', '抚州职业技术学院', '江西外语外贸职业学院', '江西大宇职业技术学院', '江西工业贸易职业技术学院', '江西环境工程职业学院', '江西信息应用职业技术学院', - '江西管理职业学院', '江西服装职业技术学院', '江西新闻出版职业技术学院', '江西应用工程职业学院', '江西青年职业学院', '江西城市职业学院', '江西工业工程职业技术学院', '江西工程职业学院', '江西旅游商贸职业学院', '江西先锋软件职业技术学院', - '江西司法警官职业学院', '江西生物科技职业学院', '江西冶金职业技术学院', '江西制造职业技术学院', '江西机电职业技术学院', '江西陶瓷工艺美术职业技术学院', '江西科技职业学院', '宜春职业技术学院', '江西电力职业技术学院', '上饶职业技术学院', - '江西艺术职业学院', '江西财经职业学院', '江西应用技术职业学院', '江西现代职业技术学院', '鹰潭职业技术学院', '江西航空职业技术学院', '江西农业工程职业学院', '江西泰豪动漫职业学院', '江西枫林涉外经贸职业学院', '江西太阳能科技职业学院', - '赣西科技职业学院', '江西交通职业技术学院', '江西赣江职业技术学院', '山东大学', '中国海洋大学', '青岛大学', '山东科技大学', '山东理工大学', '聊城大学', '烟台大学', - '青岛科技大学', '青岛理工大学', '济南大学', '山东建筑大学', '山东农业大学', '青岛农业大学', '山东中医药大学', '山东师范大学', '曲阜师范大学', '鲁东大学', - '山东万杰医学院', '潍坊科技学院', '山东英才学院', '山东轻工业学院', '潍坊学院', '山东交通学院', '潍坊医学院', '泰山医学院', '滨州医学院', '济宁医学院', - '临沂师范学院', '德州学院', '山东经济学院', '山东财政学院', '山东工商学院', '山东警察学院', '山东政法学院', '山东体育学院', '山东艺术学院', '山东工艺美术学院', - '烟台南山学院', '青岛滨海学院', '滨州学院', '枣庄学院', '济宁学院', '菏泽学院', '泰山学院', '山东中医药高等专科学校', '淄博师范高等专科学校', '山东电力高等专科学校', - '菏泽医学专科学校', '山东医学高等专科学校', '山东畜牧兽医职业学院', '曲阜远东职业技术学院', '日照职业技术学院', '山东商业职业技术学院', '济宁职业技术学院', '威海职业学院', '青岛职业技术学院', '莱芜职业技术学院', - '聊城职业技术学院', '山东劳动职业技术学院', '山东外贸职业学院', '山东司法警官职业学院', '菏泽家政职业学院', '潍坊工商职业学院', '山东铝业职业学院', '山东华宇职业技术学院', '山东凯文科技职业学院', '山东交通职业学院', - '烟台汽车工程职业学院', '山东经贸职业学院', '山东理工职业学院', '青岛酒店管理职业技术学院', '淄博科技职业学院', '山东现代职业学院', '山东大王职业学院', '滨州职业学院', '山东服装职业学院', '烟台职业学院', - '青岛黄海职业学院', '青岛飞洋职业技术学院', '东营职业学院', '德州科技职业学院', '潍坊职业学院', '山东力明科技职业学院', '山东商务职业学院', '山东科技职业学院', '山东信息职业技术学院', '山东水利职业学院', - '山东外国语职业学院', '山东协和职业技术学院', '枣庄职业学院', '青岛求实职业技术学院', '泰山职业技术学院', '济南工程职业技术学院', '济南铁道职业技术学院', '山东杏林科技职业学院', '山东外事翻译职业学院', '烟台工程职业技术学院', - '山东药品食品职业学院', '山东旅游职业学院', '青岛恒星职业技术学院', '德州职业技术学院', '山东胜利职业学院', '枣庄科技职业学院', '山东圣翰财贸职业学院', '山东电子职业技术学院', '淄博职业学院', '山东化工职业学院', - '山东传媒职业学院', '山东城市建设职业学院', '青岛港湾职业技术学院', '山东丝绸纺织职业学院', '临沂职业学院', '济南职业学院', '山东工业职业学院', '郑州大学', '河南大学', '河南科技大学', - '河南理工大学', '河南工业大学', '河南农业大学', '河南师范大学', '郑州科技学院', '郑州华信学院', '华北水利水电学院', '郑州轻工业学院', '河南城建学院', '郑州航空工业管理学院', - '中原工学院', '黄河科技学院', '南阳理工学院', '安阳工学院', '河南工程学院', '洛阳理工学院', '河南中医学院', '新乡医学院', '信阳师范学院', '周口师范学院', - '南阳师范学院', '洛阳师范学院', '商丘师范学院', '安阳师范学院', '河南财经学院', '黄淮学院', '新乡学院', '河南科技学院', '许昌学院', '平顶山学院', - '铁道警官高等专科学校', '漯河医学高等专科学校', '郑州电力高等专科学校', '河南机电高等专科学校', '郑州牧业工程高等专科学校', '信阳农业高等专科学校', '郑州澍青医学高等专科学校', '商丘医学高等专科学校', '南阳医学高等专科学校', '焦作师范高等专科学校', - '郑州师范高等专科学校', '河南商业高等专科学校', '河南财政税务高等专科学校', '河南公安高等专科学校', '三门峡职业技术学院', '河南职业技术学院', '郑州铁路职业技术学院', '黄河水利职业技术学院', '漯河职业技术学院', '中州大学', - '焦作大学', '开封大学', '郑州旅游职业学院', '郑州经贸职业学院', '河南质量工程职业学院', '河南检察职业学院', '河南建筑职业技术学院', '郑州职业技术学院', '河南交通职业技术学院', '信阳职业技术学院', - '河南工业贸易职业学院', '郑州工业安全职业学院', '漯河食品职业学院', '郑州电力职业技术学院', '郑州信息科技职业学院', '济源职业技术学院', '新乡职业技术学院', '郑州电子信息职业技术学院', '河南农业职业学院', '周口科技职业学院', - '安阳职业技术学院', '驻马店职业技术学院', '商丘科技职业学院', '永城职业学院', '郑州交通职业学院', '嵩山少林武术职业学院', '郑州布瑞达理工职业学院', '商丘职业技术学院', '平顶山工业职业技术学院', '许昌职业技术学院', - '鹤壁职业技术学院', '濮阳职业技术学院', '周口职业技术学院', '河南司法警官职业学院', '河南工业职业技术学院', '河南经贸职业学院', '武汉大学', '中南财经政法大学', '华中科技大学', '武汉理工大学', - '中国地质大学', '华中农业大学', '华中师范大学', '中南民族大学', '湖北大学', '长江大学', '江汉大学', '三峡大学', '武汉科技大学', '湖北工业大学', - '武汉工程大学', '武汉科技学院', '荆楚理工学院', '武汉工业学院', '湖北汽车工业学院', '湖北中医学院', '郧阳医学院', '湖北师范学院', '黄冈师范学院', '孝感学院', - '湖北第二师范学院', '湖北经济学院', '湖北警官学院', '武汉体育学院', '湖北美术学院', '武汉音乐学院', '湖北民族学院', '咸宁学院', '武汉生物工程学院', '襄樊学院', - '黄石理工学院', '湖北中医药高等专科学校', '郧阳师范高等专科学校', '湖北财经高等专科学校', '武汉商业服务学院', '沙市职业大学', '恩施职业技术学院', '黄冈职业技术学院', '襄樊职业技术学院', '湖北职业技术学院', - '十堰职业技术学院', '长江职业学院', '武汉工贸职业学院', '武汉职业技术学院', '武汉船舶职业技术学院', '鄂州职业大学', '湖北水利水电职业技术学院', '三峡电力职业学院', '长江工程职业技术学院', '武汉航海职业技术学院', - '武汉工业职业技术学院', '武汉警官职业学院', '武汉铁路职业技术学院', '武汉城市职业学院', '湖北开放职业学院', '武汉信息传播职业技术学院', '武汉科技职业学院', '武汉语言文化职业学院', '仙桃职业学院', '武汉外语外事职业学院', - '咸宁职业技术学院', '湖北城市建设职业技术学院', '武汉电力职业技术学院', '湖北三峡职业技术学院', '湖北国土资源职业学院', '江汉艺术职业学院', '武汉民政职业学院', '湖北科技职业学院', '湖北青年职业学院', '黄冈科技职业学院', - '湖北生态工程职业技术学院', '鄂东职业技术学院', '湖北财税职业学院', '武汉商贸职业学院', '荆州职业技术学院', '武汉交通职业学院', '湖北交通职业技术学院', '武汉软件工程职业学院', '湖北生物科技职业学院', '随州职业技术学院', - '黄石职业技术学院', '三峡旅游职业技术学院', '湖北艺术职业学院', '武汉工程职业技术学院', '湖北轻工职业技术学院', '中南大学', '湖南大学', '湘潭大学', '湖南科技大学', '吉首大学', - '长沙理工大学', '南华大学', '湖南工业大学', '湖南农业大学', '湖南中医药大学', '湖南师范大学', '长沙学院', '湖南第一师范学院', '湖南城市学院', '湖南工程学院', - '湖南理工学院', '湖南工学院', '中南林业科技大学', '长沙医学院', '湘南学院', '衡阳师范学院', '湖南商学院', '湖南涉外经济学院', '湖南文理学院', '湖南人文科技学院', - '邵阳学院', '湖南科技学院', '怀化学院', '怀化医学高等专科学校', '湖南中医药高等专科学校', '益阳医学高等专科学校', '邵阳医学高等专科学校', '株洲师范高等专科学校', '长沙师范学校', '湖南税务高等专科学校', - '湖南财经高等专科学校', '湖南公安高等专科学校', '长沙航空职业技术学院', '永州职业技术学院', '湖南女子职业大学', '湖南环境生物职业技术学院', '湖南信息职业技术学院', '长沙民政职业技术学院', '湖南冶金职业技术学院', '湖南大众传媒职业技术学院', - '湖南工业职业技术学院', '湖南铁道职业技术学院', '湖南工程职业技术学院', '湖南城建职业技术学院', '湖南都市职业学院', '长沙环境保护职业技术学院', '长沙职业技术学院', '湖南艺术职业学院', '湖南生物机电职业技术学院', '湘西民族职业技术学院', - '湖南体育职业学院', '衡阳财经工业职业技术学院', '益阳职业技术学院', '湖南同德职业学院', '湖南民族职业学院', '湖南电子科技职业学院', '湖南现代物流职业技术学院', '长沙南方职业学院', '常德职业技术学院', '岳阳职业技术学院', - '怀化职业技术学院', '潇湘职业学院', '湖南化工职业技术学院', '湖南九嶷职业技术学院', '湖南交通工程职业技术学院', '湖南机电职业技术学院', '长沙社会安全职业技术学院', '湖南水利水电职业技术学院', '长沙电力职业技术学院', '株洲职业技术学院', - '湖南司法警官职业学院', '湖南网络工程职业学院', '长沙商贸旅游职业技术学院', '邵阳职业技术学院', '湖南对外经济贸易职业学院', '湖南石油化工职业技术学院', '湖南商务职业技术学院', '湖南交通职业技术学院', '保险职业学院', '娄底职业技术学院', - '长沙通信职业技术学院', '湘潭职业技术学院', '郴州职业技术学院', '湖南科技职业学院', '湖南科技工业职业技术学院', '湖南电气职业技术学院', '张家界航空工业职业技术学院', '湖南外国语职业学院', '湖南工艺美术职业学院', '湖南理工职业技术学院', - '湖南科技经贸职业学院', '湖南软件职业学院', '湖南信息科学职业学院', '湖南铁路科技职业技术学院', '湖南安全技术职业学院', '中山大学', '华南理工大学', '暨南大学', '汕头大学', '深圳大学', - '五邑大学', '广东工业大学', '华南农业大学', '广东海洋大学', '广州中医药大学', '南方医科大学', '华南师范大学', '广东外语外贸大学', '广州大学', '北京师范大学-香港浸会大学联合国际学院', - '肇庆学院', '茂名学院', '东莞理工学院', '仲恺农业工程学院', '广东医学院', '广州医学院', '广东药学院', '惠州学院', '韶关学院', '湛江师范学院', - '嘉应学院', '韩山师范学院', '广东金融学院', '广东商学院', '广东警官学院', '广州体育学院', '广州美术学院', '星海音乐学院', '广东技术师范学院', '广东培正学院', - '广东白云学院', '佛山科学技术学院', '广州航海高等专科学校', '肇庆医学高等专科学校', '私立华联学院', '民办南华工商学院', '广州民航职业技术学院', '广东食品药品职业学院', '潮汕职业技术学院', '广东水利电力职业技术学院', - '深圳职业技术学院', '广东松山职业技术学院', '顺德职业技术学院', '广东新安职业技术学院', '广东农工商职业技术学院', '佛山职业技术学院', '广东轻工职业技术学院', '广东交通职业技术学院', '广州番禺职业技术学院', '广州现代信息工程职业技术学院', - '惠州经济职业技术学院', '珠海城市职业技术学院', '广东行政职业学院', '广东体育职业技术学院', '广州涉外经济职业技术学院', '广州工商职业技术学院', '广州松田职业学院', '肇庆工商职业技术学院', '广东理工职业学院', '广州南洋理工职业学院', - '广东工程职业技术学院', '广州科技贸易职业学院', '广州城建职业学院', '广州城市职业学院', '广州珠江职业技术学院', '广州华南商贸职业学院', '广东科学技术职业学院', '广东机电职业技术学院', '深圳信息职业技术学院', '汕头职业技术学院', - '广东亚视演艺职业学院', '清远职业技术学院', '广州铁路职业技术学院', '广东司法警官职业学院', '广州科技职业技术学院', '茂名职业技术学院', '中山职业技术学院', '江门职业技术学院', '广东工贸职业技术学院', '湛江现代科技职业学院', - '广东文艺职业学院', '广州体育职业技术学院', '中山火炬职业技术学院', '广州工程技术职业学院', '广州华立科技职业学院', '东莞南博职业技术学院', '河源职业技术学院', '广东财经职业学院', '广东省外语艺术职业学院', '广东纺织职业技术学院', - '广东邮电职业技术学院', '阳江职业技术学院', '汕尾职业技术学院', '广东岭南职业技术学院', '广东女子职业技术学院', '广东建设职业技术学院', '广东科贸职业学院', '肇庆科技职业技术学院', '揭阳职业技术学院', '罗定职业技术学院', - '广州康大职业技术学院', '珠海艺术职业学院', '南海东软信息技术职业学院', '广西大学', '桂林电子科技大学', '桂林理工大学', '广西医科大学', '广西师范大学', '广西民族大学', '广西工学院', - '广西中医学院', '右江民族医学院', '桂林医学院', '广西师范学院', '广西民族师范学院', '玉林师范学院', '河池学院', '广西财经学院', '广西艺术学院', '百色学院', - '贺州学院', '钦州学院', '梧州学院', '桂林航天工业高等专科学校', '柳州医学高等专科学校', '桂林师范高等专科学校', '柳州师范高等专科学校', '广西幼儿师范高等专科学校', '桂林旅游高等专科学校', '广西警官高等专科学校', - '广西体育高等专科学校', '南宁职业技术学院', '柳州职业技术学院', '广西机电职业技术学院', '广西职业技术学院', '广西农业职业技术学院', '桂林山水职业学院', '贵港职业学院', '广西工业职业技术学院', '河池职业学院', - '北海艺术设计职业学院', '北海职业学院', '梧州职业学院', '柳州运输职业技术学院', '广西工程职业学院', '广西建设职业技术学院', '广西理工职业技术学院', '广西生态工程职业技术学院', '广西经济职业学院', '广西水利电力职业技术学院', - '广西交通职业技术学院', '广西国际商务职业技术学院', '广西英华国际职业学院', '广西电力职业技术学院', '广西东方外语职业学院', '广西演艺职业学院', '广西工商职业技术学院', '广西经贸职业技术学院', '广西城市职业学院', '柳州城市职业学院', - '百色职业学院', '邕江大学', '海南大学', '海南师范大学', '海口经济学院', '海南医学院', '琼州学院', '琼台师范高等专科学校', '海南职业技术学院', '三亚城市职业学院', - '三亚理工职业学院', '海南科技职业学院', '海南外国语职业学院', '海南万和信息职业技术学院', '海南软件职业技术学院', '海南经贸职业技术学院', '海南政法职业学院', '三亚航空旅游职业学院', '重庆大学', '西南大学', - '重庆交通大学', '重庆邮电大学', '重庆理工大学', '重庆医科大学', '重庆师范大学', '重庆工商大学', '西南政法大学', '重庆科技学院', '长江师范学院', '四川外语学院', - '四川美术学院', '重庆文理学院', '重庆三峡学院', '重庆电力高等专科学校', '重庆医药高等专科学校', '重庆三峡医药高等专科学校', '重庆工业职业技术学院', '重庆电子工程职业学院', '重庆正大软件职业技术学院', '重庆机电职业技术学院', - '重庆传媒职业学院', '重庆财经职业学院', '重庆水利电力职业技术学院', '重庆航天职业技术学院', '重庆青年职业技术学院', '重庆工商职业学院', '重庆江津职业学院', '重庆民生职业技术学院', '重庆建筑工程职业学院', '重庆工贸职业技术学院', - '重庆能源职业学院', '重庆商务职业学院', '重庆科创职业学院', '重庆城市职业学院', '重庆工程职业技术学院', '重庆巴渝职业技术学院', '重庆信息技术职业学院', '重庆海联职业技术学院', '重庆警官职业学院', '重庆城市管理职业学院', - '重庆三峡职业学院', '四川大学', '西南交通大学', '电子科技大学', '西南财经大学', '西南民族大学', '成都理工大学', '西华大学', '西南科技大学', '四川农业大学', - '成都中医药大学', '四川师范大学', '西华师范大学', '中国民用航空飞行学院', '西南石油大学', '四川理工学院', '成都信息工程学院', '泸州医学院', '川北医学院', '成都医学院', - '内江师范学院', '四川文理学院', '乐山师范学院', '四川警察学院', '成都体育学院', '四川音乐学院', '四川民族学院', '绵阳师范学院', '宜宾学院', '攀枝花学院', - '西昌学院', '成都学院', '四川烹饪高等专科学校', '成都电子机械高等专科学校', '成都纺织高等专科学校', '四川中医药高等专科学校', '阿坝师范高等专科学校', '四川幼儿师范高等专科学校', '民办四川天一学院', '成都航空职业技术学院', - '四川财经职业学院', '四川现代职业学院', '四川城市职业学院', '四川华新现代职业学院', '内江职业技术学院', '四川文化传媒职业学院', '四川警安职业学院', '南充职业技术学院', '四川水利职业技术学院', '成都职业技术学院', - '四川管理职业学院', '四川商务职业学院', '四川信息职业技术学院', '四川司法警官职业学院', '成都东软信息技术职业学院', '四川科技职业学院', '四川文化产业职业学院', '四川托普信息技术职业学院', '成都艺术职业学院', '宜宾职业技术学院', - '成都农业科技职业学院', '四川职业技术学院', '广安职业技术学院', '乐山职业技术学院', '四川国际标榜职业学院', '四川机电职业技术学院', '四川交通职业技术学院', '达州职业技术学院', '四川建筑职业技术学院', '四川工商职业技术学院', - '绵阳职业技术学院', '四川电力职业技术学院', '四川工程职业技术学院', '四川化工职业技术学院', '雅安职业技术学院', '四川航天职业技术学院', '泸州职业技术学院', '四川邮电职业技术学院', '眉山职业技术学院', '四川艺术职业学院', - '贵州大学', '贵州师范大学', '贵阳医学院', '遵义医学院', '贵阳中医学院', '兴义民族师范学院', '毕节学院', '六盘水师范学院', '黔南民族师范学院', '遵义师范学院', - '贵州师范学院', '贵州财经学院', '贵州民族学院', '铜仁学院', '凯里学院', '安顺学院', '贵阳学院', '黔南民族医学高等专科学校', '遵义医药高等专科学校', '贵州商业高等专科学校', - '贵州交通职业技术学院', '贵州警官职业学院', '贵州电子信息职业技术学院', '贵州航天职业技术学院', '贵阳职业技术学院', '安顺职业技术学院', '毕节职业技术学院', '遵义职业技术学院', '贵州亚泰职业学院', '黔东南民族职业技术学院', - '黔南民族职业技术学院', '贵州电力职业技术学院', '贵州工业职业技术学院', '贵阳护理职业学院', '贵州轻工职业技术学院', '黔西南民族职业技术学院', '铜仁职业技术学院', '六盘水职业技术学院', '贵州职业技术学院', '云南大学', - '昆明理工大学', '云南农业大学', '云南师范大学', '云南财经大学', '云南民族大学', '西南林学院', '昆明医学院', '云南中医学院', '曲靖师范学院', '楚雄师范学院', - '玉溪师范学院', '红河学院', '云南警官学院', '云南艺术学院', '昆明学院', '大理学院', '文山学院', '保山学院', '昆明冶金高等专科学校', '云南医学高等专科学校', - '曲靖医学高等专科学校', '楚雄医药高等专科学校', '保山中医药高等专科学校', '昭通师范高等专科学校', '思茅师范高等专科学校', '丽江师范高等专科学校', '临沧师范高等专科学校', '德宏师范高等专科学校', '云南能源职业技术学院', '云南国土资源职业学院', - '云南林业职业技术学院', '云南经贸外事职业学院', '云南交通职业技术学院', '云南科技信息职业学院', '昆明艺术职业学院', '云南新兴职业学院', '昆明扬帆职业技术学院', '西双版纳职业技术学院', '云南机电职业技术学院', '云南司法警官职业学院', - '云南热带作物职业学院', '云南锡业职业技术学院', '云南文化艺术职业学院', '云南经济管理职业学院', '云南体育运动职业技术学院', '德宏职业学院', '云南三鑫职业技术学院', '云南农业职业技术学院', '昆明工业职业技术学院', '云南国防工业职业技术学院', - '云南爱因森软件职业学院', '云南北美职业学院', '玉溪农业职业技术学院', '西藏大学', '西藏藏医学院', '西藏民族学院', '拉萨师范高等专科学校', '西藏警官高等专科学校', '西藏职业技术学院', '西安交通大学', - '长安大学', '西安电子科技大学', '西北农林科技大学', '陕西师范大学', '西北工业大学', '西北大学', '延安大学', '西安理工大学', '西安建筑科技大学', '西安科技大学', - '西安石油大学', '西安工程大学', '西安工业大学', '西安外国语大学', '西北政法大学', '陕西科技大学', '西安思源学院', '陕西国际商贸学院', '西安邮电学院', '陕西中医学院', - '西安医学院', '陕西理工学院', '渭南师范学院', '咸阳师范学院', '榆林学院', '宝鸡文理学院', '西安财经学院', '西安体育学院', '西安美术学院', '西安音乐学院', - '西安培华学院', '西安翻译学院', '西安文理学院', '安康学院', '商洛学院', '西京学院', '西安欧亚学院', '西安外事学院', '西安航空技术高等专科学校', '西安电力高等专科学校', - '西安医学高等专科学校', '陕西工业职业技术学院', '杨凌职业技术学院', '陕西青年职业学院', '铜川职业技术学院', '陕西财经职业技术学院', '陕西交通职业技术学院', '陕西能源职业技术学院', '陕西职业技术学院', '西安航空职业技术学院', - '陕西旅游烹饪职业学院', '陕西纺织服装职业技术学院', '陕西电子信息职业技术学院', '陕西国防工业职业技术学院', '西安汽车科技职业学院', '西安科技商贸职业学院', '陕西铁路工程职业技术学院', '陕西航空职业技术学院', '宝鸡职业技术学院', '西安三资职业学院', - '西安高新科技职业学院', '陕西服装艺术职业学院', '陕西警官职业学院', '西安铁路职业技术学院', '陕西经济管理职业技术学院', '陕西电子科技职业学院', '西安海棠职业学院', '安康职业技术学院', '西安东方亚太职业技术学院', '咸阳职业技术学院', - '西安职业技术学院', '商洛职业技术学院', '汉中职业技术学院', '延安职业技术学院', '渭南职业技术学院', '陕西邮电职业技术学院', '兰州大学', '西北民族大学', '兰州理工大学', '兰州交通大学', - '甘肃农业大学', '西北师范大学', '甘肃中医学院', '陇东学院', '甘肃民族师范学院', '天水师范学院', '兰州商学院', '甘肃政法学院', '河西学院', '兰州城市学院', - '兰州工业高等专科学校', '平凉医学高等专科学校', '张掖医学高等专科学校', '陇南师范高等专科学校', '定西师范高等专科学校', '甘肃联合大学', '兰州石化职业技术学院', '甘肃农业职业技术学院', '甘肃林业职业技术学院', '甘肃建筑职业技术学院', - '甘肃警察职业学院', '甘肃交通职业技术学院', '酒泉职业技术学院', '兰州外语职业学院', '兰州职业技术学院', '甘肃工业职业技术学院', '甘肃畜牧工程职业技术学院', '武威职业学院', '兰州资源环境职业技术学院', '甘肃钢铁职业技术学院', - '青海大学', '青海师范大学', '青海民族大学', '青海畜牧兽医职业技术学院', '青海卫生职业技术学院', '青海建筑职业技术学院', '青海交通职业技术学院', '青海警官职业学院', '北方民族大学', '宁夏大学', - '宁夏理工学院', '宁夏医科大学', '宁夏师范学院', '宁夏民族职业技术学院', '宁夏工商职业技术学院', '宁夏职业技术学院', '银川科技职业学院', '宁夏工业职业学院', '宁夏建设职业技术学院', '宁夏司法警官职业学院', - '宁夏财经职业技术学院', '新疆大学', '石河子大学', '新疆农业大学', '塔里木大学', '新疆医科大学', '新疆师范大学', '新疆财经大学', '喀什师范学院', '伊犁师范学院', - '新疆艺术学院', '昌吉学院', '新疆工业高等专科学校', '新疆维吾尔医学专科学校', '和田师范专科学校', '新疆兵团警官高等专科学校', '新疆警官高等专科学校', '乌鲁木齐职业大学', '新疆机电职业技术学院', '新疆轻工职业技术学院', - '克拉玛依职业技术学院', '新疆农业职业技术学院', '伊犁职业技术学院', '新疆石河子职业技术学院', '新疆交通职业技术学院', '新疆现代职业技术学院', '新疆天山职业技术学院', '阿克苏职业技术学院', '巴音郭楞职业技术学院', '新疆职业大学', - '昌吉职业技术学院', '新疆能源职业技术学院', '新疆建设职业技术学院']; +def final static ALL_UNIVERSITYS = ['鍖椾含澶у', '涓浗浜烘皯澶у', '娓呭崕澶у', '鍖椾含浜ら�氬ぇ瀛�', '鍖椾含绉戞妧澶у', '涓浗鐭虫补澶у', '鍖椾含閭數澶у', '鍗庡寳鐢靛姏澶у', '鍖椾含鍖栧伐澶у', '涓浗鍐滀笟澶у', + '鍖椾含鏋椾笟澶у', '鍖椾含涓尰鑽ぇ瀛�', '鍖椾含甯堣寖澶у', '鍖椾含澶栧浗璇ぇ瀛�', '鍖椾含璇█澶у', '瀵瑰缁忔祹璐告槗澶у', '涓ぎ璐㈢粡澶у', '涓浗鏀挎硶澶у', '涓ぎ姘戞棌澶у', '涓浗浜烘皯鍏畨澶у', + '鍖椾含鍗忓拰鍖诲闄�', '鍖椾含浣撹偛澶у', '鍖椾含鐞嗗伐澶у', '鍖椾含鑸┖鑸ぉ澶у', '鍖椾含淇℃伅绉戞妧澶у', '鍖椾含宸ュ晢澶у', '鍖椾含鑱斿悎澶у', '鍖椾含宸ヤ笟澶у', '鍖楁柟宸ヤ笟澶у', '棣栭兘鍖荤澶у', + '棣栭兘甯堣寖澶у', '棣栭兘缁忔祹璐告槗澶у', '涓浗浼犲獟澶у', '鍥介檯鍏崇郴瀛﹂櫌', '涓ぎ缇庢湳瀛﹂櫌', '涓ぎ鎴忓墽瀛﹂櫌', '涓ぎ闊充箰瀛﹂櫌', '鍖椾含鐢靛瓙绉戞妧瀛﹂櫌', '澶栦氦瀛﹂櫌', '涓浗鍔冲姩鍏崇郴瀛﹂櫌', + '涓浗闈掑勾鏀挎不瀛﹂櫌', '涓崕濂冲瓙瀛﹂櫌', '鍖椾含寤虹瓚宸ョ▼瀛﹂櫌', '鍖椾含鏈嶈瀛﹂櫌', '鍖椾含鍗板埛瀛﹂櫌', '鍖椾含鐭虫补鍖栧伐瀛﹂櫌', '棣栭挗宸ュ闄�', '鍖椾含鍐滃闄�', '棣栭兘浣撹偛瀛﹂櫌', '鍖椾含绗簩澶栧浗璇闄�', + '鍖椾含鐗╄祫瀛﹂櫌', '鍖椾含璀﹀療瀛﹂櫌', '涓浗闊充箰瀛﹂櫌', '鍖椾含鑸炶箞瀛﹂櫌', '涓浗鎴忔洸瀛﹂櫌', '鍖椾含鐢靛奖瀛﹂櫌', '鍖椾含鍩庡競瀛﹂櫌', '鍖椾含闈掑勾鏀挎不瀛﹂櫌', '鍖椾含宸ヤ笟鑱屼笟鎶�鏈闄�', '鍖椾含绉戞妧缁忚惀绠$悊瀛﹂櫌', + '鍖椾含鐢靛瓙绉戞妧鑱屼笟瀛﹂櫌', '鍖椾含淇℃伅鑱屼笟鎶�鏈闄�', '鍖椾含缁忔祹鎶�鏈亴涓氬闄�', '鍖椾含绀句細绠$悊鑱屼笟瀛﹂櫌', '鍖椾含鍚夊埄澶у', '鍖椾含鍐滀笟鑱屼笟瀛﹂櫌', '鍖椾含绉戞妧鑱屼笟瀛﹂櫌', '鍖椾含鍖楀ぇ鏂规杞欢鑱屼笟鎶�鏈闄�', '鍖椾含鐜颁唬鑱屼笟鎶�鏈闄�', '鍖椾含缁忔祹绠$悊鑱屼笟瀛﹂櫌', + '鍖椾含璐㈣锤鑱屼笟瀛﹂櫌', '鍖椾含鏀挎硶鑱屼笟瀛﹂櫌', '鍖椾含浜ら�氳亴涓氭妧鏈闄�', '鍖椾含鏂板渾鏄庤亴涓氬闄�', '鍖椾含姹囦匠鑱屼笟瀛﹂櫌', '鍖椾含鍩归粠鑱屼笟瀛﹂櫌', '鍖椾含鎴忔洸鑹烘湳鑱屼笟瀛﹂櫌', '鍖椾含浜寳鑱屼笟鎶�鏈闄�', '鍖椾含鍔冲姩淇濋殰鑱屼笟瀛﹂櫌', '鍖椾含浣撹偛鑱屼笟瀛﹂櫌', + '鍖椾含缁忚锤鑱屼笟瀛﹂櫌', '鍗楀紑澶у', '澶╂触澶у', '涓浗姘戣埅澶у', '澶╂触宸ヤ笟澶у', '澶╂触绉戞妧澶у', '澶╂触鐞嗗伐澶у', '澶╂触鍖荤澶у', '澶╂触涓尰鑽ぇ瀛�', '澶╂触甯堣寖澶у', + '澶╂触璐㈢粡澶у', '澶╂触鍟嗕笟澶у', '澶╂触澶╃嫯瀛﹂櫌', '澶╂触鍩庡競寤鸿瀛﹂櫌', '澶╂触鍐滃闄�', '澶╂触宸ョ▼甯堣寖瀛﹂櫌', '澶╂触澶栧浗璇闄�', '澶╂触浣撹偛瀛﹂櫌', '澶╂触闊充箰瀛﹂櫌', '澶╂触缇庢湳瀛﹂櫌', + '澶╂触鍖诲楂樼瓑涓撶瀛︽牎', '澶╂触鏈虹數鑱屼笟鎶�鏈闄�', '澶╂触鐜颁唬鑱屼笟鎶�鏈闄�', '澶╂触杞诲伐鑱屼笟鎶�鏈闄�', '澶╂触鑱屼笟澶у', '澶╂触婊ㄦ捣鑱屼笟瀛﹂櫌', '澶╂触鍏畨璀﹀畼鑱屼笟瀛﹂櫌', '澶╂触娓ゆ捣鑱屼笟鎶�鏈闄�', '澶╂触宸ョ▼鑱屼笟鎶�鏈闄�', '澶╂触鐢靛瓙淇℃伅鑱屼笟鎶�鏈闄�', + '澶╂触鍩庡競寤鸿绠$悊鑱屼笟鎶�鏈闄�', '澶╂触骞挎挱褰辫鑱屼笟瀛﹂櫌', '澶╂触鍥藉湡璧勬簮鍜屾埧灞嬭亴涓氬闄�', '澶╂触娴疯繍鑱屼笟瀛﹂櫌', '澶╂触涓痉鑱屼笟鎶�鏈闄�', '澶╂触鐭虫补鑱屼笟鎶�鏈闄�', '澶╂触鑹烘湳鑱屼笟瀛﹂櫌', '澶╂触鍩庡競鑱屼笟瀛﹂櫌', '澶╂触鐢熺墿宸ョ▼鑱屼笟鎶�鏈闄�', '澶╂触鍐堕噾鑱屼笟鎶�鏈闄�', + '澶╂触宸ヨ壓缇庢湳鑱屼笟瀛﹂櫌', '澶╂触閾侀亾鑱屼笟鎶�鏈闄�', '澶╂触浜ら�氳亴涓氬闄�', '澶╂触瀵瑰缁忔祹璐告槗鑱屼笟瀛﹂櫌', '澶╂触闈掑勾鑱屼笟瀛﹂櫌', '澶╂触寮�鍙戝尯鑱屼笟鎶�鏈闄�', '娌冲寳澶у', '娌冲寳宸ヤ笟澶у', '鐕曞北澶у', '娌冲寳鐞嗗伐澶у', + '娌冲寳绉戞妧澶у', '娌冲寳宸ョ▼澶у', '娌冲寳鍐滀笟澶у', '娌冲寳鍖荤澶у', '娌冲寳甯堣寖澶у', '娌冲寳缁忚锤澶у', '涓浗浜烘皯姝﹁璀﹀療閮ㄩ槦瀛﹂櫌', '涓ぎ鍙告硶璀﹀畼瀛﹂櫌', '闃茬伨绉戞妧瀛﹂櫌', '鍗庡寳绉戞妧瀛﹂櫌', + '鐭冲搴勯搧閬撳闄�', '娌冲寳寤虹瓚宸ョ▼瀛﹂櫌', '鍖楀崕鑸ぉ宸ヤ笟瀛﹂櫌', '鐭冲搴勭粡娴庡闄�', '鍗庡寳鐓ょ偔鍖诲闄�', '鎵垮痉鍖诲闄�', '娌冲寳绉戞妧甯堣寖瀛﹂櫌', '閭㈠彴瀛﹂櫌', '寤婂潑甯堣寖瀛﹂櫌', '鍞愬北甯堣寖瀛﹂櫌', + '娌冲寳閲戣瀺瀛﹂櫌', '娌冲寳浣撹偛瀛﹂櫌', '娌冲寳浼犲獟瀛﹂櫌', '鐭冲搴勫闄�', '淇濆畾瀛﹂櫌', '琛℃按瀛﹂櫌', '鍞愬北瀛﹂櫌', '娌冲寳鍖楁柟瀛﹂櫌', '閭兏瀛﹂櫌', '娌у窞鍖诲楂樼瓑涓撶瀛︽牎', + '娌冲寳宸ョ▼鎶�鏈珮绛変笓绉戝鏍�', '鎵垮痉鐭虫补楂樼瓑涓撶瀛︽牎', '鐭冲搴勪汉姘戝尰瀛﹂珮绛変笓绉戝鏍�', '鐭冲搴勫尰瀛﹂珮绛変笓绉戝鏍�', '閭㈠彴鍖诲楂樼瓑涓撶瀛︽牎', '鎵垮痉姘戞棌甯堣寖楂樼瓑涓撶瀛︽牎', '娌у窞甯堣寖涓撶瀛︽牎', '娌冲寳鍖栧伐鍖昏嵂鑱屼笟鎶�鏈闄�', '娌у窞鑱屼笟鎶�鏈闄�', '鐭冲搴勯搧璺亴涓氭妧鏈闄�', + '閭㈠彴鑱屼笟鎶�鏈闄�', '鐭冲搴勮亴涓氭妧鏈闄�', '淇濆畾鑱屼笟鎶�鏈闄�', '娌冲寳鑳芥簮鑱屼笟鎶�鏈闄�', '娌冲寳宸ヤ笟鑱屼笟鎶�鏈闄�', '閭兏鑱屼笟鎶�鏈闄�', '寮犲鍙h亴涓氭妧鏈闄�', '鐭冲搴勯偖鐢佃亴涓氭妧鏈闄�', '娌冲寳濂冲瓙鑱屼笟鎶�鏈闄�', '鐭冲搴勮绠楁満鑱屼笟瀛﹂櫌', + '娌冲寳寤烘潗鑱屼笟鎶�鏈闄�', '娌冲寳杞欢鑱屼笟鎶�鏈闄�', '娌冲寳澶栧浗璇亴涓氬闄�', '娌冲寳鏀挎硶鑱屼笟瀛﹂櫌', '娌冲寳鏈虹數鑱屼笟鎶�鏈闄�', '鐭冲搴勫缁忚锤鑱屼笟瀛﹂櫌', '鐭冲搴勪笢鏂圭編鏈亴涓氬闄�', '鐭冲搴勫璇炕璇戣亴涓氬闄�', '鐭冲搴勫浜嬭亴涓氬闄�', '鐭冲搴勭鎶�淇℃伅鑱屼笟瀛﹂櫌', + '娌冲寳鍏畨璀﹀療鑱屼笟瀛﹂櫌', '鐭冲搴勪俊鎭伐绋嬭亴涓氬闄�', '鍞愬北绉戞妧鑱屼笟鎶�鏈闄�', '鐭冲搴勫伐鍟嗚亴涓氬闄�', '淇濆畾鐢靛姏鑱屼笟鎶�鏈闄�', '寤婂潑鑱屼笟鎶�鏈闄�', '娌冲寳鍔冲姩鍏崇郴鑱屼笟瀛﹂櫌', '娌冲寳鍙告硶璀﹀畼鑱屼笟瀛﹂櫌', '鐭冲搴勭鎶�鑱屼笟瀛﹂櫌', '鐭冲搴勭鎶�宸ョ▼鑱屼笟瀛﹂櫌', + '鍐�涓亴涓氬闄�', '娓ゆ捣鐭虫补鑱屼笟瀛﹂櫌', '寤婂潑涓滄柟鑱屼笟鎶�鏈闄�', '娌冲寳鐭虫补鑱屼笟鎶�鏈闄�', '瀹e寲绉戞妧鑱屼笟瀛﹂櫌', '淇濆畾绉戞妧鑱屼笟瀛﹂櫌', '娉婂ご鑱屼笟瀛﹂櫌', '娌冲寳浜ら�氳亴涓氭妧鏈闄�', '鍞愬北宸ヤ笟鑱屼笟鎶�鏈闄�', '琛℃按鑱屼笟鎶�鏈闄�', + '绉︾殗宀涜亴涓氭妧鏈闄�', '鐭冲搴勫鍥借鑱屼笟瀛﹂櫌', '娌冲寳鏃呮父鑱屼笟瀛﹂櫌', '鍞愬北鑱屼笟鎶�鏈闄�', '鐭冲搴勬硶鍟嗚亴涓氬闄�', '娌冲寳鐪佽壓鏈亴涓氬闄�', '鐭冲搴勭悊宸ヨ亴涓氬闄�', '灞辫タ澶у', '澶師鐞嗗伐澶у', '涓寳澶у', + '澶師绉戞妧澶у', '灞辫タ鍐滀笟澶у', '灞辫タ鍖荤澶у', '灞辫タ甯堣寖澶у', '灞辫タ澶у悓澶у', '灞辫タ璐㈢粡澶у', '澶師宸ヤ笟瀛﹂櫌', '灞辫タ涓尰瀛﹂櫌', '闀挎不鍖诲闄�', '杩愬煄瀛﹂櫌', + '蹇诲窞甯堣寖瀛﹂櫌', '澶師甯堣寖瀛﹂櫌', '鏅嬩腑瀛﹂櫌', '闀挎不瀛﹂櫌', '澶師鐢靛姏楂樼瓑涓撶瀛︽牎', '鍚曟楂樼瓑涓撶瀛︽牎', '杩愬煄骞煎効甯堣寖楂樼瓑涓撶瀛︽牎', '灞辫タ鐪佽储鏀跨◣鍔′笓绉戝鏍�', '灞辫タ璀﹀畼楂樼瓑涓撶瀛︽牎', '澶師澶у', + '灞辫タ寤虹瓚鑱屼笟鎶�鏈闄�', '灞辫タ杞诲伐鑱屼笟鎶�鏈闄�', '杩愬煄鑱屼笟鎶�鏈闄�', '灞辫タ宸ュ晢鑱屼笟瀛﹂櫌', '娼炲畨鑱屼笟鎶�鏈闄�', '灞辫タ浜ら�氳亴涓氭妧鏈闄�', '灞辫タ鐓ょ偔鑱屼笟鎶�鏈闄�', '鍖楀渤鑱屼笟鎶�鏈闄�', '闃虫硥鑱屼笟鎶�鏈闄�', '灞辫タ宸ョ▼鑱屼笟鎶�鏈闄�', + '灞辫タ鑹烘湳鑱屼笟瀛﹂櫌', '灞辫タ鍏村崕鑱屼笟瀛﹂櫌', '涓存本鑱屼笟鎶�鏈闄�', '灞辫タ鐢靛姏鑱屼笟鎶�鏈闄�', '蹇诲窞鑱屼笟鎶�鏈闄�', '灞辫タ淇℃伅鑱屼笟鎶�鏈闄�', '闀挎不鑱屼笟鎶�鏈闄�', '灞辫タ绠$悊鑱屼笟瀛﹂櫌', '灞辫タ鏃呮父鑱屼笟瀛﹂櫌', '鏅嬪煄鑱屼笟鎶�鏈闄�', + '灞辫タ璀﹀畼鑱屼笟瀛﹂櫌', '灞辫タ鏈虹數鑱屼笟鎶�鏈闄�', '澶師鍩庡競鑱屼笟鎶�鏈闄�', '灞辫タ鐢熺墿搴旂敤鑱屼笟鎶�鏈闄�', '灞辫タ缁忚锤鑱屼笟瀛﹂櫌', '灞辫タ姘村埄鑱屼笟鎶�鏈闄�', '灞辫タ閲戣瀺鑱屼笟瀛﹂櫌', '灞辫タ缁煎悎鑱屼笟鎶�鏈闄�', '澶師鏃呮父鑱屼笟瀛﹂櫌', '灞辫タ鍥介檯鍟嗗姟鑱屼笟瀛﹂櫌', + '灞辫タ鑰佸尯鑱屼笟鎶�鏈闄�', '灞辫タ鍚屾枃澶栬鑱屼笟瀛﹂櫌', '灞辫タ浣撹偛鑱屼笟瀛﹂櫌', '灞辫タ鎴忓墽鑱屼笟瀛﹂櫌', '灞辫タ璐㈣锤鑱屼笟鎶�鏈闄�', '灞辫タ鏋椾笟鑱屼笟鎶�鏈闄�', '灞辫タ鍗庢境鍟嗚锤鑱屼笟瀛﹂櫌', '鏅嬩腑鑱屼笟鎶�鏈闄�', '灞辫タ杩愬煄鍐滀笟鑱屼笟鎶�鏈闄�', '鏈斿窞鑱屼笟鎶�鏈闄�', + '鍐呰挋鍙ゅぇ瀛�', '鍐呰挋鍙ょ鎶�澶у', '鍐呰挋鍙ゆ皯鏃忓ぇ瀛�', '鍐呰挋鍙ゅ伐涓氬ぇ瀛�', '鍐呰挋鍙ゅ啘涓氬ぇ瀛�', '鍐呰挋鍙ゅ笀鑼冨ぇ瀛�', '鍐呰挋鍙ゅ尰瀛﹂櫌', '鍛间鸡璐濆皵瀛﹂櫌', '鍛煎拰娴╃壒姘戞棌瀛﹂櫌', '璧ゅ嘲瀛﹂櫌', + '闆嗗畞甯堣寖瀛﹂櫌', '鍐呰挋鍙よ储缁忓闄�', '涔屽叞瀵熷竷鍖诲楂樼瓑涓撶瀛︽牎', '娌冲澶у', '鍖呭ご鑱屼笟鎶�鏈闄�', '鍐呰挋鍙ゅ缓绛戣亴涓氭妧鏈闄�', '涔屾捣鑱屼笟鎶�鏈闄�', '鍖呭ご閽㈤搧鑱屼笟鎶�鏈闄�', '绉戝皵娌佽壓鏈亴涓氬闄�', '鍖呭ご閾侀亾鑱屼笟鎶�鏈闄�', + '鍐呰挋鍙ゅ晢璐歌亴涓氬闄�', '閯傚皵澶氭柉鑱屼笟瀛﹂櫌', '鍐呰挋鍙や氦閫氳亴涓氭妧鏈闄�', '鍐呰挋鍙ゆ満鐢佃亴涓氭妧鏈闄�', '鍐呰挋鍙ょ鎶�鑱屼笟瀛﹂櫌', '鍐呰挋鍙ょ數瀛愪俊鎭亴涓氭妧鏈闄�', '閿℃灄閮嫆鑱屼笟瀛﹂櫌', '鍛煎拰娴╃壒鑱屼笟瀛﹂櫌', '鍖呭ご杞诲伐鑱屼笟鎶�鏈闄�', '涔屽叞瀵熷竷鑱屼笟瀛﹂櫌', + '閫氳窘鑱屼笟瀛﹂櫌', '鍐呰挋鍙ゅ寲宸ヨ亴涓氬闄�', '鍐呰挋鍙ょ粡璐稿璇亴涓氬闄�', '璧ゅ嘲鑱屼笟鎶�鏈闄�', '鍐呰挋鍙ゅ寳鏂硅亴涓氭妧鏈闄�', '鍏村畨鑱屼笟鎶�鏈闄�', '鍐呰挋鍙や綋鑲茶亴涓氬闄�', '鍐呰挋鍙よ瀵熻亴涓氬闄�', '鍐呰挋鍙や赴宸炶亴涓氬闄�', '澶ц繛鐞嗗伐澶у', + '涓滃寳澶у', '澶ц繛娴蜂簨澶у', '杈藉畞澶у', '澶ц繛澶у', '娌堥槼澶у', '娌堥槼鐞嗗伐澶у', '杈藉畞宸ョ▼鎶�鏈ぇ瀛�', '娌堥槼宸ヤ笟澶у', '娌堥槼寤虹瓚澶у', '杈藉畞鐭虫补鍖栧伐澶у', + '澶ц繛浜ら�氬ぇ瀛�', '杈藉畞绉戞妧澶у', '杈藉畞宸ヤ笟澶у', '澶ц繛宸ヤ笟澶у', '娌堥槼鍐滀笟澶у', '涓浗鍖荤澶у', '澶ц繛鍖荤澶у', '杈藉畞涓尰鑽ぇ瀛�', '娌堥槼鑽澶у', '杈藉畞甯堣寖澶у', + '娌堥槼甯堣寖澶у', '娓ゆ捣澶у', '涓滃寳璐㈢粡澶у', '澶ц繛姘戞棌瀛﹂櫌', '涓浗鍒戜簨璀﹀療瀛﹂櫌', '娌堥槼鍖栧伐瀛﹂櫌', '娌堥槼鑸┖宸ヤ笟瀛﹂櫌', '娌堥槼宸ョ▼瀛﹂櫌', '杈藉畞绉戞妧瀛﹂櫌', '澶ц繛涓滆蒋淇℃伅瀛﹂櫌', + '澶ц繛姘翠骇瀛﹂櫌', '杈藉畞鍖诲闄�', '娌堥槼鍖诲闄�', '闉嶅北甯堣寖瀛﹂櫌', '澶ц繛澶栧浗璇闄�', '杈藉畞璐㈣锤瀛﹂櫌', '娌堥槼浣撹偛瀛﹂櫌', '椴佽繀缇庢湳瀛﹂櫌', '娌堥槼闊充箰瀛﹂櫌', '澶ц繛鑹烘湳瀛﹂櫌', + '杈戒笢瀛﹂櫌', '杈藉畞瀵瑰缁忚锤瀛﹂櫌', '杈藉畞浜ら�氶珮绛変笓绉戝鏍�', '閾佸箔甯堣寖楂樼瓑涓撶瀛︽牎', '閿﹀窞甯堣寖楂樼瓑涓撶瀛︽牎', '鎶氶『甯堣寖楂樼瓑涓撶瀛︽牎', '鏈濋槼甯堣寖楂樼瓑涓撶瀛︽牎', '杈藉畞绋庡姟楂樼瓑涓撶瀛︽牎', '杈藉畞璀﹀畼楂樼瓑涓撶瀛︽牎', '闃滄柊楂樼瓑涓撶瀛︽牎', + '澶ц繛鑱屼笟鎶�鏈闄�', '鎶氶『鑱屼笟鎶�鏈闄�', '钀ュ彛鑱屼笟鎶�鏈闄�', '杈藉畞鍐滀笟鑱屼笟鎶�鏈闄�', '澶ц繛鍟嗗姟鑱屼笟瀛﹂櫌', '鐩橀敠鑱屼笟鎶�鏈闄�', '娓ゆ捣鑸硅埗鑱屼笟瀛﹂櫌', '杈介槼鑱屼笟鎶�鏈闄�', '杈藉畞淇℃伅鑱屼笟鎶�鏈闄�', '杈藉畞閲戣瀺鑱屼笟瀛﹂櫌', + '杈藉畞鐭冲寲鑱屼笟鎶�鏈闄�', '杈藉畞缁忔祹鑱屼笟鎶�鏈闄�', '閿﹀窞鍟嗗姟鑱屼笟瀛﹂櫌', '杈藉畞鏈虹數鑱屼笟鎶�鏈闄�', '杈藉畞閾侀亾鑱屼笟鎶�鏈闄�', '澶ц繛涓滆蒋淇℃伅鎶�鏈亴涓氬闄�', '澶ц繛鑹烘湳鑱屼笟瀛﹂櫌', '杈藉畞寤虹瓚鑱屼笟鎶�鏈闄�', '杈藉畞骞垮憡鑱屼笟瀛﹂櫌', '杈藉畞浣撹偛杩愬姩鑱屼笟鎶�鏈闄�', + '娌堥槼鑱屼笟鎶�鏈闄�', '澶ц繛杞欢鑱屼笟瀛﹂櫌', '澶ц繛缈昏瘧鑱屼笟瀛﹂櫌', '杈藉畞鍟嗚锤鑱屼笟瀛﹂櫌', '澶ц繛鏋彾鑱屼笟鎶�鏈闄�', '杈藉畞鍦拌川宸ョ▼鑱屼笟瀛﹂櫌', '杈藉畞瑁呭鍒堕�犺亴涓氭妧鏈闄�', '杈藉畞鑱屼笟瀛﹂櫌', '杈藉畞鏋椾笟鑱屼笟鎶�鏈闄�', '澶ц繛瑁呭鍒堕�犺亴涓氭妧鏈闄�', + '澶ц繛姹借溅鑱屼笟鎶�鏈闄�', '杈藉畞鐜颁唬鏈嶅姟鑱屼笟鎶�鏈闄�', '澶ц繛鑸繍鑱屼笟鎶�鏈闄�', '杈藉畞缇庢湳鑱屼笟瀛﹂櫌', '娌堥槼鑸┖鑱屼笟鎶�鏈闄�', '杈芥渤鐭虫补鑱屼笟鎶�鏈闄�', '鍚夋灄澶у', '涓滃寳甯堣寖澶у', '寤惰竟澶у', '鍖楀崕澶у', + '闀挎槬澶у', '闀挎槬鐞嗗伐澶у', '闀挎槬宸ヤ笟澶у', '鍚夋灄鍐滀笟澶у', '闀挎槬涓尰鑽ぇ瀛�', '鍚夋灄甯堣寖澶у', '涓滃寳鐢靛姏澶у', '闀挎槬宸ョ▼瀛﹂櫌', '鍚夋灄寤虹瓚宸ョ▼瀛﹂櫌', '鍚夋灄鍖栧伐瀛﹂櫌', + '鍚夋灄鍐滀笟绉戞妧瀛﹂櫌', '鍚夋灄鍖昏嵂瀛﹂櫌', '鍚夋灄宸ョ▼鎶�鏈笀鑼冨闄�', '閫氬寲甯堣寖瀛﹂櫌', '鐧藉煄甯堣寖瀛﹂櫌', '闀挎槬甯堣寖瀛﹂櫌', '鍚夋灄鍗庢ˉ澶栧浗璇闄�', '闀挎槬绋庡姟瀛﹂櫌', '鍚夋灄宸ュ晢瀛﹂櫌', '鍚夋灄浣撹偛瀛﹂櫌', + '鍚夋灄鑹烘湳瀛﹂櫌', '鍚夋灄鍔ㄧ敾瀛﹂櫌', '鐧藉煄鍖诲楂樼瓑涓撶瀛︽牎', '闀挎槬姹借溅宸ヤ笟楂樼瓑涓撶瀛︽牎', '闀挎槬鍖诲楂樼瓑涓撶瀛︽牎', '闀挎槬閲戣瀺楂樼瓑涓撶瀛︽牎', '鍚夋灄鍏畨楂樼瓑涓撶瀛︽牎', '鍥涘钩鑱屼笟澶у', '鍚夋灄浜ら�氳亴涓氭妧鏈闄�', '闀挎槬涓滄柟鑱屼笟瀛﹂櫌', + '杈芥簮鑱屼笟鎶�鏈闄�', '闀跨櫧灞辫亴涓氭妧鏈闄�', '鍚夋灄鍙告硶璀﹀畼鑱屼笟瀛﹂櫌', '鏉惧師鑱屼笟鎶�鏈闄�', '闀挎槬鑱屼笟鎶�鏈闄�', '鍚夋灄鍐滀笟宸ョ▼鑱屼笟鎶�鏈闄�', '鍚夋灄宸ヤ笟鑱屼笟鎶�鏈闄�', '鍚夋灄鐢靛瓙淇℃伅鑱屼笟鎶�鏈闄�', '闀挎槬淇℃伅鎶�鏈亴涓氬闄�', '鍚夋灄閾侀亾鑱屼笟鎶�鏈闄�', + '鐧藉煄鑱屼笟鎶�鏈闄�', '涓滃寳鏋椾笟澶у', '鍝堝皵婊ㄥ伐涓氬ぇ瀛�', '鍝堝皵婊ㄥ伐绋嬪ぇ瀛�', '榛戦緳姹熷ぇ瀛�', '浣虫湪鏂ぇ瀛�', '榻愰綈鍝堝皵澶у', '鍝堝皵婊ㄧ悊宸ュぇ瀛�', '涓滃寳鍐滀笟澶у', '榛戦緳姹熷叓涓�鍐滃灕澶у', + '鍝堝皵婊ㄥ尰绉戝ぇ瀛�', '榛戦緳姹熶腑鍖昏嵂澶у', '鍝堝皵婊ㄥ笀鑼冨ぇ瀛�', '鍝堝皵婊ㄥ晢涓氬ぇ瀛�', '澶у簡鐭虫补瀛﹂櫌', '鍝堝皵婊ㄥ闄�', '榛戦緳姹熷伐绋嬪闄�', '榛戦緳姹熺鎶�瀛﹂櫌', '鐗′腹姹熷尰瀛﹂櫌', '榻愰綈鍝堝皵鍖诲闄�', + '澶у簡甯堣寖瀛﹂櫌', '鐗′腹姹熷笀鑼冨闄�', '鍝堝皵婊ㄥ痉寮哄晢鍔″闄�', '鍝堝皵婊ㄤ綋鑲插闄�', '缁ュ寲瀛﹂櫌', '榛戦緳姹熶笢鏂瑰闄�', '榛戞渤瀛﹂櫌', '澶у簡鍖诲楂樼瓑涓撶瀛︽牎', '榻愰綈鍝堝皵楂樼瓑甯堣寖涓撶瀛︽牎', '楣ゅ矖甯堣寖楂樼瓑涓撶瀛︽牎', + '榛戦緳姹熷辜鍎垮笀鑼冮珮绛変笓绉戝鏍�', '鍝堝皵婊ㄩ噾铻嶉珮绛変笓绉戝鏍�', '榛戦緳姹熺暅鐗у吔鍖昏亴涓氬闄�', '榛戦緳姹熷徃娉曡瀹樿亴涓氬闄�', '榛戦緳姹熸灄涓氳亴涓氭妧鏈闄�', '榛戦緳姹熷啘涓氬伐绋嬭亴涓氬闄�', '澶у簡鑱屼笟瀛﹂櫌', '榻愰綈鍝堝皵鑱屼笟瀛﹂櫌', '楦¤タ澶у', '浼婃槬鑱屼笟瀛﹂櫌', + '鐗′腹姹熷ぇ瀛�', '榛戦緳姹熷缓绛戣亴涓氭妧鏈闄�', '榛戦緳姹熷啘涓氳亴涓氭妧鏈闄�', '榛戦緳姹熷啘鍨﹁亴涓氬闄�', '榛戦緳姹熸皯鏃忚亴涓氬闄�', '涓冨彴娌宠亴涓氬闄�', '鍝堝皵婊ㄥ簲鐢ㄨ亴涓氭妧鏈闄�', '鍝堝皵婊ㄧ幇浠e叕鍏卞叧绯昏亴涓氬闄�', '榛戦緳姹熶氦閫氳亴涓氭妧鏈闄�', '榛戦緳姹熷寳寮�鑱屼笟鎶�鏈闄�', + '鍝堝皵婊ㄨ亴涓氭妧鏈闄�', '鍝堝皵婊ㄧ數鍔涜亴涓氭妧鏈闄�', '鍝堝皵婊ㄩ搧閬撹亴涓氭妧鏈闄�', '榛戦緳姹熷啘涓氱粡娴庤亴涓氬闄�', '浣虫湪鏂亴涓氬闄�', '榛戦緳姹熻壓鏈亴涓氬闄�', '榛戦緳姹熷伐鍟嗚亴涓氭妧鏈闄�', '榛戦緳姹熺伯椋熻亴涓氬闄�', '鍝堝皵婊ㄧ瀛︽妧鏈亴涓氬闄�', '榛戦緳姹熷晢涓氳亴涓氬闄�', + '榛戦緳姹熷啘鍨﹀啘涓氳亴涓氭妧鏈闄�', '榛戦緳姹熷啘鍨︽灄涓氳亴涓氭妧鏈闄�', '榛戦緳姹熷叕瀹夎瀹樿亴涓氬闄�', '榛戦緳姹熺敓鐗╃鎶�鑱屼笟瀛﹂櫌', '鍝堝皵婊ㄥ崕澶忚绠楁満鑱屼笟鎶�鏈闄�', '澶у叴瀹夊箔鑱屼笟瀛﹂櫌', '榛戦緳姹熺叅鐐亴涓氭妧鏈闄�', '榛戦緳姹熶俊鎭妧鏈亴涓氬闄�', '榛戦緳姹熸梾娓歌亴涓氭妧鏈闄�', '榛戦緳姹熶笁姹熺編鏈亴涓氬闄�', + '榛戦緳姹熺敓鎬佸伐绋嬭亴涓氬闄�', '澶嶆棪澶у', '鍚屾祹澶у', '涓婃捣浜ら�氬ぇ瀛�', '鍗庝笢鐞嗗伐澶у', '涓滃崕澶у', '鍗庝笢甯堣寖澶у', '涓婃捣澶栧浗璇ぇ瀛�', '涓婃捣璐㈢粡澶у', '涓婃捣澶у', + '涓婃捣鐞嗗伐澶у', '涓婃捣娴蜂簨澶у', '涓婃捣宸ョ▼鎶�鏈ぇ瀛�', '涓婃捣娴锋磱澶у', '涓婃捣涓尰鑽ぇ瀛�', '涓婃捣甯堣寖澶у', '鍗庝笢鏀挎硶澶у', '涓婃捣娴峰叧瀛﹂櫌', '涓婃捣寤烘ˉ瀛﹂櫌', '涓婃捣鏀挎硶瀛﹂櫌', + '涓婃捣搴旂敤鎶�鏈闄�', '涓婃捣绗簩宸ヤ笟澶у', '涓婃捣鐢垫満瀛﹂櫌', '涓婃捣鐢靛姏瀛﹂櫌', '涓婃捣瀵瑰璐告槗瀛﹂櫌', '涓婃捣閲戣瀺瀛﹂櫌', '涓婃捣绔嬩俊浼氳瀛﹂櫌', '涓婃捣浣撹偛瀛﹂櫌', '涓婃捣闊充箰瀛﹂櫌', '涓婃捣鎴忓墽瀛﹂櫌', + '涓婃捣鍟嗗闄�', '涓婃捣鏉夎揪瀛﹂櫌', '涓婃捣鍖荤枟鍣ㄦ楂樼瓑涓撶瀛︽牎', '涓婃捣鍑虹増鍗板埛楂樼瓑涓撶瀛︽牎', '涓婃捣鍖昏嵂楂樼瓑涓撶瀛︽牎', '涓婃捣鏃呮父楂樼瓑涓撶瀛︽牎', '涓婃捣鍏畨楂樼瓑涓撶瀛︽牎', '涓婃捣鐢靛奖鑹烘湳鑱屼笟瀛﹂櫌', '涓婃捣鏂颁鲸鑱屼笟鎶�鏈闄�', '涓婃捣涓滄捣鑱屼笟鎶�鏈闄�', + '涓婃捣鐢靛瓙淇℃伅鑱屼笟鎶�鏈闄�', '涓婃捣宸ヨ壓缇庢湳鑱屼笟瀛﹂櫌', '涓婃捣绔嬭揪鑱屼笟鎶�鏈闄�', '涓婃捣娴庡厜鑱屼笟鎶�鏈闄�', '涓婃捣浜ら�氳亴涓氭妧鏈闄�', '涓婃捣宸ュ晢澶栧浗璇亴涓氬闄�', '涓婃捣娴蜂簨鑱屼笟鎶�鏈闄�', '涓婃捣绉戝鎶�鏈亴涓氬闄�', '涓婃捣鍩庡競绠$悊鑱屼笟鎶�鏈闄�', '涓婃捣闇囨棪鑱屼笟瀛﹂櫌', + '涓婃捣涓崕鑱屼笟鎶�鏈闄�', '涓婃捣琛屽仴鑱屼笟瀛﹂櫌', '涓婃捣宸ヤ細绠$悊鑱屼笟瀛﹂櫌', '涓婃捣鎵樻櫘淇℃伅鎶�鏈亴涓氬闄�', '涓婃捣閭﹀痉鑱屼笟鎶�鏈闄�', '涓婃捣鍐滄灄鑱屼笟鎶�鏈闄�', '涓婃捣涓鲸鑱屼笟鎶�鏈闄�', '涓婃捣鎬濆崥鑱屼笟鎶�鏈闄�', '涓婃捣娆у崕鑱屼笟鎶�鏈闄�', '涓婃捣浣撹偛鑱屼笟瀛﹂櫌', + '涓婃捣姘戣繙鑱屼笟鎶�鏈闄�', '涓婃捣寤哄嘲鑱屼笟鎶�鏈闄�', '鍗椾含澶у', '涓滃崡澶у', '涓浗鐭夸笟澶у', '娌虫捣澶у', '姹熷崡澶у', '鍗椾含鍐滀笟澶у', '涓浗鑽澶у', '鍗椾含鐞嗗伐澶у', + '鍗椾含鑸┖鑸ぉ澶у', '鑻忓窞澶у', '鎵窞澶у', '姹熻嫃澶у', '鍗椾含閭數澶у', '姹熻嫃绉戞妧澶у', '鍗椾含宸ヤ笟澶у', '鍗椾含鏋椾笟澶у', '鍗椾含鍖荤澶у', '鍗椾含涓尰鑽ぇ瀛�', + '鍗椾含甯堣寖澶у', '寰愬窞甯堣寖澶у', '鍗椾含璐㈢粡澶у', '鍗楅�氬ぇ瀛�', '瑗夸氦鍒╃墿娴﹀ぇ瀛�', '鍗椾含淇℃伅宸ョ▼澶у', '娣槾宸ュ闄�', '寰愬窞宸ョ▼瀛﹂櫌', '娣捣宸ュ闄�', '甯稿窞宸ュ闄�', + '鐩愬煄宸ュ闄�', '姹熻嫃宸ヤ笟瀛﹂櫌', '閲戦櫟绉戞妧瀛﹂櫌', '鍗椾含宸ョ▼瀛﹂櫌', '寰愬窞鍖诲闄�', '姹熻嫃鎶�鏈笀鑼冨闄�', '娣槾甯堣寖瀛﹂櫌', '鍗椾含鏅撳簞瀛﹂櫌', '鐩愬煄甯堣寖瀛﹂櫌', '鑻忓窞绉戞妧瀛﹂櫌', + '鍗椾含瀹¤瀛﹂櫌', '姹熻嫃璀﹀畼瀛﹂櫌', '鍗椾含浣撹偛瀛﹂櫌', '鍗椾含鑹烘湳瀛﹂櫌', '甯哥啛鐞嗗伐瀛﹂櫌', '涓夋睙瀛﹂櫌', '鍗椾含妫灄鍏畨楂樼瓑涓撶瀛︽牎', '杩炰簯娓笀鑼冮珮绛変笓绉戝鏍�', '娉板窞甯堣寖楂樼瓑涓撶瀛︽牎', '闀囨睙甯傞珮绛変笓绉戝鏍�', + '姹熻嫃鐣滅墽鍏藉尰鑱屼笟鎶�鏈闄�', '鍗楅�氱汉缁囪亴涓氭妧鏈闄�', '鍗椾含宸ヤ笟鑱屼笟鎶�鏈闄�', '鏃犻敗鍟嗕笟鑱屼笟鎶�鏈闄�', '娉板窞鑱屼笟鎶�鏈闄�', '鍗楅�氳埅杩愯亴涓氭妧鏈闄�', '寰愬窞寤虹瓚鑱屼笟鎶�鏈闄�', '鏃犻敗鑱屼笟鎶�鏈闄�', '姘戝姙鏄庤揪鑱屼笟鎶�鏈闄�', '鍗楅�氳亴涓氬ぇ瀛�', + '娌欐床鑱屼笟宸ュ闄�', '鑻忓窞宸ヨ壓缇庢湳鑱屼笟鎶�鏈闄�', '鎵窞甯傝亴涓氬ぇ瀛�', '鑻忓窞鑱屼笟澶у', '杩炰簯娓亴涓氭妧鏈闄�', '姹熻嫃鍩庡競鑱屼笟瀛﹂櫌', '鑻忓窞楂樺崥杞欢鎶�鏈亴涓氬闄�', '姹熼槾鑱屼笟鎶�鏈闄�', '閽熷北鑱屼笟鎶�鏈闄�', '娣畨淇℃伅鑱屼笟鎶�鏈闄�', + '鍗椾含浜ら�氳亴涓氭妧鏈闄�', '姹熻嫃寤哄悍鑱屼笟瀛﹂櫌', '瀹胯縼鑱屼笟鎶�鏈闄�', '鑻忓窞淇℃伅鑱屼笟鎶�鏈闄�', '姹熻嫃椋熷搧鑱屼笟鎶�鏈闄�', '澶箹鍒涙剰鑱屼笟鎶�鏈闄�', '姹熻嫃娴蜂簨鑱屼笟鎶�鏈闄�', '姹熻嫃缁忚锤鑱屼笟鎶�鏈闄�', '鍗椾含淇℃伅鑱屼笟鎶�鏈闄�', '甯稿窞宸ョ▼鑱屼笟鎶�鏈闄�', + '甯稿窞杞诲伐鑱屼笟鎶�鏈闄�', '寰愬窞宸ヤ笟鑱屼笟鎶�鏈闄�', '姹熻嫃鍐滄灄鑱屼笟鎶�鏈闄�', '姹熻嫃淇℃伅鑱屼笟鎶�鏈闄�', '鑻忓窞娓ぇ鎬濆煿绉戞妧鑱屼笟瀛﹂櫌', '鏄嗗北鐧讳簯绉戞妧鑱屼笟瀛﹂櫌', '鍗椾含鏃呮父鑱屼笟瀛﹂櫌', '鑻忓窞宸ヤ笟鍥尯鑱屼笟鎶�鏈闄�', '鑻忓窞缁忚锤鑱屼笟鎶�鏈闄�', '甯稿窞鏈虹數鑱屼笟鎶�鏈闄�', + '姹熸捣鑱屼笟鎶�鏈闄�', '鍗椾含鍖栧伐鑱屼笟鎶�鏈闄�', '鐩愬煄鍗敓鑱屼笟鎶�鏈闄�', '甯稿窞淇℃伅鑱屼笟鎶�鏈闄�', '姝e痉鑱屼笟鎶�鏈闄�', '鐐庨粍鑱屼笟鎶�鏈闄�', '涔濆窞鑱屼笟鎶�鏈闄�', '鏃犻敗鍩庡競鑱屼笟鎶�鏈闄�', '鏃犻敗宸ヨ壓鑱屼笟鎶�鏈闄�', '鍋ラ泟鑱屼笟鎶�鏈闄�', + '姹熻嫃璐㈢粡鑱屼笟鎶�鏈闄�', '鐩愬煄绾虹粐鑱屼笟鎶�鏈闄�', '甯稿窞绾虹粐鏈嶈鑱屼笟鎶�鏈闄�', '鍗椾含閾侀亾鑱屼笟鎶�鏈闄�', '鑻忓窞宸ヤ笟鑱屼笟鎶�鏈闄�', '閲戝北鑱屼笟鎶�鏈闄�', '绱悈鑱屼笟鎶�鏈闄�', '閲戣偗鑱屼笟鎶�鏈闄�', '姹熻嫃鑱斿悎鑱屼笟鎶�鏈闄�', '姹熷崡褰辫鑹烘湳鑱屼笟瀛﹂櫌', + '寤轰笢鑱屼笟鎶�鏈闄�', '鑻忓窞鎵樻櫘淇℃伅鑱屼笟鎶�鏈闄�', '搴斿ぉ鑱屼笟鎶�鏈闄�', '鏃犻敗绉戞妧鑱屼笟瀛﹂櫌', '鍗楅�氬啘涓氳亴涓氭妧鏈闄�', '鎵窞鐜璧勬簮鑱屼笟鎶�鏈闄�', '鎵窞宸ヤ笟鑱屼笟鎶�鏈闄�', '鍗椾含鏈虹數鑱屼笟鎶�鏈闄�', '鑻忓窞鍐滀笟鑱屼笟鎶�鏈闄�', '鍗椾含瑙嗚鑹烘湳鑱屼笟瀛﹂櫌', + '鑻忓窞鍗敓鑱屼笟鎶�鏈闄�', '鍗椾含鐗规畩鏁欒偛鑱屼笟鎶�鏈闄�', '鏃犻敗鍗楁磱鑱屼笟鎶�鏈闄�', '纭呮箹鑱屼笟鎶�鏈闄�', '娴欐睙澶у', '瀹佹尝澶у', '娴欐睙宸ヤ笟澶у', '鏉窞鐢靛瓙绉戞妧澶у', '娴欐睙鐞嗗伐澶у', '娴欐睙涓尰鑽ぇ瀛�', + '娴欐睙甯堣寖澶у', '鏉窞甯堣寖澶у', '娴欐睙宸ュ晢澶у', '瀹佹尝璇轰竵姹夊ぇ瀛�', '娓╁窞澶у', '瀹佹尝澶х孩楣板闄�', '娴欐睙瓒婄澶栧浗璇闄�', '鍢夊叴瀛﹂櫌', '涓浗璁¢噺瀛﹂櫌', '娴欐睙绉戞妧瀛﹂櫌', + '瀹佹尝宸ョ▼瀛﹂櫌', '娴欐睙娴锋磱瀛﹂櫌', '娴欐睙鏋楀闄�', '娓╁窞鍖诲闄�', '婀栧窞甯堣寖瀛﹂櫌', '缁嶅叴鏂囩悊瀛﹂櫌', '鍙板窞瀛﹂櫌', '娴欐睙浼犲獟瀛﹂櫌', '娴欐睙璐㈢粡瀛﹂櫌', '娴欐睙璀﹀療瀛﹂櫌', + '涓浗缇庢湳瀛﹂櫌', '娴欐睙鏍戜汉瀛﹂櫌', '娴欐睙涓囬噷瀛﹂櫌', '涓芥按瀛﹂櫌', '鍏畨娴疯楂樼瓑涓撶瀛︽牎', '娴欐睙姘村埄姘寸數涓撶瀛︽牎', '娴欐睙鍖诲楂樼瓑涓撶瀛︽牎', '娴欐睙鍖昏嵂楂樼瓑涓撶瀛︽牎', '閲戝崕鑱屼笟鎶�鏈闄�', '瀹佹尝鑱屼笟鎶�鏈闄�', + '娓╁窞鑱屼笟鎶�鏈闄�', '娴欐睙浜ら�氳亴涓氭妧鏈闄�', '娴欐睙閲戣瀺鑱屼笟瀛﹂櫌', '鏉窞绉戞妧鑱屼笟鎶�鏈闄�', '婀栧窞鑱屼笟鎶�鏈闄�', '娴欐睙鏃呮父鑱屼笟瀛﹂櫌', '鍙板窞鑱屼笟鎶�鏈闄�', '娴欐睙宸ヨ锤鑱屼笟鎶�鏈闄�', '娴欐睙宸ヤ笟鑱屼笟鎶�鏈闄�', '鏉窞涓囧悜鑱屼笟鎶�鏈闄�', + '娴欐睙宸ュ晢鑱屼笟鎶�鏈闄�', '娴欐睙缁忔祹鑱屼笟鎶�鏈闄�', '娴欐睙鏈虹數鑱屼笟鎶�鏈闄�', '琛㈠窞鑱屼笟鎶�鏈闄�', '娴欐睙涓滄柟鑱屼笟鎶�鏈闄�', '涔変箤宸ュ晢鑱屼笟鎶�鏈闄�', '鍢夊叴鍗楁磱鑱屼笟鎶�鏈闄�', '瀹佹尝鍩庡競鑱屼笟鎶�鏈闄�', '娴欐睙浣撹偛鑱屼笟鎶�鏈闄�', '娴欐睙鐢靛姏鑱屼笟鎶�鏈闄�', + '娴欐睙鍚屾祹绉戞妧鑱屼笟瀛﹂櫌', '娴欐睙閭數鑱屼笟鎶�鏈闄�', '鍙板窞绉戞妧鑱屼笟瀛﹂櫌', '娓╁窞绉戞妧鑱屼笟瀛﹂櫌', '缁嶅叴鎵樻櫘淇℃伅鑱屼笟鎶�鏈闄�', '娴欐睙闀垮緛鑱屼笟鎶�鏈闄�', '娴欐睙姹借溅鑱屼笟鎶�鏈闄�', '娴欐睙绾虹粐鏈嶈鑱屼笟鎶�鏈闄�', '娴欐睙鍥介檯娴疯繍鑱屼笟鎶�鏈闄�', '娴欐睙璀﹀畼鑱屼笟瀛﹂櫌', + '娴欐睙寤鸿鑱屼笟鎶�鏈闄�', '鏉窞鑱屼笟鎶�鏈闄�', '瀹佹尝澶╀竴鑱屼笟鎶�鏈闄�', '娴欐睙鍟嗕笟鑱屼笟鎶�鏈闄�', '娴欐睙鑲茶嫳鑱屼笟鎶�鏈闄�', '鍢夊叴鑱屼笟鎶�鏈闄�', '娴欐睙妯簵褰辫鑱屼笟瀛﹂櫌', '娴欐睙骞垮帵寤鸿鑱屼笟鎶�鏈闄�', '涓芥按鑱屼笟鎶�鏈闄�', '娴欐睙缁忚锤鑱屼笟鎶�鏈闄�', + '娴欐睙鑹烘湳鑱屼笟瀛﹂櫌', '鍚堣偉宸ヤ笟澶у', '涓浗绉戝鎶�鏈ぇ瀛�', '瀹夊窘澶у', '瀹夊窘鐞嗗伐澶у', '瀹夊窘宸ヤ笟澶у', '瀹夊窘鍐滀笟澶у', '瀹夊窘鍖荤澶у', '瀹夊窘甯堣寖澶у', '瀹夊窘璐㈢粡澶у', + '瀹夊窘涓夎仈瀛﹂櫌', '瀹夊窘宸ョ▼绉戞妧瀛﹂櫌', '瀹夊窘寤虹瓚宸ヤ笟瀛﹂櫌', '瀹夊窘涓尰瀛﹂櫌', '鐨栧崡鍖诲闄�', '铓屽煚鍖诲闄�', '娣崡甯堣寖瀛﹂櫌', '娣寳鐓ょ偔甯堣寖瀛﹂櫌', '瀹夊簡甯堣寖瀛﹂櫌', '瀹夊窘绉戞妧瀛﹂櫌', + '闃滈槼甯堣寖瀛﹂櫌', '鍚堣偉甯堣寖瀛﹂櫌', '鐨栬タ瀛﹂櫌', '姹犲窞瀛﹂櫌', '鍚堣偉瀛﹂櫌', '榛勫北瀛﹂櫌', '铓屽煚瀛﹂櫌', '閾滈櫟瀛﹂櫌', '瀹垮窞瀛﹂櫌', '婊佸窞瀛﹂櫌', + '宸㈡箹瀛﹂櫌', '瀹夊窘鏂板崕瀛﹂櫌', '椹瀺灞卞笀鑼冮珮绛変笓绉戝鏍�', '瀹夊窘涓尰鑽珮绛変笓绉戝鏍�', '瀹夊簡鍖昏嵂楂樼瓑涓撶瀛︽牎', '瀹夊窘鍖诲楂樼瓑涓撶瀛︽牎', '浜冲窞甯堣寖楂樼瓑涓撶瀛︽牎', '娣寳鑱屼笟鎶�鏈闄�', '瀹夊窘姘村埄姘寸數鑱屼笟鎶�鏈闄�', '鑺滄箹鑱屼笟鎶�鏈闄�', + '閾滈櫟鑱屼笟鎶�鏈闄�', '瀹夊窘鍟嗚锤鑱屼笟鎶�鏈闄�', '娣崡鑱屼笟鎶�鏈闄�', '娣崡鑱斿悎澶у', '瀹夊窘鑱屼笟鎶�鏈闄�', '姘戝姙涓囧崥绉戞妧鑱屼笟瀛﹂櫌', '瀹夊窘璀﹀畼鑱屼笟瀛﹂櫌', '瀹夊窘瀹¤鑱屼笟瀛﹂櫌', '瀹夊窘鐭夸笟鑱屼笟鎶�鏈闄�', '瀹夊窘閭數鑱屼笟鎶�鏈闄�', + '瀹夊窘鍏畨鑱屼笟瀛﹂櫌', '瀹夊窘宸ヤ笟鑱屼笟鎶�鏈闄�', '姘戝姙瀹夊窘澶栧浗璇亴涓氭妧鏈闄�', '鍚堣偉閫氱敤鑱屼笟鎶�鏈闄�', '瀹夊窘宸ヤ笟缁忔祹鑱屼笟鎶�鏈闄�', '瀹夊窘鏂伴椈鍑虹増鑱屼笟鎶�鏈闄�', '宸㈡箹鑱屼笟鎶�鏈闄�', '姘戝姙瀹夊窘鏂囪揪淇℃伅鎶�鏈亴涓氬闄�', '瀹垮窞鑱屼笟鎶�鏈闄�', '瀹夊窘浣撹偛杩愬姩鑱屼笟鎶�鏈闄�', + '姘戝姙鍚堣偉缁忔祹鎶�鏈亴涓氬闄�', '瀹夊窘鐢靛瓙淇℃伅鑱屼笟鎶�鏈闄�', '姘戝姙鍚堣偉婊ㄦ箹鑱屼笟鎶�鏈闄�', '鍏畨鑱屼笟鎶�鏈闄�', '闃滈槼绉戞妧鑱屼笟瀛﹂櫌', '瀹夊窘鏈虹數鑱屼笟鎶�鏈闄�', '瀹夊窘鍩庡競绠$悊鑱屼笟瀛﹂櫌', '瀹夊窘鑹烘湳鑱屼笟瀛﹂櫌', '瀹夊窘鍥介槻绉戞妧鑱屼笟瀛﹂櫌', '瀹夊窘宸ュ晢鑱屼笟瀛﹂櫌', + '瀹夊窘鍐堕噾绉戞妧鑱屼笟瀛﹂櫌', '姘戝姙瀹夊窘鏃呮父鑱屼笟瀛﹂櫌', '瀹夊簡鑱屼笟鎶�鏈闄�', '寰藉晢鑱屼笟瀛﹂櫌', '铓屽煚缁忔祹鎶�鏈亴涓氬闄�', '鍚堣偉鍏辫揪鑱屼笟鎶�鏈闄�', '瀹夊窘缁挎捣鍟嗗姟鑱屼笟瀛﹂櫌', '瀹夊窘娑夊缁忔祹鑱屼笟瀛﹂櫌', '鍚堣偉淇℃伅鎶�鏈亴涓氬闄�', '椹瀺灞辫亴涓氭妧鏈闄�', + '瀹夊窘宸ヨ锤鑱屼笟鎶�鏈闄�', '瀹夊窘鐢垫皵宸ョ▼鑱屼笟鎶�鏈闄�', '瀹夊窘鍥介檯鍟嗗姟鑱屼笟瀛﹂櫌', '姹犲窞鑱屼笟鎶�鏈闄�', '瀹夊窘浜ら�氳亴涓氭妧鏈闄�', '瀹e煄鑱屼笟鎶�鏈闄�', '浜冲窞鑱屼笟鎶�鏈闄�', '瀹夊窘鐜颁唬淇℃伅宸ョ▼鑱屼笟瀛﹂櫌', '鑺滄箹淇℃伅鎶�鏈亴涓氬闄�', '瀹夊窘璐㈣锤鑱屼笟瀛﹂櫌', + '瀹夊窘涓境绉戞妧鑱屼笟瀛﹂櫌', '婊佸窞鑱屼笟鎶�鏈闄�', '瀹夊窘骞挎挱褰辫鑱屼笟鎶�鏈闄�', '瀹夊窘鏋椾笟鑱屼笟鎶�鏈闄�', '姘戝姙鍚堣偉璐㈢粡鑱屼笟瀛﹂櫌', '闃滈槼鑱屼笟鎶�鏈闄�', '鍘﹂棬澶у', '鍗庝鲸澶у', '绂忓缓鍐滄灄澶у', '闆嗙編澶у', + '绂忓窞澶у', '浠版仼澶у', '绂忓缓鍖荤澶у', '绂忓缓甯堣寖澶у', '鍘﹂棬鐞嗗伐瀛﹂櫌', '闂藉崡鐞嗗伐瀛﹂櫌', '绂忓缓宸ョ▼瀛﹂櫌', '绂忓缓涓尰瀛﹂櫌', '娉夊窞甯堣寖瀛﹂櫌', '婕冲窞甯堣寖瀛﹂櫌', + '绂忓缓璀﹀療瀛﹂櫌', '姝﹀し瀛﹂櫌', '榫欏博瀛﹂櫌', '鑾嗙敯瀛﹂櫌', '闂芥睙瀛﹂櫌', '涓夋槑瀛﹂櫌', '鍘﹂棬鍖诲楂樼瓑涓撶瀛︽牎', '娉夊窞鍖诲楂樼瓑涓撶瀛︽牎', '瀹佸痉甯堣寖楂樼瓑涓撶瀛︽牎', '绂忓缓鍟嗕笟楂樼瓑涓撶瀛︽牎', + '绂忓缓鍗庡崡濂冲瓙鑱屼笟瀛﹂櫌', '榛庢槑鑱屼笟澶у', '绂忓窞鑻卞崕鑱屼笟瀛﹂櫌', '绂忓缓浜ら�氳亴涓氭妧鏈闄�', '娉夊窞绾虹粐鏈嶈鑱屼笟瀛﹂櫌', '婕冲窞鑱屼笟鎶�鏈闄�', '鍘﹂棬鍗庡鑱屼笟瀛﹂櫌', '绂忓窞杞欢鑱屼笟鎶�鏈闄�', '娉夊窞杞诲伐鑱屼笟瀛﹂櫌', '绂忓窞澶栬澶栬锤鑱屼笟鎶�鏈闄�', + '绂忓窞榛庢槑鑱屼笟鎶�鏈闄�', '绂忓窞娴峰场鑱屼笟鎶�鏈闄�', '闂藉寳鑱屼笟鎶�鏈闄�', '鍘﹂棬鍗庡ぉ娑夊鑱屼笟鎶�鏈闄�', '绂忓缓閲戣瀺鑱屼笟鎶�鏈闄�', '绂忓窞绉戞妧鑱屼笟鎶�鏈闄�', '寰峰寲闄剁摲鑱屼笟鎶�鏈闄�', '绂忓缓鐢熺墿宸ョ▼鑱屼笟鎶�鏈闄�', '绂忓缓鑹烘湳鑱屼笟瀛﹂櫌', '涓夋槑鑱屼笟鎶�鏈闄�', + '婕冲窞鍩庡競鑱屼笟瀛﹂櫌', '绂忓缓璀﹀畼鑱屼笟瀛﹂櫌', '闂借タ鑱屼笟鎶�鏈闄�', '鍘﹂棬杞欢鑱屼笟鎶�鏈闄�', '鍘﹂棬瀹夐槻绉戞妧鑱屼笟瀛﹂櫌', '婕冲窞鍗敓鑱屼笟瀛﹂櫌', '绂忓窞鑱屼笟鎶�鏈闄�', '绂忓缓鍗敓鑱屼笟鎶�鏈闄�', '娉夊窞鍗庡厜鎽勫奖鑹烘湳鑱屼笟瀛﹂櫌', '娉夊窞淇℃伅鑱屼笟鎶�鏈闄�', + '鍘﹂棬鍩庡競鑱屼笟瀛﹂櫌', '鍘﹂棬婕旇壓鑱屼笟瀛﹂櫌', '瀹佸痉鑱屼笟鎶�鏈闄�', '绂忓缓浣撹偛鑱屼笟鎶�鏈闄�', '鍘﹂棬鍏存墠鑱屼笟鎶�鏈闄�', '绂忓缓瀵瑰缁忔祹璐告槗鑱屼笟鎶�鏈闄�', '婀勬床婀捐亴涓氭妧鏈闄�', '娉夊窞缁忚锤鑱屼笟鎶�鏈闄�', '娉夊窞鐞嗗伐鑱屼笟瀛﹂櫌', '鍘﹂棬涓滄捣鑱屼笟鎶�鏈闄�', + '鍘﹂棬鍗楁磱鑱屼笟瀛﹂櫌', '娉夊窞娉板北鑸捣鑱屼笟瀛﹂櫌', '婕冲窞澶╃鑼惰亴涓氭妧鏈闄�', '婕冲窞鍚夐┈鍗板埛鑱屼笟鎶�鏈闄�', '姝﹀し灞辫亴涓氬闄�', '绂忓缓淇℃伅鑱屼笟鎶�鏈闄�', '鍘﹂棬娴锋磱鑱屼笟鎶�鏈闄�', '绂忓缓鍐滀笟鑱屼笟鎶�鏈闄�', '绂忓缓鏋椾笟鑱屼笟鎶�鏈闄�', '绂忓缓鐢靛姏鑱屼笟鎶�鏈闄�', + '绂忓缓姘村埄鐢靛姏鑱屼笟鎶�鏈闄�', '鍗楁槍澶у', '姹熻タ鐞嗗伐澶у', '鍗庝笢浜ら�氬ぇ瀛�', '涓滃崕鐞嗗伐澶у', '鍗楁槍鑸┖澶у', '姹熻タ鍐滀笟澶у', '姹熻タ甯堣寖澶у', '姹熻タ璐㈢粡澶у', '浜曞唸灞卞ぇ瀛�', + '鏅痉闀囬櫠鐡峰闄�', '鍗楁槍宸ョ▼瀛﹂櫌', '鍗楁槍鐞嗗伐瀛﹂櫌', '姹熻タ涓尰瀛﹂櫌', '璧e崡鍖诲闄�', '璧e崡甯堣寖瀛﹂櫌', '姹熻タ绉戞妧甯堣寖瀛﹂櫌', '涓婇ザ甯堣寖瀛﹂櫌', '涔濇睙瀛﹂櫌', '姹熻タ钃濆ぉ瀛﹂櫌', + '瀹滄槬瀛﹂櫌', '鍗楁槍甯堣寖楂樼瓑涓撶瀛︽牎', '姹熻タ涓尰鑽珮绛変笓绉戝鏍�', '姹熻タ鍏畨涓撶瀛︽牎', '鏂颁綑楂樼瓑涓撶瀛︽牎', '鏅痉闀囬珮绛変笓绉戝鏍�', '钀嶄埂楂樼瓑涓撶瀛︽牎', '姹熻タ鎶ょ悊鑱屼笟鎶�鏈闄�', '姹熻タ宸ヤ笟鑱屼笟鎶�鏈闄�', '涔濇睙鑱屼笟澶у', + '涔濇睙鑱屼笟鎶�鏈闄�', '姹熻タ娓濆窞绉戞妧鑱屼笟瀛﹂櫌', '姹熻タ缁忔祹绠$悊鑱屼笟瀛﹂櫌', '姹熻タ寤鸿鑱屼笟鎶�鏈闄�', '鎶氬窞鑱屼笟鎶�鏈闄�', '姹熻タ澶栬澶栬锤鑱屼笟瀛﹂櫌', '姹熻タ澶у畤鑱屼笟鎶�鏈闄�', '姹熻タ宸ヤ笟璐告槗鑱屼笟鎶�鏈闄�', '姹熻タ鐜宸ョ▼鑱屼笟瀛﹂櫌', '姹熻タ淇℃伅搴旂敤鑱屼笟鎶�鏈闄�', + '姹熻タ绠$悊鑱屼笟瀛﹂櫌', '姹熻タ鏈嶈鑱屼笟鎶�鏈闄�', '姹熻タ鏂伴椈鍑虹増鑱屼笟鎶�鏈闄�', '姹熻タ搴旂敤宸ョ▼鑱屼笟瀛﹂櫌', '姹熻タ闈掑勾鑱屼笟瀛﹂櫌', '姹熻タ鍩庡競鑱屼笟瀛﹂櫌', '姹熻タ宸ヤ笟宸ョ▼鑱屼笟鎶�鏈闄�', '姹熻タ宸ョ▼鑱屼笟瀛﹂櫌', '姹熻タ鏃呮父鍟嗚锤鑱屼笟瀛﹂櫌', '姹熻タ鍏堥攱杞欢鑱屼笟鎶�鏈闄�', + '姹熻タ鍙告硶璀﹀畼鑱屼笟瀛﹂櫌', '姹熻タ鐢熺墿绉戞妧鑱屼笟瀛﹂櫌', '姹熻タ鍐堕噾鑱屼笟鎶�鏈闄�', '姹熻タ鍒堕�犺亴涓氭妧鏈闄�', '姹熻タ鏈虹數鑱屼笟鎶�鏈闄�', '姹熻タ闄剁摲宸ヨ壓缇庢湳鑱屼笟鎶�鏈闄�', '姹熻タ绉戞妧鑱屼笟瀛﹂櫌', '瀹滄槬鑱屼笟鎶�鏈闄�', '姹熻タ鐢靛姏鑱屼笟鎶�鏈闄�', '涓婇ザ鑱屼笟鎶�鏈闄�', + '姹熻タ鑹烘湳鑱屼笟瀛﹂櫌', '姹熻タ璐㈢粡鑱屼笟瀛﹂櫌', '姹熻タ搴旂敤鎶�鏈亴涓氬闄�', '姹熻タ鐜颁唬鑱屼笟鎶�鏈闄�', '楣版江鑱屼笟鎶�鏈闄�', '姹熻タ鑸┖鑱屼笟鎶�鏈闄�', '姹熻タ鍐滀笟宸ョ▼鑱屼笟瀛﹂櫌', '姹熻タ娉拌豹鍔ㄦ极鑱屼笟瀛﹂櫌', '姹熻タ鏋灄娑夊缁忚锤鑱屼笟瀛﹂櫌', '姹熻タ澶槼鑳界鎶�鑱屼笟瀛﹂櫌', + '璧hタ绉戞妧鑱屼笟瀛﹂櫌', '姹熻タ浜ら�氳亴涓氭妧鏈闄�', '姹熻タ璧f睙鑱屼笟鎶�鏈闄�', '灞变笢澶у', '涓浗娴锋磱澶у', '闈掑矝澶у', '灞变笢绉戞妧澶у', '灞变笢鐞嗗伐澶у', '鑱婂煄澶у', '鐑熷彴澶у', + '闈掑矝绉戞妧澶у', '闈掑矝鐞嗗伐澶у', '娴庡崡澶у', '灞变笢寤虹瓚澶у', '灞变笢鍐滀笟澶у', '闈掑矝鍐滀笟澶у', '灞变笢涓尰鑽ぇ瀛�', '灞变笢甯堣寖澶у', '鏇查槣甯堣寖澶у', '椴佷笢澶у', + '灞变笢涓囨澃鍖诲闄�', '娼嶅潑绉戞妧瀛﹂櫌', '灞变笢鑻辨墠瀛﹂櫌', '灞变笢杞诲伐涓氬闄�', '娼嶅潑瀛﹂櫌', '灞变笢浜ら�氬闄�', '娼嶅潑鍖诲闄�', '娉板北鍖诲闄�', '婊ㄥ窞鍖诲闄�', '娴庡畞鍖诲闄�', + '涓存矀甯堣寖瀛﹂櫌', '寰峰窞瀛﹂櫌', '灞变笢缁忔祹瀛﹂櫌', '灞变笢璐㈡斂瀛﹂櫌', '灞变笢宸ュ晢瀛﹂櫌', '灞变笢璀﹀療瀛﹂櫌', '灞变笢鏀挎硶瀛﹂櫌', '灞变笢浣撹偛瀛﹂櫌', '灞变笢鑹烘湳瀛﹂櫌', '灞变笢宸ヨ壓缇庢湳瀛﹂櫌', + '鐑熷彴鍗楀北瀛﹂櫌', '闈掑矝婊ㄦ捣瀛﹂櫌', '婊ㄥ窞瀛﹂櫌', '鏋e簞瀛﹂櫌', '娴庡畞瀛﹂櫌', '鑿忔辰瀛﹂櫌', '娉板北瀛﹂櫌', '灞变笢涓尰鑽珮绛変笓绉戝鏍�', '娣勫崥甯堣寖楂樼瓑涓撶瀛︽牎', '灞变笢鐢靛姏楂樼瓑涓撶瀛︽牎', + '鑿忔辰鍖诲涓撶瀛︽牎', '灞变笢鍖诲楂樼瓑涓撶瀛︽牎', '灞变笢鐣滅墽鍏藉尰鑱屼笟瀛﹂櫌', '鏇查槣杩滀笢鑱屼笟鎶�鏈闄�', '鏃ョ収鑱屼笟鎶�鏈闄�', '灞变笢鍟嗕笟鑱屼笟鎶�鏈闄�', '娴庡畞鑱屼笟鎶�鏈闄�', '濞佹捣鑱屼笟瀛﹂櫌', '闈掑矝鑱屼笟鎶�鏈闄�', '鑾辫姕鑱屼笟鎶�鏈闄�', + '鑱婂煄鑱屼笟鎶�鏈闄�', '灞变笢鍔冲姩鑱屼笟鎶�鏈闄�', '灞变笢澶栬锤鑱屼笟瀛﹂櫌', '灞变笢鍙告硶璀﹀畼鑱屼笟瀛﹂櫌', '鑿忔辰瀹舵斂鑱屼笟瀛﹂櫌', '娼嶅潑宸ュ晢鑱屼笟瀛﹂櫌', '灞变笢閾濅笟鑱屼笟瀛﹂櫌', '灞变笢鍗庡畤鑱屼笟鎶�鏈闄�', '灞变笢鍑枃绉戞妧鑱屼笟瀛﹂櫌', '灞变笢浜ら�氳亴涓氬闄�', + '鐑熷彴姹借溅宸ョ▼鑱屼笟瀛﹂櫌', '灞变笢缁忚锤鑱屼笟瀛﹂櫌', '灞变笢鐞嗗伐鑱屼笟瀛﹂櫌', '闈掑矝閰掑簵绠$悊鑱屼笟鎶�鏈闄�', '娣勫崥绉戞妧鑱屼笟瀛﹂櫌', '灞变笢鐜颁唬鑱屼笟瀛﹂櫌', '灞变笢澶х帇鑱屼笟瀛﹂櫌', '婊ㄥ窞鑱屼笟瀛﹂櫌', '灞变笢鏈嶈鑱屼笟瀛﹂櫌', '鐑熷彴鑱屼笟瀛﹂櫌', + '闈掑矝榛勬捣鑱屼笟瀛﹂櫌', '闈掑矝椋炴磱鑱屼笟鎶�鏈闄�', '涓滆惀鑱屼笟瀛﹂櫌', '寰峰窞绉戞妧鑱屼笟瀛﹂櫌', '娼嶅潑鑱屼笟瀛﹂櫌', '灞变笢鍔涙槑绉戞妧鑱屼笟瀛﹂櫌', '灞变笢鍟嗗姟鑱屼笟瀛﹂櫌', '灞变笢绉戞妧鑱屼笟瀛﹂櫌', '灞变笢淇℃伅鑱屼笟鎶�鏈闄�', '灞变笢姘村埄鑱屼笟瀛﹂櫌', + '灞变笢澶栧浗璇亴涓氬闄�', '灞变笢鍗忓拰鑱屼笟鎶�鏈闄�', '鏋e簞鑱屼笟瀛﹂櫌', '闈掑矝姹傚疄鑱屼笟鎶�鏈闄�', '娉板北鑱屼笟鎶�鏈闄�', '娴庡崡宸ョ▼鑱屼笟鎶�鏈闄�', '娴庡崡閾侀亾鑱屼笟鎶�鏈闄�', '灞变笢鏉忔灄绉戞妧鑱屼笟瀛﹂櫌', '灞变笢澶栦簨缈昏瘧鑱屼笟瀛﹂櫌', '鐑熷彴宸ョ▼鑱屼笟鎶�鏈闄�', + '灞变笢鑽搧椋熷搧鑱屼笟瀛﹂櫌', '灞变笢鏃呮父鑱屼笟瀛﹂櫌', '闈掑矝鎭掓槦鑱屼笟鎶�鏈闄�', '寰峰窞鑱屼笟鎶�鏈闄�', '灞变笢鑳滃埄鑱屼笟瀛﹂櫌', '鏋e簞绉戞妧鑱屼笟瀛﹂櫌', '灞变笢鍦g堪璐㈣锤鑱屼笟瀛﹂櫌', '灞变笢鐢靛瓙鑱屼笟鎶�鏈闄�', '娣勫崥鑱屼笟瀛﹂櫌', '灞变笢鍖栧伐鑱屼笟瀛﹂櫌', + '灞变笢浼犲獟鑱屼笟瀛﹂櫌', '灞变笢鍩庡競寤鸿鑱屼笟瀛﹂櫌', '闈掑矝娓咕鑱屼笟鎶�鏈闄�', '灞变笢涓濈桓绾虹粐鑱屼笟瀛﹂櫌', '涓存矀鑱屼笟瀛﹂櫌', '娴庡崡鑱屼笟瀛﹂櫌', '灞变笢宸ヤ笟鑱屼笟瀛﹂櫌', '閮戝窞澶у', '娌冲崡澶у', '娌冲崡绉戞妧澶у', + '娌冲崡鐞嗗伐澶у', '娌冲崡宸ヤ笟澶у', '娌冲崡鍐滀笟澶у', '娌冲崡甯堣寖澶у', '閮戝窞绉戞妧瀛﹂櫌', '閮戝窞鍗庝俊瀛﹂櫌', '鍗庡寳姘村埄姘寸數瀛﹂櫌', '閮戝窞杞诲伐涓氬闄�', '娌冲崡鍩庡缓瀛﹂櫌', '閮戝窞鑸┖宸ヤ笟绠$悊瀛﹂櫌', + '涓師宸ュ闄�', '榛勬渤绉戞妧瀛﹂櫌', '鍗楅槼鐞嗗伐瀛﹂櫌', '瀹夐槼宸ュ闄�', '娌冲崡宸ョ▼瀛﹂櫌', '娲涢槼鐞嗗伐瀛﹂櫌', '娌冲崡涓尰瀛﹂櫌', '鏂颁埂鍖诲闄�', '淇¢槼甯堣寖瀛﹂櫌', '鍛ㄥ彛甯堣寖瀛﹂櫌', + '鍗楅槼甯堣寖瀛﹂櫌', '娲涢槼甯堣寖瀛﹂櫌', '鍟嗕笜甯堣寖瀛﹂櫌', '瀹夐槼甯堣寖瀛﹂櫌', '娌冲崡璐㈢粡瀛﹂櫌', '榛勬樊瀛﹂櫌', '鏂颁埂瀛﹂櫌', '娌冲崡绉戞妧瀛﹂櫌', '璁告槍瀛﹂櫌', '骞抽《灞卞闄�', + '閾侀亾璀﹀畼楂樼瓑涓撶瀛︽牎', '婕渤鍖诲楂樼瓑涓撶瀛︽牎', '閮戝窞鐢靛姏楂樼瓑涓撶瀛︽牎', '娌冲崡鏈虹數楂樼瓑涓撶瀛︽牎', '閮戝窞鐗т笟宸ョ▼楂樼瓑涓撶瀛︽牎', '淇¢槼鍐滀笟楂樼瓑涓撶瀛︽牎', '閮戝窞婢嶉潚鍖诲楂樼瓑涓撶瀛︽牎', '鍟嗕笜鍖诲楂樼瓑涓撶瀛︽牎', '鍗楅槼鍖诲楂樼瓑涓撶瀛︽牎', '鐒︿綔甯堣寖楂樼瓑涓撶瀛︽牎', + '閮戝窞甯堣寖楂樼瓑涓撶瀛︽牎', '娌冲崡鍟嗕笟楂樼瓑涓撶瀛︽牎', '娌冲崡璐㈡斂绋庡姟楂樼瓑涓撶瀛︽牎', '娌冲崡鍏畨楂樼瓑涓撶瀛︽牎', '涓夐棬宄¤亴涓氭妧鏈闄�', '娌冲崡鑱屼笟鎶�鏈闄�', '閮戝窞閾佽矾鑱屼笟鎶�鏈闄�', '榛勬渤姘村埄鑱屼笟鎶�鏈闄�', '婕渤鑱屼笟鎶�鏈闄�', '涓窞澶у', + '鐒︿綔澶у', '寮�灏佸ぇ瀛�', '閮戝窞鏃呮父鑱屼笟瀛﹂櫌', '閮戝窞缁忚锤鑱屼笟瀛﹂櫌', '娌冲崡璐ㄩ噺宸ョ▼鑱屼笟瀛﹂櫌', '娌冲崡妫�瀵熻亴涓氬闄�', '娌冲崡寤虹瓚鑱屼笟鎶�鏈闄�', '閮戝窞鑱屼笟鎶�鏈闄�', '娌冲崡浜ら�氳亴涓氭妧鏈闄�', '淇¢槼鑱屼笟鎶�鏈闄�', + '娌冲崡宸ヤ笟璐告槗鑱屼笟瀛﹂櫌', '閮戝窞宸ヤ笟瀹夊叏鑱屼笟瀛﹂櫌', '婕渤椋熷搧鑱屼笟瀛﹂櫌', '閮戝窞鐢靛姏鑱屼笟鎶�鏈闄�', '閮戝窞淇℃伅绉戞妧鑱屼笟瀛﹂櫌', '娴庢簮鑱屼笟鎶�鏈闄�', '鏂颁埂鑱屼笟鎶�鏈闄�', '閮戝窞鐢靛瓙淇℃伅鑱屼笟鎶�鏈闄�', '娌冲崡鍐滀笟鑱屼笟瀛﹂櫌', '鍛ㄥ彛绉戞妧鑱屼笟瀛﹂櫌', + '瀹夐槼鑱屼笟鎶�鏈闄�', '椹婚┈搴楄亴涓氭妧鏈闄�', '鍟嗕笜绉戞妧鑱屼笟瀛﹂櫌', '姘稿煄鑱屼笟瀛﹂櫌', '閮戝窞浜ら�氳亴涓氬闄�', '宓╁北灏戞灄姝︽湳鑱屼笟瀛﹂櫌', '閮戝窞甯冪憺杈剧悊宸ヨ亴涓氬闄�', '鍟嗕笜鑱屼笟鎶�鏈闄�', '骞抽《灞卞伐涓氳亴涓氭妧鏈闄�', '璁告槍鑱屼笟鎶�鏈闄�', + '楣ゅ鑱屼笟鎶�鏈闄�', '婵槼鑱屼笟鎶�鏈闄�', '鍛ㄥ彛鑱屼笟鎶�鏈闄�', '娌冲崡鍙告硶璀﹀畼鑱屼笟瀛﹂櫌', '娌冲崡宸ヤ笟鑱屼笟鎶�鏈闄�', '娌冲崡缁忚锤鑱屼笟瀛﹂櫌', '姝︽眽澶у', '涓崡璐㈢粡鏀挎硶澶у', '鍗庝腑绉戞妧澶у', '姝︽眽鐞嗗伐澶у', + '涓浗鍦拌川澶у', '鍗庝腑鍐滀笟澶у', '鍗庝腑甯堣寖澶у', '涓崡姘戞棌澶у', '婀栧寳澶у', '闀挎睙澶у', '姹熸眽澶у', '涓夊场澶у', '姝︽眽绉戞妧澶у', '婀栧寳宸ヤ笟澶у', + '姝︽眽宸ョ▼澶у', '姝︽眽绉戞妧瀛﹂櫌', '鑽嗘鐞嗗伐瀛﹂櫌', '姝︽眽宸ヤ笟瀛﹂櫌', '婀栧寳姹借溅宸ヤ笟瀛﹂櫌', '婀栧寳涓尰瀛﹂櫌', '閮ч槼鍖诲闄�', '婀栧寳甯堣寖瀛﹂櫌', '榛勫唸甯堣寖瀛﹂櫌', '瀛濇劅瀛﹂櫌', + '婀栧寳绗簩甯堣寖瀛﹂櫌', '婀栧寳缁忔祹瀛﹂櫌', '婀栧寳璀﹀畼瀛﹂櫌', '姝︽眽浣撹偛瀛﹂櫌', '婀栧寳缇庢湳瀛﹂櫌', '姝︽眽闊充箰瀛﹂櫌', '婀栧寳姘戞棌瀛﹂櫌', '鍜稿畞瀛﹂櫌', '姝︽眽鐢熺墿宸ョ▼瀛﹂櫌', '瑗勬▕瀛﹂櫌', + '榛勭煶鐞嗗伐瀛﹂櫌', '婀栧寳涓尰鑽珮绛変笓绉戝鏍�', '閮ч槼甯堣寖楂樼瓑涓撶瀛︽牎', '婀栧寳璐㈢粡楂樼瓑涓撶瀛︽牎', '姝︽眽鍟嗕笟鏈嶅姟瀛﹂櫌', '娌欏競鑱屼笟澶у', '鎭╂柦鑱屼笟鎶�鏈闄�', '榛勫唸鑱屼笟鎶�鏈闄�', '瑗勬▕鑱屼笟鎶�鏈闄�', '婀栧寳鑱屼笟鎶�鏈闄�', + '鍗佸牥鑱屼笟鎶�鏈闄�', '闀挎睙鑱屼笟瀛﹂櫌', '姝︽眽宸ヨ锤鑱屼笟瀛﹂櫌', '姝︽眽鑱屼笟鎶�鏈闄�', '姝︽眽鑸硅埗鑱屼笟鎶�鏈闄�', '閯傚窞鑱屼笟澶у', '婀栧寳姘村埄姘寸數鑱屼笟鎶�鏈闄�', '涓夊场鐢靛姏鑱屼笟瀛﹂櫌', '闀挎睙宸ョ▼鑱屼笟鎶�鏈闄�', '姝︽眽鑸捣鑱屼笟鎶�鏈闄�', + '姝︽眽宸ヤ笟鑱屼笟鎶�鏈闄�', '姝︽眽璀﹀畼鑱屼笟瀛﹂櫌', '姝︽眽閾佽矾鑱屼笟鎶�鏈闄�', '姝︽眽鍩庡競鑱屼笟瀛﹂櫌', '婀栧寳寮�鏀捐亴涓氬闄�', '姝︽眽淇℃伅浼犳挱鑱屼笟鎶�鏈闄�', '姝︽眽绉戞妧鑱屼笟瀛﹂櫌', '姝︽眽璇█鏂囧寲鑱屼笟瀛﹂櫌', '浠欐鑱屼笟瀛﹂櫌', '姝︽眽澶栬澶栦簨鑱屼笟瀛﹂櫌', + '鍜稿畞鑱屼笟鎶�鏈闄�', '婀栧寳鍩庡競寤鸿鑱屼笟鎶�鏈闄�', '姝︽眽鐢靛姏鑱屼笟鎶�鏈闄�', '婀栧寳涓夊场鑱屼笟鎶�鏈闄�', '婀栧寳鍥藉湡璧勬簮鑱屼笟瀛﹂櫌', '姹熸眽鑹烘湳鑱屼笟瀛﹂櫌', '姝︽眽姘戞斂鑱屼笟瀛﹂櫌', '婀栧寳绉戞妧鑱屼笟瀛﹂櫌', '婀栧寳闈掑勾鑱屼笟瀛﹂櫌', '榛勫唸绉戞妧鑱屼笟瀛﹂櫌', + '婀栧寳鐢熸�佸伐绋嬭亴涓氭妧鏈闄�', '閯備笢鑱屼笟鎶�鏈闄�', '婀栧寳璐㈢◣鑱屼笟瀛﹂櫌', '姝︽眽鍟嗚锤鑱屼笟瀛﹂櫌', '鑽嗗窞鑱屼笟鎶�鏈闄�', '姝︽眽浜ら�氳亴涓氬闄�', '婀栧寳浜ら�氳亴涓氭妧鏈闄�', '姝︽眽杞欢宸ョ▼鑱屼笟瀛﹂櫌', '婀栧寳鐢熺墿绉戞妧鑱屼笟瀛﹂櫌', '闅忓窞鑱屼笟鎶�鏈闄�', + '榛勭煶鑱屼笟鎶�鏈闄�', '涓夊场鏃呮父鑱屼笟鎶�鏈闄�', '婀栧寳鑹烘湳鑱屼笟瀛﹂櫌', '姝︽眽宸ョ▼鑱屼笟鎶�鏈闄�', '婀栧寳杞诲伐鑱屼笟鎶�鏈闄�', '涓崡澶у', '婀栧崡澶у', '婀樻江澶у', '婀栧崡绉戞妧澶у', '鍚夐澶у', + '闀挎矙鐞嗗伐澶у', '鍗楀崕澶у', '婀栧崡宸ヤ笟澶у', '婀栧崡鍐滀笟澶у', '婀栧崡涓尰鑽ぇ瀛�', '婀栧崡甯堣寖澶у', '闀挎矙瀛﹂櫌', '婀栧崡绗竴甯堣寖瀛﹂櫌', '婀栧崡鍩庡競瀛﹂櫌', '婀栧崡宸ョ▼瀛﹂櫌', + '婀栧崡鐞嗗伐瀛﹂櫌', '婀栧崡宸ュ闄�', '涓崡鏋椾笟绉戞妧澶у', '闀挎矙鍖诲闄�', '婀樺崡瀛﹂櫌', '琛¢槼甯堣寖瀛﹂櫌', '婀栧崡鍟嗗闄�', '婀栧崡娑夊缁忔祹瀛﹂櫌', '婀栧崡鏂囩悊瀛﹂櫌', '婀栧崡浜烘枃绉戞妧瀛﹂櫌', + '閭甸槼瀛﹂櫌', '婀栧崡绉戞妧瀛﹂櫌', '鎬�鍖栧闄�', '鎬�鍖栧尰瀛﹂珮绛変笓绉戝鏍�', '婀栧崡涓尰鑽珮绛変笓绉戝鏍�', '鐩婇槼鍖诲楂樼瓑涓撶瀛︽牎', '閭甸槼鍖诲楂樼瓑涓撶瀛︽牎', '鏍床甯堣寖楂樼瓑涓撶瀛︽牎', '闀挎矙甯堣寖瀛︽牎', '婀栧崡绋庡姟楂樼瓑涓撶瀛︽牎', + '婀栧崡璐㈢粡楂樼瓑涓撶瀛︽牎', '婀栧崡鍏畨楂樼瓑涓撶瀛︽牎', '闀挎矙鑸┖鑱屼笟鎶�鏈闄�', '姘稿窞鑱屼笟鎶�鏈闄�', '婀栧崡濂冲瓙鑱屼笟澶у', '婀栧崡鐜鐢熺墿鑱屼笟鎶�鏈闄�', '婀栧崡淇℃伅鑱屼笟鎶�鏈闄�', '闀挎矙姘戞斂鑱屼笟鎶�鏈闄�', '婀栧崡鍐堕噾鑱屼笟鎶�鏈闄�', '婀栧崡澶т紬浼犲獟鑱屼笟鎶�鏈闄�', + '婀栧崡宸ヤ笟鑱屼笟鎶�鏈闄�', '婀栧崡閾侀亾鑱屼笟鎶�鏈闄�', '婀栧崡宸ョ▼鑱屼笟鎶�鏈闄�', '婀栧崡鍩庡缓鑱屼笟鎶�鏈闄�', '婀栧崡閮藉競鑱屼笟瀛﹂櫌', '闀挎矙鐜淇濇姢鑱屼笟鎶�鏈闄�', '闀挎矙鑱屼笟鎶�鏈闄�', '婀栧崡鑹烘湳鑱屼笟瀛﹂櫌', '婀栧崡鐢熺墿鏈虹數鑱屼笟鎶�鏈闄�', '婀樿タ姘戞棌鑱屼笟鎶�鏈闄�', + '婀栧崡浣撹偛鑱屼笟瀛﹂櫌', '琛¢槼璐㈢粡宸ヤ笟鑱屼笟鎶�鏈闄�', '鐩婇槼鑱屼笟鎶�鏈闄�', '婀栧崡鍚屽痉鑱屼笟瀛﹂櫌', '婀栧崡姘戞棌鑱屼笟瀛﹂櫌', '婀栧崡鐢靛瓙绉戞妧鑱屼笟瀛﹂櫌', '婀栧崡鐜颁唬鐗╂祦鑱屼笟鎶�鏈闄�', '闀挎矙鍗楁柟鑱屼笟瀛﹂櫌', '甯稿痉鑱屼笟鎶�鏈闄�', '宀抽槼鑱屼笟鎶�鏈闄�', + '鎬�鍖栬亴涓氭妧鏈闄�', '娼囨箻鑱屼笟瀛﹂櫌', '婀栧崡鍖栧伐鑱屼笟鎶�鏈闄�', '婀栧崡涔濆斗鑱屼笟鎶�鏈闄�', '婀栧崡浜ら�氬伐绋嬭亴涓氭妧鏈闄�', '婀栧崡鏈虹數鑱屼笟鎶�鏈闄�', '闀挎矙绀句細瀹夊叏鑱屼笟鎶�鏈闄�', '婀栧崡姘村埄姘寸數鑱屼笟鎶�鏈闄�', '闀挎矙鐢靛姏鑱屼笟鎶�鏈闄�', '鏍床鑱屼笟鎶�鏈闄�', + '婀栧崡鍙告硶璀﹀畼鑱屼笟瀛﹂櫌', '婀栧崡缃戠粶宸ョ▼鑱屼笟瀛﹂櫌', '闀挎矙鍟嗚锤鏃呮父鑱屼笟鎶�鏈闄�', '閭甸槼鑱屼笟鎶�鏈闄�', '婀栧崡瀵瑰缁忔祹璐告槗鑱屼笟瀛﹂櫌', '婀栧崡鐭虫补鍖栧伐鑱屼笟鎶�鏈闄�', '婀栧崡鍟嗗姟鑱屼笟鎶�鏈闄�', '婀栧崡浜ら�氳亴涓氭妧鏈闄�', '淇濋櫓鑱屼笟瀛﹂櫌', '濞勫簳鑱屼笟鎶�鏈闄�', + '闀挎矙閫氫俊鑱屼笟鎶�鏈闄�', '婀樻江鑱屼笟鎶�鏈闄�', '閮村窞鑱屼笟鎶�鏈闄�', '婀栧崡绉戞妧鑱屼笟瀛﹂櫌', '婀栧崡绉戞妧宸ヤ笟鑱屼笟鎶�鏈闄�', '婀栧崡鐢垫皵鑱屼笟鎶�鏈闄�', '寮犲鐣岃埅绌哄伐涓氳亴涓氭妧鏈闄�', '婀栧崡澶栧浗璇亴涓氬闄�', '婀栧崡宸ヨ壓缇庢湳鑱屼笟瀛﹂櫌', '婀栧崡鐞嗗伐鑱屼笟鎶�鏈闄�', + '婀栧崡绉戞妧缁忚锤鑱屼笟瀛﹂櫌', '婀栧崡杞欢鑱屼笟瀛﹂櫌', '婀栧崡淇℃伅绉戝鑱屼笟瀛﹂櫌', '婀栧崡閾佽矾绉戞妧鑱屼笟鎶�鏈闄�', '婀栧崡瀹夊叏鎶�鏈亴涓氬闄�', '涓北澶у', '鍗庡崡鐞嗗伐澶у', '鏆ㄥ崡澶у', '姹曞ご澶у', '娣卞湷澶у', + '浜旈倯澶у', '骞夸笢宸ヤ笟澶у', '鍗庡崡鍐滀笟澶у', '骞夸笢娴锋磱澶у', '骞垮窞涓尰鑽ぇ瀛�', '鍗楁柟鍖荤澶у', '鍗庡崡甯堣寖澶у', '骞夸笢澶栬澶栬锤澶у', '骞垮窞澶у', '鍖椾含甯堣寖澶у-棣欐腐娴镐細澶у鑱斿悎鍥介檯瀛﹂櫌', + '鑲囧簡瀛﹂櫌', '鑼傚悕瀛﹂櫌', '涓滆帪鐞嗗伐瀛﹂櫌', '浠叉伜鍐滀笟宸ョ▼瀛﹂櫌', '骞夸笢鍖诲闄�', '骞垮窞鍖诲闄�', '骞夸笢鑽闄�', '鎯犲窞瀛﹂櫌', '闊跺叧瀛﹂櫌', '婀涙睙甯堣寖瀛﹂櫌', + '鍢夊簲瀛﹂櫌', '闊╁北甯堣寖瀛﹂櫌', '骞夸笢閲戣瀺瀛﹂櫌', '骞夸笢鍟嗗闄�', '骞夸笢璀﹀畼瀛﹂櫌', '骞垮窞浣撹偛瀛﹂櫌', '骞垮窞缇庢湳瀛﹂櫌', '鏄熸捣闊充箰瀛﹂櫌', '骞夸笢鎶�鏈笀鑼冨闄�', '骞夸笢鍩规瀛﹂櫌', + '骞夸笢鐧戒簯瀛﹂櫌', '浣涘北绉戝鎶�鏈闄�', '骞垮窞鑸捣楂樼瓑涓撶瀛︽牎', '鑲囧簡鍖诲楂樼瓑涓撶瀛︽牎', '绉佺珛鍗庤仈瀛﹂櫌', '姘戝姙鍗楀崕宸ュ晢瀛﹂櫌', '骞垮窞姘戣埅鑱屼笟鎶�鏈闄�', '骞夸笢椋熷搧鑽搧鑱屼笟瀛﹂櫌', '娼睍鑱屼笟鎶�鏈闄�', '骞夸笢姘村埄鐢靛姏鑱屼笟鎶�鏈闄�', + '娣卞湷鑱屼笟鎶�鏈闄�', '骞夸笢鏉惧北鑱屼笟鎶�鏈闄�', '椤哄痉鑱屼笟鎶�鏈闄�', '骞夸笢鏂板畨鑱屼笟鎶�鏈闄�', '骞夸笢鍐滃伐鍟嗚亴涓氭妧鏈闄�', '浣涘北鑱屼笟鎶�鏈闄�', '骞夸笢杞诲伐鑱屼笟鎶�鏈闄�', '骞夸笢浜ら�氳亴涓氭妧鏈闄�', '骞垮窞鐣鑱屼笟鎶�鏈闄�', '骞垮窞鐜颁唬淇℃伅宸ョ▼鑱屼笟鎶�鏈闄�', + '鎯犲窞缁忔祹鑱屼笟鎶�鏈闄�', '鐝犳捣鍩庡競鑱屼笟鎶�鏈闄�', '骞夸笢琛屾斂鑱屼笟瀛﹂櫌', '骞夸笢浣撹偛鑱屼笟鎶�鏈闄�', '骞垮窞娑夊缁忔祹鑱屼笟鎶�鏈闄�', '骞垮窞宸ュ晢鑱屼笟鎶�鏈闄�', '骞垮窞鏉剧敯鑱屼笟瀛﹂櫌', '鑲囧簡宸ュ晢鑱屼笟鎶�鏈闄�', '骞夸笢鐞嗗伐鑱屼笟瀛﹂櫌', '骞垮窞鍗楁磱鐞嗗伐鑱屼笟瀛﹂櫌', + '骞夸笢宸ョ▼鑱屼笟鎶�鏈闄�', '骞垮窞绉戞妧璐告槗鑱屼笟瀛﹂櫌', '骞垮窞鍩庡缓鑱屼笟瀛﹂櫌', '骞垮窞鍩庡競鑱屼笟瀛﹂櫌', '骞垮窞鐝犳睙鑱屼笟鎶�鏈闄�', '骞垮窞鍗庡崡鍟嗚锤鑱屼笟瀛﹂櫌', '骞夸笢绉戝鎶�鏈亴涓氬闄�', '骞夸笢鏈虹數鑱屼笟鎶�鏈闄�', '娣卞湷淇℃伅鑱屼笟鎶�鏈闄�', '姹曞ご鑱屼笟鎶�鏈闄�', + '骞夸笢浜氳婕旇壓鑱屼笟瀛﹂櫌', '娓呰繙鑱屼笟鎶�鏈闄�', '骞垮窞閾佽矾鑱屼笟鎶�鏈闄�', '骞夸笢鍙告硶璀﹀畼鑱屼笟瀛﹂櫌', '骞垮窞绉戞妧鑱屼笟鎶�鏈闄�', '鑼傚悕鑱屼笟鎶�鏈闄�', '涓北鑱屼笟鎶�鏈闄�', '姹熼棬鑱屼笟鎶�鏈闄�', '骞夸笢宸ヨ锤鑱屼笟鎶�鏈闄�', '婀涙睙鐜颁唬绉戞妧鑱屼笟瀛﹂櫌', + '骞夸笢鏂囪壓鑱屼笟瀛﹂櫌', '骞垮窞浣撹偛鑱屼笟鎶�鏈闄�', '涓北鐏偓鑱屼笟鎶�鏈闄�', '骞垮窞宸ョ▼鎶�鏈亴涓氬闄�', '骞垮窞鍗庣珛绉戞妧鑱屼笟瀛﹂櫌', '涓滆帪鍗楀崥鑱屼笟鎶�鏈闄�', '娌虫簮鑱屼笟鎶�鏈闄�', '骞夸笢璐㈢粡鑱屼笟瀛﹂櫌', '骞夸笢鐪佸璇壓鏈亴涓氬闄�', '骞夸笢绾虹粐鑱屼笟鎶�鏈闄�', + '骞夸笢閭數鑱屼笟鎶�鏈闄�', '闃虫睙鑱屼笟鎶�鏈闄�', '姹曞熬鑱屼笟鎶�鏈闄�', '骞夸笢宀崡鑱屼笟鎶�鏈闄�', '骞夸笢濂冲瓙鑱屼笟鎶�鏈闄�', '骞夸笢寤鸿鑱屼笟鎶�鏈闄�', '骞夸笢绉戣锤鑱屼笟瀛﹂櫌', '鑲囧簡绉戞妧鑱屼笟鎶�鏈闄�', '鎻槼鑱屼笟鎶�鏈闄�', '缃楀畾鑱屼笟鎶�鏈闄�', + '骞垮窞搴峰ぇ鑱屼笟鎶�鏈闄�', '鐝犳捣鑹烘湳鑱屼笟瀛﹂櫌', '鍗楁捣涓滆蒋淇℃伅鎶�鏈亴涓氬闄�', '骞胯タ澶у', '妗傛灄鐢靛瓙绉戞妧澶у', '妗傛灄鐞嗗伐澶у', '骞胯タ鍖荤澶у', '骞胯タ甯堣寖澶у', '骞胯タ姘戞棌澶у', '骞胯タ宸ュ闄�', + '骞胯タ涓尰瀛﹂櫌', '鍙虫睙姘戞棌鍖诲闄�', '妗傛灄鍖诲闄�', '骞胯タ甯堣寖瀛﹂櫌', '骞胯タ姘戞棌甯堣寖瀛﹂櫌', '鐜夋灄甯堣寖瀛﹂櫌', '娌虫睜瀛﹂櫌', '骞胯タ璐㈢粡瀛﹂櫌', '骞胯タ鑹烘湳瀛﹂櫌', '鐧捐壊瀛﹂櫌', + '璐哄窞瀛﹂櫌', '閽﹀窞瀛﹂櫌', '姊у窞瀛﹂櫌', '妗傛灄鑸ぉ宸ヤ笟楂樼瓑涓撶瀛︽牎', '鏌冲窞鍖诲楂樼瓑涓撶瀛︽牎', '妗傛灄甯堣寖楂樼瓑涓撶瀛︽牎', '鏌冲窞甯堣寖楂樼瓑涓撶瀛︽牎', '骞胯タ骞煎効甯堣寖楂樼瓑涓撶瀛︽牎', '妗傛灄鏃呮父楂樼瓑涓撶瀛︽牎', '骞胯タ璀﹀畼楂樼瓑涓撶瀛︽牎', + '骞胯タ浣撹偛楂樼瓑涓撶瀛︽牎', '鍗楀畞鑱屼笟鎶�鏈闄�', '鏌冲窞鑱屼笟鎶�鏈闄�', '骞胯タ鏈虹數鑱屼笟鎶�鏈闄�', '骞胯タ鑱屼笟鎶�鏈闄�', '骞胯タ鍐滀笟鑱屼笟鎶�鏈闄�', '妗傛灄灞辨按鑱屼笟瀛﹂櫌', '璐垫腐鑱屼笟瀛﹂櫌', '骞胯タ宸ヤ笟鑱屼笟鎶�鏈闄�', '娌虫睜鑱屼笟瀛﹂櫌', + '鍖楁捣鑹烘湳璁捐鑱屼笟瀛﹂櫌', '鍖楁捣鑱屼笟瀛﹂櫌', '姊у窞鑱屼笟瀛﹂櫌', '鏌冲窞杩愯緭鑱屼笟鎶�鏈闄�', '骞胯タ宸ョ▼鑱屼笟瀛﹂櫌', '骞胯タ寤鸿鑱屼笟鎶�鏈闄�', '骞胯タ鐞嗗伐鑱屼笟鎶�鏈闄�', '骞胯タ鐢熸�佸伐绋嬭亴涓氭妧鏈闄�', '骞胯タ缁忔祹鑱屼笟瀛﹂櫌', '骞胯タ姘村埄鐢靛姏鑱屼笟鎶�鏈闄�', + '骞胯タ浜ら�氳亴涓氭妧鏈闄�', '骞胯タ鍥介檯鍟嗗姟鑱屼笟鎶�鏈闄�', '骞胯タ鑻卞崕鍥介檯鑱屼笟瀛﹂櫌', '骞胯タ鐢靛姏鑱屼笟鎶�鏈闄�', '骞胯タ涓滄柟澶栬鑱屼笟瀛﹂櫌', '骞胯タ婕旇壓鑱屼笟瀛﹂櫌', '骞胯タ宸ュ晢鑱屼笟鎶�鏈闄�', '骞胯タ缁忚锤鑱屼笟鎶�鏈闄�', '骞胯タ鍩庡競鑱屼笟瀛﹂櫌', '鏌冲窞鍩庡競鑱屼笟瀛﹂櫌', + '鐧捐壊鑱屼笟瀛﹂櫌', '閭曟睙澶у', '娴峰崡澶у', '娴峰崡甯堣寖澶у', '娴峰彛缁忔祹瀛﹂櫌', '娴峰崡鍖诲闄�', '鐞煎窞瀛﹂櫌', '鐞煎彴甯堣寖楂樼瓑涓撶瀛︽牎', '娴峰崡鑱屼笟鎶�鏈闄�', '涓変簹鍩庡競鑱屼笟瀛﹂櫌', + '涓変簹鐞嗗伐鑱屼笟瀛﹂櫌', '娴峰崡绉戞妧鑱屼笟瀛﹂櫌', '娴峰崡澶栧浗璇亴涓氬闄�', '娴峰崡涓囧拰淇℃伅鑱屼笟鎶�鏈闄�', '娴峰崡杞欢鑱屼笟鎶�鏈闄�', '娴峰崡缁忚锤鑱屼笟鎶�鏈闄�', '娴峰崡鏀挎硶鑱屼笟瀛﹂櫌', '涓変簹鑸┖鏃呮父鑱屼笟瀛﹂櫌', '閲嶅簡澶у', '瑗垮崡澶у', + '閲嶅簡浜ら�氬ぇ瀛�', '閲嶅簡閭數澶у', '閲嶅簡鐞嗗伐澶у', '閲嶅簡鍖荤澶у', '閲嶅簡甯堣寖澶у', '閲嶅簡宸ュ晢澶у', '瑗垮崡鏀挎硶澶у', '閲嶅簡绉戞妧瀛﹂櫌', '闀挎睙甯堣寖瀛﹂櫌', '鍥涘窛澶栬瀛﹂櫌', + '鍥涘窛缇庢湳瀛﹂櫌', '閲嶅簡鏂囩悊瀛﹂櫌', '閲嶅簡涓夊场瀛﹂櫌', '閲嶅簡鐢靛姏楂樼瓑涓撶瀛︽牎', '閲嶅簡鍖昏嵂楂樼瓑涓撶瀛︽牎', '閲嶅簡涓夊场鍖昏嵂楂樼瓑涓撶瀛︽牎', '閲嶅簡宸ヤ笟鑱屼笟鎶�鏈闄�', '閲嶅簡鐢靛瓙宸ョ▼鑱屼笟瀛﹂櫌', '閲嶅簡姝eぇ杞欢鑱屼笟鎶�鏈闄�', '閲嶅簡鏈虹數鑱屼笟鎶�鏈闄�', + '閲嶅簡浼犲獟鑱屼笟瀛﹂櫌', '閲嶅簡璐㈢粡鑱屼笟瀛﹂櫌', '閲嶅簡姘村埄鐢靛姏鑱屼笟鎶�鏈闄�', '閲嶅簡鑸ぉ鑱屼笟鎶�鏈闄�', '閲嶅簡闈掑勾鑱屼笟鎶�鏈闄�', '閲嶅簡宸ュ晢鑱屼笟瀛﹂櫌', '閲嶅簡姹熸触鑱屼笟瀛﹂櫌', '閲嶅簡姘戠敓鑱屼笟鎶�鏈闄�', '閲嶅簡寤虹瓚宸ョ▼鑱屼笟瀛﹂櫌', '閲嶅簡宸ヨ锤鑱屼笟鎶�鏈闄�', + '閲嶅簡鑳芥簮鑱屼笟瀛﹂櫌', '閲嶅簡鍟嗗姟鑱屼笟瀛﹂櫌', '閲嶅簡绉戝垱鑱屼笟瀛﹂櫌', '閲嶅簡鍩庡競鑱屼笟瀛﹂櫌', '閲嶅簡宸ョ▼鑱屼笟鎶�鏈闄�', '閲嶅簡宸存笣鑱屼笟鎶�鏈闄�', '閲嶅簡淇℃伅鎶�鏈亴涓氬闄�', '閲嶅簡娴疯仈鑱屼笟鎶�鏈闄�', '閲嶅簡璀﹀畼鑱屼笟瀛﹂櫌', '閲嶅簡鍩庡競绠$悊鑱屼笟瀛﹂櫌', + '閲嶅簡涓夊场鑱屼笟瀛﹂櫌', '鍥涘窛澶у', '瑗垮崡浜ら�氬ぇ瀛�', '鐢靛瓙绉戞妧澶у', '瑗垮崡璐㈢粡澶у', '瑗垮崡姘戞棌澶у', '鎴愰兘鐞嗗伐澶у', '瑗垮崕澶у', '瑗垮崡绉戞妧澶у', '鍥涘窛鍐滀笟澶у', + '鎴愰兘涓尰鑽ぇ瀛�', '鍥涘窛甯堣寖澶у', '瑗垮崕甯堣寖澶у', '涓浗姘戠敤鑸┖椋炶瀛﹂櫌', '瑗垮崡鐭虫补澶у', '鍥涘窛鐞嗗伐瀛﹂櫌', '鎴愰兘淇℃伅宸ョ▼瀛﹂櫌', '娉稿窞鍖诲闄�', '宸濆寳鍖诲闄�', '鎴愰兘鍖诲闄�', + '鍐呮睙甯堣寖瀛﹂櫌', '鍥涘窛鏂囩悊瀛﹂櫌', '涔愬北甯堣寖瀛﹂櫌', '鍥涘窛璀﹀療瀛﹂櫌', '鎴愰兘浣撹偛瀛﹂櫌', '鍥涘窛闊充箰瀛﹂櫌', '鍥涘窛姘戞棌瀛﹂櫌', '缁甸槼甯堣寖瀛﹂櫌', '瀹滃瀛﹂櫌', '鏀�鏋濊姳瀛﹂櫌', + '瑗挎槍瀛﹂櫌', '鎴愰兘瀛﹂櫌', '鍥涘窛鐑归オ楂樼瓑涓撶瀛︽牎', '鎴愰兘鐢靛瓙鏈烘楂樼瓑涓撶瀛︽牎', '鎴愰兘绾虹粐楂樼瓑涓撶瀛︽牎', '鍥涘窛涓尰鑽珮绛変笓绉戝鏍�', '闃垮潩甯堣寖楂樼瓑涓撶瀛︽牎', '鍥涘窛骞煎効甯堣寖楂樼瓑涓撶瀛︽牎', '姘戝姙鍥涘窛澶╀竴瀛﹂櫌', '鎴愰兘鑸┖鑱屼笟鎶�鏈闄�', + '鍥涘窛璐㈢粡鑱屼笟瀛﹂櫌', '鍥涘窛鐜颁唬鑱屼笟瀛﹂櫌', '鍥涘窛鍩庡競鑱屼笟瀛﹂櫌', '鍥涘窛鍗庢柊鐜颁唬鑱屼笟瀛﹂櫌', '鍐呮睙鑱屼笟鎶�鏈闄�', '鍥涘窛鏂囧寲浼犲獟鑱屼笟瀛﹂櫌', '鍥涘窛璀﹀畨鑱屼笟瀛﹂櫌', '鍗楀厖鑱屼笟鎶�鏈闄�', '鍥涘窛姘村埄鑱屼笟鎶�鏈闄�', '鎴愰兘鑱屼笟鎶�鏈闄�', + '鍥涘窛绠$悊鑱屼笟瀛﹂櫌', '鍥涘窛鍟嗗姟鑱屼笟瀛﹂櫌', '鍥涘窛淇℃伅鑱屼笟鎶�鏈闄�', '鍥涘窛鍙告硶璀﹀畼鑱屼笟瀛﹂櫌', '鎴愰兘涓滆蒋淇℃伅鎶�鏈亴涓氬闄�', '鍥涘窛绉戞妧鑱屼笟瀛﹂櫌', '鍥涘窛鏂囧寲浜т笟鑱屼笟瀛﹂櫌', '鍥涘窛鎵樻櫘淇℃伅鎶�鏈亴涓氬闄�', '鎴愰兘鑹烘湳鑱屼笟瀛﹂櫌', '瀹滃鑱屼笟鎶�鏈闄�', + '鎴愰兘鍐滀笟绉戞妧鑱屼笟瀛﹂櫌', '鍥涘窛鑱屼笟鎶�鏈闄�', '骞垮畨鑱屼笟鎶�鏈闄�', '涔愬北鑱屼笟鎶�鏈闄�', '鍥涘窛鍥介檯鏍囨鑱屼笟瀛﹂櫌', '鍥涘窛鏈虹數鑱屼笟鎶�鏈闄�', '鍥涘窛浜ら�氳亴涓氭妧鏈闄�', '杈惧窞鑱屼笟鎶�鏈闄�', '鍥涘窛寤虹瓚鑱屼笟鎶�鏈闄�', '鍥涘窛宸ュ晢鑱屼笟鎶�鏈闄�', + '缁甸槼鑱屼笟鎶�鏈闄�', '鍥涘窛鐢靛姏鑱屼笟鎶�鏈闄�', '鍥涘窛宸ョ▼鑱屼笟鎶�鏈闄�', '鍥涘窛鍖栧伐鑱屼笟鎶�鏈闄�', '闆呭畨鑱屼笟鎶�鏈闄�', '鍥涘窛鑸ぉ鑱屼笟鎶�鏈闄�', '娉稿窞鑱屼笟鎶�鏈闄�', '鍥涘窛閭數鑱屼笟鎶�鏈闄�', '鐪夊北鑱屼笟鎶�鏈闄�', '鍥涘窛鑹烘湳鑱屼笟瀛﹂櫌', + '璐靛窞澶у', '璐靛窞甯堣寖澶у', '璐甸槼鍖诲闄�', '閬典箟鍖诲闄�', '璐甸槼涓尰瀛﹂櫌', '鍏翠箟姘戞棌甯堣寖瀛﹂櫌', '姣曡妭瀛﹂櫌', '鍏洏姘村笀鑼冨闄�', '榛斿崡姘戞棌甯堣寖瀛﹂櫌', '閬典箟甯堣寖瀛﹂櫌', + '璐靛窞甯堣寖瀛﹂櫌', '璐靛窞璐㈢粡瀛﹂櫌', '璐靛窞姘戞棌瀛﹂櫌', '閾滀粊瀛﹂櫌', '鍑噷瀛﹂櫌', '瀹夐『瀛﹂櫌', '璐甸槼瀛﹂櫌', '榛斿崡姘戞棌鍖诲楂樼瓑涓撶瀛︽牎', '閬典箟鍖昏嵂楂樼瓑涓撶瀛︽牎', '璐靛窞鍟嗕笟楂樼瓑涓撶瀛︽牎', + '璐靛窞浜ら�氳亴涓氭妧鏈闄�', '璐靛窞璀﹀畼鑱屼笟瀛﹂櫌', '璐靛窞鐢靛瓙淇℃伅鑱屼笟鎶�鏈闄�', '璐靛窞鑸ぉ鑱屼笟鎶�鏈闄�', '璐甸槼鑱屼笟鎶�鏈闄�', '瀹夐『鑱屼笟鎶�鏈闄�', '姣曡妭鑱屼笟鎶�鏈闄�', '閬典箟鑱屼笟鎶�鏈闄�', '璐靛窞浜氭嘲鑱屼笟瀛﹂櫌', '榛斾笢鍗楁皯鏃忚亴涓氭妧鏈闄�', + '榛斿崡姘戞棌鑱屼笟鎶�鏈闄�', '璐靛窞鐢靛姏鑱屼笟鎶�鏈闄�', '璐靛窞宸ヤ笟鑱屼笟鎶�鏈闄�', '璐甸槼鎶ょ悊鑱屼笟瀛﹂櫌', '璐靛窞杞诲伐鑱屼笟鎶�鏈闄�', '榛旇タ鍗楁皯鏃忚亴涓氭妧鏈闄�', '閾滀粊鑱屼笟鎶�鏈闄�', '鍏洏姘磋亴涓氭妧鏈闄�', '璐靛窞鑱屼笟鎶�鏈闄�', '浜戝崡澶у', + '鏄嗘槑鐞嗗伐澶у', '浜戝崡鍐滀笟澶у', '浜戝崡甯堣寖澶у', '浜戝崡璐㈢粡澶у', '浜戝崡姘戞棌澶у', '瑗垮崡鏋楀闄�', '鏄嗘槑鍖诲闄�', '浜戝崡涓尰瀛﹂櫌', '鏇查潠甯堣寖瀛﹂櫌', '妤氶泟甯堣寖瀛﹂櫌', + '鐜夋邯甯堣寖瀛﹂櫌', '绾㈡渤瀛﹂櫌', '浜戝崡璀﹀畼瀛﹂櫌', '浜戝崡鑹烘湳瀛﹂櫌', '鏄嗘槑瀛﹂櫌', '澶х悊瀛﹂櫌', '鏂囧北瀛﹂櫌', '淇濆北瀛﹂櫌', '鏄嗘槑鍐堕噾楂樼瓑涓撶瀛︽牎', '浜戝崡鍖诲楂樼瓑涓撶瀛︽牎', + '鏇查潠鍖诲楂樼瓑涓撶瀛︽牎', '妤氶泟鍖昏嵂楂樼瓑涓撶瀛︽牎', '淇濆北涓尰鑽珮绛変笓绉戝鏍�', '鏄�氬笀鑼冮珮绛変笓绉戝鏍�', '鎬濊寘甯堣寖楂樼瓑涓撶瀛︽牎', '涓芥睙甯堣寖楂樼瓑涓撶瀛︽牎', '涓存钵甯堣寖楂樼瓑涓撶瀛︽牎', '寰峰畯甯堣寖楂樼瓑涓撶瀛︽牎', '浜戝崡鑳芥簮鑱屼笟鎶�鏈闄�', '浜戝崡鍥藉湡璧勬簮鑱屼笟瀛﹂櫌', + '浜戝崡鏋椾笟鑱屼笟鎶�鏈闄�', '浜戝崡缁忚锤澶栦簨鑱屼笟瀛﹂櫌', '浜戝崡浜ら�氳亴涓氭妧鏈闄�', '浜戝崡绉戞妧淇℃伅鑱屼笟瀛﹂櫌', '鏄嗘槑鑹烘湳鑱屼笟瀛﹂櫌', '浜戝崡鏂板叴鑱屼笟瀛﹂櫌', '鏄嗘槑鎵竼鑱屼笟鎶�鏈闄�', '瑗垮弻鐗堢撼鑱屼笟鎶�鏈闄�', '浜戝崡鏈虹數鑱屼笟鎶�鏈闄�', '浜戝崡鍙告硶璀﹀畼鑱屼笟瀛﹂櫌', + '浜戝崡鐑甫浣滅墿鑱屼笟瀛﹂櫌', '浜戝崡閿′笟鑱屼笟鎶�鏈闄�', '浜戝崡鏂囧寲鑹烘湳鑱屼笟瀛﹂櫌', '浜戝崡缁忔祹绠$悊鑱屼笟瀛﹂櫌', '浜戝崡浣撹偛杩愬姩鑱屼笟鎶�鏈闄�', '寰峰畯鑱屼笟瀛﹂櫌', '浜戝崡涓夐懌鑱屼笟鎶�鏈闄�', '浜戝崡鍐滀笟鑱屼笟鎶�鏈闄�', '鏄嗘槑宸ヤ笟鑱屼笟鎶�鏈闄�', '浜戝崡鍥介槻宸ヤ笟鑱屼笟鎶�鏈闄�', + '浜戝崡鐖卞洜妫蒋浠惰亴涓氬闄�', '浜戝崡鍖楃編鑱屼笟瀛﹂櫌', '鐜夋邯鍐滀笟鑱屼笟鎶�鏈闄�', '瑗胯棌澶у', '瑗胯棌钘忓尰瀛﹂櫌', '瑗胯棌姘戞棌瀛﹂櫌', '鎷夎惃甯堣寖楂樼瓑涓撶瀛︽牎', '瑗胯棌璀﹀畼楂樼瓑涓撶瀛︽牎', '瑗胯棌鑱屼笟鎶�鏈闄�', '瑗垮畨浜ら�氬ぇ瀛�', + '闀垮畨澶у', '瑗垮畨鐢靛瓙绉戞妧澶у', '瑗垮寳鍐滄灄绉戞妧澶у', '闄曡タ甯堣寖澶у', '瑗垮寳宸ヤ笟澶у', '瑗垮寳澶у', '寤跺畨澶у', '瑗垮畨鐞嗗伐澶у', '瑗垮畨寤虹瓚绉戞妧澶у', '瑗垮畨绉戞妧澶у', + '瑗垮畨鐭虫补澶у', '瑗垮畨宸ョ▼澶у', '瑗垮畨宸ヤ笟澶у', '瑗垮畨澶栧浗璇ぇ瀛�', '瑗垮寳鏀挎硶澶у', '闄曡タ绉戞妧澶у', '瑗垮畨鎬濇簮瀛﹂櫌', '闄曡タ鍥介檯鍟嗚锤瀛﹂櫌', '瑗垮畨閭數瀛﹂櫌', '闄曡タ涓尰瀛﹂櫌', + '瑗垮畨鍖诲闄�', '闄曡タ鐞嗗伐瀛﹂櫌', '娓崡甯堣寖瀛﹂櫌', '鍜搁槼甯堣寖瀛﹂櫌', '姒嗘灄瀛﹂櫌', '瀹濋浮鏂囩悊瀛﹂櫌', '瑗垮畨璐㈢粡瀛﹂櫌', '瑗垮畨浣撹偛瀛﹂櫌', '瑗垮畨缇庢湳瀛﹂櫌', '瑗垮畨闊充箰瀛﹂櫌', + '瑗垮畨鍩瑰崕瀛﹂櫌', '瑗垮畨缈昏瘧瀛﹂櫌', '瑗垮畨鏂囩悊瀛﹂櫌', '瀹夊悍瀛﹂櫌', '鍟嗘礇瀛﹂櫌', '瑗夸含瀛﹂櫌', '瑗垮畨娆т簹瀛﹂櫌', '瑗垮畨澶栦簨瀛﹂櫌', '瑗垮畨鑸┖鎶�鏈珮绛変笓绉戝鏍�', '瑗垮畨鐢靛姏楂樼瓑涓撶瀛︽牎', + '瑗垮畨鍖诲楂樼瓑涓撶瀛︽牎', '闄曡タ宸ヤ笟鑱屼笟鎶�鏈闄�', '鏉ㄥ噷鑱屼笟鎶�鏈闄�', '闄曡タ闈掑勾鑱屼笟瀛﹂櫌', '閾滃窛鑱屼笟鎶�鏈闄�', '闄曡タ璐㈢粡鑱屼笟鎶�鏈闄�', '闄曡タ浜ら�氳亴涓氭妧鏈闄�', '闄曡タ鑳芥簮鑱屼笟鎶�鏈闄�', '闄曡タ鑱屼笟鎶�鏈闄�', '瑗垮畨鑸┖鑱屼笟鎶�鏈闄�', + '闄曡タ鏃呮父鐑归オ鑱屼笟瀛﹂櫌', '闄曡タ绾虹粐鏈嶈鑱屼笟鎶�鏈闄�', '闄曡タ鐢靛瓙淇℃伅鑱屼笟鎶�鏈闄�', '闄曡タ鍥介槻宸ヤ笟鑱屼笟鎶�鏈闄�', '瑗垮畨姹借溅绉戞妧鑱屼笟瀛﹂櫌', '瑗垮畨绉戞妧鍟嗚锤鑱屼笟瀛﹂櫌', '闄曡タ閾佽矾宸ョ▼鑱屼笟鎶�鏈闄�', '闄曡タ鑸┖鑱屼笟鎶�鏈闄�', '瀹濋浮鑱屼笟鎶�鏈闄�', '瑗垮畨涓夎祫鑱屼笟瀛﹂櫌', + '瑗垮畨楂樻柊绉戞妧鑱屼笟瀛﹂櫌', '闄曡タ鏈嶈鑹烘湳鑱屼笟瀛﹂櫌', '闄曡タ璀﹀畼鑱屼笟瀛﹂櫌', '瑗垮畨閾佽矾鑱屼笟鎶�鏈闄�', '闄曡タ缁忔祹绠$悊鑱屼笟鎶�鏈闄�', '闄曡タ鐢靛瓙绉戞妧鑱屼笟瀛﹂櫌', '瑗垮畨娴锋鑱屼笟瀛﹂櫌', '瀹夊悍鑱屼笟鎶�鏈闄�', '瑗垮畨涓滄柟浜氬お鑱屼笟鎶�鏈闄�', '鍜搁槼鑱屼笟鎶�鏈闄�', + '瑗垮畨鑱屼笟鎶�鏈闄�', '鍟嗘礇鑱屼笟鎶�鏈闄�', '姹変腑鑱屼笟鎶�鏈闄�', '寤跺畨鑱屼笟鎶�鏈闄�', '娓崡鑱屼笟鎶�鏈闄�', '闄曡タ閭數鑱屼笟鎶�鏈闄�', '鍏板窞澶у', '瑗垮寳姘戞棌澶у', '鍏板窞鐞嗗伐澶у', '鍏板窞浜ら�氬ぇ瀛�', + '鐢樿們鍐滀笟澶у', '瑗垮寳甯堣寖澶у', '鐢樿們涓尰瀛﹂櫌', '闄囦笢瀛﹂櫌', '鐢樿們姘戞棌甯堣寖瀛﹂櫌', '澶╂按甯堣寖瀛﹂櫌', '鍏板窞鍟嗗闄�', '鐢樿們鏀挎硶瀛﹂櫌', '娌宠タ瀛﹂櫌', '鍏板窞鍩庡競瀛﹂櫌', + '鍏板窞宸ヤ笟楂樼瓑涓撶瀛︽牎', '骞冲噳鍖诲楂樼瓑涓撶瀛︽牎', '寮犳帠鍖诲楂樼瓑涓撶瀛︽牎', '闄囧崡甯堣寖楂樼瓑涓撶瀛︽牎', '瀹氳タ甯堣寖楂樼瓑涓撶瀛︽牎', '鐢樿們鑱斿悎澶у', '鍏板窞鐭冲寲鑱屼笟鎶�鏈闄�', '鐢樿們鍐滀笟鑱屼笟鎶�鏈闄�', '鐢樿們鏋椾笟鑱屼笟鎶�鏈闄�', '鐢樿們寤虹瓚鑱屼笟鎶�鏈闄�', + '鐢樿們璀﹀療鑱屼笟瀛﹂櫌', '鐢樿們浜ら�氳亴涓氭妧鏈闄�', '閰掓硥鑱屼笟鎶�鏈闄�', '鍏板窞澶栬鑱屼笟瀛﹂櫌', '鍏板窞鑱屼笟鎶�鏈闄�', '鐢樿們宸ヤ笟鑱屼笟鎶�鏈闄�', '鐢樿們鐣滅墽宸ョ▼鑱屼笟鎶�鏈闄�', '姝﹀▉鑱屼笟瀛﹂櫌', '鍏板窞璧勬簮鐜鑱屼笟鎶�鏈闄�', '鐢樿們閽㈤搧鑱屼笟鎶�鏈闄�', + '闈掓捣澶у', '闈掓捣甯堣寖澶у', '闈掓捣姘戞棌澶у', '闈掓捣鐣滅墽鍏藉尰鑱屼笟鎶�鏈闄�', '闈掓捣鍗敓鑱屼笟鎶�鏈闄�', '闈掓捣寤虹瓚鑱屼笟鎶�鏈闄�', '闈掓捣浜ら�氳亴涓氭妧鏈闄�', '闈掓捣璀﹀畼鑱屼笟瀛﹂櫌', '鍖楁柟姘戞棌澶у', '瀹佸澶у', + '瀹佸鐞嗗伐瀛﹂櫌', '瀹佸鍖荤澶у', '瀹佸甯堣寖瀛﹂櫌', '瀹佸姘戞棌鑱屼笟鎶�鏈闄�', '瀹佸宸ュ晢鑱屼笟鎶�鏈闄�', '瀹佸鑱屼笟鎶�鏈闄�', '閾跺窛绉戞妧鑱屼笟瀛﹂櫌', '瀹佸宸ヤ笟鑱屼笟瀛﹂櫌', '瀹佸寤鸿鑱屼笟鎶�鏈闄�', '瀹佸鍙告硶璀﹀畼鑱屼笟瀛﹂櫌', + '瀹佸璐㈢粡鑱屼笟鎶�鏈闄�', '鏂扮枂澶у', '鐭虫渤瀛愬ぇ瀛�', '鏂扮枂鍐滀笟澶у', '濉旈噷鏈ㄥぇ瀛�', '鏂扮枂鍖荤澶у', '鏂扮枂甯堣寖澶у', '鏂扮枂璐㈢粡澶у', '鍠�浠�甯堣寖瀛﹂櫌', '浼婄妬甯堣寖瀛﹂櫌', + '鏂扮枂鑹烘湳瀛﹂櫌', '鏄屽悏瀛﹂櫌', '鏂扮枂宸ヤ笟楂樼瓑涓撶瀛︽牎', '鏂扮枂缁村惥灏斿尰瀛︿笓绉戝鏍�', '鍜岀敯甯堣寖涓撶瀛︽牎', '鏂扮枂鍏靛洟璀﹀畼楂樼瓑涓撶瀛︽牎', '鏂扮枂璀﹀畼楂樼瓑涓撶瀛︽牎', '涔岄瞾鏈ㄩ綈鑱屼笟澶у', '鏂扮枂鏈虹數鑱屼笟鎶�鏈闄�', '鏂扮枂杞诲伐鑱屼笟鎶�鏈闄�', + '鍏嬫媺鐜涗緷鑱屼笟鎶�鏈闄�', '鏂扮枂鍐滀笟鑱屼笟鎶�鏈闄�', '浼婄妬鑱屼笟鎶�鏈闄�', '鏂扮枂鐭虫渤瀛愯亴涓氭妧鏈闄�', '鏂扮枂浜ら�氳亴涓氭妧鏈闄�', '鏂扮枂鐜颁唬鑱屼笟鎶�鏈闄�', '鏂扮枂澶╁北鑱屼笟鎶�鏈闄�', '闃垮厠鑻忚亴涓氭妧鏈闄�', '宸撮煶閮鑱屼笟鎶�鏈闄�', '鏂扮枂鑱屼笟澶у', + '鏄屽悏鑱屼笟鎶�鏈闄�', '鏂扮枂鑳芥簮鑱屼笟鎶�鏈闄�', '鏂扮枂寤鸿鑱屼笟鎶�鏈闄�']; } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/Distance.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/Distance.groovy index 664102bf8..0add3e827 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/Distance.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/Distance.groovy @@ -4,7 +4,7 @@ package com.fangjia.script.district * Created with IntelliJ IDEA. * User: Administrator * Date: 13-3-14 - * Time: 下午1:07 + * Time: 涓嬪崍1:07 * To change this template use File | Settings | File Templates. */ class Distance { @@ -16,7 +16,7 @@ class Distance { } /** - * 根据两点间经纬度坐标(double值),计算两点间距离,单位为米 + * 鏍规嵁涓ょ偣闂寸粡绾害鍧愭爣锛坉ouble鍊硷級锛岃绠椾袱鐐归棿璺濈锛屽崟浣嶄负绫� * @param lng1 * @param lat1 * @param lng2 @@ -42,7 +42,7 @@ class Distance { */ public static void main(String[] args) { - // TODO 自动生成方法存根 + // TODO 鑷姩鐢熸垚鏂规硶瀛樻牴 double distance = GetDistance(121.370601,31.215980,121.352688,31.216004); System.out.println("Distance is:"+distance); } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistinctOffice.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistinctOffice.groovy index 87b4e7102..3c070441c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistinctOffice.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistinctOffice.groovy @@ -36,10 +36,10 @@ class DistinctOffice { DBObject q = new BasicDBObject(); q.put("cat", "office"); q.put("visible", 0); - q.put('city', '上海'); + q.put('city', '涓婃捣'); def dsCursor = getDataStoreConnection().find(q); def list = []; - println "办公楼:"+dsCursor.count() + println "鍔炲叕妤硷細"+dsCursor.count() def index = 1; for(def obj : dsCursor){ def region = obj.get("region"); @@ -64,7 +64,7 @@ class DistinctOffice { DBObject q = new BasicDBObject(); q.put("cat", "office"); q.put("visible", 0); - q.put('city', '上海'); + q.put('city', '涓婃捣'); def dsCursor = getDataStoreConnection().find(q); def map = [:] def index =1 ; @@ -90,7 +90,7 @@ class DistinctOffice { DBObject q = new BasicDBObject(); q.put("cat", "office"); q.put("visible", 0); - q.put('city', '上海'); + q.put('city', '涓婃捣'); def dsCursor = getDataStoreConnection().find(q); def map = [:] def index =1 ; @@ -128,7 +128,7 @@ class DistinctOffice { def distinctShop(){ DBObject q = new BasicDBObject(); q.put("cat", "shop"); - q.put('city', '上海'); + q.put('city', '涓婃捣'); def dsCursor = getDataStoreConnection().find(q); def map = [:] @@ -145,7 +145,7 @@ class DistinctOffice { def valueId = map.get(region +"@"+name); println a +" "+ name+" "+id; -// if(name.indexOf("招租")!=-1||name.indexOf("出租")!=-1||name.indexOf("地块")!=-1||name.indexOf("项目")!=-1||name.indexOf("价格")!=-1||name.indexOf("低价")!=-1||name.indexOf("公司")!=-1||name.indexOf("平米")!=-1||name.indexOf("好房")!=-1||name.indexOf("火爆")!=-1||name.indexOf("旺铺")!=-1||name.indexOf("隆重招商")!=-1){ +// if(name.indexOf("鎷涚")!=-1||name.indexOf("鍑虹")!=-1||name.indexOf("鍦板潡")!=-1||name.indexOf("椤圭洰")!=-1||name.indexOf("浠锋牸")!=-1||name.indexOf("浣庝环")!=-1||name.indexOf("鍏徃")!=-1||name.indexOf("骞崇背")!=-1||name.indexOf("濂芥埧")!=-1||name.indexOf("鐏垎")!=-1||name.indexOf("鏃洪摵")!=-1||name.indexOf("闅嗛噸鎷涘晢")!=-1){ // index++; // println name + " "+id // removeDistrict(id); @@ -181,33 +181,33 @@ class DistinctOffice { } public String findRegionFromFileName(String address){ - List regions = Arrays.asList("黄浦","黄埔","卢湾","徐汇","长宁","静安","普陀","闸北","虹口","杨浦","宝山","闵行","浦东","嘉定","南汇","奉贤","松江","金山","青浦","崇明县"); - address = address.replace("上海市","").replace("上海",""); + List regions = Arrays.asList("榛勬郸","榛勫煍","鍗㈡咕","寰愭眹","闀垮畞","闈欏畨","鏅檧","闂稿寳","铏瑰彛","鏉ㄦ郸","瀹濆北","闂佃","娴︿笢","鍢夊畾","鍗楁眹","濂夎搐","鏉炬睙","閲戝北","闈掓郸","宕囨槑鍘�"); + address = address.replace("涓婃捣甯�","").replace("涓婃捣",""); for(String region : regions){ if(address.indexOf(region)!=-1){ - if(address.indexOf(region+"路")!=-1){ - address = address.substring(address.indexOf(region + "路"), address.length()); + if(address.indexOf(region+"璺�")!=-1){ + address = address.substring(address.indexOf(region + "璺�"), address.length()); }else{ - if(region.equals("浦东")){ - if(address.indexOf("浦东大道")!=-1){ - address = address.substring(address.indexOf(region + "大道"), address.length()); - }else if(address.indexOf("浦东南路")!=-1){ - address = address.substring(address.indexOf(region + "南路"), address.length()); + if(region.equals("娴︿笢")){ + if(address.indexOf("娴︿笢澶ч亾")!=-1){ + address = address.substring(address.indexOf(region + "澶ч亾"), address.length()); + }else if(address.indexOf("娴︿笢鍗楄矾")!=-1){ + address = address.substring(address.indexOf(region + "鍗楄矾"), address.length()); }else{ - address = address.replace(region + "新区", "").replace(region, ""); + address = address.replace(region + "鏂板尯", "").replace(region, ""); } }else{ - if(region.equals("松江")){ - if(address.indexOf("松江路")!=-1){ - address = address.replace(region + "区", ""); + if(region.equals("鏉炬睙")){ + if(address.indexOf("鏉炬睙璺�")!=-1){ + address = address.replace(region + "鍖�", ""); }else{ - address = address.replace(region + "区", "").replace(region, ""); + address = address.replace(region + "鍖�", "").replace(region, ""); } }else{ - if(address.indexOf(region + "区")!=-1){ - address = address.replace(region + "区", "").replace(region + "镇", "").replace(region, ""); + if(address.indexOf(region + "鍖�")!=-1){ + address = address.replace(region + "鍖�", "").replace(region + "闀�", "").replace(region, ""); }else{ if(address.startsWith(region)){ address = address.replace(region, ""); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictAddressFomarter.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictAddressFomarter.groovy index 8edde854f..4c3f3ac58 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictAddressFomarter.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictAddressFomarter.groovy @@ -22,11 +22,11 @@ import net.sf.json.JSONObject; class DistrictAddressFomarter { private final static String datastoreDomain = "seaweed.db.fangjia.com" - private static final String REG_NUM = "(((,|\\.|\\d| )*\\d)|(一|二|三|四|五|六|七|八|九|十|零|两|个|十|百|千|万|亿| )+)"; - public static Pattern REG_NUMBER_CN = Pattern.compile(REG_NUM + "(弄|号|栋)"); + private static final String REG_NUM = "(((,|\\.|\\d| )*\\d)|(涓�|浜寍涓墊鍥泑浜攟鍏瓅涓億鍏珅涔潀鍗亅闆秥涓涓獆鍗亅鐧緗鍗億涓噟浜縷 )+)"; + public static Pattern REG_NUMBER_CN = Pattern.compile(REG_NUM + "(寮剕鍙穦鏍�)"); - private static String REG_ADDR1 = "[\u4e00-\u9fa5]{2,4}[路|巷|街|弄|街道|大道|大街|巷子|公路|马路]+"; - public static Pattern REG_ROAD = Pattern.compile("[\u4e00-\u9fa5]{2,4}[路|巷|街|弄|街道|大道|大街|巷子|公路|马路]+"); + private static String REG_ADDR1 = "[\u4e00-\u9fa5]{2,4}[璺瘄宸穦琛梶寮剕琛楅亾|澶ч亾|澶ц|宸峰瓙|鍏矾|椹矾]+"; + public static Pattern REG_ROAD = Pattern.compile("[\u4e00-\u9fa5]{2,4}[璺瘄宸穦琛梶寮剕琛楅亾|澶ч亾|澶ц|宸峰瓙|鍏矾|椹矾]+"); public static void main(String[] args) { DSCollection ddColl = new DataStore(datastoreDomain, 27007).getCollection("fangjia.seaweed") @@ -35,12 +35,12 @@ class DistrictAddressFomarter { HttpHelper addrHelper = new HttpHelper("open.fangjia.com") def cities = getAllCities() int tc = 0 - for(String city : ['北京','成都','西安']) { + for(String city : ['鍖椾含','鎴愰兘','瑗垮畨']) { DBObject query = new BasicDBObject() query.put("cat", 'shop') query.put("visible", 0) query.put("city", city) - query.put("name", '德胜国际广场') + query.put("name", '寰疯儨鍥介檯骞垮満') DBObject fields = new BasicDBObject() fields.put("_id", 1) @@ -89,7 +89,7 @@ class DistrictAddressFomarter { // // if(s.endsWith('city')) { // String a1 = arrs[0] -// if(arrs[0].endsWith('市')) { +// if(arrs[0].endsWith('甯�')) { // a1 = a1.substring(0, a1.length() - 1) // } // if(!a1.equals(city)) { @@ -98,7 +98,7 @@ class DistrictAddressFomarter { // } // // String newAddress = "" -// if(address.startsWith(arrs[0] + "区")) { +// if(address.startsWith(arrs[0] + "鍖�")) { // newAddress = address.substring((arrs[1].split("-")[1]).toInteger() + 1) // }else { // newAddress = address.substring((arrs[1].split("-")[1]).toInteger()) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictAroundFacilitiesBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictAroundFacilitiesBatch.groovy index 63d7f841f..f732f6983 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictAroundFacilitiesBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictAroundFacilitiesBatch.groovy @@ -28,17 +28,17 @@ class DistrictAroundFacilitiesBatch extends BaseBatch { public static DSCollection dataStoreConnection = null; public static void main(String[] args) { - //小区周边数据更新 + //灏忓尯鍛ㄨ竟鏁版嵁鏇存柊 this.runBatch(new DistrictAroundFacilitiesBatch(), args); } @Override public void process(Object args) { - def cities = ["北京", "上海"]// + def cities = ["鍖椾含", "涓婃捣"]// for (def city : cities) { def ret = CommonDatautils.getAllDistricts("district", city) -// def ret = getAllDistrictBaseInfo("上海", '闵行', '万源城', "district"); +// def ret = getAllDistrictBaseInfo("涓婃捣", '闂佃', '涓囨簮鍩�', "district"); def index = 0; for (def dbo : ret) { index++; @@ -52,23 +52,23 @@ class DistrictAroundFacilitiesBatch extends BaseBatch { } def poms = findPoms(dbo.lat2 / 10000000000.0, dbo.lng2 / 10000000000.0); DBObject object = new BasicDBObject(); - object.put("hospital", unique(processType(poms.get('医院'), 1000, null, ['宠物', '动物', '口腔', '牙科', '美容', '齿科', '眼科', '号楼', '住院部', 'Pure', 'Tokushinkai', '假牙制作', '镶牙', '咪', '喵']))) - object.put("shop", processType(poms.get('超市'), 1000, ['便民商店', '便利店'], ['杂货店', '烟酒', '爱鑫', '超市便利店'])) - object.put("university", processType(poms.get('学校'), 1000, ['大学'], ['食堂', '办公室', '德威', '早教', '夕阳红', '公司'])) - object.put("middle_school", processType(poms.get('学校'), 1000, ['中学'], ['食堂', '办公室', '早教', '夕阳红', '公司'])) - object.put("primary_school", processType(poms.get('学校'), 1000, ['小学'], ['食堂', '办公室', '早教', '夕阳红', '公司'])) - object.put("kindergarten", processType(poms.get('学校'), 1000, ['幼儿园', '托儿所'], ['食堂', '亲子', '办公室', '夕阳红', '公司'])) - object.put("food_shop", processType(poms.get('餐饮'), 500, ['餐饮服务'])) + object.put("hospital", unique(processType(poms.get('鍖婚櫌'), 1000, null, ['瀹犵墿', '鍔ㄧ墿', '鍙h厰', '鐗欑', '缇庡', '榻跨', '鐪肩', '鍙锋ゼ', '浣忛櫌閮�', 'Pure', 'Tokushinkai', '鍋囩墮鍒朵綔', '闀剁墮', '鍜�', '鍠�']))) + object.put("shop", processType(poms.get('瓒呭競'), 1000, ['渚挎皯鍟嗗簵', '渚垮埄搴�'], ['鏉傝揣搴�', '鐑熼厭', '鐖遍懌', '瓒呭競渚垮埄搴�'])) + object.put("university", processType(poms.get('瀛︽牎'), 1000, ['澶у'], ['椋熷爞', '鍔炲叕瀹�', '寰峰▉', '鏃╂暀', '澶曢槼绾�', '鍏徃'])) + object.put("middle_school", processType(poms.get('瀛︽牎'), 1000, ['涓'], ['椋熷爞', '鍔炲叕瀹�', '鏃╂暀', '澶曢槼绾�', '鍏徃'])) + object.put("primary_school", processType(poms.get('瀛︽牎'), 1000, ['灏忓'], ['椋熷爞', '鍔炲叕瀹�', '鏃╂暀', '澶曢槼绾�', '鍏徃'])) + object.put("kindergarten", processType(poms.get('瀛︽牎'), 1000, ['骞煎効鍥�', '鎵樺効鎵�'], ['椋熷爞', '浜插瓙', '鍔炲叕瀹�', '澶曢槼绾�', '鍏徃'])) + object.put("food_shop", processType(poms.get('椁愰ギ'), 500, ['椁愰ギ鏈嶅姟'])) def market = []; - if (poms.get('商场')) { - market = market + poms.get('商场'); + if (poms.get('鍟嗗満')) { + market = market + poms.get('鍟嗗満'); } - if (poms.get('超市')) { - market = market + poms.get('超市'); + if (poms.get('瓒呭競')) { + market = market + poms.get('瓒呭競'); } - object.put("supermarket", processType(market, 1000, ['购物中心', "超市", "好又多"], ['公司', '村村寨寨', '伍缘折扣', '杂货店'])) - object.put("bank", processType(poms.get('银行'), 1000, ['银行'], ['自动提款机'])) - object.put("atm", processType(poms.get('ATM'), 1000, ['自动提款机', "atm", "ATM"])) + object.put("supermarket", processType(market, 1000, ['璐墿涓績', "瓒呭競", "濂藉張澶�"], ['鍏徃', '鏉戞潙瀵ㄥ', '浼嶇紭鎶樻墸', '鏉傝揣搴�'])) + object.put("bank", processType(poms.get('閾惰'), 1000, ['閾惰'], ['鑷姩鎻愭鏈�'])) + object.put("atm", processType(poms.get('ATM'), 1000, ['鑷姩鎻愭鏈�', "atm", "ATM"])) updateToDistrictFacilitys(city, region, districtName, object) updateToDistrictFacilitysScore(city, region, districtName) } @@ -125,7 +125,7 @@ class DistrictAroundFacilitiesBatch extends BaseBatch { } /** - * 处理 + * 澶勭悊 * @param list * @param includes * @return @@ -183,11 +183,11 @@ class DistrictAroundFacilitiesBatch extends BaseBatch { } } - if (name.indexOf("(") > -1) { - int lb = name.indexOf("(") - int rb = name.lastIndexOf(")") + if (name.indexOf("锛�") > -1) { + int lb = name.indexOf("锛�") + int rb = name.lastIndexOf("锛�") if (lb < rb) { - name = name.replace("(" + name.substring(lb + 1, rb) + ")", "") + name = name.replace("锛�" + name.substring(lb + 1, rb) + "锛�", "") } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictArroundMapBaiduPOI.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictArroundMapBaiduPOI.groovy index a8d0d2c9b..43759cd29 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictArroundMapBaiduPOI.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictArroundMapBaiduPOI.groovy @@ -25,23 +25,23 @@ import com.mongodb.DBCollection import com.mongodb.DBObject /** - * 百度地图API获取小区周边信息 + * 鐧惧害鍦板浘API鑾峰彇灏忓尯鍛ㄨ竟淇℃伅 */ @BatchOwner(Watcher.YuKai) public class DistrictArroundMapBaiduPOI extends BaseBatch { final static String AK = 'FwGZrRTgZCqsKugHIRNgMwGF' public static String POI_DOMAIN = 'http://api.map.baidu.com/place/v2/search?&query=%s&location=%s&radius=2000&scope=1&page_size=20&output=json&ak=%s' - public static final def CITIES = ['上海', '北京'] + public static final def CITIES = ['涓婃捣', '鍖椾含'] public String datastoreDomain = "seaweed.db.fangjia.com" public DSCollection dsCollection = new DataStore(datastoreDomain, 27007).getCollection("fangjia.seaweed") public DBCollection coll = MongoUtils.getCollectionByName("fangjia_base", "district_around", "192.168.0.67") public static String[] cats = [ - '超市', '商场', '批发市场', '学校', '医院', '药店', '银行', 'ATM', '发廊', '4s店', - '便利店', '餐饮', '公交', '购物', '市场', - '地铁', '机场', '停车场', '加油站', '长途汽车站', '火车售票点', - '影院', '健身中心','酒吧','咖啡','KTV','公园','酒店','会展中心', - '运动', + '瓒呭競', '鍟嗗満', '鎵瑰彂甯傚満', '瀛︽牎', '鍖婚櫌', '鑽簵', '閾惰', 'ATM', '鍙戝粖', '4s搴�', + '渚垮埄搴�', '椁愰ギ', '鍏氦', '璐墿', '甯傚満', + '鍦伴搧', '鏈哄満', '鍋滆溅鍦�', '鍔犳补绔�', '闀块�旀苯杞︾珯', '鐏溅鍞エ鐐�', + '褰遍櫌', '鍋ヨ韩涓績','閰掑惂','鍜栧暋','KTV','鍏洯','閰掑簵','浼氬睍涓績', + '杩愬姩', ] public static void main(String[] args) { @@ -60,7 +60,7 @@ public class DistrictArroundMapBaiduPOI extends BaseBatch { q.put('cat', 'district') q.put('city', cityName) q.put('visible', 0) - q.put('name', '延吉东路125弄小区') + q.put('name', '寤跺悏涓滆矾125寮勫皬鍖�') DBObject fs = new BasicDBObject(); fs.put('city', 1) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictArroundMapabcPOI.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictArroundMapabcPOI.groovy index 7df0a6306..10ff4c555 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictArroundMapabcPOI.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictArroundMapabcPOI.groovy @@ -35,17 +35,17 @@ import com.mongodb.DBObject; @BatchOwner(Watcher.DuXiaoYu) public class DistrictArroundMapabcPOI extends BaseBatch { public static String POI_DOMAIN = "open.fangjia.com" - public static final def CITIES = ['上海'] + public static final def CITIES = ['涓婃捣'] public String datastoreDomain = "seaweed.db.fangjia.com" public DSCollection dsCollection = new DataStore(datastoreDomain, 27007).getCollection("fangjia.seaweed") public DBCollection coll = MongoUtils.getCollectionByName("fangjia_base", "district_around", "192.168.0.67") public static String[] cats = [ - '超市', '商场', '批发市场', '学校', '医院', '药店', '银行', 'ATM', '发廊', '4s店', - '便利店', '餐饮', '公交', '购物', '市场', - '地铁', '机场', '停车场', '加油站', '长途汽车站', '火车售票点', - '影院', '健身中心','酒吧','咖啡','KTV','公园','酒店','会展中心', - '运动', + '瓒呭競', '鍟嗗満', '鎵瑰彂甯傚満', '瀛︽牎', '鍖婚櫌', '鑽簵', '閾惰', 'ATM', '鍙戝粖', '4s搴�', + '渚垮埄搴�', '椁愰ギ', '鍏氦', '璐墿', '甯傚満', + '鍦伴搧', '鏈哄満', '鍋滆溅鍦�', '鍔犳补绔�', '闀块�旀苯杞︾珯', '鐏溅鍞エ鐐�', + '褰遍櫌', '鍋ヨ韩涓績','閰掑惂','鍜栧暋','KTV','鍏洯','閰掑簵','浼氬睍涓績', + '杩愬姩', ] public static void main(String[] args) { @@ -64,8 +64,8 @@ public class DistrictArroundMapabcPOI extends BaseBatch { q.put('cat', 'district') q.put('city', cityName) q.put('visible', 0) - q.put('name', '复兴苑') - q.put('region', '黄浦') + q.put('name', '澶嶅叴鑻�') + q.put('region', '榛勬郸') DBObject fs = new BasicDBObject(); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictAutoProcessBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictAutoProcessBatch.groovy index e14897c98..d445773e4 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictAutoProcessBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictAutoProcessBatch.groovy @@ -26,7 +26,7 @@ class DistrictAutoProcessBatch { static main(args) { def task = new DistrictAutoProcessBatch(); - def citys = ["金华","湖州","徐州","镇江","扬州","衢州","绍兴","嘉兴","连云港","盐城","南通","温州","开封","柳州","呼伦贝尔","泰州","淮安","江门","安阳","朔州","珠海","洛阳","许昌","宝鸡","南宁","新乡","营口","丹东","忻州","包头","丽水","渭南","运城","长治","晋中","舟山","宿迁","鞍山","榆林","鄂尔多斯"] + def citys = ["閲戝崕","婀栧窞","寰愬窞","闀囨睙","鎵窞","琛㈠窞","缁嶅叴","鍢夊叴","杩炰簯娓�","鐩愬煄","鍗楅��","娓╁窞","寮�灏�","鏌冲窞","鍛间鸡璐濆皵","娉板窞","娣畨","姹熼棬","瀹夐槼","鏈斿窞","鐝犳捣","娲涢槼","璁告槍","瀹濋浮","鍗楀畞","鏂颁埂","钀ュ彛","涓逛笢","蹇诲窞","鍖呭ご","涓芥按","娓崡","杩愬煄","闀挎不","鏅嬩腑","鑸熷北","瀹胯縼","闉嶅北","姒嗘灄","閯傚皵澶氭柉"] citys.each { task.run(it); } @@ -65,8 +65,8 @@ class DistrictAutoProcessBatch { def correctionStageData(List districts){ districts.each {Map district -> - if(district.name ==~ /.*((一|二|三|四|五|六|七|八|九|十)|\d+)+期$/){ - String mainName = district.name.toString().replaceAll("((一|二|三|四|五|六|七|八|九|十)|\\d+)+期","") + if(district.name ==~ /.*((涓�|浜寍涓墊鍥泑浜攟鍏瓅涓億鍏珅涔潀鍗�)|\d+)+鏈�$/){ + String mainName = district.name.toString().replaceAll("((涓�|浜寍涓墊鍥泑浜攟鍏瓅涓億鍏珅涔潀鍗�)|\\d+)+鏈�","") if(district.alias && district.alias.contains(mainName)){ List alias = district.alias alias.remove(mainName) @@ -76,7 +76,7 @@ class DistrictAutoProcessBatch { udata.put("alias", alias) udata.put("m_date", new Date()); seaweed.update(q, new BasicDBObject('$set', udata)) - println(district.toString() + "移除别名:${mainName}") + println(district.toString() + "绉婚櫎鍒悕:${mainName}") } } } @@ -88,7 +88,7 @@ class DistrictAutoProcessBatch { String orgAddress = district.address if(StringUtils.isNotBlank(address)){ if(address ==~ /.*\d+$/){ - address += "号" + address += "鍙�" } JSONObject result = OpenApiClient.addressStandardize(district.city, address) String formateAddr; @@ -98,7 +98,7 @@ class DistrictAutoProcessBatch { formateAddr += result.getString("streetNumber") } } - if(formateAddr && formateAddr.contains("市")){ + if(formateAddr && formateAddr.contains("甯�")){ result = OpenApiClient.addressStandardize(district.city, formateAddr) if(result.containsKey("street")){ formateAddr = result.getString("street") @@ -108,12 +108,12 @@ class DistrictAutoProcessBatch { } } if(formateAddr){ - if(!formateAddr.endsWith("交汇")){ + if(!formateAddr.endsWith("浜ゆ眹")){ def addrs = splitAddress(formateAddr) if(addrs.size() == 2){ formateAddr = addrs[0] + addrs[1] }else if(addrs.size() == 3){ - formateAddr = addrs[0] + "与" + addrs[1].replaceFirst("^(与|和)","") + "交汇" + formateAddr = addrs[0] + "涓�" + addrs[1].replaceFirst("^(涓巪鍜�)","") + "浜ゆ眹" } } if(orgAddress != formateAddr){ @@ -133,7 +133,7 @@ class DistrictAutoProcessBatch { def List splitAddress(String addr){ List addres = [] - def keys = ["街道","大道","国道","道路","路","街","线","桥"] + def keys = ["琛楅亾","澶ч亾","鍥介亾","閬撹矾","璺�","琛�","绾�","妗�"] String remain = addr; while(true){ int p = Integer.MAX_VALUE @@ -164,8 +164,8 @@ class DistrictAutoProcessBatch { } districts.each {Map district -> String districtName = district.name - if(districtName.contains(".") || districtName.contains("·")){ - String newName = districtName.replace('.','').replace('·','') + if(districtName.contains(".") || districtName.contains("路")){ + String newName = districtName.replace('.','').replace('路','') String k = "${district.city}#${district.region}#${newName}".toString() if(keys.containsKey(k)){ Map d = keys.get(k) @@ -222,9 +222,9 @@ class DistrictAutoProcessBatch { keys << "${district.city}#${district.region}#${district.name}" } districts.each {Map district -> - if(district.name ==~ /.*路\d+号$/){ - if(keys.contains("${district.city}#${district.region}#${district.name}小区")){ - println("无法修改:${district.city} ${district.name}") + if(district.name ==~ /.*璺痋d+鍙�$/){ + if(keys.contains("${district.city}#${district.region}#${district.name}灏忓尯")){ + println("鏃犳硶淇敼:${district.city} ${district.name}") }else{ def alias = district.alias if(alias == null){ @@ -236,7 +236,7 @@ class DistrictAutoProcessBatch { DBObject q = new BasicDBObject(); q.put("_id", district.id); DBObject udata = new BasicDBObject(); - udata.put("name", district.name + "小区"); + udata.put("name", district.name + "灏忓尯"); udata.put("alias", alias) udata.put("m_date", new Date()); seaweed.update(q, new BasicDBObject('$set', udata)) @@ -265,7 +265,7 @@ class DistrictAutoProcessBatch { if(hasSame){ l.each {Map d-> if(d.region != region){ - println("区域重复错误删除${d}") + println("鍖哄煙閲嶅閿欒鍒犻櫎${d}") updateSeaweed(d.id) } } @@ -276,14 +276,14 @@ class DistrictAutoProcessBatch { } def getBaiDuRegion(def city,def name) { - name = name.toString().replace("小区","").replace("住宅","") + name = name.toString().replace("灏忓尯","").replace("浣忓畢","") def resp = BaiDuApiUtils.search(city, name, "", 2, 20, 0) JSONObject selected = null if (resp && resp.getInt("status") == 0 && resp.containsKey("results")) { JSONArray results = (JSONArray) resp.get("results") for (int j = 0; j < results.size(); j++) { def item = (JSONObject) results.get(j) - if(item.containsKey("name") && item.containsKey("location") && item.getString("name").replace('.','').replace('·','').contains(name)){ + if(item.containsKey("name") && item.containsKey("location") && item.getString("name").replace('.','').replace('路','').contains(name)){ selected = item break; } @@ -314,19 +314,19 @@ class DistrictAutoProcessBatch { if(isEndsWith(name)){ index++; - println "[${index}] 关键字结尾:"+name; + println "[${index}] 鍏抽敭瀛楃粨灏撅細"+name; updateSeaweed(m.id); } if(isContainsChars(name)){ index++; - println "[${index}] 关键字包含:"+name; + println "[${index}] 鍏抽敭瀛楀寘鍚細"+name; updateSeaweed(m.id); } if(getOtherWebsiteFlag(m.city, m.region, m.name)){ index++; - println "[${index}] 产权年限:"+name; + println "[${index}] 浜ф潈骞撮檺锛�"+name; updateSeaweed(m.id); } } @@ -344,11 +344,11 @@ class DistrictAutoProcessBatch { def isEndsWith(def s){ - def endChars = ["路","街","店","贸区","巷","村","设计院","社区","地块"]; + def endChars = ["璺�","琛�","搴�","璐稿尯","宸�","鏉�","璁捐闄�","绀惧尯","鍦板潡"]; def flag = false; for(def key : endChars){ if(s.endsWith(key)){ - if(key=="村"||key=="巷"){ + if(key=="鏉�"||key=="宸�"){ if(s.length()<=3){ flag = true; } @@ -363,7 +363,7 @@ class DistrictAutoProcessBatch { } def isContainsChars(s){ - def chars = ["世贸中心","商务中心","家具中心","商业中心","建材市场","生活广场","购物广场","商城","。"] + def chars = ["涓栬锤涓績","鍟嗗姟涓績","瀹跺叿涓績","鍟嗕笟涓績","寤烘潗甯傚満","鐢熸椿骞垮満","璐墿骞垮満","鍟嗗煄","銆�"] def flag = false; for(def key : chars){ if(s.indexOf(key)!=-1){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictClickRankStatBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictClickRankStatBatch.groovy index eaf0bc5c1..bedfddd8b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictClickRankStatBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictClickRankStatBatch.groovy @@ -20,7 +20,7 @@ import com.mongodb.DBCollection import com.mongodb.DBObject import com.mongodb.Mongo /** - * 从二手房及小区列表中提取小区的点击量,并进行数量排名 + * 浠庝簩鎵嬫埧鍙婂皬鍖哄垪琛ㄤ腑鎻愬彇灏忓尯鐨勭偣鍑婚噺锛屽苟杩涜鏁伴噺鎺掑悕 * @author Administrator * */ @@ -38,7 +38,7 @@ class DistrictClickRankStatBatch extends BaseBatch{ @Override public void process(Object args) { - task("上海"); + task("涓婃捣"); } @@ -48,7 +48,7 @@ class DistrictClickRankStatBatch extends BaseBatch{ def obj = isExistDistrictClickRank(city, lastWeekEnd); if(obj){ //deleteDistrictClickRank(city, lastWeekEnd); - println " 已存在"; + println " 宸插瓨鍦�"; }else{ def resultMap = findDistrictClickCount(city, lastWeekEnd, lastWeekBegin); resultMap = sortMap(resultMap); @@ -59,7 +59,7 @@ class DistrictClickRankStatBatch extends BaseBatch{ } - //是否存在该日期的小区点击量排名 + //鏄惁瀛樺湪璇ユ棩鏈熺殑灏忓尯鐐瑰嚮閲忔帓鍚� private def isExistDistrictClickRank(def city, def statDate){ DBObject q = new BasicDBObject(); q.put("start_time", statDate); @@ -68,7 +68,7 @@ class DistrictClickRankStatBatch extends BaseBatch{ return obj; } - //删除该日期的小区点击量排名 + //鍒犻櫎璇ユ棩鏈熺殑灏忓尯鐐瑰嚮閲忔帓鍚� private def deleteDistrictClickRank(def city, def statDate){ DBObject q = new BasicDBObject(); q.put("stat_time", statDate); @@ -77,7 +77,7 @@ class DistrictClickRankStatBatch extends BaseBatch{ } - //从日志记录中提取点击二手房详情页及小区详情页的小区 + //浠庢棩蹇楄褰曚腑鎻愬彇鐐瑰嚮浜屾墜鎴胯鎯呴〉鍙婂皬鍖鸿鎯呴〉鐨勫皬鍖� private def findDistrictClickCount(def city, def lastWeekEnd, def lastWeekBegin){ DBObject startTime = new BasicDBObject('$gte', lastWeekBegin).append('$lt', lastWeekEnd); //DBObject startTime = new BasicDBObject('$gte', lastWeekBegin).append('$lt', DateUtils.parseFromTightYYYYMMDD('2013-04-23')); @@ -132,7 +132,7 @@ class DistrictClickRankStatBatch extends BaseBatch{ return resultMap; } - //对小区点击量进行排序 + //瀵瑰皬鍖虹偣鍑婚噺杩涜鎺掑簭 private def sortMap(def map){ map = map.sort(){ a, b -> b.value.compareTo(a.value) @@ -140,7 +140,7 @@ class DistrictClickRankStatBatch extends BaseBatch{ return map; } - //标记排名 + //鏍囪鎺掑悕 private def countRank(def map){ def index = 1; map.each { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictClickStatisticsBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictClickStatisticsBatch.groovy index d1b22e14c..a654f3c6d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictClickStatisticsBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictClickStatisticsBatch.groovy @@ -17,7 +17,7 @@ import com.mongodb.DBObject import com.mongodb.Mongo /** - * 小区点击量统计 + * 灏忓尯鐐瑰嚮閲忕粺璁� * @author yukai */ @BatchOwner(Watcher.YuKai) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictCountStatBath.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictCountStatBath.groovy index d972227a3..7356234bf 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictCountStatBath.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictCountStatBath.groovy @@ -13,7 +13,7 @@ import com.fangjia.script.Watcher import com.fangjia.script.util.MongoUtils; /** - * 小区数量统计,每天统计一次 + * 灏忓尯鏁伴噺缁熻,姣忓ぉ缁熻涓�娆� * @author gaojuan */ @BatchOwner(Watcher.GaoJuan) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictDealSellRentRankBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictDealSellRentRankBatch.groovy index b670962db..55bd126f9 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictDealSellRentRankBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictDealSellRentRankBatch.groovy @@ -35,37 +35,37 @@ class DistrictDealSellRentRankBatch extends BaseBatch { private static final DBCollection LOUDONG_COLL = MongoUtils.getCollectionByName("fangjia", "house_loudong", "mongo.db.fangjia.com") private static final DBCollection DISTRICT_ANALY_DATA_COLL = MongoUtils.getCollectionByName("fangjia_stat", "district_analy_data", "mongo.db.fangjia.com") public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(60) - // 最大重试次数 + // 鏈�澶ч噸璇曟鏁� private static final int MAX_TRY_COUNT = 5; public void process(Object args) { def cities = [ - "深圳","上海","北京", "广州","成都","重庆","杭州","西安","天津","武汉","南京","沈阳","贵阳","福州","宁波","石家庄","大连","昆明","苏州","长沙","太原","厦门","无锡","郑州", - "呼和浩特","兰州","哈尔滨","济南","佛山","长春","青岛","东莞","合肥","乌鲁木齐","烟台","南昌","泉州","齐齐哈尔","包头","常德","大同","温州","银川","西宁","扬州","绵阳", - "威海","吉林","邯郸","中山","湛江","潍坊","保定","秦皇岛","常州","宜昌","鞍山","嘉兴","大庆","徐州","株洲","镇江","赣州","芜湖","南通","九江","泰州","洛阳","台州","惠州", - "湖州","江门","绍兴","海口","珠海","金华","连云港","桂林","马鞍山","柳州","淄博","盐城","本溪","汕头","衡阳","揭阳","茂名","牡丹江","平顶山","舟山","安阳","岳阳","许昌", - "四平","淮南","淮安","赤峰","佳木斯","南阳","临沂","临汾","榆林","咸阳","唐山","三亚","宜宾","自贡","廊坊","攀枝花","南宁","延安","襄阳","丽江","大理","六盘水","湘潭", - "清远","衢州","宿迁","北海","莆田","玉林","张家界","玉溪","云浮","肇庆","新乡","营口","潮州","黄石","焦作","盘锦","梅州","曲靖","阳江","韶关","河源","遵义","伊犁", - "阿拉善盟","锡林郭勒盟","兴安盟","林芝","阿里","那曲","山南","日喀则","昌都","红河","中卫","双鸭山","克孜勒苏","巴音郭楞","博尔塔拉","阿勒泰","昌吉","和田","哈密", - "吐鲁番","文山州","武威","铁岭","天水","泰安","黄冈","广元","阜阳","定西","辽源","丽水","乐山","菏泽","锦州","汉中","黄山","白山","安顺","安康","绥化","钦州","鄂尔多斯", - "梧州","百色","鸡西","七台河","白城","朝阳","亳州","安庆","六安","宁德","三沙","临沧","拉萨","南充","泸州","资阳","乌海","开封","固原","朔州","平凉","白银","吉安","通化", - "鹤岗","铜仁","南平","贵港","商洛","吴忠","晋城","阿克苏","海东","黑河","阜新","抚顺","葫芦岛","张家口","衡水","邢台","石嘴山","济宁","日照","聊城","滨州","淮北","宣城", - "三明","宿州","龙岩","保山","池州","乌兰察布","内江","达州","贺州","巴中","昭通","怀化","鄂州","伊春","毕节","十堰","遂宁","漯河","松原","眉山","鹤壁","忻州","郴州", - "晋中","益阳","辽阳","宝鸡","酒泉","张掖","随州","承德","鹰潭","新余","孝感","枣庄","周口","濮阳","莱芜","阳泉","运城","蚌埠","渭南","滁州","铜陵","嘉峪关","漳州","庆阳", - "汕尾","上饶","普洱","沧州","宜春","德阳","东营","广安","德州","雅安","永州","娄底","荆州","咸宁","三门峡","商丘","长治","吕梁","金昌","陇南","萍乡","抚州","通辽","楚雄", - "临夏","甘南","黔西南","黔东南","湘西","延边","海北州","黄南州","海南州","果洛州","玉树州","海西州","阿坝州","凉山州","怒江州","巴彦淖尔","来宾","信阳","克拉玛依","河池", - "邵阳","荆门","防城港","驻马店","铜川","崇左","呼伦贝尔","大兴安岭","甘孜州","西双版纳州","德宏州","喀什","恩施","塔城","黔南","迪庆州","丹东","石河子","阿拉尔", - "图木舒克","五家渠","济源","仙桃","潜江","天门","景德镇", "神农架","五指山","琼海","儋州","文昌","万宁","东方","定安","屯昌","澄迈","临高","白沙","昌江","乐东","陵水", - "保亭","琼中","北屯","铁门关","双河","可克达拉" + "娣卞湷","涓婃捣","鍖椾含", "骞垮窞","鎴愰兘","閲嶅簡","鏉窞","瑗垮畨","澶╂触","姝︽眽","鍗椾含","娌堥槼","璐甸槼","绂忓窞","瀹佹尝","鐭冲搴�","澶ц繛","鏄嗘槑","鑻忓窞","闀挎矙","澶師","鍘﹂棬","鏃犻敗","閮戝窞", + "鍛煎拰娴╃壒","鍏板窞","鍝堝皵婊�","娴庡崡","浣涘北","闀挎槬","闈掑矝","涓滆帪","鍚堣偉","涔岄瞾鏈ㄩ綈","鐑熷彴","鍗楁槍","娉夊窞","榻愰綈鍝堝皵","鍖呭ご","甯稿痉","澶у悓","娓╁窞","閾跺窛","瑗垮畞","鎵窞","缁甸槼", + "濞佹捣","鍚夋灄","閭兏","涓北","婀涙睙","娼嶅潑","淇濆畾","绉︾殗宀�","甯稿窞","瀹滄槍","闉嶅北","鍢夊叴","澶у簡","寰愬窞","鏍床","闀囨睙","璧e窞","鑺滄箹","鍗楅��","涔濇睙","娉板窞","娲涢槼","鍙板窞","鎯犲窞", + "婀栧窞","姹熼棬","缁嶅叴","娴峰彛","鐝犳捣","閲戝崕","杩炰簯娓�","妗傛灄","椹瀺灞�","鏌冲窞","娣勫崥","鐩愬煄","鏈邯","姹曞ご","琛¢槼","鎻槼","鑼傚悕","鐗′腹姹�","骞抽《灞�","鑸熷北","瀹夐槼","宀抽槼","璁告槍", + "鍥涘钩","娣崡","娣畨","璧ゅ嘲","浣虫湪鏂�","鍗楅槼","涓存矀","涓存本","姒嗘灄","鍜搁槼","鍞愬北","涓変簹","瀹滃","鑷础","寤婂潑","鏀�鏋濊姳","鍗楀畞","寤跺畨","瑗勯槼","涓芥睙","澶х悊","鍏洏姘�","婀樻江", + "娓呰繙","琛㈠窞","瀹胯縼","鍖楁捣","鑾嗙敯","鐜夋灄","寮犲鐣�","鐜夋邯","浜戞诞","鑲囧簡","鏂颁埂","钀ュ彛","娼窞","榛勭煶","鐒︿綔","鐩橀敠","姊呭窞","鏇查潠","闃虫睙","闊跺叧","娌虫簮","閬典箟","浼婄妬", + "闃挎媺鍠勭洘","閿℃灄閮嫆鐩�","鍏村畨鐩�","鏋楄姖","闃块噷","閭f洸","灞卞崡","鏃ュ杸鍒�","鏄岄兘","绾㈡渤","涓崼","鍙岄腑灞�","鍏嬪瓬鍕掕嫃","宸撮煶閮","鍗氬皵濉旀媺","闃垮嫆娉�","鏄屽悏","鍜岀敯","鍝堝瘑", + "鍚愰瞾鐣�","鏂囧北宸�","姝﹀▉","閾佸箔","澶╂按","娉板畨","榛勫唸","骞垮厓","闃滈槼","瀹氳タ","杈芥簮","涓芥按","涔愬北","鑿忔辰","閿﹀窞","姹変腑","榛勫北","鐧藉北","瀹夐『","瀹夊悍","缁ュ寲","閽﹀窞","閯傚皵澶氭柉", + "姊у窞","鐧捐壊","楦¤タ","涓冨彴娌�","鐧藉煄","鏈濋槼","浜冲窞","瀹夊簡","鍏畨","瀹佸痉","涓夋矙","涓存钵","鎷夎惃","鍗楀厖","娉稿窞","璧勯槼","涔屾捣","寮�灏�","鍥哄師","鏈斿窞","骞冲噳","鐧介摱","鍚夊畨","閫氬寲", + "楣ゅ矖","閾滀粊","鍗楀钩","璐垫腐","鍟嗘礇","鍚村繝","鏅嬪煄","闃垮厠鑻�","娴蜂笢","榛戞渤","闃滄柊","鎶氶『","钁姦宀�","寮犲鍙�","琛℃按","閭㈠彴","鐭冲槾灞�","娴庡畞","鏃ョ収","鑱婂煄","婊ㄥ窞","娣寳","瀹e煄", + "涓夋槑","瀹垮窞","榫欏博","淇濆北","姹犲窞","涔屽叞瀵熷竷","鍐呮睙","杈惧窞","璐哄窞","宸翠腑","鏄��","鎬�鍖�","閯傚窞","浼婃槬","姣曡妭","鍗佸牥","閬傚畞","婕渤","鏉惧師","鐪夊北","楣ゅ","蹇诲窞","閮村窞", + "鏅嬩腑","鐩婇槼","杈介槼","瀹濋浮","閰掓硥","寮犳帠","闅忓窞","鎵垮痉","楣版江","鏂颁綑","瀛濇劅","鏋e簞","鍛ㄥ彛","婵槼","鑾辫姕","闃虫硥","杩愬煄","铓屽煚","娓崡","婊佸窞","閾滈櫟","鍢夊唱鍏�","婕冲窞","搴嗛槼", + "姹曞熬","涓婇ザ","鏅幢","娌у窞","瀹滄槬","寰烽槼","涓滆惀","骞垮畨","寰峰窞","闆呭畨","姘稿窞","濞勫簳","鑽嗗窞","鍜稿畞","涓夐棬宄�","鍟嗕笜","闀挎不","鍚曟","閲戞槍","闄囧崡","钀嶄埂","鎶氬窞","閫氳窘","妤氶泟", + "涓村","鐢樺崡","榛旇タ鍗�","榛斾笢鍗�","婀樿タ","寤惰竟","娴峰寳宸�","榛勫崡宸�","娴峰崡宸�","鏋滄礇宸�","鐜夋爲宸�","娴疯タ宸�","闃垮潩宸�","鍑夊北宸�","鎬掓睙宸�","宸村溅娣栧皵","鏉ュ","淇¢槼","鍏嬫媺鐜涗緷","娌虫睜", + "閭甸槼","鑽嗛棬","闃插煄娓�","椹婚┈搴�","閾滃窛","宕囧乏","鍛间鸡璐濆皵","澶у叴瀹夊箔","鐢樺瓬宸�","瑗垮弻鐗堢撼宸�","寰峰畯宸�","鍠�浠�","鎭╂柦","濉斿煄","榛斿崡","杩簡宸�","涓逛笢","鐭虫渤瀛�","闃挎媺灏�", + "鍥炬湪鑸掑厠","浜斿娓�","娴庢簮","浠欐","娼滄睙","澶╅棬","鏅痉闀�", "绁炲啘鏋�","浜旀寚灞�","鐞兼捣","鍎嬪窞","鏂囨槍","涓囧畞","涓滄柟","瀹氬畨","灞槍","婢勮繄","涓撮珮","鐧芥矙","鏄屾睙","涔愪笢","闄垫按", + "淇濅涵","鐞间腑","鍖楀悲","閾侀棬鍏�","鍙屾渤","鍙厠杈炬媺" ] - cities = ["鹤岗"] + cities = ["楣ゅ矖"] println cities for(String city : cities) { List districts = findDistrictByCity(city) println city + "\t" + districts.size() - //半年的房源排名统计 + //鍗婂勾鐨勬埧婧愭帓鍚嶇粺璁� def sellCountsList = [] Date currentDate = DateUtil.truncateDay(new Date()) def districtCountResult = findDistrictHouseCount(city, districts, currentDate); @@ -88,7 +88,7 @@ class DistrictDealSellRentRankBatch extends BaseBatch { sellCountsList = sellCountsList.unique() sellCountsList = sellCountsList.sort().reverse() - //房号数排名统计 + //鎴垮彿鏁版帓鍚嶇粺璁� def householdsCountList = [] def householdsCountMap = [:] for(DBObject district : districts) { @@ -108,7 +108,7 @@ class DistrictDealSellRentRankBatch extends BaseBatch { } householdsCountList = householdsCountList.unique().sort().reverse() - //半年的成交排名统计 + //鍗婂勾鐨勬垚浜ゆ帓鍚嶇粺璁� def dealCountList = [] Map dealCountMap = [:] Date halfYear = DateUtil.getBeforeDay(new Date(), 180) @@ -120,7 +120,7 @@ class DistrictDealSellRentRankBatch extends BaseBatch { dealCountList = dealCountList.unique() dealCountList = dealCountList.sort().reverse() - //半年的链接网址带看数量排名统计 + //鍗婂勾鐨勯摼鎺ョ綉鍧�甯︾湅鏁伴噺鎺掑悕缁熻 def seeCountList = [] def seeCountMap = [:] for(DBObject district : districts) { @@ -140,7 +140,7 @@ class DistrictDealSellRentRankBatch extends BaseBatch { seeCountList = seeCountList.unique() seeCountList = seeCountList.sort().reverse() - //周边小区的数量及排名统计 + //鍛ㄨ竟灏忓尯鐨勬暟閲忓強鎺掑悕缁熻 def aroundCountList = [] def aroundCountMap = [:] for(DBObject district : districts) { @@ -374,7 +374,7 @@ class DistrictDealSellRentRankBatch extends BaseBatch { def findAllCommHouse(city, districts, startDate, endDate){ def totalCount = new AtomicLong() final CountDownLatch latch = new CountDownLatch(districts.size()) - println city +" 小区量:"+districts.size() + println city +" 灏忓尯閲忥細"+districts.size() def retMap = new ConcurrentHashMap() for(def i=0;i2){ -// if(ret.estate_company!='---'&&ret.estate_company.indexOf("暂无")==-1&&ret.estate_company.indexOf("待定")==-1&&ret.estate_company.indexOf("平方米")==-1&&ret.estate_company.indexOf("自主物业")==-1&&ret.estate_company.indexOf("小区物业")==-1){ +// if(ret.estate_company!='---'&&ret.estate_company.indexOf("鏆傛棤")==-1&&ret.estate_company.indexOf("寰呭畾")==-1&&ret.estate_company.indexOf("骞虫柟绫�")==-1&&ret.estate_company.indexOf("鑷富鐗╀笟")==-1&&ret.estate_company.indexOf("灏忓尯鐗╀笟")==-1){ // companys << ret.estate_company // } // // } // -// if(ret.estate_charge&&ret.estate_charge.indexOf("暂无")==-1&&ret.estate_charge.indexOf("待定")==-1){ +// if(ret.estate_charge&&ret.estate_charge.indexOf("鏆傛棤")==-1&&ret.estate_charge.indexOf("寰呭畾")==-1){ // charges << ret.estate_charge // } // @@ -416,14 +416,14 @@ class DistrictFieldWashBatch { // open_dates << ret.open_date // } -// if(ret.live_date&&ret.live_date.indexOf("暂无")==-1&&ret.live_date.indexOf("待定")==-1){ +// if(ret.live_date&&ret.live_date.indexOf("鏆傛棤")==-1&&ret.live_date.indexOf("寰呭畾")==-1){ // def year = getNumber(ret.live_date); // if(year && year>1900){ // live_dates << ret.live_date // } // } -// if(ret.finish_building_date&&ret.finish_building_date.indexOf("暂无")==-1&&ret.finish_building_date.indexOf("待定")==-1&&ret.finish_building_date!="0000-00-00"){ +// if(ret.finish_building_date&&ret.finish_building_date.indexOf("鏆傛棤")==-1&&ret.finish_building_date.indexOf("寰呭畾")==-1&&ret.finish_building_date!="0000-00-00"){ // // def year = getNumber(ret.finish_building_date); // if(year && year>1900){ @@ -432,7 +432,7 @@ class DistrictFieldWashBatch { // // } - if(ret.developer&&ret.developer.indexOf("暂无")==-1&&ret.developer.indexOf("待定")==-1&&ret.developer.indexOf("未知")==-1&&ret.developer.indexOf("不详")==-1&&ret.developer.indexOf("无")==-1){ + if(ret.developer&&ret.developer.indexOf("鏆傛棤")==-1&&ret.developer.indexOf("寰呭畾")==-1&&ret.developer.indexOf("鏈煡")==-1&&ret.developer.indexOf("涓嶈")==-1&&ret.developer.indexOf("鏃�")==-1){ developers << ret.developer } @@ -447,7 +447,7 @@ class DistrictFieldWashBatch { } } - if(ret.build_date&&ret.build_date.toString().indexOf("暂无")==-1&&ret.build_date.toString().indexOf("待定")==-1){ + if(ret.build_date&&ret.build_date.toString().indexOf("鏆傛棤")==-1&&ret.build_date.toString().indexOf("寰呭畾")==-1){ def year = getNumber(ret.build_date.toString()); if(year && year>1900){ build_dates << ret.build_date @@ -473,7 +473,7 @@ class DistrictFieldWashBatch { def propertyLifeReplace(def ret){ for(def m : ret){ def name = m.name; - if(name.indexOf("宿舍")!=-1){ + if(name.indexOf("瀹胯垗")!=-1){ println name; DBObject q = new BasicDBObject(); q.put("_id", m.id); @@ -574,7 +574,7 @@ class DistrictFieldWashBatch { } } -// if(!m.cubage_percent||m.cubage_percent.indexOf("暂无")!=-1){ +// if(!m.cubage_percent||m.cubage_percent.indexOf("鏆傛棤")!=-1){ // println m.name // def retMap = getOtherWebsiteValues(m.city, m.region, m.name); // def cubage_percents = retMap.cubage_percents; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictHouseAreaStatBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictHouseAreaStatBatch.groovy index 3f30e286d..ee7fa230d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictHouseAreaStatBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictHouseAreaStatBatch.groovy @@ -29,7 +29,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit /** - * 统计小区不同面积的数量 + * 缁熻灏忓尯涓嶅悓闈㈢Н鐨勬暟閲� * 2016.9.7 * @author gaojuan * @@ -124,7 +124,7 @@ class DistrictHouseAreaStatBatch extends BaseBatch{ saveData(rMap); } }else{ - println dist.city+ " "+index +"/"+count + " "+ dist.region +" "+dist.name+" 存在..." + println dist.city+ " "+index +"/"+count + " "+ dist.region +" "+dist.name+" 瀛樺湪..." } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictHouseBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictHouseBatch.groovy index 5542b2c16..87ec59840 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictHouseBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictHouseBatch.groovy @@ -28,10 +28,10 @@ import com.mongodb.Mongo /** - * 小区房源展示量统计batch,每天跑一次 + * 灏忓尯鎴挎簮灞曠ず閲忕粺璁atch锛屾瘡澶╄窇涓�娆� * - * 数据来源:datastore -- db:fangjia - * 结果表:collection: -- district_house + * 鏁版嵁鏉ユ簮锛歞atastore -- db:fangjia + * 缁撴灉琛細collection: -- district_house * */ @BatchOwner(Watcher.GaoJuan) @@ -45,8 +45,8 @@ class DistrictHouseBatch extends BaseBatch { // DBObject q = new BasicDBObject(); // q.put("cat", "sell"); -// q.put("city","常州") -// q.put("district_name","清河苑一区") +// q.put("city","甯稿窞") +// q.put("district_name","娓呮渤鑻戜竴鍖�") // def dbcursor = CommonDatautils.getHouseDataStoreConnection().find(q) // for(def obj : dbcursor){ // obj.put("c_date", new Date()) @@ -54,7 +54,7 @@ class DistrictHouseBatch extends BaseBatch { // } -// CommonDatautils.getHouseDataStoreConnection().find(new BasicDBObject("districtname_key","清河苑一区_溧阳_常州")).each{ +// CommonDatautils.getHouseDataStoreConnection().find(new BasicDBObject("districtname_key","娓呮渤鑻戜竴鍖篲婧ч槼_甯稿窞")).each{ // println(it) // } @@ -115,7 +115,7 @@ class DistrictHouseBatch extends BaseBatch { sellQuery.put('$facet', facet) sellQuery.put('city', city) sellQuery.put('cat',cat) -// sellQuery.put("district_name","新城帝景南区") +// sellQuery.put("district_name","鏂板煄甯濇櫙鍗楀尯") // sellQuery.put('visible',0) DSCursor sellDSCursor = SEABIRD.find(sellQuery).skip(0).limit(0) List sellFacetResult = sellDSCursor.getFacetResults(); @@ -157,7 +157,7 @@ class DistrictHouseBatch extends BaseBatch { q.put('city', city) q.put('cat', 'district') q.put('visible', 0) - q.put("name","清河苑") + q.put("name","娓呮渤鑻�") DSCursor cur = SEAWEED.find(q, fields).batchSize(2000) Iterator iter = cur.iterator() diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictKey.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictKey.groovy index 1a671eed7..c0adcb9c5 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictKey.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictKey.groovy @@ -31,7 +31,7 @@ class DistrictKey implements Serializable { /** - * 如果city, region, name都不为null或空白字符串,则返回true,否则返回false + * 濡傛灉city, region, name閮戒笉涓簄ull鎴栫┖鐧藉瓧绗︿覆锛屽垯杩斿洖true锛屽惁鍒欒繑鍥瀎alse * * @return */ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictMetroDistanceBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictMetroDistanceBatch.groovy index 2fc006b7a..3ecbded55 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictMetroDistanceBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictMetroDistanceBatch.groovy @@ -46,7 +46,7 @@ class DistrictMetroDistanceBatch { query.put("cat", "district") query.put('visible', 0) DSCursor cursor = seabirdColl.find(query, fields).batchSize(2000) - println city + "\t" + "共有" + cursor.count() + "个小区计算..." + println city + "\t" + "鍏辨湁" + cursor.count() + "涓皬鍖鸿绠�..." Iterator iter = cursor.iterator() int i = 0 while(iter.hasNext()) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictPOIBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictPOIBatch.groovy index ebd21d130..cd63cea31 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictPOIBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictPOIBatch.groovy @@ -87,7 +87,7 @@ public class DistrictPOIBatch { int grade = dbo.get('city_grade') int status = dbo.get('status') String display = dbo.get('display') - if(display == '全国' ||status != 2) { + if(display == '鍏ㄥ浗' ||status != 2) { continue; } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictPeriod.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictPeriod.groovy index 9274d4375..ec8696056 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictPeriod.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictPeriod.groovy @@ -19,13 +19,13 @@ class DistrictPeriod { static main(args) { def allCitys = []; SERVER_AREA_CONN.find().sort(new BasicDBObject('city_grade', 1)).each { - if (it.display == '全国') + if (it.display == '鍏ㄥ浗') return; allCitys << it; } - Pattern p = Pattern.compile('.+([1-9一两二三四五六七八九]+)期$'); + Pattern p = Pattern.compile('.+([1-9涓�涓や簩涓夊洓浜斿叚涓冨叓涔漖+)鏈�$'); allCitys.each { DBObject q = new BasicDBObject(); @@ -47,7 +47,7 @@ class DistrictPeriod { if (p.matcher(name).matches()) return; - Pattern p2 = Pattern.compile(name + '([1-9一两二三四五六七八九]+)期$'); + Pattern p2 = Pattern.compile(name + '([1-9涓�涓や簩涓夊洓浜斿叚涓冨叓涔漖+)鏈�$'); def index = 0; def details = []; ds.each { dis2 -> @@ -91,7 +91,7 @@ class DistrictPeriod { } /** - * 把字符串转换成Double类型 + * 鎶婂瓧绗︿覆杞崲鎴怐ouble绫诲瀷 * @param s * @return */ @@ -130,7 +130,7 @@ class DistrictPeriod { } /** - * 把字符串中有中文数字的转换成数字 + * 鎶婂瓧绗︿覆涓湁涓枃鏁板瓧鐨勮浆鎹㈡垚鏁板瓧 * @param s * @return */ @@ -142,23 +142,23 @@ class DistrictPeriod { } /** - * 获得中文数字映射表 - * key:中文数字 - * value:数字 + * 鑾峰緱涓枃鏁板瓧鏄犲皠琛� + * key:涓枃鏁板瓧 + * value:鏁板瓧 * @return */ private static Map getChineseNumberMap(){ Map chineseNumberMap = new HashMap(); - chineseNumberMap.put("一", "1"); - chineseNumberMap.put("两", "2"); - chineseNumberMap.put("二", "2"); - chineseNumberMap.put("三", "3"); - chineseNumberMap.put("四", "4"); - chineseNumberMap.put("五", "5"); - chineseNumberMap.put("六", "6"); - chineseNumberMap.put("七", "7"); - chineseNumberMap.put("八", "8"); - chineseNumberMap.put("九", "9"); + chineseNumberMap.put("涓�", "1"); + chineseNumberMap.put("涓�", "2"); + chineseNumberMap.put("浜�", "2"); + chineseNumberMap.put("涓�", "3"); + chineseNumberMap.put("鍥�", "4"); + chineseNumberMap.put("浜�", "5"); + chineseNumberMap.put("鍏�", "6"); + chineseNumberMap.put("涓�", "7"); + chineseNumberMap.put("鍏�", "8"); + chineseNumberMap.put("涔�", "9"); return chineseNumberMap; } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictPic.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictPic.groovy index 780748f2d..a0ec5f53f 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictPic.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictPic.groovy @@ -77,8 +77,8 @@ class DistrictPic { query.put("cat", cat) query.put("visible", 0) query.put("city", city) -// query.put("region", '闵行') -// query.put("name", '上海康城') +// query.put("region", '闂佃') +// query.put("name", '涓婃捣搴峰煄') DBObject fields = new BasicDBObject() fields.put("city", 1) @@ -146,7 +146,7 @@ class DistrictPic { int grade = dbo.get('city_grade') int status = dbo.get('status') String display = dbo.get('display') - if(display == '全国') { + if(display == '鍏ㄥ浗') { continue; } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictRatioMatchBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictRatioMatchBatch.groovy index 68e38a6e2..0a46707d5 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictRatioMatchBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictRatioMatchBatch.groovy @@ -19,7 +19,7 @@ import com.mongodb.DBObject /** - * 计算小区住宅比 + * 璁$畻灏忓尯浣忓畢姣� * @author shibb * */ @@ -28,12 +28,12 @@ class DistrictRatioMatchBatch extends BaseBatch{ private final static String datastoreDomain = "seaweed.db.fangjia.com" - private final static List district_value = new ArrayList(Arrays.asList("LOFT","loft", "MINI墅", "SOHO","TOWNHOUS","Townhouse","安置房","板楼","别邸","别墅","大院", - "大宅", "叠联", "叠拼","叠墅","叠院","动迁房","独栋","独院","多层","高层", - "公房", "公馆", "公寓","公租房","官邸","豪宅","花墅","回迁房","经济适用房","经适房", - "精装房","居民小区","老公房","联排","联院","廉租房","两限房","毛坯房","民宅","平房", - "平墅","商品房","商住","上院","双拼","四合院","四仔屋","塔楼","现房","限价房","小高层", - "洋房","洋楼","住宅","庄园","自住房","自住型商品房","租赁房")); + private final static List district_value = new ArrayList(Arrays.asList("LOFT","loft", "MINI澧�", "SOHO","TOWNHOUS","Townhouse","瀹夌疆鎴�","鏉挎ゼ","鍒偢","鍒","澶ч櫌", + "澶у畢", "鍙犺仈", "鍙犳嫾","鍙犲","鍙犻櫌","鍔ㄨ縼鎴�","鐙爧","鐙櫌","澶氬眰","楂樺眰", + "鍏埧", "鍏", "鍏瘬","鍏鎴�","瀹橀偢","璞畢","鑺卞","鍥炶縼鎴�","缁忔祹閫傜敤鎴�","缁忛�傛埧", + "绮捐鎴�","灞呮皯灏忓尯","鑰佸叕鎴�","鑱旀帓","鑱旈櫌","寤夌鎴�","涓ら檺鎴�","姣涘澂鎴�","姘戝畢","骞虫埧", + "骞冲","鍟嗗搧鎴�","鍟嗕綇","涓婇櫌","鍙屾嫾","鍥涘悎闄�","鍥涗粩灞�","濉旀ゼ","鐜版埧","闄愪环鎴�","灏忛珮灞�", + "娲嬫埧","娲嬫ゼ","浣忓畢","搴勫洯","鑷綇鎴�","鑷綇鍨嬪晢鍝佹埧","绉熻祦鎴�")); public static final DBCollection ANALY_TASK_COLL = MongoUtils.getCollectionByName("coredata", "analy_task", "coredata.mongo.db.fangjia.com") public static final DBCollection SERVER_AREA_COLL = MongoUtils.getCollectionByName("fangjia", "server_area", "mongo.db.fangjia.com") @@ -51,13 +51,13 @@ class DistrictRatioMatchBatch extends BaseBatch{ public void process(Object args) { def allCity = findAllCity(); if(SystemUtils.IS_OS_WINDOWS){ - allCity = ["开封"] + allCity = ["寮�灏�"] } for(def city : allCity){ - println "城市" + city + "\n"; - println "开始时间:"+ DateUtils.formatToTightYYYYMMDDhhmmss(new Date()) + "\n"; + println "鍩庡競" + city + "\n"; + println "寮�濮嬫椂闂�:"+ DateUtils.formatToTightYYYYMMDDhhmmss(new Date()) + "\n"; doProcess(city); - println "结束时间:"+ DateUtils.formatToTightYYYYMMDDhhmmss(new Date()) + "\n"; + println "缁撴潫鏃堕棿:"+ DateUtils.formatToTightYYYYMMDDhhmmss(new Date()) + "\n"; } } @@ -100,12 +100,12 @@ class DistrictRatioMatchBatch extends BaseBatch{ List site = new ArrayList(); List aliasObjList = new ArrayList(); List taskList = new ArrayList(); - //把所有的小区查出来site表 + //鎶婃墍鏈夌殑灏忓尯鏌ュ嚭鏉ite琛� while(iter.hasNext()){ DBObject dbo = iter.next() Map siteDetail = new HashMap(); String district_name = dbo.get("district_name"); - if(!district_name.contains("写字楼")&&!district_name.contains("商铺")){ + if(!district_name.contains("鍐欏瓧妤�")&&!district_name.contains("鍟嗛摵")){ siteDetail.put("district_name", dbo.get("district_name")); siteDetail.put("region", dbo.get("region")); siteDetail.put("id",dbo.get("_id")) @@ -115,7 +115,7 @@ class DistrictRatioMatchBatch extends BaseBatch{ site.add(siteDetail); } } - //把seaweed表中的所有数据查出来 + //鎶妔eaweed琛ㄤ腑鐨勬墍鏈夋暟鎹煡鍑烘潵 DBObject qsea = new BasicDBObject('city', city).append('visible', 0).append('cat', 'district') def dscurSea = seaweed.find(qsea, new BasicDBObject('alias', 1).append('region', 1).append('name', 1)).batchSize(2000) Iterator iterSea = dscurSea.iterator() @@ -136,35 +136,35 @@ class DistrictRatioMatchBatch extends BaseBatch{ task.put("page_name", dboSea.get("page_name")); taskList.add(task); } - //处理数据 + //澶勭悊鏁版嵁 for(int h =0 ;h districtList = new ArrayList(); - //在小区名不为空的情况下进行计算 + //鍦ㄥ皬鍖哄悕涓嶄负绌虹殑鎯呭喌涓嬭繘琛岃绠� if(district!=null&&district!=""){ - int i = 0;//包含住宅关键字的数量 - int j = 0;//总的数量 - int p = 0;//网站数目 + int i = 0;//鍖呭惈浣忓畢鍏抽敭瀛楃殑鏁伴噺 + int j = 0;//鎬荤殑鏁伴噺 + int p = 0;//缃戠珯鏁扮洰 - String siteNames = "";//拼接网站名称 + String siteNames = "";//鎷兼帴缃戠珯鍚嶇О List sites = new ArrayList(); List estatetypeList = [] - boolean isNewHouse = false;//判断小区是不是新房 + boolean isNewHouse = false;//鍒ゆ柇灏忓尯鏄笉鏄柊鎴� - if(null!=pageType&&"新房".equals(pageType)){ + if(null!=pageType&&"鏂版埧".equals(pageType)){ isNewHouse = true; } districtList.add(district); - //通过小区名查找 + //閫氳繃灏忓尯鍚嶆煡鎵� if(!district.trim().contains(" ")&&!district.trim().contains(" ")){ for(int f =0 ;f0){ for(int y =0 ;y siteNameList = new ArrayList();//网站名称 + List siteNameList = new ArrayList();//缃戠珯鍚嶇О List roadObjectList = new ArrayList(); DBObject q2 = new BasicDBObject('primary_map.name', districtList.get(y)).append('primary_map.city', city).append('category', 'district') def dscur2 = statColl2.find(q2,new BasicDBObject('site_name', 1).append('page_name', 1).append('task_id', 1).append('status', 1) @@ -217,7 +217,7 @@ class DistrictRatioMatchBatch extends BaseBatch{ String taskListId = taskList.get(x).get("id"); if(taskId.equals(taskListId)){ String pageName = taskList.get(x).get("page_name"); - if(pageName.contains("新房")){ + if(pageName.contains("鏂版埧")){ isNewHouse = true ; break; } @@ -235,9 +235,9 @@ class DistrictRatioMatchBatch extends BaseBatch{ String content = dd.get("estate_type2"); if(content!=null&&content!=""){ boolean isDistrict = false - if(content.contains(",")||content.contains(",")||content.contains("、") + if(content.contains(",")||content.contains("锛�")||content.contains("銆�") ||content.contains(" ")||content.contains(" ")||content.contains("/")){ - String[] contentList = content.split(",|,|、| | |/"); + String[] contentList = content.split(",|锛寍銆亅 | |/"); for(int x = 0;x= 3 && !estatetypeList.contains("住宅") && opposeCount > abstentionCount){//物业类型不包含住宅,网站量大于3且非住宅数量大于物业类型为空数量 + }else if(estatetypeList.size() >= 3 && !estatetypeList.contains("浣忓畢") && opposeCount > abstentionCount){//鐗╀笟绫诲瀷涓嶅寘鍚綇瀹咃紝缃戠珯閲忓ぇ浜�3涓旈潪浣忓畢鏁伴噺澶т簬鐗╀笟绫诲瀷涓虹┖鏁伴噺 isRemove = true } if(isRemove){ @@ -314,26 +314,26 @@ class DistrictRatioMatchBatch extends BaseBatch{ int ratio = (int) Math.round(i/j*100); DBObject entity = new BasicDBObject() if(isNewHouse){ - entity.put("page_type", "新房"); + entity.put("page_type", "鏂版埧"); }else{ - entity.put("page_type", "二手房"); + entity.put("page_type", "浜屾墜鎴�"); } entity.put("district_ratio", ratio); entity.put("site_names", siteNames); entity.put("site_count", p); - //第一个true没有这条记录也更新,第二个true允许多个 + //绗竴涓猼rue娌℃湁杩欐潯璁板綍涔熸洿鏂帮紝绗簩涓猼rue鍏佽澶氫釜 statColl.update(new BasicDBObject("_id", id), new BasicDBObject('$set', entity)); }else{ DBObject entity = new BasicDBObject() if(isNewHouse){ - entity.put("page_type", "新房"); + entity.put("page_type", "鏂版埧"); }else{ - entity.put("page_type", "二手房"); + entity.put("page_type", "浜屾墜鎴�"); } entity.put("district_ratio", 0); entity.put("site_names", siteNames); entity.put("site_count", sites.size()); - //第一个true没有这条记录也更新,第二个true允许多个 + //绗竴涓猼rue娌℃湁杩欐潯璁板綍涔熸洿鏂帮紝绗簩涓猼rue鍏佽澶氫釜 statColl.update(new BasicDBObject("_id", id), new BasicDBObject('$set', entity)); } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictSmallPicsFilterBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictSmallPicsFilterBatch.groovy index 79371e750..cbd13a4ee 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictSmallPicsFilterBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictSmallPicsFilterBatch.groovy @@ -18,7 +18,7 @@ import com.mongodb.DBObject import com.mongodb.Mongo /** - * 检查小区图片中的小图,默认查找小于200*200的图片 + * 妫�鏌ュ皬鍖哄浘鐗囦腑鐨勫皬鍥撅紝榛樿鏌ユ壘灏忎簬200*200鐨勫浘鐗� * @author yukai * */ @@ -102,7 +102,7 @@ class DistrictSmallPicsFilterBatch extends BaseBatch { } /** - * 房型图列表转换为string列表 + * 鎴垮瀷鍥惧垪琛ㄨ浆鎹负string鍒楄〃 * * @param srcs * @return @@ -128,8 +128,8 @@ class DistrictSmallPicsFilterBatch extends BaseBatch { } /** - * 检查图片,小于120*82的直接在fs中删除 - * @param pics 图片url列表 + * 妫�鏌ュ浘鐗囷紝灏忎簬120*82鐨勭洿鎺ュ湪fs涓垹闄� + * @param pics 鍥剧墖url鍒楄〃 * @return */ private checkPics(List pics) { @@ -137,13 +137,13 @@ class DistrictSmallPicsFilterBatch extends BaseBatch { return [:] } - // 直接删除的图片url列表 + // 鐩存帴鍒犻櫎鐨勫浘鐗噓rl鍒楄〃 def deletedPics = [] - // 最终要删除的图片url列表 + // 鏈�缁堣鍒犻櫎鐨勫浘鐗噓rl鍒楄〃 def toBeDelPics = [] - // fs查询条件 + // fs鏌ヨ鏉′欢 DBObject query = null - // fs的图片对象 + // fs鐨勫浘鐗囧璞� DBObject picObj = null BufferedImage bufferedImage = null for (def pic : pics) { @@ -206,7 +206,7 @@ class DistrictSmallPicsFilterBatch extends BaseBatch { } /** - * 把不存在的图片和直接删除的小图的url从小区里更新掉 + * 鎶婁笉瀛樺湪鐨勫浘鐗囧拰鐩存帴鍒犻櫎鐨勫皬鍥剧殑url浠庡皬鍖洪噷鏇存柊鎺� */ def updateDistrictInfo(district, deletedOutPics, deletedFloorPics) { def needUpdateDistrict = false diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictSmallPicsTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictSmallPicsTest.groovy index 6876d5203..2d5766693 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictSmallPicsTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictSmallPicsTest.groovy @@ -27,15 +27,15 @@ class DistrictSmallPicsTest { static main(args) { DBObject dQuery = new BasicDBObject() dQuery.put("cat", "district") - dQuery.put("name", "颐慧佳园") - dQuery.put("region", "海淀") + dQuery.put("name", "棰愭収浣冲洯") + dQuery.put("region", "娴锋穩") def district = datastoreDB.findOne(dQuery) def pics = district.out_pics - // fs查询条件 + // fs鏌ヨ鏉′欢 DBObject query = null - // fs的图片对象 + // fs鐨勫浘鐗囧璞� DBObject picObj = null BufferedImage bufferedImage = null for (def pic : pics) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictTagArbiterBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictTagArbiterBatch.groovy index 5e6730f8f..caca4cbbd 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictTagArbiterBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictTagArbiterBatch.groovy @@ -18,7 +18,7 @@ import com.mongodb.DBObject @BatchOwner(Watcher.DuXiaoYu) class DistrictTagArbiterBatch extends BaseBatch { - public static final def CITIES = ["上海"] + public static final def CITIES = ["涓婃捣"] public DSCollection dsCollection = new DataStore("seaweed.db.fangjia.com").getCollection("fangjia.seabird") public DBCollection collMetro = MongoUtils.getCollectionByName("fangjia", "metro_distance", "mongo.db.fangjia.com") public DBCollection collFacilitys = MongoUtils.getCollectionByName("fangjia", "district_facilitys", "mongo.db.fangjia.com") @@ -36,8 +36,8 @@ class DistrictTagArbiterBatch extends BaseBatch { q.put("visible", 0) q.put("cat", 'district') -// q.put("region", '长宁') -// q.put("district_name", '新泾三村') +// q.put("region", '闀垮畞') +// q.put("district_name", '鏂版尘涓夋潙') DBObject fs = new BasicDBObject(); fs.put('description', 0) @@ -109,7 +109,7 @@ class DistrictTagArbiterBatch extends BaseBatch { q.put("city", city) q.put("region", region) q.put("district_name", districtName) - //半年内的交易 + //鍗婂勾鍐呯殑浜ゆ槗 DBObject sq = new BasicDBObject(); sq.put('stat_date', -1) DBCursor cur = collTrade.find(q, new BasicDBObject('total', 1)).sort(sq) @@ -140,7 +140,7 @@ class DistrictTagArbiterBatch extends BaseBatch { double aroundScore = 0 poms.each() {cat, pom-> - if(cat != '运动' && cat != '会展中心' && cat != '公园' && cat != '火车售票点' && cat != '停车场' && cat != '机场' && cat != '市场' && cat != '公交' && cat != '加油站') { + if(cat != '杩愬姩' && cat != '浼氬睍涓績' && cat != '鍏洯' && cat != '鐏溅鍞エ鐐�' && cat != '鍋滆溅鍦�' && cat != '鏈哄満' && cat != '甯傚満' && cat != '鍏氦' && cat != '鍔犳补绔�') { for(Map map : pom) { double distance = GeoUtils.calculateDistance(map.get('x'), map.get('y'), lng, lat) // println map.get("name") + " : " + distance diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictTagBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictTagBatch.groovy index 4108d6827..cbd00dd0f 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictTagBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/DistrictTagBatch.groovy @@ -7,43 +7,43 @@ import com.fangjia.script.BatchOwner; import com.fangjia.script.Watcher; /** - * 知名开发商 - 品牌物业 - 交通便利 - 绿化率高 - 配套完善 - 大型社区 - 市中心 - 交易活跃 + * 鐭ュ悕寮�鍙戝晢 + 鍝佺墝鐗╀笟 + 浜ら�氫究鍒� + 缁垮寲鐜囬珮 + 閰嶅瀹屽杽 + 澶у瀷绀惧尯 + 甯備腑蹇� + 浜ゆ槗娲昏穬 * @author xiaoyu * */ @BatchOwner(Watcher.DuXiaoYu) class DistrictTagBatch extends BaseBatch { - public static def TOP_DEVELOPERS = ["万科地产", "中海地产", "保利地产", "绿地集团", "恒大地产", "碧桂园", "华润置地", "世茂房地产", "万达集团", - "绿城中国", "富力地产", "融创中国", "龙湖地产", "远洋地产", "金地集团", "招商地产", "雅居乐", "华夏幸福", - "九龙仓", "保利香港", "中信地产", + public static def TOP_DEVELOPERS = ["涓囩鍦颁骇", "涓捣鍦颁骇", "淇濆埄鍦颁骇", "缁垮湴闆嗗洟", "鎭掑ぇ鍦颁骇", "纰ф鍥�", "鍗庢鼎缃湴", "涓栬寕鎴垮湴浜�", "涓囪揪闆嗗洟", + "缁垮煄涓浗", "瀵屽姏鍦颁骇", "铻嶅垱涓浗", "榫欐箹鍦颁骇", "杩滄磱鍦颁骇", "閲戝湴闆嗗洟", "鎷涘晢鍦颁骇", "闆呭眳涔�", "鍗庡骞哥", + "涔濋緳浠�", "淇濆埄棣欐腐", "涓俊鍦颁骇", ] - public static def TOP_MANAGEMENT = ["上海陆家嘴物业管理有限公司":"陆家嘴", "北京世邦魏理仕物业管理服务有限公司":"世邦魏理仕", "第一太平戴维斯(Savills)中国公司":"戴维斯", "深圳市中海物业管理公司":"中海物业", - "上海中星集团申城物业有限公司":"中星集团", "戴德梁行房地産顾问(深圳)有限公司":"戴德梁行", "北京金融街物业管理有限责任公司":"金融街", "上海上房物业管理有限公司":"上房物业", - "北京万科物业管理有限公司":"万科物业", "上海高力国际物业服务有限公司":"高力", "深圳市赛格物业管理有限公司":"赛格", "深圳市福田物业发展有限公司":"福田", "上海科瑞物业管理发展有限公司":"", "深圳市鹏基物业管理有限公司":"", - "深圳市华侨城物业管理有限公司 ":"", "北京城建物业管理有限责任公司":"", "深圳中航物业管理有限公司":"", "北京万通鼎安国际物业管理顾问有限公司":"", "深圳市万科物业管理有限公司":"", "上海宝钢源康物业管理有限公司":"", - "番禺祈福物业管理有限公司":"", "上海外高桥物业管理有限公司":"", "深圳市万厦居业有限公司":"", "上海申能物业管理有限公司":"", "北京中海物业管理有限公司":"", "上实物业管理(上海)有限公司":"", - "深圳市天健物业管理有限公司":"", "国贸物业酒店管理有限公司":"", "中房集团北京物业公司":"", "上海东湖物业管理公司":"", "北京大成物业管理有限公司":"", "上海复瑞物业管理有限公司":"", - "深圳熊谷物业管理有限公司":"", "北京京威物业管理有限公司":"", "上海四平物业管理有限公司":"", "北京华润物业管理有限公司":"", "山东鲁能物业公司":"", "北京悦豪物业管理有限公司":"", - "深圳信和物业管理有限公司":"", "上海新长宁集团新华物业有限公司":"", "深圳市保利物业管理有限公司":"", "上海中山物业有限公司":"", "深圳市城建物业管理有限公司":"", "北京网信物业管理有限公司":"", - "宁波经济技术开发区联合物业有限公司":"", "深圳市百仕达物业管理有限公司":"", "北京裕展物业管理有限公司":"", "深圳卓越物业管理有限公司":"", "仲量联行测量师事务所(上海)有限公司":"", - "陕西金鑫太平物业管理有限公司":"", "北京宝景物业管理有限公司":"", "北京建创新兴物业管理有限公司":"", "上海沪莘置业发展有限公司":"", "北京天宇流星花园物业管理有限公司":"", "深圳市泰然物业管理服务有限公司":"", - "北京市北宇物业管理公司":"", "西安铁峰物业管理有限责任公司":"", "北京银达物业管理有限责任公司":"", "上海延吉物业管理有限公司":"", "广州莱佛士物业服务有限公司":"", "深圳市冠懋物业管理有限公司":"", - "北京天竺空港物业管理有限公司":"", "广东省华侨物业发展公司":"", "上海民盈城投物业管理有限公司":"", "北京中兴物业管理有限公司":"", "深圳祥祺物业管理有限公司":"", "北京育新物业管理公司":"", - "上海嘉城物业管理有限公司":"", "北京华特物业管理发展有限公司":"", "深圳市长城物业管理股份有限公司":"", "上海申大物业有限公司":"", "深圳花样年物业管理有限公司":"", "天津天孚物业管理有限公司":"", - "上海平凉物业管理有限公司":"", "北京达文物业管理有限公司":"", "青岛城市建设集团物业管理有限公司":"", "深圳市绿景物业管理有限公司":"", "江苏新城物业管理有限公司":"", "上海安居物业有限公司":"", - "北京仲量联行物业管理服务有限公司":"", "深圳市前海物业管理有限公司":"", "福州融侨物业管理有限公司":"", "保利广州物业管理有限公司":"", "上海德律风物业有限公司":"", "河南建业物业管理有限公司":"", - "北京燕山星城物业管理公司":"", "上海欣达房产服务公司":"", "广州万宁物业管理有限公司":"", "深圳市中信物业管理有限公司":"", "上海长风物业有限公司":"", "北京华腾世纪物业管理有限公司":"", - "深圳泰华物业管理有限公司":"", "珠海市中竣物业管理有限公司":"", "友谊集团物业管理有限公司":"", "深圳市龙房物业管理有限公司":"", "北京东光物业管理有限公司":"", "上海万涓物业有限公司":"", - "北京国广物业管理有限公司":"", "青岛海信物业经营有限公司":"", "济南济发物业有限责任公司":""] + public static def TOP_MANAGEMENT = ["涓婃捣闄嗗鍢寸墿涓氱鐞嗘湁闄愬叕鍙�":"闄嗗鍢�", "鍖椾含涓栭偊榄忕悊浠曠墿涓氱鐞嗘湇鍔℃湁闄愬叕鍙�":"涓栭偊榄忕悊浠�", "绗竴澶钩鎴寸淮鏂紙Savills锛変腑鍥藉叕鍙�":"鎴寸淮鏂�", "娣卞湷甯備腑娴风墿涓氱鐞嗗叕鍙�":"涓捣鐗╀笟", + "涓婃捣涓槦闆嗗洟鐢冲煄鐗╀笟鏈夐檺鍏徃":"涓槦闆嗗洟", "鎴村痉姊佽鎴垮湴鐢i【闂紙娣卞湷锛夋湁闄愬叕鍙�":"鎴村痉姊佽", "鍖椾含閲戣瀺琛楃墿涓氱鐞嗘湁闄愯矗浠诲叕鍙�":"閲戣瀺琛�", "涓婃捣涓婃埧鐗╀笟绠$悊鏈夐檺鍏徃":"涓婃埧鐗╀笟", + "鍖椾含涓囩鐗╀笟绠$悊鏈夐檺鍏徃":"涓囩鐗╀笟", "涓婃捣楂樺姏鍥介檯鐗╀笟鏈嶅姟鏈夐檺鍏徃":"楂樺姏", "娣卞湷甯傝禌鏍肩墿涓氱鐞嗘湁闄愬叕鍙�":"璧涙牸", "娣卞湷甯傜鐢扮墿涓氬彂灞曟湁闄愬叕鍙�":"绂忕敯", "涓婃捣绉戠憺鐗╀笟绠$悊鍙戝睍鏈夐檺鍏徃":"", "娣卞湷甯傞箯鍩虹墿涓氱鐞嗘湁闄愬叕鍙�":"", + "娣卞湷甯傚崕渚ㄥ煄鐗╀笟绠$悊鏈夐檺鍏徃 ":"", "鍖椾含鍩庡缓鐗╀笟绠$悊鏈夐檺璐d换鍏徃":"", "娣卞湷涓埅鐗╀笟绠$悊鏈夐檺鍏徃":"", "鍖椾含涓囬�氶紟瀹夊浗闄呯墿涓氱鐞嗛【闂湁闄愬叕鍙�":"", "娣卞湷甯備竾绉戠墿涓氱鐞嗘湁闄愬叕鍙�":"", "涓婃捣瀹濋挗婧愬悍鐗╀笟绠$悊鏈夐檺鍏徃":"", + "鐣绁堢鐗╀笟绠$悊鏈夐檺鍏徃":"", "涓婃捣澶栭珮妗ョ墿涓氱鐞嗘湁闄愬叕鍙�":"", "娣卞湷甯備竾鍘﹀眳涓氭湁闄愬叕鍙�":"", "涓婃捣鐢宠兘鐗╀笟绠$悊鏈夐檺鍏徃":"", "鍖椾含涓捣鐗╀笟绠$悊鏈夐檺鍏徃":"", "涓婂疄鐗╀笟绠$悊锛堜笂娴凤級鏈夐檺鍏徃":"", + "娣卞湷甯傚ぉ鍋ョ墿涓氱鐞嗘湁闄愬叕鍙�":"", "鍥借锤鐗╀笟閰掑簵绠$悊鏈夐檺鍏徃":"", "涓埧闆嗗洟鍖椾含鐗╀笟鍏徃":"", "涓婃捣涓滄箹鐗╀笟绠$悊鍏徃":"", "鍖椾含澶ф垚鐗╀笟绠$悊鏈夐檺鍏徃":"", "涓婃捣澶嶇憺鐗╀笟绠$悊鏈夐檺鍏徃":"", + "娣卞湷鐔婅胺鐗╀笟绠$悊鏈夐檺鍏徃":"", "鍖椾含浜▉鐗╀笟绠$悊鏈夐檺鍏徃":"", "涓婃捣鍥涘钩鐗╀笟绠$悊鏈夐檺鍏徃":"", "鍖椾含鍗庢鼎鐗╀笟绠$悊鏈夐檺鍏徃":"", "灞变笢椴佽兘鐗╀笟鍏徃":"", "鍖椾含鎮﹁豹鐗╀笟绠$悊鏈夐檺鍏徃":"", + "娣卞湷淇″拰鐗╀笟绠$悊鏈夐檺鍏徃":"", "涓婃捣鏂伴暱瀹侀泦鍥㈡柊鍗庣墿涓氭湁闄愬叕鍙�":"", "娣卞湷甯備繚鍒╃墿涓氱鐞嗘湁闄愬叕鍙�":"", "涓婃捣涓北鐗╀笟鏈夐檺鍏徃":"", "娣卞湷甯傚煄寤虹墿涓氱鐞嗘湁闄愬叕鍙�":"", "鍖椾含缃戜俊鐗╀笟绠$悊鏈夐檺鍏徃":"", + "瀹佹尝缁忔祹鎶�鏈紑鍙戝尯鑱斿悎鐗╀笟鏈夐檺鍏徃":"", "娣卞湷甯傜櫨浠曡揪鐗╀笟绠$悊鏈夐檺鍏徃":"", "鍖椾含瑁曞睍鐗╀笟绠$悊鏈夐檺鍏徃":"", "娣卞湷鍗撹秺鐗╀笟绠$悊鏈夐檺鍏徃":"", "浠查噺鑱旇娴嬮噺甯堜簨鍔℃墍锛堜笂娴凤級鏈夐檺鍏徃":"", + "闄曡タ閲戦懌澶钩鐗╀笟绠$悊鏈夐檺鍏徃":"", "鍖椾含瀹濇櫙鐗╀笟绠$悊鏈夐檺鍏徃":"", "鍖椾含寤哄垱鏂板叴鐗╀笟绠$悊鏈夐檺鍏徃":"", "涓婃捣娌帢缃笟鍙戝睍鏈夐檺鍏徃":"", "鍖椾含澶╁畤娴佹槦鑺卞洯鐗╀笟绠$悊鏈夐檺鍏徃":"", "娣卞湷甯傛嘲鐒剁墿涓氱鐞嗘湇鍔℃湁闄愬叕鍙�":"", + "鍖椾含甯傚寳瀹囩墿涓氱鐞嗗叕鍙�":"", "瑗垮畨閾佸嘲鐗╀笟绠$悊鏈夐檺璐d换鍏徃":"", "鍖椾含閾惰揪鐗╀笟绠$悊鏈夐檺璐d换鍏徃":"", "涓婃捣寤跺悏鐗╀笟绠$悊鏈夐檺鍏徃":"", "骞垮窞鑾变經澹墿涓氭湇鍔℃湁闄愬叕鍙�":"", "娣卞湷甯傚啝鎳嬬墿涓氱鐞嗘湁闄愬叕鍙�":"", + "鍖椾含澶╃绌烘腐鐗╀笟绠$悊鏈夐檺鍏徃":"", "骞夸笢鐪佸崕渚ㄧ墿涓氬彂灞曞叕鍙�":"", "涓婃捣姘戠泩鍩庢姇鐗╀笟绠$悊鏈夐檺鍏徃":"", "鍖椾含涓叴鐗╀笟绠$悊鏈夐檺鍏徃":"", "娣卞湷绁ョズ鐗╀笟绠$悊鏈夐檺鍏徃":"", "鍖椾含鑲叉柊鐗╀笟绠$悊鍏徃":"", + "涓婃捣鍢夊煄鐗╀笟绠$悊鏈夐檺鍏徃":"", "鍖椾含鍗庣壒鐗╀笟绠$悊鍙戝睍鏈夐檺鍏徃":"", "娣卞湷甯傞暱鍩庣墿涓氱鐞嗚偂浠芥湁闄愬叕鍙�":"", "涓婃捣鐢冲ぇ鐗╀笟鏈夐檺鍏徃":"", "娣卞湷鑺辨牱骞寸墿涓氱鐞嗘湁闄愬叕鍙�":"", "澶╂触澶╁瓪鐗╀笟绠$悊鏈夐檺鍏徃":"", + "涓婃捣骞冲噳鐗╀笟绠$悊鏈夐檺鍏徃":"", "鍖椾含杈炬枃鐗╀笟绠$悊鏈夐檺鍏徃":"", "闈掑矝鍩庡競寤鸿闆嗗洟鐗╀笟绠$悊鏈夐檺鍏徃":"", "娣卞湷甯傜豢鏅墿涓氱鐞嗘湁闄愬叕鍙�":"", "姹熻嫃鏂板煄鐗╀笟绠$悊鏈夐檺鍏徃":"", "涓婃捣瀹夊眳鐗╀笟鏈夐檺鍏徃":"", + "鍖椾含浠查噺鑱旇鐗╀笟绠$悊鏈嶅姟鏈夐檺鍏徃":"", "娣卞湷甯傚墠娴风墿涓氱鐞嗘湁闄愬叕鍙�":"", "绂忓窞铻嶄鲸鐗╀笟绠$悊鏈夐檺鍏徃":"", "淇濆埄骞垮窞鐗╀笟绠$悊鏈夐檺鍏徃":"", "涓婃捣寰峰緥椋庣墿涓氭湁闄愬叕鍙�":"", "娌冲崡寤轰笟鐗╀笟绠$悊鏈夐檺鍏徃":"", + "鍖椾含鐕曞北鏄熷煄鐗╀笟绠$悊鍏徃":"", "涓婃捣娆h揪鎴夸骇鏈嶅姟鍏徃":"", "骞垮窞涓囧畞鐗╀笟绠$悊鏈夐檺鍏徃":"", "娣卞湷甯備腑淇$墿涓氱鐞嗘湁闄愬叕鍙�":"", "涓婃捣闀块鐗╀笟鏈夐檺鍏徃":"", "鍖椾含鍗庤吘涓栫邯鐗╀笟绠$悊鏈夐檺鍏徃":"", + "娣卞湷娉板崕鐗╀笟绠$悊鏈夐檺鍏徃":"", "鐝犳捣甯備腑绔g墿涓氱鐞嗘湁闄愬叕鍙�":"", "鍙嬭皧闆嗗洟鐗╀笟绠$悊鏈夐檺鍏徃":"", "娣卞湷甯傞緳鎴跨墿涓氱鐞嗘湁闄愬叕鍙�":"", "鍖椾含涓滃厜鐗╀笟绠$悊鏈夐檺鍏徃":"", "涓婃捣涓囨稉鐗╀笟鏈夐檺鍏徃":"", + "鍖椾含鍥藉箍鐗╀笟绠$悊鏈夐檺鍏徃":"", "闈掑矝娴蜂俊鐗╀笟缁忚惀鏈夐檺鍏徃":"", "娴庡崡娴庡彂鐗╀笟鏈夐檺璐d换鍏徃":""] public static void main(String[] args) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/HospitalMatchBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/HospitalMatchBatch.groovy index 730baeb8c..762b933a0 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/HospitalMatchBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/HospitalMatchBatch.groovy @@ -17,7 +17,7 @@ import com.mongodb.util.JSON class HospitalMatchBatch extends BaseBatch { private final static String datastoreDomain = "seaweed.db.fangjia.com" static def DSCollection dsCollection = new DataStore(datastoreDomain, 27007).getCollection("fangjia.seaweed") - static def final CITIES = ["上海", "北京"] + static def final CITIES = ["涓婃捣", "鍖椾含"] public static void main(String[] args) { runBatch(new HospitalMatchBatch(), args) @@ -27,23 +27,23 @@ class HospitalMatchBatch extends BaseBatch { public void process(Object args) { for(String city : CITIES) { println city +"----------------------------------------------" - def districtMap = findDistrictLatAndLng(city); //查询海鸟中的小区经纬度 - def hosptials = findHospital(city) //查所有抓取的医院名 + def districtMap = findDistrictLatAndLng(city); //鏌ヨ娴烽笩涓殑灏忓尯缁忕含搴� + def hosptials = findHospital(city) //鏌ユ墍鏈夋姄鍙栫殑鍖婚櫌鍚� - def districtHosptialMap = caluateDistance(districtMap, hosptials); //计算海鸟中的小区与抓取医院之间距离,匹配到小区 - delDistrictHosptial(city); //删除小区对应该的医院 + def districtHosptialMap = caluateDistance(districtMap, hosptials); //璁$畻娴烽笩涓殑灏忓尯涓庢姄鍙栧尰闄箣闂磋窛绂伙紝鍖归厤鍒板皬鍖� + delDistrictHosptial(city); //鍒犻櫎灏忓尯瀵瑰簲璇ョ殑鍖婚櫌 saveDistrictHosptial(city, districtHosptialMap) - def facilitys = findDistrictFacilitys(city) //查找小区周边配套医院 - def hsptLevelMap = findHospitalLevel(city) //查找医院等级 + def facilitys = findDistrictFacilitys(city) //鏌ユ壘灏忓尯鍛ㄨ竟閰嶅鍖婚櫌 + def hsptLevelMap = findHospitalLevel(city) //鏌ユ壘鍖婚櫌绛夌骇 - def result = districtHosptialNameMatch(facilitys, districtHosptialMap, hsptLevelMap); //将配套中的小区医院与匹配好的小区医院列表进行匹配名称及对应该等级 + def result = districtHosptialNameMatch(facilitys, districtHosptialMap, hsptLevelMap); //灏嗛厤濂椾腑鐨勫皬鍖哄尰闄笌鍖归厤濂界殑灏忓尯鍖婚櫌鍒楄〃杩涜鍖归厤鍚嶇О鍙婂搴旇绛夌骇 updateFacilityHspt(city, result) } } - //查询距离 + //鏌ヨ璺濈 public def caluateDistance(def districtMap, def hosptials){ def districtHosptialMap = [:]; def lists = []; @@ -87,7 +87,7 @@ class HospitalMatchBatch extends BaseBatch { def district_hspt = districtHosptialMap.get(key); if(district_hspt && facility_hspt) { - for(def i=0;i< facility_hspt.size();i++){ //配套里的医院名 + for(def i=0;i< facility_hspt.size();i++){ //閰嶅閲岀殑鍖婚櫌鍚� def name = facility_hspt[i]; if(name.indexOf("(") != -1) { name = name.substring(0, name.indexOf("(")); @@ -96,11 +96,11 @@ class HospitalMatchBatch extends BaseBatch { if(name.indexOf("[") != -1) { name = name.substring(0, name.indexOf("[")); } - def temp_name = name.replace("门诊部",""); + def temp_name = name.replace("闂ㄨ瘖閮�",""); def name_split = splitWord(temp_name); - for(def hspt_name : district_hspt) { //抓取 + for(def hspt_name : district_hspt) { //鎶撳彇 def cawal_hspt_name = hspt_name; if(hspt_name.indexOf("(") != -1) { cawal_hspt_name = hspt_name.substring(0, hspt_name.indexOf("(")); @@ -119,17 +119,17 @@ class HospitalMatchBatch extends BaseBatch { double d = Similarity.getSimilarity(hspt_name_split, name_split) if(d >= 0.9) { def level = hsptLevelMap.get(hspt_name) - println "["+key + "] 配套表:"+name+" 抓取匹配:"+hspt_name+" 等级:"+level + "" - println "该小区配套表医院列表:" +facility_hspt - println "抓取匹配医院列表:"+ district_hspt + println "["+key + "] 閰嶅琛細"+name+" 鎶撳彇鍖归厤锛�"+hspt_name+" 绛夌骇锛�"+level + "" + println "璇ュ皬鍖洪厤濂楄〃鍖婚櫌鍒楄〃锛�" +facility_hspt + println "鎶撳彇鍖归厤鍖婚櫌鍒楄〃锛�"+ district_hspt println "--------------------------------------------------------------------------" facility_hspt[i] = name + "["+level+"]" } else { if(hspt_name_split.indexOf(name_split)!=-1 || name_split.indexOf(hspt_name_split)!=-1) { def level = hsptLevelMap.get(hspt_name) - println "["+key + "] 配套表:"+name+" 抓取匹配:"+hspt_name+" 等级:"+level + "" - println "该小区配套表医院列表:" +facility_hspt - println "抓取匹配医院列表:"+ district_hspt + println "["+key + "] 閰嶅琛細"+name+" 鎶撳彇鍖归厤锛�"+hspt_name+" 绛夌骇锛�"+level + "" + println "璇ュ皬鍖洪厤濂楄〃鍖婚櫌鍒楄〃锛�" +facility_hspt + println "鎶撳彇鍖归厤鍖婚櫌鍒楄〃锛�"+ district_hspt println "--------------------------------------------------------------------------" facility_hspt[i] = name + "["+level+"]" } @@ -158,7 +158,7 @@ class HospitalMatchBatch extends BaseBatch { conn.setRequestMethod("GET"); conn.doOutput = true inputStream = conn.getInputStream(); - BufferedReader buf = new BufferedReader(new InputStreamReader(inputStream,"UTF-8"));// 创建UTF-8的BufferedReader + BufferedReader buf = new BufferedReader(new InputStreamReader(inputStream,"UTF-8"));// 鍒涘缓UTF-8鐨凚ufferedReader while((line = buf.readLine())!=null){ sb.append(line); } @@ -170,7 +170,7 @@ class HospitalMatchBatch extends BaseBatch { String[] tempStr = str.toString().split('\\|'); if(tempStr.size()==3){ if(tempStr[2] == "city" || tempStr[2] == "region") { - if(tempStr[2] == "city" && tempStr[0]=='瑞金') { + if(tempStr[2] == "city" && tempStr[0]=='鐟為噾') { continue; }else{ key = key.replace(tempStr[0].trim(),""); @@ -186,7 +186,7 @@ class HospitalMatchBatch extends BaseBatch { /** - * 按城市找小区 + * 鎸夊煄甯傛壘灏忓尯 * @param city * @return */ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/ImportOffice.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/ImportOffice.groovy index ec34cdebd..219ebdbc8 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/ImportOffice.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/ImportOffice.groovy @@ -15,7 +15,7 @@ class ImportOffice { final static DBCollection officeDB = MongoUtils.getCollectionByName("commercial", "office_kunshan", "192.168.0.61", 27037) public static void main(String[] args) { - String city = "昆山"; + String city = "鏄嗗北"; DBCursor cur = officeDB.find() int c = 0 while(cur.hasNext()) { @@ -109,7 +109,7 @@ class ImportOffice { DBObject obj = new BasicDBObject() obj.put('cat', 'office_name') - obj.put('desc', '写字楼') + obj.put('desc', '鍐欏瓧妤�') obj.put('value', name) obj.put('pattern', patterns.unique()) @@ -141,7 +141,7 @@ class ImportOffice { knowbaseDB.update(q, new BasicDBObject('$set', dbo), true, true) } - //字段映射 + //瀛楁鏄犲皠 static def getFieldMap(){ def m = [:]; m.put("name","name"); @@ -149,64 +149,64 @@ class ImportOffice { m.put("block","block"); m.put("address","address"); m.put("desc","description"); - m.put("环线位置","loop_line_info"); - m.put("物业类别","build_type"); - m.put("写字楼等级","bed_kind"); - m.put("建筑类别","estate_type"); - m.put("总层数","floor_info"); - m.put("项目特色","characteristic"); - m.put("开发商","developer"); - m.put("竣工时间","live_date"); - m.put("物业费","estate_charge"); - m.put("物业公司","estate_company"); - m.put("建筑面积","build_area"); - m.put("是否可分割","sideset"); - m.put("是否涉外","is_foreign"); - m.put("电梯数量","facilities"); - m.put("空调","lighting_ventilation"); - m.put("装修状况","fitment"); - m.put("停车位","car_site"); - m.put("楼内配套","other_factor"); - m.put("公交","bus"); //38,公交与地铁都在“traffic”里 - m.put("地铁","subway"); - m.put("商场","shopping"); //38 商场,银行,配套都在“relate_info”里 - m.put("银行","bank"); - m.put("楼盘内部配套","site"); - m.put("平面图","floor_img"); - m.put("外景图","out_pics"); - m.put("级别","bed_kind"); - m.put("开间面积","sight"); + m.put("鐜嚎浣嶇疆","loop_line_info"); + m.put("鐗╀笟绫诲埆","build_type"); + m.put("鍐欏瓧妤肩瓑绾�","bed_kind"); + m.put("寤虹瓚绫诲埆","estate_type"); + m.put("鎬诲眰鏁�","floor_info"); + m.put("椤圭洰鐗硅壊","characteristic"); + m.put("寮�鍙戝晢","developer"); + m.put("绔e伐鏃堕棿","live_date"); + m.put("鐗╀笟璐�","estate_charge"); + m.put("鐗╀笟鍏徃","estate_company"); + m.put("寤虹瓚闈㈢Н","build_area"); + m.put("鏄惁鍙垎鍓�","sideset"); + m.put("鏄惁娑夊","is_foreign"); + m.put("鐢垫鏁伴噺","facilities"); + m.put("绌鸿皟","lighting_ventilation"); + m.put("瑁呬慨鐘跺喌","fitment"); + m.put("鍋滆溅浣�","car_site"); + m.put("妤煎唴閰嶅","other_factor"); + m.put("鍏氦","bus"); //38,鍏氦涓庡湴閾侀兘鍦ㄢ�渢raffic鈥濋噷 + m.put("鍦伴搧","subway"); + m.put("鍟嗗満","shopping"); //38 鍟嗗満锛岄摱琛岋紝閰嶅閮藉湪鈥渞elate_info鈥濋噷 + m.put("閾惰","bank"); + m.put("妤肩洏鍐呴儴閰嶅","site"); + m.put("骞抽潰鍥�","floor_img"); + m.put("澶栨櫙鍥�","out_pics"); + m.put("绾у埆","bed_kind"); + m.put("寮�闂撮潰绉�","sight"); m.put("pics","pics"); - m.put("物业管理公司","estate_manage"); - m.put("客梯数","customer_count"); - m.put("物业管理费","estate_charge"); - m.put("电梯品牌","elevator_brand"); - m.put("电梯有无分区设置","elevator_set"); - m.put("空调开放时间","open_time"); - m.put("货梯数","freight_elevators"); - m.put("车位月租金","car_rent"); - m.put("地上车位数","ground_car"); - m.put("网络通讯","network"); - m.put("地下车位数","underground_car"); - m.put("总楼层","floor_info"); - m.put("竣工年月","live_date"); - m.put("标准层高","standard_height"); - m.put("总建筑面积","build_area"); - m.put("净高","clear_height"); - m.put("标准层面积","standard_area"); - m.put("大堂层高","lobby_height"); + m.put("鐗╀笟绠$悊鍏徃","estate_manage"); + m.put("瀹㈡鏁�","customer_count"); + m.put("鐗╀笟绠$悊璐�","estate_charge"); + m.put("鐢垫鍝佺墝","elevator_brand"); + m.put("鐢垫鏈夋棤鍒嗗尯璁剧疆","elevator_set"); + m.put("绌鸿皟寮�鏀炬椂闂�","open_time"); + m.put("璐ф鏁�","freight_elevators"); + m.put("杞︿綅鏈堢閲�","car_rent"); + m.put("鍦颁笂杞︿綅鏁�","ground_car"); + m.put("缃戠粶閫氳","network"); + m.put("鍦颁笅杞︿綅鏁�","underground_car"); + m.put("鎬绘ゼ灞�","floor_info"); + m.put("绔e伐骞存湀","live_date"); + m.put("鏍囧噯灞傞珮","standard_height"); + m.put("鎬诲缓绛戦潰绉�","build_area"); + m.put("鍑�楂�","clear_height"); + m.put("鏍囧噯灞傞潰绉�","standard_area"); + m.put("澶у爞灞傞珮","lobby_height"); - m.put("外墙","exterior_wall"); - m.put("结构","structure"); - m.put("是否可注册","is_register"); + m.put("澶栧","exterior_wall"); + m.put("缁撴瀯","structure"); + m.put("鏄惁鍙敞鍐�","is_register"); m.put("pics","anjukePics"); m.put("lat","lat"); m.put("lng","lng"); - m.put("得房率","room_rate"); + m.put("寰楁埧鐜�","room_rate"); return m; } - //额外增加信息字段 + //棰濆澧炲姞淇℃伅瀛楁 static List getOtherField(){ return ["bus", "estate_manage","elevator_brand","elevator_set","open_time","freight_elevators","car_rent","ground_car","network","underground_car","standard_height","clear_height","standard_area","lobby_height","exterior_wall","structure","is_register","is_foreign","customer_count","room_rate"]; } 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 index 530d8b36d..8e4246a27 100644 --- 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 @@ -5,7 +5,7 @@ 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) { @@ -20,7 +20,7 @@ class MasterNameInAlias { def disticts = CommonDatautils.findAllDistricts(city, "district", ["city","region","name","address","alias","estate_type2", "lat", "lng"]) def cityList = [] - cityList << ["城市","区域","名称","物业类型","地址","别名", "距离", "地址状态"] + cityList << ["鍩庡競","鍖哄煙","鍚嶇О","鐗╀笟绫诲瀷","鍦板潃","鍒悕", "璺濈", "鍦板潃鐘舵��"] for(def dist1 : disticts){ def distList = [] for(def dist2 : disticts){ @@ -54,6 +54,6 @@ class MasterNameInAlias { println city +" "+cityList.size() } } -// ExcelUtils.write("d:\\数据\\小区\\主名在别名中.xlsx", allList, "数据") +// ExcelUtils.write("d:\\鏁版嵁\\灏忓尯\\涓诲悕鍦ㄥ埆鍚嶄腑.xlsx", allList, "鏁版嵁") } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/NewDistrictStatBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/NewDistrictStatBatch.groovy index 62e7a9f1f..eb0f4ddfb 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/NewDistrictStatBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/NewDistrictStatBatch.groovy @@ -22,7 +22,7 @@ import com.mongodb.DBObject import com.mongodb.Mongo /** - * 新盘均价统计 + * 鏂扮洏鍧囦环缁熻 * @author duxiaoyu */ @BatchOwner(Watcher.DuXiaoYu) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/SeaweedGeoSysConvertBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/SeaweedGeoSysConvertBatch.groovy index 094371ebd..9874ed1bc 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/SeaweedGeoSysConvertBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/SeaweedGeoSysConvertBatch.groovy @@ -18,7 +18,7 @@ import java.util.function.Consumer import static com.mongodb.client.model.Filters.eq import static com.mongodb.client.model.Projections.include -@BatchOwner(value = Watcher.WangWenYan, describe = "不同坐标系经纬度相互转换填充") +@BatchOwner(value = Watcher.WangWenYan, describe = "涓嶅悓鍧愭爣绯荤粡绾害鐩镐簰杞崲濉厖") class SeaweedGeoSysConvertBatch extends BaseBatch { MongoCollection SEAWEED = Mongo3Utils.getDbCollection(Constants.FANGJIA_MONGO_URI, "fangjia", "seaweed") diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/SeaweedStandardBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/SeaweedStandardBatch.groovy index 15999d033..a96b97dc7 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/SeaweedStandardBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/SeaweedStandardBatch.groovy @@ -12,7 +12,7 @@ import net.sf.json.JSONObject; import com.fangjia.script.common.DataHandleUtils; import com.fangjia.core.util.*; /** - * 小区名称及地址标准化处理 + * 灏忓尯鍚嶇О鍙婂湴鍧�鏍囧噯鍖栧鐞� * @author gaojuan * */ @@ -27,7 +27,7 @@ class SeaweedStandardBatch { static main(args) { def task = new SeaweedStandardBatch(); - def citys = CommonDatautils.findAllCity()//["大同","咸阳","绵阳","黔西南","黔南"] + def citys = CommonDatautils.findAllCity()//["澶у悓","鍜搁槼","缁甸槼","榛旇タ鍗�","榛斿崡"] for(def city : citys){ task.run(city); @@ -35,27 +35,27 @@ class SeaweedStandardBatch { } def run(def city){ -// //查询该城市的区域及区域别名 +// //鏌ヨ璇ュ煄甯傜殑鍖哄煙鍙婂尯鍩熷埆鍚� // def regionMap = CommonDatautils.getAllRegionBlockByCityAndCat(city, "region"); -// //去除名称中的城市及区域 +// //鍘婚櫎鍚嶇О涓殑鍩庡競鍙婂尯鍩� // processInCityAndRegion(city, regionMap); -// //地址不完整(*路与*路交汇) +// //鍦板潃涓嶅畬鏁�(锛婅矾涓庯紛璺氦姹�) // processAddress(city) -// //删除地图返回为"道路"类型的小区 +// //鍒犻櫎鍦板浘杩斿洖涓�"閬撹矾"绫诲瀷鐨勫皬鍖� // processType(city); -// //删除或修改能在地图上找到的小区 +// //鍒犻櫎鎴栦慨鏀硅兘鍦ㄥ湴鍥句笂鎵惧埌鐨勫皬鍖� // processRepeatRegion(city, regionMap); // -// //分期处理 +// //鍒嗘湡澶勭悊 // processFenQi(city); -// //删除相同区域和名称的小区 +// //鍒犻櫎鐩稿悓鍖哄煙鍜屽悕绉扮殑灏忓尯 // processSameRegionAndAddress(city); // // -// //有特殊符号 +// //鏈夌壒娈婄鍙� // processSpecialChar(city); - //别名处理 + //鍒悕澶勭悊 processAlias(city); } @@ -115,7 +115,7 @@ class SeaweedStandardBatch { def bastDist = selectBestDistrict(v); for(def dist : v){ if(dist.get("_id")==bastDist.get("_id")){ - println "[不处理]"+dist.region +" "+dist.name + " " +dist.getAt("_id") + println "[涓嶅鐞哴"+dist.region +" "+dist.name + " " +dist.getAt("_id") }else{ println "[delete]"+dist.region +" "+dist.name+ " " +dist.getAt("_id") if(isUpdate){ @@ -132,10 +132,10 @@ class SeaweedStandardBatch { def processFenQi(def city){ def districts = CommonDatautils.getAllDistrictBaseInfo(city, CATEGORY) for(def dist : districts){ - def key = findPattern(dist.name, ".*[一|二|三|四|五|六|七|八|九|十|\\d]期"); + def key = findPattern(dist.name, ".*[涓�|浜寍涓墊鍥泑浜攟鍏瓅涓億鍏珅涔潀鍗亅\\d]鏈�"); if(key){ - def aliasName = dist.name.substring(dist.name.indexOf("期")+1).replace("(", "").replace(")", "").replace("·", ""); - if(!aliasName || aliasName.size()==0 || aliasName.endsWith("区")){ + def aliasName = dist.name.substring(dist.name.indexOf("鏈�")+1).replace("(", "").replace(")", "").replace("路", ""); + if(!aliasName || aliasName.size()==0 || aliasName.endsWith("鍖�")){ continue; } def alias = dist.alias; @@ -146,7 +146,7 @@ class SeaweedStandardBatch { alias << aliasName } - def newName = dist.name.replace(aliasName, "").replace("()", "").replace("·", "").replace("1期", "一期").replace("2期", "二期").replace("3期", "三期").replace("4期", "四期").replace("5期", "五期").replace("6期", "六期").replace("7期", "七期").replace("8期", "八期").replace("9期", "九期"); + def newName = dist.name.replace(aliasName, "").replace("()", "").replace("路", "").replace("1鏈�", "涓�鏈�").replace("2鏈�", "浜屾湡").replace("3鏈�", "涓夋湡").replace("4鏈�", "鍥涙湡").replace("5鏈�", "浜旀湡").replace("6鏈�", "鍏湡").replace("7鏈�", "涓冩湡").replace("8鏈�", "鍏湡").replace("9鏈�", "涔濇湡"); if(alias.contains(newName)){ alias.remove(newName); } @@ -159,7 +159,7 @@ class SeaweedStandardBatch { } CommonDatautils.updateSeaweed(dist.get("_id"), "name", newName); } - println "[${city}][分期] old-Value:"+dist.name+" name-value:"+newName + " alias:"+alias; + println "[${city}][鍒嗘湡] old-Value:"+dist.name+" name-value:"+newName + " alias:"+alias; } } } @@ -199,7 +199,7 @@ class SeaweedStandardBatch { } repeatMap.each {k,v-> - println k +" "+v + println k +"銆�"+v def noUpdateDataId = null; def noUpdateAlias = null; def addAlias = null; @@ -272,7 +272,7 @@ class SeaweedStandardBatch { def deleteSpecialChar(def name){ - def chars = ["·",".","-"," "]; + def chars = ["路",".","-"," "]; for(def c : chars){ if(name.contains(c)){ name = name.replace(c, ""); @@ -284,30 +284,30 @@ class SeaweedStandardBatch { def processAddress(city){ - //查询该城市的小区 + //鏌ヨ璇ュ煄甯傜殑灏忓尯 def districts = CommonDatautils.getAllDistrictBaseInfo(city, CATEGORY) for(def dist : districts){ if(!dist.address){ continue; } - if(dist.address.endsWith("米")||dist.address.endsWith("交汇")){ + if(dist.address.endsWith("绫�")||dist.address.endsWith("浜ゆ眹")){ continue; } - def address = findPattern(dist.address, ".*[路|街|大道]与.*[路|街|大道]"); + def address = findPattern(dist.address, ".*[璺瘄琛梶澶ч亾]涓�.*[璺瘄琛梶澶ч亾]"); if(address){ - if(address.contains("交叉路")){ - address = address.replace("交叉路","交汇"); + if(address.contains("浜ゅ弶璺�")){ + address = address.replace("浜ゅ弶璺�","浜ゆ眹"); }else{ - if(dist.address.endsWith(address+"交汇")){ + if(dist.address.endsWith(address+"浜ゆ眹")){ continue; }else{ - address = address+"交汇"; + address = address+"浜ゆ眹"; } } if(address != dist.address){ - println "[补充路与路交汇] "+dist.get("_id").toString() + " old-value :"+dist.address + " new-value:"+address + println "[琛ュ厖璺笌璺氦姹嘳 "+dist.get("_id").toString() + " old-value :"+dist.address + " new-value:"+address if(isUpdate){ CommonDatautils.updateSeaweed(dist.get("_id"), "address", address); } @@ -320,14 +320,14 @@ class SeaweedStandardBatch { def processInCityAndRegion(city, regionMap){ - //查询该城市的小区 + //鏌ヨ璇ュ煄甯傜殑灏忓尯 def districts = CommonDatautils.getAllDistrictBaseInfo(city, CATEGORY) for(def dist : districts){ def distName = dist.name; if(distName.startsWith(city)){ - distName = distName.replace(city+"市", "").replace(city+"县", "").replace(city, "") + distName = distName.replace(city+"甯�", "").replace(city+"鍘�", "").replace(city, "") if(distName.length()<4){ distName = dist.name; } @@ -340,7 +340,7 @@ class SeaweedStandardBatch { } for(def pattern : patterns){ - if(distName.contains(pattern) && distName.startsWith(pattern) && !distName.startsWith(pattern+"路")){ + if(distName.contains(pattern) && distName.startsWith(pattern) && !distName.startsWith(pattern+"璺�")){ def newName = distName.replace(pattern, ""); if(newName.length()>=4){ distName = newName; @@ -369,7 +369,7 @@ class SeaweedStandardBatch { def repeatKeys = []; def repeatMap = [:]; - //查询该城市的小区 + //鏌ヨ璇ュ煄甯傜殑灏忓尯 def districts = CommonDatautils.getAllDistrictBaseInfo(city, CATEGORY) for(def dist : districts){ @@ -407,7 +407,7 @@ class SeaweedStandardBatch { if(sameData){ def formatRegion = standardRegion(sameData.region, regionMap); if(!formatRegion){ - println "百度返回:"+formatRegion+" 不在库中"+sameData.region +" "+sameData.name + println "鐧惧害杩斿洖锛�"+formatRegion+" 涓嶅湪搴撲腑"+sameData.region +" "+sameData.name }else{ def lastDist = null; for(def dist : v){ @@ -430,7 +430,7 @@ class SeaweedStandardBatch { CommonDatautils.updateSeaweed(dist.get("_id"), "region", formatRegion); } }else{ - println "[不处理]"+dist.region +" "+dist.name + println "[涓嶅鐞哴"+dist.region +" "+dist.name } }else{ println "[delete]"+dist.region +" "+dist.name @@ -499,7 +499,7 @@ class SeaweedStandardBatch { def processType(city){ - //查询该城市的小区 + //鏌ヨ璇ュ煄甯傜殑灏忓尯 def districts = CommonDatautils.getAllDistrictBaseInfo(city, CATEGORY) for(def dist : districts){ @@ -515,11 +515,11 @@ class SeaweedStandardBatch { } if(tag){ - if(tag=="道路"){ + if(tag=="閬撹矾"){ if(isUpdate){ CommonDatautils.updateSeaweed(dist.get("_id"), "status", 1); } - println "[地图返回<道路>]"+dist.region + " "+dist.name+" "+dist.get("_id").toString(); + println "[鍦板浘杩斿洖<閬撹矾>]"+dist.region + " "+dist.name+" "+dist.get("_id").toString(); } } } @@ -559,7 +559,7 @@ class SeaweedStandardBatch { String result = request.get("http://api.map.baidu.com/place/v2/search",params,"UTF-8"); JSONObject json = JSONObject.fromObject(result); if(json.getInt("status") >= 300){ - println "请求有问题啦 !" + println "璇锋眰鏈夐棶棰樺暒 锛�" } return json; }catch (Exception e){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/SeaweedUpdateTask.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/SeaweedUpdateTask.groovy index bc9df8d07..f3e8c5b3c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/SeaweedUpdateTask.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/SeaweedUpdateTask.groovy @@ -12,7 +12,7 @@ import com.mongodb.DBObject import com.mongodb.Mongo import groovy.sql.* /** - * 当小区,商铺,写字楼区域,名称发生变化时修改相应表的历史记录 + * 褰撳皬鍖猴紝鍟嗛摵锛屽啓瀛楁ゼ鍖哄煙锛屽悕绉板彂鐢熷彉鍖栨椂淇敼鐩稿簲琛ㄧ殑鍘嗗彶璁板綍 * @author gaojuan * */ @@ -33,10 +33,10 @@ class SeaweedUpdateTask extends BaseBatch{ def tasks = findDistrictTask(); if(tasks.size() > 0){ - println "开始时间:"+ new Date(); - println "共处理任务【${tasks.size()}】条" + println "寮�濮嬫椂闂达細"+ new Date(); + println "鍏卞鐞嗕换鍔°��${tasks.size()}銆戞潯" taskProcess2(tasks); - println "结束时间:"+ new Date(); + println "缁撴潫鏃堕棿锛�"+ new Date(); println "------------------------------------------------------------------------------" } @@ -75,14 +75,14 @@ class SeaweedUpdateTask extends BaseBatch{ if(task.type == 2){ if(task.estate_type == "district" || task.estate_type == "villa" ){ - //小区,商铺,写字楼均价表-小区均价在区域板块中的排名 + //灏忓尯锛屽晢閾猴紝鍐欏瓧妤煎潎浠疯〃-灏忓尯鍧囦环鍦ㄥ尯鍩熸澘鍧椾腑鐨勬帓鍚� def tables = ["district_avgprice_rank"]; processTables(q, udata, tables, task.type, fangjiaDb, fangjiaHost); def tables1 = ["district_stat"]; processTables(q, udata, tables1, task.type, fangjiaStatDb, fangjiaHost); - //均价预测表-商铺写字楼出租 + //鍧囦环棰勬祴琛�-鍟嗛摵鍐欏瓧妤煎嚭绉� def tables2 = ["price_predict"]; processTables(q2, udata2, tables2, task.type, fangjiaDb, fangjiaHost); @@ -91,33 +91,33 @@ class SeaweedUpdateTask extends BaseBatch{ def tables5 = ["district_agent", "district_attention_rank","district_click_rank","district_facilitys","district_hot","district_trade_stat","metro_distance"]; processTables(q4, udata, tables5, task.type, fangjiaDb, fangjiaHost); - //房型表 + //鎴垮瀷琛� //def tables6 = ["district_housetype"]; //processTables(q, udata, tables6, task.type, coredataDb, coredataHost); } - //修改房价通用户交易及估价表,只作区域修改 mysql + //淇敼鎴夸环閫氱敤鎴蜂氦鏄撳強浼颁环琛紝鍙綔鍖哄煙淇敼 mysql if(task.new_region){ updateFjtUserTrades(task.city, task.region, task.name, task.new_region); updateFjtEvaluation(task.city, task.region, task.name, task.new_region); } - println taskId+"修改处理完成........" + println taskId+"淇敼澶勭悊瀹屾垚........" }else if(task.type==1 || task.type==3){ //def tables6 = ["district_housetype"]; //processTables(q, null, tables6, task.type, coredataDb, coredataHost); - println taskId+"删除处理完成........" + println taskId+"鍒犻櫎澶勭悊瀹屾垚........" }else if(task.type==4){ def tables6 = ["district_housetype"]; - def estateType1 = task.estate_type == "district"?"小区":(task.estate_type == "villa"?"别墅":""); + def estateType1 = task.estate_type == "district"?"灏忓尯":(task.estate_type == "villa"?"鍒":""); def udata4 = createUpdateObject(["estate_type":estateType1]); //processTables(q4, udata4, tables6, 5, coredataDb, coredataHost); } - updateTaskStatus(task._id, 2);//更改任务的状态 + updateTaskStatus(task._id, 2);//鏇存敼浠诲姟鐨勭姸鎬� } } @@ -153,9 +153,9 @@ class SeaweedUpdateTask extends BaseBatch{ def findDistrictTask(){ DBObject queryCondition = new BasicDBObject() - //queryCondition.put("city", "上海"); - queryCondition.put("status", 1);//未处理 - //queryCondition.put("type", 4);//修改 1:删除 2:区域,各称修改 3.关联删除 4.物业类型修改 + //queryCondition.put("city", "涓婃捣"); + queryCondition.put("status", 1);//鏈鐞� + //queryCondition.put("type", 4);//淇敼 1锛氬垹闄� 2锛氬尯鍩燂紝鍚勭О淇敼 3.鍏宠仈鍒犻櫎 4.鐗╀笟绫诲瀷淇敼 DBCursor cur = TASK_COLL.find(queryCondition).sort(new BasicDBObject("_id", 1)); def ret = []; @@ -190,8 +190,8 @@ class SeaweedUpdateTask extends BaseBatch{ } def updateDistrictData(q, udata, dbColl, type){ - println "查询条件:"+q - println "修改:"+udata + println "鏌ヨ鏉′欢锛�"+q + println "淇敼锛�"+udata println "dbColl:"+dbColl.toString(); println "type:"+type; @@ -215,7 +215,7 @@ class SeaweedUpdateTask extends BaseBatch{ } // if(type == 4){ -// //发出重算指令 +// //鍙戝嚭閲嶇畻鎸囦护 // DBObject cmd = new BasicDBObject() // cmd.put("city", q.city) // cmd.put("region", q.region) @@ -246,7 +246,7 @@ class SeaweedUpdateTask extends BaseBatch{ for(def estateType : types){ if(estateType != udata.estate_type){ q.put("estate_type", estateType) - dbColl.remove(q);//删除小区房型表中多余类型 + dbColl.remove(q);//鍒犻櫎灏忓尯鎴垮瀷琛ㄤ腑澶氫綑绫诲瀷 } } } @@ -256,13 +256,13 @@ class SeaweedUpdateTask extends BaseBatch{ def getEstateType(def cat){ if(cat == "district"){ - return "小区"; + return "灏忓尯"; }else if(cat == "villa"){ - return "别墅"; + return "鍒"; }else if(cat == "shop"){ - return "商铺"; + return "鍟嗛摵"; }else if(cat == "office"){ - return "写字楼"; + return "鍐欏瓧妤�"; } } @@ -276,34 +276,34 @@ class SeaweedUpdateTask extends BaseBatch{ def q2 = createQuery(["city":task.city, "region":task.region, "name":task.name, "kind":getEstateType(task.estate_type)]); def udata2 = createUpdateObject(["region":task.new_region, "name":task.new_name]); - //小区,商铺,写字楼均价表 + //灏忓尯锛屽晢閾猴紝鍐欏瓧妤煎潎浠疯〃 updateDistrictData(q, udata, DISTRICT_STAT_COLL, task.type); - //均价预测表 + //鍧囦环棰勬祴琛� updateDistrictData(q2, udata2, PRICE_PREDICT_COLL, task.type); - //小区均价在区域板块中的排名 + //灏忓尯鍧囦环鍦ㄥ尯鍩熸澘鍧椾腑鐨勬帓鍚� updateDistrictData(q, udata, DISTRICT_AVGPRICE_RANK_COLL, task.type); def q3 = createQuery(["city":task.city, "region":task.region, "name":task.name]); def q4 = createQuery(["city":task.city, "region":task.region, "district_name":task.name]); if(task.estate_type == "district"){ - //租金均价表 + //绉熼噾鍧囦环琛� updateDistrictData(q, udata, DISTRICT_STAT_RENT_COLL, task.type); - //房型表 + //鎴垮瀷琛� updateDistrictData(q, udata, HOUSE_TYPE_COLL, task.type); - //均价对比表 + //鍧囦环瀵规瘮琛� updateDistrictData(q3, udata2, AVERAGE_STATISTICS_COLL, task.type); - //小区所在区域的中介表 + //灏忓尯鎵�鍦ㄥ尯鍩熺殑涓粙琛� updateDistrictData(q4, udata2, DISTRICT_AGENT_COLL, task.type); - //小区关注度(点击量)排名 + //灏忓尯鍏虫敞搴︼紙鐐瑰嚮閲忥級鎺掑悕 updateDistrictData(q4, udata2, DISTRICT_ATTENTION_RANK_COLL, task.type); } - updateTaskStatus(task._id, 2);//更改任务的状态 + updateTaskStatus(task._id, 2);//鏇存敼浠诲姟鐨勭姸鎬� } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/Similarity.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/Similarity.groovy index 3d6813fd4..832aa2759 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/Similarity.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/Similarity.groovy @@ -7,30 +7,30 @@ import com.mongodb.util.JSON * Created with IntelliJ IDEA. * User: Administrator * Date: 13-3-14 - * Time: 下午4:46 + * Time: 涓嬪崍4:46 * To change this template use File | Settings | File Templates. */ class Similarity { public static void main(String[] args) { - String s1="中山医院分部"; - String s2="中山医院"; + String s1="涓北鍖婚櫌鍒嗛儴"; + String s2="涓北鍖婚櫌"; long t1=new Date().getTime(); double d=getSimilarity(s1, s2); long t2=new Date().getTime(); - System.out.println("相似度:"+d+"————计算时间:"+(t2-t1)+"毫秒"); + System.out.println("鐩镐技搴︼細"+d+"鈥斺�斺�斺�旇绠楁椂闂达細"+(t2-t1)+"姣"); } public static double getSimilarity(String doc1, String doc2) { if (doc1 != null && doc1.trim().length() > 0 && doc2 != null&& doc2.trim().length() > 0) { Map AlgorithmMap = new HashMap(); - //将两个字符串中的中文字符以及出现的总数封装到,AlgorithmMap中 + //灏嗕袱涓瓧绗︿覆涓殑涓枃瀛楃浠ュ強鍑虹幇鐨勬�绘暟灏佽鍒帮紝AlgorithmMap涓� for (int i = 0; i < doc1.length(); i++) { char d1 = doc1.charAt(i); if(isHanZi(d1)){ - int charIndex = getGB2312Id(d1); //ch在GB2312中的位置 + int charIndex = getGB2312Id(d1); //ch鍦℅B2312涓殑浣嶇疆 if(charIndex != -1){ int[] fq = AlgorithmMap.get(charIndex); if(fq != null && fq.length == 2){ @@ -86,26 +86,26 @@ class Similarity { public static boolean isHanZi(char ch) { - // 判断是否汉字 + // 鍒ゆ柇鏄惁姹夊瓧 return (ch >= 0x4E00 && ch <= 0x9FA5); } /** - * 根据输入的Unicode字符,获取它的GB2312编码或者ascii编码, + * 鏍规嵁杈撳叆鐨刄nicode瀛楃锛岃幏鍙栧畠鐨凣B2312缂栫爜鎴栬�卆scii缂栫爜锛� * @param ch - * 输入的GB2312中文字符或者ASCII字符(128个) - * @return ch在GB2312中的位置,-1表示该字符不认识 + * 杈撳叆鐨凣B2312涓枃瀛楃鎴栬�匒SCII瀛楃(128涓�) + * @return ch鍦℅B2312涓殑浣嶇疆锛�-1琛ㄧず璇ュ瓧绗︿笉璁よ瘑 */ public static short getGB2312Id(char ch) { try { byte[] buffer = Character.toString(ch).getBytes("GB2312"); if (buffer.length != 2) { - // 正常情况下buffer应该是两个字节,否则说明ch不属于GB2312编码,故返回'?',此时说明不认识该字符 + // 姝e父鎯呭喌涓媌uffer搴旇鏄袱涓瓧鑺傦紝鍚﹀垯璇存槑ch涓嶅睘浜嶨B2312缂栫爜锛屾晠杩斿洖'?'锛屾鏃惰鏄庝笉璁よ瘑璇ュ瓧绗� return -1; } - int b0 = (int) (buffer[0] & 0x0FF) - 161; // 编码从A1开始,因此减去0xA1=161 - int b1 = (int) (buffer[1] & 0x0FF) - 161; // 第一个字符和最后一个字符没有汉字,因此每个区只收16*6-2=94个汉字 + int b0 = (int) (buffer[0] & 0x0FF) - 161; // 缂栫爜浠嶢1寮�濮嬶紝鍥犳鍑忓幓0xA1=161 + int b1 = (int) (buffer[1] & 0x0FF) - 161; // 绗竴涓瓧绗﹀拰鏈�鍚庝竴涓瓧绗︽病鏈夋眽瀛楋紝鍥犳姣忎釜鍖哄彧鏀�16*6-2=94涓眽瀛� return (short) (b0 * 94 + b1); } catch (UnsupportedEncodingException e) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/Test.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/Test.groovy index d0167ec3b..2b7eb346c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/Test.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/Test.groovy @@ -71,13 +71,13 @@ class Test { } public static void processSameAddress() { -// def map = httpHelper.tokenizer("上海市黄浦淮海中路816弄") +// def map = httpHelper.tokenizer("涓婃捣甯傞粍娴︽樊娴蜂腑璺�816寮�") // println map - DSCursor cur = dsCollection.find(new BasicDBObject("cat", 'district').append("city", '上海').append("visible", 0), new BasicDBObject().append("address", 1).append("name", 1)) + DSCursor cur = dsCollection.find(new BasicDBObject("cat", 'district').append("city", '涓婃捣').append("visible", 0), new BasicDBObject().append("address", 1).append("name", 1)) Iterator iter = cur.iterator() while(iter.hasNext()) { DBObject dbo = iter.next() - String address = '上海市黄浦淮海中路816弄'//dbo.get('address') + String address = '涓婃捣甯傞粍娴︽樊娴蜂腑璺�816寮�'//dbo.get('address') def resMap = httpHelper.tokenizer(address); for(String s : resMap.get('details').split(",")) { String[] arrs = s.split("\\|"); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/Test2.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/Test2.groovy index 303a3839c..289356692 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/Test2.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/Test2.groovy @@ -24,13 +24,13 @@ NETWORK_PRICE_COLL.find(new BasicDBObject(), keys).batchSize(1000).each {BasicDB if(dbo.avg_price && dbo.fgg_price){ def diff = Math.abs((dbo.getInt("fgg_price") - dbo.getInt("avg_price"))/dbo.getInt("avg_price")) if(diff < 0.15){ - networkAvgPrice["房"] = new Date() + networkAvgPrice["鎴�"] = new Date() } } if(dbo.avg_price && dbo.ygj_price){ def diff = Math.abs((dbo.getInt("ygj_price") - dbo.getInt("avg_price"))/dbo.getInt("avg_price")) if(diff < 0.15){ - networkAvgPrice["云"] = new Date() + networkAvgPrice["浜�"] = new Date() } } @@ -50,7 +50,7 @@ NETWORK_PRICE_COLL.find(new BasicDBObject(), keys).batchSize(1000).each {BasicDB } } if(count % 1000 == 0){ - println("updateNetWorkAvgPrice进度:${count}/${total}") + println("updateNetWorkAvgPrice杩涘害:${count}/${total}") } } \ No newline at end of file diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/TrafficMatchBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/TrafficMatchBatch.groovy index 2c880e0ae..8cc7db6e1 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/TrafficMatchBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/TrafficMatchBatch.groovy @@ -15,9 +15,9 @@ import com.mongodb.DBObject @BatchOwner(Watcher.DuXiaoYu) class TrafficMatchBatch extends BaseBatch { - public static final def CITIES = ["上海", "北京"] + public static final def CITIES = ["涓婃捣", "鍖椾含"] - //人正常步行速度为1.5m/s + //浜烘甯告琛岄�熷害涓�1.5m/s public static final int MAX_DISTANCE = 1.5 * 60 * 5 public DBCollection collLine = MongoUtils.getCollectionByName("fangjia_base", "bus_line", "192.168.0.67") @@ -101,7 +101,7 @@ class TrafficMatchBatch extends BaseBatch { station.setLat(dbo.get('lat')) station.setLng(dbo.get('lng')) station.setName(dbo.get('station')) - if(busLine.get('name').toString().endsWith('路')) { + if(busLine.get('name').toString().endsWith('璺�')) { station.setLine(busLine.get('shuzi')) }else { station.setLine(busLine.get('name')) @@ -125,7 +125,7 @@ class TrafficMatchBatch extends BaseBatch { private DBObject getBusLine(String city, String lineId) { DBObject dbo = collLine.findOne(new BasicDBObject("city", city).append('line_id', lineId)) - if(dbo.get('kind').indexOf('常规线路') > -1 || dbo.get('kind').indexOf('文字线路') > -1) { + if(dbo.get('kind').indexOf('甯歌绾胯矾') > -1 || dbo.get('kind').indexOf('鏂囧瓧绾胯矾') > -1) { return dbo } return null diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/crawl/FzFdc.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/crawl/FzFdc.groovy index 0daf44f38..25fba05e0 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/crawl/FzFdc.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/crawl/FzFdc.groovy @@ -30,7 +30,7 @@ class FzFdc { } def crawl(url){ - def document = CrawalUtil.getDocumentByABuYun(url, null, "gb2312");//关键字 + def document = CrawalUtil.getDocumentByABuYun(url, null, "gb2312");//鍏抽敭瀛� def rets = [] if(document){ def eles = JQueryUtils.select("table a", document) @@ -51,21 +51,21 @@ class FzFdc { for(def key : rets){ def arrs = key.split("#") - def rMap = OpenApiUtils.matchDistrict("福州", arrs[1], true) + def rMap = OpenApiUtils.matchDistrict("绂忓窞", arrs[1], true) if(rMap) { - def region = RegionData.formatRegion("福州", arrs[0]) + def region = RegionData.formatRegion("绂忓窞", arrs[0]) if (region == rMap.region) { def district = CommonDatautils.queryDistrictById(rMap.id) if(!district.build_structure){ def udata = new BasicDBObject() - udata.put("build_structure", "钢筋混凝土结构") + udata.put("build_structure", "閽㈢瓔娣峰嚌鍦熺粨鏋�") index++ println index +" "+key DbUtils.seaweed.update(new BasicDBObject('_id',district._id),new BasicDBObject('$set', udata)) } } }else{ - println "[没找到] "+ key + println "[娌℃壘鍒癩 "+ key } } @@ -76,12 +76,12 @@ class FzFdc { // def document = getHttpContent(url) def document = CrawalUtil.getDocumentByABuYun(url, null, "gb2312"); if(document){ - def districtName = JQueryUtils.selectText("td:contains(项目名称:)+td", document) - def region = JQueryUtils.selectText("td:contains(所在区县:)+td", document) + def districtName = JQueryUtils.selectText("td:contains(椤圭洰鍚嶇О锛�)+td", document) + def region = JQueryUtils.selectText("td:contains(鎵�鍦ㄥ尯鍘匡細)+td", document) if(!region){ - def addr = JQueryUtils.selectText("td:contains(项目地址:)+td", document) - if(addr && addr.contains("区")){ - region = addr.substring(0, addr.indexOf("区")).replace("福州市","") + def addr = JQueryUtils.selectText("td:contains(椤圭洰鍦板潃锛�)+td", document) + if(addr && addr.contains("鍖�")){ + region = addr.substring(0, addr.indexOf("鍖�")).replace("绂忓窞甯�","") }else{ println url } @@ -151,7 +151,7 @@ class FzFdc { conn.connect(); //println param.toString() - //输出流 + //杈撳嚭娴� if (StringUtils.isNotEmpty(param)) { mWriter = new BufferedWriter(new OutputStreamWriter(conn.getOutputStream(), charset)); mWriter.write(param); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/crawl/MoveCrawlData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/crawl/MoveCrawlData.groovy index f9e67b93b..bdecb9ff0 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/crawl/MoveCrawlData.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/crawl/MoveCrawlData.groovy @@ -11,7 +11,7 @@ class MoveCrawlData { public static final String JOB_ID = "51dfa792e4b0deeabfd0b788" - //抓取系统的存储地址 + //鎶撳彇绯荤粺鐨勫瓨鍌ㄥ湴鍧� public static DBCollection METADATA_COLL = MongoUtils.getCollectionByName("artemis", "metadata", "192.168.0.56", 55007) public static DBCollection CRAWL_COLL = MongoUtils.getCollectionByName("fangjia_crawl", "new_district_2", "192.168.0.67") diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/crawl/SoufunDistrictDetailAnalyzer.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/crawl/SoufunDistrictDetailAnalyzer.groovy index 584eb788a..c51bd81b4 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/crawl/SoufunDistrictDetailAnalyzer.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/crawl/SoufunDistrictDetailAnalyzer.groovy @@ -22,12 +22,12 @@ import org.jsoup.nodes.Element import org.jsoup.select.Elements /** - * 小区原始网页更新 + * 灏忓尯鍘熷缃戦〉鏇存柊 * @author xiaoyu * */ class SoufunDistrictDetailAnalyzer { - //抓取系统的存储地址 + //鎶撳彇绯荤粺鐨勫瓨鍌ㄥ湴鍧� public static DBCollection METADATA_COLL = MongoUtils.getCollectionByName("artemis", "metadata", "192.168.0.56", 55007) public static final SIGN = "_20130802_sh"; // public static final String JOB_ID = "51417203e4b03972d270eb86" @@ -48,19 +48,19 @@ class SoufunDistrictDetailAnalyzer { public static DBCollection KNOWBASE_COLL = MongoUtils.getCollectionByName("poseidon", "know_base_new", "192.168.0.60") public static void main(String[] args) { -// //从原始抓取的库中取出数据 +// //浠庡師濮嬫姄鍙栫殑搴撲腑鍙栧嚭鏁版嵁 // exportToDB(); // -// //解析出数据字段并保存到prep +// //瑙f瀽鍑烘暟鎹瓧娈靛苟淇濆瓨鍒皃rep analyHtml(); - //分析经纬度 + //鍒嗘瀽缁忕含搴� // analyLatLng() - //知识库修改 + //鐭ヨ瘑搴撲慨鏀� // updateKnowbase() - //保存到线上 + //淇濆瓨鍒扮嚎涓� // saveToDatastore() } @@ -87,7 +87,7 @@ class SoufunDistrictDetailAnalyzer { String name = dbo.get('name') String estateType = dbo.get('estate_type') - if((estateType && (estateType.indexOf('写字楼') > -1 || estateType.indexOf('商铺') > -1)) || name.indexOf('写字楼') > -1 || name.indexOf('商铺') > -1 || name.indexOf('商业广场') > -1) { + if((estateType && (estateType.indexOf('鍐欏瓧妤�') > -1 || estateType.indexOf('鍟嗛摵') > -1)) || name.indexOf('鍐欏瓧妤�') > -1 || name.indexOf('鍟嗛摵') > -1 || name.indexOf('鍟嗕笟骞垮満') > -1) { continue; } @@ -144,7 +144,7 @@ class SoufunDistrictDetailAnalyzer { String estateType = dbo.get('estate_type') List alias = dbo.get('alias') - if((estateType && (estateType.indexOf('写字楼') > -1 || estateType.indexOf('商铺') > -1)) || name.indexOf('写字楼') > -1 || name.indexOf('商铺') > -1 || name.indexOf('商业广场') > -1) { + if((estateType && (estateType.indexOf('鍐欏瓧妤�') > -1 || estateType.indexOf('鍟嗛摵') > -1)) || name.indexOf('鍐欏瓧妤�') > -1 || name.indexOf('鍟嗛摵') > -1 || name.indexOf('鍟嗕笟骞垮満') > -1) { continue; } @@ -168,7 +168,7 @@ class SoufunDistrictDetailAnalyzer { DBObject obj = new BasicDBObject() obj.put('cat', 'district_name') - obj.put('desc', '小区名') + obj.put('desc', '灏忓尯鍚�') // obj.put('flag', 0) obj.put('value', name) obj.put('pattern', patterns.unique()) @@ -193,7 +193,7 @@ class SoufunDistrictDetailAnalyzer { } /** - * 分析经纬度 + * 鍒嗘瀽缁忕含搴� */ public static void analyLatLng() { println "starting to analy LatLng " + DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) @@ -257,7 +257,7 @@ class SoufunDistrictDetailAnalyzer { /** - * 从原始抓取的库中取出数据 + * 浠庡師濮嬫姄鍙栫殑搴撲腑鍙栧嚭鏁版嵁 */ static void exportToDB() { println "starting to export to " + HTML_TABLE_NAME + " " + DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) @@ -300,7 +300,7 @@ class SoufunDistrictDetailAnalyzer { } /** - * 解析出数据字段并保存到prep + * 瑙f瀽鍑烘暟鎹瓧娈靛苟淇濆瓨鍒皃rep */ public static void analyHtml() { println "starting to analy html " + DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) @@ -333,8 +333,8 @@ class SoufunDistrictDetailAnalyzer { continue; } - String name = selectText(["h1", "#house_6"], content).replace('小区网', ""); - String regionBlock = selectText([".leftinfo dd:contains(所属区域)", ".xiangqing dd:contains(所属区域)", "#bsif tbody tr:contains(区域) td"], content).replace('所属区域:', "") + String name = selectText(["h1", "#house_6"], content).replace('灏忓尯缃�', ""); + String regionBlock = selectText([".leftinfo dd:contains(鎵�灞炲尯鍩�)", ".xiangqing dd:contains(鎵�灞炲尯鍩�)", "#bsif tbody tr:contains(鍖哄煙) td"], content).replace('鎵�灞炲尯鍩燂細', "") String[] arrs = regionBlock.split(' ') String region = null; String block = null; @@ -348,49 +348,49 @@ class SoufunDistrictDetailAnalyzer { } - String aliasStr = selectText([".bm_title span"], content).replace('别名:', "").trim() + String aliasStr = selectText([".bm_title span"], content).replace('鍒悕锛�', "").trim() def alias = getAlias(aliasStr) - String address = selectText([".leftinfo dd:contains(小区地址)", ".xiangqing dd:contains(楼盘地址)", "#bsif tr:contains(地址) td"], content).replace('小区地址:', "").replace("楼盘地址:", "").replace("[地图]", "").trim() - String characteristic = selectText([".leftinfo dd:contains(项目特色)", ".xiangqing dd:contains(项目特色)"], content).replace('项目特色:', "").trim() - String developer = selectText([".leftinfo dd:contains(商:)", ".xiangqing dd:contains(商:)", "#bsif tr:contains(商:) td"], content).replace('开 发 商:', "").replace("[相关网站]", "").trim() - String liveDate = selectText([".leftinfo dd:contains(竣工时间)", ".xiangqing dd:contains(竣工时间)"], content).replace('竣工时间:', "").replace("[相关网站]", "").trim() + String address = selectText([".leftinfo dd:contains(灏忓尯鍦板潃)", ".xiangqing dd:contains(妤肩洏鍦板潃)", "#bsif tr:contains(鍦板潃) td"], content).replace('灏忓尯鍦板潃锛�', "").replace("妤肩洏鍦板潃锛�", "").replace("[鍦板浘]", "").trim() + String characteristic = selectText([".leftinfo dd:contains(椤圭洰鐗硅壊)", ".xiangqing dd:contains(椤圭洰鐗硅壊)"], content).replace('椤圭洰鐗硅壊锛�', "").trim() + String developer = selectText([".leftinfo dd:contains(鍟嗭細)", ".xiangqing dd:contains(鍟嗭細)", "#bsif tr:contains(鍟嗭細) td"], content).replace('寮� 鍙� 鍟嗭細', "").replace("[鐩稿叧缃戠珯]", "").trim() + String liveDate = selectText([".leftinfo dd:contains(绔e伐鏃堕棿)", ".xiangqing dd:contains(绔e伐鏃堕棿)"], content).replace('绔e伐鏃堕棿锛�', "").replace("[鐩稿叧缃戠珯]", "").trim() - String estateType = selectText([".leftinfo dd:contains(物业类别)", ".xiangqing dd:contains(物业类别)", "#bsif tr:contains(住宅类别) td:eq(1)"], content).replace('物业类别:', "").replace('住宅类别:', "").trim() - String buildType = selectText([".leftinfo dd:contains(建筑类别)", ".xiangqing dd:contains(建筑类别)", "#bsif tr:contains(建筑类别) td:eq(3)"], content).replace('建筑类别:', "").trim() + String estateType = selectText([".leftinfo dd:contains(鐗╀笟绫诲埆)", ".xiangqing dd:contains(鐗╀笟绫诲埆)", "#bsif tr:contains(浣忓畢绫诲埆) td:eq(1)"], content).replace('鐗╀笟绫诲埆锛�', "").replace('浣忓畢绫诲埆锛�', "").trim() + String buildType = selectText([".leftinfo dd:contains(寤虹瓚绫诲埆)", ".xiangqing dd:contains(寤虹瓚绫诲埆)", "#bsif tr:contains(寤虹瓚绫诲埆) td:eq(3)"], content).replace('寤虹瓚绫诲埆锛�', "").trim() - String loopLineInfo = selectText([".leftinfo dd:contains(环线位置)", ".xiangqing dd:contains(环线位置)"], content).replace('环线位置:', "").trim() - String cubagePercent = selectText([".leftinfo dd:contains(容积率)", ".xiangqing dd:contains(容积率)", "#bsif tr:contains(容积率) td:eq(1)"], content).replace('容 积 率:', "").replace("[关于容积率]", "").replace("[容积率]", "").trim() - String virescencePercent = selectText([".leftinfo dd:contains(绿化率)", ".xiangqing dd:contains(绿化率)", "#bsif tr:contains(绿化率) td:eq(3)"], content).replace('绿 化 率:', "").replace("[关于绿化率]", "").replace("[绿化率]", "").trim() + String loopLineInfo = selectText([".leftinfo dd:contains(鐜嚎浣嶇疆)", ".xiangqing dd:contains(鐜嚎浣嶇疆)"], content).replace('鐜嚎浣嶇疆锛�', "").trim() + String cubagePercent = selectText([".leftinfo dd:contains(瀹圭Н鐜�)", ".xiangqing dd:contains(瀹圭Н鐜�)", "#bsif tr:contains(瀹圭Н鐜�) td:eq(1)"], content).replace('瀹� 绉� 鐜囷細', "").replace("[鍏充簬瀹圭Н鐜嘳", "").replace("[瀹圭Н鐜嘳", "").trim() + String virescencePercent = selectText([".leftinfo dd:contains(缁垮寲鐜�)", ".xiangqing dd:contains(缁垮寲鐜�)", "#bsif tr:contains(缁垮寲鐜�) td:eq(3)"], content).replace('缁� 鍖� 鐜囷細', "").replace("[鍏充簬缁垮寲鐜嘳", "").replace("[缁垮寲鐜嘳", "").trim() - String estateCharge = selectText([".leftinfo dd:contains(费:)", ".xiangqing dd:contains(费:)", "#bsif tr:contains(费:) td:eq(1)"], content).replace('物 业 费:', "").trim() - String estateCharge2 = selectText([".leftinfo dd:contains(物业管理附加信息:)", ".xiangqing dd:contains(物业管理附加信息:)"], content).replace('物业管理附加信息:', "").trim() - String estateCompany = selectText([".leftinfo dd:contains(物业公司:)", ".xiangqing dd:contains(物业公司:)", "#bsif tr:contains(物业公司) td:eq(3)"], content).replace('物业公司:', "").trim() + String estateCharge = selectText([".leftinfo dd:contains(璐癸細)", ".xiangqing dd:contains(璐癸細)", "#bsif tr:contains(璐癸細) td:eq(1)"], content).replace('鐗� 涓� 璐癸細', "").trim() + String estateCharge2 = selectText([".leftinfo dd:contains(鐗╀笟绠$悊闄勫姞淇℃伅锛�)", ".xiangqing dd:contains(鐗╀笟绠$悊闄勫姞淇℃伅锛�)"], content).replace('鐗╀笟绠$悊闄勫姞淇℃伅锛�', "").trim() + String estateCompany = selectText([".leftinfo dd:contains(鐗╀笟鍏徃锛�)", ".xiangqing dd:contains(鐗╀笟鍏徃锛�)", "#bsif tr:contains(鐗╀笟鍏徃) td:eq(3)"], content).replace('鐗╀笟鍏徃锛�', "").trim() - String allArea = selectText([".leftinfo .lbox dd:contains(占地面积:)", ".xiangqing dd:contains(占地面积:)", "#bsif tr:contains(占地面积) td:eq(1)"], content).replace('占地面积:', "").trim() - String buildArea = selectText([".leftinfo .lbox dd:contains(建筑面积:)", ".xiangqing dd:contains(建筑面积:)", "#bsif tr:contains(建筑面积) td:eq(3)"], content).replace('建筑面积:', "").trim() + String allArea = selectText([".leftinfo .lbox dd:contains(鍗犲湴闈㈢Н锛�)", ".xiangqing dd:contains(鍗犲湴闈㈢Н锛�)", "#bsif tr:contains(鍗犲湴闈㈢Н) td:eq(1)"], content).replace('鍗犲湴闈㈢Н锛�', "").trim() + String buildArea = selectText([".leftinfo .lbox dd:contains(寤虹瓚闈㈢Н锛�)", ".xiangqing dd:contains(寤虹瓚闈㈢Н锛�)", "#bsif tr:contains(寤虹瓚闈㈢Н) td:eq(3)"], content).replace('寤虹瓚闈㈢Н锛�', "").trim() - String householdCount = selectText([".leftinfo .lbox dd:contains(总户数:)", ".xiangqing dd:contains(总户数:)"], content).replace('总户数:', "").trim() - String currHouseholdCount = selectText([".leftinfo .lbox dd:contains(当期户数:)", ".xiangqing dd:contains(当期户数:)"], content).replace('当期户数:', "").trim() + String householdCount = selectText([".leftinfo .lbox dd:contains(鎬绘埛鏁帮細)", ".xiangqing dd:contains(鎬绘埛鏁帮細)"], content).replace('鎬绘埛鏁帮細', "").trim() + String currHouseholdCount = selectText([".leftinfo .lbox dd:contains(褰撴湡鎴锋暟锛�)", ".xiangqing dd:contains(褰撴湡鎴锋暟锛�)"], content).replace('褰撴湡鎴锋暟锛�', "").trim() - String carSite = selectText([".leftinfo dt:contains(停车位:)", ".xiangqing dd:contains(位:)", "#bsif tr:contains(车位信息) td"], content).replace('停 车 位:', "").replace('停车位:', "").trim() + String carSite = selectText([".leftinfo dt:contains(鍋滆溅浣嶏細)", ".xiangqing dd:contains(浣嶏細)", "#bsif tr:contains(杞︿綅淇℃伅) td"], content).replace('鍋� 杞� 浣嶏細', "").replace('鍋滆溅浣嶏細', "").trim() String description = selectText([".jianjie", "#dli014"], content).trim() if(!description) { - description = DataUtil.removeHtml(StringUtils.substringBetween(content, "", "")).replace("小区简介编辑本段", "").replace("\n", "").replace("\t", "").trim() + description = DataUtil.removeHtml(StringUtils.substringBetween(content, "", "")).replace("灏忓尯绠�浠嬬紪杈戞湰娈�", "").replace("\n", "").replace("\t", "").trim() } - String loudongInfo = DataUtil.removeHtml(StringUtils.substringBetween(content, "", "")).replace("楼座信息编辑本段", "").replace("\n", "").replace("\t", "").trim() + String loudongInfo = DataUtil.removeHtml(StringUtils.substringBetween(content, "", "")).replace("妤煎骇淇℃伅缂栬緫鏈", "").replace("\n", "").replace("\t", "").trim() String traffic = selectText([".xiangqing:eq(1) dt", "#dli013"], content).trim() if(!traffic) { - traffic = DataUtil.removeHtml(StringUtils.substringBetween(content, "", "")).replace("交通状况编辑本段", "").replace("\n", "").replace("\t", "").trim() + traffic = DataUtil.removeHtml(StringUtils.substringBetween(content, "", "")).replace("浜ら�氱姸鍐电紪杈戞湰娈�", "").replace("\n", "").replace("\t", "").trim() } - String facilities = selectHtml([".lpblbox1:contains(周边信息) dl:eq(1) dt", "#dli012 table td"], content).trim() + String facilities = selectHtml([".lpblbox1:contains(鍛ㄨ竟淇℃伅) dl:eq(1) dt", "#dli012 table td"], content).trim() if(!facilities) { - facilities = DataUtil.removeHtml(StringUtils.substringBetween(content, "", "")).replace("周边信息编辑本段", "").replace("\n", "").replace("\t", "").trim() + facilities = DataUtil.removeHtml(StringUtils.substringBetween(content, "", "")).replace("鍛ㄨ竟淇℃伅缂栬緫鏈", "").replace("\n", "").replace("\t", "").trim() } DBObject obj = new BasicDBObject() @@ -474,7 +474,7 @@ class SoufunDistrictDetailAnalyzer { def removeKeys = [] for(String key : dbo.keySet()) { String s = dbo.get(key) - if(s == null || "".equals(s) || s.startsWith("暂无资料") || s.equals("暂无")) { + if(s == null || "".equals(s) || s.startsWith("鏆傛棤璧勬枡") || s.equals("鏆傛棤")) { removeKeys.add(key) } } @@ -489,7 +489,7 @@ class SoufunDistrictDetailAnalyzer { def okeys = [] for(String key : otherInfo.keySet()) { String s = otherInfo.get(key) - if(s == null || "".equals(s) || s.startsWith("暂无资料") || s.equals("暂无")) { + if(s == null || "".equals(s) || s.startsWith("鏆傛棤璧勬枡") || s.equals("鏆傛棤")) { okeys.add(key) } } @@ -533,10 +533,10 @@ class SoufunDistrictDetailAnalyzer { /** * _id, city, name, region, address, alias, all_area, block, description, - * build_area(建筑面积), build_date, build_type, estate_type(建筑类型), facilities(配套设施), car_site, cubage_percent(容积率), virescence_percent(绿化率) - * developer, estate_charge(物业费), estate_company, household_count(户数),lat, lng, + * build_area(寤虹瓚闈㈢Н), build_date, build_type, estate_type(寤虹瓚绫诲瀷), facilities(閰嶅璁炬柦), car_site, cubage_percent(瀹圭Н鐜�), virescence_percent(缁垮寲鐜�) + * developer, estate_charge(鐗╀笟璐�), estate_company, household_count(鎴锋暟),lat, lng, * floorplan_pics, in_pics, kind, - * live_date(入住时间), matching_pics, out_pics, pics, + * live_date(鍏ヤ綇鏃堕棿), matching_pics, out_pics, pics, * **/ private static getAlias(String str) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/removeDistrict.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/removeDistrict.groovy index 5011e67d9..1bd34b16b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/removeDistrict.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/removeDistrict.groovy @@ -6,7 +6,7 @@ import com.fangjia.datastore.driver.DataStore import com.mongodb.BasicDBObject import com.mongodb.DBObject; /** - * 将seaweed中状态为删除全真正删除 + * 灏唖eaweed涓姸鎬佷负鍒犻櫎鍏ㄧ湡姝e垹闄� * @author gaojuan * */ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/evaluation/AddLoudongInfo.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/evaluation/AddLoudongInfo.groovy index 4d4190621..253383a02 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/evaluation/AddLoudongInfo.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/evaluation/AddLoudongInfo.groovy @@ -24,7 +24,7 @@ import com.mongodb.DBCursor; import com.mongodb.DBObject import com.mongodb.QueryOperators -//给楼栋数据库中补充面积,房型,朝向,所在楼层,楼高 +//缁欐ゼ鏍嬫暟鎹簱涓ˉ鍏呴潰绉紝鎴垮瀷锛屾湞鍚戯紝鎵�鍦ㄦゼ灞傦紝妤奸珮 @BatchOwner(Watcher.GaoJuan) class AddLoudongInfo extends BaseBatch{ public static final DBCollection LOUDONG_COLL = MongoUtils.getCollectionByName("fangjia", "house_loudong", "mongo.db.fangjia.com") @@ -37,7 +37,7 @@ class AddLoudongInfo extends BaseBatch{ @Override public void process(Object args) { - def city = "上海"; + def city = "涓婃捣"; def districts = getAllDistricts(); findAllHaveNumEvaluation(city, districts); } @@ -53,7 +53,7 @@ class AddLoudongInfo extends BaseBatch{ public def getAllDistricts(){ DBObject q = new BasicDBObject(); - q.put("city", "上海"); + q.put("city", "涓婃捣"); q.put("website_name", new BasicDBObject('$in',["ziroom.com", "dankegongyu.com", "mgzf.com"])); def cursor = getDataStoreConnection().find(q).sort(new BasicDBObject('publish_date', -1)) @@ -81,7 +81,7 @@ class AddLoudongInfo extends BaseBatch{ DBCursor cur = EVALUA_COLL.find(queryCondition).sort(new BasicDBObject("c_date", -1)) cur.setOptions(Bytes.QUERYOPTION_NOTIMEOUT) def heights = [:]; -// if(map.name.indexOf("商检公寓")!=-1){ +// if(map.name.indexOf("鍟嗘鍏瘬")!=-1){ // println ".............................." // }else{ // continue; @@ -486,7 +486,7 @@ class AddLoudongInfo extends BaseBatch{ return lastResult; } - //定义可信度 + //瀹氫箟鍙俊搴� public int getEditFlag(def values , def values_count, def total_count){ def edit_flag = 0; if(values_count < 10){ @@ -505,7 +505,7 @@ class AddLoudongInfo extends BaseBatch{ } return edit_flag; } - // 对数字进行四舍五入 + // 瀵规暟瀛楄繘琛屽洓鑸嶄簲鍏� public Double round(v,scale){ BigDecimal b = new BigDecimal(Double.toString(v)); BigDecimal one = new BigDecimal("1"); @@ -520,8 +520,8 @@ class AddLoudongInfo extends BaseBatch{ queryCondition.put("region", obj.region); queryCondition.put("name", obj.name); - if(obj.house_num.indexOf("号")!=-1){ - obj.house_num = obj.house_num.replace("号",""); + if(obj.house_num.indexOf("鍙�")!=-1){ + obj.house_num = obj.house_num.replace("鍙�",""); } def num = isInteger(obj.room_num); if(num>50000){ @@ -707,8 +707,8 @@ class AddLoudongInfo extends BaseBatch{ private def filterHouseNum(def house_num){ - if(house_num.indexOf('号')!=-1){ - house_num = house_num.replace('号',''); + if(house_num.indexOf('鍙�')!=-1){ + house_num = house_num.replace('鍙�',''); } def num = isInteger(house_num); if(num){ @@ -724,7 +724,7 @@ class AddLoudongInfo extends BaseBatch{ if(flag){ return house_num; }else{ - re = /[0-9]*[甲|乙|丙|丁]/ + re = /[0-9]*[鐢瞸涔檤涓檤涓乚/ flag = house_num ==~ re if(flag){ return house_num; @@ -755,16 +755,16 @@ class AddLoudongInfo extends BaseBatch{ private def filterBuildType(def buildType){ if(buildType){ if(buildType.size()>=4){ - return '公寓'; + return '鍏瘬'; }else{ - if(buildType.indexOf('别墅')!=-1){ - return '别墅'; + if(buildType.indexOf('鍒')!=-1){ + return '鍒'; }else{ - return '公寓'; + return '鍏瘬'; } } }else{ - return '公寓'; + return '鍏瘬'; } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/evaluation/AddressEvaluationBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/evaluation/AddressEvaluationBatch.groovy index 43792ae86..37d538fce 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/evaluation/AddressEvaluationBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/evaluation/AddressEvaluationBatch.groovy @@ -36,8 +36,8 @@ class AddressEvaluationBatch { public static final HttpHelper HH = new HttpHelper(HOST) static main(args) { - String city = "郑州" - def lines = FileUtils.readLines(new File("D:\\广发数据\\测试\\${city}.txt")) + String city = "閮戝窞" + def lines = FileUtils.readLines(new File("D:\\骞垮彂鏁版嵁\\娴嬭瘯\\${city}.txt")) for(line in lines) { String[] arrs = line.split("\t") @@ -64,10 +64,10 @@ class AddressEvaluationBatch { weekend = DateUtil.parseDate(arrs[6], 'yyyy.MM') } String buildType = arrs[7] - if(buildType.indexOf('别墅') > -1) { - buildType = '独立别墅' + if(buildType.indexOf('鍒') > -1) { + buildType = '鐙珛鍒' }else { - buildType = '公寓' + buildType = '鍏瘬' } Integer floor = null @@ -86,31 +86,31 @@ class AddressEvaluationBatch { } String direction = null - if(arrs[9].indexOf('东南') > -1) { - direction = "东南" - }else if(arrs[9].indexOf('东北') > -1) { - direction = "东北" - }else if(arrs[9].indexOf('西南') > -1) { - direction = "西南" - }else if(arrs[9].indexOf('西北') > -1) { - direction = "西北" - }else if(arrs[9].indexOf('东') > -1) { - direction = "东" - }else if(arrs[9].indexOf('南') > -1) { - direction = "南" - }else if(arrs[9].indexOf('西') > -1) { - direction = "西" - }else if(arrs[9].indexOf('北') > -1) { - direction = "北" + if(arrs[9].indexOf('涓滃崡') > -1) { + direction = "涓滃崡" + }else if(arrs[9].indexOf('涓滃寳') > -1) { + direction = "涓滃寳" + }else if(arrs[9].indexOf('瑗垮崡') > -1) { + direction = "瑗垮崡" + }else if(arrs[9].indexOf('瑗垮寳') > -1) { + direction = "瑗垮寳" + }else if(arrs[9].indexOf('涓�') > -1) { + direction = "涓�" + }else if(arrs[9].indexOf('鍗�') > -1) { + direction = "鍗�" + }else if(arrs[9].indexOf('瑗�') > -1) { + direction = "瑗�" + }else if(arrs[9].indexOf('鍖�') > -1) { + direction = "鍖�" } String fitment = null - if(arrs[10].indexOf('精装') > -1 || arrs[10].indexOf('豪装') > -1) { - fitment = "精装修" - }else if(arrs[10].indexOf('毛坯') > -1) { - fitment = "毛坯" - }else if(arrs[10].indexOf('普通') > -1) { - fitment = "普通装修" + if(arrs[10].indexOf('绮捐') > -1 || arrs[10].indexOf('璞') > -1) { + fitment = "绮捐淇�" + }else if(arrs[10].indexOf('姣涘澂') > -1) { + fitment = "姣涘澂" + }else if(arrs[10].indexOf('鏅��') > -1) { + fitment = "鏅�氳淇�" } @@ -157,7 +157,7 @@ class AddressEvaluationBatch { totalPrice2 = jo2.get('totalPrice') } - String s = address + "\t" + (districtName ? districtName : "#") + "\t" + totalPrice + "\t" + totalPrice2 + "\t" + (matched ? '匹配' : '推测'); + String s = address + "\t" + (districtName ? districtName : "#") + "\t" + totalPrice + "\t" + totalPrice2 + "\t" + (matched ? '鍖归厤' : '鎺ㄦ祴'); println s sbuilder.append(s) sbuilder.append("\r\n") @@ -191,7 +191,7 @@ class AddressEvaluationBatch { // bprice = 0 // } // -// String s = address + "\t" + (districtKey ? districtKey.getName() : "#") + "\t" + aprice + "\t" + bprice + "\t" + (districtKey ? '匹配' : '推测'); +// String s = address + "\t" + (districtKey ? districtKey.getName() : "#") + "\t" + aprice + "\t" + bprice + "\t" + (districtKey ? '鍖归厤' : '鎺ㄦ祴'); // println s // sbuilder.append(s) // sbuilder.append("\r\n") @@ -322,7 +322,7 @@ class AddressEvaluationBatch { Iterator iter = cur.iterator() while(iter.hasNext()) { DBObject dbo = iter.next() - if(dbo.get('estate_type2') && dbo.get('estate_type2').indexOf('别墅') == -1) { + if(dbo.get('estate_type2') && dbo.get('estate_type2').indexOf('鍒') == -1) { ret.add(new DistrictKey(city, dbo.get('region'), dbo.get('name'))) } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/evaluation/BatchEvaluateBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/evaluation/BatchEvaluateBatch.groovy index de29e890e..949c97623 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/evaluation/BatchEvaluateBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/evaluation/BatchEvaluateBatch.groovy @@ -19,7 +19,7 @@ import org.apache.commons.lang.StringUtils import java.util.zip.ZipException /** - * 批量重估脚本 + * 鎵归噺閲嶄及鑴氭湰 * Created by wenyan on 2016/1/8. */ @BatchOwner(Watcher.WangWenYan) @@ -84,7 +84,7 @@ public class BatchEvaluateBatch extends BaseBatch{ if(!checkPassed){ update = new BasicDBObject() update.append("status", TASK_STATUS_ERROR) - update.append("msg", "数据格式不正确") + update.append("msg", "鏁版嵁鏍煎紡涓嶆纭�") TASK_COLL.update(new BasicDBObject("_id",task._id), new BasicDBObject('$set',update)) } @@ -130,12 +130,12 @@ public class BatchEvaluateBatch extends BaseBatch{ FILES.update(new BasicDBObject("_id", fileId), new BasicDBObject('$set', new BasicDBObject('data',data))) update = new BasicDBObject() update.append("status", TASK_STATUS_SUC) - update.append("msg", "处理完成") + update.append("msg", "澶勭悊瀹屾垚") update.append("finish_date", new Date()) TASK_COLL.update(new BasicDBObject("_id",task._id), new BasicDBObject('$set',update)) def errorRatio = errorEvaluateCount / (double)evaluationCount if(errorRatio > 0.1){ - jms.sendSms(Watcher.WangWenYan.mobile,"【房价网】批量估价,任务${task._id.toString()} 估价失败率较高(${DataUtil.roundDouble(errorRatio * 100, 2)}%)!",null) + jms.sendSms(Watcher.WangWenYan.mobile,"銆愭埧浠风綉銆戞壒閲忎及浠�,浠诲姟${task._id.toString()} 浼颁环澶辫触鐜囪緝楂橈紙${DataUtil.roundDouble(errorRatio * 100, 2)}%锛�!",null) } } @@ -147,7 +147,7 @@ public class BatchEvaluateBatch extends BaseBatch{ times ++ } if(resp == null){ - jms.sendSms(Watcher.WangWenYan.mobile,"【房价网】批量估价,无法调用估价接口,请检查接口是否正常",null) + jms.sendSms(Watcher.WangWenYan.mobile,"銆愭埧浠风綉銆戞壒閲忎及浠凤紝鏃犳硶璋冪敤浼颁环鎺ュ彛锛岃妫�鏌ユ帴鍙f槸鍚︽甯�",null) System.exit(0) } return resp diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/evaluation/EvaluationBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/evaluation/EvaluationBatch.groovy index 9f852c00f..02bfb7a54 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/evaluation/EvaluationBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/evaluation/EvaluationBatch.groovy @@ -22,7 +22,7 @@ import com.fangjia.script.util.OpenApiClient; import com.fangjia.script.commData.CommonDatautils; import com.fangjia.script.common.DataHandleUtils; /** - * 批量估价 + * 鎵归噺浼颁环 * @author gaojuan * */ @@ -41,40 +41,40 @@ class EvaluationBatch { //runSH(); //runBJ(); //runJN(); - //runResult("郑州","E:\\数据导出\\估价\\郑州-房屋估值数据测试.xlsx","E:\\数据导出\\估价\\结果\\郑州.xlsx"); - runResult("南京","E:\\数据导出\\估价\\南京-房屋估值数据测试.xlsx","E:\\数据导出\\估价\\结果\\南京.xlsx"); + //runResult("閮戝窞","E:\\鏁版嵁瀵煎嚭\\浼颁环\\閮戝窞-鎴垮眿浼板�兼暟鎹祴璇�.xlsx","E:\\鏁版嵁瀵煎嚭\\浼颁环\\缁撴灉\\閮戝窞.xlsx"); + runResult("鍗椾含","E:\\鏁版嵁瀵煎嚭\\浼颁环\\鍗椾含-鎴垮眿浼板�兼暟鎹祴璇�.xlsx","E:\\鏁版嵁瀵煎嚭\\浼颁环\\缁撴灉\\鍗椾含.xlsx"); } def runSH(){ - def ret = readExcel("E:\\数据导出\\估价\\上海-数据.xlsx"); - def result = evaluationSH("上海", ret); - exportHouse(result, "E:\\数据导出\\估价\\结果\\上海-数据.xlsx"); + def ret = readExcel("E:\\鏁版嵁瀵煎嚭\\浼颁环\\涓婃捣-鏁版嵁.xlsx"); + def result = evaluationSH("涓婃捣", ret); + exportHouse(result, "E:\\鏁版嵁瀵煎嚭\\浼颁环\\缁撴灉\\涓婃捣-鏁版嵁.xlsx"); } def evaluationSH(def city, def ret){ for(def dbo : ret){ - def districtKey = CommonDatautils.formatDistrictName(city,null, dbo.get("楼盘名称(小区名称)")); + def districtKey = CommonDatautils.formatDistrictName(city,null, dbo.get("妤肩洏鍚嶇О锛堝皬鍖哄悕绉帮級")); if(districtKey){ Map params = new HashMap(); params.put("city", city); params.put("district", districtKey.region); params.put("name", districtKey.name); - params.put("size", String.valueOf(dbo.get("建筑面积"))); - params.put("floor", dbo.get("所在楼层").toInteger().toString()); - params.put("maxFloor", dbo.get("总楼层").toInteger().toString()); - params.put("direction", filterDiretion(dbo.get("朝向")).toString()); + params.put("size", String.valueOf(dbo.get("寤虹瓚闈㈢Н"))); + params.put("floor", dbo.get("鎵�鍦ㄦゼ灞�").toInteger().toString()); + params.put("maxFloor", dbo.get("鎬绘ゼ灞�").toInteger().toString()); + params.put("direction", filterDiretion(dbo.get("鏈濆悜")).toString()); def result = getEvaluationResult(params); if(result){ - dbo.put("评估总价格(万)", DataHandleUtils.getDoubleRound(2, result.totalPrice/10000.0)) - dbo.put("市场单价(万)", result.avgPrice) + dbo.put("璇勪及鎬讳环鏍硷紙涓囷級", DataHandleUtils.getDoubleRound(2, result.totalPrice/10000.0)) + dbo.put("甯傚満鍗曚环锛堜竾锛�", result.avgPrice) }else{ - dbo.put("评估总价格(万)", '') - dbo.put("市场单价(万)", '') + dbo.put("璇勪及鎬讳环鏍硷紙涓囷級", '') + dbo.put("甯傚満鍗曚环锛堜竾锛�", '') } println result; }else{ - dbo.put("评估总价格(万)", '') - dbo.put("市场单价(万)", '') - println "没找到小区" + dbo + dbo.put("璇勪及鎬讳环鏍硷紙涓囷級", '') + dbo.put("甯傚満鍗曚环锛堜竾锛�", '') + println "娌℃壘鍒板皬鍖�" + dbo } } @@ -86,36 +86,36 @@ class EvaluationBatch { def runBJ(){ - def ret = readExcel("E:\\数据导出\\估价\\北京.xlsx"); - def result = evaluationBJ("北京", ret); - exportHouse(result, "E:\\数据导出\\估价\\结果\\北京.xlsx"); + def ret = readExcel("E:\\鏁版嵁瀵煎嚭\\浼颁环\\鍖椾含.xlsx"); + def result = evaluationBJ("鍖椾含", ret); + exportHouse(result, "E:\\鏁版嵁瀵煎嚭\\浼颁环\\缁撴灉\\鍖椾含.xlsx"); } def evaluationBJ(def city, def ret){ for(def dbo : ret){ - def districtKey = CommonDatautils.formatDistrictName(city,null, dbo.get("楼盘名称(小区名称)")); + def districtKey = CommonDatautils.formatDistrictName(city,null, dbo.get("妤肩洏鍚嶇О锛堝皬鍖哄悕绉帮級")); if(districtKey){ Map params = new HashMap(); params.put("city", city); params.put("district", districtKey.region); params.put("name", districtKey.name); - params.put("size", String.valueOf(dbo.get("建筑面积"))); - params.put("floor", dbo.get("所在楼层").toInteger().toString()); - params.put("maxFloor", dbo.get("总楼层").toInteger().toString()); - params.put("direction", filterDiretion(dbo.get("朝向")).toString()); + params.put("size", String.valueOf(dbo.get("寤虹瓚闈㈢Н"))); + params.put("floor", dbo.get("鎵�鍦ㄦゼ灞�").toInteger().toString()); + params.put("maxFloor", dbo.get("鎬绘ゼ灞�").toInteger().toString()); + params.put("direction", filterDiretion(dbo.get("鏈濆悜")).toString()); def result = getEvaluationResult(params); if(result){ - dbo.put("评估价格", result.totalPrice) - dbo.put("单价", result.avgPrice) + dbo.put("璇勪及浠锋牸", result.totalPrice) + dbo.put("鍗曚环", result.avgPrice) }else{ - dbo.put("评估价格", '') - dbo.put("单价", '') + dbo.put("璇勪及浠锋牸", '') + dbo.put("鍗曚环", '') } println result; }else{ - dbo.put("评估价格", '') - dbo.put("单价", '') - println "没找到小区" + dbo + dbo.put("璇勪及浠锋牸", '') + dbo.put("鍗曚环", '') + println "娌℃壘鍒板皬鍖�" + dbo } } @@ -127,36 +127,36 @@ class EvaluationBatch { def runJN(){ - def ret = readExcel("E:\\数据导出\\估价\\济南-房屋估值数据.xlsx"); - def result = evaluationBJ("济南", ret); - exportHouse(result, "E:\\数据导出\\估价\\结果\\济南-房屋估值数据.xlsx"); + def ret = readExcel("E:\\鏁版嵁瀵煎嚭\\浼颁环\\娴庡崡-鎴垮眿浼板�兼暟鎹�.xlsx"); + def result = evaluationBJ("娴庡崡", ret); + exportHouse(result, "E:\\鏁版嵁瀵煎嚭\\浼颁环\\缁撴灉\\娴庡崡-鎴垮眿浼板�兼暟鎹�.xlsx"); } def evaluationJN(def city, def ret){ for(def dbo : ret){ - def districtKey = CommonDatautils.formatDistrictName(city,null, dbo.get("楼盘名称(小区名称)")); + def districtKey = CommonDatautils.formatDistrictName(city,null, dbo.get("妤肩洏鍚嶇О锛堝皬鍖哄悕绉帮級")); if(districtKey){ Map params = new HashMap(); params.put("city", city); params.put("district", districtKey.region); params.put("name", districtKey.name); - params.put("size", String.valueOf(dbo.get("建筑面积"))); - params.put("floor", dbo.get("所在楼层").toInteger().toString()); - params.put("maxFloor", dbo.get("总楼层").toInteger().toString()); - params.put("direction", filterDiretion(dbo.get("朝向")).toString()); + params.put("size", String.valueOf(dbo.get("寤虹瓚闈㈢Н"))); + params.put("floor", dbo.get("鎵�鍦ㄦゼ灞�").toInteger().toString()); + params.put("maxFloor", dbo.get("鎬绘ゼ灞�").toInteger().toString()); + params.put("direction", filterDiretion(dbo.get("鏈濆悜")).toString()); def result = getEvaluationResult(params); if(result){ - dbo.put("评估价格", result.totalPrice) - dbo.put("市场单价", result.avgPrice) + dbo.put("璇勪及浠锋牸", result.totalPrice) + dbo.put("甯傚満鍗曚环", result.avgPrice) }else{ - dbo.put("评估价格", '') - dbo.put("市场单价", '') + dbo.put("璇勪及浠锋牸", '') + dbo.put("甯傚満鍗曚环", '') } println result; }else{ - dbo.put("评估价格", '') - dbo.put("市场单价", '') - println "没找到小区" + dbo + dbo.put("璇勪及浠锋牸", '') + dbo.put("甯傚満鍗曚环", '') + println "娌℃壘鍒板皬鍖�" + dbo } } @@ -181,30 +181,30 @@ class EvaluationBatch { def evaluationByAddress(def city, def ret){ for(def dbo : ret){ - def map = addressParse(city, dbo.get("楼盘名称(小区名称)")); + def map = addressParse(city, dbo.get("妤肩洏鍚嶇О锛堝皬鍖哄悕绉帮級")); println map.name if(map && map.status==0){ Map params = new HashMap(); params.put("city", city); params.put("district", map.region); params.put("name", map.name); - params.put("size", String.valueOf(dbo.get("建筑面积"))); - params.put("floor", dbo.get("所在楼层").toInteger().toString()); - params.put("maxFloor", dbo.get("总楼层").toInteger().toString()); - params.put("direction", filterDiretion(dbo.get("朝向")).toString()); + params.put("size", String.valueOf(dbo.get("寤虹瓚闈㈢Н"))); + params.put("floor", dbo.get("鎵�鍦ㄦゼ灞�").toInteger().toString()); + params.put("maxFloor", dbo.get("鎬绘ゼ灞�").toInteger().toString()); + params.put("direction", filterDiretion(dbo.get("鏈濆悜")).toString()); def result = getEvaluationResult(params); if(result){ - dbo.put("评估价格", result.totalPrice) - dbo.put("市场单价", result.avgPrice) + dbo.put("璇勪及浠锋牸", result.totalPrice) + dbo.put("甯傚満鍗曚环", result.avgPrice) }else{ - dbo.put("评估价格", '') - dbo.put("市场单价", '') + dbo.put("璇勪及浠锋牸", '') + dbo.put("甯傚満鍗曚环", '') } println result; }else{ - dbo.put("评估价格", '') - dbo.put("市场单价", '') - println "没找到小区" + dbo + dbo.put("璇勪及浠锋牸", '') + dbo.put("甯傚満鍗曚环", '') + println "娌℃壘鍒板皬鍖�" + dbo } } @@ -214,29 +214,29 @@ class EvaluationBatch { def evaluation(def city, def ret){ for(def dbo : ret){ - def districtKey = CommonDatautils.formatDistrictName(city,null, dbo.get("楼盘名称(小区名称)")); + def districtKey = CommonDatautils.formatDistrictName(city,null, dbo.get("妤肩洏鍚嶇О锛堝皬鍖哄悕绉帮級")); if(districtKey){ Map params = new HashMap(); params.put("city", city); params.put("district", districtKey.region); params.put("name", districtKey.name); - params.put("size", String.valueOf(dbo.get("建筑面积"))); - params.put("floor", dbo.get("所在楼层").toInteger().toString()); - params.put("maxFloor", dbo.get("总楼层").toInteger().toString()); - params.put("direction", filterDiretion(dbo.get("朝向")).toString()); + params.put("size", String.valueOf(dbo.get("寤虹瓚闈㈢Н"))); + params.put("floor", dbo.get("鎵�鍦ㄦゼ灞�").toInteger().toString()); + params.put("maxFloor", dbo.get("鎬绘ゼ灞�").toInteger().toString()); + params.put("direction", filterDiretion(dbo.get("鏈濆悜")).toString()); def result = getEvaluationResult(params); if(result){ - dbo.put("评估价格", result.totalPrice) - dbo.put("市场单价", result.avgPrice) + dbo.put("璇勪及浠锋牸", result.totalPrice) + dbo.put("甯傚満鍗曚环", result.avgPrice) }else{ - dbo.put("评估价格", '') - dbo.put("市场单价", '') + dbo.put("璇勪及浠锋牸", '') + dbo.put("甯傚満鍗曚环", '') } println result; }else{ - dbo.put("评估价格", '') - dbo.put("市场单价", '') - println "没找到小区" + dbo + dbo.put("璇勪及浠锋牸", '') + dbo.put("甯傚満鍗曚环", '') + println "娌℃壘鍒板皬鍖�" + dbo } } @@ -251,15 +251,15 @@ class EvaluationBatch { def filterDiretion(def direction){ - def directionMap = ["西南":1,"东南":2,"南":3,"西北":4,"东北":5,"东":6,"西":7,"北":8,"东西":9,"南北":10] + def directionMap = ["瑗垮崡":1,"涓滃崡":2,"鍗�":3,"瑗垮寳":4,"涓滃寳":5,"涓�":6,"瑗�":7,"鍖�":8,"涓滆タ":9,"鍗楀寳":10] def value = directionMap.get(direction); if(!value){ - if(direction == "全南"){ - direction = "南" - }else if(direction.contains("南北")){ - direction = "南北" - }else if(direction == "南向"){ - direction = "南" + if(direction == "鍏ㄥ崡"){ + direction = "鍗�" + }else if(direction.contains("鍗楀寳")){ + direction = "鍗楀寳" + }else if(direction == "鍗楀悜"){ + direction = "鍗�" } value = directionMap.get(direction); @@ -268,7 +268,7 @@ class EvaluationBatch { if(value){ return value; }else{ - println "朝向:没值" + println "鏈濆悜锛氭病鍊�" } return null; @@ -280,7 +280,7 @@ class EvaluationBatch { return result.getJSONObject("result") } } else if (result.getInt("code") == 500) { - println("小区估价失败:${params.city} ${params.name} ${params.size} ${result}") + println("灏忓尯浼颁环澶辫触:${params.city} ${params.name} ${params.size} ${result}") } } @@ -294,7 +294,7 @@ class EvaluationBatch { def WORK_BOOK = null; try { if (file.exists()) { - FileInputStream fs=new FileInputStream(path); //获取d://test.xls + FileInputStream fs=new FileInputStream(path); //鑾峰彇d://test.xls WORK_BOOK = WorkbookFactory.create(fs) WORK_BOOK.setForceFormulaRecalculation(true) sheet = WORK_BOOK.getSheetAt(0); @@ -396,7 +396,7 @@ class EvaluationBatch { conn.setRequestMethod("GET"); conn.doOutput = true inputStream = conn.getInputStream(); - BufferedReader buf = new BufferedReader(new InputStreamReader(inputStream,"UTF-8"));// 创建UTF-8的BufferedReader + BufferedReader buf = new BufferedReader(new InputStreamReader(inputStream,"UTF-8"));// 鍒涘缓UTF-8鐨凚ufferedReader while((line = buf.readLine())!=null){ sb.append(line); } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/evaluation/EvaluationCountBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/evaluation/EvaluationCountBatch.groovy index 3d113a056..05882b4b6 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/evaluation/EvaluationCountBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/evaluation/EvaluationCountBatch.groovy @@ -10,7 +10,7 @@ import com.mongodb.DBCollection import com.mongodb.DBObject /** - * 每日估价数量统计 + * 姣忔棩浼颁环鏁伴噺缁熻 * * @author yukai * @@ -26,7 +26,7 @@ class EvaluationCountBatch extends BaseBatch { public void process(Object args) { /* - // 历史数据 + // 鍘嗗彶鏁版嵁 COUNT_COLL.remove(new BasicDBObject()); Calendar calendar = Calendar.getInstance(); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/evaluation/EvaluationDemo.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/evaluation/EvaluationDemo.groovy index e49f0f1ed..b1162871a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/evaluation/EvaluationDemo.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/evaluation/EvaluationDemo.groovy @@ -29,7 +29,7 @@ class EvaluationDemo { public def findDistrictCount(){ def result = [:] - def citys = ["北京"]//findAllCity(); + def citys = ["鍖椾含"]//findAllCity(); for(def city : citys){ result = getAllDistricts("district", city, result) } @@ -46,7 +46,7 @@ class EvaluationDemo { if(cursor){ for(def dbo : cursor){ def city = dbo.get("display"); - if(city!='全国'){ + if(city!='鍏ㄥ浗'){ citys << city; } } @@ -56,12 +56,12 @@ class EvaluationDemo { } public void start(){ - def citys = ["北京","上海","广州","深圳","成都","温州"]; + def citys = ["鍖椾含","涓婃捣","骞垮窞","娣卞湷","鎴愰兘","娓╁窞"]; def m = [:]; for(def city : citys){ m = findEvaluation(m, city); } - println "正在写入文件......................." + println "姝e湪鍐欏叆鏂囦欢......................." createExcel(m); } @@ -184,16 +184,16 @@ class EvaluationDemo { private def filterBuildType(def buildType){ if(buildType){ if(buildType.size()>=4){ - return '公寓'; + return '鍏瘬'; }else{ - if(buildType.indexOf('别墅')!=-1){ - return '别墅'; + if(buildType.indexOf('鍒')!=-1){ + return '鍒'; }else{ - return '公寓'; + return '鍏瘬'; } } }else{ - return '公寓'; + return '鍏瘬'; } } @@ -203,21 +203,21 @@ class EvaluationDemo { if (file.exists()){ file.delete(); } - file.append("城市,") - file.append("区域,") - file.append("楼盘名称,") - file.append("栋号,") - file.append("室号,") - file.append("面积(平米),") - file.append("2013-11评估总价(元),") - file.append("2013-09评估总价(元),") - file.append("2013-06月评估总价(元),") - file.append("2013-03月评估总价(元),") + file.append("鍩庡競,") + file.append("鍖哄煙,") + file.append("妤肩洏鍚嶇О,") + file.append("鏍嬪彿,") + file.append("瀹ゅ彿,") + file.append("闈㈢Н锛堝钩绫筹級,") + file.append("2013-11璇勪及鎬讳环锛堝厓锛�,") + file.append("2013-09璇勪及鎬讳环锛堝厓锛�,") + file.append("2013-06鏈堣瘎浼版�讳环锛堝厓锛�,") + file.append("2013-03鏈堣瘎浼版�讳环锛堝厓锛�,") - file.append("2012-12评估总价(元),") - file.append("2012-09评估总价(元),") - file.append("2012-06月评估总价(元),") - file.append("2012-03月评估总价(元),") + file.append("2012-12璇勪及鎬讳环锛堝厓锛�,") + file.append("2012-09璇勪及鎬讳环锛堝厓锛�,") + file.append("2012-06鏈堣瘎浼版�讳环锛堝厓锛�,") + file.append("2012-03鏈堣瘎浼版�讳环锛堝厓锛�,") file.append(System.getProperty("line.separator")); list.each{d-> def key = d.key; @@ -290,8 +290,8 @@ class EvaluationDemo { private def filterHouseNum(def house_num){ - if(house_num.indexOf('号')!=-1){ - house_num = house_num.replace('号',''); + if(house_num.indexOf('鍙�')!=-1){ + house_num = house_num.replace('鍙�',''); } def num = isInteger(house_num); if(num){ @@ -307,7 +307,7 @@ class EvaluationDemo { if(flag){ return house_num; }else{ - re = /[0-9]*[甲|乙|丙|丁]/ + re = /[0-9]*[鐢瞸涔檤涓檤涓乚/ flag = house_num ==~ re if(flag){ return house_num; @@ -374,18 +374,18 @@ class EvaluationDemo { // println "["+index201+"] "+finish_date + " "+obj.get("name"); // } } - println cursor.count() + " 2000年:"+index200+" 2001年:"+index201 + println cursor.count() + " 2000骞达細"+index200+" 2001骞达細"+index201 //result.put(city, cursor.count()); return result; } private def createDistrictBuildDateExcel(def list){ - File file = new File("e:\\北京小区2010.csv"); + File file = new File("e:\\鍖椾含灏忓尯2010.csv"); if (file.exists()){ file.delete(); } - file.append("小区名称,") - file.append("竣工时间,") + file.append("灏忓尯鍚嶇О,") + file.append("绔e伐鏃堕棿,") file.append(System.getProperty("line.separator")); list.each{d-> def city = d.key; @@ -403,8 +403,8 @@ class EvaluationDemo { if (file.exists()){ file.delete(); } - file.append("城市,") - file.append("小区数量,") + file.append("鍩庡競,") + file.append("灏忓尯鏁伴噺,") file.append(System.getProperty("line.separator")); list.each{d-> def city = d.key; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/evaluation/EvaluationExportBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/evaluation/EvaluationExportBatch.groovy index f40cfa2be..c4ca26673 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/evaluation/EvaluationExportBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/evaluation/EvaluationExportBatch.groovy @@ -240,16 +240,16 @@ class EvaluationExportBatch extends BaseBatch { return object; } - def static directionMap = [3:"南",2:"东南",1:"西南",4:"西北",5:"东北",6:"东",7:"西",8:"北",9:"东西",10:"南北"]; - def static buildTypeMap = [3:"住宅",8:"公寓",4:"独立别墅",5:"双拼别墅",6:"联排别墅",7:"叠加别墅"]; - def static fitmentRankMap = [2:"普通装修", 1:"毛坯",4:"精装修",5:"豪华装修", 0:"开发商装修"]; - def static fitmentAgeMap = [1:"1年",2:"2年",3:"3年",4:"4年",5:"4年以上"]; - def static housePropertyMap = [1:"个人产权",2:"集体产权",3:"国有产权"]; - def static carportMap = [1:"已租",2:"已购",3:"暂无"]; - def static insidePosMap = [1:"离小区出口近",2:"离小区出口远",3:"离小区出口距离适中"]; - def static sightMap = [1:"景观房",2:"侧景观房",3:"一般",4:"差"]; - def static noiseMap = [1:"无噪音",2:"噪音较小",3:"噪音较大"]; - def static sideSetMap = [1:"非边套",2:"边套不带窗",3:"边套带窗"]; - def static worryFacilityMap = [1:"很近",2:"较近",3:"无"]; - def static lightingVentilationMap = [1:"无暗房/南北通风",2:"南北通风",3:"一般", 4:"差"]; + def static directionMap = [3:"鍗�",2:"涓滃崡",1:"瑗垮崡",4:"瑗垮寳",5:"涓滃寳",6:"涓�",7:"瑗�",8:"鍖�",9:"涓滆タ",10:"鍗楀寳"]; + def static buildTypeMap = [3:"浣忓畢",8:"鍏瘬",4:"鐙珛鍒",5:"鍙屾嫾鍒",6:"鑱旀帓鍒",7:"鍙犲姞鍒"]; + def static fitmentRankMap = [2:"鏅�氳淇�", 1:"姣涘澂",4:"绮捐淇�",5:"璞崕瑁呬慨", 0:"寮�鍙戝晢瑁呬慨"]; + def static fitmentAgeMap = [1:"1骞�",2:"2骞�",3:"3骞�",4:"4骞�",5:"4骞翠互涓�"]; + def static housePropertyMap = [1:"涓汉浜ф潈",2:"闆嗕綋浜ф潈",3:"鍥芥湁浜ф潈"]; + def static carportMap = [1:"宸茬",2:"宸茶喘",3:"鏆傛棤"]; + def static insidePosMap = [1:"绂诲皬鍖哄嚭鍙h繎",2:"绂诲皬鍖哄嚭鍙h繙",3:"绂诲皬鍖哄嚭鍙h窛绂婚�備腑"]; + def static sightMap = [1:"鏅鎴�",2:"渚ф櫙瑙傛埧",3:"涓�鑸�",4:"宸�"]; + def static noiseMap = [1:"鏃犲櫔闊�",2:"鍣煶杈冨皬",3:"鍣煶杈冨ぇ"]; + def static sideSetMap = [1:"闈炶竟濂�",2:"杈瑰涓嶅甫绐�",3:"杈瑰甯︾獥"]; + def static worryFacilityMap = [1:"寰堣繎",2:"杈冭繎",3:"鏃�"]; + def static lightingVentilationMap = [1:"鏃犳殫鎴�/鍗楀寳閫氶",2:"鍗楀寳閫氶",3:"涓�鑸�", 4:"宸�"]; } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/evaluation/EvaluationFieldProcent.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/evaluation/EvaluationFieldProcent.groovy index 9c1578e2d..daa2075be 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/evaluation/EvaluationFieldProcent.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/evaluation/EvaluationFieldProcent.groovy @@ -22,7 +22,7 @@ import com.mongodb.DBCursor; import com.mongodb.DBObject import com.mongodb.QueryOperators -//对估价表数据进行字段覆盖率统计 +//瀵逛及浠疯〃鏁版嵁杩涜瀛楁瑕嗙洊鐜囩粺璁� @BatchOwner(Watcher.GaoJuan) class EvaluationFieldProcent extends BaseBatch{ @@ -49,42 +49,42 @@ class EvaluationFieldProcent extends BaseBatch{ def startDate = DateUtils.parseFromTightYYYYMMDD(DateUtils.add(endDate_str, -1)); def sevenBeforeDate = DateUtils.parseFromTightYYYYMMDD(DateUtils.add(endDate_str, -7)); - def siteFieldsMap = ["region":"区域",'district_name':'小区名称','house_num':'栋号','room_num':'室号','area':'面积','floor':'所在楼层','height':'楼高','stairs':"几梯",'doors':"几户","floor_height":"层高","floor_space":"楼间距","fitment":"装修情况","fitment_age":"装修年限","leak":"有无渗水情况","crack":"有无墙体开裂","direction":"房屋朝向","carport":"自有车位","carport_saturation":"小区车位饱和度","parking_fee":"停车费","parking_fee_unit":"停车费单位","worry_factor":"附近厌恶设施","noise":"噪音影响","facilities":"小区内部配套","green_area":"小区内绿化覆盖面","property":"物业管理综合水平", - "property_fee":"物业管理费","security":"小区治安环境","rental_rates":"小区出租率","garden_area":"花园面积","terrace_area":"露台面积","basement_area":"地下室面积","attic_area":"阁楼面积","fitment_charge":"装修费用","house_property":"产权属性","insidepos":"小区位置","sight":"景观情况","lighting_ventilation":"采光通风","sideset":"边套装置","worry_facility":"厌恶设施","room":"室","hall":"厅","build_type":"建筑类型"] + def siteFieldsMap = ["region":"鍖哄煙",'district_name':'灏忓尯鍚嶇О','house_num':'鏍嬪彿','room_num':'瀹ゅ彿','area':'闈㈢Н','floor':'鎵�鍦ㄦゼ灞�','height':'妤奸珮','stairs':"鍑犳",'doors':"鍑犳埛","floor_height":"灞傞珮","floor_space":"妤奸棿璺�","fitment":"瑁呬慨鎯呭喌","fitment_age":"瑁呬慨骞撮檺","leak":"鏈夋棤娓楁按鎯呭喌","crack":"鏈夋棤澧欎綋寮�瑁�","direction":"鎴垮眿鏈濆悜","carport":"鑷湁杞︿綅","carport_saturation":"灏忓尯杞︿綅楗卞拰搴�","parking_fee":"鍋滆溅璐�","parking_fee_unit":"鍋滆溅璐瑰崟浣�","worry_factor":"闄勮繎鍘屾伓璁炬柦","noise":"鍣煶褰卞搷","facilities":"灏忓尯鍐呴儴閰嶅","green_area":"灏忓尯鍐呯豢鍖栬鐩栭潰","property":"鐗╀笟绠$悊缁煎悎姘村钩", + "property_fee":"鐗╀笟绠$悊璐�","security":"灏忓尯娌诲畨鐜","rental_rates":"灏忓尯鍑虹鐜�","garden_area":"鑺卞洯闈㈢Н","terrace_area":"闇插彴闈㈢Н","basement_area":"鍦颁笅瀹ら潰绉�","attic_area":"闃佹ゼ闈㈢Н","fitment_charge":"瑁呬慨璐圭敤","house_property":"浜ф潈灞炴��","insidepos":"灏忓尯浣嶇疆","sight":"鏅鎯呭喌","lighting_ventilation":"閲囧厜閫氶","sideset":"杈瑰瑁呯疆","worry_facility":"鍘屾伓璁炬柦","room":"瀹�","hall":"鍘�","build_type":"寤虹瓚绫诲瀷"] def site_fields = ['region','district_name','house_num','room_num','area','floor','height','stairs','doors',"floor_height", "floor_space","fitment","fitment_age","leak","crack","direction","carport","carport_saturation","parking_fee","parking_fee_unit","worry_factor","noise","facilities","green_area","property","property_fee","security","rental_rates","garden_area","terrace_area","basement_area","attic_area"] def report_fields = ['region','district_name','house_num','room_num','area','floor','height',"room","hall","build_type","fitment_charge","fitment","fitment_age","house_property","direction","carport","insidepos","sight","lighting_ventilation","noise","sideset","worry_facility"]; - def site_filedCountMap = findEvaluation("上海", startDate, endDate, "site", site_fields); + def site_filedCountMap = findEvaluation("涓婃捣", startDate, endDate, "site", site_fields); def site_resultMap = caluateFilePrecent(site_filedCountMap); - def report_filedCountMap = findEvaluation("上海", startDate, endDate, "report", report_fields); + def report_filedCountMap = findEvaluation("涓婃捣", startDate, endDate, "report", report_fields); def report_resultMap = caluateFilePrecent(report_filedCountMap); - def site_7_filedCountMap = findEvaluation("上海", sevenBeforeDate, endDate, "site", site_fields); + def site_7_filedCountMap = findEvaluation("涓婃捣", sevenBeforeDate, endDate, "site", site_fields); def site_7_resultMap = caluateFilePrecent(site_7_filedCountMap); - def report_7_filedCountMap = findEvaluation("上海", sevenBeforeDate, endDate, "report", report_fields); + def report_7_filedCountMap = findEvaluation("涓婃捣", sevenBeforeDate, endDate, "report", report_fields); def report_7_resultMap = caluateFilePrecent(report_7_filedCountMap); def all_fields = site_fields + report_fields all_fields = all_fields.unique(); sendEmail(all_fields, site_resultMap, report_resultMap, siteFieldsMap, startDate, site_filedCountMap, report_filedCountMap, site_fields, report_fields, site_7_filedCountMap, site_7_resultMap, report_7_filedCountMap, report_7_resultMap); - println "估价字段覆盖率统计完成......" + println "浼颁环瀛楁瑕嗙洊鐜囩粺璁″畬鎴�......" } private void sendEmail(def all_fields, def site_resultMap, def report_resultMap, def siteFieldsMap, def startDate, def site_filedCountMap, def report_filedCountMap, def site_fields, def report_fields, def site_7_filedCountMap, def site_7_resultMap, def report_7_filedCountMap,def report_7_resultMap) { String content = toMail(all_fields, site_resultMap, report_resultMap, siteFieldsMap, site_filedCountMap, report_filedCountMap, site_fields, report_fields, site_7_filedCountMap, site_7_resultMap, report_7_filedCountMap, report_7_resultMap); String dateString = DateUtil.formatToYYYYMMDD(startDate); - String subject = "上海 昨天及最近7天 估价字段覆盖率报告"; + String subject = "涓婃捣 鏄ㄥぉ鍙婃渶杩�7澶� 浼颁环瀛楁瑕嗙洊鐜囨姤鍛�"; for(email in emails) { sendEmail(email, subject, content); } } /** - * 发送邮件 + * 鍙戦�侀偖浠� */ private sendEmail(email, subject, content) { @@ -94,15 +94,15 @@ class EvaluationFieldProcent extends BaseBatch{ private String toMail(def all_fields, def site_resultMap, def report_resultMap, def siteFieldsMap, def site_filedCountMap, def report_filedCountMap, def site_fields, def report_fields, def site_7_filedCountMap,def site_7_resultMap,def report_7_filedCountMap,def report_7_resultMap) { StringBuffer sb = new StringBuffer(); - sb.append("参与网站估价(三步曲)字段覆盖率数量:"+site_filedCountMap.get("count") +"条(昨天) "+site_7_filedCountMap.get("count")+"条(最近7天)
    "); - sb.append("参与报告估价字段覆盖率数量:"+report_filedCountMap.get("count") +"条(昨天) "+report_7_filedCountMap.get("count")+"条(最近7天)
    "); + sb.append("鍙備笌缃戠珯浼颁环(涓夋鏇�)瀛楁瑕嗙洊鐜囨暟閲忥細"+site_filedCountMap.get("count") +"鏉�(鏄ㄥぉ) "+site_7_filedCountMap.get("count")+"鏉�(鏈�杩�7澶�)
    "); + sb.append("鍙備笌鎶ュ憡浼颁环瀛楁瑕嗙洊鐜囨暟閲忥細"+report_filedCountMap.get("count") +"鏉�(鏄ㄥぉ) "+report_7_filedCountMap.get("count")+"鏉�(鏈�杩�7澶�)
    "); sb.append("") sb.append("") - sb.append(""); - sb.append(""); - sb.append(""); - sb.append(""); - sb.append(""); + sb.append(""); + sb.append(""); + sb.append(""); + sb.append(""); + sb.append(""); sb.append("") all_fields.each { def filed = it @@ -125,9 +125,9 @@ class EvaluationFieldProcent extends BaseBatch{ sb.append(""); }else{ if(site_fields.contains(filed)){ - sb.append(""); + sb.append(""); }else{ - sb.append(""); + sb.append(""); } } @@ -135,9 +135,9 @@ class EvaluationFieldProcent extends BaseBatch{ sb.append(""); }else{ if(report_fields.contains(filed)){ - sb.append(""); + sb.append(""); }else{ - sb.append(""); + sb.append(""); } } @@ -146,9 +146,9 @@ class EvaluationFieldProcent extends BaseBatch{ sb.append(""); }else{ if(site_fields.contains(filed)){ - sb.append(""); + sb.append(""); }else{ - sb.append(""); + sb.append(""); } } @@ -157,9 +157,9 @@ class EvaluationFieldProcent extends BaseBatch{ sb.append(""); }else{ if(report_fields.contains(filed)){ - sb.append(""); + sb.append(""); }else{ - sb.append(""); + sb.append(""); } } @@ -219,7 +219,7 @@ class EvaluationFieldProcent extends BaseBatch{ } - // 对数字进行四舍五入 + // 瀵规暟瀛楄繘琛屽洓鑸嶄簲鍏� public Double round(v,scale){ BigDecimal b = new BigDecimal(Double.toString(v)); BigDecimal one = new BigDecimal("1"); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/evaluation/HouseLoudongAnalyseBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/evaluation/HouseLoudongAnalyseBatch.groovy index f0ccdd67f..c2c792f29 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/evaluation/HouseLoudongAnalyseBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/evaluation/HouseLoudongAnalyseBatch.groovy @@ -14,7 +14,7 @@ import groovy.sql.Sql import org.apache.commons.lang.StringUtils /** - * 楼栋库分析程序 + * 妤兼爧搴撳垎鏋愮▼搴� * Created by wenyan on 2015/11/2. */ @BatchOwner(Watcher.WangWenYan) @@ -26,7 +26,7 @@ public class HouseLoudongAnalyseBatch extends BaseBatch{ static Sql sql = Sql.newInstance( 'jdbc:mysql://mysql.db.fangjia.com:4306/goojia_fangjia?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull', 'root', 'Ga041242', 'com.mysql.jdbc.Driver' ) - /**房价网估价信息提取楼栋信息*/ + /**鎴夸环缃戜及浠蜂俊鎭彁鍙栨ゼ鏍嬩俊鎭�*/ public static final def RVAL_FIELDS_MAP = [ "direction":"direction", "fitment":"fitment_rank", "fitment_age":"fitment_age", "fitment_charge":"fitment_cost", "build_type":"build_type", "house_property":"house_property", "lighting_ventilation":"lighting_ventilation","worry_facility":"worry_facility", "sideset":"sideset", @@ -37,12 +37,12 @@ public class HouseLoudongAnalyseBatch extends BaseBatch{ "green_area":"green_area", "property":"property", "property_fee":"property_fee", "security":"security", "rental_rates":"rental_rates", "terrace_area":"terrace_area" ] - static final def FJT_FITMENT_CODE = [ 0:"开发商装修", 1:"毛坯", 2:"普通装修", 4:"精装修", 5:"豪华装修"] - static final def FJT_DIRECTION_CODE = [ 1:"西南" , 2:"东南", 3:"南", 4:"西北", 5:"东北", 6:"东", 7:"西", 8:"北", 9:"东西", 10:"南北"] - static final def FIT_HOURCE_PROPERT_CODE = [1:"个人产权" , 2:"集体产权" , 3:"国有产权"] - static final def FJT_SIDESET_CODE = [1: "非边套", 2: "边套不带窗", 3: "边套带窗"] - static final def FJT_NOISE_CODE = [1: "无噪音", 2: "噪音较小", 3: "噪音较大"] - static final def FJT_BUILD_TYPE_CODE = [1: "商铺", 2: "写字楼", 4: "独立别墅", 5: "双拼别墅", 6: "联排别墅", 7: "叠加别墅", 8 :"公寓"] + static final def FJT_FITMENT_CODE = [ 0:"寮�鍙戝晢瑁呬慨", 1:"姣涘澂", 2:"鏅�氳淇�", 4:"绮捐淇�", 5:"璞崕瑁呬慨"] + static final def FJT_DIRECTION_CODE = [ 1:"瑗垮崡" , 2:"涓滃崡", 3:"鍗�", 4:"瑗垮寳", 5:"涓滃寳", 6:"涓�", 7:"瑗�", 8:"鍖�", 9:"涓滆タ", 10:"鍗楀寳"] + static final def FIT_HOURCE_PROPERT_CODE = [1:"涓汉浜ф潈" , 2:"闆嗕綋浜ф潈" , 3:"鍥芥湁浜ф潈"] + static final def FJT_SIDESET_CODE = [1: "闈炶竟濂�", 2: "杈瑰涓嶅甫绐�", 3: "杈瑰甯︾獥"] + static final def FJT_NOISE_CODE = [1: "鏃犲櫔闊�", 2: "鍣煶杈冨皬", 3: "鍣煶杈冨ぇ"] + static final def FJT_BUILD_TYPE_CODE = [1: "鍟嗛摵", 2: "鍐欏瓧妤�", 4: "鐙珛鍒", 5: "鍙屾嫾鍒", 6: "鑱旀帓鍒", 7: "鍙犲姞鍒", 8 :"鍏瘬"] def static main(args){ runBatch(new HouseLoudongAnalyseBatch(), args) @@ -246,7 +246,7 @@ public class HouseLoudongAnalyseBatch extends BaseBatch{ fieldMap.each {def sf,def df -> def v = s.get(sf) - if(v != null && v != "" && v != "无" ){ + if(v != null && v != "" && v != "鏃�" ){ d.put(df,v) } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/evaluation/LoudongAnalyticsBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/evaluation/LoudongAnalyticsBatch.groovy index 02f0f131a..d5efd2596 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/evaluation/LoudongAnalyticsBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/evaluation/LoudongAnalyticsBatch.groovy @@ -86,7 +86,7 @@ class LoudongAnalyticsBatch extends BaseBatch{ def countMap = [:] for(DBObject dbo : evaluations) { Object val = dbo.get(fieldName) - if(val == null || val == "" || "无".equals(val)) { + if(val == null || val == "" || "鏃�".equals(val)) { continue; } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/evaluation/LoudongRowFlagBath.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/evaluation/LoudongRowFlagBath.groovy index c0433320e..f52d1982f 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/evaluation/LoudongRowFlagBath.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/evaluation/LoudongRowFlagBath.groovy @@ -18,7 +18,7 @@ import com.mongodb.DBCursor; import com.mongodb.DBObject import com.mongodb.QueryOperators -//给楼栋里的原始数据打标签(只作一次使用) +//缁欐ゼ鏍嬮噷鐨勫師濮嬫暟鎹墦鏍囩(鍙綔涓�娆′娇鐢�) @BatchOwner(Watcher.GaoJuan) class LoudongRowFlagBath extends BaseBatch{ @@ -33,7 +33,7 @@ class LoudongRowFlagBath extends BaseBatch{ updateFlag(); } - //为记录打标记 + //涓鸿褰曟墦鏍囪 public def updateFlag(){ DBObject q = new BasicDBObject(); @@ -43,7 +43,7 @@ class LoudongRowFlagBath extends BaseBatch{ cur.setOptions(Bytes.QUERYOPTION_NOTIMEOUT) int index = 0 def lists = []; - def names = ['汇贤居','华丽家族古北花园','新华路一号','公馆77','达安花园','盛大金磐','中粮海景壹号','中信和平家园','新梅共和城','苏堤春晓名苑','霞飞别墅','复地爱伦坡'] + def names = ['姹囪搐灞�','鍗庝附瀹舵棌鍙ゅ寳鑺卞洯','鏂板崕璺竴鍙�','鍏77','杈惧畨鑺卞洯','鐩涘ぇ閲戠','涓伯娴锋櫙澹瑰彿','涓俊鍜屽钩瀹跺洯','鏂版鍏卞拰鍩�','鑻忓牑鏄ユ檽鍚嶈嫅','闇為鍒','澶嶅湴鐖变鸡鍧�'] while(cur.hasNext()) { String districtName = dbo.get('name') if(names.contains(districtName)){ @@ -131,18 +131,18 @@ class LoudongRowFlagBath extends BaseBatch{ if (file.exists()){ file.delete(); } - file.append("区域,") - file.append("楼盘名称,") - file.append("栋号,") - file.append("室号,") - file.append("面积,") - file.append("室,") - file.append("厅,") - file.append("朝向,") - file.append("装修状况,") - file.append("装修年限,") - file.append("装修费用,") - file.append("车位情况,") + file.append("鍖哄煙,") + file.append("妤肩洏鍚嶇О,") + file.append("鏍嬪彿,") + file.append("瀹ゅ彿,") + file.append("闈㈢Н,") + file.append("瀹�,") + file.append("鍘�,") + file.append("鏈濆悜,") + file.append("瑁呬慨鐘跺喌,") + file.append("瑁呬慨骞撮檺,") + file.append("瑁呬慨璐圭敤,") + file.append("杞︿綅鎯呭喌,") file.append(System.getProperty("line.separator")); list.each{ file.append(it.region + ",","gbk") diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/exprian/ExprianDataProcess.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/exprian/ExprianDataProcess.groovy index 829c77581..40e169029 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/exprian/ExprianDataProcess.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/exprian/ExprianDataProcess.groovy @@ -33,8 +33,8 @@ import org.bson.types.ObjectId * Created by dxy on 2016/4/14. */ class ExprianDataProcess { -// public static final String ORG_FILE = "D:\\工作文档\\Exprian\\CHN_3dpGrid_2dp_v2_189Cities.txt" -// public static final String ORG_PRO_FILE = "D:\\工作文档\\Exprian\\PRO_CHN_3dpGrid_2dp_v2_189Cities.xlsx" +// public static final String ORG_FILE = "D:\\宸ヤ綔鏂囨。\\Exprian\\CHN_3dpGrid_2dp_v2_189Cities.txt" +// public static final String ORG_PRO_FILE = "D:\\宸ヤ綔鏂囨。\\Exprian\\PRO_CHN_3dpGrid_2dp_v2_189Cities.xlsx" static DBCollection STAT_COLL = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "mongo.db.fangjia.com") static DBCollection REGION_STAT_COLL = MongoUtils.getCollectionByName("fangjia", "region_stat", "mongo.db.fangjia.com") @@ -51,20 +51,20 @@ class ExprianDataProcess { static def CITY_REGION_PRICE_MAP = [:] static def cities = [ -// "上海","北京","重庆", -// "广州","深圳","天津","成都","西安","杭州","武汉","南京","沈阳","福州","贵阳","宁波","石家庄","大连","昆明","苏州", -// "长沙","太原","厦门","无锡","郑州","呼和浩特","兰州","济南","佛山","长春","青岛","东莞","合肥", -// "泉州","包头","常德","哈尔滨","乌鲁木齐", -// "烟台","南昌","大同","温州","银川","西宁","扬州","威海","邯郸","中山","秦皇岛","常州","湛江", -// "保定","吉林","绵阳","宜昌","嘉兴","镇江","芜湖","南通","泰州","洛阳","台州","赣州","大庆","徐州","株洲","鞍山","潍坊","惠州","湖州","江门","绍兴","海口","珠海","马鞍山","柳州", -// "淄博","汕头","盐城","金华","连云港", "桂林","衡阳","揭阳","茂名","平顶山","安阳","四平","漳州","上饶","宜春","德阳","东营","德州","永州", -// "娄底","荆州","商丘","长治","楚雄","凉山州","迪庆州","邵阳","荆门","西双版纳州","九江","许昌","临沂", "咸阳","唐山","三亚","沧州","黔东南", -// "岳阳","新余","蚌埠","嘉峪关","周口","益阳","郴州","漯河","鄂州","十堰","晋中","承德","宝鸡","怀化","日照","衡水","景德镇","开封","龙岩", -// "滨州","达州","内江","三明","海东","南阳","海西州","济宁","邢台","淮安","泸州","南充","临汾","自贡","安庆","廊坊","张家口","玉林","莆田", -// "北海","乌兰察布","黄山","南宁","拉萨","汉中","黄冈","河源","南平","榆林","梧州","乐山","丽水","泰安","韶关","阳江","梅州","焦作","黄石", -// "潮州","新乡","肇庆","玉溪","宿迁","衢州","广元","遵义","湘潭", -// "清远","丽江","昌吉","大理","襄阳","哈密","鄂尔多斯","赤峰","巴音郭楞" - '沧州' +// "涓婃捣","鍖椾含","閲嶅簡", +// "骞垮窞","娣卞湷","澶╂触","鎴愰兘","瑗垮畨","鏉窞","姝︽眽","鍗椾含","娌堥槼","绂忓窞","璐甸槼","瀹佹尝","鐭冲搴�","澶ц繛","鏄嗘槑","鑻忓窞", +// "闀挎矙","澶師","鍘﹂棬","鏃犻敗","閮戝窞","鍛煎拰娴╃壒","鍏板窞","娴庡崡","浣涘北","闀挎槬","闈掑矝","涓滆帪","鍚堣偉", +// "娉夊窞","鍖呭ご","甯稿痉","鍝堝皵婊�","涔岄瞾鏈ㄩ綈", +// "鐑熷彴","鍗楁槍","澶у悓","娓╁窞","閾跺窛","瑗垮畞","鎵窞","濞佹捣","閭兏","涓北","绉︾殗宀�","甯稿窞","婀涙睙", +// "淇濆畾","鍚夋灄","缁甸槼","瀹滄槍","鍢夊叴","闀囨睙","鑺滄箹","鍗楅��","娉板窞","娲涢槼","鍙板窞","璧e窞","澶у簡","寰愬窞","鏍床","闉嶅北","娼嶅潑","鎯犲窞","婀栧窞","姹熼棬","缁嶅叴","娴峰彛","鐝犳捣","椹瀺灞�","鏌冲窞", +// "娣勫崥","姹曞ご","鐩愬煄","閲戝崕","杩炰簯娓�", "妗傛灄","琛¢槼","鎻槼","鑼傚悕","骞抽《灞�","瀹夐槼","鍥涘钩","婕冲窞","涓婇ザ","瀹滄槬","寰烽槼","涓滆惀","寰峰窞","姘稿窞", +// "濞勫簳","鑽嗗窞","鍟嗕笜","闀挎不","妤氶泟","鍑夊北宸�","杩簡宸�","閭甸槼","鑽嗛棬","瑗垮弻鐗堢撼宸�","涔濇睙","璁告槍","涓存矀", "鍜搁槼","鍞愬北","涓変簹","娌у窞","榛斾笢鍗�", +// "宀抽槼","鏂颁綑","铓屽煚","鍢夊唱鍏�","鍛ㄥ彛","鐩婇槼","閮村窞","婕渤","閯傚窞","鍗佸牥","鏅嬩腑","鎵垮痉","瀹濋浮","鎬�鍖�","鏃ョ収","琛℃按","鏅痉闀�","寮�灏�","榫欏博", +// "婊ㄥ窞","杈惧窞","鍐呮睙","涓夋槑","娴蜂笢","鍗楅槼","娴疯タ宸�","娴庡畞","閭㈠彴","娣畨","娉稿窞","鍗楀厖","涓存本","鑷础","瀹夊簡","寤婂潑","寮犲鍙�","鐜夋灄","鑾嗙敯", +// "鍖楁捣","涔屽叞瀵熷竷","榛勫北","鍗楀畞","鎷夎惃","姹変腑","榛勫唸","娌虫簮","鍗楀钩","姒嗘灄","姊у窞","涔愬北","涓芥按","娉板畨","闊跺叧","闃虫睙","姊呭窞","鐒︿綔","榛勭煶", +// "娼窞","鏂颁埂","鑲囧簡","鐜夋邯","瀹胯縼","琛㈠窞","骞垮厓","閬典箟","婀樻江", +// "娓呰繙","涓芥睙","鏄屽悏","澶х悊","瑗勯槼","鍝堝瘑","閯傚皵澶氭柉","璧ゅ嘲","宸撮煶閮" + '娌у窞' ] public static void main(String[] args) { @@ -131,7 +131,7 @@ class ExprianDataProcess { } private static void processByCity(String city, boolean reCalc) { - //城市数据加载 + //鍩庡競鏁版嵁鍔犺浇 reloadData(city) DBObject q = new BasicDBObject() @@ -170,8 +170,8 @@ class ExprianDataProcess { continue } - double[] esp = com.fangjia.core.util.GeoUtils.getLatLon(lng, lat, 1000, 90) // 右侧OFFSET处的经纬度 - double[] wnp = com.fangjia.core.util.GeoUtils.getLatLon(lng, lat, 1000, 360) // 上方OFFSET处的经纬度 + double[] esp = com.fangjia.core.util.GeoUtils.getLatLon(lng, lat, 1000, 90) // 鍙充晶OFFSET澶勭殑缁忕含搴� + double[] wnp = com.fangjia.core.util.GeoUtils.getLatLon(lng, lat, 1000, 360) // 涓婃柟OFFSET澶勭殑缁忕含搴� double maxLng = esp[0] double minLng = wnp[0] @@ -202,7 +202,7 @@ class ExprianDataProcess { if(cpdbDistricts.size() > 0) { def cpdbPrices = [] for (DBObject district : cpdbDistricts) { - def price = findPricesByDistrict(district.get('city'), district.get('region'), district.get('name'), (district.get('estate_type2') && district.get('estate_type2').indexOf('别墅') > -1 ? '别墅' : '普通住宅')) + def price = findPricesByDistrict(district.get('city'), district.get('region'), district.get('name'), (district.get('estate_type2') && district.get('estate_type2').indexOf('鍒') > -1 ? '鍒' : '鏅�氫綇瀹�')) if(price) { cpdbPrices << price } @@ -218,12 +218,12 @@ class ExprianDataProcess { def cpdbNearPrice = 0; int merters = getAroundMeters(city); for (int i = 1; i <= merters; i++) { - //有小区没价格,利用周边小区进行计算 + //鏈夊皬鍖烘病浠锋牸锛屽埄鐢ㄥ懆杈瑰皬鍖鸿繘琛岃绠� cpdbNearDistricts = getNearestDistricts((maxLng + minLng) / 2.0, (maxLat + minLat) / 2.0, i * 1000 + 500) def cpdbNearPrices = [] for (DBObject district : cpdbNearDistricts) { - if(district.get('lng2') && district.get('lat2') && (district.get('estate_type2') == null || district.get('estate_type2').indexOf('别墅') == -1)) { - def price = findPricesByDistrict(district.get('city'), district.get('region'), district.get('name'), (district.get('estate_type2') && district.get('estate_type2').indexOf('别墅') > -1 ? '别墅' : '普通住宅')) + if(district.get('lng2') && district.get('lat2') && (district.get('estate_type2') == null || district.get('estate_type2').indexOf('鍒') == -1)) { + def price = findPricesByDistrict(district.get('city'), district.get('region'), district.get('name'), (district.get('estate_type2') && district.get('estate_type2').indexOf('鍒') > -1 ? '鍒' : '鏅�氫綇瀹�')) if(price) { cpdbNearPrices << price } @@ -242,7 +242,7 @@ class ExprianDataProcess { udata.put('cpdb_near_price', uniqueRandomValue(seqId, cpdbNearPrice)) } - //周边1公里无法计算出价格,则使用城市或区域价格 + //鍛ㄨ竟1鍏噷鏃犳硶璁$畻鍑轰环鏍硷紝鍒欎娇鐢ㄥ煄甯傛垨鍖哄煙浠锋牸 if(cpdbNearDistricts && cpdbNearPrice > 0) { ExprianUtil.DATA_COLL.update(idQuery, new BasicDBObject('$set', udata), false, true) }else { @@ -262,7 +262,7 @@ class ExprianDataProcess { udata.put("map_price", mapPrice) } - //说明这个格子中有小区存在 + //璇存槑杩欎釜鏍煎瓙涓湁灏忓尯瀛樺湪 if(mapDistricts) { if(mapPrice > 0) { ExprianUtil.DATA_COLL.update(idQuery, new BasicDBObject('$set', udata), false, true) @@ -270,12 +270,12 @@ class ExprianDataProcess { def cpdbNearPrice = 0 int merters = getAroundMeters(city); for(int i=1; i <= merters; i++) { - //利用最远周边5公里的小区进行计算 + //鍒╃敤鏈�杩滃懆杈�5鍏噷鐨勫皬鍖鸿繘琛岃绠� def cpdbNearDistricts = getNearestDistricts((maxLng + minLng) / 2.0, (maxLat + minLat) / 2.0, i*1000 + 500) def cpdbNearPrices = [] for (DBObject district : cpdbNearDistricts) { - if (district.get('lng2') && district.get('lat2') && (district.get('estate_type2') == null || district.get('estate_type2').indexOf('别墅') == -1)) { - def price = findPricesByDistrict(district.get('city'), district.get('region'), district.get('name'), (district.get('estate_type2') && district.get('estate_type2').indexOf('别墅') > -1 ? '别墅' : '普通住宅')) + if (district.get('lng2') && district.get('lat2') && (district.get('estate_type2') == null || district.get('estate_type2').indexOf('鍒') == -1)) { + def price = findPricesByDistrict(district.get('city'), district.get('region'), district.get('name'), (district.get('estate_type2') && district.get('estate_type2').indexOf('鍒') > -1 ? '鍒' : '鏅�氫綇瀹�')) if (price) { cpdbNearPrices << uniqueRandomValue(seqId, price) } @@ -291,7 +291,7 @@ class ExprianDataProcess { } } - //CPDB周边5公里没有小区,使用地图库最远周边5公里的数据 + //CPDB鍛ㄨ竟5鍏噷娌℃湁灏忓尯,浣跨敤鍦板浘搴撴渶杩滃懆杈�5鍏噷鐨勬暟鎹� def mapNearPrice = 0; if(cpdbNearPrice == 0) { for (int i = 1; i <= 5; i++) { @@ -374,8 +374,8 @@ class ExprianDataProcess { } def static STANDERD_CITY = [ - "海西蒙古族藏族自治州" : '海西州', - "巴音郭楞蒙古自治州" : "巴音郭楞", + "娴疯タ钂欏彜鏃忚棌鏃忚嚜娌诲窞" : '娴疯タ宸�', + "宸撮煶閮钂欏彜鑷不宸�" : "宸撮煶閮", ] private static String convertStanderdCity(String city) { @@ -501,7 +501,7 @@ class ExprianDataProcess { statq.put("city", realCity) statq.put("region", region) statq.put("district_name", name) - statq.put("estate_type", cpdbobj.get('estate_type2') && cpdbobj.get('estate_type2').indexOf('别墅') > -1 ? '别墅' : '小区') + statq.put("estate_type", cpdbobj.get('estate_type2') && cpdbobj.get('estate_type2').indexOf('鍒') > -1 ? '鍒' : '灏忓尯') statq.put("weekend", WEEKEND) DBObject statObj = STAT_COLL.findOne(statq) if(statObj) { @@ -536,7 +536,7 @@ class ExprianDataProcess { return null; } - def static tagkeys = ["小区", "住宅", "楼盘", "村庄"] as String[]; + def static tagkeys = ["灏忓尯", "浣忓畢", "妤肩洏", "鏉戝簞"] as String[]; private static List findInmapDistricts(double minLng, double maxLng, double minLat, double maxLat) throws UnknownHostException { DBObject q = new BasicDBObject(); q.put("lng", new BasicDBObject('$gte', minLng).append('$lte', maxLng)); @@ -557,7 +557,7 @@ class ExprianDataProcess { if(StringUtils.isNotBlank(tag) && dbo.get("cla") != null && dbo.get("cla")) { boolean f1 = false; boolean f2 = false; - if (tag != null && tag.indexOf("住宅") > -1) { + if (tag != null && tag.indexOf("浣忓畢") > -1) { f1 = true } @@ -575,7 +575,7 @@ class ExprianDataProcess { ret.add(dbo); } }else { - if (tag != null && tag.indexOf("住宅") > -1) { + if (tag != null && tag.indexOf("浣忓畢") > -1) { ret.add(dbo); } else { if (dbo.get("cla") != null && dbo.get("cla") instanceof List) { @@ -645,7 +645,7 @@ class ExprianDataProcess { Set regionsList = new LinkedHashSet(); regionsList.add(inputRegion); - //只有进行区域区分,才可以使用区域别名 + //鍙湁杩涜鍖哄煙鍖哄垎锛屾墠鍙互浣跨敤鍖哄煙鍒悕 List regionAlias = RegionData.getRegionAlias(inputCity, inputRegion) if (regionAlias) { regionsList.addAll(regionAlias) @@ -713,7 +713,7 @@ class ExprianDataProcess { /** - * 获取周边10公里内的所有小区 + * 鑾峰彇鍛ㄨ竟10鍏噷鍐呯殑鎵�鏈夊皬鍖� * * @param lng * @param lat @@ -767,7 +767,7 @@ class ExprianDataProcess { DBCursor cur = STAT_COLL.find(new BasicDBObject('city', city).append('weekend', WEEKEND)).addOption(Bytes.QUERYOPTION_NOTIMEOUT) while(cur.hasNext()) { DBObject dbo = cur.next() - String key = dbo.get('city') + "-" + dbo.get('region') + '-' + dbo.get('district_name') + '-' + (dbo.get('estate_type') && dbo.get('estate_type').indexOf('别墅') > -1 ? '别墅' : '普通住宅'); + String key = dbo.get('city') + "-" + dbo.get('region') + '-' + dbo.get('district_name') + '-' + (dbo.get('estate_type') && dbo.get('estate_type').indexOf('鍒') > -1 ? '鍒' : '鏅�氫綇瀹�'); ret.put(key, dbo.get('avg_price')) } @@ -830,8 +830,8 @@ class ExprianDataProcess { return city } - if(city.endsWith('市')) { - city = StringUtils.substringBeforeLast(city, "市") + if(city.endsWith('甯�')) { + city = StringUtils.substringBeforeLast(city, "甯�") if(cities.contains(city)) { return city } @@ -857,13 +857,13 @@ class ExprianDataProcess { } } - /**推测真正的正式名*/ + /**鎺ㄦ祴鐪熸鐨勬寮忓悕*/ static String speculateCityNameByRegion(String province, String orgName){ List foundCityList = new ArrayList(); - /**根据区域推测所在的城市*/ + /**鏍规嵁鍖哄煙鎺ㄦ祴鎵�鍦ㄧ殑鍩庡競*/ String temp; for(Map.Entry> entry : CITY_REGION_MAP.entrySet()){ - temp = orgName.replaceFirst("^" + entry.getKey(),"");//排除无"市"标示的城市信息干扰 如:北京海定区 + temp = orgName.replaceFirst("^" + entry.getKey(),"");//鎺掗櫎鏃�"甯�"鏍囩ず鐨勫煄甯備俊鎭共鎵� 濡傦細鍖椾含娴峰畾鍖� if(entry.getValue().contains(temp)){ if(province == null){ foundCityList.add(entry.getKey()); @@ -903,379 +903,379 @@ class ExprianDataProcess { } def static CITY_CODES = [ - '100':'拉萨', - '101':'那曲', - '103':'阿里地区', - '104':'昆明', - '106':'玉溪', - '108':'普洱', - '110':'临沧', - '112':'保山', - '114':'丽江', - '117':'张掖', - '118':'武威', - '119':'东莞', - '121':'三亚', - '122':'鄂州', - '123':'乌海', - '124':'莱芜', - '125':'海口', - '126':'蚌埠', - '127':'合肥', - '128':'阜阳', - '129':'芜湖', - '130':'安庆', - '131':'北京', - '132':'重庆', - '133':'南平', - '134':'泉州', - '135':'庆阳', - '136':'定西', - '137':'韶关', - '138':'佛山', - '139':'茂名', - '140':'珠海', - '141':'梅州', - '142':'桂林', - '143':'河池', - '144':'崇左', - '145':'钦州', - '146':'贵阳', - '147':'六盘水', - '148':'秦皇岛', - '149':'沧州', - '150':'石家庄', - '151':'邯郸', - '152':'新乡', - '153':'洛阳', - '154':'商丘', - '155':'许昌', - '157':'荆州', - '158':'长沙', - '159':'衡阳', - '160':'镇江', - '161':'南通', - '162':'淮安', - '163':'南昌', - '164':'新余', - '165':'通化', - '166':'锦州', - '167':'大连', - '168':'乌兰察布', - '169':'巴彦淖尔', - '170':'渭南', - '171':'宝鸡', - '172':'枣庄', - '173':'日照', - '174':'东营', - '175':'威海', - '176':'太原', - '178':'温州', - '179':'杭州', - '180':'宁波', - '181':'中卫', - '183':'辽源', - '184':'抚顺', - '186':'宜宾', - '187':'中山', - '188':'亳州', - '189':'滁州', - '190':'宣城', - '191':'廊坊', - '192':'宁德', - '193':'龙岩', - '194':'厦门', - '195':'莆田', - '196':'天水', - '197':'清远', - '198':'湛江', - '199':'阳江', - '200':'河源', - '201':'潮州', - '202':'来宾', - '203':'百色', - '204':'防城港', - '2551.0':'铜仁', - '206':'毕节', - '207':'承德', - '208':'衡水', - '209':'濮阳', - '210':'开封', - '211':'焦作', - '212':'三门峡', - '213':'平顶山', - '214':'信阳', - '215':'鹤壁', - '216':'十堰', - '217':'荆门', - '218':'武汉', - '219':'常德', - '220':'岳阳', - '221':'娄底', - '222':'株洲', - '223':'盐城', - '224':'苏州', - '225':'景德镇', - '226':'抚州', - '227':'本溪', - '228':'盘锦', - '229':'包头', - '230':'阿拉善盟', - '231':'榆林', - '232':'铜川', - '233':'西安', - '234':'临沂', - '235':'滨州', - '236':'青岛', - '237':'朔州', - '238':'晋中', - '239':'巴中', - '240':'绵阳', - '241':'广安', - '242':'资阳', - '243':'衢州', - '244':'台州', - '245':'舟山', - '246':'固原', - '248':'内江', - '249':'曲靖', - '250':'淮南', - '251':'巢湖', - '252':'黄山', - '253':'淮北', - '254':'三明', - '255':'漳州', - '256':'陇南', - '257':'广州', - '258':'云浮', - '259':'揭阳', - '260':'贺州', - '261':'南宁', - '262':'遵义', - '263':'安顺', - '264':'张家口', - '265':'唐山', - '266':'邢台', - '267':'安阳', - '268':'郑州', - '269':'驻马店', - '270':'宜昌', - '271':'黄冈', - '272':'益阳', - '273':'邵阳', - '275':'郴州', - '276':'泰州', - '277':'宿迁', - '278':'宜春', - '279':'鹰潭', - '280':'朝阳', - '281':'营口', - '282':'丹东', - '283':'鄂尔多斯', - '284':'延安', - '285':'商洛', - '286':'济宁', - '287':'潍坊', - '288':'济南', - '289':'上海', - '290':'晋城', - '291':'南充', - '292':'丽水', - '293':'绍兴', - '294':'湖州', - '295':'北海', - '297':'赤峰', - '298':'六安', - '299':'池州', - '300':'福州', - '301':'惠州', - '302':'江门', - '303':'汕头', - '304':'梧州', - '305':'柳州', - '307':'保定', - '308':'周口', - '309':'南阳', - '310':'孝感', - '311':'黄石', - '312':'张家界', - '313':'湘潭', - '314':'永州', - '315':'南京', - '316':'徐州', - '317':'无锡', - '318':'吉安', - '319':'葫芦岛', - '320':'鞍山', - '321':'呼和浩特', - '322':'吴忠', - '323':'咸阳', - '324':'安康', - '325':'泰安', - '326':'烟台', - '327':'吕梁', - '328':'运城', - '329':'广元', - '330':'遂宁', - '331':'泸州', - '332':'天津', - '333':'金华', - '334':'嘉兴', - '335':'石嘴山', - '336':'昭通', - '337':'铜陵', - '338':'肇庆', - '339':'汕尾', - '33':'嘉峪关', - '340':'深圳', - '341':'贵港', - '344':'漯河', - '346':'扬州', - '347':'连云港', - '348':'常州', - '349':'九江', - '34':'金昌', - '350':'萍乡', - '351':'辽阳', - '352':'汉中', - '353':'菏泽', - '354':'淄博', - '355':'大同', - '356':'长治', - '357':'阳泉', - '358':'马鞍山', - '359':'平凉', - '35':'白银', - '360':'银川', - '361':'玉林', - '362':'咸宁', - '363':'怀化', - '364':'上饶', - '365':'赣州', - '366':'聊城', - '367':'忻州', - '368':'临汾', - '369':'达州', - '36':'兰州', - '370':'宿州', - '371':'随州', - '372':'德州', - '37':'酒泉', - '38':'大兴安岭', - '39':'黑河', - '40':'伊春', - '41':'齐齐哈尔', - '42':'佳木斯', - '43':'鹤岗', - '44':'绥化', - '45':'双鸭山', - '46':'鸡西', - '47':'七台河', - '48':'哈尔滨', - '49':'牡丹江', - '50':'大庆', - '51':'白城', - '52':'松原', - '53':'长春', - '56':'四平', - '57':'白山', - '58':'沈阳', - '59':'阜新', - '60':'铁岭', - '61':'呼伦贝尔', - '62':'兴安盟', - '63':'锡林郭勒盟', - '64':'通辽', - '66':'西宁', - '69':'海东', - '74':'德阳', - '75':'成都', - '76':'雅安', - '77':'眉山', - '78':'自贡', - '79':'乐山', - '81':'攀枝花', - '82':'和田', - '83':'喀什', - '85':'阿克苏', - '89':'吐鲁番', - '91':'哈密', - '92':'乌鲁木齐', - '94':'塔城', - '95':'克拉玛依', - '96':'阿勒泰', - '97':'山南地区', - '98':'林芝地区', - '55':'吉林', - '54':'延边', - '111.0':'大理', - '147':'六盘水', - '107':'红河', - '80':'凉山州', - '80':'凉山州', - '110':'临沧', - '105':'楚雄', - '93':'昌吉', - '373':'恩施', - '70':'黄南州', - '90':'伊犁', - '1':'全国', - '65':'海西州', - '109':'西双版纳州', - '86':'巴音郭楞', - '115':'迪庆州', - '342':'黔东南', - '342':'黔东南', - '62':'兴安盟', - '62':'兴安盟', - '63':'锡林郭勒盟', - '230':'阿拉善盟', - '274':'湘西', - '185':'阿坝州', - '73':'甘孜州', - '343':'黔西南', - '306':'黔南', - '177':'文山州', - '116':'德宏州', - '113':'怒江州', - '99':'昌都', - '97':'山南', - '102':'日喀则', - '103':'阿里', - '98':'林芝', - '182':'临夏', - '247':'甘南', - '67':'海北州', - '68':'海南州', - '72':'果洛州', - '71':'玉树州', - '88':'博尔塔拉', - '84':'克孜勒苏', - '770':'石河子', - '731':'阿拉尔', - '792':'图木舒克', - '789':'五家渠', - '1277':'济源', - '1713':'仙桃', - '1293':'潜江', - '2654':'天门', - '2734':'神农架', - '1644':'五指山', - '2358':'琼海', - '1215':'儋州', - '2758':'文昌', - '1216':'万宁', - '2634':'东方', - '1214':'定安', - '1641':'屯昌', - '2757':'澄迈', - '2033':'临高', - '2359':'白沙', - '1642':'昌江', - '2032':'乐东', - '1643':'陵水', - '1217':'保亭', - '2031':'琼中', - '21':'三沙' + '100':'鎷夎惃', + '101':'閭f洸', + '103':'闃块噷鍦板尯', + '104':'鏄嗘槑', + '106':'鐜夋邯', + '108':'鏅幢', + '110':'涓存钵', + '112':'淇濆北', + '114':'涓芥睙', + '117':'寮犳帠', + '118':'姝﹀▉', + '119':'涓滆帪', + '121':'涓変簹', + '122':'閯傚窞', + '123':'涔屾捣', + '124':'鑾辫姕', + '125':'娴峰彛', + '126':'铓屽煚', + '127':'鍚堣偉', + '128':'闃滈槼', + '129':'鑺滄箹', + '130':'瀹夊簡', + '131':'鍖椾含', + '132':'閲嶅簡', + '133':'鍗楀钩', + '134':'娉夊窞', + '135':'搴嗛槼', + '136':'瀹氳タ', + '137':'闊跺叧', + '138':'浣涘北', + '139':'鑼傚悕', + '140':'鐝犳捣', + '141':'姊呭窞', + '142':'妗傛灄', + '143':'娌虫睜', + '144':'宕囧乏', + '145':'閽﹀窞', + '146':'璐甸槼', + '147':'鍏洏姘�', + '148':'绉︾殗宀�', + '149':'娌у窞', + '150':'鐭冲搴�', + '151':'閭兏', + '152':'鏂颁埂', + '153':'娲涢槼', + '154':'鍟嗕笜', + '155':'璁告槍', + '157':'鑽嗗窞', + '158':'闀挎矙', + '159':'琛¢槼', + '160':'闀囨睙', + '161':'鍗楅��', + '162':'娣畨', + '163':'鍗楁槍', + '164':'鏂颁綑', + '165':'閫氬寲', + '166':'閿﹀窞', + '167':'澶ц繛', + '168':'涔屽叞瀵熷竷', + '169':'宸村溅娣栧皵', + '170':'娓崡', + '171':'瀹濋浮', + '172':'鏋e簞', + '173':'鏃ョ収', + '174':'涓滆惀', + '175':'濞佹捣', + '176':'澶師', + '178':'娓╁窞', + '179':'鏉窞', + '180':'瀹佹尝', + '181':'涓崼', + '183':'杈芥簮', + '184':'鎶氶『', + '186':'瀹滃', + '187':'涓北', + '188':'浜冲窞', + '189':'婊佸窞', + '190':'瀹e煄', + '191':'寤婂潑', + '192':'瀹佸痉', + '193':'榫欏博', + '194':'鍘﹂棬', + '195':'鑾嗙敯', + '196':'澶╂按', + '197':'娓呰繙', + '198':'婀涙睙', + '199':'闃虫睙', + '200':'娌虫簮', + '201':'娼窞', + '202':'鏉ュ', + '203':'鐧捐壊', + '204':'闃插煄娓�', + '2551.0':'閾滀粊', + '206':'姣曡妭', + '207':'鎵垮痉', + '208':'琛℃按', + '209':'婵槼', + '210':'寮�灏�', + '211':'鐒︿綔', + '212':'涓夐棬宄�', + '213':'骞抽《灞�', + '214':'淇¢槼', + '215':'楣ゅ', + '216':'鍗佸牥', + '217':'鑽嗛棬', + '218':'姝︽眽', + '219':'甯稿痉', + '220':'宀抽槼', + '221':'濞勫簳', + '222':'鏍床', + '223':'鐩愬煄', + '224':'鑻忓窞', + '225':'鏅痉闀�', + '226':'鎶氬窞', + '227':'鏈邯', + '228':'鐩橀敠', + '229':'鍖呭ご', + '230':'闃挎媺鍠勭洘', + '231':'姒嗘灄', + '232':'閾滃窛', + '233':'瑗垮畨', + '234':'涓存矀', + '235':'婊ㄥ窞', + '236':'闈掑矝', + '237':'鏈斿窞', + '238':'鏅嬩腑', + '239':'宸翠腑', + '240':'缁甸槼', + '241':'骞垮畨', + '242':'璧勯槼', + '243':'琛㈠窞', + '244':'鍙板窞', + '245':'鑸熷北', + '246':'鍥哄師', + '248':'鍐呮睙', + '249':'鏇查潠', + '250':'娣崡', + '251':'宸㈡箹', + '252':'榛勫北', + '253':'娣寳', + '254':'涓夋槑', + '255':'婕冲窞', + '256':'闄囧崡', + '257':'骞垮窞', + '258':'浜戞诞', + '259':'鎻槼', + '260':'璐哄窞', + '261':'鍗楀畞', + '262':'閬典箟', + '263':'瀹夐『', + '264':'寮犲鍙�', + '265':'鍞愬北', + '266':'閭㈠彴', + '267':'瀹夐槼', + '268':'閮戝窞', + '269':'椹婚┈搴�', + '270':'瀹滄槍', + '271':'榛勫唸', + '272':'鐩婇槼', + '273':'閭甸槼', + '275':'閮村窞', + '276':'娉板窞', + '277':'瀹胯縼', + '278':'瀹滄槬', + '279':'楣版江', + '280':'鏈濋槼', + '281':'钀ュ彛', + '282':'涓逛笢', + '283':'閯傚皵澶氭柉', + '284':'寤跺畨', + '285':'鍟嗘礇', + '286':'娴庡畞', + '287':'娼嶅潑', + '288':'娴庡崡', + '289':'涓婃捣', + '290':'鏅嬪煄', + '291':'鍗楀厖', + '292':'涓芥按', + '293':'缁嶅叴', + '294':'婀栧窞', + '295':'鍖楁捣', + '297':'璧ゅ嘲', + '298':'鍏畨', + '299':'姹犲窞', + '300':'绂忓窞', + '301':'鎯犲窞', + '302':'姹熼棬', + '303':'姹曞ご', + '304':'姊у窞', + '305':'鏌冲窞', + '307':'淇濆畾', + '308':'鍛ㄥ彛', + '309':'鍗楅槼', + '310':'瀛濇劅', + '311':'榛勭煶', + '312':'寮犲鐣�', + '313':'婀樻江', + '314':'姘稿窞', + '315':'鍗椾含', + '316':'寰愬窞', + '317':'鏃犻敗', + '318':'鍚夊畨', + '319':'钁姦宀�', + '320':'闉嶅北', + '321':'鍛煎拰娴╃壒', + '322':'鍚村繝', + '323':'鍜搁槼', + '324':'瀹夊悍', + '325':'娉板畨', + '326':'鐑熷彴', + '327':'鍚曟', + '328':'杩愬煄', + '329':'骞垮厓', + '330':'閬傚畞', + '331':'娉稿窞', + '332':'澶╂触', + '333':'閲戝崕', + '334':'鍢夊叴', + '335':'鐭冲槾灞�', + '336':'鏄��', + '337':'閾滈櫟', + '338':'鑲囧簡', + '339':'姹曞熬', + '33':'鍢夊唱鍏�', + '340':'娣卞湷', + '341':'璐垫腐', + '344':'婕渤', + '346':'鎵窞', + '347':'杩炰簯娓�', + '348':'甯稿窞', + '349':'涔濇睙', + '34':'閲戞槍', + '350':'钀嶄埂', + '351':'杈介槼', + '352':'姹変腑', + '353':'鑿忔辰', + '354':'娣勫崥', + '355':'澶у悓', + '356':'闀挎不', + '357':'闃虫硥', + '358':'椹瀺灞�', + '359':'骞冲噳', + '35':'鐧介摱', + '360':'閾跺窛', + '361':'鐜夋灄', + '362':'鍜稿畞', + '363':'鎬�鍖�', + '364':'涓婇ザ', + '365':'璧e窞', + '366':'鑱婂煄', + '367':'蹇诲窞', + '368':'涓存本', + '369':'杈惧窞', + '36':'鍏板窞', + '370':'瀹垮窞', + '371':'闅忓窞', + '372':'寰峰窞', + '37':'閰掓硥', + '38':'澶у叴瀹夊箔', + '39':'榛戞渤', + '40':'浼婃槬', + '41':'榻愰綈鍝堝皵', + '42':'浣虫湪鏂�', + '43':'楣ゅ矖', + '44':'缁ュ寲', + '45':'鍙岄腑灞�', + '46':'楦¤タ', + '47':'涓冨彴娌�', + '48':'鍝堝皵婊�', + '49':'鐗′腹姹�', + '50':'澶у簡', + '51':'鐧藉煄', + '52':'鏉惧師', + '53':'闀挎槬', + '56':'鍥涘钩', + '57':'鐧藉北', + '58':'娌堥槼', + '59':'闃滄柊', + '60':'閾佸箔', + '61':'鍛间鸡璐濆皵', + '62':'鍏村畨鐩�', + '63':'閿℃灄閮嫆鐩�', + '64':'閫氳窘', + '66':'瑗垮畞', + '69':'娴蜂笢', + '74':'寰烽槼', + '75':'鎴愰兘', + '76':'闆呭畨', + '77':'鐪夊北', + '78':'鑷础', + '79':'涔愬北', + '81':'鏀�鏋濊姳', + '82':'鍜岀敯', + '83':'鍠�浠�', + '85':'闃垮厠鑻�', + '89':'鍚愰瞾鐣�', + '91':'鍝堝瘑', + '92':'涔岄瞾鏈ㄩ綈', + '94':'濉斿煄', + '95':'鍏嬫媺鐜涗緷', + '96':'闃垮嫆娉�', + '97':'灞卞崡鍦板尯', + '98':'鏋楄姖鍦板尯', + '55':'鍚夋灄', + '54':'寤惰竟', + '111.0':'澶х悊', + '147':'鍏洏姘�', + '107':'绾㈡渤', + '80':'鍑夊北宸�', + '80':'鍑夊北宸�', + '110':'涓存钵', + '105':'妤氶泟', + '93':'鏄屽悏', + '373':'鎭╂柦', + '70':'榛勫崡宸�', + '90':'浼婄妬', + '1':'鍏ㄥ浗', + '65':'娴疯タ宸�', + '109':'瑗垮弻鐗堢撼宸�', + '86':'宸撮煶閮', + '115':'杩簡宸�', + '342':'榛斾笢鍗�', + '342':'榛斾笢鍗�', + '62':'鍏村畨鐩�', + '62':'鍏村畨鐩�', + '63':'閿℃灄閮嫆鐩�', + '230':'闃挎媺鍠勭洘', + '274':'婀樿タ', + '185':'闃垮潩宸�', + '73':'鐢樺瓬宸�', + '343':'榛旇タ鍗�', + '306':'榛斿崡', + '177':'鏂囧北宸�', + '116':'寰峰畯宸�', + '113':'鎬掓睙宸�', + '99':'鏄岄兘', + '97':'灞卞崡', + '102':'鏃ュ杸鍒�', + '103':'闃块噷', + '98':'鏋楄姖', + '182':'涓村', + '247':'鐢樺崡', + '67':'娴峰寳宸�', + '68':'娴峰崡宸�', + '72':'鏋滄礇宸�', + '71':'鐜夋爲宸�', + '88':'鍗氬皵濉旀媺', + '84':'鍏嬪瓬鍕掕嫃', + '770':'鐭虫渤瀛�', + '731':'闃挎媺灏�', + '792':'鍥炬湪鑸掑厠', + '789':'浜斿娓�', + '1277':'娴庢簮', + '1713':'浠欐', + '1293':'娼滄睙', + '2654':'澶╅棬', + '2734':'绁炲啘鏋�', + '1644':'浜旀寚灞�', + '2358':'鐞兼捣', + '1215':'鍎嬪窞', + '2758':'鏂囨槍', + '1216':'涓囧畞', + '2634':'涓滄柟', + '1214':'瀹氬畨', + '1641':'灞槍', + '2757':'婢勮繄', + '2033':'涓撮珮', + '2359':'鐧芥矙', + '1642':'鏄屾睙', + '2032':'涔愪笢', + '1643':'闄垫按', + '1217':'淇濅涵', + '2031':'鐞间腑', + '21':'涓夋矙' ] } \ No newline at end of file diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/exprian/ExprianUtil.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/exprian/ExprianUtil.groovy index 24bb29bf6..750e5053f 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/exprian/ExprianUtil.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/exprian/ExprianUtil.groovy @@ -10,18 +10,18 @@ import com.mongodb.DBCollection class ExprianUtil { static DBCollection DATA_COLL = MongoUtils.getCollectionByName("fangjia_tmp", "exprian_data2", "192.168.0.61") static def CITIES = [ -// "重庆","北京", - "上海", -// "广州","深圳", -// "天津","成都","杭州","武汉","南京","西安","沈阳","福州","贵阳","宁波","石家庄","大连","昆明","苏州","长沙","太原","厦门","无锡","郑州","呼和浩特","兰州","哈尔滨", -// "济南","佛山","长春","青岛","东莞","合肥","乌鲁木齐","烟台","南昌","泉州","包头","常德","大同","温州","银川","西宁","扬州","绵阳","威海","吉林", -// "邯郸","中山","湛江","潍坊","保定","秦皇岛","常州","宜昌","鞍山", -// "嘉兴","大庆","徐州","株洲","镇江","赣州","芜湖","南通","九江", "泰州","洛阳", -// "台州","惠州","湖州","江门","绍兴","海口","珠海","金华","连云港","桂林","马鞍山","柳州","淄博","盐城","汕头","衡阳","揭阳","茂名","平顶山", -// "安阳","岳阳","许昌","四平","淮安","赤峰","南阳","临沂","临汾","榆林","咸阳","唐山","三亚", -// "自贡","廊坊","南宁","襄阳","丽江","大理","湘潭","清远","衢州","宿迁","北海","莆田","玉林","玉溪","肇庆","新乡","潮州","黄石","焦作","梅州","阳江","韶关","河源","哈密","昌吉", -// "巴音郭楞","遵义","泰安","黄冈","广元","丽水","乐山","汉中","黄山","鄂尔多斯","梧州","安庆","拉萨","南充","泸州","开封","景德镇","南平","海东","张家口","衡水","邢台","济宁","日照", -// "滨州","三明","龙岩","乌兰察布","内江","达州","怀化","鄂州","十堰","漯河","郴州","晋中","益阳","宝鸡","承德","新余","周口","蚌埠","嘉峪关","漳州","上饶","沧州", -// "宜春","德阳","东营","德州","永州","娄底","荆州","商丘","长治","楚雄","黔东南","海西州","凉山州","迪庆州","邵阳","荆门","西双版纳州" +// "閲嶅簡","鍖椾含", + "涓婃捣", +// "骞垮窞","娣卞湷", +// "澶╂触","鎴愰兘","鏉窞","姝︽眽","鍗椾含","瑗垮畨","娌堥槼","绂忓窞","璐甸槼","瀹佹尝","鐭冲搴�","澶ц繛","鏄嗘槑","鑻忓窞","闀挎矙","澶師","鍘﹂棬","鏃犻敗","閮戝窞","鍛煎拰娴╃壒","鍏板窞","鍝堝皵婊�", +// "娴庡崡","浣涘北","闀挎槬","闈掑矝","涓滆帪","鍚堣偉","涔岄瞾鏈ㄩ綈","鐑熷彴","鍗楁槍","娉夊窞","鍖呭ご","甯稿痉","澶у悓","娓╁窞","閾跺窛","瑗垮畞","鎵窞","缁甸槼","濞佹捣","鍚夋灄", +// "閭兏","涓北","婀涙睙","娼嶅潑","淇濆畾","绉︾殗宀�","甯稿窞","瀹滄槍","闉嶅北", +// "鍢夊叴","澶у簡","寰愬窞","鏍床","闀囨睙","璧e窞","鑺滄箹","鍗楅��","涔濇睙", "娉板窞","娲涢槼", +// "鍙板窞","鎯犲窞","婀栧窞","姹熼棬","缁嶅叴","娴峰彛","鐝犳捣","閲戝崕","杩炰簯娓�","妗傛灄","椹瀺灞�","鏌冲窞","娣勫崥","鐩愬煄","姹曞ご","琛¢槼","鎻槼","鑼傚悕","骞抽《灞�", +// "瀹夐槼","宀抽槼","璁告槍","鍥涘钩","娣畨","璧ゅ嘲","鍗楅槼","涓存矀","涓存本","姒嗘灄","鍜搁槼","鍞愬北","涓変簹", +// "鑷础","寤婂潑","鍗楀畞","瑗勯槼","涓芥睙","澶х悊","婀樻江","娓呰繙","琛㈠窞","瀹胯縼","鍖楁捣","鑾嗙敯","鐜夋灄","鐜夋邯","鑲囧簡","鏂颁埂","娼窞","榛勭煶","鐒︿綔","姊呭窞","闃虫睙","闊跺叧","娌虫簮","鍝堝瘑","鏄屽悏", +// "宸撮煶閮","閬典箟","娉板畨","榛勫唸","骞垮厓","涓芥按","涔愬北","姹変腑","榛勫北","閯傚皵澶氭柉","姊у窞","瀹夊簡","鎷夎惃","鍗楀厖","娉稿窞","寮�灏�","鏅痉闀�","鍗楀钩","娴蜂笢","寮犲鍙�","琛℃按","閭㈠彴","娴庡畞","鏃ョ収", +// "婊ㄥ窞","涓夋槑","榫欏博","涔屽叞瀵熷竷","鍐呮睙","杈惧窞","鎬�鍖�","閯傚窞","鍗佸牥","婕渤","閮村窞","鏅嬩腑","鐩婇槼","瀹濋浮","鎵垮痉","鏂颁綑","鍛ㄥ彛","铓屽煚","鍢夊唱鍏�","婕冲窞","涓婇ザ","娌у窞", +// "瀹滄槬","寰烽槼","涓滆惀","寰峰窞","姘稿窞","濞勫簳","鑽嗗窞","鍟嗕笜","闀挎不","妤氶泟","榛斾笢鍗�","娴疯タ宸�","鍑夊北宸�","杩簡宸�","閭甸槼","鑽嗛棬","瑗垮弻鐗堢撼宸�" ] } \ No newline at end of file diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/exprian/LngLatConvertorBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/exprian/LngLatConvertorBatch.groovy index dc63a2da1..e23d081e4 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/exprian/LngLatConvertorBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/exprian/LngLatConvertorBatch.groovy @@ -41,7 +41,7 @@ class LngLatConvertorBatch { double lat = dbo.get('Grid_SW_Lat_WGS84').toDouble() double lng = dbo.get('Grid_SW_Lon_WGS84').toDouble() - //是否需要重新转换经纬度 + //鏄惁闇�瑕侀噸鏂拌浆鎹㈢粡绾害 if(reConvertor) { latlngs << [_id: dbo.get('_id'), lnglat: lng + "," + lat] cc++ @@ -55,7 +55,7 @@ class LngLatConvertorBatch { } } - println city + "\t共:" + c + ", 转换:" + cc + ", 忽略:" + nc + "\t" + DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) + println city + "\t鍏�:" + c + ", 杞崲:" + cc + ", 蹇界暐:" + nc + "\t" + DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) //http://api.map.baidu.com/geoconv/v1/? int t = 0 @@ -69,7 +69,7 @@ class LngLatConvertorBatch { def url = "${BAIDU_API}?coords=${StringUtils.join(geolist, ";")}&ak=15ded8e02adb9107cc7855bba0d772d4&from=1&to=5&output=json" def results = invokeHttp(url, [:], "UTF-8") if(!results) { - println city + "\t出错\t" + DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) + println city + "\t鍑洪敊\t" + DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) sleep(60 * 1000) continue // System.exit(0) @@ -95,8 +95,8 @@ class LngLatConvertorBatch { def lat = point.getDouble('y') - double[] esp = com.fangjia.core.util.GeoUtils.getLatLon(lng, lat, 1000, 90) // 右侧OFFSET处的经纬度 - double[] wnp = com.fangjia.core.util.GeoUtils.getLatLon(lng, lat, 1000, 360) // 上方OFFSET处的经纬度 + double[] esp = com.fangjia.core.util.GeoUtils.getLatLon(lng, lat, 1000, 90) // 鍙充晶OFFSET澶勭殑缁忕含搴� + double[] wnp = com.fangjia.core.util.GeoUtils.getLatLon(lng, lat, 1000, 360) // 涓婃柟OFFSET澶勭殑缁忕含搴� double maxLng = esp[0] double minLng = wnp[0] @@ -107,7 +107,7 @@ class LngLatConvertorBatch { } // println "\t" + t } -// println city + "\t完成" +// println city + "\t瀹屾垚" } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/exprian/ProcessExcelData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/exprian/ProcessExcelData.groovy index 77a57616b..789945567 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/exprian/ProcessExcelData.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/exprian/ProcessExcelData.groovy @@ -11,8 +11,8 @@ import org.apache.commons.lang.StringUtils */ class ProcessExcelData { static def EXCEL_FILES = [ -// [city:'北京', name:'北京价格数据(减后20160616102540).xlsx'], - [city:'上海', name:'上海价格数据(减后20160616114934).xls'], +// [city:'鍖椾含', name:'鍖椾含浠锋牸鏁版嵁(鍑忓悗20160616102540).xlsx'], + [city:'涓婃捣', name:'涓婃捣浠锋牸鏁版嵁(鍑忓悗20160616114934).xls'], ] def static final FILE_PATH = "D:\\data\\experian" @@ -23,7 +23,7 @@ class ProcessExcelData { String fileName = cfg.name List> rows = ExcelUtils.read(FILE_PATH + "\\" + fileName, 0, 1) for(List clomns : rows) { - //只处理价格类型为3的 + //鍙鐞嗕环鏍肩被鍨嬩负3鐨� if(clomns.size() < 13) { continue } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjia/ImportCtiy.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjia/ImportCtiy.groovy index 5c01a76ba..6dcef80b7 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjia/ImportCtiy.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjia/ImportCtiy.groovy @@ -61,476 +61,476 @@ class ImportCtiy { } def city = [ /** - * 全国 + * 鍏ㄥ浗 */ [ "www", - "全国", + "鍏ㄥ浗", "www", "086", 0, 0, 0, 0, - "全国", + "鍏ㄥ浗", 0, 9 ], /** - * 上海 + * 涓婃捣 */ [ "sh", - "上海", + "涓婃捣", "shanghai", "021", 1, 1, 121.4759159000, 31.2243531000, - "华东城市", + "鍗庝笢鍩庡競", 5, 2 ], /** - * 北京 + * 鍖椾含 */ [ "bj", - "北京", + "鍖椾含", "beijing", "010", 0, 1, 116.4071200000, 39.9063400000, - "华北东北", + "鍗庡寳涓滃寳", 16, 2 ], /** - * 广州 + * 骞垮窞 */ [ "gz", - "广州", + "骞垮窞", "guangzhou", "020", 0, 1, 113.2661500000, 23.1335800000, - "华南华中", + "鍗庡崡鍗庝腑", 23, 2 ], /** - * 杭州 + * 鏉窞 */ [ "hz", - "杭州", + "鏉窞", "hangzhou", "0571", 0, 0, 120.1557400000, 30.2730400000, - "华东城市", + "鍗庝笢鍩庡競", 12, 2 ], /** - * 深圳 + * 娣卞湷 */ [ "sz", - "深圳", + "娣卞湷", "shenzhen", "0755", 0, 1, 114.07, 22.33, - "华南华中", + "鍗庡崡鍗庝腑", 15, 2 ], /** - * 扬州 + * 鎵窞 */ [ "yz", - "扬州", + "鎵窞", "yangzhou", "0514", 0, 0, 119.26, 32.23, - "华东城市", + "鍗庝笢鍩庡競", 10, 2 ], /** - * 南京 + * 鍗椾含 */ [ "nj", - "南京", + "鍗椾含", "nanjing", "025", 0, 1, 118.7963900000, 32.0583600000, - "华东城市", + "鍗庝笢鍩庡競", 11, 2 ], /** - * 天津 + * 澶╂触 */ [ "tj", - "天津", + "澶╂触", "tianjin", "022", 0, 1, 117.2142500000, 39.1213000000, - "华北东北", + "鍗庡寳涓滃寳", 9, 2 ], /** - * 成都 + * 鎴愰兘 */ [ "cd", - "成都", + "鎴愰兘", "chengdu", "028", 0, 1, 104.0646800000, 30.6585800000, - "西部城市", + "瑗块儴鍩庡競", 26, 2 ], /** - * 西安 + * 瑗垮畨 */ [ "xa", - "西安", + "瑗垮畨", "xian", "029", 0, 0, 108.9442900000, 34.2647700000, - "西部城市", + "瑗块儴鍩庡競", 25, 2 ], /** - * 沈阳 + * 娌堥槼 */ [ "sy", - "沈阳", + "娌堥槼", "shenyang", "024", 0, 1, 123.4321800000, 41.8062600000, - "华北东北", + "鍗庡寳涓滃寳", 1, 2 ], /** - * 重庆 + * 閲嶅簡 */ [ "cq", - "重庆", + "閲嶅簡", "chongqing", "023", 0, 1, 106.5522700000, 29.5632900000, - "西部城市", + "瑗块儴鍩庡競", 27, 2 ], /** - * 苏州 + * 鑻忓窞 */ [ "suz", - "苏州", + "鑻忓窞", "suzhou", "0512", 0, 0, 120.5865600000, 31.2976400000, - "华东城市", + "鍗庝笢鍩庡競", 6, 2 ], /** - * 武汉 + * 姝︽眽 */ [ "wh", - "武汉", + "姝︽眽", "wuhan", "027", 0, 1, 114.3054200000, 30.5927300000, - "华南华中", + "鍗庡崡鍗庝腑", 21, 2 ], /** - * 长沙 + * 闀挎矙 */ [ "cs", - "长沙", + "闀挎矙", "changsha", "0731", 0, 0, 112.9389100000, 28.2280500000, - "华南华中", + "鍗庡崡鍗庝腑", 22, 2 ], /** - * 石家庄 + * 鐭冲搴� */ [ "sjz", - "石家庄", + "鐭冲搴�", "shijiazhuang", "0311", 0, 0, 114.5144300000, 38.0428500000, - "华北东北", + "鍗庡寳涓滃寳", 17, 2 ], /** - * 青岛 + * 闈掑矝 */ [ "qd", - "青岛", + "闈掑矝", "qingdao", "0532", 0, 0, 120.3830400000, 36.0662400000, - "华北东北", + "鍗庡寳涓滃寳", 3, 2 ], /** - * 福州 + * 绂忓窞 */ [ "fz", - "福州", + "绂忓窞", "fuzhou", "0591", 0, 0, 119.2962600000, 26.0741000000, - "华南华中", + "鍗庡崡鍗庝腑", 8, 2 ], /** - * 济南 + * 娴庡崡 */ [ "jn", - "济南", + "娴庡崡", "jinan", "0531", 0, 0, 117.0420100000, 36.7277800000, - "华北东北", + "鍗庡寳涓滃寳", 19, 2 ], /** - * 厦门 + * 鍘﹂棬 */ [ "xm", - "厦门", + "鍘﹂棬", "xiamen", "0592", 0, 0, 118.10000, 24.46667, - "华南华中", + "鍗庡崡鍗庝腑", 14, 2 ], /** - * 宁波 + * 瀹佹尝 */ [ "nb", - "宁波", + "瀹佹尝", "ningbo", "0574", 0, 0, 121.5504100000, 29.8736300000, - "华东城市", + "鍗庝笢鍩庡競", 13, 2 ], /** - * 大连 + * 澶ц繛 */ [ "dl", - "大连", + "澶ц繛", "dalian", "0411", 0, 1, 121.6143400000, 38.9142900000, - "华北东北", + "鍗庡寳涓滃寳", 2, 2 ], /** - * 无锡 + * 鏃犻敗 */ [ "wx", - "无锡", + "鏃犻敗", "wuxi", "0510", 0, 0, 120.3028100000, 31.5660400000, - "华东城市", + "鍗庝笢鍩庡競", 4, 2 ], /** - * 三亚 + * 涓変簹 */ [ "sanya", - "三亚", + "涓変簹", "sanya", "0899", 1, 0, 109.50000, 18.20000, - "华南华中", + "鍗庡崡鍗庝腑", 24, 2 ], /** - * 太原 + * 澶師 */ [ "ty", - "太原", + "澶師", "taiyuan", "0351", 0, 0, 112.53333, 37.86667, - "华北东北", + "鍗庡寳涓滃寳", 18, 2 ], /** - * 福州 + * 绂忓窞 */ [ "wz", - "温州", + "娓╁窞", "wenzhou", "0577", 0, 0, 120.38, 28.00, - "华东城市", + "鍗庝笢鍩庡競", 7, 2 ], /** - * 佛山 + * 浣涘北 */ [ "fs", - "佛山", + "浣涘北", "foshan", "0757", 1, 0, 113.1214160000, 23.0215480000, - "华南华中", + "鍗庡崡鍗庝腑", 0, 2 ], /** - * 郑州 + * 閮戝窞 */ [ "zz", - "郑州", + "閮戝窞", "zhengzhou", "0371", 1, 0, 113.65000, 34.76667, - "华北东北", + "鍗庡寳涓滃寳", 20, 2] - // dg("东莞", "dongguan", 0), - // hrb("哈尔滨", "haerbin", 0), + // dg("涓滆帪", "dongguan", 0), + // hrb("鍝堝皵婊�", "haerbin", 0), - // hf("合肥", "hefei", 0), - // km("昆明", "kunming", 0), - // nc("南昌", "nanchang", 0), - // nn("南宁", "nanning", 0), - // lz("兰州", "lanzhou", 0); + // hf("鍚堣偉", "hefei", 0), + // km("鏄嗘槑", "kunming", 0), + // nc("鍗楁槍", "nanchang", 0), + // nn("鍗楀畞", "nanning", 0), + // lz("鍏板窞", "lanzhou", 0); ]; } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjia/MonitorConsumerBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjia/MonitorConsumerBatch.groovy index 1de84d44a..0e80f1f49 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjia/MonitorConsumerBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjia/MonitorConsumerBatch.groovy @@ -21,16 +21,16 @@ class MonitorConsumerBatch { def message = msg.object try { if(message.owners) { - def s = "线上" + StringUtils.substringAfterLast(message.name, ".") + "发生异常,请尽快处理." + def s = "绾夸笂" + StringUtils.substringAfterLast(message.name, ".") + "鍙戠敓寮傚父,璇峰敖蹇鐞�." message.owners.each{ownerName, owner-> jms.sendSms(owner.mobile, s, null, true) } }else{ - jms.sendSms(Watcher.HuangXiaoHu.getMobile(), StringUtils.substringAfterLast(message.name, ".") + "无人认领.", null, true) + jms.sendSms(Watcher.HuangXiaoHu.getMobile(), StringUtils.substringAfterLast(message.name, ".") + "鏃犱汉璁ら.", null, true) } }catch(Exception e) { e.printStackTrace() - jms.sendSms(Watcher.HuangXiaoHu.getMobile(), StringUtils.substringAfterLast(message.name, ".") + "无人认领.===========", null, true) + jms.sendSms(Watcher.HuangXiaoHu.getMobile(), StringUtils.substringAfterLast(message.name, ".") + "鏃犱汉璁ら.===========", null, true) } } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjia/Test.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjia/Test.groovy index 02e507cda..474d8f9df 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjia/Test.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjia/Test.groovy @@ -32,7 +32,7 @@ class Test { DBCursor cur = mongoColl.find() while(cur.hasNext()) { DBObject dbo = cur.next() - if(dbo.get("display") != "全国") { + if(dbo.get("display") != "鍏ㄥ浗") { ONLINE_CITY << dbo.get("display") } } @@ -52,7 +52,7 @@ class Test { // String name = ds[0] // List cats = Arrays.asList(ds[2].split(",")) // if(cats.contains("city")) { -// if(name.endsWith("市")) { +// if(name.endsWith("甯�")) { // name = name.substring(0, name.length() - 1) // } // if(ONLINE_CITY.contains(name)) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjia/house/EveryDayAddHouseStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjia/house/EveryDayAddHouseStat.groovy index dae835e86..6be51522d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjia/house/EveryDayAddHouseStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjia/house/EveryDayAddHouseStat.groovy @@ -16,7 +16,7 @@ import com.fangjia.script.Watcher import com.fangjia.script.util.MongoUtils; /** - * 统计每日新增二手房源量及租房房源量 + * 缁熻姣忔棩鏂板浜屾墜鎴挎簮閲忓強绉熸埧鎴挎簮閲� * @author gaojuan */ @BatchOwner(Watcher.GaoJuan) @@ -35,7 +35,7 @@ class EveryDayAddHouseStat extends BaseBatch{ Date startDate = DateUtil.truncateDay(new Date()); def statDate = new Date().format('yyyy-MM-dd'); - println "统计日期:" + statDate; + println "缁熻鏃ユ湡锛�" + statDate; def sellHouseCountMap = getHouseCount("sell", startDate); def sellAllHouseCountMap = getAllHouseCount("sell", startDate); @@ -88,7 +88,7 @@ class EveryDayAddHouseStat extends BaseBatch{ def dsCursor = getDataStoreConnection().find(q); def map = [:]; def count = dsCursor.count(); - map.put("全国", count); + map.put("鍏ㄥ浗", count); return map; } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjia/house/HouseFilterReasonStatBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjia/house/HouseFilterReasonStatBatch.groovy index b9c63fa15..aadee25ea 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjia/house/HouseFilterReasonStatBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjia/house/HouseFilterReasonStatBatch.groovy @@ -34,7 +34,7 @@ class HouseFilterReasonStatBatch extends BaseBatch { Date currentDate = DateUtil.truncateDay(new Date()) displayCityReason(null, "sell", currentDate) displayCityReason(null, "rent", currentDate) - println "==全国===${DateUtil.formatToTightYYYYMMDDhhmmss(new Date())}" + println "==鍏ㄥ浗===${DateUtil.formatToTightYYYYMMDDhhmmss(new Date())}" for(String city : ServerAreaData.displays()) { displayCityReason(city, "sell", currentDate) displayCityReason(city, "rent", currentDate) @@ -62,7 +62,7 @@ class HouseFilterReasonStatBatch extends BaseBatch { } if(valueCounts != null) { - def realCity = city == null ? '全国' : city; + def realCity = city == null ? '鍏ㄥ浗' : city; clearData(realCity, cat, currentDate) for(Count c : valueCounts) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/AbcEvaluationRowsBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/AbcEvaluationRowsBatch.groovy index 459c68770..ac3d95135 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/AbcEvaluationRowsBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/AbcEvaluationRowsBatch.groovy @@ -93,7 +93,7 @@ class AbcEvaluationRowsBatch extends BaseBatch{ .append('house_num', houseNumber).append('room_num', roomNumber) DBObject obj = LOUDONG_COLL.findOne(query) if(!obj){ - String source = "房价通" + String source = "鎴夸环閫�" com.fangjia.script.linxsh.util.entity.HouseLoudong houseLoudng = new com.fangjia.script.linxsh.util.entity.HouseLoudong() houseLoudng.city = ret.city houseLoudng.region = ret.region diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/AccessLogBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/AccessLogBatch.groovy index 06e84af84..d97ebf59c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/AccessLogBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/AccessLogBatch.groovy @@ -54,7 +54,7 @@ class AccessLogBatch extends BaseBatch{ builder.append(s) builder.append('\n') } - FileUtils.writeStringToFile(new File("E:\\房价通问题\\log\\估价记录备份\\"+day+".txt"), builder.toString(), "GBK") + FileUtils.writeStringToFile(new File("E:\\鎴夸环閫氶棶棰榎\log\\浼颁环璁板綍澶囦唤\\"+day+".txt"), builder.toString(), "GBK") } def run(){ @@ -65,7 +65,7 @@ class AccessLogBatch extends BaseBatch{ while(true){ //String day = (now-i).format("yyyy-MM-dd"); String day = now.format("yyyy-MM-dd"); - String fileName = "E:\\房价通问题\\log\\2016-05\\localhost_access_log."+ day +".txt"; + String fileName = "E:\\鎴夸环閫氶棶棰榎\log\\2016-05\\localhost_access_log."+ day +".txt"; //def ips = ["116.225.76.29","124.74.249.152"]; def ips = analyUserIp(fileName, "2871018828254@qq.com"); @@ -73,7 +73,7 @@ class AccessLogBatch extends BaseBatch{ def rows = readTxt(fileName, ips); writeTxt(rows, day); i--; - println day +" 已完成" + println day +" 宸插畬鎴�" break; } } @@ -133,11 +133,11 @@ class AccessLogBatch extends BaseBatch{ }catch(IllegalArgumentException e){} } -// if(it.contains("许昌路1600")||it.contains("庭安路825")||it.contains("三峰大厦")||it.contains("高行绿洲")){ +// if(it.contains("璁告槍璺�1600")||it.contains("搴畨璺�825")||it.contains("涓夊嘲澶у帵")||it.contains("楂樿缁挎床")){ // println fileName + " "+ it; // } -// if(it.contains("莲园路580")||it.contains("莲园路580")||it.contains("菊泉公寓")||it.contains("菊泉路515弄")||it.contains("河东小区")||it.contains("吴杨路55弄")){ +// if(it.contains("鑾插洯璺�580")||it.contains("鑾插洯璺�580")||it.contains("鑿婃硥鍏瘬")||it.contains("鑿婃硥璺�515寮�")||it.contains("娌充笢灏忓尯")||it.contains("鍚存潹璺�55寮�")){ // println fileName + " "+ it; // rows << it; // } @@ -211,7 +211,7 @@ class AccessLogBatch extends BaseBatch{ } def read(){ - String fileName = "D:\\数据\\logs\\performance.open.log"; + String fileName = "D:\\鏁版嵁\\logs\\performance.open.log"; File file = new File(fileName); def rets = [] def index = 0 diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/AddFjtCity.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/AddFjtCity.groovy index 04fa4907a..62c2125a5 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/AddFjtCity.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/AddFjtCity.groovy @@ -12,10 +12,10 @@ class AddFjtCity { def task = new AddFjtCity() def citys = [ - "鞍山","安阳","安顺","安康","安庆","阿克苏","阿勒泰","阿里","阿拉善盟","阿坝州","阿拉尔","北京","北海","北屯","包头","保定","保亭","保山","本溪","白山","百色","白城","白银","白沙","亳州","巴彦淖尔","巴中","巴音郭楞","滨州","毕节","宝鸡","蚌埠","博尔塔拉","成都","常德","常州","赤峰","潮州","朝阳","沧州","崇左","池州","郴州","承德","滁州","昌吉","昌都","昌江","楚雄","澄迈","大连","大同","大庆","大理","大兴安岭","东莞","东营","东方","定西","德州","德阳","德宏州","达州","迪庆州","丹东","儋州","定安","鄂尔多斯","鄂州","恩施","福州","佛山","阜阳","防城港","阜新","抚顺","抚州","广州","广元","广安","贵阳","贵港","赣州","桂林","固原","甘南","甘孜州","果洛州", - "杭州","呼和浩特","呼伦贝尔","哈尔滨","哈密","合肥","邯郸","惠州","湖州","海口","海东","衡阳","淮南","淮安","淮北","黄石","黄冈","黄山","黄南州","菏泽","汉中","河池","河源","和田","鹤岗","鹤壁","黑河","葫芦岛","衡水","贺州","怀化","红河","海北州","海南州","海西州","济南","济宁","济源","吉林","吉安","嘉兴","嘉峪关","九江","江门","金华","金昌","揭阳","佳木斯","焦作","锦州","鸡西","荆门","荆州","景德镇","晋城","晋中","酒泉","昆明","昆玉","开封","克拉玛依","克孜勒苏","喀什","可克达拉","兰州","洛阳","连云港","柳州","临沂","临汾","临沧","临夏","临高","陵水","廊坊","丽江","丽水","六盘水","六安","辽源","聊城","乐山","乐东","拉萨","泸州","来宾","莱芜","龙岩","漯河","辽阳","娄底","吕梁","陇南","林芝","凉山州","绵阳","马鞍山","茂名","牡丹江","梅州","眉山", - "南京","南昌","南通","南阳","南宁","南充","南平","宁德","宁波","内江","那曲","怒江州","平顶山","萍乡","平凉","攀枝花","盘锦","普洱","莆田","濮阳","青岛","清远","泉州","齐齐哈尔","秦皇岛","衢州","曲靖","钦州","七台河","庆阳","黔西南","黔东南","黔南","潜江","琼海","琼中","日照","日喀则","上海","上饶","深圳","沈阳","神农架","石家庄","石嘴山","苏州","宿迁","宿州","厦门","绍兴","邵阳","韶关","汕头","三亚","三沙","三明","三门峡","山南","汕尾","四平","绥化","朔州","双鸭山","双河","十堰","遂宁","随州","松原","商丘","商洛","石河子","天津","天水","天门","太原","泰州","泰安","台州","唐山","铜仁","铜陵","铜川","通化","通辽","铁岭","铁门关","吐鲁番","塔城","图木舒克","屯昌", - "武汉","武威","无锡","芜湖","吴忠","五家渠","五指山","乌鲁木齐","乌海","乌兰察布","威海","潍坊","梧州","渭南","温州","文山州","文昌","万宁","西安","西宁","西双版纳州","徐州","许昌","咸阳","咸宁","襄阳","湘潭","湘西","新余","新乡","信阳","邢台","忻州","孝感","兴安盟","锡林郭勒盟","仙桃","宣城","烟台","银川","宜昌","宜宾","宜春","盐城","延安","延边","岳阳","榆林","玉林","玉溪","玉树州","营口","阳江","云浮","伊春","伊犁","益阳","鹰潭","阳泉","扬州","运城","雅安","永州","重庆","长沙","长春","长治","郑州","中山","中卫","张家界","张家口","张掖","漳州","湛江","株洲","珠海","驻马店","镇江","淄博","舟山","周口","资阳","自贡","肇庆","遵义","昭通","枣庄"] + "闉嶅北","瀹夐槼","瀹夐『","瀹夊悍","瀹夊簡","闃垮厠鑻�","闃垮嫆娉�","闃块噷","闃挎媺鍠勭洘","闃垮潩宸�","闃挎媺灏�","鍖椾含","鍖楁捣","鍖楀悲","鍖呭ご","淇濆畾","淇濅涵","淇濆北","鏈邯","鐧藉北","鐧捐壊","鐧藉煄","鐧介摱","鐧芥矙","浜冲窞","宸村溅娣栧皵","宸翠腑","宸撮煶閮","婊ㄥ窞","姣曡妭","瀹濋浮","铓屽煚","鍗氬皵濉旀媺","鎴愰兘","甯稿痉","甯稿窞","璧ゅ嘲","娼窞","鏈濋槼","娌у窞","宕囧乏","姹犲窞","閮村窞","鎵垮痉","婊佸窞","鏄屽悏","鏄岄兘","鏄屾睙","妤氶泟","婢勮繄","澶ц繛","澶у悓","澶у簡","澶х悊","澶у叴瀹夊箔","涓滆帪","涓滆惀","涓滄柟","瀹氳タ","寰峰窞","寰烽槼","寰峰畯宸�","杈惧窞","杩簡宸�","涓逛笢","鍎嬪窞","瀹氬畨","閯傚皵澶氭柉","閯傚窞","鎭╂柦","绂忓窞","浣涘北","闃滈槼","闃插煄娓�","闃滄柊","鎶氶『","鎶氬窞","骞垮窞","骞垮厓","骞垮畨","璐甸槼","璐垫腐","璧e窞","妗傛灄","鍥哄師","鐢樺崡","鐢樺瓬宸�","鏋滄礇宸�", + "鏉窞","鍛煎拰娴╃壒","鍛间鸡璐濆皵","鍝堝皵婊�","鍝堝瘑","鍚堣偉","閭兏","鎯犲窞","婀栧窞","娴峰彛","娴蜂笢","琛¢槼","娣崡","娣畨","娣寳","榛勭煶","榛勫唸","榛勫北","榛勫崡宸�","鑿忔辰","姹変腑","娌虫睜","娌虫簮","鍜岀敯","楣ゅ矖","楣ゅ","榛戞渤","钁姦宀�","琛℃按","璐哄窞","鎬�鍖�","绾㈡渤","娴峰寳宸�","娴峰崡宸�","娴疯タ宸�","娴庡崡","娴庡畞","娴庢簮","鍚夋灄","鍚夊畨","鍢夊叴","鍢夊唱鍏�","涔濇睙","姹熼棬","閲戝崕","閲戞槍","鎻槼","浣虫湪鏂�","鐒︿綔","閿﹀窞","楦¤タ","鑽嗛棬","鑽嗗窞","鏅痉闀�","鏅嬪煄","鏅嬩腑","閰掓硥","鏄嗘槑","鏄嗙帀","寮�灏�","鍏嬫媺鐜涗緷","鍏嬪瓬鍕掕嫃","鍠�浠�","鍙厠杈炬媺","鍏板窞","娲涢槼","杩炰簯娓�","鏌冲窞","涓存矀","涓存本","涓存钵","涓村","涓撮珮","闄垫按","寤婂潑","涓芥睙","涓芥按","鍏洏姘�","鍏畨","杈芥簮","鑱婂煄","涔愬北","涔愪笢","鎷夎惃","娉稿窞","鏉ュ","鑾辫姕","榫欏博","婕渤","杈介槼","濞勫簳","鍚曟","闄囧崡","鏋楄姖","鍑夊北宸�","缁甸槼","椹瀺灞�","鑼傚悕","鐗′腹姹�","姊呭窞","鐪夊北", + "鍗椾含","鍗楁槍","鍗楅��","鍗楅槼","鍗楀畞","鍗楀厖","鍗楀钩","瀹佸痉","瀹佹尝","鍐呮睙","閭f洸","鎬掓睙宸�","骞抽《灞�","钀嶄埂","骞冲噳","鏀�鏋濊姳","鐩橀敠","鏅幢","鑾嗙敯","婵槼","闈掑矝","娓呰繙","娉夊窞","榻愰綈鍝堝皵","绉︾殗宀�","琛㈠窞","鏇查潠","閽﹀窞","涓冨彴娌�","搴嗛槼","榛旇タ鍗�","榛斾笢鍗�","榛斿崡","娼滄睙","鐞兼捣","鐞间腑","鏃ョ収","鏃ュ杸鍒�","涓婃捣","涓婇ザ","娣卞湷","娌堥槼","绁炲啘鏋�","鐭冲搴�","鐭冲槾灞�","鑻忓窞","瀹胯縼","瀹垮窞","鍘﹂棬","缁嶅叴","閭甸槼","闊跺叧","姹曞ご","涓変簹","涓夋矙","涓夋槑","涓夐棬宄�","灞卞崡","姹曞熬","鍥涘钩","缁ュ寲","鏈斿窞","鍙岄腑灞�","鍙屾渤","鍗佸牥","閬傚畞","闅忓窞","鏉惧師","鍟嗕笜","鍟嗘礇","鐭虫渤瀛�","澶╂触","澶╂按","澶╅棬","澶師","娉板窞","娉板畨","鍙板窞","鍞愬北","閾滀粊","閾滈櫟","閾滃窛","閫氬寲","閫氳窘","閾佸箔","閾侀棬鍏�","鍚愰瞾鐣�","濉斿煄","鍥炬湪鑸掑厠","灞槍", + "姝︽眽","姝﹀▉","鏃犻敗","鑺滄箹","鍚村繝","浜斿娓�","浜旀寚灞�","涔岄瞾鏈ㄩ綈","涔屾捣","涔屽叞瀵熷竷","濞佹捣","娼嶅潑","姊у窞","娓崡","娓╁窞","鏂囧北宸�","鏂囨槍","涓囧畞","瑗垮畨","瑗垮畞","瑗垮弻鐗堢撼宸�","寰愬窞","璁告槍","鍜搁槼","鍜稿畞","瑗勯槼","婀樻江","婀樿タ","鏂颁綑","鏂颁埂","淇¢槼","閭㈠彴","蹇诲窞","瀛濇劅","鍏村畨鐩�","閿℃灄閮嫆鐩�","浠欐","瀹e煄","鐑熷彴","閾跺窛","瀹滄槍","瀹滃","瀹滄槬","鐩愬煄","寤跺畨","寤惰竟","宀抽槼","姒嗘灄","鐜夋灄","鐜夋邯","鐜夋爲宸�","钀ュ彛","闃虫睙","浜戞诞","浼婃槬","浼婄妬","鐩婇槼","楣版江","闃虫硥","鎵窞","杩愬煄","闆呭畨","姘稿窞","閲嶅簡","闀挎矙","闀挎槬","闀挎不","閮戝窞","涓北","涓崼","寮犲鐣�","寮犲鍙�","寮犳帠","婕冲窞","婀涙睙","鏍床","鐝犳捣","椹婚┈搴�","闀囨睙","娣勫崥","鑸熷北","鍛ㄥ彛","璧勯槼","鑷础","鑲囧簡","閬典箟","鏄��","鏋e簞"] println citys.unique().size() @@ -67,7 +67,7 @@ class AddFjtCity { if(!rets.contains(it.ch_city)){ rets << it.ch_city }else{ - println "重复:"+it.ch_city + println "閲嶅锛�"+it.ch_city } }) return rets; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/AnalyTask.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/AnalyTask.groovy index e53811159..cb6b8c0c2 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/AnalyTask.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/AnalyTask.groovy @@ -58,7 +58,7 @@ class AnalyTask { def printResult(map){ map.each {k,v-> - println k + " 次数:" + v + println k + " 娆℃暟锛�" + v } } @@ -69,9 +69,9 @@ class AnalyTask { if (file.exists()){ file.delete(); } - file.append("名称,") - file.append("运行次数,") - file.append("最后一次运行时间,") + file.append("鍚嶇О,") + file.append("杩愯娆℃暟,") + file.append("鏈�鍚庝竴娆¤繍琛屾椂闂�,") file.append(System.getProperty("line.separator")); map.each{k,v-> if(k.indexOf("_time")==-1){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/DownPdfCheck.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/DownPdfCheck.groovy index 2e5201a8c..ba515fb97 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/DownPdfCheck.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/DownPdfCheck.groovy @@ -19,7 +19,7 @@ class DownPdfCheck { } def czLogRun(){ - def files = getAllFiles("D:\\数据\\常州") + def files = getAllFiles("D:\\鏁版嵁\\甯稿窞") if(files){ for(def filepath : files){ read(filepath); @@ -44,7 +44,7 @@ class DownPdfCheck { } def run(){ - def files = getAllFiles("D:\\数据\\11.6日估单汇总") + def files = getAllFiles("D:\\鏁版嵁\\11.6鏃ヤ及鍗曟眹鎬�") if(files){ def index = 0; for(def filepath : files){ @@ -54,35 +54,35 @@ class DownPdfCheck { // } def filename = filepath.toString().substring(filepath.toString().lastIndexOf("\\")+1, filepath.toString().lastIndexOf(".pdf")); - def dists = OpenApiUtils.matchAllDistrict("上海", filename) + def dists = OpenApiUtils.matchAllDistrict("涓婃捣", filename) if(!dists && filename.contains("-")){ - dists = OpenApiUtils.matchAllDistrict("上海", filename.substring(0, filename.indexOf("-"))) + dists = OpenApiUtils.matchAllDistrict("涓婃捣", filename.substring(0, filename.indexOf("-"))) } - def house_num = getMatchString(filename, "(弄|号|区|村)[\\d+A-Za-z].*栋"); - def room_num = getMatchString(filename, "栋.*\\d+(.*)?室"); + def house_num = getMatchString(filename, "(寮剕鍙穦鍖簗鏉�)[\\d+A-Za-z].*鏍�"); + def room_num = getMatchString(filename, "鏍�.*\\d+(.*)?瀹�"); if(!house_num){ - house_num = getMatchString(filename, "路\\d+.*栋"); + house_num = getMatchString(filename, "璺痋\d+.*鏍�"); } if(!house_num){ - house_num = getMatchString(filename, "\\d+栋"); + house_num = getMatchString(filename, "\\d+鏍�"); } if(house_num){ - house_num = house_num.replace("弄","").replace("区","").replace("村","").replace("号","").replace("路","") - if(house_num.contains("栋")){ - house_num = house_num.replace("栋","") + house_num = house_num.replace("寮�","").replace("鍖�","").replace("鏉�","").replace("鍙�","").replace("璺�","") + if(house_num.contains("鏍�")){ + house_num = house_num.replace("鏍�","") } } if(room_num){ - room_num = room_num.replace("室","").replace("栋","") + room_num = room_num.replace("瀹�","").replace("鏍�","") }else{ - room_num = getMatchString(filename, "栋.*("); - if(room_num && room_num.contains("室")){ - room_num = room_num.replace("栋","").replace("(","").replace("层","") + room_num = getMatchString(filename, "鏍�.*锛�"); + if(room_num && room_num.contains("瀹�")){ + room_num = room_num.replace("鏍�","").replace("锛�","").replace("灞�","") }else{ - room_num = getMatchString(filename, "号.*\\d+(.*)?室"); + room_num = getMatchString(filename, "鍙�.*\\d+(.*)?瀹�"); if(room_num){ - room_num = room_num.replace("号","").replace("室","") + room_num = room_num.replace("鍙�","").replace("瀹�","") } } } @@ -91,7 +91,7 @@ class DownPdfCheck { def ret = findDownLoadRows(evaluations); - println "【${index}】"+filename +" 评估记录:"+evaluations +" 下载记录:"+ret + println "銆�${index}銆�"+filename +" 璇勪及璁板綍锛�"+evaluations +" 涓嬭浇璁板綍锛�"+ret } } } @@ -154,7 +154,7 @@ class DownPdfCheck { files << tempList[i]; } if (tempList[i].isDirectory()) { - System.out.println("文件夹:" + tempList[i]); + System.out.println("鏂囦欢澶癸細" + tempList[i]); } } return files; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/EvaluationTaskAllocation.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/EvaluationTaskAllocation.groovy index 28c42917c..d6e6f9f8b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/EvaluationTaskAllocation.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/EvaluationTaskAllocation.groovy @@ -32,7 +32,7 @@ import com.mongodb.DBCollection; import com.mongodb.DBObject /** - * 人工询价与人工出报告的任务 分配 + * 浜哄伐璇环涓庝汉宸ュ嚭鎶ュ憡鐨勪换鍔� 鍒嗛厤 * @author gaojuan * */ @@ -42,7 +42,7 @@ class EvaluationTaskAllocation extends BaseBatch{ static final def onLineSqlInstance = Sql.newInstance("jdbc:mysql://mysql.db.fangjia.com:4306/goojia_fangjia?&characterEncoding=utf8", "sa", "G00jia", "com.mysql.jdbc.Driver"); DBCollection bkoffUsersColl = MongoUtils.getCollectionByName("fangjia", "bkoff_users", "mongo.db.fangjia.com", 28017) - def static contactInfos =[:]// ["高娟":[mobile:"15021384995",email:"gaojuan@fangjia.com"],"曹玉彦":[mobile:"13818903076",email:"caoyuyan@fangjia.com"]]; + def static contactInfos =[:]// ["楂樺":[mobile:"15021384995",email:"gaojuan@fangjia.com"],"鏇圭帀褰�":[mobile:"13818903076",email:"caoyuyan@fangjia.com"]]; static Jms jms = Jms.create('tcp://jms.db.fangjia.com:61616'); static main(args) { runBatch(new EvaluationTaskAllocation(), args) @@ -56,26 +56,26 @@ class EvaluationTaskAllocation extends BaseBatch{ } - //对未分配的任务进行分配 + //瀵规湭鍒嗛厤鐨勪换鍔¤繘琛屽垎閰� def sendTasksAction(){ - //初始化 + //鍒濆鍖� contactInfos =[:]; - //查询需要处理任务的人员 + //鏌ヨ闇�瑕佸鐞嗕换鍔$殑浜哄憳 findBkoffUsers(); - //将以前处理任务的人员,而现在不需处理的人员名下的任务重新分配 + //灏嗕互鍓嶅鐞嗕换鍔$殑浜哄憳锛岃�岀幇鍦ㄤ笉闇�澶勭悊鐨勪汉鍛樺悕涓嬬殑浠诲姟閲嶆柊鍒嗛厤 reAllocationTask(); - //没有认领的任务 + //娌℃湁璁ら鐨勪换鍔� def noClaimasks = findEvaluationTasksByStatus(0); - println "分配任务:【"+noClaimasks.size()+"】 条"; + println "鍒嗛厤浠诲姟锛氥��"+noClaimasks.size()+"銆� 鏉�"; if(noClaimasks !=null && noClaimasks.size() > 0){ TreeMap treeMap = new TreeMap(); - //初始化 + //鍒濆鍖� contactInfos.each {k,v-> treeMap.put(k, 0); } def names = treeMap.keySet(); - //已被认领,末处理的任务 + //宸茶璁ら锛屾湯澶勭悊鐨勪换鍔� def noProcessTasks = findEvaluationTasksByStatus(1); for(def task : noProcessTasks){ def claimName = task.claim_name; @@ -84,9 +84,9 @@ class EvaluationTaskAllocation extends BaseBatch{ } } - println "没分配前:"+treeMap; + println "娌″垎閰嶅墠锛�"+treeMap; def results = []; - //任务分配 + //浠诲姟鍒嗛厤 for(def task : noClaimasks){ task.status = 1; @@ -103,7 +103,7 @@ class EvaluationTaskAllocation extends BaseBatch{ updateTasks(results); } - println "分配后:"+treeMap; + println "鍒嗛厤鍚庯細"+treeMap; } @@ -157,7 +157,7 @@ class EvaluationTaskAllocation extends BaseBatch{ } public List> sort(TreeMap treeMap){ - //指定排序器 + //鎸囧畾鎺掑簭鍣� List> arrayList = new ArrayList>(treeMap.entrySet()); try { Collections.sort(arrayList, new Comparator>() { @@ -173,11 +173,11 @@ class EvaluationTaskAllocation extends BaseBatch{ def send(contactWay, name, evaluationId, way){ def evaluation = findEvaluation(evaluationId); - def content = "您好!"+name+",房价通客户发送【"+evaluation.address+"】需人工处理,请您尽快处理!" + def content = "鎮ㄥソ!"+name+",鎴夸环閫氬鎴峰彂閫併��"+evaluation.address+"銆戦渶浜哄伐澶勭悊,璇锋偍灏藉揩澶勭悊锛�" if(way == "mobile"){ jms.sendSms(contactWay, content, null, true); }else{ - jms.sendMail(contactWay, "【房价通】人工处理" + DateUtil.formatToTightYYYYMMDDhhmmss(new Date()), content); + jms.sendMail(contactWay, "銆愭埧浠烽�氥�戜汉宸ュ鐞�" + DateUtil.formatToTightYYYYMMDDhhmmss(new Date()), content); } } @@ -192,7 +192,7 @@ class EvaluationTaskAllocation extends BaseBatch{ } def reAllocationTask(){ - //处理中的任务 + //澶勭悊涓殑浠诲姟 def processTasks = findEvaluationTasksByStatus(1); for(def map : processTasks){ def name = map.claim_name diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/FjtAnalyCrawlerIp.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/FjtAnalyCrawlerIp.groovy index 5091edaa5..1d68c0795 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/FjtAnalyCrawlerIp.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/FjtAnalyCrawlerIp.groovy @@ -20,7 +20,7 @@ import com.mongodb.DBCollection; import com.mongodb.DBObject /** - * 通过地址匹配日志,分析疑似爬虫用户 + * 閫氳繃鍦板潃鍖归厤鏃ュ織锛屽垎鏋愮枒浼肩埇铏敤鎴� * @author gaojuan * */ @@ -51,9 +51,9 @@ class FjtAnalyCrawlerIp extends BaseBatch{ def findAddressMatchLogs(){ def timeMap = getTimes(); - println "统计时间:"+timeMap.startDate +" >>> "+ timeMap.endDate + println "缁熻鏃堕棿锛�"+timeMap.startDate +" >>> "+ timeMap.endDate DBObject q = new BasicDBObject(); - q.put("source", "房价通"); + q.put("source", "鎴夸环閫�"); q.put('c_date', new BasicDBObject('$gte', timeMap.startDate).append('$lt', timeMap.endDate)); def cursor = addressMatchLogColl.find(q); def ret = [:]; @@ -104,14 +104,14 @@ class FjtAnalyCrawlerIp extends BaseBatch{ if(count > 100){ def arr = k.split("#"); if(arr[1] && arr[1]!="116.247.70.58"){ - def flag = addFjtBlockIp(arr[1]);//通过http形式添加到黑名单中 + def flag = addFjtBlockIp(arr[1]);//閫氳繃http褰㈠紡娣诲姞鍒伴粦鍚嶅崟涓� noNormalIp << k + "#" +flag; } } } if(noNormalIp.size > 0){ - sendEmail(noNormalIp);//如果存在疑似爬虫的ip,发邮件 + sendEmail(noNormalIp);//濡傛灉瀛樺湪鐤戜技鐖櫕鐨刬p锛屽彂閭欢 } } @@ -119,7 +119,7 @@ class FjtAnalyCrawlerIp extends BaseBatch{ def sendEmail(def noNormalIps){ def content = toContent(noNormalIps); for(email in emails) { - jms.sendMail(email, "房价通疑似爬虫用户", content.toString()) + jms.sendMail(email, "鎴夸环閫氱枒浼肩埇铏敤鎴�", content.toString()) } } @@ -127,9 +127,9 @@ class FjtAnalyCrawlerIp extends BaseBatch{ StringBuffer sb = new StringBuffer(); sb.append("
    字段名昨天网站估价覆盖率昨天报告估价覆盖率最近7天网站估价覆盖率最近7天报告估价覆盖率瀛楁鍚�鏄ㄥぉ缃戠珯浼颁环瑕嗙洊鐜�鏄ㄥぉ鎶ュ憡浼颁环瑕嗙洊鐜�鏈�杩�7澶╃綉绔欎及浠疯鐩栫巼鏈�杩�7澶╂姤鍛婁及浠疯鐩栫巼
    "+site_precent+"无人填写鏃犱汉濉啓无此因素鏃犳鍥犵礌"+report_precent+"无人填写鏃犱汉濉啓无此因素鏃犳鍥犵礌"+site_7_precent+"无人填写鏃犱汉濉啓无此因素鏃犳鍥犵礌"+report_7_precent+"无人填写鏃犱汉濉啓无此因素鏃犳鍥犵礌
    ") sb.append("") - sb.append(""); - sb.append(""); - sb.append(""); + sb.append(""); + sb.append(""); + sb.append(""); sb.append("") noNormalIps.each { def arr = it.split("#"); @@ -137,9 +137,9 @@ class FjtAnalyCrawlerIp extends BaseBatch{ sb.append(""); sb.append(""); if(arr[2] == "true"){ - sb.append(""); + sb.append(""); }else{ - sb.append(""); + sb.append(""); } sb.append("") diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/FjtGuoQiUser.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/FjtGuoQiUser.groovy index 30e92e7df..4abd8a524 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/FjtGuoQiUser.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/FjtGuoQiUser.groovy @@ -12,7 +12,7 @@ class FjtGuoQiUser { } def run(){ - def ret = readTxt("E:\\数据测试\\数据\\", "房价通过期企业用户.txt");//读文件 + def ret = readTxt("E:\\鏁版嵁娴嬭瘯\\鏁版嵁\\", "鎴夸环閫氳繃鏈熶紒涓氱敤鎴�.txt");//璇绘枃浠� setOpenDay(ret); } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/FjtHouseGlod.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/FjtHouseGlod.groovy index 833b93b43..0799d75d9 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/FjtHouseGlod.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/FjtHouseGlod.groovy @@ -36,7 +36,7 @@ class FjtHouseGlod { for(def userHouse : userHouses){ def userId = userHouse.user_id; addUserGold(userId); - addGoldLogs(userId, "系统返还房豆(房源发布)"); + addGoldLogs(userId, "绯荤粺杩旇繕鎴胯眴(鎴挎簮鍙戝竷)"); } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/FjtLogAnalyBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/FjtLogAnalyBatch.groovy index cb3598ff1..50014cc15 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/FjtLogAnalyBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/FjtLogAnalyBatch.groovy @@ -19,7 +19,7 @@ import java.util.regex.Matcher import java.util.regex.Pattern import com.fangjia.script.util.DateUtils -//房价通下载样本页与估价页分析 +//鎴夸环閫氫笅杞芥牱鏈〉涓庝及浠烽〉鍒嗘瀽 @BatchOwner(Watcher.GaoJuan) class FjtLogAnalyBatch extends BaseBatch{ @@ -41,13 +41,13 @@ class FjtLogAnalyBatch extends BaseBatch{ def run(){ def day = (new Date()-1).format("yyyy-MM-dd") - println "${day} 完成....." + println "${day} 瀹屾垚....." remove(day); - //分析点击下载样本的信息 + //鍒嗘瀽鐐瑰嚮涓嬭浇鏍锋湰鐨勪俊鎭� def ret = findDownYangBenReporLog(day); def result = findEvaluationInfo(ret); save(result, "yangben_down", day); - //用户到评估页面 + //鐢ㄦ埛鍒拌瘎浼伴〉闈� def pgRet = findPingguLog(day); save(pgRet, "pinggu", day); } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/FjtLogTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/FjtLogTest.groovy index 5483abdad..6540242b4 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/FjtLogTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/FjtLogTest.groovy @@ -23,7 +23,7 @@ class FjtLogTest { def run(){ - def obj = "170.00万元" + def obj = "170.00涓囧厓" obj = obj.replaceAll("[^0-9.]", ""); double value = Double.parseDouble(obj)*10000 Integer i = value.intValue(); @@ -78,7 +78,7 @@ class FjtLogTest { List> infoIds = new ArrayList>(map.entrySet()); - //排序 + //鎺掑簭 Collections.sort(infoIds, new Comparator>() { public int compare(Map.Entry o1, Map.Entry o2) { //return (o2.getValue() - o1.getValue()); 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 58a433b62..759cde721 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 @@ -16,7 +16,7 @@ import com.fangjia.script.Watcher import com.mongodb.QueryOperators import com.mongodb.Bytes; /** - * 房价通访问时间统计 + * 鎴夸环閫氳闂椂闂寸粺璁� * @author gaojuan * */ @@ -35,14 +35,14 @@ class FjtResponseTimeAnaly extends BaseBatch{ @Override public void process(Object args) { //run(); - jms.sendMail("gaojuan@fangjia.com", "测试发邮件", "收到了2?") + jms.sendMail("gaojuan@fangjia.com", "娴嬭瘯鍙戦偖浠�", "鏀跺埌浜�2锛�") } def run(){ def startDate = (new Date()-1).format("yyyy-MM-dd") def endDate = (new Date()).format("yyyy-MM-dd") - println "${startDate} 完成....." + println "${startDate} 瀹屾垚....." def detailMap = getTimePrecent(startDate, endDate); def resultMap = findLogs(startDate, endDate, 3000); def ret = sortResult(resultMap); @@ -192,7 +192,7 @@ class FjtResponseTimeAnaly extends BaseBatch{ def sendEmail(def detailMap, def ret){ def content = toContent(detailMap,ret); for(email in emails) { - jms.sendMail(email, "房价通请求超过3s的访问", content.toString()) + jms.sendMail(email, "鎴夸环閫氳姹傝秴杩�3s鐨勮闂�", content.toString()) } } @@ -200,8 +200,8 @@ class FjtResponseTimeAnaly extends BaseBatch{ StringBuffer sb = new StringBuffer(); sb.append("
    房价通用户疑似爬虫Ip状态鎴夸环閫氱敤鎴�鐤戜技鐖櫕Ip鐘舵��
    "+arr[0]+""+arr[1]+"已存在宸插瓨鍦�新增鏂板
    ") sb.append("") - sb.append(""); - sb.append(""); + sb.append(""); + sb.append(""); sb.append("") ret.each { @@ -221,12 +221,12 @@ class FjtResponseTimeAnaly extends BaseBatch{ sb.append("
    房价通uri数量鎴夸环閫歶ri鏁伴噺
    ") sb.append("") - sb.append(""); - sb.append(""); - sb.append(""); - sb.append(""); - sb.append(""); - sb.append(""); + sb.append(""); + sb.append(""); + sb.append(""); + sb.append(""); + sb.append(""); + sb.append(""); sb.append("") timeStat.each { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/FjtUserBrowserAnaly.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/FjtUserBrowserAnaly.groovy index d194e1300..1c4745065 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/FjtUserBrowserAnaly.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/FjtUserBrowserAnaly.groovy @@ -1,7 +1,7 @@ package com.fangjia.script.fangjiatong import groovy.sql.* -/*房价通用户浏览器分析*/ +/*鎴夸环閫氱敤鎴锋祻瑙堝櫒鍒嗘瀽*/ class FjtUserBrowserAnaly { static final def fjtSqlInstance = Sql.newInstance("jdbc:mysql://mysql.db.fangjia.com:4306/goojia_fangjia?&characterEncoding=utf8", "sa", "G00jia", "com.mysql.jdbc.Driver"); @@ -95,7 +95,7 @@ class FjtUserBrowserAnaly { } } - println "共 ${index} 条" + println "鍏� ${index} 鏉�" map.each {k,v-> println k+" "+v @@ -104,7 +104,7 @@ class FjtUserBrowserAnaly { return map; } - //提取email + //鎻愬彇email def selectEmail(def s){ def email = null; @@ -151,7 +151,7 @@ class FjtUserBrowserAnaly { }else if(s.contains("Safari")){ type = "Safari" }else{ - type = "其它" + type = "鍏跺畠" } return type; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/FjtUserClickLogAnalyBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/FjtUserClickLogAnalyBatch.groovy index 02d2b1ca5..31f48c9f7 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/FjtUserClickLogAnalyBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/FjtUserClickLogAnalyBatch.groovy @@ -33,16 +33,16 @@ class FjtUserClickLogAnalyBatch extends BaseBatch{ } def run(def startDate, def endDate){ - //按时间查询日志 + //鎸夋椂闂存煡璇㈡棩蹇� def logs = findUserLogs(startDate, endDate); - //加载所有用户的身份 + //鍔犺浇鎵�鏈夌敤鎴风殑韬唤 def userRoleMap = findUserRoles(); - //分析日志 + //鍒嗘瀽鏃ュ織 def resultMap = analyLogs(logs, userRoleMap); - //保存统计结果 + //淇濆瓨缁熻缁撴灉 saveResult(resultMap, startDate.format("yyyy-MM-dd")); - println startDate.format("yyyy-MM-dd") +" 统计完成......"; + println startDate.format("yyyy-MM-dd") +" 缁熻瀹屾垚......"; } def findUserRoles(){ @@ -66,14 +66,14 @@ class FjtUserClickLogAnalyBatch extends BaseBatch{ def dbo = it.next(); def role = userRoleMap.get(dbo.user_name); - //用户身份 + //鐢ㄦ埛韬唤 def detailMap = resultMap.get(role); if(!detailMap){ detailMap = [:] resultMap.put(role, detailMap); } - //链接 + //閾炬帴 def uriMap = detailMap.get("uriMap"); if(!uriMap){ uriMap = [:]; @@ -86,7 +86,7 @@ class FjtUserClickLogAnalyBatch extends BaseBatch{ }else{ uriMap.put(uri, uri_count + 1); } - //点击量 + //鐐瑰嚮閲� def count = detailMap.get("click_count"); if(!count){ detailMap.put("click_count", 1); @@ -94,7 +94,7 @@ class FjtUserClickLogAnalyBatch extends BaseBatch{ detailMap.put("click_count", count + 1); } - //用户 + //鐢ㄦ埛 def emails = detailMap.get("emails"); if(!emails){ emails = []; @@ -105,7 +105,7 @@ class FjtUserClickLogAnalyBatch extends BaseBatch{ emails << dbo.user_name; } - //操作系统 + //鎿嶄綔绯荤粺 def osMap = detailMap.get("os_mark"); if(!osMap){ osMap = [:] @@ -120,7 +120,7 @@ class FjtUserClickLogAnalyBatch extends BaseBatch{ os_names << dbo.user_name } - //版本的使用情况 + //鐗堟湰鐨勪娇鐢ㄦ儏鍐� if(dbo.fjt_version){ def versionMap = detailMap.get("version"); if(!versionMap){ @@ -136,7 +136,7 @@ class FjtUserClickLogAnalyBatch extends BaseBatch{ names << dbo.user_name } } - //浏览器 + //娴忚鍣� def browserMap = detailMap.get("browser"); if(!browserMap){ browserMap = [:] diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/SimilarUserStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/SimilarUserStat.groovy index a06a918eb..d3fba9f71 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/SimilarUserStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/SimilarUserStat.groovy @@ -80,8 +80,8 @@ class SimilarUserStat { if (file.exists()){ file.delete(); } - file.append("姓名,") - file.append("手机号,") + file.append("濮撳悕,") + file.append("鎵嬫満鍙�,") file.append(System.getProperty("line.separator")); for(def m : ret){ file.append(m.name + ",") @@ -112,12 +112,12 @@ class SimilarUserStat { } } - File file = new File("e:\\融时代.csv"); + File file = new File("e:\\铻嶆椂浠�.csv"); if (file.exists()){ file.delete(); } - file.append("姓名,") - file.append("手机号,") + file.append("濮撳悕,") + file.append("鎵嬫満鍙�,") file.append("ip,") file.append(System.getProperty("line.separator")); for(def m : ret){ @@ -173,7 +173,7 @@ class SimilarUserStat { def mobile = dbo.mobile; def name = dbo.contact_people def city = dbo.city - if(mobile && city=='上海'){ + if(mobile && city=='涓婃捣'){ def mobiles = result.get(user_id+"&"+name) if(!mobiles){ mobiles = []; @@ -186,12 +186,12 @@ class SimilarUserStat { println "[${index}]" + user_id + " " + mobiles }else{ - println "[${index}] 无电话号码或非上海" + println "[${index}] 鏃犵數璇濆彿鐮佹垨闈炰笂娴�" } } }else{ - println "[${index}]没找到房源 "+houseId+" "+user_id + println "[${index}]娌℃壘鍒版埧婧� "+houseId+" "+user_id } } } @@ -207,13 +207,13 @@ class SimilarUserStat { } - File file = new File("e:\\房价通用户电话.csv"); + File file = new File("e:\\鎴夸环閫氱敤鎴风數璇�.csv"); if (file.exists()){ file.delete(); } - file.append("帐号,") - file.append("姓名,") - file.append("手机号,") + file.append("甯愬彿,") + file.append("濮撳悕,") + file.append("鎵嬫満鍙�,") file.append(System.getProperty("line.separator")); map.each{k,v-> def arr = k.split("&") @@ -228,7 +228,7 @@ class SimilarUserStat { def run7(){ DBObject query = new BasicDBObject() - query.put("city", "上海") + query.put("city", "涓婃捣") query.put("url", "fangjia.com") DBObject qq = new BasicDBObject() @@ -252,10 +252,10 @@ class SimilarUserStat { println rets.join(",") } - //查询常州发布房源的用户 + //鏌ヨ甯稿窞鍙戝竷鎴挎簮鐨勭敤鎴� def run3(){ DBObject query = new BasicDBObject() - query.put("city", "上海") + query.put("city", "涓婃捣") query.put("url", "fangjia.com") DBObject qq = new BasicDBObject() @@ -300,13 +300,13 @@ class SimilarUserStat { } - File file = new File("e:\\房价通用户电话2.csv"); + File file = new File("e:\\鎴夸环閫氱敤鎴风數璇�2.csv"); if (file.exists()){ file.delete(); } - file.append("帐号,") - file.append("姓名,") - file.append("手机号,") + file.append("甯愬彿,") + file.append("濮撳悕,") + file.append("鎵嬫満鍙�,") file.append(System.getProperty("line.separator")); map.each{k,v-> def arr = k.split("&") @@ -324,13 +324,13 @@ class SimilarUserStat { def run(){ def allUsers = findUser("2015-08-01") - println "共: "+allUsers.size() + println "鍏�: "+allUsers.size() // def houseUsers = findPublishHouseUser("2015-08-01"); // // def users = filterNoPublishHouseUser(allUsers, houseUsers); def users = findUserPhone(allUsers); - println "发布房源的共:"+users.size() + println "鍙戝竷鎴挎簮鐨勫叡锛�"+users.size() def mobileMap = analyUserEmail(users); mobileMap.each {k,v-> @@ -342,7 +342,7 @@ class SimilarUserStat { def findTasks(){ DBObject query = new BasicDBObject(); - query.put("city", "上海") + query.put("city", "涓婃捣") def cursor = TASK_COLL.find(query); def ret = []; def index = 0; @@ -354,8 +354,8 @@ class SimilarUserStat { } index++; } - println "共:"+index; - println "结果:"+ret.size(); + println "鍏憋細"+index; + println "缁撴灉锛�"+ret.size(); return ret; } @@ -418,8 +418,8 @@ class SimilarUserStat { ret << id; } } - println "发过房源:"+ret.size() - println "发过房源:"+ret.unique().size() + println "鍙戣繃鎴挎簮:"+ret.size() + println "鍙戣繃鎴挎簮:"+ret.unique().size() return ret; } @@ -500,7 +500,7 @@ class SimilarUserStat { } def ret = [:]; println userIds.size(); - println "房源量:"+cursor.count(); + println "鎴挎簮閲�:"+cursor.count(); userIds.each { def date = findUserById(it) @@ -604,7 +604,7 @@ class SimilarUserStat { } def findUser(def cdate){ - def sql = "SELECT * FROM users WHERE date_created>='"+cdate+"' AND role=1 AND city='上海'"; + def sql = "SELECT * FROM users WHERE date_created>='"+cdate+"' AND role=1 AND city='涓婃捣'"; def ret = []; onLineSqlInstance.eachRow(sql,{ def map = [:] @@ -635,7 +635,7 @@ class SimilarUserStat { } def findPublishHouseUser(def cdate){ - def sql = "SELECT DISTINCT user_id FROM gold_logs WHERE date_created>='"+cdate+"' AND (content='发布租房信息' OR content='发布二手房信息')"; + def sql = "SELECT DISTINCT user_id FROM gold_logs WHERE date_created>='"+cdate+"' AND (content='鍙戝竷绉熸埧淇℃伅' OR content='鍙戝竷浜屾墜鎴夸俊鎭�')"; def ret = []; onLineSqlInstance.eachRow(sql,{ ret << it.user_id; @@ -679,15 +679,15 @@ class SimilarUserStat { } def export(ret){ - File file = new File("e:\\用户统计.csv"); + File file = new File("e:\\鐢ㄦ埛缁熻.csv"); if (file.exists()){ file.delete(); } - file.append("时间,") - file.append("总房源量,") - file.append("帐号数量,") - file.append("2015注册用户人数,") - file.append("新用户发布的房源量,") + file.append("鏃堕棿,") + file.append("鎬绘埧婧愰噺,") + file.append("甯愬彿鏁伴噺,") + file.append("2015娉ㄥ唽鐢ㄦ埛浜烘暟,") + file.append("鏂扮敤鎴峰彂甯冪殑鎴挎簮閲�,") file.append(System.getProperty("line.separator")); ret.each{ file.append(it.date + ",","gbk") @@ -701,12 +701,12 @@ class SimilarUserStat { def export2(ret){ - File file = new File("e:\\用户统计.csv"); + File file = new File("e:\\鐢ㄦ埛缁熻.csv"); if (file.exists()){ file.delete(); } - file.append("时间,") - file.append("人数,") + file.append("鏃堕棿,") + file.append("浜烘暟,") file.append(System.getProperty("line.separator")); ret.each{k,v-> file.append(k + ",","gbk") @@ -723,18 +723,18 @@ class SimilarUserStat { FileOutputStream fos = null; try { HSSFWorkbook WORK_BOOK = new HSSFWorkbook(); - HSSFSheet sheet = WORK_BOOK.createSheet("商铺"); + HSSFSheet sheet = WORK_BOOK.createSheet("鍟嗛摵"); int rowCount = sheet.getLastRowNum(); HSSFRow row0 = sheet.createRow(0); - row0.createCell(0).setCellValue("房价通帐号"); - row0.createCell(1).setCellValue("姓名"); - row0.createCell(2).setCellValue("房源数量"); - row0.createCell(3).setCellValue("手机号"); - row0.createCell(4).setCellValue("发布楼盘名称"); - row0.createCell(5).setCellValue("时间"); + row0.createCell(0).setCellValue("鎴夸环閫氬笎鍙�"); + row0.createCell(1).setCellValue("濮撳悕"); + row0.createCell(2).setCellValue("鎴挎簮鏁伴噺"); + row0.createCell(3).setCellValue("鎵嬫満鍙�"); + row0.createCell(4).setCellValue("鍙戝竷妤肩洏鍚嶇О"); + row0.createCell(5).setCellValue("鏃堕棿"); map.each {k,v-> diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/TimeoutBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/TimeoutBatch.groovy index 7f0f46c2d..5cafd970a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/TimeoutBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/TimeoutBatch.groovy @@ -29,7 +29,7 @@ class TimeoutBatch { static final Jms jms = Jms.create('tcp://jms.db.goojia.com:61616') static main(args) { - //每隔120分钟取一次 + //姣忛殧120鍒嗛挓鍙栦竴娆� Date now = new Date(); Calendar calendar = Calendar.getInstance(); calendar.setTime(new Date()); @@ -67,16 +67,16 @@ class TimeoutBatch { if(entry.value>maxFrequent){ maxFrequent = entry.value; if(entry.key){ - maxFrequentMessage = entry.key+"-:"+maxFrequent; + maxFrequentMessage = entry.key+"-锛�"+maxFrequent; } } stringBuilder.append(entry.key+"-: "+entry.value) } - maxFrequentMessage = "最频繁的方法:"+maxFrequentMessage+";\n"; - maxCostMessage = "最耗时的方法:"+maxCostMessage+";\n"; - String otherMessage = "报警详情:"+stringBuilder.toString(); + maxFrequentMessage = "鏈�棰戠箒鐨勬柟娉曪細"+maxFrequentMessage+";\n"; + maxCostMessage = "鏈�鑰楁椂鐨勬柟娉曪細"+maxCostMessage+";\n"; + String otherMessage = "鎶ヨ璇︽儏锛�"+stringBuilder.toString(); // println maxCostMessage; // println maxFrequentMessage; // println stringBuilder.toString(); @@ -90,8 +90,8 @@ class TimeoutBatch { } println "send:"+maxCostMessage+maxFrequentMessage+otherMessage; } - //统计出每个controller-action的超时次数 - //统计出最长的超时item + //缁熻鍑烘瘡涓猚ontroller-action鐨勮秴鏃舵鏁� + //缁熻鍑烘渶闀跨殑瓒呮椂item System.exit(0); } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/UnfreezeFjtUserGoldBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/UnfreezeFjtUserGoldBatch.groovy index 12b440a32..7a69d9e6f 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/UnfreezeFjtUserGoldBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/UnfreezeFjtUserGoldBatch.groovy @@ -13,7 +13,7 @@ import com.mongodb.DBObject import com.mongodb.Mongo /** - * 购买房调报告时,会冻结房币。如果没有付款,则定时解冻。 + * 璐拱鎴胯皟鎶ュ憡鏃讹紝浼氬喕缁撴埧甯併�傚鏋滄病鏈変粯娆撅紝鍒欏畾鏃惰В鍐汇�� * @author yukai * */ @@ -42,7 +42,7 @@ class UnfreezeFjtUserGoldBatch extends BaseBatch { } if (limitDate.before(line.c_date)) { - // 24小时内的记录不用管 + // 24灏忔椂鍐呯殑璁板綍涓嶇敤绠� return; } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/UserSubmitDistrictTaskBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/UserSubmitDistrictTaskBatch.groovy index dc32172e2..00501ea38 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/UserSubmitDistrictTaskBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/UserSubmitDistrictTaskBatch.groovy @@ -23,7 +23,7 @@ import com.mongodb.Mongo import java.util.regex.Pattern /** - * 用户做小区任务,将审核成功的进行小区更新 + * 鐢ㄦ埛鍋氬皬鍖轰换鍔★紝灏嗗鏍告垚鍔熺殑杩涜灏忓尯鏇存柊 * @author gaojuan * */ @@ -133,7 +133,7 @@ class UserSubmitDistrictTaskBatch extends BaseBatch{ def findUserSubmitTask(startDate, endDate){ DBObject q = new BasicDBObject(); - q.put("status", 1);//审核完成 + q.put("status", 1);//瀹℃牳瀹屾垚 q.put('beans', new BasicDBObject('$gt', 0)); q.put('c_date', new BasicDBObject('$gte', DateUtils.parseFromTightYYYYMMDD(startDate)).append('$lt', DateUtils.parseFromTightYYYYMMDD(endDate))); @@ -147,7 +147,7 @@ class UserSubmitDistrictTaskBatch extends BaseBatch{ fieldMap.each {k,v-> def field = toChangeField(k); - //栋 梯 户 + //鏍� 姊� 鎴� if(field != "buildings" && field != "stairs" && field != "houses"){ def val = obj.get(field); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/Area.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/Area.groovy index a9280cc87..dc88de4aa 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/Area.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/Area.groovy @@ -91,7 +91,7 @@ class Area { } result.insert(buffer) stat.clear() - println("清理缓存:$count") + println("娓呯悊缂撳瓨:$count") } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/Area10.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/Area10.groovy index 4515bcc6d..2aa59522e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/Area10.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/Area10.groovy @@ -119,7 +119,7 @@ class Area10 { int numKey=list0.indexOf(key) if(numKey+1==list0.size()){ map.put(key,map.get(list0.get(numKey-1))+30) - message=message+key+'室推算;' + message=message+key+'瀹ゆ帹绠�;' continue } def val1=map.get(list0.get(numKey+1)) @@ -131,7 +131,7 @@ class Area10 { def value=df.format(val) val=Double.parseDouble(value) map.put(key,val) - message=message+key+'室推算;' + message=message+key+'瀹ゆ帹绠�;' } data=map.get(key) } @@ -154,7 +154,7 @@ class Area10 { } DistrictTagBatch.district_tag_coll.update(q, u, true, false); - println("已跑完"+k+"个小区") + println("宸茶窇瀹�"+k+"涓皬鍖�") k++ } private static int getPurpose(area) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/CountByCity.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/CountByCity.groovy index 26e3d4d77..c22d01b51 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/CountByCity.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/CountByCity.groovy @@ -70,7 +70,7 @@ class CountByCity extends BaseBatch { } } if (i % 10000 == 0) { - println("执行进度:${DataUtil.getRound(2, ((i * 100)/total))}") + println("鎵ц杩涘害:${DataUtil.getRound(2, ((i * 100)/total))}") } i++ } @@ -87,14 +87,14 @@ class CountByCity extends BaseBatch { basicDBObject.put("num", num); basicDBObject.put("update_date", update_date); collA.insert(basicDBObject); - println("已插入" + j + "条数据"); + println("宸叉彃鍏�" + j + "鏉℃暟鎹�"); j++; } } def citys = collA.distinct("city"); def pl = 1; for (def city : citys) { - println("进入第" + pl + "个城市处理!"); + println("杩涘叆绗�" + pl + "涓煄甯傚鐞嗭紒"); def sum = 0; def listA = new ArrayList(); def listB = new ArrayList(); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/CountByRegion.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/CountByRegion.groovy index 5e55d0540..fdb1d8d22 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/CountByRegion.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/CountByRegion.groovy @@ -79,7 +79,7 @@ class CountByRegion extends BaseBatch { basicDBObject.put("num",num); basicDBObject.put("update_date",update_date); collA.insert(basicDBObject); - println("已插入"+j+"条数据"); + println("宸叉彃鍏�"+j+"鏉℃暟鎹�"); j++; } } @@ -87,7 +87,7 @@ class CountByRegion extends BaseBatch { def cityRegions=collA.distinct("cityRegion"); def pl=1; for(def cityRegion:cityRegions){ - println("进入第"+pl+"个区域处理!"); + println("杩涘叆绗�"+pl+"涓尯鍩熷鐞嗭紒"); def sum=0; def listA=new ArrayList(); def listB=new ArrayList(); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/DeleteSeawater.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/DeleteSeawater.groovy index 087d68f5f..0d42f8937 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/DeleteSeawater.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/DeleteSeawater.groovy @@ -15,7 +15,7 @@ import java.text.SimpleDateFormat /** * Created by Administrator on 2017/7/7. - *定时1个月跑一次房源库,去除与人工指导价差异不在-20%——20%之内的数据 + *瀹氭椂1涓湀璺戜竴娆℃埧婧愬簱锛屽幓闄や笌浜哄伐鎸囧浠峰樊寮備笉鍦�-20%鈥斺��20%涔嬪唴鐨勬暟鎹� */ @BatchOwner(Watcher.FangRui) public class DeleteSeawater extends BaseBatch { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/DistrictAvgPrice.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/DistrictAvgPrice.groovy index c427e10dd..421e4d681 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/DistrictAvgPrice.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/DistrictAvgPrice.groovy @@ -21,11 +21,11 @@ class DistrictAvgPrice { static def data=[] static Date end = DateUtil.getFirstDayOfWeek(new Date()); //static def citys=City.getCitys(); - static def citys=['安庆','滁州'] + static def citys=['瀹夊簡','婊佸窞'] public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(20) static Semaphore semaphore = new Semaphore(20) public static void main(String[] args) { - data<<['城市','均价'] + data<<['鍩庡競','鍧囦环'] CountDownLatch latch = new CountDownLatch(citys.size()) for(def city:citys){ final String new_city = city diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/LngLatEachWeek.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/LngLatEachWeek.groovy index 29478337f..ac63c6a10 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/LngLatEachWeek.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/LngLatEachWeek.groovy @@ -42,7 +42,7 @@ class LngLatEachWeek extends BaseBatch { def count=1; def j=0; def data=[]; - data <<['小区id','编号','城市','区域','名称']; + data <<['灏忓尯id','缂栧彿','鍩庡競','鍖哄煙','鍚嶇О']; DBUtils.seaweed.find(new BasicDBObject('cat','district').append('visible',0)).batchSize(500).each {q-> if(!q.lat2||!q.lng2){ def city=q.city @@ -69,20 +69,20 @@ class LngLatEachWeek extends BaseBatch { println(count) count++ } - ExcelUtils.write("D:\\FR\\未匹配上的小区经纬度.xlsx",data,"sheet"); + ExcelUtils.write("D:\\FR\\鏈尮閰嶄笂鐨勫皬鍖虹粡绾害.xlsx",data,"sheet"); String id = ObjectId.get().toString() BasicDBObject file = new BasicDBObject() file.put("t", "upload") file.put("content_type", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet") file.put("c_date", new Date()) file.put("_id", idGenerator(id, "o")) - file.put("data", new File("D:\\FR\\未匹配上的小区经纬度.xlsx").getBytes()) + file.put("data", new File("D:\\FR\\鏈尮閰嶄笂鐨勫皬鍖虹粡绾害.xlsx").getBytes()) fsDB.save(file) def href = DataUtil.encodePicUrl(id, "o", "upload") - href = "点击下载附件" - jms.sendMail("caoyuyan@fangjia.com","未匹配上的小区经纬度",href) - jms.sendMail("wangchencen@fangjia.com","未匹配上的小区经纬度",href) -// jms.sendMail("sunjian@fangjia.com","未匹配上的小区经纬度",href) + href = "鐐瑰嚮涓嬭浇闄勪欢" + jms.sendMail("caoyuyan@fangjia.com","鏈尮閰嶄笂鐨勫皬鍖虹粡绾害",href) + jms.sendMail("wangchencen@fangjia.com","鏈尮閰嶄笂鐨勫皬鍖虹粡绾害",href) +// jms.sendMail("sunjian@fangjia.com","鏈尮閰嶄笂鐨勫皬鍖虹粡绾害",href) } public static Map getLngLatByAddress(String city, String address){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/Util.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/Util.groovy index 13a8c2f99..d440344c6 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/Util.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/Util.groovy @@ -14,16 +14,16 @@ import java.util.regex.Pattern */ class Util { public static region(def str){ - str=StringUtils.substringAfter(str,"市"); + str=StringUtils.substringAfter(str,"甯�"); return str; } public static area(def str){ - str=StringUtils.substringBefore(str,"㎡"); + str=StringUtils.substringBefore(str,"銕�"); def m=Double.parseDouble(str.toString()) return m; } public static name(def str){ - Pattern pattern = Pattern.compile("(.{2,}?)(?=[\\d、]+幢)"); + Pattern pattern = Pattern.compile("(.{2,}?)(?=[\\d銆乚+骞�)"); Matcher matcher = pattern.matcher(str); if(matcher.find()) { return matcher.group(1) @@ -35,9 +35,9 @@ class Util { try { String encoding="GBK"; File file=new File(fileName); - if(file.isFile() && file.exists()){ //判断文件是否存在 + if(file.isFile() && file.exists()){ //鍒ゆ柇鏂囦欢鏄惁瀛樺湪 InputStreamReader read = new InputStreamReader( - new FileInputStream(file),encoding);//考虑到编码格式 + new FileInputStream(file),encoding);//鑰冭檻鍒扮紪鐮佹牸寮� BufferedReader bufferedReader = new BufferedReader(read); String lineTxt = null; while((lineTxt = bufferedReader.readLine()) != null){ @@ -45,10 +45,10 @@ class Util { } read.close(); }else{ - System.out.println("找不到指定的文件"); + System.out.println("鎵句笉鍒版寚瀹氱殑鏂囦欢"); } } catch (Exception e) { - System.out.println("读取文件内容出错"); + System.out.println("璇诲彇鏂囦欢鍐呭鍑洪敊"); e.printStackTrace(); } return list @@ -58,7 +58,7 @@ class Util { def dbo = DbUtils.findOneOnSeaweed(new BasicDBObject("city",city).append("region",region).append("name",name).append("cat","district").append("status",0), new BasicDBObject("city",1).append("region",1).append("name",1).append("sid",1).append("c_date",1)) if(dbo!=null){ - println "已存在****新增**********"+dbo + println "宸插瓨鍦�****鏂板**********"+dbo }else{ DBObject obj = new BasicDBObject() obj.put("city", city); @@ -78,7 +78,7 @@ class Util { new BasicDBObject("city",1).append("region",1).append("name",1).append("sid",1).append("c_date",1)) if(obj2==null){ DbUtils.seaweed.save(obj); - println "新增成功"+"********" + println "鏂板鎴愬姛"+"********" hadDoing++ } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/email/MailAuthenticator.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/email/MailAuthenticator.groovy index 2275163e8..5fa5c0508 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/email/MailAuthenticator.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/email/MailAuthenticator.groovy @@ -6,9 +6,9 @@ import javax.mail.URLName * Created by Administrator on 2017/9/26. */ class MailAuthenticator extends Authenticator { - /** 用户账号 */ + /** 鐢ㄦ埛璐﹀彿 */ String username; - /** 用户口令 */ + /** 鐢ㄦ埛鍙d护 */ String password; /** @@ -21,7 +21,7 @@ class MailAuthenticator extends Authenticator { } /** - * 身份验证 + * 韬唤楠岃瘉 * @return */ @Override diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/email/MailInfo.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/email/MailInfo.groovy index dcc24ee89..967756acc 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/email/MailInfo.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/email/MailInfo.groovy @@ -8,37 +8,37 @@ import java.security.GeneralSecurityException * Created by Administrator on 2017/9/26. */ class MailInfo { - /** 发送邮件的服务器的IP */ + /** 鍙戦�侀偖浠剁殑鏈嶅姟鍣ㄧ殑IP */ private String mailHost; - /** 发送邮件的服务器的端口 */ + /** 鍙戦�侀偖浠剁殑鏈嶅姟鍣ㄧ殑绔彛 */ private String mailPort = "465"; - /** 发送邮件的用户名(邮箱全名称) */ + /** 鍙戦�侀偖浠剁殑鐢ㄦ埛鍚嶏紙閭鍏ㄥ悕绉帮級 */ private String username; - /** 发送邮件的密码 */ + /** 鍙戦�侀偖浠剁殑瀵嗙爜 */ private String password; - /** 错误信息发送地址(多个邮件地址以";"分隔) */ + /** 閿欒淇℃伅鍙戦�佸湴鍧�锛堝涓偖浠跺湴鍧�浠�";"鍒嗛殧锛� */ private String errorTo; - /** 错误信息抄送地址(多个邮件地址以";"分隔) */ + /** 閿欒淇℃伅鎶勯�佸湴鍧�锛堝涓偖浠跺湴鍧�浠�";"鍒嗛殧锛� */ private String errorCc; - /** 警告信息发送地址(多个邮件地址以";"分隔) */ + /** 璀﹀憡淇℃伅鍙戦�佸湴鍧�锛堝涓偖浠跺湴鍧�浠�";"鍒嗛殧锛� */ private String warningTo; - /** 警告信息抄送地址(多个邮件地址以";"分隔) */ + /** 璀﹀憡淇℃伅鎶勯�佸湴鍧�锛堝涓偖浠跺湴鍧�浠�";"鍒嗛殧锛� */ private String warningCc; - /** 通知信息发送地址(多个邮件地址以";"分隔) */ + /** 閫氱煡淇℃伅鍙戦�佸湴鍧�锛堝涓偖浠跺湴鍧�浠�";"鍒嗛殧锛� */ private String notifyTo; - /** 通知信息抄送地址(多个邮件地址以";"分隔) */ + /** 閫氱煡淇℃伅鎶勯�佸湴鍧�锛堝涓偖浠跺湴鍧�浠�";"鍒嗛殧锛� */ private String notifyCc; - /** 邮件主题 */ + /** 閭欢涓婚 */ private String subject; - /** 邮件内容 */ + /** 閭欢鍐呭 */ private String content; - /** 邮件附件的文件名 */ + /** 閭欢闄勪欢鐨勬枃浠跺悕 */ private String[] attachFileNames; /** - * 获取邮件参数 + * 鑾峰彇閭欢鍙傛暟 * * @return * @throws GeneralSecurityException diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/email/MailSender.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/email/MailSender.groovy index def29b7df..60c820b4d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/email/MailSender.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/email/MailSender.groovy @@ -33,36 +33,36 @@ class MailSender { /** - * 以文本格式发送邮件 + * 浠ユ枃鏈牸寮忓彂閫侀偖浠� * * @param mailInfo - * 邮件信息 + * 閭欢淇℃伅 * @param mailType - * 邮件类型 1-error;2-warning;3-notify; + * 閭欢绫诲瀷 1-error锛�2-warning锛�3-notify锛� * @return * @throws Exception */ public boolean sendTextMail(MailInfo mailInfo, int mailType) throws Exception { - // 需要身份认证,创建一个密码验证器 + // 闇�瑕佽韩浠借璇侊紝鍒涘缓涓�涓瘑鐮侀獙璇佸櫒 MailAuthenticator authenticator = new MailAuthenticator(mailInfo.getUsername(), mailInfo.getPassword()); Properties prop = mailInfo.getProperties(); - // 根据邮件会话属性和密码验证器构造一个发送邮件的session + // 鏍规嵁閭欢浼氳瘽灞炴�у拰瀵嗙爜楠岃瘉鍣ㄦ瀯閫犱竴涓彂閫侀偖浠剁殑session Session sendMailSession = Session.getDefaultInstance(prop, authenticator); try { - // 根据session创建一个邮件消息 + // 鏍规嵁session鍒涘缓涓�涓偖浠舵秷鎭� Message mailMessage = new MimeMessage(sendMailSession); - // 创建邮件发送者地址 + // 鍒涘缓閭欢鍙戦�佽�呭湴鍧� Address from = new InternetAddress(mailInfo.getUsername()); - // 设置邮件消息的发送者 + // 璁剧疆閭欢娑堟伅鐨勫彂閫佽�� mailMessage.setFrom(from); - // 创建邮件的接收者地址 to:发送;cc:抄送 + // 鍒涘缓閭欢鐨勬帴鏀惰�呭湴鍧� to锛氬彂閫侊紱cc锛氭妱閫� Address[][] maillToArr = getMailToAddress(mailInfo, mailType); - // 设置邮件消息的接收者,发送,抄送 + // 璁剧疆閭欢娑堟伅鐨勬帴鏀惰�咃紝鍙戦�侊紝鎶勯�� if (maillToArr != null && maillToArr[0] != null && maillToArr[0].length > 0) { mailMessage.setRecipients(Message.RecipientType.TO, maillToArr[0]); } @@ -70,14 +70,14 @@ class MailSender { mailMessage.setRecipients(Message.RecipientType.CC, maillToArr[1]); } - // 设置邮件消息的主题 + // 璁剧疆閭欢娑堟伅鐨勪富棰� mailMessage.setSubject(mailInfo.getSubject()); - // 设置邮件消息发送的时间 + // 璁剧疆閭欢娑堟伅鍙戦�佺殑鏃堕棿 mailMessage.setSentDate(Calendar.getInstance().getTime()); - // 设置邮件消息的主要内容 + // 璁剧疆閭欢娑堟伅鐨勪富瑕佸唴瀹� mailMessage.setText(mailInfo.getContent()); - // 发送邮件 + // 鍙戦�侀偖浠� Transport.send(mailMessage); } catch (Exception e) { @@ -90,34 +90,34 @@ class MailSender { /** - * 以HTML格式发送邮件 + * 浠TML鏍煎紡鍙戦�侀偖浠� * * @param mailInfo - * 邮件信息 + * 閭欢淇℃伅 * @param mailType - * 邮件类型 1-error;2-warning;(默认)3-notify; + * 閭欢绫诲瀷 1-error锛�2-warning锛涳紙榛樿锛�3-notify锛� * @return * @throws Exception */ public boolean sendHtmlMail(MailInfo mailInfo, int mailType) throws Exception { - // 需要身份认证,创建一个密码验证器 + // 闇�瑕佽韩浠借璇侊紝鍒涘缓涓�涓瘑鐮侀獙璇佸櫒 Authenticator authenticator = new MailAuthenticator(mailInfo.getUsername(), mailInfo.getPassword()); Properties prop = mailInfo.getProperties(); - // 根据邮件会话属性和密码验证器构造一个发送邮件的session + // 鏍规嵁閭欢浼氳瘽灞炴�у拰瀵嗙爜楠岃瘉鍣ㄦ瀯閫犱竴涓彂閫侀偖浠剁殑session Session sendMailSession = Session.getDefaultInstance(prop,authenticator); try { - // 根据session创建一个邮件消息 + // 鏍规嵁session鍒涘缓涓�涓偖浠舵秷鎭� Message mailMessage = new MimeMessage(sendMailSession); - // 创建邮件发送者地址 + // 鍒涘缓閭欢鍙戦�佽�呭湴鍧� Address from = new InternetAddress(mailInfo.getUsername()); - // 设置邮件消息的发送者 + // 璁剧疆閭欢娑堟伅鐨勫彂閫佽�� mailMessage.setFrom(from); - // 创建邮件的接收者地址 to:发送;cc:抄送 + // 鍒涘缓閭欢鐨勬帴鏀惰�呭湴鍧� to锛氬彂閫侊紱cc锛氭妱閫� Address[][] maillToArr = getMailToAddress(mailInfo, mailType); - // 设置邮件消息的接收者,发送,抄送 + // 璁剧疆閭欢娑堟伅鐨勬帴鏀惰�咃紝鍙戦�侊紝鎶勯�� if (maillToArr != null && maillToArr[0] != null && maillToArr[0].length > 0) { mailMessage.setRecipients(Message.RecipientType.TO, maillToArr[0]); } @@ -125,33 +125,33 @@ class MailSender { mailMessage.setRecipients(Message.RecipientType.CC, maillToArr[1]); } - // 设置邮件消息的主题 + // 璁剧疆閭欢娑堟伅鐨勪富棰� mailMessage.setSubject(mailInfo.getSubject()); - // 设置邮件消息发送的时间 + // 璁剧疆閭欢娑堟伅鍙戦�佺殑鏃堕棿 mailMessage.setSentDate(Calendar.getInstance().getTime()); - // MimeMultipart类是一个容器类,包含MimeBodyPart类型的对象 + // MimeMultipart绫绘槸涓�涓鍣ㄧ被锛屽寘鍚玀imeBodyPart绫诲瀷鐨勫璞� Multipart multiPart = new MimeMultipart(); - // 创建一个包含HTML内容的MimeBodyPart + // 鍒涘缓涓�涓寘鍚獺TML鍐呭鐨凪imeBodyPart BodyPart bodyPart = new MimeBodyPart(); - // 设置html邮件消息内容 + // 璁剧疆html閭欢娑堟伅鍐呭 bodyPart.setContent(mailInfo.getContent(), "text/html; charset=utf-8"); multiPart.addBodyPart(bodyPart); - //添加附件 + //娣诲姞闄勪欢 if(mailInfo.getAttachFileNames().length != 0){ for(String attachFile : mailInfo.getAttachFileNames()){ bodyPart=new MimeBodyPart(); - FileDataSource fds=new FileDataSource(attachFile); //得到数据源 - bodyPart.setDataHandler(new DataHandler(fds)); //得到附件本身并放入BodyPart - bodyPart.setFileName(MimeUtility.encodeText(fds.getName())); //得到文件名并编码(防止中文文件名乱码)同样放入BodyPart + FileDataSource fds=new FileDataSource(attachFile); //寰楀埌鏁版嵁婧� + bodyPart.setDataHandler(new DataHandler(fds)); //寰楀埌闄勪欢鏈韩骞舵斁鍏odyPart + bodyPart.setFileName(MimeUtility.encodeText(fds.getName())); //寰楀埌鏂囦欢鍚嶅苟缂栫爜锛堥槻姝腑鏂囨枃浠跺悕涔辩爜锛夊悓鏍锋斁鍏odyPart multiPart.addBodyPart(bodyPart); } } - // 设置邮件消息的主要内容 + // 璁剧疆閭欢娑堟伅鐨勪富瑕佸唴瀹� mailMessage.setContent(multiPart); - // 发送邮件 + // 鍙戦�侀偖浠� Transport.send(mailMessage); } catch (Exception e) { @@ -164,13 +164,13 @@ class MailSender { /** - * 创建发送邮件列表地址对象 + * 鍒涘缓鍙戦�侀偖浠跺垪琛ㄥ湴鍧�瀵硅薄 * * @param mailInfo - * 邮件信息 + * 閭欢淇℃伅 * @param mailType - * 邮件类型 1-error;2-warning;(默认)3-notify; - * @return Address[0]:发送地址数组;Address[1]:抄送地址数组 + * 閭欢绫诲瀷 1-error锛�2-warning锛涳紙榛樿锛�3-notify锛� + * @return Address[0]锛氬彂閫佸湴鍧�鏁扮粍锛汚ddress[1]锛氭妱閫佸湴鍧�鏁扮粍 */ private Address[][] getMailToAddress(MailInfo mailInfo, int mailType) throws AddressException { Address[] toAdds = null; @@ -192,7 +192,7 @@ class MailSender { /** - * 构建MailInfo对象 + * 鏋勫缓MailInfo瀵硅薄 * @return */ public MailInfo getMailInfo() { @@ -203,11 +203,11 @@ class MailSender { info.setPassword("Goojia123456"); info.setNotifyTo("wangchencen@fangjia.com"); info.setNotifyCc("caoyuyan@fangjia.com"); - info.setSubject("测试附件邮件发送"); - info.setContent("写一个带附件的工具类,不知道可能成功不!"); + info.setSubject("娴嬭瘯闄勪欢閭欢鍙戦��"); + info.setContent("鍐欎竴涓甫闄勪欢鐨勫伐鍏风被锛屼笉鐭ラ亾鍙兘鎴愬姛涓嶏紒"); String []array=new String[1]; - array[0]="D:\\excel\\F3\\副本不合理值--建筑结构_映射填充_.xlsx" - info.setAttachFileNames(array);//添加附件 + array[0]="D:\\excel\\F3\\鍓湰涓嶅悎鐞嗗��--寤虹瓚缁撴瀯_鏄犲皠濉厖_.xlsx" + info.setAttachFileNames(array);//娣诲姞闄勪欢 return info; } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/email/SentEmail.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/email/SentEmail.groovy index 31b0cb050..9ad89e121 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/email/SentEmail.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/email/SentEmail.groovy @@ -37,11 +37,11 @@ class SentEmail { file.put("content_type", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet") file.put("c_date", new Date()) file.put("_id", SentEmail.idGenerator(id, "o")) - file.put("data", new File("D:\\excel\\F3\\副本不合理值--建筑结构_映射填充_.xlsx").getBytes()) + file.put("data", new File("D:\\excel\\F3\\鍓湰涓嶅悎鐞嗗��--寤虹瓚缁撴瀯_鏄犲皠濉厖_.xlsx").getBytes()) fsDB.save(file) def href = DataUtil.encodePicUrl(id, "o", "upload") - href = "下载附件" - jms.sendMail("yinjihuan@fangjia.com","测试附件", href)*/ + href = "涓嬭浇闄勪欢" + jms.sendMail("yinjihuan@fangjia.com","娴嬭瘯闄勪欢", href)*/ println( DigestUtils.md5Hex("wanger123")) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/noTimer/CityCoverRate.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/noTimer/CityCoverRate.groovy index a75c9e32b..25b00d7ed 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/noTimer/CityCoverRate.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/noTimer/CityCoverRate.groovy @@ -14,10 +14,10 @@ import java.text.DecimalFormat */ def coll = new Mongo("mongo.db.fangjia.com", 27017).getDB('fangjia_stat').getCollection('district_analy_data'); def citys=UpdateCityAndRegion.getCitys(); -//def citys=['安阳','滁州'] +//def citys=['瀹夐槼','婊佸窞'] DecimalFormat df = new DecimalFormat("0.00"); def data=[] -data<<['城市','覆盖率'] +data<<['鍩庡競','瑕嗙洊鐜�'] def j=1; def map=new HashMap() for(def city:citys){ @@ -42,7 +42,7 @@ for(def city:citys){ double numRate=Double.parseDouble(val) def s=numRate.toString()+'%' data<<[city,s] - println('已跑完'+j+'个城市') + println('宸茶窇瀹�'+j+'涓煄甯�') j++ } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/noTimer/DongGuan.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/noTimer/DongGuan.groovy index ab0e2a679..7ad56de0d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/noTimer/DongGuan.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/noTimer/DongGuan.groovy @@ -8,7 +8,7 @@ import com.fangjia.script.wenyan.auto.MultiThreadDistrictAutoProcessor */ def count=1 MultiThreadDistrictAutoProcessor multiThreadDistrictAutoProcessor=new MultiThreadDistrictAutoProcessor() -ExcelUtils.modify("D:\\excel\\F3\\副本东莞小区65后台字段填充.xlsx",{item-> +ExcelUtils.modify("D:\\excel\\F3\\鍓湰涓滆帪灏忓尯65鍚庡彴瀛楁濉厖.xlsx",{item-> def city=item['A'] def region=item['B'] def name=item['C'] diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/noTimer/FA65.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/noTimer/FA65.groovy index 4c822a964..1c788b589 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/noTimer/FA65.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/noTimer/FA65.groovy @@ -25,7 +25,7 @@ DBCollection coll = MongoUtils.getCollectionByName("coredata", "analy_site", "c //DBCollection seeds = MongoUtils.getCollectionByName("coredata", "seeds", "coredata.mongo.db.fangjia.com", 27017) def count=1 def data=[] -data<<['城市','区域','小区名','地址','物业类型','网站量/房源量','住宅比','地图库对比结果','网站列表'] +data<<['鍩庡競','鍖哄煙','灏忓尯鍚�','鍦板潃','鐗╀笟绫诲瀷','缃戠珯閲�/鎴挎簮閲�','浣忓畢姣�','鍦板浘搴撳姣旂粨鏋�','缃戠珯鍒楄〃'] MultiThreadDistrictAutoProcessor multiThreadDistrictAutoProcessor=new MultiThreadDistrictAutoProcessor() coll.find(new BasicDBObject()).addOption(Bytes.QUERYOPTION_NOTIMEOUT).batchSize(500).each { q-> if(q.cat=='district'&&q.audit_status==0&&q.data_status==0&&q.exists==0){ @@ -33,7 +33,7 @@ coll.find(new BasicDBObject()).addOption(Bytes.QUERYOPTION_NOTIMEOUT).batchSize( def list0a=new ArrayList() def address=new StringBuffer() def estate_type=new StringBuffer() - if(str.contains('链家在线')||str.contains('城市房产')){ + if(str.contains('閾惧鍦ㄧ嚎')||str.contains('鍩庡競鎴夸骇')){ List list0=multiThreadDistrictAutoProcessor.findFieldValueInCrawlerData(q.city.toString(),q.region.toString(),q.district_name.toString(),'address') List list1=multiThreadDistrictAutoProcessor.findFieldValueInCrawlerData(q.city.toString(),q.region.toString(),q.district_name.toString(),'estate_type2') for(def o:list0){ @@ -51,11 +51,11 @@ coll.find(new BasicDBObject()).addOption(Bytes.QUERYOPTION_NOTIMEOUT).batchSize( def diff=null if(StringUtils.isNotBlank(it)){ if(it=='not_exist'){ - diff='地图库不存在' + diff='鍦板浘搴撲笉瀛樺湪' }else if(it=='diff_region'){ - diff='区域不一致' + diff='鍖哄煙涓嶄竴鑷�' }else if(it=='alias_exist'){ - diff='是'+q.alias_name+'的别名' + diff='鏄�'+q.alias_name+'鐨勫埆鍚�' } } data<<[q.city,q.region,q.district_name,address.toString(),estate_type.toString(),q.site_count+'/'+q.house_num,q.district_ratio+'%',diff,q.site_names] @@ -65,7 +65,7 @@ coll.find(new BasicDBObject()).addOption(Bytes.QUERYOPTION_NOTIMEOUT).batchSize( } } DbUtils -println('开始读入excel') +println('寮�濮嬭鍏xcel') ExcelUtils.write("D:\\excel\\Data\\65.xlsx",data,'sheet') /*BlockData.formatBlock()*/ /*def keys=new BasicDBObject() diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/noTimer/FA65loudongCount.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/noTimer/FA65loudongCount.groovy index 03131c0d2..955598ca6 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/noTimer/FA65loudongCount.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/noTimer/FA65loudongCount.groovy @@ -11,7 +11,7 @@ import org.apache.commons.lang.StringUtils * Created by Administrator on 2017/9/12. */ def map=new HashMap() -ExcelUtils.read("D:\\excel\\F3\\副本不合理值--建筑结构_板楼_塔楼_.xlsx").each {item-> +ExcelUtils.read("D:\\excel\\F3\\鍓湰涓嶅悎鐞嗗��--寤虹瓚缁撴瀯_鏉挎ゼ_濉旀ゼ_.xlsx").each {item-> def key=item['B'] def value=item['C'] map.put(key,value) @@ -22,7 +22,7 @@ keys.city=1 keys.region=1 keys.name=1 keys.build_structure=1 -def data=['钢结构','钢、钢筋混凝土结构','钢筋混凝土结构','混合结构','砖木结构','其他结构'] +def data=['閽㈢粨鏋�','閽€�侀挗绛嬫贩鍑濆湡缁撴瀯','閽㈢瓔娣峰嚌鍦熺粨鏋�','娣峰悎缁撴瀯','鐮栨湪缁撴瀯','鍏朵粬缁撴瀯'] MultiThreadDistrictAutoProcessor multiThreadDistrictAutoProcessor=new MultiThreadDistrictAutoProcessor() int count=1 int sum=1 @@ -67,7 +67,7 @@ DBUtils.seaweed.find(new BasicDBObject('cat','district').append('visible',0),key BasicDBObject basicDBObject=new BasicDBObject('loudong_count',loudongCount) //DBUtils.seaweed.update(new BasicDBObject('_id',q._id),new BasicDBObject('$set',basicDBObject)) sum++ - println('已填充'+sum+'条') + println('宸插~鍏�'+sum+'鏉�') } }*/ @@ -77,13 +77,13 @@ DBUtils.seaweed.find(new BasicDBObject('cat','district').append('visible',0),key def result=map.get(build_structure) BasicDBObject basicDBObject=new BasicDBObject('build_structure',result) DBUtils.seaweed.update(new BasicDBObject('_id',q._id),new BasicDBObject('$set',basicDBObject)) - println('已填充'+sum+'条') + println('宸插~鍏�'+sum+'鏉�') sum++ }*/ sum++ if(sum%1000==0){ - println('已填充'+sum+'条') + println('宸插~鍏�'+sum+'鏉�') } } @@ -92,7 +92,7 @@ DBUtils.seaweed.find(new BasicDBObject('cat','district').append('visible',0),key } count++ } -println("总量:"+sum) -println "库中小区:"+count +println("鎬婚噺锛�"+sum) +println "搴撲腑灏忓尯锛�"+count println((double)sum/count) -/*ExcelUtils.write("D:\\excel\\F1\\不合理值.xlsx",data,'sheet')*/ +/*ExcelUtils.write("D:\\excel\\F1\\涓嶅悎鐞嗗��.xlsx",data,'sheet')*/ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/noTimer/FangGuanJu.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/noTimer/FangGuanJu.groovy index afcec5f82..476a44db9 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/noTimer/FangGuanJu.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/noTimer/FangGuanJu.groovy @@ -11,16 +11,16 @@ import com.mongodb.DBCursor */ List list=new ArrayList(); -def filepath="D:\\excel\\房管局" +def filepath="D:\\excel\\鎴跨灞�" File file = new File(filepath); if (!file.isDirectory()) { - System.out.println("文件"); + System.out.println("鏂囦欢"); System.out.println("path=" + file.getPath()); System.out.println("absolutepath=" + file.getAbsolutePath()); System.out.println("name=" + file.getName()); } else if (file.isDirectory()) { - System.out.println("文件夹"); + System.out.println("鏂囦欢澶�"); String[] filelist = file.list(); for (int i = 0; i < filelist.length; i++) { File readfile = new File(filepath + "\\" + filelist[i]); @@ -38,14 +38,14 @@ for(String path:list){ println(path) ExcelUtils.read(path).each {item-> def dealway=item['H'] - if(!dealway.equals("无效")&&!dealway.equals("新增")&&!dealway.equals("非住宅")){ + if(!dealway.equals("鏃犳晥")&&!dealway.equals("鏂板")&&!dealway.equals("闈炰綇瀹�")){ def city=item['B'] def region=item['C'] def name=item['D'] def SID=item['E'] def nameInseaweed=item['F'] DBCursor dbCursor=coll.find(new BasicDBObject('city',city).append('region',region).append('name',name). - append('status',0).append('from','房管局')) + append('status',0).append('from','鎴跨灞�')) for(BasicDBObject basicDBObject:dbCursor){ def room_num=basicDBObject.room_num def house_area=basicDBObject.house_area diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/noTimer/SimpleDistrict.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/noTimer/SimpleDistrict.groovy index c7c61b319..a93ea54a1 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/noTimer/SimpleDistrict.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/noTimer/SimpleDistrict.groovy @@ -18,8 +18,8 @@ import org.apache.commons.lang.StringUtils def coll = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", MongoUtils.MongoDB_Domain_mongo) def data=[] def data1=[] -data<<['城市','城市小区总量','城市相似小区量','城市相似小区占比'] -data1<<['城市','区域','区域小区总量','区域相似小区量','区域相似小区占比'] +data<<['鍩庡競','鍩庡競灏忓尯鎬婚噺','鍩庡競鐩镐技灏忓尯閲�','鍩庡競鐩镐技灏忓尯鍗犳瘮'] +data1<<['鍩庡競','鍖哄煙','鍖哄煙灏忓尯鎬婚噺','鍖哄煙鐩镐技灏忓尯閲�','鍖哄煙鐩镐技灏忓尯鍗犳瘮'] Date end = DateUtil.getFirstDayOfWeek(new Date()); def citys=UpdateCityAndRegion.getCitys(); Map map1=new HashMap<>(); @@ -64,7 +64,7 @@ for(def city:citys){ } } data <<[city,dsCursor.count(),count,(double)count/(double)dsCursor.count()] - println('已跑完'+m+'个城市') + println('宸茶窇瀹�'+m+'涓煄甯�') m++ } @@ -72,5 +72,5 @@ for(def o:map1.keySet()){ def array=o.split('|') data1 <<[array[0],array[1],map1.get(o),map2.get(o),(double)map2.get(o)/(double)map1.get(o)] } -ExcelUtils.write("D:\\excel\\Data\\相似小区.xlsx", data, "Sheet1") -ExcelUtils.write("D:\\excel\\Data\\相似小区.xlsx", data1, "Sheet2") \ No newline at end of file +ExcelUtils.write("D:\\excel\\Data\\鐩镐技灏忓尯.xlsx", data, "Sheet1") +ExcelUtils.write("D:\\excel\\Data\\鐩镐技灏忓尯.xlsx", data1, "Sheet2") \ No newline at end of file diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/noTimer/UpdateCityAndRegion.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/noTimer/UpdateCityAndRegion.groovy index 6d691b055..ab3a9c60c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/noTimer/UpdateCityAndRegion.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/noTimer/UpdateCityAndRegion.groovy @@ -83,7 +83,7 @@ class UpdateCityAndRegion{ } return true; } - //获取全国城市 + //鑾峰彇鍏ㄥ浗鍩庡競 public static boolean getCityDistrictByFields(String city,String region,String name){ BasicDBObject qu = new BasicDBObject() qu.append("city", city) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/noTimer/YunGuJia.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/noTimer/YunGuJia.groovy index bd69122cd..54c36fc19 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/noTimer/YunGuJia.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/noTimer/YunGuJia.groovy @@ -16,7 +16,7 @@ List list1=new ArrayList() def m=1 def n=1 def o=1 -ExcelUtils.read("D:\\excel\\Data\\副本云估价房价网都存在小区.xlsx").each { item -> +ExcelUtils.read("D:\\excel\\Data\\鍓湰浜戜及浠锋埧浠风綉閮藉瓨鍦ㄥ皬鍖�.xlsx").each { item -> def city=item['A'] if(StringUtils.isBlank(item['A'])){ city='' @@ -39,7 +39,7 @@ ExcelUtils.read("D:\\excel\\Data\\ m++ } -ExcelUtils.read("D:\\excel\\Data\\副本云估价数据_需重跑_.xlsx").each { item -> +ExcelUtils.read("D:\\excel\\Data\\鍓湰浜戜及浠锋暟鎹甠闇�閲嶈窇_.xlsx").each { item -> def city=item['A'] if(StringUtils.isBlank(item['A'])){ city='' @@ -62,7 +62,7 @@ ExcelUtils.read("D:\\excel\\Data\\ n++ } -ExcelUtils.read("D:\\excel\\Data\\副本云估价新抓小区__8月_--原表.xlsx").each { item -> +ExcelUtils.read("D:\\excel\\Data\\鍓湰浜戜及浠锋柊鎶撳皬鍖篲_8鏈坃--鍘熻〃.xlsx").each { item -> def projectid=(Integer)item['A'] def city=item['B'] if(StringUtils.isBlank(item['B'])){ @@ -80,8 +80,8 @@ ExcelUtils.read("D:\\excel\\Data\\ def data1=[] def data2=[] -data1 <<['projectid','城市','区域','小区名','地址'] -data2 <<['projectid','城市','区域','小区名','地址'] +data1 <<['projectid','鍩庡競','鍖哄煙','灏忓尯鍚�','鍦板潃'] +data2 <<['projectid','鍩庡競','鍖哄煙','灏忓尯鍚�','鍦板潃'] def count=1 def j=1 coll.find().addOption(Bytes.QUERYOPTION_NOTIMEOUT).batchSize(500).each { q -> @@ -92,7 +92,7 @@ coll.find().addOption(Bytes.QUERYOPTION_NOTIMEOUT).batchSize(500).each { q -> def address=detail.get('address') def name=StringUtils.substringBefore(projectname,'[') def region=StringUtils.substringBetween(projectname,'[',']') - //region=region.replaceAll('区','') + //region=region.replaceAll('鍖�','') //def key=city+region+name def key=city+name def key0=projectid+city @@ -109,6 +109,6 @@ coll.find().addOption(Bytes.QUERYOPTION_NOTIMEOUT).batchSize(500).each { q -> } j++ } -ExcelUtils.write("D:\\excel\\Data\\云估价小区B.xlsx",data1,'sheeet1') -ExcelUtils.write("D:\\excel\\Data\\云估价小区B.xlsx",data2,'sheeet2') +ExcelUtils.write("D:\\excel\\Data\\浜戜及浠峰皬鍖築.xlsx",data1,'sheeet1') +ExcelUtils.write("D:\\excel\\Data\\浜戜及浠峰皬鍖築.xlsx",data2,'sheeet2') diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/noTimer/YunGuJia2.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/noTimer/YunGuJia2.groovy index eac1762ef..b7831661f 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/noTimer/YunGuJia2.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/noTimer/YunGuJia2.groovy @@ -44,50 +44,50 @@ class YunGuJia2 { def seaName=item['G'] BasicDBObject basicDBObject=DbUtils.seaweed.findOne(new BasicDBObject('_id',new ObjectId(id))) - /* if('地址别名'.equals(dealWay)){ + /* if('鍦板潃鍒悕'.equals(dealWay)){ if(YunGuJia2.doDZBM(basicDBObject,YUNaddress)){ - item['S']='是' + item['S']='鏄�' } - }else if('地址替换'.equals(dealWay)){ + }else if('鍦板潃鏇挎崲'.equals(dealWay)){ if(YunGuJia2.doDZTH(basicDBObject,YUNaddress,seaAddress)){ - item['S']='是' + item['S']='鏄�' } - }else if('名称别名'.equals(dealWay)){ + }else if('鍚嶇О鍒悕'.equals(dealWay)){ if(YunGuJia2.doMCBM(basicDBObject,YUNname,seaName)){ - item['S']='是' + item['S']='鏄�' } - }else if('名称别名,地址别名'.equals(dealWay)){ + }else if('鍚嶇О鍒悕,鍦板潃鍒悕'.equals(dealWay)){ boolean tag1=YunGuJia2.doMCBM(basicDBObject,YUNname,seaName) boolean tag2=YunGuJia2.doDZBM(basicDBObject,YUNaddress) if(tag1||tag2){ - item['S']='是' + item['S']='鏄�' } - }else if('名称别名,地址替换'.equals(dealWay)){ + }else if('鍚嶇О鍒悕,鍦板潃鏇挎崲'.equals(dealWay)){ boolean tag1=YunGuJia2.doMCBM(basicDBObject,YUNname,seaName) boolean tag2=YunGuJia2.doDZTH(basicDBObject,YUNaddress,seaAddress) if(tag1||tag2){ - item['S']='是' + item['S']='鏄�' } - }else*/ if('新增'.equals(dealWay)){ + }else*/ if('鏂板'.equals(dealWay)){ def city=item['B'] def region=item['P'] def name=item['Q'].toString() def address=item['R'].toString() def beizhu=item['O'] def estate_type2 = '' - if('商住'.equals(beizhu)){ - estate_type2 = '商住' - }else if('别墅'.equals(beizhu)){ - estate_type2 = '别墅' - }else if('普通住宅'.equals(beizhu)){ - estate_type2 = '普通住宅' + if('鍟嗕綇'.equals(beizhu)){ + estate_type2 = '鍟嗕綇' + }else if('鍒'.equals(beizhu)){ + estate_type2 = '鍒' + }else if('鏅�氫綇瀹�'.equals(beizhu)){ + estate_type2 = '鏅�氫綇瀹�' } else { - if (name.contains('商住')) { - estate_type2 = '商住' - } else if (name.contains('别墅')) { - estate_type2 = '别墅' + if (name.contains('鍟嗕綇')) { + estate_type2 = '鍟嗕綇' + } else if (name.contains('鍒')) { + estate_type2 = '鍒' } else { - estate_type2 = '普通住宅' + estate_type2 = '鏅�氫綇瀹�' } } def addr_alias=new ArrayList() @@ -113,7 +113,7 @@ class YunGuJia2 { println(count) count++ }) - println('总共新增'+hadDoing+'条') + println('鎬诲叡鏂板'+hadDoing+'鏉�') } public static doDZBM(BasicDBObject basicDBObject,def YUNaddress){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/noTimer/YunGuJia3.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/noTimer/YunGuJia3.groovy index 7420b6d8f..31f95e569 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/noTimer/YunGuJia3.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/noTimer/YunGuJia3.groovy @@ -21,7 +21,7 @@ class YunGuJia3 { public static void readExcel(){ def hadDoing=0 def count=1 - ExcelUtils.modify("D:\\excel\\F3\\副本云估价接口匹配-9月_漏数据-需入库.xlsx",{ item -> + ExcelUtils.modify("D:\\excel\\F3\\鍓湰浜戜及浠锋帴鍙e尮閰�-9鏈坃婕忔暟鎹�-闇�鍏ュ簱.xlsx",{ item -> def YUNcity=null if(StringUtils.isNotBlank(item['B'])){ YUNcity=item['B'].toString() @@ -47,64 +47,64 @@ class YunGuJia3 { def dealWay=item['S'] BasicDBObject basicDBObject1=DbUtils.seaweed.findOne(new BasicDBObject('_id',new ObjectId(idFromName))) BasicDBObject basicDBObject2=DbUtils.seaweed.findOne(new BasicDBObject('_id',new ObjectId(idFromAddress))) - if('地址别名(地址)'.equals(dealWay)){ + if('鍦板潃鍒悕(鍦板潃锛�'.equals(dealWay)){ if(YunGuJia3.doDZBM(basicDBObject2,YUNaddress)){ - item['X']='是' + item['X']='鏄�' } - } else if('地址别名(名称)'.equals(dealWay)){ + } else if('鍦板潃鍒悕(鍚嶇О锛�'.equals(dealWay)){ if(YunGuJia3.doDZBM(basicDBObject1,YUNaddress)){ - item['X']='是' + item['X']='鏄�' } - }else if('名称别名(地址)'.equals(dealWay)){ + }else if('鍚嶇О鍒悕(鍦板潃锛�'.equals(dealWay)){ if(YunGuJia3.doMCBM(basicDBObject2,YUNname,nameFromAddres)){ - item['X']='是' + item['X']='鏄�' } - } else if('名称别名(名称)'.equals(dealWay)){ + } else if('鍚嶇О鍒悕(鍚嶇О锛�'.equals(dealWay)){ if(YunGuJia3.doMCBM(basicDBObject1,YUNname,nameFromName)){ - item['X']='是' + item['X']='鏄�' } - } else if('地址替换(名称)'.equals(dealWay)){ + } else if('鍦板潃鏇挎崲(鍚嶇О锛�'.equals(dealWay)){ if(YunGuJia3.doDZTH(basicDBObject1,YUNaddress,addressFromName)){ - item['X']='是' + item['X']='鏄�' } - }else if('名称别名,地址别名(地址)'.equals(dealWay)){ + }else if('鍚嶇О鍒悕,鍦板潃鍒悕(鍦板潃锛�'.equals(dealWay)){ boolean tag1=YunGuJia3.doMCBM(basicDBObject2,YUNname,nameFromAddres) boolean tag2=YunGuJia3.doDZBM(basicDBObject2,YUNaddress) if(tag1||tag2){ - item['X']='是' + item['X']='鏄�' } - }else if('名称别名,地址别名(名称)'.equals(dealWay)){ + }else if('鍚嶇О鍒悕,鍦板潃鍒悕(鍚嶇О锛�'.equals(dealWay)){ boolean tag1=YunGuJia3.doMCBM(basicDBObject1,YUNname,nameFromName) boolean tag2=YunGuJia3.doDZBM(basicDBObject1,YUNaddress) if(tag1||tag2){ - item['X']='是' + item['X']='鏄�' } - }else if('名称别名,地址替换(名称)'.equals(dealWay)){ + }else if('鍚嶇О鍒悕,鍦板潃鏇挎崲(鍚嶇О锛�'.equals(dealWay)){ boolean tag1=YunGuJia3.doMCBM(basicDBObject1,YUNname,nameFromName) boolean tag2=YunGuJia3.doDZTH(basicDBObject1,YUNaddress,addressFromName) if(tag1||tag2){ - item['X']='是' + item['X']='鏄�' } - } else if('新增'.equals(dealWay)){ + } else if('鏂板'.equals(dealWay)){ def city=item['B'] def region=item['U'] def name=item['V'].toString() def address=item['W'].toString() def beizhu=item['T'] def estate_type2 = '' - if('商住'.equals(beizhu)){ - estate_type2 = '商住' - }else if('别墅'.equals(beizhu)){ - estate_type2 = '别墅' - }else if('普通住宅'.equals(beizhu)){ - estate_type2 = '普通住宅' + if('鍟嗕綇'.equals(beizhu)){ + estate_type2 = '鍟嗕綇' + }else if('鍒'.equals(beizhu)){ + estate_type2 = '鍒' + }else if('鏅�氫綇瀹�'.equals(beizhu)){ + estate_type2 = '鏅�氫綇瀹�' } else { - if (name.contains('商住')) { - estate_type2 = '商住' - } else if (name.contains('别墅')) { - estate_type2 = '别墅' + if (name.contains('鍟嗕綇')) { + estate_type2 = '鍟嗕綇' + } else if (name.contains('鍒')) { + estate_type2 = '鍒' } else { - estate_type2 = '普通住宅' + estate_type2 = '鏅�氫綇瀹�' } } def addr_alias=new ArrayList() @@ -124,14 +124,14 @@ class YunGuJia3 { region=RegionData.formatRegion(city,region) if(RegionData.isRegion(city,region)){ hadDoing= Util.addDistrict(city, region, name, estate_type2, address,alias, addr_alias, 'YUNGUJIA',hadDoing) - item['X']='是' + item['X']='鏄�' } } } println(count) count++ }) - println('总共新增'+hadDoing+'条') + println('鎬诲叡鏂板'+hadDoing+'鏉�') } public static doDZBM(BasicDBObject basicDBObject,def YUNaddress){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/noTimer/YunGuJia4.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/noTimer/YunGuJia4.groovy index 14175c4e3..7840e7ceb 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/noTimer/YunGuJia4.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/noTimer/YunGuJia4.groovy @@ -16,7 +16,7 @@ class YunGuJia4 { def hadDoing=0 def count=0 def j=1 - ExcelUtils.modify('D:\\excel\\F1\\副本云估价接口匹配_未匹配需入库_.xlsx',{item-> + ExcelUtils.modify('D:\\excel\\F1\\鍓湰浜戜及浠锋帴鍙e尮閰峗鏈尮閰嶉渶鍏ュ簱_.xlsx',{item-> def city=item['B'] def dealway=item['H'] def beizhu=item['I'] @@ -24,20 +24,20 @@ class YunGuJia4 { def name=item['K'].toString() def address=item['L'] def estate_type2 = '' - if('新增'.equals(dealway)){ - if('商住'.equals(beizhu)){ - estate_type2 = '商住' - }else if('别墅'.equals(beizhu)){ - estate_type2 = '别墅' - }else if('普通住宅'.equals(beizhu)){ - estate_type2 = '普通住宅' + if('鏂板'.equals(dealway)){ + if('鍟嗕綇'.equals(beizhu)){ + estate_type2 = '鍟嗕綇' + }else if('鍒'.equals(beizhu)){ + estate_type2 = '鍒' + }else if('鏅�氫綇瀹�'.equals(beizhu)){ + estate_type2 = '鏅�氫綇瀹�' } else { - if (name.contains('商住')) { - estate_type2 = '商住' - } else if (name.contains('别墅')) { - estate_type2 = '别墅' + if (name.contains('鍟嗕綇')) { + estate_type2 = '鍟嗕綇' + } else if (name.contains('鍒')) { + estate_type2 = '鍒' } else { - estate_type2 = '普通住宅' + estate_type2 = '鏅�氫綇瀹�' } } city=AddressUtil.formatCity(city) @@ -47,7 +47,7 @@ class YunGuJia4 { count=hadDoing hadDoing= Util.addDistrict(city, region, name, estate_type2, address, 'YUNGUJIA',hadDoing) if(count!=hadDoing){ - item['R']='是' + item['R']='鏄�' } } } @@ -57,6 +57,6 @@ class YunGuJia4 { j++ }) - println('共入库'+hadDoing+'条数据') + println('鍏卞叆搴�'+hadDoing+'鏉℃暟鎹�') } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/noTimer/YunGuJia9.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/noTimer/YunGuJia9.groovy index c74aca7dc..681c0a91f 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/noTimer/YunGuJia9.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/noTimer/YunGuJia9.groovy @@ -22,7 +22,7 @@ class YunGuJia9 { public static void readExcel(){ def hadDoing=0 def count=1 - ExcelUtils.modify("D:\\excel\\F3\\副本云估价接口匹配-9月_漏数据-需入库.xlsx",{item-> + ExcelUtils.modify("D:\\excel\\F3\\鍓湰浜戜及浠锋帴鍙e尮閰�-9鏈坃婕忔暟鎹�-闇�鍏ュ簱.xlsx",{item-> def YUNcity=null if(StringUtils.isNotBlank(item['B'])){ YUNcity=item['B'].toString() @@ -50,49 +50,49 @@ class YunGuJia9 { def id=item['J'] def dealWay=item['S'] BasicDBObject basicDBObject=DbUtils.seaweed.findOne(new BasicDBObject('_id',new ObjectId(id))) - if(dealWay.equals('地址别名')){ + if(dealWay.equals('鍦板潃鍒悕')){ if(YunGuJia9.doDZBM(basicDBObject,YUNaddress,seaAddress)){ - item['X']='是' + item['X']='鏄�' } - }else if(dealWay.equals('地址替换')){ + }else if(dealWay.equals('鍦板潃鏇挎崲')){ if(YunGuJia9.doDZTH(basicDBObject,YUNaddress,seaAddress)){ - item['X']='是' + item['X']='鏄�' } - }else if(dealWay.equals('名称别名')){ + }else if(dealWay.equals('鍚嶇О鍒悕')){ if(YunGuJia9.doMCBM(basicDBObject,YUNname,seaName)){ - item['X']='是' + item['X']='鏄�' } - }else if(dealWay.equals('名称别名,地址别名')){ + }else if(dealWay.equals('鍚嶇О鍒悕,鍦板潃鍒悕')){ boolean tag1=YunGuJia9.doMCBM(basicDBObject,YUNname,seaName) boolean tag2=YunGuJia9.doDZBM(basicDBObject,YUNaddress,seaAddress) if(tag1||tag2){ - item['X']='是' + item['X']='鏄�' } - }else if(dealWay.equals('名称别名,地址替换')){ + }else if(dealWay.equals('鍚嶇О鍒悕,鍦板潃鏇挎崲')){ boolean tag1=YunGuJia9.doMCBM(basicDBObject,YUNname,seaName) boolean tag2=YunGuJia9.doDZTH(basicDBObject,YUNaddress,seaAddress) if(tag1||tag2){ - item['X']='是' + item['X']='鏄�' } - }else if(dealWay.equals('新增')){ + }else if(dealWay.equals('鏂板')){ def region=item['U'] def name=item['V'].toString() def address=item['W'].toString() def beizhu=item['T'] def estate_type2 = '' - if('商住'.equals(beizhu)){ - estate_type2 = '商住' - }else if('别墅'.equals(beizhu)){ - estate_type2 = '别墅' - }else if('普通住宅'.equals(beizhu)){ - estate_type2 = '普通住宅' + if('鍟嗕綇'.equals(beizhu)){ + estate_type2 = '鍟嗕綇' + }else if('鍒'.equals(beizhu)){ + estate_type2 = '鍒' + }else if('鏅�氫綇瀹�'.equals(beizhu)){ + estate_type2 = '鏅�氫綇瀹�' } else { - if (name.contains('商住')) { - estate_type2 = '商住' - } else if (name.contains('别墅')) { - estate_type2 = '别墅' + if (name.contains('鍟嗕綇')) { + estate_type2 = '鍟嗕綇' + } else if (name.contains('鍒')) { + estate_type2 = '鍒' } else { - estate_type2 = '普通住宅' + estate_type2 = '鏅�氫綇瀹�' } } def addr_alias=new ArrayList() @@ -112,14 +112,14 @@ class YunGuJia9 { region=RegionData.formatRegion(city,region) if(RegionData.isRegion(city,region)){ hadDoing= Util.addDistrict(city, region, name, estate_type2, address,alias, addr_alias, 'YUNGUJIA',hadDoing) - item['X']='是' + item['X']='鏄�' } } } println(count) count++ }) - println('总共新增'+hadDoing+'条') + println('鎬诲叡鏂板'+hadDoing+'鏉�') } public static doDZBM(BasicDBObject basicDBObject, def YUNaddress,def seaAddress){ boolean flag=false diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/spider/WeiPing.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/spider/WeiPing.groovy index ab69db3f6..eff65a457 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/spider/WeiPing.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/spider/WeiPing.groovy @@ -34,7 +34,7 @@ class WeiPing { headers.put("Connection","keep-alive") def content=HttpClient.get(url,headers,2000,10000,true) JSONObject jsonObject=JSONObject.fromObject(content) - println('开始睡眠20s') + println('寮�濮嬬潯鐪�20s') Thread.sleep(20000) for(JSONObject o:jsonObject.List){ def num=o.DistrictID @@ -52,7 +52,7 @@ class WeiPing { String link="http://wx.surea.com/api/Viss/GetProjectListBySchool?SchoolID="+schoolId+"&sortColumn=1&sort=true" String reA="http://wx.surea.com/MobileView/Viss/SchoolProList.htm?sname=%u4E0A%u6D77%u5E02%u6D66%u4E1C%u65B0%u533A%u798F%u5C71%u5916%u56FD%u8BED%u5C0F%u5B66%uFF08%u745E%u534E%u6821%u533A%uFF09&SchoolId="+schoolId headers.put("Referer",reA) - println('开始睡眠20s') + println('寮�濮嬬潯鐪�20s') Thread.sleep(20000) def contentB=HttpClient.get(link,headers,2000,10000,true) if(contentB==null){ @@ -72,7 +72,7 @@ class WeiPing { BasicDBObject basicDBObject1=COLL.findOne(new BasicDBObject("ProjectId",objso.ProjectId)) if(basicDBObject1==null){ COLL.save(basicDBObject) - println("已抓取"+sum+"条*******"+objso.ProjectId) + println("宸叉姄鍙�"+sum+"鏉�*******"+objso.ProjectId) sum++ } /* def id=objso.Id @@ -87,7 +87,7 @@ class WeiPing { BasicDBObject basicDBObject1=COLL.findOne(new BasicDBObject("ProjectId",json.ProjectId)) if(basicDBObject1==null){ COLL.save(basicDBObject) - println("已抓取"+sum+"条*******"+projectId) + println("宸叉姄鍙�"+sum+"鏉�*******"+projectId) sum++ }*/ } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/spider/Xuxiaoyu.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/spider/Xuxiaoyu.groovy index 66daf0740..904e7c993 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/spider/Xuxiaoyu.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangrui/spider/Xuxiaoyu.groovy @@ -21,11 +21,11 @@ class Xuxiaoyu { static DBCollection COLL = MongoUtils.getCollectionByName("mantanghong", "xuxiaoyu", '192.168.0.61', 27017) public static void main(String[] args) { def data=[] - data<<['公司名称(必填)','联系人','联系方式'] + data<<['鍏徃鍚嶇О(蹇呭~)','鑱旂郴浜�','鑱旂郴鏂瑰紡'] COLL.find().each {q-> String news=q.news - news=StringUtils.substringAfter(news,'电话:') - news=StringUtils.substringBefore(news,'邮箱') + news=StringUtils.substringAfter(news,'鐢佃瘽锛�') + news=StringUtils.substringBefore(news,'閭') data<<[q.name,q.person,news] } ExcelUtils.write("D:\\excel\\Data\\xuxiaoyuA.xlsx",data,"sheet") @@ -51,11 +51,11 @@ class Xuxiaoyu { String news=doca.select(".clear.text-ellipsis.m-t-xs.text-md.text-black.ma_line2").text() String person=null try{ - person=doca.select("td:matches(法定代表人)+td>a").get(0).text() + person=doca.select("td:matches(娉曞畾浠h〃浜�)+td>a").get(0).text() }catch (Exception e){ } - String hangye=doca.select("td:matches(所属行业)+td").text() + String hangye=doca.select("td:matches(鎵�灞炶涓�)+td").text() BasicDBObject basicDBObject=new BasicDBObject() basicDBObject.put("name",name) basicDBObject.put("news",news) @@ -64,7 +64,7 @@ class Xuxiaoyu { BasicDBObject basicDBObject1=COLL.findOne(new BasicDBObject('name',name)) if(basicDBObject1==null){ COLL.save(basicDBObject) - println('已抓取'+count+'条') + println('宸叉姄鍙�'+count+'鏉�') count++ } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fpk/DistrictInfoAnaly.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fpk/DistrictInfoAnaly.groovy index 3c39e5892..85e361919 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fpk/DistrictInfoAnaly.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fpk/DistrictInfoAnaly.groovy @@ -11,13 +11,13 @@ import com.mongodb.Bytes import com.mongodb.DBCollection /** - * 房凭卡小区信息分析 + * 鎴垮嚟鍗″皬鍖轰俊鎭垎鏋� * Created by wenyan on 2015/12/29. */ //@BatchOwner(Watcher.WangWenYan) public class DistrictInfoAnaly extends BaseBatch{ - def CITY_LIST = ["上海", "北京"] + def CITY_LIST = ["涓婃捣", "鍖椾含"] DBCollection DISTRICT_HOT = MongoUtils.getCollectionByName("fangjia", "district_hot", "mongo.db.fangjia.com") DBCollection DISTRICT_ATTENTION = MongoUtils.getCollectionByName("fangjia_base", "district_attention_log", "log.mongo.db.fangjia.com", 52002) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fsh/BrokerInfo.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fsh/BrokerInfo.groovy index b03a9c23a..c9227ddd7 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fsh/BrokerInfo.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fsh/BrokerInfo.groovy @@ -13,7 +13,7 @@ import org.apache.commons.lang.StringUtils import java.text.SimpleDateFormat /** - * 房源经纪人 + * 鎴挎簮缁忕邯浜� */ class BrokerInfo{ public static final DBCollection DISTRICT_ANALY_DATA = MongoUtils.getCollectionByName("fangjia_stat", "district_analy_data", "mongo.db.fangjia.com", 27017) @@ -39,7 +39,7 @@ class BrokerInfo{ } /** - * 小区半年内的经纪人数量 + * 灏忓尯鍗婂勾鍐呯殑缁忕邯浜烘暟閲� * @return */ public static def getBorkerCount(String city,String region,String name,List alias,int startDate){ @@ -57,7 +57,7 @@ class BrokerInfo{ } /** - * 更新均价排名 + * 鏇存柊鍧囦环鎺掑悕 * @param db * @param map * @param citySize @@ -84,7 +84,7 @@ class BrokerInfo{ } /** - * 城市排名 + * 鍩庡競鎺掑悕 * @param list * @return */ @@ -101,7 +101,7 @@ class BrokerInfo{ return LevelUtil.doLevel(set); } /** - * 获取上个月的int类型时间 + * 鑾峰彇涓婁釜鏈堢殑int绫诲瀷鏃堕棿 * @return */ public static int getLastMonth(){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fsh/CityHouseCountStatBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fsh/CityHouseCountStatBatch.groovy index 7121293b0..d25b0f0da 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fsh/CityHouseCountStatBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fsh/CityHouseCountStatBatch.groovy @@ -20,7 +20,7 @@ import org.apache.lucene.search.BooleanQuery import org.apache.lucene.search.TermQuery /** - * 城市月挂牌量统计 + * 鍩庡競鏈堟寕鐗岄噺缁熻 * Created by gaojuan on 2018/1/2. */ @BatchOwner(Watcher.GaoJuan) @@ -38,7 +38,7 @@ class CityHouseCountStatBatch extends BaseBatch{ def startDate = DateUtils.truncateDay(DateUtils.getFirstDayOfMonth(new Date(), -1)); def endDate = DateUtils.truncateDay(DateUtils.getLastDayOfMonth(new Date(), -1)); def sDate = DateUtils.formatDateByPattern(startDate, "yyyyMM").toInteger() - println "统计日期:" + DateUtils.formatDateByPattern(startDate, "yyyy-MM-dd") + " " + DateUtils.formatDateByPattern(endDate, "yyyy-MM-dd") + " " + sDate + println "缁熻鏃ユ湡锛�" + DateUtils.formatDateByPattern(startDate, "yyyy-MM-dd") + " " + DateUtils.formatDateByPattern(endDate, "yyyy-MM-dd") + " " + sDate def citys = CommonDatautils.findAllCity(); for(def city : citys){ @@ -50,7 +50,7 @@ class CityHouseCountStatBatch extends BaseBatch{ def sellCount = findCityHouseCount(null, "sell", startDate, endDate); def rentCount = findCityHouseCount(null, "rent", startDate, endDate); - save("全国", sellCount, rentCount, sDate); + save("鍏ㄥ浗", sellCount, rentCount, sDate); } def save(def city, def sellCount, def rentCount, def statDate){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fsh/CityPriceIndexBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fsh/CityPriceIndexBatch.groovy index d7d6f14e1..b6f03ace2 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fsh/CityPriceIndexBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fsh/CityPriceIndexBatch.groovy @@ -12,7 +12,7 @@ import com.mongodb.DBCollection import com.mongodb.DBObject /** - * 城市月均价,租金回报率,潜力指数表 + * 鍩庡競鏈堝潎浠凤紝绉熼噾鍥炴姤鐜囷紝娼滃姏鎸囨暟琛� * Created by gaojuan on 2017/12/27. */ @BatchOwner(Watcher.GaoJuan) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fsh/DayHouseStatBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fsh/DayHouseStatBatch.groovy index cf2348961..1343d83b1 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fsh/DayHouseStatBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fsh/DayHouseStatBatch.groovy @@ -12,7 +12,7 @@ import com.mongodb.DBObject import org.apache.commons.lang.time.DateUtils /** - * 近30天的挂牌房源量统计 + * 杩�30澶╃殑鎸傜墝鎴挎簮閲忕粺璁� */ @BatchOwner(Watcher.GaoJuan) class DayHouseStatBatch extends BaseBatch{ @@ -37,29 +37,29 @@ class DayHouseStatBatch extends BaseBatch{ def rets = [] def sellCount1 = findCityHouseCount(null, "sell", endDayDate2, endDayDate1); def rentCount1 = findCityHouseCount(null, "rent", endDayDate2, endDayDate1); - rets << [city:"全国",sell_count:sellCount1, rent_count:rentCount1, s_date:Integer.parseInt(DateUtil.formatByPattern(day, "yyyyMMdd")), c_date:new Date()] + rets << [city:"鍏ㄥ浗",sell_count:sellCount1, rent_count:rentCount1, s_date:Integer.parseInt(DateUtil.formatByPattern(day, "yyyyMMdd")), c_date:new Date()] def sellCount2 = findCityHouseCount(null, "sell", endDayDate3, endDayDate2); def rentCount2 = findCityHouseCount(null, "rent", endDayDate3, endDayDate2); - rets << [city:"全国",sell_count:sellCount2, rent_count:rentCount2, s_date:Integer.parseInt(DateUtil.formatByPattern(endDayDate2, "yyyyMMdd")), c_date:new Date()] + rets << [city:"鍏ㄥ浗",sell_count:sellCount2, rent_count:rentCount2, s_date:Integer.parseInt(DateUtil.formatByPattern(endDayDate2, "yyyyMMdd")), c_date:new Date()] def sellCount3 = findCityHouseCount(null, "sell", endDayDate4, endDayDate3); def rentCount3 = findCityHouseCount(null, "rent", endDayDate4, endDayDate3); - rets << [city:"全国",sell_count:sellCount3, rent_count:rentCount3, s_date:Integer.parseInt(DateUtil.formatByPattern(endDayDate3, "yyyyMMdd")), c_date:new Date()] + rets << [city:"鍏ㄥ浗",sell_count:sellCount3, rent_count:rentCount3, s_date:Integer.parseInt(DateUtil.formatByPattern(endDayDate3, "yyyyMMdd")), c_date:new Date()] def sellCount4 = findCityHouseCount(null, "sell", endDayDate5, endDayDate4); def rentCount4 = findCityHouseCount(null, "rent", endDayDate5, endDayDate4); - rets << [city:"全国",sell_count:sellCount4, rent_count:rentCount4, s_date:Integer.parseInt(DateUtil.formatByPattern(endDayDate4, "yyyyMMdd")), c_date:new Date()] + rets << [city:"鍏ㄥ浗",sell_count:sellCount4, rent_count:rentCount4, s_date:Integer.parseInt(DateUtil.formatByPattern(endDayDate4, "yyyyMMdd")), c_date:new Date()] def sellCount5 = findCityHouseCount(null, "sell", endDayDate6, endDayDate5); def rentCount5 = findCityHouseCount(null, "rent", endDayDate6, endDayDate5); - rets << [city:"全国",sell_count:sellCount5, rent_count:rentCount5, s_date:Integer.parseInt(DateUtil.formatByPattern(endDayDate5, "yyyyMMdd")), c_date:new Date()] + rets << [city:"鍏ㄥ浗",sell_count:sellCount5, rent_count:rentCount5, s_date:Integer.parseInt(DateUtil.formatByPattern(endDayDate5, "yyyyMMdd")), c_date:new Date()] def sellCount6 = findCityHouseCount(null, "sell", endDayDate7, endDayDate6); def rentCount6 = findCityHouseCount(null, "rent", endDayDate7, endDayDate6); - rets << [city:"全国",sell_count:sellCount6, rent_count:rentCount6, s_date:Integer.parseInt(DateUtil.formatByPattern(endDayDate6, "yyyyMMdd")), c_date:new Date()] + rets << [city:"鍏ㄥ浗",sell_count:sellCount6, rent_count:rentCount6, s_date:Integer.parseInt(DateUtil.formatByPattern(endDayDate6, "yyyyMMdd")), c_date:new Date()] - removeByCity("全国"); + removeByCity("鍏ㄥ浗"); saveData(rets); } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fsh/DistrictAreaBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fsh/DistrictAreaBatch.groovy index 132d9d664..5cb826741 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fsh/DistrictAreaBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fsh/DistrictAreaBatch.groovy @@ -25,14 +25,14 @@ import com.mongodb.DBCollection import java.util.concurrent.atomic.AtomicInteger /** - * 给小区跑标签,房生活中用到
    - * 目前跑地图标签,根据标签不同设置不同用途
    - * 用途如下: - * 1:结婚 - * 2:上学 - * 3:养老 - * 4:改善 - * 5:其他 + * 缁欏皬鍖鸿窇鏍囩锛屾埧鐢熸椿涓敤鍒�
    + * 鐩墠璺戝湴鍥炬爣绛�,鏍规嵁鏍囩涓嶅悓璁剧疆涓嶅悓鐢ㄩ��
    + * 鐢ㄩ�斿涓嬶細 + * 1锛氱粨濠� + * 2锛氫笂瀛� + * 3锛氬吇鑰� + * 4锛氭敼鍠� + * 5锛氬叾浠� * * @author yinjihuan * @@ -43,7 +43,7 @@ class DistrictAreaBatch extends BaseBatch { static DecimalFormat df = new DecimalFormat("0.00"); static def k=new AtomicInteger(1) static def citys= UpdateCityAndRegion.getCitys(); - //static def citys= ['安庆'] + //static def citys= ['瀹夊簡'] static main(args) { runBatch(new DistrictAreaBatch(), args, [isSystemExit:false]) } @@ -166,7 +166,7 @@ class DistrictAreaBatch extends BaseBatch { int numKey=list0.indexOf(key) if(numKey+1==list0.size()){ map.put(key,map.get(list0.get(numKey-1))+30) - message=message+key+'室推算;' + message=message+key+'瀹ゆ帹绠�;' continue } def val1=map.get(list0.get(numKey+1)) @@ -178,7 +178,7 @@ class DistrictAreaBatch extends BaseBatch { def value=df.format(val) val=Double.parseDouble(value) map.put(key,val) - message=message+key+'室推算;' + message=message+key+'瀹ゆ帹绠�;' } data=map.get(key) } @@ -201,7 +201,7 @@ class DistrictAreaBatch extends BaseBatch { } DistrictTagBatch.district_tag_coll.update(q, u, true, false); - println("已跑完"+k.get()+"个小区") + println("宸茶窇瀹�"+k.get()+"涓皬鍖�") k.addAndGet(1) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fsh/DistrictArroundPoiCountBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fsh/DistrictArroundPoiCountBatch.groovy index cfd221013..2f710f351 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fsh/DistrictArroundPoiCountBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fsh/DistrictArroundPoiCountBatch.groovy @@ -19,7 +19,7 @@ import java.util.concurrent.TimeUnit /** * Created by gaojuan on 2018/4/10. - * 统计小区周边配套1公里范围内的poi数量 + * 缁熻灏忓尯鍛ㄨ竟閰嶅1鍏噷鑼冨洿鍐呯殑poi鏁伴噺 */ @BatchOwner(Watcher.GaoJuan) class DistrictArroundPoiCountBatch extends BaseBatch{ @@ -33,7 +33,7 @@ class DistrictArroundPoiCountBatch extends BaseBatch{ @Override void process(Object args) { - List citys = ["南京"];// CommonUtils.findAllCity(); + List citys = ["鍗椾含"];// CommonUtils.findAllCity(); for(String city:citys){ getDistrictPoiCount(city) @@ -76,26 +76,26 @@ class DistrictArroundPoiCountBatch extends BaseBatch{ def getDetailPoiCount(def city, def lat, def lng){ def map = CommonDatautils.findMaxLatLngMinLatLng(lat, lng, 1000) def countMap = [:] - //超市 + //瓒呭競 def supermarket_count = findPoiCount(city, "060400", map.maxLat, map.minLat, map.maxLng, map.minLng) countMap.put("supermarket_count", supermarket_count) - //幼儿园 - def kindergarten_school_detail = findPoiDetail(city, "141200", "幼儿园", map.maxLat, map.minLat, map.maxLng, map.minLng) + //骞煎効鍥� + def kindergarten_school_detail = findPoiDetail(city, "141200", "骞煎効鍥�", map.maxLat, map.minLat, map.maxLng, map.minLng) countMap.put("kindergarten_school_count", kindergarten_school_detail.size()) - //小学 - def primary_school_detail = findPoiDetail(city, "141200", "学校;小学", map.maxLat, map.minLat, map.maxLng, map.minLng) + //灏忓 + def primary_school_detail = findPoiDetail(city, "141200", "瀛︽牎;灏忓", map.maxLat, map.minLat, map.maxLng, map.minLng) countMap.put("primary_school_count", primary_school_detail.size()) - //中学 - def middle_school_detail = findPoiDetail(city, "141200", "学校;中学", map.maxLat, map.minLat, map.maxLng, map.minLng) + //涓 + def middle_school_detail = findPoiDetail(city, "141200", "瀛︽牎;涓", map.maxLat, map.minLat, map.maxLng, map.minLng) countMap.put("middle_school_count", middle_school_detail.size()) - //菜市场 - def vegetable_market_detail = findPoiDetail(city, "060700", "蔬菜市场", map.maxLat, map.minLat, map.maxLng, map.minLng) + //鑿滃競鍦� + def vegetable_market_detail = findPoiDetail(city, "060700", "钄彍甯傚満", map.maxLat, map.minLat, map.maxLng, map.minLng) countMap.put("vegetable_market_count", vegetable_market_detail.size()) - //公交 + //鍏氦 def bus_detail = findBusPoiCount(city, "150700", map.maxLat, map.minLat, map.maxLng, map.minLng) countMap.put("bus_count",bus_detail.size()) - //地铁 + //鍦伴搧 def subway_detail = findSubwayPoiDetail(city, "150500", map.maxLat, map.minLat, map.maxLng, map.minLng) countMap.put("subway_count", subway_detail.size()) return countMap; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fsh/DistrictBuildAndHouseNumBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fsh/DistrictBuildAndHouseNumBatch.groovy index 592761d8e..baa489adb 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fsh/DistrictBuildAndHouseNumBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fsh/DistrictBuildAndHouseNumBatch.groovy @@ -42,7 +42,7 @@ class DistrictBuildAndHouseNumBatch{ } } /** - * 自动补全房号 + * 鑷姩琛ュ叏鎴垮彿 */ public static void doAutoCompleteRoom(){ def citys = CommonUtils.findAllCity(); @@ -60,7 +60,7 @@ class DistrictBuildAndHouseNumBatch{ } } /** - * 获取某个小区有规则的楼栋号 + * 鑾峰彇鏌愪釜灏忓尯鏈夎鍒欑殑妤兼爧鍙� * @param city * @param region * @param name @@ -82,11 +82,11 @@ class DistrictBuildAndHouseNumBatch{ } } }); - int max = 0; //最大楼号数 + int max = 0; //鏈�澶фゼ鍙锋暟 Map housesHeight = Maps.newHashMap(); for(DBObject loudong : loudongs) { if(loudong.get("status") == 0 - || (loudong.get("from").size() == 1 && loudong.get("from").contains("电信数据"))){ + || (loudong.get("from").size() == 1 && loudong.get("from").contains("鐢典俊鏁版嵁"))){ continue; } String houseNumber = loudong.get("house_num"); @@ -116,7 +116,7 @@ class DistrictBuildAndHouseNumBatch{ dtos.add(dto); housesHeight.put(houseNumber, height); } - //模拟补全楼号 + //妯℃嫙琛ュ叏妤煎彿 for(int i= 1; i <= max; ++i) { DBObject dto = new BasicDBObject(); dto.put("hn",i+""); @@ -145,7 +145,7 @@ class DistrictBuildAndHouseNumBatch{ } } /** - * 获取处理后的房号 + * 鑾峰彇澶勭悊鍚庣殑鎴垮彿 * @param houses * @param city * @param region @@ -169,10 +169,10 @@ class DistrictBuildAndHouseNumBatch{ }); int maxRoomNum = 0; int maxFloor = fetchMaxFloor(city, region, name, hn); - int maxRoomFloor = 0;//从室号中提取的最高楼层 + int maxRoomFloor = 0;//浠庡鍙蜂腑鎻愬彇鐨勬渶楂樻ゼ灞� for (DBObject houseLoudong : houses) { if (houseLoudong.get("status") == 1 - || "电信数据".equals(houseLoudong.("from")) + || "鐢典俊鏁版嵁".equals(houseLoudong.("from")) || StringUtils.isBlank(houseLoudong.get("district_no"))) { continue; } @@ -201,13 +201,13 @@ class DistrictBuildAndHouseNumBatch{ dto.put("floor",floor); rooms.add(dto); } - //补全室号 + //琛ュ叏瀹ゅ彿 if(maxFloor == 0) { maxFloor = maxRoomFloor; } for(int i = 1; i<=maxFloor; ++i) { for(int j = 1; j <= maxRoomNum; ++j) { - //生成室号 + //鐢熸垚瀹ゅ彿 String generateRoomNum = String.valueOf(i * 100 + j); DBObject dt = new BasicDBObject(); dt.put("rn",generateRoomNum); @@ -224,7 +224,7 @@ class DistrictBuildAndHouseNumBatch{ saveHouseInfo(obj) } /** - * 获取某楼栋的最高楼层 + * 鑾峰彇鏌愭ゼ鏍嬬殑鏈�楂樻ゼ灞� * @param city * @param district * @param projectName @@ -235,11 +235,11 @@ class DistrictBuildAndHouseNumBatch{ int maxFloor = 0; List loudongs = findAll(city, district, projectName, buildingNumber); Map floorsMap = Maps.newHashMap(); - //将总楼层以及出现次数临时存储 - int mostFrequentCount = 0; //出现次数最多的次数 + //灏嗘�绘ゼ灞備互鍙婂嚭鐜版鏁颁复鏃跺瓨鍌� + int mostFrequentCount = 0; //鍑虹幇娆℃暟鏈�澶氱殑娆℃暟 for(DBObject loudong : loudongs) { if(loudong.get("status") == 0 - || (loudong.get("from").size() == 1 && loudong.get("from").contains("电信数据")) + || (loudong.get("from").size() == 1 && loudong.get("from").contains("鐢典俊鏁版嵁")) || loudong.get("floors") <= 0){ continue; } @@ -251,18 +251,18 @@ class DistrictBuildAndHouseNumBatch{ mostFrequentCount = Math.max(mostFrequentCount, floorCount + 1); floorsMap.put(loudong.get("floors"), floorCount + 1); } - //找出出现次数最多的楼层 + //鎵惧嚭鍑虹幇娆℃暟鏈�澶氱殑妤煎眰 List maxFloors = Lists.newArrayList(); for(Map.Entry floorsEntry: floorsMap.entrySet()) { if(floorsEntry.getValue() == mostFrequentCount) { maxFloors.add(floorsEntry.getKey()); } } - //如果maxFloors不唯一,取最大值 + //濡傛灉maxFloors涓嶅敮涓�锛屽彇鏈�澶у�� if(maxFloors.size() > 1) { Collections.sort(maxFloors, Collections.reverseOrder()); } - //取第一个值 + //鍙栫涓�涓�� if(maxFloors.size() > 0) { maxFloor = maxFloors.get(0); } @@ -270,7 +270,7 @@ class DistrictBuildAndHouseNumBatch{ } /** - * 房号查询 + * 鎴垮彿鏌ヨ * @return */ public static List findHouseNum(String city,String region,String name,String houseNum){ @@ -300,7 +300,7 @@ class DistrictBuildAndHouseNumBatch{ /** - * 楼栋号查询 + * 妤兼爧鍙锋煡璇� * @param city * @param region * @param name @@ -329,7 +329,7 @@ class DistrictBuildAndHouseNumBatch{ return list } /** - * 保存楼栋信息 + * 淇濆瓨妤兼爧淇℃伅 * @param db */ public static void saveBuildingInfo(DBObject db) { @@ -342,7 +342,7 @@ class DistrictBuildAndHouseNumBatch{ } /** - * 保存房号信息 + * 淇濆瓨鎴垮彿淇℃伅 * @param db */ public static void saveHouseInfo(DBObject db) { @@ -356,7 +356,7 @@ class DistrictBuildAndHouseNumBatch{ } /** - * 按照房号数最多的楼栋来补全其他楼栋房号 + * 鎸夌収鎴垮彿鏁版渶澶氱殑妤兼爧鏉ヨˉ鍏ㄥ叾浠栨ゼ鏍嬫埧鍙� * @param city * @param region * @param name @@ -388,7 +388,7 @@ class DistrictBuildAndHouseNumBatch{ } /** - * 根据城市区域小区名查询 + * 鏍规嵁鍩庡競鍖哄煙灏忓尯鍚嶆煡璇� * @param city * @param region * @param name diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fsh/DistrictKLineDataBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fsh/DistrictKLineDataBatch.groovy index dd44240b4..9826b4b27 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fsh/DistrictKLineDataBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fsh/DistrictKLineDataBatch.groovy @@ -34,7 +34,7 @@ class DistrictKLineDataBatch extends BaseBatch{ } def run(){ - def citys = ["上海"]//CommonDatautils.findAllCity(); + def citys = ["涓婃捣"]//CommonDatautils.findAllCity(); for(def city : citys){ def districts = CommonDatautils.getAllDistrictBaseInfo(city, "district"); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fsh/DistrictNewPriceSyncBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fsh/DistrictNewPriceSyncBatch.groovy index 8568220d0..3f91a8b06 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fsh/DistrictNewPriceSyncBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fsh/DistrictNewPriceSyncBatch.groovy @@ -20,7 +20,7 @@ import com.mongodb.DBCollection import java.util.concurrent.atomic.AtomicLong /** - * 小区最新一期的价格同步脚本
    + * 灏忓尯鏈�鏂颁竴鏈熺殑浠锋牸鍚屾鑴氭湰
    * * @author yinjihuan * @@ -28,13 +28,13 @@ import java.util.concurrent.atomic.AtomicLong @BatchOwner(Watcher.YinJiHuan) class DistrictNewPriceSyncBatch extends BaseBatch { public static final DBCollection district_new_price_coll = MongoUtils.getCollectionByName("fangjia_stat", "fsh.district_new_price", "mongo.db.fangjia.com") - // 小区均价 + // 灏忓尯鍧囦环 public static final DBCollection district_stat_coll = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "mongo.db.fangjia.com") - // 小区标签 + // 灏忓尯鏍囩 public static final DBCollection district_tag_coll = MongoUtils.getCollectionByName("fangjia_stat", "fsh.district_tag", "mongo.db.fangjia.com") - // 小区指数 + // 灏忓尯鎸囨暟 public static final DBCollection potential_index_coll = MongoUtils.getCollectionByName("fangjia_stat", "potential_index", "mongo.db.fangjia.com") - // 平米租金 + // 骞崇背绉熼噾 public static final DBCollection sqmetre_rent_coll = MongoUtils.getCollectionByName("fangjia", "sqmetre_rent", "mongo.db.fangjia.com") public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(5) public static String access_token = "899b3d41c3b235684339e6b6d40333f3f522e513df923e9a5771a704287cef16"; @@ -55,25 +55,25 @@ class DistrictNewPriceSyncBatch extends BaseBatch { private sendZhongYuan() { try { - println "发送定时重估消息给中原房生活后台处理" + println "鍙戦�佸畾鏃堕噸浼版秷鎭粰涓師鎴跨敓娲诲悗鍙板鐞�" for (int i=0; i<5;i++) { String result = HttpClient.get("http://zyfsh.fangjia.com/rest/houses/eval?token=goojia123456") if (result != null && result.contains("200")) { - DingDingMessageUtil.sendTextMessage(access_token, "发送定时重估消息给中原房生活后台处理成功") + DingDingMessageUtil.sendTextMessage(access_token, "鍙戦�佸畾鏃堕噸浼版秷鎭粰涓師鎴跨敓娲诲悗鍙板鐞嗘垚鍔�") break; } else { - DingDingMessageUtil.sendTextMessage(access_token, "发送定时重估消息给中原房生活后台处理失败:"+result) + DingDingMessageUtil.sendTextMessage(access_token, "鍙戦�佸畾鏃堕噸浼版秷鎭粰涓師鎴跨敓娲诲悗鍙板鐞嗗け璐ワ細"+result) Thread.sleep(1000 * 60) } } } catch (Exception e) { - DingDingMessageUtil.sendTextMessage(access_token, "发送定时重估消息给中原房生活后台处理失败:"+e.getMessage()) + DingDingMessageUtil.sendTextMessage(access_token, "鍙戦�佸畾鏃堕噸浼版秷鎭粰涓師鎴跨敓娲诲悗鍙板鐞嗗け璐ワ細"+e.getMessage()) e.printStackTrace() } } /** - * 首次跑数据 + * 棣栨璺戞暟鎹� */ private firstFirstProcess() { long start = System.currentTimeMillis() @@ -108,14 +108,14 @@ class DistrictNewPriceSyncBatch extends BaseBatch { } latch.await() long end = System.currentTimeMillis() - println "复制完成,耗时:" + (end - start) + println "澶嶅埗瀹屾垚锛岃�楁椂锛�" + (end - start) } /** - * 非首次跑数据 + * 闈為娆¤窇鏁版嵁 */ private noFirstProcess() { - DingDingMessageUtil.sendTextMessage(access_token, "开始复制最新均价") + DingDingMessageUtil.sendTextMessage(access_token, "寮�濮嬪鍒舵渶鏂板潎浠�") long start = System.currentTimeMillis() Set citys = RegionData.getAllCity() @@ -150,7 +150,7 @@ class DistrictNewPriceSyncBatch extends BaseBatch { data.append("lat2", (double)dis.lat2 / 10000000000.0) } } - //小区指数 + //灏忓尯鎸囨暟 def indexDate = null potential_index_coll.find().limit(1).sort(new BasicDBObject("_id", -1)).each { d -> indexDate = d.date @@ -169,7 +169,7 @@ class DistrictNewPriceSyncBatch extends BaseBatch { data.append("index", 0) } - // 租金回报率=平米租金*12/均价 + // 绉熼噾鍥炴姤鐜�=骞崇背绉熼噾*12/鍧囦环 def wd = null sqmetre_rent_coll.find().limit(1).sort(new BasicDBObject("_id", -1)).each { d -> wd = d.weekend @@ -204,8 +204,8 @@ class DistrictNewPriceSyncBatch extends BaseBatch { } latch.await() long end = System.currentTimeMillis() - DingDingMessageUtil.sendTextMessage(access_token, "复制完成,耗时:" + (end - start)) - println "复制完成,耗时:" + (end - start) + DingDingMessageUtil.sendTextMessage(access_token, "澶嶅埗瀹屾垚锛岃�楁椂锛�" + (end - start)) + println "澶嶅埗瀹屾垚锛岃�楁椂锛�" + (end - start) Date removeDate = null // district_new_price_coll.find().limit(1).sort(new BasicDBObject("weekend", 1)).each { data -> // removeDate = data.weekend @@ -214,14 +214,14 @@ class DistrictNewPriceSyncBatch extends BaseBatch { Date w = DateUtil.getFirstDayOfWeek(weekend); removeDate = DateUtil.getFirstDayOfWeek(w); if (removeDate) { - DingDingMessageUtil.sendTextMessage(access_token, "开始删除老数据:" + DateUtil.formatToTightYYYYMMDD(removeDate)) - println "开始删除老数据:" + DateUtil.formatToTightYYYYMMDD(removeDate) + DingDingMessageUtil.sendTextMessage(access_token, "寮�濮嬪垹闄よ�佹暟鎹�:" + DateUtil.formatToTightYYYYMMDD(removeDate)) + println "寮�濮嬪垹闄よ�佹暟鎹�:" + DateUtil.formatToTightYYYYMMDD(removeDate) citys.each { city -> BasicDBObject query = new BasicDBObject("weekend", removeDate).append("city", city) println query district_new_price_coll.remove(query) } } - DingDingMessageUtil.sendTextMessage(access_token, "当前总数量:" + district_new_price_coll.count() + " 复制数量:" + aLong.get()) + DingDingMessageUtil.sendTextMessage(access_token, "褰撳墠鎬绘暟閲�:" + district_new_price_coll.count() + " 澶嶅埗鏁伴噺锛�" + aLong.get()) } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fsh/DistrictTag.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fsh/DistrictTag.groovy index 28954d2cb..61441f88d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fsh/DistrictTag.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fsh/DistrictTag.groovy @@ -45,7 +45,7 @@ class DistrictTag { runOne(dis) k.addAndGet(1) if(k%1000==0){ - println("已跑完"+k.get()+"个小区") + println("宸茶窇瀹�"+k.get()+"涓皬鍖�") } } @@ -109,7 +109,7 @@ class DistrictTag { int numKey=list0.indexOf(key) if(numKey+1==list0.size()){ map.put(key,map.get(list0.get(numKey-1))+30) - message=message+key+'室推算;' + message=message+key+'瀹ゆ帹绠�;' continue } def val1=map.get(list0.get(numKey+1)) @@ -121,7 +121,7 @@ class DistrictTag { def value=df.format(val) val=Double.parseDouble(value) map.put(key,val) - message=message+key+'室推算;' + message=message+key+'瀹ゆ帹绠�;' } data=map.get(key) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fsh/DistrictTagBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fsh/DistrictTagBatch.groovy index 6a6ac8045..2df886787 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fsh/DistrictTagBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fsh/DistrictTagBatch.groovy @@ -14,14 +14,14 @@ import com.mongodb.BasicDBObject import com.mongodb.DBCollection /** - * 给小区跑标签,房生活中用到
    - * 目前跑地图标签,根据标签不同设置不同用途
    - * 用途如下: - * 1:结婚 - * 2:上学 - * 3:养老 - * 4:改善 - * 5:其他 + * 缁欏皬鍖鸿窇鏍囩锛屾埧鐢熸椿涓敤鍒�
    + * 鐩墠璺戝湴鍥炬爣绛�,鏍规嵁鏍囩涓嶅悓璁剧疆涓嶅悓鐢ㄩ��
    + * 鐢ㄩ�斿涓嬶細 + * 1锛氱粨濠� + * 2锛氫笂瀛� + * 3锛氬吇鑰� + * 4锛氭敼鍠� + * 5锛氬叾浠� * * @author yinjihuan * @@ -31,16 +31,16 @@ class DistrictTagBatch extends BaseBatch { public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(10) public static final DBCollection district_tag_coll = MongoUtils.getCollectionByName("fangjia_stat", "fsh.district_tag", "mongo.db.fangjia.com") - private static final String J_DI_TIE = "近地铁"; - private static final String G_JIAO_DUO = "公交多"; - private static final String J_CAI_CHANG = "近菜场"; - private static final String J_CHAO_SHI = "近超市"; - private static final String J_YI_LIAO = "近医疗"; - private static final String J_XUE_XIAO = "近学校"; - private static final String J_GONG_YUAN = "近公园"; - private static final String J_YIN_HANG = "近银行"; - private static final String L_HUA_LV = "绿化率高"; - private static final String F_LIN_XIN = "房龄新"; + private static final String J_DI_TIE = "杩戝湴閾�"; + private static final String G_JIAO_DUO = "鍏氦澶�"; + private static final String J_CAI_CHANG = "杩戣彍鍦�"; + private static final String J_CHAO_SHI = "杩戣秴甯�"; + private static final String J_YI_LIAO = "杩戝尰鐤�"; + private static final String J_XUE_XIAO = "杩戝鏍�"; + private static final String J_GONG_YUAN = "杩戝叕鍥�"; + private static final String J_YIN_HANG = "杩戦摱琛�"; + private static final String L_HUA_LV = "缁垮寲鐜囬珮"; + private static final String F_LIN_XIN = "鎴块緞鏂�"; static main(args) { runBatch(new DistrictTagBatch(), args, [isSystemExit:false]) } @@ -191,24 +191,24 @@ class DistrictTagBatch extends BaseBatch { } /** - * 获取小区标签对应的用途 - * 改善用的4用123替代 - * 也就是在查询4的时候in (1,2,3)就可以了 + * 鑾峰彇灏忓尯鏍囩瀵瑰簲鐨勭敤閫� + * 鏀瑰杽鐢ㄧ殑4鐢�123鏇夸唬 + * 涔熷氨鏄湪鏌ヨ4鐨勬椂鍊檌n (1,2,3)灏卞彲浠ヤ簡 * @param tags * @return */ private static int getPurpose(tags) { if ((tags.contains(J_DI_TIE) || tags.contains(G_JIAO_DUO)) && tags.contains(J_CAI_CHANG) && tags.contains(J_YI_LIAO) && tags.contains(J_GONG_YUAN) && tags.contains(J_YIN_HANG)) { - return 3; //养老用 + return 3; //鍏昏�佺敤 } if ((tags.contains(J_DI_TIE) || tags.contains(G_JIAO_DUO)) && tags.contains(J_CAI_CHANG) && tags.contains(J_CHAO_SHI) && tags.contains(J_YI_LIAO)) { - return 1; //结婚用 + return 1; //缁撳鐢� } if ((tags.contains(J_DI_TIE) || tags.contains(G_JIAO_DUO)) && tags.contains(J_CAI_CHANG) && tags.contains(J_CHAO_SHI) && tags.contains(J_XUE_XIAO)) { - return 2; //上学用 + return 2; //涓婂鐢� } return 5; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fsh/FshAroundQuote.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fsh/FshAroundQuote.groovy index 32ff90a23..6aa1b26d6 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fsh/FshAroundQuote.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fsh/FshAroundQuote.groovy @@ -14,7 +14,7 @@ import org.apache.commons.lang.StringUtils import java.text.SimpleDateFormat /** - * 房源经纪人 + * 鎴挎簮缁忕邯浜� */ class FshAroundQuote{ public static final DBCollection FSH_DISTRICT_SAME_QUOTE = MongoUtils.getCollectionByName("fangjia_stat", "fsh.same_quote_sell", "mongo.db.fangjia.com", 27017) @@ -45,7 +45,7 @@ class FshAroundQuote{ }) } /** - * 更新库中数据 + * 鏇存柊搴撲腑鏁版嵁 */ public static void updateData(def dis,def houses){ def obj = new BasicDBObject(); @@ -69,7 +69,7 @@ class FshAroundQuote{ } } /** - * 按照1,2,3,5,10公里进行查询 + * 鎸夌収1,2,3,5,10鍏噷杩涜鏌ヨ * @param db * @param start * @return @@ -116,7 +116,7 @@ class FshAroundQuote{ return list; } /** - * 查询房源 + * 鏌ヨ鎴挎簮 * @param diss * @param start * @param minPrice @@ -144,9 +144,9 @@ class FshAroundQuote{ } /** - * 查询小区周边的小区 + * 鏌ヨ灏忓尯鍛ㄨ竟鐨勫皬鍖� * @param dis - * @param radus 周边多少m的范围 + * @param radus 鍛ㄨ竟澶氬皯m鐨勮寖鍥� * @return */ public static def findAroundDistrict(def dis,int radus){ @@ -159,7 +159,7 @@ class FshAroundQuote{ return diss; } /** - * 获取上个月的int类型时间 + * 鑾峰彇涓婁釜鏈堢殑int绫诲瀷鏃堕棿 * @return */ public static int getLastMonth(){ @@ -180,7 +180,7 @@ class FshAroundQuote{ return Integer.valueOf(datestr); } /** - * 获取城市中小区的经纬度 + * 鑾峰彇鍩庡競涓皬鍖虹殑缁忕含搴� * @param city * @return */ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fsh/FshAroundSell.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fsh/FshAroundSell.groovy index f221725b0..c09b9d382 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fsh/FshAroundSell.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fsh/FshAroundSell.groovy @@ -12,13 +12,13 @@ import com.mongodb.DBObject import org.apache.commons.lang.StringUtils /** - * 房源经纪人 + * 鎴挎簮缁忕邯浜� */ class FshAroundSell{ public static final DBCollection FSH_DISTRICT_SAME_QUOTE = MongoUtils.getCollectionByName("fangjia_stat", "fsh.same_quote_sell", "mongo.db.fangjia.com", 27017) static main(args) { - getDistrictSameHouses("上海") + getDistrictSameHouses("涓婃捣") } public static void getDistrictSameHouses(city){ @@ -39,7 +39,7 @@ class FshAroundSell{ } /** - * 按照1,2,3,5,10公里进行查询 + * 鎸夌収1,2,3,5,10鍏噷杩涜鏌ヨ * @param db * @param start * @return @@ -86,7 +86,7 @@ class FshAroundSell{ return list; } /** - * 更新库中数据 + * 鏇存柊搴撲腑鏁版嵁 */ public static void updateData(def dis,def sells){ def obj = new BasicDBObject(); @@ -111,7 +111,7 @@ class FshAroundSell{ } /** - * 查询成交 + * 鏌ヨ鎴愪氦 * @param diss * @param start * @param minPrice @@ -139,9 +139,9 @@ class FshAroundSell{ } /** - * 查询小区周边的小区 + * 鏌ヨ灏忓尯鍛ㄨ竟鐨勫皬鍖� * @param dis - * @param radus 周边多少m的范围 + * @param radus 鍛ㄨ竟澶氬皯m鐨勮寖鍥� * @return */ public static def findAroundDistrict(def dis,int radus){ @@ -154,7 +154,7 @@ class FshAroundSell{ return diss; } /** - * 获取上个月的int类型时间 + * 鑾峰彇涓婁釜鏈堢殑int绫诲瀷鏃堕棿 * @return */ public static int getLastMonth(){ @@ -173,7 +173,7 @@ class FshAroundSell{ return date; } /** - * 获取城市中小区的经纬度 + * 鑾峰彇鍩庡競涓皬鍖虹殑缁忕含搴� * @param city * @return */ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fsh/SendFSHRentNoticeBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fsh/SendFSHRentNoticeBatch.groovy index 4100274d4..868c8165e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fsh/SendFSHRentNoticeBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fsh/SendFSHRentNoticeBatch.groovy @@ -4,26 +4,26 @@ import com.fangjia.script.yinjihaun.util.DingDingMessageUtil import com.fangjia.script.yinjihaun.util.HttpClient /** - * 发送房生活租金提醒通知 + * 鍙戦�佹埧鐢熸椿绉熼噾鎻愰啋閫氱煡 * @author yinjihuan */ class SendFSHRentNoticeBatch { public static String access_token = "899b3d41c3b235684339e6b6d40333f3f522e513df923e9a5771a704287cef16"; static main(args) { try { - DingDingMessageUtil.sendTextMessage(access_token, "开始发送房生活租金提醒通知") + DingDingMessageUtil.sendTextMessage(access_token, "寮�濮嬪彂閫佹埧鐢熸椿绉熼噾鎻愰啋閫氱煡") for (int i=0; i<5;i++) { String result = HttpClient.get("http://192.168.10.170:8084/rest/houses/rent/notice?token=goojia123456") if (result != null && result.contains("200")) { - DingDingMessageUtil.sendTextMessage(access_token, "发送房生活租金提醒通知处理成功") + DingDingMessageUtil.sendTextMessage(access_token, "鍙戦�佹埧鐢熸椿绉熼噾鎻愰啋閫氱煡澶勭悊鎴愬姛") break; } else { - DingDingMessageUtil.sendTextMessage(access_token, "发送房生活租金提醒通知处理失败:"+result) + DingDingMessageUtil.sendTextMessage(access_token, "鍙戦�佹埧鐢熸椿绉熼噾鎻愰啋閫氱煡澶勭悊澶辫触锛�"+result) Thread.sleep(1000 * 60) } } } catch (Exception e) { - DingDingMessageUtil.sendTextMessage(access_token, "发送房生活租金提醒通知处理失败:"+e.getMessage()) + DingDingMessageUtil.sendTextMessage(access_token, "鍙戦�佹埧鐢熸椿绉熼噾鎻愰啋閫氱煡澶勭悊澶辫触锛�"+e.getMessage()) e.printStackTrace() } } 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 index 5a5c5f63f..4ea02a025 100644 --- 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 @@ -39,7 +39,7 @@ class AmapAddressUpdate { static main(args) { def task = new AmapAddressUpdate() - def path = "d:\\数据\\小区\\重庆小区地址与高德地图V1.xlsx" + def path = "d:\\鏁版嵁\\灏忓尯\\閲嶅簡灏忓尯鍦板潃涓庨珮寰峰湴鍥綱1.xlsx" // task.run(path) // task.similarMatch(path) @@ -47,52 +47,52 @@ class AmapAddressUpdate { // task.addressSource(path) // task.amapRun() -// task.addrAndLocationDistance(path)//地址经纬度与库中经纬度比较 +// task.addrAndLocationDistance(path)//鍦板潃缁忕含搴︿笌搴撲腑缁忕含搴︽瘮杈� // task.updateData(path) -// task.updateLocation(path)//更新经纬度 +// task.updateLocation(path)//鏇存柊缁忕含搴� task.matchNoSameRegionDist() } def run(path){ - //"三明","宁德","泉州","厦门","福州","漳州","南平","龙岩","莆田" - def citys = ["重庆"]//CommonDatautils.findAllCity() + //"涓夋槑","瀹佸痉","娉夊窞","鍘﹂棬","绂忓窞","婕冲窞","鍗楀钩","榫欏博","鑾嗙敯" + def citys = ["閲嶅簡"]//CommonDatautils.findAllCity() def allrets = [] - 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, "数据") + ExcelUtils.write(path, allrets, "鏁版嵁") } def matchNoSameRegionDist(){ - def citys = ["三明","宁德","泉州","厦门","福州","漳州","南平","龙岩","莆田","重庆"] + def citys = ["涓夋槑","瀹佸痉","娉夊窞","鍘﹂棬","绂忓窞","婕冲窞","鍗楀钩","榫欏博","鑾嗙敯","閲嶅簡"] for (def city : citys) { def disticts = CommonDatautils.findAllDistricts(city, "district", ["city", "region", "name","address","estate_type2", "addr_alias","lat", "lng"]) def rets = findDiffRegionAmapDetail(disticts) - ExcelUtils.write("D:\\数据\\小区\\区域有问题小区.xlsx", rets, city) + ExcelUtils.write("D:\\鏁版嵁\\灏忓尯\\鍖哄煙鏈夐棶棰樺皬鍖�.xlsx", rets, city) } } def amapRun(){ - def city = "福州市" + def city = "绂忓窞甯�" def datas = findAllAmapByCity(city) // datas = datas[0..10] - println "Es总量:"+datas.size() + println "Es鎬婚噺锛�"+datas.size() def rets = match(datas) - ExcelUtils.write("d:\\数据\\小区\\福州高德数据匹配.xlsx", rets, "数据") + 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"] + rets << ["ID","楂樺痉鍩庡競","楂樺痉鍖哄煙","楂樺痉鍚嶇О","楂樺痉鍦板潃","鍖归厤鍩庡競","鍖归厤鍖哄煙","鍖归厤鍚嶇О","鍖归厤绫诲瀷","鍖归厤ID"] for(def i=0;i // println data.adname+" "+data.name +" "+data.address +" "+data.type @@ -367,12 +367,12 @@ class AmapAddressUpdate { 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}')") - sqlBuffer.append(" and type like '%住宅%'") + sqlBuffer.append(" and type like '%浣忓畢%'") ResultSet rs = dataSource.connection.createStatement().executeQuery(sqlBuffer.toString()) def list = [] while (rs.next()) { // println rs.getString("adname")+" "+rs.getString("name") +" "+rs.getString("address") +" "+rs.getString("type") - def mapName = rs.getString("name").replace("·","") + def mapName = rs.getString("name").replace("路","") if(mapName == name){ def map = [:] map.name = rs.getString("name") @@ -399,7 +399,7 @@ class AmapAddressUpdate { def addressRun(inputfile){ ExcelUtils.multiThreadingModify(inputfile, { row -> -// if(row['H'] && row['H'].contains("口步行") && row['H'].contains("(")){ +// if(row['H'] && row['H'].contains("鍙f琛�") && row['H'].contains("(")){ // row['I'] = row['H'].substring(0, row['H'].indexOf("(")) // } if(row['J']){ @@ -461,7 +461,7 @@ class AmapAddressUpdate { } for(def addr : list){ if(addresses.contains(addr)){ - row['O'] = "诸葛找房" + row['O'] = "璇歌憶鎵炬埧" break } } @@ -474,7 +474,7 @@ class AmapAddressUpdate { def findAllEsData(city,region, name){ def rets = [] - def sql = "select * from community where city='${city}' and name='${name}' and source='诸葛找房APP'" + 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) @@ -510,7 +510,7 @@ class AmapAddressUpdate { hits = hits.hits for(def h : hits){ def d = h._source - if(d.region && d.region.contains(region) && d.address && d.source=="诸葛找房APP"){ + if(d.region && d.region.contains(region) && d.address && d.source=="璇歌憶鎵炬埧APP"){ rets << d.address } } @@ -553,12 +553,12 @@ class AmapAddressUpdate { def updateData(path){ ExcelUtils.multiThreadingModify(path, { row -> - if(row['Q'] && row['Q'].contains("修改地址")){ + 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("可替换原地址")){ + if(row['Q'].contains("鍙浛鎹㈠師鍦板潃")){ udata.put("address", row['I']) - }else if(row['Q'].contains("可新增地址别名")){ + }else if(row['Q'].contains("鍙柊澧炲湴鍧�鍒悕")){ udata.put("address", row['I']) def addrAlias = dist1.addr_alias if(!addrAlias){ @@ -580,7 +580,7 @@ class AmapAddressUpdate { def index = 0 ExcelUtils.modify(path, { row -> - if(row['R'] && row['R']=="是"){ + if(row['R'] && row['R']=="鏄�"){ index++ def dist1 = CommonDatautils.findDistrict(row['A'], row['B'], row['C'], "district") if(dist1){ @@ -605,7 +605,7 @@ class AmapAddressUpdate { } } - // 高德转百度 + // 楂樺痉杞櫨搴� def baidu = BaiDuApiUtils.geoconv(lng, lat, 3) def lng2 = baidu.x def lat2 = baidu.y @@ -633,7 +633,7 @@ class AmapAddressUpdate { 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) + 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 @@ -665,7 +665,7 @@ class AmapAddressUpdate { def maxSocreObj = null while (rs.next()) { def map = [:] - def mapName = rs.getString("name").replace("·","") + def mapName = rs.getString("name").replace("路","") println name +" "+ mapName if(rs.getString("adname") && rs.getString("adname").contains(region)){ @@ -674,7 +674,7 @@ class AmapAddressUpdate { map.region = rs.getString("adname") map.type = rs.getString("type") - map.match_type = "名称相似" + map.match_type = "鍚嶇О鐩镐技" def location = rs.getObject("location") if(location){ map.lng = location.x 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 9c7fa617d..b15dd256f 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 @@ -20,7 +20,7 @@ import java.util.regex.Matcher import java.util.regex.Pattern /** - * 福州农商行-楼盘信息导出 + * 绂忓窞鍐滃晢琛�-妤肩洏淇℃伅瀵煎嚭 */ @BatchOwner(Watcher.GaoJuan) class DistrictInfoExportBatch extends BaseBatch{ @@ -48,21 +48,21 @@ class DistrictInfoExportBatch extends BaseBatch{ "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", "build_structure","building_count","alias","address"] - def ret = createDatas("福州") + def ret = createDatas("绂忓窞") def fileName = "/fzbank/output/FJW_COMM_"+curDate+".csv" def dataCodeFileName = "/fzbank/output/FJW_COMM_"+curDate+".sha512" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\福州\\FJW_COMM_"+curDate+".csv" - dataCodeFileName = "D:\\数据\\福州\\FJW_COMM_"+curDate+".sha512" + fileName = "D:\\鏁版嵁\\绂忓窞\\FJW_COMM_"+curDate+".csv" + dataCodeFileName = "D:\\鏁版嵁\\绂忓窞\\FJW_COMM_"+curDate+".sha512" } - //生成数据文件并上传 + //鐢熸垚鏁版嵁鏂囦欢骞朵笂浼� def sb = appendResult(headers, ret) DataHandleUtils.outPutFile(fileName, sb, charset); FzFtpUtils.ftpUpload(fileName) - //生成加密数据文件并上传 + //鐢熸垚鍔犲瘑鏁版嵁鏂囦欢骞朵笂浼� FzFtpUtils.uploadSha512Data2(fileName, dataCodeFileName, charset); } @@ -93,7 +93,7 @@ class DistrictInfoExportBatch extends BaseBatch{ def fzAddrMap = getFzAddress(); - //因为福州个性化问题,又不想影响自家数据库数据,所以另存一个福州小区库,用于手动添加数据 + //鍥犱负绂忓窞涓�у寲闂锛屽張涓嶆兂褰卞搷鑷鏁版嵁搴撴暟鎹紝鎵�浠ュ彟瀛樹竴涓宸炲皬鍖哄簱锛岀敤浜庢墜鍔ㄦ坊鍔犳暟鎹� saveOrUpdateFzDist(districts) if(day == 15){ @@ -111,7 +111,7 @@ class DistrictInfoExportBatch extends BaseBatch{ } for(def rMap : fzDistricts){ - //价格没有也提供 + //浠锋牸娌℃湁涔熸彁渚� // def dbo = CommonDatautils.queryDistrictPriceByDate3(city, rMap.region, rMap.name, startDate, lastDate) // if(dbo){ def row = [] @@ -125,7 +125,7 @@ class DistrictInfoExportBatch extends BaseBatch{ }else{ row << "" row << "" - println rMap.name +" 无经纬度" + println rMap.name +" 鏃犵粡绾害" } row << rMap.estate_type2 @@ -145,7 +145,7 @@ class DistrictInfoExportBatch extends BaseBatch{ row << rMap.virescence_percent row << rMap.developer row << rMap.estate_company - row << getBuildStructure(rMap.build_structure)//为空的,默认钢混 + row << getBuildStructure(rMap.build_structure)//涓虹┖鐨勶紝榛樿閽㈡贩 row << rMap.loudong_count row << processAlias(rMap.alias, rMap.addr_alias) @@ -226,7 +226,7 @@ class DistrictInfoExportBatch extends BaseBatch{ def newAlias = [] if(alias){ for(def name : alias){ - if(name && !name.contains("(") && !name.contains("、") && !name.contains("?") && !name.contains("(") && !newAlias.contains(name)){ + if(name && !name.contains("(") && !name.contains("銆�") && !name.contains("?") && !name.contains("锛�") && !newAlias.contains(name)){ newAlias << name } } @@ -234,7 +234,7 @@ class DistrictInfoExportBatch extends BaseBatch{ if(addr_alias){ for(def name : addr_alias){ - if(name && !name.contains("(") && !name.contains("、") && !name.contains("?") && !name.contains("(") && !newAlias.contains(name)){ + if(name && !name.contains("(") && !name.contains("銆�") && !name.contains("?") && !name.contains("锛�") && !newAlias.contains(name)){ newAlias << name } } @@ -249,45 +249,45 @@ class DistrictInfoExportBatch extends BaseBatch{ def getBuildStructure(buildStructures){ if(buildStructures){ def rets = [] - if(buildStructures.contains("钢结构")){ - if(!rets.contains("钢混")){ - rets << "钢混" + if(buildStructures.contains("閽㈢粨鏋�")){ + if(!rets.contains("閽㈡贩")){ + rets << "閽㈡贩" } } - if(buildStructures.contains("钢、钢筋混凝土结构")){ - if(!rets.contains("钢混")){ - rets << "钢混" + if(buildStructures.contains("閽€�侀挗绛嬫贩鍑濆湡缁撴瀯")){ + if(!rets.contains("閽㈡贩")){ + rets << "閽㈡贩" } } - if(buildStructures.contains("钢筋混凝土结构")){ - if(!rets.contains("钢混")){ - rets << "钢混" + if(buildStructures.contains("閽㈢瓔娣峰嚌鍦熺粨鏋�")){ + if(!rets.contains("閽㈡贩")){ + rets << "閽㈡贩" } } - if(buildStructures.contains("混合结构")){ - if(!rets.contains("非钢混")){ - rets << "非钢混" + if(buildStructures.contains("娣峰悎缁撴瀯")){ + if(!rets.contains("闈為挗娣�")){ + rets << "闈為挗娣�" } } - if(buildStructures.contains("砖木结构")){ - if(!rets.contains("非钢混")){ - rets << "非钢混" + if(buildStructures.contains("鐮栨湪缁撴瀯")){ + if(!rets.contains("闈為挗娣�")){ + rets << "闈為挗娣�" } } - if(buildStructures.contains("其他结构")){ - if(!rets.contains("非钢混")){ - rets << "非钢混" + if(buildStructures.contains("鍏朵粬缁撴瀯")){ + if(!rets.contains("闈為挗娣�")){ + rets << "闈為挗娣�" } } if(rets.size()==0){ - rets << "钢混" + rets << "閽㈡贩" } return rets.join(",") } - return "钢混"; + return "閽㈡贩"; } @@ -317,7 +317,7 @@ class DistrictInfoExportBatch extends BaseBatch{ } def export(def fileName, def ret){ - //lat,lng 高德 property_fee物业费 delivery_date交房时间 landscaping_ratio绿化率 + //lat,lng 楂樺痉 property_fee鐗╀笟璐� delivery_date浜ゆ埧鏃堕棿 landscaping_ratio缁垮寲鐜� 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", @@ -402,15 +402,15 @@ class DistrictInfoExportBatch extends BaseBatch{ } private String csvHandlerStr(String str) { - //csv格式如果有逗号,整体用双引号括起来;如果里面还有双引号就替换成两个双引号,这样导出来的格式就不会有问题了 + //csv鏍煎紡濡傛灉鏈夐�楀彿锛屾暣浣撶敤鍙屽紩鍙锋嫭璧锋潵锛涘鏋滈噷闈㈣繕鏈夊弻寮曞彿灏辨浛鎹㈡垚涓や釜鍙屽紩鍙凤紝杩欐牱瀵煎嚭鏉ョ殑鏍煎紡灏变笉浼氭湁闂浜� String tempDescription=str; - //如果有逗号 + //濡傛灉鏈夐�楀彿 if(str.contains(",")){ - //如果还有双引号,先将双引号转义,避免两边加了双引号后转义错误 + //濡傛灉杩樻湁鍙屽紩鍙凤紝鍏堝皢鍙屽紩鍙疯浆涔夛紝閬垮厤涓よ竟鍔犱簡鍙屽紩鍙峰悗杞箟閿欒 if(str.contains("\"")){ tempDescription=str.replace("\"", "\"\""); } - //在将逗号转义 + //鍦ㄥ皢閫楀彿杞箟 tempDescription="\""+tempDescription+"\""; } return tempDescription; @@ -418,23 +418,23 @@ class DistrictInfoExportBatch extends BaseBatch{ static def processDate(def finishBuildingDate){ if(finishBuildingDate){ - Pattern pat1 = Pattern.compile("\\d{4}[年\\-\\.]\\d{2}[月\\-\\.]\\d{2}"); + Pattern pat1 = Pattern.compile("\\d{4}[骞碶\-\\.]\\d{2}[鏈圽\-\\.]\\d{2}"); Matcher matcher1 = pat1.matcher(finishBuildingDate); - Pattern pat2 = Pattern.compile("\\d{4}[年\\-\\.]\\d{2}"); + Pattern pat2 = Pattern.compile("\\d{4}[骞碶\-\\.]\\d{2}"); def matcher2 = pat2.matcher(finishBuildingDate); Pattern pat3 = Pattern.compile("\\d{4}"); def matcher3 = pat3.matcher(finishBuildingDate); if (matcher1.find()) { - return matcher1.group().replace("年","-").replace("月","-") + return matcher1.group().replace("骞�","-").replace("鏈�","-") }else if(matcher2.find()){ - return matcher2.group().replace("年","-") + return matcher2.group().replace("骞�","-") }else if(matcher3.find()){ return matcher3.group() }else{ - println finishBuildingDate+" 无" + println finishBuildingDate+" 鏃�" } } return null; 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 9a1c97ae7..9a69a789b 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 @@ -14,7 +14,7 @@ import org.bson.types.ObjectId import java.text.DecimalFormat /** - * 福州农商行-小区月均价数据导出 + * 绂忓窞鍐滃晢琛�-灏忓尯鏈堝潎浠锋暟鎹鍑� */ @BatchOwner(Watcher.GaoJuan) class DistrictPriceExportBatch extends BaseBatch{ @@ -28,7 +28,7 @@ class DistrictPriceExportBatch extends BaseBatch{ static DBCollection DISTRICT_SELL_STAT = MongoUtils.getCollectionByName("fangjia_stat", "district_sell_stat", "mongo.db.fangjia.com") - def specialDistsPriceMap = ["津泰新村9-13号、15-18号":37500,"津泰新村14号":51000,"津泰新村1-6号、8号":23500,"津泰新村7号":38000,"津泰新村19号":36000, "金泉公寓15、16、17栋":24000,"金泉小区(1-12栋)":14000] + def specialDistsPriceMap = ["娲ユ嘲鏂版潙9-13鍙枫��15-18鍙�":37500,"娲ユ嘲鏂版潙14鍙�":51000,"娲ユ嘲鏂版潙1-6鍙枫��8鍙�":23500,"娲ユ嘲鏂版潙7鍙�":38000,"娲ユ嘲鏂版潙19鍙�":36000, "閲戞硥鍏瘬15銆�16銆�17鏍�":24000,"閲戞硥灏忓尯(1-12鏍�)":14000] static main(args) { runBatch(new DistrictPriceExportBatch(), args) } @@ -39,7 +39,7 @@ class DistrictPriceExportBatch extends BaseBatch{ def curDate = Integer.parseInt(DateUtils.formatDateByPattern(new Date(), "yyyyMMdd")); def headers = ["id","comm_id","city","district","name","avg_price","year_month"] - def ret = createNewDatas("福州") + def ret = createNewDatas("绂忓窞") saveToDB(ret) def results = selectLastResultDatas(ret); @@ -47,13 +47,13 @@ class DistrictPriceExportBatch extends BaseBatch{ def fileName = "/fzbank/output/FJW_DISTRICT_STAT_"+curDate+".csv" def dataCodeFileName = "/fzbank/output/FJW_DISTRICT_STAT_"+curDate+".sha512" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\福州\\FJW_DISTRICT_STAT_"+curDate+".csv" - dataCodeFileName = "D:\\数据\\福州\\FJW_DISTRICT_STAT_"+curDate+".sha512" + fileName = "D:\\鏁版嵁\\绂忓窞\\FJW_DISTRICT_STAT_"+curDate+".csv" + dataCodeFileName = "D:\\鏁版嵁\\绂忓窞\\FJW_DISTRICT_STAT_"+curDate+".sha512" } def sb = appendResult(headers, results) DataHandleUtils.outPutFile(fileName, sb, charset); FzFtpUtils.ftpUpload(fileName) - //生成加密数据文件并上传 + //鐢熸垚鍔犲瘑鏁版嵁鏂囦欢骞朵笂浼� FzFtpUtils.uploadSha512Data2(fileName, dataCodeFileName, charset); } @@ -129,8 +129,8 @@ class DistrictPriceExportBatch extends BaseBatch{ } } - def curPriceMap = findFzDistrictSellStat("福州",curDate) - def lastPriceMap = findFzDistrictStat("福州",lastMonth) + def curPriceMap = findFzDistrictSellStat("绂忓窞",curDate) + def lastPriceMap = findFzDistrictStat("绂忓窞",lastMonth) def result = [] for(def rMap : districts){ @@ -143,7 +143,7 @@ class DistrictPriceExportBatch extends BaseBatch{ def lastMonthPrice = lastPriceMap.get(rMap.get("_id").toString()) if(curPrice && lastMonthPrice){ - // 20260115修改,价格不进行控制 + // 20260115淇敼锛屼环鏍间笉杩涜鎺у埗 // if(dbo.value_type != 1){ // def mom = (curPrice - lastMonthPrice)/lastMonthPrice // if(Math.abs(mom)*100>=6){ @@ -166,11 +166,11 @@ class DistrictPriceExportBatch extends BaseBatch{ } def m = [] if(curPrice && dbo){ - m << dbo.get("_id").toString()//均价ID + m << dbo.get("_id").toString()//鍧囦环ID }else{ m << new ObjectId().toString() } - m << rMap.get("_id").toString()//楼盘ID + m << rMap.get("_id").toString()//妤肩洏ID m << rMap.city m << rMap.region m << rMap.name @@ -182,28 +182,28 @@ class DistrictPriceExportBatch extends BaseBatch{ m << curDate.toInteger(); if(curPrice && dbo){ if(dbo.value_type == 1){ - m << "指导价" + m << "鎸囧浠�" }else if(dbo.value_type == 2){ - m << "自身样本" + m << "鑷韩鏍锋湰" }else if(dbo.value_type == 3){ - m << "第三方" + m << "绗笁鏂�" }else if(dbo.value_type == 4){ - m << "交易数据" + m << "浜ゆ槗鏁版嵁" }else if(dbo.value_type == 5){ - m << "周边楼盘" + m << "鍛ㄨ竟妤肩洏" }else if(dbo.value_type == 6){ - m << "推导" + m << "鎺ㄥ" }else if(dbo.value_type == 8) { - m << "新模型" + m << "鏂版ā鍨�" }else if(dbo.value_type == 9){ - m << "神经网络" + m << "绁炵粡缃戠粶" }else if(dbo.value_type == 10){ - m << "无方式" + m << "鏃犳柟寮�" }else{ m << "" } }else{ - m << "无" + m << "鏃�" } result << m } @@ -220,14 +220,14 @@ class DistrictPriceExportBatch extends BaseBatch{ def dataStr = DateUtils.add(endDateStr, -30) def startDate = DateUtils.parseFromTightYYYYMMDD(dataStr) def lastDate = DateUtils.parseFromTightByPattern(endDateStr, "yyyy-MM-dd") -// List list2 = FileUtils.readLines(new File("D:\\数据\\福州\\FJW_DISTRICT_STAT_202111.csv")) +// List list2 = FileUtils.readLines(new File("D:\\鏁版嵁\\绂忓窞\\FJW_DISTRICT_STAT_202111.csv")) // def map2 = [:] // for(def s : list2) { // def row = s.split("@\\|@") // def key = row[2] + "##" + row[3] + "##" + row[4] // map2.put(key, row[5]) // } - def lastMonthPriceMap = findFzDistrictStat("福州",lastMonthDate) + def lastMonthPriceMap = findFzDistrictStat("绂忓窞",lastMonthDate) def result = [] @@ -259,11 +259,11 @@ class DistrictPriceExportBatch extends BaseBatch{ } def m = [] if(curPrice && dbo){ - m << dbo.get("_id").toString()//均价ID + m << dbo.get("_id").toString()//鍧囦环ID }else{ m << new ObjectId().toString() } - m << rMap.get("_id").toString()//楼盘ID + m << rMap.get("_id").toString()//妤肩洏ID m << rMap.city m << rMap.region m << rMap.name @@ -330,7 +330,7 @@ class DistrictPriceExportBatch extends BaseBatch{ } } - //随机浮点数 + //闅忔満娴偣鏁� public static double nextDouble(final double min, final double max) throws Exception { DecimalFormat df = new DecimalFormat("#.00"); @@ -355,7 +355,7 @@ class DistrictPriceExportBatch extends BaseBatch{ udata.put("m_date", new Date()) udata.put("avg_price", r[5]) - //按comm_id修改,小区名重新赋值,防止区域和小区名修改 + //鎸塩omm_id淇敼锛屽皬鍖哄悕閲嶆柊璧嬪�硷紝闃叉鍖哄煙鍜屽皬鍖哄悕淇敼 udata.put("region", r[3]) udata.put("name", r[4]) udata.put("value_type", r[7]) 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 30be8c6d8..5cfe9d1f1 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 @@ -18,7 +18,7 @@ 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 DistrictSellStatBatch extends BaseBatch { @@ -53,17 +53,17 @@ class DistrictSellStatBatch extends BaseBatch { def day = date.getDate() def hours = date.getHours() if(day == 2 && hours<7){ - calcMonthlyPrice() //正常算一期 + calcMonthlyPrice() //姝e父绠椾竴鏈� }else{ - //根据calc_type算历史 + //鏍规嵁calc_type绠楀巻鍙� def q = new BasicDBObject("category" ,"sell_month") def commands = COMMAND_COLL.find(q) - println "共 【"+commands.size()+"】 个小区重算 "+new Date() + println "鍏� 銆�"+commands.size()+"銆� 涓皬鍖洪噸绠� "+new Date() for(def command : commands){ def calc_type = command.calc_type def id = command._id if(calc_type==1){ - //找出第一次均价计算的时间 + //鎵惧嚭绗竴娆″潎浠疯绠楃殑鏃堕棿 def obj = CommonDatautils.queryFirstOrLastDistrictPrice(command.city, command.region, command.name, 1) if(obj){ def weekend = obj.weekend @@ -76,7 +76,7 @@ class DistrictSellStatBatch extends BaseBatch { def curDate = DateUtils.parseFromTightByPattern(month.toString()+"01", "yyyyMMdd") calcMonthlyPriceByName(curDate, command.city, command.region, command.name) } - //删除命令 + //鍒犻櫎鍛戒护 COMMAND_COLL.remove(new BasicDBObject("_id", id)) } } @@ -103,13 +103,13 @@ class DistrictSellStatBatch extends BaseBatch { } def calcMonthlyPrice(curDate){ - //只有福州使用tob价格,改为所有城市都使用2B价格,除人工指导价除外 + //鍙湁绂忓窞浣跨敤tob浠锋牸锛屾敼涓烘墍鏈夊煄甯傞兘浣跨敤2B浠锋牸锛岄櫎浜哄伐鎸囧浠烽櫎澶� if(!curDate){ curDate = new Date() } def citys = CommonUtils.findAllCity() -// citys.remove("上海") -// citys.remove("福州") +// citys.remove("涓婃捣") +// citys.remove("绂忓窞") 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(curDate)) @@ -129,7 +129,7 @@ class DistrictSellStatBatch extends BaseBatch { index++ def districts = [] - if(city == "福州"){ + if(city == "绂忓窞"){ // if(day == 15){ districts = FZ_DIST_COLL.find(new BasicDBObject("city", city), keys).toList() // }else{ @@ -137,7 +137,7 @@ class DistrictSellStatBatch extends BaseBatch { // } }else{ def q = new BasicDBObject("city", city).append("cat", "district").append("status", 0) -// q.put("name", "越华路小区") +// q.put("name", "瓒婂崕璺皬鍖�") // if(day == 2){ districts = SEAWEED_MONGO_COLL.find(q, keys).batchSize(2000).toList() // }else{ @@ -151,10 +151,10 @@ class DistrictSellStatBatch extends BaseBatch { def startDate = DateUtils.getFirstDayOfMonth(curDate, -1); def endDate = DateUtils.getLastDayOfMonth(curDate, -1); if(districts.size()>0){ - def weekendPriceMap = findPriceMap(city, startDate, endDate, null, null)//上个月小区均价 - def curMonthlyPriceMap = findMonthlyPrice(city, curMonth, null, null)//当月小区月均价 - def lastMonthlyPriceMap = findMonthlyPrice(city, monDate, null, null)//上个月小区月均价 - def lastYearPriceMap = findMonthlyPrice(city, yoyDate, null, null)//去年小区月均价 + def weekendPriceMap = findPriceMap(city, startDate, endDate, null, null)//涓婁釜鏈堝皬鍖哄潎浠� + def curMonthlyPriceMap = findMonthlyPrice(city, curMonth, null, null)//褰撴湀灏忓尯鏈堝潎浠� + def lastMonthlyPriceMap = findMonthlyPrice(city, monDate, null, null)//涓婁釜鏈堝皬鍖烘湀鍧囦环 + def lastYearPriceMap = findMonthlyPrice(city, yoyDate, null, null)//鍘诲勾灏忓尯鏈堝潎浠� if(weekendPriceMap){ running(curMonth, districts, weekendPriceMap, curMonthlyPriceMap, lastMonthlyPriceMap, lastYearPriceMap) } @@ -164,7 +164,7 @@ class DistrictSellStatBatch extends BaseBatch { def calcMonthlyPriceByName(curDate, city, region, name) { - //只有福州使用tob价格,改为所有城市都使用2B价格,除人工指导价除外 + //鍙湁绂忓窞浣跨敤tob浠锋牸锛屾敼涓烘墍鏈夊煄甯傞兘浣跨敤2B浠锋牸锛岄櫎浜哄伐鎸囧浠烽櫎澶� if (!curDate) { curDate = new Date() } @@ -184,10 +184,10 @@ class DistrictSellStatBatch extends BaseBatch { def startDate = DateUtils.getFirstDayOfMonth(curDate, -1); def endDate = DateUtils.getLastDayOfMonth(curDate, -1); if (districts.size() > 0) { - def weekendPriceMap = findPriceMap(city, startDate, endDate, region, name)//上个月小区均价 - def curMonthlyPriceMap = findMonthlyPrice(city, curMonth, region, name)//当月小区月均价 - def lastMonthlyPriceMap = findMonthlyPrice(city, monDate, region, name)//上个月小区月均价 - def lastYearPriceMap = findMonthlyPrice(city, yoyDate, region, name)//去年小区月均价 + def weekendPriceMap = findPriceMap(city, startDate, endDate, region, name)//涓婁釜鏈堝皬鍖哄潎浠� + def curMonthlyPriceMap = findMonthlyPrice(city, curMonth, region, name)//褰撴湀灏忓尯鏈堝潎浠� + def lastMonthlyPriceMap = findMonthlyPrice(city, monDate, region, name)//涓婁釜鏈堝皬鍖烘湀鍧囦环 + def lastYearPriceMap = findMonthlyPrice(city, yoyDate, region, name)//鍘诲勾灏忓尯鏈堝潎浠� if (weekendPriceMap) { running(curMonth, districts, weekendPriceMap, curMonthlyPriceMap, lastMonthlyPriceMap, lastYearPriceMap) } @@ -244,7 +244,7 @@ class DistrictSellStatBatch extends BaseBatch { try{ mom = DataUtil.roundDouble(((weekendPriceObj.avg_price - lastMonthPriceObj.avg_price)/(double)lastMonthPriceObj.avg_price),4) }catch(Exception e){ - println key+" 出错................." + println key+" 鍑洪敊................." } } @@ -252,7 +252,7 @@ class DistrictSellStatBatch extends BaseBatch { def curPrice = weekendPriceObj.avg_price if(weekendPriceObj.value_type!=1){ - if(dist.city == "福州"){ + if(dist.city == "绂忓窞"){ if(Math.abs(mom)*100>8){ def randMarkup = nextDouble(5, 8) if(mom < 0){ @@ -346,7 +346,7 @@ class DistrictSellStatBatch extends BaseBatch { } - //随机浮点数 + //闅忔満娴偣鏁� public static double nextDouble(final double min, final double max) throws Exception { DecimalFormat df = new DecimalFormat("#.00"); @@ -372,7 +372,7 @@ class DistrictSellStatBatch extends BaseBatch { def priceMap = [:] for(def d : dbcursor){ if(!priceMap.containsKey(d.region +"##"+d.district_name)){ - if(city == "福州"){ + if(city == "绂忓窞"){ if(d.avg_price_2b && d.value_type!=1){ d.avg_price = d.avg_price_2b } @@ -414,7 +414,7 @@ class DistrictSellStatBatch extends BaseBatch { // if(stats){ // batchUpdate(stats) // } -// println "[${index}] "+city+" 完成" +// println "[${index}] "+city+" 瀹屾垚" // } // } // @@ -467,7 +467,7 @@ class DistrictSellStatBatch extends BaseBatch { // DISTRICT_SELL_STAT.update(new BasicDBObject("_id", obj._id) , new BasicDBObject('$set', udata),true,false) // } // }else{ -// println stat.city+" "+stat.region+" "+stat.name+" 不存在" +// println stat.city+" "+stat.region+" "+stat.name+" 涓嶅瓨鍦�" // } // } // 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 ef11f554b..1801b7efe 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 @@ -8,7 +8,7 @@ import com.mongodb.* import org.apache.commons.io.FileUtils import org.bson.types.ObjectId /** - * 福州数据结果统计 + * 绂忓窞鏁版嵁缁撴灉缁熻 */ class FzDataResultStat { @@ -32,7 +32,7 @@ class FzDataResultStat { } def statHouse(){ - ExcelUtils.multiThreadingModify("C:\\Users\\gaojuan\\Downloads\\福州待调查小区.xlsx",{d-> + ExcelUtils.multiThreadingModify("C:\\Users\\gaojuan\\Downloads\\绂忓窞寰呰皟鏌ュ皬鍖�.xlsx",{d-> def o = CommonDatautils.findDistrictById(d['A']) if(o){ def count = CommonDatautils.findHouseCountByDate(o.city, o.region, o.name, o.alias, "sell", 20220818) @@ -45,7 +45,7 @@ class FzDataResultStat { def margeExcel(){ - def list2= ExcelUtils.read("D:\\数据\\福州\\价格比对_202204_新2.xlsx", 0 ,1) + def list2= ExcelUtils.read("D:\\鏁版嵁\\绂忓窞\\浠锋牸姣斿_202204_鏂�2.xlsx", 0 ,1) def map2 = [:] for(def s : list2){ @@ -53,7 +53,7 @@ class FzDataResultStat { map2.put(key, s["D"]) } - ExcelUtils.multiThreadingModify("D:\\数据\\福州\\价格比对_202204_新3.xlsx",{row-> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\绂忓窞\\浠锋牸姣斿_202204_鏂�3.xlsx",{row-> if(row["A"]){ def key = row["A"]+"##"+row["B"]+"##"+row["C"] def price = map2.get(key) @@ -67,12 +67,12 @@ class FzDataResultStat { def curMonth = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), 0, "yyyyMM")+"15"); def lastMonth = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM")); -// List list1= FileUtils.readLines(new File("D:\\数据\\福州\\FJW_DISTRICT_STAT_${curMonth}.csv")) -// def dists = CommonDatautils.findAllDistricts("福州", "district", ["status"]) - def dists = getFzDistricts("福州", ["status"]) +// List list1= FileUtils.readLines(new File("D:\\鏁版嵁\\绂忓窞\\FJW_DISTRICT_STAT_${curMonth}.csv")) +// def dists = CommonDatautils.findAllDistricts("绂忓窞", "district", ["status"]) + def dists = getFzDistricts("绂忓窞", ["status"]) def idMaps = [:] for(def d : dists){ - idMaps.put(d._id.toString(), d.status==0?"有效":"无效") + idMaps.put(d._id.toString(), d.status==0?"鏈夋晥":"鏃犳晥") } def list1 = findFzDistrictStat(Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM"))) @@ -83,12 +83,12 @@ class FzDataResultStat { if(!distkeys.contains(key)){ distkeys << key }else{ - println "重复:"+key + println "閲嶅锛�"+key } map1.put(key, obj) } -// List list2 = FileUtils.readLines(new File("D:\\数据\\福州\\FJW_DISTRICT_STAT_${lastMonth}.csv")) +// List list2 = FileUtils.readLines(new File("D:\\鏁版嵁\\绂忓窞\\FJW_DISTRICT_STAT_${lastMonth}.csv")) def list2 = findFzDistrictStat(Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -2, "yyyyMM"))) def map2 = [:] for(def obj : list2) { @@ -96,7 +96,7 @@ class FzDataResultStat { map2.put(key, obj) } def rows = [] - rows << ["ID","城市","区域","名称","${curMonth}价格","${lastMonth}价格", "涨跌幅","计算方式", "是否有效", "涨跌绝对值"] + rows << ["ID","鍩庡競","鍖哄煙","鍚嶇О","${curMonth}浠锋牸","${lastMonth}浠锋牸", "娑ㄨ穼骞�","璁$畻鏂瑰紡", "鏄惁鏈夋晥", "娑ㄨ穼缁濆鍊�"] def index = 0 map1.each {k,obj1-> def keys = k.split("##") @@ -112,7 +112,7 @@ class FzDataResultStat { e.printStackTrace() } - def flag = "无效" + def flag = "鏃犳晥" if(obj1){ flag = idMaps.get(obj1.comm_id) } @@ -126,14 +126,14 @@ class FzDataResultStat { index++ println row } - ExcelUtils.write("D:\\数据\\福州\\价格比对_${curMonth}.xlsx", rows, "数据") + ExcelUtils.write("D:\\鏁版嵁\\绂忓窞\\浠锋牸姣斿_${curMonth}.xlsx", rows, "鏁版嵁") - def regions = ["鼓楼","仓山","台江","晋安","马尾","长乐"]; + def regions = ["榧撴ゼ","浠撳北","鍙版睙","鏅嬪畨","椹熬","闀夸箰"]; def datas1 = [] def datas2 = [] - datas1 << ["城市","区域","名称","${curMonth}价格","${lastMonth}价格", "涨跌幅", "是否有效"] - datas2 << ["城市","区域","名称","${curMonth}价格","${lastMonth}价格", "涨跌幅", "是否有效"] + datas1 << ["鍩庡競","鍖哄煙","鍚嶇О","${curMonth}浠锋牸","${lastMonth}浠锋牸", "娑ㄨ穼骞�", "鏄惁鏈夋晥"] + datas2 << ["鍩庡競","鍖哄煙","鍚嶇О","${curMonth}浠锋牸","${lastMonth}浠锋牸", "娑ㄨ穼骞�", "鏄惁鏈夋晥"] def row_num = 0 for(def row : rows){ if(row_num>0){ @@ -151,14 +151,14 @@ class FzDataResultStat { row_num++ } - ExcelUtils.write("D:\\数据\\福州\\6区(超10%)_${curMonth}.xlsx", datas1, "数据") - ExcelUtils.write("D:\\数据\\福州\\7县(超10%)_${curMonth}.xlsx", datas2, "数据") + ExcelUtils.write("D:\\鏁版嵁\\绂忓窞\\6鍖�(瓒�10%)_${curMonth}.xlsx", datas1, "鏁版嵁") + ExcelUtils.write("D:\\鏁版嵁\\绂忓窞\\7鍘�(瓒�10%)_${curMonth}.xlsx", datas2, "鏁版嵁") } def regionPriceTrendRun(){ - def city = "福州" + def city = "绂忓窞" def add = -9; def months = [] while(add<0){ @@ -167,14 +167,14 @@ class FzDataResultStat { } def prices = exportRegion(city, months) def curMonth = DateUtils.formatDateByPattern(new Date(), "yyyy-MM") - ExcelUtils.write("D:\\数据\\福州\\福州6区均价半年走势_${curMonth}.xlsx", prices, "数据") + ExcelUtils.write("D:\\鏁版嵁\\绂忓窞\\绂忓窞6鍖哄潎浠峰崐骞磋蛋鍔縚${curMonth}.xlsx", prices, "鏁版嵁") } def exportRegion(city, months){ - def regions = ["鼓楼","仓山","台江","晋安","马尾","长乐","福清","闽侯","连江","罗源","闽清","永泰","平潭"]; + def regions = ["榧撴ゼ","浠撳北","鍙版睙","鏅嬪畨","椹熬","闀夸箰","绂忔竻","闂戒警","杩炴睙","缃楁簮","闂芥竻","姘告嘲","骞虫江"]; def datas =[] - def header = ["城市", "区域"] + def header = ["鍩庡競", "鍖哄煙"] for(def m : months){ header << m.toString().substring(0, m.toString().lastIndexOf("-")) } @@ -242,7 +242,7 @@ class FzDataResultStat { def saveCsvData(){ - def files = getAllFiles("C:\\Users\\gaojuan\\福州数据(1)") + def files = getAllFiles("C:\\Users\\gaojuan\\绂忓窞鏁版嵁(1)") if(files){ for(def filepath : files){ List list1= FileUtils.readLines(filepath) @@ -275,7 +275,7 @@ class FzDataResultStat { files << tempList[i]; } if (tempList[i].isDirectory()) { - System.out.println("文件夹:" + tempList[i]); + System.out.println("鏂囦欢澶癸細" + tempList[i]); } } return files; @@ -308,7 +308,7 @@ class FzDataResultStat { } def testNewPrice(){ - ExcelUtils.modify("D:\\数据\\福州\\福州200个小区抽样价格核验202507.xlsx",{d-> + ExcelUtils.modify("D:\\鏁版嵁\\绂忓窞\\绂忓窞200涓皬鍖烘娊鏍蜂环鏍兼牳楠�202507.xlsx",{d-> if(d['A']){ def q = new BasicDBObject() q.put("comm_id", d['A']) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/FzDistrictMatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/FzDistrictMatch.groovy index d4e07eab4..34856c9bb 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/FzDistrictMatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/FzDistrictMatch.groovy @@ -22,14 +22,14 @@ class FzDistrictMatch { // task.addPrice() // task.addThirdPrice() - task.addThirdPrice2("D:\\数据\\福州\\价格比对_20240315.xlsx") + task.addThirdPrice2("D:\\鏁版嵁\\绂忓窞\\浠锋牸姣斿_20240315.xlsx") // task.longyanPrice() } def longyanPrice(){ -// def dists = CommonDatautils.findAllDistricts("龙岩","district", ["city","region","name","estate_type2"]) +// def dists = CommonDatautils.findAllDistricts("榫欏博","district", ["city","region","name","estate_type2"]) // def rets = [] -// rets << ["Id", "城市","区域", "名称", "物业类型", "上个月价格toB","上个月价格","最新价格toB","最新价格"] +// rets << ["Id", "鍩庡競","鍖哄煙", "鍚嶇О", "鐗╀笟绫诲瀷", "涓婁釜鏈堜环鏍紅oB","涓婁釜鏈堜环鏍�","鏈�鏂颁环鏍紅oB","鏈�鏂颁环鏍�"] // for(def d : dists){ // def ret = [] // ret << d._id.toString() @@ -50,10 +50,10 @@ class FzDistrictMatch { // } // rets << ret // } -// ExcelUtils.write("D:\\数据\\福州\\龙岩价格对比.xlsx", rets, "龙岩") +// ExcelUtils.write("D:\\鏁版嵁\\绂忓窞\\榫欏博浠锋牸瀵规瘮.xlsx", rets, "榫欏博") - addThirdPrice("D:\\数据\\福州\\龙岩价格对比.xlsx") + addThirdPrice("D:\\鏁版嵁\\绂忓窞\\榫欏博浠锋牸瀵规瘮.xlsx") } def addThirdPrice2(path){ @@ -89,8 +89,8 @@ class FzDistrictMatch { } def addThirdPrice(){ - def map = read("D:\\数据\\福州\\FJW_THIRD_PARTY_AVG_PRICE_202206.csv"); - ExcelUtils.modify("D:\\数据\\福州\\福州\\福州高端小区匹配.xlsx", { d -> + def map = read("D:\\鏁版嵁\\绂忓窞\\FJW_THIRD_PARTY_AVG_PRICE_202206.csv"); + ExcelUtils.modify("D:\\鏁版嵁\\绂忓窞\\绂忓窞\\绂忓窞楂樼灏忓尯鍖归厤.xlsx", { d -> if(d['G']){ def priceMap = map.get(d['G']) def prices = [] @@ -197,7 +197,7 @@ class FzDistrictMatch { } def addPrice(){ - ExcelUtils.modify("D:\\数据\\福州\\福州\\福州高端小区匹配.xlsx", { d -> + ExcelUtils.modify("D:\\鏁版嵁\\绂忓窞\\绂忓窞\\绂忓窞楂樼灏忓尯鍖归厤.xlsx", { d -> if(d['G']){ def avg_price = findFzDistrictStat( d['G'],202207) d['F'] = avg_price @@ -218,18 +218,18 @@ class FzDistrictMatch { } def run(){ - ExcelUtils.multiThreadingModify("D:\\数据\\福州\\福州\\福州高端小区匹配.xlsx",{d-> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\绂忓窞\\绂忓窞\\绂忓窞楂樼灏忓尯鍖归厤.xlsx",{d-> def region = d['C'] if(!d['G'] && region){ - def name = d['B'].toString().replace("(","").replace(")","") -// name = d['B'].toString().replace("(非钢混)","").replace("(钢混)","") - region = RegionData.formatRegion("福州", region) -// def dist = CommonDatautils.findDistrict("福州", region, name, "district") + def name = d['B'].toString().replace("锛�","").replace("锛�","") +// name = d['B'].toString().replace("锛堥潪閽㈡贩锛�","").replace("锛堥挗娣凤級","") + region = RegionData.formatRegion("绂忓窞", region) +// def dist = CommonDatautils.findDistrict("绂忓窞", region, name, "district") // if(dist){ // d['G'] = dist._id.toString() // d['H'] = dist.name // } - def jsonObject = OpenApiClient.addressMatch("福州", name, "property", false, region, null) + def jsonObject = OpenApiClient.addressMatch("绂忓窞", name, "property", false, region, null) if(jsonObject != null && jsonObject.precise!=-1) { d['H'] = jsonObject.get("name") d['G'] = jsonObject.get("id") @@ -243,7 +243,7 @@ class FzDistrictMatch { def addThirdPrice(path){ ExcelUtils.multiThreadingModify(path, { d -> - if(d['C'] && d['C']=="新罗"){ + if(d['C'] && d['C']=="鏂扮綏"){ def cityMap = CommonDatautils.findThirdPartyPrice(d['B'], d['C'], d['D'], 202312, 202403) def priceMap = cityMap.get(d['B']+"##"+d['C']+"##"+d['D']) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/FzFtpUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/FzFtpUtils.groovy index fabec3340..9a65d90c2 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/FzFtpUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/FzFtpUtils.groovy @@ -19,36 +19,36 @@ class FzFtpUtils { static def ftpUpload(outputPath_dist){ - //上传到ftp + //涓婁紶鍒癴tp sftpChannel = reConnect(); sftp.upload(ftpPath, outputPath_dist, sftpChannel); } static def reConnect(){ if(sftpChannel == null){ - println "sftpChannel 为空,需重连....." + println "sftpChannel 涓虹┖锛岄渶閲嶈繛....." if(sftp == null){ sftp = new SFTP(); } sftpChannel = sftp.connect(ftpServer, ftpPort, ftpUser, ftpPassword); }else{ - println "sftpChannel 正常....." + println "sftpChannel 姝e父....." } return sftpChannel; } static def uploadSha512Data(def sb, def dataCodeFileName, def charset){ - String sha512HexStr= DigestUtils.sha512Hex(sb.getBytes())//生成加密码码 - DataHandleUtils.outPutFile(dataCodeFileName, sha512HexStr,charset);//生成加密码文件 - ftpUpload(dataCodeFileName)//上传加密码文件到FTP + String sha512HexStr= DigestUtils.sha512Hex(sb.getBytes())//鐢熸垚鍔犲瘑鐮佺爜 + DataHandleUtils.outPutFile(dataCodeFileName, sha512HexStr,charset);//鐢熸垚鍔犲瘑鐮佹枃浠� + ftpUpload(dataCodeFileName)//涓婁紶鍔犲瘑鐮佹枃浠跺埌FTP } static def uploadSha512Data2(def dataFileName, def dataCodeFileName, def charset){ def data = new FileInputStream(new File(dataFileName)) - String sha512HexStr= DigestUtils.sha512Hex(data)//生成加密码码 - DataHandleUtils.outPutFile(dataCodeFileName, sha512HexStr,charset);//生成加密码文件 - ftpUpload(dataCodeFileName)//上传加密码文件到FTP + String sha512HexStr= DigestUtils.sha512Hex(data)//鐢熸垚鍔犲瘑鐮佺爜 + DataHandleUtils.outPutFile(dataCodeFileName, sha512HexStr,charset);//鐢熸垚鍔犲瘑鐮佹枃浠� + ftpUpload(dataCodeFileName)//涓婁紶鍔犲瘑鐮佹枃浠跺埌FTP } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/GongShu.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/GongShu.groovy index 2484d02b4..0b8699989 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/GongShu.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/GongShu.groovy @@ -20,13 +20,13 @@ class GongShu { } def run() { - String path1 = "D:\\数据\\福州\\福州200个小区抽样价格核验202602.xlsx"; -// String path1 = "D:\\数据\\福州\\价格比对_20240915.xlsx"; - String path2 = "E:\\goojia\\file\\excel文件\\福州\\福州202410小区价格.xlsx"; -// String path2 = "E:\\goojia\\file\\excel文件\\福州\\福州202410小区价格.xlsx"; - String path3 = "E:\\goojia\\file\\excel文件\\福州\\福州贝壳小区.xlsx"; -// String path2 = "E:\\goojia\\file\\excel文件\\福州\\1.xlsx"; -// String path1 = "E:\\goojia\\file\\excel文件\\福州\\福州全部小区.xlsx"; + String path1 = "D:\\鏁版嵁\\绂忓窞\\绂忓窞200涓皬鍖烘娊鏍蜂环鏍兼牳楠�202602.xlsx"; +// String path1 = "D:\\鏁版嵁\\绂忓窞\\浠锋牸姣斿_20240915.xlsx"; + String path2 = "E:\\goojia\\file\\excel鏂囦欢\\绂忓窞\\绂忓窞202410灏忓尯浠锋牸.xlsx"; +// String path2 = "E:\\goojia\\file\\excel鏂囦欢\\绂忓窞\\绂忓窞202410灏忓尯浠锋牸.xlsx"; + String path3 = "E:\\goojia\\file\\excel鏂囦欢\\绂忓窞\\绂忓窞璐濆3灏忓尯.xlsx"; +// String path2 = "E:\\goojia\\file\\excel鏂囦欢\\绂忓窞\\1.xlsx"; +// String path1 = "E:\\goojia\\file\\excel鏂囦欢\\绂忓窞\\绂忓窞鍏ㄩ儴灏忓尯.xlsx"; // findID(path2) // findDelDistrict(path2) // findDistrictByAlias(path2) @@ -47,7 +47,7 @@ class GongShu { ExcelUtils.defineByInputThreadingModify(10, path2, { List d -> count.incrementAndGet() if (count % 10 == 0) { - println("已处理:" + count) + println("宸插鐞嗭細" + count) } def city = d['C'] def region = d['D'] @@ -65,7 +65,7 @@ class GongShu { ExcelUtils.defineByInputThreadingModify(10, path2, { List d -> count.incrementAndGet() if (count % 10 == 0) { - println("已处理:" + count) + println("宸插鐞嗭細" + count) } def city = d['C'] def region = d['D'] @@ -73,7 +73,7 @@ class GongShu { def district = CommonDatautils.findDistrictAll(city, region, name, "district") if ("1" == district.status.toString()) { // d['B'] = district._id.toString() - d['G'] = "已删除" + d['G'] = "宸插垹闄�" } }) } @@ -83,7 +83,7 @@ class GongShu { ExcelUtils.defineByInputThreadingModify(10, path2, { List d -> count.incrementAndGet() if (count % 10 == 0) { - println("已处理:" + count) + println("宸插鐞嗭細" + count) } if (d['G']) { def city = d['C'] @@ -102,14 +102,14 @@ class GongShu { ExcelUtils.defineByInputThreadingModify(10, path1, { List d -> count.incrementAndGet() if (count % 10 == 0) { - println("已处理:" + count) + println("宸插鐞嗭細" + count) } def address = d['B'] + d['D'] + d['C'] def city = d['B'] def name = d['C'] def region = d['D'] - //19匹配 + //19鍖归厤 String url = "http://192.168.0.19:31080/FangJiaNlpService/match"; def map = [:] map.put("address", address) @@ -162,23 +162,23 @@ class GongShu { d['F'] = price.avg_price d['G'] = price.avg_price_2b def dbo = price - // 计算方式 + // 璁$畻鏂瑰紡 if (dbo.value_type == 1) { - dbo.cal_type = "指导价" + dbo.cal_type = "鎸囧浠�" } else if (dbo.value_type == 2) { - dbo.cal_type = "自身样本" + dbo.cal_type = "鑷韩鏍锋湰" } else if (dbo.value_type == 3) { - dbo.cal_type = "第三方" + dbo.cal_type = "绗笁鏂�" } else if (dbo.value_type == 4) { - dbo.cal_type = "交易数据" + dbo.cal_type = "浜ゆ槗鏁版嵁" } else if (dbo.value_type == 5) { - dbo.cal_type = "周边楼盘" + dbo.cal_type = "鍛ㄨ竟妤肩洏" } else if (dbo.value_type == 6) { - dbo.cal_type = "推导" + dbo.cal_type = "鎺ㄥ" } else if (dbo.value_type == 9) { - dbo.cal_type = "神经网络" + dbo.cal_type = "绁炵粡缃戠粶" } else if (dbo.value_type == 10) { - dbo.cal_type = "无方式" + dbo.cal_type = "鏃犳柟寮�" } else { dbo.cal_type = "" } @@ -199,7 +199,7 @@ class GongShu { ExcelUtils.defineByInputThreadingModify(1, path2, { List d -> count.incrementAndGet() if (count % 10 == 0) { - println("已处理:" + count) + println("宸插鐞嗭細" + count) } def key = d['G'] + d['H'] + d['I'] map.put(key, d) @@ -207,7 +207,7 @@ class GongShu { print(map) ExcelUtils.defineByInputThreadingModify(1, path1, { List d -> - def key = "福州" + d['C'] + d['D'] + def key = "绂忓窞" + d['C'] + d['D'] if (map.containsKey(key)) { def value = map.get(key) d['J'] = value['B'] @@ -226,7 +226,7 @@ class GongShu { ExcelUtils.defineByInputThreadingModify(1, path2, { List d -> count.incrementAndGet() if (count % 10 == 0) { - println("已处理:" + count) + println("宸插鐞嗭細" + count) } def key = d['C'] + d['D'] + d['E'] map.put(key, d) @@ -234,7 +234,7 @@ class GongShu { print(map) ExcelUtils.defineByInputThreadingModify(1, path1, { List d -> - def key = "福州" + d['C'] + d['D'] + def key = "绂忓窞" + d['C'] + d['D'] if (map.containsKey(key)) { def value = map.get(key) if (!d['J']) { @@ -250,13 +250,13 @@ class GongShu { } - // 房源及数量 + // 鎴挎簮鍙婃暟閲� def houseCase(path2) { def count = new AtomicInteger() ExcelUtils.defineByInputThreadingModify(10, path2, { List d -> count.incrementAndGet() if (count % 10 == 0) { - println("已处理:" + count) + println("宸插鐞嗭細" + count) } def price = [] @@ -269,7 +269,7 @@ class GongShu { name = d['L'] def must = [] - def term1 = ["terms": ["root": ["ke.com"]]] // 修正terms查询的格式 + def term1 = ["terms": ["root": ["ke.com"]]] // 淇terms鏌ヨ鐨勬牸寮� must << term1 def term2 = ["terms": ["cat": ["sell"]]] must << term2 @@ -281,7 +281,7 @@ class GongShu { must << term5 def params = ["query": ["bool": ["must": must]]] - // 添加 p_date 大于 20240101 的条件 + // 娣诲姞 p_date 澶т簬 20240101 鐨勬潯浠� def term6 = ["range": ["p_date": ["gt": "20240401"]]] must << term6 @@ -305,9 +305,9 @@ class GongShu { if (price.size() > 0) { println(price) - // 计算中位数 + // 璁$畻涓綅鏁� def medianPrice = calculateMedian(price) - // 找到与中位数最接近的有效价格 + // 鎵惧埌涓庝腑浣嶆暟鏈�鎺ヨ繎鐨勬湁鏁堜环鏍� def nearestPrice = findNearestPrice(medianPrice, price) print(nearestPrice) d['O'] = nearestPrice @@ -318,15 +318,15 @@ class GongShu { }) } - //查找三方价格 + //鏌ユ壘涓夋柟浠锋牸 def thirdPrice(path1) { def count = 0 ExcelUtils.multiThreadingModify( path1, { List d -> count++ if (count % 10 == 0) { - println("已处理:" + count) + println("宸插鐞嗭細" + count) } - def city = "福州" + def city = "绂忓窞" def region = d['B'] def name = d['C'] def valusMap = CommonDatautils.findThirdPartyPrice(city, region, name, 202511, 202601) @@ -354,18 +354,18 @@ class GongShu { ExcelUtils.multiThreadingModify(path1, { List d -> count++ if (count % 10 == 0) { - println("已处理:" + count) + println("宸插鐞嗭細" + count) } if (d['B']) { def city def region def name if (d['B'] && d['C']) { - city ="福州" + city ="绂忓窞" region = d['B'] name = d['C'] String sql = "select * from community where city = '${city}' and region = '${region}' and name.keyword = '${name}' " + - "and source = '贝壳找房' "; + "and source = '璐濆3鎵炬埧' "; ElasticUtils.executeSqlQuery(sql, { result -> if (result.size() > 0) { println(name +" "+result.avg_price) @@ -390,7 +390,7 @@ class GongShu { ExcelUtils.defineByInputThreadingModify(1, path1, { List d -> count++ if (count % 10 == 0) { - println("已处理:" + count) + println("宸插鐞嗭細" + count) } if (d['C'] && d['D'] && d['E']) { String city = d['C'] @@ -414,7 +414,7 @@ class GongShu { }) } - //重算小区价格 + //閲嶇畻灏忓尯浠锋牸 def rePrice(path2) { ExcelUtils.removeEmptyRow(path2) ExcelUtils.defineByInputThreadingModify(10, path2, { List d -> @@ -422,12 +422,12 @@ class GongShu { String city = d['A'] String region = d['B'] String name = d['C'] -// CommonUtils.recalculationAverage(city, region, name, "小区", DateUtil.parseDate("20240721", "yyyyMMdd")) - CommonUtils.recalculationAverage(city, region, name, "小区", DateUtil.parseDate("20240915", "yyyyMMdd")) - CommonUtils.recalculationAverage(city, region, name, "小区", DateUtil.parseDate("20240922", "yyyyMMdd")) - CommonUtils.recalculationAverage(city, region, name, "小区", DateUtil.parseDate("20240929", "yyyyMMdd")) - CommonUtils.recalculationAverage(city, region, name, "小区", DateUtil.parseDate("20241006", "yyyyMMdd")) - CommonUtils.recalculationAverage(city, region, name, "小区", DateUtil.parseDate("20241013", "yyyyMMdd")) +// CommonUtils.recalculationAverage(city, region, name, "灏忓尯", DateUtil.parseDate("20240721", "yyyyMMdd")) + CommonUtils.recalculationAverage(city, region, name, "灏忓尯", DateUtil.parseDate("20240915", "yyyyMMdd")) + CommonUtils.recalculationAverage(city, region, name, "灏忓尯", DateUtil.parseDate("20240922", "yyyyMMdd")) + CommonUtils.recalculationAverage(city, region, name, "灏忓尯", DateUtil.parseDate("20240929", "yyyyMMdd")) + CommonUtils.recalculationAverage(city, region, name, "灏忓尯", DateUtil.parseDate("20241006", "yyyyMMdd")) + CommonUtils.recalculationAverage(city, region, name, "灏忓尯", DateUtil.parseDate("20241013", "yyyyMMdd")) } @@ -435,22 +435,22 @@ class GongShu { } - // 计算中位数 + // 璁$畻涓綅鏁� def calculateMedian(prices) { def sortedPrices = prices.sort() def size = sortedPrices.size() if (size % 2 == 0) { - // 如果列表长度为偶数,则取中间两个数的平均值作为中位数 + // 濡傛灉鍒楄〃闀垮害涓哄伓鏁帮紝鍒欏彇涓棿涓や釜鏁扮殑骞冲潎鍊间綔涓轰腑浣嶆暟 def midIndex = (size / 2).toInteger() return (sortedPrices[midIndex - 1] + sortedPrices[midIndex]) / 2.0 } else { - // 如果列表长度为奇数,则取中间的数作为中位数 + // 濡傛灉鍒楄〃闀垮害涓哄鏁帮紝鍒欏彇涓棿鐨勬暟浣滀负涓綅鏁� return sortedPrices[((size - 1) / 2).toInteger()] } } def findNearestPrice(targetPrice, validPrices) { - def nearestPrice = validPrices.first() // 假设第一个有效价格是最接近的价格 + def nearestPrice = validPrices.first() // 鍋囪绗竴涓湁鏁堜环鏍兼槸鏈�鎺ヨ繎鐨勪环鏍� def minDiff = Math.abs(targetPrice - nearestPrice) validPrices.each { price -> @@ -471,7 +471,7 @@ class GongShu { ExcelUtils.defineByInputThreadingModify(1, path2, { List d -> count++ if (count % 10 == 0) { - println("已处理:" + count) + println("宸插鐞嗭細" + count) } def matchCity = d['B'] def matchRegion = d['C'] @@ -480,7 +480,7 @@ class GongShu { q.put("match_city", matchCity) q.put("match_region", matchRegion) q.put("match_name", matchName) - q.put("source", "链家") + q.put("source", "閾惧") q.put("s_date", 202404) def data = DATA_PROCESS.find(q) for (da in data) { 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 76925db82..ec298ec51 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 @@ -45,13 +45,13 @@ class HouseExportBatch extends BaseBatch{ connectionProperties.put("password", "5e8edd851d2fdfbd7415232c67367cc3") dataSource.setProperties(connectionProperties) } - static def DIRECTIONS = ["东北", "西北", "东南", "西南", "南北", "东西", "东", "南", "西", "北"] + 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("豪装", ["豪华装修", "高档", "豪华", "豪装", "高级装修", "高装", "奢侈"]) + FITMENTS_TYPES_MAPS.put("姣涘澂", ["姣涘澂", "娓呮按", "鏃犺淇�", "鐙爧姣涘澂", "姣涜儦", "鐧藉澂", "鏃ц", "鍧�", "鍘熸埧", "姣涘潖"]) + FITMENTS_TYPES_MAPS.put("绠�瑁�", ["绠�瑁�", "鏅�氳淇�", "鏅��", "绠�鍗曡淇�", "绠�鏄撹淇�", "鏅", "涓�鑸淇�", "涓�鑸�", "绠�", "绮楄淇�"]) + FITMENTS_TYPES_MAPS.put("绮捐", ["绮捐", "鍏ㄨ淇�", "鍏ㄨ", "涓瓑瑁呬慨", "涓", "涓。瑁呬慨", "绮捐嚧瑁呬慨", "涓。", "涓瓑", "绮�", "涓慨", "浼樿川瑁呬慨", "鏃跺皻瑁呬慨", "鑹", "涓珮鎸�"]) + FITMENTS_TYPES_MAPS.put("璞", ["璞崕瑁呬慨", "楂樻。", "璞崕", "璞", "楂樼骇瑁呬慨", "楂樿", "濂緢"]) } @@ -67,23 +67,23 @@ class HouseExportBatch extends BaseBatch{ def headers = ["id","comm_id","city","district","comm_name","size","total_price","unit_price","total_floor","floor","room","hall","toilet","direction","fitment","title","url","p_date"] - def ret = createDatas("福州") - println "房源数据查询完成......总计:"+ret.size() + def ret = createDatas("绂忓窞") + println "鎴挎簮鏁版嵁鏌ヨ瀹屾垚......鎬昏锛�"+ret.size() def fileName = "/fzbank/output/FJW_HOUSE_"+curDate+".csv" def dataCodeFileName = "/fzbank/output/FJW_HOUSE_"+curDate+".sha512" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\福州\\FJW_HOUSE_"+curDate+".csv" - dataCodeFileName = "D:\\数据\\福州\\FJW_HOUSE_"+curDate+".sha512" + fileName = "D:\\鏁版嵁\\绂忓窞\\FJW_HOUSE_"+curDate+".csv" + dataCodeFileName = "D:\\鏁版嵁\\绂忓窞\\FJW_HOUSE_"+curDate+".sha512" } batchCreateFile(ret, fileName, headers, charset); - println "数据文件输出完成......" + println "鏁版嵁鏂囦欢杈撳嚭瀹屾垚......" FzFtpUtils.ftpUpload(fileName) - println "上传Ftp完成......" + println "涓婁紶Ftp瀹屾垚......" - //生成加密数据文件并上传 + //鐢熸垚鍔犲瘑鏁版嵁鏂囦欢骞朵笂浼� FzFtpUtils.uploadSha512Data2(fileName, dataCodeFileName, charset); - println "加密文件上传Ftp完成......" + println "鍔犲瘑鏂囦欢涓婁紶Ftp瀹屾垚......" } def batchCreateFile(ret, fileName, headers, charset){ @@ -123,10 +123,10 @@ class HouseExportBatch extends BaseBatch{ println index if(index%10000==0){ - println index+"开始写入CSV "+new Date().toLocaleString() + println index+"寮�濮嬪啓鍏SV "+new Date().toLocaleString() out.write(sb.toString().getBytes(charset)); sb.setLength(0) - println index+"结束写入CSV "+new Date().toLocaleString() + println index+"缁撴潫鍐欏叆CSV "+new Date().toLocaleString() } } @@ -198,7 +198,7 @@ class HouseExportBatch extends BaseBatch{ row.each{str-> def s = str.toString(); if(s && s!="null"){ - if(s.toString().contains(",")||s.toString().contains(",")){ + if(s.toString().contains(",")||s.toString().contains("锛�")){ s = csvHandlerStr(s.toString()) if(s.endsWith(",\"")){ s = s.replace(",\"","\"") @@ -213,10 +213,10 @@ class HouseExportBatch extends BaseBatch{ } sb.append(System.getProperty("line.separator")); if(index%10000==0){ - println index+"开始写入CSV "+new Date().toLocaleString() + println index+"寮�濮嬪啓鍏SV "+new Date().toLocaleString() bufferedWriter.write(sb.toString()); sb.setLength(0) - println index+"结束写入CSV "+new Date().toLocaleString() + println index+"缁撴潫鍐欏叆CSV "+new Date().toLocaleString() } // } @@ -232,7 +232,7 @@ class HouseExportBatch extends BaseBatch{ def createDatas(def city){ def districts = CommonDatautils.findAllDistricts(city, "district", ["city","region","name","alias"]); - println "小区共:"+districts.size() + println "灏忓尯鍏憋細"+districts.size() def rows = [] def retMap = new ConcurrentHashMap() def index = 0; @@ -517,7 +517,7 @@ class HouseExportBatch extends BaseBatch{ } } - println "过滤后:"+index + println "杩囨护鍚庯細"+index return allRetMap; } @@ -555,7 +555,7 @@ class HouseExportBatch extends BaseBatch{ row << seawater.url row << seawater.p_date rets << row - return false;//不进行更新 + return false;//涓嶈繘琛屾洿鏂� }); return rets; } @@ -600,16 +600,16 @@ class HouseExportBatch extends BaseBatch{ } private String csvHandlerStr(String str) { - //csv格式如果有逗号,整体用双引号括起来;如果里面还有双引号就替换成两个双引号,这样导出来的格式就不会有问题了 + //csv鏍煎紡濡傛灉鏈夐�楀彿锛屾暣浣撶敤鍙屽紩鍙锋嫭璧锋潵锛涘鏋滈噷闈㈣繕鏈夊弻寮曞彿灏辨浛鎹㈡垚涓や釜鍙屽紩鍙凤紝杩欐牱瀵煎嚭鏉ョ殑鏍煎紡灏变笉浼氭湁闂浜� String tempDescription=str; - //如果有逗号 - if(str.contains(",")||str.contains(",")){ - //如果还有双引号,先将双引号转义,避免两边加了双引号后转义错误 + //濡傛灉鏈夐�楀彿 + if(str.contains(",")||str.contains("锛�")){ + //濡傛灉杩樻湁鍙屽紩鍙凤紝鍏堝皢鍙屽紩鍙疯浆涔夛紝閬垮厤涓よ竟鍔犱簡鍙屽紩鍙峰悗杞箟閿欒 if(str.contains("\"")){ // tempDescription=str.replace("\"", "\"\""); tempDescription=str.replace("\"", ""); } - //在将逗号转义 + //鍦ㄥ皢閫楀彿杞箟 tempDescription="\""+tempDescription+"\""; } return tempDescription; @@ -621,7 +621,7 @@ class HouseExportBatch extends BaseBatch{ return null } fitmentDesc = fitmentDesc.replaceAll("[\\s ]+", "") - if (fitmentDesc.equals("非毛坯")) { + if (fitmentDesc.equals("闈炴瘺鍧�")) { return null } Iterator>> it = FITMENTS_TYPES_MAPS @@ -646,7 +646,7 @@ class HouseExportBatch extends BaseBatch{ if (directionDesc == null) { return null } - directionDesc = directionDesc.replaceAll("(\\(|(|《|\"|“|【|〔).+?(\\)|》|)|\"|”|】|〕)", "#_#") + directionDesc = directionDesc.replaceAll("(\\(|锛坾銆妡\"|鈥渱銆恷銆�).+?(\\)|銆媩锛墊\"|鈥潀銆憒銆�)", "#_#") StringBuffer sb = new StringBuffer() for (int i = 0; i < directionDesc.length(); i++) { String c = directionDesc.substring(i, i + 1) @@ -676,27 +676,27 @@ class HouseExportBatch extends BaseBatch{ if(floorDesc){ floorDesc = floorDesc.replaceAll("[\\s ]+", "") if(floorDesc){ - Pattern pat1 = Pattern.compile("第(\\d{1,2})层"); + 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)?"); + 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.contains("楂樻ゼ灞�") || floorDesc.contains("楂樺眰")){ + return "楂樺眰" } - if(floorDesc.contains("低楼层") || floorDesc.contains("低层")){ - return "低层" + if(floorDesc.contains("浣庢ゼ灞�") || floorDesc.contains("浣庡眰")){ + return "浣庡眰" } if(floorDesc.isNumber()){ return floorDesc; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/Sha1Util.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/Sha1Util.groovy index 5dbdbf960..ec44eb67a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/Sha1Util.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/Sha1Util.groovy @@ -8,8 +8,8 @@ import java.security.NoSuchAlgorithmException; class Sha1Util { /** - * SHA1签名 - * @param paramStr 要加签的字符串 + * SHA1绛惧悕 + * @param paramStr 瑕佸姞绛剧殑瀛楃涓� * @return */ public static String SHA1(String paramStr) { @@ -45,7 +45,7 @@ class Sha1Util { // System.out.println(sha256HexStr); // System.out.println(sha512HexStr); -// def bt = FileUtils.readFileToByteArray(new File("D:\\数据\\test\\FJW_HOUSE_201911.csv")) +// def bt = FileUtils.readFileToByteArray(new File("D:\\鏁版嵁\\test\\FJW_HOUSE_201911.csv")) String sb = FileUtils.readFileToString(new File("C:\\Users\\gaojuan\\Desktop\\FJW_DISTRICT_STAT_201911.csv"), "gbk") @@ -53,7 +53,7 @@ class Sha1Util { // for(def s : list){ // sb.append(s) // } - String sha512HexStr1= DigestUtils.sha512Hex(sb.toString().getBytes("utf-8"))//生成加密码码 + String sha512HexStr1= DigestUtils.sha512Hex(sb.toString().getBytes("utf-8"))//鐢熸垚鍔犲瘑鐮佺爜 println sha512HexStr1; def data = new FileInputStream(new File("C:\\Users\\gaojuan\\Desktop\\FJW_DISTRICT_STAT_201911.csv")) 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 673aa591a..d6b6a1872 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 @@ -24,9 +24,9 @@ import com.fangjia.core.util.HttpRequest //Message message = new Message(); //message.setMsgtype("text"); -//message.setText(new MessageInfo("测试")); +//message.setText(new MessageInfo("娴嬭瘯")); //URL url = new URL("https://oapi.dingtalk.com/robot/send?access_token=35587c9e7accc54ff7ddf2c6ebdc36a3ba065b4a2bdac78c0e9928596361b430"); -//// 建立http连接 +//// 寤虹珛http杩炴帴 //HttpURLConnection conn = (HttpURLConnection) url.openConnection(); //conn.setDoOutput(true); //conn.setDoInput(true); @@ -53,7 +53,7 @@ import com.fangjia.core.util.HttpRequest //request.post("https://oapi.dingtalk.com/robot/send?access_token=35587c9e7accc54ff7ddf2c6ebdc36a3ba065b4a2bdac78c0e9928596361b430","", "utf-8") -//sendMarkdownMessage("租金", "测试") +//sendMarkdownMessage("绉熼噾", "娴嬭瘯") //static void sendMarkdownMessage(String title, String msg){ // HttpRequest request = new HttpRequest() // JSONObject requestBody = new JSONObject() @@ -64,8 +64,8 @@ import com.fangjia.core.util.HttpRequest // 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("余姚") +//ExcelUtils.modify("C:\\Users\\gaojuan\\Downloads\\绗笁鏂瑰皬鍖哄尯鍩�.xlsx", { d -> +// def city = RegionData.formatCity("浣欏") // d['D'] = city // if(city){ // d['E'] = RegionData.formatRegion(city, d['C']) @@ -79,13 +79,13 @@ import com.fangjia.core.util.HttpRequest //// } //}) -//def datas = ExcelUtils.read("D:\\数据\\福州\\202305月福州统计数据\\福州马尾第三方.xlsx", 0, 1) +//def datas = ExcelUtils.read("D:\\鏁版嵁\\绂忓窞\\202305鏈堢宸炵粺璁℃暟鎹甛\绂忓窞椹熬绗笁鏂�.xlsx", 0, 1) //def m = [:] //for(def d : datas){ // m.put(d['B'], d) //} -//ExcelUtils.modify("D:\\数据\\福州\\202305月福州统计数据\\福州马尾.xlsx",{d-> +//ExcelUtils.modify("D:\\鏁版嵁\\绂忓窞\\202305鏈堢宸炵粺璁℃暟鎹甛\绂忓窞椹熬.xlsx",{d-> // def dist = CommonDatautils.findDistrict(d['A'], d['B'], d['C'], "district") // if(dist){ // def ret = m.get(dist._id.toString()) @@ -129,7 +129,7 @@ import com.fangjia.core.util.HttpRequest //} //DBCollection DISTRICT_SELL_STAT = MongoUtils.getCollectionByName("fangjia_stat", "district_sell_stat", "mongo.db.fangjia.com") -//def datas = FileUtils.readLines("D:\\数据\\其它\\FJW_COMM_20221015.csv") +//def datas = FileUtils.readLines("D:\\鏁版嵁\\鍏跺畠\\FJW_COMM_20221015.csv") //def rets = [] //for(def d : datas){ // def arrs = d.split("@") @@ -143,7 +143,7 @@ import com.fangjia.core.util.HttpRequest // udata.put("avg", r.avg_price.toInteger()) // DISTRICT_SELL_STAT.update(new BasicDBObject("commid", r.commId) , new BasicDBObject('$set', data),false,false) // }else{ -// println r.commId +" 不存在" +// println r.commId +" 涓嶅瓨鍦�" // } //} @@ -151,7 +151,7 @@ import com.fangjia.core.util.HttpRequest //List list = FileUtils.readLines(new File("C:\\Users\\gaojuan\\Desktop\\FJW_HOUSE_201911.csv")) -//println "过滤前:"+list.size()+ " "+new Date().toLocaleString() +//println "杩囨护鍓嶏細"+list.size()+ " "+new Date().toLocaleString() //def ret = [] //def map = [:] //for(def s : list){ @@ -160,10 +160,10 @@ import com.fangjia.core.util.HttpRequest // map.put(row[0], s) // ret << s // }else{ -// println row[0]+" 存在" +// println row[0]+" 瀛樺湪" // } //} -//println "过滤后:"+list.size()+ " "+new Date().toLocaleString() +//println "杩囨护鍚庯細"+list.size()+ " "+new Date().toLocaleString() // //def getHouse(def id){ // def must = [] @@ -184,13 +184,13 @@ import com.fangjia.core.util.HttpRequest // def source = hits[0].get("_source") // location = source.location // }else{ -// println "查找经纬度有问题......"+hits.size() +// println "鏌ユ壘缁忕含搴︽湁闂......"+hits.size() // } // } // return location; //} -//List list1= FileUtils.readLines(new File("D:\\数据\\福州\\FJW_DISTRICT_STAT_202112.csv")) +//List list1= FileUtils.readLines(new File("D:\\鏁版嵁\\绂忓窞\\FJW_DISTRICT_STAT_202112.csv")) //def map1 = [:] //for(def s : list1){ // def row = s.split("@\\|@") @@ -198,7 +198,7 @@ import com.fangjia.core.util.HttpRequest // map1.put(key, row[5]) //} // -//List list2 = FileUtils.readLines(new File("D:\\数据\\福州\\FJW_DISTRICT_STAT_202111.csv")) +//List list2 = FileUtils.readLines(new File("D:\\鏁版嵁\\绂忓窞\\FJW_DISTRICT_STAT_202111.csv")) //def map2 = [:] //for(def s : list2) { // def row = s.split("@\\|@") @@ -212,32 +212,32 @@ import com.fangjia.core.util.HttpRequest // def lastPrice = map2.get(k) // rows << [keys[0], keys[1], keys[2], v.toString(), lastPrice.toString()] //} -//ExcelUtils.write("D:\\数据\\福州\\价格比对12-2.xlsx", rows, "数据") -//ExcelUtils.multiThreadingModify("D:\\数据\\福州\\福州涨幅在10%以上小区.xlsx",{d-> +//ExcelUtils.write("D:\\鏁版嵁\\绂忓窞\\浠锋牸姣斿12-2.xlsx", rows, "鏁版嵁") +//ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\绂忓窞\\绂忓窞娑ㄥ箙鍦�10%浠ヤ笂灏忓尯.xlsx",{d-> // def obj = CommonDatautils.queryDistrictPrice(d['A'],d['B'], d['C'], DateUtils.parseFromTightByPattern("2021-10-10","yyyy-MM-dd")) // if(obj){ // if(obj.value_type == 1){ -// d["G"] = "指导价" +// d["G"] = "鎸囧浠�" // }else if(obj.value_type == 2){ -// d["G"] ="自身样本" +// d["G"] ="鑷韩鏍锋湰" // }else if(obj.value_type == 3){ -// d["G"] = "第三方" +// d["G"] = "绗笁鏂�" // }else if(obj.value_type == 4){ -// d["G"] = "交易数据" +// d["G"] = "浜ゆ槗鏁版嵁" // }else if(obj.value_type == 5){ -// d["G"] ="周边楼盘" +// d["G"] ="鍛ㄨ竟妤肩洏" // }else if(obj.value_type == 6){ -// d["G"] ="推导" +// d["G"] ="鎺ㄥ" // }else if(obj.value_type == 9){ -// d["G"] = "神经网络" +// d["G"] = "绁炵粡缃戠粶" // }else if(obj.value_type == 10){ -// d["G"] = "无方式" +// d["G"] = "鏃犳柟寮�" // } // } //},0) -//def files = CommonDatautils.getAllFiles("D:\\数据\\福州\\原始数据") +//def files = CommonDatautils.getAllFiles("D:\\鏁版嵁\\绂忓窞\\鍘熷鏁版嵁") //if(files){ // for(def filepath : files){ // def filename = filepath.getPath() @@ -257,7 +257,7 @@ import com.fangjia.core.util.HttpRequest // return rets; //} -ExcelUtils.multiThreadingModify("D:\\数据\\福州\\福州价格比对.xlsx",{d-> +ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\绂忓窞\\绂忓窞浠锋牸姣斿.xlsx",{d-> def obj = dist_stat_coll.findOne(new BasicDBObject("city", d['B']).append("region",d['C']).append("district_name",d['D']).append("weekend",DateUtils.parseFromTightYYYYMMDD("2025-06-29"))) if(obj){ d['H'] = obj.avg_price_2b 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 2fd2a95f2..7329d851f 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 @@ -11,10 +11,10 @@ import com.fangjia.script.util.MongoUtils import com.fangjia.script.yinjihaun.util.DingDingMessageUtil import com.mongodb.BasicDBObject 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_202601.csv") +//绂忓窞绗笁鏂瑰潎浠风粺璁�,鍙戦�侀拤閽夋秷鎭� +//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_202601.csv") def count0 = 0 def count1 = 0 def count2 = 0 @@ -26,11 +26,11 @@ def count7 = 0 def count8 = 0 def count9 = 0 def total = datas.size() -def regions = ["鼓楼","仓山","台江","晋安","马尾","长乐"] +def regions = ["榧撴ゼ","浠撳北","鍙版睙","鏅嬪畨","椹熬","闀夸箰"] def regionCount = 0 def rets = [] -rets << ["网站有对比价数量","有对比价楼盘量","有对比价占比"] +rets << ["缃戠珯鏈夊姣斾环鏁伴噺","鏈夊姣斾环妤肩洏閲�","鏈夊姣斾环鍗犳瘮"] for(def d : datas){ def list = [] if(regions.contains(d[3])){ @@ -96,7 +96,7 @@ for(def d : datas){ } } -println("总量:"+ total) +println("鎬婚噺:"+ total) def pre1 = DataHandleUtils.getDoubleRound(2, count1*100.0/total) println("count1:"+ pre1) def pre2 = DataHandleUtils.getDoubleRound(2, count2*100.0/total) @@ -122,31 +122,31 @@ println("count8:"+ pre8) def pre9 = DataHandleUtils.getDoubleRound(2, count9*100.0/total) println("count9:"+ pre9) -rets << ["1家",count1, pre1+"%"] -rets << ["2家",count2, pre2+"%"] -rets << ["3家",count3, pre3+"%"] -rets << ["4家",count4, pre4+"%"] -rets << ["5家",count5, pre5+"%"] -rets << ["6家",count6, pre6+"%"] -rets << ["7家",count7, pre7+"%"] -rets << ["8家",count8, pre8+"%"] -rets << ["9家",count9, pre9+"%"] +rets << ["1瀹�",count1, pre1+"%"] +rets << ["2瀹�",count2, pre2+"%"] +rets << ["3瀹�",count3, pre3+"%"] +rets << ["4瀹�",count4, pre4+"%"] +rets << ["5瀹�",count5, pre5+"%"] +rets << ["6瀹�",count6, pre6+"%"] +rets << ["7瀹�",count7, pre7+"%"] +rets << ["8瀹�",count8, pre8+"%"] +rets << ["9瀹�",count9, pre9+"%"] def curMonth = DateUtils.formatDateByPattern(new Date(), "yyyyMM") -ExcelUtils.write("d:\\数据\\福州\\多方均价对比统计数据"+curMonth+".xlsx",rets,"统计") -def s = "第三方均价总量:${total}\n6区总量:${regionCount}\ncount1: "+ count1+"( "+pre1+"% )\ncount2: "+ count2+"( "+pre2+"% )\ncount3: "+count3+"( "+pre3+"% )\ncount4: "+count4+"( "+pre4+"% )\ncount5: "+count5+"( "+pre5+"% )\ncount6: "+count6+"( "+pre6+"% )\ncount7: "+count7+"( "+pre7+"%)\ncount8: "+count8+"( "+pre8+"% )\ncount9: "+count9+" ("+pre9+"% )" +ExcelUtils.write("d:\\鏁版嵁\\绂忓窞\\澶氭柟鍧囦环瀵规瘮缁熻鏁版嵁"+curMonth+".xlsx",rets,"缁熻") +def s = "绗笁鏂瑰潎浠锋�婚噺锛�${total}\n6鍖烘�婚噺锛�${regionCount}\ncount1: "+ count1+"( "+pre1+"% )\ncount2: "+ count2+"( "+pre2+"% )\ncount3: "+count3+"( "+pre3+"% )\ncount4: "+count4+"( "+pre4+"% )\ncount5: "+count5+"( "+pre5+"% )\ncount6: "+count6+"( "+pre6+"% )\ncount7: "+count7+"( "+pre7+"%)\ncount8: "+count8+"( "+pre8+"% )\ncount9: "+count9+" ("+pre9+"% )" println s def access_token = "065f4a05d5f87eb39a9f9e048eeefb80c1f7560446f8926441de80453c160c60" DingDingMessageUtil.sendTextMessage(access_token, s) -////def districts = CommonDatautils.findAllDistricts("福州", "district", ["city", "region", "name"]); +////def districts = CommonDatautils.findAllDistricts("绂忓窞", "district", ["city", "region", "name"]); //def total = 8018 -//def names = ["诸葛找房":"zhugezhaofang_esf_price","安居客":"anjuke_esf_price","搜房":"soufang_esf_price","链家":"lianjia_esf_price","城市房产":"cityhouse_esf_price","房探":"fangtan_esf_price","房多多":"fangdoudou_esf_price","麦田":"maitian_esf_price", "58同城":"58tc_esf_price"] +//def names = ["璇歌憶鎵炬埧":"zhugezhaofang_esf_price","瀹夊眳瀹�":"anjuke_esf_price","鎼滄埧":"soufang_esf_price","閾惧":"lianjia_esf_price","鍩庡競鎴夸骇":"cityhouse_esf_price","鎴挎帰":"fangtan_esf_price","鎴垮澶�":"fangdoudou_esf_price","楹︾敯":"maitian_esf_price", "58鍚屽煄":"58tc_esf_price"] // //def rets = [] //def sDate = 202011 -//rets << ["时间","诸葛找房","安居客","搜房","链家","城市房产","房探","房多多","麦田", "58同城"] +//rets << ["鏃堕棿","璇歌憶鎵炬埧","瀹夊眳瀹�","鎼滄埧","閾惧","鍩庡競鎴夸骇","鎴挎帰","鎴垮澶�","楹︾敯", "58鍚屽煄"] //def ret = [] //ret << sDate //names.each{k,v-> @@ -156,12 +156,12 @@ DingDingMessageUtil.sendTextMessage(access_token, s) // ret << DataHandleUtils.getDoubleRound(2,count*100.0/total)+"("+crawlCount+")" //} //rets.add(ret) -//ExcelUtils.write("d:\\数据\\第三方均价覆盖率1.xlsx",rets,"数据") +//ExcelUtils.write("d:\\鏁版嵁\\绗笁鏂瑰潎浠疯鐩栫巼1.xlsx",rets,"鏁版嵁") // //def crawlCount(k, sDate){ // def thirdPartyColl = CrawalDBUtil.getThirdPartyCol(); // def q = new BasicDBObject() -// q.put("city","福州") +// q.put("city","绂忓窞") // q.put("s_date", sDate) // q.put("source",k) // return thirdPartyColl.count(q) @@ -171,7 +171,7 @@ DingDingMessageUtil.sendTextMessage(access_token, s) //def count(name, sDate){ // DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "mongo.db.fangjia.com") // def q = new BasicDBObject() -// q.put("city","福州") +// q.put("city","绂忓窞") // q.put("s_date", sDate) // q.put(name, new BasicDBObject('$gt', 0)); // return AVERAGE_STATISTICS.count(q) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/ThirdPriceExportBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/ThirdPriceExportBatch.groovy index fb6631ba3..9fedc0dde 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/ThirdPriceExportBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/ThirdPriceExportBatch.groovy @@ -14,7 +14,7 @@ import org.apache.commons.codec.digest.DigestUtils @BatchOwner(Watcher.GaoJuan) /** - * 福州农商行-第三方均价导出 + * 绂忓窞鍐滃晢琛�-绗笁鏂瑰潎浠峰鍑� */ class ThirdPriceExportBatch extends BaseBatch{ @@ -33,24 +33,24 @@ class ThirdPriceExportBatch extends BaseBatch{ } @Override void process(Object args) { - //表头 + //琛ㄥご def headers = ["id","comm_id","city","district","name","s_date","zhuge_avg_price","anjuke_avg_price","fang_avg_price","lianjia_avg_price","cityhouse_avg_price","fangtan_avg_price","fangdd_avg_price","maitian_avg_price","58_avg_price"] - //创建数据 - def ret = createDatas("福州") + //鍒涘缓鏁版嵁 + def ret = createDatas("绂忓窞") def fileName = "/fzbank/output/FJW_THIRD_PARTY_AVG_PRICE_"+curDate+".csv" def dataCodeFileName = "/fzbank/output/FJW_THIRD_PARTY_AVG_PRICE_"+curDate+".sha512" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\福州\\FJW_THIRD_PARTY_AVG_PRICE_"+curDate+".csv" - dataCodeFileName = "D:\\数据\\福州\\FJW_THIRD_PARTY_AVG_PRICE_"+curDate+".sha512" + fileName = "D:\\鏁版嵁\\绂忓窞\\FJW_THIRD_PARTY_AVG_PRICE_"+curDate+".csv" + dataCodeFileName = "D:\\鏁版嵁\\绂忓窞\\FJW_THIRD_PARTY_AVG_PRICE_"+curDate+".sha512" } - //生成数据文件并上传 + //鐢熸垚鏁版嵁鏂囦欢骞朵笂浼� def sb = appendResult(headers, ret) DataHandleUtils.outPutFile(fileName, sb,charset); FzFtpUtils.ftpUpload(fileName) - //生成加密数据文件并上传 + //鐢熸垚鍔犲瘑鏁版嵁鏂囦欢骞朵笂浼� FzFtpUtils.uploadSha512Data2(fileName, dataCodeFileName, charset); } @@ -58,7 +58,7 @@ class ThirdPriceExportBatch extends BaseBatch{ def districts = CommonDatautils.findAllDistricts(city, "district", ["city","region","name"]); def result = [] def index = 0 - def lastMonthPriceMap = findFzDistrictStat("福州", curDate) + def lastMonthPriceMap = findFzDistrictStat("绂忓窞", curDate) for(def dist : districts){ def key = dist.city +"##"+ dist.region+"##"+ dist.name @@ -241,11 +241,11 @@ class ThirdPriceExportBatch extends BaseBatch{ if(!retMap.cityhouse_esf_price && d.cityhouse_esf_price){ retMap.cityhouse_esf_price = d.cityhouse_esf_price } - if(!retMap.fangtan_esf_price && d.jiwu_esf_price){//使用吉屋替换房探 待抓取 + if(!retMap.fangtan_esf_price && d.jiwu_esf_price){//浣跨敤鍚夊眿鏇挎崲鎴挎帰 寰呮姄鍙� retMap.fangtan_esf_price = d.jiwu_esf_price } - if(!retMap.fangdoudou_esf_price && d.get("365house_esf_price")){//使用淘房365替换房多多 + if(!retMap.fangdoudou_esf_price && d.get("365house_esf_price")){//浣跨敤娣樻埧365鏇挎崲鎴垮澶� retMap.fangdoudou_esf_price = d.get("365house_esf_price") } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/ThirdTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/ThirdTest.groovy index 57b9f852c..eb1cc146a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/ThirdTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/ThirdTest.groovy @@ -29,24 +29,24 @@ class ThirdTest { } def run4(){ - ExcelUtils.multiThreadingModify("D:\\数据\\福州\\福州\\房价网数据-公司方提供.xlsx", { d -> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\绂忓窞\\绂忓窞\\鎴夸环缃戞暟鎹�-鍏徃鏂规彁渚�.xlsx", { d -> if (!d['C']) { -// def name = d['A'].replace("(钢混)","").replace("(非钢混)","").replace("(混合)","") -// def lists = CommonDatautils.findDistrictsByCityAndName("福州",name, "district") +// def name = d['A'].replace("(閽㈡贩)","").replace("锛堥潪閽㈡贩锛�","").replace("(娣峰悎)","") +// def lists = CommonDatautils.findDistrictsByCityAndName("绂忓窞",name, "district") // if(lists){ // for(def o : lists){ //// if(d['B'] && d['B'].toString().contains(o.address)){ // d['C'] = o.region // d['D'] = o.name -// d['E'] = "名称去括号中的字" +// d['E'] = "鍚嶇О鍘绘嫭鍙蜂腑鐨勫瓧" //// } // } // } - def rMap = SeaweedDataMatchProcess.doMatch("福州", null, d['A'], d['B']); + def rMap = SeaweedDataMatchProcess.doMatch("绂忓窞", null, d['A'], d['B']); if(rMap){ d['C'] = rMap.region d['D'] = rMap.name - d['E'] = "匹配接口" + d['E'] = "鍖归厤鎺ュ彛" } } @@ -55,13 +55,13 @@ class ThirdTest { def run3() { -// ExcelUtils.multiThreadingModify("D:\\数据\\福州\\福州\\房价网数据-公司方提供.xlsx", { d -> +// ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\绂忓窞\\绂忓窞\\鎴夸环缃戞暟鎹�-鍏徃鏂规彁渚�.xlsx", { d -> // if(!d['F']){ -// def price = CommonDatautils.queryDistrictPrice("福州",d['C'], d['D']) +// def price = CommonDatautils.queryDistrictPrice("绂忓窞",d['C'], d['D']) // d['F'] = price // } // },0) -// List list1= FileUtils.readLines(new File("D:\\数据\\福州\\FJW_DISTRICT_STAT_202202.csv")) +// List list1= FileUtils.readLines(new File("D:\\鏁版嵁\\绂忓窞\\FJW_DISTRICT_STAT_202202.csv")) // def map1 = [:] // for(def s : list1){ // def row = s.split("@\\|@") @@ -69,7 +69,7 @@ class ThirdTest { // map1.put(key, row[5]) // } - List list1= FileUtils.readLines(new File("D:\\数据\\福州\\FJW_THIRD_PARTY_AVG_PRICE_202202.csv")) + List list1= FileUtils.readLines(new File("D:\\鏁版嵁\\绂忓窞\\FJW_THIRD_PARTY_AVG_PRICE_202202.csv")) def map1 = [:] for(def str : list1){ def s = str.split("@\\|@") @@ -118,9 +118,9 @@ class ThirdTest { } - ExcelUtils.multiThreadingModify("D:\\数据\\福州\\福州\\房价网数据-公司方提供.xlsx", { d -> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\绂忓窞\\绂忓窞\\鎴夸环缃戞暟鎹�-鍏徃鏂规彁渚�.xlsx", { d -> // if (!d['F']) { -// def lists = CommonDatautils.findDistrictsByCityAndName("福州", d['A'], "district") +// def lists = CommonDatautils.findDistrictsByCityAndName("绂忓窞", d['A'], "district") // if(lists){ // for(def o : lists){ // if(o.address==d['B']){ @@ -129,7 +129,7 @@ class ThirdTest { // } // } // } - def key = "福州##"+d['C']+"##"+d['D'] + def key = "绂忓窞##"+d['C']+"##"+d['D'] def priceMap = map1.get(key) if(priceMap){ if(priceMap.zhugezhaofang){ @@ -165,18 +165,18 @@ class ThirdTest { } def run1(){ - ExcelUtils.modify("D:\\数据\\福州\\福州\\房屋评估数据-数据方公司提供-结果.xlsx",{d-> + ExcelUtils.modify("D:\\鏁版嵁\\绂忓窞\\绂忓窞\\鎴垮眿璇勪及鏁版嵁-鏁版嵁鏂瑰叕鍙告彁渚�-缁撴灉.xlsx",{d-> if(d['B'] && !d['D']){ - if(d['B'].contains("号")){ -// def price = searchContent2("福州","https://fz.58.com", d['B'], 304) + if(d['B'].contains("鍙�")){ +// def price = searchContent2("绂忓窞","https://fz.58.com", d['B'], 304) // if(price){ // d['C'] = price -// d['F'] = "58同城" +// d['F'] = "58鍚屽煄" // } - def price = thirdPartyColl("福州", d['B']) + def price = thirdPartyColl("绂忓窞", d['B']) if(price){ d['D'] = price; - d['F'] = "麦田" + d['F'] = "楹︾敯" } } @@ -188,7 +188,7 @@ class ThirdTest { def q = new BasicDBObject() q.put("city", city) q.put("address", address) - q.put("source","麦田") + q.put("source","楹︾敯") q.put("s_date",202202) def obj = thirdPartyColl.findOne(q) if(obj){ @@ -198,13 +198,13 @@ class ThirdTest { } - //查看此关键字是否有数据 + //鏌ョ湅姝ゅ叧閿瓧鏄惁鏈夋暟鎹� def searchContent2(def city,def url,def keyword, def cityid){ def newUrl = url+"/esf-ajax/community/pc/autocomplete/?city_id=${cityid}&kw="+URLEncoder.encode(keyword, "utf-8")+"&type=2" - def document = CrawalUtil.getDocumentByABuYun(newUrl, "访问过于频繁", "utf-8", null, true); + def document = CrawalUtil.getDocumentByABuYun(newUrl, "璁块棶杩囦簬棰戠箒", "utf-8", null, true); def price = null if(document){ - println "【"+keyword +"】 查询" + println "銆�"+keyword +"銆� 鏌ヨ" def jsonObj = JSONObject.fromObject(document) if(jsonObj && jsonObj.status=="ok"){ if(jsonObj.data.size()>0){ @@ -213,19 +213,19 @@ class ThirdTest { price = d.price.toInteger() } }else{ - println "【"+keyword +"】 无结果" + println "銆�"+keyword +"銆� 鏃犵粨鏋�" } } return price; } def run(){ - def map = findThirdPrice("福州") - ExcelUtils.multiThreadingModify("D:\\数据\\福州\\福州\\房屋评估数据-数据方公司提供.xlsx",{d-> + def map = findThirdPrice("绂忓窞") + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\绂忓窞\\绂忓窞\\鎴垮眿璇勪及鏁版嵁-鏁版嵁鏂瑰叕鍙告彁渚�.xlsx",{d-> if(!d['F']){ - def lists = CommonDatautils.findDistrictsByCityAndName("福州",d['A'], "district") + def lists = CommonDatautils.findDistrictsByCityAndName("绂忓窞",d['A'], "district") if(!lists){ - lists = CommonDatautils.findDistrictByAlias("福州",null, d['A'], "district") + lists = CommonDatautils.findDistrictByAlias("绂忓窞",null, d['A'], "district") } for(def o : lists){ // if(o.address == d['B']){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/TradeExportBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/TradeExportBatch.groovy index 94efbb6df..48ab6fdb2 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/TradeExportBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/TradeExportBatch.groovy @@ -37,21 +37,21 @@ class TradeExportBatch extends BaseBatch{ def headers = ["id","comm_id","city","district","name","unit_price","area","trade_date","total_price"] - def ret = createDatas("福州") + def ret = createDatas("绂忓窞") def fileName = "/fzbank/output/FJW_DEAL_PRICE_"+curDate+".csv" def dataCodeFileName = "/fzbank/output/FJW_DEAL_PRICE_"+curDate+".sha512" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\福州\\FJW_DEAL_PRICE_"+curDate+".csv" - dataCodeFileName = "D:\\数据\\福州\\FJW_DEAL_PRICE_"+curDate+".sha512" + fileName = "D:\\鏁版嵁\\绂忓窞\\FJW_DEAL_PRICE_"+curDate+".csv" + dataCodeFileName = "D:\\鏁版嵁\\绂忓窞\\FJW_DEAL_PRICE_"+curDate+".sha512" } def sb = appendResult(headers, ret); DataHandleUtils.outPutFile(fileName, sb, charset); FzFtpUtils.ftpUpload(fileName) - //生成加密数据文件并上传 + //鐢熸垚鍔犲瘑鏁版嵁鏂囦欢骞朵笂浼� // FzFtpUtils.uploadSha512Data(sb, dataCodeFileName, charset); FzFtpUtils.uploadSha512Data2(fileName, dataCodeFileName, charset); } @@ -136,7 +136,7 @@ class TradeExportBatch extends BaseBatch{ } } } - println "成交总计:"+rets.size() + println "鎴愪氦鎬昏锛�"+rets.size() } return rets; } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/geluke/DetailDataToMcdonalds.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/geluke/DetailDataToMcdonalds.groovy index 2b0b5e4e2..b4a38d4ce 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/geluke/DetailDataToMcdonalds.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/geluke/DetailDataToMcdonalds.groovy @@ -42,8 +42,8 @@ class DetailDataToMcdonalds { public static final DSCollection SEAWEED_COLL = new DataStore("seaweed.db.fangjia.com", 27007).getCollection("fangjia.seaweed") public static final DBCollection SCHOOL_COLL = MongoUtils.getCollectionByName("fangjia", "school", "mongo.db.fangjia.com") public static void mainfsdfsdf(String[] args) { - String dirPath = "D:\\麦当劳数据\\测试数据\\50个测试点位" - String dirPath2 = "D:\\麦当劳数据\\测试数据\\50个测试点位经纬度" + String dirPath = "D:\\楹﹀綋鍔虫暟鎹甛\娴嬭瘯鏁版嵁\\50涓祴璇曠偣浣�" + String dirPath2 = "D:\\楹﹀綋鍔虫暟鎹甛\娴嬭瘯鏁版嵁\\50涓祴璇曠偣浣嶇粡绾害" Iterator iter = FileUtils.iterateFiles(new File(dirPath), null, true) int inx = 0 while(iter.hasNext()) { @@ -59,7 +59,7 @@ class DetailDataToMcdonalds { HSSFWorkbook targetBook = new HSSFWorkbook(); if(sheet1.getLastRowNum() > 0) { - HSSFSheet targetSheet1 = targetBook.createSheet('小区'); + HSSFSheet targetSheet1 = targetBook.createSheet('灏忓尯'); int i = 0 for(int j=1;j<=sheet1.getLastRowNum();j++) { String districtName = sheet1.getRow(j).getCell(0) @@ -94,7 +94,7 @@ class DetailDataToMcdonalds { if(workBook.getSheets().length > 2) { Sheet sheet2 = workBook.getSheetAt(2) if(sheet2.getLastRowNum() > 0) { - HSSFSheet targetSheet2 = targetBook.createSheet('写字楼'); + HSSFSheet targetSheet2 = targetBook.createSheet('鍐欏瓧妤�'); int i = 0 for(int j=1;j<=sheet2.getLastRowNum();j++) { if(!sheet2.getRow(j)) { @@ -130,7 +130,7 @@ class DetailDataToMcdonalds { if(workBook.getSheets().length > 3) { Sheet sheet3 = workBook.getSheetAt(3) if(sheet3.getLastRowNum() > 0) { - HSSFSheet targetSheet3 = targetBook.createSheet('学校'); + HSSFSheet targetSheet3 = targetBook.createSheet('瀛︽牎'); int i = 0 for(int j=1;j<=sheet3.getLastRowNum();j++) { String name = sheet3.getRow(j).getCell(0) @@ -161,7 +161,7 @@ class DetailDataToMcdonalds { targetFile.mkdir() } - FileOutputStream fos = new FileOutputStream(new File(dirPath2 + "\\" + city + "\\经纬度-"+ fileName)); + FileOutputStream fos = new FileOutputStream(new File(dirPath2 + "\\" + city + "\\缁忕含搴�-"+ fileName)); targetBook.write(fos); fos.flush(); fos.close(); @@ -172,12 +172,12 @@ class DetailDataToMcdonalds { public static void main(String[] args) { DetailDataToMcdonalds sd = new DetailDataToMcdonalds() -// DBObject obj = SEAWEED_COLL.findOne(new BasicDBObject('city', '上海').append('cat', 'district').append('visible', 0).append('name', '新泾三村')) +// DBObject obj = SEAWEED_COLL.findOne(new BasicDBObject('city', '涓婃捣').append('cat', 'district').append('visible', 0).append('name', '鏂版尘涓夋潙')) // sd.exportAroundDistrict(city, obj.get('lat') / 10000000000.0, obj.get('lng') / 10000000000.0) // def points = [['address':obj.get('address'), 'lat':obj.get('lat') / 10000000000.0, 'lng':obj.get('lng') / 10000000000.0]] def points = [] - def lines = FileUtils.readLines(new File("D:\\麦当劳数据\\测试数据\\13-points.txt"), "UTF-8") + def lines = FileUtils.readLines(new File("D:\\楹﹀綋鍔虫暟鎹甛\娴嬭瘯鏁版嵁\\13-points.txt"), "UTF-8") int seq = 0 def service = new MapabcService(); for(line in lines) { @@ -197,19 +197,19 @@ class DetailDataToMcdonalds { } public void createDataExcelFile(String city, String fileName, Map point) { - File dir = new File("D:/麦当劳数据/测试数据/${city}/") + File dir = new File("D:/楹﹀綋鍔虫暟鎹�/娴嬭瘯鏁版嵁/${city}/") if(!dir.exists()) { dir.mkdir(); } - File file = new File("D:/麦当劳数据/测试数据/${city}/${fileName}.xls") + File file = new File("D:/楹﹀綋鍔虫暟鎹�/娴嬭瘯鏁版嵁/${city}/${fileName}.xls") if(file.exists()) { file.delete(); } HSSFWorkbook workBook = new HSSFWorkbook(); - HSSFSheet mainSheet = workBook.createSheet('信息'); + HSSFSheet mainSheet = workBook.createSheet('淇℃伅'); HSSFRow row0 = mainSheet.createRow(0) HSSFCell cell0 = row0.createCell(0); cell0.setCellValue(point.get('address')); @@ -218,10 +218,10 @@ class DetailDataToMcdonalds { cell0 = row0.createCell(2); cell0.setCellValue(String.valueOf(point.get('lng'))); - buildDistrictSheet(city, workBook.createSheet('小区'), point.get('lat'), point.get('lng')) - buildOfficeSheet(city, workBook.createSheet('写字楼'), point.get('lat'), point.get('lng')) - if(city=='上海'){ - buildSchoolSheet(city, workBook.createSheet('学校'), point.get('lat'), point.get('lng')); + buildDistrictSheet(city, workBook.createSheet('灏忓尯'), point.get('lat'), point.get('lng')) + buildOfficeSheet(city, workBook.createSheet('鍐欏瓧妤�'), point.get('lat'), point.get('lng')) + if(city=='涓婃捣'){ + buildSchoolSheet(city, workBook.createSheet('瀛︽牎'), point.get('lat'), point.get('lng')); } @@ -233,7 +233,7 @@ class DetailDataToMcdonalds { } public void createDataXmlFile(String city, String fileName, Map point) { - File file = new File("D:/麦当劳数据/测试数据/${city}/${fileName}.xml") + File file = new File("D:/楹﹀綋鍔虫暟鎹�/娴嬭瘯鏁版嵁/${city}/${fileName}.xml") if(file.exists()) { file.delete(); } @@ -288,19 +288,19 @@ class DetailDataToMcdonalds { cell = row.createCell(2); cell.setCellValue(district.get('address')) - //竣工时间 + //绔e伐鏃堕棿 cell = row.createCell(3); cell.setCellValue(district.get('finish_building_date')) - //户数 + //鎴锋暟 cell = row.createCell(4); cell.setCellValue(String.valueOf(lastCount)) - //均价 + //鍧囦环 cell = row.createCell(5); cell.setCellValue(district.get('avg_price')) - //入住率 + //鍏ヤ綇鐜� cell = row.createCell(6); cell.setCellValue(String.valueOf(livePercent)) @@ -343,11 +343,11 @@ class DetailDataToMcdonalds { cell = row.createCell(4); cell.setCellValue(String.valueOf(peopleCount)) - //竣工时间 + //绔e伐鏃堕棿 cell = row.createCell(5); cell.setCellValue(office.get('finish_building_date')) - //入住率 + //鍏ヤ綇鐜� cell = row.createCell(6); cell.setCellValue(String.valueOf(livePercent)) @@ -403,39 +403,39 @@ class DetailDataToMcdonalds { Element districtEle = new Element('district'); Element ele1 = new Element('column'); - ele1.setAttribute('name', '名称') + ele1.setAttribute('name', '鍚嶇О') ele1.setText(district.get('name')) Element ele2 = new Element('column'); - ele2.setAttribute('name', '区域') + ele2.setAttribute('name', '鍖哄煙') ele2.setText(district.get('region')) Element ele3 = new Element('column'); - ele3.setAttribute('name', '地址') + ele3.setAttribute('name', '鍦板潃') ele3.setText(district.get('address')) Element ele4 = new Element('column'); - ele4.setAttribute('name', '竣工时间') + ele4.setAttribute('name', '绔e伐鏃堕棿') ele4.setText(district.get('finish_building_date')) Element ele5 = new Element('column'); - ele5.setAttribute('name', '户数') + ele5.setAttribute('name', '鎴锋暟') ele5.setText(String.valueOf(lastCount)) Element ele6 = new Element('column'); - ele6.setAttribute('name', '房价') + ele6.setAttribute('name', '鎴夸环') ele6.setText(String.valueOf(district.get('avg_price'))) Element ele7 = new Element('column'); - ele7.setAttribute('name', '入住率') + ele7.setAttribute('name', '鍏ヤ綇鐜�') ele7.setText(livePercent) Element ele8 = new Element('column'); - ele8.setAttribute('name', '纬度') + ele8.setAttribute('name', '绾害') ele8.setText(String.valueOf(district.get('lat'))) Element ele9 = new Element('column'); - ele9.setAttribute('name', '经度') + ele9.setAttribute('name', '缁忓害') ele9.setText(String.valueOf(district.get('lng'))) districtEle.addContent(ele1) @@ -509,14 +509,14 @@ class DetailDataToMcdonalds { data.remove("finish_building_date") }else { String fbd = data.get('finish_building_date'); - if(fbd.indexOf('年') > -1) { - fbd = fbd.replace("年", "-") + if(fbd.indexOf('骞�') > -1) { + fbd = fbd.replace("骞�", "-") } - if(fbd.indexOf('月') > -1) { - fbd = fbd.replace("月", "-") + if(fbd.indexOf('鏈�') > -1) { + fbd = fbd.replace("鏈�", "-") } - if(fbd.indexOf('日') > -1) { - fbd = fbd.replace("日", "") + if(fbd.indexOf('鏃�') > -1) { + fbd = fbd.replace("鏃�", "") } fbd = fbd.replaceAll('[^\\-\\d]', '') @@ -552,23 +552,23 @@ class DetailDataToMcdonalds { Element officeEle = new Element('office'); Element ele1 = new Element('column'); - ele1.setAttribute('name', '名称') + ele1.setAttribute('name', '鍚嶇О') ele1.setText(district.get('name')) Element ele2 = new Element('column'); - ele2.setAttribute('name', '地址') + ele2.setAttribute('name', '鍦板潃') ele2.setText(district.get('address')) Element ele3 = new Element('column'); - ele3.setAttribute('name', '纬度') + ele3.setAttribute('name', '绾害') ele3.setText(String.valueOf(district.get('lat'))) Element ele4 = new Element('column'); - ele4.setAttribute('name', '经度') + ele4.setAttribute('name', '缁忓害') ele4.setText(String.valueOf(district.get('lng'))) Element ele5 = new Element('column'); - ele5.setAttribute('name', '办公人口') + ele5.setAttribute('name', '鍔炲叕浜哄彛') ele5.setText(String.valueOf(peopleCount)) officeEle.addContent(ele1) @@ -636,14 +636,14 @@ class DetailDataToMcdonalds { data.remove("finish_building_date") }else { String fbd = data.get('finish_building_date'); - if(fbd.indexOf('年') > -1) { - fbd = fbd.replace("年", "-") + if(fbd.indexOf('骞�') > -1) { + fbd = fbd.replace("骞�", "-") } - if(fbd.indexOf('月') > -1) { - fbd = fbd.replace("月", "-") + if(fbd.indexOf('鏈�') > -1) { + fbd = fbd.replace("鏈�", "-") } - if(fbd.indexOf('日') > -1) { - fbd = fbd.replace("日", "") + if(fbd.indexOf('鏃�') > -1) { + fbd = fbd.replace("鏃�", "") } fbd = fbd.replaceAll('[^\\-\\d]', '') @@ -731,33 +731,33 @@ class DetailDataToMcdonalds { public String getDistrictType(String kind, String estateType) { if (StringUtils.isNotBlank(kind)) { - if(kind.indexOf('小区') > -1 || kind.indexOf('公寓') > -1) { - return '小区' + if(kind.indexOf('灏忓尯') > -1 || kind.indexOf('鍏瘬') > -1) { + return '灏忓尯' } } Set ret = new HashSet(); if (StringUtils.isNotBlank(estateType)) { - if (StringUtils.indexOfAny(estateType, (String[])(["别墅", "独栋", "联排", "双拼", "叠加"].toArray())) > -1) { - ret.add("别墅"); + if (StringUtils.indexOfAny(estateType, (String[])(["鍒", "鐙爧", "鑱旀帓", "鍙屾嫾", "鍙犲姞"].toArray())) > -1) { + ret.add("鍒"); } - if (StringUtils.indexOfAny(estateType, (String[])(["住宅", "公寓", "小区", "商住"].toArray())) > -1) { - ret.add("小区"); + if (StringUtils.indexOfAny(estateType, (String[])(["浣忓畢", "鍏瘬", "灏忓尯", "鍟嗕綇"].toArray())) > -1) { + ret.add("灏忓尯"); } } if (ret.size() == 0) { - return "小区"; + return "灏忓尯"; } String s = StringUtils.join(ret, ","); - if (s != null && s.indexOf("别墅") > -1) { - return "别墅"; + if (s != null && s.indexOf("鍒") > -1) { + return "鍒"; } - return "小区"; + return "灏忓尯"; } @@ -896,7 +896,7 @@ class DetailDataToMcdonalds { conn.setRequestMethod("GET"); conn.doOutput = true inputStream = conn.getInputStream(); - BufferedReader buf = new BufferedReader(new InputStreamReader(inputStream,"UTF-8"));// 创建UTF-8的BufferedReader + BufferedReader buf = new BufferedReader(new InputStreamReader(inputStream,"UTF-8"));// 鍒涘缓UTF-8鐨凚ufferedReader while((line = buf.readLine())!=null){ sb.append(line); } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/geluke/GlkCityPriceLevel.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/geluke/GlkCityPriceLevel.groovy index 76f697d68..ca0bde475 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/geluke/GlkCityPriceLevel.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/geluke/GlkCityPriceLevel.groovy @@ -42,46 +42,46 @@ class GlkCityPriceLevel { def createData(){ def map = [:]; - map.put("上海",27000); - map.put("杭州",20000); - map.put("南京",16000); - map.put("苏州",12000); - map.put("无锡",7600); - map.put("济南",9000); - map.put("青岛",14000); - map.put("北京",40000); - map.put("天津",14000); - map.put("石家庄",8000); - map.put("大连",12000); - map.put("广州",19000); - map.put("深圳",23000); - map.put("武汉",8600); - map.put("郑州",7800); - map.put("南昌",8900); - map.put("东莞",7500); - map.put("成都",9000); - map.put("西安",7000); - map.put("昆明",9000); - map.put("昆山",7700); + map.put("涓婃捣",27000); + map.put("鏉窞",20000); + map.put("鍗椾含",16000); + map.put("鑻忓窞",12000); + map.put("鏃犻敗",7600); + map.put("娴庡崡",9000); + map.put("闈掑矝",14000); + map.put("鍖椾含",40000); + map.put("澶╂触",14000); + map.put("鐭冲搴�",8000); + map.put("澶ц繛",12000); + map.put("骞垮窞",19000); + map.put("娣卞湷",23000); + map.put("姝︽眽",8600); + map.put("閮戝窞",7800); + map.put("鍗楁槍",8900); + map.put("涓滆帪",7500); + map.put("鎴愰兘",9000); + map.put("瑗垮畨",7000); + map.put("鏄嗘槑",9000); + map.put("鏄嗗北",7700); - map.put("福州",13000); - map.put("宁波",16000); - map.put("温州",25500); - map.put("绍兴",14000); - map.put("金华",10000); - map.put("嘉兴",8000); - map.put("常州",7500); - map.put("南通",10000); - map.put("常熟",13000); - map.put("烟台",8000); - map.put("厦门",23000); - map.put("合肥",7000); - map.put("太原",8000); - map.put("长沙",6800); - map.put("沈阳",8300); - map.put("哈尔滨",7700); - map.put("佛山",7500); - map.put("珠海",13000); + map.put("绂忓窞",13000); + map.put("瀹佹尝",16000); + map.put("娓╁窞",25500); + map.put("缁嶅叴",14000); + map.put("閲戝崕",10000); + map.put("鍢夊叴",8000); + map.put("甯稿窞",7500); + map.put("鍗楅��",10000); + map.put("甯哥啛",13000); + map.put("鐑熷彴",8000); + map.put("鍘﹂棬",23000); + map.put("鍚堣偉",7000); + map.put("澶師",8000); + map.put("闀挎矙",6800); + map.put("娌堥槼",8300); + map.put("鍝堝皵婊�",7700); + map.put("浣涘北",7500); + map.put("鐝犳捣",13000); return map; } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/geluke/MapabcService.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/geluke/MapabcService.groovy index 014d0a62a..bec59fe10 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/geluke/MapabcService.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/geluke/MapabcService.groovy @@ -16,7 +16,7 @@ import com.fangjia.script.util.MongoUtils * Created with IntelliJ IDEA. * User: Administrator * Date: 12-12-19 - * Time: 下午4:40 + * Time: 涓嬪崍4:40 * To change this template use File | Settings | File Templates. */ class MapabcService { @@ -32,8 +32,8 @@ class MapabcService { public static final DBCollection baisheng_data_COLL = MongoUtils.getCollectionByName("geluke", "baisheng_data", production) /** - * 解析地址 - * 例子:http://apis.mapabc.com/geocode/simple?resType=xml&encode=utf-8&range=300&roadnum=3&crossnum=2&poinum=2&retvalue=1&key=b0a7db0b3a30f944a21c3682064dc70ef5b738b062f6479a5eca39725798b1ee300bd8d5de3a4ae3&sid=7000&address=%E4%B8%8A%E6%B5%B7%E5%B8%82%E6%96%87%E6%98%8C%E8%A5%BF%E8%B7%AF%E4%B8%8E%E5%87%A4%E6%A8%AF%E8%B7%AF%E4%BA%A4%E5%8F%89%E5%8F%A3&rid=90156 + * 瑙f瀽鍦板潃 + * 渚嬪瓙锛歨ttp://apis.mapabc.com/geocode/simple?resType=xml&encode=utf-8&range=300&roadnum=3&crossnum=2&poinum=2&retvalue=1&key=b0a7db0b3a30f944a21c3682064dc70ef5b738b062f6479a5eca39725798b1ee300bd8d5de3a4ae3&sid=7000&address=%E4%B8%8A%E6%B5%B7%E5%B8%82%E6%96%87%E6%98%8C%E8%A5%BF%E8%B7%AF%E4%B8%8E%E5%87%A4%E6%A8%AF%E8%B7%AF%E4%BA%A4%E5%8F%89%E5%8F%A3&rid=90156 * @param key */ def parseAddress(String key, String city){ @@ -47,7 +47,7 @@ class MapabcService { for(poi in poiList){ def level = poi.level.text() if (isFirst){ - //如果是第一次,则以第一次作为优先选择 + //濡傛灉鏄涓�娆★紝鍒欎互绗竴娆′綔涓轰紭鍏堥�夋嫨 getDataFromPoi(ret, poi) isFirst = false } @@ -61,7 +61,7 @@ class MapabcService { } /** - * 从poi中获得需要的数据 + * 浠巔oi涓幏寰楅渶瑕佺殑鏁版嵁 * @param ret * @param poi */ @@ -75,14 +75,14 @@ class MapabcService { } /** - * 根据关键词进行查询 + * 鏍规嵁鍏抽敭璇嶈繘琛屾煡璇� * @param q - * @param pageNo 页码 从1开始 + * @param pageNo 椤电爜 浠�1寮�濮� * @return - * poiList poi列表 - * total:总记录数 - * record:当前记录的条数 - * totalPage:总页数 + * poiList poi鍒楄〃 + * total锛氭�昏褰曟暟 + * record锛氬綋鍓嶈褰曠殑鏉℃暟 + * totalPage锛氭�婚〉鏁� */ def findAllByQuery(String city, String q, pageNo){ def cityNo = findCityNoByQuery(city) @@ -110,13 +110,13 @@ class MapabcService { } /** - * 在中心点坐标附近查找周边信息 - * @param cenX 比如:116.40546799 - * @param cenY 比如:39.9077611 - * @param keyword 关键词,比如酒店 - * @param type 数据类型,比如:住宿 - * @param range 周边查询范围,单位为米,比如3000,表示3千米 - * @param pageNo 页码,从1开始 + * 鍦ㄤ腑蹇冪偣鍧愭爣闄勮繎鏌ユ壘鍛ㄨ竟淇℃伅 + * @param cenX 姣斿锛�116.40546799 + * @param cenY 姣斿锛�39.9077611 + * @param keyword 鍏抽敭璇嶏紝姣斿閰掑簵 + * @param type 鏁版嵁绫诲瀷锛屾瘮濡傦細浣忓 + * @param range 鍛ㄨ竟鏌ヨ鑼冨洿锛屽崟浣嶄负绫筹紝姣斿3000锛岃〃绀�3鍗冪背 + * @param pageNo 椤电爜锛屼粠1寮�濮� */ def findAllAroundAtCenter(cenX, cenY, keyword, type, range, pageNo){ keyword = URLEncoder.encode(keyword, "UTF-8") @@ -141,7 +141,7 @@ class MapabcService { } /** - * 根据查询词获得这个城市的区号 + * 鏍规嵁鏌ヨ璇嶈幏寰楄繖涓煄甯傜殑鍖哄彿 * @param q */ private findCityNoByQuery(String q){ @@ -156,395 +156,395 @@ class MapabcService { private buildCityNoMap(){ def cityNoMap = [:] - cityNoMap.put("北京", "010") - cityNoMap.put("广州", "020") - cityNoMap.put("重庆", "023") - cityNoMap.put("南京", "025") - cityNoMap.put("武汉", "027") - cityNoMap.put("成都", "028") - cityNoMap.put("保定", "0312") - cityNoMap.put("承德", "0314") - cityNoMap.put("唐山", "0315") - cityNoMap.put("廊坊", "0316") - cityNoMap.put("秦皇岛", "0335") - cityNoMap.put("新乡", "0373") - cityNoMap.put("洛阳", "0379") - cityNoMap.put("大连", "0411") - cityNoMap.put("鞍山", "0412") - cityNoMap.put("抚顺", "0413") - cityNoMap.put("本溪", "0414") - cityNoMap.put("丹东", "0415") - cityNoMap.put("辽阳", "0419") - cityNoMap.put("葫芦岛", "0429") - cityNoMap.put("长春", "0431") - cityNoMap.put("哈尔滨", "0451") - cityNoMap.put("佳木斯", "0454") - cityNoMap.put("包头", "0472") - cityNoMap.put("镇江", "0511") - cityNoMap.put("苏州", "0512") - cityNoMap.put("南通", "0513") - cityNoMap.put("扬州", "0514") - cityNoMap.put("徐州", "0516") - cityNoMap.put("常州", "0519") - cityNoMap.put("济南", "0531") - cityNoMap.put("青岛", "0532") - cityNoMap.put("蚌埠", "0552") - cityNoMap.put("黄山", "0559") - cityNoMap.put("杭州", "0571") - cityNoMap.put("湖州", "0572") - cityNoMap.put("台州", "0576") - cityNoMap.put("温州", "0577") - cityNoMap.put("福州", "0591") - cityNoMap.put("厦门", "0592") - cityNoMap.put("宁德", "0593") - cityNoMap.put("莆田", "0594") - cityNoMap.put("泉州", "0595") - cityNoMap.put("漳州", "0596") - cityNoMap.put("威海", "0631") - cityNoMap.put("汕尾", "0660") - cityNoMap.put("汕尾岛", "0660") - cityNoMap.put("阳江", "0662") - cityNoMap.put("揭阳", "0663") - cityNoMap.put("茂名", "0668") - cityNoMap.put("襄阳", "0710") - cityNoMap.put("黄石", "0714") - cityNoMap.put("宜昌", "0717") - cityNoMap.put("十堰", "0719") - cityNoMap.put("荆门", "0724") - cityNoMap.put("岳阳", "0730") - cityNoMap.put("长沙", "0731") - cityNoMap.put("湘潭", "0732") - cityNoMap.put("株洲", "0733") - cityNoMap.put("常德", "0736") - cityNoMap.put("江门", "0750") - cityNoMap.put("汕头", "0754") - cityNoMap.put("深圳", "0755") - cityNoMap.put("珠海", "0756") - cityNoMap.put("湛江", "0759") - cityNoMap.put("中山", "0760") - cityNoMap.put("防城港", "0770") - cityNoMap.put("南宁", "0771") - cityNoMap.put("桂林", "0773") - cityNoMap.put("北海", "0779") - cityNoMap.put("南昌", "0791") - cityNoMap.put("九江", "0792") - cityNoMap.put("景德镇", "0798") - cityNoMap.put("自贡", "0813") - cityNoMap.put("泸州", "0830") - cityNoMap.put("宜宾", "0831") - cityNoMap.put("内江", "01832") - cityNoMap.put("眉山", "0833") - cityNoMap.put("贵阳", "0851") - cityNoMap.put("三亚", "0899") - cityNoMap.put("咸阳", "0910") - cityNoMap.put("延安", "0911") - cityNoMap.put("延边朝鲜族自治州", "0433") - cityNoMap.put("七台河", "0464") - cityNoMap.put("三明", "0598") - cityNoMap.put("三门峡", "0398") - cityNoMap.put("上海", "021") - cityNoMap.put("上饶", "0793") - cityNoMap.put("东莞", "0769") - cityNoMap.put("东营", "0546") - cityNoMap.put("中卫", "01953") - cityNoMap.put("临夏回族自治州", "0930") - cityNoMap.put("临汾", "0357") - cityNoMap.put("临沂", "0539") - cityNoMap.put("丽水", "0578") - cityNoMap.put("乌兰察布", "0474") - cityNoMap.put("乌海", "0473") - cityNoMap.put("乌鲁木齐", "0991") - cityNoMap.put("乐山", "0833") - cityNoMap.put("云浮", "0766") - cityNoMap.put("亳州", "0558") - cityNoMap.put("仙桃", "0728") - cityNoMap.put("伊春", "0458") - cityNoMap.put("伊犁哈萨克自治州", "0999") - cityNoMap.put("佛山", "0757") - cityNoMap.put("信阳", "0376") - cityNoMap.put("克拉玛依", "0990") - cityNoMap.put("六安", "0564") - cityNoMap.put("兰州", "0931") - cityNoMap.put("兴安盟", "0482") - cityNoMap.put("凉山彝族自治州", "0834") - cityNoMap.put("南充", "0817") - cityNoMap.put("南平", "0599") - cityNoMap.put("南阳", "0377") - cityNoMap.put("博尔塔拉蒙古自治州", "0909") - cityNoMap.put("双鸭山", "0469") - cityNoMap.put("合肥", "0551") - cityNoMap.put("吉安", "0796") - cityNoMap.put("吉林", "0432") - cityNoMap.put("吐鲁番地区", "0995") - cityNoMap.put("吕梁", "0358") - cityNoMap.put("吴忠", "0953") - cityNoMap.put("周口", "0394") - cityNoMap.put("呼伦贝尔", "0470") - cityNoMap.put("呼和浩特", "0471") - cityNoMap.put("咸宁", "0715") - cityNoMap.put("商丘", "0370") - cityNoMap.put("商洛", "0914") - cityNoMap.put("嘉兴", "0573") - cityNoMap.put("四平", "0434") - cityNoMap.put("塔城地区", "0901") - cityNoMap.put("大兴安岭地区", "0457") - cityNoMap.put("大同", "0352") - cityNoMap.put("大庆", "0459") - cityNoMap.put("大理白族自治州", "0872") - cityNoMap.put("天水", "0938") - cityNoMap.put("天津", "022") - cityNoMap.put("天门", "01728") - cityNoMap.put("太原", "0351") - cityNoMap.put("娄底", "0738") - cityNoMap.put("孝感", "0712") - cityNoMap.put("宁波", "0574") - cityNoMap.put("安庆", "0556") - cityNoMap.put("安康", "0915") - cityNoMap.put("安阳", "0372") - cityNoMap.put("安顺", "0853") - cityNoMap.put("定西", "0932") - cityNoMap.put("宜春", "0795") - cityNoMap.put("宝鸡", "0917") - cityNoMap.put("宣城", "0563") - cityNoMap.put("宿州", "0557") - cityNoMap.put("宿迁", "0527") - cityNoMap.put("山南地区", "0893") - cityNoMap.put("崇左", "01771") - cityNoMap.put("巢湖", "0565") - cityNoMap.put("巴中", "0827") - cityNoMap.put("平凉", "0933") - cityNoMap.put("平顶山", "0375") - cityNoMap.put("广元", "0839") - cityNoMap.put("广安", "0826") - cityNoMap.put("庆阳", "0934") - cityNoMap.put("开封", "0378") - cityNoMap.put("张家口", "0313") - cityNoMap.put("张家界", "0744") - cityNoMap.put("张掖", "0936") - cityNoMap.put("德州", "0534") - cityNoMap.put("德阳", "0838") - cityNoMap.put("忻州", "0350") - cityNoMap.put("怀化", "0745") - cityNoMap.put("恩施土家族苗族自治州", "0718") - cityNoMap.put("惠州", "0752") - cityNoMap.put("抚州", "0794") - cityNoMap.put("拉萨", "0891") - cityNoMap.put("攀枝花", "0812") - cityNoMap.put("新余", "0790") - cityNoMap.put("无锡", "0510") - cityNoMap.put("日喀则地区", "0892") - cityNoMap.put("日照", "0633") - cityNoMap.put("昆明", "0871") - cityNoMap.put("昌吉回族自治州", "0994") - cityNoMap.put("昭通", "0870") - cityNoMap.put("晋中", "0354") - cityNoMap.put("晋城", "0356") - cityNoMap.put("曲靖", "0874") - cityNoMap.put("朔州", "0349") - cityNoMap.put("朝阳", "0421") - cityNoMap.put("来宾", "01772") - cityNoMap.put("松原", "0438") - cityNoMap.put("枣庄", "0632") - cityNoMap.put("柳州", "0772") - cityNoMap.put("梅州", "0753") - cityNoMap.put("梧州", "0774") - cityNoMap.put("楚雄彝族自治州", "0878") - cityNoMap.put("榆林", "0912") - cityNoMap.put("武威", "01935") - cityNoMap.put("毕节地区", "0857") - cityNoMap.put("永州", "0746") - cityNoMap.put("汉中", "0916") - cityNoMap.put("池州", "0566") - cityNoMap.put("沈阳", "024") - cityNoMap.put("沧州", "0317") - cityNoMap.put("河池", "0778") - cityNoMap.put("河源", "0762") - cityNoMap.put("泰安", "0538") - cityNoMap.put("泰州", "0523") - cityNoMap.put("济宁", "0537") - cityNoMap.put("济源", "01391") - cityNoMap.put("海东地区", "0972") - cityNoMap.put("海北藏族自治州", "0970") - cityNoMap.put("海南藏族自治州", "0974") - cityNoMap.put("海口", "0898") - cityNoMap.put("淄博", "0533") - cityNoMap.put("淮北", "0561") - cityNoMap.put("淮南", "0554") - cityNoMap.put("淮安", "0517") - cityNoMap.put("清远", "0763") - cityNoMap.put("渭南", "0913") - cityNoMap.put("湘西土家族苗族自治州", "0743") - cityNoMap.put("滁州", "0550") - cityNoMap.put("滨州", "0543") - cityNoMap.put("漯河", "0395") - cityNoMap.put("潍坊", "0536") - cityNoMap.put("潜江", "02728") - cityNoMap.put("潮州", "0768") - cityNoMap.put("濮阳", "0393") - cityNoMap.put("烟台", "0535") - cityNoMap.put("焦作", "0391") - cityNoMap.put("牡丹江", "0453") - cityNoMap.put("玉林", "0775") - cityNoMap.put("玉溪", "0877") - cityNoMap.put("甘孜藏族自治州", "0836") - cityNoMap.put("白城", "0436") - cityNoMap.put("白山", "0439") - cityNoMap.put("白银", "0943") - cityNoMap.put("益阳", "0737") - cityNoMap.put("盐城", "0515") - cityNoMap.put("盘锦", "0427") - cityNoMap.put("石嘴山", "0952") - cityNoMap.put("石家庄", "0311") - cityNoMap.put("石河子", "0993") - cityNoMap.put("神农架林区", "01719") - cityNoMap.put("红河哈尼族彝族自治州", "0873") - cityNoMap.put("绍兴", "0575") - cityNoMap.put("绥化", "0455") - cityNoMap.put("绵阳", "0816") - cityNoMap.put("聊城", "0635") - cityNoMap.put("肇庆", "0758") - cityNoMap.put("舟山", "0580") - cityNoMap.put("芜湖", "0553") - cityNoMap.put("荆州", "0716") - cityNoMap.put("莱芜", "0634") - cityNoMap.put("菏泽", "0530") - cityNoMap.put("萍乡", "0799") - cityNoMap.put("营口", "0417") - cityNoMap.put("衡水", "0318") - cityNoMap.put("衡阳", "0734") - cityNoMap.put("衢州", "0570") - cityNoMap.put("西双版纳傣族自治州", "0691") - cityNoMap.put("西宁", "0971") - cityNoMap.put("西安", "029") - cityNoMap.put("许昌", "0374") - cityNoMap.put("贵港", "01755") - cityNoMap.put("贺州", "01774") - cityNoMap.put("资阳", "0832") - cityNoMap.put("赣州", "0797") - cityNoMap.put("赤峰", "0476") - cityNoMap.put("辽源", "0437") - cityNoMap.put("达州", "0818") - cityNoMap.put("运城", "0359") - cityNoMap.put("连云港", "0518") - cityNoMap.put("通化", "0435") - cityNoMap.put("通辽", "0475") - cityNoMap.put("遂宁", "0825") - cityNoMap.put("遵义", "0852") - cityNoMap.put("邢台", "0319") - cityNoMap.put("邯郸", "0310") - cityNoMap.put("邵阳", "0739") - cityNoMap.put("郑州", "0371") - cityNoMap.put("郴州", "0735") - cityNoMap.put("鄂尔多斯", "0477") - cityNoMap.put("鄂州", "0711") - cityNoMap.put("酒泉", "0937") - cityNoMap.put("金华", "0579") - cityNoMap.put("金昌", "0935") - cityNoMap.put("钦州", "0777") - cityNoMap.put("铁岭", "0410") - cityNoMap.put("铜仁地区", "0856") - cityNoMap.put("铜川", "0919") - cityNoMap.put("铜陵", "0562") - cityNoMap.put("银川", "0951") - cityNoMap.put("锦州", "0416") - cityNoMap.put("长治", "0355") - cityNoMap.put("阜新", "0418") - cityNoMap.put("阜阳", "01558") - cityNoMap.put("阳泉", "0353") - cityNoMap.put("阿坝藏族羌族自治州", "0837") - cityNoMap.put("陇南", "02935") - cityNoMap.put("随州", "0722") - cityNoMap.put("雅安", "0835") - cityNoMap.put("韶关", "0751") - cityNoMap.put("马鞍山", "0555") - cityNoMap.put("驻马店", "0396") - cityNoMap.put("鸡西", "0467") - cityNoMap.put("鹤壁", "0392") - cityNoMap.put("鹤岗", "0468") - cityNoMap.put("鹰潭", "0701") - cityNoMap.put("黄冈", "0713") - cityNoMap.put("黑河", "0456") - cityNoMap.put("黔东南苗族侗族自治州", "0855") - cityNoMap.put("黔南布依族苗族自治州", "0854") - cityNoMap.put("齐齐哈尔", "0452") - cityNoMap.put("龙岩", "0597") - cityNoMap.put("甘南藏族自治州", "0941") - cityNoMap.put("嘉峪关", "1937") - cityNoMap.put("百色", "0776") - cityNoMap.put("六盘水", "0858") - cityNoMap.put("黔西南布依族苗族自治州", "0859") - cityNoMap.put("白沙黎族自治县", "0802") - cityNoMap.put("保亭黎族苗族自治县", "0801") - cityNoMap.put("昌江黎族自治县", "0803") - cityNoMap.put("澄迈县", "0804") - cityNoMap.put("定安县", "0806") - cityNoMap.put("东方", "0807") - cityNoMap.put("东沙群岛", "0808") - cityNoMap.put("乐东黎族自治县", "2802") - cityNoMap.put("临高县", "1896") - cityNoMap.put("陵水黎族自治县", "0809") - cityNoMap.put("南沙群岛", "1891") - cityNoMap.put("琼海", "1894") - cityNoMap.put("琼中黎族苗族自治县", "1899") - cityNoMap.put("屯昌县", "1892") - cityNoMap.put("万宁", "1898") - cityNoMap.put("文昌", "1893") - cityNoMap.put("五指山", "1897") - cityNoMap.put("西沙群岛", "1895") - cityNoMap.put("中沙群岛", "2801") - cityNoMap.put("儋州", "0805") - cityNoMap.put("阿拉善盟", "0483") - cityNoMap.put("巴彦淖尔市", "0478") - cityNoMap.put("锡林郭勒盟", "0479") - cityNoMap.put("固原", "0954") - cityNoMap.put("果洛藏族自治州", "0975") - cityNoMap.put("海西蒙古族藏族自治州", "0977") - cityNoMap.put("黄南藏族自治州", "0973") - cityNoMap.put("玉树藏族自治州", "0976") - cityNoMap.put("阿里地区", "0897") - cityNoMap.put("昌都地区", "0895") - cityNoMap.put("林芝地区", "0894") - cityNoMap.put("那曲地区", "0896") - cityNoMap.put("阿克苏地区", "0997") - cityNoMap.put("阿勒泰地区", "0906") - cityNoMap.put("巴音郭楞蒙古自治州", "0996") - cityNoMap.put("哈密地区", "0902") - cityNoMap.put("和田地区", "0903") - cityNoMap.put("喀什地区", "0998") - cityNoMap.put("克孜勒苏柯尔克孜自治州", "0908") - cityNoMap.put("保山", "0875") - cityNoMap.put("德宏傣族景颇族自治州", "0692") - cityNoMap.put("迪庆藏族自治州", "0887") - cityNoMap.put("丽江", "0888") - cityNoMap.put("临沧市", "0883") - cityNoMap.put("怒江傈僳族自治州", "0886") - cityNoMap.put("普洱", "0879") - cityNoMap.put("文山壮族苗族自治州", "0876") - cityNoMap.put("香港", "1852") - cityNoMap.put("澳门", "1853") - cityNoMap.put("五家渠市", "652300") - cityNoMap.put("阿拉尔市", "652900") - cityNoMap.put("图木舒克市", "653000") + cityNoMap.put("鍖椾含", "010") + cityNoMap.put("骞垮窞", "020") + cityNoMap.put("閲嶅簡", "023") + cityNoMap.put("鍗椾含", "025") + cityNoMap.put("姝︽眽", "027") + cityNoMap.put("鎴愰兘", "028") + cityNoMap.put("淇濆畾", "0312") + cityNoMap.put("鎵垮痉", "0314") + cityNoMap.put("鍞愬北", "0315") + cityNoMap.put("寤婂潑", "0316") + cityNoMap.put("绉︾殗宀�", "0335") + cityNoMap.put("鏂颁埂", "0373") + cityNoMap.put("娲涢槼", "0379") + cityNoMap.put("澶ц繛", "0411") + cityNoMap.put("闉嶅北", "0412") + cityNoMap.put("鎶氶『", "0413") + cityNoMap.put("鏈邯", "0414") + cityNoMap.put("涓逛笢", "0415") + cityNoMap.put("杈介槼", "0419") + cityNoMap.put("钁姦宀�", "0429") + cityNoMap.put("闀挎槬", "0431") + cityNoMap.put("鍝堝皵婊�", "0451") + cityNoMap.put("浣虫湪鏂�", "0454") + cityNoMap.put("鍖呭ご", "0472") + cityNoMap.put("闀囨睙", "0511") + cityNoMap.put("鑻忓窞", "0512") + cityNoMap.put("鍗楅��", "0513") + cityNoMap.put("鎵窞", "0514") + cityNoMap.put("寰愬窞", "0516") + cityNoMap.put("甯稿窞", "0519") + cityNoMap.put("娴庡崡", "0531") + cityNoMap.put("闈掑矝", "0532") + cityNoMap.put("铓屽煚", "0552") + cityNoMap.put("榛勫北", "0559") + cityNoMap.put("鏉窞", "0571") + cityNoMap.put("婀栧窞", "0572") + cityNoMap.put("鍙板窞", "0576") + cityNoMap.put("娓╁窞", "0577") + cityNoMap.put("绂忓窞", "0591") + cityNoMap.put("鍘﹂棬", "0592") + cityNoMap.put("瀹佸痉", "0593") + cityNoMap.put("鑾嗙敯", "0594") + cityNoMap.put("娉夊窞", "0595") + cityNoMap.put("婕冲窞", "0596") + cityNoMap.put("濞佹捣", "0631") + cityNoMap.put("姹曞熬", "0660") + cityNoMap.put("姹曞熬宀�", "0660") + cityNoMap.put("闃虫睙", "0662") + cityNoMap.put("鎻槼", "0663") + cityNoMap.put("鑼傚悕", "0668") + cityNoMap.put("瑗勯槼", "0710") + cityNoMap.put("榛勭煶", "0714") + cityNoMap.put("瀹滄槍", "0717") + cityNoMap.put("鍗佸牥", "0719") + cityNoMap.put("鑽嗛棬", "0724") + cityNoMap.put("宀抽槼", "0730") + cityNoMap.put("闀挎矙", "0731") + cityNoMap.put("婀樻江", "0732") + cityNoMap.put("鏍床", "0733") + cityNoMap.put("甯稿痉", "0736") + cityNoMap.put("姹熼棬", "0750") + cityNoMap.put("姹曞ご", "0754") + cityNoMap.put("娣卞湷", "0755") + cityNoMap.put("鐝犳捣", "0756") + cityNoMap.put("婀涙睙", "0759") + cityNoMap.put("涓北", "0760") + cityNoMap.put("闃插煄娓�", "0770") + cityNoMap.put("鍗楀畞", "0771") + cityNoMap.put("妗傛灄", "0773") + cityNoMap.put("鍖楁捣", "0779") + cityNoMap.put("鍗楁槍", "0791") + cityNoMap.put("涔濇睙", "0792") + cityNoMap.put("鏅痉闀�", "0798") + cityNoMap.put("鑷础", "0813") + cityNoMap.put("娉稿窞", "0830") + cityNoMap.put("瀹滃", "0831") + cityNoMap.put("鍐呮睙", "01832") + cityNoMap.put("鐪夊北", "0833") + cityNoMap.put("璐甸槼", "0851") + cityNoMap.put("涓変簹", "0899") + cityNoMap.put("鍜搁槼", "0910") + cityNoMap.put("寤跺畨", "0911") + cityNoMap.put("寤惰竟鏈濋矞鏃忚嚜娌诲窞", "0433") + cityNoMap.put("涓冨彴娌�", "0464") + cityNoMap.put("涓夋槑", "0598") + cityNoMap.put("涓夐棬宄�", "0398") + cityNoMap.put("涓婃捣", "021") + cityNoMap.put("涓婇ザ", "0793") + cityNoMap.put("涓滆帪", "0769") + cityNoMap.put("涓滆惀", "0546") + cityNoMap.put("涓崼", "01953") + cityNoMap.put("涓村鍥炴棌鑷不宸�", "0930") + cityNoMap.put("涓存本", "0357") + cityNoMap.put("涓存矀", "0539") + cityNoMap.put("涓芥按", "0578") + cityNoMap.put("涔屽叞瀵熷竷", "0474") + cityNoMap.put("涔屾捣", "0473") + cityNoMap.put("涔岄瞾鏈ㄩ綈", "0991") + cityNoMap.put("涔愬北", "0833") + cityNoMap.put("浜戞诞", "0766") + cityNoMap.put("浜冲窞", "0558") + cityNoMap.put("浠欐", "0728") + cityNoMap.put("浼婃槬", "0458") + cityNoMap.put("浼婄妬鍝堣惃鍏嬭嚜娌诲窞", "0999") + cityNoMap.put("浣涘北", "0757") + cityNoMap.put("淇¢槼", "0376") + cityNoMap.put("鍏嬫媺鐜涗緷", "0990") + cityNoMap.put("鍏畨", "0564") + cityNoMap.put("鍏板窞", "0931") + cityNoMap.put("鍏村畨鐩�", "0482") + cityNoMap.put("鍑夊北褰濇棌鑷不宸�", "0834") + cityNoMap.put("鍗楀厖", "0817") + cityNoMap.put("鍗楀钩", "0599") + cityNoMap.put("鍗楅槼", "0377") + cityNoMap.put("鍗氬皵濉旀媺钂欏彜鑷不宸�", "0909") + cityNoMap.put("鍙岄腑灞�", "0469") + cityNoMap.put("鍚堣偉", "0551") + cityNoMap.put("鍚夊畨", "0796") + cityNoMap.put("鍚夋灄", "0432") + cityNoMap.put("鍚愰瞾鐣湴鍖�", "0995") + cityNoMap.put("鍚曟", "0358") + cityNoMap.put("鍚村繝", "0953") + cityNoMap.put("鍛ㄥ彛", "0394") + cityNoMap.put("鍛间鸡璐濆皵", "0470") + cityNoMap.put("鍛煎拰娴╃壒", "0471") + cityNoMap.put("鍜稿畞", "0715") + cityNoMap.put("鍟嗕笜", "0370") + cityNoMap.put("鍟嗘礇", "0914") + cityNoMap.put("鍢夊叴", "0573") + cityNoMap.put("鍥涘钩", "0434") + cityNoMap.put("濉斿煄鍦板尯", "0901") + cityNoMap.put("澶у叴瀹夊箔鍦板尯", "0457") + cityNoMap.put("澶у悓", "0352") + cityNoMap.put("澶у簡", "0459") + cityNoMap.put("澶х悊鐧芥棌鑷不宸�", "0872") + cityNoMap.put("澶╂按", "0938") + cityNoMap.put("澶╂触", "022") + cityNoMap.put("澶╅棬", "01728") + cityNoMap.put("澶師", "0351") + cityNoMap.put("濞勫簳", "0738") + cityNoMap.put("瀛濇劅", "0712") + cityNoMap.put("瀹佹尝", "0574") + cityNoMap.put("瀹夊簡", "0556") + cityNoMap.put("瀹夊悍", "0915") + cityNoMap.put("瀹夐槼", "0372") + cityNoMap.put("瀹夐『", "0853") + cityNoMap.put("瀹氳タ", "0932") + cityNoMap.put("瀹滄槬", "0795") + cityNoMap.put("瀹濋浮", "0917") + cityNoMap.put("瀹e煄", "0563") + cityNoMap.put("瀹垮窞", "0557") + cityNoMap.put("瀹胯縼", "0527") + cityNoMap.put("灞卞崡鍦板尯", "0893") + cityNoMap.put("宕囧乏", "01771") + cityNoMap.put("宸㈡箹", "0565") + cityNoMap.put("宸翠腑", "0827") + cityNoMap.put("骞冲噳", "0933") + cityNoMap.put("骞抽《灞�", "0375") + cityNoMap.put("骞垮厓", "0839") + cityNoMap.put("骞垮畨", "0826") + cityNoMap.put("搴嗛槼", "0934") + cityNoMap.put("寮�灏�", "0378") + cityNoMap.put("寮犲鍙�", "0313") + cityNoMap.put("寮犲鐣�", "0744") + cityNoMap.put("寮犳帠", "0936") + cityNoMap.put("寰峰窞", "0534") + cityNoMap.put("寰烽槼", "0838") + cityNoMap.put("蹇诲窞", "0350") + cityNoMap.put("鎬�鍖�", "0745") + cityNoMap.put("鎭╂柦鍦熷鏃忚嫍鏃忚嚜娌诲窞", "0718") + cityNoMap.put("鎯犲窞", "0752") + cityNoMap.put("鎶氬窞", "0794") + cityNoMap.put("鎷夎惃", "0891") + cityNoMap.put("鏀�鏋濊姳", "0812") + cityNoMap.put("鏂颁綑", "0790") + cityNoMap.put("鏃犻敗", "0510") + cityNoMap.put("鏃ュ杸鍒欏湴鍖�", "0892") + cityNoMap.put("鏃ョ収", "0633") + cityNoMap.put("鏄嗘槑", "0871") + cityNoMap.put("鏄屽悏鍥炴棌鑷不宸�", "0994") + cityNoMap.put("鏄��", "0870") + cityNoMap.put("鏅嬩腑", "0354") + cityNoMap.put("鏅嬪煄", "0356") + cityNoMap.put("鏇查潠", "0874") + cityNoMap.put("鏈斿窞", "0349") + cityNoMap.put("鏈濋槼", "0421") + cityNoMap.put("鏉ュ", "01772") + cityNoMap.put("鏉惧師", "0438") + cityNoMap.put("鏋e簞", "0632") + cityNoMap.put("鏌冲窞", "0772") + cityNoMap.put("姊呭窞", "0753") + cityNoMap.put("姊у窞", "0774") + cityNoMap.put("妤氶泟褰濇棌鑷不宸�", "0878") + cityNoMap.put("姒嗘灄", "0912") + cityNoMap.put("姝﹀▉", "01935") + cityNoMap.put("姣曡妭鍦板尯", "0857") + cityNoMap.put("姘稿窞", "0746") + cityNoMap.put("姹変腑", "0916") + cityNoMap.put("姹犲窞", "0566") + cityNoMap.put("娌堥槼", "024") + cityNoMap.put("娌у窞", "0317") + cityNoMap.put("娌虫睜", "0778") + cityNoMap.put("娌虫簮", "0762") + cityNoMap.put("娉板畨", "0538") + cityNoMap.put("娉板窞", "0523") + cityNoMap.put("娴庡畞", "0537") + cityNoMap.put("娴庢簮", "01391") + cityNoMap.put("娴蜂笢鍦板尯", "0972") + cityNoMap.put("娴峰寳钘忔棌鑷不宸�", "0970") + cityNoMap.put("娴峰崡钘忔棌鑷不宸�", "0974") + cityNoMap.put("娴峰彛", "0898") + cityNoMap.put("娣勫崥", "0533") + cityNoMap.put("娣寳", "0561") + cityNoMap.put("娣崡", "0554") + cityNoMap.put("娣畨", "0517") + cityNoMap.put("娓呰繙", "0763") + cityNoMap.put("娓崡", "0913") + cityNoMap.put("婀樿タ鍦熷鏃忚嫍鏃忚嚜娌诲窞", "0743") + cityNoMap.put("婊佸窞", "0550") + cityNoMap.put("婊ㄥ窞", "0543") + cityNoMap.put("婕渤", "0395") + cityNoMap.put("娼嶅潑", "0536") + cityNoMap.put("娼滄睙", "02728") + cityNoMap.put("娼窞", "0768") + cityNoMap.put("婵槼", "0393") + cityNoMap.put("鐑熷彴", "0535") + cityNoMap.put("鐒︿綔", "0391") + cityNoMap.put("鐗′腹姹�", "0453") + cityNoMap.put("鐜夋灄", "0775") + cityNoMap.put("鐜夋邯", "0877") + cityNoMap.put("鐢樺瓬钘忔棌鑷不宸�", "0836") + cityNoMap.put("鐧藉煄", "0436") + cityNoMap.put("鐧藉北", "0439") + cityNoMap.put("鐧介摱", "0943") + cityNoMap.put("鐩婇槼", "0737") + cityNoMap.put("鐩愬煄", "0515") + cityNoMap.put("鐩橀敠", "0427") + cityNoMap.put("鐭冲槾灞�", "0952") + cityNoMap.put("鐭冲搴�", "0311") + cityNoMap.put("鐭虫渤瀛�", "0993") + cityNoMap.put("绁炲啘鏋舵灄鍖�", "01719") + cityNoMap.put("绾㈡渤鍝堝凹鏃忓綕鏃忚嚜娌诲窞", "0873") + cityNoMap.put("缁嶅叴", "0575") + cityNoMap.put("缁ュ寲", "0455") + cityNoMap.put("缁甸槼", "0816") + cityNoMap.put("鑱婂煄", "0635") + cityNoMap.put("鑲囧簡", "0758") + cityNoMap.put("鑸熷北", "0580") + cityNoMap.put("鑺滄箹", "0553") + cityNoMap.put("鑽嗗窞", "0716") + cityNoMap.put("鑾辫姕", "0634") + cityNoMap.put("鑿忔辰", "0530") + cityNoMap.put("钀嶄埂", "0799") + cityNoMap.put("钀ュ彛", "0417") + cityNoMap.put("琛℃按", "0318") + cityNoMap.put("琛¢槼", "0734") + cityNoMap.put("琛㈠窞", "0570") + cityNoMap.put("瑗垮弻鐗堢撼鍌f棌鑷不宸�", "0691") + cityNoMap.put("瑗垮畞", "0971") + cityNoMap.put("瑗垮畨", "029") + cityNoMap.put("璁告槍", "0374") + cityNoMap.put("璐垫腐", "01755") + cityNoMap.put("璐哄窞", "01774") + cityNoMap.put("璧勯槼", "0832") + cityNoMap.put("璧e窞", "0797") + cityNoMap.put("璧ゅ嘲", "0476") + cityNoMap.put("杈芥簮", "0437") + cityNoMap.put("杈惧窞", "0818") + cityNoMap.put("杩愬煄", "0359") + cityNoMap.put("杩炰簯娓�", "0518") + cityNoMap.put("閫氬寲", "0435") + cityNoMap.put("閫氳窘", "0475") + cityNoMap.put("閬傚畞", "0825") + cityNoMap.put("閬典箟", "0852") + cityNoMap.put("閭㈠彴", "0319") + cityNoMap.put("閭兏", "0310") + cityNoMap.put("閭甸槼", "0739") + cityNoMap.put("閮戝窞", "0371") + cityNoMap.put("閮村窞", "0735") + cityNoMap.put("閯傚皵澶氭柉", "0477") + cityNoMap.put("閯傚窞", "0711") + cityNoMap.put("閰掓硥", "0937") + cityNoMap.put("閲戝崕", "0579") + cityNoMap.put("閲戞槍", "0935") + cityNoMap.put("閽﹀窞", "0777") + cityNoMap.put("閾佸箔", "0410") + cityNoMap.put("閾滀粊鍦板尯", "0856") + cityNoMap.put("閾滃窛", "0919") + cityNoMap.put("閾滈櫟", "0562") + cityNoMap.put("閾跺窛", "0951") + cityNoMap.put("閿﹀窞", "0416") + cityNoMap.put("闀挎不", "0355") + cityNoMap.put("闃滄柊", "0418") + cityNoMap.put("闃滈槼", "01558") + cityNoMap.put("闃虫硥", "0353") + cityNoMap.put("闃垮潩钘忔棌缇屾棌鑷不宸�", "0837") + cityNoMap.put("闄囧崡", "02935") + cityNoMap.put("闅忓窞", "0722") + cityNoMap.put("闆呭畨", "0835") + cityNoMap.put("闊跺叧", "0751") + cityNoMap.put("椹瀺灞�", "0555") + cityNoMap.put("椹婚┈搴�", "0396") + cityNoMap.put("楦¤タ", "0467") + cityNoMap.put("楣ゅ", "0392") + cityNoMap.put("楣ゅ矖", "0468") + cityNoMap.put("楣版江", "0701") + cityNoMap.put("榛勫唸", "0713") + cityNoMap.put("榛戞渤", "0456") + cityNoMap.put("榛斾笢鍗楄嫍鏃忎緱鏃忚嚜娌诲窞", "0855") + cityNoMap.put("榛斿崡甯冧緷鏃忚嫍鏃忚嚜娌诲窞", "0854") + cityNoMap.put("榻愰綈鍝堝皵", "0452") + cityNoMap.put("榫欏博", "0597") + cityNoMap.put("鐢樺崡钘忔棌鑷不宸�", "0941") + cityNoMap.put("鍢夊唱鍏�", "1937") + cityNoMap.put("鐧捐壊", "0776") + cityNoMap.put("鍏洏姘�", "0858") + cityNoMap.put("榛旇タ鍗楀竷渚濇棌鑻楁棌鑷不宸�", "0859") + cityNoMap.put("鐧芥矙榛庢棌鑷不鍘�", "0802") + cityNoMap.put("淇濅涵榛庢棌鑻楁棌鑷不鍘�", "0801") + cityNoMap.put("鏄屾睙榛庢棌鑷不鍘�", "0803") + cityNoMap.put("婢勮繄鍘�", "0804") + cityNoMap.put("瀹氬畨鍘�", "0806") + cityNoMap.put("涓滄柟", "0807") + cityNoMap.put("涓滄矙缇ゅ矝", "0808") + cityNoMap.put("涔愪笢榛庢棌鑷不鍘�", "2802") + cityNoMap.put("涓撮珮鍘�", "1896") + cityNoMap.put("闄垫按榛庢棌鑷不鍘�", "0809") + cityNoMap.put("鍗楁矙缇ゅ矝", "1891") + cityNoMap.put("鐞兼捣", "1894") + cityNoMap.put("鐞间腑榛庢棌鑻楁棌鑷不鍘�", "1899") + cityNoMap.put("灞槍鍘�", "1892") + cityNoMap.put("涓囧畞", "1898") + cityNoMap.put("鏂囨槍", "1893") + cityNoMap.put("浜旀寚灞�", "1897") + cityNoMap.put("瑗挎矙缇ゅ矝", "1895") + cityNoMap.put("涓矙缇ゅ矝", "2801") + cityNoMap.put("鍎嬪窞", "0805") + cityNoMap.put("闃挎媺鍠勭洘", "0483") + cityNoMap.put("宸村溅娣栧皵甯�", "0478") + cityNoMap.put("閿℃灄閮嫆鐩�", "0479") + cityNoMap.put("鍥哄師", "0954") + cityNoMap.put("鏋滄礇钘忔棌鑷不宸�", "0975") + cityNoMap.put("娴疯タ钂欏彜鏃忚棌鏃忚嚜娌诲窞", "0977") + cityNoMap.put("榛勫崡钘忔棌鑷不宸�", "0973") + cityNoMap.put("鐜夋爲钘忔棌鑷不宸�", "0976") + cityNoMap.put("闃块噷鍦板尯", "0897") + cityNoMap.put("鏄岄兘鍦板尯", "0895") + cityNoMap.put("鏋楄姖鍦板尯", "0894") + cityNoMap.put("閭f洸鍦板尯", "0896") + cityNoMap.put("闃垮厠鑻忓湴鍖�", "0997") + cityNoMap.put("闃垮嫆娉板湴鍖�", "0906") + cityNoMap.put("宸撮煶閮钂欏彜鑷不宸�", "0996") + cityNoMap.put("鍝堝瘑鍦板尯", "0902") + cityNoMap.put("鍜岀敯鍦板尯", "0903") + cityNoMap.put("鍠�浠�鍦板尯", "0998") + cityNoMap.put("鍏嬪瓬鍕掕嫃鏌皵鍏嬪瓬鑷不宸�", "0908") + cityNoMap.put("淇濆北", "0875") + cityNoMap.put("寰峰畯鍌f棌鏅鏃忚嚜娌诲窞", "0692") + cityNoMap.put("杩簡钘忔棌鑷不宸�", "0887") + cityNoMap.put("涓芥睙", "0888") + cityNoMap.put("涓存钵甯�", "0883") + cityNoMap.put("鎬掓睙鍌堝兂鏃忚嚜娌诲窞", "0886") + cityNoMap.put("鏅幢", "0879") + cityNoMap.put("鏂囧北澹棌鑻楁棌鑷不宸�", "0876") + cityNoMap.put("棣欐腐", "1852") + cityNoMap.put("婢抽棬", "1853") + cityNoMap.put("浜斿娓犲競", "652300") + cityNoMap.put("闃挎媺灏斿競", "652900") + cityNoMap.put("鍥炬湪鑸掑厠甯�", "653000") - cityNoMap.put("昆山", "0512") - cityNoMap.put("常熟", "0512") - cityNoMap.put("萧山", "0571") - cityNoMap.put("义乌", "0579") + cityNoMap.put("鏄嗗北", "0512") + cityNoMap.put("甯哥啛", "0512") + cityNoMap.put("钀у北", "0571") + cityNoMap.put("涔変箤", "0579") return cityNoMap } /** - * 从poi中获得公司的信息 - * address:地址 - * name:公司名 - * com_type:公司类型 - * lat: 经度 - * lng: 维度 - * zip_code:邮编 - * city_code:城市区号 - * tel: 电话号码 + * 浠巔oi涓幏寰楀叕鍙哥殑淇℃伅 + * address:鍦板潃 + * name锛氬叕鍙稿悕 + * com_type:鍏徃绫诲瀷 + * lat: 缁忓害 + * lng: 缁村害 + * zip_code:閭紪 + * city_code:鍩庡競鍖哄彿 + * tel: 鐢佃瘽鍙风爜 * @param poi */ private getCompanyDataFromPoi(poi){ @@ -562,10 +562,10 @@ class MapabcService { } /** - * 根据经纬度计算距离 - * 返回单位为米 - * 使用方法如:println caculateDistance(121.4420330826, 31.2460880049,121.4432680000, 31.2459470000) - * 具体参考:http://www.storyday.com/wp-content/uploads/2008/09/latlung_dis.html + * 鏍规嵁缁忕含搴﹁绠楄窛绂� + * 杩斿洖鍗曚綅涓虹背 + * 浣跨敤鏂规硶濡傦細println caculateDistance(121.4420330826, 31.2460880049,121.4432680000, 31.2459470000) + * 鍏蜂綋鍙傝�冿細http://www.storyday.com/wp-content/uploads/2008/09/latlung_dis.html */ public def caculateDistance(lng1, lat1, lng2, lat2){ def radLat1 = rad(lat1) @@ -587,7 +587,7 @@ class MapabcService { public void crawlDistrictLngLatWithAddress(){ DBObject queryParams=new BasicDBObject(); - queryParams.put("city", "上海"); + queryParams.put("city", "涓婃捣"); DBCursor cur=source.find(queryParams); def countIndex=0; def failedCount=0; @@ -598,7 +598,7 @@ class MapabcService { queryParams2.put("_id", dbObj.get("_id")); if(target.count(queryParams2)>0)continue; - def rt=parseAddress(address, "上海") + def rt=parseAddress(address, "涓婃捣") if(rt.size()>0){ DBObject targetObj=new BasicDBObject(); targetObj.put("_id", dbObj.get("_id")); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/geluke/ServerArea.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/geluke/ServerArea.groovy index 6498c5476..3f59f8f30 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/geluke/ServerArea.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/geluke/ServerArea.groovy @@ -17,7 +17,7 @@ class ServerArea { //public static final DBCollection FJBS_DATA_COLL = MongoUtils.getCollectionByName("fangjia", "baisheng_data", "mongo.db.fangjia.com") //public static final DBCollection GLKBS_DATA_COLL = MongoUtils.getCollectionByName("geluke", "baisheng_data", "mongo.db.fangjia.com") - public static def citys = ["上海","杭州","南京","苏州","无锡","济南","青岛","北京","天津","石家庄","大连","广州","深圳","武汉","郑州","南昌","东莞","成都","西安","昆明","昆山","福州","宁波","温州","绍兴","金华","嘉兴","常州","南通","常熟","烟台","厦门","合肥","太原","长沙","沈阳","哈尔滨","佛山","珠海"]; + public static def citys = ["涓婃捣","鏉窞","鍗椾含","鑻忓窞","鏃犻敗","娴庡崡","闈掑矝","鍖椾含","澶╂触","鐭冲搴�","澶ц繛","骞垮窞","娣卞湷","姝︽眽","閮戝窞","鍗楁槍","涓滆帪","鎴愰兘","瑗垮畨","鏄嗘槑","鏄嗗北","绂忓窞","瀹佹尝","娓╁窞","缁嶅叴","閲戝崕","鍢夊叴","甯稿窞","鍗楅��","甯哥啛","鐑熷彴","鍘﹂棬","鍚堣偉","澶師","闀挎矙","娌堥槼","鍝堝皵婊�","浣涘北","鐝犳捣"]; static main(args) { 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 43e4429ce..338d17817 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 @@ -26,8 +26,8 @@ class AddAvgpriceBatch { public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(100) static { - citys = ["宜昌"]//CommonDatautils.findAllCity() - println "加载城市完成:"+citys.size() + citys = ["瀹滄槍"]//CommonDatautils.findAllCity() + println "鍔犺浇鍩庡競瀹屾垚:"+citys.size() } static main(args) { @@ -135,7 +135,7 @@ class AddAvgpriceBatch { def key = d.region +"#"+d.district_name if(!nameKeys.contains(key)){ DIST_STAT_COLL.remove(new BasicDBObject("_id", d._id)) - println "删除:"+city +" "+ d.district_name + println "鍒犻櫎锛�"+city +" "+ d.district_name } } } @@ -153,9 +153,9 @@ class AddAvgpriceBatch { } def sendPriceCommand(){ - ExcelUtils.multiThreadingModify("D:\\数据\\美术宝\\美术宝测试数据(价格).xlsx", { row -> - if(!row['P'] && row['T'] && ["别墅","普通住宅","商住两用"].contains(row['T'])){ - //发重算均价命令 + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\缇庢湳瀹漒\缇庢湳瀹濇祴璇曟暟鎹�(浠锋牸).xlsx", { row -> + if(!row['P'] && row['T'] && ["鍒","鏅�氫綇瀹�","鍟嗕綇涓ょ敤"].contains(row['T'])){ + //鍙戦噸绠楀潎浠峰懡浠� println row['K']+" "+row['L']+" "+row['M'] addPrice(row['K'],row['L'],row['M'], row['T'], DateUtils.parseFromTightByPattern('2023-10-01','yyyy-MM-dd'),DateUtils.parseFromTightByPattern('2023-10-25','yyyy-MM-dd')) } @@ -163,10 +163,10 @@ class AddAvgpriceBatch { } def test(){ - def districts = CommonDatautils.findAllDistricts("福州","district", ["city","region","name", "estate_type2"]) -// 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-06-30','yyyy-MM-dd'),DateUtils.parseFromTightByPattern('2023-07-05','yyyy-MM-dd')) } } @@ -174,35 +174,35 @@ class AddAvgpriceBatch { def totalCount = 0; citys.each{city-> - if(city!="全国"){ + if(city!="鍏ㄥ浗"){ def districtKeysMap = CommonDatautils.findAllDistrictKeys(city, "district") println "------------------------------------------------------------" - println "${city}小区量:"+districtKeysMap.size() + println "${city}灏忓尯閲�:"+districtKeysMap.size() if(districtKeysMap){ def lastWeekendStats = queryAllDistrictPriceByWeekend(city, DateUtils.parseFromTightYYYYMMDD("2018-09-09")) - println "【2018-9-9】共计均价小区:"+lastWeekendStats.size() - //库中小区没有计算过均价的小区 + println "銆�2018-9-9銆戝叡璁″潎浠峰皬鍖猴細"+lastWeekendStats.size() + //搴撲腑灏忓尯娌℃湁璁$畻杩囧潎浠风殑灏忓尯 def districtKeys = districtKeysMap.keySet(); def rets1 = findNoCaluteDistrict(districtKeys, lastWeekendStats); - println "【2018-9-9】共 "+rets1.size()+" 个小区无均价" + println "銆�2018-9-9銆戝叡 "+rets1.size()+" 涓皬鍖烘棤鍧囦环" def lastAgoWeekendStats = queryAllDistrictPriceByWeekend(city, DateUtils.parseFromTightYYYYMMDD("2018-09-02")) - println "【2018-9-2】共计均价小区:"+lastAgoWeekendStats.size() - //之前有价,此周无价 + println "銆�2018-9-2銆戝叡璁″潎浠峰皬鍖猴細"+lastAgoWeekendStats.size() + //涔嬪墠鏈変环锛屾鍛ㄦ棤浠� def res2 = findHavePrice(lastAgoWeekendStats, rets1); - println "需补算小区共 " + res2.size() + " 个" + println "闇�琛ョ畻灏忓尯鍏� " + res2.size() + " 涓�" if(res2){ totalCount = totalCount + res2.size() for(def disKey : res2){ def array = disKey.split("##"); def estateType2 = districtKeysMap.get(disKey) - //发重算均价命令 + //鍙戦噸绠楀潎浠峰懡浠� CommonUtils.recalculationAverage(array[0], array[1], array[2], estateType2, 0, new Date()) } } } } } - println "共补:"+totalCount + println "鍏辫ˉ锛�"+totalCount } @@ -211,29 +211,29 @@ class AddAvgpriceBatch { def totalCount = 0; citys.each{city-> - if(city!="全国"){ + if(city!="鍏ㄥ浗"){ def districtKeysMap = CommonDatautils.findAllDistrictKeys(city, "district") println "------------------------------------------------------------" - println "${city}小区量:"+districtKeysMap.size() + println "${city}灏忓尯閲�:"+districtKeysMap.size() if(districtKeysMap){ def lastWeekendStats = queryAllDistrictPriceByWeekend(city, DateUtils.parseFromTightYYYYMMDD("2024-04-07")) - println "【2023-03-26】共计均价小区:"+lastWeekendStats.size() - //库中小区没有计算过均价的小区 + println "銆�2023-03-26銆戝叡璁″潎浠峰皬鍖猴細"+lastWeekendStats.size() + //搴撲腑灏忓尯娌℃湁璁$畻杩囧潎浠风殑灏忓尯 def districtKeys = districtKeysMap.keySet(); def rets1 = findNoCaluteDistrict(districtKeys, lastWeekendStats); - println "【2023-03-26】共 "+rets1.size()+" 个小区无均价" + println "銆�2023-03-26銆戝叡 "+rets1.size()+" 涓皬鍖烘棤鍧囦环" if(rets1){ for(def disKey : rets1){ def array = disKey.split("##"); def estateType2 = districtKeysMap.get(disKey) - //发重算均价命令 + //鍙戦噸绠楀潎浠峰懡浠� addPrice(array[0], array[1], array[2], estateType2, DateUtils.parseFromTightByPattern('2024-03-01','yyyy-MM-dd'),DateUtils.parseFromTightByPattern('2024-04-07','yyyy-MM-dd')) } } } } } - println "共补:"+totalCount + println "鍏辫ˉ锛�"+totalCount } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/AddDataFromExcel.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/AddDataFromExcel.groovy index 411969244..b6c7a09d6 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/AddDataFromExcel.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/AddDataFromExcel.groovy @@ -15,7 +15,7 @@ import java.util.regex.Pattern class AddDataFromExcel { - def codeMap = ["北京": "131", "天津": "332", "石家庄": "150", "唐山": "265", "秦皇岛": "148", "邯郸": "151", "邢台": "266", "保定": "307", "张家口": "264", "承德": "207", "沧州": "149", "廊坊": "191", "衡水": "208", "太原": "176", "大同": "355", "阳泉": "357", "长治": "356", "晋城": "290", "朔州": "237", "晋中": "238", "运城": "328", "忻州": "367", "临汾": "368", "吕梁": "327", "呼和浩特": "321", "包头": "229", "乌海": "123", "赤峰": "297", "通辽": "64", "鄂尔多斯": "283", "呼伦贝尔": "61", "巴彦淖尔": "169", "乌兰察布": "168", "兴安盟": "62", "锡林郭勒盟": "63", "阿拉善盟": "230", "沈阳": "58", "大连": "167", "鞍山": "320", "抚顺": "184", "本溪": "227", "丹东": "282", "锦州": "166", "营口": "281", "阜新": "59", "辽阳": "351", "盘锦": "228", "铁岭": "60", "朝阳": "280", "葫芦岛": "319", "长春": "53", "吉林市": "55", "四平": "56", "辽源": "183", "通化": "165", "白山": "57", "松原": "52", "白城": "51", "延边朝鲜族自治州": "54", "哈尔滨": "48", "齐齐哈尔": "41", "鸡西": "46", "鹤岗": "43", "双鸭山": "45", "大庆": "50", "伊春": "40", "佳木斯": "42", "七台河": "47", "牡丹江": "49", "黑河": "39", "绥化": "44", "大兴安岭地区": "38", "上海": "289", "南京": "315", "无锡": "317", "徐州": "316", "常州": "348", "苏州": "224", "南通": "161", "连云港": "347", "淮安": "162", "盐城": "223", "扬州": "346", "镇江": "160", "泰州": "276", "宿迁": "277", "杭州": "179", "宁波": "180", "温州": "178", "嘉兴": "334", "湖州": "294", "绍兴": "293", "金华": "333", "衢州": "243", "舟山": "245", "台州": "244", "丽水": "292", "合肥": "127", "芜湖": "129", "蚌埠": "126", "淮南": "250", "马鞍山": "358", "淮北": "253", "铜陵": "337", "安庆": "130", "黄山": "252", "滁州": "189", "阜阳": "128", "宿州": "370", "巢湖": "251", "六安": "298", "亳州": "188", "池州": "299", "宣城": "190", "福州": "300", "厦门": "194", "莆田": "195", "三明": "254", "泉州": "134", "漳州": "255", "南平": "133", "龙岩": "193", "宁德": "192", "南昌": "163", "景德镇": "225", "萍乡": "350", "九江": "349", "新余": "164", "鹰潭": "279", "赣州": "365", "吉安": "318", "宜春": "278", "抚州": "226", "上饶": "364", "济南": "288", "青岛": "236", "淄博": "354", "枣庄": "172", "东营": "174", "烟台": "326", "潍坊": "287", "济宁": "286", "泰安": "325", "威海": "175", "日照": "173", "莱芜": "124", "临沂": "234", "德州": "372", "聊城": "366", "滨州": "235", "菏泽": "353", "郑州": "268", "开封": "210", "洛阳": "153", "平顶山": "213", "安阳": "267", "鹤壁": "215", "新乡": "152", "焦作": "211", "濮阳": "209", "许昌": "155", "漯河": "344", "三门峡": "212", "南阳": "309", "商丘": "154", "信阳": "214", "周口": "308", "驻马店": "269", "武汉": "218", "黄石": "311", "十堰": "216", "宜昌": "270", "襄阳": "156", "鄂州": "122", "荆门": "217", "孝感": "310", "荆州": "157", "黄冈": "271", "咸宁": "362", "随州": "371", "恩施土家族苗族自治州": "373", "仙桃": "1713", "潜江": "1293", "天门": "2654", "神农架林区": "2734", "长沙": "158", "株洲": "222", "湘潭": "313", "衡阳": "159", "邵阳": "273", "岳阳": "220", "常德": "219", "张家界": "312", "益阳": "272", "郴州": "275", "永州": "314", "怀化": "363", "娄底": "221", "湘西土家族苗族自治州": "274", "广州": "257", "韶关": "137", "深圳": "340", "珠海": "140", "汕头": "303", "佛山": "138", "江门": "302", "湛江": "198", "茂名": "139", "肇庆": "338", "惠州": "301", "梅州": "141", "汕尾": "339", "河源": "200", "阳江": "199", "清远": "197", "东莞": "119", "中山": "187", "潮州": "201", "揭阳": "259", "云浮": "258", "南宁": "261", "柳州": "305", "桂林": "142", "梧州": "304", "北海": "295", "防城港": "204", "钦州": "145", "贵港": "341", "玉林": "361", "百色": "203", "贺州": "260", "河池": "143", "来宾": "202", "崇左": "144", "海口": "125", "三亚": "121", "五指山": "1644", "琼海": "2358", "儋州": "1215", "文昌": "2758", "万宁": "1216", "东方": "2634", "定安": "1214", "屯昌": "1641", "澄迈": "2757", "临高": "2033", "白沙黎族自治": "2359", "昌江黎族自治": "1642", "乐东黎族自治": "2032", "陵水黎族自治": "1643", "保亭黎族苗族自治": "1217", "琼中黎族苗族自治": "2031", "重庆": "132", "成都": "75", "自贡": "78", "攀枝花": "81", "泸州": "331", "德阳": "74", "绵阳": "240", "广元": "329", "遂宁": "330", "内江": "248", "乐山": "79", "南充": "291", "眉山": "77", "宜宾": "186", "广安": "241", "达州": "369", "雅安": "76", "巴中": "239", "资阳": "242", "阿坝藏族羌族自治州": "185", "甘孜藏族自治州": "73", "凉山彝族自治州": "80", "贵阳": "146", "六盘水": "147", "遵义": "262", "安顺": "263", "铜仁地区": "205", "黔西南布依族苗族自治州": "343", "毕节地区": "206", "黔东南苗族侗族自治州": "342", "黔南布依族苗族自治州": "306", "昆明": "104", "曲靖": "249", "玉溪": "106", "保山": "112", "昭通": "336", "丽江": "114", "临沧": "110", "楚雄彝族自治州": "105", "红河哈尼族彝族自治州": "107", "文山壮族苗族自治州": "177", "普洱": "108", "西双版纳傣族自治州": "109", "大理白族自治州": "111", "德宏傣族景颇族自治州": "116", "怒江傈僳族自治州": "113", "迪庆藏族自治州": "115", "拉萨": "100", "昌都地区": "99", "山南地区": "97", "日喀则地区": "102", "那曲地区": "101", "阿里地区": "103", "林芝地区": "98", "西安": "233", "铜川": "232", "宝鸡": "171", "咸阳": "323", "渭南": "170", "延安": "284", "汉中": "352", "榆林": "231", "安康": "324", "商洛": "285", "兰州": "36", "嘉峪关": "33", "金昌": "34", "白银": "35", "天水": "196", "武威": "118", "张掖": "117", "平凉": "359", "酒泉": "37", "庆阳": "135", "定西": "136", "陇南": "256", "临夏回族自治州": "182", "甘南藏族自治州": "247", "西宁": "66", "海东地区": "69", "海北藏族自治州": "67", "黄南藏族自治州": "70", "海南藏族自治州": "68", "果洛藏族自治州": "72", "玉树藏族自治州": "71", "海西蒙古族藏族自治州": "65", "银川": "360", "石嘴山": "335", "吴忠": "322", "固原": "246", "中卫": "181", "乌鲁木齐": "92", "克拉玛依": "95", "吐鲁番地区": "89", "哈密地区": "91", "昌吉回族自治州": "93", "博尔塔拉蒙古自治州": "88", "巴音郭楞蒙古自治州": "86", "阿克苏地区": "85", "克孜勒苏柯尔克孜自治州": "84", "喀什地区": "83", "和田地区": "82", "伊犁哈萨克自治州": "90", "塔城地区": "94", "阿勒泰地区": "96", "石河子": "770", "阿拉尔": "731", "图木舒克": "792", "五家渠": "789", "香港特别行政区": "2912", "澳门特别行政区": "2911"] + def codeMap = ["鍖椾含": "131", "澶╂触": "332", "鐭冲搴�": "150", "鍞愬北": "265", "绉︾殗宀�": "148", "閭兏": "151", "閭㈠彴": "266", "淇濆畾": "307", "寮犲鍙�": "264", "鎵垮痉": "207", "娌у窞": "149", "寤婂潑": "191", "琛℃按": "208", "澶師": "176", "澶у悓": "355", "闃虫硥": "357", "闀挎不": "356", "鏅嬪煄": "290", "鏈斿窞": "237", "鏅嬩腑": "238", "杩愬煄": "328", "蹇诲窞": "367", "涓存本": "368", "鍚曟": "327", "鍛煎拰娴╃壒": "321", "鍖呭ご": "229", "涔屾捣": "123", "璧ゅ嘲": "297", "閫氳窘": "64", "閯傚皵澶氭柉": "283", "鍛间鸡璐濆皵": "61", "宸村溅娣栧皵": "169", "涔屽叞瀵熷竷": "168", "鍏村畨鐩�": "62", "閿℃灄閮嫆鐩�": "63", "闃挎媺鍠勭洘": "230", "娌堥槼": "58", "澶ц繛": "167", "闉嶅北": "320", "鎶氶『": "184", "鏈邯": "227", "涓逛笢": "282", "閿﹀窞": "166", "钀ュ彛": "281", "闃滄柊": "59", "杈介槼": "351", "鐩橀敠": "228", "閾佸箔": "60", "鏈濋槼": "280", "钁姦宀�": "319", "闀挎槬": "53", "鍚夋灄甯�": "55", "鍥涘钩": "56", "杈芥簮": "183", "閫氬寲": "165", "鐧藉北": "57", "鏉惧師": "52", "鐧藉煄": "51", "寤惰竟鏈濋矞鏃忚嚜娌诲窞": "54", "鍝堝皵婊�": "48", "榻愰綈鍝堝皵": "41", "楦¤タ": "46", "楣ゅ矖": "43", "鍙岄腑灞�": "45", "澶у簡": "50", "浼婃槬": "40", "浣虫湪鏂�": "42", "涓冨彴娌�": "47", "鐗′腹姹�": "49", "榛戞渤": "39", "缁ュ寲": "44", "澶у叴瀹夊箔鍦板尯": "38", "涓婃捣": "289", "鍗椾含": "315", "鏃犻敗": "317", "寰愬窞": "316", "甯稿窞": "348", "鑻忓窞": "224", "鍗楅��": "161", "杩炰簯娓�": "347", "娣畨": "162", "鐩愬煄": "223", "鎵窞": "346", "闀囨睙": "160", "娉板窞": "276", "瀹胯縼": "277", "鏉窞": "179", "瀹佹尝": "180", "娓╁窞": "178", "鍢夊叴": "334", "婀栧窞": "294", "缁嶅叴": "293", "閲戝崕": "333", "琛㈠窞": "243", "鑸熷北": "245", "鍙板窞": "244", "涓芥按": "292", "鍚堣偉": "127", "鑺滄箹": "129", "铓屽煚": "126", "娣崡": "250", "椹瀺灞�": "358", "娣寳": "253", "閾滈櫟": "337", "瀹夊簡": "130", "榛勫北": "252", "婊佸窞": "189", "闃滈槼": "128", "瀹垮窞": "370", "宸㈡箹": "251", "鍏畨": "298", "浜冲窞": "188", "姹犲窞": "299", "瀹e煄": "190", "绂忓窞": "300", "鍘﹂棬": "194", "鑾嗙敯": "195", "涓夋槑": "254", "娉夊窞": "134", "婕冲窞": "255", "鍗楀钩": "133", "榫欏博": "193", "瀹佸痉": "192", "鍗楁槍": "163", "鏅痉闀�": "225", "钀嶄埂": "350", "涔濇睙": "349", "鏂颁綑": "164", "楣版江": "279", "璧e窞": "365", "鍚夊畨": "318", "瀹滄槬": "278", "鎶氬窞": "226", "涓婇ザ": "364", "娴庡崡": "288", "闈掑矝": "236", "娣勫崥": "354", "鏋e簞": "172", "涓滆惀": "174", "鐑熷彴": "326", "娼嶅潑": "287", "娴庡畞": "286", "娉板畨": "325", "濞佹捣": "175", "鏃ョ収": "173", "鑾辫姕": "124", "涓存矀": "234", "寰峰窞": "372", "鑱婂煄": "366", "婊ㄥ窞": "235", "鑿忔辰": "353", "閮戝窞": "268", "寮�灏�": "210", "娲涢槼": "153", "骞抽《灞�": "213", "瀹夐槼": "267", "楣ゅ": "215", "鏂颁埂": "152", "鐒︿綔": "211", "婵槼": "209", "璁告槍": "155", "婕渤": "344", "涓夐棬宄�": "212", "鍗楅槼": "309", "鍟嗕笜": "154", "淇¢槼": "214", "鍛ㄥ彛": "308", "椹婚┈搴�": "269", "姝︽眽": "218", "榛勭煶": "311", "鍗佸牥": "216", "瀹滄槍": "270", "瑗勯槼": "156", "閯傚窞": "122", "鑽嗛棬": "217", "瀛濇劅": "310", "鑽嗗窞": "157", "榛勫唸": "271", "鍜稿畞": "362", "闅忓窞": "371", "鎭╂柦鍦熷鏃忚嫍鏃忚嚜娌诲窞": "373", "浠欐": "1713", "娼滄睙": "1293", "澶╅棬": "2654", "绁炲啘鏋舵灄鍖�": "2734", "闀挎矙": "158", "鏍床": "222", "婀樻江": "313", "琛¢槼": "159", "閭甸槼": "273", "宀抽槼": "220", "甯稿痉": "219", "寮犲鐣�": "312", "鐩婇槼": "272", "閮村窞": "275", "姘稿窞": "314", "鎬�鍖�": "363", "濞勫簳": "221", "婀樿タ鍦熷鏃忚嫍鏃忚嚜娌诲窞": "274", "骞垮窞": "257", "闊跺叧": "137", "娣卞湷": "340", "鐝犳捣": "140", "姹曞ご": "303", "浣涘北": "138", "姹熼棬": "302", "婀涙睙": "198", "鑼傚悕": "139", "鑲囧簡": "338", "鎯犲窞": "301", "姊呭窞": "141", "姹曞熬": "339", "娌虫簮": "200", "闃虫睙": "199", "娓呰繙": "197", "涓滆帪": "119", "涓北": "187", "娼窞": "201", "鎻槼": "259", "浜戞诞": "258", "鍗楀畞": "261", "鏌冲窞": "305", "妗傛灄": "142", "姊у窞": "304", "鍖楁捣": "295", "闃插煄娓�": "204", "閽﹀窞": "145", "璐垫腐": "341", "鐜夋灄": "361", "鐧捐壊": "203", "璐哄窞": "260", "娌虫睜": "143", "鏉ュ": "202", "宕囧乏": "144", "娴峰彛": "125", "涓変簹": "121", "浜旀寚灞�": "1644", "鐞兼捣": "2358", "鍎嬪窞": "1215", "鏂囨槍": "2758", "涓囧畞": "1216", "涓滄柟": "2634", "瀹氬畨": "1214", "灞槍": "1641", "婢勮繄": "2757", "涓撮珮": "2033", "鐧芥矙榛庢棌鑷不": "2359", "鏄屾睙榛庢棌鑷不": "1642", "涔愪笢榛庢棌鑷不": "2032", "闄垫按榛庢棌鑷不": "1643", "淇濅涵榛庢棌鑻楁棌鑷不": "1217", "鐞间腑榛庢棌鑻楁棌鑷不": "2031", "閲嶅簡": "132", "鎴愰兘": "75", "鑷础": "78", "鏀�鏋濊姳": "81", "娉稿窞": "331", "寰烽槼": "74", "缁甸槼": "240", "骞垮厓": "329", "閬傚畞": "330", "鍐呮睙": "248", "涔愬北": "79", "鍗楀厖": "291", "鐪夊北": "77", "瀹滃": "186", "骞垮畨": "241", "杈惧窞": "369", "闆呭畨": "76", "宸翠腑": "239", "璧勯槼": "242", "闃垮潩钘忔棌缇屾棌鑷不宸�": "185", "鐢樺瓬钘忔棌鑷不宸�": "73", "鍑夊北褰濇棌鑷不宸�": "80", "璐甸槼": "146", "鍏洏姘�": "147", "閬典箟": "262", "瀹夐『": "263", "閾滀粊鍦板尯": "205", "榛旇タ鍗楀竷渚濇棌鑻楁棌鑷不宸�": "343", "姣曡妭鍦板尯": "206", "榛斾笢鍗楄嫍鏃忎緱鏃忚嚜娌诲窞": "342", "榛斿崡甯冧緷鏃忚嫍鏃忚嚜娌诲窞": "306", "鏄嗘槑": "104", "鏇查潠": "249", "鐜夋邯": "106", "淇濆北": "112", "鏄��": "336", "涓芥睙": "114", "涓存钵": "110", "妤氶泟褰濇棌鑷不宸�": "105", "绾㈡渤鍝堝凹鏃忓綕鏃忚嚜娌诲窞": "107", "鏂囧北澹棌鑻楁棌鑷不宸�": "177", "鏅幢": "108", "瑗垮弻鐗堢撼鍌f棌鑷不宸�": "109", "澶х悊鐧芥棌鑷不宸�": "111", "寰峰畯鍌f棌鏅鏃忚嚜娌诲窞": "116", "鎬掓睙鍌堝兂鏃忚嚜娌诲窞": "113", "杩簡钘忔棌鑷不宸�": "115", "鎷夎惃": "100", "鏄岄兘鍦板尯": "99", "灞卞崡鍦板尯": "97", "鏃ュ杸鍒欏湴鍖�": "102", "閭f洸鍦板尯": "101", "闃块噷鍦板尯": "103", "鏋楄姖鍦板尯": "98", "瑗垮畨": "233", "閾滃窛": "232", "瀹濋浮": "171", "鍜搁槼": "323", "娓崡": "170", "寤跺畨": "284", "姹変腑": "352", "姒嗘灄": "231", "瀹夊悍": "324", "鍟嗘礇": "285", "鍏板窞": "36", "鍢夊唱鍏�": "33", "閲戞槍": "34", "鐧介摱": "35", "澶╂按": "196", "姝﹀▉": "118", "寮犳帠": "117", "骞冲噳": "359", "閰掓硥": "37", "搴嗛槼": "135", "瀹氳タ": "136", "闄囧崡": "256", "涓村鍥炴棌鑷不宸�": "182", "鐢樺崡钘忔棌鑷不宸�": "247", "瑗垮畞": "66", "娴蜂笢鍦板尯": "69", "娴峰寳钘忔棌鑷不宸�": "67", "榛勫崡钘忔棌鑷不宸�": "70", "娴峰崡钘忔棌鑷不宸�": "68", "鏋滄礇钘忔棌鑷不宸�": "72", "鐜夋爲钘忔棌鑷不宸�": "71", "娴疯タ钂欏彜鏃忚棌鏃忚嚜娌诲窞": "65", "閾跺窛": "360", "鐭冲槾灞�": "335", "鍚村繝": "322", "鍥哄師": "246", "涓崼": "181", "涔岄瞾鏈ㄩ綈": "92", "鍏嬫媺鐜涗緷": "95", "鍚愰瞾鐣湴鍖�": "89", "鍝堝瘑鍦板尯": "91", "鏄屽悏鍥炴棌鑷不宸�": "93", "鍗氬皵濉旀媺钂欏彜鑷不宸�": "88", "宸撮煶閮钂欏彜鑷不宸�": "86", "闃垮厠鑻忓湴鍖�": "85", "鍏嬪瓬鍕掕嫃鏌皵鍏嬪瓬鑷不宸�": "84", "鍠�浠�鍦板尯": "83", "鍜岀敯鍦板尯": "82", "浼婄妬鍝堣惃鍏嬭嚜娌诲窞": "90", "濉斿煄鍦板尯": "94", "闃垮嫆娉板湴鍖�": "96", "鐭虫渤瀛�": "770", "闃挎媺灏�": "731", "鍥炬湪鑸掑厠": "792", "浜斿娓�": "789", "棣欐腐鐗瑰埆琛屾斂鍖�": "2912", "婢抽棬鐗瑰埆琛屾斂鍖�": "2911"] static main(args) { @@ -23,12 +23,12 @@ class AddDataFromExcel { task.run(); } def run(){ - def datas = ExcelUtils.read("d:\\数据\\全国地图数据10-21-1120(测试)(2)(1) - 副本.xlsx", 0, 1) + def datas = ExcelUtils.read("d:\\鏁版嵁\\鍏ㄥ浗鍦板浘鏁版嵁10-21-1120(娴嬭瘯)(2)(1) - 鍓湰.xlsx", 0, 1) def index = 0; for(def data : datas){ def opt = data['AA'] def city = data['T'] - if(city=="上海"){ + if(city=="涓婃捣"){ continue; } def region = data['U'] @@ -39,7 +39,7 @@ class AddDataFromExcel { // println "dddd" // } - if(opt && opt.contains("新增")){ + if(opt && opt.contains("鏂板")){ def q = new BasicDBObject() q.put("city", city) @@ -69,7 +69,7 @@ class AddDataFromExcel { dbo.c_date = new Date() dbo.m_date = new Date() def markMap = [:] - markMap.put("data_source", "机器入库") + markMap.put("data_source", "鏈哄櫒鍏ュ簱") dbo.mark_map = markMap def mapList = OpenApiUtils.getGaoDeSearchLocation(city, region, name) @@ -129,12 +129,12 @@ class AddDataFromExcel { } def alias = [] -// if(opt.indexOf("名称别名")>-1){ +// if(opt.indexOf("鍚嶇О鍒悕")>-1){ def nameAlias = data['X'] if(nameAlias){ - def c = new String(nameAlias.getBytes("GBK"), "GBK").replace("?", "·"); - if(c.indexOf(",")>-1){ - def arr = c.split(",") + def c = new String(nameAlias.getBytes("GBK"), "GBK").replace("?", "路"); + if(c.indexOf("锛�")>-1){ + def arr = c.split("锛�") for(def s : arr){ alias << s } @@ -149,12 +149,12 @@ class AddDataFromExcel { // def addrAlias = [] -// if(opt.indexOf("地址别名")>-1){ +// if(opt.indexOf("鍦板潃鍒悕")>-1){ def addr_alias = data['Y'] if(addr_alias){ - def c = new String(addr_alias.getBytes("GBK"), "GBK").replace("?", "·"); - if(c.indexOf(",")>-1){ - def arr = c.split(",") + def c = new String(addr_alias.getBytes("GBK"), "GBK").replace("?", "路"); + if(c.indexOf("锛�")>-1){ + def arr = c.split("锛�") for(def s : arr){ addrAlias << s } @@ -172,7 +172,7 @@ class AddDataFromExcel { println "[${index}]"+dbo DbUtils.seaweed.save(dbo); }else{ - println "已存在......"+city+" "+region+" "+name + println "宸插瓨鍦�......"+city+" "+region+" "+name } } } @@ -183,13 +183,13 @@ class AddDataFromExcel { def processHouseholdCount(def household_count, def estateType2){ if(household_count){ household_count = household_count.toInteger() - if(estateType2=="普通住宅" || estateType2=="商住"){ + if(estateType2=="鏅�氫綇瀹�" || estateType2=="鍟嗕綇"){ if(household_count>=50 && household_count<=100000){ return household_count; }else{ return null; } - }else if(estateType2=="别墅"){ + }else if(estateType2=="鍒"){ if(household_count>=20 && household_count<=100000){ return household_count; }else{ @@ -202,10 +202,10 @@ class AddDataFromExcel { def processFinishBuildingDate(def finishBuildingDate){ if(finishBuildingDate){ - Pattern pat1 = Pattern.compile("\\d{4}[年\\-]\\d{2}[月\\-]\\d{2}"); + Pattern pat1 = Pattern.compile("\\d{4}[骞碶\-]\\d{2}[鏈圽\-]\\d{2}"); Matcher matcher1 = pat1.matcher(finishBuildingDate); - Pattern pat2 = Pattern.compile("\\d{4}[年\\-]\\d{2}"); + Pattern pat2 = Pattern.compile("\\d{4}[骞碶\-]\\d{2}"); def matcher2 = pat2.matcher(finishBuildingDate); Pattern pat3 = Pattern.compile("\\d{4}"); @@ -225,12 +225,12 @@ class AddDataFromExcel { def processEstateCharge(def city, def estateCharege, def estateType2){ if(estateCharege){ try{ - if(estateCharege.indexOf("元")>-1){ - estateCharege = estateCharege.toString().substring(0, estateCharege.toString().indexOf("元")) + if(estateCharege.indexOf("鍏�")>-1){ + estateCharege = estateCharege.toString().substring(0, estateCharege.toString().indexOf("鍏�")) } estateCharege = estateCharege.toDouble() - if(estateType2=="普通住宅"){ - if(city=="上海"){ + if(estateType2=="鏅�氫綇瀹�"){ + if(city=="涓婃捣"){ if(estateCharege>=0.6 && estateCharege<=3.5){ return estateCharege.toString() }else{ @@ -243,13 +243,13 @@ class AddDataFromExcel { return null; } } - }else if(estateType2=="别墅"){ + }else if(estateType2=="鍒"){ if(estateCharege>=3){ return estateCharege.toString(); }else{ return null; } - }else if(estateType2=="商住"){ + }else if(estateType2=="鍟嗕綇"){ if(estateCharege>=4){ return estateCharege.toString(); }else{ @@ -257,7 +257,7 @@ class AddDataFromExcel { } } }catch (Exception e){ - println "estateCharege 转不了 "+estateCharege.toString() + println "estateCharege 杞笉浜� "+estateCharege.toString() } } return estateCharege; @@ -317,7 +317,7 @@ class AddDataFromExcel { def source = hits[0].get("_source") location = source.location }else{ - println "查找经纬度有问题......"+hits.size() + println "鏌ユ壘缁忕含搴︽湁闂......"+hits.size() } } if(location){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/AddDataTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/AddDataTest.groovy index cd585f8d8..1c8ed405b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/AddDataTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/AddDataTest.groovy @@ -17,18 +17,18 @@ class AddDataTest { def run(){ - def city = "上海"; + def city = "涓婃捣"; def regionMap = CommonDatautils.getRegionsByCity(city); cityRegionMap.put(city, regionMap); def index = 1; - ExcelUtils.modify("D:\\logs\\新潮上海公司楼盘列表匹配(需入库).xlsx", { List row -> + ExcelUtils.modify("D:\\logs\\鏂版疆涓婃捣鍏徃妤肩洏鍒楄〃鍖归厤(闇�鍏ュ簱).xlsx", { List row -> def region = row['D']; def name = row['G']; def address = row['K'] - name = name.toString().replace("(","").replace(")","") + name = name.toString().replace("锛�","").replace("锛�","") def standardRegion = getStandardRegion(city, region); - if(name.indexOf("城花新区")>-1){ + if(name.indexOf("鍩庤姳鏂板尯")>-1){ println "seeee" } if(standardRegion){ @@ -52,10 +52,10 @@ class AddDataTest { row["R"] = obj.name println index +" "+row["M"]+" "+row["N"]+" "+row["O"]+" "+row["P"]+" "+row["Q"] }else{ - println index + " "+ region+" "+name+" 没有找到该小区" + println index + " "+ region+" "+name+" 娌℃湁鎵惧埌璇ュ皬鍖�" } }else{ - println index + " "+ region+" 区域没有标准化出来" + println index + " "+ region+" 鍖哄煙娌℃湁鏍囧噯鍖栧嚭鏉�" } index++; @@ -73,7 +73,7 @@ class AddDataTest { } if(ret){ if(ret.size()>=2){ - println name +" 找到多个相似" + println name +" 鎵惧埌澶氫釜鐩镐技" } for(def temp : ret){ def tempName = temp.name; @@ -84,7 +84,7 @@ class AddDataTest { obj = temp; } if(obj){ - println name +" 通过关键词找到相似" + println name +" 閫氳繃鍏抽敭璇嶆壘鍒扮浉浼�" break; } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/AddDistrictBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/AddDistrictBatch.groovy index 989952755..740cc5865 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/AddDistrictBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/AddDistrictBatch.groovy @@ -19,11 +19,11 @@ class AddDistrictBatch { task.run(); } def run(){ - def datas = ExcelUtils.read("d:\\数据\\中山小区数据.xlsx", 0, 1) + def datas = ExcelUtils.read("d:\\鏁版嵁\\涓北灏忓尯鏁版嵁.xlsx", 0, 1) def index = 0; for(def data : datas){ def opt = data['U'] - if(opt && opt.contains("新增")){ + if(opt && opt.contains("鏂板")){ index++; def city = data['P'] def region = data['Q'] @@ -128,9 +128,9 @@ class AddDistrictBatch { dbo.lng3 = glng def alias = null - if(opt.indexOf("名称别名")>-1){ + if(opt.indexOf("鍚嶇О鍒悕")>-1){ def aias = data['D'] - def c = new String(aias.getBytes("GBK"), "GBK").replace("?", "·"); + def c = new String(aias.getBytes("GBK"), "GBK").replace("?", "路"); alias = [] alias << c } @@ -162,9 +162,9 @@ class AddDistrictBatch { dbo.m_date = new Date() def alias = null - if(opt.indexOf("名称别名")>-1){ + if(opt.indexOf("鍚嶇О鍒悕")>-1){ def aias = data['D'] - def c = new String(aias.getBytes("GBK"), "GBK").replace("?", "·"); + def c = new String(aias.getBytes("GBK"), "GBK").replace("?", "路"); if(obj.alias && !obj.alias.contains(c)){ obj.alias << c dbo.alias = obj.alias; @@ -176,7 +176,7 @@ class AddDistrictBatch { } DbUtils.seaweed.update(q, new BasicDBObject('$set',dbo)) }else{ - println "已存在......" + println "宸插瓨鍦�......" } } } @@ -187,13 +187,13 @@ class AddDistrictBatch { def processHouseholdCount(def household_count, def estateType2){ if(household_count){ household_count = household_count.toInteger() - if(estateType2=="普通住宅" || estateType2=="商住"){ + if(estateType2=="鏅�氫綇瀹�" || estateType2=="鍟嗕綇"){ if(household_count>=50 && household_count<=100000){ return household_count; }else{ return null; } - }else if(estateType2=="别墅"){ + }else if(estateType2=="鍒"){ if(household_count>=20 && household_count<=100000){ return household_count; }else{ @@ -206,10 +206,10 @@ class AddDistrictBatch { def processFinishBuildingDate(def finishBuildingDate){ if(finishBuildingDate){ - Pattern pat1 = Pattern.compile("\\d{4}[年\\-]\\d{2}[月\\-]\\d{2}"); + Pattern pat1 = Pattern.compile("\\d{4}[骞碶\-]\\d{2}[鏈圽\-]\\d{2}"); Matcher matcher1 = pat1.matcher(finishBuildingDate); - Pattern pat2 = Pattern.compile("\\d{4}[年\\-]\\d{2}"); + Pattern pat2 = Pattern.compile("\\d{4}[骞碶\-]\\d{2}"); def matcher2 = pat2.matcher(finishBuildingDate); Pattern pat3 = Pattern.compile("\\d{4}"); @@ -229,12 +229,12 @@ class AddDistrictBatch { def processEstateCharge(def city, def estateCharege, def estateType2){ if(estateCharege){ try{ - if(estateCharege.indexOf("元")>-1){ - estateCharege = estateCharege.toString().substring(0, estateCharege.toString().indexOf("元")) + if(estateCharege.indexOf("鍏�")>-1){ + estateCharege = estateCharege.toString().substring(0, estateCharege.toString().indexOf("鍏�")) } estateCharege = estateCharege.toDouble() - if(estateType2=="普通住宅"){ - if(city=="上海"){ + if(estateType2=="鏅�氫綇瀹�"){ + if(city=="涓婃捣"){ if(estateCharege>=0.6 && estateCharege<=3.5){ return estateCharege.toString() }else{ @@ -247,13 +247,13 @@ class AddDistrictBatch { return null; } } - }else if(estateType2=="别墅"){ + }else if(estateType2=="鍒"){ if(estateCharege>=3){ return estateCharege.toString(); }else{ return null; } - }else if(estateType2=="商住"){ + }else if(estateType2=="鍟嗕綇"){ if(estateCharege>=4){ return estateCharege.toString(); }else{ @@ -261,7 +261,7 @@ class AddDistrictBatch { } } }catch (Exception e){ - println "estateCharege 转不了 "+estateCharege.toString() + println "estateCharege 杞笉浜� "+estateCharege.toString() } } return estateCharege; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/AddDistrictCq.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/AddDistrictCq.groovy index 98581ed18..82e753f2a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/AddDistrictCq.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/AddDistrictCq.groovy @@ -15,11 +15,11 @@ class AddDistrictCq { task.run(); } def run() { - def datas = ExcelUtils.read("d:\\数据\\兴业银行需入库数据.xlsx", 0, 1) + def datas = ExcelUtils.read("d:\\鏁版嵁\\鍏翠笟閾惰闇�鍏ュ簱鏁版嵁.xlsx", 0, 1) def index = 0; for (def data : datas) { def opt = data['O'] - if(opt && opt.indexOf("新增")>-1){ + if(opt && opt.indexOf("鏂板")>-1){ index++ def city = data['J'] def region = data['K'] @@ -59,15 +59,15 @@ class AddDistrictCq { dbo.m_date = new Date() def markMap = [:] - markMap.put("data_source", "机器入库") + markMap.put("data_source", "鏈哄櫒鍏ュ簱") dbo.mark_map = markMap dbo = getLocations(city, dbo); // def alias = [] // if(nameAlias){ -// def c = new String(nameAlias.getBytes("GBK"), "GBK").replace("?", "·"); -// if(c.indexOf(",")>-1){ -// def arr = c.split(",") +// def c = new String(nameAlias.getBytes("GBK"), "GBK").replace("?", "路"); +// if(c.indexOf("锛�")>-1){ +// def arr = c.split("锛�") // for(def s : arr){ // alias << s // } @@ -89,7 +89,7 @@ class AddDistrictCq { println "[${index}]"+dbo DbUtils.seaweed.save(dbo); }else{ - println name+" 已存在" + println name+" 宸插瓨鍦�" } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/AddDistrictTemp.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/AddDistrictTemp.groovy index 94442053c..a19d18889 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/AddDistrictTemp.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/AddDistrictTemp.groovy @@ -12,7 +12,7 @@ class AddDistrictTemp { task.run(); } def run() { - def datas = ExcelUtils.read("D:\\数据\\小区\\新增小区.xlsx", 0, 1) + def datas = ExcelUtils.read("D:\\鏁版嵁\\灏忓尯\\鏂板灏忓尯.xlsx", 0, 1) def index = 0 for (def d : datas) { index ++ @@ -28,7 +28,7 @@ class AddDistrictTemp { dbo.region = d['B']; dbo.name = d['C'] dbo.address = d['F'] - dbo.estate_type2 = "普通住宅" + dbo.estate_type2 = "鏅�氫綇瀹�" dbo.status = 0; dbo.cat ="district" dbo.name_cat = 0 @@ -36,10 +36,10 @@ class AddDistrictTemp { dbo.m_date = new Date() def markMap = [:] - markMap.put("data_source", "机器入库") + markMap.put("data_source", "鏈哄櫒鍏ュ簱") dbo.mark_map = markMap - // 高德转百度 + // 楂樺痉杞櫨搴� def baidu = BaiDuApiUtils.geoconv(d['G'].toString().toDouble(), d['H'].toString().toDouble(), 3) def lng2 = baidu.x def lat2 = baidu.y @@ -68,7 +68,7 @@ class AddDistrictTemp { println "[${index}]"+dbo DbUtils.seaweed.save(dbo); }else{ - println d['C']+" 已存在" + println d['C']+" 宸插瓨鍦�" } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/AddEsHouseField.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/AddEsHouseField.groovy index 9af2b800d..ae51dbbc4 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/AddEsHouseField.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/AddEsHouseField.groovy @@ -25,7 +25,7 @@ class AddEsHouseField { task.run() } def run(){ - def houseMap = findHouseSource("福州", 20200101, "lianjia.com"); + def houseMap = findHouseSource("绂忓窞", 20200101, "lianjia.com"); def index = 0 houseMap.each {k,v-> def arrs = k.split("#") @@ -53,21 +53,21 @@ class AddEsHouseField { if(build_structures){ def rets = [] for(def build_structure : build_structures){ - if(build_structure.indexOf("砖木")>-1){ - rets << "砖木结构" + if(build_structure.indexOf("鐮栨湪")>-1){ + rets << "鐮栨湪缁撴瀯" } - if(build_structure.indexOf("钢结构")>-1){ - rets << "钢结构"; + if(build_structure.indexOf("閽㈢粨鏋�")>-1){ + rets << "閽㈢粨鏋�"; } - if(build_structure.indexOf("钢、钢筋混凝土")>-1){ - rets << "钢、钢筋混凝土结构"; + if(build_structure.indexOf("閽€�侀挗绛嬫贩鍑濆湡")>-1){ + rets << "閽€�侀挗绛嬫贩鍑濆湡缁撴瀯"; } - if(build_structure.indexOf("钢筋混凝土")>-1 ||build_structure.indexOf("钢混")>-1 || build_structure.indexOf("框架")>-1 || build_structure.indexOf("剪力墙结构")>-1 ){ - rets << "钢筋混凝土结构"; + if(build_structure.indexOf("閽㈢瓔娣峰嚌鍦�")>-1 ||build_structure.indexOf("閽㈡贩")>-1 || build_structure.indexOf("妗嗘灦")>-1 || build_structure.indexOf("鍓姏澧欑粨鏋�")>-1 ){ + rets << "閽㈢瓔娣峰嚌鍦熺粨鏋�"; } - if(build_structure.indexOf("混合")>-1 || build_structure.indexOf("板楼")>-1 || build_structure.indexOf("砖混")>-1){ - rets << "混合结构"; + if(build_structure.indexOf("娣峰悎")>-1 || build_structure.indexOf("鏉挎ゼ")>-1 || build_structure.indexOf("鐮栨贩")>-1){ + rets << "娣峰悎缁撴瀯"; } } rets.unique() diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/AddThirdPriceDistrict.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/AddThirdPriceDistrict.groovy index 579e0710e..4a6330207 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/AddThirdPriceDistrict.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/AddThirdPriceDistrict.groovy @@ -26,41 +26,41 @@ class AddThirdPriceDistrict { def matchErrorLogColl = CrawalDBUtil.getMatchErrorLogCol(); def thirdPartyColl = CrawalDBUtil.getThirdPartyCol(); - def codeMap = ["北京": "131", "天津": "332", "石家庄": "150", "唐山": "265", "秦皇岛": "148", "邯郸": "151", "邢台": "266", "保定": "307", "张家口": "264", "承德": "207", "沧州": "149", "廊坊": "191", "衡水": "208", "太原": "176", "大同": "355", "阳泉": "357", "长治": "356", "晋城": "290", "朔州": "237", "晋中": "238", "运城": "328", "忻州": "367", "临汾": "368", "吕梁": "327", "呼和浩特": "321", "包头": "229", "乌海": "123", "赤峰": "297", "通辽": "64", "鄂尔多斯": "283", "呼伦贝尔": "61", "巴彦淖尔": "169", "乌兰察布": "168", "兴安盟": "62", "锡林郭勒盟": "63", "阿拉善盟": "230", "沈阳": "58", "大连": "167", "鞍山": "320", "抚顺": "184", "本溪": "227", "丹东": "282", "锦州": "166", "营口": "281", "阜新": "59", "辽阳": "351", "盘锦": "228", "铁岭": "60", "朝阳": "280", "葫芦岛": "319", "长春": "53", "吉林市": "55", "四平": "56", "辽源": "183", "通化": "165", "白山": "57", "松原": "52", "白城": "51", "延边朝鲜族自治州": "54", "哈尔滨": "48", "齐齐哈尔": "41", "鸡西": "46", "鹤岗": "43", "双鸭山": "45", "大庆": "50", "伊春": "40", "佳木斯": "42", "七台河": "47", "牡丹江": "49", "黑河": "39", "绥化": "44", "大兴安岭地区": "38", "上海": "289", "南京": "315", "无锡": "317", "徐州": "316", "常州": "348", "苏州": "224", "南通": "161", "连云港": "347", "淮安": "162", "盐城": "223", "扬州": "346", "镇江": "160", "泰州": "276", "宿迁": "277", "杭州": "179", "宁波": "180", "温州": "178", "嘉兴": "334", "湖州": "294", "绍兴": "293", "金华": "333", "衢州": "243", "舟山": "245", "台州": "244", "丽水": "292", "合肥": "127", "芜湖": "129", "蚌埠": "126", "淮南": "250", "马鞍山": "358", "淮北": "253", "铜陵": "337", "安庆": "130", "黄山": "252", "滁州": "189", "阜阳": "128", "宿州": "370", "巢湖": "251", "六安": "298", "亳州": "188", "池州": "299", "宣城": "190", "福州": "300", "厦门": "194", "莆田": "195", "三明": "254", "泉州": "134", "漳州": "255", "南平": "133", "龙岩": "193", "宁德": "192", "南昌": "163", "景德镇": "225", "萍乡": "350", "九江": "349", "新余": "164", "鹰潭": "279", "赣州": "365", "吉安": "318", "宜春": "278", "抚州": "226", "上饶": "364", "济南": "288", "青岛": "236", "淄博": "354", "枣庄": "172", "东营": "174", "烟台": "326", "潍坊": "287", "济宁": "286", "泰安": "325", "威海": "175", "日照": "173", "莱芜": "124", "临沂": "234", "德州": "372", "聊城": "366", "滨州": "235", "菏泽": "353", "郑州": "268", "开封": "210", "洛阳": "153", "平顶山": "213", "安阳": "267", "鹤壁": "215", "新乡": "152", "焦作": "211", "濮阳": "209", "许昌": "155", "漯河": "344", "三门峡": "212", "南阳": "309", "商丘": "154", "信阳": "214", "周口": "308", "驻马店": "269", "武汉": "218", "黄石": "311", "十堰": "216", "宜昌": "270", "襄阳": "156", "鄂州": "122", "荆门": "217", "孝感": "310", "荆州": "157", "黄冈": "271", "咸宁": "362", "随州": "371", "恩施土家族苗族自治州": "373", "仙桃": "1713", "潜江": "1293", "天门": "2654", "神农架林区": "2734", "长沙": "158", "株洲": "222", "湘潭": "313", "衡阳": "159", "邵阳": "273", "岳阳": "220", "常德": "219", "张家界": "312", "益阳": "272", "郴州": "275", "永州": "314", "怀化": "363", "娄底": "221", "湘西土家族苗族自治州": "274", "广州": "257", "韶关": "137", "深圳": "340", "珠海": "140", "汕头": "303", "佛山": "138", "江门": "302", "湛江": "198", "茂名": "139", "肇庆": "338", "惠州": "301", "梅州": "141", "汕尾": "339", "河源": "200", "阳江": "199", "清远": "197", "东莞": "119", "中山": "187", "潮州": "201", "揭阳": "259", "云浮": "258", "南宁": "261", "柳州": "305", "桂林": "142", "梧州": "304", "北海": "295", "防城港": "204", "钦州": "145", "贵港": "341", "玉林": "361", "百色": "203", "贺州": "260", "河池": "143", "来宾": "202", "崇左": "144", "海口": "125", "三亚": "121", "五指山": "1644", "琼海": "2358", "儋州": "1215", "文昌": "2758", "万宁": "1216", "东方": "2634", "定安": "1214", "屯昌": "1641", "澄迈": "2757", "临高": "2033", "白沙黎族自治": "2359", "昌江黎族自治": "1642", "乐东黎族自治": "2032", "陵水黎族自治": "1643", "保亭黎族苗族自治": "1217", "琼中黎族苗族自治": "2031", "重庆": "132", "成都": "75", "自贡": "78", "攀枝花": "81", "泸州": "331", "德阳": "74", "绵阳": "240", "广元": "329", "遂宁": "330", "内江": "248", "乐山": "79", "南充": "291", "眉山": "77", "宜宾": "186", "广安": "241", "达州": "369", "雅安": "76", "巴中": "239", "资阳": "242", "阿坝藏族羌族自治州": "185", "甘孜藏族自治州": "73", "凉山彝族自治州": "80", "贵阳": "146", "六盘水": "147", "遵义": "262", "安顺": "263", "铜仁地区": "205", "黔西南布依族苗族自治州": "343", "毕节地区": "206", "黔东南苗族侗族自治州": "342", "黔南布依族苗族自治州": "306", "昆明": "104", "曲靖": "249", "玉溪": "106", "保山": "112", "昭通": "336", "丽江": "114", "临沧": "110", "楚雄彝族自治州": "105", "红河哈尼族彝族自治州": "107", "文山壮族苗族自治州": "177", "普洱": "108", "西双版纳傣族自治州": "109", "大理白族自治州": "111", "德宏傣族景颇族自治州": "116", "怒江傈僳族自治州": "113", "迪庆藏族自治州": "115", "拉萨": "100", "昌都地区": "99", "山南地区": "97", "日喀则地区": "102", "那曲地区": "101", "阿里地区": "103", "林芝地区": "98", "西安": "233", "铜川": "232", "宝鸡": "171", "咸阳": "323", "渭南": "170", "延安": "284", "汉中": "352", "榆林": "231", "安康": "324", "商洛": "285", "兰州": "36", "嘉峪关": "33", "金昌": "34", "白银": "35", "天水": "196", "武威": "118", "张掖": "117", "平凉": "359", "酒泉": "37", "庆阳": "135", "定西": "136", "陇南": "256", "临夏回族自治州": "182", "甘南藏族自治州": "247", "西宁": "66", "海东地区": "69", "海北藏族自治州": "67", "黄南藏族自治州": "70", "海南藏族自治州": "68", "果洛藏族自治州": "72", "玉树藏族自治州": "71", "海西蒙古族藏族自治州": "65", "银川": "360", "石嘴山": "335", "吴忠": "322", "固原": "246", "中卫": "181", "乌鲁木齐": "92", "克拉玛依": "95", "吐鲁番地区": "89", "哈密地区": "91", "昌吉回族自治州": "93", "博尔塔拉蒙古自治州": "88", "巴音郭楞蒙古自治州": "86", "阿克苏地区": "85", "克孜勒苏柯尔克孜自治州": "84", "喀什地区": "83", "和田地区": "82", "伊犁哈萨克自治州": "90", "塔城地区": "94", "阿勒泰地区": "96", "石河子": "770", "阿拉尔": "731", "图木舒克": "792", "五家渠": "789", "香港特别行政区": "2912", "澳门特别行政区": "2911"] - def gaodeCityCodeMap = ["北京":"110000","天津":"120000","石家庄":"130100","辛集":"130181","晋州":"130183","新乐":"130184","唐山":"130200","滦州":"130284","遵化":"130281","迁安":"130283","秦皇岛":"130300","邯郸":"130400","武安":"130481","邢台":"130500","南宫":"130581","沙河":"130582","保定":"130600","涿州":"130681","定州":"130682","安国":"130683","高碑店":"130684","张家口":"130700","承德":"130800","平泉":"130881","沧州":"130900","泊头":"130981","任丘":"130982","黄骅":"130983","河间":"130984","廊坊":"131000","霸州":"131081","三河":"131082","衡水":"131100","深州":"131182","太原":"140100","古交":"140181","大同":"140200","阳泉":"140300","长治":"140400","晋城":"140500","高平":"140581","朔州":"140600","怀仁":"140681","晋中":"140700","介休":"140781","运城":"140800","永济":"140881","河津":"140882","忻州":"140900","原平":"140981","临汾":"141000","侯马":"141081","霍州":"141082","吕梁":"141100","孝义":"141181","汾阳":"141182","呼和浩特":"150100","包头":"150200","乌海":"150300","赤峰":"150400","通辽":"150500","霍林郭勒":"150581","鄂尔多斯":"150600","呼伦贝尔":"150700","满洲里":"150781","牙克石":"150782","扎兰屯":"150783","额尔古纳":"150784","根河":"150785","巴彦淖尔":"150800","乌兰察布":"150900","丰镇":"150981","乌兰浩特":"152201","阿尔山":"152202","二连浩特":"152501","锡林浩特":"152502","沈阳":"210100","新民":"210181","大连":"210200","瓦房店":"210281","庄河":"210283","鞍山":"210300","海城":"210381","抚顺":"210400","本溪":"210500","丹东":"210600","东港":"210681","凤城":"210682","锦州":"210700","凌海":"210781","北镇":"210782","营口":"210800","西市区":"210803","盖州":"210881","大石桥":"210882","阜新":"210900","辽阳":"211000","灯塔":"211081","盘锦":"211100","铁岭":"211200","调兵山":"211281","开原":"211282","朝阳":"211300","北票":"211381","凌源":"211382","葫芦岛":"211400","兴城":"211481","长春":"220100","榆树":"220182","德惠":"220183","吉林":"220200","蛟河":"220281","桦甸":"220282","舒兰":"220283","磐石":"220284","四平":"220300","公主岭":"220381","双辽":"220382","辽源":"220400","通化":"220500","梅河口":"220581","集安":"220582","白山":"220600","临江":"220681","松原":"220700","扶余":"220781","白城":"220800","洮南":"220881","大安":"220882","延吉":"222401","图们":"222402","敦化":"222403","珲春":"222404","龙井":"222405","和龙":"222406","哈尔滨":"230100","尚志":"230183","五常":"230184","齐齐哈尔":"230200","讷河":"230281","鸡西":"230300","虎林":"230381","密山":"230382","鹤岗":"230400","双鸭山":"230500","大庆":"230600","伊春":"230700","铁力":"230781","佳木斯":"230800","同江":"230881","富锦":"230882","抚远":"230883","七台河":"230900","牡丹江":"231000","绥芬河":"231081","海林":"231083","宁安":"231084","穆棱":"231085","东宁":"231086","黑河":"231100","北安":"231181","五大连池":"231182","绥化":"231200","安达":"231281","肇东":"231282","海伦":"231283","漠河":"232701","上海":"310000","南京":"320100","无锡":"320200","江阴":"320281","宜兴":"320282","徐州":"320300","新沂":"320381","邳州":"320382","常州":"320400","溧阳":"320481","苏州":"320500","常熟":"320581","张家港":"320582","昆山":"320583","太仓":"320585","南通":"320600","海安":"320685","启东":"320681","如皋":"320682","海门":"320684","连云港":"320700","淮安":"320800","盐城":"320900","东台":"320981","扬州":"321000","仪征":"321081","高邮":"321084","镇江":"321100","丹阳":"321181","扬中":"321182","句容":"321183","泰州":"321200","兴化":"321281","靖江":"321282","泰兴":"321283","宿迁":"321300","杭州":"330100","建德":"330182","宁波":"330200","余姚":"330281","慈溪":"330282","温州":"330300","瑞安":"330381","乐清":"330382","嘉兴":"330400","海宁":"330481","平湖":"330482","桐乡":"330483","湖州":"330500","绍兴":"330600","诸暨":"330681","嵊州":"330683","金华":"330700","兰溪":"330781","义乌":"330782","东阳":"330783","永康":"330784","衢州":"330800","江山":"330881","舟山":"330900","台州":"331000","温岭":"331081","临海":"331082","玉环":"331083","丽水":"331100","龙泉":"331181","合肥":"340100","巢湖":"340181","芜湖":"340200","蚌埠":"340300","淮南":"340400","马鞍山":"340500","淮北":"340600","铜陵":"340700","安庆":"340800","潜山":"340882","桐城":"340881","黄山":"341000","滁州":"341100","天长":"341181","明光":"341182","阜阳":"341200","界首":"341282","宿州":"341300","六安":"341500","亳州":"341600","池州":"341700","宣城":"341800","宁国":"341881","福州":"350100","福清":"350181","厦门":"350200","莆田":"350300","三明":"350400","永安":"350481","泉州":"350500","石狮":"350581","晋江":"350582","南安":"350583","漳州":"350600","龙海":"350681","南平":"350700","邵武":"350781","武夷山":"350782","建瓯":"350783","龙岩":"350800","漳平":"350881","宁德":"350900","福安":"350981","福鼎":"350982","南昌":"360100","景德镇":"360200","乐平":"360281","萍乡":"360300","九江":"360400","瑞昌":"360481","共青城":"360482","庐山":"360483","新余":"360500","鹰潭":"360600","贵溪":"360681","赣州":"360700","瑞金":"360781","吉安":"360800","井冈山":"360881","宜春":"360900","丰城":"360981","樟树":"360982","高安":"360983","抚州":"361000","上饶":"361100","德兴":"361181","济南":"370100","市中区":"370103","青岛":"370200","市南区":"370202","市北区":"370203","胶州":"370281","平度":"370283","莱西":"370285","淄博":"370300","枣庄":"370400","市中区":"370402","滕州":"370481","东营":"370500","烟台":"370600","龙口":"370681","莱阳":"370682","莱州":"370683","蓬莱":"370684","招远":"370685","栖霞":"370686","海阳":"370687","潍坊":"370700","青州":"370781","诸城":"370782","寿光":"370783","安丘":"370784","高密":"370785","昌邑":"370786","济宁":"370800","曲阜":"370881","邹城":"370883","泰安":"370900","新泰":"370982","肥城":"370983","威海":"371000","荣成":"371082","乳山":"371083","日照":"371100","临沂":"371300","德州":"371400","乐陵":"371481","禹城":"371482","聊城":"371500","临清":"371581","滨州":"371600","邹平":"371681","菏泽":"371700","郑州":"410100","巩义":"410181","荥阳":"410182","新密":"410183","新郑":"410184","登封":"410185","开封":"410200","洛阳":"410300","偃师":"410381","平顶山":"410400","舞钢":"410481","汝州":"410482","安阳":"410500","林州":"410581","鹤壁":"410600","新乡":"410700","卫辉":"410781","辉县":"410782","焦作":"410800","沁阳":"410882","孟州":"410883","濮阳":"410900","许昌":"411000","禹州":"411081","长葛":"411082","漯河":"411100","三门峡":"411200","义马":"411281","灵宝":"411282","南阳":"411300","邓州":"411381","商丘":"411400","永城":"411481","信阳":"411500","周口":"411600","项城":"411681","驻马店":"411700","济源":"419001","武汉":"420100","黄石":"420200","大冶":"420281","十堰":"420300","丹江口":"420381","宜昌":"420500","宜都":"420581","当阳":"420582","枝江":"420583","襄阳":"420600","老河口":"420682","枣阳":"420683","宜城":"420684","鄂州":"420700","荆门":"420800","京山":"420882","钟祥":"420881","孝感":"420900","应城":"420981","安陆":"420982","汉川":"420984","荆州":"421000","沙市区":"421002","石首":"421081","洪湖":"421083","松滋":"421087","黄冈":"421100","麻城":"421181","武穴":"421182","咸宁":"421200","赤壁":"421281","随州":"421300","广水":"421381","恩施":"422801","利川":"422802","仙桃":"429004","潜江":"429005","天门":"429006","长沙":"430100","浏阳":"430181","宁乡":"430182","株洲":"430200","醴陵":"430281","湘潭":"430300","湘乡":"430381","韶山":"430382","衡阳":"430400","耒阳":"430481","常宁":"430482","邵阳":"430500","武冈":"430581","岳阳":"430600","汨罗":"430681","临湘":"430682","常德":"430700","津市":"430781","张家界":"430800","益阳":"430900","沅江":"430981","郴州":"431000","资兴":"431081","永州":"431100","怀化":"431200","洪江":"431281","娄底":"431300","冷水江":"431381","涟源":"431382","吉首":"433101","广州":"440100","韶关":"440200","乐昌":"440281","南雄":"440282","深圳":"440300","珠海":"440400","汕头":"440500","佛山":"440600","江门":"440700","台山":"440781","开平":"440783","鹤山":"440784","恩平":"440785","湛江":"440800","廉江":"440881","雷州":"440882","吴川":"440883","茂名":"440900","高州":"440981","化州":"440982","信宜":"440983","肇庆":"441200","四会":"441284","惠州":"441300","梅州":"441400","兴宁":"441481","汕尾":"441500","陆丰":"441581","河源":"441600","阳江":"441700","阳春":"441781","清远":"441800","英德":"441881","连州":"441882","东莞":"441900","中山":"442000","潮州":"445100","揭阳":"445200","普宁":"445281","云浮":"445300","罗定":"445381","南宁":"450100","柳州":"450200","桂林":"450300","荔浦":"450381","梧州":"450400","岑溪":"450481","北海":"450500","防城港":"450600","东兴":"450681","钦州":"450700","贵港":"450800","桂平":"450881","玉林":"450900","北流":"450981","百色":"451000","靖西":"451081","贺州":"451100","河池":"451200","来宾":"451300","合山":"451381","崇左":"451400","凭祥":"451481","海口":"460100","三亚":"460200","三沙":"460300","儋州":"460400","五指山":"469001","琼海":"469002","文昌":"469005","万宁":"469006","东方":"469007","重庆":"500000","重庆市郊县":"500200","成都":"510100","都江堰":"510181","彭州":"510182","邛崃":"510183","崇州":"510184","简阳":"510185","自贡":"510300","攀枝花":"510400","泸州":"510500","德阳":"510600","广汉":"510681","什邡":"510682","绵竹":"510683","绵阳":"510700","江油":"510781","广元":"510800","遂宁":"510900","内江":"511000","市中区":"511002","隆昌":"511083","乐山":"511100","市中区":"511102","峨眉山":"511181","南充":"511300","阆中":"511381","眉山":"511400","宜宾":"511500","广安":"511600","华蓥":"511681","达州":"511700","万源":"511781","雅安":"511800","巴中":"511900","资阳":"512000","马尔康":"513201","康定":"513301","西昌":"513401","贵阳":"520100","清镇":"520181","六盘水":"520200","盘州":"520281","遵义":"520300","赤水":"520381","仁怀":"520382","安顺":"520400","毕节":"520500","铜仁":"520600","兴义":"522301","兴仁":"522302","凯里":"522601","都匀":"522701","福泉":"522702","昆明":"530100","安宁":"530181","曲靖":"530300","宣威":"530381","玉溪":"530400","保山":"530500","腾冲":"530581","昭通":"530600","水富":"530681","丽江":"530700","普洱":"530800","临沧":"530900","楚雄":"532301","个旧":"532501","开远":"532502","蒙自":"532503","弥勒":"532504","文山":"532601","景洪":"532801","大理":"532901","瑞丽":"533102","芒":"533103","泸水":"533301","香格里拉":"533401","拉萨":"540100","日喀则":"540200","昌都":"540300","林芝":"540400","山南":"540500","那曲":"540600","西安":"610100","铜川":"610200","宝鸡":"610300","咸阳":"610400","彬州":"610482","兴平":"610481","渭南":"610500","韩城":"610581","华阴":"610582","延安":"610600","汉中":"610700","榆林":"610800","神木":"610881","安康":"610900","商洛":"611000","兰州":"620100","嘉峪关":"620200","金昌":"620300","白银":"620400","天水":"620500","武威":"620600","张掖":"620700","平凉":"620800","华亭":"620881","酒泉":"620900","玉门":"620981","敦煌":"620982","庆阳":"621000","定西":"621100","陇南":"621200","临夏":"622901","合作":"623001","西宁":"630100","海东":"630200","玉树":"632701","格尔木":"632801","德令哈":"632802","茫崖":"632803","银川":"640100","灵武":"640181","石嘴山":"640200","吴忠":"640300","青铜峡":"640381","固原":"640400","中卫":"640500","乌鲁木齐":"650100","新市区":"650104","克拉玛依":"650200","吐鲁番":"650400","哈密":"650500","昌吉":"652301","阜康":"652302","博乐":"652701","阿拉山口":"652702","库尔勒":"652801","阿克苏":"652901","阿图什":"653001","喀什":"653101","和田":"653201","伊宁":"654002","奎屯":"654003","霍尔果斯":"654004","塔城":"654201","乌苏":"654202","阿勒泰":"654301","石河子":"659001","阿拉尔":"659002","图木舒克":"659003","五家渠":"659004","北屯":"659005","铁门关":"659006","双河":"659007","可克达拉":"659008","昆玉":"659009","伊犁":"654000"] + def codeMap = ["鍖椾含": "131", "澶╂触": "332", "鐭冲搴�": "150", "鍞愬北": "265", "绉︾殗宀�": "148", "閭兏": "151", "閭㈠彴": "266", "淇濆畾": "307", "寮犲鍙�": "264", "鎵垮痉": "207", "娌у窞": "149", "寤婂潑": "191", "琛℃按": "208", "澶師": "176", "澶у悓": "355", "闃虫硥": "357", "闀挎不": "356", "鏅嬪煄": "290", "鏈斿窞": "237", "鏅嬩腑": "238", "杩愬煄": "328", "蹇诲窞": "367", "涓存本": "368", "鍚曟": "327", "鍛煎拰娴╃壒": "321", "鍖呭ご": "229", "涔屾捣": "123", "璧ゅ嘲": "297", "閫氳窘": "64", "閯傚皵澶氭柉": "283", "鍛间鸡璐濆皵": "61", "宸村溅娣栧皵": "169", "涔屽叞瀵熷竷": "168", "鍏村畨鐩�": "62", "閿℃灄閮嫆鐩�": "63", "闃挎媺鍠勭洘": "230", "娌堥槼": "58", "澶ц繛": "167", "闉嶅北": "320", "鎶氶『": "184", "鏈邯": "227", "涓逛笢": "282", "閿﹀窞": "166", "钀ュ彛": "281", "闃滄柊": "59", "杈介槼": "351", "鐩橀敠": "228", "閾佸箔": "60", "鏈濋槼": "280", "钁姦宀�": "319", "闀挎槬": "53", "鍚夋灄甯�": "55", "鍥涘钩": "56", "杈芥簮": "183", "閫氬寲": "165", "鐧藉北": "57", "鏉惧師": "52", "鐧藉煄": "51", "寤惰竟鏈濋矞鏃忚嚜娌诲窞": "54", "鍝堝皵婊�": "48", "榻愰綈鍝堝皵": "41", "楦¤タ": "46", "楣ゅ矖": "43", "鍙岄腑灞�": "45", "澶у簡": "50", "浼婃槬": "40", "浣虫湪鏂�": "42", "涓冨彴娌�": "47", "鐗′腹姹�": "49", "榛戞渤": "39", "缁ュ寲": "44", "澶у叴瀹夊箔鍦板尯": "38", "涓婃捣": "289", "鍗椾含": "315", "鏃犻敗": "317", "寰愬窞": "316", "甯稿窞": "348", "鑻忓窞": "224", "鍗楅��": "161", "杩炰簯娓�": "347", "娣畨": "162", "鐩愬煄": "223", "鎵窞": "346", "闀囨睙": "160", "娉板窞": "276", "瀹胯縼": "277", "鏉窞": "179", "瀹佹尝": "180", "娓╁窞": "178", "鍢夊叴": "334", "婀栧窞": "294", "缁嶅叴": "293", "閲戝崕": "333", "琛㈠窞": "243", "鑸熷北": "245", "鍙板窞": "244", "涓芥按": "292", "鍚堣偉": "127", "鑺滄箹": "129", "铓屽煚": "126", "娣崡": "250", "椹瀺灞�": "358", "娣寳": "253", "閾滈櫟": "337", "瀹夊簡": "130", "榛勫北": "252", "婊佸窞": "189", "闃滈槼": "128", "瀹垮窞": "370", "宸㈡箹": "251", "鍏畨": "298", "浜冲窞": "188", "姹犲窞": "299", "瀹e煄": "190", "绂忓窞": "300", "鍘﹂棬": "194", "鑾嗙敯": "195", "涓夋槑": "254", "娉夊窞": "134", "婕冲窞": "255", "鍗楀钩": "133", "榫欏博": "193", "瀹佸痉": "192", "鍗楁槍": "163", "鏅痉闀�": "225", "钀嶄埂": "350", "涔濇睙": "349", "鏂颁綑": "164", "楣版江": "279", "璧e窞": "365", "鍚夊畨": "318", "瀹滄槬": "278", "鎶氬窞": "226", "涓婇ザ": "364", "娴庡崡": "288", "闈掑矝": "236", "娣勫崥": "354", "鏋e簞": "172", "涓滆惀": "174", "鐑熷彴": "326", "娼嶅潑": "287", "娴庡畞": "286", "娉板畨": "325", "濞佹捣": "175", "鏃ョ収": "173", "鑾辫姕": "124", "涓存矀": "234", "寰峰窞": "372", "鑱婂煄": "366", "婊ㄥ窞": "235", "鑿忔辰": "353", "閮戝窞": "268", "寮�灏�": "210", "娲涢槼": "153", "骞抽《灞�": "213", "瀹夐槼": "267", "楣ゅ": "215", "鏂颁埂": "152", "鐒︿綔": "211", "婵槼": "209", "璁告槍": "155", "婕渤": "344", "涓夐棬宄�": "212", "鍗楅槼": "309", "鍟嗕笜": "154", "淇¢槼": "214", "鍛ㄥ彛": "308", "椹婚┈搴�": "269", "姝︽眽": "218", "榛勭煶": "311", "鍗佸牥": "216", "瀹滄槍": "270", "瑗勯槼": "156", "閯傚窞": "122", "鑽嗛棬": "217", "瀛濇劅": "310", "鑽嗗窞": "157", "榛勫唸": "271", "鍜稿畞": "362", "闅忓窞": "371", "鎭╂柦鍦熷鏃忚嫍鏃忚嚜娌诲窞": "373", "浠欐": "1713", "娼滄睙": "1293", "澶╅棬": "2654", "绁炲啘鏋舵灄鍖�": "2734", "闀挎矙": "158", "鏍床": "222", "婀樻江": "313", "琛¢槼": "159", "閭甸槼": "273", "宀抽槼": "220", "甯稿痉": "219", "寮犲鐣�": "312", "鐩婇槼": "272", "閮村窞": "275", "姘稿窞": "314", "鎬�鍖�": "363", "濞勫簳": "221", "婀樿タ鍦熷鏃忚嫍鏃忚嚜娌诲窞": "274", "骞垮窞": "257", "闊跺叧": "137", "娣卞湷": "340", "鐝犳捣": "140", "姹曞ご": "303", "浣涘北": "138", "姹熼棬": "302", "婀涙睙": "198", "鑼傚悕": "139", "鑲囧簡": "338", "鎯犲窞": "301", "姊呭窞": "141", "姹曞熬": "339", "娌虫簮": "200", "闃虫睙": "199", "娓呰繙": "197", "涓滆帪": "119", "涓北": "187", "娼窞": "201", "鎻槼": "259", "浜戞诞": "258", "鍗楀畞": "261", "鏌冲窞": "305", "妗傛灄": "142", "姊у窞": "304", "鍖楁捣": "295", "闃插煄娓�": "204", "閽﹀窞": "145", "璐垫腐": "341", "鐜夋灄": "361", "鐧捐壊": "203", "璐哄窞": "260", "娌虫睜": "143", "鏉ュ": "202", "宕囧乏": "144", "娴峰彛": "125", "涓変簹": "121", "浜旀寚灞�": "1644", "鐞兼捣": "2358", "鍎嬪窞": "1215", "鏂囨槍": "2758", "涓囧畞": "1216", "涓滄柟": "2634", "瀹氬畨": "1214", "灞槍": "1641", "婢勮繄": "2757", "涓撮珮": "2033", "鐧芥矙榛庢棌鑷不": "2359", "鏄屾睙榛庢棌鑷不": "1642", "涔愪笢榛庢棌鑷不": "2032", "闄垫按榛庢棌鑷不": "1643", "淇濅涵榛庢棌鑻楁棌鑷不": "1217", "鐞间腑榛庢棌鑻楁棌鑷不": "2031", "閲嶅簡": "132", "鎴愰兘": "75", "鑷础": "78", "鏀�鏋濊姳": "81", "娉稿窞": "331", "寰烽槼": "74", "缁甸槼": "240", "骞垮厓": "329", "閬傚畞": "330", "鍐呮睙": "248", "涔愬北": "79", "鍗楀厖": "291", "鐪夊北": "77", "瀹滃": "186", "骞垮畨": "241", "杈惧窞": "369", "闆呭畨": "76", "宸翠腑": "239", "璧勯槼": "242", "闃垮潩钘忔棌缇屾棌鑷不宸�": "185", "鐢樺瓬钘忔棌鑷不宸�": "73", "鍑夊北褰濇棌鑷不宸�": "80", "璐甸槼": "146", "鍏洏姘�": "147", "閬典箟": "262", "瀹夐『": "263", "閾滀粊鍦板尯": "205", "榛旇タ鍗楀竷渚濇棌鑻楁棌鑷不宸�": "343", "姣曡妭鍦板尯": "206", "榛斾笢鍗楄嫍鏃忎緱鏃忚嚜娌诲窞": "342", "榛斿崡甯冧緷鏃忚嫍鏃忚嚜娌诲窞": "306", "鏄嗘槑": "104", "鏇查潠": "249", "鐜夋邯": "106", "淇濆北": "112", "鏄��": "336", "涓芥睙": "114", "涓存钵": "110", "妤氶泟褰濇棌鑷不宸�": "105", "绾㈡渤鍝堝凹鏃忓綕鏃忚嚜娌诲窞": "107", "鏂囧北澹棌鑻楁棌鑷不宸�": "177", "鏅幢": "108", "瑗垮弻鐗堢撼鍌f棌鑷不宸�": "109", "澶х悊鐧芥棌鑷不宸�": "111", "寰峰畯鍌f棌鏅鏃忚嚜娌诲窞": "116", "鎬掓睙鍌堝兂鏃忚嚜娌诲窞": "113", "杩簡钘忔棌鑷不宸�": "115", "鎷夎惃": "100", "鏄岄兘鍦板尯": "99", "灞卞崡鍦板尯": "97", "鏃ュ杸鍒欏湴鍖�": "102", "閭f洸鍦板尯": "101", "闃块噷鍦板尯": "103", "鏋楄姖鍦板尯": "98", "瑗垮畨": "233", "閾滃窛": "232", "瀹濋浮": "171", "鍜搁槼": "323", "娓崡": "170", "寤跺畨": "284", "姹変腑": "352", "姒嗘灄": "231", "瀹夊悍": "324", "鍟嗘礇": "285", "鍏板窞": "36", "鍢夊唱鍏�": "33", "閲戞槍": "34", "鐧介摱": "35", "澶╂按": "196", "姝﹀▉": "118", "寮犳帠": "117", "骞冲噳": "359", "閰掓硥": "37", "搴嗛槼": "135", "瀹氳タ": "136", "闄囧崡": "256", "涓村鍥炴棌鑷不宸�": "182", "鐢樺崡钘忔棌鑷不宸�": "247", "瑗垮畞": "66", "娴蜂笢鍦板尯": "69", "娴峰寳钘忔棌鑷不宸�": "67", "榛勫崡钘忔棌鑷不宸�": "70", "娴峰崡钘忔棌鑷不宸�": "68", "鏋滄礇钘忔棌鑷不宸�": "72", "鐜夋爲钘忔棌鑷不宸�": "71", "娴疯タ钂欏彜鏃忚棌鏃忚嚜娌诲窞": "65", "閾跺窛": "360", "鐭冲槾灞�": "335", "鍚村繝": "322", "鍥哄師": "246", "涓崼": "181", "涔岄瞾鏈ㄩ綈": "92", "鍏嬫媺鐜涗緷": "95", "鍚愰瞾鐣湴鍖�": "89", "鍝堝瘑鍦板尯": "91", "鏄屽悏鍥炴棌鑷不宸�": "93", "鍗氬皵濉旀媺钂欏彜鑷不宸�": "88", "宸撮煶閮钂欏彜鑷不宸�": "86", "闃垮厠鑻忓湴鍖�": "85", "鍏嬪瓬鍕掕嫃鏌皵鍏嬪瓬鑷不宸�": "84", "鍠�浠�鍦板尯": "83", "鍜岀敯鍦板尯": "82", "浼婄妬鍝堣惃鍏嬭嚜娌诲窞": "90", "濉斿煄鍦板尯": "94", "闃垮嫆娉板湴鍖�": "96", "鐭虫渤瀛�": "770", "闃挎媺灏�": "731", "鍥炬湪鑸掑厠": "792", "浜斿娓�": "789", "棣欐腐鐗瑰埆琛屾斂鍖�": "2912", "婢抽棬鐗瑰埆琛屾斂鍖�": "2911"] + def gaodeCityCodeMap = ["鍖椾含":"110000","澶╂触":"120000","鐭冲搴�":"130100","杈涢泦":"130181","鏅嬪窞":"130183","鏂颁箰":"130184","鍞愬北":"130200","婊﹀窞":"130284","閬靛寲":"130281","杩佸畨":"130283","绉︾殗宀�":"130300","閭兏":"130400","姝﹀畨":"130481","閭㈠彴":"130500","鍗楀":"130581","娌欐渤":"130582","淇濆畾":"130600","娑垮窞":"130681","瀹氬窞":"130682","瀹夊浗":"130683","楂樼搴�":"130684","寮犲鍙�":"130700","鎵垮痉":"130800","骞虫硥":"130881","娌у窞":"130900","娉婂ご":"130981","浠讳笜":"130982","榛勯獏":"130983","娌抽棿":"130984","寤婂潑":"131000","闇稿窞":"131081","涓夋渤":"131082","琛℃按":"131100","娣卞窞":"131182","澶師":"140100","鍙や氦":"140181","澶у悓":"140200","闃虫硥":"140300","闀挎不":"140400","鏅嬪煄":"140500","楂樺钩":"140581","鏈斿窞":"140600","鎬�浠�":"140681","鏅嬩腑":"140700","浠嬩紤":"140781","杩愬煄":"140800","姘告祹":"140881","娌虫触":"140882","蹇诲窞":"140900","鍘熷钩":"140981","涓存本":"141000","渚┈":"141081","闇嶅窞":"141082","鍚曟":"141100","瀛濅箟":"141181","姹鹃槼":"141182","鍛煎拰娴╃壒":"150100","鍖呭ご":"150200","涔屾捣":"150300","璧ゅ嘲":"150400","閫氳窘":"150500","闇嶆灄閮嫆":"150581","閯傚皵澶氭柉":"150600","鍛间鸡璐濆皵":"150700","婊℃床閲�":"150781","鐗欏厠鐭�":"150782","鎵庡叞灞�":"150783","棰濆皵鍙ょ撼":"150784","鏍规渤":"150785","宸村溅娣栧皵":"150800","涔屽叞瀵熷竷":"150900","涓伴晣":"150981","涔屽叞娴╃壒":"152201","闃垮皵灞�":"152202","浜岃繛娴╃壒":"152501","閿℃灄娴╃壒":"152502","娌堥槼":"210100","鏂版皯":"210181","澶ц繛":"210200","鐡︽埧搴�":"210281","搴勬渤":"210283","闉嶅北":"210300","娴峰煄":"210381","鎶氶『":"210400","鏈邯":"210500","涓逛笢":"210600","涓滄腐":"210681","鍑ゅ煄":"210682","閿﹀窞":"210700","鍑屾捣":"210781","鍖楅晣":"210782","钀ュ彛":"210800","瑗垮競鍖�":"210803","鐩栧窞":"210881","澶х煶妗�":"210882","闃滄柊":"210900","杈介槼":"211000","鐏":"211081","鐩橀敠":"211100","閾佸箔":"211200","璋冨叺灞�":"211281","寮�鍘�":"211282","鏈濋槼":"211300","鍖楃エ":"211381","鍑屾簮":"211382","钁姦宀�":"211400","鍏村煄":"211481","闀挎槬":"220100","姒嗘爲":"220182","寰锋儬":"220183","鍚夋灄":"220200","铔熸渤":"220281","妗︾敻":"220282","鑸掑叞":"220283","纾愮煶":"220284","鍥涘钩":"220300","鍏富宀�":"220381","鍙岃窘":"220382","杈芥簮":"220400","閫氬寲":"220500","姊呮渤鍙�":"220581","闆嗗畨":"220582","鐧藉北":"220600","涓存睙":"220681","鏉惧師":"220700","鎵朵綑":"220781","鐧藉煄":"220800","娲崡":"220881","澶у畨":"220882","寤跺悏":"222401","鍥句滑":"222402","鏁﹀寲":"222403","鐝叉槬":"222404","榫欎簳":"222405","鍜岄緳":"222406","鍝堝皵婊�":"230100","灏氬織":"230183","浜斿父":"230184","榻愰綈鍝堝皵":"230200","璁锋渤":"230281","楦¤タ":"230300","铏庢灄":"230381","瀵嗗北":"230382","楣ゅ矖":"230400","鍙岄腑灞�":"230500","澶у簡":"230600","浼婃槬":"230700","閾佸姏":"230781","浣虫湪鏂�":"230800","鍚屾睙":"230881","瀵岄敠":"230882","鎶氳繙":"230883","涓冨彴娌�":"230900","鐗′腹姹�":"231000","缁ヨ姮娌�":"231081","娴锋灄":"231083","瀹佸畨":"231084","绌嗘1":"231085","涓滃畞":"231086","榛戞渤":"231100","鍖楀畨":"231181","浜斿ぇ杩炴睜":"231182","缁ュ寲":"231200","瀹夎揪":"231281","鑲囦笢":"231282","娴蜂鸡":"231283","婕犳渤":"232701","涓婃捣":"310000","鍗椾含":"320100","鏃犻敗":"320200","姹熼槾":"320281","瀹滃叴":"320282","寰愬窞":"320300","鏂版矀":"320381","閭冲窞":"320382","甯稿窞":"320400","婧ч槼":"320481","鑻忓窞":"320500","甯哥啛":"320581","寮犲娓�":"320582","鏄嗗北":"320583","澶粨":"320585","鍗楅��":"320600","娴峰畨":"320685","鍚笢":"320681","濡傜殝":"320682","娴烽棬":"320684","杩炰簯娓�":"320700","娣畨":"320800","鐩愬煄":"320900","涓滃彴":"320981","鎵窞":"321000","浠緛":"321081","楂橀偖":"321084","闀囨睙":"321100","涓归槼":"321181","鎵腑":"321182","鍙ュ":"321183","娉板窞":"321200","鍏村寲":"321281","闈栨睙":"321282","娉板叴":"321283","瀹胯縼":"321300","鏉窞":"330100","寤哄痉":"330182","瀹佹尝":"330200","浣欏":"330281","鎱堟邯":"330282","娓╁窞":"330300","鐟炲畨":"330381","涔愭竻":"330382","鍢夊叴":"330400","娴峰畞":"330481","骞虫箹":"330482","妗愪埂":"330483","婀栧窞":"330500","缁嶅叴":"330600","璇告毃":"330681","宓婂窞":"330683","閲戝崕":"330700","鍏版邯":"330781","涔変箤":"330782","涓滈槼":"330783","姘稿悍":"330784","琛㈠窞":"330800","姹熷北":"330881","鑸熷北":"330900","鍙板窞":"331000","娓╁箔":"331081","涓存捣":"331082","鐜夌幆":"331083","涓芥按":"331100","榫欐硥":"331181","鍚堣偉":"340100","宸㈡箹":"340181","鑺滄箹":"340200","铓屽煚":"340300","娣崡":"340400","椹瀺灞�":"340500","娣寳":"340600","閾滈櫟":"340700","瀹夊簡":"340800","娼滃北":"340882","妗愬煄":"340881","榛勫北":"341000","婊佸窞":"341100","澶╅暱":"341181","鏄庡厜":"341182","闃滈槼":"341200","鐣岄":"341282","瀹垮窞":"341300","鍏畨":"341500","浜冲窞":"341600","姹犲窞":"341700","瀹e煄":"341800","瀹佸浗":"341881","绂忓窞":"350100","绂忔竻":"350181","鍘﹂棬":"350200","鑾嗙敯":"350300","涓夋槑":"350400","姘稿畨":"350481","娉夊窞":"350500","鐭崇嫯":"350581","鏅嬫睙":"350582","鍗楀畨":"350583","婕冲窞":"350600","榫欐捣":"350681","鍗楀钩":"350700","閭垫":"350781","姝﹀し灞�":"350782","寤虹摨":"350783","榫欏博":"350800","婕冲钩":"350881","瀹佸痉":"350900","绂忓畨":"350981","绂忛紟":"350982","鍗楁槍":"360100","鏅痉闀�":"360200","涔愬钩":"360281","钀嶄埂":"360300","涔濇睙":"360400","鐟炴槍":"360481","鍏遍潚鍩�":"360482","搴愬北":"360483","鏂颁綑":"360500","楣版江":"360600","璐垫邯":"360681","璧e窞":"360700","鐟為噾":"360781","鍚夊畨":"360800","浜曞唸灞�":"360881","瀹滄槬":"360900","涓板煄":"360981","妯熸爲":"360982","楂樺畨":"360983","鎶氬窞":"361000","涓婇ザ":"361100","寰峰叴":"361181","娴庡崡":"370100","甯備腑鍖�":"370103","闈掑矝":"370200","甯傚崡鍖�":"370202","甯傚寳鍖�":"370203","鑳跺窞":"370281","骞冲害":"370283","鑾辫タ":"370285","娣勫崥":"370300","鏋e簞":"370400","甯備腑鍖�":"370402","婊曞窞":"370481","涓滆惀":"370500","鐑熷彴":"370600","榫欏彛":"370681","鑾遍槼":"370682","鑾卞窞":"370683","钃幈":"370684","鎷涜繙":"370685","鏍栭湠":"370686","娴烽槼":"370687","娼嶅潑":"370700","闈掑窞":"370781","璇稿煄":"370782","瀵垮厜":"370783","瀹変笜":"370784","楂樺瘑":"370785","鏄岄倯":"370786","娴庡畞":"370800","鏇查槣":"370881","閭瑰煄":"370883","娉板畨":"370900","鏂版嘲":"370982","鑲ュ煄":"370983","濞佹捣":"371000","鑽f垚":"371082","涔冲北":"371083","鏃ョ収":"371100","涓存矀":"371300","寰峰窞":"371400","涔愰櫟":"371481","绂瑰煄":"371482","鑱婂煄":"371500","涓存竻":"371581","婊ㄥ窞":"371600","閭瑰钩":"371681","鑿忔辰":"371700","閮戝窞":"410100","宸╀箟":"410181","鑽ラ槼":"410182","鏂板瘑":"410183","鏂伴儜":"410184","鐧诲皝":"410185","寮�灏�":"410200","娲涢槼":"410300","鍋冨笀":"410381","骞抽《灞�":"410400","鑸為挗":"410481","姹濆窞":"410482","瀹夐槼":"410500","鏋楀窞":"410581","楣ゅ":"410600","鏂颁埂":"410700","鍗緣":"410781","杈夊幙":"410782","鐒︿綔":"410800","娌侀槼":"410882","瀛熷窞":"410883","婵槼":"410900","璁告槍":"411000","绂瑰窞":"411081","闀胯憶":"411082","婕渤":"411100","涓夐棬宄�":"411200","涔夐┈":"411281","鐏靛疂":"411282","鍗楅槼":"411300","閭撳窞":"411381","鍟嗕笜":"411400","姘稿煄":"411481","淇¢槼":"411500","鍛ㄥ彛":"411600","椤瑰煄":"411681","椹婚┈搴�":"411700","娴庢簮":"419001","姝︽眽":"420100","榛勭煶":"420200","澶у喍":"420281","鍗佸牥":"420300","涓规睙鍙�":"420381","瀹滄槍":"420500","瀹滈兘":"420581","褰撻槼":"420582","鏋濇睙":"420583","瑗勯槼":"420600","鑰佹渤鍙�":"420682","鏋i槼":"420683","瀹滃煄":"420684","閯傚窞":"420700","鑽嗛棬":"420800","浜北":"420882","閽熺ゥ":"420881","瀛濇劅":"420900","搴斿煄":"420981","瀹夐檰":"420982","姹夊窛":"420984","鑽嗗窞":"421000","娌欏競鍖�":"421002","鐭抽":"421081","娲箹":"421083","鏉炬粙":"421087","榛勫唸":"421100","楹诲煄":"421181","姝︾┐":"421182","鍜稿畞":"421200","璧ゅ":"421281","闅忓窞":"421300","骞挎按":"421381","鎭╂柦":"422801","鍒╁窛":"422802","浠欐":"429004","娼滄睙":"429005","澶╅棬":"429006","闀挎矙":"430100","娴忛槼":"430181","瀹佷埂":"430182","鏍床":"430200","閱撮櫟":"430281","婀樻江":"430300","婀樹埂":"430381","闊跺北":"430382","琛¢槼":"430400","鑰掗槼":"430481","甯稿畞":"430482","閭甸槼":"430500","姝﹀唸":"430581","宀抽槼":"430600","姹ㄧ綏":"430681","涓存箻":"430682","甯稿痉":"430700","娲ュ競":"430781","寮犲鐣�":"430800","鐩婇槼":"430900","娌呮睙":"430981","閮村窞":"431000","璧勫叴":"431081","姘稿窞":"431100","鎬�鍖�":"431200","娲睙":"431281","濞勫簳":"431300","鍐锋按姹�":"431381","娑熸簮":"431382","鍚夐":"433101","骞垮窞":"440100","闊跺叧":"440200","涔愭槍":"440281","鍗楅泟":"440282","娣卞湷":"440300","鐝犳捣":"440400","姹曞ご":"440500","浣涘北":"440600","姹熼棬":"440700","鍙板北":"440781","寮�骞�":"440783","楣ゅ北":"440784","鎭╁钩":"440785","婀涙睙":"440800","寤夋睙":"440881","闆峰窞":"440882","鍚村窛":"440883","鑼傚悕":"440900","楂樺窞":"440981","鍖栧窞":"440982","淇″疁":"440983","鑲囧簡":"441200","鍥涗細":"441284","鎯犲窞":"441300","姊呭窞":"441400","鍏村畞":"441481","姹曞熬":"441500","闄嗕赴":"441581","娌虫簮":"441600","闃虫睙":"441700","闃虫槬":"441781","娓呰繙":"441800","鑻卞痉":"441881","杩炲窞":"441882","涓滆帪":"441900","涓北":"442000","娼窞":"445100","鎻槼":"445200","鏅畞":"445281","浜戞诞":"445300","缃楀畾":"445381","鍗楀畞":"450100","鏌冲窞":"450200","妗傛灄":"450300","鑽旀郸":"450381","姊у窞":"450400","宀戞邯":"450481","鍖楁捣":"450500","闃插煄娓�":"450600","涓滃叴":"450681","閽﹀窞":"450700","璐垫腐":"450800","妗傚钩":"450881","鐜夋灄":"450900","鍖楁祦":"450981","鐧捐壊":"451000","闈栬タ":"451081","璐哄窞":"451100","娌虫睜":"451200","鏉ュ":"451300","鍚堝北":"451381","宕囧乏":"451400","鍑ゥ":"451481","娴峰彛":"460100","涓変簹":"460200","涓夋矙":"460300","鍎嬪窞":"460400","浜旀寚灞�":"469001","鐞兼捣":"469002","鏂囨槍":"469005","涓囧畞":"469006","涓滄柟":"469007","閲嶅簡":"500000","閲嶅簡甯傞儕鍘�":"500200","鎴愰兘":"510100","閮芥睙鍫�":"510181","褰窞":"510182","閭涘磧":"510183","宕囧窞":"510184","绠�闃�":"510185","鑷础":"510300","鏀�鏋濊姳":"510400","娉稿窞":"510500","寰烽槼":"510600","骞挎眽":"510681","浠�閭�":"510682","缁电":"510683","缁甸槼":"510700","姹熸补":"510781","骞垮厓":"510800","閬傚畞":"510900","鍐呮睙":"511000","甯備腑鍖�":"511002","闅嗘槍":"511083","涔愬北":"511100","甯備腑鍖�":"511102","宄ㄧ湁灞�":"511181","鍗楀厖":"511300","闃嗕腑":"511381","鐪夊北":"511400","瀹滃":"511500","骞垮畨":"511600","鍗庤摜":"511681","杈惧窞":"511700","涓囨簮":"511781","闆呭畨":"511800","宸翠腑":"511900","璧勯槼":"512000","椹皵搴�":"513201","搴峰畾":"513301","瑗挎槍":"513401","璐甸槼":"520100","娓呴晣":"520181","鍏洏姘�":"520200","鐩樺窞":"520281","閬典箟":"520300","璧ゆ按":"520381","浠佹��":"520382","瀹夐『":"520400","姣曡妭":"520500","閾滀粊":"520600","鍏翠箟":"522301","鍏翠粊":"522302","鍑噷":"522601","閮藉寑":"522701","绂忔硥":"522702","鏄嗘槑":"530100","瀹夊畞":"530181","鏇查潠":"530300","瀹e▉":"530381","鐜夋邯":"530400","淇濆北":"530500","鑵惧啿":"530581","鏄��":"530600","姘村瘜":"530681","涓芥睙":"530700","鏅幢":"530800","涓存钵":"530900","妤氶泟":"532301","涓棫":"532501","寮�杩�":"532502","钂欒嚜":"532503","寮ュ嫆":"532504","鏂囧北":"532601","鏅椽":"532801","澶х悊":"532901","鐟炰附":"533102","鑺�":"533103","娉告按":"533301","棣欐牸閲屾媺":"533401","鎷夎惃":"540100","鏃ュ杸鍒�":"540200","鏄岄兘":"540300","鏋楄姖":"540400","灞卞崡":"540500","閭f洸":"540600","瑗垮畨":"610100","閾滃窛":"610200","瀹濋浮":"610300","鍜搁槼":"610400","褰窞":"610482","鍏村钩":"610481","娓崡":"610500","闊╁煄":"610581","鍗庨槾":"610582","寤跺畨":"610600","姹変腑":"610700","姒嗘灄":"610800","绁炴湪":"610881","瀹夊悍":"610900","鍟嗘礇":"611000","鍏板窞":"620100","鍢夊唱鍏�":"620200","閲戞槍":"620300","鐧介摱":"620400","澶╂按":"620500","姝﹀▉":"620600","寮犳帠":"620700","骞冲噳":"620800","鍗庝涵":"620881","閰掓硥":"620900","鐜夐棬":"620981","鏁︾厡":"620982","搴嗛槼":"621000","瀹氳タ":"621100","闄囧崡":"621200","涓村":"622901","鍚堜綔":"623001","瑗垮畞":"630100","娴蜂笢":"630200","鐜夋爲":"632701","鏍煎皵鏈�":"632801","寰蜂护鍝�":"632802","鑼礀":"632803","閾跺窛":"640100","鐏垫":"640181","鐭冲槾灞�":"640200","鍚村繝":"640300","闈掗摐宄�":"640381","鍥哄師":"640400","涓崼":"640500","涔岄瞾鏈ㄩ綈":"650100","鏂板競鍖�":"650104","鍏嬫媺鐜涗緷":"650200","鍚愰瞾鐣�":"650400","鍝堝瘑":"650500","鏄屽悏":"652301","闃滃悍":"652302","鍗氫箰":"652701","闃挎媺灞卞彛":"652702","搴撳皵鍕�":"652801","闃垮厠鑻�":"652901","闃垮浘浠�":"653001","鍠�浠�":"653101","鍜岀敯":"653201","浼婂畞":"654002","濂庡悲":"654003","闇嶅皵鏋滄柉":"654004","濉斿煄":"654201","涔岃嫃":"654202","闃垮嫆娉�":"654301","鐭虫渤瀛�":"659001","闃挎媺灏�":"659002","鍥炬湪鑸掑厠":"659003","浜斿娓�":"659004","鍖楀悲":"659005","閾侀棬鍏�":"659006","鍙屾渤":"659007","鍙厠杈炬媺":"659008","鏄嗙帀":"659009","浼婄妬":"654000"] public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(10) - def regionCodeMap = ["320102":"玄武", - "320104":"秦淮", - "320105":"建邺", - "320106":"鼓楼", - "320111":"浦口", - "320113":"栖霞", - "320114":"雨花台", - "320115":"江宁", - "320116":"六合", - "320117":"溧水", - "320118":"高淳", - "320205":"锡山", - "320206":"惠山", - "320211":"滨湖", - "320281":"江阴", - "320282":"宜兴", - "320213":"梁溪", - "320214":"新吴", - "320204":"梁溪", - "320203":"梁溪", - "320202":"梁溪", - "320201":"梁溪", - "320505":"虎丘", - "320506":"吴中", - "320507":"相城", - "320508":"姑苏", - "320509":"吴江", - "320581":"常熟", - "320582":"张家港", - "320583":"昆山", - "320585":"太仓", - "320501":"虎丘" + def regionCodeMap = ["320102":"鐜勬", + "320104":"绉︽樊", + "320105":"寤洪偤", + "320106":"榧撴ゼ", + "320111":"娴﹀彛", + "320113":"鏍栭湠", + "320114":"闆ㄨ姳鍙�", + "320115":"姹熷畞", + "320116":"鍏悎", + "320117":"婧ф按", + "320118":"楂樻烦", + "320205":"閿″北", + "320206":"鎯犲北", + "320211":"婊ㄦ箹", + "320281":"姹熼槾", + "320282":"瀹滃叴", + "320213":"姊佹邯", + "320214":"鏂板惔", + "320204":"姊佹邯", + "320203":"姊佹邯", + "320202":"姊佹邯", + "320201":"姊佹邯", + "320505":"铏庝笜", + "320506":"鍚翠腑", + "320507":"鐩稿煄", + "320508":"濮戣嫃", + "320509":"鍚存睙", + "320581":"甯哥啛", + "320582":"寮犲娓�", + "320583":"鏄嗗北", + "320585":"澶粨", + "320501":"铏庝笜" ] def final AtomicInteger index = new AtomicInteger(0) @@ -81,21 +81,21 @@ class AddThirdPriceDistrict { def task = new AddThirdPriceDistrict(); task.run() -// def mapName = "锦华星光苑3,4幢" -//// println task.pattern("港新花苑A1区"); -// println mapName.replaceAll("\\w+-?\\w+(幢)", "") -// println mapName.replaceAll("(\\w+,)?+\\w+(幢)", "") +// def mapName = "閿﹀崕鏄熷厜鑻�3,4骞�" +//// println task.pattern("娓柊鑺辫嫅A1鍖�"); +// println mapName.replaceAll("\\w+-?\\w+(骞�)", "") +// println mapName.replaceAll("(\\w+,)?+\\w+(骞�)", "") } def run(){ // exportDatas(); -// getDataType("D:\\数据\\小区\\南昌第三方均价.xlsx"); -// addInfo("D:\\数据\\小区\\南昌第三方均价.xlsx"); -// addMapInfo("D:\\数据\\小区\\南昌第三方均价.xlsx") -// addCrawlMapInfo("D:\\数据\\小区\\南昌第三方均价.xlsx") - // dataFilter("D:\\数据\\小区\\南昌第三方均价.xlsx") -// matchDistDatas("D:\\数据\\小区\\南昌第三方均价.xlsx") - addNewMapInfo("D:\\数据\\小区\\南昌第三方均价.xlsx") -// addFlag("苏州","D:\\数据\\小区\\苏州第三方均价(1)(2).xlsx"); +// getDataType("D:\\鏁版嵁\\灏忓尯\\鍗楁槍绗笁鏂瑰潎浠�.xlsx"); +// addInfo("D:\\鏁版嵁\\灏忓尯\\鍗楁槍绗笁鏂瑰潎浠�.xlsx"); +// addMapInfo("D:\\鏁版嵁\\灏忓尯\\鍗楁槍绗笁鏂瑰潎浠�.xlsx") +// addCrawlMapInfo("D:\\鏁版嵁\\灏忓尯\\鍗楁槍绗笁鏂瑰潎浠�.xlsx") + // dataFilter("D:\\鏁版嵁\\灏忓尯\\鍗楁槍绗笁鏂瑰潎浠�.xlsx") +// matchDistDatas("D:\\鏁版嵁\\灏忓尯\\鍗楁槍绗笁鏂瑰潎浠�.xlsx") + addNewMapInfo("D:\\鏁版嵁\\灏忓尯\\鍗楁槍绗笁鏂瑰潎浠�.xlsx") +// addFlag("鑻忓窞","D:\\鏁版嵁\\灏忓尯\\鑻忓窞绗笁鏂瑰潎浠�(1)(2).xlsx"); } def dataFilter(filePath){ @@ -114,7 +114,7 @@ class AddThirdPriceDistrict { } }else{ - def s1 = com.fangjia.core.util.DataUtil.match(name, Pattern.compile("(路|街|道)\\d+号\$")) + def s1 = com.fangjia.core.util.DataUtil.match(name, Pattern.compile("(璺瘄琛梶閬�)\\d+鍙穃$")) if(s1){ row['T'] = 19 } @@ -127,14 +127,14 @@ class AddThirdPriceDistrict { } }); - println "3.名称过滤完成" + println "3.鍚嶇О杩囨护瀹屾垚" } def addNewMapInfo(def path){ ExcelUtils.multiThreadingModify(path, { row -> if(!row['I']){ - def gdData = FangjiaClientUtils.getMapData(row['A'], row['B'], row['C'], row['D'],"", "高德") + def gdData = FangjiaClientUtils.getMapData(row['A'], row['B'], row['C'], row['D'],"", "楂樺痉") if(gdData){ row['F'] = gdData.district row['G'] = gdData.name @@ -145,7 +145,7 @@ class AddThirdPriceDistrict { row['L'] = gdData.lat } - def bdData = FangjiaClientUtils.getMapData(row['A'], row['B'], row['C'], row['D'],"", "百度") + def bdData = FangjiaClientUtils.getMapData(row['A'], row['B'], row['C'], row['D'],"", "鐧惧害") if(bdData){ row['M'] = bdData.district row['N'] = bdData.name @@ -204,16 +204,16 @@ class AddThirdPriceDistrict { def exportDatas(){ - //跑完 "上海","重庆","哈尔滨","沈阳","东莞","南昌","昆明","金华","温州","淄博","湛江","肇庆","宜昌","岳阳","安庆","芜湖","西宁","日照","常德","张家口","北京","广州","深圳","重庆","郑州","长沙","西安","成都","东莞", - def citys = ["佛山","杭州","合肥","南京","青岛","沈阳","苏州","天津","武汉","珠海","中山","长春","扬州","烟台","徐州","无锡","温州","太原","台州","石家庄","绍兴","厦门","泉州","宁波","南通","南宁","南昌","兰州","常州","大连","福州","贵阳","哈尔滨","海口","惠州","济南","嘉兴","金华","昆明","遵义","淄博","株洲","镇江","肇庆","漳州","湛江","岳阳","银川","宜昌","盐城","芜湖","乌鲁木齐","唐山","泰州","汕头","三亚","清远","秦皇岛","马鞍山","洛阳","柳州","连云港","廊坊","九江","吉林","淮安","湖州","呼和浩特","沧州","保定","安庆","张家口","西宁","日照","拉萨","锦州","大同","常德","北海","文昌","陵水","保亭"] + //璺戝畬 "涓婃捣","閲嶅簡","鍝堝皵婊�","娌堥槼","涓滆帪","鍗楁槍","鏄嗘槑","閲戝崕","娓╁窞","娣勫崥","婀涙睙","鑲囧簡","瀹滄槍","宀抽槼","瀹夊簡","鑺滄箹","瑗垮畞","鏃ョ収","甯稿痉","寮犲鍙�","鍖椾含","骞垮窞","娣卞湷","閲嶅簡","閮戝窞","闀挎矙","瑗垮畨","鎴愰兘","涓滆帪", + def citys = ["浣涘北","鏉窞","鍚堣偉","鍗椾含","闈掑矝","娌堥槼","鑻忓窞","澶╂触","姝︽眽","鐝犳捣","涓北","闀挎槬","鎵窞","鐑熷彴","寰愬窞","鏃犻敗","娓╁窞","澶師","鍙板窞","鐭冲搴�","缁嶅叴","鍘﹂棬","娉夊窞","瀹佹尝","鍗楅��","鍗楀畞","鍗楁槍","鍏板窞","甯稿窞","澶ц繛","绂忓窞","璐甸槼","鍝堝皵婊�","娴峰彛","鎯犲窞","娴庡崡","鍢夊叴","閲戝崕","鏄嗘槑","閬典箟","娣勫崥","鏍床","闀囨睙","鑲囧簡","婕冲窞","婀涙睙","宀抽槼","閾跺窛","瀹滄槍","鐩愬煄","鑺滄箹","涔岄瞾鏈ㄩ綈","鍞愬北","娉板窞","姹曞ご","涓変簹","娓呰繙","绉︾殗宀�","椹瀺灞�","娲涢槼","鏌冲窞","杩炰簯娓�","寤婂潑","涔濇睙","鍚夋灄","娣畨","婀栧窞","鍛煎拰娴╃壒","娌у窞","淇濆畾","瀹夊簡","寮犲鍙�","瑗垮畞","鏃ョ収","鎷夎惃","閿﹀窞","澶у悓","甯稿痉","鍖楁捣","鏂囨槍","闄垫按","淇濅涵"] for(def city : citys){ def datas = findMatchErrorDatas(city); - println "共【"+datas.size()+"】条" + println "鍏便��"+datas.size()+"銆戞潯" datas = filterName(datas); - println "过滤后共【"+datas.size()+"】条" + println "杩囨护鍚庡叡銆�"+datas.size()+"銆戞潯" def resMap = groupByName(datas); def rets = [] - rets << ["城市","区域","名称","优选地址","来源网站","高德区域","高德名称","高德地址","高德类型","经度","纬度","百度区域","百度名称","百度地址","百度类型","经度","纬度","标记","匹配区域","匹配名称","小区ID","地址"] + rets << ["鍩庡競","鍖哄煙","鍚嶇О","浼橀�夊湴鍧�","鏉ユ簮缃戠珯","楂樺痉鍖哄煙","楂樺痉鍚嶇О","楂樺痉鍦板潃","楂樺痉绫诲瀷","缁忓害","绾害","鐧惧害鍖哄煙","鐧惧害鍚嶇О","鐧惧害鍦板潃","鐧惧害绫诲瀷","缁忓害","绾害","鏍囪","鍖归厤鍖哄煙","鍖归厤鍚嶇О","灏忓尯ID","鍦板潃"] resMap.each {k,v-> def ret = [] def arrs = k.split("##") @@ -228,13 +228,13 @@ class AddThirdPriceDistrict { ret << v.join(",") rets << ret } - ExcelUtils.write("D:\\数据\\小区\\"+city+"第三方均价.xlsx", rets,"最后") + ExcelUtils.write("D:\\鏁版嵁\\灏忓尯\\"+city+"绗笁鏂瑰潎浠�.xlsx", rets,"鏈�鍚�") } } def filterName(datas){ - // def keys = ["地块","部","商业","写字楼","商铺","共享","产业","软件","创意","门店","幼儿园","孵化","基地","投资","创业","工业区","批发","办公","停车场","创客","科技","家具","工业园","商贸","服装","五金城","建材","汽配","文创园","家居","商务中心","市场","交易中心","厂房","汽车","自建房","科创园","采购中心","服务中心","金融中心","食贸中心","便利中心","购物中心","媒体中心","会展中心",""] - def keys = ["地块"] + // def keys = ["鍦板潡","閮�","鍟嗕笟","鍐欏瓧妤�","鍟嗛摵","鍏变韩","浜т笟","杞欢","鍒涙剰","闂ㄥ簵","骞煎効鍥�","瀛靛寲","鍩哄湴","鎶曡祫","鍒涗笟","宸ヤ笟鍖�","鎵瑰彂","鍔炲叕","鍋滆溅鍦�","鍒涘","绉戞妧","瀹跺叿","宸ヤ笟鍥�","鍟嗚锤","鏈嶈","浜旈噾鍩�","寤烘潗","姹介厤","鏂囧垱鍥�","瀹跺眳","鍟嗗姟涓績","甯傚満","浜ゆ槗涓績","鍘傛埧","姹借溅","鑷缓鎴�","绉戝垱鍥�","閲囪喘涓績","鏈嶅姟涓績","閲戣瀺涓績","椋熻锤涓績","渚垮埄涓績","璐墿涓績","濯掍綋涓績","浼氬睍涓績",""] + def keys = ["鍦板潡"] def newDatas = [] for(def i=0;i=0.9){ o.city = mapCity - o.matchType = "相似0.9以上" + o.matchType = "鐩镐技0.9浠ヤ笂" bo = o break; } @@ -517,7 +517,7 @@ class AddThirdPriceDistrict { def selectAddress(def addrs){ def address = null for(def addr : addrs){ - if(addr.toString().contains("号")){ + if(addr.toString().contains("鍙�")){ address = addr break; } @@ -538,18 +538,18 @@ class AddThirdPriceDistrict { def q = new BasicDBObject() q.put("city",city) q.put("s_date",new BasicDBObject('$gte', 202101)) -// q.put("name","博济聚创科技园") -// q.put("source","贝壳找房") +// q.put("name","鍗氭祹鑱氬垱绉戞妧鍥�") +// q.put("source","璐濆3鎵炬埧") def dbcursor = matchErrorLogColl.find(q) println dbcursor.count() def rets = [] for(def d : dbcursor){ - if(d.error_log != "没匹配上相应的区域" && !d.match_type){ + if(d.error_log != "娌″尮閰嶄笂鐩稿簲鐨勫尯鍩�" && !d.match_type){ def source = d.source - if(source && source=="365淘房"){ + if(source && source=="365娣樻埧"){ def obj = findEstateType(d.tid) if(obj){ - if(obj.estate_type && (obj.estate_type.contains("住宅") || obj.estate_type.contains("公寓") || obj.estate_type.contains("别墅"))){ + if(obj.estate_type && (obj.estate_type.contains("浣忓畢") || obj.estate_type.contains("鍏瘬") || obj.estate_type.contains("鍒"))){ rets << d; }else{ if(obj.estate_type){ @@ -572,12 +572,12 @@ class AddThirdPriceDistrict { } def addInfo(filePath){ - province = "江西" -// def city = "苏州" + province = "姹熻タ" +// def city = "鑻忓窞" // def datas = findMatchErrorDatas(city); -// println "共【"+datas.size()+"】条" +// println "鍏便��"+datas.size()+"銆戞潯" // datas = filterName(datas); -// println "过滤后共【"+datas.size()+"】条" +// println "杩囨护鍚庡叡銆�"+datas.size()+"銆戞潯" // def resMap = groupByName(datas); def index = 0; @@ -602,14 +602,14 @@ class AddThirdPriceDistrict { // if(!regions.contains(row['B'])){ // row['Y'] = regions.toString() // }else if(regions.contains(row['B'])){ -// row['Y'] = "已存在" +// row['Y'] = "宸插瓨鍦�" // } // } // }else{ // if(obj.region != row['B']){ // row['Y'] = obj.region // }else if(obj.region == row['B']){ -// row['Y'] = "已存在" +// row['Y'] = "宸插瓨鍦�" // } // } @@ -663,14 +663,14 @@ class AddThirdPriceDistrict { if(!regions.contains(row['C'])){ row['P'] = regions.toString() }else if(regions.contains(row['C'])){ - row['P'] = "已存在" + row['P'] = "宸插瓨鍦�" } } }else{ if(obj.region != row['C']){ row['P'] = obj.region }else if(obj.region == row['C']){ - row['P'] = "已存在" + row['P'] = "宸插瓨鍦�" } } @@ -717,7 +717,7 @@ class AddThirdPriceDistrict { def region = row['B'] def otherRegion = row['Y'] - if((otherRegion && otherRegion=="已存在") || !name){ + if((otherRegion && otherRegion=="宸插瓨鍦�") || !name){ row['R'] = 1 }else{ province = prov @@ -730,30 +730,30 @@ class AddThirdPriceDistrict { } if(!row['R']){ - row['R'] = addDataFlagByGdType(newName, row['F'],row['G'], row['I']);//高德类型 + row['R'] = addDataFlagByGdType(newName, row['F'],row['G'], row['I']);//楂樺痉绫诲瀷 } if(!row['R']){ - row['R'] = addDataFlagByMatch(region, newName, row['S'], row['T'])//名称 + row['R'] = addDataFlagByMatch(region, newName, row['S'], row['T'])//鍚嶇О } if(!row['R']){ - row['R'] = addDataFlagByMatch(region, newName, row['S'], matchAddr)//地址 + row['R'] = addDataFlagByMatch(region, newName, row['S'], matchAddr)//鍦板潃 } - if(!row['S']){//没匹配上 + if(!row['S']){//娌″尮閰嶄笂 if(!row['R']){ row['R'] = addDataFlagByGdAndBdType(region, newName, row['F'], row['G'], row['I'], row['L'],row['M'], row['O'], otherRegion, houseCount); } } - if(!row['S']){//没匹配上 + if(!row['S']){//娌″尮閰嶄笂 if(!row['R']){ row['R'] = addDataFlagByGdAndBdType(region, newName, row['F'], row['H'], row['I'], row['L'],row['N'], row['O'], otherRegion, houseCount); } } - if(!row['S']){//没匹配上 + if(!row['S']){//娌″尮閰嶄笂 if(!row['R']){ row['R'] = addDataFlagBySimGdAndBdType(region, newName, row['F'], row['G'], row['I'], row['L'],row['M'], row['O'], otherRegion, houseCount); } @@ -763,7 +763,7 @@ class AddThirdPriceDistrict { } // if(!row['R']){ -// row['R'] = addDataFlagByBdType(newName, row['L'], row['M'], row['O'])//百度类型 +// row['R'] = addDataFlagByBdType(newName, row['L'], row['M'], row['O'])//鐧惧害绫诲瀷 // } } @@ -771,34 +771,34 @@ class AddThirdPriceDistrict { } def nameProcess(def region, def name){ - name = name.replace("?","").replace(".","").replace("(","").replace(")","").replace("院小区","小区").replace("号小区","号").replace("号住宅区","号").replace("号院","号").replace("-","").replace("1期","一期").replace("2期","二期").replace("1区","一区").replace("2区","二区").replaceAll("\\w+-?\\w+(幢)", "").replaceAll("(\\w+,)+\\w+(幢)", "").replace(" ","").trim() - if(region.endsWith("区")){ - def newRegion = region.replace("区","") + name = name.replace("?","").replace(".","").replace("锛�","").replace("锛�","").replace("闄㈠皬鍖�","灏忓尯").replace("鍙峰皬鍖�","鍙�").replace("鍙蜂綇瀹呭尯","鍙�").replace("鍙烽櫌","鍙�").replace("-","").replace("1鏈�","涓�鏈�").replace("2鏈�","浜屾湡").replace("1鍖�","涓�鍖�").replace("2鍖�","浜屽尯").replaceAll("\\w+-?\\w+(骞�)", "").replaceAll("(\\w+,)+\\w+(骞�)", "").replace(" ","").trim() + if(region.endsWith("鍖�")){ + def newRegion = region.replace("鍖�","") if(newRegion.length()!=1){ region = newRegion } } - if(region.endsWith("市")){ - def newRegion = region.replace("市","") + if(region.endsWith("甯�")){ + def newRegion = region.replace("甯�","") if(newRegion.length()!=1){ region = newRegion } } - if(name.toString().endsWith(region) || name.toString().startsWith(region) || name.toString().endsWith(region+"市") || name.toString().endsWith(region+"区")){ - name = name.replace(region+"市", "").replace(region+"区", "").replace(region, "").trim() + if(name.toString().endsWith(region) || name.toString().startsWith(region) || name.toString().endsWith(region+"甯�") || name.toString().endsWith(region+"鍖�")){ + name = name.replace(region+"甯�", "").replace(region+"鍖�", "").replace(region, "").trim() } if(name && name.toString().startsWith(province)){ name = name.replace(province, "") } - if(name && (name.toString().contains("ΜΟΜΛ")|| name.toString().contains("MOMΛ"))){ - name = name.replace("ΜΟΜΛ", "MOMA").replace("MOMΛ", "MOMA") + if(name && (name.toString().contains("螠螣螠螞")|| name.toString().contains("MOM螞"))){ + name = name.replace("螠螣螠螞", "MOMA").replace("MOM螞", "MOMA") } return name.toUpperCase() } def addDataFlagByName(def name){ - def keys = ["散盘","办公楼","写字楼","商务","家居建材","商贸城","服装城","科技园","删除","五金","购物广场","物流园","文化教育"] + def keys = ["鏁g洏","鍔炲叕妤�","鍐欏瓧妤�","鍟嗗姟","瀹跺眳寤烘潗","鍟嗚锤鍩�","鏈嶈鍩�","绉戞妧鍥�","鍒犻櫎","浜旈噾","璐墿骞垮満","鐗╂祦鍥�","鏂囧寲鏁欒偛"] def isAdd = true; for(def key : keys){ if(name.contains(key)){ @@ -808,7 +808,7 @@ class AddThirdPriceDistrict { } if(isAdd){ - def endKeys = ["路","店","酒店","汽车城","五金城","机电城","装饰城","材料城","农贸","商城","工业区","家居广场","家居生活中心","服务中心","创新中心","科创中心","财智中心","金融中心","创投中心","外包中心","创业大厦","度假村","商写楼","塑化城","材料城","礼品城","汽车用品城","汽配城","市场","批发","文创园","交易中心","服装中心","科技中心","科创园","工业园","创业园","度假区","科创谷","旅游城","食品城","工业坊","百货","商贸广场","采购中心","购物中心","小学","教学楼","学区房","有限公司","电力站","模具城","装饰","数码广场","教师楼","茶城","建材家居","物流城","器材广场","贸易中心","商品城"] + def endKeys = ["璺�","搴�","閰掑簵","姹借溅鍩�","浜旈噾鍩�","鏈虹數鍩�","瑁呴グ鍩�","鏉愭枡鍩�","鍐滆锤","鍟嗗煄","宸ヤ笟鍖�","瀹跺眳骞垮満","瀹跺眳鐢熸椿涓績","鏈嶅姟涓績","鍒涙柊涓績","绉戝垱涓績","璐㈡櫤涓績","閲戣瀺涓績","鍒涙姇涓績","澶栧寘涓績","鍒涗笟澶у帵","搴﹀亣鏉�","鍟嗗啓妤�","濉戝寲鍩�","鏉愭枡鍩�","绀煎搧鍩�","姹借溅鐢ㄥ搧鍩�","姹介厤鍩�","甯傚満","鎵瑰彂","鏂囧垱鍥�","浜ゆ槗涓績","鏈嶈涓績","绉戞妧涓績","绉戝垱鍥�","宸ヤ笟鍥�","鍒涗笟鍥�","搴﹀亣鍖�","绉戝垱璋�","鏃呮父鍩�","椋熷搧鍩�","宸ヤ笟鍧�","鐧捐揣","鍟嗚锤骞垮満","閲囪喘涓績","璐墿涓績","灏忓","鏁欏妤�","瀛﹀尯鎴�","鏈夐檺鍏徃","鐢靛姏绔�","妯″叿鍩�","瑁呴グ","鏁扮爜骞垮満","鏁欏笀妤�","鑼跺煄","寤烘潗瀹跺眳","鐗╂祦鍩�","鍣ㄦ潗骞垮満","璐告槗涓績","鍟嗗搧鍩�"] for(def key : endKeys){ if(name.toString().endsWith(key)){ isAdd = false; @@ -836,7 +836,7 @@ class AddThirdPriceDistrict { if(name && gdName){ gdName = nameProcess(gdRegion, gdName); if(name == gdName && gdType){ - if(gdType.contains("住宿服务")){ + if(gdType.contains("浣忓鏈嶅姟")){ isAdd = 1 } } @@ -847,9 +847,9 @@ class AddThirdPriceDistrict { def fliterCommonWord(def region, def name){ if(name){ name = nameProcess(region, name) - for(def word : ["小区","公寓","住宅楼","花园","住宅","自建房","广场"]){ + for(def word : ["灏忓尯","鍏瘬","浣忓畢妤�","鑺卞洯","浣忓畢","鑷缓鎴�","骞垮満"]){ def tempName = name.replace(word,"") - if(!tempName.toString().endsWith("路") && !tempName.toString().endsWith("街") && !tempName.toString().endsWith("弄") && !tempName.toString().endsWith("巷")){ + if(!tempName.toString().endsWith("璺�") && !tempName.toString().endsWith("琛�") && !tempName.toString().endsWith("寮�") && !tempName.toString().endsWith("宸�")){ name = tempName } } @@ -864,66 +864,66 @@ class AddThirdPriceDistrict { name = fliterCommonWord(region, name) if(gdName && bdName){ - bdName = bdName.replace("·","").replace("-","") + bdName = bdName.replace("路","").replace("-","") if(gdRegion.contains(region) && bdRegion.contains(region) && gdName==name && bdName==name){ - if(gdType && bdType && (gdType.contains("住宅区") || gdType.contains("商务住宅相关") || gdType.contains("商住两用楼宇"))&& (bdType.contains("住宅区") || bdType.contains("房地产"))){ + if(gdType && bdType && (gdType.contains("浣忓畢鍖�") || gdType.contains("鍟嗗姟浣忓畢鐩稿叧") || gdType.contains("鍟嗕綇涓ょ敤妤煎畤"))&& (bdType.contains("浣忓畢鍖�") || bdType.contains("鎴垮湴浜�"))){ if(otherRegion){ - isAdd = "都是住宅,库中有其它区域" + isAdd = "閮芥槸浣忓畢锛屽簱涓湁鍏跺畠鍖哄煙" }else{ - if(bdType.contains("写字楼") || bdType.contains("购物")){ + if(bdType.contains("鍐欏瓧妤�") || bdType.contains("璐墿")){ isAdd = "1" }else{ isAdd = "2" } } - }else if(gdType && bdType && (gdType.contains("住宅区") || gdType.contains("商务住宅相关") || gdType.contains("商住两用楼宇"))&& !bdType.contains("写字楼") && !bdType.contains("购物")){ + }else if(gdType && bdType && (gdType.contains("浣忓畢鍖�") || gdType.contains("鍟嗗姟浣忓畢鐩稿叧") || gdType.contains("鍟嗕綇涓ょ敤妤煎畤"))&& !bdType.contains("鍐欏瓧妤�") && !bdType.contains("璐墿")){ isAdd = "2" - }else if(bdType && bdType.contains("住宅区")){ + }else if(bdType && bdType.contains("浣忓畢鍖�")){ if(houseCount){ isAdd = "2" } } }else if(gdRegion.contains(region) && gdName==name){ - if(gdType && (gdType.contains("住宅区") || gdType.contains("商住两用楼宇") || gdType.contains("商务住宅相关"))){ + if(gdType && (gdType.contains("浣忓畢鍖�") || gdType.contains("鍟嗕綇涓ょ敤妤煎畤") || gdType.contains("鍟嗗姟浣忓畢鐩稿叧"))){ if(!otherRegion){ isAdd = "2" } - }else if(gdType && (gdType.contains("写字楼") || gdType.contains("购物"))){ + }else if(gdType && (gdType.contains("鍐欏瓧妤�") || gdType.contains("璐墿"))){ isAdd = "1" } }else if(bdRegion.contains(region) && bdName==name){ - if(bdType && bdType.contains("住宅区")){ + if(bdType && bdType.contains("浣忓畢鍖�")){ if(!otherRegion) { isAdd = "2" } - }else if(bdType && (bdType.contains("写字楼") || bdType.contains("购物"))){ + }else if(bdType && (bdType.contains("鍐欏瓧妤�") || bdType.contains("璐墿"))){ isAdd = "1" } } }else if(gdName && gdRegion.contains(region) && gdName==name){ - if(gdType && (gdType.contains("住宅区") || gdType.contains("商务住宅相关") || gdType.contains("商住两用楼宇"))){ + if(gdType && (gdType.contains("浣忓畢鍖�") || gdType.contains("鍟嗗姟浣忓畢鐩稿叧") || gdType.contains("鍟嗕綇涓ょ敤妤煎畤"))){ if(!otherRegion) { isAdd = "2" } - }else if(gdType && (gdType.contains("写字楼") || gdType.contains("购物"))){ + }else if(gdType && (gdType.contains("鍐欏瓧妤�") || gdType.contains("璐墿"))){ isAdd = "1" } }else if(bdName && bdRegion.contains(region) && bdName==name){ - if(bdType && bdType.contains("住宅区")){ + if(bdType && bdType.contains("浣忓畢鍖�")){ if(!otherRegion) { isAdd = "2" } - }else if(bdType && (bdType.contains("写字楼") || bdType.contains("购物"))){ + }else if(bdType && (bdType.contains("鍐欏瓧妤�") || bdType.contains("璐墿"))){ isAdd = "1" - }else if(bdType && !bdType.contains("房地产") && !bdType.contains("公交车站") && !bdType.contains("公司企业")){ + }else if(bdType && !bdType.contains("鎴垮湴浜�") && !bdType.contains("鍏氦杞︾珯") && !bdType.contains("鍏徃浼佷笟")){ isAdd = "2" } } - if(!isAdd){//名字不全相等 + if(!isAdd){//鍚嶅瓧涓嶅叏鐩哥瓑 if(gdRegion && gdRegion.contains(region)){ - if(gdType && gdName.toString().contains("建设中") && gdName.toString().contains(name) && (gdType.contains("商务住宅相关") || gdType.contains("住宅小区"))){ + if(gdType && gdName.toString().contains("寤鸿涓�") && gdName.toString().contains(name) && (gdType.contains("鍟嗗姟浣忓畢鐩稿叧") || gdType.contains("浣忓畢灏忓尯"))){ if(!otherRegion){ isAdd = "2" } @@ -936,7 +936,7 @@ class AddThirdPriceDistrict { def addDataFlagBySimGdAndBdType(def region, def name, def gdRegion, def gdName, def gdType, def bdRegion, def bdName, def bdType, def otherRegion, def houseCount){ def isAdd = null; def s1 = "" - def words = ["小区","公寓","花园","住宅区","住宅","商住楼","花苑","自建房","华润","万科","新城","绿地","旭辉","中天","中锐","港龙","路劲","弘阳"] + def words = ["灏忓尯","鍏瘬","鑺卞洯","浣忓畢鍖�","浣忓畢","鍟嗕綇妤�","鑺辫嫅","鑷缓鎴�","鍗庢鼎","涓囩","鏂板煄","缁垮湴","鏃緣","涓ぉ","涓攼","娓緳","璺姴","寮橀槼"] if(bdType){ if(bdRegion.contains(region)){ if(name.length() > bdName.toString().length()){ @@ -974,7 +974,7 @@ class AddThirdPriceDistrict { if(name && bdName){ bdName = nameProcess(bdRegion, bdName); if(name == bdName && bdType){ - if(!bdType.contains("房地产") && !bdType.contains("公交车站")){ + if(!bdType.contains("鎴垮湴浜�") && !bdType.contains("鍏氦杞︾珯")){ isAdd = 4 } } @@ -993,7 +993,7 @@ class AddThirdPriceDistrict { isAdd = 1; }else{ def s1 = "" - def words = ["小区","公寓","花园","住宅区","住宅","商住楼","花苑","自建房","华润","万科","新城","绿地","旭辉","中天","中锐","港龙","路劲","弘阳"] + def words = ["灏忓尯","鍏瘬","鑺卞洯","浣忓畢鍖�","浣忓畢","鍟嗕綇妤�","鑺辫嫅","鑷缓鎴�","鍗庢鼎","涓囩","鏂板煄","缁垮湴","鏃緣","涓ぉ","涓攼","娓緳","璺姴","寮橀槼"] if(matchName.toString().length()>name.length()){ s1 = matchName.replace(name, "") @@ -1029,7 +1029,7 @@ class AddThirdPriceDistrict { sqlBuffer.append(" and cityname = '" + city + "'") sqlBuffer.append(" and adname = '" + region + "'") sqlBuffer.append(" and MATCH(name,'${name}')") - sqlBuffer.append(" and source = '高德' order by score() desc limit 1") + sqlBuffer.append(" and source = '楂樺痉' order by score() desc limit 1") ResultSet rs = dataSource.connection.createStatement().executeQuery(sqlBuffer.toString()) def map = [:] while (rs.next()) { @@ -1049,7 +1049,7 @@ class AddThirdPriceDistrict { def pattern(def s){ - Pattern pattern = Pattern.compile("(东|南|北|西|甲|乙|丙|丁|一|二|三|四|五|六|七|八|九|十|东|南|西|北|\\w)+(期|区)") + Pattern pattern = Pattern.compile("(涓渱鍗梶鍖梶瑗縷鐢瞸涔檤涓檤涓亅涓�|浜寍涓墊鍥泑浜攟鍏瓅涓億鍏珅涔潀鍗亅涓渱鍗梶瑗縷鍖梶\\w)+(鏈焲鍖�)") def matcher = pattern.matcher(s) if(matcher.find()){ return matcher.group(); @@ -1084,7 +1084,7 @@ class AddThirdPriceDistrict { println index +" "+row } },0) - println "5.小区匹配完成" + println "5.灏忓尯鍖归厤瀹屾垚" } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/AddZhugeFangDistrictSeedsBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/AddZhugeFangDistrictSeedsBatch.groovy index 9ccab011a..58e96ebb6 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/AddZhugeFangDistrictSeedsBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/AddZhugeFangDistrictSeedsBatch.groovy @@ -16,7 +16,7 @@ import org.jsoup.nodes.Element import org.jsoup.select.Elements /** - * 发现诸葛找房小区详情页种子 + * 鍙戠幇璇歌憶鎵炬埧灏忓尯璇︽儏椤电瀛� * Created by gaojuan on 2018/2/7. */ @BatchOwner(Watcher.GaoJuan) @@ -123,7 +123,7 @@ class AddZhugeFangDistrictSeedsBatch extends BaseBatch{ if(elements) { for(def element : elements){ def blockName = element.text(); - if (blockName && blockName != "不限") { + if (blockName && blockName != "涓嶉檺") { def href = element.attr("href") blocks = blockMap.get(rName) if(!blocks){ @@ -131,7 +131,7 @@ class AddZhugeFangDistrictSeedsBatch extends BaseBatch{ blockMap.put(rName, blocks) } def newUrl = rUrl.toString().substring(0, rUrl.toString().indexOf(".com")+4) + href; - if(!newUrl.contains("垈tou") && !newUrl.contains("javascript:;")){ + if(!newUrl.contains("鍨坱ou") && !newUrl.contains("javascript:;")){ blocks << newUrl; } } @@ -157,7 +157,7 @@ class AddZhugeFangDistrictSeedsBatch extends BaseBatch{ if(elements){ for (Element element : elements) { def region = element.text(); - if(region && region!="不限"){ + if(region && region!="涓嶉檺"){ def href = element.attr("href") def newUrl = url.toString().substring(0, url.toString().indexOf(".com")+4) + href; regionMap.put(region, newUrl) @@ -177,10 +177,10 @@ class AddZhugeFangDistrictSeedsBatch extends BaseBatch{ document = Jsoup.parse(s); Elements elements = JQueryUtils.select([xpath], document) def ret = [:]; -// ret.put("上海", url+"/community"); +// ret.put("涓婃捣", url+"/community"); for (Element element : elements) { def city = element.text(); - if(city!="北京" && city!="上海"){ + if(city!="鍖椾含" && city!="涓婃捣"){ def href = element.attr("href") ret.put(city, href+"/community"); } @@ -214,7 +214,7 @@ class AddZhugeFangDistrictSeedsBatch extends BaseBatch{ count ++; Thread.sleep(20000) if(count >= 10){ - println "无法获取:"+url; + println "鏃犳硶鑾峰彇锛�"+url; errorsUrl << url return s; } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/AddressMatchLocation.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/AddressMatchLocation.groovy index f86770c56..3fc3cb4c7 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/AddressMatchLocation.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/AddressMatchLocation.groovy @@ -20,8 +20,8 @@ class AddressMatchLocation { def allCitys = CommonDatautils.findAllCity(); def allRegionMap = CommonDatautils.getAllCityRegions() - def gaodeCityCodeMap = ["北京":"110000","天津":"120000","石家庄":"130100","辛集":"130181","晋州":"130183","新乐":"130184","唐山":"130200","滦州":"130284","遵化":"130281","迁安":"130283","秦皇岛":"130300","邯郸":"130400","武安":"130481","邢台":"130500","南宫":"130581","沙河":"130582","保定":"130600","涿州":"130681","定州":"130682","安国":"130683","高碑店":"130684","张家口":"130700","承德":"130800","平泉":"130881","沧州":"130900","泊头":"130981","任丘":"130982","黄骅":"130983","河间":"130984","廊坊":"131000","霸州":"131081","三河":"131082","衡水":"131100","深州":"131182","太原":"140100","古交":"140181","大同":"140200","阳泉":"140300","长治":"140400","晋城":"140500","高平":"140581","朔州":"140600","怀仁":"140681","晋中":"140700","介休":"140781","运城":"140800","永济":"140881","河津":"140882","忻州":"140900","原平":"140981","临汾":"141000","侯马":"141081","霍州":"141082","吕梁":"141100","孝义":"141181","汾阳":"141182","呼和浩特":"150100","包头":"150200","乌海":"150300","赤峰":"150400","通辽":"150500","霍林郭勒":"150581","鄂尔多斯":"150600","呼伦贝尔":"150700","满洲里":"150781","牙克石":"150782","扎兰屯":"150783","额尔古纳":"150784","根河":"150785","巴彦淖尔":"150800","乌兰察布":"150900","丰镇":"150981","乌兰浩特":"152201","阿尔山":"152202","二连浩特":"152501","锡林浩特":"152502","沈阳":"210100","新民":"210181","大连":"210200","瓦房店":"210281","庄河":"210283","鞍山":"210300","海城":"210381","抚顺":"210400","本溪":"210500","丹东":"210600","东港":"210681","凤城":"210682","锦州":"210700","凌海":"210781","北镇":"210782","营口":"210800","西市区":"210803","盖州":"210881","大石桥":"210882","阜新":"210900","辽阳":"211000","灯塔":"211081","盘锦":"211100","铁岭":"211200","调兵山":"211281","开原":"211282","朝阳":"211300","北票":"211381","凌源":"211382","葫芦岛":"211400","兴城":"211481","长春":"220100","榆树":"220182","德惠":"220183","吉林":"220200","蛟河":"220281","桦甸":"220282","舒兰":"220283","磐石":"220284","四平":"220300","公主岭":"220381","双辽":"220382","辽源":"220400","通化":"220500","梅河口":"220581","集安":"220582","白山":"220600","临江":"220681","松原":"220700","扶余":"220781","白城":"220800","洮南":"220881","大安":"220882","延吉":"222401","图们":"222402","敦化":"222403","珲春":"222404","龙井":"222405","和龙":"222406","哈尔滨":"230100","尚志":"230183","五常":"230184","齐齐哈尔":"230200","讷河":"230281","鸡西":"230300","虎林":"230381","密山":"230382","鹤岗":"230400","双鸭山":"230500","大庆":"230600","伊春":"230700","铁力":"230781","佳木斯":"230800","同江":"230881","富锦":"230882","抚远":"230883","七台河":"230900","牡丹江":"231000","绥芬河":"231081","海林":"231083","宁安":"231084","穆棱":"231085","东宁":"231086","黑河":"231100","北安":"231181","五大连池":"231182","绥化":"231200","安达":"231281","肇东":"231282","海伦":"231283","漠河":"232701","上海":"310000","南京":"320100","无锡":"320200","江阴":"320281","宜兴":"320282","徐州":"320300","新沂":"320381","邳州":"320382","常州":"320400","溧阳":"320481","苏州":"320500","常熟":"320581","张家港":"320582","昆山":"320583","太仓":"320585","南通":"320600","海安":"320685","启东":"320681","如皋":"320682","海门":"320684","连云港":"320700","淮安":"320800","盐城":"320900","东台":"320981","扬州":"321000","仪征":"321081","高邮":"321084","镇江":"321100","丹阳":"321181","扬中":"321182","句容":"321183","泰州":"321200","兴化":"321281","靖江":"321282","泰兴":"321283","宿迁":"321300","杭州":"330100","建德":"330182","宁波":"330200","余姚":"330281","慈溪":"330282","温州":"330300","瑞安":"330381","乐清":"330382","嘉兴":"330400","海宁":"330481","平湖":"330482","桐乡":"330483","湖州":"330500","绍兴":"330600","诸暨":"330681","嵊州":"330683","金华":"330700","兰溪":"330781","义乌":"330782","东阳":"330783","永康":"330784","衢州":"330800","江山":"330881","舟山":"330900","台州":"331000","温岭":"331081","临海":"331082","玉环":"331083","丽水":"331100","龙泉":"331181","合肥":"340100","巢湖":"340181","芜湖":"340200","蚌埠":"340300","淮南":"340400","马鞍山":"340500","淮北":"340600","铜陵":"340700","安庆":"340800","潜山":"340882","桐城":"340881","黄山":"341000","滁州":"341100","天长":"341181","明光":"341182","阜阳":"341200","界首":"341282","宿州":"341300","六安":"341500","亳州":"341600","池州":"341700","宣城":"341800","宁国":"341881","福州":"350100","福清":"350181","厦门":"350200","莆田":"350300","三明":"350400","永安":"350481","泉州":"350500","石狮":"350581","晋江":"350582","南安":"350583","漳州":"350600","龙海":"350681","南平":"350700","邵武":"350781","武夷山":"350782","建瓯":"350783","龙岩":"350800","漳平":"350881","宁德":"350900","福安":"350981","福鼎":"350982","南昌":"360100","景德镇":"360200","乐平":"360281","萍乡":"360300","九江":"360400","瑞昌":"360481","共青城":"360482","庐山":"360483","新余":"360500","鹰潭":"360600","贵溪":"360681","赣州":"360700","瑞金":"360781","吉安":"360800","井冈山":"360881","宜春":"360900","丰城":"360981","樟树":"360982","高安":"360983","抚州":"361000","上饶":"361100","德兴":"361181","济南":"370100","市中区":"370103","青岛":"370200","市南区":"370202","市北区":"370203","胶州":"370281","平度":"370283","莱西":"370285","淄博":"370300","枣庄":"370400","市中区":"370402","滕州":"370481","东营":"370500","烟台":"370600","龙口":"370681","莱阳":"370682","莱州":"370683","蓬莱":"370684","招远":"370685","栖霞":"370686","海阳":"370687","潍坊":"370700","青州":"370781","诸城":"370782","寿光":"370783","安丘":"370784","高密":"370785","昌邑":"370786","济宁":"370800","曲阜":"370881","邹城":"370883","泰安":"370900","新泰":"370982","肥城":"370983","威海":"371000","荣成":"371082","乳山":"371083","日照":"371100","临沂":"371300","德州":"371400","乐陵":"371481","禹城":"371482","聊城":"371500","临清":"371581","滨州":"371600","邹平":"371681","菏泽":"371700","郑州":"410100","巩义":"410181","荥阳":"410182","新密":"410183","新郑":"410184","登封":"410185","开封":"410200","洛阳":"410300","偃师":"410381","平顶山":"410400","舞钢":"410481","汝州":"410482","安阳":"410500","林州":"410581","鹤壁":"410600","新乡":"410700","卫辉":"410781","辉县":"410782","焦作":"410800","沁阳":"410882","孟州":"410883","濮阳":"410900","许昌":"411000","禹州":"411081","长葛":"411082","漯河":"411100","三门峡":"411200","义马":"411281","灵宝":"411282","南阳":"411300","邓州":"411381","商丘":"411400","永城":"411481","信阳":"411500","周口":"411600","项城":"411681","驻马店":"411700","济源":"419001","武汉":"420100","黄石":"420200","大冶":"420281","十堰":"420300","丹江口":"420381","宜昌":"420500","宜都":"420581","当阳":"420582","枝江":"420583","襄阳":"420600","老河口":"420682","枣阳":"420683","宜城":"420684","鄂州":"420700","荆门":"420800","京山":"420882","钟祥":"420881","孝感":"420900","应城":"420981","安陆":"420982","汉川":"420984","荆州":"421000","沙市区":"421002","石首":"421081","洪湖":"421083","松滋":"421087","黄冈":"421100","麻城":"421181","武穴":"421182","咸宁":"421200","赤壁":"421281","随州":"421300","广水":"421381","恩施":"422801","利川":"422802","仙桃":"429004","潜江":"429005","天门":"429006","长沙":"430100","浏阳":"430181","宁乡":"430182","株洲":"430200","醴陵":"430281","湘潭":"430300","湘乡":"430381","韶山":"430382","衡阳":"430400","耒阳":"430481","常宁":"430482","邵阳":"430500","武冈":"430581","岳阳":"430600","汨罗":"430681","临湘":"430682","常德":"430700","津市":"430781","张家界":"430800","益阳":"430900","沅江":"430981","郴州":"431000","资兴":"431081","永州":"431100","怀化":"431200","洪江":"431281","娄底":"431300","冷水江":"431381","涟源":"431382","吉首":"433101","广州":"440100","韶关":"440200","乐昌":"440281","南雄":"440282","深圳":"440300","珠海":"440400","汕头":"440500","佛山":"440600","江门":"440700","台山":"440781","开平":"440783","鹤山":"440784","恩平":"440785","湛江":"440800","廉江":"440881","雷州":"440882","吴川":"440883","茂名":"440900","高州":"440981","化州":"440982","信宜":"440983","肇庆":"441200","四会":"441284","惠州":"441300","梅州":"441400","兴宁":"441481","汕尾":"441500","陆丰":"441581","河源":"441600","阳江":"441700","阳春":"441781","清远":"441800","英德":"441881","连州":"441882","东莞":"441900","中山":"442000","潮州":"445100","揭阳":"445200","普宁":"445281","云浮":"445300","罗定":"445381","南宁":"450100","柳州":"450200","桂林":"450300","荔浦":"450381","梧州":"450400","岑溪":"450481","北海":"450500","防城港":"450600","东兴":"450681","钦州":"450700","贵港":"450800","桂平":"450881","玉林":"450900","北流":"450981","百色":"451000","靖西":"451081","贺州":"451100","河池":"451200","来宾":"451300","合山":"451381","崇左":"451400","凭祥":"451481","海口":"460100","三亚":"460200","三沙":"460300","儋州":"460400","五指山":"469001","琼海":"469002","文昌":"469005","万宁":"469006","东方":"469007","重庆":"500000","重庆市郊县":"500200","成都":"510100","都江堰":"510181","彭州":"510182","邛崃":"510183","崇州":"510184","简阳":"510185","自贡":"510300","攀枝花":"510400","泸州":"510500","德阳":"510600","广汉":"510681","什邡":"510682","绵竹":"510683","绵阳":"510700","江油":"510781","广元":"510800","遂宁":"510900","内江":"511000","市中区":"511002","隆昌":"511083","乐山":"511100","市中区":"511102","峨眉山":"511181","南充":"511300","阆中":"511381","眉山":"511400","宜宾":"511500","广安":"511600","华蓥":"511681","达州":"511700","万源":"511781","雅安":"511800","巴中":"511900","资阳":"512000","马尔康":"513201","康定":"513301","西昌":"513401","贵阳":"520100","清镇":"520181","六盘水":"520200","盘州":"520281","遵义":"520300","赤水":"520381","仁怀":"520382","安顺":"520400","毕节":"520500","铜仁":"520600","兴义":"522301","兴仁":"522302","凯里":"522601","都匀":"522701","福泉":"522702","昆明":"530100","安宁":"530181","曲靖":"530300","宣威":"530381","玉溪":"530400","保山":"530500","腾冲":"530581","昭通":"530600","水富":"530681","丽江":"530700","普洱":"530800","临沧":"530900","楚雄":"532301","个旧":"532501","开远":"532502","蒙自":"532503","弥勒":"532504","文山":"532601","景洪":"532801","大理":"532901","瑞丽":"533102","芒":"533103","泸水":"533301","香格里拉":"533401","拉萨":"540100","日喀则":"540200","昌都":"540300","林芝":"540400","山南":"540500","那曲":"540600","西安":"610100","铜川":"610200","宝鸡":"610300","咸阳":"610400","彬州":"610482","兴平":"610481","渭南":"610500","韩城":"610581","华阴":"610582","延安":"610600","汉中":"610700","榆林":"610800","神木":"610881","安康":"610900","商洛":"611000","兰州":"620100","嘉峪关":"620200","金昌":"620300","白银":"620400","天水":"620500","武威":"620600","张掖":"620700","平凉":"620800","华亭":"620881","酒泉":"620900","玉门":"620981","敦煌":"620982","庆阳":"621000","定西":"621100","陇南":"621200","临夏":"622901","合作":"623001","西宁":"630100","海东":"630200","玉树":"632701","格尔木":"632801","德令哈":"632802","茫崖":"632803","银川":"640100","灵武":"640181","石嘴山":"640200","吴忠":"640300","青铜峡":"640381","固原":"640400","中卫":"640500","乌鲁木齐":"650100","新市区":"650104","克拉玛依":"650200","吐鲁番":"650400","哈密":"650500","昌吉":"652301","阜康":"652302","博乐":"652701","阿拉山口":"652702","库尔勒":"652801","阿克苏":"652901","阿图什":"653001","喀什":"653101","和田":"653201","伊宁":"654002","奎屯":"654003","霍尔果斯":"654004","塔城":"654201","乌苏":"654202","阿勒泰":"654301","石河子":"659001","阿拉尔":"659002","图木舒克":"659003","五家渠":"659004","北屯":"659005","铁门关":"659006","双河":"659007","可克达拉":"659008","昆玉":"659009","伊犁":"654000"] - def baiduCityCodeMap = ["北京": "131", "天津": "332", "石家庄": "150", "唐山": "265", "秦皇岛": "148", "邯郸": "151", "邢台": "266", "保定": "307", "张家口": "264", "承德": "207", "沧州": "149", "廊坊": "191", "衡水": "208", "太原": "176", "大同": "355", "阳泉": "357", "长治": "356", "晋城": "290", "朔州": "237", "晋中": "238", "运城": "328", "忻州": "367", "临汾": "368", "吕梁": "327", "呼和浩特": "321", "包头": "229", "乌海": "123", "赤峰": "297", "通辽": "64", "鄂尔多斯": "283", "呼伦贝尔": "61", "巴彦淖尔": "169", "乌兰察布": "168", "兴安盟": "62", "锡林郭勒盟": "63", "阿拉善盟": "230", "沈阳": "58", "大连": "167", "鞍山": "320", "抚顺": "184", "本溪": "227", "丹东": "282", "锦州": "166", "营口": "281", "阜新": "59", "辽阳": "351", "盘锦": "228", "铁岭": "60", "朝阳": "280", "葫芦岛": "319", "长春": "53", "吉林市": "55", "四平": "56", "辽源": "183", "通化": "165", "白山": "57", "松原": "52", "白城": "51", "延边朝鲜族自治州": "54", "哈尔滨": "48", "齐齐哈尔": "41", "鸡西": "46", "鹤岗": "43", "双鸭山": "45", "大庆": "50", "伊春": "40", "佳木斯": "42", "七台河": "47", "牡丹江": "49", "黑河": "39", "绥化": "44", "大兴安岭地区": "38", "上海": "289", "南京": "315", "无锡": "317", "徐州": "316", "常州": "348", "苏州": "224", "南通": "161", "连云港": "347", "淮安": "162", "盐城": "223", "扬州": "346", "镇江": "160", "泰州": "276", "宿迁": "277", "杭州": "179", "宁波": "180", "温州": "178", "嘉兴": "334", "湖州": "294", "绍兴": "293", "金华": "333", "衢州": "243", "舟山": "245", "台州": "244", "丽水": "292", "合肥": "127", "芜湖": "129", "蚌埠": "126", "淮南": "250", "马鞍山": "358", "淮北": "253", "铜陵": "337", "安庆": "130", "黄山": "252", "滁州": "189", "阜阳": "128", "宿州": "370", "巢湖": "251", "六安": "298", "亳州": "188", "池州": "299", "宣城": "190", "福州": "300", "厦门": "194", "莆田": "195", "三明": "254", "泉州": "134", "漳州": "255", "南平": "133", "龙岩": "193", "宁德": "192", "南昌": "163", "景德镇": "225", "萍乡": "350", "九江": "349", "新余": "164", "鹰潭": "279", "赣州": "365", "吉安": "318", "宜春": "278", "抚州": "226", "上饶": "364", "济南": "288", "青岛": "236", "淄博": "354", "枣庄": "172", "东营": "174", "烟台": "326", "潍坊": "287", "济宁": "286", "泰安": "325", "威海": "175", "日照": "173", "莱芜": "124", "临沂": "234", "德州": "372", "聊城": "366", "滨州": "235", "菏泽": "353", "郑州": "268", "开封": "210", "洛阳": "153", "平顶山": "213", "安阳": "267", "鹤壁": "215", "新乡": "152", "焦作": "211", "濮阳": "209", "许昌": "155", "漯河": "344", "三门峡": "212", "南阳": "309", "商丘": "154", "信阳": "214", "周口": "308", "驻马店": "269", "武汉": "218", "黄石": "311", "十堰": "216", "宜昌": "270", "襄阳": "156", "鄂州": "122", "荆门": "217", "孝感": "310", "荆州": "157", "黄冈": "271", "咸宁": "362", "随州": "371", "恩施土家族苗族自治州": "373", "仙桃": "1713", "潜江": "1293", "天门": "2654", "神农架林区": "2734", "长沙": "158", "株洲": "222", "湘潭": "313", "衡阳": "159", "邵阳": "273", "岳阳": "220", "常德": "219", "张家界": "312", "益阳": "272", "郴州": "275", "永州": "314", "怀化": "363", "娄底": "221", "湘西土家族苗族自治州": "274", "广州": "257", "韶关": "137", "深圳": "340", "珠海": "140", "汕头": "303", "佛山": "138", "江门": "302", "湛江": "198", "茂名": "139", "肇庆": "338", "惠州": "301", "梅州": "141", "汕尾": "339", "河源": "200", "阳江": "199", "清远": "197", "东莞": "119", "中山": "187", "潮州": "201", "揭阳": "259", "云浮": "258", "南宁": "261", "柳州": "305", "桂林": "142", "梧州": "304", "北海": "295", "防城港": "204", "钦州": "145", "贵港": "341", "玉林": "361", "百色": "203", "贺州": "260", "河池": "143", "来宾": "202", "崇左": "144", "海口": "125", "三亚": "121", "五指山": "1644", "琼海": "2358", "儋州": "1215", "文昌": "2758", "万宁": "1216", "东方": "2634", "定安": "1214", "屯昌": "1641", "澄迈": "2757", "临高": "2033", "白沙": "2359", "昌江": "1642", "乐东": "2032", "陵水": "1643", "保亭": "1217", "琼中": "2031", "重庆": "132", "成都": "75", "自贡": "78", "攀枝花": "81", "泸州": "331", "德阳": "74", "绵阳": "240", "广元": "329", "遂宁": "330", "内江": "248", "乐山": "79", "南充": "291", "眉山": "77", "宜宾": "186", "广安": "241", "达州": "369", "雅安": "76", "巴中": "239", "资阳": "242", "阿坝州": "185", "甘孜州": "73", "凉山州": "80", "贵阳": "146", "六盘水": "147", "遵义": "262", "安顺": "263", "铜仁地区": "205", "黔西南州": "343", "毕节地区": "206", "黔东南州": "342", "黔南州": "306", "昆明": "104", "曲靖": "249", "玉溪": "106", "保山": "112", "昭通": "336", "丽江": "114", "临沧": "110", "楚雄州": "105", "红河哈尼族彝族自治州": "107", "文山壮族苗族自治州": "177", "普洱": "108", "西双版纳傣族自治州": "109", "大理州": "111", "德宏州": "116", "怒江州": "113", "迪庆州": "115", "拉萨": "100", "昌都地区": "99", "山南地区": "97", "日喀则地区": "102", "那曲地区": "101", "阿里地区": "103", "林芝地区": "98", "西安": "233", "铜川": "232", "宝鸡": "171", "咸阳": "323", "渭南": "170", "延安": "284", "汉中": "352", "榆林": "231", "安康": "324", "商洛": "285", "兰州": "36", "嘉峪关": "33", "金昌": "34", "白银": "35", "天水": "196", "武威": "118", "张掖": "117", "平凉": "359", "酒泉": "37", "庆阳": "135", "定西": "136", "陇南": "256", "临夏回族自治州": "182", "甘南藏族自治州": "247", "西宁": "66", "海东地区": "69", "海北藏族自治州": "67", "黄南藏族自治州": "70", "海南藏族自治州": "68", "果洛藏族自治州": "72", "玉树州": "71", "海西州": "65", "银川": "360", "石嘴山": "335", "吴忠": "322", "固原": "246", "中卫": "181", "乌鲁木齐": "92", "克拉玛依": "95", "吐鲁番地区": "89", "哈密地区": "91", "昌吉州": "93", "博尔塔拉蒙古自治州": "88", "巴音郭楞蒙古自治州": "86", "阿克苏地区": "85", "克孜勒苏柯尔克孜自治州": "84", "喀什地区": "83", "和田地区": "82", "伊犁": "90", "塔城地区": "94", "阿勒泰地区": "96", "石河子": "770", "阿拉尔": "731", "图木舒克": "792", "五家渠": "789", "香港特别行政区": "2912", "澳门特别行政区": "2911"] + def gaodeCityCodeMap = ["鍖椾含":"110000","澶╂触":"120000","鐭冲搴�":"130100","杈涢泦":"130181","鏅嬪窞":"130183","鏂颁箰":"130184","鍞愬北":"130200","婊﹀窞":"130284","閬靛寲":"130281","杩佸畨":"130283","绉︾殗宀�":"130300","閭兏":"130400","姝﹀畨":"130481","閭㈠彴":"130500","鍗楀":"130581","娌欐渤":"130582","淇濆畾":"130600","娑垮窞":"130681","瀹氬窞":"130682","瀹夊浗":"130683","楂樼搴�":"130684","寮犲鍙�":"130700","鎵垮痉":"130800","骞虫硥":"130881","娌у窞":"130900","娉婂ご":"130981","浠讳笜":"130982","榛勯獏":"130983","娌抽棿":"130984","寤婂潑":"131000","闇稿窞":"131081","涓夋渤":"131082","琛℃按":"131100","娣卞窞":"131182","澶師":"140100","鍙や氦":"140181","澶у悓":"140200","闃虫硥":"140300","闀挎不":"140400","鏅嬪煄":"140500","楂樺钩":"140581","鏈斿窞":"140600","鎬�浠�":"140681","鏅嬩腑":"140700","浠嬩紤":"140781","杩愬煄":"140800","姘告祹":"140881","娌虫触":"140882","蹇诲窞":"140900","鍘熷钩":"140981","涓存本":"141000","渚┈":"141081","闇嶅窞":"141082","鍚曟":"141100","瀛濅箟":"141181","姹鹃槼":"141182","鍛煎拰娴╃壒":"150100","鍖呭ご":"150200","涔屾捣":"150300","璧ゅ嘲":"150400","閫氳窘":"150500","闇嶆灄閮嫆":"150581","閯傚皵澶氭柉":"150600","鍛间鸡璐濆皵":"150700","婊℃床閲�":"150781","鐗欏厠鐭�":"150782","鎵庡叞灞�":"150783","棰濆皵鍙ょ撼":"150784","鏍规渤":"150785","宸村溅娣栧皵":"150800","涔屽叞瀵熷竷":"150900","涓伴晣":"150981","涔屽叞娴╃壒":"152201","闃垮皵灞�":"152202","浜岃繛娴╃壒":"152501","閿℃灄娴╃壒":"152502","娌堥槼":"210100","鏂版皯":"210181","澶ц繛":"210200","鐡︽埧搴�":"210281","搴勬渤":"210283","闉嶅北":"210300","娴峰煄":"210381","鎶氶『":"210400","鏈邯":"210500","涓逛笢":"210600","涓滄腐":"210681","鍑ゅ煄":"210682","閿﹀窞":"210700","鍑屾捣":"210781","鍖楅晣":"210782","钀ュ彛":"210800","瑗垮競鍖�":"210803","鐩栧窞":"210881","澶х煶妗�":"210882","闃滄柊":"210900","杈介槼":"211000","鐏":"211081","鐩橀敠":"211100","閾佸箔":"211200","璋冨叺灞�":"211281","寮�鍘�":"211282","鏈濋槼":"211300","鍖楃エ":"211381","鍑屾簮":"211382","钁姦宀�":"211400","鍏村煄":"211481","闀挎槬":"220100","姒嗘爲":"220182","寰锋儬":"220183","鍚夋灄":"220200","铔熸渤":"220281","妗︾敻":"220282","鑸掑叞":"220283","纾愮煶":"220284","鍥涘钩":"220300","鍏富宀�":"220381","鍙岃窘":"220382","杈芥簮":"220400","閫氬寲":"220500","姊呮渤鍙�":"220581","闆嗗畨":"220582","鐧藉北":"220600","涓存睙":"220681","鏉惧師":"220700","鎵朵綑":"220781","鐧藉煄":"220800","娲崡":"220881","澶у畨":"220882","寤跺悏":"222401","鍥句滑":"222402","鏁﹀寲":"222403","鐝叉槬":"222404","榫欎簳":"222405","鍜岄緳":"222406","鍝堝皵婊�":"230100","灏氬織":"230183","浜斿父":"230184","榻愰綈鍝堝皵":"230200","璁锋渤":"230281","楦¤タ":"230300","铏庢灄":"230381","瀵嗗北":"230382","楣ゅ矖":"230400","鍙岄腑灞�":"230500","澶у簡":"230600","浼婃槬":"230700","閾佸姏":"230781","浣虫湪鏂�":"230800","鍚屾睙":"230881","瀵岄敠":"230882","鎶氳繙":"230883","涓冨彴娌�":"230900","鐗′腹姹�":"231000","缁ヨ姮娌�":"231081","娴锋灄":"231083","瀹佸畨":"231084","绌嗘1":"231085","涓滃畞":"231086","榛戞渤":"231100","鍖楀畨":"231181","浜斿ぇ杩炴睜":"231182","缁ュ寲":"231200","瀹夎揪":"231281","鑲囦笢":"231282","娴蜂鸡":"231283","婕犳渤":"232701","涓婃捣":"310000","鍗椾含":"320100","鏃犻敗":"320200","姹熼槾":"320281","瀹滃叴":"320282","寰愬窞":"320300","鏂版矀":"320381","閭冲窞":"320382","甯稿窞":"320400","婧ч槼":"320481","鑻忓窞":"320500","甯哥啛":"320581","寮犲娓�":"320582","鏄嗗北":"320583","澶粨":"320585","鍗楅��":"320600","娴峰畨":"320685","鍚笢":"320681","濡傜殝":"320682","娴烽棬":"320684","杩炰簯娓�":"320700","娣畨":"320800","鐩愬煄":"320900","涓滃彴":"320981","鎵窞":"321000","浠緛":"321081","楂橀偖":"321084","闀囨睙":"321100","涓归槼":"321181","鎵腑":"321182","鍙ュ":"321183","娉板窞":"321200","鍏村寲":"321281","闈栨睙":"321282","娉板叴":"321283","瀹胯縼":"321300","鏉窞":"330100","寤哄痉":"330182","瀹佹尝":"330200","浣欏":"330281","鎱堟邯":"330282","娓╁窞":"330300","鐟炲畨":"330381","涔愭竻":"330382","鍢夊叴":"330400","娴峰畞":"330481","骞虫箹":"330482","妗愪埂":"330483","婀栧窞":"330500","缁嶅叴":"330600","璇告毃":"330681","宓婂窞":"330683","閲戝崕":"330700","鍏版邯":"330781","涔変箤":"330782","涓滈槼":"330783","姘稿悍":"330784","琛㈠窞":"330800","姹熷北":"330881","鑸熷北":"330900","鍙板窞":"331000","娓╁箔":"331081","涓存捣":"331082","鐜夌幆":"331083","涓芥按":"331100","榫欐硥":"331181","鍚堣偉":"340100","宸㈡箹":"340181","鑺滄箹":"340200","铓屽煚":"340300","娣崡":"340400","椹瀺灞�":"340500","娣寳":"340600","閾滈櫟":"340700","瀹夊簡":"340800","娼滃北":"340882","妗愬煄":"340881","榛勫北":"341000","婊佸窞":"341100","澶╅暱":"341181","鏄庡厜":"341182","闃滈槼":"341200","鐣岄":"341282","瀹垮窞":"341300","鍏畨":"341500","浜冲窞":"341600","姹犲窞":"341700","瀹e煄":"341800","瀹佸浗":"341881","绂忓窞":"350100","绂忔竻":"350181","鍘﹂棬":"350200","鑾嗙敯":"350300","涓夋槑":"350400","姘稿畨":"350481","娉夊窞":"350500","鐭崇嫯":"350581","鏅嬫睙":"350582","鍗楀畨":"350583","婕冲窞":"350600","榫欐捣":"350681","鍗楀钩":"350700","閭垫":"350781","姝﹀し灞�":"350782","寤虹摨":"350783","榫欏博":"350800","婕冲钩":"350881","瀹佸痉":"350900","绂忓畨":"350981","绂忛紟":"350982","鍗楁槍":"360100","鏅痉闀�":"360200","涔愬钩":"360281","钀嶄埂":"360300","涔濇睙":"360400","鐟炴槍":"360481","鍏遍潚鍩�":"360482","搴愬北":"360483","鏂颁綑":"360500","楣版江":"360600","璐垫邯":"360681","璧e窞":"360700","鐟為噾":"360781","鍚夊畨":"360800","浜曞唸灞�":"360881","瀹滄槬":"360900","涓板煄":"360981","妯熸爲":"360982","楂樺畨":"360983","鎶氬窞":"361000","涓婇ザ":"361100","寰峰叴":"361181","娴庡崡":"370100","甯備腑鍖�":"370103","闈掑矝":"370200","甯傚崡鍖�":"370202","甯傚寳鍖�":"370203","鑳跺窞":"370281","骞冲害":"370283","鑾辫タ":"370285","娣勫崥":"370300","鏋e簞":"370400","甯備腑鍖�":"370402","婊曞窞":"370481","涓滆惀":"370500","鐑熷彴":"370600","榫欏彛":"370681","鑾遍槼":"370682","鑾卞窞":"370683","钃幈":"370684","鎷涜繙":"370685","鏍栭湠":"370686","娴烽槼":"370687","娼嶅潑":"370700","闈掑窞":"370781","璇稿煄":"370782","瀵垮厜":"370783","瀹変笜":"370784","楂樺瘑":"370785","鏄岄倯":"370786","娴庡畞":"370800","鏇查槣":"370881","閭瑰煄":"370883","娉板畨":"370900","鏂版嘲":"370982","鑲ュ煄":"370983","濞佹捣":"371000","鑽f垚":"371082","涔冲北":"371083","鏃ョ収":"371100","涓存矀":"371300","寰峰窞":"371400","涔愰櫟":"371481","绂瑰煄":"371482","鑱婂煄":"371500","涓存竻":"371581","婊ㄥ窞":"371600","閭瑰钩":"371681","鑿忔辰":"371700","閮戝窞":"410100","宸╀箟":"410181","鑽ラ槼":"410182","鏂板瘑":"410183","鏂伴儜":"410184","鐧诲皝":"410185","寮�灏�":"410200","娲涢槼":"410300","鍋冨笀":"410381","骞抽《灞�":"410400","鑸為挗":"410481","姹濆窞":"410482","瀹夐槼":"410500","鏋楀窞":"410581","楣ゅ":"410600","鏂颁埂":"410700","鍗緣":"410781","杈夊幙":"410782","鐒︿綔":"410800","娌侀槼":"410882","瀛熷窞":"410883","婵槼":"410900","璁告槍":"411000","绂瑰窞":"411081","闀胯憶":"411082","婕渤":"411100","涓夐棬宄�":"411200","涔夐┈":"411281","鐏靛疂":"411282","鍗楅槼":"411300","閭撳窞":"411381","鍟嗕笜":"411400","姘稿煄":"411481","淇¢槼":"411500","鍛ㄥ彛":"411600","椤瑰煄":"411681","椹婚┈搴�":"411700","娴庢簮":"419001","姝︽眽":"420100","榛勭煶":"420200","澶у喍":"420281","鍗佸牥":"420300","涓规睙鍙�":"420381","瀹滄槍":"420500","瀹滈兘":"420581","褰撻槼":"420582","鏋濇睙":"420583","瑗勯槼":"420600","鑰佹渤鍙�":"420682","鏋i槼":"420683","瀹滃煄":"420684","閯傚窞":"420700","鑽嗛棬":"420800","浜北":"420882","閽熺ゥ":"420881","瀛濇劅":"420900","搴斿煄":"420981","瀹夐檰":"420982","姹夊窛":"420984","鑽嗗窞":"421000","娌欏競鍖�":"421002","鐭抽":"421081","娲箹":"421083","鏉炬粙":"421087","榛勫唸":"421100","楹诲煄":"421181","姝︾┐":"421182","鍜稿畞":"421200","璧ゅ":"421281","闅忓窞":"421300","骞挎按":"421381","鎭╂柦":"422801","鍒╁窛":"422802","浠欐":"429004","娼滄睙":"429005","澶╅棬":"429006","闀挎矙":"430100","娴忛槼":"430181","瀹佷埂":"430182","鏍床":"430200","閱撮櫟":"430281","婀樻江":"430300","婀樹埂":"430381","闊跺北":"430382","琛¢槼":"430400","鑰掗槼":"430481","甯稿畞":"430482","閭甸槼":"430500","姝﹀唸":"430581","宀抽槼":"430600","姹ㄧ綏":"430681","涓存箻":"430682","甯稿痉":"430700","娲ュ競":"430781","寮犲鐣�":"430800","鐩婇槼":"430900","娌呮睙":"430981","閮村窞":"431000","璧勫叴":"431081","姘稿窞":"431100","鎬�鍖�":"431200","娲睙":"431281","濞勫簳":"431300","鍐锋按姹�":"431381","娑熸簮":"431382","鍚夐":"433101","骞垮窞":"440100","闊跺叧":"440200","涔愭槍":"440281","鍗楅泟":"440282","娣卞湷":"440300","鐝犳捣":"440400","姹曞ご":"440500","浣涘北":"440600","姹熼棬":"440700","鍙板北":"440781","寮�骞�":"440783","楣ゅ北":"440784","鎭╁钩":"440785","婀涙睙":"440800","寤夋睙":"440881","闆峰窞":"440882","鍚村窛":"440883","鑼傚悕":"440900","楂樺窞":"440981","鍖栧窞":"440982","淇″疁":"440983","鑲囧簡":"441200","鍥涗細":"441284","鎯犲窞":"441300","姊呭窞":"441400","鍏村畞":"441481","姹曞熬":"441500","闄嗕赴":"441581","娌虫簮":"441600","闃虫睙":"441700","闃虫槬":"441781","娓呰繙":"441800","鑻卞痉":"441881","杩炲窞":"441882","涓滆帪":"441900","涓北":"442000","娼窞":"445100","鎻槼":"445200","鏅畞":"445281","浜戞诞":"445300","缃楀畾":"445381","鍗楀畞":"450100","鏌冲窞":"450200","妗傛灄":"450300","鑽旀郸":"450381","姊у窞":"450400","宀戞邯":"450481","鍖楁捣":"450500","闃插煄娓�":"450600","涓滃叴":"450681","閽﹀窞":"450700","璐垫腐":"450800","妗傚钩":"450881","鐜夋灄":"450900","鍖楁祦":"450981","鐧捐壊":"451000","闈栬タ":"451081","璐哄窞":"451100","娌虫睜":"451200","鏉ュ":"451300","鍚堝北":"451381","宕囧乏":"451400","鍑ゥ":"451481","娴峰彛":"460100","涓変簹":"460200","涓夋矙":"460300","鍎嬪窞":"460400","浜旀寚灞�":"469001","鐞兼捣":"469002","鏂囨槍":"469005","涓囧畞":"469006","涓滄柟":"469007","閲嶅簡":"500000","閲嶅簡甯傞儕鍘�":"500200","鎴愰兘":"510100","閮芥睙鍫�":"510181","褰窞":"510182","閭涘磧":"510183","宕囧窞":"510184","绠�闃�":"510185","鑷础":"510300","鏀�鏋濊姳":"510400","娉稿窞":"510500","寰烽槼":"510600","骞挎眽":"510681","浠�閭�":"510682","缁电":"510683","缁甸槼":"510700","姹熸补":"510781","骞垮厓":"510800","閬傚畞":"510900","鍐呮睙":"511000","甯備腑鍖�":"511002","闅嗘槍":"511083","涔愬北":"511100","甯備腑鍖�":"511102","宄ㄧ湁灞�":"511181","鍗楀厖":"511300","闃嗕腑":"511381","鐪夊北":"511400","瀹滃":"511500","骞垮畨":"511600","鍗庤摜":"511681","杈惧窞":"511700","涓囨簮":"511781","闆呭畨":"511800","宸翠腑":"511900","璧勯槼":"512000","椹皵搴�":"513201","搴峰畾":"513301","瑗挎槍":"513401","璐甸槼":"520100","娓呴晣":"520181","鍏洏姘�":"520200","鐩樺窞":"520281","閬典箟":"520300","璧ゆ按":"520381","浠佹��":"520382","瀹夐『":"520400","姣曡妭":"520500","閾滀粊":"520600","鍏翠箟":"522301","鍏翠粊":"522302","鍑噷":"522601","閮藉寑":"522701","绂忔硥":"522702","鏄嗘槑":"530100","瀹夊畞":"530181","鏇查潠":"530300","瀹e▉":"530381","鐜夋邯":"530400","淇濆北":"530500","鑵惧啿":"530581","鏄��":"530600","姘村瘜":"530681","涓芥睙":"530700","鏅幢":"530800","涓存钵":"530900","妤氶泟":"532301","涓棫":"532501","寮�杩�":"532502","钂欒嚜":"532503","寮ュ嫆":"532504","鏂囧北":"532601","鏅椽":"532801","澶х悊":"532901","鐟炰附":"533102","鑺�":"533103","娉告按":"533301","棣欐牸閲屾媺":"533401","鎷夎惃":"540100","鏃ュ杸鍒�":"540200","鏄岄兘":"540300","鏋楄姖":"540400","灞卞崡":"540500","閭f洸":"540600","瑗垮畨":"610100","閾滃窛":"610200","瀹濋浮":"610300","鍜搁槼":"610400","褰窞":"610482","鍏村钩":"610481","娓崡":"610500","闊╁煄":"610581","鍗庨槾":"610582","寤跺畨":"610600","姹変腑":"610700","姒嗘灄":"610800","绁炴湪":"610881","瀹夊悍":"610900","鍟嗘礇":"611000","鍏板窞":"620100","鍢夊唱鍏�":"620200","閲戞槍":"620300","鐧介摱":"620400","澶╂按":"620500","姝﹀▉":"620600","寮犳帠":"620700","骞冲噳":"620800","鍗庝涵":"620881","閰掓硥":"620900","鐜夐棬":"620981","鏁︾厡":"620982","搴嗛槼":"621000","瀹氳タ":"621100","闄囧崡":"621200","涓村":"622901","鍚堜綔":"623001","瑗垮畞":"630100","娴蜂笢":"630200","鐜夋爲":"632701","鏍煎皵鏈�":"632801","寰蜂护鍝�":"632802","鑼礀":"632803","閾跺窛":"640100","鐏垫":"640181","鐭冲槾灞�":"640200","鍚村繝":"640300","闈掗摐宄�":"640381","鍥哄師":"640400","涓崼":"640500","涔岄瞾鏈ㄩ綈":"650100","鏂板競鍖�":"650104","鍏嬫媺鐜涗緷":"650200","鍚愰瞾鐣�":"650400","鍝堝瘑":"650500","鏄屽悏":"652301","闃滃悍":"652302","鍗氫箰":"652701","闃挎媺灞卞彛":"652702","搴撳皵鍕�":"652801","闃垮厠鑻�":"652901","闃垮浘浠�":"653001","鍠�浠�":"653101","鍜岀敯":"653201","浼婂畞":"654002","濂庡悲":"654003","闇嶅皵鏋滄柉":"654004","濉斿煄":"654201","涔岃嫃":"654202","闃垮嫆娉�":"654301","鐭虫渤瀛�":"659001","闃挎媺灏�":"659002","鍥炬湪鑸掑厠":"659003","浜斿娓�":"659004","鍖楀悲":"659005","閾侀棬鍏�":"659006","鍙屾渤":"659007","鍙厠杈炬媺":"659008","鏄嗙帀":"659009","浼婄妬":"654000"] + def baiduCityCodeMap = ["鍖椾含": "131", "澶╂触": "332", "鐭冲搴�": "150", "鍞愬北": "265", "绉︾殗宀�": "148", "閭兏": "151", "閭㈠彴": "266", "淇濆畾": "307", "寮犲鍙�": "264", "鎵垮痉": "207", "娌у窞": "149", "寤婂潑": "191", "琛℃按": "208", "澶師": "176", "澶у悓": "355", "闃虫硥": "357", "闀挎不": "356", "鏅嬪煄": "290", "鏈斿窞": "237", "鏅嬩腑": "238", "杩愬煄": "328", "蹇诲窞": "367", "涓存本": "368", "鍚曟": "327", "鍛煎拰娴╃壒": "321", "鍖呭ご": "229", "涔屾捣": "123", "璧ゅ嘲": "297", "閫氳窘": "64", "閯傚皵澶氭柉": "283", "鍛间鸡璐濆皵": "61", "宸村溅娣栧皵": "169", "涔屽叞瀵熷竷": "168", "鍏村畨鐩�": "62", "閿℃灄閮嫆鐩�": "63", "闃挎媺鍠勭洘": "230", "娌堥槼": "58", "澶ц繛": "167", "闉嶅北": "320", "鎶氶『": "184", "鏈邯": "227", "涓逛笢": "282", "閿﹀窞": "166", "钀ュ彛": "281", "闃滄柊": "59", "杈介槼": "351", "鐩橀敠": "228", "閾佸箔": "60", "鏈濋槼": "280", "钁姦宀�": "319", "闀挎槬": "53", "鍚夋灄甯�": "55", "鍥涘钩": "56", "杈芥簮": "183", "閫氬寲": "165", "鐧藉北": "57", "鏉惧師": "52", "鐧藉煄": "51", "寤惰竟鏈濋矞鏃忚嚜娌诲窞": "54", "鍝堝皵婊�": "48", "榻愰綈鍝堝皵": "41", "楦¤タ": "46", "楣ゅ矖": "43", "鍙岄腑灞�": "45", "澶у簡": "50", "浼婃槬": "40", "浣虫湪鏂�": "42", "涓冨彴娌�": "47", "鐗′腹姹�": "49", "榛戞渤": "39", "缁ュ寲": "44", "澶у叴瀹夊箔鍦板尯": "38", "涓婃捣": "289", "鍗椾含": "315", "鏃犻敗": "317", "寰愬窞": "316", "甯稿窞": "348", "鑻忓窞": "224", "鍗楅��": "161", "杩炰簯娓�": "347", "娣畨": "162", "鐩愬煄": "223", "鎵窞": "346", "闀囨睙": "160", "娉板窞": "276", "瀹胯縼": "277", "鏉窞": "179", "瀹佹尝": "180", "娓╁窞": "178", "鍢夊叴": "334", "婀栧窞": "294", "缁嶅叴": "293", "閲戝崕": "333", "琛㈠窞": "243", "鑸熷北": "245", "鍙板窞": "244", "涓芥按": "292", "鍚堣偉": "127", "鑺滄箹": "129", "铓屽煚": "126", "娣崡": "250", "椹瀺灞�": "358", "娣寳": "253", "閾滈櫟": "337", "瀹夊簡": "130", "榛勫北": "252", "婊佸窞": "189", "闃滈槼": "128", "瀹垮窞": "370", "宸㈡箹": "251", "鍏畨": "298", "浜冲窞": "188", "姹犲窞": "299", "瀹e煄": "190", "绂忓窞": "300", "鍘﹂棬": "194", "鑾嗙敯": "195", "涓夋槑": "254", "娉夊窞": "134", "婕冲窞": "255", "鍗楀钩": "133", "榫欏博": "193", "瀹佸痉": "192", "鍗楁槍": "163", "鏅痉闀�": "225", "钀嶄埂": "350", "涔濇睙": "349", "鏂颁綑": "164", "楣版江": "279", "璧e窞": "365", "鍚夊畨": "318", "瀹滄槬": "278", "鎶氬窞": "226", "涓婇ザ": "364", "娴庡崡": "288", "闈掑矝": "236", "娣勫崥": "354", "鏋e簞": "172", "涓滆惀": "174", "鐑熷彴": "326", "娼嶅潑": "287", "娴庡畞": "286", "娉板畨": "325", "濞佹捣": "175", "鏃ョ収": "173", "鑾辫姕": "124", "涓存矀": "234", "寰峰窞": "372", "鑱婂煄": "366", "婊ㄥ窞": "235", "鑿忔辰": "353", "閮戝窞": "268", "寮�灏�": "210", "娲涢槼": "153", "骞抽《灞�": "213", "瀹夐槼": "267", "楣ゅ": "215", "鏂颁埂": "152", "鐒︿綔": "211", "婵槼": "209", "璁告槍": "155", "婕渤": "344", "涓夐棬宄�": "212", "鍗楅槼": "309", "鍟嗕笜": "154", "淇¢槼": "214", "鍛ㄥ彛": "308", "椹婚┈搴�": "269", "姝︽眽": "218", "榛勭煶": "311", "鍗佸牥": "216", "瀹滄槍": "270", "瑗勯槼": "156", "閯傚窞": "122", "鑽嗛棬": "217", "瀛濇劅": "310", "鑽嗗窞": "157", "榛勫唸": "271", "鍜稿畞": "362", "闅忓窞": "371", "鎭╂柦鍦熷鏃忚嫍鏃忚嚜娌诲窞": "373", "浠欐": "1713", "娼滄睙": "1293", "澶╅棬": "2654", "绁炲啘鏋舵灄鍖�": "2734", "闀挎矙": "158", "鏍床": "222", "婀樻江": "313", "琛¢槼": "159", "閭甸槼": "273", "宀抽槼": "220", "甯稿痉": "219", "寮犲鐣�": "312", "鐩婇槼": "272", "閮村窞": "275", "姘稿窞": "314", "鎬�鍖�": "363", "濞勫簳": "221", "婀樿タ鍦熷鏃忚嫍鏃忚嚜娌诲窞": "274", "骞垮窞": "257", "闊跺叧": "137", "娣卞湷": "340", "鐝犳捣": "140", "姹曞ご": "303", "浣涘北": "138", "姹熼棬": "302", "婀涙睙": "198", "鑼傚悕": "139", "鑲囧簡": "338", "鎯犲窞": "301", "姊呭窞": "141", "姹曞熬": "339", "娌虫簮": "200", "闃虫睙": "199", "娓呰繙": "197", "涓滆帪": "119", "涓北": "187", "娼窞": "201", "鎻槼": "259", "浜戞诞": "258", "鍗楀畞": "261", "鏌冲窞": "305", "妗傛灄": "142", "姊у窞": "304", "鍖楁捣": "295", "闃插煄娓�": "204", "閽﹀窞": "145", "璐垫腐": "341", "鐜夋灄": "361", "鐧捐壊": "203", "璐哄窞": "260", "娌虫睜": "143", "鏉ュ": "202", "宕囧乏": "144", "娴峰彛": "125", "涓変簹": "121", "浜旀寚灞�": "1644", "鐞兼捣": "2358", "鍎嬪窞": "1215", "鏂囨槍": "2758", "涓囧畞": "1216", "涓滄柟": "2634", "瀹氬畨": "1214", "灞槍": "1641", "婢勮繄": "2757", "涓撮珮": "2033", "鐧芥矙": "2359", "鏄屾睙": "1642", "涔愪笢": "2032", "闄垫按": "1643", "淇濅涵": "1217", "鐞间腑": "2031", "閲嶅簡": "132", "鎴愰兘": "75", "鑷础": "78", "鏀�鏋濊姳": "81", "娉稿窞": "331", "寰烽槼": "74", "缁甸槼": "240", "骞垮厓": "329", "閬傚畞": "330", "鍐呮睙": "248", "涔愬北": "79", "鍗楀厖": "291", "鐪夊北": "77", "瀹滃": "186", "骞垮畨": "241", "杈惧窞": "369", "闆呭畨": "76", "宸翠腑": "239", "璧勯槼": "242", "闃垮潩宸�": "185", "鐢樺瓬宸�": "73", "鍑夊北宸�": "80", "璐甸槼": "146", "鍏洏姘�": "147", "閬典箟": "262", "瀹夐『": "263", "閾滀粊鍦板尯": "205", "榛旇タ鍗楀窞": "343", "姣曡妭鍦板尯": "206", "榛斾笢鍗楀窞": "342", "榛斿崡宸�": "306", "鏄嗘槑": "104", "鏇查潠": "249", "鐜夋邯": "106", "淇濆北": "112", "鏄��": "336", "涓芥睙": "114", "涓存钵": "110", "妤氶泟宸�": "105", "绾㈡渤鍝堝凹鏃忓綕鏃忚嚜娌诲窞": "107", "鏂囧北澹棌鑻楁棌鑷不宸�": "177", "鏅幢": "108", "瑗垮弻鐗堢撼鍌f棌鑷不宸�": "109", "澶х悊宸�": "111", "寰峰畯宸�": "116", "鎬掓睙宸�": "113", "杩簡宸�": "115", "鎷夎惃": "100", "鏄岄兘鍦板尯": "99", "灞卞崡鍦板尯": "97", "鏃ュ杸鍒欏湴鍖�": "102", "閭f洸鍦板尯": "101", "闃块噷鍦板尯": "103", "鏋楄姖鍦板尯": "98", "瑗垮畨": "233", "閾滃窛": "232", "瀹濋浮": "171", "鍜搁槼": "323", "娓崡": "170", "寤跺畨": "284", "姹変腑": "352", "姒嗘灄": "231", "瀹夊悍": "324", "鍟嗘礇": "285", "鍏板窞": "36", "鍢夊唱鍏�": "33", "閲戞槍": "34", "鐧介摱": "35", "澶╂按": "196", "姝﹀▉": "118", "寮犳帠": "117", "骞冲噳": "359", "閰掓硥": "37", "搴嗛槼": "135", "瀹氳タ": "136", "闄囧崡": "256", "涓村鍥炴棌鑷不宸�": "182", "鐢樺崡钘忔棌鑷不宸�": "247", "瑗垮畞": "66", "娴蜂笢鍦板尯": "69", "娴峰寳钘忔棌鑷不宸�": "67", "榛勫崡钘忔棌鑷不宸�": "70", "娴峰崡钘忔棌鑷不宸�": "68", "鏋滄礇钘忔棌鑷不宸�": "72", "鐜夋爲宸�": "71", "娴疯タ宸�": "65", "閾跺窛": "360", "鐭冲槾灞�": "335", "鍚村繝": "322", "鍥哄師": "246", "涓崼": "181", "涔岄瞾鏈ㄩ綈": "92", "鍏嬫媺鐜涗緷": "95", "鍚愰瞾鐣湴鍖�": "89", "鍝堝瘑鍦板尯": "91", "鏄屽悏宸�": "93", "鍗氬皵濉旀媺钂欏彜鑷不宸�": "88", "宸撮煶閮钂欏彜鑷不宸�": "86", "闃垮厠鑻忓湴鍖�": "85", "鍏嬪瓬鍕掕嫃鏌皵鍏嬪瓬鑷不宸�": "84", "鍠�浠�鍦板尯": "83", "鍜岀敯鍦板尯": "82", "浼婄妬": "90", "濉斿煄鍦板尯": "94", "闃垮嫆娉板湴鍖�": "96", "鐭虫渤瀛�": "770", "闃挎媺灏�": "731", "鍥炬湪鑸掑厠": "792", "浜斿娓�": "789", "棣欐腐鐗瑰埆琛屾斂鍖�": "2912", "婢抽棬鐗瑰埆琛屾斂鍖�": "2911"] static main(args) { def task = new AddressMatchLocation(); @@ -32,7 +32,7 @@ class AddressMatchLocation { def index = 0 //multiThreadingModify - ExcelUtils.multiThreadingModify("E:\\数据\\数据五-2.xlsx", { row -> + ExcelUtils.multiThreadingModify("E:\\鏁版嵁\\鏁版嵁浜�-2.xlsx", { row -> def address = row['G'] def city = null def lng = row['J'] @@ -194,7 +194,7 @@ class AddressMatchLocation { def str = ret.get(0).location def level = ret.get(0).level - if(str && ["门牌号","单元号","道路","道路交叉路口","热点商圈","村庄","兴趣点"].contains(level)){ + if(str && ["闂ㄧ墝鍙�","鍗曞厓鍙�","閬撹矾","閬撹矾浜ゅ弶璺彛","鐑偣鍟嗗湀","鏉戝簞","鍏磋叮鐐�"].contains(level)){ def arrs = str.split(",") return ["lng":arrs[0], "lat":arrs[1]] }else{ @@ -238,7 +238,7 @@ class AddressMatchLocation { // def regions = m.value // for(def regionMap : regions){ // def region = regionMap.key -// if(!region.contains("开发") && !region.contains("高新") && s.contains(region)){ +// if(!region.contains("寮�鍙�") && !region.contains("楂樻柊") && s.contains(region)){ // newCity = city; // break; // } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/AliasProcess.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/AliasProcess.groovy index 53bf2e17d..2567fb6d6 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/AliasProcess.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/AliasProcess.groovy @@ -29,21 +29,21 @@ class AliasProcess { def checkAlias(city, districts){ def alias = [] def alias2 = [] - alias << ["别名"] - alias2 << ["城市", "区域", "名称", "别名", "修改后别名"] + alias << ["鍒悕"] + alias2 << ["鍩庡競", "鍖哄煙", "鍚嶇О", "鍒悕", "淇敼鍚庡埆鍚�"] def updateIndex = 0; for(def dbo : districts){ if(dbo.alias){ def newAlais = [] for(def s : dbo.alias){ -// if(dbo.name!="森陇家园"){ +// if(dbo.name!="妫檱瀹跺洯"){ // break // } - s = nullFilter(s);//空值过滤 - s = charFilter(s)//特殊字符 + s = nullFilter(s);//绌哄�艰繃婊� + s = charFilter(s)//鐗规畩瀛楃 - s = specialChineseChar(dbo.region, s);//特殊汉字 + s = specialChineseChar(dbo.region, s);//鐗规畩姹夊瓧 def array = splitWord(s); if(array && array.size()>0){ @@ -59,7 +59,7 @@ class AliasProcess { alias << [name] } }else{ - println "【"+name +"】 太长或太短" + println "銆�"+name +"銆� 澶暱鎴栧お鐭�" } } } @@ -83,8 +83,8 @@ class AliasProcess { } } println city +" "+ updateIndex - ExcelUtils.write("D:\\数据\\别名\\("+city+")所有别名.xlsx",alias,"全国") - ExcelUtils.write("D:\\数据\\别名\\("+city+")-Update.xlsx",alias2,"全国") + ExcelUtils.write("D:\\鏁版嵁\\鍒悕\\("+city+")鎵�鏈夊埆鍚�.xlsx",alias,"鍏ㄥ浗") + ExcelUtils.write("D:\\鏁版嵁\\鍒悕\\("+city+")-Update.xlsx",alias2,"鍏ㄥ浗") } @@ -92,12 +92,12 @@ class AliasProcess { for(def dbo : districts){ def buildType = dbo.build_type if(buildType){ - if(buildType.contains("低层")){ + if(buildType.contains("浣庡眰")){ - if(buildType.contains("多层")){ - buildType = buildType.replace("低层","") + if(buildType.contains("澶氬眰")){ + buildType = buildType.replace("浣庡眰","") }else{ - buildType = buildType.replace("低层","多层") + buildType = buildType.replace("浣庡眰","澶氬眰") } if(buildType && buildType.toString().startsWith(",")){ buildType = buildType.toString().substring(1, buildType.toString().length()) @@ -128,30 +128,30 @@ class AliasProcess { s = s.toString().substring(1, s.toString().length()-1) } - if(s.toString().startsWith("(") && s.toString().endsWith(")")){ + if(s.toString().startsWith("锛�") && s.toString().endsWith("锛�")){ s = s.toString().substring(1, s.toString().length()-1) } - def charArray = ["《","》","【","】"," ","“","”","."]; + def charArray = ["銆�","銆�","銆�","銆�"," ","鈥�","鈥�","."]; for(def res : charArray){ s = s.replace(res, ""); } - s = s.replace("(","(").replace(")",")") + s = s.replace("锛�","(").replace("锛�",")") - if(s.contains("(公寓)")){ - def temp = s.replace("(公寓)","") - if(temp.contains("公寓")){ + if(s.contains("(鍏瘬)")){ + def temp = s.replace("(鍏瘬)","") + if(temp.contains("鍏瘬")){ s = temp; }else{ - s = s.replace("(公寓)","公寓") + s = s.replace("(鍏瘬)","鍏瘬") } } - if(s.contains("(别墅)")){ - def temp = s.replace("(别墅)","") - if(temp.contains("别墅")){ + if(s.contains("(鍒)")){ + def temp = s.replace("(鍒)","") + if(temp.contains("鍒")){ return temp; }else{ - s = s.replace("(别墅)","别墅") + s = s.replace("(鍒)","鍒") } } @@ -175,13 +175,13 @@ class AliasProcess { return null; } - s = s.replace("("+region+"区)","").replace("("+region+")","") - def chars = ["扩大范围","地块"] + s = s.replace("("+region+"鍖�)","").replace("("+region+")","") + def chars = ["鎵╁ぇ鑼冨洿","鍦板潡"] for(def key : chars){ if(s.contains(key)){ - if(s.contains("(")){ - def count1 = s.indexOf("(") - def count2 = s.indexOf("地块") + if(s.contains("锛�")){ + def count1 = s.indexOf("锛�") + def count2 = s.indexOf("鍦板潡") if(count2>count1){ s = s.toString().substring(0, count1) }else{ @@ -203,8 +203,8 @@ class AliasProcess { if(s.contains(";")){ array = s.split(";") } - if(s.contains("、")){ - array = s.split("、") + if(s.contains("銆�")){ + array = s.split("銆�") } @@ -230,7 +230,7 @@ class AliasProcess { def findCommonChar(s){ - Pattern pattern = Pattern.compile('(\\d+|A|B|C|D|一期|二期|三期|四期|五期)'); + Pattern pattern = Pattern.compile('(\\d+|A|B|C|D|涓�鏈焲浜屾湡|涓夋湡|鍥涙湡|浜旀湡)'); Matcher matcher = pattern.matcher(s); List list = new ArrayList(); while (matcher.find()) { @@ -244,7 +244,7 @@ class AliasProcess { def findWord(s){ - Pattern pattern = Pattern.compile('(A区|B区|C区|D区|E区|H区|一区|二区|三区|四区|五区|一期|二期|三期|四期|五期|东区|西区|南区|北区|阳光|农房|北岸|南站|明珠|住宅|商住|公寓|北苑|北园|大楼|八街|安园|佳园|花苑)'); + Pattern pattern = Pattern.compile('(A鍖簗B鍖簗C鍖簗D鍖簗E鍖簗H鍖簗涓�鍖簗浜屽尯|涓夊尯|鍥涘尯|浜斿尯|涓�鏈焲浜屾湡|涓夋湡|鍥涙湡|浜旀湡|涓滃尯|瑗垮尯|鍗楀尯|鍖楀尯|闃冲厜|鍐滄埧|鍖楀哺|鍗楃珯|鏄庣彔|浣忓畢|鍟嗕綇|鍏瘬|鍖楄嫅|鍖楀洯|澶фゼ|鍏|瀹夊洯|浣冲洯|鑺辫嫅)'); Matcher matcher = pattern.matcher(s); List list = new ArrayList(); while (matcher.find()) { @@ -259,7 +259,7 @@ class AliasProcess { def includeWord(s){ if(s){ - def keys = ["号楼"]; + def keys = ["鍙锋ゼ"]; for(def key : keys){ if(s.contains(key)){ return null; @@ -270,7 +270,7 @@ class AliasProcess { } public static def fenQifiler(def s) { - Pattern pattern = Pattern.compile('[1|2|3|4|5|一|二|三|四|五|六|七].*、[1|2|3|4|5|一|二|三|四|五|六|七][期|村]'); + Pattern pattern = Pattern.compile('[1|2|3|4|5|涓�|浜寍涓墊鍥泑浜攟鍏瓅涓僝.*銆乕1|2|3|4|5|涓�|浜寍涓墊鍥泑浜攟鍏瓅涓僝[鏈焲鏉慮'); Matcher matcher = pattern.matcher(s); List list = new ArrayList(); @@ -278,7 +278,7 @@ class AliasProcess { list.add(matcher.group()); } if(list.size()==0) { - pattern = Pattern.compile('[1|2|3|4|5|一|二|三|四|五|六|七]期?至[1|2|3|4|5|一|二|三|四|五|六|七]期?'); + pattern = Pattern.compile('[1|2|3|4|5|涓�|浜寍涓墊鍥泑浜攟鍏瓅涓僝鏈�?鑷砙1|2|3|4|5|涓�|浜寍涓墊鍥泑浜攟鍏瓅涓僝鏈�?'); matcher = pattern.matcher(s); while (matcher.find()) { list.add(matcher.group()); @@ -310,7 +310,7 @@ class AliasProcess { } def findRoadNumber(s){ - Pattern pattern = Pattern.compile('路\\d+(弄|号)'); + Pattern pattern = Pattern.compile('璺痋\d+(寮剕鍙�)'); Matcher matcher = pattern.matcher(s); List list = new ArrayList(); while (matcher.find()) { @@ -339,11 +339,11 @@ class AliasProcess { if(s == num){ return false; } - if(s == num+"弄小区"){ + if(s == num+"寮勫皬鍖�"){ return false; } def s1 = distNname.replace(name, "") - if(s1 && ["小区","公寓","别墅","商住"].contains(s1)){ + if(s1 && ["灏忓尯","鍏瘬","鍒","鍟嗕綇"].contains(s1)){ return false; } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ApiTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ApiTest.groovy index 29dc8483c..3b4385695 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ApiTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ApiTest.groovy @@ -13,26 +13,26 @@ class ApiTest { } def evaluationBath(){ - def path = "d:\\数据\\测试数据\\农行特殊房验证案例.xlsx" + def path = "d:\\鏁版嵁\\娴嬭瘯鏁版嵁\\鍐滆鐗规畩鎴块獙璇佹渚�.xlsx" ExcelUtils.modify(path, { data -> def s = data['B'] - def address = s.toString().substring(0, s.toString().indexOf("弄")+1) + def address = s.toString().substring(0, s.toString().indexOf("寮�")+1) def house_num = null; - if(s.contains("栋")){ - house_num = s.toString().substring(s.toString().indexOf("弄")+1, s.toString().indexOf("栋")) + if(s.contains("鏍�")){ + house_num = s.toString().substring(s.toString().indexOf("寮�")+1, s.toString().indexOf("鏍�")) } def room_num = null; - if(s.contains("室")){ - room_num = s.toString().substring(s.toString().indexOf("栋")+1, s.toString().indexOf("室")) + if(s.contains("瀹�")){ + room_num = s.toString().substring(s.toString().indexOf("鏍�")+1, s.toString().indexOf("瀹�")) } def map = queryEvaluation(data['A'], address, house_num, room_num) if(!map){ map = [:] - if(s.contains("绿地丽水名邸")){ - map.region="青浦" - map.name = "绿地丽水名邸" + if(s.contains("缁垮湴涓芥按鍚嶉偢")){ + map.region="闈掓郸" + map.name = "缁垮湴涓芥按鍚嶉偢" } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/BaiduMapCrawl.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/BaiduMapCrawl.groovy index 5d595253d..c2e24eedb 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/BaiduMapCrawl.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/BaiduMapCrawl.groovy @@ -44,18 +44,18 @@ class BaiduMapCrawl { final AtomicInteger count = new AtomicInteger() def updateLists = [] def index = 0 - public static final def SOURCE = "百度"; + public static final def SOURCE = "鐧惧害"; static main(args) { // def task = new BaiduMapCrawl(); // task.run() - def s = DataHandleUtils.findMatchPattern("东辉村坑山社42号楼", "\\d+号楼") + def s = DataHandleUtils.findMatchPattern("涓滆緣鏉戝潙灞辩ぞ42鍙锋ゼ", "\\d+鍙锋ゼ") println s } def run(){ - def citys = ["南平","厦门","宁德","龙岩","福州","三明","泉州","莆田","漳州"] + def citys = ["鍗楀钩","鍘﹂棬","瀹佸痉","榫欏博","绂忓窞","涓夋槑","娉夊窞","鑾嗙敯","婕冲窞"] for(def city : citys){ def cityLations = findAllLation(city); baiduCitySearch(cityLations); @@ -86,7 +86,7 @@ class BaiduMapCrawl { lats.sort() lngs.sort() println index +" "+location.city+" "+ bound_bd - def result = BaiduMapUtils.searchByBounds("住宅", lats[0], lngs[0], lats[1], lngs[1]) + def result = BaiduMapUtils.searchByBounds("浣忓畢", lats[0], lngs[0], lats[1], lngs[1]) if(result){ println result.size() parseData(result); @@ -113,7 +113,7 @@ class BaiduMapCrawl { map.address = DataUtil.formateAddress(map.cityname, arr.address) map.m_date = DateUtil.formatDate(new Date(),"yyyy-MM-dd HH:mm:ss").replace(" ","T") map.org_address = arr.address - map.name = arr.name.replace("(建设中)","") + map.name = arr.name.replace("(寤鸿涓�)","") def location = arr.location if(location){ @@ -174,7 +174,7 @@ class BaiduMapCrawl { conn.connect(); println param.toString() - //输出流 + //杈撳嚭娴� if (StringUtils.isNotEmpty(param)) { mWriter = new BufferedWriter(new OutputStreamWriter(conn.getOutputStream(), charset)); mWriter.write(param); @@ -200,7 +200,7 @@ class BaiduMapCrawl { def update(location){ def udata = new BasicDBObject(); - udata.put("status","完成") + udata.put("status","瀹屾垚") BOUNDS_COLL.update(new BasicDBObject('_id', location._id), new BasicDBObject('$set', udata), true, false) } @@ -213,7 +213,7 @@ class BaiduMapCrawl { for(def location : updateLists){ if(location && location._id){ Document updateDocument = new Document(); - def doc = new Document("status","完成").append("m_date", new Date()) + def doc = new Document("status","瀹屾垚").append("m_date", new Date()) updateDocument.append('$set', doc); Bson updateBson = Filters.eq("_id", location._id); UpdateOneModel updateOneModel = new UpdateOneModel(updateBson, updateDocument); @@ -223,7 +223,7 @@ class BaiduMapCrawl { try{ COLL.bulkWrite(writeModelList) }catch (Exception e){ - println "异常" + println "寮傚父" } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/BaiduMapSearchTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/BaiduMapSearchTest.groovy index 5954a4abb..c52851084 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/BaiduMapSearchTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/BaiduMapSearchTest.groovy @@ -13,7 +13,7 @@ class BaiduMapSearchTest { } def run(){ def index = 0; - ExcelUtils.modify("D:\\数据\\分期.xlsx", { row -> + ExcelUtils.modify("D:\\鏁版嵁\\鍒嗘湡.xlsx", { row -> index ++; def city = row['B'] @@ -77,17 +77,17 @@ class BaiduMapSearchTest { if(name1 || name2){ if(name1 == name){ if(region1 && region1!=region){ - return "库中存在,百度可搜到,与库中区域[${dbo.region}]不同" + return "搴撲腑瀛樺湪锛岀櫨搴﹀彲鎼滃埌锛屼笌搴撲腑鍖哄煙[${dbo.region}]涓嶅悓" } }else if(name2 == name){ if(region2 && region2!=region){ - return "库中存在,百度可搜到,与库中区域[${dbo.region}]不同" + return "搴撲腑瀛樺湪锛岀櫨搴﹀彲鎼滃埌锛屼笌搴撲腑鍖哄煙[${dbo.region}]涓嶅悓" } } } if(region != dbo.region){ - return "库中存在,与区域[${dbo.region}]不同" + return "搴撲腑瀛樺湪锛屼笌鍖哄煙[${dbo.region}]涓嶅悓" } } return ""; @@ -96,12 +96,12 @@ class BaiduMapSearchTest { def regionStandard(String region){ def s = null; - if(region && region.indexOf("市")>-1){ - def r = region.substring(region.indexOf("市")+1, region.length()) - if(r.indexOf("区")>-1){ - s = r.substring(0,r.indexOf("区")) - }else if(r.indexOf("县")>-1){ - s = r.substring(0,r.indexOf("县")) + if(region && region.indexOf("甯�")>-1){ + def r = region.substring(region.indexOf("甯�")+1, region.length()) + if(r.indexOf("鍖�")>-1){ + s = r.substring(0,r.indexOf("鍖�")) + }else if(r.indexOf("鍘�")>-1){ + s = r.substring(0,r.indexOf("鍘�")) } } return s; @@ -114,15 +114,15 @@ class BaiduMapSearchTest { def t if(name.indexOf(")")>-1){ t = name.substring(name.indexOf("(")+1, name.indexOf(")")) - }else if(name.indexOf(")")>-1){ - t = name.substring(name.indexOf("(")+1, name.indexOf(")")) + }else if(name.indexOf("锛�")>-1){ + t = name.substring(name.indexOf("(")+1, name.indexOf("锛�")) } - if(t.endsWith("期")){ + if(t.endsWith("鏈�")){ name = name.replaceAll("\\(","").replaceAll("\\)","") } } - return name.replaceAll("-","").replaceAll("1期","一期").replaceAll("2期","二期").replaceAll("3期","三期").replaceAll("4期","四期").replaceAll("5期","五期").replaceAll("6期","六期").replaceAll("7期","七期").replaceAll("8期","八期").replaceAll("9期","九期").replaceAll("10期","十期"); + return name.replaceAll("-","").replaceAll("1鏈�","涓�鏈�").replaceAll("2鏈�","浜屾湡").replaceAll("3鏈�","涓夋湡").replaceAll("4鏈�","鍥涙湡").replaceAll("5鏈�","浜旀湡").replaceAll("6鏈�","鍏湡").replaceAll("7鏈�","涓冩湡").replaceAll("8鏈�","鍏湡").replaceAll("9鏈�","涔濇湡").replaceAll("10鏈�","鍗佹湡"); } return null; } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/BaiduMapSearchTest1.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/BaiduMapSearchTest1.groovy index 31c0cde54..fa222370b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/BaiduMapSearchTest1.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/BaiduMapSearchTest1.groovy @@ -11,7 +11,7 @@ class BaiduMapSearchTest1 { } def run(){ def index = 0; - ExcelUtils.modify("D:\\数据\\分期.xlsx", { row -> + ExcelUtils.modify("D:\\鏁版嵁\\鍒嗘湡.xlsx", { row -> index ++; def city = row['B'] @@ -19,7 +19,7 @@ class BaiduMapSearchTest1 { def region = row['D'] // if(index<100) { -// if(name=="168乐活商街一期"){ +// if(name=="168涔愭椿鍟嗚涓�鏈�"){ def baiduMap = getBaiduMapData(city, region, name); if (baiduMap) { row['L'] = baiduMap.name diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/CcbDistrict.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/CcbDistrict.groovy index 77741e1f7..7dbae79c5 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/CcbDistrict.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/CcbDistrict.groovy @@ -16,14 +16,14 @@ import com.mongodb.DBObject class CcbDistrict { DBCollection thirdPartyColl = CrawalDBUtil.getThirdPartyCol() - def codeMap = ["北京": "131", "天津": "332", "石家庄": "150", "唐山": "265", "秦皇岛": "148", "邯郸": "151", "邢台": "266", "保定": "307", "张家口": "264", "承德": "207", "沧州": "149", "廊坊": "191", "衡水": "208", "太原": "176", "大同": "355", "阳泉": "357", "长治": "356", "晋城": "290", "朔州": "237", "晋中": "238", "运城": "328", "忻州": "367", "临汾": "368", "吕梁": "327", "呼和浩特": "321", "包头": "229", "乌海": "123", "赤峰": "297", "通辽": "64", "鄂尔多斯": "283", "呼伦贝尔": "61", "巴彦淖尔": "169", "乌兰察布": "168", "兴安盟": "62", "锡林郭勒盟": "63", "阿拉善盟": "230", "沈阳": "58", "大连": "167", "鞍山": "320", "抚顺": "184", "本溪": "227", "丹东": "282", "锦州": "166", "营口": "281", "阜新": "59", "辽阳": "351", "盘锦": "228", "铁岭": "60", "朝阳": "280", "葫芦岛": "319", "长春": "53", "吉林市": "55", "四平": "56", "辽源": "183", "通化": "165", "白山": "57", "松原": "52", "白城": "51", "延边朝鲜族自治州": "54", "哈尔滨": "48", "齐齐哈尔": "41", "鸡西": "46", "鹤岗": "43", "双鸭山": "45", "大庆": "50", "伊春": "40", "佳木斯": "42", "七台河": "47", "牡丹江": "49", "黑河": "39", "绥化": "44", "大兴安岭地区": "38", "上海": "289", "南京": "315", "无锡": "317", "徐州": "316", "常州": "348", "苏州": "224", "南通": "161", "连云港": "347", "淮安": "162", "盐城": "223", "扬州": "346", "镇江": "160", "泰州": "276", "宿迁": "277", "杭州": "179", "宁波": "180", "温州": "178", "嘉兴": "334", "湖州": "294", "绍兴": "293", "金华": "333", "衢州": "243", "舟山": "245", "台州": "244", "丽水": "292", "合肥": "127", "芜湖": "129", "蚌埠": "126", "淮南": "250", "马鞍山": "358", "淮北": "253", "铜陵": "337", "安庆": "130", "黄山": "252", "滁州": "189", "阜阳": "128", "宿州": "370", "巢湖": "251", "六安": "298", "亳州": "188", "池州": "299", "宣城": "190", "福州": "300", "厦门": "194", "莆田": "195", "三明": "254", "泉州": "134", "漳州": "255", "南平": "133", "龙岩": "193", "宁德": "192", "南昌": "163", "景德镇": "225", "萍乡": "350", "九江": "349", "新余": "164", "鹰潭": "279", "赣州": "365", "吉安": "318", "宜春": "278", "抚州": "226", "上饶": "364", "济南": "288", "青岛": "236", "淄博": "354", "枣庄": "172", "东营": "174", "烟台": "326", "潍坊": "287", "济宁": "286", "泰安": "325", "威海": "175", "日照": "173", "莱芜": "124", "临沂": "234", "德州": "372", "聊城": "366", "滨州": "235", "菏泽": "353", "郑州": "268", "开封": "210", "洛阳": "153", "平顶山": "213", "安阳": "267", "鹤壁": "215", "新乡": "152", "焦作": "211", "濮阳": "209", "许昌": "155", "漯河": "344", "三门峡": "212", "南阳": "309", "商丘": "154", "信阳": "214", "周口": "308", "驻马店": "269", "武汉": "218", "黄石": "311", "十堰": "216", "宜昌": "270", "襄阳": "156", "鄂州": "122", "荆门": "217", "孝感": "310", "荆州": "157", "黄冈": "271", "咸宁": "362", "随州": "371", "恩施土家族苗族自治州": "373", "仙桃": "1713", "潜江": "1293", "天门": "2654", "神农架林区": "2734", "长沙": "158", "株洲": "222", "湘潭": "313", "衡阳": "159", "邵阳": "273", "岳阳": "220", "常德": "219", "张家界": "312", "益阳": "272", "郴州": "275", "永州": "314", "怀化": "363", "娄底": "221", "湘西土家族苗族自治州": "274", "广州": "257", "韶关": "137", "深圳": "340", "珠海": "140", "汕头": "303", "佛山": "138", "江门": "302", "湛江": "198", "茂名": "139", "肇庆": "338", "惠州": "301", "梅州": "141", "汕尾": "339", "河源": "200", "阳江": "199", "清远": "197", "东莞": "119", "中山": "187", "潮州": "201", "揭阳": "259", "云浮": "258", "南宁": "261", "柳州": "305", "桂林": "142", "梧州": "304", "北海": "295", "防城港": "204", "钦州": "145", "贵港": "341", "玉林": "361", "百色": "203", "贺州": "260", "河池": "143", "来宾": "202", "崇左": "144", "海口": "125", "三亚": "121", "五指山": "1644", "琼海": "2358", "儋州": "1215", "文昌": "2758", "万宁": "1216", "东方": "2634", "定安": "1214", "屯昌": "1641", "澄迈": "2757", "临高": "2033", "白沙黎族自治": "2359", "昌江黎族自治": "1642", "乐东黎族自治": "2032", "陵水黎族自治": "1643", "保亭黎族苗族自治": "1217", "琼中黎族苗族自治": "2031", "重庆": "132", "成都": "75", "自贡": "78", "攀枝花": "81", "泸州": "331", "德阳": "74", "绵阳": "240", "广元": "329", "遂宁": "330", "内江": "248", "乐山": "79", "南充": "291", "眉山": "77", "宜宾": "186", "广安": "241", "达州": "369", "雅安": "76", "巴中": "239", "资阳": "242", "阿坝藏族羌族自治州": "185", "甘孜藏族自治州": "73", "凉山彝族自治州": "80", "贵阳": "146", "六盘水": "147", "遵义": "262", "安顺": "263", "铜仁地区": "205", "黔西南布依族苗族自治州": "343", "毕节地区": "206", "黔东南苗族侗族自治州": "342", "黔南布依族苗族自治州": "306", "昆明": "104", "曲靖": "249", "玉溪": "106", "保山": "112", "昭通": "336", "丽江": "114", "临沧": "110", "楚雄彝族自治州": "105", "红河哈尼族彝族自治州": "107", "文山壮族苗族自治州": "177", "普洱": "108", "西双版纳傣族自治州": "109", "大理白族自治州": "111", "德宏傣族景颇族自治州": "116", "怒江傈僳族自治州": "113", "迪庆藏族自治州": "115", "拉萨": "100", "昌都地区": "99", "山南地区": "97", "日喀则地区": "102", "那曲地区": "101", "阿里地区": "103", "林芝地区": "98", "西安": "233", "铜川": "232", "宝鸡": "171", "咸阳": "323", "渭南": "170", "延安": "284", "汉中": "352", "榆林": "231", "安康": "324", "商洛": "285", "兰州": "36", "嘉峪关": "33", "金昌": "34", "白银": "35", "天水": "196", "武威": "118", "张掖": "117", "平凉": "359", "酒泉": "37", "庆阳": "135", "定西": "136", "陇南": "256", "临夏回族自治州": "182", "甘南藏族自治州": "247", "西宁": "66", "海东地区": "69", "海北藏族自治州": "67", "黄南藏族自治州": "70", "海南藏族自治州": "68", "果洛藏族自治州": "72", "玉树藏族自治州": "71", "海西蒙古族藏族自治州": "65", "银川": "360", "石嘴山": "335", "吴忠": "322", "固原": "246", "中卫": "181", "乌鲁木齐": "92", "克拉玛依": "95", "吐鲁番地区": "89", "哈密地区": "91", "昌吉回族自治州": "93", "博尔塔拉蒙古自治州": "88", "巴音郭楞蒙古自治州": "86", "阿克苏地区": "85", "克孜勒苏柯尔克孜自治州": "84", "喀什地区": "83", "和田地区": "82", "伊犁哈萨克自治州": "90", "塔城地区": "94", "阿勒泰地区": "96", "石河子": "770", "阿拉尔": "731", "图木舒克": "792", "五家渠": "789", "香港特别行政区": "2912", "澳门特别行政区": "2911"] + def codeMap = ["鍖椾含": "131", "澶╂触": "332", "鐭冲搴�": "150", "鍞愬北": "265", "绉︾殗宀�": "148", "閭兏": "151", "閭㈠彴": "266", "淇濆畾": "307", "寮犲鍙�": "264", "鎵垮痉": "207", "娌у窞": "149", "寤婂潑": "191", "琛℃按": "208", "澶師": "176", "澶у悓": "355", "闃虫硥": "357", "闀挎不": "356", "鏅嬪煄": "290", "鏈斿窞": "237", "鏅嬩腑": "238", "杩愬煄": "328", "蹇诲窞": "367", "涓存本": "368", "鍚曟": "327", "鍛煎拰娴╃壒": "321", "鍖呭ご": "229", "涔屾捣": "123", "璧ゅ嘲": "297", "閫氳窘": "64", "閯傚皵澶氭柉": "283", "鍛间鸡璐濆皵": "61", "宸村溅娣栧皵": "169", "涔屽叞瀵熷竷": "168", "鍏村畨鐩�": "62", "閿℃灄閮嫆鐩�": "63", "闃挎媺鍠勭洘": "230", "娌堥槼": "58", "澶ц繛": "167", "闉嶅北": "320", "鎶氶『": "184", "鏈邯": "227", "涓逛笢": "282", "閿﹀窞": "166", "钀ュ彛": "281", "闃滄柊": "59", "杈介槼": "351", "鐩橀敠": "228", "閾佸箔": "60", "鏈濋槼": "280", "钁姦宀�": "319", "闀挎槬": "53", "鍚夋灄甯�": "55", "鍥涘钩": "56", "杈芥簮": "183", "閫氬寲": "165", "鐧藉北": "57", "鏉惧師": "52", "鐧藉煄": "51", "寤惰竟鏈濋矞鏃忚嚜娌诲窞": "54", "鍝堝皵婊�": "48", "榻愰綈鍝堝皵": "41", "楦¤タ": "46", "楣ゅ矖": "43", "鍙岄腑灞�": "45", "澶у簡": "50", "浼婃槬": "40", "浣虫湪鏂�": "42", "涓冨彴娌�": "47", "鐗′腹姹�": "49", "榛戞渤": "39", "缁ュ寲": "44", "澶у叴瀹夊箔鍦板尯": "38", "涓婃捣": "289", "鍗椾含": "315", "鏃犻敗": "317", "寰愬窞": "316", "甯稿窞": "348", "鑻忓窞": "224", "鍗楅��": "161", "杩炰簯娓�": "347", "娣畨": "162", "鐩愬煄": "223", "鎵窞": "346", "闀囨睙": "160", "娉板窞": "276", "瀹胯縼": "277", "鏉窞": "179", "瀹佹尝": "180", "娓╁窞": "178", "鍢夊叴": "334", "婀栧窞": "294", "缁嶅叴": "293", "閲戝崕": "333", "琛㈠窞": "243", "鑸熷北": "245", "鍙板窞": "244", "涓芥按": "292", "鍚堣偉": "127", "鑺滄箹": "129", "铓屽煚": "126", "娣崡": "250", "椹瀺灞�": "358", "娣寳": "253", "閾滈櫟": "337", "瀹夊簡": "130", "榛勫北": "252", "婊佸窞": "189", "闃滈槼": "128", "瀹垮窞": "370", "宸㈡箹": "251", "鍏畨": "298", "浜冲窞": "188", "姹犲窞": "299", "瀹e煄": "190", "绂忓窞": "300", "鍘﹂棬": "194", "鑾嗙敯": "195", "涓夋槑": "254", "娉夊窞": "134", "婕冲窞": "255", "鍗楀钩": "133", "榫欏博": "193", "瀹佸痉": "192", "鍗楁槍": "163", "鏅痉闀�": "225", "钀嶄埂": "350", "涔濇睙": "349", "鏂颁綑": "164", "楣版江": "279", "璧e窞": "365", "鍚夊畨": "318", "瀹滄槬": "278", "鎶氬窞": "226", "涓婇ザ": "364", "娴庡崡": "288", "闈掑矝": "236", "娣勫崥": "354", "鏋e簞": "172", "涓滆惀": "174", "鐑熷彴": "326", "娼嶅潑": "287", "娴庡畞": "286", "娉板畨": "325", "濞佹捣": "175", "鏃ョ収": "173", "鑾辫姕": "124", "涓存矀": "234", "寰峰窞": "372", "鑱婂煄": "366", "婊ㄥ窞": "235", "鑿忔辰": "353", "閮戝窞": "268", "寮�灏�": "210", "娲涢槼": "153", "骞抽《灞�": "213", "瀹夐槼": "267", "楣ゅ": "215", "鏂颁埂": "152", "鐒︿綔": "211", "婵槼": "209", "璁告槍": "155", "婕渤": "344", "涓夐棬宄�": "212", "鍗楅槼": "309", "鍟嗕笜": "154", "淇¢槼": "214", "鍛ㄥ彛": "308", "椹婚┈搴�": "269", "姝︽眽": "218", "榛勭煶": "311", "鍗佸牥": "216", "瀹滄槍": "270", "瑗勯槼": "156", "閯傚窞": "122", "鑽嗛棬": "217", "瀛濇劅": "310", "鑽嗗窞": "157", "榛勫唸": "271", "鍜稿畞": "362", "闅忓窞": "371", "鎭╂柦鍦熷鏃忚嫍鏃忚嚜娌诲窞": "373", "浠欐": "1713", "娼滄睙": "1293", "澶╅棬": "2654", "绁炲啘鏋舵灄鍖�": "2734", "闀挎矙": "158", "鏍床": "222", "婀樻江": "313", "琛¢槼": "159", "閭甸槼": "273", "宀抽槼": "220", "甯稿痉": "219", "寮犲鐣�": "312", "鐩婇槼": "272", "閮村窞": "275", "姘稿窞": "314", "鎬�鍖�": "363", "濞勫簳": "221", "婀樿タ鍦熷鏃忚嫍鏃忚嚜娌诲窞": "274", "骞垮窞": "257", "闊跺叧": "137", "娣卞湷": "340", "鐝犳捣": "140", "姹曞ご": "303", "浣涘北": "138", "姹熼棬": "302", "婀涙睙": "198", "鑼傚悕": "139", "鑲囧簡": "338", "鎯犲窞": "301", "姊呭窞": "141", "姹曞熬": "339", "娌虫簮": "200", "闃虫睙": "199", "娓呰繙": "197", "涓滆帪": "119", "涓北": "187", "娼窞": "201", "鎻槼": "259", "浜戞诞": "258", "鍗楀畞": "261", "鏌冲窞": "305", "妗傛灄": "142", "姊у窞": "304", "鍖楁捣": "295", "闃插煄娓�": "204", "閽﹀窞": "145", "璐垫腐": "341", "鐜夋灄": "361", "鐧捐壊": "203", "璐哄窞": "260", "娌虫睜": "143", "鏉ュ": "202", "宕囧乏": "144", "娴峰彛": "125", "涓変簹": "121", "浜旀寚灞�": "1644", "鐞兼捣": "2358", "鍎嬪窞": "1215", "鏂囨槍": "2758", "涓囧畞": "1216", "涓滄柟": "2634", "瀹氬畨": "1214", "灞槍": "1641", "婢勮繄": "2757", "涓撮珮": "2033", "鐧芥矙榛庢棌鑷不": "2359", "鏄屾睙榛庢棌鑷不": "1642", "涔愪笢榛庢棌鑷不": "2032", "闄垫按榛庢棌鑷不": "1643", "淇濅涵榛庢棌鑻楁棌鑷不": "1217", "鐞间腑榛庢棌鑻楁棌鑷不": "2031", "閲嶅簡": "132", "鎴愰兘": "75", "鑷础": "78", "鏀�鏋濊姳": "81", "娉稿窞": "331", "寰烽槼": "74", "缁甸槼": "240", "骞垮厓": "329", "閬傚畞": "330", "鍐呮睙": "248", "涔愬北": "79", "鍗楀厖": "291", "鐪夊北": "77", "瀹滃": "186", "骞垮畨": "241", "杈惧窞": "369", "闆呭畨": "76", "宸翠腑": "239", "璧勯槼": "242", "闃垮潩钘忔棌缇屾棌鑷不宸�": "185", "鐢樺瓬钘忔棌鑷不宸�": "73", "鍑夊北褰濇棌鑷不宸�": "80", "璐甸槼": "146", "鍏洏姘�": "147", "閬典箟": "262", "瀹夐『": "263", "閾滀粊鍦板尯": "205", "榛旇タ鍗楀竷渚濇棌鑻楁棌鑷不宸�": "343", "姣曡妭鍦板尯": "206", "榛斾笢鍗楄嫍鏃忎緱鏃忚嚜娌诲窞": "342", "榛斿崡甯冧緷鏃忚嫍鏃忚嚜娌诲窞": "306", "鏄嗘槑": "104", "鏇查潠": "249", "鐜夋邯": "106", "淇濆北": "112", "鏄��": "336", "涓芥睙": "114", "涓存钵": "110", "妤氶泟褰濇棌鑷不宸�": "105", "绾㈡渤鍝堝凹鏃忓綕鏃忚嚜娌诲窞": "107", "鏂囧北澹棌鑻楁棌鑷不宸�": "177", "鏅幢": "108", "瑗垮弻鐗堢撼鍌f棌鑷不宸�": "109", "澶х悊鐧芥棌鑷不宸�": "111", "寰峰畯鍌f棌鏅鏃忚嚜娌诲窞": "116", "鎬掓睙鍌堝兂鏃忚嚜娌诲窞": "113", "杩簡钘忔棌鑷不宸�": "115", "鎷夎惃": "100", "鏄岄兘鍦板尯": "99", "灞卞崡鍦板尯": "97", "鏃ュ杸鍒欏湴鍖�": "102", "閭f洸鍦板尯": "101", "闃块噷鍦板尯": "103", "鏋楄姖鍦板尯": "98", "瑗垮畨": "233", "閾滃窛": "232", "瀹濋浮": "171", "鍜搁槼": "323", "娓崡": "170", "寤跺畨": "284", "姹変腑": "352", "姒嗘灄": "231", "瀹夊悍": "324", "鍟嗘礇": "285", "鍏板窞": "36", "鍢夊唱鍏�": "33", "閲戞槍": "34", "鐧介摱": "35", "澶╂按": "196", "姝﹀▉": "118", "寮犳帠": "117", "骞冲噳": "359", "閰掓硥": "37", "搴嗛槼": "135", "瀹氳タ": "136", "闄囧崡": "256", "涓村鍥炴棌鑷不宸�": "182", "鐢樺崡钘忔棌鑷不宸�": "247", "瑗垮畞": "66", "娴蜂笢鍦板尯": "69", "娴峰寳钘忔棌鑷不宸�": "67", "榛勫崡钘忔棌鑷不宸�": "70", "娴峰崡钘忔棌鑷不宸�": "68", "鏋滄礇钘忔棌鑷不宸�": "72", "鐜夋爲钘忔棌鑷不宸�": "71", "娴疯タ钂欏彜鏃忚棌鏃忚嚜娌诲窞": "65", "閾跺窛": "360", "鐭冲槾灞�": "335", "鍚村繝": "322", "鍥哄師": "246", "涓崼": "181", "涔岄瞾鏈ㄩ綈": "92", "鍏嬫媺鐜涗緷": "95", "鍚愰瞾鐣湴鍖�": "89", "鍝堝瘑鍦板尯": "91", "鏄屽悏鍥炴棌鑷不宸�": "93", "鍗氬皵濉旀媺钂欏彜鑷不宸�": "88", "宸撮煶閮钂欏彜鑷不宸�": "86", "闃垮厠鑻忓湴鍖�": "85", "鍏嬪瓬鍕掕嫃鏌皵鍏嬪瓬鑷不宸�": "84", "鍠�浠�鍦板尯": "83", "鍜岀敯鍦板尯": "82", "浼婄妬鍝堣惃鍏嬭嚜娌诲窞": "90", "濉斿煄鍦板尯": "94", "闃垮嫆娉板湴鍖�": "96", "鐭虫渤瀛�": "770", "闃挎媺灏�": "731", "鍥炬湪鑸掑厠": "792", "浜斿娓�": "789", "棣欐腐鐗瑰埆琛屾斂鍖�": "2912", "婢抽棬鐗瑰埆琛屾斂鍖�": "2911"] static main(args) { def task = new CcbDistrict() task.run() } def run(){ - def filePath = "D:\\数据\\房估估\\南京.xls" + def filePath = "D:\\鏁版嵁\\鎴夸及浼癨\鍗椾含.xls" // dataFilter(filePath); // standardRegionAndName(filePath) // matchOther(filePath) @@ -38,7 +38,7 @@ class CcbDistrict { def index = 0 ExcelUtils.multiThreadingModify(filePath, { row -> index++ - if(row['R']=="已删除") { + if(row['R']=="宸插垹闄�") { println index+" "+ row['F'] +" "+ row['N']+" "+row['O'] FangjiaClientUtils.sendDistrictPriceCalculate(row['F'], row['N'], row['O'], 104); } @@ -55,7 +55,7 @@ class CcbDistrict { } } }); - println "1.名称过滤完成" + println "1.鍚嶇О杩囨护瀹屾垚" } def standardRegionAndName(def filePath){ @@ -68,7 +68,7 @@ class CcbDistrict { data['O'] = NameProcess.nameStandard(data['F'],region, name) } }); - println "2.区域名称格式化完成" + println "2.鍖哄煙鍚嶇О鏍煎紡鍖栧畬鎴�" } @@ -90,7 +90,7 @@ class CcbDistrict { } if(isDel){ - data['R'] = "已删除" + data['R'] = "宸插垹闄�" } } } @@ -115,7 +115,7 @@ class CcbDistrict { } if(count){ - data['Q']="第三方" + data['Q']="绗笁鏂�" } } }); @@ -126,9 +126,9 @@ class CcbDistrict { ExcelUtils.modify(filePath, { data -> if(!data['F']){ index++ - def gdData = FangjiaClientUtils.getMapData(data['A'], data['B'], data['E'], data['D'],"", "高德") + def gdData = FangjiaClientUtils.getMapData(data['A'], data['B'], data['E'], data['D'],"", "楂樺痉") if(!gdData){ - gdData = FangjiaClientUtils.getMapData(data['A'], "", data['E'], data['D'],"", "高德") + gdData = FangjiaClientUtils.getMapData(data['A'], "", data['E'], data['D'],"", "楂樺痉") } if(gdData){ data['AH'] = gdData.district @@ -140,9 +140,9 @@ class CcbDistrict { data['AN'] = gdData.lat } - def bdData = FangjiaClientUtils.getMapData(data['A'], data['B'], data['E'], data['D'],"", "百度") + def bdData = FangjiaClientUtils.getMapData(data['A'], data['B'], data['E'], data['D'],"", "鐧惧害") if(!bdData){ - bdData = FangjiaClientUtils.getMapData(data['A'], "", data['E'], data['D'],"", "百度") + bdData = FangjiaClientUtils.getMapData(data['A'], "", data['E'], data['D'],"", "鐧惧害") } if(bdData){ data['AO'] = bdData.district diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/CityDistrictStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/CityDistrictStat.groovy index cbef75ed8..a6aa1ee50 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/CityDistrictStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/CityDistrictStat.groovy @@ -12,14 +12,14 @@ class CityDistrictStat { def run(){ def citys = CommonDatautils.findAllCity(); def ret = [] - ret << ["城市","小区量","地址量","别名量","地址别名量"] + ret << ["鍩庡競","灏忓尯閲�","鍦板潃閲�","鍒悕閲�","鍦板潃鍒悕閲�"] for(def city : citys){ def districts = CommonDatautils.findAllDistricts(city, "district", ["city","region","name","address","alias","addr_alias"]); def m = fieldStat(city, districts); ret << m } - ExcelUtils.write("D:\\数据\\小区地址量统计.xlsx", ret, "sheet") + ExcelUtils.write("D:\\鏁版嵁\\灏忓尯鍦板潃閲忕粺璁�.xlsx", ret, "sheet") } def fieldStat(city, districts){ @@ -27,15 +27,15 @@ class CityDistrictStat { def alias = 0; def addr_alias = 0; for(def dist : districts) { - // 名称别名 + // 鍚嶇О鍒悕 if (dist.alias) { alias = alias + dist.alias.size() } - // 地址 + // 鍦板潃 if (dist.address) { address++ } - // 地址别名 + // 鍦板潃鍒悕 if (dist.addr_alias && dist.addr_alias!="null") { addr_alias = addr_alias + dist.addr_alias.size() } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/CityRegionFieldStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/CityRegionFieldStat.groovy index f519756a4..5ae283684 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/CityRegionFieldStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/CityRegionFieldStat.groovy @@ -26,7 +26,7 @@ class CityRegionFieldStat { task.run() } def run(){ - def city = '福州' + def city = '绂忓窞' def ret = getRegions(city); def result = [] def dataInfos = [] @@ -66,11 +66,11 @@ class CityRegionFieldStat { println datas dataInfos << datas } - result << ["区域名","小区数量","经纬度信息","物业类型","建筑类型","户数","物业费","停车位","产权年限", - "产权性质","开盘时间","竣工时间","交房时间","占地面积","建筑面积","容积率","开发商","物业公司", - "建筑结构","楼栋总数","均价小区","均价覆盖率"] + result << ["鍖哄煙鍚�","灏忓尯鏁伴噺","缁忕含搴︿俊鎭�","鐗╀笟绫诲瀷","寤虹瓚绫诲瀷","鎴锋暟","鐗╀笟璐�","鍋滆溅浣�","浜ф潈骞撮檺", + "浜ф潈鎬ц川","寮�鐩樻椂闂�","绔e伐鏃堕棿","浜ゆ埧鏃堕棿","鍗犲湴闈㈢Н","寤虹瓚闈㈢Н","瀹圭Н鐜�","寮�鍙戝晢","鐗╀笟鍏徃", + "寤虹瓚缁撴瀯","妤兼爧鎬绘暟","鍧囦环灏忓尯","鍧囦环瑕嗙洊鐜�"] result.addAll(dataInfos) - ExcelUtils.write("d:\\数据\\结果\\福州.xlsx", result, "Sheet1") + ExcelUtils.write("d:\\鏁版嵁\\缁撴灉\\绂忓窞.xlsx", result, "Sheet1") } @@ -116,157 +116,157 @@ class CityRegionFieldStat { def discount= 0; for(def dist : districts){ - //小区名 + //灏忓尯鍚� if(dist.name){ name++; } - // 名称别名 + // 鍚嶇О鍒悕 if(dist.alias){ alias++; } - // 地址 + // 鍦板潃 if(dist.address){ address++ } - // 地址别名 + // 鍦板潃鍒悕 if(dist.addr_alias){ addr_alias++ } - // 经度 + // 缁忓害 if(dist.lng && dist.lng){ lng2++ } - // 维度 + // 缁村害 if(dist.lat && dist.lat){ lat2++ } - // 板块 + // 鏉垮潡 if(dist.block){ block++ } - // 环线 + // 鐜嚎 if(dist.loop_line_info){ loop_line_info++ } - // 物业类型 + // 鐗╀笟绫诲瀷 if(dist.estate_type2){ estate_type2++ } - // 建筑类型 + // 寤虹瓚绫诲瀷 if(dist.build_type){ build_type++ } - // 商圈businessQuarter + // 鍟嗗湀businessQuarter if(dist.business_quarter){ business_quarter++ } - // 户数 + // 鎴锋暟 if(dist.household_count){ household_count++ } - // 物业费 + // 鐗╀笟璐� if(dist.estate_charge){ estate_charge++ } - // 停车位 + // 鍋滆溅浣� if(dist.car_site_count){ car_site_count++ } - // 停车位描述 + // 鍋滆溅浣嶆弿杩� if(dist.car_site){ car_site++ } - // 产权年限 + // 浜ф潈骞撮檺 if(dist.property_life){ property_life++ } - // 产权性质 + // 浜ф潈鎬ц川 if(dist.house_property){ house_property++ } - // 开工时间 + // 寮�宸ユ椂闂� if(dist.start_building_date){ start_building_date++ } - // 开盘时间 + // 寮�鐩樻椂闂� if(dist.open_date){ open_date++ } - // 竣工时间 + // 绔e伐鏃堕棿 if(dist.finish_building_date){ finish_building_date++ } - // 交房时间 + // 浜ゆ埧鏃堕棿 if(dist.live_date){ live_date++ } - // 占地面积 + // 鍗犲湴闈㈢Н if(dist.all_area){ all_area++ } - // 建筑面积 + // 寤虹瓚闈㈢Н if(dist.build_area){ build_area++ } - // 容积率 + // 瀹圭Н鐜� if(dist.cubage_percent){ cubage_percent++ } - // 绿化率 + // 缁垮寲鐜� if(dist.virescence_percent){ virescence_percent++ } - // 预售许可证 + // 棰勫敭璁稿彲璇� if(dist.licence){ licence++ } - // 开发商 + // 寮�鍙戝晢 if(dist.developer){ developer++ } - // 物业公司 + // 鐗╀笟鍏徃 if(dist.estate_company){ estate_company++ } - // 装修情况 + // 瑁呬慨鎯呭喌 if(dist.fitment){ fitment++ } - // 建筑结构 + // 寤虹瓚缁撴瀯 if(dist.build_structure){ build_structure++ } - // 周边配套 + // 鍛ㄨ竟閰嶅 if(dist.facilities){ facilities++ } - // 交通状况 + // 浜ら�氱姸鍐� if(dist.traffic){ traffic++ } - // 相关信息 + // 鐩稿叧淇℃伅 if(dist.relate_info){ relate_info++ } - // 描述 + // 鎻忚堪 if(dist.description){ description++ } - // 售楼地址 + // 鍞ゼ鍦板潃 if(dist.sell_address){ sell_address++ } - // 售楼电话 + // 鍞ゼ鐢佃瘽 if(dist.mobile){ mobile++ } - // 楼栋总数 + // 妤兼爧鎬绘暟 if(dist.loudong_count){ loudong_count++ } - // 折扣 + // 鎶樻墸 if(dist.discount){ discount++ } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/CitySellStatTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/CitySellStatTest.groovy index 49b75a911..f0a15eb01 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/CitySellStatTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/CitySellStatTest.groovy @@ -21,7 +21,7 @@ class CitySellStatTest { def cityPriceRun(){ def cityObjs = CommonDatautils.findCitys(); def rets = [] - rets << ["序号","城市","城市级别","城市均价起始月","起始均价","城市均价最新月","最新均价"] + rets << ["搴忓彿","鍩庡競","鍩庡競绾у埆","鍩庡競鍧囦环璧峰鏈�","璧峰鍧囦环","鍩庡競鍧囦环鏈�鏂版湀","鏈�鏂板潎浠�"] def index = 1 for(def o : cityObjs){ def ret = [] @@ -48,11 +48,11 @@ class CitySellStatTest { index++ } - ExcelUtils.write("D:\\数据\\其它\\全国城市均价.xlsx", rets, "城市均价") + ExcelUtils.write("D:\\鏁版嵁\\鍏跺畠\\鍏ㄥ浗鍩庡競鍧囦环.xlsx", rets, "鍩庡競鍧囦环") } def run(){ - ExcelUtils.modify("E:\\数据\\城市均价列表.xls",{row-> + ExcelUtils.modify("E:\\鏁版嵁\\鍩庡競鍧囦环鍒楄〃.xls",{row-> def city = row[1] println city def month = findFirstMonth(city); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ConsumptionData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ConsumptionData.groovy index cab8fa656..28f0e7d34 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ConsumptionData.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ConsumptionData.groovy @@ -11,7 +11,7 @@ import net.sf.json.JSONObject def line = 0; def radius = 1000 -ExcelUtils.modify("D:\\数据\\畅容数据0404-1.xlsx", { row -> +ExcelUtils.modify("D:\\鏁版嵁\\鐣呭鏁版嵁0404-1.xlsx", { row -> line ++; if(line>=1){ def city = row['E']; @@ -19,7 +19,7 @@ ExcelUtils.modify("D:\\ if(city && locations){ if(locations.toString().contains(",")){ def postion = locations.split(",") - //平均消费 + //骞冲潎娑堣垂 def p1 = getAvgPrice(city, postion, 1000) def p2 = getAvgPrice(city, postion, 2000) def p3 = getAvgPrice(city, postion, 3000) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/CrawlDataMatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/CrawlDataMatch.groovy index 1aed12e90..6776c353d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/CrawlDataMatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/CrawlDataMatch.groovy @@ -17,29 +17,29 @@ import java.util.concurrent.atomic.AtomicLong import java.util.regex.Matcher import java.util.regex.Pattern -//地图抓取数据匹配 +//鍦板浘鎶撳彇鏁版嵁鍖归厤 class CrawlDataMatch { def house_queryUrl = "http://192.168.0.206:9200/amap_poi/_search" public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(10) static def totalCount = new AtomicLong() - def codeMap = ["北京": "131", "天津": "332", "石家庄": "150", "唐山": "265", "秦皇岛": "148", "邯郸": "151", "邢台": "266", "保定": "307", "张家口": "264", "承德": "207", "沧州": "149", "廊坊": "191", "衡水": "208", "太原": "176", "大同": "355", "阳泉": "357", "长治": "356", "晋城": "290", "朔州": "237", "晋中": "238", "运城": "328", "忻州": "367", "临汾": "368", "吕梁": "327", "呼和浩特": "321", "包头": "229", "乌海": "123", "赤峰": "297", "通辽": "64", "鄂尔多斯": "283", "呼伦贝尔": "61", "巴彦淖尔": "169", "乌兰察布": "168", "兴安盟": "62", "锡林郭勒盟": "63", "阿拉善盟": "230", "沈阳": "58", "大连": "167", "鞍山": "320", "抚顺": "184", "本溪": "227", "丹东": "282", "锦州": "166", "营口": "281", "阜新": "59", "辽阳": "351", "盘锦": "228", "铁岭": "60", "朝阳": "280", "葫芦岛": "319", "长春": "53", "吉林市": "55", "四平": "56", "辽源": "183", "通化": "165", "白山": "57", "松原": "52", "白城": "51", "延边朝鲜族自治州": "54", "哈尔滨": "48", "齐齐哈尔": "41", "鸡西": "46", "鹤岗": "43", "双鸭山": "45", "大庆": "50", "伊春": "40", "佳木斯": "42", "七台河": "47", "牡丹江": "49", "黑河": "39", "绥化": "44", "大兴安岭地区": "38", "上海": "289", "南京": "315", "无锡": "317", "徐州": "316", "常州": "348", "苏州": "224", "南通": "161", "连云港": "347", "淮安": "162", "盐城": "223", "扬州": "346", "镇江": "160", "泰州": "276", "宿迁": "277", "杭州": "179", "宁波": "180", "温州": "178", "嘉兴": "334", "湖州": "294", "绍兴": "293", "金华": "333", "衢州": "243", "舟山": "245", "台州": "244", "丽水": "292", "合肥": "127", "芜湖": "129", "蚌埠": "126", "淮南": "250", "马鞍山": "358", "淮北": "253", "铜陵": "337", "安庆": "130", "黄山": "252", "滁州": "189", "阜阳": "128", "宿州": "370", "巢湖": "251", "六安": "298", "亳州": "188", "池州": "299", "宣城": "190", "福州": "300", "厦门": "194", "莆田": "195", "三明": "254", "泉州": "134", "漳州": "255", "南平": "133", "龙岩": "193", "宁德": "192", "南昌": "163", "景德镇": "225", "萍乡": "350", "九江": "349", "新余": "164", "鹰潭": "279", "赣州": "365", "吉安": "318", "宜春": "278", "抚州": "226", "上饶": "364", "济南": "288", "青岛": "236", "淄博": "354", "枣庄": "172", "东营": "174", "烟台": "326", "潍坊": "287", "济宁": "286", "泰安": "325", "威海": "175", "日照": "173", "莱芜": "124", "临沂": "234", "德州": "372", "聊城": "366", "滨州": "235", "菏泽": "353", "郑州": "268", "开封": "210", "洛阳": "153", "平顶山": "213", "安阳": "267", "鹤壁": "215", "新乡": "152", "焦作": "211", "濮阳": "209", "许昌": "155", "漯河": "344", "三门峡": "212", "南阳": "309", "商丘": "154", "信阳": "214", "周口": "308", "驻马店": "269", "武汉": "218", "黄石": "311", "十堰": "216", "宜昌": "270", "襄阳": "156", "鄂州": "122", "荆门": "217", "孝感": "310", "荆州": "157", "黄冈": "271", "咸宁": "362", "随州": "371", "恩施土家族苗族自治州": "373", "仙桃": "1713", "潜江": "1293", "天门": "2654", "神农架林区": "2734", "长沙": "158", "株洲": "222", "湘潭": "313", "衡阳": "159", "邵阳": "273", "岳阳": "220", "常德": "219", "张家界": "312", "益阳": "272", "郴州": "275", "永州": "314", "怀化": "363", "娄底": "221", "湘西土家族苗族自治州": "274", "广州": "257", "韶关": "137", "深圳": "340", "珠海": "140", "汕头": "303", "佛山": "138", "江门": "302", "湛江": "198", "茂名": "139", "肇庆": "338", "惠州": "301", "梅州": "141", "汕尾": "339", "河源": "200", "阳江": "199", "清远": "197", "东莞": "119", "中山": "187", "潮州": "201", "揭阳": "259", "云浮": "258", "南宁": "261", "柳州": "305", "桂林": "142", "梧州": "304", "北海": "295", "防城港": "204", "钦州": "145", "贵港": "341", "玉林": "361", "百色": "203", "贺州": "260", "河池": "143", "来宾": "202", "崇左": "144", "海口": "125", "三亚": "121", "五指山": "1644", "琼海": "2358", "儋州": "1215", "文昌": "2758", "万宁": "1216", "东方": "2634", "定安": "1214", "屯昌": "1641", "澄迈": "2757", "临高": "2033", "白沙黎族自治": "2359", "昌江黎族自治": "1642", "乐东黎族自治": "2032", "陵水黎族自治": "1643", "保亭黎族苗族自治": "1217", "琼中黎族苗族自治": "2031", "重庆": "132", "成都": "75", "自贡": "78", "攀枝花": "81", "泸州": "331", "德阳": "74", "绵阳": "240", "广元": "329", "遂宁": "330", "内江": "248", "乐山": "79", "南充": "291", "眉山": "77", "宜宾": "186", "广安": "241", "达州": "369", "雅安": "76", "巴中": "239", "资阳": "242", "阿坝藏族羌族自治州": "185", "甘孜藏族自治州": "73", "凉山彝族自治州": "80", "贵阳": "146", "六盘水": "147", "遵义": "262", "安顺": "263", "铜仁地区": "205", "黔西南布依族苗族自治州": "343", "毕节地区": "206", "黔东南苗族侗族自治州": "342", "黔南布依族苗族自治州": "306", "昆明": "104", "曲靖": "249", "玉溪": "106", "保山": "112", "昭通": "336", "丽江": "114", "临沧": "110", "楚雄彝族自治州": "105", "红河哈尼族彝族自治州": "107", "文山壮族苗族自治州": "177", "普洱": "108", "西双版纳傣族自治州": "109", "大理白族自治州": "111", "德宏傣族景颇族自治州": "116", "怒江傈僳族自治州": "113", "迪庆藏族自治州": "115", "拉萨": "100", "昌都地区": "99", "山南地区": "97", "日喀则地区": "102", "那曲地区": "101", "阿里地区": "103", "林芝地区": "98", "西安": "233", "铜川": "232", "宝鸡": "171", "咸阳": "323", "渭南": "170", "延安": "284", "汉中": "352", "榆林": "231", "安康": "324", "商洛": "285", "兰州": "36", "嘉峪关": "33", "金昌": "34", "白银": "35", "天水": "196", "武威": "118", "张掖": "117", "平凉": "359", "酒泉": "37", "庆阳": "135", "定西": "136", "陇南": "256", "临夏回族自治州": "182", "甘南藏族自治州": "247", "西宁": "66", "海东地区": "69", "海北藏族自治州": "67", "黄南藏族自治州": "70", "海南藏族自治州": "68", "果洛藏族自治州": "72", "玉树藏族自治州": "71", "海西蒙古族藏族自治州": "65", "银川": "360", "石嘴山": "335", "吴忠": "322", "固原": "246", "中卫": "181", "乌鲁木齐": "92", "克拉玛依": "95", "吐鲁番地区": "89", "哈密地区": "91", "昌吉回族自治州": "93", "博尔塔拉蒙古自治州": "88", "巴音郭楞蒙古自治州": "86", "阿克苏地区": "85", "克孜勒苏柯尔克孜自治州": "84", "喀什地区": "83", "和田地区": "82", "伊犁哈萨克自治州": "90", "塔城地区": "94", "阿勒泰地区": "96", "石河子": "770", "阿拉尔": "731", "图木舒克": "792", "五家渠": "789", "香港特别行政区": "2912", "澳门特别行政区": "2911"] + def codeMap = ["鍖椾含": "131", "澶╂触": "332", "鐭冲搴�": "150", "鍞愬北": "265", "绉︾殗宀�": "148", "閭兏": "151", "閭㈠彴": "266", "淇濆畾": "307", "寮犲鍙�": "264", "鎵垮痉": "207", "娌у窞": "149", "寤婂潑": "191", "琛℃按": "208", "澶師": "176", "澶у悓": "355", "闃虫硥": "357", "闀挎不": "356", "鏅嬪煄": "290", "鏈斿窞": "237", "鏅嬩腑": "238", "杩愬煄": "328", "蹇诲窞": "367", "涓存本": "368", "鍚曟": "327", "鍛煎拰娴╃壒": "321", "鍖呭ご": "229", "涔屾捣": "123", "璧ゅ嘲": "297", "閫氳窘": "64", "閯傚皵澶氭柉": "283", "鍛间鸡璐濆皵": "61", "宸村溅娣栧皵": "169", "涔屽叞瀵熷竷": "168", "鍏村畨鐩�": "62", "閿℃灄閮嫆鐩�": "63", "闃挎媺鍠勭洘": "230", "娌堥槼": "58", "澶ц繛": "167", "闉嶅北": "320", "鎶氶『": "184", "鏈邯": "227", "涓逛笢": "282", "閿﹀窞": "166", "钀ュ彛": "281", "闃滄柊": "59", "杈介槼": "351", "鐩橀敠": "228", "閾佸箔": "60", "鏈濋槼": "280", "钁姦宀�": "319", "闀挎槬": "53", "鍚夋灄甯�": "55", "鍥涘钩": "56", "杈芥簮": "183", "閫氬寲": "165", "鐧藉北": "57", "鏉惧師": "52", "鐧藉煄": "51", "寤惰竟鏈濋矞鏃忚嚜娌诲窞": "54", "鍝堝皵婊�": "48", "榻愰綈鍝堝皵": "41", "楦¤タ": "46", "楣ゅ矖": "43", "鍙岄腑灞�": "45", "澶у簡": "50", "浼婃槬": "40", "浣虫湪鏂�": "42", "涓冨彴娌�": "47", "鐗′腹姹�": "49", "榛戞渤": "39", "缁ュ寲": "44", "澶у叴瀹夊箔鍦板尯": "38", "涓婃捣": "289", "鍗椾含": "315", "鏃犻敗": "317", "寰愬窞": "316", "甯稿窞": "348", "鑻忓窞": "224", "鍗楅��": "161", "杩炰簯娓�": "347", "娣畨": "162", "鐩愬煄": "223", "鎵窞": "346", "闀囨睙": "160", "娉板窞": "276", "瀹胯縼": "277", "鏉窞": "179", "瀹佹尝": "180", "娓╁窞": "178", "鍢夊叴": "334", "婀栧窞": "294", "缁嶅叴": "293", "閲戝崕": "333", "琛㈠窞": "243", "鑸熷北": "245", "鍙板窞": "244", "涓芥按": "292", "鍚堣偉": "127", "鑺滄箹": "129", "铓屽煚": "126", "娣崡": "250", "椹瀺灞�": "358", "娣寳": "253", "閾滈櫟": "337", "瀹夊簡": "130", "榛勫北": "252", "婊佸窞": "189", "闃滈槼": "128", "瀹垮窞": "370", "宸㈡箹": "251", "鍏畨": "298", "浜冲窞": "188", "姹犲窞": "299", "瀹e煄": "190", "绂忓窞": "300", "鍘﹂棬": "194", "鑾嗙敯": "195", "涓夋槑": "254", "娉夊窞": "134", "婕冲窞": "255", "鍗楀钩": "133", "榫欏博": "193", "瀹佸痉": "192", "鍗楁槍": "163", "鏅痉闀�": "225", "钀嶄埂": "350", "涔濇睙": "349", "鏂颁綑": "164", "楣版江": "279", "璧e窞": "365", "鍚夊畨": "318", "瀹滄槬": "278", "鎶氬窞": "226", "涓婇ザ": "364", "娴庡崡": "288", "闈掑矝": "236", "娣勫崥": "354", "鏋e簞": "172", "涓滆惀": "174", "鐑熷彴": "326", "娼嶅潑": "287", "娴庡畞": "286", "娉板畨": "325", "濞佹捣": "175", "鏃ョ収": "173", "鑾辫姕": "124", "涓存矀": "234", "寰峰窞": "372", "鑱婂煄": "366", "婊ㄥ窞": "235", "鑿忔辰": "353", "閮戝窞": "268", "寮�灏�": "210", "娲涢槼": "153", "骞抽《灞�": "213", "瀹夐槼": "267", "楣ゅ": "215", "鏂颁埂": "152", "鐒︿綔": "211", "婵槼": "209", "璁告槍": "155", "婕渤": "344", "涓夐棬宄�": "212", "鍗楅槼": "309", "鍟嗕笜": "154", "淇¢槼": "214", "鍛ㄥ彛": "308", "椹婚┈搴�": "269", "姝︽眽": "218", "榛勭煶": "311", "鍗佸牥": "216", "瀹滄槍": "270", "瑗勯槼": "156", "閯傚窞": "122", "鑽嗛棬": "217", "瀛濇劅": "310", "鑽嗗窞": "157", "榛勫唸": "271", "鍜稿畞": "362", "闅忓窞": "371", "鎭╂柦鍦熷鏃忚嫍鏃忚嚜娌诲窞": "373", "浠欐": "1713", "娼滄睙": "1293", "澶╅棬": "2654", "绁炲啘鏋舵灄鍖�": "2734", "闀挎矙": "158", "鏍床": "222", "婀樻江": "313", "琛¢槼": "159", "閭甸槼": "273", "宀抽槼": "220", "甯稿痉": "219", "寮犲鐣�": "312", "鐩婇槼": "272", "閮村窞": "275", "姘稿窞": "314", "鎬�鍖�": "363", "濞勫簳": "221", "婀樿タ鍦熷鏃忚嫍鏃忚嚜娌诲窞": "274", "骞垮窞": "257", "闊跺叧": "137", "娣卞湷": "340", "鐝犳捣": "140", "姹曞ご": "303", "浣涘北": "138", "姹熼棬": "302", "婀涙睙": "198", "鑼傚悕": "139", "鑲囧簡": "338", "鎯犲窞": "301", "姊呭窞": "141", "姹曞熬": "339", "娌虫簮": "200", "闃虫睙": "199", "娓呰繙": "197", "涓滆帪": "119", "涓北": "187", "娼窞": "201", "鎻槼": "259", "浜戞诞": "258", "鍗楀畞": "261", "鏌冲窞": "305", "妗傛灄": "142", "姊у窞": "304", "鍖楁捣": "295", "闃插煄娓�": "204", "閽﹀窞": "145", "璐垫腐": "341", "鐜夋灄": "361", "鐧捐壊": "203", "璐哄窞": "260", "娌虫睜": "143", "鏉ュ": "202", "宕囧乏": "144", "娴峰彛": "125", "涓変簹": "121", "浜旀寚灞�": "1644", "鐞兼捣": "2358", "鍎嬪窞": "1215", "鏂囨槍": "2758", "涓囧畞": "1216", "涓滄柟": "2634", "瀹氬畨": "1214", "灞槍": "1641", "婢勮繄": "2757", "涓撮珮": "2033", "鐧芥矙榛庢棌鑷不": "2359", "鏄屾睙榛庢棌鑷不": "1642", "涔愪笢榛庢棌鑷不": "2032", "闄垫按榛庢棌鑷不": "1643", "淇濅涵榛庢棌鑻楁棌鑷不": "1217", "鐞间腑榛庢棌鑻楁棌鑷不": "2031", "閲嶅簡": "132", "鎴愰兘": "75", "鑷础": "78", "鏀�鏋濊姳": "81", "娉稿窞": "331", "寰烽槼": "74", "缁甸槼": "240", "骞垮厓": "329", "閬傚畞": "330", "鍐呮睙": "248", "涔愬北": "79", "鍗楀厖": "291", "鐪夊北": "77", "瀹滃": "186", "骞垮畨": "241", "杈惧窞": "369", "闆呭畨": "76", "宸翠腑": "239", "璧勯槼": "242", "闃垮潩钘忔棌缇屾棌鑷不宸�": "185", "鐢樺瓬钘忔棌鑷不宸�": "73", "鍑夊北褰濇棌鑷不宸�": "80", "璐甸槼": "146", "鍏洏姘�": "147", "閬典箟": "262", "瀹夐『": "263", "閾滀粊鍦板尯": "205", "榛旇タ鍗楀竷渚濇棌鑻楁棌鑷不宸�": "343", "姣曡妭鍦板尯": "206", "榛斾笢鍗楄嫍鏃忎緱鏃忚嚜娌诲窞": "342", "榛斿崡甯冧緷鏃忚嫍鏃忚嚜娌诲窞": "306", "鏄嗘槑": "104", "鏇查潠": "249", "鐜夋邯": "106", "淇濆北": "112", "鏄��": "336", "涓芥睙": "114", "涓存钵": "110", "妤氶泟褰濇棌鑷不宸�": "105", "绾㈡渤鍝堝凹鏃忓綕鏃忚嚜娌诲窞": "107", "鏂囧北澹棌鑻楁棌鑷不宸�": "177", "鏅幢": "108", "瑗垮弻鐗堢撼鍌f棌鑷不宸�": "109", "澶х悊鐧芥棌鑷不宸�": "111", "寰峰畯鍌f棌鏅鏃忚嚜娌诲窞": "116", "鎬掓睙鍌堝兂鏃忚嚜娌诲窞": "113", "杩簡钘忔棌鑷不宸�": "115", "鎷夎惃": "100", "鏄岄兘鍦板尯": "99", "灞卞崡鍦板尯": "97", "鏃ュ杸鍒欏湴鍖�": "102", "閭f洸鍦板尯": "101", "闃块噷鍦板尯": "103", "鏋楄姖鍦板尯": "98", "瑗垮畨": "233", "閾滃窛": "232", "瀹濋浮": "171", "鍜搁槼": "323", "娓崡": "170", "寤跺畨": "284", "姹変腑": "352", "姒嗘灄": "231", "瀹夊悍": "324", "鍟嗘礇": "285", "鍏板窞": "36", "鍢夊唱鍏�": "33", "閲戞槍": "34", "鐧介摱": "35", "澶╂按": "196", "姝﹀▉": "118", "寮犳帠": "117", "骞冲噳": "359", "閰掓硥": "37", "搴嗛槼": "135", "瀹氳タ": "136", "闄囧崡": "256", "涓村鍥炴棌鑷不宸�": "182", "鐢樺崡钘忔棌鑷不宸�": "247", "瑗垮畞": "66", "娴蜂笢鍦板尯": "69", "娴峰寳钘忔棌鑷不宸�": "67", "榛勫崡钘忔棌鑷不宸�": "70", "娴峰崡钘忔棌鑷不宸�": "68", "鏋滄礇钘忔棌鑷不宸�": "72", "鐜夋爲钘忔棌鑷不宸�": "71", "娴疯タ钂欏彜鏃忚棌鏃忚嚜娌诲窞": "65", "閾跺窛": "360", "鐭冲槾灞�": "335", "鍚村繝": "322", "鍥哄師": "246", "涓崼": "181", "涔岄瞾鏈ㄩ綈": "92", "鍏嬫媺鐜涗緷": "95", "鍚愰瞾鐣湴鍖�": "89", "鍝堝瘑鍦板尯": "91", "鏄屽悏鍥炴棌鑷不宸�": "93", "鍗氬皵濉旀媺钂欏彜鑷不宸�": "88", "宸撮煶閮钂欏彜鑷不宸�": "86", "闃垮厠鑻忓湴鍖�": "85", "鍏嬪瓬鍕掕嫃鏌皵鍏嬪瓬鑷不宸�": "84", "鍠�浠�鍦板尯": "83", "鍜岀敯鍦板尯": "82", "浼婄妬鍝堣惃鍏嬭嚜娌诲窞": "90", "濉斿煄鍦板尯": "94", "闃垮嫆娉板湴鍖�": "96", "鐭虫渤瀛�": "770", "闃挎媺灏�": "731", "鍥炬湪鑸掑厠": "792", "浜斿娓�": "789", "棣欐腐鐗瑰埆琛屾斂鍖�": "2912", "婢抽棬鐗瑰埆琛屾斂鍖�": "2911"] static main(args) { -// def s = DataHandleUtils.findMatchPattern("集安路253号-B栋", "-?\\d+[号|#]楼") +// def s = DataHandleUtils.findMatchPattern("闆嗗畨璺�253鍙�-B鏍�", "-?\\d+[鍙穦#]妤�") // println s def task = new CrawlDataMatch() -// def data = task.findBaiduMap("漳州", "东山", "漳州东山岛近邻公寓"); - // println task.nameFormat("长安路长安小区-28号楼") +// def data = task.findBaiduMap("婕冲窞", "涓滃北", "婕冲窞涓滃北宀涜繎閭诲叕瀵�"); + // println task.nameFormat("闀垮畨璺暱瀹夊皬鍖�-28鍙锋ゼ") // task.run() // task.poolRun(); - task.excelRun();//导出地图数据 + task.excelRun();//瀵煎嚭鍦板浘鏁版嵁 // task.addLocation(); // task.excelMerge(); // task.match(); @@ -47,8 +47,8 @@ class CrawlDataMatch { } def excelMerge(){ - def txDatas = ExcelUtils.read("d:\\数据\\结果\\福建\\腾讯住宅(处理后).xlsx") - def bdDatas = ExcelUtils.read("d:\\数据\\结果\\福建\\百度(处理后2).xlsx") + def txDatas = ExcelUtils.read("d:\\鏁版嵁\\缁撴灉\\绂忓缓\\鑵捐浣忓畢(澶勭悊鍚�).xlsx") + def bdDatas = ExcelUtils.read("d:\\鏁版嵁\\缁撴灉\\绂忓缓\\鐧惧害(澶勭悊鍚�2).xlsx") def newBdDatas = [] for(def bd : bdDatas){ @@ -67,13 +67,13 @@ class CrawlDataMatch { } newBdDatas << bd } - ExcelUtils.write("d:\\数据\\结果\\福建\\百度住宅(3).xlsx", newBdDatas, "Sheet1") + ExcelUtils.write("d:\\鏁版嵁\\缁撴灉\\绂忓缓\\鐧惧害浣忓畢(3).xlsx", newBdDatas, "Sheet1") } def addLocation(){ def rets = findAllAddress() def index = 0 - ExcelUtils.multiThreadingModify("d:\\数据\\结果\\深圳高德地图匹配数据.xlsx",{List row -> + ExcelUtils.multiThreadingModify("d:\\鏁版嵁\\缁撴灉\\娣卞湷楂樺痉鍦板浘鍖归厤鏁版嵁.xlsx",{List row -> index ++ def name = row['D'] def address = row['E'] @@ -86,10 +86,10 @@ class CrawlDataMatch { } def addBaiduLocation(){ - def oldLists = ExcelUtils.read("D:\\数据\\南京第三方均价 (自动保存的).xlsx",0,1) + def oldLists = ExcelUtils.read("D:\\鏁版嵁\\鍗椾含绗笁鏂瑰潎浠� (鑷姩淇濆瓨鐨�).xlsx",0,1) def index = 0 - ExcelUtils.modify("D:\\数据\\小区\\南京、无锡-入库.xlsx",{List row -> + ExcelUtils.modify("D:\\鏁版嵁\\灏忓尯\\鍗椾含銆佹棤閿�-鍏ュ簱.xlsx",{List row -> index ++ def name = row['C'] def city = row['A'] @@ -128,24 +128,24 @@ class CrawlDataMatch { def excelRun(){ - def citys = ["泰安","临沂","菏泽","东营","德州","济宁","日照","聊城","滨州","枣庄","莱芜","济南","青岛","威海","烟台","潍坊","淄博"] + def citys = ["娉板畨","涓存矀","鑿忔辰","涓滆惀","寰峰窞","娴庡畞","鏃ョ収","鑱婂煄","婊ㄥ窞","鏋e簞","鑾辫姕","娴庡崡","闈掑矝","濞佹捣","鐑熷彴","娼嶅潑","娣勫崥"] for(def city : citys){ - def path = "d:\\数据\\小区\\山东\\"+city+"地图数据.xlsx" + def path = "d:\\鏁版嵁\\灏忓尯\\灞变笢\\"+city+"鍦板浘鏁版嵁.xlsx" def rets = findAllAddress(city) // createExcel(path, rets, city); matchDatas(path) } -// statWord(path);//切词统计词频 +// statWord(path);//鍒囪瘝缁熻璇嶉 -// println "共:"+rets.size() +// println "鍏憋細"+rets.size() // matchDatas(path) // filterData(path) -// matchMapData(path)//匹配百度地图 +// matchMapData(path)//鍖归厤鐧惧害鍦板浘 } def matchMapData(path){ @@ -229,14 +229,14 @@ class CrawlDataMatch { println k +" "+v results << [k, v] } - ExcelUtils.write("d:\\数据\\结果\\福建\\百度住宅(词频).xlsx", results, "Sheet1") + ExcelUtils.write("d:\\鏁版嵁\\缁撴灉\\绂忓缓\\鐧惧害浣忓畢(璇嶉).xlsx", results, "Sheet1") } def nameCheck(def name){ - def words = ["店","厂房","地块","创业","基地","市场","建材","商务","商场","学生公寓","研究生公寓","分拨中心","服务中心","配送中心","活动中心","商业中心","批发","艺术品中心","代理","soho","SOHO","工业园","工业区","长租公寓","租赁房","学生宿舍","步行街","工业大厦","展厅","民宿","商铺","时长房","康复中心","连锁","海景房","廉租房","散盘","理发"] + def words = ["搴�","鍘傛埧","鍦板潡","鍒涗笟","鍩哄湴","甯傚満","寤烘潗","鍟嗗姟","鍟嗗満","瀛︾敓鍏瘬","鐮旂┒鐢熷叕瀵�","鍒嗘嫧涓績","鏈嶅姟涓績","閰嶉�佷腑蹇�","娲诲姩涓績","鍟嗕笟涓績","鎵瑰彂","鑹烘湳鍝佷腑蹇�","浠g悊","soho","SOHO","宸ヤ笟鍥�","宸ヤ笟鍖�","闀跨鍏瘬","绉熻祦鎴�","瀛︾敓瀹胯垗","姝ヨ琛�","宸ヤ笟澶у帵","灞曞巺","姘戝","鍟嗛摵","鏃堕暱鎴�","搴峰涓績","杩為攣","娴锋櫙鎴�","寤夌鎴�","鏁g洏","鐞嗗彂"] def flag = false; - if(name && (name=="小区"||name=="公寓")){ + if(name && (name=="灏忓尯"||name=="鍏瘬")){ flag = true; }else{ for(def word : words){ @@ -252,10 +252,10 @@ class CrawlDataMatch { def filterData(path){ def datas = ExcelUtils.read(path) // datas = sortDatas(datas); - // ExcelUtils.write("d:\\数据\\结果\\福建地图抓取数据-腾讯住宅.xlsx", datas, "Sheet1") + // ExcelUtils.write("d:\\鏁版嵁\\缁撴灉\\绂忓缓鍦板浘鎶撳彇鏁版嵁-鑵捐浣忓畢.xlsx", datas, "Sheet1") def results = [] - results << ["省","城市","区域","名称","地址","类型","经度","纬度","标记"] + results << ["鐪�","鍩庡競","鍖哄煙","鍚嶇О","鍦板潃","绫诲瀷","缁忓害","绾害","鏍囪"] def names = [] if(datas){ @@ -264,7 +264,7 @@ class CrawlDataMatch { def city = data[1] def region = data[2] def name = data[3] -// if(name=="云鼎3d设计-1栋"){ +// if(name=="浜戦紟3d璁捐-1鏍�"){ // println name // } @@ -292,7 +292,7 @@ class CrawlDataMatch { } } } - ExcelUtils.write("d:\\数据\\结果\\福建\\百度(处理后2).xlsx", results, "Sheet1") + ExcelUtils.write("d:\\鏁版嵁\\缁撴灉\\绂忓缓\\鐧惧害(澶勭悊鍚�2).xlsx", results, "Sheet1") } def sortDatas(def datas){ @@ -314,28 +314,28 @@ class CrawlDataMatch { } def nameFormat(def name){ - name = name.replace("1里","一里").replace("2里","二里").replace("3里","三里").replace("4里","四里").replace("5里","五里").replace("6里","六里").replace("7里","七里").replace("8里","八里").replace("1期","一期").replace("2期","二期").replace("3期","三期").replace("4期","四期").replace("5期","五期").replace("6期","六期").replace("7期","七期").replace("8期","八期").replace("1区","一区").replace("2区","二区").replace("3区","三区").replace("4区","四区").replace("5区","五区").replace("6区","六区").replace("7区","七区").replace("8区","八区").replace("9区","九区") - def s = DataHandleUtils.findMatchPattern(name, "路.*-[A-Za-z0-9]+[号|#|幢|栋]楼?") + name = name.replace("1閲�","涓�閲�").replace("2閲�","浜岄噷").replace("3閲�","涓夐噷").replace("4閲�","鍥涢噷").replace("5閲�","浜旈噷").replace("6閲�","鍏噷").replace("7閲�","涓冮噷").replace("8閲�","鍏噷").replace("1鏈�","涓�鏈�").replace("2鏈�","浜屾湡").replace("3鏈�","涓夋湡").replace("4鏈�","鍥涙湡").replace("5鏈�","浜旀湡").replace("6鏈�","鍏湡").replace("7鏈�","涓冩湡").replace("8鏈�","鍏湡").replace("1鍖�","涓�鍖�").replace("2鍖�","浜屽尯").replace("3鍖�","涓夊尯").replace("4鍖�","鍥涘尯").replace("5鍖�","浜斿尯").replace("6鍖�","鍏尯").replace("7鍖�","涓冨尯").replace("8鍖�","鍏尯").replace("9鍖�","涔濆尯") + def s = DataHandleUtils.findMatchPattern(name, "璺�.*-[A-Za-z0-9]+[鍙穦#|骞鏍媇妤�?") if(!s){ - s = DataHandleUtils.findMatchPattern(name, "-?\\d+[号|#|幢|栋]楼?") + s = DataHandleUtils.findMatchPattern(name, "-?\\d+[鍙穦#|骞鏍媇妤�?") } if(!s){ - s = DataHandleUtils.findMatchPattern(name, "-?[A-Za-z][号|#|幢|栋|座|区]楼?") + s = DataHandleUtils.findMatchPattern(name, "-?[A-Za-z][鍙穦#|骞鏍媩搴鍖篯妤�?") } if(s && name!=s){ - if(s.startsWith("路")){ + if(s.startsWith("璺�")){ name = name.toString().replace(s.substring(s.indexOf("-")), "") - }else if(!name.toString().contains("路")){ + }else if(!name.toString().contains("璺�")){ name = name.toString().replace(s, "") } } - s = DataHandleUtils.findMatchPattern(name, "-[一|二|三|四|五|六|七|八]期") + s = DataHandleUtils.findMatchPattern(name, "-[涓�|浜寍涓墊鍥泑浜攟鍏瓅涓億鍏玗鏈�") if(s){ name = name.replace(s, s.substring(1, s.length())) } - name = name.replace("·","").replace("(营销中心)","").replace("营销中心","").replace("接待中心","") - s = DataHandleUtils.findMatchPattern(name, "\\d+-\\d+[号|#|幢|栋]楼?") + name = name.replace("路","").replace("(钀ラ攢涓績)","").replace("钀ラ攢涓績","").replace("鎺ュ緟涓績","") + s = DataHandleUtils.findMatchPattern(name, "\\d+-\\d+[鍙穦#|骞鏍媇妤�?") if(!s){ name = name.replace("-","") } @@ -345,7 +345,7 @@ class CrawlDataMatch { def createExcel(def path, def rets, def city){ def ret = [] - ret << ["省","城市","区域","名称","地址","类型","经度","纬度","匹配Id","匹配城市","匹配区域","匹配名称","匹配地址","匹配类型"] + ret << ["鐪�","鍩庡競","鍖哄煙","鍚嶇О","鍦板潃","绫诲瀷","缁忓害","绾害","鍖归厤Id","鍖归厤鍩庡競","鍖归厤鍖哄煙","鍖归厤鍚嶇О","鍖归厤鍦板潃","鍖归厤绫诲瀷"] def datas = [] for(def row : rets){ def data = [] @@ -402,8 +402,8 @@ class CrawlDataMatch { rMap.estate_type2 = obj.estate_type2 } } - if(!rMap && name.contains("·")){ - def newName = trimChar(name).replace("·","") + if(!rMap && name.contains("路")){ + def newName = trimChar(name).replace("路","") rMap = matchFromDB2(city,newName) } return rMap; @@ -411,19 +411,19 @@ class CrawlDataMatch { def run(){ def rets = findAllAddress() - println "共:"+rets.size() + println "鍏憋細"+rets.size() rets = match(rets); // rets = matchFromDB(rets) def ret = [] - ret << ["省","城市","区域","名称","地址","类型","匹配Id","匹配城市","匹配区域","匹配名称","匹配地址","匹配类型"] + ret << ["鐪�","鍩庡競","鍖哄煙","鍚嶇О","鍦板潃","绫诲瀷","鍖归厤Id","鍖归厤鍩庡競","鍖归厤鍖哄煙","鍖归厤鍚嶇О","鍖归厤鍦板潃","鍖归厤绫诲瀷"] ret.addAll(rets) - ExcelUtils.write("d:\\数据\\结果\\深圳高德地图匹配数据.xlsx", ret, "Sheet1") + ExcelUtils.write("d:\\鏁版嵁\\缁撴灉\\娣卞湷楂樺痉鍦板浘鍖归厤鏁版嵁.xlsx", ret, "Sheet1") } def match(){//multiThreadingModify def index = 0 - ExcelUtils.multiThreadingModify("D:\\数据\\无锡第三方均价.xlsx", { row -> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\鏃犻敗绗笁鏂瑰潎浠�.xlsx", { row -> index ++ def city = row['A'] def region = row['B'] @@ -502,14 +502,14 @@ class CrawlDataMatch { ResultSet rs = statement.executeQuery(sqlBuffer.toString()) def rets = [] def index = 0; -// def citys = [ "青岛"] +// def citys = [ "闈掑矝"] //def typecodes = ["120203","120300","120301","120302"] def count= 0 while(rs.next()){ def source = rs.getObject("source") count++ println count+" "+source - if(source && source=="高德"){ + if(source && source=="楂樺痉"){ String city = rs.getString("cityname"); //def typecode = rs.getObject("typecode") // println city +" "+typecode @@ -572,7 +572,7 @@ class CrawlDataMatch { } } if(row.size()<=6){ - def name = trimChar(row[3]).replace("·","") + def name = trimChar(row[3]).replace("路","") row = matchFromDB(row, row[1],name) } @@ -619,7 +619,7 @@ class CrawlDataMatch { } } if(row.size()<=6){ - def name = trimChar(row[3]).replace("·","") + def name = trimChar(row[3]).replace("路","") row = matchFromDB(row, row[1],name) } @@ -647,12 +647,12 @@ class CrawlDataMatch { def matcher = pattern.matcher(address) if (matcher.find()) { def s = matcher.group(); - if (address.indexOf("交汇") > -1 || address.indexOf("与") > -1) { + if (address.indexOf("浜ゆ眹") > -1 || address.indexOf("涓�") > -1) { return null; - } else if (address.indexOf("路") == -1 && address.indexOf("街") == -1 && address.indexOf("大道") == -1 && address.indexOf("巷") == -1 && address.indexOf("北里") == -1 && address.indexOf("南里") == -1 && address.indexOf("东里") == -1 && address.indexOf("西里") == -1) { + } else if (address.indexOf("璺�") == -1 && address.indexOf("琛�") == -1 && address.indexOf("澶ч亾") == -1 && address.indexOf("宸�") == -1 && address.indexOf("鍖楅噷") == -1 && address.indexOf("鍗楅噷") == -1 && address.indexOf("涓滈噷") == -1 && address.indexOf("瑗块噷") == -1) { return null; } else { - pattern = Pattern.compile("[路|街|大道|巷]\\d+"); + pattern = Pattern.compile("[璺瘄琛梶澶ч亾|宸穄\\d+"); matcher = pattern.matcher(address) if(matcher.find()){ return s; @@ -675,7 +675,7 @@ class CrawlDataMatch { def poolRun(){ def rets = findAllAddress() - println "共:"+rets.size() + println "鍏憋細"+rets.size() rets = match(rets); def results = [] @@ -691,7 +691,7 @@ class CrawlDataMatch { results << match2(ret); } } catch (Exception e) { - println "异常" + println "寮傚父" e.printStackTrace(); } finally { latch.countDown() @@ -704,9 +704,9 @@ class CrawlDataMatch { latch.await() def ret = [] - ret << ["省","城市","区域","名称","地址","类型","匹配Id","匹配城市","匹配区域","匹配名称","匹配地址","匹配类型"] + ret << ["鐪�","鍩庡競","鍖哄煙","鍚嶇О","鍦板潃","绫诲瀷","鍖归厤Id","鍖归厤鍩庡競","鍖归厤鍖哄煙","鍖归厤鍚嶇О","鍖归厤鍦板潃","鍖归厤绫诲瀷"] ret.addAll(results) - ExcelUtils.write("d:\\数据\\结果\\深圳地图匹配数据2.xlsx", ret, "Sheet1") + ExcelUtils.write("d:\\鏁版嵁\\缁撴灉\\娣卞湷鍦板浘鍖归厤鏁版嵁2.xlsx", ret, "Sheet1") } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/CreateWord.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/CreateWord.groovy index 35a84f2bb..6661a9326 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/CreateWord.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/CreateWord.groovy @@ -31,7 +31,7 @@ class CreateWord { def openApiRun(){ def p = "E:\\ViewStore\\youdao\\main\\projects\\fangjia-open\\src\\main\\java\\com\\fangjia\\open\\controllers"; def files = getAllFiles(p) - println "共:"+files + println "鍏憋細"+files code = "gbk" for(def file : files){ println "All:"+file.getPath() @@ -41,8 +41,8 @@ class CreateWord { for(def path : files){ def flag = findInFiles(path, fileNames); if(flag){ -// writeFile(path.getPath(), "D:\\数据\\代码\\房价数据接口平台.txt"); - writeFile(path.getPath(), "D:\\数据\\代码\\房产评级接口平台.txt"); +// writeFile(path.getPath(), "D:\\鏁版嵁\\浠g爜\\鎴夸环鏁版嵁鎺ュ彛骞冲彴.txt"); + writeFile(path.getPath(), "D:\\鏁版嵁\\浠g爜\\鎴夸骇璇勭骇鎺ュ彛骞冲彴.txt"); } } } @@ -51,7 +51,7 @@ class CreateWord { // def p = "E:\\ViewStore\\branch_fangjia_bkoff\\main\\projects\\fangjia-bkoff\\src\\main\\java\\com\\fangjia\\bkoff\\controllers"; def p = "E:\\ViewStore\\branch_fangjia_bkoff\\main\\projects\\fangjia-bkoff\\src\\main\\webapp"; def files = getAllFiles(p) - println "共:"+files + println "鍏憋細"+files // code = "gbk" for(def file : files){ println "All:"+file.getPath() @@ -61,7 +61,7 @@ class CreateWord { for(def path : files){ def flag = findInFiles(path, fileNames); if(flag){ - writeFile(path.getPath(), "D:\\数据\\代码\\房价智能管理系统用户手册.txt"); + writeFile(path.getPath(), "D:\\鏁版嵁\\浠g爜\\鎴夸环鏅鸿兘绠$悊绯荤粺鐢ㄦ埛鎵嬪唽.txt"); } } } @@ -70,7 +70,7 @@ class CreateWord { // def p = "E:\\ViewStore\\branch_fangjia_bkoff\\main\\projects\\fangjia-bkoff\\src\\main\\java\\com\\fangjia\\bkoff\\controllers"; def p = "E:\\ViewStore\\branch_fangjia_bkoff\\main\\projects\\fangjia-bkoff\\src\\main\\webapp"; def files = getAllFiles(p) - println "共:"+files + println "鍏憋細"+files for(def file : files){ println "All:"+file.getPath() } @@ -80,7 +80,7 @@ class CreateWord { for(def path : files){ def flag = findInFiles(path, fileNames); if(flag){ - writeFile(path.getPath(), "D:\\数据\\代码\\商用客户接口管理系统用户手册.txt"); + writeFile(path.getPath(), "D:\\鏁版嵁\\浠g爜\\鍟嗙敤瀹㈡埛鎺ュ彛绠$悊绯荤粺鐢ㄦ埛鎵嬪唽.txt"); } } } @@ -89,7 +89,7 @@ class CreateWord { // def p = "E:\\ViewStore\\branch_fangjia_bkoff\\main\\projects\\fangjia-bkoff\\src\\main\\java\\com\\fangjia\\bkoff\\controllers"; def p = "E:\\ViewStore\\branch_fangjia_bkoff\\main\\projects\\fangjia-bkoff\\src\\main\\webapp"; def files = getAllFiles(p) - println "共:"+files + println "鍏憋細"+files for(def file : files){ println "All:"+file.getPath() } @@ -100,7 +100,7 @@ class CreateWord { for(def path : files){ def flag = findInFiles(path, fileNames); if(flag){ - writeFile(path.getPath(), "D:\\数据\\代码\\租金智能管理系统.txt"); + writeFile(path.getPath(), "D:\\鏁版嵁\\浠g爜\\绉熼噾鏅鸿兘绠$悊绯荤粺.txt"); } } } @@ -108,13 +108,13 @@ class CreateWord { def youdaToCrun(){ def p = "E:\\ViewStore\\you-da1.0\\main\\projects\\fangjia-youda\\fangjia-youda-service\\src\\main\\java\\com\\fangjia\\youda\\service"; def files = getAllFiles(p) - println "共:"+files + println "鍏憋細"+files for(def file : files){ println "All:"+file.getPath() } // def fileNames =["EsfTradeController","LandController","NewTradeController","TradeBlockService","RegionBlockService","LogService","CommonService","LandService","esfTrade\\detail.gsp","esfTrade\\index.gsp","esfTrade\\print.gsp","newTrade\\detail.gsp","newTrade\\index.gsp","newTrade\\show.gsp"] for(def path : files){ - writeFile(path.getPath(), "D:\\数据\\代码\\友达ToC.txt"); + writeFile(path.getPath(), "D:\\鏁版嵁\\浠g爜\\鍙嬭揪ToC.txt"); } } @@ -126,7 +126,7 @@ class CreateWord { } // def fileNames =["EsfTradeController","LandController","NewTradeController","TradeBlockService","RegionBlockService","LogService","CommonService","LandService","esfTrade\\detail.gsp","esfTrade\\index.gsp","esfTrade\\print.gsp","newTrade\\detail.gsp","newTrade\\index.gsp","newTrade\\show.gsp"] for(def path : files){ - writeFile(path.getPath(), "D:\\数据\\代码\\友达ToB.txt"); + writeFile(path.getPath(), "D:\\鏁版嵁\\浠g爜\\鍙嬭揪ToB.txt"); } } @@ -137,7 +137,7 @@ class CreateWord { println "All:"+file.getPath() } for(def path : files){ - writeFile(path.getPath(), "D:\\数据\\代码\\友达后台.txt"); + writeFile(path.getPath(), "D:\\鏁版嵁\\浠g爜\\鍙嬭揪鍚庡彴.txt"); } } @@ -148,7 +148,7 @@ class CreateWord { println "All:"+file.getPath() } for(def path : files){ - writeFile(path.getPath(), "D:\\数据\\代码\\有房小程序.txt"); + writeFile(path.getPath(), "D:\\鏁版嵁\\浠g爜\\鏈夋埧灏忕▼搴�.txt"); } } @@ -162,7 +162,7 @@ class CreateWord { for(def path : files){ // def flag = findInFiles(path, fileNames); // if(flag){ - writeFile(path.getPath(), "D:\\数据\\代码\\房价通.txt"); + writeFile(path.getPath(), "D:\\鏁版嵁\\浠g爜\\鎴夸环閫�.txt"); // } } } @@ -171,7 +171,7 @@ class CreateWord { def flag = false; for(def allFileName : fileNames){ if(path.getPath().contains(allFileName)){ - println "找到:"+path.getName() +" "+path.getPath() + println "鎵惧埌锛�"+path.getName() +" "+path.getPath() flag = true; break; } @@ -190,7 +190,7 @@ class CreateWord { file.createNewFile(); } - // 这里的true,是以追加的方式写 + // 杩欓噷鐨則rue锛屾槸浠ヨ拷鍔犵殑鏂瑰紡鍐� writer = new FileWriter(dest, true); // reader = new FileReader(strSrc); @@ -224,7 +224,7 @@ class CreateWord { def createTxt(def path){ def filename = path.getName(); def lines = FileUtils.readLines(path, "UTF-8") - FileUtils.writeStringToFile(new File("D:\\数据\\代码\\房价通\\"+filename+".txt"), lines.toString()) + FileUtils.writeStringToFile(new File("D:\\鏁版嵁\\浠g爜\\鎴夸环閫歕\"+filename+".txt"), lines.toString()) } def static getAllFiles(def path) { @@ -242,7 +242,7 @@ class CreateWord { } } - println "文件夹:"+path+" count:"+files.size() + println "鏂囦欢澶癸細"+path+" count:"+files.size() return files; } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/CutWordUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/CutWordUtils.groovy index 0e732595e..b6fc88600 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/CutWordUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/CutWordUtils.groovy @@ -18,50 +18,50 @@ class CutWordUtils { try{ ret = JSONObject.fromObject(ret) if(ret){ - //中国石化销售有限公司辽宁石油分公司 - //东莞市粤美特加油站有限公司 - //广东粤宏石油化工有限公司城区加油站 - //中油黑龙江农垦石油有限公司宝山加油站 - //东莞市常平岗梓加油站有限公司 - //呼和浩特市凌峰石油销售有限公司 + //涓浗鐭冲寲閿�鍞湁闄愬叕鍙歌窘瀹佺煶娌瑰垎鍏徃 + //涓滆帪甯傜菠缇庣壒鍔犳补绔欐湁闄愬叕鍙� + //骞夸笢绮ゅ畯鐭虫补鍖栧伐鏈夐檺鍏徃鍩庡尯鍔犳补绔� + //涓补榛戦緳姹熷啘鍨︾煶娌规湁闄愬叕鍙稿疂灞卞姞娌圭珯 + //涓滆帪甯傚父骞冲矖姊撳姞娌圭珯鏈夐檺鍏徃 + //鍛煎拰娴╃壒甯傚噷宄扮煶娌归攢鍞湁闄愬叕鍙� - if(name && name.contains("有限公司")){ - def pos = name.indexOf("有限公司") + if(name && name.contains("鏈夐檺鍏徃")){ + def pos = name.indexOf("鏈夐檺鍏徃") def prov = ret.prov def newKey = name - if(newKey.toString().endsWith("有限公司")){ + if(newKey.toString().endsWith("鏈夐檺鍏徃")){ if(prov && newKey.indexOf(prov)==0){ - newKey = newKey.replace(prov+"省","").replace(prov,"") + newKey = newKey.replace(prov+"鐪�","").replace(prov,"") } if(ret.city && newKey.indexOf(ret.city)==0){ - newKey = newKey.replace(ret.city+"市","").replace(ret.city,"") + newKey = newKey.replace(ret.city+"甯�","").replace(ret.city,"") } if(ret.region && newKey.indexOf(ret.region)==0){ - newKey = newKey.replace(ret.region + "县", "").replace(ret.region+"区", "").replace(ret.region, "") + newKey = newKey.replace(ret.region + "鍘�", "").replace(ret.region+"鍖�", "").replace(ret.region, "") } - newKey = newKey.replace("销售股份有限公司","").replace("销售有限公司","").replace("股份有限公司","").replace("有限公司","") + newKey = newKey.replace("閿�鍞偂浠芥湁闄愬叕鍙�","").replace("閿�鍞湁闄愬叕鍙�","").replace("鑲′唤鏈夐檺鍏徃","").replace("鏈夐檺鍏徃","") }else{ if(prov && newKey.indexOf(prov)>-1){ if(pos > newKey.indexOf(prov)){ - newKey = newKey.replace(prov+"省","").replace(prov,"") + newKey = newKey.replace(prov+"鐪�","").replace(prov,"") } } if(ret.city && newKey.indexOf(ret.city)>-1){ if(pos > newKey.indexOf(ret.city)){ - newKey = newKey.replace(ret.city+"市","").replace(ret.city,"") + newKey = newKey.replace(ret.city+"甯�","").replace(ret.city,"") } } if(ret.region && newKey.indexOf(ret.region)>-1){ if(pos > newKey.indexOf(ret.region)) { - newKey = newKey.replace(ret.region + "县", "").replace(ret.region+"区", "").replace(ret.region, "") + newKey = newKey.replace(ret.region + "鍘�", "").replace(ret.region+"鍖�", "").replace(ret.region, "") } } - newKey = newKey.replace("销售股份有限公司","").replace("销售有限公司","").replace("股份有限公司","").replace("有限公司","") + newKey = newKey.replace("閿�鍞偂浠芥湁闄愬叕鍙�","").replace("閿�鍞湁闄愬叕鍙�","").replace("鑲′唤鏈夐檺鍏徃","").replace("鏈夐檺鍏徃","") } if(newKey){ ret.key = newKey @@ -69,13 +69,13 @@ class CutWordUtils { } - if(ret.key && ret.key=="加油站"){ + if(ret.key && ret.key=="鍔犳补绔�"){ def newKey = name if(ret.city && newKey.indexOf(ret.city)==0){ - newKey = newKey.replace(ret.city+"市","").replace(ret.city,"") + newKey = newKey.replace(ret.city+"甯�","").replace(ret.city,"") } if(ret.region && newKey.indexOf(ret.region)==0){ - newKey = newKey.replace(ret.region+"县","").replace(ret.region,"") + newKey = newKey.replace(ret.region+"鍘�","").replace(ret.region,"") } if(newKey){ ret.key = newKey diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/CzBankStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/CzBankStat.groovy index 599ef8f1e..e122bb393 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/CzBankStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/CzBankStat.groovy @@ -77,7 +77,7 @@ class CzBankStat { // println haveResultCount+" /${index.get()}"+arrs[4]+" "+count results << line }else{ - println "${haveResultCount}/${index.get()}[无结果] "+arrs[1]+" "+arrs[2]+" "+arrs[3]+" "+arrs[4]+" "+0 + println "${haveResultCount}/${index.get()}[鏃犵粨鏋淽 "+arrs[1]+" "+arrs[2]+" "+arrs[3]+" "+arrs[4]+" "+0 } } } @@ -180,7 +180,7 @@ class CzBankStat { httpclient.executeMethod(post); int code = post.getStatusCode(); //if (code == HttpStatus.SC_OK) - info = new String(post.getResponseBodyAsString()); //接口返回的信息 + info = new String(post.getResponseBodyAsString()); //鎺ュ彛杩斿洖鐨勪俊鎭� } catch (Exception ex) { ex.printStackTrace(); } finally { @@ -295,7 +295,7 @@ class CzBankStat { files << tempList[i]; } if (tempList[i].isDirectory()) { - System.out.println("文件夹:" + tempList[i]); + System.out.println("鏂囦欢澶癸細" + tempList[i]); } } return files; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/DataExport.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/DataExport.groovy index f2f28cb47..7264033ea 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/DataExport.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/DataExport.groovy @@ -16,13 +16,13 @@ import com.mongodb.DBObject /** * Created by gaojuan on 2018/3/13. */ -def citys = [ "合肥","北京", "上海", "广州", "深圳"] -//def citys = ["济南","洛阳","金华","合肥"] -//def citys = ["唐山","南平","呼和浩特","宜昌"] -//def citys = ["信阳","湘潭","襄阳","铜陵"] +def citys = [ "鍚堣偉","鍖椾含", "涓婃捣", "骞垮窞", "娣卞湷"] +//def citys = ["娴庡崡","娲涢槼","閲戝崕","鍚堣偉"] +//def citys = ["鍞愬北","鍗楀钩","鍛煎拰娴╃壒","瀹滄槍"] +//def citys = ["淇¢槼","婀樻江","瑗勯槼","閾滈櫟"] def weekend = "2018-03-11" def radius = 1000; -def level = "一线" +def level = "涓�绾�" for(def city : citys){ // def cityPrice = CommonDatautils.findCityPrice(city, weekend) @@ -53,10 +53,10 @@ for(def city : citys){ // data[10] = dist.avg_consumption; datas<100){ break; } - //均价 + //鍧囦环 def dbo = CommonDatautils.findDistrictPrice(dist.city, dist.region, dist.name) if(dbo){ dist.avg_price = dbo.avg_price } - //周边均价 + //鍛ㄨ竟鍧囦环 def around_district_avg_price = addDistrictArroundInfo(dist.city, dist.region, dist.name, ) if(around_district_avg_price){ dist.around_district_avg_price = around_district_avg_price } - //平均消费 + //骞冲潎娑堣垂 if(dist.lat2 && dist.lng2){ def map = CommonDatautils.findMaxLatLngMinLatLng(dist.lat2/10000000000.0, dist.lng2/10000000000.0, radius) dist.avg_consumption = getAvgConsumption(dist.city, map, dist.lat2, dist.lng2, radius) @@ -210,7 +210,7 @@ public def getCityRegions(city){ def regions = []; for(DBObject obj : dbCursor){ def region = obj.get("name"); - if(region.indexOf("周边")==-1 && region.indexOf("其他")==-1) { + if(region.indexOf("鍛ㄨ竟")==-1 && region.indexOf("鍏朵粬")==-1) { regions << region; } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/DealPriceProcess.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/DealPriceProcess.groovy index c6ce91e86..92960f884 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/DealPriceProcess.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/DealPriceProcess.groovy @@ -24,11 +24,11 @@ class DealPriceProcess { // task.stat(); // task.export(); task.process(); -// task.signProcess("振业峦山谷花园(一期)")// 桂芳园七期(桂芳园(七期)) 振业峦山谷花园(一期) -// println task. isRoad("市府路104-42号") -// println "丽水湾畔 东四块玉南街" -// println task.isSpecialChar("丽水湾畔\\r\\t") -// println task.isStandardRoad("天钥桥路394弄") +// task.signProcess("鎸笟宄﹀北璋疯姳鍥�(涓�鏈�)")// 妗傝姵鍥竷鏈�(妗傝姵鍥紙涓冩湡锛�) 鎸笟宄﹀北璋疯姳鍥�(涓�鏈�) +// println task. isRoad("甯傚簻璺�104-42鍙�") +// println "涓芥按婀剧晹 涓滃洓鍧楃帀鍗楄" +// println task.isSpecialChar("涓芥按婀剧晹\\r\\t") +// println task.isStandardRoad("澶╅挜妗ヨ矾394寮�") } def process(){ @@ -47,7 +47,7 @@ class DealPriceProcess { def stat(){ def citys = CommonDatautils.findAllCity(); def rets = [] - rets << ["城市","小区量","半年成交量","半年匹配小区总量","半年匹配小区量","半年匹配占比","一年成交量","一年匹配小区总量","一年匹配小区量","一年匹配占比"] + rets << ["鍩庡競","灏忓尯閲�","鍗婂勾鎴愪氦閲�","鍗婂勾鍖归厤灏忓尯鎬婚噺","鍗婂勾鍖归厤灏忓尯閲�","鍗婂勾鍖归厤鍗犳瘮","涓�骞存垚浜ら噺","涓�骞村尮閰嶅皬鍖烘�婚噺","涓�骞村尮閰嶅皬鍖洪噺","涓�骞村尮閰嶅崰姣�"] for(def city : citys){ def districts = CommonDatautils.findAllDistrictByCity(city, "district",["city","region","name","alias"]) if(districts){ @@ -72,11 +72,11 @@ class DealPriceProcess { rets << ret } } - ExcelUtils.write("E:\\数据\\成交.xlsx", rets, "Sheet1") + ExcelUtils.write("E:\\鏁版嵁\\鎴愪氦.xlsx", rets, "Sheet1") } def isStandardRoad(def s){ - def pattern = Pattern.compile("[路|街|大道|巷]\\d+(号|弄)"); + def pattern = Pattern.compile("[璺瘄琛梶澶ч亾|宸穄\\d+(鍙穦寮�)"); def matcher = pattern.matcher(s) if(matcher.find()){ return true; @@ -118,12 +118,12 @@ class DealPriceProcess { DBObject dbo = cursor.next(); def district = districtMap.get(dbo.city + "_" + dbo.region + "_" + dbo.district_name); if(!district){ - if(!dbo.district_name.contains("小区")){ - district = districtMap.get(dbo.city + "_" + dbo.region + "_" + dbo.district_name+"小区"); + if(!dbo.district_name.contains("灏忓尯")){ + district = districtMap.get(dbo.city + "_" + dbo.region + "_" + dbo.district_name+"灏忓尯"); } - if(!district && !dbo.district_name.contains("公寓")){ - district = districtMap.get(dbo.city + "_" + dbo.region + "_" + dbo.district_name+"公寓"); + if(!district && !dbo.district_name.contains("鍏瘬")){ + district = districtMap.get(dbo.city + "_" + dbo.region + "_" + dbo.district_name+"鍏瘬"); } if(!district && dbo.district_name.contains("(")){ @@ -227,7 +227,7 @@ class DealPriceProcess { def removeSpecialChar(def s){ - def chars = [".","·","?","*","●","﹒"] + def chars = [".","路","?","*","鈼�","锕�"] s = trimChar(s) for(def c : chars){ if(c=="."){ @@ -240,12 +240,12 @@ class DealPriceProcess { } } - s = s.replace("Ⅰ","一").replace("Ⅱ","二").replace("Ⅲ","三").replace("(高层)","").replace("(公寓)","").replace("(住宅)","").replace("(公寓)","").trim() + s = s.replace("鈪�","涓�").replace("鈪�","浜�").replace("鈪�","涓�").replace("(楂樺眰)","").replace("(鍏瘬锛�","").replace("锛堜綇瀹咃級","").replace("(鍏瘬)","").trim() s = signProcess(s) return s; } def signProcess(def s){ - Pattern p2 = Pattern.compile("(\\(|\\()(一期|二期|三期|四期|五期|六期|七期|八期|九期|东区|南区|西区|北区|一区|二区|三区|四区|五区|六区|七区|八区|九区)(\\))"); + Pattern p2 = Pattern.compile("(\\锛坾\\()(涓�鏈焲浜屾湡|涓夋湡|鍥涙湡|浜旀湡|鍏湡|涓冩湡|鍏湡|涔濇湡|涓滃尯|鍗楀尯|瑗垮尯|鍖楀尯|涓�鍖簗浜屽尯|涓夊尯|鍥涘尯|浜斿尯|鍏尯|涓冨尯|鍏尯|涔濆尯)(\\锛�)"); def m2 = p2.matcher(s); while(m2.find()){ println m2.group() @@ -277,7 +277,7 @@ class DealPriceProcess { } def isRoad(def s){ - String regex2 = "[0-9]*(-|/|、)[0-9]*"; + String regex2 = "[0-9]*(-|/|銆�)[0-9]*"; Pattern p2 = Pattern.compile(regex2); def m2 = p2.matcher(s); @@ -288,11 +288,11 @@ class DealPriceProcess { } def export(){ - def city = "武汉" + def city = "姝︽眽" def districts = CommonDatautils.findAllDistrictByCity(city, "district",["city","region","name","alias"]) if(districts) { def rets = [] - rets << ["城市","区域","小区名称"] + rets << ["鍩庡競","鍖哄煙","灏忓尯鍚嶇О"] def rMap = findTrades(city, '2019-09-01', getDistrictNames(city, districts)); if(rMap.result){ for(def s : rMap.result){ @@ -305,7 +305,7 @@ class DealPriceProcess { } } - ExcelUtils.write("E:\\数据\\武汉小区.xlsx", rets, "Sheet1") + ExcelUtils.write("E:\\鏁版嵁\\姝︽眽灏忓尯.xlsx", rets, "Sheet1") } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/DistrictCityRegionProcess.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/DistrictCityRegionProcess.groovy index 203ea65da..92e5cdfcc 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/DistrictCityRegionProcess.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/DistrictCityRegionProcess.groovy @@ -42,14 +42,14 @@ class DistrictCityRegionProcess { def process(citys, cityMaps, datas){ def index = 0; - println "共:"+datas.size() + println "鍏憋細"+datas.size() for(def data : datas){ def city = data.city if(citys.contains(city)){ def regions = cityMaps.get(city); if(regions && !regions.contains(data.region)){ index++ - println index +" 区域:"+city+" "+ data.region+" "+data._id + println index +" 鍖哄煙锛�"+city+" "+ data.region+" "+data._id def dbo = new BasicDBObject() dbo.put("status", 1) dbo.put("m_date", new Date()) @@ -57,13 +57,13 @@ class DistrictCityRegionProcess { } }else{ index++ - println index +" 城市:"+city+" "+ data.region+" "+data._id + println index +" 鍩庡競锛�"+city+" "+ data.region+" "+data._id def dbo = new BasicDBObject() dbo.put("status", 1) dbo.put("m_date", new Date()) DbUtils.seaweed.update(new BasicDBObject("_id", data._id), new BasicDBObject('$set', dbo)) } } - println "共修改 "+index+" 个" + println "鍏变慨鏀� "+index+" 涓�" } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/DistrictDelete.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/DistrictDelete.groovy index 20045ce8c..d3cd7ac18 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/DistrictDelete.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/DistrictDelete.groovy @@ -21,15 +21,15 @@ class DistrictDelete{ public static void main(String[] args) { def task = new DistrictDelete(); - //task.run();//8月4号到7号精确地址在另一个小区名称或地址别名中 - //task.run1();//8月4号到7号存在另一个小区的别名中 + //task.run();//8鏈�4鍙峰埌7鍙风簿纭湴鍧�鍦ㄥ彟涓�涓皬鍖哄悕绉版垨鍦板潃鍒悕涓� + //task.run1();//8鏈�4鍙峰埌7鍙峰瓨鍦ㄥ彟涓�涓皬鍖虹殑鍒悕涓� task.run2(); } def run2(){ - def rows = ExcelUtils.read("C:\\Users\\gaojuan\\Desktop\\重复小区.xlsx") + def rows = ExcelUtils.read("C:\\Users\\gaojuan\\Desktop\\閲嶅灏忓尯.xlsx") if(rows && rows.size()>0){ def rets = [] def index = 0 @@ -56,7 +56,7 @@ class DistrictDelete{ udata.put("m_date", new Date()); DbUtils.seaweed.update(new BasicDBObject("_id", id), new BasicDBObject('$set', udata)) } - println "完成" + println "瀹屾垚" } } } @@ -66,7 +66,7 @@ class DistrictDelete{ def allCity = CommonUtils.findAllCity(); for(def city : allCity){ def districts = findAllDistricts(city, "district", ["city","region","name"]) - println city +" 新增量:"+ districts.count() + println city +" 鏂板閲忥細"+ districts.count() def ret = districtProcess(districts); removeDistrict(ret); } @@ -103,7 +103,7 @@ class DistrictDelete{ if(dbo){ deleteIndex++; - println "[${deleteIndex}/${districts.count()}]:"+dist.city + " "+dist.name+" "+dist.address+"(删除) [${dbo.name} ${dbo.address}(保留)]" + println "[${deleteIndex}/${districts.count()}]锛�"+dist.city + " "+dist.name+" "+dist.address+"(鍒犻櫎) [${dbo.name} ${dbo.address}(淇濈暀)]" deleteLists << dist; } } @@ -160,7 +160,7 @@ class DistrictDelete{ if(dbo){ deleteIndex++; - println "[${deleteIndex}/${districts.count()}]:"+dist.city + " "+name+"(删除) [${dbo.name}(保留)]" + println "[${deleteIndex}/${districts.count()}]锛�"+dist.city + " "+name+"(鍒犻櫎) [${dbo.name}(淇濈暀)]" deleteLists << dist; } @@ -223,16 +223,16 @@ class DistrictDelete{ def matcher = pattern.matcher(address) if(matcher.find()){ def s = matcher.group(); - if(address.indexOf("交汇")>-1||address.indexOf("与")>-1){ + if(address.indexOf("浜ゆ眹")>-1||address.indexOf("涓�")>-1){ return null; - }else if(address.indexOf("路")==-1&&address.indexOf("街")==-1&&address.indexOf("大道")==-1){ - if(address.indexOf(s+"号")>-1||address.indexOf(s+"弄")>-1){ - //防止".152弄" + }else if(address.indexOf("璺�")==-1&&address.indexOf("琛�")==-1&&address.indexOf("澶ч亾")==-1){ + if(address.indexOf(s+"鍙�")>-1||address.indexOf(s+"寮�")>-1){ + //闃叉".152寮�" def su = address.replace(s, ""); if(su.length()<3){ return null; }else{ - if(address.indexOf("地铁"+s)>-1){ + if(address.indexOf("鍦伴搧"+s)>-1){ return null; }else{ return s; @@ -244,20 +244,20 @@ class DistrictDelete{ def matcher1 = pattern1.matcher(address) if(matcher1.find()){ def ss = matcher1.group(); - if(address.indexOf(ss+"号")>-1||address.indexOf(ss+"弄")>-1){ + if(address.indexOf(ss+"鍙�")>-1||address.indexOf(ss+"寮�")>-1){ return ss; } } return null; } }else{ - if(address.indexOf(s+"号")==-1&&address.indexOf(s+"弄")==-1){ + if(address.indexOf(s+"鍙�")==-1&&address.indexOf(s+"寮�")==-1){ Pattern pattern2 = Pattern.compile("\\d+-\\d+"); def matcher2 = pattern2.matcher(address) if(matcher2.find()){ def sss = matcher2.group(); - if(address.indexOf(sss+"号")>-1||address.indexOf(sss+"弄")>-1){ + if(address.indexOf(sss+"鍙�")>-1||address.indexOf(sss+"寮�")>-1){ return sss; } } @@ -276,7 +276,7 @@ class DistrictDelete{ def isNumberStart(address){ Pattern pattern = Pattern.compile("^(\\d+)(.*)"); Matcher matcher = pattern.matcher(address); - if (matcher.matches()) {//数字开头 + if (matcher.matches()) {//鏁板瓧寮�澶� return matcher.group(); } return null; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/DistrictDetailBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/DistrictDetailBatch.groovy index 8fccafde8..6c8c90800 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/DistrictDetailBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/DistrictDetailBatch.groovy @@ -43,11 +43,11 @@ class DistrictDetailBatch { println count+" "+dist.city+" "+dist.estate_type2 if(!dist.estate_type2){ dist_index ++ - println "【${city_index}】"+dist_index+"/"+dists.size()+" ${dist.city} "+dist.estate_type2 + println "銆�${city_index}銆�"+dist_index+"/"+dists.size()+" ${dist.city} "+dist.estate_type2 }else{ - if(dist.estate_type2 && !["普通住宅","别墅","商住"].contains(dist.estate_type2)){ + if(dist.estate_type2 && !["鏅�氫綇瀹�","鍒","鍟嗕綇"].contains(dist.estate_type2)){ dist_index ++ - println "【${city_index}】"+dist_index+"/"+dists.size()+" ${dist.city} "+dist.estate_type2 + println "銆�${city_index}銆�"+dist_index+"/"+dists.size()+" ${dist.city} "+dist.estate_type2 } } } @@ -55,22 +55,22 @@ class DistrictDetailBatch { } def run3(){ - def dists = CommonDatautils.findAllDistrictByCity("福州","district",["city","region","name", "build_structure"]) + def dists = CommonDatautils.findAllDistrictByCity("绂忓窞","district",["city","region","name", "build_structure"]) def rets = [] if(dists){ for(def dist : dists){ - if(dist.build_structure && dist.build_structure.contains("钢结构")){ + if(dist.build_structure && dist.build_structure.contains("閽㈢粨鏋�")){ rets << [dist.city, dist.region, dist.name, dist.build_structure] } } } - ExcelUtils.write("D:\\数据\\福州钢结构小区.xlsx", rets, "福州") + ExcelUtils.write("D:\\鏁版嵁\\绂忓窞閽㈢粨鏋勫皬鍖�.xlsx", rets, "绂忓窞") } def run5(){ - def filePath = "D:\\数据\\建行银行\\建行信用卡数据V9(测试).xlsx" + def filePath = "D:\\鏁版嵁\\寤鸿閾惰\\寤鸿淇$敤鍗℃暟鎹甐9(娴嬭瘯).xlsx" ExcelUtils.multiThreadingModify(filePath, { row -> def city = row['C'] def region = row['D'] @@ -91,7 +91,7 @@ class DistrictDetailBatch { DBObject q = new BasicDBObject() q.put("p_rate", new BasicDBObject(QueryOperators.LT, 0)); - println "共:"+DISTRICT_DETAIL_COLL.count(q); + println "鍏憋細"+DISTRICT_DETAIL_COLL.count(q); def dbcursor = DISTRICT_DETAIL_COLL.find(q); def index = 1; dbcursor.each { final def dbo -> @@ -110,7 +110,7 @@ class DistrictDetailBatch { } index++ } catch (Exception e) { - println "异常" + println "寮傚父" e.printStackTrace(); } finally { } @@ -124,7 +124,7 @@ class DistrictDetailBatch { def run(){ DBObject q = new BasicDBObject() q.put("p_rate", new BasicDBObject(QueryOperators.LT, 0)); - println "共:"+DISTRICT_DETAIL_COLL.count(q); + println "鍏憋細"+DISTRICT_DETAIL_COLL.count(q); def dbcursor = DISTRICT_DETAIL_COLL.find(q); def index = 1; for(def dbo : dbcursor){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/DistrictFind.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/DistrictFind.groovy index 5e73d4bd9..24e56fc13 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/DistrictFind.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/DistrictFind.groovy @@ -9,7 +9,7 @@ class DistrictFind { task.run() } def run(){ - def list = ExcelUtils.read("F:\\数据\\地图搜索(1).xlsx", 0, 1) + def list = ExcelUtils.read("F:\\鏁版嵁\\鍦板浘鎼滅储(1).xlsx", 0, 1) def rets = [] for(def i=0;i +ExcelUtils.modify("D:\\鏁版嵁\\骞垮窞甯備綇鎴垮拰鍩庝埂寤鸿灞�.xls", { row -> index ++; - def city ="广州" + def city ="骞垮窞" def region = row['E'] def name = row['A'] def address = row['C'] @@ -41,7 +41,7 @@ ExcelUtils.modify("D:\\ def matchDistrict(def city, def address){ - address = address.replace("(","(").replace(")",")").replace(" ","") + address = address.replace("锛�","(").replace("锛�",")").replace(" ","") def url = "http://open.fangjia.com/address/matchV2?city="+city+"&address="+address+"&preciseLevel=strict&token=F54F52381C49BB9EB4A33EB1B65604AE4B71A28AEE53518A94A2F360408B9056D57553931D15CE6DDE765562DAD286BA38E05A4CDAFC51C3D527A4959BF8E75A3B95DB7108FCEA340DDE61925616DB55118E1851E67D83EAD800460D100D6B667A4ED8EE67C8F7FB&category=district" String content = new HttpRequest().get(url, "utf-8"); def rMap = [:] diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/DistrictSearch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/DistrictSearch.groovy index caeb9a0be..df2ad845e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/DistrictSearch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/DistrictSearch.groovy @@ -43,34 +43,34 @@ class DistrictSearch { // def rMap = findAllNewHouseData(); // -// ExcelUtils.modify("d:\\数据\\河南入库数据.xlsx", { data -> +// ExcelUtils.modify("d:\\鏁版嵁\\娌冲崡鍏ュ簱鏁版嵁.xlsx", { data -> // index++ //// if(index>=15735){ // def opt = data['C'] // def city = data['C'] // def region = data['D'] // def name = data['E'] -//// if(name.toString().contains("双岛湖御园")){ +//// if(name.toString().contains("鍙屽矝婀栧尽鍥�")){ // def matchName = data['K'] // // def status = data['AD'] // // def standRegion = RegionData.formatRegion(city, region) // def nameStr = trimChar(name) -// if(nameStr && nameStr.contains("·")){ -// nameStr = nameStr.replace("·","") +// if(nameStr && nameStr.contains("路")){ +// nameStr = nameStr.replace("路","") // } // -// //比对抓取的新盘 +// //姣斿鎶撳彇鐨勬柊鐩� // findDataFromCrawl(city, standRegion, nameStr, matchName, name, data, rMap) // -// if(!status && name.endsWith("期")){ -// //分期处理 +// if(!status && name.endsWith("鏈�")){ +// //鍒嗘湡澶勭悊 // processFenQi(city, standRegion, name, nameStr, data); // } //// -//// if(!status && name.endsWith("小区")){ -//// //后缀小区处理 +//// if(!status && name.endsWith("灏忓尯")){ +//// //鍚庣紑灏忓尯澶勭悊 //// processXiaoQu(city, standRegion, name, nameStr); //// } //// } @@ -78,37 +78,37 @@ class DistrictSearch { //// } // }) -// saveDataToDB("D:\\数据\\结果\\漳州地图数据.xlsx"); - batchSaveDataToDB("D:\\数据\\小区\\南京、无锡-入库.xlsx"); +// saveDataToDB("D:\\鏁版嵁\\缁撴灉\\婕冲窞鍦板浘鏁版嵁.xlsx"); + batchSaveDataToDB("D:\\鏁版嵁\\灏忓尯\\鍗椾含銆佹棤閿�-鍏ュ簱.xlsx"); } def processFenQi(city, standRegion, newName, oldName, data){ - def s = oldName.replace("1期","一期").replace("2期","二期").replace("3期","三期").replace("4期","四期").replace("5期","五期").replace("6期","六期").replace("7期","七期").replace("8期","八期").replace("9期","九期").replace("10期","十期").replace("Ⅱ期","二期") + def s = oldName.replace("1鏈�","涓�鏈�").replace("2鏈�","浜屾湡").replace("3鏈�","涓夋湡").replace("4鏈�","鍥涙湡").replace("5鏈�","浜旀湡").replace("6鏈�","鍏湡").replace("7鏈�","涓冩湡").replace("8鏈�","鍏湡").replace("9鏈�","涔濇湡").replace("10鏈�","鍗佹湡").replace("鈪℃湡","浜屾湡") def obj = CommonDatautils.findDistrict(city, standRegion, s, "district") if(obj){ if(obj.alias && obj.alias.contains(oldName)){ - data['AD'] = "不处理,别名存在" + data['AD'] = "涓嶅鐞嗭紝鍒悕瀛樺湪" }else{ - data['AD'] = "加别名" + data['AD'] = "鍔犲埆鍚�" } }else{ - def prefix = s.substring(0, s.indexOf("期")-1) + def prefix = s.substring(0, s.indexOf("鏈�")-1) obj = CommonDatautils.findDistrict(city, standRegion, prefix, "district") if(obj){ - data['AD'] = "新增入库" + data['AD'] = "鏂板鍏ュ簱" } } } def processXiaoQu(city, standRegion, oldName, newName, data){ - def name = oldName.replace("小区","") + def name = oldName.replace("灏忓尯","") if(name && name.length>=3){ def obj = CommonDatautils.findDistrict(city, standRegion, name, "district") if(obj){ - data['AD'] = "加别名" + data['AD'] = "鍔犲埆鍚�" } } } @@ -132,9 +132,9 @@ class DistrictSearch { if (address1 && findPattern(address1)) { data['W'] = address1 }else{ - if(address1 && (address1.contains("交汇")||address1.contains("交叉"))){ + if(address1 && (address1.contains("浜ゆ眹")||address1.contains("浜ゅ弶"))){ data['W'] = address1 - }else if (address && (address.contains("交汇")||address.contains("交叉"))) { + }else if (address && (address.contains("浜ゆ眹")||address.contains("浜ゅ弶"))) { data['W'] = address } } @@ -146,12 +146,12 @@ class DistrictSearch { // def ret = addToDb(city, standRegion, nameStr, name, row); // if(ret && ret.size()>0){ // addIndex++; -// println "[${zIndex}/${index}] "+city+" "+key+" 存在 ${addIndex}【入库】" -// data['AD'] = "入库" +// println "[${zIndex}/${index}] "+city+" "+key+" 瀛樺湪 ${addIndex}銆愬叆搴撱��" +// data['AD'] = "鍏ュ簱" // } // // }else{ -// println "[${zIndex}/${index}] "+city+" "+key+" 存在" +// println "[${zIndex}/${index}] "+city+" "+key+" 瀛樺湪" // } } @@ -165,12 +165,12 @@ class DistrictSearch { def matcher = pattern.matcher(address) if (matcher.find()) { def s = matcher.group(); - if (address.indexOf("交汇") > -1 || address.indexOf("与") > -1) { + if (address.indexOf("浜ゆ眹") > -1 || address.indexOf("涓�") > -1) { return null; - } else if (address.indexOf("路") == -1 && address.indexOf("街") == -1 && address.indexOf("大道") == -1 && address.indexOf("巷") == -1 && address.indexOf("北里") == -1 && address.indexOf("南里") == -1 && address.indexOf("东里") == -1 && address.indexOf("西里") == -1) { + } else if (address.indexOf("璺�") == -1 && address.indexOf("琛�") == -1 && address.indexOf("澶ч亾") == -1 && address.indexOf("宸�") == -1 && address.indexOf("鍖楅噷") == -1 && address.indexOf("鍗楅噷") == -1 && address.indexOf("涓滈噷") == -1 && address.indexOf("瑗块噷") == -1) { return null; } else { - pattern = Pattern.compile("[路|街|大道|巷]\\d+"); + pattern = Pattern.compile("[璺瘄琛梶澶ч亾|宸穄\\d+"); matcher = pattern.matcher(address) if(matcher.find()){ return s; @@ -198,7 +198,7 @@ class DistrictSearch { def findAllNewHouseData(){ def q = new BasicDBObject() q.put("s_date", 201910) - q.put("source", "搜房新房") + q.put("source", "鎼滄埧鏂版埧") def keys = new BasicDBObject() keys.put("city",1) @@ -224,8 +224,8 @@ class DistrictSearch { if(ret.size()>0){ def location = getEsLocation(city, name) if(!location){ - if(name.toString().endsWith("别墅")){ - location = getEsLocation(city, name.toString().replace("别墅","")) + if(name.toString().endsWith("鍒")){ + location = getEsLocation(city, name.toString().replace("鍒","")) } } for(def o : ret){ @@ -240,10 +240,10 @@ class DistrictSearch { o.c_date = new Date() o.m_date = new Date() def markMap = [:] - markMap.put("data_source", "机器入库") + markMap.put("data_source", "鏈哄櫒鍏ュ簱") o.mark_map = markMap } - println ret.size() +" 保存" + println ret.size() +" 淇濆瓨" } return ret } @@ -252,9 +252,9 @@ class DistrictSearch { def doc = crawlCount(url); def ret = [] if(doc){ - def href = JQueryUtils.select("#orginalNaviBox a:contains(楼盘详情)", doc) + def href = JQueryUtils.select("#orginalNaviBox a:contains(妤肩洏璇︽儏)", doc) if(!href){ - href = JQueryUtils.select("#orginalNaviBox a:contains(详细信息)", doc) + href = JQueryUtils.select("#orginalNaviBox a:contains(璇︾粏淇℃伅)", doc) } if(href){ href = href.attr("href") @@ -266,23 +266,23 @@ class DistrictSearch { def oldMap = [:] def nameStr = JQueryUtils.selectText("#huxinxq_E02_15",doc) - def estateType = JQueryUtils.selectText("li:contains(物业类别:) div:eq(1)", doc) - oldMap.build_type = JQueryUtils.selectText("li:contains(建筑类别:) div:eq(1)", doc) - oldMap.developer = JQueryUtils.selectText("li:contains(商:) div:eq(1)", doc) - oldMap.property_life = JQueryUtils.selectText("li:contains(产权年限:) div:eq(1)", doc) - def open_date_str = JQueryUtils.selectText("li:contains(开盘时间:) div:eq(1)", doc) - oldMap.live_date = JQueryUtils.selectText("li:contains(交房时间:) div:eq(1)", doc) - oldMap.all_area = JQueryUtils.selectText("li:contains(占地面积:) div:eq(1)", doc) - oldMap.build_area = JQueryUtils.selectText("li:contains(建筑面积:) div:eq(1)", doc) - oldMap.cubage_percent = JQueryUtils.selectText("li:contains(率:) div:eq(1)", doc) - oldMap.virescence_percent = JQueryUtils.selectText("li:contains(率:) + li div:eq(1)", doc) - oldMap.loudong_count = JQueryUtils.selectText("li:contains(楼栋总数:) div:eq(1)", doc) - def houseCountStr = JQueryUtils.selectText("div:contains(小区规划) li:contains(户)", doc) - if(houseCountStr && houseCountStr.contains("总户数:")){ + def estateType = JQueryUtils.selectText("li:contains(鐗╀笟绫诲埆锛�) div:eq(1)", doc) + oldMap.build_type = JQueryUtils.selectText("li:contains(寤虹瓚绫诲埆锛�) div:eq(1)", doc) + oldMap.developer = JQueryUtils.selectText("li:contains(鍟嗭細) div:eq(1)", doc) + oldMap.property_life = JQueryUtils.selectText("li:contains(浜ф潈骞撮檺锛�) div:eq(1)", doc) + def open_date_str = JQueryUtils.selectText("li:contains(寮�鐩樻椂闂达細) div:eq(1)", doc) + oldMap.live_date = JQueryUtils.selectText("li:contains(浜ゆ埧鏃堕棿锛�) div:eq(1)", doc) + oldMap.all_area = JQueryUtils.selectText("li:contains(鍗犲湴闈㈢Н锛�) div:eq(1)", doc) + oldMap.build_area = JQueryUtils.selectText("li:contains(寤虹瓚闈㈢Н锛�) div:eq(1)", doc) + oldMap.cubage_percent = JQueryUtils.selectText("li:contains(鐜囷細) div:eq(1)", doc) + oldMap.virescence_percent = JQueryUtils.selectText("li:contains(鐜囷細) + li div:eq(1)", doc) + oldMap.loudong_count = JQueryUtils.selectText("li:contains(妤兼爧鎬绘暟锛�) div:eq(1)", doc) + def houseCountStr = JQueryUtils.selectText("div:contains(灏忓尯瑙勫垝) li:contains(鎴�)", doc) + if(houseCountStr && houseCountStr.contains("鎬绘埛鏁帮細")){ oldMap.household_count = houseCountStr } - def estateCharge = JQueryUtils.selectText("li:contains(费:) div:eq(1)", doc) - oldMap.estate_company = JQueryUtils.selectText("li:contains(物业公司:) div:eq(1)", doc) + def estateCharge = JQueryUtils.selectText("li:contains(璐癸細) div:eq(1)", doc) + oldMap.estate_company = JQueryUtils.selectText("li:contains(鐗╀笟鍏徃锛�) div:eq(1)", doc) if(open_date_str){ oldMap.open_date = DateUtil.parseStringToDate(open_date_str) @@ -290,7 +290,7 @@ class DistrictSearch { def aliaStr = JQueryUtils.selectText(".h1_label", doc) def alias = []; if(aliaStr){ - def arr = aliaStr.replace("别名:","").split(" ") + def arr = aliaStr.replace("鍒悕锛�","").split(" ") for(def s : arr){ alias << s } @@ -299,8 +299,8 @@ class DistrictSearch { alias << nameStr } - def carInfo = JQueryUtils.selectText("li:contains(位:) div:eq(1)", doc); - if(carInfo && carInfo.contains("暂")){ + def carInfo = JQueryUtils.selectText("li:contains(浣嶏細) div:eq(1)", doc); + if(carInfo && carInfo.contains("鏆�")){ carInfo = null } if(estateCharge){ @@ -313,15 +313,15 @@ class DistrictSearch { def types =addEstateTypeToData(estateType) if(types) { for (def type : types) { - if (type != "商铺" && type != "写字楼") { + if (type != "鍟嗛摵" && type != "鍐欏瓧妤�") { def dist = new BasicDBObject() dist.city = city dist.region = standRegion dist.name = name oldMap.estateType2 = type; - if(type == "别墅"){ - if(!dist.name.toString().contains("墅")){ - dist.name = dist.name+"别墅" + if(type == "鍒"){ + if(!dist.name.toString().contains("澧�")){ + dist.name = dist.name+"鍒" } } dist.estate_type2 = type; @@ -340,7 +340,7 @@ class DistrictSearch { dist = FiledStrand.addDateToData(oldMap, dist); dist = FiledStrand.addDateToData(oldMap, dist); dist = FiledStrand.addPropertyLiftToData(oldMap, dist) - dist.address = JQueryUtils.selectText("li:contains(楼盘地址:) div:eq(1)", doc) + dist.address = JQueryUtils.selectText("li:contains(妤肩洏鍦板潃锛�) div:eq(1)", doc) dist.description = JQueryUtils.selectText(".intro", doc) if (carInfo) { dist.car_site = carInfo @@ -355,7 +355,7 @@ class DistrictSearch { } }else{ - println "找不到详情" + println "鎵句笉鍒拌鎯�" } } return ret; @@ -365,22 +365,22 @@ class DistrictSearch { static def addEstateTypeToData(estateType){ def types = []; if(estateType){ - if(estateType.contains("商住") || estateType.contains("LOFT")){ - types << "商住" + if(estateType.contains("鍟嗕綇") || estateType.contains("LOFT")){ + types << "鍟嗕綇" } - if(estateType.contains("别墅") || estateType.contains("花园洋房") || estateType.contains("双拼")|| estateType.contains("联排")){ - types << "别墅" + if(estateType.contains("鍒") || estateType.contains("鑺卞洯娲嬫埧") || estateType.contains("鍙屾嫾")|| estateType.contains("鑱旀帓")){ + types << "鍒" } - if(estateType.contains("商铺")){ - types << "商铺" + if(estateType.contains("鍟嗛摵")){ + types << "鍟嗛摵" } - if(estateType.contains("写字楼") || estateType.contains("SOHO")){ - types << "写字楼" + if(estateType.contains("鍐欏瓧妤�") || estateType.contains("SOHO")){ + types << "鍐欏瓧妤�" } - if(estateType.contains("住宅")){ - if(!types.contains("商住") && !types.contains("别墅")){ - types << "普通住宅" + if(estateType.contains("浣忓畢")){ + if(!types.contains("鍟嗕綇") && !types.contains("鍒")){ + types << "鏅�氫綇瀹�" } } @@ -450,7 +450,7 @@ class DistrictSearch { def source = hits[0].get("_source") location = source.location }else{ - println "查找经纬度有问题......"+hits.size() + println "鏌ユ壘缁忕含搴︽湁闂......"+hits.size() } } if(location){ @@ -472,11 +472,11 @@ class DistrictSearch { for(def data : datas){ def opt = data['AD'] if(opt){ - if(opt == "加别名"){ + if(opt == "鍔犲埆鍚�"){ //addFenQiAlias(data) - }else if(opt == "新增入库"){ + }else if(opt == "鏂板鍏ュ簱"){ //addToDb(data); - }else if(opt == "入库"){ + }else if(opt == "鍏ュ簱"){ index++; if(index>=175){ addSouFun(data, rMap); @@ -510,8 +510,8 @@ class DistrictSearch { def standRegion = RegionData.formatRegion(city, region) def nameStr = trimChar(name) - if(nameStr && nameStr.contains("·")){ - nameStr = nameStr.replace("·","") + if(nameStr && nameStr.contains("路")){ + nameStr = nameStr.replace("路","") } def key = city+"##"+standRegion+"##"+nameStr @@ -540,10 +540,10 @@ class DistrictSearch { def standRegion = RegionData.formatRegion(city, region) def nameStr = trimChar(name) - if(nameStr && nameStr.contains("·")){ - nameStr = nameStr.replace("·","") + if(nameStr && nameStr.contains("路")){ + nameStr = nameStr.replace("路","") } - def s = nameStr.replace("1期","一期").replace("2期","二期").replace("3期","三期").replace("4期","四期").replace("5期","五期").replace("6期","六期").replace("7期","七期").replace("8期","八期").replace("9期","九期").replace("10期","十期").replace("Ⅱ期","二期") + def s = nameStr.replace("1鏈�","涓�鏈�").replace("2鏈�","浜屾湡").replace("3鏈�","涓夋湡").replace("4鏈�","鍥涙湡").replace("5鏈�","浜旀湡").replace("6鏈�","鍏湡").replace("7鏈�","涓冩湡").replace("8鏈�","鍏湡").replace("9鏈�","涔濇湡").replace("10鏈�","鍗佹湡").replace("鈪℃湡","浜屾湡") def obj = CommonDatautils.findDistrict(city, standRegion, s, "district") if(obj){ def alias = obj.alias @@ -557,7 +557,7 @@ class DistrictSearch { udata.put("alias",alias) udata.put("m_date", new Date()) DbUtils.seaweed.update(q, new BasicDBObject('$set',udata)) - println "【加别名】"+name +" "+alias + println "銆愬姞鍒悕銆�"+name +" "+alias } } @@ -569,13 +569,13 @@ class DistrictSearch { def standRegion = RegionData.formatRegion(city, region) def nameStr = trimChar(name) - if(nameStr && nameStr.contains("·")){ - nameStr = nameStr.replace("·","") + if(nameStr && nameStr.contains("路")){ + nameStr = nameStr.replace("路","") } - def s = nameStr.replace("1期","一期").replace("2期","二期").replace("3期","三期").replace("4期","四期").replace("5期","五期").replace("6期","六期").replace("7期","七期").replace("8期","八期").replace("9期","九期").replace("10期","十期").replace("Ⅱ期","二期") + def s = nameStr.replace("1鏈�","涓�鏈�").replace("2鏈�","浜屾湡").replace("3鏈�","涓夋湡").replace("4鏈�","鍥涙湡").replace("5鏈�","浜旀湡").replace("6鏈�","鍏湡").replace("7鏈�","涓冩湡").replace("8鏈�","鍏湡").replace("9鏈�","涔濇湡").replace("10鏈�","鍗佹湡").replace("鈪℃湡","浜屾湡") def obj = CommonDatautils.findDistrict(city, standRegion, s, "district") if(!obj){ - def prefix = s.substring(0, s.indexOf("期")-1) + def prefix = s.substring(0, s.indexOf("鏈�")-1) obj = CommonDatautils.findDistrict(city, standRegion, prefix, "district") if(obj){ def d = new BasicDBObject() @@ -599,7 +599,7 @@ class DistrictSearch { d.put("c_date", new Date()) d.put("m_date", new Date()) def markMap = [:] - markMap.put("data_source", "机器入库") + markMap.put("data_source", "鏈哄櫒鍏ュ簱") d.put("mark_map",markMap) def map = getEsLocation(city, name) @@ -610,7 +610,7 @@ class DistrictSearch { d.lng2 = (map.lng2.toDouble() * 10000000000).longValue() } DbUtils.seaweed.save(d) - println "【新增入库】"+d + println "銆愭柊澧炲叆搴撱��"+d } } } @@ -656,9 +656,9 @@ class DistrictSearch { newAddress2 = standardAddress(bdAddress) } } - if(newAddress1 && newAddress1.contains("号")){ + if(newAddress1 && newAddress1.contains("鍙�")){ newAddress = newAddress1 - }else if(newAddress2 && newAddress2.contains("号")){ + }else if(newAddress2 && newAddress2.contains("鍙�")){ newAddress = newAddress2 }else{ if(newAddress1 && newAddress2){ @@ -673,10 +673,10 @@ class DistrictSearch { def standRegion = RegionData.formatRegion(city, region) def nameStr = trimChar(name) - if(nameStr && nameStr.contains("·")){ - nameStr = nameStr.replace("·","").replace("·","") + if(nameStr && nameStr.contains("路")){ + nameStr = nameStr.replace("路","").replace("路","") } - nameStr = nameStr.replace("1期","一期").replace("2期","二期").replace("3期","三期").replace("4期","四期").replace("5期","五期").replace("6期","六期").replace("7期","七期").replace("8期","八期").replace("9期","九期").replace("10期","十期").replace("Ⅱ期","二期") + nameStr = nameStr.replace("1鏈�","涓�鏈�").replace("2鏈�","浜屾湡").replace("3鏈�","涓夋湡").replace("4鏈�","鍥涙湡").replace("5鏈�","浜旀湡").replace("6鏈�","鍏湡").replace("7鏈�","涓冩湡").replace("8鏈�","鍏湡").replace("9鏈�","涔濇湡").replace("10鏈�","鍗佹湡").replace("鈪℃湡","浜屾湡") def obj = CommonDatautils.findDistrict(city, standRegion, nameStr, "district") if(!obj){ @@ -699,7 +699,7 @@ class DistrictSearch { d.put("c_date", new Date()) d.put("m_date", new Date()) def markMap = [:] - markMap.put("data_source", "机器入库") + markMap.put("data_source", "鏈哄櫒鍏ュ簱") d.put("mark_map",markMap) if(gdlng){ @@ -743,7 +743,7 @@ class DistrictSearch { addIndex++ nameKeys << key DbUtils.seaweed.save(d) - println "${addIndex}【新增入库】"+d + println "${addIndex}銆愭柊澧炲叆搴撱��"+d // Thread.sleep(60*1000) // addCalutePrice(d); } @@ -783,9 +783,9 @@ class DistrictSearch { def getEstateType(def name){ - def estateType = "普通住宅" - if(name.contains("别墅") || name.contains("洋房")){ - estateType = "别墅" + def estateType = "鏅�氫綇瀹�" + if(name.contains("鍒") || name.contains("娲嬫埧")){ + estateType = "鍒" } return estateType } @@ -794,10 +794,10 @@ class DistrictSearch { def standardAddress(def address) { address = address.replaceAll("\\(.*?\\)","") - if (address.indexOf("交汇") > -1 || address.indexOf("与") > -1 || address.indexOf("米") > -1) { + if (address.indexOf("浜ゆ眹") > -1 || address.indexOf("涓�") > -1 || address.indexOf("绫�") > -1) { return address; }else { - def pattern = Pattern.compile("[路|街|大道|巷|里]"); + def pattern = Pattern.compile("[璺瘄琛梶澶ч亾|宸穦閲宂"); def matcher = pattern.matcher(address) if(matcher.find()){ return address; @@ -818,10 +818,10 @@ class DistrictSearch { def flag = data['K'] if(flag && flag.toInteger()==1){ def nameStr = trimChar(name) - if(nameStr && nameStr.contains("·")){ - nameStr = nameStr.replace("·","").replace("·","") + if(nameStr && nameStr.contains("路")){ + nameStr = nameStr.replace("路","").replace("路","") } - nameStr = nameStr.replace("1期","一期").replace("2期","二期").replace("3期","三期").replace("4期","四期").replace("5期","五期").replace("6期","六期").replace("7期","七期").replace("8期","八期").replace("9期","九期").replace("10期","十期").replace("Ⅱ期","二期").replace("1区","一区").replace("2区","二区").replace("3区","三区").replace("4区","四区").replace("5区","五区").replace("6区","六区").replace("7区","七区").replace("8期","八期").replace("9区","九区").replace("10区","十区") + nameStr = nameStr.replace("1鏈�","涓�鏈�").replace("2鏈�","浜屾湡").replace("3鏈�","涓夋湡").replace("4鏈�","鍥涙湡").replace("5鏈�","浜旀湡").replace("6鏈�","鍏湡").replace("7鏈�","涓冩湡").replace("8鏈�","鍏湡").replace("9鏈�","涔濇湡").replace("10鏈�","鍗佹湡").replace("鈪℃湡","浜屾湡").replace("1鍖�","涓�鍖�").replace("2鍖�","浜屽尯").replace("3鍖�","涓夊尯").replace("4鍖�","鍥涘尯").replace("5鍖�","浜斿尯").replace("6鍖�","鍏尯").replace("7鍖�","涓冨尯").replace("8鏈�","鍏湡").replace("9鍖�","涔濆尯").replace("10鍖�","鍗佸尯") def obj = CommonDatautils.findDistrict(city, region, nameStr, "district") if(!obj) { @@ -840,7 +840,7 @@ class DistrictSearch { d.put("c_date", new Date()) d.put("m_date", new Date()) def markMap = [:] - markMap.put("data_source", "机器入库") + markMap.put("data_source", "鏈哄櫒鍏ュ簱") d.put("mark_map", markMap) if (gdlat && gdlng) { @@ -856,7 +856,7 @@ class DistrictSearch { addIndex++ nameKeys << key DbUtils.seaweed.save(d) - println "${addIndex}【新增入库】" + d + println "${addIndex}銆愭柊澧炲叆搴撱��" + d addCalutePrice(d); } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/DistrictStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/DistrictStat.groovy index 5c7b2f5c2..4d6c71dc4 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/DistrictStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/DistrictStat.groovy @@ -25,15 +25,15 @@ class DistrictStat { def task = new DistrictStat(); // task.run() -// task.run("无锡") +// task.run("鏃犻敗") -// 合肥市 -// 芜湖市 -// 安庆市 -// 马鞍山市 -// 宣称市 -// 六安市 -// def citys = ["宣城","合肥","芜湖","安庆","马鞍山","六安"] +// 鍚堣偉甯� +// 鑺滄箹甯� +// 瀹夊簡甯� +// 椹瀺灞卞競 +// 瀹gО甯� +// 鍏畨甯� +// def citys = ["瀹e煄","鍚堣偉","鑺滄箹","瀹夊簡","椹瀺灞�","鍏畨"] // for(def city : citys){ // task.stat(city) // } @@ -47,50 +47,50 @@ class DistrictStat { def cityStat1(){ def index = 0 def rets = [] - ExcelUtils.modify("D:\\数据\\小区\\城市数量统计1.xlsx",{d-> + ExcelUtils.modify("D:\\鏁版嵁\\灏忓尯\\鍩庡競鏁伴噺缁熻1.xlsx",{d-> def districts = null - if(d['D']=="义乌"){ - districts = CommonDatautils.findAllDistrictByCity("金华", "district", ["region","name"]) + if(d['D']=="涔変箤"){ + districts = CommonDatautils.findAllDistrictByCity("閲戝崕", "district", ["region","name"]) def newDists = [] for(def dist : districts){ - if(dist.region =="义乌"){ + if(dist.region =="涔変箤"){ newDists << dist } } districts = newDists - }else if(d['D']=="金华"){ - districts = CommonDatautils.findAllDistrictByCity("金华", "district", ["region","name"]) + }else if(d['D']=="閲戝崕"){ + districts = CommonDatautils.findAllDistrictByCity("閲戝崕", "district", ["region","name"]) def newDists = [] for(def dist : districts){ - if(dist.region !="义乌"){ + if(dist.region !="涔変箤"){ newDists << dist } } districts = newDists - }else if(d['D']=="无锡"){ - districts = CommonDatautils.findAllDistrictByCity("无锡", "district", ["region","name"]) + }else if(d['D']=="鏃犻敗"){ + districts = CommonDatautils.findAllDistrictByCity("鏃犻敗", "district", ["region","name"]) def newDists = [] for(def dist : districts){ - if(dist.region !="江阴"){ + if(dist.region !="姹熼槾"){ newDists << dist } } districts = newDists - }else if(d['D']=="苏州"){ - districts = CommonDatautils.findAllDistrictByCity("苏州", "district", ["region","name"]) + }else if(d['D']=="鑻忓窞"){ + districts = CommonDatautils.findAllDistrictByCity("鑻忓窞", "district", ["region","name"]) def newDists = [] for(def dist : districts){ - if(dist.region !="常熟"){ + if(dist.region !="甯哥啛"){ newDists << dist } } districts = newDists - }else if(d['D']=="济南"){ - districts = CommonDatautils.findAllDistrictByCity("济南", "district", ["region","name"]) + }else if(d['D']=="娴庡崡"){ + districts = CommonDatautils.findAllDistrictByCity("娴庡崡", "district", ["region","name"]) def newDists = [] for(def dist : districts){ - if(dist.region !="莱芜"){ + if(dist.region !="鑾辫姕"){ newDists << dist } } @@ -101,9 +101,9 @@ class DistrictStat { d['F'] = districts.size() if(districts){ - d['E'] = "是" + d['E'] = "鏄�" }else{ - d['E'] = "否" + d['E'] = "鍚�" } def prov = null @@ -120,26 +120,26 @@ class DistrictStat { } }, 0) -// FileUtils.batchCreateFile(rets, "D:\\数据\\小区\\A类城市楼盘列表1.dat", [], "utf-8", false); +// FileUtils.batchCreateFile(rets, "D:\\鏁版嵁\\灏忓尯\\A绫诲煄甯傛ゼ鐩樺垪琛�1.dat", [], "utf-8", false); } def createDoc(dataList){ - // 创建 Word 文档 + // 鍒涘缓 Word 鏂囨。 def doc = new XWPFDocument() - def table = doc.createTable(dataList.size() + 1, 5) // 行数=数据行+表头,列数=3 + def table = doc.createTable(dataList.size() + 1, 5) // 琛屾暟=鏁版嵁琛�+琛ㄥご锛屽垪鏁�=3 - // 设置表头 + // 璁剧疆琛ㄥご def headerRow = table.getRow(0) - headerRow.getCell(0).setText("序号") - headerRow.getCell(1).setText("类型") - headerRow.getCell(2).setText("省份") - headerRow.getCell(3).setText("城市") - headerRow.getCell(4).setText("楼盘名称") + headerRow.getCell(0).setText("搴忓彿") + headerRow.getCell(1).setText("绫诲瀷") + headerRow.getCell(2).setText("鐪佷唤") + headerRow.getCell(3).setText("鍩庡競") + headerRow.getCell(4).setText("妤肩洏鍚嶇О") - // 填充数据 + // 濉厖鏁版嵁 dataList.eachWithIndex { item, index -> - def row = table.getRow(index+1) // 跳过表头 + def row = table.getRow(index+1) // 璺宠繃琛ㄥご row.getCell(0).setText(item.id.toString()) row.getCell(1).setText(item.type.toString()) row.getCell(2).setText(item.province.toString()) @@ -147,23 +147,23 @@ class DistrictStat { row.getCell(4).setText(item.names.toString()) } - // 保存到文件 - def outputFile = new File("A类城市楼盘列表.docx") + // 淇濆瓨鍒版枃浠� + def outputFile = new File("A绫诲煄甯傛ゼ鐩樺垪琛�.docx") doc.write(new FileOutputStream(outputFile)) - println "Word 表格生成成功: ${outputFile.absolutePath}" + println "Word 琛ㄦ牸鐢熸垚鎴愬姛: ${outputFile.absolutePath}" } def cityStat(){ def index = 0 def rets = [] - ExcelUtils.modify("D:\\数据\\小区\\城市数量统计.xlsx",{d-> + ExcelUtils.modify("D:\\鏁版嵁\\灏忓尯\\鍩庡競鏁伴噺缁熻.xlsx",{d-> def districts = CommonDatautils.findAllDistrictByCity(d['D'], "district", ["city", "region", "name"]) if(districts){ d['F'] = districts.size() - d['E'] = "是" + d['E'] = "鏄�" - rets << ["序号","类型","省份","城市","楼盘名称","金华"] + rets << ["搴忓彿","绫诲瀷","鐪佷唤","鍩庡競","妤肩洏鍚嶇О","閲戝崕"] def data = fullCityMap.get(d['D']) def prov = null if(data){ @@ -177,8 +177,8 @@ class DistrictStat { } }, 0) -// ExcelUtils.write("D:\\数据\\小区\\A类城市楼盘列表.xlsx", rets, "楼盘数据详情列表") - FileUtils.batchCreateFile(rets, "D:\\数据\\小区\\A类城市楼盘列表.dat", [], "utf-8", false); +// ExcelUtils.write("D:\\鏁版嵁\\灏忓尯\\A绫诲煄甯傛ゼ鐩樺垪琛�.xlsx", rets, "妤肩洏鏁版嵁璇︽儏鍒楄〃") + FileUtils.batchCreateFile(rets, "D:\\鏁版嵁\\灏忓尯\\A绫诲煄甯傛ゼ鐩樺垪琛�.dat", [], "utf-8", false); } def stat(city){ @@ -208,7 +208,7 @@ class DistrictStat { } println totalCount.get() +" "+o.region +" "+o.name+" "+count } catch (Exception e) { - println totalCount.get() +" 查房源Error: "+city+" "+ o.region+" "+o.name+" "+e.getMessage() + println totalCount.get() +" 鏌ユ埧婧怑rror: "+city+" "+ o.region+" "+o.name+" "+e.getMessage() } finally { latch.countDown() } @@ -225,7 +225,7 @@ class DistrictStat { def weekend = DateUtils.parseFromTightYYYYMMDD("2020-10-25") def districts = CommonDatautils.findAllDistrictByCity(city, "district", ["city", "region", "name","estate_type2"]) def total = districts.size() - println "共[${total}]个小区" + println "鍏盵${total}]涓皬鍖�" def priceMap = CommonDatautils.queryDistrictPrice(city, weekend) def priceIndex = 0 for(def dist : districts){ @@ -236,15 +236,15 @@ class DistrictStat { println key } } - println "共[${priceIndex}]有价格,无价格共:"+(total-priceIndex) + println "鍏盵${priceIndex}]鏈変环鏍硷紝鏃犱环鏍煎叡锛�"+(total-priceIndex) def rets = CommonDatautils.queryDistrictPrices(city, weekend) def results = [] - results << ["城市","区域","名称","价格","可信度"] + results << ["鍩庡競","鍖哄煙","鍚嶇О","浠锋牸","鍙俊搴�"] for(def d : rets){ results << [d.city, d.region, d.district_name, d.avg_price, d.credit] } - ExcelUtils.write("d:\\数据\\统计\\无锡.xlsx",results, "价格") + ExcelUtils.write("d:\\鏁版嵁\\缁熻\\鏃犻敗.xlsx",results, "浠锋牸") } def run(){ @@ -266,9 +266,9 @@ class DistrictStat { }else{ // def priceData = CommonDatautils.queryDistrictPriceData(dist.city, dist.region, dist.name) // if(priceData){ -// println "[无价格] "+key+" "+ DateUtils.formatDateByPattern(priceData.weekend, "yyyy-MM-dd") +// println "[鏃犱环鏍糫 "+key+" "+ DateUtils.formatDateByPattern(priceData.weekend, "yyyy-MM-dd") // }else{ -// println "[无价格] "+key +// println "[鏃犱环鏍糫 "+key // } noPriceList << dist diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/DistrictUpdateBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/DistrictUpdateBatch.groovy index 84bcfc90f..04115f510 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/DistrictUpdateBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/DistrictUpdateBatch.groovy @@ -23,7 +23,7 @@ class DistrictUpdateBatch { for(def city : citys){ def districts = CommonDatautils.findAllDistricts(city, "district", ["city","region","name","alias","estate_type2","lat","lat2","lng","lng2","address","build_type","property_life"]) if(districts){ -// processFenQi1(districts)//主名有数字分期 +// processFenQi1(districts)//涓诲悕鏈夋暟瀛楀垎鏈� processFenQi2(districts) } } @@ -39,15 +39,15 @@ class DistrictUpdateBatch { if(dist.alias != newAlias){ index++; totalUpdate++; - //修改别名 - println "【${index}/${totalUpdate}】"+dist.city + " name:"+dist.name+" old-name:"+dist.alias+" new-name:"+newAlias + //淇敼鍒悕 + println "銆�${index}/${totalUpdate}銆�"+dist.city + " name:"+dist.name+" old-name:"+dist.alias+" new-name:"+newAlias def data = new BasicDBObject() data.put("alias",newAlias) data.put("m_date", new Date()) DbUtils.seaweed.update(new BasicDBObject("_id", dist._id), new BasicDBObject('$set',data)) if(rMap.addDist){ - println "【${index}/${totalUpdate}】"+ dist.city + " name:"+dist.name+" old-name:"+dist.alias+" 新增小区:"+rMap.addDist + println "銆�${index}/${totalUpdate}銆�"+ dist.city + " name:"+dist.name+" old-name:"+dist.alias+" 鏂板灏忓尯:"+rMap.addDist addToDB(rMap, dist); } } @@ -87,14 +87,14 @@ class DistrictUpdateBatch { def addDistrict = [] if(alias){ for(def name : alias){ - def s = isPattern(dist.name+"(\\(|-)?(一|二|三|四|五|六|七|八|九|十|\\d+)期\\)?\\(?(\\d+|至|经适房|\\w+)?\\)?", name) + def s = isPattern(dist.name+"(\\(|-)?(涓�|浜寍涓墊鍥泑浜攟鍏瓅涓億鍏珅涔潀鍗亅\\d+)鏈焅\)?\\(?(\\d+|鑷硘缁忛�傛埧|\\w+)?\\)?", name) if(!s){ newAlias << name }else{ - if(!dist.name.toString().endsWith("期")){ - s = s.replace("(","").replace(")","").replace("1期","一期").replace("2期","二期").replace("3期","三期").replace("4期","四期").replace("5期","五期").replace("6期","六期").replace("7期","七期").replace("8期","八期").replace("9期","九期") - if(!s.endsWith("期")){ - s = s.substring(0, s.indexOf("期")+1) + if(!dist.name.toString().endsWith("鏈�")){ + s = s.replace("(","").replace(")","").replace("1鏈�","涓�鏈�").replace("2鏈�","浜屾湡").replace("3鏈�","涓夋湡").replace("4鏈�","鍥涙湡").replace("5鏈�","浜旀湡").replace("6鏈�","鍏湡").replace("7鏈�","涓冩湡").replace("8鏈�","鍏湡").replace("9鏈�","涔濇湡") + if(!s.endsWith("鏈�")){ + s = s.substring(0, s.indexOf("鏈�")+1) } def similarDist = CommonDatautils.findDistrict(dist.city, dist.region, s, "district") if(!similarDist){ @@ -124,7 +124,7 @@ class DistrictUpdateBatch { def processFenQi1(def districts){ for(def dist : districts){ if(endWiths(dist.name)){ - def newName = dist.name.replace("1期","一期").replace("2期","二期").replace("3期","三期").replace("4期","四期").replace("5期","五期").replace("6期","六期").replace("7期","七期").replace("8期","八期").replace("9期","九期").replace("10期","十期").replace("11期","十一期").replace("12期","十二期").replace("13期","十三期") + def newName = dist.name.replace("1鏈�","涓�鏈�").replace("2鏈�","浜屾湡").replace("3鏈�","涓夋湡").replace("4鏈�","鍥涙湡").replace("5鏈�","浜旀湡").replace("6鏈�","鍏湡").replace("7鏈�","涓冩湡").replace("8鏈�","鍏湡").replace("9鏈�","涔濇湡").replace("10鏈�","鍗佹湡").replace("11鏈�","鍗佷竴鏈�").replace("12鏈�","鍗佷簩鏈�").replace("13鏈�","鍗佷笁鏈�") updateDistrict(dist, newName); // addTask(dist, newName); } @@ -133,7 +133,7 @@ class DistrictUpdateBatch { def addTask(dist, newName){ def estate_type = "district"; - if(dist.estate_type2=="别墅"){ + if(dist.estate_type2=="鍒"){ estate_type = "villa" } def d = new BasicDBObject() @@ -162,13 +162,13 @@ class DistrictUpdateBatch { data.put("alias",alias) data.put("m_date", new Date()) DbUtils.seaweed.update(new BasicDBObject("_id", dist._id), data) - println dist.city+"##"+dist.region+"##"+dist.name +" 修改:"+data + println dist.city+"##"+dist.region+"##"+dist.name +" 淇敼锛�"+data } def endWiths(def name){ - def arr = ["1期","2期","3期","4期","5期","6期","7期","8期","9期","10期"] + def arr = ["1鏈�","2鏈�","3鏈�","4鏈�","5鏈�","6鏈�","7鏈�","8鏈�","9鏈�","10鏈�"] def flag = false; for(def s : arr){ if(name.toString().endsWith(s)){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/DistrictUpdateCrawl.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/DistrictUpdateCrawl.groovy index 5f8b8c6e4..f2abb08c3 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/DistrictUpdateCrawl.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/DistrictUpdateCrawl.groovy @@ -50,8 +50,8 @@ class DistrictUpdateCrawl { if(dist){ def udata = new BasicDBObject() if(!dist.estate_charge && obj.estate_charge){ - if(obj.estate_charge.contains("元/平米/月")){ - obj.estate_charge = obj.estate_charge.replace("元/平米/月","") + if(obj.estate_charge.contains("鍏�/骞崇背/鏈�")){ + obj.estate_charge = obj.estate_charge.replace("鍏�/骞崇背/鏈�","") } udata.put("estate_charge",obj.estate_charge) } @@ -80,8 +80,8 @@ class DistrictUpdateCrawl { def findCrawlDatas(){ def q = new BasicDBObject() q.put("s_date",202005) - q.put("source", "链家") - q.put("city", "广州") + q.put("source", "閾惧") + q.put("city", "骞垮窞") q.put("type", new BasicDBObject(QueryOperators.IN, [1,2])) def dbcursor = dataProcessColl.find(q) return dbcursor; @@ -93,9 +93,9 @@ class DistrictUpdateCrawl { while(!stop){ def finish = sofangRun(); if(finish){ - stop = true;//设置停止 + stop = true;//璁剧疆鍋滄 // Thread.sleep(60*1000) - println "全部解析完成" + println "鍏ㄩ儴瑙f瀽瀹屾垚" } } } @@ -117,16 +117,16 @@ class DistrictUpdateCrawl { def ret = [] DBCursor dbCursor = null try { - dbCursor = metadataColl.find(new BasicDBObject("s_date", SHORT_DATE).append('status',2).append('source','搜房')) + dbCursor = metadataColl.find(new BasicDBObject("s_date", SHORT_DATE).append('status',2).append('source','鎼滄埧')) .limit(limit).addOption(Bytes.QUERYOPTION_NOTIMEOUT) while (dbCursor.hasNext()){ DBObject cur = dbCursor.next(); ret << cur } } catch (EOFException e){ - println("List fetchMetadata(int limit) { 发生异常, 异常信息 EOFException 为:" + e.getMessage()) + println("List fetchMetadata(int limit) { 鍙戠敓寮傚父, 寮傚父淇℃伅 EOFException 涓�:" + e.getMessage()) } catch (Exception e){ - println("List fetchMetadata(int limit) { 发生异常, 异常信息 Exception为:" + e.getMessage()) + println("List fetchMetadata(int limit) { 鍙戠敓寮傚父, 寮傚父淇℃伅 Exception涓�:" + e.getMessage()) } finally{ if(dbCursor!=null){ @@ -137,7 +137,7 @@ class DistrictUpdateCrawl { } def sofangParsing(metadataList){ - println "共:"+metadataList.size()+" "+new Date().toString() + println "鍏憋細"+metadataList.size()+" "+new Date().toString() final CountDownLatch latch = new CountDownLatch(metadataList.size()) metadataList.each{ metadata -> fixedThreadPool.execute( @@ -163,13 +163,13 @@ class DistrictUpdateCrawl { def name = JQueryUtils.selectText(".Rbigbt h1 a", document) def price = JQueryUtils.selectText(".Rbiginfo .prib", document) def alias = JQueryUtils.selectText(".Rbigbt .alias", document) - def buildDateStr = JQueryUtils.selectText("li:contains(建筑年代)", document).replace("建筑年代","") - def estateTypeStr = JQueryUtils.selectText("li:contains(建筑类型)", document).replace("建筑类型","") - def householdCountStr = JQueryUtils.selectText("li:contains(房屋总数)", document).replace("房屋总数","") - def loudongCountStr = JQueryUtils.selectText("li:contains(楼栋总数)", document).replace("楼栋总数","") - def estateCompanyStr = JQueryUtils.selectText("li:contains(物业公司)", document).replace("物业公司","") - def developerStr = JQueryUtils.selectText("li:contains(开发商)", document).replace("开发商","") - def addressStr = JQueryUtils.selectText("li:contains(小区位置)", document).replace("小区位置","") + def buildDateStr = JQueryUtils.selectText("li:contains(寤虹瓚骞翠唬)", document).replace("寤虹瓚骞翠唬","") + def estateTypeStr = JQueryUtils.selectText("li:contains(寤虹瓚绫诲瀷)", document).replace("寤虹瓚绫诲瀷","") + def householdCountStr = JQueryUtils.selectText("li:contains(鎴垮眿鎬绘暟)", document).replace("鎴垮眿鎬绘暟","") + def loudongCountStr = JQueryUtils.selectText("li:contains(妤兼爧鎬绘暟)", document).replace("妤兼爧鎬绘暟","") + def estateCompanyStr = JQueryUtils.selectText("li:contains(鐗╀笟鍏徃)", document).replace("鐗╀笟鍏徃","") + def developerStr = JQueryUtils.selectText("li:contains(寮�鍙戝晢)", document).replace("寮�鍙戝晢","") + def addressStr = JQueryUtils.selectText("li:contains(灏忓尯浣嶇疆)", document).replace("灏忓尯浣嶇疆","") if(name){ metadata.name = name @@ -178,14 +178,14 @@ class DistrictUpdateCrawl { metadata.price = price } if(alias){ - metadata.alias = alias.replace("别名:","") + metadata.alias = alias.replace("鍒悕锛�","") } if(householdCountStr){ - householdCountStr = householdCountStr.replace("户","") + householdCountStr = householdCountStr.replace("鎴�","") } if(loudongCountStr){ - loudongCountStr = loudongCountStr.replace("栋", "") + loudongCountStr = loudongCountStr.replace("鏍�", "") } metadata.district_id = metadata.url metadata.estate_type = estateTypeStr @@ -227,9 +227,9 @@ class DistrictUpdateCrawl { def updateMetadateStatus(def mid){ DBObject matdatequery = new BasicDBObject() matdatequery.put("_id", mid) - println mid.toString() +" 已完成解析 " + println mid.toString() +" 宸插畬鎴愯В鏋� " def udata = new BasicDBObject() - udata.put("status", 3) //3:解析成功 2:未解析 + udata.put("status", 3) //3:瑙f瀽鎴愬姛 2:鏈В鏋� metadataColl.update(matdatequery, new BasicDBObject('$set', udata), false, true) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/EsHousePriceStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/EsHousePriceStat.groovy index d5123668b..efd6d6545 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/EsHousePriceStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/EsHousePriceStat.groovy @@ -16,7 +16,7 @@ import org.apache.commons.lang.StringUtils import java.util.zip.GZIPInputStream /** - * es城市区域房源均价统计 + * es鍩庡競鍖哄煙鎴挎簮鍧囦环缁熻 */ @BatchOwner(Watcher.GaoJuan) class EsHousePriceStat extends BaseBatch{ @@ -203,7 +203,7 @@ class EsHousePriceStat extends BaseBatch{ conn.connect(); - //输出流 + //杈撳嚭娴� if (StringUtils.isNotEmpty(param)) { mWriter = new BufferedWriter(new OutputStreamWriter(conn.getOutputStream(), charset)); mWriter.write(param); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/EsHouseStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/EsHouseStat.groovy index 9d7c97533..8ec296696 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/EsHouseStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/EsHouseStat.groovy @@ -46,7 +46,7 @@ class EsHouseStat { public static void main(String[] args){ def task = new EsHouseStat(); task.run(); -// task.testRun("深圳") +// task.testRun("娣卞湷") // task.exportOpenLog(); // task.exportMongoLog() // task.exportPoi(); @@ -64,23 +64,23 @@ class EsHouseStat { def addPrice(){ def datas = [] - def data1 = ExcelUtils.read("D:\\数据\\建行银行\\穆良书\\北京成都.xlsx",0,1) - def data2 = ExcelUtils.read("D:\\数据\\建行银行\\穆良书\\大连杭州厦门.xlsx",0,1) - def data3 = ExcelUtils.read("D:\\数据\\建行银行\\穆良书\\上海.xlsx",0,1) - def data4 = ExcelUtils.read("D:\\数据\\建行银行\\穆良书\\深圳广州.xlsx",0,1) - def data5 = ExcelUtils.read("D:\\数据\\建行银行\\穆良书\\重庆苏州.xlsx",0,1) + def data1 = ExcelUtils.read("D:\\鏁版嵁\\寤鸿閾惰\\绌嗚壇涔\鍖椾含鎴愰兘.xlsx",0,1) + def data2 = ExcelUtils.read("D:\\鏁版嵁\\寤鸿閾惰\\绌嗚壇涔\澶ц繛鏉窞鍘﹂棬.xlsx",0,1) + def data3 = ExcelUtils.read("D:\\鏁版嵁\\寤鸿閾惰\\绌嗚壇涔\涓婃捣.xlsx",0,1) + def data4 = ExcelUtils.read("D:\\鏁版嵁\\寤鸿閾惰\\绌嗚壇涔\娣卞湷骞垮窞.xlsx",0,1) + def data5 = ExcelUtils.read("D:\\鏁版嵁\\寤鸿閾惰\\绌嗚壇涔\閲嶅簡鑻忓窞.xlsx",0,1) datas.addAll(data1) datas.addAll(data2) datas.addAll(data3) datas.addAll(data4) datas.addAll(data5) - println "data1共:"+data1.size() - println "data2共:"+data2.size() - println "data3共:"+data3.size() - println "data4共:"+data4.size() - println "data5共:"+data5.size() - println "共:"+datas.size() + println "data1鍏憋細"+data1.size() + println "data2鍏憋細"+data2.size() + println "data3鍏憋細"+data3.size() + println "data4鍏憋細"+data4.size() + println "data5鍏憋細"+data5.size() + println "鍏憋細"+datas.size() final CountDownLatch latch = new CountDownLatch(datas.size()) def final AtomicInteger count_ = new AtomicInteger(0) @@ -114,13 +114,13 @@ class EsHouseStat { latch.await() def results = [] - results << ["城市","区域","名称","均价","2月7号均价"] + results << ["鍩庡競","鍖哄煙","鍚嶇О","鍧囦环","2鏈�7鍙峰潎浠�"] for(def dist : datas){ if(dist[4] && dist[4]>0){ results << dist } } - ExcelUtils.write("D:\\数据\\建行银行\\穆良书\\建行10个城市价格数据2.xlsx",results,"数据") + ExcelUtils.write("D:\\鏁版嵁\\寤鸿閾惰\\绌嗚壇涔\寤鸿10涓煄甯備环鏍兼暟鎹�2.xlsx",results,"鏁版嵁") } @@ -135,8 +135,8 @@ class EsHouseStat { } def rets = [] - def citys = ["福州", "厦门", "泉州", "莆田", "宁德", "三明", "龙岩", "南平", "漳州"] - rets << ["时间", "福州", "厦门", "泉州", "莆田", "宁德", "三明", "龙岩", "南平", "漳州"] + def citys = ["绂忓窞", "鍘﹂棬", "娉夊窞", "鑾嗙敯", "瀹佸痉", "涓夋槑", "榫欏博", "鍗楀钩", "婕冲窞"] + rets << ["鏃堕棿", "绂忓窞", "鍘﹂棬", "娉夊窞", "鑾嗙敯", "瀹佸痉", "涓夋槑", "榫欏博", "鍗楀钩", "婕冲窞"] for(def date :dates){ @@ -150,15 +150,15 @@ class EsHouseStat { rets << ret println ret } - ExcelUtils.write("D:\\数据\\房源统计.xlsx", rets,"全国") + ExcelUtils.write("D:\\鏁版嵁\\鎴挎簮缁熻.xlsx", rets,"鍏ㄥ浗") } def szRentHouseStat(){ - def citys = ["上海","北京","广州","深圳","杭州","南京","天津","成都","西安","沈阳","重庆","苏州","武汉","长沙","青岛","厦门","宁波","大连","无锡"] -// def citys = ["长沙"] + def citys = ["涓婃捣","鍖椾含","骞垮窞","娣卞湷","鏉窞","鍗椾含","澶╂触","鎴愰兘","瑗垮畨","娌堥槼","閲嶅簡","鑻忓窞","姝︽眽","闀挎矙","闈掑矝","鍘﹂棬","瀹佹尝","澶ц繛","鏃犻敗"] +// def citys = ["闀挎矙"] def rets = [] - rets << ["城市","小区数量","2020-08-01","2020-09-01","2020-10-01","2020-11-01","2020-12-01","2021-01-01"] + rets << ["鍩庡競","灏忓尯鏁伴噺","2020-08-01","2020-09-01","2020-10-01","2020-11-01","2020-12-01","2021-01-01"] for(def city : citys){ def month0 = findRentHouse(city, 20200801, 20210201) // def month1 = findRentHouse(city, 20200801, 20200901) @@ -206,10 +206,10 @@ class EsHouseStat { // rets << [city, districts.size(), month1+"(${map.matchCount1})",month2+"(${map.matchCount2})",month3+"(${map.matchCount3})",month4+"(${map.matchCount4})",month5+"(${map.matchCount5})",month6+"(${map.matchCount6})" ] rets << [city, districts.size(), month0] - println city +" 完成" + println city +" 瀹屾垚" } - ExcelUtils.write("d:\\数据\\租房数据统计1.xlsx",rets, "租房统计") + ExcelUtils.write("d:\\鏁版嵁\\绉熸埧鏁版嵁缁熻1.xlsx",rets, "绉熸埧缁熻") } @@ -376,17 +376,17 @@ class EsHouseStat { def testRun(def city){ -// println "北京 " +findHouse("北京", 20200301, 20200601) -// println "上海 " +findHouse("上海", 20200301, 20200601) -// println "广州 " +findHouse("广州", 20200301, 20200601) -// println "深圳 " +findHouse("深圳", 20200301, 20200601) -// println "合肥 " +findHouse("合肥", 20200301, 20200601) +// println "鍖椾含 " +findHouse("鍖椾含", 20200301, 20200601) +// println "涓婃捣 " +findHouse("涓婃捣", 20200301, 20200601) +// println "骞垮窞 " +findHouse("骞垮窞", 20200301, 20200601) +// println "娣卞湷 " +findHouse("娣卞湷", 20200301, 20200601) +// println "鍚堣偉 " +findHouse("鍚堣偉", 20200301, 20200601) def statMap1 = findHouseSource(city, 20200801, 20200831) def statMap2 = findHouseSource(city, 20200901, 20200930) statMap1.each {k,v-> def count2 = statMap2.get(k) - println k +" 8月:"+v+" 9月:"+count2 + println k +" 8鏈堬細"+v+" 9鏈堬細"+count2 } } @@ -394,7 +394,7 @@ class EsHouseStat { //QueryBuilder queryBuilder = QueryBuilders.boolQuery().must(QueryBuilders.termQuery("user_id", '1007736')).must(QueryBuilders.termQuery("request_uri", '/property/detail')) // QueryBuilder queryBuilder = QueryBuilders.boolQuery().must(QueryBuilders.termQuery("user_id", '1007721')).must(QueryBuilders.termQuery("request_uri", '/property/evaluate')).must(QueryBuilders.termQuery("code", 200)) - QueryBuilder queryBuilder = QueryBuilders.boolQuery().must(QueryBuilders.termQuery("user_id", '1007751')).must(QueryBuilders.termQuery("request_uri", '/property/evaluateForTest')).must(QueryBuilders.termQuery("parameter_map.city", '上海')) + QueryBuilder queryBuilder = QueryBuilders.boolQuery().must(QueryBuilders.termQuery("user_id", '1007751')).must(QueryBuilders.termQuery("request_uri", '/property/evaluateForTest')).must(QueryBuilders.termQuery("parameter_map.city", '涓婃捣')) def rets = [] def houses = ElasticUtils.executeSimpleQuery("192.168.0.206", "open_uri_log", queryBuilder); def curDate = DateUtils.parseFromTightByPattern("2020-07-01", "yyyy-MM-dd") @@ -444,8 +444,8 @@ class EsHouseStat { QueryBuilder queryBuilder = QueryBuilders.boolQuery().must(QueryBuilders.termQuery("user_id", '1007751')).must(QueryBuilders.termQuery("request_uri", '/property/evaluateForTest')).must(QueryBuilders.termQuery("parameter_map.city", city)).must(date_range_cdate) def rets = [] def houses = ElasticUtils.executeSimpleQuery("192.168.0.206", "open_uri_log", queryBuilder); - //"城市","楼盘名称","地址", - rets << ["城市","面积","室","厅","卫","楼高","物业类型","房龄","装修","朝向","估价时间","结果信息","城市","区域","楼盘名称","总价","单价","计算方式","房源列表量","建筑年代","物业类型","距离","近半年涨跌幅","同区域20%小区价位","同区域80%小区价位","附近小区量","经纬度"] + //"鍩庡競","妤肩洏鍚嶇О","鍦板潃", + rets << ["鍩庡競","闈㈢Н","瀹�","鍘�","鍗�","妤奸珮","鐗╀笟绫诲瀷","鎴块緞","瑁呬慨","鏈濆悜","浼颁环鏃堕棿","缁撴灉淇℃伅","鍩庡競","鍖哄煙","妤肩洏鍚嶇О","鎬讳环","鍗曚环","璁$畻鏂瑰紡","鎴挎簮鍒楄〃閲�","寤虹瓚骞翠唬","鐗╀笟绫诲瀷","璺濈","杩戝崐骞存定璺屽箙","鍚屽尯鍩�20%灏忓尯浠蜂綅","鍚屽尯鍩�80%灏忓尯浠蜂綅","闄勮繎灏忓尯閲�","缁忕含搴�"] if(houses){ for (int k=0;k= curDate.getTime() - if(map.msg=="该小区不存在" || map.msg=="暂时不支持该小区的估价"){ + if(map.msg=="璇ュ皬鍖轰笉瀛樺湪" || map.msg=="鏆傛椂涓嶆敮鎸佽灏忓尯鐨勪及浠�"){ continue } def ret = [] def paramMap = map.parameter_map - //城市 楼盘名称 地址 面积 室 厅 卫 楼高 朝向 装修 房龄 估价时间 物业类型 + //鍩庡競 妤肩洏鍚嶇О 鍦板潃 闈㈢Н 瀹� 鍘� 鍗� 妤奸珮 鏈濆悜 瑁呬慨 鎴块緞 浼颁环鏃堕棿 鐗╀笟绫诲瀷 ret << paramMap.city ret << paramMap.name ret << paramMap.address @@ -648,7 +648,7 @@ class EsHouseStat { ret << map.res_map.msg }else{ if(resMap.houses){ - //城市 区域 楼盘名称 总价 单价 计算方式 房源列表 + //鍩庡競 鍖哄煙 妤肩洏鍚嶇О 鎬讳环 鍗曚环 璁$畻鏂瑰紡 鎴挎簮鍒楄〃 ret << "" ret << resMap.city ret << handleIllegalCharacter(resMap.district) @@ -659,7 +659,7 @@ class EsHouseStat { ret << resMap.houses.size() }else{ - //城市 区域 楼盘名称 总价 单价 计算方式 模型特征(经纬度,建筑年代,附近小区,距离,近半年涨跌幅,同区域20%,80%价位) + //鍩庡競 鍖哄煙 妤肩洏鍚嶇О 鎬讳环 鍗曚环 璁$畻鏂瑰紡 妯″瀷鐗瑰緛锛堢粡绾害锛屽缓绛戝勾浠o紝闄勮繎灏忓尯锛岃窛绂伙紝杩戝崐骞存定璺屽箙锛屽悓鍖哄煙20%锛�80%浠蜂綅锛� ret << "" ret << resMap.city ret << resMap.district @@ -698,7 +698,7 @@ class EsHouseStat { def houses = LOG.find(q) if(houses){ for(def map : houses){ - if(map.msg=="暂时不支持该小区的估价"){ + if(map.msg=="鏆傛椂涓嶆敮鎸佽灏忓尯鐨勪及浠�"){ continue } @@ -706,7 +706,7 @@ class EsHouseStat { println resMap if(resMap && map.code == 200 && resMap.calcType==2){ def ret = [] - //城市 区域 楼盘名称 总价 单价 计算方式 模型特征(经纬度,建筑年代,附近小区,距离,近半年涨跌幅,同区域20%,80%价位) + //鍩庡競 鍖哄煙 妤肩洏鍚嶇О 鎬讳环 鍗曚环 璁$畻鏂瑰紡 妯″瀷鐗瑰緛锛堢粡绾害锛屽缓绛戝勾浠o紝闄勮繎灏忓尯锛岃窛绂伙紝杩戝崐骞存定璺屽箙锛屽悓鍖哄煙20%锛�80%浠蜂綅锛� ret << resMap.city ret << resMap.district ret << resMap.name @@ -802,7 +802,7 @@ class EsHouseStat { sqlBuffer.append("SELECT * FROM open_uri_log WHERE 1=1") sqlBuffer.append(" and user_id = '1007739'") sqlBuffer.append(" and request_uri = '/property/detail'") - sqlBuffer.append(" and parameter_map.name = '坚真花园二期'") + sqlBuffer.append(" and parameter_map.name = '鍧氱湡鑺卞洯浜屾湡'") ResultSet rs = dataSource.connection.createStatement().executeQuery(sqlBuffer.toString()) def rets = [] @@ -837,10 +837,10 @@ class EsHouseStat { /** - * 判断查询结果集中是否存在某列 - * @param rs 查询结果集 - * @param columnName 列名 - * @return true 存在; false 不存咋 + * 鍒ゆ柇鏌ヨ缁撴灉闆嗕腑鏄惁瀛樺湪鏌愬垪 + * @param rs 鏌ヨ缁撴灉闆� + * @param columnName 鍒楀悕 + * @return true 瀛樺湪; false 涓嶅瓨鍜� */ public boolean isExistColumn(ResultSet rs, String columnName) { try { @@ -858,37 +858,37 @@ class EsHouseStat { def exportOpenLog(){ - def city = "苏州" + def city = "鑻忓窞" def rets = findLogs4(city); - ExcelUtils.write("D:\\数据\\深圳建行正式("+city+").xlsx", rets,"成功") + ExcelUtils.write("D:\\鏁版嵁\\娣卞湷寤鸿姝e紡("+city+").xlsx", rets,"鎴愬姛") } def exportMongoLog(){ - //"上海","北京","成都","重庆","苏州","广州","大连","厦门","杭州", - def citys = ["深圳"] + //"涓婃捣","鍖椾含","鎴愰兘","閲嶅簡","鑻忓窞","骞垮窞","澶ц繛","鍘﹂棬","鏉窞", + def citys = ["娣卞湷"] for(def city :citys){ def rets = findLogs5(city); // def rets = findLogs6(city); - ExcelUtils.write("D:\\数据\\深圳建行\\深圳建行正式("+city+").xlsx", rets,"成功") + ExcelUtils.write("D:\\鏁版嵁\\娣卞湷寤鸿\\娣卞湷寤鸿姝e紡("+city+").xlsx", rets,"鎴愬姛") } } def exportPoi(){ - def citys = ["北京","广州","深圳","合肥","苏州","西安","重庆"] + def citys = ["鍖椾含","骞垮窞","娣卞湷","鍚堣偉","鑻忓窞","瑗垮畨","閲嶅簡"] for(def city : citys){ def rets = [] - rets << ["城市","区域","名称","备注","类型","类型编码","高德经度","高德纬度"] + rets << ["鍩庡競","鍖哄煙","鍚嶇О","澶囨敞","绫诲瀷","绫诲瀷缂栫爜","楂樺痉缁忓害","楂樺痉绾害"] rets.addAll(findPoiLogs(city)) println city +" "+rets.size() if(rets.size() > 65535){ - ExcelUtils.write("D:\\数据\\poi2-"+city+"1.xls", rets[0..65534],city) + ExcelUtils.write("D:\\鏁版嵁\\poi2-"+city+"1.xls", rets[0..65534],city) def rets2 = [] - rets2 << ["城市","区域","名称","备注","类型","类型编码","高德经度","高德纬度"] + rets2 << ["鍩庡競","鍖哄煙","鍚嶇О","澶囨敞","绫诲瀷","绫诲瀷缂栫爜","楂樺痉缁忓害","楂樺痉绾害"] rets2.addAll(rets[65535..(rets.size()-1)]) - ExcelUtils.write("D:\\数据\\poi2-"+city+"2.xls", rets2,city) + ExcelUtils.write("D:\\鏁版嵁\\poi2-"+city+"2.xls", rets2,city) }else{ - ExcelUtils.write("D:\\数据\\poi2-"+city+".xls", rets,city) + ExcelUtils.write("D:\\鏁版嵁\\poi2-"+city+".xls", rets,city) } } @@ -922,19 +922,19 @@ class EsHouseStat { def stat(){ -// def citys = ["深圳"] - def citys = ["上海","北京","成都","重庆","苏州","广州","大连","厦门","杭州","深圳"] +// def citys = ["娣卞湷"] + def citys = ["涓婃捣","鍖椾含","鎴愰兘","閲嶅簡","鑻忓窞","骞垮窞","澶ц繛","鍘﹂棬","鏉窞","娣卞湷"] def rets = [] - rets << ["城市","估价总调用量","成功调用量","失败调用量","有样本调用量","无样本调用量"] + rets << ["鍩庡競","浼颁环鎬昏皟鐢ㄩ噺","鎴愬姛璋冪敤閲�","澶辫触璋冪敤閲�","鏈夋牱鏈皟鐢ㄩ噺","鏃犳牱鏈皟鐢ㄩ噺"] for(def city :citys){ - //def datas = ExcelUtils.read("D:\\数据\\深圳建行\\深圳建行正式("+city+").xlsx",0,1) + //def datas = ExcelUtils.read("D:\\鏁版嵁\\娣卞湷寤鸿\\娣卞湷寤鸿姝e紡("+city+").xlsx",0,1) def map = findHousePriceType(city, 1); def ret = [] ret << city ret << findTotalCount(city); ret << findLogs6(city, ["ok"]); - ret << findLogs6(city, ["该小区不存在","暂时不支持该小区的估价"]); + ret << findLogs6(city, ["璇ュ皬鍖轰笉瀛樺湪","鏆傛椂涓嶆敮鎸佽灏忓尯鐨勪及浠�"]); ret << findHouseType(city, 1); ret << findHouseType(city, 2); @@ -945,7 +945,7 @@ class EsHouseStat { rets << ret } - ExcelUtils.write("D:\\数据\\深圳建行\\深圳建行调用统计2.xlsx", rets, "统计") + ExcelUtils.write("D:\\鏁版嵁\\娣卞湷寤鸿\\娣卞湷寤鸿璋冪敤缁熻2.xlsx", rets, "缁熻") } def findSuccess(def datas){ def count = 0 @@ -962,7 +962,7 @@ class EsHouseStat { def count = 0 for(def data : datas){ def msg = data['N'] - if(msg=="该小区不存在" || msg =="暂时不支持该小区的估价"){ + if(msg=="璇ュ皬鍖轰笉瀛樺湪" || msg =="鏆傛椂涓嶆敮鎸佽灏忓尯鐨勪及浠�"){ count++ } } @@ -1001,10 +1001,10 @@ class EsHouseStat { } def matchStat(){ - def citys = ["上海","北京","成都","重庆","苏州","广州","大连","厦门","杭州","深圳"] + def citys = ["涓婃捣","鍖椾含","鎴愰兘","閲嶅簡","鑻忓窞","骞垮窞","澶ц繛","鍘﹂棬","鏉窞","娣卞湷"] def datas = [] - datas << ["城市","区域","名称"] + datas << ["鍩庡競","鍖哄煙","鍚嶇О"] for(def city : citys){ def rets = findLogs5(city); def keys = [] @@ -1024,7 +1024,7 @@ class EsHouseStat { cityDatas << [ret[14], ret[15], ret[16], ret[12],ret[18]] // } } -// if(ret.size()==14 && ret[13]=="暂时不支持该小区的估价"){ +// if(ret.size()==14 && ret[13]=="鏆傛椂涓嶆敮鎸佽灏忓尯鐨勪及浠�"){ // def key = ret[0]+"#"+ret[1]+"#"+ret[2] // if(!keys.contains(key)){ // keys << key @@ -1053,13 +1053,13 @@ class EsHouseStat { // data << keys.size() // datas << data } - ExcelUtils.write("D:\\数据\\深圳建行\\建行匹配小区(2).xlsx",datas,"统计") + ExcelUtils.write("D:\\鏁版嵁\\娣卞湷寤鸿\\寤鸿鍖归厤灏忓尯锛�2锛�.xlsx",datas,"缁熻") } def statNoHouseCalType(){ - def citys = ["上海","北京","成都","重庆","苏州","广州","大连","厦门","杭州","深圳"] + def citys = ["涓婃捣","鍖椾含","鎴愰兘","閲嶅簡","鑻忓窞","骞垮窞","澶ц繛","鍘﹂棬","鏉窞","娣卞湷"] def results = [] - results << ["城市","无样本总量","1","2","3","4","5","6","7","8","9","10","其它"] + results << ["鍩庡競","鏃犳牱鏈�婚噺","1","2","3","4","5","6","7","8","9","10","鍏跺畠"] for(def city : citys){ def rets = findLogs6(city); println rets.size() @@ -1090,13 +1090,13 @@ class EsHouseStat { } results << rows } - ExcelUtils.write("D:\\数据\\深圳建行\\无样本计算方式统计.xlsx",results, "数据") + ExcelUtils.write("D:\\鏁版嵁\\娣卞湷寤鸿\\鏃犳牱鏈绠楁柟寮忕粺璁�.xlsx",results, "鏁版嵁") } def statCityHouse(){ - def citys = ["上海","北京","成都","重庆","苏州","广州","大连","厦门","杭州","深圳"] + def citys = ["涓婃捣","鍖椾含","鎴愰兘","閲嶅簡","鑻忓窞","骞垮窞","澶ц繛","鍘﹂棬","鏉窞","娣卞湷"] def rets = [] - rets << ["城市","总量","anjuke.com","58.com","ke.com","leju.com","lianjia.com","c21.com","fang.com","centanet.com","fangdd.com","qfang.com","fccs.com","house365.com","zhuge.com","izhiliao.com","leyoujia.com","5i5j.com","均价"] + rets << ["鍩庡競","鎬婚噺","anjuke.com","58.com","ke.com","leju.com","lianjia.com","c21.com","fang.com","centanet.com","fangdd.com","qfang.com","fccs.com","house365.com","zhuge.com","izhiliao.com","leyoujia.com","5i5j.com","鍧囦环"] def roots = ["anjuke.com","58.com","ke.com","leju.com","lianjia.com","c21.com","fang.com","centanet.com","fangdd.com","qfang.com","fccs.com","house365.com","zhuge.com","izhiliao.com","leyoujia.com","5i5j.com"] for(def city : citys){ def ret = [] @@ -1114,7 +1114,7 @@ class EsHouseStat { rets << ret println ret } - ExcelUtils.write("D:\\数据\\深圳建行\\建行房源统计.xlsx",rets,"统计") + ExcelUtils.write("D:\\鏁版嵁\\娣卞湷寤鸿\\寤鸿鎴挎簮缁熻.xlsx",rets,"缁熻") } @@ -1148,7 +1148,7 @@ class EsHouseStat { keys.put("res_map",1) def cursor = LOG.find(q) def count = 0 - println "总量:"+cursor.count() + println "鎬婚噺锛�"+cursor.count() for(def d : cursor){ def resMap = d.res_map.result if(resMap){ @@ -1161,7 +1161,7 @@ class EsHouseStat { } def statNoHouseCCBData(){ - def citys = ["上海","北京","成都","重庆","苏州","广州","大连","厦门","杭州","深圳"] + def citys = ["涓婃捣","鍖椾含","鎴愰兘","閲嶅簡","鑻忓窞","骞垮窞","澶ц繛","鍘﹂棬","鏉窞","娣卞湷"] for(def city : citys){ findTestDatas(city, 2) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/EsSearchUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/EsSearchUtils.groovy index 82893abe6..37d0ca9a2 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/EsSearchUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/EsSearchUtils.groovy @@ -23,8 +23,8 @@ class EsSearchUtils { ResultSet rs = dataSource.connection.createStatement().executeQuery(sql.toString()) def rets = [] ElasticUtils.executeSqlQuery(sql,{ data-> - def mapName = data.name.replaceAll('[·\\(\\)()]|·', '').replace("建设中", "") - def newName = name.replaceAll('[·\\(\\)()]|·', '') + def mapName = data.name.replaceAll('[路\\(\\)锛堬級]|路', '').replace("寤鸿涓�", "") + def newName = name.replaceAll('[路\\(\\)锛堬級]|路', '') if(newName == mapName){ def m = [:] m.city = data.cityname diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/EsUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/EsUtils.groovy index 1daa072a4..ac50c9b50 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/EsUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/EsUtils.groovy @@ -48,7 +48,7 @@ class EsUtils { conn.connect(); - //输出流 + //杈撳嚭娴� if (StringUtils.isNotEmpty(param)) { mWriter = new BufferedWriter(new OutputStreamWriter(conn.getOutputStream(), charset)); mWriter.write(param); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ExMatchDistrictFromExcel.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ExMatchDistrictFromExcel.groovy index 3d1174c1b..b7d523c01 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ExMatchDistrictFromExcel.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ExMatchDistrictFromExcel.groovy @@ -4,7 +4,7 @@ import com.fangjia.script.commData.CommonDatautils import com.fangjia.script.util.ExcelUtils def line = 0; -ExcelUtils.modify("D:\\数据\\结果\\南通数据.xlsx", { row -> +ExcelUtils.modify("D:\\鏁版嵁\\缁撴灉\\鍗楅�氭暟鎹�.xlsx", { row -> line ++; if(line>=1) { def city = row['A']; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ExcelCheckDist.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ExcelCheckDist.groovy index 3d683f208..934213763 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ExcelCheckDist.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ExcelCheckDist.groovy @@ -10,8 +10,8 @@ class ExcelCheckDist { } def run(){ - def gaoDeDatas = ExcelUtils.read("D:\\数据\\结果\\福建\\高德地图要保存小区.xlsx", 0, 1) - def tenxunDatas = ExcelUtils.read("D:\\数据\\结果\\福建\\腾讯1.xlsx", 1, 1) + def gaoDeDatas = ExcelUtils.read("D:\\鏁版嵁\\缁撴灉\\绂忓缓\\楂樺痉鍦板浘瑕佷繚瀛樺皬鍖�.xlsx", 0, 1) + def tenxunDatas = ExcelUtils.read("D:\\鏁版嵁\\缁撴灉\\绂忓缓\\鑵捐1.xlsx", 1, 1) def tenxunIndex = 0 for(def gaode : gaoDeDatas){ @@ -29,7 +29,7 @@ class ExcelCheckDist { gaoDeDatas.addAll(tenxunDatas) - def baiduDatas = ExcelUtils.read("D:\\数据\\结果\\福建\\百度住宅(3).xlsx", 1, 1) + def baiduDatas = ExcelUtils.read("D:\\鏁版嵁\\缁撴灉\\绂忓缓\\鐧惧害浣忓畢(3).xlsx", 1, 1) def baiduIndex = 0 for(def gaode : gaoDeDatas){ def city = gaode['B'] diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ExportAllInfo.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ExportAllInfo.groovy index a524a9f91..c92d37b3c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ExportAllInfo.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ExportAllInfo.groovy @@ -18,8 +18,8 @@ class ExportAllInfo { public static final DBCollection RENT_COLL = MongoUtils.getCollectionByName("fangjia", "district_stat_rent", "mongo.db.fangjia.com") public static final DBCollection ZHONGJIE_COLL = MongoUtils.getCollectionByName("fangjia_pds", "gaode_zhongjie", "mongo.db.fangjia.com") - //去除私立学校 - def static keys = ["医院","学校","幼儿园","公园\\绿地","体育场馆","图书馆","写字楼","银行\\ATM","停车场","便利店","网吧","商场","KTV","剧场\\影院","健身中心","美容院","大型超市","洗浴中心","酒店","咖啡厅","餐饮","游乐场","房产中介","旅游景点","地铁","码头","机场","火车站"] + //鍘婚櫎绉佺珛瀛︽牎 + def static keys = ["鍖婚櫌","瀛︽牎","骞煎効鍥�","鍏洯\\缁垮湴","浣撹偛鍦洪","鍥句功棣�","鍐欏瓧妤�","閾惰\\ATM","鍋滆溅鍦�","渚垮埄搴�","缃戝惂","鍟嗗満","KTV","鍓у満\\褰遍櫌","鍋ヨ韩涓績","缇庡闄�","澶у瀷瓒呭競","娲楁荡涓績","閰掑簵","鍜栧暋鍘�","椁愰ギ","娓镐箰鍦�","鎴夸骇涓粙","鏃呮父鏅偣","鍦伴搧","鐮佸ご","鏈哄満","鐏溅绔�"] static main(args) { def task = new ExportAllInfo() @@ -28,7 +28,7 @@ class ExportAllInfo { def run(){ def line = 0; - ExcelUtils.modify("D:\\数据\\原数据\\广州样本案例-9.15-1.xlsx", { row -> + ExcelUtils.modify("D:\\鏁版嵁\\鍘熸暟鎹甛\骞垮窞鏍锋湰妗堜緥-9.15-1.xlsx", { row -> line ++; if(line>1){ def city = row[0]; @@ -60,35 +60,35 @@ class ExportAllInfo { def addDistrictInfo(row, dbo){ if(dbo){ - //建筑类型 + //寤虹瓚绫诲瀷 row['T'] = dbo.build_type ; - // 户数 + // 鎴锋暟 row['U'] = dbo.household_count ; - // 物业费 + // 鐗╀笟璐� row['V'] = dbo.estate_charge ; - // 停车位 + // 鍋滆溅浣� row['W'] = dbo.car_site_count ; - // 产权年限 + // 浜ф潈骞撮檺 row['X'] = dbo.property_life ; - // 竣工日期 + // 绔e伐鏃ユ湡 row['Y'] = getFinishDate(dbo.finish_building_date) ; - // 占地面积 + // 鍗犲湴闈㈢Н row['Z'] = dbo.all_area ; - // 建筑面积 + // 寤虹瓚闈㈢Н row['AA'] = dbo.build_area ; - // 绿化率 + // 缁垮寲鐜� row['AB'] = dbo.virescence_percent ; - // 容积率 + // 瀹圭Н鐜� row['AC'] = dbo.cubage_percent ; - // 开发商 + // 寮�鍙戝晢 row['AD'] = dbo.developer ; - // 物业公司 ? + // 鐗╀笟鍏徃 ? row['AE'] = dbo.estate_company ; - // 经度 ? + // 缁忓害 ? row['AF'] = dbo.lng2?dbo.lng2/10000000000.0 :""; - // 纬度 + // 绾害 row['AG'] = dbo.lat2?dbo.lat2/10000000000.0:"" ; - // 预售许可证 + // 棰勫敭璁稿彲璇� row['AH'] = dbo.licence ; } @@ -182,7 +182,7 @@ class ExportAllInfo { for(def key :keys){ def newkey = key.replace("\\","/"); def details = countPois(datas, city, dbo.lat/10000000000, dbo.lng/10000000000, newkey);//CommonDatautils.findPoiDetail(key, dist.lat2, dist.lng2) - if(!details && key!="机场" && key!="火车站"){ + if(!details && key!="鏈哄満" && key!="鐏溅绔�"){ newkey = key.replace("/",'$'); details = CommonDatautils.findPoiDetail(newkey, dbo.lat2, dbo.lng2); } @@ -196,7 +196,7 @@ class ExportAllInfo { def countPois(datas, city, lat, lng, keyword){ def names = [] def results; - if(keyword=="房产中介"){ + if(keyword=="鎴夸骇涓粙"){ if (lng && lat && lng > 0) { for(def data : datas){ double dis = GeoUtils.calculateDistance(lng, lat, Double.parseDouble(data.lng), Double.parseDouble(data.lat)) @@ -206,8 +206,8 @@ class ExportAllInfo { } } }else{ - if(keyword.indexOf("影院")!=-1){ - keyword = "电影院"; + if(keyword.indexOf("褰遍櫌")!=-1){ + keyword = "鐢靛奖闄�"; } double[] bounds = GeoUtils.getAround(lat,lng,1000) def query = new BasicDBObject() @@ -218,7 +218,7 @@ class ExportAllInfo { results = POI.find(query); results.each {BasicDBObject dbo-> if(GeoUtils.calculateDistance(lng, lat, dbo.lng, dbo.lat)){ - if(keyword == "地铁"){ + if(keyword == "鍦伴搧"){ names << dbo.address }else{ names << dbo.name diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ExportCityPrice.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ExportCityPrice.groovy index 6c40006fb..23fc33fbd 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ExportCityPrice.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ExportCityPrice.groovy @@ -14,7 +14,7 @@ import com.mongodb.DBObject */ -ExcelUtils.modify("D:\\数据\\70个大中型城市价格导出(20180305).xlsx", { row -> +ExcelUtils.modify("D:\\鏁版嵁\\70涓ぇ涓瀷鍩庡競浠锋牸瀵煎嚭(20180305).xlsx", { row -> def city = row[0]; row[1] = queryCityPrice(city,"2018-02-04" ); row[2] = queryCityPrice(city,"2018-03-04" ); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/FZDataExport.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/FZDataExport.groovy index 423764526..7cd9d5c4c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/FZDataExport.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/FZDataExport.groovy @@ -36,7 +36,7 @@ class FZDataExport { } def run(){ - def datas = ExcelUtils.read("d:\\数据\\福州导出小区.xlsx", 0, 1) + def datas = ExcelUtils.read("d:\\鏁版嵁\\绂忓窞瀵煎嚭灏忓尯.xlsx", 0, 1) // districtExport(datas); @@ -82,12 +82,12 @@ class FZDataExport { rows << row } - result << ["楼盘ID","城市","区域","楼盘名称","经纬度信息","物业类型","建筑类型","户数","物业费","停车位","产权年限", - "产权性质","开盘时间","竣工时间","交房时间","占地面积","建筑面积","容积率","开发商","物业公司", - "建筑结构","楼栋总数"] + result << ["妤肩洏ID","鍩庡競","鍖哄煙","妤肩洏鍚嶇О","缁忕含搴︿俊鎭�","鐗╀笟绫诲瀷","寤虹瓚绫诲瀷","鎴锋暟","鐗╀笟璐�","鍋滆溅浣�","浜ф潈骞撮檺", + "浜ф潈鎬ц川","寮�鐩樻椂闂�","绔e伐鏃堕棿","浜ゆ埧鏃堕棿","鍗犲湴闈㈢Н","寤虹瓚闈㈢Н","瀹圭Н鐜�","寮�鍙戝晢","鐗╀笟鍏徃", + "寤虹瓚缁撴瀯","妤兼爧鎬绘暟"] result.addAll(rows) - ExcelUtils.write("d:\\数据\\福州\\福州案例数据.xlsx", result, "小区") - println "小区信息导完" + ExcelUtils.write("d:\\鏁版嵁\\绂忓窞\\绂忓窞妗堜緥鏁版嵁.xlsx", result, "灏忓尯") + println "灏忓尯淇℃伅瀵煎畬" } def districtAvgPriceExport(def datas){ @@ -106,14 +106,14 @@ class FZDataExport { rows << row } - def header = ["楼盘ID","城市","区域","楼盘名称"] + def header = ["妤肩洏ID","鍩庡競","鍖哄煙","妤肩洏鍚嶇О"] for(def date : dates){ - header<< DateUtils.formatDateByPattern(date, "yyyy年MM月") + header<< DateUtils.formatDateByPattern(date, "yyyy骞碝M鏈�") } rets << header rets.addAll(rows) - ExcelUtils.write("d:\\数据\\福州\\福州案例数据.xlsx", rets, "均价") - println "小区均价导完" + ExcelUtils.write("d:\\鏁版嵁\\绂忓窞\\绂忓窞妗堜緥鏁版嵁.xlsx", rets, "鍧囦环") + println "灏忓尯鍧囦环瀵煎畬" } def findAllPrice(def city, def region, def name, def dates){ @@ -130,7 +130,7 @@ class FZDataExport { def houseExport(def datas){ def rets = [] - rets << ["楼盘编号","城市","区域","名称","房源编号","面积","挂牌总价","挂牌单价","楼高","楼层信息","室","厅","卫","朝向","装修","标题","URL","挂牌时间"] + rets << ["妤肩洏缂栧彿","鍩庡競","鍖哄煙","鍚嶇О","鎴挎簮缂栧彿","闈㈢Н","鎸傜墝鎬讳环","鎸傜墝鍗曚环","妤奸珮","妤煎眰淇℃伅","瀹�","鍘�","鍗�","鏈濆悜","瑁呬慨","鏍囬","URL","鎸傜墝鏃堕棿"] def rows = [] for(def data : datas){ def obj = CommonDatautils.findDistrictPrice(data[1], data[2], data[3]) @@ -144,8 +144,8 @@ class FZDataExport { } } rets.addAll(rows) - ExcelUtils.write("d:\\数据\\福州\\福州案例数据.xlsx", rets, "房源") - println "小区房源导完" + ExcelUtils.write("d:\\鏁版嵁\\绂忓窞\\绂忓窞妗堜緥鏁版嵁.xlsx", rets, "鎴挎簮") + println "灏忓尯鎴挎簮瀵煎畬" } @@ -202,7 +202,7 @@ class FZDataExport { // rets << row; // roots << root // } - return false;//不进行更新 + return false;//涓嶈繘琛屾洿鏂� }); def stop = false; @@ -269,7 +269,7 @@ class FZDataExport { def tradeExport(def datas){ - def rets = [["楼盘ID","城市","区域","楼盘名称","面积","成交单价","成交总价","成交时间"]] + def rets = [["妤肩洏ID","鍩庡競","鍖哄煙","妤肩洏鍚嶇О","闈㈢Н","鎴愪氦鍗曚环","鎴愪氦鎬讳环","鎴愪氦鏃堕棿"]] for(def data : datas){ def rows = findDealPrice(data[0],data[1], data[2], data[3]); if(rows){ @@ -277,8 +277,8 @@ class FZDataExport { rets.addAll(rows) } } - ExcelUtils.write("d:\\数据\\福州\\福州案例数据.xlsx", rets, "成交数据") - println "成交数据导完" + ExcelUtils.write("d:\\鏁版嵁\\绂忓窞\\绂忓窞妗堜緥鏁版嵁.xlsx", rets, "鎴愪氦鏁版嵁") + println "鎴愪氦鏁版嵁瀵煎畬" } def findDealPrice(id, city, region, name){ @@ -305,12 +305,12 @@ class FZDataExport { def thirdTradeExport(def datas){ def rets = [] - def headers = ["楼盘ID","城市","区域","楼盘名称"] + def headers = ["妤肩洏ID","鍩庡競","鍖哄煙","妤肩洏鍚嶇О"] def fieldMap = [ - "房估估":"fanggugu_esf","诸葛找房":"zhugezhaofang_esf","安居客":"anjuke_esf","搜房":"soufang_esf","中原地产":"zhongyuan_esf","赶集":"ganji_esf", - "链家":"lianjia_esf","兔博士":"tuboshi_esf","城市房产":"cityhouse_esf","贝壳找房":"beike_esf","Q房":"qfang_esf", - "乐有家":"leyoujia_esf","房探":"fangtan_esf","房多多":"fangdoudou_esf","小资家":"xiaozijia_esf","我爱我家":"5i5j_esf","麦田":"maitian_esf", - "房途":"fangtoo_esf","C21":"c21_esf","乐居":"leju_esf","房产超市":"fccs_esf","58同城":"58tc_esf" + "鎴夸及浼�":"fanggugu_esf","璇歌憶鎵炬埧":"zhugezhaofang_esf","瀹夊眳瀹�":"anjuke_esf","鎼滄埧":"soufang_esf","涓師鍦颁骇":"zhongyuan_esf","璧堕泦":"ganji_esf", + "閾惧":"lianjia_esf","鍏斿崥澹�":"tuboshi_esf","鍩庡競鎴夸骇":"cityhouse_esf","璐濆3鎵炬埧":"beike_esf","Q鎴�":"qfang_esf", + "涔愭湁瀹�":"leyoujia_esf","鎴挎帰":"fangtan_esf","鎴垮澶�":"fangdoudou_esf","灏忚祫瀹�":"xiaozijia_esf","鎴戠埍鎴戝":"5i5j_esf","楹︾敯":"maitian_esf", + "鎴块��":"fangtoo_esf","C21":"c21_esf","涔愬眳":"leju_esf","鎴夸骇瓒呭競":"fccs_esf","58鍚屽煄":"58tc_esf" ] fieldMap.each {k,v-> headers << k @@ -332,8 +332,8 @@ class FZDataExport { rets << headers rets.addAll(rows) - ExcelUtils.write("d:\\数据\\福州\\福州案例数据.xlsx", rets, "第三方数据") - println "第三方均价导完" + ExcelUtils.write("d:\\鏁版嵁\\绂忓窞\\绂忓窞妗堜緥鏁版嵁.xlsx", rets, "绗笁鏂规暟鎹�") + println "绗笁鏂瑰潎浠峰瀹�" } def findThirdPrice(def city, def region, def name, def source){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/FZHouseEvaluation.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/FZHouseEvaluation.groovy index 6e5a99f52..6fdaf59fd 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/FZHouseEvaluation.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/FZHouseEvaluation.groovy @@ -18,16 +18,16 @@ class FZHouseEvaluation { task.run() } def run(){ - def datas = ExcelUtils.read("D:\\数据\\福州\\福州高质量小区.xlsx",0, 1) + def datas = ExcelUtils.read("D:\\鏁版嵁\\绂忓窞\\绂忓窞楂樿川閲忓皬鍖�.xlsx",0, 1) def louDongInfos = getLouDongInfo(datas); } def getLouDongInfo(def datas){ def allRets = [] def index = 0 - allRets << ["城市","区域","名称","楼栋号","室号","朝向","楼层","楼高","装修","面积","总价","单价"] + allRets << ["鍩庡競","鍖哄煙","鍚嶇О","妤兼爧鍙�","瀹ゅ彿","鏈濆悜","妤煎眰","妤奸珮","瑁呬慨","闈㈢Н","鎬讳环","鍗曚环"] for(def data : datas){ - if(["鼓楼","仓山","台江","晋安","马尾"].contains(data['B'])){ + if(["榧撴ゼ","浠撳北","鍙版睙","鏅嬪畨","椹熬"].contains(data['B'])){ def count = regionMap.get(data['B']) if(count<=20){ def rets = findLouDongs(data['A'], data['B'], data['C']); @@ -39,7 +39,7 @@ class FZHouseEvaluation { } } - ExcelUtils.write("D:\\数据\\福州\\福州房源1.xlsx",allRets,"数据") + ExcelUtils.write("D:\\鏁版嵁\\绂忓窞\\绂忓窞鎴挎簮1.xlsx",allRets,"鏁版嵁") println allRets.size() } @@ -55,7 +55,7 @@ class FZHouseEvaluation { params.put("size", String.valueOf(o.house_area)); if(o.house_height){ params.put("maxFloor", o.house_height.toString()); - params.put("direction", getDirectionCode(o.direction).toString());//朝向 + params.put("direction", getDirectionCode(o.direction).toString());//鏈濆悜 if(o.house_floor){ params.put("floor", o.house_floor.toString()); }else{ @@ -68,10 +68,10 @@ class FZHouseEvaluation { fitmentCode = getFitmentCode(o.fitment_rank) } if(fitmentCode){ - params.put("decoration", fitmentCode.toString());//装修 + params.put("decoration", fitmentCode.toString());//瑁呬慨 }else{ fitmentCode = (r.nextInt(4)+1).toString() - params.put("decoration", fitmentCode);//装修 + params.put("decoration", fitmentCode);//瑁呬慨 } o.fitment_rank = getFitment(fitmentCode.toInteger()); @@ -91,18 +91,18 @@ class FZHouseEvaluation { } def getDirectionCode(def s){ - def directMap = ["西南":1, "东南":2, "南":3, "西北":4, "东北":5, "东":6, "西":7, "北":8, "东西":9, "南北":10] + def directMap = ["瑗垮崡":1, "涓滃崡":2, "鍗�":3, "瑗垮寳":4, "涓滃寳":5, "涓�":6, "瑗�":7, "鍖�":8, "涓滆タ":9, "鍗楀寳":10] return directMap.get(s); } def getFitmentCode(def s){ if(s){ - if(["毛坯"].contains(s)){ + if(["姣涘澂"].contains(s)){ return 1; - }else if(["简单装修","简装"].contains(s)){ + }else if(["绠�鍗曡淇�","绠�瑁�"].contains(s)){ return 2; - }else if(["精装修","精装"].contains(s)){ + }else if(["绮捐淇�","绮捐"].contains(s)){ return 3; - }else if(["豪华装修","豪装"].contains(s)){ + }else if(["璞崕瑁呬慨","璞"].contains(s)){ return 4; } } @@ -110,7 +110,7 @@ class FZHouseEvaluation { } def getFitment(def code){ - def fitmentMap = [1:"毛坯", 2:"简装", 3:"精装", 4:"豪装"] + def fitmentMap = [1:"姣涘澂", 2:"绠�瑁�", 3:"绮捐", 4:"璞"] return fitmentMap.get(code); } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/FangjiatongUserStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/FangjiatongUserStat.groovy index 931989928..63e237c28 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/FangjiatongUserStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/FangjiatongUserStat.groovy @@ -29,7 +29,7 @@ class FangjiatongUserStat { result << [s, findName(s)] } println result - ExcelUtils.write("D:\\数据\\结果\\房价通用户.xls", result, "统计") + ExcelUtils.write("D:\\鏁版嵁\\缁撴灉\\鎴夸环閫氱敤鎴�.xls", result, "缁熻") } def findName(email){ @@ -68,7 +68,7 @@ class FangjiatongUserStat { // def months = ["2020-01-01","2020-02-01","2020-03-01","2020-04-01","2020-05-01","2020-06-01","2020-07-01","2020-08-01","2020-09-01","2020-10-01","2020-11-01","2020-12-01","2021-01-01"] def months = ["2022-01-01","2022-02-01","2022-03-01","2022-04-01","2022-05-01","2022-06-01","2022-07-01","2022-08-01","2022-09-01","2022-10-01","2022-11-01","2022-12-01","2023-01-01"] def rets = [] - def header = ["用户id","支行名称", "备注名称"] + def header = ["鐢ㄦ埛id","鏀鍚嶇О", "澶囨敞鍚嶇О"] months.each{m-> header << m.substring(0, 7) } @@ -89,7 +89,7 @@ class FangjiatongUserStat { } rets << ret } - ExcelUtils.write("D:\\数据\\农行统计.xlsx", rets, "农行统计-2022") + ExcelUtils.write("D:\\鏁版嵁\\鍐滆缁熻.xlsx", rets, "鍐滆缁熻-2022") } def findUses(role){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/FileSearchTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/FileSearchTest.groovy index 5f033bdcc..2782aefdd 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/FileSearchTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/FileSearchTest.groovy @@ -11,7 +11,7 @@ class FileSearchTest { } def stat(){ - def files = getAllFiles("D:\\数据\\jn-logs") + def files = getAllFiles("D:\\鏁版嵁\\jn-logs") if(files){ def ret = [] for(def filepath : files){ @@ -34,13 +34,13 @@ class FileSearchTest { return aa.compareTo(bb) } println ret - ExcelUtils.write("D:\\数据\\江南行商铺房源.xlsx", ret, "统计"); + ExcelUtils.write("D:\\鏁版嵁\\姹熷崡琛屽晢閾烘埧婧�.xlsx", ret, "缁熻"); } } def run(){ - def files = getAllFiles("D:\\数据\\jn-logs") - println "共:"+files.size() + def files = getAllFiles("D:\\鏁版嵁\\jn-logs") + println "鍏憋細"+files.size() if(files){ def count = 0; def names = [] @@ -62,7 +62,7 @@ class FileSearchTest { println s } // if(stop){ -// println "找到文件:"+filename +// println "鎵惧埌鏂囦欢锛�"+filename // } } } @@ -78,7 +78,7 @@ class FileSearchTest { files << tempList[i]; } if (tempList[i].isDirectory()) { - System.out.println("文件夹:" + tempList[i]); + System.out.println("鏂囦欢澶癸細" + tempList[i]); } } return files; 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 e32358ffd..1cb51bdbc 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 @@ -103,14 +103,14 @@ class FiledStrand { updateFile = addBuildStructureToData(dist, updateFile); updateFile = addAllAreaToData(dist, updateFile); updateFile = addBuildAreaToData(dist, updateFile); - updateFile = addCubagePercentToData(dist, updateFile);//容积 - updateFile = addVirescencePercentToData(dist, updateFile);//绿化 + updateFile = addCubagePercentToData(dist, updateFile);//瀹圭Н + updateFile = addVirescencePercentToData(dist, updateFile);//缁垮寲 updateFile = addDeveloperToData(dist, updateFile); updateFile = addEstateCompanyToData(dist, updateFile); if(updateFile){ updateIndex++; updateFile.m_date = new Date() - println "【${index}-${updateIndex}】["+dist+"] 修改["+updateFile+"]" + println "銆�${index}-${updateIndex}銆慬"+dist+"] 淇敼["+updateFile+"]" DbUtils.seaweed.update(new BasicDBObject('_id',dist._id),new BasicDBObject('$set',updateFile)) } @@ -139,7 +139,7 @@ class FiledStrand { static def addPropertyLiftToData(def dist, def updateFile){ if(dist.estateType && dist.property_life){ - if(dist.estateType == "商住"){ + if(dist.estateType == "鍟嗕綇"){ if(dist.property_life.contains("50")){ updateFile.dist.property_life = "50" }else if(dist.property_life.contains("40")){ @@ -200,12 +200,12 @@ class FiledStrand { static def addHouseStructureToData(def dist, def updateFile){ def house_structure = null if(dist.house_structure){ - if(dist.house_structure.indexOf("框架")>-1 && dist.house_structure.indexOf("剪力")>-1){ - house_structure = "框架-剪力墙结构" - }else if(dist.house_structure.indexOf("框架")>-1){ - house_structure = "框架结构" - }else if(dist.house_structure.indexOf("剪力")>-1){ - house_structure = "剪力墙结构" + if(dist.house_structure.indexOf("妗嗘灦")>-1 && dist.house_structure.indexOf("鍓姏")>-1){ + house_structure = "妗嗘灦-鍓姏澧欑粨鏋�" + }else if(dist.house_structure.indexOf("妗嗘灦")>-1){ + house_structure = "妗嗘灦缁撴瀯" + }else if(dist.house_structure.indexOf("鍓姏")>-1){ + house_structure = "鍓姏澧欑粨鏋�" } } if(house_structure!=dist.house_structure){ @@ -217,16 +217,16 @@ class FiledStrand { static def addBuildStructureToData(def dist, def updateFile){ def buildStructure = null if(dist.build_structure){ - if(dist.build_structure.indexOf("砖木")>-1){ - buildStructure = "砖木结构" - }else if(dist.build_structure.indexOf("钢结构")>-1){ - buildStructure = "钢结构"; - }else if(dist.build_structure.indexOf("钢、钢筋混凝土")>-1){ - buildStructure = "钢、钢筋混凝土结构"; - }else if(dist.build_structure.indexOf("钢筋混凝土")>-1){ - buildStructure = "钢筋混凝土结构"; - }else if(dist.build_structure.indexOf("混合")>-1){ - buildStructure = "混合结构"; + if(dist.build_structure.indexOf("鐮栨湪")>-1){ + buildStructure = "鐮栨湪缁撴瀯" + }else if(dist.build_structure.indexOf("閽㈢粨鏋�")>-1){ + buildStructure = "閽㈢粨鏋�"; + }else if(dist.build_structure.indexOf("閽€�侀挗绛嬫贩鍑濆湡")>-1){ + buildStructure = "閽€�侀挗绛嬫贩鍑濆湡缁撴瀯"; + }else if(dist.build_structure.indexOf("閽㈢瓔娣峰嚌鍦�")>-1){ + buildStructure = "閽㈢瓔娣峰嚌鍦熺粨鏋�"; + }else if(dist.build_structure.indexOf("娣峰悎")>-1){ + buildStructure = "娣峰悎缁撴瀯"; } } @@ -311,16 +311,16 @@ class FiledStrand { 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 "综合体" + 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 "鍏朵粬" } } return null @@ -338,12 +338,12 @@ class FiledStrand { static def processCarSiteRent(rent){ if(rent){ - if(["-","0元/月","无","不详","未知","待查","免费元/月","/","0","*","待确认","undefined元/月","0元","0元每月","未知元/月","0.00元/月","未定","暂定","测算中","无元/月","未定元/月","另议元/月","面议元/月","面议元/月","有元/月","暂时未确定","0元(无停车位)"," 元/月"].contains(rent)){ + if(["-","0鍏�/鏈�","鏃�","涓嶈","鏈煡","寰呮煡","鍏嶈垂鍏�/鏈�","/","0","*","寰呯‘璁�","undefined鍏�/鏈�","0鍏�","0鍏冩瘡鏈�","鏈煡鍏�/鏈�","0.00鍏�/鏈�","鏈畾","鏆傚畾","娴嬬畻涓�","鏃犲厓/鏈�","鏈畾鍏�/鏈�","鍙﹁鍏�/鏈�","闈㈣鍏�/鏈�","闈㈣鍏�/鏈�","鏈夊厓/鏈�","鏆傛椂鏈‘瀹�","0鍏冿紙鏃犲仠杞︿綅锛�"," 鍏�/鏈�"].contains(rent)){ return null - }else if(rent.contains("暂无") || rent.contains("车位不归") || rent.contains("待定") || rent.contains("暂定") || rent.contains("暂完善") || rent.contains("待审批") || rent.contains("不详") || rent.contains("未定价格") || rent.contains("中国电信") || rent.contains("面谈")){ + }else if(rent.contains("鏆傛棤") || rent.contains("杞︿綅涓嶅綊") || rent.contains("寰呭畾") || rent.contains("鏆傚畾") || rent.contains("鏆傚畬鍠�") || rent.contains("寰呭鎵�") || rent.contains("涓嶈") || rent.contains("鏈畾浠锋牸") || rent.contains("涓浗鐢典俊") || rent.contains("闈㈣皥")){ return null }else{ - rent = rent.replace("元/月","元/月").replace(",","").replace("#","").replace(".00","") + rent = rent.replace("鍏冿紡鏈�","鍏�/鏈�").replace(",","").replace("#","").replace(".00","") if(rent.toString().length()>100){ return null } @@ -362,39 +362,39 @@ class FiledStrand { static def processName(name){ - name = name.replace('·','').replace('.','').replace('●','').replace('@','').replace('%','').replace('?','').replace('Ⅰ期','一期') + name = name.replace('路','').replace('.','').replace('鈼�','').replace('@','').replace('%','').replace('?','').replace('鈪犳湡','涓�鏈�') if (name.contains('(') && name.contains(')')){ def rep_str = name.subsring(name.index('('),name.lastIndex(')')+1) name = name.replace(rep_str, '') } - if (name.contains('(') && name.contains(')')){ - def rep_str = name.subsring(name.index('('),name.rfind(')')+1) + if (name.contains('(') && name.contains('锛�')){ + 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.subsring(name.index('【'),name.rfind('】')+1) + if (name.find('銆�')!=-1 && name.find('銆�')!=-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.subsring(name.index('【'),name.rfind('】')+1) + if (name.find('銆�')!=-1 && name.find('銆�')!=-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.subsring(name.index('('),name.rfind(')')+1) + if (name.find('锛�')!=-1 && name.find('锛�')!=-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.subsring(name.index('「'),name.rfind('」')+1) + if (name.find('銆�')!=-1 && name.find('銆�')!=-1){ + def rep_str = name.subsring(name.index('銆�'),name.rfind('銆�')+1) name = name.replace(rep_str, '') } return name @@ -415,7 +415,7 @@ class FiledStrand { } static def processCarSiteDesc(car_site){ - if(car_site && car_site.size()<=20 && car_site.size()>=2 && !car_site.contains("待定") && !car_site.contains("暂无")){ + if(car_site && car_site.size()<=20 && car_site.size()>=2 && !car_site.contains("寰呭畾") && !car_site.contains("鏆傛棤")){ return car_site.toString() } return null @@ -479,7 +479,7 @@ class FiledStrand { static def processBlock(city, region, def block){ if(block){ - if(block.contains("无") || block.toString().length()>10){ + if(block.contains("鏃�") || block.toString().length()>10){ return null } // block = BlockData.formatBlock(city, region, block); @@ -491,22 +491,22 @@ class FiledStrand { static def processBuildType(def buildType, def estateType){ if(buildType){ def types = [] - if(estateType == "别墅"){ - def arrs = ["多层","小高层","高层","超高层","花园洋房","老洋房","四合院"] + if(estateType == "鍒"){ + def arrs = ["澶氬眰","灏忛珮灞�","楂樺眰","瓒呴珮灞�","鑺卞洯娲嬫埧","鑰佹磱鎴�","鍥涘悎闄�"] for(def s : arrs){ if(buildType.contains(s)){ types << s } } - }else if(estateType == "商住"){ - def arrs = ["独栋","双拼","联排","叠加","老式别墅洋房"] + }else if(estateType == "鍟嗕綇"){ + def arrs = ["鐙爧","鍙屾嫾","鑱旀帓","鍙犲姞","鑰佸紡鍒娲嬫埧"] for(def s : arrs){ if(buildType.contains(s)){ types << s } } }else{ - def arrs = ["多层","小高层","高层","超高层","SOHO","soho","LOFT","loft","酒店式公寓"] + def arrs = ["澶氬眰","灏忛珮灞�","楂樺眰","瓒呴珮灞�","SOHO","soho","LOFT","loft","閰掑簵寮忓叕瀵�"] for(def s : arrs){ if(buildType.contains(s)){ types << s @@ -522,7 +522,7 @@ class FiledStrand { static def processlandProperty(val){ if(val){ - def arrs = ["经适房","限价房","廉租房","宅基地","保障房","动迁房","配套房","商品房"] + def arrs = ["缁忛�傛埧","闄愪环鎴�","寤夌鎴�","瀹呭熀鍦�","淇濋殰鎴�","鍔ㄨ縼鎴�","閰嶅鎴�","鍟嗗搧鎴�"] def property = null for(def s : arrs){ if(val.contains(s)){ @@ -538,16 +538,16 @@ class FiledStrand { static def processBuildStructure(val) { if (val) { def buildStructure= null - if(val.indexOf("砖木")>-1){ - buildStructure = "砖木结构" - }else if(val.indexOf("钢结构")>-1){ - buildStructure = "钢结构"; - }else if(val.indexOf("钢、钢筋混凝土")>-1){ - buildStructure = "钢、钢筋混凝土结构"; - }else if(val.indexOf("钢筋混凝土")>-1 || val.indexOf("钢混")>-1){ - buildStructure = "钢筋混凝土结构"; - }else if(val.indexOf("混合")>-1){ - buildStructure = "混合结构"; + if(val.indexOf("鐮栨湪")>-1){ + buildStructure = "鐮栨湪缁撴瀯" + }else if(val.indexOf("閽㈢粨鏋�")>-1){ + buildStructure = "閽㈢粨鏋�"; + }else if(val.indexOf("閽€�侀挗绛嬫贩鍑濆湡")>-1){ + buildStructure = "閽€�侀挗绛嬫贩鍑濆湡缁撴瀯"; + }else if(val.indexOf("閽㈢瓔娣峰嚌鍦�")>-1 || val.indexOf("閽㈡贩")>-1){ + buildStructure = "閽㈢瓔娣峰嚌鍦熺粨鏋�"; + }else if(val.indexOf("娣峰悎")>-1){ + buildStructure = "娣峰悎缁撴瀯"; } return buildStructure } @@ -557,14 +557,14 @@ class FiledStrand { static def processLevel(val){ def level = null if (val) { - if(val.contains("超甲") || val.contains("5A") || val.contains("6A") || val.contains("顶级")){ - level = "超甲级" - }else if(val.indexOf("甲")>-1 || val.contains("A")){ - level = "甲级" - }else if(val.indexOf("乙")>-1 || val.contains("B")){ - level = "乙级"; - }else if(val.indexOf("丙")>-1 || val.contains("C")){ - level = "丙级"; + if(val.contains("瓒呯敳") || val.contains("5A") || val.contains("6A") || val.contains("椤剁骇")){ + level = "瓒呯敳绾�" + }else if(val.indexOf("鐢�")>-1 || val.contains("A")){ + level = "鐢茬骇" + }else if(val.indexOf("涔�")>-1 || val.contains("B")){ + level = "涔欑骇"; + }else if(val.indexOf("涓�")>-1 || val.contains("C")){ + level = "涓欑骇"; } } return level @@ -574,8 +574,8 @@ class FiledStrand { static def processLoopLine(val){ def line = null if (val) { - if(!val.contains("暂") && !val.contains("无")){ - if(val.indexOf("环")>-1){ + if(!val.contains("鏆�") && !val.contains("鏃�")){ + if(val.indexOf("鐜�")>-1){ line = val } } @@ -586,10 +586,10 @@ class FiledStrand { static def processForeign(val){ def foreign = null if (val) { - if(val.indexOf("是")>-1){ - foreign = "是" - }else if(val.indexOf("否")>-1){ - foreign = "否"; + if(val.indexOf("鏄�")>-1){ + foreign = "鏄�" + }else if(val.indexOf("鍚�")>-1){ + foreign = "鍚�"; } } return foreign @@ -598,14 +598,14 @@ class FiledStrand { static def processRegister(val){ def register = null if (val) { - if(val.contains("不可以注册") || val.contains("不能注册")){ - register = "否"; - }else if(val.contains("可以注册")){ - register = "是" - }else if(val.indexOf("是")>-1){ - register = "是" - }else if(val.indexOf("否")>-1){ - register = "否"; + if(val.contains("涓嶅彲浠ユ敞鍐�") || val.contains("涓嶈兘娉ㄥ唽")){ + register = "鍚�"; + }else if(val.contains("鍙互娉ㄥ唽")){ + register = "鏄�" + }else if(val.indexOf("鏄�")>-1){ + register = "鏄�" + }else if(val.indexOf("鍚�")>-1){ + register = "鍚�"; } } return register @@ -614,12 +614,12 @@ class FiledStrand { static def processFitment(val){ def fitment = null if(val){ - if(val.indexOf("精装")>-1){ - fitment = "精装" - }else if(val.indexOf("简单")>-1 || val.indexOf("简装")>-1 || val.indexOf("一般")>-1 || val.indexOf("普通")>-1){ - fitment = "简装"; - }else if(val.indexOf("毛坯")>-1){ - fitment = "毛坯"; + if(val.indexOf("绮捐")>-1){ + fitment = "绮捐" + }else if(val.indexOf("绠�鍗�")>-1 || val.indexOf("绠�瑁�")>-1 || val.indexOf("涓�鑸�")>-1 || val.indexOf("鏅��")>-1){ + fitment = "绠�瑁�"; + }else if(val.indexOf("姣涘澂")>-1){ + fitment = "姣涘澂"; } } return fitment @@ -647,7 +647,7 @@ class FiledStrand { } static def isRoad(def s){ - def pattern = Pattern.compile("[路|街|大道|巷]"); + def pattern = Pattern.compile("[璺瘄琛梶澶ч亾|宸穄"); def matcher = pattern.matcher(s) if(matcher.find()){ return true; @@ -656,7 +656,7 @@ class FiledStrand { } static def isStandardRoad(def s){ - def pattern = Pattern.compile("[路|街|大道|巷]\\d+(号|弄)"); + def pattern = Pattern.compile("[璺瘄琛梶澶ч亾|宸穄\\d+(鍙穦寮�)"); def matcher = pattern.matcher(s) if(matcher.find()){ return true; @@ -687,7 +687,7 @@ class FiledStrand { if(dist.cubage_percent){ def v = getValue(dist.cubage_percent) if(v){ - if(dist.estate_type2 == "别墅"){ + if(dist.estate_type2 == "鍒"){ if(v>=0.3 && v<=1){ cubage_percent = v.toString() } @@ -745,14 +745,14 @@ class FiledStrand { static def addBuildTypeToData(dist, updateFile){ if(dist.estateType2 && dist.buildType){ - def house = ["超高层","小高层","多层","高层","花园洋房","老洋房","四合院"] - def villa = ["独栋","双拼","联排","叠加","老式别墅洋房"] - def shopHouse = ["超高层","小高层","多层","高层","独栋","双拼","联排","叠加"] + def house = ["瓒呴珮灞�","灏忛珮灞�","澶氬眰","楂樺眰","鑺卞洯娲嬫埧","鑰佹磱鎴�","鍥涘悎闄�"] + def villa = ["鐙爧","鍙屾嫾","鑱旀帓","鍙犲姞","鑰佸紡鍒娲嬫埧"] + def shopHouse = ["瓒呴珮灞�","灏忛珮灞�","澶氬眰","楂樺眰","鐙爧","鍙屾嫾","鑱旀帓","鍙犲姞"] def useList = null; def buildTypes = [] - if(dist.estateType2=="商住"){ + if(dist.estateType2=="鍟嗕綇"){ useList = shopHouse; - }else if(dist.estateType2 =="别墅"){ + }else if(dist.estateType2 =="鍒"){ useList = villa; }else{ useList = house @@ -780,7 +780,7 @@ class FiledStrand { static def addEstateCompanyToData(dist, updateFile){ def estate_company = null if(dist.estate_company && dist.estate_company.length()<=20){ - estate_company = dist.estate_company.replace(",","").replace(".","").replace("?","").replace("/","").replace("自主物业","").replace("数据","") + estate_company = dist.estate_company.replace(",","").replace(".","").replace("?","").replace("/","").replace("鑷富鐗╀笟","").replace("鏁版嵁","") } if(estate_company!=dist.estate_company){ updateFile.estate_company = estate_company @@ -792,8 +792,8 @@ class FiledStrand { if(estateCharege){ try{ estateCharege = estateCharege.toDouble() - if(estateType2=="普通住宅"){ - if(city=="上海" || city=="北京" || city=="广州" || city=="杭州"){ + if(estateType2=="鏅�氫綇瀹�"){ + if(city=="涓婃捣" || city=="鍖椾含" || city=="骞垮窞" || city=="鏉窞"){ if(estateCharege>=0.3 && estateCharege<=40){ return estateCharege }else{ @@ -806,19 +806,19 @@ class FiledStrand { return null; } } - }else if(estateType2=="别墅"){ + }else if(estateType2=="鍒"){ if(estateCharege>=1){ return estateCharege; }else{ return null; } - }else if(estateType2=="商住"){ + }else if(estateType2=="鍟嗕綇"){ if(estateCharege>=2){ return estateCharege; }else{ return null; } - }else if(estateType2=="写字楼" || estateType2=="office"){ + }else if(estateType2=="鍐欏瓧妤�" || estateType2=="office"){ if(estateCharege>=0.35 && estateCharege<=60){ return estateCharege; }else{ @@ -826,7 +826,7 @@ class FiledStrand { } } }catch (Exception e){ - println "estateCharege 转不了 "+estateCharege + println "estateCharege 杞笉浜� "+estateCharege } } return null; @@ -835,13 +835,13 @@ class FiledStrand { static def processHouseholdCount(def household_count, def estateType2){ if(household_count){ household_count = household_count.toInteger() - if(estateType2=="普通住宅" || estateType2=="商住"){ + if(estateType2=="鏅�氫綇瀹�" || estateType2=="鍟嗕綇"){ if(household_count>=15 && household_count<=100000){ return household_count; }else{ return null; } - }else if(estateType2=="别墅"){ + }else if(estateType2=="鍒"){ if(household_count>=10 && household_count<=100000){ return household_count; }else{ @@ -910,10 +910,10 @@ class FiledStrand { static def processFinishBuildingDate(def finishBuildingDate){ if(finishBuildingDate){ - Pattern pat1 = Pattern.compile("\\d{4}[年\\-\\.]\\d{2}[月\\-\\.]\\d{2}"); + Pattern pat1 = Pattern.compile("\\d{4}[骞碶\-\\.]\\d{2}[鏈圽\-\\.]\\d{2}"); Matcher matcher1 = pat1.matcher(finishBuildingDate); - Pattern pat2 = Pattern.compile("\\d{4}[年\\-\\.]\\d{2}"); + Pattern pat2 = Pattern.compile("\\d{4}[骞碶\-\\.]\\d{2}"); def matcher2 = pat2.matcher(finishBuildingDate); Pattern pat3 = Pattern.compile("\\d{4}"); @@ -921,9 +921,9 @@ class FiledStrand { def dateStr = null if (matcher1.find()) { - dateStr = matcher1.group().replace("年","-").replace("月","-").replace(".","") + dateStr = matcher1.group().replace("骞�","-").replace("鏈�","-").replace(".","") }else if(matcher2.find()){ - dateStr = matcher2.group().replace("年","-").replace(".","-") + dateStr = matcher2.group().replace("骞�","-").replace(".","-") }else if(matcher3.find()){ dateStr = matcher3.group().replace(".","-") } @@ -946,26 +946,26 @@ class FiledStrand { if(["#NA","*"].contains(val)){ return null } - if(val.contains("暂无") || val.contains("暂定")){ + if(val.contains("鏆傛棤") || val.contains("鏆傚畾")){ return null } - if(val.contains("未知") || val.contains("不祥")){ + if(val.contains("鏈煡") || val.contains("涓嶇ゥ")){ return null } - if(val.contains("待定") || val.contains("待详情")){ + if(val.contains("寰呭畾") || val.contains("寰呰鎯�")){ return null } - if(val.contains("尚未公开")){ + if(val.contains("灏氭湭鍏紑")){ return null } - if(val.contains("在线咨询")){ + if(val.contains("鍦ㄧ嚎鍜ㄨ")){ return null } - if(val.contains("平米") || val.contains("元平月")){ + if(val.contains("骞崇背") || val.contains("鍏冨钩鏈�")){ return null } - if(val == "无"){ + if(val == "鏃�"){ return null } if(val == "-"){ @@ -977,7 +977,7 @@ class FiledStrand { if(val.isNumber()){ return null } - def fiterChars = [",",".","?","/","数据",'-','?',' ',' '] + def fiterChars = [",",".","?","/","鏁版嵁",'-','?',' ',' '] for(def s : fiterChars){ val = val.replace(s, '') } @@ -990,11 +990,11 @@ class FiledStrand { return null } - Pattern pattern = Pattern.compile("\\d{4}年"); + Pattern pattern = Pattern.compile("\\d{4}骞�"); if (pattern.matcher(val).matches()) { return null } - return val.replace("*","").replace("*","") + return val.replace("锛�","").replace("*","") } } @@ -1012,7 +1012,7 @@ class FiledStrand { def updateOpenDate(){ def index = 0; - ExcelUtils.modify("D:\\数据\\线上小区数据.xlsx", { row -> + ExcelUtils.modify("D:\\鏁版嵁\\绾夸笂灏忓尯鏁版嵁.xlsx", { row -> def id = row['B'] index++ def finish_building_date = row['I'] diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/FillDistrictFieldValue.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/FillDistrictFieldValue.groovy index 7af4102df..c1e78d533 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/FillDistrictFieldValue.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/FillDistrictFieldValue.groovy @@ -13,9 +13,9 @@ class FillDistrictFieldValue { task.run(); } def run(){ - def rows = ExcelUtils.read("D:\\数据\\新潮上海公司楼盘列表匹配_需入库_补充修正字段-部分重做.xlsx",0,1) - println "共:"+rows.size() - def city = "上海" + def rows = ExcelUtils.read("D:\\鏁版嵁\\鏂版疆涓婃捣鍏徃妤肩洏鍒楄〃鍖归厤_闇�鍏ュ簱_琛ュ厖淇瀛楁-閮ㄥ垎閲嶅仛.xlsx",0,1) + println "鍏憋細"+rows.size() + def city = "涓婃捣" def index = 1; rows.each {row-> // if(row.size()>=25){ @@ -26,15 +26,15 @@ class FillDistrictFieldValue { def loudong_count = row[16] def car_site_count = row[18] def name = row[19] - if(household_count && household_count=="查无"){ + if(household_count && household_count=="鏌ユ棤"){ household_count = null; } - if(loudong_count && loudong_count=="查无"){ + if(loudong_count && loudong_count=="鏌ユ棤"){ loudong_count = null; } - if(car_site_count && car_site_count=="查无"){ + if(car_site_count && car_site_count=="鏌ユ棤"){ car_site_count = null; } @@ -69,10 +69,10 @@ class FillDistrictFieldValue { } }else{ - println "${index} 库中没查到" + println "${index} 搴撲腑娌℃煡鍒�" } }else{ - println "${index} 空值" + println "${index} 绌哄��" } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/FjtBatchEvaluation.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/FjtBatchEvaluation.groovy index 93b3101ff..4dffaaaaf 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/FjtBatchEvaluation.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/FjtBatchEvaluation.groovy @@ -20,13 +20,13 @@ class FjtBatchEvaluation { def run(){ - def datas = ExcelUtils.read("D:\\数据\\个人房地产押品未重估清单1.xlsx", 0, 1) + def datas = ExcelUtils.read("D:\\鏁版嵁\\涓汉鎴垮湴浜ф娂鍝佹湭閲嶄及娓呭崟1.xlsx", 0, 1) for(def data : datas){ createDoc(data); } - // ExcelUtils.write("E:\\数据\\分行营业部押品重估清单(结果).xlsx", datas, "Sheet1") + // ExcelUtils.write("E:\\鏁版嵁\\鍒嗚钀ヤ笟閮ㄦ娂鍝侀噸浼版竻鍗�(缁撴灉).xlsx", datas, "Sheet1") } def createDoc(def data){ @@ -35,7 +35,7 @@ class FjtBatchEvaluation { param.put("\${name}", data['D']) param.put("\${address}", data['G']) param.put("\${area}", data['H']) - def d2 = DateUtils.formatDateByPattern(new Date(), "yyyy年MM月dd日") + def d2 = DateUtils.formatDateByPattern(new Date(), "yyyy骞碝M鏈坉d鏃�") param.put("\${date}", d2) def total = data['E'] @@ -50,12 +50,12 @@ class FjtBatchEvaluation { println CurrencyConverter.toChinese(total.toString()) println CurrencyConverter.toChinese(price.toString()) - def outprintUrl = "D:\\数据\\111.docx" - def lastPath = "D:\\数据\\农行\\"+ data['G']+".docx" + def outprintUrl = "D:\\鏁版嵁\\111.docx" + def lastPath = "D:\\鏁版嵁\\鍐滆\\"+ data['G']+".docx" // createDoc(param, outprintUrl, lastPath); } -// def distMap = matchDistrict("上海", data['C']) +// def distMap = matchDistrict("涓婃捣", data['C']) // if(distMap && distMap.name){ // def pMap = [:] // pMap.put("city", distMap.city); @@ -73,7 +73,7 @@ class FjtBatchEvaluation { // if(date){ // date = date.toString().replace(".","-") // def d1 = DateUtils.parseFromTightYYYYMMDD(date) -// def d2 = DateUtils.formatDateByPattern(d1, "yyyy年MM月dd日") +// def d2 = DateUtils.formatDateByPattern(d1, "yyyy骞碝M鏈坉d鏃�") // param.put("\${date}", d2) // } // @@ -100,7 +100,7 @@ class FjtBatchEvaluation { } def matchDistrict(def city, def address){ - address = address.replace("(","(").replace(")",")").replace(" ","") + address = address.replace("锛�","(").replace("锛�",")").replace(" ","") def url = "http://open.fangjia.com/address/matchV2?city="+city+"&address="+address+"&preciseLevel=strict&token=F54F52381C49BB9EB4A33EB1B65604AE4B71A28AEE53518A94A2F360408B9056D57553931D15CE6DDE765562DAD286BA38E05A4CDAFC51C3D527A4959BF8E75A3B95DB7108FCEA340DDE61925616DB55118E1851E67D83EAD800460D100D6B667A4ED8EE67C8F7FB&category=district" String content = new HttpRequest().get(url, "utf-8"); def rMap = [:] @@ -131,14 +131,14 @@ class FjtBatchEvaluation { params.put("city", city); params.put("district", districtKey.region); params.put("name", districtKey.name); - params.put("size", String.valueOf(dbo.get("建筑面积"))); - params.put("floor", dbo.get("所在楼层").toInteger().toString()); - params.put("maxFloor", dbo.get("总楼层").toInteger().toString()); - params.put("direction", filterDiretion(dbo.get("朝向")).toString()); + params.put("size", String.valueOf(dbo.get("寤虹瓚闈㈢Н"))); + params.put("floor", dbo.get("鎵�鍦ㄦゼ灞�").toInteger().toString()); + params.put("maxFloor", dbo.get("鎬绘ゼ灞�").toInteger().toString()); + params.put("direction", filterDiretion(dbo.get("鏈濆悜")).toString()); def result = getEvaluationResult(params); if(result){ - dbo.put("评估价格", result.totalPrice) - dbo.put("市场单价", result.avgPrice) + dbo.put("璇勪及浠锋牸", result.totalPrice) + dbo.put("甯傚満鍗曚环", result.avgPrice) } } @@ -149,7 +149,7 @@ class FjtBatchEvaluation { return result.getJSONObject("result") } } else if (result.getInt("code") == 500) { - println("小区估价失败:${params.city} ${params.name} ${params.size} ${result}") + println("灏忓尯浼颁环澶辫触:${params.city} ${params.name} ${params.size} ${result}") } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/GaoDeMapCrawl.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/GaoDeMapCrawl.groovy index 4923ea92e..fa3427ec1 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/GaoDeMapCrawl.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/GaoDeMapCrawl.groovy @@ -46,16 +46,16 @@ class GaoDeMapCrawl extends BaseBatch{ def flagLists = [] def index = 0 -// def categorys = ["141202", "141203"]//中学,小学 +// def categorys = ["141202", "141203"]//涓锛屽皬瀛� // def prefix = "district_" -// def categorys = ["120000", "120200","120203","120300","120301","120302","120303","120304"]//住宅相关 +// def categorys = ["120000", "120200","120203","120300","120301","120302","120303","120304"]//浣忓畢鐩稿叧 // def prefix = "road_" -// def categorys = ["190301"]//道路相关 +// def categorys = ["190301"]//閬撹矾鐩稿叧 def prefix = "village_" - def categorys = ["190108","190109"]//村庄 + def categorys = ["190108","190109"]//鏉戝簞 // def prefix = "food_" @@ -84,7 +84,7 @@ class GaoDeMapCrawl extends BaseBatch{ }else{ processing(cityLations) - println "长度:"+updateLists.size() + println "闀垮害锛�"+updateLists.size() if(updateLists.size() > 0){ updateBatch(); } @@ -104,7 +104,7 @@ class GaoDeMapCrawl extends BaseBatch{ count.addAndGet(1) search(location) } catch (Exception e) { - println "异常" + println "寮傚父" e.printStackTrace(); } finally { @@ -119,9 +119,9 @@ class GaoDeMapCrawl extends BaseBatch{ - def run(){//,"西安","重庆" - //def citys = ["上海","重庆","哈尔滨","沈阳","东莞","南昌","昆明","金华","温州","淄博","湛江","肇庆","宜昌","岳阳","安庆","芜湖","西宁","日照","常德","张家口","北京","广州","深圳","重庆","郑州","长沙","西安","成都","东莞","佛山","杭州","合肥","南京","青岛","沈阳","苏州","天津","武汉","珠海","中山","长春","扬州","烟台","徐州","无锡","温州","太原","台州","石家庄","绍兴","厦门","泉州","宁波","南通","南宁","南昌","兰州","常州","大连","福州","贵阳","哈尔滨","海口","惠州","济南","嘉兴","金华","昆明","遵义","淄博","株洲","镇江","肇庆","漳州","湛江","岳阳","银川","宜昌","盐城","芜湖","乌鲁木齐","唐山","泰州","汕头","三亚","清远","秦皇岛","马鞍山","洛阳","柳州","连云港","廊坊","九江","吉林","淮安","湖州","呼和浩特","沧州","保定","安庆","张家口","西宁","日照","拉萨","锦州","大同","常德","北海","文昌","陵水","保亭"] - def citys = ["上海","南京","苏州","无锡","扬州","常州","徐州","镇江","南通","泰州","连云港","盐城","淮安","宿迁","杭州","宁波","温州","嘉兴","台州","湖州","绍兴","金华","舟山","衢州","丽水"] + def run(){//,"瑗垮畨","閲嶅簡" + //def citys = ["涓婃捣","閲嶅簡","鍝堝皵婊�","娌堥槼","涓滆帪","鍗楁槍","鏄嗘槑","閲戝崕","娓╁窞","娣勫崥","婀涙睙","鑲囧簡","瀹滄槍","宀抽槼","瀹夊簡","鑺滄箹","瑗垮畞","鏃ョ収","甯稿痉","寮犲鍙�","鍖椾含","骞垮窞","娣卞湷","閲嶅簡","閮戝窞","闀挎矙","瑗垮畨","鎴愰兘","涓滆帪","浣涘北","鏉窞","鍚堣偉","鍗椾含","闈掑矝","娌堥槼","鑻忓窞","澶╂触","姝︽眽","鐝犳捣","涓北","闀挎槬","鎵窞","鐑熷彴","寰愬窞","鏃犻敗","娓╁窞","澶師","鍙板窞","鐭冲搴�","缁嶅叴","鍘﹂棬","娉夊窞","瀹佹尝","鍗楅��","鍗楀畞","鍗楁槍","鍏板窞","甯稿窞","澶ц繛","绂忓窞","璐甸槼","鍝堝皵婊�","娴峰彛","鎯犲窞","娴庡崡","鍢夊叴","閲戝崕","鏄嗘槑","閬典箟","娣勫崥","鏍床","闀囨睙","鑲囧簡","婕冲窞","婀涙睙","宀抽槼","閾跺窛","瀹滄槍","鐩愬煄","鑺滄箹","涔岄瞾鏈ㄩ綈","鍞愬北","娉板窞","姹曞ご","涓変簹","娓呰繙","绉︾殗宀�","椹瀺灞�","娲涢槼","鏌冲窞","杩炰簯娓�","寤婂潑","涔濇睙","鍚夋灄","娣畨","婀栧窞","鍛煎拰娴╃壒","娌у窞","淇濆畾","瀹夊簡","寮犲鍙�","瑗垮畞","鏃ョ収","鎷夎惃","閿﹀窞","澶у悓","甯稿痉","鍖楁捣","鏂囨槍","闄垫按","淇濅涵"] + def citys = ["涓婃捣","鍗椾含","鑻忓窞","鏃犻敗","鎵窞","甯稿窞","寰愬窞","闀囨睙","鍗楅��","娉板窞","杩炰簯娓�","鐩愬煄","娣畨","瀹胯縼","鏉窞","瀹佹尝","娓╁窞","鍢夊叴","鍙板窞","婀栧窞","缁嶅叴","閲戝崕","鑸熷北","琛㈠窞","涓芥按"] def allcitys = CommonUtils.findAllCity() def totalCount = 0; for(def city : allcitys){ @@ -133,7 +133,7 @@ class GaoDeMapCrawl extends BaseBatch{ if(!cityLations){ stop = true; }else{ - println "开始处理["+city +"]:"+cityLations.size() + println "寮�濮嬪鐞哰"+city +"]锛�"+cityLations.size() gaoDeCitySearch(cityLations); } } @@ -148,7 +148,7 @@ class GaoDeMapCrawl extends BaseBatch{ q.put("city", city) } q.put(prefix+"status", new BasicDBObject(QueryOperators.EXISTS, false)) -// q.put("status", "失败") +// q.put("status", "澶辫触") // q.put("traffic_status", new BasicDBObject(QueryOperators.EXISTS, false)) def dbcursor = BOUNDS_COLL.find(q).batchSize(3000).addOption(Bytes.QUERYOPTION_NOTIMEOUT) def results = [] @@ -180,16 +180,16 @@ class GaoDeMapCrawl extends BaseBatch{ // latch.await() if(updateLists.size() > 0){ - println " 正常访问共:"+updateLists.size() + println " 姝e父璁块棶鍏憋細"+updateLists.size() updateBatch(); } if(updateErrorLists.size() > 0){ - println " 失败访问共:"+updateErrorLists.size() + println " 澶辫触璁块棶鍏憋細"+updateErrorLists.size() updateErrorBatch(); } if(flagLists.size()>0){ - println "有数据的格子共:"+flagLists.size() + println "鏈夋暟鎹殑鏍煎瓙鍏憋細"+flagLists.size() updateFlagBath(); } } @@ -207,16 +207,16 @@ class GaoDeMapCrawl extends BaseBatch{ // } if(updateLists.size() > 0 && updateLists.size()>1000){ - println " 正常访问共:"+updateLists.size() + println " 姝e父璁块棶鍏憋細"+updateLists.size() updateBatch(); } if(updateErrorLists.size() > 0 && updateErrorLists.size()>1000){ - println " 失败访问共:"+updateErrorLists.size() + println " 澶辫触璁块棶鍏憋細"+updateErrorLists.size() updateErrorBatch(); } if(flagLists.size()>0 && flagLists.size()>1000){ - println "有数据的格子共:"+flagLists.size() + println "鏈夋暟鎹殑鏍煎瓙鍏憋細"+flagLists.size() updateFlagBath(); } } @@ -234,7 +234,7 @@ class GaoDeMapCrawl extends BaseBatch{ def map3 = ["lat":lats[1], "lng":lngs[1]] def map4 = ["lat":lats[1], "lng" : lngs[0]] def locations = [map1, map2, map3, map4, map1] -// def rets = GaoDeUtils.polygon_json(locations, ["商务住宅", "住宅区", "住宅小区"], "建设中", 1) +// def rets = GaoDeUtils.polygon_json(locations, ["鍟嗗姟浣忓畢", "浣忓畢鍖�", "浣忓畢灏忓尯"], "寤鸿涓�", 1) // def m = GaoDeUtils.polygon_json(locations, ["110101","110105","150500","150600","150702","050100","050101","050102","050103","050104","050105","050106","050107","050108","050109","050110","050111","050112","050113","050114","050115","050116","050117","050118","050119","050120","050121","050122","050123","050200","050201","050202","050203","050204","050205","050206","050207","050208","050209","050210","050211","050212","050213","050214","050215","050216","050217","050300","050301","050302","050303","050304","050305","050306","050307","050308","050309","050310","050311","060100","060101","060102","060400","060401","060402","060403","060404","060405","060406","060407","060408","060409","060411","060413","060414","060415"], null, 1) // def m = GaoDeUtils.polygon_json(locations, ["150700"], "", 1) // def m = GaoDeUtils.polygon_json(locations, ["120000","120100","120200","120201","120202","120203","120300","120301","120302","120303","120304"], null, 1) @@ -283,7 +283,7 @@ class GaoDeMapCrawl extends BaseBatch{ map.org_cityname = ret.cityname map.adname = RegionData.formatRegion(city, ret.adname) map.org_address = ret.address - map.name =ret.name.replace("(建设中)","") + map.name =ret.name.replace("(寤鸿涓�)","") def location = ret.location if(location){ @@ -294,7 +294,7 @@ class GaoDeMapCrawl extends BaseBatch{ map.id = ret.id map.org_name = ret.name map.org_adname = ret.adname - map.source = "高德" + map.source = "楂樺痉" def newUrl = targetUrl +"/"+ret.id httpSaveData(newUrl, map) @@ -343,7 +343,7 @@ class GaoDeMapCrawl extends BaseBatch{ conn.connect(); //println param.toString() - //输出流 + //杈撳嚭娴� if (StringUtils.isNotEmpty(param)) { mWriter = new BufferedWriter(new OutputStreamWriter(conn.getOutputStream(), charset)); mWriter.write(param); @@ -369,7 +369,7 @@ class GaoDeMapCrawl extends BaseBatch{ def update(location){ def udata = new BasicDBObject(); - udata.put("status","完成") + udata.put("status","瀹屾垚") BOUNDS_COLL.update(new BasicDBObject('_id', location._id), new BasicDBObject('$set', udata), true, false) } @@ -382,7 +382,7 @@ class GaoDeMapCrawl extends BaseBatch{ for(def location : updateLists){ if(location && location._id){ Document updateDocument = new Document(); - def doc = new Document(prefix+"status","完成").append("m_date", new Date()).append("content", location.content) + def doc = new Document(prefix+"status","瀹屾垚").append("m_date", new Date()).append("content", location.content) updateDocument.append('$set', doc); Bson updateBson = Filters.eq("_id", location._id); UpdateOneModel updateOneModel = new UpdateOneModel(updateBson, updateDocument); @@ -392,7 +392,7 @@ class GaoDeMapCrawl extends BaseBatch{ try{ COLL.bulkWrite(writeModelList) }catch (Exception e){ - println "异常" + println "寮傚父" } updateLists = [] } @@ -414,7 +414,7 @@ class GaoDeMapCrawl extends BaseBatch{ try{ COLL.bulkWrite(writeModelList) }catch (Exception e){ - println "异常" + println "寮傚父" } flagLists = [] } @@ -428,7 +428,7 @@ class GaoDeMapCrawl extends BaseBatch{ for(def location : updateErrorLists){ if(location && location._id){ Document updateDocument = new Document(); - def doc = new Document(prefix+"status","失败").append("m_date", new Date()).append("content", location.content) + def doc = new Document(prefix+"status","澶辫触").append("m_date", new Date()).append("content", location.content) updateDocument.append('$set', doc); Bson updateBson = Filters.eq("_id", location._id); UpdateOneModel updateOneModel = new UpdateOneModel(updateBson, updateDocument); @@ -438,7 +438,7 @@ class GaoDeMapCrawl extends BaseBatch{ try{ COLL.bulkWrite(writeModelList) }catch (Exception e){ - println "异常" + println "寮傚父" } updateErrorLists = [] } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/GaoDeMapCrawlOffice.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/GaoDeMapCrawlOffice.groovy index af8b0ce1b..bb26f9b2a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/GaoDeMapCrawlOffice.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/GaoDeMapCrawlOffice.groovy @@ -36,8 +36,8 @@ class GaoDeMapCrawlOffice { static main(args) { def task = new GaoDeMapCrawlOffice(); -// task.run(["办公楼", "写字楼", "创意园"], "写字楼") - task.run(["公司企业", "知名企业", "公司"], "公司企业") +// task.run(["鍔炲叕妤�", "鍐欏瓧妤�", "鍒涙剰鍥�"], "鍐欏瓧妤�") + task.run(["鍏徃浼佷笟", "鐭ュ悕浼佷笟", "鍏徃"], "鍏徃浼佷笟") } def allRun(){ @@ -51,7 +51,7 @@ class GaoDeMapCrawlOffice { }else{ processing(cityLations) - println "长度:"+updateLists.size() + println "闀垮害锛�"+updateLists.size() if(updateLists.size() > 0){ updateBatch(); } @@ -71,7 +71,7 @@ class GaoDeMapCrawlOffice { count.addAndGet(1) search(location) } catch (Exception e) { - println "异常" + println "寮傚父" e.printStackTrace(); } finally { @@ -87,7 +87,7 @@ class GaoDeMapCrawlOffice { def run(List types, String keyword){ - def citys = ["上海"] + def citys = ["涓婃捣"] for(def city : citys){ def cityLations = findAllLation(city); @@ -209,7 +209,7 @@ class GaoDeMapCrawlOffice { conn.connect(); println param.toString() - //输出流 + //杈撳嚭娴� if (StringUtils.isNotEmpty(param)) { mWriter = new BufferedWriter(new OutputStreamWriter(conn.getOutputStream(), charset)); mWriter.write(param); @@ -235,7 +235,7 @@ class GaoDeMapCrawlOffice { def update(location){ def udata = new BasicDBObject(); - udata.put("status","完成") + udata.put("status","瀹屾垚") BOUNDS_COLL.update(new BasicDBObject('_id', location._id), new BasicDBObject('$set', udata), true, false) } @@ -248,7 +248,7 @@ class GaoDeMapCrawlOffice { for(def location : updateLists){ if(location && location._id){ Document updateDocument = new Document(); - def doc = new Document("status","完成").append("m_date", new Date()) + def doc = new Document("status","瀹屾垚").append("m_date", new Date()) updateDocument.append('$set', doc); Bson updateBson = Filters.eq("_id", location._id); UpdateOneModel updateOneModel = new UpdateOneModel(updateBson, updateDocument); @@ -258,7 +258,7 @@ class GaoDeMapCrawlOffice { try{ COLL.bulkWrite(writeModelList) }catch (Exception e){ - println "异常" + println "寮傚父" } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/GreenBuild.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/GreenBuild.groovy index e66933e4d..7d3abb3d9 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/GreenBuild.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/GreenBuild.groovy @@ -26,7 +26,7 @@ class GreenBuild { def run(){ def datas = findAll() def rets = match(datas) - ExcelUtils.write("D:\\数据\\绿色建筑\\绿色建筑匹配住宅.xlsx", rets, "匹配结果") + ExcelUtils.write("D:\\鏁版嵁\\缁胯壊寤虹瓚\\缁胯壊寤虹瓚鍖归厤浣忓畢.xlsx", rets, "鍖归厤缁撴灉") } def match(datas){ @@ -35,7 +35,7 @@ class GreenBuild { def totalCount = new AtomicLong() final CountDownLatch latch = new CountDownLatch(datas.size()) - rets << ["ID", "城市","区域", "名称", "匹配ID", "匹配城市" , "匹配区域" ,"匹配名称"] + rets << ["ID", "鍩庡競","鍖哄煙", "鍚嶇О", "鍖归厤ID", "鍖归厤鍩庡競" , "鍖归厤鍖哄煙" ,"鍖归厤鍚嶇О"] for(def i=0;i def date = data['A'] @@ -94,7 +94,7 @@ def getCityByAddress(def address){ return null; } -//获取经纬度信息 +//鑾峰彇缁忕含搴︿俊鎭� def getLocation(def address){ def locationMap = [:]; def resp = BaiDuApiUtils.geocoder(null, address); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/HouseLouDongMatchBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/HouseLouDongMatchBatch.groovy index a337263f9..c309ff718 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/HouseLouDongMatchBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/HouseLouDongMatchBatch.groovy @@ -41,7 +41,7 @@ class HouseLouDongMatch { stop = true; }else{ processing(datas) - println "长度:"+updateLists.size() + println "闀垮害锛�"+updateLists.size() if(updateLists.size() > 0){ updateLouDong(); } @@ -58,7 +58,7 @@ class HouseLouDongMatch { keys.put("_id",1) keys.put("match_name",1) def rets = [] - def q = new BasicDBObject("city","上海") + def q = new BasicDBObject("city","涓婃捣") q.put("match_name", new BasicDBObject(QueryOperators.EXISTS, false)); q.put("m_date", new BasicDBObject(QueryOperators.LT, DateUtils.parseFromTightYYYYMMDD("2019-09-02"))) def results = LOUDONG_COLL.find(q, keys).addOption(Bytes.QUERYOPTION_NOTIMEOUT).limit(2000).asList(); @@ -81,7 +81,7 @@ class HouseLouDongMatch { } } catch (Exception e) { - println "异常" + println "寮傚父" e.printStackTrace(); } finally { latch.countDown() @@ -155,7 +155,7 @@ class HouseLouDongMatch { UpdateOneModel updateOneModel = new UpdateOneModel(updateBson, updateDocument); writeModelList.add(updateOneModel) }else{ - println "怎么来的?" + println "鎬庝箞鏉ョ殑锛�" } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/LandDetailCrawl.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/LandDetailCrawl.groovy index e153f90b6..67e70fdf2 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/LandDetailCrawl.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/LandDetailCrawl.groovy @@ -65,7 +65,7 @@ class LandDetailCrawl { } def updateData(){ - def datas = ExcelUtils.read("D:\\数据\\土地\\土地-21-06.xlsx",0, 1) + def datas = ExcelUtils.read("D:\\鏁版嵁\\鍦熷湴\\鍦熷湴-21-06.xlsx",0, 1) if(datas && datas.size()>0){ for(def data : datas){ def id = data['A'] @@ -76,18 +76,18 @@ class LandDetailCrawl { if(area){ upMap.area = area.toString().toDouble() } - upMap.volumetricRate = data['J']//(容积率) - def compete_price_date = data['K']//(成交日期) + upMap.volumetricRate = data['J']//(瀹圭Н鐜�) + def compete_price_date = data['K']//锛堟垚浜ゆ棩鏈燂級 if(compete_price_date){ upMap.compete_price_date = compete_price_date upMap.entryTime = upMap.compete_price_date upMap.addTime = upMap.compete_price_date } - def architectureArea = data['O']//(规划建筑面积)㎡ + def architectureArea = data['O']//(瑙勫垝寤虹瓚闈㈢Н)銕� if(architectureArea){ upMap.architectureArea = architectureArea.toString().toDouble() } - def totalPrice = data['S']//(成交价)万元 + def totalPrice = data['S']//(鎴愪氦浠�)涓囧厓 if(totalPrice){ upMap.totalPrice = totalPrice.toString().toDouble() if(upMap.totalPrice && upMap.area){ @@ -95,11 +95,11 @@ class LandDetailCrawl { } } - def startprice = data['U']//(起始价)万元 + def startprice = data['U']//锛堣捣濮嬩环锛変竾鍏� if(startprice){ upMap.startprice = startprice.toString().toDouble() } - def startFloorPrice = data['V']//(楼面地价)元/㎡ + def startFloorPrice = data['V']//锛堟ゼ闈㈠湴浠凤級鍏�/銕� if(startFloorPrice){ upMap.startFloorPrice = startFloorPrice.toString().toDouble() } @@ -131,7 +131,7 @@ class LandDetailCrawl { detail.area = o.area detail.address = o.parcelName detail.contractNumber = o.landPlotID - detail.source = "搜房" + detail.source = "鎼滄埧" detail.landUser = o.competer detail.volumetricRate = o.volumeRate detail.compete_price_date = o.tradeTime @@ -158,43 +158,43 @@ class LandDetailCrawl { def uses = [] if(s){ - if(s.contains("租赁住房")){ - uses << "租赁住房" - }else if(s.contains("动迁安置房")){ - uses << "动迁安置房" - }else if(s.contains("住宿餐饮")){ - uses << "住宿餐饮" - }else if(s.contains("科研设计")){ - uses << "科研设计" - }else if(s.contains("文体娱乐")){ - uses << "文体娱乐" - }else if(s.contains("医卫慈善")){ - uses << "医卫慈善" - }else if(s.contains("公共设施")){ - uses << "公共设施" - }else if(s.contains("加油站")){ - uses << "加油站" - }else if(s.contains("港口码头")){ - uses << "港口码头" - }else if(s.contains("停车场")){ - uses << "停车场" - }else if(s.contains("办公")){ - uses << "办公" - }else if(s.contains("商业")){ - uses << "商业" - }else if(s.contains("教育")){ - uses << "教育" - }else if(s.contains("工业")){ - uses << "工业" - }else if(s.contains("仓储")){ - uses << "仓储" - }else if(s.contains("住宅")){ - uses << "住宅" - }else if(s.contains("综合")){ - uses << "综合" + if(s.contains("绉熻祦浣忔埧")){ + uses << "绉熻祦浣忔埧" + }else if(s.contains("鍔ㄨ縼瀹夌疆鎴�")){ + uses << "鍔ㄨ縼瀹夌疆鎴�" + }else if(s.contains("浣忓椁愰ギ")){ + uses << "浣忓椁愰ギ" + }else if(s.contains("绉戠爺璁捐")){ + uses << "绉戠爺璁捐" + }else if(s.contains("鏂囦綋濞变箰")){ + uses << "鏂囦綋濞变箰" + }else if(s.contains("鍖诲崼鎱堝杽")){ + uses << "鍖诲崼鎱堝杽" + }else if(s.contains("鍏叡璁炬柦")){ + uses << "鍏叡璁炬柦" + }else if(s.contains("鍔犳补绔�")){ + uses << "鍔犳补绔�" + }else if(s.contains("娓彛鐮佸ご")){ + uses << "娓彛鐮佸ご" + }else if(s.contains("鍋滆溅鍦�")){ + uses << "鍋滆溅鍦�" + }else if(s.contains("鍔炲叕")){ + uses << "鍔炲叕" + }else if(s.contains("鍟嗕笟")){ + uses << "鍟嗕笟" + }else if(s.contains("鏁欒偛")){ + uses << "鏁欒偛" + }else if(s.contains("宸ヤ笟")){ + uses << "宸ヤ笟" + }else if(s.contains("浠撳偍")){ + uses << "浠撳偍" + }else if(s.contains("浣忓畢")){ + uses << "浣忓畢" + }else if(s.contains("缁煎悎")){ + uses << "缁煎悎" } }else{ - uses << "其它" + uses << "鍏跺畠" } return uses } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/LianjiaPriceCrawler.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/LianjiaPriceCrawler.groovy index 0434283e3..5bdd45b5c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/LianjiaPriceCrawler.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/LianjiaPriceCrawler.groovy @@ -27,7 +27,7 @@ import org.jsoup.nodes.Element import org.jsoup.select.Elements /** - * 抓取链接均价 + * 鎶撳彇閾炬帴鍧囦环 * Created by gaojuan on 2017/9/1. */ @BatchOwner(Watcher.GaoJuan) @@ -37,7 +37,7 @@ class LianjiaPriceCrawler extends BaseBatch{ public static final SHORT_DATE = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM")); public static final DBCollection MAPPING_URL_COLL = MongoUtils.getCollectionByName("fangjia", "mapping_url", "mongo.db.fangjia.com") - //种子库 + //绉嶅瓙搴� public static final DBCollection SEED_COLL = MongoUtils.getCollectionByName("artemis", "seed", "artemis.db.fangjia.com", 27017) public static final DBCollection CRAWL_COLL = MongoUtils.getCollectionByName("artemis", "metadata", "metadata.mongo.db.fangjia.com", 55007) @@ -55,13 +55,13 @@ class LianjiaPriceCrawler extends BaseBatch{ @Override public void process(Object args) { - //发现新链接添加种子 + //鍙戠幇鏂伴摼鎺ユ坊鍔犵瀛� addNewSeeds(); - //启动抓取任务 + //鍚姩鎶撳彇浠诲姟 startJobs(); - //检查任务是否完成 + //妫�鏌ヤ换鍔℃槸鍚﹀畬鎴� moniterJobs(); - //如果完成解析网页 + //濡傛灉瀹屾垚瑙f瀽缃戦〉 analyWebpage(); } @@ -84,8 +84,8 @@ class LianjiaPriceCrawler extends BaseBatch{ String content = data.get('content'); def resultMap = doAnalyzerWebpage(city, url, content) if(resultMap && resultMap.avgPrice != null && resultMap.avgPrice > 1000 && resultMap.avgPrice < 300000) { - if(resultMap.name.contains("(")){ - resultMap.name = resultMap.name.replace("(","(").replace(")",")"); + if(resultMap.name.contains("锛�")){ + resultMap.name = resultMap.name.replace("锛�","(").replace("锛�",")"); } def dist = CommonDatautils.findDistrict(resultMap.city, resultMap.region, resultMap.name, CATEGORY) ; if(!dist){ @@ -108,7 +108,7 @@ class LianjiaPriceCrawler extends BaseBatch{ } } - //删除metadata + //鍒犻櫎metadata CRAWL_COLL.remove(new BasicDBObject('_id', new BasicDBObject('$in', metadataIdList))) metadataIdList.clear(); } @@ -143,7 +143,7 @@ class LianjiaPriceCrawler extends BaseBatch{ if(regionStr){ def array = regionStr.split(">") if(array.length==5){ - region = array[2].replace("小区","") + region = array[2].replace("灏忓尯","") } } } @@ -175,22 +175,22 @@ class LianjiaPriceCrawler extends BaseBatch{ } /** - * 启动任务 - * 0-无 1-运行中 2-完成 3-暂停 + * 鍚姩浠诲姟 + * 0-鏃� 1-杩愯涓� 2-瀹屾垚 3-鏆傚仠 */ public void startJobs() { - //判断是否任务正在运行 + //鍒ゆ柇鏄惁浠诲姟姝e湪杩愯 if(getArtemisJobState(LIANJIA_JOBID) != 1) { - //停止任务 + //鍋滄浠诲姟 stopArtemisJob(LIANJIA_JOBID) sleep(3*1000) - //清理任务 + //娓呯悊浠诲姟 cleanArtemisJobData(LIANJIA_JOBID); sleep(3*1000) - //开始任务 + //寮�濮嬩换鍔� startArtemisJob(LIANJIA_JOBID); }else { - println DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) + " " + LIANJIA_JOBID + "\t抓取任务已启动" + println DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) + " " + LIANJIA_JOBID + "\t鎶撳彇浠诲姟宸插惎鍔�" } JOB_STATUS = 1 sleep(10*1000) @@ -198,8 +198,8 @@ class LianjiaPriceCrawler extends BaseBatch{ /** - * 获取抓取任务的状态 - * 1-运行中 2-完成或停止 3-暂停 + * 鑾峰彇鎶撳彇浠诲姟鐨勭姸鎬� + * 1-杩愯涓� 2-瀹屾垚鎴栧仠姝� 3-鏆傚仠 * @param jobId * @return */ @@ -259,24 +259,24 @@ class LianjiaPriceCrawler extends BaseBatch{ /** - * 检查任务 + * 妫�鏌ヤ换鍔� */ public void moniterJobs() { - //检查任务是否运行完成 + //妫�鏌ヤ换鍔℃槸鍚﹁繍琛屽畬鎴� while(true) { if(getArtemisJobState(LIANJIA_JOBID) == 2) { JOB_STATUS = 2 - println DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) + " " + JOB_STATUS + "\t抓取任务已完成" + println DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) + " " + JOB_STATUS + "\t鎶撳彇浠诲姟宸插畬鎴�" break; } - //每5分钟检查一次 + //姣�5鍒嗛挓妫�鏌ヤ竴娆� sleep(5 * 60 * 1000) } } def addNewSeeds(){ - def allCity = ["北京"]//CommonUtils.findAllCity(); + def allCity = ["鍖椾含"]//CommonUtils.findAllCity(); for(def city : allCity){ def urls = findAllSeeds(city); if(urls){ @@ -304,7 +304,7 @@ class LianjiaPriceCrawler extends BaseBatch{ def urls = [] for(def dbo : dbcursor){ if(dbo.lianjia_esf && dbo.lianjia_esf.contains("lianjia.com")){ - if(city!="上海"){ + if(city!="涓婃捣"){ urls << dbo.lianjia_esf.replace("http","https"); } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/LocationSearch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/LocationSearch.groovy index 4f0d984f2..19320a76e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/LocationSearch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/LocationSearch.groovy @@ -11,9 +11,9 @@ class LocationSearch { } def run(){ - def path = "D:\\数据\\poi数据\\商圈数据(0719).xlsx" + def path = "D:\\鏁版嵁\\poi鏁版嵁\\鍟嗗湀鏁版嵁(0719).xlsx" def index = 0 - def city = "重庆" + def city = "閲嶅簡" def region = null ExcelUtils.modify(path, { row -> index ++ @@ -22,7 +22,7 @@ class LocationSearch { if(!matchName){ name = name.toString().trim() if(name){ - def gdData = FangjiaClientUtils.getMapData(city, null, name, null,"", "高德") + def gdData = FangjiaClientUtils.getMapData(city, null, name, null,"", "楂樺痉") if(gdData){ row['F'] = gdData.name row['G'] = gdData.address @@ -38,7 +38,7 @@ class LocationSearch { // } // -// def gdData = FangjiaClientUtils.getMapData(city, region, name, null,"", "高德") +// def gdData = FangjiaClientUtils.getMapData(city, region, name, null,"", "楂樺痉") // if(gdData){ // row['F'] = gdData.name // row['G'] = gdData.address diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/LocationSearchDistrict.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/LocationSearchDistrict.groovy index b7d9f0d98..ced10ad8f 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/LocationSearchDistrict.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/LocationSearchDistrict.groovy @@ -14,7 +14,7 @@ class LocationSearchDistrict { def run(){ def index = 0 - ExcelUtils.modify("D:\\数据\\北京车联天下芜湖家位置2.xlsx", { row -> + ExcelUtils.modify("D:\\鏁版嵁\\鍖椾含杞﹁仈澶╀笅鑺滄箹瀹朵綅缃�2.xlsx", { row -> def lng = row[1] def lat = row[2] index++ @@ -46,32 +46,32 @@ class LocationSearchDistrict { def s = jsonObj.regeocode if(s && s.formatted_address){ def addr = s.formatted_address - if(addr && addr.contains("省") && addr.contains("市")){ - def province = addr.substring(0, addr.indexOf("省")) - def city = addr.substring(addr.indexOf("省")+1, addr.indexOf("市")) + if(addr && addr.contains("鐪�") && addr.contains("甯�")){ + def province = addr.substring(0, addr.indexOf("鐪�")) + def city = addr.substring(addr.indexOf("鐪�")+1, addr.indexOf("甯�")) def ret = [:] ret.city = city ret.province = province return ret; - }else if(addr && addr.contains("省")){ - def province = addr.substring(0, addr.indexOf("省")) - if(addr.contains("州")){ - def city = addr.substring(addr.indexOf("省")+1, addr.indexOf("省")+3) + }else if(addr && addr.contains("鐪�")){ + def province = addr.substring(0, addr.indexOf("鐪�")) + if(addr.contains("宸�")){ + def city = addr.substring(addr.indexOf("鐪�")+1, addr.indexOf("鐪�")+3) def ret = [:] ret.city = city ret.province = province return ret; } - }else if(addr && !addr.contains("省") && addr.contains("市")){ - def province = addr.substring(0, addr.indexOf("市")) + }else if(addr && !addr.contains("鐪�") && addr.contains("甯�")){ + def province = addr.substring(0, addr.indexOf("甯�")) def ret = [:] ret.city = province ret.province = province return ret; - }else if(addr && addr.contains("新疆")){ + }else if(addr && addr.contains("鏂扮枂")){ def ret = [:] - ret.province = "新疆" - ret.city = "石河子" + ret.province = "鏂扮枂" + ret.city = "鐭虫渤瀛�" } } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/LogStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/LogStat.groovy index b99f162e1..b36f6a206 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/LogStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/LogStat.groovy @@ -26,8 +26,8 @@ class LogStat { } def run1(){ - ExcelUtils.modify("C:\\Users\\gaojuan\\Desktop\\案例信息-待反馈评估过程_V2(无颜色).xls", { d -> - def city = d['C'].replace("市","") + ExcelUtils.modify("C:\\Users\\gaojuan\\Desktop\\妗堜緥淇℃伅-寰呭弽棣堣瘎浼拌繃绋媉V2锛堟棤棰滆壊锛�.xls", { d -> + def city = d['C'].replace("甯�","") def district = CommonDatautils.findDistrict(city, d['AA'], d['AB'], "district") if(!district){ println "sss" @@ -86,7 +86,7 @@ class LogStat { } def run(){ - ExcelUtils.multiThreadingModify("C:\\Users\\gaojuan\\Desktop\\案例信息-待反馈评估过程_V2(无颜色).xls",{ d -> + ExcelUtils.multiThreadingModify("C:\\Users\\gaojuan\\Desktop\\妗堜緥淇℃伅-寰呭弽棣堣瘎浼拌繃绋媉V2锛堟棤棰滆壊锛�.xls",{ d -> // def calDate = DateUtil.parseDate(d['M'], "yyyy-MM-dd") // def weekend = DateUtils.getFirstDayOfWeek(calDate) // def dbo = CommonDatautils.queryDistrictPrice(d['N'], d['O'], d['P'], weekend) @@ -95,7 +95,7 @@ class LogStat { // } if(d['AA'] && d['AB'] && d['AH']){ - def city = d['C'].replace("市","") + def city = d['C'].replace("甯�","") def district = CommonDatautils.findDistrict(city, d['AA'], d['AB'], "district") if(district){ @@ -156,7 +156,7 @@ class LogStat { def q = new BasicDBObject() q.put("city", dist.city) q.put("region", dist.region) - q.put("source", "链家在线") + q.put("source", "閾惧鍦ㄧ嚎") def alias = [] if(dist.alias){ @@ -217,8 +217,8 @@ class LogStat { /** - * 转义字符串中的特殊字符 - * 仅过滤Lucene regexps, 其他的勿用 + * 杞箟瀛楃涓蹭腑鐨勭壒娈婂瓧绗� + * 浠呰繃婊ucene regexps, 鍏朵粬鐨勫嬁鐢� * @param keyword * @return */ @@ -236,7 +236,7 @@ class LogStat { // keys.put("res_map",1) // def cursor = LOG.find(q) // def count = 0 -// println "总量:"+cursor.count() +// println "鎬婚噺锛�"+cursor.count() // def datas = [] // for(def d : cursor){ // if(d && d.code==200 && d.res_map && d.res_map.code==200){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/MargerExcel.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/MargerExcel.groovy index 01217b2db..91c600cb7 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/MargerExcel.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/MargerExcel.groovy @@ -11,14 +11,14 @@ class MargerExcel{ def run(){ - def data1 = ExcelUtils.read("D:\\数据\\结果\\合同类V03--人工.xlsx"); + def data1 = ExcelUtils.read("D:\\鏁版嵁\\缁撴灉\\鍚堝悓绫籚03--浜哄伐.xlsx"); println data1.size() def addressMap = createMapData(data1); println addressMap.size(); - def data2 = ExcelUtils.read("D:\\数据\\原数据\\押品类V03-2.xlsx"); + def data2 = ExcelUtils.read("D:\\鏁版嵁\\鍘熸暟鎹甛\鎶煎搧绫籚03-2.xlsx"); println data2.size() def index = 0; for(def data : data2){ @@ -28,47 +28,47 @@ class MargerExcel{ if(row){ index++; println "[${index}] "+address - //抵押物所在地区 + //鎶垫娂鐗╂墍鍦ㄥ湴鍖� data[13] = row[9]; - //抵押物所在地区名称 + //鎶垫娂鐗╂墍鍦ㄥ湴鍖哄悕绉� data[14] = row[10]; - //城市 + //鍩庡競 data[15] = row[11]; - //省 + //鐪� data[16] = row[12]; - //市 + //甯� data[17] = row[13]; - //区 + //鍖� data[18] = row[14]; - //乡镇 + //涔¢晣 data[19] = row[15]; - //道路 + //閬撹矾 data[20] = row[16]; - //小区名 + //灏忓尯鍚� data[21] = row[17]; - //楼栋 + //妤兼爧 data[22] = row[18]; - //单元 + //鍗曞厓 data[23] = row[19]; - //室号 + //瀹ゅ彿 data[24] = row[20]; - //楼层 + //妤煎眰 data[25] = row[21]; - //地址完整性级别 + //鍦板潃瀹屾暣鎬х骇鍒� data[26] = row[22]; - //补充字段 + //琛ュ厖瀛楁 data[27] = row[23]; - //总价 + //鎬讳环 data[28] = row[24]; - //类型 + //绫诲瀷 data[29] = row[25]; } } def ret = [] - ret << ["ID","抵质押物类型编码"," 抵质押物类型"," 房产类型编码"," 房产类型","房屋详细地址","建筑面积"," 土地性质编码","土地性质","土地用途编码","土地用途","房屋装修情况编码","房屋装修情况","抵押物所在地区","抵押物所在地区名称","城市","省","市","区","乡镇","道路","小区名","楼栋","单元","室号","楼层","地址完整性级别","补充字段","总价","类型"] + ret << ["ID","鎶佃川鎶肩墿绫诲瀷缂栫爜"," 鎶佃川鎶肩墿绫诲瀷"," 鎴夸骇绫诲瀷缂栫爜"," 鎴夸骇绫诲瀷","鎴垮眿璇︾粏鍦板潃","寤虹瓚闈㈢Н"," 鍦熷湴鎬ц川缂栫爜","鍦熷湴鎬ц川","鍦熷湴鐢ㄩ�旂紪鐮�","鍦熷湴鐢ㄩ��","鎴垮眿瑁呬慨鎯呭喌缂栫爜","鎴垮眿瑁呬慨鎯呭喌","鎶垫娂鐗╂墍鍦ㄥ湴鍖�","鎶垫娂鐗╂墍鍦ㄥ湴鍖哄悕绉�","鍩庡競","鐪�","甯�","鍖�","涔¢晣","閬撹矾","灏忓尯鍚�","妤兼爧","鍗曞厓","瀹ゅ彿","妤煎眰","鍦板潃瀹屾暣鎬х骇鍒�","琛ュ厖瀛楁","鎬讳环","绫诲瀷"] ret.addAll(data2) - ExcelUtils.write("d:\\数据\\结果\\押品类V03-2.xlsx", ret, "Sheet1") + ExcelUtils.write("d:\\鏁版嵁\\缁撴灉\\鎶煎搧绫籚03-2.xlsx", ret, "Sheet1") } def createMapData(datas){ @@ -79,7 +79,7 @@ class MargerExcel{ if(!obj){ resultMap.put(address, data); }else{ - println "重复地址:"+address + println "閲嶅鍦板潃锛�"+address } } return resultMap; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/MatchFromMongo.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/MatchFromMongo.groovy index 99fe94bf5..261f75c39 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/MatchFromMongo.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/MatchFromMongo.groovy @@ -21,9 +21,9 @@ class MatchFromMongo { def rets = match(datas); def ret = [] - ret << ["城市","区域","名称","地址","类型","匹配Id","匹配城市","匹配区域","匹配名称","匹配地址","匹配类型"] + ret << ["鍩庡競","鍖哄煙","鍚嶇О","鍦板潃","绫诲瀷","鍖归厤Id","鍖归厤鍩庡競","鍖归厤鍖哄煙","鍖归厤鍚嶇О","鍖归厤鍦板潃","鍖归厤绫诲瀷"] ret.addAll(rets) - ExcelUtils.write("d:\\数据\\结果\\苏州数据.xlsx", ret, "Sheet1") + ExcelUtils.write("d:\\鏁版嵁\\缁撴灉\\鑻忓窞鏁版嵁.xlsx", ret, "Sheet1") } def match(def rets){ @@ -42,7 +42,7 @@ class MatchFromMongo { if(!rMap && ret.name){ def s = ret.name.replace("##","@@").replace("\\","@@") // rMap = OpenApiUtils.matchDistrict(ret.city, s) - rMap = OpenApiUtils.matchDistrictByAddressAndRegion(ret.city, s, "昆山") + rMap = OpenApiUtils.matchDistrictByAddressAndRegion(ret.city, s, "鏄嗗北") } if(!rMap && ret.address){ @@ -63,7 +63,7 @@ class MatchFromMongo { } } if(row.size()<=6 && row[3]){ - def name = trimChar(row[3]).replace("·","") + def name = trimChar(row[3]).replace("路","") if(name){ row = matchFromDB(row, row[1],name) } @@ -79,7 +79,7 @@ class MatchFromMongo { def findDatas(){ DBObject q = new BasicDBObject(); - q.put("city", "苏州") + q.put("city", "鑻忓窞") // q.put("siteCode",new BasicDBObject('$in', ["dgfc_dg"])) def keys = new BasicDBObject(); keys.put("city",1) @@ -92,7 +92,7 @@ class MatchFromMongo { for(def obj : dbsoure){ def type = obj.estateType if(type){ - if(!type.contains("商铺")&& !type.contains("写字楼")){ + if(!type.contains("鍟嗛摵")&& !type.contains("鍐欏瓧妤�")){ rets << obj } }else{ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/MeituanTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/MeituanTest.groovy index 33d88dd25..4a101b7c1 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/MeituanTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/MeituanTest.groovy @@ -13,12 +13,12 @@ import java.util.concurrent.atomic.AtomicLong DBCollection DISTRICT_SELL_STAT = MongoUtils.getCollectionByName("fangjia_stat", "district_sell_stat", "mongo.db.fangjia.com") ExecutorService fixedThreadPool = Executors.newFixedThreadPool(20) -File file = new File("d:\\数据\\美团\\FJW_COMM_20230815.csv"); +File file = new File("d:\\鏁版嵁\\缇庡洟\\FJW_COMM_20230815.csv"); def rows = []; file.eachLine{ def d = it.split("@",-1) - if(d[1] && d[1]!='福州' && d[7] && d[7].isNumber()){ + if(d[1] && d[1]!='绂忓窞' && d[7] && d[7].isNumber()){ rows << d } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/NoHouseDistrictStatBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/NoHouseDistrictStatBatch.groovy index 7f1f0b25b..ebf3d08bb 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/NoHouseDistrictStatBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/NoHouseDistrictStatBatch.groovy @@ -57,7 +57,7 @@ class NoHouseDistrictStatBatch extends BaseBatch{ println "${cityIndex} " + city run(city, weekend); } catch (Exception e) { - println "异常" + println "寮傚父" e.printStackTrace(); } finally { latch.countDown() @@ -80,7 +80,7 @@ class NoHouseDistrictStatBatch extends BaseBatch{ // def keys = findNoInListKyes(districts, distKeys); // def rets = findInOtherHouse(keys); - println city +" 共:"+ districts.size()+" 多区域小区共: "+moreRegionDists.size()+" 无房源小区的:"+retMaps.size() + println city +" 鍏憋細"+ districts.size()+" 澶氬尯鍩熷皬鍖哄叡: "+moreRegionDists.size()+" 鏃犳埧婧愬皬鍖虹殑锛�"+retMaps.size() saveResult(city, retMaps); } @@ -139,7 +139,7 @@ class NoHouseDistrictStatBatch extends BaseBatch{ } } - //批量保存 + //鎵归噺淇濆瓨 if(addRows){ AVERAGER_CONFIG_COLL.insert(addRows) } @@ -208,7 +208,7 @@ class NoHouseDistrictStatBatch extends BaseBatch{ for(def key : rets){ def arrs = key.split("#") if(moreRegionDists && moreRegionDists.contains(arrs[0]+"#"+arrs[2])){ - retMap.put(key, null)//存在于多个区域,区域设置为不忽略 + retMap.put(key, null)//瀛樺湪浜庡涓尯鍩燂紝鍖哄煙璁剧疆涓轰笉蹇界暐 }else{ def alias = [] for(def d : districts){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/OpenApiStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/OpenApiStat.groovy index c956e70e5..30c8087bf 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/OpenApiStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/OpenApiStat.groovy @@ -27,7 +27,7 @@ class OpenApiStat { } // def run(){ // def ret = getUserVisitLog("1007545", DateUtils.parseFromTightYYYYMMDD("2019-03-01"), DateUtils.parseFromTightYYYYMMDD("2019-03-31")) -// println "楼盘详情访问总量:"+ret.size() +// println "妤肩洏璇︽儏璁块棶鎬婚噺:"+ret.size() // analy(ret); // analyInput(ret); // } @@ -48,9 +48,9 @@ class OpenApiStat { fixedThreadPool.shutdown() fixedThreadPool.awaitTermination(5, TimeUnit.DAYS) // -// println "加载完成......"+totalCount.get() +// println "鍔犺浇瀹屾垚......"+totalCount.get() -// println "楼盘详情访问总量:"+datas.size() +// println "妤肩洏璇︽儏璁块棶鎬婚噺:"+datas.size() analy(); // analyInput(datas); } @@ -101,7 +101,7 @@ class OpenApiStat { } - println "【结果】共返回:"+rMap.size()+"个小区" + println "銆愮粨鏋溿�戝叡杩斿洖锛�"+rMap.size()+"涓皬鍖�" def repeatCount = 0; def levelCount1=0 def levelCount2=0 @@ -127,10 +127,10 @@ class OpenApiStat { levelCount4++; } } - println "【结果】重复的共:"+repeatCount+"个" - println "【结果】levelCount1:"+levelCount1+" levelCount2:"+levelCount2+" levelCount3:"+levelCount3+" levelCount4:"+levelCount4 + println "銆愮粨鏋溿�戦噸澶嶇殑鍏憋細"+repeatCount+"涓�" + println "銆愮粨鏋溿�憀evelCount1:"+levelCount1+" levelCount2:"+levelCount2+" levelCount3:"+levelCount3+" levelCount4:"+levelCount4 - println "【输入】共有:"+pMap.size()+"个不同输入" + println "銆愯緭鍏ャ�戝叡鏈夛細"+pMap.size()+"涓笉鍚岃緭鍏�" def q_repeatCount = 0; def q_levelCount1=0 def q_levelCount2=0 @@ -157,8 +157,8 @@ class OpenApiStat { } } - println "【输入】重复的共:"+q_repeatCount+"个" - println "【输入】levelCount1:"+q_levelCount1+" levelCount2:"+q_levelCount2+" levelCount3:"+q_levelCount3+" levelCount4:"+q_levelCount4 + println "銆愯緭鍏ャ�戦噸澶嶇殑鍏憋細"+q_repeatCount+"涓�" + println "銆愯緭鍏ャ�憀evelCount1:"+q_levelCount1+" levelCount2:"+q_levelCount2+" levelCount3:"+q_levelCount3+" levelCount4:"+q_levelCount4 } @@ -177,7 +177,7 @@ class OpenApiStat { } } - println "共有:"+rMap.size()+"个不同输入" + println "鍏辨湁锛�"+rMap.size()+"涓笉鍚岃緭鍏�" def repeatCount = 0; def levelCount1=0 def levelCount2=0 @@ -204,8 +204,8 @@ class OpenApiStat { } } - println "输入重复的共:"+repeatCount+"个" - println "输入levelCount1:"+levelCount1+" levelCount2:"+levelCount2+" levelCount3:"+levelCount3+" levelCount4:"+levelCount4 + println "杈撳叆閲嶅鐨勫叡锛�"+repeatCount+"涓�" + println "杈撳叆levelCount1:"+levelCount1+" levelCount2:"+levelCount2+" levelCount3:"+levelCount3+" levelCount4:"+levelCount4 return rMap; } @@ -240,6 +240,6 @@ class OpenApiStat { TEST_COLL.insert(ret) ret = [] } - println DateUtils.formatDateByPattern(startDate,"yyyy-MM-dd")+"总量:"+index+" " + println DateUtils.formatDateByPattern(startDate,"yyyy-MM-dd")+"鎬婚噺锛�"+index+" " } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/OpenApiStat1.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/OpenApiStat1.groovy index 66f25a845..81a4204fb 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/OpenApiStat1.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/OpenApiStat1.groovy @@ -17,7 +17,7 @@ class OpenApiStat1 { } def run(){ def ret = getUserVisitLog("1007545", DateUtils.parseFromTightYYYYMMDD("2018-05-01"), DateUtils.parseFromTightYYYYMMDD("2019-03-31")) - println "2018-5-1楼盘详情访问总量:"+ret.size() + println "2018-5-1妤肩洏璇︽儏璁块棶鎬婚噺:"+ret.size() analy(ret); analyInput(ret); @@ -41,7 +41,7 @@ class OpenApiStat1 { } } - println "共返回:"+rMap.size()+"个小区" + println "鍏辫繑鍥烇細"+rMap.size()+"涓皬鍖�" def repeatCount = 0; def levelCount1=0 def levelCount2=0 @@ -67,7 +67,7 @@ class OpenApiStat1 { levelCount4++; } } - println "重复的共:"+repeatCount+"个" + println "閲嶅鐨勫叡锛�"+repeatCount+"涓�" println "levelCount1:"+levelCount1+" levelCount2:"+levelCount2+" levelCount3:"+levelCount3+" levelCount4:"+levelCount4 return rMap; } @@ -87,7 +87,7 @@ class OpenApiStat1 { } } - println "共有:"+rMap.size()+"个不同输入" + println "鍏辨湁锛�"+rMap.size()+"涓笉鍚岃緭鍏�" def repeatCount = 0; def levelCount1=0 def levelCount2=0 @@ -114,8 +114,8 @@ class OpenApiStat1 { } } - println "输入重复的共:"+repeatCount+"个" - println "输入levelCount1:"+levelCount1+" levelCount2:"+levelCount2+" levelCount3:"+levelCount3+" levelCount4:"+levelCount4 + println "杈撳叆閲嶅鐨勫叡锛�"+repeatCount+"涓�" + println "杈撳叆levelCount1:"+levelCount1+" levelCount2:"+levelCount2+" levelCount3:"+levelCount3+" levelCount4:"+levelCount4 return rMap; } @@ -139,7 +139,7 @@ class OpenApiStat1 { } } - println "总量:"+index + println "鎬婚噺锛�"+index return ret; } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/OpenApiUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/OpenApiUtils.groovy index 7dfbdfcb1..a60d0f985 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/OpenApiUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/OpenApiUtils.groovy @@ -14,7 +14,7 @@ import org.apache.commons.lang.StringUtils class OpenApiUtils { static def matchDistrict(def city, def address, def suggestDistrict, def preciseLevelflag, def suggestName){ - address = address.replace("(","(").replace(")",")").replace(" ","").replace("#","").replace("<","").replace(">","").replace("%","").replace("\"","") + address = address.replace("锛�","(").replace("锛�",")").replace(" ","").replace("#","").replace("<","").replace(">","").replace("%","").replace("\"","") def url = "http://open.fangjia.com/address/matchV2?city="+city+"&address="+address+"&token=F54F52381C49BB9EB4A33EB1B65604AE4B71A28AEE53518A94A2F360408B9056D57553931D15CE6DDE765562DAD286BA38E05A4CDAFC51C3D527A4959BF8E75A3B95DB7108FCEA340DDE61925616DB55118E1851E67D83EAD800460D100D6B667A4ED8EE67C8F7FB&category=district&__refresh_cache=1" if(preciseLevelflag){ url = url +"&preciseLevel=strict" @@ -53,7 +53,7 @@ class OpenApiUtils { static def matchDetailDistrict(def city, def address, def suggestDistrict, def preciseLevelflag){ - address = address.replace("(","(").replace(")",")").replace(" ","") + address = address.replace("锛�","(").replace("锛�",")").replace(" ","") def url = "http://open.fangjia.com/address/matchV2?city="+city+"&address="+address+"&suggestDistrict="+suggestDistrict+"&token=F54F52381C49BB9EB4A33EB1B65604AE4B71A28AEE53518A94A2F360408B9056D57553931D15CE6DDE765562DAD286BA38E05A4CDAFC51C3D527A4959BF8E75A3B95DB7108FCEA340DDE61925616DB55118E1851E67D83EAD800460D100D6B667A4ED8EE67C8F7FB&category=district&__refresh_cache=1" if(preciseLevelflag){ url = url +"&preciseLevel=strict" @@ -71,7 +71,7 @@ class OpenApiUtils { static def matchDistrict2(def city, def address, def preciseLevelflag){ - address = address.replace("(","(").replace(")",")").replace(" ","").replace("#","") + address = address.replace("锛�","(").replace("锛�",")").replace(" ","").replace("#","") def url = "http://open.fangjia.com/address/matchV2?city="+city+"&address="+address+"&token=F54F52381C49BB9EB4A33EB1B65604AE4B71A28AEE53518A94A2F360408B9056D57553931D15CE6DDE765562DAD286BA38E05A4CDAFC51C3D527A4959BF8E75A3B95DB7108FCEA340DDE61925616DB55118E1851E67D83EAD800460D100D6B667A4ED8EE67C8F7FB&category=district&__refresh_cache=1" if(preciseLevelflag){ url = url +"&preciseLevel=strict" @@ -97,7 +97,7 @@ class OpenApiUtils { static def matchAllDistrict(def city, def address){ - address = address.replace("(","(").replace(")",")").replace(" ","") + address = address.replace("锛�","(").replace("锛�",")").replace(" ","") def url = "http://open.fangjia.com/address/matchAll?city="+city+"&address="+address+"&preciseLevel=strict&token=F54F52381C49BB9EB4A33EB1B65604AE4B71A28AEE53518A94A2F360408B9056D57553931D15CE6DDE765562DAD286BA38E05A4CDAFC51C3D527A4959BF8E75A3B95DB7108FCEA340DDE61925616DB55118E1851E67D83EAD800460D100D6B667A4ED8EE67C8F7FB&category=district&__refresh_cache=1" String content = new HttpRequest().get(url, "utf-8"); @@ -123,7 +123,7 @@ class OpenApiUtils { static def matchDistrictByAddr(def city, def address, def region){ - address = address.replace("(","(").replace(")",")").replace(" ","") + address = address.replace("锛�","(").replace("锛�",")").replace(" ","") def url = "http://open.fangjia.com/address/matchV2?city="+city+"&address="+address+"&suggestDistrict="+region+"&preciseLevel=strict&token=F54F52381C49BB9EB4A33EB1B65604AE4B71A28AEE53518A94A2F360408B9056D57553931D15CE6DDE765562DAD286BA38E05A4CDAFC51C3D527A4959BF8E75A3B95DB7108FCEA340DDE61925616DB55118E1851E67D83EAD800460D100D6B667A4ED8EE67C8F7FB&category=district&__refresh_cache=1" String content = new HttpRequest().get(url, "utf-8"); def rMap = [:] @@ -151,7 +151,7 @@ class OpenApiUtils { if(result){ for(def ret : result){ ret.estateType = ret.type - ret.source = "高德" + ret.source = "楂樺痉" } } return result @@ -167,8 +167,8 @@ class OpenApiUtils { } address = address.trim().replace(" ","") // String url = "https://restapi.amap.com/v3/place/text?keywords=" + address + "&types=120000&city=" + city + "&output=json&offset=20&page=1&key=2af0b8533415a612b98d59bb93d664b9&extensions=all" - //key:8796b9dfb3889b57c38e2fff1b7e51bd 花钱买的 - String url = "https://restapi.amap.com/v3/place/text?keywords=" + address + "&city=" + city + "&output=json&offset=20&page=1&key=8796b9dfb3889b57c38e2fff1b7e51bd&extensions=all&citylimit=true"//citylimit限制城市 + //key:8796b9dfb3889b57c38e2fff1b7e51bd 鑺遍挶涔扮殑 + String url = "https://restapi.amap.com/v3/place/text?keywords=" + address + "&city=" + city + "&output=json&offset=20&page=1&key=8796b9dfb3889b57c38e2fff1b7e51bd&extensions=all&citylimit=true"//citylimit闄愬埗鍩庡競 List poiList = null; @@ -189,14 +189,14 @@ class OpenApiUtils { continue; } -// if(jo_item.containsKey("type") && !jo_item.getString("type").contains("住宅")){ +// if(jo_item.containsKey("type") && !jo_item.getString("type").contains("浣忓畢")){ // continue; // } String item_address = jo_item.containsKey("address") ? jo_item.getString("address") : null; String item_name = jo_item.containsKey("name") ? jo_item.getString("name") : null; if(item_name){ - item_name = item_name.replace("-","").replace("·","").replace("1区","一区").replace("2区","二区").replace("3区","三区").replace("4区","四区").replace("5区","五区").replace("6区","六区").replace("7区","七区").replace("8区","八区").replace("1期","一期").replace("2期","二期").replace("3期","三期").replace("4期","四期").replace("5期","五期").replace("6期","六期").replace("7期","七期").replace("8期","八期") + item_name = item_name.replace("-","").replace("路","").replace("1鍖�","涓�鍖�").replace("2鍖�","浜屽尯").replace("3鍖�","涓夊尯").replace("4鍖�","鍥涘尯").replace("5鍖�","浜斿尯").replace("6鍖�","鍏尯").replace("7鍖�","涓冨尯").replace("8鍖�","鍏尯").replace("1鏈�","涓�鏈�").replace("2鏈�","浜屾湡").replace("3鏈�","涓夋湡").replace("4鏈�","鍥涙湡").replace("5鏈�","浜旀湡").replace("6鏈�","鍏湡").replace("7鏈�","涓冩湡").replace("8鏈�","鍏湡") } boolean getedData = false; if(isFullMatch == true){ @@ -255,19 +255,19 @@ class OpenApiUtils { jo.put("lng", arrs[0]) } - if(type && type.contains("出入口")){ - println "X 高德地图:【"+jo_item.getString("cityname")+"-"+jo_item.getString("adname")+"-"+jo_item.getString("name")+"-"+jo_item.getString("address")+"】" +" 搜索:【"+city+"-"+address+"】-${type}" + if(type && type.contains("鍑哄叆鍙�")){ + println "X 楂樺痉鍦板浘锛氥��"+jo_item.getString("cityname")+"-"+jo_item.getString("adname")+"-"+jo_item.getString("name")+"-"+jo_item.getString("address")+"銆�" +" 鎼滅储锛氥��"+city+"-"+address+"銆�-${type}" }else{ - println "√高德地图:【"+jo_item.getString("cityname")+"-"+jo_item.getString("adname")+"-"+jo_item.getString("name")+"-"+jo_item.getString("address")+"】" +" 搜索:【"+city+"-"+address+"】" + println "鈭氶珮寰峰湴鍥撅細銆�"+jo_item.getString("cityname")+"-"+jo_item.getString("adname")+"-"+jo_item.getString("name")+"-"+jo_item.getString("address")+"銆�" +" 鎼滅储锛氥��"+city+"-"+address+"銆�" poiList.add(jo); } }else{ - println "X 高德地图:【"+jo_item.getString("cityname")+"-"+jo_item.getString("adname")+"-"+jo_item.getString("name")+"-"+jo_item.getString("address")+"】" +" 搜索:【"+city+"-"+address+"】" + println "X 楂樺痉鍦板浘锛氥��"+jo_item.getString("cityname")+"-"+jo_item.getString("adname")+"-"+jo_item.getString("name")+"-"+jo_item.getString("address")+"銆�" +" 鎼滅储锛氥��"+city+"-"+address+"銆�" } } }else{ - println "X 高德地图 ( "+city+"-"+address+" )无结果!" + println "X 楂樺痉鍦板浘 ( "+city+"-"+address+" )鏃犵粨鏋滐紒" } } } catch (Exception e) { @@ -323,8 +323,8 @@ class OpenApiUtils { if(ret.get("detail_info")){ estateType = ret.get("detail_info").get("tag") } - if(estateType && estateType.contains("出入口")){ - println "X百度地图:【"+ret.get("city")+"-"+ret.get("area")+"-"+ret.get("name")+"-"+address+"】" +" DB:【"+city+"-"+region+"-"+name+"】-${estateType}" + if(estateType && estateType.contains("鍑哄叆鍙�")){ + println "X鐧惧害鍦板浘锛氥��"+ret.get("city")+"-"+ret.get("area")+"-"+ret.get("name")+"-"+address+"銆�" +" DB锛氥��"+city+"-"+region+"-"+name+"銆�-${estateType}" }else{ if(lat2){ map.lat = lat @@ -336,7 +336,7 @@ class OpenApiUtils { map.name = districtName map.region = distRegion map.estateType = estateType - map.source = "百度" + map.source = "鐧惧害" rets << map lat = null @@ -344,11 +344,11 @@ class OpenApiUtils { lat2 = null lng2 = null } - println "√百度地图:【"+ret.get("city")+"-"+ret.get("area")+"-"+ret.get("name")+" "+map.estateType+"-"+address+"】" +" DB:【"+city+"-"+region+"-"+name+"】" + println "鈭氱櫨搴﹀湴鍥撅細銆�"+ret.get("city")+"-"+ret.get("area")+"-"+ret.get("name")+" "+map.estateType+"-"+address+"銆�" +" DB锛氥��"+city+"-"+region+"-"+name+"銆�" } // }else{ -// println "X百度地图:【"+ret.get("city")+"-"+ret.get("area")+"-"+ret.get("name")+"-"+ret.get("address")+"】" +" DB:【"+city+"-"+region+"-"+name+"】" +// println "X鐧惧害鍦板浘锛氥��"+ret.get("city")+"-"+ret.get("area")+"-"+ret.get("name")+"-"+ret.get("address")+"銆�" +" DB锛氥��"+city+"-"+region+"-"+name+"銆�" // } }else{ def score1 = 0 @@ -361,9 +361,9 @@ class OpenApiUtils { } if(score1 || score2){ rets << map - println "√百度地图:【"+ret.get("city")+"-"+ret.get("area")+"-"+ret.get("name")+"-"+address+"】" +" DB:【"+city+"-"+region+"-"+name+"】(score:"+score1+"#"+score2+")" + println "鈭氱櫨搴﹀湴鍥撅細銆�"+ret.get("city")+"-"+ret.get("area")+"-"+ret.get("name")+"-"+address+"銆�" +" DB锛氥��"+city+"-"+region+"-"+name+"銆�(score:"+score1+"#"+score2+")" }else{ - println "X百度地图:【"+ret.get("city")+"-"+ret.get("area")+"-"+ret.get("name")+"-"+ret.get("address")+"】" +" DB:【"+city+"-"+region+"-"+name+"】" + println "X鐧惧害鍦板浘锛氥��"+ret.get("city")+"-"+ret.get("area")+"-"+ret.get("name")+"-"+ret.get("address")+"銆�" +" DB锛氥��"+city+"-"+region+"-"+name+"銆�" } } @@ -382,7 +382,7 @@ class OpenApiUtils { static def searchBaiDuMap(String region, String township, String keyword,int cityCode) { def rets = [] - keyword = keyword.replace("居民委员会","").replace("居委会","").replace("居委会","").replace("居委","").replace("村民委员会","").replace("村村委会","村").replace("村委会","村") + keyword = keyword.replace("灞呮皯濮斿憳浼�","").replace("灞呭浼�","").replace("灞呭浼�","").replace("灞呭","").replace("鏉戞皯濮斿憳浼�","").replace("鏉戞潙濮斾細","鏉�").replace("鏉戝浼�","鏉�") def address = keyword try { Thread.sleep(500) @@ -404,29 +404,29 @@ class OpenApiUtils { rets = createData(rets, uidInfo, loc, region, name, address) }else{ def baiduCity = loc.city_name - if(baiduCity.contains("市")){ - baiduCity = baiduCity.substring(0, baiduCity.indexOf("市")) + if(baiduCity.contains("甯�")){ + baiduCity = baiduCity.substring(0, baiduCity.indexOf("甯�")) } baiduCity = RegionData.formatCity(baiduCity) if(!baiduCity){ baiduCity = loc.history_address - if(baiduCity.contains("市")){ - baiduCity = baiduCity.substring(0, baiduCity.indexOf("市")) + if(baiduCity.contains("甯�")){ + baiduCity = baiduCity.substring(0, baiduCity.indexOf("甯�")) } baiduCity = RegionData.formatCity(baiduCity) } if(!baiduCity){ baiduCity = loc.area_name - if(baiduCity.contains("市")){ - baiduCity = baiduCity.substring(0, baiduCity.indexOf("市")) + if(baiduCity.contains("甯�")){ + baiduCity = baiduCity.substring(0, baiduCity.indexOf("甯�")) } baiduCity = RegionData.formatCity(baiduCity) } def baiduRegion = loc.area_name.replace(baiduCity,"") - keyword = keyword.replace("社区","") - def bdName = loc.name.replace("居民委员会","").replace("居委会","").replace("居委","").replace("村民委员会","").replace("村村委会","村").replace("村委会","村").replace("社区","") + keyword = keyword.replace("绀惧尯","") + def bdName = loc.name.replace("灞呮皯濮斿憳浼�","").replace("灞呭浼�","").replace("灞呭","").replace("鏉戞皯濮斿憳浼�","").replace("鏉戞潙濮斾細","鏉�").replace("鏉戝浼�","鏉�").replace("绀惧尯","") def score1 = CosineSimilarAlgorithm.getSimilarityRatio(bdName, keyword); def score2 = CosineSimilarAlgorithm.getSimilarityRatio(loc.addr, keyword); @@ -448,15 +448,15 @@ class OpenApiUtils { bean.estateType = loc.std_tag bean.score = score1 + score2 rets << bean; - println "√百度搜索地图:【"+baiduCity+"-"+baiduRegion+"-"+loc.name+"-"+ loc.addr.replace("[]","")+" "+bean.estateType+"】" +" 搜索:【"+address+"】(score:"+score1+"#"+score2+")" + println "鈭氱櫨搴︽悳绱㈠湴鍥撅細銆�"+baiduCity+"-"+baiduRegion+"-"+loc.name+"-"+ loc.addr.replace("[]","")+" "+bean.estateType+"銆�" +" 鎼滅储锛氥��"+address+"銆�(score:"+score1+"#"+score2+")" }else{ - println "X 百度搜索地图:【"+loc.get("area_name")+"-"+loc.get("area_name")+"-"+loc.get("name")+"-"+loc.get("addr")+"】" +" 搜索:【"+address+"】" + println "X 鐧惧害鎼滅储鍦板浘锛氥��"+loc.get("area_name")+"-"+loc.get("area_name")+"-"+loc.get("name")+"-"+loc.get("addr")+"銆�" +" 鎼滅储锛氥��"+address+"銆�" } } } } }else{ - println "X百度搜索地图("+address+")无结果" + println "X鐧惧害鎼滅储鍦板浘("+address+")鏃犵粨鏋�" } } catch(Exception e) { } @@ -491,10 +491,10 @@ class OpenApiUtils { bean.estateType = result.get("detail_info").get("tag") } - if(bean.estateType && (bean.estateType.contains('出入口') || bean.estateType.contains('公交车站'))){ - println "X百度搜索地图:【"+baiduCity+"-"+baiduRegion+"-"+newName+"-"+result.get("address")+"】" +" 搜索:【"+address+"】-${bean.estateType}" + if(bean.estateType && (bean.estateType.contains('鍑哄叆鍙�') || bean.estateType.contains('鍏氦杞︾珯'))){ + println "X鐧惧害鎼滅储鍦板浘锛氥��"+baiduCity+"-"+baiduRegion+"-"+newName+"-"+result.get("address")+"銆�" +" 鎼滅储锛氥��"+address+"銆�-${bean.estateType}" }else{ - println "√百度搜索地图:【"+baiduCity+"-"+baiduRegion+"-"+newName+"-"+result.get("address")+"】" +" 搜索:【"+address+"】" + println "鈭氱櫨搴︽悳绱㈠湴鍥撅細銆�"+baiduCity+"-"+baiduRegion+"-"+newName+"-"+result.get("address")+"銆�" +" 鎼滅储锛氥��"+address+"銆�" rets << bean; } @@ -520,17 +520,17 @@ class OpenApiUtils { } bean.score = score1 + score2 rets << bean; - println "√百度搜索地图:【"+baiduCity+"-"+baiduRegion+"-"+newName+"-"+bean.estateType+"-"+ loc.addr.replace("[]","")+"】" +" 搜索:【"+address+"】(score:"+score1+"#"+score2+")" + println "鈭氱櫨搴︽悳绱㈠湴鍥撅細銆�"+baiduCity+"-"+baiduRegion+"-"+newName+"-"+bean.estateType+"-"+ loc.addr.replace("[]","")+"銆�" +" 鎼滅储锛氥��"+address+"銆�(score:"+score1+"#"+score2+")" }else{ - println "X 百度搜索地图:【"+loc.get("area_name")+"-"+loc.get("area_name")+"-"+loc.get("name")+"-"+loc.get("addr")+"】" +" 搜索:【"+address+"】" + println "X 鐧惧害鎼滅储鍦板浘锛氥��"+loc.get("area_name")+"-"+loc.get("area_name")+"-"+loc.get("name")+"-"+loc.get("addr")+"銆�" +" 鎼滅储锛氥��"+address+"銆�" } } return rets; } def static formatName(String name) { - if(name.indexOf("·") != -1) { - name = name.replaceAll("·", "") + if(name.indexOf("路") != -1) { + name = name.replaceAll("路", "") } if(name.indexOf(".") != -1) { name = name.replace(".", "") @@ -544,8 +544,8 @@ class OpenApiUtils { if(name.indexOf("-")!=-1){ name = name.replace("-","") } - name = name.replace("一期","1期").replace("二期","2期").replace("三期","3期").replace("四期","4期").replace("五期","5期").replace("六期","6期") - name = name.replace("(建设中)","").replace("建设中","").replace("(建)","") + name = name.replace("涓�鏈�","1鏈�").replace("浜屾湡","2鏈�").replace("涓夋湡","3鏈�").replace("鍥涙湡","4鏈�").replace("浜旀湡","5鏈�").replace("鍏湡","6鏈�") + name = name.replace("(寤鸿涓�)","").replace("寤鸿涓�","").replace("(寤�)","") return name.replaceAll("\\s+", "").toLowerCase() } @@ -757,7 +757,7 @@ class OpenApiUtils { } - //源地址的完整性进行验证 + //婧愬湴鍧�鐨勫畬鏁存�ц繘琛岄獙璇� static def addrVerify(city, address){ def url = "http://open.fangjia.com/addrSvc/addrVerify?city=${city}&address=${address}&token=F54F52381C49BB9EB4A33EB1B65604AE4B71A28AEE53518A94A2F360408B9056D57553931D15CE6DDE765562DAD286BA38E05A4CDAFC51C3D527A4959BF8E75A3B95DB7108FCEA340DDE61925616DB55118E1851E67D83EAD800460D100D6B667A4ED8EE67C8F7FB" String content = new HttpRequest().get(url, "utf-8"); @@ -772,7 +772,7 @@ class OpenApiUtils { } - //源地址的完整性进行验证 + //婧愬湴鍧�鐨勫畬鏁存�ц繘琛岄獙璇� static def addrVerifyNanjing(city, address, type){ address = URLEncoder.encode(address, "utf-8"); def url = "http://open.fangjia.com/addrSvc/njcbVillageIdentify?address=${address}&type=${type}&token=F54F52381C49BB9EB4A33EB1B65604AE4B71A28AEE53518A94A2F360408B9056D57553931D15CE6DDE765562DAD286BA38E05A4CDAFC51C3D527A4959BF8E75A3B95DB7108FCEA340DDE61925616DB55118E1851E67D83EAD800460D100D6B667A4ED8EE67C8F7FB" @@ -867,7 +867,7 @@ class OpenApiUtils { return null; } - // 省、市、区、街道、社区居委、POI补全 + // 鐪併�佸競銆佸尯銆佽閬撱�佺ぞ鍖哄眳濮斻�丳OI琛ュ叏 static def complete(city, address){ def url = "http://open.fangjia.com/addrSvc/complete?city=${city}&address=${address}&token=F54F52381C49BB9EB4A33EB1B65604AE4B71A28AEE53518A94A2F360408B9056D57553931D15CE6DDE765562DAD286BA38E05A4CDAFC51C3D527A4959BF8E75A3B95DB7108FCEA340DDE61925616DB55118E1851E67D83EAD800460D100D6B667A4ED8EE67C8F7FB" String content = new HttpRequest().get(url, "utf-8"); @@ -880,7 +880,7 @@ class OpenApiUtils { } return null; } - //五级(省/市/区/街道/社区居委)解析、补全 + //浜旂骇锛堢渷/甯�/鍖�/琛楅亾/绀惧尯灞呭锛夎В鏋愩�佽ˉ鍏� static def division(city, address){ def url = "http://open.fangjia.com/addrSvc/division?city=${city}&address=${address}&token=F54F52381C49BB9EB4A33EB1B65604AE4B71A28AEE53518A94A2F360408B9056D57553931D15CE6DDE765562DAD286BA38E05A4CDAFC51C3D527A4959BF8E75A3B95DB7108FCEA340DDE61925616DB55118E1851E67D83EAD800460D100D6B667A4ED8EE67C8F7FB" String content = new HttpRequest().get(url, "utf-8"); @@ -894,7 +894,7 @@ class OpenApiUtils { return null; } - //识别地址中省、市、区、道路、POI同时进行地址验证 + //璇嗗埆鍦板潃涓渷銆佸競銆佸尯銆侀亾璺�丳OI鍚屾椂杩涜鍦板潃楠岃瘉 static def structure(city, address){ def url = "http://open.fangjia.com/addrSvc/structure?city=${city}&address=${address}&token=F54F52381C49BB9EB4A33EB1B65604AE4B71A28AEE53518A94A2F360408B9056D57553931D15CE6DDE765562DAD286BA38E05A4CDAFC51C3D527A4959BF8E75A3B95DB7108FCEA340DDE61925616DB55118E1851E67D83EAD800460D100D6B667A4ED8EE67C8F7FB" String content = new HttpRequest().get(url, "utf-8"); @@ -910,7 +910,7 @@ class OpenApiUtils { /** - * 招商银行测试 + * 鎷涘晢閾惰娴嬭瘯 * @param city * @param address * @return diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/OpenUserBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/OpenUserBatch.groovy index a87dbc4c2..3f22d6303 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/OpenUserBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/OpenUserBatch.groovy @@ -17,7 +17,7 @@ class OpenUserBatch { } def test(){ - def rets = FileUtils.readLines(new File("C:\\Users\\gaojuan\\Desktop\\房价通建行.txt")); + def rets = FileUtils.readLines(new File("C:\\Users\\gaojuan\\Desktop\\鎴夸环閫氬缓琛�.txt")); rets.each{ def datas = it.split(",") println datas; @@ -40,13 +40,13 @@ class OpenUserBatch { def sql = "insert into users(id, email, password, role, user_role, city, gold_total, come_from, date_created, last_updated, status, uid, access_token, house_report_token, open_day, fangdiao_apply_add, gujia_add, fangdiao_apply_count, gujia_down_count, fangdiao_add, fangdiao_down_count, yang_ben_down, mobile, pay_password, evaluation_count, close_date, manager, role_users, weixinId) VALUES ("+id+", 'jianhangsh"+num+"', '"+pwd+"', '14', NULL, NULL, '0', 'fangjiatong', now(), now(), '0', NULL, NULL, '', '0', '2', '2', '2', '2', NULL, NULL, '0', NULL, NULL, NULL, '2019-12-31 00:00:00', '0', '', NULL)"; onLineSqlInstance.execute(sql); - def sql2 = "INSERT INTO users_detail (id, p_id,name, org_name, phone, fax, email, address, role, company, user_valid_date, online_status, last_login_date, last_operat_date, date_created, last_updated, mobile, eva_guide, ip_list, sale_name) VALUES ('"+id+"', '0', 'jianhangsh"+num+"', '建设银行上海市分行', NULL, NULL, NULL, NULL, NULL, NULL, NULL, b'0', now(), now(), now(), now(), NULL, b'0', '', '王古月')"; + def sql2 = "INSERT INTO users_detail (id, p_id,name, org_name, phone, fax, email, address, role, company, user_valid_date, online_status, last_login_date, last_operat_date, date_created, last_updated, mobile, eva_guide, ip_list, sale_name) VALUES ('"+id+"', '0', 'jianhangsh"+num+"', '寤鸿閾惰涓婃捣甯傚垎琛�', NULL, NULL, NULL, NULL, NULL, NULL, NULL, b'0', now(), now(), now(), now(), NULL, b'0', '', '鐜嬪彜鏈�')"; onLineSqlInstance.execute(sql2) } } def addShenZhenFjtUser(){ - def datas = ExcelUtils.read("D:\\数据\\黑龙江银行\\大正银行端新增账户模板中国银行.xls",0,1) + def datas = ExcelUtils.read("D:\\鏁版嵁\\榛戦緳姹熼摱琛孿\澶ф閾惰绔柊澧炶处鎴锋ā鏉夸腑鍥介摱琛�.xls",0,1) def i = 0; for(def data : datas){ i++; @@ -56,16 +56,16 @@ class OpenUserBatch { def sql = "insert into users(id, email, password, role, user_role, city, gold_total, come_from, date_created, last_updated, status, uid, access_token, house_report_token, open_day, fangdiao_apply_add, gujia_add, fangdiao_apply_count, gujia_down_count, fangdiao_add, fangdiao_down_count, yang_ben_down, mobile, pay_password, evaluation_count, close_date, manager, role_users, weixinId) VALUES ("+id+", '"+mobile+"', '666666', '18', NULL, NULL, '0', 'fangjiatong', now(), now(), '0', NULL, NULL, '', '0', '2', '2', '2', '500', NULL, NULL, '0', NULL, NULL, NULL, '2025-12-31 00:00:00', '0', '', NULL)"; onLineSqlInstance.execute(sql); - def sql2 = "INSERT INTO users_detail (id, p_id,name, org_name, phone, fax, email, address, role, company, user_valid_date, online_status, last_login_date, last_operat_date, date_created, last_updated, mobile, eva_guide, ip_list, sale_name) VALUES ('"+id+"', '0', '"+data[2]+"', '"+data[1]+"', '"+mobile+"', NULL, NULL, NULL, NULL, NULL, NULL, b'0', now(), now(), now(), now(), NULL, b'0', '', '王蕾')"; + def sql2 = "INSERT INTO users_detail (id, p_id,name, org_name, phone, fax, email, address, role, company, user_valid_date, online_status, last_login_date, last_operat_date, date_created, last_updated, mobile, eva_guide, ip_list, sale_name) VALUES ('"+id+"', '0', '"+data[2]+"', '"+data[1]+"', '"+mobile+"', NULL, NULL, NULL, NULL, NULL, NULL, b'0', now(), now(), now(), now(), NULL, b'0', '', '鐜嬭暰')"; onLineSqlInstance.execute(sql2) - def sql3 = "INSERT INTO user_city (user_id, citys, credits) VALUES("+id+",'哈尔滨,齐齐哈尔,大庆,牡丹江,佳木斯,绥化,鸡西,七台河,双鸭山,鹤岗,黑河,伊春,大兴安岭','哈尔滨:,齐齐哈尔:,大庆:,牡丹江:,佳木斯:,绥化:,鸡西:,七台河:,双鸭山:,鹤岗:,黑河:,伊春:,大兴安岭:')" + def sql3 = "INSERT INTO user_city (user_id, citys, credits) VALUES("+id+",'鍝堝皵婊�,榻愰綈鍝堝皵,澶у簡,鐗′腹姹�,浣虫湪鏂�,缁ュ寲,楦¤タ,涓冨彴娌�,鍙岄腑灞�,楣ゅ矖,榛戞渤,浼婃槬,澶у叴瀹夊箔','鍝堝皵婊�:,榻愰綈鍝堝皵:,澶у簡:,鐗′腹姹�:,浣虫湪鏂�:,缁ュ寲:,楦¤タ:,涓冨彴娌�:,鍙岄腑灞�:,楣ゅ矖:,榛戞渤:,浼婃槬:,澶у叴瀹夊箔:')" onLineSqlInstance.execute(sql3) } } def addFujianFjtUser(){ - def datas = ExcelUtils.read("D:\\数据\\江苏农行\\福建省农行账号开通.xlsx",0,1) + def datas = ExcelUtils.read("D:\\鏁版嵁\\姹熻嫃鍐滆\\绂忓缓鐪佸啘琛岃处鍙峰紑閫�.xlsx",0,1) def i = 0; for(def data : datas){ i++; @@ -75,10 +75,10 @@ class OpenUserBatch { def sql = "insert into users(id, email, password, role, user_role, city, gold_total, come_from, date_created, last_updated, status, uid, access_token, house_report_token, open_day, fangdiao_apply_add, gujia_add, fangdiao_apply_count, gujia_down_count, fangdiao_add, fangdiao_down_count, yang_ben_down, mobile, pay_password, evaluation_count, close_date, manager, role_users, weixinId) VALUES ("+id+", '"+mobile+"', '"+pwd+"', '12', NULL, NULL, '0', 'fangjiatong', now(), now(), '0', NULL, NULL, '', '0', '2', '2', '2', '100', NULL, NULL, '0', NULL, NULL, '100', '2022-07-10 00:00:00', '0', '', NULL)"; onLineSqlInstance.execute(sql); - def sql2 = "INSERT INTO users_detail (id, p_id,name, org_name, phone, fax, email, address, role, company, user_valid_date, online_status, last_login_date, last_operat_date, date_created, last_updated, mobile, eva_guide, ip_list, sale_name) VALUES ('"+id+"', '0', '"+data['C']+"', '福建', '"+mobile+"', NULL, NULL, NULL, NULL, NULL, NULL, b'0', now(), now(), now(), now(), NULL, b'0', '', '蒋晓春')"; + def sql2 = "INSERT INTO users_detail (id, p_id,name, org_name, phone, fax, email, address, role, company, user_valid_date, online_status, last_login_date, last_operat_date, date_created, last_updated, mobile, eva_guide, ip_list, sale_name) VALUES ('"+id+"', '0', '"+data['C']+"', '绂忓缓', '"+mobile+"', NULL, NULL, NULL, NULL, NULL, NULL, b'0', now(), now(), now(), now(), NULL, b'0', '', '钂嬫檽鏄�')"; onLineSqlInstance.execute(sql2) - def sql3 = "INSERT INTO user_city (user_id, citys, credits) VALUES("+id+",'福州,厦门,泉州,莆田,宁德,三明,龙岩,南平,漳州','福州:,厦门:,泉州:,莆田:,宁德:,三明:,龙岩:,南平:,漳州:')" + def sql3 = "INSERT INTO user_city (user_id, citys, credits) VALUES("+id+",'绂忓窞,鍘﹂棬,娉夊窞,鑾嗙敯,瀹佸痉,涓夋槑,榫欏博,鍗楀钩,婕冲窞','绂忓窞:,鍘﹂棬:,娉夊窞:,鑾嗙敯:,瀹佸痉:,涓夋槑:,榫欏博:,鍗楀钩:,婕冲窞:')" onLineSqlInstance.execute(sql3) } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/PingAnAddressLevalTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/PingAnAddressLevalTest.groovy index e0e481909..7033b0028 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/PingAnAddressLevalTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/PingAnAddressLevalTest.groovy @@ -20,13 +20,13 @@ class PingAnAddressLevalTest { } def run(){ - // def datas = ExcelUtils.read("D:\\数据\\平安数据.xlsx", 0 , 1) - ExcelUtils.modify("D:\\数据\\平安数据.xlsx", { List row-> + // def datas = ExcelUtils.read("D:\\鏁版嵁\\骞冲畨鏁版嵁.xlsx", 0 , 1) + ExcelUtils.modify("D:\\鏁版嵁\\骞冲畨鏁版嵁.xlsx", { List row-> def address = row['B']; def district = match(address); if(district){ - if(district.name=="白鹭洲别墅"){ - district.name = "阳光城君山墅" + if(district.name=="鐧介弓娲插埆澧�"){ + district.name = "闃冲厜鍩庡悰灞卞" } def ret = getDistrictLevelResult(district.city, district.region, district.name); if(ret){ @@ -148,7 +148,7 @@ class PingAnAddressLevalTest { } }else{ - println "【${address}】获取城市 "+cityResult.msg + println "銆�${address}銆戣幏鍙栧煄甯� "+cityResult.msg } return district; } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/PingAnPuHuiDataExport.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/PingAnPuHuiDataExport.groovy index 3e0b48499..efc3fa0c3 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/PingAnPuHuiDataExport.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/PingAnPuHuiDataExport.groovy @@ -37,12 +37,12 @@ class PingAnPuHuiDataExport { } result.addAll(rows) - ExcelUtils.write("d:\\数据\\结果\\平安普惠重跑.xlsx", result, "Sheet1") + ExcelUtils.write("d:\\鏁版嵁\\缁撴灉\\骞冲畨鏅儬閲嶈窇.xlsx", result, "Sheet1") } def findDatas(){ DBObject q = new BasicDBObject(); - q.put("file_name", "平安普惠重跑.xlsx") + q.put("file_name", "骞冲畨鏅儬閲嶈窇.xlsx") q.put("version", "1502863858273") def dbCursor = ADDRESS_COLL.find(q).sort(new BasicDBObject("seq",1)); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/PoiLocation.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/PoiLocation.groovy index f0678d5b0..c49e10f2b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/PoiLocation.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/PoiLocation.groovy @@ -14,8 +14,8 @@ class PoiLocation { def allCitys = CommonDatautils.findAllCity(); def allRegionMap = CommonDatautils.getAllCityRegions() - def gaodeCityCodeMap = ["北京":"110000","天津":"120000","石家庄":"130100","辛集":"130181","晋州":"130183","新乐":"130184","唐山":"130200","滦州":"130284","遵化":"130281","迁安":"130283","秦皇岛":"130300","邯郸":"130400","武安":"130481","邢台":"130500","南宫":"130581","沙河":"130582","保定":"130600","涿州":"130681","定州":"130682","安国":"130683","高碑店":"130684","张家口":"130700","承德":"130800","平泉":"130881","沧州":"130900","泊头":"130981","任丘":"130982","黄骅":"130983","河间":"130984","廊坊":"131000","霸州":"131081","三河":"131082","衡水":"131100","深州":"131182","太原":"140100","古交":"140181","大同":"140200","阳泉":"140300","长治":"140400","晋城":"140500","高平":"140581","朔州":"140600","怀仁":"140681","晋中":"140700","介休":"140781","运城":"140800","永济":"140881","河津":"140882","忻州":"140900","原平":"140981","临汾":"141000","侯马":"141081","霍州":"141082","吕梁":"141100","孝义":"141181","汾阳":"141182","呼和浩特":"150100","包头":"150200","乌海":"150300","赤峰":"150400","通辽":"150500","霍林郭勒":"150581","鄂尔多斯":"150600","呼伦贝尔":"150700","满洲里":"150781","牙克石":"150782","扎兰屯":"150783","额尔古纳":"150784","根河":"150785","巴彦淖尔":"150800","乌兰察布":"150900","丰镇":"150981","乌兰浩特":"152201","阿尔山":"152202","二连浩特":"152501","锡林浩特":"152502","沈阳":"210100","新民":"210181","大连":"210200","瓦房店":"210281","庄河":"210283","鞍山":"210300","海城":"210381","抚顺":"210400","本溪":"210500","丹东":"210600","东港":"210681","凤城":"210682","锦州":"210700","凌海":"210781","北镇":"210782","营口":"210800","西市区":"210803","盖州":"210881","大石桥":"210882","阜新":"210900","辽阳":"211000","灯塔":"211081","盘锦":"211100","铁岭":"211200","调兵山":"211281","开原":"211282","朝阳":"211300","北票":"211381","凌源":"211382","葫芦岛":"211400","兴城":"211481","长春":"220100","榆树":"220182","德惠":"220183","吉林":"220200","蛟河":"220281","桦甸":"220282","舒兰":"220283","磐石":"220284","四平":"220300","公主岭":"220381","双辽":"220382","辽源":"220400","通化":"220500","梅河口":"220581","集安":"220582","白山":"220600","临江":"220681","松原":"220700","扶余":"220781","白城":"220800","洮南":"220881","大安":"220882","延吉":"222401","图们":"222402","敦化":"222403","珲春":"222404","龙井":"222405","和龙":"222406","哈尔滨":"230100","尚志":"230183","五常":"230184","齐齐哈尔":"230200","讷河":"230281","鸡西":"230300","虎林":"230381","密山":"230382","鹤岗":"230400","双鸭山":"230500","大庆":"230600","伊春":"230700","铁力":"230781","佳木斯":"230800","同江":"230881","富锦":"230882","抚远":"230883","七台河":"230900","牡丹江":"231000","绥芬河":"231081","海林":"231083","宁安":"231084","穆棱":"231085","东宁":"231086","黑河":"231100","北安":"231181","五大连池":"231182","绥化":"231200","安达":"231281","肇东":"231282","海伦":"231283","漠河":"232701","上海":"310000","南京":"320100","无锡":"320200","江阴":"320281","宜兴":"320282","徐州":"320300","新沂":"320381","邳州":"320382","常州":"320400","溧阳":"320481","苏州":"320500","常熟":"320581","张家港":"320582","昆山":"320583","太仓":"320585","南通":"320600","海安":"320685","启东":"320681","如皋":"320682","海门":"320684","连云港":"320700","淮安":"320800","盐城":"320900","东台":"320981","扬州":"321000","仪征":"321081","高邮":"321084","镇江":"321100","丹阳":"321181","扬中":"321182","句容":"321183","泰州":"321200","兴化":"321281","靖江":"321282","泰兴":"321283","宿迁":"321300","杭州":"330100","建德":"330182","宁波":"330200","余姚":"330281","慈溪":"330282","温州":"330300","瑞安":"330381","乐清":"330382","嘉兴":"330400","海宁":"330481","平湖":"330482","桐乡":"330483","湖州":"330500","绍兴":"330600","诸暨":"330681","嵊州":"330683","金华":"330700","兰溪":"330781","义乌":"330782","东阳":"330783","永康":"330784","衢州":"330800","江山":"330881","舟山":"330900","台州":"331000","温岭":"331081","临海":"331082","玉环":"331083","丽水":"331100","龙泉":"331181","合肥":"340100","巢湖":"340181","芜湖":"340200","蚌埠":"340300","淮南":"340400","马鞍山":"340500","淮北":"340600","铜陵":"340700","安庆":"340800","潜山":"340882","桐城":"340881","黄山":"341000","滁州":"341100","天长":"341181","明光":"341182","阜阳":"341200","界首":"341282","宿州":"341300","六安":"341500","亳州":"341600","池州":"341700","宣城":"341800","宁国":"341881","福州":"350100","福清":"350181","厦门":"350200","莆田":"350300","三明":"350400","永安":"350481","泉州":"350500","石狮":"350581","晋江":"350582","南安":"350583","漳州":"350600","龙海":"350681","南平":"350700","邵武":"350781","武夷山":"350782","建瓯":"350783","龙岩":"350800","漳平":"350881","宁德":"350900","福安":"350981","福鼎":"350982","南昌":"360100","景德镇":"360200","乐平":"360281","萍乡":"360300","九江":"360400","瑞昌":"360481","共青城":"360482","庐山":"360483","新余":"360500","鹰潭":"360600","贵溪":"360681","赣州":"360700","瑞金":"360781","吉安":"360800","井冈山":"360881","宜春":"360900","丰城":"360981","樟树":"360982","高安":"360983","抚州":"361000","上饶":"361100","德兴":"361181","济南":"370100","市中区":"370103","青岛":"370200","市南区":"370202","市北区":"370203","胶州":"370281","平度":"370283","莱西":"370285","淄博":"370300","枣庄":"370400","市中区":"370402","滕州":"370481","东营":"370500","烟台":"370600","龙口":"370681","莱阳":"370682","莱州":"370683","蓬莱":"370684","招远":"370685","栖霞":"370686","海阳":"370687","潍坊":"370700","青州":"370781","诸城":"370782","寿光":"370783","安丘":"370784","高密":"370785","昌邑":"370786","济宁":"370800","曲阜":"370881","邹城":"370883","泰安":"370900","新泰":"370982","肥城":"370983","威海":"371000","荣成":"371082","乳山":"371083","日照":"371100","临沂":"371300","德州":"371400","乐陵":"371481","禹城":"371482","聊城":"371500","临清":"371581","滨州":"371600","邹平":"371681","菏泽":"371700","郑州":"410100","巩义":"410181","荥阳":"410182","新密":"410183","新郑":"410184","登封":"410185","开封":"410200","洛阳":"410300","偃师":"410381","平顶山":"410400","舞钢":"410481","汝州":"410482","安阳":"410500","林州":"410581","鹤壁":"410600","新乡":"410700","卫辉":"410781","辉县":"410782","焦作":"410800","沁阳":"410882","孟州":"410883","濮阳":"410900","许昌":"411000","禹州":"411081","长葛":"411082","漯河":"411100","三门峡":"411200","义马":"411281","灵宝":"411282","南阳":"411300","邓州":"411381","商丘":"411400","永城":"411481","信阳":"411500","周口":"411600","项城":"411681","驻马店":"411700","济源":"419001","武汉":"420100","黄石":"420200","大冶":"420281","十堰":"420300","丹江口":"420381","宜昌":"420500","宜都":"420581","当阳":"420582","枝江":"420583","襄阳":"420600","老河口":"420682","枣阳":"420683","宜城":"420684","鄂州":"420700","荆门":"420800","京山":"420882","钟祥":"420881","孝感":"420900","应城":"420981","安陆":"420982","汉川":"420984","荆州":"421000","沙市区":"421002","石首":"421081","洪湖":"421083","松滋":"421087","黄冈":"421100","麻城":"421181","武穴":"421182","咸宁":"421200","赤壁":"421281","随州":"421300","广水":"421381","恩施":"422801","利川":"422802","仙桃":"429004","潜江":"429005","天门":"429006","长沙":"430100","浏阳":"430181","宁乡":"430182","株洲":"430200","醴陵":"430281","湘潭":"430300","湘乡":"430381","韶山":"430382","衡阳":"430400","耒阳":"430481","常宁":"430482","邵阳":"430500","武冈":"430581","岳阳":"430600","汨罗":"430681","临湘":"430682","常德":"430700","津市":"430781","张家界":"430800","益阳":"430900","沅江":"430981","郴州":"431000","资兴":"431081","永州":"431100","怀化":"431200","洪江":"431281","娄底":"431300","冷水江":"431381","涟源":"431382","吉首":"433101","广州":"440100","韶关":"440200","乐昌":"440281","南雄":"440282","深圳":"440300","珠海":"440400","汕头":"440500","佛山":"440600","江门":"440700","台山":"440781","开平":"440783","鹤山":"440784","恩平":"440785","湛江":"440800","廉江":"440881","雷州":"440882","吴川":"440883","茂名":"440900","高州":"440981","化州":"440982","信宜":"440983","肇庆":"441200","四会":"441284","惠州":"441300","梅州":"441400","兴宁":"441481","汕尾":"441500","陆丰":"441581","河源":"441600","阳江":"441700","阳春":"441781","清远":"441800","英德":"441881","连州":"441882","东莞":"441900","中山":"442000","潮州":"445100","揭阳":"445200","普宁":"445281","云浮":"445300","罗定":"445381","南宁":"450100","柳州":"450200","桂林":"450300","荔浦":"450381","梧州":"450400","岑溪":"450481","北海":"450500","防城港":"450600","东兴":"450681","钦州":"450700","贵港":"450800","桂平":"450881","玉林":"450900","北流":"450981","百色":"451000","靖西":"451081","贺州":"451100","河池":"451200","来宾":"451300","合山":"451381","崇左":"451400","凭祥":"451481","海口":"460100","三亚":"460200","三沙":"460300","儋州":"460400","五指山":"469001","琼海":"469002","文昌":"469005","万宁":"469006","东方":"469007","重庆":"500000","重庆市郊县":"500200","成都":"510100","都江堰":"510181","彭州":"510182","邛崃":"510183","崇州":"510184","简阳":"510185","自贡":"510300","攀枝花":"510400","泸州":"510500","德阳":"510600","广汉":"510681","什邡":"510682","绵竹":"510683","绵阳":"510700","江油":"510781","广元":"510800","遂宁":"510900","内江":"511000","市中区":"511002","隆昌":"511083","乐山":"511100","市中区":"511102","峨眉山":"511181","南充":"511300","阆中":"511381","眉山":"511400","宜宾":"511500","广安":"511600","华蓥":"511681","达州":"511700","万源":"511781","雅安":"511800","巴中":"511900","资阳":"512000","马尔康":"513201","康定":"513301","西昌":"513401","贵阳":"520100","清镇":"520181","六盘水":"520200","盘州":"520281","遵义":"520300","赤水":"520381","仁怀":"520382","安顺":"520400","毕节":"520500","铜仁":"520600","兴义":"522301","兴仁":"522302","凯里":"522601","都匀":"522701","福泉":"522702","昆明":"530100","安宁":"530181","曲靖":"530300","宣威":"530381","玉溪":"530400","保山":"530500","腾冲":"530581","昭通":"530600","水富":"530681","丽江":"530700","普洱":"530800","临沧":"530900","楚雄":"532301","个旧":"532501","开远":"532502","蒙自":"532503","弥勒":"532504","文山":"532601","景洪":"532801","大理":"532901","瑞丽":"533102","芒":"533103","泸水":"533301","香格里拉":"533401","拉萨":"540100","日喀则":"540200","昌都":"540300","林芝":"540400","山南":"540500","那曲":"540600","西安":"610100","铜川":"610200","宝鸡":"610300","咸阳":"610400","彬州":"610482","兴平":"610481","渭南":"610500","韩城":"610581","华阴":"610582","延安":"610600","汉中":"610700","榆林":"610800","神木":"610881","安康":"610900","商洛":"611000","兰州":"620100","嘉峪关":"620200","金昌":"620300","白银":"620400","天水":"620500","武威":"620600","张掖":"620700","平凉":"620800","华亭":"620881","酒泉":"620900","玉门":"620981","敦煌":"620982","庆阳":"621000","定西":"621100","陇南":"621200","临夏":"622901","合作":"623001","西宁":"630100","海东":"630200","玉树":"632701","格尔木":"632801","德令哈":"632802","茫崖":"632803","银川":"640100","灵武":"640181","石嘴山":"640200","吴忠":"640300","青铜峡":"640381","固原":"640400","中卫":"640500","乌鲁木齐":"650100","新市区":"650104","克拉玛依":"650200","吐鲁番":"650400","哈密":"650500","昌吉":"652301","阜康":"652302","博乐":"652701","阿拉山口":"652702","库尔勒":"652801","阿克苏":"652901","阿图什":"653001","喀什":"653101","和田":"653201","伊宁":"654002","奎屯":"654003","霍尔果斯":"654004","塔城":"654201","乌苏":"654202","阿勒泰":"654301","石河子":"659001","阿拉尔":"659002","图木舒克":"659003","五家渠":"659004","北屯":"659005","铁门关":"659006","双河":"659007","可克达拉":"659008","昆玉":"659009","伊犁":"654000"] - def baiduCityCodeMap = ["北京": "131", "天津": "332", "石家庄": "150", "唐山": "265", "秦皇岛": "148", "邯郸": "151", "邢台": "266", "保定": "307", "张家口": "264", "承德": "207", "沧州": "149", "廊坊": "191", "衡水": "208", "太原": "176", "大同": "355", "阳泉": "357", "长治": "356", "晋城": "290", "朔州": "237", "晋中": "238", "运城": "328", "忻州": "367", "临汾": "368", "吕梁": "327", "呼和浩特": "321", "包头": "229", "乌海": "123", "赤峰": "297", "通辽": "64", "鄂尔多斯": "283", "呼伦贝尔": "61", "巴彦淖尔": "169", "乌兰察布": "168", "兴安盟": "62", "锡林郭勒盟": "63", "阿拉善盟": "230", "沈阳": "58", "大连": "167", "鞍山": "320", "抚顺": "184", "本溪": "227", "丹东": "282", "锦州": "166", "营口": "281", "阜新": "59", "辽阳": "351", "盘锦": "228", "铁岭": "60", "朝阳": "280", "葫芦岛": "319", "长春": "53", "吉林市": "55", "四平": "56", "辽源": "183", "通化": "165", "白山": "57", "松原": "52", "白城": "51", "延边朝鲜族自治州": "54", "哈尔滨": "48", "齐齐哈尔": "41", "鸡西": "46", "鹤岗": "43", "双鸭山": "45", "大庆": "50", "伊春": "40", "佳木斯": "42", "七台河": "47", "牡丹江": "49", "黑河": "39", "绥化": "44", "大兴安岭地区": "38", "上海": "289", "南京": "315", "无锡": "317", "徐州": "316", "常州": "348", "苏州": "224", "南通": "161", "连云港": "347", "淮安": "162", "盐城": "223", "扬州": "346", "镇江": "160", "泰州": "276", "宿迁": "277", "杭州": "179", "宁波": "180", "温州": "178", "嘉兴": "334", "湖州": "294", "绍兴": "293", "金华": "333", "衢州": "243", "舟山": "245", "台州": "244", "丽水": "292", "合肥": "127", "芜湖": "129", "蚌埠": "126", "淮南": "250", "马鞍山": "358", "淮北": "253", "铜陵": "337", "安庆": "130", "黄山": "252", "滁州": "189", "阜阳": "128", "宿州": "370", "巢湖": "251", "六安": "298", "亳州": "188", "池州": "299", "宣城": "190", "福州": "300", "厦门": "194", "莆田": "195", "三明": "254", "泉州": "134", "漳州": "255", "南平": "133", "龙岩": "193", "宁德": "192", "南昌": "163", "景德镇": "225", "萍乡": "350", "九江": "349", "新余": "164", "鹰潭": "279", "赣州": "365", "吉安": "318", "宜春": "278", "抚州": "226", "上饶": "364", "济南": "288", "青岛": "236", "淄博": "354", "枣庄": "172", "东营": "174", "烟台": "326", "潍坊": "287", "济宁": "286", "泰安": "325", "威海": "175", "日照": "173", "莱芜": "124", "临沂": "234", "德州": "372", "聊城": "366", "滨州": "235", "菏泽": "353", "郑州": "268", "开封": "210", "洛阳": "153", "平顶山": "213", "安阳": "267", "鹤壁": "215", "新乡": "152", "焦作": "211", "濮阳": "209", "许昌": "155", "漯河": "344", "三门峡": "212", "南阳": "309", "商丘": "154", "信阳": "214", "周口": "308", "驻马店": "269", "武汉": "218", "黄石": "311", "十堰": "216", "宜昌": "270", "襄阳": "156", "鄂州": "122", "荆门": "217", "孝感": "310", "荆州": "157", "黄冈": "271", "咸宁": "362", "随州": "371", "恩施土家族苗族自治州": "373", "仙桃": "1713", "潜江": "1293", "天门": "2654", "神农架林区": "2734", "长沙": "158", "株洲": "222", "湘潭": "313", "衡阳": "159", "邵阳": "273", "岳阳": "220", "常德": "219", "张家界": "312", "益阳": "272", "郴州": "275", "永州": "314", "怀化": "363", "娄底": "221", "湘西土家族苗族自治州": "274", "广州": "257", "韶关": "137", "深圳": "340", "珠海": "140", "汕头": "303", "佛山": "138", "江门": "302", "湛江": "198", "茂名": "139", "肇庆": "338", "惠州": "301", "梅州": "141", "汕尾": "339", "河源": "200", "阳江": "199", "清远": "197", "东莞": "119", "中山": "187", "潮州": "201", "揭阳": "259", "云浮": "258", "南宁": "261", "柳州": "305", "桂林": "142", "梧州": "304", "北海": "295", "防城港": "204", "钦州": "145", "贵港": "341", "玉林": "361", "百色": "203", "贺州": "260", "河池": "143", "来宾": "202", "崇左": "144", "海口": "125", "三亚": "121", "五指山": "1644", "琼海": "2358", "儋州": "1215", "文昌": "2758", "万宁": "1216", "东方": "2634", "定安": "1214", "屯昌": "1641", "澄迈": "2757", "临高": "2033", "白沙": "2359", "昌江": "1642", "乐东": "2032", "陵水": "1643", "保亭": "1217", "琼中": "2031", "重庆": "132", "成都": "75", "自贡": "78", "攀枝花": "81", "泸州": "331", "德阳": "74", "绵阳": "240", "广元": "329", "遂宁": "330", "内江": "248", "乐山": "79", "南充": "291", "眉山": "77", "宜宾": "186", "广安": "241", "达州": "369", "雅安": "76", "巴中": "239", "资阳": "242", "阿坝州": "185", "甘孜州": "73", "凉山州": "80", "贵阳": "146", "六盘水": "147", "遵义": "262", "安顺": "263", "铜仁地区": "205", "黔西南州": "343", "毕节地区": "206", "黔东南州": "342", "黔南州": "306", "昆明": "104", "曲靖": "249", "玉溪": "106", "保山": "112", "昭通": "336", "丽江": "114", "临沧": "110", "楚雄州": "105", "红河哈尼族彝族自治州": "107", "文山壮族苗族自治州": "177", "普洱": "108", "西双版纳傣族自治州": "109", "大理州": "111", "德宏州": "116", "怒江州": "113", "迪庆州": "115", "拉萨": "100", "昌都地区": "99", "山南地区": "97", "日喀则地区": "102", "那曲地区": "101", "阿里地区": "103", "林芝地区": "98", "西安": "233", "铜川": "232", "宝鸡": "171", "咸阳": "323", "渭南": "170", "延安": "284", "汉中": "352", "榆林": "231", "安康": "324", "商洛": "285", "兰州": "36", "嘉峪关": "33", "金昌": "34", "白银": "35", "天水": "196", "武威": "118", "张掖": "117", "平凉": "359", "酒泉": "37", "庆阳": "135", "定西": "136", "陇南": "256", "临夏回族自治州": "182", "甘南藏族自治州": "247", "西宁": "66", "海东地区": "69", "海北藏族自治州": "67", "黄南藏族自治州": "70", "海南藏族自治州": "68", "果洛藏族自治州": "72", "玉树州": "71", "海西州": "65", "银川": "360", "石嘴山": "335", "吴忠": "322", "固原": "246", "中卫": "181", "乌鲁木齐": "92", "克拉玛依": "95", "吐鲁番地区": "89", "哈密地区": "91", "昌吉州": "93", "博尔塔拉蒙古自治州": "88", "巴音郭楞蒙古自治州": "86", "阿克苏地区": "85", "克孜勒苏柯尔克孜自治州": "84", "喀什地区": "83", "和田地区": "82", "伊犁": "90", "塔城地区": "94", "阿勒泰地区": "96", "石河子": "770", "阿拉尔": "731", "图木舒克": "792", "五家渠": "789", "香港特别行政区": "2912", "澳门特别行政区": "2911"] + def gaodeCityCodeMap = ["鍖椾含":"110000","澶╂触":"120000","鐭冲搴�":"130100","杈涢泦":"130181","鏅嬪窞":"130183","鏂颁箰":"130184","鍞愬北":"130200","婊﹀窞":"130284","閬靛寲":"130281","杩佸畨":"130283","绉︾殗宀�":"130300","閭兏":"130400","姝﹀畨":"130481","閭㈠彴":"130500","鍗楀":"130581","娌欐渤":"130582","淇濆畾":"130600","娑垮窞":"130681","瀹氬窞":"130682","瀹夊浗":"130683","楂樼搴�":"130684","寮犲鍙�":"130700","鎵垮痉":"130800","骞虫硥":"130881","娌у窞":"130900","娉婂ご":"130981","浠讳笜":"130982","榛勯獏":"130983","娌抽棿":"130984","寤婂潑":"131000","闇稿窞":"131081","涓夋渤":"131082","琛℃按":"131100","娣卞窞":"131182","澶師":"140100","鍙や氦":"140181","澶у悓":"140200","闃虫硥":"140300","闀挎不":"140400","鏅嬪煄":"140500","楂樺钩":"140581","鏈斿窞":"140600","鎬�浠�":"140681","鏅嬩腑":"140700","浠嬩紤":"140781","杩愬煄":"140800","姘告祹":"140881","娌虫触":"140882","蹇诲窞":"140900","鍘熷钩":"140981","涓存本":"141000","渚┈":"141081","闇嶅窞":"141082","鍚曟":"141100","瀛濅箟":"141181","姹鹃槼":"141182","鍛煎拰娴╃壒":"150100","鍖呭ご":"150200","涔屾捣":"150300","璧ゅ嘲":"150400","閫氳窘":"150500","闇嶆灄閮嫆":"150581","閯傚皵澶氭柉":"150600","鍛间鸡璐濆皵":"150700","婊℃床閲�":"150781","鐗欏厠鐭�":"150782","鎵庡叞灞�":"150783","棰濆皵鍙ょ撼":"150784","鏍规渤":"150785","宸村溅娣栧皵":"150800","涔屽叞瀵熷竷":"150900","涓伴晣":"150981","涔屽叞娴╃壒":"152201","闃垮皵灞�":"152202","浜岃繛娴╃壒":"152501","閿℃灄娴╃壒":"152502","娌堥槼":"210100","鏂版皯":"210181","澶ц繛":"210200","鐡︽埧搴�":"210281","搴勬渤":"210283","闉嶅北":"210300","娴峰煄":"210381","鎶氶『":"210400","鏈邯":"210500","涓逛笢":"210600","涓滄腐":"210681","鍑ゅ煄":"210682","閿﹀窞":"210700","鍑屾捣":"210781","鍖楅晣":"210782","钀ュ彛":"210800","瑗垮競鍖�":"210803","鐩栧窞":"210881","澶х煶妗�":"210882","闃滄柊":"210900","杈介槼":"211000","鐏":"211081","鐩橀敠":"211100","閾佸箔":"211200","璋冨叺灞�":"211281","寮�鍘�":"211282","鏈濋槼":"211300","鍖楃エ":"211381","鍑屾簮":"211382","钁姦宀�":"211400","鍏村煄":"211481","闀挎槬":"220100","姒嗘爲":"220182","寰锋儬":"220183","鍚夋灄":"220200","铔熸渤":"220281","妗︾敻":"220282","鑸掑叞":"220283","纾愮煶":"220284","鍥涘钩":"220300","鍏富宀�":"220381","鍙岃窘":"220382","杈芥簮":"220400","閫氬寲":"220500","姊呮渤鍙�":"220581","闆嗗畨":"220582","鐧藉北":"220600","涓存睙":"220681","鏉惧師":"220700","鎵朵綑":"220781","鐧藉煄":"220800","娲崡":"220881","澶у畨":"220882","寤跺悏":"222401","鍥句滑":"222402","鏁﹀寲":"222403","鐝叉槬":"222404","榫欎簳":"222405","鍜岄緳":"222406","鍝堝皵婊�":"230100","灏氬織":"230183","浜斿父":"230184","榻愰綈鍝堝皵":"230200","璁锋渤":"230281","楦¤タ":"230300","铏庢灄":"230381","瀵嗗北":"230382","楣ゅ矖":"230400","鍙岄腑灞�":"230500","澶у簡":"230600","浼婃槬":"230700","閾佸姏":"230781","浣虫湪鏂�":"230800","鍚屾睙":"230881","瀵岄敠":"230882","鎶氳繙":"230883","涓冨彴娌�":"230900","鐗′腹姹�":"231000","缁ヨ姮娌�":"231081","娴锋灄":"231083","瀹佸畨":"231084","绌嗘1":"231085","涓滃畞":"231086","榛戞渤":"231100","鍖楀畨":"231181","浜斿ぇ杩炴睜":"231182","缁ュ寲":"231200","瀹夎揪":"231281","鑲囦笢":"231282","娴蜂鸡":"231283","婕犳渤":"232701","涓婃捣":"310000","鍗椾含":"320100","鏃犻敗":"320200","姹熼槾":"320281","瀹滃叴":"320282","寰愬窞":"320300","鏂版矀":"320381","閭冲窞":"320382","甯稿窞":"320400","婧ч槼":"320481","鑻忓窞":"320500","甯哥啛":"320581","寮犲娓�":"320582","鏄嗗北":"320583","澶粨":"320585","鍗楅��":"320600","娴峰畨":"320685","鍚笢":"320681","濡傜殝":"320682","娴烽棬":"320684","杩炰簯娓�":"320700","娣畨":"320800","鐩愬煄":"320900","涓滃彴":"320981","鎵窞":"321000","浠緛":"321081","楂橀偖":"321084","闀囨睙":"321100","涓归槼":"321181","鎵腑":"321182","鍙ュ":"321183","娉板窞":"321200","鍏村寲":"321281","闈栨睙":"321282","娉板叴":"321283","瀹胯縼":"321300","鏉窞":"330100","寤哄痉":"330182","瀹佹尝":"330200","浣欏":"330281","鎱堟邯":"330282","娓╁窞":"330300","鐟炲畨":"330381","涔愭竻":"330382","鍢夊叴":"330400","娴峰畞":"330481","骞虫箹":"330482","妗愪埂":"330483","婀栧窞":"330500","缁嶅叴":"330600","璇告毃":"330681","宓婂窞":"330683","閲戝崕":"330700","鍏版邯":"330781","涔変箤":"330782","涓滈槼":"330783","姘稿悍":"330784","琛㈠窞":"330800","姹熷北":"330881","鑸熷北":"330900","鍙板窞":"331000","娓╁箔":"331081","涓存捣":"331082","鐜夌幆":"331083","涓芥按":"331100","榫欐硥":"331181","鍚堣偉":"340100","宸㈡箹":"340181","鑺滄箹":"340200","铓屽煚":"340300","娣崡":"340400","椹瀺灞�":"340500","娣寳":"340600","閾滈櫟":"340700","瀹夊簡":"340800","娼滃北":"340882","妗愬煄":"340881","榛勫北":"341000","婊佸窞":"341100","澶╅暱":"341181","鏄庡厜":"341182","闃滈槼":"341200","鐣岄":"341282","瀹垮窞":"341300","鍏畨":"341500","浜冲窞":"341600","姹犲窞":"341700","瀹e煄":"341800","瀹佸浗":"341881","绂忓窞":"350100","绂忔竻":"350181","鍘﹂棬":"350200","鑾嗙敯":"350300","涓夋槑":"350400","姘稿畨":"350481","娉夊窞":"350500","鐭崇嫯":"350581","鏅嬫睙":"350582","鍗楀畨":"350583","婕冲窞":"350600","榫欐捣":"350681","鍗楀钩":"350700","閭垫":"350781","姝﹀し灞�":"350782","寤虹摨":"350783","榫欏博":"350800","婕冲钩":"350881","瀹佸痉":"350900","绂忓畨":"350981","绂忛紟":"350982","鍗楁槍":"360100","鏅痉闀�":"360200","涔愬钩":"360281","钀嶄埂":"360300","涔濇睙":"360400","鐟炴槍":"360481","鍏遍潚鍩�":"360482","搴愬北":"360483","鏂颁綑":"360500","楣版江":"360600","璐垫邯":"360681","璧e窞":"360700","鐟為噾":"360781","鍚夊畨":"360800","浜曞唸灞�":"360881","瀹滄槬":"360900","涓板煄":"360981","妯熸爲":"360982","楂樺畨":"360983","鎶氬窞":"361000","涓婇ザ":"361100","寰峰叴":"361181","娴庡崡":"370100","甯備腑鍖�":"370103","闈掑矝":"370200","甯傚崡鍖�":"370202","甯傚寳鍖�":"370203","鑳跺窞":"370281","骞冲害":"370283","鑾辫タ":"370285","娣勫崥":"370300","鏋e簞":"370400","甯備腑鍖�":"370402","婊曞窞":"370481","涓滆惀":"370500","鐑熷彴":"370600","榫欏彛":"370681","鑾遍槼":"370682","鑾卞窞":"370683","钃幈":"370684","鎷涜繙":"370685","鏍栭湠":"370686","娴烽槼":"370687","娼嶅潑":"370700","闈掑窞":"370781","璇稿煄":"370782","瀵垮厜":"370783","瀹変笜":"370784","楂樺瘑":"370785","鏄岄倯":"370786","娴庡畞":"370800","鏇查槣":"370881","閭瑰煄":"370883","娉板畨":"370900","鏂版嘲":"370982","鑲ュ煄":"370983","濞佹捣":"371000","鑽f垚":"371082","涔冲北":"371083","鏃ョ収":"371100","涓存矀":"371300","寰峰窞":"371400","涔愰櫟":"371481","绂瑰煄":"371482","鑱婂煄":"371500","涓存竻":"371581","婊ㄥ窞":"371600","閭瑰钩":"371681","鑿忔辰":"371700","閮戝窞":"410100","宸╀箟":"410181","鑽ラ槼":"410182","鏂板瘑":"410183","鏂伴儜":"410184","鐧诲皝":"410185","寮�灏�":"410200","娲涢槼":"410300","鍋冨笀":"410381","骞抽《灞�":"410400","鑸為挗":"410481","姹濆窞":"410482","瀹夐槼":"410500","鏋楀窞":"410581","楣ゅ":"410600","鏂颁埂":"410700","鍗緣":"410781","杈夊幙":"410782","鐒︿綔":"410800","娌侀槼":"410882","瀛熷窞":"410883","婵槼":"410900","璁告槍":"411000","绂瑰窞":"411081","闀胯憶":"411082","婕渤":"411100","涓夐棬宄�":"411200","涔夐┈":"411281","鐏靛疂":"411282","鍗楅槼":"411300","閭撳窞":"411381","鍟嗕笜":"411400","姘稿煄":"411481","淇¢槼":"411500","鍛ㄥ彛":"411600","椤瑰煄":"411681","椹婚┈搴�":"411700","娴庢簮":"419001","姝︽眽":"420100","榛勭煶":"420200","澶у喍":"420281","鍗佸牥":"420300","涓规睙鍙�":"420381","瀹滄槍":"420500","瀹滈兘":"420581","褰撻槼":"420582","鏋濇睙":"420583","瑗勯槼":"420600","鑰佹渤鍙�":"420682","鏋i槼":"420683","瀹滃煄":"420684","閯傚窞":"420700","鑽嗛棬":"420800","浜北":"420882","閽熺ゥ":"420881","瀛濇劅":"420900","搴斿煄":"420981","瀹夐檰":"420982","姹夊窛":"420984","鑽嗗窞":"421000","娌欏競鍖�":"421002","鐭抽":"421081","娲箹":"421083","鏉炬粙":"421087","榛勫唸":"421100","楹诲煄":"421181","姝︾┐":"421182","鍜稿畞":"421200","璧ゅ":"421281","闅忓窞":"421300","骞挎按":"421381","鎭╂柦":"422801","鍒╁窛":"422802","浠欐":"429004","娼滄睙":"429005","澶╅棬":"429006","闀挎矙":"430100","娴忛槼":"430181","瀹佷埂":"430182","鏍床":"430200","閱撮櫟":"430281","婀樻江":"430300","婀樹埂":"430381","闊跺北":"430382","琛¢槼":"430400","鑰掗槼":"430481","甯稿畞":"430482","閭甸槼":"430500","姝﹀唸":"430581","宀抽槼":"430600","姹ㄧ綏":"430681","涓存箻":"430682","甯稿痉":"430700","娲ュ競":"430781","寮犲鐣�":"430800","鐩婇槼":"430900","娌呮睙":"430981","閮村窞":"431000","璧勫叴":"431081","姘稿窞":"431100","鎬�鍖�":"431200","娲睙":"431281","濞勫簳":"431300","鍐锋按姹�":"431381","娑熸簮":"431382","鍚夐":"433101","骞垮窞":"440100","闊跺叧":"440200","涔愭槍":"440281","鍗楅泟":"440282","娣卞湷":"440300","鐝犳捣":"440400","姹曞ご":"440500","浣涘北":"440600","姹熼棬":"440700","鍙板北":"440781","寮�骞�":"440783","楣ゅ北":"440784","鎭╁钩":"440785","婀涙睙":"440800","寤夋睙":"440881","闆峰窞":"440882","鍚村窛":"440883","鑼傚悕":"440900","楂樺窞":"440981","鍖栧窞":"440982","淇″疁":"440983","鑲囧簡":"441200","鍥涗細":"441284","鎯犲窞":"441300","姊呭窞":"441400","鍏村畞":"441481","姹曞熬":"441500","闄嗕赴":"441581","娌虫簮":"441600","闃虫睙":"441700","闃虫槬":"441781","娓呰繙":"441800","鑻卞痉":"441881","杩炲窞":"441882","涓滆帪":"441900","涓北":"442000","娼窞":"445100","鎻槼":"445200","鏅畞":"445281","浜戞诞":"445300","缃楀畾":"445381","鍗楀畞":"450100","鏌冲窞":"450200","妗傛灄":"450300","鑽旀郸":"450381","姊у窞":"450400","宀戞邯":"450481","鍖楁捣":"450500","闃插煄娓�":"450600","涓滃叴":"450681","閽﹀窞":"450700","璐垫腐":"450800","妗傚钩":"450881","鐜夋灄":"450900","鍖楁祦":"450981","鐧捐壊":"451000","闈栬タ":"451081","璐哄窞":"451100","娌虫睜":"451200","鏉ュ":"451300","鍚堝北":"451381","宕囧乏":"451400","鍑ゥ":"451481","娴峰彛":"460100","涓変簹":"460200","涓夋矙":"460300","鍎嬪窞":"460400","浜旀寚灞�":"469001","鐞兼捣":"469002","鏂囨槍":"469005","涓囧畞":"469006","涓滄柟":"469007","閲嶅簡":"500000","閲嶅簡甯傞儕鍘�":"500200","鎴愰兘":"510100","閮芥睙鍫�":"510181","褰窞":"510182","閭涘磧":"510183","宕囧窞":"510184","绠�闃�":"510185","鑷础":"510300","鏀�鏋濊姳":"510400","娉稿窞":"510500","寰烽槼":"510600","骞挎眽":"510681","浠�閭�":"510682","缁电":"510683","缁甸槼":"510700","姹熸补":"510781","骞垮厓":"510800","閬傚畞":"510900","鍐呮睙":"511000","甯備腑鍖�":"511002","闅嗘槍":"511083","涔愬北":"511100","甯備腑鍖�":"511102","宄ㄧ湁灞�":"511181","鍗楀厖":"511300","闃嗕腑":"511381","鐪夊北":"511400","瀹滃":"511500","骞垮畨":"511600","鍗庤摜":"511681","杈惧窞":"511700","涓囨簮":"511781","闆呭畨":"511800","宸翠腑":"511900","璧勯槼":"512000","椹皵搴�":"513201","搴峰畾":"513301","瑗挎槍":"513401","璐甸槼":"520100","娓呴晣":"520181","鍏洏姘�":"520200","鐩樺窞":"520281","閬典箟":"520300","璧ゆ按":"520381","浠佹��":"520382","瀹夐『":"520400","姣曡妭":"520500","閾滀粊":"520600","鍏翠箟":"522301","鍏翠粊":"522302","鍑噷":"522601","閮藉寑":"522701","绂忔硥":"522702","鏄嗘槑":"530100","瀹夊畞":"530181","鏇查潠":"530300","瀹e▉":"530381","鐜夋邯":"530400","淇濆北":"530500","鑵惧啿":"530581","鏄��":"530600","姘村瘜":"530681","涓芥睙":"530700","鏅幢":"530800","涓存钵":"530900","妤氶泟":"532301","涓棫":"532501","寮�杩�":"532502","钂欒嚜":"532503","寮ュ嫆":"532504","鏂囧北":"532601","鏅椽":"532801","澶х悊":"532901","鐟炰附":"533102","鑺�":"533103","娉告按":"533301","棣欐牸閲屾媺":"533401","鎷夎惃":"540100","鏃ュ杸鍒�":"540200","鏄岄兘":"540300","鏋楄姖":"540400","灞卞崡":"540500","閭f洸":"540600","瑗垮畨":"610100","閾滃窛":"610200","瀹濋浮":"610300","鍜搁槼":"610400","褰窞":"610482","鍏村钩":"610481","娓崡":"610500","闊╁煄":"610581","鍗庨槾":"610582","寤跺畨":"610600","姹変腑":"610700","姒嗘灄":"610800","绁炴湪":"610881","瀹夊悍":"610900","鍟嗘礇":"611000","鍏板窞":"620100","鍢夊唱鍏�":"620200","閲戞槍":"620300","鐧介摱":"620400","澶╂按":"620500","姝﹀▉":"620600","寮犳帠":"620700","骞冲噳":"620800","鍗庝涵":"620881","閰掓硥":"620900","鐜夐棬":"620981","鏁︾厡":"620982","搴嗛槼":"621000","瀹氳タ":"621100","闄囧崡":"621200","涓村":"622901","鍚堜綔":"623001","瑗垮畞":"630100","娴蜂笢":"630200","鐜夋爲":"632701","鏍煎皵鏈�":"632801","寰蜂护鍝�":"632802","鑼礀":"632803","閾跺窛":"640100","鐏垫":"640181","鐭冲槾灞�":"640200","鍚村繝":"640300","闈掗摐宄�":"640381","鍥哄師":"640400","涓崼":"640500","涔岄瞾鏈ㄩ綈":"650100","鏂板競鍖�":"650104","鍏嬫媺鐜涗緷":"650200","鍚愰瞾鐣�":"650400","鍝堝瘑":"650500","鏄屽悏":"652301","闃滃悍":"652302","鍗氫箰":"652701","闃挎媺灞卞彛":"652702","搴撳皵鍕�":"652801","闃垮厠鑻�":"652901","闃垮浘浠�":"653001","鍠�浠�":"653101","鍜岀敯":"653201","浼婂畞":"654002","濂庡悲":"654003","闇嶅皵鏋滄柉":"654004","濉斿煄":"654201","涔岃嫃":"654202","闃垮嫆娉�":"654301","鐭虫渤瀛�":"659001","闃挎媺灏�":"659002","鍥炬湪鑸掑厠":"659003","浜斿娓�":"659004","鍖楀悲":"659005","閾侀棬鍏�":"659006","鍙屾渤":"659007","鍙厠杈炬媺":"659008","鏄嗙帀":"659009","浼婄妬":"654000"] + def baiduCityCodeMap = ["鍖椾含": "131", "澶╂触": "332", "鐭冲搴�": "150", "鍞愬北": "265", "绉︾殗宀�": "148", "閭兏": "151", "閭㈠彴": "266", "淇濆畾": "307", "寮犲鍙�": "264", "鎵垮痉": "207", "娌у窞": "149", "寤婂潑": "191", "琛℃按": "208", "澶師": "176", "澶у悓": "355", "闃虫硥": "357", "闀挎不": "356", "鏅嬪煄": "290", "鏈斿窞": "237", "鏅嬩腑": "238", "杩愬煄": "328", "蹇诲窞": "367", "涓存本": "368", "鍚曟": "327", "鍛煎拰娴╃壒": "321", "鍖呭ご": "229", "涔屾捣": "123", "璧ゅ嘲": "297", "閫氳窘": "64", "閯傚皵澶氭柉": "283", "鍛间鸡璐濆皵": "61", "宸村溅娣栧皵": "169", "涔屽叞瀵熷竷": "168", "鍏村畨鐩�": "62", "閿℃灄閮嫆鐩�": "63", "闃挎媺鍠勭洘": "230", "娌堥槼": "58", "澶ц繛": "167", "闉嶅北": "320", "鎶氶『": "184", "鏈邯": "227", "涓逛笢": "282", "閿﹀窞": "166", "钀ュ彛": "281", "闃滄柊": "59", "杈介槼": "351", "鐩橀敠": "228", "閾佸箔": "60", "鏈濋槼": "280", "钁姦宀�": "319", "闀挎槬": "53", "鍚夋灄甯�": "55", "鍥涘钩": "56", "杈芥簮": "183", "閫氬寲": "165", "鐧藉北": "57", "鏉惧師": "52", "鐧藉煄": "51", "寤惰竟鏈濋矞鏃忚嚜娌诲窞": "54", "鍝堝皵婊�": "48", "榻愰綈鍝堝皵": "41", "楦¤タ": "46", "楣ゅ矖": "43", "鍙岄腑灞�": "45", "澶у簡": "50", "浼婃槬": "40", "浣虫湪鏂�": "42", "涓冨彴娌�": "47", "鐗′腹姹�": "49", "榛戞渤": "39", "缁ュ寲": "44", "澶у叴瀹夊箔鍦板尯": "38", "涓婃捣": "289", "鍗椾含": "315", "鏃犻敗": "317", "寰愬窞": "316", "甯稿窞": "348", "鑻忓窞": "224", "鍗楅��": "161", "杩炰簯娓�": "347", "娣畨": "162", "鐩愬煄": "223", "鎵窞": "346", "闀囨睙": "160", "娉板窞": "276", "瀹胯縼": "277", "鏉窞": "179", "瀹佹尝": "180", "娓╁窞": "178", "鍢夊叴": "334", "婀栧窞": "294", "缁嶅叴": "293", "閲戝崕": "333", "琛㈠窞": "243", "鑸熷北": "245", "鍙板窞": "244", "涓芥按": "292", "鍚堣偉": "127", "鑺滄箹": "129", "铓屽煚": "126", "娣崡": "250", "椹瀺灞�": "358", "娣寳": "253", "閾滈櫟": "337", "瀹夊簡": "130", "榛勫北": "252", "婊佸窞": "189", "闃滈槼": "128", "瀹垮窞": "370", "宸㈡箹": "251", "鍏畨": "298", "浜冲窞": "188", "姹犲窞": "299", "瀹e煄": "190", "绂忓窞": "300", "鍘﹂棬": "194", "鑾嗙敯": "195", "涓夋槑": "254", "娉夊窞": "134", "婕冲窞": "255", "鍗楀钩": "133", "榫欏博": "193", "瀹佸痉": "192", "鍗楁槍": "163", "鏅痉闀�": "225", "钀嶄埂": "350", "涔濇睙": "349", "鏂颁綑": "164", "楣版江": "279", "璧e窞": "365", "鍚夊畨": "318", "瀹滄槬": "278", "鎶氬窞": "226", "涓婇ザ": "364", "娴庡崡": "288", "闈掑矝": "236", "娣勫崥": "354", "鏋e簞": "172", "涓滆惀": "174", "鐑熷彴": "326", "娼嶅潑": "287", "娴庡畞": "286", "娉板畨": "325", "濞佹捣": "175", "鏃ョ収": "173", "鑾辫姕": "124", "涓存矀": "234", "寰峰窞": "372", "鑱婂煄": "366", "婊ㄥ窞": "235", "鑿忔辰": "353", "閮戝窞": "268", "寮�灏�": "210", "娲涢槼": "153", "骞抽《灞�": "213", "瀹夐槼": "267", "楣ゅ": "215", "鏂颁埂": "152", "鐒︿綔": "211", "婵槼": "209", "璁告槍": "155", "婕渤": "344", "涓夐棬宄�": "212", "鍗楅槼": "309", "鍟嗕笜": "154", "淇¢槼": "214", "鍛ㄥ彛": "308", "椹婚┈搴�": "269", "姝︽眽": "218", "榛勭煶": "311", "鍗佸牥": "216", "瀹滄槍": "270", "瑗勯槼": "156", "閯傚窞": "122", "鑽嗛棬": "217", "瀛濇劅": "310", "鑽嗗窞": "157", "榛勫唸": "271", "鍜稿畞": "362", "闅忓窞": "371", "鎭╂柦鍦熷鏃忚嫍鏃忚嚜娌诲窞": "373", "浠欐": "1713", "娼滄睙": "1293", "澶╅棬": "2654", "绁炲啘鏋舵灄鍖�": "2734", "闀挎矙": "158", "鏍床": "222", "婀樻江": "313", "琛¢槼": "159", "閭甸槼": "273", "宀抽槼": "220", "甯稿痉": "219", "寮犲鐣�": "312", "鐩婇槼": "272", "閮村窞": "275", "姘稿窞": "314", "鎬�鍖�": "363", "濞勫簳": "221", "婀樿タ鍦熷鏃忚嫍鏃忚嚜娌诲窞": "274", "骞垮窞": "257", "闊跺叧": "137", "娣卞湷": "340", "鐝犳捣": "140", "姹曞ご": "303", "浣涘北": "138", "姹熼棬": "302", "婀涙睙": "198", "鑼傚悕": "139", "鑲囧簡": "338", "鎯犲窞": "301", "姊呭窞": "141", "姹曞熬": "339", "娌虫簮": "200", "闃虫睙": "199", "娓呰繙": "197", "涓滆帪": "119", "涓北": "187", "娼窞": "201", "鎻槼": "259", "浜戞诞": "258", "鍗楀畞": "261", "鏌冲窞": "305", "妗傛灄": "142", "姊у窞": "304", "鍖楁捣": "295", "闃插煄娓�": "204", "閽﹀窞": "145", "璐垫腐": "341", "鐜夋灄": "361", "鐧捐壊": "203", "璐哄窞": "260", "娌虫睜": "143", "鏉ュ": "202", "宕囧乏": "144", "娴峰彛": "125", "涓変簹": "121", "浜旀寚灞�": "1644", "鐞兼捣": "2358", "鍎嬪窞": "1215", "鏂囨槍": "2758", "涓囧畞": "1216", "涓滄柟": "2634", "瀹氬畨": "1214", "灞槍": "1641", "婢勮繄": "2757", "涓撮珮": "2033", "鐧芥矙": "2359", "鏄屾睙": "1642", "涔愪笢": "2032", "闄垫按": "1643", "淇濅涵": "1217", "鐞间腑": "2031", "閲嶅簡": "132", "鎴愰兘": "75", "鑷础": "78", "鏀�鏋濊姳": "81", "娉稿窞": "331", "寰烽槼": "74", "缁甸槼": "240", "骞垮厓": "329", "閬傚畞": "330", "鍐呮睙": "248", "涔愬北": "79", "鍗楀厖": "291", "鐪夊北": "77", "瀹滃": "186", "骞垮畨": "241", "杈惧窞": "369", "闆呭畨": "76", "宸翠腑": "239", "璧勯槼": "242", "闃垮潩宸�": "185", "鐢樺瓬宸�": "73", "鍑夊北宸�": "80", "璐甸槼": "146", "鍏洏姘�": "147", "閬典箟": "262", "瀹夐『": "263", "閾滀粊鍦板尯": "205", "榛旇タ鍗楀窞": "343", "姣曡妭鍦板尯": "206", "榛斾笢鍗楀窞": "342", "榛斿崡宸�": "306", "鏄嗘槑": "104", "鏇查潠": "249", "鐜夋邯": "106", "淇濆北": "112", "鏄��": "336", "涓芥睙": "114", "涓存钵": "110", "妤氶泟宸�": "105", "绾㈡渤鍝堝凹鏃忓綕鏃忚嚜娌诲窞": "107", "鏂囧北澹棌鑻楁棌鑷不宸�": "177", "鏅幢": "108", "瑗垮弻鐗堢撼鍌f棌鑷不宸�": "109", "澶х悊宸�": "111", "寰峰畯宸�": "116", "鎬掓睙宸�": "113", "杩簡宸�": "115", "鎷夎惃": "100", "鏄岄兘鍦板尯": "99", "灞卞崡鍦板尯": "97", "鏃ュ杸鍒欏湴鍖�": "102", "閭f洸鍦板尯": "101", "闃块噷鍦板尯": "103", "鏋楄姖鍦板尯": "98", "瑗垮畨": "233", "閾滃窛": "232", "瀹濋浮": "171", "鍜搁槼": "323", "娓崡": "170", "寤跺畨": "284", "姹変腑": "352", "姒嗘灄": "231", "瀹夊悍": "324", "鍟嗘礇": "285", "鍏板窞": "36", "鍢夊唱鍏�": "33", "閲戞槍": "34", "鐧介摱": "35", "澶╂按": "196", "姝﹀▉": "118", "寮犳帠": "117", "骞冲噳": "359", "閰掓硥": "37", "搴嗛槼": "135", "瀹氳タ": "136", "闄囧崡": "256", "涓村鍥炴棌鑷不宸�": "182", "鐢樺崡钘忔棌鑷不宸�": "247", "瑗垮畞": "66", "娴蜂笢鍦板尯": "69", "娴峰寳钘忔棌鑷不宸�": "67", "榛勫崡钘忔棌鑷不宸�": "70", "娴峰崡钘忔棌鑷不宸�": "68", "鏋滄礇钘忔棌鑷不宸�": "72", "鐜夋爲宸�": "71", "娴疯タ宸�": "65", "閾跺窛": "360", "鐭冲槾灞�": "335", "鍚村繝": "322", "鍥哄師": "246", "涓崼": "181", "涔岄瞾鏈ㄩ綈": "92", "鍏嬫媺鐜涗緷": "95", "鍚愰瞾鐣湴鍖�": "89", "鍝堝瘑鍦板尯": "91", "鏄屽悏宸�": "93", "鍗氬皵濉旀媺钂欏彜鑷不宸�": "88", "宸撮煶閮钂欏彜鑷不宸�": "86", "闃垮厠鑻忓湴鍖�": "85", "鍏嬪瓬鍕掕嫃鏌皵鍏嬪瓬鑷不宸�": "84", "鍠�浠�鍦板尯": "83", "鍜岀敯鍦板尯": "82", "浼婄妬": "90", "濉斿煄鍦板尯": "94", "闃垮嫆娉板湴鍖�": "96", "鐭虫渤瀛�": "770", "闃挎媺灏�": "731", "鍥炬湪鑸掑厠": "792", "浜斿娓�": "789", "棣欐腐鐗瑰埆琛屾斂鍖�": "2912", "婢抽棬鐗瑰埆琛屾斂鍖�": "2911"] static main(args) { def task = new PoiLocation(); @@ -24,7 +24,7 @@ class PoiLocation { def run(){ def index = 0 - ExcelUtils.multiThreadingModify("D:\\数据\\poi数据\\八城市医院数据.xlsx", { row -> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\poi鏁版嵁\\鍏煄甯傚尰闄㈡暟鎹�.xlsx", { row -> index ++ def city = row['B'] def name = row['C'] @@ -34,8 +34,8 @@ class PoiLocation { def region = row['C'] if(!lat){ - if(address && address.contains("学校地址:")){ - address = address.replace("学校地址:","") + if(address && address.contains("瀛︽牎鍦板潃:")){ + address = address.replace("瀛︽牎鍦板潃:","") } if(!location){ location = parserByGaode(city, name); @@ -72,13 +72,13 @@ class PoiLocation { if(ret){ def str = ret.get(0).location def level = ret.get(0).level - if(str && ["门牌号","单元号","热点商圈","兴趣点"].contains(level)){ + if(str && ["闂ㄧ墝鍙�","鍗曞厓鍙�","鐑偣鍟嗗湀","鍏磋叮鐐�"].contains(level)){ // if(ret.get(0).district==region || ret.get(0).district.contains(region)){ def arrs = str.split(",") return ["lng":arrs[0], "lat":arrs[1]] // }else{ -// println " 区域不[ ${region} - ${ret.get(0).district}]"+address +" "+level +// println " 鍖哄煙涓峓 ${region} - ${ret.get(0).district}]"+address +" "+level // return null // } }else{ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/PriceLevel.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/PriceLevel.groovy index 0f47e7d35..e07aa9705 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/PriceLevel.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/PriceLevel.groovy @@ -28,7 +28,7 @@ class PriceLevel { def run1(){ - def pFile = "D:\\数据\\原数据\\上海平米租金.xlsx"; + def pFile = "D:\\鏁版嵁\\鍘熸暟鎹甛\涓婃捣骞崇背绉熼噾.xlsx"; def startDate = "201706" def index = 0 def weekend = DateUtils.parseFromTightYYYYMMDD("2017-10-08"); @@ -76,7 +76,7 @@ class PriceLevel { return null; } def run(){ - def city = "上海"; + def city = "涓婃捣"; def ret = CommonDatautils.findAllDistricts(city, "district", ["city","region","name"]); def weekend = DateUtils.parseFromTightYYYYMMDD("2017-11-19"); def startDate = "201709" @@ -134,9 +134,9 @@ class PriceLevel { } def rets = []; - rets << ["城市","区域","小区名","可信度","小区均价","均价等级","district_stat均价","district_stat等级","链家","房估估","云估价","价格评级"] + rets << ["鍩庡競","鍖哄煙","灏忓尯鍚�","鍙俊搴�","灏忓尯鍧囦环","鍧囦环绛夌骇","district_stat鍧囦环","district_stat绛夌骇","閾惧","鎴夸及浼�","浜戜及浠�","浠锋牸璇勭骇"] rets.addAll(rowss) - ExcelUtils.write("d:\\数据\\结果\\上海均价对比6.xlsx", rets, "Sheet1") + ExcelUtils.write("d:\\鏁版嵁\\缁撴灉\\涓婃捣鍧囦环瀵规瘮6.xlsx", rets, "Sheet1") } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ProxyHttpUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ProxyHttpUtils.groovy index 72495191d..65ff09d17 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ProxyHttpUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ProxyHttpUtils.groovy @@ -10,40 +10,40 @@ class ProxyHttpUtils { static String proxyPassword = '3B2FBD05B0AF'; static String getProxyResult(targetUrl, data){ - // 将 JSON 对象转换为字符串 + // 灏� JSON 瀵硅薄杞崲涓哄瓧绗︿覆 String jsonData = new JsonOutput().toJson(data); - // 创建代理对象 + // 鍒涘缓浠g悊瀵硅薄 Proxy proxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress(proxyHost, proxyPort)); - // 创建 URL 对象 + // 鍒涘缓 URL 瀵硅薄 URL url = new URL(targetUrl); - // 创建连接对象 + // 鍒涘缓杩炴帴瀵硅薄 URLConnection connection = url.openConnection(proxy); - // 设置代理认证 + // 璁剧疆浠g悊璁よ瘉 java.net.Authenticator.setDefault(new java.net.Authenticator() { protected PasswordAuthentication getPasswordAuthentication() { return new PasswordAuthentication(proxyUsername, proxyPassword.toCharArray()) } }) - // 设置请求方法为 POST + // 璁剧疆璇锋眰鏂规硶涓� POST connection.setRequestMethod("POST"); - // 允许输出流 + // 鍏佽杈撳嚭娴� connection.setDoOutput(true); - // 设置请求头 + // 璁剧疆璇锋眰澶� connection.setRequestProperty("Content-Type", "application/json"); - // 发送请求参数 + // 鍙戦�佽姹傚弬鏁� OutputStream outputStream = connection.getOutputStream(); outputStream.write(jsonData.getBytes("UTF-8")); outputStream.flush(); outputStream.close(); - // 读取响应 + // 璇诲彇鍝嶅簲 int responseCode = connection.getResponseCode() if (responseCode == HttpURLConnection.HTTP_OK) { BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream())); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/QQMapCrawl.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/QQMapCrawl.groovy index 7601a4dab..f21f1a943 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/QQMapCrawl.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/QQMapCrawl.groovy @@ -39,7 +39,7 @@ class QQMapCrawl { static def targetUrl = "http://192.168.0.206:9200/amap_poi/_doc" public static final def dbUrl = "mongodb://192.168.0.235:27018"; - public static final def SOURCE = "腾讯"; + public static final def SOURCE = "鑵捐"; public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(10) final AtomicInteger count = new AtomicInteger() @@ -64,7 +64,7 @@ class QQMapCrawl { }else{ processing(cityLations) - println "长度:"+updateLists.size() + println "闀垮害锛�"+updateLists.size() if(updateLists.size() > 0){ updateBatch(); } @@ -84,7 +84,7 @@ class QQMapCrawl { count.addAndGet(1) search(location) } catch (Exception e) { - println "异常" + println "寮傚父" e.printStackTrace(); } finally { @@ -100,8 +100,8 @@ class QQMapCrawl { def run(){ - //"龙岩"8 - def citys = ["南平","厦门","宁德","龙岩","福州","三明","泉州","莆田","漳州"]// + //"榫欏博"8 + def citys = ["鍗楀钩","鍘﹂棬","瀹佸痉","榫欏博","绂忓窞","涓夋槑","娉夊窞","鑾嗙敯","婕冲窞"]// for(def city : citys){ def cityLations = findAllLation(city); @@ -142,7 +142,7 @@ class QQMapCrawl { int totalPageNum = 1 int curPageNum = 1 int count = 0 - //先查寻第一页,如果总页数大于1,则循环查询 + //鍏堟煡瀵荤涓�椤碉紝濡傛灉鎬婚〉鏁板ぇ浜�1,鍒欏惊鐜煡璇� def rets = [] while (curPageNum <= totalPageNum) { String key = qqKeyPool.get(); @@ -197,7 +197,7 @@ class QQMapCrawl { map.type = arr.category map.m_date = DateUtil.formatDate(new Date(),"yyyy-MM-dd HH:mm:ss").replace(" ","T") map.org_address = arr.address - map.name = arr.title.replace("(建设中)","") + map.name = arr.title.replace("(寤鸿涓�)","") def location = arr.location if(location){ @@ -222,9 +222,9 @@ class QQMapCrawl { def JSONObject doSearch(String type, Double minLng, Double minLat, Double maxLng, Double maxLat, int pageNum, String key) { Map params = new HashMap() - params.put("boundary", "rectangle($minLat,$minLng,$maxLat,$maxLng)")//矩形区域 + params.put("boundary", "rectangle($minLat,$minLng,$maxLat,$maxLng)")//鐭╁舰鍖哄煙 // params.put("filter", type) - params.put("keyword", "住宅") + params.put("keyword", "浣忓畢") params.put("page_size", 20) params.put("page_index", pageNum) params.put("key", key) @@ -271,7 +271,7 @@ class QQMapCrawl { conn.connect(); println param.toString() - //输出流 + //杈撳嚭娴� if (StringUtils.isNotEmpty(param)) { mWriter = new BufferedWriter(new OutputStreamWriter(conn.getOutputStream(), charset)); mWriter.write(param); @@ -297,7 +297,7 @@ class QQMapCrawl { def update(location){ def udata = new BasicDBObject(); - udata.put("status","完成") + udata.put("status","瀹屾垚") BOUNDS_COLL.update(new BasicDBObject('_id', location._id), new BasicDBObject('$set', udata), true, false) } @@ -310,7 +310,7 @@ class QQMapCrawl { for(def location : updateLists){ if(location && location._id){ Document updateDocument = new Document(); - def doc = new Document("status","完成").append("m_date", new Date()) + def doc = new Document("status","瀹屾垚").append("m_date", new Date()) updateDocument.append('$set', doc); Bson updateBson = Filters.eq("_id", location._id); UpdateOneModel updateOneModel = new UpdateOneModel(updateBson, updateDocument); @@ -320,7 +320,7 @@ class QQMapCrawl { try{ COLL.bulkWrite(writeModelList) }catch (Exception e){ - println "异常" + println "寮傚父" } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/QinLingStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/QinLingStat.groovy index 62ae568e5..28b7a8402 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/QinLingStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/QinLingStat.groovy @@ -10,15 +10,15 @@ import com.mongodb.DBObject def index = 0; -ExcelUtils.modify("D:\\数据\\亲邻科技城市小区数量统计3-13.xlsx", { row -> +ExcelUtils.modify("D:\\鏁版嵁\\浜查偦绉戞妧鍩庡競灏忓尯鏁伴噺缁熻3-13.xlsx", { row -> index ++; def city = row['B'] def region = row['C'] - if(city=="黔东南" && region=="凯里"){ + if(city=="榛斾笢鍗�" && region=="鍑噷"){ def districts = findDistricts(city, region); def rMap = statFieldValue(districts); row['G'] = districts.size(); - // 均价 + // 鍧囦环 def priceCount = findDistrictPrice(city, region); row['H']= priceCount row['I']= rMap.name; @@ -60,7 +60,7 @@ ExcelUtils.modify("D:\\ row['AS']= rMap.loudong_count row['AT']= rMap.discount - println "数量:"+index +" "+ row + println "鏁伴噺锛�"+index +" "+ row } },3); @@ -106,157 +106,157 @@ def statFieldValue(def districts){ def discount= 0; for(def dist : districts){ - //小区名 + //灏忓尯鍚� if(dist.name){ name++; } - // 名称别名 + // 鍚嶇О鍒悕 if(dist.alias){ alias++; } - // 地址 + // 鍦板潃 if(dist.address){ address++ } - // 地址别名 + // 鍦板潃鍒悕 if(dist.addr_alias){ addr_alias++ } - // 经度 + // 缁忓害 if(dist.lng && dist.lng){ lng2++ } - // 维度 + // 缁村害 if(dist.lat && dist.lat){ lat2++ } - // 板块 + // 鏉垮潡 if(dist.block){ block++ } - // 环线 + // 鐜嚎 if(dist.loop_line_info){ loop_line_info++ } - // 物业类型 + // 鐗╀笟绫诲瀷 if(dist.estate_type2){ estate_type2++ } - // 建筑类型 + // 寤虹瓚绫诲瀷 if(dist.build_type){ build_type++ } - // 商圈businessQuarter + // 鍟嗗湀businessQuarter if(dist.business_quarter){ business_quarter++ } - // 户数 + // 鎴锋暟 if(dist.household_count){ household_count++ } - // 物业费 + // 鐗╀笟璐� if(dist.estate_charge){ estate_charge++ } - // 停车位 + // 鍋滆溅浣� if(dist.car_site_count){ car_site_count++ } - // 停车位描述 + // 鍋滆溅浣嶆弿杩� if(dist.car_site){ car_site++ } - // 产权年限 + // 浜ф潈骞撮檺 if(dist.property_life){ property_life++ } - // 产权性质 + // 浜ф潈鎬ц川 if(dist.house_property){ house_property++ } - // 开工时间 + // 寮�宸ユ椂闂� if(dist.start_building_date){ start_building_date++ } - // 开盘时间 + // 寮�鐩樻椂闂� if(dist.open_date){ open_date++ } - // 竣工时间 + // 绔e伐鏃堕棿 if(dist.finish_building_date){ finish_building_date++ } - // 交房时间 + // 浜ゆ埧鏃堕棿 if(dist.live_date){ live_date++ } - // 占地面积 + // 鍗犲湴闈㈢Н if(dist.all_area){ all_area++ } - // 建筑面积 + // 寤虹瓚闈㈢Н if(dist.build_area){ build_area++ } - // 容积率 + // 瀹圭Н鐜� if(dist.cubage_percent){ cubage_percent++ } - // 绿化率 + // 缁垮寲鐜� if(dist.virescence_percent){ virescence_percent++ } - // 预售许可证 + // 棰勫敭璁稿彲璇� if(dist.licence){ licence++ } - // 开发商 + // 寮�鍙戝晢 if(dist.developer){ developer++ } - // 物业公司 + // 鐗╀笟鍏徃 if(dist.estate_company){ estate_company++ } - // 装修情况 + // 瑁呬慨鎯呭喌 if(dist.fitment){ fitment++ } - // 建筑结构 + // 寤虹瓚缁撴瀯 if(dist.build_structure){ build_structure++ } - // 周边配套 + // 鍛ㄨ竟閰嶅 if(dist.facilities){ facilities++ } - // 交通状况 + // 浜ら�氱姸鍐� if(dist.traffic){ traffic++ } - // 相关信息 + // 鐩稿叧淇℃伅 if(dist.relate_info){ relate_info++ } - // 描述 + // 鎻忚堪 if(dist.description){ description++ } - // 售楼地址 + // 鍞ゼ鍦板潃 if(dist.sell_address){ sell_address++ } - // 售楼电话 + // 鍞ゼ鐢佃瘽 if(dist.mobile){ mobile++ } - // 楼栋总数 + // 妤兼爧鎬绘暟 if(dist.loudong_count){ loudong_count++ } - // 折扣 + // 鎶樻墸 if(dist.discount){ discount++ } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/QinLingStat1.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/QinLingStat1.groovy index eb85734e0..a4cf464a6 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/QinLingStat1.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/QinLingStat1.groovy @@ -11,19 +11,19 @@ import com.mongodb.DBObject def index = 0; -ExcelUtils.modify("D:\\数据\\亲邻科技城市小区数量统计3-13.xlsx", { row -> +ExcelUtils.modify("D:\\鏁版嵁\\浜查偦绉戞妧鍩庡競灏忓尯鏁伴噺缁熻3-13.xlsx", { row -> index ++; def city = row['B'] def region = row['C'] - if(city && city=='黔东南' && region=="凯里"){ + if(city && city=='榛斾笢鍗�' && region=="鍑噷"){ def districts = findDistricts(city, region); if(districts){ def rMap = statFieldValue(districts); def total = districts.size(); row['G'] = total - // 均价 + // 鍧囦环 def priceCount = findDistrictPrice(city, region); row['H']= percent(priceCount, total) row['I']= percent(rMap.name, total); @@ -65,7 +65,7 @@ ExcelUtils.modify("D:\\ row['AT']= percent(rMap.loudong_count, total); row['AU']= percent(rMap.discount, total); - println "覆盖率:"+index +" "+ row + println "瑕嗙洊鐜囷細"+index +" "+ row } } }, 4); @@ -120,157 +120,157 @@ def statFieldValue(def districts){ def discount= 0; for(def dist : districts){ - //小区名 + //灏忓尯鍚� if(dist.name){ name++; } - // 名称别名 + // 鍚嶇О鍒悕 if(dist.alias){ alias++; } - // 地址 + // 鍦板潃 if(dist.address){ address++ } - // 地址别名 + // 鍦板潃鍒悕 if(dist.addr_alias){ addr_alias++ } - // 经度 + // 缁忓害 if(dist.lng && dist.lng){ lng2++ } - // 维度 + // 缁村害 if(dist.lat && dist.lat){ lat2++ } - // 板块 + // 鏉垮潡 if(dist.block){ block++ } - // 环线 + // 鐜嚎 if(dist.loop_line_info){ loop_line_info++ } - // 物业类型 + // 鐗╀笟绫诲瀷 if(dist.estate_type2){ estate_type2++ } - // 建筑类型 + // 寤虹瓚绫诲瀷 if(dist.build_type){ build_type++ } - // 商圈businessQuarter + // 鍟嗗湀businessQuarter if(dist.business_quarter){ business_quarter++ } - // 户数 + // 鎴锋暟 if(dist.household_count){ household_count++ } - // 物业费 + // 鐗╀笟璐� if(dist.estate_charge){ estate_charge++ } - // 停车位 + // 鍋滆溅浣� if(dist.car_site_count){ car_site_count++ } - // 停车位描述 + // 鍋滆溅浣嶆弿杩� if(dist.car_site){ car_site++ } - // 产权年限 + // 浜ф潈骞撮檺 if(dist.property_life){ property_life++ } - // 产权性质 + // 浜ф潈鎬ц川 if(dist.house_property){ house_property++ } - // 开工时间 + // 寮�宸ユ椂闂� if(dist.start_building_date){ start_building_date++ } - // 开盘时间 + // 寮�鐩樻椂闂� if(dist.open_date){ open_date++ } - // 竣工时间 + // 绔e伐鏃堕棿 if(dist.finish_building_date){ finish_building_date++ } - // 交房时间 + // 浜ゆ埧鏃堕棿 if(dist.live_date){ live_date++ } - // 占地面积 + // 鍗犲湴闈㈢Н if(dist.all_area){ all_area++ } - // 建筑面积 + // 寤虹瓚闈㈢Н if(dist.build_area){ build_area++ } - // 容积率 + // 瀹圭Н鐜� if(dist.cubage_percent){ cubage_percent++ } - // 绿化率 + // 缁垮寲鐜� if(dist.virescence_percent){ virescence_percent++ } - // 预售许可证 + // 棰勫敭璁稿彲璇� if(dist.licence){ licence++ } - // 开发商 + // 寮�鍙戝晢 if(dist.developer){ developer++ } - // 物业公司 + // 鐗╀笟鍏徃 if(dist.estate_company){ estate_company++ } - // 装修情况 + // 瑁呬慨鎯呭喌 if(dist.fitment){ fitment++ } - // 建筑结构 + // 寤虹瓚缁撴瀯 if(dist.build_structure){ build_structure++ } - // 周边配套 + // 鍛ㄨ竟閰嶅 if(dist.facilities){ facilities++ } - // 交通状况 + // 浜ら�氱姸鍐� if(dist.traffic){ traffic++ } - // 相关信息 + // 鐩稿叧淇℃伅 if(dist.relate_info){ relate_info++ } - // 描述 + // 鎻忚堪 if(dist.description){ description++ } - // 售楼地址 + // 鍞ゼ鍦板潃 if(dist.sell_address){ sell_address++ } - // 售楼电话 + // 鍞ゼ鐢佃瘽 if(dist.mobile){ mobile++ } - // 楼栋总数 + // 妤兼爧鎬绘暟 if(dist.loudong_count){ loudong_count++ } - // 折扣 + // 鎶樻墸 if(dist.discount){ discount++ } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/QxjrDataExport.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/QxjrDataExport.groovy index dc478ed45..76c0577ff 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/QxjrDataExport.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/QxjrDataExport.groovy @@ -18,7 +18,7 @@ import com.mongodb.DBObject def line = 0; -ExcelUtils.modify("D:\\数据\\原数据\\房调报告测试数据(2).xlsx", { row -> +ExcelUtils.modify("D:\\鏁版嵁\\鍘熸暟鎹甛\鎴胯皟鎶ュ憡娴嬭瘯鏁版嵁(2).xlsx", { row -> line ++; if(line>=2) { def city = row['B']; @@ -55,7 +55,7 @@ ExcelUtils.modify("D:\\ def max = evalObj.totalPrice * (1 + Math.random() / 100 + 0.05)/10000; def min = evalObj.totalPrice * (1 - Math.random() / 100 - 0.05)/10000; - row["Z"] = min.toInteger()+"万-"+max.toInteger()+"万" + row["Z"] = min.toInteger()+"涓�-"+max.toInteger()+"涓�" } println row @@ -96,25 +96,25 @@ def addRent(city, region, name, month, row){ def addDistrictInfo(row, dbo){ if(dbo){ - //建筑类型 + //寤虹瓚绫诲瀷 row['G'] = dbo.build_type ; - // 竣工日期 + // 绔e伐鏃ユ湡 row['H'] = dbo.finish_building_date ; - // 开发商 + // 寮�鍙戝晢 row['I'] = dbo.developer ; - // 占地面积 + // 鍗犲湴闈㈢Н row['J'] = dbo.all_area ; - // 物业公司 ? + // 鐗╀笟鍏徃 ? row['K'] = dbo.estate_company ; - // 建筑面积 + // 寤虹瓚闈㈢Н row['L'] = dbo.build_area ; - // 容积率 + // 瀹圭Н鐜� row['M'] = dbo.cubage_percent ; - // 绿化率 + // 缁垮寲鐜� row['N'] = dbo.virescence_percent ; - // 物业费 + // 鐗╀笟璐� row['O'] = dbo.estate_charge ; - // 停车位 + // 鍋滆溅浣� row['P'] = dbo.car_site_count ; } return row; @@ -122,14 +122,14 @@ def addDistrictInfo(row, dbo){ def addPois(city, region, name, dbo, row){ - def keys = ["地铁","公交","学校","医院","便利店","超市","餐饮","银行","ATM"] + def keys = ["鍦伴搧","鍏氦","瀛︽牎","鍖婚櫌","渚垮埄搴�","瓒呭競","椁愰ギ","閾惰","ATM"] def index = 36; if(dbo.lat){ def info = [:]; for(def key :keys){ def newkey = key.replace("\\","/"); def details = countPois( city, dbo.lat/10000000000, dbo.lng/10000000000, newkey);//CommonDatautils.findPoiDetail(key, dist.lat2, dist.lng2) - if(!details && key!="机场" && key!="火车站"){ + if(!details && key!="鏈哄満" && key!="鐏溅绔�"){ newkey = key.replace("/",'$'); details = CommonDatautils.findPoiDetail(newkey, dbo.lat2, dbo.lng2); } @@ -143,8 +143,8 @@ def addPois(city, region, name, dbo, row){ def countPois( city, lat, lng, keyword){ def names = [] def results; - if(keyword.indexOf("影院")!=-1){ - keyword = "电影院"; + if(keyword.indexOf("褰遍櫌")!=-1){ + keyword = "鐢靛奖闄�"; } double[] bounds = GeoUtils.getAround(lat,lng,1000) def query = new BasicDBObject() @@ -155,9 +155,9 @@ def countPois( city, lat, lng, keyword){ results = POI.find(query); results.each {BasicDBObject dbo-> if(GeoUtils.calculateDistance(lng, lat, dbo.lng, dbo.lat)){ - if(keyword == "地铁"){ + if(keyword == "鍦伴搧"){ names << dbo.address - }else if(keyword == "公交"){ + }else if(keyword == "鍏氦"){ def s = "" if(dbo.address.toString().indexOf("(")>0){ s = dbo.address.toString().substring(0, dbo.address.toString().indexOf("(")) @@ -282,10 +282,10 @@ def findHouseInfo(def city, def region, def name,def house_num, def room_num, de row['V'] = dbo.direction def s = ""; if(dbo.room>0){ - s = dbo.room + "室"; + s = dbo.room + "瀹�"; } if(dbo.hall > 0){ - s = s + dbo.hall+"厅" + s = s + dbo.hall+"鍘�" } if(s){ row['W'] = s diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/RegionBlockSetting.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/RegionBlockSetting.groovy index 937c82184..932ba5e09 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/RegionBlockSetting.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/RegionBlockSetting.groovy @@ -15,7 +15,7 @@ class RegionBlockSetting { } def run(){ def q = new BasicDBObject() - q.put("ranking_level","县级市") + q.put("ranking_level","鍘跨骇甯�") def dbcursor = REGION_BLOCK_COLL.find(q) def index = 0 for(def d : dbcursor){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/RegionUpdate.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/RegionUpdate.groovy index deff62712..21888e3cf 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/RegionUpdate.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/RegionUpdate.groovy @@ -14,11 +14,11 @@ class RegionUpdate { static main(args) { def task = new RegionUpdate(); // task.run(); - task.run1();//漳州区域修改 + task.run1();//婕冲窞鍖哄煙淇敼 } def run1(){ - def city = "四平" + def city = "鍥涘钩" def districts = CommonDatautils.findAllFiledDistrict("district",city); def regions = CommonDatautils.getRegionListByCity(city) @@ -27,9 +27,9 @@ class RegionUpdate { DistrictRegionTransfer transfer = new DistrictRegionTransfer() def regionErrorIndex = 0 if(districts){ - //根据经纬度获取经纬度所在区域 + //鏍规嵁缁忕含搴﹁幏鍙栫粡绾害鎵�鍦ㄥ尯鍩� for(def dist : districts){ - if(dist.region!="公主岭"){ + if(dist.region!="鍏富宀�"){ continue } index++ @@ -108,7 +108,7 @@ class RegionUpdate { } def run(){ - def datas = ExcelUtils.read("d:\\数据\\上海精确地址地图区域对比.xlsx", 0, 1) + def datas = ExcelUtils.read("d:\\鏁版嵁\\涓婃捣绮剧‘鍦板潃鍦板浘鍖哄煙瀵规瘮.xlsx", 0, 1) for(def data : datas){ def id = data[0] diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/RoomStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/RoomStat.groovy index e83135e20..ec0121b3c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/RoomStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/RoomStat.groovy @@ -26,7 +26,7 @@ class RoomStat { def run(){ def index = 0; - ExcelUtils.modify("D:\\数据\\城市房源户型统计.xlsx", { row -> + ExcelUtils.modify("D:\\鏁版嵁\\鍩庡競鎴挎簮鎴峰瀷缁熻.xlsx", { row -> index ++; def city = row['A'] def room1 = findHouse(city, 1); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/RoundPoiFilter.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/RoundPoiFilter.groovy index e102d5ed9..14d3c18cf 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/RoundPoiFilter.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/RoundPoiFilter.groovy @@ -10,8 +10,8 @@ import com.fangjia.script.util.ExcelUtils -def priceFiles = getFiles("D:\\数据\\原数据\\东北师范大学\\东北师范大学(小区均价)副本-1\\"); -//def citys = ["上海","北京","成都"] +def priceFiles = getFiles("D:\\鏁版嵁\\鍘熸暟鎹甛\涓滃寳甯堣寖澶у\\涓滃寳甯堣寖澶у锛堝皬鍖哄潎浠凤級鍓湰-1\\"); +//def citys = ["涓婃捣","鍖椾含","鎴愰兘"] def count = 0; for(def pFile : priceFiles){ count++; @@ -22,23 +22,23 @@ for(def pFile : priceFiles){ // if(citys.contains(city)){ // continue; // } -// List> pDatas = ExcelUtils.read("D:\\数据\\原数据\\东北师范大学\\东北师范大学(小区均价)副本\\"+city+".xlsx", 2); +// List> pDatas = ExcelUtils.read("D:\\鏁版嵁\\鍘熸暟鎹甛\涓滃寳甯堣寖澶у\\涓滃寳甯堣寖澶у锛堝皬鍖哄潎浠凤級鍓湰\\"+city+".xlsx", 2); // def keys = []; // for(def row : pDatas){ // keys << row[0]+"#"+row[1]+"#"+row[2] // } -// def distFileName = "D:\\数据\\原数据\\东北师范大学\\东北师范大学\\东北师范大学---周边配套信息("+city+")-2.xlsx" +// def distFileName = "D:\\鏁版嵁\\鍘熸暟鎹甛\涓滃寳甯堣寖澶у\\涓滃寳甯堣寖澶у\\涓滃寳甯堣寖澶у---鍛ㄨ竟閰嶅淇℃伅("+city+")-2.xlsx" // ExcelUtils.filter(distFileName,{row-> // def key = row[0]+"#"+row[1]+"#"+row[2] // if(!keys.contains(key)){ -// return false;//删除 +// return false;//鍒犻櫎 // }else{ -// return true;//保留 +// return true;//淇濈暀 // } // },0) // -// def mapFile = "D:\\数据\\原数据\\东北师范大学\\东北师范大学\\东北师范大学---周边配套信息("+city+")-1.xlsx" +// def mapFile = "D:\\鏁版嵁\\鍘熸暟鎹甛\涓滃寳甯堣寖澶у\\涓滃寳甯堣寖澶у\\涓滃寳甯堣寖澶у---鍛ㄨ竟閰嶅淇℃伅("+city+")-1.xlsx" // try { // ExcelUtils.modify(mapFile, { row -> // def subway = row['AD'] @@ -54,7 +54,7 @@ for(def pFile : priceFiles){ ExcelUtils.modify(pFile, { row -> // def flag = isContinue(row); -// if(!flag){//断掉,进行修改操作 +// if(!flag){//鏂帀锛岃繘琛屼慨鏀规搷浣� def index = 0; def update = false; @@ -76,8 +76,8 @@ for(def pFile : priceFiles){ // } }, 2) - ExcelUtils.excelToCSV("D:\\数据\\原数据\\东北师范大学\\东北师范大学(小区均价)副本-1\\"+city+".xlsx",2) - println city +" 完成" + ExcelUtils.excelToCSV("D:\\鏁版嵁\\鍘熸暟鎹甛\涓滃寳甯堣寖澶у\\涓滃寳甯堣寖澶у锛堝皬鍖哄潎浠凤級鍓湰-1\\"+city+".xlsx",2) + println city +" 瀹屾垚" } def isContinue(row){ @@ -110,7 +110,7 @@ def getFiles(filePath){ return files; } -//File file = new File("D:\\数据\\原数据\\东北师范大学\\东北师范大学(小区均价)副本"); +//File file = new File("D:\\鏁版嵁\\鍘熸暟鎹甛\涓滃寳甯堣寖澶у\\涓滃寳甯堣寖澶у锛堝皬鍖哄潎浠凤級鍓湰"); //File[] tempList = file.listFiles(); // //def files = []; @@ -120,7 +120,7 @@ def getFiles(filePath){ // } //} // -////去除无效小区 +////鍘婚櫎鏃犳晥灏忓尯 //def index=0; //for (def fileName : files){ // ExcelUtils.filter(fileName,{row-> @@ -132,12 +132,12 @@ def getFiles(filePath){ // } // // },2) -// println fileName +"完成....." +// println fileName +"瀹屾垚....." //} -//def filePath = "D:\\数据\\原数据\\东北师范大学\\上海.xlsx"; -////def filePath = "D:\\数据\\结果\\东北师范大学\\东北师范大学---贵阳.xlsx"; +//def filePath = "D:\\鏁版嵁\\鍘熸暟鎹甛\涓滃寳甯堣寖澶у\\涓婃捣.xlsx"; +////def filePath = "D:\\鏁版嵁\\缁撴灉\\涓滃寳甯堣寖澶у\\涓滃寳甯堣寖澶у---璐甸槼.xlsx"; //def index = 0; //ExcelUtils.filter(filePath,{row-> // def value = row['AL'] @@ -151,4 +151,4 @@ def getFiles(filePath){ //},2) -//ExcelUtils.excelToCSV("D:\\数据\\结果\\东北师范大学\\东北师范大学---周边配套信息(北京)-1.xlsx",0) \ No newline at end of file +//ExcelUtils.excelToCSV("D:\\鏁版嵁\\缁撴灉\\涓滃寳甯堣寖澶у\\涓滃寳甯堣寖澶у---鍛ㄨ竟閰嶅淇℃伅(鍖椾含)-1.xlsx",0) \ No newline at end of file diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/RunLocationInfo.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/RunLocationInfo.groovy index 22d6246fc..761850d0b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/RunLocationInfo.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/RunLocationInfo.groovy @@ -18,7 +18,7 @@ import java.util.regex.Pattern line = 0; updateIndex = 0 -ExcelUtils.modify("D:\\数据\\上海经纬度测试(0725).xlsx", { row -> +ExcelUtils.modify("D:\\鏁版嵁\\涓婃捣缁忕含搴︽祴璇�(0725).xlsx", { row -> line ++; if(line>=1) { def city = row['F']; @@ -190,14 +190,14 @@ public static com.alibaba.fastjson.JSONObject queryMaxSimilarAddress(String city continue; } - if(jo_item.containsKey("type") && !jo_item.getString("type").contains("住宅")){ + if(jo_item.containsKey("type") && !jo_item.getString("type").contains("浣忓畢")){ continue; } String item_address = jo_item.containsKey("address") ? jo_item.getString("address") : null; String item_name = jo_item.containsKey("name") ? jo_item.getString("name") : null; if(item_name){ - item_name = item_name.replace("·","").replace("1区","一区").replace("2区","二区").replace("3区","三区").replace("4区","四区").replace("5区","五区").replace("6区","六区").replace("7区","七区").replace("8区","八区").replace("1期","一期").replace("2期","二期").replace("3期","三期").replace("4期","四期").replace("5期","五期").replace("6期","六期").replace("7期","七期").replace("8期","八期") + item_name = item_name.replace("路","").replace("1鍖�","涓�鍖�").replace("2鍖�","浜屽尯").replace("3鍖�","涓夊尯").replace("4鍖�","鍥涘尯").replace("5鍖�","浜斿尯").replace("6鍖�","鍏尯").replace("7鍖�","涓冨尯").replace("8鍖�","鍏尯").replace("1鏈�","涓�鏈�").replace("2鏈�","浜屾湡").replace("3鏈�","涓夋湡").replace("4鏈�","鍥涙湡").replace("5鏈�","浜旀湡").replace("6鏈�","鍏湡").replace("7鏈�","涓冩湡").replace("8鏈�","鍏湡") } boolean getedData = false; if(isFullMatch == true){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/SearchDistrictAddress.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/SearchDistrictAddress.groovy index 84d28920c..b1d2a696f 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/SearchDistrictAddress.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/SearchDistrictAddress.groovy @@ -8,7 +8,7 @@ import java.util.regex.Pattern class SearchDistrictAddress { - def codeMap = ["北京": "131", "天津": "332", "石家庄": "150", "唐山": "265", "秦皇岛": "148", "邯郸": "151", "邢台": "266", "保定": "307", "张家口": "264", "承德": "207", "沧州": "149", "廊坊": "191", "衡水": "208", "太原": "176", "大同": "355", "阳泉": "357", "长治": "356", "晋城": "290", "朔州": "237", "晋中": "238", "运城": "328", "忻州": "367", "临汾": "368", "吕梁": "327", "呼和浩特": "321", "包头": "229", "乌海": "123", "赤峰": "297", "通辽": "64", "鄂尔多斯": "283", "呼伦贝尔": "61", "巴彦淖尔": "169", "乌兰察布": "168", "兴安盟": "62", "锡林郭勒盟": "63", "阿拉善盟": "230", "沈阳": "58", "大连": "167", "鞍山": "320", "抚顺": "184", "本溪": "227", "丹东": "282", "锦州": "166", "营口": "281", "阜新": "59", "辽阳": "351", "盘锦": "228", "铁岭": "60", "朝阳": "280", "葫芦岛": "319", "长春": "53", "吉林市": "55", "四平": "56", "辽源": "183", "通化": "165", "白山": "57", "松原": "52", "白城": "51", "延边朝鲜族自治州": "54", "哈尔滨": "48", "齐齐哈尔": "41", "鸡西": "46", "鹤岗": "43", "双鸭山": "45", "大庆": "50", "伊春": "40", "佳木斯": "42", "七台河": "47", "牡丹江": "49", "黑河": "39", "绥化": "44", "大兴安岭地区": "38", "上海": "289", "南京": "315", "无锡": "317", "徐州": "316", "常州": "348", "苏州": "224", "南通": "161", "连云港": "347", "淮安": "162", "盐城": "223", "扬州": "346", "镇江": "160", "泰州": "276", "宿迁": "277", "杭州": "179", "宁波": "180", "温州": "178", "嘉兴": "334", "湖州": "294", "绍兴": "293", "金华": "333", "衢州": "243", "舟山": "245", "台州": "244", "丽水": "292", "合肥": "127", "芜湖": "129", "蚌埠": "126", "淮南": "250", "马鞍山": "358", "淮北": "253", "铜陵": "337", "安庆": "130", "黄山": "252", "滁州": "189", "阜阳": "128", "宿州": "370", "巢湖": "251", "六安": "298", "亳州": "188", "池州": "299", "宣城": "190", "福州": "300", "厦门": "194", "莆田": "195", "三明": "254", "泉州": "134", "漳州": "255", "南平": "133", "龙岩": "193", "宁德": "192", "南昌": "163", "景德镇": "225", "萍乡": "350", "九江": "349", "新余": "164", "鹰潭": "279", "赣州": "365", "吉安": "318", "宜春": "278", "抚州": "226", "上饶": "364", "济南": "288", "青岛": "236", "淄博": "354", "枣庄": "172", "东营": "174", "烟台": "326", "潍坊": "287", "济宁": "286", "泰安": "325", "威海": "175", "日照": "173", "莱芜": "124", "临沂": "234", "德州": "372", "聊城": "366", "滨州": "235", "菏泽": "353", "郑州": "268", "开封": "210", "洛阳": "153", "平顶山": "213", "安阳": "267", "鹤壁": "215", "新乡": "152", "焦作": "211", "濮阳": "209", "许昌": "155", "漯河": "344", "三门峡": "212", "南阳": "309", "商丘": "154", "信阳": "214", "周口": "308", "驻马店": "269", "武汉": "218", "黄石": "311", "十堰": "216", "宜昌": "270", "襄阳": "156", "鄂州": "122", "荆门": "217", "孝感": "310", "荆州": "157", "黄冈": "271", "咸宁": "362", "随州": "371", "恩施土家族苗族自治州": "373", "仙桃": "1713", "潜江": "1293", "天门": "2654", "神农架林区": "2734", "长沙": "158", "株洲": "222", "湘潭": "313", "衡阳": "159", "邵阳": "273", "岳阳": "220", "常德": "219", "张家界": "312", "益阳": "272", "郴州": "275", "永州": "314", "怀化": "363", "娄底": "221", "湘西土家族苗族自治州": "274", "广州": "257", "韶关": "137", "深圳": "340", "珠海": "140", "汕头": "303", "佛山": "138", "江门": "302", "湛江": "198", "茂名": "139", "肇庆": "338", "惠州": "301", "梅州": "141", "汕尾": "339", "河源": "200", "阳江": "199", "清远": "197", "东莞": "119", "中山": "187", "潮州": "201", "揭阳": "259", "云浮": "258", "南宁": "261", "柳州": "305", "桂林": "142", "梧州": "304", "北海": "295", "防城港": "204", "钦州": "145", "贵港": "341", "玉林": "361", "百色": "203", "贺州": "260", "河池": "143", "来宾": "202", "崇左": "144", "海口": "125", "三亚": "121", "五指山": "1644", "琼海": "2358", "儋州": "1215", "文昌": "2758", "万宁": "1216", "东方": "2634", "定安": "1214", "屯昌": "1641", "澄迈": "2757", "临高": "2033", "白沙黎族自治": "2359", "昌江黎族自治": "1642", "乐东黎族自治": "2032", "陵水黎族自治": "1643", "保亭黎族苗族自治": "1217", "琼中黎族苗族自治": "2031", "重庆": "132", "成都": "75", "自贡": "78", "攀枝花": "81", "泸州": "331", "德阳": "74", "绵阳": "240", "广元": "329", "遂宁": "330", "内江": "248", "乐山": "79", "南充": "291", "眉山": "77", "宜宾": "186", "广安": "241", "达州": "369", "雅安": "76", "巴中": "239", "资阳": "242", "阿坝藏族羌族自治州": "185", "甘孜藏族自治州": "73", "凉山彝族自治州": "80", "贵阳": "146", "六盘水": "147", "遵义": "262", "安顺": "263", "铜仁地区": "205", "黔西南布依族苗族自治州": "343", "毕节地区": "206", "黔东南苗族侗族自治州": "342", "黔南布依族苗族自治州": "306", "昆明": "104", "曲靖": "249", "玉溪": "106", "保山": "112", "昭通": "336", "丽江": "114", "临沧": "110", "楚雄彝族自治州": "105", "红河哈尼族彝族自治州": "107", "文山壮族苗族自治州": "177", "普洱": "108", "西双版纳傣族自治州": "109", "大理白族自治州": "111", "德宏傣族景颇族自治州": "116", "怒江傈僳族自治州": "113", "迪庆藏族自治州": "115", "拉萨": "100", "昌都地区": "99", "山南地区": "97", "日喀则地区": "102", "那曲地区": "101", "阿里地区": "103", "林芝地区": "98", "西安": "233", "铜川": "232", "宝鸡": "171", "咸阳": "323", "渭南": "170", "延安": "284", "汉中": "352", "榆林": "231", "安康": "324", "商洛": "285", "兰州": "36", "嘉峪关": "33", "金昌": "34", "白银": "35", "天水": "196", "武威": "118", "张掖": "117", "平凉": "359", "酒泉": "37", "庆阳": "135", "定西": "136", "陇南": "256", "临夏回族自治州": "182", "甘南藏族自治州": "247", "西宁": "66", "海东地区": "69", "海北藏族自治州": "67", "黄南藏族自治州": "70", "海南藏族自治州": "68", "果洛藏族自治州": "72", "玉树藏族自治州": "71", "海西蒙古族藏族自治州": "65", "银川": "360", "石嘴山": "335", "吴忠": "322", "固原": "246", "中卫": "181", "乌鲁木齐": "92", "克拉玛依": "95", "吐鲁番地区": "89", "哈密地区": "91", "昌吉回族自治州": "93", "博尔塔拉蒙古自治州": "88", "巴音郭楞蒙古自治州": "86", "阿克苏地区": "85", "克孜勒苏柯尔克孜自治州": "84", "喀什地区": "83", "和田地区": "82", "伊犁哈萨克自治州": "90", "塔城地区": "94", "阿勒泰地区": "96", "石河子": "770", "阿拉尔": "731", "图木舒克": "792", "五家渠": "789", "香港特别行政区": "2912", "澳门特别行政区": "2911"] + def codeMap = ["鍖椾含": "131", "澶╂触": "332", "鐭冲搴�": "150", "鍞愬北": "265", "绉︾殗宀�": "148", "閭兏": "151", "閭㈠彴": "266", "淇濆畾": "307", "寮犲鍙�": "264", "鎵垮痉": "207", "娌у窞": "149", "寤婂潑": "191", "琛℃按": "208", "澶師": "176", "澶у悓": "355", "闃虫硥": "357", "闀挎不": "356", "鏅嬪煄": "290", "鏈斿窞": "237", "鏅嬩腑": "238", "杩愬煄": "328", "蹇诲窞": "367", "涓存本": "368", "鍚曟": "327", "鍛煎拰娴╃壒": "321", "鍖呭ご": "229", "涔屾捣": "123", "璧ゅ嘲": "297", "閫氳窘": "64", "閯傚皵澶氭柉": "283", "鍛间鸡璐濆皵": "61", "宸村溅娣栧皵": "169", "涔屽叞瀵熷竷": "168", "鍏村畨鐩�": "62", "閿℃灄閮嫆鐩�": "63", "闃挎媺鍠勭洘": "230", "娌堥槼": "58", "澶ц繛": "167", "闉嶅北": "320", "鎶氶『": "184", "鏈邯": "227", "涓逛笢": "282", "閿﹀窞": "166", "钀ュ彛": "281", "闃滄柊": "59", "杈介槼": "351", "鐩橀敠": "228", "閾佸箔": "60", "鏈濋槼": "280", "钁姦宀�": "319", "闀挎槬": "53", "鍚夋灄甯�": "55", "鍥涘钩": "56", "杈芥簮": "183", "閫氬寲": "165", "鐧藉北": "57", "鏉惧師": "52", "鐧藉煄": "51", "寤惰竟鏈濋矞鏃忚嚜娌诲窞": "54", "鍝堝皵婊�": "48", "榻愰綈鍝堝皵": "41", "楦¤タ": "46", "楣ゅ矖": "43", "鍙岄腑灞�": "45", "澶у簡": "50", "浼婃槬": "40", "浣虫湪鏂�": "42", "涓冨彴娌�": "47", "鐗′腹姹�": "49", "榛戞渤": "39", "缁ュ寲": "44", "澶у叴瀹夊箔鍦板尯": "38", "涓婃捣": "289", "鍗椾含": "315", "鏃犻敗": "317", "寰愬窞": "316", "甯稿窞": "348", "鑻忓窞": "224", "鍗楅��": "161", "杩炰簯娓�": "347", "娣畨": "162", "鐩愬煄": "223", "鎵窞": "346", "闀囨睙": "160", "娉板窞": "276", "瀹胯縼": "277", "鏉窞": "179", "瀹佹尝": "180", "娓╁窞": "178", "鍢夊叴": "334", "婀栧窞": "294", "缁嶅叴": "293", "閲戝崕": "333", "琛㈠窞": "243", "鑸熷北": "245", "鍙板窞": "244", "涓芥按": "292", "鍚堣偉": "127", "鑺滄箹": "129", "铓屽煚": "126", "娣崡": "250", "椹瀺灞�": "358", "娣寳": "253", "閾滈櫟": "337", "瀹夊簡": "130", "榛勫北": "252", "婊佸窞": "189", "闃滈槼": "128", "瀹垮窞": "370", "宸㈡箹": "251", "鍏畨": "298", "浜冲窞": "188", "姹犲窞": "299", "瀹e煄": "190", "绂忓窞": "300", "鍘﹂棬": "194", "鑾嗙敯": "195", "涓夋槑": "254", "娉夊窞": "134", "婕冲窞": "255", "鍗楀钩": "133", "榫欏博": "193", "瀹佸痉": "192", "鍗楁槍": "163", "鏅痉闀�": "225", "钀嶄埂": "350", "涔濇睙": "349", "鏂颁綑": "164", "楣版江": "279", "璧e窞": "365", "鍚夊畨": "318", "瀹滄槬": "278", "鎶氬窞": "226", "涓婇ザ": "364", "娴庡崡": "288", "闈掑矝": "236", "娣勫崥": "354", "鏋e簞": "172", "涓滆惀": "174", "鐑熷彴": "326", "娼嶅潑": "287", "娴庡畞": "286", "娉板畨": "325", "濞佹捣": "175", "鏃ョ収": "173", "鑾辫姕": "124", "涓存矀": "234", "寰峰窞": "372", "鑱婂煄": "366", "婊ㄥ窞": "235", "鑿忔辰": "353", "閮戝窞": "268", "寮�灏�": "210", "娲涢槼": "153", "骞抽《灞�": "213", "瀹夐槼": "267", "楣ゅ": "215", "鏂颁埂": "152", "鐒︿綔": "211", "婵槼": "209", "璁告槍": "155", "婕渤": "344", "涓夐棬宄�": "212", "鍗楅槼": "309", "鍟嗕笜": "154", "淇¢槼": "214", "鍛ㄥ彛": "308", "椹婚┈搴�": "269", "姝︽眽": "218", "榛勭煶": "311", "鍗佸牥": "216", "瀹滄槍": "270", "瑗勯槼": "156", "閯傚窞": "122", "鑽嗛棬": "217", "瀛濇劅": "310", "鑽嗗窞": "157", "榛勫唸": "271", "鍜稿畞": "362", "闅忓窞": "371", "鎭╂柦鍦熷鏃忚嫍鏃忚嚜娌诲窞": "373", "浠欐": "1713", "娼滄睙": "1293", "澶╅棬": "2654", "绁炲啘鏋舵灄鍖�": "2734", "闀挎矙": "158", "鏍床": "222", "婀樻江": "313", "琛¢槼": "159", "閭甸槼": "273", "宀抽槼": "220", "甯稿痉": "219", "寮犲鐣�": "312", "鐩婇槼": "272", "閮村窞": "275", "姘稿窞": "314", "鎬�鍖�": "363", "濞勫簳": "221", "婀樿タ鍦熷鏃忚嫍鏃忚嚜娌诲窞": "274", "骞垮窞": "257", "闊跺叧": "137", "娣卞湷": "340", "鐝犳捣": "140", "姹曞ご": "303", "浣涘北": "138", "姹熼棬": "302", "婀涙睙": "198", "鑼傚悕": "139", "鑲囧簡": "338", "鎯犲窞": "301", "姊呭窞": "141", "姹曞熬": "339", "娌虫簮": "200", "闃虫睙": "199", "娓呰繙": "197", "涓滆帪": "119", "涓北": "187", "娼窞": "201", "鎻槼": "259", "浜戞诞": "258", "鍗楀畞": "261", "鏌冲窞": "305", "妗傛灄": "142", "姊у窞": "304", "鍖楁捣": "295", "闃插煄娓�": "204", "閽﹀窞": "145", "璐垫腐": "341", "鐜夋灄": "361", "鐧捐壊": "203", "璐哄窞": "260", "娌虫睜": "143", "鏉ュ": "202", "宕囧乏": "144", "娴峰彛": "125", "涓変簹": "121", "浜旀寚灞�": "1644", "鐞兼捣": "2358", "鍎嬪窞": "1215", "鏂囨槍": "2758", "涓囧畞": "1216", "涓滄柟": "2634", "瀹氬畨": "1214", "灞槍": "1641", "婢勮繄": "2757", "涓撮珮": "2033", "鐧芥矙榛庢棌鑷不": "2359", "鏄屾睙榛庢棌鑷不": "1642", "涔愪笢榛庢棌鑷不": "2032", "闄垫按榛庢棌鑷不": "1643", "淇濅涵榛庢棌鑻楁棌鑷不": "1217", "鐞间腑榛庢棌鑻楁棌鑷不": "2031", "閲嶅簡": "132", "鎴愰兘": "75", "鑷础": "78", "鏀�鏋濊姳": "81", "娉稿窞": "331", "寰烽槼": "74", "缁甸槼": "240", "骞垮厓": "329", "閬傚畞": "330", "鍐呮睙": "248", "涔愬北": "79", "鍗楀厖": "291", "鐪夊北": "77", "瀹滃": "186", "骞垮畨": "241", "杈惧窞": "369", "闆呭畨": "76", "宸翠腑": "239", "璧勯槼": "242", "闃垮潩钘忔棌缇屾棌鑷不宸�": "185", "鐢樺瓬钘忔棌鑷不宸�": "73", "鍑夊北褰濇棌鑷不宸�": "80", "璐甸槼": "146", "鍏洏姘�": "147", "閬典箟": "262", "瀹夐『": "263", "閾滀粊鍦板尯": "205", "榛旇タ鍗楀竷渚濇棌鑻楁棌鑷不宸�": "343", "姣曡妭鍦板尯": "206", "榛斾笢鍗楄嫍鏃忎緱鏃忚嚜娌诲窞": "342", "榛斿崡甯冧緷鏃忚嫍鏃忚嚜娌诲窞": "306", "鏄嗘槑": "104", "鏇查潠": "249", "鐜夋邯": "106", "淇濆北": "112", "鏄��": "336", "涓芥睙": "114", "涓存钵": "110", "妤氶泟褰濇棌鑷不宸�": "105", "绾㈡渤鍝堝凹鏃忓綕鏃忚嚜娌诲窞": "107", "鏂囧北澹棌鑻楁棌鑷不宸�": "177", "鏅幢": "108", "瑗垮弻鐗堢撼鍌f棌鑷不宸�": "109", "澶х悊鐧芥棌鑷不宸�": "111", "寰峰畯鍌f棌鏅鏃忚嚜娌诲窞": "116", "鎬掓睙鍌堝兂鏃忚嚜娌诲窞": "113", "杩簡钘忔棌鑷不宸�": "115", "鎷夎惃": "100", "鏄岄兘鍦板尯": "99", "灞卞崡鍦板尯": "97", "鏃ュ杸鍒欏湴鍖�": "102", "閭f洸鍦板尯": "101", "闃块噷鍦板尯": "103", "鏋楄姖鍦板尯": "98", "瑗垮畨": "233", "閾滃窛": "232", "瀹濋浮": "171", "鍜搁槼": "323", "娓崡": "170", "寤跺畨": "284", "姹変腑": "352", "姒嗘灄": "231", "瀹夊悍": "324", "鍟嗘礇": "285", "鍏板窞": "36", "鍢夊唱鍏�": "33", "閲戞槍": "34", "鐧介摱": "35", "澶╂按": "196", "姝﹀▉": "118", "寮犳帠": "117", "骞冲噳": "359", "閰掓硥": "37", "搴嗛槼": "135", "瀹氳タ": "136", "闄囧崡": "256", "涓村鍥炴棌鑷不宸�": "182", "鐢樺崡钘忔棌鑷不宸�": "247", "瑗垮畞": "66", "娴蜂笢鍦板尯": "69", "娴峰寳钘忔棌鑷不宸�": "67", "榛勫崡钘忔棌鑷不宸�": "70", "娴峰崡钘忔棌鑷不宸�": "68", "鏋滄礇钘忔棌鑷不宸�": "72", "鐜夋爲钘忔棌鑷不宸�": "71", "娴疯タ钂欏彜鏃忚棌鏃忚嚜娌诲窞": "65", "閾跺窛": "360", "鐭冲槾灞�": "335", "鍚村繝": "322", "鍥哄師": "246", "涓崼": "181", "涔岄瞾鏈ㄩ綈": "92", "鍏嬫媺鐜涗緷": "95", "鍚愰瞾鐣湴鍖�": "89", "鍝堝瘑鍦板尯": "91", "鏄屽悏鍥炴棌鑷不宸�": "93", "鍗氬皵濉旀媺钂欏彜鑷不宸�": "88", "宸撮煶閮钂欏彜鑷不宸�": "86", "闃垮厠鑻忓湴鍖�": "85", "鍏嬪瓬鍕掕嫃鏌皵鍏嬪瓬鑷不宸�": "84", "鍠�浠�鍦板尯": "83", "鍜岀敯鍦板尯": "82", "浼婄妬鍝堣惃鍏嬭嚜娌诲窞": "90", "濉斿煄鍦板尯": "94", "闃垮嫆娉板湴鍖�": "96", "鐭虫渤瀛�": "770", "闃挎媺灏�": "731", "鍥炬湪鑸掑厠": "792", "浜斿娓�": "789", "棣欐腐鐗瑰埆琛屾斂鍖�": "2912", "婢抽棬鐗瑰埆琛屾斂鍖�": "2911"] static main(args) { def task = new SearchDistrictAddress(); @@ -16,10 +16,10 @@ class SearchDistrictAddress { } def run(){ def index = 0 - ExcelUtils.modify("D:\\数据\\地图搜索.xlsx", { row -> + ExcelUtils.modify("D:\\鏁版嵁\\鍦板浘鎼滅储.xlsx", { row -> index++ def opt = row['O'] - if(row['E']=='中梁首府壹号院'){//!opt || (opt && !opt.toString().contains("房地产")) || + if(row['E']=='涓棣栧簻澹瑰彿闄�'){//!opt || (opt && !opt.toString().contains("鎴垮湴浜�")) || def m = [:] m.city = row['C'] m.region = row['D'] @@ -37,7 +37,7 @@ class SearchDistrictAddress { if(m.name && m.name.length()>=3){ def ret = findBaiduMap(m); if(ret){ - println ret.name +" 原:"+row['O']+" 新:"+ret.estateType + println ret.name +" 鍘燂細"+row['O']+" 鏂帮細"+ret.estateType row['K'] = ret.city row['L'] = ret.region row['M'] = ret.name @@ -53,11 +53,11 @@ class SearchDistrictAddress { def addrRes = selectAddress(addrList) if(addrRes && addrRes.size()>0){ row['P'] = addrRes[0] - println addrList.toString() +" 选:"+addrRes[0] + println addrList.toString() +" 閫夛細"+addrRes[0] } } } - println "------------------------------------【${index}】------------------------------------------" + println "------------------------------------銆�${index}銆�------------------------------------------" } },0); @@ -73,8 +73,8 @@ class SearchDistrictAddress { } if(!ret){ for(def s : addrList){ - if (s.contains("交汇")||s.contains("交叉") ||s.contains("米")) { - if(!s.contains("与;") && !s.startsWith("路") && !s.startsWith("路;")){ + if (s.contains("浜ゆ眹")||s.contains("浜ゅ弶") ||s.contains("绫�")) { + if(!s.contains("涓�;") && !s.startsWith("璺�") && !s.startsWith("璺�;")){ ret << s } } @@ -130,7 +130,7 @@ class SearchDistrictAddress { locationMap.lng2 = (map.lng2.toDouble() * 10000000000).longValue() locationMap.id = ret._id locationMap.city = ret.city - if (ret.address.toString().endsWith("路")) { + if (ret.address.toString().endsWith("璺�")) { locationMap.address = map.address.replace("(","").replace(")",""); } @@ -168,7 +168,7 @@ class SearchDistrictAddress { locationMap.lng2 = (map.lng2.toDouble() * 10000000000).longValue() locationMap.id = ret._id locationMap.city = ret.city - if (ret.address.toString().endsWith("路")) { + if (ret.address.toString().endsWith("璺�")) { locationMap.address = map.address.replace("(","").replace(")",""); } @@ -184,7 +184,7 @@ class SearchDistrictAddress { def map; if (rets) { if (rets.size() >= 1) { - //相似里找有精确地址 + //鐩镐技閲屾壘鏈夌簿纭湴鍧� for (def mapObj : rets) { mapObj.address = com.fangjia.script.util.DataUtil.formateAddress(city, mapObj.address); if (mapObj.address && findPattern(mapObj.address)) { @@ -193,10 +193,10 @@ class SearchDistrictAddress { } } if(!map){ - //交带有交叉口地址 + //浜ゅ甫鏈変氦鍙夊彛鍦板潃 for (def mapObj : rets) { - if (mapObj.address && (mapObj.address.contains("交汇")||mapObj.address.contains("交叉"))) { - if(!mapObj.address.contains("与;") && !mapObj.address.startsWith("路") && !mapObj.address.startsWith("路;")){ + if (mapObj.address && (mapObj.address.contains("浜ゆ眹")||mapObj.address.contains("浜ゅ弶"))) { + if(!mapObj.address.contains("涓�;") && !mapObj.address.startsWith("璺�") && !mapObj.address.startsWith("璺�;")){ map = mapObj; break; } @@ -219,12 +219,12 @@ class SearchDistrictAddress { def matcher = pattern.matcher(address) if (matcher.find()) { def s = matcher.group(); - if (address.indexOf("交汇") > -1 || address.indexOf("与") > -1) { + if (address.indexOf("浜ゆ眹") > -1 || address.indexOf("涓�") > -1) { return null; - } else if (address.indexOf("路") == -1 && address.indexOf("街") == -1 && address.indexOf("大道") == -1 && address.indexOf("巷") == -1 && address.indexOf("北里") == -1 && address.indexOf("南里") == -1 && address.indexOf("东里") == -1 && address.indexOf("西里") == -1) { + } else if (address.indexOf("璺�") == -1 && address.indexOf("琛�") == -1 && address.indexOf("澶ч亾") == -1 && address.indexOf("宸�") == -1 && address.indexOf("鍖楅噷") == -1 && address.indexOf("鍗楅噷") == -1 && address.indexOf("涓滈噷") == -1 && address.indexOf("瑗块噷") == -1) { return null; } else { - pattern = Pattern.compile("[路|街|大道|巷]\\d+"); + pattern = Pattern.compile("[璺瘄琛梶澶ч亾|宸穄\\d+"); matcher = pattern.matcher(address) if(matcher.find()){ return s; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ShLongShangHangLocation.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ShLongShangHangLocation.groovy index 4cc9588c1..1b3638295 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ShLongShangHangLocation.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ShLongShangHangLocation.groovy @@ -11,7 +11,7 @@ class ShLongShangHangLocation { } def run(){ - def rets = ["上海市黄兴路1599号","上海市杨浦区长阳路1687号A栋","上海市杨浦区佳木思路432号","上海市杨浦区控江路1063号","上海市杨浦区鞍山路100号","上海市杨浦区延吉东路287号","上海市杨浦区殷行路408号","上海市杨浦区闸殷路1555号102室","上海市杨浦区平凉路1500号"] + def rets = ["涓婃捣甯傞粍鍏磋矾1599鍙�","涓婃捣甯傛潹娴﹀尯闀块槼璺�1687鍙稟鏍�","涓婃捣甯傛潹娴﹀尯浣虫湪鎬濊矾432鍙�","涓婃捣甯傛潹娴﹀尯鎺ф睙璺�1063鍙�","涓婃捣甯傛潹娴﹀尯闉嶅北璺�100鍙�","涓婃捣甯傛潹娴﹀尯寤跺悏涓滆矾287鍙�","涓婃捣甯傛潹娴﹀尯娈疯璺�408鍙�","涓婃捣甯傛潹娴﹀尯闂告璺�1555鍙�102瀹�","涓婃捣甯傛潹娴﹀尯骞冲噳璺�1500鍙�"] def map = [:] for(def r : rets){ def location = getLocation(r) @@ -20,12 +20,12 @@ class ShLongShangHangLocation { } } def titleMap = [0:'C',1:'D',2:'E',3:'F',4:'G',5:'H',6:'I',7:'J',8:'K'] - ExcelUtils.modify("D:\\数据\\上海农商行\\网点与居委分布20230118.xlsx",{row-> - if(row['B'] && !row['B'].contains("地址") && row['B'].contains('齐齐哈尔路')){ + ExcelUtils.modify("D:\\鏁版嵁\\涓婃捣鍐滃晢琛孿\缃戠偣涓庡眳濮斿垎甯�20230118.xlsx",{row-> + if(row['B'] && !row['B'].contains("鍦板潃") && row['B'].contains('榻愰綈鍝堝皵璺�')){ for(def i=0;i + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\鍒囪瘝缁撴灉2.xlsx", { row -> index++ def addr = row['D'] def excelScore = row['J'] @@ -77,46 +77,46 @@ class SzCarData { if(newName){ def regions = findRegion(city, oldName, regionMap); def score = null - newName = newName.replace("有限责任公司","").replace("服务有限公司","").replace("有限公司","") + newName = newName.replace("鏈夐檺璐d换鍏徃","").replace("鏈嶅姟鏈夐檺鍏徃","").replace("鏈夐檺鍏徃","") // def subNameStr = subName(city, regions[1], newName); def subNameStr = row['F'] // row['G'] = regions[0] // row['H'] = subNameStr - //高德全匹配搜索 + //楂樺痉鍏ㄥ尮閰嶆悳绱� def rets = GaoDeApiUtils.searchByProxy(oldName, gaodeCode, null, "utf-8", true); def gdRes = searchMapByAll(city, oldName, rets); def bdRes = null; def qqRes = null if(gdRes){ - row['I'] = gdRes.matchType+"(高德)" + row['I'] = gdRes.matchType+"(楂樺痉)" row['J'] = 1 score = 1 } - //腾讯全匹配搜索 + //鑵捐鍏ㄥ尮閰嶆悳绱� rets = searchByQQ(city, oldName); qqRes = searchMapByAll(city, oldName, rets); if(qqRes){ - row['M'] = qqRes.matchType+"(腾讯)" + row['M'] = qqRes.matchType+"(鑵捐)" row['N'] = 1 score = 1 } - //百度全匹配搜索 + //鐧惧害鍏ㄥ尮閰嶆悳绱� if(baiduCode){ rets = searchBaiDuMap(oldName, baiduCode.toInteger()) bdRes = searchMapByAll(city, oldName, rets); if(bdRes){ if(bdRes.matchType){ - row['Q'] = bdRes.matchType+"(百度)" + row['Q'] = bdRes.matchType+"(鐧惧害)" } row['R'] = 1 score = 1 } } - //高德全匹配或腾讯全匹配搜索 没有结果 关键字-高德 + //楂樺痉鍏ㄥ尮閰嶆垨鑵捐鍏ㄥ尮閰嶆悳绱� 娌℃湁缁撴灉 鍏抽敭瀛�-楂樺痉 if(!gdRes){ rets = GaoDeApiUtils.searchByProxy(subNameStr, gaodeCode, null, "utf-8", true); gdRes = searchMapBySimilar(city, subNameStr, rets); @@ -128,13 +128,13 @@ class SzCarData { } if(!qqRes){ - //高德全匹配或腾讯全匹配搜索 没有结果 关键字-腾讯 + //楂樺痉鍏ㄥ尮閰嶆垨鑵捐鍏ㄥ尮閰嶆悳绱� 娌℃湁缁撴灉 鍏抽敭瀛�-鑵捐 if(city && subNameStr){ rets = searchByQQ(city, subNameStr); qqRes = searchMapBySimilar(city, subNameStr, rets); if(qqRes){ if(qqRes.matchType){ - row['M'] = qqRes.matchType+"(腾讯)" + row['M'] = qqRes.matchType+"(鑵捐)" } row['N'] = qqRes.score score = qqRes.score @@ -142,14 +142,14 @@ class SzCarData { } } - //高德全匹配或腾讯全匹配搜索 没有结果 关键字-百度 + //楂樺痉鍏ㄥ尮閰嶆垨鑵捐鍏ㄥ尮閰嶆悳绱� 娌℃湁缁撴灉 鍏抽敭瀛�-鐧惧害 if(!bdRes){ if(baiduCode) { rets = searchBaiDuMap(subNameStr, baiduCode.toInteger()); bdRes = searchMapBySimilar(city, subNameStr, rets); if (bdRes) { if(bdRes.matchType){ - row['Q'] = bdRes.matchType + "(百度)" + row['Q'] = bdRes.matchType + "(鐧惧害)" } row['R'] = bdRes.score score = bdRes.score @@ -255,13 +255,13 @@ class SzCarData { // } } - if(address.contains("区")){ - def s = address.toString().substring(0, address.indexOf("区")+1) - if(s && !s.contains("社区") && !s.contains("工业") && !s.contains("街道")){ + if(address.contains("鍖�")){ + def s = address.toString().substring(0, address.indexOf("鍖�")+1) + if(s && !s.contains("绀惧尯") && !s.contains("宸ヤ笟") && !s.contains("琛楅亾")){ if(!s.contains(region)){ newAddress = prefix + address }else{ - s = address.toString().substring(address.indexOf("区")+1) + s = address.toString().substring(address.indexOf("鍖�")+1) newAddress = prefix + s } @@ -332,7 +332,7 @@ class SzCarData { // def regions = m.value // for(def regionMap : regions){ // def region = regionMap.key -// if(!region.contains("开发") && !region.contains("高新") && s.contains(region)){ +// if(!region.contains("寮�鍙�") && !region.contains("楂樻柊") && s.contains(region)){ // newCity = city; // break; // } @@ -348,8 +348,8 @@ class SzCarData { def removeCity(oldName, citys){ citys.each{city-> - if(oldName.contains(city) && !oldName.contains(city+"分公司")){ - oldName = oldName.replace(city+"市","").replace(city,"") + if(oldName.contains(city) && !oldName.contains(city+"鍒嗗叕鍙�")){ + oldName = oldName.replace(city+"甯�","").replace(city,"") } } return oldName @@ -381,11 +381,11 @@ class SzCarData { if(region){ - if(newName.contains("区")){ - def temp = newName.substring(newName.indexOf(region), newName.indexOf("区")+1); + if(newName.contains("鍖�")){ + def temp = newName.substring(newName.indexOf(region), newName.indexOf("鍖�")+1); newName = newName.replace(temp,"") - }else if(newName.contains("县")){ - def temp = newName.substring(newName.indexOf(region), newName.indexOf("县")+1); + }else if(newName.contains("鍘�")){ + def temp = newName.substring(newName.indexOf(region), newName.indexOf("鍘�")+1); newName = newName.replace(temp,"") }else{ newName = newName.replace(region,"") @@ -397,8 +397,8 @@ class SzCarData { def static formatName(String name) { - if(name.indexOf("·") != -1) { - name = name.replaceAll("·", "") + if(name.indexOf("路") != -1) { + name = name.replaceAll("路", "") } if(name.indexOf(".") != -1) { @@ -423,7 +423,7 @@ class SzCarData { def mapCity = RegionData.formatCity(o.cityname) if(mapCity==city && o.name == name){ o.city = mapCity - o.matchType = "全匹配" + o.matchType = "鍏ㄥ尮閰�" bo = o break; } @@ -432,7 +432,7 @@ class SzCarData { // for(def o :rets){ // if(o.name == name){ // o.city = RegionData.formatCity(o.cityname) -// o.matchType = "城市不同,名称匹配" +// o.matchType = "鍩庡競涓嶅悓锛屽悕绉板尮閰�" // bo = o // break; // } @@ -457,7 +457,7 @@ class SzCarData { def name2 = o.name.replace(v, "") if(name1 && name2 && (name1.contains(name2) || name2.contains(name1))){ o.city = mapCity - o.matchType = "城市相同,名称包含(去键字)" + o.matchType = "鍩庡競鐩稿悓锛屽悕绉板寘鍚紙鍘婚敭瀛楋級" bo = o break; } @@ -470,7 +470,7 @@ class SzCarData { def mapCity = RegionData.formatCity(o.cityname) if(city==mapCity && (name.contains(o.name) || o.name.contains(name))){ o.city = mapCity - o.matchType = "城市相同,名称包含" + o.matchType = "鍩庡競鐩稿悓锛屽悕绉板寘鍚�" bo = o break; } @@ -485,7 +485,7 @@ class SzCarData { def name2 = o.name.replace(v, "") if(name1 && name2 && name1.contains(name2) && name2.contains(name1)){ o.city = RegionData.formatCity(o.cityname) - o.matchType = "城市不同,名称包含(去键字)" + o.matchType = "鍩庡競涓嶅悓锛屽悕绉板寘鍚紙鍘婚敭瀛楋級" bo = o break; } @@ -498,7 +498,7 @@ class SzCarData { for(def o :rets){ if(name.contains(o.name) && o.name.contains(name)){ o.city = RegionData.formatCity(o.cityname) - o.matchType = "城市不同,名称包含" + o.matchType = "鍩庡競涓嶅悓锛屽悕绉板寘鍚�" bo = o break; } @@ -563,15 +563,15 @@ class SzCarData { // println obj+" "+e.getMessage() // } - if(obj.key.contains("汽") && name.contains("汽")){ - mapKeyName = obj.key.substring(0, obj.key.indexOf("汽")) - newName = name.substring(0, name.indexOf("汽")) - }else if(obj.key.contains("美容") && name.contains("美容")){ - mapKeyName = obj.key.substring(0, obj.key.indexOf("美容")) - newName = name.substring(0, name.indexOf("美容")) - }else if(obj.key.contains("汽车") || name.contains("汽车")){ - mapKeyName = obj.key.replace("汽车","") - newName = name.replace("汽车","") + if(obj.key.contains("姹�") && name.contains("姹�")){ + mapKeyName = obj.key.substring(0, obj.key.indexOf("姹�")) + newName = name.substring(0, name.indexOf("姹�")) + }else if(obj.key.contains("缇庡") && name.contains("缇庡")){ + mapKeyName = obj.key.substring(0, obj.key.indexOf("缇庡")) + newName = name.substring(0, name.indexOf("缇庡")) + }else if(obj.key.contains("姹借溅") || name.contains("姹借溅")){ + mapKeyName = obj.key.replace("姹借溅","") + newName = name.replace("姹借溅","") }else{ mapKeyName = obj.key newName= name; @@ -581,7 +581,7 @@ class SzCarData { if(city==obj.city){ if(score > maxScore){ maxScore = score; - o.matchType = "城市相同,名称相似" + o.matchType = "鍩庡競鐩稿悓锛屽悕绉扮浉浼�" o.city = obj.city bo = o bo.score = maxScore @@ -601,7 +601,7 @@ class SzCarData { score = CosineSimilarAlgorithm.getSimilarityRatio(mapKeyName, newName); if(score > maxScore){ maxScore = score - o.matchType = "名称相似" + o.matchType = "鍚嶇О鐩镐技" o.city = obj.city bo = o bo.score = maxScore @@ -611,7 +611,7 @@ class SzCarData { def newNameBY = com.fangjia.core.util.DataUtil.hanyuQuanpin(newName, " ") if(mapKeyNameBY == newNameBY){ maxScore = 0.977; - o.matchType = "拼音相似" + o.matchType = "鎷奸煶鐩镐技" o.city = obj.city bo = o bo.score = maxScore @@ -757,12 +757,12 @@ class SzCarData { def allCitys = CommonDatautils.findAllCity(); def allRegionMap = CommonDatautils.getAllCityRegions() - ExcelUtils.multiThreadingModify("D:\\12.27_文艳_第15份.xlsx", { row -> + ExcelUtils.multiThreadingModify("D:\\12.27_鏂囪壋_绗�15浠�.xlsx", { row -> index++ // def city = row['B'] def oldName = row['A'] -// if(oldName.contains("定西中石油昆仑燃气有限公司")){ +// if(oldName.contains("瀹氳タ涓煶娌规槅浠戠噧姘旀湁闄愬叕鍙�")){ def city = findCity(oldName, allCitys, allRegionMap); // if(!city){ // city = row['B'] @@ -785,7 +785,7 @@ class SzCarData { } if(newName) { def regions = findRegion(city, oldName, regionMap); - newName = newName.replace("有限责任公司", "").replace("服务有限公司", "").replace("有限公司", "") + newName = newName.replace("鏈夐檺璐d换鍏徃", "").replace("鏈嶅姟鏈夐檺鍏徃", "").replace("鏈夐檺鍏徃", "") subNameStr = subName(city, regions[1], newName); } @@ -820,7 +820,7 @@ class SzCarData { for(def o : rets){ def vo = [:] if(o.ad_info && o.ad_info.city){ - vo.city = o.ad_info.city.replace("市","") + vo.city = o.ad_info.city.replace("甯�","") vo.cityname = o.ad_info.city } vo.name = o.title @@ -886,13 +886,13 @@ class SzCarData { def index = 0; - geoAreaCodeMap = readGeoAreaCode("D:\\数据\\AMap_adcode_citycode.xlsx"); + geoAreaCodeMap = readGeoAreaCode("D:\\鏁版嵁\\AMap_adcode_citycode.xlsx"); def dataMap = [:] - dataMap = addExistDatas(dataMap,"D:\\数据\\建行\\交付\\第二批(17699)(交付)的副本.xlsx"); - dataMap = addExistDatas(dataMap,"D:\\数据\\建行\\交付\\第一批经纬度_总店地址_12.31.xlsx"); + dataMap = addExistDatas(dataMap,"D:\\鏁版嵁\\寤鸿\\浜や粯\\绗簩鎵�(17699)(浜や粯锛夌殑鍓湰.xlsx"); + dataMap = addExistDatas(dataMap,"D:\\鏁版嵁\\寤鸿\\浜や粯\\绗竴鎵圭粡绾害_鎬诲簵鍦板潃_12.31.xlsx"); //multiThreadingModify - ExcelUtils.multiThreadingModify("D:\\数据\\建行\\第二批(17699)(交付).xlsx", { row -> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\寤鸿\\绗簩鎵�(17699)(浜や粯锛�.xlsx", { row -> index++ def oldName = row['E'] def id = row['C'] @@ -931,7 +931,7 @@ class SzCarData { def rets = GaoDeApiUtils.searchByProxy(oldName, gaodeCode, null, "utf-8", true); gdRes0 = searchMapBySimilar(city, region, newKeys, rets); - //高德全匹配或腾讯全匹配搜索 没有结果 关键字-高德 + //楂樺痉鍏ㄥ尮閰嶆垨鑵捐鍏ㄥ尮閰嶆悳绱� 娌℃湁缁撴灉 鍏抽敭瀛�-楂樺痉 rets = GaoDeApiUtils.searchByProxy(newKeys, gaodeCode, null, "utf-8", true); def gdRes = searchMapBySimilar(city, region, newKeys, rets); if(gdRes0 || gdRes){ @@ -960,7 +960,7 @@ class SzCarData { rets = searchByQQ(city, oldName); qqRes0 = searchMapBySimilar(city, region, newKeys, rets); - //高德全匹配或腾讯全匹配搜索 没有结果 关键字-腾讯 + //楂樺痉鍏ㄥ尮閰嶆垨鑵捐鍏ㄥ尮閰嶆悳绱� 娌℃湁缁撴灉 鍏抽敭瀛�-鑵捐 rets = searchByQQ(city, newKeys); qqRes = searchMapBySimilar(city, region, newKeys, rets); @@ -968,28 +968,28 @@ class SzCarData { if(qqRes0 && qqRes){ if(qqRes0.score>=qqRes.score){ if(qqRes0.matchType){ - row['S'] = qqRes0.matchType+"(腾讯)" + row['S'] = qqRes0.matchType+"(鑵捐)" } row['T'] = qqRes0.score score = qqRes0.score qqRes = qqRes0 }else{ if(qqRes.matchType){ - row['S'] = qqRes.matchType+"(腾讯)" + row['S'] = qqRes.matchType+"(鑵捐)" } row['T'] = qqRes.score score = qqRes.score } }else if(qqRes0){ if(qqRes0.matchType){ - row['S'] = qqRes0.matchType+"(腾讯)" + row['S'] = qqRes0.matchType+"(鑵捐)" } row['T'] = qqRes0.score score = qqRes0.score qqRes = qqRes0 }else if(qqRes){ if(qqRes.matchType){ - row['S'] = qqRes.matchType+"(腾讯)" + row['S'] = qqRes.matchType+"(鑵捐)" } row['T'] = qqRes.score score = qqRes.score @@ -1045,9 +1045,9 @@ class SzCarData { def addressParserName(){ def index = 0; - geoAreaCodeMap = readGeoAreaCode("D:\\数据\\AMap_adcode_citycode.xlsx"); + geoAreaCodeMap = readGeoAreaCode("D:\\鏁版嵁\\AMap_adcode_citycode.xlsx"); //multiThreadingModify - ExcelUtils.multiThreadingModify("D:\\数据\\建行\\待优化重复数据(五)_8930.xlsx", { row -> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\寤鸿\\寰呬紭鍖栭噸澶嶆暟鎹�(浜�)_8930.xlsx", { row -> def shopName = row['E'] def shopAddress = row['F'] def parserCity = row['H'] @@ -1061,14 +1061,14 @@ class SzCarData { if(!parserCity){ parserCity = row['D'] } - if(parserCity && !shopAddress.contains(parserCity) && !shopAddress.contains("省")){ + if(parserCity && !shopAddress.contains(parserCity) && !shopAddress.contains("鐪�")){ shopAddress = parserCity + shopAddress } def res = null def txRes = null; def gaodeCode = getMapCode(parserCity, allCitys, allRegionMap, shopAddress) - if(keyword && keyword.contains('石油分公司')){ + if(keyword && keyword.contains('鐭虫补鍒嗗叕鍙�')){ keyword = parserCity + keyword } println "[ "+index + " ] "+shopName+" "+shopAddress+" KEY:"+keyword @@ -1101,7 +1101,7 @@ class SzCarData { if(res){ row['K'] = res.name row['L'] = res.score - println "【最终所选结果】"+res.name + " " + res.address + println "銆愭渶缁堟墍閫夌粨鏋溿��"+res.name + " " + res.address } println "--------------------------------------------------------------------" } @@ -1119,9 +1119,9 @@ class SzCarData { // def newKey = null; // def newName = null // if(obj){ -// if(shopNameKey && o.disp_name && shopNameKey.contains("汽") && o.disp_name.contains("汽")){ -// newKey = shopNameKey.substring(0, shopNameKey.indexOf("汽")) -// newName = o.disp_name.substring(0, o.disp_name.indexOf("汽")) +// if(shopNameKey && o.disp_name && shopNameKey.contains("姹�") && o.disp_name.contains("姹�")){ +// newKey = shopNameKey.substring(0, shopNameKey.indexOf("姹�")) +// newName = o.disp_name.substring(0, o.disp_name.indexOf("姹�")) // }else{ // newKey = o.disp_name // newName = shopNameKey @@ -1147,54 +1147,54 @@ class SzCarData { def processKey(){ def index = 0 - ExcelUtils.modify("D:\\数据\\建行\\第三批 79155(切词结果).xlsx", { row -> + ExcelUtils.modify("D:\\鏁版嵁\\寤鸿\\绗笁鎵� 79155(鍒囪瘝缁撴灉).xlsx", { row -> def gaodeScore = row['N'] def txScore = row['R'] def keyword = row['I'] def txName = row['O'] - if(keyword && keyword.contains("汽") && (gaodeScore && gaodeScore<0.8 && txScore && txScore<0.8)){ + if(keyword && keyword.contains("姹�") && (gaodeScore && gaodeScore<0.8 && txScore && txScore<0.8)){ def region = row['H'] def gaodeName = row['K'] index++ - def newKeyword = keyword.substring(0, keyword.indexOf("汽")) + def newKeyword = keyword.substring(0, keyword.indexOf("姹�")) println index +" "+ gaodeName+" "+ txName - if(gaodeName && gaodeName.contains("汽")){ + if(gaodeName && gaodeName.contains("姹�")){ def gaodeAddr = row['L'] if(region){ if(gaodeAddr.contains(region)){ - def s1 = gaodeName.substring(0, gaodeName.indexOf("汽")) + def s1 = gaodeName.substring(0, gaodeName.indexOf("姹�")) if(newKeyword == s1){ row['S'] = s1 - println index +" "+ gaodeName + " keyword:"+keyword +" 【${s1}】" + println index +" "+ gaodeName + " keyword:"+keyword +" 銆�${s1}銆�" } } }else{ - def s2 = gaodeName.substring(0, gaodeName.indexOf("汽")) + def s2 = gaodeName.substring(0, gaodeName.indexOf("姹�")) if(newKeyword == s2) { row['S'] = s2 - println index +" "+ gaodeName + " keyword:"+keyword +" 【${s2}】" + println index +" "+ gaodeName + " keyword:"+keyword +" 銆�${s2}銆�" } } } - if(txName && txName.contains("汽")){ + if(txName && txName.contains("姹�")){ def txAddr = row['P'] if(region){ if(txAddr.contains(region)){ - def s3 = txName.substring(0, txName.indexOf("汽")) + def s3 = txName.substring(0, txName.indexOf("姹�")) if(newKeyword == s3) { row['T'] = s3 - println index +" "+ txName + " keyword:"+keyword +" 【${s3}】" + println index +" "+ txName + " keyword:"+keyword +" 銆�${s3}銆�" } } }else{ - def s4 = txName.substring(0, txName.indexOf("汽")) + def s4 = txName.substring(0, txName.indexOf("姹�")) if(newKeyword == s4) { row['T'] = s4 - println index +" "+ txName + " keyword:"+keyword +" 【${s4}】" + println index +" "+ txName + " keyword:"+keyword +" 銆�${s4}銆�" } } } @@ -1206,13 +1206,13 @@ class SzCarData { def addressAddScore(){ def index = 0 //multiThreadingModify - ExcelUtils.multiThreadingModify("D:\\数据\\建行\\第二批(17699)(交付).xlsx", { row -> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\寤鸿\\绗簩鎵�(17699)(浜や粯锛�.xlsx", { row -> def oldAddr = row['F'] def gaodeScore = row['P'] def txScore = row['T'] index++ - if(oldAddr && (oldAddr.contains("路") || oldAddr.contains("街")|| oldAddr.contains("大道"))){ + if(oldAddr && (oldAddr.contains("璺�") || oldAddr.contains("琛�")|| oldAddr.contains("澶ч亾"))){ def gaodeAddr = row['N'] def txAddr = row['R'] def city = row['H']; @@ -1220,18 +1220,18 @@ class SzCarData { def addr = DataUtil.formateAddress(city, oldAddr); - if(addr && (!addr.endsWith("路") && !addr.endsWith("街"))){ + if(addr && (!addr.endsWith("璺�") && !addr.endsWith("琛�"))){ if(gaodeScore && gaodeScore!=1){ if(gaodeAddr && gaodeAddr.contains(addr)){ row['P'] = 0.999 - row['O'] = "地址相符" + row['O'] = "鍦板潃鐩哥" } } if(txScore && txScore!=1){ if(txAddr && txAddr.contains(addr)){ row['T'] = 0.999 - row['S'] = "地址相符" + row['S'] = "鍦板潃鐩哥" } } }else{ @@ -1239,14 +1239,14 @@ class SzCarData { if(gaodeScore && gaodeScore!=1){ if(gaodeAddr && gaodeAddr.contains(addr)){ row['P'] = 0.666 - row['O'] = "同条路" + row['O'] = "鍚屾潯璺�" } } if(txScore && txScore!=1){ if(txAddr && txAddr.contains(addr)){ row['T'] = 0.666 - row['S'] = "同条路" + row['S'] = "鍚屾潯璺�" } } } @@ -1259,7 +1259,7 @@ class SzCarData { def addressSimlar(){ def index = 0 - ExcelUtils.multiThreadingModify("D:\\数据\\建行\\一对多(四)_643.xlsx", { row -> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\寤鸿\\涓�瀵瑰(鍥�)_643.xlsx", { row -> def oldAddr = row['F'] def gaodeAddr = row['N'] def txAddr = row['R'] diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/TempSynchData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/TempSynchData.groovy index 0459e23e7..99fa8267a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/TempSynchData.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/TempSynchData.groovy @@ -11,7 +11,7 @@ import com.mongodb.DBObject * Created by dev on 2017/10/10. */ -//新闻内容 +//鏂伴椈鍐呭 /*DBCollection NEWS_RESOURCE_LINE_COLL = MongoUtils.getCollectionByName("fangjia_coresite", "news_resource", "mongo.db.fangjia.com") DBCollection NEWS_RESOURCE_OFFLINE_COLL = MongoUtils.getCollectionByName("fangjia_coresite", "news_resource", "192.168.0.136") 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 4d5119c0e..d4bace413 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 @@ -28,7 +28,7 @@ import com.mongodb.DBObject // //def citys = CommonDatautils.findAllCity(); //def ret = []; -//ret << ["城市","区域简称","区域全称"] +//ret << ["鍩庡競","鍖哄煙绠�绉�","鍖哄煙鍏ㄧО"] //for(def city : citys){ // DBObject q = new BasicDBObject(); // q.put("city", city) @@ -44,11 +44,11 @@ import com.mongodb.DBObject // } // //} -//ExcelUtils.write("D:\\数据\\结果\\区域信息.xlsx", ret, "数据") +//ExcelUtils.write("D:\\鏁版嵁\\缁撴灉\\鍖哄煙淇℃伅.xlsx", ret, "鏁版嵁") -//ExcelUtils.multiThreadingModify("D:\\数据\\重庆农商行\\重庆农商行测试地址.xlsx",{d-> +//ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\閲嶅簡鍐滃晢琛屾祴璇曞湴鍧�.xlsx",{d-> // if(d['B']){ -// def json = GaoDeApiUtils.geo("重庆", d['B']) +// def json = GaoDeApiUtils.geo("閲嶅簡", d['B']) // if(json && json.info=="OK"){ // def datas = json.geocodes // if(datas){ @@ -70,8 +70,8 @@ import com.mongodb.DBObject // // //}) -//println "开始统计" -//def datas = ExcelUtils.read("C:\\Users\\gaojuan\\Desktop\\成交\\202202.xlsx",0,1) +//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']) @@ -82,9 +82,9 @@ import com.mongodb.DBObject // prices << d['G'] //} // -//def regions = ["闵行","浦东","嘉定","普陀","青浦","静安","金山","松江","虹口","杨浦","奉贤","长宁","宝山","徐汇","崇明","黄浦"] +//def regions = ["闂佃","娴︿笢","鍢夊畾","鏅檧","闈掓郸","闈欏畨","閲戝北","鏉炬睙","铏瑰彛","鏉ㄦ郸","濂夎搐","闀垮畞","瀹濆北","寰愭眹","宕囨槑","榛勬郸"] //def rows = [] -//rows << ["区域","数量", "均价"] +//rows << ["鍖哄煙","鏁伴噺", "鍧囦环"] // //regions.each{e-> // def prices = map.get(e) @@ -95,14 +95,14 @@ import com.mongodb.DBObject //// def price = (prices.sum()/prices.size()).toInteger() //// rows << [region, prices.size(), price] ////} -//ExcelUtils.write("C:\\Users\\gaojuan\\Desktop\\成交\\trend-2202.xlsx", rows, "结果") +//ExcelUtils.write("C:\\Users\\gaojuan\\Desktop\\鎴愪氦\\trend-2202.xlsx", rows, "缁撴灉") -//ExcelUtils.multiThreadingModify("D:\\数据\\其它\\城市等级.xlsx",{d-> +//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-> +ExcelUtils.modify("D:\\鏁版嵁\\鍏跺畠\\鍩庡競绛夌骇.xlsx",{d-> def q = new BasicDBObject() q.put("display", d['C']) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/Test2.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/Test2.groovy index 7e420a09a..b54147835 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/Test2.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/Test2.groovy @@ -22,7 +22,7 @@ class Test2 { //Date date = new Date(1553765171807); //println DateUtils.format(date, "yyyy-MM-dd") - jms.sendMail("gaojuan@fangjia.com", "小区字段覆盖率详细报告", "test") + jms.sendMail("gaojuan@fangjia.com", "灏忓尯瀛楁瑕嗙洊鐜囪缁嗘姤鍛�", "test") } static String test1(long time, String format) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/TestData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/TestData.groovy index dc01a4bb0..26ca4c724 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/TestData.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/TestData.groovy @@ -10,7 +10,7 @@ class TestData { } def run(){ - def path = "D:\\数据\\测试数据\\新增小区.xlsx" + def path = "D:\\鏁版嵁\\娴嬭瘯鏁版嵁\\鏂板灏忓尯.xlsx" matchDatas(path) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/TestEmail.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/TestEmail.groovy index 4e66c4284..9cfd231b1 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/TestEmail.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/TestEmail.groovy @@ -7,20 +7,20 @@ email.setSSL(true); email.setHostName("smtp.exmail.qq.com"); email.setSslSmtpPort("465"); email.setCharset("GBK") -email.setAuthentication("service@fangjia.com", "bRvvVvic8HVgHkCi"); //用户名和密码 -email.addTo("gaojuan@fangjia.com"); //接收方 -email.setFrom("service@fangjia.com"); //发送方 -email.setSubject("test"); //标题 -email.setContent("测试", "text/html"); +email.setAuthentication("service@fangjia.com", "bRvvVvic8HVgHkCi"); //鐢ㄦ埛鍚嶅拰瀵嗙爜 +email.addTo("gaojuan@fangjia.com"); //鎺ユ敹鏂� +email.setFrom("service@fangjia.com"); //鍙戦�佹柟 +email.setSubject("test"); //鏍囬 +email.setContent("娴嬭瘯", "text/html"); //email.setHostName("smtp.exmail.qq.com"); //email.setSSL(true); //email.setSslSmtpPort("465"); //email.setFrom("service@fangjia.com"); // -//email.setAuthentication("service@fangjia.com", "Goojia123456"); //用户名和密码 +//email.setAuthentication("service@fangjia.com", "Goojia123456"); //鐢ㄦ埛鍚嶅拰瀵嗙爜 //email.setSubject("aaaa"); //email.setMsg("bbbb"); //email.setCharset("gbk"); -//email.addTo("gaojuan@fangjia.com"); //接收方 +//email.addTo("gaojuan@fangjia.com"); //鎺ユ敹鏂� email.send(); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/TestEs.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/TestEs.groovy index 7e2bd56c2..5c32a99a1 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/TestEs.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/TestEs.groovy @@ -10,7 +10,7 @@ import net.sf.json.JSON DSCollection SEABIRD = new DataStore("datastore.db.fangjia.com", 27017).getCollection("fangjia.seabird") DBObject q = new BasicDBObject() -q.put("city","海东") +q.put("city","娴蜂笢") q.put("cat","sell"); //q.put("visible", 0) println SEABIRD.count(q); @@ -20,7 +20,7 @@ for(def obj : cursor){ if(dist){ DBObject qq = new BasicDBObject() - qq.put("city","海东") + qq.put("city","娴蜂笢") qq.put("cat","sell"); qq.put("district_name", obj.district_name) println obj.district_name + SEABIRD.count(qq); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/TestExcelStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/TestExcelStat.groovy index 01ee13bf3..1cf013a84 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/TestExcelStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/TestExcelStat.groovy @@ -14,8 +14,8 @@ class TestExcelStat { def testLocation(){ for(def i=0;i<300;i++){ - // def json = GaoDeApiUtils.geo("云南", "德宏傣族景颇族自治州芒市芒市大街59号") - def result = TengXunApiUtils.searchByAddress("广州中山市葵兴大道26号") + // def json = GaoDeApiUtils.geo("浜戝崡", "寰峰畯鍌f棌鏅鏃忚嚜娌诲窞鑺掑競鑺掑競澶ц59鍙�") + def result = TengXunApiUtils.searchByAddress("骞垮窞涓北甯傝懙鍏村ぇ閬�26鍙�") println i +" "+ result.location } @@ -24,7 +24,7 @@ class TestExcelStat { def run(){ def count = 0; - def rows = ExcelUtils.read("D:\\数据\\切词结果(1).xlsx",0,1); + def rows = ExcelUtils.read("D:\\鏁版嵁\\鍒囪瘝缁撴灉(1).xlsx",0,1); def index = 0 rows.each { row -> index ++; @@ -32,17 +32,17 @@ class TestExcelStat { def qq = row['M'] def baidu = row['Q'] def flag = false; - if(gaode && gaode.contains("全匹配") ){ + if(gaode && gaode.contains("鍏ㄥ尮閰�") ){ flag = true; } if(!flag){ - if(qq && qq.contains("全匹配") ){ + if(qq && qq.contains("鍏ㄥ尮閰�") ){ flag = true; } } if(!flag){ - if(baidu && baidu.contains("全匹配") ){ + if(baidu && baidu.contains("鍏ㄥ尮閰�") ){ flag = true; } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/TestFjtLog.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/TestFjtLog.groovy index 5dac60e11..31370428a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/TestFjtLog.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/TestFjtLog.groovy @@ -14,7 +14,7 @@ class TestFjtLog { static main(args) { def q = new BasicDBObject() -// q.put("cat","土地") +// q.put("cat","鍦熷湴") def dbcursor = COLL.find(q).sort(new BasicDBObject("_id",-1)) def map = [:] @@ -36,7 +36,7 @@ class TestFjtLog { } - //将长整型数字转换为日期格式的字符串 + //灏嗛暱鏁村瀷鏁板瓧杞崲涓烘棩鏈熸牸寮忕殑瀛楃涓� static String test1(long time, String format) { SimpleDateFormat dateFormat = new SimpleDateFormat(format); Date date = new Date(time); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/TestGaodeMat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/TestGaodeMat.groovy index 83f4725c8..811a42d4f 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/TestGaodeMat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/TestGaodeMat.groovy @@ -6,34 +6,34 @@ import com.fangjia.script.yinjihaun.amap.GaoDeApiUtils class TestGaodeMat { - def regionCodeMap = ["310101":"黄浦", - "310104":"徐汇", - "310105":"长宁", - "310107":"普陀", - "310109":"虹口", - "310110":"杨浦", - "310112":"闵行", - "310113":"宝山", - "310114":"嘉定", - "310115":"浦东", - "310116":"金山", - "310117":"松江", - "310118":"青浦", - "310120":"奉贤", - "310151":"崇明", - "310106":"静安", + def regionCodeMap = ["310101":"榛勬郸", + "310104":"寰愭眹", + "310105":"闀垮畞", + "310107":"鏅檧", + "310109":"铏瑰彛", + "310110":"鏉ㄦ郸", + "310112":"闂佃", + "310113":"瀹濆北", + "310114":"鍢夊畾", + "310115":"娴︿笢", + "310116":"閲戝北", + "310117":"鏉炬睙", + "310118":"闈掓郸", + "310120":"濂夎搐", + "310151":"宕囨槑", + "310106":"闈欏畨", ] static main(args) { def task = new TestGaodeMat(); - task.run();//原始没切词 + task.run();//鍘熷娌″垏璇� } def run(){ def cityCode = "310000" // multiThreadingModify def index = 0 - ExcelUtils.modify("D:\\数据\\跑高德.xlsx", { row -> + ExcelUtils.modify("D:\\鏁版嵁\\璺戦珮寰�.xlsx", { row -> index++ def name = row['A'] if(!row['C']){ @@ -51,7 +51,7 @@ class TestGaodeMat { def findResult(def rets, def region, def name){ def res = null - def standardRegion = RegionData.formatRegion("上海", region) + def standardRegion = RegionData.formatRegion("涓婃捣", region) if(rets && standardRegion){ for(def o :rets){ def adcode = o.adcode @@ -60,8 +60,8 @@ class TestGaodeMat { if(mapRegion){ if(mapRegion.contains(standardRegion) ||standardRegion.contains(mapRegion)){ - if(name.contains("路") || name.contains("街")){ - if(!o.name.contains("路") && !o.name.contains("街")){ + if(name.contains("璺�") || name.contains("琛�")){ + if(!o.name.contains("璺�") && !o.name.contains("琛�")){ res = o; break } @@ -73,7 +73,7 @@ class TestGaodeMat { } } -// def mapRegion = RegionData.formatRegion("上海", o.region) +// def mapRegion = RegionData.formatRegion("涓婃捣", o.region) // if(mapRegion.contains(region) || region.contains(mapRegion)){ // res = o; // } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/TestLevel.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/TestLevel.groovy index ca6780d9b..07abc8031 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/TestLevel.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/TestLevel.groovy @@ -18,18 +18,18 @@ import static com.fangjia.script.util.ExcelUtils.modify * Created by gaojuan on 2018/1/22. */ -def filename = "D:\\数据\\房价大数据评估测试2.xlsx"; +def filename = "D:\\鏁版嵁\\鎴夸环澶ф暟鎹瘎浼版祴璇�2.xlsx"; modify(filename, { List data -> def address = data['G'] def avgPrice = data['D'].toInteger(); def city = getCityByAddress(address); - def matchRow = '房屋地址' + def matchRow = '鎴垮眿鍦板潃' if(city){ def resp = OpenApiClient.addressMatch(city, address , "district", false) if(resp.getDouble("credit") == 0){ address = data['L'] - matchRow = '备注' + matchRow = '澶囨敞' resp = OpenApiClient.addressMatch(city, address , "district", false) } if(resp.getDouble("credit") > 0){ @@ -84,7 +84,7 @@ def getCityByAddress(def address){ return null; } -//获取经纬度信息 +//鑾峰彇缁忕含搴︿俊鎭� def getLocation(def address){ def locationMap = [:]; def resp = BaiDuApiUtils.geocoder(null, address); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/TestStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/TestStat.groovy index d13eec7cd..49b21b281 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/TestStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/TestStat.groovy @@ -6,7 +6,7 @@ import org.apache.tools.ant.util.DateUtils import org.bson.types.ObjectId def ret = [:] -ExcelUtils.modify("D:\\数据\\bb.xlsx", { row -> +ExcelUtils.modify("D:\\鏁版嵁\\bb.xlsx", { row -> def id = row['A'] def cat = row['C'] def date = new ObjectId(id).getDate(); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/TradeDataMatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/TradeDataMatch.groovy index c395a8a2a..17e2d26e4 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/TradeDataMatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/TradeDataMatch.groovy @@ -61,15 +61,15 @@ class TradeDataMatch { def rMap = null if(!rMap && obj.districtName){ def s = obj.districtName.replace("##","@@").replace("\\","@@") - rMap = OpenApiUtils.matchDistrict("上海", s) + rMap = OpenApiUtils.matchDistrict("涓婃捣", s) } if(!rMap && obj.premisesName){ def s = obj.premisesName.replace("##","@@").replace("\\","@@") - rMap = OpenApiUtils.matchDistrict("上海", s) + rMap = OpenApiUtils.matchDistrict("涓婃捣", s) } if(!rMap && obj.address){ def s = obj.address.replace("##","@@").replace("\\","@@") - rMap = OpenApiUtils.matchDistrict("上海", s) + rMap = OpenApiUtils.matchDistrict("涓婃捣", s) } return rMap; @@ -189,7 +189,7 @@ class TradeDataMatch { conn.connect(); - //输出流 + //杈撳嚭娴� if (StringUtils.isNotEmpty(param)) { mWriter = new BufferedWriter(new OutputStreamWriter(conn.getOutputStream(), charset)); mWriter.write(param); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/TradeMatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/TradeMatch.groovy index a496ed93f..0828bb9ac 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/TradeMatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/TradeMatch.groovy @@ -15,14 +15,14 @@ import java.util.concurrent.ExecutorService import java.util.concurrent.Executors import java.util.concurrent.atomic.AtomicLong -//ExcelUtils.multiThreadingModify("C:\\Users\\gaojuan\\Desktop\\成交未匹配.xlsx",{d-> +//ExcelUtils.multiThreadingModify("C:\\Users\\gaojuan\\Desktop\\鎴愪氦鏈尮閰�.xlsx",{d-> // if(d['A'] && !d['E']){ //// def dist = CommonDatautils.findDistrict(d['A'], d['B'], d['C'].toString(), "district") //// def dist = CommonDatautils.findDistrictByAlias(d['A'], d['B'], d['C'].toString(), "district") // println d['A'] +" "+d['C'] //// def total = findDatas(d['A'], d['B'], d['C']) //// d['D'] = total -// def c = getAmapLocation(d['A']+"市", d['B']+"区", d['C'].replace("?","").replace("·","").replace("?","").replace("|","").replace("·","")) +// def c = getAmapLocation(d['A']+"甯�", d['B']+"鍖�", d['C'].replace("?","").replace("路","").replace("?","").replace("|","").replace("路","")) // d['E'] = c // } //}) @@ -30,12 +30,12 @@ import java.util.concurrent.atomic.AtomicLong def URL = "mongodb://admin:G00MONGOADMIN@192.168.0.100:30009"; DBCollection seaweed_coll = MongoUtils.getCollectionByName2("fangjia", "seaweed", URL) def q = new BasicDBObject() -q.put("city", "上海市") +q.put("city", "涓婃捣甯�") q.put("category", "district") q.put("status", 0) def ret = [] def list = seaweed_coll.find(q).batchSize(5000).toList() -println "总计:"+list.size() +println "鎬昏锛�"+list.size() //for(def l : list){ // def obj = getAmapLocation(l.city, l.region, l.name) // if(obj){ @@ -79,7 +79,7 @@ for(def i=0;i - if(d.name.contains(name) && d.type.contains("住宅") && d.shape){ + if(d.name.contains(name) && d.type.contains("浣忓畢") && d.shape){ obj = d } }) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/UpdateStatWeekend.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/UpdateStatWeekend.groovy index e231a8d7e..d0799e206 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/UpdateStatWeekend.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/UpdateStatWeekend.groovy @@ -28,8 +28,8 @@ class UpdateStatWeekend { } def run(){ - //"合肥","上海","北京","广州","杭州","深圳","石家庄","天津","武汉","西安","重庆", - def citys = ["苏州"] + //"鍚堣偉","涓婃捣","鍖椾含","骞垮窞","鏉窞","娣卞湷","鐭冲搴�","澶╂触","姝︽眽","瑗垮畨","閲嶅簡", + def citys = ["鑻忓窞"] for(def city : citys){ def rets = findAddData(city) process(city, rets) @@ -75,7 +75,7 @@ class UpdateStatWeekend { DIST_STAT_COLL.update(new BasicDBObject('_id', r.id), new BasicDBObject('$set', data)) }catch(Exception e){ DIST_STAT_COLL.remove(new BasicDBObject('_id', r.id)) - println "[重复] "+ r.id + println "[閲嶅] "+ r.id } } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/VagueAddressLocationBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/VagueAddressLocationBatch.groovy index df875945a..69b036f1e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/VagueAddressLocationBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/VagueAddressLocationBatch.groovy @@ -20,7 +20,7 @@ import java.util.regex.Pattern import com.fangjia.script.util.DbUtils /** - * 模糊地址经纬度更新 + * 妯$硦鍦板潃缁忕含搴︽洿鏂� */ @BatchOwner(Watcher.GaoJuan) class VagueAddressLocationBatch extends BaseBatch { @@ -28,7 +28,7 @@ class VagueAddressLocationBatch extends BaseBatch { public static EsDataSource dataSource = new EsDataSource() private static final String address = "jdbc:es://http://192.168.0.206:9200/timezone=UTC&page.size=250&connect.timeout=120s&network.timeout=120s&page.timeout=120s" - def codeMap = ["北京": "131", "天津": "332", "石家庄": "150", "唐山": "265", "秦皇岛": "148", "邯郸": "151", "邢台": "266", "保定": "307", "张家口": "264", "承德": "207", "沧州": "149", "廊坊": "191", "衡水": "208", "太原": "176", "大同": "355", "阳泉": "357", "长治": "356", "晋城": "290", "朔州": "237", "晋中": "238", "运城": "328", "忻州": "367", "临汾": "368", "吕梁": "327", "呼和浩特": "321", "包头": "229", "乌海": "123", "赤峰": "297", "通辽": "64", "鄂尔多斯": "283", "呼伦贝尔": "61", "巴彦淖尔": "169", "乌兰察布": "168", "兴安盟": "62", "锡林郭勒盟": "63", "阿拉善盟": "230", "沈阳": "58", "大连": "167", "鞍山": "320", "抚顺": "184", "本溪": "227", "丹东": "282", "锦州": "166", "营口": "281", "阜新": "59", "辽阳": "351", "盘锦": "228", "铁岭": "60", "朝阳": "280", "葫芦岛": "319", "长春": "53", "吉林市": "55", "四平": "56", "辽源": "183", "通化": "165", "白山": "57", "松原": "52", "白城": "51", "延边朝鲜族自治州": "54", "哈尔滨": "48", "齐齐哈尔": "41", "鸡西": "46", "鹤岗": "43", "双鸭山": "45", "大庆": "50", "伊春": "40", "佳木斯": "42", "七台河": "47", "牡丹江": "49", "黑河": "39", "绥化": "44", "大兴安岭地区": "38", "上海": "289", "南京": "315", "无锡": "317", "徐州": "316", "常州": "348", "苏州": "224", "南通": "161", "连云港": "347", "淮安": "162", "盐城": "223", "扬州": "346", "镇江": "160", "泰州": "276", "宿迁": "277", "杭州": "179", "宁波": "180", "温州": "178", "嘉兴": "334", "湖州": "294", "绍兴": "293", "金华": "333", "衢州": "243", "舟山": "245", "台州": "244", "丽水": "292", "合肥": "127", "芜湖": "129", "蚌埠": "126", "淮南": "250", "马鞍山": "358", "淮北": "253", "铜陵": "337", "安庆": "130", "黄山": "252", "滁州": "189", "阜阳": "128", "宿州": "370", "巢湖": "251", "六安": "298", "亳州": "188", "池州": "299", "宣城": "190", "福州": "300", "厦门": "194", "莆田": "195", "三明": "254", "泉州": "134", "漳州": "255", "南平": "133", "龙岩": "193", "宁德": "192", "南昌": "163", "景德镇": "225", "萍乡": "350", "九江": "349", "新余": "164", "鹰潭": "279", "赣州": "365", "吉安": "318", "宜春": "278", "抚州": "226", "上饶": "364", "济南": "288", "青岛": "236", "淄博": "354", "枣庄": "172", "东营": "174", "烟台": "326", "潍坊": "287", "济宁": "286", "泰安": "325", "威海": "175", "日照": "173", "莱芜": "124", "临沂": "234", "德州": "372", "聊城": "366", "滨州": "235", "菏泽": "353", "郑州": "268", "开封": "210", "洛阳": "153", "平顶山": "213", "安阳": "267", "鹤壁": "215", "新乡": "152", "焦作": "211", "濮阳": "209", "许昌": "155", "漯河": "344", "三门峡": "212", "南阳": "309", "商丘": "154", "信阳": "214", "周口": "308", "驻马店": "269", "武汉": "218", "黄石": "311", "十堰": "216", "宜昌": "270", "襄阳": "156", "鄂州": "122", "荆门": "217", "孝感": "310", "荆州": "157", "黄冈": "271", "咸宁": "362", "随州": "371", "恩施土家族苗族自治州": "373", "仙桃": "1713", "潜江": "1293", "天门": "2654", "神农架林区": "2734", "长沙": "158", "株洲": "222", "湘潭": "313", "衡阳": "159", "邵阳": "273", "岳阳": "220", "常德": "219", "张家界": "312", "益阳": "272", "郴州": "275", "永州": "314", "怀化": "363", "娄底": "221", "湘西土家族苗族自治州": "274", "广州": "257", "韶关": "137", "深圳": "340", "珠海": "140", "汕头": "303", "佛山": "138", "江门": "302", "湛江": "198", "茂名": "139", "肇庆": "338", "惠州": "301", "梅州": "141", "汕尾": "339", "河源": "200", "阳江": "199", "清远": "197", "东莞": "119", "中山": "187", "潮州": "201", "揭阳": "259", "云浮": "258", "南宁": "261", "柳州": "305", "桂林": "142", "梧州": "304", "北海": "295", "防城港": "204", "钦州": "145", "贵港": "341", "玉林": "361", "百色": "203", "贺州": "260", "河池": "143", "来宾": "202", "崇左": "144", "海口": "125", "三亚": "121", "五指山": "1644", "琼海": "2358", "儋州": "1215", "文昌": "2758", "万宁": "1216", "东方": "2634", "定安": "1214", "屯昌": "1641", "澄迈": "2757", "临高": "2033", "白沙黎族自治": "2359", "昌江黎族自治": "1642", "乐东黎族自治": "2032", "陵水黎族自治": "1643", "保亭黎族苗族自治": "1217", "琼中黎族苗族自治": "2031", "重庆": "132", "成都": "75", "自贡": "78", "攀枝花": "81", "泸州": "331", "德阳": "74", "绵阳": "240", "广元": "329", "遂宁": "330", "内江": "248", "乐山": "79", "南充": "291", "眉山": "77", "宜宾": "186", "广安": "241", "达州": "369", "雅安": "76", "巴中": "239", "资阳": "242", "阿坝藏族羌族自治州": "185", "甘孜藏族自治州": "73", "凉山彝族自治州": "80", "贵阳": "146", "六盘水": "147", "遵义": "262", "安顺": "263", "铜仁地区": "205", "黔西南布依族苗族自治州": "343", "毕节地区": "206", "黔东南苗族侗族自治州": "342", "黔南布依族苗族自治州": "306", "昆明": "104", "曲靖": "249", "玉溪": "106", "保山": "112", "昭通": "336", "丽江": "114", "临沧": "110", "楚雄彝族自治州": "105", "红河哈尼族彝族自治州": "107", "文山壮族苗族自治州": "177", "普洱": "108", "西双版纳傣族自治州": "109", "大理白族自治州": "111", "德宏傣族景颇族自治州": "116", "怒江傈僳族自治州": "113", "迪庆藏族自治州": "115", "拉萨": "100", "昌都地区": "99", "山南地区": "97", "日喀则地区": "102", "那曲地区": "101", "阿里地区": "103", "林芝地区": "98", "西安": "233", "铜川": "232", "宝鸡": "171", "咸阳": "323", "渭南": "170", "延安": "284", "汉中": "352", "榆林": "231", "安康": "324", "商洛": "285", "兰州": "36", "嘉峪关": "33", "金昌": "34", "白银": "35", "天水": "196", "武威": "118", "张掖": "117", "平凉": "359", "酒泉": "37", "庆阳": "135", "定西": "136", "陇南": "256", "临夏回族自治州": "182", "甘南藏族自治州": "247", "西宁": "66", "海东地区": "69", "海北藏族自治州": "67", "黄南藏族自治州": "70", "海南藏族自治州": "68", "果洛藏族自治州": "72", "玉树藏族自治州": "71", "海西蒙古族藏族自治州": "65", "银川": "360", "石嘴山": "335", "吴忠": "322", "固原": "246", "中卫": "181", "乌鲁木齐": "92", "克拉玛依": "95", "吐鲁番地区": "89", "哈密地区": "91", "昌吉回族自治州": "93", "博尔塔拉蒙古自治州": "88", "巴音郭楞蒙古自治州": "86", "阿克苏地区": "85", "克孜勒苏柯尔克孜自治州": "84", "喀什地区": "83", "和田地区": "82", "伊犁哈萨克自治州": "90", "塔城地区": "94", "阿勒泰地区": "96", "石河子": "770", "阿拉尔": "731", "图木舒克": "792", "五家渠": "789", "香港特别行政区": "2912", "澳门特别行政区": "2911"] + def codeMap = ["鍖椾含": "131", "澶╂触": "332", "鐭冲搴�": "150", "鍞愬北": "265", "绉︾殗宀�": "148", "閭兏": "151", "閭㈠彴": "266", "淇濆畾": "307", "寮犲鍙�": "264", "鎵垮痉": "207", "娌у窞": "149", "寤婂潑": "191", "琛℃按": "208", "澶師": "176", "澶у悓": "355", "闃虫硥": "357", "闀挎不": "356", "鏅嬪煄": "290", "鏈斿窞": "237", "鏅嬩腑": "238", "杩愬煄": "328", "蹇诲窞": "367", "涓存本": "368", "鍚曟": "327", "鍛煎拰娴╃壒": "321", "鍖呭ご": "229", "涔屾捣": "123", "璧ゅ嘲": "297", "閫氳窘": "64", "閯傚皵澶氭柉": "283", "鍛间鸡璐濆皵": "61", "宸村溅娣栧皵": "169", "涔屽叞瀵熷竷": "168", "鍏村畨鐩�": "62", "閿℃灄閮嫆鐩�": "63", "闃挎媺鍠勭洘": "230", "娌堥槼": "58", "澶ц繛": "167", "闉嶅北": "320", "鎶氶『": "184", "鏈邯": "227", "涓逛笢": "282", "閿﹀窞": "166", "钀ュ彛": "281", "闃滄柊": "59", "杈介槼": "351", "鐩橀敠": "228", "閾佸箔": "60", "鏈濋槼": "280", "钁姦宀�": "319", "闀挎槬": "53", "鍚夋灄甯�": "55", "鍥涘钩": "56", "杈芥簮": "183", "閫氬寲": "165", "鐧藉北": "57", "鏉惧師": "52", "鐧藉煄": "51", "寤惰竟鏈濋矞鏃忚嚜娌诲窞": "54", "鍝堝皵婊�": "48", "榻愰綈鍝堝皵": "41", "楦¤タ": "46", "楣ゅ矖": "43", "鍙岄腑灞�": "45", "澶у簡": "50", "浼婃槬": "40", "浣虫湪鏂�": "42", "涓冨彴娌�": "47", "鐗′腹姹�": "49", "榛戞渤": "39", "缁ュ寲": "44", "澶у叴瀹夊箔鍦板尯": "38", "涓婃捣": "289", "鍗椾含": "315", "鏃犻敗": "317", "寰愬窞": "316", "甯稿窞": "348", "鑻忓窞": "224", "鍗楅��": "161", "杩炰簯娓�": "347", "娣畨": "162", "鐩愬煄": "223", "鎵窞": "346", "闀囨睙": "160", "娉板窞": "276", "瀹胯縼": "277", "鏉窞": "179", "瀹佹尝": "180", "娓╁窞": "178", "鍢夊叴": "334", "婀栧窞": "294", "缁嶅叴": "293", "閲戝崕": "333", "琛㈠窞": "243", "鑸熷北": "245", "鍙板窞": "244", "涓芥按": "292", "鍚堣偉": "127", "鑺滄箹": "129", "铓屽煚": "126", "娣崡": "250", "椹瀺灞�": "358", "娣寳": "253", "閾滈櫟": "337", "瀹夊簡": "130", "榛勫北": "252", "婊佸窞": "189", "闃滈槼": "128", "瀹垮窞": "370", "宸㈡箹": "251", "鍏畨": "298", "浜冲窞": "188", "姹犲窞": "299", "瀹e煄": "190", "绂忓窞": "300", "鍘﹂棬": "194", "鑾嗙敯": "195", "涓夋槑": "254", "娉夊窞": "134", "婕冲窞": "255", "鍗楀钩": "133", "榫欏博": "193", "瀹佸痉": "192", "鍗楁槍": "163", "鏅痉闀�": "225", "钀嶄埂": "350", "涔濇睙": "349", "鏂颁綑": "164", "楣版江": "279", "璧e窞": "365", "鍚夊畨": "318", "瀹滄槬": "278", "鎶氬窞": "226", "涓婇ザ": "364", "娴庡崡": "288", "闈掑矝": "236", "娣勫崥": "354", "鏋e簞": "172", "涓滆惀": "174", "鐑熷彴": "326", "娼嶅潑": "287", "娴庡畞": "286", "娉板畨": "325", "濞佹捣": "175", "鏃ョ収": "173", "鑾辫姕": "124", "涓存矀": "234", "寰峰窞": "372", "鑱婂煄": "366", "婊ㄥ窞": "235", "鑿忔辰": "353", "閮戝窞": "268", "寮�灏�": "210", "娲涢槼": "153", "骞抽《灞�": "213", "瀹夐槼": "267", "楣ゅ": "215", "鏂颁埂": "152", "鐒︿綔": "211", "婵槼": "209", "璁告槍": "155", "婕渤": "344", "涓夐棬宄�": "212", "鍗楅槼": "309", "鍟嗕笜": "154", "淇¢槼": "214", "鍛ㄥ彛": "308", "椹婚┈搴�": "269", "姝︽眽": "218", "榛勭煶": "311", "鍗佸牥": "216", "瀹滄槍": "270", "瑗勯槼": "156", "閯傚窞": "122", "鑽嗛棬": "217", "瀛濇劅": "310", "鑽嗗窞": "157", "榛勫唸": "271", "鍜稿畞": "362", "闅忓窞": "371", "鎭╂柦鍦熷鏃忚嫍鏃忚嚜娌诲窞": "373", "浠欐": "1713", "娼滄睙": "1293", "澶╅棬": "2654", "绁炲啘鏋舵灄鍖�": "2734", "闀挎矙": "158", "鏍床": "222", "婀樻江": "313", "琛¢槼": "159", "閭甸槼": "273", "宀抽槼": "220", "甯稿痉": "219", "寮犲鐣�": "312", "鐩婇槼": "272", "閮村窞": "275", "姘稿窞": "314", "鎬�鍖�": "363", "濞勫簳": "221", "婀樿タ鍦熷鏃忚嫍鏃忚嚜娌诲窞": "274", "骞垮窞": "257", "闊跺叧": "137", "娣卞湷": "340", "鐝犳捣": "140", "姹曞ご": "303", "浣涘北": "138", "姹熼棬": "302", "婀涙睙": "198", "鑼傚悕": "139", "鑲囧簡": "338", "鎯犲窞": "301", "姊呭窞": "141", "姹曞熬": "339", "娌虫簮": "200", "闃虫睙": "199", "娓呰繙": "197", "涓滆帪": "119", "涓北": "187", "娼窞": "201", "鎻槼": "259", "浜戞诞": "258", "鍗楀畞": "261", "鏌冲窞": "305", "妗傛灄": "142", "姊у窞": "304", "鍖楁捣": "295", "闃插煄娓�": "204", "閽﹀窞": "145", "璐垫腐": "341", "鐜夋灄": "361", "鐧捐壊": "203", "璐哄窞": "260", "娌虫睜": "143", "鏉ュ": "202", "宕囧乏": "144", "娴峰彛": "125", "涓変簹": "121", "浜旀寚灞�": "1644", "鐞兼捣": "2358", "鍎嬪窞": "1215", "鏂囨槍": "2758", "涓囧畞": "1216", "涓滄柟": "2634", "瀹氬畨": "1214", "灞槍": "1641", "婢勮繄": "2757", "涓撮珮": "2033", "鐧芥矙榛庢棌鑷不": "2359", "鏄屾睙榛庢棌鑷不": "1642", "涔愪笢榛庢棌鑷不": "2032", "闄垫按榛庢棌鑷不": "1643", "淇濅涵榛庢棌鑻楁棌鑷不": "1217", "鐞间腑榛庢棌鑻楁棌鑷不": "2031", "閲嶅簡": "132", "鎴愰兘": "75", "鑷础": "78", "鏀�鏋濊姳": "81", "娉稿窞": "331", "寰烽槼": "74", "缁甸槼": "240", "骞垮厓": "329", "閬傚畞": "330", "鍐呮睙": "248", "涔愬北": "79", "鍗楀厖": "291", "鐪夊北": "77", "瀹滃": "186", "骞垮畨": "241", "杈惧窞": "369", "闆呭畨": "76", "宸翠腑": "239", "璧勯槼": "242", "闃垮潩钘忔棌缇屾棌鑷不宸�": "185", "鐢樺瓬钘忔棌鑷不宸�": "73", "鍑夊北褰濇棌鑷不宸�": "80", "璐甸槼": "146", "鍏洏姘�": "147", "閬典箟": "262", "瀹夐『": "263", "閾滀粊鍦板尯": "205", "榛旇タ鍗楀竷渚濇棌鑻楁棌鑷不宸�": "343", "姣曡妭鍦板尯": "206", "榛斾笢鍗楄嫍鏃忎緱鏃忚嚜娌诲窞": "342", "榛斿崡甯冧緷鏃忚嫍鏃忚嚜娌诲窞": "306", "鏄嗘槑": "104", "鏇查潠": "249", "鐜夋邯": "106", "淇濆北": "112", "鏄��": "336", "涓芥睙": "114", "涓存钵": "110", "妤氶泟褰濇棌鑷不宸�": "105", "绾㈡渤鍝堝凹鏃忓綕鏃忚嚜娌诲窞": "107", "鏂囧北澹棌鑻楁棌鑷不宸�": "177", "鏅幢": "108", "瑗垮弻鐗堢撼鍌f棌鑷不宸�": "109", "澶х悊鐧芥棌鑷不宸�": "111", "寰峰畯鍌f棌鏅鏃忚嚜娌诲窞": "116", "鎬掓睙鍌堝兂鏃忚嚜娌诲窞": "113", "杩簡钘忔棌鑷不宸�": "115", "鎷夎惃": "100", "鏄岄兘鍦板尯": "99", "灞卞崡鍦板尯": "97", "鏃ュ杸鍒欏湴鍖�": "102", "閭f洸鍦板尯": "101", "闃块噷鍦板尯": "103", "鏋楄姖鍦板尯": "98", "瑗垮畨": "233", "閾滃窛": "232", "瀹濋浮": "171", "鍜搁槼": "323", "娓崡": "170", "寤跺畨": "284", "姹変腑": "352", "姒嗘灄": "231", "瀹夊悍": "324", "鍟嗘礇": "285", "鍏板窞": "36", "鍢夊唱鍏�": "33", "閲戞槍": "34", "鐧介摱": "35", "澶╂按": "196", "姝﹀▉": "118", "寮犳帠": "117", "骞冲噳": "359", "閰掓硥": "37", "搴嗛槼": "135", "瀹氳タ": "136", "闄囧崡": "256", "涓村鍥炴棌鑷不宸�": "182", "鐢樺崡钘忔棌鑷不宸�": "247", "瑗垮畞": "66", "娴蜂笢鍦板尯": "69", "娴峰寳钘忔棌鑷不宸�": "67", "榛勫崡钘忔棌鑷不宸�": "70", "娴峰崡钘忔棌鑷不宸�": "68", "鏋滄礇钘忔棌鑷不宸�": "72", "鐜夋爲钘忔棌鑷不宸�": "71", "娴疯タ钂欏彜鏃忚棌鏃忚嚜娌诲窞": "65", "閾跺窛": "360", "鐭冲槾灞�": "335", "鍚村繝": "322", "鍥哄師": "246", "涓崼": "181", "涔岄瞾鏈ㄩ綈": "92", "鍏嬫媺鐜涗緷": "95", "鍚愰瞾鐣湴鍖�": "89", "鍝堝瘑鍦板尯": "91", "鏄屽悏鍥炴棌鑷不宸�": "93", "鍗氬皵濉旀媺钂欏彜鑷不宸�": "88", "宸撮煶閮钂欏彜鑷不宸�": "86", "闃垮厠鑻忓湴鍖�": "85", "鍏嬪瓬鍕掕嫃鏌皵鍏嬪瓬鑷不宸�": "84", "鍠�浠�鍦板尯": "83", "鍜岀敯鍦板尯": "82", "浼婄妬鍝堣惃鍏嬭嚜娌诲窞": "90", "濉斿煄鍦板尯": "94", "闃垮嫆娉板湴鍖�": "96", "鐭虫渤瀛�": "770", "闃挎媺灏�": "731", "鍥炬湪鑸掑厠": "792", "浜斿娓�": "789", "棣欐腐鐗瑰埆琛屾斂鍖�": "2912", "婢抽棬鐗瑰埆琛屾斂鍖�": "2911"] static { dataSource.setUrl(address) @@ -46,18 +46,18 @@ class VagueAddressLocationBatch extends BaseBatch { @Override void process(Object args) { - //"北京","常州", - // def citys =["无锡","重庆","东莞","中山","合肥","苏州","广州","深圳","佛山","长沙","韶关","惠州","清远","珠海","福州","厦门","龙岩","漳州","成都","天津","南京","青岛"] //CommonDatautils.findAllCity(); - def citys =["重庆"] //CommonDatautils.findAllCity(); - //,"济南","青岛","烟台","威海","潍坊","淄博","临沂","泰安","菏泽","东营","德州","济宁","日照","聊城","滨州","枣庄" -//市谊大厦 华三新村 阳光家园 + //"鍖椾含","甯稿窞", + // def citys =["鏃犻敗","閲嶅簡","涓滆帪","涓北","鍚堣偉","鑻忓窞","骞垮窞","娣卞湷","浣涘北","闀挎矙","闊跺叧","鎯犲窞","娓呰繙","鐝犳捣","绂忓窞","鍘﹂棬","榫欏博","婕冲窞","鎴愰兘","澶╂触","鍗椾含","闈掑矝"] //CommonDatautils.findAllCity(); + def citys =["閲嶅簡"] //CommonDatautils.findAllCity(); + //,"娴庡崡","闈掑矝","鐑熷彴","濞佹捣","娼嶅潑","娣勫崥","涓存矀","娉板畨","鑿忔辰","涓滆惀","寰峰窞","娴庡畞","鏃ョ収","鑱婂煄","婊ㄥ窞","鏋e簞" +//甯傝皧澶у帵 鍗庝笁鏂版潙 闃冲厜瀹跺洯 for (def city : citys) { def districts = CommonDatautils.findAllDistricts(city, "district", ["city", "region", "name", "address", "lat2", "lat", "lng2", "lng"]); def rets = findVagueAddress(city, districts); findAndUpdateLocation(rets); - // writeCSV(results, "d:\\数据\\结果\\" + city + "地址更新.csv") - writeCSV(results, "d:\\数据\\结果\\" + city + "地址模糊.csv") -// ExcelUtils.write("d:\\数据\\结果\\" + city + "地址模糊.xlsx", rets, "数据") + // writeCSV(results, "d:\\鏁版嵁\\缁撴灉\\" + city + "鍦板潃鏇存柊.csv") + writeCSV(results, "d:\\鏁版嵁\\缁撴灉\\" + city + "鍦板潃妯$硦.csv") +// ExcelUtils.write("d:\\鏁版嵁\\缁撴灉\\" + city + "鍦板潃妯$硦.xlsx", rets, "鏁版嵁") } @@ -71,24 +71,24 @@ class VagueAddressLocationBatch extends BaseBatch { if (address) { address = address.trim(); } - //没地址 + //娌″湴鍧� if (!address) { rets << district; // rows << [district.city, district.region, district.name, district.address] - println district.city + " " + district.name + " ******[" + district.address + "]******** 模糊地址" + println district.city + " " + district.name + " ******[" + district.address + "]******** 妯$硦鍦板潃" } else { if (!findPattern(address)) { rets << district; // rows << [district.city, district.region, district.name, district.address] - println district.city + " " + district.name + " ******[" + district.address + "]******** 模糊地址" + println district.city + " " + district.name + " ******[" + district.address + "]******** 妯$硦鍦板潃" } else { - println district.city + " " + district.address + " 精确地址" + println district.city + " " + district.address + " 绮剧‘鍦板潃" } } } if(districts){ - println "[" + city + "] 小区总量:" + districts.size() + " 模糊地址小区总量:" + rets.size() + " 占比:" + DataHandleUtils.getDoubleRound(2, rets.size() * 100 / districts.size()) + println "[" + city + "] 灏忓尯鎬婚噺锛�" + districts.size() + " 妯$硦鍦板潃灏忓尯鎬婚噺锛�" + rets.size() + " 鍗犳瘮锛�" + DataHandleUtils.getDoubleRound(2, rets.size() * 100 / districts.size()) } return rets; @@ -103,12 +103,12 @@ class VagueAddressLocationBatch extends BaseBatch { def matcher = pattern.matcher(address) if (matcher.find()) { def s = matcher.group(); - if (address.indexOf("交汇") > -1 || address.indexOf("与") > -1) { + if (address.indexOf("浜ゆ眹") > -1 || address.indexOf("涓�") > -1) { return null; - } else if (address.indexOf("路") == -1 && address.indexOf("街") == -1 && address.indexOf("大道") == -1 && address.indexOf("巷") == -1 && address.indexOf("北里") == -1 && address.indexOf("南里") == -1 && address.indexOf("东里") == -1 && address.indexOf("西里") == -1) { + } else if (address.indexOf("璺�") == -1 && address.indexOf("琛�") == -1 && address.indexOf("澶ч亾") == -1 && address.indexOf("宸�") == -1 && address.indexOf("鍖楅噷") == -1 && address.indexOf("鍗楅噷") == -1 && address.indexOf("涓滈噷") == -1 && address.indexOf("瑗块噷") == -1) { return null; } else { - pattern = Pattern.compile("[路甲|路|街|大道|巷|弄|里]\\d+"); + pattern = Pattern.compile("[璺敳|璺瘄琛梶澶ч亾|宸穦寮剕閲宂\\d+"); matcher = pattern.matcher(address) if(matcher.find()){ return s; @@ -139,9 +139,9 @@ class VagueAddressLocationBatch extends BaseBatch { if (locationMap) { updateLocation(locationMap, ret); } else { - println "[没找到] " + ret.city + " " + ret.region + " " + ret.name + " " + ret.address + println "[娌℃壘鍒癩 " + ret.city + " " + ret.region + " " + ret.name + " " + ret.address } - println "【${index}/${rets.size()}】**************【${ret.region}---${ret.name}----${ret.address}】**********************************************************************" + println "銆�${index}/${rets.size()}銆�**************銆�${ret.region}---${ret.name}----${ret.address}銆�**********************************************************************" } } @@ -173,12 +173,12 @@ class VagueAddressLocationBatch extends BaseBatch { } if (locationMap.address && locationMap.address != ret.address) { - println "地址修改:" + locationMap.address + " (原)" + ret.address + println "鍦板潃淇敼锛�" + locationMap.address + " (鍘�)" + ret.address udata.put("address", locationMap.address) msgMap.new_address = locationMap.address } if (udata) { - println ret.city + " " + ret.region + " " + ret.name + " [ 修改其经纬度!]" + println ret.city + " " + ret.region + " " + ret.name + " [ 淇敼鍏剁粡绾害锛乚" udata.put("m_date", new Date()) DbUtils.seaweed.update(new BasicDBObject('_id',locationMap.id),new BasicDBObject('$set',udata)) } @@ -190,7 +190,7 @@ class VagueAddressLocationBatch extends BaseBatch { def map; if (rets) { if (rets.size() > 1) { - //相似里找有精确地址 + //鐩镐技閲屾壘鏈夌簿纭湴鍧� for (def mapObj : rets) { if((mapObj.adname && mapObj.adname.contains(region)) || (mapObj.region && mapObj.region.contains(region))){ if(mapObj.name.contains(name) || name.contains(mapObj.name)){ @@ -203,12 +203,12 @@ class VagueAddressLocationBatch extends BaseBatch { } } if(!map){ - //交带有交叉口地址 + //浜ゅ甫鏈変氦鍙夊彛鍦板潃 for (def mapObj : rets) { if((mapObj.adname && mapObj.adname.contains(region)) || (mapObj.region && mapObj.region.contains(region))){ if(mapObj.name.contains(name) || name.contains(mapObj.name)) { - if (mapObj.address && (mapObj.address.contains("交汇") || mapObj.address.contains("交叉"))) { - if (!mapObj.address.contains("与;") && !mapObj.address.startsWith("路") && !mapObj.address.startsWith("路;")) { + if (mapObj.address && (mapObj.address.contains("浜ゆ眹") || mapObj.address.contains("浜ゅ弶"))) { + if (!mapObj.address.contains("涓�;") && !mapObj.address.startsWith("璺�") && !mapObj.address.startsWith("璺�;")) { map = mapObj; break; } @@ -302,17 +302,17 @@ class VagueAddressLocationBatch extends BaseBatch { if (file.exists()) { file.delete(); } - file.append("城市,") - file.append("区域,") - file.append("楼盘名称,") - file.append("原地址,") - file.append("经度,") - file.append("纬度,") - file.append("是否更新经纬度,") - file.append("新经度,") - file.append("新纬度,") - file.append("差距,") - file.append("新地址,") + file.append("鍩庡競,") + file.append("鍖哄煙,") + file.append("妤肩洏鍚嶇О,") + file.append("鍘熷湴鍧�,") + file.append("缁忓害,") + file.append("绾害,") + file.append("鏄惁鏇存柊缁忕含搴�,") + file.append("鏂扮粡搴�,") + file.append("鏂扮含搴�,") + file.append("宸窛,") + file.append("鏂板湴鍧�,") file.append(System.getProperty("line.separator")); list.each { def m = it; @@ -331,9 +331,9 @@ class VagueAddressLocationBatch extends BaseBatch { file.append(m.distance + ",", "gbk") if (m.updateLngFlag) { - file.append("是,", "gbk") + file.append("鏄�,", "gbk") } else { - file.append("否,", "gbk") + file.append("鍚�,", "gbk") } if(m.m_lng2){ file.append(m.m_lng2 / 10000000000d + ",", "gbk") diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/WuXiAddressTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/WuXiAddressTest.groovy index cbf9f5e12..47ba1e3b6 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/WuXiAddressTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/WuXiAddressTest.groovy @@ -11,7 +11,7 @@ class WuXiAddressTest { } def addAddress(){ - ExcelUtils.modify("D:\\数据\\无锡\\教育机构-标准化(已处理)(3)(1).xlsx",{d-> + ExcelUtils.modify("D:\\鏁版嵁\\鏃犻敗\\鏁欒偛鏈烘瀯-鏍囧噯鍖栵紙宸插鐞嗭級(3)(1).xlsx",{d-> def prov = d['C'] def city = d['D'] def region = d['E'] @@ -19,14 +19,14 @@ class WuXiAddressTest { def road = d['J'] def street = d['R'] - def newAddress = prov+"省"+city +"市" - if(region == "惠山"){ - newAddress = newAddress + region +"区" + def newAddress = prov+"鐪�"+city +"甯�" + if(region == "鎯犲北"){ + newAddress = newAddress + region +"鍖�" }else{ - newAddress = newAddress + region +"市" + newAddress = newAddress + region +"甯�" } - d['U'] = d['S'].replace(region+"市", "").replace(d['R'], "") + d['U'] = d['S'].replace(region+"甯�", "").replace(d['R'], "") def dist = d['U'] def s1 = null @@ -43,7 +43,7 @@ class WuXiAddressTest { } def run(){ -// def datas = ExcelUtils.read("D:\\数据\\无锡\\教育机构-标准化(已处理).xlsx",0,1) +// def datas = ExcelUtils.read("D:\\鏁版嵁\\鏃犻敗\\鏁欒偛鏈烘瀯-鏍囧噯鍖栵紙宸插鐞嗭級.xlsx",0,1) // for(def d : datas){ // def locationStr = getLocationInfo(d['D'], d['Q']) // def township = getStreetInfo(locationStr) @@ -53,13 +53,13 @@ class WuXiAddressTest { - ExcelUtils.multiThreadingModify("D:\\数据\\无锡\\教育机构-标准化(已处理).xlsx",{d-> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\鏃犻敗\\鏁欒偛鏈烘瀯-鏍囧噯鍖栵紙宸插鐞嗭級.xlsx",{d-> if(!d['S']){ def locationStr = getLocationInfo(d['D'], d['Q']) def township = getStreetInfo(locationStr) - def name = getJuWeiHuiInfo(locationStr, "村委会", "1000"); + def name = getJuWeiHuiInfo(locationStr, "鏉戝浼�", "1000"); if(!name){ - name = getJuWeiHuiInfo(locationStr,"村委会", "2000"); + name = getJuWeiHuiInfo(locationStr,"鏉戝浼�", "2000"); if(name){ d['T'] = 2000 } @@ -68,7 +68,7 @@ class WuXiAddressTest { } if(!name){ - name = getJuWeiHuiInfo(locationStr, "村委会", "3000"); + name = getJuWeiHuiInfo(locationStr, "鏉戝浼�", "3000"); if(name){ d['T'] = 3000 } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/XinChaoHouseCount.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/XinChaoHouseCount.groovy index cb9f8d8bc..1472a0ee4 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/XinChaoHouseCount.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/XinChaoHouseCount.groovy @@ -13,12 +13,12 @@ class XinChaoHouseCount { task.run() } def run(){ - def datas = ExcelUtils.read("C:\\Users\\gaojuan\\Desktop\\新潮数据\\汇总.xlsx", 0, 1) + def datas = ExcelUtils.read("C:\\Users\\gaojuan\\Desktop\\鏂版疆鏁版嵁\\姹囨��.xlsx", 0, 1) def rets = [] - rets << ["城市","区域","名称","户数","新潮户数"] + rets << ["鍩庡競","鍖哄煙","鍚嶇О","鎴锋暟","鏂版疆鎴锋暟"] def index = 0; - println "总量:"+datas.size() + println "鎬婚噺锛�"+datas.size() for(def data : datas){ def city = data['A'] def region = data['E'] @@ -31,7 +31,7 @@ class XinChaoHouseCount { def districts = CommonDatautils.findDistrict(city, region, name, "district"); if(districts && !districts.household_count && houseCount){ index++; - println "[${index}]"+city +" "+ name +"新潮数:"+houseCount +" DB:"+districts.household_count + println "[${index}]"+city +" "+ name +"鏂版疆鏁帮細"+houseCount +" DB锛�"+districts.household_count if(houseCount != districts.household_count){ def ret = [] ret << city @@ -48,6 +48,6 @@ class XinChaoHouseCount { } } } - ExcelUtils.write("d:\\数据\\结果\\新潮户数比对统计.xlsx", rets, "Sheet1") + ExcelUtils.write("d:\\鏁版嵁\\缁撴灉\\鏂版疆鎴锋暟姣斿缁熻.xlsx", rets, "Sheet1") } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/YinLianMeiShi.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/YinLianMeiShi.groovy index 3075ff1db..bd15e094a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/YinLianMeiShi.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/YinLianMeiShi.groovy @@ -20,7 +20,7 @@ import java.util.regex.Pattern class YinLianMeiShi { - def baiduCityCodeMap = ["北京": "131", "天津": "332", "石家庄": "150", "唐山": "265", "秦皇岛": "148", "邯郸": "151", "邢台": "266", "保定": "307", "张家口": "264", "承德": "207", "沧州": "149", "廊坊": "191", "衡水": "208", "太原": "176", "大同": "355", "阳泉": "357", "长治": "356", "晋城": "290", "朔州": "237", "晋中": "238", "运城": "328", "忻州": "367", "临汾": "368", "吕梁": "327", "呼和浩特": "321", "包头": "229", "乌海": "123", "赤峰": "297", "通辽": "64", "鄂尔多斯": "283", "呼伦贝尔": "61", "巴彦淖尔": "169", "乌兰察布": "168", "兴安盟": "62", "锡林郭勒盟": "63", "阿拉善盟": "230", "沈阳": "58", "大连": "167", "鞍山": "320", "抚顺": "184", "本溪": "227", "丹东": "282", "锦州": "166", "营口": "281", "阜新": "59", "辽阳": "351", "盘锦": "228", "铁岭": "60", "朝阳": "280", "葫芦岛": "319", "长春": "53", "吉林市": "55", "四平": "56", "辽源": "183", "通化": "165", "白山": "57", "松原": "52", "白城": "51", "延边朝鲜族自治州": "54", "哈尔滨": "48", "齐齐哈尔": "41", "鸡西": "46", "鹤岗": "43", "双鸭山": "45", "大庆": "50", "伊春": "40", "佳木斯": "42", "七台河": "47", "牡丹江": "49", "黑河": "39", "绥化": "44", "大兴安岭地区": "38", "上海": "289", "南京": "315", "无锡": "317", "徐州": "316", "常州": "348", "苏州": "224", "南通": "161", "连云港": "347", "淮安": "162", "盐城": "223", "扬州": "346", "镇江": "160", "泰州": "276", "宿迁": "277", "杭州": "179", "宁波": "180", "温州": "178", "嘉兴": "334", "湖州": "294", "绍兴": "293", "金华": "333", "衢州": "243", "舟山": "245", "台州": "244", "丽水": "292", "合肥": "127", "芜湖": "129", "蚌埠": "126", "淮南": "250", "马鞍山": "358", "淮北": "253", "铜陵": "337", "安庆": "130", "黄山": "252", "滁州": "189", "阜阳": "128", "宿州": "370", "巢湖": "251", "六安": "298", "亳州": "188", "池州": "299", "宣城": "190", "福州": "300", "厦门": "194", "莆田": "195", "三明": "254", "泉州": "134", "漳州": "255", "南平": "133", "龙岩": "193", "宁德": "192", "南昌": "163", "景德镇": "225", "萍乡": "350", "九江": "349", "新余": "164", "鹰潭": "279", "赣州": "365", "吉安": "318", "宜春": "278", "抚州": "226", "上饶": "364", "济南": "288", "青岛": "236", "淄博": "354", "枣庄": "172", "东营": "174", "烟台": "326", "潍坊": "287", "济宁": "286", "泰安": "325", "威海": "175", "日照": "173", "莱芜": "124", "临沂": "234", "德州": "372", "聊城": "366", "滨州": "235", "菏泽": "353", "郑州": "268", "开封": "210", "洛阳": "153", "平顶山": "213", "安阳": "267", "鹤壁": "215", "新乡": "152", "焦作": "211", "濮阳": "209", "许昌": "155", "漯河": "344", "三门峡": "212", "南阳": "309", "商丘": "154", "信阳": "214", "周口": "308", "驻马店": "269", "武汉": "218", "黄石": "311", "十堰": "216", "宜昌": "270", "襄阳": "156", "鄂州": "122", "荆门": "217", "孝感": "310", "荆州": "157", "黄冈": "271", "咸宁": "362", "随州": "371", "恩施土家族苗族自治州": "373", "仙桃": "1713", "潜江": "1293", "天门": "2654", "神农架林区": "2734", "长沙": "158", "株洲": "222", "湘潭": "313", "衡阳": "159", "邵阳": "273", "岳阳": "220", "常德": "219", "张家界": "312", "益阳": "272", "郴州": "275", "永州": "314", "怀化": "363", "娄底": "221", "湘西土家族苗族自治州": "274", "广州": "257", "韶关": "137", "深圳": "340", "珠海": "140", "汕头": "303", "佛山": "138", "江门": "302", "湛江": "198", "茂名": "139", "肇庆": "338", "惠州": "301", "梅州": "141", "汕尾": "339", "河源": "200", "阳江": "199", "清远": "197", "东莞": "119", "中山": "187", "潮州": "201", "揭阳": "259", "云浮": "258", "南宁": "261", "柳州": "305", "桂林": "142", "梧州": "304", "北海": "295", "防城港": "204", "钦州": "145", "贵港": "341", "玉林": "361", "百色": "203", "贺州": "260", "河池": "143", "来宾": "202", "崇左": "144", "海口": "125", "三亚": "121", "五指山": "1644", "琼海": "2358", "儋州": "1215", "文昌": "2758", "万宁": "1216", "东方": "2634", "定安": "1214", "屯昌": "1641", "澄迈": "2757", "临高": "2033", "白沙黎族自治": "2359", "昌江黎族自治": "1642", "乐东黎族自治": "2032", "陵水黎族自治": "1643", "保亭黎族苗族自治": "1217", "琼中黎族苗族自治": "2031", "重庆": "132", "成都": "75", "自贡": "78", "攀枝花": "81", "泸州": "331", "德阳": "74", "绵阳": "240", "广元": "329", "遂宁": "330", "内江": "248", "乐山": "79", "南充": "291", "眉山": "77", "宜宾": "186", "广安": "241", "达州": "369", "雅安": "76", "巴中": "239", "资阳": "242", "阿坝藏族羌族自治州": "185", "甘孜藏族自治州": "73", "凉山彝族自治州": "80", "贵阳": "146", "六盘水": "147", "遵义": "262", "安顺": "263", "铜仁地区": "205", "黔西南布依族苗族自治州": "343", "毕节地区": "206", "黔东南苗族侗族自治州": "342", "黔南布依族苗族自治州": "306", "昆明": "104", "曲靖": "249", "玉溪": "106", "保山": "112", "昭通": "336", "丽江": "114", "临沧": "110", "楚雄彝族自治州": "105", "红河哈尼族彝族自治州": "107", "文山壮族苗族自治州": "177", "普洱": "108", "西双版纳傣族自治州": "109", "大理白族自治州": "111", "德宏傣族景颇族自治州": "116", "怒江傈僳族自治州": "113", "迪庆藏族自治州": "115", "拉萨": "100", "昌都地区": "99", "山南地区": "97", "日喀则地区": "102", "那曲地区": "101", "阿里地区": "103", "林芝地区": "98", "西安": "233", "铜川": "232", "宝鸡": "171", "咸阳": "323", "渭南": "170", "延安": "284", "汉中": "352", "榆林": "231", "安康": "324", "商洛": "285", "兰州": "36", "嘉峪关": "33", "金昌": "34", "白银": "35", "天水": "196", "武威": "118", "张掖": "117", "平凉": "359", "酒泉": "37", "庆阳": "135", "定西": "136", "陇南": "256", "临夏回族自治州": "182", "甘南藏族自治州": "247", "西宁": "66", "海东地区": "69", "海北藏族自治州": "67", "黄南藏族自治州": "70", "海南藏族自治州": "68", "果洛藏族自治州": "72", "玉树藏族自治州": "71", "海西蒙古族藏族自治州": "65", "银川": "360", "石嘴山": "335", "吴忠": "322", "固原": "246", "中卫": "181", "乌鲁木齐": "92", "克拉玛依": "95", "吐鲁番地区": "89", "哈密地区": "91", "昌吉回族自治州": "93", "博尔塔拉蒙古自治州": "88", "巴音郭楞蒙古自治州": "86", "阿克苏地区": "85", "克孜勒苏柯尔克孜自治州": "84", "喀什地区": "83", "和田地区": "82", "伊犁": "90", "塔城地区": "94", "阿勒泰地区": "96", "石河子": "770", "阿拉尔": "731", "图木舒克": "792", "五家渠": "789", "香港特别行政区": "2912", "澳门特别行政区": "2911"] + def baiduCityCodeMap = ["鍖椾含": "131", "澶╂触": "332", "鐭冲搴�": "150", "鍞愬北": "265", "绉︾殗宀�": "148", "閭兏": "151", "閭㈠彴": "266", "淇濆畾": "307", "寮犲鍙�": "264", "鎵垮痉": "207", "娌у窞": "149", "寤婂潑": "191", "琛℃按": "208", "澶師": "176", "澶у悓": "355", "闃虫硥": "357", "闀挎不": "356", "鏅嬪煄": "290", "鏈斿窞": "237", "鏅嬩腑": "238", "杩愬煄": "328", "蹇诲窞": "367", "涓存本": "368", "鍚曟": "327", "鍛煎拰娴╃壒": "321", "鍖呭ご": "229", "涔屾捣": "123", "璧ゅ嘲": "297", "閫氳窘": "64", "閯傚皵澶氭柉": "283", "鍛间鸡璐濆皵": "61", "宸村溅娣栧皵": "169", "涔屽叞瀵熷竷": "168", "鍏村畨鐩�": "62", "閿℃灄閮嫆鐩�": "63", "闃挎媺鍠勭洘": "230", "娌堥槼": "58", "澶ц繛": "167", "闉嶅北": "320", "鎶氶『": "184", "鏈邯": "227", "涓逛笢": "282", "閿﹀窞": "166", "钀ュ彛": "281", "闃滄柊": "59", "杈介槼": "351", "鐩橀敠": "228", "閾佸箔": "60", "鏈濋槼": "280", "钁姦宀�": "319", "闀挎槬": "53", "鍚夋灄甯�": "55", "鍥涘钩": "56", "杈芥簮": "183", "閫氬寲": "165", "鐧藉北": "57", "鏉惧師": "52", "鐧藉煄": "51", "寤惰竟鏈濋矞鏃忚嚜娌诲窞": "54", "鍝堝皵婊�": "48", "榻愰綈鍝堝皵": "41", "楦¤タ": "46", "楣ゅ矖": "43", "鍙岄腑灞�": "45", "澶у簡": "50", "浼婃槬": "40", "浣虫湪鏂�": "42", "涓冨彴娌�": "47", "鐗′腹姹�": "49", "榛戞渤": "39", "缁ュ寲": "44", "澶у叴瀹夊箔鍦板尯": "38", "涓婃捣": "289", "鍗椾含": "315", "鏃犻敗": "317", "寰愬窞": "316", "甯稿窞": "348", "鑻忓窞": "224", "鍗楅��": "161", "杩炰簯娓�": "347", "娣畨": "162", "鐩愬煄": "223", "鎵窞": "346", "闀囨睙": "160", "娉板窞": "276", "瀹胯縼": "277", "鏉窞": "179", "瀹佹尝": "180", "娓╁窞": "178", "鍢夊叴": "334", "婀栧窞": "294", "缁嶅叴": "293", "閲戝崕": "333", "琛㈠窞": "243", "鑸熷北": "245", "鍙板窞": "244", "涓芥按": "292", "鍚堣偉": "127", "鑺滄箹": "129", "铓屽煚": "126", "娣崡": "250", "椹瀺灞�": "358", "娣寳": "253", "閾滈櫟": "337", "瀹夊簡": "130", "榛勫北": "252", "婊佸窞": "189", "闃滈槼": "128", "瀹垮窞": "370", "宸㈡箹": "251", "鍏畨": "298", "浜冲窞": "188", "姹犲窞": "299", "瀹e煄": "190", "绂忓窞": "300", "鍘﹂棬": "194", "鑾嗙敯": "195", "涓夋槑": "254", "娉夊窞": "134", "婕冲窞": "255", "鍗楀钩": "133", "榫欏博": "193", "瀹佸痉": "192", "鍗楁槍": "163", "鏅痉闀�": "225", "钀嶄埂": "350", "涔濇睙": "349", "鏂颁綑": "164", "楣版江": "279", "璧e窞": "365", "鍚夊畨": "318", "瀹滄槬": "278", "鎶氬窞": "226", "涓婇ザ": "364", "娴庡崡": "288", "闈掑矝": "236", "娣勫崥": "354", "鏋e簞": "172", "涓滆惀": "174", "鐑熷彴": "326", "娼嶅潑": "287", "娴庡畞": "286", "娉板畨": "325", "濞佹捣": "175", "鏃ョ収": "173", "鑾辫姕": "124", "涓存矀": "234", "寰峰窞": "372", "鑱婂煄": "366", "婊ㄥ窞": "235", "鑿忔辰": "353", "閮戝窞": "268", "寮�灏�": "210", "娲涢槼": "153", "骞抽《灞�": "213", "瀹夐槼": "267", "楣ゅ": "215", "鏂颁埂": "152", "鐒︿綔": "211", "婵槼": "209", "璁告槍": "155", "婕渤": "344", "涓夐棬宄�": "212", "鍗楅槼": "309", "鍟嗕笜": "154", "淇¢槼": "214", "鍛ㄥ彛": "308", "椹婚┈搴�": "269", "姝︽眽": "218", "榛勭煶": "311", "鍗佸牥": "216", "瀹滄槍": "270", "瑗勯槼": "156", "閯傚窞": "122", "鑽嗛棬": "217", "瀛濇劅": "310", "鑽嗗窞": "157", "榛勫唸": "271", "鍜稿畞": "362", "闅忓窞": "371", "鎭╂柦鍦熷鏃忚嫍鏃忚嚜娌诲窞": "373", "浠欐": "1713", "娼滄睙": "1293", "澶╅棬": "2654", "绁炲啘鏋舵灄鍖�": "2734", "闀挎矙": "158", "鏍床": "222", "婀樻江": "313", "琛¢槼": "159", "閭甸槼": "273", "宀抽槼": "220", "甯稿痉": "219", "寮犲鐣�": "312", "鐩婇槼": "272", "閮村窞": "275", "姘稿窞": "314", "鎬�鍖�": "363", "濞勫簳": "221", "婀樿タ鍦熷鏃忚嫍鏃忚嚜娌诲窞": "274", "骞垮窞": "257", "闊跺叧": "137", "娣卞湷": "340", "鐝犳捣": "140", "姹曞ご": "303", "浣涘北": "138", "姹熼棬": "302", "婀涙睙": "198", "鑼傚悕": "139", "鑲囧簡": "338", "鎯犲窞": "301", "姊呭窞": "141", "姹曞熬": "339", "娌虫簮": "200", "闃虫睙": "199", "娓呰繙": "197", "涓滆帪": "119", "涓北": "187", "娼窞": "201", "鎻槼": "259", "浜戞诞": "258", "鍗楀畞": "261", "鏌冲窞": "305", "妗傛灄": "142", "姊у窞": "304", "鍖楁捣": "295", "闃插煄娓�": "204", "閽﹀窞": "145", "璐垫腐": "341", "鐜夋灄": "361", "鐧捐壊": "203", "璐哄窞": "260", "娌虫睜": "143", "鏉ュ": "202", "宕囧乏": "144", "娴峰彛": "125", "涓変簹": "121", "浜旀寚灞�": "1644", "鐞兼捣": "2358", "鍎嬪窞": "1215", "鏂囨槍": "2758", "涓囧畞": "1216", "涓滄柟": "2634", "瀹氬畨": "1214", "灞槍": "1641", "婢勮繄": "2757", "涓撮珮": "2033", "鐧芥矙榛庢棌鑷不": "2359", "鏄屾睙榛庢棌鑷不": "1642", "涔愪笢榛庢棌鑷不": "2032", "闄垫按榛庢棌鑷不": "1643", "淇濅涵榛庢棌鑻楁棌鑷不": "1217", "鐞间腑榛庢棌鑻楁棌鑷不": "2031", "閲嶅簡": "132", "鎴愰兘": "75", "鑷础": "78", "鏀�鏋濊姳": "81", "娉稿窞": "331", "寰烽槼": "74", "缁甸槼": "240", "骞垮厓": "329", "閬傚畞": "330", "鍐呮睙": "248", "涔愬北": "79", "鍗楀厖": "291", "鐪夊北": "77", "瀹滃": "186", "骞垮畨": "241", "杈惧窞": "369", "闆呭畨": "76", "宸翠腑": "239", "璧勯槼": "242", "闃垮潩钘忔棌缇屾棌鑷不宸�": "185", "鐢樺瓬钘忔棌鑷不宸�": "73", "鍑夊北褰濇棌鑷不宸�": "80", "璐甸槼": "146", "鍏洏姘�": "147", "閬典箟": "262", "瀹夐『": "263", "閾滀粊鍦板尯": "205", "榛旇タ鍗楀竷渚濇棌鑻楁棌鑷不宸�": "343", "姣曡妭鍦板尯": "206", "榛斾笢鍗楄嫍鏃忎緱鏃忚嚜娌诲窞": "342", "榛斿崡甯冧緷鏃忚嫍鏃忚嚜娌诲窞": "306", "鏄嗘槑": "104", "鏇查潠": "249", "鐜夋邯": "106", "淇濆北": "112", "鏄��": "336", "涓芥睙": "114", "涓存钵": "110", "妤氶泟褰濇棌鑷不宸�": "105", "绾㈡渤鍝堝凹鏃忓綕鏃忚嚜娌诲窞": "107", "鏂囧北澹棌鑻楁棌鑷不宸�": "177", "鏅幢": "108", "瑗垮弻鐗堢撼鍌f棌鑷不宸�": "109", "澶х悊鐧芥棌鑷不宸�": "111", "寰峰畯鍌f棌鏅鏃忚嚜娌诲窞": "116", "鎬掓睙鍌堝兂鏃忚嚜娌诲窞": "113", "杩簡钘忔棌鑷不宸�": "115", "鎷夎惃": "100", "鏄岄兘鍦板尯": "99", "灞卞崡鍦板尯": "97", "鏃ュ杸鍒欏湴鍖�": "102", "閭f洸鍦板尯": "101", "闃块噷鍦板尯": "103", "鏋楄姖鍦板尯": "98", "瑗垮畨": "233", "閾滃窛": "232", "瀹濋浮": "171", "鍜搁槼": "323", "娓崡": "170", "寤跺畨": "284", "姹変腑": "352", "姒嗘灄": "231", "瀹夊悍": "324", "鍟嗘礇": "285", "鍏板窞": "36", "鍢夊唱鍏�": "33", "閲戞槍": "34", "鐧介摱": "35", "澶╂按": "196", "姝﹀▉": "118", "寮犳帠": "117", "骞冲噳": "359", "閰掓硥": "37", "搴嗛槼": "135", "瀹氳タ": "136", "闄囧崡": "256", "涓村鍥炴棌鑷不宸�": "182", "鐢樺崡钘忔棌鑷不宸�": "247", "瑗垮畞": "66", "娴蜂笢鍦板尯": "69", "娴峰寳钘忔棌鑷不宸�": "67", "榛勫崡钘忔棌鑷不宸�": "70", "娴峰崡钘忔棌鑷不宸�": "68", "鏋滄礇钘忔棌鑷不宸�": "72", "鐜夋爲钘忔棌鑷不宸�": "71", "娴疯タ钂欏彜鏃忚棌鏃忚嚜娌诲窞": "65", "閾跺窛": "360", "鐭冲槾灞�": "335", "鍚村繝": "322", "鍥哄師": "246", "涓崼": "181", "涔岄瞾鏈ㄩ綈": "92", "鍏嬫媺鐜涗緷": "95", "鍚愰瞾鐣湴鍖�": "89", "鍝堝瘑鍦板尯": "91", "鏄屽悏鍥炴棌鑷不宸�": "93", "鍗氬皵濉旀媺钂欏彜鑷不宸�": "88", "宸撮煶閮钂欏彜鑷不宸�": "86", "闃垮厠鑻忓湴鍖�": "85", "鍏嬪瓬鍕掕嫃鏌皵鍏嬪瓬鑷不宸�": "84", "鍠�浠�鍦板尯": "83", "鍜岀敯鍦板尯": "82", "浼婄妬": "90", "濉斿煄鍦板尯": "94", "闃垮嫆娉板湴鍖�": "96", "鐭虫渤瀛�": "770", "闃挎媺灏�": "731", "鍥炬湪鑸掑厠": "792", "浜斿娓�": "789", "棣欐腐鐗瑰埆琛屾斂鍖�": "2912", "婢抽棬鐗瑰埆琛屾斂鍖�": "2911"] DBCollection QCC_COLL = MongoUtils.getCollectionByName("crawl", "tyc_web_crawl", "192.168.0.206",27020) @@ -35,8 +35,8 @@ class YinLianMeiShi { } def addValueByBaiduId(){ - ExcelUtils.modify("D:\\数据\\银联\\数据500条(12-21).xlsx",{d-> - if(d['A'] && d['T']=="百度人工"){ + ExcelUtils.modify("D:\\鏁版嵁\\閾惰仈\\鏁版嵁500鏉�(12-21).xlsx",{d-> + if(d['A'] && d['T']=="鐧惧害浜哄伐"){ def jsonObj = BaiDuApiUtils.getDetailByUid(d['U']) if(jsonObj && jsonObj.result){ def result = jsonObj.result @@ -55,9 +55,9 @@ class YinLianMeiShi { }) } def marge(){ - def file1 = "D:\\数据\\银联\\银联人工1221(灵芝).xlsx" + def file1 = "D:\\鏁版嵁\\閾惰仈\\閾惰仈浜哄伐1221(鐏佃姖).xlsx" def datas1 = ExcelUtils.read(file1, 0, 1) - ExcelUtils.modify("D:\\数据\\银联\\数据500条(12-21).xlsx",{d-> + ExcelUtils.modify("D:\\鏁版嵁\\閾惰仈\\鏁版嵁500鏉�(12-21).xlsx",{d-> if(d['A']){ for(def r : datas1){ if(r['A'] == d['A']){ @@ -72,7 +72,7 @@ class YinLianMeiShi { def location = amapPoi.location if(location){ def arrs = location.split(",") - // 高德转百度 + // 楂樺痉杞櫨搴� def baidu = BaiDuApiUtils.geoconv(arrs[0].toString().toDouble(), arrs[1].toString().toDouble(), 3) def lng2 = baidu.x def lat2 = baidu.y @@ -88,7 +88,7 @@ class YinLianMeiShi { } def run(){ - ExcelUtils.modify("D:\\数据\\银联\\数据500条(合并人工).xlsx",{row-> + ExcelUtils.modify("D:\\鏁版嵁\\閾惰仈\\鏁版嵁500鏉★紙鍚堝苟浜哄伐).xlsx",{row-> def score = row['Q'] if(row['B'] && !row['L']){ def baiduCode = getBaiduMapCode(row['E']); @@ -103,7 +103,7 @@ class YinLianMeiShi { if(baiduCode){ def map = getSimpleAddress(city, row['C']) def simpleAddr = map.addr - if(map.city!="市辖区" && map.city!=city){ + if(map.city!="甯傝緰鍖�" && map.city!=city){ city = RegionData.formatCity(map.city); } def rets = getBiduSearchDatas(baiduCode , simpleAddr, row['B'], null) @@ -131,8 +131,8 @@ class YinLianMeiShi { } def matchFlag(){ - ExcelUtils.multiThreadingModify("D:\\数据\\银联\\数据500条(合并人工).xlsx",{row-> - if(row['B'] && row['B'].contains("麦加美董村餐厅")){ + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\閾惰仈\\鏁版嵁500鏉★紙鍚堝苟浜哄伐).xlsx",{row-> + if(row['B'] && row['B'].contains("楹﹀姞缇庤懀鏉戦鍘�")){ def datas = findQccData(row['B']) if(datas){ def max_score = 0 @@ -151,8 +151,8 @@ class YinLianMeiShi { def name_score = CosineSimilarAlgorithm.getSimilarityRatio(newKeys, qccNameKey); def addr_score = 0 if (map.addr && inputMap.addr) { - if(map.addr.contains("与")){ - def arrs = map.addr.split("与") + if(map.addr.contains("涓�")){ + def arrs = map.addr.split("涓�") for(def s1 : arrs){ def temp_addr_score = CosineSimilarAlgorithm.getSimilarityRatio(inputMap.addr, s1); if(temp_addr_score > addr_score){ @@ -248,7 +248,7 @@ class YinLianMeiShi { } if(jsonObj.result.city){ - if(jsonObj.result.city=="市辖区"){ + if(jsonObj.result.city=="甯傝緰鍖�"){ map.city = jsonObj.result.province }else{ map.city = jsonObj.result.city @@ -263,7 +263,7 @@ class YinLianMeiShi { def street = jsonObj.result.street if(street){ old_addr = street - map.street = street.replace("交叉口","").replace("交叉","") + map.street = street.replace("浜ゅ弶鍙�","").replace("浜ゅ弶","") } } if(jsonObj.result.streetNumber){ @@ -273,12 +273,12 @@ class YinLianMeiShi { } } } - map.addr = old_addr.replace("交叉口","").replace("交叉","") + map.addr = old_addr.replace("浜ゅ弶鍙�","").replace("浜ゅ弶","") return map; } def filterName(pro,city, region, name){ - def newKey = name.replace("餐饮服务有限公司","").replace("控股有限公司","").replace("有限责任公司", "").replace("有限公司","").replace("餐饮","") + def newKey = name.replace("椁愰ギ鏈嶅姟鏈夐檺鍏徃","").replace("鎺ц偂鏈夐檺鍏徃","").replace("鏈夐檺璐d换鍏徃", "").replace("鏈夐檺鍏徃","").replace("椁愰ギ","") if(pro && name.contains(pro)){ newKey = newKey.replace(pro, "") } @@ -300,15 +300,15 @@ class YinLianMeiShi { newKey = newKey.replace(newRegion, "") } - if(newKey.contains("(") || newKey.contains("(")){ + if(newKey.contains("(") || newKey.contains("锛�")){ if(newKey.contains("(")){ def subName = newKey.substring(newKey.indexOf("(")+1, newKey.indexOf(")")); - if(subName.endsWith("街") || subName.endsWith("路") || subName.contains("*") || subName.endsWith("店")){ + if(subName.endsWith("琛�") || subName.endsWith("璺�") || subName.contains("*") || subName.endsWith("搴�")){ newKey = newKey.replace("("+subName+")", ""); } } - newKey = newKey.replace("(","").replace(")","").replace("(","").replace(")","") - if(newKey.toString().endsWith("店")){ + newKey = newKey.replace("(","").replace(")","").replace("锛�","").replace("锛�","") + if(newKey.toString().endsWith("搴�")){ newKey = newKey.substring(0, newKey.size()-1) } } @@ -316,7 +316,7 @@ class YinLianMeiShi { } def filterName2(pro,city, region, name){ - def newKey = name.replace("餐饮服务有限公司","").replace("控股有限公司","").replace("有限责任公司", "").replace("有限公司","").replace("餐饮","") + def newKey = name.replace("椁愰ギ鏈嶅姟鏈夐檺鍏徃","").replace("鎺ц偂鏈夐檺鍏徃","").replace("鏈夐檺璐d换鍏徃", "").replace("鏈夐檺鍏徃","").replace("椁愰ギ","") if(pro && name.contains(pro)){ newKey = newKey.replace(pro, "") } @@ -338,7 +338,7 @@ class YinLianMeiShi { newKey = newKey.replace(newRegion, "") } - newKey = newKey.replace("(","").replace(")","").replace("(","").replace(")","") + newKey = newKey.replace("(","").replace(")","").replace("锛�","").replace("锛�","") return newKey; } @@ -415,8 +415,8 @@ class YinLianMeiShi { } def static formatName(String name) { - if(name.indexOf("·") != -1) { - name = name.replaceAll("·", "") + if(name.indexOf("路") != -1) { + name = name.replaceAll("路", "") } if(name.indexOf(".") != -1) { @@ -505,8 +505,8 @@ class YinLianMeiShi { } } if (baidu_addr_map.addr) { - if(baidu_addr_map.addr.contains("与")){ - def arrs = baidu_addr_map.addr.split("与") + if(baidu_addr_map.addr.contains("涓�")){ + def arrs = baidu_addr_map.addr.split("涓�") for(def s1 : arrs){ def temp_addr_score = CosineSimilarAlgorithm.getSimilarityRatio(inpAddr, s1); if(temp_addr_score > addr_score && (inpAddr.contains(baidu_addr_map.addr) || baidu_addr_map.addr.contains(inpAddr))){ @@ -530,13 +530,13 @@ class YinLianMeiShi { // if(city==o.cityname){ if(total_score > maxScore){ maxScore = total_score; - o.matchType = "城市相同,名称相似" + o.matchType = "鍩庡競鐩稿悓锛屽悕绉扮浉浼�" o.city = o.cityname bo = o bo.score = maxScore if(addr_score>0.6){ - o.matchType = "城市相同,名称相似,地址有关" + o.matchType = "鍩庡競鐩稿悓锛屽悕绉扮浉浼硷紝鍦板潃鏈夊叧" } } // if(bo && score!=1){ @@ -545,7 +545,7 @@ class YinLianMeiShi { // if(baidu_addr){ // def addr_score = CosineSimilarAlgorithm.getSimilarityRatio(inpAddr, baidu_addr); // //if(addr_score==1){ -// // o.matchType = "城市相同,名称相似,地址有关" +// // o.matchType = "鍩庡競鐩稿悓锛屽悕绉扮浉浼硷紝鍦板潃鏈夊叧" // bo.score = bo.score + addr_score // maxScore = bo.score; // //} @@ -566,7 +566,7 @@ class YinLianMeiShi { // score = CosineSimilarAlgorithm.getSimilarityRatio(mapKeyName, newName); // if(score > maxScore){ // maxScore = score -// o.matchType = "名称相似" +// o.matchType = "鍚嶇О鐩镐技" // o.city = obj.city // bo = o // bo.score = maxScore @@ -576,7 +576,7 @@ class YinLianMeiShi { // def newNameBY = com.fangjia.core.util.DataUtil.hanyuQuanpin(newName, " ") // if(mapKeyNameBY == newNameBY){ // maxScore = 0.977; -// o.matchType = "拼音相似" +// o.matchType = "鎷奸煶鐩镐技" // o.city = obj.city // bo = o // bo.score = maxScore diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/YinLianTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/YinLianTest.groovy index 3f21cf781..bb39e21e6 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/YinLianTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/YinLianTest.groovy @@ -10,7 +10,7 @@ import net.sf.json.JSONObject * Created by gaojuan on 2017/9/19. */ def index = 0; -ExcelUtils.modify("D:\\数据\\原数据\\银联接口--银联测试数据.xlsx", { row -> +ExcelUtils.modify("D:\\鏁版嵁\\鍘熸暟鎹甛\閾惰仈鎺ュ彛--閾惰仈娴嬭瘯鏁版嵁.xlsx", { row -> index ++; def city = row[0].toString().replaceAll('\\n', ""); def address = row[1].toString().replaceAll('\\n', ""); 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 0db9c5bb7..0545d8209 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 @@ -28,16 +28,16 @@ import java.util.regex.Pattern import java.util.zip.GZIPInputStream /** - * 友达数据解析入库 + * 鍙嬭揪鏁版嵁瑙f瀽鍏ュ簱 */ class YouDaDataParser { - def city = "上海" + def city = "涓婃捣" public static final def offlineUrl = "mongodb://developer:G00IDCDEV12385@192.168.0.136:28017"; public static final DBCollection youda_newhouse_coll = MongoUtils.getCollectionByName2("business", "res_newdealprice", offlineUrl) public static final DBCollection youda_esfhouse_coll = MongoUtils.getCollectionByName2("business", "res_esfdealprice", offlineUrl) - //线下:228 线上:45 测试 + //绾夸笅锛�228 绾夸笂锛�45 娴嬭瘯 static def new_targetUrl = "http://192.168.0.228:9200/new_deal_price_lansi/doc" static def new_queryUrl = "http://192.168.0.228:9200/new_deal_price_lansi/doc/_search" @@ -51,15 +51,15 @@ class YouDaDataParser { static def statDate = DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(), -1),"yyyy-MM-dd") static main(args) { def task = new YouDaDataParser(); -// task.newHouseparse();//友达一手房存入mongo - task.esfParser("D:\\数据\\友达\\2024年2月\\查询1.DBF");//友达二手房存入mongo -// task.newhouseToSaveEs();//新房保存到es - task.esfhouseToSaveEs();//二手房保存到es -// task.updateFinishDateByEsfTrade();//根据二手成交的竣工时间修改seaweed库中的竣工时间 +// task.newHouseparse();//鍙嬭揪涓�鎵嬫埧瀛樺叆mongo + task.esfParser("D:\\鏁版嵁\\鍙嬭揪\\2024骞�2鏈圽\鏌ヨ1.DBF");//鍙嬭揪浜屾墜鎴垮瓨鍏ongo +// task.newhouseToSaveEs();//鏂版埧淇濆瓨鍒癳s + task.esfhouseToSaveEs();//浜屾墜鎴夸繚瀛樺埌es +// task.updateFinishDateByEsfTrade();//鏍规嵁浜屾墜鎴愪氦鐨勭宸ユ椂闂翠慨鏀箂eaweed搴撲腑鐨勭宸ユ椂闂� } def newHouseparse(){ - def files = ["D:\\数据\\友达10月\\一手房\\查询1.DBF","D:\\数据\\友达10月\\一手房\\查询1.DBF"] + def files = ["D:\\鏁版嵁\\鍙嬭揪10鏈圽\涓�鎵嬫埧\\鏌ヨ1.DBF","D:\\鏁版嵁\\鍙嬭揪10鏈圽\涓�鎵嬫埧\\鏌ヨ1.DBF"] def datas = [] for(def fileName : files){ def rows = readDBF(fileName); @@ -93,7 +93,7 @@ class YouDaDataParser { def block = null; if(data[12]){ - block = data[12].toString().replace("板块","") + block = data[12].toString().replace("鏉垮潡","") } row.block = block row.loopPosition = data[11].toString() @@ -158,9 +158,9 @@ class YouDaDataParser { if(!obj){ youda_newhouse_coll.save(row) }else{ - println "已存在--"+row + println "宸插瓨鍦�--"+row } - println "${count_.get()}【入库】"+ row + println "${count_.get()}銆愬叆搴撱��"+ row } def matchDistrict(def city, def region, def address){ @@ -188,53 +188,53 @@ class YouDaDataParser { } def getHouseType(def s){ - def type1 = ["公寓"] - def type2 = ["办公","写字楼","办公楼"] - def type3 = ["工厂"] - def type4 = ["商业", "商场", "会所","店铺", "商铺"] + def type1 = ["鍏瘬"] + def type2 = ["鍔炲叕","鍐欏瓧妤�","鍔炲叕妤�"] + def type3 = ["宸ュ巶"] + def type4 = ["鍟嗕笟", "鍟嗗満", "浼氭墍","搴楅摵", "鍟嗛摵"] if(s){ if(isExists(type1, s)){ - return "公寓" + return "鍏瘬" }else if(isExists(type2, s)){ - return "办公楼" + return "鍔炲叕妤�" }else if(isExists(type3, s)){ - return "工厂" + return "宸ュ巶" }else if(isExists(type4, s)){ - return "商铺" - }else if(s.indexOf("别墅")>-1){ - return "别墅" - }else if (s.indexOf("花园住宅")>-1){ - return "花园住宅" - }else if (s.indexOf("里弄房")>-1){ - return "里弄房" - }else if (s.indexOf("新工房")>-1){ - return "新工房" + return "鍟嗛摵" + }else if(s.indexOf("鍒")>-1){ + return "鍒" + }else if (s.indexOf("鑺卞洯浣忓畢")>-1){ + return "鑺卞洯浣忓畢" + }else if (s.indexOf("閲屽紕鎴�")>-1){ + return "閲屽紕鎴�" + }else if (s.indexOf("鏂板伐鎴�")>-1){ + return "鏂板伐鎴�" }else{ - return "其它" + return "鍏跺畠" } }else{ - return "未知" + return "鏈煡" } } def getDistrictType(def s){ - def type1 = ["公寓","住宅"] - def type2 = ["办公","写字楼","办公楼"] - def type3 = ["商住","综合社区"] - def type4 = ["商业", "商场", "会所","店铺", "商铺"] + def type1 = ["鍏瘬","浣忓畢"] + def type2 = ["鍔炲叕","鍐欏瓧妤�","鍔炲叕妤�"] + def type3 = ["鍟嗕綇","缁煎悎绀惧尯"] + def type4 = ["鍟嗕笟", "鍟嗗満", "浼氭墍","搴楅摵", "鍟嗛摵"] if(s){ if(isExists(type1, s)){ - return "住宅" - }else if(s.indexOf("别墅")>-1){ - return "别墅" + return "浣忓畢" + }else if(s.indexOf("鍒")>-1){ + return "鍒" }else if(isExists(type2, s)){ - return "办公" + return "鍔炲叕" }else if(isExists(type3, s)){ - return "综合社区" + return "缁煎悎绀惧尯" }else if(isExists(type4, s)){ - return "商铺" + return "鍟嗛摵" }else{ - return "其它" + return "鍏跺畠" } } } @@ -256,19 +256,19 @@ class YouDaDataParser { InputStream fis = null; def datas = [] try { - // 读取文件的输入流 + // 璇诲彇鏂囦欢鐨勮緭鍏ユ祦 fis = new FileInputStream(path); - // 根据输入流初始化一个DBFReader实例,用来读取DBF文件信息 + // 鏍规嵁杈撳叆娴佸垵濮嬪寲涓�涓狣BFReader瀹炰緥锛岀敤鏉ヨ鍙朌BF鏂囦欢淇℃伅 DBFReader reader = new DBFReader(fis); - // 调用DBFReader对实例方法得到path文件中字段的个数 + // 璋冪敤DBFReader瀵瑰疄渚嬫柟娉曞緱鍒皃ath鏂囦欢涓瓧娈电殑涓暟 int fieldsCount = reader.getFieldCount(); - // 取出字段信息 + // 鍙栧嚭瀛楁淇℃伅 for (int i = 0; i < fieldsCount; i++) { DBFField field = reader.getField(i); System.out.print(field.getName()+" "); } Object[] rowValues; - // 一条条取出path文件中记录 + // 涓�鏉℃潯鍙栧嚭path鏂囦欢涓褰� while ((rowValues = reader.nextRecord()) != null) { datas << rowValues; } @@ -318,7 +318,7 @@ class YouDaDataParser { def block = null; if(data[4]){ - block = data[4].toString().replace("板块","") + block = data[4].toString().replace("鏉垮潡","") } row.block = block row.loopPosition = data[5].toString() @@ -408,16 +408,16 @@ class YouDaDataParser { if(!obj){ youda_esfhouse_coll.save(row) }else{ - println "已存在" + println "宸插瓨鍦�" } - println "${count_.get()}【入库】"+ row + println "${count_.get()}銆愬叆搴撱��"+ row } def newhouseToSaveEs(){ def q = new BasicDBObject() q.put("contractTime", new BasicDBObject('$gte', DateUtils.parseFromTightYYYYMMDD(statDate))) def dbcursor = youda_newhouse_coll.find(q).batchSize(2000) - println "总量:"+dbcursor.count() + println "鎬婚噺锛�"+dbcursor.count() def index = 0 ; def rets = [] for(def obj : dbcursor){ @@ -623,7 +623,7 @@ class YouDaDataParser { conn.connect(); - //输出流 + //杈撳嚭娴� if (StringUtils.isNotEmpty(param)) { mWriter = new BufferedWriter(new OutputStreamWriter(conn.getOutputStream(), charset)); mWriter.write(param); @@ -679,11 +679,11 @@ class YouDaDataParser { if(qObj){ if(qObj.finish_building_date && !qObj.finish_building_date.contains(obj.completedTimeStr)){ //index++ - //println index +" 修改:"+obj.ydId.toString()+" "+ qObj.finish_building_date +" "+ obj.completedTimeStr + //println index +" 淇敼锛�"+obj.ydId.toString()+" "+ qObj.finish_building_date +" "+ obj.completedTimeStr }else{ if(!qObj.finish_building_date){ index++ - println index +" 填充:"+qObj.name+" "+ obj.completedTimeStr + println index +" 濉厖锛�"+qObj.name+" "+ obj.completedTimeStr def updateFile = [:] updateFile.m_date = new Date() updateFile.finish_building_date = obj.completedTimeStr diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ZheShangPriceLevel.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ZheShangPriceLevel.groovy index d2c0429a8..8d40e459c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ZheShangPriceLevel.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ZheShangPriceLevel.groovy @@ -28,9 +28,9 @@ class ZheShangPriceLevel{ def run(){ - def file = "D:\\数据\\原数据\\合同类V03--人工.xlsx" + def file = "D:\\鏁版嵁\\鍘熸暟鎹甛\鍚堝悓绫籚03--浜哄伐.xlsx" def rets = []; - //rets << ["城市", "区域","名称","地址","物业类型","产权年限"] + //rets << ["鍩庡競", "鍖哄煙","鍚嶇О","鍦板潃","鐗╀笟绫诲瀷","浜ф潈骞撮檺"] def rows2 = ExcelUtils.read(file); def index = 0; @@ -72,7 +72,7 @@ class ZheShangPriceLevel{ def area = row[2] task.fjw_price = (totalPrice/area).toInteger() } - //其它网站价格 + //鍏跺畠缃戠珯浠锋牸 def startDate = DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyy-MM"), -6, "yyyy-MM"); startDate = startDate.replace("-", "") def rMap = findNetworkPrice(city, region, districtName, startDate.toInteger()); @@ -112,9 +112,9 @@ class ZheShangPriceLevel{ } } - rets << ["ID","房屋地址","建筑面积","房屋总价","房屋单价","房屋形式码值","房屋形式","房屋类别码值","房屋类别","抵押物所在区域","抵押物所在区域名称","城市","省","市","区","乡镇","道路","小区名","楼栋","单元","室号","楼层","地址完整性级别","补充字段","总价","类型","匹配城市","匹配区域","匹配小区名","小区别名","人工匹配地址","地址别名","备注","分配","房估估","云估价","链家","价格评级"] + rets << ["ID","鎴垮眿鍦板潃","寤虹瓚闈㈢Н","鎴垮眿鎬讳环","鎴垮眿鍗曚环","鎴垮眿褰㈠紡鐮佸��","鎴垮眿褰㈠紡","鎴垮眿绫诲埆鐮佸��","鎴垮眿绫诲埆","鎶垫娂鐗╂墍鍦ㄥ尯鍩�","鎶垫娂鐗╂墍鍦ㄥ尯鍩熷悕绉�","鍩庡競","鐪�","甯�","鍖�","涔¢晣","閬撹矾","灏忓尯鍚�","妤兼爧","鍗曞厓","瀹ゅ彿","妤煎眰","鍦板潃瀹屾暣鎬х骇鍒�","琛ュ厖瀛楁","鎬讳环","绫诲瀷","鍖归厤鍩庡競","鍖归厤鍖哄煙","鍖归厤灏忓尯鍚�","灏忓尯鍒悕","浜哄伐鍖归厤鍦板潃","鍦板潃鍒悕","澶囨敞","鍒嗛厤","鎴夸及浼�","浜戜及浠�","閾惧","浠锋牸璇勭骇"] rets.addAll(rows2) - ExcelUtils.write("d:\\数据\\结果\\合同类V03--人工.xlsx", rets, "Sheet1") + ExcelUtils.write("d:\\鏁版嵁\\缁撴灉\\鍚堝悓绫籚03--浜哄伐.xlsx", rets, "Sheet1") } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ZheShengBank.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ZheShengBank.groovy index e2eb3f289..96e7713aa 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ZheShengBank.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ZheShengBank.groovy @@ -17,7 +17,7 @@ MongoCollection OPEN_URI_LOG = Mongo3Utils.getDbCollection(Constants.S //def endDate = DateUtil.parseDate("20230401", "yyyyMMdd") //Calendar calendar = Calendar.getInstance() //calendar.setTime(startDate) -//def data = [[ "公司名称","访问链接", "访问时间", "总量"]] +//def data = [[ "鍏徃鍚嶇О","璁块棶閾炬帴", "璁块棶鏃堕棿", "鎬婚噺"]] //def rMap = [:] //def index = 0 //OPEN_URI_LOG.find(and(eq("user_id", "1007569"), eq("request_uri", "/address/risk"), eq("code", 200))).each { Document doc -> @@ -44,7 +44,7 @@ MongoCollection OPEN_URI_LOG = Mongo3Utils.getDbCollection(Constants.S //calendar.setTime(startDate) //def count = 0 //def hashSet = [] -//def data = [["用户ID", "用户名称", "IP", "访问链接", "访问时间", "dataStatus", "code", "msg", "参数", "resMap"]] +//def data = [["鐢ㄦ埛ID", "鐢ㄦ埛鍚嶇О", "IP", "璁块棶閾炬帴", "璁块棶鏃堕棿", "dataStatus", "code", "msg", "鍙傛暟", "resMap"]] //while (startDate.before(endDate)) { // calendar.add(Calendar.DATE, 1) // def nextDate = calendar.getTime() @@ -59,7 +59,7 @@ MongoCollection OPEN_URI_LOG = Mongo3Utils.getDbCollection(Constants.S // hashSet << result // println total+" "+ nextDate //// } else { -//// println("已存在") +//// println("宸插瓨鍦�") //// } // } // if (count % 7 == 0) { @@ -70,8 +70,8 @@ MongoCollection OPEN_URI_LOG = Mongo3Utils.getDbCollection(Constants.S // //} // -////FileUtils.batchCreateFile(data, "d:\\浙商调用详情1.csv",null, "utf-8", false); -//ExcelUtils.write("D:\\浙商调用详情${startDate.format('yyyyMM')}.xlsx", data, "查询日志") +////FileUtils.batchCreateFile(data, "d:\\娴欏晢璋冪敤璇︽儏1.csv",null, "utf-8", false); +//ExcelUtils.write("D:\\娴欏晢璋冪敤璇︽儏${startDate.format('yyyyMM')}.xlsx", data, "鏌ヨ鏃ュ織") @@ -82,18 +82,18 @@ MongoCollection OPEN_URI_LOG = Mongo3Utils.getDbCollection(Constants.S //calendar.setTime(startDate) //def count = 0 //def hashSet = [] -//def data = [["用户ID", "用户名称", "IP", "访问链接", "访问时间", "dataStatus", "code", "msg", "参数", "resMap"]] +//def data = [["鐢ㄦ埛ID", "鐢ㄦ埛鍚嶇О", "IP", "璁块棶閾炬帴", "璁块棶鏃堕棿", "dataStatus", "code", "msg", "鍙傛暟", "resMap"]] // //OPEN_URI_LOG.find(and(eq("user_id", "1007779"), eq("data_status", 1), lt("c_date", endDate), gte("c_date", startDate))).each { Document doc -> // def result = JSONObject.fromObject(doc.res_map.result) -// def item = [doc._id.toString(), "辽宁卓信普惠征信", doc.ip, doc.request_uri, doc.c_date.format("yyyy-MM-dd HH:mm:ss"), doc.data_status, doc.code, doc.msg, JSONObject.fromObject(doc.parameter_map).toString(), result.toString()] +// def item = [doc._id.toString(), "杈藉畞鍗撲俊鏅儬寰佷俊", doc.ip, doc.request_uri, doc.c_date.format("yyyy-MM-dd HH:mm:ss"), doc.data_status, doc.code, doc.msg, JSONObject.fromObject(doc.parameter_map).toString(), result.toString()] // data << item // hashSet << result //} // // -////FileUtils.batchCreateFile(data, "d:\\浙商调用详情1.csv",null, "utf-8", false); -//ExcelUtils.write("D:\\辽宁卓信普惠征信${startDate.format('yyyyMM')}.xlsx", data, "查询日志") +////FileUtils.batchCreateFile(data, "d:\\娴欏晢璋冪敤璇︽儏1.csv",null, "utf-8", false); +//ExcelUtils.write("D:\\杈藉畞鍗撲俊鏅儬寰佷俊${startDate.format('yyyyMM')}.xlsx", data, "鏌ヨ鏃ュ織") //def startDate = DateUtil.parseDate("20221201", "yyyyMMdd") @@ -102,7 +102,7 @@ MongoCollection OPEN_URI_LOG = Mongo3Utils.getDbCollection(Constants.S //calendar.setTime(startDate) //def count = 0 //def hashSet = [] -//def data = [["用户ID", "用户名称", "IP", "访问链接", "访问时间", "dataStatus", "code", "msg", "参数", "resMap"]] +//def data = [["鐢ㄦ埛ID", "鐢ㄦ埛鍚嶇О", "IP", "璁块棶閾炬帴", "璁块棶鏃堕棿", "dataStatus", "code", "msg", "鍙傛暟", "resMap"]] // //OPEN_URI_LOG.find(and(eq("request_uri", "/property/detail"), eq("data_status", 1), lt("c_date", endDate), gte("c_date", startDate))).each { Document doc -> // def result = JSONObject.fromObject(doc.res_map.result) @@ -114,8 +114,8 @@ MongoCollection OPEN_URI_LOG = Mongo3Utils.getDbCollection(Constants.S //} // // -////FileUtils.batchCreateFile(data, "d:\\浙商调用详情1.csv",null, "utf-8", false); -//ExcelUtils.write("D:\\小区详情${startDate.format('yyyyMM')}.xlsx", data, "查询日志") +////FileUtils.batchCreateFile(data, "d:\\娴欏晢璋冪敤璇︽儏1.csv",null, "utf-8", false); +//ExcelUtils.write("D:\\灏忓尯璇︽儏${startDate.format('yyyyMM')}.xlsx", data, "鏌ヨ鏃ュ織") @@ -126,16 +126,16 @@ Calendar calendar = Calendar.getInstance() calendar.setTime(startDate) def count = 0 def hashSet = [] -def data = [[ "用户名称", "IP", "访问链接", "访问时间", "dataStatus", "code", "msg","访问时长","parameter_map.showCode", "参数-城市", "参数-地址","省","省编码","城市","城市编码","区","区编码","镇","镇","街道","社区","社区编码","poi","楼栋号","单元号","经度","纬度","格式化地址","有效性","路号","楼层","室号"]] +def data = [[ "鐢ㄦ埛鍚嶇О", "IP", "璁块棶閾炬帴", "璁块棶鏃堕棿", "dataStatus", "code", "msg","璁块棶鏃堕暱","parameter_map.showCode", "鍙傛暟-鍩庡競", "鍙傛暟-鍦板潃","鐪�","鐪佺紪鐮�","鍩庡競","鍩庡競缂栫爜","鍖�","鍖虹紪鐮�","闀�","闀�","琛楅亾","绀惧尯","绀惧尯缂栫爜","poi","妤兼爧鍙�","鍗曞厓鍙�","缁忓害","绾害","鏍煎紡鍖栧湴鍧�","鏈夋晥鎬�","璺彿","妤煎眰","瀹ゅ彿"]] OPEN_URI_LOG.find(and(eq("user_id", "1007780"), eq("request_uri","/v2/address/standard"), eq("data_status", 1), lt("c_date", endDate), gte("c_date", startDate))).each { Document doc -> def result = JSONObject.fromObject(doc.res_map.result) - def item = [ "福建顶点软件", doc.ip, doc.request_uri, doc.c_date.format("yyyy-MM-dd HH:mm:ss"), doc.data_status, doc.code, doc.msg,doc.time,doc.parameter_map.showCode, + def item = [ "绂忓缓椤剁偣杞欢", doc.ip, doc.request_uri, doc.c_date.format("yyyy-MM-dd HH:mm:ss"), doc.data_status, doc.code, doc.msg,doc.time,doc.parameter_map.showCode, doc.parameter_map.city,doc.parameter_map.address, result.province,result.provinceCode,result.city,result.cityCode,result.district,result.districtCode,result.township,result.townshipCode,result.street,result.community,result.communityCode,result.name,result.buildingNumber,result.unitNumber,result.lng,result.lat,result.formatAddress,result.addrVerify,result.streetNumber,result.floor,result.roomNumber] data << item hashSet << result } -//FileUtils.batchCreateFile(data, "d:\\浙商调用详情1.csv",null, "utf-8", false); -ExcelUtils.write("D:\\福建顶点软件${startDate.format('yyyyMM')}.xlsx", data, "查询日志") \ No newline at end of file +//FileUtils.batchCreateFile(data, "d:\\娴欏晢璋冪敤璇︽儏1.csv",null, "utf-8", false); +ExcelUtils.write("D:\\绂忓缓椤剁偣杞欢${startDate.format('yyyyMM')}.xlsx", data, "鏌ヨ鏃ュ織") \ No newline at end of file diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ZhugezhaofangHouseCountCrawal.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ZhugezhaofangHouseCountCrawal.groovy index fc27ca304..4827d4738 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ZhugezhaofangHouseCountCrawal.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ZhugezhaofangHouseCountCrawal.groovy @@ -22,7 +22,7 @@ import org.jsoup.nodes.Element import org.jsoup.select.Elements /** - * 解析诸葛找房挂牌房源降价信息 + * 瑙f瀽璇歌憶鎵炬埧鎸傜墝鎴挎簮闄嶄环淇℃伅 * Created by gaojuan on 2017/12/13. */ @BatchOwner(Watcher.GaoJuan) @@ -46,9 +46,9 @@ class ZhugezhaofangHouseCountCrawal extends BaseBatch{ @Override void process(Object args) { - //检查任务是否完成 + //妫�鏌ヤ换鍔℃槸鍚﹀畬鎴� //moniterJobs(); - //如果完成解析网页 + //濡傛灉瀹屾垚瑙f瀽缃戦〉 // analyWebpage(); def retMap = getAllUrls("http://sh.zhugefang.com", ".select_city_wrap a"); crawalAnalyWebpage(retMap); @@ -69,7 +69,7 @@ class ZhugezhaofangHouseCountCrawal extends BaseBatch{ document = Jsoup.parse(s); Elements elements = JQueryUtils.select([xpath], document) def ret = [:]; - ret.put("上海", url); + ret.put("涓婃捣", url); for (Element element : elements) { def city = element.text(); def href = element.attr("href") @@ -132,7 +132,7 @@ class ZhugezhaofangHouseCountCrawal extends BaseBatch{ if(rets){ saveAnalyData(rets) } - //删除metadata + //鍒犻櫎metadata CRAWL_COLL.remove(new BasicDBObject('_id', new BasicDBObject('$in', metadataIdList))) } @@ -162,21 +162,21 @@ class ZhugezhaofangHouseCountCrawal extends BaseBatch{ def map = [:]; try { // Document document = Jsoup.parse(s); - String addHouseCount = JQueryUtils.selectText([".change_house_list a:contains(今日新上房源) h5"], document) - String cutPriceHouseCount = JQueryUtils.selectText([".change_house_list a:contains(今日降价房源) h5"], document) - String increasePriceHouseCount = JQueryUtils.selectText([".change_house_list a:contains(今日涨价房源) h5"], document) + String addHouseCount = JQueryUtils.selectText([".change_house_list a:contains(浠婃棩鏂颁笂鎴挎簮) h5"], document) + String cutPriceHouseCount = JQueryUtils.selectText([".change_house_list a:contains(浠婃棩闄嶄环鎴挎簮) h5"], document) + String increasePriceHouseCount = JQueryUtils.selectText([".change_house_list a:contains(浠婃棩娑ㄤ环鎴挎簮) h5"], document) String updateDateString = JQueryUtils.selectText([".zhuge_exponent .time_update"], document) if (!addHouseCount && !cutPriceHouseCount && !increasePriceHouseCount) { return null; } if (updateDateString) { - updateDateString = updateDateString.replace("更新于", "") + updateDateString = updateDateString.replace("鏇存柊浜�", "") } String cityAvgPriceString = JQueryUtils.selectText([".line>p"], document) - if (cityAvgPriceString && cityAvgPriceString.contains("元/平")) { - cityAvgPriceString = cityAvgPriceString.replace("元/平", "") + if (cityAvgPriceString && cityAvgPriceString.contains("鍏�/骞�")) { + cityAvgPriceString = cityAvgPriceString.replace("鍏�/骞�", "") } if (addHouseCount) { map.add_house_count = addHouseCount.toInteger() @@ -219,24 +219,24 @@ class ZhugezhaofangHouseCountCrawal extends BaseBatch{ /** - * 检查任务 + * 妫�鏌ヤ换鍔� */ public void moniterJobs() { - //检查任务是否运行完成 + //妫�鏌ヤ换鍔℃槸鍚﹁繍琛屽畬鎴� while(true) { if(getArtemisJobState(JOBID) == 2) { JOB_STATUS = 2 - println DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) + " " + JOB_STATUS + "\t抓取任务已完成" + println DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) + " " + JOB_STATUS + "\t鎶撳彇浠诲姟宸插畬鎴�" break; } - //每5分钟检查一次 + //姣�5鍒嗛挓妫�鏌ヤ竴娆� sleep(5 * 60 * 1000) } } /** - * 获取抓取任务的状态 - * 1-运行中 2-完成或停止 3-暂停 + * 鑾峰彇鎶撳彇浠诲姟鐨勭姸鎬� + * 1-杩愯涓� 2-瀹屾垚鎴栧仠姝� 3-鏆傚仠 * @param jobId * @return */ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/abc/SuzouPocTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/abc/SuzouPocTest.groovy index 763fba889..c7360cf0c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/abc/SuzouPocTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/abc/SuzouPocTest.groovy @@ -35,14 +35,14 @@ class SuzouPocTest { def task = new SuzouPocTest() // task.run() // task.newRun() -// task.test()//有楼层 - task.testEval()//无楼层 -// task.level()//楼盘评级 +// task.test()//鏈夋ゼ灞� + task.testEval()//鏃犳ゼ灞� +// task.level()//妤肩洏璇勭骇 // task.house() } def test(){ - ExcelUtils.modify("D:\\数据\\慧合\\(中企华正诚评估回复)房产价值查询20251209-结果.xlsx", { d -> + ExcelUtils.modify("D:\\鏁版嵁\\鎱у悎\\(涓紒鍗庢璇氳瘎浼板洖澶�)鎴夸骇浠峰�兼煡璇�20251209-缁撴灉.xlsx", { d -> if(!d['S'] && d['A']){ def floorAdds = d['I'].split("/") def ret1 = OpenApiClient.addressEvaluation(d['C'], null, d['D'], d['D'], d['K'], floorAdds[0], floorAdds[1]) @@ -58,7 +58,7 @@ class SuzouPocTest { } def level(){ - ExcelUtils.modify("D:\\数据\\其它\\附件1:POC测试样本(匹配).xlsx", { d -> + ExcelUtils.modify("D:\\鏁版嵁\\鍏跺畠\\闄勪欢1锛歅OC娴嬭瘯鏍锋湰(鍖归厤).xlsx", { d -> if(d['O']){ // def obj = CommonDatautils.findDistrict(d['K'], d['L'], d['M'], "district") // if(obj){ @@ -99,10 +99,10 @@ class SuzouPocTest { } def testEval(){ - ExcelUtils.multiThreadingModify("D:\\数据\\海南\\地址清单.xlsx", { d -> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\娴峰崡\\鍦板潃娓呭崟.xlsx", { d -> if(!d['L'] && d['B']){ // def city = d['C'] -// if(city == "市辖区"){ +// if(city == "甯傝緰鍖�"){ // city = d['B'] // } // def obj = CommonDatautils.findDistrictById(d['O']) @@ -138,8 +138,8 @@ class SuzouPocTest { def house(){ def cases = [] - cases << ["城市", "区域","板块", "名称", "面积", "单价","总价","装修", "朝向", "距离","所在楼层","总楼层","室","厅","卫","发布时间","标题", "序号"] - ExcelUtils.modify("D:\\数据\\湖北银行\\房产价格评估测试数据_1210-匹配-V2.xlsx", { d -> + cases << ["鍩庡競", "鍖哄煙","鏉垮潡", "鍚嶇О", "闈㈢Н", "鍗曚环","鎬讳环","瑁呬慨", "鏈濆悜", "璺濈","鎵�鍦ㄦゼ灞�","鎬绘ゼ灞�","瀹�","鍘�","鍗�","鍙戝竷鏃堕棿","鏍囬", "搴忓彿"] + ExcelUtils.modify("D:\\鏁版嵁\\婀栧寳閾惰\\鎴夸骇浠锋牸璇勪及娴嬭瘯鏁版嵁_1210-鍖归厤-V2.xlsx", { d -> if(d['Q']){ println d["P"] def obj = CommonDatautils.findDistrict(d['N'], d['O'], d['P'], "district") @@ -162,10 +162,10 @@ class SuzouPocTest { def startDate = DateUtils.parseFromTightByPattern("2025-01-01", "yyyy-MM-dd") def pDate = DateUtils.parseFromTightByPattern(h.publishDate, "yyyy-MM-dd") if(pDate.getTime()>=startDate.getTime()){ - houseList << [h.city, h.district, h.block, h.name, h.size, h.unitPrice, h.totalPrice, h.decoration, h.direction, h.distance, h.floor,h.maxFloor, h.room, h.hall, h.toilet, h.publishDate, h.title, d["A"],"挂牌"] + houseList << [h.city, h.district, h.block, h.name, h.size, h.unitPrice, h.totalPrice, h.decoration, h.direction, h.distance, h.floor,h.maxFloor, h.room, h.hall, h.toilet, h.publishDate, h.title, d["A"],"鎸傜墝"] } }else{ - println "价格过滤 "+startPrice +" "+endPrice +" "+ h.unitPrice + println "浠锋牸杩囨护 "+startPrice +" "+endPrice +" "+ h.unitPrice } } } @@ -185,7 +185,7 @@ class SuzouPocTest { def pDate = DateUtils.parseFromTightByPattern(h.tradeDate, "yyyy-MM-dd") if(pDate.getTime()>=startDate.getTime()){ if(startPrice && h.avgPrice>=startPrice && h.avgPrice<=endPrice) { - dealList << [h.city, h.district, "", h.name, h.size, h.avgPrice, h.totalPrice, h.decoration, h.direction, distance, h.floor, h.maxFloor, h.room, h.hall, h.toilet, h.tradeDate, "", d["A"], "成交"] + dealList << [h.city, h.district, "", h.name, h.size, h.avgPrice, h.totalPrice, h.decoration, h.direction, distance, h.floor, h.maxFloor, h.room, h.hall, h.toilet, h.tradeDate, "", d["A"], "鎴愪氦"] } } } @@ -206,7 +206,7 @@ class SuzouPocTest { def pDate = DateUtils.parseFromTightByPattern(h.tradeDate, "yyyy-MM-dd") if(pDate.getTime()>=startDate.getTime()){ if(startPrice && h.avgPrice>=startPrice && h.avgPrice<=endPrice) { - dealList << [h.city, h.district, "", h.name, h.size, h.avgPrice, h.totalPrice, h.decoration, h.direction, distance, h.floor, h.maxFloor, h.room, h.hall, h.toilet, h.tradeDate, "", d["A"], "成交"] + dealList << [h.city, h.district, "", h.name, h.size, h.avgPrice, h.totalPrice, h.decoration, h.direction, distance, h.floor, h.maxFloor, h.room, h.hall, h.toilet, h.tradeDate, "", d["A"], "鎴愪氦"] } } } @@ -228,13 +228,13 @@ class SuzouPocTest { } }) println cases.size() - ExcelUtils.write("D:\\数据\\湖北银行\\房产价格评估测试数据_1216-样本.xlsx", cases, "样本") + ExcelUtils.write("D:\\鏁版嵁\\婀栧寳閾惰\\鎴夸骇浠锋牸璇勪及娴嬭瘯鏁版嵁_1216-鏍锋湰.xlsx", cases, "鏍锋湰") } def newRun(){ println("start:"+new Date().toString()) - def filePath = "D:\\数据\\江苏农行\\押品填报表_测试数据样例-给公司.xls" + def filePath = "D:\\鏁版嵁\\姹熻嫃鍐滆\\鎶煎搧濉姤琛╛娴嬭瘯鏁版嵁鏍蜂緥-缁欏叕鍙�.xls" newMatch(filePath) addEvalutePrice(filePath) addLation(filePath) @@ -269,9 +269,9 @@ class SuzouPocTest { d['Q'] = obj.get("lng")/10000000000.0 d['R'] = obj.get("lat")/10000000000.0 } - d['S'] = "直接从库中查询" + d['S'] = "鐩存帴浠庡簱涓煡璇�" }else{ - //新的匹配算法 + //鏂扮殑鍖归厤绠楁硶 def jsonObject = FangjiaClientUtils.newMatch(city, address, "property", false) if(!jsonObject && !jsonObject.containsKey("result")){ jsonObject = FangjiaClientUtils.newMatch(city, address, "property", true) @@ -284,10 +284,10 @@ class SuzouPocTest { jsonObject = FangjiaClientUtils.newMatch(city, newAddr, "property", true) } if(!jsonObject.containsKey("result")){ - //老匹配 + //鑰佸尮閰� jsonObject = OpenApiClient.addressMatch(city, address, null, false, region, name) if(jsonObject && jsonObject.credit>0){ - d['S'] = "老匹配" + d['S'] = "鑰佸尮閰�" } } if (jsonObject != null && !jsonObject.containsKey("result")) { @@ -345,7 +345,7 @@ class SuzouPocTest { if(map){ d['Q'] = map.lng d['R'] = map.lat - d['T'] = "地址反解析经纬度" + d['T'] = "鍦板潃鍙嶈В鏋愮粡绾害" } } }) @@ -363,7 +363,7 @@ class SuzouPocTest { def str = ret.get(0).location def level = ret.get(0).level - if(str && ["门牌号","单元号","道路","道路交叉路口","热点商圈","村庄","兴趣点","门址","住宅区"].contains(level)){ + if(str && ["闂ㄧ墝鍙�","鍗曞厓鍙�","閬撹矾","閬撹矾浜ゅ弶璺彛","鐑偣鍟嗗湀","鏉戝簞","鍏磋叮鐐�","闂ㄥ潃","浣忓畢鍖�"].contains(level)){ def arrs = str.split(",") return ["lng":arrs[0], "lat":arrs[1]] }else{ @@ -384,7 +384,7 @@ class SuzouPocTest { dist.city = city dist.lng = d['Q'].toString().toDouble()*10000000000L dist.lat = d['R'].toString().toDouble()*10000000000L - dist.estateType = "普通住宅"//d['H'] + dist.estateType = "鏅�氫綇瀹�"//d['H'] if(dist.lat) { List list = DbUtils.findAroundDistrictByRadius(dist, 1000) if (list) { @@ -423,12 +423,12 @@ class SuzouPocTest { nb.distance = distance newList << nb } - //排序 + //鎺掑簭 Collections.sort(newList, new Comparator() { @Override int compare(Object o1, Object o2) { if(o1.distance > o2.distance) - return 1;//第二个元素(o1)比第一个元素(o2)大,返回-1 + return 1;//绗簩涓厓绱狅紙o1锛夋瘮绗竴涓厓绱狅紙o2锛夊ぇ锛岃繑鍥�-1 if(o1.distance == o2.distance) return 0; return -1; @@ -444,7 +444,7 @@ class SuzouPocTest { def run(){ - def path = "D:\\数据\\江苏农行\\江苏农1062条(总).xlsx" + def path = "D:\\鏁版嵁\\姹熻嫃鍐滆\\姹熻嫃鍐�1062鏉�(鎬�).xlsx" addressEvalute(path) // addFjwTobPrice(path) // addThirdPrice(path) @@ -545,13 +545,13 @@ class SuzouPocTest { } def margeExcel(path){ - def datas = ExcelUtils.read("D:\\数据\\江苏农行\\(合并)江苏农匹配不上149条-.xlsx", 0, 1) + def datas = ExcelUtils.read("D:\\鏁版嵁\\姹熻嫃鍐滆\\锛堝悎骞讹級姹熻嫃鍐滃尮閰嶄笉涓�149鏉�-.xlsx", 0, 1) def map = [:] for(def d : datas){ map.put(d['G'], d['O']) } - ExcelUtils.multiThreadingModify("D:\\数据\\江苏农行\\江苏农1062条.xlsx",{d-> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\姹熻嫃鍐滆\\姹熻嫃鍐�1062鏉�.xlsx",{d-> def commId = map.get(d['G']) def dist = CommonDatautils.findDistrictById(commId) if(dist){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/address/AddressParser.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/address/AddressParser.groovy index 2895805ae..28203b34b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/address/AddressParser.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/address/AddressParser.groovy @@ -40,7 +40,7 @@ class AddressParser { match2(data._id, data.city, data.region, data.school_address, data.school_name); } catch (Exception e) { - println "异常" + println "寮傚父" e.printStackTrace(); } finally { latch.countDown() @@ -68,7 +68,7 @@ class AddressParser { match(data._id, data.city, data.region, data.school_address, data.school_name); } catch (Exception e) { - println "异常" + println "寮傚父" e.printStackTrace(); } finally { latch.countDown() @@ -163,7 +163,7 @@ class AddressParser { def findAllDatas(){ def q = new BasicDBObject() -// q.put("school_name","苏州市娄葑实验小学") +// q.put("school_name","鑻忓窞甯傚▌钁戝疄楠屽皬瀛�") // q.put("school_lng", new BasicDBObject(QueryOperators.EXISTS, false)) def dbcursor = district_school_col.find(q) def rets =[] diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/apiLog/ApiTimeOutAnalyBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/apiLog/ApiTimeOutAnalyBatch.groovy index d4dbf01dd..719024faf 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/apiLog/ApiTimeOutAnalyBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/apiLog/ApiTimeOutAnalyBatch.groovy @@ -28,7 +28,7 @@ class ApiTimeOutAnalyBatch extends BaseBatch{ } def sendMessage(uriCountMap){ - def message = "【Api接口近5分钟超过5条请求时间超3秒提醒】\n超时接口:" + def message = "銆怉pi鎺ュ彛杩�5鍒嗛挓瓒呰繃5鏉¤姹傛椂闂磋秴3绉掓彁閱掋�慭n瓒呮椂鎺ュ彛锛�" def total = message.length() uriCountMap.each{uri,count-> if(count>=5){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/apiLog/ApiUserCountAnalyBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/apiLog/ApiUserCountAnalyBatch.groovy index 4ca121052..1e6db883b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/apiLog/ApiUserCountAnalyBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/apiLog/ApiUserCountAnalyBatch.groovy @@ -31,14 +31,14 @@ class ApiUserCountAnalyBatch extends BaseBatch{ def sendMessage(def rets){ - def message = "【Api接口使用提醒】\n" + def message = "銆怉pi鎺ュ彛浣跨敤鎻愰啋銆慭n" def total = message.length() for(def r : rets){ - def type = "正式帐户" + def type = "姝e紡甯愭埛" if(r.type!=0){ - type = "测试帐户" + type = "娴嬭瘯甯愭埛" } - message = message + r.company+ " 用户ID:"+r.user_id+"(${type}),有 "+r.uris.size()+" 个接口使用率已超过80%,接口有:"+r.uris.join(",")+"\n" + message = message + r.company+ " 鐢ㄦ埛ID锛�"+r.user_id+"锛�${type}锛夛紝鏈� "+r.uris.size()+" 涓帴鍙d娇鐢ㄧ巼宸茶秴杩�80%锛屾帴鍙f湁锛�"+r.uris.join(",")+"\n" } if(message.length()>total){ println message diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ccb/CcbCityPriceStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ccb/CcbCityPriceStat.groovy index 7ea251213..86b0c6996 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ccb/CcbCityPriceStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ccb/CcbCityPriceStat.groovy @@ -18,7 +18,7 @@ class CcbCityPriceStat { task.run() } def run(){ - def citys = ["潍坊","临沂","邯郸","济宁","威海","绵阳","梅州","平顶山","江门","赣州","泰安","襄阳","南阳","桂林","临汾","聊城","德州","商丘","衡阳","宿迁","包头","渭南","咸阳","许昌","滨州","邢台","南充","安阳","新乡","枣庄","滁州","龙岩","宝鸡","信阳","运城","衡水","东营","晋中","孝感","长治","阜阳","韶关","菏泽","德阳","宁德","荆州","乐山","驻马店","南平","汉中","榆林","宜春","鞍山","开封","周口","绥化","湘潭","黄冈","承德","焦作","牡丹江","莆田","上饶","齐齐哈尔","眉山","郴州","营口","蚌埠","赤峰","大庆","河源","吕梁","遂宁","漯河","三明","茂名","濮阳","曲靖","平凉","鄂尔多斯","十堰","吉安","黄石","佳木斯","三门峡","揭阳","忻州","通辽","泸州","六安","潮州","衢州","淮南","荆门","永州","呼伦贝尔","葫芦岛","丹东","延边","宣城","宜宾","庆阳","晋城","阳江","宿州","延安","咸宁","怀化","黄山","舟山","汕尾","盘锦","朝阳","丽水","抚州","铁岭","红河","陇南","广安","抚顺","自贡","达州","玉林","玉溪","白银","亳州","邵阳","广元","昌吉","益阳","张掖","娄底","阳泉","天水","朔州","随州","大理","通化","楚雄","巴彦淖尔","乌兰察布","松原","景德镇","新余","辽阳","阜新","黔南","酒泉","淮北","四平","梧州","黔东南","巴中","鹤壁","鸡西","钦州","内江","池州","仙桃","恩施","本溪","资阳","六盘水","百色","白城","临夏","伊犁","贵港","白山","双鸭山","吴忠","鄂州","丽江","安康","毕节","云浮","巴音郭楞","安顺","阿克苏","黑河","铜陵","雅安","石嘴山","鹤岗","萍乡","锡林郭勒盟","铜仁","防城港","喀什","兴安盟","河池","铜川","普洱","保山","凉山州","鹰潭","定西","伊春","中卫","黔西南","商洛","乌海","武威","海西州","来宾","湘西","昭通","哈密","张家界","西双版纳州","七台河","固原","攀枝花","德宏州","崇左","辽源","嘉峪关","克拉玛依","临沧","潜江","贺州","天门","海东","塔城","儋州","金昌","博尔塔拉","吐鲁番","大兴安岭","阿勒泰","和田","迪庆州","日喀则","林芝"] + def citys = ["娼嶅潑","涓存矀","閭兏","娴庡畞","濞佹捣","缁甸槼","姊呭窞","骞抽《灞�","姹熼棬","璧e窞","娉板畨","瑗勯槼","鍗楅槼","妗傛灄","涓存本","鑱婂煄","寰峰窞","鍟嗕笜","琛¢槼","瀹胯縼","鍖呭ご","娓崡","鍜搁槼","璁告槍","婊ㄥ窞","閭㈠彴","鍗楀厖","瀹夐槼","鏂颁埂","鏋e簞","婊佸窞","榫欏博","瀹濋浮","淇¢槼","杩愬煄","琛℃按","涓滆惀","鏅嬩腑","瀛濇劅","闀挎不","闃滈槼","闊跺叧","鑿忔辰","寰烽槼","瀹佸痉","鑽嗗窞","涔愬北","椹婚┈搴�","鍗楀钩","姹変腑","姒嗘灄","瀹滄槬","闉嶅北","寮�灏�","鍛ㄥ彛","缁ュ寲","婀樻江","榛勫唸","鎵垮痉","鐒︿綔","鐗′腹姹�","鑾嗙敯","涓婇ザ","榻愰綈鍝堝皵","鐪夊北","閮村窞","钀ュ彛","铓屽煚","璧ゅ嘲","澶у簡","娌虫簮","鍚曟","閬傚畞","婕渤","涓夋槑","鑼傚悕","婵槼","鏇查潠","骞冲噳","閯傚皵澶氭柉","鍗佸牥","鍚夊畨","榛勭煶","浣虫湪鏂�","涓夐棬宄�","鎻槼","蹇诲窞","閫氳窘","娉稿窞","鍏畨","娼窞","琛㈠窞","娣崡","鑽嗛棬","姘稿窞","鍛间鸡璐濆皵","钁姦宀�","涓逛笢","寤惰竟","瀹e煄","瀹滃","搴嗛槼","鏅嬪煄","闃虫睙","瀹垮窞","寤跺畨","鍜稿畞","鎬�鍖�","榛勫北","鑸熷北","姹曞熬","鐩橀敠","鏈濋槼","涓芥按","鎶氬窞","閾佸箔","绾㈡渤","闄囧崡","骞垮畨","鎶氶『","鑷础","杈惧窞","鐜夋灄","鐜夋邯","鐧介摱","浜冲窞","閭甸槼","骞垮厓","鏄屽悏","鐩婇槼","寮犳帠","濞勫簳","闃虫硥","澶╂按","鏈斿窞","闅忓窞","澶х悊","閫氬寲","妤氶泟","宸村溅娣栧皵","涔屽叞瀵熷竷","鏉惧師","鏅痉闀�","鏂颁綑","杈介槼","闃滄柊","榛斿崡","閰掓硥","娣寳","鍥涘钩","姊у窞","榛斾笢鍗�","宸翠腑","楣ゅ","楦¤タ","閽﹀窞","鍐呮睙","姹犲窞","浠欐","鎭╂柦","鏈邯","璧勯槼","鍏洏姘�","鐧捐壊","鐧藉煄","涓村","浼婄妬","璐垫腐","鐧藉北","鍙岄腑灞�","鍚村繝","閯傚窞","涓芥睙","瀹夊悍","姣曡妭","浜戞诞","宸撮煶閮","瀹夐『","闃垮厠鑻�","榛戞渤","閾滈櫟","闆呭畨","鐭冲槾灞�","楣ゅ矖","钀嶄埂","閿℃灄閮嫆鐩�","閾滀粊","闃插煄娓�","鍠�浠�","鍏村畨鐩�","娌虫睜","閾滃窛","鏅幢","淇濆北","鍑夊北宸�","楣版江","瀹氳タ","浼婃槬","涓崼","榛旇タ鍗�","鍟嗘礇","涔屾捣","姝﹀▉","娴疯タ宸�","鏉ュ","婀樿タ","鏄��","鍝堝瘑","寮犲鐣�","瑗垮弻鐗堢撼宸�","涓冨彴娌�","鍥哄師","鏀�鏋濊姳","寰峰畯宸�","宕囧乏","杈芥簮","鍢夊唱鍏�","鍏嬫媺鐜涗緷","涓存钵","娼滄睙","璐哄窞","澶╅棬","娴蜂笢","濉斿煄","鍎嬪窞","閲戞槍","鍗氬皵濉旀媺","鍚愰瞾鐣�","澶у叴瀹夊箔","闃垮嫆娉�","鍜岀敯","杩簡宸�","鏃ュ杸鍒�","鏋楄姖"] def rets = [] def startDate = DateUtils.parseFromTightByPattern("2022-02-01","yyyy-MM-dd") def endDate = DateUtils.parseFromTightByPattern("2022-06-01","yyyy-MM-dd") @@ -45,8 +45,8 @@ class CcbCityPriceStat { } - println "总量:"+rets.size() - ExcelUtils.write("d:\\数据\\234个城市价格数据.xlsx", rets, "所有") + println "鎬婚噺锛�"+rets.size() + ExcelUtils.write("d:\\鏁版嵁\\234涓煄甯備环鏍兼暟鎹�.xlsx", rets, "鎵�鏈�") } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ccb/CcbCodeUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ccb/CcbCodeUtils.groovy index 842e0afe1..8d259b9df 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ccb/CcbCodeUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ccb/CcbCodeUtils.groovy @@ -9,9 +9,9 @@ import java.util.regex.Pattern class CcbCodeUtils { - //否:0 是:1 + //鍚�:0 鏄�:1 static def parseFlag(String flag){ - if(flag && flag == "是"){ + if(flag && flag == "鏄�"){ return 1; } return 0; @@ -27,10 +27,10 @@ class CcbCodeUtils { return null; } - //权属 产权:11 购房合同:12 集体产权:13 预定:14 经济适用房:15 拆迁补偿:16 产权抵押中:17 使用权:21 直管房:22 自管房:23 公产:24 公租房:25 廉租房:26 限价房:27 房改房:28 自建房:29 标准价房改:18 已购公房:19 小产权:20 其他:99 + //鏉冨睘 浜ф潈:11 璐埧鍚堝悓:12 闆嗕綋浜ф潈:13 棰勫畾:14 缁忔祹閫傜敤鎴�:15 鎷嗚縼琛ュ伩:16 浜ф潈鎶垫娂涓�:17 浣跨敤鏉�:21 鐩寸鎴�:22 鑷鎴�:23 鍏骇:24 鍏鎴�:25 寤夌鎴�:26 闄愪环鎴�:27 鎴挎敼鎴�:28 鑷缓鎴�:29 鏍囧噯浠锋埧鏀�:18 宸茶喘鍏埧:19 灏忎骇鏉�:20 鍏朵粬:99 static def parseHouseProperty(String houseProperty){ if(houseProperty){ - if(houseProperty.contains("集体所有房产")){ + if(houseProperty.contains("闆嗕綋鎵�鏈夋埧浜�")){ return 13; }else{ return 99 @@ -39,7 +39,7 @@ class CcbCodeUtils { return null } - //产权年限40:01 50:02 70:03 + //浜ф潈骞撮檺40:01 50:02 70:03 static def parseHousePropertyYear(def propertyLife){ if(propertyLife){ if(propertyLife.contains("70")){ @@ -54,7 +54,7 @@ class CcbCodeUtils { return null } - // 建筑类型 //高层塔楼:0101 高层板楼:0102 小高层板楼:0103 多层板楼:0104 独栋别墅:0105 联排别墅:0106 叠拼别墅:0107 其他建筑形式:0199 + // 寤虹瓚绫诲瀷 //楂樺眰濉旀ゼ:0101 楂樺眰鏉挎ゼ:0102 灏忛珮灞傛澘妤�:0103 澶氬眰鏉挎ゼ:0104 鐙爧鍒:0105 鑱旀帓鍒:0106 鍙犳嫾鍒:0107 鍏朵粬寤虹瓚褰㈠紡:0199 static def parseHouseEstateType(def buildType){ if(buildType){ return "0199" @@ -62,52 +62,52 @@ class CcbCodeUtils { return null } -// 高层塔楼 0101 增加“超高层” 0109 -// 高层板楼 0102 增加“老洋房” 0113 -// 小高层板楼 0103 增加“花园洋房” 0110 -// 多层板楼 0104 增加“四合院” 0111 -// 独栋别墅 0105 增加“老式别墅洋房” 0112 -// 联排别墅 0106 增加“双拼别墅” 0108 -// 叠拼别墅 0107 -// 其他建筑形式 0199 +// 楂樺眰濉旀ゼ 0101 澧炲姞鈥滆秴楂樺眰鈥� 0109 +// 楂樺眰鏉挎ゼ 0102 澧炲姞鈥滆�佹磱鎴库�� 0113 +// 灏忛珮灞傛澘妤� 0103 澧炲姞鈥滆姳鍥磱鎴库�� 0110 +// 澶氬眰鏉挎ゼ 0104 澧炲姞鈥滃洓鍚堥櫌鈥� 0111 +// 鐙爧鍒 0105 澧炲姞鈥滆�佸紡鍒娲嬫埧鈥� 0112 +// 鑱旀帓鍒 0106 澧炲姞鈥滃弻鎷煎埆澧呪�� 0108 +// 鍙犳嫾鍒 0107 +// 鍏朵粬寤虹瓚褰㈠紡 0199 static def parseBuildType(def buildType){ if(buildType){ def types = [] - if(buildType.contains("老式别墅洋房")){ + if(buildType.contains("鑰佸紡鍒娲嬫埧")){ types << "0112" } - if(buildType.contains("四合院")){ + if(buildType.contains("鍥涘悎闄�")){ types << "0111" } - if(buildType.contains("花园洋房")){ + if(buildType.contains("鑺卞洯娲嬫埧")){ types << "0110" } - if(buildType.contains("老洋房")){ + if(buildType.contains("鑰佹磱鎴�")){ types << "0113" } - if(buildType.contains("双拼")){ + if(buildType.contains("鍙屾嫾")){ types << "0108" } - if(buildType.contains("叠拼")){ + if(buildType.contains("鍙犳嫾")){ types << "0107" } - if(buildType.contains("联排")){ + if(buildType.contains("鑱旀帓")){ types << "0106" } - if(buildType.contains("独栋")){ + if(buildType.contains("鐙爧")){ types << "0105" } - if(buildType.contains("多层")){ + if(buildType.contains("澶氬眰")){ types << "0104" } - if(buildType.contains("超高层")){ + if(buildType.contains("瓒呴珮灞�")){ types << "0109" } - if(buildType.contains("小高层")){ + if(buildType.contains("灏忛珮灞�")){ types << "0103" } - if(buildType.contains("高层")){ + if(buildType.contains("楂樺眰")){ types << "0102" } return types @@ -116,28 +116,28 @@ class CcbCodeUtils { } - //朝向 南北通透:0301 东南:0302 南:0303 东西通透:0304 东:0305 西南:0306 西:0307 北:0308 东北:0309 西北:0310 其他朝向:0399 + //鏈濆悜 鍗楀寳閫氶�忥細0301 涓滃崡锛�0302 鍗楋細0303 涓滆タ閫氶�忥細0304 涓滐細0305 瑗垮崡锛�0306 瑗匡細0307 鍖楋細0308 涓滃寳锛�0309 瑗垮寳锛�0310 鍏朵粬鏈濆悜锛�0399 static def getDirectionCode(def direction){ if(direction){ - if(direction.contains("南北")){ + if(direction.contains("鍗楀寳")){ return "0301" - }else if(direction.contains("东南")){ + }else if(direction.contains("涓滃崡")){ return "0302" - }else if(direction.contains("南")){ + }else if(direction.contains("鍗�")){ return "0303" - }else if(direction.contains("东西")){ + }else if(direction.contains("涓滆タ")){ return "0304" - }else if(direction.contains("东")){ + }else if(direction.contains("涓�")){ return "0305" - }else if(direction.contains("西南")){ + }else if(direction.contains("瑗垮崡")){ return "0306" - }else if(direction.contains("西")){ + }else if(direction.contains("瑗�")){ return "0307" - }else if(direction.contains("东北")){ + }else if(direction.contains("涓滃寳")){ return "0309" - }else if(direction.contains("西北")){ + }else if(direction.contains("瑗垮寳")){ return "0310" - }else if(direction.contains("北")){ + }else if(direction.contains("鍖�")){ return "0308" } return "0399" @@ -146,25 +146,25 @@ class CcbCodeUtils { } - //装修 毛坯房:0601 简装修:0602 精装修:0603 + //瑁呬慨 姣涘澂鎴匡細0601 绠�瑁呬慨锛�0602 绮捐淇細0603 static def getFitmentCode(def fitmentStr){ if(fitmentStr){ - if(fitmentStr.contains("毛坯")){ + if(fitmentStr.contains("姣涘澂")){ return "0601" - }else if(fitmentStr.contains("简装")){ + }else if(fitmentStr.contains("绠�瑁�")){ return "0602" - }else if(fitmentStr.contains("精装")||fitmentStr.contains("豪装")){ + }else if(fitmentStr.contains("绮捐")||fitmentStr.contains("璞")){ return "0603" } } return null; } - //户型 非成套一室户:01 非成套二室户:02 非成套三室户:03 旧式里弄房一房:04 旧式里弄房二房:05 旧式里弄房三房:06 花园洋房:07 - //一室一厅:08 二室一厅:09 三室一厅:10 四室一厅:11 二室二厅:12 三室二厅:13 四室二厅:14 复式结构:15 别墅:16 其他:99 + //鎴峰瀷 闈炴垚濂椾竴瀹ゆ埛锛�01 闈炴垚濂椾簩瀹ゆ埛锛�02 闈炴垚濂椾笁瀹ゆ埛锛�03 鏃у紡閲屽紕鎴夸竴鎴匡細04 鏃у紡閲屽紕鎴夸簩鎴匡細05 鏃у紡閲屽紕鎴夸笁鎴匡細06 鑺卞洯娲嬫埧锛�07 + //涓�瀹や竴鍘咃細08 浜屽涓�鍘咃細09 涓夊涓�鍘咃細10 鍥涘涓�鍘咃細11 浜屽浜屽巺锛�12 涓夊浜屽巺锛�13 鍥涘浜屽巺锛�14 澶嶅紡缁撴瀯锛�15 鍒锛�16 鍏朵粬锛�99 static def getHouseTypeCode(def estate_type, def room, def hall){ - if(estate_type && estate_type.contains("别墅")){ + if(estate_type && estate_type.contains("鍒")){ return "16" }else{ if(room && hall){ @@ -189,24 +189,24 @@ class CcbCodeUtils { return null } - //钢混结构:1 砖混结构:2 钢结构:3 框架结构:4 框架剪力墙结构:5 剪力墙结构:6 筒体结构:7 框架筒体结构:8 筒中筒:9 砖木结构:10 其他:11 -// 钢、钢筋混凝土结构 002 -// 钢筋混凝土结构 003 -// 砖木结构 004 -// 混合结构 005 -// 其它结构 006 + //閽㈡贩缁撴瀯:1 鐮栨贩缁撴瀯:2 閽㈢粨鏋�:3 妗嗘灦缁撴瀯:4 妗嗘灦鍓姏澧欑粨鏋�:5 鍓姏澧欑粨鏋�:6 绛掍綋缁撴瀯:7 妗嗘灦绛掍綋缁撴瀯:8 绛掍腑绛�:9 鐮栨湪缁撴瀯:10 鍏朵粬:11 +// 閽€�侀挗绛嬫贩鍑濆湡缁撴瀯 002 +// 閽㈢瓔娣峰嚌鍦熺粨鏋� 003 +// 鐮栨湪缁撴瀯 004 +// 娣峰悎缁撴瀯 005 +// 鍏跺畠缁撴瀯 006 static def getBuildStructureCode(def buildStructure){ if(buildStructure){ - if(buildStructure.contains("钢结构")){ + if(buildStructure.contains("閽㈢粨鏋�")){ return "3"; - }else if(buildStructure.contains("钢、钢筋混凝土结构")){ + }else if(buildStructure.contains("閽€�侀挗绛嬫贩鍑濆湡缁撴瀯")){ return "1"; - }else if(buildStructure.contains("钢筋混凝土结构")){ + }else if(buildStructure.contains("閽㈢瓔娣峰嚌鍦熺粨鏋�")){ return "1"; - }else if(buildStructure.contains("砖木结构")){ + }else if(buildStructure.contains("鐮栨湪缁撴瀯")){ return "10"; - }else if(buildStructure.contains("混合结构")){ + }else if(buildStructure.contains("娣峰悎缁撴瀯")){ return "2"; } } @@ -214,18 +214,18 @@ class CcbCodeUtils { } static def getDistHouseTypeCode(def estateType){ - if(estateType && estateType=="别墅"){ + if(estateType && estateType=="鍒"){ return "08" - }else if(estateType && (estateType=="普通住宅" || estateType=="商住")){ + }else if(estateType && (estateType=="鏅�氫綇瀹�" || estateType=="鍟嗕綇")){ return "01" } return "99" } static def getUseTypeCode(def estateType){ - if(estateType=="商住"){ + if(estateType=="鍟嗕綇"){ return "13" - }else if(estateType && (estateType=="普通住宅")){ + }else if(estateType && (estateType=="鏅�氫綇瀹�")){ return "11" } return "11" @@ -235,49 +235,49 @@ class CcbCodeUtils { return null } - //室内结构 - //平层:11 错层:12 复式:13 阁楼:14 团结户:15 老式房:16 地下室:17 带阁楼:21 带车库:22 其他:99 跃层:18 带地下室:24 带储藏室:25 带车位:23 + //瀹ゅ唴缁撴瀯 + //骞冲眰:11 閿欏眰:12 澶嶅紡:13 闃佹ゼ:14 鍥㈢粨鎴�:15 鑰佸紡鎴�:16 鍦颁笅瀹�:17 甯﹂榿妤�:21 甯﹁溅搴�:22 鍏朵粬:99 璺冨眰:18 甯﹀湴涓嬪:24 甯﹀偍钘忓:25 甯﹁溅浣�:23 static def getRoomStructureCode(room_structure){ if(room_structure){ - if(room_structure.contains("平层")){ + if(room_structure.contains("骞冲眰")){ return "11" - }else if(room_structure.contains("错层")){ + }else if(room_structure.contains("閿欏眰")){ return "12" - }else if(room_structure.contains("复式")){ + }else if(room_structure.contains("澶嶅紡")){ return "13" - }else if(room_structure.contains("阁楼")){ + }else if(room_structure.contains("闃佹ゼ")){ return "14" - }else if(room_structure.contains("团结户")){ + }else if(room_structure.contains("鍥㈢粨鎴�")){ return "15" - }else if(room_structure.contains("老式房")){ + }else if(room_structure.contains("鑰佸紡鎴�")){ return "16" - }else if(room_structure.contains("地下室")){ + }else if(room_structure.contains("鍦颁笅瀹�")){ return "17" - }else if(room_structure.contains("带阁楼")){ + }else if(room_structure.contains("甯﹂榿妤�")){ return "21" - }else if(room_structure.contains("带车库")){ + }else if(room_structure.contains("甯﹁溅搴�")){ return "22" - }else if(room_structure.contains("带车位")){ + }else if(room_structure.contains("甯﹁溅浣�")){ return "23" - }else if(room_structure.contains("带地下室")){ + }else if(room_structure.contains("甯﹀湴涓嬪")){ return "24" - }else if(room_structure.contains("带储藏室")){ + }else if(room_structure.contains("甯﹀偍钘忓")){ return "25" - }else if(room_structure.contains("跃层")){ + }else if(room_structure.contains("璺冨眰")){ return "18" } } return null; } - //租赁方式 整租:0 合租:1 转租:2 + //绉熻祦鏂瑰紡 鏁寸锛�0 鍚堢锛�1 杞锛�2 static def getRentTypeCode(def rentType){ if(rentType){ - if(rentType.contains("整租")){ + if(rentType.contains("鏁寸")){ return 0; - }else if(rentType.contains("合租")){ + }else if(rentType.contains("鍚堢")){ return 1; - }else if(rentType.contains("转租")){ + }else if(rentType.contains("杞")){ return 2; } } @@ -285,12 +285,12 @@ class CcbCodeUtils { } - //房屋用途 + //鎴垮眿鐢ㄩ�� static def parseHouseUse(String houseUse){ if(houseUse){ - if(houseUse.contains("住宅")){ + if(houseUse.contains("浣忓畢")){ return 11; - }else if(houseUse.contains("商住")){ + }else if(houseUse.contains("鍟嗕綇")){ return 13; }else{ return 99 @@ -314,10 +314,10 @@ class CcbCodeUtils { if(estateCharege){ try{ estateCharege = trimChar(estateCharege); - estateCharege = estateCharege.replace("元/平米/月","").replace("元/平方米/月","").replace("元/?O?月","") + estateCharege = estateCharege.replace("鍏�/骞崇背/鏈�","").replace("鍏�/骞虫柟绫�/鏈�","").replace("鍏�/?O?鏈�","") estateCharege = estateCharege.toDouble() - if(estateType2=="普通住宅"){ - if(city=="上海" || city=="北京" || city=="广州" || city=="杭州"){ + if(estateType2=="鏅�氫綇瀹�"){ + if(city=="涓婃捣" || city=="鍖椾含" || city=="骞垮窞" || city=="鏉窞"){ if(estateCharege>=0.6 && estateCharege<=3.5){ return estateCharege }else{ @@ -330,13 +330,13 @@ class CcbCodeUtils { return null; } } - }else if(estateType2=="别墅"){ + }else if(estateType2=="鍒"){ if(estateCharege>=3){ return estateCharege; }else{ return null; } - }else if(estateType2=="商住"){ + }else if(estateType2=="鍟嗕綇"){ if(estateCharege>=4){ return estateCharege; }else{ @@ -344,7 +344,7 @@ class CcbCodeUtils { } } }catch (Exception e){ - println "estateCharege 转不了 "+estateCharege + println "estateCharege 杞笉浜� "+estateCharege return null; } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ccb/CcbXykData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ccb/CcbXykData.groovy index c90064d97..68e4f8002 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ccb/CcbXykData.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ccb/CcbXykData.groovy @@ -9,7 +9,7 @@ class CcbXykData { } def run(){ - def districts = CommonDatautils.findAllDistrictByCity("上海","district",["city","region","name","estate_charge"]) + def districts = CommonDatautils.findAllDistrictByCity("涓婃捣","district",["city","region","name","estate_charge"]) for(def d : districts){ } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ccb/DistrictSchoolDataExport.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ccb/DistrictSchoolDataExport.groovy index 96470533d..1fafbd9fa 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ccb/DistrictSchoolDataExport.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ccb/DistrictSchoolDataExport.groovy @@ -18,7 +18,7 @@ import java.util.regex.Pattern class DistrictSchoolDataExport { - def cityCodeMap = ["苏州":"320500","合肥":"340100", "西安":"610000"] + def cityCodeMap = ["鑻忓窞":"320500","鍚堣偉":"340100", "瑗垮畨":"610000"] static DBCollection district_school_col = MongoUtils.getCollectionByAuth20190102("fangjia_craw", "district_school") static DBCollection school_col = MongoUtils.getCollectionByAuth20190102("fangjia_craw", "school") @@ -32,29 +32,29 @@ class DistrictSchoolDataExport { } def megre(){ - def datas1 = ExcelUtils.read("d:\\数据\\楼盘对口学校_V2.xlsx",0,0) + def datas1 = ExcelUtils.read("d:\\鏁版嵁\\妤肩洏瀵瑰彛瀛︽牎_V2.xlsx",0,0) def ids = [] for(def d : datas1){ ids << d['U'] } - def datas2 = ExcelUtils.read("d:\\数据\\无学区房数据(1).xlsx",0,1) + def datas2 = ExcelUtils.read("d:\\鏁版嵁\\鏃犲鍖烘埧鏁版嵁(1).xlsx",0,1) for(def d : datas2){ def id = d['U'] if(!ids.contains(id)){ datas1 << d } } - ExcelUtils.write("d:\\数据\\楼盘对口学校V1.xlsx", datas1, "数据") + ExcelUtils.write("d:\\鏁版嵁\\妤肩洏瀵瑰彛瀛︽牎V1.xlsx", datas1, "鏁版嵁") } def run(){ - def city = "苏州" + def city = "鑻忓窞" getRegionCodeByCity(city) - getRegionCodeByCity("合肥") - getRegionCodeByCity("西安") - def districts0 = CommonDatautils.findAllDistricts("苏州", "district", ["city", "region", "name", "address", "lng", "lat", "c_date","m_date"]); - def districts1 = CommonDatautils.findAllDistricts("合肥", "district", ["city", "region", "name", "address", "lng", "lat", "c_date","m_date"]); - def districts2 = CommonDatautils.findAllDistricts("西安", "district", ["city", "region", "name", "address", "lng", "lat", "c_date","m_date"]); + getRegionCodeByCity("鍚堣偉") + getRegionCodeByCity("瑗垮畨") + def districts0 = CommonDatautils.findAllDistricts("鑻忓窞", "district", ["city", "region", "name", "address", "lng", "lat", "c_date","m_date"]); + def districts1 = CommonDatautils.findAllDistricts("鍚堣偉", "district", ["city", "region", "name", "address", "lng", "lat", "c_date","m_date"]); + def districts2 = CommonDatautils.findAllDistricts("瑗垮畨", "district", ["city", "region", "name", "address", "lng", "lat", "c_date","m_date"]); def districts = [] districts.addAll(districts0) districts.addAll(districts1) @@ -63,7 +63,7 @@ class DistrictSchoolDataExport { final CountDownLatch latch = new CountDownLatch(districts.size()) def rets = [] - rets << ["城市","区域","小区名称","小区经度","小区纬度","小区地址","对口小学","小学地址","小学属性","小学经度","小学纬度","对口中学","中学地址","中学属性","中学经度","中学纬度","备注","创建时间","修改时间","来源网站","小区ID","数据类型"] + rets << ["鍩庡競","鍖哄煙","灏忓尯鍚嶇О","灏忓尯缁忓害","灏忓尯绾害","灏忓尯鍦板潃","瀵瑰彛灏忓","灏忓鍦板潃","灏忓灞炴��","灏忓缁忓害","灏忓绾害","瀵瑰彛涓","涓鍦板潃","涓灞炴��","涓缁忓害","涓绾害","澶囨敞","鍒涘缓鏃堕棿","淇敼鏃堕棿","鏉ユ簮缃戠珯","灏忓尯ID","鏁版嵁绫诲瀷"] def i = 0 for(def k=0;k> FITMENTS_TYPES_MAPS = new HashMap>() static{ - FITMENTS_TYPES_MAPS.put("毛坯", ["毛坯", "清水", "无装修", "独栋毛坯", "毛胚", "白坯", "旧装", "坯", "原房", "毛坏"]) - FITMENTS_TYPES_MAPS.put("简装", ["简装", "普通装修", "普通", "简单装修", "简易装修", "普装", "一般装修", "一般", "简", "粗装修"]) - FITMENTS_TYPES_MAPS.put("精装", ["精装", "全装修", "全装", "中等装修", "中装", "中档装修", "精致装修", "中档", "中等", "精", "中修", "优质装修", "时尚装修", "良装", "中高挡"]) - FITMENTS_TYPES_MAPS.put("豪装", ["豪华装修", "高档", "豪华", "豪装", "高级装修", "高装", "奢侈"]) + FITMENTS_TYPES_MAPS.put("姣涘澂", ["姣涘澂", "娓呮按", "鏃犺淇�", "鐙爧姣涘澂", "姣涜儦", "鐧藉澂", "鏃ц", "鍧�", "鍘熸埧", "姣涘潖"]) + FITMENTS_TYPES_MAPS.put("绠�瑁�", ["绠�瑁�", "鏅�氳淇�", "鏅��", "绠�鍗曡淇�", "绠�鏄撹淇�", "鏅", "涓�鑸淇�", "涓�鑸�", "绠�", "绮楄淇�"]) + FITMENTS_TYPES_MAPS.put("绮捐", ["绮捐", "鍏ㄨ淇�", "鍏ㄨ", "涓瓑瑁呬慨", "涓", "涓。瑁呬慨", "绮捐嚧瑁呬慨", "涓。", "涓瓑", "绮�", "涓慨", "浼樿川瑁呬慨", "鏃跺皻瑁呬慨", "鑹", "涓珮鎸�"]) + FITMENTS_TYPES_MAPS.put("璞", ["璞崕瑁呬慨", "楂樻。", "璞崕", "璞", "楂樼骇瑁呬慨", "楂樿", "濂緢"]) } public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(30) - def cityCodeMap = ["北京":"110100","重庆":"500100", "哈尔滨":"230100"] + def cityCodeMap = ["鍖椾含":"110100","閲嶅簡":"500100", "鍝堝皵婊�":"230100"] def regionCodeMap = [:] static main(args) { @@ -61,13 +61,13 @@ class HouseExport { def run(){ -// "重庆", - def citys = ["北京"] +// "閲嶅簡", + def citys = ["鍖椾含"] for(def city : citys){ getRegionCodeByCity(city) def districts = CommonDatautils.findAllDistricts(city, "district", ["city", "region", "name", "address","alias","finish_building_date","house_property","property_life","build_type","estate_type2","build_structure"]); - if(city == "哈尔滨"){ + if(city == "鍝堝皵婊�"){ exportSellCSV(city, districts, 20170801, 20210301, 2020); // exportRentCSV(city, districts, 20170801, 20210301, 2020); @@ -90,7 +90,7 @@ class HouseExport { def totalCount = new AtomicLong() final CountDownLatch latch = new CountDownLatch(districts.size()) - println city +" 小区量:"+districts.size() + println city +" 灏忓尯閲忥細"+districts.size() def datas = [] def retMap = new ConcurrentHashMap() @@ -141,12 +141,12 @@ class HouseExport { } latch.await() def allDatas = createSellDatas(retMap); - def headers = ["城市ID","出售ID","挂牌房屋ID","城市名称","行政区ID","行政区名称","小区ID","小区名称","楼栋ID","楼栋编号","楼栋名称","单元ID","单元编号","单元名称","户ID","详细地址","建筑年代","权属","权属年限","单价","总价","出售付款方式","所在楼层","总楼层","建筑类型","室内结构","建筑结构","建筑面积","套内面积","户型","室","厅","厨","卫","朝向","装修情况","是否有电梯","几梯几户","发布时间","到期时间","是否首发","房源数据来源","中介公司ID","中介公司名称","发布人","发布人电话","描述信息","备注","创建时间","更新时间","来源公司"] + def headers = ["鍩庡競ID","鍑哄敭ID","鎸傜墝鎴垮眿ID","鍩庡競鍚嶇О","琛屾斂鍖篒D","琛屾斂鍖哄悕绉�","灏忓尯ID","灏忓尯鍚嶇О","妤兼爧ID","妤兼爧缂栧彿","妤兼爧鍚嶇О","鍗曞厓ID","鍗曞厓缂栧彿","鍗曞厓鍚嶇О","鎴稩D","璇︾粏鍦板潃","寤虹瓚骞翠唬","鏉冨睘","鏉冨睘骞撮檺","鍗曚环","鎬讳环","鍑哄敭浠樻鏂瑰紡","鎵�鍦ㄦゼ灞�","鎬绘ゼ灞�","寤虹瓚绫诲瀷","瀹ゅ唴缁撴瀯","寤虹瓚缁撴瀯","寤虹瓚闈㈢Н","濂楀唴闈㈢Н","鎴峰瀷","瀹�","鍘�","鍘�","鍗�","鏈濆悜","瑁呬慨鎯呭喌","鏄惁鏈夌數姊�","鍑犳鍑犳埛","鍙戝竷鏃堕棿","鍒版湡鏃堕棿","鏄惁棣栧彂","鎴挎簮鏁版嵁鏉ユ簮","涓粙鍏徃ID","涓粙鍏徃鍚嶇О","鍙戝竷浜�","鍙戝竷浜虹數璇�","鎻忚堪淇℃伅","澶囨敞","鍒涘缓鏃堕棿","鏇存柊鏃堕棿","鏉ユ簮鍏徃"] def count = 1; for(def allData : allDatas){ - FileUtils.batchCreateFile(allData, "d:\\数据\\建行\\bigdata_forsale_${year}_${cityCodeMap[city]}_${count}.dat",headers, "utf-8"); - println city +" [sell-${count}]生成完成!" + FileUtils.batchCreateFile(allData, "d:\\鏁版嵁\\寤鸿\\bigdata_forsale_${year}_${cityCodeMap[city]}_${count}.dat",headers, "utf-8"); + println city +" [sell-${count}]鐢熸垚瀹屾垚锛�" count ++; } @@ -156,7 +156,7 @@ class HouseExport { def exportRentCSV(city, districts, startDate, endDate, year){ final CountDownLatch latch = new CountDownLatch(districts.size()) - println city +" 小区量:"+districts.size() + println city +" 灏忓尯閲忥細"+districts.size() def totalCount = new AtomicLong() def retMap = new ConcurrentHashMap() @@ -209,11 +209,11 @@ class HouseExport { latch.await() def allDatas = createRentDatas(retMap); - def headers = ["城市ID","出租ID","挂牌房屋ID","城市名称","行政区ID","行政区名称","小区ID","小区名称","楼栋ID","楼栋编号","楼栋名称","单元ID","单元编号","单元名称","户ID","详细地址","建筑年代","权属","权属年限","出租面积","单价","总价","租赁方式","出租付款方式","所在楼层","总楼层","建筑类型","室内结构","建筑结构","建筑面积","套内面积","户型","室","厅","厨","卫","朝向","装修情况","是否有电梯","几梯几户","发布时间","到期时间","是否首发","房源数据来源","中介公司ID","中介公司名称","发布人","发布人电话","描述信息","备注","创建时间","更新时间","来源公司"] + def headers = ["鍩庡競ID","鍑虹ID","鎸傜墝鎴垮眿ID","鍩庡競鍚嶇О","琛屾斂鍖篒D","琛屾斂鍖哄悕绉�","灏忓尯ID","灏忓尯鍚嶇О","妤兼爧ID","妤兼爧缂栧彿","妤兼爧鍚嶇О","鍗曞厓ID","鍗曞厓缂栧彿","鍗曞厓鍚嶇О","鎴稩D","璇︾粏鍦板潃","寤虹瓚骞翠唬","鏉冨睘","鏉冨睘骞撮檺","鍑虹闈㈢Н","鍗曚环","鎬讳环","绉熻祦鏂瑰紡","鍑虹浠樻鏂瑰紡","鎵�鍦ㄦゼ灞�","鎬绘ゼ灞�","寤虹瓚绫诲瀷","瀹ゅ唴缁撴瀯","寤虹瓚缁撴瀯","寤虹瓚闈㈢Н","濂楀唴闈㈢Н","鎴峰瀷","瀹�","鍘�","鍘�","鍗�","鏈濆悜","瑁呬慨鎯呭喌","鏄惁鏈夌數姊�","鍑犳鍑犳埛","鍙戝竷鏃堕棿","鍒版湡鏃堕棿","鏄惁棣栧彂","鎴挎簮鏁版嵁鏉ユ簮","涓粙鍏徃ID","涓粙鍏徃鍚嶇О","鍙戝竷浜�","鍙戝竷浜虹數璇�","鎻忚堪淇℃伅","澶囨敞","鍒涘缓鏃堕棿","鏇存柊鏃堕棿","鏉ユ簮鍏徃"] - FileUtils.batchCreateFile(allDatas, "d:\\数据\\建行\\bigdata_forrent_${year}_${cityCodeMap[city]}.dat", headers, "utf-8"); - println city +" [rent]生成完成!" + FileUtils.batchCreateFile(allDatas, "d:\\鏁版嵁\\寤鸿\\bigdata_forrent_${year}_${cityCodeMap[city]}.dat", headers, "utf-8"); + println city +" [rent]鐢熸垚瀹屾垚锛�" } def createSellDatas(def map){ @@ -376,57 +376,57 @@ class HouseExport { if (file.exists()) { file.delete(); } - file.append("城市ID|@|", "UTF-8") - file.append("出售ID|@|", "UTF-8") - file.append("挂牌房屋ID|@|", "UTF-8") - file.append("城市名称|@|", "UTF-8") - file.append("行政区ID|@|", "UTF-8") - file.append("行政区名称|@|", "UTF-8") - file.append("小区ID|@|", "UTF-8") - file.append("小区名称|@|", "UTF-8") - file.append("楼栋ID|@|", "UTF-8") - file.append("楼栋编号|@|", "UTF-8") - file.append("楼栋名称|@|", "UTF-8") - file.append("单元ID|@|", "UTF-8") - file.append("单元编号|@|", "UTF-8") - file.append("单元名称|@|", "UTF-8") - file.append("户ID|@|", "UTF-8") - file.append("详细地址|@|", "UTF-8") - file.append("建筑年代|@|", "UTF-8") - file.append("权属|@|", "UTF-8") - file.append("权属年限|@|", "UTF-8") - file.append("单价|@|", "UTF-8") - file.append("总价|@|", "UTF-8") - file.append("出售付款方式|@|", "UTF-8") - file.append("所在楼层|@|", "UTF-8") - file.append("总楼层|@|", "UTF-8") - file.append("建筑类型|@|", "UTF-8") - file.append("室内结构|@|", "UTF-8") - file.append("建筑结构|@|", "UTF-8") - file.append("建筑面积|@|", "UTF-8") - file.append("套内面积|@|", "UTF-8") - file.append("户型|@|", "UTF-8") - file.append("室|@|", "UTF-8") - file.append("厅|@|", "UTF-8") - file.append("厨|@|", "UTF-8") - file.append("卫|@|", "UTF-8") - file.append("朝向|@|", "UTF-8") - file.append("装修情况|@|", "UTF-8") - file.append("是否有电梯|@|", "UTF-8") - file.append("几梯几户|@|", "UTF-8") - file.append("发布时间|@|", "UTF-8") - file.append("到期时间|@|", "UTF-8") - file.append("是否首发|@|", "UTF-8") - file.append("房源数据来源|@|", "UTF-8") - file.append("中介公司ID|@|", "UTF-8") - file.append("中介公司名称|@|", "UTF-8") - file.append("发布人|@|", "UTF-8") - file.append("发布人电话|@|", "UTF-8") - file.append("描述信息|@|", "UTF-8") - file.append("备注|@|", "UTF-8") - file.append("创建时间|@|", "UTF-8") - file.append("更新时间|@|", "UTF-8") - file.append("来源公司|@|", "UTF-8") + file.append("鍩庡競ID|@|", "UTF-8") + file.append("鍑哄敭ID|@|", "UTF-8") + file.append("鎸傜墝鎴垮眿ID|@|", "UTF-8") + file.append("鍩庡競鍚嶇О|@|", "UTF-8") + file.append("琛屾斂鍖篒D|@|", "UTF-8") + file.append("琛屾斂鍖哄悕绉皘@|", "UTF-8") + file.append("灏忓尯ID|@|", "UTF-8") + file.append("灏忓尯鍚嶇О|@|", "UTF-8") + file.append("妤兼爧ID|@|", "UTF-8") + file.append("妤兼爧缂栧彿|@|", "UTF-8") + file.append("妤兼爧鍚嶇О|@|", "UTF-8") + file.append("鍗曞厓ID|@|", "UTF-8") + file.append("鍗曞厓缂栧彿|@|", "UTF-8") + file.append("鍗曞厓鍚嶇О|@|", "UTF-8") + file.append("鎴稩D|@|", "UTF-8") + file.append("璇︾粏鍦板潃|@|", "UTF-8") + file.append("寤虹瓚骞翠唬|@|", "UTF-8") + file.append("鏉冨睘|@|", "UTF-8") + file.append("鏉冨睘骞撮檺|@|", "UTF-8") + file.append("鍗曚环|@|", "UTF-8") + file.append("鎬讳环|@|", "UTF-8") + file.append("鍑哄敭浠樻鏂瑰紡|@|", "UTF-8") + file.append("鎵�鍦ㄦゼ灞倈@|", "UTF-8") + file.append("鎬绘ゼ灞倈@|", "UTF-8") + file.append("寤虹瓚绫诲瀷|@|", "UTF-8") + file.append("瀹ゅ唴缁撴瀯|@|", "UTF-8") + file.append("寤虹瓚缁撴瀯|@|", "UTF-8") + file.append("寤虹瓚闈㈢Н|@|", "UTF-8") + file.append("濂楀唴闈㈢Н|@|", "UTF-8") + file.append("鎴峰瀷|@|", "UTF-8") + file.append("瀹@|", "UTF-8") + file.append("鍘厊@|", "UTF-8") + file.append("鍘▅@|", "UTF-8") + file.append("鍗珅@|", "UTF-8") + file.append("鏈濆悜|@|", "UTF-8") + file.append("瑁呬慨鎯呭喌|@|", "UTF-8") + file.append("鏄惁鏈夌數姊瘄@|", "UTF-8") + file.append("鍑犳鍑犳埛|@|", "UTF-8") + file.append("鍙戝竷鏃堕棿|@|", "UTF-8") + file.append("鍒版湡鏃堕棿|@|", "UTF-8") + file.append("鏄惁棣栧彂|@|", "UTF-8") + file.append("鎴挎簮鏁版嵁鏉ユ簮|@|", "UTF-8") + file.append("涓粙鍏徃ID|@|", "UTF-8") + file.append("涓粙鍏徃鍚嶇О|@|", "UTF-8") + file.append("鍙戝竷浜簗@|", "UTF-8") + file.append("鍙戝竷浜虹數璇潀@|", "UTF-8") + file.append("鎻忚堪淇℃伅|@|", "UTF-8") + file.append("澶囨敞|@|", "UTF-8") + file.append("鍒涘缓鏃堕棿|@|", "UTF-8") + file.append("鏇存柊鏃堕棿|@|", "UTF-8") + file.append("鏉ユ簮鍏徃|@|", "UTF-8") file.append(System.getProperty("line.separator")); def index = 0 @@ -632,7 +632,7 @@ class HouseExport { if(seawater.p_date instanceof String){ seawater.p_date = seawater.p_date.toInteger() } - if(city=="哈尔滨" && seawater.p_date>=20181001 && seawater.p_date<20200201){ + if(city=="鍝堝皵婊�" && seawater.p_date>=20181001 && seawater.p_date<20200201){ rowMap.p_date = DateUtils.getRandomDate("2018-01-01", "2018-10-01") rowMap.c_date = rowMap.p_date rowMap.m_date = rowMap.p_date @@ -661,27 +661,27 @@ class HouseExport { if(floorDesc){ floorDesc = floorDesc.replaceAll("[\\s ]+", "") if(floorDesc){ - Pattern pat1 = Pattern.compile("第(\\d{1,2})层"); + 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)?"); + 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.contains("楂樻ゼ灞�") || floorDesc.contains("楂樺眰")){ +// return "楂樺眰" // } // // -// if(floorDesc.contains("低楼层") || floorDesc.contains("低层")){ -// return "低层" +// if(floorDesc.contains("浣庢ゼ灞�") || floorDesc.contains("浣庡眰")){ +// return "浣庡眰" // } if(floorDesc.isNumber()){ return floorDesc; @@ -692,16 +692,16 @@ class HouseExport { } private String csvHandlerStr(String str) { - //csv格式如果有逗号,整体用双引号括起来;如果里面还有双引号就替换成两个双引号,这样导出来的格式就不会有问题了 + //csv鏍煎紡濡傛灉鏈夐�楀彿锛屾暣浣撶敤鍙屽紩鍙锋嫭璧锋潵锛涘鏋滈噷闈㈣繕鏈夊弻寮曞彿灏辨浛鎹㈡垚涓や釜鍙屽紩鍙凤紝杩欐牱瀵煎嚭鏉ョ殑鏍煎紡灏变笉浼氭湁闂浜� String tempDescription=str; - //如果有逗号 - if(str.contains(",")||str.contains(",")){ - //如果还有双引号,先将双引号转义,避免两边加了双引号后转义错误 + //濡傛灉鏈夐�楀彿 + if(str.contains(",")||str.contains("锛�")){ + //濡傛灉杩樻湁鍙屽紩鍙凤紝鍏堝皢鍙屽紩鍙疯浆涔夛紝閬垮厤涓よ竟鍔犱簡鍙屽紩鍙峰悗杞箟閿欒 if(str.contains("\"")){ // tempDescription=str.replace("\"", "\"\""); tempDescription=str.replace("\"", ""); } - //在将逗号转义 + //鍦ㄥ皢閫楀彿杞箟 tempDescription="\""+tempDescription+"\""; } return tempDescription; @@ -713,7 +713,7 @@ class HouseExport { return null } fitmentDesc = fitmentDesc.replaceAll("[\\s ]+", "") - if (fitmentDesc.equals("非毛坯")) { + if (fitmentDesc.equals("闈炴瘺鍧�")) { return null } Iterator>> it = FITMENTS_TYPES_MAPS @@ -738,7 +738,7 @@ class HouseExport { if (directionDesc == null) { return null } - directionDesc = directionDesc.replaceAll("(\\(|(|《|\"|“|【|〔).+?(\\)|》|)|\"|”|】|〕)", "#_#") + directionDesc = directionDesc.replaceAll("(\\(|锛坾銆妡\"|鈥渱銆恷銆�).+?(\\)|銆媩锛墊\"|鈥潀銆憒銆�)", "#_#") StringBuffer sb = new StringBuffer() for (int i = 0; i < directionDesc.length(); i++) { String c = directionDesc.substring(i, i + 1) @@ -765,17 +765,17 @@ class HouseExport { } /* - * 生成一个用不重复的ID + * 鐢熸垚涓�涓敤涓嶉噸澶嶇殑ID */ def GenNonDuplicateID(randomLength){ return Number(Math.random().toString().substr(3,randomLength) + Date.now()).toString(36) } -//GenNonDuplicateID()将生成 rfmipbs8ag0kgkcogc 类似的ID +//GenNonDuplicateID()灏嗙敓鎴� rfmipbs8ag0kgkcogc 绫讳技鐨処D def marge(){ - File file = new File("D:\\数据\\建行\\新建文本文档.txt"); + File file = new File("D:\\鏁版嵁\\寤鸿\\鏂板缓鏂囨湰鏂囨。.txt"); def ids = new HashSet(); def index = 0 diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/chongqin/PocTest2023.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/chongqin/PocTest2023.groovy index 08e1d9fb5..2d527e080 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/chongqin/PocTest2023.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/chongqin/PocTest2023.groovy @@ -16,7 +16,7 @@ import com.mongodb.BasicDBObject import com.mongodb.DBCollection /** - * 重庆poc测试-2023版 + * 閲嶅簡poc娴嬭瘯-2023鐗� */ class PocTest2023 { @@ -32,16 +32,16 @@ class PocTest2023 { def run(){ -// addEvaluationPrice("D:\\数据\\重庆农商行2023\\重庆估值样本测试2.xlsx") -// addressEvalute("D:\\数据\\重庆农商行2023\\重庆估值样本测试.xlsx") -// structure("D:\\数据\\重庆农商行2023\\重庆估值样本测试.xlsx") //九级地址拆分 -// addThirdPrice("D:\\数据\\重庆农商行2023\\重庆估值样本测试.xlsx") +// addEvaluationPrice("D:\\鏁版嵁\\閲嶅簡鍐滃晢琛�2023\\閲嶅簡浼板�兼牱鏈祴璇�2.xlsx") +// addressEvalute("D:\\鏁版嵁\\閲嶅簡鍐滃晢琛�2023\\閲嶅簡浼板�兼牱鏈祴璇�.xlsx") +// structure("D:\\鏁版嵁\\閲嶅簡鍐滃晢琛�2023\\閲嶅簡浼板�兼牱鏈祴璇�.xlsx") //涔濈骇鍦板潃鎷嗗垎 +// addThirdPrice("D:\\鏁版嵁\\閲嶅簡鍐滃晢琛�2023\\閲嶅簡浼板�兼牱鏈祴璇�.xlsx") -// baseInfo("D:\\数据\\重庆农商行2023\\开发商及物业信息样本.xlsx") -// baseInfoByName("D:\\数据\\重庆农商行2023\\开发商及物业信息样本.xlsx") +// baseInfo("D:\\鏁版嵁\\閲嶅簡鍐滃晢琛�2023\\寮�鍙戝晢鍙婄墿涓氫俊鎭牱鏈�.xlsx") +// baseInfoByName("D:\\鏁版嵁\\閲嶅簡鍐滃晢琛�2023\\寮�鍙戝晢鍙婄墿涓氫俊鎭牱鏈�.xlsx") - distScore("D:\\数据\\重庆农商行2023\\楼盘评级样本.xlsx") + distScore("D:\\鏁版嵁\\閲嶅簡鍐滃晢琛�2023\\妤肩洏璇勭骇鏍锋湰.xlsx") } def addEvaluationPrice(path){ @@ -53,7 +53,7 @@ class PocTest2023 { def address = d['E'] def area = d['D'] - //旧地址估值 + //鏃у湴鍧�浼板�� def ret1 = OpenApiClient.addressEvaluation(city, region, address, null, area, null, null) if(ret1){ d['N']= ret1.city @@ -80,7 +80,7 @@ class PocTest2023 { def address = d['E'] def area = d['D'] - //旧地址估值 + //鏃у湴鍧�浼板�� def ret1 = OpenApiClient.addressEvaluation(city, region, address, null, area, null, null) if(ret1){ d['N']= ret1.city @@ -94,7 +94,7 @@ class PocTest2023 { } } - //新的匹配算法 + //鏂扮殑鍖归厤绠楁硶 def jsonObject = FangjiaClientUtils.newMatch(city, address, "property", false) if(jsonObject != null && jsonObject.credit>0) { d['R'] = jsonObject.get("city") @@ -141,7 +141,7 @@ class PocTest2023 { } // def addAuthor(inputfile){ -// def authors = ["曹","张", "陈", "许", "金玉"] +// def authors = ["鏇�","寮�", "闄�", "璁�", "閲戠帀"] // ExcelUtils.modify(inputfile, { d -> // if(d['V'] && d['V'] == "F"){ // for(def name : authors){ @@ -160,7 +160,7 @@ class PocTest2023 { def area = d['D'] println address - //旧地址估值 + //鏃у湴鍧�浼板�� def ret1 = OpenApiClient.addressEvaluation(city, region, address, null, area, null, null) if(ret1){ d['R']= ret1.city @@ -182,15 +182,15 @@ class PocTest2023 { } if(dist.is_elevator){ - d['P'] = "有" + d['P'] = "鏈�" }else{ - d['P'] = "无" + d['P'] = "鏃�" } def newCity = RegionData.formatCity(city) def obj = findPaiMai(newCity, address) if(obj){ - d['Q'] = "是" + d['Q'] = "鏄�" } } } @@ -230,15 +230,15 @@ class PocTest2023 { } if (dist.is_elevator) { - d['P'] = "有" + d['P'] = "鏈�" } else { - d['P'] = "无" + d['P'] = "鏃�" } def newCity = RegionData.formatCity(city) def obj = findPaiMai(newCity, address) if (obj) { - d['Q'] = "是" + d['Q'] = "鏄�" } } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/chongqingblank/DataMatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/chongqingblank/DataMatch.groovy index 5d5304f21..6910fe05b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/chongqingblank/DataMatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/chongqingblank/DataMatch.groovy @@ -28,11 +28,11 @@ class DataMatch { // task.run1() // task.run2() // task.run3() -// println task.findAddress("昌州街道棠香路") +// println task.findAddress("鏄屽窞琛楅亾妫犻璺�") -// task.run2MatchV2( "D:\\数据\\重庆农商行\\估值1-V2.xlsx") -// task.fzWeiyuanshuMatch("D:\\数据\\福州\\连江楼盘.xlsx") - task.delRegionCode("D:\\数据\\需删除区域编码.xlsx") +// task.run2MatchV2( "D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\浼板��1-V2.xlsx") +// task.fzWeiyuanshuMatch("D:\\鏁版嵁\\绂忓窞\\杩炴睙妤肩洏.xlsx") + task.delRegionCode("D:\\鏁版嵁\\闇�鍒犻櫎鍖哄煙缂栫爜.xlsx") } def delRegionCode(path){ @@ -48,7 +48,7 @@ class DataMatch { def fzWeiyuanshuMatch(fileName){ ExcelUtils.multiThreadingModify(fileName,{d-> // if(!d['G']){ -// def arr = OpenApiClient.search("福州", "连江", d['C']) +// def arr = OpenApiClient.search("绂忓窞", "杩炴睙", d['C']) // if(arr){ // d['E'] = arr.city // d['F'] = arr.district @@ -58,7 +58,7 @@ class DataMatch { def results = null if(d['H'] && d['H']=="F" && d['C']){ - results = OpenApiClient.addressMatch("福州",d['C'], "property", false, "连江", null) + results = OpenApiClient.addressMatch("绂忓窞",d['C'], "property", false, "杩炴睙", null) } if(results && results.precise>=0){ d['J'] = results.district @@ -68,11 +68,11 @@ class DataMatch { } def run1(){ - def fileName = "D:\\数据\\重庆农商行\\估值2-V5.xlsx" + def fileName = "D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\浼板��2-V5.xlsx" //matchRegionValue(fileName); matchDistrict(fileName) // ExcelUtils.multiThreadingModify(fileName,{d-> -// if(d['O']=="新增"){ +// if(d['O']=="鏂板"){ // // d['L'] = d['P'] // d['M'] = d['Q'] @@ -98,7 +98,7 @@ class DataMatch { // } if(d['R'] && !d['G']){ def results = null -// if(d['E'] && isStreet(d['E'])){//加上效果并没有想象中的好 +// if(d['E'] && isStreet(d['E'])){//鍔犱笂鏁堟灉骞舵病鏈夋兂璞′腑鐨勫ソ // results = OpenApiClient.addressMatch(city, d['E'], "property", false, region, d['D']) // } if((results && results.precise<0) || !results){ @@ -118,7 +118,7 @@ class DataMatch { } def run2(){ - def fileName = "D:\\数据\\重庆农商行\\估值2-V2.xlsx" + def fileName = "D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\浼板��2-V2.xlsx" // matchRegionValue(fileName); matchDistrict2(fileName) } @@ -158,11 +158,11 @@ class DataMatch { } def run3(){ - def fileName = "D:\\数据\\重庆农商行\\估值3.xlsx" + def fileName = "D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\浼板��3.xlsx" // matchDistrict3(fileName) ExcelUtils.multiThreadingModify(fileName,{d-> if(d['I']){ - d['I'] = d['I'].toString().replace("省","").replace("市","") + d['I'] = d['I'].toString().replace("鐪�","").replace("甯�","") } if(d['J'] && d['I']){ d['J'] = RegionData.formatRegion(d['I'], d['J']) @@ -205,12 +205,12 @@ class DataMatch { def results = null def name = null if (d['C']) { - name = d['C'].toString().replace(".", "").replace("(", "").replace(")", "").replace("。", "") - .replace("·", "").replace("-", "").replace("`", "").replace("?", "").replace("‘", "") - .replace("1期", "一期").replace("2期", "二期").replace("3期", "三期") - .replace("4期", "四期").replace("5期", "五期").replace("12区", "十二区").replace("1区", "一区").replace("2区", "二区").replace("3区", "三区") - .replace("4区", "四区").replace("5区", "五区").replace("a区", "A区") - .replace("B区", "B区").replace("c区", "C区").replace("d区", "D区") + name = d['C'].toString().replace(".", "").replace("锛�", "").replace("锛�", "").replace("銆�", "") + .replace("路", "").replace("-", "").replace("`", "").replace("锛�", "").replace("鈥�", "") + .replace("1鏈�", "涓�鏈�").replace("2鏈�", "浜屾湡").replace("3鏈�", "涓夋湡") + .replace("4鏈�", "鍥涙湡").replace("5鏈�", "浜旀湡").replace("12鍖�", "鍗佷簩鍖�").replace("1鍖�", "涓�鍖�").replace("2鍖�", "浜屽尯").replace("3鍖�", "涓夊尯") + .replace("4鍖�", "鍥涘尯").replace("5鍖�", "浜斿尯").replace("a鍖�", "A鍖�") + .replace("B鍖�", "B鍖�").replace("c鍖�", "C鍖�").replace("d鍖�", "D鍖�") } if (name) { results = OpenApiClient.addressMatch(city, name, "property", false, region, null) @@ -238,11 +238,11 @@ class DataMatch { def code = d['C'] if(code && code.toString().isNumber()){ if(code.toInteger().toString()=="500226"){ - d['I'] = "荣昌" - d['J'] = "重庆" + d['I'] = "鑽f槍" + d['J'] = "閲嶅簡" }else if(code.toInteger().toString()=="500223"){ - d['I'] = "潼南" - d['J'] = "重庆" + d['I'] = "娼煎崡" + d['J'] = "閲嶅簡" }else{ def data = findRegionCodeValue(code.toInteger().toString()); if(data){ @@ -292,8 +292,8 @@ class DataMatch { } def findAddress(String address) { - //Pattern ROAD_PATTERN = Pattern.compile('.*[路|大道|巷|胡同|街]\\d+号'); - Pattern ROAD_PATTERN = Pattern.compile('.[里,路,道,街,巷,路段,胡同].?\\d+.?\\d+[号,弄]|.[里,路,道,街,巷,路段,胡同].?\\d+.?[号,弄]') + //Pattern ROAD_PATTERN = Pattern.compile('.*[璺瘄澶ч亾|宸穦鑳″悓|琛梋\\d+鍙�'); + Pattern ROAD_PATTERN = Pattern.compile('.[閲�,璺�,閬�,琛�,宸�,璺,鑳″悓].?\\d+.?\\d+[鍙�,寮刔|.[閲�,璺�,閬�,琛�,宸�,璺,鑳″悓].?\\d+.?[鍙�,寮刔') Matcher m = ROAD_PATTERN.matcher(address) String newAddress if (m.find()) { @@ -311,12 +311,12 @@ class DataMatch { region = d['C'] } if(d['D']) { - def name = d['D'].toString().replace(".", "").replace("(", "").replace(")", "").replace("。", "") - .replace("·", "").replace("-", "").replace("`", "").replace("?", "").replace("‘", "") - .replace("1期", "一期").replace("2期", "二期").replace("3期", "三期") - .replace("4期", "四期").replace("5期", "五期").replace("12区", "十二区").replace("1区", "一区").replace("2区", "二区").replace("3区", "三区") - .replace("4区", "四区").replace("5区", "五区").replace("a区", "A区") - .replace("B区", "B区").replace("c区", "C区").replace("d区", "D区") + def name = d['D'].toString().replace(".", "").replace("锛�", "").replace("锛�", "").replace("銆�", "") + .replace("路", "").replace("-", "").replace("`", "").replace("锛�", "").replace("鈥�", "") + .replace("1鏈�", "涓�鏈�").replace("2鏈�", "浜屾湡").replace("3鏈�", "涓夋湡") + .replace("4鏈�", "鍥涙湡").replace("5鏈�", "浜旀湡").replace("12鍖�", "鍗佷簩鍖�").replace("1鍖�", "涓�鍖�").replace("2鍖�", "浜屽尯").replace("3鍖�", "涓夊尯") + .replace("4鍖�", "鍥涘尯").replace("5鍖�", "浜斿尯").replace("a鍖�", "A鍖�") + .replace("B鍖�", "B鍖�").replace("c鍖�", "C鍖�").replace("d鍖�", "D鍖�") def result = OpenApiUtils.matchDetailDistrict(city, name, region, true) if (!result && d['E']) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/chongqingblank/DistrictSelectHouse.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/chongqingblank/DistrictSelectHouse.groovy index d0e32b227..65afc4a27 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/chongqingblank/DistrictSelectHouse.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/chongqingblank/DistrictSelectHouse.groovy @@ -25,7 +25,7 @@ class DistrictSelectHouse { } def run3(){ - ExcelUtils.multiThreadingModify("D:\\数据\\重庆农商行\\重庆样本V1 -跑地址.xlsx",{d-> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\閲嶅簡鏍锋湰V1 -璺戝湴鍧�.xlsx",{d-> if(d['A']) { def dist = CommonDatautils.findDistrict(d['A'],d['B'], d['C'], "district") if(dist){ @@ -36,7 +36,7 @@ class DistrictSelectHouse { } def run2(){ - ExcelUtils.multiThreadingModify("D:\\数据\\重庆农商行\\重庆样本.xlsx",{d-> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\閲嶅簡鏍锋湰.xlsx",{d-> if(d['N']){ def floorInfo = d['J'] def height = d['N'] @@ -45,11 +45,11 @@ class DistrictSelectHouse { def mod = (int)(height/3) def h_start = (height - mod).toInteger() def random_floor = null - if(floorInfo.contains("低楼层")){ + if(floorInfo.contains("浣庢ゼ灞�")){ random_floor = random(1, mod) - }else if(floorInfo.contains("中楼层")){ + }else if(floorInfo.contains("涓ゼ灞�")){ random_floor = random(mod+1, h_start-1) - }else if(floorInfo.contains("高楼层")){ + }else if(floorInfo.contains("楂樻ゼ灞�")){ random_floor = random(h_start, height) } d['M'] = random_floor @@ -68,7 +68,7 @@ class DistrictSelectHouse { def run(){ - def city = "重庆" + def city = "閲嶅簡" def weekend = "2022-03-06" def thirdPriceMap = findNearThirdPartyPrice(city) def distStats = findCreditHightDistrict2(city, weekend, thirdPriceMap) @@ -105,7 +105,7 @@ class DistrictSelectHouse { row << h.p_date rets << row } - ExcelUtils.write("D:\\数据\\重庆农商行\\重庆样本.xlsx", rets, "数据") + ExcelUtils.write("D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\閲嶅簡鏍锋湰.xlsx", rets, "鏁版嵁") } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/chongqingblank/EvaluationPrice.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/chongqingblank/EvaluationPrice.groovy index 90eaa4e13..4d205c166 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/chongqingblank/EvaluationPrice.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/chongqingblank/EvaluationPrice.groovy @@ -15,7 +15,7 @@ class EvaluationPrice { } def run(){ - ExcelUtils.multiThreadingModify("D:\\数据\\重庆农商行\\估值3-V3.xlsx",{ d-> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\浼板��3-V3.xlsx",{ d-> if(d['K'] && d['M']){ def priceMap = getEvaluationPrice(d['J'], d['K'], d['L'], d['D'].toString()) if(priceMap){ @@ -41,7 +41,7 @@ class EvaluationPrice { return result.getJSONObject("result") } } else if (result.getInt("code") == 500) { - println("小区估价失败:${params.city} ${params.name} ${params.size} ${result}") + println("灏忓尯浼颁环澶辫触:${params.city} ${params.name} ${params.size} ${result}") } } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/chongqingblank/TestMatchResult.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/chongqingblank/TestMatchResult.groovy index 9ff1149d5..f0043659c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/chongqingblank/TestMatchResult.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/chongqingblank/TestMatchResult.groovy @@ -22,16 +22,16 @@ class TestMatchResult { static main(args) { def task = new TestMatchResult() -// task.run1("D:\\数据\\重庆农商行\\估值1.xlsx") - task.run2("D:\\数据\\重庆农商行\\估值2-V2.xlsx") -// task.run3("D:\\数据\\重庆农商行\\估值3.xlsx") +// task.run1("D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\浼板��1.xlsx") + task.run2("D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\浼板��2-V2.xlsx") +// task.run3("D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\浼板��3.xlsx") -// task.nearDistRun("D:\\数据\\重庆农商行\\估值2-V5.xlsx") -// task.run2V1("D:\\数据\\重庆农商行\\估值2-V2.xlsx") +// task.nearDistRun("D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\浼板��2-V5.xlsx") +// task.run2V1("D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\浼板��2-V2.xlsx") -// task.similarScore("D:\\数据\\重庆农商行\\估值2-V5.xlsx") +// task.similarScore("D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\浼板��2-V5.xlsx") -// task.mapRun("D:\\数据\\重庆农商行\\估值2-V4-map.xlsx"); +// task.mapRun("D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\浼板��2-V4-map.xlsx"); } @@ -46,29 +46,29 @@ class TestMatchResult { region = d['C'] } def newName = null - if(d['D']=="大川菲尔小城"){ + if(d['D']=="澶у窛鑿插皵灏忓煄"){ if (d['D']) { - newName = d['D'].toString().replace(".", "").replace("(", "").replace(")", "").replace("。", "") - .replace("·", "").replace("-", "").replace("`", "").replace("?", "").replace("‘", "") - .replace("1期", "一期").replace("2期", "二期").replace("3期", "三期") - .replace("4期", "四期").replace("5期", "五期").replace("12区", "十二区").replace("1区", "一区").replace("2区", "二区").replace("3区", "三区") - .replace("4区", "四区").replace("5区", "五区").replace("a区", "A区") - .replace("B区", "B区").replace("c区", "C区").replace("d区", "D区") + newName = d['D'].toString().replace(".", "").replace("锛�", "").replace("锛�", "").replace("銆�", "") + .replace("路", "").replace("-", "").replace("`", "").replace("锛�", "").replace("鈥�", "") + .replace("1鏈�", "涓�鏈�").replace("2鏈�", "浜屾湡").replace("3鏈�", "涓夋湡") + .replace("4鏈�", "鍥涙湡").replace("5鏈�", "浜旀湡").replace("12鍖�", "鍗佷簩鍖�").replace("1鍖�", "涓�鍖�").replace("2鍖�", "浜屽尯").replace("3鍖�", "涓夊尯") + .replace("4鍖�", "鍥涘尯").replace("5鍖�", "浜斿尯").replace("a鍖�", "A鍖�") + .replace("B鍖�", "B鍖�").replace("c鍖�", "C鍖�").replace("d鍖�", "D鍖�") } if (!region || (region && region == d['L'])) { if (d['D'] && !d['O'] && d['M']) { if (d['M'] == newName) { - d['O'] = "相同" + d['O'] = "鐩稿悓" } if (!d['O']) { def dbo = CommonDatautils.findDistrictByAlias(d['K'], d['L'], d['D'], "district") if (dbo) { - d['O'] = "别名匹配" + d['O'] = "鍒悕鍖归厤" } } // if (!d['O'] && d['M'] && d['E']) { // if (d['E'].toString().contains(d['M'])) { -// d['O'] = "名称in地址" +// d['O'] = "鍚嶇Оin鍦板潃" // } // } @@ -76,7 +76,7 @@ class TestMatchResult { def py1 = com.fangjia.core.util.DataUtil.hanyuQuanpin(newName, " ") def py2 = com.fangjia.core.util.DataUtil.hanyuQuanpin(d['M'], " ") if (py1 == py2) { - d['O'] = "拼音相同" + d['O'] = "鎷奸煶鐩稿悓" } } @@ -88,37 +88,37 @@ class TestMatchResult { word = d['M'].toString().replace(newName, "") } if (word) { - def words = ["重庆", "小区", "(高层)", "花园", "恒都", "(洋房)", "社区"] + def words = ["閲嶅簡", "灏忓尯", "锛堥珮灞傦級", "鑺卞洯", "鎭掗兘", "锛堟磱鎴匡級", "绀惧尯"] for (def w : words) { if (word == w) { - d['O'] = "去部分词后相同" + d['O'] = "鍘婚儴鍒嗚瘝鍚庣浉鍚�" break } } - if (!d['O'] && !word.endsWith("区") && !word.endsWith("期") && !word.endsWith("团") && !word.endsWith("东苑") && !word.endsWith("西苑") && !word.endsWith("南苑") && !word.endsWith("北苑")) { - if (d['N'] && d['N'].toString().endsWith("号") && d['E'] && d['E'].toString().contains(d['N'])) { + if (!d['O'] && !word.endsWith("鍖�") && !word.endsWith("鏈�") && !word.endsWith("鍥�") && !word.endsWith("涓滆嫅") && !word.endsWith("瑗胯嫅") && !word.endsWith("鍗楄嫅") && !word.endsWith("鍖楄嫅")) { + if (d['N'] && d['N'].toString().endsWith("鍙�") && d['E'] && d['E'].toString().contains(d['N'])) { def score = CosineSimilarAlgorithm.getSimilarity(d['M'], newName); if (score >= 0.65) { println newName + " " + d['M'] + " " + score - d['O'] = "地址相同" + d['O'] = "鍦板潃鐩稿悓" } } } } } - if (!d['O'] && newName && !newName.contains("期") && !newName.endsWith("组团") && (!newName.endsWith("区") || newName.endsWith("小区"))) { + if (!d['O'] && newName && !newName.contains("鏈�") && !newName.endsWith("缁勫洟") && (!newName.endsWith("鍖�") || newName.endsWith("灏忓尯"))) { - def gaodeRest = FangjiaClientUtils.getMapData(city, region, newName, d['E'], "住宅", "高德") + def gaodeRest = FangjiaClientUtils.getMapData(city, region, newName, d['E'], "浣忓畢", "楂樺痉") if (!gaodeRest) { - gaodeRest = FangjiaClientUtils.getMapData(city, region, newName, d['E'], "住宅", "百度") + gaodeRest = FangjiaClientUtils.getMapData(city, region, newName, d['E'], "浣忓畢", "鐧惧害") } if (gaodeRest && gaodeRest.name) { - def mapName = gaodeRest.name.replace(".", "").replace("(", "").replace(")", "").replace("·", "").replace("`", "").replace("?", "") + def mapName = gaodeRest.name.replace(".", "").replace("锛�", "").replace("锛�", "").replace("路", "").replace("`", "").replace("锛�", "") if (mapName == d['M'] && gaodeRest.score >= 0.7) { - d['O'] = gaodeRest.source + "匹配" + d['O'] = gaodeRest.source + "鍖归厤" println newName + " " + d['M'] + " " + gaodeRest.score } } @@ -128,15 +128,15 @@ class TestMatchResult { if (d['D'] && !d['O']) { - def gaodeRest = FangjiaClientUtils.getMapData(city, region, newName, d['E'], "住宅", "高德") + def gaodeRest = FangjiaClientUtils.getMapData(city, region, newName, d['E'], "浣忓畢", "楂樺痉") def mapName = null if (gaodeRest && gaodeRest.name) { - mapName = gaodeRest.name.replace(".", "").replace("(", "").replace(")", "").replace("·", "").replace("`", "").replace("?", "") + mapName = gaodeRest.name.replace(".", "").replace("锛�", "").replace("锛�", "").replace("路", "").replace("`", "").replace("锛�", "") } if (!gaodeRest || (gaodeRest && mapName != newName)) { - gaodeRest = FangjiaClientUtils.getMapData(city, region, newName, d['E'], "住宅", "百度") + gaodeRest = FangjiaClientUtils.getMapData(city, region, newName, d['E'], "浣忓畢", "鐧惧害") if (gaodeRest && gaodeRest.name) { - mapName = gaodeRest.name.replace(".", "").replace("(", "").replace(")", "").replace("·", "").replace("`", "").replace("?", "") + mapName = gaodeRest.name.replace(".", "").replace("锛�", "").replace("锛�", "").replace("路", "").replace("`", "").replace("锛�", "") } } if (gaodeRest && mapName == newName) { @@ -172,29 +172,29 @@ class TestMatchResult { city = d['J'] } -// if(d['E']=="巴南区花溪镇花溪新街88号2单元3-4#") { +// if(d['E']=="宸村崡鍖鸿姳婧晣鑺辨邯鏂拌88鍙�2鍗曞厓3-4#") { // println "ss" if (!region || (region && region == d['L'])) { if (d['N'] && !d['O'] && d['E']) { - if (d['N'].toString().endsWith("号") && d['E'] && d['E'].toString().contains(d['N'])) { - d['O'] = "地址匹配" + if (d['N'].toString().endsWith("鍙�") && d['E'] && d['E'].toString().contains(d['N'])) { + d['O'] = "鍦板潃鍖归厤" } } } if (!d['O'] && d['M'] && d['E']) { def matchName = d['M'] - if(matchName.toString().endsWith("小区")){ - matchName = matchName.toString().replace("小区","") + if(matchName.toString().endsWith("灏忓尯")){ + matchName = matchName.toString().replace("灏忓尯","") } if(matchName.toString().startsWith(d['L'])){ matchName = matchName.toString().replace(d['L'],"") } def oldName= NameProcess.nameStandard(city,region, d['E']) if (oldName.toString().contains(matchName)) { - d['O'] = "名称in地址" + d['O'] = "鍚嶇Оin鍦板潃" } } @@ -202,16 +202,16 @@ class TestMatchResult { def gaodeRest = null if (!gaodeRest && d['E']) { - gaodeRest = FangjiaClientUtils.getMapData(city, region, d['E'], null, "住宅", "高德") + gaodeRest = FangjiaClientUtils.getMapData(city, region, d['E'], null, "浣忓畢", "楂樺痉") } if(!gaodeRest && d['H']){ - gaodeRest = FangjiaClientUtils.getMapData(city, region, d['H'], null, "住宅", "高德") + gaodeRest = FangjiaClientUtils.getMapData(city, region, d['H'], null, "浣忓畢", "楂樺痉") } if (!gaodeRest && d['E']) { - gaodeRest = FangjiaClientUtils.getMapData(city, region, d['E'], null, "住宅", "百度") + gaodeRest = FangjiaClientUtils.getMapData(city, region, d['E'], null, "浣忓畢", "鐧惧害") } if (!gaodeRest && d['H']) { - gaodeRest = FangjiaClientUtils.getMapData(city, region, d['H'], null, "住宅", "百度") + gaodeRest = FangjiaClientUtils.getMapData(city, region, d['H'], null, "浣忓畢", "鐧惧害") } if (gaodeRest && gaodeRest.score >= 0.5) { @@ -295,7 +295,7 @@ class TestMatchResult { // if(!d['I'] && !d['J']){ // city = d['B'] // } - if(d['O'] && d['O']=="周边"){ + if(d['O'] && d['O']=="鍛ㄨ竟"){ def locationMap = null if(d['B'] && d['E']){ locationMap = getLocation(city, d['E']) @@ -328,24 +328,24 @@ class TestMatchResult { d['AJ'] = d['N'] } if(!d['O']){ - if(d['R'] && d['R'].contains("号")){ - def addr = d['R'].toString().substring(0, d['R'].indexOf("号")) + if(d['R'] && d['R'].contains("鍙�")){ + def addr = d['R'].toString().substring(0, d['R'].indexOf("鍙�")) if((addr && d['E'] && d['E'].contains(addr))){ def region = RegionData.formatRegion(city, d['P']) - if(d['U'] && d['U'].toString().contains("住宅")){ + if(d['U'] && d['U'].toString().contains("浣忓畢")){ d['AH'] = region d['AI'] = d['Q'] d['AJ'] = d['R'] d['AK'] = d['U'] d['AM'] = d['S']+","+d['T'] - d['O'] ="地图匹配" + d['O'] ="鍦板浘鍖归厤" }else if(!d['U']){ d['AH'] = region d['AI'] = d['Q'] d['AJ'] = d['R'] d['AK'] = d['U'] d['AM'] = d['S']+","+d['T'] - d['O'] ="地图匹配" + d['O'] ="鍦板浘鍖归厤" } } } @@ -353,28 +353,28 @@ class TestMatchResult { if(!d['O']){ if(d['Y'] && d['AE']){ - def mapName = d['Y'].toString().replace(".", "").replace("(", "").replace(")", "").replace("。", "") - .replace("·", "").replace("-", "").replace("`", "").replace("?", "").replace("‘", "") - .replace("1期", "一期").replace("2期", "二期").replace("3期", "三期") - .replace("4期", "四期").replace("5期", "五期").replace("12区", "十二区").replace("1区", "一区").replace("2区", "二区").replace("3区", "三区") - .replace("4区", "四区").replace("5区", "五区").replace("a区", "A区") - .replace("B区", "B区").replace("c区", "C区").replace("d区", "D区") + def mapName = d['Y'].toString().replace(".", "").replace("锛�", "").replace("锛�", "").replace("銆�", "") + .replace("路", "").replace("-", "").replace("`", "").replace("锛�", "").replace("鈥�", "") + .replace("1鏈�", "涓�鏈�").replace("2鏈�", "浜屾湡").replace("3鏈�", "涓夋湡") + .replace("4鏈�", "鍥涙湡").replace("5鏈�", "浜旀湡").replace("12鍖�", "鍗佷簩鍖�").replace("1鍖�", "涓�鍖�").replace("2鍖�", "浜屽尯").replace("3鍖�", "涓夊尯") + .replace("4鍖�", "鍥涘尯").replace("5鍖�", "浜斿尯").replace("a鍖�", "A鍖�") + .replace("B鍖�", "B鍖�").replace("c鍖�", "C鍖�").replace("d鍖�", "D鍖�") if(mapName == d['AE']){ def region = RegionData.formatRegion(city, d['AD']) d['AH'] = region d['AI'] = d['AE'] d['AJ'] = d['AF'] d['AK'] = d['DB'] - d['O'] ="名称相同" + d['O'] ="鍚嶇О鐩稿悓" }else{ if(d['AB'].toString().toDouble()>=d['AG'].toString().toDouble()){ def region = RegionData.formatRegion(city, d['AD']) d['AH'] = region d['AI'] = d['AE'] d['AJ'] = d['AF'] - d['AK'] = "DB库近" + d['AK'] = "DB搴撹繎" d['AL'] = d['AG'] - d['O'] ="距离比较" + d['O'] ="璺濈姣旇緝" }else{ def region = RegionData.formatRegion(city, d['X']) d['AH'] = region @@ -383,7 +383,7 @@ class TestMatchResult { d['AK'] = d['AA'] d['AL'] = d['AB'] d['AM'] = d['AC'] - d['O'] ="距离比较" + d['O'] ="璺濈姣旇緝" } } }else if(d['Y']){ @@ -394,15 +394,15 @@ class TestMatchResult { d['AK'] = d['AA'] d['AL'] = d['AB'] d['AM'] = d['AC'] - d['O'] ="采用地图相近" + d['O'] ="閲囩敤鍦板浘鐩歌繎" }else if(d['AE']){ def region = RegionData.formatRegion(city, d['AD']) d['AH'] = region d['AI'] = d['AE'] d['AJ'] = d['AF'] - d['AK'] = "DB库近" + d['AK'] = "DB搴撹繎" d['AL'] = d['AG'] - d['O'] ="采用DB相近" + d['O'] ="閲囩敤DB鐩歌繎" } } },0); @@ -493,11 +493,11 @@ class TestMatchResult { if(d['C'].toString().length()<2){ newName = null }else{ - newName = d['C'].toString().replace(".", "").replace("(", "").replace(")", "").replace("。", "") - .replace("·", "").replace("-", "").replace("`", "").replace("?", "").replace("‘", "") - .replace("1期", "一期").replace("2期", "二期").replace("3期", "三期") - .replace("4期", "四期").replace("5期", "五期").replace("12区", "十二区").replace("a区", "A区") - .replace("B区", "B区").replace("c区", "C区").replace("d区", "D区") + newName = d['C'].toString().replace(".", "").replace("锛�", "").replace("锛�", "").replace("銆�", "") + .replace("路", "").replace("-", "").replace("`", "").replace("锛�", "").replace("鈥�", "") + .replace("1鏈�", "涓�鏈�").replace("2鏈�", "浜屾湡").replace("3鏈�", "涓夋湡") + .replace("4鏈�", "鍥涙湡").replace("5鏈�", "浜旀湡").replace("12鍖�", "鍗佷簩鍖�").replace("a鍖�", "A鍖�") + .replace("B鍖�", "B鍖�").replace("c鍖�", "C鍖�").replace("d鍖�", "D鍖�") } } @@ -515,12 +515,12 @@ class TestMatchResult { if(!region ||(region && d['L'] && region.contains(d['L']))) { if (d['B'] && !d['O'] && d['M']) { if (d['M'] == newName) { - d['O'] = "相同" + d['O'] = "鐩稿悓" } if (!d['O']) { def dbo = CommonDatautils.findDistrictByAlias(d['K'], d['L'], newName, "district") if (dbo) { - d['O'] = "别名匹配" + d['O'] = "鍒悕鍖归厤" } } @@ -528,7 +528,7 @@ class TestMatchResult { def py1 = com.fangjia.core.util.DataUtil.hanyuQuanpin(newName, " ") def py2 = com.fangjia.core.util.DataUtil.hanyuQuanpin(d['M'], " ") if (py1 == py2) { - d['O'] = "拼音相同" + d['O'] = "鎷奸煶鐩稿悓" } } @@ -540,37 +540,37 @@ class TestMatchResult { word = d['M'].toString().replace(newName, "") } if (word) { - def words = ["重庆", "小区", "(高层)", "花园", "恒都", "(洋房)", "社区"] + def words = ["閲嶅簡", "灏忓尯", "锛堥珮灞傦級", "鑺卞洯", "鎭掗兘", "锛堟磱鎴匡級", "绀惧尯"] for (def w : words) { if (word == w) { - d['O'] = "去部分词后相同" + d['O'] = "鍘婚儴鍒嗚瘝鍚庣浉鍚�" break } } - if (!d['O'] && !word.endsWith("区") && !word.endsWith("期") && !word.endsWith("团") && !word.endsWith("东苑") && !word.endsWith("西苑") && !word.endsWith("南苑") && !word.endsWith("北苑")) { - if (d['N'] && d['N'].toString().endsWith("号") && address.toString().contains(d['N'])) { + if (!d['O'] && !word.endsWith("鍖�") && !word.endsWith("鏈�") && !word.endsWith("鍥�") && !word.endsWith("涓滆嫅") && !word.endsWith("瑗胯嫅") && !word.endsWith("鍗楄嫅") && !word.endsWith("鍖楄嫅")) { + if (d['N'] && d['N'].toString().endsWith("鍙�") && address.toString().contains(d['N'])) { def score = CosineSimilarAlgorithm.getSimilarity(d['M'], newName); if (score >= 0.65) { println newName + " " + d['M'] + " " + score - d['O'] = "地址相同" + d['O'] = "鍦板潃鐩稿悓" } } } } } - if (!d['O'] && newName && !newName.contains("期") && !newName.endsWith("组团") && (!newName.endsWith("区") || newName.endsWith("小区"))) { + if (!d['O'] && newName && !newName.contains("鏈�") && !newName.endsWith("缁勫洟") && (!newName.endsWith("鍖�") || newName.endsWith("灏忓尯"))) { - def gaodeRest = FangjiaClientUtils.getMapData(city, region, newName, address, "住宅", "高德") + def gaodeRest = FangjiaClientUtils.getMapData(city, region, newName, address, "浣忓畢", "楂樺痉") if (!gaodeRest) { - gaodeRest = FangjiaClientUtils.getMapData(city, region, newName, address, "住宅", "百度") + gaodeRest = FangjiaClientUtils.getMapData(city, region, newName, address, "浣忓畢", "鐧惧害") } if (gaodeRest && gaodeRest.name) { - def mapName = gaodeRest.name.replace(".", "").replace("(", "").replace(")", "").replace("·", "").replace("`", "").replace("?", "") + def mapName = gaodeRest.name.replace(".", "").replace("锛�", "").replace("锛�", "").replace("路", "").replace("`", "").replace("锛�", "") if (mapName == d['M'] && gaodeRest.score >= 0.7) { - d['O'] = gaodeRest.source + "匹配" + d['O'] = gaodeRest.source + "鍖归厤" println newName + " " + d['M'] + " " + gaodeRest.score } } @@ -581,15 +581,15 @@ class TestMatchResult { if(newName && !d['O']){ - def gaodeRest = FangjiaClientUtils.getMapData(city, region, newName, address, "住宅", "高德") + def gaodeRest = FangjiaClientUtils.getMapData(city, region, newName, address, "浣忓畢", "楂樺痉") def mapName = null if(gaodeRest && gaodeRest.name){ - mapName = gaodeRest.name.replace(".", "").replace("(", "").replace(")", "").replace("·", "").replace("`", "").replace("?", "") + mapName = gaodeRest.name.replace(".", "").replace("锛�", "").replace("锛�", "").replace("路", "").replace("`", "").replace("锛�", "") } if(!gaodeRest || (gaodeRest && mapName != newName)) { - gaodeRest = FangjiaClientUtils.getMapData(city, region, newName, d['E'], "住宅", "百度") + gaodeRest = FangjiaClientUtils.getMapData(city, region, newName, d['E'], "浣忓畢", "鐧惧害") if(gaodeRest && gaodeRest.name){ - mapName = gaodeRest.name.replace(".", "").replace("(", "").replace(")", "").replace("·", "").replace("`", "").replace("?", "") + mapName = gaodeRest.name.replace(".", "").replace("锛�", "").replace("锛�", "").replace("路", "").replace("`", "").replace("锛�", "") } } if(gaodeRest && mapName== newName){ @@ -610,8 +610,8 @@ class TestMatchResult { ExcelUtils.multiThreadingModify(fileName, { d -> def city = d['J'] def region = d['I'] - if(city && region && d['Q'] && d['O']!="距离比较" && d['O']!="地址匹配"){ - def gaodeRest = FangjiaClientUtils.getMapData(city, region, d['Q'], null, "住宅", "高德") + if(city && region && d['Q'] && d['O']!="璺濈姣旇緝" && d['O']!="鍦板潃鍖归厤"){ + def gaodeRest = FangjiaClientUtils.getMapData(city, region, d['Q'], null, "浣忓畢", "楂樺痉") if(gaodeRest){ d['V'] = gaodeRest.city d['W'] = gaodeRest.district diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/chongqingblank/TestPrice.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/chongqingblank/TestPrice.groovy index 952d0033a..b3f9f0b99 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/chongqingblank/TestPrice.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/chongqingblank/TestPrice.groovy @@ -19,7 +19,7 @@ class TestPrice { } def run(){ - ExcelUtils.multiThreadingModify("D:\\数据\\重庆农商行\\估值1-V2.xlsx",{ d-> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\浼板��1-V2.xlsx",{ d-> if(d['K'] && d['M']){ def dbo = findThirdPrice(d['K'], d['L'], d['M'], 202012, "lianjia_esf_price") if(dbo){ @@ -58,7 +58,7 @@ class TestPrice { def q = new BasicDBObject() q.put("city", dist.city) q.put("region", dist.region) -// q.put("source", "链家在线") +// q.put("source", "閾惧鍦ㄧ嚎") def alias = [] if(dist.alias){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/city/CityStatExport.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/city/CityStatExport.groovy index 26b2fa122..fffda8a45 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/city/CityStatExport.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/city/CityStatExport.groovy @@ -37,7 +37,7 @@ class CityStatExport { } def exportRegionAvgPrice(){ - def regions = ["鼓楼","仓山","台江","晋安","马尾","长乐","福清","闽侯","连江","罗源","闽清","永泰","平潭"]; + def regions = ["榧撴ゼ","浠撳北","鍙版睙","鏅嬪畨","椹熬","闀夸箰","绂忔竻","闂戒警","杩炴睙","缃楁簮","闂芥竻","姘告嘲","骞虫江"]; def add = -9; def months = [] while(add<=0){ @@ -52,17 +52,17 @@ class CityStatExport { for(def i=0; i if(!d['B']){ def city = RegionData.formatCity(d['A']) @@ -83,7 +83,7 @@ class CityStatExport { } def houseStat(){ - def fileName = "D:\\数据\\贝壳\\贝壳城市小区二手房统计V3-已重新补充.xlsx" + def fileName = "D:\\鏁版嵁\\璐濆3\\璐濆3鍩庡競灏忓尯浜屾墜鎴跨粺璁3-宸查噸鏂拌ˉ鍏�.xlsx" ExcelUtils.multiThreadingModify(fileName, { d -> // def houseCount = findHouseCount(d['F'], 20230201) // d['H'] = houseCount @@ -93,7 +93,7 @@ class CityStatExport { } def stat(){ - def fileName = "C:\\Users\\gaojuan\\Desktop\\江苏城市字段信息统计_交付.xlsx" + def fileName = "C:\\Users\\gaojuan\\Desktop\\姹熻嫃鍩庡競瀛楁淇℃伅缁熻_浜や粯.xlsx" ExcelUtils.multiThreadingModify(fileName, { d -> println d['A'] + " "+ d['B'] def rets = CcbCommonUtils.findAllDistrictByCityAndRegion(d['A'], d['B'],"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"]) @@ -107,10 +107,10 @@ class CityStatExport { // def citys = CommonDatautils.findAllCity(); - def citys = [ "贵阳","六盘水","遵义","安顺","铜仁","毕节","黔西南","黔东南","黔南"] + def citys = [ "璐甸槼","鍏洏姘�","閬典箟","瀹夐『","閾滀粊","姣曡妭","榛旇タ鍗�","榛斾笢鍗�","榛斿崡"] def ret = [] - ret << ["城市","小区总量"] -// ret << ["城市","楼栋总量", "房号总量"] + ret << ["鍩庡競","灏忓尯鎬婚噺"] +// ret << ["鍩庡競","妤兼爧鎬婚噺", "鎴垮彿鎬婚噺"] for(def city : citys){ def districts = CommonDatautils.findAllDistricts(city, "district", ["city", "region", "name"]); def total = districts.size() @@ -138,12 +138,12 @@ class CityStatExport { ret << m println m } - ExcelUtils.write("D:\\数据\\楼盘量.xlsx",ret,"数据3") + ExcelUtils.write("D:\\鏁版嵁\\妤肩洏閲�.xlsx",ret,"鏁版嵁3") } def run1(){ - def datas = ExcelUtils.read("D:\\数据\\福州\\福州省数据现状.xlsx",2, 1) + def datas = ExcelUtils.read("D:\\鏁版嵁\\绂忓窞\\绂忓窞鐪佹暟鎹幇鐘�.xlsx",2, 1) for(def data : datas){ def region = RegionData.formatRegion(data['B'], data['D']) if(region){ @@ -151,14 +151,14 @@ class CityStatExport { data['E'] = districts.size() } } - ExcelUtils.write("D:\\数据\\福州省数据现状.xlsx", datas,"数据") + ExcelUtils.write("D:\\鏁版嵁\\绂忓窞鐪佹暟鎹幇鐘�.xlsx", datas,"鏁版嵁") } def regionStat(){ - def citys = ['淮南','阜阳','黄山','亳州','安庆','六安','淮北','宣城','池州','铜陵','滁州','蚌埠','合肥','芜湖','马鞍山','宿州'] + def citys = ['娣崡','闃滈槼','榛勫北','浜冲窞','瀹夊簡','鍏畨','娣寳','瀹e煄','姹犲窞','閾滈櫟','婊佸窞','铓屽煚','鍚堣偉','鑺滄箹','椹瀺灞�','瀹垮窞'] def ret = [] - ret << ["城市","区域","小区总量"] + ret << ["鍩庡競","鍖哄煙","灏忓尯鎬婚噺"] for(def city : citys){ def regions = CommonDatautils.getRegionListByCity(city) @@ -177,7 +177,7 @@ class CityStatExport { ret << row } } - ExcelUtils.write("D:\\数据\\安徽省城市统计(楼盘量).xlsx",ret,"区县") + ExcelUtils.write("D:\\鏁版嵁\\瀹夊窘鐪佸煄甯傜粺璁�(妤肩洏閲�).xlsx",ret,"鍖哄幙") } @@ -256,12 +256,12 @@ class CityStatExport { for(def dist : districts){ - // 产权年限 + // 浜ф潈骞撮檺 if(dist.property_life){ property_life++ } - // 竣工时间 + // 绔e伐鏃堕棿 if(dist.finish_building_date){ finish_building_date++ } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/commStat/CityStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/commStat/CityStat.groovy index 0ddc8afec..5416d2a9b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/commStat/CityStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/commStat/CityStat.groovy @@ -37,7 +37,7 @@ class CityStat { task.countDist() } def countDist(){ - ExcelUtils.modify("D:\\数据\\其它\\小区统计.xlsx", { d -> + ExcelUtils.modify("D:\\鏁版嵁\\鍏跺畠\\灏忓尯缁熻.xlsx", { d -> if(d['B']){ def districts = CommonDatautils.findAllDistrictByCity(d['B'], "district", ["city", "region", "name"]) d['D'] = districts.size() @@ -46,10 +46,10 @@ class CityStat { } def dealPriceStat(){ - //def citys = ["上海","北京","广州","合肥","南京","深圳","武汉","郑州","重庆","福州","厦门","青岛","太原","长春","苏州","南宁","沈阳","天津","西安","长沙","大连","南昌","东莞","佛山","济南","南通","镇江","宁波","烟台","哈尔滨"] - def citys = ["石家庄","贵阳"] + //def citys = ["涓婃捣","鍖椾含","骞垮窞","鍚堣偉","鍗椾含","娣卞湷","姝︽眽","閮戝窞","閲嶅簡","绂忓窞","鍘﹂棬","闈掑矝","澶師","闀挎槬","鑻忓窞","鍗楀畞","娌堥槼","澶╂触","瑗垮畨","闀挎矙","澶ц繛","鍗楁槍","涓滆帪","浣涘北","娴庡崡","鍗楅��","闀囨睙","瀹佹尝","鐑熷彴","鍝堝皵婊�"] + def citys = ["鐭冲搴�","璐甸槼"] def rets = [] - rets << ["城市","2022-4月总量"] + rets << ["鍩庡競","2022-4鏈堟�婚噺"] def startDate = DateUtils.parseFromTightByPattern('2022-01-01','yyyy-MM-dd') def endDate = DateUtils.parseFromTightByPattern('2022-02-01','yyyy-MM-dd') for(def c : citys){ @@ -60,11 +60,11 @@ class CityStat { println ret } - ExcelUtils.write("D:\\数据\\2021成交数据.xlsx", rets, "月统计") + ExcelUtils.write("D:\\鏁版嵁\\2021鎴愪氦鏁版嵁.xlsx", rets, "鏈堢粺璁�") } // def run8(){ -// ExcelUtils.multiThreadingModify("D:\\数据\\深圳建行\\建行匹配小区(3).xlsx",{d-> +// ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\娣卞湷寤鸿\\寤鸿鍖归厤灏忓尯锛�3锛�.xlsx",{d-> // // def dist = CommonDatautils.findDistrict(d['N'], d['O'], d['P'], "district") // if(dist){ @@ -75,7 +75,7 @@ class CityStat { // } def run5(){ - def dists = CommonDatautils.findAllDistrictByCity("常州","district",["city", "region","name","alias"]) + def dists = CommonDatautils.findAllDistrictByCity("甯稿窞","district",["city", "region","name","alias"]) def total = 0 def scount = 0 def index = 0 @@ -98,7 +98,7 @@ class CityStat { def run7(){ - def dists = CommonDatautils.findAllDistrictByCity("镇江","district",["city", "region","name","alias"]) + def dists = CommonDatautils.findAllDistrictByCity("闀囨睙","district",["city", "region","name","alias"]) def distMap = [:] for(def dist : dists){ @@ -114,7 +114,7 @@ class CityStat { distMap.put( dist.region +"#"+dist.name, dist) } } - def rets = findTradeDetails2("镇江","2020-03-24"); + def rets = findTradeDetails2("闀囨睙","2020-03-24"); def total = 0 def scount = 0 @@ -144,7 +144,7 @@ class CityStat { } def run6(){ - def dists = CommonDatautils.findAllDistrictByCity("常州","district",["city", "region","name","alias"]) + def dists = CommonDatautils.findAllDistrictByCity("甯稿窞","district",["city", "region","name","alias"]) final CountDownLatch latch = new CountDownLatch(dists.size()) def totalCount = new AtomicLong() @@ -212,7 +212,7 @@ class CityStat { } def run3(){ - ExcelUtils.multiThreadingModify("D:\\数据\\建行银行\\建行匹配小区17.xlsx",{data-> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\寤鸿閾惰\\寤鸿鍖归厤灏忓尯17.xlsx",{data-> if(data['A']){ def startDate = DateUtils.addMonth(data['D'], -3) def endDate = DateUtils.addMonth(data['D'], 3) @@ -225,7 +225,7 @@ class CityStat { } def run4(){ - def citys = ["上海","北京","大连","厦门","深圳","杭州","成都","重庆","苏州","广州"] + def citys = ["涓婃捣","鍖椾含","澶ц繛","鍘﹂棬","娣卞湷","鏉窞","鎴愰兘","閲嶅簡","鑻忓窞","骞垮窞"] def startDate = DateUtils.addMonth(new Date(), -3) def endDate = "2021-02-01" def result = [] @@ -269,7 +269,7 @@ class CityStat { } latch.await() - ExcelUtils.write("D:\\数据\\深圳建行\\成交数据.xlsx",rets, "成交") + ExcelUtils.write("D:\\鏁版嵁\\娣卞湷寤鸿\\鎴愪氦鏁版嵁.xlsx",rets, "鎴愪氦") return rets; } @@ -277,10 +277,10 @@ class CityStat { def run(){ - //"北京","大连","厦门","深圳","杭州","成都","重庆","苏州","广州" - def citys = ["上海","北京","大连","厦门","深圳","杭州","成都","重庆","苏州","广州"] + //"鍖椾含","澶ц繛","鍘﹂棬","娣卞湷","鏉窞","鎴愰兘","閲嶅簡","鑻忓窞","骞垮窞" + def citys = ["涓婃捣","鍖椾含","澶ц繛","鍘﹂棬","娣卞湷","鏉窞","鎴愰兘","閲嶅簡","鑻忓窞","骞垮窞"] def rets = [] - rets << ["城市","小区数量","均价覆盖率","样本计算小区均价覆盖率","badcase数量", "近三个月成交数据量","近三个月有成交数据的小区覆盖率"] + rets << ["鍩庡競","灏忓尯鏁伴噺","鍧囦环瑕嗙洊鐜�","鏍锋湰璁$畻灏忓尯鍧囦环瑕嗙洊鐜�","badcase鏁伴噺", "杩戜笁涓湀鎴愪氦鏁版嵁閲�","杩戜笁涓湀鏈夋垚浜ゆ暟鎹殑灏忓尯瑕嗙洊鐜�"] for(def city : citys) { def districts = CommonDatautils.findAllDistrictByCity(city, "district", ["city","region","name", "alias"]) def priceCount = findStatCount(city, DateUtils.parseFromTightByPattern("2021-01-17", "yyyy-MM-dd"), null); @@ -297,16 +297,16 @@ class CityStat { def tradeDistPercent = 0//DataHandleUtils.getDoubleRound(2, tradeDistCount*100/districts.size()) rets << [city, districts.size(), pricePercent+"%", houseStatPercent+"%", badcasePercent+"%", tradeCount, tradeDistPercent+"%"] - println city +" 完成" + println city +" 瀹屾垚" } - ExcelUtils.write("d:\\数据\\统计\\城市统计1.xlsx", rets, "统计") + ExcelUtils.write("d:\\鏁版嵁\\缁熻\\鍩庡競缁熻1.xlsx", rets, "缁熻") } def run1(){ - //"北京","大连","厦门","深圳","杭州","成都","重庆","苏州","广州" - def citys = ["上海"] + //"鍖椾含","澶ц繛","鍘﹂棬","娣卞湷","鏉窞","鎴愰兘","閲嶅簡","鑻忓窞","骞垮窞" + def citys = ["涓婃捣"] def rets = [] - rets << ["城市","区域","小区名","成交价","评估价"] + rets << ["鍩庡競","鍖哄煙","灏忓尯鍚�","鎴愪氦浠�","璇勪及浠�"] for(def city : citys) { def districts = CommonDatautils.findAllDistrictByCity(city, "district", ["city", "region", "name", "alias"]) def retMap = calTradeDistDetail(city,DateUtils.parseFromTightByPattern("2020-10-01", "yyyy-MM-dd"), districts); @@ -319,13 +319,13 @@ class CityStat { rets << [city, arrs[0], arrs[1], tradeAvgPrice.toInteger(), stat.avg_price] } } - println city +" 完成" + println city +" 瀹屾垚" } - ExcelUtils.write("d:\\数据\\统计\\城市成交数据.xlsx", rets, "成交") + ExcelUtils.write("d:\\鏁版嵁\\缁熻\\鍩庡競鎴愪氦鏁版嵁.xlsx", rets, "鎴愪氦") } def run2(){ - def datas = ExcelUtils.read("D:\\数据\\深圳建行\\建行匹配小区2.xlsx",0,1) + def datas = ExcelUtils.read("D:\\鏁版嵁\\娣卞湷寤鸿\\寤鸿鍖归厤灏忓尯2.xlsx",0,1) def cityDataMap = [:] def index = 0 for(def data : datas){ @@ -342,15 +342,15 @@ class CityStat { lists << dist } - def citys = [ "苏州", "广州", "杭州", "大连", "重庆", "成都", "深圳", "厦门", "上海", "北京" ] + def citys = [ "鑻忓窞", "骞垮窞", "鏉窞", "澶ц繛", "閲嶅簡", "鎴愰兘", "娣卞湷", "鍘﹂棬", "涓婃捣", "鍖椾含" ] def results = [] - results << ["城市","区域","小区名","成交价","评估价"] + results << ["鍩庡競","鍖哄煙","灏忓尯鍚�","鎴愪氦浠�","璇勪及浠�"] for(def city : citys){ def districts = cityDataMap.get(city) def rets = findAvgPriceTrades(city, districts) results.addAll(rets) } - ExcelUtils.write("D:\\数据\\深圳建行\\建行成交3.xlsx",results, "数据") + ExcelUtils.write("D:\\鏁版嵁\\娣卞湷寤鸿\\寤鸿鎴愪氦3.xlsx",results, "鏁版嵁") } def findAvgPriceTrades(city, districts){ @@ -503,7 +503,7 @@ class CityStat { def calTradeDistCount(def city, def tradeDate, def districts){ def q = new BasicDBObject() q.put("city", city) - q.put("source","链家在线") + q.put("source","閾惧鍦ㄧ嚎") q.put("trade_date", new BasicDBObject('$gte', tradeDate)) def dbcorsor = DEAL_PRICE_COLL.find(q) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/commStat/DataStatTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/commStat/DataStatTest.groovy index aadcddc6e..89239bc4b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/commStat/DataStatTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/commStat/DataStatTest.groovy @@ -30,12 +30,12 @@ DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "ave DBCollection region_stat_coll = MongoUtils.getCollectionByName("fangjia", "region_stat", "mongo.db.fangjia.com") DBCollection mca_administrative_division_coll = MongoUtils.getCollectionByName("crawl", "mca_administrative_division_2022", "192.168.0.206", 27020) -//def citys = ["乌鲁木齐","昌吉","阿克苏","伊犁","喀什"] +//def citys = ["涔岄瞾鏈ㄩ綈","鏄屽悏","闃垮厠鑻�","浼婄妬","鍠�浠�"] //for(def city : citys){ // //} -//ExcelUtils.multiThreadingModify("D:\\数据\\江苏\\新疆数据统计.xlsx",{d-> +//ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\姹熻嫃\\鏂扮枂鏁版嵁缁熻.xlsx",{d-> //// def keys = getDealPrices(d['A'], DEAL_PRICE_COLL) //// if(keys){ //// d['G'] = keys.size() @@ -80,7 +80,7 @@ def getDealPrices(def city, coll){ return keys; } //def q = new BasicDBObject() -//q.put("status","已成交") +//q.put("status","宸叉垚浜�") //q.put("startDate", new BasicDBObject('$gte', DateUtils.parseFromTightYYYYMMDD("2021-07-01"))) //def dbcursor = paimai43_COLL.find(q) //def map = [:] @@ -96,21 +96,21 @@ def getDealPrices(def city, coll){ //} -//ExcelUtils.modify("D:\\数据\\朔州房源.xlsx",{r-> +//ExcelUtils.modify("D:\\鏁版嵁\\鏈斿窞鎴挎簮.xlsx",{r-> // def dist = CommonDatautils.findDistrict(r['A'],r['B'], r['C'], "district") // if(dist){ -// r['E'] = "名称完全一致" +// r['E'] = "鍚嶇О瀹屽叏涓�鑷�" // } // //}) -//def citys = ["锡林郭勒盟","保亭","塔城","陇南","海东","日喀则","迪庆州","忻州","昌吉","海西州","和田","克拉玛依","梅州","潮州","延安","楚雄","阿克苏","平凉","商洛","普洱","大兴安岭","白山","西双版纳州","临夏","榆林","阿勒泰","文昌","陵水","吐鲁番","庆阳","临沧","保山","黑河","喀什","白银","朔州","龙岩","韶关","揭阳","儋州","吕梁","来宾","渭南","肇庆","运城","丽江","德宏州","长治","黔南","张掖","金华","河源","邢台","晋中","宁德","曲靖","昭通","拉萨","玉溪","林芝","百色","仙桃","湘潭","滨州","随州","日照","呼伦贝尔","崇左","汕尾"] +//def citys = ["閿℃灄閮嫆鐩�","淇濅涵","濉斿煄","闄囧崡","娴蜂笢","鏃ュ杸鍒�","杩簡宸�","蹇诲窞","鏄屽悏","娴疯タ宸�","鍜岀敯","鍏嬫媺鐜涗緷","姊呭窞","娼窞","寤跺畨","妤氶泟","闃垮厠鑻�","骞冲噳","鍟嗘礇","鏅幢","澶у叴瀹夊箔","鐧藉北","瑗垮弻鐗堢撼宸�","涓村","姒嗘灄","闃垮嫆娉�","鏂囨槍","闄垫按","鍚愰瞾鐣�","搴嗛槼","涓存钵","淇濆北","榛戞渤","鍠�浠�","鐧介摱","鏈斿窞","榫欏博","闊跺叧","鎻槼","鍎嬪窞","鍚曟","鏉ュ","娓崡","鑲囧簡","杩愬煄","涓芥睙","寰峰畯宸�","闀挎不","榛斿崡","寮犳帠","閲戝崕","娌虫簮","閭㈠彴","鏅嬩腑","瀹佸痉","鏇查潠","鏄��","鎷夎惃","鐜夋邯","鏋楄姖","鐧捐壊","浠欐","婀樻江","婊ㄥ窞","闅忓窞","鏃ョ収","鍛间鸡璐濆皵","宕囧乏","姹曞熬"] // -//def districts = CommonDatautils.findAllDistrictByCity("朔州","district",["city","region","name","alias"]) +//def districts = CommonDatautils.findAllDistrictByCity("鏈斿窞","district",["city","region","name","alias"]) // //def totalCount = new AtomicLong() //final CountDownLatch latch = new CountDownLatch(districts.size()) -//println "小区量:"+districts.size() +//println "灏忓尯閲忥細"+districts.size() // //def retMap = new ConcurrentHashMap() //for(def i=0;i // def arrs = k.split("#") // datas << [arrs[0], arrs[1], arrs[2], count] //} -//ExcelUtils.write("D:\\数据\\朔州匹配房源1.xlsx", datas, "数量") -//ExcelUtils.modify("D:\\数据\\重庆农商行\\重庆数据统计.xlsx",{d-> +//ExcelUtils.write("D:\\鏁版嵁\\鏈斿窞鍖归厤鎴挎簮1.xlsx", datas, "鏁伴噺") +//ExcelUtils.modify("D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\閲嶅簡鏁版嵁缁熻.xlsx",{d-> // def count = retMap.get(d['A']) // if(count){ // def pre = count.toInteger()*100/d['B'].toString().toDouble().toInteger() @@ -169,12 +169,12 @@ def getDealPrices(def city, coll){ // d['E'] = pre // } // if(d['A'] && !d['H']){ -// def prices = CommonDatautils.queryCityRegionPrices("重庆", d['A'], '2022-01-01') +// def prices = CommonDatautils.queryCityRegionPrices("閲嶅簡", d['A'], '2022-01-01') // if(prices){ // def avg_prices = prices.sum()/prices.size() // d['H'] = avg_prices.toInteger() // } -// def prices = CommonDatautils.queryDistrictPrices("重庆", d['A'], '2022-01-01') +// def prices = CommonDatautils.queryDistrictPrices("閲嶅簡", d['A'], '2022-01-01') // if(prices){ // def avg_prices = prices.sum()/prices.size() // d['H'] = avg_prices.toInteger() @@ -183,20 +183,20 @@ def getDealPrices(def city, coll){ //}) -//ExcelUtils.multiThreadingModify("D:\\数据\\房源\\估值数据统计结果20220715.xlsx",{d-> +//ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\鎴挎簮\\浼板�兼暟鎹粺璁$粨鏋�20220715.xlsx",{d-> // def rets = findHousesByCityAndRoot(d['A'], "sell", 20210701, "anjuke.com") // d['R'] = rets.size() // println d['A'] +" "+rets.size() // //}) -//def countMap = ["深圳":5,"中山":409,"贵阳":372,"南宁":1130,"台州":1325,"杭州":1177,"南昌":1369,"厦门":1370,"绍兴":1363,"徐州":1468,"长沙":1620,"东莞":1673,"郑州":1769,"遵义":1004,"温州":2012,"烟台":2080,"哈尔滨":5459,"湛江":392,"株洲":1068,"武汉":2486,"长春":2857,"岳阳":356,"肇庆":607,"镇江":1043,"芜湖":402,"银川":505,"合肥":2818,"宜昌":786,"淄博":2441,"佛山":3067,"马鞍山":227,"清远":537,"汕头":707,"洛阳":552,"济南":3456,"九江":138,"秦皇岛":1495,"宁波":3772,"乌鲁木齐":2273,"沧州":394,"泉州":4692,"廊坊":1120,"唐山":2626,"石家庄":4914,"漳州":4071,"张家口":357,"沈阳":5000,"青岛":5052,"柳州":2270,"安庆":756,"兰州":5399,"拉萨":784,"昆明":5436,"吉林":2274,"惠州":6206,"嘉兴":6142,"常德":963,"梅州":317,"绵阳":494,"海口":7883,"江门":663,"临沂":1473,"日照":2070,"襄阳":209,"湖州":3667,"平顶山":1501,"泰安":356,"大同":2814,"衡阳":241,"桂林":372,"临汾":372,"锦州":2875,"北海":2507,"赣州":1659,"商丘":644,"德州":639,"渭南":430,"咸阳":301,"聊城":932,"保定":3672,"许昌":266,"邢台":277,"潍坊":3743,"西宁":4002,"宝鸡":204,"邯郸":2361,"安阳":557,"济宁":2194,"龙岩":367,"太原":7524,"南充":568,"盐城":6512,"阜阳":198,"运城":462,"菏泽":320,"晋中":539,"新乡":768,"滁州":1025,"衡水":969,"信阳":1048,"长治":806,"韶关":696,"荆州":361,"汉中":118,"威海":3030,"孝感":984,"东营":874,"宜春":251,"开封":111,"驻马店":549,"湘潭":410,"黄冈":250,"三亚":7481,"上饶":164,"眉山":284,"绥化":851,"宁德":1469,"苏州":8876,"焦作":767,"牡丹江":1009,"齐齐哈尔":566,"枣庄":2636,"河源":167,"宿迁":3428,"遂宁":81,"滨州":3454,"漯河":308,"周口":1670,"茂名":347,"大庆":932,"平凉":210,"南阳":4087,"黄石":99,"鄂尔多斯":452,"营口":1470,"包头":4789,"吉安":442,"金华":13539,"通辽":238,"泸州":183,"乐山":2776,"佳木斯":506,"三门峡":574,"承德":2923,"荆门":64,"曲靖":1521,"忻州":770,"潮州":359,"永州":209,"揭阳":934,"呼伦贝尔":353,"扬州":12477,"宣城":293,"赤峰":2770,"吕梁":2618,"宜宾":322,"濮阳":2389,"宿州":264,"阳江":270,"延安":388,"丹东":885,"怀化":258,"黄山":312,"十堰":2687,"抚州":179,"郴州":4355,"衢州":1714,"陇南":4,"榆林":4694,"延边":1640,"抚顺":258,"丽水":817,"庆阳":2069,"玉溪":254,"玉林":544,"咸宁":1983,"舟山":1970,"达州":990,"亳州":289,"呼和浩特":10185,"张掖":64,"广元":148,"益阳":156,"汕尾":2392,"昌吉":225,"蚌埠":5496,"天水":173,"随州":211,"珠海":13972,"巴彦淖尔":0,"楚雄":95,"乌兰察布":172,"新余":86,"南平":7781,"广安":2129,"景德镇":474,"铁岭":2676,"松原":747,"淮安":13859,"三明":6425,"朝阳":3393,"酒泉":479,"四平":261,"梧州":248,"自贡":2983,"黔东南":205,"大理":1914,"黔南":866,"内江":177,"仙桃":70,"白银":2398,"朔州":1861,"娄底":2601,"六盘水":277,"百色":73,"阳泉":2135,"德阳":9330,"邵阳":2425,"盘锦":4269,"双鸭山":0,"白山":60,"通化":2379,"红河":4013,"鄂州":149,"吴忠":244,"毕节":88,"云浮":10,"伊犁":579,"丽江":331,"贵港":705,"黑河":10,"安康":381,"葫芦岛":6562,"资阳":1320,"鹤壁":1904,"萍乡":173,"锡林郭勒盟":34,"防城港":33,"钦州":2141,"阿克苏":540,"鹤岗":233,"铜川":12,"喀什":68,"巴中":2540,"凉山州":0,"鹰潭":46,"石嘴山":468,"保山":152,"伊春":54,"六安":7649,"定西":75,"鸡西":2384,"临夏":1598,"海西州":0,"商洛":58,"中卫":112,"普洱":302,"湘西":4,"来宾":8,"张家界":21,"西双版纳州":0,"恩施":2215,"攀枝花":87,"晋城":6613,"乌海":361,"七台河":172,"雅安":1152,"黔西南":391,"嘉峪关":37,"淮南":6767,"潜江":0,"辽源":163,"临沧":89,"塔城":1,"克拉玛依":121,"金昌":10,"儋州":33,"海东":106,"大兴安岭":5,"兴安盟":972,"和田":0,"吐鲁番":107,"迪庆州":14,"安顺":1939,"日喀则":32,"文昌":2,"林芝":9,"保亭":0,"陵水":0,"阿勒泰":177,"天门":370,"崇左":560,"莆田":12067,"白城":2422,"铜仁":2209,"河池":1926,"辽阳":4615,"昭通":1995,"哈密":2592,"本溪":4452,"武威":1885,"德宏州":1654,"大连":18125,"成都":17618,"博尔塔拉":2094,"贺州":2168,"池州":6831,"固原":4445,"阜新":6345,"鞍山":15277,"巴音郭楞":7481,"铜陵":9225,"泰州":26770,"南通":26075,"连云港":30835,"西安":28834,"淮北":16917,"北京":35728,"南京":32406,"无锡":48220,"广州":50209,"天津":63311,"上海":160627,"常州":155553,"重庆":221058] -//ExcelUtils.multiThreadingModify("D:\\数据\\房源\\估值数据统计结果20220715.xlsx",{d-> +//def countMap = ["娣卞湷":5,"涓北":409,"璐甸槼":372,"鍗楀畞":1130,"鍙板窞":1325,"鏉窞":1177,"鍗楁槍":1369,"鍘﹂棬":1370,"缁嶅叴":1363,"寰愬窞":1468,"闀挎矙":1620,"涓滆帪":1673,"閮戝窞":1769,"閬典箟":1004,"娓╁窞":2012,"鐑熷彴":2080,"鍝堝皵婊�":5459,"婀涙睙":392,"鏍床":1068,"姝︽眽":2486,"闀挎槬":2857,"宀抽槼":356,"鑲囧簡":607,"闀囨睙":1043,"鑺滄箹":402,"閾跺窛":505,"鍚堣偉":2818,"瀹滄槍":786,"娣勫崥":2441,"浣涘北":3067,"椹瀺灞�":227,"娓呰繙":537,"姹曞ご":707,"娲涢槼":552,"娴庡崡":3456,"涔濇睙":138,"绉︾殗宀�":1495,"瀹佹尝":3772,"涔岄瞾鏈ㄩ綈":2273,"娌у窞":394,"娉夊窞":4692,"寤婂潑":1120,"鍞愬北":2626,"鐭冲搴�":4914,"婕冲窞":4071,"寮犲鍙�":357,"娌堥槼":5000,"闈掑矝":5052,"鏌冲窞":2270,"瀹夊簡":756,"鍏板窞":5399,"鎷夎惃":784,"鏄嗘槑":5436,"鍚夋灄":2274,"鎯犲窞":6206,"鍢夊叴":6142,"甯稿痉":963,"姊呭窞":317,"缁甸槼":494,"娴峰彛":7883,"姹熼棬":663,"涓存矀":1473,"鏃ョ収":2070,"瑗勯槼":209,"婀栧窞":3667,"骞抽《灞�":1501,"娉板畨":356,"澶у悓":2814,"琛¢槼":241,"妗傛灄":372,"涓存本":372,"閿﹀窞":2875,"鍖楁捣":2507,"璧e窞":1659,"鍟嗕笜":644,"寰峰窞":639,"娓崡":430,"鍜搁槼":301,"鑱婂煄":932,"淇濆畾":3672,"璁告槍":266,"閭㈠彴":277,"娼嶅潑":3743,"瑗垮畞":4002,"瀹濋浮":204,"閭兏":2361,"瀹夐槼":557,"娴庡畞":2194,"榫欏博":367,"澶師":7524,"鍗楀厖":568,"鐩愬煄":6512,"闃滈槼":198,"杩愬煄":462,"鑿忔辰":320,"鏅嬩腑":539,"鏂颁埂":768,"婊佸窞":1025,"琛℃按":969,"淇¢槼":1048,"闀挎不":806,"闊跺叧":696,"鑽嗗窞":361,"姹変腑":118,"濞佹捣":3030,"瀛濇劅":984,"涓滆惀":874,"瀹滄槬":251,"寮�灏�":111,"椹婚┈搴�":549,"婀樻江":410,"榛勫唸":250,"涓変簹":7481,"涓婇ザ":164,"鐪夊北":284,"缁ュ寲":851,"瀹佸痉":1469,"鑻忓窞":8876,"鐒︿綔":767,"鐗′腹姹�":1009,"榻愰綈鍝堝皵":566,"鏋e簞":2636,"娌虫簮":167,"瀹胯縼":3428,"閬傚畞":81,"婊ㄥ窞":3454,"婕渤":308,"鍛ㄥ彛":1670,"鑼傚悕":347,"澶у簡":932,"骞冲噳":210,"鍗楅槼":4087,"榛勭煶":99,"閯傚皵澶氭柉":452,"钀ュ彛":1470,"鍖呭ご":4789,"鍚夊畨":442,"閲戝崕":13539,"閫氳窘":238,"娉稿窞":183,"涔愬北":2776,"浣虫湪鏂�":506,"涓夐棬宄�":574,"鎵垮痉":2923,"鑽嗛棬":64,"鏇查潠":1521,"蹇诲窞":770,"娼窞":359,"姘稿窞":209,"鎻槼":934,"鍛间鸡璐濆皵":353,"鎵窞":12477,"瀹e煄":293,"璧ゅ嘲":2770,"鍚曟":2618,"瀹滃":322,"婵槼":2389,"瀹垮窞":264,"闃虫睙":270,"寤跺畨":388,"涓逛笢":885,"鎬�鍖�":258,"榛勫北":312,"鍗佸牥":2687,"鎶氬窞":179,"閮村窞":4355,"琛㈠窞":1714,"闄囧崡":4,"姒嗘灄":4694,"寤惰竟":1640,"鎶氶『":258,"涓芥按":817,"搴嗛槼":2069,"鐜夋邯":254,"鐜夋灄":544,"鍜稿畞":1983,"鑸熷北":1970,"杈惧窞":990,"浜冲窞":289,"鍛煎拰娴╃壒":10185,"寮犳帠":64,"骞垮厓":148,"鐩婇槼":156,"姹曞熬":2392,"鏄屽悏":225,"铓屽煚":5496,"澶╂按":173,"闅忓窞":211,"鐝犳捣":13972,"宸村溅娣栧皵":0,"妤氶泟":95,"涔屽叞瀵熷竷":172,"鏂颁綑":86,"鍗楀钩":7781,"骞垮畨":2129,"鏅痉闀�":474,"閾佸箔":2676,"鏉惧師":747,"娣畨":13859,"涓夋槑":6425,"鏈濋槼":3393,"閰掓硥":479,"鍥涘钩":261,"姊у窞":248,"鑷础":2983,"榛斾笢鍗�":205,"澶х悊":1914,"榛斿崡":866,"鍐呮睙":177,"浠欐":70,"鐧介摱":2398,"鏈斿窞":1861,"濞勫簳":2601,"鍏洏姘�":277,"鐧捐壊":73,"闃虫硥":2135,"寰烽槼":9330,"閭甸槼":2425,"鐩橀敠":4269,"鍙岄腑灞�":0,"鐧藉北":60,"閫氬寲":2379,"绾㈡渤":4013,"閯傚窞":149,"鍚村繝":244,"姣曡妭":88,"浜戞诞":10,"浼婄妬":579,"涓芥睙":331,"璐垫腐":705,"榛戞渤":10,"瀹夊悍":381,"钁姦宀�":6562,"璧勯槼":1320,"楣ゅ":1904,"钀嶄埂":173,"閿℃灄閮嫆鐩�":34,"闃插煄娓�":33,"閽﹀窞":2141,"闃垮厠鑻�":540,"楣ゅ矖":233,"閾滃窛":12,"鍠�浠�":68,"宸翠腑":2540,"鍑夊北宸�":0,"楣版江":46,"鐭冲槾灞�":468,"淇濆北":152,"浼婃槬":54,"鍏畨":7649,"瀹氳タ":75,"楦¤タ":2384,"涓村":1598,"娴疯タ宸�":0,"鍟嗘礇":58,"涓崼":112,"鏅幢":302,"婀樿タ":4,"鏉ュ":8,"寮犲鐣�":21,"瑗垮弻鐗堢撼宸�":0,"鎭╂柦":2215,"鏀�鏋濊姳":87,"鏅嬪煄":6613,"涔屾捣":361,"涓冨彴娌�":172,"闆呭畨":1152,"榛旇タ鍗�":391,"鍢夊唱鍏�":37,"娣崡":6767,"娼滄睙":0,"杈芥簮":163,"涓存钵":89,"濉斿煄":1,"鍏嬫媺鐜涗緷":121,"閲戞槍":10,"鍎嬪窞":33,"娴蜂笢":106,"澶у叴瀹夊箔":5,"鍏村畨鐩�":972,"鍜岀敯":0,"鍚愰瞾鐣�":107,"杩簡宸�":14,"瀹夐『":1939,"鏃ュ杸鍒�":32,"鏂囨槍":2,"鏋楄姖":9,"淇濅涵":0,"闄垫按":0,"闃垮嫆娉�":177,"澶╅棬":370,"宕囧乏":560,"鑾嗙敯":12067,"鐧藉煄":2422,"閾滀粊":2209,"娌虫睜":1926,"杈介槼":4615,"鏄��":1995,"鍝堝瘑":2592,"鏈邯":4452,"姝﹀▉":1885,"寰峰畯宸�":1654,"澶ц繛":18125,"鎴愰兘":17618,"鍗氬皵濉旀媺":2094,"璐哄窞":2168,"姹犲窞":6831,"鍥哄師":4445,"闃滄柊":6345,"闉嶅北":15277,"宸撮煶閮":7481,"閾滈櫟":9225,"娉板窞":26770,"鍗楅��":26075,"杩炰簯娓�":30835,"瑗垮畨":28834,"娣寳":16917,"鍖椾含":35728,"鍗椾含":32406,"鏃犻敗":48220,"骞垮窞":50209,"澶╂触":63311,"涓婃捣":160627,"甯稿窞":155553,"閲嶅簡":221058] +//ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\鎴挎簮\\浼板�兼暟鎹粺璁$粨鏋�20220715.xlsx",{d-> // def count = countMap.get(d['A']) // d['R'] = count //}) // -//println "完成" +//println "瀹屾垚" def findThirdParty(city, region, name, coll){ @@ -233,8 +233,8 @@ def findHouses(def city, def region, def cat, def startDate, def name, def alias } - if(name.contains("弄小区")){ - def newName = name.replace("弄小区","弄") + if(name.contains("寮勫皬鍖�")){ + def newName = name.replace("寮勫皬鍖�","寮�") if(!alias.contains(newName)){ alias << newName } @@ -291,7 +291,7 @@ def findHousesByCityAndRoot(def city, def cat, def startDate, def root){ //def rows = [] -//rows << ["城市","小区量", "别名量", "地址别名量"] +//rows << ["鍩庡競","灏忓尯閲�", "鍒悕閲�", "鍦板潃鍒悕閲�"] //for(def c : citys){ // def districts = CommonDatautils.findAllDistrictByCity(c,"district",["city","region","name","alias", "addr_alias"]) // def alias_count = 0 @@ -306,10 +306,10 @@ def findHousesByCityAndRoot(def city, def cat, def startDate, def root){ // } // rows << [c, districts.size(), alias_count, addr_alias_count] //} -//ExcelUtils.write("D:\\数据\\江苏\\新疆数据统计.xlsx", rows, "结果") +//ExcelUtils.write("D:\\鏁版嵁\\姹熻嫃\\鏂扮枂鏁版嵁缁熻.xlsx", rows, "缁撴灉") -//区域级统计 -//def city = "合肥" +//鍖哄煙绾х粺璁� +//def city = "鍚堣偉" //def regions = CommonDatautils.getCityRegions(city) //def rows = [] //for(def region : regions){ @@ -326,10 +326,10 @@ def findHousesByCityAndRoot(def city, def cat, def startDate, def root){ // } // rows << [region, districts.size(), alias_count, addr_alias_count] //} -//ExcelUtils.write("D:\\数据\\新安银行\\新安银行数据统计.xlsx", rows, "结果") +//ExcelUtils.write("D:\\鏁版嵁\\鏂板畨閾惰\\鏂板畨閾惰鏁版嵁缁熻.xlsx", rows, "缁撴灉") -ExcelUtils.multiThreadingModify("D:\\数据\\临时\\区县楼盘量统计.xlsx",{d-> +ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\涓存椂\\鍖哄幙妤肩洏閲忕粺璁�.xlsx",{d-> if(d['C'] && !d['I']){ def city = RegionData.formatCity(d['C']) if(!city){ @@ -354,7 +354,7 @@ ExcelUtils.multiThreadingModify("D:\\ // q.put("district","") // def dbo = mca_administrative_division_coll.findOne(q) // if(!dbo){ -// q.put("city", "省直辖县级行政区划") +// q.put("city", "鐪佺洿杈栧幙绾ц鏀垮尯鍒�") // q.put("district", d['B']) // dbo = mca_administrative_division_coll.findOne(q) // } @@ -363,7 +363,7 @@ ExcelUtils.multiThreadingModify("D:\\ // } }) -//def citys = ["北京","上海","重庆","天津","石家庄","唐山","秦皇岛","邯郸","邢台","保定","张家口","承德","沧州","廊坊","衡水","太原","大同","阳泉","长治","晋城","朔州","晋中","运城","忻州","临汾","吕梁","呼和浩特","包头","乌海","赤峰","通辽","鄂尔多斯","呼伦贝尔","巴彦淖尔","乌兰察布","兴安盟","锡林郭勒盟","阿拉善盟","沈阳","大连","鞍山","抚顺","本溪","丹东","锦州","营口","阜新","辽阳","盘锦","铁岭","朝阳","葫芦岛","长春","吉林","四平","辽源","通化","白山","松原","白城","延边","哈尔滨","齐齐哈尔","鸡西","鹤岗","双鸭山","大庆","伊春","佳木斯","七台河","牡丹江","黑河","绥化","大兴安岭","南京","无锡","徐州","常州","苏州","南通","连云港","淮安","盐城","扬州","镇江","泰州","宿迁","杭州","宁波","温州","嘉兴","湖州","绍兴","金华","衢州","舟山","台州","丽水","合肥","芜湖","蚌埠","淮南","马鞍山","淮北","铜陵","安庆","黄山","滁州","阜阳","宿州","六安","亳州","池州","宣城","福州","厦门","莆田","三明","泉州","漳州","南平","龙岩","宁德","南昌","景德镇","萍乡","九江","新余","鹰潭","赣州","吉安","宜春","抚州","上饶","济南","青岛","淄博","枣庄","东营","烟台","潍坊","济宁","泰安","威海","日照","临沂","德州","聊城","滨州","菏泽","郑州","开封","洛阳","平顶山","安阳","鹤壁","新乡","焦作","濮阳","许昌","漯河","三门峡","南阳","商丘","信阳","周口","驻马店","武汉","黄石","十堰","宜昌","襄阳","鄂州","荆门","孝感","荆州","黄冈","咸宁","随州","恩施","长沙","株洲","湘潭","衡阳","邵阳","岳阳","常德","张家界","益阳","郴州","永州","怀化","娄底","湘西","广州","韶关","深圳","珠海","汕头","佛山","江门","湛江","茂名","肇庆","惠州","梅州","汕尾","河源","阳江","清远","东莞","中山","潮州","揭阳","云浮","南宁","柳州","桂林","梧州","北海","防城港","钦州","贵港","玉林","百色","贺州","河池","来宾","崇左","海口","三亚","三沙","儋州","成都","自贡","攀枝花","泸州","德阳","绵阳","广元","遂宁","内江","乐山","南充","眉山","宜宾","广安","达州","雅安","巴中","资阳","阿坝州","甘孜州","凉山州","贵阳","六盘水","遵义","安顺","毕节","铜仁","黔西南","黔东南","黔南","昆明","曲靖","玉溪","保山","昭通","丽江","普洱","临沧","楚雄","红河","文山州","西双版纳州","大理","德宏州","怒江州","迪庆州","拉萨","日喀则","昌都","林芝","山南","那曲","阿里","西安","铜川","宝鸡","咸阳","渭南","延安","汉中","榆林","安康","商洛","兰州","嘉峪关","金昌","白银","天水","武威","张掖","平凉","酒泉","庆阳","定西","陇南","临夏","甘南","西宁","海东","海北州","黄南州","海南州","果洛州","玉树州","海西州","银川","石嘴山","吴忠","固原","中卫","乌鲁木齐","克拉玛依","吐鲁番","哈密","昌吉","博尔塔拉","巴音郭楞","阿克苏","克孜勒苏","喀什","和田","伊犁","塔城","阿勒泰","济源","仙桃","潜江","天门","神农架","五指山","琼海","文昌","万宁","东方","定安","屯昌","澄迈","临高","白沙","昌江","乐东","陵水","保亭","琼中","石河子","阿拉尔","图木舒克","五家渠","北屯","铁门关","双河","可克达拉","昆玉"] +//def citys = ["鍖椾含","涓婃捣","閲嶅簡","澶╂触","鐭冲搴�","鍞愬北","绉︾殗宀�","閭兏","閭㈠彴","淇濆畾","寮犲鍙�","鎵垮痉","娌у窞","寤婂潑","琛℃按","澶師","澶у悓","闃虫硥","闀挎不","鏅嬪煄","鏈斿窞","鏅嬩腑","杩愬煄","蹇诲窞","涓存本","鍚曟","鍛煎拰娴╃壒","鍖呭ご","涔屾捣","璧ゅ嘲","閫氳窘","閯傚皵澶氭柉","鍛间鸡璐濆皵","宸村溅娣栧皵","涔屽叞瀵熷竷","鍏村畨鐩�","閿℃灄閮嫆鐩�","闃挎媺鍠勭洘","娌堥槼","澶ц繛","闉嶅北","鎶氶『","鏈邯","涓逛笢","閿﹀窞","钀ュ彛","闃滄柊","杈介槼","鐩橀敠","閾佸箔","鏈濋槼","钁姦宀�","闀挎槬","鍚夋灄","鍥涘钩","杈芥簮","閫氬寲","鐧藉北","鏉惧師","鐧藉煄","寤惰竟","鍝堝皵婊�","榻愰綈鍝堝皵","楦¤タ","楣ゅ矖","鍙岄腑灞�","澶у簡","浼婃槬","浣虫湪鏂�","涓冨彴娌�","鐗′腹姹�","榛戞渤","缁ュ寲","澶у叴瀹夊箔","鍗椾含","鏃犻敗","寰愬窞","甯稿窞","鑻忓窞","鍗楅��","杩炰簯娓�","娣畨","鐩愬煄","鎵窞","闀囨睙","娉板窞","瀹胯縼","鏉窞","瀹佹尝","娓╁窞","鍢夊叴","婀栧窞","缁嶅叴","閲戝崕","琛㈠窞","鑸熷北","鍙板窞","涓芥按","鍚堣偉","鑺滄箹","铓屽煚","娣崡","椹瀺灞�","娣寳","閾滈櫟","瀹夊簡","榛勫北","婊佸窞","闃滈槼","瀹垮窞","鍏畨","浜冲窞","姹犲窞","瀹e煄","绂忓窞","鍘﹂棬","鑾嗙敯","涓夋槑","娉夊窞","婕冲窞","鍗楀钩","榫欏博","瀹佸痉","鍗楁槍","鏅痉闀�","钀嶄埂","涔濇睙","鏂颁綑","楣版江","璧e窞","鍚夊畨","瀹滄槬","鎶氬窞","涓婇ザ","娴庡崡","闈掑矝","娣勫崥","鏋e簞","涓滆惀","鐑熷彴","娼嶅潑","娴庡畞","娉板畨","濞佹捣","鏃ョ収","涓存矀","寰峰窞","鑱婂煄","婊ㄥ窞","鑿忔辰","閮戝窞","寮�灏�","娲涢槼","骞抽《灞�","瀹夐槼","楣ゅ","鏂颁埂","鐒︿綔","婵槼","璁告槍","婕渤","涓夐棬宄�","鍗楅槼","鍟嗕笜","淇¢槼","鍛ㄥ彛","椹婚┈搴�","姝︽眽","榛勭煶","鍗佸牥","瀹滄槍","瑗勯槼","閯傚窞","鑽嗛棬","瀛濇劅","鑽嗗窞","榛勫唸","鍜稿畞","闅忓窞","鎭╂柦","闀挎矙","鏍床","婀樻江","琛¢槼","閭甸槼","宀抽槼","甯稿痉","寮犲鐣�","鐩婇槼","閮村窞","姘稿窞","鎬�鍖�","濞勫簳","婀樿タ","骞垮窞","闊跺叧","娣卞湷","鐝犳捣","姹曞ご","浣涘北","姹熼棬","婀涙睙","鑼傚悕","鑲囧簡","鎯犲窞","姊呭窞","姹曞熬","娌虫簮","闃虫睙","娓呰繙","涓滆帪","涓北","娼窞","鎻槼","浜戞诞","鍗楀畞","鏌冲窞","妗傛灄","姊у窞","鍖楁捣","闃插煄娓�","閽﹀窞","璐垫腐","鐜夋灄","鐧捐壊","璐哄窞","娌虫睜","鏉ュ","宕囧乏","娴峰彛","涓変簹","涓夋矙","鍎嬪窞","鎴愰兘","鑷础","鏀�鏋濊姳","娉稿窞","寰烽槼","缁甸槼","骞垮厓","閬傚畞","鍐呮睙","涔愬北","鍗楀厖","鐪夊北","瀹滃","骞垮畨","杈惧窞","闆呭畨","宸翠腑","璧勯槼","闃垮潩宸�","鐢樺瓬宸�","鍑夊北宸�","璐甸槼","鍏洏姘�","閬典箟","瀹夐『","姣曡妭","閾滀粊","榛旇タ鍗�","榛斾笢鍗�","榛斿崡","鏄嗘槑","鏇查潠","鐜夋邯","淇濆北","鏄��","涓芥睙","鏅幢","涓存钵","妤氶泟","绾㈡渤","鏂囧北宸�","瑗垮弻鐗堢撼宸�","澶х悊","寰峰畯宸�","鎬掓睙宸�","杩簡宸�","鎷夎惃","鏃ュ杸鍒�","鏄岄兘","鏋楄姖","灞卞崡","閭f洸","闃块噷","瑗垮畨","閾滃窛","瀹濋浮","鍜搁槼","娓崡","寤跺畨","姹変腑","姒嗘灄","瀹夊悍","鍟嗘礇","鍏板窞","鍢夊唱鍏�","閲戞槍","鐧介摱","澶╂按","姝﹀▉","寮犳帠","骞冲噳","閰掓硥","搴嗛槼","瀹氳タ","闄囧崡","涓村","鐢樺崡","瑗垮畞","娴蜂笢","娴峰寳宸�","榛勫崡宸�","娴峰崡宸�","鏋滄礇宸�","鐜夋爲宸�","娴疯タ宸�","閾跺窛","鐭冲槾灞�","鍚村繝","鍥哄師","涓崼","涔岄瞾鏈ㄩ綈","鍏嬫媺鐜涗緷","鍚愰瞾鐣�","鍝堝瘑","鏄屽悏","鍗氬皵濉旀媺","宸撮煶閮","闃垮厠鑻�","鍏嬪瓬鍕掕嫃","鍠�浠�","鍜岀敯","浼婄妬","濉斿煄","闃垮嫆娉�","娴庢簮","浠欐","娼滄睙","澶╅棬","绁炲啘鏋�","浜旀寚灞�","鐞兼捣","鏂囨槍","涓囧畞","涓滄柟","瀹氬畨","灞槍","婢勮繄","涓撮珮","鐧芥矙","鏄屾睙","涔愪笢","闄垫按","淇濅涵","鐞间腑","鐭虫渤瀛�","闃挎媺灏�","鍥炬湪鑸掑厠","浜斿娓�","鍖楀悲","閾侀棬鍏�","鍙屾渤","鍙厠杈炬媺","鏄嗙帀"] // //def fjwCitys = CommonDatautils.findAllCity() //for(def fjw_city : fjwCitys){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/coresite/AddUrlToBaiduSpider.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/coresite/AddUrlToBaiduSpider.groovy index 2b03fd2ae..ffe4a2a26 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/coresite/AddUrlToBaiduSpider.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/coresite/AddUrlToBaiduSpider.groovy @@ -4,24 +4,24 @@ import java.net.HttpURLConnection import java.net.URL import java.io.OutputStream -// 目标服务器的URL +// 鐩爣鏈嶅姟鍣ㄧ殑URL def targetUrlString = "http://data.zz.baidu.com/urls?site=sh.fangjia.com&token=UaKTemkcQ6I4YvSA" -// 需要POST的URL数据 +// 闇�瑕丳OST鐨刄RL鏁版嵁 def postData = "https://sh.fangjia.com/zoushi?cityName=%E4%B8%8A%E6%B5%B7&keyword=%E5%A4%A9%E5%B1%B1%E6%96%B0%E8%8B%91" -// 创建URL对象 +// 鍒涘缓URL瀵硅薄 URL url = new URL(targetUrlString) -// 打开连接 +// 鎵撳紑杩炴帴 HttpURLConnection connection = (HttpURLConnection) url.openConnection() -connection.setDoOutput(true) // 表明我们将发送POST请求的输出数据 -connection.setRequestMethod("POST") // 设置请求方法为POST -connection.setRequestProperty("User-Agent", "curl/7.12.1") // 设置User-Agent,尽管这在实际应用中可能并非必需 -connection.setRequestProperty("Content-Type", "text/plain") // 设置内容类型,因为我们将发送纯文本数据 -connection.setRequestProperty("Content-Length", Integer.toString(postData.getBytes().length)) // 设置内容长度 +connection.setDoOutput(true) // 琛ㄦ槑鎴戜滑灏嗗彂閫丳OST璇锋眰鐨勮緭鍑烘暟鎹� +connection.setRequestMethod("POST") // 璁剧疆璇锋眰鏂规硶涓篜OST +connection.setRequestProperty("User-Agent", "curl/7.12.1") // 璁剧疆User-Agent锛屽敖绠¤繖鍦ㄥ疄闄呭簲鐢ㄤ腑鍙兘骞堕潪蹇呴渶 +connection.setRequestProperty("Content-Type", "text/plain") // 璁剧疆鍐呭绫诲瀷锛屽洜涓烘垜浠皢鍙戦�佺函鏂囨湰鏁版嵁 +connection.setRequestProperty("Content-Length", Integer.toString(postData.getBytes().length)) // 璁剧疆鍐呭闀垮害 -// 发送POST数据 +// 鍙戦�丳OST鏁版嵁 //try (OutputStream os = connection.getOutputStream()) { // byte[] input = postData.getBytes("utf-8") // os.write(input, 0, input.length) @@ -31,11 +31,11 @@ outputStream.write(postData.getBytes()); outputStream.flush(); outputStream.close(); -// 获取响应码 +// 鑾峰彇鍝嶅簲鐮� int responseCode = connection.getResponseCode() println "POST Response Code :: $responseCode" -// 可选:读取响应内容 +// 鍙�夛細璇诲彇鍝嶅簲鍐呭 def reader = new BufferedReader(new InputStreamReader(connection.getInputStream(), "utf-8")) StringBuilder response = new StringBuilder() String responseLine @@ -44,5 +44,5 @@ while ((responseLine = reader.readLine()) != null) { } println "Response Body :: ${response.toString()}" -// 关闭连接 +// 鍏抽棴杩炴帴 connection.disconnect() \ No newline at end of file diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/crawl/AnjukeAbuyunCrawl.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/crawl/AnjukeAbuyunCrawl.groovy index 97dc61875..80d6d7c2f 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/crawl/AnjukeAbuyunCrawl.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/crawl/AnjukeAbuyunCrawl.groovy @@ -26,7 +26,7 @@ class AnjukeAbuyunCrawl { url ="https://fz.anjuke.com/sale/p${i}/?from=navigation" def doc = getABuYunDocument(url); def eles = JQueryUtils.select(".list-main .list-left .list .property a", doc) - println "页数:"+i+" 记录数:"+eles!=null?eles.size():0 + println "椤垫暟锛�"+i+" 璁板綍鏁帮細"+eles!=null?eles.size():0 if(eles){ parser(eles) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/crawl/AnjukeAppCrawl.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/crawl/AnjukeAppCrawl.groovy index b97ec6bb1..95fb133a2 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/crawl/AnjukeAppCrawl.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/crawl/AnjukeAppCrawl.groovy @@ -32,7 +32,7 @@ class AnjukeAppCrawl { static def PREFIX_UNICODE = "\\u"; public static final SHORT_DATE = Utils.getLastMonth(); def static final DBCollection thirdPartyColl = CrawalDBUtil.getThirdPartyCol(); - public static def SOURCE = "安居客"; + public static def SOURCE = "瀹夊眳瀹�"; DBCollection detail = MongoUtils.getCollectionByAuth20190102("fangjia_craw", "app_anjuke_detail") public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(50) @@ -63,7 +63,7 @@ class AnjukeAppCrawl { } def statCount(){ - ExcelUtils.multiThreadingModify("D:\\数据\\anjuke\\cur_city_count.xlsx",{d-> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\anjuke\\cur_city_count.xlsx",{d-> def city = d['B'] if(!d['D']){ def q = new BasicDBObject() @@ -78,7 +78,7 @@ class AnjukeAppCrawl { def exportFzDist(){ def q = new BasicDBObject() - q.put("city","福州") + q.put("city","绂忓窞") def dbcursor = detail.find(q).batchSize(5000) def index = 0 def rets = [] @@ -88,10 +88,10 @@ class AnjukeAppCrawl { if(d.propInfo.saleNum){ count = d.propInfo.saleNum.toInteger() } - rets << [d.base.cityName, d.base.areaName, d.base.name, d._id.toString(),d.base.id, count, "fz","安居客"] + rets << [d.base.cityName, d.base.areaName, d.base.name, d._id.toString(),d.base.id, count, "fz","瀹夊眳瀹�"] } - ExcelUtils.write("D:\\数据\\福州\\福州小区.xlsx", rets, "数据") + ExcelUtils.write("D:\\鏁版嵁\\绂忓窞\\绂忓窞灏忓尯.xlsx", rets, "鏁版嵁") } def selectNoSave(){ @@ -102,7 +102,7 @@ class AnjukeAppCrawl { for(def d : dbcursor){ index++ if(!esData.contains(d.jumpAction)){ - println "没保存 "+ d.jumpAction + println "娌′繚瀛� "+ d.jumpAction } if(index%100000==0){ println index @@ -113,7 +113,7 @@ class AnjukeAppCrawl { def findAllEsData(){ def urls = new HashSet() - ElasticUtils.executeSqlQuery("select url from community where source='安居客移动端'", { + ElasticUtils.executeSqlQuery("select url from community where source='瀹夊眳瀹㈢Щ鍔ㄧ'", { urls << it.url }) return urls; @@ -140,7 +140,7 @@ class AnjukeAppCrawl { } def autoRun(){ - def rets = ExcelUtils.read("d:\\数据\\安居客城市区域编码.xlsx") + def rets = ExcelUtils.read("d:\\鏁版嵁\\瀹夊眳瀹㈠煄甯傚尯鍩熺紪鐮�.xlsx") def total= rets.size() def index =0 for(def d : rets){ @@ -152,8 +152,8 @@ class AnjukeAppCrawl { } def saveToEs(){ - def rets = ExcelUtils.read("d:\\数据\\安居客城市区域编码.xlsx",2,0) - def citys = ["福州"] + def rets = ExcelUtils.read("d:\\鏁版嵁\\瀹夊眳瀹㈠煄甯傚尯鍩熺紪鐮�.xlsx",2,0) + def citys = ["绂忓窞"] for(def d : rets){ if(citys.contains(d['A'])){ def lists = getAllAppDatas(d['A']) @@ -222,7 +222,7 @@ class AnjukeAppCrawl { map.rentNum = d.propInfo.rentNum?d.propInfo.rentNum.toInteger():null map.saleNum = d.propInfo.saleNum?d.propInfo.saleNum.toInteger():null - map.source = "安居客移动端" + map.source = "瀹夊眳瀹㈢Щ鍔ㄧ" map.url = d.jumpAction map.waterPowerSupply = extend.waterPowerSupply list << map @@ -241,7 +241,7 @@ class AnjukeAppCrawl { driver.manage().deleteAllCookies() def cityMap = getCityMap(url, driver) def rets = [] - rets << ["城市","城市id","区域","区域id"] + rets << ["鍩庡競","鍩庡競id","鍖哄煙","鍖哄煙id"] def index = 0 cityMap.each{ch_city,m-> index++ @@ -252,7 +252,7 @@ class AnjukeAppCrawl { rets << [ch_city, m.city_id.toInteger(),v.info.name, v.info.value_str.toInteger()] } } - ExcelUtils.write("d:\\数据\\安居客城市区域编码.xlsx", rets, "数据") + ExcelUtils.write("d:\\鏁版嵁\\瀹夊眳瀹㈠煄甯傚尯鍩熺紪鐮�.xlsx", rets, "鏁版嵁") } def run2(){ @@ -280,7 +280,7 @@ class AnjukeAppCrawl { if(start>0 && end>0 && end > start){ def str = doc.toString().substring(start, end).replace("").replace("PAGE_DATA= ","").replace("","") def jsonObj = JSONObject.fromObject(dataStr) - def str = DataHandleUtils.findMatchPattern(doc.text(),"下辖.*[街道|镇]、?和?") + def str = DataHandleUtils.findMatchPattern(doc.text(),"涓嬭緰.*[琛楅亾|闀嘳銆�?鍜�?") def towns = [] if(jsonObj && jsonObj.catalog){ def catalogs = jsonObj.catalog def index = null for(def log : catalogs){ def curIndex = log.index - if(log.title=="行政区划"){ + if(log.title=="琛屾斂鍖哄垝"){ index = log.index } if(index && curIndex.toString().startsWith(index+"-")){ @@ -89,7 +89,7 @@ class BaiduBaikeTown { } - def str2 = DataHandleUtils.findMatchPattern(doc.text(),"开发区辖.*[,|。]") + def str2 = DataHandleUtils.findMatchPattern(doc.text(),"寮�鍙戝尯杈�.*[锛寍銆俔") map.town_str2 = str2 return map } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/BusinessQuarterProcess.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/BusinessQuarterProcess.groovy index 93a7dda3f..c5ff35717 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/BusinessQuarterProcess.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/BusinessQuarterProcess.groovy @@ -49,7 +49,7 @@ class BusinessQuarterProcess { } def addRegion(){ - def list = CommonDatautils.queryRangeByCat("区域") + def list = CommonDatautils.queryRangeByCat("鍖哄煙") println list.size() def dbcursor = bk_business_coll.find(new BasicDBObject("_id", new ObjectId("67a318893b75f388c80979f2"))) for(def d : dbcursor){ @@ -115,7 +115,7 @@ class BusinessQuarterProcess { row.put("province", data.province) row.put("city", data.city) }else{ - println d.city + " 没找到简称" + println d.city + " 娌℃壘鍒扮畝绉�" } @@ -129,7 +129,7 @@ class BusinessQuarterProcess { if(border){ def arrs = border.split(";") if(border.contains("|")){ - println d._id.toString()+" 可能含多个围栏" + println d._id.toString()+" 鍙兘鍚涓洿鏍�" } for(def i=0;i - def res = FangjiaClientUtils.aiResult("河北省哪些乡镇街道完全隶属于"+d['E']+",有则以逗号隔开方式输出,无则输出无,其它信息不输出") + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\鏁版嵁寤鸿\\寮�鍙戝尯\\娌冲寳鐪佸紑鍙戝尯-ai缁撴灉.xlsx", { d -> + def res = FangjiaClientUtils.aiResult("娌冲寳鐪佸摢浜涗埂闀囪閬撳畬鍏ㄩ毝灞炰簬"+d['E']+"锛屾湁鍒欎互閫楀彿闅斿紑鏂瑰紡杈撳嚭锛屾棤鍒欒緭鍑烘棤锛屽叾瀹冧俊鎭笉杈撳嚭") def message = res.data.replaceAll("\n", "") d['F'] = res.code d['G'] = message println d['E'] +" "+res.code + " "+message -// def q = new BasicDBObject("name", d['E']).append("type","乡镇街道") +// def q = new BasicDBObject("name", d['E']).append("type","涔¢晣琛楅亾") // def dbcursor = DEV_MAPPING_CONN.find(q) // if(dbcursor.count()>0){ // def list = [] @@ -115,7 +115,7 @@ class DevProcess { def parseCityAndDist(){ - ExcelUtils.multiThreadingModify("D:\\数据\\数据建设\\等级开发区.xlsx",{d-> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\鏁版嵁寤鸿\\绛夌骇寮�鍙戝尯.xlsx",{d-> if(!d['J']){ // def obj = getMapInfo(null, d['A']+d['C']) // if(obj){ @@ -155,7 +155,7 @@ class DevProcess { def str = obj.location def level = obj.level -// if(str && ["门牌号","单元号","道路","道路交叉路口","热点商圈","村庄","兴趣点","门址","住宅区"].contains(level)){ +// if(str && ["闂ㄧ墝鍙�","鍗曞厓鍙�","閬撹矾","閬撹矾浜ゅ弶璺彛","鐑偣鍟嗗湀","鏉戝簞","鍏磋叮鐐�","闂ㄥ潃","浣忓畢鍖�"].contains(level)){ def arrs = str.split(",") return ["lng":arrs[0], "lat":arrs[1],"province":obj.province,"city":obj.city, "district":obj.district, "formatted_address":obj.formatted_address] // }else{ @@ -166,7 +166,7 @@ class DevProcess { } } def run(){ - def rets = ExcelUtils.read("D:\\数据\\开发区\\附件全国农村创业园区(基地)目录2021.xls") + def rets = ExcelUtils.read("D:\\鏁版嵁\\寮�鍙戝尯\\闄勪欢鍏ㄥ浗鍐滄潙鍒涗笟鍥尯锛堝熀鍦帮級鐩綍2021.xls") def index = 0 def mcaDistMap = CommonDatautils.queryDistNameCity() @@ -185,10 +185,10 @@ class DevProcess { udata.address = r['E'] udata.create_time = new Date() udata.industry = r['F'] - udata.level = "国家级" + udata.level = "鍥藉绾�" udata.name = r['D'] udata.province = r['B'] - udata.type = "农村创业园区" + udata.type = "鍐滄潙鍒涗笟鍥尯" if(jsonObject) { if (jsonObject.get("city") && jsonObject.get("city") != "null") { @@ -221,7 +221,7 @@ class DevProcess { if(!obj){ development_zone_CONN.save(udata) }else{ - println udata.name +" 已存在" + println udata.name +" 宸插瓨鍦�" } } } @@ -232,16 +232,16 @@ class DevProcess { if(!obj){ obj = findDevByAlias(name) if(obj){ - obj.match_way = "别名" + obj.match_way = "鍒悕" } }else{ - obj.match_way = "相同" + obj.match_way = "鐩稿悓" } return obj } def findDebBySimlar(def devs, def name, def city){ - name = name.replace("经济开发区", "经济技术开发区").replace("工业园区", "工业园") + name = name.replace("缁忔祹寮�鍙戝尯", "缁忔祹鎶�鏈紑鍙戝尯").replace("宸ヤ笟鍥尯", "宸ヤ笟鍥�") def last = null for(def d : devs){ def alias1 = null @@ -256,7 +256,7 @@ class DevProcess { if(alias1){ try { for(def n : alias1){ - n = n.replace("经济开发区", "经济技术开发区").replace("工业园区", "工业园") + n = n.replace("缁忔祹寮�鍙戝尯", "缁忔祹鎶�鏈紑鍙戝尯").replace("宸ヤ笟鍥尯", "宸ヤ笟鍥�") if(d.city && d.city.contains(city) && (n.contains(name) || name.contains(n))){ last = d break @@ -288,16 +288,16 @@ class DevProcess { def findDevBySimlar(name){ def q = new BasicDBObject() - q.put('name',new BasicDBObject('$regex', Pattern.compile('^.*'+name+'.*$', Pattern.CASE_INSENSITIVE))) //名称 模糊查询 + q.put('name',new BasicDBObject('$regex', Pattern.compile('^.*'+name+'.*$', Pattern.CASE_INSENSITIVE))) //鍚嶇О 妯$硦鏌ヨ return development_zone_CONN.findOne(q) } def findDevByPark(prov, city, name){ def q = new BasicDBObject() - q.put('province',new BasicDBObject('$regex', Pattern.compile('^.*'+prov+'.*$', Pattern.CASE_INSENSITIVE))) //名称 模糊查询 - q.put('city',new BasicDBObject('$regex', Pattern.compile('^.*'+city+'.*$', Pattern.CASE_INSENSITIVE))) //名称 模糊查询 - q.put('park',new BasicDBObject('$regex', Pattern.compile('^.*'+name+'.*$', Pattern.CASE_INSENSITIVE))) //名称 模糊查询 - q.put("type", "园区") + q.put('province',new BasicDBObject('$regex', Pattern.compile('^.*'+prov+'.*$', Pattern.CASE_INSENSITIVE))) //鍚嶇О 妯$硦鏌ヨ + q.put('city',new BasicDBObject('$regex', Pattern.compile('^.*'+city+'.*$', Pattern.CASE_INSENSITIVE))) //鍚嶇О 妯$硦鏌ヨ + q.put('park',new BasicDBObject('$regex', Pattern.compile('^.*'+name+'.*$', Pattern.CASE_INSENSITIVE))) //鍚嶇О 妯$硦鏌ヨ + q.put("type", "鍥尯") return dev_mapping_CONN.findOne(q) } @@ -306,7 +306,7 @@ class DevProcess { while(i<20){ def fileName = "/home/goojia/gj/qzd-${i}.xlsx" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\数据建设\\开发区\\乡镇街道围栏开发区数据.xlsx" + fileName = "D:\\鏁版嵁\\鏁版嵁寤鸿\\寮�鍙戝尯\\涔¢晣琛楅亾鍥存爮寮�鍙戝尯鏁版嵁.xlsx" } File file=new File(fileName); @@ -358,25 +358,25 @@ class DevProcess { d['L'] = jsonObject.get("streetNumber") road = road + jsonObject.get("streetNumber") } else { - d['N'] = "信息不完整" + d['N'] = "淇℃伅涓嶅畬鏁�" } if (!d['N'] && !d['E'].contains(road)) { - d['N'] = "原地址不含路" + d['N'] = "鍘熷湴鍧�涓嶅惈璺�" } if (!d['N']) { - def flag = road.matches('^[\u4e00-\u9fa5]+?(路|大道|巷|胡同|街).+[弄号]$') + def flag = road.matches('^[\u4e00-\u9fa5]+?(璺瘄澶ч亾|宸穦鑳″悓|琛�).+[寮勫彿]$') if (!flag) { - d['N'] = "路非法" + d['N'] = "璺潪娉�" } def roadsize = jsonObject.get("street").size() if (!d['N'] && (roadsize < 3 || roadsize > 7)) { - d['N'] = "路太长|路太短" + d['N'] = "璺お闀縷璺お鐭�" } } }else{ - d['N'] = "无地址" + d['N'] = "鏃犲湴鍧�" } if (jsonObject.get("dev") && jsonObject.get("dev") != "null") { @@ -397,7 +397,7 @@ class DevProcess { } i++ - println fileName+" 完成" + println fileName+" 瀹屾垚" } } @@ -407,10 +407,10 @@ class DevProcess { def devNameSplitRoad(){ def fileName = "/home/goojia/gj/company.xlsx" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\数据建设\\开发区\\56万需修改地址.xlsx" + fileName = "D:\\鏁版嵁\\鏁版嵁寤鸿\\寮�鍙戝尯\\56涓囬渶淇敼鍦板潃.xlsx" } ExcelUtils.multiThreadingModify(fileName,{d-> - if(d['P'] && d['P']=="路正常" && !d['O']){ + if(d['P'] && d['P']=="璺甯�" && !d['O']){ def jsonObject = com.fangjia.script.gj.district.FangjiaClientUtils.formatNinelevel(d['B'], d['E']) if(jsonObject){ def street = jsonObject.get("street") @@ -444,19 +444,19 @@ class DevProcess { } def addFlag(){ - ExcelUtils.modify("C:\\Users\\gaojuan\\Downloads\\企业园区地址.xlsx",{d-> + ExcelUtils.modify("C:\\Users\\gaojuan\\Downloads\\浼佷笟鍥尯鍦板潃.xlsx",{d-> if(d['H'] && d['D']){ if(d['D'].contains(d['H'])){ - d['O'] = "是" + d['O'] = "鏄�" }else{ def newName = null if(d['H'].toString().startsWith(d['I'])){ newName = d['H'].toString().substring(d['I'].toString().length()) - }else if(d['H'].toString().startsWith(d['I']+"省")){ + }else if(d['H'].toString().startsWith(d['I']+"鐪�")){ newName = d['H'].toString().substring(d['I'].toString().length()+1) } if(newName && d['D'].contains(newName)){ - d['O'] = "是2" + d['O'] = "鏄�2" } } } @@ -464,22 +464,22 @@ class DevProcess { } def matchDev(){ - ExcelUtils.multiThreadingModify("D:\\数据\\数据建设\\开发区\\省级开发区名单\\2018年版.xlsx",{d-> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\鏁版嵁寤鸿\\寮�鍙戝尯\\鐪佺骇寮�鍙戝尯鍚嶅崟\\2018骞寸増.xlsx",{d-> if(!d['G'] && d['C']){ def q = new BasicDBObject() q.put("name", d['C']) - def way = "相同" + def way = "鐩稿悓" def obj = development_zone_CONN.findOne(q) if(!obj){ q.put('alias', new BasicDBObject('$in',[d['C']])) obj = development_zone_CONN.findOne(q) - way = "别名" + way = "鍒悕" } if(!obj){ - def name = d['C'] //.replace('经济技术开发区','经济开发区') - q.put('name',new BasicDBObject('$regex', Pattern.compile('^.*'+name+'.*$', Pattern.CASE_INSENSITIVE))) //名称 模糊查询 + def name = d['C'] //.replace('缁忔祹鎶�鏈紑鍙戝尯','缁忔祹寮�鍙戝尯') + q.put('name',new BasicDBObject('$regex', Pattern.compile('^.*'+name+'.*$', Pattern.CASE_INSENSITIVE))) //鍚嶇О 妯$硦鏌ヨ obj = development_zone_CONN.findOne(q) - way = "模糊" + way = "妯$硦" } def allDevNames = [] if(!obj){ @@ -512,7 +512,7 @@ class DevProcess { } if(smilarObj){ d['H'] = smilarObj.name - d['G'] = "相似得分" + d['G'] = "鐩镐技寰楀垎" d['I'] = maxScore } } @@ -527,7 +527,7 @@ class DevProcess { def findDev(){ - ExcelUtils.multiThreadingModify("D:\\数据\\数据建设\\开发区外包\\开发区-0423(161个-浙江).xlsx", { d -> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\鏁版嵁寤鸿\\寮�鍙戝尯澶栧寘\\寮�鍙戝尯-0423(161涓�-娴欐睙).xlsx", { d -> def q = new BasicDBObject() q.put("name", d['B']) def obj = development_zone_CONN.findOne(q) @@ -539,7 +539,7 @@ class DevProcess { } def calAddrDistince(){ - ExcelUtils.multiThreadingModify("D:\\数据\\数据建设\\企业园区地址-新.xlsx",{d-> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\鏁版嵁寤鸿\\浼佷笟鍥尯鍦板潃-鏂�.xlsx",{d-> if(d['M'] && d['N'] && d['Y'] && d['Z']){ def addr1 = getFullAddress(d['J'], d['K'],d['L'],d['M'] , d['N']) def addr2 = getFullAddress(d['V'], d['W'], d['X'], d['Y'] , d['Z']) @@ -585,10 +585,10 @@ class DevProcess { } def updateCityAndDist(){ - ExcelUtils.modify("D:\\数据\\数据建设\\等级开发区 - 汇总.xlsx",{d-> + ExcelUtils.modify("D:\\鏁版嵁\\鏁版嵁寤鸿\\绛夌骇寮�鍙戝尯 - 姹囨��.xlsx",{d-> if(d['L']){ def udata = new BasicDBObject() - if(d['L']=="采用拆分结果"){ + if(d['L']=="閲囩敤鎷嗗垎缁撴灉"){ if(d["I"]){ udata.put("province", d["I"]) } @@ -598,7 +598,7 @@ class DevProcess { if(d["K"]){ udata.put("district", d["K"]) } - }else if(d['L']=="采用地图结果"){ + }else if(d['L']=="閲囩敤鍦板浘缁撴灉"){ if(d["H"]){ udata.put("province", d["H"]) } @@ -620,11 +620,11 @@ class DevProcess { def addDevAddres1(){ def rets = [] - ExcelUtils.multiThreadingModify("D:\\数据\\数据建设\\企业园区地址-新.xlsx",{d-> - if(d['O'] && d['P']=="正常" && d['U']){ + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\鏁版嵁寤鸿\\浼佷笟鍥尯鍦板潃-鏂�.xlsx",{d-> + if(d['O'] && d['P']=="姝e父" && d['U']){ def obj = development_zone_CONN.findOne(new BasicDBObject("name", d['U'])) if(obj){ - d['AB'] = "存在" + d['AB'] = "瀛樺湪" def addr_alias = obj.addr_alias if(!addr_alias){ addr_alias = [] @@ -640,18 +640,18 @@ class DevProcess { } }else{ rets << d - println "匹配:"+d['U']+" 原始:"+d['H'] + println "鍖归厤锛�"+d['U']+" 鍘熷锛�"+d['H'] } } },0) -// ExcelUtils.write("D:\\数据\\数据建设\\待新增开发区.xlsx",rets, "新增") +// ExcelUtils.write("D:\\鏁版嵁\\鏁版嵁寤鸿\\寰呮柊澧炲紑鍙戝尯.xlsx",rets, "鏂板") } def addDevAddres2(){ def rets = [] - ExcelUtils.modify("D:\\数据\\数据建设\\待新增国家级以上开发区.xlsx",{d-> - if((d['R'] && d['R'].toString()=="正常") || (d['P'] && d['P'].toString()=="正常")){ + ExcelUtils.modify("D:\\鏁版嵁\\鏁版嵁寤鸿\\寰呮柊澧炲浗瀹剁骇浠ヤ笂寮�鍙戝尯.xlsx",{d-> + if((d['R'] && d['R'].toString()=="姝e父") || (d['P'] && d['P'].toString()=="姝e父")){ def obj = null if(d['U']){ try{ @@ -669,18 +669,18 @@ class DevProcess { } } if(obj){ - d['AB'] = "存在" + d['AB'] = "瀛樺湪" def addr_alias = obj.addr_alias if(!addr_alias){ addr_alias = [] } def old_count = addr_alias.size() - if(d['R'] && d['R']=="正常" && !addr_alias.contains(d['Y']+d['Z']) && d['X'] && d['F'] && d['X']==d['F']){ + if(d['R'] && d['R']=="姝e父" && !addr_alias.contains(d['Y']+d['Z']) && d['X'] && d['F'] && d['X']==d['F']){ addr_alias << d['Y']+d['Z'] } - if(d['P'] && d['P']=='正常' && !addr_alias.contains(d['M']+d['N']) && d['F'] && d['L'] && d['L']==d['F']){ + if(d['P'] && d['P']=='姝e父' && !addr_alias.contains(d['M']+d['N']) && d['F'] && d['L'] && d['L']==d['F']){ addr_alias << d['M']+d['N'] } @@ -691,18 +691,18 @@ class DevProcess { } }else{ // rets << d - println "匹配:"+d['U']+" 原始:"+d['H'] + println "鍖归厤锛�"+d['U']+" 鍘熷锛�"+d['H'] } } }, 0) -// ExcelUtils.write("D:\\数据\\数据建设\\待新增开发区.xlsx",rets, "新增") +// ExcelUtils.write("D:\\鏁版嵁\\鏁版嵁寤鸿\\寰呮柊澧炲紑鍙戝尯.xlsx",rets, "鏂板") } def addDevAddres3(){ def index = 0 - ExcelUtils.multiThreadingModify("D:\\数据\\数据建设\\开发区\\新跑省份\\河北省\\河北省开发区地址入库.xlsx",{d-> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\鏁版嵁寤鸿\\寮�鍙戝尯\\鏂拌窇鐪佷唤\\娌冲寳鐪乗\娌冲寳鐪佸紑鍙戝尯鍦板潃鍏ュ簱.xlsx",{d-> if(d['A']){ def obj = development_zone_CONN.findOne(new BasicDBObject("name", d['A'])) if(obj){ @@ -711,7 +711,7 @@ class DevProcess { def q2 = new BasicDBObject() q2.put("name", d['A']) q2.put("address", d['B']) - q2.put("type","地址") + q2.put("type","鍦板潃") def sameObj = DEV_MAPPING_CONN.findOne(q2) if(!sameObj){ index++ @@ -720,7 +720,7 @@ class DevProcess { udata.put("city", obj.city) udata.put("district", obj.district) udata.put("name",obj.name) - udata.put("type", "地址") + udata.put("type", "鍦板潃") udata.put("address", d['B']) DEV_MAPPING_CONN.save(udata) } @@ -728,7 +728,7 @@ class DevProcess { } },0) println index -// ExcelUtils.write("D:\\数据\\数据建设\\待新增开发区.xlsx",rets, "新增") +// ExcelUtils.write("D:\\鏁版嵁\\鏁版嵁寤鸿\\寰呮柊澧炲紑鍙戝尯.xlsx",rets, "鏂板") } def stat(){ @@ -744,15 +744,15 @@ class DevProcess { } def addNewDev(){ - ExcelUtils.modify("D:\\数据\\数据建设\\待新增国家级以上开发区.xlsx",{d-> + ExcelUtils.modify("D:\\鏁版嵁\\鏁版嵁寤鸿\\寰呮柊澧炲浗瀹剁骇浠ヤ笂寮�鍙戝尯.xlsx",{d-> def udata = new BasicDBObject() udata.address = d['M']+d['N'] udata.create_time = new Date() if(d['G']){ - if(d['G'].contains("国家级")){ - udata.level = "国家级" - }else if(d['G'].contains("省级")){ - udata.level = "省级" + if(d['G'].contains("鍥藉绾�")){ + udata.level = "鍥藉绾�" + }else if(d['G'].contains("鐪佺骇")){ + udata.level = "鐪佺骇" } } @@ -767,27 +767,27 @@ class DevProcess { if(!obj){ development_zone_CONN.save(udata) }else{ - println udata.name +" 已存在" + println udata.name +" 宸插瓨鍦�" } }) } def addNewDev2(){ - ExcelUtils.modify("D:\\数据\\数据建设\\开发区\\河北省官网发布190开发区.xlsx",{d-> - if(d['F'] && d['F']=="新增"){ + ExcelUtils.modify("D:\\鏁版嵁\\鏁版嵁寤鸿\\寮�鍙戝尯\\娌冲寳鐪佸畼缃戝彂甯�190寮�鍙戝尯.xlsx",{d-> + if(d['F'] && d['F']=="鏂板"){ def udata = new BasicDBObject() udata.create_time = new Date() udata.province = d['G'] udata.city = d['I'] udata.district = d['J'] - udata.level = "省级" + udata.level = "鐪佺骇" udata.name = d['D'] def obj = development_zone_CONN.findOne(new BasicDBObject("name", udata.name)) if(!obj){ development_zone_CONN.save(udata) }else{ - println udata.name +" 已存在" + println udata.name +" 宸插瓨鍦�" } } }) @@ -800,7 +800,7 @@ class DevProcess { if(d.address){ formatAddress = AddressUtil.formatAddress(d.city, d.address) } - if(formatAddress && !formatAddress.endsWith("号") && !formatAddress.endsWith("弄")){ + if(formatAddress && !formatAddress.endsWith("鍙�") && !formatAddress.endsWith("寮�")){ formatAddress = null } def addr_alias = [] @@ -818,7 +818,7 @@ class DevProcess { udata.put("city", d.city) udata.put("district", d.district) udata.put("name",d.name) - udata.put("type", "地址") + udata.put("type", "鍦板潃") if(d.township){ udata.put("street", d.township) } @@ -830,13 +830,13 @@ class DevProcess { } def deleteAddr(){ - ExcelUtils.modify("D:\\数据\\数据建设\\删除开发区地址.xlsx",{d-> + ExcelUtils.modify("D:\\鏁版嵁\\鏁版嵁寤鸿\\鍒犻櫎寮�鍙戝尯鍦板潃.xlsx",{d-> DEV_MAPPING_CONN.remove(new BasicDBObject("_id", new ObjectId(d['A']))) }); } def deleteAddr2(){ - ExcelUtils.modify("D:\\数据\\数据建设\\开发区\\56万中待删除地址.xlsx",{d-> + ExcelUtils.modify("D:\\鏁版嵁\\鏁版嵁寤鸿\\寮�鍙戝尯\\56涓囦腑寰呭垹闄ゅ湴鍧�.xlsx",{d-> if(d['Q'] && d['M']){ def q = new BasicDBObject() q.put("_id", new ObjectId(d['Q'])) @@ -878,7 +878,7 @@ class DevProcess { def matchDevAndAddAddress(){ - ExcelUtils.modify("D:\\数据\\数据建设\\开发区\\新跑省份\\福建重庆去重后地址.xlsx",{d-> + ExcelUtils.modify("D:\\鏁版嵁\\鏁版嵁寤鸿\\寮�鍙戝尯\\鏂拌窇鐪佷唤\\绂忓缓閲嶅簡鍘婚噸鍚庡湴鍧�.xlsx",{d-> if(d['E']){ def q = new BasicDBObject() q.put("name", d['E']) @@ -903,10 +903,10 @@ class DevProcess { } udata.put("name",obj.name) - udata.put("type", "地址") + udata.put("type", "鍦板潃") udata.put("address",address) udata.put("c_date", new Date()) -// udata.put("type", "乡镇街道") +// udata.put("type", "涔¢晣琛楅亾") // udata.put("township", street) DEV_MAPPING_CONN.save(udata) println obj.name +" "+address @@ -919,7 +919,7 @@ class DevProcess { def matchDevTownship(){ - ExcelUtils.modify("D:\\数据\\数据建设\\开发区\\新跑省份\\福建重庆去重后地址.xlsx",{d-> + ExcelUtils.modify("D:\\鏁版嵁\\鏁版嵁寤鸿\\寮�鍙戝尯\\鏂拌窇鐪佷唤\\绂忓缓閲嶅簡鍘婚噸鍚庡湴鍧�.xlsx",{d-> if(d['D']){ def q = new BasicDBObject() q.put("name", d['D']) @@ -940,10 +940,10 @@ class DevProcess { } udata.put("name",obj.name) - udata.put("type", "乡镇街道") + udata.put("type", "涔¢晣琛楅亾") udata.put("township", street) -// udata.put("type", "区域") +// udata.put("type", "鍖哄煙") // udata.put("dev_district", street) udata.put("c_date",new Date()) DEV_MAPPING_CONN.save(udata) @@ -955,13 +955,13 @@ class DevProcess { } def addAlias(){ - ExcelUtils.modify("D:\\数据\\数据建设\\开发区\\开发区别名.xlsx",{d-> + ExcelUtils.modify("D:\\鏁版嵁\\鏁版嵁寤鸿\\寮�鍙戝尯\\寮�鍙戝尯鍒悕.xlsx",{d-> def q = new BasicDBObject() q.put("name", d['A']) def obj = development_zone_CONN.findOne(q) if(obj){ d['D'] = obj._id.toString() - def arrs = d['B'].split("、") + def arrs = d['B'].split("銆�") def alias = obj.alias if(!alias){ alias = [] @@ -980,7 +980,7 @@ class DevProcess { } def addDevShape(){ - ExcelUtils.modify("D:\\数据\\数据建设\\开发区\\开发区围栏.xlsx",{d-> + ExcelUtils.modify("D:\\鏁版嵁\\鏁版嵁寤鸿\\寮�鍙戝尯\\寮�鍙戝尯鍥存爮.xlsx",{d-> if(d['W']){ def s = d['S'] JSONObject jsonObject = JSONObject.fromObject(s); @@ -994,16 +994,16 @@ class DevProcess { } def addDevStreet(){ - ExcelUtils.modify("D:\\数据\\数据建设\\开发区\\区域匹配开发区.xlsx",{d-> - if(d['J']=="是"){ - def dbcursor = ADMINISTRATIVE_MAPPING_COLL.find(new BasicDBObject("district", d['D']).append("type","乡镇街道")) + ExcelUtils.modify("D:\\鏁版嵁\\鏁版嵁寤鸿\\寮�鍙戝尯\\鍖哄煙鍖归厤寮�鍙戝尯.xlsx",{d-> + if(d['J']=="鏄�"){ + def dbcursor = ADMINISTRATIVE_MAPPING_COLL.find(new BasicDBObject("district", d['D']).append("type","涔¢晣琛楅亾")) for(def obj : dbcursor){ def o = new BasicDBObject() o.put("province" , obj.province) o.put("city" , obj.city) o.put("district" , obj.mzb_district_name) o.put("name" , d['E']) - o.put("type" , "乡镇街道") + o.put("type" , "涔¢晣琛楅亾") o.put("township" , obj.street) DEV_MAPPING_CONN.save(o) } @@ -1031,16 +1031,16 @@ class DevProcess { } def addKfc(){ - ExcelUtils.modify("D:\\数据\\数据建设\\开发区\\投促中国开发区(1).xlsx",{d-> + ExcelUtils.modify("D:\\鏁版嵁\\鏁版嵁寤鸿\\寮�鍙戝尯\\鎶曚績涓浗寮�鍙戝尯(1).xlsx",{d-> if(d['I']){ - if(d['I'] == "添加"){ + if(d['I'] == "娣诲姞"){ def udata = new BasicDBObject() udata.put("create_time" , new Date()) udata.put("industry",d['D']) - if(d['E'].contains("国家级")){ - udata.put("level" ,"国家级") - }else if(d['E'].contains("省级")){ - udata.put("level" ,"省级") + if(d['E'].contains("鍥藉绾�")){ + udata.put("level" ,"鍥藉绾�") + }else if(d['E'].contains("鐪佺骇")){ + udata.put("level" ,"鐪佺骇") } udata.put("name" ,d['F']) udata.put("province" ,d['G']) @@ -1073,12 +1073,12 @@ class DevProcess { } def devToPark(){ - def datas = ExcelUtils.read("D:\\数据\\数据建设\\开发区\\百度百科下辖街道解析.xlsx",0, 1) + def datas = ExcelUtils.read("D:\\鏁版嵁\\鏁版嵁寤鸿\\寮�鍙戝尯\\鐧惧害鐧剧涓嬭緰琛楅亾瑙f瀽.xlsx",0, 1) def rets = [] - rets << ["开发区名称", "下辖街道", "城市", "区域"] + rets << ["寮�鍙戝尯鍚嶇О", "涓嬭緰琛楅亾", "鍩庡競", "鍖哄煙"] for(def d : datas){ if(d['E']){ - def arrs = d['E'].split("、") + def arrs = d['E'].split("銆�") def q = new BasicDBObject().append("name", d['A']) def obj = development_zone_CONN.findOne(q) if(obj){ @@ -1088,12 +1088,12 @@ class DevProcess { } } } - ExcelUtils.write("D:\\数据\\数据建设\\开发区\\百度百科开发区下辖街道.xlsx", rets, "下辖街道") + ExcelUtils.write("D:\\鏁版嵁\\鏁版嵁寤鸿\\寮�鍙戝尯\\鐧惧害鐧剧寮�鍙戝尯涓嬭緰琛楅亾.xlsx", rets, "涓嬭緰琛楅亾") } def checkTown(){ - ExcelUtils.multiThreadingModify("D:\\数据\\数据建设\\开发区\\百度百科开发区下辖街道.xlsx",{d-> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\鏁版嵁寤鸿\\寮�鍙戝尯\\鐧惧害鐧剧寮�鍙戝尯涓嬭緰琛楅亾.xlsx",{d-> if(!d['E']){ if(d['A']){ @@ -1102,7 +1102,7 @@ class DevProcess { // if (jsonObject1.get("townCode") && jsonObject1.get("townCode")!='null' && jsonObject1.get("townCode")!='') { // def township = jsonObject1.get("township") // def district = jsonObject1.get("district") -// d['E'] = "接口" +// d['E'] = "鎺ュ彛" // if(district && district!='null'){ // d['F'] = district // } @@ -1121,13 +1121,13 @@ class DevProcess { q.put("city", d['C']) // q.put("district", d['D']) // q.put("mzb_district_name", d['D']) - q.put("type", "乡镇街道") + q.put("type", "涔¢晣琛楅亾") q.put('street',new BasicDBObject('$regex', Pattern.compile(d['B'].toString().trim()+'.*$', Pattern.CASE_INSENSITIVE))) // q.put("street", d['B']) // q.put('alias', new BasicDBObject('$in',[d['B']])) def obj = ADMINISTRATIVE_MAPPING_COLL.findOne(q) if(obj){ - d['E'] = "可入库-忽略区域模糊2" + d['E'] = "鍙叆搴�-蹇界暐鍖哄煙妯$硦2" d['F'] = obj.district d['G'] = obj.street } @@ -1160,7 +1160,7 @@ class DevProcess { } def addDevInfo(){ - ExcelUtils.multiThreadingModify("C:\\Users\\gaojuan\\Downloads\\河北省开发区对应园区.xlsx",{d-> + ExcelUtils.multiThreadingModify("C:\\Users\\gaojuan\\Downloads\\娌冲寳鐪佸紑鍙戝尯瀵瑰簲鍥尯.xlsx",{d-> if(d['C']){ def q = new BasicDBObject().append("name", d['C']) def obj = development_zone_CONN.findOne(q) @@ -1173,30 +1173,30 @@ class DevProcess { } def matchDevShape(){ - ExcelUtils.multiThreadingModify("D:\\数据\\数据建设\\开发区\\开发区-全量9-14.xlsx",{d-> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\鏁版嵁寤鸿\\寮�鍙戝尯\\寮�鍙戝尯-鍏ㄩ噺9-14.xlsx",{d-> if(d['C'] && !d['I']){ - def newDev = d['E'].replace("经济技术开发区", "经济开发区").replace(d['B'].replace("省",""), "") - def dbcursor = ADMINISTRATIVE_MAPPING_COLL.find(new BasicDBObject("city",d['C']).append("district", d['D']).append("type","乡镇街道").append("street", new BasicDBObject('$regex', Pattern.compile(newDev.trim()+'.*$', Pattern.CASE_INSENSITIVE))).append("shape", new BasicDBObject('$exists',true))) + def newDev = d['E'].replace("缁忔祹鎶�鏈紑鍙戝尯", "缁忔祹寮�鍙戝尯").replace(d['B'].replace("鐪�",""), "") + def dbcursor = ADMINISTRATIVE_MAPPING_COLL.find(new BasicDBObject("city",d['C']).append("district", d['D']).append("type","涔¢晣琛楅亾").append("street", new BasicDBObject('$regex', Pattern.compile(newDev.trim()+'.*$', Pattern.CASE_INSENSITIVE))).append("shape", new BasicDBObject('$exists',true))) if(dbcursor.count()>0){ - println "[统计局] "+d['E'] +" "+ dbcursor.count() + println "[缁熻灞�] "+d['E'] +" "+ dbcursor.count() if(dbcursor.count()==1){ for(def obj : dbcursor){ d['F'] = obj.city d['G'] = obj.district d['H'] = obj.street - d['I'] = "统计局相似(去省)-有围栏" + d['I'] = "缁熻灞�鐩镐技(鍘荤渷)-鏈夊洿鏍�" } } }else{ dbcursor = TOWNPOLYLINE_COLL.find(new BasicDBObject("city",d['C']).append("region", d['D']).append("town", newDev)) - println "[乡镇街道围栏] "+d['E'] +" "+ dbcursor.count() + println "[涔¢晣琛楅亾鍥存爮] "+d['E'] +" "+ dbcursor.count() if(dbcursor.count()==1){ for(def obj : dbcursor){ d['F'] = obj.city d['G'] = obj.region d['H'] = obj.town if(obj.polyline){ - d['I'] = "乡镇围栏相似(去省)-有围栏" + d['I'] = "涔¢晣鍥存爮鐩镐技(鍘荤渷)-鏈夊洿鏍�" } } @@ -1208,14 +1208,14 @@ class DevProcess { } def addQiDevResult(){ - ExcelUtils.multiThreadingModify("D:\\数据\\数据建设\\开发区\\新跑省份\\江苏省\\江苏省-齐梁待跑地址.xlsx",{d-> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\鏁版嵁寤鸿\\寮�鍙戝尯\\鏂拌窇鐪佷唤\\姹熻嫃鐪乗\姹熻嫃鐪�-榻愭寰呰窇鍦板潃.xlsx",{d-> if(d['E'] && !d['Z']){ def q = new BasicDBObject("qiye_address", d['E']) def obj = tempJiangsuQiliangColl.findOne(q) if(obj){ def qlmap = obj.ql if(qlmap){ - d['Z'] = "有" + d['Z'] = "鏈�" if(qlmap.indusParkList){ def parklist = qlmap.indusParkList def names = [] @@ -1236,7 +1236,7 @@ class DevProcess { q.put("shape", new BasicDBObject('$exists', true)) def dbcursor = DEVELOPMENT_ZONE_43_COLL.find(q) for(def d : dbcursor){ - if(d.name!="福州长乐国际机场综合保税区"){ + if(d.name!="绂忓窞闀夸箰鍥介檯鏈哄満缁煎悎淇濈◣鍖�"){ def udata = new BasicDBObject() if(d.shape.coordinates){ d.shape.coordinates = [d.shape.coordinates] diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/DevQlCheck.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/DevQlCheck.groovy index f37e917d2..757234084 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/DevQlCheck.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/DevQlCheck.groovy @@ -22,21 +22,21 @@ class DevQlCheck { } def run(){ - def devName = "福建龙海经济开发区" + def devName = "绂忓缓榫欐捣缁忔祹寮�鍙戝尯" def obj = DEVELOPMENT_ZONE_43_COLL.findOne(new BasicDBObject("name",devName)) - def pois = readCSV("C:\\Users\\gaojuan\\Downloads\\漳州市POI.csv") + def pois = readCSV("C:\\Users\\gaojuan\\Downloads\\婕冲窞甯侾OI.csv") def devPois = [] - devPois << ["省", "城市", "区域", "名称", "地址", "类型", "经度", "纬度", "齐梁开发区"] + devPois << ["鐪�", "鍩庡競", "鍖哄煙", "鍚嶇О", "鍦板潃", "绫诲瀷", "缁忓害", "绾害", "榻愭寮�鍙戝尯"] for(def poi : pois){ def flag = InsidePolygon.isInArea(poi.lng.toString().toDouble(), poi.lat.toString().toDouble(), InsidePolygon.createPoint4(obj.shape.coordinates)) if(flag){ devPois << [poi.province, poi.city, poi.district, poi.name, poi.address, poi.cat, poi.lng, poi.lat] } } - println "共:"+devPois.size()+" 个" - ExcelUtils.write("D:\\数据\\数据建设\\开发区外包\\${devName}poi齐梁校验.xlsx", devPois, "齐梁开发区") + println "鍏憋細"+devPois.size()+" 涓�" + ExcelUtils.write("D:\\鏁版嵁\\鏁版嵁寤鸿\\寮�鍙戝尯澶栧寘\\${devName}poi榻愭鏍¢獙.xlsx", devPois, "榻愭寮�鍙戝尯") def index = 0 - ExcelUtils.modify("D:\\数据\\数据建设\\开发区外包\\${devName}poi齐梁校验.xlsx",{d-> + ExcelUtils.modify("D:\\鏁版嵁\\鏁版嵁寤鸿\\寮�鍙戝尯澶栧寘\\${devName}poi榻愭鏍¢獙.xlsx",{d-> def address = d['B']+d['C']+d['D'] // if(d['E']){ // address = address + d['E'] @@ -54,7 +54,7 @@ class DevQlCheck { def getQlResult(address){ def params = [ 'address': address, - 'type': '1' //1:对公 0:对私 + 'type': '1' //1锛氬鍏� 0锛氬绉� ] try{ def str = ProxyHttpUtils.getProxyResult(targetUrl, params); @@ -101,7 +101,7 @@ class DevQlCheck { o.put("data_source", arrs[9]) rets << o }catch(Exception e){ - println filename+" 文件异常" + println filename+" 鏂囦欢寮傚父" } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/DevUpdateTestBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/DevUpdateTestBatch.groovy index 6650ea864..cc5951a45 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/DevUpdateTestBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/DevUpdateTestBatch.groovy @@ -32,11 +32,11 @@ class DevUpdateTestBatch { static main(args) { def task = new DevUpdateTestBatch() - def path = "D:\\数据\\数据建设\\开发区\\开发区-园区.xlsx"//开发区-园区.xlsx + def path = "D:\\鏁版嵁\\鏁版嵁寤鸿\\寮�鍙戝尯\\寮�鍙戝尯-鍥尯.xlsx"//寮�鍙戝尯-鍥尯.xlsx // task.addDev(path) task.addDevAddress(path) // -// task.updateHasGov("新疆维吾尔自治区","喀什地区","麦盖提县", "麦盖提镇", "是") +// task.updateHasGov("鏂扮枂缁村惥灏旇嚜娌诲尯","鍠�浠�鍦板尯","楹︾洊鎻愬幙", "楹︾洊鎻愰晣", "鏄�") } @@ -68,9 +68,9 @@ class DevUpdateTestBatch { o.remove("create_time") addEs(o, "192.168.0.89", "development_zone") addEs(o, "192.168.0.52", "development_zone") - d['I'] = "已完成" + d['I'] = "宸插畬鎴�" }else{ - println d['A'] +" 已存在" + println d['A'] +" 宸插瓨鍦�" } } }) @@ -98,7 +98,7 @@ class DevUpdateTestBatch { request.setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE); BulkResponse bulkResponse = client.bulk(request, RequestOptions.DEFAULT); if (bulkResponse.hasFailures()) { - // 处理错误 + // 澶勭悊閿欒 println "Bulk request has failures: " + bulkResponse.buildFailureMessage() } else { processedCount += request.numberOfActions(); @@ -113,11 +113,11 @@ class DevUpdateTestBatch { def obj = development_zone_43_CONN.findOne(new BasicDBObject("name", d['A'])) if(obj){ def q = new BasicDBObject("name", d['A']).append("type",d['B']) - if(d['B'] == "乡镇街道"){ + if(d['B'] == "涔¢晣琛楅亾"){ q.put("township", d['C']) - }else if(d['B'] == "地址"){ + }else if(d['B'] == "鍦板潃"){ q.put("address", d['C']) - }else if(d['B'] == "园区"){ + }else if(d['B'] == "鍥尯"){ q.put("park", d['C']) }else if(d['B'] == "Poi"){ q.put("poi", d['C']) @@ -130,11 +130,11 @@ class DevUpdateTestBatch { o.put("district", obj.district) o.put("name", obj.name) o.put("type", d['B']) - if(d['B'] == "乡镇街道"){ + if(d['B'] == "涔¢晣琛楅亾"){ o.put("township", d['C']) - }else if(d['B'] == "地址"){ + }else if(d['B'] == "鍦板潃"){ o.put("address", d['C']) - }else if(d['B'] == "园区"){ + }else if(d['B'] == "鍥尯"){ o.put("park", d['C']) }else if(d['B'] == "Poi"){ o.put("poi", d['C']) @@ -155,14 +155,14 @@ class DevUpdateTestBatch { println "52 es error: "+e.printStackTrace() } - d['D'] = "已完成" + d['D'] = "宸插畬鎴�" }else{ - d['D'] = "重复" - println d['A'] +" "+ d['C']+" 重复" + d['D'] = "閲嶅" + println d['A'] +" "+ d['C']+" 閲嶅" } }else{ - d['D'] = "不存在" - println d['A'] +" 不存在" + d['D'] = "涓嶅瓨鍦�" + println d['A'] +" 涓嶅瓨鍦�" } } },1) @@ -178,19 +178,19 @@ class DevUpdateTestBatch { q.put("street", street) def obj = ADMINISTRATIVE_MAPPING_COLL.findOne(q) if(obj){ - //修改43 + //淇敼43 // ADMINISTRATIVE_MAPPING_COLL.update(new BasicDBObject("_id",obj._id), new BasicDBObject('$set',new BasicDBObject('has_gov',hasGov))) - //修改89 administrative_mapping + //淇敼89 administrative_mapping update89EsAdministrativeMapping(province, city, district, street, hasGov) - //修改89 administrative_mapping + //淇敼89 administrative_mapping update52EsAdministrativeMapping(province, city, district, street, hasGov) }else{ - println province+" "+city+" "+district+" "+street+" 没找到" + println province+" "+city+" "+district+" "+street+" 娌℃壘鍒�" } - //修改100 community - //修改89 community - //修改52 community + //淇敼100 community + //淇敼89 community + //淇敼52 community } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/DistrictAliasProcess.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/DistrictAliasProcess.groovy index 5b80f7877..541d3e6b9 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/DistrictAliasProcess.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/DistrictAliasProcess.groovy @@ -15,13 +15,13 @@ class DistrictAliasProcess { } def run(){ - ExcelUtils.modify("D:\\数据\\数据建设\\小区\\名称在映射别名中-第二批.xlsx",{ d-> - if(d['H']=="是"){ + ExcelUtils.modify("D:\\鏁版嵁\\鏁版嵁寤鸿\\灏忓尯\\鍚嶇О鍦ㄦ槧灏勫埆鍚嶄腑-绗簩鎵�.xlsx",{ d-> + if(d['H']=="鏄�"){ def udata = new BasicDBObject() udata.put("status", 1) udata.put("m_date", new Date()) DbUtils.seaweed.update(new BasicDBObject("_id", new ObjectId(d['A'])), new BasicDBObject('$set', udata)) - }else if(d['H']=="否"){ + }else if(d['H']=="鍚�"){ def aliasDist = d['F'] def arrs = aliasDist.split("-") def obj = CommonDatautils.findDistrict(d['B'], arrs[0], arrs[1],"district") @@ -56,8 +56,8 @@ class DistrictAliasProcess { } for(def r : rets){ - def mainName1 = r.name.toString().replaceAll("([一二三四五六七八九十百千\\d]+)期\$", "") - def mainName2 = r.name.toString().replaceAll("(\\w|东|南|北|中|西|甲|乙|丙|丁|一|二|三|四|五|六|七|八|九|十)区\$", "") + def mainName1 = r.name.toString().replaceAll("([涓�浜屼笁鍥涗簲鍏竷鍏節鍗佺櫨鍗僜\d]+)鏈焅$", "") + def mainName2 = r.name.toString().replaceAll("(\\w|涓渱鍗梶鍖梶涓瓅瑗縷鐢瞸涔檤涓檤涓亅涓�|浜寍涓墊鍥泑浜攟鍏瓅涓億鍏珅涔潀鍗�)鍖篭$", "") def lastObj = null for(def j : rets){ if((j.name==mainName1 || mainName2==j.name) && r._id!=j._id && r.region==j.region && r.city==j.city){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/DistrictLoopInfo.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/DistrictLoopInfo.groovy index be1a4b729..abcb59eb2 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/DistrictLoopInfo.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/DistrictLoopInfo.groovy @@ -21,13 +21,13 @@ class DistrictLoopInfo { def run(){ def q = new BasicDBObject() - q.put("name", new BasicDBObject('$in', ["内环","中环","外环","郊环"])) + q.put("name", new BasicDBObject('$in', ["鍐呯幆","涓幆","澶栫幆","閮婄幆"])) def loopShapes = LATLNG_POLYGON_COLL.find(q) def loopMap = [:] for(def loop : loopShapes){ loopMap.put(loop.name, loop) } - def districts = CommonDatautils.findAllDistricts("上海", "district", ["city", "region", "name", "lat", "lng", "loop_line_info"]) + def districts = CommonDatautils.findAllDistricts("涓婃捣", "district", ["city", "region", "name", "lat", "lng", "loop_line_info"]) println districts.size() def index = 0 for(def d : districts){ @@ -36,38 +36,38 @@ class DistrictLoopInfo { def lng = d.lng/10000000000.0 def lat = d.lat/10000000000.0 Point2D.Double point = new Point2D.Double(DataHandleUtils.getDoubleRound(6, lng), DataHandleUtils.getDoubleRound(6, lat)); - def loop1 = loopMap.get("内环") + def loop1 = loopMap.get("鍐呯幆") def flag = InPolygon.isInArea(point, InPolygon.createPoint(loop1.shape.coordinates)) def loop_line_info = "" if(flag){ - loop_line_info = "内环内" + loop_line_info = "鍐呯幆鍐�" }else{ - loop1 = loopMap.get("中环") + loop1 = loopMap.get("涓幆") flag = InPolygon.isInArea(point, InPolygon.createPoint(loop1.shape.coordinates)) if(flag){ - loop_line_info = "内中环" + loop_line_info = "鍐呬腑鐜�" }else{ - loop1 = loopMap.get("外环") + loop1 = loopMap.get("澶栫幆") flag = InPolygon.isInArea(point, InPolygon.createPoint(loop1.shape.coordinates)) if(flag){ - loop_line_info = "中外环" + loop_line_info = "涓鐜�" }else{ - loop1 = loopMap.get("郊环") + loop1 = loopMap.get("閮婄幆") flag = InPolygon.isInArea(point, InPolygon.createPoint(loop1.shape.coordinates)) if(flag){ - loop_line_info = "外郊环" + loop_line_info = "澶栭儕鐜�" }else{ - loop_line_info = "郊环外" + loop_line_info = "閮婄幆澶�" } } } } - println index +" "+d.region +" "+d.name+" 原:"+d.loop_line_info+" 现:"+loop_line_info+" lng:"+lng+","+lat + println index +" "+d.region +" "+d.name+" 鍘燂細"+d.loop_line_info+" 鐜帮細"+loop_line_info+" lng:"+lng+","+lat def udata =new BasicDBObject() udata.put("loop_line_info", loop_line_info) DBUtils.seaweed.update(new BasicDBObject('_id',d._id),new BasicDBObject('$set',udata)) }else{ - println index + " "+d.region +" "+d.name+"无经纬度信息" + println index + " "+d.region +" "+d.name+"鏃犵粡绾害淇℃伅" } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/DistrictRepeatBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/DistrictRepeatBatch.groovy index 63839d995..5364b3ed6 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/DistrictRepeatBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/DistrictRepeatBatch.groovy @@ -13,7 +13,7 @@ import org.apache.commons.lang.SerializationUtils import org.bson.types.ObjectId /** - * 查找重复小区 + * 鏌ユ壘閲嶅灏忓尯 */ class DistrictRepeatBatch { @@ -27,8 +27,8 @@ class DistrictRepeatBatch { } def processRepeatAndAlias(){ - ExcelUtils.modify("D:\\数据\\小区\\重复小区\\结果\\重复可疑小区-南京.xlsx",{d-> - if(d['H'] && d['H'] == "删除"){ + ExcelUtils.modify("D:\\鏁版嵁\\灏忓尯\\閲嶅灏忓尯\\缁撴灉\\閲嶅鍙枒灏忓尯-鍗椾含.xlsx",{d-> + if(d['H'] && d['H'] == "鍒犻櫎"){ def obj = CommonDatautils.findDistrictById(d['A']) if(!obj){ obj = CommonDatautils.findDistrict(d['A'], d['B'], d['C'], "district") @@ -44,7 +44,7 @@ class DistrictRepeatBatch { if(d['I']){ def obj = CommonDatautils.findDistrict(d['A'], d['B'], d['C'], "district") if(obj){ - def arrs = d['I'].split(",") + def arrs = d['I'].split("锛�") if(arrs){ def alias = obj.alias if(!alias){ @@ -67,7 +67,7 @@ class DistrictRepeatBatch { def run(){ def rets = [] - rets << ["id","城市","区域", "名称", "物业类型", "地址", "备注", "id(重复)","城市(重复)","区域(重复)", "名称(重复)", "物业类型(重复)", "地址(重复)", "相似度"] + rets << ["id","鍩庡競","鍖哄煙", "鍚嶇О", "鐗╀笟绫诲瀷", "鍦板潃", "澶囨敞", "id(閲嶅)","鍩庡競(閲嶅)","鍖哄煙(閲嶅)", "鍚嶇О(閲嶅)", "鐗╀笟绫诲瀷(閲嶅)", "鍦板潃(閲嶅)", "鐩镐技搴�"] def citys = CommonDatautils.findAllCity() def index = 0 for(def city : citys){ @@ -75,10 +75,10 @@ class DistrictRepeatBatch { def districts = CommonDatautils.findAllDistricts(city, "district", ["city", "region", "name", "address","estate_type2","lat", "lng"]) def rows = findRepeatByEstateType(districts) rets.addAll(rows) - println "【${index}】 "+city +" 完成比对" + println "銆�${index}銆� "+city +" 瀹屾垚姣斿" } - ExcelUtils.write("D:\\数据\\小区重复数据处理.xlsx", rets, "小区") + ExcelUtils.write("D:\\鏁版嵁\\灏忓尯閲嶅鏁版嵁澶勭悊.xlsx", rets, "灏忓尯") } def findRepeatByEstateType(districts){ @@ -95,8 +95,8 @@ class DistrictRepeatBatch { if(d1.estate_type2!=d2.estate_type2){ continue } - def d1_name = d1.name.replace("别墅", "").replace("商住楼", "").replace("商住", "").replace("小区", "") - def d2_name = d2.name.replace("别墅", "").replace("商住楼", "").replace("商住", "").replace("小区", "") + def d1_name = d1.name.replace("鍒", "").replace("鍟嗕綇妤�", "").replace("鍟嗕綇", "").replace("灏忓尯", "") + def d2_name = d2.name.replace("鍒", "").replace("鍟嗕綇妤�", "").replace("鍟嗕綇", "").replace("灏忓尯", "") if(d1_name != d2_name){ continue } @@ -108,8 +108,8 @@ class DistrictRepeatBatch { if(score>0.9){ ids << d1._id.toString() ids << d2._id.toString() - rows << [d1._id.toString(), d1.city, d1.region, d1.name, d1.estate_type2, d1.address, "物业类型", d2._id.toString(), d2.city, d2.region, d2.name, d2.estate_type2, d2.address, score] - println d1.region +" "+d1.name +" "+d1.address +" 重复数据("+d2.region+" "+d2.name+" "+d2.address+") score:"+score + rows << [d1._id.toString(), d1.city, d1.region, d1.name, d1.estate_type2, d1.address, "鐗╀笟绫诲瀷", d2._id.toString(), d2.city, d2.region, d2.name, d2.estate_type2, d2.address, score] + println d1.region +" "+d1.name +" "+d1.address +" 閲嶅鏁版嵁锛�"+d2.region+" "+d2.name+" "+d2.address+") score:"+score } } } @@ -118,25 +118,25 @@ class DistrictRepeatBatch { def resultProcess(){ - ExcelUtils.multiThreadingModify("D:\\数据\\小区重复数据处理.xlsx",{d-> - if(d["O"] && !d["O"].contains("不处理") && !d['R']){ - if(d['O']=="K列改为商住" || d["O"] == "修改K列为别墅"){ + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\灏忓尯閲嶅鏁版嵁澶勭悊.xlsx",{d-> + if(d["O"] && !d["O"].contains("涓嶅鐞�") && !d['R']){ + if(d['O']=="K鍒楁敼涓哄晢浣�" || d["O"] == "淇敼K鍒椾负鍒"){ def updteId = d['H'] def q = new BasicDBObject() q.put("_id", new ObjectId(updteId)) def udata = new BasicDBObject() - if(d['O']=="K列改为商住" ){ - udata.put("estate_type2", "商住") + if(d['O']=="K鍒楁敼涓哄晢浣�" ){ + udata.put("estate_type2", "鍟嗕綇") }else{ - udata.put("estate_type2", "别墅") + udata.put("estate_type2", "鍒") } udata.put("m_date", new Date()) DbUtils.seaweed.update(q, new BasicDBObject('$set', udata)) saveOptLog(d["I"], d["J"], d["K"], "update") - d["R"] = "库中已处理" + d["R"] = "搴撲腑宸插鐞�" } - else if(d["O"] == "都删"){ + else if(d["O"] == "閮藉垹"){ def udata = new BasicDBObject() udata.put("status", 1) udata.put("m_date", new Date()) @@ -144,9 +144,9 @@ class DistrictRepeatBatch { saveOptLog(d["B"], d["C"], d["D"], "remove") DbUtils.seaweed.update(new BasicDBObject("_id", new ObjectId(d["H"])), new BasicDBObject('$set', udata)) saveOptLog(d["I"], d["J"], d["K"], "remove") - d["R"] = "库中已处理" + d["R"] = "搴撲腑宸插鐞�" } - else if(d["O"]=="删除K列小区"){ + else if(d["O"]=="鍒犻櫎K鍒楀皬鍖�"){ def udata = new BasicDBObject() udata.put("status", 1) udata.put("m_date", new Date()) @@ -161,7 +161,7 @@ class DistrictRepeatBatch { def s1 = d['D'].replace(d['K'], "") def s2 = d['K'].replace(d['D'], "") def addNameAlias = true - if(s1=="小区" || s2=="小区" || s1=="别墅" || s2 == "别墅" || s1=="商住" || s2=="商住"){ + if(s1=="灏忓尯" || s2=="灏忓尯" || s1=="鍒" || s2 == "鍒" || s1=="鍟嗕綇" || s2=="鍟嗕綇"){ addNameAlias = false } if(addNameAlias){ @@ -210,7 +210,7 @@ class DistrictRepeatBatch { } } - d["R"] = "库中已处理" + d["R"] = "搴撲腑宸插鐞�" } } }) @@ -225,7 +225,7 @@ class DistrictRepeatBatch { obj.put("c_date", new Date()) obj.put("m_date", new Date()) obj.put("type", type) - obj.put("user_name", "高娟") + obj.put("user_name", "楂樺") obj.put("origin", "script") OPERATION_LOG_COLL.save(obj) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/GXDdistrictMatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/GXDdistrictMatch.groovy index 1c45b42e4..cbf7fa581 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/GXDdistrictMatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/GXDdistrictMatch.groovy @@ -34,9 +34,9 @@ class 8GXDdistrictMatch { // task.runDb() // task.hainanMatch() -// task.updateDistStatus()//恢复name_cat不正常数据 -// task.saveToDB() //保存新增小区 -// task.restoreDist()//恢复小区status=0 +// task.updateDistStatus()//鎭㈠name_cat涓嶆甯告暟鎹� +// task.saveToDB() //淇濆瓨鏂板灏忓尯 +// task.restoreDist()//鎭㈠灏忓尯status=0 // task.runMatch() @@ -51,10 +51,10 @@ class 8GXDdistrictMatch { } def addOldMatch(){ - //老匹配 + //鑰佸尮閰� def fileName = "/home/goojia/gj/map.xlsx" if (CommonDatautils.isWindow()) { - fileName = "C:\\Users\\gaojuan\\Downloads\\百度有围栏数据1.xlsx"//11城重新匹配.xlsx + fileName = "C:\\Users\\gaojuan\\Downloads\\鐧惧害鏈夊洿鏍忔暟鎹�1.xlsx"//11鍩庨噸鏂板尮閰�.xlsx } ExcelUtils.multiThreadingModify(fileName, { d -> @@ -81,8 +81,8 @@ class 8GXDdistrictMatch { } def addOldMatch2(){ - //老匹配 - def fileName = "D:\\数据\\建行\\房产估值\\建行业务反馈badcase.xlsx"//11城重新匹配.xlsx + //鑰佸尮閰� + def fileName = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\寤鸿涓氬姟鍙嶉badcase.xlsx"//11鍩庨噸鏂板尮閰�.xlsx ExcelUtils.multiThreadingModify(fileName, { d -> println d['C'] if(!d['AJ']){ @@ -107,7 +107,7 @@ class 8GXDdistrictMatch { } def hainanMatch(){ - def fileName = "D:\\数据\\小区\\海南未匹配地址-1.xlsx" + def fileName = "D:\\鏁版嵁\\灏忓尯\\娴峰崡鏈尮閰嶅湴鍧�-1.xlsx" ExcelUtils.multiThreadingModify(fileName, { d -> if(d['D'] && d['F'] ){// // def jsonObject = com.fangjia.script.gj.district.FangjiaClientUtils.formatNinelevel(null, d['I']) @@ -127,9 +127,9 @@ class 8GXDdistrictMatch { if(fullCityObj){ // def fullRegion = regionCodeDataMap.get(d['A']+"#"+d['E']) - def obj = findDatasByCityAndName(formatCity, d['D'].replaceAll('[·\\(\\)()]|·', '')) + def obj = findDatasByCityAndName(formatCity, d['D'].replaceAll('[路\\(\\)锛堬級]|路', '')) if(obj){ - d['U'] = "楼盘抓取库" + d['U'] = "妤肩洏鎶撳彇搴�" d['V'] = obj.city d['W'] = obj.region d['X'] = obj.name @@ -147,7 +147,7 @@ class 8GXDdistrictMatch { } def runDb(){ - def fileName = "D:\\数据\\国信达\\国信达11城未匹配数据.xlsx" + def fileName = "D:\\鏁版嵁\\鍥戒俊杈綷\鍥戒俊杈�11鍩庢湭鍖归厤鏁版嵁.xlsx" ExcelUtils.modify(fileName, { d -> if(!d['U']){ def fullCityObj = fullCityMap.get(d['AD']) @@ -155,7 +155,7 @@ class 8GXDdistrictMatch { def fullRegion = regionCodeDataMap.get(d['A']+"#"+d['E']) def obj = findPoiFromDB(fullCityObj.city, fullRegion, d['C']) if(obj){ - d['U'] = "地图库" + d['U'] = "鍦板浘搴�" d['V'] = obj.city d['W'] = obj.region d['X'] = obj.name @@ -164,9 +164,9 @@ class 8GXDdistrictMatch { d['AA'] = obj.lng d['AB'] = obj.lat }else{ - obj = findDatas(d['AD'], d['AE'], d['C'], d['C'].replaceAll('[·\\(\\)()]|·', '')) + obj = findDatas(d['AD'], d['AE'], d['C'], d['C'].replaceAll('[路\\(\\)锛堬級]|路', '')) if(obj){ - d['U'] = "楼盘抓取库" + d['U'] = "妤肩洏鎶撳彇搴�" d['V'] = obj.city d['W'] = obj.region d['X'] = obj.name @@ -195,7 +195,7 @@ class 8GXDdistrictMatch { def run(){ - def fileName = "D:\\数据\\国信达\\接口匹配.xlsx"//11城重新匹配.xlsx + def fileName = "D:\\鏁版嵁\\鍥戒俊杈綷\鎺ュ彛鍖归厤.xlsx"//11鍩庨噸鏂板尮閰�.xlsx ExcelUtils.multiThreadingModify(fileName, { d -> println d['C'] if(!d['V'] && d['A']){ @@ -208,18 +208,18 @@ class 8GXDdistrictMatch { if (region) { d = match(city, region, d) } else { - println d['A'] + "#" + d['E'] + " 区域无法格式化" + println d['A'] + "#" + d['E'] + " 鍖哄煙鏃犳硶鏍煎紡鍖�" } } else { - println d['A'] + "#" + d['E'] + " 无法格式化" + println d['A'] + "#" + d['E'] + " 鏃犳硶鏍煎紡鍖�" } } }) } def runMatch(){ - def fileName = "D:\\数据\\福州\\建行测试匹配.xlsx"//11城重新匹配.xlsx 福州贝壳数据.xlsx + def fileName = "D:\\鏁版嵁\\绂忓窞\\寤鸿娴嬭瘯鍖归厤.xlsx"//11鍩庨噸鏂板尮閰�.xlsx 绂忓窞璐濆3鏁版嵁.xlsx ExcelUtils.multiThreadingModify(fileName, { d -> def city = d['A'] @@ -229,17 +229,17 @@ class 8GXDdistrictMatch { if (region) { d = match(city, region, d) } else { - println d['A'] + "#" + d['E'] + " 区域无法格式化" + println d['A'] + "#" + d['E'] + " 鍖哄煙鏃犳硶鏍煎紡鍖�" } } }) } def updateDistStatus(){ - def fileName = "D:\\数据\\国信达\\国信达11城(全).xlsx" + def fileName = "D:\\鏁版嵁\\鍥戒俊杈綷\鍥戒俊杈�11鍩�(鍏�).xlsx" def index = 0 ExcelUtils.modify(fileName, { d -> - if(d['U'] && ["名称匹配","名称匹配(Update)","名称在别名中","名称在别名中(Update)","别名匹配"].contains(d['U'])){ + if(d['U'] && ["鍚嶇О鍖归厤","鍚嶇О鍖归厤(Update)","鍚嶇О鍦ㄥ埆鍚嶄腑","鍚嶇О鍦ㄥ埆鍚嶄腑(Update)","鍒悕鍖归厤"].contains(d['U'])){ index++ def status = d['Z'] @@ -265,7 +265,7 @@ class 8GXDdistrictMatch { } def restoreDist(){ - def fileName = "D:\\数据\\国信达\\11城小区需恢复数据.xlsx"//国信达11城(全).xlsx + def fileName = "D:\\鏁版嵁\\鍥戒俊杈綷\11鍩庡皬鍖洪渶鎭㈠鏁版嵁.xlsx"//鍥戒俊杈�11鍩�(鍏�).xlsx def index = 0 ExcelUtils.modify(fileName, { d -> if(d['U']){ @@ -289,14 +289,14 @@ class 8GXDdistrictMatch { } def saveToDB(){ -// def fileName = "D:\\数据\\国信达\\国信达11城未匹配数据.xlsx" - def fileName = "D:\\数据\\小区\\海南新增小区.xlsx" +// def fileName = "D:\\鏁版嵁\\鍥戒俊杈綷\鍥戒俊杈�11鍩庢湭鍖归厤鏁版嵁.xlsx" + def fileName = "D:\\鏁版嵁\\灏忓尯\\娴峰崡鏂板灏忓尯.xlsx" ExcelUtils.modify(fileName, { d -> if(d['A'] && d['C']){ def udata = new BasicDBObject() udata.put("city", d['A']) udata.put("region", d['B']) - def name = d['C'].replaceAll('[·\\(\\)()]|·', '').replace("建设中", "") + def name = d['C'].replaceAll('[路\\(\\)锛堬級]|路', '').replace("寤鸿涓�", "") udata.put("name", name) // def alias = [] @@ -318,18 +318,18 @@ class 8GXDdistrictMatch { udata.put("status", 0) udata.put("name_cat", 0) udata.put("cat", "district") -// udata.put("username", "高娟") +// udata.put("username", "楂樺") - def estateType2 = "普通住宅" + def estateType2 = "鏅�氫綇瀹�" def type = "" if(d['D']){ type = d['D'] } if(type){ - if(type.contains("别墅")){ - estateType2 = "别墅" - }else if(type.contains("商住")){ - estateType2 = "商住" + if(type.contains("鍒")){ + estateType2 = "鍒" + }else if(type.contains("鍟嗕綇")){ + estateType2 = "鍟嗕綇" } } udata.put("estate_type2", estateType2) @@ -339,7 +339,7 @@ class 8GXDdistrictMatch { Long lat = d['G'] * 10000000000 udata.put("lat", lat) udata.put("lng", lng) - // 高德转百度 + // 楂樺痉杞櫨搴� def baidu = BaiDuApiUtils.geoconv(d['F'].toString().toDouble(), d['G'].toString().toDouble(), 3) def lng2 = baidu.x def lat2 = baidu.y @@ -353,7 +353,7 @@ class 8GXDdistrictMatch { udata.put("c_date", new Date()) udata.put("m_date", new Date()) def markMap = [:] - markMap.put("data_source", "机器入库") + markMap.put("data_source", "鏈哄櫒鍏ュ簱") udata.put("mark_map",markMap) // udata.put("is_new", 0) DbUtils.seaweed.save(udata) @@ -361,7 +361,7 @@ class 8GXDdistrictMatch { // def s = FangjiaClientUtils.saveOrUpdateDistrict(udata) println name // def opt = "add" -// if(s && s=='成功'){ +// if(s && s=='鎴愬姛'){ // saveOptLog(udata.city, udata.region, udata.name, opt) // } } @@ -370,7 +370,7 @@ class 8GXDdistrictMatch { } def checkDist(){ - ExcelUtils.multiThreadingModify("D:\\数据\\小区\\海南未匹配地址-1.xlsx", { d -> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\灏忓尯\\娴峰崡鏈尮閰嶅湴鍧�-1.xlsx", { d -> if(d['V'] && d['W'] && d['X']){ matching(d['V'], d['W'], d, d['X'], null, null) } @@ -378,11 +378,11 @@ class 8GXDdistrictMatch { } def match(city, region, d){ - d = matching(city, region, d, d['C'].replaceAll('[·\\(\\)()]|·', ''), d['D'], "") + d = matching(city, region, d, d['C'].replaceAll('[路\\(\\)锛堬級]|路', ''), d['D'], "") if(!d['U']){ - d = matching(city, region, d, d['C'].replace("小区","").replace("号楼","号院").replace("号","号院"), d['D'], "(Update)") + d = matching(city, region, d, d['C'].replace("灏忓尯","").replace("鍙锋ゼ","鍙烽櫌").replace("鍙�","鍙烽櫌"), d['D'], "(Update)") if(!d['U']){ - d = matching(city, region, d, d['C']+"小区", d['D'], "(Update)") + d = matching(city, region, d, d['C']+"灏忓尯", d['D'], "(Update)") } if(!d['U']){ @@ -403,10 +403,10 @@ class 8GXDdistrictMatch { } if(!d['U']){ - if(d['C'].contains("小区")){ - d = matching2(city, region, d, d['C'].replace("小区",""), d['D'], "(Update)") + if(d['C'].contains("灏忓尯")){ + d = matching2(city, region, d, d['C'].replace("灏忓尯",""), d['D'], "(Update)") }else{ - d = matching2(city, region, d, d['C']+"小区", d['D'], "(Update)") + d = matching2(city, region, d, d['C']+"灏忓尯", d['D'], "(Update)") } } } @@ -426,7 +426,7 @@ class 8GXDdistrictMatch { } } if(jsonObject != null) { - d['U'] = "接口匹配" + d['U'] = "鎺ュ彛鍖归厤" d['V'] = jsonObject.get("city") d['W'] = jsonObject.get("district") d['X'] = jsonObject.get("name") @@ -450,26 +450,26 @@ class 8GXDdistrictMatch { def matching(city, region, d, name, alias, str){ - //正常状态下有没有 + //姝e父鐘舵�佷笅鏈夋病鏈� def rets = CommonDatautils.findDistrictList(city, region, name, "district") if(rets){ if(rets.size()>=1){ - d = setRowValue(rets[0], d, "名称匹配"+str) + d = setRowValue(rets[0], d, "鍚嶇О鍖归厤"+str) } }else{ rets = CommonDatautils.findDistrictByAlias(city, region, name, "district") if(rets && rets.size()>=1){ - d = setRowValue(rets[0], d, "名称在别名中"+str) + d = setRowValue(rets[0], d, "鍚嶇О鍦ㄥ埆鍚嶄腑"+str) }else{ rets = CommonDatautils.findDistrictByAddress(city, region, name, "district") if(rets && rets.size()>=1){ - d = setRowValue(rets[0], d, "名称在地址中"+str) + d = setRowValue(rets[0], d, "鍚嶇О鍦ㄥ湴鍧�涓�"+str) }else{ if (d['D'] && alias) { - rets = CommonDatautils.findDistrictByAlias(city, region, alias.replaceAll('[·\\(\\)()]|·', ''), "district") + rets = CommonDatautils.findDistrictByAlias(city, region, alias.replaceAll('[路\\(\\)锛堬級]|路', ''), "district") if (rets) { if (rets.size() >= 1) { - d = setRowValue(rets[0], d, "别名匹配"+str) + d = setRowValue(rets[0], d, "鍒悕鍖归厤"+str) } } } @@ -484,20 +484,20 @@ class 8GXDdistrictMatch { } def matching2(city, region, d, name, alias, str){ - def rets = CommonDatautils.findAllStatusDistrict(city, region, name, "district")//包含删除的 + def rets = CommonDatautils.findAllStatusDistrict(city, region, name, "district")//鍖呭惈鍒犻櫎鐨� if(rets){ if (rets.size() >= 1) { - d = setRowValue(rets[0], d, "名称匹配(非正常)"+str) + d = setRowValue(rets[0], d, "鍚嶇О鍖归厤锛堥潪姝e父锛�"+str) } }else{ rets = CommonDatautils.findAllStatusDistrictByAlias(city, region, name, "district") if (rets && rets.size() >= 1) { - d = setRowValue(rets[0], d, "别名匹配(非正常)"+str) + d = setRowValue(rets[0], d, "鍒悕鍖归厤锛堥潪姝e父锛�"+str) }else{ rets = CommonDatautils.findAllStatusDistrictByAlias(city, region, alias, "district") if (rets.size() >= 1) { - d = setRowValue(rets[0], d, "别名匹配(非正常)"+str) + d = setRowValue(rets[0], d, "鍒悕鍖归厤锛堥潪姝e父锛�"+str) } } } @@ -512,7 +512,7 @@ class 8GXDdistrictMatch { def rets = CommonDatautils.findDistrictByAddress(city, region, d['F']+d['G'],"district") if(rets){ if (rets.size() >= 1) { - d = setRowValue(rets[0], d, "地址匹配") + d = setRowValue(rets[0], d, "鍦板潃鍖归厤") } } if(rets){ @@ -547,7 +547,7 @@ class 8GXDdistrictMatch { } def filterSpacialChar(def s){ - def pattern = ~/[()!;\·]\[【】()]/ + def pattern = ~/[()!;\路]\[銆愩�戯紙锛塢/ def matcher = pattern.matcher(s) def count = matcher.getCount() @@ -569,7 +569,7 @@ class 8GXDdistrictMatch { if(rets){ def obj = null for(def r : rets){ - if(r.property_type && (r.property_type.contains("住宅") || r.property_type.contains("别墅") || r.property_type.contains("公寓"))){ + if(r.property_type && (r.property_type.contains("浣忓畢") || r.property_type.contains("鍒") || r.property_type.contains("鍏瘬"))){ obj = r break } @@ -596,7 +596,7 @@ class 8GXDdistrictMatch { if(rets){ def obj = null for(def r : rets){ - if(r.property_type && (r.property_type.contains("住宅") || r.property_type.contains("别墅") || r.property_type.contains("公寓"))){ + if(r.property_type && (r.property_type.contains("浣忓畢") || r.property_type.contains("鍒") || r.property_type.contains("鍏瘬"))){ obj = r break } @@ -620,7 +620,7 @@ class 8GXDdistrictMatch { obj.put("c_date", new Date()) obj.put("m_date", new Date()) obj.put("type", type) - obj.put("user_name", "高娟") + obj.put("user_name", "楂樺") obj.put("origin", "script") OPERATION_LOG_COLL.save(obj) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/MinglujiData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/MinglujiData.groovy index 99b05841f..d687ccaee 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/MinglujiData.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/MinglujiData.groovy @@ -8,7 +8,7 @@ import com.mongodb.DBCollection import java.util.regex.Pattern /** - * 名录集 + * 鍚嶅綍闆� */ class MinglujiData { @@ -29,8 +29,8 @@ class MinglujiData { } def run(){ - def prov = "江苏省" - def city = "无锡" + def prov = "姹熻嫃鐪�" + def city = "鏃犻敗" exportDatas(city) // exportDatas(city) // matchDev(prov, city) @@ -46,7 +46,7 @@ class MinglujiData { } def exportDatas(city){ def datas = findMinglujiDatas(city) - ExcelUtils.write("D:\\数据\\数据建设\\名录集\\${city}.xlsx", datas, "数据") + ExcelUtils.write("D:\\鏁版嵁\\鏁版嵁寤鸿\\鍚嶅綍闆哱\${city}.xlsx", datas, "鏁版嵁") } def matchDev(prov, city){ def devs = loadAllDevs(prov) @@ -55,7 +55,7 @@ class MinglujiData { while(i<20) { def fileName = "/home/goojia/gj/mlj_${i}.xlsx" if (CommonDatautils.isWindow()) { - fileName = "D:\\数据\\数据建设\\名录集\\${city}_${i}.xlsx" + fileName = "D:\\鏁版嵁\\鏁版嵁寤鸿\\鍚嶅綍闆哱\${city}_${i}.xlsx" } File file=new File(fileName); if(file.exists()){ @@ -96,16 +96,16 @@ class MinglujiData { obj = findDevByPark(d['A'], d['B'], d['E']) if (!obj) { } else { - d['N'] = "园区" + d['N'] = "鍥尯" } } else { - d['N'] = "相似" + d['N'] = "鐩镐技" } } else { - d['N'] = "别名" + d['N'] = "鍒悕" } } else { - d['N'] = "相同" + d['N'] = "鐩稿悓" } if (obj) { d['M'] = obj.name @@ -116,14 +116,14 @@ class MinglujiData { }) } i++ - println fileName +" 完成(匹配开发区不使用接口)" + println fileName +" 瀹屾垚(鍖归厤寮�鍙戝尯涓嶄娇鐢ㄦ帴鍙�)" } } def tempMatchDev(prov){ def devs = loadAllDevs(prov) - ExcelUtils.multiThreadingModify("D:\\数据\\数据建设\\名录集\\湖州-开发区-等级.xlsx",{d-> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\鏁版嵁寤鸿\\鍚嶅綍闆哱\婀栧窞-寮�鍙戝尯-绛夌骇.xlsx",{d-> if(d['U'] && !d['W'] ){ def obj = findDevByName(null, d['U']) if(!obj){ @@ -134,16 +134,16 @@ class MinglujiData { obj = findDevByPark(d['A'], d['B'], d['U']) if (!obj) { }else{ - d['X'] = "园区" + d['X'] = "鍥尯" } }else{ - d['X'] = "相似" + d['X'] = "鐩镐技" } }else{ - d['X'] = "别名" + d['X'] = "鍒悕" } }else{ - d['X'] = "相同" + d['X'] = "鐩稿悓" } if(obj){ d['W'] = obj.name @@ -159,7 +159,7 @@ class MinglujiData { while(i<20){ def fileName = "/home/goojia/gj/mlj_${i}.xlsx" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\数据建设\\名录集\\${city}_${i}.xlsx" + fileName = "D:\\鏁版嵁\\鏁版嵁寤鸿\\鍚嶅綍闆哱\${city}_${i}.xlsx" } File file=new File(fileName); @@ -172,10 +172,10 @@ class MinglujiData { if(!list){ }else{ - d['T'] = "包含" + d['T'] = "鍖呭惈" } }else{ - d['T'] = "相同" + d['T'] = "鐩稿悓" } if(list){ if(list.size()==1){ @@ -199,7 +199,7 @@ class MinglujiData { } } }, 0) - println fileName +" 运行完成" + println fileName +" 杩愯瀹屾垚" } i++ } @@ -210,10 +210,10 @@ class MinglujiData { while(i<20) { def fileName = "/home/goojia/gj/mlj_${i}.xlsx" if (CommonDatautils.isWindow()) { - fileName = "D:\\数据\\数据建设\\名录集\\${city}_${i}.xlsx" + fileName = "D:\\鏁版嵁\\鏁版嵁寤鸿\\鍚嶅綍闆哱\${city}_${i}.xlsx" } - println "开始读取:"+fileName + println "寮�濮嬭鍙栵細"+fileName File file = new File(fileName); if (file.exists()) { ExcelUtils.multiThreadingModify(fileName,{d-> @@ -262,25 +262,25 @@ class MinglujiData { d['AB'] = jsonObject.get("streetNumber") road = road + jsonObject.get("streetNumber") } else { - d['AC'] = "信息不完整" + d['AC'] = "淇℃伅涓嶅畬鏁�" } if (!d['AC'] && !d['J'].contains(road)) { - d['AC'] = "原地址不含路" + d['AC'] = "鍘熷湴鍧�涓嶅惈璺�" } if (!d['AC']) { - def flag = road.matches('^[\u4e00-\u9fa5]+?(路|大道|巷|胡同|街).+[弄号]$') + def flag = road.matches('^[\u4e00-\u9fa5]+?(璺瘄澶ч亾|宸穦鑳″悓|琛�).+[寮勫彿]$') if (!flag) { - d['AC'] = "路非法" + d['AC'] = "璺潪娉�" } def roadsize = jsonObject.get("street").size() if (!d['AC'] && (roadsize < 3 || roadsize > 7)) { - d['AC'] = "路太长|路太短" + d['AC'] = "璺お闀縷璺お鐭�" } } }else{ - d['AC'] = "无地址" + d['AC'] = "鏃犲湴鍧�" } if (jsonObject.get("dev") && jsonObject.get("dev") != "null") { @@ -297,7 +297,7 @@ class MinglujiData { } } },0) - println fileName +" 九级拆分完成" + println fileName +" 涔濈骇鎷嗗垎瀹屾垚" } i++ } @@ -309,10 +309,10 @@ class MinglujiData { if(!obj){ obj = findDevByAlias(city, name) if(obj){ - obj.match_way = "别名" + obj.match_way = "鍒悕" } }else{ - obj.match_way = "相同" + obj.match_way = "鐩稿悓" } return obj } @@ -322,7 +322,7 @@ class MinglujiData { while(i<20) { def fileName = "/home/goojia/gj/mlj_${i}.xlsx" if (CommonDatautils.isWindow()) { - fileName = "D:\\数据\\数据建设\\名录集\\${city}_${i}.xlsx" + fileName = "D:\\鏁版嵁\\鏁版嵁寤鸿\\鍚嶅綍闆哱\${city}_${i}.xlsx" } File file = new File(fileName); @@ -339,24 +339,24 @@ class MinglujiData { }) } i++ - println fileName +" 五级拆分完成" + println fileName +" 浜旂骇鎷嗗垎瀹屾垚" } } def checkDev(){ - ExcelUtils.multiThreadingModify("D:\\数据\\数据建设\\名录集\\嘉兴入库数据.xlsx",{d-> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\鏁版嵁寤鸿\\鍚嶅綍闆哱\鍢夊叴鍏ュ簱鏁版嵁.xlsx",{d-> if(d['F']){ def obj = findDevByName(null, d['F']) if(obj){ - d['I'] = "库中" + d['I'] = "搴撲腑" }else{ - d['I'] = "非库中" + d['I'] = "闈炲簱涓�" } } }) } def saveMljData(){ - ExcelUtils.multiThreadingModify("D:\\数据\\数据建设\\名录集\\嘉兴入库数据.xlsx",{d-> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\鏁版嵁寤鸿\\鍚嶅綍闆哱\鍢夊叴鍏ュ簱鏁版嵁.xlsx",{d-> def obj = new BasicDBObject() obj.put("province", d['A']) obj.put("city", d['B']) @@ -376,7 +376,7 @@ class MinglujiData { } def findDebBySimlar(def devs, def name, def city){ - name = name.replace("经济开发区", "经济技术开发区").replace("工业园区", "工业园") + name = name.replace("缁忔祹寮�鍙戝尯", "缁忔祹鎶�鏈紑鍙戝尯").replace("宸ヤ笟鍥尯", "宸ヤ笟鍥�") def last = null for(def d : devs){ def alias1 = null @@ -391,7 +391,7 @@ class MinglujiData { if(alias1){ try { for(def n : alias1){ - n = n.replace("经济开发区", "经济技术开发区").replace("工业园区", "工业园") + n = n.replace("缁忔祹寮�鍙戝尯", "缁忔祹鎶�鏈紑鍙戝尯").replace("宸ヤ笟鍥尯", "宸ヤ笟鍥�") if(d.city && d.city.contains(city) && (n.contains(name) || name.contains(n))){ last = d break @@ -428,23 +428,23 @@ class MinglujiData { def findDevBySimlar(name){ def q = new BasicDBObject() - q.put('name',new BasicDBObject('$regex', Pattern.compile('^.*'+name+'.*$', Pattern.CASE_INSENSITIVE))) //名称 模糊查询 + q.put('name',new BasicDBObject('$regex', Pattern.compile('^.*'+name+'.*$', Pattern.CASE_INSENSITIVE))) //鍚嶇О 妯$硦鏌ヨ return development_zone_CONN.findOne(q) } def findDevByPark(prov, city, name){ def q = new BasicDBObject() - q.put('province',new BasicDBObject('$regex', Pattern.compile('^.*'+prov+'.*$', Pattern.CASE_INSENSITIVE))) //名称 模糊查询 - q.put('city',new BasicDBObject('$regex', Pattern.compile('^.*'+city+'.*$', Pattern.CASE_INSENSITIVE))) //名称 模糊查询 - q.put('park',new BasicDBObject('$regex', Pattern.compile('^.*'+name+'.*$', Pattern.CASE_INSENSITIVE))) //名称 模糊查询 - q.put("type", "园区") + q.put('province',new BasicDBObject('$regex', Pattern.compile('^.*'+prov+'.*$', Pattern.CASE_INSENSITIVE))) //鍚嶇О 妯$硦鏌ヨ + q.put('city',new BasicDBObject('$regex', Pattern.compile('^.*'+city+'.*$', Pattern.CASE_INSENSITIVE))) //鍚嶇О 妯$硦鏌ヨ + q.put('park',new BasicDBObject('$regex', Pattern.compile('^.*'+name+'.*$', Pattern.CASE_INSENSITIVE))) //鍚嶇О 妯$硦鏌ヨ + q.put("type", "鍥尯") return dev_mapping_CONN.findOne(q) } def findCommunityByName(province, city, name){ def q = new BasicDBObject() - q.put("province_name", province+"省") - q.put("city_name", city+"市") + q.put("province_name", province+"鐪�") + q.put("city_name", city+"甯�") q.put("name", name) def dbcursor = community_100_CONN.find(q) def list = [] @@ -456,8 +456,8 @@ class MinglujiData { def findCommunityBySimlar(province, city, name){ def q = new BasicDBObject() - q.put("province_name", province+"省") - q.put("city_name", city+"市") + q.put("province_name", province+"鐪�") + q.put("city_name", city+"甯�") q.put("name", new BasicDBObject('$regex', Pattern.compile('^'+name+'.*$', Pattern.CASE_INSENSITIVE))) def dbcursor = community_100_CONN.find(q) def list = [] @@ -481,7 +481,7 @@ class MinglujiData { keys.put("province",1) def datas = mlj_COLL.find(new BasicDBObject("c_city", city), keys) def rets = [] - rets << ["省","城市","区域","街道","开发区名","类型","公司名","社区","居委","地址","拆分街道","拆分居委","匹配开发区名"] + rets << ["鐪�","鍩庡競","鍖哄煙","琛楅亾","寮�鍙戝尯鍚�","绫诲瀷","鍏徃鍚�","绀惧尯","灞呭","鍦板潃","鎷嗗垎琛楅亾","鎷嗗垎灞呭","鍖归厤寮�鍙戝尯鍚�"] for(def d : datas){ def street = d.c_street def splitStreet = "" diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/NewGaoDePoiBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/NewGaoDePoiBatch.groovy index 70b407ceb..968af87b4 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/NewGaoDePoiBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/NewGaoDePoiBatch.groovy @@ -28,7 +28,7 @@ import java.util.concurrent.ExecutorService import java.util.concurrent.Executors import java.util.concurrent.atomic.AtomicLong /** - * 新版poi处理入库(第二批) + * 鏂扮増poi澶勭悊鍏ュ簱锛堢浜屾壒锛� */ @BatchOwner(Watcher.GaoJuan) class NewGaoDePoiBatch extends BaseBatch{ @@ -52,7 +52,7 @@ class NewGaoDePoiBatch extends BaseBatch{ def run(){ if (CommonDatautils.isWindow()) { - TAGS = getAllPoiType("D:\\数据\\数据建设\\Poi\\POI分类白名单.xlsx") + TAGS = getAllPoiType("D:\\鏁版嵁\\鏁版嵁寤鸿\\Poi\\POI鍒嗙被鐧藉悕鍗�.xlsx") }else{ TAGS = getAllPoiType("/home/goojia/gj/POI_TYPES.xlsx") } @@ -60,7 +60,7 @@ class NewGaoDePoiBatch extends BaseBatch{ def cityList = CommonDatautils.findFullNameCitys().reverse() for(def cityObj : cityList){ -// if(cityObj.city == "胡杨河市"){ +// if(cityObj.city == "鑳℃潹娌冲競"){ def results = CommonDatautils.findAllNewPoiDatas(cityObj.city) println cityObj.province+" " +cityObj.city+" "+results.size() if(results){ @@ -136,7 +136,7 @@ class NewGaoDePoiBatch extends BaseBatch{ if(newDistrict){ saveObj.district = newDistrict }else{ - println map.city +" "+map.district +" 格式化不出区域" + println map.city +" "+map.district +" 鏍煎紡鍖栦笉鍑哄尯鍩�" } saveObj.name = map.name @@ -151,7 +151,7 @@ class NewGaoDePoiBatch extends BaseBatch{ saveObj.spell_name = com.fangjia.core.util.DataUtil.hanyuQuanpin(map.name, " ") saveObj.version = version saveObj.data_id = map.map_id - saveObj.data_source = "高德地图" + saveObj.data_source = "楂樺痉鍦板浘" saveObj.data_source_year = "2024-11" saveObj.parent_id = map.parent_id @@ -219,8 +219,8 @@ class NewGaoDePoiBatch extends BaseBatch{ // break // } // } -// if(!saveObj.township && map.address && (map.address.contains("街道") || map.address.contains("镇") || map.address.contains("乡"))){ -// println map.address +" 含街道,镇,乡" +// if(!saveObj.township && map.address && (map.address.contains("琛楅亾") || map.address.contains("闀�") || map.address.contains("涔�"))){ +// println map.address +" 鍚閬�,闀囷紝涔�" // } // } } @@ -261,7 +261,7 @@ class NewGaoDePoiBatch extends BaseBatch{ } for(def regionName : alias){ - if(address.startsWith(regionName) && (regionName.endsWith("区") || regionName.endsWith("县"))){ + if(address.startsWith(regionName) && (regionName.endsWith("鍖�") || regionName.endsWith("鍘�"))){ address = address.substring(regionName.toString().length()) break } @@ -270,7 +270,7 @@ class NewGaoDePoiBatch extends BaseBatch{ } - if(address && address.toString().startsWith("市辖区")){ + if(address && address.toString().startsWith("甯傝緰鍖�")){ address = address.toString().substring(3) } @@ -325,12 +325,12 @@ class NewGaoDePoiBatch extends BaseBatch{ request.add(new IndexRequest("map_poi_2024", "_doc", map.data_id).source(map, XContentType.JSON)); - // 批量提交数据 + // 鎵归噺鎻愪氦鏁版嵁 if (request.numberOfActions() >= batchSize) { request.setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE); BulkResponse bulkResponse = client.bulk(request, RequestOptions.DEFAULT); if (bulkResponse.hasFailures()) { - // 处理错误 + // 澶勭悊閿欒 print "Bulk request has failures: " + bulkResponse.buildFailureMessage() } else { processedCount += request.numberOfActions(); @@ -345,7 +345,7 @@ class NewGaoDePoiBatch extends BaseBatch{ request.setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE); BulkResponse bulkResponse = client.bulk(request, RequestOptions.DEFAULT); if (bulkResponse.hasFailures()) { - // 处理错误 + // 澶勭悊閿欒 println "Bulk request has failures: " + bulkResponse.buildFailureMessage() } else { processedCount += request.numberOfActions(); @@ -365,20 +365,20 @@ class NewGaoDePoiBatch extends BaseBatch{ } def fileName = "/home/goojia/gj/poi/old_poi/merge_poi/${cityObj.city}.csv" if (CommonDatautils.isWindow()) { - fileName = "D:\\数据\\merge_poi\\${cityObj.city}.csv" + fileName = "D:\\鏁版嵁\\merge_poi\\${cityObj.city}.csv" } println fileName File file=new File(fileName); if(file.exists()){ def results = readCSV(fileName) - println "运行城市:"+cityObj.province+" " +cityObj.city+" "+results.size() + println "杩愯鍩庡競锛�"+cityObj.province+" " +cityObj.city+" "+results.size() if(results){ def megerMap = poiRepeat(cityObj.city, results) - println "待保存:" + cityObj.city +" "+megerMap.size() + println "寰呬繚瀛橈細" + cityObj.city +" "+megerMap.size() save(megerMap.values()) } }else{ - println fileName +" 不存在" + println fileName +" 涓嶅瓨鍦�" } } } @@ -392,7 +392,7 @@ class NewGaoDePoiBatch extends BaseBatch{ def townMap = CommonDatautils.queryTownByCity(city) def esMap = findEsPoiByCity(city) - println "Es 加载完成:"+new Date().format("yyyy-MM-dd HH:mm:ss") + println "Es 鍔犺浇瀹屾垚锛�"+new Date().format("yyyy-MM-dd HH:mm:ss") for(def i=0;i - def district = "嘉峪关市" + def district = "鍢夊唱鍏冲競" if(d.district){ district = d.district } @@ -481,7 +481,7 @@ class NewGaoDePoiBatch extends BaseBatch{ o.put("name", d.name) o.put("township", d.township) o.put("location", d.location) - regionMap.put(d.name.replace("-","").replace("·",""), o) + regionMap.put(d.name.replace("-","").replace("路",""), o) // map.put(district, regionMap) map.put(district, regionMap) }) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/NewPoiData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/NewPoiData.groovy index b84907b11..afbb7aca7 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/NewPoiData.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/NewPoiData.groovy @@ -32,8 +32,8 @@ class NewPoiData { } def noMatchData(){ - ExcelUtils.multiThreadingModify("d:\\数据\\未匹配写字楼2.xlsx", { d -> - if(d['H']!='地图'){ + ExcelUtils.multiThreadingModify("d:\\鏁版嵁\\鏈尮閰嶅啓瀛楁ゼ2.xlsx", { d -> + if(d['H']!='鍦板浘'){ def map = CommonDatautils.findOneThirdNetWorkOffice(d['A'], d['B'], d['C']) if(map){ d['E'] = map.lng @@ -43,7 +43,7 @@ class NewPoiData { }) } def matchByCity(){ - ExcelUtils.multiThreadingModify("d:\\数据\\入库写字楼.xlsx",{d-> + ExcelUtils.multiThreadingModify("d:\\鏁版嵁\\鍏ュ簱鍐欏瓧妤�.xlsx",{d-> def jsonObject = FangjiaClientUtils.newMatch(d['A'], d['A']+d['B']+d['C'], "office", false) def formatAddress = null if(d['D']){ @@ -74,20 +74,20 @@ class NewPoiData { def export(){ def rets = [] - rets << ["城市", "区域", "名称", "地址", "经度", "纬度"] + rets << ["鍩庡競", "鍖哄煙", "鍚嶇О", "鍦板潃", "缁忓害", "绾害"] rets.addAll(CommonDatautils.findNewPoiDatas()) - ExcelUtils.write("d:\\数据\\poi写字楼.xlsx", rets, "写字楼") + ExcelUtils.write("d:\\鏁版嵁\\poi鍐欏瓧妤�.xlsx", rets, "鍐欏瓧妤�") } def exportNetWorkOffice(){ def rets = [] - rets << ["城市", "区域", "名称", "地址", "经度", "纬度"] + rets << ["鍩庡競", "鍖哄煙", "鍚嶇О", "鍦板潃", "缁忓害", "绾害"] rets.addAll(CommonDatautils.findThirdNetWorkOffice()) - ExcelUtils.write("d:\\数据\\poi写字楼-网站.xlsx", rets, "写字楼") + ExcelUtils.write("d:\\鏁版嵁\\poi鍐欏瓧妤�-缃戠珯.xlsx", rets, "鍐欏瓧妤�") } def calcuteDistance(){ - ExcelUtils.multiThreadingModify("C:\\Users\\JLKJ0001\\Downloads\\商铺出租信息.xlsx", { d -> + ExcelUtils.multiThreadingModify("C:\\Users\\JLKJ0001\\Downloads\\鍟嗛摵鍑虹淇℃伅.xlsx", { d -> if(d['I']){ def arrs = d['I'].split(",") def distance = GeoHelper.GetDistance(arrs[1].toString().toDouble(),arrs[0].toDouble(), 22.512276,113.939156) @@ -101,7 +101,7 @@ class NewPoiData { def addDistrict(){ - def path = "D:\\数据\\入库写字楼.xlsx" + def path = "D:\\鏁版嵁\\鍏ュ簱鍐欏瓧妤�.xlsx" def keys = new CopyOnWriteArrayList() def index = 0 ExcelUtils.modify(path, { d-> @@ -116,10 +116,10 @@ class NewPoiData { formatAddress = AddressUtil.formatAddress(city, address) } if(!formatAddress){ - if(address.contains("交叉口")){ - formatAddress = address.substring(0, address.toString().indexOf("交叉口")+3) - }else if(address.contains("交叉")){ - formatAddress = address.substring(0, address.toString().indexOf("交叉")+2) + if(address.contains("浜ゅ弶鍙�")){ + formatAddress = address.substring(0, address.toString().indexOf("浜ゅ弶鍙�")+3) + }else if(address.contains("浜ゅ弶")){ + formatAddress = address.substring(0, address.toString().indexOf("浜ゅ弶")+2) } } } @@ -136,7 +136,7 @@ class NewPoiData { blat = baidu.y * 10000000000L } - def estateType2 = "普通住宅" + def estateType2 = "鏅�氫綇瀹�" def key = city+"##"+region+"##"+name if(name && !keys.contains(key)){ def dist = CommonDatautils.findDistrict(city, region, name, "district") @@ -160,7 +160,7 @@ class NewPoiData { data.put("lng2",blng) } def markMap = [:] - markMap.put("data_source", "机器入库") + markMap.put("data_source", "鏈哄櫒鍏ュ簱") data.put("mark_map",markMap) index++ DbUtils.seaweed.save(data); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/PoiLocation.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/PoiLocation.groovy index 40e83e5ae..70633aac9 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/PoiLocation.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/PoiLocation.groovy @@ -43,7 +43,7 @@ class PoiLocation { def run(){ - def citys = ["深圳市"] + def citys = ["娣卞湷甯�"] citys = citys.reverse() for(def city : citys){ findPois(city) @@ -51,7 +51,7 @@ class PoiLocation { } def regionAndStreetProcess(){ - def citys = ['南平市','泉州市', '厦门市', '福州市', '龙岩市', '漳州市', '宁德市', '三明市', '莆田市'] + def citys = ['鍗楀钩甯�','娉夊窞甯�', '鍘﹂棬甯�', '绂忓窞甯�', '榫欏博甯�', '婕冲窞甯�', '瀹佸痉甯�', '涓夋槑甯�', '鑾嗙敯甯�'] for(def city : citys){ def datas = findAllPoisByCity(city) process(datas) @@ -81,8 +81,8 @@ class PoiLocation { def findPois(city){ def q = new BasicDBObject() q.put("city", city) - q.put("district", "坪山区") - q.put('address',new BasicDBObject('$regex', Pattern.compile('^.*兰竹东路8号.*$', Pattern.CASE_INSENSITIVE))) //名称 模糊查询 + q.put("district", "鍧北鍖�") + q.put('address',new BasicDBObject('$regex', Pattern.compile('^.*鍏扮涓滆矾8鍙�.*$', Pattern.CASE_INSENSITIVE))) //鍚嶇О 妯$硦鏌ヨ // q.put("run_status", new BasicDBObject('$ne', 1)) def keys = new BasicDBObject() @@ -161,7 +161,7 @@ class PoiLocation { def map = running(d) rets << map if(map.update_status && map.update_status!=100){ - println "[ ${index} ]"+d.city +" "+totalCount.get() +"/"+rets.size()+" "+map.id+" "+d.district+" 原:"+d.township+" 新:"+map.township + println "[ ${index} ]"+d.city +" "+totalCount.get() +"/"+rets.size()+" "+map.id+" "+d.district+" 鍘燂細"+d.township+" 鏂帮細"+map.township } if (map.update_status && map.update_status !=100) { updateMapPoi(map.id, map.township) @@ -186,7 +186,7 @@ class PoiLocation { def map =[:] if(d.location){ - //判断区域否在围栏里 + //鍒ゆ柇鍖哄煙鍚﹀湪鍥存爮閲� def regionFlag = null if(d.district){ for(def rs : regions){ @@ -197,7 +197,7 @@ class PoiLocation { } if(regionFlag){ - //判断township是否在统计局中 + //鍒ゆ柇township鏄惁鍦ㄧ粺璁″眬涓� if(d.township){ town = getSimilarTown(regions, d.city, d.township) } @@ -205,13 +205,13 @@ class PoiLocation { def newTown = getTownByLocation(d.city, regions, d.location) if(town){ if(town.street == d.township){ - //打标记 - map.run_status = 1 // 1:已运行 + //鎵撴爣璁� + map.run_status = 1 // 1:宸茶繍琛� map.id = d._id.toString() - map.update_status = 100 //1:区域有问题 2:乡镇街道需修改 3:2边区域不一致 100:不修改 + map.update_status = 100 //1锛氬尯鍩熸湁闂 2锛氫埂闀囪閬撻渶淇敼 3:2杈瑰尯鍩熶笉涓�鑷� 100:涓嶄慨鏀� }else{ - map.update_status = 2 //1:区域有问题 2:乡镇街道需修改 3:2边区域不一致 100:不修改 - map.run_status = 1 // 1:已运行 + map.update_status = 2 //1锛氬尯鍩熸湁闂 2锛氫埂闀囪閬撻渶淇敼 3:2杈瑰尯鍩熶笉涓�鑷� 100:涓嶄慨鏀� + map.run_status = 1 // 1:宸茶繍琛� map.id = d._id.toString() map.township = town.street } @@ -220,19 +220,19 @@ class PoiLocation { if(gaodeMap && gaodeMap.township && gaodeMap.township!='[]') { def mapTown = getSimilarTown(regions, d.city, gaodeMap.township) if (mapTown) { - map.update_status = 2 //1:区域有问题 2:乡镇街道需修改 3:2边区域不一致 - map.run_status = 1 // 1:已运行 + map.update_status = 2 //1锛氬尯鍩熸湁闂 2锛氫埂闀囪閬撻渶淇敼 3:2杈瑰尯鍩熶笉涓�鑷� + map.run_status = 1 // 1:宸茶繍琛� map.id = d._id.toString() map.township = mapTown.street }else{ if(d.district!=gaodeMap.district){ - map.update_status = 3 //1:区域有问题 2:乡镇街道需修改 3:2边区域不一致 - map.run_status = 1 // 1:已运行 + map.update_status = 3 //1锛氬尯鍩熸湁闂 2锛氫埂闀囪閬撻渶淇敼 3:2杈瑰尯鍩熶笉涓�鑷� + map.run_status = 1 // 1:宸茶繍琛� map.id = d._id.toString() map.township = "" }else{ - map.update_status = 2 //1:区域有问题 2:乡镇街道需修改 3:2边区域不一致 - map.run_status = 1 // 1:已运行 + map.update_status = 2 //1锛氬尯鍩熸湁闂 2锛氫埂闀囪閬撻渶淇敼 3:2杈瑰尯鍩熶笉涓�鑷� + map.run_status = 1 // 1:宸茶繍琛� map.id = d._id.toString() map.township = "" } @@ -240,9 +240,9 @@ class PoiLocation { } } }else{ - //打标记“经纬度有误,不在区域围栏中” - map.update_status = 1 //1:区域有问题 2:乡镇街道需修改 3:2边区域不一致 - map.run_status = 1 // 1:已运行 + //鎵撴爣璁扳�滅粡绾害鏈夎锛屼笉鍦ㄥ尯鍩熷洿鏍忎腑鈥� + map.update_status = 1 //1锛氬尯鍩熸湁闂 2锛氫埂闀囪閬撻渶淇敼 3:2杈瑰尯鍩熶笉涓�鑷� + map.run_status = 1 // 1:宸茶繍琛� map.id = d._id.toString() map.township = "" } @@ -255,7 +255,7 @@ class PoiLocation { def dataRun(d){ def regions = getFullRegion(d) if(d.location) { - //判断区域否在围栏里 + //鍒ゆ柇鍖哄煙鍚﹀湪鍥存爮閲� def regionFlag = null if (d.district) { for (def rs : regions) { @@ -265,14 +265,14 @@ class PoiLocation { } } - if (regionFlag) {//在围栏里 - //判断township是否在统计局中 + if (regionFlag) {//鍦ㄥ洿鏍忛噷 + //鍒ゆ柇township鏄惁鍦ㄧ粺璁″眬涓� // if(d.township){ // town = getSimilarTown(regions, d.city, d.township) // } - }else{//不在转栏里,重新搜索 + }else{//涓嶅湪杞爮閲岋紝閲嶆柊鎼滅储 println(d) } @@ -302,8 +302,8 @@ class PoiLocation { town = townObj }else if(townObj.alias && townObj.alias.contains(townstr)){ town = townObj - }else if(townObj.street.toString().endsWith("乡")||townObj.street.toString().endsWith("镇")||townObj.street.toString().endsWith("街道")||townObj.street.toString().endsWith("社区")||townObj.street.toString().endsWith("地区")){ - def newTown = townObj.street.replace("乡","").replace("镇","").replace("街道","").replace("社区","").replace("地区","") + }else if(townObj.street.toString().endsWith("涔�")||townObj.street.toString().endsWith("闀�")||townObj.street.toString().endsWith("琛楅亾")||townObj.street.toString().endsWith("绀惧尯")||townObj.street.toString().endsWith("鍦板尯")){ + def newTown = townObj.street.replace("涔�","").replace("闀�","").replace("琛楅亾","").replace("绀惧尯","").replace("鍦板尯","") if(townstr.contains(newTown)){ town = townObj } @@ -392,12 +392,12 @@ class PoiLocation { print "." } - // 批量提交数据 + // 鎵归噺鎻愪氦鏁版嵁 if (request.numberOfActions() >= batchSize) { request.setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE); BulkResponse bulkResponse = client.bulk(request, RequestOptions.DEFAULT); if (bulkResponse.hasFailures()) { - // 处理错误 + // 澶勭悊閿欒 print "Bulk request has failures: " + bulkResponse.buildFailureMessage() } else { processedCount += request.numberOfActions(); @@ -413,7 +413,7 @@ class PoiLocation { request.setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE); BulkResponse bulkResponse = client.bulk(request, RequestOptions.DEFAULT); if (bulkResponse.hasFailures()) { - // 处理错误 + // 澶勭悊閿欒 println "Bulk request has failures: " + bulkResponse.buildFailureMessage() } else { processedCount += request.numberOfActions(); @@ -421,7 +421,7 @@ class PoiLocation { } } - println "结束时间 "+new Date() + println "缁撴潫鏃堕棿 "+new Date() } @@ -440,7 +440,7 @@ class PoiLocation { if(udata){ MAPPOI_CONN.update(q, new BasicDBObject('$set', udata)) }else{ - println m.toString()+" 无法修改-无值" + println m.toString()+" 鏃犳硶淇敼-鏃犲��" } // } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/PoiNineSplitBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/PoiNineSplitBatch.groovy index bf7a84c06..29072d7cf 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/PoiNineSplitBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/PoiNineSplitBatch.groovy @@ -20,7 +20,7 @@ class PoiNineSplitBatch{ while(i<360) { def fileName = "/home/goojia/gj/new_poi/new_poi_address_split_${i}.xlsx" if (CommonDatautils.isWindow()) { - fileName = "D:\\数据\\new_poi\\new_poi_address_split_${i}.xlsx" + fileName = "D:\\鏁版嵁\\new_poi\\new_poi_address_split_${i}.xlsx" } File file = new File(fileName); @@ -42,9 +42,9 @@ class PoiNineSplitBatch{ } } }) - println fileName +" 九级拆分完成" + println fileName +" 涔濈骇鎷嗗垎瀹屾垚" }else{ - println fileName +" 文件不存在" + println fileName +" 鏂囦欢涓嶅瓨鍦�" } i++ } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/RegionStandardBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/RegionStandardBatch.groovy index e6a6feaa8..2c141f052 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/RegionStandardBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/RegionStandardBatch.groovy @@ -17,9 +17,9 @@ import org.elasticsearch.common.xcontent.XContentType import org.elasticsearch.index.query.QueryBuilder import org.elasticsearch.index.query.QueryBuilders /** - * 区域标准化 - * 1.小区库区域标准化,包含小区,商铺,写字楼 - * 2.poi数据库中 区域标准化 + * 鍖哄煙鏍囧噯鍖� + * 1.灏忓尯搴撳尯鍩熸爣鍑嗗寲锛屽寘鍚皬鍖猴紝鍟嗛摵锛屽啓瀛楁ゼ + * 2.poi鏁版嵁搴撲腑 鍖哄煙鏍囧噯鍖� */ class RegionStandardBatch extends BaseBatch{ @@ -38,7 +38,7 @@ class RegionStandardBatch extends BaseBatch{ // poiRegionStandard() // seaweedRegionStandard() // poiRegionStandard() - //通过乡镇街道修改区域 如:东莞市 + //閫氳繃涔¢晣琛楅亾淇敼鍖哄煙 濡傦細涓滆帪甯� // updateRegionByTown() } @@ -47,7 +47,7 @@ class RegionStandardBatch extends BaseBatch{ } def poiRegionStandard(){ - def runCitys = ["重庆","三明","龙岩","南平","漳州","福州","厦门","泉州","莆田","宁德"] + def runCitys = ["閲嶅簡","涓夋槑","榫欏博","鍗楀钩","婕冲窞","绂忓窞","鍘﹂棬","娉夊窞","鑾嗙敯","瀹佸痉"] def index = 0 def citys = CommonDatautils.findAllCity() for(def city : citys){ @@ -65,7 +65,7 @@ class RegionStandardBatch extends BaseBatch{ def fileName = "/home/goojia/gj/poi/${fullCityName}.csv" if (CommonDatautils.isWindow()) { - fileName = "D:\\数据\\poi\\${fullCityName}.csv" + fileName = "D:\\鏁版嵁\\poi\\${fullCityName}.csv" } File file=new File(fileName); if(file.exists()){ @@ -80,17 +80,17 @@ class RegionStandardBatch extends BaseBatch{ }else{ // haveStreetProcess(city, set, cat) - println "没找区域:"+city + println "娌℃壘鍖哄煙锛�"+city } }else{ - println "没找区域:"+city + println "娌℃壘鍖哄煙锛�"+city } }else{ - println fileName+" 文件没找到" + println fileName+" 鏂囦欢娌℃壘鍒�" } }else{ - println "没找到相应的全称:"+city + println "娌℃壘鍒扮浉搴旂殑鍏ㄧО锛�"+city } } @@ -100,7 +100,7 @@ class RegionStandardBatch extends BaseBatch{ def seaweedRegionStandardByCat(cat){ - def citys = ["伊春"]//CommonDatautils.findAllCity() + def citys = ["浼婃槬"]//CommonDatautils.findAllCity() for(def city : citys){ def rMap = regionMap.get(city) @@ -134,13 +134,13 @@ class RegionStandardBatch extends BaseBatch{ def udata = new BasicDBObject() udata.put("region", updateRegion) udata.put("m_date", new Date()) - println d.city +" "+d.region+" "+d.name +" 区域修改为:"+updateRegion + println d.city +" "+d.region+" "+d.name +" 鍖哄煙淇敼涓猴細"+updateRegion DbUtils.seaweed.update(new BasicDBObject("_id", d._id), new BasicDBObject('$set', udata)) }else{ def udata = new BasicDBObject() udata.put("status", 1) udata.put("m_date", new Date()) - println d.city +" "+d.region+" "+d.name +" 状态修改为:删除" + println d.city +" "+d.region+" "+d.name +" 鐘舵�佷慨鏀逛负锛氬垹闄�" DbUtils.seaweed.update(new BasicDBObject("_id", d._id), new BasicDBObject('$set', udata)) } } @@ -199,14 +199,14 @@ class RegionStandardBatch extends BaseBatch{ def udata = new BasicDBObject() udata.put("region", updateRegion) udata.put("m_date", new Date()) - println d.city +" "+d.region+" "+d.name +" 区域修改为:"+updateRegion + println d.city +" "+d.region+" "+d.name +" 鍖哄煙淇敼涓猴細"+updateRegion DbUtils.seaweed.update(new BasicDBObject("_id", d._id), new BasicDBObject('$set', udata)) }else{ if(flag!="pass"){ def udata = new BasicDBObject() udata.put("status", 1) udata.put("m_date", new Date()) - println d.city +" "+d.region+" "+d.name +" 状态修改为:删除" + println d.city +" "+d.region+" "+d.name +" 鐘舵�佷慨鏀逛负锛氬垹闄�" // DbUtils.seaweed.update(new BasicDBObject("_id", d._id), new BasicDBObject('$set', udata)) } } @@ -273,7 +273,7 @@ class RegionStandardBatch extends BaseBatch{ results.clear() } - println d.city +" "+d.district+" "+d.name +" "+d.status+" 区域修改为:"+updateRegion + println d.city +" "+d.district+" "+d.name +" "+d.status+" 鍖哄煙淇敼涓猴細"+updateRegion }else{ def m = [:] @@ -284,7 +284,7 @@ class RegionStandardBatch extends BaseBatch{ results.clear() } - println d.city +" "+d.district+" "+d.name +" "+d.status+" 状态修改为:删除" + println d.city +" "+d.district+" "+d.name +" "+d.status+" 鐘舵�佷慨鏀逛负锛氬垹闄�" } } @@ -294,7 +294,7 @@ class RegionStandardBatch extends BaseBatch{ updateRegionByEs(results) results.clear() } - println city +" 处理完成" + println city +" 澶勭悊瀹屾垚" } @@ -313,20 +313,20 @@ class RegionStandardBatch extends BaseBatch{ } try { - // 执行批量更新请求 + // 鎵ц鎵归噺鏇存柊璇锋眰 def bulkResponse = client.bulk(bulkRequest, RequestOptions.DEFAULT) - // 检查响应 + // 妫�鏌ュ搷搴� if (bulkResponse.hasFailures()) { - println("批量更新中有失败的操作:") + println("鎵归噺鏇存柊涓湁澶辫触鐨勬搷浣�:") bulkResponse.buildFailureMessage().each { println(it) } } else { - println("批量更新成功!") + println("鎵归噺鏇存柊鎴愬姛!") } } catch (Exception e) { e.printStackTrace() } finally { - // 关闭客户端 + // 鍏抽棴瀹㈡埛绔� try { client.close() } catch (Exception e) { @@ -338,14 +338,14 @@ class RegionStandardBatch extends BaseBatch{ // def queryPoiDatasByCity(){ // def esUrl = "http://localhost:9200/your_index/_search" -// def pageSize = 1000 // 每页返回的记录数 -// def scrollSize = '1m' // scroll上下文的生存时间 +// def pageSize = 1000 // 姣忛〉杩斿洖鐨勮褰曟暟 +// def scrollSize = '1m' // scroll涓婁笅鏂囩殑鐢熷瓨鏃堕棿 // -//// 初始化HttpClient和ObjectMapper +//// 鍒濆鍖朒ttpClient鍜孫bjectMapper // CloseableHttpClient httpClient = HttpClients.createDefault() // ObjectMapper objectMapper = new ObjectMapper() // -//// 初始化scroll请求 +//// 鍒濆鍖杝croll璇锋眰 // def scrollRequest = """ //{ // "size": $pageSize, @@ -356,7 +356,7 @@ class RegionStandardBatch extends BaseBatch{ //} //""" // -//// 发送scroll初始化请求 +//// 鍙戦�乻croll鍒濆鍖栬姹� // HttpGet scrollInitRequest = new HttpGet(esUrl) // scrollInitRequest.setEntity(new org.apache.http.entity.StringEntity(scrollRequest, "UTF-8")) // scrollInitRequest.setHeader("Content-Type", "application/json") @@ -365,10 +365,10 @@ class RegionStandardBatch extends BaseBatch{ // HttpEntity entity = scrollInitResponse.getEntity() // String scrollId = objectMapper.readValue(EntityUtils.toString(entity), Map.class).get("_scroll_id").toString() // -//// 存储所有结果 +//// 瀛樺偍鎵�鏈夌粨鏋� // def allResults = [] // -//// 发送scroll请求获取数据,直到没有更多数据为止 +//// 鍙戦�乻croll璇锋眰鑾峰彇鏁版嵁锛岀洿鍒版病鏈夋洿澶氭暟鎹负姝� // while (true) { // def scrollRequestWithId = """ // { @@ -387,23 +387,23 @@ class RegionStandardBatch extends BaseBatch{ // // def hits = responseMap.get("hits").get("hits") // if (hits.isEmpty()) { -// break // 没有更多数据,跳出循环 +// break // 娌℃湁鏇村鏁版嵁锛岃烦鍑哄惊鐜� // } // -// // 合并当前页的数据 +// // 鍚堝苟褰撳墠椤电殑鏁版嵁 // allResults.addAll(hits.map({ it.get("_source") })) // -// // 更新scrollId以进行下一次请求 +// // 鏇存柊scrollId浠ヨ繘琛屼笅涓�娆¤姹� // scrollId = responseMap.get("_scroll_id").toString() // } // -// // 关闭HttpClient +// // 鍏抽棴HttpClient // httpClient.close() // -// // 输出或处理全量数据 +// // 杈撳嚭鎴栧鐞嗗叏閲忔暟鎹� // println(allResults) // -// // 注意:实际应用中,你可能需要在获取完数据后清除scroll上下文,以释放资源。 +// // 娉ㄦ剰锛氬疄闄呭簲鐢ㄤ腑锛屼綘鍙兘闇�瑕佸湪鑾峰彇瀹屾暟鎹悗娓呴櫎scroll涓婁笅鏂囷紝浠ラ噴鏀捐祫婧愩�� // } def readCSV(filename){ def lines = FileUtils.readLines(new File(filename)) @@ -421,7 +421,7 @@ class RegionStandardBatch extends BaseBatch{ o.put("id", arrs[5]) rets << o }catch(Exception e){ - println filename+" 文件异常" + println filename+" 鏂囦欢寮傚父" } } @@ -431,7 +431,7 @@ class RegionStandardBatch extends BaseBatch{ } def updateRegionByTown(){ - ExcelUtils.modify("d:\\数据\\城市与区域相同写字楼.xlsx",{d-> + ExcelUtils.modify("d:\\鏁版嵁\\鍩庡競涓庡尯鍩熺浉鍚屽啓瀛楁ゼ.xlsx",{d-> def town = RegionData.formatRegion(d['B'], d['F']) if(town){ @@ -440,13 +440,13 @@ class RegionStandardBatch extends BaseBatch{ def udata = new BasicDBObject() udata.put("region", town) udata.put("m_date", new Date()) - println d['F']+" "+" 区域修改为:" + town + println d['F']+" "+" 鍖哄煙淇敼涓猴細" + town DbUtils.seaweed.update(new BasicDBObject("_id", new ObjectId(d['A'])), new BasicDBObject('$set', udata)) }else{ def udata = new BasicDBObject() udata.put("m_date", new Date()) udata.put("status", 1) - println d['F']+" "+" 删除:" + town + println d['F']+" "+" 鍒犻櫎锛�" + town DbUtils.seaweed.update(new BasicDBObject("_id", new ObjectId(d['A'])), new BasicDBObject('$set', udata)) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/RegionUpdateBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/RegionUpdateBatch.groovy index 748447212..61d8802ff 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/RegionUpdateBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/RegionUpdateBatch.groovy @@ -11,7 +11,7 @@ import java.util.concurrent.ExecutorService import java.util.concurrent.Executors import java.util.concurrent.atomic.AtomicLong -//更新第三方均价表中小区区域 +//鏇存柊绗笁鏂瑰潎浠疯〃涓皬鍖哄尯鍩� class RegionUpdateBatch { public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(50) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/SynchAdministrativeMappingDataBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/SynchAdministrativeMappingDataBatch.groovy index 225203124..72a19574c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/SynchAdministrativeMappingDataBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/SynchAdministrativeMappingDataBatch.groovy @@ -31,12 +31,12 @@ class SynchAdministrativeMappingDataBatch extends BaseBatch{ def retMap = getAdminiMappingTo100() synchToEs(retMap, "192.168.0.89", indexName) synchToEs(retMap, "192.168.0.52", indexName) - println(" 运行完成") + println(" 杩愯瀹屾垚") } def synchAdminiMappingTo100(){ - //删除旧的,再同步新的 + //鍒犻櫎鏃х殑锛屽啀鍚屾鏂扮殑 ADMINISTRATIVE_MAPPING_COLL_100.remove(new BasicDBObject()) def q = new BasicDBObject() @@ -80,7 +80,7 @@ class SynchAdministrativeMappingDataBatch extends BaseBatch{ def synchToEs(retMap, host, indexName){ QueryBuilder queryBuilder = QueryBuilders.boolQuery() -// queryBuilder.must(QueryBuilders.termQuery("street", "喀拉玛盖镇")) +// queryBuilder.must(QueryBuilders.termQuery("street", "鍠�鎷夌帥鐩栭晣")) def oldIds = new CopyOnWriteArrayList() ElasticUtils89.queryUpdate(host, indexName, queryBuilder, { String id, doc-> @@ -92,7 +92,7 @@ class SynchAdministrativeMappingDataBatch extends BaseBatch{ def val = doc.get(k) if(val!=v){ // if(k!="shape" || (k=="shape" && v.type!="MultiPolygon")){ - println k +" 修改 "+id + println k +" 淇敼 "+id updateFieldCount++ doc.put(k,v) // } @@ -100,11 +100,11 @@ class SynchAdministrativeMappingDataBatch extends BaseBatch{ } } if(mongoObj && updateFieldCount){ - //进行修改 + //杩涜淇敼 return true }else{ if(!mongoObj){ - println "删除:"+id +" "+doc.name + println "鍒犻櫎锛�"+id +" "+doc.name ElasticUtils.delete(id, host, indexName) return false } @@ -115,7 +115,7 @@ class SynchAdministrativeMappingDataBatch extends BaseBatch{ def addEsDatasMap = [:] retMap.each{id,map-> if(!oldIds.contains(id)){ - println "需新增:"+id + println "闇�鏂板锛�"+id map.remove("c_date") map.remove("m_date") map.remove("polyline_source") diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/SynchDevDataBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/SynchDevDataBatch.groovy index 7cc322652..3371051ec 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/SynchDevDataBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/SynchDevDataBatch.groovy @@ -13,7 +13,7 @@ import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.CopyOnWriteArrayList /** - * 将43上的开发区同步到mongo-100, es-89, es-52 + * 灏�43涓婄殑寮�鍙戝尯鍚屾鍒癿ongo-100, es-89, es-52 */ class SynchDevDataBatch extends BaseBatch{ @@ -43,7 +43,7 @@ class SynchDevDataBatch extends BaseBatch{ rets << r devMap.put(r._id.toString(), r) } - //删除旧的,再同步新的 + //鍒犻櫎鏃х殑锛屽啀鍚屾鏂扮殑 development_zone_CONN.remove(new BasicDBObject()) development_zone_CONN.insert(rets) return devMap; @@ -80,7 +80,7 @@ class SynchDevDataBatch extends BaseBatch{ // esDelIds << id // } // } -// println "Es删除开发区数量:"+esDelIds.size() +// println "Es鍒犻櫎寮�鍙戝尯鏁伴噺锛�"+esDelIds.size() } @@ -96,18 +96,18 @@ class SynchDevDataBatch extends BaseBatch{ if(!["id","_id" ,"build_date" ,"create_time","bd_shape","img_url","operator","operate_result","m_date","township","block"].contains(k)){ def val = doc.get(k) if(val!=v){ - println doc.name +" 修改 "+k+" "+ v+" "+id + println doc.name +" 淇敼 "+k+" "+ v+" "+id updateFieldCount++ doc.put(k,v) } } } if(mongoObj && updateFieldCount){ - //进行修改 + //杩涜淇敼 return true }else{ if(!mongoObj){ - println "删除:"+id +" "+doc.name + println "鍒犻櫎锛�"+id +" "+doc.name ElasticUtils.delete(id, host, indexName) return false } @@ -117,7 +117,7 @@ class SynchDevDataBatch extends BaseBatch{ def addEsDatasMap = [:] devMap.each{id,map-> if(!oldIds.contains(id)){ - println "需新增:"+id + println "闇�鏂板锛�"+id map.remove("create_time") map.remove("build_date") map.remove("bd_shape") diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/TempExportData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/TempExportData.groovy index c3d0bf761..634a77458 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/TempExportData.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/TempExportData.groovy @@ -26,8 +26,8 @@ class TempExportData { def task = new TempExportData() // task.run() // def rets = task.fzHouseStat() -// ExcelUtils.write("/home/goojia/gj/福州小区房源及第三方情况统计.xlsx", rets,"数据") -// println "文件已生成" +// ExcelUtils.write("/home/goojia/gj/绂忓窞灏忓尯鎴挎簮鍙婄涓夋柟鎯呭喌缁熻.xlsx", rets,"鏁版嵁") +// println "鏂囦欢宸茬敓鎴�" // exportDistShape() // task.exportDistrictAlias() task.exportOfficeHouseCount() @@ -40,14 +40,14 @@ class TempExportData { def exportDistrictAlias(){ def citys = CommonDatautils.findAllCity() def allRets = [] - allRets << ["Id","城市","区域","名称","地址","已删ID","已删区域","已删名称","已删地址","距离"] + allRets << ["Id","鍩庡競","鍖哄煙","鍚嶇О","鍦板潃","宸插垹ID","宸插垹鍖哄煙","宸插垹鍚嶇О","宸插垹鍦板潃","璺濈"] for (def city : citys) { def dists = CommonDatautils.findAllDistricts(city, "district", ["city", "region", "name", "address", "alias", "lat","lng"]) def rets = findDelDistBatch(dists) allRets.addAll(rets) } - ExcelUtils.write("D:\\数据\\数据建设\\小区\\融合存疑小区.xlsx",allRets, "小区") + ExcelUtils.write("D:\\鏁版嵁\\鏁版嵁寤鸿\\灏忓尯\\铻嶅悎瀛樼枒灏忓尯.xlsx",allRets, "灏忓尯") } @@ -68,7 +68,7 @@ class TempExportData { if(delDists){ if(delDists.size()==1){ def delDist = delDists[0] - def distance = "缺经纬度" + def distance = "缂虹粡绾害" if(delDist.lat){ distance = GeoHelper.GetDistance(dist.lat/10000000000.0, dist.lng/10000000000.0, delDist.lat/10000000000.0, delDist.lng/10000000000.0) } @@ -93,12 +93,12 @@ class TempExportData { def run() { def citys = CommonDatautils.findAllCity() def rets = [] - rets << ["ID", "城市", "区域", "名称", "地址", "别名区域", "别名名称", "别名地址", "别名所在小区id"] + rets << ["ID", "鍩庡競", "鍖哄煙", "鍚嶇О", "鍦板潃", "鍒悕鍖哄煙", "鍒悕鍚嶇О", "鍒悕鍦板潃", "鍒悕鎵�鍦ㄥ皬鍖篿d"] for (def city : citys) { def cityRets = getResults(city) rets.addAll(cityRets) } - ExcelUtils.write("D:\\数据\\数据建设\\名称在别名中的小区.xlsx", rets,"数据") + ExcelUtils.write("D:\\鏁版嵁\\鏁版嵁寤鸿\\鍚嶇О鍦ㄥ埆鍚嶄腑鐨勫皬鍖�.xlsx", rets,"鏁版嵁") } @@ -149,12 +149,12 @@ class TempExportData { } def fzHouseStat(){ - def districts = CommonDatautils.findAllDistricts("福州", "district", ["city", "region", "name", "alias","estate_type2"]) + def districts = CommonDatautils.findAllDistricts("绂忓窞", "district", ["city", "region", "name", "alias","estate_type2"]) def addCount = new AtomicLong() final CountDownLatch latch = new CountDownLatch(districts.size()) def total = districts.size() def rets = new CopyOnWriteArrayList() - rets << ["城市","区域","名称","上月价格","3年房源量","2年房源量", "2年第三方家数"] + rets << ["鍩庡競","鍖哄煙","鍚嶇О","涓婃湀浠锋牸","3骞存埧婧愰噺","2骞存埧婧愰噺", "2骞寸涓夋柟瀹舵暟"] for(def i=0;i + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\楂樺痉鍐欏瓧妤�-鎴挎簮绗笁鏂归獙璇�.xlsx",{d-> // def obj = findYuanQu(d['B'], d['D']) // if(obj){ -// d['T'] = "前瞻存在" +// d['T'] = "鍓嶇灮瀛樺湪" // } // if(!d['T']){ // def city = RegionData.formatCity(d['C']) // def obj = findYuanQu(city, d['E']) // if(obj){ -// d['T'] = "前瞻存在" +// d['T'] = "鍓嶇灮瀛樺湪" // d['U'] = obj.name // } // } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/Test.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/Test.groovy index 1d22f4cc3..ea78ba899 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/Test.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/Test.groovy @@ -11,8 +11,8 @@ System.out.println(creationDate); //DBCollection REGION_STAT_COLL = MongoUtils.getCollectionByName2("fangjia", "region_stat", mongoDbUrl) // // -//def city = "昌江" -//ExcelUtils.modify("D:\\数据\\海南\\海南省城市均价.xlsx",{d-> +//def city = "鏄屾睙" +//ExcelUtils.modify("D:\\鏁版嵁\\娴峰崡\\娴峰崡鐪佸煄甯傚潎浠�.xlsx",{d-> // def date = d['B'] // def start = DateUtils.getFirstDayOfMonth(date) // def end = DateUtils.getLastDayOfMonth(date) @@ -30,7 +30,7 @@ System.out.println(creationDate); // o.put("city", city) // o.put("m_date" , new Date()) // o.put("weekend", weekend) -// o.put("cat","城市") +// o.put("cat","鍩庡競") // o.put("moving_average" , (int)avg_price) // if(!last_price){ // o.put("weekend_markup" , 0) @@ -39,7 +39,7 @@ System.out.println(creationDate); // o.put("weekend_markup" , weekend_markup) // } // -// def q = new BasicDBObject("cat", "城市").append("city", city).append("weekend", weekend) +// def q = new BasicDBObject("cat", "鍩庡競").append("city", city).append("weekend", weekend) // REGION_STAT_COLL.update(q, new BasicDBObject('$set', o),true, false) // } //},1) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/ThardParthAnalyBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/ThardParthAnalyBatch.groovy index 6d9260f87..c958eab04 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/ThardParthAnalyBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/ThardParthAnalyBatch.groovy @@ -37,31 +37,31 @@ class ThardParthAnalyBatch extends BaseBatch{ def fjwTotalCount = CommonDatautils.findAllCount("district") def mdate = DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(), -1), "yyyy-MM-dd") def sDate = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM")); - println "统计月份:"+sDate+" 查询更新时间:"+mdate + println "缁熻鏈堜唤锛�"+sDate+" 鏌ヨ鏇存柊鏃堕棿:"+mdate def crawlTotalCount = findAllEsDataCount(mdate) - println "抓取第三方小区总量:"+crawlTotalCount + println "鎶撳彇绗笁鏂瑰皬鍖烘�婚噺锛�"+crawlTotalCount def synchTotalCount = findAllMongoDatasCount(sDate) - println "同步到第三方库小区总量: "+synchTotalCount + println "鍚屾鍒扮涓夋柟搴撳皬鍖烘�婚噺: "+synchTotalCount def synchHavePriceTotalCount = findAllMongoDatasHavePricesCount(sDate) - println "同步到第三方库有价格数量:"+synchHavePriceTotalCount + println "鍚屾鍒扮涓夋柟搴撴湁浠锋牸鏁伴噺:"+synchHavePriceTotalCount def synchDistCount = findAllMongoDistrictCount(sDate) - println "同步到第三方库有价格小区量: "+synchDistCount + println "鍚屾鍒扮涓夋柟搴撴湁浠锋牸灏忓尯閲�: "+synchDistCount def matchTotalCount = findMatchSuccessCount(sDate) - println "第三方匹配成功总量:"+matchTotalCount + println "绗笁鏂瑰尮閰嶆垚鍔熸�婚噺锛�"+matchTotalCount def matchDistTotalCount = findMatchSuccessDistCount(sDate) - println "第三方匹配成功小区量:"+matchDistTotalCount + println "绗笁鏂瑰尮閰嶆垚鍔熷皬鍖洪噺锛�"+matchDistTotalCount def precent = matchDistTotalCount*100.0/fjwTotalCount precent = DataHandleUtils.getDoubleRound(2, precent) - println "匹配成功占比:"+precent+"%" + println "鍖归厤鎴愬姛鍗犳瘮锛�"+precent+"%" def noMatchTotalCount = findNoMatchCount(sDate) - println "第三方小区匹配还未匹配数量: "+noMatchTotalCount + println "绗笁鏂瑰皬鍖哄尮閰嶈繕鏈尮閰嶆暟閲�: "+noMatchTotalCount saveOrUpdateDatas(sDate, fjwTotalCount, crawlTotalCount, synchTotalCount, synchHavePriceTotalCount, synchDistCount, matchTotalCount,matchDistTotalCount, precent,noMatchTotalCount); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/ThirdPriceMappingBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/ThirdPriceMappingBatch.groovy index f9ea5362b..162fae2ee 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/ThirdPriceMappingBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/ThirdPriceMappingBatch.groovy @@ -17,7 +17,7 @@ import java.util.concurrent.ExecutorService import java.util.concurrent.Executors import java.util.concurrent.atomic.AtomicLong /** - * 第三方小区与我们小区映射关系表 + * 绗笁鏂瑰皬鍖轰笌鎴戜滑灏忓尯鏄犲皠鍏崇郴琛� */ @BatchOwner(Watcher.GaoJuan) class ThirdPriceMappingBatch extends BaseBatch{ @@ -39,10 +39,10 @@ class ThirdPriceMappingBatch extends BaseBatch{ @Override public void process(Object args) { - def citys = ["北京","厦门","泉州","安顺"]//CommonUtils.findAllCity() -// //将新增数据同步过来 + def citys = ["鍖椾含","鍘﹂棬","娉夊窞","瀹夐『"]//CommonUtils.findAllCity() +// //灏嗘柊澧炴暟鎹悓姝ヨ繃鏉� // addNemCommunity(citys) -//// //接口进行匹配 +//// //鎺ュ彛杩涜鍖归厤 match(citys) addOldMatchResult(citys) @@ -116,17 +116,17 @@ class ThirdPriceMappingBatch extends BaseBatch{ } def addNemCommunity(citys){ -// def citys = ["北京","厦门","泉州","安顺"] //CommonUtils.findAllCity() +// def citys = ["鍖椾含","鍘﹂棬","娉夊窞","瀹夐『"] //CommonUtils.findAllCity() def total = 0 def index = 0 for(def c : citys){ index ++ def crawlDatas = thirdPartyPriceColl.find(new BasicDBObject("city", c).append("s_date", curDate)).toList() def addCount = addDatasToDB(crawlDatas) - println c + " 新增:"+ addCount + println c + " 鏂板锛�"+ addCount total = total + addCount } - println total +" 新增总计:"+total + println total +" 鏂板鎬昏锛�"+total } @@ -184,9 +184,9 @@ class ThirdPriceMappingBatch extends BaseBatch{ for(def c : citys){ def datas = thirdSeaweedMappingColl.find(new BasicDBObject("city", c).append("old_match_id", new BasicDBObject('$exists', false)), keys).toList() - println c +" 待关联数据:"+datas.size() + println c +" 寰呭叧鑱旀暟鎹細"+datas.size() findResultFromDB(c, datas) - println c + " 关联数据结束 "+DateUtils.formatDateByPattern(new Date(),"yyyy-MM-dd HH:mm:ss") + println c + " 鍏宠仈鏁版嵁缁撴潫 "+DateUtils.formatDateByPattern(new Date(),"yyyy-MM-dd HH:mm:ss") } } @@ -219,9 +219,9 @@ class ThirdPriceMappingBatch extends BaseBatch{ udata.put("old_match_way",obj.type) thirdSeaweedMappingColl.update(new BasicDBObject("_id", d._id), new BasicDBObject('$set', udata)) - println addCount.get()+"/"+total +" [旧匹配找到] " + println addCount.get()+"/"+total +" [鏃у尮閰嶆壘鍒癩 " }else{ - println addCount.get()+"/"+total +" [旧匹配没找到] "+d._id.toString() + println addCount.get()+"/"+total +" [鏃у尮閰嶆病鎵惧埌] "+d._id.toString() } } catch (Exception e) { e.printStackTrace() diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/TownCenterBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/TownCenterBatch.groovy index b776efc53..087a9a32b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/TownCenterBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/TownCenterBatch.groovy @@ -9,7 +9,7 @@ import com.mongodb.BasicDBObject import com.mongodb.DBCollection /** - * 乡镇街道 判断 中心点是否在围栏或一个围栏是否包含多个中心点 + * 涔¢晣琛楅亾 鍒ゆ柇 涓績鐐规槸鍚﹀湪鍥存爮鎴栦竴涓洿鏍忔槸鍚﹀寘鍚涓腑蹇冪偣 */ @BatchOwner(Watcher.GaoJuan) class TownCenterBatch extends BaseBatch{ @@ -22,7 +22,7 @@ class TownCenterBatch extends BaseBatch{ @Override void process(Object args) { - def city = "上海市" + def city = "涓婃捣甯�" def shapes = findHasShapeTown(city) def centers = findAllCenters(city) def retMap = checkCenter(shapes, centers) @@ -40,11 +40,11 @@ class TownCenterBatch extends BaseBatch{ for(def town : shapes){ index ++ def points = InsidePolygon.createPoint4(town.shape.coordinates) - //1.先判断当前镇的中心点是否在围栏中 + //1.鍏堝垽鏂綋鍓嶉晣鐨勪腑蹇冪偣鏄惁鍦ㄥ洿鏍忎腑 if(town.location){ def flag = InsidePolygon.isInArea(town.location.lon, town.location.lat, points) if(!flag){ - println town.city + " "+town.district+" "+town.street+" 不在本身围栏中" + println town.city + " "+town.district+" "+town.street+" 涓嶅湪鏈韩鍥存爮涓�" }else{ def list = map.get(town.city + "#"+town.district+"#"+town.street) if(!list){ @@ -54,7 +54,7 @@ class TownCenterBatch extends BaseBatch{ list << town.city + "#"+town.district+"#"+town.street } } - //2.判断是否有其它点在围栏中 + //2.鍒ゆ柇鏄惁鏈夊叾瀹冪偣鍦ㄥ洿鏍忎腑 for(def center : centers){ if(center._id.toString() != town._id.toString()){ def flag = InsidePolygon.isInArea(center.location.lon, center.location.lat, points) @@ -65,7 +65,7 @@ class TownCenterBatch extends BaseBatch{ map.put(town.city + "#"+town.district+"#"+town.street, list) } list << center.city + "#"+center.district+"#"+center.street - println center.city + " "+center.district+" "+center.street+" 在 "+town.city + " "+town.district+" "+town.street+" 围栏中" + println center.city + " "+center.district+" "+center.street+" 鍦� "+town.city + " "+town.district+" "+town.street+" 鍥存爮涓�" } } } @@ -79,7 +79,7 @@ class TownCenterBatch extends BaseBatch{ def findHasShapeTown(city){ def q = new BasicDBObject() - q.put("type", "乡镇街道") + q.put("type", "涔¢晣琛楅亾") q.put("shape", new BasicDBObject('$exists', true)) if(city){ q.put("city", city) @@ -96,7 +96,7 @@ class TownCenterBatch extends BaseBatch{ def findAllCenters(city){ def q = new BasicDBObject() - q.put("type", "乡镇街道") + q.put("type", "涔¢晣琛楅亾") q.put("location", new BasicDBObject('$exists', true)) if(city){ q.put("city", city) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/TownMiddleProcess.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/TownMiddleProcess.groovy index 19d13330b..5034abf4f 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/TownMiddleProcess.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/TownMiddleProcess.groovy @@ -20,8 +20,8 @@ import org.bson.types.ObjectId import java.util.regex.Pattern /** - * 乡镇街道中间表 - * 包含市,区,乡镇街道别名,来源 统计局community表 + * 涔¢晣琛楅亾涓棿琛� + * 鍖呭惈甯傦紝鍖猴紝涔¢晣琛楅亾鍒悕锛屾潵婧� 缁熻灞�community琛� */ class TownMiddleProcess { @@ -54,71 +54,71 @@ class TownMiddleProcess { } def run(){ - //创建省份 + //鍒涘缓鐪佷唤 // createProvince() - //创建城市 + //鍒涘缓鍩庡競 // createCity() - //创建区域 + //鍒涘缓鍖哄煙 // createRegion() - //创建乡镇街道 + //鍒涘缓涔¢晣琛楅亾 // createTown() - //修改乡镇街道别名 + //淇敼涔¢晣琛楅亾鍒悕 // updateTownAlias() - //中间表同步到100 + //涓棿琛ㄥ悓姝ュ埌100 // synchTown() - //添加地级市标志 + //娣诲姞鍦扮骇甯傛爣蹇� // addCityFlag() // addPinyin() - //打标记,将开发区与民政部相同的打上1 + //鎵撴爣璁帮紝灏嗗紑鍙戝尯涓庢皯鏀块儴鐩稿悓鐨勬墦涓�1 // addTjjDevFlag() - //打标记,用于标识乡镇街道是否输出及格式化输出街道 + //鎵撴爣璁帮紝鐢ㄤ簬鏍囪瘑涔¢晣琛楅亾鏄惁杈撳嚭鍙婃牸寮忓寲杈撳嚭琛楅亾 // addStreetFlag() // addDistrictDiffFlag() - //对比中间表的街道与community街道是否一致,因为元极反馈类似“高密市醴泉街道”解析有问题,要去掉“高密市”,然后去了中间表 + //瀵规瘮涓棿琛ㄧ殑琛楅亾涓巆ommunity琛楅亾鏄惁涓�鑷达紝鍥犱负鍏冩瀬鍙嶉绫讳技鈥滈珮瀵嗗競閱存硥琛楅亾鈥濊В鏋愭湁闂锛岃鍘绘帀鈥滈珮瀵嗗競鈥濓紝鐒跺悗鍘讳簡涓棿琛� // updateCommunityDiffStreet() -// updateTownPoline()//更新乡镇街道围栏 -// updateTownPolineBatch()//批量更新乡镇街道围栏 +// updateTownPoline()//鏇存柊涔¢晣琛楅亾鍥存爮 +// updateTownPolineBatch()//鎵归噺鏇存柊涔¢晣琛楅亾鍥存爮 // checkTown() - //区域民政部名称更新到乡镇街道中 + //鍖哄煙姘戞斂閮ㄥ悕绉版洿鏂板埌涔¢晣琛楅亾涓� // updateTownshipByRegion() // addAliasFromExcel() - //增加简称及简拼 + //澧炲姞绠�绉板強绠�鎷� // addSimpleName() - //根据民政部数据修改行政区划中间表 + //鏍规嵁姘戞斂閮ㄦ暟鎹慨鏀硅鏀垮尯鍒掍腑闂磋〃 // mzbDistrictUpate() // addCity() -// addTownCenter()//百度接口添加中心点 -// checkCenterInTownRang()//检测乡镇街道中心点是否在围栏中 +// addTownCenter()//鐧惧害鎺ュ彛娣诲姞涓績鐐� +// checkCenterInTownRang()//妫�娴嬩埂闀囪閬撲腑蹇冪偣鏄惁鍦ㄥ洿鏍忎腑 // addSpecialCityTownAlias() -// updateNewRegionPoyline()//更新新的区域围栏 +// updateNewRegionPoyline()//鏇存柊鏂扮殑鍖哄煙鍥存爮 // updateMappingPolyline() - //批量修改多边型围栏数据结构 + //鎵归噺淇敼澶氳竟鍨嬪洿鏍忔暟鎹粨鏋� // updatePolylineBatch() // test2dshape() - //将省会城市更新到数据库中 + //灏嗙渷浼氬煄甯傛洿鏂板埌鏁版嵁搴撲腑 // updateProvinceCenter() - //城市级别更新到库中 + //鍩庡競绾у埆鏇存柊鍒板簱涓� // updateCityLevel() - //城市顺序 + //鍩庡競椤哄簭 // updateCityNum() } def createProvince(){ - def cat = "省" + def cat = "鐪�" def tjjMaps = findAllProcincesFromTJJ(cat) def mzbMaps = findAllProcincesFromMZB(cat) @@ -151,12 +151,12 @@ class TownMiddleProcess { lastRets << udata } } - saveToDB(lastRets, "省份") + saveToDB(lastRets, "鐪佷唤") } def createCity(){ - def cat = "城市" + def cat = "鍩庡競" def tjjMaps = findAllProcincesFromTJJ(cat) def mzbMaps = findAllProcincesFromMZB(cat) def tjjKeys = tjjMaps.keySet() @@ -175,20 +175,20 @@ class TownMiddleProcess { lastRets < def city = RegionData.formatCity(o.city) if(city){ def cityObj = CommonDatautils.findAlCityDetail(city) o.put("alias", cityObj.alias) }else{ - println o.province+" "+o.city +" 房价网无此城市" + println o.province+" "+o.city +" 鎴夸环缃戞棤姝ゅ煄甯�" } } - //添加城市围栏 + //娣诲姞鍩庡競鍥存爮 def cityPolylineMap = cityPolyline() - //添加pid - def provPidMap = createPidData("省份") + //娣诲姞pid + def provPidMap = createPidData("鐪佷唤") lastRets.each{o-> def shapeData = cityPolylineMap.get(o.city) if(shapeData){ @@ -206,7 +206,7 @@ class TownMiddleProcess { def createRegion(){ - def cat = "区域" + def cat = "鍖哄煙" def tjjMaps = findAllProcincesFromTJJ(cat) def mzbMaps = findAllProcincesFromMZB(cat) def tjjKeys = tjjMaps.keySet() @@ -233,10 +233,10 @@ class TownMiddleProcess { lastRets << ud } } - //添加别名 + //娣诲姞鍒悕 def regionMap = CommonDatautils.getAllCityFullRegions() lastRets.each {o-> - if(o.district.contains("开发区")){ + if(o.district.contains("寮�鍙戝尯")){ println "ssss" } def city = RegionData.formatCity(o.city) @@ -262,14 +262,14 @@ class TownMiddleProcess { } }else{ - println o.province+" "+o.city+" "+ o.district +" 房价网无此城市" + println o.province+" "+o.city+" "+ o.district +" 鎴夸环缃戞棤姝ゅ煄甯�" } } - //添加pid - def provPidMap = createPidData("城市") + //娣诲姞pid + def provPidMap = createPidData("鍩庡競") - //添加区域围栏 + //娣诲姞鍖哄煙鍥存爮 def regionPolylineMap = regionPolyline() lastRets.each{o-> @@ -283,12 +283,12 @@ class TownMiddleProcess { o.pid = provId } } - //是否为县级市 + //鏄惁涓哄幙绾у競 saveToDB(lastRets, cat) } def createTown(){ - def cat = "乡镇街道" + def cat = "涔¢晣琛楅亾" def tjjMaps = findAllProcincesFromTJJ(cat) def lastRets = [] @@ -301,10 +301,10 @@ class TownMiddleProcess { lastRets << ud } - //添加区域围栏 + //娣诲姞鍖哄煙鍥存爮 def regionPolylineMap = townPolyline() - //添加pid - def provPidMap = createPidData("区域") + //娣诲姞pid + def provPidMap = createPidData("鍖哄煙") lastRets.each{o-> def shapeData = getStreetPolyline(regionPolylineMap, o, o.district) @@ -327,7 +327,7 @@ class TownMiddleProcess { o.pid = provId } } - //是否为县级市 + //鏄惁涓哄幙绾у競 saveToDB(lastRets, cat) } @@ -335,43 +335,43 @@ class TownMiddleProcess { def shapeData = regionPolylineMap.get(o.city+"|@|"+ district+"|@|"+o.street) if(!shapeData){ def streetKey = o.street - if(streetKey.toString().endsWith("镇")){ - streetKey = streetKey.toString().substring(0, streetKey.toString().lastIndexOf("镇"))+"街道" - }else if(streetKey.toString().endsWith("乡")){ - streetKey = streetKey.toString().substring(0, streetKey.toString().lastIndexOf("乡"))+"镇" - }else if(streetKey.toString().endsWith("街道")){ - streetKey = streetKey.toString().substring(0, streetKey.toString().lastIndexOf("街道"))+"镇" - }else if(streetKey.toString().endsWith("地区")){ - streetKey = streetKey.toString().substring(0, streetKey.toString().lastIndexOf("地区"))+"镇" + if(streetKey.toString().endsWith("闀�")){ + streetKey = streetKey.toString().substring(0, streetKey.toString().lastIndexOf("闀�"))+"琛楅亾" + }else if(streetKey.toString().endsWith("涔�")){ + streetKey = streetKey.toString().substring(0, streetKey.toString().lastIndexOf("涔�"))+"闀�" + }else if(streetKey.toString().endsWith("琛楅亾")){ + streetKey = streetKey.toString().substring(0, streetKey.toString().lastIndexOf("琛楅亾"))+"闀�" + }else if(streetKey.toString().endsWith("鍦板尯")){ + streetKey = streetKey.toString().substring(0, streetKey.toString().lastIndexOf("鍦板尯"))+"闀�" } shapeData = regionPolylineMap.get(o.city+"|@|"+ district+"|@|"+streetKey) if(!shapeData){ streetKey = o.street - if(streetKey.toString().endsWith("镇")){ - streetKey = streetKey.toString().substring(0, streetKey.toString().lastIndexOf("镇"))+"乡" - }else if(streetKey.toString().endsWith("乡")){ - streetKey = streetKey.toString().substring(0, streetKey.toString().lastIndexOf("乡"))+"镇" - }else if(streetKey.toString().endsWith("街道")){ - streetKey = streetKey.toString().substring(0, streetKey.toString().lastIndexOf("街道"))+"社区" + if(streetKey.toString().endsWith("闀�")){ + streetKey = streetKey.toString().substring(0, streetKey.toString().lastIndexOf("闀�"))+"涔�" + }else if(streetKey.toString().endsWith("涔�")){ + streetKey = streetKey.toString().substring(0, streetKey.toString().lastIndexOf("涔�"))+"闀�" + }else if(streetKey.toString().endsWith("琛楅亾")){ + streetKey = streetKey.toString().substring(0, streetKey.toString().lastIndexOf("琛楅亾"))+"绀惧尯" } shapeData = regionPolylineMap.get(o.city+"|@|"+ district+"|@|"+streetKey) } if(!shapeData){ streetKey = o.street - if(streetKey.toString().endsWith("镇")){ - streetKey = streetKey.toString().substring(0, streetKey.toString().lastIndexOf("镇"))+"地区" - }else if(streetKey.toString().endsWith("街道")){ - streetKey = streetKey.toString().substring(0, streetKey.toString().lastIndexOf("街道"))+"乡" + if(streetKey.toString().endsWith("闀�")){ + streetKey = streetKey.toString().substring(0, streetKey.toString().lastIndexOf("闀�"))+"鍦板尯" + }else if(streetKey.toString().endsWith("琛楅亾")){ + streetKey = streetKey.toString().substring(0, streetKey.toString().lastIndexOf("琛楅亾"))+"涔�" } shapeData = regionPolylineMap.get(o.city+"|@|"+ district+"|@|"+streetKey) } if(!shapeData){ - if(streetKey.toString().endsWith("镇")){ - streetKey = streetKey.toString().substring(0, streetKey.toString().lastIndexOf("镇")) - }else if(streetKey.toString().endsWith("乡")){ - streetKey = streetKey.toString().substring(0, streetKey.toString().lastIndexOf("乡")) - }else if(streetKey.toString().endsWith("街道")){ - streetKey = streetKey.toString().substring(0, streetKey.toString().lastIndexOf("街道")) + if(streetKey.toString().endsWith("闀�")){ + streetKey = streetKey.toString().substring(0, streetKey.toString().lastIndexOf("闀�")) + }else if(streetKey.toString().endsWith("涔�")){ + streetKey = streetKey.toString().substring(0, streetKey.toString().lastIndexOf("涔�")) + }else if(streetKey.toString().endsWith("琛楅亾")){ + streetKey = streetKey.toString().substring(0, streetKey.toString().lastIndexOf("琛楅亾")) } shapeData = regionPolylineMap.get(o.city+"|@|"+ district+"|@|"+streetKey) } @@ -442,8 +442,8 @@ class TownMiddleProcess { def updateTownAlias(){ - ExcelUtils.modify("D:\\数据\\数据建设\\乡镇街道\\乡镇别名问题审核交付_0418.xlsx",{ row-> - if(row['G'] && row['G']=="不处理"){ + ExcelUtils.modify("D:\\鏁版嵁\\鏁版嵁寤鸿\\涔¢晣琛楅亾\\涔¢晣鍒悕闂瀹℃牳浜や粯_0418.xlsx",{ row-> + if(row['G'] && row['G']=="涓嶅鐞�"){ def q = new BasicDBObject() q.put("city",row['C']) q.put("district",row['D']) @@ -511,28 +511,28 @@ class TownMiddleProcess { def map = [:] def pids = [] def step = 2 - if(type == "城市"){ + if(type == "鍩庡競"){ step = 4 - }else if(type == "区域"){ + }else if(type == "鍖哄煙"){ step = 6 } for(def d : dbcursor){ def pid = null def code = null if(d.mzb_province_code){ - if(type == "省份") { + if(type == "鐪佷唤") { code = d.mzb_province_code.toString() - }else if(type == "城市"){ + }else if(type == "鍩庡競"){ code = d.mzb_city_code.toString() - }else if(type == "区域"){ + }else if(type == "鍖哄煙"){ code = d.mzb_district_code.toString() } }else if(d.tjj_province_code){ - if(type == "省份") { + if(type == "鐪佷唤") { code = d.tjj_province_code.toString() - }else if(type == "城市"){ + }else if(type == "鍩庡競"){ code = d.tjj_city_code.toString() - }else if(type == "区域"){ + }else if(type == "鍖哄煙"){ code = d.tjj_district_code.toString() } } @@ -544,11 +544,11 @@ class TownMiddleProcess { if(!pids.contains(d.city+"-"+pid)){ pids << d.city+"-"+pid } - if(type == "省份"){ + if(type == "鐪佷唤"){ map.put(d.province, pid) - }else if(type == "城市"){ + }else if(type == "鍩庡競"){ map.put(d.city, pid) - }else if(type == "区域"){ + }else if(type == "鍖哄煙"){ map.put(d.city+"@"+d.district, pid) } } @@ -577,38 +577,38 @@ class TownMiddleProcess { def findAllProcincesFromTJJ(cat){ - // 定义聚合管道,按 city 字段分组,并计算每个城市的数量 + // 瀹氫箟鑱氬悎绠¢亾锛屾寜 city 瀛楁鍒嗙粍锛屽苟璁$畻姣忎釜鍩庡競鐨勬暟閲� DBObject groupFields = new BasicDBObject(); def match = null - if(cat=="省"){ + if(cat=="鐪�"){ groupFields.put("_id", new BasicDBObject("province_name", '$province_name').append("province_code", '$province_code')) - }else if(cat=="城市"){ + }else if(cat=="鍩庡競"){ groupFields.put("_id", new BasicDBObject("province_name", '$province_name').append("province_code", '$province_code').append("city_name", '$city_name').append("city_code", '$city_code')) - }else if(cat=="区域"){ + }else if(cat=="鍖哄煙"){ groupFields.put("_id", new BasicDBObject("province_name", '$province_name').append("province_code", '$province_code').append("city_name", '$city_name').append("city_code", '$city_code').append("area_name", '$area_name').append("area_code", '$area_code')) - }else if(cat=="乡镇街道"){ + }else if(cat=="涔¢晣琛楅亾"){ groupFields.put("_id", new BasicDBObject("province_name", '$province_name').append("province_code", '$province_code').append("city_name", '$city_name').append("city_code", '$city_code').append("area_name", '$area_name').append("area_code", '$area_code').append("street_name", '$street_name').append("street_code", '$street_code')) } groupFields.put("count", new BasicDBObject('$sum', 1)); DBObject group = new BasicDBObject('$group', groupFields); - // 执行聚合查询 + // 鎵ц鑱氬悎鏌ヨ AggregationOutput output = COMMUNITY_CONN.aggregate(Arrays.asList(group)); def map = [:] - // 遍历结果 + // 閬嶅巻缁撴灉 for (DBObject result : output.results()) { def obj = (DBObject ) result.get("_id"); - if(obj.get("city_name").toString()!="省直辖县级行政区划"){ + if(obj.get("city_name").toString()!="鐪佺洿杈栧幙绾ц鏀垮尯鍒�"){ def key = obj.get("province_name") def value = obj.get("province_code") - if(cat=="城市"){ + if(cat=="鍩庡競"){ key = key +"|@|"+ obj.get("city_name") value = value +"|@|"+ obj.get("city_code") - }else if(cat=="区域"){ + }else if(cat=="鍖哄煙"){ key = key +"|@|"+ obj.get("city_name")+"|@|"+ obj.get("area_name") value = value +"|@|"+ obj.get("city_code")+"|@|"+ obj.get("area_code") - }else if(cat=="乡镇街道"){ + }else if(cat=="涔¢晣琛楅亾"){ key = key +"|@|"+ obj.get("city_name")+"|@|"+ obj.get("area_name")+"|@|"+ obj.get("street_name") value = value +"|@|"+ obj.get("city_code")+"|@|"+ obj.get("area_code")+"|@|"+ obj.get("street_code") } @@ -623,17 +623,17 @@ class TownMiddleProcess { def findAllProcincesFromMZB(cat){ BasicDBObject match = null; - // 定义聚合管道,按 city 字段分组,并计算每个城市的数量 + // 瀹氫箟鑱氬悎绠¢亾锛屾寜 city 瀛楁鍒嗙粍锛屽苟璁$畻姣忎釜鍩庡競鐨勬暟閲� DBObject groupFields = new BasicDBObject(); - if(cat == "省"){ - match = new BasicDBObject('$match', new BasicDBObject("level", "省份")); + if(cat == "鐪�"){ + match = new BasicDBObject('$match', new BasicDBObject("level", "鐪佷唤")); groupFields.put("_id", new BasicDBObject("province", '$province').append("mca_province_code", '$mca_province_code')) - }else if(cat == "城市"){ - match = new BasicDBObject('$match', new BasicDBObject("level", "城市")); + }else if(cat == "鍩庡競"){ + match = new BasicDBObject('$match', new BasicDBObject("level", "鍩庡競")); groupFields.put("_id", new BasicDBObject("province", '$province').append("mca_province_code", '$mca_province_code').append("city",'$city').append("mca_city_code",'$mca_city_code')) - }else if(cat == "区域"){ - match = new BasicDBObject('$match', new BasicDBObject("level", "区域")); + }else if(cat == "鍖哄煙"){ + match = new BasicDBObject('$match', new BasicDBObject("level", "鍖哄煙")); groupFields.put("_id", new BasicDBObject("province", '$province').append("mca_province_code", '$mca_province_code').append("city",'$city').append("mca_city_code",'$mca_city_code').append("district",'$district').append("mca_district_code",'$mca_district_code')) } @@ -641,19 +641,19 @@ class TownMiddleProcess { groupFields.put("count", new BasicDBObject('$sum', 1)); DBObject group = new BasicDBObject('$group', groupFields); - // 执行聚合查询 + // 鎵ц鑱氬悎鏌ヨ AggregationOutput output = ADMINISTRATIVE_DIVISION_CONN.aggregate(Arrays.asList(match, group)); def map = [:] - // 遍历结果 + // 閬嶅巻缁撴灉 for (DBObject result : output.results()) { def obj = (DBObject ) result.get("_id"); - if(obj.get("city").toString()!="省直辖县级行政区划"){ + if(obj.get("city").toString()!="鐪佺洿杈栧幙绾ц鏀垮尯鍒�"){ def key = obj.get("province") def value = obj.get("mca_province_code") - if(cat == "城市"){ + if(cat == "鍩庡競"){ key = key +"|@|"+obj.get("city") value = value + "|@|" + obj.get("mca_city_code") - }else if(cat == "区域"){ + }else if(cat == "鍖哄煙"){ key = key +"|@|"+obj.get("city")+"|@|"+obj.get("district") value = value + "|@|" + obj.get("mca_city_code")+ "|@|" + obj.get("mca_district_code") } @@ -772,40 +772,40 @@ class TownMiddleProcess { } def addCityFlag(){ -// ExcelUtils.modify("D:\\数据\\数据建设\\地级市.xlsx",{ row-> +// ExcelUtils.modify("D:\\鏁版嵁\\鏁版嵁寤鸿\\鍦扮骇甯�.xlsx",{ row-> // if(row['A']){ -// def q = new BasicDBObject("type", "城市") +// def q = new BasicDBObject("type", "鍩庡競") // q.put("city", row['A']) // def obj = ADMINISTRATIVE_MAPPING_COLL.findOne(q) // if(obj){ // def udata = new BasicDBObject() -// udata.put("prefecture_level_city", "是") +// udata.put("prefecture_level_city", "鏄�") // ADMINISTRATIVE_MAPPING_COLL.update(new BasicDBObject("_id",obj._id), new BasicDBObject('$set',udata)) // }else{ -// println row['A']+" 没找到该城市" +// println row['A']+" 娌℃壘鍒拌鍩庡競" // } // } // }); - ExcelUtils.modify("D:\\数据\\数据建设\\地级市.xlsx",{ row-> + ExcelUtils.modify("D:\\鏁版嵁\\鏁版嵁寤鸿\\鍦扮骇甯�.xlsx",{ row-> if(row['A']){ - def q = new BasicDBObject("type", "区域") + def q = new BasicDBObject("type", "鍖哄煙") q.put("district", row['A']) def count = ADMINISTRATIVE_MAPPING_COLL.count(q) if(count && count == 1){ def obj = ADMINISTRATIVE_MAPPING_COLL.findOne(q) def udata = new BasicDBObject() - udata.put("county_level_city", "是") + udata.put("county_level_city", "鏄�") ADMINISTRATIVE_MAPPING_COLL.update(new BasicDBObject("_id",obj._id), new BasicDBObject('$set',udata)) }else{ - println row['A']+" 没找到该城市" + println row['A']+" 娌℃壘鍒拌鍩庡競" } } },1); } def addPinyin(){ - def q = new BasicDBObject("type", "乡镇街道") + def q = new BasicDBObject("type", "涔¢晣琛楅亾") def dbcursor = ADMINISTRATIVE_MAPPING_COLL.find(q).batchSize(2000) for(def d : dbcursor){ if(d.street){ @@ -819,29 +819,29 @@ class TownMiddleProcess { } def addTjjDevFlag(){ - def q = new BasicDBObject("type", "区域") + def q = new BasicDBObject("type", "鍖哄煙") def dbcursor = ADMINISTRATIVE_MAPPING_COLL.find(q).batchSize(2000) for(def d : dbcursor){ if(d.district && d.mzb_district_name && d.district==d.mzb_district_name){ def udata = new BasicDBObject() - udata.put("district_diff", 1) //民政部,统计局 名称相同 district_diff打1 + udata.put("district_diff", 1) //姘戞斂閮紝缁熻灞� 鍚嶇О鐩稿悓 district_diff鎵�1 ADMINISTRATIVE_MAPPING_COLL.update(new BasicDBObject("_id",d._id), new BasicDBObject('$set',udata)) } } } def addStreetFlag(){ - ExcelUtils.modify("D:\\数据\\数据建设\\乡镇街道\\乡镇街道-结果.xlsx",{ row-> + ExcelUtils.modify("D:\\鏁版嵁\\鏁版嵁寤鸿\\涔¢晣琛楅亾\\涔¢晣琛楅亾-缁撴灉.xlsx",{ row-> if(row['I']){ - if(row['I']=="标0"){ + if(row['I']=="鏍�0"){ def udata = new BasicDBObject() - udata.put("street_output", 0) //0:不输出 1:输出 + udata.put("street_output", 0) //0锛氫笉杈撳嚭 1锛氳緭鍑� ADMINISTRATIVE_MAPPING_COLL.update(new BasicDBObject("_id",new ObjectId(row['A'])), new BasicDBObject('$set',udata)) - }else if(row['I']=="标1"){ + }else if(row['I']=="鏍�1"){ def udata = new BasicDBObject() - udata.put("street_output", 1) //0:不输出 1:输出 + udata.put("street_output", 1) //0锛氫笉杈撳嚭 1锛氳緭鍑� if(row['G']){ - udata.put("street", row['G']) //街道中去除区域 + udata.put("street", row['G']) //琛楅亾涓幓闄ゅ尯鍩� } ADMINISTRATIVE_MAPPING_COLL.update(new BasicDBObject("_id",new ObjectId(row['A'])), new BasicDBObject('$set',udata)) } @@ -850,7 +850,7 @@ class TownMiddleProcess { } def addDistrictDiffFlag(){ - ExcelUtils.modify("D:\\数据\\数据建设\\区域-结果.xlsx",{ row-> + ExcelUtils.modify("D:\\鏁版嵁\\鏁版嵁寤鸿\\鍖哄煙-缁撴灉.xlsx",{ row-> def flag = row['F'].toString().toDouble().toInteger() def udata = new BasicDBObject() udata.put("district_diff", flag) @@ -859,7 +859,7 @@ class TownMiddleProcess { } def updateCommunityDiffStreet(){ - def q = new BasicDBObject("type", "乡镇街道") + def q = new BasicDBObject("type", "涔¢晣琛楅亾") def dbcursor = ADMINISTRATIVE_MAPPING_COLL.find(q).batchSize(2000) for(def d : dbcursor){ def query = new BasicDBObject() @@ -886,10 +886,10 @@ class TownMiddleProcess { } def updateTownPoline(){ - def city = "海口市" - def region = "美兰区" - def name = "海口桂林洋经济开发区(农场)" - def q = new BasicDBObject("city", city).append("region", region).append("town","国营桂林洋农场") + def city = "娴峰彛甯�" + def region = "缇庡叞鍖�" + def name = "娴峰彛妗傛灄娲嬬粡娴庡紑鍙戝尯锛堝啘鍦猴級" + def q = new BasicDBObject("city", city).append("region", region).append("town","鍥借惀妗傛灄娲嬪啘鍦�") println city+" "+ name+" "+TOWNPOLYLINE_COLL.count(q) def d = TOWNPOLYLINE_COLL.findOne(q) if(d){ @@ -923,8 +923,8 @@ class TownMiddleProcess { def updateTownPolineBatch(){ def i = 0 - ExcelUtils.modify("D:\\数据\\数据建设\\开发区\\乡镇街道围栏开发区数据.xlsx",{ row-> - if(row['R'] && row['R']=="新增围栏"){ + ExcelUtils.modify("D:\\鏁版嵁\\鏁版嵁寤鸿\\寮�鍙戝尯\\涔¢晣琛楅亾鍥存爮寮�鍙戝尯鏁版嵁.xlsx",{ row-> + if(row['R'] && row['R']=="鏂板鍥存爮"){ i++ if(i>=134){ def q = new BasicDBObject("city", row['B']).append("region", row['C']).append("town",row['D']) @@ -941,7 +941,7 @@ class TownMiddleProcess { def rets = [] def bd_rets = [] - println row['N'] +" 共有:"+arrs.size()+" 个围栏" + println row['N'] +" 鍏辨湁锛�"+arrs.size()+" 涓洿鏍�" def index = 1 for(def s : arrs){ def points = s.split(";") @@ -954,7 +954,7 @@ class TownMiddleProcess { def lat = DataHandleUtils.getDoubleRound(6, pointArr[1].toString().toDouble()) pointList << [lon, lat] - // 高德转百度 + // 楂樺痉杞櫨搴� def baidu = BaiDuApiUtils.geoconv(lon, lat, 3) def bd_lng = baidu.x def bd_lat = baidu.y @@ -967,7 +967,7 @@ class TownMiddleProcess { def udata = new BasicDBObject() udata.put("shape", resultMap) - udata.put("operator", "高娟") + udata.put("operator", "楂樺") udata.put("m_date", new Date()) udata.put("bd_shape",bd_resultMap) @@ -985,11 +985,11 @@ class TownMiddleProcess { resultMap.coordinates = pointList bd_resultMap.coordinates = bd_pointList obj.put("shape", resultMap) - obj.put("operator", "高娟") + obj.put("operator", "楂樺") obj.put("m_date", new Date()) obj.put("bd_shape",bd_resultMap) obj.put("create_time", new Date()) - obj.put("block", dbo.name+"-地块"+index) + obj.put("block", dbo.name+"-鍦板潡"+index) DEVELOPMENT_ZONE_43_COLL.save(obj) } @@ -1004,7 +1004,7 @@ class TownMiddleProcess { // bd_resultMap.type = "MultiPolygon" // } // println d.city+" "+d.region+" "+d.town+" "+rets.size() - row['S'] = "已完成" + row['S'] = "宸插畬鎴�" } } @@ -1013,7 +1013,7 @@ class TownMiddleProcess { } def checkTown(){ - def q = new BasicDBObject("shape", new BasicDBObject('$exists', false)).append("type","乡镇街道") + def q = new BasicDBObject("shape", new BasicDBObject('$exists', false)).append("type","涔¢晣琛楅亾") def dbcursor = ADMINISTRATIVE_MAPPING_COLL.find(q) for(def ad : dbcursor){ def polyline_q = new BasicDBObject("city", ad.city).append("town",ad.district+ad.street) @@ -1044,7 +1044,7 @@ class TownMiddleProcess { def udata = new BasicDBObject() udata.put("shape", resultMap) - udata.put("polyline_source", "区域+街道匹配") + udata.put("polyline_source", "鍖哄煙+琛楅亾鍖归厤") def updateQuery = new BasicDBObject("_id", ad._id) ADMINISTRATIVE_MAPPING_COLL.update(updateQuery, new BasicDBObject('$set',udata)) @@ -1055,7 +1055,7 @@ class TownMiddleProcess { def updateTownshipByRegion(){ - def q = new BasicDBObject("mzb_district_name", new BasicDBObject('$exists', true)).append("type","区域") + def q = new BasicDBObject("mzb_district_name", new BasicDBObject('$exists', true)).append("type","鍖哄煙") def keys = new BasicDBObject() keys.put("mzb_district_name",1) keys.put("mzb_district_code",1) @@ -1064,7 +1064,7 @@ class TownMiddleProcess { keys.put("district",1) def dbcursor = ADMINISTRATIVE_MAPPING_COLL.find(q, keys) for(def d : dbcursor){ - def upquery = new BasicDBObject("type","乡镇街道").append("district", d.district).append("city",d.city) + def upquery = new BasicDBObject("type","涔¢晣琛楅亾").append("district", d.district).append("city",d.city) def udata = new BasicDBObject() udata.put("mzb_district_name",d.mzb_district_name) udata.put("mzb_district_code",d.mzb_district_code) @@ -1073,8 +1073,8 @@ class TownMiddleProcess { } def addAliasFromExcel(){ - ExcelUtils.modify("D:\\数据\\数据建设\\乡镇街道\\乡镇街道合并或者变更20240627.xlsx",{ row-> - def q = new BasicDBObject("type", "乡镇街道") + ExcelUtils.modify("D:\\鏁版嵁\\鏁版嵁寤鸿\\涔¢晣琛楅亾\\涔¢晣琛楅亾鍚堝苟鎴栬�呭彉鏇�20240627.xlsx",{ row-> + def q = new BasicDBObject("type", "涔¢晣琛楅亾") q.put("city", row['A']) q.put("street", row['D']) if(row['B']){ @@ -1082,7 +1082,7 @@ class TownMiddleProcess { } def obj = ADMINISTRATIVE_MAPPING_COLL.findOne(q) if(obj){ - row['F'] = '是' + row['F'] = '鏄�' def alias = obj.alias if(!alias){ alias = [] @@ -1116,11 +1116,11 @@ class TownMiddleProcess { def updateQuery = new BasicDBObject("_id", d._id) ADMINISTRATIVE_MAPPING_COLL.update(updateQuery, new BasicDBObject('$set',udata)) } -// def city = d.city.replace("市","").replace("区","").replace("县","") +// def city = d.city.replace("甯�","").replace("鍖�","").replace("鍘�","") // def udata = new BasicDBObject() // udata.put("city_short", city) // if(d.district && d.district.size()>=3){ -// def region= d.district.replace("区","").replace("镇","").replace("乡","") +// def region= d.district.replace("鍖�","").replace("闀�","").replace("涔�","") // udata.put("district_short", region) // } // def updateQuery = new BasicDBObject("_id", d._id) @@ -1142,22 +1142,22 @@ class TownMiddleProcess { } def mzbDistrictUpate(){ - ExcelUtils.modify("D:\\数据\\数据建设\\乡镇街道\\民政部\\2014-2022年.xlsx",{ row-> + ExcelUtils.modify("D:\\鏁版嵁\\鏁版嵁寤鸿\\涔¢晣琛楅亾\\姘戞斂閮╘\2014-2022骞�.xlsx",{ row-> if(!row['I']){ def updateType = row['E'] def prov = row['B'] def newStreet = row['G'] - if(["新设街道","新设镇","新增街道","新建街道","新建乡镇","新设乡","新增乡","新增建制"].contains(updateType)){ + if(["鏂拌琛楅亾","鏂拌闀�","鏂板琛楅亾","鏂板缓琛楅亾","鏂板缓涔¢晣","鏂拌涔�","鏂板涔�","鏂板寤哄埗"].contains(updateType)){ def dbo = findStreets(prov, newStreet, row['F'].toString().toDouble().toInteger().toString()) if(dbo){ row['I'] = dbo.city row['J'] = dbo.district - row['K'] = "存在" + row['K'] = "瀛樺湪" row['L'] = dbo.tjj_street_code row['M'] = dbo.pid } - }else if(["撤乡设镇","撤乡建镇","撤乡设乡","撤乡、镇设镇","撤销设街道","撤销建街道","撤销街道建镇","撤镇设镇、街道","撤销镇新设镇","乡镇合并","整建制划归","撤镇建新镇","区划变更","撤镇、街道设镇","撤街道建镇","撤销乡、镇新设镇","撤镇、街道设街道","撤乡、街道设街道","撤乡设街道","撤乡建街道","撤镇设街道","撤镇建街道","名称变更","撤街道设镇","撤乡、镇设街道","撤街道、镇、乡","并入其他建制",'撤镇设镇',"合并","合并建镇","更名","撤销合并","合并建制","合并镇","合并街道","名称变更","合并调整","合并建街道","撤镇设街道、镇","撤乡、镇设乡","撤镇乡设街道","区划调整","合并乡","撤镇设市","区划代码调整","区划代码变更","撤销乡、镇设街道"].contains(updateType)){ + }else if(["鎾や埂璁鹃晣","鎾や埂寤洪晣","鎾や埂璁句埂","鎾や埂銆侀晣璁鹃晣","鎾ら攢璁捐閬�","鎾ら攢寤鸿閬�","鎾ら攢琛楅亾寤洪晣","鎾ら晣璁鹃晣銆佽閬�","鎾ら攢闀囨柊璁鹃晣","涔¢晣鍚堝苟","鏁村缓鍒跺垝褰�","鎾ら晣寤烘柊闀�","鍖哄垝鍙樻洿","鎾ら晣銆佽閬撹闀�","鎾よ閬撳缓闀�","鎾ら攢涔°�侀晣鏂拌闀�","鎾ら晣銆佽閬撹琛楅亾","鎾や埂銆佽閬撹琛楅亾","鎾や埂璁捐閬�","鎾や埂寤鸿閬�","鎾ら晣璁捐閬�","鎾ら晣寤鸿閬�","鍚嶇О鍙樻洿","鎾よ閬撹闀�","鎾や埂銆侀晣璁捐閬�","鎾よ閬撱�侀晣銆佷埂","骞跺叆鍏朵粬寤哄埗",'鎾ら晣璁鹃晣',"鍚堝苟","鍚堝苟寤洪晣","鏇村悕","鎾ら攢鍚堝苟","鍚堝苟寤哄埗","鍚堝苟闀�","鍚堝苟琛楅亾","鍚嶇О鍙樻洿","鍚堝苟璋冩暣","鍚堝苟寤鸿閬�","鎾ら晣璁捐閬撱�侀晣","鎾や埂銆侀晣璁句埂","鎾ら晣涔¤琛楅亾","鍖哄垝璋冩暣","鍚堝苟涔�","鎾ら晣璁惧競","鍖哄垝浠g爜璋冩暣","鍖哄垝浠g爜鍙樻洿","鎾ら攢涔°�侀晣璁捐閬�"].contains(updateType)){ if(row['F']){ def dbo = null def code = row['F'].toString() @@ -1175,37 +1175,37 @@ class TownMiddleProcess { } if(row['D']){ if(!alias.contains(row['D'])){ - row['K'] = "存在(加别名)" + row['K'] = "瀛樺湪(鍔犲埆鍚�)" alias << row['D'] addAlias(dbo._id, alias) }else{ - row['K'] = "存在" + row['K'] = "瀛樺湪" } }else{ - row['K'] = "存在" + row['K'] = "瀛樺湪" } } } - }else if(updateType == "撤街道设街道"){ - row['K'] = "人工处理" - }else if(updateType == "隶属关系变更"){ - row['K'] = "人工处理" - }else if(["撤销镇","撤乡","撤销街道","撤销","撤街道设社区工作站","撤销建制"].contains(updateType)){ - row['K'] = "人工处理" - }else if(updateType =='撤销乡'){ + }else if(updateType == "鎾よ閬撹琛楅亾"){ + row['K'] = "浜哄伐澶勭悊" + }else if(updateType == "闅跺睘鍏崇郴鍙樻洿"){ + row['K'] = "浜哄伐澶勭悊" + }else if(["鎾ら攢闀�","鎾や埂","鎾ら攢琛楅亾","鎾ら攢","鎾よ閬撹绀惧尯宸ヤ綔绔�","鎾ら攢寤哄埗"].contains(updateType)){ + row['K'] = "浜哄伐澶勭悊" + }else if(updateType =='鎾ら攢涔�'){ if(!row['F']){ - row['K'] = "人工处理" + row['K'] = "浜哄伐澶勭悊" } } - if(prov && newStreet && (!row['K'] || (row['K'] && !row['K'].contains("存在")) )){ + if(prov && newStreet && (!row['K'] || (row['K'] && !row['K'].contains("瀛樺湪")) )){ def dbo = findStreets(prov, newStreet, null) if(dbo){ row['I'] = dbo.city row['J'] = dbo.district - row['K'] = "存在-编码不同" + row['K'] = "瀛樺湪-缂栫爜涓嶅悓" row['L'] = dbo.tjj_street_code row['M'] = dbo.pid def alias = dbo.alias @@ -1214,14 +1214,14 @@ class TownMiddleProcess { } if(row['D']){ if(!alias.contains(row['D'])){ - row['K'] = "存在(加别名)" + row['K'] = "瀛樺湪(鍔犲埆鍚�)" alias << row['D'] // addAlias(dbo._id, alias) }else{ - row['K'] = "存在" + row['K'] = "瀛樺湪" } }else{ - row['K'] = "存在" + row['K'] = "瀛樺湪" } } } @@ -1231,7 +1231,7 @@ class TownMiddleProcess { } def addCity(){ - ExcelUtils.multiThreadingModify("D:\\数据\\数据建设\\乡镇街道\\民政部\\2014-2022年.xlsx",{ row-> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\鏁版嵁寤鸿\\涔¢晣琛楅亾\\姘戞斂閮╘\2014-2022骞�.xlsx",{ row-> def citycode = null if(row['F']){ citycode = row['F'].toString().substring(0, 4) @@ -1242,7 +1242,7 @@ class TownMiddleProcess { if(citycode){ def q = new BasicDBObject() q.put("mzb_city_code", citycode+"00") - q.put("type", "城市") + q.put("type", "鍩庡競") def dbo = ADMINISTRATIVE_MAPPING_COLL.findOne(q) if(dbo){ row['O'] = dbo.city @@ -1284,14 +1284,14 @@ class TownMiddleProcess { def addAlias(id, alias){ def udata = new BasicDBObject() udata.put("alias", alias) - udata.put("operator","高娟-批量") + udata.put("operator","楂樺-鎵归噺") def updateQuery = new BasicDBObject("_id", id) ADMINISTRATIVE_MAPPING_COLL.update(updateQuery, new BasicDBObject('$set',udata)) } def addTownCenter(){ - ExcelUtils.modify("D:\\数据\\数据建设\\乡镇街道\\乡镇街道无中心点数据.xlsx",{ row-> + ExcelUtils.modify("D:\\鏁版嵁\\鏁版嵁寤鸿\\涔¢晣琛楅亾\\涔¢晣琛楅亾鏃犱腑蹇冪偣鏁版嵁.xlsx",{ row-> def json = BaiduMapUtils.searchByAddress(row['C']+row['D']+row['E']) if(json){ row['J'] = json.confidence @@ -1316,7 +1316,7 @@ class TownMiddleProcess { def checkCenterInTownRang(){ def q = new BasicDBObject() - q.put("type","乡镇街道") + q.put("type","涔¢晣琛楅亾") q.put("location", new BasicDBObject('$exists',false)) def dbcursor = ADMINISTRATIVE_MAPPING_COLL.find(q) for(def d : dbcursor){ @@ -1327,7 +1327,7 @@ class TownMiddleProcess { def addSpecialCityTownAlias(){ def fullCityMap = CommonDatautils.queryFullNameCity() - def citys = ["东莞","中山","嘉峪关","昆玉","石河子","阿拉尔","图木舒克","五家渠","济源","仙桃","潜江","天门","神农架","五指山","琼海","儋州","文昌","万宁","东方","定安","屯昌","澄迈","临高","白沙","昌江","乐东","陵水","保亭","琼中","北屯","铁门关","双河","可克达拉"] + def citys = ["涓滆帪","涓北","鍢夊唱鍏�","鏄嗙帀","鐭虫渤瀛�","闃挎媺灏�","鍥炬湪鑸掑厠","浜斿娓�","娴庢簮","浠欐","娼滄睙","澶╅棬","绁炲啘鏋�","浜旀寚灞�","鐞兼捣","鍎嬪窞","鏂囨槍","涓囧畞","涓滄柟","瀹氬畨","灞槍","婢勮繄","涓撮珮","鐧芥矙","鏄屾睙","涔愪笢","闄垫按","淇濅涵","鐞间腑","鍖楀悲","閾侀棬鍏�","鍙屾渤","鍙厠杈炬媺"] def regionMap = CommonDatautils.getAllCityFullRegions() for(def city : citys){ def townMap = regionMap.get(city) @@ -1368,7 +1368,7 @@ class TownMiddleProcess { } def q = new BasicDBObject() - q.put("type", "乡镇街道") + q.put("type", "涔¢晣琛楅亾") q.put("city", fullCityName) def keys = new BasicDBObject() @@ -1380,18 +1380,18 @@ class TownMiddleProcess { def regionPolylineMap = regionPolyline() def q = new BasicDBObject() - q.put("type","区域") -// q.put("city", "苏州市") + q.put("type","鍖哄煙") +// q.put("city", "鑻忓窞甯�") def dbcursor = ADMINISTRATIVE_MAPPING_COLL.find(q).setOptions(Bytes.QUERYOPTION_NOTIMEOUT) for(def d : dbcursor){ def shapeData = regionPolylineMap.get(d.city+"|@|"+d.district) println d.city+" "+d.district if(shapeData){ - println "新围栏数:"+shapeData.shape.coordinates.size() + println "鏂板洿鏍忔暟锛�"+shapeData.shape.coordinates.size() } if(d.shape){ - println "旧围栏数:"+d.shape.coordinates.size() + println "鏃у洿鏍忔暟锛�"+d.shape.coordinates.size() } if(d.shape && shapeData && shapeData.shape!=d.shape){ @@ -1404,8 +1404,8 @@ class TownMiddleProcess { // double area = com.fangjia.script.util.GeoHelper.calculateArea(shapeData.shape.coordinates[0]) // double area1 = com.fangjia.script.util.GeoHelper.calculateArea(d.shape.coordinates[0]) // if(Math.abs(area1-area)>=1){ -// println "新:"+area -// println "旧:"+area1 +// println "鏂帮細"+area +// println "鏃э細"+area1 // def udata = new BasicDBObject() // udata.shape = shapeData.shape // udata.location = shapeData.location @@ -1418,7 +1418,7 @@ class TownMiddleProcess { def updateMappingPolyline(){ def q = new BasicDBObject() - q.put("type","区域") + q.put("type","鍖哄煙") q.put("shape.type","polygon") def dbcursor = ADMINISTRATIVE_MAPPING_COLL.find(q) for(def d : dbcursor){ @@ -1493,7 +1493,7 @@ class TownMiddleProcess { def test2dshape(){ def q = new BasicDBObject() - q.put("street","花亭路街道") + q.put("street","鑺变涵璺閬�") // q.put("shape",new BasicDBObject('$exists', true)) def dbcursor = ADMINISTRATIVE_MAPPING_COLL_100.find(q).batchSize(100) for(def obj : dbcursor){ @@ -1502,7 +1502,7 @@ class TownMiddleProcess { }catch(Exception e){ def coordinates = obj.shape.coordinates for(def coors : coordinates){ - for (int i = 0; i < coors.size(); i++) { // 改为索引遍历 + for (int i = 0; i < coors.size(); i++) { // 鏀逛负绱㈠紩閬嶅巻 def coorsArr = coors[i] def index = 0 def new_coors = [] @@ -1519,14 +1519,14 @@ class TownMiddleProcess { } if(new_coors.size()!=coorsArr.size()){ coors[i] = new_coors - println "[修改] "+ obj.city +" "+obj.street +" 原:"+coorsArr.size()+" 现:"+new_coors.size() + println "[淇敼] "+ obj.city +" "+obj.street +" 鍘燂細"+coorsArr.size()+" 鐜帮細"+new_coors.size() } } } try{ TEMP_ADMINISTRATIVE_MAPPING_COLL_100.save(obj) }catch(Exception ex){ - println "仍有问题:"+obj.city +" "+obj.street+" "+ex.getMessage() + println "浠嶆湁闂锛�"+obj.city +" "+obj.street+" "+ex.getMessage() } } @@ -1535,13 +1535,13 @@ class TownMiddleProcess { } def updateProvinceCenter(){ - ExcelUtils.modify("D:\\数据\\数据建设\\城市\\省会城市.xlsx",{d-> + ExcelUtils.modify("D:\\鏁版嵁\\鏁版嵁寤鸿\\鍩庡競\\鐪佷細鍩庡競.xlsx",{d-> def city = d['C'] if(city){ - def q = new BasicDBObject("type","城市").append("city_short", city) + def q = new BasicDBObject("type","鍩庡競").append("city_short", city) def obj = ADMINISTRATIVE_MAPPING_COLL.findOne(q) if(obj){ - def udata = new BasicDBObject("capital_city", "是") + def udata = new BasicDBObject("capital_city", "鏄�") ADMINISTRATIVE_MAPPING_COLL.update(new BasicDBObject('_id', obj._id), new BasicDBObject('$set', udata)) } } @@ -1549,32 +1549,32 @@ class TownMiddleProcess { } def updateCityLevel(){ - ExcelUtils.modify("D:\\数据\\数据建设\\城市\\城市等级.xlsx",{d-> + ExcelUtils.modify("D:\\鏁版嵁\\鏁版嵁寤鸿\\鍩庡競\\鍩庡競绛夌骇.xlsx",{d-> def city = d['A'] if(city){ - def q = new BasicDBObject("type","城市").append("city_short", city) + def q = new BasicDBObject("type","鍩庡競").append("city_short", city) def obj = ADMINISTRATIVE_MAPPING_COLL.findOne(q) if(obj){ def udata = new BasicDBObject("city_level", d['B']) ADMINISTRATIVE_MAPPING_COLL.update(new BasicDBObject('_id', obj._id), new BasicDBObject('$set', udata)) }else{ - println city +" 没找到" + println city +" 娌℃壘鍒�" } } }) } def updateCityNum(){ - ExcelUtils.modify("D:\\数据\\数据建设\\城市\\城市排序.xlsx",{d-> + ExcelUtils.modify("D:\\鏁版嵁\\鏁版嵁寤鸿\\鍩庡競\\鍩庡競鎺掑簭.xlsx",{d-> def city = d['A'] if(city){ - def q = new BasicDBObject("type","城市").append("city_short", city) + def q = new BasicDBObject("type","鍩庡競").append("city_short", city) def obj = ADMINISTRATIVE_MAPPING_COLL.findOne(q) if(obj){ def udata = new BasicDBObject("city_position", d['B'].toString().toDouble().toInteger()) ADMINISTRATIVE_MAPPING_COLL.update(new BasicDBObject('_id', obj._id), new BasicDBObject('$set', udata)) }else{ - println city +" 没找到" + println city +" 娌℃壘鍒�" } } }) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/TownStandardBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/TownStandardBatch.groovy index 8edaa8a99..451e6f164 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/TownStandardBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/TownStandardBatch.groovy @@ -32,9 +32,9 @@ import java.util.concurrent.ExecutorService import java.util.concurrent.Executors import java.util.concurrent.atomic.AtomicLong /** - * 区域标准化 - * 1.小区库乡镇街道标准化,包含小区,商铺,写字楼 - * 2.poi数据库中乡镇街道标准化 + * 鍖哄煙鏍囧噯鍖� + * 1.灏忓尯搴撲埂闀囪閬撴爣鍑嗗寲锛屽寘鍚皬鍖猴紝鍟嗛摵锛屽啓瀛楁ゼ + * 2.poi鏁版嵁搴撲腑涔¢晣琛楅亾鏍囧噯鍖� */ class TownStandardBatch extends BaseBatch{ @@ -59,15 +59,15 @@ class TownStandardBatch extends BaseBatch{ def TownStandard(){ // townStandardByCat("office") // townStandardByPoi() - addTownByTownShape()//为没有乡镇街道的poi,补充乡镇街道,忽略区域,并使用地图 + addTownByTownShape()//涓烘病鏈変埂闀囪閬撶殑poi锛岃ˉ鍏呬埂闀囪閬擄紝蹇界暐鍖哄煙锛屽苟浣跨敤鍦板浘 // standardTown() // updateTownData() } def townStandardByCat(def cat){ - //"三明","龙岩","南平","漳州","福州","厦门","泉州","莆田","宁德", - def citys = ["天津"]//CommonDatautils.findAllCity() + //"涓夋槑","榫欏博","鍗楀钩","婕冲窞","绂忓窞","鍘﹂棬","娉夊窞","鑾嗙敯","瀹佸痉", + def citys = ["澶╂触"]//CommonDatautils.findAllCity() for(def city : citys){ def data = fullCityMap.get(city) @@ -84,17 +84,17 @@ class TownStandardBatch extends BaseBatch{ if(regionSet.size()>=1){ haveRegionProcess(city, fullCityName, townMap, cat, shortRegionNameMap) }else{ - println city +" 无区域" + println city +" 鏃犲尯鍩�" } } } } def townStandardByPoi(){ - updateList << ["数据ID", "城市","区域","乡镇街道","名称","状态", "修改"] + updateList << ["鏁版嵁ID", "鍩庡競","鍖哄煙","涔¢晣琛楅亾","鍚嶇О","鐘舵��", "淇敼"] - addAliasList << ["城市","区域","乡镇街道", "新增别名"] - def runProvinces = ["福建省","浙江省","江苏省","安徽省","山东省","甘肃省"] + addAliasList << ["鍩庡競","鍖哄煙","涔¢晣琛楅亾", "鏂板鍒悕"] + def runProvinces = ["绂忓缓鐪�","娴欐睙鐪�","姹熻嫃鐪�","瀹夊窘鐪�","灞变笢鐪�","鐢樿們鐪�"] def citys = CommonDatautils.findAllCity() def index = 0 for(def city : citys){ @@ -111,7 +111,7 @@ class TownStandardBatch extends BaseBatch{ def fileName = "/home/goojia/gj/poi/${fullCityName}.csv" if (CommonDatautils.isWindow()) { - fileName = "D:\\数据\\poi\\${fullCityName}.csv" + fileName = "D:\\鏁版嵁\\poi\\${fullCityName}.csv" } File file=new File(fileName); if(file.exists()){ @@ -130,18 +130,18 @@ class TownStandardBatch extends BaseBatch{ } } if(updateList.size()>50000){ - ExcelUtils.write("D:\\数据\\乡镇街道待查数据-${index}.xlsx", updateList, "数据") - ExcelUtils.write("D:\\数据\\乡镇街道待查数据-需新增别名-${index}.xlsx", addAliasList, "数据") + ExcelUtils.write("D:\\鏁版嵁\\涔¢晣琛楅亾寰呮煡鏁版嵁-${index}.xlsx", updateList, "鏁版嵁") + ExcelUtils.write("D:\\鏁版嵁\\涔¢晣琛楅亾寰呮煡鏁版嵁-闇�鏂板鍒悕-${index}.xlsx", addAliasList, "鏁版嵁") updateList.clear() } }else{ - println fileName+" 文件没找到" + println fileName+" 鏂囦欢娌℃壘鍒�" } }else{ - println "没找到相应的全称:"+city + println "娌℃壘鍒扮浉搴旂殑鍏ㄧО锛�"+city } } - ExcelUtils.write("D:\\数据\\乡镇街道待查数据-最后.xlsx", updateList, "数据") + ExcelUtils.write("D:\\鏁版嵁\\涔¢晣琛楅亾寰呮煡鏁版嵁-鏈�鍚�.xlsx", updateList, "鏁版嵁") } def haveRegionProcess(city, fullCityName, townMap, cat, shortRegionNameMap){ @@ -196,13 +196,13 @@ class TownStandardBatch extends BaseBatch{ def udata = new BasicDBObject() udata.put("township", updateTown) udata.put("m_date", new Date()) - println d.city +" "+d.region+" "+d.name+" "+d.township +" 乡镇修改为:"+updateTown + println d.city +" "+d.region+" "+d.name+" "+d.township +" 涔¢晣淇敼涓猴細"+updateTown DbUtils.seaweed.update(new BasicDBObject("_id", d._id), new BasicDBObject('$set', udata)) }else{ def udata = new BasicDBObject() udata.put("township", "") udata.put("m_date", new Date()) - println d.city +" "+d.region+" "+d.name+" "+d.township +" 乡镇修改为:空值" + println d.city +" "+d.region+" "+d.name+" "+d.township +" 涔¢晣淇敼涓猴細绌哄��" DbUtils.seaweed.update(new BasicDBObject("_id", d._id), new BasicDBObject('$set', udata)) } } @@ -226,7 +226,7 @@ class TownStandardBatch extends BaseBatch{ towns = townDatas break }else{ - println(d.city +" "+d.district+" 没找下辖街道") + println(d.city +" "+d.district+" 娌℃壘涓嬭緰琛楅亾") } } @@ -247,7 +247,7 @@ class TownStandardBatch extends BaseBatch{ break } // else{ -// if(town.street.contains(d.township.replace("镇","").replace("街道","").replace("乡",""))){ +// if(town.street.contains(d.township.replace("闀�","").replace("琛楅亾","").replace("涔�",""))){ // updateTown = town.street // opt = false // def addObj = [town.city, town.district, town.street, d.township] @@ -270,7 +270,7 @@ class TownStandardBatch extends BaseBatch{ results.clear() } updateList << [d.id, d.province, d.city, d.district, d.name,d.township, d.status, updateTown] -// println d.city +" "+d.district+" "+d.name +" "+d.township+" 乡镇修改为:"+updateTown +// println d.city +" "+d.district+" "+d.name +" "+d.township+" 涔¢晣淇敼涓猴細"+updateTown }else{ def m = [:] m.put(d.id, ["township":""]) @@ -280,7 +280,7 @@ class TownStandardBatch extends BaseBatch{ results.clear() } updateList << [d.id, d.province, d.city, d.district, d.name, d.township, d.status, ""] - println d.city +" "+d.district+" "+d.name +" "+d.township+" 状态修改为:空值" + println d.city +" "+d.district+" "+d.name +" "+d.township+" 鐘舵�佷慨鏀逛负锛氱┖鍊�" } } @@ -292,7 +292,7 @@ class TownStandardBatch extends BaseBatch{ updateByEs(results) results.clear() } - println fullCityName +" 处理完成" + println fullCityName +" 澶勭悊瀹屾垚" } @@ -312,20 +312,20 @@ class TownStandardBatch extends BaseBatch{ } try { - // 执行批量更新请求 + // 鎵ц鎵归噺鏇存柊璇锋眰 def bulkResponse = client.bulk(bulkRequest, RequestOptions.DEFAULT) - // 检查响应 + // 妫�鏌ュ搷搴� if (bulkResponse.hasFailures()) { - println("批量更新中有失败的操作:") + println("鎵归噺鏇存柊涓湁澶辫触鐨勬搷浣�:") bulkResponse.buildFailureMessage().each { println(it) } } else { -// println("批量更新成功!") +// println("鎵归噺鏇存柊鎴愬姛!") } } catch (Exception e) { e.printStackTrace() } finally { - // 关闭客户端 + // 鍏抽棴瀹㈡埛绔� try { client.close() } catch (Exception e) { @@ -391,7 +391,7 @@ class TownStandardBatch extends BaseBatch{ for(line in lines) { if(line && index>=1){ String[] arrs = line.split(",") - if(arrs.size()>=11 && arrs[10]=="是" && arrs[6]!=arrs[7]){ + if(arrs.size()>=11 && arrs[10]=="鏄�" && arrs[6]!=arrs[7]){ def o = new BasicDBObject() try{ o.put("id", arrs[0]) @@ -444,11 +444,11 @@ class TownStandardBatch extends BaseBatch{ def addTownByTownShape(){ def i = 0 - def headers = ["_id","province","city","district","lng","lat","data_source","乡镇街道", "新区域", "方式", "标准乡镇"] + def headers = ["_id","province","city","district","lng","lat","data_source","涔¢晣琛楅亾", "鏂板尯鍩�", "鏂瑰紡", "鏍囧噯涔¢晣"] while(i<=50){ def fileName = "/home/goojia/gj/new_poi/input/map/no_township_${i}.csv" if (CommonDatautils.isWindow()) { - fileName = "D:\\数据\\数据建设\\乡镇街道\\no_township_${i}.csv" + fileName = "D:\\鏁版嵁\\鏁版嵁寤鸿\\涔¢晣琛楅亾\\no_township_${i}.csv" } File file=new File(fileName); if(file.exists()) { @@ -456,13 +456,13 @@ class TownStandardBatch extends BaseBatch{ println i +" "+ rets.size() def rows = addTownshipBatch(rets) if (CommonDatautils.isWindow()) { - com.fangjia.script.gj.ccb.FileUtils.batchCreateFileByCustomSuffix(rows, "D:\\数据\\数据建设\\乡镇街道\\待补充乡镇街道\\结果-地图\\no_township_result_${i}.csv", headers, "utf-8", false, ',', ''); + com.fangjia.script.gj.ccb.FileUtils.batchCreateFileByCustomSuffix(rows, "D:\\鏁版嵁\\鏁版嵁寤鸿\\涔¢晣琛楅亾\\寰呰ˉ鍏呬埂闀囪閬揬\缁撴灉-鍦板浘\\no_township_result_${i}.csv", headers, "utf-8", false, ',', ''); }else{ com.fangjia.script.gj.ccb.FileUtils.batchCreateFileByCustomSuffix(rows, "/home/goojia/gj/new_poi/output/no_township_result_${i}.csv", headers, "utf-8", false, ',', ''); } - println fileName +" 运行完成" + println fileName +" 杩愯瀹屾垚" }else{ - println fileName +" 不存在" + println fileName +" 涓嶅瓨鍦�" } i++ } @@ -471,13 +471,13 @@ class TownStandardBatch extends BaseBatch{ def standardTown(){ def i = 49 - def headers = ["_id","province","city","district","lng","lat","data_source","乡镇街道", "新区域", "方式", "标准乡镇"] + def headers = ["_id","province","city","district","lng","lat","data_source","涔¢晣琛楅亾", "鏂板尯鍩�", "鏂瑰紡", "鏍囧噯涔¢晣"] def cityTownMap = CommonDatautils.queryAllTown(["city", "district", "mzb_district_name", "street", "alias"]) while(i<=50){ def fileName = "/home/goojia/gj/new_poi/input/map/no_township_result_${i}.csv" if (CommonDatautils.isWindow()) { - fileName = "D:\\数据\\数据建设\\乡镇街道\\待补充乡镇街道\\结果-地图\\no_township_result_${i}.csv" + fileName = "D:\\鏁版嵁\\鏁版嵁寤鸿\\涔¢晣琛楅亾\\寰呰ˉ鍏呬埂闀囪閬揬\缁撴灉-鍦板浘\\no_township_result_${i}.csv" } File file=new File(fileName); if(file.exists()) { @@ -485,13 +485,13 @@ class TownStandardBatch extends BaseBatch{ println i +" "+ rets.size() def rows = addTownshipBatch2(rets, cityTownMap) if (CommonDatautils.isWindow()) { - com.fangjia.script.gj.ccb.FileUtils.batchCreateFileByCustomSuffix(rows, "D:\\数据\\数据建设\\乡镇街道\\待补充乡镇街道\\结果-地图-验证乡镇\\no_township_result_${i}.csv", headers, "utf-8", false, ',', ''); + com.fangjia.script.gj.ccb.FileUtils.batchCreateFileByCustomSuffix(rows, "D:\\鏁版嵁\\鏁版嵁寤鸿\\涔¢晣琛楅亾\\寰呰ˉ鍏呬埂闀囪閬揬\缁撴灉-鍦板浘-楠岃瘉涔¢晣\\no_township_result_${i}.csv", headers, "utf-8", false, ',', ''); }else{ com.fangjia.script.gj.ccb.FileUtils.batchCreateFileByCustomSuffix(rows, "/home/goojia/gj/new_poi/output/no_township_result_${i}.csv", headers, "utf-8", false, ',', ''); } - println fileName +" 运行完成" + println fileName +" 杩愯瀹屾垚" }else{ - println fileName +" 不存在" + println fileName +" 涓嶅瓨鍦�" } i++ } @@ -575,7 +575,7 @@ class TownStandardBatch extends BaseBatch{ } def addTown(saveObj, townMap, location) { - //在poi本区域下通过乡镇街道围栏选出所在乡镇街道 + //鍦╬oi鏈尯鍩熶笅閫氳繃涔¢晣琛楅亾鍥存爮閫夊嚭鎵�鍦ㄤ埂闀囪閬� // def towns = townMap.get(saveObj.district) // if (towns) { // for (def town : towns) { @@ -583,14 +583,14 @@ class TownStandardBatch extends BaseBatch{ // def flag = InsidePolygon.isInArea(location.lon, location.lat, InsidePolygon.createPoint4(town.shape.coordinates)) // if (flag) { // saveObj.township = town.street -// saveObj.town_source = "同区域" -// saveObj.strand_town = "是" +// saveObj.town_source = "鍚屽尯鍩�" +// saveObj.strand_town = "鏄�" // break // } // } // } // } - //忽略poi中的区域 通过乡镇街道围栏选出所在乡镇街道 + //蹇界暐poi涓殑鍖哄煙 閫氳繃涔¢晣琛楅亾鍥存爮閫夊嚭鎵�鍦ㄤ埂闀囪閬� // if(!saveObj.township){ // def townNames = townMap.keySet() // for(def townName : townNames){ @@ -601,7 +601,7 @@ class TownStandardBatch extends BaseBatch{ // if (flag) { // saveObj.township = town.street // saveObj.new_district = town.mzb_district_name -// saveObj.town_source = "忽略区域" +// saveObj.town_source = "蹇界暐鍖哄煙" // saveObj.strand_town = isStandTown(townMap, saveObj.new_district, saveObj.township) // break // } @@ -612,13 +612,13 @@ class TownStandardBatch extends BaseBatch{ // } // } // } - //通过调取地图api接口获取乡镇街道 + //閫氳繃璋冨彇鍦板浘api鎺ュ彛鑾峰彇涔¢晣琛楅亾 if(!saveObj.township){ def gaodeMap = getTownshipInfo(location.lon+","+location.lat) if(gaodeMap && gaodeMap.township){ saveObj.township = gaodeMap.township saveObj.new_district = gaodeMap.district - saveObj.town_source = "高德API" + saveObj.town_source = "楂樺痉API" saveObj.strand_town = "" // if(townMap.size()>=1){ // saveObj.strand_town = isStandTown(townMap, saveObj.new_district, saveObj.township) @@ -626,7 +626,7 @@ class TownStandardBatch extends BaseBatch{ } } -// //通过调取地图api接口获取乡镇街道 +// //閫氳繃璋冨彇鍦板浘api鎺ュ彛鑾峰彇涔¢晣琛楅亾 // if(!saveObj.township){ def gaodeMap = BaiduMapUtils.geocoding(location.lat+","+location.lon) // if(gaodeMap && gaodeMap.addressComponent) { @@ -635,7 +635,7 @@ class TownStandardBatch extends BaseBatch{ // if(addressComponent.town){ // saveObj.township = addressComponent.town // saveObj.new_district = addressComponent.district -// saveObj.town_source = "百度API" +// saveObj.town_source = "鐧惧害API" // saveObj.strand_town = isStandTown(townMap, saveObj.new_district, saveObj.township) // } // } @@ -646,11 +646,11 @@ class TownStandardBatch extends BaseBatch{ def isStandTown(townMap, district, town){ def towns = townMap.get(district) - def flag = "非" + def flag = "闈�" if(towns){ for(def t : towns){ if(t.street == town){ - flag = "是" + flag = "鏄�" break } } @@ -684,7 +684,7 @@ class TownStandardBatch extends BaseBatch{ } // if(jsonObject.status==0 || count>3){ // stop = true -// println "高德调用超3次" +// println "楂樺痉璋冪敤瓒�3娆�" // }else{ // count ++ // Thread.sleep(3000) @@ -705,14 +705,14 @@ class TownStandardBatch extends BaseBatch{ while(i<50) { def fileName = "/home/goojia/gj/new_poi/output/no_township_result_${i}.csv" if (CommonDatautils.isWindow()) { - fileName = "D:\\数据\\数据建设\\乡镇街道\\待补充乡镇街道\\结果-地图-验证乡镇\\no_township_result_${i}.csv" + fileName = "D:\\鏁版嵁\\鏁版嵁寤鸿\\涔¢晣琛楅亾\\寰呰ˉ鍏呬埂闀囪閬揬\缁撴灉-鍦板浘-楠岃瘉涔¢晣\\no_township_result_${i}.csv" } File file = new File(fileName); if (file.exists()) { def rets = readCSV3(fileName) println file.getAbsoluteFile().getName() +" "+(rets.size()*100/200000)+"%"+" "+rets.size() if(rets){ -// updateToEs(rets)//不能用这种方法修改,否则其它字段都将丢失 +// updateToEs(rets)//涓嶈兘鐢ㄨ繖绉嶆柟娉曚慨鏀癸紝鍚﹀垯鍏跺畠瀛楁閮藉皢涓㈠け // updateToEs2(rets) updateDistTownship(rets) } @@ -737,12 +737,12 @@ class TownStandardBatch extends BaseBatch{ print "." } - // 批量提交数据 + // 鎵归噺鎻愪氦鏁版嵁 if (request.numberOfActions() >= batchSize) { request.setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE); BulkResponse bulkResponse = client.bulk(request, RequestOptions.DEFAULT); if (bulkResponse.hasFailures()) { - // 处理错误 + // 澶勭悊閿欒 print "Bulk request has failures: " + bulkResponse.buildFailureMessage() } else { processedCount += request.numberOfActions(); @@ -758,7 +758,7 @@ class TownStandardBatch extends BaseBatch{ request.setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE); BulkResponse bulkResponse = client.bulk(request, RequestOptions.DEFAULT); if (bulkResponse.hasFailures()) { - // 处理错误 + // 澶勭悊閿欒 println "Bulk request has failures: " + bulkResponse.buildFailureMessage() } else { processedCount += request.numberOfActions(); @@ -766,7 +766,7 @@ class TownStandardBatch extends BaseBatch{ } } - println "结束时间 "+new Date() + println "缁撴潫鏃堕棿 "+new Date() } def updateToEs2(rows) { @@ -823,7 +823,7 @@ class TownStandardBatch extends BaseBatch{ udata.put("status", 1) udata.put("m_date", new Date()) DbUtils.seaweed.update(new BasicDBObject('_id',new ObjectId(m.id)), new BasicDBObject('$set', udata)) - println "删除 "+m.city +" "+obj.name+" "+m.id+" "+obj.cat + println "鍒犻櫎 "+m.city +" "+obj.name+" "+m.id+" "+obj.cat continue }else{ udata.put("region", region) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/TownshipPrcoess.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/TownshipPrcoess.groovy index f87cebb9c..a82c9556a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/TownshipPrcoess.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/TownshipPrcoess.groovy @@ -19,19 +19,19 @@ class TownshipPrcoess { } def run() { - def fileName = "D:\\数据\\数据建设\\乡镇别名问题.xlsx" + def fileName = "D:\\鏁版嵁\\鏁版嵁寤鸿\\涔¢晣鍒悕闂.xlsx" ExcelUtils.modify(fileName, { d -> if(!d['G']){ -// def name1 = d['E'].replace("街道","").replace("镇","").replace("乡","") -// def name2 = d['F'].replace("街道","").replace("镇","").replace("乡","") +// def name1 = d['E'].replace("琛楅亾","").replace("闀�","").replace("涔�","") +// def name2 = d['F'].replace("琛楅亾","").replace("闀�","").replace("涔�","") // if(name1 == name2){ -// d['G'] = "不处理" +// d['G'] = "涓嶅鐞�" // } def lists1 = findCommunityTown(community_CONN, d['C'], d['D'], d['E']) def lists2 = findCommunityTown(community_CONN, d['C'], d['D'], d['F']) if(lists1 && lists2){ - d['G'] = "需删除" + d['G'] = "闇�鍒犻櫎" } } }) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/TownshipStrandUpdate.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/TownshipStrandUpdate.groovy index da5899b14..95b0ee6fc 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/TownshipStrandUpdate.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/TownshipStrandUpdate.groovy @@ -63,15 +63,15 @@ class TownshipStrandUpdate { commMap = CommonDatautils.queryCommunityByCity() polylineMap = CommonDatautils.findAllTownRanges() newAdvMappingMap = CommonDatautils.queryNewTownByCity() -// def citys = ["唐山","邯郸","石家庄","保定","秦皇岛","廊坊","沧州","张家口","衡水","邢台","承德"]//CommonDatautils.findAllCity() - def citys = ["澄迈","临高"]//CommonDatautils.findAllCity(),"东方","澄迈","临高" +// def citys = ["鍞愬北","閭兏","鐭冲搴�","淇濆畾","绉︾殗宀�","寤婂潑","娌у窞","寮犲鍙�","琛℃按","閭㈠彴","鎵垮痉"]//CommonDatautils.findAllCity() + def citys = ["婢勮繄","涓撮珮"]//CommonDatautils.findAllCity(),"涓滄柟","婢勮繄","涓撮珮" citys = citys.reverse() for(def city : citys){ // -// if(["中山","东莞"].contains(city)){ +// if(["涓北","涓滆帪"].contains(city)){ // continue // } - def fileName = "D:\\数据\\数据建设\\乡镇街道\\写字楼\\写字楼乡镇街道格式化-${city}.xlsx" + def fileName = "D:\\鏁版嵁\\鏁版嵁寤鸿\\涔¢晣琛楅亾\\鍐欏瓧妤糪\鍐欏瓧妤间埂闀囪閬撴牸寮忓寲-${city}.xlsx" File file=new File(fileName); // if(!file.exists()){ def dists = CommonDatautils.findAllDistrictsFromMg(city, "office", ["city","region","name","address","cat","estate_type2","status","township","lng","lat"]) @@ -82,27 +82,27 @@ class TownshipStrandUpdate { } } -// 相同且为统计局乡镇 -// 更正 -// 不同且不为统计局乡镇 -// 区域不同 -// 地图无乡镇街道 -// 城市不同 +// 鐩稿悓涓斾负缁熻灞�涔¢晣 +// 鏇存 +// 涓嶅悓涓斾笉涓虹粺璁″眬涔¢晣 +// 鍖哄煙涓嶅悓 +// 鍦板浘鏃犱埂闀囪閬� +// 鍩庡競涓嶅悓 def stat(){ def citys = CommonDatautils.findAllCity() citys = citys.reverse() def rets = [] - rets << ["城市", "小区量", "更正量","相同且为统计局乡镇","不同且不为统计局乡镇","区域不同","地图无乡镇街道","城市不同","无值"] + rets << ["鍩庡競", "灏忓尯閲�", "鏇存閲�","鐩稿悓涓斾负缁熻灞�涔¢晣","涓嶅悓涓斾笉涓虹粺璁″眬涔¢晣","鍖哄煙涓嶅悓","鍦板浘鏃犱埂闀囪閬�","鍩庡競涓嶅悓","鏃犲��"] for(def city : citys){ - def fileName = "D:\\数据\\数据建设\\乡镇街道\\商铺\\商铺乡镇街道格式化-${city}.xlsx" + def fileName = "D:\\鏁版嵁\\鏁版嵁寤鸿\\涔¢晣琛楅亾\\鍟嗛摵\\鍟嗛摵涔¢晣琛楅亾鏍煎紡鍖�-${city}.xlsx" File file=new File(fileName); def map = [:] def datas = null if(file.exists()){ datas = ExcelUtils.read(fileName,0, 1) for(def d : datas){ - def key = "空值" + def key = "绌哄��" if(d['S']){ key = d['S'] } @@ -120,23 +120,23 @@ class TownshipStrandUpdate { } println "--------------------------------------------------------------------------------------------" if(map){ - rets << [city, datas.size(), map.get("更正"),map.get("相同且为统计局乡镇"),map.get("不同且不为统计局乡镇"),map.get("区域不同"),map.get("地图无乡镇街道"),map.get("城市不同"),map.get("空值")] + rets << [city, datas.size(), map.get("鏇存"),map.get("鐩稿悓涓斾负缁熻灞�涔¢晣"),map.get("涓嶅悓涓斾笉涓虹粺璁″眬涔¢晣"),map.get("鍖哄煙涓嶅悓"),map.get("鍦板浘鏃犱埂闀囪閬�"),map.get("鍩庡競涓嶅悓"),map.get("绌哄��")] } } - ExcelUtils.write("D:\\数据\\数据建设\\乡镇街道\\乡镇街道更新结果统计.xlsx", rets, "商铺") + ExcelUtils.write("D:\\鏁版嵁\\鏁版嵁寤鸿\\涔¢晣琛楅亾\\涔¢晣琛楅亾鏇存柊缁撴灉缁熻.xlsx", rets, "鍟嗛摵") } def updateTown(){ def citys = CommonDatautils.findAllCity() citys = citys.reverse() for(def city : citys){ - def fileName = "D:\\数据\\数据建设\\乡镇街道\\商铺\\商铺乡镇街道格式化-${city}.xlsx" + def fileName = "D:\\鏁版嵁\\鏁版嵁寤鸿\\涔¢晣琛楅亾\\鍟嗛摵\\鍟嗛摵涔¢晣琛楅亾鏍煎紡鍖�-${city}.xlsx" File file=new File(fileName); if(file.exists()){ println fileName ExcelUtils.multiThreadingModify(fileName,{d-> - if(d['S']!='相同且为统计局乡镇' && d['S']){ + if(d['S']!='鐩稿悓涓斾负缁熻灞�涔¢晣' && d['S']){ def q = new BasicDBObject() q.put("city", d['A']) q.put("region", d['B']) @@ -183,7 +183,7 @@ class TownshipStrandUpdate { def running(d){ def fullCity = fullCityMap.get(d.city) def regions = getFullRegion(fullCity, d) - if(!regions && ["中山市","东莞市","济源市","仙桃市","潜江市","天门市","神农架市","五指山市","琼海市","文昌市","万宁市","东方市","定安市","屯昌市","澄迈市","临高市","白沙市","昌江市","乐东市","陵水市","保亭市","琼中市","阿拉尔市","图木舒克市","五家渠市","北屯市","铁门关市","双河市","可克达拉市"].contains(fullCity.city)){ + if(!regions && ["涓北甯�","涓滆帪甯�","娴庢簮甯�","浠欐甯�","娼滄睙甯�","澶╅棬甯�","绁炲啘鏋跺競","浜旀寚灞卞競","鐞兼捣甯�","鏂囨槍甯�","涓囧畞甯�","涓滄柟甯�","瀹氬畨甯�","灞槍甯�","婢勮繄甯�","涓撮珮甯�","鐧芥矙甯�","鏄屾睙甯�","涔愪笢甯�","闄垫按甯�","淇濅涵甯�","鐞间腑甯�","闃挎媺灏斿競","鍥炬湪鑸掑厠甯�","浜斿娓犲競","鍖楀悲甯�","閾侀棬鍏冲競","鍙屾渤甯�","鍙厠杈炬媺甯�"].contains(fullCity.city)){ regions = [] regions << fullCity.city } @@ -212,7 +212,7 @@ class TownshipStrandUpdate { if(mapTown){ d.strand_street = mapTown.street if(mapTown.shape && mapTown.shape.coordinates){ - d.map_town_shape = "有" + d.map_town_shape = "鏈�" def flag = InsidePolygon.isInArea(d.lng, d.lat, InsidePolygon.createPoint4(mapTown.shape.coordinates)) if(flag){ d.map_polygon_town = mapTown.street @@ -243,7 +243,7 @@ class TownshipStrandUpdate { if( gaodeMap.district && gaodeMap.district!='[]'){ mapRegion = gaodeMap.district }else{ - if(mapCity && ["中山市","东莞市","济源市","仙桃市","潜江市","天门市","神农架市","五指山市","琼海市","文昌市","万宁市","东方市","定安市","屯昌市","澄迈市","临高市","白沙市","昌江市","乐东市","陵水市","保亭市","琼中市","阿拉尔市","图木舒克市","五家渠市","北屯市","铁门关市","双河市","可克达拉市"].contains(mapCity)){ + if(mapCity && ["涓北甯�","涓滆帪甯�","娴庢簮甯�","浠欐甯�","娼滄睙甯�","澶╅棬甯�","绁炲啘鏋跺競","浜旀寚灞卞競","鐞兼捣甯�","鏂囨槍甯�","涓囧畞甯�","涓滄柟甯�","瀹氬畨甯�","灞槍甯�","婢勮繄甯�","涓撮珮甯�","鐧芥矙甯�","鏄屾睙甯�","涔愪笢甯�","闄垫按甯�","淇濅涵甯�","鐞间腑甯�","闃挎媺灏斿競","鍥炬湪鑸掑厠甯�","浜斿娓犲競","鍖楀悲甯�","閾侀棬鍏冲競","鍙屾渤甯�","鍙厠杈炬媺甯�"].contains(mapCity)){ mapRegion = mapCity } } @@ -263,50 +263,50 @@ class TownshipStrandUpdate { if(regions.contains(mapRegion)){ if(mapTownship){ if(town){ - d.old_tjj_township = "是" + d.old_tjj_township = "鏄�" }else{ - d.old_tjj_township = "否" + d.old_tjj_township = "鍚�" } if(mapTown){ - d.new_tjj_township = "是" + d.new_tjj_township = "鏄�" }else{ - d.new_tjj_township = "否" + d.new_tjj_township = "鍚�" } if(mapTownship == d.township){ if(town){ - d.remark = "相同且为统计局乡镇" + d.remark = "鐩稿悓涓斾负缁熻灞�涔¢晣" }else{ - d.remark = "非统计局乡镇" - d.opt = "原因很多:可能存在此乡镇,但区域不同,也有可能不存在此乡镇,也有可能与其它镇合并" + d.remark = "闈炵粺璁″眬涔¢晣" + d.opt = "鍘熷洜寰堝锛氬彲鑳藉瓨鍦ㄦ涔¢晣锛屼絾鍖哄煙涓嶅悓锛屼篃鏈夊彲鑳戒笉瀛樺湪姝や埂闀囷紝涔熸湁鍙兘涓庡叾瀹冮晣鍚堝苟" } }else{ if(mapTown){ - d.remark = "更正" + d.remark = "鏇存" }else{ - d.remark = "不同且不为统计局乡镇" - d.opt = "原因很多:可能存在此乡镇,但区域不同,也有可能不存在此乡镇,也有可能与其它镇合并" + d.remark = "涓嶅悓涓斾笉涓虹粺璁″眬涔¢晣" + d.opt = "鍘熷洜寰堝锛氬彲鑳藉瓨鍦ㄦ涔¢晣锛屼絾鍖哄煙涓嶅悓锛屼篃鏈夊彲鑳戒笉瀛樺湪姝や埂闀囷紝涔熸湁鍙兘涓庡叾瀹冮晣鍚堝苟" } } }else{ - d.remark = "地图无乡镇街道" - d.opt = "地图无街道信息" + d.remark = "鍦板浘鏃犱埂闀囪閬�" + d.opt = "鍦板浘鏃犺閬撲俊鎭�" } }else{ - d.remark = "区域不同" - d.opt = "经纬度可能跨区域" + d.remark = "鍖哄煙涓嶅悓" + d.opt = "缁忕含搴﹀彲鑳借法鍖哄煙" } }else{ - d.remark = "城市不同" - d.opt = "经纬度可能跨城市" + d.remark = "鍩庡競涓嶅悓" + d.opt = "缁忕含搴﹀彲鑳借法鍩庡競" } } - if(d.map_town_shape && d.map_town_shape=="有"){ + if(d.map_town_shape && d.map_town_shape=="鏈�"){ if(!d.map_polygon_town){ - d.opt = "经纬度可疑" + d.opt = "缁忕含搴﹀彲鐤�" } } return d; @@ -340,8 +340,8 @@ class TownshipStrandUpdate { town = townObj }else if(townObj.alias && townObj.alias.contains(townstr)){ town = townObj - }else if(townObj.street.toString().endsWith("乡")||townObj.street.toString().endsWith("镇")||townObj.street.toString().endsWith("街道")||townObj.street.toString().endsWith("社区")||townObj.street.toString().endsWith("地区")){ - def newTown = townObj.street.replace("乡","").replace("镇","").replace("街道","").replace("社区","").replace("地区","") + }else if(townObj.street.toString().endsWith("涔�")||townObj.street.toString().endsWith("闀�")||townObj.street.toString().endsWith("琛楅亾")||townObj.street.toString().endsWith("绀惧尯")||townObj.street.toString().endsWith("鍦板尯")){ + def newTown = townObj.street.replace("涔�","").replace("闀�","").replace("琛楅亾","").replace("绀惧尯","").replace("鍦板尯","") if(townstr.contains(newTown)){ town = townObj } @@ -371,7 +371,7 @@ class TownshipStrandUpdate { def createDatas(dists){ def rets = [] - rets << ["城市","区域","名称","地址","物业类型","乡镇","经度","纬度","原始乡镇是否在围栏中","经纬度是否在围栏中","地图城市","地图区域","地图乡镇","地图乡镇是否在围栏中","地图乡镇是否在统计局中","地图所在乡镇街道是否有围栏","地图地址","标准镇","备注", "操作","原始围栏表相似镇", "原始围栏表相似得分","中间表相似镇", "中间表相似得分"] + rets << ["鍩庡競","鍖哄煙","鍚嶇О","鍦板潃","鐗╀笟绫诲瀷","涔¢晣","缁忓害","绾害","鍘熷涔¢晣鏄惁鍦ㄥ洿鏍忎腑","缁忕含搴︽槸鍚﹀湪鍥存爮涓�","鍦板浘鍩庡競","鍦板浘鍖哄煙","鍦板浘涔¢晣","鍦板浘涔¢晣鏄惁鍦ㄥ洿鏍忎腑","鍦板浘涔¢晣鏄惁鍦ㄧ粺璁″眬涓�","鍦板浘鎵�鍦ㄤ埂闀囪閬撴槸鍚︽湁鍥存爮","鍦板浘鍦板潃","鏍囧噯闀�","澶囨敞", "鎿嶄綔","鍘熷鍥存爮琛ㄧ浉浼奸晣", "鍘熷鍥存爮琛ㄧ浉浼煎緱鍒�","涓棿琛ㄧ浉浼奸晣", "涓棿琛ㄧ浉浼煎緱鍒�"] for(def d : dists){ rets << [d.city,d.region,d.name,d.address,d.estate_type2,d.township,d.lng,d.lat, d.old_tjj_township, d.polygon_town, d.mapCity,d.mapRegion,d.mapTownship,d.map_polygon_town,d.new_tjj_township,d.map_town_shape,d.mapAddr,d.strand_street, d.remark, d.opt, d.old_similar_town, d.old_similar_town_score, d.new_similar_town, d.new_similar_town_score] } @@ -397,7 +397,7 @@ class TownshipStrandUpdate { if(addressComponent.city.size()>0){ city = addressComponent.city }else{ - if(addressComponent.province && (addressComponent.province.endsWith("省") || addressComponent.province.endsWith("自治区"))){ + if(addressComponent.province && (addressComponent.province.endsWith("鐪�") || addressComponent.province.endsWith("鑷不鍖�"))){ city = addressComponent.district }else{ city = addressComponent.province @@ -428,15 +428,15 @@ class TownshipStrandUpdate { } def updateDiffRegionTown(){ - def fileName = "D:\\数据\\数据建设\\乡镇街道\\district-不同区域.xlsx" + def fileName = "D:\\鏁版嵁\\鏁版嵁寤鸿\\涔¢晣琛楅亾\\district-涓嶅悓鍖哄煙.xlsx" ExcelUtils.modify(fileName,{d-> def lists = CommonDatautils.findDistrictList(d['A'], null, d['C'], "district") d['AA'] = lists.size() - //只处理库中只有一个的 + //鍙鐞嗗簱涓彧鏈変竴涓殑 if(lists && lists.size()==1 && d['R']){ def newRegion = RegionData.formatRegion(d['A'], d['R']) if(newRegion){ -// if(d['X'] && d['X'].toString().contains(d['M']+" "+d['N'])){ //地图街道在中间表中 +// if(d['X'] && d['X'].toString().contains(d['M']+" "+d['N'])){ //鍦板浘琛楅亾鍦ㄤ腑闂磋〃涓� def dbo = lists[0] // def arrs = d['X'].split(" ") def udata = new BasicDBObject() @@ -445,8 +445,8 @@ class TownshipStrandUpdate { // udata.put("township", arrs[1]) DbUtils.seaweed.update(new BasicDBObject('_id',dbo._id), new BasicDBObject('$set', udata)) - CommonDatautils.saveOptLog(dbo.city, dbo.region, dbo.name, "district", "update-region","高娟") - d['AB'] = "已处理" + CommonDatautils.saveOptLog(dbo.city, dbo.region, dbo.name, "district", "update-region","楂樺") + d['AB'] = "宸插鐞�" // } } } @@ -454,7 +454,7 @@ class TownshipStrandUpdate { } def cleanTown(){ - def fileName = "D:\\数据\\数据建设\\乡镇街道\\district-不同区域.xlsx" + def fileName = "D:\\鏁版嵁\\鏁版嵁寤鸿\\涔¢晣琛楅亾\\district-涓嶅悓鍖哄煙.xlsx" ExcelUtils.modify(fileName,{d-> if(d['AC']){ def dbo = CommonDatautils.findDistrict(d['B'], d['C'], d['D'], "district") @@ -464,7 +464,7 @@ class TownshipStrandUpdate { udata.put("township", "") DbUtils.seaweed.update(new BasicDBObject('_id',dbo._id), new BasicDBObject('$set', udata)) - CommonDatautils.saveOptLog(dbo.city, dbo.region, dbo.name, "office", "update-town","高娟") + CommonDatautils.saveOptLog(dbo.city, dbo.region, dbo.name, "office", "update-town","楂樺") } } }) @@ -479,7 +479,7 @@ class TownshipStrandUpdate { def index = 0 for(def city : citys) { index++ - if (["中山", "东莞"].contains(city)) { + if (["涓北", "涓滆帪"].contains(city)) { continue } @@ -498,14 +498,14 @@ class TownshipStrandUpdate { udata.put("township", "") DbUtils.seaweed.update(new BasicDBObject('_id',d._id), new BasicDBObject('$set', udata)) - CommonDatautils.saveOptLog(d.city, d.region, d.name, "office", "update-town","高娟") + CommonDatautils.saveOptLog(d.city, d.region, d.name, "office", "update-town","楂樺") println d.city + " " + d.region + " " + d.township + " " + d.name } } } } - println index + " " + city + " 完成" + println index + " " + city + " 瀹屾垚" } } @@ -520,14 +520,14 @@ class TownshipStrandUpdate { if(list.size()==1){ return list[0] }else{ - println city+ " "+district+" "+street+" 有多个" + println city+ " "+district+" "+street+" 鏈夊涓�" } } return null } def updateTownMapping(){ - def fileName = "D:\\数据\\数据建设\\乡镇街道\\双方区域对比.xlsx" + def fileName = "D:\\鏁版嵁\\鏁版嵁寤鸿\\涔¢晣琛楅亾\\鍙屾柟鍖哄煙瀵规瘮.xlsx" ExcelUtils.modify(fileName,{d-> if(d['F']){ // def udata = new BasicDBObject() @@ -573,13 +573,13 @@ class TownshipStrandUpdate { } def updateDevMapping(){ - def fileName = "D:\\数据\\数据建设\\开发区\\开发区映射表重复数据.xlsx" + def fileName = "D:\\鏁版嵁\\鏁版嵁寤鸿\\寮�鍙戝尯\\寮�鍙戝尯鏄犲皠琛ㄩ噸澶嶆暟鎹�.xlsx" ExcelUtils.modify(fileName,{d-> def q = new BasicDBObject() q.put("city", d['A']) q.put("district", d['B']) q.put("name",d['C']) - q.put("type", "乡镇街道") + q.put("type", "涔¢晣琛楅亾") q.put("township", d['D']) def list = dev_MAPPING_COLL_100.find(q).toList() if(list && list.size()==2){ @@ -594,15 +594,15 @@ class TownshipStrandUpdate { } def updateSpecCityTown(){ - def citys = ["中山","东莞","潜江","天门","神农架","五指山","琼海","文昌","万宁","东方","定安","屯昌","澄迈","临高","白沙","昌江","乐东","陵水","保亭","琼中","阿拉尔","图木舒克","五家渠","北屯","铁门关","双河","可克达拉"] + def citys = ["涓北","涓滆帪","娼滄睙","澶╅棬","绁炲啘鏋�","浜旀寚灞�","鐞兼捣","鏂囨槍","涓囧畞","涓滄柟","瀹氬畨","灞槍","婢勮繄","涓撮珮","鐧芥矙","鏄屾睙","涔愪笢","闄垫按","淇濅涵","鐞间腑","闃挎媺灏�","鍥炬湪鑸掑厠","浜斿娓�","鍖楀悲","閾侀棬鍏�","鍙屾渤","鍙厠杈炬媺"] -// def citys = ["中山"] +// def citys = ["涓北"] for(def city : citys){ - def fileName = "D:\\数据\\数据建设\\乡镇街道\\商铺\\商铺乡镇街道格式化-${city}.xlsx" + def fileName = "D:\\鏁版嵁\\鏁版嵁寤鸿\\涔¢晣琛楅亾\\鍟嗛摵\\鍟嗛摵涔¢晣琛楅亾鏍煎紡鍖�-${city}.xlsx" ExcelUtils.modify(fileName,{d-> def list = CommonDatautils.findDistrictList(d['A'], null , d['C'], "office") if(list.size()>1){ - println d['A'] +" "+d['C'] + " 有多个" + println d['A'] +" "+d['C'] + " 鏈夊涓�" }else if(list.size()==1){ def dbo = list[0] def town = null @@ -626,7 +626,7 @@ class TownshipStrandUpdate { udata.put("region", region) DbUtils.seaweed.update(new BasicDBObject('_id',dbo._id), new BasicDBObject('$set', udata)) }else{ - println d['A']+" "+d['C']+" "+d['X'] +" 无法格式化" + println d['A']+" "+d['C']+" "+d['X'] +" 鏃犳硶鏍煎紡鍖�" } } @@ -637,9 +637,9 @@ class TownshipStrandUpdate { def updateTownshipAlias(){ - def fileName = "D:\\数据\\数据建设\\乡镇街道\\20250219--乡镇街道添加别名.xlsx" + def fileName = "D:\\鏁版嵁\\鏁版嵁寤鸿\\涔¢晣琛楅亾\\20250219--涔¢晣琛楅亾娣诲姞鍒悕.xlsx" ExcelUtils.modify(fileName,{d-> - def q = new BasicDBObject("type","乡镇街道").append("city", d["A"]).append("district",d["B"]).append("street",d["C"]) + def q = new BasicDBObject("type","涔¢晣琛楅亾").append("city", d["A"]).append("district",d["B"]).append("street",d["C"]) def list = ADMINISTRATIVE_MAPPING_COLL.find(q).toList() def newAlias = d['D'] if(list.size()==0){ @@ -660,7 +660,7 @@ class TownshipStrandUpdate { def udata = new BasicDBObject() udata.put("alias", alias) udata.put("m_date", new Date()) - udata.put("operator","陈杰") + udata.put("operator","闄堟澃") ADMINISTRATIVE_MAPPING_COLL.update(new BasicDBObject("_id",obj._id), new BasicDBObject('$set',udata)) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/TradeDatasDistBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/TradeDatasDistBatch.groovy index 7d34463a2..40ba06576 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/TradeDatasDistBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/TradeDatasDistBatch.groovy @@ -17,7 +17,7 @@ class TradeDatasDistBatch { } def run(){ - ExcelUtils.multiThreadingModify("D:\\数据\\数据建设\\小区\\房天下成交别名.xlsx",{d-> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\鏁版嵁寤鸿\\灏忓尯\\鎴垮ぉ涓嬫垚浜ゅ埆鍚�.xlsx",{d-> def udata = new BasicDBObject() udata.put("city", d['A']) @@ -30,11 +30,11 @@ class TradeDatasDistBatch { // if(!dist){ // def rets = CommonDatautils.findDistrictByAlias(d['A'], d['B'], d['C'], "district") // if(rets && rets.size()==1){ -// flag = "别名匹配" +// flag = "鍒悕鍖归厤" // dist = rets[0] // } // }else{ -// flag = "名称匹配" +// flag = "鍚嶇О鍖归厤" // } // if(flag){ // d['F'] = dist.city diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/VillaHouseBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/VillaHouseBatch.groovy index 73571b916..f2b33c6bb 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/VillaHouseBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/VillaHouseBatch.groovy @@ -22,7 +22,7 @@ class VillaHouseBatch extends BaseBatch{ def pgsqlInstance236 = Sql.newInstance("jdbc:postgresql://192.168.0.236:5432/warehouse", "postgres", "postgres", "org.postgresql.Driver") - //235为房价网内部计算均价的库 + //235涓烘埧浠风綉鍐呴儴璁$畻鍧囦环鐨勫簱 def sqlInstance235 = Sql.newInstance("jdbc:postgresql://192.168.0.235:5433/fangjia?stringtype=unspecified", "postgres", "Goojia123456", "org.postgresql.Driver") @@ -36,16 +36,16 @@ class VillaHouseBatch extends BaseBatch{ @Override void process(Object args) { - def dists = CcbCommonUtils.findAllDistrictByCity("上海", "district", ["city", "region", "name", "estate_type2"], "all") + def dists = CcbCommonUtils.findAllDistrictByCity("涓婃捣", "district", ["city", "region", "name", "estate_type2"], "all") def villaDists = findVillaDists(dists) addVillaTypeFlag(villaDists) - println "运行完成" + println "杩愯瀹屾垚" } def findVillaDists(dists){ def villaDists = [] for(def d : dists){ - if(d.estate_type2 == "别墅"){ + if(d.estate_type2 == "鍒"){ villaDists << d } } @@ -61,7 +61,7 @@ class VillaHouseBatch extends BaseBatch{ if(sellIds){ def retMap = run(sellIds) if(retMap){ - println "最终修改:"+retMap.size() + println "鏈�缁堜慨鏀癸細"+retMap.size() updateHouseFlag(retMap) } } @@ -121,16 +121,16 @@ class VillaHouseBatch extends BaseBatch{ def title = house.name println title if(title){ - if(title.contains("独栋")){ - flag = "独栋" - }else if(title.contains("联排")){ - flag = "联排" - }else if(title.contains("叠拼")){ - flag = "叠拼" - }else if(title.contains("花园洋房")){ - flag = "花园洋房" - }else if(title.contains("双拼")){ - flag = "双拼" + if(title.contains("鐙爧")){ + flag = "鐙爧" + }else if(title.contains("鑱旀帓")){ + flag = "鑱旀帓" + }else if(title.contains("鍙犳嫾")){ + flag = "鍙犳嫾" + }else if(title.contains("鑺卞洯娲嬫埧")){ + flag = "鑺卞洯娲嬫埧" + }else if(title.contains("鍙屾嫾")){ + flag = "鍙屾嫾" } } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/AddAlias.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/AddAlias.groovy index 5d4b81290..d3dc2c278 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/AddAlias.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/AddAlias.groovy @@ -6,9 +6,9 @@ import com.fangjia.script.util.DbUtils import com.fangjia.script.util.ExcelUtils import com.mongodb.BasicDBObject // -//ExcelUtils.modify("D:\\数据\\常州\\有样本小区-匹配 -区域相同样本量超过等于3条(人工手动).xlsx",{d-> +//ExcelUtils.modify("D:\\鏁版嵁\\甯稿窞\\鏈夋牱鏈皬鍖�-鍖归厤 -鍖哄煙鐩稿悓鏍锋湰閲忚秴杩囩瓑浜�3鏉★紙浜哄伐鎵嬪姩锛�.xlsx",{d-> // def opt = d['J'] -// if(opt && opt.contains("别名")){ +// if(opt && opt.contains("鍒悕")){ // def dist = CommonDatautils.findDistrictById(d['H']) // if(dist){ // def alias = [] @@ -28,10 +28,10 @@ import com.mongodb.BasicDBObject -ExcelUtils.modify("D:\\数据\\厦门\\厦门户数(曹和付)-结果.xlsx",{d-> +ExcelUtils.modify("D:\\鏁版嵁\\鍘﹂棬\\鍘﹂棬鎴锋暟(鏇瑰拰浠橈級-缁撴灉.xlsx",{d-> def opt = d['J'] if(opt && opt.toString().toDouble().toInteger()==1){ - def dist = CommonDatautils.findDistrict('厦门',d['G'],d['H'], "district") + def dist = CommonDatautils.findDistrict('鍘﹂棬',d['G'],d['H'], "district") if(dist){ def udata = new BasicDBObject() udata.put("household_count", d['F'].toString().toDouble().toInteger()) 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 index cc9c87682..545e5ebaf 100644 --- 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 @@ -16,7 +16,7 @@ import java.util.concurrent.Executors import java.util.concurrent.atomic.AtomicLong /** - * 通过房源更改电梯 + * 閫氳繃鎴挎簮鏇存敼鐢垫 */ @BatchOwner(Watcher.GaoJuan) @@ -46,7 +46,7 @@ class AddDistrictElevatorBatch extends BaseBatch{ def addEvevatorProcess(c, dists){ def totalCount = new AtomicLong() final CountDownLatch latch = new CountDownLatch(dists.size()) - println "小区量:"+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() + println totalCount.get()+" [${dist.estate_type2}] "+dist.name +" 鍘燂細"+houses.size()+" 鏈夊�硷細"+haveHouses.size()+" 绛涢�夋牱鏈噺锛�"+newHouses.size() BasicDBObject udata = new BasicDBObject() - if(dist.estate_type2 == "别墅"){ + if(dist.estate_type2 == "鍒"){ udata.put("is_elevator", false) }else{ udata.put("is_elevator", true) @@ -76,7 +76,7 @@ class AddDistrictElevatorBatch extends BaseBatch{ DbUtils.seaweed.update(new BasicDBObject('_id', dist._id),new BasicDBObject('$set',udata)) rets << dist }else{ - if(dist.build_type && dist.build_type.contains("高层")){ + 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)) @@ -100,7 +100,7 @@ class AddDistrictElevatorBatch extends BaseBatch{ def analyElevator(houses, estateType){ def heights = [] for(def h : houses){ - if(estateType=="别墅"){ + if(estateType=="鍒"){ if(h.height && h.height<=4) { heights << h.height } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/ApiTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/ApiTest.groovy index a245c0cd2..b24427766 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/ApiTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/ApiTest.groovy @@ -24,24 +24,24 @@ class ApiTest { static main(args) { def task = new ApiTest() -// task.rankRunTest()//小区排名接口测试 -// task.similarRunTest()//相似房源接口测试 - task.jnBankSearch() //江南行小区搜索 -// task.loupanLevelTest()//楼盘评级接口测试 +// task.rankRunTest()//灏忓尯鎺掑悕鎺ュ彛娴嬭瘯 +// task.similarRunTest()//鐩镐技鎴挎簮鎺ュ彛娴嬭瘯 + task.jnBankSearch() //姹熷崡琛屽皬鍖烘悳绱� +// task.loupanLevelTest()//妤肩洏璇勭骇鎺ュ彛娴嬭瘯 -// task.jsAbcHouseCastTest()//北交所房源接口测试 小区 -// task.arroundFacilities()//北交所周边poi 小区 +// task.jsAbcHouseCastTest()//鍖椾氦鎵�鎴挎簮鎺ュ彛娴嬭瘯 灏忓尯 +// task.arroundFacilities()//鍖椾氦鎵�鍛ㄨ竟poi 灏忓尯 -// task.addressAvgPrice("D:\\数据\\北交所\\拍卖案例(-地址估值接口).xlsx")//地址出小区均价 -// task.addressEvaluate("D:\\数据\\北交所\\拍卖案例(-地址均价接口).xlsx")//地址估值 -// task.arroundFacilitiesByAddress("D:\\数据\\北交所\\拍卖案例(-周边poi接口).xlsx")//北交所周边poi 地址 -// task.jsAbcHouseCastTestByAddress("D:\\数据\\北交所\\拍卖案例(房源接口500条-价格控20%).xlsx") -// task.houseValueInformation("D:\\数据\\北交所\\北交所综合接口测试.xlsx") +// task.addressAvgPrice("D:\\鏁版嵁\\鍖椾氦鎵�\\鎷嶅崠妗堜緥(-鍦板潃浼板�兼帴鍙�).xlsx")//鍦板潃鍑哄皬鍖哄潎浠� +// task.addressEvaluate("D:\\鏁版嵁\\鍖椾氦鎵�\\鎷嶅崠妗堜緥(-鍦板潃鍧囦环鎺ュ彛).xlsx")//鍦板潃浼板�� +// task.arroundFacilitiesByAddress("D:\\鏁版嵁\\鍖椾氦鎵�\\鎷嶅崠妗堜緥(-鍛ㄨ竟poi鎺ュ彛).xlsx")//鍖椾氦鎵�鍛ㄨ竟poi 鍦板潃 +// task.jsAbcHouseCastTestByAddress("D:\\鏁版嵁\\鍖椾氦鎵�\\鎷嶅崠妗堜緥(鎴挎簮鎺ュ彛500鏉�-浠锋牸鎺�20%).xlsx") +// task.houseValueInformation("D:\\鏁版嵁\\鍖椾氦鎵�\\鍖椾氦鎵�缁煎悎鎺ュ彛娴嬭瘯.xlsx") - //五级地址标准化 -// task.addrStructure("D:\\数据\\地数\\地址标准化-测试用例.xlsx") -// task.nineLevel("D:\\数据\\地数\\地址九级标准化-测试用例.xlsx") + //浜旂骇鍦板潃鏍囧噯鍖� +// task.addrStructure("D:\\鏁版嵁\\鍦版暟\\鍦板潃鏍囧噯鍖�-娴嬭瘯鐢ㄤ緥.xlsx") +// task.nineLevel("D:\\鏁版嵁\\鍦版暟\\鍦板潃涔濈骇鏍囧噯鍖�-娴嬭瘯鐢ㄤ緥.xlsx") } def addrStructure(path){ @@ -197,7 +197,7 @@ class ApiTest { def loupanLevelTest(){ - ExcelUtils.modify("D:\\数据\\卓信\\上海 - 副本.xlsx", { d -> + ExcelUtils.modify("D:\\鏁版嵁\\鍗撲俊\\涓婃捣 - 鍓湰.xlsx", { d -> if (d['A']) { def results = com.fangjia.script.gj.OpenApiUtils.financialRating(d['A'], d['B']+d['C']) if(results){ @@ -208,14 +208,14 @@ class ApiTest { } def jnBankSearch(){ - ExcelUtils.modify("D:\\数据\\江南农商行\\住宅信息V2-差异案例(反馈).xlsx", { d -> + ExcelUtils.modify("D:\\鏁版嵁\\姹熷崡鍐滃晢琛孿\浣忓畢淇℃伅V2-宸紓妗堜緥锛堝弽棣堬級.xlsx", { d -> }) } def similarRunTest(){ - ExcelUtils.modify("D:\\数据\\江南农商行\\住宅信息V2-差异案例(反馈).xlsx", { d -> + ExcelUtils.modify("D:\\鏁版嵁\\姹熷崡鍐滃晢琛孿\浣忓畢淇℃伅V2-宸紓妗堜緥锛堝弽棣堬級.xlsx", { d -> if(d['A']){ def cityCode = d['U'].toString().toDouble().toInteger() def proCode = d['V'].toString().toDouble().toInteger() @@ -237,13 +237,13 @@ class ApiTest { } def rankRunTest(){ - def dists = CommonDatautils.findAllDistrictByCity("上海","district", ["city","region","name"]) - //def dists = CommonDatautils.findDistrictByCityAndRegions("上海","district", ["浦东"], ["city","region","name"]) + def dists = CommonDatautils.findAllDistrictByCity("涓婃捣","district", ["city","region","name"]) + //def dists = CommonDatautils.findDistrictByCityAndRegions("涓婃捣","district", ["娴︿笢"], ["city","region","name"]) def rets = createCityDatas(dists) for(def r : rets){ println r } - ExcelUtils.write("d:\\数据\\浦东小区排名.xlsx", rets, "测试") + ExcelUtils.write("d:\\鏁版嵁\\娴︿笢灏忓尯鎺掑悕.xlsx", rets, "娴嬭瘯") } @@ -300,11 +300,11 @@ class ApiTest { } def jsAbcHouseCastTest(){ - def citys = ["无锡"] + def citys = ["鏃犻敗"] for(def city : citys){ def districts = CommonDatautils.findAllDistricts(city, "district", ["city","region","name","estate_type2"]) def rets = getHouseCases(districts) - ExcelUtils.write("D:\\数据\\江苏\\房源样本.xlsx", rets, city) + ExcelUtils.write("D:\\鏁版嵁\\姹熻嫃\\鎴挎簮鏍锋湰.xlsx", rets, city) } } @@ -313,7 +313,7 @@ class ApiTest { def rets = new CopyOnWriteArrayList() def totalCount = new AtomicLong() final CountDownLatch latch = new CountDownLatch(districts.size()) - rets << ["城市","区域","名称", "物业类型", "最小案例","最大案例", "案例"] + rets << ["鍩庡競","鍖哄煙","鍚嶇О", "鐗╀笟绫诲瀷", "鏈�灏忔渚�","鏈�澶ф渚�", "妗堜緥"] for(def i=0;i def type = row['E'] if(!types.contains(type)){ row['I'] = 1 } }); - println "1.类型过滤完成" + println "1.绫诲瀷杩囨护瀹屾垚" } def mathchKeywords(def filePath){ @@ -156,17 +156,17 @@ class CcbData { } def updateAddress(){ - def datas = ExcelUtils.read("D:\\数据\\建行银行\\建行信用卡数据V7(结果).xlsx", 0, 1) + def datas = ExcelUtils.read("D:\\鏁版嵁\\寤鸿閾惰\\寤鸿淇$敤鍗℃暟鎹甐7(缁撴灉).xlsx", 0, 1) for(def data : datas){ def opt = data['K'] - if(opt && opt=="已存在"){ + if(opt && opt=="宸插瓨鍦�"){ def obj = CommonDatautils.findDistrictById(data['L']) if(obj){ def fileAddress = data['B'] def addr = com.fangjia.script.util.DataUtil.formateAddress(data['C'], fileAddress) println fileAddress +" addr:"+addr +" db-address:"+ obj.address if(addr && addr != obj.address){ - if(obj.address.toString().endsWith("号") && (addr.contains("路") || addr.contains("大道"))){ + if(obj.address.toString().endsWith("鍙�") && (addr.contains("璺�") || addr.contains("澶ч亾"))){ def addr_alias = obj.addr_alias if(!addr_alias){ addr_alias = [] @@ -178,14 +178,14 @@ class CcbData { udata.put("addr_alias", addr_alias) udata.put("m_date", new Date()) // DbUtils.seaweed.update(new BasicDBObject("_id", obj._id), new BasicDBObject('$set', udata)) - println "保存地址别名 "+ addr_alias + println "淇濆瓨鍦板潃鍒悕 "+ addr_alias }else{ - if(addr.endsWith("号")){ + if(addr.endsWith("鍙�")){ def udata = new BasicDBObject() udata.put("address", addr) udata.put("m_date", new Date()) DbUtils.seaweed.update(new BasicDBObject("_id", obj._id), new BasicDBObject('$set', udata)) - println "保存地址"+ addr + println "淇濆瓨鍦板潃"+ addr } } } @@ -196,12 +196,12 @@ class CcbData { } def matchData(){ - mathchKeywords("D:\\数据\\建行银行\\建行信用卡数据(未匹配).xlsx"); + mathchKeywords("D:\\鏁版嵁\\寤鸿閾惰\\寤鸿淇$敤鍗℃暟鎹�(鏈尮閰�).xlsx"); } def matchMap(){ def index = 0 - ExcelUtils.multiThreadingModify("D:\\数据\\建行银行\\建行信用卡数据(未匹配).xlsx", { row -> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\寤鸿閾惰\\寤鸿淇$敤鍗℃暟鎹�(鏈尮閰�).xlsx", { row -> if(row['E'] && !row['G'] && !row['D']){//!row['G'] && index<10 index++ def rets = GaoDeUtils.search(row['E'], row['C'], null) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/CreateDicBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/CreateDicBatch.groovy index 1cc2dc5de..aebebe53d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/CreateDicBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/CreateDicBatch.groovy @@ -61,8 +61,8 @@ class CreateDicBatch { println index +" "+city +" region:"+regions.size()+" dist:"+districts.size()+" town:"+towns.size()+" total:"+rets.size() } - writeFile(rets, "D:\\数据\\词典\\dict.txt", "UTF-8"); - writeFile(idfRets, "D:\\数据\\词典\\fj_idf_dic.txt", "UTF-8"); + writeFile(rets, "D:\\鏁版嵁\\璇嶅吀\\dict.txt", "UTF-8"); + writeFile(idfRets, "D:\\鏁版嵁\\璇嶅吀\\fj_idf_dic.txt", "UTF-8"); } def createRegionKeys(def regions){ @@ -210,7 +210,7 @@ class CreateDicBatch { if(json){ addr = json.street } - if(addr && !addr.contains("交汇") && !addr.contains("交叉") && !addr.contains("交叉")){ + if(addr && !addr.contains("浜ゆ眹") && !addr.contains("浜ゅ弶") && !addr.contains("浜ゅ弶")){ def map = [:] map.keys = addr map.num = roadNum @@ -277,15 +277,15 @@ class CreateDicBatch { map2.num = idfCityNum idfRets << map2; - if(!s.endsWith("市")){ + if(!s.endsWith("甯�")){ def m2 = [:] - m2.keys = s+"市" + m2.keys = s+"甯�" m2.num = cityNum m2.cat = "city" rets << m2; def map3 = [:] - map3.keys = s+"市" + map3.keys = s+"甯�" map3.num = idfCityNum idfRets << map3; } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/DataProcess.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/DataProcess.groovy index 2f9eb809e..70d1c145d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/DataProcess.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/DataProcess.groovy @@ -23,14 +23,14 @@ import java.util.concurrent.Semaphore class DataProcess { static main(args) { - //建行信用卡城市(临汾--晋城).xlsx - def filePath = "D:\\数据\\小区\\地图\\兰州.xlsx" + //寤鸿淇$敤鍗″煄甯�(涓存本--鏅嬪煄).xlsx + def filePath = "D:\\鏁版嵁\\灏忓尯\\鍦板浘\\鍏板窞.xlsx" def task = new DataProcess(); // task.batchSaveDataToDB(filePath) task.mapBatchSaveDataToDB(filePath) // task.calcutePrice(filePath); // task.calcutePrice2(); -// task.deleteRepDist("株洲"); +// task.deleteRepDist("鏍床"); // task.saveOldData(filePath); @@ -59,13 +59,13 @@ class DataProcess { } } - println "最终入库【${lastDatas.size()}】条" + println "鏈�缁堝叆搴撱��${lastDatas.size()}銆戞潯" if(lastDatas){ def addIndex = 0 for(def d : lastDatas){ addIndex++ def values = saveData(d['A'], d['B'], d['E'], d['C'], d['AA'], d['AB'], d['AC'], d['AD'], d['AE'], d['AF']) - println "${addIndex}【新增入库】"+ values + println "${addIndex}銆愭柊澧炲叆搴撱��"+ values FangjiaClientUtils.sendDistrictPriceCalculate(d['A'], d['B'], d['E'], 104); } @@ -81,7 +81,7 @@ class DataProcess { index++ println index+" "+data['B'] def name = NameProcess.nameStandard(data['C'], data['D'], data['E']) - if(data['E'] && data['E'].contains("门")){ + if(data['E'] && data['E'].contains("闂�")){ data['M'] = name } if(data['H']){ @@ -99,7 +99,7 @@ class DataProcess { // def opt = data['J'] // if(opt && (opt.toInteger()==1 || opt.toInteger()==2)){ // def name = NameProcess.nameStandard(data['C'], data['D'], data['E']) -// if(data['E'] && data['E'].contains("门")){ +// if(data['E'] && data['E'].contains("闂�")){ // data['M'] = name // } // if(data['H']){ @@ -111,7 +111,7 @@ class DataProcess { // } // } // -// ExcelUtils.write("D:\\数据\\建行银行\\建行信用卡数据V9(名称标准化).xlsx", datas, "标准化") +// ExcelUtils.write("D:\\鏁版嵁\\寤鸿閾惰\\寤鸿淇$敤鍗℃暟鎹甐9(鍚嶇О鏍囧噯鍖�).xlsx", datas, "鏍囧噯鍖�") } @@ -131,23 +131,23 @@ class DataProcess { } } - println "最终入库【${lastDatas.size()}】条" + println "鏈�缁堝叆搴撱��${lastDatas.size()}銆戞潯" if(lastDatas){ def addIndex = 0 for(def d : lastDatas){ - def estateType = "普通住宅" + def estateType = "鏅�氫綇瀹�" if(d['E']){ - if(d['E'].contains("别墅")){ - estateType = "别墅" - }else if(d['E'].contains("商住")){ - estateType = "商住" + if(d['E'].contains("鍒")){ + estateType = "鍒" + }else if(d['E'].contains("鍟嗕綇")){ + estateType = "鍟嗕綇" } } - if(d['H'].contains("别墅")){ - estateType = "别墅" - }else if(d['H'].contains("商住")){ - estateType = "商住" + if(d['H'].contains("鍒")){ + estateType = "鍒" + }else if(d['H'].contains("鍟嗕綇")){ + estateType = "鍟嗕綇" } def addr = null if(d['AA']){ @@ -164,13 +164,13 @@ class DataProcess { if(!obj){ addIndex++ def values = saveData(d['A'], d['B'], d['H'], null, addr, estateType, d['F'], d['G'], null,null) - println "${addIndex}【新增入库】"+ values + println "${addIndex}銆愭柊澧炲叆搴撱��"+ values FangjiaClientUtils.sendDistrictPriceCalculate(d['A'], d['B'], d['H'], 4); }else{ - println "【已存在】 ${d['A']} ${d['B']} ${d['H']}" + println "銆愬凡瀛樺湪銆� ${d['A']} ${d['B']} ${d['H']}" } }else{ - println "区域有问题 【${d['A']}】 【${d['B']}】" + println "鍖哄煙鏈夐棶棰� 銆�${d['A']}銆� 銆�${d['B']}銆�" } } } @@ -208,19 +208,19 @@ class DataProcess { def source = data['F'] if(source){ - if(source=="高德"||source=="腾讯"){ + if(source=="楂樺痉"||source=="鑵捐"){ lng = data['G'] lat = data['H'] - }else if(source=="百度"){ + }else if(source=="鐧惧害"){ bdlng = data['G'] bdlat = data['H'] } } // if(mapType){ -// if(mapType=="腾讯"){ +// if(mapType=="鑵捐"){ // -// }else if(mapType == "百度"){ +// }else if(mapType == "鐧惧害"){ // //detailMap = findMapDetailByBaidu(mapId) // } // }else{ @@ -235,12 +235,12 @@ class DataProcess { // } // def gaodeType = data['N'] - def estateType = "普通住宅" + def estateType = "鏅�氫綇瀹�" if(mapType){ - if(mapType.contains("别墅")){ - estateType = "别墅" - }else if(mapType.contains("商住")){ - estateType = "商住" + if(mapType.contains("鍒")){ + estateType = "鍒" + }else if(mapType.contains("鍟嗕綇")){ + estateType = "鍟嗕綇" } } @@ -248,7 +248,7 @@ class DataProcess { if(isRegion){ // name = NameProcess.nameStandard(city,region, name) // if(!name || (name && name.size()<3)){ -// data['K']="名称过滤" +// data['K']="鍚嶇О杩囨护" // continue // } // name = name.replace("-","") @@ -262,26 +262,26 @@ class DataProcess { // words << key // addIndex++ // def values = saveData(city, region, name, null, address, estateType, lng, lat, bdlng,bdlat) -// data['O']="已保存" +// data['O']="宸蹭繚瀛�" // data['P']=values._id.toString() - println "${addIndex}【新增入库】${data['O']} "//+ values + println "${addIndex}銆愭柊澧炲叆搴撱��${data['O']} "//+ values // FangjiaClientUtils.sendDistrictPriceCalculate(d['A'], d['B'], d['H'], 4); // } }else{ - data['O']="已存在" + data['O']="宸插瓨鍦�" data['P']=obj._id.toString() - println "【已存在】 ${city} ${region} ${name}" + println "銆愬凡瀛樺湪銆� ${city} ${region} ${name}" FangjiaClientUtils.sendDistrictPriceCalculate(obj.city, obj.region, obj.name, 4) } }else{ - data['O']="区域有问题" - println "区域有问题 【${city}】 【${region}】" + data['O']="鍖哄煙鏈夐棶棰�" + println "鍖哄煙鏈夐棶棰� 銆�${city}銆� 銆�${region}銆�" } } } - ExcelUtils.write("D:\\数据\\建行银行\\建行信用卡数据V91(名称标准化-入库).xlsx", datas, "入库后") + ExcelUtils.write("D:\\鏁版嵁\\寤鸿閾惰\\寤鸿淇$敤鍗℃暟鎹甐91(鍚嶇О鏍囧噯鍖�-鍏ュ簱).xlsx", datas, "鍏ュ簱鍚�") } @@ -290,7 +290,7 @@ class DataProcess { def index = 0 if(datas){ for(def data : datas){ - if(data['O'] && data['O']=="已保存"){ + if(data['O'] && data['O']=="宸蹭繚瀛�"){ index++ println index +" "+ data['C']+" "+data['D']+" "+data['M'] FangjiaClientUtils.sendDistrictPriceCalculate(data['C'], data['D'], data['M'], 1); @@ -373,7 +373,7 @@ class DataProcess { d.put("c_date", new Date()) d.put("m_date", new Date()) def markMap = [:] - markMap.put("data_source", "机器入库") + markMap.put("data_source", "鏈哄櫒鍏ュ簱") d.put("mark_map",markMap) if(gdlng){ @@ -401,9 +401,9 @@ class DataProcess { } def getEstateType(def name){ - def estateType = "普通住宅" - if(name.contains("别墅") || name.contains("洋房")){ - estateType = "别墅" + def estateType = "鏅�氫綇瀹�" + if(name.contains("鍒") || name.contains("娲嬫埧")){ + estateType = "鍒" } return estateType } @@ -411,7 +411,7 @@ class DataProcess { def deleteRepDist(def city){ def q = new BasicDBObject() q.put("city",city) - q.put("region","渌口区") + q.put("region","娓屽彛鍖�") q.put("cat", "district") q.put("status", 0) def dbcursor = DbUtils.seaweed.find(q) @@ -421,7 +421,7 @@ class DataProcess { // if(!keys.contains(key)){ // keys << key // }else{ - println "删除:"+key + println "鍒犻櫎锛�"+key def d = new BasicDBObject() d.put("_id", dbo._id) @@ -559,7 +559,7 @@ class DataProcess { } def updateDBAddress(){ - def citys = ["厦门"]//CommonUtils.findAllCity() + def citys = ["鍘﹂棬"]//CommonUtils.findAllCity() for(def city : citys){ def rets = CommonDatautils.findDistrictByCdate(city, "district","2020-09-24"); if(rets){ @@ -571,10 +571,10 @@ class DataProcess { def updateRegion(){ def citys = CommonUtils.findAllCity() - citys.remove("上海") - citys.remove("北京") - citys.remove("广州") - citys.remove("深圳") + citys.remove("涓婃捣") + citys.remove("鍖椾含") + citys.remove("骞垮窞") + citys.remove("娣卞湷") DistrictRegionTransfer transfer = new DistrictRegionTransfer() def index = 0 for(def city : citys){ @@ -588,7 +588,7 @@ class DataProcess { transfer.transfer(dist, dist.city, region) } }else{ - println dist.city +" "+region +" 标准化有问题" + println dist.city +" "+region +" 鏍囧噯鍖栨湁闂" } } println index+" "+ city @@ -613,7 +613,7 @@ class DataProcess { } def updateDBName(){ - def filePath = "D:\\数据\\建行银行\\建行信用卡数据V9(名称标准化-入库).xlsx" + def filePath = "D:\\鏁版嵁\\寤鸿閾惰\\寤鸿淇$敤鍗℃暟鎹甐9(鍚嶇О鏍囧噯鍖�-鍏ュ簱).xlsx" ExcelUtils.multiThreadingModify(filePath, { row -> if(row['P']){ def obj = CommonDatautils.findDistrictById(row['P']) @@ -626,7 +626,7 @@ class DataProcess { } def updateEstatetype(){ - def filePath = "D:\\数据\\建行银行\\建行信用卡数据V9(名称标准化-入库).xlsx" + def filePath = "D:\\鏁版嵁\\寤鸿閾惰\\寤鸿淇$敤鍗℃暟鎹甐9(鍚嶇О鏍囧噯鍖�-鍏ュ簱).xlsx" ExcelUtils.multiThreadingModify(filePath, { row -> if(row['C'] && row['D'] && row['E']){ def obj = CommonDatautils.findDistrict(row['C'], row['D'], row['E'], "district") 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 8507f7d00..64fd6de38 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 @@ -30,7 +30,7 @@ import java.util.concurrent.atomic.AtomicLong import java.util.regex.Pattern /** - * 小区字段填充入库(自动入库) + * 灏忓尯瀛楁濉厖鍏ュ簱锛堣嚜鍔ㄥ叆搴擄級 */ @BatchOwner(Watcher.GaoJuan) class DistrictFieldAddBatch extends BaseBatch{ @@ -38,30 +38,30 @@ class DistrictFieldAddBatch extends BaseBatch{ public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(10) static Jms jms = Jms.create('tcp://jms.db.fangjia.com:61616'); DBCollection SEAWEEDMAP_COLL = MongoUtils.getCollectionByName("fangjia", "seaweedmap", "192.168.0.235", 27018) - //"安居客":"安居客小程序","链家":"链家","幸福里":"幸福里","城市房产":"城市房产小程序","搜房":"搜房" + //"瀹夊眳瀹�":"瀹夊眳瀹㈠皬绋嬪簭","閾惧":"閾惧","骞哥閲�":"骞哥閲�","鍩庡競鎴夸骇":"鍩庡競鎴夸骇灏忕▼搴�","鎼滄埧":"鎼滄埧" // - def sourceMap = ["贝壳找房":"贝壳找房","链家":"链家","贝壳找房-新房":"贝壳找房-新房","安居客":"安居客","幸福里":"幸福里","安居客小程序":"安居客小程序","城市房产":"城市房产小程序","安居客移动端":"安居客移动端","安居客-新房":"安居客-新房","楼盘网-新房":"楼盘网-新房","禧泰":"中国房价行情", "城市房产":"城市房产","搜房":"搜房","我爱我家":"我爱我家","诸葛找房":"诸葛找房", - "乐有家":"乐有家","吉屋":"吉屋","C21":"C21","365淘房":"365淘房"] //key:穆融合表的来源 valve:es解析表的来源 + def sourceMap = ["璐濆3鎵炬埧":"璐濆3鎵炬埧","閾惧":"閾惧","璐濆3鎵炬埧-鏂版埧":"璐濆3鎵炬埧-鏂版埧","瀹夊眳瀹�":"瀹夊眳瀹�","骞哥閲�":"骞哥閲�","瀹夊眳瀹㈠皬绋嬪簭":"瀹夊眳瀹㈠皬绋嬪簭","鍩庡競鎴夸骇":"鍩庡競鎴夸骇灏忕▼搴�","瀹夊眳瀹㈢Щ鍔ㄧ":"瀹夊眳瀹㈢Щ鍔ㄧ","瀹夊眳瀹�-鏂版埧":"瀹夊眳瀹�-鏂版埧","妤肩洏缃�-鏂版埧":"妤肩洏缃�-鏂版埧","绂ф嘲":"涓浗鎴夸环琛屾儏", "鍩庡競鎴夸骇":"鍩庡競鎴夸骇","鎼滄埧":"鎼滄埧","鎴戠埍鎴戝":"鎴戠埍鎴戝","璇歌憶鎵炬埧":"璇歌憶鎵炬埧", + "涔愭湁瀹�":"涔愭湁瀹�","鍚夊眿":"鍚夊眿","C21":"C21","365娣樻埧":"365娣樻埧"] //key:绌嗚瀺鍚堣〃鐨勬潵婧� valve:es瑙f瀽琛ㄧ殑鏉ユ簮 //"alias":"alias", - //ownership_type:权属类型 为商品房、经适房、动迁房等 - //house_property 产权性质:国有产权 "house_property":"网站没有", + //ownership_type:鏉冨睘绫诲瀷 涓哄晢鍝佹埧銆佺粡閫傛埧銆佸姩杩佹埧绛� + //house_property 浜ф潈鎬ц川锛氬浗鏈変骇鏉� "house_property":"缃戠珯娌℃湁", def fieldsMap = ["lng":"location","estate_charge":"property_fee","block":"block","build_date":"build_year","estate_company":"property_company","developer":"developer", "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","loudong_count":"loudong_cnt"]//key:seaweed表字段 value:es表字段 + "loop_line_info":"loop_line","loudong_count":"loudong_cnt"]//key:seaweed琛ㄥ瓧娈� value:es琛ㄥ瓧娈� // def fieldsMap = ["household_count":"households"] - def fieldsNameMap = ["estate_charge":"物业费","block":"板块","build_date":"建筑年代","estate_company":"物业公司","developer":"开发商", - "virescence_percent":"绿化率","cubage_percent":"容积率","build_area":"建筑面积","all_area":"占地面积","household_count":"户型", - "car_site_count":"车位","car_site":"车位描述","property_life":"产权年限","address":"地址","build_structure":"建筑结构", - "build_type":"建筑类型", "land_property":"权属类别","live_date":"入住时间","loop_line_info":"环线"] + def fieldsNameMap = ["estate_charge":"鐗╀笟璐�","block":"鏉垮潡","build_date":"寤虹瓚骞翠唬","estate_company":"鐗╀笟鍏徃","developer":"寮�鍙戝晢", + "virescence_percent":"缁垮寲鐜�","cubage_percent":"瀹圭Н鐜�","build_area":"寤虹瓚闈㈢Н","all_area":"鍗犲湴闈㈢Н","household_count":"鎴峰瀷", + "car_site_count":"杞︿綅","car_site":"杞︿綅鎻忚堪","property_life":"浜ф潈骞撮檺","address":"鍦板潃","build_structure":"寤虹瓚缁撴瀯", + "build_type":"寤虹瓚绫诲瀷", "land_property":"鏉冨睘绫诲埆","live_date":"鍏ヤ綇鏃堕棿","loop_line_info":"鐜嚎"] final DBCollection thirdSeaweedMappingColl = MongoUtils.getCollectionByName("fangjia_craw", "third_seaweed_mapping", "192.168.0.235", 27018) @@ -71,24 +71,24 @@ class DistrictFieldAddBatch extends BaseBatch{ static main(args) { runBatch(new DistrictFieldAddBatch(), args) -// ExcelUtils.multiThreadingModify("D:\\数据\\小区\\上海别墅.xlsx",{d-> +// ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\灏忓尯\\涓婃捣鍒.xlsx",{d-> // def dist = CommonDatautils.findDistrict(d['B'], d['G'], d['C'], "district") //// if(dist){ //// d['L'] = dist.loudong_count //// d['M'] = dist.household_count //// d['Q'] = dist.estate_type2 //// } -// def list = findEsDatasByCityAndName(d['B'], d['G'], d['C'], "搜房") +// def list = findEsDatasByCityAndName(d['B'], d['G'], d['C'], "鎼滄埧") // if(!list && dist){ // def alias = dist.alias // for(def name : alias){ -// list = findEsDatasByCityAndName(d['B'], d['G'], name, "搜房") +// list = findEsDatasByCityAndName(d['B'], d['G'], name, "鎼滄埧") // if(list){ -// d['Z'] = "别名" +// d['Z'] = "鍒悕" // } // } // }else{ -// d['Z'] = "名称" +// d['Z'] = "鍚嶇О" // } // if(list){ // def obj = list[0] @@ -113,7 +113,7 @@ class DistrictFieldAddBatch extends BaseBatch{ def rh_analysRets = [] def fields = fieldsMap.keySet() as List - def headers = ["来源", "城市"] + def headers = ["鏉ユ簮", "鍩庡競"] fields.each{it-> headers << fieldsNameMap.get(it) } @@ -122,14 +122,14 @@ class DistrictFieldAddBatch extends BaseBatch{ def totalCount = CommonDatautils.findAllDistrictCount("district", c) if(totalCount){ -// rh_analysRets = addFieldFromRonghe(c, totalCount, rh_analysRets)//融合 -// analysRets = addFieldFromMatch(c, totalCount, analysRets)//匹配 - analysRets = addFieldFromMatchMapping(c, totalCount, analysRets)//新旧匹配中间表 +// rh_analysRets = addFieldFromRonghe(c, totalCount, rh_analysRets)//铻嶅悎 +// analysRets = addFieldFromMatch(c, totalCount, analysRets)//鍖归厤 + analysRets = addFieldFromMatchMapping(c, totalCount, analysRets)//鏂版棫鍖归厤涓棿琛� } } println analysRets.toString() // sendStatEmail(headers, analysRets, rh_analysRets) -// ExcelUtils.write("D:\\数据\\小区\\覆盖率.xlsx", analysRets, "数据") +// ExcelUtils.write("D:\\鏁版嵁\\灏忓尯\\瑕嗙洊鐜�.xlsx", analysRets, "鏁版嵁") } def addFieldFromMatch(c, totalCount, analysRets){ @@ -141,10 +141,10 @@ class DistrictFieldAddBatch extends BaseBatch{ def matchRets1 = matchApi(esRets) def matchRets2 = selectRestByCredit(matchRets1) - println esWebSource +" 抓取量:"+esRets.size()+" 匹配量:"+matchRets1.size()+" 0.9分以上量:"+matchRets2.size() + println esWebSource +" 鎶撳彇閲忥細"+esRets.size()+" 鍖归厤閲忥細"+matchRets1.size()+" 0.9鍒嗕互涓婇噺锛�"+matchRets2.size() def updateRets = processFieldsFromMatch(c , matchRets2, esWebSource) - println "【通过匹配填充字段】网站:"+seaweedmapSource +" Es:"+esRets.size()+" 融合小区占比:"+DataHandleUtils.getDoubleRound(2, matchRets2.size()*100/totalCount)+"%" + println "銆愰�氳繃鍖归厤濉厖瀛楁銆戠綉绔欙細"+seaweedmapSource +" Es:"+esRets.size()+" 铻嶅悎灏忓尯鍗犳瘮锛�"+DataHandleUtils.getDoubleRound(2, matchRets2.size()*100/totalCount)+"%" def precentMap = fieldUpdate(totalCount, updateRets) println c +" "+precentMap.toString() updateDB(c, updateRets) @@ -177,7 +177,7 @@ class DistrictFieldAddBatch extends BaseBatch{ sourceMap.each { seaweedmapSource, esWebSource -> def esRets = findMatchSameDatas(c, esWebSource) - println esWebSource +" 新老算法匹配相同量:"+esRets.size() + println esWebSource +" 鏂拌�佺畻娉曞尮閰嶇浉鍚岄噺锛�"+esRets.size() def updateRets = processFieldsFromMatch(c , esRets, esWebSource) @@ -240,7 +240,7 @@ class DistrictFieldAddBatch extends BaseBatch{ def esRets = findEsDistrict(c, esWebSource) def updateRets = processFieldsFromRh(c, rhRets, esRets) - println "【通过融合关系填充字段】网站:"+seaweedmapSource +" 第三方融合表:"+rhRets.size() +" Es:"+esRets.size()+" 融合小区占比:"+DataHandleUtils.getDoubleRound(2, rhRets.size()*100/totalCount)+"%" + println "銆愰�氳繃铻嶅悎鍏崇郴濉厖瀛楁銆戠綉绔欙細"+seaweedmapSource +" 绗笁鏂硅瀺鍚堣〃锛�"+rhRets.size() +" Es:"+esRets.size()+" 铻嶅悎灏忓尯鍗犳瘮锛�"+DataHandleUtils.getDoubleRound(2, rhRets.size()*100/totalCount)+"%" def precentMap = fieldUpdate(totalCount, updateRets) println c +" "+precentMap.toString() updateDB(c, updateRets) @@ -276,12 +276,12 @@ class DistrictFieldAddBatch extends BaseBatch{ } def dist = CommonDatautils.findDistrictFieldById(rhDist.commid, fields) if(!dist){ - println c+" "+rhDist.commid+" 不存在" + println c+" "+rhDist.commid+" 涓嶅瓨鍦�" continue } def esDbo = esRets.get(c + "#" + rhDist.id) if(!esDbo){ - println c+" "+rhDist.id+" 不存在[ES]" + println c+" "+rhDist.id+" 涓嶅瓨鍦╗ES]" continue } def newValues = strandField(c, dist, esDbo) @@ -301,12 +301,12 @@ class DistrictFieldAddBatch extends BaseBatch{ fields << "estate_type2" def fieldValueMap = [:] for(def matchDist : matchRets){ -// if(!["智富中心","龙山新寓","天怡瀚园","远盛凤林府","京口路小区","梦溪路小区","浩创优尚","溪山丽苑","旭园"].contains(matchDist.name)){ +// if(!["鏅哄瘜涓績","榫欏北鏂板瘬","澶╂�$�氬洯","杩滅洓鍑ゆ灄搴�","浜彛璺皬鍖�","姊︽邯璺皬鍖�","娴╁垱浼樺皻","婧北涓借嫅","鏃洯"].contains(matchDist.name)){ // continue // } def dist = CommonDatautils.findDistrictFieldById(matchDist.match_id, fields) if(!dist){ - println c+" "+matchDist.match_id+" 不存在" + println c+" "+matchDist.match_id+" 涓嶅瓨鍦�" continue } def newValues = strandField(c, dist, matchDist) @@ -316,7 +316,7 @@ class DistrictFieldAddBatch extends BaseBatch{ } } -// ExcelUtils.write("D:\\数据\\小区\\${c}户数.xlsx",rets,esWebSource) +// ExcelUtils.write("D:\\鏁版嵁\\灏忓尯\\${c}鎴锋暟.xlsx",rets,esWebSource) return fieldValueMap; } @@ -533,21 +533,21 @@ class DistrictFieldAddBatch extends BaseBatch{ def matching(data){ def name = data.name - if(data.name && data.name.contains("·")){ - name = data.name.replace("·", "") + if(data.name && data.name.contains("路")){ + name = data.name.replace("路", "") } - def flag = "名称匹配" + def flag = "鍚嶇О鍖归厤" def dist = matchDist(data.city, data.region, name) if(!dist){ dist = CommonDatautils.findSeaweedByMappingAlias(data.city, data.region, name,"district") - flag = "映射别名匹配" + flag = "鏄犲皠鍒悕鍖归厤" } if(!dist) { def rets = CommonDatautils.findDistrictByAlias(data.city, data.region, name, "district") if(rets && rets.size()==1){ - flag = "别名匹配" + flag = "鍒悕鍖归厤" dist = rets[0] } } @@ -564,10 +564,10 @@ class DistrictFieldAddBatch extends BaseBatch{ if(data.address && isStandardRoad(data.address)){ jsonObject = OpenApiClient.addressMatch(data.city, data.address, "property", false,data.region, name) }else{ - data.flag = "匹配接口-地址" + data.flag = "鍖归厤鎺ュ彛-鍦板潃" } }else{ - data.flag = "匹配接口-名称" + data.flag = "鍖归厤鎺ュ彛-鍚嶇О" } if(jsonObject != null && jsonObject.precise!=-1) { data.match_id = jsonObject.get("id") @@ -585,21 +585,21 @@ class DistrictFieldAddBatch extends BaseBatch{ def newMatching(data){ def name = data.name - if(data.name && data.name.contains("·")){ - name = data.name.replace("·", "") + if(data.name && data.name.contains("路")){ + name = data.name.replace("路", "") } - def flag = "名称匹配" + def flag = "鍚嶇О鍖归厤" def dist = matchDist(data.city, data.region, name) if(!dist){ dist = CommonDatautils.findSeaweedByMappingAlias(data.city, data.region, name,"district") - flag = "映射别名匹配" + flag = "鏄犲皠鍒悕鍖归厤" } if(!dist) { def rets = CommonDatautils.findDistrictByAlias(data.city, data.region, name, "district") if(rets && rets.size()==1){ - flag = "别名匹配" + flag = "鍒悕鍖归厤" dist = rets[0] } } @@ -616,10 +616,10 @@ class DistrictFieldAddBatch extends BaseBatch{ if(data.address && isStandardRoad(data.address)){ jsonObject = FangjiaClientUtils.newMatch(data.city, data.address, "property", false) }else{ - data.flag = "匹配接口-地址" + data.flag = "鍖归厤鎺ュ彛-鍦板潃" } }else{ - data.flag = "匹配接口-名称" + data.flag = "鍖归厤鎺ュ彛-鍚嶇О" } if(jsonObject != null && jsonObject.credit>0) { data.match_id = jsonObject.get("id") @@ -658,7 +658,7 @@ class DistrictFieldAddBatch extends BaseBatch{ def isStandardRoad(def s){ - def pattern = Pattern.compile("[路|街|大道|巷]\\d+(号|弄)"); + def pattern = Pattern.compile("[璺瘄琛梶澶ч亾|宸穄\\d+(鍙穦寮�)"); def matcher = pattern.matcher(s) if(matcher.find()){ return true; @@ -672,10 +672,10 @@ class DistrictFieldAddBatch extends BaseBatch{ StringBuffer sb = new StringBuffer(); if(analysRets){ sb.append("
    房价通uri数量1-2s数量2-3s数量3-5s数量5s以上数量鎴夸环閫歶ri鏁伴噺1-2s鏁伴噺2-3s鏁伴噺3-5s鏁伴噺5s浠ヤ笂鏁伴噺
    ") - sb.append("字段补充情况分析") + sb.append("瀛楁琛ュ厖鎯呭喌鍒嗘瀽") sb.append("") headers.each{it-> - if(it=="来源" || it=="城市"){ + if(it=="鏉ユ簮" || it=="鍩庡競"){ sb.append("") }else{ sb.append("") @@ -697,10 +697,10 @@ class DistrictFieldAddBatch extends BaseBatch{ StringBuffer rh_sb = new StringBuffer(); if(rh_nalysRets){ rh_sb.append("
    "+ it+""+ it+"
    ") - rh_sb.append("字段补充情况分析") + rh_sb.append("瀛楁琛ュ厖鎯呭喌鍒嗘瀽") rh_sb.append("") headers.each{it-> - if(it=="来源" || it=="城市"){ + if(it=="鏉ユ簮" || it=="鍩庡競"){ rh_sb.append("") }else{ rh_sb.append("") @@ -719,7 +719,7 @@ class DistrictFieldAddBatch extends BaseBatch{ } for (def email : EMAILS) { - jms.sendMail(email, "字段填充情况分析", sb.toString()+rh_sb.toString()); + jms.sendMail(email, "瀛楁濉厖鎯呭喌鍒嗘瀽", sb.toString()+rh_sb.toString()); } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/DistrictFiledStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/DistrictFiledStat.groovy index e3d7eb51c..4b860705a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/DistrictFiledStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/DistrictFiledStat.groovy @@ -9,11 +9,11 @@ import com.mongodb.BasicDBObject import com.mongodb.DBCollection /** - * 字段提升率统计 + * 瀛楁鎻愬崌鐜囩粺璁� */ DBCollection CITY_INFO_CONN = MongoUtils.getCollectionByName("fangjia_data_ana", "city_info", MongoUtils.MongoDB_Domain_mongo); -def fieldsMap = ["district_count":"小区数量","name":"名称" ,"region":"区域" ,"block":"板块" ,"address":"地址" ,"estateType2":"物业类型" ,"householdCount":"户数" ,"openDate":"开盘时间" ,"liveDate":"入住时间" ,"buildDate":"建筑年代" ,"allArea":"占地面积" ,"buildArea":"建筑面积" ,"buildType":"建筑类型" ,"developer":"开发商" ,"estateCompany":"物业公司" ,"cubagePercent":"容积率" ,"virescencePercent":"绿化率" ,"carSite":"停车位" ,"estateCharge":"物业费" ,"floorplanPics":"户型图" ,"outPics":"外景图" ,"finishBuildingDate":"竣工时间" ,"businessQuarter":"商圈" ,"startBuildingDate":"开建时间" ,"loopLineInfo":"环线" ,"propertyLife":"产权年限" ,"houseProperty":"产权性质" ,"licence":"预售许可证" ,"buildStructure":"建筑结构" ,"lat":"百度纬度" ,"pics":"图片" ,"streetCommunity":"街道" ,"schools":"学校" ,"houseStructure":"房屋结构" ,"alias":"别名" ,"addrAlias":"地址别名" ,"mainTypeArea":"主力面积" ,"loudongCount":"楼栋数" ,"latLng" :"高德经度" ,"rentPrice":"租金" ] +def fieldsMap = ["district_count":"灏忓尯鏁伴噺","name":"鍚嶇О" ,"region":"鍖哄煙" ,"block":"鏉垮潡" ,"address":"鍦板潃" ,"estateType2":"鐗╀笟绫诲瀷" ,"householdCount":"鎴锋暟" ,"openDate":"寮�鐩樻椂闂�" ,"liveDate":"鍏ヤ綇鏃堕棿" ,"buildDate":"寤虹瓚骞翠唬" ,"allArea":"鍗犲湴闈㈢Н" ,"buildArea":"寤虹瓚闈㈢Н" ,"buildType":"寤虹瓚绫诲瀷" ,"developer":"寮�鍙戝晢" ,"estateCompany":"鐗╀笟鍏徃" ,"cubagePercent":"瀹圭Н鐜�" ,"virescencePercent":"缁垮寲鐜�" ,"carSite":"鍋滆溅浣�" ,"estateCharge":"鐗╀笟璐�" ,"floorplanPics":"鎴峰瀷鍥�" ,"outPics":"澶栨櫙鍥�" ,"finishBuildingDate":"绔e伐鏃堕棿" ,"businessQuarter":"鍟嗗湀" ,"startBuildingDate":"寮�寤烘椂闂�" ,"loopLineInfo":"鐜嚎" ,"propertyLife":"浜ф潈骞撮檺" ,"houseProperty":"浜ф潈鎬ц川" ,"licence":"棰勫敭璁稿彲璇�" ,"buildStructure":"寤虹瓚缁撴瀯" ,"lat":"鐧惧害绾害" ,"pics":"鍥剧墖" ,"streetCommunity":"琛楅亾" ,"schools":"瀛︽牎" ,"houseStructure":"鎴垮眿缁撴瀯" ,"alias":"鍒悕" ,"addrAlias":"鍦板潃鍒悕" ,"mainTypeArea":"涓诲姏闈㈢Н" ,"loudongCount":"妤兼爧鏁�" ,"latLng" :"楂樺痉缁忓害" ,"rentPrice":"绉熼噾" ] def weeknd = DateUtils.getFirstDayOfWeek(new Date()) def lastWeeknd = DateUtils.getFirstDayOfWeek(new Date()-7) @@ -29,7 +29,7 @@ def citys = CommonDatautils.findAllCity() def fields = fieldsMap.keySet() as List def rets = [] def headers = [] -headers << "城市" +headers << "鍩庡競" fields.each{k-> headers << fieldsMap.get(k) } @@ -55,7 +55,7 @@ for(def c : citys){ rets << ret } -ExcelUtils.write("D:\\数据\\小区\\字段提升率"+DateUtils.formatDateByPattern(weeknd,"yyyy-MM-dd")+".xlsx", rets, "字段提升率统计") +ExcelUtils.write("D:\\鏁版嵁\\灏忓尯\\瀛楁鎻愬崌鐜�"+DateUtils.formatDateByPattern(weeknd,"yyyy-MM-dd")+".xlsx", rets, "瀛楁鎻愬崌鐜囩粺璁�") diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/DistrictLocationGeo.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/DistrictLocationGeo.groovy index 9a76b82a5..21c5f2a08 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/DistrictLocationGeo.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/DistrictLocationGeo.groovy @@ -16,14 +16,14 @@ class DistrictLocationGeo { final DBCollection JD_review_GEO_COLL = MongoUtils.getCollectionByName("business", "jingdong_update_location_geo", "192.168.0.206",27020) static main(args) { def task = new DistrictLocationGeo() -// task.run()//通过经纬度,调用高德逆解析,并保存数据 +// task.run()//閫氳繃缁忕含搴︼紝璋冪敤楂樺痉閫嗚В鏋愶紝骞朵繚瀛樻暟鎹� // def distance = GeoUtils.calculateDistance(130.573501, 45.752712, 130.573527,45.753287); // println distance task.run1() } def run(){ - ExcelUtils.multiThreadingModify("D:\\数据\\京东\\房价网重复小区数据5-1217【机密】(1).xlsx",{ d-> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\浜笢\\鎴夸环缃戦噸澶嶅皬鍖烘暟鎹�5-1217銆愭満瀵嗐��(1).xlsx",{ d-> if(d['A']){ // def dbo = JD_SEAWEED_COLL.findOne(new BasicDBObject("_id", new ObjectId(d['A']))) def obj = CommonDatautils.findDistrictById(d['A']) @@ -32,7 +32,7 @@ class DistrictLocationGeo { def lng = obj.lng/10000000000.0; def jsonObject = GaoDeApiUtils.geocode(lng+","+lat) if(jsonObject){ - d["F"] = "高德" + d["F"] = "楂樺痉" def dbo = new BasicDBObject() dbo.put("city", obj.city) dbo.put("district", obj.region) @@ -58,7 +58,7 @@ class DistrictLocationGeo { def run1(){ - ExcelUtils.modify("D:\\数据\\京东\\经纬度更新5.3万.xlsx",{ d-> + ExcelUtils.modify("D:\\鏁版嵁\\浜笢\\缁忕含搴︽洿鏂�5.3涓�.xlsx",{ d-> if(d['A']){ def lng = d['B']; def lat = d['C']; @@ -66,7 +66,7 @@ class DistrictLocationGeo { if(jsonObject){ def obj = CommonDatautils.findDistrictById(d['A']) - d["F"] = "高德" + d["F"] = "楂樺痉" def dbo = new BasicDBObject() dbo.put("city", obj.city) dbo.put("district", obj.region) @@ -165,7 +165,7 @@ class DistrictLocationGeo { return null default: - // 检查是否是包含JSONNull的字符串表示 + // 妫�鏌ユ槸鍚︽槸鍖呭惈JSONNull鐨勫瓧绗︿覆琛ㄧず if (value instanceof String && value.contains("JSONNull")) { return null } @@ -180,7 +180,7 @@ class DistrictLocationGeo { } def run2(){ - ExcelUtils.modify("D:\\数据\\昆仑\\263未出居委数据.xlsx",{ d-> + ExcelUtils.modify("D:\\鏁版嵁\\鏄嗕粦\\263鏈嚭灞呭鏁版嵁.xlsx",{ d-> def jsonObject = GaoDeApiUtils.geocodeByAddress(d['C'], d['B']) Thread.sleep(1000) def count = 0 diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/DistrictProcess.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/DistrictProcess.groovy index 9ec21a2eb..cf04ad227 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/DistrictProcess.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/DistrictProcess.groovy @@ -12,7 +12,7 @@ class DistrictProcess { static main(args) { def task = new DistrictProcess(); // task.run() - def name = "锦星花园19" + def name = "閿︽槦鑺卞洯19" def number = DataUtil.match(name, Pattern.compile("\\w{3}\$")) if(!number){ number = DataUtil.match(name, Pattern.compile("\\w{1,2}\$")) @@ -21,20 +21,20 @@ class DistrictProcess { } def run(){ -// def filePath = "D:\\数据\\小区\\苏州.xlsx" +// def filePath = "D:\\鏁版嵁\\灏忓尯\\鑻忓窞.xlsx" // for(def city : citys){ - def filePath = "D:\\数据\\小区\\苏州.xlsx" -// //名称过滤 + def filePath = "D:\\鏁版嵁\\灏忓尯\\鑻忓窞.xlsx" +// //鍚嶇О杩囨护 // dataFilter(filePath) -// //名称格式化 +// //鍚嶇О鏍煎紡鍖� // nameStandard(filePath); -// //小区匹配 +// //灏忓尯鍖归厤 // matchDistDatas(filePath) -// //地图匹配 +// //鍦板浘鍖归厤 // mapMatch(filePath); -// //统计房源量 +// //缁熻鎴挎簮閲� // houseCalculate(filePath); -// //统计是否存在多个区域 +// //缁熻鏄惁瀛樺湪澶氫釜鍖哄煙 // moreRegionCalculate(filePath) // // addFlag(filePath) @@ -55,7 +55,7 @@ class DistrictProcess { } } }); - println "1.名称过滤完成" + println "1.鍚嶇О杩囨护瀹屾垚" } def nameStandard(filePath){ @@ -67,7 +67,7 @@ class DistrictProcess { } }, 0); - println "2.名称标准化完成" + println "2.鍚嶇О鏍囧噯鍖栧畬鎴�" } def matchDistDatas(def path){ @@ -85,7 +85,7 @@ class DistrictProcess { println index +" "+row } },0) - println "3.小区匹配完成" + println "3.灏忓尯鍖归厤瀹屾垚" } def mapMatch(def filePath){ @@ -94,12 +94,12 @@ class DistrictProcess { index ++ def city = row['A'] def region = row['B'] - def name = row['E']//格式化名称 + def name = row['E']//鏍煎紡鍖栧悕绉� def addr = row['D'] def flag = row['F'] def gdValue = row['H'] if(!gdValue && !flag){ - def gdData = FangjiaClientUtils.getMapData(city, region, name, addr,"", "高德") + def gdData = FangjiaClientUtils.getMapData(city, region, name, addr,"", "楂樺痉") if(gdData){ row['G'] = gdData.district row['H'] = gdData.name @@ -112,7 +112,7 @@ class DistrictProcess { } if(!flag){ - def bdData = FangjiaClientUtils.getMapData(city, region, name, addr,"", "百度") + def bdData = FangjiaClientUtils.getMapData(city, region, name, addr,"", "鐧惧害") if(bdData){ row['N'] = bdData.district row['O'] = bdData.name @@ -126,7 +126,7 @@ class DistrictProcess { println index +" "+row },0); - println "4.地图匹配完成" + println "4.鍦板浘鍖归厤瀹屾垚" } def houseCalculate(filePath){ @@ -141,7 +141,7 @@ class DistrictProcess { def moreRegionCalculate(filePath){ ExcelUtils.multiThreadingModify(filePath, { row -> - if(row['E'] == "金洲花城别墅"){ + if(row['E'] == "閲戞床鑺卞煄鍒"){ println "sss" } @@ -169,7 +169,7 @@ class DistrictProcess { }else if(regions.contains(row['B'])){ - row['Z'] = "已存在" + row['Z'] = "宸插瓨鍦�" row['F'] = 1 } } @@ -181,18 +181,18 @@ class DistrictProcess { ExcelUtils.multiThreadingModify(filePath, { row -> index++ if(!row['F']) { - //根据别名查找 + //鏍规嵁鍒悕鏌ユ壘 - //有匹配的结果根据名称进行过滤 + //鏈夊尮閰嶇殑缁撴灉鏍规嵁鍚嶇О杩涜杩囨护 if(row['W']) { row['F'] = FlagProcess.addDataFlagByMatch(row['A'], row['B'], row['E'], row['V'], row['W']) } - if(row['E'] =="朗诗蔚蓝广场"){ + if(row['E'] =="鏈楄瘲钄氳摑骞垮満"){ println row } - //匹配的结果根据地址进行过滤 + //鍖归厤鐨勭粨鏋滄牴鎹湴鍧�杩涜杩囨护 if(row['W'] && !row['F']) { row['F'] = FlagProcess.addDataFlagByMatch(row['A'],row['B'], row['E'], row['V'], row['X']) } @@ -202,13 +202,13 @@ class DistrictProcess { row = setMapValue(row, rMap); } - //无匹配结果,没有标记, 并且不存在其它区域 + //鏃犲尮閰嶇粨鏋滐紝娌℃湁鏍囪锛� 骞朵笖涓嶅瓨鍦ㄥ叾瀹冨尯鍩� if(!row['W'] && !row['F'] && !row['Z']){ def rMap = FlagProcess.addDataFlagByType(row['A'],row['B'], row['E'],row['D'], row['G'], row['H'], row['I'], row['J'], row['N'], row['O'], row['P'],row['Q'], row['Y'], row['L'], row['M'], row['S'], row['T']) row = setMapValue(row, rMap); } - //根据地图类型过滤 + //鏍规嵁鍦板浘绫诲瀷杩囨护 // if(!row['F']){ // row['F'] = FlagProcess.addDataFlagByType(row['B'], row['E'], row['G'], row['H'], row['J'], row['N'], row['O'], row['Q']) // } @@ -233,7 +233,7 @@ class DistrictProcess { def index = 0 ExcelUtils.modify(filePath, { row -> index++ - if(!row['F'] && (row['H'] || row['O'] || row['W']) && row['E']=="同里东新村") {// && row['E']=="竹苑新村园区" + if(!row['F'] && (row['H'] || row['O'] || row['W']) && row['E']=="鍚岄噷涓滄柊鏉�") {// && row['E']=="绔硅嫅鏂版潙鍥尯" def rMap = NlpProcess.addFlag2(row['A'], row['B'], row['E'],row['D'], row['G'], row['H'], row['I'], row['J'],row['L'], row['M'],row['N'], row['O'], row['P'], row['Q'], row['S'], row['T'], row['V'], row['W'], row['X'], row['Y']); row = setMapValue(row, rMap); } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/DistrictStatRentCleanBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/DistrictStatRentCleanBatch.groovy index edb26ccb1..ab5adfd1f 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/DistrictStatRentCleanBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/DistrictStatRentCleanBatch.groovy @@ -24,7 +24,7 @@ class DistrictStatRentCleanBatch extends BaseBatch{ for(def c : citys){ def keys = CommonDatautils.getSimpleDistricts("district", c) running(keys, c) - println c +" 运行完成" + println c +" 杩愯瀹屾垚" } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/ExportData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/ExportData.groovy index 7fa85152f..f41f5baea 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/ExportData.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/ExportData.groovy @@ -33,38 +33,38 @@ class ExportData { } def exportMap(){ - //"河北"---"沧州","张家口","衡水","邢台","承德","石家庄","唐山","邯郸","廊坊","保定","秦皇岛" -// def pname = "青海" - //"河南"---安阳","许昌","南阳","开封","信阳","驻马店","漯河","鹤壁","周口","濮阳","三门峡","商丘","郑州","洛阳","平顶山","新乡","焦作","济源" - //"湖北"--- "黄冈","荆门","鄂州","十堰","随州","孝感","荆州","咸宁","恩施","武汉","襄阳","宜昌","黄石","仙桃","潜江","天门","神农架" - //"湖南" ---"常德","岳阳","邵阳","怀化","郴州","益阳","永州","娄底","湘西","长沙","株洲","湘潭","张家界","衡阳" - //"广西" ---- "钦州","梧州","百色","来宾","防城港","崇左","河池","贺州","贵港","南宁","桂林","北海","柳州","玉林" - //"山东"---临沂","泰安","菏泽","东营","德州","济宁","日照","聊城","滨州","枣庄","莱芜","济南","青岛","威海","烟台","潍坊","淄博" - //"辽宁" ---"铁岭","锦州","朝阳","阜新","抚顺","葫芦岛","辽阳","沈阳","大连","鞍山","丹东","本溪","营口","盘锦" - //"吉林"---"四平","辽源","白山","白城","通化","松原","延边","长春","吉林" - //"甘肃"----"武威","天水","定西","平凉","白银","酒泉","张掖","嘉峪关","庆阳","金昌","陇南","临夏","甘南","兰州" - //"贵州"----"遵义","安顺","铜仁","毕节","黔西南","黔东南","黔南","贵阳","六盘水" - //"海南" ----"三沙","三亚","海口","五指山","琼海","儋州","文昌","万宁","东方","定安","屯昌","澄迈","临高","白沙","昌江","乐东","陵水","保亭","琼中" - //黑龙江 ----"齐齐哈尔","佳木斯","绥化","鸡西","七台河","双鸭山","鹤岗","黑河","伊春","大兴安岭","哈尔滨","大庆","牡丹江" - //"山西" ---"大同","临汾","朔州","忻州","晋中","阳泉","运城","长治","吕梁","晋城","太原" - //"辽宁"---"铁岭","锦州","朝阳","阜新","抚顺","葫芦岛","辽阳","沈阳","大连","鞍山","丹东","本溪","营口","盘锦" - //"四川"----广元","乐山","南充","泸州","资阳","内江","达州","巴中","遂宁","眉山","德阳","广安","雅安","阿坝州","甘孜州","凉山州","成都","绵阳","宜宾","自贡","攀枝花" - //"新疆"----"克拉玛依","阿克苏","喀什","昌吉","吐鲁番","哈密","和田","塔城","阿勒泰","博尔塔拉","巴音郭楞","克孜勒苏","伊犁","昆玉","乌鲁木齐","石河子","阿拉尔","图木舒克","五家渠","北屯","铁门关","双河","可克达拉" - //陕西 ----"榆林","汉中","安康","铜川","宝鸡","渭南","商洛","西安","咸阳","延安" - //"云南" ---"临沧","保山","昭通","普洱","楚雄","红河","文山州","西双版纳州","德宏州","怒江州","迪庆州","昆明","丽江","大理","曲靖","玉溪" - //"内蒙古"---" 包头","赤峰","鄂尔多斯","乌海","巴彦淖尔","呼伦贝尔","乌兰察布","通辽","兴安盟","锡林郭勒盟","阿拉善盟","呼和浩特" - //宁夏 ----- 中卫 固原 石嘴山 吴忠 银川 - //青海 ---- 海东 海北州 黄南州 海南州 果洛州 玉树州 海西州 西宁 -// def citys = ["潜江","来宾","河源","甘南","宣城","朔州","景德镇","呼和浩特","固原","佛山","玉溪","江门","黄山","海口","梧州","辽源","亳州","六安","大理","滁州","韶关","拉萨","北屯","锡林郭勒盟","海北州","肇庆","梅州","重庆","玉树州","石嘴山","清远","钦州", -// "中卫","兴安盟","天门","贺州","湛江","文山州","图木舒克","通辽","茂名","海南州","贵港","铜陵","铁门关","汕头","临沧","楚雄","昌都","德宏州","北海","保山","阳江","西双版纳州","石河子","琼海","甘孜州","阿坝州","万宁","怒江州","揭阳","潮州","云浮", -// "防城港","池州","文昌","儋州","阿拉善盟","阿拉尔","五家渠","山南","日喀则","乐东","黄南州"] - def citys = ["安庆","西宁","日照","长春","武汉","西安","苏州","大连","广州","重庆","南京","沈阳","青岛","天津","济南","宁波","长沙","石家庄","佛山","嘉兴","银川","南通","廊坊","中山","郑州","哈尔滨","烟台","徐州","绍兴","厦门","昆明","南昌","贵阳","珠海","东莞","镇江","洛阳","温州","兰州","福州","惠州","呼和浩特","常州","唐山","淮安","湖州","九江","太原","北海","株洲","淄博","盐城","乌鲁木齐","海口","南宁","常德","台州","金华","吉林","岳阳","柳州","清远","湛江","张家口","保定","北京","成都","深圳","杭州","合肥","扬州","无锡","泉州","遵义","肇庆","漳州","宜昌","芜湖","泰州","汕头","三亚","秦皇岛","马鞍山","连云港","沧州","拉萨","锦州","大同","文昌","陵水","保亭"]; + //"娌冲寳"---"娌у窞","寮犲鍙�","琛℃按","閭㈠彴","鎵垮痉","鐭冲搴�","鍞愬北","閭兏","寤婂潑","淇濆畾","绉︾殗宀�" +// def pname = "闈掓捣" + //"娌冲崡"---瀹夐槼","璁告槍","鍗楅槼","寮�灏�","淇¢槼","椹婚┈搴�","婕渤","楣ゅ","鍛ㄥ彛","婵槼","涓夐棬宄�","鍟嗕笜","閮戝窞","娲涢槼","骞抽《灞�","鏂颁埂","鐒︿綔","娴庢簮" + //"婀栧寳"--- "榛勫唸","鑽嗛棬","閯傚窞","鍗佸牥","闅忓窞","瀛濇劅","鑽嗗窞","鍜稿畞","鎭╂柦","姝︽眽","瑗勯槼","瀹滄槍","榛勭煶","浠欐","娼滄睙","澶╅棬","绁炲啘鏋�" + //"婀栧崡" ---"甯稿痉","宀抽槼","閭甸槼","鎬�鍖�","閮村窞","鐩婇槼","姘稿窞","濞勫簳","婀樿タ","闀挎矙","鏍床","婀樻江","寮犲鐣�","琛¢槼" + //"骞胯タ" ---- "閽﹀窞","姊у窞","鐧捐壊","鏉ュ","闃插煄娓�","宕囧乏","娌虫睜","璐哄窞","璐垫腐","鍗楀畞","妗傛灄","鍖楁捣","鏌冲窞","鐜夋灄" + //"灞变笢"---涓存矀","娉板畨","鑿忔辰","涓滆惀","寰峰窞","娴庡畞","鏃ョ収","鑱婂煄","婊ㄥ窞","鏋e簞","鑾辫姕","娴庡崡","闈掑矝","濞佹捣","鐑熷彴","娼嶅潑","娣勫崥" + //"杈藉畞" ---"閾佸箔","閿﹀窞","鏈濋槼","闃滄柊","鎶氶『","钁姦宀�","杈介槼","娌堥槼","澶ц繛","闉嶅北","涓逛笢","鏈邯","钀ュ彛","鐩橀敠" + //"鍚夋灄"---"鍥涘钩","杈芥簮","鐧藉北","鐧藉煄","閫氬寲","鏉惧師","寤惰竟","闀挎槬","鍚夋灄" + //"鐢樿們"----"姝﹀▉","澶╂按","瀹氳タ","骞冲噳","鐧介摱","閰掓硥","寮犳帠","鍢夊唱鍏�","搴嗛槼","閲戞槍","闄囧崡","涓村","鐢樺崡","鍏板窞" + //"璐靛窞"----"閬典箟","瀹夐『","閾滀粊","姣曡妭","榛旇タ鍗�","榛斾笢鍗�","榛斿崡","璐甸槼","鍏洏姘�" + //"娴峰崡" ----"涓夋矙","涓変簹","娴峰彛","浜旀寚灞�","鐞兼捣","鍎嬪窞","鏂囨槍","涓囧畞","涓滄柟","瀹氬畨","灞槍","婢勮繄","涓撮珮","鐧芥矙","鏄屾睙","涔愪笢","闄垫按","淇濅涵","鐞间腑" + //榛戦緳姹� ----"榻愰綈鍝堝皵","浣虫湪鏂�","缁ュ寲","楦¤タ","涓冨彴娌�","鍙岄腑灞�","楣ゅ矖","榛戞渤","浼婃槬","澶у叴瀹夊箔","鍝堝皵婊�","澶у簡","鐗′腹姹�" + //"灞辫タ" ---"澶у悓","涓存本","鏈斿窞","蹇诲窞","鏅嬩腑","闃虫硥","杩愬煄","闀挎不","鍚曟","鏅嬪煄","澶師" + //"杈藉畞"---"閾佸箔","閿﹀窞","鏈濋槼","闃滄柊","鎶氶『","钁姦宀�","杈介槼","娌堥槼","澶ц繛","闉嶅北","涓逛笢","鏈邯","钀ュ彛","鐩橀敠" + //"鍥涘窛"----骞垮厓","涔愬北","鍗楀厖","娉稿窞","璧勯槼","鍐呮睙","杈惧窞","宸翠腑","閬傚畞","鐪夊北","寰烽槼","骞垮畨","闆呭畨","闃垮潩宸�","鐢樺瓬宸�","鍑夊北宸�","鎴愰兘","缁甸槼","瀹滃","鑷础","鏀�鏋濊姳" + //"鏂扮枂"----"鍏嬫媺鐜涗緷","闃垮厠鑻�","鍠�浠�","鏄屽悏","鍚愰瞾鐣�","鍝堝瘑","鍜岀敯","濉斿煄","闃垮嫆娉�","鍗氬皵濉旀媺","宸撮煶閮","鍏嬪瓬鍕掕嫃","浼婄妬","鏄嗙帀","涔岄瞾鏈ㄩ綈","鐭虫渤瀛�","闃挎媺灏�","鍥炬湪鑸掑厠","浜斿娓�","鍖楀悲","閾侀棬鍏�","鍙屾渤","鍙厠杈炬媺" + //闄曡タ ----"姒嗘灄","姹変腑","瀹夊悍","閾滃窛","瀹濋浮","娓崡","鍟嗘礇","瑗垮畨","鍜搁槼","寤跺畨" + //"浜戝崡" ---"涓存钵","淇濆北","鏄��","鏅幢","妤氶泟","绾㈡渤","鏂囧北宸�","瑗垮弻鐗堢撼宸�","寰峰畯宸�","鎬掓睙宸�","杩簡宸�","鏄嗘槑","涓芥睙","澶х悊","鏇查潠","鐜夋邯" + //"鍐呰挋鍙�"---" 鍖呭ご","璧ゅ嘲","閯傚皵澶氭柉","涔屾捣","宸村溅娣栧皵","鍛间鸡璐濆皵","涔屽叞瀵熷竷","閫氳窘","鍏村畨鐩�","閿℃灄閮嫆鐩�","闃挎媺鍠勭洘","鍛煎拰娴╃壒" + //瀹佸 ----- 涓崼 鍥哄師 鐭冲槾灞� 鍚村繝 閾跺窛 + //闈掓捣 ---- 娴蜂笢 娴峰寳宸� 榛勫崡宸� 娴峰崡宸� 鏋滄礇宸� 鐜夋爲宸� 娴疯タ宸� 瑗垮畞 +// def citys = ["娼滄睙","鏉ュ","娌虫簮","鐢樺崡","瀹e煄","鏈斿窞","鏅痉闀�","鍛煎拰娴╃壒","鍥哄師","浣涘北","鐜夋邯","姹熼棬","榛勫北","娴峰彛","姊у窞","杈芥簮","浜冲窞","鍏畨","澶х悊","婊佸窞","闊跺叧","鎷夎惃","鍖楀悲","閿℃灄閮嫆鐩�","娴峰寳宸�","鑲囧簡","姊呭窞","閲嶅簡","鐜夋爲宸�","鐭冲槾灞�","娓呰繙","閽﹀窞", +// "涓崼","鍏村畨鐩�","澶╅棬","璐哄窞","婀涙睙","鏂囧北宸�","鍥炬湪鑸掑厠","閫氳窘","鑼傚悕","娴峰崡宸�","璐垫腐","閾滈櫟","閾侀棬鍏�","姹曞ご","涓存钵","妤氶泟","鏄岄兘","寰峰畯宸�","鍖楁捣","淇濆北","闃虫睙","瑗垮弻鐗堢撼宸�","鐭虫渤瀛�","鐞兼捣","鐢樺瓬宸�","闃垮潩宸�","涓囧畞","鎬掓睙宸�","鎻槼","娼窞","浜戞诞", +// "闃插煄娓�","姹犲窞","鏂囨槍","鍎嬪窞","闃挎媺鍠勭洘","闃挎媺灏�","浜斿娓�","灞卞崡","鏃ュ杸鍒�","涔愪笢","榛勫崡宸�"] + def citys = ["瀹夊簡","瑗垮畞","鏃ョ収","闀挎槬","姝︽眽","瑗垮畨","鑻忓窞","澶ц繛","骞垮窞","閲嶅簡","鍗椾含","娌堥槼","闈掑矝","澶╂触","娴庡崡","瀹佹尝","闀挎矙","鐭冲搴�","浣涘北","鍢夊叴","閾跺窛","鍗楅��","寤婂潑","涓北","閮戝窞","鍝堝皵婊�","鐑熷彴","寰愬窞","缁嶅叴","鍘﹂棬","鏄嗘槑","鍗楁槍","璐甸槼","鐝犳捣","涓滆帪","闀囨睙","娲涢槼","娓╁窞","鍏板窞","绂忓窞","鎯犲窞","鍛煎拰娴╃壒","甯稿窞","鍞愬北","娣畨","婀栧窞","涔濇睙","澶師","鍖楁捣","鏍床","娣勫崥","鐩愬煄","涔岄瞾鏈ㄩ綈","娴峰彛","鍗楀畞","甯稿痉","鍙板窞","閲戝崕","鍚夋灄","宀抽槼","鏌冲窞","娓呰繙","婀涙睙","寮犲鍙�","淇濆畾","鍖椾含","鎴愰兘","娣卞湷","鏉窞","鍚堣偉","鎵窞","鏃犻敗","娉夊窞","閬典箟","鑲囧簡","婕冲窞","瀹滄槍","鑺滄箹","娉板窞","姹曞ご","涓変簹","绉︾殗宀�","椹瀺灞�","杩炰簯娓�","娌у窞","鎷夎惃","閿﹀窞","澶у悓","鏂囨槍","闄垫按","淇濅涵"]; for(def city : citys){ - def path = "D:\\数据\\小区\\地图\\${city}.xlsx"; + def path = "D:\\鏁版嵁\\灏忓尯\\鍦板浘\\${city}.xlsx"; def datas = findAllDatas(city, null) - println "${city}共计:"+datas.size() - ExcelUtils.write(path, datas, "数据") + println "${city}鍏辫锛�"+datas.size() + ExcelUtils.write(path, datas, "鏁版嵁") } } @@ -74,16 +74,16 @@ class ExportData { def exportThird(){ - def citys = ["南昌"] + def citys = ["鍗楁槍"] for(def city : citys){ def rets = [] - rets << ["城市","区域","名称","别名"] + rets << ["鍩庡競","鍖哄煙","鍚嶇О","鍒悕"] def cursor = thirdDistrictColl.find(new BasicDBObject("city", city)) for(def o : cursor){ def ret = [] - if(o.city == "昆山"){ - ret << "苏州" - ret << "昆山" + if(o.city == "鏄嗗北"){ + ret << "鑻忓窞" + ret << "鏄嗗北" }else{ ret << o.city def region = RegionData.formatRegion(o.city, o.region) @@ -94,7 +94,7 @@ class ExportData { ret << o.similar_word rets << ret } - ExcelUtils.write("D:\\数据\\房估估\\"+city+".xls", rets, city) + ExcelUtils.write("D:\\鏁版嵁\\鎴夸及浼癨\"+city+".xls", rets, city) } } @@ -103,21 +103,21 @@ class ExportData { def findAllDatas(def city, def pname){ final StringBuffer sqlBuffer = new StringBuffer() - sqlBuffer.append("SELECT address,pname,cityname,type,adname,name,source,m_date,location FROM amap_poi WHERE 1=1 and cityname='${city}' and type like '商务住宅%'") + sqlBuffer.append("SELECT address,pname,cityname,type,adname,name,source,m_date,location FROM amap_poi WHERE 1=1 and cityname='${city}' and type like '鍟嗗姟浣忓畢%'") // sqlBuffer.append(" and pname = '"+pname+"'") // sqlBuffer.append(" and cityname = '"+pname+"'") ResultSet rs = dataSource.connection.createStatement().executeQuery(sqlBuffer.toString()) def rets = [] - rets << ["城市","区域","名称","地址","类型","高德经度","高德纬度","标准化名称","标记","匹配城市","匹配区域","匹配名称","匹配地址"] + rets << ["鍩庡競","鍖哄煙","鍚嶇О","鍦板潃","绫诲瀷","楂樺痉缁忓害","楂樺痉绾害","鏍囧噯鍖栧悕绉�","鏍囪","鍖归厤鍩庡競","鍖归厤鍖哄煙","鍖归厤鍚嶇О","鍖归厤鍦板潃"] def index = 0 while (rs.next()) { index++ def source = rs.getObject("source") - if(source && source=="高德"){ + if(source && source=="楂樺痉"){ println index def type = rs.getObject("type") //def city = rs.getString("cityname") - if(type.contains("住宅")){ + if(type.contains("浣忓畢")){ def ret = [] ret << city ret << rs.getString("adname") 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 93c1f35da..271449eda 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 @@ -71,7 +71,7 @@ class FangjiaClientUtils { - //分词 省,市,区 + //鍒嗚瘝 鐪侊紝甯傦紝鍖� public static def addressStand(def city, def address){ def jsonObj = null def content = null @@ -92,7 +92,7 @@ class FangjiaClientUtils { return jsonObj; } - //分词基础上的标准化,complete=false 不不全 short=true 省市区返回简拼 + //鍒嗚瘝鍩虹涓婄殑鏍囧噯鍖栵紝complete=false 涓嶄笉鍏� short=true 鐪佸競鍖鸿繑鍥炵畝鎷� public static def addressStructure(def city, def address){ def jsonObj = null def content = null @@ -206,7 +206,7 @@ class FangjiaClientUtils { com.alibaba.fastjson.JSONObject json = HttpUtils.doPost2("http://192.168.0.100:38080/FangJiaDataService/saveData", jsonStr) if (json.status == 0) { - return "成功" + return "鎴愬姛" }else if(json.status == 1){ return json.msg } @@ -260,7 +260,7 @@ class FangjiaClientUtils { content = new HttpRequest().newGet(url, null, "utf-8") jsonObj = JSONObject.fromObject(content) } catch (Exception e) { - println "报错地址:"+url + println "鎶ラ敊鍦板潃锛�"+url e.printStackTrace(); } return jsonObj; @@ -416,8 +416,8 @@ class FangjiaClientUtils { /** - * 经纬度转换 - * 1、高德转百度 2、高德转WGS84 3、百度转高德 4、WGS84转高德 5、百度转WGS84 6、WGS84转百度 + * 缁忕含搴﹁浆鎹� + * 1銆侀珮寰疯浆鐧惧害 2銆侀珮寰疯浆WGS84 3銆佺櫨搴﹁浆楂樺痉 4銆乄GS84杞珮寰� 5銆佺櫨搴﹁浆WGS84 6銆乄GS84杞櫨搴� */ public static def convert(String locationstr, type){ def jsonObj = null diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/FlagProcess.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/FlagProcess.groovy index df28997dc..d2153d857 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/FlagProcess.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/FlagProcess.groovy @@ -17,20 +17,20 @@ class FlagProcess { def flag = null def estateType = null if(gdRegion || bdRegion){ - if(region == gdRegion && name == gdName && gdType && (gdType.contains("住宅区") || gdType.contains("门牌信息"))){ + if(region == gdRegion && name == gdName && gdType && (gdType.contains("浣忓畢鍖�") || gdType.contains("闂ㄧ墝淇℃伅"))){ flag = 22; lastAddr = getBestAddress(city, address, gdAddress, null); // def lng = dist.lng/10000000000.0; // def lat = dist.lat/10000000000.0; // double dis = GeoUtils.calculateDistance(gdlng,gdlat,lng,lat) - if(gdType.contains("别墅")){ - estateType = "别墅" + if(gdType.contains("鍒")){ + estateType = "鍒" } rMap.gdLng = gdLng rMap.gdLat = gdLat } if(!flag){ - if(region == bdRegion && name == bdName && bdType && (bdType.contains("房地产") && !bdType.contains("写字楼")) ){ + if(region == bdRegion && name == bdName && bdType && (bdType.contains("鎴垮湴浜�") && !bdType.contains("鍐欏瓧妤�")) ){ flag = 22; lastAddr = getBestAddress(city, address, null, bdAddress); // def lng = dist.lng2/1000000000.0; @@ -80,8 +80,8 @@ class FlagProcess { def estateType = null if(region && matchRegion && region == matchRegion){ flag = 21; - if(type.contains("别墅")){ - estateType = "别墅" + if(type.contains("鍒")){ + estateType = "鍒" } } if(flag){ @@ -95,20 +95,20 @@ class FlagProcess { def flag = null; def lastAddr = null def estateType = null - if(gdType && !gdType.contains("商务住宅")){ + if(gdType && !gdType.contains("鍟嗗姟浣忓畢")){ flag = 1; - if(gdName.contains("售楼处") || gdName.contains("营销")){ + if(gdName.contains("鍞ゼ澶�") || gdName.contains("钀ラ攢")){ flag = null; } }else{ - if(gdType && (gdType.contains("写字楼") || gdType.contains("园区"))){ + if(gdType && (gdType.contains("鍐欏瓧妤�") || gdType.contains("鍥尯"))){ flag = 11; } - if(gdType.contains("住宅区")|| gdType.contains("商务住宅相关")){ + if(gdType.contains("浣忓畢鍖�")|| gdType.contains("鍟嗗姟浣忓畢鐩稿叧")){ flag = 3; lastAddr = getBestAddress(city, address, gdAddress, null); - if(gdType.contains("别墅")){ - estateType = "别墅" + if(gdType.contains("鍒")){ + estateType = "鍒" } } } @@ -129,27 +129,27 @@ class FlagProcess { def lastAddr = null def estateType = null if(name && gdName && bdName && name==gdName && name==bdName){ - if(gdType && bdType){//名称相同,都有类型 - if(!gdType.contains("商务住宅") && !bdType.contains("房地产") && !bdType.contains("公司企业;公司")){ + if(gdType && bdType){//鍚嶇О鐩稿悓锛岄兘鏈夌被鍨� + if(!gdType.contains("鍟嗗姟浣忓畢") && !bdType.contains("鎴垮湴浜�") && !bdType.contains("鍏徃浼佷笟;鍏徃")){ flag = 1; - if(gdName.contains("售楼处") || gdName.contains("营销")){ + if(gdName.contains("鍞ゼ澶�") || gdName.contains("钀ラ攢")){ flag = null; } }else{ - if((gdType.contains("写字楼") || gdType.contains("园区"))&& (bdType.contains("写字楼") || bdType.contains("园区"))){ + if((gdType.contains("鍐欏瓧妤�") || gdType.contains("鍥尯"))&& (bdType.contains("鍐欏瓧妤�") || bdType.contains("鍥尯"))){ flag = 11; } - //2个都必须是住宅 - if((gdType.contains("住宅区") || gdType.contains("商务住宅相关")) && (bdType.contains("住宅区") || bdType.contains("内部楼栋") || bdType.contains("宿舍"))){ + //2涓兘蹇呴』鏄綇瀹� + if((gdType.contains("浣忓畢鍖�") || gdType.contains("鍟嗗姟浣忓畢鐩稿叧")) && (bdType.contains("浣忓畢鍖�") || bdType.contains("鍐呴儴妤兼爧") || bdType.contains("瀹胯垗"))){ flag = 3; lastAddr = getBestAddress(city, address, gdAddress, bdAddress); - if(gdType.contains("别墅")){ - estateType = "别墅" + if(gdType.contains("鍒")){ + estateType = "鍒" } - }else if(gdType.contains("住宅区") || gdType.contains("商务住宅相关")){ + }else if(gdType.contains("浣忓畢鍖�") || gdType.contains("鍟嗗姟浣忓畢鐩稿叧")){ if(!houseCount){ - if(!bdType.contains("房地产")||bdType.contains("写字楼")){ + if(!bdType.contains("鎴垮湴浜�")||bdType.contains("鍐欏瓧妤�")){ flag = 111; } } @@ -157,14 +157,14 @@ class FlagProcess { if(!flag){ flag = 3; lastAddr = getBestAddress(city, address, gdAddress, null); - if(gdType.contains("别墅")){ - estateType = "别墅" + if(gdType.contains("鍒")){ + estateType = "鍒" } } - }else if(bdType.contains("住宅区") || bdType.contains("内部楼栋") || bdType.contains("宿舍")){ + }else if(bdType.contains("浣忓畢鍖�") || bdType.contains("鍐呴儴妤兼爧") || bdType.contains("瀹胯垗")){ if(!houseCount){ - if(!gdType.contains("住宅区") && !gdType.contains("商务住宅相关") && !gdType.contains("门牌信息")){ + if(!gdType.contains("浣忓畢鍖�") && !gdType.contains("鍟嗗姟浣忓畢鐩稿叧") && !gdType.contains("闂ㄧ墝淇℃伅")){ flag = 111; } } @@ -174,62 +174,62 @@ class FlagProcess { } } } - }else if(gdType){//名称相同,只有高德有类型 - if(!gdType.contains("商务住宅")){ + }else if(gdType){//鍚嶇О鐩稿悓锛屽彧鏈夐珮寰锋湁绫诲瀷 + if(!gdType.contains("鍟嗗姟浣忓畢")){ flag = 1; - if(gdName.contains("售楼处") || gdName.contains("营销")){ + if(gdName.contains("鍞ゼ澶�") || gdName.contains("钀ラ攢")){ flag = null; } }else { - if(gdType.contains("写字楼") || gdType.contains("园区")){ + if(gdType.contains("鍐欏瓧妤�") || gdType.contains("鍥尯")){ flag = 11; } - if(gdType.contains("住宅区")|| gdType.contains("商务住宅相关")){ + if(gdType.contains("浣忓畢鍖�")|| gdType.contains("鍟嗗姟浣忓畢鐩稿叧")){ flag = 3; lastAddr = getBestAddress(city, address, gdAddress, null); - if(gdType.contains("别墅")){ - estateType = "别墅" + if(gdType.contains("鍒")){ + estateType = "鍒" } } } - }else if(bdType){//名称相同,只有百度有类型 - if(!bdType.contains("房地产") && !bdType.contains("公司企业;公司")){ + }else if(bdType){//鍚嶇О鐩稿悓锛屽彧鏈夌櫨搴︽湁绫诲瀷 + if(!bdType.contains("鎴垮湴浜�") && !bdType.contains("鍏徃浼佷笟;鍏徃")){ flag = 1; } } }else if(name && gdName && name==gdName){ - if(gdType && !gdType.contains("商务住宅")){ + if(gdType && !gdType.contains("鍟嗗姟浣忓畢")){ flag = 1; - if(gdName.contains("售楼处") || gdName.contains("营销")){ + if(gdName.contains("鍞ゼ澶�") || gdName.contains("钀ラ攢")){ flag = null; } - if(bdType && (bdType.contains("房地产") || bdType.contains("公司企业;公司"))){ + if(bdType && (bdType.contains("鎴垮湴浜�") || bdType.contains("鍏徃浼佷笟;鍏徃"))){ flag = null; } }else{ - if(gdType.contains("写字楼") || gdType.contains("园区")){ + if(gdType.contains("鍐欏瓧妤�") || gdType.contains("鍥尯")){ flag = 11; } - if(gdType.contains("住宅区")|| gdType.contains("商务住宅相关")){ + if(gdType.contains("浣忓畢鍖�")|| gdType.contains("鍟嗗姟浣忓畢鐩稿叧")){ flag = 3; lastAddr = getBestAddress(city, address, gdAddress, null); - if(gdType.contains("别墅")){ - estateType = "别墅" + if(gdType.contains("鍒")){ + estateType = "鍒" } } } }else if(name && bdName && name==bdName){ - if(bdType && (bdType.contains("写字楼") || bdType.contains("园区"))){ + if(bdType && (bdType.contains("鍐欏瓧妤�") || bdType.contains("鍥尯"))){ flag = 11; } - if(bdType && !bdType.contains("房地产") && !bdType.contains("公司企业;公司")){ + if(bdType && !bdType.contains("鎴垮湴浜�") && !bdType.contains("鍏徃浼佷笟;鍏徃")){ flag = 1; } - if(bdType && bdType.contains("商务住宅")){ + if(bdType && bdType.contains("鍟嗗姟浣忓畢")){ flag = null; } } @@ -247,17 +247,17 @@ class FlagProcess { def lastAddr = null def estateType = null - if(bdType && !bdType.contains("房地产") && !bdType.contains("公司企业;公司")){ + if(bdType && !bdType.contains("鎴垮湴浜�") && !bdType.contains("鍏徃浼佷笟;鍏徃")){ flag = 1; }else{ - if(bdType && (bdType.contains("写字楼") || bdType.contains("园区"))){ + if(bdType && (bdType.contains("鍐欏瓧妤�") || bdType.contains("鍥尯"))){ flag = 11; } - if(bdType && bdType.contains("房地产")){ - if(bdType.contains("住宅区") || bdType.contains("内部楼栋")){ + if(bdType && bdType.contains("鎴垮湴浜�")){ + if(bdType.contains("浣忓畢鍖�") || bdType.contains("鍐呴儴妤兼爧")){ flag = 3; lastAddr = getBestAddress(city, address, null, bdAddress); - }else if(bdType.contains("写字楼")){ + }else if(bdType.contains("鍐欏瓧妤�")){ flag = 1; } } @@ -302,7 +302,7 @@ class FlagProcess { if(addrList1){ for(def addr2 : addrList1){ - if(addr2.contains("号")){ + if(addr2.contains("鍙�")){ newAddress = addr2 break; }else{ @@ -319,10 +319,10 @@ class FlagProcess { static def standardAddress(def address) { address = address.replaceAll("\\(.*?\\)","") - if (address.indexOf("交汇") > -1 || address.indexOf("与") > -1 || address.indexOf("米") > -1) { + if (address.indexOf("浜ゆ眹") > -1 || address.indexOf("涓�") > -1 || address.indexOf("绫�") > -1) { return address; }else { - def pattern = Pattern.compile("[路|街|大道|巷|里]"); + def pattern = Pattern.compile("[璺瘄琛梶澶ч亾|宸穦閲宂"); def matcher = pattern.matcher(address) if(matcher.find()){ return address; @@ -343,7 +343,7 @@ class FlagProcess { isAdd = 11; }else{ def s1 = "" - def words = ["小区","公寓","花园","住宅区","住宅","商住楼","花苑","自建房","华润","万科","新城","绿地","旭辉","中天","中锐","港龙","路劲","弘阳","华润"] + def words = ["灏忓尯","鍏瘬","鑺卞洯","浣忓畢鍖�","浣忓畢","鍟嗕綇妤�","鑺辫嫅","鑷缓鎴�","鍗庢鼎","涓囩","鏂板煄","缁垮湴","鏃緣","涓ぉ","涓攼","娓緳","璺姴","寮橀槼","鍗庢鼎"] if(matchName.toString().length()>name.length()){ s1 = matchName.replace(name, "") @@ -363,7 +363,7 @@ class FlagProcess { println name +" "+matchName+" str: "+ s1 def s = pattern(s1); if(s == s1){ - isAdd = 4 //库中有,但此为分期 + isAdd = 4 //搴撲腑鏈夛紝浣嗘涓哄垎鏈� } } @@ -374,7 +374,7 @@ class FlagProcess { } static def pattern(def s){ - Pattern pattern = Pattern.compile("(东|南|北|西|甲|乙|丙|丁|一|二|三|四|五|六|七|八|九|十|东|南|西|北|\\w)+(期|区)") + Pattern pattern = Pattern.compile("(涓渱鍗梶鍖梶瑗縷鐢瞸涔檤涓檤涓亅涓�|浜寍涓墊鍥泑浜攟鍏瓅涓億鍏珅涔潀鍗亅涓渱鍗梶瑗縷鍖梶\\w)+(鏈焲鍖�)") def matcher = pattern.matcher(s) if(matcher.find()){ return matcher.group(); @@ -389,66 +389,66 @@ class FlagProcess { name = fliterCommonWord(region, name) if(gdName && bdName){ - bdName = bdName.replace("·","").replace("-","") + bdName = bdName.replace("路","").replace("-","") if(gdRegion.contains(region) && bdRegion.contains(region) && gdName==name && bdName==name){ - if(gdType && bdType && (gdType.contains("住宅区") || gdType.contains("商务住宅相关") || gdType.contains("商住两用楼宇"))&& (bdType.contains("住宅区") || bdType.contains("房地产"))){ + if(gdType && bdType && (gdType.contains("浣忓畢鍖�") || gdType.contains("鍟嗗姟浣忓畢鐩稿叧") || gdType.contains("鍟嗕綇涓ょ敤妤煎畤"))&& (bdType.contains("浣忓畢鍖�") || bdType.contains("鎴垮湴浜�"))){ if(otherRegion){ - isAdd = "都是住宅,库中有其它区域" + isAdd = "閮芥槸浣忓畢锛屽簱涓湁鍏跺畠鍖哄煙" }else{ - if(bdType.contains("写字楼") || bdType.contains("购物")){ + if(bdType.contains("鍐欏瓧妤�") || bdType.contains("璐墿")){ isAdd = "1" }else{ isAdd = "2" } } - }else if(gdType && bdType && (gdType.contains("住宅区") || gdType.contains("商务住宅相关") || gdType.contains("商住两用楼宇"))&& !bdType.contains("写字楼") && !bdType.contains("购物")){ + }else if(gdType && bdType && (gdType.contains("浣忓畢鍖�") || gdType.contains("鍟嗗姟浣忓畢鐩稿叧") || gdType.contains("鍟嗕綇涓ょ敤妤煎畤"))&& !bdType.contains("鍐欏瓧妤�") && !bdType.contains("璐墿")){ isAdd = "2" - }else if(bdType && bdType.contains("住宅区")){ + }else if(bdType && bdType.contains("浣忓畢鍖�")){ if(houseCount){ isAdd = "2" } } }else if(gdRegion.contains(region) && gdName==name){ - if(gdType && (gdType.contains("住宅区") || gdType.contains("商住两用楼宇") || gdType.contains("商务住宅相关"))){ + if(gdType && (gdType.contains("浣忓畢鍖�") || gdType.contains("鍟嗕綇涓ょ敤妤煎畤") || gdType.contains("鍟嗗姟浣忓畢鐩稿叧"))){ if(!otherRegion){ isAdd = "2" } - }else if(gdType && (gdType.contains("写字楼") || gdType.contains("购物"))){ + }else if(gdType && (gdType.contains("鍐欏瓧妤�") || gdType.contains("璐墿"))){ isAdd = "1" } }else if(bdRegion.contains(region) && bdName==name){ - if(bdType && bdType.contains("住宅区")){ + if(bdType && bdType.contains("浣忓畢鍖�")){ if(!otherRegion) { isAdd = "2" } - }else if(bdType && (bdType.contains("写字楼") || bdType.contains("购物"))){ + }else if(bdType && (bdType.contains("鍐欏瓧妤�") || bdType.contains("璐墿"))){ isAdd = "1" } } }else if(gdName && gdRegion.contains(region) && gdName==name){ - if(gdType && (gdType.contains("住宅区") || gdType.contains("商务住宅相关") || gdType.contains("商住两用楼宇"))){ + if(gdType && (gdType.contains("浣忓畢鍖�") || gdType.contains("鍟嗗姟浣忓畢鐩稿叧") || gdType.contains("鍟嗕綇涓ょ敤妤煎畤"))){ if(!otherRegion) { isAdd = "2" } - }else if(gdType && (gdType.contains("写字楼") || gdType.contains("购物"))){ + }else if(gdType && (gdType.contains("鍐欏瓧妤�") || gdType.contains("璐墿"))){ isAdd = "1" } }else if(bdName && bdRegion.contains(region) && bdName==name){ - if(bdType && bdType.contains("住宅区")){ + if(bdType && bdType.contains("浣忓畢鍖�")){ if(!otherRegion) { isAdd = "2" } - }else if(bdType && (bdType.contains("写字楼") || bdType.contains("购物"))){ + }else if(bdType && (bdType.contains("鍐欏瓧妤�") || bdType.contains("璐墿"))){ isAdd = "1" - }else if(bdType && !bdType.contains("房地产") && !bdType.contains("公交车站") && !bdType.contains("公司企业")){ + }else if(bdType && !bdType.contains("鎴垮湴浜�") && !bdType.contains("鍏氦杞︾珯") && !bdType.contains("鍏徃浼佷笟")){ isAdd = "2" } } - if(!isAdd){//名字不全相等 + if(!isAdd){//鍚嶅瓧涓嶅叏鐩哥瓑 if(gdRegion && gdRegion.contains(region)){ - if(gdType && gdName.toString().contains("建设中") && gdName.toString().contains(name) && (gdType.contains("商务住宅相关") || gdType.contains("住宅小区"))){ + if(gdType && gdName.toString().contains("寤鸿涓�") && gdName.toString().contains(name) && (gdType.contains("鍟嗗姟浣忓畢鐩稿叧") || gdType.contains("浣忓畢灏忓尯"))){ if(!otherRegion){ isAdd = "2" } @@ -461,9 +461,9 @@ class FlagProcess { static def fliterCommonWord(def city, def region, def name){ if(name){ name = NameProcess.nameStandard(city, region, name) - for(def word : ["小区","公寓","住宅楼","花园","住宅","自建房","广场"]){ + for(def word : ["灏忓尯","鍏瘬","浣忓畢妤�","鑺卞洯","浣忓畢","鑷缓鎴�","骞垮満"]){ def tempName = name.replace(word,"") - if(!tempName.toString().endsWith("路") && !tempName.toString().endsWith("街") && !tempName.toString().endsWith("弄") && !tempName.toString().endsWith("巷")){ + if(!tempName.toString().endsWith("璺�") && !tempName.toString().endsWith("琛�") && !tempName.toString().endsWith("寮�") && !tempName.toString().endsWith("宸�")){ name = tempName } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/JindDongGeoTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/JindDongGeoTest.groovy index 2b0dfcb18..3ae574209 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/JindDongGeoTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/JindDongGeoTest.groovy @@ -14,16 +14,16 @@ class JindDongGeoTest { static main(args) { def task = new JindDongGeoTest() - task.run()//通过经纬度,调用高德逆解析,并保存数据 + task.run()//閫氳繃缁忕含搴︼紝璋冪敤楂樺痉閫嗚В鏋愶紝骞朵繚瀛樻暟鎹� } def run(){ - ExcelUtils.modify("D:\\数据\\京东\\失败.xlsx",{ d-> + ExcelUtils.modify("D:\\鏁版嵁\\浜笢\\澶辫触.xlsx",{ d-> if(d['E']){ def jsonObject = GaoDeApiUtils.geocode(d['E']) if(jsonObject){ - d["F"] = "高德" + d["F"] = "楂樺痉" def dbo = new BasicDBObject() dbo.put("old_id", d['A']) dbo.put("city", d['B']) @@ -126,7 +126,7 @@ class JindDongGeoTest { return null default: - // 检查是否是包含JSONNull的字符串表示 + // 妫�鏌ユ槸鍚︽槸鍖呭惈JSONNull鐨勫瓧绗︿覆琛ㄧず if (value instanceof String && value.contains("JSONNull")) { return null } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/MapDistrictProcess.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/MapDistrictProcess.groovy index 49216581d..7a7c83880 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/MapDistrictProcess.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/MapDistrictProcess.groovy @@ -16,7 +16,7 @@ import com.mongodb.BasicDBObject import java.util.regex.Pattern /*** - * 地图小区处理 + * 鍦板浘灏忓尯澶勭悊 */ class MapDistrictProcess { def districtDetailColl = CrawalDBUtil.getDistrictDetailColl(); @@ -28,22 +28,22 @@ class MapDistrictProcess { } /** - * 1:删除 10:小区已存在 11:去关键字后相同删除 12:距离排除 13:人工删除 14:得分小于0.6 15:预测写字楼 16:人工删除百度房地产类型 17:词性删除 18:名称字数太少小于3 19:路 - * 20:不同区域新增(库中无) 21:分期新增 23:不同区域,距离相近 25:无匹配,可新增 22:有匹配,距离1000米以下,相似度在0.6以上 24:疑似匹配有误 27:人工判定入库 + * 1:鍒犻櫎 10锛氬皬鍖哄凡瀛樺湪 11锛氬幓鍏抽敭瀛楀悗鐩稿悓鍒犻櫎 12:璺濈鎺掗櫎 13锛氫汉宸ュ垹闄� 14锛氬緱鍒嗗皬浜�0.6 15:棰勬祴鍐欏瓧妤� 16锛氫汉宸ュ垹闄ょ櫨搴︽埧鍦颁骇绫诲瀷 17:璇嶆�у垹闄� 18:鍚嶇О瀛楁暟澶皯灏忎簬3 19锛氳矾 + * 20锛氫笉鍚屽尯鍩熸柊澧烇紙搴撲腑鏃狅級 21锛氬垎鏈熸柊澧� 23:涓嶅悓鍖哄煙锛岃窛绂荤浉杩� 25:鏃犲尮閰嶏紝鍙柊澧� 22:鏈夊尮閰嶏紝璺濈1000绫充互涓嬶紝鐩镐技搴﹀湪0.6浠ヤ笂 24锛氱枒浼煎尮閰嶆湁璇� 27锛氫汉宸ュ垽瀹氬叆搴� * @return */ def run(){ -// def files = ["重庆.xlsx","东莞.xlsx","温州.xlsx","绍兴.xlsx","宁波.xlsx","南昌.xlsx","济南.xlsx","金华.xlsx","肇庆.xlsx","湛江.xlsx","岳阳.xlsx","盐城.xlsx","唐山.xlsx","三亚.xlsx","廊坊.xlsx","呼和浩特.xlsx","西宁.xlsx","日照.xlsx","常德.xlsx"] - //"乌鲁木齐.xlsx","烟台.xlsx","保定.xlsx","贵阳.xlsx","湖州.xlsx","惠州.xlsx","吉林.xlsx","遵义.xlsx","宜昌.xlsx","芜湖.xlsx","兰州.xlsx" - def files = ["兰州.xlsx"] +// def files = ["閲嶅簡.xlsx","涓滆帪.xlsx","娓╁窞.xlsx","缁嶅叴.xlsx","瀹佹尝.xlsx","鍗楁槍.xlsx","娴庡崡.xlsx","閲戝崕.xlsx","鑲囧簡.xlsx","婀涙睙.xlsx","宀抽槼.xlsx","鐩愬煄.xlsx","鍞愬北.xlsx","涓変簹.xlsx","寤婂潑.xlsx","鍛煎拰娴╃壒.xlsx","瑗垮畞.xlsx","鏃ョ収.xlsx","甯稿痉.xlsx"] + //"涔岄瞾鏈ㄩ綈.xlsx","鐑熷彴.xlsx","淇濆畾.xlsx","璐甸槼.xlsx","婀栧窞.xlsx","鎯犲窞.xlsx","鍚夋灄.xlsx","閬典箟.xlsx","瀹滄槍.xlsx","鑺滄箹.xlsx","鍏板窞.xlsx" + def files = ["鍏板窞.xlsx"] for(def fileName : files){ - def filePath = "D:\\数据\\小区\\地图\\"+fileName; + def filePath = "D:\\鏁版嵁\\灏忓尯\\鍦板浘\\"+fileName; typeFilter(filePath) nameStandard(filePath); dataFilter(filePath) houseCalculate(filePath); - //统计是否存在多个区域 + //缁熻鏄惁瀛樺湪澶氫釜鍖哄煙 matchDistDatas(filePath) moreRegionCalculate(filePath) // @@ -80,7 +80,7 @@ class MapDistrictProcess { } }else{ - def s1 = DataUtil.match(name, Pattern.compile("(路|街|道)\\d+号\$")) + def s1 = DataUtil.match(name, Pattern.compile("(璺瘄琛梶閬�)\\d+鍙穃$")) if(s1){ row['I'] = 19 } @@ -93,31 +93,31 @@ class MapDistrictProcess { } }); - println "3.名称过滤完成" + println "3.鍚嶇О杩囨护瀹屾垚" } def typeFilter(filePath){ - def types = ["商务住宅;楼宇;商住两用楼宇","商务住宅;楼宇;商住两用楼宇|商务住宅;住宅区;住宅区","商务住宅;楼宇;商住两用楼宇|商务住宅;住宅区;住宅小区","商务住宅;商务住宅相关;商务住宅相关","商务住宅;住宅区;别墅","商务住宅;住宅区;别墅|商务住宅;住宅区;住宅小区","商务住宅;住宅区;社区中心|商务住宅;住宅区;住宅小区","商务住宅;住宅区;宿舍","商务住宅;住宅区;宿舍|商务住宅;住宅区;住宅小区","商务住宅;住宅区;住宅小区","商务住宅;住宅区;住宅区","商务住宅;住宅区;住宅小区|商务住宅;住宅区;宿舍","商务住宅;住宅区;住宅小区|商务住宅;住宅区;别墅","商务住宅;住宅区;住宅小区|商务住宅;楼宇;商住两用楼宇","商务住宅;住宅区;住宅小区|商务住宅;住宅区;社区中心","商务住宅;住宅区;住宅小区|商务住宅;楼宇;楼宇相关"] + def types = ["鍟嗗姟浣忓畢;妤煎畤;鍟嗕綇涓ょ敤妤煎畤","鍟嗗姟浣忓畢;妤煎畤;鍟嗕綇涓ょ敤妤煎畤|鍟嗗姟浣忓畢;浣忓畢鍖�;浣忓畢鍖�","鍟嗗姟浣忓畢;妤煎畤;鍟嗕綇涓ょ敤妤煎畤|鍟嗗姟浣忓畢;浣忓畢鍖�;浣忓畢灏忓尯","鍟嗗姟浣忓畢;鍟嗗姟浣忓畢鐩稿叧;鍟嗗姟浣忓畢鐩稿叧","鍟嗗姟浣忓畢;浣忓畢鍖�;鍒","鍟嗗姟浣忓畢;浣忓畢鍖�;鍒|鍟嗗姟浣忓畢;浣忓畢鍖�;浣忓畢灏忓尯","鍟嗗姟浣忓畢;浣忓畢鍖�;绀惧尯涓績|鍟嗗姟浣忓畢;浣忓畢鍖�;浣忓畢灏忓尯","鍟嗗姟浣忓畢;浣忓畢鍖�;瀹胯垗","鍟嗗姟浣忓畢;浣忓畢鍖�;瀹胯垗|鍟嗗姟浣忓畢;浣忓畢鍖�;浣忓畢灏忓尯","鍟嗗姟浣忓畢;浣忓畢鍖�;浣忓畢灏忓尯","鍟嗗姟浣忓畢;浣忓畢鍖�;浣忓畢鍖�","鍟嗗姟浣忓畢;浣忓畢鍖�;浣忓畢灏忓尯|鍟嗗姟浣忓畢;浣忓畢鍖�;瀹胯垗","鍟嗗姟浣忓畢;浣忓畢鍖�;浣忓畢灏忓尯|鍟嗗姟浣忓畢;浣忓畢鍖�;鍒","鍟嗗姟浣忓畢;浣忓畢鍖�;浣忓畢灏忓尯|鍟嗗姟浣忓畢;妤煎畤;鍟嗕綇涓ょ敤妤煎畤","鍟嗗姟浣忓畢;浣忓畢鍖�;浣忓畢灏忓尯|鍟嗗姟浣忓畢;浣忓畢鍖�;绀惧尯涓績","鍟嗗姟浣忓畢;浣忓畢鍖�;浣忓畢灏忓尯|鍟嗗姟浣忓畢;妤煎畤;妤煎畤鐩稿叧"] ExcelUtils.multiThreadingModify(filePath, { row -> def type = row['E'] if(!types.contains(type)){ row['I'] = 1 } }); - println "1.类型过滤完成" + println "1.绫诲瀷杩囨护瀹屾垚" } def baiduTypeFilter(filePath){ - def types = ["房地产;住宅区","房地产;内部楼栋","房地产","房地产;宿舍"] + def types = ["鎴垮湴浜�;浣忓畢鍖�","鎴垮湴浜�;鍐呴儴妤兼爧","鎴垮湴浜�","鎴垮湴浜�;瀹胯垗"] ExcelUtils.multiThreadingModify(filePath, { row -> def type = row['S'] if(type && row['Q'] && row['Q']==row['H'] && !types.contains(type)){ row['I'] = 1 } }); - println "9.百度类型过滤完成" + println "9.鐧惧害绫诲瀷杩囨护瀹屾垚" } def distanceFilter(filePath){ @@ -130,7 +130,7 @@ class MapDistrictProcess { } } }); - println "10.距离过滤完成" + println "10.璺濈杩囨护瀹屾垚" } def nameStandard(filePath){ @@ -143,7 +143,7 @@ class MapDistrictProcess { } }, 0); - println "2.名称标准化完成" + println "2.鍚嶇О鏍囧噯鍖栧畬鎴�" } def matchDistDatas(def path){ @@ -173,7 +173,7 @@ class MapDistrictProcess { println index +" "+row } },0) - println "5.小区匹配完成" + println "5.灏忓尯鍖归厤瀹屾垚" } def houseCalculate(filePath){ @@ -182,7 +182,7 @@ class MapDistrictProcess { row['N'] = EsSearchUtils.findHouse(row['A'], row['B'], row['H']) } }); - println "4.房源统计完成" + println "4.鎴挎簮缁熻瀹屾垚" } def moreRegionCalculate(filePath){ @@ -210,13 +210,13 @@ class MapDistrictProcess { row['I'] = 20 } }else if(regions.contains(row['B'])){ - row['O'] = "已存在" + row['O'] = "宸插瓨鍦�" row['I'] = 10 } } } }); - println "6.区域过滤完成" + println "6.鍖哄煙杩囨护瀹屾垚" } def addFlag(def filePath){ @@ -224,18 +224,18 @@ class MapDistrictProcess { ExcelUtils.multiThreadingModify(filePath, { row -> index++ if(!row['I']) { - //根据别名查找 + //鏍规嵁鍒悕鏌ユ壘 - //有匹配的结果根据名称进行过滤 + //鏈夊尮閰嶇殑缁撴灉鏍规嵁鍚嶇О杩涜杩囨护 if(row['J']) { row['I'] = FlagProcess.addDataFlagByMatch(row['A'], row['B'], row['H'], row['K'], row['L']) } - //匹配的结果根据地址进行过滤 + //鍖归厤鐨勭粨鏋滄牴鎹湴鍧�杩涜杩囨护 if(row['J'] && !row['H']) { row['I'] = FlagProcess.addDataFlagByMatch(row['A'],row['B'], row['H'], row['K'], row['M']) } - //无匹配结果,没有标记, 并且不存在其它区域 + //鏃犲尮閰嶇粨鏋滐紝娌℃湁鏍囪锛� 骞朵笖涓嶅瓨鍦ㄥ叾瀹冨尯鍩� // if(!row['J'] && !row['I'] && !row['O']){ // def rMap = FlagProcess.addDataFlagByType(row['A'],row['B'], row['E'],row['D'], row['G'], row['H'], row['I'], row['J'], row['N'], row['O'], row['P'],row['Q'], row['Y'], row['L'], row['M'], row['S'], row['T']) // row = setMapValue(row, rMap); @@ -246,7 +246,7 @@ class MapDistrictProcess { row = setMapValue(row, rMap); } - //根据地图类型过滤 + //鏍规嵁鍦板浘绫诲瀷杩囨护 // if(!row['F']){ // row['F'] = FlagProcess.addDataFlagByType(row['B'], row['E'], row['G'], row['H'], row['J'], row['N'], row['O'], row['Q']) // } @@ -254,7 +254,7 @@ class MapDistrictProcess { } }); - println "7.打标记完成" + println "7.鎵撴爣璁板畬鎴�" } def baiduMap(def filePath){ @@ -282,7 +282,7 @@ class MapDistrictProcess { } } }); - println "11.特征过滤完成" + println "11.鐗瑰緛杩囨护瀹屾垚" } def mapMatch(def filePath){ @@ -291,11 +291,11 @@ class MapDistrictProcess { index ++ def city = row['A'] def region = row['B'] - def name = row['H']//格式化名称 + def name = row['H']//鏍煎紡鍖栧悕绉� def addr = row['D'] if(!row['I']){ - def bdData = FangjiaClientUtils.getMapData(city, region, name, addr,"", "百度") + def bdData = FangjiaClientUtils.getMapData(city, region, name, addr,"", "鐧惧害") if(bdData){ row['P'] = bdData.district @@ -310,7 +310,7 @@ class MapDistrictProcess { println index +" "+row },0); - println "8.地图匹配完成" + println "8.鍦板浘鍖归厤瀹屾垚" } def houseMatch(filePath){ @@ -357,7 +357,7 @@ class MapDistrictProcess { ExcelUtils.multiThreadingModify(filePath, { row -> if(row['W']) { def rMap = FlagProcess.addDataFlagByHouseCount(row['J'], row['K'], row['L'], row['G'], row['F'], row['N']) - if(row['W']=="写字楼"){ + if(row['W']=="鍐欏瓧妤�"){ if(row['I']){ if(row['I'].toString().startsWith("2")){ row['I'] = 15 @@ -376,7 +376,7 @@ class MapDistrictProcess { if(row['N']>0){ row['I'] = 25 }else{ - if(row['E']!='商务住宅;商务住宅相关;商务住宅相关'){ + if(row['E']!='鍟嗗姟浣忓畢;鍟嗗姟浣忓畢鐩稿叧;鍟嗗姟浣忓畢鐩稿叧'){ row['I'] = 25 } } @@ -398,7 +398,7 @@ class MapDistrictProcess { row['I'] = 24 } }else if(!row['I'] && row['J'] && row['Y']==0){ - if(row['E']!='商务住宅;商务住宅相关;商务住宅相关'){ + if(row['E']!='鍟嗗姟浣忓畢;鍟嗗姟浣忓畢鐩稿叧;鍟嗗姟浣忓畢鐩稿叧'){ row['I'] = 26 } } @@ -413,19 +413,19 @@ class MapDistrictProcess { if(name.toString().length()>=3 && name.toString().length()<=10){ score = score + 2; } - def keys = ["家属院","小区","公寓","别墅"] + def keys = ["瀹跺睘闄�","灏忓尯","鍏瘬","鍒"] for(def key : keys){ if(name.toString().endsWith(key) && name!=key){ score = score + 4; } } - def s1 = DataUtil.match(name, Pattern.compile("[一|二|三|四|五|六|七|八|九|十|十一|十二|十三|十四|十五|十六|十七|十八|\\w+](期|区)\$")) + def s1 = DataUtil.match(name, Pattern.compile("[涓�|浜寍涓墊鍥泑浜攟鍏瓅涓億鍏珅涔潀鍗亅鍗佷竴|鍗佷簩|鍗佷笁|鍗佸洓|鍗佷簲|鍗佸叚|鍗佷竷|鍗佸叓|\\w+](鏈焲鍖�)\$")) if(s1){ score = score + 2; } - def keys2 = ["国际","商厦","广场"] + def keys2 = ["鍥介檯","鍟嗗帵","骞垮満"] for(def key : keys2){ if(name.toString().endsWith(key) && name!=key){ score = score - 2; @@ -437,7 +437,7 @@ class MapDistrictProcess { def updateRegion(){ - def filePath = "D:\\数据\\小区\\地图\\东莞.xlsx"; + def filePath = "D:\\鏁版嵁\\灏忓尯\\鍦板浘\\涓滆帪.xlsx"; ExcelUtils.multiThreadingModify(filePath, { row -> def region = getRegionByLocation(row['F'], row['G']); if(region){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/MapMatchProcess.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/MapMatchProcess.groovy index b24dce5fe..d7d829117 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/MapMatchProcess.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/MapMatchProcess.groovy @@ -12,7 +12,7 @@ class MapMatchBatchProcess { } def run(){ def index = 0; - def filePath = "D:\\数据\\小区\\苏州.xlsx" + def filePath = "D:\\鏁版嵁\\灏忓尯\\鑻忓窞.xlsx" ExcelUtils.multiThreadingModify(filePath, { row -> index ++ @@ -21,7 +21,7 @@ class MapMatchBatchProcess { def name = row['C'] def addr = row['D'] if(index < 101){ - def gdData = FangjiaClientUtils.getMapData(city, region, name, addr,"", "高德") + def gdData = FangjiaClientUtils.getMapData(city, region, name, addr,"", "楂樺痉") if(gdData){ row['E'] = gdData.district row['F'] = gdData.name @@ -32,7 +32,7 @@ class MapMatchBatchProcess { row['K'] = gdData.lat } - def bdData = FangjiaClientUtils.getMapData(city, region, name, addr,"", "百度") + def bdData = FangjiaClientUtils.getMapData(city, region, name, addr,"", "鐧惧害") if(bdData){ row['L'] = bdData.district row['M'] = bdData.name diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/NameProcess.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/NameProcess.groovy index ce0a23406..59846b73f 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/NameProcess.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/NameProcess.groovy @@ -7,9 +7,9 @@ import java.util.regex.Pattern class NameProcess { static def filterName(def name){ - def keys = ["散盘","办公楼","写字楼","商务","家居建材","商贸城","服装城","科技园","删除","五金","购物广场","物流园","文化教育","材料城","充电站","产业园","商业中心","办公大楼","工业","机械城","孵化","体验中心","投诉站","接送点","文化站","创业","办公中心","自编","创新","科技","实业园","管理处","百货","展园","展厅","软件园","基地","学生","青年","女生","学生宿舍","单身","办公室","值班室","服务站","酒店宿舍","男生","地块","租房","临时","大门","农业园","装修","摆件","展示","发展中心","商业广场","运营中心","店铺","筹备组","车场","厂家","培训","号门","管理科","招商处","展点","住院楼","家禽","捐赠","群租","招租","软装","生活广场","直购","员工","理赔","互助","赠品","图片","男宿舍","招租","站点","卸货","购物","大学","消火栓","集散地","过渡房","多肉","等候","租","商铺","家庭式","地产","宾馆","共享","人才","创意","轰趴","会所","不动产","美丽","精装","专区","下客点","办公","设计","汽车","垃圾","圆床房","白领","厂房","水果","专家","的","人员","自如","影吧","物业","会展","文明楼","工房","示范","宣传","老年","妇女","沐浴","蔬果","敬老","棋牌","房产","公益","碧波庭","高层","服务","居民","英才","职工公寓","职工之家","风情园","中心","项目","门卫","客栈","底商","美团","空间","无人机","国际广场","智慧社区","食品","排","交口","爱心", - "养老","集贸","保安","建筑工人","单位宿舍","工程","演员","二人转","建工","兵营","供应","土产","学员","职工","门口","欢迎","车棚","宝宝","陵园","登记处","植物","驿站","自助","书","女子","健康","营业","扎啤","创客","电子广场","村民安置房","办事处生活区","萌宠","啤酒","高档","回迁楼","品茶","公司宿舍","置业","明星","家庭","老区","新区","单元","居民点","救助站","公司宿舍","梦想","公司职工宿舍","公司职工住宅楼","单位房","平安","文明社区","书院","丝绸","旧区","建材城","栋宿舍","吉宅","女人城","疾控","医院","易初莲花","发展","魔方","轻纺城","合作","外贸","嬉空间","优+","医生","康乃馨","总部","网格站","私人定制","家装","换新家","仓库","防盗","客运站","蔬菜","旁","爱情","菜场","套","商场","公寓房","守望点","硕士","佛庵","组团","区宿舍","妇幼","英才","血站","女儿","环卫","贸易城","平房","公安","物流","管理","理想","商业城","留医部","劳动","医药","团校","聚贤","豪华","电梯","超豪","恋家","地铁","法院","高级公寓","温馨","安全文明","精英","教师村","旧村改造","私宅","楼群","老师楼","敬业","佳缘","保障性住房","自建房","群众","度假","政府住宅","乘务","科教","房改房","豪宅","移民","艺校","运管处","校区","教委楼","学区","教师公寓","记者站","温泉","旅店","防疫站","园区","扶贫","按摩","文化中心","居委会", "限价房","看房", - "合伙人","中学公寓","海景房","儿童","花艺","乐乐家","招收","商业","研究生","教师","旅游","精洗","物管区","律师","果蔬","文化室","休闲广场","集资房","精神家园","红星美凯龙","雅居","高中","球室","世华易居","住院综合楼","养生"] + def keys = ["鏁g洏","鍔炲叕妤�","鍐欏瓧妤�","鍟嗗姟","瀹跺眳寤烘潗","鍟嗚锤鍩�","鏈嶈鍩�","绉戞妧鍥�","鍒犻櫎","浜旈噾","璐墿骞垮満","鐗╂祦鍥�","鏂囧寲鏁欒偛","鏉愭枡鍩�","鍏呯數绔�","浜т笟鍥�","鍟嗕笟涓績","鍔炲叕澶фゼ","宸ヤ笟","鏈烘鍩�","瀛靛寲","浣撻獙涓績","鎶曡瘔绔�","鎺ラ�佺偣","鏂囧寲绔�","鍒涗笟","鍔炲叕涓績","鑷紪","鍒涙柊","绉戞妧","瀹炰笟鍥�","绠$悊澶�","鐧捐揣","灞曞洯","灞曞巺","杞欢鍥�","鍩哄湴","瀛︾敓","闈掑勾","濂崇敓","瀛︾敓瀹胯垗","鍗曡韩","鍔炲叕瀹�","鍊肩彮瀹�","鏈嶅姟绔�","閰掑簵瀹胯垗","鐢风敓","鍦板潡","绉熸埧","涓存椂","澶ч棬","鍐滀笟鍥�","瑁呬慨","鎽嗕欢","灞曠ず","鍙戝睍涓績","鍟嗕笟骞垮満","杩愯惀涓績","搴楅摵","绛瑰缁�","杞﹀満","鍘傚","鍩硅","鍙烽棬","绠$悊绉�","鎷涘晢澶�","灞曠偣","浣忛櫌妤�","瀹剁","鎹愯禒","缇ょ","鎷涚","杞","鐢熸椿骞垮満","鐩磋喘","鍛樺伐","鐞嗚禂","浜掑姪","璧犲搧","鍥剧墖","鐢峰鑸�","鎷涚","绔欑偣","鍗歌揣","璐墿","澶у","娑堢伀鏍�","闆嗘暎鍦�","杩囨浮鎴�","澶氳倝","绛夊��","绉�","鍟嗛摵","瀹跺涵寮�","鍦颁骇","瀹鹃","鍏变韩","浜烘墠","鍒涙剰","杞拌洞","浼氭墍","涓嶅姩浜�","缇庝附","绮捐","涓撳尯","涓嬪鐐�","鍔炲叕","璁捐","姹借溅","鍨冨溇","鍦嗗簥鎴�","鐧介","鍘傛埧","姘存灉","涓撳","鐨�","浜哄憳","鑷","褰卞惂","鐗╀笟","浼氬睍","鏂囨槑妤�","宸ユ埧","绀鸿寖","瀹d紶","鑰佸勾","濡囧コ","娌愭荡","钄灉","鏁��","妫嬬墝","鎴夸骇","鍏泭","纰ф尝搴�","楂樺眰","鏈嶅姟","灞呮皯","鑻辨墠","鑱屽伐鍏瘬","鑱屽伐涔嬪","椋庢儏鍥�","涓績","椤圭洰","闂ㄥ崼","瀹㈡爤","搴曞晢","缇庡洟","绌洪棿","鏃犱汉鏈�","鍥介檯骞垮満","鏅烘収绀惧尯","椋熷搧","鎺�","浜ゅ彛","鐖卞績", + "鍏昏��","闆嗚锤","淇濆畨","寤虹瓚宸ヤ汉","鍗曚綅瀹胯垗","宸ョ▼","婕斿憳","浜屼汉杞�","寤哄伐","鍏佃惀","渚涘簲","鍦熶骇","瀛﹀憳","鑱屽伐","闂ㄥ彛","娆㈣繋","杞︽","瀹濆疂","闄靛洯","鐧昏澶�","妞嶇墿","椹跨珯","鑷姪","涔�","濂冲瓙","鍋ュ悍","钀ヤ笟","鎵庡暏","鍒涘","鐢靛瓙骞垮満","鏉戞皯瀹夌疆鎴�","鍔炰簨澶勭敓娲诲尯","钀屽疇","鍟ら厭","楂樻。","鍥炶縼妤�","鍝佽尪","鍏徃瀹胯垗","缃笟","鏄庢槦","瀹跺涵","鑰佸尯","鏂板尯","鍗曞厓","灞呮皯鐐�","鏁戝姪绔�","鍏徃瀹胯垗","姊︽兂","鍏徃鑱屽伐瀹胯垗","鍏徃鑱屽伐浣忓畢妤�","鍗曚綅鎴�","骞冲畨","鏂囨槑绀惧尯","涔﹂櫌","涓濈桓","鏃у尯","寤烘潗鍩�","鏍嬪鑸�","鍚夊畢","濂充汉鍩�","鐤炬帶","鍖婚櫌","鏄撳垵鑾茶姳","鍙戝睍","榄旀柟","杞荤汉鍩�","鍚堜綔","澶栬锤","瀣夌┖闂�","浼�+","鍖荤敓","搴蜂箖棣�","鎬婚儴","缃戞牸绔�","绉佷汉瀹氬埗","瀹惰","鎹㈡柊瀹�","浠撳簱","闃茬洍","瀹㈣繍绔�","钄彍","鏃�","鐖辨儏","鑿滃満","濂�","鍟嗗満","鍏瘬鎴�","瀹堟湜鐐�","纭曞+","浣涘旱","缁勫洟","鍖哄鑸�","濡囧辜","鑻辨墠","琛�绔�","濂冲効","鐜崼","璐告槗鍩�","骞虫埧","鍏畨","鐗╂祦","绠$悊","鐞嗘兂","鍟嗕笟鍩�","鐣欏尰閮�","鍔冲姩","鍖昏嵂","鍥㈡牎","鑱氳搐","璞崕","鐢垫","瓒呰豹","鎭嬪","鍦伴搧","娉曢櫌","楂樼骇鍏瘬","娓╅Θ","瀹夊叏鏂囨槑","绮捐嫳","鏁欏笀鏉�","鏃ф潙鏀归��","绉佸畢","妤肩兢","鑰佸笀妤�","鏁笟","浣崇紭","淇濋殰鎬т綇鎴�","鑷缓鎴�","缇や紬","搴﹀亣","鏀垮簻浣忓畢","涔樺姟","绉戞暀","鎴挎敼鎴�","璞畢","绉绘皯","鑹烘牎","杩愮澶�","鏍″尯","鏁欏妤�","瀛﹀尯","鏁欏笀鍏瘬","璁拌�呯珯","娓╂硥","鏃呭簵","闃茬柅绔�","鍥尯","鎵惰传","鎸夋懇","鏂囧寲涓績","灞呭浼�", "闄愪环鎴�","鐪嬫埧", + "鍚堜紮浜�","涓鍏瘬","娴锋櫙鎴�","鍎跨","鑺辫壓","涔愪箰瀹�","鎷涙敹","鍟嗕笟","鐮旂┒鐢�","鏁欏笀","鏃呮父","绮炬礂","鐗╃鍖�","寰嬪笀","鏋滆敩","鏂囧寲瀹�","浼戦棽骞垮満","闆嗚祫鎴�","绮剧瀹跺洯","绾㈡槦缇庡嚡榫�","闆呭眳","楂樹腑","鐞冨","涓栧崕鏄撳眳","浣忛櫌缁煎悎妤�","鍏荤敓"] def isAdd = true; for(def key : keys){ if(name.contains(key)){ @@ -19,7 +19,7 @@ class NameProcess { } if(isAdd){ - def endKeys = ["路","街","店","酒店","汽车城","五金城","机电城","装饰城","材料城","农贸","商城","工业区","家居广场","家居生活中心","服务中心","创新中心","科创中心","财智中心","金融中心","创投中心","外包中心","创业大厦","度假","商写楼","塑化城","材料城","礼品城","汽车用品城","汽配城","市场","批发","文创园","交易中心","服装中心","科技中心","科创园","工业园","创业园","度假区","科创谷","旅游城","食品城","工业坊","百货","商贸广场","采购中心","购物中心","小学","教学楼","学区房","有限公司","电力站","模具城","装饰","数码广场","教师楼","茶城","建材家居","物流城","器材广场","贸易中心","商品城","建材广场","商贸街","绣品街","学生","高层","养生谷","度假项目","工程","度假村","度假区","早市","少儿","药铺","温馨","单间","公司住宅","公司宿舍","校宿舍","格格","茶叶","人行门","学校","公司"] + def endKeys = ["璺�","琛�","搴�","閰掑簵","姹借溅鍩�","浜旈噾鍩�","鏈虹數鍩�","瑁呴グ鍩�","鏉愭枡鍩�","鍐滆锤","鍟嗗煄","宸ヤ笟鍖�","瀹跺眳骞垮満","瀹跺眳鐢熸椿涓績","鏈嶅姟涓績","鍒涙柊涓績","绉戝垱涓績","璐㈡櫤涓績","閲戣瀺涓績","鍒涙姇涓績","澶栧寘涓績","鍒涗笟澶у帵","搴﹀亣","鍟嗗啓妤�","濉戝寲鍩�","鏉愭枡鍩�","绀煎搧鍩�","姹借溅鐢ㄥ搧鍩�","姹介厤鍩�","甯傚満","鎵瑰彂","鏂囧垱鍥�","浜ゆ槗涓績","鏈嶈涓績","绉戞妧涓績","绉戝垱鍥�","宸ヤ笟鍥�","鍒涗笟鍥�","搴﹀亣鍖�","绉戝垱璋�","鏃呮父鍩�","椋熷搧鍩�","宸ヤ笟鍧�","鐧捐揣","鍟嗚锤骞垮満","閲囪喘涓績","璐墿涓績","灏忓","鏁欏妤�","瀛﹀尯鎴�","鏈夐檺鍏徃","鐢靛姏绔�","妯″叿鍩�","瑁呴グ","鏁扮爜骞垮満","鏁欏笀妤�","鑼跺煄","寤烘潗瀹跺眳","鐗╂祦鍩�","鍣ㄦ潗骞垮満","璐告槗涓績","鍟嗗搧鍩�","寤烘潗骞垮満","鍟嗚锤琛�","缁e搧琛�","瀛︾敓","楂樺眰","鍏荤敓璋�","搴﹀亣椤圭洰","宸ョ▼","搴﹀亣鏉�","搴﹀亣鍖�","鏃╁競","灏戝効","鑽摵","娓╅Θ","鍗曢棿","鍏徃浣忓畢","鍏徃瀹胯垗","鏍″鑸�","鏍兼牸","鑼跺彾","浜鸿闂�","瀛︽牎","鍏徃"] for(def key : endKeys){ if(name.toString().endsWith(key)){ isAdd = false; @@ -29,7 +29,7 @@ class NameProcess { } if(isAdd){ - def startKeys = ["FQ","社区"] + def startKeys = ["FQ","绀惧尯"] for(def key : startKeys){ if(name.toString().endsWith(key)||name.toString().startsWith(key)){ isAdd = false; @@ -38,7 +38,7 @@ class NameProcess { } } if(isAdd){ - def strs = ["碧桂园","雅居乐","满庭芳","综合商住楼","教育宿舍","生活小区","市政院","公交小区","搬迁小区","家属楼","商业小区","委宿舍","人行宿舍","工人宿舍","教师公寓","教师宿舍","顺心居","小花园","医药宿舍","商住小区","统建楼","农民","供销楼","温馨楼","星期","党校","统建楼","惜缘","改造","国际城","好客来","商业大楼","一二期","市政楼","非小区","高中","建委楼","商业社区","双建委","教育小区","饭店","建安处","开发区","生活区","和社区","家属院","经济适用房", "家属宿舍楼","卫生生活区"] + def strs = ["纰ф鍥�","闆呭眳涔�","婊″涵鑺�","缁煎悎鍟嗕綇妤�","鏁欒偛瀹胯垗","鐢熸椿灏忓尯","甯傛斂闄�","鍏氦灏忓尯","鎼縼灏忓尯","瀹跺睘妤�","鍟嗕笟灏忓尯","濮斿鑸�","浜鸿瀹胯垗","宸ヤ汉瀹胯垗","鏁欏笀鍏瘬","鏁欏笀瀹胯垗","椤哄績灞�","灏忚姳鍥�","鍖昏嵂瀹胯垗","鍟嗕綇灏忓尯","缁熷缓妤�","鍐滄皯","渚涢攢妤�","娓╅Θ妤�","鏄熸湡","鍏氭牎","缁熷缓妤�","鎯滅紭","鏀归��","鍥介檯鍩�","濂藉鏉�","鍟嗕笟澶фゼ","涓�浜屾湡","甯傛斂妤�","闈炲皬鍖�","楂樹腑","寤哄妤�","鍟嗕笟绀惧尯","鍙屽缓濮�","鏁欒偛灏忓尯","楗簵","寤哄畨澶�","寮�鍙戝尯","鐢熸椿鍖�","鍜岀ぞ鍖�","瀹跺睘闄�","缁忔祹閫傜敤鎴�", "瀹跺睘瀹胯垗妤�","鍗敓鐢熸椿鍖�"] for(def str : strs){ if(str == name){ isAdd = false; @@ -53,34 +53,34 @@ class NameProcess { static def nameStandard(def city, def region, def name){ if(name.contains("(") && name.contains(")")){ def newName = name.substring(name.indexOf("("), name.indexOf(")")+1) - if(newName && (newName.contains("路")||newName.contains("街")||newName.contains("大道") || newName.contains("站") || newName.contains("门"))){ + if(newName && (newName.contains("璺�")||newName.contains("琛�")||newName.contains("澶ч亾") || newName.contains("绔�") || newName.contains("闂�"))){ name = name.replace(newName, "") } } - //.replace("院小区","小区")replace("号小区","号")..replace("号院","号").replace("号住宅区","号") + //.replace("闄㈠皬鍖�","灏忓尯")replace("鍙峰皬鍖�","鍙�")..replace("鍙烽櫌","鍙�").replace("鍙蜂綇瀹呭尯","鍙�") name = name.replace("?","").replace("&",""). - replace("·","").replace(".","").replace("(",""). - replace(")","").replace("(","").replace(")",""). - replace("【","").replace("】","").replace("11期","十一期").replace("12期","十二期").replace("13期","十三期").replace("14期","十四期").replace("15期","十五期").replace("16期","十六期").replace("17期","十七期").replace("18期","十八期").replace("19期","十九期").replace("10期","十期").replace("1期","一期").replace("2期","二期").replace("3期","三期").replace("4期","四期").replace("5期","五期").replace("6期","六期").replace("7期","七期").replace("8期","八期").replace("9期","九期").replace(" ","").replace("Ⅰ","").trim() - name = name.replace("(建设中)","").replace("售楼中心","").replace("销售中心","").replace("营销中心","").replace("接待处","").replace("售楼部","").replace("房产销售","").replace("售楼处","").replace("销售部","").replace("商品房","") - if(name && name.contains("区")){ - def s0 = DataUtil.match(name, Pattern.compile("[a-zA-Z]\\d+区")) + replace("路","").replace(".","").replace("锛�",""). + replace("锛�","").replace("(","").replace(")",""). + replace("銆�","").replace("銆�","").replace("11鏈�","鍗佷竴鏈�").replace("12鏈�","鍗佷簩鏈�").replace("13鏈�","鍗佷笁鏈�").replace("14鏈�","鍗佸洓鏈�").replace("15鏈�","鍗佷簲鏈�").replace("16鏈�","鍗佸叚鏈�").replace("17鏈�","鍗佷竷鏈�").replace("18鏈�","鍗佸叓鏈�").replace("19鏈�","鍗佷節鏈�").replace("10鏈�","鍗佹湡").replace("1鏈�","涓�鏈�").replace("2鏈�","浜屾湡").replace("3鏈�","涓夋湡").replace("4鏈�","鍥涙湡").replace("5鏈�","浜旀湡").replace("6鏈�","鍏湡").replace("7鏈�","涓冩湡").replace("8鏈�","鍏湡").replace("9鏈�","涔濇湡").replace(" ","").replace("鈪�","").trim() + name = name.replace("(寤鸿涓�)","").replace("鍞ゼ涓績","").replace("閿�鍞腑蹇�","").replace("钀ラ攢涓績","").replace("鎺ュ緟澶�","").replace("鍞ゼ閮�","").replace("鎴夸骇閿�鍞�","").replace("鍞ゼ澶�","").replace("閿�鍞儴","").replace("鍟嗗搧鎴�","") + if(name && name.contains("鍖�")){ + def s0 = DataUtil.match(name, Pattern.compile("[a-zA-Z]\\d+鍖�")) if(!s0){ - s0 = DataUtil.match(name, Pattern.compile("\\d+区")) + s0 = DataUtil.match(name, Pattern.compile("\\d+鍖�")) if(s0){ - name = name.replace("11区","十一区").replace("12区","十二区").replace("13区","十三区").replace("14区","十四区").replace("15区","十五区").replace("16区","十六区").replace("17区","十七区").replace("18区","十八区").replace("19区","十九区").replace("10区","十区").replace("1区","一区").replace("2区","二区").replace("3区","三区").replace("4区","四区").replace("5区","五区").replace("6区","六区").replace("7区","七区").replace("8区","八区").replace("9区","九区") + name = name.replace("11鍖�","鍗佷竴鍖�").replace("12鍖�","鍗佷簩鍖�").replace("13鍖�","鍗佷笁鍖�").replace("14鍖�","鍗佸洓鍖�").replace("15鍖�","鍗佷簲鍖�").replace("16鍖�","鍗佸叚鍖�").replace("17鍖�","鍗佷竷鍖�").replace("18鍖�","鍗佸叓鍖�").replace("19鍖�","鍗佷節鍖�").replace("10鍖�","鍗佸尯").replace("1鍖�","涓�鍖�").replace("2鍖�","浜屽尯").replace("3鍖�","涓夊尯").replace("4鍖�","鍥涘尯").replace("5鍖�","浜斿尯").replace("6鍖�","鍏尯").replace("7鍖�","涓冨尯").replace("8鍖�","鍏尯").replace("9鍖�","涔濆尯") } } } - if(name.contains("幢")){ + if(name.contains("骞�")){ name = name.replace("-",""); - name = name.replaceAll("\\w+-?\\w+(幢)", "").replaceAll("(\\w+,)?+\\w+(幢)", "") + name = name.replaceAll("\\w+-?\\w+(骞�)", "").replaceAll("(\\w+,)?+\\w+(骞�)", "") } - if(name.endsWith("座")){ - name = name.replaceAll("\\w+-?\\w+座", "").replaceAll("-?\\w+座", "") + if(name.endsWith("搴�")){ + name = name.replaceAll("\\w+-?\\w+搴�", "").replaceAll("-?\\w+搴�", "") } - if(name.endsWith("栋")){ - name = name.replaceAll("\\w+-?\\w+栋", "").replaceAll("\\w+(栋)?-\\w+", "").replaceAll("-?\\w+栋", "") + if(name.endsWith("鏍�")){ + name = name.replaceAll("\\w+-?\\w+鏍�", "").replaceAll("\\w+(鏍�)?-\\w+", "").replaceAll("-?\\w+鏍�", "") } @@ -98,37 +98,37 @@ class NameProcess { } if(name){ - name = name.replaceAll("\\d+(栋|号楼|组|幢)-?\\d+(单元)?", "").replaceAll("-?\\d+单元", "") - name = name.replaceAll("(一|二|三|四|五|六|七|八)(栋|号楼|组|幢)(一|二)?(单元)?","") - name = name.replaceAll("-?\\w+(栋楼|号综合楼|号楼|栋付|号商住楼|号楼附|楼|馆|号公寓)","") - name = name.replaceAll("(南|北)楼\$","") + name = name.replaceAll("\\d+(鏍媩鍙锋ゼ|缁剕骞�)-?\\d+(鍗曞厓)?", "").replaceAll("-?\\d+鍗曞厓", "") + name = name.replaceAll("(涓�|浜寍涓墊鍥泑浜攟鍏瓅涓億鍏�)(鏍媩鍙锋ゼ|缁剕骞�)(涓�|浜�)?(鍗曞厓)?","") + name = name.replaceAll("-?\\w+(鏍嬫ゼ|鍙风患鍚堟ゼ|鍙锋ゼ|鏍嬩粯|鍙峰晢浣忔ゼ|鍙锋ゼ闄剕妤紎棣唡鍙峰叕瀵�)","") + name = name.replaceAll("(鍗梶鍖�)妤糪$","") } - if(name && (!name.endsWith("号") && !name.endsWith("弄") && !name.endsWith("弄小区"))){ - def tname = name.replaceAll(".*(路|弄)\\d+(楼)?", "") - if(tname && !tname.toString().startsWith("号")){ + if(name && (!name.endsWith("鍙�") && !name.endsWith("寮�") && !name.endsWith("寮勫皬鍖�"))){ + def tname = name.replaceAll(".*(璺瘄寮�)\\d+(妤�)?", "") + if(tname && !tname.toString().startsWith("鍙�")){ name = tname; } } - if(name && !name.contains("路") && !name.contains("街") && !name.contains("大道") && !name.contains("巷")){ - def h1 = DataUtil.match(name, Pattern.compile("(\\w+)?-?\\w+(排)")) + if(name && !name.contains("璺�") && !name.contains("琛�") && !name.contains("澶ч亾") && !name.contains("宸�")){ + def h1 = DataUtil.match(name, Pattern.compile("(\\w+)?-?\\w+(鎺�)")) if(h1){ name = name.replaceAll(h1,"") } - }else if(name && (!name.contains("路") || !name.contains("街") || !name.contains("道") || !name.contains("巷"))){ - s1 = DataUtil.match(name, Pattern.compile("(路|街|大道|巷)\\d+\$")) + }else if(name && (!name.contains("璺�") || !name.contains("琛�") || !name.contains("閬�") || !name.contains("宸�"))){ + s1 = DataUtil.match(name, Pattern.compile("(璺瘄琛梶澶ч亾|宸�)\\d+\$")) if(s1){ return null } } if(name){ - def s2 = DataUtil.match(name, Pattern.compile("\\d+室")) + def s2 = DataUtil.match(name, Pattern.compile("\\d+瀹�")) if(s2){ name = name.replaceAll(s2,"") } } - if(name && !name.contains("家属院") && !name.contains("家属楼") && !name.contains("住宅楼")){ - def s3 = DataUtil.match(name, Pattern.compile("(大学|学院|职业技术|学校|酒店|师大|技校|技检).*?(楼|宿|舍|研究院|公寓)")) + if(name && !name.contains("瀹跺睘闄�") && !name.contains("瀹跺睘妤�") && !name.contains("浣忓畢妤�")){ + def s3 = DataUtil.match(name, Pattern.compile("(澶у|瀛﹂櫌|鑱屼笟鎶�鏈瘄瀛︽牎|閰掑簵|甯堝ぇ|鎶�鏍鎶�妫�).*?(妤紎瀹縷鑸峾鐮旂┒闄鍏瘬)")) if(s3){ return null } @@ -136,55 +136,55 @@ class NameProcess { if(!name){ return null } -// if(region && region.endsWith("区")){ -// def newRegion = region.replace("区","") +// if(region && region.endsWith("鍖�")){ +// def newRegion = region.replace("鍖�","") // if(newRegion.length()!=1){ // region = newRegion // } // } // if(city && name.toString().startsWith(city)){ -// def newName = name.replace(city+"市", "").replace(city, "") -// if(!["花园"].contains(newName)){ +// def newName = name.replace(city+"甯�", "").replace(city, "") +// if(!["鑺卞洯"].contains(newName)){ // name = newName // } // } // -// if(region && region.endsWith("市")){ -// def newRegion = region.replace("市","") +// if(region && region.endsWith("甯�")){ +// def newRegion = region.replace("甯�","") // if(newRegion.length()!=1){ // region = newRegion // } // } -// if(region && (name.toString().endsWith(region) || name.toString().startsWith(region) || name.toString().endsWith(region+"市") || name.toString().endsWith(region+"区"))){ -// def tname = name.replace(region+"市", "").replace(region+"区", "").replace(region+"县", "").replace(region, "").trim() -// if(tname && tname.size()>2 && !tname.startsWith("大道") && !tname.startsWith("路") && !tname.startsWith("街") ){ +// if(region && (name.toString().endsWith(region) || name.toString().startsWith(region) || name.toString().endsWith(region+"甯�") || name.toString().endsWith(region+"鍖�"))){ +// def tname = name.replace(region+"甯�", "").replace(region+"鍖�", "").replace(region+"鍘�", "").replace(region, "").trim() +// if(tname && tname.size()>2 && !tname.startsWith("澶ч亾") && !tname.startsWith("璺�") && !tname.startsWith("琛�") ){ // name = tname; // } // } - if(name && (name.toString().contains("ΜΟΜΛ")|| name.toString().contains("MOMΛ"))){ - name = name.replace("ΜΟΜΛ", "MOMA").replace("MOMΛ", "MOMA") - }else if(name && name.contains("Ⅴ")){ - name = name.replace("Ⅴ", "V") + if(name && (name.toString().contains("螠螣螠螞")|| name.toString().contains("MOM螞"))){ + name = name.replace("螠螣螠螞", "MOMA").replace("MOM螞", "MOMA") + }else if(name && name.contains("鈪�")){ + name = name.replace("鈪�", "V") } if(name){ - if(["花园"].contains(name)){ + if(["鑺卞洯"].contains(name)){ return null } - if((name.endsWith("村") || name.endsWith("街"))&& name.size()<=3){ + if((name.endsWith("鏉�") || name.endsWith("琛�"))&& name.size()<=3){ return null } - //|| name.endsWith("组") - if(name.endsWith("电梯")||name.endsWith("大道")||name.endsWith("厂") || name.endsWith("条")){ + //|| name.endsWith("缁�") + if(name.endsWith("鐢垫")||name.endsWith("澶ч亾")||name.endsWith("鍘�") || name.endsWith("鏉�")){ return null } - if(name.contains("、")||name.contains("|")||name.contains(".")){ + if(name.contains("銆�")||name.contains("|")||name.contains(".")){ return null } } - if(name && name.contains("楼")){ - def h1 = DataUtil.match(name, Pattern.compile("\\d+(座)?楼(\\d+)?")) + if(name && name.contains("妤�")){ + def h1 = DataUtil.match(name, Pattern.compile("\\d+(搴�)?妤�(\\d+)?")) if(h1){ name = name.replaceAll(h1,"") } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/NlpProcess.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/NlpProcess.groovy index 0f5da25b1..4cb66b491 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/NlpProcess.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/NlpProcess.groovy @@ -87,7 +87,7 @@ class NlpProcess { } if(gdType){ - if(gdType.contains("住宅区") || gdType.contains("商务住宅") || gdType.contains("临街院门") ){ + if(gdType.contains("浣忓畢鍖�") || gdType.contains("鍟嗗姟浣忓畢") || gdType.contains("涓磋闄㈤棬") ){ gdScore = gdScore + 0.3; } } @@ -105,7 +105,7 @@ class NlpProcess { } if(bdType){ - if(bdType.contains("房地产")){ + if(bdType.contains("鎴垮湴浜�")){ gdScore = gdScore + 0.3; } } @@ -116,8 +116,8 @@ class NlpProcess { if(gdScore && bdScore){ if(gdScore>bdScore && gdScore>0.6){ - if(gdType.contains("别墅")){ - estateType = "别墅" + if(gdType.contains("鍒")){ + estateType = "鍒" } rMap.flag = 222 rMap.address = FlagProcess.getBestAddress(city, address, gdAddress, null); @@ -125,8 +125,8 @@ class NlpProcess { rMap.gdLat = gdLat rMap.gdLng = gdLng }else if(gdScore0.6){ - if(gdType.contains("别墅")){ - estateType = "别墅" + if(gdType.contains("鍒")){ + estateType = "鍒" } rMap.flag = 222 rMap.address = FlagProcess.getBestAddress(city, address, null, bdAddress); @@ -135,8 +135,8 @@ class NlpProcess { rMap.bdLng = bdLng } }else if(gdScore && gdScore>0.6){ - if(gdType.contains("别墅")){ - estateType = "别墅" + if(gdType.contains("鍒")){ + estateType = "鍒" } rMap.flag = 222 rMap.address = FlagProcess.getBestAddress(city, address, gdAddress, null); @@ -144,8 +144,8 @@ class NlpProcess { rMap.gdLat = gdLat rMap.gdLng = gdLng }else if(bdScore && bdScore>0.6){ - if(gdType.contains("别墅")){ - estateType = "别墅" + if(gdType.contains("鍒")){ + estateType = "鍒" } rMap.flag = 222 rMap.address = FlagProcess.getBestAddress(city, address, null, bdAddress); @@ -236,11 +236,11 @@ class NlpProcess { } if(gdType){ - if(gdType.contains("住宅区") || gdType.contains("商住两用") || gdType.contains("商务住宅相关") || gdType.contains("临街院门") ){ + if(gdType.contains("浣忓畢鍖�") || gdType.contains("鍟嗕綇涓ょ敤") || gdType.contains("鍟嗗姟浣忓畢鐩稿叧") || gdType.contains("涓磋闄㈤棬") ){ gdScore = gdScore + 0.3; - }else if(gdType.contains("购物")){ + }else if(gdType.contains("璐墿")){ gdScore = gdScore - 0.3; - }else if(gdType.contains("写字楼")){ + }else if(gdType.contains("鍐欏瓧妤�")){ gdScore = gdScore - 0.3; } } @@ -260,11 +260,11 @@ class NlpProcess { } if(bdType){ - if(bdType.contains("房地产")){ + if(bdType.contains("鎴垮湴浜�")){ bdScore = bdScore + 0.3; - }else if(bdType.contains("购物")){ + }else if(bdType.contains("璐墿")){ bdScore = bdScore - 0.3; - }else if(bdType.contains("写字楼")){ + }else if(bdType.contains("鍐欏瓧妤�")){ bdScore = bdScore - 0.3; } } @@ -275,8 +275,8 @@ class NlpProcess { if(gdScore && bdScore){ if(gdScore>bdScore && gdScore>0.6){ - if(gdType.contains("别墅")){ - estateType = "别墅" + if(gdType.contains("鍒")){ + estateType = "鍒" } rMap.flag = 222 rMap.address = FlagProcess.getBestAddress(city, address, gdAddress, null); @@ -284,8 +284,8 @@ class NlpProcess { rMap.gdLat = gdLat rMap.gdLng = gdLng }else if(gdScore0.6){ - if(gdType.contains("别墅")){ - estateType = "别墅" + if(gdType.contains("鍒")){ + estateType = "鍒" } rMap.flag = 222 rMap.address = FlagProcess.getBestAddress(city, address, null, bdAddress); @@ -296,8 +296,8 @@ class NlpProcess { rMap.flag = 111 } }else if(gdScore && gdScore>0.6){ - if(gdType.contains("别墅")){ - estateType = "别墅" + if(gdType.contains("鍒")){ + estateType = "鍒" } rMap.flag = 222 rMap.address = FlagProcess.getBestAddress(city, address, gdAddress, null); @@ -305,8 +305,8 @@ class NlpProcess { rMap.gdLat = gdLat rMap.gdLng = gdLng }else if(bdScore && bdScore>0.6){ - if(gdType.contains("别墅")){ - estateType = "别墅" + if(gdType.contains("鍒")){ + estateType = "鍒" } rMap.flag = 222 rMap.address = FlagProcess.getBestAddress(city, address, null, bdAddress); @@ -392,11 +392,11 @@ class NlpProcess { } if(bdType){ - if(bdType.contains("写字楼")){ + if(bdType.contains("鍐欏瓧妤�")){ bdScore = bdScore - 0.3; - }else if(bdType.contains("购物")){ + }else if(bdType.contains("璐墿")){ bdScore = bdScore - 0.3; - }else if(bdType.contains("房地产")){ + }else if(bdType.contains("鎴垮湴浜�")){ bdScore = bdScore + 0.3; } } @@ -427,7 +427,7 @@ class NlpProcess { static def pattern(def s){ - Pattern pattern = Pattern.compile("[\u4e00-\u9fa5]{2,4}[路|巷|街|弄|街道|大道|大街|巷子|公路|马路]+") + Pattern pattern = Pattern.compile("[\u4e00-\u9fa5]{2,4}[璺瘄宸穦琛梶寮剕琛楅亾|澶ч亾|澶ц|宸峰瓙|鍏矾|椹矾]+") def matcher = pattern.matcher(s) if(matcher.find()){ return matcher.group(); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/OfficeFieldAddBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/OfficeFieldAddBatch.groovy index 741193c36..7cbd3af80 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/OfficeFieldAddBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/OfficeFieldAddBatch.groovy @@ -19,15 +19,15 @@ import java.util.concurrent.ExecutorService import java.util.concurrent.Executors /** - * 写字楼字段填充入库(自动入库) + * 鍐欏瓧妤煎瓧娈靛~鍏呭叆搴擄紙鑷姩鍏ュ簱锛� */ @BatchOwner(Watcher.GaoJuan) class OfficeFieldAddBatch extends BaseBatch{ public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(10) - def sources = ["安居客app","办办网","房天下","中华写字楼", "点点租"] + def sources = ["瀹夊眳瀹pp","鍔炲姙缃�","鎴垮ぉ涓�","涓崕鍐欏瓧妤�", "鐐圭偣绉�"] - //type:租售类别 wall:外墙 + //type:绉熷敭绫诲埆 wall:澶栧 // def fieldsMap = ["elevators_count":"elevator_num","person_elevators_count":"elevator_num","goods_elevator_count":"elevator_num","block":"block", // "estate_type2":"property_type","estate_company":"property_company","estate_charge":"property_fee","all_area":"area", // "standard_area":"standard_area","sight":"open_area","build_area":"build_area","build_type":"build_type","total_floor":"total_floor", @@ -55,7 +55,7 @@ class OfficeFieldAddBatch extends BaseBatch{ @Override void process(Object args) { - def citys = ["深圳"]//CommonDatautils.findAllCity() + def citys = ["娣卞湷"]//CommonDatautils.findAllCity() def fields = fieldsMap.keySet() as List def analysRets = [] for(def c : citys){ @@ -88,12 +88,12 @@ class OfficeFieldAddBatch extends BaseBatch{ fields << "city" def fieldValueMap = [:] for(def esOffice : matchRets){ -// if(esOffice.name!="东方建富时尚广场"){ +// if(esOffice.name!="涓滄柟寤哄瘜鏃跺皻骞垮満"){ // continue // } def office = CommonDatautils.findNormalDistrict(esOffice.city, esOffice.region, esOffice.name, "office", fields) if(!office){ -// println c+" "+esOffice.name+" 不存在" +// println c+" "+esOffice.name+" 涓嶅瓨鍦�" continue } def newValues = strandField(c, office, esOffice, source) @@ -197,12 +197,12 @@ class OfficeFieldAddBatch extends BaseBatch{ if(seaweedfield == "elevators_count"){ newVal = FiledStrand.processElevators(esVal) } - if(seaweedfield == "person_elevators_count" && esVal.contains("客梯")){ - newVal = FiledStrand.processElevators(esVal.substring(esVal.indexOf("客梯"))) + if(seaweedfield == "person_elevators_count" && esVal.contains("瀹㈡")){ + newVal = FiledStrand.processElevators(esVal.substring(esVal.indexOf("瀹㈡"))) } - if(seaweedfield == "goods_elevator_count" && esVal.contains("货梯")){ - newVal = FiledStrand.processElevators(esVal.substring(esVal.indexOf("货梯"))) + if(seaweedfield == "goods_elevator_count" && esVal.contains("璐ф")){ + newVal = FiledStrand.processElevators(esVal.substring(esVal.indexOf("璐ф"))) } if(seaweedfield == "standard_height" || seaweedfield=="lobby_height" || seaweedfield=="clear_height"){ @@ -301,7 +301,7 @@ class OfficeFieldAddBatch extends BaseBatch{ def fieldTempProcess(){ - ExcelUtils.multiThreadingModify("D:\\数据\\数据建设\\写字楼\\写字楼待处理地址.xlsx",{d-> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\鏁版嵁寤鸿\\鍐欏瓧妤糪\鍐欏瓧妤煎緟澶勭悊鍦板潃.xlsx",{d-> BasicDBObject udata = new BasicDBObject() udata.put("m_date", new Date()) udata.put("address", d['F']) @@ -310,7 +310,7 @@ class OfficeFieldAddBatch extends BaseBatch{ } def deleteNotNormalOffice(){ - ExcelUtils.modify("D:\\数据\\数据建设\\写字楼\\需删除写字楼.xlsx",{d-> + ExcelUtils.modify("D:\\鏁版嵁\\鏁版嵁寤鸿\\鍐欏瓧妤糪\闇�鍒犻櫎鍐欏瓧妤�.xlsx",{d-> BasicDBObject udata = new BasicDBObject() udata.put("m_date", new Date()) udata.put("status", 1) 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 1be279a43..e87a29b93 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 @@ -26,7 +26,7 @@ import java.util.concurrent.atomic.AtomicLong import java.util.regex.Pattern /** - * 写字楼字段清洗入库(自动入库) + * 鍐欏瓧妤煎瓧娈垫竻娲楀叆搴擄紙鑷姩鍏ュ簱锛� */ @BatchOwner(Watcher.GaoJuan) class OfficeFieldCleanBatch extends BaseBatch{ @@ -37,18 +37,18 @@ class OfficeFieldCleanBatch extends BaseBatch{ "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表字段 + "parking_fee":"car_fee","elevators_count":"elevator_num","bay_area":"open_area","estate_type2":"property_type"]//key:seaweed琛ㄥ瓧娈� value:es琛ㄥ瓧娈� // - def sourceMap = ["安居客":"安居客app","房天下":"房天下","楼盘网":"楼盘网","办办网":"办办网","点点租":"点点租"] + def sourceMap = ["瀹夊眳瀹�":"瀹夊眳瀹pp","鎴垮ぉ涓�":"鎴垮ぉ涓�","妤肩洏缃�":"妤肩洏缃�","鍔炲姙缃�":"鍔炲姙缃�","鐐圭偣绉�":"鐐圭偣绉�"] - 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"] + 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","绔e伐鏃堕棿":"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") @@ -61,7 +61,7 @@ class OfficeFieldCleanBatch extends BaseBatch{ @Override void process(Object args) { -// def str = "1200平方/层,1067㎡,1650-1900平米" +// def str = "1200骞虫柟/灞�,1067銕★紝1650-1900骞崇背" // def citys = CommonDatautils.findAllCity().reverse() @@ -82,26 +82,26 @@ class OfficeFieldCleanBatch extends BaseBatch{ } def export(){ - def offices = CommonDatautils.findAllFiledDistrict("office", "上海") + 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 == "编号"){ + 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 << "是" + row << "鏄�" }else if(val==0){ - row << "否" + row << "鍚�" }else{ row << '' } @@ -118,16 +118,16 @@ class OfficeFieldCleanBatch extends BaseBatch{ rets << row } } - ExcelUtils.write("D:\\数据\\写字楼\\中远.xlsx",rets, "数据") + ExcelUtils.write("D:\\鏁版嵁\\鍐欏瓧妤糪\涓繙.xlsx",rets, "鏁版嵁") } def test(){ - def datas = ExcelUtils.read("D:\\数据\\写字楼\\写字楼价格(1).xlsx",0 , 1) + 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-> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\鍐欏瓧妤糪\涓繙.xlsx",{d-> def row = map.get(d['B']+"#"+d['C']+'#'+d['D']) d['F'] = row['F'] }) @@ -135,7 +135,7 @@ class OfficeFieldCleanBatch extends BaseBatch{ def updateErrorField(){ def offices = CommonDatautils.findAllDistrict("office", ["underground_car_site"]) -// def offices = CommonDatautils.findAllDistricts("上海","office", ["build_area"]) +// def offices = CommonDatautils.findAllDistricts("涓婃捣","office", ["build_area"]) def totalCount = new AtomicLong() final CountDownLatch latch = new CountDownLatch(offices.size()) @@ -246,8 +246,8 @@ class OfficeFieldCleanBatch extends BaseBatch{ } def newVal2 = null - if(o.elevators_count.contains("客梯")){ - newVal2 = FiledStrand.processElevators(o.elevators_count.toString().substring(o.elevators_count.indexOf("客梯"))) + if(o.elevators_count.contains("瀹㈡")){ + newVal2 = FiledStrand.processElevators(o.elevators_count.toString().substring(o.elevators_count.indexOf("瀹㈡"))) if(newVal2.toString()!=o.elevators_count){ println o._id.toString()+" old:"+o.elevators_count +" new:"+newVal2 udata.put("person_elevators_count", newVal2.toString()) @@ -255,8 +255,8 @@ class OfficeFieldCleanBatch extends BaseBatch{ } def newVal3 = null - if(o.elevators_count.contains("货梯")){ - newVal3 = FiledStrand.processElevators(o.elevators_count.toString().substring(o.elevators_count.indexOf("货梯"))) + if(o.elevators_count.contains("璐ф")){ + newVal3 = FiledStrand.processElevators(o.elevators_count.toString().substring(o.elevators_count.indexOf("璐ф"))) if(newVal3.toString()!=o.elevators_count){ println o._id.toString()+" old:"+o.elevators_count +" new:"+newVal3 udata.put("goods_elevator_count", newVal3.toString()) @@ -265,7 +265,7 @@ class OfficeFieldCleanBatch extends BaseBatch{ if(newVal2 && newVal3){ def total = newVal2.toInteger() + newVal3.toInteger() udata.put("elevators_count", total.toString()) - println o._id.toString()+" 总电梯:"+total + println o._id.toString()+" 鎬荤數姊�:"+total } } @@ -383,7 +383,7 @@ class OfficeFieldCleanBatch extends BaseBatch{ def addFieldValue(){ - def citys = ["上海"] + def citys = ["涓婃捣"] def analysRets = [] for(def c : citys){ def totalCount = CommonDatautils.findAllDistrictCount("office", c) @@ -400,7 +400,7 @@ class OfficeFieldCleanBatch extends BaseBatch{ fields.each{ def newVal = null if(it == "property_fee"){ - newVal = FiledStrand.processEstateCharge(office.city,office.get(it), "写字楼") + newVal = FiledStrand.processEstateCharge(office.city,office.get(it), "鍐欏瓧妤�") newVal = newVal.toString() } @@ -465,21 +465,21 @@ class OfficeFieldCleanBatch extends BaseBatch{ def matching(data){ def name = data.name - if(data.name && data.name.contains("·")){ - name = data.name.replace("·", "") + if(data.name && data.name.contains("路")){ + name = data.name.replace("路", "") } - def flag = "名称匹配" + def flag = "鍚嶇О鍖归厤" def dist = matchDist(data.city, data.region, name) if(!dist){ dist = CommonDatautils.findSeaweedByMappingAlias(data.city, data.region, name,"office") - flag = "映射别名匹配" + flag = "鏄犲皠鍒悕鍖归厤" } if(!dist) { def rets = CommonDatautils.findDistrictByAlias(data.city, data.region, name, "office") if(rets && rets.size()==1){ - flag = "别名匹配" + flag = "鍒悕鍖归厤" dist = rets[0] } } @@ -496,10 +496,10 @@ class OfficeFieldCleanBatch extends BaseBatch{ if(data.address && isStandardRoad(data.address)){ jsonObject = OpenApiClient.addressMatch(data.city, data.address, "office", false,data.region, name) }else{ - data.flag = "匹配接口-地址" + data.flag = "鍖归厤鎺ュ彛-鍦板潃" } }else{ - data.flag = "匹配接口-名称" + data.flag = "鍖归厤鎺ュ彛-鍚嶇О" } if(jsonObject != null && jsonObject.precise!=-1) { data.match_id = jsonObject.get("id") @@ -516,7 +516,7 @@ class OfficeFieldCleanBatch extends BaseBatch{ def isStandardRoad(def s){ - def pattern = Pattern.compile("[路|街|大道|巷]\\d+(号|弄)"); + def pattern = Pattern.compile("[璺瘄琛梶澶ч亾|宸穄\\d+(鍙穦寮�)"); def matcher = pattern.matcher(s) if(matcher.find()){ return true; @@ -543,10 +543,10 @@ class OfficeFieldCleanBatch extends BaseBatch{ // esRets = esRets[0..100] def matchRets1 = matchApi(esRets) def matchRets2 = selectRestByCredit(matchRets1) - println esWebSource +" 抓取量:"+esRets.size()+" 匹配量:"+matchRets1.size()+" 0.9分以上量:"+matchRets2.size() + 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)+"%" + println "銆愰�氳繃鍖归厤濉厖瀛楁銆戠綉绔欙細"+seaweedmapSource +" Es:"+esRets.size()+" 铻嶅悎灏忓尯鍗犳瘮锛�"+ DataHandleUtils.getDoubleRound(2, matchRets2.size()*100/totalCount)+"%" def precentMap = fieldUpdate(totalCount, updateRets) println c +" "+precentMap.toString() updateDB(c, updateRets) @@ -611,7 +611,7 @@ class OfficeFieldCleanBatch extends BaseBatch{ for(def matchDist : matchRets){ def dist = CommonDatautils.findDistrictFieldById(matchDist.match_id, fields) if(!dist){ - println c+" "+matchDist.match_id+" 不存在" + println c+" "+matchDist.match_id+" 涓嶅瓨鍦�" continue } def newValues = strandField(c, dist, matchDist) @@ -766,7 +766,7 @@ class OfficeFieldCleanBatch extends BaseBatch{ def addBlock(){ def rets = findAllBlockRange() - def offices = CommonDatautils.findAllDistricts("上海", "office", ["city","region","name","block","lat2", "lng2"]) + def offices = CommonDatautils.findAllDistricts("涓婃捣", "office", ["city","region","name","block","lat2", "lng2"]) def totalCount = new AtomicLong() final CountDownLatch latch = new CountDownLatch(offices.size()) @@ -793,7 +793,7 @@ class OfficeFieldCleanBatch extends BaseBatch{ udata.put("block", lastObj.name) udata.put("status", "0") udata.put("cat", "office") - udata.put("username", "高娟") + udata.put("username", "楂樺") udata.put("id", office._id.toString()) udata.put("loopLineInfo", lastObj.loop) def s = FangjiaClientUtils.saveOrUpdateDistrict(udata) @@ -834,14 +834,14 @@ class OfficeFieldCleanBatch extends BaseBatch{ obj.put("m_date", new Date()) obj.put("type", "update") obj.put("data", datas) - obj.put("user_name", "高娟") + 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 city = "涓婃捣" + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\鍐欏瓧妤糪\bd_file_insert锛堝緟鍏ュ簱锛�.xlsx",{d-> def udata = [:] def formatAddress = AddressUtil.formatAddress(city, d['B']) udata.put("city", city) @@ -855,7 +855,7 @@ class OfficeFieldCleanBatch extends BaseBatch{ udata.put("lng", lng) udata.put("status", "0") udata.put("cat", "office") - udata.put("username", "高娟") + udata.put("username", "楂樺") def s = FangjiaClientUtils.saveOrUpdateDistrict(udata) println d['D'] + s }) @@ -864,11 +864,11 @@ class OfficeFieldCleanBatch extends BaseBatch{ def fileAddBlock(){ def rets = findAllBlockRange() - ExcelUtils.multiThreadingModify("D:\\数据\\其它\\上海商铺房源.xlsx",{d-> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\鍏跺畠\\涓婃捣鍟嗛摵鎴挎簮.xlsx",{d-> def location = d['T'] if(location && !d['F']){ def arrs = location.split(",") - // 高德转百度 + // 楂樺痉杞櫨搴� def baidu = BaiDuApiUtils.geoconv(arrs[0].toString().toDouble(), arrs[1].toString().toDouble(), 3) if(baidu){ def lng2 = baidu.x diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/PricePkTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/PricePkTest.groovy index beabc5fd2..b7373ee3e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/PricePkTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/PricePkTest.groovy @@ -12,11 +12,11 @@ import com.mongodb.DBCollection def lineUrl = "mongodb://developer:G00IDCDEV12385@mongo.db.fangjia.com:28017"; DBCollection DEAL_PRICE_COLL = MongoUtils.getCollectionByName2("fangjia", "deal_price", lineUrl) -def city = "常州" +def city = "甯稿窞" def districts = CommonDatautils.findAllDistricts(city, "district", ["city", "region", "name", "alias"]) println districts.size() def rets = [] -rets << ["城市", "区域", "名称", "房价网ToC", "房价网ToB", "近三个月成交均价"] +rets << ["鍩庡競", "鍖哄煙", "鍚嶇О", "鎴夸环缃慣oC", "鎴夸环缃慣oB", "杩戜笁涓湀鎴愪氦鍧囦环"] def index = 0 for(def d : districts){ index++ @@ -38,5 +38,5 @@ for(def d : districts){ rets << ret println index } -ExcelUtils.write("d:\\数据\\江南农商行\\常州小区价格.xlsx", rets, "数据") +ExcelUtils.write("d:\\鏁版嵁\\姹熷崡鍐滃晢琛孿\甯稿窞灏忓尯浠锋牸.xlsx", rets, "鏁版嵁") diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/RemoveDistrict.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/RemoveDistrict.groovy index 2f49dc227..8b378adb4 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/RemoveDistrict.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/RemoveDistrict.groovy @@ -6,7 +6,7 @@ import com.fangjia.script.util.DbUtils import com.mongodb.BasicDBObject /** - * 临时移除 相同名称即在正常状态下有,在删除状态下也有的小区 + * 涓存椂绉婚櫎 鐩稿悓鍚嶇О鍗冲湪姝e父鐘舵�佷笅鏈夛紝鍦ㄥ垹闄ょ姸鎬佷笅涔熸湁鐨勫皬鍖� */ class RemoveDistrict { @@ -26,7 +26,7 @@ class RemoveDistrict { if(!keys.contains(key)){ keys << key }else{ - println it.toString()+" 删除" + println it.toString()+" 鍒犻櫎" DbUtils.seaweed.remove(new BasicDBObject("_id",it._id)) } // def list = CommonDatautils.findAllStatusDistrict(it.city, it.region, it.name, cat, ["city", "region", "name", "status"]) @@ -34,16 +34,16 @@ class RemoveDistrict { // println it.toString() + " "+list.size() // for(def d : list){ //// if(d.status.toString()=="0"){ -//// println d.toString()+" 保留" +//// println d.toString()+" 淇濈暀" //// }else if(d.status.toString()=="1"){ -//// println d.toString()+" 删除" +//// println d.toString()+" 鍒犻櫎" //// DbUtils.seaweed.remove(new BasicDBObject("_id",d._id)) //// } // // if(d.status.toString()=="1"){ -// println d.toString()+" 保留" +// println d.toString()+" 淇濈暀" // }else if(d.status.toString()!="1"){ -// println d.toString()+" 删除" +// println d.toString()+" 鍒犻櫎" // DbUtils.seaweed.remove(new BasicDBObject("_id",d._id)) // } // } 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 597926900..228fb92bf 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 @@ -11,7 +11,7 @@ import com.mongodb.BasicDBObject import com.mongodb.DBCollection /** - *处理地址在地址别名中有重复 + *澶勭悊鍦板潃鍦ㄥ湴鍧�鍒悕涓湁閲嶅 */ class SameDistName { @@ -20,14 +20,14 @@ class SameDistName { static main(args) { def task = new SameDistName() // task.run() - //地址和地址别名完全一致 + //鍦板潃鍜屽湴鍧�鍒悕瀹屽叏涓�鑷� task.addressPocess() } def addressPocess(){ - def citys = ["福州"]//CommonDatautils.findAllCity(); + def citys = ["绂忓窞"]//CommonDatautils.findAllCity(); for(def c : citys){ def dists = CommonDatautils.findAllDistrictByCity(c, "district", ["city","region", "name", "address","addr_alias"]) @@ -35,8 +35,8 @@ class SameDistName { def index = 0 for(def dist : dists){ if(dist.address){ -// if(dist.address.toString().endsWith("弄")){ -// dist.address = dist.address.toString().replace("弄","号") +// 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 = [] @@ -47,7 +47,7 @@ class SameDistName { } index ++ - println "[${index}] "+dist.city +" "+dist.name+" 旧:"+dist.addr_alias+" 新:"+ new_address_alias + println "[${index}] "+dist.city +" "+dist.name+" 鏃э細"+dist.addr_alias+" 鏂帮細"+ new_address_alias def d = new BasicDBObject() d.put("_id", dist._id) @@ -64,7 +64,7 @@ class SameDistName { } def run(){ - def dists = CommonDatautils.findAllDistrictByCity("常州", "district", ["city","region", "name", "address","lat", "lng"]) + def dists = CommonDatautils.findAllDistrictByCity("甯稿窞", "district", ["city","region", "name", "address","lat", "lng"]) def map = [:] for(def d : dists){ def list = map.get(d.name) @@ -83,9 +83,9 @@ class SameDistName { } def retDats = [] - retDats << ["城市","区域","名称","地址","区域状况"] + retDats << ["鍩庡競","鍖哄煙","鍚嶇О","鍦板潃","鍖哄煙鐘跺喌"] if(datas){ - def regionPointsMap = findRegionRange("常州") + def regionPointsMap = findRegionRange("甯稿窞") for(def d : datas){ def lng = d.lng/10000000000.0 def lat = d.lat/10000000000.0 @@ -93,7 +93,7 @@ class SameDistName { retDats << [d.city, d.region, d.name, d.address, flag] } } - ExcelUtils.write("D:\\数据\\小区\\相同小区不同区域.xlsx", retDats, "数据") + ExcelUtils.write("D:\\鏁版嵁\\灏忓尯\\鐩稿悓灏忓尯涓嶅悓鍖哄煙.xlsx", retDats, "鏁版嵁") } def findRegionRange(city){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/SeaweedDataMatchProcess.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/SeaweedDataMatchProcess.groovy index ba72b03de..f5aa7a268 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/SeaweedDataMatchProcess.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/SeaweedDataMatchProcess.groovy @@ -37,7 +37,7 @@ class SeaweedDataMatchProcess { } if(!rMap && address && name){ - def flag = address.matches('^[\u4e00-\u9fa5]+?(路|大道|街).+[弄号]$') + def flag = address.matches('^[\u4e00-\u9fa5]+?(璺瘄澶ч亾|琛�).+[寮勫彿]$') if(flag){ rMap = OpenApiUtils.matchDistrict(city, address, region, true, name) } @@ -54,8 +54,8 @@ class SeaweedDataMatchProcess { // }else{ // rMap = null // } - if(!rMap && name && name.contains("·")){ - def newName = trimChar(name).replace("·","") + if(!rMap && name && name.contains("路")){ + def newName = trimChar(name).replace("路","") rMap = matchFromDB2(city,newName) } return rMap; @@ -89,12 +89,12 @@ class SeaweedDataMatchProcess { def matcher = pattern.matcher(address) if (matcher.find()) { def s = matcher.group(); - if (address.indexOf("交汇") > -1 || address.indexOf("与") > -1) { + if (address.indexOf("浜ゆ眹") > -1 || address.indexOf("涓�") > -1) { return null; - } else if (address.indexOf("路") == -1 && address.indexOf("街") == -1 && address.indexOf("大道") == -1 && address.indexOf("巷") == -1 && address.indexOf("北里") == -1 && address.indexOf("南里") == -1 && address.indexOf("东里") == -1 && address.indexOf("西里") == -1) { + } else if (address.indexOf("璺�") == -1 && address.indexOf("琛�") == -1 && address.indexOf("澶ч亾") == -1 && address.indexOf("宸�") == -1 && address.indexOf("鍖楅噷") == -1 && address.indexOf("鍗楅噷") == -1 && address.indexOf("涓滈噷") == -1 && address.indexOf("瑗块噷") == -1) { return null; } else { - pattern = Pattern.compile("[路|街|大道|巷]\\d+"); + pattern = Pattern.compile("[璺瘄琛梶澶ч亾|宸穄\\d+"); matcher = pattern.matcher(address) if(matcher.find()){ return s; @@ -143,7 +143,7 @@ class SeaweedDataMatchProcess { public static void main(def agrs){ - doMatch("上海", "静安", "金家巷西弄", null) + doMatch("涓婃捣", "闈欏畨", "閲戝宸疯タ寮�", null) } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/SourceDistDataMatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/SourceDistDataMatch.groovy index 4687872d3..27ecb779a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/SourceDistDataMatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/SourceDistDataMatch.groovy @@ -17,7 +17,7 @@ class SourceDistDataMatch { } def run(){ - def path = "D:\\数据\\小区\\上海第三方均价.xlsx" + def path = "D:\\鏁版嵁\\灏忓尯\\涓婃捣绗笁鏂瑰潎浠�.xlsx" ExcelUtils.multiThreadingModify(path, { d -> def obj = CommonDatautils.findDistrict(d['A'], d['B'], d['C'], "district") if(obj){ @@ -32,7 +32,7 @@ class SourceDistDataMatch { } def mapRun(){ - def path = "D:\\数据\\小区\\上海第三方均价.xlsx" + def path = "D:\\鏁版嵁\\灏忓尯\\涓婃捣绗笁鏂瑰潎浠�.xlsx" ExcelUtils.multiThreadingModify(path, { d -> if(!d['N'] && !d['F']){ def dist = ["city":d['A'], "region":d['B'], "name":d['C'], "address":d['D']] @@ -52,7 +52,7 @@ class SourceDistDataMatch { } def filterName(){ - def path = "D:\\数据\\小区\\上海第三方均价.xlsx" + def path = "D:\\鏁版嵁\\灏忓尯\\涓婃捣绗笁鏂瑰潎浠�.xlsx" ExcelUtils.multiThreadingModify(path, { d -> if(!d['N']) { def name = d['C'] @@ -68,13 +68,13 @@ class SourceDistDataMatch { } def filterType(){ - def path = "D:\\数据\\小区\\上海第三方均价.xlsx" + def path = "D:\\鏁版嵁\\灏忓尯\\涓婃捣绗笁鏂瑰潎浠�.xlsx" ExcelUtils.multiThreadingModify(path, { d -> if(!d['N']){ def type = d['J'] - if(type && (type.contains("房地产") || (type.contains("商务住宅") && type.contains("商住两用")) || (type.contains("住宅区") && !type.contains("科教") && !type.contains("生活") && !type.contains("体育") && !type.contains("政府") && !type.contains("公司") && !type.contains("购物") && !type.contains("住宿")))){ + if(type && (type.contains("鎴垮湴浜�") || (type.contains("鍟嗗姟浣忓畢") && type.contains("鍟嗕綇涓ょ敤")) || (type.contains("浣忓畢鍖�") && !type.contains("绉戞暀") && !type.contains("鐢熸椿") && !type.contains("浣撹偛") && !type.contains("鏀垮簻") && !type.contains("鍏徃") && !type.contains("璐墿") && !type.contains("浣忓")))){ - }else if(type && type.contains("商务住宅") && !type.contains("商住两用")){ + }else if(type && type.contains("鍟嗗姟浣忓畢") && !type.contains("鍟嗕綇涓ょ敤")){ def count = 0 if(d['S'] && d['S']!='null'){ count = d['S'].toDouble().toInteger() @@ -93,24 +93,24 @@ class SourceDistDataMatch { def matchMap(def dist){ - def gaodeRest = FangjiaClientUtils.searchMapData(dist.city, dist.name,"住宅", "高德") + def gaodeRest = FangjiaClientUtils.searchMapData(dist.city, dist.name,"浣忓畢", "楂樺痉") if(!gaodeRest && dist.address){ - gaodeRest = FangjiaClientUtils.searchMapData(dist.city, dist.address,"住宅", "高德") + gaodeRest = FangjiaClientUtils.searchMapData(dist.city, dist.address,"浣忓畢", "楂樺痉") } def gdlocationMap = null def bdlocationMap = null if(gaodeRest){ gdlocationMap = getMapLocation2(dist, gaodeRest); if(gdlocationMap){ - gdlocationMap.source = "高德" + gdlocationMap.source = "楂樺痉" } } - def baiduRest = FangjiaClientUtils.searchMapData(dist.city, dist.name,"住宅", "百度") + def baiduRest = FangjiaClientUtils.searchMapData(dist.city, dist.name,"浣忓畢", "鐧惧害") if(baiduRest){ bdlocationMap = getMapLocation2(dist, baiduRest); if(bdlocationMap){ - bdlocationMap.source = "百度" + bdlocationMap.source = "鐧惧害" } } @@ -177,7 +177,7 @@ class SourceDistDataMatch { if(!r.city.contains(dist.city)){ continue } - if(["公交车站"].contains(r.type)){ + if(["鍏氦杞︾珯"].contains(r.type)){ continue } if(regionImpr && !r.district){ @@ -198,7 +198,7 @@ class SourceDistDataMatch { def score1 = 0.0; def score2 = 0.0 - if(distName && (distName.contains("号") || distName.contains("弄")) && (distName.contains("路") || distName.contains("街") || distName.contains("大道"))){ + if(distName && (distName.contains("鍙�") || distName.contains("寮�")) && (distName.contains("璺�") || distName.contains("琛�") || distName.contains("澶ч亾"))){ if(r.address){ score2 = CosineSimilarAlgorithm.getSimilarity(distName, r.address)/2 } @@ -210,7 +210,7 @@ class SourceDistDataMatch { } score3 = score1 + score2 - if(r.type && r.type.contains("住宅")){ + if(r.type && r.type.contains("浣忓畢")){ score3 = score3 + 0.2 } if(score3 >maxScore){ @@ -236,14 +236,14 @@ class SourceDistDataMatch { def nameReplace(def s, city){ if(s.contains("(") && s.contains(")")){ def s1 = s.toString().substring(s.indexOf("(")+1, s.indexOf(")")) - if(s1.contains("路")||s1.contains("街")||s1.contains("大道")){ + if(s1.contains("璺�")||s1.contains("琛�")||s1.contains("澶ч亾")){ s = s.toString().substring(0, s.indexOf("(")) } } - def name = s.replace("?","").replace("-","").replace("&","").replace("·","").replace(".","").replace("(","").replace(")","").replace("(","").replace(")","").replace("【","").replace("】","").replace("11期","十一期").replace("12期","十二期").replace("13期","十三期").replace("14期","十四期").replace("15期","十五期").replace("16期","十六期").replace("17期","十七期").replace("18期","十八期").replace("19期","十九期").replace("10期","十期").replace("1期","一期").replace("2期","二期").replace("3期","三期").replace("4期","四期").replace("5期","五期").replace("6期","六期").replace("7期","七期").replace("8期","八期").replace("9期","九期").replace("1区","一区").replace("2区","二区").replace("3区","三区").replace("4区","四区").replace("5区","五区").replace("6区","六区").replace("7区","七区").replace("8区","八区").replace("9区","九区").replace(" ","").replace("建设中","").replace("钢混","").trim() + def name = s.replace("?","").replace("-","").replace("&","").replace("路","").replace(".","").replace("锛�","").replace("锛�","").replace("(","").replace(")","").replace("銆�","").replace("銆�","").replace("11鏈�","鍗佷竴鏈�").replace("12鏈�","鍗佷簩鏈�").replace("13鏈�","鍗佷笁鏈�").replace("14鏈�","鍗佸洓鏈�").replace("15鏈�","鍗佷簲鏈�").replace("16鏈�","鍗佸叚鏈�").replace("17鏈�","鍗佷竷鏈�").replace("18鏈�","鍗佸叓鏈�").replace("19鏈�","鍗佷節鏈�").replace("10鏈�","鍗佹湡").replace("1鏈�","涓�鏈�").replace("2鏈�","浜屾湡").replace("3鏈�","涓夋湡").replace("4鏈�","鍥涙湡").replace("5鏈�","浜旀湡").replace("6鏈�","鍏湡").replace("7鏈�","涓冩湡").replace("8鏈�","鍏湡").replace("9鏈�","涔濇湡").replace("1鍖�","涓�鍖�").replace("2鍖�","浜屽尯").replace("3鍖�","涓夊尯").replace("4鍖�","鍥涘尯").replace("5鍖�","浜斿尯").replace("6鍖�","鍏尯").replace("7鍖�","涓冨尯").replace("8鍖�","鍏尯").replace("9鍖�","涔濆尯").replace(" ","").replace("寤鸿涓�","").replace("閽㈡贩","").trim() if(name.startsWith(city)){ - def newName = name.replace(city+"市","").replace(city,"") - if(newName && newName=="花园"){ + def newName = name.replace(city+"甯�","").replace(city,"") + if(newName && newName=="鑺卞洯"){ return name }else{ name = newName @@ -253,8 +253,8 @@ class SourceDistDataMatch { } /** - * 转义字符串中的特殊字符 - * 仅过滤Lucene regexps, 其他的勿用 + * 杞箟瀛楃涓蹭腑鐨勭壒娈婂瓧绗� + * 浠呰繃婊ucene regexps, 鍏朵粬鐨勫嬁鐢� * @param keyword * @return */ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/Test.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/Test.groovy index 2db3745ca..efc2923fd 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/Test.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/Test.groovy @@ -14,7 +14,7 @@ def response = client.post( path: '/chat/deepseek', contentType: ContentType.JSON, headers: [accept: 'application/json'], - body: [content: '湖北省的别称,别称以逗号隔开输出,只输出别称,其它不输出'] + body: [content: '婀栧寳鐪佺殑鍒О锛屽埆绉颁互閫楀彿闅斿紑杈撳嚭锛屽彧杈撳嚭鍒О锛屽叾瀹冧笉杈撳嚭'] ) println "Response status: ${response.status}" diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/UpdateDistrictField.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/UpdateDistrictField.groovy index f44d8bf4b..3f744f5b7 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/UpdateDistrictField.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/UpdateDistrictField.groovy @@ -22,8 +22,8 @@ import java.util.concurrent.Executors import java.util.concurrent.atomic.AtomicLong /** - * 根据链家数据修改小区库中字段 - * 使用到中间映射表 + * 鏍规嵁閾惧鏁版嵁淇敼灏忓尯搴撲腑瀛楁 + * 浣跨敤鍒颁腑闂存槧灏勮〃 */ @BatchOwner(Watcher.GaoJuan) class UpdateDistrictField extends BaseBatch{ @@ -33,7 +33,7 @@ class UpdateDistrictField extends BaseBatch{ def fields = ["developer","estate_company","household_count","loudong_count","estate_charge","car_site_count"] - def sources = ["链家", "我爱我家", "安居客"] + def sources = ["閾惧", "鎴戠埍鎴戝", "瀹夊眳瀹�"] def statMap = [:] @@ -53,7 +53,7 @@ class UpdateDistrictField extends BaseBatch{ } def margeResults = megerDatas(sourceMap) updateDB(margeResults) - println "修改完成 "+new Date().toString() + println "淇敼瀹屾垚 "+new Date().toString() } def megerDatas(sourceMap){ @@ -72,11 +72,11 @@ class UpdateDistrictField extends BaseBatch{ def valMap = sourceMap.get(source) def sourceEsObj = findCommunities(valMap.get(id)) if(sourceEsObj){ - if(source == "链家"){ + if(source == "閾惧"){ sourceEsObj.source = "lianjia" - }else if(source == "我爱我家"){ + }else if(source == "鎴戠埍鎴戝"){ sourceEsObj.source = "wiwj" - }else if(source == "安居客"){ + }else if(source == "瀹夊眳瀹�"){ sourceEsObj.source = "anjuke" } datas << sourceEsObj @@ -158,15 +158,15 @@ class UpdateDistrictField extends BaseBatch{ // } // // lianjiaCountMap.each {k,v-> -// println "[链家] "+k+" "+v +// println "[閾惧] "+k+" "+v // } // // wiwjCountMap.each {k,v-> -// println "[我爱我家] "+k+" "+v +// println "[鎴戠埍鎴戝] "+k+" "+v // } // // anjukeCountMap.each {k,v-> -// println "[安居客] "+k+" "+v +// println "[瀹夊眳瀹 "+k+" "+v // } // return lastValues // } @@ -182,7 +182,7 @@ class UpdateDistrictField extends BaseBatch{ // def batchUpdateDist(source){ //// def rets = findThirdMatchDist(source) -// println "[${source}] 符保条件小区量:"+rets.size() +// println "[${source}] 绗︿繚鏉′欢灏忓尯閲忥細"+rets.size() // def updateIndex = new AtomicLong() // final CountDownLatch latch = new CountDownLatch(rets.size()) // def allUpdateList = new CopyOnWriteArrayList() @@ -211,7 +211,7 @@ class UpdateDistrictField extends BaseBatch{ //// ) // } // latch.await() -// println "总修改量:"+updateIndex.get() +// println "鎬讳慨鏀归噺锛�"+updateIndex.get() // def countMap = [:] // for(def map : allUpdateList){ // map.each{k,v-> @@ -225,7 +225,7 @@ class UpdateDistrictField extends BaseBatch{ // } // // countMap.each {k,v-> -// println k +" 更新量:"+v +// println k +" 鏇存柊閲忥細"+v // } // // println "---------------------------------------------------------" @@ -342,7 +342,7 @@ class UpdateDistrictField extends BaseBatch{ if(newVal){ lastValueMap.put(field, newVal) - //以下为统计各网站各字段的更新情况 + //浠ヤ笅涓虹粺璁″悇缃戠珯鍚勫瓧娈电殑鏇存柊鎯呭喌 def fieldStatMap = statMap.get(esData.source) if(!fieldStatMap){ fieldStatMap = [:] diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/ZsNoExistsToDB.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/ZsNoExistsToDB.groovy index 5c87fa8cb..b19e42420 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/ZsNoExistsToDB.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/ZsNoExistsToDB.groovy @@ -37,14 +37,14 @@ class ZsNoExistsToDB { } def addDistrictToDB(){ - def datas = ExcelUtils.read("D:\\数据\\浙商\\不存在小区(结果V1).xlsx",0,1) + def datas = ExcelUtils.read("D:\\鏁版嵁\\娴欏晢\\涓嶅瓨鍦ㄥ皬鍖�(缁撴灉V1).xlsx",0,1) def keys = [] def addIndex = 0 for(def d : datas){ - if(d['J'] && d['J']=="新增"){ + if(d['J'] && d['J']=="鏂板"){ def city = d['A'] def region = d['B'] - def name = d['F'].toString().replace("·","") + def name = d['F'].toString().replace("路","") def address = d['G'] def dist = CommonDatautils.findDistrict(city,region,name,"district") if(!dist){ @@ -77,7 +77,7 @@ class ZsNoExistsToDB { if(lng){ lng = lng.toString().toDouble() lat = lat.toString().toDouble() - // 高德转百度 + // 楂樺痉杞櫨搴� def baidu = BaiDuApiUtils.geoconv(lng, lat, 3) lng2 = baidu.x lat2 = baidu.y @@ -89,11 +89,11 @@ class ZsNoExistsToDB { } } - def estateType2 = "普通住宅" - if(name.contains("别墅")){ - estateType2 = "别墅" - }else if(name.contains("商住")){ - estateType2 = "商住" + def estateType2 = "鏅�氫綇瀹�" + if(name.contains("鍒")){ + estateType2 = "鍒" + }else if(name.contains("鍟嗕綇")){ + estateType2 = "鍟嗕綇" } def data = new BasicDBObject(); @@ -118,15 +118,15 @@ class ZsNoExistsToDB { } def markMap = [:] - markMap.put("data_source", "机器入库") + markMap.put("data_source", "鏈哄櫒鍏ュ簱") data.put("mark_map",markMap) DbUtils.seaweed.save(data) FangjiaClientUtils.sendDistrictPriceCalculate(city,region, name, 12); addIndex++ - println "[新增] "+addIndex +" "+ data + println "[鏂板] "+addIndex +" "+ data }else{ - println dist.city +" "+dist.region+" "+dist.name+" 小区已存在" + println dist.city +" "+dist.region+" "+dist.name+" 灏忓尯宸插瓨鍦�" } } } @@ -134,14 +134,14 @@ class ZsNoExistsToDB { def run(){ def rets = findOpenLog2() - // ExcelUtils.write("D:\\数据\\浙商\\不存在小区2.xlsx", rets, "数据") + // ExcelUtils.write("D:\\鏁版嵁\\娴欏晢\\涓嶅瓨鍦ㄥ皬鍖�2.xlsx", rets, "鏁版嵁") println rets.size() // matchMap2() } def matchMap2() { - ExcelUtils.multiThreadingModify("D:\\数据\\浙商\\不存在小区.xlsx", { d -> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\娴欏晢\\涓嶅瓨鍦ㄥ皬鍖�.xlsx", { d -> if(!d['E']){ def rets = OpenApiUtils.getGaoDeSearchLocation(d['A'],d['B'],d['C']) def map = findStandardObject(d['A'],d['B'],d['C'], rets); @@ -201,10 +201,10 @@ class ZsNoExistsToDB { def matchMap(){ - ExcelUtils.modify("D:\\数据\\浙商\\不存在小区.xlsx",{data-> - def gdData = FangjiaClientUtils.getMapData(data['A'], data['B'], data['C'], data['D'],"", "高德") + ExcelUtils.modify("D:\\鏁版嵁\\娴欏晢\\涓嶅瓨鍦ㄥ皬鍖�.xlsx",{data-> + def gdData = FangjiaClientUtils.getMapData(data['A'], data['B'], data['C'], data['D'],"", "楂樺痉") if(!gdData){ - gdData = FangjiaClientUtils.getMapData(data['A'], "", data['C'], data['D'],"", "高德") + gdData = FangjiaClientUtils.getMapData(data['A'], "", data['C'], data['D'],"", "楂樺痉") } if(gdData){ data['E'] = gdData.district @@ -216,9 +216,9 @@ class ZsNoExistsToDB { data['K'] = gdData.score } - def bdData = FangjiaClientUtils.getMapData(data['A'], data['B'], data['C'], data['D'],"", "百度") + def bdData = FangjiaClientUtils.getMapData(data['A'], data['B'], data['C'], data['D'],"", "鐧惧害") if(!bdData){ - bdData = FangjiaClientUtils.getMapData(data['A'], "", data['C'], data['D'],"", "百度") + bdData = FangjiaClientUtils.getMapData(data['A'], "", data['C'], data['D'],"", "鐧惧害") } if(bdData){ data['L'] = bdData.district @@ -240,7 +240,7 @@ class ZsNoExistsToDB { QueryBuilder queryBuilder = QueryBuilders.boolQuery().must(QueryBuilders.termQuery("user_id", '1007569')).must(QueryBuilders.termQuery("request_uri", '/czbank/evaluation')).must(date_range_cdate) def rets = [] - rets << ["城市", "区域", "名称","地址", "高德区域","高德名称","高德地址","高德类型","高德经度","高德纬度","DB存在"] + rets << ["鍩庡競", "鍖哄煙", "鍚嶇О","鍦板潃", "楂樺痉鍖哄煙","楂樺痉鍚嶇О","楂樺痉鍦板潃","楂樺痉绫诲瀷","楂樺痉缁忓害","楂樺痉绾害","DB瀛樺湪"] def datas = ElasticUtils.executeSimpleQuery("192.168.0.206", "open_uri_log", queryBuilder); def index = 0 def count = 0 @@ -249,7 +249,7 @@ class ZsNoExistsToDB { if(d.code == 400){ index++ def msg = d.msg - if(msg.contains("该楼盘不存在")){ + if(msg.contains("璇ユゼ鐩樹笉瀛樺湪")){ def arrs = msg.split(" ") if(arrs){ def rMap = [:] @@ -285,7 +285,7 @@ class ZsNoExistsToDB { } } } - println "400: "+index+" 该楼盘不存在:"+count+" 去重后:"+rets.size() + println "400: "+index+" 璇ユゼ鐩樹笉瀛樺湪锛�"+count+" 鍘婚噸鍚庯細"+rets.size() return rets; } @@ -297,7 +297,7 @@ class ZsNoExistsToDB { sqlBuffer.append(" and c_date >= '2022-01-01'") ResultSet rs = dataSource.connection.createStatement().executeQuery(sqlBuffer.toString()) def rets = [] - rets << ["城市", "区域", "名称","地址", "高德区域","高德名称","高德地址","高德类型","高德经度","高德纬度","DB存在"] + rets << ["鍩庡競", "鍖哄煙", "鍚嶇О","鍦板潃", "楂樺痉鍖哄煙","楂樺痉鍚嶇О","楂樺痉鍦板潃","楂樺痉绫诲瀷","楂樺痉缁忓害","楂樺痉绾害","DB瀛樺湪"] def index = 0 def count = 0 while (rs.next()){ @@ -305,7 +305,7 @@ class ZsNoExistsToDB { if(code == 400){ index++ def msg = rs.getString("msg") - if(msg && msg.contains("该楼盘不存在")){ + if(msg && msg.contains("璇ユゼ鐩樹笉瀛樺湪")){ def arrs = msg.split(" ") if(arrs){ def rMap = [:] @@ -334,7 +334,7 @@ class ZsNoExistsToDB { } } } - println "400: "+index+" 该楼盘不存在:"+count+" 去重后:"+rets.size() + println "400: "+index+" 璇ユゼ鐩樹笉瀛樺湪锛�"+count+" 鍘婚噸鍚庯細"+rets.size() return rets; } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/ZsPersonProcess.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/ZsPersonProcess.groovy index cfa92f44a..3c2af0e30 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/ZsPersonProcess.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/ZsPersonProcess.groovy @@ -32,12 +32,12 @@ class ZsPersonProcess { // task.parse() -// def d= task.addressStandardize("成都","半岛城邦2期") +// def d= task.addressStandardize("鎴愰兘","鍗婂矝鍩庨偊2鏈�") // if(d){ // println "keywords:"+d.name+" street:"+d.street+" number:"+d.streetNumber // } -// def dist = ["city":"重庆", "region":"临海", "name":"伟星·金桥郡",address:""] +// def dist = ["city":"閲嶅簡", "region":"涓存捣", "name":"浼熸槦路閲戞ˉ閮�",address:""] // if(dist.name){ // def arrs = FangjiaClientUtils.getNlpKey(dist.name, 3) // println "Name: "+arrs @@ -61,7 +61,7 @@ class ZsPersonProcess { } def matchMap(){ -// def datas = ExcelUtils.read("d:\\数据\\浙商\\浙商人工.xlsx", 0,1) +// def datas = ExcelUtils.read("d:\\鏁版嵁\\娴欏晢\\娴欏晢浜哄伐.xlsx", 0,1) // for(def d : datas){ // if(d['U']){ // def dist = ["city":d['U'], "region":d['V'], "name":d['G']] @@ -77,7 +77,7 @@ class ZsPersonProcess { // } // } - ExcelUtils.multiThreadingModify("d:\\数据\\浙商\\浙商人工(单-恢复).xlsx", { d -> + ExcelUtils.multiThreadingModify("d:\\鏁版嵁\\娴欏晢\\娴欏晢浜哄伐(鍗�-鎭㈠).xlsx", { d -> if(d['U'] && !d['Y']){ def name = null def dist = [] @@ -88,7 +88,7 @@ class ZsPersonProcess { } loactionMap = matchMap(dist) - if(d['X'] && !d['X'].toString().endsWith("路") && !d['X'].toString().endsWith("街") && (!d['W'] || !loactionMap)){ + if(d['X'] && !d['X'].toString().endsWith("璺�") && !d['X'].toString().endsWith("琛�") && (!d['W'] || !loactionMap)){ dist = ["city":d['U'], "region":d['V'], "name":d['X'], "address":null] loactionMap = matchMap(dist) } @@ -109,9 +109,9 @@ class ZsPersonProcess { def parse(){ - def keywords = ["路","街","巷","大道"] -// def datas = ExcelUtils.read("d:\\数据\\浙商\\浙商人工.xlsx", 0,1) - ExcelUtils.modify("d:\\数据\\浙商\\浙商人工(单).xlsx",{d-> + def keywords = ["璺�","琛�","宸�","澶ч亾"] +// def datas = ExcelUtils.read("d:\\鏁版嵁\\娴欏晢\\娴欏晢浜哄伐.xlsx", 0,1) + ExcelUtils.modify("d:\\鏁版嵁\\娴欏晢\\娴欏晢浜哄伐(鍗�).xlsx",{d-> if(!d['Y']){ def str = d['G'] @@ -137,7 +137,7 @@ class ZsPersonProcess { } } - if(!d['X'] || (d['X'] && !d['X'].toString().contains("号"))){ + if(!d['X'] || (d['X'] && !d['X'].toString().contains("鍙�"))){ json = addressStandardize(d['U'], d['H'].toString()) if(json){ if(json.name){ @@ -161,7 +161,7 @@ class ZsPersonProcess { } def run(){ - ExcelUtils.multiThreadingModify("d:\\数据\\浙商\\浙商人工.xlsx",{d-> + ExcelUtils.multiThreadingModify("d:\\鏁版嵁\\娴欏晢\\娴欏晢浜哄伐.xlsx",{d-> if(!d['S'] && !d['T']){ def dbo = null @@ -205,7 +205,7 @@ class ZsPersonProcess { } if(dbo){ - if(dbo.province.contains('省')){ + if(dbo.province.contains('鐪�')){ d['T'] = dbo.province d['U'] = dbo.fangjia_city }else{ @@ -278,24 +278,24 @@ class ZsPersonProcess { } def matchMap(def dist){ - def gaodeRest = FangjiaClientUtils.searchMapData(dist.city, dist.name,"住宅", "高德") + def gaodeRest = FangjiaClientUtils.searchMapData(dist.city, dist.name,"浣忓畢", "楂樺痉") if(!gaodeRest && dist.address){ - gaodeRest = FangjiaClientUtils.searchMapData(dist.city, dist.address,"住宅", "高德") + gaodeRest = FangjiaClientUtils.searchMapData(dist.city, dist.address,"浣忓畢", "楂樺痉") } def gdlocationMap = null def bdlocationMap = null if(gaodeRest){ gdlocationMap = getMapLocation2(dist, gaodeRest); if(gdlocationMap){ - gdlocationMap.source = "高德" + gdlocationMap.source = "楂樺痉" } } - def baiduRest = FangjiaClientUtils.searchMapData(dist.city, dist.name,"住宅", "百度") + def baiduRest = FangjiaClientUtils.searchMapData(dist.city, dist.name,"浣忓畢", "鐧惧害") if(baiduRest){ bdlocationMap = getMapLocation2(dist, baiduRest); if(bdlocationMap){ - bdlocationMap.source = "百度" + bdlocationMap.source = "鐧惧害" } } @@ -329,7 +329,7 @@ class ZsPersonProcess { if(!r.city.contains(dist.city)){ continue } - if(["公交车站"].contains(r.type)){ + if(["鍏氦杞︾珯"].contains(r.type)){ continue } def name = nameReplace(r.name, dist.city) @@ -358,7 +358,7 @@ class ZsPersonProcess { word = dist.name.replace(name, "") } if (word) { - def words = ["商住楼", "小区","公寓","别墅","花园"] + def words = ["鍟嗕綇妤�", "灏忓尯","鍏瘬","鍒","鑺卞洯"] for (def w : words) { if (word == w ) { lat = r.lat @@ -376,7 +376,7 @@ class ZsPersonProcess { } } if(!lng){ - Pattern pattern = Pattern.compile("\\d+号楼"); + Pattern pattern = Pattern.compile("\\d+鍙锋ゼ"); Matcher matcher = pattern.matcher(word); if(matcher.find()){ def newWord = word.replace(matcher.group(),"") @@ -398,7 +398,7 @@ class ZsPersonProcess { } if(!lng){ - Pattern pattern = Pattern.compile("[A-Za-z]区"); + Pattern pattern = Pattern.compile("[A-Za-z]鍖�"); Matcher matcher = pattern.matcher(word); if(matcher.find()){ def newWord = word.replace(matcher.group(),"") @@ -420,8 +420,8 @@ class ZsPersonProcess { } } } - if(!lng && dist.address && (dist.address.contains("号") || dist.address.contains("弄") || dist.address.contains("交汇")) && r.address){ - if((r.address.contains("号") || r.address.contains("弄") || r.address.contains("交汇")) && r.address.contains(dist.address)){ + if(!lng && dist.address && (dist.address.contains("鍙�") || dist.address.contains("寮�") || dist.address.contains("浜ゆ眹")) && r.address){ + if((r.address.contains("鍙�") || r.address.contains("寮�") || r.address.contains("浜ゆ眹")) && r.address.contains(dist.address)){ lat = r.lat lng = r.lng region = r.district @@ -502,7 +502,7 @@ class ZsPersonProcess { if(!r.city.contains(dist.city)){ continue } - if(["公交车站"].contains(r.type)){ + if(["鍏氦杞︾珯"].contains(r.type)){ continue } if(regionImpr && !r.district){ @@ -527,7 +527,7 @@ class ZsPersonProcess { score2 = CosineSimilarAlgorithm.getSimilarity(dist.address, r.address)/2 } score3 = score1 + score2 - if(r.type && r.type.contains("住宅")){ + if(r.type && r.type.contains("浣忓畢")){ score3 = score3 + 0.2 } if(score3 >maxScore){ @@ -553,14 +553,14 @@ class ZsPersonProcess { def nameReplace(def s, city){ if(s.contains("(") && s.contains(")")){ def s1 = s.toString().substring(s.indexOf("(")+1, s.indexOf(")")) - if(s1.contains("路")||s1.contains("街")||s1.contains("大道")){ + if(s1.contains("璺�")||s1.contains("琛�")||s1.contains("澶ч亾")){ s = s.toString().substring(0, s.indexOf("(")) } } - def name = s.replace("?","").replace("-","").replace("&","").replace("·","").replace(".","").replace("(","").replace(")","").replace("(","").replace(")","").replace("【","").replace("】","").replace("11期","十一期").replace("12期","十二期").replace("13期","十三期").replace("14期","十四期").replace("15期","十五期").replace("16期","十六期").replace("17期","十七期").replace("18期","十八期").replace("19期","十九期").replace("10期","十期").replace("1期","一期").replace("2期","二期").replace("3期","三期").replace("4期","四期").replace("5期","五期").replace("6期","六期").replace("7期","七期").replace("8期","八期").replace("9期","九期").replace("1区","一区").replace("2区","二区").replace("3区","三区").replace("4区","四区").replace("5区","五区").replace("6区","六区").replace("7区","七区").replace("8区","八区").replace("9区","九区").replace(" ","").replace("建设中","").replace("钢混","").trim() + def name = s.replace("?","").replace("-","").replace("&","").replace("路","").replace(".","").replace("锛�","").replace("锛�","").replace("(","").replace(")","").replace("銆�","").replace("銆�","").replace("11鏈�","鍗佷竴鏈�").replace("12鏈�","鍗佷簩鏈�").replace("13鏈�","鍗佷笁鏈�").replace("14鏈�","鍗佸洓鏈�").replace("15鏈�","鍗佷簲鏈�").replace("16鏈�","鍗佸叚鏈�").replace("17鏈�","鍗佷竷鏈�").replace("18鏈�","鍗佸叓鏈�").replace("19鏈�","鍗佷節鏈�").replace("10鏈�","鍗佹湡").replace("1鏈�","涓�鏈�").replace("2鏈�","浜屾湡").replace("3鏈�","涓夋湡").replace("4鏈�","鍥涙湡").replace("5鏈�","浜旀湡").replace("6鏈�","鍏湡").replace("7鏈�","涓冩湡").replace("8鏈�","鍏湡").replace("9鏈�","涔濇湡").replace("1鍖�","涓�鍖�").replace("2鍖�","浜屽尯").replace("3鍖�","涓夊尯").replace("4鍖�","鍥涘尯").replace("5鍖�","浜斿尯").replace("6鍖�","鍏尯").replace("7鍖�","涓冨尯").replace("8鍖�","鍏尯").replace("9鍖�","涔濆尯").replace(" ","").replace("寤鸿涓�","").replace("閽㈡贩","").trim() if(name.startsWith(city)){ - def newName = name.replace(city+"市","").replace(city,"") - if(newName && newName=="花园"){ + def newName = name.replace(city+"甯�","").replace(city,"") + if(newName && newName=="鑺卞洯"){ return name }else{ name = newName @@ -570,7 +570,7 @@ class ZsPersonProcess { } def matchDb(){ - ExcelUtils.multiThreadingModify("d:\\数据\\浙商\\测试.xlsx",{d-> + ExcelUtils.multiThreadingModify("d:\\鏁版嵁\\娴欏晢\\娴嬭瘯.xlsx",{d-> if(d['Y'] && d['S'] && d['S'].toString().toDouble().toInteger()==6){ def results = null def name = null @@ -589,7 +589,7 @@ class ZsPersonProcess { d['AM'] = results.district d['AN'] = results.name - println "输入:"+d['V']+" "+d['W']+" 地图:"+d['Z']+" "+d['AA']+" 匹配:"+results.district+" "+results.name + println "杈撳叆锛�"+d['V']+" "+d['W']+" 鍦板浘锛�"+d['Z']+" "+d['AA']+" 鍖归厤锛�"+results.district+" "+results.name def alias = results.alias if(!alias){ alias = [] @@ -598,16 +598,16 @@ class ZsPersonProcess { alias << results.name } - if(d['V']!="东莞"){ + if(d['V']!="涓滆帪"){ def distance = null if(d['AC'] && d['AD']){ def maplng = null def maplat = null - if(d['Y'] && d['Y']=="高德"){ + if(d['Y'] && d['Y']=="楂樺痉"){ def baidu = BaiDuApiUtils.geoconv(d['AC'].toDouble(), d['AD'].toDouble(), 3) maplng = baidu.x maplat = baidu.y - }else if(d['Y'] && d['Y']=="百度"){ + }else if(d['Y'] && d['Y']=="鐧惧害"){ maplng = d['AC'] maplat = d['AD'] } @@ -616,8 +616,8 @@ class ZsPersonProcess { d['AQ'] = distance.toInteger() - if(d['V']){//原始数据有区域 - if(results.district && d['Z'] && results.district==d['Z']){//结果与地图区域相同 + if(d['V']){//鍘熷鏁版嵁鏈夊尯鍩� + if(results.district && d['Z'] && results.district==d['Z']){//缁撴灉涓庡湴鍥惧尯鍩熺浉鍚� if(results.district==d['V']){ if(alias.contains(name)){ @@ -631,37 +631,37 @@ class ZsPersonProcess { if(results && results.precise>=0 && results.district == d['V']){ if(results.name!=oldName){ if(results.alias && results.alias.contains(oldName)){ - d['AP'] = "已存在,区域相同" + d['AP'] = "宸插瓨鍦紝鍖哄煙鐩稿悓" }else{ - d['AP'] = "新增小区【"+oldName+"】" + d['AP'] = "鏂板灏忓尯銆�"+oldName+"銆�" } }else{ - d['AP'] = "已存在,区域相同" + d['AP'] = "宸插瓨鍦紝鍖哄煙鐩稿悓" } }else{ - d['AP'] = "新增小区【"+oldName+"】" + d['AP'] = "鏂板灏忓尯銆�"+oldName+"銆�" } }else{ if(!alias.contains(oldName)){ - d['AP'] = "添加别名【"+oldName+"】" + d['AP'] = "娣诲姞鍒悕銆�"+oldName+"銆�" }else{ - d['AP'] = "已存在" + d['AP'] = "宸插瓨鍦�" } } }else{ if(results.district==d['V']){ - d['AP'] = "已存在" + d['AP'] = "宸插瓨鍦�" } } }else{ - d['AP'] = "已存在,区域相同" + d['AP'] = "宸插瓨鍦紝鍖哄煙鐩稿悓" } }else{ def group = pattern(name) if(group){ - d['AP'] = "新增小区【"+name+"】" + d['AP'] = "鏂板灏忓尯銆�"+name+"銆�" }else{ - d['AP'] = "添加别名【"+ d['W'] +"】" + d['AP'] = "娣诲姞鍒悕銆�"+ d['W'] +"銆�" } } }else{ @@ -670,52 +670,52 @@ class ZsPersonProcess { // if(d['W'] && !alias.contains(d['W'])){ // def fq = pattern(d['W']) // if(fq){ -// msg = "添加小区【"+ d['AA'] +"】" +// msg = "娣诲姞灏忓尯銆�"+ d['AA'] +"銆�" // }else{ // names << d['W'] -// msg = "添加别名【"+ d['W'] +"】" +// msg = "娣诲姞鍒悕銆�"+ d['W'] +"銆�" // } // } - d['AP'] = "输入区域问题 " + d['AP'] = "杈撳叆鍖哄煙闂 " } }else{ - if(d['Z'] && d['V'] && d['Z']==d['V']){//结果与地图区域不同,输入与地图相同 - d['AP'] = "新增小区【"+d['AA']+"】" + if(d['Z'] && d['V'] && d['Z']==d['V']){//缁撴灉涓庡湴鍥惧尯鍩熶笉鍚岋紝杈撳叆涓庡湴鍥剧浉鍚� + d['AP'] = "鏂板灏忓尯銆�"+d['AA']+"銆�" }else{ - if(results.address && d['AB'] && results.address.contains("路") && results.address.contains("号")){ - if(d['AB'].contains("路") && d['AB'].contains("号") && results.address.contains(d['AB'])){ - d['AP'] = "库中区域存疑 " + if(results.address && d['AB'] && results.address.contains("璺�") && results.address.contains("鍙�")){ + if(d['AB'].contains("璺�") && d['AB'].contains("鍙�") && results.address.contains(d['AB'])){ + d['AP'] = "搴撲腑鍖哄煙瀛樼枒 " }else{ - d['AP'] = "区域都不同,地址不同" + d['AP'] = "鍖哄煙閮戒笉鍚岋紝鍦板潃涓嶅悓" } }else{ - d['AP'] = "区域地址存疑 " + d['AP'] = "鍖哄煙鍦板潃瀛樼枒 " } } } }else{ - if(results.district && d['Z'] && results.district==d['Z']) {//结果与地图区域相同 + if(results.district && d['Z'] && results.district==d['Z']) {//缁撴灉涓庡湴鍥惧尯鍩熺浉鍚� if(!alias.contains(name)){ def group1 = pattern(name) if(group1 && name==d['W']){ - d['AP'] = "新增小区【"+d['AA']+"】" - }else if(group1 && d['X'] && d['AB'] && d['X'].contains("路") && d['X'].contains("号") && d['AB'].contains("路") && d['AB'].contains("号") && d['AB'].contains(d['X'])){ - d['AP'] = "新增小区【"+d['AA']+"】 添加别名【"+d['W']+"】" + d['AP'] = "鏂板灏忓尯銆�"+d['AA']+"銆�" + }else if(group1 && d['X'] && d['AB'] && d['X'].contains("璺�") && d['X'].contains("鍙�") && d['AB'].contains("璺�") && d['AB'].contains("鍙�") && d['AB'].contains(d['X'])){ + d['AP'] = "鏂板灏忓尯銆�"+d['AA']+"銆� 娣诲姞鍒悕銆�"+d['W']+"銆�" } }else{ - d['AP'] = "区域缺失,名称存在" + d['AP'] = "鍖哄煙缂哄け锛屽悕绉板瓨鍦�" } } } }else{ - d['AP'] = "城市需特殊处理" + d['AP'] = "鍩庡競闇�鐗规畩澶勭悊" } }else{ - d['AP'] = "新增小区【"+d['AA']+"】" + d['AP'] = "鏂板灏忓尯銆�"+d['AA']+"銆�" } } },0) @@ -723,7 +723,7 @@ class ZsPersonProcess { def matchDb2(){ - ExcelUtils.multiThreadingModify("d:\\数据\\浙商\\浙商人工(单-测试入库-全).xlsx",{d-> + ExcelUtils.multiThreadingModify("d:\\鏁版嵁\\娴欏晢\\娴欏晢浜哄伐(鍗�-娴嬭瘯鍏ュ簱-鍏�).xlsx",{d-> if(d['Y'] && d['S'] && d['S'].toString().toDouble().toInteger()==6){ def results = null def name = null @@ -742,9 +742,9 @@ class ZsPersonProcess { d['AM'] = results.district d['AN'] = results.name - println "输入:"+d['V']+" "+d['W']+" 地图:"+d['Z']+" "+d['AA']+" 匹配:"+results.district+" "+results.name + println "杈撳叆锛�"+d['V']+" "+d['W']+" 鍦板浘锛�"+d['Z']+" "+d['AA']+" 鍖归厤锛�"+results.district+" "+results.name - if(d['V']!="东莞"){ + if(d['V']!="涓滆帪"){ def alias = results.alias if(!alias){ alias = [] @@ -757,11 +757,11 @@ class ZsPersonProcess { if(d['AC'] && d['AD']){ def maplng = null def maplat = null - if(d['Y'] && d['Y']=="高德"){ + if(d['Y'] && d['Y']=="楂樺痉"){ def baidu = BaiDuApiUtils.geoconv(d['AC'].toDouble(), d['AD'].toDouble(), 3) maplng = baidu.x maplat = baidu.y - }else if(d['Y'] && d['Y']=="百度"){ + }else if(d['Y'] && d['Y']=="鐧惧害"){ maplng = d['AC'] maplat = d['AD'] } @@ -770,16 +770,16 @@ class ZsPersonProcess { d['AQ'] = distance.toInteger() -// if(d['V']){//原始数据有区域 +// if(d['V']){//鍘熷鏁版嵁鏈夊尯鍩� if(distance>5000){ if(results.district && d['Z'] && results.district==d['Z']){ if(alias.contains(name)){ }else{ - d['AP'] = "新增小区【"+d['AA']+"】" + d['AP'] = "鏂板灏忓尯銆�"+d['AA']+"銆�" } }else{ - d['AP'] = "新增小区【"+d['AA']+"】" + d['AP'] = "鏂板灏忓尯銆�"+d['AA']+"銆�" } }else{ @@ -787,10 +787,10 @@ class ZsPersonProcess { } }else{ - d['AP'] = "城市需特殊处理" + d['AP'] = "鍩庡競闇�鐗规畩澶勭悊" } }else{ - d['AP'] = "新增小区【"+d['AA']+"】" + d['AP'] = "鏂板灏忓尯銆�"+d['AA']+"銆�" } } },0) @@ -799,7 +799,7 @@ class ZsPersonProcess { def getOptMsg(def d, def name, def results){ def msg = "" - if(results.district && d['Z'] && results.district==d['Z']){//结果与地图区域相同 + if(results.district && d['Z'] && results.district==d['Z']){//缁撴灉涓庡湴鍥惧尯鍩熺浉鍚� if(alias.contains(name)){ if(d['W']){ @@ -812,44 +812,44 @@ class ZsPersonProcess { if(results && results.precise>=0 && results.district == d['V']){ if(results.name!=oldName){ if(results.alias && results.alias.contains(oldName)){ - msg = "已存在,区域相同" + msg = "宸插瓨鍦紝鍖哄煙鐩稿悓" }else{ - msg = "新增小区【"+d['W']+"】" + msg = "鏂板灏忓尯銆�"+d['W']+"銆�" } }else{ - msg = "已存在,区域相同" + msg = "宸插瓨鍦紝鍖哄煙鐩稿悓" } }else{ - msg = "新增小区【"+d['W']+"】" + msg = "鏂板灏忓尯銆�"+d['W']+"銆�" } }else{ if(results.district!=d['V']){ - msg = "输入区域问题" + msg = "杈撳叆鍖哄煙闂" }else{ - msg = "添加别名【"+ d['W'] +"】" + msg = "娣诲姞鍒悕銆�"+ d['W'] +"銆�" } } }else{ if(results.district==d['V']){ - msg = "已存在" + msg = "宸插瓨鍦�" }else{ - msg = "输入区域问题" + msg = "杈撳叆鍖哄煙闂" } } }else{ - msg = "已存在,输入无名称" + msg = "宸插瓨鍦紝杈撳叆鏃犲悕绉�" } }else{ def group = pattern(name) if(group){ - msg = "新增小区【"+name+"】" + msg = "鏂板灏忓尯銆�"+name+"銆�" if(d['W']){ def oldName = nameReplace(d['W'], d['U']) if(oldName==name){ if(d['V'] != d['Z']){ - msg = msg +" 输入区域问题" + msg = msg +" 杈撳叆鍖哄煙闂" } } } @@ -857,27 +857,27 @@ class ZsPersonProcess { }else{ if(distance>1000){ if(d['W'] && results.address && d['AB'] && d['AB'].contains(results.address)){ - msg = "添加别名【"+ d['W'] +"】" + msg = "娣诲姞鍒悕銆�"+ d['W'] +"銆�" }else{ - if(d['X'] && d['AB'] && d['X'].contains("路") && d['X'].contains("号") && d['AB'].contains("路") && d['AB'].contains("号") && d['AB'].contains(d['X'])){ - msg = "新增小区【"+d['AA']+"】" + if(d['X'] && d['AB'] && d['X'].contains("璺�") && d['X'].contains("鍙�") && d['AB'].contains("璺�") && d['AB'].contains("鍙�") && d['AB'].contains(d['X'])){ + msg = "鏂板灏忓尯銆�"+d['AA']+"銆�" } } }else{ - msg = "添加别名【"+ d['W'] +"】" + msg = "娣诲姞鍒悕銆�"+ d['W'] +"銆�" } } d['AP'] = msg } }else{ - msg = "区域不同,距离相近" + msg = "鍖哄煙涓嶅悓锛岃窛绂荤浉杩�" if(!alias.contains(name)){ def group = pattern(name) if(group){ - msg = msg +" 新增小区【"+d['AA']+"】" + msg = msg +" 鏂板灏忓尯銆�"+d['AA']+"銆�" }else{ - msg = msg + " 添加别名【"+ d['W'] +"】" + msg = msg + " 娣诲姞鍒悕銆�"+ d['W'] +"銆�" } } } @@ -885,7 +885,7 @@ class ZsPersonProcess { } def matchDb3(){ - ExcelUtils.multiThreadingModify("d:\\数据\\浙商\\浙商人工(单-测试入库-全).xlsx",{d-> + ExcelUtils.multiThreadingModify("d:\\鏁版嵁\\娴欏晢\\娴欏晢浜哄伐(鍗�-娴嬭瘯鍏ュ簱-鍏�).xlsx",{d-> if(d['Y'] && d['S'] && d['S'].toString().toDouble().toInteger()==6){ def results = null def name = null @@ -904,9 +904,9 @@ class ZsPersonProcess { d['AM'] = results.district d['AN'] = results.name - println "输入:"+d['V']+" "+d['W']+" 地图:"+d['Z']+" "+d['AA']+" 匹配:"+results.district+" "+results.name + println "杈撳叆锛�"+d['V']+" "+d['W']+" 鍦板浘锛�"+d['Z']+" "+d['AA']+" 鍖归厤锛�"+results.district+" "+results.name - if(d['V']!="东莞"){ + if(d['V']!="涓滆帪"){ def alias = getAllAlias(results) def distance = calcuteDistance(d, results.lat, results.lng) d['AO'] = distance.toInteger() @@ -917,70 +917,70 @@ class ZsPersonProcess { def group = pattern(name) if(group){ if(alias.contains(name)){ - d['AQ'] = "已存在[距离远]" + d['AQ'] = "宸插瓨鍦╗璺濈杩淽" }else{ - d['AQ'] = "新增【"+d['AA']+"】[距离远]" + d['AQ'] = "鏂板銆�"+d['AA']+"銆慬璺濈杩淽" } }else{ if(results.district==d['Z'] && score1>7){ - d['AQ'] = "已存在[距离远]" + d['AQ'] = "宸插瓨鍦╗璺濈杩淽" if(results.district!=d['V']){ - d['AQ'] = "已存在[距离远][输入区域有误]" + d['AQ'] = "宸插瓨鍦╗璺濈杩淽[杈撳叆鍖哄煙鏈夎]" } }else if(score1<=3){ - d['AQ'] = "匹配可疑[距离远]" + d['AQ'] = "鍖归厤鍙枒[璺濈杩淽" }else{ - d['AQ'] = "其它可疑[距离远]" + d['AQ'] = "鍏跺畠鍙枒[璺濈杩淽" } } }else{ if(results.district==d['Z'] && score1>7){ - d['AQ'] = "已存在[距离近]" + d['AQ'] = "宸插瓨鍦╗璺濈杩慮" if(results.district!=d['V']){ - d['AQ'] = "已存在[距离近][输入区域有误]" + d['AQ'] = "宸插瓨鍦╗璺濈杩慮[杈撳叆鍖哄煙鏈夎]" } }else if(score1<=3){ - d['AQ'] = "匹配可疑[距离近]" + d['AQ'] = "鍖归厤鍙枒[璺濈杩慮" }else if(score1>3 && score1<=7){ if(distance<1000){ if(alias.contains(name)){ - d['AQ'] = "已存在[距离近]" + d['AQ'] = "宸插瓨鍦╗璺濈杩慮" if(results.district!=d['V']){ - d['AQ'] = "已存在[距离近][输入区域有误]" + d['AQ'] = "宸插瓨鍦╗璺濈杩慮[杈撳叆鍖哄煙鏈夎]" } }else{ - d['AQ'] = "加别名[距离近]" + d['AQ'] = "鍔犲埆鍚峓璺濈杩慮" if(results.district!=d['V']){ - d['AQ'] = "加别名[距离近][输入区域有误]" + d['AQ'] = "鍔犲埆鍚峓璺濈杩慮[杈撳叆鍖哄煙鏈夎]" } def group = pattern(name) def group1 = pattern(results.name) if(group && group!=group1){ - d['AQ'] = "加别名[距离近][分期]" + d['AQ'] = "鍔犲埆鍚峓璺濈杩慮[鍒嗘湡]" } } }else{ - d['AQ'] = "待定" + d['AQ'] = "寰呭畾" if(results.address && d['AB'] && d['AB'].contains(results.address)){ - d['AQ'] = "加别名[距离近][路相关]" + d['AQ'] = "鍔犲埆鍚峓璺濈杩慮[璺浉鍏砞" } } }else if(results.district!=d['Z'] && score1>7){ - d['AQ'] = "[距离近][区域不同]" + d['AQ'] = "[璺濈杩慮[鍖哄煙涓嶅悓]" def group = pattern(name) def group1 = pattern(results.name) if(group && group!=group1){ - d['AQ'] = "[距离近][区域不同][分期]" + d['AQ'] = "[璺濈杩慮[鍖哄煙涓嶅悓][鍒嗘湡]" } } } }else{ - d['AQ'] = "城市需特殊处理" + d['AQ'] = "鍩庡競闇�鐗规畩澶勭悊" } }else{ - d['AQ'] = "新增小区【"+d['AA']+"】" + d['AQ'] = "鏂板灏忓尯銆�"+d['AA']+"銆�" } } },0) @@ -990,9 +990,9 @@ class ZsPersonProcess { def saveOrUpdate(){ def dists =[] def rows = [] - ExcelUtils.modify("d:\\数据\\浙商\\浙商人工(单-测试入库-全).xlsx",{d-> + ExcelUtils.modify("d:\\鏁版嵁\\娴欏晢\\娴欏晢浜哄伐(鍗�-娴嬭瘯鍏ュ簱-鍏�).xlsx",{d-> if(d['Y'] && d['S'] && d['S'].toString().toDouble().toInteger()==6) { - if(d['AQ'] && d['AQ'].contains("新增")){ + if(d['AQ'] && d['AQ'].contains("鏂板")){ if(d['U'] && d['Z'] && d['AA']){ def name = nameReplace(d['AA'], d['U']) def key = d['U']+"##"+d['Z']+"##"+name @@ -1003,7 +1003,7 @@ class ZsPersonProcess { def lng2 = null def lat = null def lng = null - if(d['Y']=="高德"){ + if(d['Y']=="楂樺痉"){ lng = (d['AC'].toDouble()*10000000000).longValue() lat = (d['AD'].toDouble()*10000000000).longValue() def gmap = GeocodeUtils.getGaodeToBaidu(d['AC'].toDouble(), d['AD'].toDouble()) @@ -1011,7 +1011,7 @@ class ZsPersonProcess { lng2 = (gmap.get("lng")*10000000000).longValue() lat2 = (gmap.get("lat")*10000000000).longValue() } - }else if(d['Y']=="百度"){ + }else if(d['Y']=="鐧惧害"){ lng2 = (d['AC'].toDouble()*10000000000).longValue() lat2 = (d['AD'].toDouble()*10000000000).longValue() def gmap = GeocodeUtils.geoconvBaiduToGoogle(d['AC'].toDouble(), d['AD'].toDouble()) @@ -1020,12 +1020,12 @@ class ZsPersonProcess { lat = (gmap.get("lat")*10000000000).longValue() } } - def estateType = "普通住宅" + def estateType = "鏅�氫綇瀹�" if(d['AF']){ - if(d['AF'].contains("别墅")){ - estateType = "别墅" - }else if(d['AF'].contains("商住")){ - estateType = "商住" + if(d['AF'].contains("鍒")){ + estateType = "鍒" + }else if(d['AF'].contains("鍟嗕綇")){ + estateType = "鍟嗕綇" } } def alias = [] @@ -1052,25 +1052,25 @@ class ZsPersonProcess { if(!obj){ saveData(row[0], row[1], row[2], row[3], row[4], row[5], row[6], row[7], row[8], row[9]) FangjiaClientUtils.sendDistrictPriceCalculate(row[0], row[1], row[2], 4); - println "【新增】 ${row[0]} ${row[1]} ${row[2]}" + println "銆愭柊澧炪�� ${row[0]} ${row[1]} ${row[2]}" }else{ - println "【已存在】 ${row[0]} ${row[1]} ${row[2]}" + println "銆愬凡瀛樺湪銆� ${row[0]} ${row[1]} ${row[2]}" } }else{ - println "区域不能标准化 -- ${row[0]} ${row[1]} ${row[2]}" + println "鍖哄煙涓嶈兘鏍囧噯鍖� -- ${row[0]} ${row[1]} ${row[2]}" } } - println "【add】"+dists.size() + println "銆恆dd銆�"+dists.size() } def updateLocation(){ def keys = [] - ExcelUtils.modify("d:\\数据\\浙商\\测试.xlsx", { d -> + ExcelUtils.modify("d:\\鏁版嵁\\娴欏晢\\娴嬭瘯.xlsx", { d -> if (d['Y'] && d['S'] && d['S'].toString().toDouble().toInteger() == 6) { - if (d['AQ'] && d['AQ'].contains("已存在[距离远]")) { + if (d['AQ'] && d['AQ'].contains("宸插瓨鍦╗璺濈杩淽")) { if (d['U'] && d['Z'] && d['AA']) { def obj = findData(d['AL'], d['AM'], d['AN']) if(obj){ @@ -1078,7 +1078,7 @@ class ZsPersonProcess { def lng2 = null def lat = null def lng = null - if(d['Y']=="高德"){ + if(d['Y']=="楂樺痉"){ lng = (d['AC'].toDouble()*10000000000).longValue() lat = (d['AD'].toDouble()*10000000000).longValue() def gmap = GeocodeUtils.getGaodeToBaidu(d['AC'].toDouble(), d['AD'].toDouble()) @@ -1086,7 +1086,7 @@ class ZsPersonProcess { lng2 = (gmap.get("lng")*10000000000).longValue() lat2 = (gmap.get("lat")*10000000000).longValue() } - }else if(d['Y']=="百度"){ + }else if(d['Y']=="鐧惧害"){ lng2 = (d['AC'].toDouble()*10000000000).longValue() lat2 = (d['AD'].toDouble()*10000000000).longValue() def gmap = GeocodeUtils.geoconvBaiduToGoogle(d['AC'].toDouble(), d['AD'].toDouble()) @@ -1119,13 +1119,13 @@ class ZsPersonProcess { } def addAlias(){ - ExcelUtils.modify("d:\\数据\\浙商\\测试.xlsx", { d -> + ExcelUtils.modify("d:\\鏁版嵁\\娴欏晢\\娴嬭瘯.xlsx", { d -> if (d['Y'] && d['S'] && d['S'].toString().toDouble().toInteger() == 6) { - if (d['AQ'] && d['AQ'].contains("别名") && !d['AQ'].contains("分期")) { + if (d['AQ'] && d['AQ'].contains("鍒悕") && !d['AQ'].contains("鍒嗘湡")) { if (d['U'] && d['Z'] && d['AA']) { def obj = findData(d['AL'], d['AM'], d['AN']) if(obj){ - def aliasName = d['AA'].replace("(建设中)","") + def aliasName = d['AA'].replace("(寤鸿涓�)","") if(d['AN']!=aliasName){ def alias = obj.alias @@ -1187,7 +1187,7 @@ class ZsPersonProcess { d.put("c_date", new Date()) d.put("m_date", new Date()) def markMap = [:] - markMap.put("data_source", "机器入库") + markMap.put("data_source", "鏈哄櫒鍏ュ簱") d.put("mark_map",markMap) d.put("lat", lat) @@ -1214,11 +1214,11 @@ class ZsPersonProcess { if(d['AC'] && d['AD']){ def maplng = null def maplat = null - if(d['Y'] && d['Y']=="高德"){ + if(d['Y'] && d['Y']=="楂樺痉"){ def baidu = BaiDuApiUtils.geoconv(d['AC'].toDouble(), d['AD'].toDouble(), 3) maplng = baidu.x maplat = baidu.y - }else if(d['Y'] && d['Y']=="百度"){ + }else if(d['Y'] && d['Y']=="鐧惧害"){ maplng = d['AC'] maplat = d['AD'] } @@ -1227,7 +1227,7 @@ class ZsPersonProcess { return distance; } def pattern(def s){ - Pattern pattern = Pattern.compile("(东|南|北|西|甲|乙|丙|丁|一|二|三|四|五|六|七|八|九|十|东|南|西|北|\\w)+(期|区|街区)") + Pattern pattern = Pattern.compile("(涓渱鍗梶鍖梶瑗縷鐢瞸涔檤涓檤涓亅涓�|浜寍涓墊鍥泑浜攟鍏瓅涓億鍏珅涔潀鍗亅涓渱鍗梶瑗縷鍖梶\\w)+(鏈焲鍖簗琛楀尯)") def matcher = pattern.matcher(s) if(matcher.find()){ return matcher.group(); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/districtwash/AddDetailDistrict.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/districtwash/AddDetailDistrict.groovy index a6286194a..a27f65d19 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/districtwash/AddDetailDistrict.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/districtwash/AddDetailDistrict.groovy @@ -26,17 +26,17 @@ class AddDetailDistrict { } def addEstateType(){ - def citys = ["沈阳","哈尔滨","吉林","遵义","淄博","西宁","青岛","大连","宁波"] + def citys = ["娌堥槼","鍝堝皵婊�","鍚夋灄","閬典箟","娣勫崥","瑗垮畞","闈掑矝","澶ц繛","瀹佹尝"] for(def city : citys){ def keys = [] def districts = CommonDatautils.findAllDistrictByCity(city, "district", ["city","region","name","estate_type2"]) for(def d : districts) { if(!d.estate_type2){ - def estateType2 = "普通住宅" - if(d.name.contains("别墅")){ - estateType2 = "别墅" - }else if(d.name.contains("商住")){ - estateType2 = "商住" + def estateType2 = "鏅�氫綇瀹�" + if(d.name.contains("鍒")){ + estateType2 = "鍒" + }else if(d.name.contains("鍟嗕綇")){ + estateType2 = "鍟嗕綇" } DBObject update = new BasicDBObject(); update.put('$set', new BasicDBObject("estate_type2", estateType2).append("m_date", new Date())); @@ -70,8 +70,8 @@ class AddDetailDistrict { } def run() { - def citys = ["沈阳", "哈尔滨", "吉林", "遵义", "淄博", "西宁", "青岛", "大连", "宁波"]//CcbCommonUtils.citys; - //第三方均价数据匹配 + def citys = ["娌堥槼", "鍝堝皵婊�", "鍚夋灄", "閬典箟", "娣勫崥", "瑗垮畞", "闈掑矝", "澶ц繛", "瀹佹尝"]//CcbCommonUtils.citys; + //绗笁鏂瑰潎浠锋暟鎹尮閰� for (def city : citys) { def rets = findAllDataByCity(city) def rMap = getMatchDistrict(city) @@ -97,7 +97,7 @@ class AddDetailDistrict { key = d.city+"#"+newRegion+"#"+name } if(flag && !saveDistKeys.contains(key)){ - def gdData = FangjiaClientUtils.getMapData(d.city, newRegion, name, d.address,"", "高德") + def gdData = FangjiaClientUtils.getMapData(d.city, newRegion, name, d.address,"", "楂樺痉") def lng2 = null def lat2 = null def lng = null diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/districtwash/AddThirdDistrictField.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/districtwash/AddThirdDistrictField.groovy index 0d84f4f75..8e6c5d2b2 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/districtwash/AddThirdDistrictField.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/districtwash/AddThirdDistrictField.groovy @@ -20,7 +20,7 @@ class AddThirdDistrictField { task.run() } def run(){ - def datas = findDatas("搜房","福州"); + def datas = findDatas("鎼滄埧","绂忓窞"); match(datas); } @@ -50,8 +50,8 @@ class AddThirdDistrictField { if(d.estate_charge && !district.estate_charge){ def chargeStr = "" - if(d.estate_charge.contains("至")){ - chargeStr = d.estate_charge.substring(d.estate_charge.indexOf("至")+1, d.estate_charge.size()); + if(d.estate_charge.contains("鑷�")){ + chargeStr = d.estate_charge.substring(d.estate_charge.indexOf("鑷�")+1, d.estate_charge.size()); }else{ chargeStr = d.estate_charge } @@ -91,20 +91,20 @@ class AddThirdDistrictField { static def getBuildStructureValue(def build_structure){ if(build_structure){ def rets = [] - if(build_structure.indexOf("砖木")>-1){ - rets << "砖木结构" + if(build_structure.indexOf("鐮栨湪")>-1){ + rets << "鐮栨湪缁撴瀯" } - if(build_structure.indexOf("钢结构")>-1){ - rets << "钢结构"; + if(build_structure.indexOf("閽㈢粨鏋�")>-1){ + rets << "閽㈢粨鏋�"; } - if(build_structure.indexOf("钢、钢筋混凝土")>-1){ - rets << "钢、钢筋混凝土结构"; + if(build_structure.indexOf("閽€�侀挗绛嬫贩鍑濆湡")>-1){ + rets << "閽€�侀挗绛嬫贩鍑濆湡缁撴瀯"; } - if(build_structure.indexOf("钢筋混凝土")>-1||build_structure.indexOf("钢混")>-1){ - rets << "钢筋混凝土结构"; + if(build_structure.indexOf("閽㈢瓔娣峰嚌鍦�")>-1||build_structure.indexOf("閽㈡贩")>-1){ + rets << "閽㈢瓔娣峰嚌鍦熺粨鏋�"; } - if(build_structure.indexOf("混合")>-1){ - rets << "混合结构"; + if(build_structure.indexOf("娣峰悎")>-1){ + rets << "娣峰悎缁撴瀯"; } return rets.join(",") } @@ -113,15 +113,15 @@ class AddThirdDistrictField { static def processHouseholdCount(def household_count, def estateType2){ if(household_count){ - household_count = household_count.replace("户","") + household_count = household_count.replace("鎴�","") household_count = household_count.toInteger() - if(estateType2=="普通住宅" || estateType2=="商住"){ + if(estateType2=="鏅�氫綇瀹�" || estateType2=="鍟嗕綇"){ if(household_count>=50 && household_count<=100000){ return household_count; }else{ return null; } - }else if(estateType2=="别墅"){ + }else if(estateType2=="鍒"){ if(household_count>=20 && household_count<=100000){ return household_count; }else{ @@ -136,10 +136,10 @@ class AddThirdDistrictField { if(estateCharege){ try{ estateCharege = trimChar(estateCharege); - estateCharege = estateCharege.replace("元/平米/月","").replace("元/平方米/月","").replace("元/?O?月","") + estateCharege = estateCharege.replace("鍏�/骞崇背/鏈�","").replace("鍏�/骞虫柟绫�/鏈�","").replace("鍏�/?O?鏈�","") estateCharege = estateCharege.toDouble() - if(estateType2=="普通住宅"){ - if(city=="上海" || city=="北京" || city=="广州" || city=="杭州"){ + if(estateType2=="鏅�氫綇瀹�"){ + if(city=="涓婃捣" || city=="鍖椾含" || city=="骞垮窞" || city=="鏉窞"){ if(estateCharege>=0.6 && estateCharege<=3.5){ return estateCharege }else{ @@ -152,13 +152,13 @@ class AddThirdDistrictField { return null; } } - }else if(estateType2=="别墅"){ + }else if(estateType2=="鍒"){ if(estateCharege>=3){ return estateCharege; }else{ return null; } - }else if(estateType2=="商住"){ + }else if(estateType2=="鍟嗕綇"){ if(estateCharege>=4){ return estateCharege; }else{ @@ -166,7 +166,7 @@ class AddThirdDistrictField { } } }catch (Exception e){ - println "estateCharege 转不了 "+estateCharege + println "estateCharege 杞笉浜� "+estateCharege } } return estateCharege; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/districtwash/DistrictAddressSameProcess.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/districtwash/DistrictAddressSameProcess.groovy index 26b20b3e3..955da7519 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/districtwash/DistrictAddressSameProcess.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/districtwash/DistrictAddressSameProcess.groovy @@ -13,7 +13,7 @@ class DistrictAddressSameProcess { task.run(); } def run(){ - def citys = ["上海"]//CommonDatautils.findAllCity() + def citys = ["涓婃捣"]//CommonDatautils.findAllCity() for(def city :citys) { def districts = CommonDatautils.findAllDistrictByCity(city, "district", ["city", "region", "name", "alias", "address", "addr_alias"]) def sameAddressMap = getSameAddressDistricts(city, districts); @@ -35,7 +35,7 @@ class DistrictAddressSameProcess { dists << dist } } - println "原始地址共:"+map.size() + println "鍘熷鍦板潃鍏憋細"+map.size() def newMap = [:] map.each {k,list-> if(list.size()>1){ @@ -45,12 +45,12 @@ class DistrictAddressSameProcess { newMap.put(k, list) } } - println "【${city}】多地址共:"+newMap.size() + println "銆�${city}銆戝鍦板潃鍏憋細"+newMap.size() // if(newMap.size()>0){ // def count = 0 // newMap.each {k,v-> // count++ -// println "【${count}】Address:"+k +// println "銆�${count}銆慉ddress:"+k // for(int i=0;i def districts = CommonDatautils.findAllDistrictByCity(city, "district",["city","region","name","address","m_date"]) districts = getConformDistrict(districts) println city +" "+districts.size() matchMap(districts); - ExcelUtils.write("D:\\数据\\小区\\建行待清理数据("+city+").xlsx",districts,"数据") + ExcelUtils.write("D:\\鏁版嵁\\灏忓尯\\寤鸿寰呮竻鐞嗘暟鎹�("+city+").xlsx",districts,"鏁版嵁") } } @@ -48,7 +48,7 @@ class DistrictTypeCheck { mapDetail(ret); println "${totalCount.get()} " + ret } catch (Exception e) { - println "异常" + println "寮傚父" e.printStackTrace(); } finally { latch.countDown() @@ -65,7 +65,7 @@ class DistrictTypeCheck { def mapDetail(def ret){ - def gdData = FangjiaClientUtils.getMapData(ret[0], ret[1], ret[2], ret[3],"", "高德") + def gdData = FangjiaClientUtils.getMapData(ret[0], ret[1], ret[2], ret[3],"", "楂樺痉") if(gdData && ret[2]==gdData.name){ ret[4] = gdData.district ret[5] = gdData.name @@ -73,7 +73,7 @@ class DistrictTypeCheck { ret[7] = gdData.type } - def bdData = FangjiaClientUtils.getMapData(ret[0], ret[1], ret[2], ret[3],"", "百度") + def bdData = FangjiaClientUtils.getMapData(ret[0], ret[1], ret[2], ret[3],"", "鐧惧害") if(bdData && ret[2]==bdData.name) { ret[8] = bdData.district ret[9] = bdData.name @@ -87,7 +87,7 @@ class DistrictTypeCheck { def getConformDistrict(districts){ def dists = [] - dists << ["城市","区域","小区名","地址","高德区域","高德名称","高德地址","高德类型","百度区域","百度名称","百度地址","百度类型" ] + dists << ["鍩庡競","鍖哄煙","灏忓尯鍚�","鍦板潃","楂樺痉鍖哄煙","楂樺痉鍚嶇О","楂樺痉鍦板潃","楂樺痉绫诲瀷","鐧惧害鍖哄煙","鐧惧害鍚嶇О","鐧惧害鍦板潃","鐧惧害绫诲瀷" ] for(def dist : districts){ def mDate = DateUtils.formatDateByPattern(dist.m_date, "yyyy-MM-dd") if(mDate && mDate.contains("2020-08-04")){ @@ -98,9 +98,9 @@ class DistrictTypeCheck { } def process(){ - def files = ["D:\\数据\\小区\\建行待清理数据(西安).xlsx","D:\\数据\\小区\\建行待清理数据(重庆).xlsx","D:\\数据\\小区\\建行待清理数据(苏州).xlsx"] - def gdfilters = ["商务住宅;楼宇;商住两用楼宇","商务住宅;楼宇;商住两用楼宇|商务住宅;住宅区;住宅区","商务住宅;楼宇;商住两用楼宇|商务住宅;住宅区;住宅小区","商务住宅;商务住宅相关;商务住宅相关","商务住宅;住宅区;别墅","商务住宅;住宅区;别墅|商务住宅;住宅区;住宅小区","商务住宅;住宅区;社区中心|商务住宅;住宅区;住宅小区","商务住宅;住宅区;宿舍","商务住宅;住宅区;宿舍|商务住宅;住宅区;住宅小区","商务住宅;住宅区;住宅小区","商务住宅;住宅区;住宅区","商务住宅;住宅区;住宅小区|商务住宅;住宅区;宿舍","商务住宅;住宅区;住宅小区|商务住宅;住宅区;别墅","商务住宅;住宅区;住宅小区|商务住宅;楼宇;商住两用楼宇","商务住宅;住宅区;住宅小区|商务住宅;住宅区;社区中心","商务住宅;住宅区;住宅小区|商务住宅;楼宇;楼宇相关"] - def bdfilters = ["房地产;住宅区","房地产","房地产;宿舍","房地产;其他"] + def files = ["D:\\鏁版嵁\\灏忓尯\\寤鸿寰呮竻鐞嗘暟鎹�(瑗垮畨).xlsx","D:\\鏁版嵁\\灏忓尯\\寤鸿寰呮竻鐞嗘暟鎹�(閲嶅簡).xlsx","D:\\鏁版嵁\\灏忓尯\\寤鸿寰呮竻鐞嗘暟鎹�(鑻忓窞).xlsx"] + def gdfilters = ["鍟嗗姟浣忓畢;妤煎畤;鍟嗕綇涓ょ敤妤煎畤","鍟嗗姟浣忓畢;妤煎畤;鍟嗕綇涓ょ敤妤煎畤|鍟嗗姟浣忓畢;浣忓畢鍖�;浣忓畢鍖�","鍟嗗姟浣忓畢;妤煎畤;鍟嗕綇涓ょ敤妤煎畤|鍟嗗姟浣忓畢;浣忓畢鍖�;浣忓畢灏忓尯","鍟嗗姟浣忓畢;鍟嗗姟浣忓畢鐩稿叧;鍟嗗姟浣忓畢鐩稿叧","鍟嗗姟浣忓畢;浣忓畢鍖�;鍒","鍟嗗姟浣忓畢;浣忓畢鍖�;鍒|鍟嗗姟浣忓畢;浣忓畢鍖�;浣忓畢灏忓尯","鍟嗗姟浣忓畢;浣忓畢鍖�;绀惧尯涓績|鍟嗗姟浣忓畢;浣忓畢鍖�;浣忓畢灏忓尯","鍟嗗姟浣忓畢;浣忓畢鍖�;瀹胯垗","鍟嗗姟浣忓畢;浣忓畢鍖�;瀹胯垗|鍟嗗姟浣忓畢;浣忓畢鍖�;浣忓畢灏忓尯","鍟嗗姟浣忓畢;浣忓畢鍖�;浣忓畢灏忓尯","鍟嗗姟浣忓畢;浣忓畢鍖�;浣忓畢鍖�","鍟嗗姟浣忓畢;浣忓畢鍖�;浣忓畢灏忓尯|鍟嗗姟浣忓畢;浣忓畢鍖�;瀹胯垗","鍟嗗姟浣忓畢;浣忓畢鍖�;浣忓畢灏忓尯|鍟嗗姟浣忓畢;浣忓畢鍖�;鍒","鍟嗗姟浣忓畢;浣忓畢鍖�;浣忓畢灏忓尯|鍟嗗姟浣忓畢;妤煎畤;鍟嗕綇涓ょ敤妤煎畤","鍟嗗姟浣忓畢;浣忓畢鍖�;浣忓畢灏忓尯|鍟嗗姟浣忓畢;浣忓畢鍖�;绀惧尯涓績","鍟嗗姟浣忓畢;浣忓畢鍖�;浣忓畢灏忓尯|鍟嗗姟浣忓畢;妤煎畤;妤煎畤鐩稿叧"] + def bdfilters = ["鎴垮湴浜�;浣忓畢鍖�","鎴垮湴浜�","鎴垮湴浜�;瀹胯垗","鎴垮湴浜�;鍏朵粬"] for(def path : files){ def datas = ExcelUtils.read(path, 0, 1) @@ -130,7 +130,7 @@ class DistrictTypeCheck { } } - println path +" 共:"+ datas.size()+" 删除不合理:"+deleteIndex + println path +" 鍏憋細"+ datas.size()+" 鍒犻櫎涓嶅悎鐞嗭細"+deleteIndex } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/districtwash/DistrictTypeUpdate.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/districtwash/DistrictTypeUpdate.groovy index 8608b9a8f..f7841d5e0 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/districtwash/DistrictTypeUpdate.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/districtwash/DistrictTypeUpdate.groovy @@ -15,22 +15,22 @@ class DistrictTypeUpdate { } def updateType(){ - ExcelUtils.modify("D:\\数据\\厦门\\物业类型可疑小区(第二批).xlsx",{d-> + ExcelUtils.modify("D:\\鏁版嵁\\鍘﹂棬\\鐗╀笟绫诲瀷鍙枒灏忓尯(绗簩鎵�).xlsx",{d-> def flag = d['F'] if(flag && flag.toString().toDouble().toInteger()==2){ def name = d['C'] def type = null - if(name && name.toString().contains("商住")){ - type = "商住" + if(name && name.toString().contains("鍟嗕綇")){ + type = "鍟嗕綇" }else{ - type = "别墅" + type = "鍒" } def udata = [:] udata.put("status", "0") udata.put("cat", "district") - udata.put("username", "高娟") + udata.put("username", "楂樺") udata.put("city", d['A']) udata.put("region", d['B']) udata.put("name", d['C']) @@ -52,13 +52,13 @@ class DistrictTypeUpdate { districts.each{d-> def row = null - if(d.name.contains("商住")){ - if(d.estate_type2!="商住") { + if(d.name.contains("鍟嗕綇")){ + if(d.estate_type2!="鍟嗕綇") { row = [d.city, d.region, d.name, d.estate_type2, DateUtils.formatDateByPattern(d.c_date, "yyyy-MM-dd")] } }else{ - if(d.name.contains("墅")){ - if(d.estate_type2!="别墅"){ + if(d.name.contains("澧�")){ + if(d.estate_type2!="鍒"){ row = [d.city, d.region, d.name, d.estate_type2, DateUtils.formatDateByPattern(d.c_date, "yyyy-MM-dd")] } } @@ -70,7 +70,7 @@ class DistrictTypeUpdate { } } } - ExcelUtils.write("d:\\数据\\小区\\物业类型可疑小区.xlsx", datas, "小区") + ExcelUtils.write("d:\\鏁版嵁\\灏忓尯\\鐗╀笟绫诲瀷鍙枒灏忓尯.xlsx", datas, "灏忓尯") } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/districtwash/DistrictWash.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/districtwash/DistrictWash.groovy index b3001091a..7f0113dab 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/districtwash/DistrictWash.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/districtwash/DistrictWash.groovy @@ -34,8 +34,8 @@ class DistrictWash { static main(args) { def task = new DistrictWash(); -// task.shortNameRun()//小于等于2个字的小区名称处理 -// task.nameFilter()//名称包含地块及项目 +// task.shortNameRun()//灏忎簬绛変簬2涓瓧鐨勫皬鍖哄悕绉板鐞� +// task.nameFilter()//鍚嶇О鍖呭惈鍦板潡鍙婇」鐩� // task.sameAddressPrcess(); // task.sameNameProcess() task.nameInAlias() @@ -46,7 +46,7 @@ class DistrictWash { updateShortName() } def updateShortName(){ - def datas = ExcelUtils.read("D:\\数据\\小区\\小区名称--2个字(xi).xlsx",0,1) + def datas = ExcelUtils.read("D:\\鏁版嵁\\灏忓尯\\灏忓尯鍚嶇О--2涓瓧(xi).xlsx",0,1) if(datas){ for(def data : datas){ def flag = data['N'] @@ -106,7 +106,7 @@ class DistrictWash { def citys = CommonDatautils.findAllCity() def rets = [] def map = [:] - rets<< ["城市","区域","名称","地址","id"] + rets<< ["鍩庡競","鍖哄煙","鍚嶇О","鍦板潃","id"] for(def city : citys){ def districts = CommonDatautils.findAllDistrictByCity(city, "district", ["city", "region", "name", "alias", "address", "addr_alias"]) def index = 0 @@ -139,7 +139,7 @@ class DistrictWash { println k +" "+ v } - ExcelUtils.write("D:\\数据\\小区\\小区名称.xlsx",rets,"数据") + ExcelUtils.write("D:\\鏁版嵁\\灏忓尯\\灏忓尯鍚嶇О.xlsx",rets,"鏁版嵁") } def matchMap(rets){ @@ -156,7 +156,7 @@ class DistrictWash { mapDetail(ret); println "${totalCount.get()} " + ret } catch (Exception e) { - println "异常" + println "寮傚父" e.printStackTrace(); } finally { latch.countDown() @@ -172,7 +172,7 @@ class DistrictWash { } def mapDetail(def ret){ - def gdData = FangjiaClientUtils.getMapData(ret[0], ret[1], ret[2], ret[3],"", "高德") + def gdData = FangjiaClientUtils.getMapData(ret[0], ret[1], ret[2], ret[3],"", "楂樺痉") if(gdData && ret[2]==gdData.name){ ret[5] = gdData.district ret[6] = gdData.name @@ -180,7 +180,7 @@ class DistrictWash { ret[8] = gdData.type } - def bdData = FangjiaClientUtils.getMapData(ret[0], ret[1], ret[2], ret[3],"", "百度") + def bdData = FangjiaClientUtils.getMapData(ret[0], ret[1], ret[2], ret[3],"", "鐧惧害") if(bdData && ret[2]==bdData.name) { ret[9] = bdData.district ret[10] = bdData.name @@ -192,15 +192,15 @@ class DistrictWash { def nameFilter(){ - def citys = ["无锡","南京"]//CommonDatautils.findAllCity() + def citys = ["鏃犻敗","鍗椾含"]//CommonDatautils.findAllCity() def index = 0 def rets = [] - //rets<< ["城市","区域","名称","地址","id"] + //rets<< ["鍩庡競","鍖哄煙","鍚嶇О","鍦板潃","id"] for(def city :citys){ def districts = CommonDatautils.findAllDistrictByCity(city, "district", ["city", "region", "name", "alias", "address", "addr_alias","c_date"]) for(def dist : districts){ -// if(dist.name.contains("项目")||dist.name.contains("地块")){ - if(dist.name.contains("路小区")||dist.name.contains("街小区")||dist.name.contains("路住宅")||dist.name.contains("街住宅")){ +// if(dist.name.contains("椤圭洰")||dist.name.contains("鍦板潡")){ + if(dist.name.contains("璺皬鍖�")||dist.name.contains("琛楀皬鍖�")||dist.name.contains("璺綇瀹�")||dist.name.contains("琛椾綇瀹�")){ index++ println index+" "+dist.city+" "+dist.name +" "+ DateUtils.formatDateByPattern(dist.c_date, "yyyy-MM-dd") rets << dist @@ -217,7 +217,7 @@ class DistrictWash { println d.city +" "+d.name+" "+houseCount+" "+d.c_date }else{ delIndex++ - println "${delIndex}[删除] "+d.city +" "+d.name+" "+houseCount+" "+d.c_date + println "${delIndex}[鍒犻櫎] "+d.city +" "+d.name+" "+houseCount+" "+d.c_date def udata = new BasicDBObject() udata.put("status",1) DbUtils.seaweed.update(new BasicDBObject('_id',d._id),new BasicDBObject('$set', udata)) @@ -225,12 +225,12 @@ class DistrictWash { } } - //ExcelUtils.write("D:\\数据\\小区\\小区名称(地块项目).xlsx",rets,"数据") + //ExcelUtils.write("D:\\鏁版嵁\\灏忓尯\\灏忓尯鍚嶇О(鍦板潡椤圭洰).xlsx",rets,"鏁版嵁") } def districtFilterName(districts){ for(def dist : districts){ - if(dist.name.contains("项目")||dist.name.contains("地块")){ + if(dist.name.contains("椤圭洰")||dist.name.contains("鍦板潡")){ println dist.name } } @@ -263,7 +263,7 @@ class DistrictWash { for(def d :v){ def flag = findMapData(d) if(!flag){ - println "[不存在] "+ d + println "[涓嶅瓨鍦╙ "+ d } } } @@ -273,10 +273,10 @@ class DistrictWash { } def findMapData(def dist){ - if(dist.name=="延安中路527号小区"){ + if(dist.name=="寤跺畨涓矾527鍙峰皬鍖�"){ println "eeee" } - def gdData = FangjiaClientUtils.getMapData(dist.city, dist.region, dist.name, dist.address,"", "高德") + def gdData = FangjiaClientUtils.getMapData(dist.city, dist.region, dist.name, dist.address,"", "楂樺痉") def gdFlag = false if(gdData){ def gdName = gdData.name.replace("-","") @@ -286,7 +286,7 @@ class DistrictWash { } } - def bdData = FangjiaClientUtils.getMapData(dist.city, dist.region, dist.name, dist.address,"", "百度") + def bdData = FangjiaClientUtils.getMapData(dist.city, dist.region, dist.name, dist.address,"", "鐧惧害") def bdFlag = false if(bdData && bdData.name){ def bdName = bdData.name.replace("-","") @@ -304,7 +304,7 @@ class DistrictWash { def nameStandard(def name) { if (name.contains("(") && name.contains(")")) { def newName = name.substring(name.indexOf("("), name.indexOf(")") + 1) - if (newName && (newName.contains("路") || newName.contains("街") || newName.contains("大道") || newName.contains("站") || newName.contains("门"))) { + if (newName && (newName.contains("璺�") || newName.contains("琛�") || newName.contains("澶ч亾") || newName.contains("绔�") || newName.contains("闂�"))) { name = name.replace(newName, "") } } @@ -361,14 +361,14 @@ class DistrictWash { } def sameNameProcess(){ - def districts = CommonDatautils.findAllDistrictByCity("中山","district",["city","region","name","address","lat2", "lng2"]) + def districts = CommonDatautils.findAllDistrictByCity("涓北","district",["city","region","name","address","lat2", "lng2"]) def dists1 = [] def dists2 = [] for(def dist : districts){ if(dist.lng2){ dist.lng2 = dist.lng2/10000000000.0d dist.lat2 = dist.lat2/10000000000.0d - if(dist.region=="中山"){ + if(dist.region=="涓北"){ dists1 << dist }else{ dists2 << dist @@ -401,7 +401,7 @@ class DistrictWash { } def nameInAlias(){ - def citys = ["上海"]//CommonDatautils.findAllCity() + def citys = ["涓婃捣"]//CommonDatautils.findAllCity() for(def city :citys) { def districts = CommonDatautils.findAllDistrictByCity(city, "district", ["city", "region", "name", "alias", "address", "addr_alias","lat2","lng2"]) @@ -425,13 +425,13 @@ class DistrictWash { println "[${index}]"+dist.region +" "+dist.address+" "+dist.name+" alias:"+dist.alias +" addr_alias:"+dist.addr_alias println "[${index}]"+d.region +" "+d.address+" "+d.name+" alias:"+d.alias +" addr_alias:"+dist.addr_alias - if(dist.name.contains("期")||d.name.contains("期")||(dist.name.endsWith("区")&&!dist.name.endsWith("小区")) || (d.name.endsWith("区")&&!d.name.endsWith("小区"))){ + if(dist.name.contains("鏈�")||d.name.contains("鏈�")||(dist.name.endsWith("鍖�")&&!dist.name.endsWith("灏忓尯")) || (d.name.endsWith("鍖�")&&!d.name.endsWith("灏忓尯"))){ continue; } - def distData = FangjiaClientUtils.getMapData(dist.city, dist.region, dist.name, dist.address,"", "高德") - def dData = FangjiaClientUtils.getMapData(d.city, d.region, d.name, d.address,"", "高德") + def distData = FangjiaClientUtils.getMapData(dist.city, dist.region, dist.name, dist.address,"", "楂樺痉") + def dData = FangjiaClientUtils.getMapData(d.city, d.region, d.name, d.address,"", "楂樺痉") - if(distData && dData && distData.name != dData.name && distData.name.contains(dist.name) && dData.name.contains(d.name)){//不同,都存在 + if(distData && dData && distData.name != dData.name && distData.name.contains(dist.name) && dData.name.contains(d.name)){//涓嶅悓锛岄兘瀛樺湪 d.alias.remove(dist.name); //updateDist(d._id, d.alias); }else{ @@ -445,7 +445,7 @@ class DistrictWash { println "delete:"+d.name } }else if(dData && dData.name == d.name){ - if(!distData || (distData && !distData.type.contains("房地产"))){ + if(!distData || (distData && !distData.type.contains("鎴垮湴浜�"))){ //deleteDist(dist._id); println "delete:"+dist.name }else{ @@ -479,8 +479,8 @@ class DistrictWash { println "[${index}]" + d.region + " " + d.address +" "+dist.name + " " + d.addr_alias d = margeAlias(dist, d); - def distData = FangjiaClientUtils.getMapData(dist.city, dist.region, dist.name, dist.address,"", "百度") - def dData = FangjiaClientUtils.getMapData(d.city, d.region, d.name, d.address,"", "百度") + def distData = FangjiaClientUtils.getMapData(dist.city, dist.region, dist.name, dist.address,"", "鐧惧害") + def dData = FangjiaClientUtils.getMapData(d.city, d.region, d.name, d.address,"", "鐧惧害") println distance +" "+d.alias +" "+ d.addr_alias } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/dongguanbank/DongGuanBankTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/dongguanbank/DongGuanBankTest.groovy index fe2ab3332..68ee3e1ac 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/dongguanbank/DongGuanBankTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/dongguanbank/DongGuanBankTest.groovy @@ -11,7 +11,7 @@ import org.apache.lucene.queryparser.classic.QueryParser class DongGuanBankTest { static main(args) { def task = new DongGuanBankTest() - def path = "D:\\数据\\东莞银行\\东莞银行测试_输出单价(2).xlsx" + def path = "D:\\鏁版嵁\\涓滆帪閾惰\\涓滆帪閾惰娴嬭瘯_杈撳嚭鍗曚环(2).xlsx" // task.run(path) // task.addPrice(path) task.addMinMaxPrice(path) @@ -19,7 +19,7 @@ class DongGuanBankTest { def run(path){ ExcelUtils.multiThreadingModify(path,{d-> - def city = d['A'].replace("市","") + def city = d['A'].replace("甯�","") if(city){ def region = RegionData.formatRegion(city, d['B']) def results = OpenApiClient.addressMatch(city, d['F'], "property", false, region, d['C']) @@ -36,7 +36,7 @@ class DongGuanBankTest { def addPrice(path){ - ExcelUtils.multiThreadingModify("D:\\数据\\东莞银行\\东莞银行房价数据测试20220916 v2.xlsx", { d -> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\涓滆帪閾惰\\涓滆帪閾惰鎴夸环鏁版嵁娴嬭瘯20220916 v2.xlsx", { d -> if(d['H']){ def dist = CommonDatautils.findDistrict(d['H'], d['I'], d['J'], "district") def priceObj = CommonDatautils.queryDistrictPrice(d['H'], d['I'], d['J'], DateUtils.parseFromTightByPattern("2022-09-11","yyyy-MM-dd")) @@ -49,21 +49,21 @@ class DongGuanBankTest { } if(priceObj.value_type){ if(priceObj.value_type == 1){ - d['S'] = "指导价" + d['S'] = "鎸囧浠�" }else if(priceObj.value_type == 2){ - d['S'] = "自身样本" + d['S'] = "鑷韩鏍锋湰" }else if(priceObj.value_type == 3){ - d['S'] = "第三方" + d['S'] = "绗笁鏂�" }else if(priceObj.value_type == 4){ - d['S'] = "交易数据" + d['S'] = "浜ゆ槗鏁版嵁" }else if(priceObj.value_type == 5){ - d['S'] = "周边楼盘" + d['S'] = "鍛ㄨ竟妤肩洏" }else if(priceObj.value_type == 6){ - d['S'] = "推导" + d['S'] = "鎺ㄥ" }else if(priceObj.value_type == 9){ - d['S'] = "神经网络" + d['S'] = "绁炵粡缃戠粶" }else if(priceObj.value_type == 10){ - d['S'] = "无方式" + d['S'] = "鏃犳柟寮�" } } } @@ -116,8 +116,8 @@ class DongGuanBankTest { /** - * 转义字符串中的特殊字符 - * 仅过滤Lucene regexps, 其他的勿用 + * 杞箟瀛楃涓蹭腑鐨勭壒娈婂瓧绗� + * 浠呰繃婊ucene regexps, 鍏朵粬鐨勫嬁鐢� * @param keyword * @return */ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/es/EsHouseMatchDistrict.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/es/EsHouseMatchDistrict.groovy index 8d353b9b3..b76f421fe 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/es/EsHouseMatchDistrict.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/es/EsHouseMatchDistrict.groovy @@ -33,7 +33,7 @@ class EsHouseMatchDistrict { } def houseRun(){ - def citys = ["杭州"]//CommonUtils.findAllCity(); + def citys = ["鏉窞"]//CommonUtils.findAllCity(); for(def city : citys){ def endDate = DateUtils.parseFromTightByPattern("2021-06-01","yyyy-MM-dd")//DateUtils.truncateDay(new Date()) def startDate = DateUtils.parseFromTightByPattern("2021-01-01","yyyy-MM-dd")//DateUtils.truncateDay(new Date()-1) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/es/EsMonthHouseStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/es/EsMonthHouseStat.groovy index d5d3956e6..6b7c58ebb 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/es/EsMonthHouseStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/es/EsMonthHouseStat.groovy @@ -32,7 +32,7 @@ class EsMonthHouseStat { def statRent(){ def index = 0 - ExcelUtils.multiThreadingModify("D:\\数据\\其它\\租金.xlsx", { d -> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\鍏跺畠\\绉熼噾.xlsx", { d -> index++ def region = RegionData.formatRegion(d['A'], d['B']) if(region){ @@ -63,7 +63,7 @@ class EsMonthHouseStat { } def statDistHouse(){ - ExcelUtils.multiThreadingModify("D:\\数据\\建行\\房产估值\\小区\\大连有效小区确认_2256--查好-1.xlsx",{d-> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\灏忓尯\\澶ц繛鏈夋晥灏忓尯纭_2256--鏌ュソ-1.xlsx",{d-> if(d['B']){ def alias = [] if(d['G']){ @@ -96,10 +96,10 @@ class EsMonthHouseStat { } def run(){ - def citys = ["北京","上海","广州","深圳","重庆","郑州","长沙","西安","成都","东莞","佛山","杭州","合肥","南京","青岛","沈阳","苏州","天津","武汉","珠海","中山","长春","扬州","烟台","徐州","无锡","温州","太原","台州","石家庄","绍兴","厦门","泉州","宁波","南通","南宁","南昌","兰州","常州","大连","福州","贵阳","哈尔滨","海口","惠州","济南","嘉兴","金华","昆明","遵义","淄博","株洲","镇江","肇庆","漳州","湛江","岳阳","银川","宜昌","盐城","芜湖","乌鲁木齐","唐山","泰州","汕头","三亚","清远","秦皇岛","马鞍山","洛阳","柳州","连云港","廊坊","九江","吉林","淮安","湖州","呼和浩特","沧州","保定","安庆","张家口","西宁","日照","拉萨","锦州","大同","常德","北海","文昌","陵水","保亭"] + def citys = ["鍖椾含","涓婃捣","骞垮窞","娣卞湷","閲嶅簡","閮戝窞","闀挎矙","瑗垮畨","鎴愰兘","涓滆帪","浣涘北","鏉窞","鍚堣偉","鍗椾含","闈掑矝","娌堥槼","鑻忓窞","澶╂触","姝︽眽","鐝犳捣","涓北","闀挎槬","鎵窞","鐑熷彴","寰愬窞","鏃犻敗","娓╁窞","澶師","鍙板窞","鐭冲搴�","缁嶅叴","鍘﹂棬","娉夊窞","瀹佹尝","鍗楅��","鍗楀畞","鍗楁槍","鍏板窞","甯稿窞","澶ц繛","绂忓窞","璐甸槼","鍝堝皵婊�","娴峰彛","鎯犲窞","娴庡崡","鍢夊叴","閲戝崕","鏄嗘槑","閬典箟","娣勫崥","鏍床","闀囨睙","鑲囧簡","婕冲窞","婀涙睙","宀抽槼","閾跺窛","瀹滄槍","鐩愬煄","鑺滄箹","涔岄瞾鏈ㄩ綈","鍞愬北","娉板窞","姹曞ご","涓変簹","娓呰繙","绉︾殗宀�","椹瀺灞�","娲涢槼","鏌冲窞","杩炰簯娓�","寤婂潑","涔濇睙","鍚夋灄","娣畨","婀栧窞","鍛煎拰娴╃壒","娌у窞","淇濆畾","瀹夊簡","寮犲鍙�","瑗垮畞","鏃ョ収","鎷夎惃","閿﹀窞","澶у悓","甯稿痉","鍖楁捣","鏂囨槍","闄垫按","淇濅涵"] def rets = [] def dates = ["2020-05","2020-06","2020-07","2020-08","2020-09","2020-10","2020-11","2020-12","2021-01","2021-02","2021-03","2021-04","2021-05"] - def headers = ["城市"] + def headers = ["鍩庡競"] headers.addAll(dates) rets << headers for(def city : citys){ @@ -115,23 +115,23 @@ class EsMonthHouseStat { rets << datas println datas } - ExcelUtils.write("d:\\数据\\建行92个城市房源统计.xlsx", rets, "统计") + ExcelUtils.write("d:\\鏁版嵁\\寤鸿92涓煄甯傛埧婧愮粺璁�.xlsx", rets, "缁熻") } def tradeRun(){ - def citys = ["北京","上海","广州","深圳","重庆","郑州","长沙","西安","成都","东莞","佛山","杭州","合肥","南京","青岛","沈阳","苏州","天津","武汉","珠海","中山","长春","扬州","烟台","徐州","无锡","温州","太原","台州","石家庄","绍兴","厦门","泉州","宁波","南通","南宁","南昌","兰州","常州","大连","福州","贵阳","哈尔滨","海口","惠州","济南","嘉兴","金华","昆明","遵义","淄博","株洲","镇江","肇庆","漳州","湛江","岳阳","银川","宜昌","盐城","芜湖","乌鲁木齐","唐山","泰州","汕头","三亚","清远","秦皇岛","马鞍山","洛阳","柳州","连云港","廊坊","九江","吉林","淮安","湖州","呼和浩特","沧州","保定","安庆","张家口","西宁","日照","拉萨","锦州","大同","常德","北海","文昌","陵水","保亭"] + def citys = ["鍖椾含","涓婃捣","骞垮窞","娣卞湷","閲嶅簡","閮戝窞","闀挎矙","瑗垮畨","鎴愰兘","涓滆帪","浣涘北","鏉窞","鍚堣偉","鍗椾含","闈掑矝","娌堥槼","鑻忓窞","澶╂触","姝︽眽","鐝犳捣","涓北","闀挎槬","鎵窞","鐑熷彴","寰愬窞","鏃犻敗","娓╁窞","澶師","鍙板窞","鐭冲搴�","缁嶅叴","鍘﹂棬","娉夊窞","瀹佹尝","鍗楅��","鍗楀畞","鍗楁槍","鍏板窞","甯稿窞","澶ц繛","绂忓窞","璐甸槼","鍝堝皵婊�","娴峰彛","鎯犲窞","娴庡崡","鍢夊叴","閲戝崕","鏄嗘槑","閬典箟","娣勫崥","鏍床","闀囨睙","鑲囧簡","婕冲窞","婀涙睙","宀抽槼","閾跺窛","瀹滄槍","鐩愬煄","鑺滄箹","涔岄瞾鏈ㄩ綈","鍞愬北","娉板窞","姹曞ご","涓変簹","娓呰繙","绉︾殗宀�","椹瀺灞�","娲涢槼","鏌冲窞","杩炰簯娓�","寤婂潑","涔濇睙","鍚夋灄","娣畨","婀栧窞","鍛煎拰娴╃壒","娌у窞","淇濆畾","瀹夊簡","寮犲鍙�","瑗垮畞","鏃ョ収","鎷夎惃","閿﹀窞","澶у悓","甯稿痉","鍖楁捣","鏂囨槍","闄垫按","淇濅涵"] def rets = [] def rets2 = [] //, //"2021-01","2021-02","2021-03","2021-04","2021-05" //def dates = ["2020-01","2020-02","2020-03","2020-04","2020-05","2020-06","2020-07","2020-08","2020-09","2020-10","2020-11","2020-12"] def dates = ["2021-04"] - def headers = ["城市"] + def headers = ["鍩庡競"] headers.addAll(dates) rets << headers - def headers2 = ["城市"] + def headers2 = ["鍩庡競"] headers2.addAll(dates) rets2 << headers2 for(def city : citys){ @@ -164,13 +164,13 @@ class EsMonthHouseStat { rets2 << datas2 println datas } - ExcelUtils.write("d:\\数据\\建行92个城市成交统计(去重前匹配).xlsx", rets, "统计") + ExcelUtils.write("d:\\鏁版嵁\\寤鸿92涓煄甯傛垚浜ょ粺璁�(鍘婚噸鍓嶅尮閰�).xlsx", rets, "缁熻") - ExcelUtils.write("d:\\数据\\建行92个城市成交统计(去重后匹配).xlsx", rets2, "统计") + ExcelUtils.write("d:\\鏁版嵁\\寤鸿92涓煄甯傛垚浜ょ粺璁�(鍘婚噸鍚庡尮閰�).xlsx", rets2, "缁熻") } def houseRun(){ - ExcelUtils.multiThreadingModify("d:\\数据\\建行\\城市覆盖率统计.xlsx",{d-> + ExcelUtils.multiThreadingModify("d:\\鏁版嵁\\寤鸿\\鍩庡競瑕嗙洊鐜囩粺璁�.xlsx",{d-> def city = d['A'] def count = findHouseCount(city, 20221101, 20230201) d['B'] = count @@ -205,7 +205,7 @@ class EsMonthHouseStat { def statOfficeHouse(){ def citys = CommonDatautils.findAllCity() def allLists = [] - allLists << ["城市", "近一年写字楼出售量", "写字楼量", "近一年出售房源量大于3的写字楼量", "大于3写字楼量占比"] + allLists << ["鍩庡競", "杩戜竴骞村啓瀛楁ゼ鍑哄敭閲�", "鍐欏瓧妤奸噺", "杩戜竴骞村嚭鍞埧婧愰噺澶т簬3鐨勫啓瀛楁ゼ閲�", "澶т簬3鍐欏瓧妤奸噺鍗犳瘮"] citys.each{c-> def count = findHouseCountByCat(c, "office_sell",20240101, 20250201) @@ -243,7 +243,7 @@ class EsMonthHouseStat { allLists << row } - ExcelUtils.write("D:\\数据\\写字楼\\全国写字楼情况占比统计.xlsx", allLists, "写字楼情况") + ExcelUtils.write("D:\\鏁版嵁\\鍐欏瓧妤糪\鍏ㄥ浗鍐欏瓧妤兼儏鍐靛崰姣旂粺璁�.xlsx", allLists, "鍐欏瓧妤兼儏鍐�") } @@ -283,8 +283,8 @@ class EsMonthHouseStat { } /** - * 转义字符串中的特殊字符 - * 仅过滤Lucene regexps, 其他的勿用 + * 杞箟瀛楃涓蹭腑鐨勭壒娈婂瓧绗� + * 浠呰繃婊ucene regexps, 鍏朵粬鐨勫嬁鐢� * @param keyword * @return */ @@ -321,7 +321,7 @@ class EsMonthHouseStat { def q = new BasicDBObject() q.put("city", city) // q.put("region", dist.region) -// q.put("source", "链家在线") +// q.put("source", "閾惧鍦ㄧ嚎") // def alias = [] // if(dist.alias){ @@ -383,7 +383,7 @@ class EsMonthHouseStat { def citys = CommonDatautils.findAllCity() def root = "lianjia.com" def rets = [] - rets << ["城市", "5月上旬","5月中旬","5月下旬", "6月前10天"] + rets << ["鍩庡競", "5鏈堜笂鏃�","5鏈堜腑鏃�","5鏈堜笅鏃�", "6鏈堝墠10澶�"] for(def city : citys){ def count1 = findHouseCount(city, root, 20210501, 20210510) def count2 = findHouseCount(city, root, 20210510, 20210520) @@ -391,7 +391,7 @@ class EsMonthHouseStat { def count4 = findHouseCount(city, root, 20210601, 20210610) rets << [city, count1, count2, count3, count4] } - ExcelUtils.write("d:\\数据\\房源分析\\城市房源分析.xlsx", rets, "数据") + ExcelUtils.write("d:\\鏁版嵁\\鎴挎簮鍒嗘瀽\\鍩庡競鎴挎簮鍒嗘瀽.xlsx", rets, "鏁版嵁") } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/es/ExportHouse.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/es/ExportHouse.groovy index 8dd989f3c..d2e96e4c1 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/es/ExportHouse.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/es/ExportHouse.groovy @@ -7,8 +7,8 @@ import org.elasticsearch.index.query.BoolQueryBuilder import org.elasticsearch.index.query.QueryBuilder import org.elasticsearch.index.query.QueryBuilders -def datas = findHouseCount("北京", 20230201, 20230430) -ExcelUtils.write("D:\\数据\\天弘基金.xlsx", datas, "样例") +def datas = findHouseCount("鍖椾含", 20230201, 20230430) +ExcelUtils.write("D:\\鏁版嵁\\澶╁紭鍩洪噾.xlsx", datas, "鏍蜂緥") @@ -19,7 +19,7 @@ def findHouseCount(def city, def startDate, def endDate){ def startMdate = DateUtils.parseFromTightByPattern(startDate.toString(),"yyyyMMdd") def endMdate = DateUtils.parseFromTightByPattern(endDate.toString(), "yyyyMMdd") - rets << ["城市","区域","板块","名称","面积","单价","总价","室","厅","卫","装修","朝向","发布时间","物业类型","楼层状况","楼高","建筑结构","建筑年代","标题","URL"] + rets << ["鍩庡競","鍖哄煙","鏉垮潡","鍚嶇О","闈㈢Н","鍗曚环","鎬讳环","瀹�","鍘�","鍗�","瑁呬慨","鏈濆悜","鍙戝竷鏃堕棿","鐗╀笟绫诲瀷","妤煎眰鐘跺喌","妤奸珮","寤虹瓚缁撴瀯","寤虹瓚骞翠唬","鏍囬","URL"] 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); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/es/FangjiaCorestieLogAnaly.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/es/FangjiaCorestieLogAnaly.groovy index 6b0f2112c..71d54bd59 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/es/FangjiaCorestieLogAnaly.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/es/FangjiaCorestieLogAnaly.groovy @@ -15,7 +15,7 @@ String address = "jdbc:es://http://192.168.0.86:9200/timezone=UTC&page.size=250& stat() def stat(){ - def datas = ExcelUtils.read("D:\\数据\\fjw-提交3.xlsx",0,1) + def datas = ExcelUtils.read("D:\\鏁版嵁\\fjw-鎻愪氦3.xlsx",0,1) def map=[:] for(def d : datas){ def count = map.get(d['C']) @@ -74,7 +74,7 @@ def findFangjiaLogs(){ Calendar calendar = Calendar.getInstance() calendar.setTime(startDate) def list = [] - def data = [["mid", "ip", "访问时间"]] + def data = [["mid", "ip", "璁块棶鏃堕棿"]] while (startDate.before(endDate)) { calendar.add(Calendar.DATE, 1) def nextDate = calendar.getTime() @@ -114,5 +114,5 @@ def findFangjiaLogs(){ startDate = nextDate } - ExcelUtils.write("D:\\数据\\fjw-提交3.xlsx", data, "查询日志") + ExcelUtils.write("D:\\鏁版嵁\\fjw-鎻愪氦3.xlsx", data, "鏌ヨ鏃ュ織") } \ No newline at end of file diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/es/HouseAnaly.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/es/HouseAnaly.groovy index 626af0640..316b4bc7d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/es/HouseAnaly.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/es/HouseAnaly.groovy @@ -14,7 +14,7 @@ import java.util.concurrent.atomic.AtomicLong class HouseAnaly { - public static final String[] TAGS = ["独栋", "联排", "叠加", "双拼", "花园面积", "泳池", "别墅", "带花园", "洋房", "叠拼", "独院", "联体", "微墅", "大平墅"]; + public static final String[] TAGS = ["鐙爧", "鑱旀帓", "鍙犲姞", "鍙屾嫾", "鑺卞洯闈㈢Н", "娉虫睜", "鍒", "甯﹁姳鍥�", "娲嬫埧", "鍙犳嫾", "鐙櫌", "鑱斾綋", "寰", "澶у钩澧�"]; public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(30) static main(args) { @@ -28,15 +28,15 @@ class HouseAnaly { for(def city : citys){ def districts = CommonDatautils.findAllDistrictByCity(city,"district", ["city","region","name","alias", "estate_type2"]) def rets = processing(districts) - println "[${city}] 写文件 "+rets.size() + println "[${city}] 鍐欐枃浠� "+rets.size() allRets.addAll(rets) } - ExcelUtils.write("d:\\数据\\样本房源分析(20%).xlsx", allRets, "房源分析") + ExcelUtils.write("d:\\鏁版嵁\\鏍锋湰鎴挎簮鍒嗘瀽(20%).xlsx", allRets, "鎴挎簮鍒嗘瀽") } def processing(dists){ def rets = new CopyOnWriteArrayList() - rets << ["小区ID","城市","区域","名称","是否是主名","样本量","最大值","最小值","平均值","中位值","10分位置","90分位置","住宅样本量","别墅样本量","商住样本量"] + rets << ["灏忓尯ID","鍩庡競","鍖哄煙","鍚嶇О","鏄惁鏄富鍚�","鏍锋湰閲�","鏈�澶у��","鏈�灏忓��","骞冲潎鍊�","涓綅鍊�","10鍒嗕綅缃�","90鍒嗕綅缃�","浣忓畢鏍锋湰閲�","鍒鏍锋湰閲�","鍟嗕綇鏍锋湰閲�"] def totalCount = new AtomicLong() final CountDownLatch latch = new CountDownLatch(dists.size()) for(def i=0;i + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\鍐欏瓧妤糪\鍐欏瓧妤肩閲戠粺璁�.xlsx",{d-> def cityObj = CommonDatautils.findAlCityDetail(d['A']) if(cityObj){ if(cityObj.new_city_grade==1000){ - d['P'] = "一线" + d['P'] = "涓�绾�" }else if(cityObj.new_city_grade==1500){ - d['P'] = "新一线" + d['P'] = "鏂颁竴绾�" }else if(cityObj.new_city_grade==2000){ - d['P'] = "二线" + d['P'] = "浜岀嚎" }else if(cityObj.new_city_grade==3000){ - d['P'] = "三线" + d['P'] = "涓夌嚎" }else if(cityObj.new_city_grade==4000){ - d['P'] = "四线" + d['P'] = "鍥涚嚎" }else if(cityObj.new_city_grade==5000){ - d['P'] = "五线" + d['P'] = "浜旂嚎" } } // def count3s = [] @@ -76,36 +76,36 @@ class OfficeStat { def sampleFieldPrecent(){ def citys = CommonDatautils.findAllCity() def rets = [] - rets << ["城市","区域","名称","级别","面积","最高楼","装修","单价(元/平米/天)","发布时间","总量"] + rets << ["鍩庡競","鍖哄煙","鍚嶇О","绾у埆","闈㈢Н","鏈�楂樻ゼ","瑁呬慨","鍗曚环锛堝厓/骞崇背/澶╋級","鍙戝竷鏃堕棿","鎬婚噺"] citys.each { c -> def regionMap = CommonDatautils.getRegionsByCity(c) def ret = sampleFieldStat(c, regionMap, "office_rent") rets.addAll(ret) } ///home/goojia/gj - ExcelUtils.write("D:\\数据\\写字楼\\写字楼租金统计.xlsx", rets, "写字楼租金样本字段覆盖率") + ExcelUtils.write("D:\\鏁版嵁\\鍐欏瓧妤糪\鍐欏瓧妤肩閲戠粺璁�.xlsx", rets, "鍐欏瓧妤肩閲戞牱鏈瓧娈佃鐩栫巼") } def run(){ def citys = CommonDatautils.findAllCity() def rets = [] - rets << ["城市","区域","近1个月样本量","近2个月样本量","近3个月样本量","近4个月样本量","近5个月样本量","近6个月样本量","近7个月样本量","近8个月样本量","近9个月样本量","近10个月样本量","近11个月样本量","近12个月样本量","样本覆盖率(区域走势)" ] + rets << ["鍩庡競","鍖哄煙","杩�1涓湀鏍锋湰閲�","杩�2涓湀鏍锋湰閲�","杩�3涓湀鏍锋湰閲�","杩�4涓湀鏍锋湰閲�","杩�5涓湀鏍锋湰閲�","杩�6涓湀鏍锋湰閲�","杩�7涓湀鏍锋湰閲�","杩�8涓湀鏍锋湰閲�","杩�9涓湀鏍锋湰閲�","杩�10涓湀鏍锋湰閲�","杩�11涓湀鏍锋湰閲�","杩�12涓湀鏍锋湰閲�","鏍锋湰瑕嗙洊鐜�(鍖哄煙璧板娍锛�" ] citys.each{c-> def regionMap = CommonDatautils.getRegionsByCity(c) def ret = statHouse(c, regionMap, "office_rent") rets.addAll(ret) } - ExcelUtils.write("D:\\数据\\写字楼\\写字楼租金统计.xlsx", rets, "写字楼区域租金样本覆盖率") + ExcelUtils.write("D:\\鏁版嵁\\鍐欏瓧妤糪\鍐欏瓧妤肩閲戠粺璁�.xlsx", rets, "鍐欏瓧妤煎尯鍩熺閲戞牱鏈鐩栫巼") } def cityRun(){ def citys = CommonDatautils.findAllCity() def rets = [] - rets << ["城市","区域","近1个月样本量","近2个月样本量","近3个月样本量","近4个月样本量","近5个月样本量","近6个月样本量","近7个月样本量","近8个月样本量","近9个月样本量","近10个月样本量","近11个月样本量","近12个月样本量","样本覆盖率(区域走势)" ] + rets << ["鍩庡競","鍖哄煙","杩�1涓湀鏍锋湰閲�","杩�2涓湀鏍锋湰閲�","杩�3涓湀鏍锋湰閲�","杩�4涓湀鏍锋湰閲�","杩�5涓湀鏍锋湰閲�","杩�6涓湀鏍锋湰閲�","杩�7涓湀鏍锋湰閲�","杩�8涓湀鏍锋湰閲�","杩�9涓湀鏍锋湰閲�","杩�10涓湀鏍锋湰閲�","杩�11涓湀鏍锋湰閲�","杩�12涓湀鏍锋湰閲�","鏍锋湰瑕嗙洊鐜�(鍖哄煙璧板娍锛�" ] citys.each{c-> def ret = statCityHouse(c, "office_rent") rets.addAll(ret) } - ExcelUtils.write("D:\\数据\\写字楼\\写字楼租金统计.xlsx", rets, "写字楼城市租金样本覆盖率") + ExcelUtils.write("D:\\鏁版嵁\\鍐欏瓧妤糪\鍐欏瓧妤肩閲戠粺璁�.xlsx", rets, "鍐欏瓧妤煎煄甯傜閲戞牱鏈鐩栫巼") } def statHouse(city, regionMap, cat){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/fjwPriceBaseData/FjwBigdataCommbuildtypeBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/fjwPriceBaseData/FjwBigdataCommbuildtypeBatch.groovy index 2a94ffa1d..e29d59d65 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/fjwPriceBaseData/FjwBigdataCommbuildtypeBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/fjwPriceBaseData/FjwBigdataCommbuildtypeBatch.groovy @@ -16,15 +16,15 @@ import java.util.concurrent.Executors import java.util.concurrent.atomic.AtomicLong /** - * 房价网内部模型估值项目 - * 小区建筑类型数据同步 + * 鎴夸环缃戝唴閮ㄦā鍨嬩及鍊奸」鐩� + * 灏忓尯寤虹瓚绫诲瀷鏁版嵁鍚屾 */ @BatchOwner(Watcher.GaoJuan) class FjwBigdataCommbuildtypeBatch extends BaseBatch{ public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(40) - //235为房价网内部计算均价的库 + //235涓烘埧浠风綉鍐呴儴璁$畻鍧囦环鐨勫簱 def sqlInstance = Sql.newInstance("jdbc:postgresql://192.168.0.235:5433/fangjia?stringtype=unspecified", "postgres", "Goojia123456", "org.postgresql.Driver") @@ -102,7 +102,7 @@ class FjwBigdataCommbuildtypeBatch extends BaseBatch{ def delPgData(){ sqlInstance.execute("delete from base.bigdata_commbuildtype") - println "base.bigdata_commbuildtype 数据已删除" + println "base.bigdata_commbuildtype 鏁版嵁宸插垹闄�" } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/fjwPriceBaseData/FjwBigdataCommunityBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/fjwPriceBaseData/FjwBigdataCommunityBatch.groovy index eb2cbf34a..e5a41cea3 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/fjwPriceBaseData/FjwBigdataCommunityBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/fjwPriceBaseData/FjwBigdataCommunityBatch.groovy @@ -23,8 +23,8 @@ import java.util.concurrent.atomic.AtomicLong import java.util.regex.Pattern /** - * 房价网内部估值项目使用 - * 小区数据同步 + * 鎴夸环缃戝唴閮ㄤ及鍊奸」鐩娇鐢� + * 灏忓尯鏁版嵁鍚屾 */ @BatchOwner(Watcher.GaoJuan) @@ -32,7 +32,7 @@ class FjwBigdataCommunityBatch extends BaseBatch{ public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(10) - //235为房价网内部计算均价的库 + //235涓烘埧浠风綉鍐呴儴璁$畻鍧囦环鐨勫簱 def sqlInstance = Sql.newInstance("jdbc:postgresql://192.168.0.235:5433/fangjia?stringtype=unspecified", "postgres", "Goojia123456", "org.postgresql.Driver") @@ -46,15 +46,15 @@ class FjwBigdataCommunityBatch extends BaseBatch{ def citys = CcbCommonUtils.getRunningCitys(["all"]) def rows = [] - def headers = []//["城市ID","行政区ID","小区ID","行政区名称","小区名称","详细地址","纬度","经度","占地总面积","建筑总面积","绿化率","容积率","车位数量","建筑年代","房屋用途", - //"总套数","数据时间","更新标记","更新时间","小区类型","小区曾用名","街道","门牌号","是否新盘","小区介绍","备注","创建时间","来源公司", - //"乡镇/街道办","逻辑行政区划代码","逻辑行政区划"] + def headers = []//["鍩庡競ID","琛屾斂鍖篒D","灏忓尯ID","琛屾斂鍖哄悕绉�","灏忓尯鍚嶇О","璇︾粏鍦板潃","绾害","缁忓害","鍗犲湴鎬婚潰绉�","寤虹瓚鎬婚潰绉�","缁垮寲鐜�","瀹圭Н鐜�","杞︿綅鏁伴噺","寤虹瓚骞翠唬","鎴垮眿鐢ㄩ��", + //"鎬诲鏁�","鏁版嵁鏃堕棿","鏇存柊鏍囪","鏇存柊鏃堕棿","灏忓尯绫诲瀷","灏忓尯鏇剧敤鍚�","琛楅亾","闂ㄧ墝鍙�","鏄惁鏂扮洏","灏忓尯浠嬬粛","澶囨敞","鍒涘缓鏃堕棿","鏉ユ簮鍏徃", + //"涔¢晣/琛楅亾鍔�","閫昏緫琛屾斂鍖哄垝浠g爜","閫昏緫琛屾斂鍖哄垝"] def cityCodeDataMap = CcbCommonUtils.findCityCodeValue() def index = 0 def today = new Date().getDate() def fangjiaDists = new HashSet() - println "starting 。。。。。。。。。" + println "starting 銆傘�傘�傘�傘�傘�傘�傘�傘��" for(def city : citys){ index ++ def distCodeMap = CcbCommonUtils.findAllDistrictCodeValue(city) @@ -64,12 +64,12 @@ class FjwBigdataCommunityBatch extends BaseBatch{ fangjiaDists << d._id.toString() } - def ccbMaps = findPgCcbDistrict(cityCodeDataMap.get(city)) //估值导数时使用 + def ccbMaps = findPgCcbDistrict(cityCodeDataMap.get(city)) //浼板�煎鏁版椂浣跨敤 def rets = createCityDatas(cityCodeDataMap, distCodeMap, dists) rets = addDeleteDist(dists, ccbMaps, rets, fangjiaDists) rows.addAll(rets) - println "[${index}] "+city +" 小区量:"+dists.size()+" 总:"+rets.size() + println "[${index}] "+city +" 灏忓尯閲忥細"+dists.size()+" 鎬伙細"+rets.size() } // if(today > 10){ @@ -80,7 +80,7 @@ class FjwBigdataCommunityBatch extends BaseBatch{ def addDeleteDist(dists, ccbMaps, rets, fangjiaDists){ - println "房价网小区:"+fangjiaDists.size()+" 建行小区:"+rets.size() + println "鎴夸环缃戝皬鍖猴細"+fangjiaDists.size()+" 寤鸿灏忓尯锛�"+rets.size() def ccbDists = ccbMaps.keySet() for(def ccbId : ccbDists){ if(!fangjiaDists.contains(ccbId)){ @@ -89,7 +89,7 @@ class FjwBigdataCommunityBatch extends BaseBatch{ rets << datas } } - println "添加删除状态小区:"+rets.size() + println "娣诲姞鍒犻櫎鐘舵�佸皬鍖猴細"+rets.size() return rets } @@ -125,7 +125,7 @@ class FjwBigdataCommunityBatch extends BaseBatch{ try{ def data = distCodeMap.get(dist.region) if(!data){ - println dist.city +" "+dist.region +" "+dist.name+" 没有找到对应的区域" + println dist.city +" "+dist.region +" "+dist.name+" 娌℃湁鎵惧埌瀵瑰簲鐨勫尯鍩�" return ret; } @@ -269,7 +269,7 @@ class FjwBigdataCommunityBatch extends BaseBatch{ def delPgData(){ sqlInstance.execute("delete from base.bigdata_community") - println "base.bigdata_community 数据已删除" + println "base.bigdata_community 鏁版嵁宸插垹闄�" } def saveToPgSql(rows){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/fjwPriceBaseData/FjwBigdataDealBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/fjwPriceBaseData/FjwBigdataDealBatch.groovy index 68e46f8e3..4b48af714 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/fjwPriceBaseData/FjwBigdataDealBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/fjwPriceBaseData/FjwBigdataDealBatch.groovy @@ -20,8 +20,8 @@ import java.util.concurrent.atomic.AtomicInteger import java.util.concurrent.atomic.AtomicLong import java.util.regex.Pattern /** - * 建行模型估值项目 - * 成交数据同步 + * 寤鸿妯″瀷浼板�奸」鐩� + * 鎴愪氦鏁版嵁鍚屾 */ @BatchOwner(Watcher.GaoJuan) class FjwBigdataDealBatch extends BaseBatch{ @@ -31,7 +31,7 @@ class FjwBigdataDealBatch extends BaseBatch{ def curDate = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMMdd"), -1, "yyyyMMdd")); public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(30) - def sourceMap = ["冰山成交":"bingshanai.com","贝壳找房":"ke.com","我爱我家":"5i5j.com","链家在线":"lianjia.com","房天下":"fang.com","中原地产":"centanet.com","福州不动产":"","搜房":"fang.com", "幸福里":"xflapp.com",] + def sourceMap = ["鍐板北鎴愪氦":"bingshanai.com","璐濆3鎵炬埧":"ke.com","鎴戠埍鎴戝":"5i5j.com","閾惧鍦ㄧ嚎":"lianjia.com","鎴垮ぉ涓�":"fang.com","涓師鍦颁骇":"centanet.com","绂忓窞涓嶅姩浜�":"","鎼滄埧":"fang.com", "骞哥閲�":"xflapp.com",] public static final def offlineUrl = "mongodb://developer:G00IDCDEV12385@192.168.0.136:28017"; public static final DBCollection youda_esfhouse_coll = MongoUtils.getCollectionByName2("business", "res_esfdealprice", offlineUrl) @@ -60,7 +60,7 @@ class FjwBigdataDealBatch extends BaseBatch{ } def rows = [] - def headers = []//["城市ID","成交ID","城市名称","行政区ID","行政区名称","街道","门牌号","小区ID","小区名称","楼栋ID","楼栋编号","楼栋名称","单元ID","单元编号","单元名称","户ID","详细地址","建筑年代","权属","权属年限","期数","所在楼层","层类型","总楼层数","建筑类型","建筑结构","建筑面积","套内面积","户型","室","厅","厨","卫","房屋用途","室内结构","朝向","装修情况","评估编号","成交单价","成交总价","申报总价","评估总价","网签合同编号","交易日期","交易类型","出售付款方式","成交周期","是否有电梯","赠送面积(地面花园)","赠送面积(露台)","赠送面积(阳台)","赠送面积(飘窗)","赠送面积(阁楼)","赠送面积(车库)","赠送面积(地下室)","赠送面积(其他)","房源数据来源","中介公司ID","中介公司名称","备注","创建时间","更新时间","来源公司","成交金额","数据时间"] + def headers = []//["鍩庡競ID","鎴愪氦ID","鍩庡競鍚嶇О","琛屾斂鍖篒D","琛屾斂鍖哄悕绉�","琛楅亾","闂ㄧ墝鍙�","灏忓尯ID","灏忓尯鍚嶇О","妤兼爧ID","妤兼爧缂栧彿","妤兼爧鍚嶇О","鍗曞厓ID","鍗曞厓缂栧彿","鍗曞厓鍚嶇О","鎴稩D","璇︾粏鍦板潃","寤虹瓚骞翠唬","鏉冨睘","鏉冨睘骞撮檺","鏈熸暟","鎵�鍦ㄦゼ灞�","灞傜被鍨�","鎬绘ゼ灞傛暟","寤虹瓚绫诲瀷","寤虹瓚缁撴瀯","寤虹瓚闈㈢Н","濂楀唴闈㈢Н","鎴峰瀷","瀹�","鍘�","鍘�","鍗�","鎴垮眿鐢ㄩ��","瀹ゅ唴缁撴瀯","鏈濆悜","瑁呬慨鎯呭喌","璇勪及缂栧彿","鎴愪氦鍗曚环","鎴愪氦鎬讳环","鐢虫姤鎬讳环","璇勪及鎬讳环","缃戠鍚堝悓缂栧彿","浜ゆ槗鏃ユ湡","浜ゆ槗绫诲瀷","鍑哄敭浠樻鏂瑰紡","鎴愪氦鍛ㄦ湡","鏄惁鏈夌數姊�","璧犻�侀潰绉紙鍦伴潰鑺卞洯锛�","璧犻�侀潰绉紙闇插彴锛�","璧犻�侀潰绉紙闃冲彴锛�","璧犻�侀潰绉紙椋樼獥锛�","璧犻�侀潰绉紙闃佹ゼ锛�","璧犻�侀潰绉紙杞﹀簱锛�","璧犻�侀潰绉紙鍦颁笅瀹わ級","璧犻�侀潰绉紙鍏朵粬锛�","鎴挎簮鏁版嵁鏉ユ簮","涓粙鍏徃ID","涓粙鍏徃鍚嶇О","澶囨敞","鍒涘缓鏃堕棿","鏇存柊鏃堕棿","鏉ユ簮鍏徃","鎴愪氦閲戦","鏁版嵁鏃堕棿"] def cityCodeDataMap = CcbCommonUtils.findCityCodeValue() def index = 0 for(def city : citys){ @@ -69,9 +69,9 @@ class FjwBigdataDealBatch extends BaseBatch{ def ppeDists = [:] def dealIds = findHistoryDealIds(CcbCommonUtils.getCcbCity(city)) - println "历史id加载量:"+dealIds.size() + println "鍘嗗彶id鍔犺浇閲忥細"+dealIds.size() def statMap = [:]//getDistrictStatByCity(city, weekend) - if(city=="上海"){ + if(city=="涓婃捣"){ def youDataTrade = getYouDaData(statMap) def youdaDatas = createData(city, youDataTrade, cityCodeDataMap, distCodeMap, "youda", dealIds) rows.addAll(youdaDatas) @@ -82,7 +82,7 @@ class FjwBigdataDealBatch extends BaseBatch{ if(trades){ def rets = createData(city, trades, cityCodeDataMap, distCodeMap, "other", dealIds) rows.addAll(rets) - println "【${index}】"+city +" 成交共:"+rets.size() + println "銆�${index}銆�"+city +" 鎴愪氦鍏憋細"+rets.size() def cityDatas = [] cityDatas << headers @@ -91,10 +91,10 @@ class FjwBigdataDealBatch extends BaseBatch{ } - println "txt 生成 " + rows.size() + println "txt 鐢熸垚 " + rows.size() saveToPgSql(rows) -// def datas = readTxt("D:\\数据\\建行\\建行成交\\MODEL_000000_000000_BIGDATA_DEAL_GJ_ADD_20230928_0001.dat") +// def datas = readTxt("D:\\鏁版嵁\\寤鸿\\寤鸿鎴愪氦\\MODEL_000000_000000_BIGDATA_DEAL_GJ_ADD_20230928_0001.dat") // saveToPgSql2(datas) } @@ -117,13 +117,13 @@ class FjwBigdataDealBatch extends BaseBatch{ def totalCount = new AtomicLong() final CountDownLatch latch = new CountDownLatch(rets.size()) -// def lianjiaPriceMap = findThirdPartyPrice("上海") +// def lianjiaPriceMap = findThirdPartyPrice("涓婃捣") // def startDate = DateUtils.parseFromTightByPattern(DateUtils.addMonth(new Date(),-2),'yyyy-MM-dd') -// def lianjiaPriceMap = getDistrictStatByCity("上海", startDate) +// def lianjiaPriceMap = getDistrictStatByCity("涓婃捣", startDate) def ccbPriceMap = null - if(city == "上海"){ - ccbPriceMap = [:]//getCommunityPrices("上海") + if(city == "涓婃捣"){ + ccbPriceMap = [:]//getCommunityPrices("涓婃捣") } for(def i=0;i> FITMENTS_TYPES_MAPS = new HashMap>() static{ - FITMENTS_TYPES_MAPS.put("毛坯", ["毛坯", "清水", "无装修", "独栋毛坯", "毛胚", "白坯", "旧装", "坯", "原房", "毛坏"]) - FITMENTS_TYPES_MAPS.put("简装", ["简装", "普通装修", "普通", "简单装修", "简易装修", "普装", "一般装修", "一般", "简", "粗装修"]) - FITMENTS_TYPES_MAPS.put("精装", ["精装", "全装修", "全装", "中等装修", "中装", "中档装修", "精致装修", "中档", "中等", "精", "中修", "优质装修", "时尚装修", "良装", "中高挡"]) - FITMENTS_TYPES_MAPS.put("豪装", ["豪华装修", "高档", "豪华", "豪装", "高级装修", "高装", "奢侈"]) + FITMENTS_TYPES_MAPS.put("姣涘澂", ["姣涘澂", "娓呮按", "鏃犺淇�", "鐙爧姣涘澂", "姣涜儦", "鐧藉澂", "鏃ц", "鍧�", "鍘熸埧", "姣涘潖"]) + FITMENTS_TYPES_MAPS.put("绠�瑁�", ["绠�瑁�", "鏅�氳淇�", "鏅��", "绠�鍗曡淇�", "绠�鏄撹淇�", "鏅", "涓�鑸淇�", "涓�鑸�", "绠�", "绮楄淇�"]) + FITMENTS_TYPES_MAPS.put("绮捐", ["绮捐", "鍏ㄨ淇�", "鍏ㄨ", "涓瓑瑁呬慨", "涓", "涓。瑁呬慨", "绮捐嚧瑁呬慨", "涓。", "涓瓑", "绮�", "涓慨", "浼樿川瑁呬慨", "鏃跺皻瑁呬慨", "鑹", "涓珮鎸�"]) + FITMENTS_TYPES_MAPS.put("璞", ["璞崕瑁呬慨", "楂樻。", "璞崕", "璞", "楂樼骇瑁呬慨", "楂樿", "濂緢"]) } - public static final String[] TAGS = ["独栋", "联排", "叠加", "双拼", "花园面积", "泳池", "别墅", "带花园", "洋房", "叠拼", "独院", "联体", "微墅", "大平墅"]; + public static final String[] TAGS = ["鐙爧", "鑱旀帓", "鍙犲姞", "鍙屾嫾", "鑺卞洯闈㈢Н", "娉虫睜", "鍒", "甯﹁姳鍥�", "娲嬫埧", "鍙犳嫾", "鐙櫌", "鑱斾綋", "寰", "澶у钩澧�"]; public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(60) public static ExecutorService fixedThreadPool2 = Executors.newFixedThreadPool(200) @@ -70,7 +70,7 @@ class FjwBigdataForsaleBatch extends BaseBatch{ def lastMonth = DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM"); def curMonth = DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), 0, "yyyyMM"); - // 最大重试次数 + // 鏈�澶ч噸璇曟鏁� private static final int MAX_TRY_COUNT = 5; static main(args) { @@ -79,15 +79,15 @@ class FjwBigdataForsaleBatch extends BaseBatch{ @Override public void process(Object args) { - //目前查询库中是否已存在,用的是Oracle + //鐩墠鏌ヨ搴撲腑鏄惁宸插瓨鍦紝鐢ㄧ殑鏄疧racle def index = 0 def citys = CcbCommonUtils.getRunningCitys(["all"]) def cityCodeDataMap = CcbCommonUtils.findCityCodeValue() def startDate = lastMonth+"18" - def endDate = curMonth+"19" //正式运行时curMonth要改 - println "房源时间:"+startDate+" "+endDate + def endDate = curMonth+"19" //姝e紡杩愯鏃禼urMonth瑕佹敼 + println "鎴挎簮鏃堕棿锛�"+startDate+" "+endDate def houseIdsfilter = null;//findAllHouseIdsByCity() @@ -102,7 +102,7 @@ class FjwBigdataForsaleBatch extends BaseBatch{ def statCity(def citys){ - def datas = ExcelUtils.read("C:\\Users\\gaojuan\\Desktop\\无房源城市.xlsx",0,1) + def datas = ExcelUtils.read("C:\\Users\\gaojuan\\Desktop\\鏃犳埧婧愬煄甯�.xlsx",0,1) def houseCitys = [] for(def d : datas){ houseCitys << d['C'] @@ -122,19 +122,19 @@ class FjwBigdataForsaleBatch extends BaseBatch{ def retMap = findAllCommHouse(index,city, cityCodeDataMap, distCodeMap, districts, startDate, endDate, houseIdsfilter) def cityCode = cityCodeDataMap.get(city) def delHouseIds = retMap.del_houses - println city + "(删除)房源总量:"+delHouseIds.size() + println city + "(鍒犻櫎)鎴挎簮鎬婚噺锛�"+delHouseIds.size() delHousesToPgSql(cityCode, delHouseIds) def allDatas = retMap.add_houses.values() - println city + "(新增)房源总量:"+allDatas.size() + println city + "(鏂板)鎴挎簮鎬婚噺锛�"+allDatas.size() saveToPgSql(allDatas) } def findAllCommHouse(index,city, cityCodeDataMap, distCodeMap, districts, startDate, endDate, houseIdsfilter){ def totalCount = new AtomicLong() final CountDownLatch latch = new CountDownLatch(districts.size()) - println city +" 小区量:"+districts.size() + println city +" 灏忓尯閲忥細"+districts.size() BloomFilter curhousefilter = BloomFilter.create(Funnels.stringFunnel(StandardCharsets.UTF_8), 200000000, 0.000001); @@ -152,7 +152,7 @@ class FjwBigdataForsaleBatch extends BaseBatch{ def ret = findHouses(city, rMap.region, "sell", startDate,endDate, rMap.name, rMap.alias, rMap.estate_type2, commId, cityCodeDataMap) //def ret = findHousesByDistId(city, commId, "sell", startDate,endDate) -// if(ret && ret.size()<100){//导历史房源需要,以后不需要 +// if(ret && ret.size()<100){//瀵煎巻鍙叉埧婧愰渶瑕侊紝浠ュ悗涓嶉渶瑕� // ret = findHouses(city, rMap.region, "sell", 20190701, endDate, rMap.name, rMap.alias) // } if(ret){ @@ -191,18 +191,18 @@ class FjwBigdataForsaleBatch extends BaseBatch{ curhousefilter.put(m.houseId) houseIdsfilter.put(m.houseId) }else{ - println city +" "+m.houseId+" 已存在" + println city +" "+m.houseId+" 宸插瓨鍦�" } } }else{ - println city +" "+rMap.region+" 没有找到对应的区域" + println city +" "+rMap.region+" 娌℃湁鎵惧埌瀵瑰簲鐨勫尯鍩�" } } - println totalCount.get() +" "+city+" "+rMap.region+" "+rMap.name+" 原始:"+ret.size()+" 过滤后:"+retMap.size() + println totalCount.get() +" "+city+" "+rMap.region+" "+rMap.name+" 鍘熷:"+ret.size()+" 杩囨护鍚庯細"+retMap.size() } catch (Exception e) { - println totalCount.get() +" 查房源Error: "+city+" "+rMap.region+" "+rMap.name+" "+e.getMessage() + println totalCount.get() +" 鏌ユ埧婧怑rror: "+city+" "+rMap.region+" "+rMap.name+" "+e.getMessage() } finally { latch.countDown() } @@ -292,7 +292,7 @@ class FjwBigdataForsaleBatch extends BaseBatch{ // if(!houseIds.contains(r.houseId)){ // newRets << r // }else{ -// println r.houseId +" 已存在" +// println r.houseId +" 宸插瓨鍦�" // } // } // return newRets @@ -316,8 +316,8 @@ class FjwBigdataForsaleBatch extends BaseBatch{ } - if(name.contains("弄小区")){ - def newName = name.replace("弄小区","弄") + if(name.contains("寮勫皬鍖�")){ + def newName = name.replace("寮勫皬鍖�","寮�") if(!alias.contains(newName)){ alias << newName } @@ -343,13 +343,13 @@ class FjwBigdataForsaleBatch extends BaseBatch{ def map = houses[k]; DBObject seawater = new BasicDBObject(map) - if(estate_type2 && estate_type2=="普通住宅"){ - if(seawater.estate_type && (seawater.estate_type.contains("商住") || seawater.estate_type.contains("商业") || seawater.estate_type.contains("商务"))){ + if(estate_type2 && estate_type2=="鏅�氫綇瀹�"){ + if(seawater.estate_type && (seawater.estate_type.contains("鍟嗕綇") || seawater.estate_type.contains("鍟嗕笟") || seawater.estate_type.contains("鍟嗗姟"))){ println city +" "+name+" "+seawater._id.toString()+" "+seawater.estate_type continue; } - if(seawater.estate_type&& seawater.estate_type.contains("别墅")){ + if(seawater.estate_type&& seawater.estate_type.contains("鍒")){ println city +" "+name+" "+seawater._id.toString()+" "+seawater.estate_type continue; } @@ -480,14 +480,14 @@ class FjwBigdataForsaleBatch extends BaseBatch{ rets << rowMap // if(houseIds.contains(seawater.id)){ -// println seawater.id +" 已存在" +// println seawater.id +" 宸插瓨鍦�" // }else{ // rets << rowMap // } // def count = isExistFromHouse(seawater.id) // if(count){ -// println seawater.id +" 已存在" +// println seawater.id +" 宸插瓨鍦�" // }else{ // rets << rowMap // } @@ -512,7 +512,7 @@ class FjwBigdataForsaleBatch extends BaseBatch{ QueryBuilder date_range_mdate = QueryBuilders.rangeQuery("m_date").from(startMdate.getTime()).to(endMdate.getTime()).includeLower(true).includeUpper(false); - //用以下方法会查出发布时间很久以前的 + //鐢ㄤ互涓嬫柟娉曚細鏌ュ嚭鍙戝竷鏃堕棿寰堜箙浠ュ墠鐨� // QueryBuilder dateQueryBuilder = QueryBuilders.boolQuery() // dateQueryBuilder.should(date_range) // dateQueryBuilder.should(date_range_mdate) @@ -540,33 +540,33 @@ class FjwBigdataForsaleBatch extends BaseBatch{ } - if(name.contains("弄小区")){ - def newName = name.replace("弄小区","弄") + if(name.contains("寮勫皬鍖�")){ + def newName = name.replace("寮勫皬鍖�","寮�") if(!alias.contains(newName)){ alias << newName } } - if(estate_type2 && estate_type2=="别墅" && !name.contains("别墅")){ - def newName = name + "(别墅)" + if(estate_type2 && estate_type2=="鍒" && !name.contains("鍒")){ + def newName = name + "(鍒)" if(!alias.contains(newName)){ alias << newName } - newName = name + "别墅" + newName = name + "鍒" if(!alias.contains(newName)){ alias << newName } } - if(estate_type2 && estate_type2=="商住"){ - def newName = name + "(商住)" + if(estate_type2 && estate_type2=="鍟嗕綇"){ + def newName = name + "(鍟嗕綇)" if(!alias.contains(newName)){ alias << newName } } - if(name.contains("别墅")){ - def newName = name.replace("别墅", "").replace("()", "").replace("()", "") + if(name.contains("鍒")){ + def newName = name.replace("鍒", "").replace("()", "").replace("锛堬級", "") def obj = CommonDatautils.findDistrict(city,region,newName,"district") if(!alias.contains(newName)){ alias << newName @@ -607,13 +607,13 @@ class FjwBigdataForsaleBatch extends BaseBatch{ continue; } - if(estate_type2 && estate_type2=="普通住宅"){ - if(seawater.estate_type && (seawater.estate_type.contains("商住") || seawater.estate_type.contains("商业") || seawater.estate_type.contains("商务"))){ + if(estate_type2 && estate_type2=="鏅�氫綇瀹�"){ + if(seawater.estate_type && (seawater.estate_type.contains("鍟嗕綇") || seawater.estate_type.contains("鍟嗕笟") || seawater.estate_type.contains("鍟嗗姟"))){ println city +" "+name+" "+seawater._id.toString()+" "+seawater.estate_type continue; } - if(seawater.estate_type&& seawater.estate_type.contains("别墅")){ + if(seawater.estate_type&& seawater.estate_type.contains("鍒")){ println city +" "+name+" "+seawater._id.toString()+" "+seawater.estate_type continue; } @@ -622,7 +622,7 @@ class FjwBigdataForsaleBatch extends BaseBatch{ if(vallaFlag){ continue; } - }else if (estate_type2 && estate_type2=="别墅"){ + }else if (estate_type2 && estate_type2=="鍒"){ def vallaFlag = isVilla(seawater.area, seawater.name, seawater.height, seawater.room) if(!vallaFlag){ continue; @@ -749,14 +749,14 @@ class FjwBigdataForsaleBatch extends BaseBatch{ rets << rowMap // if(houseIds.contains(seawater.id)){ -// println seawater.id +" 已存在" +// println seawater.id +" 宸插瓨鍦�" // }else{ // rets << rowMap // } // def count = isExistFromHouse(seawater.id) // if(count){ -// println seawater.id +" 已存在" +// println seawater.id +" 宸插瓨鍦�" // }else{ // rets << rowMap // } @@ -777,25 +777,25 @@ class FjwBigdataForsaleBatch extends BaseBatch{ while (retryCount < MAX_TRY_COUNT && !success) { try { rets = findHousesByMdate(city, region, cat, startDate, endDate, name, alias, estate_type2, rets1) - // 如果操作成功,设置success为true + // 濡傛灉鎿嶄綔鎴愬姛锛岃缃畇uccess涓簍rue success = true; } catch (Exception e) { retryCount++; - println "查询重试 " + retryCount + "/" + MAX_TRY_COUNT - // 这里可以选择在重试之前等待一段时间 - Thread.sleep(3000); // 例如等待1秒 + println "鏌ヨ閲嶈瘯 " + retryCount + "/" + MAX_TRY_COUNT + // 杩欓噷鍙互閫夋嫨鍦ㄩ噸璇曚箣鍓嶇瓑寰呬竴娈垫椂闂� + Thread.sleep(3000); // 渚嬪绛夊緟1绉� } } if (!success) { - println "重试5次后依然失败: " + MAX_TRY_COUNT + " "+city +" "+region+" "+name + println "閲嶈瘯5娆″悗渚濈劧澶辫触锛� " + MAX_TRY_COUNT + " "+city +" "+region+" "+name } return rets; } /** - * 是否是别墅 + * 鏄惁鏄埆澧� * @return */ public boolean isVilla(area, name, height, room) { @@ -839,27 +839,27 @@ class FjwBigdataForsaleBatch extends BaseBatch{ if(floorDesc){ floorDesc = floorDesc.replaceAll("[\\s ]+", "") if(floorDesc){ - Pattern pat1 = Pattern.compile("第(\\d{1,2})层"); + 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)?"); + 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.contains("楂樻ゼ灞�") || floorDesc.contains("楂樺眰")){ +// return "楂樺眰" // } // // -// if(floorDesc.contains("低楼层") || floorDesc.contains("低层")){ -// return "低层" +// if(floorDesc.contains("浣庢ゼ灞�") || floorDesc.contains("浣庡眰")){ +// return "浣庡眰" // } if(floorDesc.isNumber()){ return floorDesc; @@ -870,16 +870,16 @@ class FjwBigdataForsaleBatch extends BaseBatch{ } private String csvHandlerStr(String str) { - //csv格式如果有逗号,整体用双引号括起来;如果里面还有双引号就替换成两个双引号,这样导出来的格式就不会有问题了 + //csv鏍煎紡濡傛灉鏈夐�楀彿锛屾暣浣撶敤鍙屽紩鍙锋嫭璧锋潵锛涘鏋滈噷闈㈣繕鏈夊弻寮曞彿灏辨浛鎹㈡垚涓や釜鍙屽紩鍙凤紝杩欐牱瀵煎嚭鏉ョ殑鏍煎紡灏变笉浼氭湁闂浜� String tempDescription=str; - //如果有逗号 - if(str.contains(",")||str.contains(",")){ - //如果还有双引号,先将双引号转义,避免两边加了双引号后转义错误 + //濡傛灉鏈夐�楀彿 + if(str.contains(",")||str.contains("锛�")){ + //濡傛灉杩樻湁鍙屽紩鍙凤紝鍏堝皢鍙屽紩鍙疯浆涔夛紝閬垮厤涓よ竟鍔犱簡鍙屽紩鍙峰悗杞箟閿欒 if(str.contains("\"")){ // tempDescription=str.replace("\"", "\"\""); tempDescription=str.replace("\"", ""); } - //在将逗号转义 + //鍦ㄥ皢閫楀彿杞箟 tempDescription="\""+tempDescription+"\""; } return tempDescription; @@ -891,7 +891,7 @@ class FjwBigdataForsaleBatch extends BaseBatch{ return null } fitmentDesc = fitmentDesc.replaceAll("[\\s ]+", "") - if (fitmentDesc.equals("非毛坯")) { + if (fitmentDesc.equals("闈炴瘺鍧�")) { return null } Iterator>> it = FITMENTS_TYPES_MAPS @@ -916,7 +916,7 @@ class FjwBigdataForsaleBatch extends BaseBatch{ if (directionDesc == null) { return null } - directionDesc = directionDesc.replaceAll("(\\(|(|《|\"|“|【|〔).+?(\\)|》|)|\"|”|】|〕)", "#_#") + directionDesc = directionDesc.replaceAll("(\\(|锛坾銆妡\"|鈥渱銆恷銆�).+?(\\)|銆媩锛墊\"|鈥潀銆憒銆�)", "#_#") StringBuffer sb = new StringBuffer() for (int i = 0; i < directionDesc.length(); i++) { String c = directionDesc.substring(i, i + 1) @@ -946,7 +946,7 @@ class FjwBigdataForsaleBatch extends BaseBatch{ def marge(){ - File file = new File("D:\\数据\\建行\\新建文本文档.txt"); + File file = new File("D:\\鏁版嵁\\寤鸿\\鏂板缓鏂囨湰鏂囨。.txt"); def ids = new HashSet(); def index = 0 @@ -975,7 +975,7 @@ class FjwBigdataForsaleBatch extends BaseBatch{ } def findAllHouseIdsByCity(cityid){ - // 创建布隆过滤器对象 + // 鍒涘缓甯冮殕杩囨护鍣ㄥ璞� BloomFilter filter = BloomFilter.create(Funnels.stringFunnel(StandardCharsets.UTF_8), 200000000, 0.000001); // def houseIds = new HashSet() pgsqlInstance.eachRow("SELECT gujia_sell_id FROM base.bigdata_forsale where urbn_id='${cityid}'",{it-> @@ -1004,20 +1004,20 @@ class FjwBigdataForsaleBatch extends BaseBatch{ stmt.addBatch() count++ - // 每20000条执行一次 + // 姣�20000鏉℃墽琛屼竴娆� if (count % 20000 == 0) { stmt.executeBatch() - println "已执行批处理: $count" + println "宸叉墽琛屾壒澶勭悊: $count" } } - // 执行剩余的 + // 鎵ц鍓╀綑鐨� if (ids.size() % 20000 != 0) { stmt.executeBatch() - println "执行最后一批: ${ids.size() % 20000}" + println "鎵ц鏈�鍚庝竴鎵�: ${ids.size() % 20000}" } - println "总处理记录数: $count" + println "鎬诲鐞嗚褰曟暟: $count" } finally { stmt.close() } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/fjwPriceBaseData/FjwGuiDingPriceBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/fjwPriceBaseData/FjwGuiDingPriceBatch.groovy index b2dd0c3be..7aee834a9 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/fjwPriceBaseData/FjwGuiDingPriceBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/fjwPriceBaseData/FjwGuiDingPriceBatch.groovy @@ -21,8 +21,8 @@ import java.util.concurrent.Executors import java.util.concurrent.atomic.AtomicLong import org.bson.types.ObjectId /** - * 建行模型估值项目 - * 人工指导价同步 + * 寤鸿妯″瀷浼板�奸」鐩� + * 浜哄伐鎸囧浠峰悓姝� */ @BatchOwner(Watcher.GaoJuan) @@ -53,7 +53,7 @@ class FjwGuiDingPriceBatch extends BaseBatch{ def cityCodeDatas = CcbCommonUtils.findCityCodeValue() def distCodeMap = CcbCommonUtils.findAllDistrictCodeValue(city) - //添加自己库中的人工指导价 + //娣诲姞鑷繁搴撲腑鐨勪汉宸ユ寚瀵间环 def end = DateUtils.add(DateUtils.formatDateByPattern(new Date(),"yyyy-MM-dd"), 1) def start = DateUtils.add(DateUtils.formatDateByPattern(new Date(),"yyyy-MM-dd"), -90) @@ -65,14 +65,14 @@ class FjwGuiDingPriceBatch extends BaseBatch{ println city + " " + rets.size() } } - println "【房价网内部】人工指导价总计:"+rows.size() + println "銆愭埧浠风綉鍐呴儴銆戜汉宸ユ寚瀵间环鎬昏锛�"+rows.size() saveToPgSql(rows) } def findFangDatas(def districts){ def totalCount = new AtomicLong() final CountDownLatch latch = new CountDownLatch(districts.size()) - println " 小区量:"+districts.size() + println " 灏忓尯閲忥細"+districts.size() def result = Collections.synchronizedList(new ArrayList()); for(def i=0;i filter = BloomFilter.create(Funnels.stringFunnel(StandardCharsets.UTF_8), 200000000, 0.000001); sqlInstance.eachRow("SELECT gujia_fsid FROM base.guided_price",{it-> filter.put(it.gujia_fsid) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/fjwPriceBaseData/FjwThirdPartyPriceBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/fjwPriceBaseData/FjwThirdPartyPriceBatch.groovy index c5f33716f..0a0a40e3a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/fjwPriceBaseData/FjwThirdPartyPriceBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/fjwPriceBaseData/FjwThirdPartyPriceBatch.groovy @@ -18,8 +18,8 @@ import java.text.SimpleDateFormat import java.util.concurrent.ConcurrentHashMap /** - * 建行模型估值项目 - * 第三方均价数据同步 + * 寤鸿妯″瀷浼板�奸」鐩� + * 绗笁鏂瑰潎浠锋暟鎹悓姝� */ @BatchOwner(Watcher.GaoJuan) class FjwThirdPartyPriceBatch extends BaseBatch { @@ -32,10 +32,10 @@ class FjwThirdPartyPriceBatch extends BaseBatch { static final DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "mongo.db.fangjia.com") DBCollection DIST_SELL_STAT = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "mongo.db.fangjia.com") - def sourceMap = ["诸葛找房":"01", "安居客":"02","房天下":"03","链家":"04","城市家居":"05","麦田":"06","贝壳":"07", - "淘房365":"08","中原":"09","兔博士":"10","Q房":"11","房探":"12","房多多":"13","我爱我家":"14", - "禧泰数据":"15","吉屋网":"16","乐居":"17","21世纪":"18","房产超市":"19","58同城":"20", - "乐有家":"21","幸福里":"22","中国房价行情":"23","常州住房":"24" + def sourceMap = ["璇歌憶鎵炬埧":"01", "瀹夊眳瀹�":"02","鎴垮ぉ涓�":"03","閾惧":"04","鍩庡競瀹跺眳":"05","楹︾敯":"06","璐濆3":"07", + "娣樻埧365":"08","涓師":"09","鍏斿崥澹�":"10","Q鎴�":"11","鎴挎帰":"12","鎴垮澶�":"13","鎴戠埍鎴戝":"14", + "绂ф嘲鏁版嵁":"15","鍚夊眿缃�":"16","涔愬眳":"17","21涓栫邯":"18","鎴夸骇瓒呭競":"19","58鍚屽煄":"20", + "涔愭湁瀹�":"21","骞哥閲�":"22","涓浗鎴夸环琛屾儏":"23","甯稿窞浣忔埧":"24" ] @@ -52,7 +52,7 @@ class FjwThirdPartyPriceBatch extends BaseBatch { def citys = CcbCommonUtils.getRunningCitys(["all"]) runDatas(citys) - //同步历史数据 + //鍚屾鍘嗗彶鏁版嵁 // def stop = false // def month = -1 // while(!stop){ @@ -78,7 +78,7 @@ class FjwThirdPartyPriceBatch extends BaseBatch { index++ def gocIdsPrices = [] - if(city == "深圳"){ + if(city == "娣卞湷"){ gocIdsPrices = FjwPgsqlCommUtils.findDistGovPrice(city) } @@ -318,49 +318,49 @@ class FjwThirdPartyPriceBatch extends BaseBatch { def web = "" if(k=="zhuge_avg_price"){ - web = "诸葛找房" + web = "璇歌憶鎵炬埧" }else if(k=="anjuke_avg_price"){ - web = "安居客" + web = "瀹夊眳瀹�" }else if(k=="fang_avg_price"){ - web = "房天下" + web = "鎴垮ぉ涓�" }else if(k=="lianjia_avg_price"){ - web = "链家" + web = "閾惧" }else if(k=="cityhouse_avg_price"){ - web = "禧泰数据" + web = "绂ф嘲鏁版嵁" }else if(k=="maitian_avg_price"){ - web = "麦田" + web = "楹︾敯" }else if(k=="ke_avg_price"){ - web = "贝壳" + web = "璐濆3" }else if(k=="taofang_avg_price"){ - web = "淘房365" + web = "娣樻埧365" }else if(k=="zhongyuan_avg_price"){ - web = "中原" + web = "涓師" }else if(k=="tbs_avg_price"){ - web = "兔博士" + web = "鍏斿崥澹�" }else if(k=="qfang_avg_price"){ - web = "Q房" + web = "Q鎴�" }else if(k=="fangtan_avg_price"){ - web = "房探" + web = "鎴挎帰" }else if(k=="fangduoduo_avg_price"){ - web = "房多多" + web = "鎴垮澶�" }else if(k=="wiwj_avg_price"){ - web = "我爱我家" + web = "鎴戠埍鎴戝" }else if(k=="fccs_avg_price"){ - web = "房产超市" + web = "鎴夸骇瓒呭競" }else if(k=="csjj_avg_price"){ - web = "城市居家" + web = "鍩庡競灞呭" }else if(k=="leyoujia_avg_price"){ - web = "乐有家" + web = "涔愭湁瀹�" }else if(k=="c21_avg_price"){ web = "C21" }else if(k=="jiwu_avg_price"){ - web = "吉屋网" + web = "鍚夊眿缃�" }else if(k=="xingfuli_avg_price"){ - web = "幸福里" + web = "骞哥閲�" }else if(k=="creprice_avg_price"){ - web = "中国房价行情" + web = "涓浗鎴夸环琛屾儏" }else if(k=="zwfc_avg_price"){ - web = "常州住房" + web = "甯稿窞浣忔埧" } ret << sourceMap.get(web) @@ -393,33 +393,33 @@ class FjwThirdPartyPriceBatch extends BaseBatch { ret << d.name def web = "" if(k=="zhugezhaofang_esf_price"){ - web = "诸葛找房" + web = "璇歌憶鎵炬埧" }else if(k=="anjuke_esf_price"){ - web = "安居客" + web = "瀹夊眳瀹�" }else if(k=="soufang_esf_price"){ - web = "房天下" + web = "鎴垮ぉ涓�" }else if(k=="lianjia_esf_price"){ - web = "链家" + web = "閾惧" }else if(k=="cityhouse_esf_price"){ - web = "禧泰数据" + web = "绂ф嘲鏁版嵁" }else if(k=="maitian_esf_price"){ - web = "麦田" + web = "楹︾敯" }else if(k=="beike_esf_price"){ - web = "贝壳" + web = "璐濆3" }else if(k=="365house_esf_price"){ - web = "淘房365" + web = "娣樻埧365" }else if(k=="zhongyuan_esf_price"){ - web = "中原" + web = "涓師" }else if(k=="tuboshi_esf_price"){ - web = "兔博士" + web = "鍏斿崥澹�" }else if(k=="qfang_esf_price"){ - ret << "Q房" + ret << "Q鎴�" }else if(k=="fangtan_esf_price"){ - ret << "房探" + ret << "鎴挎帰" }else if(k=="fangduoduo_esf_price"){ - ret << "房多多" + ret << "鎴垮澶�" }else if(k=="5i5j_esf_price"){ - ret << "我爱我家" + ret << "鎴戠埍鎴戝" }else{ ret << "" } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/guangfa/GuangfaBlankSelectDistrict.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/guangfa/GuangfaBlankSelectDistrict.groovy index da8902cab..a56769ebf 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/guangfa/GuangfaBlankSelectDistrict.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/guangfa/GuangfaBlankSelectDistrict.groovy @@ -37,27 +37,27 @@ class GuangfaBlankSelectDistrict { def run(){ - def file = "D:\\数据\\广发\\获取楼盘信息需求(东莞和杭州).xlsx" + def file = "D:\\鏁版嵁\\骞垮彂\\鑾峰彇妤肩洏淇℃伅闇�姹傦紙涓滆帪鍜屾澀宸烇級.xlsx" def cityMap = standardRegion(file) def priceMap = getZhiDaoPrice(file) selectDistricts(cityMap, priceMap) - println "写入完成" + println "鍐欏叆瀹屾垚" } def run2(){ selectDistricts2() - println "写入完成" + println "鍐欏叆瀹屾垚" } def selectDistricts(cityMap, priceMap){ def rets = [] - rets << ["城市","区域","指导价","楼盘名称","楼盘地址","开发商名称","容积率","物业名称","*套数","*楼龄","户型","*建筑面积区间","2021年1-6月成交量","*均价","*成交量","*均价","*成交量","*均价"] + rets << ["鍩庡競","鍖哄煙","鎸囧浠�","妤肩洏鍚嶇О","妤肩洏鍦板潃","寮�鍙戝晢鍚嶇О","瀹圭Н鐜�","鐗╀笟鍚嶇О","*濂楁暟","*妤奸緞","鎴峰瀷","*寤虹瓚闈㈢Н鍖洪棿","2021骞�1-6鏈堟垚浜ら噺","*鍧囦环","*鎴愪氦閲�","*鍧囦环","*鎴愪氦閲�","*鍧囦环"] cityMap.each{city, regions-> - if(["西安","东莞","杭州"].contains(city)){ + if(["瑗垮畨","涓滆帪","鏉窞"].contains(city)){ def thirdPriceMap = findNearThirdPartyPrice(city, regions) def retMaps = findCreditHightDistrict2(city, regions, "2021-08-01", priceMap, thirdPriceMap) def districts = CommonDatautils.findAllDistrictByCity(city, "district", ["city","region","name","address","alias","estate_company", "developer","cubage_percent","household_count", "finish_building_date"]) - //基本情况合格的小区 + //鍩烘湰鎯呭喌鍚堟牸鐨勫皬鍖� def distMap = [:] for(def d : districts){ if(regions.contains(d.region)){// && d.household_count && d.household_count>=50 @@ -96,7 +96,7 @@ class GuangfaBlankSelectDistrict { // } } } - println city +" 基本情况合格的小区:"+distMap.size() + println city +" 鍩烘湰鎯呭喌鍚堟牸鐨勫皬鍖�:"+distMap.size() for(def r : regions){ def names = retMaps.get(r) @@ -105,24 +105,24 @@ class GuangfaBlankSelectDistrict { rets.addAll(results) } } - println "结束" + println "缁撴潫" } } - println "开始写入Excel....."+rets.size() - ExcelUtils.write("d:\\数据\\广发\\楼盘(西安东莞杭州).xlsx", rets, "数据") + println "寮�濮嬪啓鍏xcel....."+rets.size() + ExcelUtils.write("d:\\鏁版嵁\\骞垮彂\\妤肩洏(瑗垮畨涓滆帪鏉窞).xlsx", rets, "鏁版嵁") } def selectDistricts2(){ def rets = [] - rets << ["城市","区域","指导价","楼盘名称","楼盘地址","开发商名称","容积率","物业名称","*套数","*楼龄","户型","*建筑面积区间","2021年1-6月成交量","*均价","*成交量","*均价","*成交量","*均价"] - def citys = ["东莞","杭州"] + rets << ["鍩庡競","鍖哄煙","鎸囧浠�","妤肩洏鍚嶇О","妤肩洏鍦板潃","寮�鍙戝晢鍚嶇О","瀹圭Н鐜�","鐗╀笟鍚嶇О","*濂楁暟","*妤奸緞","鎴峰瀷","*寤虹瓚闈㈢Н鍖洪棿","2021骞�1-6鏈堟垚浜ら噺","*鍧囦环","*鎴愪氦閲�","*鍧囦环","*鎴愪氦閲�","*鍧囦环"] + def citys = ["涓滆帪","鏉窞"] citys.each{city-> def thirdPriceMap = findNearThirdPartyPrice(city) def retMaps = findCreditHightDistrict3(city, "2021-08-22", thirdPriceMap) def districts = CommonDatautils.findAllDistrictByCity(city, "district", ["city","region","name","address","alias","estate_company", "developer","cubage_percent","household_count", "finish_building_date"]) - //基本情况合格的小区 + //鍩烘湰鎯呭喌鍚堟牸鐨勫皬鍖� def distMap = [:] for(def d : districts){ // && d.household_count && d.household_count>=50 @@ -161,7 +161,7 @@ class GuangfaBlankSelectDistrict { // } } - println city +" 基本情况合格的小区:"+distMap.size() + println city +" 鍩烘湰鎯呭喌鍚堟牸鐨勫皬鍖�:"+distMap.size() for(def r : regions){ def names = retMaps.get(r) @@ -170,11 +170,11 @@ class GuangfaBlankSelectDistrict { rets.addAll(results) } } - println "结束" + println "缁撴潫" } - println "开始写入Excel....."+rets.size() - ExcelUtils.write("d:\\数据\\广发\\楼盘(西安东莞杭州).xlsx", rets, "数据") + println "寮�濮嬪啓鍏xcel....."+rets.size() + ExcelUtils.write("d:\\鏁版嵁\\骞垮彂\\妤肩洏(瑗垮畨涓滆帪鏉窞).xlsx", rets, "鏁版嵁") } def getRoomTypeAndTradeInfo(def names, def distMap, def priceMap){ @@ -214,7 +214,7 @@ class GuangfaBlankSelectDistrict { def retMap1 = null; def retMap2 = null; def retMap3 = null - if(d.city == "上海"){ + if(d.city == "涓婃捣"){ retMap1 = findShTrades(d, "2021-01-01", "2021-07-01") retMap2 = findShTrades(d, "2020-01-01", "2020-12-31") retMap3 = findShTrades(d, "2019-01-01", "2019-12-31") @@ -236,7 +236,7 @@ class GuangfaBlankSelectDistrict { d.avg_price3 = (int)retMap3.avg_price } if(!retMap1 || !retMap2 || !retMap3){ - println d.city+" "+ d.region+" "+ d.name +"成交有一年为空过滤" + println d.city+" "+ d.region+" "+ d.name +"鎴愪氦鏈変竴骞翠负绌鸿繃婊�" return null } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/hongxing/HongXingMonthBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/hongxing/HongXingMonthBatch.groovy index 598eefdbd..cfc613f94 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/hongxing/HongXingMonthBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/hongxing/HongXingMonthBatch.groovy @@ -34,20 +34,20 @@ class HongXingMonthBatch extends BaseBatch{ if(count > 0){ def fileName = "/home/goojia/hongxing/202602.xlsx" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\宏信息\\202602.xlsx" + fileName = "D:\\鏁版嵁\\瀹忎俊鎭痋\202602.xlsx" } - def datas = ExcelUtils.read("D:\\数据\\宏信息\\最新0123核价结果(绿色价格)宏信估值详情(含总价).xlsx") + def datas = ExcelUtils.read("D:\\鏁版嵁\\瀹忎俊鎭痋\鏈�鏂�0123鏍镐环缁撴灉锛堢豢鑹蹭环鏍硷級瀹忎俊浼板�艰鎯咃紙鍚�讳环锛�.xlsx") def newDatas = createDatas(datas, lastMonthStr) def curDateStr = DateUtils.formatDateByPattern(new Date(),"yyyyMMdd") - ExcelUtils.write("D:\\数据\\宏信息\\宏信楼盘监测"+curDateStr+".xlsx", newDatas,"结果") + ExcelUtils.write("D:\\鏁版嵁\\瀹忎俊鎭痋\瀹忎俊妤肩洏鐩戞祴"+curDateStr+".xlsx", newDatas,"缁撴灉") } } def createDatas(datas, lastMonthStr){ def rows = [] - rows << ["物业类型","名称","地址","面积","单价(元)","总价(元)","环比涨跌幅","定基涨跌幅(相比首月波动)","区域均价","区域均价涨跌幅","楼盘所在区域价格的排名(仅针对住宅)","楼盘所在区域排名变化(仅针对住宅)","期房/现房","省份","城市","城市排名"] + rows << ["鐗╀笟绫诲瀷","鍚嶇О","鍦板潃","闈㈢Н","鍗曚环锛堝厓锛�","鎬讳环锛堝厓锛�","鐜瘮娑ㄨ穼骞�","瀹氬熀娑ㄨ穼骞�(鐩告瘮棣栨湀娉㈠姩锛�","鍖哄煙鍧囦环","鍖哄煙鍧囦环娑ㄨ穼骞�","妤肩洏鎵�鍦ㄥ尯鍩熶环鏍肩殑鎺掑悕锛堜粎閽堝浣忓畢锛�","妤肩洏鎵�鍦ㄥ尯鍩熸帓鍚嶅彉鍖栵紙浠呴拡瀵逛綇瀹咃級","鏈熸埧/鐜版埧","鐪佷唤","鍩庡競","鍩庡競鎺掑悕"] def index = 1 for(def d : datas){ println d['B'] @@ -61,7 +61,7 @@ class HongXingMonthBatch extends BaseBatch{ row << d['B'] row << d['H'] - if(!["商铺","办公楼"].contains(d['D'])){ + if(!["鍟嗛摵","鍔炲叕妤�"].contains(d['D'])){ def dist = CommonDatautils.findDistrictById(d['I']) if(dist){ def priceObj = findDistrictMonthPrice(dist.city, dist.region, dist.name, lastMonthStr) @@ -109,14 +109,14 @@ class HongXingMonthBatch extends BaseBatch{ } }else{ - println d['I'] +" 未找到该id的楼盘" + println d['I'] +" 鏈壘鍒拌id鐨勬ゼ鐩�" } }else{ def dist = CommonDatautils.findDistrictById(d['I']) def cityMarkupObj = null def regionMarkupObj = null if(dist){ - if(d['D'] == "办公楼"){ + if(d['D'] == "鍔炲叕妤�"){ cityMarkupObj = findRentOfficeMarkup(dist.city, null, lastMonthStr, "city") regionMarkupObj = findSellOfficeMarkup(dist.city, dist.region, lastMonthStr, "district") if(cityMarkupObj){ @@ -126,7 +126,7 @@ class HongXingMonthBatch extends BaseBatch{ if(regionMarkupObj){ regionMarkupObj.mom = regionMarkupObj.mom / 100 } - }else if(d['D'] == "商铺"){ + }else if(d['D'] == "鍟嗛摵"){ cityMarkupObj = findSellShopMarkup(dist.city, null, lastMonthStr, "city") regionMarkupObj = findSellShopMarkup(dist.city, dist.region, lastMonthStr, "district") } @@ -146,7 +146,7 @@ class HongXingMonthBatch extends BaseBatch{ row << "" } - if(d['D'] == "办公楼"){ + if(d['D'] == "鍔炲叕妤�"){ if(regionMarkupObj){ row << (int)regionMarkupObj.avg_price row << regionMarkupObj.mom * 100 @@ -164,7 +164,7 @@ class HongXingMonthBatch extends BaseBatch{ } } }else{ - println d['I'] +" 未找到该id的楼盘" + println d['I'] +" 鏈壘鍒拌id鐨勬ゼ鐩�" } } @@ -207,7 +207,7 @@ class HongXingMonthBatch extends BaseBatch{ tihuanKey = key tihuanValue = value } - //对价格打85折 + //瀵逛环鏍兼墦85鎶� for(def map : rets){ def keys = null def price = null @@ -217,20 +217,20 @@ class HongXingMonthBatch extends BaseBatch{ } def newPrice = price * 0.85 if(keys == tihuanKey){ - //替换价格 + //鏇挎崲浠锋牸 map.put(tihuanKey, tihuanValue) }else{ map.put(keys, newPrice) } } - //排序 + //鎺掑簭 rets = rets.sort { a, b -> - // 获取每个map的第一个entry的value进行比较 + // 鑾峰彇姣忎釜map鐨勭涓�涓猠ntry鐨剉alue杩涜姣旇緝 def aValue = a.values().first() def bValue = b.values().first() - bValue <=> aValue // 降序:b在前,a在后 + bValue <=> aValue // 闄嶅簭锛歜鍦ㄥ墠锛宎鍦ㄥ悗 } - //查找名次 + //鏌ユ壘鍚嶆 def index = 0 def lastIndex = null; for(def map : rets){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/hongxing/TestEvaluation.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/hongxing/TestEvaluation.groovy index dcf575391..241cc8e33 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/hongxing/TestEvaluation.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/hongxing/TestEvaluation.groovy @@ -36,7 +36,7 @@ class TestEvaluation { // task.newAndOldMatch() -// task.addFjwToBprice("D:\\数据\\宏信息\\宏信房源台账-价格.xlsx") +// task.addFjwToBprice("D:\\鏁版嵁\\瀹忎俊鎭痋\瀹忎俊鎴挎簮鍙拌处-浠锋牸.xlsx") // task.addAreaFactor() // task.addOptName() @@ -45,7 +45,7 @@ class TestEvaluation { task.addEvaluationDetail() -// ExcelUtils.modify("D:\\数据\\宏信息\\最新0112核价结果(红色匹配+绿色价格)宏信估值详情-.xlsx", { d -> +// ExcelUtils.modify("D:\\鏁版嵁\\瀹忎俊鎭痋\鏈�鏂�0112鏍镐环缁撴灉锛堢孩鑹插尮閰�+缁胯壊浠锋牸锛夊畯淇′及鍊艰鎯�-.xlsx", { d -> // if(d['Y']){ // d['Z'] = DataHandleUtils.getDoubleRound(2, d['Y']/10000.0); // } @@ -53,8 +53,8 @@ class TestEvaluation { } def houseSimilar(){ - ExcelUtils.modify("D:\\数据\\江南农商行\\异地押品未自动重估明细(小区与无样本).xlsx",{d-> - if(d['I'] && d['C']=="商铺、商场"){ + ExcelUtils.modify("D:\\鏁版嵁\\姹熷崡鍐滃晢琛孿\寮傚湴鎶煎搧鏈嚜鍔ㄩ噸浼版槑缁�(灏忓尯涓庢棤鏍锋湰).xlsx",{d-> + if(d['I'] && d['C']=="鍟嗛摵銆佸晢鍦�"){ def dist = CommonDatautils.findDistrictById(d['I']) if(dist){ def map = CcbCommonUtils.findAllDistrictCodeValue(dist.city) @@ -91,15 +91,15 @@ class TestEvaluation { } def match(){ - ExcelUtils.modify("D:\\数据\\江南农商行\\异地押品未自动重估明细(小区与无样本).xlsx",{d-> - if(["商铺、商场"].contains(d['C'])){ + ExcelUtils.modify("D:\\鏁版嵁\\姹熷崡鍐滃晢琛孿\寮傚湴鎶煎搧鏈嚜鍔ㄩ噸浼版槑缁�(灏忓尯涓庢棤鏍锋湰).xlsx",{d-> + if(["鍟嗛摵銆佸晢鍦�"].contains(d['C'])){ if(d['H'] && !d['I']){ def address = d['H'] def city = d['E'] - if(city=="市辖区"){ + if(city=="甯傝緰鍖�"){ city = d['D'] } - if(!address.contains("省") && !address.contains("市")){ + if(!address.contains("鐪�") && !address.contains("甯�")){ address = d['D'] +city + d['F']+d['H'] } def jsonObject = FangjiaClientUtils.newMatch(city, address, "shop", false) @@ -121,8 +121,8 @@ class TestEvaluation { def newMatch(){ - ExcelUtils.multiThreadingModify("D:\\数据\\估值\\地址估价-匹配(加写字楼-商铺) - v2.xlsx", { d -> - def city = "上海" + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\浼板�糪\鍦板潃浼颁环-鍖归厤(鍔犲啓瀛楁ゼ-鍟嗛摵) - v2.xlsx", { d -> + def city = "涓婃捣" def address = d['A'] if(!d['B'] && address){ def jsonObject = FangjiaClientUtils.newMatch(city, address, "", true) @@ -182,11 +182,11 @@ class TestEvaluation { } def newAndOldMatch(){ - ExcelUtils.multiThreadingModify("D:\\数据\\宏信息\\宏信房源台账.xlsx",{d-> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\瀹忎俊鎭痋\瀹忎俊鎴挎簮鍙拌处.xlsx",{d-> if(d['A']){ def address = d['B'] def city = d['F'] - if( !d['L'] && d['D'] && ["办公室"].contains(d['D'])){ + if( !d['L'] && d['D'] && ["鍔炲叕瀹�"].contains(d['D'])){ def jsonObject = FangjiaClientUtils.newMatch(city, address, "office", false) if(!jsonObject && d['A']){ jsonObject = FangjiaClientUtils.newMatch(city, d['A'], "office", false) @@ -201,7 +201,7 @@ class TestEvaluation { jsonObject = FangjiaClientUtils.newMatch(city, address, "office", true) if(jsonObject){ d['L'] = jsonObject.get("id") - d['M'] = jsonObject.get("city")+"(地图)" + d['M'] = jsonObject.get("city")+"(鍦板浘)" d['N'] = jsonObject.get("district") d['O'] = jsonObject.get("name") d['P'] = jsonObject.get("propertyType") @@ -223,7 +223,7 @@ class TestEvaluation { // jsonObject2 = OpenApiClient.addressMatch(city, address, "property", true, null, null) // if(jsonObject2 != null && jsonObject2.precise!=-1) { // d['F'] = jsonObject2.get("id") -// d['G'] = jsonObject2.get("city")+"(地图)" +// d['G'] = jsonObject2.get("city")+"(鍦板浘)" // d['H'] = jsonObject2.get("district") // d['I'] = jsonObject2.get("name") // } @@ -246,23 +246,23 @@ class TestEvaluation { id = d['Q'] } if(id && !d['AA']){ - if(d['E'] && d['E']=="商铺"){ + if(d['E'] && d['E']=="鍟嗛摵"){ def dist = CommonDatautils.findDistrictById(id) if(dist && dist.lat && dist.lat>0){ def loc = dist.lng/10000000000.0+","+dist.lat/10000000000.0 def type = "1" // if(dist.cat=="district"){ -// type = "1"//"住宅底商" +// type = "1"//"浣忓畢搴曞晢" // }else{ -// type = "0" //临街商铺 +// type = "0" //涓磋鍟嗛摵 // } def jsonObj = FangjiaClientUtils.shopEvaluate(loc, type, d['I']) - if(jsonObj.msg == "成功"){ + if(jsonObj.msg == "鎴愬姛"){ d['Z'] = jsonObj.totalPrice d['AA'] = jsonObj.unitPrice } } - }else if(d['E'] && d['E']=="办公楼"){ + }else if(d['E'] && d['E']=="鍔炲叕妤�"){ def dist = CommonDatautils.findDistrictById(id) if(dist){ def jsonObj = OpenApiClient.officeSellEvaluate(dist.city, dist.region, dist.name, d['I']) @@ -302,7 +302,7 @@ class TestEvaluation { def addAreaFactor(){ - ExcelUtils.multiThreadingModify("D:\\数据\\宏信息\\(红色)宏信估值详情-最新0106.xlsx",{d-> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\瀹忎俊鎭痋\锛堢孩鑹诧級瀹忎俊浼板�艰鎯�-鏈�鏂�0106.xlsx",{d-> if(d['I'] && d['J'] && d['K']){ def dist = CommonDatautils.findDistrictById(d['I']) if(dist){ @@ -331,13 +331,13 @@ class TestEvaluation { } def addOptName(){ - def list = ExcelUtils.read("D:\\数据\\宏信息\\报告负责人.xlsx", 0, 1) + def list = ExcelUtils.read("D:\\鏁版嵁\\瀹忎俊鎭痋\鎶ュ憡璐熻矗浜�.xlsx", 0, 1) def nameMap = [:] for(def d : list){ nameMap.put(d[0], d[4]) } - ExcelUtils.multiThreadingModify("D:\\数据\\宏信息\\宏信房源台账-基准价(含ID).xlsx", { d -> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\瀹忎俊鎭痋\瀹忎俊鎴挎簮鍙拌处-鍩哄噯浠凤紙鍚獻D锛�.xlsx", { d -> if(d['A']){ def name = nameMap[d['A']] d['O'] = name @@ -347,13 +347,13 @@ class TestEvaluation { } def addDistId(){ - def list = ExcelUtils.read("D:\\数据\\宏信息\\宏信房源台账-基准价(含ID).xlsx", 0, 1) + def list = ExcelUtils.read("D:\\鏁版嵁\\瀹忎俊鎭痋\瀹忎俊鎴挎簮鍙拌处-鍩哄噯浠凤紙鍚獻D锛�.xlsx", 0, 1) def nameMap = [:] for(def d : list){ nameMap.put(d[0], d[8]) } - ExcelUtils.multiThreadingModify("D:\\数据\\宏信息\\报告负责人.xlsx", { d -> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\瀹忎俊鎭痋\鎶ュ憡璐熻矗浜�.xlsx", { d -> if(d['A']){ def id = nameMap[d['A']] d['G'] = id @@ -363,20 +363,20 @@ class TestEvaluation { def addEvaluationToDB(){ def rets = [] - ExcelUtils.modify("D:\\数据\\宏信息\\宏信项目-第二版-价格修正.xlsx", { d -> + ExcelUtils.modify("D:\\鏁版嵁\\瀹忎俊鎭痋\瀹忎俊椤圭洰-绗簩鐗�-浠锋牸淇.xlsx", { d -> if(d['G']){ def dist = CommonDatautils.findDistrictById(d['G']) if(dist){ def buildType = 0 - if(d['B'] == "公寓"){ + if(d['B'] == "鍏瘬"){ buildType = 8 - }else if(d['B'] == "别墅"){ + }else if(d['B'] == "鍒"){ buildType = 11 - }else if(d['B'] == "商铺"){ + }else if(d['B'] == "鍟嗛摵"){ buildType = 1 - }else if(d['B'] == "办公楼"){ + }else if(d['B'] == "鍔炲叕妤�"){ buildType = 2 - }else if(d['B'] == "住宅"){ + }else if(d['B'] == "浣忓畢"){ buildType = 3 } def lat = dist.lat/10000000000.0 @@ -413,8 +413,8 @@ class TestEvaluation { def addEvaluationDetail(){ def rets = [] - def detailList = ExcelUtils.read("D:\\数据\\宏信息\\最新0112核价结果(红色匹配+绿色价格)宏信估值详情-修改总价.xlsx", 0 , 1) - ExcelUtils.modify("D:\\数据\\宏信息\\宏信项目-第二版-价格修正.xlsx", { d -> + def detailList = ExcelUtils.read("D:\\鏁版嵁\\瀹忎俊鎭痋\鏈�鏂�0112鏍镐环缁撴灉锛堢孩鑹插尮閰�+缁胯壊浠锋牸锛夊畯淇′及鍊艰鎯�-淇敼鎬讳环.xlsx", 0 , 1) + ExcelUtils.modify("D:\\鏁版嵁\\瀹忎俊鎭痋\瀹忎俊椤圭洰-绗簩鐗�-浠锋牸淇.xlsx", { d -> if (d['G'] && d['L']) { def rows = findEvaluationIdExists(d['L'].toString().toDouble().toInteger()) if(!rows){ @@ -423,9 +423,9 @@ class TestEvaluation { def ret = [] ret << d['L'].toString().toDouble().toInteger() def houses = [] - if(["住宅","别墅","公寓","商住"].contains(d["B"])){ + if(["浣忓畢","鍒","鍏瘬","鍟嗕綇"].contains(d["B"])){ def propertyType = 0 - if(d["B"] == "别墅"){ + if(d["B"] == "鍒"){ propertyType = 1 } def avgPrice = d['K'] @@ -456,7 +456,7 @@ class TestEvaluation { ret << '{"trendSvg":""}' } ret << [] - ret << "上海宏信建设发展有限公司" + ret << "涓婃捣瀹忎俊寤鸿鍙戝睍鏈夐檺鍏徃" ret << new Date() ret << new Date() ret << 1 @@ -478,19 +478,19 @@ class TestEvaluation { sql.withBatch(1, sqlstring){ ps-> def houseSamplesJson = null if (r[1]) { - // 修复中文转义 + // 淇涓枃杞箟 houseSamplesJson = fixUnicodeEscapes(JsonOutput.toJson(r[1])) } def marketAnalysisJson = null if (r[2]) { - // 修复中文转义 + // 淇涓枃杞箟 marketAnalysisJson = fixUnicodeEscapes(JsonOutput.toJson(r[2])) } def customPropertiesJson = r[1] ? JsonOutput.toJson(r[3]) : null def attachmentsJson = null if(r[9]){ - // 修复中文转义 + // 淇涓枃杞箟 attachmentsJson = fixUnicodeEscapes(JsonOutput.toJson(r[9])) } @@ -523,9 +523,9 @@ class TestEvaluation { priceTrendMap.put("categories", categories) priceTrendMap.put("series", [["name":name,"data":priceData]]) - String title = "价格走势图"; - String subtitle = categories[0] + " 至 "+categories[categories.size()-1]; - // 测试小数位为0(整数等差) + String title = "浠锋牸璧板娍鍥�"; + String subtitle = categories[0] + " 鑷� "+categories[categories.size()-1]; + // 娴嬭瘯灏忔暟浣嶄负0锛堟暣鏁扮瓑宸級 String svgWithoutDecimals = SvgUtils.generatePriceTrendSvg(dataSets, labels, title, subtitle, 0); return ["avgPrice":price, "priceTrend":priceTrendMap,"trendSvg":svgWithoutDecimals] } @@ -549,7 +549,7 @@ class TestEvaluation { if(items.size()>1){ def time = new Date().getTime() - def resMap = ["id":"attachment_"+time, "title": "出售资产价格清单","type": 1,"editing": false,"items":items] + def resMap = ["id":"attachment_"+time, "title": "鍑哄敭璧勪骇浠锋牸娓呭崟","type": 1,"editing": false,"items":items] return [resMap] } return [] @@ -566,28 +566,28 @@ class TestEvaluation { def lastIndex = 0 while (matcher.find()) { - // 添加前面的部分 + // 娣诲姞鍓嶉潰鐨勯儴鍒� result.append(jsonString.substring(lastIndex, matcher.start())) - // 转换Unicode转义字符 + // 杞崲Unicode杞箟瀛楃 String hex = matcher.group(1) int codePoint = Integer.parseInt(hex, 16) - // 检查是否是中文字符(常用中文字符范围) - // 中文Unicode范围:0x4E00-0x9FFF,0x3400-0x4DBF,0x20000-0x2A6DF等 + // 妫�鏌ユ槸鍚︽槸涓枃瀛楃锛堝父鐢ㄤ腑鏂囧瓧绗﹁寖鍥达級 + // 涓枃Unicode鑼冨洿锛�0x4E00-0x9FFF锛�0x3400-0x4DBF锛�0x20000-0x2A6DF绛� if ((codePoint >= 0x4E00 && codePoint <= 0x9FFF) || (codePoint >= 0x3400 && codePoint <= 0x4DBF)) { - // 是中文,转换为实际字符 + // 鏄腑鏂囷紝杞崲涓哄疄闄呭瓧绗� result.append(new String(Character.toChars(codePoint))) } else { - // 不是中文,保留转义格式 + // 涓嶆槸涓枃锛屼繚鐣欒浆涔夋牸寮� result.append("\\u").append(hex) } lastIndex = matcher.end() } - // 添加剩余部分 + // 娣诲姞鍓╀綑閮ㄥ垎 result.append(jsonString.substring(lastIndex)) return result.toString() } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/house/ExportArroundHouse.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/house/ExportArroundHouse.groovy index b26c9400c..48f9735c2 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/house/ExportArroundHouse.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/house/ExportArroundHouse.groovy @@ -8,7 +8,7 @@ import com.fangjia.script.util.DateUtil import com.fangjia.script.util.ExcelUtils /** - * 导出某小区周边房源 + * 瀵煎嚭鏌愬皬鍖哄懆杈规埧婧� */ class ExportArroundHouse { @@ -19,16 +19,16 @@ class ExportArroundHouse { } def run(){ - def name = "南山雨果" + def name = "鍗楀北闆ㄦ灉" def lng = 121.270784 def lat = 31.160661 - def districts = CommonDatautils.getDistrictArround("上海", lng, lat) + def districts = CommonDatautils.getDistrictArround("涓婃捣", lng, lat) def startPrice = 45000 def endPrice = 50000 def lastHouses = [] for(def d : districts){ def distance = GeoUtils.calculateDistance(lng, lat, d.lng/10000000000.0, d.lat/10000000000.0); - println d.name +" 相距:"+distance + println d.name +" 鐩歌窛锛�"+distance def houses = CommonDatautils.findHouses(d.city, d.region, "sell", 20240829, 20250901, d.name, d.alias, d.estate_type2) for(def h : houses){ if(h.avg_price>startPrice && h.avg_price + ExcelUtils.modify("D:\\鏁版嵁\\瀹忎俊鎭痋\鍟嗛摵鍜屽啓瀛楁ゼ.xlsx",{d-> def dist = CommonDatautils.findDistrictById(d['G']) def lng = dist.lng/10000000000.0 def lat = dist.lat/10000000000.0 @@ -109,7 +109,7 @@ class ExportArroundHouse { // if(!houses || (houses && houses.size()<20)){ // endPrice = (int)(startPrice + startPrice*0.1) // houses = CommonDatautils.findHousesByLocation(dist.city, dist.region, "shop_sell", 20250419, 20260119, startPrice, endPrice,null, null, null) -// println dist.city +" "+dist.name+" 周边 "+houses.size() +// println dist.city +" "+dist.name+" 鍛ㄨ竟 "+houses.size() // } println "-----------------------------------------------------------------------------------------------------------------------" for(def h : houses){ @@ -124,7 +124,7 @@ class ExportArroundHouse { def list = [] if(lastHouses){ - list << ["编号","城市","区域","板块","名称","地址","装修","朝向","面积","楼层","楼高","单价","总价","距离","位置","发布时间","标题"] + list << ["缂栧彿","鍩庡競","鍖哄煙","鏉垮潡","鍚嶇О","鍦板潃","瑁呬慨","鏈濆悜","闈㈢Н","妤煎眰","妤奸珮","鍗曚环","鎬讳环","璺濈","浣嶇疆","鍙戝竷鏃堕棿","鏍囬"] for(def lh : lastHouses){ def ret = [] ret << lh._id.toString() @@ -155,7 +155,7 @@ class ExportArroundHouse { } } - ExcelUtils.write("D:\\数据\\宏信息\\商铺写字楼房源.xlsx", list, dist.name) + ExcelUtils.write("D:\\鏁版嵁\\瀹忎俊鎭痋\鍟嗛摵鍐欏瓧妤兼埧婧�.xlsx", list, dist.name) }) } 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 index 315821223..38b8d0e19 100644 --- 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 @@ -39,7 +39,7 @@ class RemoveHouse extends BaseBatch{ } def end = new Date() - println "开始时间:"+start - println "结束时间:"+end + println "寮�濮嬫椂闂达細"+start + println "缁撴潫鏃堕棿锛�"+end } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/images/AddDistImagesBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/images/AddDistImagesBatch.groovy index 76d782f86..b408249ec 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/images/AddDistImagesBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/images/AddDistImagesBatch.groovy @@ -21,7 +21,7 @@ import java.util.concurrent.ExecutorService import java.util.concurrent.Executors import java.util.concurrent.atomic.AtomicLong /** - * 更新小区图片 + * 鏇存柊灏忓尯鍥剧墖 */ @BatchOwner(Watcher.GaoJuan) class AddDistImagesBatch extends BaseBatch{ @@ -43,8 +43,8 @@ class AddDistImagesBatch extends BaseBatch{ def citys = CommonUtils.findAllCity() citys.each {city-> def communitys = findAllEsData2(city, mdate) - println "抓取城市: "+city +" 第三方小区有图片数:"+communitys.size() - //第三方匹配小区 + println "鎶撳彇鍩庡競: "+city +" 绗笁鏂瑰皬鍖烘湁鍥剧墖鏁帮細"+communitys.size() + //绗笁鏂瑰尮閰嶅皬鍖� matchCommunitys(communitys) } @@ -52,8 +52,8 @@ class AddDistImagesBatch extends BaseBatch{ } def findAllEsData2(city, mdate){ QueryBuilder date_range = QueryBuilders.rangeQuery("m_date").from(mdate.getTime()).includeLower(true) - //安居客小程序 - QueryBuilder queryBuilder = QueryBuilders.boolQuery().must(QueryBuilders.termQuery("city", city)).must(QueryBuilders.termQuery("source", "贝壳找房")) + //瀹夊眳瀹㈠皬绋嬪簭 + QueryBuilder queryBuilder = QueryBuilders.boolQuery().must(QueryBuilders.termQuery("city", city)).must(QueryBuilders.termQuery("source", "璐濆3鎵炬埧")) .must(date_range).must(date_range) def rets = [] @@ -79,7 +79,7 @@ class AddDistImagesBatch extends BaseBatch{ def findAllEsData(city, mdate){ def names = new HashSet() def rets = [] - ElasticUtils.executeSqlQuery("select * from community where source='安居客小程序' and city='${city}' and m_date>='${mdate}' order by m_date", { d-> + ElasticUtils.executeSqlQuery("select * from community where source='瀹夊眳瀹㈠皬绋嬪簭' and city='${city}' and m_date>='${mdate}' order by m_date", { d-> if(d.house_type_images_2 || d.outdoor_images){ def s = d.city +"#"+d.region+"#"+d.name+"#"+d.property_type if(!names.contains(s)){ @@ -110,7 +110,7 @@ class AddDistImagesBatch extends BaseBatch{ try{ addCount.addAndGet(1) - def query = new BasicDBObject("city", d.city).append("district",d.region).append("name",d.name).append("source","贝壳找房").append("match_id", new BasicDBObject('$exists', true)) + def query = new BasicDBObject("city", d.city).append("district",d.region).append("name",d.name).append("source","璐濆3鎵炬埧").append("match_id", new BasicDBObject('$exists', true)) def obj = thirdSeaweedMappingColl.findOne(query) if(obj) { def imageObj = seaweed_fs_coll.findOne(new ObjectId(obj.match_id)) @@ -130,11 +130,11 @@ class AddDistImagesBatch extends BaseBatch{ if(vo.out_pics || vo.floorplan_pics){ def q = new BasicDBObject("_id", new ObjectId(obj.match_id)) seaweed_fs_coll.update(q, new BasicDBObject('$set', vo), true,false) - println addCount.get()+"/"+total +" [匹配库中存在] " + println addCount.get()+"/"+total +" [鍖归厤搴撲腑瀛樺湪] " } } }else{ - println addCount.get()+"/"+total +" [没找到相应的匹配数据] "+d._id.toString() + println addCount.get()+"/"+total +" [娌℃壘鍒扮浉搴旂殑鍖归厤鏁版嵁] "+d._id.toString() } } catch (Exception e) { @@ -171,7 +171,7 @@ class AddDistImagesBatch extends BaseBatch{ static def statImgCountByCity(){ def fullCityMap = CommonDatautils.queryFullNameByCity() - ExcelUtils.multiThreadingModify("D:\\数据\\全国城市.xlsx",{d-> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\鍏ㄥ浗鍩庡競.xlsx",{d-> // def data = fullCityMap.get(d['A']) // if(data){ // def q = new BasicDBObject() diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/level/DistrictIndexBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/level/DistrictIndexBatch.groovy index eac332041..8241495b7 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/level/DistrictIndexBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/level/DistrictIndexBatch.groovy @@ -37,7 +37,7 @@ import java.util.concurrent.atomic.AtomicLong import java.util.zip.GZIPInputStream /** - * 小区潜力指数 + * 灏忓尯娼滃姏鎸囨暟 */ class DistrictIndexBatch extends BaseBatch{ @@ -76,7 +76,7 @@ class DistrictIndexBatch extends BaseBatch{ def dists = CommonDatautils.findAllDistrictByCity(city, "district", ["city","alias","region","name", "finish_building_date","estate_charge","lat","lng","lng2","lat2","household_count"]) def code = cityCodeDatas.get(city) def city_avg_total_price = null - if(city!="上海"){ + if(city!="涓婃捣"){ city_avg_total_price = getAvgTotalPrice(city, 20200101, DateUtils.formatDateByPattern(new Date(),"yyyyMMdd")) if(city_avg_total_price){ city_avg_total_price = city_avg_total_price/10000.0 @@ -102,7 +102,7 @@ class DistrictIndexBatch extends BaseBatch{ final CountDownLatch latch = new CountDownLatch(dists.size()) def datas = new CopyOnWriteArrayList() - datas << ["城市","区域","名称","户均价格","物业费","小区价格在区域排名","消费","潜力"] + datas << ["鍩庡競","鍖哄煙","鍚嶇О","鎴峰潎浠锋牸","鐗╀笟璐�","灏忓尯浠锋牸鍦ㄥ尯鍩熸帓鍚�","娑堣垂","娼滃姏"] for(def i=0;i o2.distance) - return 1;//第二个元素(o1)比第一个元素(o2)大,返回-1 + return 1;//绗簩涓厓绱狅紙o1锛夋瘮绗竴涓厓绱狅紙o2锛夊ぇ锛岃繑鍥�-1 if(o1.distance == o2.distance) return 0; return -1; @@ -614,11 +614,11 @@ class DistrictIndexBatch extends BaseBatch{ def queryPoi(def city){ final StringBuffer sqlBuffer = new StringBuffer() sqlBuffer.append("SELECT cityname,adname,name,address,type,location,m_date,typecode,business.keytag as keytag,business.cost as cost FROM amap_poi_detail WHERE 1=1") - sqlBuffer.append(" and cityname = '" + city + "市'") + sqlBuffer.append(" and cityname = '" + city + "甯�'") sqlBuffer.append(" and business.cost>20 and business.cost<500") ResultSet rs = dataSource.connection.createStatement().executeQuery(sqlBuffer.toString()) def datas = [] - def tags = ["法国菜","东南亚菜","日本料理","火锅","海鲜","自助餐","西餐","浙菜","茶餐厅","酒吧","烤肉","潮州菜","云贵菜","韩国料理","中餐","特色火锅","西北菜","串串香","农家乐","烧烤","茶座","上海菜","意大利菜","素菜馆","蛋糕店","东北菜","湘菜","粤菜","咖啡厅","轰趴馆","清真菜","北京菜","川菜","餐饮服务,餐饮相关场所,餐饮相关"] + def tags = ["娉曞浗鑿�","涓滃崡浜氳彍","鏃ユ湰鏂欑悊","鐏攨","娴烽矞","鑷姪椁�","瑗块","娴欒彍","鑼堕鍘�","閰掑惂","鐑よ倝","娼窞鑿�","浜戣吹鑿�","闊╁浗鏂欑悊","涓","鐗硅壊鐏攨","瑗垮寳鑿�","涓蹭覆棣�","鍐滃涔�","鐑х儰","鑼跺骇","涓婃捣鑿�","鎰忓ぇ鍒╄彍","绱犺彍棣�","铔嬬硶搴�","涓滃寳鑿�","婀樿彍","绮よ彍","鍜栧暋鍘�","杞拌洞棣�","娓呯湡鑿�","鍖椾含鑿�","宸濊彍","椁愰ギ鏈嶅姟,椁愰ギ鐩稿叧鍦烘墍,椁愰ギ鐩稿叧"] def index = 0 while (rs.next()) { index++ @@ -790,7 +790,7 @@ class DistrictIndexBatch extends BaseBatch{ conn.connect(); //println param.toString() - //输出流 + //杈撳嚭娴� if (StringUtils.isNotEmpty(param)) { mWriter = new BufferedWriter(new OutputStreamWriter(conn.getOutputStream(), charset)); mWriter.write(param); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/level/DsElasticUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/level/DsElasticUtils.groovy index 9ef7e6926..bfba33e6e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/level/DsElasticUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/level/DsElasticUtils.groovy @@ -37,7 +37,7 @@ import java.util.concurrent.TimeUnit import java.util.function.BiConsumer /** - * 功能说明:Elasticsearch工具类 + * 鍔熻兘璇存槑:Elasticsearch宸ュ叿绫� */ class DsElasticUtils { @@ -78,7 +78,7 @@ class DsElasticUtils { /** - * 创建一个ES批处理器 + * 鍒涘缓涓�涓狤S鎵瑰鐞嗗櫒 * @param host * @return */ @@ -114,7 +114,7 @@ class DsElasticUtils { } /** - * 关闭一个ES批处理器 + * 鍏抽棴涓�涓狤S鎵瑰鐞嗗櫒 * @param * @return */ 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 index 3c74690da..ed5c059d5 100644 --- 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 @@ -16,7 +16,7 @@ import java.util.concurrent.Executors import java.util.concurrent.atomic.AtomicLong /** - * 判断小区是否在城市范围内 + * 鍒ゆ柇灏忓尯鏄惁鍦ㄥ煄甯傝寖鍥村唴 */ class DistrictLocationBatch { @@ -30,7 +30,7 @@ class DistrictLocationBatch { } def deleteDist(){ - ExcelUtils.multiThreadingModify("d:\\数据\\小区\\非本城市小区.xlsx",{d-> + ExcelUtils.multiThreadingModify("d:\\鏁版嵁\\灏忓尯\\闈炴湰鍩庡競灏忓尯.xlsx",{d-> DBObject q = new BasicDBObject() q.put("city", d['A']) q.put("region", d['B']) @@ -56,7 +56,7 @@ class DistrictLocationBatch { def rets = findNotInCityDistricts(city, disticts, pointList) allrets.addAll(rets) } - ExcelUtils.write("d:\\数据\\小区\\非本城市小区.xlsx", allrets, "经纬度不在此城市中") + ExcelUtils.write("d:\\鏁版嵁\\灏忓尯\\闈炴湰鍩庡競灏忓尯.xlsx", allrets, "缁忕含搴︿笉鍦ㄦ鍩庡競涓�") } def findNotInCityDistricts(city, districts, pointList){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/location/DistrictLocationUpdate.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/location/DistrictLocationUpdate.groovy index 362bf2afb..8f5c9e608 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/location/DistrictLocationUpdate.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/location/DistrictLocationUpdate.groovy @@ -33,11 +33,11 @@ class DistrictLocationUpdate { // task.updateLocationToDB() } def run(){ - def citys = ["福州"]//CommonDatautils.findAllCity() + def citys = ["绂忓窞"]//CommonDatautils.findAllCity() for(def city : citys){ def dists = CommonDatautils.findAllDistrictByCity(city, "district", ["city","region","name","address","alias", "lng", "lat"]) def rets = [] - rets << ["城市","区域","名称","地址","经度","纬度","高德区域","高德名称","高德地址","高德类型","高德经度","高德纬度","高德类型","得分","距离"] + rets << ["鍩庡競","鍖哄煙","鍚嶇О","鍦板潃","缁忓害","绾害","楂樺痉鍖哄煙","楂樺痉鍚嶇О","楂樺痉鍦板潃","楂樺痉绫诲瀷","楂樺痉缁忓害","楂樺痉绾害","楂樺痉绫诲瀷","寰楀垎","璺濈"] for(def d : dists){ def lng = null def lat = null @@ -48,17 +48,17 @@ class DistrictLocationUpdate { rets << [d.city, d.region, d.name, d.address, lng,lat] } - ExcelUtils.write("D:\\数据\\小区\\经纬度\\${city}.xlsx",rets, "数据") + ExcelUtils.write("D:\\鏁版嵁\\灏忓尯\\缁忕含搴\${city}.xlsx",rets, "鏁版嵁") } } def mapMatch(){ def index = 0 - ExcelUtils.modify("D:\\数据\\小区\\经纬度\\福州V3.xlsx",{d-> - if(!d['H'] && d['C']=="华侨城龙居御景二期"){ + ExcelUtils.modify("D:\\鏁版嵁\\灏忓尯\\缁忕含搴\绂忓窞V3.xlsx",{d-> + if(!d['H'] && d['C']=="鍗庝鲸鍩庨緳灞呭尽鏅簩鏈�"){ index++ -// def gdData = FangjiaClientUtils.getMapData(d['A'], d['B'],d['C'], d['D'],"住宅", "高德") +// def gdData = FangjiaClientUtils.getMapData(d['A'], d['B'],d['C'], d['D'],"浣忓畢", "楂樺痉") // println d['A']+" "+d['B']+" "+d['C'] // if(gdData){ // d['G'] = gdData.district @@ -106,7 +106,7 @@ class DistrictLocationUpdate { } def updateLocationToDB(){ - ExcelUtils.modify("D:\\数据\\小区\\经纬度\\福州V3.xlsx",{d-> + ExcelUtils.modify("D:\\鏁版嵁\\灏忓尯\\缁忕含搴\绂忓窞V3.xlsx",{d-> if(d['N'] && d['N']>1000){ if(d['M']>=0.4 && d['K']){ def query = new BasicDBObject() @@ -211,7 +211,7 @@ class DistrictLocationUpdate { if (rets) { if (rets.size() >= 1) { for (def mapObj : rets) { - if(mapObj.name && (mapObj.name.contains("(公交站)")||mapObj.name.contains("门)")||mapObj.name.contains("停车场"))){ + if(mapObj.name && (mapObj.name.contains("(鍏氦绔�)")||mapObj.name.contains("闂�)")||mapObj.name.contains("鍋滆溅鍦�"))){ continue; } // if((mapObj.adname && mapObj.adname.contains(region)) || (mapObj.region && mapObj.region.contains(region))){ @@ -240,7 +240,7 @@ class DistrictLocationUpdate { final StringBuffer sqlBuffer = new StringBuffer() sqlBuffer.append("SELECT cityname,adname,name,address,type,location,m_date,typecode FROM amap_poi WHERE 1=1") sqlBuffer.append(" and cityname = '" + city + "'") - sqlBuffer.append(" and source = '高德'") + sqlBuffer.append(" and source = '楂樺痉'") ResultSet rs = dataSource.connection.createStatement().executeQuery(sqlBuffer.toString()) def retMap = [:] while (rs.next()) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/location/DistrictMapMatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/location/DistrictMapMatch.groovy index b9b0c36d8..c5e445f8f 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/location/DistrictMapMatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/location/DistrictMapMatch.groovy @@ -20,7 +20,7 @@ class DistrictMapMatch { } def distince(){ - ExcelUtils.multiThreadingModify("D:\\数据\\comm_poi_map(重庆).xlsx",{ d-> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\comm_poi_map(閲嶅簡).xlsx",{ d-> if(d['O'] && d['T'] && d['F']){ def distance = GeoUtils.calculateDistance(d['G'].toDouble(), d['F'].toDouble(), d['T'].toDouble(), d['U'].toDouble()) d['X'] = distance @@ -29,7 +29,7 @@ class DistrictMapMatch { } def mapMatch1(){ def index = 0 - ExcelUtils.multiThreadingModify("D:\\数据\\comm_poi_map(重庆).xlsx",{ d-> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\comm_poi_map(閲嶅簡).xlsx",{ d-> if(!d['O']){ index++ def rets = OpenApiUtils.getGaoDeSearchLocation(d['B'],d['C'],d['D']) @@ -63,7 +63,7 @@ class DistrictMapMatch { def mapMatch(){ def index = 0 - ExcelUtils.modify("D:\\数据\\重庆农商行\\小区\\待审核小区(地图匹配).xlsx",{ d-> + ExcelUtils.modify("D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\灏忓尯\\寰呭鏍稿皬鍖�(鍦板浘鍖归厤).xlsx",{ d-> if(!d['H']){ index++ def rets = OpenApiUtils.getGaoDeSearchLocation(d['A'],d['B'],d['C']) @@ -98,7 +98,7 @@ class DistrictMapMatch { def mapMatch2(){ def index = 0 - ExcelUtils.multiThreadingModify("D:\\数据\\建行\\二期\\待入库小区(1).xlsx",{ d-> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\寤鸿\\浜屾湡\\寰呭叆搴撳皬鍖�(1).xlsx",{ d-> if(!d['M']){ index++ def rets = OpenApiUtils.getGaoDeSearchLocation(d['C'],d['J'],d['E']) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/location/GaoDeMapSearchTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/location/GaoDeMapSearchTest.groovy index 7bfaf972f..80a9841f7 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/location/GaoDeMapSearchTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/location/GaoDeMapSearchTest.groovy @@ -16,12 +16,12 @@ import java.util.regex.Pattern class GaoDeMapSearchTest { - def baiduCityCodeMap = ["北京": "131", "天津": "332", "石家庄": "150", "唐山": "265", "秦皇岛": "148", "邯郸": "151", "邢台": "266", "保定": "307", "张家口": "264", "承德": "207", "沧州": "149", "廊坊": "191", "衡水": "208", "太原": "176", "大同": "355", "阳泉": "357", "长治": "356", "晋城": "290", "朔州": "237", "晋中": "238", "运城": "328", "忻州": "367", "临汾": "368", "吕梁": "327", "呼和浩特": "321", "包头": "229", "乌海": "123", "赤峰": "297", "通辽": "64", "鄂尔多斯": "283", "呼伦贝尔": "61", "巴彦淖尔": "169", "乌兰察布": "168", "兴安盟": "62", "锡林郭勒盟": "63", "阿拉善盟": "230", "沈阳": "58", "大连": "167", "鞍山": "320", "抚顺": "184", "本溪": "227", "丹东": "282", "锦州": "166", "营口": "281", "阜新": "59", "辽阳": "351", "盘锦": "228", "铁岭": "60", "朝阳": "280", "葫芦岛": "319", "长春": "53", "吉林市": "55", "四平": "56", "辽源": "183", "通化": "165", "白山": "57", "松原": "52", "白城": "51", "延边朝鲜族自治州": "54", "哈尔滨": "48", "齐齐哈尔": "41", "鸡西": "46", "鹤岗": "43", "双鸭山": "45", "大庆": "50", "伊春": "40", "佳木斯": "42", "七台河": "47", "牡丹江": "49", "黑河": "39", "绥化": "44", "大兴安岭地区": "38", "上海": "289", "南京": "315", "无锡": "317", "徐州": "316", "常州": "348", "苏州": "224", "南通": "161", "连云港": "347", "淮安": "162", "盐城": "223", "扬州": "346", "镇江": "160", "泰州": "276", "宿迁": "277", "杭州": "179", "宁波": "180", "温州": "178", "嘉兴": "334", "湖州": "294", "绍兴": "293", "金华": "333", "衢州": "243", "舟山": "245", "台州": "244", "丽水": "292", "合肥": "127", "芜湖": "129", "蚌埠": "126", "淮南": "250", "马鞍山": "358", "淮北": "253", "铜陵": "337", "安庆": "130", "黄山": "252", "滁州": "189", "阜阳": "128", "宿州": "370", "巢湖": "251", "六安": "298", "亳州": "188", "池州": "299", "宣城": "190", "福州": "300", "厦门": "194", "莆田": "195", "三明": "254", "泉州": "134", "漳州": "255", "南平": "133", "龙岩": "193", "宁德": "192", "南昌": "163", "景德镇": "225", "萍乡": "350", "九江": "349", "新余": "164", "鹰潭": "279", "赣州": "365", "吉安": "318", "宜春": "278", "抚州": "226", "上饶": "364", "济南": "288", "青岛": "236", "淄博": "354", "枣庄": "172", "东营": "174", "烟台": "326", "潍坊": "287", "济宁": "286", "泰安": "325", "威海": "175", "日照": "173", "莱芜": "124", "临沂": "234", "德州": "372", "聊城": "366", "滨州": "235", "菏泽": "353", "郑州": "268", "开封": "210", "洛阳": "153", "平顶山": "213", "安阳": "267", "鹤壁": "215", "新乡": "152", "焦作": "211", "濮阳": "209", "许昌": "155", "漯河": "344", "三门峡": "212", "南阳": "309", "商丘": "154", "信阳": "214", "周口": "308", "驻马店": "269", "武汉": "218", "黄石": "311", "十堰": "216", "宜昌": "270", "襄阳": "156", "鄂州": "122", "荆门": "217", "孝感": "310", "荆州": "157", "黄冈": "271", "咸宁": "362", "随州": "371", "恩施土家族苗族自治州": "373", "仙桃": "1713", "潜江": "1293", "天门": "2654", "神农架林区": "2734", "长沙": "158", "株洲": "222", "湘潭": "313", "衡阳": "159", "邵阳": "273", "岳阳": "220", "常德": "219", "张家界": "312", "益阳": "272", "郴州": "275", "永州": "314", "怀化": "363", "娄底": "221", "湘西土家族苗族自治州": "274", "广州": "257", "韶关": "137", "深圳": "340", "珠海": "140", "汕头": "303", "佛山": "138", "江门": "302", "湛江": "198", "茂名": "139", "肇庆": "338", "惠州": "301", "梅州": "141", "汕尾": "339", "河源": "200", "阳江": "199", "清远": "197", "东莞": "119", "中山": "187", "潮州": "201", "揭阳": "259", "云浮": "258", "南宁": "261", "柳州": "305", "桂林": "142", "梧州": "304", "北海": "295", "防城港": "204", "钦州": "145", "贵港": "341", "玉林": "361", "百色": "203", "贺州": "260", "河池": "143", "来宾": "202", "崇左": "144", "海口": "125", "三亚": "121", "五指山": "1644", "琼海": "2358", "儋州": "1215", "文昌": "2758", "万宁": "1216", "东方": "2634", "定安": "1214", "屯昌": "1641", "澄迈": "2757", "临高": "2033", "白沙黎族自治": "2359", "昌江黎族自治": "1642", "乐东黎族自治": "2032", "陵水黎族自治": "1643", "保亭黎族苗族自治": "1217", "琼中黎族苗族自治": "2031", "重庆": "132", "成都": "75", "自贡": "78", "攀枝花": "81", "泸州": "331", "德阳": "74", "绵阳": "240", "广元": "329", "遂宁": "330", "内江": "248", "乐山": "79", "南充": "291", "眉山": "77", "宜宾": "186", "广安": "241", "达州": "369", "雅安": "76", "巴中": "239", "资阳": "242", "阿坝藏族羌族自治州": "185", "甘孜藏族自治州": "73", "凉山彝族自治州": "80", "贵阳": "146", "六盘水": "147", "遵义": "262", "安顺": "263", "铜仁地区": "205", "黔西南布依族苗族自治州": "343", "毕节地区": "206", "黔东南苗族侗族自治州": "342", "黔南布依族苗族自治州": "306", "昆明": "104", "曲靖": "249", "玉溪": "106", "保山": "112", "昭通": "336", "丽江": "114", "临沧": "110", "楚雄彝族自治州": "105", "红河哈尼族彝族自治州": "107", "文山壮族苗族自治州": "177", "普洱": "108", "西双版纳傣族自治州": "109", "大理白族自治州": "111", "德宏傣族景颇族自治州": "116", "怒江傈僳族自治州": "113", "迪庆藏族自治州": "115", "拉萨": "100", "昌都地区": "99", "山南地区": "97", "日喀则地区": "102", "那曲地区": "101", "阿里地区": "103", "林芝地区": "98", "西安": "233", "铜川": "232", "宝鸡": "171", "咸阳": "323", "渭南": "170", "延安": "284", "汉中": "352", "榆林": "231", "安康": "324", "商洛": "285", "兰州": "36", "嘉峪关": "33", "金昌": "34", "白银": "35", "天水": "196", "武威": "118", "张掖": "117", "平凉": "359", "酒泉": "37", "庆阳": "135", "定西": "136", "陇南": "256", "临夏回族自治州": "182", "甘南藏族自治州": "247", "西宁": "66", "海东地区": "69", "海北藏族自治州": "67", "黄南藏族自治州": "70", "海南藏族自治州": "68", "果洛藏族自治州": "72", "玉树藏族自治州": "71", "海西蒙古族藏族自治州": "65", "银川": "360", "石嘴山": "335", "吴忠": "322", "固原": "246", "中卫": "181", "乌鲁木齐": "92", "克拉玛依": "95", "吐鲁番地区": "89", "哈密地区": "91", "昌吉回族自治州": "93", "博尔塔拉蒙古自治州": "88", "巴音郭楞蒙古自治州": "86", "阿克苏地区": "85", "克孜勒苏柯尔克孜自治州": "84", "喀什地区": "83", "和田地区": "82", "伊犁": "90", "塔城地区": "94", "阿勒泰地区": "96", "石河子": "770", "阿拉尔": "731", "图木舒克": "792", "五家渠": "789", "香港特别行政区": "2912", "澳门特别行政区": "2911"] + def baiduCityCodeMap = ["鍖椾含": "131", "澶╂触": "332", "鐭冲搴�": "150", "鍞愬北": "265", "绉︾殗宀�": "148", "閭兏": "151", "閭㈠彴": "266", "淇濆畾": "307", "寮犲鍙�": "264", "鎵垮痉": "207", "娌у窞": "149", "寤婂潑": "191", "琛℃按": "208", "澶師": "176", "澶у悓": "355", "闃虫硥": "357", "闀挎不": "356", "鏅嬪煄": "290", "鏈斿窞": "237", "鏅嬩腑": "238", "杩愬煄": "328", "蹇诲窞": "367", "涓存本": "368", "鍚曟": "327", "鍛煎拰娴╃壒": "321", "鍖呭ご": "229", "涔屾捣": "123", "璧ゅ嘲": "297", "閫氳窘": "64", "閯傚皵澶氭柉": "283", "鍛间鸡璐濆皵": "61", "宸村溅娣栧皵": "169", "涔屽叞瀵熷竷": "168", "鍏村畨鐩�": "62", "閿℃灄閮嫆鐩�": "63", "闃挎媺鍠勭洘": "230", "娌堥槼": "58", "澶ц繛": "167", "闉嶅北": "320", "鎶氶『": "184", "鏈邯": "227", "涓逛笢": "282", "閿﹀窞": "166", "钀ュ彛": "281", "闃滄柊": "59", "杈介槼": "351", "鐩橀敠": "228", "閾佸箔": "60", "鏈濋槼": "280", "钁姦宀�": "319", "闀挎槬": "53", "鍚夋灄甯�": "55", "鍥涘钩": "56", "杈芥簮": "183", "閫氬寲": "165", "鐧藉北": "57", "鏉惧師": "52", "鐧藉煄": "51", "寤惰竟鏈濋矞鏃忚嚜娌诲窞": "54", "鍝堝皵婊�": "48", "榻愰綈鍝堝皵": "41", "楦¤タ": "46", "楣ゅ矖": "43", "鍙岄腑灞�": "45", "澶у簡": "50", "浼婃槬": "40", "浣虫湪鏂�": "42", "涓冨彴娌�": "47", "鐗′腹姹�": "49", "榛戞渤": "39", "缁ュ寲": "44", "澶у叴瀹夊箔鍦板尯": "38", "涓婃捣": "289", "鍗椾含": "315", "鏃犻敗": "317", "寰愬窞": "316", "甯稿窞": "348", "鑻忓窞": "224", "鍗楅��": "161", "杩炰簯娓�": "347", "娣畨": "162", "鐩愬煄": "223", "鎵窞": "346", "闀囨睙": "160", "娉板窞": "276", "瀹胯縼": "277", "鏉窞": "179", "瀹佹尝": "180", "娓╁窞": "178", "鍢夊叴": "334", "婀栧窞": "294", "缁嶅叴": "293", "閲戝崕": "333", "琛㈠窞": "243", "鑸熷北": "245", "鍙板窞": "244", "涓芥按": "292", "鍚堣偉": "127", "鑺滄箹": "129", "铓屽煚": "126", "娣崡": "250", "椹瀺灞�": "358", "娣寳": "253", "閾滈櫟": "337", "瀹夊簡": "130", "榛勫北": "252", "婊佸窞": "189", "闃滈槼": "128", "瀹垮窞": "370", "宸㈡箹": "251", "鍏畨": "298", "浜冲窞": "188", "姹犲窞": "299", "瀹e煄": "190", "绂忓窞": "300", "鍘﹂棬": "194", "鑾嗙敯": "195", "涓夋槑": "254", "娉夊窞": "134", "婕冲窞": "255", "鍗楀钩": "133", "榫欏博": "193", "瀹佸痉": "192", "鍗楁槍": "163", "鏅痉闀�": "225", "钀嶄埂": "350", "涔濇睙": "349", "鏂颁綑": "164", "楣版江": "279", "璧e窞": "365", "鍚夊畨": "318", "瀹滄槬": "278", "鎶氬窞": "226", "涓婇ザ": "364", "娴庡崡": "288", "闈掑矝": "236", "娣勫崥": "354", "鏋e簞": "172", "涓滆惀": "174", "鐑熷彴": "326", "娼嶅潑": "287", "娴庡畞": "286", "娉板畨": "325", "濞佹捣": "175", "鏃ョ収": "173", "鑾辫姕": "124", "涓存矀": "234", "寰峰窞": "372", "鑱婂煄": "366", "婊ㄥ窞": "235", "鑿忔辰": "353", "閮戝窞": "268", "寮�灏�": "210", "娲涢槼": "153", "骞抽《灞�": "213", "瀹夐槼": "267", "楣ゅ": "215", "鏂颁埂": "152", "鐒︿綔": "211", "婵槼": "209", "璁告槍": "155", "婕渤": "344", "涓夐棬宄�": "212", "鍗楅槼": "309", "鍟嗕笜": "154", "淇¢槼": "214", "鍛ㄥ彛": "308", "椹婚┈搴�": "269", "姝︽眽": "218", "榛勭煶": "311", "鍗佸牥": "216", "瀹滄槍": "270", "瑗勯槼": "156", "閯傚窞": "122", "鑽嗛棬": "217", "瀛濇劅": "310", "鑽嗗窞": "157", "榛勫唸": "271", "鍜稿畞": "362", "闅忓窞": "371", "鎭╂柦鍦熷鏃忚嫍鏃忚嚜娌诲窞": "373", "浠欐": "1713", "娼滄睙": "1293", "澶╅棬": "2654", "绁炲啘鏋舵灄鍖�": "2734", "闀挎矙": "158", "鏍床": "222", "婀樻江": "313", "琛¢槼": "159", "閭甸槼": "273", "宀抽槼": "220", "甯稿痉": "219", "寮犲鐣�": "312", "鐩婇槼": "272", "閮村窞": "275", "姘稿窞": "314", "鎬�鍖�": "363", "濞勫簳": "221", "婀樿タ鍦熷鏃忚嫍鏃忚嚜娌诲窞": "274", "骞垮窞": "257", "闊跺叧": "137", "娣卞湷": "340", "鐝犳捣": "140", "姹曞ご": "303", "浣涘北": "138", "姹熼棬": "302", "婀涙睙": "198", "鑼傚悕": "139", "鑲囧簡": "338", "鎯犲窞": "301", "姊呭窞": "141", "姹曞熬": "339", "娌虫簮": "200", "闃虫睙": "199", "娓呰繙": "197", "涓滆帪": "119", "涓北": "187", "娼窞": "201", "鎻槼": "259", "浜戞诞": "258", "鍗楀畞": "261", "鏌冲窞": "305", "妗傛灄": "142", "姊у窞": "304", "鍖楁捣": "295", "闃插煄娓�": "204", "閽﹀窞": "145", "璐垫腐": "341", "鐜夋灄": "361", "鐧捐壊": "203", "璐哄窞": "260", "娌虫睜": "143", "鏉ュ": "202", "宕囧乏": "144", "娴峰彛": "125", "涓変簹": "121", "浜旀寚灞�": "1644", "鐞兼捣": "2358", "鍎嬪窞": "1215", "鏂囨槍": "2758", "涓囧畞": "1216", "涓滄柟": "2634", "瀹氬畨": "1214", "灞槍": "1641", "婢勮繄": "2757", "涓撮珮": "2033", "鐧芥矙榛庢棌鑷不": "2359", "鏄屾睙榛庢棌鑷不": "1642", "涔愪笢榛庢棌鑷不": "2032", "闄垫按榛庢棌鑷不": "1643", "淇濅涵榛庢棌鑻楁棌鑷不": "1217", "鐞间腑榛庢棌鑻楁棌鑷不": "2031", "閲嶅簡": "132", "鎴愰兘": "75", "鑷础": "78", "鏀�鏋濊姳": "81", "娉稿窞": "331", "寰烽槼": "74", "缁甸槼": "240", "骞垮厓": "329", "閬傚畞": "330", "鍐呮睙": "248", "涔愬北": "79", "鍗楀厖": "291", "鐪夊北": "77", "瀹滃": "186", "骞垮畨": "241", "杈惧窞": "369", "闆呭畨": "76", "宸翠腑": "239", "璧勯槼": "242", "闃垮潩钘忔棌缇屾棌鑷不宸�": "185", "鐢樺瓬钘忔棌鑷不宸�": "73", "鍑夊北褰濇棌鑷不宸�": "80", "璐甸槼": "146", "鍏洏姘�": "147", "閬典箟": "262", "瀹夐『": "263", "閾滀粊鍦板尯": "205", "榛旇タ鍗楀竷渚濇棌鑻楁棌鑷不宸�": "343", "姣曡妭鍦板尯": "206", "榛斾笢鍗楄嫍鏃忎緱鏃忚嚜娌诲窞": "342", "榛斿崡甯冧緷鏃忚嫍鏃忚嚜娌诲窞": "306", "鏄嗘槑": "104", "鏇查潠": "249", "鐜夋邯": "106", "淇濆北": "112", "鏄��": "336", "涓芥睙": "114", "涓存钵": "110", "妤氶泟褰濇棌鑷不宸�": "105", "绾㈡渤鍝堝凹鏃忓綕鏃忚嚜娌诲窞": "107", "鏂囧北澹棌鑻楁棌鑷不宸�": "177", "鏅幢": "108", "瑗垮弻鐗堢撼鍌f棌鑷不宸�": "109", "澶х悊鐧芥棌鑷不宸�": "111", "寰峰畯鍌f棌鏅鏃忚嚜娌诲窞": "116", "鎬掓睙鍌堝兂鏃忚嚜娌诲窞": "113", "杩簡钘忔棌鑷不宸�": "115", "鎷夎惃": "100", "鏄岄兘鍦板尯": "99", "灞卞崡鍦板尯": "97", "鏃ュ杸鍒欏湴鍖�": "102", "閭f洸鍦板尯": "101", "闃块噷鍦板尯": "103", "鏋楄姖鍦板尯": "98", "瑗垮畨": "233", "閾滃窛": "232", "瀹濋浮": "171", "鍜搁槼": "323", "娓崡": "170", "寤跺畨": "284", "姹変腑": "352", "姒嗘灄": "231", "瀹夊悍": "324", "鍟嗘礇": "285", "鍏板窞": "36", "鍢夊唱鍏�": "33", "閲戞槍": "34", "鐧介摱": "35", "澶╂按": "196", "姝﹀▉": "118", "寮犳帠": "117", "骞冲噳": "359", "閰掓硥": "37", "搴嗛槼": "135", "瀹氳タ": "136", "闄囧崡": "256", "涓村鍥炴棌鑷不宸�": "182", "鐢樺崡钘忔棌鑷不宸�": "247", "瑗垮畞": "66", "娴蜂笢鍦板尯": "69", "娴峰寳钘忔棌鑷不宸�": "67", "榛勫崡钘忔棌鑷不宸�": "70", "娴峰崡钘忔棌鑷不宸�": "68", "鏋滄礇钘忔棌鑷不宸�": "72", "鐜夋爲钘忔棌鑷不宸�": "71", "娴疯タ钂欏彜鏃忚棌鏃忚嚜娌诲窞": "65", "閾跺窛": "360", "鐭冲槾灞�": "335", "鍚村繝": "322", "鍥哄師": "246", "涓崼": "181", "涔岄瞾鏈ㄩ綈": "92", "鍏嬫媺鐜涗緷": "95", "鍚愰瞾鐣湴鍖�": "89", "鍝堝瘑鍦板尯": "91", "鏄屽悏鍥炴棌鑷不宸�": "93", "鍗氬皵濉旀媺钂欏彜鑷不宸�": "88", "宸撮煶閮钂欏彜鑷不宸�": "86", "闃垮厠鑻忓湴鍖�": "85", "鍏嬪瓬鍕掕嫃鏌皵鍏嬪瓬鑷不宸�": "84", "鍠�浠�鍦板尯": "83", "鍜岀敯鍦板尯": "82", "浼婄妬": "90", "濉斿煄鍦板尯": "94", "闃垮嫆娉板湴鍖�": "96", "鐭虫渤瀛�": "770", "闃挎媺灏�": "731", "鍥炬湪鑸掑厠": "792", "浜斿娓�": "789", "棣欐腐鐗瑰埆琛屾斂鍖�": "2912", "婢抽棬鐗瑰埆琛屾斂鍖�": "2911"] static main(args) { def task = new GaoDeMapSearchTest(); - def path = "D:\\数据\\富民\\富民测试500.xlsx" + def path = "D:\\鏁版嵁\\瀵屾皯\\瀵屾皯娴嬭瘯500.xlsx" // task.structureV2(path) // task.match(path) @@ -30,7 +30,7 @@ class GaoDeMapSearchTest { // task.checkTrue(path) // task.addFinancialLevel(path) - def results = com.fangjia.script.gj.OpenApiUtils.financialRating("重庆", "凤中路193号") + def results = com.fangjia.script.gj.OpenApiUtils.financialRating("閲嶅簡", "鍑や腑璺�193鍙�") println results } @@ -77,7 +77,7 @@ class GaoDeMapSearchTest { def isStandardRoad(def s){ - def pattern = Pattern.compile("[路|街|大道|巷]\\d+(号|弄)"); + def pattern = Pattern.compile("[璺瘄琛梶澶ч亾|宸穄\\d+(鍙穦寮�)"); def matcher = pattern.matcher(s) if(matcher.find()){ return true; @@ -124,7 +124,7 @@ class GaoDeMapSearchTest { if(bdRes.matchType){ row['X'] = bdRes.matchType } - row['Y'] = "高德" + row['Y'] = "楂樺痉" } } },0) @@ -136,7 +136,7 @@ class GaoDeMapSearchTest { def map; if (rets) { if (rets.size() >= 1) { - //相似里找有精确地址 + //鐩镐技閲屾壘鏈夌簿纭湴鍧� for (def mapObj : rets) { mapObj.address = com.fangjia.script.util.DataUtil.formateAddress(city, mapObj.address); if (mapObj.address && findPattern(mapObj.address)) { @@ -145,10 +145,10 @@ class GaoDeMapSearchTest { } } if(!map){ - //交带有交叉口地址 + //浜ゅ甫鏈変氦鍙夊彛鍦板潃 for (def mapObj : rets) { - if (mapObj.address && (mapObj.address.contains("交汇")||mapObj.address.contains("交叉"))) { - if(!mapObj.address.contains("与;") && !mapObj.address.startsWith("路") && !mapObj.address.startsWith("路;")){ + if (mapObj.address && (mapObj.address.contains("浜ゆ眹")||mapObj.address.contains("浜ゅ弶"))) { + if(!mapObj.address.contains("涓�;") && !mapObj.address.startsWith("璺�") && !mapObj.address.startsWith("璺�;")){ map = mapObj; break; } @@ -174,7 +174,7 @@ class GaoDeMapSearchTest { } if(jsonObj.result.city){ def cityStr = null - if(jsonObj.result.city=="市辖区"){ + if(jsonObj.result.city=="甯傝緰鍖�"){ cityStr = jsonObj.result.province }else{ cityStr = jsonObj.result.city @@ -223,7 +223,7 @@ class GaoDeMapSearchTest { - //可以根据测试数据添加 推荐楼盘名 + //鍙互鏍规嵁娴嬭瘯鏁版嵁娣诲姞 鎺ㄨ崘妤肩洏鍚� def match(path){ ExcelUtils.modify(path, { row -> def city = row['C'] @@ -292,7 +292,7 @@ class GaoDeMapSearchTest { if(bdRes.matchType){ row['X'] = bdRes.matchType } - row['Y'] = "百度" + row['Y'] = "鐧惧害" } println row['B'] +" "+ bdRes } @@ -312,7 +312,7 @@ class GaoDeMapSearchTest { } if(jsonObj.result.city){ - if(jsonObj.result.city=="市辖区"){ + if(jsonObj.result.city=="甯傝緰鍖�"){ map.city = jsonObj.result.province }else{ map.city = jsonObj.result.city @@ -327,7 +327,7 @@ class GaoDeMapSearchTest { def street = jsonObj.result.street if(street){ old_addr = street - map.street = street.replace("交叉口","").replace("交叉","") + map.street = street.replace("浜ゅ弶鍙�","").replace("浜ゅ弶","") } } if(jsonObj.result.streetNumber){ @@ -337,7 +337,7 @@ class GaoDeMapSearchTest { } } } - map.addr = old_addr.replace("交叉口","").replace("交叉","") + map.addr = old_addr.replace("浜ゅ弶鍙�","").replace("浜ゅ弶","") return map; } @@ -473,8 +473,8 @@ class GaoDeMapSearchTest { } } if (baidu_addr_map.addr) { - if(baidu_addr_map.addr.contains("与")){ - def arrs = baidu_addr_map.addr.split("与") + if(baidu_addr_map.addr.contains("涓�")){ + def arrs = baidu_addr_map.addr.split("涓�") for(def s1 : arrs){ def temp_addr_score = CosineSimilarAlgorithm.getSimilarityRatio(inpAddr, s1); if(temp_addr_score > addr_score && (inpAddr.contains(baidu_addr_map.addr) || baidu_addr_map.addr.contains(inpAddr))){ @@ -504,10 +504,10 @@ class GaoDeMapSearchTest { def list = [] if(addr_score>0){ - list << "地址有关" + list << "鍦板潃鏈夊叧" } if(nameScore>0){ - list << "名称相似" + list << "鍚嶇О鐩镐技" } if(list){ o.matchType = list.join(",") @@ -519,7 +519,7 @@ class GaoDeMapSearchTest { // if(baidu_addr){ // def addr_score = CosineSimilarAlgorithm.getSimilarityRatio(inpAddr, baidu_addr); // //if(addr_score==1){ -// // o.matchType = "城市相同,名称相似,地址有关" +// // o.matchType = "鍩庡競鐩稿悓锛屽悕绉扮浉浼硷紝鍦板潃鏈夊叧" // bo.score = bo.score + addr_score // maxScore = bo.score; // //} @@ -540,7 +540,7 @@ class GaoDeMapSearchTest { // score = CosineSimilarAlgorithm.getSimilarityRatio(mapKeyName, newName); // if(score > maxScore){ // maxScore = score -// o.matchType = "名称相似" +// o.matchType = "鍚嶇О鐩镐技" // o.city = obj.city // bo = o // bo.score = maxScore @@ -550,7 +550,7 @@ class GaoDeMapSearchTest { // def newNameBY = com.fangjia.core.util.DataUtil.hanyuQuanpin(newName, " ") // if(mapKeyNameBY == newNameBY){ // maxScore = 0.977; -// o.matchType = "拼音相似" +// o.matchType = "鎷奸煶鐩镐技" // o.city = obj.city // bo = o // bo.score = maxScore diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/location/GaodeCityRange.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/location/GaodeCityRange.groovy index 7c5383cd7..96fe21e18 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/location/GaodeCityRange.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/location/GaodeCityRange.groovy @@ -20,20 +20,20 @@ class GaodeCityRange { def run(){ // def citys = CommonDatautils.findAllCity() - def citys1= ["上海","北京","广州","深圳","成都","天津","西安","杭州","沈阳","重庆","武汉","南京","石家庄","福州","宁波","贵阳","苏州","长沙","大连","昆明","厦门","太原","无锡","郑州","呼和浩特","济南","哈尔滨","兰州","青岛","佛山","长春","东莞","合肥","烟台","乌鲁木齐","南昌","泉州","齐齐哈尔","包头","常德","大同","温州","银川","西宁","扬州","绵阳","威海","吉林","中山","邯郸","湛江","潍坊","保定","常州","秦皇岛","嘉兴","鞍山","马鞍山","宜昌","徐州","株洲","大庆","镇江","芜湖","赣州","南通","九江","洛阳","泰州","惠州","台州","湖州","绍兴","江门","海口","珠海","金华","桂林","连云港","马鞍山","淄博","柳州","盐城","汕头","衡阳","揭阳","茂名","牡丹江","平顶山","本溪","安阳","舟山","岳阳","许昌","四平","淮南","淮安","赤峰","佳木斯","南阳","临沂","临汾","榆林","三亚","唐山","咸阳","宜宾","自贡","廊坊","南宁","攀枝花","襄阳","延安","丽江","大理","湘潭","六盘水","清远","衢州","宿迁","北海","莆田","玉林","张家界","肇庆","曲靖","新乡","营口","潮州","河源","黄石","焦作","盘锦","韶关","阳江","梅州","云浮","玉溪","遵义","中卫","武威","铁岭","天水","泰安","黄冈","广元","阜阳","定西","辽源","丽水","乐山","菏泽","锦州","汉中","黄山","白山","安顺","安康","绥化","钦州","鄂尔多斯","梧州","百色","鸡西","七台河","白城","朝阳","沧州","东营","德州","亳州","安庆","六安","宁德","三沙","临沧","拉萨","南充","泸州","资阳","乌海","邵阳","克拉玛依","巴彦淖尔","荆门","来宾","开封","信阳","固原","驻马店","防城港","朔州","铜川","呼伦贝尔","双鸭山","平凉","崇左","白银","河池","吉安","通化","景德镇","鹤岗","海东","黑河","阜新","抚顺","葫芦岛","张家口","衡水","邢台","石嘴山","济宁","日照","聊城","滨州","淮北","宣城","三明","宿州","龙岩","保山","池州","铜仁","乌兰察布","南平","内江","达州","贺州","巴中","贵港","昭通","怀化","鄂州","伊春","毕节","十堰","遂宁","漯河","松原","眉山","鹤壁","忻州","郴州","晋中","益阳","辽阳","宝鸡","酒泉","张掖","随州","承德","鹰潭","新余","孝感","枣庄","周口","濮阳","阳泉","运城","蚌埠","渭南","滁州","铜陵","嘉峪关","漳州","庆阳","汕尾","上饶","普洱","宜春","德阳","广安","雅安","永州","娄底","荆州","咸宁","三门峡","商丘","长治","吕梁","商洛","金昌","陇南","萍乡","抚州","吴忠","通辽","晋城","阿克苏","喀什","昌吉","楚雄","大兴安岭","吐鲁番","哈密","和田","塔城","阿勒泰","博尔塔拉","巴音郭楞","克孜勒苏","伊犁","红河","昌都","日喀则","山南","那曲","阿里","林芝","兴安盟","锡林郭勒盟","阿拉善盟","临夏","甘南","黔西南","黔东南","黔南","恩施","湘西","延边","昆玉","丹东","石河子","阿拉尔","图木舒克","五家渠","济源","仙桃","潜江","天门","神农架","五指山","琼海","儋州","文昌","万宁","东方","定安","屯昌","澄迈","临高","白沙","昌江","乐东","陵水","保亭","琼中","北屯","铁门关","双河","可克达拉"] - def citys = ["新星","胡杨河","白杨"] + def citys1= ["涓婃捣","鍖椾含","骞垮窞","娣卞湷","鎴愰兘","澶╂触","瑗垮畨","鏉窞","娌堥槼","閲嶅簡","姝︽眽","鍗椾含","鐭冲搴�","绂忓窞","瀹佹尝","璐甸槼","鑻忓窞","闀挎矙","澶ц繛","鏄嗘槑","鍘﹂棬","澶師","鏃犻敗","閮戝窞","鍛煎拰娴╃壒","娴庡崡","鍝堝皵婊�","鍏板窞","闈掑矝","浣涘北","闀挎槬","涓滆帪","鍚堣偉","鐑熷彴","涔岄瞾鏈ㄩ綈","鍗楁槍","娉夊窞","榻愰綈鍝堝皵","鍖呭ご","甯稿痉","澶у悓","娓╁窞","閾跺窛","瑗垮畞","鎵窞","缁甸槼","濞佹捣","鍚夋灄","涓北","閭兏","婀涙睙","娼嶅潑","淇濆畾","甯稿窞","绉︾殗宀�","鍢夊叴","闉嶅北","椹瀺灞�","瀹滄槍","寰愬窞","鏍床","澶у簡","闀囨睙","鑺滄箹","璧e窞","鍗楅��","涔濇睙","娲涢槼","娉板窞","鎯犲窞","鍙板窞","婀栧窞","缁嶅叴","姹熼棬","娴峰彛","鐝犳捣","閲戝崕","妗傛灄","杩炰簯娓�","椹瀺灞�","娣勫崥","鏌冲窞","鐩愬煄","姹曞ご","琛¢槼","鎻槼","鑼傚悕","鐗′腹姹�","骞抽《灞�","鏈邯","瀹夐槼","鑸熷北","宀抽槼","璁告槍","鍥涘钩","娣崡","娣畨","璧ゅ嘲","浣虫湪鏂�","鍗楅槼","涓存矀","涓存本","姒嗘灄","涓変簹","鍞愬北","鍜搁槼","瀹滃","鑷础","寤婂潑","鍗楀畞","鏀�鏋濊姳","瑗勯槼","寤跺畨","涓芥睙","澶х悊","婀樻江","鍏洏姘�","娓呰繙","琛㈠窞","瀹胯縼","鍖楁捣","鑾嗙敯","鐜夋灄","寮犲鐣�","鑲囧簡","鏇查潠","鏂颁埂","钀ュ彛","娼窞","娌虫簮","榛勭煶","鐒︿綔","鐩橀敠","闊跺叧","闃虫睙","姊呭窞","浜戞诞","鐜夋邯","閬典箟","涓崼","姝﹀▉","閾佸箔","澶╂按","娉板畨","榛勫唸","骞垮厓","闃滈槼","瀹氳タ","杈芥簮","涓芥按","涔愬北","鑿忔辰","閿﹀窞","姹変腑","榛勫北","鐧藉北","瀹夐『","瀹夊悍","缁ュ寲","閽﹀窞","閯傚皵澶氭柉","姊у窞","鐧捐壊","楦¤タ","涓冨彴娌�","鐧藉煄","鏈濋槼","娌у窞","涓滆惀","寰峰窞","浜冲窞","瀹夊簡","鍏畨","瀹佸痉","涓夋矙","涓存钵","鎷夎惃","鍗楀厖","娉稿窞","璧勯槼","涔屾捣","閭甸槼","鍏嬫媺鐜涗緷","宸村溅娣栧皵","鑽嗛棬","鏉ュ","寮�灏�","淇¢槼","鍥哄師","椹婚┈搴�","闃插煄娓�","鏈斿窞","閾滃窛","鍛间鸡璐濆皵","鍙岄腑灞�","骞冲噳","宕囧乏","鐧介摱","娌虫睜","鍚夊畨","閫氬寲","鏅痉闀�","楣ゅ矖","娴蜂笢","榛戞渤","闃滄柊","鎶氶『","钁姦宀�","寮犲鍙�","琛℃按","閭㈠彴","鐭冲槾灞�","娴庡畞","鏃ョ収","鑱婂煄","婊ㄥ窞","娣寳","瀹e煄","涓夋槑","瀹垮窞","榫欏博","淇濆北","姹犲窞","閾滀粊","涔屽叞瀵熷竷","鍗楀钩","鍐呮睙","杈惧窞","璐哄窞","宸翠腑","璐垫腐","鏄��","鎬�鍖�","閯傚窞","浼婃槬","姣曡妭","鍗佸牥","閬傚畞","婕渤","鏉惧師","鐪夊北","楣ゅ","蹇诲窞","閮村窞","鏅嬩腑","鐩婇槼","杈介槼","瀹濋浮","閰掓硥","寮犳帠","闅忓窞","鎵垮痉","楣版江","鏂颁綑","瀛濇劅","鏋e簞","鍛ㄥ彛","婵槼","闃虫硥","杩愬煄","铓屽煚","娓崡","婊佸窞","閾滈櫟","鍢夊唱鍏�","婕冲窞","搴嗛槼","姹曞熬","涓婇ザ","鏅幢","瀹滄槬","寰烽槼","骞垮畨","闆呭畨","姘稿窞","濞勫簳","鑽嗗窞","鍜稿畞","涓夐棬宄�","鍟嗕笜","闀挎不","鍚曟","鍟嗘礇","閲戞槍","闄囧崡","钀嶄埂","鎶氬窞","鍚村繝","閫氳窘","鏅嬪煄","闃垮厠鑻�","鍠�浠�","鏄屽悏","妤氶泟","澶у叴瀹夊箔","鍚愰瞾鐣�","鍝堝瘑","鍜岀敯","濉斿煄","闃垮嫆娉�","鍗氬皵濉旀媺","宸撮煶閮","鍏嬪瓬鍕掕嫃","浼婄妬","绾㈡渤","鏄岄兘","鏃ュ杸鍒�","灞卞崡","閭f洸","闃块噷","鏋楄姖","鍏村畨鐩�","閿℃灄閮嫆鐩�","闃挎媺鍠勭洘","涓村","鐢樺崡","榛旇タ鍗�","榛斾笢鍗�","榛斿崡","鎭╂柦","婀樿タ","寤惰竟","鏄嗙帀","涓逛笢","鐭虫渤瀛�","闃挎媺灏�","鍥炬湪鑸掑厠","浜斿娓�","娴庢簮","浠欐","娼滄睙","澶╅棬","绁炲啘鏋�","浜旀寚灞�","鐞兼捣","鍎嬪窞","鏂囨槍","涓囧畞","涓滄柟","瀹氬畨","灞槍","婢勮繄","涓撮珮","鐧芥矙","鏄屾睙","涔愪笢","闄垫按","淇濅涵","鐞间腑","鍖楀悲","閾侀棬鍏�","鍙屾渤","鍙厠杈炬媺"] + def citys = ["鏂版槦","鑳℃潹娌�","鐧芥潹"] HttpRequest request = new HttpRequest() def rows = [] citys.each{c-> if(!citys1.contains(c)){ - c = c.replace("州","") + c = c.replace("宸�","") JSONObject resp = request.getJsonContent("http://restapi.amap.com/v3/config/district?key=66e6771767ab293ace441553c36621c1&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())){ + if(["涓婃捣甯�","鍖椾含甯�","澶╂触甯�","閲嶅簡甯�"].contains(d.name.toString())){ rows << d }else{ if(d.level=="city"){ @@ -54,7 +54,7 @@ class GaodeCityRange { // def datas = resp.get("districts") // for(def d : datas){ // println c +" "+ d.name+" "+d.level -// if(["上海市","北京市","天津市","重庆市"].contains(d.name.toString())){ +// if(["涓婃捣甯�","鍖椾含甯�","澶╂触甯�","閲嶅簡甯�"].contains(d.name.toString())){ // rows << d // }else{ // if(d.level=="city"){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/location/PointUtil.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/location/PointUtil.groovy index ed710f2ee..6f37a8a07 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/location/PointUtil.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/location/PointUtil.groovy @@ -11,10 +11,10 @@ class PointUtil { public static final DBCollection BUSINESS_RANGE_COLL = MongoUtils.getCollectionByName("fangjia_crawl", "price_border", "mongo.db.fangjia.com") /** - * 判断当前位置是否在多边形区域内 + * 鍒ゆ柇褰撳墠浣嶇疆鏄惁鍦ㄥ杈瑰舰鍖哄煙鍐� * - * @param checkPoint 当前经纬度 - * @param areaAround 围栏范围 + * @param checkPoint 褰撳墠缁忕含搴� + * @param areaAround 鍥存爮鑼冨洿 * @return */ public static boolean checkIsInPolygon(Point checkPoint, List areaAround) { @@ -28,23 +28,23 @@ class PointUtil { } /** - * 判断点是否在多边形内,如果点位于多边形的顶点或边上,也算做点在多边形内,直接返回true + * 鍒ゆ柇鐐规槸鍚﹀湪澶氳竟褰㈠唴锛屽鏋滅偣浣嶄簬澶氳竟褰㈢殑椤剁偣鎴栬竟涓婏紝涔熺畻鍋氱偣鍦ㄥ杈瑰舰鍐咃紝鐩存帴杩斿洖true * - * @param point 检测点 - * @param pts 多边形的顶点 - * @return 点在多边形内返回true, 否则返回false + * @param point 妫�娴嬬偣 + * @param pts 澶氳竟褰㈢殑椤剁偣 + * @return 鐐瑰湪澶氳竟褰㈠唴杩斿洖true, 鍚﹀垯杩斿洖false */ public static boolean checkIsPtInPoly(Point2D.Double point, List pts) { int N = pts.size(); - //如果点位于多边形的顶点或边上,也算做点在多边形内,直接返回true + //濡傛灉鐐逛綅浜庡杈瑰舰鐨勯《鐐规垨杈逛笂锛屼篃绠楀仛鐐瑰湪澶氳竟褰㈠唴锛岀洿鎺ヨ繑鍥瀟rue boolean boundOrVertex = true; //cross points count of x int intersectCount = 0; - //浮点类型计算时候与0比较时候的容差 + //娴偣绫诲瀷璁$畻鏃跺�欎笌0姣旇緝鏃跺�欑殑瀹瑰樊 double precision = 2e-10; //neighbour bound vertices Point2D.Double p1, p2; - //当前点 + //褰撳墠鐐� Point2D.Double p = point; //left vertex p1 = pts.get(0); @@ -110,11 +110,11 @@ class PointUtil { //next ray left point p1 = p2; } - //偶数在多边形外 + //鍋舵暟鍦ㄥ杈瑰舰澶� if (intersectCount % 2 == 0) { return false; } else { - //奇数在多边形内 + //濂囨暟鍦ㄥ杈瑰舰鍐� return true; } } @@ -124,7 +124,7 @@ class PointUtil { } def run(){ def q = new BasicDBObject() - q.put("name", "淞南") + q.put("name", "娣炲崡") def obj = BUSINESS_RANGE_COLL.findOne(q) if(obj){ def pointStr = obj.border diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/location/RegionLocationUpdateBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/location/RegionLocationUpdateBatch.groovy index 994019514..0a0c08bd1 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/location/RegionLocationUpdateBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/location/RegionLocationUpdateBatch.groovy @@ -29,7 +29,7 @@ import java.util.regex.Matcher import java.util.regex.Pattern; /** - * 根据区域围栏修正区域 + * 鏍规嵁鍖哄煙鍥存爮淇鍖哄煙 */ @BatchOwner(Watcher.GaoJuan) class RegionLocationUpdateBatch extends BaseBatch{ @@ -62,10 +62,10 @@ class RegionLocationUpdateBatch extends BaseBatch{ 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 +" 经纬度处理完成" + println "銆�${index}銆�"+city +" 缁忕含搴﹀鐞嗗畬鎴�" rets.addAll(datas) } - ExcelUtils.write("D:\\数据\\小区\\区域纠正.xlsx", rets, "数据") + ExcelUtils.write("D:\\鏁版嵁\\灏忓尯\\鍖哄煙绾犳.xlsx", rets, "鏁版嵁") } @@ -105,17 +105,17 @@ class RegionLocationUpdateBatch extends BaseBatch{ if(flag){ if(newRegion){ - println dist.city +" "+dist.region+" "+dist.name+" 【${newRegion}】" + println dist.city +" "+dist.region+" "+dist.name+" 銆�${newRegion}銆�" def udata = [:] udata.put("region", newRegion) udata.put("status", "0") udata.put("cat", "district") - udata.put("username", "高娟") + udata.put("username", "楂樺") udata.put("id", dist._id.toString()) def s = FangjiaClientUtils.saveOrUpdateDistrict(udata) def opt = "update" - if(s && s!='成功'){ - if(s && s.contains("该区域小区已存在")){ + if(s && s!='鎴愬姛'){ + if(s && s.contains("璇ュ尯鍩熷皬鍖哄凡瀛樺湪")){ def delUdata = new BasicDBObject() delUdata.put("status", 1) delUdata.put("m_date", new Date()) @@ -128,7 +128,7 @@ class RegionLocationUpdateBatch extends BaseBatch{ rets << [dist.city, dist.region, dist.name, newRegion, opt] } }else{ - println dist.city +" "+dist.region+" "+dist.name+" 没有找到对应的区域" + println dist.city +" "+dist.region+" "+dist.name+" 娌℃湁鎵惧埌瀵瑰簲鐨勫尯鍩�" } } } catch (Exception e) { @@ -145,7 +145,7 @@ class RegionLocationUpdateBatch extends BaseBatch{ } def run(){ - def city = "杭州" + def city = "鏉窞" def regionPointsMap = findRegionRange(city) def districts = CommonDatautils.findAllDistricts(city, "district", ["city", "region", "name", "address", "lat", "lng"]); def index = 0 @@ -179,13 +179,13 @@ class RegionLocationUpdateBatch extends BaseBatch{ ret << loactionMap.lng ret << loactionMap.lat if (dist.region == loactionMap.region) { - println totalCount.get() + " " + dist.region + " " + dist.name + " 不在区域范围内,与地图相同" + println totalCount.get() + " " + dist.region + " " + dist.name + " 涓嶅湪鍖哄煙鑼冨洿鍐咃紝涓庡湴鍥剧浉鍚�" } else { - println totalCount.get() + " " + dist.region + " " + dist.name + " 不在区域范围内 地图:" + loactionMap.region + " " + distance + println totalCount.get() + " " + dist.region + " " + dist.name + " 涓嶅湪鍖哄煙鑼冨洿鍐� 鍦板浘锛�" + loactionMap.region + " " + distance } } else { ret << "" - println totalCount.get() + " " + dist.region + " " + dist.name + " 不在区域范围内,地图没找到" + println totalCount.get() + " " + dist.region + " " + dist.name + " 涓嶅湪鍖哄煙鑼冨洿鍐咃紝鍦板浘娌℃壘鍒�" } if (ret) { rets << ret @@ -200,13 +200,13 @@ class RegionLocationUpdateBatch extends BaseBatch{ }); } latch.await() - ExcelUtils.write("d:\\数据\\福州\\区域经纬度错误-${city}.xlsx", rets, "区域不在行政范围内") + ExcelUtils.write("d:\\鏁版嵁\\绂忓窞\\鍖哄煙缁忕含搴﹂敊璇�-${city}.xlsx", rets, "鍖哄煙涓嶅湪琛屾斂鑼冨洿鍐�") } def run2(){ - def datas = ExcelUtils.read("d:\\数据\\福州\\福州小区.xlsx", 0,1) + def datas = ExcelUtils.read("d:\\鏁版嵁\\绂忓窞\\绂忓窞灏忓尯.xlsx", 0,1) def rets = [] - rets << ["城市", "区域", "名称", "来源","地图区域", "地图名称","距离", "地图地址", "地图经度", "地图纬度"] + rets << ["鍩庡競", "鍖哄煙", "鍚嶇О", "鏉ユ簮","鍦板浘鍖哄煙", "鍦板浘鍚嶇О","璺濈", "鍦板浘鍦板潃", "鍦板浘缁忓害", "鍦板浘绾害"] def index = 0 for(def d : datas){ def count = d['H'].toInteger() @@ -229,9 +229,9 @@ class RegionLocationUpdateBatch extends BaseBatch{ ret << loactionMap.region ret << loactionMap.mapName def distance = null - if(loactionMap.source=="高德"){ + if(loactionMap.source=="楂樺痉"){ distance = GeoHelper.GetDistance(dist.lat/10000000000.0, dist.lng/10000000000.0, loactionMap.lat, loactionMap.lng) - }else if(loactionMap.source=="百度"){ + }else if(loactionMap.source=="鐧惧害"){ distance = GeoHelper.GetDistance(dist.lat2/10000000000.0, dist.lng2/10000000000.0, loactionMap.lat, loactionMap.lng) } ret << distance @@ -239,20 +239,20 @@ class RegionLocationUpdateBatch extends BaseBatch{ ret << loactionMap.lng ret << loactionMap.lat if(dist.region==loactionMap.region){ - println index+" "+dist.region +" "+dist.name +" 不在区域范围内,与地图相同" + println index+" "+dist.region +" "+dist.name +" 涓嶅湪鍖哄煙鑼冨洿鍐咃紝涓庡湴鍥剧浉鍚�" }else{ - println index+" "+dist.region +" "+dist.name +" 不在区域范围内 地图:"+ loactionMap.region+" "+distance + println index+" "+dist.region +" "+dist.name +" 涓嶅湪鍖哄煙鑼冨洿鍐� 鍦板浘锛�"+ loactionMap.region+" "+distance } }else{ // ret << "" - println index+" "+dist.region +" "+dist.name +" 不在区域范围内,地图没找到" + println index+" "+dist.region +" "+dist.name +" 涓嶅湪鍖哄煙鑼冨洿鍐咃紝鍦板浘娌℃壘鍒�" } rets << ret } } - ExcelUtils.write("d:\\数据\\福州\\相同经纬度小区4.xlsx", rets, "数据") + ExcelUtils.write("d:\\鏁版嵁\\绂忓窞\\鐩稿悓缁忕含搴﹀皬鍖�4.xlsx", rets, "鏁版嵁") } @@ -260,15 +260,15 @@ class RegionLocationUpdateBatch extends BaseBatch{ def run3(){ def index = 0 - ExcelUtils.modify("d:\\数据\\福州\\经纬度错误.xlsx", {d-> + ExcelUtils.modify("d:\\鏁版嵁\\绂忓窞\\缁忕含搴﹂敊璇�.xlsx", {d-> index++ def distance = null if(d['H']){ distance = d['H'].toDouble() } if(d['E'] && d['B'] == d['E'] && distance && distance>=1000){ - def mapName = d['F'].toString().replace("(建设中)","").replace("?","").replace("&","").replace("·","").replace(".","").replace("(","").replace(")","").replace("(","").replace(")","").replace("11期","十一期").replace("12期","十二期").replace("13期","十三期").replace("14期","十四期").replace("15期","十五期").replace("16期","十六期").replace("17期","十七期").replace("18期","十八期").replace("19期","十九期").replace("10期","十期").replace("1期","一期").replace("2期","二期").replace("3期","三期").replace("4期","四期").replace("5期","五期").replace("6期","六期").replace("7期","七期").replace("8期","八期").replace("9期","九期") - if(mapName.contains("-") && mapName.endsWith("楼")){ + def mapName = d['F'].toString().replace("(寤鸿涓�)","").replace("?","").replace("&","").replace("路","").replace(".","").replace("锛�","").replace("锛�","").replace("(","").replace(")","").replace("11鏈�","鍗佷竴鏈�").replace("12鏈�","鍗佷簩鏈�").replace("13鏈�","鍗佷笁鏈�").replace("14鏈�","鍗佸洓鏈�").replace("15鏈�","鍗佷簲鏈�").replace("16鏈�","鍗佸叚鏈�").replace("17鏈�","鍗佷竷鏈�").replace("18鏈�","鍗佸叓鏈�").replace("19鏈�","鍗佷節鏈�").replace("10鏈�","鍗佹湡").replace("1鏈�","涓�鏈�").replace("2鏈�","浜屾湡").replace("3鏈�","涓夋湡").replace("4鏈�","鍥涙湡").replace("5鏈�","浜旀湡").replace("6鏈�","鍏湡").replace("7鏈�","涓冩湡").replace("8鏈�","鍏湡").replace("9鏈�","涔濇湡") + if(mapName.contains("-") && mapName.endsWith("妤�")){ mapName = mapName.substring(0, mapName.indexOf("-")) } if(d['C']==mapName){ @@ -282,7 +282,7 @@ class RegionLocationUpdateBatch extends BaseBatch{ def lat2 = null def lng = null def lat = null - if(d['D']=="高德"){ + if(d['D']=="楂樺痉"){ lng = (d['I'].toDouble()*10000000000).longValue() lat = (d['J'].toDouble()*10000000000).longValue() def gmap = GeocodeUtils.getGaodeToBaidu(d['I'].toDouble(), d['J'].toDouble()) @@ -309,11 +309,11 @@ class RegionLocationUpdateBatch extends BaseBatch{ DbUtils.seaweed.update(q, new BasicDBObject('$set', udata)) def dbo = DbUtils.seaweed.findOne(q) - d['K'] = "修正" + d['K'] = "淇" } }else if(d['E'] && d['B'] != d['E'] && distance && distance<=1000){ - def mapName = d['F'].toString().replace("(建设中)","").replace("?","").replace("&","").replace("·","").replace(".","").replace("(","").replace(")","").replace("(","").replace(")","").replace("11期","十一期").replace("12期","十二期").replace("13期","十三期").replace("14期","十四期").replace("15期","十五期").replace("16期","十六期").replace("17期","十七期").replace("18期","十八期").replace("19期","十九期").replace("10期","十期").replace("1期","一期").replace("2期","二期").replace("3期","三期").replace("4期","四期").replace("5期","五期").replace("6期","六期").replace("7期","七期").replace("8期","八期").replace("9期","九期") - if(mapName.contains("-") && mapName.endsWith("楼")){ + def mapName = d['F'].toString().replace("(寤鸿涓�)","").replace("?","").replace("&","").replace("路","").replace(".","").replace("锛�","").replace("锛�","").replace("(","").replace(")","").replace("11鏈�","鍗佷竴鏈�").replace("12鏈�","鍗佷簩鏈�").replace("13鏈�","鍗佷笁鏈�").replace("14鏈�","鍗佸洓鏈�").replace("15鏈�","鍗佷簲鏈�").replace("16鏈�","鍗佸叚鏈�").replace("17鏈�","鍗佷竷鏈�").replace("18鏈�","鍗佸叓鏈�").replace("19鏈�","鍗佷節鏈�").replace("10鏈�","鍗佹湡").replace("1鏈�","涓�鏈�").replace("2鏈�","浜屾湡").replace("3鏈�","涓夋湡").replace("4鏈�","鍥涙湡").replace("5鏈�","浜旀湡").replace("6鏈�","鍏湡").replace("7鏈�","涓冩湡").replace("8鏈�","鍏湡").replace("9鏈�","涔濇湡") + if(mapName.contains("-") && mapName.endsWith("妤�")){ mapName = mapName.substring(0, mapName.indexOf("-")) } if(d['C']==mapName){ @@ -330,7 +330,7 @@ class RegionLocationUpdateBatch extends BaseBatch{ def lat2 = null def lng = null def lat = null - if(d['D']=="高德"){ + if(d['D']=="楂樺痉"){ lng = (d['I'].toDouble()*10000000000).longValue() lat = (d['J'].toDouble()*10000000000).longValue() def gmap = GeocodeUtils.getGaodeToBaidu(d['I'].toDouble(), d['J'].toDouble()) @@ -356,7 +356,7 @@ class RegionLocationUpdateBatch extends BaseBatch{ udata.put("lat2", lat2) udata.put("m_date", new Date()) DbUtils.seaweed.update(q, new BasicDBObject('$set', udata)) - d['K'] = "修正区域" + d['K'] = "淇鍖哄煙" } } } @@ -367,7 +367,7 @@ class RegionLocationUpdateBatch extends BaseBatch{ def run4(){ - ExcelUtils.modify("d:\\数据\\福州\\福州相同经纬度小区4.xlsx", {d-> + ExcelUtils.modify("d:\\鏁版嵁\\绂忓窞\\绂忓窞鐩稿悓缁忕含搴﹀皬鍖�4.xlsx", {d-> def region = d['B'] def name = d['C'] if(!d['K']){ @@ -378,9 +378,9 @@ class RegionLocationUpdateBatch extends BaseBatch{ d['E'] << loactionMap.region d['F'] << loactionMap.mapName def distance = null - if(loactionMap.source=="高德"){ + if(loactionMap.source=="楂樺痉"){ distance = GeoHelper.GetDistance(dist.lat/10000000000.0, dist.lng/10000000000.0, loactionMap.lat, loactionMap.lng) - }else if(loactionMap.source=="百度"){ + }else if(loactionMap.source=="鐧惧害"){ distance = GeoHelper.GetDistance(dist.lat2/10000000000.0, dist.lng2/10000000000.0, loactionMap.lat, loactionMap.lng) } d['G'] << distance @@ -388,34 +388,34 @@ class RegionLocationUpdateBatch extends BaseBatch{ d['I'] << loactionMap.lng d['J'] << loactionMap.lat if(dist.region==loactionMap.region){ - println index+" "+dist.region +" "+dist.name +" 不在区域范围内,与地图相同" + println index+" "+dist.region +" "+dist.name +" 涓嶅湪鍖哄煙鑼冨洿鍐咃紝涓庡湴鍥剧浉鍚�" }else{ - println index+" "+dist.region +" "+dist.name +" 不在区域范围内 地图:"+ loactionMap.region+" "+distance + println index+" "+dist.region +" "+dist.name +" 涓嶅湪鍖哄煙鑼冨洿鍐� 鍦板浘锛�"+ loactionMap.region+" "+distance } }else{ // ret << "" - println index+" "+dist.region +" "+dist.name +" 不在区域范围内,地图没找到" + println index+" "+dist.region +" "+dist.name +" 涓嶅湪鍖哄煙鑼冨洿鍐咃紝鍦板浘娌℃壘鍒�" } } },0) } def matchMap(def dist){ - def gaodeRest = FangjiaClientUtils.searchMapData(dist.city, dist.name,"住宅", "高德") + def gaodeRest = FangjiaClientUtils.searchMapData(dist.city, dist.name,"浣忓畢", "楂樺痉") def gdlocationMap = null def bdlocationMap = null if(gaodeRest){ gdlocationMap = getMapLocation(dist, gaodeRest); if(gdlocationMap){ - gdlocationMap.source = "高德" + gdlocationMap.source = "楂樺痉" } } - def baiduRest = null;//FangjiaClientUtils.searchMapData(dist.city, dist.name,"住宅", "百度") + def baiduRest = null;//FangjiaClientUtils.searchMapData(dist.city, dist.name,"浣忓畢", "鐧惧害") if(baiduRest){ bdlocationMap = getMapLocation(dist, baiduRest); if(bdlocationMap){ - bdlocationMap.source = "百度" + bdlocationMap.source = "鐧惧害" } } @@ -447,7 +447,7 @@ class RegionLocationUpdateBatch extends BaseBatch{ if(!r.city.contains(dist.city)){ continue } - def name = r.name.replace("?","").replace("&","").replace("·","").replace(".","").replace("(","").replace(")","").replace("(","").replace(")","").replace("【","").replace("】","").replace("11期","十一期").replace("12期","十二期").replace("13期","十三期").replace("14期","十四期").replace("15期","十五期").replace("16期","十六期").replace("17期","十七期").replace("18期","十八期").replace("19期","十九期").replace("10期","十期").replace("1期","一期").replace("2期","二期").replace("3期","三期").replace("4期","四期").replace("5期","五期").replace("6期","六期").replace("7期","七期").replace("8期","八期").replace("9期","九期").replace(" ","").replace("建设中","").replace("钢混","").trim() + def name = r.name.replace("?","").replace("&","").replace("路","").replace(".","").replace("锛�","").replace("锛�","").replace("(","").replace(")","").replace("銆�","").replace("銆�","").replace("11鏈�","鍗佷竴鏈�").replace("12鏈�","鍗佷簩鏈�").replace("13鏈�","鍗佷笁鏈�").replace("14鏈�","鍗佸洓鏈�").replace("15鏈�","鍗佷簲鏈�").replace("16鏈�","鍗佸叚鏈�").replace("17鏈�","鍗佷竷鏈�").replace("18鏈�","鍗佸叓鏈�").replace("19鏈�","鍗佷節鏈�").replace("10鏈�","鍗佹湡").replace("1鏈�","涓�鏈�").replace("2鏈�","浜屾湡").replace("3鏈�","涓夋湡").replace("4鏈�","鍥涙湡").replace("5鏈�","浜旀湡").replace("6鏈�","鍏湡").replace("7鏈�","涓冩湡").replace("8鏈�","鍏湡").replace("9鏈�","涔濇湡").replace(" ","").replace("寤鸿涓�","").replace("閽㈡贩","").trim() if(dist.name == name){ lat = r.lat lng = r.lng @@ -469,7 +469,7 @@ class RegionLocationUpdateBatch extends BaseBatch{ word = dist.name.replace(name, "") } if (word) { - def words = ["商住楼", "小区","公寓","别墅"] + def words = ["鍟嗕綇妤�", "灏忓尯","鍏瘬","鍒"] for (def w : words) { if (word == w ) { lat = r.lat @@ -487,7 +487,7 @@ class RegionLocationUpdateBatch extends BaseBatch{ } } if(!lng){ - Pattern pattern = Pattern.compile("\\d+号楼"); + Pattern pattern = Pattern.compile("\\d+鍙锋ゼ"); Matcher matcher = pattern.matcher(word); if(matcher.find()){ lat = r.lat @@ -505,7 +505,7 @@ class RegionLocationUpdateBatch extends BaseBatch{ } if(!lng){ - Pattern pattern = Pattern.compile("[A-Za-z]区"); + Pattern pattern = Pattern.compile("[A-Za-z]鍖�"); Matcher matcher = pattern.matcher(word); if(matcher.find()){ lat = r.lat @@ -577,7 +577,7 @@ class RegionLocationUpdateBatch extends BaseBatch{ }); } latch.await() - ExcelUtils.write("d:\\数据\\福州\\经纬度错误.xlsx", rets, "经纬度错误") + ExcelUtils.write("d:\\鏁版嵁\\绂忓窞\\缁忕含搴﹂敊璇�.xlsx", rets, "缁忕含搴﹂敊璇�") } def mapLocation(map){ @@ -598,9 +598,9 @@ class RegionLocationUpdateBatch extends BaseBatch{ ret << loactionMap.lng ret << loactionMap.lat if (dist.region == loactionMap.region) { - println dist.region + " " + dist.name + " 不在区域范围内,与地图相同" + println dist.region + " " + dist.name + " 涓嶅湪鍖哄煙鑼冨洿鍐咃紝涓庡湴鍥剧浉鍚�" } else { - println dist.region + " " + dist.name + " 不在区域范围内 地图:" + loactionMap.region + " " + distance + println dist.region + " " + dist.name + " 涓嶅湪鍖哄煙鑼冨洿鍐� 鍦板浘锛�" + loactionMap.region + " " + distance } } return ret @@ -630,7 +630,7 @@ class RegionLocationUpdateBatch extends BaseBatch{ obj.put("c_date", new Date()) obj.put("m_date", new Date()) obj.put("type", "remove") - obj.put("user_name", "高娟") + obj.put("user_name", "楂樺") obj.put("origin", "script") OPERATION_LOG_COLL.save(obj) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/location/RegionPoint.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/location/RegionPoint.groovy index a1671b461..34dc67d81 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/location/RegionPoint.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/location/RegionPoint.groovy @@ -15,7 +15,7 @@ import org.apache.commons.lang3.StringUtils import java.util.regex.Pattern /** - * 高德抓取区域边框 + * 楂樺痉鎶撳彇鍖哄煙杈规 */ class RegionPointCrawl { @@ -30,26 +30,26 @@ class RegionPointCrawl { static main(args) { def task = new RegionPointCrawl(); - //23个省 河北省、山西省、吉林省、辽宁省、黑龙江省、陕西省、甘肃省、青海省、山东省、福建省、浙江省、台湾省、河南省、湖北省、湖南省、江西省、江苏省、安徽省、广东省、海南省、四川省、贵州省、云南省 - //4个直辖市 北京市、上海市、天津市、重庆市 - //5个自治区 "内蒙古自治区","广西壮族自治区","西藏自治区","宁夏回族自治区","新疆维吾尔自治区" -// def provinces = ["河北省", "山西省","吉林省","辽宁省", "黑龙江省", "陕西省", "甘肃省", "青海省", "山东省", "福建省", "浙江省", "台湾省", "河南省", "湖北省", "湖南省", "江西省", "江苏省", "安徽省", "广东省", "海南省", "四川省", "贵州省", "云南省"] - //已跑:甘肃省,河北省,山西省,"吉林省","辽宁省", "黑龙江省", "陕西省", "青海省", "山东省", "福建省", "浙江省", "台湾省", "河南省", "湖北省", "湖南省", "江西省", "江苏省", "安徽省", "广东省", "海南省", "四川省", "贵州省","云南省" -// def provinces = ["北京市","上海市","天津市","重庆市" ] + //23涓渷 娌冲寳鐪併�佸北瑗跨渷銆佸悏鏋楃渷銆佽窘瀹佺渷銆侀粦榫欐睙鐪併�侀檿瑗跨渷銆佺敇鑲冪渷銆侀潚娴风渷銆佸北涓滅渷銆佺寤虹渷銆佹禉姹熺渷銆佸彴婀剧渷銆佹渤鍗楃渷銆佹箹鍖楃渷銆佹箹鍗楃渷銆佹睙瑗跨渷銆佹睙鑻忕渷銆佸畨寰界渷銆佸箍涓滅渷銆佹捣鍗楃渷銆佸洓宸濈渷銆佽吹宸炵渷銆佷簯鍗楃渷 + //4涓洿杈栧競 鍖椾含甯傘�佷笂娴峰競銆佸ぉ娲ュ競銆侀噸搴嗗競 + //5涓嚜娌诲尯 "鍐呰挋鍙よ嚜娌诲尯","骞胯タ澹棌鑷不鍖�","瑗胯棌鑷不鍖�","瀹佸鍥炴棌鑷不鍖�","鏂扮枂缁村惥灏旇嚜娌诲尯" +// def provinces = ["娌冲寳鐪�", "灞辫タ鐪�","鍚夋灄鐪�","杈藉畞鐪�", "榛戦緳姹熺渷", "闄曡タ鐪�", "鐢樿們鐪�", "闈掓捣鐪�", "灞变笢鐪�", "绂忓缓鐪�", "娴欐睙鐪�", "鍙版咕鐪�", "娌冲崡鐪�", "婀栧寳鐪�", "婀栧崡鐪�", "姹熻タ鐪�", "姹熻嫃鐪�", "瀹夊窘鐪�", "骞夸笢鐪�", "娴峰崡鐪�", "鍥涘窛鐪�", "璐靛窞鐪�", "浜戝崡鐪�"] + //宸茶窇锛氱敇鑲冪渷锛屾渤鍖楃渷,灞辫タ鐪�,"鍚夋灄鐪�","杈藉畞鐪�", "榛戦緳姹熺渷", "闄曡タ鐪�", "闈掓捣鐪�", "灞变笢鐪�", "绂忓缓鐪�", "娴欐睙鐪�", "鍙版咕鐪�", "娌冲崡鐪�", "婀栧寳鐪�", "婀栧崡鐪�", "姹熻タ鐪�", "姹熻嫃鐪�", "瀹夊窘鐪�", "骞夸笢鐪�", "娴峰崡鐪�", "鍥涘窛鐪�", "璐靛窞鐪�","浜戝崡鐪�" +// def provinces = ["鍖椾含甯�","涓婃捣甯�","澶╂触甯�","閲嶅簡甯�" ] // def index = 0 // for(def p : provinces){ // index ++ // println index +"/"+provinces.size() +" "+p // task.crawlCityAndDistrictCode(p); -// println "城市 区域 code 完成" +// println "鍩庡競 鍖哄煙 code 瀹屾垚" // task.run(p); -// println "区域围栏 完成" +// println "鍖哄煙鍥存爮 瀹屾垚" // } // task.statSame() - //"福建省","河北省","山西省","吉林省","辽宁省","黑龙江省","陕西省","甘肃省","山东省","湖北省","湖南省","江西省","江苏省","安徽省" - def provinces = ["河北省","山西省","吉林省","辽宁省","黑龙江省","陕西省","甘肃省","青海省","山东省","福建省","浙江省","台湾省","河南省","湖北省","湖南省","江西省","江苏省","安徽省","广东省","海南省","四川省","贵州省","云南省","北京市","上海市","天津市","重庆市","内蒙古自治区","广西壮族自治区","西藏自治区","宁夏回族自治区","新疆维吾尔自治区"] + //"绂忓缓鐪�","娌冲寳鐪�","灞辫タ鐪�","鍚夋灄鐪�","杈藉畞鐪�","榛戦緳姹熺渷","闄曡タ鐪�","鐢樿們鐪�","灞变笢鐪�","婀栧寳鐪�","婀栧崡鐪�","姹熻タ鐪�","姹熻嫃鐪�","瀹夊窘鐪�" + def provinces = ["娌冲寳鐪�","灞辫タ鐪�","鍚夋灄鐪�","杈藉畞鐪�","榛戦緳姹熺渷","闄曡タ鐪�","鐢樿們鐪�","闈掓捣鐪�","灞变笢鐪�","绂忓缓鐪�","娴欐睙鐪�","鍙版咕鐪�","娌冲崡鐪�","婀栧寳鐪�","婀栧崡鐪�","姹熻タ鐪�","姹熻嫃鐪�","瀹夊窘鐪�","骞夸笢鐪�","娴峰崡鐪�","鍥涘窛鐪�","璐靛窞鐪�","浜戝崡鐪�","鍖椾含甯�","涓婃捣甯�","澶╂触甯�","閲嶅簡甯�","鍐呰挋鍙よ嚜娌诲尯","骞胯タ澹棌鑷不鍖�","瑗胯棌鑷不鍖�","瀹佸鍥炴棌鑷不鍖�","鏂扮枂缁村惥灏旇嚜娌诲尯"] task.getTownshipCenter(provinces) task.addTownCenter(provinces) } @@ -71,7 +71,7 @@ class RegionPointCrawl { index ++ def ret = polygon(m.ad_code, "0", "all"); if(!ret){ - println m.name +" " + m.ad_code + "无结果" + println m.name +" " + m.ad_code + "鏃犵粨鏋�" } println index +" "+cityMap.name+" "+m.name+" "+ret.size() if(ret.size()>0){ @@ -80,7 +80,7 @@ class RegionPointCrawl { def newRegion = RegionData.formatRegion(standardCity, m.name) saveData(pro, standardCity, m.name, m.ad_code , ret, newRegion); }else{ - println cityMap.name +" 没有标准化" + println cityMap.name +" 娌℃湁鏍囧噯鍖�" } } @@ -121,7 +121,7 @@ class RegionPointCrawl { def findCityCode(city){ Pattern pattern = Pattern.compile(city, Pattern.CASE_INSENSITIVE); def q = null; - if(city.contains("省") || city.endsWith("自治区") || ["上海市","天津市","北京市","重庆市"].contains(city)){ + if(city.contains("鐪�") || city.endsWith("鑷不鍖�") || ["涓婃捣甯�","澶╂触甯�","鍖椾含甯�","閲嶅簡甯�"].contains(city)){ q = new BasicDBObject("province", pattern); }else{ q = new BasicDBObject("name", pattern); @@ -167,12 +167,12 @@ class RegionPointCrawl { def o = GAODECITYCODECOLL.findOne(q) if(!o){ - println name +" "+adcode+" 新增" + println name +" "+adcode+" 鏂板" q.put("c_date", new Date()) q.put("center", center) GAODECITYCODECOLL.save(q); }else{ - println name +" "+adcode+" 已存在" + println name +" "+adcode+" 宸插瓨鍦�" } } @@ -212,7 +212,7 @@ class RegionPointCrawl { def resultMap = [:] try { HttpRequest http = new HttpRequest(); - while (errorCount<5){//"2af0b8533415a612b98d59bb93d664b9" 公司key + while (errorCount<5){//"2af0b8533415a612b98d59bb93d664b9" 鍏徃key def key = getRandomKey2() // params.put("key", key) html = http.get(url, params,"utf-8") @@ -221,11 +221,11 @@ class RegionPointCrawl { if(jo.infocode!="10000"){ errorCount ++ Thread.sleep(3*1000) -// println " 不可用Key: "+key +// println " 涓嶅彲鐢↘ey: "+key }else{ errorCount = 100 status = "normal" -// println " 可用Key: "+key + " "+html +// println " 鍙敤Key: "+key + " "+html } } } @@ -265,10 +265,10 @@ class RegionPointCrawl { def obj = OLD_POLYLINECOLL.findOne(q) if(obj){ if(obj.polyline!=d.polyline){ - println index +" "+ d.city +" "+d.region+" 2次区域不同" + println index +" "+ d.city +" "+d.region+" 2娆″尯鍩熶笉鍚�" } }else{ - println index +" "+ d.city +" "+d.region+" 没有此区域" + println index +" "+ d.city +" "+d.region+" 娌℃湁姝ゅ尯鍩�" } } } @@ -317,7 +317,7 @@ class RegionPointCrawl { def query = new BasicDBObject("province", p) def count = TOWN_CENTERCOLL.count(query) if(count){ - println p +" 已存在" + println p +" 宸插瓨鍦�" }else{ def ret = polygon(p, "3", "base"); if(ret){ @@ -329,10 +329,10 @@ class RegionPointCrawl { allRets.addAll(cityTowns) } saveTownCenter(allRets) - println p +" 保存:"+allRets.size() + println p +" 淇濆瓨锛�"+allRets.size() } }else{ - println p+ "无结果" + println p+ "鏃犵粨鏋�" } } @@ -369,7 +369,7 @@ class RegionPointCrawl { def addTownCenter(provinces){ for(def p : provinces){ - def q = new BasicDBObject("province",p).append("type","乡镇街道") + def q = new BasicDBObject("province",p).append("type","涔¢晣琛楅亾") // q.put("location", new BasicDBObject('$exists', false)) def dbcursor = administrative_mapping_coll.find(q) for(def obj : dbcursor){ @@ -377,7 +377,7 @@ class RegionPointCrawl { def tq = new BasicDBObject("city", obj.city).append("district", obj.mzb_district_name).append("town", obj.street) def dbo = TOWN_CENTERCOLL.findOne(tq) if(!dbo){ - def new_street = obj.street.replace("管理处","") + def new_street = obj.street.replace("绠$悊澶�","") tq = new BasicDBObject("city", obj.city).append("district", obj.mzb_district_name).append("town", new_street) dbo = TOWN_CENTERCOLL.findOne(tq) } @@ -389,12 +389,12 @@ class RegionPointCrawl { if(!obj.location){ def udata = new BasicDBObject("location", location) administrative_mapping_coll.update(new BasicDBObject("_id",obj._id), new BasicDBObject('$set',udata)) - println("【修改】"+obj.city +" "+ obj.district+" "+obj.street) + println("銆愪慨鏀广��"+obj.city +" "+ obj.district+" "+obj.street) }else{ def distance = com.fangjia.script.util.GeoUtils.calculateDistance(location.lat, location.lon, obj.location.lat, obj.location.lon); if(distance>1000){ def udata = new BasicDBObject("location", location) - println(obj.city +" "+ obj.district+" "+obj.mzb_district_name+" "+obj.street +" 经纬度中心点相距1公里以外 原:"+obj.location.lon+","+obj.location.lat+" 新:"+dbo.center+" 距离:"+distance) + println(obj.city +" "+ obj.district+" "+obj.mzb_district_name+" "+obj.street +" 缁忕含搴︿腑蹇冪偣鐩歌窛1鍏噷浠ュ 鍘燂細"+obj.location.lon+","+obj.location.lat+" 鏂帮細"+dbo.center+" 璺濈锛�"+distance) administrative_mapping_coll.update(new BasicDBObject("_id",obj._id), new BasicDBObject('$set',udata)) } } @@ -402,7 +402,7 @@ class RegionPointCrawl { def esobj = CommonDatautils.findGaoDeDatas2(obj.city, obj.mzb_district_name, obj.street) if(!esobj){ - def short_prov = obj.province.replace("省", "") + def short_prov = obj.province.replace("鐪�", "") if(obj.street.contains(short_prov)){ esobj = CommonDatautils.findGaoDeDatas2(obj.city, obj.mzb_district_name, obj.street.replace(short_prov, "")) } @@ -414,9 +414,9 @@ class RegionPointCrawl { location["lat"] = esobj.location.lat.toDouble() def udata = new BasicDBObject("location", location) administrative_mapping_coll.update(new BasicDBObject("_id",obj._id), new BasicDBObject('$set',udata)) - println("【修改】"+obj.city +" "+ obj.district+" "+obj.mzb_district_name+" "+obj.street+" "+ esobj.cat+" "+esobj.name +" es poi ") + println("銆愪慨鏀广��"+obj.city +" "+ obj.district+" "+obj.mzb_district_name+" "+obj.street+" "+ esobj.cat+" "+esobj.name +" es poi ") }else{ - println(obj.province+" "+obj.city +" "+ obj.district+" "+obj.mzb_district_name+" "+obj.street +" 没有找到") + println(obj.province+" "+obj.city +" "+ obj.district+" "+obj.mzb_district_name+" "+obj.street +" 娌℃湁鎵惧埌") } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/meishubao/MsbPocTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/meishubao/MsbPocTest.groovy index e58c11ff5..2361be3ff 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/meishubao/MsbPocTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/meishubao/MsbPocTest.groovy @@ -13,38 +13,38 @@ class MsbPocTest { task.run(); } def run(){ - def inputfile = "D:\\数据\\建行\\房产估值\\房讯通10月价格核查_1126-FXT提交结果20241205.xlsx" -// def inputfile = "D:\\数据\\美术宝\\美术宝测试数据(匹配V2).xlsx"//美术宝测试数据(匹配).xlsx + def inputfile = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鎴胯閫�10鏈堜环鏍兼牳鏌1126-FXT鎻愪氦缁撴灉20241205.xlsx" +// def inputfile = "D:\\鏁版嵁\\缇庢湳瀹漒\缇庢湳瀹濇祴璇曟暟鎹�(鍖归厤V2).xlsx"//缇庢湳瀹濇祴璇曟暟鎹�(鍖归厤).xlsx // standard(inputfile) // match(inputfile) matchOld(inputfile) -// addPrice("D:\\数据\\美术宝\\美术宝测试数据(价格).xlsx") -// test("D:\\数据\\美术宝\\FiveLevelTest.xlsx") +// addPrice("D:\\鏁版嵁\\缇庢湳瀹漒\缇庢湳瀹濇祴璇曟暟鎹�(浠锋牸).xlsx") +// test("D:\\鏁版嵁\\缇庢湳瀹漒\FiveLevelTest.xlsx") // cityPrice() -// mergeMatchPrice("D:\\数据\\美术宝\\美术宝-新接口价格.xlsx") +// mergeMatchPrice("D:\\鏁版嵁\\缇庢湳瀹漒\缇庢湳瀹�-鏂版帴鍙d环鏍�.xlsx") // addCCBPrice(inputfile) } def cityPrice(){ - def datas = ExcelUtils.read("D:\\数据\\临时\\城市房产价格.xlsx",0,1) + def datas = ExcelUtils.read("D:\\鏁版嵁\\涓存椂\\鍩庡競鎴夸骇浠锋牸.xlsx",0,1) def map = [:] for(def d : datas){ map.put(d['A'], d) } - def ccbdatas = ExcelUtils.read("D:\\数据\\临时\\建行城市均价.xlsx",0,1) + def ccbdatas = ExcelUtils.read("D:\\鏁版嵁\\涓存椂\\寤鸿鍩庡競鍧囦环.xlsx",0,1) def ccbmap = [:] for(def d : ccbdatas){ ccbmap.put(d['A'], d['B']) } - ExcelUtils.modify("D:\\数据\\临时\\房价网城市均价.xlsx", { row -> + ExcelUtils.modify("D:\\鏁版嵁\\涓存椂\\鎴夸环缃戝煄甯傚潎浠�.xlsx", { row -> if(!row['C']){ def d = map.get(row['A']) if(!d){ - d = map.get(row['A'].replace('州','')) + d = map.get(row['A'].replace('宸�','')) } if(d){ row['C'] = d[1] @@ -54,7 +54,7 @@ class MsbPocTest { def d1 = ccbmap.get(row['A']) if(!d1){ - d1 = ccbmap.get(row['A'].replace('州','')) + d1 = ccbmap.get(row['A'].replace('宸�','')) } if(d1){ row['E'] = d1 @@ -249,7 +249,7 @@ class MsbPocTest { ExcelUtils.multiThreadingModify(inputfile, { row -> if(row['G']){ - row['G'] = row['F'].replace('·','').replace("小区","").replace("花园","").replace("1期","一期").replace("2期","二期").replace("3期","三期").replace("4期","四期").replace("5期","五期").replace("6期","6期").replace("1区","一区").replace("2区","二区").replace("3区","三区").replace("4区","四区").replace("5区","五区").replace("6区","六区") + row['G'] = row['F'].replace('路','').replace("灏忓尯","").replace("鑺卞洯","").replace("1鏈�","涓�鏈�").replace("2鏈�","浜屾湡").replace("3鏈�","涓夋湡").replace("4鏈�","鍥涙湡").replace("5鏈�","浜旀湡").replace("6鏈�","6鏈�").replace("1鍖�","涓�鍖�").replace("2鍖�","浜屽尯").replace("3鍖�","涓夊尯").replace("4鍖�","鍥涘尯").replace("5鍖�","浜斿尯").replace("6鍖�","鍏尯") // println "[match] city:"+city+" region:"+region+" address:"+address // def jsonObject = FangjiaClientUtils.newStandard(row['G']) // if(jsonObject != null && jsonObject.precise!=-1) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/meituan/AddField.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/meituan/AddField.groovy index 1b9af5b23..c606a40df 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/meituan/AddField.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/meituan/AddField.groovy @@ -11,7 +11,7 @@ class AddField { } def run(){ - ExcelUtils.multiThreadingModify("D:\\数据\\美团\\小区测试需求测试-结果0828.xlsx",{d-> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\缇庡洟\\灏忓尯娴嬭瘯闇�姹傛祴璇�-缁撴灉0828.xlsx",{d-> def obj = CommonDatautils.findDistrictById(d['F']) if(obj){ d['G'] = obj.city diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/meituan/MatchTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/meituan/MatchTest.groovy index f42431df6..1c6f03da0 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/meituan/MatchTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/meituan/MatchTest.groovy @@ -30,7 +30,7 @@ class MatchTest { def addLevel() { - def citys = ["昆明","南宁","郑州","长沙","贵阳","乌鲁木齐","中山","湛江","南昌","海口"]// + def citys = ["鏄嗘槑","鍗楀畞","閮戝窞","闀挎矙","璐甸槼","涔岄瞾鏈ㄩ綈","涓北","婀涙睙","鍗楁槍","娴峰彛"]// def weekend = DateUtils.getFirstDayOfWeek(new Date()); def cityLevelMap = [:] for(def city : citys){ @@ -39,11 +39,11 @@ class MatchTest { def datas = addPriceData(dists, priceMap); datas = calcuteLevel(datas); cityLevelMap.put(city, ["price":priceMap, "level":datas]) - println city +" 楼盘评级同步完成" + println city +" 妤肩洏璇勭骇鍚屾瀹屾垚" } - def path = "D:\\数据\\美团\\10城小区明细-结果.xlsx"//美团金融小区测试list-所有数据-评级.xlsx + def path = "D:\\鏁版嵁\\缇庡洟\\10鍩庡皬鍖烘槑缁�-缁撴灉.xlsx"//缇庡洟閲戣瀺灏忓尯娴嬭瘯list-鎵�鏈夋暟鎹�-璇勭骇.xlsx ExcelUtils.multiThreadingModify(path, { row -> def name = row['D'] @@ -74,7 +74,7 @@ class MatchTest { def meituanDel(){ - def path = "D:\\数据\\美团\\美团需入库小区合并后.xlsx" + def path = "D:\\鏁版嵁\\缇庡洟\\缇庡洟闇�鍏ュ簱灏忓尯鍚堝苟鍚�.xlsx" def index = 0 ExcelUtils.modify(path, { row -> def flag = row['O'] @@ -83,7 +83,7 @@ class MatchTest { def region = row['G'] def name = nameFileter(row['H']) def obj = null - if(city == "东莞"){ + if(city == "涓滆帪"){ obj = CommonDatautils.findDistrict(city, null, name, "district") }else{ obj = CommonDatautils.findDistrict(city, region, name, "district") @@ -105,7 +105,7 @@ class MatchTest { } def dongguang(){ - def path = "D:\\数据\\美团\\美团东莞.xlsx"//美团金融小区测试list-匹配.xlsx + def path = "D:\\鏁版嵁\\缇庡洟\\缇庡洟涓滆帪.xlsx"//缇庡洟閲戣瀺灏忓尯娴嬭瘯list-鍖归厤.xlsx ExcelUtils.modify(path, { row -> def region = null if(row['B'] && row['B']=="NULL" ){ @@ -113,9 +113,9 @@ class MatchTest { } def name = nameFileter(row['H']) def address = row['E'] - if (name && name.contains("湖畔新家")) { + if (name && name.contains("婀栫晹鏂板")) { - def obj = CommonDatautils.findDistrict("东莞", "东莞", name, "district") + def obj = CommonDatautils.findDistrict("涓滆帪", "涓滆帪", name, "district") if(obj){ def json = GaoDeApiUtils.geo(row['F'], address) if(json && json.count>=1){ @@ -123,9 +123,9 @@ class MatchTest { if(m){ def twinshop = getStreetInfo(m.location) if(twinshop){ - def newRegion = RegionData.formatRegion("东莞",twinshop) + def newRegion = RegionData.formatRegion("涓滆帪",twinshop) if(newRegion){ - def dbObj = CommonDatautils.findDistrict("东莞", newRegion, name, "district") + def dbObj = CommonDatautils.findDistrict("涓滆帪", newRegion, name, "district") if(dbObj){ println "delete" DbUtils.seaweed.remove(new BasicDBObject("_id",obj._id)) @@ -162,7 +162,7 @@ class MatchTest { } def addNum(){ - def path = "D:\\数据\\美团\\美团金融小区测试list-所有数据.xlsx"//美团金融小区测试list-匹配.xlsx + def path = "D:\\鏁版嵁\\缇庡洟\\缇庡洟閲戣瀺灏忓尯娴嬭瘯list-鎵�鏈夋暟鎹�.xlsx"//缇庡洟閲戣瀺灏忓尯娴嬭瘯list-鍖归厤.xlsx def index = 0 ExcelUtils.modify(path, { row -> index++ @@ -171,7 +171,7 @@ class MatchTest { } def run() { - def citys = ["潮州","金华","惠州","东莞","苏州","桂林","廊坊","临沧","通辽","雅安"]// + def citys = ["娼窞","閲戝崕","鎯犲窞","涓滆帪","鑻忓窞","妗傛灄","寤婂潑","涓存钵","閫氳窘","闆呭畨"]// def weekend = DateUtils.getFirstDayOfWeek(new Date()); def cityLevelMap = [:] def radioMap = [:] @@ -187,12 +187,12 @@ class MatchTest { def datas = addPriceData(dists, priceMap); datas = calcuteLevel(datas); cityLevelMap.put(city, ["price":priceMap, "level":datas]) - println city +" 楼盘评级同步完成" + println city +" 妤肩洏璇勭骇鍚屾瀹屾垚" } - def path = "D:\\数据\\美团\\美团金融小区测试list-所有数据-评级.xlsx"//美团金融小区测试list-所有数据-评级.xlsx + def path = "D:\\鏁版嵁\\缇庡洟\\缇庡洟閲戣瀺灏忓尯娴嬭瘯list-鎵�鏈夋暟鎹�-璇勭骇.xlsx"//缇庡洟閲戣瀺灏忓尯娴嬭瘯list-鎵�鏈夋暟鎹�-璇勭骇.xlsx ExcelUtils.multiThreadingModify(path, { row -> def region = null if(row['C'] && row['C']=="NULL" ){ @@ -306,12 +306,12 @@ class MatchTest { def distance = GeoHelper.GetDistance(d.lat/10000000000.0, d.lng/10000000000.0, nb.lat/10000000000.0, nb.lng/10000000000.0) nb.distance = distance } - //排序 + //鎺掑簭 Collections.sort(list, new Comparator() { @Override int compare(Object o1, Object o2) { if(o1.distance > o2.distance) - return 1;//第二个元素(o1)比第一个元素(o2)大,返回-1 + return 1;//绗簩涓厓绱狅紙o1锛夋瘮绗竴涓厓绱狅紙o2锛夊ぇ锛岃繑鍥�-1 if(o1.distance == o2.distance) return 0; return -1; @@ -393,9 +393,9 @@ class MatchTest { } def nameFileter(def name){ - name = name.replace("·","").replace(".","").replace("|","") - name = name.replace("1期","一期").replace("2期","二期").replace("3期","三期").replace("4期","四期").replace("5期","五期").replace("6期","6期") - name = name.replace("1区","一区").replace("2区","二区").replace("3区","三区").replace("4区","四区").replace("5区","五区").replace("6区","六区") + name = name.replace("路","").replace(".","").replace("|","") + name = name.replace("1鏈�","涓�鏈�").replace("2鏈�","浜屾湡").replace("3鏈�","涓夋湡").replace("4鏈�","鍥涙湡").replace("5鏈�","浜旀湡").replace("6鏈�","6鏈�") + name = name.replace("1鍖�","涓�鍖�").replace("2鍖�","浜屽尯").replace("3鍖�","涓夊尯").replace("4鍖�","鍥涘尯").replace("5鍖�","浜斿尯").replace("6鍖�","鍏尯") return name; } 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 62474f6c5..5b8f07228 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 @@ -36,7 +36,7 @@ public class BeiKeCrawlByChrome { def startMonth = DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyy-MM"), -1, "yyyy-MM") WebDriver driver = null; - //广州,佛山 重庆 + //骞垮窞锛屼經灞� 閲嶅簡 static main(args) { def task = new BeiKeCrawlByChrome(); task.run() @@ -65,7 +65,7 @@ public class BeiKeCrawlByChrome { def q = new BasicDBObject() q.put("region", null) q.put("trade_date", new BasicDBObject(QueryOperators.GTE, DateUtils.parseFromTightByPattern("2022-01-01","yyyy-MM-dd"))) - // q.put("source", new BasicDBObject('$in', ["链家在线","贝壳找房"])) + // q.put("source", new BasicDBObject('$in', ["閾惧鍦ㄧ嚎","璐濆3鎵炬埧"])) def dbcursor = DEAL_PRICE_COLL.find(q) def keys = [] for(def d : dbcursor){ @@ -81,7 +81,7 @@ public class BeiKeCrawlByChrome { query.put("city", m.city) query.put("region", null) query.put("district_name", m.name) -// query.put("source", "链家在线") +// query.put("source", "閾惧鍦ㄧ嚎") query.put("trade_date", new BasicDBObject(QueryOperators.GTE, DateUtils.parseFromTightByPattern(lastMonth,"yyyy-MM-dd"))) def data = new BasicDBObject() @@ -98,7 +98,7 @@ public class BeiKeCrawlByChrome { def flag = true while(flag){ try{ - if(s && (s.contains("无法访问此网站") || s.contains("登录"))){ + if(s && (s.contains("鏃犳硶璁块棶姝ょ綉绔�") || s.contains("鐧诲綍"))){ driver = getLogin(driver, url) driver.get(url) Thread.sleep(5000) @@ -111,7 +111,7 @@ public class BeiKeCrawlByChrome { driver = new ChromeDriver() Thread.sleep(15000) driver = getLogin(driver, url) - println "异常Url:"+url + println "寮傚父Url:"+url } } return driver; @@ -120,20 +120,20 @@ public class BeiKeCrawlByChrome { def crawlData(driver, citys){ def lineUrl = "mongodb://developer:G00IDCDEV12385@mongo.db.fangjia.com:28017"; DBCollection DEAL_PRICE_COLL = MongoUtils.getCollectionByName2("fangjia", "deal_price", lineUrl) - def runedCitys = FileUtils.readTxt("d:\\数据\\成交抓取\\贝壳已抓城市.txt") + def runedCitys = FileUtils.readTxt("d:\\鏁版嵁\\鎴愪氦鎶撳彇\\璐濆3宸叉姄鍩庡競.txt") for(def m : citys){ def city = m[0] if(runedCitys.contains(city)){ - println city +" 已运行" + println city +" 宸茶繍琛�" continue } def newCity = RegionData.formatCity(city) if(!newCity){ - if(city=="昆山"){ - newCity = "苏州" + if(city=="鏄嗗北"){ + newCity = "鑻忓窞" } - println city +" 无法格式化" + println city +" 鏃犳硶鏍煎紡鍖�" } def url = m[1] def newUrl = url+"/chengjiao/" @@ -141,25 +141,25 @@ public class BeiKeCrawlByChrome { Thread.sleep(10000) driver = checkDocument(driver, newUrl); def doc = Jsoup.parse(driver.getPageSource()) - def regions = JQueryUtils.select(".position dl:contains(位置)+dl a", doc) + def regions = JQueryUtils.select(".position dl:contains(浣嶇疆)+dl a", doc) if(regions){ for(def r : regions){ def regionText = r.text() def href = url+ r.attr("href") - println "开始抓取【${city}】【${regionText}】【${href}】" - if(city == "昆山"){ - regionText = "昆山" + println "寮�濮嬫姄鍙栥��${city}銆戙��${regionText}銆戙��${href}銆�" + if(city == "鏄嗗北"){ + regionText = "鏄嗗北" } def map = getPageDeail(driver, newCity, href, regionText) driver = map.driver - println url +" 详情链接:"+map.detailUrls.size() + println url +" 璇︽儏閾炬帴锛�"+map.detailUrls.size() } } - FileUtils.batchCreateFile([[city]], "d:\\数据\\成交抓取\\贝壳已抓城市.txt", [], "utf-8", true); + FileUtils.batchCreateFile([[city]], "d:\\鏁版嵁\\鎴愪氦鎶撳彇\\璐濆3宸叉姄鍩庡競.txt", [], "utf-8", true); // def detailUrls = getPageDeail(driver, m.city, m.url) -// println m.city +" 详情链接:"+detailUrls.size() +// println m.city +" 璇︽儏閾炬帴锛�"+detailUrls.size() // crawlDetail(driver, DEAL_PRICE_COLL, detailUrls) } @@ -214,9 +214,9 @@ public class BeiKeCrawlByChrome { def endDate = DateUtils.parseFromTightByPattern(startMonth + "-01", "yyyy-MM-dd") if(dealDate && dealDate.getTime()>=endDate.getTime()){ detailUrls << durl - println "开始查库 "+new Date().toString() - def dbo = findTrade(durl , "贝壳找房") - println "结束查库"+new Date().toString() + println "寮�濮嬫煡搴� "+new Date().toString() + def dbo = findTrade(durl , "璐濆3鎵炬埧") + println "缁撴潫鏌ュ簱"+new Date().toString() if (!dbo) { driver = parse(city, e, region, driver, null) } @@ -251,13 +251,13 @@ public class BeiKeCrawlByChrome { driver = checkDocument(driver, detailUrl); def detailDoc = Jsoup.parse(driver.getPageSource()) - println "打开获取页面 "+new Date().toString() + println "鎵撳紑鑾峰彇椤甸潰 "+new Date().toString() def title = e.select(".title a").text() if (title) { def detail = new BasicDBObject() def arrs = title.split(" ") - if(title.contains("车位")){ - detail.type = "车位" + if(title.contains("杞︿綅")){ + detail.type = "杞︿綅" } detail.city = city detail.district_name = arrs[0] @@ -267,18 +267,18 @@ public class BeiKeCrawlByChrome { } def roomStr = arrs[1] - if(roomStr && !roomStr.contains("室")){ + if(roomStr && !roomStr.contains("瀹�")){ roomStr = arrs[2] } if (roomStr) { - if (roomStr.indexOf("室") > 0) { - roomStr = roomStr.substring(0, roomStr.indexOf("室")) + if (roomStr.indexOf("瀹�") > 0) { + roomStr = roomStr.substring(0, roomStr.indexOf("瀹�")) if(roomStr && roomStr.isNumber()){ detail.room = roomStr.toInteger() } } - if (roomStr.indexOf("厅") > 0 && roomStr.indexOf("室") > 0) { - def hallStr = roomStr.substring(roomStr.indexOf("室") + 1, roomStr.indexOf("厅")) + if (roomStr.indexOf("鍘�") > 0 && roomStr.indexOf("瀹�") > 0) { + def hallStr = roomStr.substring(roomStr.indexOf("瀹�") + 1, roomStr.indexOf("鍘�")) if(hallStr && hallStr.isNumber()){ detail.hall = hallStr.toInteger() } @@ -286,12 +286,12 @@ public class BeiKeCrawlByChrome { } def areaStr = arrs[2] - if(areaStr && !areaStr.contains("平米")){ + if(areaStr && !areaStr.contains("骞崇背")){ if(arrs.size()>=4){ areaStr = arrs[3] } } - areaStr = areaStr.replace("平米","") + areaStr = areaStr.replace("骞崇背","") if (areaStr && areaStr.isNumber()) { detail.area = areaStr.toDouble() } @@ -308,31 +308,31 @@ public class BeiKeCrawlByChrome { if (tradeStr) { detail.trade_date = DateUtils.parseFromTightByPattern(tradeStr, "yyyy.MM.dd") } - detail.source = "贝壳找房" + detail.source = "璐濆3鎵炬埧" 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("梯户比例","") + liftStr = detailDiv1.select("li:contains(姊埛姣斾緥)").text().replace("姊埛姣斾緥","") } if(liftStr){ detail.lift = DataFormatUtils.parseLift(liftStr) detail.lift_household = DataFormatUtils.parseHousehold(liftStr) } - 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.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("房屋年限","")) + 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 @@ -343,8 +343,8 @@ public class BeiKeCrawlByChrome { detail.fitment = houseInfos[1] detail.floor_info = floorStr - if (floorStr && floorStr.contains("共") && floorStr.contains("层)")) { - def floorInfo = floorStr.substring(floorStr.indexOf("共") + 1, floorStr.indexOf("层)")) + if (floorStr && floorStr.contains("鍏�") && floorStr.contains("灞�)")) { + def floorInfo = floorStr.substring(floorStr.indexOf("鍏�") + 1, floorStr.indexOf("灞�)")) if (floorInfo && floorInfo.isNumber()) { detail.height = floorInfo.toInteger() } @@ -352,14 +352,14 @@ public class BeiKeCrawlByChrome { detail.create_date = new Date() detail.m_date = new Date() - println "解析页面完成 "+new Date().toString() + println "瑙f瀽椤甸潰瀹屾垚 "+new Date().toString() println detail if(id){ DEAL_PRICE_COLL.update(new BasicDBObject("_id",id),new BasicDBObject('$set',detail)) }else{ DEAL_PRICE_COLL.save(detail) } - println "保存修改完成 "+new Date().toString() + println "淇濆瓨淇敼瀹屾垚 "+new Date().toString() } } }catch(Exception ex){ @@ -374,7 +374,7 @@ public class BeiKeCrawlByChrome { def q = new BasicDBObject() q.put("city", city) q.put("name", district_name) - q.put("source", new BasicDBObject('$in', ["链家在线","贝壳找房"])) + q.put("source", new BasicDBObject('$in', ["閾惧鍦ㄧ嚎","璐濆3鎵炬埧"])) def dbcursor = thirdPartyColl.find(q).sort(new BasicDBObject('s_date', -1)).limit(1) def dbo = null; for(def d : dbcursor){ @@ -388,7 +388,7 @@ public class BeiKeCrawlByChrome { def getContent(driver, detailUrl){ driver.get(detailUrl) def str = driver.getPageSource() - if(str && str.contains("登录")){ + if(str && str.contains("鐧诲綍")){ getLogin(driver) return getContent(driver, detailUrl) } @@ -414,16 +414,16 @@ public class BeiKeCrawlByChrome { def eles = JQueryUtils.select(".deal-bread a", doc) def detail = new BasicDBObject() if(eles && eles.size()>=4){ - detail.city = eles[0].text().replace("房产网","") - detail.region = eles[2].text().replace("二手房成交","") - detail.district_name = eles[eles.size()-1].text().replace("二手房成交","") + detail.city = eles[0].text().replace("鎴夸骇缃�","") + detail.region = eles[2].text().replace("浜屾墜鎴挎垚浜�","") + detail.district_name = eles[eles.size()-1].text().replace("浜屾墜鎴挎垚浜�","") } if(detail.district_name) { def price = JQueryUtils.selectText(".dealTotalPrice i", doc) if (price && price.isNumber()) { detail.total_price = price.toInteger() * 10000 } - def areaStr = JQueryUtils.selectText("li:contains(建筑面积)", doc).replace("建筑面积", "").replace("㎡", "") + def areaStr = JQueryUtils.selectText("li:contains(寤虹瓚闈㈢Н)", doc).replace("寤虹瓚闈㈢Н", "").replace("銕�", "") if (areaStr) { detail.area = areaStr.toDouble() } @@ -431,25 +431,25 @@ public class BeiKeCrawlByChrome { if (detail.total_price && detail.area) { detail.avg_price = (int) (detail.total_price / detail.area) } - def tradeStr = JQueryUtils.selectText(".house-title span", doc).replace("成交", "").trim() + def tradeStr = JQueryUtils.selectText(".house-title span", doc).replace("鎴愪氦", "").trim() if (tradeStr) { detail.trade_date = DateUtils.parseFromTightByPattern(tradeStr, "yyyy.MM.dd") } - detail.source = "链家在线" + detail.source = "閾惧鍦ㄧ嚎" detail.url = detailUrl def dbo = findTrade(detail) if (!dbo) { - def roomStr = JQueryUtils.selectText("li:contains(房屋户型)", doc).replace("房屋户型", "") + def roomStr = JQueryUtils.selectText("li:contains(鎴垮眿鎴峰瀷)", doc).replace("鎴垮眿鎴峰瀷", "") if (roomStr) { - detail.room = roomStr.substring(0, roomStr.indexOf("室")).toInteger() - detail.hall = roomStr.substring(roomStr.indexOf("室") + 1, roomStr.indexOf("厅")).toInteger() - detail.toilet = roomStr.substring(roomStr.indexOf("卫") - 1, roomStr.indexOf("卫")).toInteger() + detail.room = roomStr.substring(0, roomStr.indexOf("瀹�")).toInteger() + detail.hall = roomStr.substring(roomStr.indexOf("瀹�") + 1, roomStr.indexOf("鍘�")).toInteger() + detail.toilet = roomStr.substring(roomStr.indexOf("鍗�") - 1, roomStr.indexOf("鍗�")).toInteger() } - detail.direction = JQueryUtils.selectText("li:contains(房屋朝向)", doc).replace("房屋朝向", "") - detail.fitment = JQueryUtils.selectText("li:contains(装修情况)", doc).replace("装修情况", "") - def floorStr = JQueryUtils.selectText("li:contains(所在楼层)", doc).replace("所在楼层", "") - if (floorStr && floorStr.contains("共") && floorStr.contains("层)")) { - floorStr = floorStr.substring(floorStr.indexOf("共") + 1, floorStr.indexOf("层)")) + detail.direction = JQueryUtils.selectText("li:contains(鎴垮眿鏈濆悜)", doc).replace("鎴垮眿鏈濆悜", "") + detail.fitment = JQueryUtils.selectText("li:contains(瑁呬慨鎯呭喌)", doc).replace("瑁呬慨鎯呭喌", "") + def floorStr = JQueryUtils.selectText("li:contains(鎵�鍦ㄦゼ灞�)", doc).replace("鎵�鍦ㄦゼ灞�", "") + if (floorStr && floorStr.contains("鍏�") && floorStr.contains("灞�)")) { + floorStr = floorStr.substring(floorStr.indexOf("鍏�") + 1, floorStr.indexOf("灞�)")) if (floorStr && floorStr.isNumber()) { detail.height = floorStr.toInteger() } @@ -485,7 +485,7 @@ public class BeiKeCrawlByChrome { def cityDoc = Jsoup.parse(driver.getPageSource()); def cityEles = JQueryUtils.select(".city_list_ul .city_province a", cityDoc) def list = [] - def citys = ["福州"] + def citys = ["绂忓窞"] if(cityEles){ for(def e : cityEles){ def href = "https:"+e.attr("href") @@ -507,11 +507,11 @@ public class BeiKeCrawlByChrome { wait.until(ExpectedConditions.visibilityOf(driver.findElement(By.className("username")))); - WebElement elemUsername = driver.findElement(By.id("username")); //获取用户名框 + WebElement elemUsername = driver.findElement(By.id("username")); //鑾峰彇鐢ㄦ埛鍚嶆 - WebElement elemPassword = driver.findElement(By.id("password")); //获取密码框 + WebElement elemPassword = driver.findElement(By.id("password")); //鑾峰彇瀵嗙爜妗� - WebElement btn = driver.findElement(By.cssSelector("button[class='ant-btn btn-login ant-btn-primary']")); //获取点击登陆按钮。 + WebElement btn = driver.findElement(By.cssSelector("button[class='ant-btn btn-login ant-btn-primary']")); //鑾峰彇鐐瑰嚮鐧婚檰鎸夐挳銆� elemUsername.sendKeys("17148854005"); @@ -523,14 +523,14 @@ public class BeiKeCrawlByChrome { // elemUsername.sendKeys("16283166371"); // elemPassword.sendKeys("Goojia123456"); - btn.submit(); // 点击行为; + btn.submit(); // 鐐瑰嚮琛屼负锛� Thread.sleep(10000) }catch(Exception e){ driver.close() driver = new ChromeDriver() Thread.sleep(15000) driver = getLogin(driver, url) - println "异常Url:"+url + println "寮傚父Url:"+url } return driver diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/Caa123Crawl.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/Caa123Crawl.groovy index fb358e503..3503afed9 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/Caa123Crawl.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/Caa123Crawl.groovy @@ -51,7 +51,7 @@ def detailUrls = getDetailLinks(driver, citys); def getDetailLinks(driver, cityList){ - def zxcitys = ["天津市","北京市","上海市","重庆市"] + def zxcitys = ["澶╂触甯�","鍖椾含甯�","涓婃捣甯�","閲嶅簡甯�"] for(def cityMap : cityList){ def citys = cityMap.citys @@ -95,7 +95,7 @@ def getDetailLinks(driver, cityList){ println city +" "+urls.size() } } - println cityMap.provice +" 完成" + println cityMap.provice +" 瀹屾垚" } @@ -115,7 +115,7 @@ def getTotalPage(def total, def pageSize){ def getCity(driver, proviceMap){ def rows = [] - def zxcitys = ["天津市","北京市","上海市","重庆市"] + def zxcitys = ["澶╂触甯�","鍖椾含甯�","涓婃捣甯�","閲嶅簡甯�"] proviceMap.each {k,v-> if(!zxcitys.contains(k)){ driver.get("https://paimai.caa123.org.cn/pages/lots/list.html?&province=${v}&status=&attribute=&term=&startTimeStamp=&endTimeStamp=&standardType=6&canLoan=&isRestricted="); @@ -125,7 +125,7 @@ def getCity(driver, proviceMap){ for(def c : cityEles){ def cityid = c.attr("data-cityid") def city = c.text() - if(!["石家庄市","太原市","齐齐哈尔市","哈尔滨市","鸡西市","长治市","朔州市","廊坊市","衡水市","唐山市","秦皇岛市","邯郸市","邢台市","保定市","沧州市","张家口市","承德市"].contains(city)){ + if(!["鐭冲搴勫競","澶師甯�","榻愰綈鍝堝皵甯�","鍝堝皵婊ㄥ競","楦¤タ甯�","闀挎不甯�","鏈斿窞甯�","寤婂潑甯�","琛℃按甯�","鍞愬北甯�","绉︾殗宀涘競","閭兏甯�","閭㈠彴甯�","淇濆畾甯�","娌у窞甯�","寮犲鍙e競","鎵垮痉甯�"].contains(city)){ cityMap.put(city, cityid) } @@ -160,7 +160,7 @@ def getDocument(driver){ for(def ele : proviceEles){ def provice = ele.text() def value = ele.attr("data-proviceid") - if(value && provice!="北京市" && provice!="天津市" && provice!="吉林省" && provice!="辽宁省" && provice!="内蒙古自治区" && provice!="山西省" && provice!="河北省" && provice!="江苏省" && provice!="黑龙江省"){ + if(value && provice!="鍖椾含甯�" && provice!="澶╂触甯�" && provice!="鍚夋灄鐪�" && provice!="杈藉畞鐪�" && provice!="鍐呰挋鍙よ嚜娌诲尯" && provice!="灞辫タ鐪�" && provice!="娌冲寳鐪�" && provice!="姹熻嫃鐪�" && provice!="榛戦緳姹熺渷"){ provinceMap.put(provice, value) } } @@ -212,7 +212,7 @@ def parse(province, city, url,doc){ result.city = city def address = JQueryUtils.selectText(["#pro_bid_name"], doc) result.address = address - if(result.address && !result.address.contains("测试")) { + if(result.address && !result.address.contains("娴嬭瘯")) { def rMap = OpenApiUtils.matchDistrict(city, result.address, null, true) if (rMap) { result.matchCity = rMap.city @@ -225,13 +225,13 @@ def parse(province, city, url,doc){ result.status = JQueryUtils.selectText([".bd_state"], doc) - result.companyName = JQueryUtils.selectText("p:contains(拍卖企业) .companyName", doc) - result.mobile = JQueryUtils.selectText("p:contains(联系方式) .companyTel", doc) + result.companyName = JQueryUtils.selectText("p:contains(鎷嶅崠浼佷笟) .companyName", doc) + result.mobile = JQueryUtils.selectText("p:contains(鑱旂郴鏂瑰紡) .companyTel", doc) def finishDateStr = JQueryUtils.selectText(["#sf-countdown .time"], doc) if (finishDateStr) { try{ - result.finishDate = com.fangjia.script.util.DateUtils.parseFromTightByPattern(finishDateStr, "yyyy年MM月dd日 HH:mm"); + result.finishDate = com.fangjia.script.util.DateUtils.parseFromTightByPattern(finishDateStr, "yyyy骞碝M鏈坉d鏃� HH:mm"); }catch(Exception e){ } @@ -270,7 +270,7 @@ def parse(province, city, url,doc){ def startPriceStr = JQueryUtils.selectText(["#startPrice"], doc) if (startPriceStr) { - startPriceStr = startPriceStr.replace(",", "").replace("元", "") + startPriceStr = startPriceStr.replace(",", "").replace("鍏�", "") if (startPriceStr.isNumber()) { result.startPrice = startPriceStr.toDouble().toInteger() } @@ -280,9 +280,9 @@ def parse(province, city, url,doc){ result.retain = JQueryUtils.selectText(["#retain"], doc) result.lookCount = JQueryUtils.selectText(".look_count span", doc) - def startDateStr = JQueryUtils.selectText("span:contains(拍卖会定于)", doc) - if(startDateStr && startDateStr.endsWith("定于") && startDateStr.endsWith("日")){ - startDateStr = startDateStr.toString().substring(startDateStr.indexOf("定于")+2, startDateStr.indexOf("日")+1).trim() + def startDateStr = JQueryUtils.selectText("span:contains(鎷嶅崠浼氬畾浜�)", doc) + if(startDateStr && startDateStr.endsWith("瀹氫簬") && startDateStr.endsWith("鏃�")){ + startDateStr = startDateStr.toString().substring(startDateStr.indexOf("瀹氫簬")+2, startDateStr.indexOf("鏃�")+1).trim() } try{ @@ -310,12 +310,12 @@ def parse(province, city, url,doc){ desc = JQueryUtils.selectText(["#pro_bid_name"], doc) } if (desc) { - if (desc.contains("别墅")) { - result.address = desc.substring(0, desc.indexOf("别墅") + 2) - } else if (desc.contains("号楼")) { - result.address = desc.substring(0, desc.indexOf("号楼") + 2) - } else if (desc.contains("房屋")) { - result.address = desc.substring(0, desc.indexOf("房屋") + 2) + if (desc.contains("鍒")) { + result.address = desc.substring(0, desc.indexOf("鍒") + 2) + } else if (desc.contains("鍙锋ゼ")) { + result.address = desc.substring(0, desc.indexOf("鍙锋ゼ") + 2) + } else if (desc.contains("鎴垮眿")) { + result.address = desc.substring(0, desc.indexOf("鎴垮眿") + 2) } } @@ -357,7 +357,7 @@ def saveToDB(rets){ ret.each{k,v-> obj.put(k,v) } - obj.source= "中拍网" + obj.source= "涓媿缃�" if(dbo){ obj.m_date = new Date() paimaiResultColl.update(q, new BasicDBObject('$set', obj)) @@ -370,7 +370,7 @@ def saveToDB(rets){ } def getAreaNumber(input, maxArea) { - Pattern pattern = Pattern.compile('\\d+(.\\d+)?(平方米|㎡|m2|方米|平)'); + Pattern pattern = Pattern.compile('\\d+(.\\d+)?(骞虫柟绫硘銕m2|鏂圭背|骞�)'); Matcher matcher = pattern.matcher(input); List list = new ArrayList(); @@ -384,10 +384,10 @@ def getAreaNumber(input, maxArea) { if(val.toString().contains(" ")){ val = val.toString().substring(val.toString().indexOf(" ")+1, val.toString().size()) } - if(val.contains("室")){ - val = val.toString().substring(val.toString().indexOf("室")+1, val.toString().size()) + if(val.contains("瀹�")){ + val = val.toString().substring(val.toString().indexOf("瀹�")+1, val.toString().size()) } - def v = val.replace("平方米", "").replace("㎡", "").replace("平", "").replace("方米", "").replace(",", "").replace("m2", ""); + def v = val.replace("骞虫柟绫�", "").replace("銕�", "").replace("骞�", "").replace("鏂圭背", "").replace(",", "").replace("m2", ""); if(v && v.toString().isNumber()){ if (maxArea) { if (v.toDouble() < maxArea) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/ChromeDriverPool.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/ChromeDriverPool.groovy index 53c9378bd..ff31f28f0 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/ChromeDriverPool.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/ChromeDriverPool.groovy @@ -7,13 +7,13 @@ import java.util.concurrent.atomic.AtomicInteger public class ChromeDriverPool { - private static ConcurrentHashMap pool ;//线程池 - private static int coreSize = 2;//核心线程池,一直驻留的资源 - private static int maxSize = 10;//TODO 设置最大数量资源,用于解决瞬时并发,瞬时并发过后要定时去识别空闲的释放掉,保留coreSize的资源 - private static AtomicInteger count = new AtomicInteger(0);//原子自增!! + private static ConcurrentHashMap pool ;//绾跨▼姹� + private static int coreSize = 2;//鏍稿績绾跨▼姹狅紝涓�鐩撮┗鐣欑殑璧勬簮 + private static int maxSize = 10;//TODO 璁剧疆鏈�澶ф暟閲忚祫婧愶紝鐢ㄤ簬瑙e喅鐬椂骞跺彂锛岀灛鏃跺苟鍙戣繃鍚庤瀹氭椂鍘昏瘑鍒┖闂茬殑閲婃斁鎺夛紝淇濈暀coreSize鐨勮祫婧� + private static AtomicInteger count = new AtomicInteger(0);//鍘熷瓙鑷锛侊紒 static { - //驱动初始化 + //椹卞姩鍒濆鍖� System.setProperty("webdriver.chrome.driver", "C:\\Users\\gaojuan\\AppData\\Local\\Google\\Chrome\\Application\\chromedriver.exe"); pool = new ConcurrentHashMap<>(); } @@ -21,12 +21,12 @@ public class ChromeDriverPool { private ChromeDriverPool(){ } - public static void init(int coreSize){//线程池数量初始化 + public static void init(int coreSize){//绾跨▼姹犳暟閲忓垵濮嬪寲 ChromeDriverPool.coreSize = coreSize; } public static Worker getPool(){ - if(count.getAndIncrement() < coreSize){//自增!!! + if(count.getAndIncrement() < coreSize){//鑷!!! return push(new Worker()); }else{ return pop(); @@ -40,7 +40,7 @@ public class ChromeDriverPool { } /** - * 循环获取未使用的资源 + * 寰幆鑾峰彇鏈娇鐢ㄧ殑璧勬簮 * @return */ public static Worker pop(){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/DataFormatUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/DataFormatUtils.groovy index 530579eb8..bc0d9ce97 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/DataFormatUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/DataFormatUtils.groovy @@ -2,11 +2,11 @@ package com.fangjia.script.gj.paimai class DataFormatUtils { - static def common_used_numerals = ['零':0, '一':1, '二':2, '两':2, '俩': 2, '三':3, '四':4, '五':5, '六':6, '七':7, '八':8, '九':9, '十':10, '百':100, '千':1000, '万':10000, '亿':100000000] + static def common_used_numerals = ['闆�':0, '涓�':1, '浜�':2, '涓�':2, '淇�': 2, '涓�':3, '鍥�':4, '浜�':5, '鍏�':6, '涓�':7, '鍏�':8, '涔�':9, '鍗�':10, '鐧�':100, '鍗�':1000, '涓�':10000, '浜�':100000000] static def parseLift(def str){ - if(str && str.contains("梯")){ - def lift = str.toString().substring(0, str.toString().indexOf("梯")) + if(str && str.contains("姊�")){ + def lift = str.toString().substring(0, str.toString().indexOf("姊�")) if(lift){ def val = chineseIntegerPart2Digit(lift) if(val){ @@ -18,8 +18,8 @@ class DataFormatUtils { } static def parseHousehold(def str){ - if(str && str.contains("梯") && str.contains("户")){ - def household = str.toString().substring(str.toString().indexOf("梯")+1, str.toString().indexOf("户")) + if(str && str.contains("姊�") && str.contains("鎴�")){ + def household = str.toString().substring(str.toString().indexOf("姊�")+1, str.toString().indexOf("鎴�")) def val = chineseIntegerPart2Digit(household) if(val){ return (int)val @@ -70,7 +70,7 @@ class DataFormatUtils { } static String getValue(String s) { - if (s && s.contains("暂无")) { + if (s && s.contains("鏆傛棤")) { return null } return s diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/DataUtil.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/DataUtil.groovy index 270e44a97..93c11b9cc 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/DataUtil.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/DataUtil.groovy @@ -38,7 +38,7 @@ class DataUtil { return curDate } static def getAreaNumber(def input, def maxArea) { - Pattern pattern = Pattern.compile('\\d+(.\\d+)?(平方米|㎡|m2|方米|平)') + Pattern pattern = Pattern.compile('\\d+(.\\d+)?(骞虫柟绫硘銕m2|鏂圭背|骞�)') Matcher matcher = pattern.matcher(input) List list = new ArrayList() @@ -49,7 +49,7 @@ class DataUtil { def area = null for (def val : list) { - def v = val.replace("平方米", "").replace("㎡", "").replace("平", "").replace("方米", "").replace(",", "").replace("m2", "") + def v = val.replace("骞虫柟绫�", "").replace("銕�", "").replace("骞�", "").replace("鏂圭背", "").replace(",", "").replace("m2", "") if (maxArea) { if (v.isDouble()) { if (v.toDouble() < maxArea) { @@ -72,22 +72,22 @@ class DataUtil { static def getPaiMaiType(def s) { if (s) { - if (s.toString().contains("结束")) { - return "已完成" - } else if (s.toString().contains("进行") || s.toString().contains("正在拍卖")) { - return "进行中" - } else if (s.toString().contains("即将开始")) { - return "即将开始" - } else if (s.toString().contains("流拍")) { - return "流拍" - } else if (s.toString().contains("撤回")) { - return "撤回" - } else if (s.toString().contains("暂缓")) { - return "暂缓" - } else if (s.toString().contains("中止")) { - return "中止" - } else if (s.toString().contains("失败")) { - return "失败" + if (s.toString().contains("缁撴潫")) { + return "宸插畬鎴�" + } else if (s.toString().contains("杩涜") || s.toString().contains("姝e湪鎷嶅崠")) { + return "杩涜涓�" + } else if (s.toString().contains("鍗冲皢寮�濮�")) { + return "鍗冲皢寮�濮�" + } else if (s.toString().contains("娴佹媿")) { + return "娴佹媿" + } else if (s.toString().contains("鎾ゅ洖")) { + return "鎾ゅ洖" + } else if (s.toString().contains("鏆傜紦")) { + return "鏆傜紦" + } else if (s.toString().contains("涓")) { + return "涓" + } else if (s.toString().contains("澶辫触")) { + return "澶辫触" } } return s @@ -95,8 +95,8 @@ class DataUtil { static def getDateRange(def s) { - s = s.replace("起", "") - Pattern pattern = Pattern.compile('法院将于(\\d+年\\d{1,2}[月|日]\\d{1,2}日\\d{0,2}时?)至(\\d+年\\d{1,2}月\\d{1,2}日\\d{0,2}时?)') + s = s.replace("璧�", "") + Pattern pattern = Pattern.compile('娉曢櫌灏嗕簬(\\d+骞碶\d{1,2}[鏈坾鏃\\d{1,2}鏃\d{0,2}鏃�?)鑷�(\\d+骞碶\d{1,2}鏈圽\d{1,2}鏃\d{0,2}鏃�?)') Matcher matcher = pattern.matcher(s) List list = new ArrayList() @@ -104,8 +104,8 @@ class DataUtil { def str = matcher.group() list.add(str) // if(str) { -// def indx1 = str.indexOf("年") -// def indx2 = str.indexOf("月") +// def indx1 = str.indexOf("骞�") +// def indx2 = str.indexOf("鏈�") // def month = str.substring(indx1+1, indx2); // if(month.toInteger()<12) { // list.add(str); @@ -114,8 +114,8 @@ class DataUtil { } if (list.size() >= 1) { String s1 = list.get(0) - s1 = s1.replace("法院将于", "").replace(" ", "") - def array = s1.split("至") + s1 = s1.replace("娉曢櫌灏嗕簬", "").replace(" ", "") + def array = s1.split("鑷�") return array } return null @@ -123,7 +123,7 @@ class DataUtil { static def getStartPrice(def s) { - Pattern pattern = Pattern.compile('起拍价:\\d+(.\\d+)?万?元') + Pattern pattern = Pattern.compile('璧锋媿浠凤細\\d+(.\\d+)?涓�?鍏�') Matcher matcher = pattern.matcher(s) List list = new ArrayList() @@ -132,11 +132,11 @@ class DataUtil { } if (list.size() >= 1) { String s1 = list.get(0) - if (s1.contains("万元")) { - s1 = s1.toString().replace("起拍价:", "").replace("万元", "").replace(",", "").replace(",", "").replace(" ","") + if (s1.contains("涓囧厓")) { + s1 = s1.toString().replace("璧锋媿浠凤細", "").replace("涓囧厓", "").replace("锛�", "").replace(",", "").replace(" ","") return (int) (s1.toDouble() * 10000) } else { - s1 = s1.toString().replace("起拍价:", "").replace("元", "").replace(",", "").replace(",", "").replace(" ","") + s1 = s1.toString().replace("璧锋媿浠凤細", "").replace("鍏�", "").replace("锛�", "").replace(",", "").replace(" ","") if (s1.isInteger()) { return s1.toInteger() } else { @@ -148,7 +148,7 @@ class DataUtil { } static def getEstateType(def s) { - Pattern pattern = Pattern.compile('房屋类型:.*;') + Pattern pattern = Pattern.compile('鎴垮眿绫诲瀷锛�.*锛�') Matcher matcher = pattern.matcher(s) List list = new ArrayList() @@ -158,8 +158,8 @@ class DataUtil { if (list.size() >= 1) { String s1 = list.get(0) if (s1) { - s1 = s1.substring(s1.indexOf(":") + 1, s1.indexOf(";")) - return s1.replace(")", "").replace("】", "") + s1 = s1.substring(s1.indexOf("锛�") + 1, s1.indexOf("锛�")) + return s1.replace("锛�", "").replace("銆�", "") } } return null @@ -167,17 +167,17 @@ class DataUtil { static def findEstateType(def s) { if (s) { - def villTypes = ["独栋", "联排", "联列", "叠加", "双拼", "花园面积", "泳池", "别墅", "花园住宅", "带花园", "洋房", "叠拼", "独院", "联体", "微墅", "大平墅"] + def villTypes = ["鐙爧", "鑱旀帓", "鑱斿垪", "鍙犲姞", "鍙屾嫾", "鑺卞洯闈㈢Н", "娉虫睜", "鍒", "鑺卞洯浣忓畢", "甯﹁姳鍥�", "娲嬫埧", "鍙犳嫾", "鐙櫌", "鑱斾綋", "寰", "澶у钩澧�"] for (def type : villTypes) { if (s.contains(type)) { - return "别墅" + return "鍒" } } - def districtTypes = ["住宅", "公寓"] + def districtTypes = ["浣忓畢", "鍏瘬"] for (def type : districtTypes) { if (s.contains(type)) { - return "普通住宅" + return "鏅�氫綇瀹�" } } } @@ -199,7 +199,7 @@ class DataUtil { } /** - * 匹配符合条件的字符串 + * 鍖归厤绗﹀悎鏉′欢鐨勫瓧绗︿覆 * * @param str * @param pattern @@ -217,18 +217,18 @@ class DataUtil { } /** - * font-secret字符串专用解密工具 + * font-secret瀛楃涓蹭笓鐢ㄨВ瀵嗗伐鍏� * - * @param key 密匙 - * @param encodeString 加密后的字符串 - * @return 解密后的字符串 + * @param key 瀵嗗寵 + * @param encodeString 鍔犲瘑鍚庣殑瀛楃涓� + * @return 瑙e瘑鍚庣殑瀛楃涓� */ static String decodeString(String key, String encodeString) { if (!key) { return "" } try { - //base64解码,初始化字体 + //base64瑙g爜锛屽垵濮嬪寲瀛椾綋 Base64 base64 = new Base64() byte[] ss = base64.decodeBase64(key) InputStream inputStream = new ByteArrayInputStream(ss) @@ -236,24 +236,24 @@ class DataUtil { FontRenderContext fontRenderContext = new FontRenderContext(new AffineTransform(), false, false) GlyphVector glyphVector = dynamicFont.createGlyphVector(fontRenderContext, "") - //获取font中字形的映射关系,字段为private,使用反射 + //鑾峰彇font涓瓧褰㈢殑鏄犲皠鍏崇郴锛屽瓧娈典负private锛屼娇鐢ㄥ弽灏� Class clazz = Font.class Field[] fs = clazz.getDeclaredFields() Font2DHandle font2DHandle = null for (int i = 0; i < fs.length; i++) { - fs[i].setAccessible(true)// 将目标属性设置为可以访问 + fs[i].setAccessible(true)// 灏嗙洰鏍囧睘鎬ц缃负鍙互璁块棶 if (fs[i].getName().equals("font2DHandle")) { font2DHandle = (Font2DHandle) fs[i].get(dynamicFont) } } - //得到映射关系 + //寰楀埌鏄犲皠鍏崇郴 Font2D font2D = font2DHandle.font2D TrueTypeFont trueTypeFont = (TrueTypeFont) font2D TrueTypeGlyphMapper charToGlyphMapper = (TrueTypeGlyphMapper) trueTypeFont.getMapper() - //开始解密,encodeString为加密后的字符串 + //寮�濮嬭В瀵嗭紝encodeString涓哄姞瀵嗗悗鐨勫瓧绗︿覆 StringBuffer buffer = new StringBuffer() char[] chars = encodeString.toCharArray() for (int i = 0; i < chars.length; i++) { @@ -302,7 +302,7 @@ class DataUtil { } static def filterEmpty(def s){ - if(s && s.contains("暂无")){ + if(s && s.contains("鏆傛棤")){ return null } return s diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/ExportPaimai.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/ExportPaimai.groovy index b994d31e6..a8918830a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/ExportPaimai.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/ExportPaimai.groovy @@ -31,7 +31,7 @@ class ExportPaimai { } def updateCount(){ - ExcelUtils.multiThreadingModify("D:\\数据\\重庆农商行\\法拍\\京东拍卖.xlsx",{d-> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\娉曟媿\\浜笢鎷嶅崠.xlsx",{d-> if(d['AC']){ def pmquery = new BasicDBObject() pmquery.put("url",d['AC']) @@ -44,14 +44,14 @@ class ExportPaimai { } def stat(){ - def file = "D:\\数据\\重庆农商行\\法拍\\苏州商业法拍原数据(已成交).xlsx" + def file = "D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\娉曟媿\\鑻忓窞鍟嗕笟娉曟媿鍘熸暟鎹�(宸叉垚浜�).xlsx" def datas = ExcelUtils.read(file, 0, 1) def index1 = 0 def rates1 = [] for(def d : datas){ - if(d['P'] && d['P']=='已成交'){ -// if(d['M'] && d['M']=="住宅") + if(d['P'] && d['P']=='宸叉垚浜�'){ +// if(d['M'] && d['M']=="浣忓畢") // if(d['K']>=240){ // index1++ // def sumTradePrice = d['S'] @@ -71,14 +71,14 @@ class ExportPaimai { } def addPrice(){ - ExcelUtils.multiThreadingModify("D:\\数据\\重庆农商行\\法拍\\宿迁法拍数据.xlsx",{d-> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\娉曟媿\\瀹胯縼娉曟媿鏁版嵁.xlsx",{d-> if(!d['Y'] && d['Z']){ d['Y'] = d['Z'] } }) } def addressStandard(){ - ExcelUtils.multiThreadingModify("D:\\数据\\重庆农商行\\法拍\\需要重跑地址解析和匹配_重庆法拍数据.xlsx",{d-> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\娉曟媿\\闇�瑕侀噸璺戝湴鍧�瑙f瀽鍜屽尮閰峗閲嶅簡娉曟媿鏁版嵁.xlsx",{d-> def formatAddress = AddressUtil.formatAddress(d['C'], d['A']) if(formatAddress){ d['F'] = formatAddress @@ -88,7 +88,7 @@ class ExportPaimai { } def standard(){ - ExcelUtils.multiThreadingModify("D:\\数据\\重庆农商行\\法拍\\需要重跑地址解析和匹配_重庆法拍数据.xlsx",{d-> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\娉曟媿\\闇�瑕侀噸璺戝湴鍧�瑙f瀽鍜屽尮閰峗閲嶅簡娉曟媿鏁版嵁.xlsx",{d-> def obj = com.fangjia.script.gj.district.FangjiaClientUtils.addressStand(d['C'], d['B']) if(obj){ def arrs = obj.entities @@ -131,14 +131,14 @@ class ExportPaimai { def runCsv(){ def datas = findPaimaiData() - println "总量:"+datas.size() - exportCsv("D:\\数据\\重庆农商行\\法拍\\淘宝法拍.csv", datas) + println "鎬婚噺锛�"+datas.size() + exportCsv("D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\娉曟媿\\娣樺疂娉曟媿.csv", datas) } def runCsv2(){ def datas = findPaimaiData() - println "总量:"+datas.size() - exportCsv("D:\\数据\\重庆农商行\\法拍\\淘宝法拍.csv", datas) + println "鎬婚噺锛�"+datas.size() + exportCsv("D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\娉曟媿\\娣樺疂娉曟媿.csv", datas) } @@ -160,10 +160,10 @@ class ExportPaimai { println index if(index%10000==0){ - println index+"开始写入CSV "+new Date().toLocaleString() + println index+"寮�濮嬪啓鍏SV "+new Date().toLocaleString() out.write(sb.toString().getBytes(charset)); sb.setLength(0) - println index+"结束写入CSV "+new Date().toLocaleString() + println index+"缁撴潫鍐欏叆CSV "+new Date().toLocaleString() } } @@ -177,15 +177,15 @@ class ExportPaimai { def run(){ - def city = "福州" + def city = "绂忓窞" def region = null def datas = findPaimaiData(city,region) - println "总量:"+datas.size() + println "鎬婚噺锛�"+datas.size() def rows = [] - def header = ["标地物地址","省","城市","区域","地址","标题提取地址","楼栋号","单元","室号","楼盘名称","建筑面积","竣工日期","房屋用途","总楼层", - "拍卖状态","是否成交","拍卖阶段","拍卖方式","成交价","拍卖开始时间","拍卖结束时间","起拍价","保证金","加价幅度","评估价","市场价", - "变卖预缴款","竞价周期","延时周期","优先购买权人","报名人数","围观人数","设置提醒人数","延迟次数", "折价率","映射类型","拍卖类型", - "映射资产类型","映射拍卖状态","URL"] + def header = ["鏍囧湴鐗╁湴鍧�","鐪�","鍩庡競","鍖哄煙","鍦板潃","鏍囬鎻愬彇鍦板潃","妤兼爧鍙�","鍗曞厓","瀹ゅ彿","妤肩洏鍚嶇О","寤虹瓚闈㈢Н","绔e伐鏃ユ湡","鎴垮眿鐢ㄩ��","鎬绘ゼ灞�", + "鎷嶅崠鐘舵��","鏄惁鎴愪氦","鎷嶅崠闃舵","鎷嶅崠鏂瑰紡","鎴愪氦浠�","鎷嶅崠寮�濮嬫椂闂�","鎷嶅崠缁撴潫鏃堕棿","璧锋媿浠�","淇濊瘉閲�","鍔犱环骞呭害","璇勪及浠�","甯傚満浠�", + "鍙樺崠棰勭即娆�","绔炰环鍛ㄦ湡","寤舵椂鍛ㄦ湡","浼樺厛璐拱鏉冧汉","鎶ュ悕浜烘暟","鍥磋浜烘暟","璁剧疆鎻愰啋浜烘暟","寤惰繜娆℃暟", "鎶樹环鐜�","鏄犲皠绫诲瀷","鎷嶅崠绫诲瀷", + "鏄犲皠璧勪骇绫诲瀷","鏄犲皠鎷嶅崠鐘舵��","URL"] rows << header def set = new HashSet() def index = 0 @@ -195,7 +195,7 @@ class ExportPaimai { println index set << d.title def row = [] - row << d.title.replace(",",",") + row << d.title.replace(",","锛�") row << d.province row << d.city row << d.region @@ -230,21 +230,21 @@ class ExportPaimai { row << d.callCount row << d.delayCount - row << d.rateDiscount//折价率 - row << d.mappingEstateType;//映射类型 - row << d.zcType;//拍卖类型:资产拍卖 司法拍卖 - row << d.mappingAgencyName//映射资产类型 - row << d.mappingStatus//映射拍卖状态 + row << d.rateDiscount//鎶樹环鐜� + row << d.mappingEstateType;//鏄犲皠绫诲瀷 + row << d.zcType;//鎷嶅崠绫诲瀷锛氳祫浜ф媿鍗� 鍙告硶鎷嶅崠 + row << d.mappingAgencyName//鏄犲皠璧勪骇绫诲瀷 + row << d.mappingStatus//鏄犲皠鎷嶅崠鐘舵�� row << d.url rows << row }else{ println d.title +" "+d.url } } - ExcelUtils.write("D:\\数据\\重庆农商行\\法拍\\福州法拍.xlsx",rows,"数据") + ExcelUtils.write("D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\娉曟媿\\绂忓窞娉曟媿.xlsx",rows,"鏁版嵁") -// batchCreateFile(rows, "D:\\数据\\重庆农商行\\法拍\\淘宝拍卖(新).csv",null,"GBK") - println "生成完成........" +// batchCreateFile(rows, "D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\娉曟媿\\娣樺疂鎷嶅崠(鏂�).csv",null,"GBK") + println "鐢熸垚瀹屾垚........" } @@ -253,40 +253,40 @@ class ExportPaimai { if (file.exists()){ file.delete(); } - file.append("标地物地址,") - file.append("省,") - file.append("城市,") - file.append("区域,") - file.append("地址,") - file.append("标题提取地址,") - file.append("楼栋号,") - file.append("单元,") - file.append("室号,") - file.append("楼盘名称,") - file.append("建筑面积,") - file.append("竣工日期,") - file.append("房屋用途,") - file.append("总楼层,") - file.append("拍卖状态,") - file.append("是否成交,") - file.append("拍卖阶段,") - file.append("拍卖方式,") - file.append("成交价,") - file.append("拍卖开始时间,") - file.append("拍卖结束时间,") - file.append("起拍价,") - file.append("保证金,") - file.append("加价幅度,") - file.append("评估价,") - file.append("市场价,") - file.append("变卖预缴款,") - file.append("竞价周期,") - file.append("延时周期,") - file.append("优先购买权人,") - file.append("报名人数,") - file.append("围观人数,") - file.append("设置提醒人数,") - file.append("延迟次数,") + file.append("鏍囧湴鐗╁湴鍧�,") + file.append("鐪�,") + file.append("鍩庡競,") + file.append("鍖哄煙,") + file.append("鍦板潃,") + file.append("鏍囬鎻愬彇鍦板潃,") + file.append("妤兼爧鍙�,") + file.append("鍗曞厓,") + file.append("瀹ゅ彿,") + file.append("妤肩洏鍚嶇О,") + file.append("寤虹瓚闈㈢Н,") + file.append("绔e伐鏃ユ湡,") + file.append("鎴垮眿鐢ㄩ��,") + file.append("鎬绘ゼ灞�,") + file.append("鎷嶅崠鐘舵��,") + file.append("鏄惁鎴愪氦,") + file.append("鎷嶅崠闃舵,") + file.append("鎷嶅崠鏂瑰紡,") + file.append("鎴愪氦浠�,") + file.append("鎷嶅崠寮�濮嬫椂闂�,") + file.append("鎷嶅崠缁撴潫鏃堕棿,") + file.append("璧锋媿浠�,") + file.append("淇濊瘉閲�,") + file.append("鍔犱环骞呭害,") + file.append("璇勪及浠�,") + file.append("甯傚満浠�,") + file.append("鍙樺崠棰勭即娆�,") + file.append("绔炰环鍛ㄦ湡,") + file.append("寤舵椂鍛ㄦ湡,") + file.append("浼樺厛璐拱鏉冧汉,") + file.append("鎶ュ悕浜烘暟,") + file.append("鍥磋浜烘暟,") + file.append("璁剧疆鎻愰啋浜烘暟,") + file.append("寤惰繜娆℃暟,") file.append("URL,") file.append(System.getProperty("line.separator")); list.each{ @@ -460,7 +460,7 @@ class ExportPaimai { if(region){ pmquery.put("region",region) } -// pmquery.put("status", new BasicDBObject('$in', ["已撤回","已暂缓"])) +// pmquery.put("status", new BasicDBObject('$in', ["宸叉挙鍥�","宸叉殏缂�"])) // pmquery.put("startDate", new BasicDBObject('$gte', DateUtils.parseFromTightYYYYMMDD("2019-01-01"))) pmquery.put("mDate", new BasicDBObject('$gte', DateUtils.parseFromTightYYYYMMDD("2022-07-01"))) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/GaoDeUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/GaoDeUtils.groovy index c3249e561..0f79fc2aa 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/GaoDeUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/GaoDeUtils.groovy @@ -100,7 +100,7 @@ class GaoDeUtils { def resultMap = [:] try { HttpRequest http = new HttpRequest(); - while (errorCount<5){//"2af0b8533415a612b98d59bb93d664b9" 公司key + while (errorCount<5){//"2af0b8533415a612b98d59bb93d664b9" 鍏徃key def key = getRandomKey2() // params.put("key", key) html = http.get(url, params,"utf-8") @@ -108,11 +108,11 @@ class GaoDeUtils { def jo = JSONObject.fromObject(html) if(jo.infocode!="10000"){ errorCount ++ - Thread.sleep(30*1000) println " 不可用Key: "+key + Thread.sleep(30*1000) println " 涓嶅彲鐢↘ey: "+key }else{ errorCount = 100 status = "normal" - println " 可用Key: "+key + " "+html + println " 鍙敤Key: "+key + " "+html } } } @@ -211,11 +211,11 @@ class GaoDeUtils { if(jo.infocode!="10000"){ errorCount ++ Thread.sleep(10*1000) - println " 不可用Key: "+key + println " 涓嶅彲鐢↘ey: "+key }else{ pois = jo.pois; errorCount = 100 - println " 可用Key: "+key + " "+content + println " 鍙敤Key: "+key + " "+content } } } @@ -523,7 +523,7 @@ class GaoDeUtils { } static void main(def a){ - println search("如东县大豫镇豫东村委会","南通") + println search("濡備笢鍘垮ぇ璞晣璞笢鏉戝浼�","鍗楅��") } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/IcbcCrawl.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/IcbcCrawl.groovy index b432108a2..bb9760856 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/IcbcCrawl.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/IcbcCrawl.groovy @@ -35,7 +35,7 @@ class IcbcCrawl { def urls = getAllDetailLinks(driver) - println "共:"+urls.size() + println "鍏憋細"+urls.size() detailCrawling(urls, driver) @@ -52,9 +52,9 @@ class IcbcCrawl { def href = e.select(".li_2_name a").attr("href") urls << "https://gf.trade.icbc.com.cn"+href } - def nextPage = JQueryUtils.select("a:contains(下一页)", doc) + def nextPage = JQueryUtils.select("a:contains(涓嬩竴椤�)", doc) if(nextPage){ - driver.findElement(By.linkText("下一页")).click(); + driver.findElement(By.linkText("涓嬩竴椤�")).click(); }else{ stop = true } @@ -87,7 +87,7 @@ class IcbcCrawl { } if(rets.size()>0){ saveData(rets) - print "完" + print "瀹�" } } @@ -98,22 +98,22 @@ class IcbcCrawl { def id = url.substring(url.indexOf("="), url.length()) if(title){ - def cityStr = JQueryUtils.selectText("dl:contains(所在城市:) li", doc) + def cityStr = JQueryUtils.selectText("dl:contains(鎵�鍦ㄥ煄甯傦細) li", doc) if(cityStr && cityStr.contains("...")){ - def cityEles = JQueryUtils.select("dl:contains(所在城市:) li", doc) + def cityEles = JQueryUtils.select("dl:contains(鎵�鍦ㄥ煄甯傦細) li", doc) if(cityEles){ cityStr = cityEles[0].attr("title") } } - if(cityStr && cityStr.contains("省")){ - result.province = cityStr.substring(0, cityStr.indexOf("省")) - result.city = cityStr.substring(cityStr.indexOf("省")+1, cityStr.length()) + if(cityStr && cityStr.contains("鐪�")){ + result.province = cityStr.substring(0, cityStr.indexOf("鐪�")) + result.city = cityStr.substring(cityStr.indexOf("鐪�")+1, cityStr.length()) }else{ - if(cityStr.contains("自治区")){ - result.province = cityStr.substring(0, cityStr.indexOf("自治区")+3) - result.city = cityStr.substring(cityStr.indexOf("自治区")+3, cityStr.length()) + if(cityStr.contains("鑷不鍖�")){ + result.province = cityStr.substring(0, cityStr.indexOf("鑷不鍖�")+3) + result.city = cityStr.substring(cityStr.indexOf("鑷不鍖�")+3, cityStr.length()) }else{ - result.city = cityStr.substring(0, cityStr.indexOf("市")) + result.city = cityStr.substring(0, cityStr.indexOf("甯�")) } } @@ -131,13 +131,13 @@ class IcbcCrawl { result.roomNum = rMap.room_num } - result.status = JQueryUtils.selectText("#message", doc).replace("本场竞买","") + result.status = JQueryUtils.selectText("#message", doc).replace("鏈満绔炰拱","") def t1 = JQueryUtils.selectText("#pricep", doc) - if(t1 && t1.contains("原因")){ - result.statusDesc = t1.substring(t1.indexOf("原因")+3, t1.toString().length()) + if(t1 && t1.contains("鍘熷洜")){ + result.statusDesc = t1.substring(t1.indexOf("鍘熷洜")+3, t1.toString().length()) } - result.type = JQueryUtils.selectText("dl:contains(类  型:) dd", doc) + result.type = JQueryUtils.selectText("dl:contains(绫汇��銆�鍨嬶細) dd", doc) def enrollCount = JQueryUtils.selectText(["#signUpNum"], doc) if(enrollCount) { result.enrollCount = enrollCount.toInteger() @@ -155,7 +155,7 @@ class IcbcCrawl { def curPriceStr = JQueryUtils.selectText(["#new_price_key"], doc) if(curPriceStr) { - curPriceStr = curPriceStr.replace(",", "").replace("元", "").trim() + curPriceStr = curPriceStr.replace(",", "").replace("鍏�", "").trim() if(curPriceStr.isInteger()) { result.curPrice = curPriceStr.toInteger() }else { @@ -163,11 +163,11 @@ class IcbcCrawl { } } - def startPriceEles = JQueryUtils.select(["dl:contains(起始价格:) dd"], doc) + def startPriceEles = JQueryUtils.select(["dl:contains(璧峰浠锋牸锛�) dd"], doc) if(startPriceEles) { def startPriceStr = startPriceEles[0].attr("title") if(startPriceStr){ - startPriceStr = startPriceStr.replace(",", "").replace("¥","") + startPriceStr = startPriceStr.replace(",", "").replace("锟�","") if(startPriceStr.isInteger()) { result.startPrice = startPriceStr.toInteger() @@ -179,22 +179,22 @@ class IcbcCrawl { } - def addPriceEles = JQueryUtils.select(["dl:contains(加价幅度:) dd"], doc) + def addPriceEles = JQueryUtils.select(["dl:contains(鍔犱环骞呭害锛�) dd"], doc) if(addPriceEles){ def addPriceStr = addPriceEles[0].attr("title") if(addPriceStr){ - addPriceStr = addPriceStr.replace(",", "").replace("¥","") + addPriceStr = addPriceStr.replace(",", "").replace("锟�","") if(addPriceStr) { result.addPrice = addPriceStr.toDouble().toInteger() } } } - def evaluationPriceEles = JQueryUtils.select(["dl:contains(评估价格:) dd"], doc) + def evaluationPriceEles = JQueryUtils.select(["dl:contains(璇勪及浠锋牸锛�) dd"], doc) if(evaluationPriceEles){ def evaluationPriceStr = evaluationPriceEles[0].attr("title") if(evaluationPriceStr){ - evaluationPriceStr = evaluationPriceStr.replace(",", "").replace("¥","") + evaluationPriceStr = evaluationPriceStr.replace(",", "").replace("锟�","") if(evaluationPriceStr.isInteger()) { result.evaluationPrice = evaluationPriceStr.toDouble().toInteger() }else { @@ -203,11 +203,11 @@ class IcbcCrawl { } } - def depositPriceEles = JQueryUtils.select(["dl:contains(加价幅度:) dd"], doc) + def depositPriceEles = JQueryUtils.select(["dl:contains(鍔犱环骞呭害锛�) dd"], doc) if(depositPriceEles){ def v = depositPriceEles[0].attr("title") if(v){ - v = v.replace(",", "").replace("¥","") + v = v.replace(",", "").replace("锟�","") if(v.isInteger()) { result.depositPrice = v.toDouble().toInteger() }else { @@ -216,25 +216,25 @@ class IcbcCrawl { } } - result.delayWeekly = JQueryUtils.selectText(["dl:contains(延时周期:) dd div:eq(0)"], doc) - result.person = JQueryUtils.selectText(["dl:contains(联系人:) dd"], doc) + result.delayWeekly = JQueryUtils.selectText(["dl:contains(寤舵椂鍛ㄦ湡锛�) dd div:eq(0)"], doc) + result.person = JQueryUtils.selectText(["dl:contains(鑱旂郴浜猴細) dd"], doc) result.court = JQueryUtils.selectText("#goToCourt", doc) - def mobileEles = JQueryUtils.select("dl:contains(联系电话:) dd", doc) + def mobileEles = JQueryUtils.select("dl:contains(鑱旂郴鐢佃瘽锛�) dd", doc) if(mobileEles){ result.mobile = mobileEles[0].attr("title") } def s1 = JQueryUtils.selectText("#div_announcement_gfword", doc) if(s1) { - def start = s1.indexOf("法院将于") - def end = s1.indexOf("止") + def start = s1.indexOf("娉曢櫌灏嗕簬") + def end = s1.indexOf("姝�") if(start>-1 && end>-1 && end>start){ - s1 = s1.substring(s1.indexOf("法院将于"), s1.indexOf("止")) + s1 = s1.substring(s1.indexOf("娉曢櫌灏嗕簬"), s1.indexOf("姝�")) } def dateRangs = PaimaiDataUtil.getDateRange(s1) if(dateRangs && dateRangs.size()==2) { - result.startDate = PaimaiDataUtil.parseFromTightByPattern(dateRangs[0], "yyyy年MM月dd日HH时") - result.finishDate = PaimaiDataUtil.parseFromTightByPattern(dateRangs[1], "yyyy年MM月dd日HH时") + result.startDate = PaimaiDataUtil.parseFromTightByPattern(dateRangs[0], "yyyy骞碝M鏈坉d鏃H鏃�") + result.finishDate = PaimaiDataUtil.parseFromTightByPattern(dateRangs[1], "yyyy骞碝M鏈坉d鏃H鏃�") } } @@ -260,9 +260,9 @@ class IcbcCrawl { result.detailMap = DataUtil.filterChar(detailMap) } if(!result.address) { - result.address = detailMap.get("拍品名称") + result.address = detailMap.get("鎷嶅搧鍚嶇О") if(!result.address) { - result.address = detailMap.get("标的名称") + result.address = detailMap.get("鏍囩殑鍚嶇О") } } @@ -296,7 +296,7 @@ class IcbcCrawl { result.introduce = detailStr.toString() result.url = url result.mDate = new Date() - result.source = "融e够" + result.source = "铻峞澶�" return result; } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/JdPaimaiCrawl.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/JdPaimaiCrawl.groovy index e11e01e8f..04e84985a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/JdPaimaiCrawl.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/JdPaimaiCrawl.groovy @@ -30,13 +30,13 @@ class JdPaimaiCrawl { } def run(){ def existsIds = []//findAllIds() - println "已存在:"+existsIds.size() + println "宸插瓨鍦�:"+existsIds.size() System.setProperty("webdriver.chrome.driver", "C:\\Users\\gaojuan\\AppData\\Local\\Google\\Chrome\\Application\\chromedriver.exe"); System.setProperty("http.nonProxyHosts", "localhost"); WebDriver driver = new ChromeDriver() def links = getList(driver) def ids = getDetailLinks(links, driver) - println "共:"+ids.size() + println "鍏憋細"+ids.size() parserList( existsIds,ids, driver) } @@ -147,7 +147,7 @@ class JdPaimaiCrawl { def getDetailLinks(links, driver){ def rets = [] - def citys = ["北京","上海","天津","重庆"] + def citys = ["鍖椾含","涓婃捣","澶╂触","閲嶅簡"] for(def link : links){ driver.get(link) def doc = Jsoup.parse(driver.getPageSource()); @@ -196,7 +196,7 @@ class JdPaimaiCrawl { } if(rets.size()>0){ saveData(rets) - print "完" + print "瀹�" } } @@ -243,7 +243,7 @@ class JdPaimaiCrawl { result.title = title result.address = JQueryUtils.selectText([".pm-location em"], doc) if(result.address) { - //调用获取城市 + //璋冪敤鑾峰彇鍩庡競 // if(!city) { // city = RegionData.formatCity(cityMap.name) // } @@ -314,17 +314,17 @@ class JdPaimaiCrawl { } def finishDateStr = JQueryUtils.selectText([".endtime"], doc) - if(finishDateStr && finishDateStr.contains("结束时间")) { - finishDateStr = finishDateStr.substring(5, finishDateStr.indexOf(" ")) - result.finishDate = DateUtils.parseFromTightByPattern(finishDateStr, "yyyy年MM月dd日 HH:mm:ss") + if(finishDateStr && finishDateStr.contains("缁撴潫鏃堕棿")) { + finishDateStr = finishDateStr.substring(5, finishDateStr.indexOf("銆�")) + result.finishDate = DateUtils.parseFromTightByPattern(finishDateStr, "yyyy骞碝M鏈坉d鏃� HH:mm:ss") } def lis = JQueryUtils.select(".description ul li", doc) if(lis && lis.size()) { for(def li : lis) { def str = li.select("span").text() - if(str.contains("起拍")) { - def v= li.select("em").text().replace("¥", "").replace(",", "") + if(str.contains("璧锋媿")) { + def v= li.select("em").text().replace("锟�", "").replace(",", "") if(v) { if(v.isInteger()) { result.startPrice = v.toDouble().toInteger() @@ -333,20 +333,20 @@ class JdPaimaiCrawl { } } - }else if(str.contains("评估价")) { - def v = li.select("em").text().replace("¥", "").replace(",", "") + }else if(str.contains("璇勪及浠�")) { + def v = li.select("em").text().replace("锟�", "").replace(",", "") if(v.isInteger()) { result.evaluationPrice = v.toDouble().toInteger() }else { result.evaluationPrice = (int)(v.toDouble()) } - }else if(str.contains("加价幅度")) { - def v = li.select("em").text().replace("¥", "").replace(",", "") + }else if(str.contains("鍔犱环骞呭害")) { + def v = li.select("em").text().replace("锟�", "").replace(",", "") if(v) { result.addPrice = v.toDouble().toInteger() } - }else if(str.contains("保证金")) { - def v = li.select("em").text().replace("¥", "").replace(",", "") + }else if(str.contains("淇濊瘉閲�")) { + def v = li.select("em").text().replace("锟�", "").replace(",", "") if(v) { if(v.isInteger()) { result.depositPrice = v.toDouble().toInteger() @@ -355,12 +355,12 @@ class JdPaimaiCrawl { } } - }else if(str.contains("延时周期")) { + }else if(str.contains("寤舵椂鍛ㄦ湡")) { - result.delayWeekly = li.select("em").text().replace("¥", "").replace(",", "") + result.delayWeekly = li.select("em").text().replace("锟�", "").replace(",", "") - }else if(str.contains("优先竞买权人")) { - result.preemptivePerson = li.select("em").text().replace("¥", "").replace(",", "") + }else if(str.contains("浼樺厛绔炰拱鏉冧汉")) { + result.preemptivePerson = li.select("em").text().replace("锟�", "").replace(",", "") } } } @@ -377,8 +377,8 @@ class JdPaimaiCrawl { detailMap.put(d_tds[0].text(), d_tds[1].text()) } }else { - if(d_tds[0] && d_tds[0].text().contains("拍品介绍")) { - detailMap.put("拍品介绍", d_tds[0].text().replace("拍品介绍 ", "")) + if(d_tds[0] && d_tds[0].text().contains("鎷嶅搧浠嬬粛")) { + detailMap.put("鎷嶅搧浠嬬粛", d_tds[0].text().replace("鎷嶅搧浠嬬粛 ", "")) } } } @@ -386,9 +386,9 @@ class JdPaimaiCrawl { result.detailMap = DataUtil.filterChar(detailMap) } if(!result.address) { - result.address = detailMap.get("拍品名称") + result.address = detailMap.get("鎷嶅搧鍚嶇О") if(!result.address) { - result.address = detailMap.get("标的名称") + result.address = detailMap.get("鏍囩殑鍚嶇О") } } @@ -411,7 +411,7 @@ class JdPaimaiCrawl { } - //解析面积 + //瑙f瀽闈㈢Н def article = JQueryUtils.selectText([".floor-content"], doc) if(article) { def area = DataUtil.getAreaNumber(article, 5000) @@ -430,12 +430,12 @@ class JdPaimaiCrawl { } } - def s1 = JQueryUtils.selectText(["li:contains(竞买公告) .floor-content"], doc) + def s1 = JQueryUtils.selectText(["li:contains(绔炰拱鍏憡) .floor-content"], doc) if(s1) { - def start = s1.indexOf("将于") - def end = s1.indexOf("止") + def start = s1.indexOf("灏嗕簬") + def end = s1.indexOf("姝�") if(start>-1 && end>-1 && end>start){ - s1 = s1.substring(s1.indexOf("将于"), s1.indexOf("止")) + s1 = s1.substring(s1.indexOf("灏嗕簬"), s1.indexOf("姝�")) } def dateRangs = DataUtil.getDateRange(s1) if(dateRangs && dateRangs.size()==2) { @@ -443,16 +443,16 @@ class JdPaimaiCrawl { for(def j=0;jind+1) { - date = date +"时" + def ind = date.indexOf("鏃�") + if(date.indexOf("鏃�")==-1 && date.toString().length()>ind+1) { + date = date +"鏃�" } - pattern = "yyyy年MM月dd日HH时" + pattern = "yyyy骞碝M鏈坉d鏃H鏃�" } if(j==0) { try{ @@ -480,8 +480,8 @@ class JdPaimaiCrawl { } if(!result.startDate){ - def sTime = JQueryUtils.selectText(".startTime", doc).replace("开拍时间:","") - result.startDate = DateUtils.parseFromTightByPattern(sTime, "yyyy年MM月dd日") + def sTime = JQueryUtils.selectText(".startTime", doc).replace("寮�鎷嶆椂闂达細","") + result.startDate = DateUtils.parseFromTightByPattern(sTime, "yyyy骞碝M鏈坉d鏃�") } if(result.finishDate){ result.finishDate = com.fangjia.script.gj.paimai.DataUtil.checkMaxDate(result.finishDate, "2000-01-01") @@ -495,7 +495,7 @@ class JdPaimaiCrawl { result.url = url result.city = city result.mDate = new Date() - result.source = "京东" + result.source = "浜笢" return result; } 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 1730f28b7..134a1c458 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 @@ -60,7 +60,7 @@ public class LianjiaCrawlByChrome { def udata = new BasicDBObject() udata.put("hall", 0) DEAL_PRICE_COLL.update(q, new BasicDBObject('$set', udata), false, true); - println "[修改]"+city +" "+ count + println "[淇敼]"+city +" "+ count } } } @@ -75,13 +75,13 @@ public class LianjiaCrawlByChrome { for(def cityUrl : cityUrls){ def detailUrls = getPageUrls(driver, cityUrl) - println cityUrl +" 详情链接:"+detailUrls.size() + println cityUrl +" 璇︽儏閾炬帴锛�"+detailUrls.size() poolCrawl( detailUrls) } } def poolCrawl(detailUrls){ - //模拟并发 + //妯℃嫙骞跺彂 int parallelSize = 10; final CountDownLatch latch = new CountDownLatch(1); ExecutorService pool = Executors.newFixedThreadPool(parallelSize); @@ -94,9 +94,9 @@ public class LianjiaCrawlByChrome { Worker work = null; try { - latch.await();//阻塞所有线程 + latch.await();//闃诲鎵�鏈夌嚎绋� System.out.println(Thread.currentThread().getName()); - while (true) {//业务需求,一直等待直到获取到驱动 + while (true) {//涓氬姟闇�姹傦紝涓�鐩寸瓑寰呯洿鍒拌幏鍙栧埌椹卞姩 work = ChromeDriverPool.getPool(); if (work != null) { break; @@ -157,10 +157,10 @@ public class LianjiaCrawlByChrome { def lastMonth = DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyy-MM"), -1, "yyyy-MM") lastMonth = lastMonth +"-01" def q = new BasicDBObject() -// q.put("city", "福州") +// q.put("city", "绂忓窞") q.put("region", null) q.put("trade_date", new BasicDBObject(QueryOperators.GTE, DateUtils.parseFromTightByPattern("2022-06-01","yyyy-MM-dd"))) - // q.put("source", new BasicDBObject('$in', ["链家在线","贝壳找房"])) + // q.put("source", new BasicDBObject('$in', ["閾惧鍦ㄧ嚎","璐濆3鎵炬埧"])) def dbcursor = DEAL_PRICE_COLL.find(q) def keys = [] for(def d : dbcursor){ @@ -176,7 +176,7 @@ public class LianjiaCrawlByChrome { query.put("city", m.city) query.put("region", null) query.put("district_name", m.name) -// query.put("source", "链家在线") +// query.put("source", "閾惧鍦ㄧ嚎") // query.put("trade_date", new BasicDBObject(QueryOperators.GTE, DateUtils.parseFromTightByPattern(lastMonth,"yyyy-MM-dd"))) def data = new BasicDBObject() @@ -191,20 +191,20 @@ public class LianjiaCrawlByChrome { def crawlData(driver, cityList){ def lineUrl = "mongodb://developer:G00IDCDEV12385@mongo.db.fangjia.com:28017"; DBCollection DEAL_PRICE_COLL = MongoUtils.getCollectionByName2("fangjia", "deal_price", lineUrl) - def runedCitys = FileUtils.readTxt("d:\\数据\\成交抓取\\链家已抓城市.txt") + def runedCitys = FileUtils.readTxt("d:\\鏁版嵁\\鎴愪氦鎶撳彇\\閾惧宸叉姄鍩庡競.txt") for(def ret : cityList){ def city = ret[0] if(runedCitys.contains(city)){ - println city +" 已运行" + println city +" 宸茶繍琛�" continue } def newCity = RegionData.formatCity(city) if(!newCity){ - if(city=="昆山"){ - newCity = "苏州" + if(city=="鏄嗗北"){ + newCity = "鑻忓窞" } - println city +" 无法格式化" + println city +" 鏃犳硶鏍煎紡鍖�" } def cityUrl = ret[1] def newUrl = cityUrl+"chengjiao/" @@ -213,23 +213,23 @@ public class LianjiaCrawlByChrome { // Thread.sleep(10000) driver = checkDocument(driver, newUrl); def doc = Jsoup.parse(driver.getPageSource()) - def regions = JQueryUtils.select(".position dl:contains(位置)+dl a", doc) + def regions = JQueryUtils.select(".position dl:contains(浣嶇疆)+dl a", doc) if(regions){ for(def r : regions){ def regionText = r.text() def href = cityUrl.toString().substring(0, cityUrl.toString().length()-1) + r.attr("href") - if(city == "昆山"){ - regionText = "昆山" + if(city == "鏄嗗北"){ + regionText = "鏄嗗北" } - println "开始抓取【${city}】【${regionText}】【${href}】" + println "寮�濮嬫姄鍙栥��${city}銆戙��${regionText}銆戙��${href}銆�" def map = getPageDeail(driver, newCity, href, regionText) driver = map.driver - println newUrl +" 详情链接:"+map.detailUrls.size() + println newUrl +" 璇︽儏閾炬帴锛�"+map.detailUrls.size() } } // crawlDetail(driver, DEAL_PRICE_COLL, detailUrls) - FileUtils.batchCreateFile([[city]], "d:\\数据\\成交抓取\\链家已抓城市.txt", [], "utf-8", true); + FileUtils.batchCreateFile([[city]], "d:\\鏁版嵁\\鎴愪氦鎶撳彇\\閾惧宸叉姄鍩庡競.txt", [], "utf-8", true); } } @@ -270,7 +270,7 @@ public class LianjiaCrawlByChrome { def flag = true while(flag){ - if(s && (s.contains("无法访问此网站") || s.contains("登录"))){ + if(s && (s.contains("鏃犳硶璁块棶姝ょ綉绔�") || s.contains("鐧诲綍"))){ driver = getLogin(driver, url) driver.get(url) Thread.sleep(5000) @@ -284,7 +284,7 @@ public class LianjiaCrawlByChrome { driver = new ChromeDriver() Thread.sleep(15000) driver = getLogin(driver, url) - println "异常Url:"+url + println "寮傚父Url:"+url } return driver; } @@ -310,7 +310,7 @@ public class LianjiaCrawlByChrome { if(dealDate){ if(dealDate.getTime()>=endDate.getTime()){ detailUrls << durl - def dbo = findTrade(durl , "链家在线") + def dbo = findTrade(durl , "閾惧鍦ㄧ嚎") if (!dbo) { driver = parse(city, e, regionText, driver, null) } @@ -322,7 +322,7 @@ public class LianjiaCrawlByChrome { break; } }else{ - println url +" 成交时间有误!" + println url +" 鎴愪氦鏃堕棿鏈夎锛�" } } @@ -355,8 +355,8 @@ public class LianjiaCrawlByChrome { if (title) { def detail = new BasicDBObject() def arrs = title.split(" ") - if(title.contains("车位")){ - detail.type = "车位" + if(title.contains("杞︿綅")){ + detail.type = "杞︿綅" } detail.city = city detail.district_name = arrs[0] @@ -380,24 +380,24 @@ public class LianjiaCrawlByChrome { def roomStr = arrs[1] if (roomStr) { - if (roomStr.indexOf("室") > 0) { - def room = roomStr.substring(0, roomStr.indexOf("室")) + if (roomStr.indexOf("瀹�") > 0) { + def room = roomStr.substring(0, roomStr.indexOf("瀹�")) if(room && room.isNumber()){ detail.room = room.toInteger() } } - if (roomStr.indexOf("厅") > 0 && roomStr.indexOf("室") > 0) { - def hall = roomStr.substring(roomStr.indexOf("室") + 1, roomStr.indexOf("厅")) + if (roomStr.indexOf("鍘�") > 0 && roomStr.indexOf("瀹�") > 0) { + def hall = roomStr.substring(roomStr.indexOf("瀹�") + 1, roomStr.indexOf("鍘�")) if(hall && hall.isNumber()){ detail.hall = hall.toInteger() } } } - if("车位"!=roomStr){ + if("杞︿綅"!=roomStr){ if(arrs && arrs.size()>=3){ - def areaStr = arrs[2].replace("平米", "") + def areaStr = arrs[2].replace("骞崇背", "") if (areaStr) { detail.area = areaStr.toDouble() } @@ -415,25 +415,25 @@ public class LianjiaCrawlByChrome { if (tradeStr) { detail.trade_date = DateUtils.parseFromTightByPattern(tradeStr, "yyyy.MM.dd") } - detail.source = "链家在线" + detail.source = "閾惧鍦ㄧ嚎" detail.url = detailUrl def detailDiv = JQueryUtils.select(".introContent", detailDoc) - def liftStr = detailDiv.select("li:contains(梯户比例)").text().replace("梯户比例","") + def liftStr = detailDiv.select("li:contains(姊埛姣斾緥)").text().replace("姊埛姣斾緥","") if(liftStr){ detail.lift = DataFormatUtils.parseLift(liftStr) detail.lift_household = DataFormatUtils.parseHousehold(liftStr) } - 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("所在楼层","")) + 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() @@ -442,8 +442,8 @@ public class LianjiaCrawlByChrome { detail.fitment = houseInfos[1] detail.floor_info = floorStr - if (floorStr && floorStr.contains("共") && floorStr.contains("层)")) { - def floorStr2 = floorStr.substring(floorStr.indexOf("共") + 1, floorStr.indexOf("层)")) + if (floorStr && floorStr.contains("鍏�") && floorStr.contains("灞�)")) { + def floorStr2 = floorStr.substring(floorStr.indexOf("鍏�") + 1, floorStr.indexOf("灞�)")) if (floorStr2 && floorStr2.isNumber()) { detail.height = floorStr2.toInteger() } @@ -473,7 +473,7 @@ public class LianjiaCrawlByChrome { def q = new BasicDBObject() q.put("city", city) q.put("name", district_name) - q.put("source", new BasicDBObject('$in', ["链家在线","贝壳找房"])) + q.put("source", new BasicDBObject('$in', ["閾惧鍦ㄧ嚎","璐濆3鎵炬埧"])) def dbcursor = thirdPartyColl.find(q).sort(new BasicDBObject('s_date', -1)).limit(1) def dbo = null; for(def d : dbcursor){ @@ -487,7 +487,7 @@ public class LianjiaCrawlByChrome { def getContent(driver, detailUrl){ driver.get(detailUrl) def str = driver.getPageSource() - if(str && str.contains("登录")){ + if(str && str.contains("鐧诲綍")){ getLogin(driver) return getContent(driver, detailUrl) } @@ -513,16 +513,16 @@ public class LianjiaCrawlByChrome { def eles = JQueryUtils.select(".deal-bread a", doc) def detail = new BasicDBObject() if(eles && eles.size()>=4){ - detail.city = eles[0].text().replace("房产网","") - detail.region = eles[2].text().replace("二手房成交","") - detail.district_name = eles[eles.size()-1].text().replace("二手房成交","") + detail.city = eles[0].text().replace("鎴夸骇缃�","") + detail.region = eles[2].text().replace("浜屾墜鎴挎垚浜�","") + detail.district_name = eles[eles.size()-1].text().replace("浜屾墜鎴挎垚浜�","") } if(detail.district_name) { def price = JQueryUtils.selectText(".dealTotalPrice i", doc) if (price && price.isNumber()) { detail.total_price = price.toInteger() * 10000 } - def areaStr = JQueryUtils.selectText("li:contains(建筑面积)", doc).replace("建筑面积", "").replace("㎡", "") + def areaStr = JQueryUtils.selectText("li:contains(寤虹瓚闈㈢Н)", doc).replace("寤虹瓚闈㈢Н", "").replace("銕�", "") if (areaStr) { detail.area = areaStr.toDouble() } @@ -530,24 +530,24 @@ public class LianjiaCrawlByChrome { if (detail.total_price && detail.area) { detail.avg_price = (int) (detail.total_price / detail.area) } - def tradeStr = JQueryUtils.selectText(".house-title span", doc).replace("成交", "").trim() + def tradeStr = JQueryUtils.selectText(".house-title span", doc).replace("鎴愪氦", "").trim() if (tradeStr) { detail.trade_date = DateUtils.parseFromTightByPattern(tradeStr, "yyyy.MM.dd") } - detail.source = "链家在线" + detail.source = "閾惧鍦ㄧ嚎" def dbo = findTrade(DEAL_PRICE_COLL, detail) if (!dbo) { - def roomStr = JQueryUtils.selectText("li:contains(房屋户型)", doc).replace("房屋户型", "") + def roomStr = JQueryUtils.selectText("li:contains(鎴垮眿鎴峰瀷)", doc).replace("鎴垮眿鎴峰瀷", "") if (roomStr) { - detail.room = roomStr.substring(0, roomStr.indexOf("室")).toInteger() - detail.hall = roomStr.substring(roomStr.indexOf("室") + 1, roomStr.indexOf("厅")).toInteger() - detail.toilet = roomStr.substring(roomStr.indexOf("卫") - 1, roomStr.indexOf("卫")).toInteger() + detail.room = roomStr.substring(0, roomStr.indexOf("瀹�")).toInteger() + detail.hall = roomStr.substring(roomStr.indexOf("瀹�") + 1, roomStr.indexOf("鍘�")).toInteger() + detail.toilet = roomStr.substring(roomStr.indexOf("鍗�") - 1, roomStr.indexOf("鍗�")).toInteger() } - detail.direction = JQueryUtils.selectText("li:contains(房屋朝向)", doc).replace("房屋朝向", "") - detail.fitment = JQueryUtils.selectText("li:contains(装修情况)", doc).replace("装修情况", "") - def floorStr = JQueryUtils.selectText("li:contains(所在楼层)", doc).replace("所在楼层", "") - if (floorStr && floorStr.contains("共") && floorStr.contains("层)")) { - floorStr = floorStr.substring(floorStr.indexOf("共") + 1, floorStr.indexOf("层)")) + detail.direction = JQueryUtils.selectText("li:contains(鎴垮眿鏈濆悜)", doc).replace("鎴垮眿鏈濆悜", "") + detail.fitment = JQueryUtils.selectText("li:contains(瑁呬慨鎯呭喌)", doc).replace("瑁呬慨鎯呭喌", "") + def floorStr = JQueryUtils.selectText("li:contains(鎵�鍦ㄦゼ灞�)", doc).replace("鎵�鍦ㄦゼ灞�", "") + if (floorStr && floorStr.contains("鍏�") && floorStr.contains("灞�)")) { + floorStr = floorStr.substring(floorStr.indexOf("鍏�") + 1, floorStr.indexOf("灞�)")) if (floorStr && floorStr.isNumber()) { detail.height = floorStr.toInteger() } @@ -583,7 +583,7 @@ public class LianjiaCrawlByChrome { def cityDoc = Jsoup.parse(driver.getPageSource()); def cityEles = JQueryUtils.select(".city_province a", cityDoc) def cityList = [] - def citys= ["福州"] + def citys= ["绂忓窞"] if(cityEles){ for(def e : cityEles) { def href = e.attr("href") @@ -603,11 +603,11 @@ public class LianjiaCrawlByChrome { Thread.sleep(10000) try{ wait.until(ExpectedConditions.visibilityOf(driver.findElement(By.className("username")))); - WebElement elemUsername = driver.findElement(By.id("username")); //获取用户名框 + WebElement elemUsername = driver.findElement(By.id("username")); //鑾峰彇鐢ㄦ埛鍚嶆 - WebElement elemPassword = driver.findElement(By.id("password")); //获取密码框 + WebElement elemPassword = driver.findElement(By.id("password")); //鑾峰彇瀵嗙爜妗� - WebElement btn = driver.findElement(By.cssSelector("button[class='ant-btn btn-login ant-btn-primary']")); //获取点击登陆按钮。 + WebElement btn = driver.findElement(By.cssSelector("button[class='ant-btn btn-login ant-btn-primary']")); //鑾峰彇鐐瑰嚮鐧婚檰鎸夐挳銆� elemUsername.sendKeys("17148854005"); elemPassword.sendKeys("12qwaszx"); @@ -618,14 +618,14 @@ public class LianjiaCrawlByChrome { // elemUsername.sendKeys("16283166371"); // elemPassword.sendKeys("Goojia123456"); - btn.submit(); // 点击行为; + btn.submit(); // 鐐瑰嚮琛屼负锛� Thread.sleep(20000) }catch(Exception e){ driver.close() driver = new ChromeDriver() Thread.sleep(15000) driver = getLogin(driver, url) - println "异常Url:"+url + println "寮傚父Url:"+url } return driver } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/PaimaiDataSend.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/PaimaiDataSend.groovy index f457e323e..7fda292bd 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/PaimaiDataSend.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/PaimaiDataSend.groovy @@ -68,8 +68,8 @@ class PaimaiDataSend { def rmfysszcRun(){ def index = 0 def q = new BasicDBObject() -// q.put("city",new BasicDBObject('$in', ["南京市", "宿迁市", "苏州市"])) - q.put("province","江苏省") +// q.put("city",new BasicDBObject('$in', ["鍗椾含甯�", "瀹胯縼甯�", "鑻忓窞甯�"])) + q.put("province","姹熻嫃鐪�") // q.put("url", "https://www.rmfysszc.gov.cn/statichtml/rm_obj/88061.shtml") def dbcursor = rmfysszc_coll.find(q).batchSize(3000) for(def d : dbcursor){ @@ -103,7 +103,7 @@ class PaimaiDataSend { def jdRunByMongo(){ def pm_q = new BasicDBObject() - pm_q.put("city","宿迁") + pm_q.put("city","瀹胯縼") pm_q.put("mDate", new BasicDBObject('$gte', DateUtils.parseFromTightYYYYMMDD("2022-08-01"))) pm_q.put("mappingStage", null) def dbcursor = paimai43_COLL.find(pm_q).batchSize(1000) @@ -120,7 +120,7 @@ class PaimaiDataSend { def dbcursor = jd_coll.find(q).batchSize(3000) for(def d : dbcursor){ index++ - println "jd:"+index + println "jd锛�"+index JSON json = new JSONObject() json.put("project", "paimai_jd") json.put("url", d.url) @@ -152,15 +152,15 @@ class PaimaiDataSend { def jdRun(){ def index = 0 def q = new BasicDBObject() -// q.put("city",new BasicDBObject('$in', ["南京市", "宿迁市","苏州市"])) - q.put("province","江苏") +// q.put("city",new BasicDBObject('$in', ["鍗椾含甯�", "瀹胯縼甯�","鑻忓窞甯�"])) + q.put("province","姹熻嫃") // q.put("parser_status", new BasicDBObject('$ne',3)) // q.put("url","https://paimai.jd.com/115669796") def dbcursor = jd_coll.find(q).batchSize(3000) def rets = [] for(def d : dbcursor){ index++ - println "jd:"+index + println "jd锛�"+index JSON json = new JSONObject() json.put("project", "paimai_jd") json.put("url", d.url) @@ -182,14 +182,14 @@ class PaimaiDataSend { rets << json if(rets.size()==10000){ - println "共:"+rets.size() + println "鍏憋細"+rets.size() sendJD(rets) rets.clear() } } if(rets.size()>0){ - println "共:"+rets.size() + println "鍏憋細"+rets.size() sendJD(rets) } } @@ -225,9 +225,9 @@ class PaimaiDataSend { def aliZcRun(){ def pm_q = new BasicDBObject() -// pm_q.put("city",new BasicDBObject('$in', ["南京", "宿迁","苏州"])) - pm_q.put("province","江苏") -// pm_q.put("region","姑苏") +// pm_q.put("city",new BasicDBObject('$in', ["鍗椾含", "瀹胯縼","鑻忓窞"])) + pm_q.put("province","姹熻嫃") +// pm_q.put("region","濮戣嫃") // pm_q.put("url","https://sf-item.taobao.com/sf_item/659117468505.htm") // pm_q.put("mDate", new BasicDBObject('$gte', DateUtils.parseFromTightYYYYMMDD("2022-08-01")).append('$lt', DateUtils.parseFromTightYYYYMMDD("2022-09-15"))) pm_q.put("mDate", new BasicDBObject('$lt', DateUtils.parseFromTightYYYYMMDD("2022-10-01"))) @@ -241,7 +241,7 @@ class PaimaiDataSend { // def flag = sendAliZc(d.url) def flag = sendAli(d.url) if(!flag){ - println "不存在:"+d.url + println "涓嶅瓨鍦�:"+d.url } } } @@ -333,12 +333,12 @@ class PaimaiDataSend { def aliFpRun(){ def index = 0 def q = new BasicDBObject() - q.put("province","福建") - q.put("city","福州") - q.put("sub_type" , "住宅用房") -// q.put("city",new BasicDBObject('$in', ["南京","宿迁","苏州"])) + q.put("province","绂忓缓") + q.put("city","绂忓窞") + q.put("sub_type" , "浣忓畢鐢ㄦ埧") +// q.put("city",new BasicDBObject('$in', ["鍗椾含","瀹胯縼","鑻忓窞"])) -// q.put("sub_type","土地") +// q.put("sub_type","鍦熷湴") // q.put("parser_status", new BasicDBObject('$ne',2)) // q.put("url","https://sf-item.taobao.com/sf_item/673646300374.htm") //https://sf-item.taobao.com/sf_item/657131607486.htm @@ -347,14 +347,14 @@ class PaimaiDataSend { // q.put("area", new BasicDBObject('$lt', 30)) def dbcursor = ali_fp_coll.find(q).setOptions(Bytes.QUERYOPTION_NOTIMEOUT).batchSize(100) - println "总记录共:"+dbcursor.count() + println "鎬昏褰曞叡锛�"+dbcursor.count() def rets = [] for(def d : dbcursor){ index++ if(index==119){ - println "测试" + println "娴嬭瘯" } println "ali-fp: "+index JSON json = new JSONObject() @@ -367,7 +367,7 @@ class PaimaiDataSend { def bid_content = net.sf.json.JSONObject.fromObject(d.bid_content) result.put("trades", bid_content) }catch(Exception e){ - println "trades结果格式问题 "+d.url + println "trades缁撴灉鏍煎紡闂 "+d.url } result.put("province", d.province) result.put("city", d.city) @@ -382,14 +382,14 @@ class PaimaiDataSend { rets << json if(rets.size()==1000){ - println "共:"+rets.size() + println "鍏憋細"+rets.size() send(rets) rets.clear() } } if(rets.size()>0){ - println "共:"+rets.size() + println "鍏憋細"+rets.size() send(rets) } } @@ -426,12 +426,12 @@ class PaimaiDataSend { def aliZcRun2(){ def index = 0 def q = new BasicDBObject() -// q.put("city",new BasicDBObject('$in', ["苏州","宿迁","南京"])) -// q.put("city", "上海") - q.put("province","江苏") - q.put("sub_type","土地") +// q.put("city",new BasicDBObject('$in', ["鑻忓窞","瀹胯縼","鍗椾含"])) +// q.put("city", "涓婃捣") + q.put("province","姹熻嫃") + q.put("sub_type","鍦熷湴") // q.put("parser_status", new BasicDBObject('$ne',1)) -// q.put("region","姑苏") +// q.put("region","濮戣嫃") q.put("url","https://susong-item.taobao.com/auction/671320162557.htm") def dbcursor = ali_zc_coll.find(q).batchSize(1000).setOptions(Bytes.QUERYOPTION_NOTIMEOUT) def rets = [] @@ -465,18 +465,18 @@ class PaimaiDataSend { rets << json if(rets.size()==1000){ - println "共:"+rets.size() + println "鍏憋細"+rets.size() send(rets) rets.clear() } } if(rets.size()>0){ - println "共:"+rets.size() + println "鍏憋細"+rets.size() send(rets) } -// println "共:"+rets.size() +// println "鍏憋細"+rets.size() // // def totalCount = new AtomicLong() // final CountDownLatch latch = new CountDownLatch(rets.size()) @@ -508,7 +508,7 @@ class PaimaiDataSend { def paimaiSendToEs(){ def rets = getPaimaiDatas() - println "共:"+rets.size() + println "鍏憋細"+rets.size() def totalCount = new AtomicLong() final CountDownLatch latch = new CountDownLatch(rets.size()) for(def i=0;i list = new ArrayList(); @@ -56,7 +56,7 @@ class PaimaiDataUtil { def area = null; for(def val : list) { - def v = val.replace("平方米", "").replace("㎡", "").replace("平", "").replace("方米", "").replace(",", "").replace("m2", ""); + def v = val.replace("骞虫柟绫�", "").replace("銕�", "").replace("骞�", "").replace("鏂圭背", "").replace(",", "").replace("m2", ""); if(maxArea) { if(v.isDouble()) { if(v.toDouble() < maxArea) { @@ -79,16 +79,16 @@ class PaimaiDataUtil { public static def getPaiMaiType(def s) { if(s) { - if(s.toString().contains("结束")) { - return "成交" - }else if(s.toString().contains("流拍")) { - return "流拍" - }else if(s.toString().contains("撤回")) { - return "撤回" - }else if(s.toString().contains("暂缓")) { - return "暂缓" - }else if(s.toString().contains("失败")) { - return "失败" + if(s.toString().contains("缁撴潫")) { + return "鎴愪氦" + }else if(s.toString().contains("娴佹媿")) { + return "娴佹媿" + }else if(s.toString().contains("鎾ゅ洖")) { + return "鎾ゅ洖" + }else if(s.toString().contains("鏆傜紦")) { + return "鏆傜紦" + }else if(s.toString().contains("澶辫触")) { + return "澶辫触" } } return null; @@ -96,8 +96,8 @@ class PaimaiDataUtil { // public static def getDateRange(def s) { -// s = s.replace("起","") -// Pattern pattern = Pattern.compile('法院将于(\\d+年\\d{1,2}月\\d{1,2}日\\d{0,2}时?)至(\\d+年\\d{1,2}月\\d{1,2}日\\d{0,2}时?)'); +// s = s.replace("璧�","") +// Pattern pattern = Pattern.compile('娉曢櫌灏嗕簬(\\d+骞碶\d{1,2}鏈圽\d{1,2}鏃\d{0,2}鏃�?)鑷�(\\d+骞碶\d{1,2}鏈圽\d{1,2}鏃\d{0,2}鏃�?)'); // Matcher matcher = pattern.matcher(s); // // List list = new ArrayList(); @@ -105,8 +105,8 @@ class PaimaiDataUtil { // def str = matcher.group() // list.add(str); //// if(str) { -//// def indx1 = str.indexOf("年") -//// def indx2 = str.indexOf("月") +//// def indx1 = str.indexOf("骞�") +//// def indx2 = str.indexOf("鏈�") //// def month = str.substring(indx1+1, indx2); //// if(month.toInteger()<12) { //// list.add(str); @@ -115,8 +115,8 @@ class PaimaiDataUtil { // } // if(list.size()>=1) { // String s1 = list.get(0) -// s1 = s1.replace("法院将于", "").replace(" ","") -// def array = s1.split("至"); +// s1 = s1.replace("娉曢櫌灏嗕簬", "").replace(" ","") +// def array = s1.split("鑷�"); // return array // } // return null; @@ -124,7 +124,7 @@ class PaimaiDataUtil { public static def getStartPrice(def s) { - Pattern pattern = Pattern.compile('起拍价:\\d+(.\\d+)?万?元'); + Pattern pattern = Pattern.compile('璧锋媿浠凤細\\d+(.\\d+)?涓�?鍏�'); Matcher matcher = pattern.matcher(s); List list = new ArrayList(); @@ -133,11 +133,11 @@ class PaimaiDataUtil { } if(list.size()>=1) { String s1 = list.get(0) - if(s1.contains("万元")) { - s1 = s1.toString().replace("起拍价:","").replace("万元", "") + if(s1.contains("涓囧厓")) { + s1 = s1.toString().replace("璧锋媿浠凤細","").replace("涓囧厓", "") return (int)(s1.toDouble()*10000) }else { - s1 = s1.toString().replace("起拍价:","").replace("元", "").replace(",","") + s1 = s1.toString().replace("璧锋媿浠凤細","").replace("鍏�", "").replace("锛�","") if(s1.isInteger()) { return s1.toInteger() }else { @@ -161,8 +161,8 @@ class PaimaiDataUtil { } public static def getDateRange(def s) { - s = s.replace("起","") - Pattern pattern = Pattern.compile('法院将于(\\d+年\\d+月\\d+日\\d+时)至(\\d+年\\d+月\\d+日\\d+时)'); + s = s.replace("璧�","") + Pattern pattern = Pattern.compile('娉曢櫌灏嗕簬(\\d+骞碶\d+鏈圽\d+鏃\d+鏃�)鑷�(\\d+骞碶\d+鏈圽\d+鏃\d+鏃�)'); Matcher matcher = pattern.matcher(s); List list = new ArrayList(); @@ -171,8 +171,8 @@ class PaimaiDataUtil { } if(list.size()>=1) { String s1 = list.get(0) - s1 = s1.replace("法院将于", "") - def array = s1.split("至"); + s1 = s1.replace("娉曢櫌灏嗕簬", "") + def array = s1.split("鑷�"); return array } return null; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/PaimaiTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/PaimaiTest.groovy index 36ee62699..627db9c3a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/PaimaiTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/PaimaiTest.groovy @@ -61,21 +61,21 @@ class PaimaiTest { q.put("url", url) def obj = paimai43_COLL.findOne(q) if(obj){ - if(obj.matchName=="中渝国宾城"){ + if(obj.matchName=="涓笣鍥藉鍩�"){ def udata = new BasicDBObject() - udata.put("matchName", "中渝山顶道国宾城") + udata.put("matchName", "涓笣灞遍《閬撳浗瀹惧煄") paimai43_COLL.update(new BasicDBObject('_id', obj._id), new BasicDBObject('$set', udata)) } println url +" "+obj.matchName }else{ - println url +" 不存在" + println url +" 涓嶅瓨鍦�" } } } def jsStat(){ def q = new BasicDBObject() - q.put("city","苏州") + q.put("city","鑻忓窞") def dbcursor = paimai43_COLL.find(q).batchSize(5000).addOption(Bytes.QUERYOPTION_NOTIMEOUT) def rets = [] for(def db : dbcursor){ @@ -110,7 +110,7 @@ class PaimaiTest { def updateFieldPaimai(){ def q = new BasicDBObject() -// q.put("city", new BasicDBObject('$in',["重庆","重庆市"])) +// q.put("city", new BasicDBObject('$in',["閲嶅簡","閲嶅簡甯�"])) def index = 0 def dbcursor = paimai43_COLL.find(q).batchSize(5000).addOption(Bytes.QUERYOPTION_NOTIMEOUT) for(def obj : dbcursor) { @@ -126,8 +126,8 @@ class PaimaiTest { } } -// if(obj.address && obj.address.contains("可贷款")){ -// obj.put("address", obj.address.substring(0,obj.address.indexOf("可贷款"))) +// if(obj.address && obj.address.contains("鍙捶娆�")){ +// obj.put("address", obj.address.substring(0,obj.address.indexOf("鍙捶娆�"))) // paimai43_COLL.update(new BasicDBObject('_id', obj._id), new BasicDBObject('$set', obj)) // } } @@ -145,7 +145,7 @@ class PaimaiTest { continue } - if(!d.proince.contains("重庆")){ + if(!d.proince.contains("閲嶅簡")){ continue } @@ -177,7 +177,7 @@ class PaimaiTest { def stat(){ def q = new BasicDBObject() - q.put("city", new BasicDBObject('$in', ["重庆","重庆市"])) + q.put("city", new BasicDBObject('$in', ["閲嶅簡","閲嶅簡甯�"])) def dbcursor = paimaiResultColl.find(q) def keys = [] for(def db : dbcursor){ @@ -187,7 +187,7 @@ class PaimaiTest { keys << key } // try{ -// def jsonObject = OpenApiClient.addressMatch("重庆", db.address, "property", false, null, null) +// def jsonObject = OpenApiClient.addressMatch("閲嶅簡", db.address, "property", false, null, null) // if(jsonObject != null && jsonObject.precise!=-1) { // db.matchCity = jsonObject.get("city") // db.matchRegion = jsonObject.get("district") @@ -218,7 +218,7 @@ class PaimaiTest { for(def cMap : cityUrls){ driver.get("https:"+cMap.url) def doc = Jsoup.parse(driver.getPageSource()); - def total = JQueryUtils.selectText("span:contains(共有拍品) label", doc) + def total = JQueryUtils.selectText("span:contains(鍏辨湁鎷嶅搧) label", doc) if(total){ def totalPage = getTotalPage(total.toInteger(), 20) @@ -227,7 +227,7 @@ class PaimaiTest { for(def i=1;i<=totalPage;i++){ driver.get("https:"+cMap.url+"&page="+i) doc = Jsoup.parse(driver.getPageSource()); - def detailEles = JQueryUtils.select(".block-wrap:contains(共有拍品) .filt-result-list li .item-tit", doc) + def detailEles = JQueryUtils.select(".block-wrap:contains(鍏辨湁鎷嶅搧) .filt-result-list li .item-tit", doc) for(def ele : detailEles){ def dMap = [:] dMap.proince = cMap.proince @@ -257,7 +257,7 @@ class PaimaiTest { } def getCity(datas, driver){ - def citys = ["上海","北京","天津","重庆"] + def citys = ["涓婃捣","鍖椾含","澶╂触","閲嶅簡"] def cityList = [] for(def data : datas){ driver.get("https:"+data.href) @@ -275,7 +275,7 @@ class PaimaiTest { }else{ def links = JQueryUtils.select(".condition .s-subtab a", doc) for(def ele : links){ - if(!["乌鲁木齐市","克拉玛依市","合肥市","芜湖市","蚌埠市","淮南市","马鞍山市","淮北市","铜陵市"].contains(ele.text())){ + if(!["涔岄瞾鏈ㄩ綈甯�","鍏嬫媺鐜涗緷甯�","鍚堣偉甯�","鑺滄箹甯�","铓屽煚甯�","娣崡甯�","椹瀺灞卞競","娣寳甯�","閾滈櫟甯�"].contains(ele.text())){ def cityMap = [:] cityMap.proince = data.proince cityMap.city = ele.text() @@ -293,7 +293,7 @@ class PaimaiTest { driver.get(url) def doc = Jsoup.parse(driver.getPageSource()); def datas = [] - def keys = [ "天津","上海","重庆","北京","浙江","河北","陕西","山西","新疆","辽宁","吉林","江苏","福建","江西","山东","河南","湖北","湖南","西藏","宁夏","甘肃","广东","安徽","广西","海南","四川","贵州","云南"] + def keys = [ "澶╂触","涓婃捣","閲嶅簡","鍖椾含","娴欐睙","娌冲寳","闄曡タ","灞辫タ","鏂扮枂","杈藉畞","鍚夋灄","姹熻嫃","绂忓缓","姹熻タ","灞变笢","娌冲崡","婀栧寳","婀栧崡","瑗胯棌","瀹佸","鐢樿們","骞夸笢","瀹夊窘","骞胯タ","娴峰崡","鍥涘窛","璐靛窞","浜戝崡"] if(doc){ def eles = JQueryUtils.select(".condition a", doc) for(def e : eles){ @@ -345,7 +345,7 @@ class PaimaiTest { results << obj } // }catch(Exception e){ -// println m.url+" 解析有问题!" +// println m.url+" 瑙f瀽鏈夐棶棰�!" // } } @@ -362,31 +362,31 @@ class PaimaiTest { def status = JQueryUtils.selectText(".time-txt", doc) if(!status) { status = JQueryUtils.selectText(".xq-time1", doc) - if(status=="已经结束") { - status = "已结束" + if(status=="宸茬粡缁撴潫") { + status = "宸茬粨鏉�" } } result.title = title result.status = status - if(title.contains("北京市朝阳区东三环中路7号4号楼28层3201")){ + if(title.contains("鍖椾含甯傛湞闃冲尯涓滀笁鐜腑璺�7鍙�4鍙锋ゼ28灞�3201")){ println title } if(title) { def newStr =title - if(newStr.contains("上海市")) { - newStr = newStr.substring(newStr.indexOf("上海市")+3) + if(newStr.contains("涓婃捣甯�")) { + newStr = newStr.substring(newStr.indexOf("涓婃捣甯�")+3) } - if(newStr.indexOf("】")>-1) { - newStr = newStr.substring(newStr.indexOf("】")+1) + if(newStr.indexOf("銆�")>-1) { + newStr = newStr.substring(newStr.indexOf("銆�")+1) } - result.address = newStr.replace("住宅房 ","") + result.address = newStr.replace("浣忓畢鎴� ","") } if(result.address) { - if(result.address.indexOf("室")>-1) { - result.address = result.address.substring(0, result.address.indexOf("室")+1) + if(result.address.indexOf("瀹�")>-1) { + result.address = result.address.substring(0, result.address.indexOf("瀹�")+1) } @@ -396,8 +396,8 @@ class PaimaiTest { def curPriceStr = JQueryUtils.selectText([".d-m-price"], doc) if(curPriceStr) { curPriceStr = JQueryUtils.selectText([".d-m-price span"], doc) - if(curPriceStr.contains("成交价:")) { - def tradePriceStr = JQueryUtils.selectText([".d-m-price .price-red"], doc).replace("元","") + if(curPriceStr.contains("鎴愪氦浠凤細")) { + def tradePriceStr = JQueryUtils.selectText([".d-m-price .price-red"], doc).replace("鍏�","") if(tradePriceStr) { result.tradePrice = tradePriceStr.toDouble().toInteger() } @@ -407,22 +407,22 @@ class PaimaiTest { curPriceStr = JQueryUtils.selectText(["#ItemArea .red"], doc) if(curPriceStr) { - curPriceStr = curPriceStr.replace(",", "").replace("元","").replace("--","") + curPriceStr = curPriceStr.replace(",", "").replace("鍏�","").replace("--","") result.tradePrice = curPriceStr.toDouble().toInteger() } } - def enrollCount = JQueryUtils.selectText([".peoples-infos span:contains(人报名) b"], doc) + def enrollCount = JQueryUtils.selectText([".peoples-infos span:contains(浜烘姤鍚�) b"], doc) if(enrollCount && enrollCount.isNumber()) { result.enrollCount = enrollCount.toInteger() } - def callCount = JQueryUtils.selectText([".peoples-infos span:contains(人设置提醒) b"], doc) + def callCount = JQueryUtils.selectText([".peoples-infos span:contains(浜鸿缃彁閱�) b"], doc) if(callCount && callCount.isNumber()) { result.callCount = callCount.toInteger() } - def lookCount = JQueryUtils.selectText([".peoples-infos span:contains(人围观) b"], doc) + def lookCount = JQueryUtils.selectText([".peoples-infos span:contains(浜哄洿瑙�) b"], doc) if(lookCount && lookCount.isNumber()) { try{ result.lookCount = lookCount.toInteger() @@ -432,21 +432,21 @@ class PaimaiTest { } - def finishDateStr = JQueryUtils.selectText(["p:contains(拍卖竞价确认时间:)"], doc) - if(finishDateStr && finishDateStr.contains("拍卖竞价确认时间")) { - finishDateStr = finishDateStr.replace("拍卖竞价确认时间:","") + def finishDateStr = JQueryUtils.selectText(["p:contains(鎷嶅崠绔炰环纭鏃堕棿锛�)"], doc) + if(finishDateStr && finishDateStr.contains("鎷嶅崠绔炰环纭鏃堕棿")) { + finishDateStr = finishDateStr.replace("鎷嶅崠绔炰环纭鏃堕棿锛�","") result.finishDate = parseFromTightByPattern(finishDateStr, "yyyy-MM-dd HH:mm:ss"); } def lis = JQueryUtils.select(".d-m-tb table:eq(0) td", doc) if(!lis) { - lis = JQueryUtils.select(".xq-cont204:contains(拍卖方式) li", doc) + lis = JQueryUtils.select(".xq-cont204:contains(鎷嶅崠鏂瑰紡) li", doc) } if(lis && lis.size()) { for(def li : lis) { def str = li.text().toString().replace(" ","") - if(str.contains("起拍价")||str.contains("起始价")) { - def v= str.replace("起拍价:", "").replace("变卖起始价:","").replace("元", "").replace(",", "").replace("--", "") + if(str.contains("璧锋媿浠�")||str.contains("璧峰浠�")) { + def v= str.replace("璧锋媿浠凤細", "").replace("鍙樺崠璧峰浠凤細","").replace("鍏�", "").replace(",", "").replace("--", "") if(v){ if(v.isInteger()) { result.startPrice = v.toInteger() @@ -455,40 +455,40 @@ class PaimaiTest { } } - }else if(str.contains("评估价")) { - def v = str.replace("评估价:", "").replace("元", "").replace(",", "").replace("--", "") + }else if(str.contains("璇勪及浠�")) { + def v = str.replace("璇勪及浠凤細", "").replace("鍏�", "").replace(",", "").replace("--", "") if(v.isInteger()) { result.evaluationPrice = v.toInteger() } - }else if(str.contains("加价幅度")) { - def v = str.replace("加价幅度:", "").replace("元", "").replace(",", "") + }else if(str.contains("鍔犱环骞呭害")) { + def v = str.replace("鍔犱环骞呭害锛�", "").replace("鍏�", "").replace(",", "") if(v) { result.addPrice = v.toInteger() } - }else if(str.contains("保证金")) { - def v = str.replace("保证金:", "").replace("元", "").replace(",", "").replace("--", "") + }else if(str.contains("淇濊瘉閲�")) { + def v = str.replace("淇濊瘉閲戯細", "").replace("鍏�", "").replace(",", "").replace("--", "") if(v) { result.depositPrice = v.toDouble().toInteger() } - }else if(str.contains("延时周期")) { + }else if(str.contains("寤舵椂鍛ㄦ湡")) { - result.delayWeekly = str.replace("延时周期:", "") + result.delayWeekly = str.replace("寤舵椂鍛ㄦ湡锛�", "") - }else if(str.contains("拍卖方式")) { + }else if(str.contains("鎷嶅崠鏂瑰紡")) { - result.type = str.replace("拍卖方式:", "") + result.type = str.replace("鎷嶅崠鏂瑰紡锛�", "") - }else if(str.contains("拍卖次数")) { + }else if(str.contains("鎷嶅崠娆℃暟")) { - result.count = str.replace("拍卖次数:", "") + result.count = str.replace("鎷嶅崠娆℃暟锛�", "") - }else if(str.contains("当前拍卖模式")) { + }else if(str.contains("褰撳墠鎷嶅崠妯″紡")) { - result.mode = str.replace("当前拍卖模式:", "") + result.mode = str.replace("褰撳墠鎷嶅崠妯″紡锛�", "") - }else if(str.contains("在线拍周期:")) { + }else if(str.contains("鍦ㄧ嚎鎷嶅懆鏈燂細")) { - result.onlineWeekly = str.replace("在线拍周期:", "") + result.onlineWeekly = str.replace("鍦ㄧ嚎鎷嶅懆鏈燂細", "") } } @@ -507,57 +507,57 @@ class PaimaiTest { detailMap.put(d_tds[0].text(), d_tds[1].text()) } }else { - if(d_tds[0] && d_tds[0].text().contains("拍品介绍")) { - detailMap.put("拍品介绍", d_tds[0].text().replace("拍品介绍 ", "")) + if(d_tds[0] && d_tds[0].text().contains("鎷嶅搧浠嬬粛")) { + detailMap.put("鎷嶅搧浠嬬粛", d_tds[0].text().replace("鎷嶅搧浠嬬粛 ", "")) } } } - if(detailMap && !detailMap.get("拍品名称")){ + if(detailMap && !detailMap.get("鎷嶅搧鍚嶇О")){ detailMap = [:] for(def tr : trs) { - if(tr.text().contains("拍品名称")){ - def td1 = tr.select("td:contains(拍品名称)+td").text() - detailMap.put("拍品名称", td1) + if(tr.text().contains("鎷嶅搧鍚嶇О")){ + def td1 = tr.select("td:contains(鎷嶅搧鍚嶇О)+td").text() + detailMap.put("鎷嶅搧鍚嶇О", td1) } - if(tr.text().contains("权利来源")){ - def td1 = tr.select("td:contains(权利来源)+td").text() - detailMap.put("权利来源", td1) + if(tr.text().contains("鏉冨埄鏉ユ簮")){ + def td1 = tr.select("td:contains(鏉冨埄鏉ユ簮)+td").text() + detailMap.put("鏉冨埄鏉ユ簮", td1) } - if(tr.text().contains("权证情况")){ - def td1 = tr.select("td:contains(权证情况)+td").text() - detailMap.put("权证情况", td1) + if(tr.text().contains("鏉冭瘉鎯呭喌")){ + def td1 = tr.select("td:contains(鏉冭瘉鎯呭喌)+td").text() + detailMap.put("鏉冭瘉鎯呭喌", td1) } - if(tr.text().contains("拍品所有人")){ - def td1 = tr.select("td:contains(拍品所有人)+td").text() - detailMap.put("拍品所有人", td1) + if(tr.text().contains("鎷嶅搧鎵�鏈変汉")){ + def td1 = tr.select("td:contains(鎷嶅搧鎵�鏈変汉)+td").text() + detailMap.put("鎷嶅搧鎵�鏈変汉", td1) } - if(tr.text().contains("房屋情况")){ - def td1 = tr.select("td:contains(房屋情况)+td").text() - detailMap.put("房屋情况", td1) + if(tr.text().contains("鎴垮眿鎯呭喌")){ + def td1 = tr.select("td:contains(鎴垮眿鎯呭喌)+td").text() + detailMap.put("鎴垮眿鎯呭喌", td1) } - if(tr.text().contains("权利限制情况及瑕疵情况")){ - def td1 = tr.select("td:contains(权利限制情况及瑕疵情况)+td").text() - detailMap.put("权利限制情况及瑕疵情况", td1) + if(tr.text().contains("鏉冨埄闄愬埗鎯呭喌鍙婄憰鐤垫儏鍐�")){ + def td1 = tr.select("td:contains(鏉冨埄闄愬埗鎯呭喌鍙婄憰鐤垫儏鍐�)+td").text() + detailMap.put("鏉冨埄闄愬埗鎯呭喌鍙婄憰鐤垫儏鍐�", td1) } - if(tr.text().contains("拍品介绍")){ - def td1 = tr.select("td:contains(拍品介绍)").text() - detailMap.put("拍品介绍", td1) + if(tr.text().contains("鎷嶅搧浠嬬粛")){ + def td1 = tr.select("td:contains(鎷嶅搧浠嬬粛)").text() + detailMap.put("鎷嶅搧浠嬬粛", td1) } } } result.detailMap = detailMap if(!result.address) { - result.address = detailMap.get("拍品名称") + result.address = detailMap.get("鎷嶅搧鍚嶇О") if(!result.address) { - result.address = detailMap.get("标的名称") + result.address = detailMap.get("鏍囩殑鍚嶇О") } } @@ -577,11 +577,11 @@ class PaimaiTest { result.imgUrls = imgLinks } - def article = JQueryUtils.selectText([".panel-con div:contains(竞买公告)+div"], doc) + def article = JQueryUtils.selectText([".panel-con div:contains(绔炰拱鍏憡)+div"], doc) if(article) { def area = getAreaNumber(article, 5000); if(!area) { - article = JQueryUtils.selectText(".panel-con .d-title2:contains(竞买须知)+div", doc) + article = JQueryUtils.selectText(".panel-con .d-title2:contains(绔炰拱椤荤煡)+div", doc) area = getAreaNumber(article, 5000); } if(area) { @@ -594,9 +594,9 @@ class PaimaiTest { if(!result.tradeAvgPrice ) { - def areaStr = JQueryUtils.selectText(["li:contains(数量/单位)"], doc) + def areaStr = JQueryUtils.selectText(["li:contains(鏁伴噺/鍗曚綅)"], doc) if(areaStr) { - areaStr = areaStr.replace("数量/单位:","").replace("平方米","").replace(",","") + areaStr = areaStr.replace("鏁伴噺/鍗曚綅锛�","").replace("骞虫柟绫�","").replace(",","") if(areaStr) { result.area = areaStr.toDouble() if(result.tradePrice) { @@ -608,12 +608,12 @@ class PaimaiTest { } - def s1 = JQueryUtils.selectText([".panel-con div:contains(竞买公告)+div"], doc) + def s1 = JQueryUtils.selectText([".panel-con div:contains(绔炰拱鍏憡)+div"], doc) if(s1) { def dateRangs = getDateRange(s1) if(dateRangs && dateRangs.size()==2) { - result.startDate = parseFromTightByPattern(dateRangs[0], "yyyy年MM月dd日HH时") - result.finishDate = parseFromTightByPattern(dateRangs[1], "yyyy年MM月dd日HH时") + result.startDate = parseFromTightByPattern(dateRangs[0], "yyyy骞碝M鏈坉d鏃H鏃�") + result.finishDate = parseFromTightByPattern(dateRangs[1], "yyyy骞碝M鏈坉d鏃H鏃�") } } @@ -621,7 +621,7 @@ class PaimaiTest { def el = JQueryUtils.select([".d-block table:eq(1)"], doc) if(!el) { - el = JQueryUtils.select([".d-title:contains(标的物介绍)+div"], doc) + el = JQueryUtils.select([".d-title:contains(鏍囩殑鐗╀粙缁�)+div"], doc) } // result.content = DataUtil.zip(s) @@ -656,7 +656,7 @@ class PaimaiTest { public static def getAreaNumber(def input, def maxArea) { - Pattern pattern = Pattern.compile('\\d+(.\\d+)?(平方米|㎡|m2|方米|平)'); + Pattern pattern = Pattern.compile('\\d+(.\\d+)?(骞虫柟绫硘銕m2|鏂圭背|骞�)'); Matcher matcher = pattern.matcher(input); List list = new ArrayList(); @@ -667,7 +667,7 @@ class PaimaiTest { def area = null; for(def val : list) { - def v = val.replace("平方米", "").replace("㎡", "").replace("平", "").replace("方米", "").replace(",", "").replace("m2", ""); + def v = val.replace("骞虫柟绫�", "").replace("銕�", "").replace("骞�", "").replace("鏂圭背", "").replace(",", "").replace("m2", ""); if(maxArea) { if(v.toDouble() < maxArea) { area = v; @@ -688,16 +688,16 @@ class PaimaiTest { public static def getPaiMaiType(def s) { if(s) { - if(s.toString().contains("结束")) { - return "成交" - }else if(s.toString().contains("流拍")) { - return "流拍" - }else if(s.toString().contains("撤回")) { - return "撤回" - }else if(s.toString().contains("暂缓")) { - return "暂缓" - }else if(s.toString().contains("失败")) { - return "失败" + if(s.toString().contains("缁撴潫")) { + return "鎴愪氦" + }else if(s.toString().contains("娴佹媿")) { + return "娴佹媿" + }else if(s.toString().contains("鎾ゅ洖")) { + return "鎾ゅ洖" + }else if(s.toString().contains("鏆傜紦")) { + return "鏆傜紦" + }else if(s.toString().contains("澶辫触")) { + return "澶辫触" } } return null; @@ -705,8 +705,8 @@ class PaimaiTest { public static def getDateRange(def s) { - s = s.replace("起","") - Pattern pattern = Pattern.compile('法院将于(\\d+年\\d+月\\d+日\\d+时)至(\\d+年\\d+月\\d+日\\d+时)'); + s = s.replace("璧�","") + Pattern pattern = Pattern.compile('娉曢櫌灏嗕簬(\\d+骞碶\d+鏈圽\d+鏃\d+鏃�)鑷�(\\d+骞碶\d+鏈圽\d+鏃\d+鏃�)'); Matcher matcher = pattern.matcher(s); List list = new ArrayList(); @@ -715,8 +715,8 @@ class PaimaiTest { } if(list.size()>=1) { String s1 = list.get(0) - s1 = s1.replace("法院将于", "") - def array = s1.split("至"); + s1 = s1.replace("娉曢櫌灏嗕簬", "") + def array = s1.split("鑷�"); return array } return null; @@ -724,7 +724,7 @@ class PaimaiTest { public static def getStartPrice(def s) { - Pattern pattern = Pattern.compile('起拍价:\\d+(.\\d+)?万?元'); + Pattern pattern = Pattern.compile('璧锋媿浠凤細\\d+(.\\d+)?涓�?鍏�'); Matcher matcher = pattern.matcher(s); List list = new ArrayList(); @@ -733,11 +733,11 @@ class PaimaiTest { } if(list.size()>=1) { String s1 = list.get(0) - if(s1.contains("万元")) { - s1 = s1.toString().replace("起拍价:","").replace("万元", "") + if(s1.contains("涓囧厓")) { + s1 = s1.toString().replace("璧锋媿浠凤細","").replace("涓囧厓", "") return (int)(s1.toDouble()*10000) }else { - s1 = s1.toString().replace("起拍价:","").replace("元", "") + s1 = s1.toString().replace("璧锋媿浠凤細","").replace("鍏�", "") return s1.toInteger() } @@ -756,7 +756,7 @@ class PaimaiTest { ret.each{k,v-> obj.put(k,v) } - obj.source = "公拍网" + obj.source = "鍏媿缃�" if(dbo){ obj.m_date = new Date() paimaiResultColl.update(q, new BasicDBObject('$set', obj)) @@ -774,24 +774,24 @@ class PaimaiTest { } def randomExtractData(){ - def runedcity = ["广州","重庆","南京","佛山","东莞","扬州","镇江","南通","惠州","珠海","连云港","淮安","清远","云浮","上海","深圳","苏州","徐州","盐城","宿迁","肇庆","韶关","汕尾","常州","湛江","泰州","无锡","江门","汕头","中山","合肥","河源","阳江","梅州","茂名","揭阳","福州","潮州"] + def runedcity = ["骞垮窞","閲嶅簡","鍗椾含","浣涘北","涓滆帪","鎵窞","闀囨睙","鍗楅��","鎯犲窞","鐝犳捣","杩炰簯娓�","娣畨","娓呰繙","浜戞诞","涓婃捣","娣卞湷","鑻忓窞","寰愬窞","鐩愬煄","瀹胯縼","鑲囧簡","闊跺叧","姹曞熬","甯稿窞","婀涙睙","娉板窞","鏃犻敗","姹熼棬","姹曞ご","涓北","鍚堣偉","娌虫簮","闃虫睙","姊呭窞","鑼傚悕","鎻槼","绂忓窞","娼窞"] def citys = CommonDatautils.findAllCity() def datas = [] - datas << ["城市", "标地物", "面积", "URL", "结束时间", "成交价"] + datas << ["鍩庡競", "鏍囧湴鐗�", "闈㈢Н", "URL", "缁撴潫鏃堕棿", "鎴愪氦浠�"] for(def c : citys){ if(runedcity.contains(c)){ continue } def q = new BasicDBObject() q.put("city", c) - q.put("status", "已成交") - q.put("estateType","住宅") + q.put("status", "宸叉垚浜�") + q.put("estateType","浣忓畢") q.put("area", new BasicDBObject('$exists', true)) q.put("title",new BasicDBObject('$exists', true) ) def dbcursor = paimai43_COLL.find(q).sort(new BasicDBObject("finishDate",-1)).limit(100) def rows = [] for(def d : dbcursor){ - if(d.title && !d.title.contains("商") && !d.title.contains("铺") && !d.title.contains("车位")){ + if(d.title && !d.title.contains("鍟�") && !d.title.contains("閾�") && !d.title.contains("杞︿綅")){ def date = DateUtils.formatDateByPattern(d.finishDate, "yyyy-MM-dd") rows << [d.city, d.title, d.area, d.url, date, d.tradePrice] } @@ -804,6 +804,6 @@ class PaimaiTest { println c +" "+rows.size() } - ExcelUtils.write("D:\\数据\\北交所\\拍卖案例-住宅-测试.xlsx", datas, "数据1") + ExcelUtils.write("D:\\鏁版嵁\\鍖椾氦鎵�\\鎷嶅崠妗堜緥-浣忓畢-娴嬭瘯.xlsx", datas, "鏁版嵁1") } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/RmfysszcCrawl.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/RmfysszcCrawl.groovy index a7c7dccb2..69e97e98d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/RmfysszcCrawl.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/RmfysszcCrawl.groovy @@ -48,7 +48,7 @@ run(url, driver) def run(url, driver){ def values = getAllCityRegionValue(url, driver) - def finishCity = ["北京市","天津市","张家口市","邯郸市","保定市","邢台市","石家庄市","唐山市","秦皇岛市"] + def finishCity = ["鍖椾含甯�","澶╂触甯�","寮犲鍙e競","閭兏甯�","淇濆畾甯�","閭㈠彴甯�","鐭冲搴勫競","鍞愬北甯�","绉︾殗宀涘競"] for(def m : values){ if(!finishCity.contains(m.city)){ driver.get(url); @@ -132,9 +132,9 @@ def getDetailByRegion(province, city, regions, driver){ while(!stop){ def doc = Jsoup.parse(driver.getPageSource()); links.addAll(getLinks(r.region, doc)) - def eles = JQueryUtils.select("a:contains(下一页)", doc) + def eles = JQueryUtils.select("a:contains(涓嬩竴椤�)", doc) if(eles){ - driver.findElement(By.xpath("//a[contains(text(), '下一页')]")).click() + driver.findElement(By.xpath("//a[contains(text(), '涓嬩竴椤�')]")).click() Thread.sleep(3000) }else{ stop = true; @@ -153,9 +153,9 @@ def getDetailByPage(province, city, region, driver){ while(!stop){ def doc = Jsoup.parse(driver.getPageSource()); links.addAll(getLinks(doc)) - def eles = JQueryUtils.select("a:contains(下一页)", doc) + def eles = JQueryUtils.select("a:contains(涓嬩竴椤�)", doc) if(eles){ - driver.findElement(By.xpath("//a[contains(text(), '下一页')]")).click() + driver.findElement(By.xpath("//a[contains(text(), '涓嬩竴椤�')]")).click() Thread.sleep(3000) }else{ stop = true; @@ -274,16 +274,16 @@ def parse(city, region, url, doc){ } } def statusStr = JQueryUtils.selectText(["#time1"], doc) - if(statusStr && statusStr.contains("状态:")){ - if(statusStr.indexOf("原因")>-1){ - result.statusDesc = statusStr.substring(statusStr.indexOf("原因")+3, statusStr.length()) - result.status = statusStr.substring(statusStr.indexOf("状态:")+3, statusStr.indexOf("原因")-1).replace("状态:","") + if(statusStr && statusStr.contains("鐘舵��:")){ + if(statusStr.indexOf("鍘熷洜")>-1){ + result.statusDesc = statusStr.substring(statusStr.indexOf("鍘熷洜")+3, statusStr.length()) + result.status = statusStr.substring(statusStr.indexOf("鐘舵��:")+3, statusStr.indexOf("鍘熷洜")-1).replace("鐘舵��:","") }else{ if(statusStr.contains("; ")){ - statusStr = statusStr.replace("状态:","") + statusStr = statusStr.replace("鐘舵��:","") result.status = statusStr.substring(0, statusStr.indexOf("; ")) }else{ - result.status = statusStr.replace("状态:","") + result.status = statusStr.replace("鐘舵��:","") } } @@ -291,7 +291,7 @@ def parse(city, region, url, doc){ def enrollCount = JQueryUtils.selectText([".bmnumber"], doc) if(enrollCount) { - enrollCount = enrollCount.replace("人报名","") + enrollCount = enrollCount.replace("浜烘姤鍚�","") if(enrollCount.isInteger()){ result.enrollCount = enrollCount.toInteger() } @@ -300,7 +300,7 @@ def parse(city, region, url, doc){ def callCount = JQueryUtils.selectText([".sc"], doc) if(callCount) { - callCount =callCount.replace("人收藏","") + callCount =callCount.replace("浜烘敹钘�","") if(callCount.isInteger()){ result.callCount = callCount.toInteger() } @@ -308,7 +308,7 @@ def parse(city, region, url, doc){ def lookCount = JQueryUtils.selectText([".hits"], doc) if(lookCount) { - lookCount = lookCount.replace("次围观","") + lookCount = lookCount.replace("娆″洿瑙�","") if(lookCount.isInteger()){ result.lookCount = lookCount.toInteger() } @@ -316,10 +316,10 @@ def parse(city, region, url, doc){ def curPriceStr = JQueryUtils.selectText(["#price div:eq(0)"], doc) - if(curPriceStr && curPriceStr.contains("起拍价")) { - curPriceStr = curPriceStr.replace("起拍价", "").replace("¥","") - if(curPriceStr.contains("万")){ - curPriceStr = curPriceStr.replace("万元","").replace("万","") + if(curPriceStr && curPriceStr.contains("璧锋媿浠�")) { + curPriceStr = curPriceStr.replace("璧锋媿浠�", "").replace("锟�","") + if(curPriceStr.contains("涓�")){ + curPriceStr = curPriceStr.replace("涓囧厓","").replace("涓�","") if(curPriceStr.isInteger()){ result.startPrice = curPriceStr.toInteger()*10000 }else{ @@ -330,8 +330,8 @@ def parse(city, region, url, doc){ def tradePriceStr = JQueryUtils.selectText([".ti"], doc) - if(tradePriceStr && tradePriceStr.contains("成交价")) { - tradePriceStr = tradePriceStr.replace("成交价:", "").replace("万元", "") + if(tradePriceStr && tradePriceStr.contains("鎴愪氦浠�")) { + tradePriceStr = tradePriceStr.replace("鎴愪氦浠�:", "").replace("涓囧厓", "") if(tradePriceStr.isInteger()){ result.tradePrice = tradePriceStr.toInteger()*10000 }else{ @@ -341,7 +341,7 @@ def parse(city, region, url, doc){ def tableEles = JQueryUtils.select("#bg1", doc) if(tableEles){ - def evaluatePriceStr = tableEles.select("td:contains(值:)").text() + def evaluatePriceStr = tableEles.select("td:contains(鍊�:)").text() if(evaluatePriceStr && evaluatePriceStr.contains(":")){ def arrs = evaluatePriceStr.split(":") if(arrs.size()==2){ @@ -349,7 +349,7 @@ def parse(city, region, url, doc){ } } - def depositPriceStr = tableEles.select("td:contains(金:)").text() + def depositPriceStr = tableEles.select("td:contains(閲�:)").text() if(depositPriceStr && depositPriceStr.contains(":")){ def arrs = depositPriceStr.split(":") if(arrs.size()==2){ @@ -357,24 +357,24 @@ def parse(city, region, url, doc){ } } if(depositPriceStr){ - depositPriceStr = depositPriceStr.replace("万元","") + depositPriceStr = depositPriceStr.replace("涓囧厓","") if(depositPriceStr.toString().isNumber()){ result.depositPrice = depositPriceStr.toDouble()*10000 } } - def courtStr = tableEles.select("td:contains(院:)").text() + def courtStr = tableEles.select("td:contains(闄�:)").text() if(courtStr && courtStr.contains(":")){ result.court = courtStr.substring(courtStr.indexOf(":")+1, courtStr.size()) } - def personStr = tableEles.select("td:contains(人:)").text() + def personStr = tableEles.select("td:contains(浜�:)").text() if(personStr && personStr.contains(":")){ result.person = personStr.substring(personStr.indexOf(":")+1, personStr.size()) } - def countStr = tableEles.select("td:contains(拍卖阶段:)").text().replace("拍卖阶段:","") - if(countStr && countStr.contains("第") && countStr.contains("次")){ - result.count = countStr.substring(countStr.indexOf("第")+1, countStr.indexOf("次")) + def countStr = tableEles.select("td:contains(鎷嶅崠闃舵:)").text().replace("鎷嶅崠闃舵:","") + if(countStr && countStr.contains("绗�") && countStr.contains("娆�")){ + result.count = countStr.substring(countStr.indexOf("绗�")+1, countStr.indexOf("娆�")) } } @@ -382,8 +382,8 @@ def parse(city, region, url, doc){ if(lis && lis.size()) { for(def li : lis) { def str = li.select("span").text() - if(str.contains("评估值")) { - def v = li.select("span:eq(1)").text().replace("万元", "") + if(str.contains("璇勪及鍊�")) { + def v = li.select("span:eq(1)").text().replace("涓囧厓", "") if(v.isNumber()){ if(v.isInteger()) { result.evaluationPrice = v.toInteger()*10000 @@ -392,8 +392,8 @@ def parse(city, region, url, doc){ } } - }else if(str.contains("保证金")) { - def v = li.select("span:eq(1)").text().replace("万元", "") + }else if(str.contains("淇濊瘉閲�")) { + def v = li.select("span:eq(1)").text().replace("涓囧厓", "") if(v.isNumber()) { if (v) { if (v.isInteger()) { @@ -403,8 +403,8 @@ def parse(city, region, url, doc){ } } } - }else if (str.contains("公告日期:")){ - str = str.replace("公告日期:","") + }else if (str.contains("鍏憡鏃ユ湡:")){ + str = str.replace("鍏憡鏃ユ湡:","") result.finishDate = DateUtils.parseFromTightByPattern(str, "yyyy.MM.dd"); } } @@ -418,7 +418,7 @@ def parse(city, region, url, doc){ for(def tr : trs) { def d_tds = tr.select("td") - if(tr.text().contains("调查情况表")){ + if(tr.text().contains("璋冩煡鎯呭喌琛�")){ continue } if(d_tds.size()>1){ @@ -443,16 +443,16 @@ def parse(city, region, url, doc){ } } }else { - if(d_tds[0] && d_tds[0].text().contains("拍品介绍")) { - detailMap.put("拍品介绍", d_tds[0].text().replace("拍品介绍 ", "")) + if(d_tds[0] && d_tds[0].text().contains("鎷嶅搧浠嬬粛")) { + detailMap.put("鎷嶅搧浠嬬粛", d_tds[0].text().replace("鎷嶅搧浠嬬粛 ", "")) } } } result.detailMap = detailMap if(!result.address) { - result.address = detailMap.get("拍品名称") + result.address = detailMap.get("鎷嶅搧鍚嶇О") if(!result.address) { - result.address = detailMap.get("标的名称") + result.address = detailMap.get("鏍囩殑鍚嶇О") } } } @@ -489,15 +489,15 @@ def parse(city, region, url, doc){ def s1 = JQueryUtils.selectText(["#pmgg"], doc) if(s1) { - def start = s1.indexOf("法院将于") - def end = s1.indexOf("止") + def start = s1.indexOf("娉曢櫌灏嗕簬") + def end = s1.indexOf("姝�") if(start>-1 && end>-1 && end>start){ - s1 = s1.substring(s1.indexOf("法院将于"), s1.indexOf("止")) + s1 = s1.substring(s1.indexOf("娉曢櫌灏嗕簬"), s1.indexOf("姝�")) } def dateRangs = PaimaiDataUtil.getDateRange(s1) if(dateRangs && dateRangs.size()==2) { - result.startDate = PaimaiDataUtil.parseFromTightByPattern(dateRangs[0], "yyyy年MM月dd日HH时") - result.finishDate = PaimaiDataUtil.parseFromTightByPattern(dateRangs[1], "yyyy年MM月dd日HH时") + result.startDate = PaimaiDataUtil.parseFromTightByPattern(dateRangs[0], "yyyy骞碝M鏈坉d鏃H鏃�") + result.finishDate = PaimaiDataUtil.parseFromTightByPattern(dateRangs[1], "yyyy骞碝M鏈坉d鏃H鏃�") } } @@ -533,7 +533,7 @@ def saveToDB(rets){ ret.each{k,v-> obj.put(k,v) } - obj.source= "人民法院诉讼资产网" + obj.source= "浜烘皯娉曢櫌璇夎璧勪骇缃�" try{ if(dbo){ obj.m_date = new Date() @@ -550,7 +550,7 @@ def saveToDB(rets){ } def getAreaNumber(input, maxArea) { - Pattern pattern = Pattern.compile('\\d+(.\\d+)?(平方米|㎡|m2|方米|平)'); + Pattern pattern = Pattern.compile('\\d+(.\\d+)?(骞虫柟绫硘銕m2|鏂圭背|骞�)'); Matcher matcher = pattern.matcher(input); List list = new ArrayList(); @@ -561,7 +561,7 @@ def getAreaNumber(input, maxArea) { def area = null; for (def val : list) { - def v = val.replace("平方米", "").replace("㎡", "").replace("平", "").replace("方米", "").replace(",", "").replace("m2", ""); + def v = val.replace("骞虫柟绫�", "").replace("銕�", "").replace("骞�", "").replace("鏂圭背", "").replace(",", "").replace("m2", ""); if(v && v.isNumber()){ if (maxArea) { if (v.toDouble() < maxArea) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/TaobaoPaimaiCrawl.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/TaobaoPaimaiCrawl.groovy index 68b73d58e..47765d159 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/TaobaoPaimaiCrawl.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/TaobaoPaimaiCrawl.groovy @@ -25,7 +25,7 @@ class TaobaoPaimaiCrawl { def getAllCityRegions(driver, url){ def provinces = getAllProvince(driver, url) - def citys = ["天津","上海","北京","重庆"] + def citys = ["澶╂触","涓婃捣","鍖椾含","閲嶅簡"] for(def province : provinces){ driver.findElement(By.xpath("//a[contains(text(), '${province}')]")).click() @@ -81,7 +81,7 @@ class TaobaoPaimaiCrawl { driver.get(url); Thread.sleep(100000) def doc = Jsoup.parse(driver.getPageSource()); - def eles= JQueryUtils.select("li:contains(标的物类型) .condition li a", doc) + def eles= JQueryUtils.select("li:contains(鏍囩殑鐗╃被鍨�) .condition li a", doc) def provinces = [] for(def e : eles){ def province = e.text() @@ -108,15 +108,15 @@ class TaobaoPaimaiCrawl { } if (title) { - def addr = title.toString().replace("本场拍卖已", "").replace(" !", "") - if (addr && addr.indexOf("室") > -1) { - result.address = addr.substring(0, addr.indexOf("室") + 1) + def addr = title.toString().replace("鏈満鎷嶅崠宸�", "").replace(" 锛�", "") + if (addr && addr.indexOf("瀹�") > -1) { + result.address = addr.substring(0, addr.indexOf("瀹�") + 1) } else { result.address = addr } if (result.city) { - if (result.address.contains(city + "市")) { + if (result.address.contains(city + "甯�")) { result.address = result.address.substring(result.address.indexOf(city) + city.length() + 1) } else { result.address = result.address.substring(result.address.indexOf(city) + city.length()) @@ -124,8 +124,8 @@ class TaobaoPaimaiCrawl { } - if (result.address.indexOf("】") > -1) { - result.address = result.address.substring(result.address.indexOf("】") + 1) + if (result.address.indexOf("銆�") > -1) { + result.address = result.address.substring(result.address.indexOf("銆�") + 1) } @@ -142,7 +142,7 @@ class TaobaoPaimaiCrawl { } } if (statusDesc) { - def status = statusDesc.substring(statusDesc.indexOf("本场拍卖") + 5, statusDesc.length() - 1) + def status = statusDesc.substring(statusDesc.indexOf("鏈満鎷嶅崠") + 5, statusDesc.length() - 1) result.status = DataUtil.getPaiMaiType(status) result.statusDesc = statusDesc } @@ -151,14 +151,14 @@ class TaobaoPaimaiCrawl { if (statusEle) { def sEle = JQueryUtils.select(".status-ing", doc) if (sEle) { - result.status = "进行中" + result.status = "杩涜涓�" } else { - result.status = "即将开始" + result.status = "鍗冲皢寮�濮�" } } def curPrice = JQueryUtils.selectText(["#sf-price"], doc) if (curPrice) { - if (curPrice.contains("当前价")) { + if (curPrice.contains("褰撳墠浠�")) { curPrice = JQueryUtils.selectText(["#sf-price .J_Price em:eq(0)"], doc) if (curPrice) { curPrice = curPrice.replace(",", "") @@ -168,7 +168,7 @@ class TaobaoPaimaiCrawl { result.curPrice = (int) (curPrice.toDouble()) } } - } else if (curPrice.contains("成交价")) { + } else if (curPrice.contains("鎴愪氦浠�")) { def tradePrice = JQueryUtils.selectText(["#sf-price .J_Price em:eq(0)"], doc) if (tradePrice) { tradePrice = tradePrice.replace(",", "") @@ -179,7 +179,7 @@ class TaobaoPaimaiCrawl { } } - } else if (curPrice.contains("起拍价")) { + } else if (curPrice.contains("璧锋媿浠�")) { def startPrice = JQueryUtils.selectText(["#sf-price .J_Price em:eq(0)"], doc) if (startPrice) { startPrice = startPrice.replace(",", "") @@ -195,12 +195,12 @@ class TaobaoPaimaiCrawl { def finishStr = JQueryUtils.selectText([".pm-bid-eyebrow .over-title"], doc) if (finishStr) { - if (finishStr.contains("结束时间")) { + if (finishStr.contains("缁撴潫鏃堕棿")) { finishStr = JQueryUtils.select([".pm-main .J_TimeLeft"], doc).text() if (finishStr) { result.finishDate = DateUtils.parseFromTightByPattern(finishStr, "yyyy/MM/dd HH:mm:ss") } - } else if (finishStr.contains("成交时间")) { + } else if (finishStr.contains("鎴愪氦鏃堕棿")) { finishStr = JQueryUtils.select([".pm-main .J_TimeLeft"], doc).text() if (finishStr) { result.finishDate = DateUtils.parseFromTightByPattern(finishStr, "yyyy/MM/dd HH:mm:ss") @@ -227,7 +227,7 @@ class TaobaoPaimaiCrawl { for (def td : tds) { def str = JQueryUtils.selectText("span:eq(0)", td).replace(" ", "") if (str) { - if (str.contains("变卖价")) { + if (str.contains("鍙樺崠浠�")) { def str1 = td.select(".J_Price").text() def str2 = td.select(".J_Price .J_Price-tip").text() def p = str1.replace(str2, "").replace(",", "") @@ -239,7 +239,7 @@ class TaobaoPaimaiCrawl { } } - } else if (str.contains("加价幅度")) { + } else if (str.contains("鍔犱环骞呭害")) { def str1 = td.select(".J_Price").text() def str2 = td.select(".J_Price .J_Price-tip").text() def p = str1.replace(str2, "").replace(",", "") @@ -251,11 +251,11 @@ class TaobaoPaimaiCrawl { } } - } else if (str.contains("类型")) { + } else if (str.contains("绫诲瀷")) { result.type = td.select(".pay-type").text() - } else if (str.contains("保证金")) { + } else if (str.contains("淇濊瘉閲�")) { def str1 = td.select(".J_Price").text() def str2 = td.select(".J_Price .J_Price-tip").text() def p = str1.replace(str2, "").replace(",", "") @@ -266,19 +266,19 @@ class TaobaoPaimaiCrawl { result.depositPrice = (int) (p.toDouble()) } } - } else if (str.contains("变卖周期")) { + } else if (str.contains("鍙樺崠鍛ㄦ湡")) { result.sellOffWeekly = td.select("span:eq(1)").text().replace(": ", "") - } else if (str.contains("竞价周期")) { + } else if (str.contains("绔炰环鍛ㄦ湡")) { result.pricePkWeekly = td.select("span:eq(1)").text().replace(": ", "") - } else if (str.contains("优先购买权")) { + } else if (str.contains("浼樺厛璐拱鏉�")) { result.preemptivePerson = td.select("span:eq(1)").text().replace(": ", "") - } else if (str.contains("变卖预缴款")) { + } else if (str.contains("鍙樺崠棰勭即娆�")) { def str1 = td.select("span:eq(1) .J_Price").text() def str2 = td.select("span:eq(1) .J_Price .J_Price-tip").text() def p = str1.replace(str2, "").replace(",", "") @@ -290,7 +290,7 @@ class TaobaoPaimaiCrawl { } } - } else if (str.contains("评估价")) { + } else if (str.contains("璇勪及浠�")) { def str1 = td.select(".J_Price").text() def str2 = td.select(".J_Price .J_Price-tip").text() def p = str1.replace(str2, "").replace(",", "") @@ -301,11 +301,11 @@ class TaobaoPaimaiCrawl { result.evaluationPrice = (int) (p.toDouble()) } } - } else if (str.contains("延时周期")) { + } else if (str.contains("寤舵椂鍛ㄦ湡")) { result.delayWeekly = td.select("span:eq(1)").text().replace(": ", "") - } else if (str.contains("起拍价")) { + } else if (str.contains("璧锋媿浠�")) { def str1 = td.select(".J_Price").text() def str2 = td.select(".J_Price .J_Price-tip").text() def p = str1.replace(str2, "").replace(",", "") @@ -335,8 +335,8 @@ class TaobaoPaimaiCrawl { detailMap.put(d_tds[0].text(), d_tds[1].text()) } } else { - if (d_tds[0] && d_tds[0].text().contains("拍品介绍")) { - detailMap.put("拍品介绍", d_tds[0].text().replace("拍品介绍 ", "")) + if (d_tds[0] && d_tds[0].text().contains("鎷嶅搧浠嬬粛")) { + detailMap.put("鎷嶅搧浠嬬粛", d_tds[0].text().replace("鎷嶅搧浠嬬粛 ", "")) } } } @@ -346,9 +346,9 @@ class TaobaoPaimaiCrawl { } if (!result.address) { - result.address = detailMap.get("拍品名称") + result.address = detailMap.get("鎷嶅搧鍚嶇О") if (!result.address) { - result.address = detailMap.get("标的名称") + result.address = detailMap.get("鏍囩殑鍚嶇О") } } @@ -370,7 +370,7 @@ class TaobaoPaimaiCrawl { } } - //面积 + //闈㈢Н def article = JQueryUtils.selectText(["#J_ItemNotice"], doc) if (article) { def area = DataUtil.getAreaNumber(article, 5000) @@ -402,16 +402,16 @@ class TaobaoPaimaiCrawl { for (def j = 0; j < dateRangs.size(); j++) { def date = dateRangs[j] def pattern = null - if (date.endsWith("日时") || date.endsWith("日")) { - pattern = "yyyy年MM月dd日" + if (date.endsWith("鏃ユ椂") || date.endsWith("鏃�")) { + pattern = "yyyy骞碝M鏈坉d鏃�" } else { - def ind = date.indexOf("日") - if (date.indexOf("时") == -1 && date.toString().length() > ind + 1) { - date = date + "时" + def ind = date.indexOf("鏃�") + if (date.indexOf("鏃�") == -1 && date.toString().length() > ind + 1) { + date = date + "鏃�" } - pattern = "yyyy年MM月dd日HH时" + pattern = "yyyy骞碝M鏈坉d鏃H鏃�" } if (j == 0) { result.startDate = DateUtils.parseFromTightByPattern(date, pattern) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/TaobaoPaimaiCrawl2.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/TaobaoPaimaiCrawl2.groovy index 8e5c57a99..b55559beb 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/TaobaoPaimaiCrawl2.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/TaobaoPaimaiCrawl2.groovy @@ -153,7 +153,7 @@ def parse(detailUrls){ if(document){ def ret = parseContent(url, document) save(ret) - println index+" 保存!" + println index+" 淇濆瓨锛�" } } } @@ -179,19 +179,19 @@ def parseContent(url, doc){ result.title = title; if(title) { - def addr = title.toString().replace("本场拍卖已","").replace(" !",""); - if(addr && addr.indexOf("室")>-1) { - result.address = addr.substring(0, addr.indexOf("室")+1) + def addr = title.toString().replace("鏈満鎷嶅崠宸�","").replace(" 锛�",""); + if(addr && addr.indexOf("瀹�")>-1) { + result.address = addr.substring(0, addr.indexOf("瀹�")+1) }else { result.address = addr } - if(result.address.indexOf("】")>-1) { - result.address = result.address.substring(result.address.indexOf("】")+1) + if(result.address.indexOf("銆�")>-1) { + result.address = result.address.substring(result.address.indexOf("銆�")+1) } - def rMap = OpenApiUtils.matchDistrict("三亚",result.address) + def rMap = OpenApiUtils.matchDistrict("涓変簹",result.address) if(rMap) { result.matchCity = rMap.matchCity result.matchRegion = rMap.matchRegion @@ -201,7 +201,7 @@ def parseContent(url, doc){ } if(statusDesc) { - def status = statusDesc.substring(statusDesc.indexOf("本场拍卖")+5, statusDesc.length()-1) + def status = statusDesc.substring(statusDesc.indexOf("鏈満鎷嶅崠")+5, statusDesc.length()-1) result.status = PaimaiDataUtil.getPaiMaiType(status) result.statusDesc = statusDesc } @@ -210,14 +210,14 @@ def parseContent(url, doc){ if(statusEle) { def sEle = JQueryUtils.select(".status-ing", doc) if(sEle) { - result.status = "正在进行" + result.status = "姝e湪杩涜" }else { - result.status = "即将开始" + result.status = "鍗冲皢寮�濮�" } } def curPrice = JQueryUtils.selectText(["#sf-price"], doc) if(curPrice) { - if(curPrice.contains("当前价")) { + if(curPrice.contains("褰撳墠浠�")) { curPrice = JQueryUtils.selectText(["#sf-price .J_Price em:eq(0)"], doc) if(curPrice) { curPrice = curPrice.replace(",","") @@ -227,7 +227,7 @@ def parseContent(url, doc){ result.curPrice = (int)(curPrice.toDouble()) } } - }else if(curPrice.contains("成交价")) { + }else if(curPrice.contains("鎴愪氦浠�")) { def tradePrice = JQueryUtils.selectText(["#sf-price .J_Price em:eq(0)"], doc) if(tradePrice) { tradePrice = tradePrice.replace(",","") @@ -238,7 +238,7 @@ def parseContent(url, doc){ } } - }else if(curPrice.contains("起拍价")) { + }else if(curPrice.contains("璧锋媿浠�")) { def startPrice = JQueryUtils.selectText(["#sf-price .J_Price em:eq(0)"], doc) if(startPrice) { startPrice = startPrice.replace(",","") @@ -254,12 +254,12 @@ def parseContent(url, doc){ def finishStr = JQueryUtils.selectText([".pm-bid-eyebrow .over-title"], doc) if(finishStr) { - if(finishStr.contains("结束时间")) { + if(finishStr.contains("缁撴潫鏃堕棿")) { finishStr = JQueryUtils.select([".pm-main .J_TimeLeft"], doc).text() if(finishStr) { result.finishDate = DateUtils.parseFromTightByPattern(finishStr, "yyyy/MM/dd HH:mm:ss"); } - }else if(finishStr.contains("成交时间")) { + }else if(finishStr.contains("鎴愪氦鏃堕棿")) { finishStr = JQueryUtils.select([".pm-main .J_TimeLeft"], doc).text() if(finishStr) { result.finishDate = DateUtils.parseFromTightByPattern(finishStr, "yyyy/MM/dd HH:mm:ss"); @@ -288,7 +288,7 @@ def parseContent(url, doc){ for(def td : tds) { def str = JQueryUtils.selectText("span:eq(0)", td).replace(" ",""); if(str) { - if(str.contains("变卖价")) { + if(str.contains("鍙樺崠浠�")) { def str1 = td.select(".J_Price").text() def str2 = td.select(".J_Price .J_Price-tip").text() def p = str1.replace(str2, "").replace(",", "") @@ -300,7 +300,7 @@ def parseContent(url, doc){ } } - }else if(str.contains("加价幅度")) { + }else if(str.contains("鍔犱环骞呭害")) { def str1 = td.select(".J_Price").text() def str2 = td.select(".J_Price .J_Price-tip").text() def p = str1.replace(str2, "").replace(",", "") @@ -312,11 +312,11 @@ def parseContent(url, doc){ } } - }else if(str.contains("类型")) { + }else if(str.contains("绫诲瀷")) { result.type = td.select(".pay-type").text() - }else if(str.contains("保证金")) { + }else if(str.contains("淇濊瘉閲�")) { def str1 = td.select(".J_Price").text() def str2 = td.select(".J_Price .J_Price-tip").text() def p = str1.replace(str2, "").replace(",", "") @@ -327,19 +327,19 @@ def parseContent(url, doc){ result.depositPrice = (int)(p.toDouble()) } } - }else if(str.contains("变卖周期")) { + }else if(str.contains("鍙樺崠鍛ㄦ湡")) { result.sellOffWeekly = td.select("span:eq(1)").text().replace(": ","") - }else if(str.contains("竞价周期")){ + }else if(str.contains("绔炰环鍛ㄦ湡")){ result.pricePkWeekly = td.select("span:eq(1)").text().replace(": ","") - }else if(str.contains("优先购买权")) { + }else if(str.contains("浼樺厛璐拱鏉�")) { result.preemptivePerson= td.select("span:eq(1)").text().replace(": ","") - }else if(str.contains("变卖预缴款")) { + }else if(str.contains("鍙樺崠棰勭即娆�")) { def str1 = td.select("span:eq(1) .J_Price").text() def str2 = td.select("span:eq(1) .J_Price .J_Price-tip").text() def p = str1.replace(str2, "").replace(",", "") @@ -351,7 +351,7 @@ def parseContent(url, doc){ } } - }else if(str.contains("评估价")) { + }else if(str.contains("璇勪及浠�")) { def str1 = td.select(".J_Price").text() def str2 = td.select(".J_Price .J_Price-tip").text() def p = str1.replace(str2, "").replace(",", "") @@ -362,11 +362,11 @@ def parseContent(url, doc){ result.evaluationPrice = (int)(p.toDouble()) } } - }else if(str.contains("延时周期")) { + }else if(str.contains("寤舵椂鍛ㄦ湡")) { result.delayWeekly = td.select("span:eq(1)").text().replace(": ","") - }else if(str.contains("起拍价")) { + }else if(str.contains("璧锋媿浠�")) { def str1 = td.select(".J_Price").text() def str2 = td.select(".J_Price .J_Price-tip").text() def p = str1.replace(str2, "").replace(",", "") @@ -396,8 +396,8 @@ def parseContent(url, doc){ detailMap.put(d_tds[0].text(), d_tds[1].text()) } }else { - if(d_tds[0] && d_tds[0].text().contains("拍品介绍")) { - detailMap.put("拍品介绍", d_tds[0].text().replace("拍品介绍 ", "")) + if(d_tds[0] && d_tds[0].text().contains("鎷嶅搧浠嬬粛")) { + detailMap.put("鎷嶅搧浠嬬粛", d_tds[0].text().replace("鎷嶅搧浠嬬粛 ", "")) } } } @@ -407,9 +407,9 @@ def parseContent(url, doc){ } if(!result.address) { - result.address = detailMap.get("拍品名称") + result.address = detailMap.get("鎷嶅搧鍚嶇О") if(!result.address) { - result.address = detailMap.get("标的名称") + result.address = detailMap.get("鏍囩殑鍚嶇О") } } @@ -431,7 +431,7 @@ def parseContent(url, doc){ } } - //面积 + //闈㈢Н def article = JQueryUtils.selectText(["#J_ItemNotice"], doc) if(article) { def area = PaimaiDataUtil.getAreaNumber(article, 5000); @@ -464,16 +464,16 @@ def parseContent(url, doc){ for(def j=0;jind+1) { - date = date +"时" + def ind = date.indexOf("鏃�") + if(date.indexOf("鏃�")==-1 && date.toString().length()>ind+1) { + date = date +"鏃�" } - pattern = "yyyy年MM月dd日HH时" + pattern = "yyyy骞碝M鏈坉d鏃H鏃�" } if(j==0) { result.startDate = DateUtils.parseFromTightByPattern(date, pattern) @@ -489,7 +489,7 @@ def parseContent(url, doc){ } result.introduce = JQueryUtils.select(["#J_desc table"], doc).toString() result.url = url - result.city = "三亚" + result.city = "涓変簹" result.mDate = new Date(); return result; } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/Worker.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/Worker.groovy index 72d9c4559..4a4592f77 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/Worker.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/Worker.groovy @@ -5,8 +5,8 @@ import org.openqa.selenium.chrome.ChromeDriver class Worker { private ChromeDriver driver; /** - * 状态修改要让其他线程可见 - * 1就绪 2运行 + * 鐘舵�佷慨鏀硅璁╁叾浠栫嚎绋嬪彲瑙� + * 1灏辩华 2杩愯 */ private volatile int status; 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 2d19f3778..6761935c8 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 @@ -15,7 +15,7 @@ import java.util.concurrent.ExecutorService import java.util.concurrent.Executors import java.util.concurrent.atomic.AtomicLong /** - * 价格对比,第三方,成交,建行价格,自已家价格 + * 浠锋牸瀵规瘮锛岀涓夋柟锛屾垚浜わ紝寤鸿浠锋牸锛岃嚜宸插浠锋牸 */ class AddPriceTest { @@ -28,7 +28,7 @@ class AddPriceTest { // def pgsqlInstance = Sql.newInstance("jdbc:postgresql://192.168.0.236:5432/warehouse", // "postgres", "postgres", "org.postgresql.Driver") - //235为房价网内部计算均价的库 + //235涓烘埧浠风綉鍐呴儴璁$畻鍧囦环鐨勫簱 def pgsqlInstance235 = Sql.newInstance("jdbc:postgresql://192.168.0.235:5433/fangjia?stringtype=unspecified", "postgres", "Goojia123456", "org.postgresql.Driver") @@ -41,14 +41,14 @@ class AddPriceTest { } def run(){ -// def districts = CommonDatautils.findAllDistrictsFromMg("西安","district", ["_id","city","region", "name", "lng","lat", "build_date", "household_count"]) +// def districts = CommonDatautils.findAllDistrictsFromMg("瑗垮畨","district", ["_id","city","region", "name", "lng","lat", "build_date", "household_count"]) // def rets = [] -// rets << ["id","城市","区域","名称","经度","纬度","户数","建成年代","价格","可信度"] +// rets << ["id","鍩庡競","鍖哄煙","鍚嶇О","缁忓害","绾害","鎴锋暟","寤烘垚骞翠唬","浠锋牸","鍙俊搴�"] // for(def d : districts){ // rets << [d._id.toString(), d.city, d.region,d.name,d.lng/10000000000.0, d.lat/10000000000.0, d.household_count, d.build_date] // } -// ExcelUtils.write("d:\\数据\\数据建设\\西安楼盘.xlsx", rets, "西安") - def filePath = "d:\\数据\\数据建设\\西安楼盘.xlsx" +// ExcelUtils.write("d:\\鏁版嵁\\鏁版嵁寤鸿\\瑗垮畨妤肩洏.xlsx", rets, "瑗垮畨") + def filePath = "d:\\鏁版嵁\\鏁版嵁寤鸿\\瑗垮畨妤肩洏.xlsx" // addGXDPrice(filePath) addCcbPrice(filePath) @@ -57,7 +57,7 @@ class AddPriceTest { // exportPkPrice() // addRegion() // addTradePrice(filePath) -// addThirdSamplePrice("D:\\数据\\建行\\房产估值\\指导价\\级联、国信达价格导入_0313.xlsx") +// addThirdSamplePrice("D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鎸囧浠穃\绾ц仈銆佸浗淇¤揪浠锋牸瀵煎叆_0313.xlsx") } @@ -71,7 +71,7 @@ class AddPriceTest { o.put("isGuidancePrice" , 0) o.put("category", "district") o.put("c_date" , new Date()) - o.put("user_name" , "房价网") + o.put("user_name" , "鎴夸环缃�") if(d['B']){ o.put("price", d['B'].toString().toDouble().toInteger()) @@ -117,14 +117,14 @@ class AddPriceTest { } def addRegion(){ - ExcelUtils.multiThreadingModify("D:\\数据\\上海农总行\\江苏省价格比对超20%的小区.xlsx",{d-> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\涓婃捣鍐滄�昏\\姹熻嫃鐪佷环鏍兼瘮瀵硅秴20%鐨勫皬鍖�.xlsx",{d-> def dist = CommonDatautils.findDistrictById(d['A']) d['C'] = dist.region }) } def exportPkPrice(){ - //"南京","苏州","无锡","扬州","常州","徐州","镇江","南通","泰州","连云港","盐城","淮安", - def citys = ["宿迁"] + //"鍗椾含","鑻忓窞","鏃犻敗","鎵窞","甯稿窞","寰愬窞","闀囨睙","鍗楅��","娉板窞","杩炰簯娓�","鐩愬煄","娣畨", + def citys = ["瀹胯縼"] for(def c : citys){ def districts = CommonDatautils.findAllDistricts(c, "district", ["city","region", "name","alias"]) @@ -132,15 +132,15 @@ class AddPriceTest { def fjwPriceMap =[:]// CommonDatautils.queryAllDistrictPrice(c, DateUtils.parseFromTightByPattern("2023-10-08","yyyy-MM-dd")) def datas = addAllPrice(districts, fjwPriceMap) - ExcelUtils.write("D:\\数据\\上海农总行\\江苏省价格比对.xlsx", datas, c) - println c +" 完成" + ExcelUtils.write("D:\\鏁版嵁\\涓婃捣鍐滄�昏\\姹熻嫃鐪佷环鏍兼瘮瀵�.xlsx", datas, c) + println c +" 瀹屾垚" } } def addAllPrice(districts, fjwPriceMap){ def cityCodeDataMap = CcbCommonUtils.findCityCodeValue() def rets = new CopyOnWriteArrayList() - rets << ["id", "城市","区域","名称","建行价格","计算方式","可信度","房价网ToB价格","计算方式","可信度","近6个月成交均价"] + rets << ["id", "鍩庡競","鍖哄煙","鍚嶇О","寤鸿浠锋牸","璁$畻鏂瑰紡","鍙俊搴�","鎴夸环缃慣oB浠锋牸","璁$畻鏂瑰紡","鍙俊搴�","杩�6涓湀鎴愪氦鍧囦环"] def totalCount = new AtomicLong() final CountDownLatch latch = new CountDownLatch(districts.size()) for(def i=0;i if(!data['M']){ @@ -74,17 +74,17 @@ class BlankEvaluationBatch { // fitmentCode = getFitmentCode(fitment_rank) // } // if (fitmentCode) { -// params.put("decoration", fitmentCode.toString());//装修 +// params.put("decoration", fitmentCode.toString());//瑁呬慨 // } else { // fitmentCode = (r.nextInt(4) + 1).toString() -// params.put("decoration", fitmentCode);//装修 +// params.put("decoration", fitmentCode);//瑁呬慨 // } def propertyType = 0 - if(rMap.estate_type2.toString().contains("别墅")){ + if(rMap.estate_type2.toString().contains("鍒")){ propertyType = 1 } if (propertyType) { - if (propertyType.contains("别墅")) { + if (propertyType.contains("鍒")) { params.put("propertyType", "1") } else { params.put("propertyType", "0") @@ -106,13 +106,13 @@ class BlankEvaluationBatch { def getFitmentCode(def s){ if(s){ - if(["毛坯"].contains(s)){ + if(["姣涘澂"].contains(s)){ return 1; - }else if(["简单装修","简装"].contains(s)){ + }else if(["绠�鍗曡淇�","绠�瑁�"].contains(s)){ return 2; - }else if(["精装修","精装"].contains(s)){ + }else if(["绮捐淇�","绮捐"].contains(s)){ return 3; - }else if(["豪华装修","豪装"].contains(s)){ + }else if(["璞崕瑁呬慨","璞"].contains(s)){ return 4; } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/price/FzMatchTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/price/FzMatchTest.groovy index 06218bbcf..58e13e3ae 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/price/FzMatchTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/price/FzMatchTest.groovy @@ -17,10 +17,10 @@ class FzMatchTest { } def caluatePPE(){ - def filePath = "D:\\数据\\福州\\商品住房楼盘评估指导参考价情况表(估家科技_福州五区_结果1).xlsx" + def filePath = "D:\\鏁版嵁\\绂忓窞\\鍟嗗搧浣忔埧妤肩洏璇勪及鎸囧鍙傝�冧环鎯呭喌琛紙浼板绉戞妧_绂忓窞浜斿尯_缁撴灉1锛�.xlsx" ExcelUtils.multiThreadingModify(filePath, { data -> if(data['F'] && data['G']){ - def dist = CommonDatautils.findDistrict("福州", data['F'], data['G'], "district") + def dist = CommonDatautils.findDistrict("绂忓窞", data['F'], data['G'], "district") if(dist){ def avg_price = findAvgPrice(dist._id.toString()) if(data['i'] && avg_price){ @@ -43,8 +43,8 @@ class FzMatchTest { } def run(){ - def filePath = "D:\\数据\\福州\\商品住房楼盘评估指导参考价情况表(估家科技_福州五区).xlsx" - def city = "福州" + def filePath = "D:\\鏁版嵁\\绂忓窞\\鍟嗗搧浣忔埧妤肩洏璇勪及鎸囧鍙傝�冧环鎯呭喌琛紙浼板绉戞妧_绂忓窞浜斿尯锛�.xlsx" + def city = "绂忓窞" ExcelUtils.multiThreadingModify(filePath, { data -> // if(data['G']){ // if(!data['H']){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/region/MapAreaUpdate.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/region/MapAreaUpdate.groovy index 9745c7074..df76b44ea 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/region/MapAreaUpdate.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/region/MapAreaUpdate.groovy @@ -21,9 +21,9 @@ class MapAreaUpdate { } def checkCcbRegion(){ - def datas = ExcelUtils.read("D:\\数据\\建行\\二期\\建行最终区域编码.xlsx",0,1) + def datas = ExcelUtils.read("D:\\鏁版嵁\\寤鸿\\浜屾湡\\寤鸿鏈�缁堝尯鍩熺紪鐮�.xlsx",0,1) def citys = CcbCommonUtils.citys - def citys_252 = ["潍坊","临沂","邯郸","济宁","威海","绵阳","梅州","平顶山","江门","赣州","泰安","襄阳","南阳","桂林","聊城","临汾","德州","商丘","衡阳","宿迁","包头","渭南","咸阳","许昌","滨州","邢台","南充","安阳","新乡","枣庄","滁州","龙岩","宝鸡","信阳","运城","衡水","东营","晋中","孝感","长治","阜阳","韶关","菏泽","德阳","宁德","荆州","乐山","驻马店","南平","汉中","榆林","宜春","鞍山","开封","周口","绥化","湘潭","黄冈","承德","焦作","牡丹江","莆田","上饶","眉山","齐齐哈尔","郴州","营口","蚌埠","大庆","赤峰","河源","吕梁","遂宁","漯河","三明","茂名","濮阳","曲靖","平凉","鄂尔多斯","十堰","吉安","黄石","佳木斯","三门峡","揭阳","忻州","通辽","泸州","六安","潮州","衢州","淮南","荆门","永州","呼伦贝尔","葫芦岛","丹东","延边","宣城","宜宾","庆阳","晋城","阳江","宿州","延安","咸宁","怀化","黄山","舟山","汕尾","盘锦","朝阳","丽水","抚州","铁岭","红河","陇南","广安","抚顺","自贡","达州","玉林","玉溪","白银","亳州","邵阳","广元","昌吉","益阳","张掖","娄底","阳泉","天水","随州","朔州","大理","通化","楚雄","巴彦淖尔","乌兰察布","新余","景德镇","松原","辽阳","阜新","酒泉","黔南","淮北","四平","梧州","黔东南","巴中","鹤壁","鸡西","内江","钦州","池州","仙桃","恩施","本溪","资阳","六盘水","百色","白城","临夏","伊犁","贵港","白山","双鸭山","吴忠","鄂州","丽江","安康","毕节","云浮","巴音郭楞","安顺","阿克苏","黑河","铜陵","雅安","石嘴山","萍乡","鹤岗","锡林郭勒盟","铜仁","防城港","喀什","兴安盟","河池","铜川","普洱","保山","凉山州","鹰潭","定西","伊春","中卫","黔西南","商洛","乌海","武威","海西州","来宾","昭通","湘西","哈密","张家界","西双版纳州","七台河","固原","攀枝花","德宏州","崇左","辽源","嘉峪关","克拉玛依","临沧","潜江","贺州","天门","海东","塔城","儋州","金昌","博尔塔拉","吐鲁番","大兴安岭","阿勒泰","和田","迪庆州","日喀则","林芝","阿坝州","阿拉善盟","阿里","昌都","甘南","甘孜州","果洛州","海北州","海南州","黄南州","克孜勒苏","那曲","怒江州","三沙","山南","神农架","文山州","玉树州"] + def citys_252 = ["娼嶅潑","涓存矀","閭兏","娴庡畞","濞佹捣","缁甸槼","姊呭窞","骞抽《灞�","姹熼棬","璧e窞","娉板畨","瑗勯槼","鍗楅槼","妗傛灄","鑱婂煄","涓存本","寰峰窞","鍟嗕笜","琛¢槼","瀹胯縼","鍖呭ご","娓崡","鍜搁槼","璁告槍","婊ㄥ窞","閭㈠彴","鍗楀厖","瀹夐槼","鏂颁埂","鏋e簞","婊佸窞","榫欏博","瀹濋浮","淇¢槼","杩愬煄","琛℃按","涓滆惀","鏅嬩腑","瀛濇劅","闀挎不","闃滈槼","闊跺叧","鑿忔辰","寰烽槼","瀹佸痉","鑽嗗窞","涔愬北","椹婚┈搴�","鍗楀钩","姹変腑","姒嗘灄","瀹滄槬","闉嶅北","寮�灏�","鍛ㄥ彛","缁ュ寲","婀樻江","榛勫唸","鎵垮痉","鐒︿綔","鐗′腹姹�","鑾嗙敯","涓婇ザ","鐪夊北","榻愰綈鍝堝皵","閮村窞","钀ュ彛","铓屽煚","澶у簡","璧ゅ嘲","娌虫簮","鍚曟","閬傚畞","婕渤","涓夋槑","鑼傚悕","婵槼","鏇查潠","骞冲噳","閯傚皵澶氭柉","鍗佸牥","鍚夊畨","榛勭煶","浣虫湪鏂�","涓夐棬宄�","鎻槼","蹇诲窞","閫氳窘","娉稿窞","鍏畨","娼窞","琛㈠窞","娣崡","鑽嗛棬","姘稿窞","鍛间鸡璐濆皵","钁姦宀�","涓逛笢","寤惰竟","瀹e煄","瀹滃","搴嗛槼","鏅嬪煄","闃虫睙","瀹垮窞","寤跺畨","鍜稿畞","鎬�鍖�","榛勫北","鑸熷北","姹曞熬","鐩橀敠","鏈濋槼","涓芥按","鎶氬窞","閾佸箔","绾㈡渤","闄囧崡","骞垮畨","鎶氶『","鑷础","杈惧窞","鐜夋灄","鐜夋邯","鐧介摱","浜冲窞","閭甸槼","骞垮厓","鏄屽悏","鐩婇槼","寮犳帠","濞勫簳","闃虫硥","澶╂按","闅忓窞","鏈斿窞","澶х悊","閫氬寲","妤氶泟","宸村溅娣栧皵","涔屽叞瀵熷竷","鏂颁綑","鏅痉闀�","鏉惧師","杈介槼","闃滄柊","閰掓硥","榛斿崡","娣寳","鍥涘钩","姊у窞","榛斾笢鍗�","宸翠腑","楣ゅ","楦¤タ","鍐呮睙","閽﹀窞","姹犲窞","浠欐","鎭╂柦","鏈邯","璧勯槼","鍏洏姘�","鐧捐壊","鐧藉煄","涓村","浼婄妬","璐垫腐","鐧藉北","鍙岄腑灞�","鍚村繝","閯傚窞","涓芥睙","瀹夊悍","姣曡妭","浜戞诞","宸撮煶閮","瀹夐『","闃垮厠鑻�","榛戞渤","閾滈櫟","闆呭畨","鐭冲槾灞�","钀嶄埂","楣ゅ矖","閿℃灄閮嫆鐩�","閾滀粊","闃插煄娓�","鍠�浠�","鍏村畨鐩�","娌虫睜","閾滃窛","鏅幢","淇濆北","鍑夊北宸�","楣版江","瀹氳タ","浼婃槬","涓崼","榛旇タ鍗�","鍟嗘礇","涔屾捣","姝﹀▉","娴疯タ宸�","鏉ュ","鏄��","婀樿タ","鍝堝瘑","寮犲鐣�","瑗垮弻鐗堢撼宸�","涓冨彴娌�","鍥哄師","鏀�鏋濊姳","寰峰畯宸�","宕囧乏","杈芥簮","鍢夊唱鍏�","鍏嬫媺鐜涗緷","涓存钵","娼滄睙","璐哄窞","澶╅棬","娴蜂笢","濉斿煄","鍎嬪窞","閲戞槍","鍗氬皵濉旀媺","鍚愰瞾鐣�","澶у叴瀹夊箔","闃垮嫆娉�","鍜岀敯","杩簡宸�","鏃ュ杸鍒�","鏋楄姖","闃垮潩宸�","闃挎媺鍠勭洘","闃块噷","鏄岄兘","鐢樺崡","鐢樺瓬宸�","鏋滄礇宸�","娴峰寳宸�","娴峰崡宸�","榛勫崡宸�","鍏嬪瓬鍕掕嫃","閭f洸","鎬掓睙宸�","涓夋矙","灞卞崡","绁炲啘鏋�","鏂囧北宸�","鐜夋爲宸�"] def fjw_citys = [] for(def d : datas){ if(!fjw_citys.contains(d['A'])){ @@ -43,7 +43,7 @@ class MapAreaUpdate { } -// //是否全在之前92个城市中 +// //鏄惁鍏ㄥ湪涔嬪墠92涓煄甯備腑 // def ccb_92_citys = getCcb92City(sqlInstance) // for(def m : ccb_92_citys){ // def isExist = false @@ -54,7 +54,7 @@ class MapAreaUpdate { // } // } // if(!isExist){ -// println m.cityId +" "+ m.distId +" 不存在" +// println m.cityId +" "+ m.distId +" 涓嶅瓨鍦�" // } // } } @@ -87,7 +87,7 @@ class MapAreaUpdate { def update(retMap){ def q = new BasicDBObject() q.put("fangjia_city",retMap.fangjia_city) - q.put("district", "市辖区") + q.put("district", "甯傝緰鍖�") def obj = FANGJIA_OFFICIAL_AREA_MAP.findOne(q) if(obj){ def udata = new BasicDBObject() diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/region/StandardOtherWebRegion.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/region/StandardOtherWebRegion.groovy index 949e55f51..8127dd610 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/region/StandardOtherWebRegion.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/region/StandardOtherWebRegion.groovy @@ -6,7 +6,7 @@ import com.mongodb.BasicDBObject import com.mongodb.DBCollection /** - * 格式化其它网站区域 + * 鏍煎紡鍖栧叾瀹冪綉绔欏尯鍩� */ @@ -16,7 +16,7 @@ DBCollection SERVER_AREA_COLL = MongoUtils.getCollectionByName2("fangjia_crawl", -def datas = ExcelUtils.read("D:\\数据\\第三方\\格式化第三方城市.xlsx",0, 1) +def datas = ExcelUtils.read("D:\\鏁版嵁\\绗笁鏂筡\鏍煎紡鍖栫涓夋柟鍩庡競.xlsx",0, 1) for(def d : datas){ def q = new BasicDBObject() q.put("city", d['A']) @@ -31,6 +31,6 @@ for(def d : datas){ obj.put("createdDate", new Date()) SERVER_AREA_COLL.save(obj) }else{ - println d['A']+" "+ d['F'] +" 已存在" + println d['A']+" "+ d['F'] +" 宸插瓨鍦�" } } \ No newline at end of file diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/AddressStandard.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/AddressStandard.groovy index 0f4fdd3cf..4f3717af6 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/AddressStandard.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/AddressStandard.groovy @@ -9,13 +9,13 @@ import java.util.concurrent.atomic.AtomicInteger class AddressStandard { static main(args) { def task = new AddressStandard() - task.run()//地址标准化 - task.test()//统计标准化后的结果 + task.run()//鍦板潃鏍囧噯鍖� + task.test()//缁熻鏍囧噯鍖栧悗鐨勭粨鏋� } def run2(){ - ExcelUtils.multiThreadingModify("d://数据//地址标准化//阿里接口拆分数据(1).xlsx",{d-> + ExcelUtils.multiThreadingModify("d://鏁版嵁//鍦板潃鏍囧噯鍖�//闃块噷鎺ュ彛鎷嗗垎鏁版嵁(1).xlsx",{d-> def json = FangjiaClientUtils.addressStand(d['A']) if(json && json.status!=0){ @@ -25,10 +25,10 @@ class AddressStandard { } def run(){ - // def datas = ExcelUtils.read("d://数据//地址标准化//阿里接口拆分数据(1-test).xlsx",0,1) + // def datas = ExcelUtils.read("d://鏁版嵁//鍦板潃鏍囧噯鍖�//闃块噷鎺ュ彛鎷嗗垎鏁版嵁(1-test).xlsx",0,1) - ExcelUtils.multiThreadingModify("d://数据//地址标准化//阿里接口拆分数据(1).xlsx",{d-> + ExcelUtils.multiThreadingModify("d://鏁版嵁//鍦板潃鏍囧噯鍖�//闃块噷鎺ュ彛鎷嗗垎鏁版嵁(1).xlsx",{d-> if(d['A']){ for(def i=18;i + ExcelUtils.multiThreadingModify("d://鏁版嵁//鍦板潃鏍囧噯鍖�//闃块噷鎺ュ彛鎷嗗垎鏁版嵁(1).xlsx",{d-> total.addAndGet(1) def sameCount = 0 def list = [] def a_prov = d['B']?d['B']:"" - if(a_prov && (a_prov.toString().endsWith("省") || a_prov.toString().endsWith("自治区"))){ - a_prov = a_prov.replace("维吾尔自治区","").replace("回族自治区","").replace("壮族自治区","").replace("自治区省","").replace("自治区","").replace("省","") + if(a_prov && (a_prov.toString().endsWith("鐪�") || a_prov.toString().endsWith("鑷不鍖�"))){ + a_prov = a_prov.replace("缁村惥灏旇嚜娌诲尯","").replace("鍥炴棌鑷不鍖�","").replace("澹棌鑷不鍖�","").replace("鑷不鍖虹渷","").replace("鑷不鍖�","").replace("鐪�","") } def b_prov = d['S']?d['S']:"" - if(b_prov && (b_prov.toString().endsWith("省") || b_prov.toString().endsWith("自治区"))){ - b_prov = b_prov.replace("维吾尔自治区","").replace("回族自治区","").replace("壮族自治区","").replace("自治区省","").replace("自治区","").replace("省","") + if(b_prov && (b_prov.toString().endsWith("鐪�") || b_prov.toString().endsWith("鑷不鍖�"))){ + b_prov = b_prov.replace("缁村惥灏旇嚜娌诲尯","").replace("鍥炴棌鑷不鍖�","").replace("澹棌鑷不鍖�","").replace("鑷不鍖虹渷","").replace("鑷不鍖�","").replace("鐪�","") } if(a_prov == b_prov){ provCount.addAndGet(1) @@ -134,11 +134,11 @@ class AddressStandard { def a_city = d['C']?d['C']:"" def b_city = d['T']?d['T']:"" - if(a_city && a_city.toString().endsWith("市")){ - a_city = a_city.replace("市","") + if(a_city && a_city.toString().endsWith("甯�")){ + a_city = a_city.replace("甯�","") } - if(b_city && b_city.toString().endsWith("市")){ - b_city = b_city.replace("市","") + if(b_city && b_city.toString().endsWith("甯�")){ + b_city = b_city.replace("甯�","") } if(a_city == b_city){ cityCount.addAndGet(1) @@ -149,11 +149,11 @@ class AddressStandard { def a_dist = d['D']?d['D']:"" def b_dist = d['U']?d['U']:"" - if(a_dist && (a_dist.endsWith("区")||a_dist.endsWith("县"))){ - a_dist = a_dist.replace("新区","").replace("区","").replace("县","") + if(a_dist && (a_dist.endsWith("鍖�")||a_dist.endsWith("鍘�"))){ + a_dist = a_dist.replace("鏂板尯","").replace("鍖�","").replace("鍘�","") } - if(b_dist && (b_dist.endsWith("区")||b_dist.endsWith("县"))){ - b_dist = b_dist.replace("新区","").replace("区","").replace("县","") + if(b_dist && (b_dist.endsWith("鍖�")||b_dist.endsWith("鍘�"))){ + b_dist = b_dist.replace("鏂板尯","").replace("鍖�","").replace("鍘�","") } if(a_dist == b_dist){ @@ -220,8 +220,8 @@ class AddressStandard { list << "subpoi" } - def a_houseno = d['L']?d['L'].replace("号楼","").replace("幢楼","").replace("栋号","").replace("幢","").replace("栋","").replace("座","").replace("号","").replace("楼","").replace("第","").replace("楼",""):"" - def b_houseno = d['AD']?d['AD'].replace("号楼","").replace("幢楼","").replace("栋号","").replace("幢","").replace("栋","").replace("座","").replace("号","").replace("楼","").replace("第","").replace("楼",""):"" + def a_houseno = d['L']?d['L'].replace("鍙锋ゼ","").replace("骞㈡ゼ","").replace("鏍嬪彿","").replace("骞�","").replace("鏍�","").replace("搴�","").replace("鍙�","").replace("妤�","").replace("绗�","").replace("妤�",""):"" + def b_houseno = d['AD']?d['AD'].replace("鍙锋ゼ","").replace("骞㈡ゼ","").replace("鏍嬪彿","").replace("骞�","").replace("鏍�","").replace("搴�","").replace("鍙�","").replace("妤�","").replace("绗�","").replace("妤�",""):"" if(a_houseno == b_houseno){ housenoCount.addAndGet(1) sameCount++ @@ -229,8 +229,8 @@ class AddressStandard { list << "houseno" } - def a_cellno = d['M']?chNumberConver(d['M'].replace("单元","")):"" - def b_cellno = d['AE']?chNumberConver(d['AE'].replace("单元","")):"" + def a_cellno = d['M']?chNumberConver(d['M'].replace("鍗曞厓","")):"" + def b_cellno = d['AE']?chNumberConver(d['AE'].replace("鍗曞厓","")):"" if(a_cellno == b_cellno){ cellnoCount.addAndGet(1) sameCount++ @@ -238,8 +238,8 @@ class AddressStandard { list << "cellno" } - def a_floorno = d['N']?d['N'].replace("层楼","").replace("层","").replace("楼",""):"" - def b_floorno = d['AF']?d['AF'].replace("层楼","").replace("层","").replace("楼",""):"" + def a_floorno = d['N']?d['N'].replace("灞傛ゼ","").replace("灞�","").replace("妤�",""):"" + def b_floorno = d['AF']?d['AF'].replace("灞傛ゼ","").replace("灞�","").replace("妤�",""):"" if(a_floorno == b_floorno){ floornoCount.addAndGet(1) sameCount++ @@ -247,8 +247,8 @@ class AddressStandard { list << "floorno" } - def a_roomno = d['O']?d['O'].replace("室号","").replace("号门","").replace("室","").replace("房","").replace("户","").replace("号","").replace("门",""):"" - def b_roomno = d['AG']?d['AG'].replace("室号","").replace("号门","").replace("室","").replace("房","").replace("户","").replace("号","").replace("门",""):"" + def a_roomno = d['O']?d['O'].replace("瀹ゅ彿","").replace("鍙烽棬","").replace("瀹�","").replace("鎴�","").replace("鎴�","").replace("鍙�","").replace("闂�",""):"" + def b_roomno = d['AG']?d['AG'].replace("瀹ゅ彿","").replace("鍙烽棬","").replace("瀹�","").replace("鎴�","").replace("鎴�","").replace("鍙�","").replace("闂�",""):"" if(a_roomno == b_roomno){ roomnoCount.addAndGet(1) sameCount++ @@ -286,15 +286,15 @@ class AddressStandard { def floor_pre = DataHandleUtils.getDoubleRound(2, floornoCount.get()*100.0/totalCount) def roomno_pre = DataHandleUtils.getDoubleRound(2, roomnoCount.get()*100.0/totalCount) def datas = [] - datas << ["总量", "prov","city","dist","town","community","road","roadno","poi","subpoi","houseno","cellno","floor","roomno"] + datas << ["鎬婚噺", "prov","city","dist","town","community","road","roadno","poi","subpoi","houseno","cellno","floor","roomno"] datas << [totalCount,prov_pre,city_pre,dist_pre,town_pre,community_pre,road_pre,roadno_pre,poi_pre,subpoi_pre,houseno_pre,cellno_pre,floor_pre,roomno_pre] - ExcelUtils.write("d://数据//地址标准化//测试结果1.xlsx", datas, "数据") + ExcelUtils.write("d://鏁版嵁//鍦板潃鏍囧噯鍖�//娴嬭瘯缁撴灉1.xlsx", datas, "鏁版嵁") } def chNumberConver(def s){ if(s && s.size()==1){ - return s.replace("一","1").replace("二","2").replace("三","3").replace("四","4").replace("五","5").replace("六","6").replace("七","7").replace("八","8").replace("九","9").replace("十","10") + return s.replace("涓�","1").replace("浜�","2").replace("涓�","3").replace("鍥�","4").replace("浜�","5").replace("鍏�","6").replace("涓�","7").replace("鍏�","8").replace("涔�","9").replace("鍗�","10") } return s; } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/AnjukeCrawlToDB.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/AnjukeCrawlToDB.groovy index 05808e33a..0c2d8a218 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/AnjukeCrawlToDB.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/AnjukeCrawlToDB.groovy @@ -29,7 +29,7 @@ class AnjukeCrawlToDB { } def stat(){ - def districts = CommonDatautils.findAllDistricts("北京", "district", ["estate_charge","finish_building_date","build_area","household_count","car_site_count","cubage_percent","virescence_percent","estate_company","developer"]); + def districts = CommonDatautils.findAllDistricts("鍖椾含", "district", ["estate_charge","finish_building_date","build_area","household_count","car_site_count","cubage_percent","virescence_percent","estate_company","developer"]); def total = districts.size() def estate_chargeCount = 0 @@ -45,35 +45,35 @@ class AnjukeCrawlToDB { if(dists.estate_charge){ estate_chargeCount++ } - // 总建面积 + // 鎬诲缓闈㈢Н if(dists.build_area){ build_areaCount++ } - // 总数 + // 鎬绘暟 if(dists.household_count){ household_countCount++ } - // 建造年代 + // 寤洪�犲勾浠� if(dists.finish_building_date){ finish_building_dateCount++ } - // 停车位 + // 鍋滆溅浣� if(dists.car_site_count){ car_site_countCount++ } - // 容积率 + // 瀹圭Н鐜� if(dists.cubage_percent){ cubage_percentCount++ } - // 绿化率 + // 缁垮寲鐜� if(dists.virescence_percent){ virescence_percentCount++ } - // 开发商 + // 寮�鍙戝晢 if(dists.developer){ developerCount++ } - // 物业公司 + // 鐗╀笟鍏徃 if(dists.estate_company){ estate_companyCount++ } @@ -109,7 +109,7 @@ class AnjukeCrawlToDB { def addAliasStat(){ - ExcelUtils.multiThreadingModify("C:\\Users\\gaojuan\\Downloads\\城市覆盖率统计(2021-03-14) (1).xls",{row-> + ExcelUtils.multiThreadingModify("C:\\Users\\gaojuan\\Downloads\\鍩庡競瑕嗙洊鐜囩粺璁�(2021-03-14) (1).xls",{row-> def city = row['B'] def districts = CommonDatautils.findAllDistricts(city, "district", ["alias", "addr_alias"]); @@ -141,7 +141,7 @@ class AnjukeCrawlToDB { def run(){ - def datas = ExcelUtils.read("D:\\数据\\待抓取小区_安居客_detail.xlsx",0,1) + def datas = ExcelUtils.read("D:\\鏁版嵁\\寰呮姄鍙栧皬鍖篲瀹夊眳瀹detail.xlsx",0,1) final CountDownLatch latch = new CountDownLatch(datas.size()) @@ -163,14 +163,14 @@ class AnjukeCrawlToDB { def dists = CommonDatautils.findDistrictById(data['A']) if(dists){ def udata = new BasicDBObject() - //物业费 + //鐗╀笟璐� if(!dists.estate_charge && data['K']){ - def estateCharge = data['K'].replace("元/平米/月","") + def estateCharge = data['K'].replace("鍏�/骞崇背/鏈�","") if(estateCharge && estateCharge.toDouble()>0){ udata.put("estate_charge",estateCharge) } } - // 总建面积 + // 鎬诲缓闈㈢Н if(!dists.build_area && data['L']){ def buildArea = data['L'].toString().replace("m?","") if(buildArea){ @@ -178,46 +178,46 @@ class AnjukeCrawlToDB { } } - // 总数 + // 鎬绘暟 if(!dists.household_count && data['M']){ def householdCount= data['M'] if(householdCount && householdCount.toString().isNumber()){ udata.put("household_count",householdCount.toInteger()) } } - // 建造年代 + // 寤洪�犲勾浠� if(!dists.finish_building_date && data['N']){ - def year = data['N'].replace("年","") + def year = data['N'].replace("骞�","") if(year && year.isNumber()){ udata.put("finish_building_date",year.toString()) } } - // 停车位 + // 鍋滆溅浣� if(!dists.car_site_count && data['O']){ if(data['O'].isNumber()){ udata.put("car_site_count", data['O'].toInteger()) } } - // 容积率 + // 瀹圭Н鐜� if(!dists.cubage_percent && data['R']){ def cubage_percent = data['R'] if(cubage_percent && cubage_percent.isNumber() && cubage_percent.toDouble()<10){ udata.put("cubage_percent", cubage_percent.toString()) } } - // 绿化率 + // 缁垮寲鐜� if(!dists.virescence_percent && data['Q']){ def virescence_percent = data['Q'].toString().replace("%","") if(virescence_percent && virescence_percent.isNumber()){ udata.put("virescence_percent", virescence_percent.toString()) } } - // 开发商 - if(!dists.developer && data['R'] && !data['R'].contains("未知") && !data['R'].contains("无")){ + // 寮�鍙戝晢 + if(!dists.developer && data['R'] && !data['R'].contains("鏈煡") && !data['R'].contains("鏃�")){ udata.put("developer", data['R']) } - // 物业公司 - if(!dists.estate_company && data['S'] && !data['S'].contains("未知") && !data['S'].contains("无")){ + // 鐗╀笟鍏徃 + if(!dists.estate_company && data['S'] && !data['S'].contains("鏈煡") && !data['S'].contains("鏃�")){ udata.put("estate_company",data['S']) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/ChongQingBlankTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/ChongQingBlankTest.groovy index 07ab82cce..b0d6b7843 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/ChongQingBlankTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/ChongQingBlankTest.groovy @@ -14,8 +14,8 @@ import java.util.regex.Pattern class ChongQingBlankTest { - def gaodeCityCodeMap = ["北京":"110000","天津":"120000","石家庄":"130100","辛集":"130181","晋州":"130183","新乐":"130184","唐山":"130200","滦州":"130284","遵化":"130281","迁安":"130283","秦皇岛":"130300","邯郸":"130400","武安":"130481","邢台":"130500","南宫":"130581","沙河":"130582","保定":"130600","涿州":"130681","定州":"130682","安国":"130683","高碑店":"130684","张家口":"130700","承德":"130800","平泉":"130881","沧州":"130900","泊头":"130981","任丘":"130982","黄骅":"130983","河间":"130984","廊坊":"131000","霸州":"131081","三河":"131082","衡水":"131100","深州":"131182","太原":"140100","古交":"140181","大同":"140200","阳泉":"140300","长治":"140400","晋城":"140500","高平":"140581","朔州":"140600","怀仁":"140681","晋中":"140700","介休":"140781","运城":"140800","永济":"140881","河津":"140882","忻州":"140900","原平":"140981","临汾":"141000","侯马":"141081","霍州":"141082","吕梁":"141100","孝义":"141181","汾阳":"141182","呼和浩特":"150100","包头":"150200","乌海":"150300","赤峰":"150400","通辽":"150500","霍林郭勒":"150581","鄂尔多斯":"150600","呼伦贝尔":"150700","满洲里":"150781","牙克石":"150782","扎兰屯":"150783","额尔古纳":"150784","根河":"150785","巴彦淖尔":"150800","乌兰察布":"150900","丰镇":"150981","乌兰浩特":"152201","阿尔山":"152202","二连浩特":"152501","锡林浩特":"152502","沈阳":"210100","新民":"210181","大连":"210200","瓦房店":"210281","庄河":"210283","鞍山":"210300","海城":"210381","抚顺":"210400","本溪":"210500","丹东":"210600","东港":"210681","凤城":"210682","锦州":"210700","凌海":"210781","北镇":"210782","营口":"210800","西市区":"210803","盖州":"210881","大石桥":"210882","阜新":"210900","辽阳":"211000","灯塔":"211081","盘锦":"211100","铁岭":"211200","调兵山":"211281","开原":"211282","朝阳":"211300","北票":"211381","凌源":"211382","葫芦岛":"211400","兴城":"211481","长春":"220100","榆树":"220182","德惠":"220183","吉林":"220200","蛟河":"220281","桦甸":"220282","舒兰":"220283","磐石":"220284","四平":"220300","公主岭":"220381","双辽":"220382","辽源":"220400","通化":"220500","梅河口":"220581","集安":"220582","白山":"220600","临江":"220681","松原":"220700","扶余":"220781","白城":"220800","洮南":"220881","大安":"220882","延吉":"222401","图们":"222402","敦化":"222403","珲春":"222404","龙井":"222405","和龙":"222406","哈尔滨":"230100","尚志":"230183","五常":"230184","齐齐哈尔":"230200","讷河":"230281","鸡西":"230300","虎林":"230381","密山":"230382","鹤岗":"230400","双鸭山":"230500","大庆":"230600","伊春":"230700","铁力":"230781","佳木斯":"230800","同江":"230881","富锦":"230882","抚远":"230883","七台河":"230900","牡丹江":"231000","绥芬河":"231081","海林":"231083","宁安":"231084","穆棱":"231085","东宁":"231086","黑河":"231100","北安":"231181","五大连池":"231182","绥化":"231200","安达":"231281","肇东":"231282","海伦":"231283","漠河":"232701","上海":"310000","南京":"320100","无锡":"320200","江阴":"320281","宜兴":"320282","徐州":"320300","新沂":"320381","邳州":"320382","常州":"320400","溧阳":"320481","苏州":"320500","常熟":"320581","张家港":"320582","昆山":"320583","太仓":"320585","南通":"320600","海安":"320685","启东":"320681","如皋":"320682","海门":"320684","连云港":"320700","淮安":"320800","盐城":"320900","东台":"320981","扬州":"321000","仪征":"321081","高邮":"321084","镇江":"321100","丹阳":"321181","扬中":"321182","句容":"321183","泰州":"321200","兴化":"321281","靖江":"321282","泰兴":"321283","宿迁":"321300","杭州":"330100","建德":"330182","宁波":"330200","余姚":"330281","慈溪":"330282","温州":"330300","瑞安":"330381","乐清":"330382","嘉兴":"330400","海宁":"330481","平湖":"330482","桐乡":"330483","湖州":"330500","绍兴":"330600","诸暨":"330681","嵊州":"330683","金华":"330700","兰溪":"330781","义乌":"330782","东阳":"330783","永康":"330784","衢州":"330800","江山":"330881","舟山":"330900","台州":"331000","温岭":"331081","临海":"331082","玉环":"331083","丽水":"331100","龙泉":"331181","合肥":"340100","巢湖":"340181","芜湖":"340200","蚌埠":"340300","淮南":"340400","马鞍山":"340500","淮北":"340600","铜陵":"340700","安庆":"340800","潜山":"340882","桐城":"340881","黄山":"341000","滁州":"341100","天长":"341181","明光":"341182","阜阳":"341200","界首":"341282","宿州":"341300","六安":"341500","亳州":"341600","池州":"341700","宣城":"341800","宁国":"341881","福州":"350100","福清":"350181","厦门":"350200","莆田":"350300","三明":"350400","永安":"350481","泉州":"350500","石狮":"350581","晋江":"350582","南安":"350583","漳州":"350600","龙海":"350681","南平":"350700","邵武":"350781","武夷山":"350782","建瓯":"350783","龙岩":"350800","漳平":"350881","宁德":"350900","福安":"350981","福鼎":"350982","南昌":"360100","景德镇":"360200","乐平":"360281","萍乡":"360300","九江":"360400","瑞昌":"360481","共青城":"360482","庐山":"360483","新余":"360500","鹰潭":"360600","贵溪":"360681","赣州":"360700","瑞金":"360781","吉安":"360800","井冈山":"360881","宜春":"360900","丰城":"360981","樟树":"360982","高安":"360983","抚州":"361000","上饶":"361100","德兴":"361181","济南":"370100","市中区":"370103","青岛":"370200","市南区":"370202","市北区":"370203","胶州":"370281","平度":"370283","莱西":"370285","淄博":"370300","枣庄":"370400","市中区":"370402","滕州":"370481","东营":"370500","烟台":"370600","龙口":"370681","莱阳":"370682","莱州":"370683","蓬莱":"370684","招远":"370685","栖霞":"370686","海阳":"370687","潍坊":"370700","青州":"370781","诸城":"370782","寿光":"370783","安丘":"370784","高密":"370785","昌邑":"370786","济宁":"370800","曲阜":"370881","邹城":"370883","泰安":"370900","新泰":"370982","肥城":"370983","威海":"371000","荣成":"371082","乳山":"371083","日照":"371100","临沂":"371300","德州":"371400","乐陵":"371481","禹城":"371482","聊城":"371500","临清":"371581","滨州":"371600","邹平":"371681","菏泽":"371700","郑州":"410100","巩义":"410181","荥阳":"410182","新密":"410183","新郑":"410184","登封":"410185","开封":"410200","洛阳":"410300","偃师":"410381","平顶山":"410400","舞钢":"410481","汝州":"410482","安阳":"410500","林州":"410581","鹤壁":"410600","新乡":"410700","卫辉":"410781","辉县":"410782","焦作":"410800","沁阳":"410882","孟州":"410883","濮阳":"410900","许昌":"411000","禹州":"411081","长葛":"411082","漯河":"411100","三门峡":"411200","义马":"411281","灵宝":"411282","南阳":"411300","邓州":"411381","商丘":"411400","永城":"411481","信阳":"411500","周口":"411600","项城":"411681","驻马店":"411700","济源":"419001","武汉":"420100","黄石":"420200","大冶":"420281","十堰":"420300","丹江口":"420381","宜昌":"420500","宜都":"420581","当阳":"420582","枝江":"420583","襄阳":"420600","老河口":"420682","枣阳":"420683","宜城":"420684","鄂州":"420700","荆门":"420800","京山":"420882","钟祥":"420881","孝感":"420900","应城":"420981","安陆":"420982","汉川":"420984","荆州":"421000","沙市区":"421002","石首":"421081","洪湖":"421083","松滋":"421087","黄冈":"421100","麻城":"421181","武穴":"421182","咸宁":"421200","赤壁":"421281","随州":"421300","广水":"421381","恩施":"422801","利川":"422802","仙桃":"429004","潜江":"429005","天门":"429006","长沙":"430100","浏阳":"430181","宁乡":"430182","株洲":"430200","醴陵":"430281","湘潭":"430300","湘乡":"430381","韶山":"430382","衡阳":"430400","耒阳":"430481","常宁":"430482","邵阳":"430500","武冈":"430581","岳阳":"430600","汨罗":"430681","临湘":"430682","常德":"430700","津市":"430781","张家界":"430800","益阳":"430900","沅江":"430981","郴州":"431000","资兴":"431081","永州":"431100","怀化":"431200","洪江":"431281","娄底":"431300","冷水江":"431381","涟源":"431382","吉首":"433101","广州":"440100","韶关":"440200","乐昌":"440281","南雄":"440282","深圳":"440300","珠海":"440400","汕头":"440500","佛山":"440600","江门":"440700","台山":"440781","开平":"440783","鹤山":"440784","恩平":"440785","湛江":"440800","廉江":"440881","雷州":"440882","吴川":"440883","茂名":"440900","高州":"440981","化州":"440982","信宜":"440983","肇庆":"441200","四会":"441284","惠州":"441300","梅州":"441400","兴宁":"441481","汕尾":"441500","陆丰":"441581","河源":"441600","阳江":"441700","阳春":"441781","清远":"441800","英德":"441881","连州":"441882","东莞":"441900","中山":"442000","潮州":"445100","揭阳":"445200","普宁":"445281","云浮":"445300","罗定":"445381","南宁":"450100","柳州":"450200","桂林":"450300","荔浦":"450381","梧州":"450400","岑溪":"450481","北海":"450500","防城港":"450600","东兴":"450681","钦州":"450700","贵港":"450800","桂平":"450881","玉林":"450900","北流":"450981","百色":"451000","靖西":"451081","贺州":"451100","河池":"451200","来宾":"451300","合山":"451381","崇左":"451400","凭祥":"451481","海口":"460100","三亚":"460200","三沙":"460300","儋州":"460400","五指山":"469001","琼海":"469002","文昌":"469005","万宁":"469006","东方":"469007","重庆":"500000","重庆市郊县":"500200","成都":"510100","都江堰":"510181","彭州":"510182","邛崃":"510183","崇州":"510184","简阳":"510185","自贡":"510300","攀枝花":"510400","泸州":"510500","德阳":"510600","广汉":"510681","什邡":"510682","绵竹":"510683","绵阳":"510700","江油":"510781","广元":"510800","遂宁":"510900","内江":"511000","市中区":"511002","隆昌":"511083","乐山":"511100","市中区":"511102","峨眉山":"511181","南充":"511300","阆中":"511381","眉山":"511400","宜宾":"511500","广安":"511600","华蓥":"511681","达州":"511700","万源":"511781","雅安":"511800","巴中":"511900","资阳":"512000","马尔康":"513201","康定":"513301","西昌":"513401","贵阳":"520100","清镇":"520181","六盘水":"520200","盘州":"520281","遵义":"520300","赤水":"520381","仁怀":"520382","安顺":"520400","毕节":"520500","铜仁":"520600","兴义":"522301","兴仁":"522302","凯里":"522601","都匀":"522701","福泉":"522702","昆明":"530100","安宁":"530181","曲靖":"530300","宣威":"530381","玉溪":"530400","保山":"530500","腾冲":"530581","昭通":"530600","水富":"530681","丽江":"530700","普洱":"530800","临沧":"530900","楚雄":"532301","个旧":"532501","开远":"532502","蒙自":"532503","弥勒":"532504","文山":"532601","景洪":"532801","大理":"532901","瑞丽":"533102","芒":"533103","泸水":"533301","香格里拉":"533401","拉萨":"540100","日喀则":"540200","昌都":"540300","林芝":"540400","山南":"540500","那曲":"540600","西安":"610100","铜川":"610200","宝鸡":"610300","咸阳":"610400","彬州":"610482","兴平":"610481","渭南":"610500","韩城":"610581","华阴":"610582","延安":"610600","汉中":"610700","榆林":"610800","神木":"610881","安康":"610900","商洛":"611000","兰州":"620100","嘉峪关":"620200","金昌":"620300","白银":"620400","天水":"620500","武威":"620600","张掖":"620700","平凉":"620800","华亭":"620881","酒泉":"620900","玉门":"620981","敦煌":"620982","庆阳":"621000","定西":"621100","陇南":"621200","临夏":"622901","合作":"623001","西宁":"630100","海东":"630200","玉树":"632701","格尔木":"632801","德令哈":"632802","茫崖":"632803","银川":"640100","灵武":"640181","石嘴山":"640200","吴忠":"640300","青铜峡":"640381","固原":"640400","中卫":"640500","乌鲁木齐":"650100","新市区":"650104","克拉玛依":"650200","吐鲁番":"650400","哈密":"650500","昌吉":"652301","阜康":"652302","博乐":"652701","阿拉山口":"652702","库尔勒":"652801","阿克苏":"652901","阿图什":"653001","喀什":"653101","和田":"653201","伊宁":"654002","奎屯":"654003","霍尔果斯":"654004","塔城":"654201","乌苏":"654202","阿勒泰":"654301","石河子":"659001","阿拉尔":"659002","图木舒克":"659003","五家渠":"659004","北屯":"659005","铁门关":"659006","双河":"659007","可克达拉":"659008","昆玉":"659009","伊犁":"654000"] - def baiduCityCodeMap = ["北京": "131", "天津": "332", "石家庄": "150", "唐山": "265", "秦皇岛": "148", "邯郸": "151", "邢台": "266", "保定": "307", "张家口": "264", "承德": "207", "沧州": "149", "廊坊": "191", "衡水": "208", "太原": "176", "大同": "355", "阳泉": "357", "长治": "356", "晋城": "290", "朔州": "237", "晋中": "238", "运城": "328", "忻州": "367", "临汾": "368", "吕梁": "327", "呼和浩特": "321", "包头": "229", "乌海": "123", "赤峰": "297", "通辽": "64", "鄂尔多斯": "283", "呼伦贝尔": "61", "巴彦淖尔": "169", "乌兰察布": "168", "兴安盟": "62", "锡林郭勒盟": "63", "阿拉善盟": "230", "沈阳": "58", "大连": "167", "鞍山": "320", "抚顺": "184", "本溪": "227", "丹东": "282", "锦州": "166", "营口": "281", "阜新": "59", "辽阳": "351", "盘锦": "228", "铁岭": "60", "朝阳": "280", "葫芦岛": "319", "长春": "53", "吉林市": "55", "四平": "56", "辽源": "183", "通化": "165", "白山": "57", "松原": "52", "白城": "51", "延边朝鲜族自治州": "54", "哈尔滨": "48", "齐齐哈尔": "41", "鸡西": "46", "鹤岗": "43", "双鸭山": "45", "大庆": "50", "伊春": "40", "佳木斯": "42", "七台河": "47", "牡丹江": "49", "黑河": "39", "绥化": "44", "大兴安岭地区": "38", "上海": "289", "南京": "315", "无锡": "317", "徐州": "316", "常州": "348", "苏州": "224", "南通": "161", "连云港": "347", "淮安": "162", "盐城": "223", "扬州": "346", "镇江": "160", "泰州": "276", "宿迁": "277", "杭州": "179", "宁波": "180", "温州": "178", "嘉兴": "334", "湖州": "294", "绍兴": "293", "金华": "333", "衢州": "243", "舟山": "245", "台州": "244", "丽水": "292", "合肥": "127", "芜湖": "129", "蚌埠": "126", "淮南": "250", "马鞍山": "358", "淮北": "253", "铜陵": "337", "安庆": "130", "黄山": "252", "滁州": "189", "阜阳": "128", "宿州": "370", "巢湖": "251", "六安": "298", "亳州": "188", "池州": "299", "宣城": "190", "福州": "300", "厦门": "194", "莆田": "195", "三明": "254", "泉州": "134", "漳州": "255", "南平": "133", "龙岩": "193", "宁德": "192", "南昌": "163", "景德镇": "225", "萍乡": "350", "九江": "349", "新余": "164", "鹰潭": "279", "赣州": "365", "吉安": "318", "宜春": "278", "抚州": "226", "上饶": "364", "济南": "288", "青岛": "236", "淄博": "354", "枣庄": "172", "东营": "174", "烟台": "326", "潍坊": "287", "济宁": "286", "泰安": "325", "威海": "175", "日照": "173", "莱芜": "124", "临沂": "234", "德州": "372", "聊城": "366", "滨州": "235", "菏泽": "353", "郑州": "268", "开封": "210", "洛阳": "153", "平顶山": "213", "安阳": "267", "鹤壁": "215", "新乡": "152", "焦作": "211", "濮阳": "209", "许昌": "155", "漯河": "344", "三门峡": "212", "南阳": "309", "商丘": "154", "信阳": "214", "周口": "308", "驻马店": "269", "武汉": "218", "黄石": "311", "十堰": "216", "宜昌": "270", "襄阳": "156", "鄂州": "122", "荆门": "217", "孝感": "310", "荆州": "157", "黄冈": "271", "咸宁": "362", "随州": "371", "恩施土家族苗族自治州": "373", "仙桃": "1713", "潜江": "1293", "天门": "2654", "神农架林区": "2734", "长沙": "158", "株洲": "222", "湘潭": "313", "衡阳": "159", "邵阳": "273", "岳阳": "220", "常德": "219", "张家界": "312", "益阳": "272", "郴州": "275", "永州": "314", "怀化": "363", "娄底": "221", "湘西土家族苗族自治州": "274", "广州": "257", "韶关": "137", "深圳": "340", "珠海": "140", "汕头": "303", "佛山": "138", "江门": "302", "湛江": "198", "茂名": "139", "肇庆": "338", "惠州": "301", "梅州": "141", "汕尾": "339", "河源": "200", "阳江": "199", "清远": "197", "东莞": "119", "中山": "187", "潮州": "201", "揭阳": "259", "云浮": "258", "南宁": "261", "柳州": "305", "桂林": "142", "梧州": "304", "北海": "295", "防城港": "204", "钦州": "145", "贵港": "341", "玉林": "361", "百色": "203", "贺州": "260", "河池": "143", "来宾": "202", "崇左": "144", "海口": "125", "三亚": "121", "五指山": "1644", "琼海": "2358", "儋州": "1215", "文昌": "2758", "万宁": "1216", "东方": "2634", "定安": "1214", "屯昌": "1641", "澄迈": "2757", "临高": "2033", "白沙黎族自治": "2359", "昌江黎族自治": "1642", "乐东黎族自治": "2032", "陵水黎族自治": "1643", "保亭黎族苗族自治": "1217", "琼中黎族苗族自治": "2031", "重庆": "132", "成都": "75", "自贡": "78", "攀枝花": "81", "泸州": "331", "德阳": "74", "绵阳": "240", "广元": "329", "遂宁": "330", "内江": "248", "乐山": "79", "南充": "291", "眉山": "77", "宜宾": "186", "广安": "241", "达州": "369", "雅安": "76", "巴中": "239", "资阳": "242", "阿坝藏族羌族自治州": "185", "甘孜藏族自治州": "73", "凉山彝族自治州": "80", "贵阳": "146", "六盘水": "147", "遵义": "262", "安顺": "263", "铜仁地区": "205", "黔西南布依族苗族自治州": "343", "毕节地区": "206", "黔东南苗族侗族自治州": "342", "黔南布依族苗族自治州": "306", "昆明": "104", "曲靖": "249", "玉溪": "106", "保山": "112", "昭通": "336", "丽江": "114", "临沧": "110", "楚雄彝族自治州": "105", "红河哈尼族彝族自治州": "107", "文山壮族苗族自治州": "177", "普洱": "108", "西双版纳傣族自治州": "109", "大理白族自治州": "111", "德宏傣族景颇族自治州": "116", "怒江傈僳族自治州": "113", "迪庆藏族自治州": "115", "拉萨": "100", "昌都地区": "99", "山南地区": "97", "日喀则地区": "102", "那曲地区": "101", "阿里地区": "103", "林芝地区": "98", "西安": "233", "铜川": "232", "宝鸡": "171", "咸阳": "323", "渭南": "170", "延安": "284", "汉中": "352", "榆林": "231", "安康": "324", "商洛": "285", "兰州": "36", "嘉峪关": "33", "金昌": "34", "白银": "35", "天水": "196", "武威": "118", "张掖": "117", "平凉": "359", "酒泉": "37", "庆阳": "135", "定西": "136", "陇南": "256", "临夏回族自治州": "182", "甘南藏族自治州": "247", "西宁": "66", "海东地区": "69", "海北藏族自治州": "67", "黄南藏族自治州": "70", "海南藏族自治州": "68", "果洛藏族自治州": "72", "玉树藏族自治州": "71", "海西蒙古族藏族自治州": "65", "银川": "360", "石嘴山": "335", "吴忠": "322", "固原": "246", "中卫": "181", "乌鲁木齐": "92", "克拉玛依": "95", "吐鲁番地区": "89", "哈密地区": "91", "昌吉回族自治州": "93", "博尔塔拉蒙古自治州": "88", "巴音郭楞蒙古自治州": "86", "阿克苏地区": "85", "克孜勒苏柯尔克孜自治州": "84", "喀什地区": "83", "和田地区": "82", "伊犁": "90", "塔城地区": "94", "阿勒泰地区": "96", "石河子": "770", "阿拉尔": "731", "图木舒克": "792", "五家渠": "789", "香港特别行政区": "2912", "澳门特别行政区": "2911"] + def gaodeCityCodeMap = ["鍖椾含":"110000","澶╂触":"120000","鐭冲搴�":"130100","杈涢泦":"130181","鏅嬪窞":"130183","鏂颁箰":"130184","鍞愬北":"130200","婊﹀窞":"130284","閬靛寲":"130281","杩佸畨":"130283","绉︾殗宀�":"130300","閭兏":"130400","姝﹀畨":"130481","閭㈠彴":"130500","鍗楀":"130581","娌欐渤":"130582","淇濆畾":"130600","娑垮窞":"130681","瀹氬窞":"130682","瀹夊浗":"130683","楂樼搴�":"130684","寮犲鍙�":"130700","鎵垮痉":"130800","骞虫硥":"130881","娌у窞":"130900","娉婂ご":"130981","浠讳笜":"130982","榛勯獏":"130983","娌抽棿":"130984","寤婂潑":"131000","闇稿窞":"131081","涓夋渤":"131082","琛℃按":"131100","娣卞窞":"131182","澶師":"140100","鍙や氦":"140181","澶у悓":"140200","闃虫硥":"140300","闀挎不":"140400","鏅嬪煄":"140500","楂樺钩":"140581","鏈斿窞":"140600","鎬�浠�":"140681","鏅嬩腑":"140700","浠嬩紤":"140781","杩愬煄":"140800","姘告祹":"140881","娌虫触":"140882","蹇诲窞":"140900","鍘熷钩":"140981","涓存本":"141000","渚┈":"141081","闇嶅窞":"141082","鍚曟":"141100","瀛濅箟":"141181","姹鹃槼":"141182","鍛煎拰娴╃壒":"150100","鍖呭ご":"150200","涔屾捣":"150300","璧ゅ嘲":"150400","閫氳窘":"150500","闇嶆灄閮嫆":"150581","閯傚皵澶氭柉":"150600","鍛间鸡璐濆皵":"150700","婊℃床閲�":"150781","鐗欏厠鐭�":"150782","鎵庡叞灞�":"150783","棰濆皵鍙ょ撼":"150784","鏍规渤":"150785","宸村溅娣栧皵":"150800","涔屽叞瀵熷竷":"150900","涓伴晣":"150981","涔屽叞娴╃壒":"152201","闃垮皵灞�":"152202","浜岃繛娴╃壒":"152501","閿℃灄娴╃壒":"152502","娌堥槼":"210100","鏂版皯":"210181","澶ц繛":"210200","鐡︽埧搴�":"210281","搴勬渤":"210283","闉嶅北":"210300","娴峰煄":"210381","鎶氶『":"210400","鏈邯":"210500","涓逛笢":"210600","涓滄腐":"210681","鍑ゅ煄":"210682","閿﹀窞":"210700","鍑屾捣":"210781","鍖楅晣":"210782","钀ュ彛":"210800","瑗垮競鍖�":"210803","鐩栧窞":"210881","澶х煶妗�":"210882","闃滄柊":"210900","杈介槼":"211000","鐏":"211081","鐩橀敠":"211100","閾佸箔":"211200","璋冨叺灞�":"211281","寮�鍘�":"211282","鏈濋槼":"211300","鍖楃エ":"211381","鍑屾簮":"211382","钁姦宀�":"211400","鍏村煄":"211481","闀挎槬":"220100","姒嗘爲":"220182","寰锋儬":"220183","鍚夋灄":"220200","铔熸渤":"220281","妗︾敻":"220282","鑸掑叞":"220283","纾愮煶":"220284","鍥涘钩":"220300","鍏富宀�":"220381","鍙岃窘":"220382","杈芥簮":"220400","閫氬寲":"220500","姊呮渤鍙�":"220581","闆嗗畨":"220582","鐧藉北":"220600","涓存睙":"220681","鏉惧師":"220700","鎵朵綑":"220781","鐧藉煄":"220800","娲崡":"220881","澶у畨":"220882","寤跺悏":"222401","鍥句滑":"222402","鏁﹀寲":"222403","鐝叉槬":"222404","榫欎簳":"222405","鍜岄緳":"222406","鍝堝皵婊�":"230100","灏氬織":"230183","浜斿父":"230184","榻愰綈鍝堝皵":"230200","璁锋渤":"230281","楦¤タ":"230300","铏庢灄":"230381","瀵嗗北":"230382","楣ゅ矖":"230400","鍙岄腑灞�":"230500","澶у簡":"230600","浼婃槬":"230700","閾佸姏":"230781","浣虫湪鏂�":"230800","鍚屾睙":"230881","瀵岄敠":"230882","鎶氳繙":"230883","涓冨彴娌�":"230900","鐗′腹姹�":"231000","缁ヨ姮娌�":"231081","娴锋灄":"231083","瀹佸畨":"231084","绌嗘1":"231085","涓滃畞":"231086","榛戞渤":"231100","鍖楀畨":"231181","浜斿ぇ杩炴睜":"231182","缁ュ寲":"231200","瀹夎揪":"231281","鑲囦笢":"231282","娴蜂鸡":"231283","婕犳渤":"232701","涓婃捣":"310000","鍗椾含":"320100","鏃犻敗":"320200","姹熼槾":"320281","瀹滃叴":"320282","寰愬窞":"320300","鏂版矀":"320381","閭冲窞":"320382","甯稿窞":"320400","婧ч槼":"320481","鑻忓窞":"320500","甯哥啛":"320581","寮犲娓�":"320582","鏄嗗北":"320583","澶粨":"320585","鍗楅��":"320600","娴峰畨":"320685","鍚笢":"320681","濡傜殝":"320682","娴烽棬":"320684","杩炰簯娓�":"320700","娣畨":"320800","鐩愬煄":"320900","涓滃彴":"320981","鎵窞":"321000","浠緛":"321081","楂橀偖":"321084","闀囨睙":"321100","涓归槼":"321181","鎵腑":"321182","鍙ュ":"321183","娉板窞":"321200","鍏村寲":"321281","闈栨睙":"321282","娉板叴":"321283","瀹胯縼":"321300","鏉窞":"330100","寤哄痉":"330182","瀹佹尝":"330200","浣欏":"330281","鎱堟邯":"330282","娓╁窞":"330300","鐟炲畨":"330381","涔愭竻":"330382","鍢夊叴":"330400","娴峰畞":"330481","骞虫箹":"330482","妗愪埂":"330483","婀栧窞":"330500","缁嶅叴":"330600","璇告毃":"330681","宓婂窞":"330683","閲戝崕":"330700","鍏版邯":"330781","涔変箤":"330782","涓滈槼":"330783","姘稿悍":"330784","琛㈠窞":"330800","姹熷北":"330881","鑸熷北":"330900","鍙板窞":"331000","娓╁箔":"331081","涓存捣":"331082","鐜夌幆":"331083","涓芥按":"331100","榫欐硥":"331181","鍚堣偉":"340100","宸㈡箹":"340181","鑺滄箹":"340200","铓屽煚":"340300","娣崡":"340400","椹瀺灞�":"340500","娣寳":"340600","閾滈櫟":"340700","瀹夊簡":"340800","娼滃北":"340882","妗愬煄":"340881","榛勫北":"341000","婊佸窞":"341100","澶╅暱":"341181","鏄庡厜":"341182","闃滈槼":"341200","鐣岄":"341282","瀹垮窞":"341300","鍏畨":"341500","浜冲窞":"341600","姹犲窞":"341700","瀹e煄":"341800","瀹佸浗":"341881","绂忓窞":"350100","绂忔竻":"350181","鍘﹂棬":"350200","鑾嗙敯":"350300","涓夋槑":"350400","姘稿畨":"350481","娉夊窞":"350500","鐭崇嫯":"350581","鏅嬫睙":"350582","鍗楀畨":"350583","婕冲窞":"350600","榫欐捣":"350681","鍗楀钩":"350700","閭垫":"350781","姝﹀し灞�":"350782","寤虹摨":"350783","榫欏博":"350800","婕冲钩":"350881","瀹佸痉":"350900","绂忓畨":"350981","绂忛紟":"350982","鍗楁槍":"360100","鏅痉闀�":"360200","涔愬钩":"360281","钀嶄埂":"360300","涔濇睙":"360400","鐟炴槍":"360481","鍏遍潚鍩�":"360482","搴愬北":"360483","鏂颁綑":"360500","楣版江":"360600","璐垫邯":"360681","璧e窞":"360700","鐟為噾":"360781","鍚夊畨":"360800","浜曞唸灞�":"360881","瀹滄槬":"360900","涓板煄":"360981","妯熸爲":"360982","楂樺畨":"360983","鎶氬窞":"361000","涓婇ザ":"361100","寰峰叴":"361181","娴庡崡":"370100","甯備腑鍖�":"370103","闈掑矝":"370200","甯傚崡鍖�":"370202","甯傚寳鍖�":"370203","鑳跺窞":"370281","骞冲害":"370283","鑾辫タ":"370285","娣勫崥":"370300","鏋e簞":"370400","甯備腑鍖�":"370402","婊曞窞":"370481","涓滆惀":"370500","鐑熷彴":"370600","榫欏彛":"370681","鑾遍槼":"370682","鑾卞窞":"370683","钃幈":"370684","鎷涜繙":"370685","鏍栭湠":"370686","娴烽槼":"370687","娼嶅潑":"370700","闈掑窞":"370781","璇稿煄":"370782","瀵垮厜":"370783","瀹変笜":"370784","楂樺瘑":"370785","鏄岄倯":"370786","娴庡畞":"370800","鏇查槣":"370881","閭瑰煄":"370883","娉板畨":"370900","鏂版嘲":"370982","鑲ュ煄":"370983","濞佹捣":"371000","鑽f垚":"371082","涔冲北":"371083","鏃ョ収":"371100","涓存矀":"371300","寰峰窞":"371400","涔愰櫟":"371481","绂瑰煄":"371482","鑱婂煄":"371500","涓存竻":"371581","婊ㄥ窞":"371600","閭瑰钩":"371681","鑿忔辰":"371700","閮戝窞":"410100","宸╀箟":"410181","鑽ラ槼":"410182","鏂板瘑":"410183","鏂伴儜":"410184","鐧诲皝":"410185","寮�灏�":"410200","娲涢槼":"410300","鍋冨笀":"410381","骞抽《灞�":"410400","鑸為挗":"410481","姹濆窞":"410482","瀹夐槼":"410500","鏋楀窞":"410581","楣ゅ":"410600","鏂颁埂":"410700","鍗緣":"410781","杈夊幙":"410782","鐒︿綔":"410800","娌侀槼":"410882","瀛熷窞":"410883","婵槼":"410900","璁告槍":"411000","绂瑰窞":"411081","闀胯憶":"411082","婕渤":"411100","涓夐棬宄�":"411200","涔夐┈":"411281","鐏靛疂":"411282","鍗楅槼":"411300","閭撳窞":"411381","鍟嗕笜":"411400","姘稿煄":"411481","淇¢槼":"411500","鍛ㄥ彛":"411600","椤瑰煄":"411681","椹婚┈搴�":"411700","娴庢簮":"419001","姝︽眽":"420100","榛勭煶":"420200","澶у喍":"420281","鍗佸牥":"420300","涓规睙鍙�":"420381","瀹滄槍":"420500","瀹滈兘":"420581","褰撻槼":"420582","鏋濇睙":"420583","瑗勯槼":"420600","鑰佹渤鍙�":"420682","鏋i槼":"420683","瀹滃煄":"420684","閯傚窞":"420700","鑽嗛棬":"420800","浜北":"420882","閽熺ゥ":"420881","瀛濇劅":"420900","搴斿煄":"420981","瀹夐檰":"420982","姹夊窛":"420984","鑽嗗窞":"421000","娌欏競鍖�":"421002","鐭抽":"421081","娲箹":"421083","鏉炬粙":"421087","榛勫唸":"421100","楹诲煄":"421181","姝︾┐":"421182","鍜稿畞":"421200","璧ゅ":"421281","闅忓窞":"421300","骞挎按":"421381","鎭╂柦":"422801","鍒╁窛":"422802","浠欐":"429004","娼滄睙":"429005","澶╅棬":"429006","闀挎矙":"430100","娴忛槼":"430181","瀹佷埂":"430182","鏍床":"430200","閱撮櫟":"430281","婀樻江":"430300","婀樹埂":"430381","闊跺北":"430382","琛¢槼":"430400","鑰掗槼":"430481","甯稿畞":"430482","閭甸槼":"430500","姝﹀唸":"430581","宀抽槼":"430600","姹ㄧ綏":"430681","涓存箻":"430682","甯稿痉":"430700","娲ュ競":"430781","寮犲鐣�":"430800","鐩婇槼":"430900","娌呮睙":"430981","閮村窞":"431000","璧勫叴":"431081","姘稿窞":"431100","鎬�鍖�":"431200","娲睙":"431281","濞勫簳":"431300","鍐锋按姹�":"431381","娑熸簮":"431382","鍚夐":"433101","骞垮窞":"440100","闊跺叧":"440200","涔愭槍":"440281","鍗楅泟":"440282","娣卞湷":"440300","鐝犳捣":"440400","姹曞ご":"440500","浣涘北":"440600","姹熼棬":"440700","鍙板北":"440781","寮�骞�":"440783","楣ゅ北":"440784","鎭╁钩":"440785","婀涙睙":"440800","寤夋睙":"440881","闆峰窞":"440882","鍚村窛":"440883","鑼傚悕":"440900","楂樺窞":"440981","鍖栧窞":"440982","淇″疁":"440983","鑲囧簡":"441200","鍥涗細":"441284","鎯犲窞":"441300","姊呭窞":"441400","鍏村畞":"441481","姹曞熬":"441500","闄嗕赴":"441581","娌虫簮":"441600","闃虫睙":"441700","闃虫槬":"441781","娓呰繙":"441800","鑻卞痉":"441881","杩炲窞":"441882","涓滆帪":"441900","涓北":"442000","娼窞":"445100","鎻槼":"445200","鏅畞":"445281","浜戞诞":"445300","缃楀畾":"445381","鍗楀畞":"450100","鏌冲窞":"450200","妗傛灄":"450300","鑽旀郸":"450381","姊у窞":"450400","宀戞邯":"450481","鍖楁捣":"450500","闃插煄娓�":"450600","涓滃叴":"450681","閽﹀窞":"450700","璐垫腐":"450800","妗傚钩":"450881","鐜夋灄":"450900","鍖楁祦":"450981","鐧捐壊":"451000","闈栬タ":"451081","璐哄窞":"451100","娌虫睜":"451200","鏉ュ":"451300","鍚堝北":"451381","宕囧乏":"451400","鍑ゥ":"451481","娴峰彛":"460100","涓変簹":"460200","涓夋矙":"460300","鍎嬪窞":"460400","浜旀寚灞�":"469001","鐞兼捣":"469002","鏂囨槍":"469005","涓囧畞":"469006","涓滄柟":"469007","閲嶅簡":"500000","閲嶅簡甯傞儕鍘�":"500200","鎴愰兘":"510100","閮芥睙鍫�":"510181","褰窞":"510182","閭涘磧":"510183","宕囧窞":"510184","绠�闃�":"510185","鑷础":"510300","鏀�鏋濊姳":"510400","娉稿窞":"510500","寰烽槼":"510600","骞挎眽":"510681","浠�閭�":"510682","缁电":"510683","缁甸槼":"510700","姹熸补":"510781","骞垮厓":"510800","閬傚畞":"510900","鍐呮睙":"511000","甯備腑鍖�":"511002","闅嗘槍":"511083","涔愬北":"511100","甯備腑鍖�":"511102","宄ㄧ湁灞�":"511181","鍗楀厖":"511300","闃嗕腑":"511381","鐪夊北":"511400","瀹滃":"511500","骞垮畨":"511600","鍗庤摜":"511681","杈惧窞":"511700","涓囨簮":"511781","闆呭畨":"511800","宸翠腑":"511900","璧勯槼":"512000","椹皵搴�":"513201","搴峰畾":"513301","瑗挎槍":"513401","璐甸槼":"520100","娓呴晣":"520181","鍏洏姘�":"520200","鐩樺窞":"520281","閬典箟":"520300","璧ゆ按":"520381","浠佹��":"520382","瀹夐『":"520400","姣曡妭":"520500","閾滀粊":"520600","鍏翠箟":"522301","鍏翠粊":"522302","鍑噷":"522601","閮藉寑":"522701","绂忔硥":"522702","鏄嗘槑":"530100","瀹夊畞":"530181","鏇查潠":"530300","瀹e▉":"530381","鐜夋邯":"530400","淇濆北":"530500","鑵惧啿":"530581","鏄��":"530600","姘村瘜":"530681","涓芥睙":"530700","鏅幢":"530800","涓存钵":"530900","妤氶泟":"532301","涓棫":"532501","寮�杩�":"532502","钂欒嚜":"532503","寮ュ嫆":"532504","鏂囧北":"532601","鏅椽":"532801","澶х悊":"532901","鐟炰附":"533102","鑺�":"533103","娉告按":"533301","棣欐牸閲屾媺":"533401","鎷夎惃":"540100","鏃ュ杸鍒�":"540200","鏄岄兘":"540300","鏋楄姖":"540400","灞卞崡":"540500","閭f洸":"540600","瑗垮畨":"610100","閾滃窛":"610200","瀹濋浮":"610300","鍜搁槼":"610400","褰窞":"610482","鍏村钩":"610481","娓崡":"610500","闊╁煄":"610581","鍗庨槾":"610582","寤跺畨":"610600","姹変腑":"610700","姒嗘灄":"610800","绁炴湪":"610881","瀹夊悍":"610900","鍟嗘礇":"611000","鍏板窞":"620100","鍢夊唱鍏�":"620200","閲戞槍":"620300","鐧介摱":"620400","澶╂按":"620500","姝﹀▉":"620600","寮犳帠":"620700","骞冲噳":"620800","鍗庝涵":"620881","閰掓硥":"620900","鐜夐棬":"620981","鏁︾厡":"620982","搴嗛槼":"621000","瀹氳タ":"621100","闄囧崡":"621200","涓村":"622901","鍚堜綔":"623001","瑗垮畞":"630100","娴蜂笢":"630200","鐜夋爲":"632701","鏍煎皵鏈�":"632801","寰蜂护鍝�":"632802","鑼礀":"632803","閾跺窛":"640100","鐏垫":"640181","鐭冲槾灞�":"640200","鍚村繝":"640300","闈掗摐宄�":"640381","鍥哄師":"640400","涓崼":"640500","涔岄瞾鏈ㄩ綈":"650100","鏂板競鍖�":"650104","鍏嬫媺鐜涗緷":"650200","鍚愰瞾鐣�":"650400","鍝堝瘑":"650500","鏄屽悏":"652301","闃滃悍":"652302","鍗氫箰":"652701","闃挎媺灞卞彛":"652702","搴撳皵鍕�":"652801","闃垮厠鑻�":"652901","闃垮浘浠�":"653001","鍠�浠�":"653101","鍜岀敯":"653201","浼婂畞":"654002","濂庡悲":"654003","闇嶅皵鏋滄柉":"654004","濉斿煄":"654201","涔岃嫃":"654202","闃垮嫆娉�":"654301","鐭虫渤瀛�":"659001","闃挎媺灏�":"659002","鍥炬湪鑸掑厠":"659003","浜斿娓�":"659004","鍖楀悲":"659005","閾侀棬鍏�":"659006","鍙屾渤":"659007","鍙厠杈炬媺":"659008","鏄嗙帀":"659009","浼婄妬":"654000"] + def baiduCityCodeMap = ["鍖椾含": "131", "澶╂触": "332", "鐭冲搴�": "150", "鍞愬北": "265", "绉︾殗宀�": "148", "閭兏": "151", "閭㈠彴": "266", "淇濆畾": "307", "寮犲鍙�": "264", "鎵垮痉": "207", "娌у窞": "149", "寤婂潑": "191", "琛℃按": "208", "澶師": "176", "澶у悓": "355", "闃虫硥": "357", "闀挎不": "356", "鏅嬪煄": "290", "鏈斿窞": "237", "鏅嬩腑": "238", "杩愬煄": "328", "蹇诲窞": "367", "涓存本": "368", "鍚曟": "327", "鍛煎拰娴╃壒": "321", "鍖呭ご": "229", "涔屾捣": "123", "璧ゅ嘲": "297", "閫氳窘": "64", "閯傚皵澶氭柉": "283", "鍛间鸡璐濆皵": "61", "宸村溅娣栧皵": "169", "涔屽叞瀵熷竷": "168", "鍏村畨鐩�": "62", "閿℃灄閮嫆鐩�": "63", "闃挎媺鍠勭洘": "230", "娌堥槼": "58", "澶ц繛": "167", "闉嶅北": "320", "鎶氶『": "184", "鏈邯": "227", "涓逛笢": "282", "閿﹀窞": "166", "钀ュ彛": "281", "闃滄柊": "59", "杈介槼": "351", "鐩橀敠": "228", "閾佸箔": "60", "鏈濋槼": "280", "钁姦宀�": "319", "闀挎槬": "53", "鍚夋灄甯�": "55", "鍥涘钩": "56", "杈芥簮": "183", "閫氬寲": "165", "鐧藉北": "57", "鏉惧師": "52", "鐧藉煄": "51", "寤惰竟鏈濋矞鏃忚嚜娌诲窞": "54", "鍝堝皵婊�": "48", "榻愰綈鍝堝皵": "41", "楦¤タ": "46", "楣ゅ矖": "43", "鍙岄腑灞�": "45", "澶у簡": "50", "浼婃槬": "40", "浣虫湪鏂�": "42", "涓冨彴娌�": "47", "鐗′腹姹�": "49", "榛戞渤": "39", "缁ュ寲": "44", "澶у叴瀹夊箔鍦板尯": "38", "涓婃捣": "289", "鍗椾含": "315", "鏃犻敗": "317", "寰愬窞": "316", "甯稿窞": "348", "鑻忓窞": "224", "鍗楅��": "161", "杩炰簯娓�": "347", "娣畨": "162", "鐩愬煄": "223", "鎵窞": "346", "闀囨睙": "160", "娉板窞": "276", "瀹胯縼": "277", "鏉窞": "179", "瀹佹尝": "180", "娓╁窞": "178", "鍢夊叴": "334", "婀栧窞": "294", "缁嶅叴": "293", "閲戝崕": "333", "琛㈠窞": "243", "鑸熷北": "245", "鍙板窞": "244", "涓芥按": "292", "鍚堣偉": "127", "鑺滄箹": "129", "铓屽煚": "126", "娣崡": "250", "椹瀺灞�": "358", "娣寳": "253", "閾滈櫟": "337", "瀹夊簡": "130", "榛勫北": "252", "婊佸窞": "189", "闃滈槼": "128", "瀹垮窞": "370", "宸㈡箹": "251", "鍏畨": "298", "浜冲窞": "188", "姹犲窞": "299", "瀹e煄": "190", "绂忓窞": "300", "鍘﹂棬": "194", "鑾嗙敯": "195", "涓夋槑": "254", "娉夊窞": "134", "婕冲窞": "255", "鍗楀钩": "133", "榫欏博": "193", "瀹佸痉": "192", "鍗楁槍": "163", "鏅痉闀�": "225", "钀嶄埂": "350", "涔濇睙": "349", "鏂颁綑": "164", "楣版江": "279", "璧e窞": "365", "鍚夊畨": "318", "瀹滄槬": "278", "鎶氬窞": "226", "涓婇ザ": "364", "娴庡崡": "288", "闈掑矝": "236", "娣勫崥": "354", "鏋e簞": "172", "涓滆惀": "174", "鐑熷彴": "326", "娼嶅潑": "287", "娴庡畞": "286", "娉板畨": "325", "濞佹捣": "175", "鏃ョ収": "173", "鑾辫姕": "124", "涓存矀": "234", "寰峰窞": "372", "鑱婂煄": "366", "婊ㄥ窞": "235", "鑿忔辰": "353", "閮戝窞": "268", "寮�灏�": "210", "娲涢槼": "153", "骞抽《灞�": "213", "瀹夐槼": "267", "楣ゅ": "215", "鏂颁埂": "152", "鐒︿綔": "211", "婵槼": "209", "璁告槍": "155", "婕渤": "344", "涓夐棬宄�": "212", "鍗楅槼": "309", "鍟嗕笜": "154", "淇¢槼": "214", "鍛ㄥ彛": "308", "椹婚┈搴�": "269", "姝︽眽": "218", "榛勭煶": "311", "鍗佸牥": "216", "瀹滄槍": "270", "瑗勯槼": "156", "閯傚窞": "122", "鑽嗛棬": "217", "瀛濇劅": "310", "鑽嗗窞": "157", "榛勫唸": "271", "鍜稿畞": "362", "闅忓窞": "371", "鎭╂柦鍦熷鏃忚嫍鏃忚嚜娌诲窞": "373", "浠欐": "1713", "娼滄睙": "1293", "澶╅棬": "2654", "绁炲啘鏋舵灄鍖�": "2734", "闀挎矙": "158", "鏍床": "222", "婀樻江": "313", "琛¢槼": "159", "閭甸槼": "273", "宀抽槼": "220", "甯稿痉": "219", "寮犲鐣�": "312", "鐩婇槼": "272", "閮村窞": "275", "姘稿窞": "314", "鎬�鍖�": "363", "濞勫簳": "221", "婀樿タ鍦熷鏃忚嫍鏃忚嚜娌诲窞": "274", "骞垮窞": "257", "闊跺叧": "137", "娣卞湷": "340", "鐝犳捣": "140", "姹曞ご": "303", "浣涘北": "138", "姹熼棬": "302", "婀涙睙": "198", "鑼傚悕": "139", "鑲囧簡": "338", "鎯犲窞": "301", "姊呭窞": "141", "姹曞熬": "339", "娌虫簮": "200", "闃虫睙": "199", "娓呰繙": "197", "涓滆帪": "119", "涓北": "187", "娼窞": "201", "鎻槼": "259", "浜戞诞": "258", "鍗楀畞": "261", "鏌冲窞": "305", "妗傛灄": "142", "姊у窞": "304", "鍖楁捣": "295", "闃插煄娓�": "204", "閽﹀窞": "145", "璐垫腐": "341", "鐜夋灄": "361", "鐧捐壊": "203", "璐哄窞": "260", "娌虫睜": "143", "鏉ュ": "202", "宕囧乏": "144", "娴峰彛": "125", "涓変簹": "121", "浜旀寚灞�": "1644", "鐞兼捣": "2358", "鍎嬪窞": "1215", "鏂囨槍": "2758", "涓囧畞": "1216", "涓滄柟": "2634", "瀹氬畨": "1214", "灞槍": "1641", "婢勮繄": "2757", "涓撮珮": "2033", "鐧芥矙榛庢棌鑷不": "2359", "鏄屾睙榛庢棌鑷不": "1642", "涔愪笢榛庢棌鑷不": "2032", "闄垫按榛庢棌鑷不": "1643", "淇濅涵榛庢棌鑻楁棌鑷不": "1217", "鐞间腑榛庢棌鑻楁棌鑷不": "2031", "閲嶅簡": "132", "鎴愰兘": "75", "鑷础": "78", "鏀�鏋濊姳": "81", "娉稿窞": "331", "寰烽槼": "74", "缁甸槼": "240", "骞垮厓": "329", "閬傚畞": "330", "鍐呮睙": "248", "涔愬北": "79", "鍗楀厖": "291", "鐪夊北": "77", "瀹滃": "186", "骞垮畨": "241", "杈惧窞": "369", "闆呭畨": "76", "宸翠腑": "239", "璧勯槼": "242", "闃垮潩钘忔棌缇屾棌鑷不宸�": "185", "鐢樺瓬钘忔棌鑷不宸�": "73", "鍑夊北褰濇棌鑷不宸�": "80", "璐甸槼": "146", "鍏洏姘�": "147", "閬典箟": "262", "瀹夐『": "263", "閾滀粊鍦板尯": "205", "榛旇タ鍗楀竷渚濇棌鑻楁棌鑷不宸�": "343", "姣曡妭鍦板尯": "206", "榛斾笢鍗楄嫍鏃忎緱鏃忚嚜娌诲窞": "342", "榛斿崡甯冧緷鏃忚嫍鏃忚嚜娌诲窞": "306", "鏄嗘槑": "104", "鏇查潠": "249", "鐜夋邯": "106", "淇濆北": "112", "鏄��": "336", "涓芥睙": "114", "涓存钵": "110", "妤氶泟褰濇棌鑷不宸�": "105", "绾㈡渤鍝堝凹鏃忓綕鏃忚嚜娌诲窞": "107", "鏂囧北澹棌鑻楁棌鑷不宸�": "177", "鏅幢": "108", "瑗垮弻鐗堢撼鍌f棌鑷不宸�": "109", "澶х悊鐧芥棌鑷不宸�": "111", "寰峰畯鍌f棌鏅鏃忚嚜娌诲窞": "116", "鎬掓睙鍌堝兂鏃忚嚜娌诲窞": "113", "杩簡钘忔棌鑷不宸�": "115", "鎷夎惃": "100", "鏄岄兘鍦板尯": "99", "灞卞崡鍦板尯": "97", "鏃ュ杸鍒欏湴鍖�": "102", "閭f洸鍦板尯": "101", "闃块噷鍦板尯": "103", "鏋楄姖鍦板尯": "98", "瑗垮畨": "233", "閾滃窛": "232", "瀹濋浮": "171", "鍜搁槼": "323", "娓崡": "170", "寤跺畨": "284", "姹変腑": "352", "姒嗘灄": "231", "瀹夊悍": "324", "鍟嗘礇": "285", "鍏板窞": "36", "鍢夊唱鍏�": "33", "閲戞槍": "34", "鐧介摱": "35", "澶╂按": "196", "姝﹀▉": "118", "寮犳帠": "117", "骞冲噳": "359", "閰掓硥": "37", "搴嗛槼": "135", "瀹氳タ": "136", "闄囧崡": "256", "涓村鍥炴棌鑷不宸�": "182", "鐢樺崡钘忔棌鑷不宸�": "247", "瑗垮畞": "66", "娴蜂笢鍦板尯": "69", "娴峰寳钘忔棌鑷不宸�": "67", "榛勫崡钘忔棌鑷不宸�": "70", "娴峰崡钘忔棌鑷不宸�": "68", "鏋滄礇钘忔棌鑷不宸�": "72", "鐜夋爲钘忔棌鑷不宸�": "71", "娴疯タ钂欏彜鏃忚棌鏃忚嚜娌诲窞": "65", "閾跺窛": "360", "鐭冲槾灞�": "335", "鍚村繝": "322", "鍥哄師": "246", "涓崼": "181", "涔岄瞾鏈ㄩ綈": "92", "鍏嬫媺鐜涗緷": "95", "鍚愰瞾鐣湴鍖�": "89", "鍝堝瘑鍦板尯": "91", "鏄屽悏鍥炴棌鑷不宸�": "93", "鍗氬皵濉旀媺钂欏彜鑷不宸�": "88", "宸撮煶閮钂欏彜鑷不宸�": "86", "闃垮厠鑻忓湴鍖�": "85", "鍏嬪瓬鍕掕嫃鏌皵鍏嬪瓬鑷不宸�": "84", "鍠�浠�鍦板尯": "83", "鍜岀敯鍦板尯": "82", "浼婄妬": "90", "濉斿煄鍦板尯": "94", "闃垮嫆娉板湴鍖�": "96", "鐭虫渤瀛�": "770", "闃挎媺灏�": "731", "鍥炬湪鑸掑厠": "792", "浜斿娓�": "789", "棣欐腐鐗瑰埆琛屾斂鍖�": "2912", "婢抽棬鐗瑰埆琛屾斂鍖�": "2911"] def allCitys = CommonDatautils.findAllCity(); def allRegionMap = CommonDatautils.getAllCityRegions() @@ -32,8 +32,8 @@ class ChongQingBlankTest { println k+" "+v.size() } - /* ExcelUtils.modify("D:\\数据\\重庆农商行\\重庆农商行测试样本(房价网v.1.2).xlsx",{row-> - if(row['B'].toString()=="重庆市九龙坡区建工三村7号"){ + /* ExcelUtils.modify("D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\閲嶅簡鍐滃晢琛屾祴璇曟牱鏈紙鎴夸环缃憊.1.2锛�.xlsx",{row-> + if(row['B'].toString()=="閲嶅簡甯備節榫欏潯鍖哄缓宸ヤ笁鏉�7鍙�"){ def city = CommonUtils.parseCityInAddress(row["B"]) if(!city){ city = CommonUtils.parseCityInAddress(row["C"]) @@ -140,7 +140,7 @@ class ChongQingBlankTest { def region = similarData.adname.replace("[]","") similarData.adname = RegionData.formatRegion(city, region) } - if(similarData.type && similarData.type.contains("村庄") && !similarData.township){ + if(similarData.type && similarData.type.contains("鏉戝簞") && !similarData.township){ def m = getMapRegion(similarData.location) if(m && m.township){ similarData.township = m.township @@ -168,7 +168,7 @@ class ChongQingBlankTest { // row['E'] = similarData.address.toString().replace("[]","") row['N'] = level if(similarData.pname){ - row['I'] = similarData.pname.replace("[]","").replace("省","").replace("市","") + row['I'] = similarData.pname.replace("[]","").replace("鐪�","").replace("甯�","") } if(similarData.cityname){ row['J'] = similarData.cityname.replace("[]","") @@ -210,7 +210,7 @@ class ChongQingBlankTest { def getLevel(newMap, oldMap, type){ def level = 0; if(newMap && oldMap){ - if((type && type.contains("村庄")) || !type){ + if((type && type.contains("鏉戝簞")) || !type){ if(newMap.orgKeywords == oldMap.orgKeywords){ return 5 } @@ -278,7 +278,7 @@ class ChongQingBlankTest { } def isAddress(address){ - def REG_ADDR1 = "[\u4e00-\u9fa5]{2,15}[路|巷|街|弄|街道|大道|大街|巷子|公路|马路|大道西段]\\d+"; + def REG_ADDR1 = "[\u4e00-\u9fa5]{2,15}[璺瘄宸穦琛梶寮剕琛楅亾|澶ч亾|澶ц|宸峰瓙|鍏矾|椹矾|澶ч亾瑗挎]\\d+"; def pattern = Pattern.compile(REG_ADDR1); def matcher = pattern.matcher(address) if(matcher.find()){ @@ -293,7 +293,7 @@ class ChongQingBlankTest { if(jsonObj && jsonObj.status=="1"){ def detailMap = jsonObj.regeocode.addressComponent if(!detailMap.city){ - if(detailMap.province && detailMap.province.toString().endsWith("市")){ + if(detailMap.province && detailMap.province.toString().endsWith("甯�")){ detailMap.city = detailMap.province } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/CompanyAddressCompare.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/CompanyAddressCompare.groovy index 081ede856..48be7116d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/CompanyAddressCompare.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/CompanyAddressCompare.groovy @@ -16,8 +16,8 @@ class CompanyAddressCompare { task.run() } def run(){ - ExcelUtils.modify("D:\\数据\\公司及地址\\公司及地址.xlsx",{row-> - if(row['D'] && !row['I'] && row['B'].contains("宁波甬城农村商业银行")){ + ExcelUtils.modify("D:\\鏁版嵁\\鍏徃鍙婂湴鍧�\\鍏徃鍙婂湴鍧�.xlsx",{row-> + if(row['D'] && !row['I'] && row['B'].contains("瀹佹尝鐢煄鍐滄潙鍟嗕笟閾惰")){ def city = CommonUtils.parseCityInAddress(row["D"]) if(!city){ city = CommonUtils.parseCityInAddress(row["B"]) @@ -25,9 +25,9 @@ class CompanyAddressCompare { if(city){ def similarData = null // if(isAddress(row["D"])){ - def simpleAddress = row["D"].toString().replace("中国(上海)自由贸易试验区","").replaceAll(/\\d+层/,"").replaceAll(/[一二三四五六]楼/,"") - if(simpleAddress && simpleAddress.contains("号")){ - simpleAddress = simpleAddress.substring(0, simpleAddress.lastIndexOf("号")+1) + def simpleAddress = row["D"].toString().replace("涓浗锛堜笂娴凤級鑷敱璐告槗璇曢獙鍖�","").replaceAll(/\\d+灞�/,"").replaceAll(/[涓�浜屼笁鍥涗簲鍏璢妤�/,"") + if(simpleAddress && simpleAddress.contains("鍙�")){ + simpleAddress = simpleAddress.substring(0, simpleAddress.lastIndexOf("鍙�")+1) } def pois = GaoDeUtils.search(simpleAddress, city, null) similarData = findSimilarDatas(pois, row["B"], simpleAddress, city, null) @@ -64,9 +64,9 @@ class CompanyAddressCompare { def nameScore = CosineSimilarAlgorithm.getSimilarityRatio(searchName, name); def addressScore = 0 if(poi.address){ - def poiAddress = poi.address.replace("号楼","号") + def poiAddress = poi.address.replace("鍙锋ゼ","鍙�") addressScore = CosineSimilarAlgorithm.getSimilarityRatio(poiAddress, address); - if(poi.address.contains("号") && address.contains("号") && (poiAddress.contains(address) || address.contains(poiAddress))){ + if(poi.address.contains("鍙�") && address.contains("鍙�") && (poiAddress.contains(address) || address.contains(poiAddress))){ addressScore = addressScore + 0.5 } } @@ -84,7 +84,7 @@ class CompanyAddressCompare { } def isAddress(address){ - def REG_ADDR1 = "[\u4e00-\u9fa5]{2,20}[路|巷|街|弄|街道|大道|大街|巷子|公路|马路|大道西段]\\d+"; + def REG_ADDR1 = "[\u4e00-\u9fa5]{2,20}[璺瘄宸穦琛梶寮剕琛楅亾|澶ч亾|澶ц|宸峰瓙|鍏矾|椹矾|澶ч亾瑗挎]\\d+"; def pattern = Pattern.compile(REG_ADDR1); def matcher = pattern.matcher(address) if(matcher.find()){ @@ -99,7 +99,7 @@ class CompanyAddressCompare { if(jsonObj && jsonObj.status=="1"){ def detailMap = jsonObj.regeocode.addressComponent if(!detailMap.city){ - if(detailMap.province && detailMap.province.toString().endsWith("市")){ + if(detailMap.province && detailMap.province.toString().endsWith("甯�")){ detailMap.city = detailMap.province } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/CrawlDistrictIdSelect.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/CrawlDistrictIdSelect.groovy index 0470fa957..d09032f33 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/CrawlDistrictIdSelect.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/CrawlDistrictIdSelect.groovy @@ -37,7 +37,7 @@ class CrawlDistrictIdSelect { } def run(){ - def source = "58同城" + def source = "58鍚屽煄" def root = "58.com" def shortCityMap = findCitySeeds(root) def datas = findCrawlData(source, shortCityMap, root) @@ -64,7 +64,7 @@ class CrawlDistrictIdSelect { def findCitySeeds(root){ def q = new BasicDBObject() q.put("root", root) - q.put("city", "福州") + q.put("city", "绂忓窞") def dbcursor = districtseedsColl.find(q) def cityMap = [:] @@ -79,7 +79,7 @@ class CrawlDistrictIdSelect { def findCrawlData(def source, shortCityMap, def root){ def q = new BasicDBObject() - q.put("city","福州") + q.put("city","绂忓窞") q.put("source", source) q.put("s_date",202112) def dbcursor = thirdPartyColl.find(q).batchSize(10000).setOptions(Bytes.QUERYOPTION_NOTIMEOUT) @@ -127,14 +127,14 @@ class CrawlDistrictIdSelect { ids << map }else{ index++ - println "[${index}]已存在:"+db.city +" "+db.name + println "[${index}]宸插瓨鍦細"+db.city +" "+db.name } keyList << db.city+"#"+district_id }else{ - println "重复:"+db.city+"#"+db.name + println "閲嶅锛�"+db.city+"#"+db.name } }else{ - println url +" 链接不合要求" + println url +" 閾炬帴涓嶅悎瑕佹眰" } } return retMap diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/DongGuangApiTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/DongGuangApiTest.groovy index 3b8227240..61fc697ae 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/DongGuangApiTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/DongGuangApiTest.groovy @@ -27,15 +27,15 @@ class DongGuangApiTest { def run(){ // def rets = findEsData(); - def rets = readTxt("D:\\数据\\东莞银行\\东莞银行 (1).csv") - println "ES 加载完成" + def rets = readTxt("D:\\鏁版嵁\\涓滆帪閾惰\\涓滆帪閾惰 (1).csv") + println "ES 鍔犺浇瀹屾垚" def datas = evaluation(rets) - println "重估完成" -// ExcelUtils.write("D:\\数据\\东莞银行\\东莞重估.xlsx", datas, "数据") - FileUtils.batchCreateFile(datas, "D:\\数据\\东莞银行\\东莞重估.txt", [], "utf-8", true); - println "txt 生成" - exportCsv("D:\\数据\\东莞银行\\东莞重估.csv", datas) - println "csv 生成" + println "閲嶄及瀹屾垚" +// ExcelUtils.write("D:\\鏁版嵁\\涓滆帪閾惰\\涓滆帪閲嶄及.xlsx", datas, "鏁版嵁") + FileUtils.batchCreateFile(datas, "D:\\鏁版嵁\\涓滆帪閾惰\\涓滆帪閲嶄及.txt", [], "utf-8", true); + println "txt 鐢熸垚" + exportCsv("D:\\鏁版嵁\\涓滆帪閾惰\\涓滆帪閲嶄及.csv", datas) + println "csv 鐢熸垚" } def readTxt(def fileName){ @@ -131,10 +131,10 @@ class DongGuangApiTest { if (file.exists()){ file.delete(); } - file.append("用户输入城市,") - file.append("用户输入城市区域,") - file.append("用户输入城市地址,") - file.append("用户输入城市面积,") + file.append("鐢ㄦ埛杈撳叆鍩庡競,") + file.append("鐢ㄦ埛杈撳叆鍩庡競鍖哄煙,") + file.append("鐢ㄦ埛杈撳叆鍩庡競鍦板潃,") + file.append("鐢ㄦ埛杈撳叆鍩庡競闈㈢Н,") file.append(System.getProperty("line.separator")); list.each{ def d = it; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/ExportToDealPrice.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/ExportToDealPrice.groovy index 4633e64b4..7fd4f2123 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/ExportToDealPrice.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/ExportToDealPrice.groovy @@ -62,7 +62,7 @@ class ExportToDealPrice { ret << dbo; index++; if(ret.size()%10000==0){ - println "第 "+(index/10000)+" 个"+ret.size() + println "绗� "+(index/10000)+" 涓�"+ret.size() TRADE_MATCH_PRICE_COLL.insert(ret); ret = []; } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/FZloationUpdate.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/FZloationUpdate.groovy index 8a490f49d..a0d82acef 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/FZloationUpdate.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/FZloationUpdate.groovy @@ -15,7 +15,7 @@ class FZloationUpdate { } def run(){ - def districts = CommonDatautils.findAllDistricts("福州", "district", ["city", "region","name","address","lat","lng"]); + def districts = CommonDatautils.findAllDistricts("绂忓窞", "district", ["city", "region","name","address","lat","lng"]); def index = 0 def locationMap = getMoreSameLocationDist(districts) def total = 0 @@ -45,7 +45,7 @@ class FZloationUpdate { def lat = null def lng = null def upldateFlag = "" - if(addrDistMap && addrDistMap.region.contains(dist.region) && (addrKey.contains("路") || addrKey.contains("大道")) && addrKey.contains("号") && dist.addr == addrKey){ + if(addrDistMap && addrDistMap.region.contains(dist.region) && (addrKey.contains("璺�") || addrKey.contains("澶ч亾")) && addrKey.contains("鍙�") && dist.addr == addrKey){ lat = addrDistMap.lat lng = addrDistMap.lng baidu = BaiDuApiUtils.geoconv(lng, lat, 3) @@ -69,7 +69,7 @@ class FZloationUpdate { udata.put("lat", lat0) udata.put("lng", lng0 ) // DbUtils.seaweed.update(new BasicDBObject("_id", dist._id), new BasicDBObject('$set', udata)) - println "[修改-${total}] "+ dist.region+" "+dist.name+" "+dist.address+" "+upldateFlag + println "[淇敼-${total}] "+ dist.region+" "+dist.name+" "+dist.address+" "+upldateFlag } } @@ -110,8 +110,8 @@ class FZloationUpdate { for(def i=0;i-1){ - if(s.indexOf(region+"区")>-1){ - key = s.substring(s.indexOf(region+"区")+region.size()+1, s.size()); - }else if(s.indexOf(region+"县")>-1){ - key = s.substring(s.indexOf(region+"县")+region.size()+1, s.size()); - }else if(s.indexOf(region+"市")>-1){ - key = s.substring(s.indexOf(region+"市")+region.size()+1, s.size()); + if(s.indexOf(region+"鍖�")>-1){ + key = s.substring(s.indexOf(region+"鍖�")+region.size()+1, s.size()); + }else if(s.indexOf(region+"鍘�")>-1){ + key = s.substring(s.indexOf(region+"鍘�")+region.size()+1, s.size()); + }else if(s.indexOf(region+"甯�")>-1){ + key = s.substring(s.indexOf(region+"甯�")+region.size()+1, s.size()); } }else{ key = s; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/FzBlankTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/FzBlankTest.groovy index 5a8f83a8f..d10b9f255 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/FzBlankTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/FzBlankTest.groovy @@ -34,7 +34,7 @@ class FzBlankTest { def addValue(){ - def filePath = "D:\\数据\\福州\\福州基准价数据V2-1(1)(1)(1).xls" + def filePath = "D:\\鏁版嵁\\绂忓窞\\绂忓窞鍩哄噯浠锋暟鎹甐2-1(1)(1)(1).xls" ExcelUtils.modify(filePath, { data -> def updateId = data['AB'] def fjwId = data['J'] @@ -46,7 +46,7 @@ class FzBlankTest { data['L'] = dist.name data['M'] = dist.address }else{ - println "【update】没查到 "+data['B'] + println "銆恥pdate銆戞病鏌ュ埌 "+data['B'] } }else{ if(fjwId){ @@ -57,7 +57,7 @@ class FzBlankTest { data['L'] = dist.name data['M'] = dist.address }else{ - println "【add】没查到 "+data['B'] + println "銆恆dd銆戞病鏌ュ埌 "+data['B'] } } } @@ -67,19 +67,19 @@ class FzBlankTest { def updateValue(){ - def filePath = "D:\\数据\\福州\\福州基准价数据(20201221).xls" + def filePath = "D:\\鏁版嵁\\绂忓窞\\绂忓窞鍩哄噯浠锋暟鎹�(20201221).xls" def datas = ExcelUtils.read(filePath, 0, 1) def index = 0 for(def data : datas){ def fid = data['J'] if(fid){ def name = data['B'] - if(name && name.contains("【混合】")){ + if(name && name.contains("銆愭贩鍚堛��")){ def dist = CommonDatautils.findDistrictById(fid) if(dist){ index ++; - BasicDBObject q = new BasicDBObject('build_structure',"混合结构") + BasicDBObject q = new BasicDBObject('build_structure',"娣峰悎缁撴瀯") DbUtils.seaweed.update(new BasicDBObject('_id',dist._id),new BasicDBObject('$set',q)) println index +" "+ name+" "+dist.build_structure } @@ -88,7 +88,7 @@ class FzBlankTest { } } def test(){ - def filePath = "D:\\数据\\福州\\福州基准价数据V2-1.xls" + def filePath = "D:\\鏁版嵁\\绂忓窞\\绂忓窞鍩哄噯浠锋暟鎹甐2-1.xls" ExcelUtils.modify(filePath, { row -> def fjw_name = row['L'] def fjw_addr = row['M'] @@ -106,7 +106,7 @@ class FzBlankTest { row['AA'] = "11" println name+" "+ addr +" "+ alias1+" "+ fjw_name + " "+ fjw_addr+" " }else if(name.contains(fjw_name) && addr.contains(fjw_name) && (alias1 && alias1==fjw_name)){ - row['AA'] = "12"//房价网名称在原始名称,地址中存在且等于别名1 + row['AA'] = "12"//鎴夸环缃戝悕绉板湪鍘熷鍚嶇О锛屽湴鍧�涓瓨鍦ㄤ笖绛変簬鍒悕1 println name+" "+ addr +" "+ alias1+" "+ fjw_name + " "+ fjw_addr+" " }else if(alias1 && (name==alias1 && alias1==addr)){ if(fjw_name == name || fjw_addr == name){ @@ -116,7 +116,7 @@ class FzBlankTest { row['AA'] = "13" println name+" "+ addr +" "+ alias1+" "+ fjw_name + " "+ fjw_addr+" " } - }else if(name.contains(fjw_name) && addr.contains(fjw_name) && alias1.contains(fjw_name) && !fjw_name.contains("区") && !fjw_name.contains("期") && !name.contains("区") && !addr.contains("期") && !alias1.contains("区") && !alias1.contains("期")){ + }else if(name.contains(fjw_name) && addr.contains(fjw_name) && alias1.contains(fjw_name) && !fjw_name.contains("鍖�") && !fjw_name.contains("鏈�") && !name.contains("鍖�") && !addr.contains("鏈�") && !alias1.contains("鍖�") && !alias1.contains("鏈�")){ row['AA'] = "14" println name+" "+ addr +" "+ alias1+" "+ fjw_name + " "+ fjw_addr+" " }else if(alias1 && (addr.contains(fjw_addr) && alias1.contains(fjw_name))){ @@ -134,7 +134,7 @@ class FzBlankTest { }); } def run(){ - def filePath = "D:\\数据\\福州\\福州基准价数据(1).xls" + def filePath = "D:\\鏁版嵁\\绂忓窞\\绂忓窞鍩哄噯浠锋暟鎹�(1).xls" def index = 0 ExcelUtils.multiThreadingModify(filePath, { row -> index++ @@ -166,7 +166,7 @@ class FzBlankTest { } def addressProcess(){ - def filePath = "D:\\数据\\福州\\福州基准价数据(交付-地址) -验证.xls" + def filePath = "D:\\鏁版嵁\\绂忓窞\\绂忓窞鍩哄噯浠锋暟鎹�(浜や粯-鍦板潃) -楠岃瘉.xls" def index = 0 ExcelUtils.modify(filePath, { data -> index++ @@ -175,7 +175,7 @@ class FzBlankTest { def fjwAddr = data['M'] def oldAddr = data['F'] println address+" "+fjwName+" "+ fjwName -// if((!address.contains("路") && !address.contains("巷") && !address.contains("号")) && !oldAddr.contains('号') && !oldAddr.contains('路') && !oldAddr.contains('街道') && !data['W']){ +// if((!address.contains("璺�") && !address.contains("宸�") && !address.contains("鍙�")) && !oldAddr.contains('鍙�') && !oldAddr.contains('璺�') && !oldAddr.contains('琛楅亾') && !data['W']){ // data['W'] = 3 // } @@ -209,7 +209,7 @@ class FzBlankTest { DbUtils.seaweed.update(new BasicDBObject('_id',fjwId),new BasicDBObject('$set', udata)) } }else{ - def oldMap = SeaweedDataMatchProcess.doMatch2("福州", address, null); + def oldMap = SeaweedDataMatchProcess.doMatch2("绂忓窞", address, null); if(oldMap){ def addr = null if(oldMap.street){ @@ -233,7 +233,7 @@ class FzBlankTest { } } -// def oldMap = SeaweedDataMatchProcess.doMatch2("福州", address, null); +// def oldMap = SeaweedDataMatchProcess.doMatch2("绂忓窞", address, null); // if(oldMap) { // def addr = null // if(oldMap.street){ @@ -248,7 +248,7 @@ class FzBlankTest { } def isStandardAddress(def address){ - def pattern = Pattern.compile("[路|街|大道|巷]\\d+[号|弄]"); + def pattern = Pattern.compile("[璺瘄琛梶澶ч亾|宸穄\\d+[鍙穦寮刔"); def matcher = pattern.matcher(address) if(matcher.find()){ def s = matcher.group(); @@ -258,7 +258,7 @@ class FzBlankTest { } def fzBlankAddress(){ - def filePath = "D:\\数据\\福州\\福州基准价数据(交付-地址) -验证.xls" + def filePath = "D:\\鏁版嵁\\绂忓窞\\绂忓窞鍩哄噯浠锋暟鎹�(浜や粯-鍦板潃) -楠岃瘉.xls" def index = 0 ExcelUtils.modify(filePath, { data -> def fzId = data['A'] @@ -294,7 +294,7 @@ class FzBlankTest { } def updateAddress(){ - def filePath = "D:\\数据\\福州\\福州基准价数据(交付-地址) -验证.xls" + def filePath = "D:\\鏁版嵁\\绂忓窞\\绂忓窞鍩哄噯浠锋暟鎹�(浜や粯-鍦板潃) -楠岃瘉.xls" def index = 0 def map = getFzAddress(); ExcelUtils.modify(filePath, { data -> @@ -313,7 +313,7 @@ class FzBlankTest { } def addressFlag(){ - def filePath = "D:\\数据\\福州\\福州基准价数据(交付-地址) -验证.xls" + def filePath = "D:\\鏁版嵁\\绂忓窞\\绂忓窞鍩哄噯浠锋暟鎹�(浜や粯-鍦板潃) -楠岃瘉.xls" ExcelUtils.modify(filePath, { data -> def address = data['B'] def fjwAddr = data['M'] @@ -326,14 +326,14 @@ class FzBlankTest { if(!data['AB'] && fzAddr && fjwAddr && fzAddr.contains(fjwAddr)){ data['AB'] = 3 } - if(!data['AB'] && fzAddr && address && !fzAddr.contains("路") && !fzAddr.contains("路")){ + if(!data['AB'] && fzAddr && address && !fzAddr.contains("璺�") && !fzAddr.contains("璺�")){ data['AB'] = 4 } },0); } def repeatMatch(){ - def filePath = "D:\\数据\\福州\\福州基准价数据(20201221).xls" + def filePath = "D:\\鏁版嵁\\绂忓窞\\绂忓窞鍩哄噯浠锋暟鎹�(20201221).xls" def datas = ExcelUtils.read(filePath, 0, 1) def map = [:] for(def data : datas){ @@ -355,7 +355,7 @@ class FzBlankTest { } } - ExcelUtils.write("D:\\数据\\福州\\匹配相同地址.xls", rets, "数据") + ExcelUtils.write("D:\\鏁版嵁\\绂忓窞\\鍖归厤鐩稿悓鍦板潃.xls", rets, "鏁版嵁") } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/JiangShuBlankDataStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/JiangShuBlankDataStat.groovy index 63543c6b5..1da5989dc 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/JiangShuBlankDataStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/JiangShuBlankDataStat.groovy @@ -36,7 +36,7 @@ class JiangShuBlankDataStat { } def repeat(){ - def datas = ExcelUtils.read("D:\\数据\\江苏农行\\江苏农行1484条.xlsx", 0,1) + def datas = ExcelUtils.read("D:\\鏁版嵁\\姹熻嫃鍐滆\\姹熻嫃鍐滆1484鏉�.xlsx", 0,1) def keys = [] for(def data : datas){ def key = data['W']+"##"+data['X']+"##"+data['Y'] @@ -61,9 +61,9 @@ class JiangShuBlankDataStat { } } - ExcelUtils.write("D:\\数据\\江苏农行\\全数据.xlsx", datas, "数据") + ExcelUtils.write("D:\\鏁版嵁\\姹熻嫃鍐滆\\鍏ㄦ暟鎹�.xlsx", datas, "鏁版嵁") -// ExcelUtils.multiThreadingModify("D:\\数据\\江苏农行\\江苏农行930条.xlsx",{row-> +// ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\姹熻嫃鍐滆\\姹熻嫃鍐滆930鏉�.xlsx",{row-> //// def address = row['G'] //// if(!row['X']){ //// def area = row['H'] @@ -81,18 +81,18 @@ class JiangShuBlankDataStat { // def inputRegion = row['X'] // def matchRegion = row['M'] // if( inputRegion&& matchRegion && inputRegion.contains(matchRegion)){ -// row['AA'] = "包含" +// row['AA'] = "鍖呭惈" // } //// def matchName = row['Y'] //// if(matchName && address && address.contains(matchName)){ -//// row['AL'] = "包含名称" +//// row['AL'] = "鍖呭惈鍚嶇О" //// } //// } // },0) } def matchCredit(){ - ExcelUtils.multiThreadingModify("D:\\数据\\江苏农行\\全数据.xlsx",{row-> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\姹熻嫃鍐滆\\鍏ㄦ暟鎹�.xlsx",{row-> def obj = CommonDatautils.findDistrict(row['E'], row['F'], row['G'], "district") if(obj){ row['H'] = obj.estate_type2 @@ -165,14 +165,14 @@ class JiangShuBlankDataStat { sbu.append(pMap.address+"\n"); } } - //FileUtils.writeStringToFile(new File("D:\\数据\\江苏农行\\log.txt"), sbu.toString(), "GBK") + //FileUtils.writeStringToFile(new File("D:\\鏁版嵁\\姹熻嫃鍐滆\\log.txt"), sbu.toString(), "GBK") } return rets; } def matchHouse(){ - ExcelUtils.multiThreadingModify("D:\\数据\\江苏农行\\全数据.xlsx",{row-> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\姹熻嫃鍐滆\\鍏ㄦ暟鎹�.xlsx",{row-> def obj = CommonDatautils.findDistrict(row['E'], row['F'], row['G'], "district") def mod = row['D'].toDouble()*0.2 def startArea = row['D'].toDouble()- mod @@ -251,8 +251,8 @@ class JiangShuBlankDataStat { } def villa(){ - ExcelUtils.multiThreadingModify("D:\\数据\\江苏农行\\200平以上.xlsx", { row -> - def obj = CommonDatautils.findDistrict(row['E'], row['F'], row['G']+"别墅", "district") + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\姹熻嫃鍐滆\\200骞充互涓�.xlsx", { row -> + def obj = CommonDatautils.findDistrict(row['E'], row['F'], row['G']+"鍒", "district") if(obj){ def dbo = CommonDatautils.queryDistrictPrice(obj.city, obj.region, obj.name, DateUtils.parseFromTightByPattern("2021-03-14","yyyy-MM-dd")) if(dbo){ @@ -265,7 +265,7 @@ class JiangShuBlankDataStat { } def addressParse(){ - ExcelUtils.multiThreadingModify("D:\\数据\\江苏农行\\200平以上.xlsx", { row -> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\姹熻嫃鍐滆\\200骞充互涓�.xlsx", { row -> def resp = OpenApiUtils.matchDistrict2(row['E'], row['C'], true) if(resp){ println resp @@ -292,16 +292,16 @@ class JiangShuBlankDataStat { def deleteProcess(){ - def datas = ExcelUtils.read("D:\\数据\\江苏农行\\江苏2千.xlsx",0,1) + def datas = ExcelUtils.read("D:\\鏁版嵁\\姹熻嫃鍐滆\\姹熻嫃2鍗�.xlsx",0,1) def addrList = [] for(def d : datas){ def addr = d['G'] addrList << addr } - ExcelUtils.multiThreadingModify("D:\\数据\\江苏农行\\200平以下.xlsx", { row -> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\姹熻嫃鍐滆\\200骞充互涓�.xlsx", { row -> def addr = row['C'] if(addrList.contains(addr)){ - row['R'] = "已调查" + row['R'] = "宸茶皟鏌�" } },0); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/JingDongTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/JingDongTest.groovy index 8acc1ff69..f37ccb099 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/JingDongTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/JingDongTest.groovy @@ -9,7 +9,7 @@ class JingDongTest { static main(args) { // def task = new JingDongTest() -// def path = "D:\\数据\\京东\\京东测试数据.xlsx" +// def path = "D:\\鏁版嵁\\浜笢\\浜笢娴嬭瘯鏁版嵁.xlsx" // task.run(path) // task.addPrice(path) // 120.12063,30.281452 @@ -18,7 +18,7 @@ class JingDongTest { // 120.137169,30.272963 // 120.108109,30.265553 - ExcelUtils.modify("C:\\Users\\gaojuan\\Downloads\\商铺出租信息 (3).xlsx",{d-> + ExcelUtils.modify("C:\\Users\\gaojuan\\Downloads\\鍟嗛摵鍑虹淇℃伅 (3).xlsx",{d-> if(d['J']){ def arrs = d['J'].split(",") def distance = GeoHelper.GetDistance(arrs[1].toString().toDouble(), arrs[0].toString().toDouble(), 22.554693, 113.869516) @@ -31,9 +31,9 @@ class JingDongTest { def run(path){ - def cityMap = ["北京":"大兴","厦门":"思明","泉州":"丰泽","安顺":"西秀"] + def cityMap = ["鍖椾含":"澶у叴","鍘﹂棬":"鎬濇槑","娉夊窞":"涓版辰","瀹夐『":"瑗跨"] def rets = [] - rets << ["城市","区域","名称","地址","高德经度","高德纬度","均价"] + rets << ["鍩庡競","鍖哄煙","鍚嶇О","鍦板潃","楂樺痉缁忓害","楂樺痉绾害","鍧囦环"] for(def m : cityMap) { println m.key +" "+m.value def districts = CommonDatautils.findAllRegionDistricts(m.key, m.value, "district", ["city", "region", "name", "address", "lng", "lat"]); @@ -45,7 +45,7 @@ class JingDongTest { } } - ExcelUtils.write(path, rets, "数据") + ExcelUtils.write(path, rets, "鏁版嵁") } def addPrice(path){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/MatchDistrict.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/MatchDistrict.groovy index 7d52d6a3b..899749aa4 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/MatchDistrict.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/MatchDistrict.groovy @@ -11,8 +11,8 @@ class MatchDistrict { task.run() } def run(){ - def filePath = "D:\\数据\\建行\\房产估值\\指导价\\深圳指导价 - 210909 -.xlsx" - def city = "深圳" + def filePath = "D:\\鏁版嵁\\寤鸿\\鎴夸骇浼板�糪\鎸囧浠穃\娣卞湷鎸囧浠� - 210909 -.xlsx" + def city = "娣卞湷" ExcelUtils.multiThreadingModify(filePath, { data -> if(data['A']){ def region = RegionData.formatRegion(city, data['A']) @@ -32,14 +32,14 @@ class MatchDistrict { //{ // "_id" : ObjectId("607963dc5bb87e2a18f4dde6"), // "guiding_type" : NumberInt(0), -// "estate_type" : "普通住宅", +// "estate_type" : "鏅�氫綇瀹�", // "house_type" : NumberInt(0), // "c_date" : ISODate("2021-04-16T10:15:56.651+0000"), -// "guiding_person" : "深圳房管局", +// "guiding_person" : "娣卞湷鎴跨灞�", // "guiding_date" : ISODate("2021-04-10T16:00:00.000+0000"), // "category" : "district", // "guiding_value" : NumberInt(48300), -// "name" : "中粮云景国际", -// "city" : "深圳", -// "region" : "光明" +// "name" : "涓伯浜戞櫙鍥介檯", +// "city" : "娣卞湷", +// "region" : "鍏夋槑" //} diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/MingShengStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/MingShengStat.groovy index e27c6adce..e3a212c5c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/MingShengStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/MingShengStat.groovy @@ -8,23 +8,23 @@ import com.mongodb.DBCollection class MingShengStat { - def cityLevel0 = ["北京","上海","广州","深圳"] - def cityLevel1 = ["成都","重庆","杭州","武汉","西安","郑州","青岛","长沙","天津","苏州","南京","东莞","沈阳","合肥","佛山"] - def cityLevel2 = ["昆明","福州","无锡","厦门","哈尔滨","长春","南昌","济南","宁波","大连","贵阳","温州","石家庄","泉州","南宁","金华","常州","珠海","惠州","嘉兴","南通","中山","保定","兰州","台州","徐州","太原","绍兴","烟台","廊坊"] - def cityLevel3 = ["海口","汕头","潍坊","扬州","洛阳","乌鲁木齐","临沂","唐山","镇江","盐城","湖州","赣州","漳州","揭阳","江门","桂林","邯郸","泰州","济宁","呼和浩特","咸阳","芜湖","三亚","阜阳","淮安遵义","银川","衡阳","上饶","柳州","淄博","莆田","绵阳","湛江","商丘","宜昌", - "沧州","连云港","南阳","蚌埠","驻马店","滁州","邢台","潮州","秦皇岛","肇庆","荆州","周口","马鞍山","清远","宿州","威海","九江","新乡","信阳","襄阳","岳阳","安庆","菏泽","宜春","黄冈","泰安","宿迁","株洲","宁德","鞍山","南充","六安","大庆","舟山"] - def cityLevel4 = ["常德","渭南湖","孝感","丽水","运城","德州","张家口","鄂尔多斯","阳江","泸州","丹东","曲靖","乐山","许昌","湘潭","晋中","安阳","齐齐哈尔","北海","宝鸡","抚州","景德镇","延安","三明","抚顺亳州","日照","西宁","衢州","拉萨","淮北","焦作","平顶山","滨州","吉安","濮阳","眉山","池州","荆门","铜仁","长治", - "衡水","铜陵","承德","达州","邵阳","德阳","龙岩","南平","淮南","黄石","营口","东营","吉林","韶关","枣庄","包头","怀化","宣城","临汾","聊城","梅州","盘锦","锦州","榆林","玉林","十堰","汕尾","咸宁","宜宾","永州","益阳","黔南州","黔东南","恩施","红河","大理","大同","鄂州","忻州","吕梁","黄山","开封","郴州","茂名","漯河","葫芦岛","河源","娄底","延边"] - def cityLevel5 = ["汉中","辽阳","四平","内江","六盘水","安顺","新余","牡丹江","晋城","自贡","三门峡","赤峰","本溪","防城港","铁岭","随州","广安","广元","天水","遂宁","萍乡","西双版纳","绥化","鹤壁","湘西","松原","阜新","酒泉","张家界","黔西南","保山","昭通","河池","来宾","玉溪","梧州","鹰潭","钦州","云浮","佳木斯","克拉玛依","呼伦贝尔","贺州", - "通化","阳泉","朝阳","百色","毕节","贵港","丽江","安康","通辽","德宏","朔州","伊犁","文山","楚雄","嘉峪关","凉山","资阳","锡林郭勒盟","雅安","普洱","崇左","庆阳","巴音郭楞(巴州)","乌兰察布","白山","昌吉","白城","兴安盟","定西","喀什","白银","陇南","巴彦淖尔","巴中","鸡西","乌海","临沧","海东","张掖","商洛","黑河","哈密","吴忠","阿克苏"] + def cityLevel0 = ["鍖椾含","涓婃捣","骞垮窞","娣卞湷"] + def cityLevel1 = ["鎴愰兘","閲嶅簡","鏉窞","姝︽眽","瑗垮畨","閮戝窞","闈掑矝","闀挎矙","澶╂触","鑻忓窞","鍗椾含","涓滆帪","娌堥槼","鍚堣偉","浣涘北"] + def cityLevel2 = ["鏄嗘槑","绂忓窞","鏃犻敗","鍘﹂棬","鍝堝皵婊�","闀挎槬","鍗楁槍","娴庡崡","瀹佹尝","澶ц繛","璐甸槼","娓╁窞","鐭冲搴�","娉夊窞","鍗楀畞","閲戝崕","甯稿窞","鐝犳捣","鎯犲窞","鍢夊叴","鍗楅��","涓北","淇濆畾","鍏板窞","鍙板窞","寰愬窞","澶師","缁嶅叴","鐑熷彴","寤婂潑"] + def cityLevel3 = ["娴峰彛","姹曞ご","娼嶅潑","鎵窞","娲涢槼","涔岄瞾鏈ㄩ綈","涓存矀","鍞愬北","闀囨睙","鐩愬煄","婀栧窞","璧e窞","婕冲窞","鎻槼","姹熼棬","妗傛灄","閭兏","娉板窞","娴庡畞","鍛煎拰娴╃壒","鍜搁槼","鑺滄箹","涓変簹","闃滈槼","娣畨閬典箟","閾跺窛","琛¢槼","涓婇ザ","鏌冲窞","娣勫崥","鑾嗙敯","缁甸槼","婀涙睙","鍟嗕笜","瀹滄槍", + "娌у窞","杩炰簯娓�","鍗楅槼","铓屽煚","椹婚┈搴�","婊佸窞","閭㈠彴","娼窞","绉︾殗宀�","鑲囧簡","鑽嗗窞","鍛ㄥ彛","椹瀺灞�","娓呰繙","瀹垮窞","濞佹捣","涔濇睙","鏂颁埂","淇¢槼","瑗勯槼","宀抽槼","瀹夊簡","鑿忔辰","瀹滄槬","榛勫唸","娉板畨","瀹胯縼","鏍床","瀹佸痉","闉嶅北","鍗楀厖","鍏畨","澶у簡","鑸熷北"] + def cityLevel4 = ["甯稿痉","娓崡婀�","瀛濇劅","涓芥按","杩愬煄","寰峰窞","寮犲鍙�","閯傚皵澶氭柉","闃虫睙","娉稿窞","涓逛笢","鏇查潠","涔愬北","璁告槍","婀樻江","鏅嬩腑","瀹夐槼","榻愰綈鍝堝皵","鍖楁捣","瀹濋浮","鎶氬窞","鏅痉闀�","寤跺畨","涓夋槑","鎶氶『浜冲窞","鏃ョ収","瑗垮畞","琛㈠窞","鎷夎惃","娣寳","鐒︿綔","骞抽《灞�","婊ㄥ窞","鍚夊畨","婵槼","鐪夊北","姹犲窞","鑽嗛棬","閾滀粊","闀挎不", + "琛℃按","閾滈櫟","鎵垮痉","杈惧窞","閭甸槼","寰烽槼","榫欏博","鍗楀钩","娣崡","榛勭煶","钀ュ彛","涓滆惀","鍚夋灄","闊跺叧","鏋e簞","鍖呭ご","鎬�鍖�","瀹e煄","涓存本","鑱婂煄","姊呭窞","鐩橀敠","閿﹀窞","姒嗘灄","鐜夋灄","鍗佸牥","姹曞熬","鍜稿畞","瀹滃","姘稿窞","鐩婇槼","榛斿崡宸�","榛斾笢鍗�","鎭╂柦","绾㈡渤","澶х悊","澶у悓","閯傚窞","蹇诲窞","鍚曟","榛勫北","寮�灏�","閮村窞","鑼傚悕","婕渤","钁姦宀�","娌虫簮","濞勫簳","寤惰竟"] + def cityLevel5 = ["姹変腑","杈介槼","鍥涘钩","鍐呮睙","鍏洏姘�","瀹夐『","鏂颁綑","鐗′腹姹�","鏅嬪煄","鑷础","涓夐棬宄�","璧ゅ嘲","鏈邯","闃插煄娓�","閾佸箔","闅忓窞","骞垮畨","骞垮厓","澶╂按","閬傚畞","钀嶄埂","瑗垮弻鐗堢撼","缁ュ寲","楣ゅ","婀樿タ","鏉惧師","闃滄柊","閰掓硥","寮犲鐣�","榛旇タ鍗�","淇濆北","鏄��","娌虫睜","鏉ュ","鐜夋邯","姊у窞","楣版江","閽﹀窞","浜戞诞","浣虫湪鏂�","鍏嬫媺鐜涗緷","鍛间鸡璐濆皵","璐哄窞", + "閫氬寲","闃虫硥","鏈濋槼","鐧捐壊","姣曡妭","璐垫腐","涓芥睙","瀹夊悍","閫氳窘","寰峰畯","鏈斿窞","浼婄妬","鏂囧北","妤氶泟","鍢夊唱鍏�","鍑夊北","璧勯槼","閿℃灄閮嫆鐩�","闆呭畨","鏅幢","宕囧乏","搴嗛槼","宸撮煶閮锛堝反宸烇級","涔屽叞瀵熷竷","鐧藉北","鏄屽悏","鐧藉煄","鍏村畨鐩�","瀹氳タ","鍠�浠�","鐧介摱","闄囧崡","宸村溅娣栧皵","宸翠腑","楦¤タ","涔屾捣","涓存钵","娴蜂笢","寮犳帠","鍟嗘礇","榛戞渤","鍝堝瘑","鍚村繝","闃垮厠鑻�"] - def ajkNewDistsMap = ["北京": 538, "上海": 1928, "广州": 1834, "深圳": 1149, "武汉": 2181, "大连": 866, "南京": 1442, "杭州": 2245, "太原": 497, "石家庄": 723, "重庆": 2700, "西安": 1693, "福州": 305, "济南": 1003, "宁波": 1304, "成都": 3004, "天津": 1614, "昆明": 755, "南昌": 697, "青岛": 1843, "厦门": 253, "郑州": 1385, "长沙": 1811, "长春": 741, "合肥": 1265, "呼和浩特": 462, "沈阳": 456, "贵阳": 499, "拉萨": 82, "宝鸡": 249, "汕头": 411, "苏州": 1531, "温州": 566, "泉州": 565, "邯郸": 314, "唐山": 442, "沧州": 248, "洛阳": 560, "南阳": 422, "襄阳": 302, "吕梁": 79, "大同": 171, "潍坊": 739, "南通": 735, "衡阳": 425, "中山": 590, "宜昌": 360, "许昌": 384, "盐城": 459, "济宁": 510, "龙岩": 227, "上饶": 288, "马鞍山": 199, "赣州": 385, "金华": 479, "常德": 394, "延边": 71, "泰州": 304, "三亚": 456, "淮安": 488, "咸宁": 307, "无锡": 703, "常州": 470, "镇江": 382, "烟台": 917, "绍兴": 714, "莆田": 261, "东莞": 729, "佛山": 1161, "株洲": 285, "黄石": 151, "孝感": 379] - def bkNewDistsMap = ["北京": 316, "上海": 2002, "广州": 1350, "深圳": 1261, "武汉": 2308, "大连": 438, "南京": 579, "杭州": 1892, "太原": 418, "石家庄": 582, "重庆": 2122, "西安": 1608, "福州": 512, "济南": 779, "宁波": 592, "成都": 2849, "天津": 1039, "昆明": 1262, "南昌": 429, "青岛": 1275, "厦门": 387, "郑州": 1146, "长沙": 1434, "长春": 433, "合肥": 807, "呼和浩特": 294, "沈阳": 1137, "贵阳": 242, "拉萨": 3, "宝鸡": 50, "苏州": 1129, "温州": 126, "泉州": 410, "邯郸": 114, "唐山": 181, "沧州": 50, "洛阳": 192, "南阳": 290, "襄阳": 55, "大同": 62, "潍坊": 332, "南通": 509, "衡阳": 83, "中山": 516, "宜昌": 147, "许昌": 156, "盐城": 211, "济宁": 205, "龙岩": 5, "上饶": 160, "马鞍山": 120, "赣州": 236, "金华": 124, "常德": 116, "三亚": 164, "淮安": 278, "咸宁": 75, "无锡": 575, "常州": 221, "镇江": 310, "烟台": 548, "绍兴": 175, "莆田": 13, "东莞": 622, "佛山": 971, "株洲": 134, "黄石": 88, "孝感": 94] - def ljNewDistMap = ["北京": 222, "上海": 1758, "广州": 1342, "深圳": 1240, "武汉": 2034, "大连": 433, "南京": 531, "杭州": 1845, "太原": 400, "石家庄": 566, "重庆": 2057, "西安": 1513, "济南": 685, "宁波": 553, "成都": 2683, "天津": 1015, "昆明": 1255, "南昌": 404, "青岛": 1228, "厦门": 361, "郑州": 986, "长沙": 1393, "长春": 367, "合肥": 786, "呼和浩特": 176, "沈阳": 1102, "贵阳": 187, "宝鸡": 0, "苏州": 1018, "温州": 222, "泉州": 329, "邯郸": 222, "唐山": 222, "洛阳": 0, "襄阳": 54, "潍坊": 222, "南通": 413, "衡阳": 0, "中山": 486, "宜昌": 7, "许昌": 0, "盐城": 0, "济宁": 0, "上饶": 0, "马鞍山": 0, "赣州": 0, "金华": 0, "常德": 0, "三亚": 156, "淮安": 0, "无锡": 550, "常州": 0, "镇江": 255, "烟台": 479, "绍兴": 150, "东莞": 589, "佛山": 948, "株洲": 0, "黄石": 40] - def sfNewDistMap =["北京": 222, "上海": 1758, "广州": 1342, "深圳": 1240, "武汉": 2034, "大连": 433, "南京": 531, "杭州": 1845, "太原": 400, "石家庄": 566, "重庆": 2057, "西安": 1513, "济南": 685, "宁波": 553, "成都": 2683, "天津": 1015, "昆明": 1255, "南昌": 404, "青岛": 1228, "厦门": 361, "郑州": 986, "长沙": 1393, "长春": 367, "合肥": 786, "呼和浩特": 176, "沈阳": 1102, "贵阳": 187, "宝鸡": 0, "苏州": 1018, "温州": 222, "泉州": 329, "邯郸": 222, "唐山": 222, "洛阳": 0, "襄阳": 54, "潍坊": 222, "南通": 413, "衡阳": 0, "中山": 486, "宜昌": 7, "许昌": 0, "盐城": 0, "济宁": 0, "上饶": 0, "马鞍山": 0, "赣州": 0, "金华": 0, "常德": 0, "三亚": 156, "淮安": 0, "无锡": 550, "常州": 0, "镇江": 255, "烟台": 479, "绍兴": 150, "东莞": 589, "佛山": 948, "株洲": 0, "黄石": 40] - def chNewDistMap = ["北京": 408, "上海": 532, "广州": 559, "深圳": 763, "武汉": 775, "大连": 7, "南京": 1137, "杭州": 517, "太原": 293, "石家庄": 567, "重庆": 817, "西安": 439, "济南": 544, "宁波": 555, "成都": 1094, "天津": 754, "昆明": 446, "南昌": 379, "青岛": 840, "厦门": 267, "郑州": 960, "长沙": 767, "长春": 299, "合肥": 404, "呼和浩特": 136, "沈阳": 385, "贵阳": 330, "拉萨": 41, "宝鸡": 145, "汕头": 220, "苏州": 715, "温州": 422, "泉州": 312, "邯郸": 425, "唐山": 317, "沧州": 298, "洛阳": 268, "南阳": 233, "襄阳": 84, "吕梁": 38, "大同": 121, "潍坊": 421, "南通": 328, "衡阳": 329, "中山": 279, "宜昌": 158, "许昌": 161, "盐城": 165, "济宁": 251, "龙岩": 90, "上饶": 136, "马鞍山": 69, "赣州": 265, "金华": 252, "常德": 192, "延边": 59, "泰州": 122, "三亚": 120, "淮安": 150, "咸宁": 175, "无锡": 468, "常州": 259, "镇江": 223, "烟台": 420, "绍兴": 368, "莆田": 106, "东莞": 249, "佛山": 438, "株洲": 216, "黄石": 96, "孝感": 160] - def jwNewDistMap = ["北京": 510, "上海": 1353, "广州": 1193, "深圳": 697, "武汉": 1746, "大连": 539, "南京": 1219, "杭州": 2030, "太原": 631, "石家庄": 521, "重庆": 2165, "西安": 1518, "济南": 811, "宁波": 1023, "成都": 3192, "天津": 91, "昆明": 764, "南昌": 632, "青岛": 1420, "厦门": 274, "郑州": 1509, "长沙": 1474, "长春": 400, "合肥": 1112, "呼和浩特": 320, "沈阳": 648, "贵阳": 501, "拉萨": 75, "宝鸡": 217, "汕头": 350, "苏州": 1210, "温州": 628, "泉州": 407, "邯郸": 203, "唐山": 638, "沧州": 367, "洛阳": 509, "南阳": 311, "襄阳": 206, "吕梁": 48, "大同": 159, "潍坊": 1041, "南通": 883, "衡阳": 420, "中山": 457, "宜昌": 319, "许昌": 151, "盐城": 488, "济宁": 534, "龙岩": 161, "上饶": 205, "马鞍山": 181, "赣州": 380, "金华": 424, "常德": 305, "延边": 102, "泰州": 172, "三亚": 460, "淮安": 368, "咸宁": 223, "无锡": 509, "常州": 420, "镇江": 506, "烟台": 976, "绍兴": 608, "莆田": 226, "东莞": 1270, "佛山": 894, "株洲": 274, "黄石": 170, "孝感": 233] - def zgNewDistMap = ["南京": 711, "大连": 143, "青岛": 1117, "济南": 577, "昆明": 726, "中山": 466, "佛山": 852, "盐城": 384, "北京": 563, "无锡": 342, "东莞": 428, "烟台": 853, "厦门": 289, "南通": 325, "太原": 310, "泉州": 354, "贵阳": 1324, "马鞍山": 141, "上海": 1776, "苏州": 385, "郑州": 610, "常州": 230, "洛阳": 228, "潍坊": 795, "赣州": 238, "淮安": 268, "深圳": 1034, "长沙": 1252, "石家庄": 296, "金华": 156, "南昌": 383, "泰州": 255, "广州": 1193, "三亚": 341, "宁波": 475, "唐山": 382, "镇江": 495, "济宁": 330, "莆田": 213, "沧州": 155, "宝鸡": 173, "重庆": 634, "沈阳": 494, "长春": 182, "襄阳": 164, "天津": 556, "合肥": 366, "宜昌": 252, "温州": 428, "南阳": 379, "成都": 2452, "绍兴": 147, "呼和浩特": 337, "武汉": 845, "西安": 1407, "邯郸": 220, "常德": 259, "杭州": 568, "黄石": 143, "大同": 151, "许昌": 289, "延边": 72, "咸宁": 230, "拉萨": 60, "株洲": 225, "上饶": 210, "孝感": 229, "吕梁": 78, "汕头": 329, "龙岩": 150, "衡阳": 328] + def ajkNewDistsMap = ["鍖椾含": 538, "涓婃捣": 1928, "骞垮窞": 1834, "娣卞湷": 1149, "姝︽眽": 2181, "澶ц繛": 866, "鍗椾含": 1442, "鏉窞": 2245, "澶師": 497, "鐭冲搴�": 723, "閲嶅簡": 2700, "瑗垮畨": 1693, "绂忓窞": 305, "娴庡崡": 1003, "瀹佹尝": 1304, "鎴愰兘": 3004, "澶╂触": 1614, "鏄嗘槑": 755, "鍗楁槍": 697, "闈掑矝": 1843, "鍘﹂棬": 253, "閮戝窞": 1385, "闀挎矙": 1811, "闀挎槬": 741, "鍚堣偉": 1265, "鍛煎拰娴╃壒": 462, "娌堥槼": 456, "璐甸槼": 499, "鎷夎惃": 82, "瀹濋浮": 249, "姹曞ご": 411, "鑻忓窞": 1531, "娓╁窞": 566, "娉夊窞": 565, "閭兏": 314, "鍞愬北": 442, "娌у窞": 248, "娲涢槼": 560, "鍗楅槼": 422, "瑗勯槼": 302, "鍚曟": 79, "澶у悓": 171, "娼嶅潑": 739, "鍗楅��": 735, "琛¢槼": 425, "涓北": 590, "瀹滄槍": 360, "璁告槍": 384, "鐩愬煄": 459, "娴庡畞": 510, "榫欏博": 227, "涓婇ザ": 288, "椹瀺灞�": 199, "璧e窞": 385, "閲戝崕": 479, "甯稿痉": 394, "寤惰竟": 71, "娉板窞": 304, "涓変簹": 456, "娣畨": 488, "鍜稿畞": 307, "鏃犻敗": 703, "甯稿窞": 470, "闀囨睙": 382, "鐑熷彴": 917, "缁嶅叴": 714, "鑾嗙敯": 261, "涓滆帪": 729, "浣涘北": 1161, "鏍床": 285, "榛勭煶": 151, "瀛濇劅": 379] + def bkNewDistsMap = ["鍖椾含": 316, "涓婃捣": 2002, "骞垮窞": 1350, "娣卞湷": 1261, "姝︽眽": 2308, "澶ц繛": 438, "鍗椾含": 579, "鏉窞": 1892, "澶師": 418, "鐭冲搴�": 582, "閲嶅簡": 2122, "瑗垮畨": 1608, "绂忓窞": 512, "娴庡崡": 779, "瀹佹尝": 592, "鎴愰兘": 2849, "澶╂触": 1039, "鏄嗘槑": 1262, "鍗楁槍": 429, "闈掑矝": 1275, "鍘﹂棬": 387, "閮戝窞": 1146, "闀挎矙": 1434, "闀挎槬": 433, "鍚堣偉": 807, "鍛煎拰娴╃壒": 294, "娌堥槼": 1137, "璐甸槼": 242, "鎷夎惃": 3, "瀹濋浮": 50, "鑻忓窞": 1129, "娓╁窞": 126, "娉夊窞": 410, "閭兏": 114, "鍞愬北": 181, "娌у窞": 50, "娲涢槼": 192, "鍗楅槼": 290, "瑗勯槼": 55, "澶у悓": 62, "娼嶅潑": 332, "鍗楅��": 509, "琛¢槼": 83, "涓北": 516, "瀹滄槍": 147, "璁告槍": 156, "鐩愬煄": 211, "娴庡畞": 205, "榫欏博": 5, "涓婇ザ": 160, "椹瀺灞�": 120, "璧e窞": 236, "閲戝崕": 124, "甯稿痉": 116, "涓変簹": 164, "娣畨": 278, "鍜稿畞": 75, "鏃犻敗": 575, "甯稿窞": 221, "闀囨睙": 310, "鐑熷彴": 548, "缁嶅叴": 175, "鑾嗙敯": 13, "涓滆帪": 622, "浣涘北": 971, "鏍床": 134, "榛勭煶": 88, "瀛濇劅": 94] + def ljNewDistMap = ["鍖椾含": 222, "涓婃捣": 1758, "骞垮窞": 1342, "娣卞湷": 1240, "姝︽眽": 2034, "澶ц繛": 433, "鍗椾含": 531, "鏉窞": 1845, "澶師": 400, "鐭冲搴�": 566, "閲嶅簡": 2057, "瑗垮畨": 1513, "娴庡崡": 685, "瀹佹尝": 553, "鎴愰兘": 2683, "澶╂触": 1015, "鏄嗘槑": 1255, "鍗楁槍": 404, "闈掑矝": 1228, "鍘﹂棬": 361, "閮戝窞": 986, "闀挎矙": 1393, "闀挎槬": 367, "鍚堣偉": 786, "鍛煎拰娴╃壒": 176, "娌堥槼": 1102, "璐甸槼": 187, "瀹濋浮": 0, "鑻忓窞": 1018, "娓╁窞": 222, "娉夊窞": 329, "閭兏": 222, "鍞愬北": 222, "娲涢槼": 0, "瑗勯槼": 54, "娼嶅潑": 222, "鍗楅��": 413, "琛¢槼": 0, "涓北": 486, "瀹滄槍": 7, "璁告槍": 0, "鐩愬煄": 0, "娴庡畞": 0, "涓婇ザ": 0, "椹瀺灞�": 0, "璧e窞": 0, "閲戝崕": 0, "甯稿痉": 0, "涓変簹": 156, "娣畨": 0, "鏃犻敗": 550, "甯稿窞": 0, "闀囨睙": 255, "鐑熷彴": 479, "缁嶅叴": 150, "涓滆帪": 589, "浣涘北": 948, "鏍床": 0, "榛勭煶": 40] + def sfNewDistMap =["鍖椾含": 222, "涓婃捣": 1758, "骞垮窞": 1342, "娣卞湷": 1240, "姝︽眽": 2034, "澶ц繛": 433, "鍗椾含": 531, "鏉窞": 1845, "澶師": 400, "鐭冲搴�": 566, "閲嶅簡": 2057, "瑗垮畨": 1513, "娴庡崡": 685, "瀹佹尝": 553, "鎴愰兘": 2683, "澶╂触": 1015, "鏄嗘槑": 1255, "鍗楁槍": 404, "闈掑矝": 1228, "鍘﹂棬": 361, "閮戝窞": 986, "闀挎矙": 1393, "闀挎槬": 367, "鍚堣偉": 786, "鍛煎拰娴╃壒": 176, "娌堥槼": 1102, "璐甸槼": 187, "瀹濋浮": 0, "鑻忓窞": 1018, "娓╁窞": 222, "娉夊窞": 329, "閭兏": 222, "鍞愬北": 222, "娲涢槼": 0, "瑗勯槼": 54, "娼嶅潑": 222, "鍗楅��": 413, "琛¢槼": 0, "涓北": 486, "瀹滄槍": 7, "璁告槍": 0, "鐩愬煄": 0, "娴庡畞": 0, "涓婇ザ": 0, "椹瀺灞�": 0, "璧e窞": 0, "閲戝崕": 0, "甯稿痉": 0, "涓変簹": 156, "娣畨": 0, "鏃犻敗": 550, "甯稿窞": 0, "闀囨睙": 255, "鐑熷彴": 479, "缁嶅叴": 150, "涓滆帪": 589, "浣涘北": 948, "鏍床": 0, "榛勭煶": 40] + def chNewDistMap = ["鍖椾含": 408, "涓婃捣": 532, "骞垮窞": 559, "娣卞湷": 763, "姝︽眽": 775, "澶ц繛": 7, "鍗椾含": 1137, "鏉窞": 517, "澶師": 293, "鐭冲搴�": 567, "閲嶅簡": 817, "瑗垮畨": 439, "娴庡崡": 544, "瀹佹尝": 555, "鎴愰兘": 1094, "澶╂触": 754, "鏄嗘槑": 446, "鍗楁槍": 379, "闈掑矝": 840, "鍘﹂棬": 267, "閮戝窞": 960, "闀挎矙": 767, "闀挎槬": 299, "鍚堣偉": 404, "鍛煎拰娴╃壒": 136, "娌堥槼": 385, "璐甸槼": 330, "鎷夎惃": 41, "瀹濋浮": 145, "姹曞ご": 220, "鑻忓窞": 715, "娓╁窞": 422, "娉夊窞": 312, "閭兏": 425, "鍞愬北": 317, "娌у窞": 298, "娲涢槼": 268, "鍗楅槼": 233, "瑗勯槼": 84, "鍚曟": 38, "澶у悓": 121, "娼嶅潑": 421, "鍗楅��": 328, "琛¢槼": 329, "涓北": 279, "瀹滄槍": 158, "璁告槍": 161, "鐩愬煄": 165, "娴庡畞": 251, "榫欏博": 90, "涓婇ザ": 136, "椹瀺灞�": 69, "璧e窞": 265, "閲戝崕": 252, "甯稿痉": 192, "寤惰竟": 59, "娉板窞": 122, "涓変簹": 120, "娣畨": 150, "鍜稿畞": 175, "鏃犻敗": 468, "甯稿窞": 259, "闀囨睙": 223, "鐑熷彴": 420, "缁嶅叴": 368, "鑾嗙敯": 106, "涓滆帪": 249, "浣涘北": 438, "鏍床": 216, "榛勭煶": 96, "瀛濇劅": 160] + def jwNewDistMap = ["鍖椾含": 510, "涓婃捣": 1353, "骞垮窞": 1193, "娣卞湷": 697, "姝︽眽": 1746, "澶ц繛": 539, "鍗椾含": 1219, "鏉窞": 2030, "澶師": 631, "鐭冲搴�": 521, "閲嶅簡": 2165, "瑗垮畨": 1518, "娴庡崡": 811, "瀹佹尝": 1023, "鎴愰兘": 3192, "澶╂触": 91, "鏄嗘槑": 764, "鍗楁槍": 632, "闈掑矝": 1420, "鍘﹂棬": 274, "閮戝窞": 1509, "闀挎矙": 1474, "闀挎槬": 400, "鍚堣偉": 1112, "鍛煎拰娴╃壒": 320, "娌堥槼": 648, "璐甸槼": 501, "鎷夎惃": 75, "瀹濋浮": 217, "姹曞ご": 350, "鑻忓窞": 1210, "娓╁窞": 628, "娉夊窞": 407, "閭兏": 203, "鍞愬北": 638, "娌у窞": 367, "娲涢槼": 509, "鍗楅槼": 311, "瑗勯槼": 206, "鍚曟": 48, "澶у悓": 159, "娼嶅潑": 1041, "鍗楅��": 883, "琛¢槼": 420, "涓北": 457, "瀹滄槍": 319, "璁告槍": 151, "鐩愬煄": 488, "娴庡畞": 534, "榫欏博": 161, "涓婇ザ": 205, "椹瀺灞�": 181, "璧e窞": 380, "閲戝崕": 424, "甯稿痉": 305, "寤惰竟": 102, "娉板窞": 172, "涓変簹": 460, "娣畨": 368, "鍜稿畞": 223, "鏃犻敗": 509, "甯稿窞": 420, "闀囨睙": 506, "鐑熷彴": 976, "缁嶅叴": 608, "鑾嗙敯": 226, "涓滆帪": 1270, "浣涘北": 894, "鏍床": 274, "榛勭煶": 170, "瀛濇劅": 233] + def zgNewDistMap = ["鍗椾含": 711, "澶ц繛": 143, "闈掑矝": 1117, "娴庡崡": 577, "鏄嗘槑": 726, "涓北": 466, "浣涘北": 852, "鐩愬煄": 384, "鍖椾含": 563, "鏃犻敗": 342, "涓滆帪": 428, "鐑熷彴": 853, "鍘﹂棬": 289, "鍗楅��": 325, "澶師": 310, "娉夊窞": 354, "璐甸槼": 1324, "椹瀺灞�": 141, "涓婃捣": 1776, "鑻忓窞": 385, "閮戝窞": 610, "甯稿窞": 230, "娲涢槼": 228, "娼嶅潑": 795, "璧e窞": 238, "娣畨": 268, "娣卞湷": 1034, "闀挎矙": 1252, "鐭冲搴�": 296, "閲戝崕": 156, "鍗楁槍": 383, "娉板窞": 255, "骞垮窞": 1193, "涓変簹": 341, "瀹佹尝": 475, "鍞愬北": 382, "闀囨睙": 495, "娴庡畞": 330, "鑾嗙敯": 213, "娌у窞": 155, "瀹濋浮": 173, "閲嶅簡": 634, "娌堥槼": 494, "闀挎槬": 182, "瑗勯槼": 164, "澶╂触": 556, "鍚堣偉": 366, "瀹滄槍": 252, "娓╁窞": 428, "鍗楅槼": 379, "鎴愰兘": 2452, "缁嶅叴": 147, "鍛煎拰娴╃壒": 337, "姝︽眽": 845, "瑗垮畨": 1407, "閭兏": 220, "甯稿痉": 259, "鏉窞": 568, "榛勭煶": 143, "澶у悓": 151, "璁告槍": 289, "寤惰竟": 72, "鍜稿畞": 230, "鎷夎惃": 60, "鏍床": 225, "涓婇ザ": 210, "瀛濇劅": 229, "鍚曟": 78, "姹曞ご": 329, "榫欏博": 150, "琛¢槼": 328] def fields = ["city","region","district_name","estate_type","area","avg_price","total_price","direction","fitment","room","hall","toilet","floor","height","build_structure","comm_id","dataType1","purpose","root","url", "p_date"] def no_fields = ["build_date","build_type","floor_info"] @@ -39,7 +39,7 @@ class MingShengStat { } def addDistBuildStr(){ - def citys = ["北京","上海","广州","深圳","武汉","大连","南京","杭州","太原","石家庄","重庆","西安","福州","济南","宁波","成都","天津","昆明","南昌","青岛","厦门","郑州","长沙","长春","合肥","呼和浩特","沈阳","贵阳","拉萨","宝鸡","汕头","苏州","温州","泉州","邯郸","唐山","沧州","洛阳","南阳","襄阳","吕梁","大同","潍坊","南通","衡阳","中山","宜昌","许昌","盐城","济宁","龙岩","上饶","马鞍山","赣州","金华","常德","延边","泰州","三亚","淮安","咸宁","无锡","常州","镇江","烟台","绍兴","莆田","东莞","佛山","株洲","黄石","孝感","香港"] + def citys = ["鍖椾含","涓婃捣","骞垮窞","娣卞湷","姝︽眽","澶ц繛","鍗椾含","鏉窞","澶師","鐭冲搴�","閲嶅簡","瑗垮畨","绂忓窞","娴庡崡","瀹佹尝","鎴愰兘","澶╂触","鏄嗘槑","鍗楁槍","闈掑矝","鍘﹂棬","閮戝窞","闀挎矙","闀挎槬","鍚堣偉","鍛煎拰娴╃壒","娌堥槼","璐甸槼","鎷夎惃","瀹濋浮","姹曞ご","鑻忓窞","娓╁窞","娉夊窞","閭兏","鍞愬北","娌у窞","娲涢槼","鍗楅槼","瑗勯槼","鍚曟","澶у悓","娼嶅潑","鍗楅��","琛¢槼","涓北","瀹滄槍","璁告槍","鐩愬煄","娴庡畞","榫欏博","涓婇ザ","椹瀺灞�","璧e窞","閲戝崕","甯稿痉","寤惰竟","娉板窞","涓変簹","娣畨","鍜稿畞","鏃犻敗","甯稿窞","闀囨睙","鐑熷彴","缁嶅叴","鑾嗙敯","涓滆帪","浣涘北","鏍床","榛勭煶","瀛濇劅","棣欐腐"] def rows = [] for(def c : citys){ @@ -52,11 +52,11 @@ class MingShengStat { } rows << row } - ExcelUtils.write("D:\\数据\\民生\\字段覆盖率统计-竣工时间.xlsx", rows, "字段统计") + ExcelUtils.write("D:\\鏁版嵁\\姘戠敓\\瀛楁瑕嗙洊鐜囩粺璁�-绔e伐鏃堕棿.xlsx", rows, "瀛楁缁熻") } def houseFieldStat(){ - def citys = ["北京","上海","广州","深圳","武汉","大连","南京","杭州","太原","石家庄","重庆","西安","福州","济南","宁波","成都","天津","昆明","南昌","青岛","厦门","郑州","长沙","长春","合肥","呼和浩特","沈阳","贵阳","拉萨","宝鸡","汕头","苏州","温州","泉州","邯郸","唐山","沧州","洛阳","南阳","襄阳","吕梁","大同","潍坊","南通","衡阳","中山","宜昌","许昌","盐城","济宁","龙岩","上饶","马鞍山","赣州","金华","常德","延边","泰州","三亚","淮安","咸宁","无锡","常州","镇江","烟台","绍兴","莆田","东莞","佛山","株洲","黄石","孝感","香港"] + def citys = ["鍖椾含","涓婃捣","骞垮窞","娣卞湷","姝︽眽","澶ц繛","鍗椾含","鏉窞","澶師","鐭冲搴�","閲嶅簡","瑗垮畨","绂忓窞","娴庡崡","瀹佹尝","鎴愰兘","澶╂触","鏄嗘槑","鍗楁槍","闈掑矝","鍘﹂棬","閮戝窞","闀挎矙","闀挎槬","鍚堣偉","鍛煎拰娴╃壒","娌堥槼","璐甸槼","鎷夎惃","瀹濋浮","姹曞ご","鑻忓窞","娓╁窞","娉夊窞","閭兏","鍞愬北","娌у窞","娲涢槼","鍗楅槼","瑗勯槼","鍚曟","澶у悓","娼嶅潑","鍗楅��","琛¢槼","涓北","瀹滄槍","璁告槍","鐩愬煄","娴庡畞","榫欏博","涓婇ザ","椹瀺灞�","璧e窞","閲戝崕","甯稿痉","寤惰竟","娉板窞","涓変簹","娣畨","鍜稿畞","鏃犻敗","甯稿窞","闀囨睙","鐑熷彴","缁嶅叴","鑾嗙敯","涓滆帪","浣涘北","鏍床","榛勭煶","瀛濇劅","棣欐腐"] def rows = [] for(def c : citys){ def row = [] @@ -74,13 +74,13 @@ class MingShengStat { rows << row } - ExcelUtils.write("D:\\数据\\民生\\字段覆盖率统计2.xlsx", rows, "字段统计") + ExcelUtils.write("D:\\鏁版嵁\\姘戠敓\\瀛楁瑕嗙洊鐜囩粺璁�2.xlsx", rows, "瀛楁缁熻") } def statFloorInfo(){ - def file = "D:\\数据\\民生\\字段覆盖率统计-楼层.xlsx" + def file = "D:\\鏁版嵁\\姘戠敓\\瀛楁瑕嗙洊鐜囩粺璁�-妤煎眰.xlsx" ExcelUtils.multiThreadingModify(file,{d-> def total = findHouseCount(d['A']) if(total>=100000){ @@ -97,8 +97,8 @@ class MingShengStat { } def addHouseRate(){ - // def datas = ExcelUtils.read("C:\\Users\\gaojuan\\Downloads\\估值数据统计结果20220816.xlsx",0,1) - ExcelUtils.multiThreadingModify("D:\\数据\\民生\\城市统计.xlsx",{d-> + // def datas = ExcelUtils.read("C:\\Users\\gaojuan\\Downloads\\浼板�兼暟鎹粺璁$粨鏋�20220816.xlsx",0,1) + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\姘戠敓\\鍩庡競缁熻.xlsx",{d-> if(d['B']){ def cityInfoDto = CommonDatautils.findCityInfo(d['B']) d['G'] = com.fangjia.script.common.DataHandleUtils.getDoubleRound(2, cityInfoDto.price_coverage*100) @@ -128,7 +128,7 @@ class MingShengStat { ElasticUtils.executeSqlQuery(sql, { count++ def s = it.floor_info - if(s && !s.contains("暂")){ + if(s && !s.contains("鏆�")){ f_count = f_count +1 } println("${count} $city\t floor_info ${s}") @@ -172,27 +172,27 @@ class MingShengStat { } def addNewLevel(){ - ExcelUtils.modify("D:\\数据\\民生\\城市统计.xlsx",{d-> + ExcelUtils.modify("D:\\鏁版嵁\\姘戠敓\\鍩庡競缁熻.xlsx",{d-> if(d['B']){ if(cityLevel0.contains(d['B'])){ - d['D'] = "一线" + d['D'] = "涓�绾�" }else if(cityLevel1.contains(d['B'])){ - d['D'] = "新一线" + d['D'] = "鏂颁竴绾�" }else if(cityLevel2.contains(d['B'])){ - d['D'] = "二线" + d['D'] = "浜岀嚎" }else if(cityLevel3.contains(d['B'])){ - d['D'] = "三线" + d['D'] = "涓夌嚎" }else if(cityLevel4.contains(d['B'])){ - d['D'] = "四线" + d['D'] = "鍥涚嚎" }else if(cityLevel5.contains(d['B'])){ - d['D'] = "五线" + d['D'] = "浜旂嚎" } } }) } def run(){ - def citys = ["北京","上海","广州","深圳","武汉","大连","南京","杭州","太原","石家庄","重庆","西安","福州","济南","宁波","成都","天津","昆明","南昌","青岛","厦门","郑州","长沙","长春","合肥","呼和浩特","沈阳","贵阳","拉萨","宝鸡","汕头","苏州","温州","泉州","邯郸","唐山","沧州","洛阳","南阳","襄阳","吕梁","大同","潍坊","南通","衡阳","中山","宜昌","许昌","盐城","济宁","龙岩","上饶","马鞍山","赣州","金华","常德","延边","泰州","三亚","淮安","咸宁","无锡","常州","镇江","烟台","绍兴","莆田","东莞","佛山","株洲","黄石","孝感","香港"] + def citys = ["鍖椾含","涓婃捣","骞垮窞","娣卞湷","姝︽眽","澶ц繛","鍗椾含","鏉窞","澶師","鐭冲搴�","閲嶅簡","瑗垮畨","绂忓窞","娴庡崡","瀹佹尝","鎴愰兘","澶╂触","鏄嗘槑","鍗楁槍","闈掑矝","鍘﹂棬","閮戝窞","闀挎矙","闀挎槬","鍚堣偉","鍛煎拰娴╃壒","娌堥槼","璐甸槼","鎷夎惃","瀹濋浮","姹曞ご","鑻忓窞","娓╁窞","娉夊窞","閭兏","鍞愬北","娌у窞","娲涢槼","鍗楅槼","瑗勯槼","鍚曟","澶у悓","娼嶅潑","鍗楅��","琛¢槼","涓北","瀹滄槍","璁告槍","鐩愬煄","娴庡畞","榫欏博","涓婇ザ","椹瀺灞�","璧e窞","閲戝崕","甯稿痉","寤惰竟","娉板窞","涓変簹","娣畨","鍜稿畞","鏃犻敗","甯稿窞","闀囨睙","鐑熷彴","缁嶅叴","鑾嗙敯","涓滆帪","浣涘北","鏍床","榛勭煶","瀛濇劅","棣欐腐"] def rows = [] for(def c : citys){ def dbo = CommonDatautils.findAlCityDetail(c) @@ -208,7 +208,7 @@ class MingShengStat { } rows << row } - ExcelUtils.write("D:\\数据\\民生\\城市统计.xlsx", rows, "数据") + ExcelUtils.write("D:\\鏁版嵁\\姘戠敓\\鍩庡競缁熻.xlsx", rows, "鏁版嵁") } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/NonghangDataExport.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/NonghangDataExport.groovy index fab3ed33b..8cba06603 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/NonghangDataExport.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/NonghangDataExport.groovy @@ -7,7 +7,7 @@ class NonghangDataExport { task.run() } def run(){ - def citys = ["临沂","广州", "深圳"] + def citys = ["涓存矀","骞垮窞", "娣卞湷"] for(def c : citys){ } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/PoiTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/PoiTest.groovy index 6bc14bab2..e8f28bd19 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/PoiTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/PoiTest.groovy @@ -8,7 +8,7 @@ import com.fangjia.script.util.GeoUtils import com.fangjia.script.yinjihaun.amap.GaoDeApiUtils -//def json = GaoDeApiUtils.geo("上海市", "上海市浦东新区永泰路1138弄11号") +//def json = GaoDeApiUtils.geo("涓婃捣甯�", "涓婃捣甯傛郸涓滄柊鍖烘案娉拌矾1138寮�11鍙�") //def locationStr = null //if(json && json.count>=1){ // def m = json.geocodes[0] @@ -21,10 +21,10 @@ def location = ["lng":121.526016,"lat":31.143047] //def rows = [] -//rows << ["城市","区域","名称","地址","距离","均价"] +//rows << ["鍩庡競","鍖哄煙","鍚嶇О","鍦板潃","璺濈","鍧囦环"] //if(location && location.lat){ // -// def dbos = CommonDatautils.getDistrictArround("上海", 121.526016, 31.143047) +// def dbos = CommonDatautils.getDistrictArround("涓婃捣", 121.526016, 31.143047) // for(def d : dbos){ // // def dbo = CommonDatautils.findDistrictPrice(d.city, d.region, d.name); @@ -39,7 +39,7 @@ def location = ["lng":121.526016,"lat":31.143047] // } // //// def map = CommonDatautils.findMaxLatLngMinLatLng(location.lat, location.lng, 1000); -//// def ret = CommonDatautils.findInRangeDist("上海", "district", (map.maxLat * 10000000000d).toLong(), (map.minLat * 10000000000d).toLong(), (map.maxLng * 10000000000d).toLong(), (map.minLng * 10000000000d).toLong()); +//// def ret = CommonDatautils.findInRangeDist("涓婃捣", "district", (map.maxLat * 10000000000d).toLong(), (map.minLat * 10000000000d).toLong(), (map.maxLng * 10000000000d).toLong(), (map.minLng * 10000000000d).toLong()); //// //// if(ret){ //// for(def row : ret){ @@ -60,11 +60,11 @@ def location = ["lng":121.526016,"lat":31.143047] //// } //// } // -// ExcelUtils.write("D:\\数据\\临时\\上海市浦东新区永泰路1138弄11号.xlsx", rows, "一公里楼盘") +// ExcelUtils.write("D:\\鏁版嵁\\涓存椂\\涓婃捣甯傛郸涓滄柊鍖烘案娉拌矾1138寮�11鍙�.xlsx", rows, "涓�鍏噷妤肩洏") //} -ExcelUtils.multiThreadingModify("D:\\数据\\临时\\地图查询数据导出-添加经纬度-兴趣点.xlsx",{d-> +ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\涓存椂\\鍦板浘鏌ヨ鏁版嵁瀵煎嚭-娣诲姞缁忕含搴�-鍏磋叮鐐�.xlsx",{d-> def loc = d['AB'] if(loc){ def arrs = loc.split(",") diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/RegionCode.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/RegionCode.groovy index 5312d274a..6b7e0adf4 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/RegionCode.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/RegionCode.groovy @@ -6,12 +6,12 @@ import com.fangjia.script.util.ExcelUtils import com.fangjia.core.RegionData import groovy.sql.Sql -def newRegionCodeFile = "D:\\数据\\建行\\二期\\行政区处理_20220923.xlsx" +def newRegionCodeFile = "D:\\鏁版嵁\\寤鸿\\浜屾湡\\琛屾斂鍖哄鐞哶20220923.xlsx" def sqlInstance = Sql.newInstance("jdbc:oracle:thin:@192.168.0.236:1521:orcl", "GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver") -def specialCityMap = ["内蒙古##兴安":"兴安盟","四川##甘孜":"甘孜州","云南##文山":"文山州","青海##玉树":"玉树州"] +def specialCityMap = ["鍐呰挋鍙�##鍏村畨":"鍏村畨鐩�","鍥涘窛##鐢樺瓬":"鐢樺瓬宸�","浜戝崡##鏂囧北":"鏂囧北宸�","闈掓捣##鐜夋爲":"鐜夋爲宸�"] //ExcelUtils.modify(newRegionCodeFile,{d-> // if(d['A'] && !d['I']){ @@ -40,7 +40,7 @@ for(def d : newDatas){ } def ccbMap = getCcb92City(sqlInstance) -ExcelUtils.modify("D:\\数据\\亲邻\\region_code.xlsx",{d-> +ExcelUtils.modify("D:\\鏁版嵁\\浜查偦\\region_code.xlsx",{d-> if(!d['C'] && d['D']){ def dbo = CommonDatautils.findAlCityDetail(d['A']) if(dbo){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/Test.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/Test.groovy index ca7c9e388..3079f3011 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/Test.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/Test.groovy @@ -30,11 +30,11 @@ DBCollection TOWNSHIP_CONN = MongoUtils.getCollectionByName2("fangjia", "townshi DBCollection FANGJIA_AREA_CODE = MongoUtils.getCollectionByName("business", "fangjia_area_code", "mongo.db.fangjia.com") DBCollection GUIDING_PRICE_COLL = MongoUtils.getCollectionByName("fangjia", "guiding_price", "mongo.db.fangjia.com") -//ExcelUtils.modify("D:\\数据\\证券\\国君见证失败原因.xls", { d -> +//ExcelUtils.modify("D:\\鏁版嵁\\璇佸埜\\鍥藉悰瑙佽瘉澶辫触鍘熷洜.xls", { d -> //}) -ExcelUtils.modify("D:\\数据\\证券\\国君见证失败原因(标准化省市区).xls", { d -> +ExcelUtils.modify("D:\\鏁版嵁\\璇佸埜\\鍥藉悰瑙佽瘉澶辫触鍘熷洜(鏍囧噯鍖栫渷甯傚尯).xls", { d -> def info = d['A'] if(info && !d['E']){ def arrs = info.split("!~") @@ -96,7 +96,7 @@ ExcelUtils.modify("D:\\ // return rets; //} -//ExcelUtils.modify("D:\\数据\\建行\\二期\\国家行政区划特殊城市导出.xlsx",{d-> +//ExcelUtils.modify("D:\\鏁版嵁\\寤鸿\\浜屾湡\\鍥藉琛屾斂鍖哄垝鐗规畩鍩庡競瀵煎嚭.xlsx",{d-> // def city = RegionData.formatCity(d['E']) // if(city && !d['J']){ // def region = RegionData.formatRegion(city, d['G']) @@ -106,7 +106,7 @@ ExcelUtils.modify("D:\\ //}) -//ExcelUtils.modify("D:\\数据\\建行\\二期\\统计局行政区划信息.xlsx",{d-> +//ExcelUtils.modify("D:\\鏁版嵁\\寤鸿\\浜屾湡\\缁熻灞�琛屾斂鍖哄垝淇℃伅.xlsx",{d-> // def city = RegionData.formatCity(d['D']) // if(!city){ // city = RegionData.formatCity(d['F']) @@ -118,8 +118,8 @@ ExcelUtils.modify("D:\\ // } //}) -//def citys = ["潍坊","临沂","邯郸","济宁","威海","绵阳","梅州","平顶山","江门","赣州","泰安","襄阳","南阳","桂林","聊城","临汾","德州","商丘","衡阳","宿迁","包头","渭南","咸阳","许昌","滨州","邢台","南充","安阳","新乡","枣庄","滁州","龙岩","宝鸡","信阳","运城","衡水","东营","晋中","孝感","长治","阜阳","韶关","菏泽","德阳","宁德","荆州","乐山","驻马店","南平","汉中","榆林","宜春","鞍山","开封","周口","绥化","湘潭","黄冈","承德","焦作","牡丹江","莆田","上饶","眉山","齐齐哈尔","郴州","营口","蚌埠","大庆","赤峰","河源","吕梁","遂宁","漯河","三明","茂名","濮阳","曲靖","平凉","鄂尔多斯","十堰","吉安","黄石","佳木斯","三门峡","揭阳","忻州","通辽","泸州","六安","潮州","衢州","淮南","荆门","永州","呼伦贝尔","葫芦岛","丹东","延边","宣城","宜宾","庆阳","晋城","阳江","宿州","延安","咸宁","怀化","黄山","舟山","汕尾","盘锦","朝阳","丽水","抚州","铁岭","红河","陇南","广安","抚顺","自贡","达州","玉林","玉溪","白银","亳州","邵阳","广元","昌吉","益阳","张掖","娄底","阳泉","天水","随州","朔州","大理","通化","楚雄","巴彦淖尔","乌兰察布","新余","景德镇","松原","辽阳","阜新","酒泉","黔南","淮北","四平","梧州","黔东南","巴中","鹤壁","鸡西","内江","钦州","池州","仙桃","恩施","本溪","资阳","六盘水","百色","白城","临夏","伊犁","贵港","白山","双鸭山","吴忠","鄂州","丽江","安康","毕节","云浮","巴音郭楞","安顺","阿克苏","黑河","铜陵","雅安","石嘴山","萍乡","鹤岗","锡林郭勒盟","铜仁","防城港","喀什","兴安盟","河池","铜川","普洱","保山","凉山州","鹰潭","定西","伊春","中卫","黔西南","商洛","乌海","武威","海西州","来宾","昭通","湘西","哈密","张家界","西双版纳州","七台河","固原","攀枝花","德宏州","崇左","辽源","嘉峪关","克拉玛依","临沧","潜江","贺州","天门","海东","塔城","儋州","金昌","博尔塔拉","吐鲁番","大兴安岭","阿勒泰","和田","迪庆州","日喀则","林芝"] -//def datas = ExcelUtils.read("D:\\数据\\建行\\二期\\统计局行政区划信息.xlsx") +//def citys = ["娼嶅潑","涓存矀","閭兏","娴庡畞","濞佹捣","缁甸槼","姊呭窞","骞抽《灞�","姹熼棬","璧e窞","娉板畨","瑗勯槼","鍗楅槼","妗傛灄","鑱婂煄","涓存本","寰峰窞","鍟嗕笜","琛¢槼","瀹胯縼","鍖呭ご","娓崡","鍜搁槼","璁告槍","婊ㄥ窞","閭㈠彴","鍗楀厖","瀹夐槼","鏂颁埂","鏋e簞","婊佸窞","榫欏博","瀹濋浮","淇¢槼","杩愬煄","琛℃按","涓滆惀","鏅嬩腑","瀛濇劅","闀挎不","闃滈槼","闊跺叧","鑿忔辰","寰烽槼","瀹佸痉","鑽嗗窞","涔愬北","椹婚┈搴�","鍗楀钩","姹変腑","姒嗘灄","瀹滄槬","闉嶅北","寮�灏�","鍛ㄥ彛","缁ュ寲","婀樻江","榛勫唸","鎵垮痉","鐒︿綔","鐗′腹姹�","鑾嗙敯","涓婇ザ","鐪夊北","榻愰綈鍝堝皵","閮村窞","钀ュ彛","铓屽煚","澶у簡","璧ゅ嘲","娌虫簮","鍚曟","閬傚畞","婕渤","涓夋槑","鑼傚悕","婵槼","鏇查潠","骞冲噳","閯傚皵澶氭柉","鍗佸牥","鍚夊畨","榛勭煶","浣虫湪鏂�","涓夐棬宄�","鎻槼","蹇诲窞","閫氳窘","娉稿窞","鍏畨","娼窞","琛㈠窞","娣崡","鑽嗛棬","姘稿窞","鍛间鸡璐濆皵","钁姦宀�","涓逛笢","寤惰竟","瀹e煄","瀹滃","搴嗛槼","鏅嬪煄","闃虫睙","瀹垮窞","寤跺畨","鍜稿畞","鎬�鍖�","榛勫北","鑸熷北","姹曞熬","鐩橀敠","鏈濋槼","涓芥按","鎶氬窞","閾佸箔","绾㈡渤","闄囧崡","骞垮畨","鎶氶『","鑷础","杈惧窞","鐜夋灄","鐜夋邯","鐧介摱","浜冲窞","閭甸槼","骞垮厓","鏄屽悏","鐩婇槼","寮犳帠","濞勫簳","闃虫硥","澶╂按","闅忓窞","鏈斿窞","澶х悊","閫氬寲","妤氶泟","宸村溅娣栧皵","涔屽叞瀵熷竷","鏂颁綑","鏅痉闀�","鏉惧師","杈介槼","闃滄柊","閰掓硥","榛斿崡","娣寳","鍥涘钩","姊у窞","榛斾笢鍗�","宸翠腑","楣ゅ","楦¤タ","鍐呮睙","閽﹀窞","姹犲窞","浠欐","鎭╂柦","鏈邯","璧勯槼","鍏洏姘�","鐧捐壊","鐧藉煄","涓村","浼婄妬","璐垫腐","鐧藉北","鍙岄腑灞�","鍚村繝","閯傚窞","涓芥睙","瀹夊悍","姣曡妭","浜戞诞","宸撮煶閮","瀹夐『","闃垮厠鑻�","榛戞渤","閾滈櫟","闆呭畨","鐭冲槾灞�","钀嶄埂","楣ゅ矖","閿℃灄閮嫆鐩�","閾滀粊","闃插煄娓�","鍠�浠�","鍏村畨鐩�","娌虫睜","閾滃窛","鏅幢","淇濆北","鍑夊北宸�","楣版江","瀹氳タ","浼婃槬","涓崼","榛旇タ鍗�","鍟嗘礇","涔屾捣","姝﹀▉","娴疯タ宸�","鏉ュ","鏄��","婀樿タ","鍝堝瘑","寮犲鐣�","瑗垮弻鐗堢撼宸�","涓冨彴娌�","鍥哄師","鏀�鏋濊姳","寰峰畯宸�","宕囧乏","杈芥簮","鍢夊唱鍏�","鍏嬫媺鐜涗緷","涓存钵","娼滄睙","璐哄窞","澶╅棬","娴蜂笢","濉斿煄","鍎嬪窞","閲戞槍","鍗氬皵濉旀媺","鍚愰瞾鐣�","澶у叴瀹夊箔","闃垮嫆娉�","鍜岀敯","杩簡宸�","鏃ュ杸鍒�","鏋楄姖"] +//def datas = ExcelUtils.read("D:\\鏁版嵁\\寤鸿\\浜屾湡\\缁熻灞�琛屾斂鍖哄垝淇℃伅.xlsx") //def fjwCitys = [] //for(def d : datas){ @@ -131,7 +131,7 @@ ExcelUtils.modify("D:\\ // rows << d // } //} -//ExcelUtils.write("D:\\数据\\建行\\二期\\统计局行政区划与房价网区域比对V2.xlsx", rows, "区域") +//ExcelUtils.write("D:\\鏁版嵁\\寤鸿\\浜屾湡\\缁熻灞�琛屾斂鍖哄垝涓庢埧浠风綉鍖哄煙姣斿V2.xlsx", rows, "鍖哄煙") //for(def c : citys){ // if(!fjwCitys.contains(c)){ @@ -140,11 +140,11 @@ ExcelUtils.modify("D:\\ //} // -//ExcelUtils.write("D:\\数据\\建行\\二期\\(特殊城市)统计局行政区划与房价网区域比对.xlsx", rows, "区域") +//ExcelUtils.write("D:\\鏁版嵁\\寤鸿\\浜屾湡\\(鐗规畩鍩庡競)缁熻灞�琛屾斂鍖哄垝涓庢埧浠风綉鍖哄煙姣斿.xlsx", rows, "鍖哄煙") // //def map = [:] -//def datas1 = ExcelUtils.read("D:\\数据\\建行\\二期\\国家行政区划特殊城市导出.xlsx") +//def datas1 = ExcelUtils.read("D:\\鏁版嵁\\寤鸿\\浜屾湡\\鍥藉琛屾斂鍖哄垝鐗规畩鍩庡競瀵煎嚭.xlsx") //for(def row : datas1){ // if(row['J']){ // def codeMap = [:] @@ -154,7 +154,7 @@ ExcelUtils.modify("D:\\ // map.put(row['I']+"#"+row['J'], codeMap) // } //} -//def datas2 = ExcelUtils.read("D:\\数据\\建行\\二期\\统计局行政区划信息.xlsx") +//def datas2 = ExcelUtils.read("D:\\鏁版嵁\\寤鸿\\浜屾湡\\缁熻灞�琛屾斂鍖哄垝淇℃伅.xlsx") //for(def row : datas2){ // if(row['H']){ // def codeMap = [:] @@ -165,7 +165,7 @@ ExcelUtils.modify("D:\\ // } //} -//ExcelUtils.modify("D:\\数据\\亲邻\\房价网省市区.xlsx",{d-> +//ExcelUtils.modify("D:\\鏁版嵁\\浜查偦\\鎴夸环缃戠渷甯傚尯.xlsx",{d-> // def key = d['B'] +"#"+d['C'] // def codeMap = map.get(key) // if(codeMap && !d['D']){ @@ -175,7 +175,7 @@ ExcelUtils.modify("D:\\ // } //}) -//ExcelUtils.modify("D:\\数据\\亲邻\\房价网省市区.xlsx",{d-> +//ExcelUtils.modify("D:\\鏁版嵁\\浜查偦\\鎴夸环缃戠渷甯傚尯.xlsx",{d-> // if(!d['D']){ // def infos = findTownshipInfo(d['B'], d['C'], TOWNSHIP_CONN) // if(infos && infos.size()==1){ @@ -191,7 +191,7 @@ ExcelUtils.modify("D:\\ //def findTownshipInfo(city, region, coll){ // def q = new BasicDBObject() // q.put("city_name", Pattern.compile(city, Pattern.CASE_INSENSITIVE)) -// q.put("street_name", Pattern.compile('^.*'+region+'街道.*$', Pattern.CASE_INSENSITIVE)) +// q.put("street_name", Pattern.compile('^.*'+region+'琛楅亾.*$', Pattern.CASE_INSENSITIVE)) // // def dbcursor = coll.find(q) // def rows = [] @@ -207,7 +207,7 @@ ExcelUtils.modify("D:\\ //def cityMap = CommonDatautils.findAllCityProvince() //def rows = [] -//rows << ["省", "市", "区域"] +//rows << ["鐪�", "甯�", "鍖哄煙"] //cityMap.each{c,p-> // def regions = CommonDatautils.getCityRegions(c) // for(def r : regions){ @@ -218,7 +218,7 @@ ExcelUtils.modify("D:\\ // rows << row // } //} -//ExcelUtils.write("D:\\数据\\亲邻\\房价网省市区.xlsx", rows, "区域") +//ExcelUtils.write("D:\\鏁版嵁\\浜查偦\\鎴夸环缃戠渷甯傚尯.xlsx", rows, "鍖哄煙") @@ -241,7 +241,7 @@ ExcelUtils.modify("D:\\ //Date date = new Date(1617211269868); //print dateFormat.format(date); //DBCollection CITY_INFO_CONN = new Mongo("mongo.db.fangjia.com", 27017).getDB('fangjia_data_ana').getCollection('city_info'); -//def path = "D:\\数据\\广发\\广东省小区及均价覆盖率统计.xlsx" +//def path = "D:\\鏁版嵁\\骞垮彂\\骞夸笢鐪佸皬鍖哄強鍧囦环瑕嗙洊鐜囩粺璁�.xlsx" //ExcelUtils.modify(path,{d-> // def districts = CommonDatautils.findAllDistrictByCity(d['B'], "district", ["name"]) // d['G'] = districts.size() @@ -275,13 +275,13 @@ ExcelUtils.modify("D:\\ //} -//def dists = CommonDatautils.findAllDistrictByCity("上海", "district", ["city","region","name","finish_building_date"]) +//def dists = CommonDatautils.findAllDistrictByCity("涓婃捣", "district", ["city","region","name","finish_building_date"]) //def rets = [] //for(def d : dists){ // def year = CommonUtils.getDistrictAge(d) // rets << [d.city,d.region, d.name, year] //} -//ExcelUtils.write("D:\\数据\\统计房龄.xlsx", rets, "数据") +//ExcelUtils.write("D:\\鏁版嵁\\缁熻鎴块緞.xlsx", rets, "鏁版嵁") diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/TestArroundPrice.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/TestArroundPrice.groovy index 531870d89..628845b7b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/TestArroundPrice.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/TestArroundPrice.groovy @@ -25,12 +25,12 @@ class TestArroundPrice { task.run2() } def run(){ -// def oldFile = "D:\\数据\\北京上海挑选小区.xlsx" - //matchBJ(oldFile, "D:\\数据\\北京小区(测试).xlsx"); - //matchSH(oldFile, "D:\\数据\\上海小区(测试).xlsx"); +// def oldFile = "D:\\鏁版嵁\\鍖椾含涓婃捣鎸戦�夊皬鍖�.xlsx" + //matchBJ(oldFile, "D:\\鏁版嵁\\鍖椾含灏忓尯(娴嬭瘯).xlsx"); + //matchSH(oldFile, "D:\\鏁版嵁\\涓婃捣灏忓尯(娴嬭瘯).xlsx"); -// def shDistricts = CommonDatautils.getAllDistricts("district", "上海"); -// def bjDistricts = CommonDatautils.getAllDistricts("district", "北京"); +// def shDistricts = CommonDatautils.getAllDistricts("district", "涓婃捣"); +// def bjDistricts = CommonDatautils.getAllDistricts("district", "鍖椾含"); // addValueBJ(oldFile, bjDistricts); // addValueSH(oldFile, shDistricts); @@ -176,7 +176,7 @@ class TestArroundPrice { } def run1(){ - def datas = ExcelUtils.read("D:\\数据\\无价格小区.xlsx",0,1) + def datas = ExcelUtils.read("D:\\鏁版嵁\\鏃犱环鏍煎皬鍖�.xlsx",0,1) for(def data : datas){ if(data['C']){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/TestSendSchoolData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/TestSendSchoolData.groovy index e81f4cb67..726ac235d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/TestSendSchoolData.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/TestSendSchoolData.groovy @@ -23,7 +23,7 @@ ExecutorService fixedThreadPool = Executors.newFixedThreadPool(10) //Thread.sleep(60*60*1000) //while (true){ def q = new BasicDBObject() -// q.put("province",new BasicDBObject('$in', ["江苏","江苏省"])) +// q.put("province",new BasicDBObject('$in', ["姹熻嫃","姹熻嫃鐪�"])) q.put("status",new BasicDBObject('$ne', 1)) def dbcursor = school_coll.find(q).batchSize(5000) def rets = [] @@ -49,14 +49,14 @@ ExecutorService fixedThreadPool = Executors.newFixedThreadPool(10) rets << json if(rets.size()==5000){ - println "共:"+rets.size() + println "鍏憋細"+rets.size() send(rets, fixedThreadPool, school_coll) rets.clear() } } if(rets.size()>0){ - println "共:"+rets.size() + println "鍏憋細"+rets.size() send(rets, fixedThreadPool, school_coll) rets.clear() } @@ -95,13 +95,13 @@ def send(def rets, def fixedThreadPool, def school_coll){ //def rets = [] ////def query = new BasicDBObject() -////query.put("source","搜学网") +////query.put("source","鎼滃缃�") //////query.put("url","http://xuexiao.51sxue.com/detail/id_26799.html") //////query.put("lat",null) ////def cursor = school_parse_coll.find(query) ////for(def o : cursor){ // def q = new BasicDBObject() -//// q.put("province","江苏省") +//// q.put("province","姹熻嫃鐪�") //// q.put("url",o.url) // def dbcursor = sxue_school_coll.find(q) // def index = 0 @@ -129,14 +129,14 @@ def send(def rets, def fixedThreadPool, def school_coll){ // // rets << json // if(rets.size()==5000){ -// println "共:"+rets.size() +// println "鍏憋細"+rets.size() // send(rets, fixedThreadPool, school_coll) // rets.clear() // } // } ////} //if(rets.size()>0){ -// println "共:"+rets.size() +// println "鍏憋細"+rets.size() // send(rets, fixedThreadPool, school_coll) // rets.clear() //} \ No newline at end of file diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/township/StreetProcess.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/township/StreetProcess.groovy index d7e5fe6fe..53333f8d7 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/township/StreetProcess.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/township/StreetProcess.groovy @@ -27,12 +27,12 @@ class StreetProcess { static main(args) { def task = new StreetProcess(); -// println RegionData.formatRegion("鞍山","铁东区") +// println RegionData.formatRegion("闉嶅北","閾佷笢鍖�") task.run() } def run(){ // -// def region = RegionData.formatRegion("三明市", "三元区") +// def region = RegionData.formatRegion("涓夋槑甯�", "涓夊厓鍖�") // println region // standard() @@ -42,7 +42,7 @@ class StreetProcess { def synchTownship(){ def q = new BasicDBObject() -// q.put("city_name","福州市") +// q.put("city_name","绂忓窞甯�") // q.put("shape",new BasicDBObject('$exists', true)) def dbcursor = TOWNSHIP.find(q) for(def d : dbcursor){ @@ -56,7 +56,7 @@ class StreetProcess { def matchStreet(){ def polylineMap = findStreetPolyline() def q = new BasicDBObject() -// q.put("fangjia_city", "福州") +// q.put("fangjia_city", "绂忓窞") // q.put("shape",new BasicDBObject('$exists', false)) def dbcursor = TOWNSHIP.find(q) def index = 0 @@ -102,7 +102,7 @@ class StreetProcess { def findStreetPolyline(){ def q = new BasicDBObject() -// q.put("fjw_city","福州") +// q.put("fjw_city","绂忓窞") def dbcursor = POLYLINE235.find(q) def map = [:] diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/updateEs.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/updateEs.groovy index dc2e47a01..e7e12a661 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/updateEs.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/updateEs.groovy @@ -12,8 +12,8 @@ findData(house_queryUrl); def findData( def queryUrl){ def must = [] - def term1 = ["term":["city":"常州"]] - def term2 = ["term":["district_name":"阳光城市"]] + def term1 = ["term":["city":"甯稿窞"]] + def term2 = ["term":["district_name":"闃冲厜鍩庡競"]] def term3 = ["term":["range":["m_date":["gte": "2019-06-20"]]]] must << term1 @@ -72,7 +72,7 @@ def doPost(def targetUrl, def headers, def params, def isJson, def charset){ conn.connect(); - //输出流 + //杈撳嚭娴� if (StringUtils.isNotEmpty(param)) { mWriter = new BufferedWriter(new OutputStreamWriter(conn.getOutputStream(), charset)); mWriter.write(param); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/GuangDaVillage.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/GuangDaVillage.groovy index a064f1913..914f8b19b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/GuangDaVillage.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/GuangDaVillage.groovy @@ -10,7 +10,7 @@ class GuangDaVillage { } def run(){ - ExcelUtils.multiThreadingModify("D:\\数据\\光大\\公开数据地址情况.xlsx",{ d-> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\鍏夊ぇ\\鍏紑鏁版嵁鍦板潃鎯呭喌.xlsx",{ d-> if(!d['R'] && d['A']){ def dto = OpenApiUtils.addrVerifyGuangda(null, d['A']) @@ -28,17 +28,17 @@ class GuangDaVillage { d['O'] = dto.committeeCode d['P'] = dto.typeCode d['Q'] = dto.typeName - d['R'] = dto.verifyFlag//涉农标识 - d['S'] = dto.addrVerify//地址是否有效信息 - d['T'] = dto.countyLevelCity//是否为县级市 - d['U'] = dto.countyGov//是否为县政府 - d['V'] = dto.addrArea //所属区域 农村区域 城市区域 县城城区(对公) - d['W'] = dto.devDistrict//是否为开发区 - d['X'] = dto.devDistrictName//开发区 - d['Y'] = dto.devLevel//开发区等级 - d['Z']= dto.administrativeTowns;//是否市辖建制 - d['AA'] = dto.prefectureLevelOrAbove ;// 是否为地级市以上行政区划 - d['AB'] = dto.countyGovTown; //县政府所在镇 + d['R'] = dto.verifyFlag//娑夊啘鏍囪瘑 + d['S'] = dto.addrVerify//鍦板潃鏄惁鏈夋晥淇℃伅 + d['T'] = dto.countyLevelCity//鏄惁涓哄幙绾у競 + d['U'] = dto.countyGov//鏄惁涓哄幙鏀垮簻 + d['V'] = dto.addrArea //鎵�灞炲尯鍩� 鍐滄潙鍖哄煙 鍩庡競鍖哄煙 鍘垮煄鍩庡尯(瀵瑰叕) + d['W'] = dto.devDistrict//鏄惁涓哄紑鍙戝尯 + d['X'] = dto.devDistrictName//寮�鍙戝尯 + d['Y'] = dto.devLevel//寮�鍙戝尯绛夌骇 + d['Z']= dto.administrativeTowns;//鏄惁甯傝緰寤哄埗 + d['AA'] = dto.prefectureLevelOrAbove ;// 鏄惁涓哄湴绾у競浠ヤ笂琛屾斂鍖哄垝 + d['AB'] = dto.countyGovTown; //鍘挎斂搴滄墍鍦ㄩ晣 } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/GuangdaTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/GuangdaTest.groovy index 1196b6bd2..499a542fb 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/GuangdaTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/GuangdaTest.groovy @@ -18,7 +18,7 @@ DBCollection development_zone_CONN = MongoUtils.getCollectionByName2("fangjia", DBCollection community_CONN = MongoUtils.getCollectionByName2("fangjia", "community", MONGO100_URL) -def filePath = "D:\\数据\\南京\\南京银行测试-新跑.xlsx" +def filePath = "D:\\鏁版嵁\\鍗椾含\\鍗椾含閾惰娴嬭瘯-鏂拌窇.xlsx" ExcelUtils.multiThreadingModify(filePath, { row -> def communityObj = null if(row['E']){ @@ -31,22 +31,22 @@ ExcelUtils.multiThreadingModify(filePath, { row -> row['P'] = communityObj.street_code } if(row['D']){ - if(row['D'].toString().endsWith("区")){ - row['F'] = "非农" + if(row['D'].toString().endsWith("鍖�")){ + row['F'] = "闈炲啘" }else{ if(communityObj){ - if(communityObj.has_gov && communityObj.has_gov=="是"){ - row['I'] = "是" - row['F'] = "非农" + if(communityObj.has_gov && communityObj.has_gov=="鏄�"){ + row['I'] = "鏄�" + row['F'] = "闈炲啘" }else{ - row['I'] = "否" + row['I'] = "鍚�" if(row['E']){ def townObj = isTown(row['C'], row['D'], row['E']) if(townObj){ - row['J'] = "是" - row['F'] = "非农" + row['J'] = "鏄�" + row['F'] = "闈炲啘" }else{ - row['F'] = "农" + row['F'] = "鍐�" } } } @@ -55,34 +55,34 @@ ExcelUtils.multiThreadingModify(filePath, { row -> } }); -//def filePath = "D:\\数据\\光大\\全量.xlsx" +//def filePath = "D:\\鏁版嵁\\鍏夊ぇ\\鍏ㄩ噺.xlsx" //ExcelUtils.modify(filePath, { row -> // if(!row['O']){ // def jsonObj = FangjiaClientUtils.villageIdentify(null, row['A']) // if(jsonObj && jsonObj.result){ // row['B'] = jsonObj.result.countyLevelCity // if(row['B']){ -// if(row['B']=="是"){ -// row['C'] = "否" -// }else if(row['B']=="否"){ -// row['C'] = "是" +// if(row['B']=="鏄�"){ +// row['C'] = "鍚�" +// }else if(row['B']=="鍚�"){ +// row['C'] = "鏄�" // } // } // row['D'] = jsonObj.result.district // row['E'] = jsonObj.result.districtCode -// if(jsonObj.result.administrativeTowns && jsonObj.result.administrativeTowns=="是"){ +// if(jsonObj.result.administrativeTowns && jsonObj.result.administrativeTowns=="鏄�"){ // row['F'] = jsonObj.result.administrativeTowns // row['G'] = jsonObj.result.town // row['H'] = jsonObj.result.townCode // } // -// if(jsonObj.result.countyGov && jsonObj.result.countyGov=="是"){ +// if(jsonObj.result.countyGov && jsonObj.result.countyGov=="鏄�"){ // row['I'] = jsonObj.result.countyGov // row['J'] = jsonObj.result.town // row['K'] = jsonObj.result.townCode // } // -// if(jsonObj.result.devDistrict && jsonObj.result.devDistrict=="是"){ +// if(jsonObj.result.devDistrict && jsonObj.result.devDistrict=="鏄�"){ // row['L'] = jsonObj.result.devDistrict // row['M'] = jsonObj.result.devDistrictName // } @@ -119,27 +119,27 @@ ExcelUtils.multiThreadingModify(filePath, { row -> // // if(row['AA'] && !row['AO']){ // if(row['Y']){ -// if(row['Y'].endsWith("区")){ -// row['AE'] = "否" -// row['AF'] = "是" +// if(row['Y'].endsWith("鍖�")){ +// row['AE'] = "鍚�" +// row['AF'] = "鏄�" // }else { -// row['AE'] = "是" -// row['AF'] = "否" +// row['AE'] = "鏄�" +// row['AF'] = "鍚�" // } // } // // if(row['AA']){ // def dev_name = isDev(development_zone_CONN, row['W'], row['X'], row['Y'], row['AA']) -// if(!dev_name && row['AA'].contains("经济开发区")){ -// dev_name = row['AA'].replace("经济开发区","经济技术开发区") +// if(!dev_name && row['AA'].contains("缁忔祹寮�鍙戝尯")){ +// dev_name = row['AA'].replace("缁忔祹寮�鍙戝尯","缁忔祹鎶�鏈紑鍙戝尯") // dev_name = isDev(development_zone_CONN, row['W'], row['X'], row['Y'], dev_name) // } -// if(!dev_name && row['AA'].contains("经济技术开发区")){ -// dev_name = row['AA'].replace("经济技术开发区","经济开发区") +// if(!dev_name && row['AA'].contains("缁忔祹鎶�鏈紑鍙戝尯")){ +// dev_name = row['AA'].replace("缁忔祹鎶�鏈紑鍙戝尯","缁忔祹寮�鍙戝尯") // dev_name = isDev(development_zone_CONN, row['W'], row['X'], row['Y'], dev_name) // } // if(dev_name){ -// row['AO'] = "是" +// row['AO'] = "鏄�" // row['AP'] = dev_name // } // } @@ -147,21 +147,21 @@ ExcelUtils.multiThreadingModify(filePath, { row -> // if(row['W'] && row['X'] && row['Y'] && row['Z']){ // def townObj = isTown(row['X'], row['Y'], row['Z']) // if(townObj){ -// row['AI'] = "是" +// row['AI'] = "鏄�" // row['AJ'] = row['Z'] // } // // def communityObj = findCommunityTown(community_CONN, row['X'], row['Y'], row['Z']) // if(communityObj){ // row['AL'] = isGov(communityObj) -// if(row['AL'] && row['AL'] =="是"){ +// if(row['AL'] && row['AL'] =="鏄�"){ // row['AM'] = row['Z'] // row['AN'] = communityObj.street_code // } // row['AG'] = communityObj.area_name // row['AH'] = communityObj.area_code // -// if(row['AI'] && row['AI'] == "是"){ +// if(row['AI'] && row['AI'] == "鏄�"){ // row['AK'] = communityObj.street_code // } // }else{ @@ -228,9 +228,9 @@ def findBestSimilar(town, towns){ def isDev(development_zone_CONN, def prov, def city, def region, def dev){ def q = new BasicDBObject() q.put("province", prov) - dev = dev.replace("(","").replace(")","").replace("市","") - if(dev.contains(region) && region.toString().endsWith("区")){ - def newRegion = region.replace("区","") + dev = dev.replace("(","").replace(")","").replace("甯�","") + if(dev.contains(region) && region.toString().endsWith("鍖�")){ + def newRegion = region.replace("鍖�","") dev = dev.replace(region, newRegion) } Pattern pattern = Pattern.compile('^.*' + dev + '.*$', Pattern.CASE_INSENSITIVE); @@ -241,41 +241,41 @@ def isDev(development_zone_CONN, def prov, def city, def region, def dev){ def devList = [] devList.add(dev); try{ - devList.add(region.replace("县","").replace("区","").replace("市","") + dev); + devList.add(region.replace("鍘�","").replace("鍖�","").replace("甯�","") + dev); }catch(e){ println region +" "+ e.getMessage() } try{ - devList.add(city.replace("市","") + region.replace("县","").replace("区","").replace("市","") + dev); + devList.add(city.replace("甯�","") + region.replace("鍘�","").replace("鍖�","").replace("甯�","") + dev); }catch(e){ println city+" "+region+" "+e.getMessage() } try{ - devList.add(prov.replace("省","") + city.replace("市","")+ region.replace("县","").replace("区","").replace("市","") + dev); + devList.add(prov.replace("鐪�","") + city.replace("甯�","")+ region.replace("鍘�","").replace("鍖�","").replace("甯�","") + dev); }catch(e){ println prov+" "+city+" "+region+" "+e.getMessage() } try{ - devList.add(city.replace("市","") + dev); + devList.add(city.replace("甯�","") + dev); }catch(e){ println e } try{ - devList.add(prov.replace("省","")+ city.replace("市","") + dev); + devList.add(prov.replace("鐪�","")+ city.replace("甯�","") + dev); }catch(e){ println e } try{ - devList.add(prov.replace("省","")+ region.replace("县","").replace("区","").replace("市","")+ dev); + devList.add(prov.replace("鐪�","")+ region.replace("鍘�","").replace("鍖�","").replace("甯�","")+ dev); }catch(e){ println e } - devList.add(prov.replace("省","")+ dev); + devList.add(prov.replace("鐪�","")+ dev); for(def zone : rets){ - String name = zone.name.replace("省","").replace("市","").replace("县","") - if(!name.endsWith("区")){ - name = name.replace("区",""); + String name = zone.name.replace("鐪�","").replace("甯�","").replace("鍘�","") + if(!name.endsWith("鍖�")){ + name = name.replace("鍖�",""); } if(devList.contains(name)){ developmentZone = zone; @@ -372,9 +372,9 @@ def isGov(obj){ if(obj){ hasGovFlag = obj.has_gov; } - if(StringUtils.isNotBlank(hasGovFlag) && hasGovFlag.equals("是")){ - return "是" + if(StringUtils.isNotBlank(hasGovFlag) && hasGovFlag.equals("鏄�")){ + return "鏄�" }else { - return "否" + return "鍚�" } } \ No newline at end of file diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/KunlunVillage.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/KunlunVillage.groovy index 86bb2ea86..2100736a0 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/KunlunVillage.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/KunlunVillage.groovy @@ -13,7 +13,7 @@ class KunlunVillage { def addrCheck(){ - ExcelUtils.modify("D:\\数据\\昆仑\\2025年11月18日批次跑批涉农地址-发估家.xlsx",{ d-> + ExcelUtils.modify("D:\\鏁版嵁\\鏄嗕粦\\2025骞�11鏈�18鏃ユ壒娆¤窇鎵规秹鍐滃湴鍧�-鍙戜及瀹�.xlsx",{ d-> def obj = FangjiaClientUtils.formatNinelevel(null, d["C"]) if(obj){ println obj @@ -26,7 +26,7 @@ class KunlunVillage { def run(){ def index = 0 - ExcelUtils.modify("D:\\数据\\昆仑\\2025年11月18日批次跑批涉农地址-发估家.xlsx",{ d-> + ExcelUtils.modify("D:\\鏁版嵁\\鏄嗕粦\\2025骞�11鏈�18鏃ユ壒娆¤窇鎵规秹鍐滃湴鍧�-鍙戜及瀹�.xlsx",{ d-> index++ if(!d['R'] && d['C']){ println index @@ -45,17 +45,17 @@ class KunlunVillage { d['O'] = dto.committeeCode d['P'] = dto.typeCode d['Q'] = dto.typeName - d['R'] = dto.verifyFlag//涉农标识 - d['S'] = dto.addrVerify//地址是否有效信息 - d['T'] = dto.countyLevelCity//是否为县级市 - d['U'] = dto.countyGov//是否为县政府 - d['V'] = dto.addrArea //所属区域 农村区域 城市区域 县城城区(对公) - d['W'] = dto.devDistrict//是否为开发区 - d['X'] = dto.devDistrictName//开发区 - d['Y'] = dto.devLevel//开发区等级 - d['Z']= dto.administrativeTowns;//是否市辖建制 - d['AA'] = dto.prefectureLevelOrAbove ;// 是否为地级市以上行政区划 - d['AB'] = dto.countyGovTown; //县政府所在镇 + d['R'] = dto.verifyFlag//娑夊啘鏍囪瘑 + d['S'] = dto.addrVerify//鍦板潃鏄惁鏈夋晥淇℃伅 + d['T'] = dto.countyLevelCity//鏄惁涓哄幙绾у競 + d['U'] = dto.countyGov//鏄惁涓哄幙鏀垮簻 + d['V'] = dto.addrArea //鎵�灞炲尯鍩� 鍐滄潙鍖哄煙 鍩庡競鍖哄煙 鍘垮煄鍩庡尯(瀵瑰叕) + d['W'] = dto.devDistrict//鏄惁涓哄紑鍙戝尯 + d['X'] = dto.devDistrictName//寮�鍙戝尯 + d['Y'] = dto.devLevel//寮�鍙戝尯绛夌骇 + d['Z']= dto.administrativeTowns;//鏄惁甯傝緰寤哄埗 + d['AA'] = dto.prefectureLevelOrAbove ;// 鏄惁涓哄湴绾у競浠ヤ笂琛屾斂鍖哄垝 + d['AB'] = dto.countyGovTown; //鍘挎斂搴滄墍鍦ㄩ晣 } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/NanjiangVillage.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/NanjiangVillage.groovy index b9ce1b38f..dd13da3c8 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/NanjiangVillage.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/NanjiangVillage.groovy @@ -11,7 +11,7 @@ class NanjiangVillage { } def run(){ - ExcelUtils.multiThreadingModify("D:\\数据\\南京\\是否农村.xlsx",{d-> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\鍗椾含\\鏄惁鍐滄潙.xlsx",{d-> if(d['A'] && !d['F']){ def dto = OpenApiUtils.addrVerifyNanjing(null, d['A'], 2) @@ -29,17 +29,17 @@ class NanjiangVillage { d['O'] = dto.committeeCode d['P'] = dto.typeCode d['Q'] = dto.typeName - d['R'] = dto.verifyFlag//涉农标识 - d['S'] = dto.addrVerify//地址是否有效信息 - d['T'] = dto.countyLevelCity//是否为县级市 - d['U'] = dto.countyGov//是否为县政府 - d['V'] = dto.addrArea //所属区域 农村区域 城市区域 县城城区(对公) - d['W'] = dto.devDistrict//是否为开发区 - d['X'] = dto.devDistrictName//开发区 - d['Y'] = dto.devLevel//开发区等级 - d['Z']= dto.administrativeTowns;//是否市辖建制 - d['AA'] = dto.prefectureLevelOrAbove ;// 是否为地级市以上行政区划 - d['AB'] = dto.countyGovTown; //县政府所在镇 + d['R'] = dto.verifyFlag//娑夊啘鏍囪瘑 + d['S'] = dto.addrVerify//鍦板潃鏄惁鏈夋晥淇℃伅 + d['T'] = dto.countyLevelCity//鏄惁涓哄幙绾у競 + d['U'] = dto.countyGov//鏄惁涓哄幙鏀垮簻 + d['V'] = dto.addrArea //鎵�灞炲尯鍩� 鍐滄潙鍖哄煙 鍩庡競鍖哄煙 鍘垮煄鍩庡尯(瀵瑰叕) + d['W'] = dto.devDistrict//鏄惁涓哄紑鍙戝尯 + d['X'] = dto.devDistrictName//寮�鍙戝尯 + d['Y'] = dto.devLevel//寮�鍙戝尯绛夌骇 + d['Z']= dto.administrativeTowns;//鏄惁甯傝緰寤哄埗 + d['AA'] = dto.prefectureLevelOrAbove ;// 鏄惁涓哄湴绾у競浠ヤ笂琛屾斂鍖哄垝 + d['AB'] = dto.countyGovTown; //鍘挎斂搴滄墍鍦ㄩ晣 } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/QiliangTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/QiliangTest.groovy index 66d1ebc3a..f79a8e284 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/QiliangTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/QiliangTest.groovy @@ -27,19 +27,19 @@ class QiliangTest { // task.run() def data = [ - 'address': '厦门市同安区厦门市同安区思明园', - 'type': '2' //1:对公 0:对私 + 'address': '鍘﹂棬甯傚悓瀹夊尯鍘﹂棬甯傚悓瀹夊尯鎬濇槑鍥�', + 'type': '2' //1锛氬鍏� 0锛氬绉� ] def s = task.getProxyResult(data); print(s); } def run(){ - ExcelUtils.modify("C:\\Users\\gaojuan\\Desktop\\对公地址(问题案例)跑一下结果.xlsx", { row -> + ExcelUtils.modify("C:\\Users\\gaojuan\\Desktop\\瀵瑰叕鍦板潃锛堥棶棰樻渚嬶級璺戜竴涓嬬粨鏋�.xlsx", { row -> if(row['B']){ def parmas = [ 'address': row['B'], - 'type': '1' //1:对公 0:对私 + 'type': '1' //1锛氬鍏� 0锛氬绉� ] def str = getProxyResult(parmas); println str @@ -87,14 +87,14 @@ class QiliangTest { if(data.farmer == "0"){ - row['N'] = "非农" + row['N'] = "闈炲啘" }else{ - row['N'] = "农" + row['N'] = "鍐�" } if(data.isGovt == "0"){ - row['O'] = "否" + row['O'] = "鍚�" }else{ - row['O'] = "是" + row['O'] = "鏄�" } def list = data.indusParkList @@ -119,40 +119,40 @@ class QiliangTest { String getProxyResult(data){ - // 将 JSON 对象转换为字符串 + // 灏� JSON 瀵硅薄杞崲涓哄瓧绗︿覆 String jsonData = new JsonOutput().toJson(data); - // 创建代理对象 + // 鍒涘缓浠g悊瀵硅薄 Proxy proxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress(proxyHost, proxyPort)); - // 创建 URL 对象 + // 鍒涘缓 URL 瀵硅薄 URL url = new URL(targetUrl); - // 创建连接对象 + // 鍒涘缓杩炴帴瀵硅薄 URLConnection connection = url.openConnection(proxy); - // 设置代理认证 + // 璁剧疆浠g悊璁よ瘉 java.net.Authenticator.setDefault(new java.net.Authenticator() { protected PasswordAuthentication getPasswordAuthentication() { return new PasswordAuthentication(proxyUsername, proxyPassword.toCharArray()) } }) - // 设置请求方法为 POST + // 璁剧疆璇锋眰鏂规硶涓� POST connection.setRequestMethod("POST"); - // 允许输出流 + // 鍏佽杈撳嚭娴� connection.setDoOutput(true); - // 设置请求头 + // 璁剧疆璇锋眰澶� connection.setRequestProperty("Content-Type", "application/json"); - // 发送请求参数 + // 鍙戦�佽姹傚弬鏁� OutputStream outputStream = connection.getOutputStream(); outputStream.write(jsonData.getBytes("UTF-8")); outputStream.flush(); outputStream.close(); - // 读取响应 + // 璇诲彇鍝嶅簲 int responseCode = connection.getResponseCode() if (responseCode == HttpURLConnection.HTTP_OK) { BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream())); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/ShBank.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/ShBank.groovy index ba01edc17..f6237cdb7 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/ShBank.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/ShBank.groovy @@ -10,13 +10,13 @@ class ShBank { } def run(){ - ExcelUtils.multiThreadingModify("D:\\数据\\上海银行\\上海银行新逻辑的测试案例.xls",{ d-> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\涓婃捣閾惰\\涓婃捣閾惰鏂伴�昏緫鐨勬祴璇曟渚�.xls",{ d-> if(!d['R'] && d['B']){ def dto = OpenApiUtils.addrVerifyShBank(null, d['B']) if(dto){ // def dto = jsonObj.result - d['E'] = dto.addrArea //所属区域 农村区域 城市区域 县城城区(对公) + d['E'] = dto.addrArea //鎵�灞炲尯鍩� 鍐滄潙鍖哄煙 鍩庡競鍖哄煙 鍘垮煄鍩庡尯(瀵瑰叕) d['F'] = dto.remark d['G'] = dto.province @@ -31,16 +31,16 @@ class ShBank { // d['O'] = dto.committeeCode // d['P'] = dto.typeCode // d['Q'] = dto.typeName - d['O'] = dto.verifyFlag//涉农标识 - d['P'] = dto.addrVerify//地址是否有效信息 - d['Q'] = dto.countyLevelCity//是否为县级市 - d['R'] = dto.countyGov//是否为县政府 - d['S'] = dto.devDistrict//是否为开发区 - d['T'] = dto.devDistrictName//开发区 - d['U'] = dto.devLevel//开发区等级 - d['V']= dto.administrativeTowns;//是否市辖建制 - d['W'] = dto.prefectureLevelOrAbove ;// 是否为地级市以上行政区划 - d['X'] = dto.countyGovTown; //县政府所在镇 + d['O'] = dto.verifyFlag//娑夊啘鏍囪瘑 + d['P'] = dto.addrVerify//鍦板潃鏄惁鏈夋晥淇℃伅 + d['Q'] = dto.countyLevelCity//鏄惁涓哄幙绾у競 + d['R'] = dto.countyGov//鏄惁涓哄幙鏀垮簻 + d['S'] = dto.devDistrict//鏄惁涓哄紑鍙戝尯 + d['T'] = dto.devDistrictName//寮�鍙戝尯 + d['U'] = dto.devLevel//寮�鍙戝尯绛夌骇 + d['V']= dto.administrativeTowns;//鏄惁甯傝緰寤哄埗 + d['W'] = dto.prefectureLevelOrAbove ;// 鏄惁涓哄湴绾у競浠ヤ笂琛屾斂鍖哄垝 + d['X'] = dto.countyGovTown; //鍘挎斂搴滄墍鍦ㄩ晣 } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/ShBankVillage.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/ShBankVillage.groovy index 5074ffc72..7a7d8cdc1 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/ShBankVillage.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/ShBankVillage.groovy @@ -10,7 +10,7 @@ class ShBankVillage { } def run(){ - ExcelUtils.multiThreadingModify("D:\\数据\\上海银行\\涉农-2月估家数据反馈.xlsx", { d -> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\涓婃捣閾惰\\娑夊啘-2鏈堜及瀹舵暟鎹弽棣�.xlsx", { d -> if (!d['R'] && d['C']) { def dto = OpenApiUtils.addrVerifyShBank(d['B'], d['C']) @@ -29,17 +29,17 @@ class ShBankVillage { d['O'] = dto.committeeCode d['P'] = dto.typeCode d['Q'] = dto.typeName - d['R'] = dto.verifyFlag//涉农标识 - d['S'] = dto.addrVerify//地址是否有效信息 - d['T'] = dto.countyLevelCity//是否为县级市 - d['U'] = dto.countyGov//是否为县政府 - d['V'] = dto.addrArea //所属区域 农村区域 城市区域 县城城区(对公) - d['W'] = dto.devDistrict//是否为开发区 - d['X'] = dto.devDistrictName//开发区 - d['Y'] = dto.devLevel//开发区等级 - d['Z'] = dto.administrativeTowns;//是否市辖建制 - d['AA'] = dto.prefectureLevelOrAbove;// 是否为地级市以上行政区划 - d['AB'] = dto.countyGovTown; //县政府所在镇 + d['R'] = dto.verifyFlag//娑夊啘鏍囪瘑 + d['S'] = dto.addrVerify//鍦板潃鏄惁鏈夋晥淇℃伅 + d['T'] = dto.countyLevelCity//鏄惁涓哄幙绾у競 + d['U'] = dto.countyGov//鏄惁涓哄幙鏀垮簻 + d['V'] = dto.addrArea //鎵�灞炲尯鍩� 鍐滄潙鍖哄煙 鍩庡競鍖哄煙 鍘垮煄鍩庡尯(瀵瑰叕) + d['W'] = dto.devDistrict//鏄惁涓哄紑鍙戝尯 + d['X'] = dto.devDistrictName//寮�鍙戝尯 + d['Y'] = dto.devLevel//寮�鍙戝尯绛夌骇 + d['Z'] = dto.administrativeTowns;//鏄惁甯傝緰寤哄埗 + d['AA'] = dto.prefectureLevelOrAbove;// 鏄惁涓哄湴绾у競浠ヤ笂琛屾斂鍖哄垝 + d['AB'] = dto.countyGovTown; //鍘挎斂搴滄墍鍦ㄩ晣 } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/XiamenVillage.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/XiamenVillage.groovy index a6240e4bd..51d1f026c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/XiamenVillage.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/XiamenVillage.groovy @@ -10,7 +10,7 @@ class XiamenVillage { } def run(){ - ExcelUtils.multiThreadingModify("D:\\数据\\厦门\\工业园区与涉农组织类型矛盾.xlsx",{ d-> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\鍘﹂棬\\宸ヤ笟鍥尯涓庢秹鍐滅粍缁囩被鍨嬬煕鐩�.xlsx",{ d-> if(!d['R']){ def dto = OpenApiUtils.addrVerifyXiameng(null, d['A'], 2) @@ -28,17 +28,17 @@ class XiamenVillage { d['O'] = dto.committeeCode d['P'] = dto.typeCode d['Q'] = dto.typeName - d['R'] = dto.verifyFlag//涉农标识 - d['S'] = dto.addrVerify//地址是否有效信息 - d['T'] = dto.countyLevelCity//是否为县级市 - d['U'] = dto.countyGov//是否为县政府 - d['V'] = dto.addrArea //所属区域 农村区域 城市区域 县城城区(对公) - d['W'] = dto.devDistrict//是否为开发区 - d['X'] = dto.devDistrictName//开发区 - d['Y'] = dto.devLevel//开发区等级 - d['Z']= dto.administrativeTowns;//是否市辖建制 - d['AA'] = dto.prefectureLevelOrAbove ;// 是否为地级市以上行政区划 - d['AB'] = dto.countyGovTown; //县政府所在镇 + d['R'] = dto.verifyFlag//娑夊啘鏍囪瘑 + d['S'] = dto.addrVerify//鍦板潃鏄惁鏈夋晥淇℃伅 + d['T'] = dto.countyLevelCity//鏄惁涓哄幙绾у競 + d['U'] = dto.countyGov//鏄惁涓哄幙鏀垮簻 + d['V'] = dto.addrArea //鎵�灞炲尯鍩� 鍐滄潙鍖哄煙 鍩庡競鍖哄煙 鍘垮煄鍩庡尯(瀵瑰叕) + d['W'] = dto.devDistrict//鏄惁涓哄紑鍙戝尯 + d['X'] = dto.devDistrictName//寮�鍙戝尯 + d['Y'] = dto.devLevel//寮�鍙戝尯绛夌骇 + d['Z']= dto.administrativeTowns;//鏄惁甯傝緰寤哄埗 + d['AA'] = dto.prefectureLevelOrAbove ;// 鏄惁涓哄湴绾у競浠ヤ笂琛屾斂鍖哄垝 + d['AB'] = dto.countyGovTown; //鍘挎斂搴滄墍鍦ㄩ晣 } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/ailiyun/AnliyunApiUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/ailiyun/AnliyunApiUtils.groovy index e79251783..46756e0ed 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/ailiyun/AnliyunApiUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/ailiyun/AnliyunApiUtils.groovy @@ -5,7 +5,7 @@ import com.aliyun.tea.*; class AnliyunApiUtils { /** - * 使用AK&SK初始化账号Client + * 浣跨敤AK&SK鍒濆鍖栬处鍙稢lient * @param accessKeyId * @param accessKeySecret * @return Client @@ -13,19 +13,19 @@ class AnliyunApiUtils { */ public static com.aliyun.iot20180120.Client createClient(String accessKeyId, String accessKeySecret) throws Exception { com.aliyun.teaopenapi.models.Config config = new com.aliyun.teaopenapi.models.Config() - // 必填,您的 AccessKey ID + // 蹇呭~锛屾偍鐨� AccessKey ID .setAccessKeyId(accessKeyId) - // 必填,您的 AccessKey Secret + // 蹇呭~锛屾偍鐨� AccessKey Secret .setAccessKeySecret(accessKeySecret); - // Endpoint 请参考 https://api.aliyun.com/product/Iot + // Endpoint 璇峰弬鑰� https://api.aliyun.com/product/Iot config.endpoint = "iot.cn-beijing.aliyuncs.com"; return new com.aliyun.iot20180120.Client(config); } public static void main(String[] args_) throws Exception { java.util.List args = java.util.Arrays.asList(args_); - // 请确保代码运行环境设置了环境变量 ALIBABA_CLOUD_ACCESS_KEY_ID 和 ALIBABA_CLOUD_ACCESS_KEY_SECRET。 - // 工程代码泄露可能会导致 AccessKey 泄露,并威胁账号下所有资源的安全性。以下代码示例使用环境变量获取 AccessKey 的方式进行调用,仅供参考,建议使用更安全的 STS 方式,更多鉴权访问方式请参见:https://help.aliyun.com/document_detail/378657.html + // 璇风‘淇濅唬鐮佽繍琛岀幆澧冭缃簡鐜鍙橀噺 ALIBABA_CLOUD_ACCESS_KEY_ID 鍜� ALIBABA_CLOUD_ACCESS_KEY_SECRET銆� + // 宸ョ▼浠g爜娉勯湶鍙兘浼氬鑷� AccessKey 娉勯湶锛屽苟濞佽儊璐﹀彿涓嬫墍鏈夎祫婧愮殑瀹夊叏鎬с�備互涓嬩唬鐮佺ず渚嬩娇鐢ㄧ幆澧冨彉閲忚幏鍙� AccessKey 鐨勬柟寮忚繘琛岃皟鐢紝浠呬緵鍙傝�冿紝寤鸿浣跨敤鏇村畨鍏ㄧ殑 STS 鏂瑰紡锛屾洿澶氶壌鏉冭闂柟寮忚鍙傝锛歨ttps://help.aliyun.com/document_detail/378657.html com.aliyun.iot20180120.Client client = createClient(Config.accessKey, Config.accessKeySecret); com.aliyun.iot20180120.models.CreateDeviceGroupRequest createDeviceGroupRequest = new com.aliyun.iot20180120.models.CreateDeviceGroupRequest() .setIotInstanceId("your_value") @@ -33,19 +33,19 @@ class AnliyunApiUtils { .setGroupDesc("your_value") .setGroupName("your_value"); try { - // 复制代码运行请自行打印 API 的返回值 + // 澶嶅埗浠g爜杩愯璇疯嚜琛屾墦鍗� API 鐨勮繑鍥炲�� client.createDeviceGroupWithOptions(createDeviceGroupRequest, new com.aliyun.teautil.models.RuntimeOptions()); } catch (TeaException error) { - // 错误 message + // 閿欒 message System.out.println(error.getMessage()); - // 诊断地址 + // 璇婃柇鍦板潃 System.out.println(error.getData().get("Recommend")); com.aliyun.teautil.Common.assertAsString(error.message); } catch (Exception _error) { TeaException error = new TeaException(_error.getMessage(), _error); - // 错误 message + // 閿欒 message System.out.println(error.getMessage()); - // 诊断地址 + // 璇婃柇鍦板潃 System.out.println(error.getData().get("Recommend")); com.aliyun.teautil.Common.assertAsString(error.message); } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/ailiyun/Config.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/ailiyun/Config.groovy index e239aab3e..c67dbdbe6 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/ailiyun/Config.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/ailiyun/Config.groovy @@ -1,12 +1,12 @@ package com.fangjia.script.gj.village.ailiyun -/* 服务端API签名配置文件 +/* 鏈嶅姟绔疉PI绛惧悕閰嶇疆鏂囦欢 * * @author: ali * @version: 0.1 2018-08-08 08:23:54 */ public class Config { - // AccessKey信息 + // AccessKey淇℃伅 public static String accessKey = "LTAI5t7UKjXaoGxzet2Vh3bB"; public static String accessKeySecret = "2avjPxmI7FlIRHvMC5C1UuAnd9iG8z"; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/ailiyun/SignatureUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/ailiyun/SignatureUtils.groovy index b2dbb9204..2afd47d34 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/ailiyun/SignatureUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/ailiyun/SignatureUtils.groovy @@ -29,7 +29,7 @@ import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang3.StringUtils; /** - * 服务端API签名 + * 鏈嶅姟绔疉PI绛惧悕 * * @author: ali * @version: 0.1 2018-06-21 20:47:05 @@ -117,7 +117,7 @@ public class SignatureUtils { // Map map = new HashMap(); // Calendar calendar = Calendar.getInstance() // def startTime = DateUtil.formatByPattern(new Date(), "yyyy-MM-dd'T'HH:mm:ss.SSSZ") -// // 公共参数 +// // 鍏叡鍙傛暟 // map.put("Format", "JSON"); // map.put("Version", "2019-11-18"); // map.put("AccessKeyId", Config.accessKey); @@ -126,11 +126,11 @@ public class SignatureUtils { // map.put("SignatureVersion", "1.0"); // map.put("SignatureNonce", System.currentTimeMillis().toString()); //// map.put("RegionId", "cn-shanghai"); -// // 请求参数 +// // 璇锋眰鍙傛暟 // map.put("Action", "StreetStd"); // map.put("ServiceCode", "addrp"); // map.put("AppKey", "Xczmmbxlur2g"); -// map.put("Text","山东省烟台市莱阳市龙门东路1号0027、0028") +// map.put("Text","灞变笢鐪佺儫鍙板競鑾遍槼甯傞緳闂ㄤ笢璺�1鍙�0027銆�0028") // try { // String signature = SignatureUtils.generate("GET", map, Config.accessKeySecret); // if(signature){ @@ -138,7 +138,7 @@ public class SignatureUtils { // } // String content = new HttpRequest().get("https://address-purification.cn-hangzhou.aliyuncs.com", map, "utf-8") // JSONObject result = JSONObject.fromObject(content) -// System.out.println("最终signature: " + signature); +// System.out.println("鏈�缁坰ignature: " + signature); // } catch (Exception e) { // e.printStackTrace(); // } @@ -152,25 +152,25 @@ public class SignatureUtils { Config.accessKey, Config.accessKeySecret); IAcsClient client = new DefaultAcsClient(defaultProfile); - // 创建API请求并设置参数 + // 鍒涘缓API璇锋眰骞惰缃弬鏁� CommonRequest request = new CommonRequest(); request.setSysDomain("address-purification.cn-hangzhou.aliyuncs.com"); request.setSysVersion("2019-11-18"); request.setSysProduct("address-purification"); request.setSysLocationProduct("addrp"); - //设置要请求的服务 + //璁剧疆瑕佽姹傜殑鏈嶅姟 request.setSysAction("StreetStd"); - //设置请求方式 + //璁剧疆璇锋眰鏂瑰紡 request.setSysMethod(MethodType.POST); request.setHttpContentType(FormatType.FORM); - //请求头 + //璇锋眰澶� request.putHeadParameter("x-acs-signature-method", "HMAC-SHA1"); request.putHeadParameter("x-acs-signature-nonce", UUID.randomUUID().toString()); - //设置项目token + //璁剧疆椤圭洰token request.putBodyParameter("AppKey", "Xczmmbxlur2g"); - //设置请求参数 + //璁剧疆璇锋眰鍙傛暟 request.putBodyParameter("Text", address); -// request.putBodyParameter("DefaultCity", "杭州市"); +// request.putBodyParameter("DefaultCity", "鏉窞甯�"); request.putQueryParameter("AcceptLanguage", "zh-CN"); try { @@ -202,7 +202,7 @@ public class SignatureUtils { } public static void main(String[] args){ - def a = getAliAddressStrc("上海市长宁区新泾三村") + def a = getAliAddressStrc("涓婃捣甯傞暱瀹佸尯鏂版尘涓夋潙") println a } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/ailiyun/UrlUtil.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/ailiyun/UrlUtil.groovy index 0cd2e1fcf..99011fc74 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/ailiyun/UrlUtil.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/ailiyun/UrlUtil.groovy @@ -6,7 +6,7 @@ import java.util.Map; import org.apache.commons.lang3.StringUtils; /** - * URL处理类 + * URL澶勭悊绫� * * @author: ali * @version: 0.1 2018-06-21 20:40:52 @@ -43,7 +43,7 @@ public class UrlUtil { public static String percentEncode(String value) { try { - // 使用URLEncoder.encode编码后,将"+","*","%7E"做替换即满足API规定的编码规范。 + // 浣跨敤URLEncoder.encode缂栫爜鍚庯紝灏�"+","*","%7E"鍋氭浛鎹㈠嵆婊¤冻API瑙勫畾鐨勭紪鐮佽鑼冦�� return value == null ? null : URLEncoder.encode(value, CHARSET_UTF8).replace("+", "%20").replace("*", "%2A").replace("%7E", "~"); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/communityLocation.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/communityLocation.groovy index 766dabccf..ba4e41bb1 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/communityLocation.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/communityLocation.groovy @@ -9,14 +9,14 @@ import com.fangjia.script.yinjihaun.amap.GaoDeApiUtils import java.sql.ResultSet -def codeMap = ["北京": "131", "天津": "332", "石家庄": "150", "唐山": "265", "秦皇岛": "148", "邯郸": "151", "邢台": "266", "保定": "307", "张家口": "264", "承德": "207", "沧州": "149", "廊坊": "191", "衡水": "208", "太原": "176", "大同": "355", "阳泉": "357", "长治": "356", "晋城": "290", "朔州": "237", "晋中": "238", "运城": "328", "忻州": "367", "临汾": "368", "吕梁": "327", "呼和浩特": "321", "包头": "229", "乌海": "123", "赤峰": "297", "通辽": "64", "鄂尔多斯": "283", "呼伦贝尔": "61", "巴彦淖尔": "169", "乌兰察布": "168", "兴安盟": "62", "锡林郭勒盟": "63", "阿拉善盟": "230", "沈阳": "58", "大连": "167", "鞍山": "320", "抚顺": "184", "本溪": "227", "丹东": "282", "锦州": "166", "营口": "281", "阜新": "59", "辽阳": "351", "盘锦": "228", "铁岭": "60", "朝阳": "280", "葫芦岛": "319", "长春": "53", "吉林市": "55", "四平": "56", "辽源": "183", "通化": "165", "白山": "57", "松原": "52", "白城": "51", "延边朝鲜族自治州": "54", "哈尔滨": "48", "齐齐哈尔": "41", "鸡西": "46", "鹤岗": "43", "双鸭山": "45", "大庆": "50", "伊春": "40", "佳木斯": "42", "七台河": "47", "牡丹江": "49", "黑河": "39", "绥化": "44", "大兴安岭地区": "38", "上海": "289", "南京": "315", "无锡": "317", "徐州": "316", "常州": "348", "苏州": "224", "南通": "161", "连云港": "347", "淮安": "162", "盐城": "223", "扬州": "346", "镇江": "160", "泰州": "276", "宿迁": "277", "杭州": "179", "宁波": "180", "温州": "178", "嘉兴": "334", "湖州": "294", "绍兴": "293", "金华": "333", "衢州": "243", "舟山": "245", "台州": "244", "丽水": "292", "合肥": "127", "芜湖": "129", "蚌埠": "126", "淮南": "250", "马鞍山": "358", "淮北": "253", "铜陵": "337", "安庆": "130", "黄山": "252", "滁州": "189", "阜阳": "128", "宿州": "370", "巢湖": "251", "六安": "298", "亳州": "188", "池州": "299", "宣城": "190", "福州": "300", "厦门": "194", "莆田": "195", "三明": "254", "泉州": "134", "漳州": "255", "南平": "133", "龙岩": "193", "宁德": "192", "南昌": "163", "景德镇": "225", "萍乡": "350", "九江": "349", "新余": "164", "鹰潭": "279", "赣州": "365", "吉安": "318", "宜春": "278", "抚州": "226", "上饶": "364", "济南": "288", "青岛": "236", "淄博": "354", "枣庄": "172", "东营": "174", "烟台": "326", "潍坊": "287", "济宁": "286", "泰安": "325", "威海": "175", "日照": "173", "莱芜": "124", "临沂": "234", "德州": "372", "聊城": "366", "滨州": "235", "菏泽": "353", "郑州": "268", "开封": "210", "洛阳": "153", "平顶山": "213", "安阳": "267", "鹤壁": "215", "新乡": "152", "焦作": "211", "濮阳": "209", "许昌": "155", "漯河": "344", "三门峡": "212", "南阳": "309", "商丘": "154", "信阳": "214", "周口": "308", "驻马店": "269", "武汉": "218", "黄石": "311", "十堰": "216", "宜昌": "270", "襄阳": "156", "鄂州": "122", "荆门": "217", "孝感": "310", "荆州": "157", "黄冈": "271", "咸宁": "362", "随州": "371", "恩施土家族苗族自治州": "373", "仙桃": "1713", "潜江": "1293", "天门": "2654", "神农架林区": "2734", "长沙": "158", "株洲": "222", "湘潭": "313", "衡阳": "159", "邵阳": "273", "岳阳": "220", "常德": "219", "张家界": "312", "益阳": "272", "郴州": "275", "永州": "314", "怀化": "363", "娄底": "221", "湘西土家族苗族自治州": "274", "广州": "257", "韶关": "137", "深圳": "340", "珠海": "140", "汕头": "303", "佛山": "138", "江门": "302", "湛江": "198", "茂名": "139", "肇庆": "338", "惠州": "301", "梅州": "141", "汕尾": "339", "河源": "200", "阳江": "199", "清远": "197", "东莞": "119", "中山": "187", "潮州": "201", "揭阳": "259", "云浮": "258", "南宁": "261", "柳州": "305", "桂林": "142", "梧州": "304", "北海": "295", "防城港": "204", "钦州": "145", "贵港": "341", "玉林": "361", "百色": "203", "贺州": "260", "河池": "143", "来宾": "202", "崇左": "144", "海口": "125", "三亚": "121", "五指山": "1644", "琼海": "2358", "儋州": "1215", "文昌": "2758", "万宁": "1216", "东方": "2634", "定安": "1214", "屯昌": "1641", "澄迈": "2757", "临高": "2033", "白沙黎族自治": "2359", "昌江黎族自治": "1642", "乐东黎族自治": "2032", "陵水黎族自治": "1643", "保亭黎族苗族自治": "1217", "琼中黎族苗族自治": "2031", "重庆": "132", "成都": "75", "自贡": "78", "攀枝花": "81", "泸州": "331", "德阳": "74", "绵阳": "240", "广元": "329", "遂宁": "330", "内江": "248", "乐山": "79", "南充": "291", "眉山": "77", "宜宾": "186", "广安": "241", "达州": "369", "雅安": "76", "巴中": "239", "资阳": "242", "阿坝藏族羌族自治州": "185", "甘孜藏族自治州": "73", "凉山彝族自治州": "80", "贵阳": "146", "六盘水": "147", "遵义": "262", "安顺": "263", "铜仁市": "205", "黔西南布依族苗族自治州": "343", "毕节地区": "206", "黔东南苗族侗族自治州": "342", "黔南布依族苗族自治州": "306", "昆明": "104", "曲靖": "249", "玉溪": "106", "保山": "112", "昭通": "336", "丽江": "114", "临沧": "110", "楚雄彝族自治州": "105", "红河哈尼族彝族自治州": "107", "文山壮族苗族自治州": "177", "普洱": "108", "西双版纳傣族自治州": "109", "大理白族自治州": "111", "德宏傣族景颇族自治州": "116", "怒江傈僳族自治州": "113", "迪庆藏族自治州": "115", "拉萨": "100", "昌都地区": "99", "山南地区": "97", "日喀则地区": "102", "那曲地区": "101", "阿里地区": "103", "林芝地区": "98", "西安": "233", "铜川": "232", "宝鸡": "171", "咸阳": "323", "渭南": "170", "延安": "284", "汉中": "352", "榆林": "231", "安康": "324", "商洛": "285", "兰州": "36", "嘉峪关": "33", "金昌": "34", "白银": "35", "天水": "196", "武威": "118", "张掖": "117", "平凉": "359", "酒泉": "37", "庆阳": "135", "定西": "136", "陇南": "256", "临夏回族自治州": "182", "甘南藏族自治州": "247", "西宁": "66", "海东市": "69", "海北藏族自治州": "67", "黄南藏族自治州": "70", "海南藏族自治州": "68", "果洛藏族自治州": "72", "玉树藏族自治州": "71", "海西蒙古族藏族自治州": "65", "银川": "360", "石嘴山": "335", "吴忠": "322", "固原": "246", "中卫": "181", "乌鲁木齐": "92", "克拉玛依": "95", "吐鲁番地区": "89", "哈密地区": "91", "昌吉回族自治州": "93", "博尔塔拉蒙古自治州": "88", "巴音郭楞蒙古自治州": "86", "阿克苏地区": "85", "克孜勒苏柯尔克孜自治州": "84", "喀什地区": "83", "和田地区": "82", "伊犁哈萨克自治州": "90", "塔城地区": "94", "阿勒泰地区": "96", "石河子": "770", "阿拉尔": "731", "图木舒克": "792", "五家渠": "789", "香港特别行政区": "2912", "澳门特别行政区": "2911","胡杨河市":"3370","新星市":"3384","昆玉市":"659009","三沙市":"3336","白沙黎族自治县":"2359","乐东黎族自治县":"2032","陵水黎族自治县":"1643","琼中黎族苗族自治县":"2031","毕节市":"206","济源市":"1277","昌江黎族自治县":"1642","吐鲁番市":"89","林芝市":"98"] -def gaodeCityCodeMap = ["北京":"110000","天津":"120000","石家庄":"130100","辛集":"130181","晋州":"130183","新乐":"130184","唐山":"130200","滦州":"130284","遵化":"130281","迁安":"130283","秦皇岛":"130300","邯郸":"130400","武安":"130481","邢台":"130500","南宫":"130581","沙河":"130582","保定":"130600","涿州":"130681","定州":"130682","安国":"130683","高碑店":"130684","张家口":"130700","承德":"130800","平泉":"130881","沧州":"130900","泊头":"130981","任丘":"130982","黄骅":"130983","河间":"130984","廊坊":"131000","霸州":"131081","三河":"131082","衡水":"131100","深州":"131182","太原":"140100","古交":"140181","大同":"140200","阳泉":"140300","长治":"140400","晋城":"140500","高平":"140581","朔州":"140600","怀仁":"140681","晋中":"140700","介休":"140781","运城":"140800","永济":"140881","河津":"140882","忻州":"140900","原平":"140981","临汾":"141000","侯马":"141081","霍州":"141082","吕梁":"141100","孝义":"141181","汾阳":"141182","呼和浩特":"150100","包头":"150200","乌海":"150300","赤峰":"150400","通辽":"150500","霍林郭勒":"150581","鄂尔多斯":"150600","呼伦贝尔":"150700","满洲里":"150781","牙克石":"150782","扎兰屯":"150783","额尔古纳":"150784","根河":"150785","巴彦淖尔":"150800","乌兰察布":"150900","丰镇":"150981","乌兰浩特":"152201","阿尔山":"152202","二连浩特":"152501","锡林浩特":"152502","沈阳":"210100","新民":"210181","大连":"210200","瓦房店":"210281","庄河":"210283","鞍山":"210300","海城":"210381","抚顺":"210400","本溪":"210500","丹东":"210600","东港":"210681","凤城":"210682","锦州":"210700","凌海":"210781","北镇":"210782","营口":"210800","西市区":"210803","盖州":"210881","大石桥":"210882","阜新":"210900","辽阳":"211000","灯塔":"211081","盘锦":"211100","铁岭":"211200","调兵山":"211281","开原":"211282","朝阳":"211300","北票":"211381","凌源":"211382","葫芦岛":"211400","兴城":"211481","长春":"220100","榆树":"220182","德惠":"220183","吉林":"220200","蛟河":"220281","桦甸":"220282","舒兰":"220283","磐石":"220284","四平":"220300","公主岭":"220381","双辽":"220382","辽源":"220400","通化":"220500","梅河口":"220581","集安":"220582","白山":"220600","临江":"220681","松原":"220700","扶余":"220781","白城":"220800","洮南":"220881","大安":"220882","延吉":"222401","图们":"222402","敦化":"222403","珲春":"222404","龙井":"222405","和龙":"222406","哈尔滨":"230100","尚志":"230183","五常":"230184","齐齐哈尔":"230200","讷河":"230281","鸡西":"230300","虎林":"230381","密山":"230382","鹤岗":"230400","双鸭山":"230500","大庆":"230600","伊春":"230700","铁力":"230781","佳木斯":"230800","同江":"230881","富锦":"230882","抚远":"230883","七台河":"230900","牡丹江":"231000","绥芬河":"231081","海林":"231083","宁安":"231084","穆棱":"231085","东宁":"231086","黑河":"231100","北安":"231181","五大连池":"231182","绥化":"231200","安达":"231281","肇东":"231282","海伦":"231283","漠河":"232701","上海":"310000","南京":"320100","无锡":"320200","江阴":"320281","宜兴":"320282","徐州":"320300","新沂":"320381","邳州":"320382","常州":"320400","溧阳":"320481","苏州":"320500","常熟":"320581","张家港":"320582","昆山":"320583","太仓":"320585","南通":"320600","海安":"320685","启东":"320681","如皋":"320682","海门":"320684","连云港":"320700","淮安":"320800","盐城":"320900","东台":"320981","扬州":"321000","仪征":"321081","高邮":"321084","镇江":"321100","丹阳":"321181","扬中":"321182","句容":"321183","泰州":"321200","兴化":"321281","靖江":"321282","泰兴":"321283","宿迁":"321300","杭州":"330100","建德":"330182","宁波":"330200","余姚":"330281","慈溪":"330282","温州":"330300","瑞安":"330381","乐清":"330382","嘉兴":"330400","海宁":"330481","平湖":"330482","桐乡":"330483","湖州":"330500","绍兴":"330600","诸暨":"330681","嵊州":"330683","金华":"330700","兰溪":"330781","义乌":"330782","东阳":"330783","永康":"330784","衢州":"330800","江山":"330881","舟山":"330900","台州":"331000","温岭":"331081","临海":"331082","玉环":"331083","丽水":"331100","龙泉":"331181","合肥":"340100","巢湖":"340181","芜湖":"340200","蚌埠":"340300","淮南":"340400","马鞍山":"340500","淮北":"340600","铜陵":"340700","安庆":"340800","潜山":"340882","桐城":"340881","黄山":"341000","滁州":"341100","天长":"341181","明光":"341182","阜阳":"341200","界首":"341282","宿州":"341300","六安":"341500","亳州":"341600","池州":"341700","宣城":"341800","宁国":"341881","福州":"350100","福清":"350181","厦门":"350200","莆田":"350300","三明":"350400","永安":"350481","泉州":"350500","石狮":"350581","晋江":"350582","南安":"350583","漳州":"350600","龙海":"350681","南平":"350700","邵武":"350781","武夷山":"350782","建瓯":"350783","龙岩":"350800","漳平":"350881","宁德":"350900","福安":"350981","福鼎":"350982","南昌":"360100","景德镇":"360200","乐平":"360281","萍乡":"360300","九江":"360400","瑞昌":"360481","共青城":"360482","庐山":"360483","新余":"360500","鹰潭":"360600","贵溪":"360681","赣州":"360700","瑞金":"360781","吉安":"360800","井冈山":"360881","宜春":"360900","丰城":"360981","樟树":"360982","高安":"360983","抚州":"361000","上饶":"361100","德兴":"361181","济南":"370100","市中区":"370103","青岛":"370200","市南区":"370202","市北区":"370203","胶州":"370281","平度":"370283","莱西":"370285","淄博":"370300","枣庄":"370400","市中区":"370402","滕州":"370481","东营":"370500","烟台":"370600","龙口":"370681","莱阳":"370682","莱州":"370683","蓬莱":"370684","招远":"370685","栖霞":"370686","海阳":"370687","潍坊":"370700","青州":"370781","诸城":"370782","寿光":"370783","安丘":"370784","高密":"370785","昌邑":"370786","济宁":"370800","曲阜":"370881","邹城":"370883","泰安":"370900","新泰":"370982","肥城":"370983","威海":"371000","荣成":"371082","乳山":"371083","日照":"371100","临沂":"371300","德州":"371400","乐陵":"371481","禹城":"371482","聊城":"371500","临清":"371581","滨州":"371600","邹平":"371681","菏泽":"371700","郑州":"410100","巩义":"410181","荥阳":"410182","新密":"410183","新郑":"410184","登封":"410185","开封":"410200","洛阳":"410300","偃师":"410381","平顶山":"410400","舞钢":"410481","汝州":"410482","安阳":"410500","林州":"410581","鹤壁":"410600","新乡":"410700","卫辉":"410781","辉县":"410782","焦作":"410800","沁阳":"410882","孟州":"410883","濮阳":"410900","许昌":"411000","禹州":"411081","长葛":"411082","漯河":"411100","三门峡":"411200","义马":"411281","灵宝":"411282","南阳":"411300","邓州":"411381","商丘":"411400","永城":"411481","信阳":"411500","周口":"411600","项城":"411681","驻马店":"411700","济源":"419001","武汉":"420100","黄石":"420200","大冶":"420281","十堰":"420300","丹江口":"420381","宜昌":"420500","宜都":"420581","当阳":"420582","枝江":"420583","襄阳":"420600","老河口":"420682","枣阳":"420683","宜城":"420684","鄂州":"420700","荆门":"420800","京山":"420882","钟祥":"420881","孝感":"420900","应城":"420981","安陆":"420982","汉川":"420984","荆州":"421000","沙市区":"421002","石首":"421081","洪湖":"421083","松滋":"421087","黄冈":"421100","麻城":"421181","武穴":"421182","咸宁":"421200","赤壁":"421281","随州":"421300","广水":"421381","恩施":"422801","利川":"422802","仙桃":"429004","潜江":"429005","天门":"429006","长沙":"430100","浏阳":"430181","宁乡":"430182","株洲":"430200","醴陵":"430281","湘潭":"430300","湘乡":"430381","韶山":"430382","衡阳":"430400","耒阳":"430481","常宁":"430482","邵阳":"430500","武冈":"430581","岳阳":"430600","汨罗":"430681","临湘":"430682","常德":"430700","津市":"430781","张家界":"430800","益阳":"430900","沅江":"430981","郴州":"431000","资兴":"431081","永州":"431100","怀化":"431200","洪江":"431281","娄底":"431300","冷水江":"431381","涟源":"431382","吉首":"433101","广州":"440100","韶关":"440200","乐昌":"440281","南雄":"440282","深圳":"440300","珠海":"440400","汕头":"440500","佛山":"440600","江门":"440700","台山":"440781","开平":"440783","鹤山":"440784","恩平":"440785","湛江":"440800","廉江":"440881","雷州":"440882","吴川":"440883","茂名":"440900","高州":"440981","化州":"440982","信宜":"440983","肇庆":"441200","四会":"441284","惠州":"441300","梅州":"441400","兴宁":"441481","汕尾":"441500","陆丰":"441581","河源":"441600","阳江":"441700","阳春":"441781","清远":"441800","英德":"441881","连州":"441882","东莞":"441900","中山":"442000","潮州":"445100","揭阳":"445200","普宁":"445281","云浮":"445300","罗定":"445381","南宁":"450100","柳州":"450200","桂林":"450300","荔浦":"450381","梧州":"450400","岑溪":"450481","北海":"450500","防城港":"450600","东兴":"450681","钦州":"450700","贵港":"450800","桂平":"450881","玉林":"450900","北流":"450981","百色":"451000","靖西":"451081","贺州":"451100","河池":"451200","来宾":"451300","合山":"451381","崇左":"451400","凭祥":"451481","海口":"460100","三亚":"460200","三沙":"460300","儋州":"460400","五指山":"469001","琼海":"469002","文昌":"469005","万宁":"469006","东方":"469007","重庆":"500000","重庆市郊县":"500200","成都":"510100","都江堰":"510181","彭州":"510182","邛崃":"510183","崇州":"510184","简阳":"510185","自贡":"510300","攀枝花":"510400","泸州":"510500","德阳":"510600","广汉":"510681","什邡":"510682","绵竹":"510683","绵阳":"510700","江油":"510781","广元":"510800","遂宁":"510900","内江":"511000","市中区":"511002","隆昌":"511083","乐山":"511100","市中区":"511102","峨眉山":"511181","南充":"511300","阆中":"511381","眉山":"511400","宜宾":"511500","广安":"511600","华蓥":"511681","达州":"511700","万源":"511781","雅安":"511800","巴中":"511900","资阳":"512000","马尔康":"513201","康定":"513301","西昌":"513401","贵阳":"520100","清镇":"520181","六盘水":"520200","盘州":"520281","遵义":"520300","赤水":"520381","仁怀":"520382","安顺":"520400","毕节":"520500","铜仁":"520600","兴义":"522301","兴仁":"522302","凯里":"522601","都匀":"522701","福泉":"522702","昆明":"530100","安宁":"530181","曲靖":"530300","宣威":"530381","玉溪":"530400","保山":"530500","腾冲":"530581","昭通":"530600","水富":"530681","丽江":"530700","普洱":"530800","临沧":"530900","楚雄":"532301","个旧":"532501","开远":"532502","蒙自":"532503","弥勒":"532504","文山":"532601","景洪":"532801","大理":"532901","瑞丽":"533102","芒":"533103","泸水":"533301","香格里拉":"533401","拉萨":"540100","日喀则":"540200","昌都":"540300","林芝":"540400","山南":"540500","那曲":"540600","西安":"610100","铜川":"610200","宝鸡":"610300","咸阳":"610400","彬州":"610482","兴平":"610481","渭南":"610500","韩城":"610581","华阴":"610582","延安":"610600","汉中":"610700","榆林":"610800","神木":"610881","安康":"610900","商洛":"611000","兰州":"620100","嘉峪关":"620200","金昌":"620300","白银":"620400","天水":"620500","武威":"620600","张掖":"620700","平凉":"620800","华亭":"620881","酒泉":"620900","玉门":"620981","敦煌":"620982","庆阳":"621000","定西":"621100","陇南":"621200","临夏":"622901","合作":"623001","西宁":"630100","海东":"630200","玉树":"632701","格尔木":"632801","德令哈":"632802","茫崖":"632803","银川":"640100","灵武":"640181","石嘴山":"640200","吴忠":"640300","青铜峡":"640381","固原":"640400","中卫":"640500","乌鲁木齐":"650100","新市区":"650104","克拉玛依":"650200","吐鲁番":"650400","哈密":"650500","昌吉":"652301","阜康":"652302","博乐":"652701","阿拉山口":"652702","库尔勒":"652801","阿克苏":"652901","阿图什":"653001","喀什":"653101","和田":"653201","伊宁":"654002","奎屯":"654003","霍尔果斯":"654004","塔城":"654201","乌苏":"654202","阿勒泰":"654301","石河子":"659001","阿拉尔":"659002","图木舒克":"659003","五家渠":"659004","北屯":"659005","铁门关":"659006","双河":"659007","可克达拉":"659008","昆玉市":"659009","伊犁":"654000"] +def codeMap = ["鍖椾含": "131", "澶╂触": "332", "鐭冲搴�": "150", "鍞愬北": "265", "绉︾殗宀�": "148", "閭兏": "151", "閭㈠彴": "266", "淇濆畾": "307", "寮犲鍙�": "264", "鎵垮痉": "207", "娌у窞": "149", "寤婂潑": "191", "琛℃按": "208", "澶師": "176", "澶у悓": "355", "闃虫硥": "357", "闀挎不": "356", "鏅嬪煄": "290", "鏈斿窞": "237", "鏅嬩腑": "238", "杩愬煄": "328", "蹇诲窞": "367", "涓存本": "368", "鍚曟": "327", "鍛煎拰娴╃壒": "321", "鍖呭ご": "229", "涔屾捣": "123", "璧ゅ嘲": "297", "閫氳窘": "64", "閯傚皵澶氭柉": "283", "鍛间鸡璐濆皵": "61", "宸村溅娣栧皵": "169", "涔屽叞瀵熷竷": "168", "鍏村畨鐩�": "62", "閿℃灄閮嫆鐩�": "63", "闃挎媺鍠勭洘": "230", "娌堥槼": "58", "澶ц繛": "167", "闉嶅北": "320", "鎶氶『": "184", "鏈邯": "227", "涓逛笢": "282", "閿﹀窞": "166", "钀ュ彛": "281", "闃滄柊": "59", "杈介槼": "351", "鐩橀敠": "228", "閾佸箔": "60", "鏈濋槼": "280", "钁姦宀�": "319", "闀挎槬": "53", "鍚夋灄甯�": "55", "鍥涘钩": "56", "杈芥簮": "183", "閫氬寲": "165", "鐧藉北": "57", "鏉惧師": "52", "鐧藉煄": "51", "寤惰竟鏈濋矞鏃忚嚜娌诲窞": "54", "鍝堝皵婊�": "48", "榻愰綈鍝堝皵": "41", "楦¤タ": "46", "楣ゅ矖": "43", "鍙岄腑灞�": "45", "澶у簡": "50", "浼婃槬": "40", "浣虫湪鏂�": "42", "涓冨彴娌�": "47", "鐗′腹姹�": "49", "榛戞渤": "39", "缁ュ寲": "44", "澶у叴瀹夊箔鍦板尯": "38", "涓婃捣": "289", "鍗椾含": "315", "鏃犻敗": "317", "寰愬窞": "316", "甯稿窞": "348", "鑻忓窞": "224", "鍗楅��": "161", "杩炰簯娓�": "347", "娣畨": "162", "鐩愬煄": "223", "鎵窞": "346", "闀囨睙": "160", "娉板窞": "276", "瀹胯縼": "277", "鏉窞": "179", "瀹佹尝": "180", "娓╁窞": "178", "鍢夊叴": "334", "婀栧窞": "294", "缁嶅叴": "293", "閲戝崕": "333", "琛㈠窞": "243", "鑸熷北": "245", "鍙板窞": "244", "涓芥按": "292", "鍚堣偉": "127", "鑺滄箹": "129", "铓屽煚": "126", "娣崡": "250", "椹瀺灞�": "358", "娣寳": "253", "閾滈櫟": "337", "瀹夊簡": "130", "榛勫北": "252", "婊佸窞": "189", "闃滈槼": "128", "瀹垮窞": "370", "宸㈡箹": "251", "鍏畨": "298", "浜冲窞": "188", "姹犲窞": "299", "瀹e煄": "190", "绂忓窞": "300", "鍘﹂棬": "194", "鑾嗙敯": "195", "涓夋槑": "254", "娉夊窞": "134", "婕冲窞": "255", "鍗楀钩": "133", "榫欏博": "193", "瀹佸痉": "192", "鍗楁槍": "163", "鏅痉闀�": "225", "钀嶄埂": "350", "涔濇睙": "349", "鏂颁綑": "164", "楣版江": "279", "璧e窞": "365", "鍚夊畨": "318", "瀹滄槬": "278", "鎶氬窞": "226", "涓婇ザ": "364", "娴庡崡": "288", "闈掑矝": "236", "娣勫崥": "354", "鏋e簞": "172", "涓滆惀": "174", "鐑熷彴": "326", "娼嶅潑": "287", "娴庡畞": "286", "娉板畨": "325", "濞佹捣": "175", "鏃ョ収": "173", "鑾辫姕": "124", "涓存矀": "234", "寰峰窞": "372", "鑱婂煄": "366", "婊ㄥ窞": "235", "鑿忔辰": "353", "閮戝窞": "268", "寮�灏�": "210", "娲涢槼": "153", "骞抽《灞�": "213", "瀹夐槼": "267", "楣ゅ": "215", "鏂颁埂": "152", "鐒︿綔": "211", "婵槼": "209", "璁告槍": "155", "婕渤": "344", "涓夐棬宄�": "212", "鍗楅槼": "309", "鍟嗕笜": "154", "淇¢槼": "214", "鍛ㄥ彛": "308", "椹婚┈搴�": "269", "姝︽眽": "218", "榛勭煶": "311", "鍗佸牥": "216", "瀹滄槍": "270", "瑗勯槼": "156", "閯傚窞": "122", "鑽嗛棬": "217", "瀛濇劅": "310", "鑽嗗窞": "157", "榛勫唸": "271", "鍜稿畞": "362", "闅忓窞": "371", "鎭╂柦鍦熷鏃忚嫍鏃忚嚜娌诲窞": "373", "浠欐": "1713", "娼滄睙": "1293", "澶╅棬": "2654", "绁炲啘鏋舵灄鍖�": "2734", "闀挎矙": "158", "鏍床": "222", "婀樻江": "313", "琛¢槼": "159", "閭甸槼": "273", "宀抽槼": "220", "甯稿痉": "219", "寮犲鐣�": "312", "鐩婇槼": "272", "閮村窞": "275", "姘稿窞": "314", "鎬�鍖�": "363", "濞勫簳": "221", "婀樿タ鍦熷鏃忚嫍鏃忚嚜娌诲窞": "274", "骞垮窞": "257", "闊跺叧": "137", "娣卞湷": "340", "鐝犳捣": "140", "姹曞ご": "303", "浣涘北": "138", "姹熼棬": "302", "婀涙睙": "198", "鑼傚悕": "139", "鑲囧簡": "338", "鎯犲窞": "301", "姊呭窞": "141", "姹曞熬": "339", "娌虫簮": "200", "闃虫睙": "199", "娓呰繙": "197", "涓滆帪": "119", "涓北": "187", "娼窞": "201", "鎻槼": "259", "浜戞诞": "258", "鍗楀畞": "261", "鏌冲窞": "305", "妗傛灄": "142", "姊у窞": "304", "鍖楁捣": "295", "闃插煄娓�": "204", "閽﹀窞": "145", "璐垫腐": "341", "鐜夋灄": "361", "鐧捐壊": "203", "璐哄窞": "260", "娌虫睜": "143", "鏉ュ": "202", "宕囧乏": "144", "娴峰彛": "125", "涓変簹": "121", "浜旀寚灞�": "1644", "鐞兼捣": "2358", "鍎嬪窞": "1215", "鏂囨槍": "2758", "涓囧畞": "1216", "涓滄柟": "2634", "瀹氬畨": "1214", "灞槍": "1641", "婢勮繄": "2757", "涓撮珮": "2033", "鐧芥矙榛庢棌鑷不": "2359", "鏄屾睙榛庢棌鑷不": "1642", "涔愪笢榛庢棌鑷不": "2032", "闄垫按榛庢棌鑷不": "1643", "淇濅涵榛庢棌鑻楁棌鑷不": "1217", "鐞间腑榛庢棌鑻楁棌鑷不": "2031", "閲嶅簡": "132", "鎴愰兘": "75", "鑷础": "78", "鏀�鏋濊姳": "81", "娉稿窞": "331", "寰烽槼": "74", "缁甸槼": "240", "骞垮厓": "329", "閬傚畞": "330", "鍐呮睙": "248", "涔愬北": "79", "鍗楀厖": "291", "鐪夊北": "77", "瀹滃": "186", "骞垮畨": "241", "杈惧窞": "369", "闆呭畨": "76", "宸翠腑": "239", "璧勯槼": "242", "闃垮潩钘忔棌缇屾棌鑷不宸�": "185", "鐢樺瓬钘忔棌鑷不宸�": "73", "鍑夊北褰濇棌鑷不宸�": "80", "璐甸槼": "146", "鍏洏姘�": "147", "閬典箟": "262", "瀹夐『": "263", "閾滀粊甯�": "205", "榛旇タ鍗楀竷渚濇棌鑻楁棌鑷不宸�": "343", "姣曡妭鍦板尯": "206", "榛斾笢鍗楄嫍鏃忎緱鏃忚嚜娌诲窞": "342", "榛斿崡甯冧緷鏃忚嫍鏃忚嚜娌诲窞": "306", "鏄嗘槑": "104", "鏇查潠": "249", "鐜夋邯": "106", "淇濆北": "112", "鏄��": "336", "涓芥睙": "114", "涓存钵": "110", "妤氶泟褰濇棌鑷不宸�": "105", "绾㈡渤鍝堝凹鏃忓綕鏃忚嚜娌诲窞": "107", "鏂囧北澹棌鑻楁棌鑷不宸�": "177", "鏅幢": "108", "瑗垮弻鐗堢撼鍌f棌鑷不宸�": "109", "澶х悊鐧芥棌鑷不宸�": "111", "寰峰畯鍌f棌鏅鏃忚嚜娌诲窞": "116", "鎬掓睙鍌堝兂鏃忚嚜娌诲窞": "113", "杩簡钘忔棌鑷不宸�": "115", "鎷夎惃": "100", "鏄岄兘鍦板尯": "99", "灞卞崡鍦板尯": "97", "鏃ュ杸鍒欏湴鍖�": "102", "閭f洸鍦板尯": "101", "闃块噷鍦板尯": "103", "鏋楄姖鍦板尯": "98", "瑗垮畨": "233", "閾滃窛": "232", "瀹濋浮": "171", "鍜搁槼": "323", "娓崡": "170", "寤跺畨": "284", "姹変腑": "352", "姒嗘灄": "231", "瀹夊悍": "324", "鍟嗘礇": "285", "鍏板窞": "36", "鍢夊唱鍏�": "33", "閲戞槍": "34", "鐧介摱": "35", "澶╂按": "196", "姝﹀▉": "118", "寮犳帠": "117", "骞冲噳": "359", "閰掓硥": "37", "搴嗛槼": "135", "瀹氳タ": "136", "闄囧崡": "256", "涓村鍥炴棌鑷不宸�": "182", "鐢樺崡钘忔棌鑷不宸�": "247", "瑗垮畞": "66", "娴蜂笢甯�": "69", "娴峰寳钘忔棌鑷不宸�": "67", "榛勫崡钘忔棌鑷不宸�": "70", "娴峰崡钘忔棌鑷不宸�": "68", "鏋滄礇钘忔棌鑷不宸�": "72", "鐜夋爲钘忔棌鑷不宸�": "71", "娴疯タ钂欏彜鏃忚棌鏃忚嚜娌诲窞": "65", "閾跺窛": "360", "鐭冲槾灞�": "335", "鍚村繝": "322", "鍥哄師": "246", "涓崼": "181", "涔岄瞾鏈ㄩ綈": "92", "鍏嬫媺鐜涗緷": "95", "鍚愰瞾鐣湴鍖�": "89", "鍝堝瘑鍦板尯": "91", "鏄屽悏鍥炴棌鑷不宸�": "93", "鍗氬皵濉旀媺钂欏彜鑷不宸�": "88", "宸撮煶閮钂欏彜鑷不宸�": "86", "闃垮厠鑻忓湴鍖�": "85", "鍏嬪瓬鍕掕嫃鏌皵鍏嬪瓬鑷不宸�": "84", "鍠�浠�鍦板尯": "83", "鍜岀敯鍦板尯": "82", "浼婄妬鍝堣惃鍏嬭嚜娌诲窞": "90", "濉斿煄鍦板尯": "94", "闃垮嫆娉板湴鍖�": "96", "鐭虫渤瀛�": "770", "闃挎媺灏�": "731", "鍥炬湪鑸掑厠": "792", "浜斿娓�": "789", "棣欐腐鐗瑰埆琛屾斂鍖�": "2912", "婢抽棬鐗瑰埆琛屾斂鍖�": "2911","鑳℃潹娌冲競":"3370","鏂版槦甯�":"3384","鏄嗙帀甯�":"659009","涓夋矙甯�":"3336","鐧芥矙榛庢棌鑷不鍘�":"2359","涔愪笢榛庢棌鑷不鍘�":"2032","闄垫按榛庢棌鑷不鍘�":"1643","鐞间腑榛庢棌鑻楁棌鑷不鍘�":"2031","姣曡妭甯�":"206","娴庢簮甯�":"1277","鏄屾睙榛庢棌鑷不鍘�":"1642","鍚愰瞾鐣競":"89","鏋楄姖甯�":"98"] +def gaodeCityCodeMap = ["鍖椾含":"110000","澶╂触":"120000","鐭冲搴�":"130100","杈涢泦":"130181","鏅嬪窞":"130183","鏂颁箰":"130184","鍞愬北":"130200","婊﹀窞":"130284","閬靛寲":"130281","杩佸畨":"130283","绉︾殗宀�":"130300","閭兏":"130400","姝﹀畨":"130481","閭㈠彴":"130500","鍗楀":"130581","娌欐渤":"130582","淇濆畾":"130600","娑垮窞":"130681","瀹氬窞":"130682","瀹夊浗":"130683","楂樼搴�":"130684","寮犲鍙�":"130700","鎵垮痉":"130800","骞虫硥":"130881","娌у窞":"130900","娉婂ご":"130981","浠讳笜":"130982","榛勯獏":"130983","娌抽棿":"130984","寤婂潑":"131000","闇稿窞":"131081","涓夋渤":"131082","琛℃按":"131100","娣卞窞":"131182","澶師":"140100","鍙や氦":"140181","澶у悓":"140200","闃虫硥":"140300","闀挎不":"140400","鏅嬪煄":"140500","楂樺钩":"140581","鏈斿窞":"140600","鎬�浠�":"140681","鏅嬩腑":"140700","浠嬩紤":"140781","杩愬煄":"140800","姘告祹":"140881","娌虫触":"140882","蹇诲窞":"140900","鍘熷钩":"140981","涓存本":"141000","渚┈":"141081","闇嶅窞":"141082","鍚曟":"141100","瀛濅箟":"141181","姹鹃槼":"141182","鍛煎拰娴╃壒":"150100","鍖呭ご":"150200","涔屾捣":"150300","璧ゅ嘲":"150400","閫氳窘":"150500","闇嶆灄閮嫆":"150581","閯傚皵澶氭柉":"150600","鍛间鸡璐濆皵":"150700","婊℃床閲�":"150781","鐗欏厠鐭�":"150782","鎵庡叞灞�":"150783","棰濆皵鍙ょ撼":"150784","鏍规渤":"150785","宸村溅娣栧皵":"150800","涔屽叞瀵熷竷":"150900","涓伴晣":"150981","涔屽叞娴╃壒":"152201","闃垮皵灞�":"152202","浜岃繛娴╃壒":"152501","閿℃灄娴╃壒":"152502","娌堥槼":"210100","鏂版皯":"210181","澶ц繛":"210200","鐡︽埧搴�":"210281","搴勬渤":"210283","闉嶅北":"210300","娴峰煄":"210381","鎶氶『":"210400","鏈邯":"210500","涓逛笢":"210600","涓滄腐":"210681","鍑ゅ煄":"210682","閿﹀窞":"210700","鍑屾捣":"210781","鍖楅晣":"210782","钀ュ彛":"210800","瑗垮競鍖�":"210803","鐩栧窞":"210881","澶х煶妗�":"210882","闃滄柊":"210900","杈介槼":"211000","鐏":"211081","鐩橀敠":"211100","閾佸箔":"211200","璋冨叺灞�":"211281","寮�鍘�":"211282","鏈濋槼":"211300","鍖楃エ":"211381","鍑屾簮":"211382","钁姦宀�":"211400","鍏村煄":"211481","闀挎槬":"220100","姒嗘爲":"220182","寰锋儬":"220183","鍚夋灄":"220200","铔熸渤":"220281","妗︾敻":"220282","鑸掑叞":"220283","纾愮煶":"220284","鍥涘钩":"220300","鍏富宀�":"220381","鍙岃窘":"220382","杈芥簮":"220400","閫氬寲":"220500","姊呮渤鍙�":"220581","闆嗗畨":"220582","鐧藉北":"220600","涓存睙":"220681","鏉惧師":"220700","鎵朵綑":"220781","鐧藉煄":"220800","娲崡":"220881","澶у畨":"220882","寤跺悏":"222401","鍥句滑":"222402","鏁﹀寲":"222403","鐝叉槬":"222404","榫欎簳":"222405","鍜岄緳":"222406","鍝堝皵婊�":"230100","灏氬織":"230183","浜斿父":"230184","榻愰綈鍝堝皵":"230200","璁锋渤":"230281","楦¤タ":"230300","铏庢灄":"230381","瀵嗗北":"230382","楣ゅ矖":"230400","鍙岄腑灞�":"230500","澶у簡":"230600","浼婃槬":"230700","閾佸姏":"230781","浣虫湪鏂�":"230800","鍚屾睙":"230881","瀵岄敠":"230882","鎶氳繙":"230883","涓冨彴娌�":"230900","鐗′腹姹�":"231000","缁ヨ姮娌�":"231081","娴锋灄":"231083","瀹佸畨":"231084","绌嗘1":"231085","涓滃畞":"231086","榛戞渤":"231100","鍖楀畨":"231181","浜斿ぇ杩炴睜":"231182","缁ュ寲":"231200","瀹夎揪":"231281","鑲囦笢":"231282","娴蜂鸡":"231283","婕犳渤":"232701","涓婃捣":"310000","鍗椾含":"320100","鏃犻敗":"320200","姹熼槾":"320281","瀹滃叴":"320282","寰愬窞":"320300","鏂版矀":"320381","閭冲窞":"320382","甯稿窞":"320400","婧ч槼":"320481","鑻忓窞":"320500","甯哥啛":"320581","寮犲娓�":"320582","鏄嗗北":"320583","澶粨":"320585","鍗楅��":"320600","娴峰畨":"320685","鍚笢":"320681","濡傜殝":"320682","娴烽棬":"320684","杩炰簯娓�":"320700","娣畨":"320800","鐩愬煄":"320900","涓滃彴":"320981","鎵窞":"321000","浠緛":"321081","楂橀偖":"321084","闀囨睙":"321100","涓归槼":"321181","鎵腑":"321182","鍙ュ":"321183","娉板窞":"321200","鍏村寲":"321281","闈栨睙":"321282","娉板叴":"321283","瀹胯縼":"321300","鏉窞":"330100","寤哄痉":"330182","瀹佹尝":"330200","浣欏":"330281","鎱堟邯":"330282","娓╁窞":"330300","鐟炲畨":"330381","涔愭竻":"330382","鍢夊叴":"330400","娴峰畞":"330481","骞虫箹":"330482","妗愪埂":"330483","婀栧窞":"330500","缁嶅叴":"330600","璇告毃":"330681","宓婂窞":"330683","閲戝崕":"330700","鍏版邯":"330781","涔変箤":"330782","涓滈槼":"330783","姘稿悍":"330784","琛㈠窞":"330800","姹熷北":"330881","鑸熷北":"330900","鍙板窞":"331000","娓╁箔":"331081","涓存捣":"331082","鐜夌幆":"331083","涓芥按":"331100","榫欐硥":"331181","鍚堣偉":"340100","宸㈡箹":"340181","鑺滄箹":"340200","铓屽煚":"340300","娣崡":"340400","椹瀺灞�":"340500","娣寳":"340600","閾滈櫟":"340700","瀹夊簡":"340800","娼滃北":"340882","妗愬煄":"340881","榛勫北":"341000","婊佸窞":"341100","澶╅暱":"341181","鏄庡厜":"341182","闃滈槼":"341200","鐣岄":"341282","瀹垮窞":"341300","鍏畨":"341500","浜冲窞":"341600","姹犲窞":"341700","瀹e煄":"341800","瀹佸浗":"341881","绂忓窞":"350100","绂忔竻":"350181","鍘﹂棬":"350200","鑾嗙敯":"350300","涓夋槑":"350400","姘稿畨":"350481","娉夊窞":"350500","鐭崇嫯":"350581","鏅嬫睙":"350582","鍗楀畨":"350583","婕冲窞":"350600","榫欐捣":"350681","鍗楀钩":"350700","閭垫":"350781","姝﹀し灞�":"350782","寤虹摨":"350783","榫欏博":"350800","婕冲钩":"350881","瀹佸痉":"350900","绂忓畨":"350981","绂忛紟":"350982","鍗楁槍":"360100","鏅痉闀�":"360200","涔愬钩":"360281","钀嶄埂":"360300","涔濇睙":"360400","鐟炴槍":"360481","鍏遍潚鍩�":"360482","搴愬北":"360483","鏂颁綑":"360500","楣版江":"360600","璐垫邯":"360681","璧e窞":"360700","鐟為噾":"360781","鍚夊畨":"360800","浜曞唸灞�":"360881","瀹滄槬":"360900","涓板煄":"360981","妯熸爲":"360982","楂樺畨":"360983","鎶氬窞":"361000","涓婇ザ":"361100","寰峰叴":"361181","娴庡崡":"370100","甯備腑鍖�":"370103","闈掑矝":"370200","甯傚崡鍖�":"370202","甯傚寳鍖�":"370203","鑳跺窞":"370281","骞冲害":"370283","鑾辫タ":"370285","娣勫崥":"370300","鏋e簞":"370400","甯備腑鍖�":"370402","婊曞窞":"370481","涓滆惀":"370500","鐑熷彴":"370600","榫欏彛":"370681","鑾遍槼":"370682","鑾卞窞":"370683","钃幈":"370684","鎷涜繙":"370685","鏍栭湠":"370686","娴烽槼":"370687","娼嶅潑":"370700","闈掑窞":"370781","璇稿煄":"370782","瀵垮厜":"370783","瀹変笜":"370784","楂樺瘑":"370785","鏄岄倯":"370786","娴庡畞":"370800","鏇查槣":"370881","閭瑰煄":"370883","娉板畨":"370900","鏂版嘲":"370982","鑲ュ煄":"370983","濞佹捣":"371000","鑽f垚":"371082","涔冲北":"371083","鏃ョ収":"371100","涓存矀":"371300","寰峰窞":"371400","涔愰櫟":"371481","绂瑰煄":"371482","鑱婂煄":"371500","涓存竻":"371581","婊ㄥ窞":"371600","閭瑰钩":"371681","鑿忔辰":"371700","閮戝窞":"410100","宸╀箟":"410181","鑽ラ槼":"410182","鏂板瘑":"410183","鏂伴儜":"410184","鐧诲皝":"410185","寮�灏�":"410200","娲涢槼":"410300","鍋冨笀":"410381","骞抽《灞�":"410400","鑸為挗":"410481","姹濆窞":"410482","瀹夐槼":"410500","鏋楀窞":"410581","楣ゅ":"410600","鏂颁埂":"410700","鍗緣":"410781","杈夊幙":"410782","鐒︿綔":"410800","娌侀槼":"410882","瀛熷窞":"410883","婵槼":"410900","璁告槍":"411000","绂瑰窞":"411081","闀胯憶":"411082","婕渤":"411100","涓夐棬宄�":"411200","涔夐┈":"411281","鐏靛疂":"411282","鍗楅槼":"411300","閭撳窞":"411381","鍟嗕笜":"411400","姘稿煄":"411481","淇¢槼":"411500","鍛ㄥ彛":"411600","椤瑰煄":"411681","椹婚┈搴�":"411700","娴庢簮":"419001","姝︽眽":"420100","榛勭煶":"420200","澶у喍":"420281","鍗佸牥":"420300","涓规睙鍙�":"420381","瀹滄槍":"420500","瀹滈兘":"420581","褰撻槼":"420582","鏋濇睙":"420583","瑗勯槼":"420600","鑰佹渤鍙�":"420682","鏋i槼":"420683","瀹滃煄":"420684","閯傚窞":"420700","鑽嗛棬":"420800","浜北":"420882","閽熺ゥ":"420881","瀛濇劅":"420900","搴斿煄":"420981","瀹夐檰":"420982","姹夊窛":"420984","鑽嗗窞":"421000","娌欏競鍖�":"421002","鐭抽":"421081","娲箹":"421083","鏉炬粙":"421087","榛勫唸":"421100","楹诲煄":"421181","姝︾┐":"421182","鍜稿畞":"421200","璧ゅ":"421281","闅忓窞":"421300","骞挎按":"421381","鎭╂柦":"422801","鍒╁窛":"422802","浠欐":"429004","娼滄睙":"429005","澶╅棬":"429006","闀挎矙":"430100","娴忛槼":"430181","瀹佷埂":"430182","鏍床":"430200","閱撮櫟":"430281","婀樻江":"430300","婀樹埂":"430381","闊跺北":"430382","琛¢槼":"430400","鑰掗槼":"430481","甯稿畞":"430482","閭甸槼":"430500","姝﹀唸":"430581","宀抽槼":"430600","姹ㄧ綏":"430681","涓存箻":"430682","甯稿痉":"430700","娲ュ競":"430781","寮犲鐣�":"430800","鐩婇槼":"430900","娌呮睙":"430981","閮村窞":"431000","璧勫叴":"431081","姘稿窞":"431100","鎬�鍖�":"431200","娲睙":"431281","濞勫簳":"431300","鍐锋按姹�":"431381","娑熸簮":"431382","鍚夐":"433101","骞垮窞":"440100","闊跺叧":"440200","涔愭槍":"440281","鍗楅泟":"440282","娣卞湷":"440300","鐝犳捣":"440400","姹曞ご":"440500","浣涘北":"440600","姹熼棬":"440700","鍙板北":"440781","寮�骞�":"440783","楣ゅ北":"440784","鎭╁钩":"440785","婀涙睙":"440800","寤夋睙":"440881","闆峰窞":"440882","鍚村窛":"440883","鑼傚悕":"440900","楂樺窞":"440981","鍖栧窞":"440982","淇″疁":"440983","鑲囧簡":"441200","鍥涗細":"441284","鎯犲窞":"441300","姊呭窞":"441400","鍏村畞":"441481","姹曞熬":"441500","闄嗕赴":"441581","娌虫簮":"441600","闃虫睙":"441700","闃虫槬":"441781","娓呰繙":"441800","鑻卞痉":"441881","杩炲窞":"441882","涓滆帪":"441900","涓北":"442000","娼窞":"445100","鎻槼":"445200","鏅畞":"445281","浜戞诞":"445300","缃楀畾":"445381","鍗楀畞":"450100","鏌冲窞":"450200","妗傛灄":"450300","鑽旀郸":"450381","姊у窞":"450400","宀戞邯":"450481","鍖楁捣":"450500","闃插煄娓�":"450600","涓滃叴":"450681","閽﹀窞":"450700","璐垫腐":"450800","妗傚钩":"450881","鐜夋灄":"450900","鍖楁祦":"450981","鐧捐壊":"451000","闈栬タ":"451081","璐哄窞":"451100","娌虫睜":"451200","鏉ュ":"451300","鍚堝北":"451381","宕囧乏":"451400","鍑ゥ":"451481","娴峰彛":"460100","涓変簹":"460200","涓夋矙":"460300","鍎嬪窞":"460400","浜旀寚灞�":"469001","鐞兼捣":"469002","鏂囨槍":"469005","涓囧畞":"469006","涓滄柟":"469007","閲嶅簡":"500000","閲嶅簡甯傞儕鍘�":"500200","鎴愰兘":"510100","閮芥睙鍫�":"510181","褰窞":"510182","閭涘磧":"510183","宕囧窞":"510184","绠�闃�":"510185","鑷础":"510300","鏀�鏋濊姳":"510400","娉稿窞":"510500","寰烽槼":"510600","骞挎眽":"510681","浠�閭�":"510682","缁电":"510683","缁甸槼":"510700","姹熸补":"510781","骞垮厓":"510800","閬傚畞":"510900","鍐呮睙":"511000","甯備腑鍖�":"511002","闅嗘槍":"511083","涔愬北":"511100","甯備腑鍖�":"511102","宄ㄧ湁灞�":"511181","鍗楀厖":"511300","闃嗕腑":"511381","鐪夊北":"511400","瀹滃":"511500","骞垮畨":"511600","鍗庤摜":"511681","杈惧窞":"511700","涓囨簮":"511781","闆呭畨":"511800","宸翠腑":"511900","璧勯槼":"512000","椹皵搴�":"513201","搴峰畾":"513301","瑗挎槍":"513401","璐甸槼":"520100","娓呴晣":"520181","鍏洏姘�":"520200","鐩樺窞":"520281","閬典箟":"520300","璧ゆ按":"520381","浠佹��":"520382","瀹夐『":"520400","姣曡妭":"520500","閾滀粊":"520600","鍏翠箟":"522301","鍏翠粊":"522302","鍑噷":"522601","閮藉寑":"522701","绂忔硥":"522702","鏄嗘槑":"530100","瀹夊畞":"530181","鏇查潠":"530300","瀹e▉":"530381","鐜夋邯":"530400","淇濆北":"530500","鑵惧啿":"530581","鏄��":"530600","姘村瘜":"530681","涓芥睙":"530700","鏅幢":"530800","涓存钵":"530900","妤氶泟":"532301","涓棫":"532501","寮�杩�":"532502","钂欒嚜":"532503","寮ュ嫆":"532504","鏂囧北":"532601","鏅椽":"532801","澶х悊":"532901","鐟炰附":"533102","鑺�":"533103","娉告按":"533301","棣欐牸閲屾媺":"533401","鎷夎惃":"540100","鏃ュ杸鍒�":"540200","鏄岄兘":"540300","鏋楄姖":"540400","灞卞崡":"540500","閭f洸":"540600","瑗垮畨":"610100","閾滃窛":"610200","瀹濋浮":"610300","鍜搁槼":"610400","褰窞":"610482","鍏村钩":"610481","娓崡":"610500","闊╁煄":"610581","鍗庨槾":"610582","寤跺畨":"610600","姹変腑":"610700","姒嗘灄":"610800","绁炴湪":"610881","瀹夊悍":"610900","鍟嗘礇":"611000","鍏板窞":"620100","鍢夊唱鍏�":"620200","閲戞槍":"620300","鐧介摱":"620400","澶╂按":"620500","姝﹀▉":"620600","寮犳帠":"620700","骞冲噳":"620800","鍗庝涵":"620881","閰掓硥":"620900","鐜夐棬":"620981","鏁︾厡":"620982","搴嗛槼":"621000","瀹氳タ":"621100","闄囧崡":"621200","涓村":"622901","鍚堜綔":"623001","瑗垮畞":"630100","娴蜂笢":"630200","鐜夋爲":"632701","鏍煎皵鏈�":"632801","寰蜂护鍝�":"632802","鑼礀":"632803","閾跺窛":"640100","鐏垫":"640181","鐭冲槾灞�":"640200","鍚村繝":"640300","闈掗摐宄�":"640381","鍥哄師":"640400","涓崼":"640500","涔岄瞾鏈ㄩ綈":"650100","鏂板競鍖�":"650104","鍏嬫媺鐜涗緷":"650200","鍚愰瞾鐣�":"650400","鍝堝瘑":"650500","鏄屽悏":"652301","闃滃悍":"652302","鍗氫箰":"652701","闃挎媺灞卞彛":"652702","搴撳皵鍕�":"652801","闃垮厠鑻�":"652901","闃垮浘浠�":"653001","鍠�浠�":"653101","鍜岀敯":"653201","浼婂畞":"654002","濂庡悲":"654003","闇嶅皵鏋滄柉":"654004","濉斿煄":"654201","涔岃嫃":"654202","闃垮嫆娉�":"654301","鐭虫渤瀛�":"659001","闃挎媺灏�":"659002","鍥炬湪鑸掑厠":"659003","浜斿娓�":"659004","鍖楀悲":"659005","閾侀棬鍏�":"659006","鍙屾渤":"659007","鍙厠杈炬媺":"659008","鏄嗙帀甯�":"659009","浼婄妬":"654000"] -//def name = "台基厂社区居委会" -//def region = "东城区" -//def rets = OpenApiUtils.searchBaiDuMap(name, region, codeMap.get("北京").toInteger()); +//def name = "鍙板熀鍘傜ぞ鍖哄眳濮斾細" +//def region = "涓滃煄鍖�" +//def rets = OpenApiUtils.searchBaiDuMap(name, region, codeMap.get("鍖椾含").toInteger()); -filePath = "D:\\数据\\涉农\\18万最终-入库.xlsx" +filePath = "D:\\鏁版嵁\\娑夊啘\\18涓囨渶缁�-鍏ュ簱.xlsx" ExcelUtils.multiThreadingModify(filePath, {d-> if(!d['N'] && d['J']){ @@ -45,16 +45,16 @@ ExcelUtils.multiThreadingModify(filePath, {d-> } } // for(def r : rets){ -// def bdname = r.name.replace("-","").replace("社区居民委员会","").replace('社区居委会','').replace('居民委员会','').replace('村民委员会','').replace('村委员会','').replace('村委会','').replace('居委会','') -// def newName = name.replace("-","").replace("社区居民委员会","").replace('社区居委会','').replace('居民委员会','').replace('村民委员会','').replace('村委员会','').replace('村委会','').replace('居委会','') +// def bdname = r.name.replace("-","").replace("绀惧尯灞呮皯濮斿憳浼�","").replace('绀惧尯灞呭浼�','').replace('灞呮皯濮斿憳浼�','').replace('鏉戞皯濮斿憳浼�','').replace('鏉戝鍛樹細','').replace('鏉戝浼�','').replace('灞呭浼�','') +// def newName = name.replace("-","").replace("绀惧尯灞呮皯濮斿憳浼�","").replace('绀惧尯灞呭浼�','').replace('灞呮皯濮斿憳浼�','').replace('鏉戞皯濮斿憳浼�','').replace('鏉戝鍛樹細','').replace('鏉戝浼�','').replace('灞呭浼�','') // def stopFlag = false // if(bdname == newName){ // stopFlag = true -// }else if(bdname.endsWith("村")){ -// if(bdname.equals(newName+"村")){ +// }else if(bdname.endsWith("鏉�")){ +// if(bdname.equals(newName+"鏉�")){ // stopFlag = true // }else{ -// if(bdname.equals(township+newName+"村")){ +// if(bdname.equals(township+newName+"鏉�")){ // stopFlag = true // } // } @@ -71,7 +71,7 @@ ExcelUtils.multiThreadingModify(filePath, {d-> // d['O'] = DataUtil.getRound(6, r.lat) // d['P'] = r.estateType // if(r.region.contains(region)){ -// d['Q'] = "区域相同" +// d['Q'] = "鍖哄煙鐩稿悓" // }else{ // d['Q'] = r.region // } @@ -81,22 +81,22 @@ ExcelUtils.multiThreadingModify(filePath, {d-> // } }else{ - println "【${city}】 没有找到相关code" + println "銆�${city}銆� 娌℃湁鎵惧埌鐩稿叧code" } } }) ExcelUtils.multiThreadingModify(filePath, {d-> if(d['J'] && d['R']){ - def newName1 = d['J'].replace("居民委员会","").replace("社区居委会","").replace("社区居委","").replace("居委会","").replace("村民委员会","").replace("村委会","").replace("小区","社区").replace("社区村","村") - def newName2 = d['R'].replace("居民委员会","").replace("社区居委会","").replace("社区居委","").replace("居委会","").replace("村民委员会","").replace("村委会","").replace("小区","社区").replace("社区村","村") + def newName1 = d['J'].replace("灞呮皯濮斿憳浼�","").replace("绀惧尯灞呭浼�","").replace("绀惧尯灞呭","").replace("灞呭浼�","").replace("鏉戞皯濮斿憳浼�","").replace("鏉戝浼�","").replace("灏忓尯","绀惧尯").replace("绀惧尯鏉�","鏉�") + def newName2 = d['R'].replace("灞呮皯濮斿憳浼�","").replace("绀惧尯灞呭浼�","").replace("绀惧尯灞呭","").replace("灞呭浼�","").replace("鏉戞皯濮斿憳浼�","").replace("鏉戝浼�","").replace("灏忓尯","绀惧尯").replace("绀惧尯鏉�","鏉�") if(newName1.contains(newName2) || newName2.contains(newName1)){ - d['U'] = "包含" + d['U'] = "鍖呭惈" }else{ def py1 = com.fangjia.core.util.DataUtil.hanyuQuanpin(newName1, " ") def py2 = com.fangjia.core.util.DataUtil.hanyuQuanpin(newName2, " ") if(py1.contains(py2) || py2.contains(py1)){ - d['U'] = "拼音相似" + d['U'] = "鎷奸煶鐩镐技" } } } @@ -106,11 +106,11 @@ ExcelUtils.multiThreadingModify(filePath, {d-> // if(d['J'] ) { // def pois = findPois(d['D'], d['F'], d['J']) // if(pois){ -// def name1 = d['J'].replace("居民委员会","").replace("社区居委会","").replace("社区居委","").replace("居委会","").replace("村民委员会","").replace("村委会","") +// def name1 = d['J'].replace("灞呮皯濮斿憳浼�","").replace("绀惧尯灞呭浼�","").replace("绀惧尯灞呭","").replace("灞呭浼�","").replace("鏉戞皯濮斿憳浼�","").replace("鏉戝浼�","") // for(def poi : pois){ -// def name2 = poi.name.replace("居民委员会","").replace("社区居委会","").replace("社区居委","").replace("居委会","").replace("村民委员会","").replace("村委会","") +// def name2 = poi.name.replace("灞呮皯濮斿憳浼�","").replace("绀惧尯灞呭浼�","").replace("绀惧尯灞呭","").replace("灞呭浼�","").replace("鏉戞皯濮斿憳浼�","").replace("鏉戝浼�","") // if(name1.contains(name2) || name2.contains(name1)){ -// //经度 纬度 类型 百度区域 百度名称 +// //缁忓害 绾害 绫诲瀷 鐧惧害鍖哄煙 鐧惧害鍚嶇О // d['N'] = poi.lng // d['O'] = poi.lat // d['P'] = poi.type @@ -153,11 +153,11 @@ def sortResult(rets){ def a1 = a.estateType def b1 = b.estateType def a1_score = a.score -// if(a1 && a1.contains("政府机构")){ +// if(a1 && a1.contains("鏀垮簻鏈烘瀯")){ // a1_score = a1_score +1 // } def b1_score = b.score -// if(b1 && b1.contains("政府机构")){ +// if(b1 && b1.contains("鏀垮簻鏈烘瀯")){ // b1_score = b1_score +1 // } return b1_score.compareTo(a1_score) @@ -167,6 +167,6 @@ def sortResult(rets){ // -//def code = codeMap.get("北京"); -//rets = OpenApiUtils.searchBaiDuMap("人定湖社区居委会", "东城区", code.toInteger()); +//def code = codeMap.get("鍖椾含"); +//rets = OpenApiUtils.searchBaiDuMap("浜哄畾婀栫ぞ鍖哄眳濮斾細", "涓滃煄鍖�", code.toInteger()); //println(rets) \ No newline at end of file diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/govLocation.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/govLocation.groovy index 8aa7b2d42..cb1a09efc 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/govLocation.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/govLocation.groovy @@ -17,12 +17,12 @@ DBCollection COMMUNITY_CONN = MongoUtils.getCollectionByName2("fangjia", "commun //def s = getTownshipInfo("118.702988,39.740979") -def filePath = "D:\\数据\\涉农\\县政府(最终).xlsx" +def filePath = "D:\\鏁版嵁\\娑夊啘\\鍘挎斂搴�(鏈�缁�).xlsx" ExcelUtils.modify(filePath, { row -> - if(!row['I'] && row['I']=='建瓯市'){ - def rets = EsSearchUtils.findPois(row['B'], row['C'], row['C']+"人民政府") + if(!row['I'] && row['I']=='寤虹摨甯�'){ + def rets = EsSearchUtils.findPois(row['B'], row['C'], row['C']+"浜烘皯鏀垮簻") if(rets){ - def obj = findOneByName(rets, row['C']+"人民政府") + def obj = findOneByName(rets, row['C']+"浜烘皯鏀垮簻") if(obj){ row['I'] = obj.lng row['J'] = obj.lat @@ -61,7 +61,7 @@ ExcelUtils.modify(filePath, { row -> // up_query.put("area_name", row['C']) // up_query.put("street_name", row['F']) // def udata = new BasicDBObject() -// udata.put("has_gov", "是") +// udata.put("has_gov", "鏄�") // COMMUNITY_CONN.update(up_query, new BasicDBObject('$set', udata), false, true) // } }) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/saveCommunity.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/saveCommunity.groovy index 8918f18f3..5a9448d4b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/saveCommunity.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/saveCommunity.groovy @@ -10,7 +10,7 @@ import org.bson.types.ObjectId def MONGO100_URL = "mongodb://admin:G00MONGOADMIN@192.168.0.100:30009"; DBCollection COMMUNITY_CONN = MongoUtils.getCollectionByName2("fangjia", "community_new_2023", MONGO100_URL) -filePath = "D:\\数据\\涉农\\18万最终-id.xlsx" +filePath = "D:\\鏁版嵁\\娑夊啘\\18涓囨渶缁�-id.xlsx" def index = 0 ExcelUtils.multiThreadingModify(filePath, { d-> diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/test.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/test.groovy index b186739ea..a748f7b68 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/test.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/test.groovy @@ -27,15 +27,15 @@ class QiliangTest1 { // task.run() def data = [ - 'address': '江苏省扬州市宝应县安宜镇宝应大道88号', + 'address': '姹熻嫃鐪佹壃宸炲競瀹濆簲鍘垮畨瀹滈晣瀹濆簲澶ч亾88鍙�', 'type': '1' ] def s = task.getProxyResult(data) print(s) } - def run(){//地址测试-2024.3.4-结果.xlsx - ExcelUtils.modify("D:\\数据\\省联社\\对比.xlsx", { row -> + def run(){//鍦板潃娴嬭瘯-2024.3.4-缁撴灉.xlsx + ExcelUtils.modify("D:\\鏁版嵁\\鐪佽仈绀綷\瀵规瘮.xlsx", { row -> if(!row['N']){ def address = null if(row['B'] && row['C'] && !row['C'].toString().contains(row['B'])){ @@ -69,14 +69,14 @@ class QiliangTest1 { } if(data.farmer == "0"){ - row['T'] = "非农" + row['T'] = "闈炲啘" }else{ - row['T'] = "农" + row['T'] = "鍐�" } if(data.isGovt == "0"){ - row['U'] = "否" + row['U'] = "鍚�" }else{ - row['U'] = "是" + row['U'] = "鏄�" } def list = data.indusParkList @@ -128,40 +128,40 @@ class QiliangTest1 { def getProxyResult(data){ - // 将 JSON 对象转换为字符串 + // 灏� JSON 瀵硅薄杞崲涓哄瓧绗︿覆 def jsonData = new JsonOutput().toJson(data) - // 创建代理对象 + // 鍒涘缓浠g悊瀵硅薄 def proxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress(proxyHost, proxyPort)) - // 创建 URL 对象 + // 鍒涘缓 URL 瀵硅薄 def url = new URL(targetUrl) - // 创建连接对象 + // 鍒涘缓杩炴帴瀵硅薄 def connection = url.openConnection(proxy) - // 设置代理认证 + // 璁剧疆浠g悊璁よ瘉 java.net.Authenticator.setDefault(new java.net.Authenticator() { protected PasswordAuthentication getPasswordAuthentication() { return new PasswordAuthentication(proxyUsername, proxyPassword.toCharArray()) } }) - // 设置请求方法为 POST + // 璁剧疆璇锋眰鏂规硶涓� POST connection.setRequestMethod("POST") - // 允许输出流 + // 鍏佽杈撳嚭娴� connection.setDoOutput(true) - // 设置请求头 + // 璁剧疆璇锋眰澶� connection.setRequestProperty("Content-Type", "application/json") - // 发送请求参数 + // 鍙戦�佽姹傚弬鏁� def outputStream = connection.getOutputStream() outputStream.write(jsonData.getBytes("UTF-8")) outputStream.flush() outputStream.close() - // 读取响应 + // 璇诲彇鍝嶅簲 def responseCode = connection.getResponseCode() if (responseCode == HttpURLConnection.HTTP_OK) { def reader = new BufferedReader(new InputStreamReader(connection.getInputStream())) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/CryptoSm4Util.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/CryptoSm4Util.groovy index 6e960180d..2d77b4cdb 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/CryptoSm4Util.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/CryptoSm4Util.groovy @@ -16,7 +16,7 @@ import java.security.SecureRandom; public class CryptoSm4Util { /** - * 默认密钥 + * 榛樿瀵嗛挜 */ private static final String DEFAULT_SECRET_KEY = "A1B2C3D4E5F60789A1B2C3D4E5F60789"; private static final String CHARSET = "UTF-8"; @@ -68,48 +68,48 @@ public class CryptoSm4Util { } /** - * 使用默认密钥加密 + * 浣跨敤榛樿瀵嗛挜鍔犲瘑 * - * @param str 加密内容 - * @return 以String密文输入, String明文输出 + * @param str 鍔犲瘑鍐呭 + * @return 浠tring瀵嗘枃杈撳叆, String鏄庢枃杈撳嚭 */ public static String encode(String str) { return encode(DEFAULT_SECRET_KEY, str); } /** - * 自定义密钥加密 + * 鑷畾涔夊瘑閽ュ姞瀵� * - * @param key 自定义密钥 - * @param str 加密的内容 - * @return String明文输入, String密文输出 + * @param key 鑷畾涔夊瘑閽� + * @param str 鍔犲瘑鐨勫唴瀹� + * @return String鏄庢枃杈撳叆, String瀵嗘枃杈撳嚭 */ public static String encode(String key, String str) { return encrypt(key, str); } /** - * 使用默认密钥解密 + * 浣跨敤榛樿瀵嗛挜瑙e瘑 * - * @param str 解密内容 - * @return 以String密文输入, String明文输出 + * @param str 瑙e瘑鍐呭 + * @return 浠tring瀵嗘枃杈撳叆, String鏄庢枃杈撳嚭 */ public static String decode(String str) { return decode(DEFAULT_SECRET_KEY, str); } /** - * 自定义密钥解密 + * 鑷畾涔夊瘑閽ヨВ瀵� * - * @param key 自定义密钥 - * @param str 加密内容 - * @return 以String密文输入, String明文输出 + * @param key 鑷畾涔夊瘑閽� + * @param str 鍔犲瘑鍐呭 + * @return 浠tring瀵嗘枃杈撳叆, String鏄庢枃杈撳嚭 */ public static String decode(String key, String str) { return decrypt(key, str); } public static void main(def a){ - println encrypt( DEFAULT_SECRET_KEY, "测试") + println encrypt( DEFAULT_SECRET_KEY, "娴嬭瘯") } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/ElasticUtils89.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/ElasticUtils89.groovy index dd2c2e5e1..b966d0417 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/ElasticUtils89.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/ElasticUtils89.groovy @@ -42,7 +42,7 @@ import java.util.concurrent.Executors import java.util.concurrent.TimeUnit import java.util.function.BiConsumer /** - * 功能说明:Elasticsearch工具类 + * 鍔熻兘璇存槑:Elasticsearch宸ュ叿绫� */ class ElasticUtils89 { @@ -153,7 +153,7 @@ class ElasticUtils89 { /** - * 创建一个ES批处理器 + * 鍒涘缓涓�涓狤S鎵瑰鐞嗗櫒 * @param host * @return */ @@ -169,10 +169,10 @@ class ElasticUtils89 { if (response.hasFailures()) { for (BulkItemResponse itemResponse : response.getItems()) { if (itemResponse.isFailed()) { - // 处理失败项 + // 澶勭悊澶辫触椤� String failureMessage = itemResponse.getFailureMessage(); println failureMessage - // 日志记录、告警或重试 + // 鏃ュ織璁板綍銆佸憡璀︽垨閲嶈瘯 } } } @@ -198,7 +198,7 @@ class ElasticUtils89 { } /** - * 关闭一个ES批处理器 + * 鍏抽棴涓�涓狤S鎵瑰鐞嗗櫒 * @param * @return */ @@ -283,7 +283,7 @@ class ElasticUtils89 { BulkProcessor bulkProcessor = createBulkProcessor(host, client) final Scroll scroll = new Scroll(TimeValue.timeValueMinutes(30)) - // 2. 初始化滚动查询 + // 2. 鍒濆鍖栨粴鍔ㄦ煡璇� SearchRequest searchRequest = new SearchRequest(indexName); searchRequest.scroll(scroll); @@ -295,47 +295,47 @@ class ElasticUtils89 { String scrollId = searchResponse.getScrollId(); SearchHit[] hits = searchResponse.getHits().getHits(); - // 3. 批量操作容器 + // 3. 鎵归噺鎿嶄綔瀹瑰櫒 BulkRequest bulkRequest = new BulkRequest(); - // 4. 处理滚动结果 + // 4. 澶勭悊婊氬姩缁撴灉 while (hits.length > 0){ for (SearchHit hit : hits) { - // 示例修改逻辑:当满足条件时更新文档 + // 绀轰緥淇敼閫昏緫锛氬綋婊¤冻鏉′欢鏃舵洿鏂版枃妗� if(closure.getMaximumNumberOfParameters() == 2){ def update = closure.call(hit.getId(), hit.getSourceAsMap()) if(update){ bulkRequest.add(new IndexRequest(indexName).id(hit.getId()).source(hit.getSourceAsMap())) } } - // 批量提交控制 + // 鎵归噺鎻愪氦鎺у埗 if (bulkRequest.numberOfActions() >= 1) { bulkRequest.setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE); BulkResponse bulkResponse = client.bulk(bulkRequest, RequestOptions.DEFAULT); if (bulkResponse.hasFailures()) { - System.err.println("批量操作部分失败: " + bulkResponse.buildFailureMessage()); - // 这里可以添加重试逻辑 + System.err.println("鎵归噺鎿嶄綔閮ㄥ垎澶辫触: " + bulkResponse.buildFailureMessage()); + // 杩欓噷鍙互娣诲姞閲嶈瘯閫昏緫 } - bulkRequest = new BulkRequest(); // 重置容器 + bulkRequest = new BulkRequest(); // 閲嶇疆瀹瑰櫒 } } - // 5. 获取下一批滚动结果 + // 5. 鑾峰彇涓嬩竴鎵规粴鍔ㄧ粨鏋� SearchScrollRequest scrollRequest = new SearchScrollRequest(scrollId).scroll(TimeValue.timeValueMinutes(5)); searchResponse = client.scroll(scrollRequest, RequestOptions.DEFAULT); scrollId = searchResponse.getScrollId(); hits = searchResponse.getHits().getHits(); } - // 6. 提交剩余批量操作 + // 6. 鎻愪氦鍓╀綑鎵归噺鎿嶄綔 if (bulkRequest.numberOfActions() > 0) { BulkResponse bulkResponse = client.bulk(bulkRequest, RequestOptions.DEFAULT); if (bulkResponse.hasFailures()) { - System.err.println("批量操作部分失败: " + bulkResponse.buildFailureMessage()); + System.err.println("鎵归噺鎿嶄綔閮ㄥ垎澶辫触: " + bulkResponse.buildFailureMessage()); } } - // 7. 清理滚动上下文 + // 7. 娓呯悊婊氬姩涓婁笅鏂� ClearScrollRequest clearScrollRequest = new ClearScrollRequest(); clearScrollRequest.addScrollId(scrollId); client.clearScroll(clearScrollRequest, RequestOptions.DEFAULT); @@ -362,7 +362,7 @@ class ElasticUtils89 { request.setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE); BulkResponse bulkResponse = client.bulk(request, RequestOptions.DEFAULT); if (bulkResponse.hasFailures()) { - // 处理错误 + // 澶勭悊閿欒 println "Bulk request has failures: " + bulkResponse.buildFailureMessage() } else { processedCount += request.numberOfActions(); @@ -376,7 +376,7 @@ class ElasticUtils89 { request.setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE); BulkResponse bulkResponse = client.bulk(request, RequestOptions.DEFAULT); if (bulkResponse.hasFailures()) { - // 处理错误 + // 澶勭悊閿欒 println "Bulk request has failures: " + bulkResponse.buildFailureMessage() } else { processedCount += request.numberOfActions(); @@ -396,7 +396,7 @@ class ElasticUtils89 { searchRequest.scroll(scroll); SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder(); if(includes){ - String[] excludes = [] // 没有要排除的字段 + String[] excludes = [] // 娌℃湁瑕佹帓闄ょ殑瀛楁 FetchSourceContext fetchSourceContext = new FetchSourceContext(true, includes, excludes) searchSourceBuilder.fetchSource(fetchSourceContext) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/GaoDePoiDataProcess.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/GaoDePoiDataProcess.groovy index af7bae2a4..b615b13b0 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/GaoDePoiDataProcess.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/GaoDePoiDataProcess.groovy @@ -41,8 +41,8 @@ import java.util.concurrent.Executors import java.util.concurrent.atomic.AtomicLong /** - * 厦门银行 - * 福建省,重庆市poi数据处理 + * 鍘﹂棬閾惰 + * 绂忓缓鐪侊紝閲嶅簡甯俻oi鏁版嵁澶勭悊 */ @BatchOwner(Watcher.GaoJuan) class GaoDePoiDataProcess extends BaseBatch{ @@ -51,10 +51,10 @@ class GaoDePoiDataProcess extends BaseBatch{ public static def version = new Date().getTime() - public static def TAGS = ["加油站","其它能源站","加气站","洗车场","充电站","餐饮相关场所","休闲餐饮场所","购物相关场所","商场","超级市场","家电电子卖场","花鸟鱼虫市场","家居建材市场","综合市场","特色商业街","生活服务场所","邮局","事务所","人才市场","洗浴推拿场所","体育休闲服务场所","运动场馆","娱乐场所","度假疗养场所","休闲场所","医疗保健服务场所","综合医院","专科医院","诊所","急救中心","疾病预防机构","住宿服务相关","宾馆酒店","旅馆招待所","风景名胜相关","公园广场","风景名胜","产业园区","政府及社会团体相关","政府机关","外国机构","社会团体","公检法机构","交通车辆管理","工商税务机构","科教文化场所","博物馆","展览馆","会展中心","美术馆","图书馆","科技馆","天文馆","文化宫","档案馆","文艺团体","传媒机构","学校","科研机构","培训机构","驾校","机场相关","银行","银行相关","保险公司","证券公司","财务公司","公司企业","知名企业","公司","工厂","农林牧渔基地","收费站","服务区","标志性建筑物","地名地址信息","热点地名","紧急避难场所"] + public static def TAGS = ["鍔犳补绔�","鍏跺畠鑳芥簮绔�","鍔犳皵绔�","娲楄溅鍦�","鍏呯數绔�","椁愰ギ鐩稿叧鍦烘墍","浼戦棽椁愰ギ鍦烘墍","璐墿鐩稿叧鍦烘墍","鍟嗗満","瓒呯骇甯傚満","瀹剁數鐢靛瓙鍗栧満","鑺遍笩楸艰櫕甯傚満","瀹跺眳寤烘潗甯傚満","缁煎悎甯傚満","鐗硅壊鍟嗕笟琛�","鐢熸椿鏈嶅姟鍦烘墍","閭眬","浜嬪姟鎵�","浜烘墠甯傚満","娲楁荡鎺ㄦ嬁鍦烘墍","浣撹偛浼戦棽鏈嶅姟鍦烘墍","杩愬姩鍦洪","濞变箰鍦烘墍","搴﹀亣鐤楀吇鍦烘墍","浼戦棽鍦烘墍","鍖荤枟淇濆仴鏈嶅姟鍦烘墍","缁煎悎鍖婚櫌","涓撶鍖婚櫌","璇婃墍","鎬ユ晳涓績","鐤剧梾棰勯槻鏈烘瀯","浣忓鏈嶅姟鐩稿叧","瀹鹃閰掑簵","鏃呴鎷涘緟鎵�","椋庢櫙鍚嶈儨鐩稿叧","鍏洯骞垮満","椋庢櫙鍚嶈儨","浜т笟鍥尯","鏀垮簻鍙婄ぞ浼氬洟浣撶浉鍏�","鏀垮簻鏈哄叧","澶栧浗鏈烘瀯","绀句細鍥綋","鍏娉曟満鏋�","浜ら�氳溅杈嗙鐞�","宸ュ晢绋庡姟鏈烘瀯","绉戞暀鏂囧寲鍦烘墍","鍗氱墿棣�","灞曡棣�","浼氬睍涓績","缇庢湳棣�","鍥句功棣�","绉戞妧棣�","澶╂枃棣�","鏂囧寲瀹�","妗f棣�","鏂囪壓鍥綋","浼犲獟鏈烘瀯","瀛︽牎","绉戠爺鏈烘瀯","鍩硅鏈烘瀯","椹炬牎","鏈哄満鐩稿叧","閾惰","閾惰鐩稿叧","淇濋櫓鍏徃","璇佸埜鍏徃","璐㈠姟鍏徃","鍏徃浼佷笟","鐭ュ悕浼佷笟","鍏徃","宸ュ巶","鍐滄灄鐗ф笖鍩哄湴","鏀惰垂绔�","鏈嶅姟鍖�","鏍囧織鎬у缓绛戠墿","鍦板悕鍦板潃淇℃伅","鐑偣鍦板悕","绱ф�ラ伩闅惧満鎵�"] - public static def TYPES = ["出入口;门","美食","交通设施;停车场","交通设施;路侧停车位","生活服务;彩票销售点","生活服务;公用事业","出入口;停车场出入口","出入口","生活服务;殡葬服务","交通设施;充电站","出入口;其他","丽人;美体","丽人;美甲","金融;atm","汽车服务;汽车检测场","道路;路口","生活服务;公共厕所","交通设施;加油加气站","生活服务;售票处","出入口;高速公路出口","交通设施;港口","交通设施;普通停车位","生活服务;步骑行专用道驿站","交通设施;收费站","交通设施;桥","交通设施;火车站","交通设施;高速公路停车区","出入口;车站入口","医疗;核酸检测点","地名地址信息;交通地名;路口名","地名地址信息;交通地名;道路名","交通设施服务;公交车站;公交车站相关","生活服务;共享设备;充电宝","交通设施服务;停车场;公共停车场","地名地址信息;自然地名;山","交通设施服务;停车场;停车场出入口","公共设施;公共厕所;公共厕所","通行设施;临街院门;临街院正门","室内设施;室内设施;室内设施","交通设施服务;停车场;路边停车场","交通设施服务;停车场;停车场相关","地名地址信息;交通地名;桥","地名地址信息;自然地名;河流","交通设施服务;停车场;专用停车场","体育休闲服务;娱乐场所;KTV","通行设施;建筑物门;建筑物门","交通设施服务;停车场;停车场入口","生活服务;丧葬设施;丧葬设施","金融保险服务;自动提款机;农村商业银行ATM","交通设施服务;停车场;停车场出口","政府机构及社会团体;交通车辆管理;交通管理机构","通行设施;建筑物门;建筑物正门","地名地址信息;普通地名;乡镇级地名","地名地址信息;自然地名;湖泊","公司企业;公司;广告装饰|生活服务","金融保险服务;自动提款机;自动提款机","金融保险服务;自动提款机;中国邮政储蓄银行ATM","金融保险服务;自动提款机;中国农业银行ATM","购物服务;家居建材市场;建材五金市场|公司企业","地名地址信息;交通地名;高速路出口","地名地址信息;交通地名;高速路入口","金融保险服务;自动提款机;中国工商银行ATM","交通设施服务;交通服务相关;交通服务相关","金融保险服务;自动提款机;中国建设银行ATM","购物服务;超级市场;超市|购物服务","交通设施服务;地铁站;出入口","购物服务;家电电子卖场;手机销售|生活服务","公司企业;公司;公司|购物服务","公司企业;公司;公司|生活服务","地名地址信息;交通地名;隧道","政府机构及社会团体;交通车辆管理;验车场","购物服务;家居建材市场;建材五金市场|生活服务","地名地址信息;交通地名;立交桥","金融保险服务;自动提款机;中国银行ATM","购物服务;便民商店/便利店;便民商店/便利店|购物服务","汽车销售;汽车销售;汽车销售|汽车维修","交通设施服务;长途汽车站;长途汽车站","地名地址信息;交通地名;铁路","道路附属设施;服务区;高速服务区","政府机构及社会团体;交通车辆管理;交通执法站","生活服务;美容美发店;美容美发店|购物服务","地名地址信息;普通地名;街道级地名","交通设施服务;地铁站;地铁站","公司企业;工厂;工厂|公司企业","购物服务;服装鞋帽皮具店;服装鞋帽皮具店|生活服务","公共设施;公共厕所;女洗手间","政府机构及社会团体;交通车辆管理;车辆管理机构","住宿服务;住宿服务相关;住宿服务相关|体育休闲服务","公共设施;公共厕所;男洗手间","汽车服务;汽车养护/装饰;汽车养护|汽车服务","地名地址信息;自然地名;岛屿","交通设施服务;港口码头;港口码头","住宿服务;宾馆酒店;宾馆酒店|住宿服务","生活服务;电讯营业厅;中国移动营业厅|购物服务","购物服务;专卖店;专营店|生活服务","地名地址信息;交通地名;城市快速路出口","地名地址信息;交通地名;城市快速路入口","购物服务;专卖店;专营店|公司企业","生活服务;丧葬设施;公墓","公司企业;公司;公司|公司企业","交通设施服务;火车站;火车站","汽车服务;汽车养护/装饰;汽车养护|汽车维修","购物服务;购物相关场所;购物相关场所|生活服务","购物服务;专卖店;烟酒专卖店|购物服务","购物服务;专卖店;自行车专卖店|生活服务","政府机构及社会团体;政府机关;乡镇以下级政府及事业单位|生活服务","金融保险服务;自动提款机;交通银行ATM","生活服务;生活服务场所;生活服务场所|购物服务","购物服务;个人用品/化妆品店;其它个人用品店|生活服务","购物服务;综合市场;农副产品市场|购物服务","住宿服务;旅馆招待所;旅馆招待所|住宿服务","购物服务;专卖店;专营店|汽车服务","公司企业;公司;广告装饰|购物服务","住宿服务;宾馆酒店;宾馆酒店|餐饮服务","公共设施;公共厕所;残障洗手间/无障碍洗手间","购物服务;专卖店;专营店|餐饮服务","购物服务;家居建材市场;建材五金市场|购物服务","购物服务;综合市场;农副产品市场|餐饮服务","购物服务;家电电子卖场;数码电子|公司企业","医疗保健服务;核酸检测;核酸检测","购物服务;家电电子卖场;数码电子|生活服务","购物服务;服装鞋帽皮具店;服装鞋帽皮具店|公司企业","汽车服务;汽车配件销售;汽车配件销售|汽车维修","购物服务;家居建材市场;布艺市场|公司企业","生活服务;丧葬设施;陵园","金融保险服务;银行;交通银行","餐饮服务;中餐厅;中餐厅|住宿服务","政府机构及社会团体;交通车辆管理;交通车辆管理相关","汽车维修;汽车维修;汽车维修|汽车服务","政府机构及社会团体;政府机关;区县级政府及事业单位|政府机构及社会团体","交通设施服务;公交车站;快速公交站","住宿服务;旅馆招待所;旅馆招待所|商务住宅","交通设施服务;火车站;进站口/检票口","地名地址信息;普通地名;区县级地名","政府机构及社会团体;政府机关;乡镇级政府及事业单位|政府机构及社会团体","购物服务;家电电子卖场;家电电子卖场|生活服务","生活服务;电讯营业厅;中国电信营业厅|购物服务","汽车维修;汽车综合维修;汽车综合维修|汽车服务","医疗保健服务;专科医院;口腔医院|医疗保健服务","金融保险服务;自动提款机;招商银行ATM","汽车服务;汽车服务相关;汽车服务相关|汽车维修","公司企业;公司;公司|汽车服务","政府机构及社会团体;社会团体;社会团体相关|公司企业","政府机构及社会团体;公检法机构;社会治安机构|政府机构及社会团体","商务住宅;住宅区;住宅小区|商务住宅","政府机构及社会团体;政府机关;乡镇级政府及事业单位|生活服务","购物服务;商场;普通商场|购物服务","公司企业;公司;机械电子|购物服务","商务住宅;住宅区;住宅小区|住宿服务","公司企业;公司;冶金化工|公司企业","公共设施;公共厕所;婴儿换洗间/哺乳室/母婴室","科教文化服务;培训机构;培训机构|购物服务","公司企业;公司;商业贸易|购物服务","餐饮服务;餐饮相关场所;餐饮相关|购物服务","生活服务;丧葬设施;殡仪馆","金融保险服务;自动提款机;中国民生银行ATM","购物服务;专卖店;自行车专卖店|摩托车服务","交通设施服务;火车站;货运火车站","购物服务;专卖店;儿童用品店|生活服务","体育休闲服务;休闲场所;休闲场所|餐饮服务","地名地址信息;自然地名;海湾海峡","政府机构及社会团体;社会团体;少先队","公司企业;公司;公司|金融保险服务","购物服务;专卖店;烟酒专卖店|公司企业","餐饮服务;中餐厅;中餐厅|餐饮服务","生活服务;维修站点;维修站点|购物服务","金融保险服务;自动提款机;兴业银行ATM","交通设施服务;长途汽车站;进站","购物服务;综合市场;农副产品市场|公司企业","住宿服务;宾馆酒店;四星级宾馆|餐饮服务","购物服务;家居建材市场;家具城|公司企业","科教文化服务;培训机构;培训机构|生活服务","公司企业;公司;广告装饰|生活服务;生活服务场所;生活服务场所","餐饮服务;冷饮店;冷饮店|餐饮服务","金融保险服务;自动提款机;上海浦东发展银行ATM","公司企业;公司;机械电子|公司企业","交通设施服务;火车站;出站口","购物服务;专卖店;专营店|购物服务","餐饮服务;茶艺馆;茶艺馆|购物服务","餐饮服务;中餐厅;特色/地方风味餐厅|餐饮服务","购物服务;花鸟鱼虫市场;花卉市场|生活服务","购物服务;便民商店/便利店;便民商店/便利店|生活服务","汽车服务;洗车场;洗车场|汽车服务","交通设施服务;停车场;公共停车场|交通设施服务","餐饮服务;糕饼店;糕饼店|购物服务","餐饮服务;中餐厅;火锅店|餐饮服务","公司企业;工厂;工厂|生活服务","餐饮服务;冷饮店;冷饮店|购物服务","医疗保健服务;综合医院;卫生院|医疗保健服务","金融保险服务;自动提款机;中信银行ATM","金融保险服务;自动提款机;中国光大银行ATM","公共设施;公用电话;公用电话","购物服务;购物相关场所;购物相关场所|餐饮服务","科教文化服务;驾校;驾校|生活服务","购物服务;综合市场;果品市场|购物服务","商务住宅;楼宇;商务写字楼|商务住宅","生活服务;美容美发店;美容美发店|生活服务","汽车销售;长安汽车销售;长安汽车销售|汽车维修","政府机构及社会团体;政府机关;乡镇以下级政府及事业单位|政府机构及社会团体","餐饮服务;糕饼店;糕饼店|餐饮服务","购物服务;综合市场;果品市场|餐饮服务","餐饮服务;中餐厅;中餐厅|体育休闲服务","购物服务;服装鞋帽皮具店;服装鞋帽皮具店|餐饮服务","出入口;门","生活服务;生活服务场所;生活服务场所|公司企业","购物服务;便民商店/便利店;便民商店/便利店|餐饮服务","生活服务;电讯营业厅;中国联通营业厅|购物服务","汽车服务;汽车配件销售;汽车配件销售|汽车服务","政府机构及社会团体;政府机关;地市级政府及事业单位|政府机构及社会团体","购物服务;专卖店;专营店|科教文化服务","购物服务;超级市场;超市|购物服务;便民商店/便利店;便民商店/便利店","购物服务;专卖店;儿童用品店|购物服务","生活服务;洗浴推拿场所;洗浴推拿场所|生活服务","汽车服务;汽车配件销售;汽车配件销售|购物服务","餐饮服务;中餐厅;综合酒楼|住宿服务","体育休闲服务;娱乐场所;酒吧|餐饮服务","购物服务;家居建材市场;布艺市场|生活服务","公司企业;公司;电信公司|生活服务","公司企业;公司;公司|科教文化服务","公司企业;工厂;工厂|购物服务","购物服务;家电电子卖场;手机销售|公司企业","医疗保健服务;专科医院;专科医院|医疗保健服务","餐饮服务;中餐厅;清真菜馆|餐饮服务","汽车销售;汽车销售;汽车销售|汽车服务","生活服务;维修站点;维修站点|摩托车服务","购物服务;服装鞋帽皮具店;服装鞋帽皮具店|购物服务","金融保险服务;自动提款机;华夏银行ATM","公司企业;公司企业;公司企业|生活服务","公司企业;公司;公司|餐饮服务","购物服务;商场;购物中心|购物服务","商务住宅;住宅区;住宅小区|生活服务","商务住宅;住宅区;住宅小区|地名地址信息","政府机构及社会团体;交通车辆管理;交通管理机构|政府机构及社会团体","购物服务;家居建材市场;家居建材市场|生活服务","商务住宅;住宅区;住宅小区|购物服务","政府机构及社会团体;公检法机构;公安警察|政府机构及社会团体","购物服务;家居建材市场;厨卫市场|购物服务","商务住宅;住宅区;住宅小区|餐饮服务","政府机构及社会团体;政府机关;区县级政府及事业单位|生活服务","餐饮服务;中餐厅;中餐厅|生活服务","汽车服务;汽车服务相关;汽车服务相关|购物服务","购物服务;家居建材市场;厨卫市场|公司企业","购物服务;家居建材市场;建材五金市场|公司企业;公司;公司","生活服务;维修站点;维修站点|汽车维修","生活服务;中介机构;中介机构|公司企业","生活服务;电讯营业厅;中国电信营业厅|公司企业","购物服务;购物相关场所;购物相关场所|汽车服务","摩托车服务;摩托车维修;摩托车维修|生活服务","汽车服务;汽车服务相关;汽车服务相关|汽车销售","生活服务;物流速递;物流速递|公司企业","购物服务;综合市场;农副产品市场|生活服务","汽车销售;大众特约销售;上海大众销售|汽车维修","汽车销售;吉利特约销售;吉利销售|汽车维修","生活服务;洗浴推拿场所;洗浴推拿场所|购物服务","购物服务;综合市场;蔬菜市场|购物服务","金融保险服务;自动提款机;广发银行ATM","购物服务;购物相关场所;购物相关场所|公司企业","政府机构及社会团体;政府机关;区县级政府及事业单位|公司企业","生活服务;洗浴推拿场所;洗浴推拿场所|住宿服务","生活服务;丧葬设施;丧葬设施|购物服务","购物服务;家居建材市场;布艺市场|购物服务","购物服务;专卖店;珠宝首饰工艺品|生活服务","购物服务;家电电子卖场;家电电子卖场|公司企业","汽车销售;大众特约销售;一汽-大众销售|汽车维修","购物服务;专卖店;自行车专卖店|汽车服务","购物服务;家居建材市场;建材五金市场|汽车服务","政府机构及社会团体;政府机关;政府机关相关|公司企业","政府机构及社会团体;政府机关;政府机关相关|生活服务","科教文化服务;学校;职业技术学校|科教文化服务","购物服务;家居建材市场;家具城|购物服务","金融保险服务;自动提款机;平安银行ATM","汽车服务;汽车服务相关;汽车服务相关|生活服务","汽车维修;汽车维修;汽车维修|汽车销售","购物服务;花鸟鱼虫市场;花卉市场|公司企业","购物服务;专卖店;古玩字画店|科教文化服务","住宿服务;宾馆酒店;五星级宾馆|餐饮服务","汽车销售;长城汽车销售;长城汽车销售|汽车维修","公司企业;公司;公司|生活服务;生活服务场所;生活服务场所","住宿服务;宾馆酒店;宾馆酒店|生活服务","餐饮服务;甜品店;甜品店|餐饮服务","商务住宅;楼宇;商住两用楼宇|商务住宅","公司企业;公司企业;公司企业|购物服务","餐饮服务;茶艺馆;茶艺馆|餐饮服务","汽车销售;日产特约销售;东风日产销售|汽车维修","科教文化服务;学校;幼儿园|科教文化服务","生活服务;摄影冲印店;摄影冲印|购物服务","道路附属设施;服务区;高速停车区","生活服务;生活服务场所;生活服务场所|汽车服务","科教文化服务;科教文化场所;科教文化场所|生活服务","政府机构及社会团体;社会团体;社会团体相关|购物服务","购物服务;家居建材市场;家居建材市场|公司企业","公司企业;公司;公司|汽车销售","汽车销售;东风特约销售;东风销售|汽车维修","购物服务;便民商店/便利店;便民商店/便利店|公司企业","交通设施服务;公交车站;电车站","购物服务;家电电子卖场;手机销售|生活服务;电讯营业厅;中国移动营业厅","地名地址信息;普通地名;村庄级地名|商务住宅","购物服务;家居建材市场;灯具瓷器市场|公司企业","餐饮服务;中餐厅;中餐厅|公司企业","生活服务;洗浴推拿场所;洗浴推拿场所|体育休闲服务","购物服务;专卖店;烟酒专卖店|餐饮服务","交通设施服务;停车场;路边停车场|交通设施服务","金融保险服务;自动提款机;北京银行ATM","公司企业;公司;公司|商务住宅","政府机构及社会团体;政府机关;乡镇以下级政府及事业单位|商务住宅","汽车销售;丰田特约销售;一汽丰田销售|汽车维修","生活服务;物流速递;物流速递|购物服务","交通设施服务;机场相关;飞机场","体育休闲服务;休闲场所;休闲场所|住宿服务","生活服务;丧葬设施;陵园|风景名胜","购物服务;便民商店/便利店;便民商店/便利店|购物服务;超级市场;超市","餐饮服务;中餐厅;四川菜(川菜)|餐饮服务","生活服务;美容美发店;美容美发店|餐饮服务","购物服务;文化用品店;文化用品店|生活服务","公司企业;公司;冶金化工|购物服务","交通设施服务;火车站;候车室","金融保险服务;银行;农村商业银行|金融保险服务","科教文化服务;学校;中学|科教文化服务","购物服务;家电电子卖场;数码电子|购物服务","餐饮服务;中餐厅;海鲜酒楼|餐饮服务","汽车销售;通用特约销售;别克销售|汽车维修","交通设施服务;机场相关;机场出发/到达","公司企业;公司;公司|政府机构及社会团体","汽车服务;二手车交易;二手车交易|汽车销售","餐饮服务;休闲餐饮场所;休闲餐饮场所|餐饮服务","餐饮服务;咖啡厅;咖啡厅|餐饮服务","汽车销售;汽车销售;汽车销售|汽车维修;汽车维修;汽车维修","汽车销售;梅赛德斯-奔驰特约销售;梅赛德斯-奔驰销售|汽车维修","购物服务;家电电子卖场;手机销售|购物服务","购物服务;专卖店;自行车专卖店|汽车销售","科教文化服务;培训机构;培训机构|体育休闲服务","生活服务;洗浴推拿场所;洗浴推拿场所|餐饮服务","生活服务;生活服务场所;生活服务场所|科教文化服务","科教文化服务;培训机构;培训机构|科教文化服务","体育休闲服务;娱乐场所;棋牌室|餐饮服务","地名地址信息;普通地名;村庄级地名|购物服务","地名地址信息;自然地名;山|地名地址信息","公司企业;公司;网络科技|购物服务","餐饮服务;中餐厅;综合酒楼|餐饮服务","生活服务;中介机构;中介机构|购物服务","汽车销售;福特特约销售;福特销售|汽车维修","公司企业;公司;公司|购物服务;购物相关场所;购物相关场所","体育休闲服务;娱乐场所;KTV|购物服务","医疗保健服务;综合医院;综合医院|医疗保健服务","商务住宅;产业园区;产业园区|公司企业","交通设施服务;港口码头;人渡口","汽车销售;奥迪特约销售;一汽-大众奥迪销售|汽车维修","科教文化服务;学校;小学|科教文化服务","生活服务;生活服务场所;生活服务场所|商务住宅","交通设施服务;港口码头;货运港口码头","科教文化服务;学校;高等院校|科教文化服务","生活服务;物流速递;物流仓储场地|公司企业","购物服务;超级市场;超市|生活服务","体育休闲服务;娱乐场所;KTV|生活服务","购物服务;专卖店;烟酒专卖店|生活服务","购物服务;专卖店;儿童用品店|科教文化服务","购物服务;家居建材市场;厨卫市场|生活服务","购物服务;商场;普通商场|商务住宅","汽车销售;现代特约销售;北京现代销售|汽车维修","生活服务;电讯营业厅;中国移动营业厅|公司企业","购物服务;家居建材市场;家居建材市场|购物服务","餐饮服务;外国餐厅;西餐厅(综合风味)|餐饮服务","体育休闲服务;娱乐场所;KTV|餐饮服务","科教文化服务;传媒机构;传媒机构|生活服务","地名地址信息;交通地名;道路名|购物服务","公司企业;公司;广告装饰|科教文化服务","公司企业;农林牧渔基地;其它农林牧渔基地|公司企业","购物服务;专卖店;书店|科教文化服务","购物服务;专卖店;珠宝首饰工艺品|公司企业","汽车销售;本田特约销售;东风本田销售|汽车维修","商务住宅;楼宇;商务写字楼|购物服务","汽车销售;丰田特约销售;广汽丰田销售|汽车维修","汽车销售;本田特约销售;广汽本田销售|汽车维修","购物服务;专卖店;古玩字画店|生活服务","医疗保健服务;诊所;诊所|医疗保健服务","汽车销售;北京汽车销售;北京汽车销售|汽车维修","购物服务;家居建材市场;灯具瓷器市场|购物服务","摩托车服务;摩托车销售;摩托车销售|购物服务","购物服务;专卖店;礼品饰品店|购物服务","交通设施服务;火车站;站台","政府机构及社会团体;社会团体;社会团体相关|生活服务","科教文化服务;培训机构;培训机构|公司企业","住宿服务;住宿服务相关;住宿服务相关|餐饮服务","购物服务;专卖店;儿童用品店|餐饮服务","公司企业;公司;电信公司|购物服务","住宿服务;旅馆招待所;旅馆招待所|餐饮服务","汽车销售;奇瑞特约销售;奇瑞销售|汽车维修","金融保险服务;自动提款机;北京农商银行ATM","生活服务;维修站点;维修站点|汽车服务","政府机构及社会团体;政府机关;乡镇级政府及事业单位|科教文化服务","医疗保健服务;医药保健销售店;药房|医疗保健服务","科教文化服务;展览馆;室内展位","体育休闲服务;娱乐场所;酒吧|购物服务","商务住宅;楼宇;商务写字楼|公司企业","金融保险服务;自动提款机;广州农商银行ATM","交通设施服务;火车站;售票","体育休闲服务;度假疗养场所;疗养院|生活服务","住宿服务;旅馆招待所;旅馆招待所|生活服务","汽车服务;汽车配件销售;汽车配件销售|公司企业","科教文化服务;传媒机构;传媒机构|公司企业","公司企业;工厂;工厂|公司企业;公司;公司","生活服务;电力营业厅;电力营业厅|公司企业","地名地址信息;普通地名;村庄级地名|地名地址信息","科教文化服务;科研机构;科研机构|公司企业","汽车销售;广汽传祺销售;广汽传祺销售|汽车维修","体育休闲服务;娱乐场所;KTV|体育休闲服务","购物服务;专卖店;儿童用品店|公司企业","汽车销售;荣威销售;荣威销售|汽车维修","政府机构及社会团体;社会团体;社会团体相关|科教文化服务","汽车销售;宝马特约销售;宝马销售|汽车维修","餐饮服务;中餐厅;中餐厅|商务住宅","住宿服务;宾馆酒店;宾馆酒店|体育休闲服务","生活服务;人才市场;人才市场|公司企业","餐饮服务;快餐厅;快餐厅|餐饮服务","交通设施;停车场","政府机构及社会团体;公检法机构;公证鉴定机构|政府机构及社会团体","生活服务;生活服务场所;生活服务场所|汽车维修","体育休闲服务;休闲场所;休闲场所|生活服务","交通设施服务;长途汽车站;出站","汽车服务;汽车养护/装饰;汽车养护|购物服务","生活服务;摄影冲印店;摄影冲印|公司企业","汽车销售;通用特约销售;雪佛兰销售|汽车维修","汽车维修;汽车维修;汽车维修|生活服务","政府机构及社会团体;政府机关;乡镇以下级政府及事业单位|地名地址信息","生活服务;电讯营业厅;中国移动营业厅|购物服务;家电电子卖场;手机销售","汽车销售;起亚特约销售;东风悦达起亚销售|汽车维修","生活服务;物流速递;物流仓储场地|商务住宅","政府机构及社会团体;公检法机构;公证鉴定机构|公司企业","地名地址信息;市中心;城市中心","政府机构及社会团体;政府机关;地市级政府及事业单位|生活服务","金融保险服务;自动提款机;深圳农村商业银行ATM","交通设施服务;轮渡站;轮渡站","购物服务;综合市场;水产海鲜市场|餐饮服务","金融保险服务;自动提款机;上海银行ATM","汽车销售;汽车销售;汽车销售|购物服务","生活服务;婴儿服务场所;婴儿游泳馆|购物服务","购物服务;服装鞋帽皮具店;品牌服装店|购物服务","餐饮服务;快餐厅;茶餐厅|餐饮服务","交通设施服务;停车场;专用停车场|交通设施服务","政府机构及社会团体;政府机关;区县级政府及事业单位|科教文化服务","购物服务;专卖店;珠宝首饰工艺品|购物服务","地名地址信息;普通地名;地市级地名","政府机构及社会团体;政府机关;地市级政府及事业单位|公司企业","餐饮服务;餐饮相关场所;餐饮相关|生活服务","住宿服务;宾馆酒店;宾馆酒店|住宿服务;旅馆招待所;旅馆招待所","住宿服务;宾馆酒店;宾馆酒店|公司企业","交通设施服务;班车站;班车站","交通设施服务;长途汽车站;候车室","医疗保健服务;综合医院;三级甲等医院|医疗保健服务","购物服务;家居建材市场;家具城|生活服务","购物服务;综合市场;果品市场|公司企业","生活服务;中介机构;中介机构|生活服务","汽车服务;汽车养护/装饰;汽车养护|汽车销售","生活服务;生活服务场所;生活服务场所|餐饮服务","购物服务;专卖店;礼品饰品店|生活服务","商务住宅;商务住宅相关;商务住宅相关|生活服务","住宿服务;住宿服务相关;住宿服务相关|商务住宅","汽车服务;汽车养护/装饰;汽车养护|生活服务","风景名胜;公园广场;公园|风景名胜","商务住宅;住宅区;住宅小区|体育休闲服务","购物服务;家电电子卖场;手机销售|生活服务;电讯营业厅;中国电信营业厅","住宿服务;住宿服务相关;住宿服务相关|体育休闲服务;休闲场所;休闲场所","商务住宅;住宅区;社区中心|生活服务","汽车服务;汽车养护/装饰;汽车养护|汽车维修;汽车维修;汽车维修","商务住宅;住宅区;住宅小区|公司企业","金融保险服务;自动提款机;上海农商银行ATM","医疗保健服务;医药保健销售店;医疗保健用品|医疗保健服务","商务住宅;楼宇;商务写字楼|政府机构及社会团体","政府机构及社会团体;社会团体;社会团体相关|金融保险服务","生活服务;事务所;会计师事务所|公司企业","住宿服务;宾馆酒店;宾馆酒店|商务住宅","公司企业;农林牧渔基地;其它农林牧渔基地|购物服务","住宿服务;宾馆酒店;宾馆酒店|购物服务","汽车销售;大众特约销售;斯柯达销售|汽车维修","政府机构及社会团体;政府机关;省直辖市级政府及事业单位|政府机构及社会团体","购物服务;个人用品/化妆品店;其它个人用品店|购物服务","汽车维修;长城汽车维修;长城汽车维修|汽车销售","餐饮服务;咖啡厅;咖啡厅|购物服务","商务住宅;住宅区;宿舍|商务住宅","生活服务;电讯营业厅;中国联通营业厅|公司企业","体育休闲服务;运动场馆;健身中心|生活服务","购物服务;专卖店;书店|公司企业","汽车维修;汽车综合维修;汽车综合维修|汽车销售","生活服务;美容美发店;美容美发店|购物服务;购物相关场所;购物相关场所","体育休闲服务;休闲场所;采摘园|公司企业","购物服务;服装鞋帽皮具店;品牌服装店|生活服务","交通设施服务;火车站;票务相关","摩托车服务;摩托车销售;摩托车销售|摩托车服务","公司企业;公司;网络科技|生活服务","医疗保健服务;医疗保健服务场所;医疗保健服务场所|生活服务","汽车销售;名爵销售;名爵销售|汽车维修","政府机构及社会团体;政府机关;政府机关相关|科教文化服务","汽车销售;通用特约销售;凯迪拉克销售|汽车维修","住宿服务;宾馆酒店;经济型连锁酒店|住宿服务","购物服务;家居建材市场;家具建材综合市场|购物服务","汽车销售;福特特约销售;马自达销售|汽车维修","购物服务;专卖店;自行车专卖店|公司企业","住宿服务;旅馆招待所;旅馆招待所|体育休闲服务","购物服务;花鸟鱼虫市场;花卉市场|购物服务","政府机构及社会团体;交通车辆管理;验车场|公司企业","购物服务;专卖店;儿童用品店|体育休闲服务","公司企业;公司;广告装饰|公司企业","政府机构及社会团体;政府机关;乡镇级政府及事业单位|公司企业","体育休闲服务;运动场馆;跆拳道场馆|科教文化服务","购物服务;家居建材市场;建材五金市场|餐饮服务","购物服务;综合市场;水产海鲜市场|购物服务","汽车服务;洗车场;洗车场|汽车维修","汽车维修;货车维修;货车维修|汽车服务","商务住宅;住宅区;住宅小区|政府机构及社会团体","医疗保健服务;专科医院;骨科医院|医疗保健服务","政府机构及社会团体;政府及社会团体相关;政府及社会团体相关|生活服务","医疗保健服务;专科医院;妇科医院|医疗保健服务","购物服务;专卖店;专营店|公司企业;公司;公司","体育休闲服务;休闲场所;休闲场所|体育休闲服务","公司企业;公司;公司|汽车维修","商务住宅;住宅区;社区中心|科教文化服务","生活服务;美容美发店;美容美发店|公司企业","购物服务;花鸟鱼虫市场;花卉市场|餐饮服务","汽车销售;红旗销售;红旗销售|汽车维修","汽车销售;长城汽车销售;魏派汽车销售|汽车维修","购物服务;专卖店;自行车专卖店|生活服务;维修站点;维修站点","地名地址信息;自然地名;湖泊|地名地址信息","购物服务;综合市场;果品市场|生活服务","购物服务;超级市场;超市|餐饮服务","住宿服务;旅馆招待所;旅馆招待所|购物服务","公司企业;公司;机械电子|生活服务","商务住宅;产业园区;产业园区|生活服务","购物服务;专卖店;宠物用品店|生活服务","汽车销售;标致雪铁龙特约销售;东风雪铁龙销售|汽车维修","购物服务;专卖店;烟酒专卖店|体育休闲服务","购物服务;综合市场;水产海鲜市场|公司企业","购物服务;专卖店;专营店|生活服务;生活服务场所;生活服务场所","商务住宅;住宅区;社区中心|体育休闲服务","汽车销售;三菱特约销售;广汽三菱销售|汽车维修","摩托车服务;摩托车维修;摩托车维修|摩托车服务","购物服务;家电电子卖场;家电电子卖场|购物服务","金融保险服务;银行;中国邮政储蓄银行|生活服务","科教文化服务;学校;成人教育|科教文化服务","购物服务;购物相关场所;购物相关场所|汽车销售","汽车销售;标致雪铁龙特约销售;东风标致销售|汽车维修","地名地址信息;自然地名;沙漠","购物服务;专卖店;专营店|汽车维修","购物服务;服装鞋帽皮具店;服装鞋帽皮具店|公司企业;公司;公司","政府机构及社会团体;交通车辆管理;交通执法站|政府机构及社会团体","购物服务;超级市场;超市|公司企业","公司企业;公司;建筑公司|公司企业","生活服务;维修站点;维修站点|公司企业","公司企业;公司;机械电子|汽车服务","商务住宅;楼宇;商务写字楼|生活服务","政府机构及社会团体;政府机关;省直辖市级政府及事业单位|科教文化服务","住宿服务;旅馆招待所;旅馆招待所|住宿服务;宾馆酒店;宾馆酒店","体育休闲服务;娱乐场所;棋牌室|购物服务","汽车销售;货车销售;货车销售|汽车维修","购物服务;综合市场;综合市场|购物服务","体育休闲服务;运动场馆;运动场所|科教文化服务","生活服务;美容美发店;美容美发店|商务住宅","体育休闲服务;运动场馆;健身中心|体育休闲服务","政府机构及社会团体;政府机关;乡镇以下级政府及事业单位|科教文化服务","汽车维修;东风特约维修;东风维修|汽车销售","生活服务;生活服务场所;生活服务场所|政府机构及社会团体","购物服务;综合市场;旧货市场|生活服务","金融保险服务;金融保险服务机构;金融保险机构|生活服务","公司企业;公司;建筑公司|生活服务","体育休闲服务;运动场馆;健身中心|科教文化服务","公司企业;公司;公司|住宿服务","政府机构及社会团体;公检法机构;社会治安机构|公司企业","购物服务;家居建材市场;建材五金市场|公司企业;工厂;工厂","生活服务;美容美发店;美容美发店|科教文化服务","科教文化服务;培训机构;培训机构|餐饮服务","购物服务;文化用品店;文化用品店|公司企业","公司企业;公司;公司|购物服务;专卖店;专营店","政府机构及社会团体;政府机关;政府机关相关|政府机构及社会团体","生活服务;洗衣店;洗衣店|购物服务","通行设施;虚拟门;虚拟门","汽车服务;汽车服务相关;汽车服务相关|公司企业","地名地址信息;普通地名;村庄级地名|餐饮服务","地名地址信息;交通地名;桥|地名地址信息","体育休闲服务;娱乐场所;网吧|购物服务","体育休闲服务;运动场馆;台球厅|体育休闲服务","体育休闲服务;度假疗养场所;度假村|体育休闲服务","公司企业;公司;公司|公司企业;工厂;工厂","交通设施服务;上下客区;出租车","政府机构及社会团体;政府机关;地市级政府及事业单位|科教文化服务","交通设施服务;机场相关;机场相关","体育休闲服务;娱乐场所;娱乐场所|生活服务","生活服务;邮局;邮政速递|生活服务","购物服务;专卖店;专营店|餐饮服务;茶艺馆;茶艺馆","商务住宅;住宅区;住宅区|生活服务","生活服务;生活服务场所;生活服务场所|金融保险服务","餐饮服务;茶艺馆;茶艺馆|体育休闲服务","购物服务;专卖店;钟表店|生活服务","购物服务;家电电子卖场;家电电子卖场|汽车服务","购物服务;购物相关场所;购物相关场所|商务住宅","汽车维修;大众特约维修;上海大众维修|汽车销售","体育休闲服务;休闲场所;游乐场|体育休闲服务","生活服务;摄影冲印店;摄影冲印|生活服务","金融保险服务;自动提款机;农村商业银行ATM|金融保险服务","体育休闲服务;娱乐场所;棋牌室|生活服务","汽车服务;汽车配件销售;汽车配件销售|生活服务","公司企业;农林牧渔基地;其它农林牧渔基地|体育休闲服务","政府机构及社会团体;工商税务机构;工商部门|政府机构及社会团体","购物服务;家居建材市场;建材五金市场|商务住宅","体育休闲服务;娱乐场所;酒吧|体育休闲服务","购物服务;专卖店;专营店|汽车服务;汽车服务相关;汽车服务相关","公司企业;公司;商业贸易|汽车服务","政府机构及社会团体;公检法机构;消防机关|生活服务","政府机构及社会团体;政府机关;乡镇级政府及事业单位|购物服务","商务住宅;商务住宅相关;商务住宅相关|购物服务","交通设施服务;机场相关;候机室","交通设施服务;港口码头;车渡口","生活服务;邮局;邮局|公司企业","购物服务;家电电子卖场;综合家电商场|购物服务","体育休闲服务;运动场馆;游泳馆|体育休闲服务","生活服务;旅行社;旅行社|公司企业","购物服务;文化用品店;文化用品店|购物服务","购物服务;特色商业街;步行街|地名地址信息","科教文化服务;学校;幼儿园|生活服务","购物服务;综合市场;蔬菜市场|生活服务","体育休闲服务;休闲场所;游乐场|购物服务","汽车销售;汽车销售;汽车销售|公司企业","购物服务;综合市场;农副产品市场|购物服务;超级市场;超市","购物服务;花鸟鱼虫市场;花卉市场|商务住宅","住宿服务;旅馆招待所;旅馆招待所|商务住宅;商务住宅相关;商务住宅相关","公司企业;公司;网络科技|公司企业","政府机构及社会团体;政府机关;政府机关相关|公司企业;公司企业;公司企业","购物服务;服装鞋帽皮具店;服装鞋帽皮具店|商务住宅","政府机构及社会团体;交通车辆管理;车辆管理机构|政府机构及社会团体","餐饮服务;快餐厅;麦当劳|餐饮服务","体育休闲服务;休闲场所;休闲场所|科教文化服务","医疗保健服务;专科医院;口腔医院|医疗保健服务;诊所;诊所","汽车销售;江淮销售;江淮销售|汽车维修","餐饮服务;外国餐厅;牛扒店(扒房)|餐饮服务","购物服务;专卖店;书店|购物服务","政府机构及社会团体;社会团体;行业协会|政府机构及社会团体","商务住宅;住宅区;住宅区|住宿服务","购物服务;专卖店;专营店|体育休闲服务","餐饮服务;快餐厅;肯德基|餐饮服务","汽车维修;汽车维修;汽车维修|汽车服务;汽车服务相关;汽车服务相关","餐饮服务;中餐厅;海鲜酒楼|住宿服务","体育休闲服务;度假疗养场所;度假村|住宿服务","购物服务;专卖店;眼镜店|公司企业","体育休闲服务;娱乐场所;网吧|体育休闲服务","购物服务;商场;商场|购物服务","购物服务;商场;普通商场|生活服务","公司企业;公司;公司|体育休闲服务","住宿服务;宾馆酒店;三星级宾馆|餐饮服务","地名地址信息;交通地名;环岛名","购物服务;家居建材市场;建材五金市场|公司企业;公司企业;公司企业","购物服务;综合市场;蔬菜市场|餐饮服务","地名地址信息;普通地名;村组级地名|地名地址信息","购物服务;家电电子卖场;数码电子|汽车服务","购物服务;综合市场;农副产品市场|餐饮服务;餐饮相关场所;餐饮相关","餐饮服务;中餐厅;东北菜|餐饮服务","政府机构及社会团体;政府机关;政府机关相关|商务住宅","汽车维修;汽车维修;汽车维修|购物服务","汽车销售;货车销售;货车销售|汽车服务","生活服务;电讯营业厅;中国电信营业厅|购物服务;家电电子卖场;手机销售","购物服务;家居建材市场;灯具瓷器市场|生活服务","住宿服务;宾馆酒店;四星级宾馆|餐饮服务;餐饮相关场所;餐饮相关","生活服务;人才市场;人才市场|生活服务","科教文化服务;学校;学校|科教文化服务","体育休闲服务;娱乐场所;棋牌室|体育休闲服务","政府机构及社会团体;社会团体;社会团体相关|政府机构及社会团体","汽车维修;日产特约维修;东风日产维修|汽车销售","购物服务;购物相关场所;购物相关场所|汽车维修","餐饮服务;中餐厅;湖南菜(湘菜)|餐饮服务","公司企业;公司;商业贸易|公司企业","购物服务;专卖店;珠宝首饰工艺品|餐饮服务","购物服务;商场;普通商场|公司企业","购物服务;花鸟鱼虫市场;宠物市场|购物服务","地名地址信息;自然地名;山脉","生活服务;洗浴推拿场所;洗浴推拿场所|商务住宅","医疗保健服务;疾病预防机构;疾病预防|医疗保健服务","地名地址信息;交通地名;立交桥|地名地址信息","风景名胜;风景名胜;红色景区|风景名胜","生活服务;物流速递;物流速递|汽车服务","购物服务;专卖店;专营店|摩托车服务","金融保险服务;银行;中国农业银行|金融保险服务","公司企业;公司;公司|购物服务;服装鞋帽皮具店;服装鞋帽皮具店","公司企业;公司;建筑公司|购物服务","餐饮服务;中餐厅;云贵菜|餐饮服务","商务住宅;住宅区;住宅小区|住宿服务;旅馆招待所;旅馆招待所","汽车维修;现代特约维修;北京现代维修|汽车销售","餐饮服务;快餐厅;快餐厅|生活服务","公司企业;公司;商业贸易|生活服务","汽车销售;丰田特约销售;雷克萨斯销售|汽车维修","科教文化服务;学校;幼儿园|购物服务","购物服务;专卖店;珠宝首饰工艺品|科教文化服务","汽车服务;汽车服务相关;汽车服务相关|汽车维修;汽车维修;汽车维修","餐饮服务;茶艺馆;茶艺馆|购物服务;专卖店;专营店","商务住宅;商务住宅相关;商务住宅相关|住宿服务","政府机构及社会团体;公检法机构;社会治安机构|生活服务","生活服务;事务所;律师事务所|政府机构及社会团体","体育休闲服务;娱乐场所;娱乐场所|购物服务","汽车服务;二手车交易;二手车交易|汽车服务","风景名胜;公园广场;城市广场|购物服务","政府机构及社会团体;政府机关;政府机关相关|金融保险服务","政府机构及社会团体;社会团体;社会团体相关|公司企业;公司企业;公司企业","购物服务;体育用品店;体育用品店|购物服务","金融保险服务;银行;中国邮政储蓄银行|金融保险服务","商务住宅;住宅区;别墅|商务住宅","汽车维修;长安汽车维修;长安汽车维修|汽车销售","餐饮服务;餐饮相关场所;餐饮相关|体育休闲服务","体育休闲服务;休闲场所;休闲场所|公司企业","体育休闲服务;娱乐场所;网吧|公司企业","汽车服务;汽车配件销售;汽车配件销售|汽车销售","汽车维修;福特特约维修;福特维修|汽车销售","购物服务;便民商店/便利店;便民商店/便利店|住宿服务","住宿服务;宾馆酒店;经济型连锁酒店|购物服务","商务住宅;住宅区;住宅区|购物服务","政府机构及社会团体;公检法机构;消防机关|政府机构及社会团体","生活服务;美容美发店;美容美发店|体育休闲服务","购物服务;家电电子卖场;数码电子|生活服务;维修站点;维修站点","金融保险服务;银行;中国工商银行|金融保险服务","餐饮服务;糕饼店;糕饼店|公司企业","科教文化服务;美术馆;美术馆|科教文化服务","购物服务;综合市场;小商品市场|购物服务","体育休闲服务;体育休闲服务场所;体育休闲服务场所|餐饮服务","体育休闲服务;娱乐场所;娱乐场所|体育休闲服务","金融保险服务;金融保险服务机构;金融保险机构|汽车服务","餐饮服务;中餐厅;广东菜(粤菜)|餐饮服务","汽车服务;二手车交易;二手车交易|购物服务","生活服务;物流速递;物流速递|汽车销售","购物服务;专卖店;自行车专卖店|摩托车服务;摩托车销售;摩托车销售","购物服务;专卖店;自行车专卖店|购物服务","体育休闲服务;休闲场所;休闲场所|风景名胜","生活服务;生活服务场所;生活服务场所|体育休闲服务","体育休闲服务;度假疗养场所;度假村|风景名胜","生活服务;邮局;邮政速递|公司企业","体育休闲服务;度假疗养场所;疗养院|政府机构及社会团体","体育休闲服务;运动场馆;健身中心|购物服务","公司企业;公司;广告装饰|购物服务;家居建材市场;建材五金市场","生活服务;电讯营业厅;中国移动营业厅|生活服务","金融保险服务;银行;中国银行|金融保险服务","体育休闲服务;休闲场所;休闲场所|购物服务","汽车服务;汽车租赁;汽车租赁|生活服务","汽车服务;汽车配件销售;汽车配件销售|汽车维修;汽车维修;汽车维修","汽车销售;斯巴鲁特约销售;斯巴鲁销售|汽车维修","餐饮服务;茶艺馆;茶艺馆|生活服务","购物服务;家电电子卖场;数码电子|公司企业;公司;公司","购物服务;家电电子卖场;综合家电商场|生活服务","商务住宅;楼宇;商务写字楼|住宿服务","政府机构及社会团体;社会团体;残联|生活服务","购物服务;商场;购物中心|商务住宅","体育休闲服务;体育休闲服务场所;体育休闲服务场所|购物服务","公司企业;公司企业;公司企业|金融保险服务","摩托车服务;摩托车服务相关;摩托车服务相关|购物服务","汽车维修;汽车综合维修;汽车综合维修|生活服务","汽车维修;货车维修;货车维修|汽车维修","购物服务;家电电子卖场;手机销售|生活服务;维修站点;维修站点","购物服务;服装鞋帽皮具店;品牌鞋店|购物服务","购物服务;综合市场;旧货市场|购物服务","住宿服务;宾馆酒店;宾馆酒店|餐饮服务;中餐厅;中餐厅","汽车销售;吉利特约销售;沃尔沃销售|汽车维修","生活服务;婴儿服务场所;婴儿游泳馆|体育休闲服务","购物服务;特色商业街;特色商业街|餐饮服务","餐饮服务;甜品店;甜品店|购物服务","交通设施服务;港口码头;客运港","体育休闲服务;娱乐场所;网吧|餐饮服务","公司企业;农林牧渔基地;其它农林牧渔基地|政府机构及社会团体","生活服务;洗浴推拿场所;洗浴推拿场所|公司企业","购物服务;专卖店;烟酒专卖店|购物服务;便民商店/便利店;便民商店/便利店","购物服务;体育用品店;体育用品店|公司企业","购物服务;便民商店/便利店;便民商店/便利店|汽车服务","购物服务;家居建材市场;建材五金市场|购物服务;专卖店;专营店","购物服务;专卖店;古玩字画店|购物服务","体育休闲服务;休闲场所;游乐场|科教文化服务","公司企业;公司;公司|金融保险服务;金融保险服务机构;金融保险机构","政府机构及社会团体;社会团体;慈善机构|生活服务","汽车销售;保时捷特约销售;保时捷销售|汽车维修","购物服务;体育用品店;户外用品|购物服务","金融保险服务;银行;银行|金融保险服务","餐饮服务;中餐厅;综合酒楼|体育休闲服务","餐饮服务;餐饮相关场所;餐饮相关|住宿服务","体育休闲服务;娱乐场所;娱乐场所|餐饮服务","体育休闲服务;娱乐场所;网吧|生活服务","购物服务;专卖店;专营店|餐饮服务;餐饮相关场所;餐饮相关","住宿服务;宾馆酒店;四星级宾馆|住宿服务","医疗保健服务;专科医院;整形美容|医疗保健服务","地名地址信息;交通地名;道路名|商务住宅","地名地址信息;自然地名;山|地名地址信息;普通地名;村庄级地名","风景名胜;公园广场;城市广场|商务住宅","购物服务;家电电子卖场;手机销售|生活服务;电讯营业厅;中国联通营业厅","金融保险服务;金融保险服务机构;金融保险机构|公司企业","生活服务;事务所;评估事务所|公司企业","生活服务;电讯营业厅;中国电信营业厅|生活服务","购物服务;购物相关场所;购物相关场所|体育休闲服务","公司企业;公司企业;公司企业|汽车服务","生活服务;中介机构;中介机构|商务住宅","科教文化服务;学校;高等院校|生活服务","购物服务;家电电子卖场;家电电子卖场|生活服务;维修站点;维修站点","餐饮服务;餐饮相关场所;餐饮相关|购物服务;购物相关场所;购物相关场所","公司企业;公司;冶金化工|生活服务","商务住宅;产业园区;产业园区|科教文化服务","商务住宅;住宅区;住宅小区|风景名胜","商务住宅;住宅区;社区中心|政府机构及社会团体","科教文化服务;培训机构;培训机构|商务住宅","购物服务;家电电子卖场;家电电子卖场|餐饮服务","地名地址信息;自然地名;河流|地名地址信息","汽车服务;汽车服务相关;汽车服务相关|金融保险服务","科教文化服务;驾校;驾校|生活服务;生活服务场所;生活服务场所","购物服务;个人用品/化妆品店;其它个人用品店|公司企业","公司企业;工厂;工厂|生活服务;生活服务场所;生活服务场所","生活服务;美容美发店;美容美发店|生活服务;洗浴推拿场所;洗浴推拿场所","科教文化服务;展览馆;展览馆|科教文化服务","购物服务;购物相关场所;购物相关场所|餐饮服务;餐饮相关场所;餐饮相关","医疗保健服务;专科医院;眼科医院|医疗保健服务","商务住宅;住宅区;住宅小区|科教文化服务","购物服务;文化用品店;文化用品店|科教文化服务","体育休闲服务;体育休闲服务场所;体育休闲服务场所|生活服务","汽车维修;起亚特约维修;东风悦达起亚维修|汽车销售","购物服务;家居建材市场;建材五金市场|汽车维修","汽车服务;汽车养护/装饰;汽车养护|公司企业","生活服务;中介机构;中介机构|购物服务;购物相关场所;购物相关场所","生活服务;中介机构;中介机构|金融保险服务","餐饮服务;糕饼店;糕饼店|生活服务","汽车销售;大众特约销售;进口大众销售|汽车维修","购物服务;服装鞋帽皮具店;服装鞋帽皮具店|体育休闲服务","风景名胜;公园广场;水族馆|购物服务","体育休闲服务;娱乐场所;KTV|商务住宅","摩托车服务;摩托车维修;摩托车维修|购物服务","体育休闲服务;休闲场所;休闲场所|餐饮服务;中餐厅;中餐厅","商务住宅;楼宇;商住两用楼宇|购物服务","政府机构及社会团体;公检法机构;公证鉴定机构|科教文化服务","汽车维修;北京汽车维修;北京汽车维修|汽车销售","汽车销售;克莱斯勒特约销售;吉普销售|汽车维修","生活服务;物流速递;物流速递|商务住宅","生活服务;自来水营业厅;自来水营业厅|公司企业","购物服务;超级市场;华润|购物服务","餐饮服务;中餐厅;中餐厅|科教文化服务","餐饮服务;中餐厅;综合酒楼|商务住宅","商务住宅;楼宇;商务写字楼|科教文化服务","地名地址信息;普通地名;村庄级地名|生活服务","政府机构及社会团体;政府机关;乡镇以下级政府及事业单位|公司企业","生活服务;摄影冲印店;摄影冲印|餐饮服务","交通设施服务;上下客区;上下客区","汽车维修;汽车综合维修;汽车综合维修|汽车维修","购物服务;专卖店;自行车专卖店|汽车维修","购物服务;综合市场;水产海鲜市场|生活服务","餐饮服务;休闲餐饮场所;休闲餐饮场所|购物服务","商务住宅;住宅区;宿舍|住宿服务","政府机构及社会团体;政府机关;省直辖市级政府及事业单位|公司企业","购物服务;家电电子卖场;手机销售|生活服务;生活服务场所;生活服务场所","购物服务;综合市场;农副产品市场|生活服务;生活服务场所;生活服务场所","汽车维修;货车维修;货车维修|汽车销售","购物服务;专卖店;专营店|汽车销售","购物服务;专卖店;书店|生活服务","风景名胜;公园广场;城市广场|体育休闲服务","出入口;停车场出入口","汽车维修;本田特约维修;东风本田维修|汽车销售","生活服务;中介机构;中介机构|餐饮服务","住宿服务;宾馆酒店;三星级宾馆|住宿服务","地名地址信息;普通地名;村庄级地名|风景名胜","购物服务;服装鞋帽皮具店;服装鞋帽皮具店|科教文化服务","购物服务;特色商业街;特色商业街|生活服务","风景名胜;风景名胜;风景名胜|体育休闲服务","交通设施服务;过境口岸;过境口岸","地名地址信息;普通地名;村庄级地名|政府机构及社会团体","汽车维修;通用特约维修;别克维修|汽车销售","科教文化服务;文化宫;文化宫|科教文化服务","餐饮服务;中餐厅;中餐厅|风景名胜","公司企业;公司;公司|汽车服务;汽车服务相关;汽车服务相关","商务住宅;住宅区;住宅区|餐饮服务","汽车维修;广汽传祺维修;广汽传祺维修|汽车销售","汽车销售;吉利特约销售;沃尔沃汽车销售|汽车维修","生活服务;物流速递;物流速递|生活服务","购物服务;综合市场;蔬菜市场|公司企业","住宿服务;住宿服务相关;住宿服务相关|生活服务","体育休闲服务;度假疗养场所;疗养院|体育休闲服务","购物服务;专卖店;烟酒专卖店|住宿服务","体育休闲服务;运动场馆;游泳馆|生活服务","政府机构及社会团体;社会团体;行业协会|公司企业","金融保险服务;保险公司;保险公司|公司企业","金融保险服务;银行;农村商业银行|购物服务","餐饮服务;外国餐厅;日本料理|餐饮服务","生活服务;电讯营业厅;中国电信营业厅|公司企业;公司;电信公司","购物服务;专卖店;古玩字画店|餐饮服务","金融保险服务;银行;农村商业银行|生活服务","交通设施服务;停车场;公共停车场|交通设施服务;停车场;路边停车场","住宿服务;住宿服务相关;住宿服务相关|体育休闲服务;度假疗养场所;度假村","体育休闲服务;休闲场所;游乐场|风景名胜","生活服务;电讯营业厅;中国联通营业厅|购物服务;家电电子卖场;手机销售","生活服务;摄影冲印店;摄影冲印|科教文化服务","科教文化服务;文化宫;文化宫|体育休闲服务","餐饮服务;中餐厅;海鲜酒楼|体育休闲服务","汽车销售;汽车销售;汽车销售|汽车服务;汽车服务相关;汽车服务相关","购物服务;家电电子卖场;数码电子|科教文化服务","购物服务;购物相关场所;购物相关场所|金融保险服务","公司企业;公司;医药公司|公司企业","地名地址信息;普通地名;村庄级地名|地名地址信息;自然地名;山","政府机构及社会团体;交通车辆管理;验车场|政府机构及社会团体","政府机构及社会团体;政府机关;省直辖市级政府及事业单位|生活服务","购物服务;家居建材市场;建材五金市场|地名地址信息","风景名胜;风景名胜;红色景区|生活服务","地名地址信息;交通地名;道路名|餐饮服务","汽车销售;福特特约销售;林肯销售|汽车维修","金融保险服务;银行;中国建设银行|金融保险服务","风景名胜;公园广场;公园|体育休闲服务","政府机构及社会团体;公检法机构;公安警察|生活服务","政府机构及社会团体;社会团体;慈善机构|购物服务","金融保险服务;自动提款机;中国农业银行ATM|金融保险服务","公司企业;公司企业;公司企业|汽车销售","政府机构及社会团体;政府机关;区县级政府及事业单位|金融保险服务","汽车服务;汽车租赁;汽车租赁|公司企业","购物服务;综合市场;综合市场|生活服务","体育休闲服务;娱乐场所;夜总会|体育休闲服务","商务住宅;产业园区;产业园区|购物服务","汽车维修;通用特约维修;雪佛兰维修|汽车销售","生活服务;物流速递;物流仓储场地|购物服务","购物服务;专卖店;书店|餐饮服务","购物服务;专卖店;土特产专卖店|购物服务","政府机构及社会团体;交通车辆管理;交通管理机构|公司企业","汽车服务;二手车交易;二手车交易|汽车维修","汽车服务;汽车服务相关;汽车服务相关|汽车销售;汽车销售;汽车销售","生活服务;洗浴推拿场所;洗浴推拿场所|生活服务;美容美发店;美容美发店","生活服务;生活服务场所;生活服务场所|公司企业;公司企业;公司企业","医疗保健服务;专科医院;专科医院|医疗保健服务;诊所;诊所","地名地址信息;自然地名;山|风景名胜","汽车服务;加油站;加油站|汽车服务","购物服务;购物相关场所;购物相关场所|科教文化服务","汽车维修;吉利特约维修;吉利维修|汽车销售","汽车维修;大众特约维修;斯柯达维修|汽车销售","科教文化服务;科研机构;科研机构|生活服务","购物服务;专卖店;专营店|科教文化服务;培训机构;培训机构","购物服务;专卖店;土特产专卖店|餐饮服务","购物服务;专卖店;宠物用品店|购物服务","购物服务;专卖店;宠物用品店|餐饮服务","购物服务;专卖店;珠宝首饰工艺品|生活服务;生活服务场所;生活服务场所","购物服务;家居建材市场;布艺市场|公司企业;公司;公司","政府机构及社会团体;公检法机构;消防机关|购物服务","汽车维修;本田特约维修;广汽本田维修|汽车销售","购物服务;家居建材市场;家居建材市场|汽车服务","购物服务;家居建材市场;建材五金市场|公司企业;公司;广告装饰","购物服务;服装鞋帽皮具店;品牌服装店|餐饮服务","公司企业;工厂;工厂|餐饮服务","政府机构及社会团体;公检法机构;公证鉴定机构|生活服务","购物服务;专卖店;烟酒专卖店|公司企业;公司;公司","购物服务;综合市场;农副产品市场|政府机构及社会团体","公司企业;公司;公司|摩托车服务","公司企业;公司;商业贸易|汽车销售","地名地址信息;交通地名;交通地名","政府机构及社会团体;社会团体;行业协会|生活服务","生活服务;美容美发店;美容美发店|汽车服务","购物服务;家居建材市场;厨卫市场|餐饮服务","购物服务;家居建材市场;布艺市场|生活服务;生活服务场所;生活服务场所","购物服务;特色商业街;特色商业街|购物服务","餐饮服务;休闲餐饮场所;休闲餐饮场所|体育休闲服务","交通设施服务;火车站;公安制证","住宿服务;宾馆酒店;五星级宾馆|餐饮服务;餐饮相关场所;餐饮相关","体育休闲服务;娱乐场所;KTV|住宿服务","汽车维修;大众特约维修;一汽-大众维修|汽车销售","购物服务;个人用品/化妆品店;其它个人用品店|餐饮服务","购物服务;花鸟鱼虫市场;宠物市场|风景名胜","金融保险服务;金融保险服务机构;金融保险机构|购物服务","商务住宅;住宅区;宿舍|科教文化服务","商务住宅;楼宇;商务写字楼|商务住宅;楼宇;商住两用楼宇","政府机构及社会团体;交通车辆管理;交通管理机构|生活服务","购物服务;专卖店;礼品饰品店|公司企业","购物服务;综合市场;农副产品市场|公司企业;公司;公司","金融保险服务;保险公司;保险公司|汽车服务","风景名胜;风景名胜;纪念馆|科教文化服务","餐饮服务;中餐厅;特色/地方风味餐厅|公司企业","体育休闲服务;影剧院;电影院|生活服务","体育休闲服务;运动场馆;台球厅|购物服务","地名地址信息;普通地名;乡镇级地名|地名地址信息","生活服务;售票处;飞机票代售点|生活服务","生活服务;维修站点;维修站点|生活服务","科教文化服务;培训机构;培训机构|购物服务;专卖店;专营店","购物服务;专卖店;珠宝首饰工艺品|商务住宅","餐饮服务;中餐厅;中餐厅|餐饮服务;茶艺馆;茶艺馆","医疗保健服务;动物医疗场所;宠物诊所|医疗保健服务","地名地址信息;交通地名;交通地名|购物服务","政府机构及社会团体;政府机关;区县级政府及事业单位|购物服务","汽车销售;日产特约销售;英菲尼迪销售|汽车维修","科教文化服务;驾校;驾校|科教文化服务","公司企业;公司;建筑公司|科教文化服务","汽车销售;日产特约销售;郑州日产销售|汽车维修","购物服务;服装鞋帽皮具店;品牌服装店|公司企业","购物服务;购物相关场所;购物相关场所|摩托车服务","金融保险服务;自动提款机;中国建设银行ATM|金融保险服务","金融保险服务;自动提款机;汇丰银行ATM","风景名胜;风景名胜相关;旅游景点|体育休闲服务","公司企业;公司;冶金化工|公司企业;工厂;工厂","公司企业;工厂;工厂|汽车服务","政府机构及社会团体;政府机关;乡镇级政府及事业单位|体育休闲服务","汽车维修;标致雪铁龙特约维修;东风雪铁龙维修|汽车销售","公司企业;公司;机械电子|购物服务;专卖店;专营店","公司企业;公司;网络科技|科教文化服务","商务住宅;住宅区;社区中心|商务住宅","政府机构及社会团体;政府机关;政府机关相关|风景名胜","汽车服务;加气站;加气站|生活服务","汽车服务;汽车俱乐部;汽车俱乐部|汽车服务","购物服务;专卖店;眼镜店|生活服务","购物服务;商场;免税品店|购物服务","餐饮服务;中餐厅;中餐厅|住宿服务;宾馆酒店;宾馆酒店","餐饮服务;中餐厅;综合酒楼|生活服务","体育休闲服务;娱乐场所;游戏厅|体育休闲服务","公司企业;公司;公司|交通设施服务","医疗保健服务;专科医院;整形美容|生活服务","政府机构及社会团体;政府机关;地市级政府及事业单位|金融保险服务","生活服务;维修站点;维修站点|汽车维修;汽车维修;汽车维修","购物服务;花鸟鱼虫市场;花卉市场|生活服务;生活服务场所;生活服务场所","金融保险服务;自动提款机;中国工商银行ATM|金融保险服务","公司企业;公司;广告装饰|生活服务;摄影冲印店;摄影冲印","医疗保健服务;综合医院;卫生院|医疗保健服务;诊所;诊所","商务住宅;楼宇;商务写字楼|餐饮服务","汽车维修;汽车综合维修;汽车综合维修|公司企业","汽车维修;荣威维修;荣威维修|汽车销售","购物服务;专卖店;专营店|公司企业;公司企业;公司企业","购物服务;体育用品店;体育用品店|体育休闲服务","餐饮服务;中餐厅;综合酒楼|公司企业","体育休闲服务;度假疗养场所;度假村|餐饮服务","体育休闲服务;度假疗养场所;疗养院|商务住宅","公司企业;农林牧渔基地;其它农林牧渔基地|生活服务","医疗保健服务;专科医院;肿瘤医院|医疗保健服务","汽车服务;汽车养护/装饰;汽车养护|汽车服务;洗车场;洗车场","生活服务;中介机构;中介机构|住宿服务","购物服务;家电电子卖场;数码电子|体育休闲服务","餐饮服务;中餐厅;中餐厅|生活服务;生活服务场所;生活服务场所","交通设施服务;交通服务相关;交通服务相关|生活服务","体育休闲服务;影剧院;电影院|餐饮服务","汽车销售;宝马特约销售;宝马MINI销售|汽车维修","科教文化服务;博物馆;博物馆|风景名胜","购物服务;专卖店;钟表店|购物服务","购物服务;家居建材市场;家具城|公司企业;公司;公司","购物服务;家居建材市场;建材五金市场|科教文化服务","购物服务;家电电子卖场;家电电子卖场|汽车维修","风景名胜;风景名胜;教堂|政府机构及社会团体","餐饮服务;冷饮店;冷饮店|生活服务","体育休闲服务;运动场馆;运动场所|购物服务","公司企业;公司;医药公司|生活服务","生活服务;生活服务场所;生活服务场所|汽车销售","生活服务;维修站点;维修站点|摩托车服务;摩托车维修;摩托车维修","购物服务;专卖店;礼品饰品店|餐饮服务","购物服务;家居建材市场;家具城|餐饮服务","餐饮服务;中餐厅;火锅店|公司企业","交通设施服务;火车站;改签","住宿服务;宾馆酒店;经济型连锁酒店|餐饮服务","政府机构及社会团体;社会团体;教会|风景名胜","政府机构及社会团体;社会团体;残联|政府机构及社会团体","汽车服务;二手车交易;二手车交易|生活服务","汽车服务;汽车养护/装饰;汽车养护|汽车服务;汽车配件销售;汽车配件销售","生活服务;电讯营业厅;中国联通营业厅|生活服务","科教文化服务;培训机构;培训机构|生活服务;生活服务场所;生活服务场所","餐饮服务;中餐厅;中餐厅|体育休闲服务;休闲场所;休闲场所","餐饮服务;糕饼店;糕饼店|购物服务;购物相关场所;购物相关场所","餐饮服务;餐饮相关场所;餐饮相关|公司企业","住宿服务;旅馆招待所;青年旅舍|住宿服务","体育休闲服务;运动场馆;乒乓球馆|科教文化服务","科教文化服务;学校;幼儿园|体育休闲服务","科教文化服务;展览馆;展览馆|风景名胜","购物服务;家居建材市场;厨卫市场|公司企业;公司;公司","购物服务;文化用品店;文化用品店|餐饮服务","购物服务;综合市场;果品市场|餐饮服务;餐饮相关场所;餐饮相关","风景名胜;风景名胜相关;旅游景点|购物服务","餐饮服务;中餐厅;潮州菜|餐饮服务","餐饮服务;中餐厅;西北菜|餐饮服务","生活服务;中介机构;中介机构|汽车服务","科教文化服务;科教文化场所;科教文化场所|公司企业","购物服务;专卖店;烟酒专卖店|公司企业;公司企业;公司企业","金融保险服务;保险公司;中国人寿保险公司|公司企业","风景名胜;公园广场;城市广场|风景名胜","公司企业;公司企业;公司企业|生活服务;生活服务场所;生活服务场所","政府机构及社会团体;社会团体;行业协会|科教文化服务","生活服务;物流速递;物流速递|餐饮服务","科教文化服务;驾校;驾校|公司企业","购物服务;商场;普通商场|风景名胜","购物服务;综合市场;果品市场|体育休闲服务","体育休闲服务;体育休闲服务场所;体育休闲服务场所|住宿服务","公司企业;公司;机械电子|公司企业;工厂;工厂","公司企业;公司;电信公司|生活服务;电讯营业厅;中国电信营业厅","医疗保健服务;医药保健销售店;医疗保健用品|生活服务","地名地址信息;普通地名;乡镇级地名|政府机构及社会团体","摩托车服务;摩托车销售;摩托车销售|汽车销售","汽车服务;洗车场;洗车场|生活服务","生活服务;婴儿服务场所;婴儿游泳馆|科教文化服务","餐饮服务;中餐厅;火锅店|餐饮服务;中餐厅;特色/地方风味餐厅","体育休闲服务;娱乐场所;酒吧|生活服务","公司企业;公司;商业贸易|餐饮服务","公司企业;公司;矿产公司|公司企业","汽车维修;标致雪铁龙特约维修;东风标致维修|汽车销售","汽车销售;货车销售;货车销售|汽车销售","生活服务;生活服务场所;生活服务场所|住宿服务","科教文化服务;科教文化场所;科教文化场所|购物服务","购物服务;专卖店;古玩字画店|公司企业","政府机构及社会团体;社会团体;慈善机构|政府机构及社会团体","生活服务;事务所;评估事务所|生活服务","生活服务;售票处;火车票代售点|生活服务","生活服务;物流速递;物流速递|公司企业;公司;公司","科教文化服务;科研机构;科研机构|科教文化服务","购物服务;便民商店/便利店;便民商店/便利店|商务住宅","购物服务;家电电子卖场;手机销售|公司企业;公司;电信公司","购物服务;特殊买卖场所;典当行|公司企业","金融保险服务;保险公司;中国人民保险公司|公司企业","交通设施服务;火车站;退票","体育休闲服务;休闲场所;休闲场所|商务住宅","体育休闲服务;娱乐场所;棋牌室|科教文化服务","商务住宅;楼宇;商务写字楼|商务住宅;住宅区;住宅小区","摩托车服务;摩托车维修;摩托车维修|汽车维修","政府机构及社会团体;政府机关;乡镇以下级政府及事业单位|体育休闲服务","汽车服务;二手车交易;二手车交易|汽车销售;汽车销售;汽车销售","生活服务;彩票彩券销售点;彩票彩券销售点|购物服务","科教文化服务;传媒机构;电视台|生活服务","购物服务;家居建材市场;建材五金市场|生活服务;维修站点;维修站点","购物服务;综合市场;综合市场|公司企业","餐饮服务;中餐厅;火锅店|生活服务","住宿服务;旅馆招待所;青年旅舍|商务住宅","体育休闲服务;运动场馆;综合体育馆|体育休闲服务","政府机构及社会团体;社会团体;社会团体相关|风景名胜","汽车销售;汽车销售;汽车销售|生活服务","生活服务;洗衣店;洗衣店|公司企业","购物服务;专卖店;音像店|购物服务","购物服务;家居建材市场;家具城|商务住宅","购物服务;家居建材市场;建材五金市场|政府机构及社会团体","购物服务;服装鞋帽皮具店;品牌鞋店|生活服务","体育休闲服务;影剧院;电影院|购物服务","汽车维修;奇瑞特约维修;奇瑞维修|汽车销售","生活服务;丧葬设施;公墓|风景名胜","购物服务;家电电子卖场;数码电子|生活服务;生活服务场所;生活服务场所","购物服务;特殊买卖场所;特殊买卖场所|生活服务","餐饮服务;中餐厅;中餐厅|餐饮服务;糕饼店;糕饼店","餐饮服务;外国餐厅;韩国料理|餐饮服务","体育休闲服务;娱乐场所;游戏厅|购物服务","商务住宅;住宅区;住宅小区|商务住宅;楼宇;商务写字楼","政府机构及社会团体;政府机关;乡镇以下级政府及事业单位|购物服务","汽车服务;汽车租赁;汽车租赁|汽车服务","汽车服务;汽车租赁;汽车租赁|汽车销售","汽车维修;梅赛德斯-奔驰特约维修;梅赛德斯-奔驰维修|汽车销售","汽车销售;长城汽车销售;长城汽车销售|购物服务","生活服务;事务所;会计师事务所|生活服务","生活服务;物流速递;物流速递|住宿服务","购物服务;专卖店;专营店|商务住宅","购物服务;专卖店;专营店|风景名胜","购物服务;家居建材市场;布艺市场|餐饮服务","风景名胜;风景名胜;风景名胜|购物服务","餐饮服务;中餐厅;特色/地方风味餐厅|体育休闲服务","体育休闲服务;体育休闲服务场所;体育休闲服务场所|公司企业","体育休闲服务;影剧院;电影院|体育休闲服务","公司企业;公司;网络科技|体育休闲服务","医疗保健服务;专科医院;精神病医院|医疗保健服务","商务住宅;住宅区;社区中心|地名地址信息","商务住宅;楼宇;商务写字楼|金融保险服务","汽车销售;海马汽车销售;海马汽车销售|汽车维修","汽车销售;现代特约销售;现代销售|汽车维修","生活服务;事务所;会计师事务所|金融保险服务","生活服务;旅行社;旅行社|住宿服务","生活服务;维修站点;维修站点|购物服务;家电电子卖场;家电电子卖场","科教文化服务;传媒机构;传媒机构|购物服务","科教文化服务;文艺团体;文艺团体|科教文化服务","购物服务;专卖店;烟酒专卖店|公司企业;工厂;工厂","购物服务;家居建材市场;建材五金市场|公司企业;公司;商业贸易","餐饮服务;中餐厅;火锅店|商务住宅","餐饮服务;咖啡厅;咖啡厅|体育休闲服务","餐饮服务;外国餐厅;西餐厅(综合风味)|体育休闲服务","交通设施服务;停车场;停车场出入口|交通设施服务","公司企业;公司;公司|汽车销售;汽车销售;汽车销售","公司企业;公司;商业贸易|购物服务;购物相关场所;购物相关场所","公司企业;公司;广告装饰|餐饮服务","汽车服务;汽车配件销售;汽车配件销售|汽车服务;汽车养护/装饰;汽车养护","生活服务;丧葬设施;公墓|生活服务","生活服务;中介机构;中介机构|公司企业;公司;公司","科教文化服务;传媒机构;传媒机构|科教文化服务","科教文化服务;学校;小学|政府机构及社会团体","购物服务;专卖店;儿童用品店|购物服务;服装鞋帽皮具店;服装鞋帽皮具店","购物服务;便民商店/便利店;便民商店/便利店|金融保险服务","购物服务;服装鞋帽皮具店;服装鞋帽皮具店|购物服务;专卖店;专营店","风景名胜;风景名胜;风景名胜|科教文化服务","体育休闲服务;娱乐场所;迪厅|体育休闲服务","公司企业;公司;医药公司|购物服务","公司企业;农林牧渔基地;其它农林牧渔基地|风景名胜","政府机构及社会团体;社会团体;社会团体相关|体育休闲服务","购物服务;便民商店/便利店;便民商店/便利店|政府机构及社会团体","餐饮服务;冷饮店;冷饮店|购物服务;购物相关场所;购物相关场所","餐饮服务;快餐厅;快餐厅|公司企业","体育休闲服务;体育休闲服务场所;体育休闲服务场所|风景名胜","体育休闲服务;娱乐场所;酒吧|餐饮服务;中餐厅;中餐厅","体育休闲服务;影剧院;剧场|科教文化服务","医疗保健服务;动物医疗场所;兽医站|医疗保健服务","政府机构及社会团体;政府机关;政府机关相关|购物服务","汽车维修;汽车维修;汽车维修|汽车销售;汽车销售;汽车销售","汽车维修;汽车综合维修;汽车综合维修|购物服务","科教文化服务;传媒机构;报社|公司企业","科教文化服务;传媒机构;电视台|科教文化服务","科教文化服务;学校;职业技术学校|生活服务","科教文化服务;学校;高等院校|商务住宅","购物服务;专卖店;儿童用品店|生活服务;婴儿服务场所;婴儿游泳馆","购物服务;专卖店;烟酒专卖店|政府机构及社会团体","购物服务;服装鞋帽皮具店;服装鞋帽皮具店|汽车服务","餐饮服务;中餐厅;安徽菜(徽菜)|餐饮服务","餐饮服务;中餐厅;海鲜酒楼|公司企业","餐饮服务;咖啡厅;咖啡厅|生活服务","餐饮服务;茶艺馆;茶艺馆|餐饮服务;中餐厅;中餐厅","公司企业;公司;公司|生活服务;物流速递;物流速递","商务住宅;产业园区;产业园区|商务住宅","汽车维修;名爵维修;名爵维修|汽车销售","汽车维修;江淮维修;江淮维修|汽车销售","汽车销售;吉利特约销售;吉利销售|汽车维修;吉利特约维修;吉利维修","汽车销售;福特特约销售;福特销售|汽车维修;福特特约维修;福特维修","汽车销售;路虎特约销售;路虎销售|汽车维修","生活服务;事务所;律师事务所|公司企业","生活服务;售票处;飞机票代售点|公司企业","生活服务;洗衣店;洗衣店|生活服务","科教文化服务;学校;幼儿园|商务住宅","科教文化服务;学校;幼儿园|政府机构及社会团体","购物服务;专卖店;专营店|政府机构及社会团体","购物服务;家电电子卖场;综合家电商场|公司企业","购物服务;特殊买卖场所;典当行|生活服务","购物服务;特色商业街;特色商业街|地名地址信息","购物服务;综合市场;农副产品市场|地名地址信息","餐饮服务;中餐厅;北京菜|餐饮服务","餐饮服务;茶艺馆;茶艺馆|商务住宅","交通设施服务;上下客区;自驾车","住宿服务;住宿服务相关;住宿服务相关|购物服务","公司企业;公司;商业贸易|金融保险服务","商务住宅;住宅区;住宅小区|商务住宅;楼宇;楼宇相关","政府机构及社会团体;公检法机构;社会治安机构|科教文化服务","政府机构及社会团体;政府机关;区县级政府及事业单位|公司企业;公司;公司","汽车服务;其它能源站;其它能源站|汽车服务","购物服务;服装鞋帽皮具店;服装鞋帽皮具店|住宿服务","购物服务;特殊买卖场所;拍卖行|公司企业","金融保险服务;银行;农村商业银行|公司企业","金融保险服务;银行;银行|生活服务","政府机构及社会团体;公检法机构;法院|政府机构及社会团体","政府机构及社会团体;政府机关;乡镇级政府及事业单位|地名地址信息","汽车服务;汽车配件销售;汽车配件销售|摩托车服务","汽车维修;三菱特约维修;广汽三菱维修|汽车销售","汽车销售;雷诺特约销售;雷诺销售|汽车维修","科教文化服务;展览馆;展览馆|购物服务","科教文化服务;科研机构;科研机构|政府机构及社会团体","购物服务;专卖店;摄影器材店|生活服务","购物服务;商场;购物中心|购物服务;商场;普通商场","购物服务;购物相关场所;购物相关场所|政府机构及社会团体","风景名胜;风景名胜相关;旅游景点|生活服务","餐饮服务;中餐厅;浙江菜|餐饮服务","餐饮服务;中餐厅;特色/地方风味餐厅|生活服务","餐饮服务;冷饮店;冷饮店|餐饮服务;中餐厅;中餐厅","地名地址信息;普通地名;村庄级地名|体育休闲服务","摩托车服务;摩托车销售;摩托车销售|公司企业","政府机构及社会团体;交通车辆管理;车辆管理机构|汽车服务","政府机构及社会团体;交通车辆管理;验车场|汽车服务","政府机构及社会团体;社会团体;社会团体相关|汽车服务","购物服务;服装鞋帽皮具店;服装鞋帽皮具店|地名地址信息","购物服务;购物相关场所;购物相关场所|公司企业;公司企业;公司企业","餐饮服务;中餐厅;综合酒楼|住宿服务;宾馆酒店;宾馆酒店","餐饮服务;茶艺馆;茶艺馆|住宿服务","公司企业;公司;公司|餐饮服务;中餐厅;中餐厅","公司企业;公司;商业贸易|购物服务;家居建材市场;建材五金市场","公司企业;公司企业;公司企业|体育休闲服务","公司企业;公司企业;公司企业|科教文化服务","商务住宅;楼宇;商务写字楼|风景名胜","生活服务;事务所;会计师事务所|科教文化服务","科教文化服务;培训机构;培训机构|购物服务;购物相关场所;购物相关场所","购物服务;综合市场;农副产品市场|商务住宅","餐饮服务;外国餐厅;意式菜品餐厅|餐饮服务","体育休闲服务;娱乐场所;KTV|科教文化服务","体育休闲服务;度假疗养场所;疗养院|生活服务;生活服务场所;生活服务场所","公司企业;公司;建筑公司|政府机构及社会团体","医疗保健服务;专科医院;耳鼻喉医院|医疗保健服务","地名地址信息;交通地名;道路名|地名地址信息","室内设施;室内设施;室内设施|生活服务","摩托车服务;摩托车维修;摩托车维修|生活服务;维修站点;维修站点","政府机构及社会团体;政府机关;外地政府办|政府机构及社会团体","生活服务;信息咨询中心;信息咨询中心|公司企业","生活服务;旅行社;旅行社|购物服务","购物服务;家居建材市场;家具建材综合市场|公司企业","金融保险服务;自动提款机;中国邮政储蓄银行ATM|金融保险服务","金融保险服务;自动提款机;自动提款机|金融保险服务","餐饮服务;中餐厅;火锅店|住宿服务","餐饮服务;茶艺馆;茶艺馆|购物服务;购物相关场所;购物相关场所","住宿服务;宾馆酒店;五星级宾馆|住宿服务","体育休闲服务;休闲场所;水上活动中心|风景名胜","体育休闲服务;休闲场所;采摘园|餐饮服务","体育休闲服务;娱乐场所;娱乐场所|住宿服务","体育休闲服务;度假疗养场所;疗养院|公司企业","公司企业;公司;公司|生活服务;中介机构;中介机构","公司企业;公司企业;公司企业|购物服务;购物相关场所;购物相关场所","商务住宅;住宅区;住宅小区|生活服务;生活服务场所;生活服务场所","地名地址信息;自然地名;峡谷","政府机构及社会团体;政府机关;乡镇级政府及事业单位|商务住宅","汽车服务;洗车场;洗车场|汽车服务;汽车养护/装饰;汽车养护","汽车销售;东风特约销售;东风销售|汽车维修;东风特约维修;东风维修","生活服务;丧葬设施;丧葬设施|购物服务;购物相关场所;购物相关场所","生活服务;信息咨询中心;信息咨询中心|生活服务","科教文化服务;培训机构;培训机构|政府机构及社会团体","购物服务;专卖店;眼镜店|购物服务","购物服务;专卖店;自行车专卖店|摩托车服务;摩托车维修;摩托车维修","购物服务;家居建材市场;家居建材市场|餐饮服务","餐饮服务;中餐厅;火锅店|体育休闲服务","体育休闲服务;休闲场所;游乐场|餐饮服务","体育休闲服务;休闲场所;采摘园|购物服务","商务住宅;住宅区;住宅小区|商务住宅;楼宇;商住两用楼宇","汽车服务;汽车养护/装饰;汽车养护|餐饮服务","汽车服务;汽车救援;汽车救援|汽车服务","生活服务;丧葬设施;陵园|生活服务","生活服务;事务所;事务所|公司企业","生活服务;婴儿服务场所;婴儿游泳馆|生活服务","生活服务;生活服务场所;生活服务场所|风景名胜","购物服务;专卖店;自行车专卖店|汽车销售;汽车销售;汽车销售","购物服务;商场;普通商场|餐饮服务","金融保险服务;财务公司;财务公司|公司企业","风景名胜;公园广场;城市广场|科教文化服务","风景名胜;风景名胜;国家级景点|风景名胜","餐饮服务;中餐厅;中餐厅|地名地址信息","餐饮服务;中餐厅;中餐厅|汽车服务","餐饮服务;中餐厅;山东菜(鲁菜)|餐饮服务","餐饮服务;冷饮店;冷饮店|餐饮服务;快餐厅;快餐厅","体育休闲服务;娱乐场所;娱乐场所|科教文化服务","公司企业;公司;矿产公司|购物服务","商务住宅;楼宇;商住两用楼宇|住宿服务","政府机构及社会团体;政府机关;区县级政府及事业单位|商务住宅","生活服务;生活服务场所;生活服务场所|交通设施服务","科教文化服务;传媒机构;出版社|公司企业","科教文化服务;学校;幼儿园|公司企业","购物服务;专卖店;珠宝首饰工艺品|体育休闲服务","购物服务;便民商店/便利店;便民商店/便利店|购物服务;专卖店;专营店","金融保险服务;自动提款机;中国银行ATM|金融保险服务","体育休闲服务;体育休闲服务场所;体育休闲服务场所|科教文化服务","公司企业;公司;公司|风景名胜","公司企业;农林牧渔基地;其它农林牧渔基地|餐饮服务","医疗保健服务;急救中心;急救中心|医疗保健服务","商务住宅;楼宇;楼宇相关|餐饮服务","摩托车服务;摩托车销售;摩托车销售|摩托车服务;摩托车维修;摩托车维修","汽车服务;汽车养护/装饰;汽车养护|汽车销售;汽车销售;汽车销售","汽车维修;汽车综合维修;汽车综合维修|汽车服务;汽车养护/装饰;汽车养护","汽车销售;捷豹特约销售;捷豹销售|汽车维修","生活服务;售票处;公园景点售票处|生活服务","生活服务;邮局;邮局|购物服务","购物服务;专卖店;土特产专卖店|公司企业","购物服务;家居建材市场;家具城|公司企业;工厂;工厂","购物服务;特色商业街;特色商业街|商务住宅","购物服务;综合市场;农副产品市场|购物服务;专卖店;专营店","购物服务;购物相关场所;购物相关场所|风景名胜","金融保险服务;银行;农村商业银行|政府机构及社会团体","餐饮服务;中餐厅;特色/地方风味餐厅|住宿服务","交通设施服务;公交车站;普通公交站","公司企业;公司企业;公司企业|商务住宅","公司企业;公司企业;公司企业|政府机构及社会团体","公司企业;公司企业;公司企业|餐饮服务","商务住宅;商务住宅相关;商务住宅相关|餐饮服务","地名地址信息;交通地名;立交桥|地名地址信息;交通地名;桥","政府机构及社会团体;政府及社会团体相关;政府及社会团体相关|公司企业","生活服务;事务所;律师事务所|商务住宅","科教文化服务;学校;高等院校|体育休闲服务","购物服务;专卖店;专营店|生活服务;丧葬设施;丧葬设施","购物服务;体育用品店;户外用品|体育休闲服务","购物服务;家居建材市场;家居建材市场|商务住宅","购物服务;家居建材市场;布艺市场|汽车服务","购物服务;家居建材市场;建材五金市场|体育休闲服务","金融保险服务;保险公司;中国太平洋保险|公司企业","金融保险服务;银行相关;银行相关|政府机构及社会团体","风景名胜;风景名胜;寺庙道观|风景名胜","体育休闲服务;影剧院;剧场|体育休闲服务","公共设施;公共厕所;公共厕所|生活服务","公司企业;知名企业;知名企业|公司企业","商务住宅;住宅区;住宅小区|餐饮服务;中餐厅;中餐厅","地名地址信息;交通地名;桥|地名地址信息;交通地名;立交桥","汽车维修;货车维修;货车维修|生活服务","汽车销售;一汽解放销售;一汽解放销售|汽车维修","科教文化服务;学校;小学|地名地址信息","购物服务;便民商店/便利店;便民商店/便利店|体育休闲服务","购物服务;便民商店/便利店;便民商店/便利店|科教文化服务","购物服务;特色商业街;特色商业街|风景名胜","金融保险服务;自动提款机;东亚银行ATM","风景名胜;风景名胜;纪念馆|风景名胜","餐饮服务;中餐厅;清真菜馆|体育休闲服务","公司企业;公司;广告装饰|购物服务;家居建材市场;家居建材市场","公司企业;公司;机械电子|科教文化服务","医疗保健服务;专科医院;传染病医院|医疗保健服务","商务住宅;产业园区;产业园区|政府机构及社会团体","商务住宅;住宅区;别墅|住宿服务","地名地址信息;普通地名;街道级地名|地名地址信息","摩托车服务;摩托车销售;摩托车销售|生活服务","汽车服务;汽车救援;汽车救援|汽车维修","生活服务;旅行社;旅行社|生活服务","科教文化服务;图书馆;图书馆|科教文化服务","科教文化服务;学校;高等院校|政府机构及社会团体","购物服务;专卖店;专营店|汽车服务;汽车配件销售;汽车配件销售","购物服务;专卖店;儿童用品店|生活服务;生活服务场所;生活服务场所","购物服务;专卖店;自行车专卖店|体育休闲服务","购物服务;服装鞋帽皮具店;品牌鞋店|公司企业","金融保险服务;保险公司;中国平安保险公司|公司企业","风景名胜;公园广场;公园|商务住宅","餐饮服务;中餐厅;四川菜(川菜)|生活服务","公司企业;公司;公司|科教文化服务;科研机构;科研机构","公司企业;农林牧渔基地;其它农林牧渔基地|商务住宅","摩托车服务;摩托车维修;摩托车维修|汽车服务","汽车服务;加油站;加油站|公司企业","汽车销售;克莱斯勒特约销售;道奇销售|汽车维修","生活服务;丧葬设施;丧葬设施|公司企业","生活服务;物流速递;物流速递|政府机构及社会团体","生活服务;生活服务场所;生活服务场所|室内设施","生活服务;生活服务场所;生活服务场所|摩托车服务","生活服务;维修站点;维修站点|购物服务;购物相关场所;购物相关场所","科教文化服务;传媒机构;传媒机构|生活服务;生活服务场所;生活服务场所","购物服务;便民商店/便利店;便民商店/便利店|公司企业;公司;公司","购物服务;商场;普通商场|购物服务;商场;购物中心","购物服务;服装鞋帽皮具店;品牌皮具店|购物服务","购物服务;特色商业街;步行街|购物服务","购物服务;花鸟鱼虫市场;花卉市场|体育休闲服务","购物服务;花鸟鱼虫市场;花卉市场|风景名胜","金融保险服务;保险公司;中国人寿保险公司|金融保险服务","金融保险服务;银行;中国人民银行|金融保险服务","风景名胜;风景名胜;红色景区|科教文化服务","风景名胜;风景名胜;风景名胜|生活服务","风景名胜;风景名胜相关;旅游景点|商务住宅","餐饮服务;中餐厅;中餐厅|餐饮服务;休闲餐饮场所;休闲餐饮场所","餐饮服务;中餐厅;中餐厅|餐饮服务;冷饮店;冷饮店","住宿服务;宾馆酒店;宾馆酒店|科教文化服务","体育休闲服务;休闲场所;游乐场|生活服务","体育休闲服务;娱乐场所;KTV|公司企业","体育休闲服务;娱乐场所;网吧|住宿服务","体育休闲服务;度假疗养场所;度假村|生活服务","体育休闲服务;运动场馆;台球厅|餐饮服务","体育休闲服务;运动场馆;游泳馆|科教文化服务","商务住宅;住宅区;住宅小区|购物服务;购物相关场所;购物相关场所","商务住宅;楼宇;商住两用楼宇|商务住宅;楼宇;商务写字楼","商务住宅;楼宇;楼宇相关|商务住宅","地名地址信息;普通地名;村庄级地名|公司企业","政府机构及社会团体;交通车辆管理;货车相关检查站","政府机构及社会团体;公检法机构;公检法机关|政府机构及社会团体","汽车服务;汽车养护/装饰;汽车养护|汽车维修;汽车综合维修;汽车综合维修","生活服务;事务所;律师事务所|生活服务","购物服务;专卖店;宠物用品店|公司企业","购物服务;专卖店;烟酒专卖店|餐饮服务;餐饮相关场所;餐饮相关","购物服务;专卖店;自行车专卖店|汽车服务;汽车服务相关;汽车服务相关","购物服务;家居建材市场;家具城|科教文化服务","购物服务;家居建材市场;布艺市场|商务住宅","购物服务;家居建材市场;建材五金市场|公司企业;公司;机械电子","购物服务;家电电子卖场;苏宁|生活服务","购物服务;花鸟鱼虫市场;花卉市场|科教文化服务","风景名胜;风景名胜;寺庙道观|地名地址信息","餐饮服务;糕饼店;糕饼店|餐饮服务;中餐厅;中餐厅","餐饮服务;餐饮相关场所;餐饮相关|商务住宅","交通设施服务;停车场;停车场入口|交通设施服务","体育休闲服务;休闲场所;采摘园|风景名胜","体育休闲服务;运动场馆;健身中心|公司企业","商务住宅;楼宇;商务写字楼|公司企业;公司;公司","地名地址信息;普通地名;省级地名","地名地址信息;自然地名;海湾海峡|地名地址信息","地名地址信息;自然地名;盆地","政府机构及社会团体;交通车辆管理;验车场|生活服务","政府机构及社会团体;政府及社会团体相关;政府及社会团体相关|购物服务","汽车服务;加气站;加气站|汽车服务","汽车销售;中国重汽销售;中国重汽销售|汽车服务","汽车销售;法拉利特约销售;玛莎拉蒂销售|汽车维修","生活服务;事务所;专利事务所|公司企业","生活服务;邮局;邮局|生活服务","科教文化服务;传媒机构;报社|生活服务","购物服务;专卖店;专营店|生活服务;美容美发店;美容美发店","购物服务;专卖店;儿童用品店|商务住宅","购物服务;体育用品店;户外用品|生活服务","购物服务;商场;普通商场|购物服务;超级市场;超市","购物服务;家居建材市场;家居建材市场|公司企业;公司;公司","购物服务;服装鞋帽皮具店;服装鞋帽皮具店|汽车销售","购物服务;购物相关场所;购物相关场所|住宿服务","餐饮服务;中餐厅;上海菜|餐饮服务","餐饮服务;外国餐厅;泰国/越南菜品餐厅|餐饮服务","交通设施服务;上下客区;网约车","体育休闲服务;休闲场所;垂钓园|购物服务","体育休闲服务;运动场馆;篮球场馆|科教文化服务","公司企业;公司;商业贸易|购物服务;专卖店;专营店","商务住宅;住宅区;住宅小区|地名地址信息;普通地名;村庄级地名","摩托车服务;摩托车服务相关;摩托车服务相关|生活服务","摩托车服务;摩托车销售;摩托车销售|汽车服务","政府机构及社会团体;社会团体;行业协会|购物服务","汽车服务;二手车交易;二手车交易|公司企业","汽车服务;洗车场;洗车场|购物服务","生活服务;丧葬设施;丧葬设施|风景名胜","生活服务;物流速递;物流速递|汽车维修","生活服务;电讯营业厅;中国铁通营业厅|公司企业","生活服务;美容美发店;美容美发店|餐饮服务;餐饮相关场所;餐饮相关","科教文化服务;科研机构;科研机构|购物服务","购物服务;专卖店;烟酒专卖店|商务住宅","购物服务;体育用品店;户外用品|公司企业","购物服务;超级市场;超市|生活服务;生活服务场所;生活服务场所","风景名胜;公园广场;水族馆|体育休闲服务","餐饮服务;中餐厅;中餐厅|公司企业;公司;公司","体育休闲服务;运动场馆;台球厅|生活服务","体育休闲服务;运动场馆;运动场所|生活服务","公司企业;工厂;工厂|购物服务;购物相关场所;购物相关场所","摩托车服务;摩托车维修;摩托车维修|摩托车服务;摩托车销售;摩托车销售","政府机构及社会团体;社会团体;社会团体相关|商务住宅","汽车服务;汽车俱乐部;汽车俱乐部|汽车维修","汽车维修;克莱斯勒特约维修;吉普维修|汽车销售","汽车维修;汽车维修;汽车维修|公司企业","汽车维修;海马汽车维修;海马汽车维修|汽车销售","汽车维修;福特特约维修;马自达维修|汽车销售","汽车销售;大众特约销售;上海大众销售|汽车销售","汽车销售;日产特约销售;东风日产销售|汽车销售","汽车销售;本田特约销售;本田讴歌销售|汽车维修","生活服务;彩票彩券销售点;彩票彩券销售点|政府机构及社会团体","生活服务;电讯营业厅;中国移动营业厅|公司企业;公司;电信公司","科教文化服务;科教文化场所;科教文化场所|体育休闲服务","购物服务;专卖店;烟酒专卖店|地名地址信息","购物服务;专卖店;烟酒专卖店|汽车服务","购物服务;家电电子卖场;数码电子|公司企业;公司;网络科技","购物服务;综合市场;果品市场|政府机构及社会团体","购物服务;花鸟鱼虫市场;宠物市场|公司企业","餐饮服务;中餐厅;中餐厅|住宿服务;住宿服务相关;住宿服务相关","餐饮服务;中餐厅;清真菜馆|住宿服务","餐饮服务;糕饼店;糕饼店|餐饮服务;甜品店;甜品店","交通设施服务;停车场;公共停车场|生活服务","体育休闲服务;体育休闲服务场所;体育休闲服务场所|商务住宅","体育休闲服务;运动场馆;运动场所|体育休闲服务","公司企业;公司;广告装饰|购物服务;购物相关场所;购物相关场所","公司企业;公司;建筑公司|金融保险服务","公司企业;公司;电信公司|政府机构及社会团体","公司企业;公司;电信公司|购物服务;家电电子卖场;手机销售","商务住宅;产业园区;产业园区|风景名胜","商务住宅;住宅区;住宅区|公司企业","政府机构及社会团体;社会团体;行业协会|体育休闲服务","汽车维修;丰田特约维修;一汽丰田维修|汽车销售","汽车维修;奥迪特约维修;一汽-大众奥迪维修|汽车销售","汽车维修;斯巴鲁特约维修;斯巴鲁维修|汽车销售","汽车销售;东风货车销售;东风货车销售|汽车维修","汽车销售;大众特约销售;大众销售|汽车维修","生活服务;洗浴推拿场所;洗浴推拿场所|科教文化服务","生活服务;洗浴推拿场所;洗浴推拿场所|风景名胜","生活服务;物流速递;物流速递|交通设施服务","生活服务;生活服务场所;生活服务场所|餐饮服务;餐饮相关场所;餐饮相关","生活服务;维修站点;维修站点|汽车销售","科教文化服务;学校;学校|生活服务","科教文化服务;文艺团体;文艺团体|生活服务","购物服务;体育用品店;体育用品店|生活服务","购物服务;商场;普通商场|体育休闲服务","购物服务;家电电子卖场;家电电子卖场|公司企业;公司;公司","购物服务;综合市场;水产海鲜市场|餐饮服务;餐饮相关场所;餐饮相关","购物服务;超级市场;超市|汽车服务","风景名胜;风景名胜;风景名胜|餐饮服务","餐饮服务;茶艺馆;茶艺馆|科教文化服务","交通设施服务;出租车;出租车","体育休闲服务;休闲场所;水上活动中心|体育休闲服务","体育休闲服务;娱乐场所;棋牌室|餐饮服务;茶艺馆;茶艺馆","体育休闲服务;运动场馆;健身中心|餐饮服务","公司企业;公司;广告装饰|商务住宅","商务住宅;商务住宅相关;商务住宅相关|风景名胜","商务住宅;楼宇;楼宇相关|购物服务","地名地址信息;交通地名;道路名|生活服务","政府机构及社会团体;交通车辆管理;交通车辆管理相关|生活服务","政府机构及社会团体;政府及社会团体相关;政府及社会团体相关|科教文化服务","生活服务;信息咨询中心;服务中心|生活服务","生活服务;电力营业厅;电力营业厅|生活服务","生活服务;美容美发店;美容美发店|购物服务;专卖店;专营店","科教文化服务;学校;成人教育|政府机构及社会团体","科教文化服务;学校;职业技术学校|科教文化服务;培训机构;培训机构","科教文化服务;科教文化场所;科教文化场所|商务住宅","购物服务;专卖店;古玩字画店|商务住宅","购物服务;商场;购物中心|生活服务","餐饮服务;中餐厅;清真菜馆|公司企业","餐饮服务;中餐厅;清真菜馆|商务住宅","餐饮服务;冷饮店;冷饮店|餐饮服务;糕饼店;糕饼店","餐饮服务;糕饼店;糕饼店|商务住宅","交通设施服务;港口码头;港口码头|风景名胜","体育休闲服务;休闲场所;休闲场所|住宿服务;住宿服务相关;住宿服务相关","公司企业;公司;机械电子|购物服务;家居建材市场;建材五金市场","商务住宅;楼宇;楼宇相关|住宿服务","地名地址信息;交通地名;桥|风景名胜","政府机构及社会团体;交通车辆管理;车辆管理机构|生活服务","政府机构及社会团体;公检法机构;检察院|政府机构及社会团体","政府机构及社会团体;工商税务机构;工商税务机构|政府机构及社会团体","政府机构及社会团体;社会团体;消费者协会|政府机构及社会团体","汽车服务;汽车服务相关;汽车服务相关|摩托车服务","汽车维修;长城汽车维修;魏派汽车维修|汽车销售","汽车销售;货车销售;货车销售|公司企业","汽车销售;货车销售;货车销售|购物服务","汽车销售;通用特约销售;别克销售|汽车维修;通用特约维修;别克维修","生活服务;物流速递;物流速递|购物服务;购物相关场所;购物相关场所","科教文化服务;文化宫;文化宫|生活服务","购物服务;专卖店;专营店|住宿服务","购物服务;专卖店;专营店|购物服务;便民商店/便利店;便民商店/便利店","购物服务;专卖店;儿童用品店|生活服务;美容美发店;美容美发店","购物服务;专卖店;烟酒专卖店|科教文化服务","购物服务;便民商店/便利店;便民商店/便利店|风景名胜","购物服务;商场;普通商场|购物服务;便民商店/便利店;便民商店/便利店","购物服务;家居建材市场;家具建材综合市场|生活服务","购物服务;家电电子卖场;数码电子|商务住宅","购物服务;文化用品店;文化用品店|生活服务;生活服务场所;生活服务场所","购物服务;综合市场;综合市场|餐饮服务","购物服务;超级市场;上海华联|购物服务","金融保险服务;保险公司;保险公司|生活服务","金融保险服务;银行;农村商业银行|金融保险服务;银行相关;银行相关","金融保险服务;银行相关;银行相关|金融保险服务","风景名胜;公园广场;植物园|风景名胜","风景名胜;风景名胜;寺庙道观|购物服务","风景名胜;风景名胜;风景名胜|政府机构及社会团体","风景名胜;风景名胜相关;旅游景点|科教文化服务","餐饮服务;中餐厅;浙江菜|住宿服务","餐饮服务;冷饮店;冷饮店|公司企业","餐饮服务;茶艺馆;茶艺馆|公司企业","交通设施服务;机场相关;直升机场","住宿服务;宾馆酒店;宾馆酒店|餐饮服务;餐饮相关场所;餐饮相关","体育休闲服务;娱乐场所;KTV|购物服务;购物相关场所;购物相关场所","体育休闲服务;娱乐场所;棋牌室|商务住宅","体育休闲服务;度假疗养场所;疗养院|住宿服务","公司企业;公司;公司|公司企业;农林牧渔基地;其它农林牧渔基地","公司企业;公司;公司|餐饮服务;餐饮相关场所;餐饮相关","公司企业;公司;冶金化工|科教文化服务","公司企业;公司;网络科技|商务住宅","公司企业;工厂;工厂|汽车维修","商务住宅;楼宇;商住两用楼宇|生活服务","政府机构及社会团体;工商税务机构;工商税务机构|生活服务","汽车服务;加气站;加气站|公司企业","汽车服务;汽车租赁;汽车租赁|购物服务","汽车维修;奥迪特约维修;上汽-大众奥迪维修|汽车销售","汽车销售;丰田特约销售;丰田销售|汽车维修","生活服务;洗浴推拿场所;洗浴推拿场所|汽车服务","科教文化服务;传媒机构;电视台|公司企业","科教文化服务;学校;小学|公司企业","科教文化服务;科教文化场所;科教文化场所|政府机构及社会团体","购物服务;专卖店;书店|体育休闲服务","购物服务;专卖店;珠宝首饰工艺品|公司企业;公司;公司","购物服务;专卖店;音像店|生活服务","购物服务;商场;免税品店|生活服务","购物服务;商场;商场|商务住宅","购物服务;商场;购物中心|公司企业","购物服务;家居建材市场;家具城|生活服务;生活服务场所;生活服务场所","购物服务;服装鞋帽皮具店;服装鞋帽皮具店|风景名胜","购物服务;超级市场;超市|住宿服务","风景名胜;风景名胜;寺庙道观|生活服务","餐饮服务;中餐厅;海鲜酒楼|生活服务","交通设施服务;停车场;专用停车场|交通设施服务;停车场;路边停车场","体育休闲服务;休闲场所;露营地|住宿服务","体育休闲服务;运动场馆;综合体育馆|购物服务","公司企业;公司;公司|汽车服务;汽车配件销售;汽车配件销售","公司企业;公司;机械电子|汽车服务;汽车服务相关;汽车服务相关","公司企业;农林牧渔基地;花卉苗圃基地|购物服务","公司企业;工厂;工厂|购物服务;专卖店;专营店","商务住宅;楼宇;工业大厦建筑物|商务住宅","地名地址信息;普通地名;村庄级地名|科教文化服务","摩托车服务;摩托车销售;摩托车销售|购物服务;购物相关场所;购物相关场所","政府机构及社会团体;公检法机构;社会治安机构|购物服务","政府机构及社会团体;政府机关;区县级政府及事业单位|体育休闲服务","汽车服务;汽车配件销售;汽车配件销售|购物服务;专卖店;专营店","汽车销售;奇瑞特约销售;奇瑞销售|汽车维修;奇瑞特约维修;奇瑞维修","汽车销售;汽车销售;汽车销售|购物服务;购物相关场所;购物相关场所","生活服务;人才市场;人才市场|购物服务","生活服务;物流速递;物流仓储场地|公司企业;公司;公司","生活服务;维修站点;维修站点|餐饮服务","科教文化服务;博物馆;博物馆|科教文化服务","科教文化服务;培训机构;培训机构|风景名胜","科教文化服务;学校;幼儿园|科教文化服务;培训机构;培训机构","购物服务;专卖店;古玩字画店|生活服务;生活服务场所;生活服务场所","购物服务;专卖店;古玩字画店|科教文化服务;培训机构;培训机构","购物服务;专卖店;珠宝首饰工艺品|风景名胜","购物服务;专卖店;礼品饰品店|体育休闲服务","购物服务;个人用品/化妆品店;莎莎|生活服务","购物服务;家居建材市场;建材五金市场|摩托车服务","购物服务;家居建材市场;灯具瓷器市场|公司企业;公司;公司","购物服务;家电电子卖场;手机销售|购物服务;家电电子卖场;数码电子","购物服务;家电电子卖场;手机销售|餐饮服务","购物服务;家电电子卖场;数码电子|餐饮服务","购物服务;服装鞋帽皮具店;服装鞋帽皮具店|公司企业;公司企业;公司企业","购物服务;综合市场;农副产品市场|体育休闲服务","购物服务;花鸟鱼虫市场;花卉市场|政府机构及社会团体","餐饮服务;中餐厅;江苏菜|餐饮服务","餐饮服务;外国餐厅;西餐厅(综合风味)|生活服务","住宿服务;宾馆酒店;三星级宾馆|生活服务","住宿服务;旅馆招待所;旅馆招待所|公司企业","体育休闲服务;娱乐场所;酒吧|餐饮服务;餐饮相关场所;餐饮相关","公司企业;公司;公司|购物服务;便民商店/便利店;便民商店/便利店","公司企业;公司;冶金化工|汽车服务","公司企业;公司;机械电子|购物服务;购物相关场所;购物相关场所","公司企业;公司;电信公司|公司企业","商务住宅;商务住宅相关;商务住宅相关|公司企业","商务住宅;楼宇;楼宇相关|风景名胜","汽车服务;充电站;充电站|生活服务","汽车服务;汽车养护/装饰;汽车养护|购物服务;购物相关场所;购物相关场所","汽车维修;吉利特约维修;沃尔沃汽车维修|汽车销售","汽车销售;东风货车销售;东风货车销售|汽车销售","汽车销售;捷豹特约销售;捷豹销售|汽车销售","生活服务;婴儿服务场所;婴儿游泳馆|购物服务;专卖店;儿童用品店","生活服务;洗浴推拿场所;洗浴推拿场所|餐饮服务;餐饮相关场所;餐饮相关","生活服务;电讯营业厅;电讯营业厅|生活服务","科教文化服务;传媒机构;电台|科教文化服务","科教文化服务;学校;职业技术学校|公司企业","科教文化服务;展览馆;展览馆|生活服务","科教文化服务;美术馆;美术馆|生活服务","购物服务;专卖店;专营店|公司企业;工厂;工厂","购物服务;专卖店;儿童用品店|公司企业;公司;公司","购物服务;专卖店;儿童用品店|餐饮服务;餐饮相关场所;餐饮相关","购物服务;专卖店;宠物用品店|体育休闲服务","购物服务;个人用品/化妆品店;其它个人用品店|汽车服务","购物服务;体育用品店;体育用品店|科教文化服务","购物服务;体育用品店;耐克专卖店|购物服务","购物服务;便民商店/便利店;便民商店/便利店|摩托车服务","购物服务;商场;商场|生活服务","购物服务;家居建材市场;厨卫市场|生活服务;生活服务场所;生活服务场所","购物服务;家居建材市场;建材五金市场|风景名胜","购物服务;综合市场;果品市场|餐饮服务;冷饮店;冷饮店","购物服务;综合市场;蔬菜市场|政府机构及社会团体","购物服务;花鸟鱼虫市场;花卉市场|住宿服务","金融保险服务;自动提款机;农村商业银行ATM|生活服务","金融保险服务;银行;中国建设银行|生活服务","风景名胜;风景名胜;风景名胜|公司企业","餐饮服务;中餐厅;中餐厅|商务住宅;商务住宅相关;商务住宅相关","餐饮服务;中餐厅;台湾菜|餐饮服务","餐饮服务;中餐厅;湖北菜(鄂菜)|餐饮服务","餐饮服务;休闲餐饮场所;休闲餐饮场所|餐饮服务;中餐厅;中餐厅","餐饮服务;外国餐厅;韩国料理|生活服务","交通设施服务;港口码头;出港","交通设施服务;索道站;索道站","住宿服务;宾馆酒店;四星级宾馆|商务住宅","体育休闲服务;运动场馆;溜冰场|购物服务","体育休闲服务;运动场馆;综合体育馆|科教文化服务","公司企业;公司;广告装饰|科教文化服务;传媒机构;传媒机构","公司企业;公司;网络科技|购物服务;家电电子卖场;数码电子","公司企业;公司;网络科技|金融保险服务","公司企业;公司;网络科技|餐饮服务","公司企业;农林牧渔基地;其它农林牧渔基地|公司企业;公司;公司","医疗保健服务;诊所;诊所|医疗保健服务;专科医院;专科医院","商务住宅;住宅区;住宅区|体育休闲服务","政府机构及社会团体;公检法机构;公检法机关|生活服务","汽车维修;汽车维修;汽车维修|生活服务;生活服务场所;生活服务场所","汽车维修;通用特约维修;凯迪拉克维修|汽车销售","汽车销售;东风特约销售;东风销售|购物服务","汽车销售;奥迪特约销售;上汽-大众奥迪销售|汽车维修","汽车销售;标致雪铁龙特约销售;东风雪铁龙销售|汽车销售","汽车销售;江淮货车销售;江淮货车销售|汽车维修","汽车销售;观致销售;观致销售|汽车维修","生活服务;丧葬设施;陵园|风景名胜;风景名胜;风景名胜","生活服务;中介机构;中介机构|科教文化服务","生活服务;售票处;售票处|生活服务","生活服务;美容美发店;美容美发店|住宿服务","科教文化服务;传媒机构;传媒机构|公司企业;公司;公司","科教文化服务;传媒机构;电视台|政府机构及社会团体","科教文化服务;学校;中学|公司企业","购物服务;专卖店;烟酒专卖店|风景名胜","购物服务;家电电子卖场;手机销售|生活服务;电讯营业厅;电讯营业厅","购物服务;服装鞋帽皮具店;品牌皮具店|生活服务","购物服务;综合市场;旧货市场|汽车服务","购物服务;超级市场;屈臣氏|购物服务","金融保险服务;银行;中国工商银行|生活服务","餐饮服务;中餐厅;特色/地方风味餐厅|地名地址信息","餐饮服务;茶艺馆;茶艺馆|风景名胜","住宿服务;宾馆酒店;四星级宾馆|体育休闲服务","体育休闲服务;休闲场所;水上活动中心|生活服务","体育休闲服务;运动场馆;羽毛球场|体育休闲服务","公司企业;公司;公司|购物服务;家居建材市场;家居建材市场","公司企业;公司;商业贸易|商务住宅","公司企业;公司企业;公司企业|汽车维修","公司企业;农林牧渔基地;其它农林牧渔基地|科教文化服务","医疗保健服务;综合医院;综合医院|医疗保健服务;诊所;诊所","商务住宅;住宅区;宿舍|政府机构及社会团体","商务住宅;楼宇;商务写字楼|体育休闲服务","政府机构及社会团体;公检法机构;消防机关|公司企业","政府机构及社会团体;政府机关;国家级机关及事业单位|政府机构及社会团体","汽车服务;汽车配件销售;汽车配件销售|公司企业;公司;公司","汽车销售;宝马特约销售;宝马销售|汽车维修;宝马特约维修;宝马维修","科教文化服务;学校;中学|政府机构及社会团体","购物服务;专卖店;古玩字画店|科教文化服务;科教文化场所;科教文化场所","购物服务;家居建材市场;建材五金市场|金融保险服务","购物服务;家电电子卖场;手机销售|政府机构及社会团体","购物服务;家电电子卖场;苏宁|购物服务","购物服务;综合市场;农副产品市场|汽车服务","购物服务;综合市场;果品市场|商务住宅","购物服务;花鸟鱼虫市场;宠物市场|生活服务","金融保险服务;保险公司;保险公司|购物服务","风景名胜;风景名胜;风景名胜|商务住宅","餐饮服务;中餐厅;中式素菜馆|餐饮服务","餐饮服务;中餐厅;四川菜(川菜)|住宿服务","餐饮服务;中餐厅;广东菜(粤菜)|体育休闲服务","餐饮服务;中餐厅;湖南菜(湘菜)|住宿服务","餐饮服务;中餐厅;特色/地方风味餐厅|餐饮服务;中餐厅;海鲜酒楼","餐饮服务;中餐厅;综合酒楼|餐饮服务;茶艺馆;茶艺馆","餐饮服务;外国餐厅;外国餐厅|餐饮服务","餐饮服务;外国餐厅;西餐厅(综合风味)|餐饮服务;外国餐厅;牛扒店(扒房)","住宿服务;宾馆酒店;三星级宾馆|商务住宅","体育休闲服务;休闲场所;休闲场所|餐饮服务;餐饮相关场所;餐饮相关","体育休闲服务;娱乐场所;娱乐场所|公司企业","体育休闲服务;娱乐场所;娱乐场所|商务住宅","体育休闲服务;娱乐场所;棋牌室|住宿服务","体育休闲服务;运动场馆;游泳馆|购物服务","公司企业;公司;公司|商务住宅;产业园区;产业园区","公司企业;公司;公司|科教文化服务;传媒机构;传媒机构","公司企业;公司;公司|购物服务;体育用品店;体育用品店","商务住宅;住宅区;宿舍|生活服务","商务住宅;楼宇;商务写字楼|商务住宅;产业园区;产业园区","政府机构及社会团体;交通车辆管理;交通管理机构|汽车服务","政府机构及社会团体;交通车辆管理;验车场|摩托车服务","政府机构及社会团体;政府机关;乡镇级政府及事业单位|金融保险服务","政府机构及社会团体;社会团体;慈善机构|体育休闲服务","汽车服务;汽车服务相关;汽车服务相关|餐饮服务","汽车服务;洗车场;洗车场|汽车销售","汽车维修;宝马特约维修;宝马维修|汽车销售","汽车维修;雷诺特约维修;雷诺维修|汽车销售","生活服务;洗浴推拿场所;洗浴推拿场所|住宿服务;宾馆酒店;宾馆酒店","生活服务;生活服务场所;生活服务场所|汽车维修;汽车维修;汽车维修","生活服务;电讯营业厅;电讯营业厅|公司企业","生活服务;邮局;邮局|政府机构及社会团体","科教文化服务;会展中心;会展中心|科教文化服务","科教文化服务;学校;小学|购物服务","购物服务;体育用品店;体育用品店|公司企业;公司;公司","购物服务;商场;免税品店|公司企业","购物服务;家电电子卖场;数码电子|生活服务;摄影冲印店;摄影冲印","购物服务;家电电子卖场;数码电子|金融保险服务","购物服务;特色商业街;特色商业街|公司企业","购物服务;综合市场;水产海鲜市场|公司企业;公司;公司","购物服务;超级市场;超市|政府机构及社会团体","金融保险服务;自动提款机;自动提款机|生活服务","金融保险服务;金融保险服务机构;金融保险机构|商务住宅","金融保险服务;银行;中国民生银行|金融保险服务","餐饮服务;中餐厅;四川菜(川菜)|体育休闲服务","餐饮服务;中餐厅;江苏菜|住宿服务","餐饮服务;冷饮店;冷饮店|餐饮服务;甜品店;甜品店","餐饮服务;咖啡厅;咖啡厅|公司企业","餐饮服务;快餐厅;快餐厅|住宿服务","餐饮服务;甜品店;甜品店|餐饮服务;糕饼店;糕饼店","交通设施服务;机场相关;机场货运处","住宿服务;住宿服务相关;住宿服务相关|风景名胜","住宿服务;宾馆酒店;三星级宾馆|体育休闲服务","公司企业;公司;医药公司|科教文化服务","商务住宅;商务住宅相关;商务住宅相关|科教文化服务","政府机构及社会团体;交通车辆管理;车辆通行证办理处","政府机构及社会团体;公检法机构;法院|生活服务","政府机构及社会团体;工商税务机构;国税机关|政府机构及社会团体","政府机构及社会团体;工商税务机构;地税机关|政府机构及社会团体","汽车销售;东风特约销售;东风销售|汽车销售","汽车销售;中国重汽销售;中国重汽销售|汽车维修","汽车销售;大众特约销售;一汽-大众销售|汽车销售","汽车销售;起亚特约销售;起亚销售|汽车维修","生活服务;摄影冲印店;摄影冲印|商务住宅","生活服务;美容美发店;美容美发店|汽车维修","科教文化服务;学校;学校|商务住宅","科教文化服务;学校;成人教育|生活服务","购物服务;专卖店;儿童用品店|科教文化服务;培训机构;培训机构","购物服务;专卖店;儿童用品店|购物服务;体育用品店;体育用品店","购物服务;专卖店;钟表店|公司企业","购物服务;家居建材市场;建材五金市场|购物服务;家居建材市场;厨卫市场","购物服务;家电电子卖场;手机销售|汽车服务","购物服务;服装鞋帽皮具店;品牌鞋店|餐饮服务","购物服务;服装鞋帽皮具店;服装鞋帽皮具店|餐饮服务;糕饼店;糕饼店","购物服务;花鸟鱼虫市场;花卉市场|公司企业;公司;公司","金融保险服务;自动提款机;南洋商业银行ATM","金融保险服务;银行相关;银行相关|生活服务","餐饮服务;中餐厅;中餐厅|住宿服务;旅馆招待所;旅馆招待所","餐饮服务;中餐厅;中餐厅|金融保险服务","餐饮服务;外国餐厅;日本料理|生活服务","餐饮服务;餐饮相关场所;餐饮相关|生活服务;生活服务场所;生活服务场所","交通设施服务;停车场;路边停车场|交通设施服务;停车场;公共停车场","交通设施服务;火车站;售票|生活服务","体育休闲服务;娱乐场所;酒吧|公司企业","体育休闲服务;影剧院;剧场|公司企业","体育休闲服务;运动场馆;跆拳道场馆|科教文化服务;培训机构;培训机构","体育休闲服务;运动场馆;运动场所|地名地址信息","公司企业;公司;建筑公司|餐饮服务","医疗保健服务;专科医院;胸科医院|医疗保健服务","商务住宅;住宅区;住宅区|商务住宅","商务住宅;住宅区;住宅小区|公司企业;公司;公司","摩托车服务;摩托车维修;摩托车维修|生活服务;生活服务场所;生活服务场所","政府机构及社会团体;政府机关;国家级机关及事业单位|公司企业","政府机构及社会团体;政府机关;政府机关相关|体育休闲服务","政府机构及社会团体;社会团体;共青团|政府机构及社会团体","汽车服务;二手车交易;二手车交易|摩托车服务","汽车服务;汽车俱乐部;汽车俱乐部|汽车销售","汽车服务;汽车租赁;汽车租赁|汽车维修","汽车服务;汽车配件销售;汽车配件销售|餐饮服务","汽车维修;一汽解放维修;一汽解放维修|汽车服务","汽车维修;东风特约维修;东风维修|汽车维修","汽车销售;一汽解放销售;一汽解放销售|汽车服务","汽车销售;东风特约销售;东风销售|汽车服务","汽车销售;江淮销售;江淮销售|汽车销售","汽车销售;荣威销售;荣威销售|汽车维修;荣威维修;荣威维修","生活服务;丧葬设施;丧葬设施|餐饮服务","生活服务;事务所;会计师事务所|政府机构及社会团体","生活服务;人才市场;人才市场|公司企业;公司;公司","科教文化服务;培训机构;培训机构|住宿服务","科教文化服务;科研机构;科研机构|商务住宅","购物服务;专卖店;珠宝首饰工艺品|金融保险服务","购物服务;便民商店/便利店;便民商店/便利店|汽车销售","购物服务;家电电子卖场;家电电子卖场|摩托车服务","购物服务;服装鞋帽皮具店;品牌箱包店|购物服务","购物服务;综合市场;旧货市场|公司企业","餐饮服务;中餐厅;湖南菜(湘菜)|生活服务","餐饮服务;中餐厅;老字号|餐饮服务","餐饮服务;冷饮店;冷饮店|体育休闲服务","餐饮服务;冷饮店;冷饮店|餐饮服务;休闲餐饮场所;休闲餐饮场所","餐饮服务;快餐厅;茶餐厅|体育休闲服务","住宿服务;旅馆招待所;旅馆招待所|风景名胜","体育休闲服务;休闲场所;垂钓园|餐饮服务","体育休闲服务;度假疗养场所;度假村|体育休闲服务;休闲场所;休闲场所","体育休闲服务;运动场馆;健身中心|科教文化服务;培训机构;培训机构","体育休闲服务;运动场馆;篮球场馆|体育休闲服务","体育休闲服务;高尔夫相关;高尔夫练习场|体育休闲服务","公司企业;公司;公司|商务住宅;商务住宅相关;商务住宅相关","公司企业;公司;机械电子|餐饮服务","医疗保健服务;动物医疗场所;动物医疗场所|医疗保健服务","商务住宅;产业园区;产业园区|体育休闲服务","商务住宅;产业园区;产业园区|汽车销售","商务住宅;楼宇;商务写字楼|政府机构及社会团体;政府机关;政府机关相关","地名地址信息;交通地名;道路名|购物服务;特色商业街;特色商业街","地名地址信息;自然地名;湖泊|风景名胜","政府机构及社会团体;交通车辆管理;交通管理机构|交通设施服务","政府机构及社会团体;公检法机构;公证鉴定机构|公司企业;公司;公司","汽车服务;汽车俱乐部;汽车俱乐部|体育休闲服务","汽车维修;大众特约维修;进口大众维修|汽车销售","汽车销售;货车销售;货车销售|生活服务","生活服务;丧葬设施;丧葬设施|购物服务;专卖店;专营店","生活服务;信息咨询中心;信息咨询中心|金融保险服务","生活服务;洗衣店;洗衣店|汽车服务","生活服务;物流速递;物流速递|金融保险服务","生活服务;电讯营业厅;中国联通营业厅|公司企业;公司;电信公司","科教文化服务;培训机构;培训机构|公司企业;公司;公司","科教文化服务;美术馆;美术馆|购物服务","购物服务;专卖店;自行车专卖店|汽车服务;二手车交易;二手车交易","购物服务;家居建材市场;灯具瓷器市场|汽车服务","购物服务;特殊买卖场所;典当行|金融保险服务","购物服务;特殊买卖场所;特殊买卖场所|公司企业","购物服务;特色商业街;步行街|地名地址信息;交通地名;道路名","金融保险服务;自动提款机;招商银行ATM|金融保险服务","金融保险服务;银行;中国光大银行|金融保险服务","金融保险服务;银行;交通银行|金融保险服务","风景名胜;公园广场;公园|科教文化服务","风景名胜;公园广场;公园|风景名胜;风景名胜;风景名胜","餐饮服务;中餐厅;四川菜(川菜)|餐饮服务;中餐厅;特色/地方风味餐厅","餐饮服务;中餐厅;山东菜(鲁菜)|住宿服务","餐饮服务;中餐厅;海鲜酒楼|商务住宅","餐饮服务;中餐厅;海鲜酒楼|餐饮服务;中餐厅;综合酒楼","餐饮服务;休闲餐饮场所;休闲餐饮场所|生活服务","餐饮服务;快餐厅;快餐厅|体育休闲服务","餐饮服务;甜品店;甜品店|餐饮服务;冷饮店;冷饮店","餐饮服务;糕饼店;糕饼店|购物服务;专卖店;专营店","交通设施服务;过境口岸;旅检楼","住宿服务;宾馆酒店;宾馆酒店|商务住宅;商务住宅相关;商务住宅相关","住宿服务;宾馆酒店;经济型连锁酒店|生活服务","体育休闲服务;休闲场所;休闲场所|体育休闲服务;娱乐场所;娱乐场所","体育休闲服务;娱乐场所;KTV|生活服务;洗浴推拿场所;洗浴推拿场所","体育休闲服务;度假疗养场所;疗养院|购物服务","公司企业;农林牧渔基地;农场|体育休闲服务","商务住宅;住宅区;别墅|体育休闲服务","商务住宅;住宅区;社区中心|生活服务;生活服务场所;生活服务场所","商务住宅;楼宇;商住两用楼宇|餐饮服务","地名地址信息;自然地名;湖泊|地名地址信息;自然地名;河流","政府机构及社会团体;交通车辆管理;交通管理机构|科教文化服务","汽车服务;汽车租赁;汽车租赁还车|生活服务","汽车维修;汽车综合维修;汽车综合维修|汽车销售;汽车销售;汽车销售","汽车销售;中国重汽销售;中国重汽销售|汽车销售","生活服务;彩票彩券销售点;彩票彩券销售点|生活服务","生活服务;摄影冲印店;摄影冲印|住宿服务","生活服务;摄影冲印店;摄影冲印|购物服务;购物相关场所;购物相关场所","生活服务;生活服务场所;生活服务场所|公共设施","科教文化服务;传媒机构;报社|科教文化服务","科教文化服务;学校;学校|政府机构及社会团体","购物服务;专卖店;专营店|汽车维修;汽车维修;汽车维修","购物服务;专卖店;专营店|购物服务;服装鞋帽皮具店;服装鞋帽皮具店","购物服务;专卖店;专营店|金融保险服务","购物服务;专卖店;宠物用品店|科教文化服务","购物服务;体育用品店;户外用品|摩托车服务","购物服务;商场;商场|公司企业","购物服务;商场;普通商场|科教文化服务","购物服务;商场;普通商场|购物服务;服装鞋帽皮具店;服装鞋帽皮具店","购物服务;家居建材市场;厨卫市场|购物服务;家电电子卖场;家电电子卖场","购物服务;家居建材市场;家居建材市场|汽车维修","购物服务;家居建材市场;家居建材市场|购物服务;专卖店;专营店","购物服务;家居建材市场;建材五金市场|住宿服务","购物服务;家居建材市场;建材五金市场|汽车销售","购物服务;特殊买卖场所;特殊买卖场所|汽车服务","购物服务;特色商业街;步行街|生活服务","金融保险服务;银行;中国农业银行|生活服务","风景名胜;公园广场;水族馆|风景名胜","风景名胜;风景名胜;国家级景点|体育休闲服务","风景名胜;风景名胜;纪念馆|生活服务","风景名胜;风景名胜;风景名胜|风景名胜","餐饮服务;中餐厅;中餐厅|交通设施服务","餐饮服务;中餐厅;中餐厅|汽车维修","餐饮服务;中餐厅;安徽菜(徽菜)|住宿服务","餐饮服务;中餐厅;火锅店|餐饮服务;中餐厅;海鲜酒楼","餐饮服务;中餐厅;特色/地方风味餐厅|商务住宅","餐饮服务;中餐厅;特色/地方风味餐厅|餐饮服务;中餐厅;四川菜(川菜)","餐饮服务;外国餐厅;牛扒店(扒房)|餐饮服务;外国餐厅;西餐厅(综合风味)"] + public static def TYPES = ["鍑哄叆鍙�;闂�","缇庨","浜ら�氳鏂�;鍋滆溅鍦�","浜ら�氳鏂�;璺晶鍋滆溅浣�","鐢熸椿鏈嶅姟;褰╃エ閿�鍞偣","鐢熸椿鏈嶅姟;鍏敤浜嬩笟","鍑哄叆鍙�;鍋滆溅鍦哄嚭鍏ュ彛","鍑哄叆鍙�","鐢熸椿鏈嶅姟;娈¤懍鏈嶅姟","浜ら�氳鏂�;鍏呯數绔�","鍑哄叆鍙�;鍏朵粬","涓戒汉;缇庝綋","涓戒汉;缇庣敳","閲戣瀺;atm","姹借溅鏈嶅姟;姹借溅妫�娴嬪満","閬撹矾;璺彛","鐢熸椿鏈嶅姟;鍏叡鍘曟墍","浜ら�氳鏂�;鍔犳补鍔犳皵绔�","鐢熸椿鏈嶅姟;鍞エ澶�","鍑哄叆鍙�;楂橀�熷叕璺嚭鍙�","浜ら�氳鏂�;娓彛","浜ら�氳鏂�;鏅�氬仠杞︿綅","鐢熸椿鏈嶅姟;姝ラ獞琛屼笓鐢ㄩ亾椹跨珯","浜ら�氳鏂�;鏀惰垂绔�","浜ら�氳鏂�;妗�","浜ら�氳鏂�;鐏溅绔�","浜ら�氳鏂�;楂橀�熷叕璺仠杞﹀尯","鍑哄叆鍙�;杞︾珯鍏ュ彛","鍖荤枟;鏍搁吀妫�娴嬬偣","鍦板悕鍦板潃淇℃伅;浜ら�氬湴鍚�;璺彛鍚�","鍦板悕鍦板潃淇℃伅;浜ら�氬湴鍚�;閬撹矾鍚�","浜ら�氳鏂芥湇鍔�;鍏氦杞︾珯;鍏氦杞︾珯鐩稿叧","鐢熸椿鏈嶅姟;鍏变韩璁惧;鍏呯數瀹�","浜ら�氳鏂芥湇鍔�;鍋滆溅鍦�;鍏叡鍋滆溅鍦�","鍦板悕鍦板潃淇℃伅;鑷劧鍦板悕;灞�","浜ら�氳鏂芥湇鍔�;鍋滆溅鍦�;鍋滆溅鍦哄嚭鍏ュ彛","鍏叡璁炬柦;鍏叡鍘曟墍;鍏叡鍘曟墍","閫氳璁炬柦;涓磋闄㈤棬;涓磋闄㈡闂�","瀹ゅ唴璁炬柦;瀹ゅ唴璁炬柦;瀹ゅ唴璁炬柦","浜ら�氳鏂芥湇鍔�;鍋滆溅鍦�;璺竟鍋滆溅鍦�","浜ら�氳鏂芥湇鍔�;鍋滆溅鍦�;鍋滆溅鍦虹浉鍏�","鍦板悕鍦板潃淇℃伅;浜ら�氬湴鍚�;妗�","鍦板悕鍦板潃淇℃伅;鑷劧鍦板悕;娌虫祦","浜ら�氳鏂芥湇鍔�;鍋滆溅鍦�;涓撶敤鍋滆溅鍦�","浣撹偛浼戦棽鏈嶅姟;濞变箰鍦烘墍;KTV","閫氳璁炬柦;寤虹瓚鐗╅棬;寤虹瓚鐗╅棬","浜ら�氳鏂芥湇鍔�;鍋滆溅鍦�;鍋滆溅鍦哄叆鍙�","鐢熸椿鏈嶅姟;涓ц懍璁炬柦;涓ц懍璁炬柦","閲戣瀺淇濋櫓鏈嶅姟;鑷姩鎻愭鏈�;鍐滄潙鍟嗕笟閾惰ATM","浜ら�氳鏂芥湇鍔�;鍋滆溅鍦�;鍋滆溅鍦哄嚭鍙�","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;浜ら�氳溅杈嗙鐞�;浜ら�氱鐞嗘満鏋�","閫氳璁炬柦;寤虹瓚鐗╅棬;寤虹瓚鐗╂闂�","鍦板悕鍦板潃淇℃伅;鏅�氬湴鍚�;涔¢晣绾у湴鍚�","鍦板悕鍦板潃淇℃伅;鑷劧鍦板悕;婀栨硦","鍏徃浼佷笟;鍏徃;骞垮憡瑁呴グ|鐢熸椿鏈嶅姟","閲戣瀺淇濋櫓鏈嶅姟;鑷姩鎻愭鏈�;鑷姩鎻愭鏈�","閲戣瀺淇濋櫓鏈嶅姟;鑷姩鎻愭鏈�;涓浗閭斂鍌ㄨ搫閾惰ATM","閲戣瀺淇濋櫓鏈嶅姟;鑷姩鎻愭鏈�;涓浗鍐滀笟閾惰ATM","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;寤烘潗浜旈噾甯傚満|鍏徃浼佷笟","鍦板悕鍦板潃淇℃伅;浜ら�氬湴鍚�;楂橀�熻矾鍑哄彛","鍦板悕鍦板潃淇℃伅;浜ら�氬湴鍚�;楂橀�熻矾鍏ュ彛","閲戣瀺淇濋櫓鏈嶅姟;鑷姩鎻愭鏈�;涓浗宸ュ晢閾惰ATM","浜ら�氳鏂芥湇鍔�;浜ら�氭湇鍔$浉鍏�;浜ら�氭湇鍔$浉鍏�","閲戣瀺淇濋櫓鏈嶅姟;鑷姩鎻愭鏈�;涓浗寤鸿閾惰ATM","璐墿鏈嶅姟;瓒呯骇甯傚満;瓒呭競|璐墿鏈嶅姟","浜ら�氳鏂芥湇鍔�;鍦伴搧绔�;鍑哄叆鍙�","璐墿鏈嶅姟;瀹剁數鐢靛瓙鍗栧満;鎵嬫満閿�鍞畖鐢熸椿鏈嶅姟","鍏徃浼佷笟;鍏徃;鍏徃|璐墿鏈嶅姟","鍏徃浼佷笟;鍏徃;鍏徃|鐢熸椿鏈嶅姟","鍦板悕鍦板潃淇℃伅;浜ら�氬湴鍚�;闅ч亾","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;浜ら�氳溅杈嗙鐞�;楠岃溅鍦�","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;寤烘潗浜旈噾甯傚満|鐢熸椿鏈嶅姟","鍦板悕鍦板潃淇℃伅;浜ら�氬湴鍚�;绔嬩氦妗�","閲戣瀺淇濋櫓鏈嶅姟;鑷姩鎻愭鏈�;涓浗閾惰ATM","璐墿鏈嶅姟;渚挎皯鍟嗗簵/渚垮埄搴�;渚挎皯鍟嗗簵/渚垮埄搴梶璐墿鏈嶅姟","姹借溅閿�鍞�;姹借溅閿�鍞�;姹借溅閿�鍞畖姹借溅缁翠慨","浜ら�氳鏂芥湇鍔�;闀块�旀苯杞︾珯;闀块�旀苯杞︾珯","鍦板悕鍦板潃淇℃伅;浜ら�氬湴鍚�;閾佽矾","閬撹矾闄勫睘璁炬柦;鏈嶅姟鍖�;楂橀�熸湇鍔″尯","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;浜ら�氳溅杈嗙鐞�;浜ら�氭墽娉曠珯","鐢熸椿鏈嶅姟;缇庡缇庡彂搴�;缇庡缇庡彂搴梶璐墿鏈嶅姟","鍦板悕鍦板潃淇℃伅;鏅�氬湴鍚�;琛楅亾绾у湴鍚�","浜ら�氳鏂芥湇鍔�;鍦伴搧绔�;鍦伴搧绔�","鍏徃浼佷笟;宸ュ巶;宸ュ巶|鍏徃浼佷笟","璐墿鏈嶅姟;鏈嶈闉嬪附鐨叿搴�;鏈嶈闉嬪附鐨叿搴梶鐢熸椿鏈嶅姟","鍏叡璁炬柦;鍏叡鍘曟墍;濂虫礂鎵嬮棿","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;浜ら�氳溅杈嗙鐞�;杞﹁締绠$悊鏈烘瀯","浣忓鏈嶅姟;浣忓鏈嶅姟鐩稿叧;浣忓鏈嶅姟鐩稿叧|浣撹偛浼戦棽鏈嶅姟","鍏叡璁炬柦;鍏叡鍘曟墍;鐢锋礂鎵嬮棿","姹借溅鏈嶅姟;姹借溅鍏绘姢/瑁呴グ;姹借溅鍏绘姢|姹借溅鏈嶅姟","鍦板悕鍦板潃淇℃伅;鑷劧鍦板悕;宀涘笨","浜ら�氳鏂芥湇鍔�;娓彛鐮佸ご;娓彛鐮佸ご","浣忓鏈嶅姟;瀹鹃閰掑簵;瀹鹃閰掑簵|浣忓鏈嶅姟","鐢熸椿鏈嶅姟;鐢佃钀ヤ笟鍘�;涓浗绉诲姩钀ヤ笟鍘厊璐墿鏈嶅姟","璐墿鏈嶅姟;涓撳崠搴�;涓撹惀搴梶鐢熸椿鏈嶅姟","鍦板悕鍦板潃淇℃伅;浜ら�氬湴鍚�;鍩庡競蹇�熻矾鍑哄彛","鍦板悕鍦板潃淇℃伅;浜ら�氬湴鍚�;鍩庡競蹇�熻矾鍏ュ彛","璐墿鏈嶅姟;涓撳崠搴�;涓撹惀搴梶鍏徃浼佷笟","鐢熸椿鏈嶅姟;涓ц懍璁炬柦;鍏","鍏徃浼佷笟;鍏徃;鍏徃|鍏徃浼佷笟","浜ら�氳鏂芥湇鍔�;鐏溅绔�;鐏溅绔�","姹借溅鏈嶅姟;姹借溅鍏绘姢/瑁呴グ;姹借溅鍏绘姢|姹借溅缁翠慨","璐墿鏈嶅姟;璐墿鐩稿叧鍦烘墍;璐墿鐩稿叧鍦烘墍|鐢熸椿鏈嶅姟","璐墿鏈嶅姟;涓撳崠搴�;鐑熼厭涓撳崠搴梶璐墿鏈嶅姟","璐墿鏈嶅姟;涓撳崠搴�;鑷杞︿笓鍗栧簵|鐢熸椿鏈嶅姟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鏀垮簻鏈哄叧;涔¢晣浠ヤ笅绾ф斂搴滃強浜嬩笟鍗曚綅|鐢熸椿鏈嶅姟","閲戣瀺淇濋櫓鏈嶅姟;鑷姩鎻愭鏈�;浜ら�氶摱琛孉TM","鐢熸椿鏈嶅姟;鐢熸椿鏈嶅姟鍦烘墍;鐢熸椿鏈嶅姟鍦烘墍|璐墿鏈嶅姟","璐墿鏈嶅姟;涓汉鐢ㄥ搧/鍖栧鍝佸簵;鍏跺畠涓汉鐢ㄥ搧搴梶鐢熸椿鏈嶅姟","璐墿鏈嶅姟;缁煎悎甯傚満;鍐滃壇浜у搧甯傚満|璐墿鏈嶅姟","浣忓鏈嶅姟;鏃呴鎷涘緟鎵�;鏃呴鎷涘緟鎵�|浣忓鏈嶅姟","璐墿鏈嶅姟;涓撳崠搴�;涓撹惀搴梶姹借溅鏈嶅姟","鍏徃浼佷笟;鍏徃;骞垮憡瑁呴グ|璐墿鏈嶅姟","浣忓鏈嶅姟;瀹鹃閰掑簵;瀹鹃閰掑簵|椁愰ギ鏈嶅姟","鍏叡璁炬柦;鍏叡鍘曟墍;娈嬮殰娲楁墜闂�/鏃犻殰纰嶆礂鎵嬮棿","璐墿鏈嶅姟;涓撳崠搴�;涓撹惀搴梶椁愰ギ鏈嶅姟","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;寤烘潗浜旈噾甯傚満|璐墿鏈嶅姟","璐墿鏈嶅姟;缁煎悎甯傚満;鍐滃壇浜у搧甯傚満|椁愰ギ鏈嶅姟","璐墿鏈嶅姟;瀹剁數鐢靛瓙鍗栧満;鏁扮爜鐢靛瓙|鍏徃浼佷笟","鍖荤枟淇濆仴鏈嶅姟;鏍搁吀妫�娴�;鏍搁吀妫�娴�","璐墿鏈嶅姟;瀹剁數鐢靛瓙鍗栧満;鏁扮爜鐢靛瓙|鐢熸椿鏈嶅姟","璐墿鏈嶅姟;鏈嶈闉嬪附鐨叿搴�;鏈嶈闉嬪附鐨叿搴梶鍏徃浼佷笟","姹借溅鏈嶅姟;姹借溅閰嶄欢閿�鍞�;姹借溅閰嶄欢閿�鍞畖姹借溅缁翠慨","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;甯冭壓甯傚満|鍏徃浼佷笟","鐢熸椿鏈嶅姟;涓ц懍璁炬柦;闄靛洯","閲戣瀺淇濋櫓鏈嶅姟;閾惰;浜ら�氶摱琛�","椁愰ギ鏈嶅姟;涓鍘�;涓鍘厊浣忓鏈嶅姟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;浜ら�氳溅杈嗙鐞�;浜ら�氳溅杈嗙鐞嗙浉鍏�","姹借溅缁翠慨;姹借溅缁翠慨;姹借溅缁翠慨|姹借溅鏈嶅姟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鏀垮簻鏈哄叧;鍖哄幙绾ф斂搴滃強浜嬩笟鍗曚綅|鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","浜ら�氳鏂芥湇鍔�;鍏氦杞︾珯;蹇�熷叕浜ょ珯","浣忓鏈嶅姟;鏃呴鎷涘緟鎵�;鏃呴鎷涘緟鎵�|鍟嗗姟浣忓畢","浜ら�氳鏂芥湇鍔�;鐏溅绔�;杩涚珯鍙�/妫�绁ㄥ彛","鍦板悕鍦板潃淇℃伅;鏅�氬湴鍚�;鍖哄幙绾у湴鍚�","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鏀垮簻鏈哄叧;涔¢晣绾ф斂搴滃強浜嬩笟鍗曚綅|鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","璐墿鏈嶅姟;瀹剁數鐢靛瓙鍗栧満;瀹剁數鐢靛瓙鍗栧満|鐢熸椿鏈嶅姟","鐢熸椿鏈嶅姟;鐢佃钀ヤ笟鍘�;涓浗鐢典俊钀ヤ笟鍘厊璐墿鏈嶅姟","姹借溅缁翠慨;姹借溅缁煎悎缁翠慨;姹借溅缁煎悎缁翠慨|姹借溅鏈嶅姟","鍖荤枟淇濆仴鏈嶅姟;涓撶鍖婚櫌;鍙h厰鍖婚櫌|鍖荤枟淇濆仴鏈嶅姟","閲戣瀺淇濋櫓鏈嶅姟;鑷姩鎻愭鏈�;鎷涘晢閾惰ATM","姹借溅鏈嶅姟;姹借溅鏈嶅姟鐩稿叧;姹借溅鏈嶅姟鐩稿叧|姹借溅缁翠慨","鍏徃浼佷笟;鍏徃;鍏徃|姹借溅鏈嶅姟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;绀句細鍥綋;绀句細鍥綋鐩稿叧|鍏徃浼佷笟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鍏娉曟満鏋�;绀句細娌诲畨鏈烘瀯|鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","鍟嗗姟浣忓畢;浣忓畢鍖�;浣忓畢灏忓尯|鍟嗗姟浣忓畢","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鏀垮簻鏈哄叧;涔¢晣绾ф斂搴滃強浜嬩笟鍗曚綅|鐢熸椿鏈嶅姟","璐墿鏈嶅姟;鍟嗗満;鏅�氬晢鍦簗璐墿鏈嶅姟","鍏徃浼佷笟;鍏徃;鏈烘鐢靛瓙|璐墿鏈嶅姟","鍟嗗姟浣忓畢;浣忓畢鍖�;浣忓畢灏忓尯|浣忓鏈嶅姟","鍏徃浼佷笟;鍏徃;鍐堕噾鍖栧伐|鍏徃浼佷笟","鍏叡璁炬柦;鍏叡鍘曟墍;濠村効鎹㈡礂闂�/鍝轰钩瀹�/姣嶅┐瀹�","绉戞暀鏂囧寲鏈嶅姟;鍩硅鏈烘瀯;鍩硅鏈烘瀯|璐墿鏈嶅姟","鍏徃浼佷笟;鍏徃;鍟嗕笟璐告槗|璐墿鏈嶅姟","椁愰ギ鏈嶅姟;椁愰ギ鐩稿叧鍦烘墍;椁愰ギ鐩稿叧|璐墿鏈嶅姟","鐢熸椿鏈嶅姟;涓ц懍璁炬柦;娈′华棣�","閲戣瀺淇濋櫓鏈嶅姟;鑷姩鎻愭鏈�;涓浗姘戠敓閾惰ATM","璐墿鏈嶅姟;涓撳崠搴�;鑷杞︿笓鍗栧簵|鎽╂墭杞︽湇鍔�","浜ら�氳鏂芥湇鍔�;鐏溅绔�;璐ц繍鐏溅绔�","璐墿鏈嶅姟;涓撳崠搴�;鍎跨鐢ㄥ搧搴梶鐢熸椿鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;浼戦棽鍦烘墍;浼戦棽鍦烘墍|椁愰ギ鏈嶅姟","鍦板悕鍦板潃淇℃伅;鑷劧鍦板悕;娴锋咕娴峰场","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;绀句細鍥綋;灏戝厛闃�","鍏徃浼佷笟;鍏徃;鍏徃|閲戣瀺淇濋櫓鏈嶅姟","璐墿鏈嶅姟;涓撳崠搴�;鐑熼厭涓撳崠搴梶鍏徃浼佷笟","椁愰ギ鏈嶅姟;涓鍘�;涓鍘厊椁愰ギ鏈嶅姟","鐢熸椿鏈嶅姟;缁翠慨绔欑偣;缁翠慨绔欑偣|璐墿鏈嶅姟","閲戣瀺淇濋櫓鏈嶅姟;鑷姩鎻愭鏈�;鍏翠笟閾惰ATM","浜ら�氳鏂芥湇鍔�;闀块�旀苯杞︾珯;杩涚珯","璐墿鏈嶅姟;缁煎悎甯傚満;鍐滃壇浜у搧甯傚満|鍏徃浼佷笟","浣忓鏈嶅姟;瀹鹃閰掑簵;鍥涙槦绾у棣唡椁愰ギ鏈嶅姟","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;瀹跺叿鍩巪鍏徃浼佷笟","绉戞暀鏂囧寲鏈嶅姟;鍩硅鏈烘瀯;鍩硅鏈烘瀯|鐢熸椿鏈嶅姟","鍏徃浼佷笟;鍏徃;骞垮憡瑁呴グ|鐢熸椿鏈嶅姟;鐢熸椿鏈嶅姟鍦烘墍;鐢熸椿鏈嶅姟鍦烘墍","椁愰ギ鏈嶅姟;鍐烽ギ搴�;鍐烽ギ搴梶椁愰ギ鏈嶅姟","閲戣瀺淇濋櫓鏈嶅姟;鑷姩鎻愭鏈�;涓婃捣娴︿笢鍙戝睍閾惰ATM","鍏徃浼佷笟;鍏徃;鏈烘鐢靛瓙|鍏徃浼佷笟","浜ら�氳鏂芥湇鍔�;鐏溅绔�;鍑虹珯鍙�","璐墿鏈嶅姟;涓撳崠搴�;涓撹惀搴梶璐墿鏈嶅姟","椁愰ギ鏈嶅姟;鑼惰壓棣�;鑼惰壓棣唡璐墿鏈嶅姟","椁愰ギ鏈嶅姟;涓鍘�;鐗硅壊/鍦版柟椋庡懗椁愬巺|椁愰ギ鏈嶅姟","璐墿鏈嶅姟;鑺遍笩楸艰櫕甯傚満;鑺卞崏甯傚満|鐢熸椿鏈嶅姟","璐墿鏈嶅姟;渚挎皯鍟嗗簵/渚垮埄搴�;渚挎皯鍟嗗簵/渚垮埄搴梶鐢熸椿鏈嶅姟","姹借溅鏈嶅姟;娲楄溅鍦�;娲楄溅鍦簗姹借溅鏈嶅姟","浜ら�氳鏂芥湇鍔�;鍋滆溅鍦�;鍏叡鍋滆溅鍦簗浜ら�氳鏂芥湇鍔�","椁愰ギ鏈嶅姟;绯曢ゼ搴�;绯曢ゼ搴梶璐墿鏈嶅姟","椁愰ギ鏈嶅姟;涓鍘�;鐏攨搴梶椁愰ギ鏈嶅姟","鍏徃浼佷笟;宸ュ巶;宸ュ巶|鐢熸椿鏈嶅姟","椁愰ギ鏈嶅姟;鍐烽ギ搴�;鍐烽ギ搴梶璐墿鏈嶅姟","鍖荤枟淇濆仴鏈嶅姟;缁煎悎鍖婚櫌;鍗敓闄鍖荤枟淇濆仴鏈嶅姟","閲戣瀺淇濋櫓鏈嶅姟;鑷姩鎻愭鏈�;涓俊閾惰ATM","閲戣瀺淇濋櫓鏈嶅姟;鑷姩鎻愭鏈�;涓浗鍏夊ぇ閾惰ATM","鍏叡璁炬柦;鍏敤鐢佃瘽;鍏敤鐢佃瘽","璐墿鏈嶅姟;璐墿鐩稿叧鍦烘墍;璐墿鐩稿叧鍦烘墍|椁愰ギ鏈嶅姟","绉戞暀鏂囧寲鏈嶅姟;椹炬牎;椹炬牎|鐢熸椿鏈嶅姟","璐墿鏈嶅姟;缁煎悎甯傚満;鏋滃搧甯傚満|璐墿鏈嶅姟","鍟嗗姟浣忓畢;妤煎畤;鍟嗗姟鍐欏瓧妤紎鍟嗗姟浣忓畢","鐢熸椿鏈嶅姟;缇庡缇庡彂搴�;缇庡缇庡彂搴梶鐢熸椿鏈嶅姟","姹借溅閿�鍞�;闀垮畨姹借溅閿�鍞�;闀垮畨姹借溅閿�鍞畖姹借溅缁翠慨","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鏀垮簻鏈哄叧;涔¢晣浠ヤ笅绾ф斂搴滃強浜嬩笟鍗曚綅|鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","椁愰ギ鏈嶅姟;绯曢ゼ搴�;绯曢ゼ搴梶椁愰ギ鏈嶅姟","璐墿鏈嶅姟;缁煎悎甯傚満;鏋滃搧甯傚満|椁愰ギ鏈嶅姟","椁愰ギ鏈嶅姟;涓鍘�;涓鍘厊浣撹偛浼戦棽鏈嶅姟","璐墿鏈嶅姟;鏈嶈闉嬪附鐨叿搴�;鏈嶈闉嬪附鐨叿搴梶椁愰ギ鏈嶅姟","鍑哄叆鍙�;闂�","鐢熸椿鏈嶅姟;鐢熸椿鏈嶅姟鍦烘墍;鐢熸椿鏈嶅姟鍦烘墍|鍏徃浼佷笟","璐墿鏈嶅姟;渚挎皯鍟嗗簵/渚垮埄搴�;渚挎皯鍟嗗簵/渚垮埄搴梶椁愰ギ鏈嶅姟","鐢熸椿鏈嶅姟;鐢佃钀ヤ笟鍘�;涓浗鑱旈�氳惀涓氬巺|璐墿鏈嶅姟","姹借溅鏈嶅姟;姹借溅閰嶄欢閿�鍞�;姹借溅閰嶄欢閿�鍞畖姹借溅鏈嶅姟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鏀垮簻鏈哄叧;鍦板競绾ф斂搴滃強浜嬩笟鍗曚綅|鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","璐墿鏈嶅姟;涓撳崠搴�;涓撹惀搴梶绉戞暀鏂囧寲鏈嶅姟","璐墿鏈嶅姟;瓒呯骇甯傚満;瓒呭競|璐墿鏈嶅姟;渚挎皯鍟嗗簵/渚垮埄搴�;渚挎皯鍟嗗簵/渚垮埄搴�","璐墿鏈嶅姟;涓撳崠搴�;鍎跨鐢ㄥ搧搴梶璐墿鏈嶅姟","鐢熸椿鏈嶅姟;娲楁荡鎺ㄦ嬁鍦烘墍;娲楁荡鎺ㄦ嬁鍦烘墍|鐢熸椿鏈嶅姟","姹借溅鏈嶅姟;姹借溅閰嶄欢閿�鍞�;姹借溅閰嶄欢閿�鍞畖璐墿鏈嶅姟","椁愰ギ鏈嶅姟;涓鍘�;缁煎悎閰掓ゼ|浣忓鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;濞变箰鍦烘墍;閰掑惂|椁愰ギ鏈嶅姟","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;甯冭壓甯傚満|鐢熸椿鏈嶅姟","鍏徃浼佷笟;鍏徃;鐢典俊鍏徃|鐢熸椿鏈嶅姟","鍏徃浼佷笟;鍏徃;鍏徃|绉戞暀鏂囧寲鏈嶅姟","鍏徃浼佷笟;宸ュ巶;宸ュ巶|璐墿鏈嶅姟","璐墿鏈嶅姟;瀹剁數鐢靛瓙鍗栧満;鎵嬫満閿�鍞畖鍏徃浼佷笟","鍖荤枟淇濆仴鏈嶅姟;涓撶鍖婚櫌;涓撶鍖婚櫌|鍖荤枟淇濆仴鏈嶅姟","椁愰ギ鏈嶅姟;涓鍘�;娓呯湡鑿滈|椁愰ギ鏈嶅姟","姹借溅閿�鍞�;姹借溅閿�鍞�;姹借溅閿�鍞畖姹借溅鏈嶅姟","鐢熸椿鏈嶅姟;缁翠慨绔欑偣;缁翠慨绔欑偣|鎽╂墭杞︽湇鍔�","璐墿鏈嶅姟;鏈嶈闉嬪附鐨叿搴�;鏈嶈闉嬪附鐨叿搴梶璐墿鏈嶅姟","閲戣瀺淇濋櫓鏈嶅姟;鑷姩鎻愭鏈�;鍗庡閾惰ATM","鍏徃浼佷笟;鍏徃浼佷笟;鍏徃浼佷笟|鐢熸椿鏈嶅姟","鍏徃浼佷笟;鍏徃;鍏徃|椁愰ギ鏈嶅姟","璐墿鏈嶅姟;鍟嗗満;璐墿涓績|璐墿鏈嶅姟","鍟嗗姟浣忓畢;浣忓畢鍖�;浣忓畢灏忓尯|鐢熸椿鏈嶅姟","鍟嗗姟浣忓畢;浣忓畢鍖�;浣忓畢灏忓尯|鍦板悕鍦板潃淇℃伅","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;浜ら�氳溅杈嗙鐞�;浜ら�氱鐞嗘満鏋剕鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;瀹跺眳寤烘潗甯傚満|鐢熸椿鏈嶅姟","鍟嗗姟浣忓畢;浣忓畢鍖�;浣忓畢灏忓尯|璐墿鏈嶅姟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鍏娉曟満鏋�;鍏畨璀﹀療|鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;鍘ㄥ崼甯傚満|璐墿鏈嶅姟","鍟嗗姟浣忓畢;浣忓畢鍖�;浣忓畢灏忓尯|椁愰ギ鏈嶅姟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鏀垮簻鏈哄叧;鍖哄幙绾ф斂搴滃強浜嬩笟鍗曚綅|鐢熸椿鏈嶅姟","椁愰ギ鏈嶅姟;涓鍘�;涓鍘厊鐢熸椿鏈嶅姟","姹借溅鏈嶅姟;姹借溅鏈嶅姟鐩稿叧;姹借溅鏈嶅姟鐩稿叧|璐墿鏈嶅姟","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;鍘ㄥ崼甯傚満|鍏徃浼佷笟","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;寤烘潗浜旈噾甯傚満|鍏徃浼佷笟;鍏徃;鍏徃","鐢熸椿鏈嶅姟;缁翠慨绔欑偣;缁翠慨绔欑偣|姹借溅缁翠慨","鐢熸椿鏈嶅姟;涓粙鏈烘瀯;涓粙鏈烘瀯|鍏徃浼佷笟","鐢熸椿鏈嶅姟;鐢佃钀ヤ笟鍘�;涓浗鐢典俊钀ヤ笟鍘厊鍏徃浼佷笟","璐墿鏈嶅姟;璐墿鐩稿叧鍦烘墍;璐墿鐩稿叧鍦烘墍|姹借溅鏈嶅姟","鎽╂墭杞︽湇鍔�;鎽╂墭杞︾淮淇�;鎽╂墭杞︾淮淇畖鐢熸椿鏈嶅姟","姹借溅鏈嶅姟;姹借溅鏈嶅姟鐩稿叧;姹借溅鏈嶅姟鐩稿叧|姹借溅閿�鍞�","鐢熸椿鏈嶅姟;鐗╂祦閫熼��;鐗╂祦閫熼�抾鍏徃浼佷笟","璐墿鏈嶅姟;缁煎悎甯傚満;鍐滃壇浜у搧甯傚満|鐢熸椿鏈嶅姟","姹借溅閿�鍞�;澶т紬鐗圭害閿�鍞�;涓婃捣澶т紬閿�鍞畖姹借溅缁翠慨","姹借溅閿�鍞�;鍚夊埄鐗圭害閿�鍞�;鍚夊埄閿�鍞畖姹借溅缁翠慨","鐢熸椿鏈嶅姟;娲楁荡鎺ㄦ嬁鍦烘墍;娲楁荡鎺ㄦ嬁鍦烘墍|璐墿鏈嶅姟","璐墿鏈嶅姟;缁煎悎甯傚満;钄彍甯傚満|璐墿鏈嶅姟","閲戣瀺淇濋櫓鏈嶅姟;鑷姩鎻愭鏈�;骞垮彂閾惰ATM","璐墿鏈嶅姟;璐墿鐩稿叧鍦烘墍;璐墿鐩稿叧鍦烘墍|鍏徃浼佷笟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鏀垮簻鏈哄叧;鍖哄幙绾ф斂搴滃強浜嬩笟鍗曚綅|鍏徃浼佷笟","鐢熸椿鏈嶅姟;娲楁荡鎺ㄦ嬁鍦烘墍;娲楁荡鎺ㄦ嬁鍦烘墍|浣忓鏈嶅姟","鐢熸椿鏈嶅姟;涓ц懍璁炬柦;涓ц懍璁炬柦|璐墿鏈嶅姟","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;甯冭壓甯傚満|璐墿鏈嶅姟","璐墿鏈嶅姟;涓撳崠搴�;鐝犲疂棣栭グ宸ヨ壓鍝亅鐢熸椿鏈嶅姟","璐墿鏈嶅姟;瀹剁數鐢靛瓙鍗栧満;瀹剁數鐢靛瓙鍗栧満|鍏徃浼佷笟","姹借溅閿�鍞�;澶т紬鐗圭害閿�鍞�;涓�姹�-澶т紬閿�鍞畖姹借溅缁翠慨","璐墿鏈嶅姟;涓撳崠搴�;鑷杞︿笓鍗栧簵|姹借溅鏈嶅姟","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;寤烘潗浜旈噾甯傚満|姹借溅鏈嶅姟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鏀垮簻鏈哄叧;鏀垮簻鏈哄叧鐩稿叧|鍏徃浼佷笟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鏀垮簻鏈哄叧;鏀垮簻鏈哄叧鐩稿叧|鐢熸椿鏈嶅姟","绉戞暀鏂囧寲鏈嶅姟;瀛︽牎;鑱屼笟鎶�鏈鏍绉戞暀鏂囧寲鏈嶅姟","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;瀹跺叿鍩巪璐墿鏈嶅姟","閲戣瀺淇濋櫓鏈嶅姟;鑷姩鎻愭鏈�;骞冲畨閾惰ATM","姹借溅鏈嶅姟;姹借溅鏈嶅姟鐩稿叧;姹借溅鏈嶅姟鐩稿叧|鐢熸椿鏈嶅姟","姹借溅缁翠慨;姹借溅缁翠慨;姹借溅缁翠慨|姹借溅閿�鍞�","璐墿鏈嶅姟;鑺遍笩楸艰櫕甯傚満;鑺卞崏甯傚満|鍏徃浼佷笟","璐墿鏈嶅姟;涓撳崠搴�;鍙ょ帺瀛楃敾搴梶绉戞暀鏂囧寲鏈嶅姟","浣忓鏈嶅姟;瀹鹃閰掑簵;浜旀槦绾у棣唡椁愰ギ鏈嶅姟","姹借溅閿�鍞�;闀垮煄姹借溅閿�鍞�;闀垮煄姹借溅閿�鍞畖姹借溅缁翠慨","鍏徃浼佷笟;鍏徃;鍏徃|鐢熸椿鏈嶅姟;鐢熸椿鏈嶅姟鍦烘墍;鐢熸椿鏈嶅姟鍦烘墍","浣忓鏈嶅姟;瀹鹃閰掑簵;瀹鹃閰掑簵|鐢熸椿鏈嶅姟","椁愰ギ鏈嶅姟;鐢滃搧搴�;鐢滃搧搴梶椁愰ギ鏈嶅姟","鍟嗗姟浣忓畢;妤煎畤;鍟嗕綇涓ょ敤妤煎畤|鍟嗗姟浣忓畢","鍏徃浼佷笟;鍏徃浼佷笟;鍏徃浼佷笟|璐墿鏈嶅姟","椁愰ギ鏈嶅姟;鑼惰壓棣�;鑼惰壓棣唡椁愰ギ鏈嶅姟","姹借溅閿�鍞�;鏃ヤ骇鐗圭害閿�鍞�;涓滈鏃ヤ骇閿�鍞畖姹借溅缁翠慨","绉戞暀鏂囧寲鏈嶅姟;瀛︽牎;骞煎効鍥瓅绉戞暀鏂囧寲鏈嶅姟","鐢熸椿鏈嶅姟;鎽勫奖鍐插嵃搴�;鎽勫奖鍐插嵃|璐墿鏈嶅姟","閬撹矾闄勫睘璁炬柦;鏈嶅姟鍖�;楂橀�熷仠杞﹀尯","鐢熸椿鏈嶅姟;鐢熸椿鏈嶅姟鍦烘墍;鐢熸椿鏈嶅姟鍦烘墍|姹借溅鏈嶅姟","绉戞暀鏂囧寲鏈嶅姟;绉戞暀鏂囧寲鍦烘墍;绉戞暀鏂囧寲鍦烘墍|鐢熸椿鏈嶅姟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;绀句細鍥綋;绀句細鍥綋鐩稿叧|璐墿鏈嶅姟","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;瀹跺眳寤烘潗甯傚満|鍏徃浼佷笟","鍏徃浼佷笟;鍏徃;鍏徃|姹借溅閿�鍞�","姹借溅閿�鍞�;涓滈鐗圭害閿�鍞�;涓滈閿�鍞畖姹借溅缁翠慨","璐墿鏈嶅姟;渚挎皯鍟嗗簵/渚垮埄搴�;渚挎皯鍟嗗簵/渚垮埄搴梶鍏徃浼佷笟","浜ら�氳鏂芥湇鍔�;鍏氦杞︾珯;鐢佃溅绔�","璐墿鏈嶅姟;瀹剁數鐢靛瓙鍗栧満;鎵嬫満閿�鍞畖鐢熸椿鏈嶅姟;鐢佃钀ヤ笟鍘�;涓浗绉诲姩钀ヤ笟鍘�","鍦板悕鍦板潃淇℃伅;鏅�氬湴鍚�;鏉戝簞绾у湴鍚峾鍟嗗姟浣忓畢","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;鐏叿鐡峰櫒甯傚満|鍏徃浼佷笟","椁愰ギ鏈嶅姟;涓鍘�;涓鍘厊鍏徃浼佷笟","鐢熸椿鏈嶅姟;娲楁荡鎺ㄦ嬁鍦烘墍;娲楁荡鎺ㄦ嬁鍦烘墍|浣撹偛浼戦棽鏈嶅姟","璐墿鏈嶅姟;涓撳崠搴�;鐑熼厭涓撳崠搴梶椁愰ギ鏈嶅姟","浜ら�氳鏂芥湇鍔�;鍋滆溅鍦�;璺竟鍋滆溅鍦簗浜ら�氳鏂芥湇鍔�","閲戣瀺淇濋櫓鏈嶅姟;鑷姩鎻愭鏈�;鍖椾含閾惰ATM","鍏徃浼佷笟;鍏徃;鍏徃|鍟嗗姟浣忓畢","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鏀垮簻鏈哄叧;涔¢晣浠ヤ笅绾ф斂搴滃強浜嬩笟鍗曚綅|鍟嗗姟浣忓畢","姹借溅閿�鍞�;涓扮敯鐗圭害閿�鍞�;涓�姹戒赴鐢伴攢鍞畖姹借溅缁翠慨","鐢熸椿鏈嶅姟;鐗╂祦閫熼��;鐗╂祦閫熼�抾璐墿鏈嶅姟","浜ら�氳鏂芥湇鍔�;鏈哄満鐩稿叧;椋炴満鍦�","浣撹偛浼戦棽鏈嶅姟;浼戦棽鍦烘墍;浼戦棽鍦烘墍|浣忓鏈嶅姟","鐢熸椿鏈嶅姟;涓ц懍璁炬柦;闄靛洯|椋庢櫙鍚嶈儨","璐墿鏈嶅姟;渚挎皯鍟嗗簵/渚垮埄搴�;渚挎皯鍟嗗簵/渚垮埄搴梶璐墿鏈嶅姟;瓒呯骇甯傚満;瓒呭競","椁愰ギ鏈嶅姟;涓鍘�;鍥涘窛鑿�(宸濊彍)|椁愰ギ鏈嶅姟","鐢熸椿鏈嶅姟;缇庡缇庡彂搴�;缇庡缇庡彂搴梶椁愰ギ鏈嶅姟","璐墿鏈嶅姟;鏂囧寲鐢ㄥ搧搴�;鏂囧寲鐢ㄥ搧搴梶鐢熸椿鏈嶅姟","鍏徃浼佷笟;鍏徃;鍐堕噾鍖栧伐|璐墿鏈嶅姟","浜ら�氳鏂芥湇鍔�;鐏溅绔�;鍊欒溅瀹�","閲戣瀺淇濋櫓鏈嶅姟;閾惰;鍐滄潙鍟嗕笟閾惰|閲戣瀺淇濋櫓鏈嶅姟","绉戞暀鏂囧寲鏈嶅姟;瀛︽牎;涓|绉戞暀鏂囧寲鏈嶅姟","璐墿鏈嶅姟;瀹剁數鐢靛瓙鍗栧満;鏁扮爜鐢靛瓙|璐墿鏈嶅姟","椁愰ギ鏈嶅姟;涓鍘�;娴烽矞閰掓ゼ|椁愰ギ鏈嶅姟","姹借溅閿�鍞�;閫氱敤鐗圭害閿�鍞�;鍒厠閿�鍞畖姹借溅缁翠慨","浜ら�氳鏂芥湇鍔�;鏈哄満鐩稿叧;鏈哄満鍑哄彂/鍒拌揪","鍏徃浼佷笟;鍏徃;鍏徃|鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","姹借溅鏈嶅姟;浜屾墜杞︿氦鏄�;浜屾墜杞︿氦鏄搢姹借溅閿�鍞�","椁愰ギ鏈嶅姟;浼戦棽椁愰ギ鍦烘墍;浼戦棽椁愰ギ鍦烘墍|椁愰ギ鏈嶅姟","椁愰ギ鏈嶅姟;鍜栧暋鍘�;鍜栧暋鍘厊椁愰ギ鏈嶅姟","姹借溅閿�鍞�;姹借溅閿�鍞�;姹借溅閿�鍞畖姹借溅缁翠慨;姹借溅缁翠慨;姹借溅缁翠慨","姹借溅閿�鍞�;姊呰禌寰锋柉-濂旈┌鐗圭害閿�鍞�;姊呰禌寰锋柉-濂旈┌閿�鍞畖姹借溅缁翠慨","璐墿鏈嶅姟;瀹剁數鐢靛瓙鍗栧満;鎵嬫満閿�鍞畖璐墿鏈嶅姟","璐墿鏈嶅姟;涓撳崠搴�;鑷杞︿笓鍗栧簵|姹借溅閿�鍞�","绉戞暀鏂囧寲鏈嶅姟;鍩硅鏈烘瀯;鍩硅鏈烘瀯|浣撹偛浼戦棽鏈嶅姟","鐢熸椿鏈嶅姟;娲楁荡鎺ㄦ嬁鍦烘墍;娲楁荡鎺ㄦ嬁鍦烘墍|椁愰ギ鏈嶅姟","鐢熸椿鏈嶅姟;鐢熸椿鏈嶅姟鍦烘墍;鐢熸椿鏈嶅姟鍦烘墍|绉戞暀鏂囧寲鏈嶅姟","绉戞暀鏂囧寲鏈嶅姟;鍩硅鏈烘瀯;鍩硅鏈烘瀯|绉戞暀鏂囧寲鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;濞变箰鍦烘墍;妫嬬墝瀹椁愰ギ鏈嶅姟","鍦板悕鍦板潃淇℃伅;鏅�氬湴鍚�;鏉戝簞绾у湴鍚峾璐墿鏈嶅姟","鍦板悕鍦板潃淇℃伅;鑷劧鍦板悕;灞眧鍦板悕鍦板潃淇℃伅","鍏徃浼佷笟;鍏徃;缃戠粶绉戞妧|璐墿鏈嶅姟","椁愰ギ鏈嶅姟;涓鍘�;缁煎悎閰掓ゼ|椁愰ギ鏈嶅姟","鐢熸椿鏈嶅姟;涓粙鏈烘瀯;涓粙鏈烘瀯|璐墿鏈嶅姟","姹借溅閿�鍞�;绂忕壒鐗圭害閿�鍞�;绂忕壒閿�鍞畖姹借溅缁翠慨","鍏徃浼佷笟;鍏徃;鍏徃|璐墿鏈嶅姟;璐墿鐩稿叧鍦烘墍;璐墿鐩稿叧鍦烘墍","浣撹偛浼戦棽鏈嶅姟;濞变箰鍦烘墍;KTV|璐墿鏈嶅姟","鍖荤枟淇濆仴鏈嶅姟;缁煎悎鍖婚櫌;缁煎悎鍖婚櫌|鍖荤枟淇濆仴鏈嶅姟","鍟嗗姟浣忓畢;浜т笟鍥尯;浜т笟鍥尯|鍏徃浼佷笟","浜ら�氳鏂芥湇鍔�;娓彛鐮佸ご;浜烘浮鍙�","姹借溅閿�鍞�;濂ヨ开鐗圭害閿�鍞�;涓�姹�-澶т紬濂ヨ开閿�鍞畖姹借溅缁翠慨","绉戞暀鏂囧寲鏈嶅姟;瀛︽牎;灏忓|绉戞暀鏂囧寲鏈嶅姟","鐢熸椿鏈嶅姟;鐢熸椿鏈嶅姟鍦烘墍;鐢熸椿鏈嶅姟鍦烘墍|鍟嗗姟浣忓畢","浜ら�氳鏂芥湇鍔�;娓彛鐮佸ご;璐ц繍娓彛鐮佸ご","绉戞暀鏂囧寲鏈嶅姟;瀛︽牎;楂樼瓑闄㈡牎|绉戞暀鏂囧寲鏈嶅姟","鐢熸椿鏈嶅姟;鐗╂祦閫熼��;鐗╂祦浠撳偍鍦哄湴|鍏徃浼佷笟","璐墿鏈嶅姟;瓒呯骇甯傚満;瓒呭競|鐢熸椿鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;濞变箰鍦烘墍;KTV|鐢熸椿鏈嶅姟","璐墿鏈嶅姟;涓撳崠搴�;鐑熼厭涓撳崠搴梶鐢熸椿鏈嶅姟","璐墿鏈嶅姟;涓撳崠搴�;鍎跨鐢ㄥ搧搴梶绉戞暀鏂囧寲鏈嶅姟","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;鍘ㄥ崼甯傚満|鐢熸椿鏈嶅姟","璐墿鏈嶅姟;鍟嗗満;鏅�氬晢鍦簗鍟嗗姟浣忓畢","姹借溅閿�鍞�;鐜颁唬鐗圭害閿�鍞�;鍖椾含鐜颁唬閿�鍞畖姹借溅缁翠慨","鐢熸椿鏈嶅姟;鐢佃钀ヤ笟鍘�;涓浗绉诲姩钀ヤ笟鍘厊鍏徃浼佷笟","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;瀹跺眳寤烘潗甯傚満|璐墿鏈嶅姟","椁愰ギ鏈嶅姟;澶栧浗椁愬巺;瑗块鍘�(缁煎悎椋庡懗)|椁愰ギ鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;濞变箰鍦烘墍;KTV|椁愰ギ鏈嶅姟","绉戞暀鏂囧寲鏈嶅姟;浼犲獟鏈烘瀯;浼犲獟鏈烘瀯|鐢熸椿鏈嶅姟","鍦板悕鍦板潃淇℃伅;浜ら�氬湴鍚�;閬撹矾鍚峾璐墿鏈嶅姟","鍏徃浼佷笟;鍏徃;骞垮憡瑁呴グ|绉戞暀鏂囧寲鏈嶅姟","鍏徃浼佷笟;鍐滄灄鐗ф笖鍩哄湴;鍏跺畠鍐滄灄鐗ф笖鍩哄湴|鍏徃浼佷笟","璐墿鏈嶅姟;涓撳崠搴�;涔﹀簵|绉戞暀鏂囧寲鏈嶅姟","璐墿鏈嶅姟;涓撳崠搴�;鐝犲疂棣栭グ宸ヨ壓鍝亅鍏徃浼佷笟","姹借溅閿�鍞�;鏈敯鐗圭害閿�鍞�;涓滈鏈敯閿�鍞畖姹借溅缁翠慨","鍟嗗姟浣忓畢;妤煎畤;鍟嗗姟鍐欏瓧妤紎璐墿鏈嶅姟","姹借溅閿�鍞�;涓扮敯鐗圭害閿�鍞�;骞挎苯涓扮敯閿�鍞畖姹借溅缁翠慨","姹借溅閿�鍞�;鏈敯鐗圭害閿�鍞�;骞挎苯鏈敯閿�鍞畖姹借溅缁翠慨","璐墿鏈嶅姟;涓撳崠搴�;鍙ょ帺瀛楃敾搴梶鐢熸椿鏈嶅姟","鍖荤枟淇濆仴鏈嶅姟;璇婃墍;璇婃墍|鍖荤枟淇濆仴鏈嶅姟","姹借溅閿�鍞�;鍖椾含姹借溅閿�鍞�;鍖椾含姹借溅閿�鍞畖姹借溅缁翠慨","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;鐏叿鐡峰櫒甯傚満|璐墿鏈嶅姟","鎽╂墭杞︽湇鍔�;鎽╂墭杞﹂攢鍞�;鎽╂墭杞﹂攢鍞畖璐墿鏈嶅姟","璐墿鏈嶅姟;涓撳崠搴�;绀煎搧楗板搧搴梶璐墿鏈嶅姟","浜ら�氳鏂芥湇鍔�;鐏溅绔�;绔欏彴","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;绀句細鍥綋;绀句細鍥綋鐩稿叧|鐢熸椿鏈嶅姟","绉戞暀鏂囧寲鏈嶅姟;鍩硅鏈烘瀯;鍩硅鏈烘瀯|鍏徃浼佷笟","浣忓鏈嶅姟;浣忓鏈嶅姟鐩稿叧;浣忓鏈嶅姟鐩稿叧|椁愰ギ鏈嶅姟","璐墿鏈嶅姟;涓撳崠搴�;鍎跨鐢ㄥ搧搴梶椁愰ギ鏈嶅姟","鍏徃浼佷笟;鍏徃;鐢典俊鍏徃|璐墿鏈嶅姟","浣忓鏈嶅姟;鏃呴鎷涘緟鎵�;鏃呴鎷涘緟鎵�|椁愰ギ鏈嶅姟","姹借溅閿�鍞�;濂囩憺鐗圭害閿�鍞�;濂囩憺閿�鍞畖姹借溅缁翠慨","閲戣瀺淇濋櫓鏈嶅姟;鑷姩鎻愭鏈�;鍖椾含鍐滃晢閾惰ATM","鐢熸椿鏈嶅姟;缁翠慨绔欑偣;缁翠慨绔欑偣|姹借溅鏈嶅姟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鏀垮簻鏈哄叧;涔¢晣绾ф斂搴滃強浜嬩笟鍗曚綅|绉戞暀鏂囧寲鏈嶅姟","鍖荤枟淇濆仴鏈嶅姟;鍖昏嵂淇濆仴閿�鍞簵;鑽埧|鍖荤枟淇濆仴鏈嶅姟","绉戞暀鏂囧寲鏈嶅姟;灞曡棣�;瀹ゅ唴灞曚綅","浣撹偛浼戦棽鏈嶅姟;濞变箰鍦烘墍;閰掑惂|璐墿鏈嶅姟","鍟嗗姟浣忓畢;妤煎畤;鍟嗗姟鍐欏瓧妤紎鍏徃浼佷笟","閲戣瀺淇濋櫓鏈嶅姟;鑷姩鎻愭鏈�;骞垮窞鍐滃晢閾惰ATM","浜ら�氳鏂芥湇鍔�;鐏溅绔�;鍞エ","浣撹偛浼戦棽鏈嶅姟;搴﹀亣鐤楀吇鍦烘墍;鐤楀吇闄鐢熸椿鏈嶅姟","浣忓鏈嶅姟;鏃呴鎷涘緟鎵�;鏃呴鎷涘緟鎵�|鐢熸椿鏈嶅姟","姹借溅鏈嶅姟;姹借溅閰嶄欢閿�鍞�;姹借溅閰嶄欢閿�鍞畖鍏徃浼佷笟","绉戞暀鏂囧寲鏈嶅姟;浼犲獟鏈烘瀯;浼犲獟鏈烘瀯|鍏徃浼佷笟","鍏徃浼佷笟;宸ュ巶;宸ュ巶|鍏徃浼佷笟;鍏徃;鍏徃","鐢熸椿鏈嶅姟;鐢靛姏钀ヤ笟鍘�;鐢靛姏钀ヤ笟鍘厊鍏徃浼佷笟","鍦板悕鍦板潃淇℃伅;鏅�氬湴鍚�;鏉戝簞绾у湴鍚峾鍦板悕鍦板潃淇℃伅","绉戞暀鏂囧寲鏈嶅姟;绉戠爺鏈烘瀯;绉戠爺鏈烘瀯|鍏徃浼佷笟","姹借溅閿�鍞�;骞挎苯浼犵ズ閿�鍞�;骞挎苯浼犵ズ閿�鍞畖姹借溅缁翠慨","浣撹偛浼戦棽鏈嶅姟;濞变箰鍦烘墍;KTV|浣撹偛浼戦棽鏈嶅姟","璐墿鏈嶅姟;涓撳崠搴�;鍎跨鐢ㄥ搧搴梶鍏徃浼佷笟","姹借溅閿�鍞�;鑽e▉閿�鍞�;鑽e▉閿�鍞畖姹借溅缁翠慨","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;绀句細鍥綋;绀句細鍥綋鐩稿叧|绉戞暀鏂囧寲鏈嶅姟","姹借溅閿�鍞�;瀹濋┈鐗圭害閿�鍞�;瀹濋┈閿�鍞畖姹借溅缁翠慨","椁愰ギ鏈嶅姟;涓鍘�;涓鍘厊鍟嗗姟浣忓畢","浣忓鏈嶅姟;瀹鹃閰掑簵;瀹鹃閰掑簵|浣撹偛浼戦棽鏈嶅姟","鐢熸椿鏈嶅姟;浜烘墠甯傚満;浜烘墠甯傚満|鍏徃浼佷笟","椁愰ギ鏈嶅姟;蹇鍘�;蹇鍘厊椁愰ギ鏈嶅姟","浜ら�氳鏂�;鍋滆溅鍦�","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鍏娉曟満鏋�;鍏瘉閴村畾鏈烘瀯|鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","鐢熸椿鏈嶅姟;鐢熸椿鏈嶅姟鍦烘墍;鐢熸椿鏈嶅姟鍦烘墍|姹借溅缁翠慨","浣撹偛浼戦棽鏈嶅姟;浼戦棽鍦烘墍;浼戦棽鍦烘墍|鐢熸椿鏈嶅姟","浜ら�氳鏂芥湇鍔�;闀块�旀苯杞︾珯;鍑虹珯","姹借溅鏈嶅姟;姹借溅鍏绘姢/瑁呴グ;姹借溅鍏绘姢|璐墿鏈嶅姟","鐢熸椿鏈嶅姟;鎽勫奖鍐插嵃搴�;鎽勫奖鍐插嵃|鍏徃浼佷笟","姹借溅閿�鍞�;閫氱敤鐗圭害閿�鍞�;闆經鍏伴攢鍞畖姹借溅缁翠慨","姹借溅缁翠慨;姹借溅缁翠慨;姹借溅缁翠慨|鐢熸椿鏈嶅姟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鏀垮簻鏈哄叧;涔¢晣浠ヤ笅绾ф斂搴滃強浜嬩笟鍗曚綅|鍦板悕鍦板潃淇℃伅","鐢熸椿鏈嶅姟;鐢佃钀ヤ笟鍘�;涓浗绉诲姩钀ヤ笟鍘厊璐墿鏈嶅姟;瀹剁數鐢靛瓙鍗栧満;鎵嬫満閿�鍞�","姹借溅閿�鍞�;璧蜂簹鐗圭害閿�鍞�;涓滈鎮﹁揪璧蜂簹閿�鍞畖姹借溅缁翠慨","鐢熸椿鏈嶅姟;鐗╂祦閫熼��;鐗╂祦浠撳偍鍦哄湴|鍟嗗姟浣忓畢","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鍏娉曟満鏋�;鍏瘉閴村畾鏈烘瀯|鍏徃浼佷笟","鍦板悕鍦板潃淇℃伅;甯備腑蹇�;鍩庡競涓績","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鏀垮簻鏈哄叧;鍦板競绾ф斂搴滃強浜嬩笟鍗曚綅|鐢熸椿鏈嶅姟","閲戣瀺淇濋櫓鏈嶅姟;鑷姩鎻愭鏈�;娣卞湷鍐滄潙鍟嗕笟閾惰ATM","浜ら�氳鏂芥湇鍔�;杞浮绔�;杞浮绔�","璐墿鏈嶅姟;缁煎悎甯傚満;姘翠骇娴烽矞甯傚満|椁愰ギ鏈嶅姟","閲戣瀺淇濋櫓鏈嶅姟;鑷姩鎻愭鏈�;涓婃捣閾惰ATM","姹借溅閿�鍞�;姹借溅閿�鍞�;姹借溅閿�鍞畖璐墿鏈嶅姟","鐢熸椿鏈嶅姟;濠村効鏈嶅姟鍦烘墍;濠村効娓告吵棣唡璐墿鏈嶅姟","璐墿鏈嶅姟;鏈嶈闉嬪附鐨叿搴�;鍝佺墝鏈嶈搴梶璐墿鏈嶅姟","椁愰ギ鏈嶅姟;蹇鍘�;鑼堕鍘厊椁愰ギ鏈嶅姟","浜ら�氳鏂芥湇鍔�;鍋滆溅鍦�;涓撶敤鍋滆溅鍦簗浜ら�氳鏂芥湇鍔�","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鏀垮簻鏈哄叧;鍖哄幙绾ф斂搴滃強浜嬩笟鍗曚綅|绉戞暀鏂囧寲鏈嶅姟","璐墿鏈嶅姟;涓撳崠搴�;鐝犲疂棣栭グ宸ヨ壓鍝亅璐墿鏈嶅姟","鍦板悕鍦板潃淇℃伅;鏅�氬湴鍚�;鍦板競绾у湴鍚�","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鏀垮簻鏈哄叧;鍦板競绾ф斂搴滃強浜嬩笟鍗曚綅|鍏徃浼佷笟","椁愰ギ鏈嶅姟;椁愰ギ鐩稿叧鍦烘墍;椁愰ギ鐩稿叧|鐢熸椿鏈嶅姟","浣忓鏈嶅姟;瀹鹃閰掑簵;瀹鹃閰掑簵|浣忓鏈嶅姟;鏃呴鎷涘緟鎵�;鏃呴鎷涘緟鎵�","浣忓鏈嶅姟;瀹鹃閰掑簵;瀹鹃閰掑簵|鍏徃浼佷笟","浜ら�氳鏂芥湇鍔�;鐝溅绔�;鐝溅绔�","浜ら�氳鏂芥湇鍔�;闀块�旀苯杞︾珯;鍊欒溅瀹�","鍖荤枟淇濆仴鏈嶅姟;缁煎悎鍖婚櫌;涓夌骇鐢茬瓑鍖婚櫌|鍖荤枟淇濆仴鏈嶅姟","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;瀹跺叿鍩巪鐢熸椿鏈嶅姟","璐墿鏈嶅姟;缁煎悎甯傚満;鏋滃搧甯傚満|鍏徃浼佷笟","鐢熸椿鏈嶅姟;涓粙鏈烘瀯;涓粙鏈烘瀯|鐢熸椿鏈嶅姟","姹借溅鏈嶅姟;姹借溅鍏绘姢/瑁呴グ;姹借溅鍏绘姢|姹借溅閿�鍞�","鐢熸椿鏈嶅姟;鐢熸椿鏈嶅姟鍦烘墍;鐢熸椿鏈嶅姟鍦烘墍|椁愰ギ鏈嶅姟","璐墿鏈嶅姟;涓撳崠搴�;绀煎搧楗板搧搴梶鐢熸椿鏈嶅姟","鍟嗗姟浣忓畢;鍟嗗姟浣忓畢鐩稿叧;鍟嗗姟浣忓畢鐩稿叧|鐢熸椿鏈嶅姟","浣忓鏈嶅姟;浣忓鏈嶅姟鐩稿叧;浣忓鏈嶅姟鐩稿叧|鍟嗗姟浣忓畢","姹借溅鏈嶅姟;姹借溅鍏绘姢/瑁呴グ;姹借溅鍏绘姢|鐢熸椿鏈嶅姟","椋庢櫙鍚嶈儨;鍏洯骞垮満;鍏洯|椋庢櫙鍚嶈儨","鍟嗗姟浣忓畢;浣忓畢鍖�;浣忓畢灏忓尯|浣撹偛浼戦棽鏈嶅姟","璐墿鏈嶅姟;瀹剁數鐢靛瓙鍗栧満;鎵嬫満閿�鍞畖鐢熸椿鏈嶅姟;鐢佃钀ヤ笟鍘�;涓浗鐢典俊钀ヤ笟鍘�","浣忓鏈嶅姟;浣忓鏈嶅姟鐩稿叧;浣忓鏈嶅姟鐩稿叧|浣撹偛浼戦棽鏈嶅姟;浼戦棽鍦烘墍;浼戦棽鍦烘墍","鍟嗗姟浣忓畢;浣忓畢鍖�;绀惧尯涓績|鐢熸椿鏈嶅姟","姹借溅鏈嶅姟;姹借溅鍏绘姢/瑁呴グ;姹借溅鍏绘姢|姹借溅缁翠慨;姹借溅缁翠慨;姹借溅缁翠慨","鍟嗗姟浣忓畢;浣忓畢鍖�;浣忓畢灏忓尯|鍏徃浼佷笟","閲戣瀺淇濋櫓鏈嶅姟;鑷姩鎻愭鏈�;涓婃捣鍐滃晢閾惰ATM","鍖荤枟淇濆仴鏈嶅姟;鍖昏嵂淇濆仴閿�鍞簵;鍖荤枟淇濆仴鐢ㄥ搧|鍖荤枟淇濆仴鏈嶅姟","鍟嗗姟浣忓畢;妤煎畤;鍟嗗姟鍐欏瓧妤紎鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;绀句細鍥綋;绀句細鍥綋鐩稿叧|閲戣瀺淇濋櫓鏈嶅姟","鐢熸椿鏈嶅姟;浜嬪姟鎵�;浼氳甯堜簨鍔℃墍|鍏徃浼佷笟","浣忓鏈嶅姟;瀹鹃閰掑簵;瀹鹃閰掑簵|鍟嗗姟浣忓畢","鍏徃浼佷笟;鍐滄灄鐗ф笖鍩哄湴;鍏跺畠鍐滄灄鐗ф笖鍩哄湴|璐墿鏈嶅姟","浣忓鏈嶅姟;瀹鹃閰掑簵;瀹鹃閰掑簵|璐墿鏈嶅姟","姹借溅閿�鍞�;澶т紬鐗圭害閿�鍞�;鏂煰杈鹃攢鍞畖姹借溅缁翠慨","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鏀垮簻鏈哄叧;鐪佺洿杈栧競绾ф斂搴滃強浜嬩笟鍗曚綅|鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","璐墿鏈嶅姟;涓汉鐢ㄥ搧/鍖栧鍝佸簵;鍏跺畠涓汉鐢ㄥ搧搴梶璐墿鏈嶅姟","姹借溅缁翠慨;闀垮煄姹借溅缁翠慨;闀垮煄姹借溅缁翠慨|姹借溅閿�鍞�","椁愰ギ鏈嶅姟;鍜栧暋鍘�;鍜栧暋鍘厊璐墿鏈嶅姟","鍟嗗姟浣忓畢;浣忓畢鍖�;瀹胯垗|鍟嗗姟浣忓畢","鐢熸椿鏈嶅姟;鐢佃钀ヤ笟鍘�;涓浗鑱旈�氳惀涓氬巺|鍏徃浼佷笟","浣撹偛浼戦棽鏈嶅姟;杩愬姩鍦洪;鍋ヨ韩涓績|鐢熸椿鏈嶅姟","璐墿鏈嶅姟;涓撳崠搴�;涔﹀簵|鍏徃浼佷笟","姹借溅缁翠慨;姹借溅缁煎悎缁翠慨;姹借溅缁煎悎缁翠慨|姹借溅閿�鍞�","鐢熸椿鏈嶅姟;缇庡缇庡彂搴�;缇庡缇庡彂搴梶璐墿鏈嶅姟;璐墿鐩稿叧鍦烘墍;璐墿鐩稿叧鍦烘墍","浣撹偛浼戦棽鏈嶅姟;浼戦棽鍦烘墍;閲囨憳鍥瓅鍏徃浼佷笟","璐墿鏈嶅姟;鏈嶈闉嬪附鐨叿搴�;鍝佺墝鏈嶈搴梶鐢熸椿鏈嶅姟","浜ら�氳鏂芥湇鍔�;鐏溅绔�;绁ㄥ姟鐩稿叧","鎽╂墭杞︽湇鍔�;鎽╂墭杞﹂攢鍞�;鎽╂墭杞﹂攢鍞畖鎽╂墭杞︽湇鍔�","鍏徃浼佷笟;鍏徃;缃戠粶绉戞妧|鐢熸椿鏈嶅姟","鍖荤枟淇濆仴鏈嶅姟;鍖荤枟淇濆仴鏈嶅姟鍦烘墍;鍖荤枟淇濆仴鏈嶅姟鍦烘墍|鐢熸椿鏈嶅姟","姹借溅閿�鍞�;鍚嶇埖閿�鍞�;鍚嶇埖閿�鍞畖姹借溅缁翠慨","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鏀垮簻鏈哄叧;鏀垮簻鏈哄叧鐩稿叧|绉戞暀鏂囧寲鏈嶅姟","姹借溅閿�鍞�;閫氱敤鐗圭害閿�鍞�;鍑开鎷夊厠閿�鍞畖姹借溅缁翠慨","浣忓鏈嶅姟;瀹鹃閰掑簵;缁忔祹鍨嬭繛閿侀厭搴梶浣忓鏈嶅姟","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;瀹跺叿寤烘潗缁煎悎甯傚満|璐墿鏈嶅姟","姹借溅閿�鍞�;绂忕壒鐗圭害閿�鍞�;椹嚜杈鹃攢鍞畖姹借溅缁翠慨","璐墿鏈嶅姟;涓撳崠搴�;鑷杞︿笓鍗栧簵|鍏徃浼佷笟","浣忓鏈嶅姟;鏃呴鎷涘緟鎵�;鏃呴鎷涘緟鎵�|浣撹偛浼戦棽鏈嶅姟","璐墿鏈嶅姟;鑺遍笩楸艰櫕甯傚満;鑺卞崏甯傚満|璐墿鏈嶅姟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;浜ら�氳溅杈嗙鐞�;楠岃溅鍦簗鍏徃浼佷笟","璐墿鏈嶅姟;涓撳崠搴�;鍎跨鐢ㄥ搧搴梶浣撹偛浼戦棽鏈嶅姟","鍏徃浼佷笟;鍏徃;骞垮憡瑁呴グ|鍏徃浼佷笟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鏀垮簻鏈哄叧;涔¢晣绾ф斂搴滃強浜嬩笟鍗曚綅|鍏徃浼佷笟","浣撹偛浼戦棽鏈嶅姟;杩愬姩鍦洪;璺嗘嫵閬撳満棣唡绉戞暀鏂囧寲鏈嶅姟","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;寤烘潗浜旈噾甯傚満|椁愰ギ鏈嶅姟","璐墿鏈嶅姟;缁煎悎甯傚満;姘翠骇娴烽矞甯傚満|璐墿鏈嶅姟","姹借溅鏈嶅姟;娲楄溅鍦�;娲楄溅鍦簗姹借溅缁翠慨","姹借溅缁翠慨;璐ц溅缁翠慨;璐ц溅缁翠慨|姹借溅鏈嶅姟","鍟嗗姟浣忓畢;浣忓畢鍖�;浣忓畢灏忓尯|鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","鍖荤枟淇濆仴鏈嶅姟;涓撶鍖婚櫌;楠ㄧ鍖婚櫌|鍖荤枟淇濆仴鏈嶅姟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鏀垮簻鍙婄ぞ浼氬洟浣撶浉鍏�;鏀垮簻鍙婄ぞ浼氬洟浣撶浉鍏硘鐢熸椿鏈嶅姟","鍖荤枟淇濆仴鏈嶅姟;涓撶鍖婚櫌;濡囩鍖婚櫌|鍖荤枟淇濆仴鏈嶅姟","璐墿鏈嶅姟;涓撳崠搴�;涓撹惀搴梶鍏徃浼佷笟;鍏徃;鍏徃","浣撹偛浼戦棽鏈嶅姟;浼戦棽鍦烘墍;浼戦棽鍦烘墍|浣撹偛浼戦棽鏈嶅姟","鍏徃浼佷笟;鍏徃;鍏徃|姹借溅缁翠慨","鍟嗗姟浣忓畢;浣忓畢鍖�;绀惧尯涓績|绉戞暀鏂囧寲鏈嶅姟","鐢熸椿鏈嶅姟;缇庡缇庡彂搴�;缇庡缇庡彂搴梶鍏徃浼佷笟","璐墿鏈嶅姟;鑺遍笩楸艰櫕甯傚満;鑺卞崏甯傚満|椁愰ギ鏈嶅姟","姹借溅閿�鍞�;绾㈡棗閿�鍞�;绾㈡棗閿�鍞畖姹借溅缁翠慨","姹借溅閿�鍞�;闀垮煄姹借溅閿�鍞�;榄忔淳姹借溅閿�鍞畖姹借溅缁翠慨","璐墿鏈嶅姟;涓撳崠搴�;鑷杞︿笓鍗栧簵|鐢熸椿鏈嶅姟;缁翠慨绔欑偣;缁翠慨绔欑偣","鍦板悕鍦板潃淇℃伅;鑷劧鍦板悕;婀栨硦|鍦板悕鍦板潃淇℃伅","璐墿鏈嶅姟;缁煎悎甯傚満;鏋滃搧甯傚満|鐢熸椿鏈嶅姟","璐墿鏈嶅姟;瓒呯骇甯傚満;瓒呭競|椁愰ギ鏈嶅姟","浣忓鏈嶅姟;鏃呴鎷涘緟鎵�;鏃呴鎷涘緟鎵�|璐墿鏈嶅姟","鍏徃浼佷笟;鍏徃;鏈烘鐢靛瓙|鐢熸椿鏈嶅姟","鍟嗗姟浣忓畢;浜т笟鍥尯;浜т笟鍥尯|鐢熸椿鏈嶅姟","璐墿鏈嶅姟;涓撳崠搴�;瀹犵墿鐢ㄥ搧搴梶鐢熸椿鏈嶅姟","姹借溅閿�鍞�;鏍囪嚧闆搧榫欑壒绾﹂攢鍞�;涓滈闆搧榫欓攢鍞畖姹借溅缁翠慨","璐墿鏈嶅姟;涓撳崠搴�;鐑熼厭涓撳崠搴梶浣撹偛浼戦棽鏈嶅姟","璐墿鏈嶅姟;缁煎悎甯傚満;姘翠骇娴烽矞甯傚満|鍏徃浼佷笟","璐墿鏈嶅姟;涓撳崠搴�;涓撹惀搴梶鐢熸椿鏈嶅姟;鐢熸椿鏈嶅姟鍦烘墍;鐢熸椿鏈嶅姟鍦烘墍","鍟嗗姟浣忓畢;浣忓畢鍖�;绀惧尯涓績|浣撹偛浼戦棽鏈嶅姟","姹借溅閿�鍞�;涓夎彵鐗圭害閿�鍞�;骞挎苯涓夎彵閿�鍞畖姹借溅缁翠慨","鎽╂墭杞︽湇鍔�;鎽╂墭杞︾淮淇�;鎽╂墭杞︾淮淇畖鎽╂墭杞︽湇鍔�","璐墿鏈嶅姟;瀹剁數鐢靛瓙鍗栧満;瀹剁數鐢靛瓙鍗栧満|璐墿鏈嶅姟","閲戣瀺淇濋櫓鏈嶅姟;閾惰;涓浗閭斂鍌ㄨ搫閾惰|鐢熸椿鏈嶅姟","绉戞暀鏂囧寲鏈嶅姟;瀛︽牎;鎴愪汉鏁欒偛|绉戞暀鏂囧寲鏈嶅姟","璐墿鏈嶅姟;璐墿鐩稿叧鍦烘墍;璐墿鐩稿叧鍦烘墍|姹借溅閿�鍞�","姹借溅閿�鍞�;鏍囪嚧闆搧榫欑壒绾﹂攢鍞�;涓滈鏍囪嚧閿�鍞畖姹借溅缁翠慨","鍦板悕鍦板潃淇℃伅;鑷劧鍦板悕;娌欐紶","璐墿鏈嶅姟;涓撳崠搴�;涓撹惀搴梶姹借溅缁翠慨","璐墿鏈嶅姟;鏈嶈闉嬪附鐨叿搴�;鏈嶈闉嬪附鐨叿搴梶鍏徃浼佷笟;鍏徃;鍏徃","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;浜ら�氳溅杈嗙鐞�;浜ら�氭墽娉曠珯|鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","璐墿鏈嶅姟;瓒呯骇甯傚満;瓒呭競|鍏徃浼佷笟","鍏徃浼佷笟;鍏徃;寤虹瓚鍏徃|鍏徃浼佷笟","鐢熸椿鏈嶅姟;缁翠慨绔欑偣;缁翠慨绔欑偣|鍏徃浼佷笟","鍏徃浼佷笟;鍏徃;鏈烘鐢靛瓙|姹借溅鏈嶅姟","鍟嗗姟浣忓畢;妤煎畤;鍟嗗姟鍐欏瓧妤紎鐢熸椿鏈嶅姟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鏀垮簻鏈哄叧;鐪佺洿杈栧競绾ф斂搴滃強浜嬩笟鍗曚綅|绉戞暀鏂囧寲鏈嶅姟","浣忓鏈嶅姟;鏃呴鎷涘緟鎵�;鏃呴鎷涘緟鎵�|浣忓鏈嶅姟;瀹鹃閰掑簵;瀹鹃閰掑簵","浣撹偛浼戦棽鏈嶅姟;濞变箰鍦烘墍;妫嬬墝瀹璐墿鏈嶅姟","姹借溅閿�鍞�;璐ц溅閿�鍞�;璐ц溅閿�鍞畖姹借溅缁翠慨","璐墿鏈嶅姟;缁煎悎甯傚満;缁煎悎甯傚満|璐墿鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;杩愬姩鍦洪;杩愬姩鍦烘墍|绉戞暀鏂囧寲鏈嶅姟","鐢熸椿鏈嶅姟;缇庡缇庡彂搴�;缇庡缇庡彂搴梶鍟嗗姟浣忓畢","浣撹偛浼戦棽鏈嶅姟;杩愬姩鍦洪;鍋ヨ韩涓績|浣撹偛浼戦棽鏈嶅姟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鏀垮簻鏈哄叧;涔¢晣浠ヤ笅绾ф斂搴滃強浜嬩笟鍗曚綅|绉戞暀鏂囧寲鏈嶅姟","姹借溅缁翠慨;涓滈鐗圭害缁翠慨;涓滈缁翠慨|姹借溅閿�鍞�","鐢熸椿鏈嶅姟;鐢熸椿鏈嶅姟鍦烘墍;鐢熸椿鏈嶅姟鍦烘墍|鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","璐墿鏈嶅姟;缁煎悎甯傚満;鏃ц揣甯傚満|鐢熸椿鏈嶅姟","閲戣瀺淇濋櫓鏈嶅姟;閲戣瀺淇濋櫓鏈嶅姟鏈烘瀯;閲戣瀺淇濋櫓鏈烘瀯|鐢熸椿鏈嶅姟","鍏徃浼佷笟;鍏徃;寤虹瓚鍏徃|鐢熸椿鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;杩愬姩鍦洪;鍋ヨ韩涓績|绉戞暀鏂囧寲鏈嶅姟","鍏徃浼佷笟;鍏徃;鍏徃|浣忓鏈嶅姟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鍏娉曟満鏋�;绀句細娌诲畨鏈烘瀯|鍏徃浼佷笟","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;寤烘潗浜旈噾甯傚満|鍏徃浼佷笟;宸ュ巶;宸ュ巶","鐢熸椿鏈嶅姟;缇庡缇庡彂搴�;缇庡缇庡彂搴梶绉戞暀鏂囧寲鏈嶅姟","绉戞暀鏂囧寲鏈嶅姟;鍩硅鏈烘瀯;鍩硅鏈烘瀯|椁愰ギ鏈嶅姟","璐墿鏈嶅姟;鏂囧寲鐢ㄥ搧搴�;鏂囧寲鐢ㄥ搧搴梶鍏徃浼佷笟","鍏徃浼佷笟;鍏徃;鍏徃|璐墿鏈嶅姟;涓撳崠搴�;涓撹惀搴�","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鏀垮簻鏈哄叧;鏀垮簻鏈哄叧鐩稿叧|鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","鐢熸椿鏈嶅姟;娲楄。搴�;娲楄。搴梶璐墿鏈嶅姟","閫氳璁炬柦;铏氭嫙闂�;铏氭嫙闂�","姹借溅鏈嶅姟;姹借溅鏈嶅姟鐩稿叧;姹借溅鏈嶅姟鐩稿叧|鍏徃浼佷笟","鍦板悕鍦板潃淇℃伅;鏅�氬湴鍚�;鏉戝簞绾у湴鍚峾椁愰ギ鏈嶅姟","鍦板悕鍦板潃淇℃伅;浜ら�氬湴鍚�;妗鍦板悕鍦板潃淇℃伅","浣撹偛浼戦棽鏈嶅姟;濞变箰鍦烘墍;缃戝惂|璐墿鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;杩愬姩鍦洪;鍙扮悆鍘厊浣撹偛浼戦棽鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;搴﹀亣鐤楀吇鍦烘墍;搴﹀亣鏉憒浣撹偛浼戦棽鏈嶅姟","鍏徃浼佷笟;鍏徃;鍏徃|鍏徃浼佷笟;宸ュ巶;宸ュ巶","浜ら�氳鏂芥湇鍔�;涓婁笅瀹㈠尯;鍑虹杞�","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鏀垮簻鏈哄叧;鍦板競绾ф斂搴滃強浜嬩笟鍗曚綅|绉戞暀鏂囧寲鏈嶅姟","浜ら�氳鏂芥湇鍔�;鏈哄満鐩稿叧;鏈哄満鐩稿叧","浣撹偛浼戦棽鏈嶅姟;濞变箰鍦烘墍;濞变箰鍦烘墍|鐢熸椿鏈嶅姟","鐢熸椿鏈嶅姟;閭眬;閭斂閫熼�抾鐢熸椿鏈嶅姟","璐墿鏈嶅姟;涓撳崠搴�;涓撹惀搴梶椁愰ギ鏈嶅姟;鑼惰壓棣�;鑼惰壓棣�","鍟嗗姟浣忓畢;浣忓畢鍖�;浣忓畢鍖簗鐢熸椿鏈嶅姟","鐢熸椿鏈嶅姟;鐢熸椿鏈嶅姟鍦烘墍;鐢熸椿鏈嶅姟鍦烘墍|閲戣瀺淇濋櫓鏈嶅姟","椁愰ギ鏈嶅姟;鑼惰壓棣�;鑼惰壓棣唡浣撹偛浼戦棽鏈嶅姟","璐墿鏈嶅姟;涓撳崠搴�;閽熻〃搴梶鐢熸椿鏈嶅姟","璐墿鏈嶅姟;瀹剁數鐢靛瓙鍗栧満;瀹剁數鐢靛瓙鍗栧満|姹借溅鏈嶅姟","璐墿鏈嶅姟;璐墿鐩稿叧鍦烘墍;璐墿鐩稿叧鍦烘墍|鍟嗗姟浣忓畢","姹借溅缁翠慨;澶т紬鐗圭害缁翠慨;涓婃捣澶т紬缁翠慨|姹借溅閿�鍞�","浣撹偛浼戦棽鏈嶅姟;浼戦棽鍦烘墍;娓镐箰鍦簗浣撹偛浼戦棽鏈嶅姟","鐢熸椿鏈嶅姟;鎽勫奖鍐插嵃搴�;鎽勫奖鍐插嵃|鐢熸椿鏈嶅姟","閲戣瀺淇濋櫓鏈嶅姟;鑷姩鎻愭鏈�;鍐滄潙鍟嗕笟閾惰ATM|閲戣瀺淇濋櫓鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;濞变箰鍦烘墍;妫嬬墝瀹鐢熸椿鏈嶅姟","姹借溅鏈嶅姟;姹借溅閰嶄欢閿�鍞�;姹借溅閰嶄欢閿�鍞畖鐢熸椿鏈嶅姟","鍏徃浼佷笟;鍐滄灄鐗ф笖鍩哄湴;鍏跺畠鍐滄灄鐗ф笖鍩哄湴|浣撹偛浼戦棽鏈嶅姟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;宸ュ晢绋庡姟鏈烘瀯;宸ュ晢閮ㄩ棬|鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;寤烘潗浜旈噾甯傚満|鍟嗗姟浣忓畢","浣撹偛浼戦棽鏈嶅姟;濞变箰鍦烘墍;閰掑惂|浣撹偛浼戦棽鏈嶅姟","璐墿鏈嶅姟;涓撳崠搴�;涓撹惀搴梶姹借溅鏈嶅姟;姹借溅鏈嶅姟鐩稿叧;姹借溅鏈嶅姟鐩稿叧","鍏徃浼佷笟;鍏徃;鍟嗕笟璐告槗|姹借溅鏈嶅姟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鍏娉曟満鏋�;娑堥槻鏈哄叧|鐢熸椿鏈嶅姟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鏀垮簻鏈哄叧;涔¢晣绾ф斂搴滃強浜嬩笟鍗曚綅|璐墿鏈嶅姟","鍟嗗姟浣忓畢;鍟嗗姟浣忓畢鐩稿叧;鍟嗗姟浣忓畢鐩稿叧|璐墿鏈嶅姟","浜ら�氳鏂芥湇鍔�;鏈哄満鐩稿叧;鍊欐満瀹�","浜ら�氳鏂芥湇鍔�;娓彛鐮佸ご;杞︽浮鍙�","鐢熸椿鏈嶅姟;閭眬;閭眬|鍏徃浼佷笟","璐墿鏈嶅姟;瀹剁數鐢靛瓙鍗栧満;缁煎悎瀹剁數鍟嗗満|璐墿鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;杩愬姩鍦洪;娓告吵棣唡浣撹偛浼戦棽鏈嶅姟","鐢熸椿鏈嶅姟;鏃呰绀�;鏃呰绀緗鍏徃浼佷笟","璐墿鏈嶅姟;鏂囧寲鐢ㄥ搧搴�;鏂囧寲鐢ㄥ搧搴梶璐墿鏈嶅姟","璐墿鏈嶅姟;鐗硅壊鍟嗕笟琛�;姝ヨ琛梶鍦板悕鍦板潃淇℃伅","绉戞暀鏂囧寲鏈嶅姟;瀛︽牎;骞煎効鍥瓅鐢熸椿鏈嶅姟","璐墿鏈嶅姟;缁煎悎甯傚満;钄彍甯傚満|鐢熸椿鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;浼戦棽鍦烘墍;娓镐箰鍦簗璐墿鏈嶅姟","姹借溅閿�鍞�;姹借溅閿�鍞�;姹借溅閿�鍞畖鍏徃浼佷笟","璐墿鏈嶅姟;缁煎悎甯傚満;鍐滃壇浜у搧甯傚満|璐墿鏈嶅姟;瓒呯骇甯傚満;瓒呭競","璐墿鏈嶅姟;鑺遍笩楸艰櫕甯傚満;鑺卞崏甯傚満|鍟嗗姟浣忓畢","浣忓鏈嶅姟;鏃呴鎷涘緟鎵�;鏃呴鎷涘緟鎵�|鍟嗗姟浣忓畢;鍟嗗姟浣忓畢鐩稿叧;鍟嗗姟浣忓畢鐩稿叧","鍏徃浼佷笟;鍏徃;缃戠粶绉戞妧|鍏徃浼佷笟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鏀垮簻鏈哄叧;鏀垮簻鏈哄叧鐩稿叧|鍏徃浼佷笟;鍏徃浼佷笟;鍏徃浼佷笟","璐墿鏈嶅姟;鏈嶈闉嬪附鐨叿搴�;鏈嶈闉嬪附鐨叿搴梶鍟嗗姟浣忓畢","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;浜ら�氳溅杈嗙鐞�;杞﹁締绠$悊鏈烘瀯|鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","椁愰ギ鏈嶅姟;蹇鍘�;楹﹀綋鍔硘椁愰ギ鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;浼戦棽鍦烘墍;浼戦棽鍦烘墍|绉戞暀鏂囧寲鏈嶅姟","鍖荤枟淇濆仴鏈嶅姟;涓撶鍖婚櫌;鍙h厰鍖婚櫌|鍖荤枟淇濆仴鏈嶅姟;璇婃墍;璇婃墍","姹借溅閿�鍞�;姹熸樊閿�鍞�;姹熸樊閿�鍞畖姹借溅缁翠慨","椁愰ギ鏈嶅姟;澶栧浗椁愬巺;鐗涙墥搴�(鎵掓埧)|椁愰ギ鏈嶅姟","璐墿鏈嶅姟;涓撳崠搴�;涔﹀簵|璐墿鏈嶅姟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;绀句細鍥綋;琛屼笟鍗忎細|鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","鍟嗗姟浣忓畢;浣忓畢鍖�;浣忓畢鍖簗浣忓鏈嶅姟","璐墿鏈嶅姟;涓撳崠搴�;涓撹惀搴梶浣撹偛浼戦棽鏈嶅姟","椁愰ギ鏈嶅姟;蹇鍘�;鑲痉鍩簗椁愰ギ鏈嶅姟","姹借溅缁翠慨;姹借溅缁翠慨;姹借溅缁翠慨|姹借溅鏈嶅姟;姹借溅鏈嶅姟鐩稿叧;姹借溅鏈嶅姟鐩稿叧","椁愰ギ鏈嶅姟;涓鍘�;娴烽矞閰掓ゼ|浣忓鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;搴﹀亣鐤楀吇鍦烘墍;搴﹀亣鏉憒浣忓鏈嶅姟","璐墿鏈嶅姟;涓撳崠搴�;鐪奸暅搴梶鍏徃浼佷笟","浣撹偛浼戦棽鏈嶅姟;濞变箰鍦烘墍;缃戝惂|浣撹偛浼戦棽鏈嶅姟","璐墿鏈嶅姟;鍟嗗満;鍟嗗満|璐墿鏈嶅姟","璐墿鏈嶅姟;鍟嗗満;鏅�氬晢鍦簗鐢熸椿鏈嶅姟","鍏徃浼佷笟;鍏徃;鍏徃|浣撹偛浼戦棽鏈嶅姟","浣忓鏈嶅姟;瀹鹃閰掑簵;涓夋槦绾у棣唡椁愰ギ鏈嶅姟","鍦板悕鍦板潃淇℃伅;浜ら�氬湴鍚�;鐜矝鍚�","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;寤烘潗浜旈噾甯傚満|鍏徃浼佷笟;鍏徃浼佷笟;鍏徃浼佷笟","璐墿鏈嶅姟;缁煎悎甯傚満;钄彍甯傚満|椁愰ギ鏈嶅姟","鍦板悕鍦板潃淇℃伅;鏅�氬湴鍚�;鏉戠粍绾у湴鍚峾鍦板悕鍦板潃淇℃伅","璐墿鏈嶅姟;瀹剁數鐢靛瓙鍗栧満;鏁扮爜鐢靛瓙|姹借溅鏈嶅姟","璐墿鏈嶅姟;缁煎悎甯傚満;鍐滃壇浜у搧甯傚満|椁愰ギ鏈嶅姟;椁愰ギ鐩稿叧鍦烘墍;椁愰ギ鐩稿叧","椁愰ギ鏈嶅姟;涓鍘�;涓滃寳鑿渱椁愰ギ鏈嶅姟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鏀垮簻鏈哄叧;鏀垮簻鏈哄叧鐩稿叧|鍟嗗姟浣忓畢","姹借溅缁翠慨;姹借溅缁翠慨;姹借溅缁翠慨|璐墿鏈嶅姟","姹借溅閿�鍞�;璐ц溅閿�鍞�;璐ц溅閿�鍞畖姹借溅鏈嶅姟","鐢熸椿鏈嶅姟;鐢佃钀ヤ笟鍘�;涓浗鐢典俊钀ヤ笟鍘厊璐墿鏈嶅姟;瀹剁數鐢靛瓙鍗栧満;鎵嬫満閿�鍞�","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;鐏叿鐡峰櫒甯傚満|鐢熸椿鏈嶅姟","浣忓鏈嶅姟;瀹鹃閰掑簵;鍥涙槦绾у棣唡椁愰ギ鏈嶅姟;椁愰ギ鐩稿叧鍦烘墍;椁愰ギ鐩稿叧","鐢熸椿鏈嶅姟;浜烘墠甯傚満;浜烘墠甯傚満|鐢熸椿鏈嶅姟","绉戞暀鏂囧寲鏈嶅姟;瀛︽牎;瀛︽牎|绉戞暀鏂囧寲鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;濞变箰鍦烘墍;妫嬬墝瀹浣撹偛浼戦棽鏈嶅姟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;绀句細鍥綋;绀句細鍥綋鐩稿叧|鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","姹借溅缁翠慨;鏃ヤ骇鐗圭害缁翠慨;涓滈鏃ヤ骇缁翠慨|姹借溅閿�鍞�","璐墿鏈嶅姟;璐墿鐩稿叧鍦烘墍;璐墿鐩稿叧鍦烘墍|姹借溅缁翠慨","椁愰ギ鏈嶅姟;涓鍘�;婀栧崡鑿�(婀樿彍)|椁愰ギ鏈嶅姟","鍏徃浼佷笟;鍏徃;鍟嗕笟璐告槗|鍏徃浼佷笟","璐墿鏈嶅姟;涓撳崠搴�;鐝犲疂棣栭グ宸ヨ壓鍝亅椁愰ギ鏈嶅姟","璐墿鏈嶅姟;鍟嗗満;鏅�氬晢鍦簗鍏徃浼佷笟","璐墿鏈嶅姟;鑺遍笩楸艰櫕甯傚満;瀹犵墿甯傚満|璐墿鏈嶅姟","鍦板悕鍦板潃淇℃伅;鑷劧鍦板悕;灞辫剦","鐢熸椿鏈嶅姟;娲楁荡鎺ㄦ嬁鍦烘墍;娲楁荡鎺ㄦ嬁鍦烘墍|鍟嗗姟浣忓畢","鍖荤枟淇濆仴鏈嶅姟;鐤剧梾棰勯槻鏈烘瀯;鐤剧梾棰勯槻|鍖荤枟淇濆仴鏈嶅姟","鍦板悕鍦板潃淇℃伅;浜ら�氬湴鍚�;绔嬩氦妗鍦板悕鍦板潃淇℃伅","椋庢櫙鍚嶈儨;椋庢櫙鍚嶈儨;绾㈣壊鏅尯|椋庢櫙鍚嶈儨","鐢熸椿鏈嶅姟;鐗╂祦閫熼��;鐗╂祦閫熼�抾姹借溅鏈嶅姟","璐墿鏈嶅姟;涓撳崠搴�;涓撹惀搴梶鎽╂墭杞︽湇鍔�","閲戣瀺淇濋櫓鏈嶅姟;閾惰;涓浗鍐滀笟閾惰|閲戣瀺淇濋櫓鏈嶅姟","鍏徃浼佷笟;鍏徃;鍏徃|璐墿鏈嶅姟;鏈嶈闉嬪附鐨叿搴�;鏈嶈闉嬪附鐨叿搴�","鍏徃浼佷笟;鍏徃;寤虹瓚鍏徃|璐墿鏈嶅姟","椁愰ギ鏈嶅姟;涓鍘�;浜戣吹鑿渱椁愰ギ鏈嶅姟","鍟嗗姟浣忓畢;浣忓畢鍖�;浣忓畢灏忓尯|浣忓鏈嶅姟;鏃呴鎷涘緟鎵�;鏃呴鎷涘緟鎵�","姹借溅缁翠慨;鐜颁唬鐗圭害缁翠慨;鍖椾含鐜颁唬缁翠慨|姹借溅閿�鍞�","椁愰ギ鏈嶅姟;蹇鍘�;蹇鍘厊鐢熸椿鏈嶅姟","鍏徃浼佷笟;鍏徃;鍟嗕笟璐告槗|鐢熸椿鏈嶅姟","姹借溅閿�鍞�;涓扮敯鐗圭害閿�鍞�;闆峰厠钀ㄦ柉閿�鍞畖姹借溅缁翠慨","绉戞暀鏂囧寲鏈嶅姟;瀛︽牎;骞煎効鍥瓅璐墿鏈嶅姟","璐墿鏈嶅姟;涓撳崠搴�;鐝犲疂棣栭グ宸ヨ壓鍝亅绉戞暀鏂囧寲鏈嶅姟","姹借溅鏈嶅姟;姹借溅鏈嶅姟鐩稿叧;姹借溅鏈嶅姟鐩稿叧|姹借溅缁翠慨;姹借溅缁翠慨;姹借溅缁翠慨","椁愰ギ鏈嶅姟;鑼惰壓棣�;鑼惰壓棣唡璐墿鏈嶅姟;涓撳崠搴�;涓撹惀搴�","鍟嗗姟浣忓畢;鍟嗗姟浣忓畢鐩稿叧;鍟嗗姟浣忓畢鐩稿叧|浣忓鏈嶅姟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鍏娉曟満鏋�;绀句細娌诲畨鏈烘瀯|鐢熸椿鏈嶅姟","鐢熸椿鏈嶅姟;浜嬪姟鎵�;寰嬪笀浜嬪姟鎵�|鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","浣撹偛浼戦棽鏈嶅姟;濞变箰鍦烘墍;濞变箰鍦烘墍|璐墿鏈嶅姟","姹借溅鏈嶅姟;浜屾墜杞︿氦鏄�;浜屾墜杞︿氦鏄搢姹借溅鏈嶅姟","椋庢櫙鍚嶈儨;鍏洯骞垮満;鍩庡競骞垮満|璐墿鏈嶅姟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鏀垮簻鏈哄叧;鏀垮簻鏈哄叧鐩稿叧|閲戣瀺淇濋櫓鏈嶅姟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;绀句細鍥綋;绀句細鍥綋鐩稿叧|鍏徃浼佷笟;鍏徃浼佷笟;鍏徃浼佷笟","璐墿鏈嶅姟;浣撹偛鐢ㄥ搧搴�;浣撹偛鐢ㄥ搧搴梶璐墿鏈嶅姟","閲戣瀺淇濋櫓鏈嶅姟;閾惰;涓浗閭斂鍌ㄨ搫閾惰|閲戣瀺淇濋櫓鏈嶅姟","鍟嗗姟浣忓畢;浣忓畢鍖�;鍒|鍟嗗姟浣忓畢","姹借溅缁翠慨;闀垮畨姹借溅缁翠慨;闀垮畨姹借溅缁翠慨|姹借溅閿�鍞�","椁愰ギ鏈嶅姟;椁愰ギ鐩稿叧鍦烘墍;椁愰ギ鐩稿叧|浣撹偛浼戦棽鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;浼戦棽鍦烘墍;浼戦棽鍦烘墍|鍏徃浼佷笟","浣撹偛浼戦棽鏈嶅姟;濞变箰鍦烘墍;缃戝惂|鍏徃浼佷笟","姹借溅鏈嶅姟;姹借溅閰嶄欢閿�鍞�;姹借溅閰嶄欢閿�鍞畖姹借溅閿�鍞�","姹借溅缁翠慨;绂忕壒鐗圭害缁翠慨;绂忕壒缁翠慨|姹借溅閿�鍞�","璐墿鏈嶅姟;渚挎皯鍟嗗簵/渚垮埄搴�;渚挎皯鍟嗗簵/渚垮埄搴梶浣忓鏈嶅姟","浣忓鏈嶅姟;瀹鹃閰掑簵;缁忔祹鍨嬭繛閿侀厭搴梶璐墿鏈嶅姟","鍟嗗姟浣忓畢;浣忓畢鍖�;浣忓畢鍖簗璐墿鏈嶅姟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鍏娉曟満鏋�;娑堥槻鏈哄叧|鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","鐢熸椿鏈嶅姟;缇庡缇庡彂搴�;缇庡缇庡彂搴梶浣撹偛浼戦棽鏈嶅姟","璐墿鏈嶅姟;瀹剁數鐢靛瓙鍗栧満;鏁扮爜鐢靛瓙|鐢熸椿鏈嶅姟;缁翠慨绔欑偣;缁翠慨绔欑偣","閲戣瀺淇濋櫓鏈嶅姟;閾惰;涓浗宸ュ晢閾惰|閲戣瀺淇濋櫓鏈嶅姟","椁愰ギ鏈嶅姟;绯曢ゼ搴�;绯曢ゼ搴梶鍏徃浼佷笟","绉戞暀鏂囧寲鏈嶅姟;缇庢湳棣�;缇庢湳棣唡绉戞暀鏂囧寲鏈嶅姟","璐墿鏈嶅姟;缁煎悎甯傚満;灏忓晢鍝佸競鍦簗璐墿鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;浣撹偛浼戦棽鏈嶅姟鍦烘墍;浣撹偛浼戦棽鏈嶅姟鍦烘墍|椁愰ギ鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;濞变箰鍦烘墍;濞变箰鍦烘墍|浣撹偛浼戦棽鏈嶅姟","閲戣瀺淇濋櫓鏈嶅姟;閲戣瀺淇濋櫓鏈嶅姟鏈烘瀯;閲戣瀺淇濋櫓鏈烘瀯|姹借溅鏈嶅姟","椁愰ギ鏈嶅姟;涓鍘�;骞夸笢鑿�(绮よ彍)|椁愰ギ鏈嶅姟","姹借溅鏈嶅姟;浜屾墜杞︿氦鏄�;浜屾墜杞︿氦鏄搢璐墿鏈嶅姟","鐢熸椿鏈嶅姟;鐗╂祦閫熼��;鐗╂祦閫熼�抾姹借溅閿�鍞�","璐墿鏈嶅姟;涓撳崠搴�;鑷杞︿笓鍗栧簵|鎽╂墭杞︽湇鍔�;鎽╂墭杞﹂攢鍞�;鎽╂墭杞﹂攢鍞�","璐墿鏈嶅姟;涓撳崠搴�;鑷杞︿笓鍗栧簵|璐墿鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;浼戦棽鍦烘墍;浼戦棽鍦烘墍|椋庢櫙鍚嶈儨","鐢熸椿鏈嶅姟;鐢熸椿鏈嶅姟鍦烘墍;鐢熸椿鏈嶅姟鍦烘墍|浣撹偛浼戦棽鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;搴﹀亣鐤楀吇鍦烘墍;搴﹀亣鏉憒椋庢櫙鍚嶈儨","鐢熸椿鏈嶅姟;閭眬;閭斂閫熼�抾鍏徃浼佷笟","浣撹偛浼戦棽鏈嶅姟;搴﹀亣鐤楀吇鍦烘墍;鐤楀吇闄鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","浣撹偛浼戦棽鏈嶅姟;杩愬姩鍦洪;鍋ヨ韩涓績|璐墿鏈嶅姟","鍏徃浼佷笟;鍏徃;骞垮憡瑁呴グ|璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;寤烘潗浜旈噾甯傚満","鐢熸椿鏈嶅姟;鐢佃钀ヤ笟鍘�;涓浗绉诲姩钀ヤ笟鍘厊鐢熸椿鏈嶅姟","閲戣瀺淇濋櫓鏈嶅姟;閾惰;涓浗閾惰|閲戣瀺淇濋櫓鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;浼戦棽鍦烘墍;浼戦棽鍦烘墍|璐墿鏈嶅姟","姹借溅鏈嶅姟;姹借溅绉熻祦;姹借溅绉熻祦|鐢熸椿鏈嶅姟","姹借溅鏈嶅姟;姹借溅閰嶄欢閿�鍞�;姹借溅閰嶄欢閿�鍞畖姹借溅缁翠慨;姹借溅缁翠慨;姹借溅缁翠慨","姹借溅閿�鍞�;鏂反椴佺壒绾﹂攢鍞�;鏂反椴侀攢鍞畖姹借溅缁翠慨","椁愰ギ鏈嶅姟;鑼惰壓棣�;鑼惰壓棣唡鐢熸椿鏈嶅姟","璐墿鏈嶅姟;瀹剁數鐢靛瓙鍗栧満;鏁扮爜鐢靛瓙|鍏徃浼佷笟;鍏徃;鍏徃","璐墿鏈嶅姟;瀹剁數鐢靛瓙鍗栧満;缁煎悎瀹剁數鍟嗗満|鐢熸椿鏈嶅姟","鍟嗗姟浣忓畢;妤煎畤;鍟嗗姟鍐欏瓧妤紎浣忓鏈嶅姟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;绀句細鍥綋;娈嬭仈|鐢熸椿鏈嶅姟","璐墿鏈嶅姟;鍟嗗満;璐墿涓績|鍟嗗姟浣忓畢","浣撹偛浼戦棽鏈嶅姟;浣撹偛浼戦棽鏈嶅姟鍦烘墍;浣撹偛浼戦棽鏈嶅姟鍦烘墍|璐墿鏈嶅姟","鍏徃浼佷笟;鍏徃浼佷笟;鍏徃浼佷笟|閲戣瀺淇濋櫓鏈嶅姟","鎽╂墭杞︽湇鍔�;鎽╂墭杞︽湇鍔$浉鍏�;鎽╂墭杞︽湇鍔$浉鍏硘璐墿鏈嶅姟","姹借溅缁翠慨;姹借溅缁煎悎缁翠慨;姹借溅缁煎悎缁翠慨|鐢熸椿鏈嶅姟","姹借溅缁翠慨;璐ц溅缁翠慨;璐ц溅缁翠慨|姹借溅缁翠慨","璐墿鏈嶅姟;瀹剁數鐢靛瓙鍗栧満;鎵嬫満閿�鍞畖鐢熸椿鏈嶅姟;缁翠慨绔欑偣;缁翠慨绔欑偣","璐墿鏈嶅姟;鏈嶈闉嬪附鐨叿搴�;鍝佺墝闉嬪簵|璐墿鏈嶅姟","璐墿鏈嶅姟;缁煎悎甯傚満;鏃ц揣甯傚満|璐墿鏈嶅姟","浣忓鏈嶅姟;瀹鹃閰掑簵;瀹鹃閰掑簵|椁愰ギ鏈嶅姟;涓鍘�;涓鍘�","姹借溅閿�鍞�;鍚夊埄鐗圭害閿�鍞�;娌冨皵娌冮攢鍞畖姹借溅缁翠慨","鐢熸椿鏈嶅姟;濠村効鏈嶅姟鍦烘墍;濠村効娓告吵棣唡浣撹偛浼戦棽鏈嶅姟","璐墿鏈嶅姟;鐗硅壊鍟嗕笟琛�;鐗硅壊鍟嗕笟琛梶椁愰ギ鏈嶅姟","椁愰ギ鏈嶅姟;鐢滃搧搴�;鐢滃搧搴梶璐墿鏈嶅姟","浜ら�氳鏂芥湇鍔�;娓彛鐮佸ご;瀹㈣繍娓�","浣撹偛浼戦棽鏈嶅姟;濞变箰鍦烘墍;缃戝惂|椁愰ギ鏈嶅姟","鍏徃浼佷笟;鍐滄灄鐗ф笖鍩哄湴;鍏跺畠鍐滄灄鐗ф笖鍩哄湴|鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","鐢熸椿鏈嶅姟;娲楁荡鎺ㄦ嬁鍦烘墍;娲楁荡鎺ㄦ嬁鍦烘墍|鍏徃浼佷笟","璐墿鏈嶅姟;涓撳崠搴�;鐑熼厭涓撳崠搴梶璐墿鏈嶅姟;渚挎皯鍟嗗簵/渚垮埄搴�;渚挎皯鍟嗗簵/渚垮埄搴�","璐墿鏈嶅姟;浣撹偛鐢ㄥ搧搴�;浣撹偛鐢ㄥ搧搴梶鍏徃浼佷笟","璐墿鏈嶅姟;渚挎皯鍟嗗簵/渚垮埄搴�;渚挎皯鍟嗗簵/渚垮埄搴梶姹借溅鏈嶅姟","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;寤烘潗浜旈噾甯傚満|璐墿鏈嶅姟;涓撳崠搴�;涓撹惀搴�","璐墿鏈嶅姟;涓撳崠搴�;鍙ょ帺瀛楃敾搴梶璐墿鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;浼戦棽鍦烘墍;娓镐箰鍦簗绉戞暀鏂囧寲鏈嶅姟","鍏徃浼佷笟;鍏徃;鍏徃|閲戣瀺淇濋櫓鏈嶅姟;閲戣瀺淇濋櫓鏈嶅姟鏈烘瀯;閲戣瀺淇濋櫓鏈烘瀯","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;绀句細鍥綋;鎱堝杽鏈烘瀯|鐢熸椿鏈嶅姟","姹借溅閿�鍞�;淇濇椂鎹风壒绾﹂攢鍞�;淇濇椂鎹烽攢鍞畖姹借溅缁翠慨","璐墿鏈嶅姟;浣撹偛鐢ㄥ搧搴�;鎴峰鐢ㄥ搧|璐墿鏈嶅姟","閲戣瀺淇濋櫓鏈嶅姟;閾惰;閾惰|閲戣瀺淇濋櫓鏈嶅姟","椁愰ギ鏈嶅姟;涓鍘�;缁煎悎閰掓ゼ|浣撹偛浼戦棽鏈嶅姟","椁愰ギ鏈嶅姟;椁愰ギ鐩稿叧鍦烘墍;椁愰ギ鐩稿叧|浣忓鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;濞变箰鍦烘墍;濞变箰鍦烘墍|椁愰ギ鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;濞变箰鍦烘墍;缃戝惂|鐢熸椿鏈嶅姟","璐墿鏈嶅姟;涓撳崠搴�;涓撹惀搴梶椁愰ギ鏈嶅姟;椁愰ギ鐩稿叧鍦烘墍;椁愰ギ鐩稿叧","浣忓鏈嶅姟;瀹鹃閰掑簵;鍥涙槦绾у棣唡浣忓鏈嶅姟","鍖荤枟淇濆仴鏈嶅姟;涓撶鍖婚櫌;鏁村舰缇庡|鍖荤枟淇濆仴鏈嶅姟","鍦板悕鍦板潃淇℃伅;浜ら�氬湴鍚�;閬撹矾鍚峾鍟嗗姟浣忓畢","鍦板悕鍦板潃淇℃伅;鑷劧鍦板悕;灞眧鍦板悕鍦板潃淇℃伅;鏅�氬湴鍚�;鏉戝簞绾у湴鍚�","椋庢櫙鍚嶈儨;鍏洯骞垮満;鍩庡競骞垮満|鍟嗗姟浣忓畢","璐墿鏈嶅姟;瀹剁數鐢靛瓙鍗栧満;鎵嬫満閿�鍞畖鐢熸椿鏈嶅姟;鐢佃钀ヤ笟鍘�;涓浗鑱旈�氳惀涓氬巺","閲戣瀺淇濋櫓鏈嶅姟;閲戣瀺淇濋櫓鏈嶅姟鏈烘瀯;閲戣瀺淇濋櫓鏈烘瀯|鍏徃浼佷笟","鐢熸椿鏈嶅姟;浜嬪姟鎵�;璇勪及浜嬪姟鎵�|鍏徃浼佷笟","鐢熸椿鏈嶅姟;鐢佃钀ヤ笟鍘�;涓浗鐢典俊钀ヤ笟鍘厊鐢熸椿鏈嶅姟","璐墿鏈嶅姟;璐墿鐩稿叧鍦烘墍;璐墿鐩稿叧鍦烘墍|浣撹偛浼戦棽鏈嶅姟","鍏徃浼佷笟;鍏徃浼佷笟;鍏徃浼佷笟|姹借溅鏈嶅姟","鐢熸椿鏈嶅姟;涓粙鏈烘瀯;涓粙鏈烘瀯|鍟嗗姟浣忓畢","绉戞暀鏂囧寲鏈嶅姟;瀛︽牎;楂樼瓑闄㈡牎|鐢熸椿鏈嶅姟","璐墿鏈嶅姟;瀹剁數鐢靛瓙鍗栧満;瀹剁數鐢靛瓙鍗栧満|鐢熸椿鏈嶅姟;缁翠慨绔欑偣;缁翠慨绔欑偣","椁愰ギ鏈嶅姟;椁愰ギ鐩稿叧鍦烘墍;椁愰ギ鐩稿叧|璐墿鏈嶅姟;璐墿鐩稿叧鍦烘墍;璐墿鐩稿叧鍦烘墍","鍏徃浼佷笟;鍏徃;鍐堕噾鍖栧伐|鐢熸椿鏈嶅姟","鍟嗗姟浣忓畢;浜т笟鍥尯;浜т笟鍥尯|绉戞暀鏂囧寲鏈嶅姟","鍟嗗姟浣忓畢;浣忓畢鍖�;浣忓畢灏忓尯|椋庢櫙鍚嶈儨","鍟嗗姟浣忓畢;浣忓畢鍖�;绀惧尯涓績|鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","绉戞暀鏂囧寲鏈嶅姟;鍩硅鏈烘瀯;鍩硅鏈烘瀯|鍟嗗姟浣忓畢","璐墿鏈嶅姟;瀹剁數鐢靛瓙鍗栧満;瀹剁數鐢靛瓙鍗栧満|椁愰ギ鏈嶅姟","鍦板悕鍦板潃淇℃伅;鑷劧鍦板悕;娌虫祦|鍦板悕鍦板潃淇℃伅","姹借溅鏈嶅姟;姹借溅鏈嶅姟鐩稿叧;姹借溅鏈嶅姟鐩稿叧|閲戣瀺淇濋櫓鏈嶅姟","绉戞暀鏂囧寲鏈嶅姟;椹炬牎;椹炬牎|鐢熸椿鏈嶅姟;鐢熸椿鏈嶅姟鍦烘墍;鐢熸椿鏈嶅姟鍦烘墍","璐墿鏈嶅姟;涓汉鐢ㄥ搧/鍖栧鍝佸簵;鍏跺畠涓汉鐢ㄥ搧搴梶鍏徃浼佷笟","鍏徃浼佷笟;宸ュ巶;宸ュ巶|鐢熸椿鏈嶅姟;鐢熸椿鏈嶅姟鍦烘墍;鐢熸椿鏈嶅姟鍦烘墍","鐢熸椿鏈嶅姟;缇庡缇庡彂搴�;缇庡缇庡彂搴梶鐢熸椿鏈嶅姟;娲楁荡鎺ㄦ嬁鍦烘墍;娲楁荡鎺ㄦ嬁鍦烘墍","绉戞暀鏂囧寲鏈嶅姟;灞曡棣�;灞曡棣唡绉戞暀鏂囧寲鏈嶅姟","璐墿鏈嶅姟;璐墿鐩稿叧鍦烘墍;璐墿鐩稿叧鍦烘墍|椁愰ギ鏈嶅姟;椁愰ギ鐩稿叧鍦烘墍;椁愰ギ鐩稿叧","鍖荤枟淇濆仴鏈嶅姟;涓撶鍖婚櫌;鐪肩鍖婚櫌|鍖荤枟淇濆仴鏈嶅姟","鍟嗗姟浣忓畢;浣忓畢鍖�;浣忓畢灏忓尯|绉戞暀鏂囧寲鏈嶅姟","璐墿鏈嶅姟;鏂囧寲鐢ㄥ搧搴�;鏂囧寲鐢ㄥ搧搴梶绉戞暀鏂囧寲鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;浣撹偛浼戦棽鏈嶅姟鍦烘墍;浣撹偛浼戦棽鏈嶅姟鍦烘墍|鐢熸椿鏈嶅姟","姹借溅缁翠慨;璧蜂簹鐗圭害缁翠慨;涓滈鎮﹁揪璧蜂簹缁翠慨|姹借溅閿�鍞�","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;寤烘潗浜旈噾甯傚満|姹借溅缁翠慨","姹借溅鏈嶅姟;姹借溅鍏绘姢/瑁呴グ;姹借溅鍏绘姢|鍏徃浼佷笟","鐢熸椿鏈嶅姟;涓粙鏈烘瀯;涓粙鏈烘瀯|璐墿鏈嶅姟;璐墿鐩稿叧鍦烘墍;璐墿鐩稿叧鍦烘墍","鐢熸椿鏈嶅姟;涓粙鏈烘瀯;涓粙鏈烘瀯|閲戣瀺淇濋櫓鏈嶅姟","椁愰ギ鏈嶅姟;绯曢ゼ搴�;绯曢ゼ搴梶鐢熸椿鏈嶅姟","姹借溅閿�鍞�;澶т紬鐗圭害閿�鍞�;杩涘彛澶т紬閿�鍞畖姹借溅缁翠慨","璐墿鏈嶅姟;鏈嶈闉嬪附鐨叿搴�;鏈嶈闉嬪附鐨叿搴梶浣撹偛浼戦棽鏈嶅姟","椋庢櫙鍚嶈儨;鍏洯骞垮満;姘存棌棣唡璐墿鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;濞变箰鍦烘墍;KTV|鍟嗗姟浣忓畢","鎽╂墭杞︽湇鍔�;鎽╂墭杞︾淮淇�;鎽╂墭杞︾淮淇畖璐墿鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;浼戦棽鍦烘墍;浼戦棽鍦烘墍|椁愰ギ鏈嶅姟;涓鍘�;涓鍘�","鍟嗗姟浣忓畢;妤煎畤;鍟嗕綇涓ょ敤妤煎畤|璐墿鏈嶅姟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鍏娉曟満鏋�;鍏瘉閴村畾鏈烘瀯|绉戞暀鏂囧寲鏈嶅姟","姹借溅缁翠慨;鍖椾含姹借溅缁翠慨;鍖椾含姹借溅缁翠慨|姹借溅閿�鍞�","姹借溅閿�鍞�;鍏嬭幈鏂嫆鐗圭害閿�鍞�;鍚夋櫘閿�鍞畖姹借溅缁翠慨","鐢熸椿鏈嶅姟;鐗╂祦閫熼��;鐗╂祦閫熼�抾鍟嗗姟浣忓畢","鐢熸椿鏈嶅姟;鑷潵姘磋惀涓氬巺;鑷潵姘磋惀涓氬巺|鍏徃浼佷笟","璐墿鏈嶅姟;瓒呯骇甯傚満;鍗庢鼎|璐墿鏈嶅姟","椁愰ギ鏈嶅姟;涓鍘�;涓鍘厊绉戞暀鏂囧寲鏈嶅姟","椁愰ギ鏈嶅姟;涓鍘�;缁煎悎閰掓ゼ|鍟嗗姟浣忓畢","鍟嗗姟浣忓畢;妤煎畤;鍟嗗姟鍐欏瓧妤紎绉戞暀鏂囧寲鏈嶅姟","鍦板悕鍦板潃淇℃伅;鏅�氬湴鍚�;鏉戝簞绾у湴鍚峾鐢熸椿鏈嶅姟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鏀垮簻鏈哄叧;涔¢晣浠ヤ笅绾ф斂搴滃強浜嬩笟鍗曚綅|鍏徃浼佷笟","鐢熸椿鏈嶅姟;鎽勫奖鍐插嵃搴�;鎽勫奖鍐插嵃|椁愰ギ鏈嶅姟","浜ら�氳鏂芥湇鍔�;涓婁笅瀹㈠尯;涓婁笅瀹㈠尯","姹借溅缁翠慨;姹借溅缁煎悎缁翠慨;姹借溅缁煎悎缁翠慨|姹借溅缁翠慨","璐墿鏈嶅姟;涓撳崠搴�;鑷杞︿笓鍗栧簵|姹借溅缁翠慨","璐墿鏈嶅姟;缁煎悎甯傚満;姘翠骇娴烽矞甯傚満|鐢熸椿鏈嶅姟","椁愰ギ鏈嶅姟;浼戦棽椁愰ギ鍦烘墍;浼戦棽椁愰ギ鍦烘墍|璐墿鏈嶅姟","鍟嗗姟浣忓畢;浣忓畢鍖�;瀹胯垗|浣忓鏈嶅姟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鏀垮簻鏈哄叧;鐪佺洿杈栧競绾ф斂搴滃強浜嬩笟鍗曚綅|鍏徃浼佷笟","璐墿鏈嶅姟;瀹剁數鐢靛瓙鍗栧満;鎵嬫満閿�鍞畖鐢熸椿鏈嶅姟;鐢熸椿鏈嶅姟鍦烘墍;鐢熸椿鏈嶅姟鍦烘墍","璐墿鏈嶅姟;缁煎悎甯傚満;鍐滃壇浜у搧甯傚満|鐢熸椿鏈嶅姟;鐢熸椿鏈嶅姟鍦烘墍;鐢熸椿鏈嶅姟鍦烘墍","姹借溅缁翠慨;璐ц溅缁翠慨;璐ц溅缁翠慨|姹借溅閿�鍞�","璐墿鏈嶅姟;涓撳崠搴�;涓撹惀搴梶姹借溅閿�鍞�","璐墿鏈嶅姟;涓撳崠搴�;涔﹀簵|鐢熸椿鏈嶅姟","椋庢櫙鍚嶈儨;鍏洯骞垮満;鍩庡競骞垮満|浣撹偛浼戦棽鏈嶅姟","鍑哄叆鍙�;鍋滆溅鍦哄嚭鍏ュ彛","姹借溅缁翠慨;鏈敯鐗圭害缁翠慨;涓滈鏈敯缁翠慨|姹借溅閿�鍞�","鐢熸椿鏈嶅姟;涓粙鏈烘瀯;涓粙鏈烘瀯|椁愰ギ鏈嶅姟","浣忓鏈嶅姟;瀹鹃閰掑簵;涓夋槦绾у棣唡浣忓鏈嶅姟","鍦板悕鍦板潃淇℃伅;鏅�氬湴鍚�;鏉戝簞绾у湴鍚峾椋庢櫙鍚嶈儨","璐墿鏈嶅姟;鏈嶈闉嬪附鐨叿搴�;鏈嶈闉嬪附鐨叿搴梶绉戞暀鏂囧寲鏈嶅姟","璐墿鏈嶅姟;鐗硅壊鍟嗕笟琛�;鐗硅壊鍟嗕笟琛梶鐢熸椿鏈嶅姟","椋庢櫙鍚嶈儨;椋庢櫙鍚嶈儨;椋庢櫙鍚嶈儨|浣撹偛浼戦棽鏈嶅姟","浜ら�氳鏂芥湇鍔�;杩囧鍙e哺;杩囧鍙e哺","鍦板悕鍦板潃淇℃伅;鏅�氬湴鍚�;鏉戝簞绾у湴鍚峾鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","姹借溅缁翠慨;閫氱敤鐗圭害缁翠慨;鍒厠缁翠慨|姹借溅閿�鍞�","绉戞暀鏂囧寲鏈嶅姟;鏂囧寲瀹�;鏂囧寲瀹珅绉戞暀鏂囧寲鏈嶅姟","椁愰ギ鏈嶅姟;涓鍘�;涓鍘厊椋庢櫙鍚嶈儨","鍏徃浼佷笟;鍏徃;鍏徃|姹借溅鏈嶅姟;姹借溅鏈嶅姟鐩稿叧;姹借溅鏈嶅姟鐩稿叧","鍟嗗姟浣忓畢;浣忓畢鍖�;浣忓畢鍖簗椁愰ギ鏈嶅姟","姹借溅缁翠慨;骞挎苯浼犵ズ缁翠慨;骞挎苯浼犵ズ缁翠慨|姹借溅閿�鍞�","姹借溅閿�鍞�;鍚夊埄鐗圭害閿�鍞�;娌冨皵娌冩苯杞﹂攢鍞畖姹借溅缁翠慨","鐢熸椿鏈嶅姟;鐗╂祦閫熼��;鐗╂祦閫熼�抾鐢熸椿鏈嶅姟","璐墿鏈嶅姟;缁煎悎甯傚満;钄彍甯傚満|鍏徃浼佷笟","浣忓鏈嶅姟;浣忓鏈嶅姟鐩稿叧;浣忓鏈嶅姟鐩稿叧|鐢熸椿鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;搴﹀亣鐤楀吇鍦烘墍;鐤楀吇闄浣撹偛浼戦棽鏈嶅姟","璐墿鏈嶅姟;涓撳崠搴�;鐑熼厭涓撳崠搴梶浣忓鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;杩愬姩鍦洪;娓告吵棣唡鐢熸椿鏈嶅姟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;绀句細鍥綋;琛屼笟鍗忎細|鍏徃浼佷笟","閲戣瀺淇濋櫓鏈嶅姟;淇濋櫓鍏徃;淇濋櫓鍏徃|鍏徃浼佷笟","閲戣瀺淇濋櫓鏈嶅姟;閾惰;鍐滄潙鍟嗕笟閾惰|璐墿鏈嶅姟","椁愰ギ鏈嶅姟;澶栧浗椁愬巺;鏃ユ湰鏂欑悊|椁愰ギ鏈嶅姟","鐢熸椿鏈嶅姟;鐢佃钀ヤ笟鍘�;涓浗鐢典俊钀ヤ笟鍘厊鍏徃浼佷笟;鍏徃;鐢典俊鍏徃","璐墿鏈嶅姟;涓撳崠搴�;鍙ょ帺瀛楃敾搴梶椁愰ギ鏈嶅姟","閲戣瀺淇濋櫓鏈嶅姟;閾惰;鍐滄潙鍟嗕笟閾惰|鐢熸椿鏈嶅姟","浜ら�氳鏂芥湇鍔�;鍋滆溅鍦�;鍏叡鍋滆溅鍦簗浜ら�氳鏂芥湇鍔�;鍋滆溅鍦�;璺竟鍋滆溅鍦�","浣忓鏈嶅姟;浣忓鏈嶅姟鐩稿叧;浣忓鏈嶅姟鐩稿叧|浣撹偛浼戦棽鏈嶅姟;搴﹀亣鐤楀吇鍦烘墍;搴﹀亣鏉�","浣撹偛浼戦棽鏈嶅姟;浼戦棽鍦烘墍;娓镐箰鍦簗椋庢櫙鍚嶈儨","鐢熸椿鏈嶅姟;鐢佃钀ヤ笟鍘�;涓浗鑱旈�氳惀涓氬巺|璐墿鏈嶅姟;瀹剁數鐢靛瓙鍗栧満;鎵嬫満閿�鍞�","鐢熸椿鏈嶅姟;鎽勫奖鍐插嵃搴�;鎽勫奖鍐插嵃|绉戞暀鏂囧寲鏈嶅姟","绉戞暀鏂囧寲鏈嶅姟;鏂囧寲瀹�;鏂囧寲瀹珅浣撹偛浼戦棽鏈嶅姟","椁愰ギ鏈嶅姟;涓鍘�;娴烽矞閰掓ゼ|浣撹偛浼戦棽鏈嶅姟","姹借溅閿�鍞�;姹借溅閿�鍞�;姹借溅閿�鍞畖姹借溅鏈嶅姟;姹借溅鏈嶅姟鐩稿叧;姹借溅鏈嶅姟鐩稿叧","璐墿鏈嶅姟;瀹剁數鐢靛瓙鍗栧満;鏁扮爜鐢靛瓙|绉戞暀鏂囧寲鏈嶅姟","璐墿鏈嶅姟;璐墿鐩稿叧鍦烘墍;璐墿鐩稿叧鍦烘墍|閲戣瀺淇濋櫓鏈嶅姟","鍏徃浼佷笟;鍏徃;鍖昏嵂鍏徃|鍏徃浼佷笟","鍦板悕鍦板潃淇℃伅;鏅�氬湴鍚�;鏉戝簞绾у湴鍚峾鍦板悕鍦板潃淇℃伅;鑷劧鍦板悕;灞�","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;浜ら�氳溅杈嗙鐞�;楠岃溅鍦簗鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鏀垮簻鏈哄叧;鐪佺洿杈栧競绾ф斂搴滃強浜嬩笟鍗曚綅|鐢熸椿鏈嶅姟","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;寤烘潗浜旈噾甯傚満|鍦板悕鍦板潃淇℃伅","椋庢櫙鍚嶈儨;椋庢櫙鍚嶈儨;绾㈣壊鏅尯|鐢熸椿鏈嶅姟","鍦板悕鍦板潃淇℃伅;浜ら�氬湴鍚�;閬撹矾鍚峾椁愰ギ鏈嶅姟","姹借溅閿�鍞�;绂忕壒鐗圭害閿�鍞�;鏋楄偗閿�鍞畖姹借溅缁翠慨","閲戣瀺淇濋櫓鏈嶅姟;閾惰;涓浗寤鸿閾惰|閲戣瀺淇濋櫓鏈嶅姟","椋庢櫙鍚嶈儨;鍏洯骞垮満;鍏洯|浣撹偛浼戦棽鏈嶅姟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鍏娉曟満鏋�;鍏畨璀﹀療|鐢熸椿鏈嶅姟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;绀句細鍥綋;鎱堝杽鏈烘瀯|璐墿鏈嶅姟","閲戣瀺淇濋櫓鏈嶅姟;鑷姩鎻愭鏈�;涓浗鍐滀笟閾惰ATM|閲戣瀺淇濋櫓鏈嶅姟","鍏徃浼佷笟;鍏徃浼佷笟;鍏徃浼佷笟|姹借溅閿�鍞�","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鏀垮簻鏈哄叧;鍖哄幙绾ф斂搴滃強浜嬩笟鍗曚綅|閲戣瀺淇濋櫓鏈嶅姟","姹借溅鏈嶅姟;姹借溅绉熻祦;姹借溅绉熻祦|鍏徃浼佷笟","璐墿鏈嶅姟;缁煎悎甯傚満;缁煎悎甯傚満|鐢熸椿鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;濞变箰鍦烘墍;澶滄�讳細|浣撹偛浼戦棽鏈嶅姟","鍟嗗姟浣忓畢;浜т笟鍥尯;浜т笟鍥尯|璐墿鏈嶅姟","姹借溅缁翠慨;閫氱敤鐗圭害缁翠慨;闆經鍏扮淮淇畖姹借溅閿�鍞�","鐢熸椿鏈嶅姟;鐗╂祦閫熼��;鐗╂祦浠撳偍鍦哄湴|璐墿鏈嶅姟","璐墿鏈嶅姟;涓撳崠搴�;涔﹀簵|椁愰ギ鏈嶅姟","璐墿鏈嶅姟;涓撳崠搴�;鍦熺壒浜т笓鍗栧簵|璐墿鏈嶅姟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;浜ら�氳溅杈嗙鐞�;浜ら�氱鐞嗘満鏋剕鍏徃浼佷笟","姹借溅鏈嶅姟;浜屾墜杞︿氦鏄�;浜屾墜杞︿氦鏄搢姹借溅缁翠慨","姹借溅鏈嶅姟;姹借溅鏈嶅姟鐩稿叧;姹借溅鏈嶅姟鐩稿叧|姹借溅閿�鍞�;姹借溅閿�鍞�;姹借溅閿�鍞�","鐢熸椿鏈嶅姟;娲楁荡鎺ㄦ嬁鍦烘墍;娲楁荡鎺ㄦ嬁鍦烘墍|鐢熸椿鏈嶅姟;缇庡缇庡彂搴�;缇庡缇庡彂搴�","鐢熸椿鏈嶅姟;鐢熸椿鏈嶅姟鍦烘墍;鐢熸椿鏈嶅姟鍦烘墍|鍏徃浼佷笟;鍏徃浼佷笟;鍏徃浼佷笟","鍖荤枟淇濆仴鏈嶅姟;涓撶鍖婚櫌;涓撶鍖婚櫌|鍖荤枟淇濆仴鏈嶅姟;璇婃墍;璇婃墍","鍦板悕鍦板潃淇℃伅;鑷劧鍦板悕;灞眧椋庢櫙鍚嶈儨","姹借溅鏈嶅姟;鍔犳补绔�;鍔犳补绔檤姹借溅鏈嶅姟","璐墿鏈嶅姟;璐墿鐩稿叧鍦烘墍;璐墿鐩稿叧鍦烘墍|绉戞暀鏂囧寲鏈嶅姟","姹借溅缁翠慨;鍚夊埄鐗圭害缁翠慨;鍚夊埄缁翠慨|姹借溅閿�鍞�","姹借溅缁翠慨;澶т紬鐗圭害缁翠慨;鏂煰杈剧淮淇畖姹借溅閿�鍞�","绉戞暀鏂囧寲鏈嶅姟;绉戠爺鏈烘瀯;绉戠爺鏈烘瀯|鐢熸椿鏈嶅姟","璐墿鏈嶅姟;涓撳崠搴�;涓撹惀搴梶绉戞暀鏂囧寲鏈嶅姟;鍩硅鏈烘瀯;鍩硅鏈烘瀯","璐墿鏈嶅姟;涓撳崠搴�;鍦熺壒浜т笓鍗栧簵|椁愰ギ鏈嶅姟","璐墿鏈嶅姟;涓撳崠搴�;瀹犵墿鐢ㄥ搧搴梶璐墿鏈嶅姟","璐墿鏈嶅姟;涓撳崠搴�;瀹犵墿鐢ㄥ搧搴梶椁愰ギ鏈嶅姟","璐墿鏈嶅姟;涓撳崠搴�;鐝犲疂棣栭グ宸ヨ壓鍝亅鐢熸椿鏈嶅姟;鐢熸椿鏈嶅姟鍦烘墍;鐢熸椿鏈嶅姟鍦烘墍","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;甯冭壓甯傚満|鍏徃浼佷笟;鍏徃;鍏徃","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鍏娉曟満鏋�;娑堥槻鏈哄叧|璐墿鏈嶅姟","姹借溅缁翠慨;鏈敯鐗圭害缁翠慨;骞挎苯鏈敯缁翠慨|姹借溅閿�鍞�","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;瀹跺眳寤烘潗甯傚満|姹借溅鏈嶅姟","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;寤烘潗浜旈噾甯傚満|鍏徃浼佷笟;鍏徃;骞垮憡瑁呴グ","璐墿鏈嶅姟;鏈嶈闉嬪附鐨叿搴�;鍝佺墝鏈嶈搴梶椁愰ギ鏈嶅姟","鍏徃浼佷笟;宸ュ巶;宸ュ巶|椁愰ギ鏈嶅姟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鍏娉曟満鏋�;鍏瘉閴村畾鏈烘瀯|鐢熸椿鏈嶅姟","璐墿鏈嶅姟;涓撳崠搴�;鐑熼厭涓撳崠搴梶鍏徃浼佷笟;鍏徃;鍏徃","璐墿鏈嶅姟;缁煎悎甯傚満;鍐滃壇浜у搧甯傚満|鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","鍏徃浼佷笟;鍏徃;鍏徃|鎽╂墭杞︽湇鍔�","鍏徃浼佷笟;鍏徃;鍟嗕笟璐告槗|姹借溅閿�鍞�","鍦板悕鍦板潃淇℃伅;浜ら�氬湴鍚�;浜ら�氬湴鍚�","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;绀句細鍥綋;琛屼笟鍗忎細|鐢熸椿鏈嶅姟","鐢熸椿鏈嶅姟;缇庡缇庡彂搴�;缇庡缇庡彂搴梶姹借溅鏈嶅姟","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;鍘ㄥ崼甯傚満|椁愰ギ鏈嶅姟","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;甯冭壓甯傚満|鐢熸椿鏈嶅姟;鐢熸椿鏈嶅姟鍦烘墍;鐢熸椿鏈嶅姟鍦烘墍","璐墿鏈嶅姟;鐗硅壊鍟嗕笟琛�;鐗硅壊鍟嗕笟琛梶璐墿鏈嶅姟","椁愰ギ鏈嶅姟;浼戦棽椁愰ギ鍦烘墍;浼戦棽椁愰ギ鍦烘墍|浣撹偛浼戦棽鏈嶅姟","浜ら�氳鏂芥湇鍔�;鐏溅绔�;鍏畨鍒惰瘉","浣忓鏈嶅姟;瀹鹃閰掑簵;浜旀槦绾у棣唡椁愰ギ鏈嶅姟;椁愰ギ鐩稿叧鍦烘墍;椁愰ギ鐩稿叧","浣撹偛浼戦棽鏈嶅姟;濞变箰鍦烘墍;KTV|浣忓鏈嶅姟","姹借溅缁翠慨;澶т紬鐗圭害缁翠慨;涓�姹�-澶т紬缁翠慨|姹借溅閿�鍞�","璐墿鏈嶅姟;涓汉鐢ㄥ搧/鍖栧鍝佸簵;鍏跺畠涓汉鐢ㄥ搧搴梶椁愰ギ鏈嶅姟","璐墿鏈嶅姟;鑺遍笩楸艰櫕甯傚満;瀹犵墿甯傚満|椋庢櫙鍚嶈儨","閲戣瀺淇濋櫓鏈嶅姟;閲戣瀺淇濋櫓鏈嶅姟鏈烘瀯;閲戣瀺淇濋櫓鏈烘瀯|璐墿鏈嶅姟","鍟嗗姟浣忓畢;浣忓畢鍖�;瀹胯垗|绉戞暀鏂囧寲鏈嶅姟","鍟嗗姟浣忓畢;妤煎畤;鍟嗗姟鍐欏瓧妤紎鍟嗗姟浣忓畢;妤煎畤;鍟嗕綇涓ょ敤妤煎畤","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;浜ら�氳溅杈嗙鐞�;浜ら�氱鐞嗘満鏋剕鐢熸椿鏈嶅姟","璐墿鏈嶅姟;涓撳崠搴�;绀煎搧楗板搧搴梶鍏徃浼佷笟","璐墿鏈嶅姟;缁煎悎甯傚満;鍐滃壇浜у搧甯傚満|鍏徃浼佷笟;鍏徃;鍏徃","閲戣瀺淇濋櫓鏈嶅姟;淇濋櫓鍏徃;淇濋櫓鍏徃|姹借溅鏈嶅姟","椋庢櫙鍚嶈儨;椋庢櫙鍚嶈儨;绾康棣唡绉戞暀鏂囧寲鏈嶅姟","椁愰ギ鏈嶅姟;涓鍘�;鐗硅壊/鍦版柟椋庡懗椁愬巺|鍏徃浼佷笟","浣撹偛浼戦棽鏈嶅姟;褰卞墽闄�;鐢靛奖闄鐢熸椿鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;杩愬姩鍦洪;鍙扮悆鍘厊璐墿鏈嶅姟","鍦板悕鍦板潃淇℃伅;鏅�氬湴鍚�;涔¢晣绾у湴鍚峾鍦板悕鍦板潃淇℃伅","鐢熸椿鏈嶅姟;鍞エ澶�;椋炴満绁ㄤ唬鍞偣|鐢熸椿鏈嶅姟","鐢熸椿鏈嶅姟;缁翠慨绔欑偣;缁翠慨绔欑偣|鐢熸椿鏈嶅姟","绉戞暀鏂囧寲鏈嶅姟;鍩硅鏈烘瀯;鍩硅鏈烘瀯|璐墿鏈嶅姟;涓撳崠搴�;涓撹惀搴�","璐墿鏈嶅姟;涓撳崠搴�;鐝犲疂棣栭グ宸ヨ壓鍝亅鍟嗗姟浣忓畢","椁愰ギ鏈嶅姟;涓鍘�;涓鍘厊椁愰ギ鏈嶅姟;鑼惰壓棣�;鑼惰壓棣�","鍖荤枟淇濆仴鏈嶅姟;鍔ㄧ墿鍖荤枟鍦烘墍;瀹犵墿璇婃墍|鍖荤枟淇濆仴鏈嶅姟","鍦板悕鍦板潃淇℃伅;浜ら�氬湴鍚�;浜ら�氬湴鍚峾璐墿鏈嶅姟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鏀垮簻鏈哄叧;鍖哄幙绾ф斂搴滃強浜嬩笟鍗曚綅|璐墿鏈嶅姟","姹借溅閿�鍞�;鏃ヤ骇鐗圭害閿�鍞�;鑻辫彶灏艰开閿�鍞畖姹借溅缁翠慨","绉戞暀鏂囧寲鏈嶅姟;椹炬牎;椹炬牎|绉戞暀鏂囧寲鏈嶅姟","鍏徃浼佷笟;鍏徃;寤虹瓚鍏徃|绉戞暀鏂囧寲鏈嶅姟","姹借溅閿�鍞�;鏃ヤ骇鐗圭害閿�鍞�;閮戝窞鏃ヤ骇閿�鍞畖姹借溅缁翠慨","璐墿鏈嶅姟;鏈嶈闉嬪附鐨叿搴�;鍝佺墝鏈嶈搴梶鍏徃浼佷笟","璐墿鏈嶅姟;璐墿鐩稿叧鍦烘墍;璐墿鐩稿叧鍦烘墍|鎽╂墭杞︽湇鍔�","閲戣瀺淇濋櫓鏈嶅姟;鑷姩鎻愭鏈�;涓浗寤鸿閾惰ATM|閲戣瀺淇濋櫓鏈嶅姟","閲戣瀺淇濋櫓鏈嶅姟;鑷姩鎻愭鏈�;姹囦赴閾惰ATM","椋庢櫙鍚嶈儨;椋庢櫙鍚嶈儨鐩稿叧;鏃呮父鏅偣|浣撹偛浼戦棽鏈嶅姟","鍏徃浼佷笟;鍏徃;鍐堕噾鍖栧伐|鍏徃浼佷笟;宸ュ巶;宸ュ巶","鍏徃浼佷笟;宸ュ巶;宸ュ巶|姹借溅鏈嶅姟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鏀垮簻鏈哄叧;涔¢晣绾ф斂搴滃強浜嬩笟鍗曚綅|浣撹偛浼戦棽鏈嶅姟","姹借溅缁翠慨;鏍囪嚧闆搧榫欑壒绾︾淮淇�;涓滈闆搧榫欑淮淇畖姹借溅閿�鍞�","鍏徃浼佷笟;鍏徃;鏈烘鐢靛瓙|璐墿鏈嶅姟;涓撳崠搴�;涓撹惀搴�","鍏徃浼佷笟;鍏徃;缃戠粶绉戞妧|绉戞暀鏂囧寲鏈嶅姟","鍟嗗姟浣忓畢;浣忓畢鍖�;绀惧尯涓績|鍟嗗姟浣忓畢","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鏀垮簻鏈哄叧;鏀垮簻鏈哄叧鐩稿叧|椋庢櫙鍚嶈儨","姹借溅鏈嶅姟;鍔犳皵绔�;鍔犳皵绔檤鐢熸椿鏈嶅姟","姹借溅鏈嶅姟;姹借溅淇变箰閮�;姹借溅淇变箰閮▅姹借溅鏈嶅姟","璐墿鏈嶅姟;涓撳崠搴�;鐪奸暅搴梶鐢熸椿鏈嶅姟","璐墿鏈嶅姟;鍟嗗満;鍏嶇◣鍝佸簵|璐墿鏈嶅姟","椁愰ギ鏈嶅姟;涓鍘�;涓鍘厊浣忓鏈嶅姟;瀹鹃閰掑簵;瀹鹃閰掑簵","椁愰ギ鏈嶅姟;涓鍘�;缁煎悎閰掓ゼ|鐢熸椿鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;濞变箰鍦烘墍;娓告垙鍘厊浣撹偛浼戦棽鏈嶅姟","鍏徃浼佷笟;鍏徃;鍏徃|浜ら�氳鏂芥湇鍔�","鍖荤枟淇濆仴鏈嶅姟;涓撶鍖婚櫌;鏁村舰缇庡|鐢熸椿鏈嶅姟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鏀垮簻鏈哄叧;鍦板競绾ф斂搴滃強浜嬩笟鍗曚綅|閲戣瀺淇濋櫓鏈嶅姟","鐢熸椿鏈嶅姟;缁翠慨绔欑偣;缁翠慨绔欑偣|姹借溅缁翠慨;姹借溅缁翠慨;姹借溅缁翠慨","璐墿鏈嶅姟;鑺遍笩楸艰櫕甯傚満;鑺卞崏甯傚満|鐢熸椿鏈嶅姟;鐢熸椿鏈嶅姟鍦烘墍;鐢熸椿鏈嶅姟鍦烘墍","閲戣瀺淇濋櫓鏈嶅姟;鑷姩鎻愭鏈�;涓浗宸ュ晢閾惰ATM|閲戣瀺淇濋櫓鏈嶅姟","鍏徃浼佷笟;鍏徃;骞垮憡瑁呴グ|鐢熸椿鏈嶅姟;鎽勫奖鍐插嵃搴�;鎽勫奖鍐插嵃","鍖荤枟淇濆仴鏈嶅姟;缁煎悎鍖婚櫌;鍗敓闄鍖荤枟淇濆仴鏈嶅姟;璇婃墍;璇婃墍","鍟嗗姟浣忓畢;妤煎畤;鍟嗗姟鍐欏瓧妤紎椁愰ギ鏈嶅姟","姹借溅缁翠慨;姹借溅缁煎悎缁翠慨;姹借溅缁煎悎缁翠慨|鍏徃浼佷笟","姹借溅缁翠慨;鑽e▉缁翠慨;鑽e▉缁翠慨|姹借溅閿�鍞�","璐墿鏈嶅姟;涓撳崠搴�;涓撹惀搴梶鍏徃浼佷笟;鍏徃浼佷笟;鍏徃浼佷笟","璐墿鏈嶅姟;浣撹偛鐢ㄥ搧搴�;浣撹偛鐢ㄥ搧搴梶浣撹偛浼戦棽鏈嶅姟","椁愰ギ鏈嶅姟;涓鍘�;缁煎悎閰掓ゼ|鍏徃浼佷笟","浣撹偛浼戦棽鏈嶅姟;搴﹀亣鐤楀吇鍦烘墍;搴﹀亣鏉憒椁愰ギ鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;搴﹀亣鐤楀吇鍦烘墍;鐤楀吇闄鍟嗗姟浣忓畢","鍏徃浼佷笟;鍐滄灄鐗ф笖鍩哄湴;鍏跺畠鍐滄灄鐗ф笖鍩哄湴|鐢熸椿鏈嶅姟","鍖荤枟淇濆仴鏈嶅姟;涓撶鍖婚櫌;鑲跨槫鍖婚櫌|鍖荤枟淇濆仴鏈嶅姟","姹借溅鏈嶅姟;姹借溅鍏绘姢/瑁呴グ;姹借溅鍏绘姢|姹借溅鏈嶅姟;娲楄溅鍦�;娲楄溅鍦�","鐢熸椿鏈嶅姟;涓粙鏈烘瀯;涓粙鏈烘瀯|浣忓鏈嶅姟","璐墿鏈嶅姟;瀹剁數鐢靛瓙鍗栧満;鏁扮爜鐢靛瓙|浣撹偛浼戦棽鏈嶅姟","椁愰ギ鏈嶅姟;涓鍘�;涓鍘厊鐢熸椿鏈嶅姟;鐢熸椿鏈嶅姟鍦烘墍;鐢熸椿鏈嶅姟鍦烘墍","浜ら�氳鏂芥湇鍔�;浜ら�氭湇鍔$浉鍏�;浜ら�氭湇鍔$浉鍏硘鐢熸椿鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;褰卞墽闄�;鐢靛奖闄椁愰ギ鏈嶅姟","姹借溅閿�鍞�;瀹濋┈鐗圭害閿�鍞�;瀹濋┈MINI閿�鍞畖姹借溅缁翠慨","绉戞暀鏂囧寲鏈嶅姟;鍗氱墿棣�;鍗氱墿棣唡椋庢櫙鍚嶈儨","璐墿鏈嶅姟;涓撳崠搴�;閽熻〃搴梶璐墿鏈嶅姟","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;瀹跺叿鍩巪鍏徃浼佷笟;鍏徃;鍏徃","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;寤烘潗浜旈噾甯傚満|绉戞暀鏂囧寲鏈嶅姟","璐墿鏈嶅姟;瀹剁數鐢靛瓙鍗栧満;瀹剁數鐢靛瓙鍗栧満|姹借溅缁翠慨","椋庢櫙鍚嶈儨;椋庢櫙鍚嶈儨;鏁欏爞|鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","椁愰ギ鏈嶅姟;鍐烽ギ搴�;鍐烽ギ搴梶鐢熸椿鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;杩愬姩鍦洪;杩愬姩鍦烘墍|璐墿鏈嶅姟","鍏徃浼佷笟;鍏徃;鍖昏嵂鍏徃|鐢熸椿鏈嶅姟","鐢熸椿鏈嶅姟;鐢熸椿鏈嶅姟鍦烘墍;鐢熸椿鏈嶅姟鍦烘墍|姹借溅閿�鍞�","鐢熸椿鏈嶅姟;缁翠慨绔欑偣;缁翠慨绔欑偣|鎽╂墭杞︽湇鍔�;鎽╂墭杞︾淮淇�;鎽╂墭杞︾淮淇�","璐墿鏈嶅姟;涓撳崠搴�;绀煎搧楗板搧搴梶椁愰ギ鏈嶅姟","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;瀹跺叿鍩巪椁愰ギ鏈嶅姟","椁愰ギ鏈嶅姟;涓鍘�;鐏攨搴梶鍏徃浼佷笟","浜ら�氳鏂芥湇鍔�;鐏溅绔�;鏀圭","浣忓鏈嶅姟;瀹鹃閰掑簵;缁忔祹鍨嬭繛閿侀厭搴梶椁愰ギ鏈嶅姟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;绀句細鍥綋;鏁欎細|椋庢櫙鍚嶈儨","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;绀句細鍥綋;娈嬭仈|鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","姹借溅鏈嶅姟;浜屾墜杞︿氦鏄�;浜屾墜杞︿氦鏄搢鐢熸椿鏈嶅姟","姹借溅鏈嶅姟;姹借溅鍏绘姢/瑁呴グ;姹借溅鍏绘姢|姹借溅鏈嶅姟;姹借溅閰嶄欢閿�鍞�;姹借溅閰嶄欢閿�鍞�","鐢熸椿鏈嶅姟;鐢佃钀ヤ笟鍘�;涓浗鑱旈�氳惀涓氬巺|鐢熸椿鏈嶅姟","绉戞暀鏂囧寲鏈嶅姟;鍩硅鏈烘瀯;鍩硅鏈烘瀯|鐢熸椿鏈嶅姟;鐢熸椿鏈嶅姟鍦烘墍;鐢熸椿鏈嶅姟鍦烘墍","椁愰ギ鏈嶅姟;涓鍘�;涓鍘厊浣撹偛浼戦棽鏈嶅姟;浼戦棽鍦烘墍;浼戦棽鍦烘墍","椁愰ギ鏈嶅姟;绯曢ゼ搴�;绯曢ゼ搴梶璐墿鏈嶅姟;璐墿鐩稿叧鍦烘墍;璐墿鐩稿叧鍦烘墍","椁愰ギ鏈嶅姟;椁愰ギ鐩稿叧鍦烘墍;椁愰ギ鐩稿叧|鍏徃浼佷笟","浣忓鏈嶅姟;鏃呴鎷涘緟鎵�;闈掑勾鏃呰垗|浣忓鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;杩愬姩鍦洪;涔掍箵鐞冮|绉戞暀鏂囧寲鏈嶅姟","绉戞暀鏂囧寲鏈嶅姟;瀛︽牎;骞煎効鍥瓅浣撹偛浼戦棽鏈嶅姟","绉戞暀鏂囧寲鏈嶅姟;灞曡棣�;灞曡棣唡椋庢櫙鍚嶈儨","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;鍘ㄥ崼甯傚満|鍏徃浼佷笟;鍏徃;鍏徃","璐墿鏈嶅姟;鏂囧寲鐢ㄥ搧搴�;鏂囧寲鐢ㄥ搧搴梶椁愰ギ鏈嶅姟","璐墿鏈嶅姟;缁煎悎甯傚満;鏋滃搧甯傚満|椁愰ギ鏈嶅姟;椁愰ギ鐩稿叧鍦烘墍;椁愰ギ鐩稿叧","椋庢櫙鍚嶈儨;椋庢櫙鍚嶈儨鐩稿叧;鏃呮父鏅偣|璐墿鏈嶅姟","椁愰ギ鏈嶅姟;涓鍘�;娼窞鑿渱椁愰ギ鏈嶅姟","椁愰ギ鏈嶅姟;涓鍘�;瑗垮寳鑿渱椁愰ギ鏈嶅姟","鐢熸椿鏈嶅姟;涓粙鏈烘瀯;涓粙鏈烘瀯|姹借溅鏈嶅姟","绉戞暀鏂囧寲鏈嶅姟;绉戞暀鏂囧寲鍦烘墍;绉戞暀鏂囧寲鍦烘墍|鍏徃浼佷笟","璐墿鏈嶅姟;涓撳崠搴�;鐑熼厭涓撳崠搴梶鍏徃浼佷笟;鍏徃浼佷笟;鍏徃浼佷笟","閲戣瀺淇濋櫓鏈嶅姟;淇濋櫓鍏徃;涓浗浜哄淇濋櫓鍏徃|鍏徃浼佷笟","椋庢櫙鍚嶈儨;鍏洯骞垮満;鍩庡競骞垮満|椋庢櫙鍚嶈儨","鍏徃浼佷笟;鍏徃浼佷笟;鍏徃浼佷笟|鐢熸椿鏈嶅姟;鐢熸椿鏈嶅姟鍦烘墍;鐢熸椿鏈嶅姟鍦烘墍","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;绀句細鍥綋;琛屼笟鍗忎細|绉戞暀鏂囧寲鏈嶅姟","鐢熸椿鏈嶅姟;鐗╂祦閫熼��;鐗╂祦閫熼�抾椁愰ギ鏈嶅姟","绉戞暀鏂囧寲鏈嶅姟;椹炬牎;椹炬牎|鍏徃浼佷笟","璐墿鏈嶅姟;鍟嗗満;鏅�氬晢鍦簗椋庢櫙鍚嶈儨","璐墿鏈嶅姟;缁煎悎甯傚満;鏋滃搧甯傚満|浣撹偛浼戦棽鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;浣撹偛浼戦棽鏈嶅姟鍦烘墍;浣撹偛浼戦棽鏈嶅姟鍦烘墍|浣忓鏈嶅姟","鍏徃浼佷笟;鍏徃;鏈烘鐢靛瓙|鍏徃浼佷笟;宸ュ巶;宸ュ巶","鍏徃浼佷笟;鍏徃;鐢典俊鍏徃|鐢熸椿鏈嶅姟;鐢佃钀ヤ笟鍘�;涓浗鐢典俊钀ヤ笟鍘�","鍖荤枟淇濆仴鏈嶅姟;鍖昏嵂淇濆仴閿�鍞簵;鍖荤枟淇濆仴鐢ㄥ搧|鐢熸椿鏈嶅姟","鍦板悕鍦板潃淇℃伅;鏅�氬湴鍚�;涔¢晣绾у湴鍚峾鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","鎽╂墭杞︽湇鍔�;鎽╂墭杞﹂攢鍞�;鎽╂墭杞﹂攢鍞畖姹借溅閿�鍞�","姹借溅鏈嶅姟;娲楄溅鍦�;娲楄溅鍦簗鐢熸椿鏈嶅姟","鐢熸椿鏈嶅姟;濠村効鏈嶅姟鍦烘墍;濠村効娓告吵棣唡绉戞暀鏂囧寲鏈嶅姟","椁愰ギ鏈嶅姟;涓鍘�;鐏攨搴梶椁愰ギ鏈嶅姟;涓鍘�;鐗硅壊/鍦版柟椋庡懗椁愬巺","浣撹偛浼戦棽鏈嶅姟;濞变箰鍦烘墍;閰掑惂|鐢熸椿鏈嶅姟","鍏徃浼佷笟;鍏徃;鍟嗕笟璐告槗|椁愰ギ鏈嶅姟","鍏徃浼佷笟;鍏徃;鐭夸骇鍏徃|鍏徃浼佷笟","姹借溅缁翠慨;鏍囪嚧闆搧榫欑壒绾︾淮淇�;涓滈鏍囪嚧缁翠慨|姹借溅閿�鍞�","姹借溅閿�鍞�;璐ц溅閿�鍞�;璐ц溅閿�鍞畖姹借溅閿�鍞�","鐢熸椿鏈嶅姟;鐢熸椿鏈嶅姟鍦烘墍;鐢熸椿鏈嶅姟鍦烘墍|浣忓鏈嶅姟","绉戞暀鏂囧寲鏈嶅姟;绉戞暀鏂囧寲鍦烘墍;绉戞暀鏂囧寲鍦烘墍|璐墿鏈嶅姟","璐墿鏈嶅姟;涓撳崠搴�;鍙ょ帺瀛楃敾搴梶鍏徃浼佷笟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;绀句細鍥綋;鎱堝杽鏈烘瀯|鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","鐢熸椿鏈嶅姟;浜嬪姟鎵�;璇勪及浜嬪姟鎵�|鐢熸椿鏈嶅姟","鐢熸椿鏈嶅姟;鍞エ澶�;鐏溅绁ㄤ唬鍞偣|鐢熸椿鏈嶅姟","鐢熸椿鏈嶅姟;鐗╂祦閫熼��;鐗╂祦閫熼�抾鍏徃浼佷笟;鍏徃;鍏徃","绉戞暀鏂囧寲鏈嶅姟;绉戠爺鏈烘瀯;绉戠爺鏈烘瀯|绉戞暀鏂囧寲鏈嶅姟","璐墿鏈嶅姟;渚挎皯鍟嗗簵/渚垮埄搴�;渚挎皯鍟嗗簵/渚垮埄搴梶鍟嗗姟浣忓畢","璐墿鏈嶅姟;瀹剁數鐢靛瓙鍗栧満;鎵嬫満閿�鍞畖鍏徃浼佷笟;鍏徃;鐢典俊鍏徃","璐墿鏈嶅姟;鐗规畩涔板崠鍦烘墍;鍏稿綋琛寍鍏徃浼佷笟","閲戣瀺淇濋櫓鏈嶅姟;淇濋櫓鍏徃;涓浗浜烘皯淇濋櫓鍏徃|鍏徃浼佷笟","浜ら�氳鏂芥湇鍔�;鐏溅绔�;閫�绁�","浣撹偛浼戦棽鏈嶅姟;浼戦棽鍦烘墍;浼戦棽鍦烘墍|鍟嗗姟浣忓畢","浣撹偛浼戦棽鏈嶅姟;濞变箰鍦烘墍;妫嬬墝瀹绉戞暀鏂囧寲鏈嶅姟","鍟嗗姟浣忓畢;妤煎畤;鍟嗗姟鍐欏瓧妤紎鍟嗗姟浣忓畢;浣忓畢鍖�;浣忓畢灏忓尯","鎽╂墭杞︽湇鍔�;鎽╂墭杞︾淮淇�;鎽╂墭杞︾淮淇畖姹借溅缁翠慨","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鏀垮簻鏈哄叧;涔¢晣浠ヤ笅绾ф斂搴滃強浜嬩笟鍗曚綅|浣撹偛浼戦棽鏈嶅姟","姹借溅鏈嶅姟;浜屾墜杞︿氦鏄�;浜屾墜杞︿氦鏄搢姹借溅閿�鍞�;姹借溅閿�鍞�;姹借溅閿�鍞�","鐢熸椿鏈嶅姟;褰╃エ褰╁埜閿�鍞偣;褰╃エ褰╁埜閿�鍞偣|璐墿鏈嶅姟","绉戞暀鏂囧寲鏈嶅姟;浼犲獟鏈烘瀯;鐢佃鍙皘鐢熸椿鏈嶅姟","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;寤烘潗浜旈噾甯傚満|鐢熸椿鏈嶅姟;缁翠慨绔欑偣;缁翠慨绔欑偣","璐墿鏈嶅姟;缁煎悎甯傚満;缁煎悎甯傚満|鍏徃浼佷笟","椁愰ギ鏈嶅姟;涓鍘�;鐏攨搴梶鐢熸椿鏈嶅姟","浣忓鏈嶅姟;鏃呴鎷涘緟鎵�;闈掑勾鏃呰垗|鍟嗗姟浣忓畢","浣撹偛浼戦棽鏈嶅姟;杩愬姩鍦洪;缁煎悎浣撹偛棣唡浣撹偛浼戦棽鏈嶅姟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;绀句細鍥綋;绀句細鍥綋鐩稿叧|椋庢櫙鍚嶈儨","姹借溅閿�鍞�;姹借溅閿�鍞�;姹借溅閿�鍞畖鐢熸椿鏈嶅姟","鐢熸椿鏈嶅姟;娲楄。搴�;娲楄。搴梶鍏徃浼佷笟","璐墿鏈嶅姟;涓撳崠搴�;闊冲儚搴梶璐墿鏈嶅姟","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;瀹跺叿鍩巪鍟嗗姟浣忓畢","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;寤烘潗浜旈噾甯傚満|鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","璐墿鏈嶅姟;鏈嶈闉嬪附鐨叿搴�;鍝佺墝闉嬪簵|鐢熸椿鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;褰卞墽闄�;鐢靛奖闄璐墿鏈嶅姟","姹借溅缁翠慨;濂囩憺鐗圭害缁翠慨;濂囩憺缁翠慨|姹借溅閿�鍞�","鐢熸椿鏈嶅姟;涓ц懍璁炬柦;鍏|椋庢櫙鍚嶈儨","璐墿鏈嶅姟;瀹剁數鐢靛瓙鍗栧満;鏁扮爜鐢靛瓙|鐢熸椿鏈嶅姟;鐢熸椿鏈嶅姟鍦烘墍;鐢熸椿鏈嶅姟鍦烘墍","璐墿鏈嶅姟;鐗规畩涔板崠鍦烘墍;鐗规畩涔板崠鍦烘墍|鐢熸椿鏈嶅姟","椁愰ギ鏈嶅姟;涓鍘�;涓鍘厊椁愰ギ鏈嶅姟;绯曢ゼ搴�;绯曢ゼ搴�","椁愰ギ鏈嶅姟;澶栧浗椁愬巺;闊╁浗鏂欑悊|椁愰ギ鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;濞变箰鍦烘墍;娓告垙鍘厊璐墿鏈嶅姟","鍟嗗姟浣忓畢;浣忓畢鍖�;浣忓畢灏忓尯|鍟嗗姟浣忓畢;妤煎畤;鍟嗗姟鍐欏瓧妤�","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鏀垮簻鏈哄叧;涔¢晣浠ヤ笅绾ф斂搴滃強浜嬩笟鍗曚綅|璐墿鏈嶅姟","姹借溅鏈嶅姟;姹借溅绉熻祦;姹借溅绉熻祦|姹借溅鏈嶅姟","姹借溅鏈嶅姟;姹借溅绉熻祦;姹借溅绉熻祦|姹借溅閿�鍞�","姹借溅缁翠慨;姊呰禌寰锋柉-濂旈┌鐗圭害缁翠慨;姊呰禌寰锋柉-濂旈┌缁翠慨|姹借溅閿�鍞�","姹借溅閿�鍞�;闀垮煄姹借溅閿�鍞�;闀垮煄姹借溅閿�鍞畖璐墿鏈嶅姟","鐢熸椿鏈嶅姟;浜嬪姟鎵�;浼氳甯堜簨鍔℃墍|鐢熸椿鏈嶅姟","鐢熸椿鏈嶅姟;鐗╂祦閫熼��;鐗╂祦閫熼�抾浣忓鏈嶅姟","璐墿鏈嶅姟;涓撳崠搴�;涓撹惀搴梶鍟嗗姟浣忓畢","璐墿鏈嶅姟;涓撳崠搴�;涓撹惀搴梶椋庢櫙鍚嶈儨","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;甯冭壓甯傚満|椁愰ギ鏈嶅姟","椋庢櫙鍚嶈儨;椋庢櫙鍚嶈儨;椋庢櫙鍚嶈儨|璐墿鏈嶅姟","椁愰ギ鏈嶅姟;涓鍘�;鐗硅壊/鍦版柟椋庡懗椁愬巺|浣撹偛浼戦棽鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;浣撹偛浼戦棽鏈嶅姟鍦烘墍;浣撹偛浼戦棽鏈嶅姟鍦烘墍|鍏徃浼佷笟","浣撹偛浼戦棽鏈嶅姟;褰卞墽闄�;鐢靛奖闄浣撹偛浼戦棽鏈嶅姟","鍏徃浼佷笟;鍏徃;缃戠粶绉戞妧|浣撹偛浼戦棽鏈嶅姟","鍖荤枟淇濆仴鏈嶅姟;涓撶鍖婚櫌;绮剧鐥呭尰闄鍖荤枟淇濆仴鏈嶅姟","鍟嗗姟浣忓畢;浣忓畢鍖�;绀惧尯涓績|鍦板悕鍦板潃淇℃伅","鍟嗗姟浣忓畢;妤煎畤;鍟嗗姟鍐欏瓧妤紎閲戣瀺淇濋櫓鏈嶅姟","姹借溅閿�鍞�;娴烽┈姹借溅閿�鍞�;娴烽┈姹借溅閿�鍞畖姹借溅缁翠慨","姹借溅閿�鍞�;鐜颁唬鐗圭害閿�鍞�;鐜颁唬閿�鍞畖姹借溅缁翠慨","鐢熸椿鏈嶅姟;浜嬪姟鎵�;浼氳甯堜簨鍔℃墍|閲戣瀺淇濋櫓鏈嶅姟","鐢熸椿鏈嶅姟;鏃呰绀�;鏃呰绀緗浣忓鏈嶅姟","鐢熸椿鏈嶅姟;缁翠慨绔欑偣;缁翠慨绔欑偣|璐墿鏈嶅姟;瀹剁數鐢靛瓙鍗栧満;瀹剁數鐢靛瓙鍗栧満","绉戞暀鏂囧寲鏈嶅姟;浼犲獟鏈烘瀯;浼犲獟鏈烘瀯|璐墿鏈嶅姟","绉戞暀鏂囧寲鏈嶅姟;鏂囪壓鍥綋;鏂囪壓鍥綋|绉戞暀鏂囧寲鏈嶅姟","璐墿鏈嶅姟;涓撳崠搴�;鐑熼厭涓撳崠搴梶鍏徃浼佷笟;宸ュ巶;宸ュ巶","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;寤烘潗浜旈噾甯傚満|鍏徃浼佷笟;鍏徃;鍟嗕笟璐告槗","椁愰ギ鏈嶅姟;涓鍘�;鐏攨搴梶鍟嗗姟浣忓畢","椁愰ギ鏈嶅姟;鍜栧暋鍘�;鍜栧暋鍘厊浣撹偛浼戦棽鏈嶅姟","椁愰ギ鏈嶅姟;澶栧浗椁愬巺;瑗块鍘�(缁煎悎椋庡懗)|浣撹偛浼戦棽鏈嶅姟","浜ら�氳鏂芥湇鍔�;鍋滆溅鍦�;鍋滆溅鍦哄嚭鍏ュ彛|浜ら�氳鏂芥湇鍔�","鍏徃浼佷笟;鍏徃;鍏徃|姹借溅閿�鍞�;姹借溅閿�鍞�;姹借溅閿�鍞�","鍏徃浼佷笟;鍏徃;鍟嗕笟璐告槗|璐墿鏈嶅姟;璐墿鐩稿叧鍦烘墍;璐墿鐩稿叧鍦烘墍","鍏徃浼佷笟;鍏徃;骞垮憡瑁呴グ|椁愰ギ鏈嶅姟","姹借溅鏈嶅姟;姹借溅閰嶄欢閿�鍞�;姹借溅閰嶄欢閿�鍞畖姹借溅鏈嶅姟;姹借溅鍏绘姢/瑁呴グ;姹借溅鍏绘姢","鐢熸椿鏈嶅姟;涓ц懍璁炬柦;鍏|鐢熸椿鏈嶅姟","鐢熸椿鏈嶅姟;涓粙鏈烘瀯;涓粙鏈烘瀯|鍏徃浼佷笟;鍏徃;鍏徃","绉戞暀鏂囧寲鏈嶅姟;浼犲獟鏈烘瀯;浼犲獟鏈烘瀯|绉戞暀鏂囧寲鏈嶅姟","绉戞暀鏂囧寲鏈嶅姟;瀛︽牎;灏忓|鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","璐墿鏈嶅姟;涓撳崠搴�;鍎跨鐢ㄥ搧搴梶璐墿鏈嶅姟;鏈嶈闉嬪附鐨叿搴�;鏈嶈闉嬪附鐨叿搴�","璐墿鏈嶅姟;渚挎皯鍟嗗簵/渚垮埄搴�;渚挎皯鍟嗗簵/渚垮埄搴梶閲戣瀺淇濋櫓鏈嶅姟","璐墿鏈嶅姟;鏈嶈闉嬪附鐨叿搴�;鏈嶈闉嬪附鐨叿搴梶璐墿鏈嶅姟;涓撳崠搴�;涓撹惀搴�","椋庢櫙鍚嶈儨;椋庢櫙鍚嶈儨;椋庢櫙鍚嶈儨|绉戞暀鏂囧寲鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;濞变箰鍦烘墍;杩巺|浣撹偛浼戦棽鏈嶅姟","鍏徃浼佷笟;鍏徃;鍖昏嵂鍏徃|璐墿鏈嶅姟","鍏徃浼佷笟;鍐滄灄鐗ф笖鍩哄湴;鍏跺畠鍐滄灄鐗ф笖鍩哄湴|椋庢櫙鍚嶈儨","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;绀句細鍥綋;绀句細鍥綋鐩稿叧|浣撹偛浼戦棽鏈嶅姟","璐墿鏈嶅姟;渚挎皯鍟嗗簵/渚垮埄搴�;渚挎皯鍟嗗簵/渚垮埄搴梶鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","椁愰ギ鏈嶅姟;鍐烽ギ搴�;鍐烽ギ搴梶璐墿鏈嶅姟;璐墿鐩稿叧鍦烘墍;璐墿鐩稿叧鍦烘墍","椁愰ギ鏈嶅姟;蹇鍘�;蹇鍘厊鍏徃浼佷笟","浣撹偛浼戦棽鏈嶅姟;浣撹偛浼戦棽鏈嶅姟鍦烘墍;浣撹偛浼戦棽鏈嶅姟鍦烘墍|椋庢櫙鍚嶈儨","浣撹偛浼戦棽鏈嶅姟;濞变箰鍦烘墍;閰掑惂|椁愰ギ鏈嶅姟;涓鍘�;涓鍘�","浣撹偛浼戦棽鏈嶅姟;褰卞墽闄�;鍓у満|绉戞暀鏂囧寲鏈嶅姟","鍖荤枟淇濆仴鏈嶅姟;鍔ㄧ墿鍖荤枟鍦烘墍;鍏藉尰绔檤鍖荤枟淇濆仴鏈嶅姟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鏀垮簻鏈哄叧;鏀垮簻鏈哄叧鐩稿叧|璐墿鏈嶅姟","姹借溅缁翠慨;姹借溅缁翠慨;姹借溅缁翠慨|姹借溅閿�鍞�;姹借溅閿�鍞�;姹借溅閿�鍞�","姹借溅缁翠慨;姹借溅缁煎悎缁翠慨;姹借溅缁煎悎缁翠慨|璐墿鏈嶅姟","绉戞暀鏂囧寲鏈嶅姟;浼犲獟鏈烘瀯;鎶ョぞ|鍏徃浼佷笟","绉戞暀鏂囧寲鏈嶅姟;浼犲獟鏈烘瀯;鐢佃鍙皘绉戞暀鏂囧寲鏈嶅姟","绉戞暀鏂囧寲鏈嶅姟;瀛︽牎;鑱屼笟鎶�鏈鏍鐢熸椿鏈嶅姟","绉戞暀鏂囧寲鏈嶅姟;瀛︽牎;楂樼瓑闄㈡牎|鍟嗗姟浣忓畢","璐墿鏈嶅姟;涓撳崠搴�;鍎跨鐢ㄥ搧搴梶鐢熸椿鏈嶅姟;濠村効鏈嶅姟鍦烘墍;濠村効娓告吵棣�","璐墿鏈嶅姟;涓撳崠搴�;鐑熼厭涓撳崠搴梶鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","璐墿鏈嶅姟;鏈嶈闉嬪附鐨叿搴�;鏈嶈闉嬪附鐨叿搴梶姹借溅鏈嶅姟","椁愰ギ鏈嶅姟;涓鍘�;瀹夊窘鑿�(寰借彍)|椁愰ギ鏈嶅姟","椁愰ギ鏈嶅姟;涓鍘�;娴烽矞閰掓ゼ|鍏徃浼佷笟","椁愰ギ鏈嶅姟;鍜栧暋鍘�;鍜栧暋鍘厊鐢熸椿鏈嶅姟","椁愰ギ鏈嶅姟;鑼惰壓棣�;鑼惰壓棣唡椁愰ギ鏈嶅姟;涓鍘�;涓鍘�","鍏徃浼佷笟;鍏徃;鍏徃|鐢熸椿鏈嶅姟;鐗╂祦閫熼��;鐗╂祦閫熼��","鍟嗗姟浣忓畢;浜т笟鍥尯;浜т笟鍥尯|鍟嗗姟浣忓畢","姹借溅缁翠慨;鍚嶇埖缁翠慨;鍚嶇埖缁翠慨|姹借溅閿�鍞�","姹借溅缁翠慨;姹熸樊缁翠慨;姹熸樊缁翠慨|姹借溅閿�鍞�","姹借溅閿�鍞�;鍚夊埄鐗圭害閿�鍞�;鍚夊埄閿�鍞畖姹借溅缁翠慨;鍚夊埄鐗圭害缁翠慨;鍚夊埄缁翠慨","姹借溅閿�鍞�;绂忕壒鐗圭害閿�鍞�;绂忕壒閿�鍞畖姹借溅缁翠慨;绂忕壒鐗圭害缁翠慨;绂忕壒缁翠慨","姹借溅閿�鍞�;璺檸鐗圭害閿�鍞�;璺檸閿�鍞畖姹借溅缁翠慨","鐢熸椿鏈嶅姟;浜嬪姟鎵�;寰嬪笀浜嬪姟鎵�|鍏徃浼佷笟","鐢熸椿鏈嶅姟;鍞エ澶�;椋炴満绁ㄤ唬鍞偣|鍏徃浼佷笟","鐢熸椿鏈嶅姟;娲楄。搴�;娲楄。搴梶鐢熸椿鏈嶅姟","绉戞暀鏂囧寲鏈嶅姟;瀛︽牎;骞煎効鍥瓅鍟嗗姟浣忓畢","绉戞暀鏂囧寲鏈嶅姟;瀛︽牎;骞煎効鍥瓅鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","璐墿鏈嶅姟;涓撳崠搴�;涓撹惀搴梶鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","璐墿鏈嶅姟;瀹剁數鐢靛瓙鍗栧満;缁煎悎瀹剁數鍟嗗満|鍏徃浼佷笟","璐墿鏈嶅姟;鐗规畩涔板崠鍦烘墍;鍏稿綋琛寍鐢熸椿鏈嶅姟","璐墿鏈嶅姟;鐗硅壊鍟嗕笟琛�;鐗硅壊鍟嗕笟琛梶鍦板悕鍦板潃淇℃伅","璐墿鏈嶅姟;缁煎悎甯傚満;鍐滃壇浜у搧甯傚満|鍦板悕鍦板潃淇℃伅","椁愰ギ鏈嶅姟;涓鍘�;鍖椾含鑿渱椁愰ギ鏈嶅姟","椁愰ギ鏈嶅姟;鑼惰壓棣�;鑼惰壓棣唡鍟嗗姟浣忓畢","浜ら�氳鏂芥湇鍔�;涓婁笅瀹㈠尯;鑷┚杞�","浣忓鏈嶅姟;浣忓鏈嶅姟鐩稿叧;浣忓鏈嶅姟鐩稿叧|璐墿鏈嶅姟","鍏徃浼佷笟;鍏徃;鍟嗕笟璐告槗|閲戣瀺淇濋櫓鏈嶅姟","鍟嗗姟浣忓畢;浣忓畢鍖�;浣忓畢灏忓尯|鍟嗗姟浣忓畢;妤煎畤;妤煎畤鐩稿叧","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鍏娉曟満鏋�;绀句細娌诲畨鏈烘瀯|绉戞暀鏂囧寲鏈嶅姟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鏀垮簻鏈哄叧;鍖哄幙绾ф斂搴滃強浜嬩笟鍗曚綅|鍏徃浼佷笟;鍏徃;鍏徃","姹借溅鏈嶅姟;鍏跺畠鑳芥簮绔�;鍏跺畠鑳芥簮绔檤姹借溅鏈嶅姟","璐墿鏈嶅姟;鏈嶈闉嬪附鐨叿搴�;鏈嶈闉嬪附鐨叿搴梶浣忓鏈嶅姟","璐墿鏈嶅姟;鐗规畩涔板崠鍦烘墍;鎷嶅崠琛寍鍏徃浼佷笟","閲戣瀺淇濋櫓鏈嶅姟;閾惰;鍐滄潙鍟嗕笟閾惰|鍏徃浼佷笟","閲戣瀺淇濋櫓鏈嶅姟;閾惰;閾惰|鐢熸椿鏈嶅姟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鍏娉曟満鏋�;娉曢櫌|鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鏀垮簻鏈哄叧;涔¢晣绾ф斂搴滃強浜嬩笟鍗曚綅|鍦板悕鍦板潃淇℃伅","姹借溅鏈嶅姟;姹借溅閰嶄欢閿�鍞�;姹借溅閰嶄欢閿�鍞畖鎽╂墭杞︽湇鍔�","姹借溅缁翠慨;涓夎彵鐗圭害缁翠慨;骞挎苯涓夎彵缁翠慨|姹借溅閿�鍞�","姹借溅閿�鍞�;闆疯鐗圭害閿�鍞�;闆疯閿�鍞畖姹借溅缁翠慨","绉戞暀鏂囧寲鏈嶅姟;灞曡棣�;灞曡棣唡璐墿鏈嶅姟","绉戞暀鏂囧寲鏈嶅姟;绉戠爺鏈烘瀯;绉戠爺鏈烘瀯|鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","璐墿鏈嶅姟;涓撳崠搴�;鎽勫奖鍣ㄦ潗搴梶鐢熸椿鏈嶅姟","璐墿鏈嶅姟;鍟嗗満;璐墿涓績|璐墿鏈嶅姟;鍟嗗満;鏅�氬晢鍦�","璐墿鏈嶅姟;璐墿鐩稿叧鍦烘墍;璐墿鐩稿叧鍦烘墍|鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","椋庢櫙鍚嶈儨;椋庢櫙鍚嶈儨鐩稿叧;鏃呮父鏅偣|鐢熸椿鏈嶅姟","椁愰ギ鏈嶅姟;涓鍘�;娴欐睙鑿渱椁愰ギ鏈嶅姟","椁愰ギ鏈嶅姟;涓鍘�;鐗硅壊/鍦版柟椋庡懗椁愬巺|鐢熸椿鏈嶅姟","椁愰ギ鏈嶅姟;鍐烽ギ搴�;鍐烽ギ搴梶椁愰ギ鏈嶅姟;涓鍘�;涓鍘�","鍦板悕鍦板潃淇℃伅;鏅�氬湴鍚�;鏉戝簞绾у湴鍚峾浣撹偛浼戦棽鏈嶅姟","鎽╂墭杞︽湇鍔�;鎽╂墭杞﹂攢鍞�;鎽╂墭杞﹂攢鍞畖鍏徃浼佷笟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;浜ら�氳溅杈嗙鐞�;杞﹁締绠$悊鏈烘瀯|姹借溅鏈嶅姟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;浜ら�氳溅杈嗙鐞�;楠岃溅鍦簗姹借溅鏈嶅姟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;绀句細鍥綋;绀句細鍥綋鐩稿叧|姹借溅鏈嶅姟","璐墿鏈嶅姟;鏈嶈闉嬪附鐨叿搴�;鏈嶈闉嬪附鐨叿搴梶鍦板悕鍦板潃淇℃伅","璐墿鏈嶅姟;璐墿鐩稿叧鍦烘墍;璐墿鐩稿叧鍦烘墍|鍏徃浼佷笟;鍏徃浼佷笟;鍏徃浼佷笟","椁愰ギ鏈嶅姟;涓鍘�;缁煎悎閰掓ゼ|浣忓鏈嶅姟;瀹鹃閰掑簵;瀹鹃閰掑簵","椁愰ギ鏈嶅姟;鑼惰壓棣�;鑼惰壓棣唡浣忓鏈嶅姟","鍏徃浼佷笟;鍏徃;鍏徃|椁愰ギ鏈嶅姟;涓鍘�;涓鍘�","鍏徃浼佷笟;鍏徃;鍟嗕笟璐告槗|璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;寤烘潗浜旈噾甯傚満","鍏徃浼佷笟;鍏徃浼佷笟;鍏徃浼佷笟|浣撹偛浼戦棽鏈嶅姟","鍏徃浼佷笟;鍏徃浼佷笟;鍏徃浼佷笟|绉戞暀鏂囧寲鏈嶅姟","鍟嗗姟浣忓畢;妤煎畤;鍟嗗姟鍐欏瓧妤紎椋庢櫙鍚嶈儨","鐢熸椿鏈嶅姟;浜嬪姟鎵�;浼氳甯堜簨鍔℃墍|绉戞暀鏂囧寲鏈嶅姟","绉戞暀鏂囧寲鏈嶅姟;鍩硅鏈烘瀯;鍩硅鏈烘瀯|璐墿鏈嶅姟;璐墿鐩稿叧鍦烘墍;璐墿鐩稿叧鍦烘墍","璐墿鏈嶅姟;缁煎悎甯傚満;鍐滃壇浜у搧甯傚満|鍟嗗姟浣忓畢","椁愰ギ鏈嶅姟;澶栧浗椁愬巺;鎰忓紡鑿滃搧椁愬巺|椁愰ギ鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;濞变箰鍦烘墍;KTV|绉戞暀鏂囧寲鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;搴﹀亣鐤楀吇鍦烘墍;鐤楀吇闄鐢熸椿鏈嶅姟;鐢熸椿鏈嶅姟鍦烘墍;鐢熸椿鏈嶅姟鍦烘墍","鍏徃浼佷笟;鍏徃;寤虹瓚鍏徃|鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","鍖荤枟淇濆仴鏈嶅姟;涓撶鍖婚櫌;鑰抽蓟鍠夊尰闄鍖荤枟淇濆仴鏈嶅姟","鍦板悕鍦板潃淇℃伅;浜ら�氬湴鍚�;閬撹矾鍚峾鍦板悕鍦板潃淇℃伅","瀹ゅ唴璁炬柦;瀹ゅ唴璁炬柦;瀹ゅ唴璁炬柦|鐢熸椿鏈嶅姟","鎽╂墭杞︽湇鍔�;鎽╂墭杞︾淮淇�;鎽╂墭杞︾淮淇畖鐢熸椿鏈嶅姟;缁翠慨绔欑偣;缁翠慨绔欑偣","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鏀垮簻鏈哄叧;澶栧湴鏀垮簻鍔瀨鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","鐢熸椿鏈嶅姟;淇℃伅鍜ㄨ涓績;淇℃伅鍜ㄨ涓績|鍏徃浼佷笟","鐢熸椿鏈嶅姟;鏃呰绀�;鏃呰绀緗璐墿鏈嶅姟","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;瀹跺叿寤烘潗缁煎悎甯傚満|鍏徃浼佷笟","閲戣瀺淇濋櫓鏈嶅姟;鑷姩鎻愭鏈�;涓浗閭斂鍌ㄨ搫閾惰ATM|閲戣瀺淇濋櫓鏈嶅姟","閲戣瀺淇濋櫓鏈嶅姟;鑷姩鎻愭鏈�;鑷姩鎻愭鏈簗閲戣瀺淇濋櫓鏈嶅姟","椁愰ギ鏈嶅姟;涓鍘�;鐏攨搴梶浣忓鏈嶅姟","椁愰ギ鏈嶅姟;鑼惰壓棣�;鑼惰壓棣唡璐墿鏈嶅姟;璐墿鐩稿叧鍦烘墍;璐墿鐩稿叧鍦烘墍","浣忓鏈嶅姟;瀹鹃閰掑簵;浜旀槦绾у棣唡浣忓鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;浼戦棽鍦烘墍;姘翠笂娲诲姩涓績|椋庢櫙鍚嶈儨","浣撹偛浼戦棽鏈嶅姟;浼戦棽鍦烘墍;閲囨憳鍥瓅椁愰ギ鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;濞变箰鍦烘墍;濞变箰鍦烘墍|浣忓鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;搴﹀亣鐤楀吇鍦烘墍;鐤楀吇闄鍏徃浼佷笟","鍏徃浼佷笟;鍏徃;鍏徃|鐢熸椿鏈嶅姟;涓粙鏈烘瀯;涓粙鏈烘瀯","鍏徃浼佷笟;鍏徃浼佷笟;鍏徃浼佷笟|璐墿鏈嶅姟;璐墿鐩稿叧鍦烘墍;璐墿鐩稿叧鍦烘墍","鍟嗗姟浣忓畢;浣忓畢鍖�;浣忓畢灏忓尯|鐢熸椿鏈嶅姟;鐢熸椿鏈嶅姟鍦烘墍;鐢熸椿鏈嶅姟鍦烘墍","鍦板悕鍦板潃淇℃伅;鑷劧鍦板悕;宄¤胺","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鏀垮簻鏈哄叧;涔¢晣绾ф斂搴滃強浜嬩笟鍗曚綅|鍟嗗姟浣忓畢","姹借溅鏈嶅姟;娲楄溅鍦�;娲楄溅鍦簗姹借溅鏈嶅姟;姹借溅鍏绘姢/瑁呴グ;姹借溅鍏绘姢","姹借溅閿�鍞�;涓滈鐗圭害閿�鍞�;涓滈閿�鍞畖姹借溅缁翠慨;涓滈鐗圭害缁翠慨;涓滈缁翠慨","鐢熸椿鏈嶅姟;涓ц懍璁炬柦;涓ц懍璁炬柦|璐墿鏈嶅姟;璐墿鐩稿叧鍦烘墍;璐墿鐩稿叧鍦烘墍","鐢熸椿鏈嶅姟;淇℃伅鍜ㄨ涓績;淇℃伅鍜ㄨ涓績|鐢熸椿鏈嶅姟","绉戞暀鏂囧寲鏈嶅姟;鍩硅鏈烘瀯;鍩硅鏈烘瀯|鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","璐墿鏈嶅姟;涓撳崠搴�;鐪奸暅搴梶璐墿鏈嶅姟","璐墿鏈嶅姟;涓撳崠搴�;鑷杞︿笓鍗栧簵|鎽╂墭杞︽湇鍔�;鎽╂墭杞︾淮淇�;鎽╂墭杞︾淮淇�","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;瀹跺眳寤烘潗甯傚満|椁愰ギ鏈嶅姟","椁愰ギ鏈嶅姟;涓鍘�;鐏攨搴梶浣撹偛浼戦棽鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;浼戦棽鍦烘墍;娓镐箰鍦簗椁愰ギ鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;浼戦棽鍦烘墍;閲囨憳鍥瓅璐墿鏈嶅姟","鍟嗗姟浣忓畢;浣忓畢鍖�;浣忓畢灏忓尯|鍟嗗姟浣忓畢;妤煎畤;鍟嗕綇涓ょ敤妤煎畤","姹借溅鏈嶅姟;姹借溅鍏绘姢/瑁呴グ;姹借溅鍏绘姢|椁愰ギ鏈嶅姟","姹借溅鏈嶅姟;姹借溅鏁戞彺;姹借溅鏁戞彺|姹借溅鏈嶅姟","鐢熸椿鏈嶅姟;涓ц懍璁炬柦;闄靛洯|鐢熸椿鏈嶅姟","鐢熸椿鏈嶅姟;浜嬪姟鎵�;浜嬪姟鎵�|鍏徃浼佷笟","鐢熸椿鏈嶅姟;濠村効鏈嶅姟鍦烘墍;濠村効娓告吵棣唡鐢熸椿鏈嶅姟","鐢熸椿鏈嶅姟;鐢熸椿鏈嶅姟鍦烘墍;鐢熸椿鏈嶅姟鍦烘墍|椋庢櫙鍚嶈儨","璐墿鏈嶅姟;涓撳崠搴�;鑷杞︿笓鍗栧簵|姹借溅閿�鍞�;姹借溅閿�鍞�;姹借溅閿�鍞�","璐墿鏈嶅姟;鍟嗗満;鏅�氬晢鍦簗椁愰ギ鏈嶅姟","閲戣瀺淇濋櫓鏈嶅姟;璐㈠姟鍏徃;璐㈠姟鍏徃|鍏徃浼佷笟","椋庢櫙鍚嶈儨;鍏洯骞垮満;鍩庡競骞垮満|绉戞暀鏂囧寲鏈嶅姟","椋庢櫙鍚嶈儨;椋庢櫙鍚嶈儨;鍥藉绾ф櫙鐐箌椋庢櫙鍚嶈儨","椁愰ギ鏈嶅姟;涓鍘�;涓鍘厊鍦板悕鍦板潃淇℃伅","椁愰ギ鏈嶅姟;涓鍘�;涓鍘厊姹借溅鏈嶅姟","椁愰ギ鏈嶅姟;涓鍘�;灞变笢鑿�(椴佽彍)|椁愰ギ鏈嶅姟","椁愰ギ鏈嶅姟;鍐烽ギ搴�;鍐烽ギ搴梶椁愰ギ鏈嶅姟;蹇鍘�;蹇鍘�","浣撹偛浼戦棽鏈嶅姟;濞变箰鍦烘墍;濞变箰鍦烘墍|绉戞暀鏂囧寲鏈嶅姟","鍏徃浼佷笟;鍏徃;鐭夸骇鍏徃|璐墿鏈嶅姟","鍟嗗姟浣忓畢;妤煎畤;鍟嗕綇涓ょ敤妤煎畤|浣忓鏈嶅姟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鏀垮簻鏈哄叧;鍖哄幙绾ф斂搴滃強浜嬩笟鍗曚綅|鍟嗗姟浣忓畢","鐢熸椿鏈嶅姟;鐢熸椿鏈嶅姟鍦烘墍;鐢熸椿鏈嶅姟鍦烘墍|浜ら�氳鏂芥湇鍔�","绉戞暀鏂囧寲鏈嶅姟;浼犲獟鏈烘瀯;鍑虹増绀緗鍏徃浼佷笟","绉戞暀鏂囧寲鏈嶅姟;瀛︽牎;骞煎効鍥瓅鍏徃浼佷笟","璐墿鏈嶅姟;涓撳崠搴�;鐝犲疂棣栭グ宸ヨ壓鍝亅浣撹偛浼戦棽鏈嶅姟","璐墿鏈嶅姟;渚挎皯鍟嗗簵/渚垮埄搴�;渚挎皯鍟嗗簵/渚垮埄搴梶璐墿鏈嶅姟;涓撳崠搴�;涓撹惀搴�","閲戣瀺淇濋櫓鏈嶅姟;鑷姩鎻愭鏈�;涓浗閾惰ATM|閲戣瀺淇濋櫓鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;浣撹偛浼戦棽鏈嶅姟鍦烘墍;浣撹偛浼戦棽鏈嶅姟鍦烘墍|绉戞暀鏂囧寲鏈嶅姟","鍏徃浼佷笟;鍏徃;鍏徃|椋庢櫙鍚嶈儨","鍏徃浼佷笟;鍐滄灄鐗ф笖鍩哄湴;鍏跺畠鍐滄灄鐗ф笖鍩哄湴|椁愰ギ鏈嶅姟","鍖荤枟淇濆仴鏈嶅姟;鎬ユ晳涓績;鎬ユ晳涓績|鍖荤枟淇濆仴鏈嶅姟","鍟嗗姟浣忓畢;妤煎畤;妤煎畤鐩稿叧|椁愰ギ鏈嶅姟","鎽╂墭杞︽湇鍔�;鎽╂墭杞﹂攢鍞�;鎽╂墭杞﹂攢鍞畖鎽╂墭杞︽湇鍔�;鎽╂墭杞︾淮淇�;鎽╂墭杞︾淮淇�","姹借溅鏈嶅姟;姹借溅鍏绘姢/瑁呴グ;姹借溅鍏绘姢|姹借溅閿�鍞�;姹借溅閿�鍞�;姹借溅閿�鍞�","姹借溅缁翠慨;姹借溅缁煎悎缁翠慨;姹借溅缁煎悎缁翠慨|姹借溅鏈嶅姟;姹借溅鍏绘姢/瑁呴グ;姹借溅鍏绘姢","姹借溅閿�鍞�;鎹疯惫鐗圭害閿�鍞�;鎹疯惫閿�鍞畖姹借溅缁翠慨","鐢熸椿鏈嶅姟;鍞エ澶�;鍏洯鏅偣鍞エ澶剕鐢熸椿鏈嶅姟","鐢熸椿鏈嶅姟;閭眬;閭眬|璐墿鏈嶅姟","璐墿鏈嶅姟;涓撳崠搴�;鍦熺壒浜т笓鍗栧簵|鍏徃浼佷笟","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;瀹跺叿鍩巪鍏徃浼佷笟;宸ュ巶;宸ュ巶","璐墿鏈嶅姟;鐗硅壊鍟嗕笟琛�;鐗硅壊鍟嗕笟琛梶鍟嗗姟浣忓畢","璐墿鏈嶅姟;缁煎悎甯傚満;鍐滃壇浜у搧甯傚満|璐墿鏈嶅姟;涓撳崠搴�;涓撹惀搴�","璐墿鏈嶅姟;璐墿鐩稿叧鍦烘墍;璐墿鐩稿叧鍦烘墍|椋庢櫙鍚嶈儨","閲戣瀺淇濋櫓鏈嶅姟;閾惰;鍐滄潙鍟嗕笟閾惰|鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","椁愰ギ鏈嶅姟;涓鍘�;鐗硅壊/鍦版柟椋庡懗椁愬巺|浣忓鏈嶅姟","浜ら�氳鏂芥湇鍔�;鍏氦杞︾珯;鏅�氬叕浜ょ珯","鍏徃浼佷笟;鍏徃浼佷笟;鍏徃浼佷笟|鍟嗗姟浣忓畢","鍏徃浼佷笟;鍏徃浼佷笟;鍏徃浼佷笟|鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","鍏徃浼佷笟;鍏徃浼佷笟;鍏徃浼佷笟|椁愰ギ鏈嶅姟","鍟嗗姟浣忓畢;鍟嗗姟浣忓畢鐩稿叧;鍟嗗姟浣忓畢鐩稿叧|椁愰ギ鏈嶅姟","鍦板悕鍦板潃淇℃伅;浜ら�氬湴鍚�;绔嬩氦妗鍦板悕鍦板潃淇℃伅;浜ら�氬湴鍚�;妗�","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鏀垮簻鍙婄ぞ浼氬洟浣撶浉鍏�;鏀垮簻鍙婄ぞ浼氬洟浣撶浉鍏硘鍏徃浼佷笟","鐢熸椿鏈嶅姟;浜嬪姟鎵�;寰嬪笀浜嬪姟鎵�|鍟嗗姟浣忓畢","绉戞暀鏂囧寲鏈嶅姟;瀛︽牎;楂樼瓑闄㈡牎|浣撹偛浼戦棽鏈嶅姟","璐墿鏈嶅姟;涓撳崠搴�;涓撹惀搴梶鐢熸椿鏈嶅姟;涓ц懍璁炬柦;涓ц懍璁炬柦","璐墿鏈嶅姟;浣撹偛鐢ㄥ搧搴�;鎴峰鐢ㄥ搧|浣撹偛浼戦棽鏈嶅姟","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;瀹跺眳寤烘潗甯傚満|鍟嗗姟浣忓畢","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;甯冭壓甯傚満|姹借溅鏈嶅姟","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;寤烘潗浜旈噾甯傚満|浣撹偛浼戦棽鏈嶅姟","閲戣瀺淇濋櫓鏈嶅姟;淇濋櫓鍏徃;涓浗澶钩娲嬩繚闄﹟鍏徃浼佷笟","閲戣瀺淇濋櫓鏈嶅姟;閾惰鐩稿叧;閾惰鐩稿叧|鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","椋庢櫙鍚嶈儨;椋庢櫙鍚嶈儨;瀵哄簷閬撹|椋庢櫙鍚嶈儨","浣撹偛浼戦棽鏈嶅姟;褰卞墽闄�;鍓у満|浣撹偛浼戦棽鏈嶅姟","鍏叡璁炬柦;鍏叡鍘曟墍;鍏叡鍘曟墍|鐢熸椿鏈嶅姟","鍏徃浼佷笟;鐭ュ悕浼佷笟;鐭ュ悕浼佷笟|鍏徃浼佷笟","鍟嗗姟浣忓畢;浣忓畢鍖�;浣忓畢灏忓尯|椁愰ギ鏈嶅姟;涓鍘�;涓鍘�","鍦板悕鍦板潃淇℃伅;浜ら�氬湴鍚�;妗鍦板悕鍦板潃淇℃伅;浜ら�氬湴鍚�;绔嬩氦妗�","姹借溅缁翠慨;璐ц溅缁翠慨;璐ц溅缁翠慨|鐢熸椿鏈嶅姟","姹借溅閿�鍞�;涓�姹借В鏀鹃攢鍞�;涓�姹借В鏀鹃攢鍞畖姹借溅缁翠慨","绉戞暀鏂囧寲鏈嶅姟;瀛︽牎;灏忓|鍦板悕鍦板潃淇℃伅","璐墿鏈嶅姟;渚挎皯鍟嗗簵/渚垮埄搴�;渚挎皯鍟嗗簵/渚垮埄搴梶浣撹偛浼戦棽鏈嶅姟","璐墿鏈嶅姟;渚挎皯鍟嗗簵/渚垮埄搴�;渚挎皯鍟嗗簵/渚垮埄搴梶绉戞暀鏂囧寲鏈嶅姟","璐墿鏈嶅姟;鐗硅壊鍟嗕笟琛�;鐗硅壊鍟嗕笟琛梶椋庢櫙鍚嶈儨","閲戣瀺淇濋櫓鏈嶅姟;鑷姩鎻愭鏈�;涓滀簹閾惰ATM","椋庢櫙鍚嶈儨;椋庢櫙鍚嶈儨;绾康棣唡椋庢櫙鍚嶈儨","椁愰ギ鏈嶅姟;涓鍘�;娓呯湡鑿滈|浣撹偛浼戦棽鏈嶅姟","鍏徃浼佷笟;鍏徃;骞垮憡瑁呴グ|璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;瀹跺眳寤烘潗甯傚満","鍏徃浼佷笟;鍏徃;鏈烘鐢靛瓙|绉戞暀鏂囧寲鏈嶅姟","鍖荤枟淇濆仴鏈嶅姟;涓撶鍖婚櫌;浼犳煋鐥呭尰闄鍖荤枟淇濆仴鏈嶅姟","鍟嗗姟浣忓畢;浜т笟鍥尯;浜т笟鍥尯|鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","鍟嗗姟浣忓畢;浣忓畢鍖�;鍒|浣忓鏈嶅姟","鍦板悕鍦板潃淇℃伅;鏅�氬湴鍚�;琛楅亾绾у湴鍚峾鍦板悕鍦板潃淇℃伅","鎽╂墭杞︽湇鍔�;鎽╂墭杞﹂攢鍞�;鎽╂墭杞﹂攢鍞畖鐢熸椿鏈嶅姟","姹借溅鏈嶅姟;姹借溅鏁戞彺;姹借溅鏁戞彺|姹借溅缁翠慨","鐢熸椿鏈嶅姟;鏃呰绀�;鏃呰绀緗鐢熸椿鏈嶅姟","绉戞暀鏂囧寲鏈嶅姟;鍥句功棣�;鍥句功棣唡绉戞暀鏂囧寲鏈嶅姟","绉戞暀鏂囧寲鏈嶅姟;瀛︽牎;楂樼瓑闄㈡牎|鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","璐墿鏈嶅姟;涓撳崠搴�;涓撹惀搴梶姹借溅鏈嶅姟;姹借溅閰嶄欢閿�鍞�;姹借溅閰嶄欢閿�鍞�","璐墿鏈嶅姟;涓撳崠搴�;鍎跨鐢ㄥ搧搴梶鐢熸椿鏈嶅姟;鐢熸椿鏈嶅姟鍦烘墍;鐢熸椿鏈嶅姟鍦烘墍","璐墿鏈嶅姟;涓撳崠搴�;鑷杞︿笓鍗栧簵|浣撹偛浼戦棽鏈嶅姟","璐墿鏈嶅姟;鏈嶈闉嬪附鐨叿搴�;鍝佺墝闉嬪簵|鍏徃浼佷笟","閲戣瀺淇濋櫓鏈嶅姟;淇濋櫓鍏徃;涓浗骞冲畨淇濋櫓鍏徃|鍏徃浼佷笟","椋庢櫙鍚嶈儨;鍏洯骞垮満;鍏洯|鍟嗗姟浣忓畢","椁愰ギ鏈嶅姟;涓鍘�;鍥涘窛鑿�(宸濊彍)|鐢熸椿鏈嶅姟","鍏徃浼佷笟;鍏徃;鍏徃|绉戞暀鏂囧寲鏈嶅姟;绉戠爺鏈烘瀯;绉戠爺鏈烘瀯","鍏徃浼佷笟;鍐滄灄鐗ф笖鍩哄湴;鍏跺畠鍐滄灄鐗ф笖鍩哄湴|鍟嗗姟浣忓畢","鎽╂墭杞︽湇鍔�;鎽╂墭杞︾淮淇�;鎽╂墭杞︾淮淇畖姹借溅鏈嶅姟","姹借溅鏈嶅姟;鍔犳补绔�;鍔犳补绔檤鍏徃浼佷笟","姹借溅閿�鍞�;鍏嬭幈鏂嫆鐗圭害閿�鍞�;閬撳閿�鍞畖姹借溅缁翠慨","鐢熸椿鏈嶅姟;涓ц懍璁炬柦;涓ц懍璁炬柦|鍏徃浼佷笟","鐢熸椿鏈嶅姟;鐗╂祦閫熼��;鐗╂祦閫熼�抾鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","鐢熸椿鏈嶅姟;鐢熸椿鏈嶅姟鍦烘墍;鐢熸椿鏈嶅姟鍦烘墍|瀹ゅ唴璁炬柦","鐢熸椿鏈嶅姟;鐢熸椿鏈嶅姟鍦烘墍;鐢熸椿鏈嶅姟鍦烘墍|鎽╂墭杞︽湇鍔�","鐢熸椿鏈嶅姟;缁翠慨绔欑偣;缁翠慨绔欑偣|璐墿鏈嶅姟;璐墿鐩稿叧鍦烘墍;璐墿鐩稿叧鍦烘墍","绉戞暀鏂囧寲鏈嶅姟;浼犲獟鏈烘瀯;浼犲獟鏈烘瀯|鐢熸椿鏈嶅姟;鐢熸椿鏈嶅姟鍦烘墍;鐢熸椿鏈嶅姟鍦烘墍","璐墿鏈嶅姟;渚挎皯鍟嗗簵/渚垮埄搴�;渚挎皯鍟嗗簵/渚垮埄搴梶鍏徃浼佷笟;鍏徃;鍏徃","璐墿鏈嶅姟;鍟嗗満;鏅�氬晢鍦簗璐墿鏈嶅姟;鍟嗗満;璐墿涓績","璐墿鏈嶅姟;鏈嶈闉嬪附鐨叿搴�;鍝佺墝鐨叿搴梶璐墿鏈嶅姟","璐墿鏈嶅姟;鐗硅壊鍟嗕笟琛�;姝ヨ琛梶璐墿鏈嶅姟","璐墿鏈嶅姟;鑺遍笩楸艰櫕甯傚満;鑺卞崏甯傚満|浣撹偛浼戦棽鏈嶅姟","璐墿鏈嶅姟;鑺遍笩楸艰櫕甯傚満;鑺卞崏甯傚満|椋庢櫙鍚嶈儨","閲戣瀺淇濋櫓鏈嶅姟;淇濋櫓鍏徃;涓浗浜哄淇濋櫓鍏徃|閲戣瀺淇濋櫓鏈嶅姟","閲戣瀺淇濋櫓鏈嶅姟;閾惰;涓浗浜烘皯閾惰|閲戣瀺淇濋櫓鏈嶅姟","椋庢櫙鍚嶈儨;椋庢櫙鍚嶈儨;绾㈣壊鏅尯|绉戞暀鏂囧寲鏈嶅姟","椋庢櫙鍚嶈儨;椋庢櫙鍚嶈儨;椋庢櫙鍚嶈儨|鐢熸椿鏈嶅姟","椋庢櫙鍚嶈儨;椋庢櫙鍚嶈儨鐩稿叧;鏃呮父鏅偣|鍟嗗姟浣忓畢","椁愰ギ鏈嶅姟;涓鍘�;涓鍘厊椁愰ギ鏈嶅姟;浼戦棽椁愰ギ鍦烘墍;浼戦棽椁愰ギ鍦烘墍","椁愰ギ鏈嶅姟;涓鍘�;涓鍘厊椁愰ギ鏈嶅姟;鍐烽ギ搴�;鍐烽ギ搴�","浣忓鏈嶅姟;瀹鹃閰掑簵;瀹鹃閰掑簵|绉戞暀鏂囧寲鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;浼戦棽鍦烘墍;娓镐箰鍦簗鐢熸椿鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;濞变箰鍦烘墍;KTV|鍏徃浼佷笟","浣撹偛浼戦棽鏈嶅姟;濞变箰鍦烘墍;缃戝惂|浣忓鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;搴﹀亣鐤楀吇鍦烘墍;搴﹀亣鏉憒鐢熸椿鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;杩愬姩鍦洪;鍙扮悆鍘厊椁愰ギ鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;杩愬姩鍦洪;娓告吵棣唡绉戞暀鏂囧寲鏈嶅姟","鍟嗗姟浣忓畢;浣忓畢鍖�;浣忓畢灏忓尯|璐墿鏈嶅姟;璐墿鐩稿叧鍦烘墍;璐墿鐩稿叧鍦烘墍","鍟嗗姟浣忓畢;妤煎畤;鍟嗕綇涓ょ敤妤煎畤|鍟嗗姟浣忓畢;妤煎畤;鍟嗗姟鍐欏瓧妤�","鍟嗗姟浣忓畢;妤煎畤;妤煎畤鐩稿叧|鍟嗗姟浣忓畢","鍦板悕鍦板潃淇℃伅;鏅�氬湴鍚�;鏉戝簞绾у湴鍚峾鍏徃浼佷笟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;浜ら�氳溅杈嗙鐞�;璐ц溅鐩稿叧妫�鏌ョ珯","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鍏娉曟満鏋�;鍏娉曟満鍏硘鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","姹借溅鏈嶅姟;姹借溅鍏绘姢/瑁呴グ;姹借溅鍏绘姢|姹借溅缁翠慨;姹借溅缁煎悎缁翠慨;姹借溅缁煎悎缁翠慨","鐢熸椿鏈嶅姟;浜嬪姟鎵�;寰嬪笀浜嬪姟鎵�|鐢熸椿鏈嶅姟","璐墿鏈嶅姟;涓撳崠搴�;瀹犵墿鐢ㄥ搧搴梶鍏徃浼佷笟","璐墿鏈嶅姟;涓撳崠搴�;鐑熼厭涓撳崠搴梶椁愰ギ鏈嶅姟;椁愰ギ鐩稿叧鍦烘墍;椁愰ギ鐩稿叧","璐墿鏈嶅姟;涓撳崠搴�;鑷杞︿笓鍗栧簵|姹借溅鏈嶅姟;姹借溅鏈嶅姟鐩稿叧;姹借溅鏈嶅姟鐩稿叧","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;瀹跺叿鍩巪绉戞暀鏂囧寲鏈嶅姟","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;甯冭壓甯傚満|鍟嗗姟浣忓畢","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;寤烘潗浜旈噾甯傚満|鍏徃浼佷笟;鍏徃;鏈烘鐢靛瓙","璐墿鏈嶅姟;瀹剁數鐢靛瓙鍗栧満;鑻忓畞|鐢熸椿鏈嶅姟","璐墿鏈嶅姟;鑺遍笩楸艰櫕甯傚満;鑺卞崏甯傚満|绉戞暀鏂囧寲鏈嶅姟","椋庢櫙鍚嶈儨;椋庢櫙鍚嶈儨;瀵哄簷閬撹|鍦板悕鍦板潃淇℃伅","椁愰ギ鏈嶅姟;绯曢ゼ搴�;绯曢ゼ搴梶椁愰ギ鏈嶅姟;涓鍘�;涓鍘�","椁愰ギ鏈嶅姟;椁愰ギ鐩稿叧鍦烘墍;椁愰ギ鐩稿叧|鍟嗗姟浣忓畢","浜ら�氳鏂芥湇鍔�;鍋滆溅鍦�;鍋滆溅鍦哄叆鍙浜ら�氳鏂芥湇鍔�","浣撹偛浼戦棽鏈嶅姟;浼戦棽鍦烘墍;閲囨憳鍥瓅椋庢櫙鍚嶈儨","浣撹偛浼戦棽鏈嶅姟;杩愬姩鍦洪;鍋ヨ韩涓績|鍏徃浼佷笟","鍟嗗姟浣忓畢;妤煎畤;鍟嗗姟鍐欏瓧妤紎鍏徃浼佷笟;鍏徃;鍏徃","鍦板悕鍦板潃淇℃伅;鏅�氬湴鍚�;鐪佺骇鍦板悕","鍦板悕鍦板潃淇℃伅;鑷劧鍦板悕;娴锋咕娴峰场|鍦板悕鍦板潃淇℃伅","鍦板悕鍦板潃淇℃伅;鑷劧鍦板悕;鐩嗗湴","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;浜ら�氳溅杈嗙鐞�;楠岃溅鍦簗鐢熸椿鏈嶅姟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鏀垮簻鍙婄ぞ浼氬洟浣撶浉鍏�;鏀垮簻鍙婄ぞ浼氬洟浣撶浉鍏硘璐墿鏈嶅姟","姹借溅鏈嶅姟;鍔犳皵绔�;鍔犳皵绔檤姹借溅鏈嶅姟","姹借溅閿�鍞�;涓浗閲嶆苯閿�鍞�;涓浗閲嶆苯閿�鍞畖姹借溅鏈嶅姟","姹借溅閿�鍞�;娉曟媺鍒╃壒绾﹂攢鍞�;鐜涜帋鎷夎拏閿�鍞畖姹借溅缁翠慨","鐢熸椿鏈嶅姟;浜嬪姟鎵�;涓撳埄浜嬪姟鎵�|鍏徃浼佷笟","鐢熸椿鏈嶅姟;閭眬;閭眬|鐢熸椿鏈嶅姟","绉戞暀鏂囧寲鏈嶅姟;浼犲獟鏈烘瀯;鎶ョぞ|鐢熸椿鏈嶅姟","璐墿鏈嶅姟;涓撳崠搴�;涓撹惀搴梶鐢熸椿鏈嶅姟;缇庡缇庡彂搴�;缇庡缇庡彂搴�","璐墿鏈嶅姟;涓撳崠搴�;鍎跨鐢ㄥ搧搴梶鍟嗗姟浣忓畢","璐墿鏈嶅姟;浣撹偛鐢ㄥ搧搴�;鎴峰鐢ㄥ搧|鐢熸椿鏈嶅姟","璐墿鏈嶅姟;鍟嗗満;鏅�氬晢鍦簗璐墿鏈嶅姟;瓒呯骇甯傚満;瓒呭競","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;瀹跺眳寤烘潗甯傚満|鍏徃浼佷笟;鍏徃;鍏徃","璐墿鏈嶅姟;鏈嶈闉嬪附鐨叿搴�;鏈嶈闉嬪附鐨叿搴梶姹借溅閿�鍞�","璐墿鏈嶅姟;璐墿鐩稿叧鍦烘墍;璐墿鐩稿叧鍦烘墍|浣忓鏈嶅姟","椁愰ギ鏈嶅姟;涓鍘�;涓婃捣鑿渱椁愰ギ鏈嶅姟","椁愰ギ鏈嶅姟;澶栧浗椁愬巺;娉板浗/瓒婂崡鑿滃搧椁愬巺|椁愰ギ鏈嶅姟","浜ら�氳鏂芥湇鍔�;涓婁笅瀹㈠尯;缃戠害杞�","浣撹偛浼戦棽鏈嶅姟;浼戦棽鍦烘墍;鍨傞挀鍥瓅璐墿鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;杩愬姩鍦洪;绡悆鍦洪|绉戞暀鏂囧寲鏈嶅姟","鍏徃浼佷笟;鍏徃;鍟嗕笟璐告槗|璐墿鏈嶅姟;涓撳崠搴�;涓撹惀搴�","鍟嗗姟浣忓畢;浣忓畢鍖�;浣忓畢灏忓尯|鍦板悕鍦板潃淇℃伅;鏅�氬湴鍚�;鏉戝簞绾у湴鍚�","鎽╂墭杞︽湇鍔�;鎽╂墭杞︽湇鍔$浉鍏�;鎽╂墭杞︽湇鍔$浉鍏硘鐢熸椿鏈嶅姟","鎽╂墭杞︽湇鍔�;鎽╂墭杞﹂攢鍞�;鎽╂墭杞﹂攢鍞畖姹借溅鏈嶅姟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;绀句細鍥綋;琛屼笟鍗忎細|璐墿鏈嶅姟","姹借溅鏈嶅姟;浜屾墜杞︿氦鏄�;浜屾墜杞︿氦鏄搢鍏徃浼佷笟","姹借溅鏈嶅姟;娲楄溅鍦�;娲楄溅鍦簗璐墿鏈嶅姟","鐢熸椿鏈嶅姟;涓ц懍璁炬柦;涓ц懍璁炬柦|椋庢櫙鍚嶈儨","鐢熸椿鏈嶅姟;鐗╂祦閫熼��;鐗╂祦閫熼�抾姹借溅缁翠慨","鐢熸椿鏈嶅姟;鐢佃钀ヤ笟鍘�;涓浗閾侀�氳惀涓氬巺|鍏徃浼佷笟","鐢熸椿鏈嶅姟;缇庡缇庡彂搴�;缇庡缇庡彂搴梶椁愰ギ鏈嶅姟;椁愰ギ鐩稿叧鍦烘墍;椁愰ギ鐩稿叧","绉戞暀鏂囧寲鏈嶅姟;绉戠爺鏈烘瀯;绉戠爺鏈烘瀯|璐墿鏈嶅姟","璐墿鏈嶅姟;涓撳崠搴�;鐑熼厭涓撳崠搴梶鍟嗗姟浣忓畢","璐墿鏈嶅姟;浣撹偛鐢ㄥ搧搴�;鎴峰鐢ㄥ搧|鍏徃浼佷笟","璐墿鏈嶅姟;瓒呯骇甯傚満;瓒呭競|鐢熸椿鏈嶅姟;鐢熸椿鏈嶅姟鍦烘墍;鐢熸椿鏈嶅姟鍦烘墍","椋庢櫙鍚嶈儨;鍏洯骞垮満;姘存棌棣唡浣撹偛浼戦棽鏈嶅姟","椁愰ギ鏈嶅姟;涓鍘�;涓鍘厊鍏徃浼佷笟;鍏徃;鍏徃","浣撹偛浼戦棽鏈嶅姟;杩愬姩鍦洪;鍙扮悆鍘厊鐢熸椿鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;杩愬姩鍦洪;杩愬姩鍦烘墍|鐢熸椿鏈嶅姟","鍏徃浼佷笟;宸ュ巶;宸ュ巶|璐墿鏈嶅姟;璐墿鐩稿叧鍦烘墍;璐墿鐩稿叧鍦烘墍","鎽╂墭杞︽湇鍔�;鎽╂墭杞︾淮淇�;鎽╂墭杞︾淮淇畖鎽╂墭杞︽湇鍔�;鎽╂墭杞﹂攢鍞�;鎽╂墭杞﹂攢鍞�","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;绀句細鍥綋;绀句細鍥綋鐩稿叧|鍟嗗姟浣忓畢","姹借溅鏈嶅姟;姹借溅淇变箰閮�;姹借溅淇变箰閮▅姹借溅缁翠慨","姹借溅缁翠慨;鍏嬭幈鏂嫆鐗圭害缁翠慨;鍚夋櫘缁翠慨|姹借溅閿�鍞�","姹借溅缁翠慨;姹借溅缁翠慨;姹借溅缁翠慨|鍏徃浼佷笟","姹借溅缁翠慨;娴烽┈姹借溅缁翠慨;娴烽┈姹借溅缁翠慨|姹借溅閿�鍞�","姹借溅缁翠慨;绂忕壒鐗圭害缁翠慨;椹嚜杈剧淮淇畖姹借溅閿�鍞�","姹借溅閿�鍞�;澶т紬鐗圭害閿�鍞�;涓婃捣澶т紬閿�鍞畖姹借溅閿�鍞�","姹借溅閿�鍞�;鏃ヤ骇鐗圭害閿�鍞�;涓滈鏃ヤ骇閿�鍞畖姹借溅閿�鍞�","姹借溅閿�鍞�;鏈敯鐗圭害閿�鍞�;鏈敯璁存瓕閿�鍞畖姹借溅缁翠慨","鐢熸椿鏈嶅姟;褰╃エ褰╁埜閿�鍞偣;褰╃エ褰╁埜閿�鍞偣|鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","鐢熸椿鏈嶅姟;鐢佃钀ヤ笟鍘�;涓浗绉诲姩钀ヤ笟鍘厊鍏徃浼佷笟;鍏徃;鐢典俊鍏徃","绉戞暀鏂囧寲鏈嶅姟;绉戞暀鏂囧寲鍦烘墍;绉戞暀鏂囧寲鍦烘墍|浣撹偛浼戦棽鏈嶅姟","璐墿鏈嶅姟;涓撳崠搴�;鐑熼厭涓撳崠搴梶鍦板悕鍦板潃淇℃伅","璐墿鏈嶅姟;涓撳崠搴�;鐑熼厭涓撳崠搴梶姹借溅鏈嶅姟","璐墿鏈嶅姟;瀹剁數鐢靛瓙鍗栧満;鏁扮爜鐢靛瓙|鍏徃浼佷笟;鍏徃;缃戠粶绉戞妧","璐墿鏈嶅姟;缁煎悎甯傚満;鏋滃搧甯傚満|鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","璐墿鏈嶅姟;鑺遍笩楸艰櫕甯傚満;瀹犵墿甯傚満|鍏徃浼佷笟","椁愰ギ鏈嶅姟;涓鍘�;涓鍘厊浣忓鏈嶅姟;浣忓鏈嶅姟鐩稿叧;浣忓鏈嶅姟鐩稿叧","椁愰ギ鏈嶅姟;涓鍘�;娓呯湡鑿滈|浣忓鏈嶅姟","椁愰ギ鏈嶅姟;绯曢ゼ搴�;绯曢ゼ搴梶椁愰ギ鏈嶅姟;鐢滃搧搴�;鐢滃搧搴�","浜ら�氳鏂芥湇鍔�;鍋滆溅鍦�;鍏叡鍋滆溅鍦簗鐢熸椿鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;浣撹偛浼戦棽鏈嶅姟鍦烘墍;浣撹偛浼戦棽鏈嶅姟鍦烘墍|鍟嗗姟浣忓畢","浣撹偛浼戦棽鏈嶅姟;杩愬姩鍦洪;杩愬姩鍦烘墍|浣撹偛浼戦棽鏈嶅姟","鍏徃浼佷笟;鍏徃;骞垮憡瑁呴グ|璐墿鏈嶅姟;璐墿鐩稿叧鍦烘墍;璐墿鐩稿叧鍦烘墍","鍏徃浼佷笟;鍏徃;寤虹瓚鍏徃|閲戣瀺淇濋櫓鏈嶅姟","鍏徃浼佷笟;鍏徃;鐢典俊鍏徃|鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","鍏徃浼佷笟;鍏徃;鐢典俊鍏徃|璐墿鏈嶅姟;瀹剁數鐢靛瓙鍗栧満;鎵嬫満閿�鍞�","鍟嗗姟浣忓畢;浜т笟鍥尯;浜т笟鍥尯|椋庢櫙鍚嶈儨","鍟嗗姟浣忓畢;浣忓畢鍖�;浣忓畢鍖簗鍏徃浼佷笟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;绀句細鍥綋;琛屼笟鍗忎細|浣撹偛浼戦棽鏈嶅姟","姹借溅缁翠慨;涓扮敯鐗圭害缁翠慨;涓�姹戒赴鐢扮淮淇畖姹借溅閿�鍞�","姹借溅缁翠慨;濂ヨ开鐗圭害缁翠慨;涓�姹�-澶т紬濂ヨ开缁翠慨|姹借溅閿�鍞�","姹借溅缁翠慨;鏂反椴佺壒绾︾淮淇�;鏂反椴佺淮淇畖姹借溅閿�鍞�","姹借溅閿�鍞�;涓滈璐ц溅閿�鍞�;涓滈璐ц溅閿�鍞畖姹借溅缁翠慨","姹借溅閿�鍞�;澶т紬鐗圭害閿�鍞�;澶т紬閿�鍞畖姹借溅缁翠慨","鐢熸椿鏈嶅姟;娲楁荡鎺ㄦ嬁鍦烘墍;娲楁荡鎺ㄦ嬁鍦烘墍|绉戞暀鏂囧寲鏈嶅姟","鐢熸椿鏈嶅姟;娲楁荡鎺ㄦ嬁鍦烘墍;娲楁荡鎺ㄦ嬁鍦烘墍|椋庢櫙鍚嶈儨","鐢熸椿鏈嶅姟;鐗╂祦閫熼��;鐗╂祦閫熼�抾浜ら�氳鏂芥湇鍔�","鐢熸椿鏈嶅姟;鐢熸椿鏈嶅姟鍦烘墍;鐢熸椿鏈嶅姟鍦烘墍|椁愰ギ鏈嶅姟;椁愰ギ鐩稿叧鍦烘墍;椁愰ギ鐩稿叧","鐢熸椿鏈嶅姟;缁翠慨绔欑偣;缁翠慨绔欑偣|姹借溅閿�鍞�","绉戞暀鏂囧寲鏈嶅姟;瀛︽牎;瀛︽牎|鐢熸椿鏈嶅姟","绉戞暀鏂囧寲鏈嶅姟;鏂囪壓鍥綋;鏂囪壓鍥綋|鐢熸椿鏈嶅姟","璐墿鏈嶅姟;浣撹偛鐢ㄥ搧搴�;浣撹偛鐢ㄥ搧搴梶鐢熸椿鏈嶅姟","璐墿鏈嶅姟;鍟嗗満;鏅�氬晢鍦簗浣撹偛浼戦棽鏈嶅姟","璐墿鏈嶅姟;瀹剁數鐢靛瓙鍗栧満;瀹剁數鐢靛瓙鍗栧満|鍏徃浼佷笟;鍏徃;鍏徃","璐墿鏈嶅姟;缁煎悎甯傚満;姘翠骇娴烽矞甯傚満|椁愰ギ鏈嶅姟;椁愰ギ鐩稿叧鍦烘墍;椁愰ギ鐩稿叧","璐墿鏈嶅姟;瓒呯骇甯傚満;瓒呭競|姹借溅鏈嶅姟","椋庢櫙鍚嶈儨;椋庢櫙鍚嶈儨;椋庢櫙鍚嶈儨|椁愰ギ鏈嶅姟","椁愰ギ鏈嶅姟;鑼惰壓棣�;鑼惰壓棣唡绉戞暀鏂囧寲鏈嶅姟","浜ら�氳鏂芥湇鍔�;鍑虹杞�;鍑虹杞�","浣撹偛浼戦棽鏈嶅姟;浼戦棽鍦烘墍;姘翠笂娲诲姩涓績|浣撹偛浼戦棽鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;濞变箰鍦烘墍;妫嬬墝瀹椁愰ギ鏈嶅姟;鑼惰壓棣�;鑼惰壓棣�","浣撹偛浼戦棽鏈嶅姟;杩愬姩鍦洪;鍋ヨ韩涓績|椁愰ギ鏈嶅姟","鍏徃浼佷笟;鍏徃;骞垮憡瑁呴グ|鍟嗗姟浣忓畢","鍟嗗姟浣忓畢;鍟嗗姟浣忓畢鐩稿叧;鍟嗗姟浣忓畢鐩稿叧|椋庢櫙鍚嶈儨","鍟嗗姟浣忓畢;妤煎畤;妤煎畤鐩稿叧|璐墿鏈嶅姟","鍦板悕鍦板潃淇℃伅;浜ら�氬湴鍚�;閬撹矾鍚峾鐢熸椿鏈嶅姟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;浜ら�氳溅杈嗙鐞�;浜ら�氳溅杈嗙鐞嗙浉鍏硘鐢熸椿鏈嶅姟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鏀垮簻鍙婄ぞ浼氬洟浣撶浉鍏�;鏀垮簻鍙婄ぞ浼氬洟浣撶浉鍏硘绉戞暀鏂囧寲鏈嶅姟","鐢熸椿鏈嶅姟;淇℃伅鍜ㄨ涓績;鏈嶅姟涓績|鐢熸椿鏈嶅姟","鐢熸椿鏈嶅姟;鐢靛姏钀ヤ笟鍘�;鐢靛姏钀ヤ笟鍘厊鐢熸椿鏈嶅姟","鐢熸椿鏈嶅姟;缇庡缇庡彂搴�;缇庡缇庡彂搴梶璐墿鏈嶅姟;涓撳崠搴�;涓撹惀搴�","绉戞暀鏂囧寲鏈嶅姟;瀛︽牎;鎴愪汉鏁欒偛|鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","绉戞暀鏂囧寲鏈嶅姟;瀛︽牎;鑱屼笟鎶�鏈鏍绉戞暀鏂囧寲鏈嶅姟;鍩硅鏈烘瀯;鍩硅鏈烘瀯","绉戞暀鏂囧寲鏈嶅姟;绉戞暀鏂囧寲鍦烘墍;绉戞暀鏂囧寲鍦烘墍|鍟嗗姟浣忓畢","璐墿鏈嶅姟;涓撳崠搴�;鍙ょ帺瀛楃敾搴梶鍟嗗姟浣忓畢","璐墿鏈嶅姟;鍟嗗満;璐墿涓績|鐢熸椿鏈嶅姟","椁愰ギ鏈嶅姟;涓鍘�;娓呯湡鑿滈|鍏徃浼佷笟","椁愰ギ鏈嶅姟;涓鍘�;娓呯湡鑿滈|鍟嗗姟浣忓畢","椁愰ギ鏈嶅姟;鍐烽ギ搴�;鍐烽ギ搴梶椁愰ギ鏈嶅姟;绯曢ゼ搴�;绯曢ゼ搴�","椁愰ギ鏈嶅姟;绯曢ゼ搴�;绯曢ゼ搴梶鍟嗗姟浣忓畢","浜ら�氳鏂芥湇鍔�;娓彛鐮佸ご;娓彛鐮佸ご|椋庢櫙鍚嶈儨","浣撹偛浼戦棽鏈嶅姟;浼戦棽鍦烘墍;浼戦棽鍦烘墍|浣忓鏈嶅姟;浣忓鏈嶅姟鐩稿叧;浣忓鏈嶅姟鐩稿叧","鍏徃浼佷笟;鍏徃;鏈烘鐢靛瓙|璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;寤烘潗浜旈噾甯傚満","鍟嗗姟浣忓畢;妤煎畤;妤煎畤鐩稿叧|浣忓鏈嶅姟","鍦板悕鍦板潃淇℃伅;浜ら�氬湴鍚�;妗椋庢櫙鍚嶈儨","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;浜ら�氳溅杈嗙鐞�;杞﹁締绠$悊鏈烘瀯|鐢熸椿鏈嶅姟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鍏娉曟満鏋�;妫�瀵熼櫌|鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;宸ュ晢绋庡姟鏈烘瀯;宸ュ晢绋庡姟鏈烘瀯|鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;绀句細鍥綋;娑堣垂鑰呭崗浼殀鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","姹借溅鏈嶅姟;姹借溅鏈嶅姟鐩稿叧;姹借溅鏈嶅姟鐩稿叧|鎽╂墭杞︽湇鍔�","姹借溅缁翠慨;闀垮煄姹借溅缁翠慨;榄忔淳姹借溅缁翠慨|姹借溅閿�鍞�","姹借溅閿�鍞�;璐ц溅閿�鍞�;璐ц溅閿�鍞畖鍏徃浼佷笟","姹借溅閿�鍞�;璐ц溅閿�鍞�;璐ц溅閿�鍞畖璐墿鏈嶅姟","姹借溅閿�鍞�;閫氱敤鐗圭害閿�鍞�;鍒厠閿�鍞畖姹借溅缁翠慨;閫氱敤鐗圭害缁翠慨;鍒厠缁翠慨","鐢熸椿鏈嶅姟;鐗╂祦閫熼��;鐗╂祦閫熼�抾璐墿鏈嶅姟;璐墿鐩稿叧鍦烘墍;璐墿鐩稿叧鍦烘墍","绉戞暀鏂囧寲鏈嶅姟;鏂囧寲瀹�;鏂囧寲瀹珅鐢熸椿鏈嶅姟","璐墿鏈嶅姟;涓撳崠搴�;涓撹惀搴梶浣忓鏈嶅姟","璐墿鏈嶅姟;涓撳崠搴�;涓撹惀搴梶璐墿鏈嶅姟;渚挎皯鍟嗗簵/渚垮埄搴�;渚挎皯鍟嗗簵/渚垮埄搴�","璐墿鏈嶅姟;涓撳崠搴�;鍎跨鐢ㄥ搧搴梶鐢熸椿鏈嶅姟;缇庡缇庡彂搴�;缇庡缇庡彂搴�","璐墿鏈嶅姟;涓撳崠搴�;鐑熼厭涓撳崠搴梶绉戞暀鏂囧寲鏈嶅姟","璐墿鏈嶅姟;渚挎皯鍟嗗簵/渚垮埄搴�;渚挎皯鍟嗗簵/渚垮埄搴梶椋庢櫙鍚嶈儨","璐墿鏈嶅姟;鍟嗗満;鏅�氬晢鍦簗璐墿鏈嶅姟;渚挎皯鍟嗗簵/渚垮埄搴�;渚挎皯鍟嗗簵/渚垮埄搴�","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;瀹跺叿寤烘潗缁煎悎甯傚満|鐢熸椿鏈嶅姟","璐墿鏈嶅姟;瀹剁數鐢靛瓙鍗栧満;鏁扮爜鐢靛瓙|鍟嗗姟浣忓畢","璐墿鏈嶅姟;鏂囧寲鐢ㄥ搧搴�;鏂囧寲鐢ㄥ搧搴梶鐢熸椿鏈嶅姟;鐢熸椿鏈嶅姟鍦烘墍;鐢熸椿鏈嶅姟鍦烘墍","璐墿鏈嶅姟;缁煎悎甯傚満;缁煎悎甯傚満|椁愰ギ鏈嶅姟","璐墿鏈嶅姟;瓒呯骇甯傚満;涓婃捣鍗庤仈|璐墿鏈嶅姟","閲戣瀺淇濋櫓鏈嶅姟;淇濋櫓鍏徃;淇濋櫓鍏徃|鐢熸椿鏈嶅姟","閲戣瀺淇濋櫓鏈嶅姟;閾惰;鍐滄潙鍟嗕笟閾惰|閲戣瀺淇濋櫓鏈嶅姟;閾惰鐩稿叧;閾惰鐩稿叧","閲戣瀺淇濋櫓鏈嶅姟;閾惰鐩稿叧;閾惰鐩稿叧|閲戣瀺淇濋櫓鏈嶅姟","椋庢櫙鍚嶈儨;鍏洯骞垮満;妞嶇墿鍥瓅椋庢櫙鍚嶈儨","椋庢櫙鍚嶈儨;椋庢櫙鍚嶈儨;瀵哄簷閬撹|璐墿鏈嶅姟","椋庢櫙鍚嶈儨;椋庢櫙鍚嶈儨;椋庢櫙鍚嶈儨|鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","椋庢櫙鍚嶈儨;椋庢櫙鍚嶈儨鐩稿叧;鏃呮父鏅偣|绉戞暀鏂囧寲鏈嶅姟","椁愰ギ鏈嶅姟;涓鍘�;娴欐睙鑿渱浣忓鏈嶅姟","椁愰ギ鏈嶅姟;鍐烽ギ搴�;鍐烽ギ搴梶鍏徃浼佷笟","椁愰ギ鏈嶅姟;鑼惰壓棣�;鑼惰壓棣唡鍏徃浼佷笟","浜ら�氳鏂芥湇鍔�;鏈哄満鐩稿叧;鐩村崌鏈哄満","浣忓鏈嶅姟;瀹鹃閰掑簵;瀹鹃閰掑簵|椁愰ギ鏈嶅姟;椁愰ギ鐩稿叧鍦烘墍;椁愰ギ鐩稿叧","浣撹偛浼戦棽鏈嶅姟;濞变箰鍦烘墍;KTV|璐墿鏈嶅姟;璐墿鐩稿叧鍦烘墍;璐墿鐩稿叧鍦烘墍","浣撹偛浼戦棽鏈嶅姟;濞变箰鍦烘墍;妫嬬墝瀹鍟嗗姟浣忓畢","浣撹偛浼戦棽鏈嶅姟;搴﹀亣鐤楀吇鍦烘墍;鐤楀吇闄浣忓鏈嶅姟","鍏徃浼佷笟;鍏徃;鍏徃|鍏徃浼佷笟;鍐滄灄鐗ф笖鍩哄湴;鍏跺畠鍐滄灄鐗ф笖鍩哄湴","鍏徃浼佷笟;鍏徃;鍏徃|椁愰ギ鏈嶅姟;椁愰ギ鐩稿叧鍦烘墍;椁愰ギ鐩稿叧","鍏徃浼佷笟;鍏徃;鍐堕噾鍖栧伐|绉戞暀鏂囧寲鏈嶅姟","鍏徃浼佷笟;鍏徃;缃戠粶绉戞妧|鍟嗗姟浣忓畢","鍏徃浼佷笟;宸ュ巶;宸ュ巶|姹借溅缁翠慨","鍟嗗姟浣忓畢;妤煎畤;鍟嗕綇涓ょ敤妤煎畤|鐢熸椿鏈嶅姟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;宸ュ晢绋庡姟鏈烘瀯;宸ュ晢绋庡姟鏈烘瀯|鐢熸椿鏈嶅姟","姹借溅鏈嶅姟;鍔犳皵绔�;鍔犳皵绔檤鍏徃浼佷笟","姹借溅鏈嶅姟;姹借溅绉熻祦;姹借溅绉熻祦|璐墿鏈嶅姟","姹借溅缁翠慨;濂ヨ开鐗圭害缁翠慨;涓婃苯-澶т紬濂ヨ开缁翠慨|姹借溅閿�鍞�","姹借溅閿�鍞�;涓扮敯鐗圭害閿�鍞�;涓扮敯閿�鍞畖姹借溅缁翠慨","鐢熸椿鏈嶅姟;娲楁荡鎺ㄦ嬁鍦烘墍;娲楁荡鎺ㄦ嬁鍦烘墍|姹借溅鏈嶅姟","绉戞暀鏂囧寲鏈嶅姟;浼犲獟鏈烘瀯;鐢佃鍙皘鍏徃浼佷笟","绉戞暀鏂囧寲鏈嶅姟;瀛︽牎;灏忓|鍏徃浼佷笟","绉戞暀鏂囧寲鏈嶅姟;绉戞暀鏂囧寲鍦烘墍;绉戞暀鏂囧寲鍦烘墍|鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","璐墿鏈嶅姟;涓撳崠搴�;涔﹀簵|浣撹偛浼戦棽鏈嶅姟","璐墿鏈嶅姟;涓撳崠搴�;鐝犲疂棣栭グ宸ヨ壓鍝亅鍏徃浼佷笟;鍏徃;鍏徃","璐墿鏈嶅姟;涓撳崠搴�;闊冲儚搴梶鐢熸椿鏈嶅姟","璐墿鏈嶅姟;鍟嗗満;鍏嶇◣鍝佸簵|鐢熸椿鏈嶅姟","璐墿鏈嶅姟;鍟嗗満;鍟嗗満|鍟嗗姟浣忓畢","璐墿鏈嶅姟;鍟嗗満;璐墿涓績|鍏徃浼佷笟","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;瀹跺叿鍩巪鐢熸椿鏈嶅姟;鐢熸椿鏈嶅姟鍦烘墍;鐢熸椿鏈嶅姟鍦烘墍","璐墿鏈嶅姟;鏈嶈闉嬪附鐨叿搴�;鏈嶈闉嬪附鐨叿搴梶椋庢櫙鍚嶈儨","璐墿鏈嶅姟;瓒呯骇甯傚満;瓒呭競|浣忓鏈嶅姟","椋庢櫙鍚嶈儨;椋庢櫙鍚嶈儨;瀵哄簷閬撹|鐢熸椿鏈嶅姟","椁愰ギ鏈嶅姟;涓鍘�;娴烽矞閰掓ゼ|鐢熸椿鏈嶅姟","浜ら�氳鏂芥湇鍔�;鍋滆溅鍦�;涓撶敤鍋滆溅鍦簗浜ら�氳鏂芥湇鍔�;鍋滆溅鍦�;璺竟鍋滆溅鍦�","浣撹偛浼戦棽鏈嶅姟;浼戦棽鍦烘墍;闇茶惀鍦皘浣忓鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;杩愬姩鍦洪;缁煎悎浣撹偛棣唡璐墿鏈嶅姟","鍏徃浼佷笟;鍏徃;鍏徃|姹借溅鏈嶅姟;姹借溅閰嶄欢閿�鍞�;姹借溅閰嶄欢閿�鍞�","鍏徃浼佷笟;鍏徃;鏈烘鐢靛瓙|姹借溅鏈嶅姟;姹借溅鏈嶅姟鐩稿叧;姹借溅鏈嶅姟鐩稿叧","鍏徃浼佷笟;鍐滄灄鐗ф笖鍩哄湴;鑺卞崏鑻楀渻鍩哄湴|璐墿鏈嶅姟","鍏徃浼佷笟;宸ュ巶;宸ュ巶|璐墿鏈嶅姟;涓撳崠搴�;涓撹惀搴�","鍟嗗姟浣忓畢;妤煎畤;宸ヤ笟澶у帵寤虹瓚鐗﹟鍟嗗姟浣忓畢","鍦板悕鍦板潃淇℃伅;鏅�氬湴鍚�;鏉戝簞绾у湴鍚峾绉戞暀鏂囧寲鏈嶅姟","鎽╂墭杞︽湇鍔�;鎽╂墭杞﹂攢鍞�;鎽╂墭杞﹂攢鍞畖璐墿鏈嶅姟;璐墿鐩稿叧鍦烘墍;璐墿鐩稿叧鍦烘墍","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鍏娉曟満鏋�;绀句細娌诲畨鏈烘瀯|璐墿鏈嶅姟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鏀垮簻鏈哄叧;鍖哄幙绾ф斂搴滃強浜嬩笟鍗曚綅|浣撹偛浼戦棽鏈嶅姟","姹借溅鏈嶅姟;姹借溅閰嶄欢閿�鍞�;姹借溅閰嶄欢閿�鍞畖璐墿鏈嶅姟;涓撳崠搴�;涓撹惀搴�","姹借溅閿�鍞�;濂囩憺鐗圭害閿�鍞�;濂囩憺閿�鍞畖姹借溅缁翠慨;濂囩憺鐗圭害缁翠慨;濂囩憺缁翠慨","姹借溅閿�鍞�;姹借溅閿�鍞�;姹借溅閿�鍞畖璐墿鏈嶅姟;璐墿鐩稿叧鍦烘墍;璐墿鐩稿叧鍦烘墍","鐢熸椿鏈嶅姟;浜烘墠甯傚満;浜烘墠甯傚満|璐墿鏈嶅姟","鐢熸椿鏈嶅姟;鐗╂祦閫熼��;鐗╂祦浠撳偍鍦哄湴|鍏徃浼佷笟;鍏徃;鍏徃","鐢熸椿鏈嶅姟;缁翠慨绔欑偣;缁翠慨绔欑偣|椁愰ギ鏈嶅姟","绉戞暀鏂囧寲鏈嶅姟;鍗氱墿棣�;鍗氱墿棣唡绉戞暀鏂囧寲鏈嶅姟","绉戞暀鏂囧寲鏈嶅姟;鍩硅鏈烘瀯;鍩硅鏈烘瀯|椋庢櫙鍚嶈儨","绉戞暀鏂囧寲鏈嶅姟;瀛︽牎;骞煎効鍥瓅绉戞暀鏂囧寲鏈嶅姟;鍩硅鏈烘瀯;鍩硅鏈烘瀯","璐墿鏈嶅姟;涓撳崠搴�;鍙ょ帺瀛楃敾搴梶鐢熸椿鏈嶅姟;鐢熸椿鏈嶅姟鍦烘墍;鐢熸椿鏈嶅姟鍦烘墍","璐墿鏈嶅姟;涓撳崠搴�;鍙ょ帺瀛楃敾搴梶绉戞暀鏂囧寲鏈嶅姟;鍩硅鏈烘瀯;鍩硅鏈烘瀯","璐墿鏈嶅姟;涓撳崠搴�;鐝犲疂棣栭グ宸ヨ壓鍝亅椋庢櫙鍚嶈儨","璐墿鏈嶅姟;涓撳崠搴�;绀煎搧楗板搧搴梶浣撹偛浼戦棽鏈嶅姟","璐墿鏈嶅姟;涓汉鐢ㄥ搧/鍖栧鍝佸簵;鑾庤帋|鐢熸椿鏈嶅姟","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;寤烘潗浜旈噾甯傚満|鎽╂墭杞︽湇鍔�","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;鐏叿鐡峰櫒甯傚満|鍏徃浼佷笟;鍏徃;鍏徃","璐墿鏈嶅姟;瀹剁數鐢靛瓙鍗栧満;鎵嬫満閿�鍞畖璐墿鏈嶅姟;瀹剁數鐢靛瓙鍗栧満;鏁扮爜鐢靛瓙","璐墿鏈嶅姟;瀹剁數鐢靛瓙鍗栧満;鎵嬫満閿�鍞畖椁愰ギ鏈嶅姟","璐墿鏈嶅姟;瀹剁數鐢靛瓙鍗栧満;鏁扮爜鐢靛瓙|椁愰ギ鏈嶅姟","璐墿鏈嶅姟;鏈嶈闉嬪附鐨叿搴�;鏈嶈闉嬪附鐨叿搴梶鍏徃浼佷笟;鍏徃浼佷笟;鍏徃浼佷笟","璐墿鏈嶅姟;缁煎悎甯傚満;鍐滃壇浜у搧甯傚満|浣撹偛浼戦棽鏈嶅姟","璐墿鏈嶅姟;鑺遍笩楸艰櫕甯傚満;鑺卞崏甯傚満|鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","椁愰ギ鏈嶅姟;涓鍘�;姹熻嫃鑿渱椁愰ギ鏈嶅姟","椁愰ギ鏈嶅姟;澶栧浗椁愬巺;瑗块鍘�(缁煎悎椋庡懗)|鐢熸椿鏈嶅姟","浣忓鏈嶅姟;瀹鹃閰掑簵;涓夋槦绾у棣唡鐢熸椿鏈嶅姟","浣忓鏈嶅姟;鏃呴鎷涘緟鎵�;鏃呴鎷涘緟鎵�|鍏徃浼佷笟","浣撹偛浼戦棽鏈嶅姟;濞变箰鍦烘墍;閰掑惂|椁愰ギ鏈嶅姟;椁愰ギ鐩稿叧鍦烘墍;椁愰ギ鐩稿叧","鍏徃浼佷笟;鍏徃;鍏徃|璐墿鏈嶅姟;渚挎皯鍟嗗簵/渚垮埄搴�;渚挎皯鍟嗗簵/渚垮埄搴�","鍏徃浼佷笟;鍏徃;鍐堕噾鍖栧伐|姹借溅鏈嶅姟","鍏徃浼佷笟;鍏徃;鏈烘鐢靛瓙|璐墿鏈嶅姟;璐墿鐩稿叧鍦烘墍;璐墿鐩稿叧鍦烘墍","鍏徃浼佷笟;鍏徃;鐢典俊鍏徃|鍏徃浼佷笟","鍟嗗姟浣忓畢;鍟嗗姟浣忓畢鐩稿叧;鍟嗗姟浣忓畢鐩稿叧|鍏徃浼佷笟","鍟嗗姟浣忓畢;妤煎畤;妤煎畤鐩稿叧|椋庢櫙鍚嶈儨","姹借溅鏈嶅姟;鍏呯數绔�;鍏呯數绔檤鐢熸椿鏈嶅姟","姹借溅鏈嶅姟;姹借溅鍏绘姢/瑁呴グ;姹借溅鍏绘姢|璐墿鏈嶅姟;璐墿鐩稿叧鍦烘墍;璐墿鐩稿叧鍦烘墍","姹借溅缁翠慨;鍚夊埄鐗圭害缁翠慨;娌冨皵娌冩苯杞︾淮淇畖姹借溅閿�鍞�","姹借溅閿�鍞�;涓滈璐ц溅閿�鍞�;涓滈璐ц溅閿�鍞畖姹借溅閿�鍞�","姹借溅閿�鍞�;鎹疯惫鐗圭害閿�鍞�;鎹疯惫閿�鍞畖姹借溅閿�鍞�","鐢熸椿鏈嶅姟;濠村効鏈嶅姟鍦烘墍;濠村効娓告吵棣唡璐墿鏈嶅姟;涓撳崠搴�;鍎跨鐢ㄥ搧搴�","鐢熸椿鏈嶅姟;娲楁荡鎺ㄦ嬁鍦烘墍;娲楁荡鎺ㄦ嬁鍦烘墍|椁愰ギ鏈嶅姟;椁愰ギ鐩稿叧鍦烘墍;椁愰ギ鐩稿叧","鐢熸椿鏈嶅姟;鐢佃钀ヤ笟鍘�;鐢佃钀ヤ笟鍘厊鐢熸椿鏈嶅姟","绉戞暀鏂囧寲鏈嶅姟;浼犲獟鏈烘瀯;鐢靛彴|绉戞暀鏂囧寲鏈嶅姟","绉戞暀鏂囧寲鏈嶅姟;瀛︽牎;鑱屼笟鎶�鏈鏍鍏徃浼佷笟","绉戞暀鏂囧寲鏈嶅姟;灞曡棣�;灞曡棣唡鐢熸椿鏈嶅姟","绉戞暀鏂囧寲鏈嶅姟;缇庢湳棣�;缇庢湳棣唡鐢熸椿鏈嶅姟","璐墿鏈嶅姟;涓撳崠搴�;涓撹惀搴梶鍏徃浼佷笟;宸ュ巶;宸ュ巶","璐墿鏈嶅姟;涓撳崠搴�;鍎跨鐢ㄥ搧搴梶鍏徃浼佷笟;鍏徃;鍏徃","璐墿鏈嶅姟;涓撳崠搴�;鍎跨鐢ㄥ搧搴梶椁愰ギ鏈嶅姟;椁愰ギ鐩稿叧鍦烘墍;椁愰ギ鐩稿叧","璐墿鏈嶅姟;涓撳崠搴�;瀹犵墿鐢ㄥ搧搴梶浣撹偛浼戦棽鏈嶅姟","璐墿鏈嶅姟;涓汉鐢ㄥ搧/鍖栧鍝佸簵;鍏跺畠涓汉鐢ㄥ搧搴梶姹借溅鏈嶅姟","璐墿鏈嶅姟;浣撹偛鐢ㄥ搧搴�;浣撹偛鐢ㄥ搧搴梶绉戞暀鏂囧寲鏈嶅姟","璐墿鏈嶅姟;浣撹偛鐢ㄥ搧搴�;鑰愬厠涓撳崠搴梶璐墿鏈嶅姟","璐墿鏈嶅姟;渚挎皯鍟嗗簵/渚垮埄搴�;渚挎皯鍟嗗簵/渚垮埄搴梶鎽╂墭杞︽湇鍔�","璐墿鏈嶅姟;鍟嗗満;鍟嗗満|鐢熸椿鏈嶅姟","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;鍘ㄥ崼甯傚満|鐢熸椿鏈嶅姟;鐢熸椿鏈嶅姟鍦烘墍;鐢熸椿鏈嶅姟鍦烘墍","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;寤烘潗浜旈噾甯傚満|椋庢櫙鍚嶈儨","璐墿鏈嶅姟;缁煎悎甯傚満;鏋滃搧甯傚満|椁愰ギ鏈嶅姟;鍐烽ギ搴�;鍐烽ギ搴�","璐墿鏈嶅姟;缁煎悎甯傚満;钄彍甯傚満|鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","璐墿鏈嶅姟;鑺遍笩楸艰櫕甯傚満;鑺卞崏甯傚満|浣忓鏈嶅姟","閲戣瀺淇濋櫓鏈嶅姟;鑷姩鎻愭鏈�;鍐滄潙鍟嗕笟閾惰ATM|鐢熸椿鏈嶅姟","閲戣瀺淇濋櫓鏈嶅姟;閾惰;涓浗寤鸿閾惰|鐢熸椿鏈嶅姟","椋庢櫙鍚嶈儨;椋庢櫙鍚嶈儨;椋庢櫙鍚嶈儨|鍏徃浼佷笟","椁愰ギ鏈嶅姟;涓鍘�;涓鍘厊鍟嗗姟浣忓畢;鍟嗗姟浣忓畢鐩稿叧;鍟嗗姟浣忓畢鐩稿叧","椁愰ギ鏈嶅姟;涓鍘�;鍙版咕鑿渱椁愰ギ鏈嶅姟","椁愰ギ鏈嶅姟;涓鍘�;婀栧寳鑿�(閯傝彍)|椁愰ギ鏈嶅姟","椁愰ギ鏈嶅姟;浼戦棽椁愰ギ鍦烘墍;浼戦棽椁愰ギ鍦烘墍|椁愰ギ鏈嶅姟;涓鍘�;涓鍘�","椁愰ギ鏈嶅姟;澶栧浗椁愬巺;闊╁浗鏂欑悊|鐢熸椿鏈嶅姟","浜ら�氳鏂芥湇鍔�;娓彛鐮佸ご;鍑烘腐","浜ら�氳鏂芥湇鍔�;绱㈤亾绔�;绱㈤亾绔�","浣忓鏈嶅姟;瀹鹃閰掑簵;鍥涙槦绾у棣唡鍟嗗姟浣忓畢","浣撹偛浼戦棽鏈嶅姟;杩愬姩鍦洪;婧滃啺鍦簗璐墿鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;杩愬姩鍦洪;缁煎悎浣撹偛棣唡绉戞暀鏂囧寲鏈嶅姟","鍏徃浼佷笟;鍏徃;骞垮憡瑁呴グ|绉戞暀鏂囧寲鏈嶅姟;浼犲獟鏈烘瀯;浼犲獟鏈烘瀯","鍏徃浼佷笟;鍏徃;缃戠粶绉戞妧|璐墿鏈嶅姟;瀹剁數鐢靛瓙鍗栧満;鏁扮爜鐢靛瓙","鍏徃浼佷笟;鍏徃;缃戠粶绉戞妧|閲戣瀺淇濋櫓鏈嶅姟","鍏徃浼佷笟;鍏徃;缃戠粶绉戞妧|椁愰ギ鏈嶅姟","鍏徃浼佷笟;鍐滄灄鐗ф笖鍩哄湴;鍏跺畠鍐滄灄鐗ф笖鍩哄湴|鍏徃浼佷笟;鍏徃;鍏徃","鍖荤枟淇濆仴鏈嶅姟;璇婃墍;璇婃墍|鍖荤枟淇濆仴鏈嶅姟;涓撶鍖婚櫌;涓撶鍖婚櫌","鍟嗗姟浣忓畢;浣忓畢鍖�;浣忓畢鍖簗浣撹偛浼戦棽鏈嶅姟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鍏娉曟満鏋�;鍏娉曟満鍏硘鐢熸椿鏈嶅姟","姹借溅缁翠慨;姹借溅缁翠慨;姹借溅缁翠慨|鐢熸椿鏈嶅姟;鐢熸椿鏈嶅姟鍦烘墍;鐢熸椿鏈嶅姟鍦烘墍","姹借溅缁翠慨;閫氱敤鐗圭害缁翠慨;鍑开鎷夊厠缁翠慨|姹借溅閿�鍞�","姹借溅閿�鍞�;涓滈鐗圭害閿�鍞�;涓滈閿�鍞畖璐墿鏈嶅姟","姹借溅閿�鍞�;濂ヨ开鐗圭害閿�鍞�;涓婃苯-澶т紬濂ヨ开閿�鍞畖姹借溅缁翠慨","姹借溅閿�鍞�;鏍囪嚧闆搧榫欑壒绾﹂攢鍞�;涓滈闆搧榫欓攢鍞畖姹借溅閿�鍞�","姹借溅閿�鍞�;姹熸樊璐ц溅閿�鍞�;姹熸樊璐ц溅閿�鍞畖姹借溅缁翠慨","姹借溅閿�鍞�;瑙傝嚧閿�鍞�;瑙傝嚧閿�鍞畖姹借溅缁翠慨","鐢熸椿鏈嶅姟;涓ц懍璁炬柦;闄靛洯|椋庢櫙鍚嶈儨;椋庢櫙鍚嶈儨;椋庢櫙鍚嶈儨","鐢熸椿鏈嶅姟;涓粙鏈烘瀯;涓粙鏈烘瀯|绉戞暀鏂囧寲鏈嶅姟","鐢熸椿鏈嶅姟;鍞エ澶�;鍞エ澶剕鐢熸椿鏈嶅姟","鐢熸椿鏈嶅姟;缇庡缇庡彂搴�;缇庡缇庡彂搴梶浣忓鏈嶅姟","绉戞暀鏂囧寲鏈嶅姟;浼犲獟鏈烘瀯;浼犲獟鏈烘瀯|鍏徃浼佷笟;鍏徃;鍏徃","绉戞暀鏂囧寲鏈嶅姟;浼犲獟鏈烘瀯;鐢佃鍙皘鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","绉戞暀鏂囧寲鏈嶅姟;瀛︽牎;涓|鍏徃浼佷笟","璐墿鏈嶅姟;涓撳崠搴�;鐑熼厭涓撳崠搴梶椋庢櫙鍚嶈儨","璐墿鏈嶅姟;瀹剁數鐢靛瓙鍗栧満;鎵嬫満閿�鍞畖鐢熸椿鏈嶅姟;鐢佃钀ヤ笟鍘�;鐢佃钀ヤ笟鍘�","璐墿鏈嶅姟;鏈嶈闉嬪附鐨叿搴�;鍝佺墝鐨叿搴梶鐢熸椿鏈嶅姟","璐墿鏈嶅姟;缁煎悎甯傚満;鏃ц揣甯傚満|姹借溅鏈嶅姟","璐墿鏈嶅姟;瓒呯骇甯傚満;灞堣嚕姘弢璐墿鏈嶅姟","閲戣瀺淇濋櫓鏈嶅姟;閾惰;涓浗宸ュ晢閾惰|鐢熸椿鏈嶅姟","椁愰ギ鏈嶅姟;涓鍘�;鐗硅壊/鍦版柟椋庡懗椁愬巺|鍦板悕鍦板潃淇℃伅","椁愰ギ鏈嶅姟;鑼惰壓棣�;鑼惰壓棣唡椋庢櫙鍚嶈儨","浣忓鏈嶅姟;瀹鹃閰掑簵;鍥涙槦绾у棣唡浣撹偛浼戦棽鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;浼戦棽鍦烘墍;姘翠笂娲诲姩涓績|鐢熸椿鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;杩愬姩鍦洪;缇芥瘺鐞冨満|浣撹偛浼戦棽鏈嶅姟","鍏徃浼佷笟;鍏徃;鍏徃|璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;瀹跺眳寤烘潗甯傚満","鍏徃浼佷笟;鍏徃;鍟嗕笟璐告槗|鍟嗗姟浣忓畢","鍏徃浼佷笟;鍏徃浼佷笟;鍏徃浼佷笟|姹借溅缁翠慨","鍏徃浼佷笟;鍐滄灄鐗ф笖鍩哄湴;鍏跺畠鍐滄灄鐗ф笖鍩哄湴|绉戞暀鏂囧寲鏈嶅姟","鍖荤枟淇濆仴鏈嶅姟;缁煎悎鍖婚櫌;缁煎悎鍖婚櫌|鍖荤枟淇濆仴鏈嶅姟;璇婃墍;璇婃墍","鍟嗗姟浣忓畢;浣忓畢鍖�;瀹胯垗|鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","鍟嗗姟浣忓畢;妤煎畤;鍟嗗姟鍐欏瓧妤紎浣撹偛浼戦棽鏈嶅姟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鍏娉曟満鏋�;娑堥槻鏈哄叧|鍏徃浼佷笟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鏀垮簻鏈哄叧;鍥藉绾ф満鍏冲強浜嬩笟鍗曚綅|鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","姹借溅鏈嶅姟;姹借溅閰嶄欢閿�鍞�;姹借溅閰嶄欢閿�鍞畖鍏徃浼佷笟;鍏徃;鍏徃","姹借溅閿�鍞�;瀹濋┈鐗圭害閿�鍞�;瀹濋┈閿�鍞畖姹借溅缁翠慨;瀹濋┈鐗圭害缁翠慨;瀹濋┈缁翠慨","绉戞暀鏂囧寲鏈嶅姟;瀛︽牎;涓|鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","璐墿鏈嶅姟;涓撳崠搴�;鍙ょ帺瀛楃敾搴梶绉戞暀鏂囧寲鏈嶅姟;绉戞暀鏂囧寲鍦烘墍;绉戞暀鏂囧寲鍦烘墍","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;寤烘潗浜旈噾甯傚満|閲戣瀺淇濋櫓鏈嶅姟","璐墿鏈嶅姟;瀹剁數鐢靛瓙鍗栧満;鎵嬫満閿�鍞畖鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","璐墿鏈嶅姟;瀹剁數鐢靛瓙鍗栧満;鑻忓畞|璐墿鏈嶅姟","璐墿鏈嶅姟;缁煎悎甯傚満;鍐滃壇浜у搧甯傚満|姹借溅鏈嶅姟","璐墿鏈嶅姟;缁煎悎甯傚満;鏋滃搧甯傚満|鍟嗗姟浣忓畢","璐墿鏈嶅姟;鑺遍笩楸艰櫕甯傚満;瀹犵墿甯傚満|鐢熸椿鏈嶅姟","閲戣瀺淇濋櫓鏈嶅姟;淇濋櫓鍏徃;淇濋櫓鍏徃|璐墿鏈嶅姟","椋庢櫙鍚嶈儨;椋庢櫙鍚嶈儨;椋庢櫙鍚嶈儨|鍟嗗姟浣忓畢","椁愰ギ鏈嶅姟;涓鍘�;涓紡绱犺彍棣唡椁愰ギ鏈嶅姟","椁愰ギ鏈嶅姟;涓鍘�;鍥涘窛鑿�(宸濊彍)|浣忓鏈嶅姟","椁愰ギ鏈嶅姟;涓鍘�;骞夸笢鑿�(绮よ彍)|浣撹偛浼戦棽鏈嶅姟","椁愰ギ鏈嶅姟;涓鍘�;婀栧崡鑿�(婀樿彍)|浣忓鏈嶅姟","椁愰ギ鏈嶅姟;涓鍘�;鐗硅壊/鍦版柟椋庡懗椁愬巺|椁愰ギ鏈嶅姟;涓鍘�;娴烽矞閰掓ゼ","椁愰ギ鏈嶅姟;涓鍘�;缁煎悎閰掓ゼ|椁愰ギ鏈嶅姟;鑼惰壓棣�;鑼惰壓棣�","椁愰ギ鏈嶅姟;澶栧浗椁愬巺;澶栧浗椁愬巺|椁愰ギ鏈嶅姟","椁愰ギ鏈嶅姟;澶栧浗椁愬巺;瑗块鍘�(缁煎悎椋庡懗)|椁愰ギ鏈嶅姟;澶栧浗椁愬巺;鐗涙墥搴�(鎵掓埧)","浣忓鏈嶅姟;瀹鹃閰掑簵;涓夋槦绾у棣唡鍟嗗姟浣忓畢","浣撹偛浼戦棽鏈嶅姟;浼戦棽鍦烘墍;浼戦棽鍦烘墍|椁愰ギ鏈嶅姟;椁愰ギ鐩稿叧鍦烘墍;椁愰ギ鐩稿叧","浣撹偛浼戦棽鏈嶅姟;濞变箰鍦烘墍;濞变箰鍦烘墍|鍏徃浼佷笟","浣撹偛浼戦棽鏈嶅姟;濞变箰鍦烘墍;濞变箰鍦烘墍|鍟嗗姟浣忓畢","浣撹偛浼戦棽鏈嶅姟;濞变箰鍦烘墍;妫嬬墝瀹浣忓鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;杩愬姩鍦洪;娓告吵棣唡璐墿鏈嶅姟","鍏徃浼佷笟;鍏徃;鍏徃|鍟嗗姟浣忓畢;浜т笟鍥尯;浜т笟鍥尯","鍏徃浼佷笟;鍏徃;鍏徃|绉戞暀鏂囧寲鏈嶅姟;浼犲獟鏈烘瀯;浼犲獟鏈烘瀯","鍏徃浼佷笟;鍏徃;鍏徃|璐墿鏈嶅姟;浣撹偛鐢ㄥ搧搴�;浣撹偛鐢ㄥ搧搴�","鍟嗗姟浣忓畢;浣忓畢鍖�;瀹胯垗|鐢熸椿鏈嶅姟","鍟嗗姟浣忓畢;妤煎畤;鍟嗗姟鍐欏瓧妤紎鍟嗗姟浣忓畢;浜т笟鍥尯;浜т笟鍥尯","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;浜ら�氳溅杈嗙鐞�;浜ら�氱鐞嗘満鏋剕姹借溅鏈嶅姟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;浜ら�氳溅杈嗙鐞�;楠岃溅鍦簗鎽╂墭杞︽湇鍔�","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鏀垮簻鏈哄叧;涔¢晣绾ф斂搴滃強浜嬩笟鍗曚綅|閲戣瀺淇濋櫓鏈嶅姟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;绀句細鍥綋;鎱堝杽鏈烘瀯|浣撹偛浼戦棽鏈嶅姟","姹借溅鏈嶅姟;姹借溅鏈嶅姟鐩稿叧;姹借溅鏈嶅姟鐩稿叧|椁愰ギ鏈嶅姟","姹借溅鏈嶅姟;娲楄溅鍦�;娲楄溅鍦簗姹借溅閿�鍞�","姹借溅缁翠慨;瀹濋┈鐗圭害缁翠慨;瀹濋┈缁翠慨|姹借溅閿�鍞�","姹借溅缁翠慨;闆疯鐗圭害缁翠慨;闆疯缁翠慨|姹借溅閿�鍞�","鐢熸椿鏈嶅姟;娲楁荡鎺ㄦ嬁鍦烘墍;娲楁荡鎺ㄦ嬁鍦烘墍|浣忓鏈嶅姟;瀹鹃閰掑簵;瀹鹃閰掑簵","鐢熸椿鏈嶅姟;鐢熸椿鏈嶅姟鍦烘墍;鐢熸椿鏈嶅姟鍦烘墍|姹借溅缁翠慨;姹借溅缁翠慨;姹借溅缁翠慨","鐢熸椿鏈嶅姟;鐢佃钀ヤ笟鍘�;鐢佃钀ヤ笟鍘厊鍏徃浼佷笟","鐢熸椿鏈嶅姟;閭眬;閭眬|鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","绉戞暀鏂囧寲鏈嶅姟;浼氬睍涓績;浼氬睍涓績|绉戞暀鏂囧寲鏈嶅姟","绉戞暀鏂囧寲鏈嶅姟;瀛︽牎;灏忓|璐墿鏈嶅姟","璐墿鏈嶅姟;浣撹偛鐢ㄥ搧搴�;浣撹偛鐢ㄥ搧搴梶鍏徃浼佷笟;鍏徃;鍏徃","璐墿鏈嶅姟;鍟嗗満;鍏嶇◣鍝佸簵|鍏徃浼佷笟","璐墿鏈嶅姟;瀹剁數鐢靛瓙鍗栧満;鏁扮爜鐢靛瓙|鐢熸椿鏈嶅姟;鎽勫奖鍐插嵃搴�;鎽勫奖鍐插嵃","璐墿鏈嶅姟;瀹剁數鐢靛瓙鍗栧満;鏁扮爜鐢靛瓙|閲戣瀺淇濋櫓鏈嶅姟","璐墿鏈嶅姟;鐗硅壊鍟嗕笟琛�;鐗硅壊鍟嗕笟琛梶鍏徃浼佷笟","璐墿鏈嶅姟;缁煎悎甯傚満;姘翠骇娴烽矞甯傚満|鍏徃浼佷笟;鍏徃;鍏徃","璐墿鏈嶅姟;瓒呯骇甯傚満;瓒呭競|鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","閲戣瀺淇濋櫓鏈嶅姟;鑷姩鎻愭鏈�;鑷姩鎻愭鏈簗鐢熸椿鏈嶅姟","閲戣瀺淇濋櫓鏈嶅姟;閲戣瀺淇濋櫓鏈嶅姟鏈烘瀯;閲戣瀺淇濋櫓鏈烘瀯|鍟嗗姟浣忓畢","閲戣瀺淇濋櫓鏈嶅姟;閾惰;涓浗姘戠敓閾惰|閲戣瀺淇濋櫓鏈嶅姟","椁愰ギ鏈嶅姟;涓鍘�;鍥涘窛鑿�(宸濊彍)|浣撹偛浼戦棽鏈嶅姟","椁愰ギ鏈嶅姟;涓鍘�;姹熻嫃鑿渱浣忓鏈嶅姟","椁愰ギ鏈嶅姟;鍐烽ギ搴�;鍐烽ギ搴梶椁愰ギ鏈嶅姟;鐢滃搧搴�;鐢滃搧搴�","椁愰ギ鏈嶅姟;鍜栧暋鍘�;鍜栧暋鍘厊鍏徃浼佷笟","椁愰ギ鏈嶅姟;蹇鍘�;蹇鍘厊浣忓鏈嶅姟","椁愰ギ鏈嶅姟;鐢滃搧搴�;鐢滃搧搴梶椁愰ギ鏈嶅姟;绯曢ゼ搴�;绯曢ゼ搴�","浜ら�氳鏂芥湇鍔�;鏈哄満鐩稿叧;鏈哄満璐ц繍澶�","浣忓鏈嶅姟;浣忓鏈嶅姟鐩稿叧;浣忓鏈嶅姟鐩稿叧|椋庢櫙鍚嶈儨","浣忓鏈嶅姟;瀹鹃閰掑簵;涓夋槦绾у棣唡浣撹偛浼戦棽鏈嶅姟","鍏徃浼佷笟;鍏徃;鍖昏嵂鍏徃|绉戞暀鏂囧寲鏈嶅姟","鍟嗗姟浣忓畢;鍟嗗姟浣忓畢鐩稿叧;鍟嗗姟浣忓畢鐩稿叧|绉戞暀鏂囧寲鏈嶅姟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;浜ら�氳溅杈嗙鐞�;杞﹁締閫氳璇佸姙鐞嗗","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鍏娉曟満鏋�;娉曢櫌|鐢熸椿鏈嶅姟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;宸ュ晢绋庡姟鏈烘瀯;鍥界◣鏈哄叧|鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;宸ュ晢绋庡姟鏈烘瀯;鍦扮◣鏈哄叧|鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","姹借溅閿�鍞�;涓滈鐗圭害閿�鍞�;涓滈閿�鍞畖姹借溅閿�鍞�","姹借溅閿�鍞�;涓浗閲嶆苯閿�鍞�;涓浗閲嶆苯閿�鍞畖姹借溅缁翠慨","姹借溅閿�鍞�;澶т紬鐗圭害閿�鍞�;涓�姹�-澶т紬閿�鍞畖姹借溅閿�鍞�","姹借溅閿�鍞�;璧蜂簹鐗圭害閿�鍞�;璧蜂簹閿�鍞畖姹借溅缁翠慨","鐢熸椿鏈嶅姟;鎽勫奖鍐插嵃搴�;鎽勫奖鍐插嵃|鍟嗗姟浣忓畢","鐢熸椿鏈嶅姟;缇庡缇庡彂搴�;缇庡缇庡彂搴梶姹借溅缁翠慨","绉戞暀鏂囧寲鏈嶅姟;瀛︽牎;瀛︽牎|鍟嗗姟浣忓畢","绉戞暀鏂囧寲鏈嶅姟;瀛︽牎;鎴愪汉鏁欒偛|鐢熸椿鏈嶅姟","璐墿鏈嶅姟;涓撳崠搴�;鍎跨鐢ㄥ搧搴梶绉戞暀鏂囧寲鏈嶅姟;鍩硅鏈烘瀯;鍩硅鏈烘瀯","璐墿鏈嶅姟;涓撳崠搴�;鍎跨鐢ㄥ搧搴梶璐墿鏈嶅姟;浣撹偛鐢ㄥ搧搴�;浣撹偛鐢ㄥ搧搴�","璐墿鏈嶅姟;涓撳崠搴�;閽熻〃搴梶鍏徃浼佷笟","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;寤烘潗浜旈噾甯傚満|璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;鍘ㄥ崼甯傚満","璐墿鏈嶅姟;瀹剁數鐢靛瓙鍗栧満;鎵嬫満閿�鍞畖姹借溅鏈嶅姟","璐墿鏈嶅姟;鏈嶈闉嬪附鐨叿搴�;鍝佺墝闉嬪簵|椁愰ギ鏈嶅姟","璐墿鏈嶅姟;鏈嶈闉嬪附鐨叿搴�;鏈嶈闉嬪附鐨叿搴梶椁愰ギ鏈嶅姟;绯曢ゼ搴�;绯曢ゼ搴�","璐墿鏈嶅姟;鑺遍笩楸艰櫕甯傚満;鑺卞崏甯傚満|鍏徃浼佷笟;鍏徃;鍏徃","閲戣瀺淇濋櫓鏈嶅姟;鑷姩鎻愭鏈�;鍗楁磱鍟嗕笟閾惰ATM","閲戣瀺淇濋櫓鏈嶅姟;閾惰鐩稿叧;閾惰鐩稿叧|鐢熸椿鏈嶅姟","椁愰ギ鏈嶅姟;涓鍘�;涓鍘厊浣忓鏈嶅姟;鏃呴鎷涘緟鎵�;鏃呴鎷涘緟鎵�","椁愰ギ鏈嶅姟;涓鍘�;涓鍘厊閲戣瀺淇濋櫓鏈嶅姟","椁愰ギ鏈嶅姟;澶栧浗椁愬巺;鏃ユ湰鏂欑悊|鐢熸椿鏈嶅姟","椁愰ギ鏈嶅姟;椁愰ギ鐩稿叧鍦烘墍;椁愰ギ鐩稿叧|鐢熸椿鏈嶅姟;鐢熸椿鏈嶅姟鍦烘墍;鐢熸椿鏈嶅姟鍦烘墍","浜ら�氳鏂芥湇鍔�;鍋滆溅鍦�;璺竟鍋滆溅鍦簗浜ら�氳鏂芥湇鍔�;鍋滆溅鍦�;鍏叡鍋滆溅鍦�","浜ら�氳鏂芥湇鍔�;鐏溅绔�;鍞エ|鐢熸椿鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;濞变箰鍦烘墍;閰掑惂|鍏徃浼佷笟","浣撹偛浼戦棽鏈嶅姟;褰卞墽闄�;鍓у満|鍏徃浼佷笟","浣撹偛浼戦棽鏈嶅姟;杩愬姩鍦洪;璺嗘嫵閬撳満棣唡绉戞暀鏂囧寲鏈嶅姟;鍩硅鏈烘瀯;鍩硅鏈烘瀯","浣撹偛浼戦棽鏈嶅姟;杩愬姩鍦洪;杩愬姩鍦烘墍|鍦板悕鍦板潃淇℃伅","鍏徃浼佷笟;鍏徃;寤虹瓚鍏徃|椁愰ギ鏈嶅姟","鍖荤枟淇濆仴鏈嶅姟;涓撶鍖婚櫌;鑳哥鍖婚櫌|鍖荤枟淇濆仴鏈嶅姟","鍟嗗姟浣忓畢;浣忓畢鍖�;浣忓畢鍖簗鍟嗗姟浣忓畢","鍟嗗姟浣忓畢;浣忓畢鍖�;浣忓畢灏忓尯|鍏徃浼佷笟;鍏徃;鍏徃","鎽╂墭杞︽湇鍔�;鎽╂墭杞︾淮淇�;鎽╂墭杞︾淮淇畖鐢熸椿鏈嶅姟;鐢熸椿鏈嶅姟鍦烘墍;鐢熸椿鏈嶅姟鍦烘墍","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鏀垮簻鏈哄叧;鍥藉绾ф満鍏冲強浜嬩笟鍗曚綅|鍏徃浼佷笟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鏀垮簻鏈哄叧;鏀垮簻鏈哄叧鐩稿叧|浣撹偛浼戦棽鏈嶅姟","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;绀句細鍥綋;鍏遍潚鍥鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","姹借溅鏈嶅姟;浜屾墜杞︿氦鏄�;浜屾墜杞︿氦鏄搢鎽╂墭杞︽湇鍔�","姹借溅鏈嶅姟;姹借溅淇变箰閮�;姹借溅淇变箰閮▅姹借溅閿�鍞�","姹借溅鏈嶅姟;姹借溅绉熻祦;姹借溅绉熻祦|姹借溅缁翠慨","姹借溅鏈嶅姟;姹借溅閰嶄欢閿�鍞�;姹借溅閰嶄欢閿�鍞畖椁愰ギ鏈嶅姟","姹借溅缁翠慨;涓�姹借В鏀剧淮淇�;涓�姹借В鏀剧淮淇畖姹借溅鏈嶅姟","姹借溅缁翠慨;涓滈鐗圭害缁翠慨;涓滈缁翠慨|姹借溅缁翠慨","姹借溅閿�鍞�;涓�姹借В鏀鹃攢鍞�;涓�姹借В鏀鹃攢鍞畖姹借溅鏈嶅姟","姹借溅閿�鍞�;涓滈鐗圭害閿�鍞�;涓滈閿�鍞畖姹借溅鏈嶅姟","姹借溅閿�鍞�;姹熸樊閿�鍞�;姹熸樊閿�鍞畖姹借溅閿�鍞�","姹借溅閿�鍞�;鑽e▉閿�鍞�;鑽e▉閿�鍞畖姹借溅缁翠慨;鑽e▉缁翠慨;鑽e▉缁翠慨","鐢熸椿鏈嶅姟;涓ц懍璁炬柦;涓ц懍璁炬柦|椁愰ギ鏈嶅姟","鐢熸椿鏈嶅姟;浜嬪姟鎵�;浼氳甯堜簨鍔℃墍|鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","鐢熸椿鏈嶅姟;浜烘墠甯傚満;浜烘墠甯傚満|鍏徃浼佷笟;鍏徃;鍏徃","绉戞暀鏂囧寲鏈嶅姟;鍩硅鏈烘瀯;鍩硅鏈烘瀯|浣忓鏈嶅姟","绉戞暀鏂囧寲鏈嶅姟;绉戠爺鏈烘瀯;绉戠爺鏈烘瀯|鍟嗗姟浣忓畢","璐墿鏈嶅姟;涓撳崠搴�;鐝犲疂棣栭グ宸ヨ壓鍝亅閲戣瀺淇濋櫓鏈嶅姟","璐墿鏈嶅姟;渚挎皯鍟嗗簵/渚垮埄搴�;渚挎皯鍟嗗簵/渚垮埄搴梶姹借溅閿�鍞�","璐墿鏈嶅姟;瀹剁數鐢靛瓙鍗栧満;瀹剁數鐢靛瓙鍗栧満|鎽╂墭杞︽湇鍔�","璐墿鏈嶅姟;鏈嶈闉嬪附鐨叿搴�;鍝佺墝绠卞寘搴梶璐墿鏈嶅姟","璐墿鏈嶅姟;缁煎悎甯傚満;鏃ц揣甯傚満|鍏徃浼佷笟","椁愰ギ鏈嶅姟;涓鍘�;婀栧崡鑿�(婀樿彍)|鐢熸椿鏈嶅姟","椁愰ギ鏈嶅姟;涓鍘�;鑰佸瓧鍙穦椁愰ギ鏈嶅姟","椁愰ギ鏈嶅姟;鍐烽ギ搴�;鍐烽ギ搴梶浣撹偛浼戦棽鏈嶅姟","椁愰ギ鏈嶅姟;鍐烽ギ搴�;鍐烽ギ搴梶椁愰ギ鏈嶅姟;浼戦棽椁愰ギ鍦烘墍;浼戦棽椁愰ギ鍦烘墍","椁愰ギ鏈嶅姟;蹇鍘�;鑼堕鍘厊浣撹偛浼戦棽鏈嶅姟","浣忓鏈嶅姟;鏃呴鎷涘緟鎵�;鏃呴鎷涘緟鎵�|椋庢櫙鍚嶈儨","浣撹偛浼戦棽鏈嶅姟;浼戦棽鍦烘墍;鍨傞挀鍥瓅椁愰ギ鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;搴﹀亣鐤楀吇鍦烘墍;搴﹀亣鏉憒浣撹偛浼戦棽鏈嶅姟;浼戦棽鍦烘墍;浼戦棽鍦烘墍","浣撹偛浼戦棽鏈嶅姟;杩愬姩鍦洪;鍋ヨ韩涓績|绉戞暀鏂囧寲鏈嶅姟;鍩硅鏈烘瀯;鍩硅鏈烘瀯","浣撹偛浼戦棽鏈嶅姟;杩愬姩鍦洪;绡悆鍦洪|浣撹偛浼戦棽鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;楂樺皵澶浉鍏�;楂樺皵澶粌涔犲満|浣撹偛浼戦棽鏈嶅姟","鍏徃浼佷笟;鍏徃;鍏徃|鍟嗗姟浣忓畢;鍟嗗姟浣忓畢鐩稿叧;鍟嗗姟浣忓畢鐩稿叧","鍏徃浼佷笟;鍏徃;鏈烘鐢靛瓙|椁愰ギ鏈嶅姟","鍖荤枟淇濆仴鏈嶅姟;鍔ㄧ墿鍖荤枟鍦烘墍;鍔ㄧ墿鍖荤枟鍦烘墍|鍖荤枟淇濆仴鏈嶅姟","鍟嗗姟浣忓畢;浜т笟鍥尯;浜т笟鍥尯|浣撹偛浼戦棽鏈嶅姟","鍟嗗姟浣忓畢;浜т笟鍥尯;浜т笟鍥尯|姹借溅閿�鍞�","鍟嗗姟浣忓畢;妤煎畤;鍟嗗姟鍐欏瓧妤紎鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鏀垮簻鏈哄叧;鏀垮簻鏈哄叧鐩稿叧","鍦板悕鍦板潃淇℃伅;浜ら�氬湴鍚�;閬撹矾鍚峾璐墿鏈嶅姟;鐗硅壊鍟嗕笟琛�;鐗硅壊鍟嗕笟琛�","鍦板悕鍦板潃淇℃伅;鑷劧鍦板悕;婀栨硦|椋庢櫙鍚嶈儨","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;浜ら�氳溅杈嗙鐞�;浜ら�氱鐞嗘満鏋剕浜ら�氳鏂芥湇鍔�","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;鍏娉曟満鏋�;鍏瘉閴村畾鏈烘瀯|鍏徃浼佷笟;鍏徃;鍏徃","姹借溅鏈嶅姟;姹借溅淇变箰閮�;姹借溅淇变箰閮▅浣撹偛浼戦棽鏈嶅姟","姹借溅缁翠慨;澶т紬鐗圭害缁翠慨;杩涘彛澶т紬缁翠慨|姹借溅閿�鍞�","姹借溅閿�鍞�;璐ц溅閿�鍞�;璐ц溅閿�鍞畖鐢熸椿鏈嶅姟","鐢熸椿鏈嶅姟;涓ц懍璁炬柦;涓ц懍璁炬柦|璐墿鏈嶅姟;涓撳崠搴�;涓撹惀搴�","鐢熸椿鏈嶅姟;淇℃伅鍜ㄨ涓績;淇℃伅鍜ㄨ涓績|閲戣瀺淇濋櫓鏈嶅姟","鐢熸椿鏈嶅姟;娲楄。搴�;娲楄。搴梶姹借溅鏈嶅姟","鐢熸椿鏈嶅姟;鐗╂祦閫熼��;鐗╂祦閫熼�抾閲戣瀺淇濋櫓鏈嶅姟","鐢熸椿鏈嶅姟;鐢佃钀ヤ笟鍘�;涓浗鑱旈�氳惀涓氬巺|鍏徃浼佷笟;鍏徃;鐢典俊鍏徃","绉戞暀鏂囧寲鏈嶅姟;鍩硅鏈烘瀯;鍩硅鏈烘瀯|鍏徃浼佷笟;鍏徃;鍏徃","绉戞暀鏂囧寲鏈嶅姟;缇庢湳棣�;缇庢湳棣唡璐墿鏈嶅姟","璐墿鏈嶅姟;涓撳崠搴�;鑷杞︿笓鍗栧簵|姹借溅鏈嶅姟;浜屾墜杞︿氦鏄�;浜屾墜杞︿氦鏄�","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;鐏叿鐡峰櫒甯傚満|姹借溅鏈嶅姟","璐墿鏈嶅姟;鐗规畩涔板崠鍦烘墍;鍏稿綋琛寍閲戣瀺淇濋櫓鏈嶅姟","璐墿鏈嶅姟;鐗规畩涔板崠鍦烘墍;鐗规畩涔板崠鍦烘墍|鍏徃浼佷笟","璐墿鏈嶅姟;鐗硅壊鍟嗕笟琛�;姝ヨ琛梶鍦板悕鍦板潃淇℃伅;浜ら�氬湴鍚�;閬撹矾鍚�","閲戣瀺淇濋櫓鏈嶅姟;鑷姩鎻愭鏈�;鎷涘晢閾惰ATM|閲戣瀺淇濋櫓鏈嶅姟","閲戣瀺淇濋櫓鏈嶅姟;閾惰;涓浗鍏夊ぇ閾惰|閲戣瀺淇濋櫓鏈嶅姟","閲戣瀺淇濋櫓鏈嶅姟;閾惰;浜ら�氶摱琛寍閲戣瀺淇濋櫓鏈嶅姟","椋庢櫙鍚嶈儨;鍏洯骞垮満;鍏洯|绉戞暀鏂囧寲鏈嶅姟","椋庢櫙鍚嶈儨;鍏洯骞垮満;鍏洯|椋庢櫙鍚嶈儨;椋庢櫙鍚嶈儨;椋庢櫙鍚嶈儨","椁愰ギ鏈嶅姟;涓鍘�;鍥涘窛鑿�(宸濊彍)|椁愰ギ鏈嶅姟;涓鍘�;鐗硅壊/鍦版柟椋庡懗椁愬巺","椁愰ギ鏈嶅姟;涓鍘�;灞变笢鑿�(椴佽彍)|浣忓鏈嶅姟","椁愰ギ鏈嶅姟;涓鍘�;娴烽矞閰掓ゼ|鍟嗗姟浣忓畢","椁愰ギ鏈嶅姟;涓鍘�;娴烽矞閰掓ゼ|椁愰ギ鏈嶅姟;涓鍘�;缁煎悎閰掓ゼ","椁愰ギ鏈嶅姟;浼戦棽椁愰ギ鍦烘墍;浼戦棽椁愰ギ鍦烘墍|鐢熸椿鏈嶅姟","椁愰ギ鏈嶅姟;蹇鍘�;蹇鍘厊浣撹偛浼戦棽鏈嶅姟","椁愰ギ鏈嶅姟;鐢滃搧搴�;鐢滃搧搴梶椁愰ギ鏈嶅姟;鍐烽ギ搴�;鍐烽ギ搴�","椁愰ギ鏈嶅姟;绯曢ゼ搴�;绯曢ゼ搴梶璐墿鏈嶅姟;涓撳崠搴�;涓撹惀搴�","浜ら�氳鏂芥湇鍔�;杩囧鍙e哺;鏃呮妤�","浣忓鏈嶅姟;瀹鹃閰掑簵;瀹鹃閰掑簵|鍟嗗姟浣忓畢;鍟嗗姟浣忓畢鐩稿叧;鍟嗗姟浣忓畢鐩稿叧","浣忓鏈嶅姟;瀹鹃閰掑簵;缁忔祹鍨嬭繛閿侀厭搴梶鐢熸椿鏈嶅姟","浣撹偛浼戦棽鏈嶅姟;浼戦棽鍦烘墍;浼戦棽鍦烘墍|浣撹偛浼戦棽鏈嶅姟;濞变箰鍦烘墍;濞变箰鍦烘墍","浣撹偛浼戦棽鏈嶅姟;濞变箰鍦烘墍;KTV|鐢熸椿鏈嶅姟;娲楁荡鎺ㄦ嬁鍦烘墍;娲楁荡鎺ㄦ嬁鍦烘墍","浣撹偛浼戦棽鏈嶅姟;搴﹀亣鐤楀吇鍦烘墍;鐤楀吇闄璐墿鏈嶅姟","鍏徃浼佷笟;鍐滄灄鐗ф笖鍩哄湴;鍐滃満|浣撹偛浼戦棽鏈嶅姟","鍟嗗姟浣忓畢;浣忓畢鍖�;鍒|浣撹偛浼戦棽鏈嶅姟","鍟嗗姟浣忓畢;浣忓畢鍖�;绀惧尯涓績|鐢熸椿鏈嶅姟;鐢熸椿鏈嶅姟鍦烘墍;鐢熸椿鏈嶅姟鍦烘墍","鍟嗗姟浣忓畢;妤煎畤;鍟嗕綇涓ょ敤妤煎畤|椁愰ギ鏈嶅姟","鍦板悕鍦板潃淇℃伅;鑷劧鍦板悕;婀栨硦|鍦板悕鍦板潃淇℃伅;鑷劧鍦板悕;娌虫祦","鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�;浜ら�氳溅杈嗙鐞�;浜ら�氱鐞嗘満鏋剕绉戞暀鏂囧寲鏈嶅姟","姹借溅鏈嶅姟;姹借溅绉熻祦;姹借溅绉熻祦杩樿溅|鐢熸椿鏈嶅姟","姹借溅缁翠慨;姹借溅缁煎悎缁翠慨;姹借溅缁煎悎缁翠慨|姹借溅閿�鍞�;姹借溅閿�鍞�;姹借溅閿�鍞�","姹借溅閿�鍞�;涓浗閲嶆苯閿�鍞�;涓浗閲嶆苯閿�鍞畖姹借溅閿�鍞�","鐢熸椿鏈嶅姟;褰╃エ褰╁埜閿�鍞偣;褰╃エ褰╁埜閿�鍞偣|鐢熸椿鏈嶅姟","鐢熸椿鏈嶅姟;鎽勫奖鍐插嵃搴�;鎽勫奖鍐插嵃|浣忓鏈嶅姟","鐢熸椿鏈嶅姟;鎽勫奖鍐插嵃搴�;鎽勫奖鍐插嵃|璐墿鏈嶅姟;璐墿鐩稿叧鍦烘墍;璐墿鐩稿叧鍦烘墍","鐢熸椿鏈嶅姟;鐢熸椿鏈嶅姟鍦烘墍;鐢熸椿鏈嶅姟鍦烘墍|鍏叡璁炬柦","绉戞暀鏂囧寲鏈嶅姟;浼犲獟鏈烘瀯;鎶ョぞ|绉戞暀鏂囧寲鏈嶅姟","绉戞暀鏂囧寲鏈嶅姟;瀛︽牎;瀛︽牎|鏀垮簻鏈烘瀯鍙婄ぞ浼氬洟浣�","璐墿鏈嶅姟;涓撳崠搴�;涓撹惀搴梶姹借溅缁翠慨;姹借溅缁翠慨;姹借溅缁翠慨","璐墿鏈嶅姟;涓撳崠搴�;涓撹惀搴梶璐墿鏈嶅姟;鏈嶈闉嬪附鐨叿搴�;鏈嶈闉嬪附鐨叿搴�","璐墿鏈嶅姟;涓撳崠搴�;涓撹惀搴梶閲戣瀺淇濋櫓鏈嶅姟","璐墿鏈嶅姟;涓撳崠搴�;瀹犵墿鐢ㄥ搧搴梶绉戞暀鏂囧寲鏈嶅姟","璐墿鏈嶅姟;浣撹偛鐢ㄥ搧搴�;鎴峰鐢ㄥ搧|鎽╂墭杞︽湇鍔�","璐墿鏈嶅姟;鍟嗗満;鍟嗗満|鍏徃浼佷笟","璐墿鏈嶅姟;鍟嗗満;鏅�氬晢鍦簗绉戞暀鏂囧寲鏈嶅姟","璐墿鏈嶅姟;鍟嗗満;鏅�氬晢鍦簗璐墿鏈嶅姟;鏈嶈闉嬪附鐨叿搴�;鏈嶈闉嬪附鐨叿搴�","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;鍘ㄥ崼甯傚満|璐墿鏈嶅姟;瀹剁數鐢靛瓙鍗栧満;瀹剁數鐢靛瓙鍗栧満","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;瀹跺眳寤烘潗甯傚満|姹借溅缁翠慨","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;瀹跺眳寤烘潗甯傚満|璐墿鏈嶅姟;涓撳崠搴�;涓撹惀搴�","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;寤烘潗浜旈噾甯傚満|浣忓鏈嶅姟","璐墿鏈嶅姟;瀹跺眳寤烘潗甯傚満;寤烘潗浜旈噾甯傚満|姹借溅閿�鍞�","璐墿鏈嶅姟;鐗规畩涔板崠鍦烘墍;鐗规畩涔板崠鍦烘墍|姹借溅鏈嶅姟","璐墿鏈嶅姟;鐗硅壊鍟嗕笟琛�;姝ヨ琛梶鐢熸椿鏈嶅姟","閲戣瀺淇濋櫓鏈嶅姟;閾惰;涓浗鍐滀笟閾惰|鐢熸椿鏈嶅姟","椋庢櫙鍚嶈儨;鍏洯骞垮満;姘存棌棣唡椋庢櫙鍚嶈儨","椋庢櫙鍚嶈儨;椋庢櫙鍚嶈儨;鍥藉绾ф櫙鐐箌浣撹偛浼戦棽鏈嶅姟","椋庢櫙鍚嶈儨;椋庢櫙鍚嶈儨;绾康棣唡鐢熸椿鏈嶅姟","椋庢櫙鍚嶈儨;椋庢櫙鍚嶈儨;椋庢櫙鍚嶈儨|椋庢櫙鍚嶈儨","椁愰ギ鏈嶅姟;涓鍘�;涓鍘厊浜ら�氳鏂芥湇鍔�","椁愰ギ鏈嶅姟;涓鍘�;涓鍘厊姹借溅缁翠慨","椁愰ギ鏈嶅姟;涓鍘�;瀹夊窘鑿�(寰借彍)|浣忓鏈嶅姟","椁愰ギ鏈嶅姟;涓鍘�;鐏攨搴梶椁愰ギ鏈嶅姟;涓鍘�;娴烽矞閰掓ゼ","椁愰ギ鏈嶅姟;涓鍘�;鐗硅壊/鍦版柟椋庡懗椁愬巺|鍟嗗姟浣忓畢","椁愰ギ鏈嶅姟;涓鍘�;鐗硅壊/鍦版柟椋庡懗椁愬巺|椁愰ギ鏈嶅姟;涓鍘�;鍥涘窛鑿�(宸濊彍)","椁愰ギ鏈嶅姟;澶栧浗椁愬巺;鐗涙墥搴�(鎵掓埧)|椁愰ギ鏈嶅姟;澶栧浗椁愬巺;瑗块鍘�(缁煎悎椋庡懗)"] public final static DBCollection COMPANY_206_COLL = MongoUtils.getCollectionByName("business", "company_huzhou", "192.168.0.206",27020) @@ -79,7 +79,7 @@ class GaoDePoiDataProcess extends BaseBatch{ @Override void process(Object args) { -// println ProvinceData.getProvince("成都") +// println ProvinceData.getProvince("鎴愰兘") // synchMapPoi(); @@ -95,7 +95,7 @@ class GaoDePoiDataProcess extends BaseBatch{ } def addTownship(){ - ExcelUtils.multiThreadingModify("D:\\数据\\数据建设\\小区\\河北省小区.xlsx",{d-> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\鏁版嵁寤鸿\\灏忓尯\\娌冲寳鐪佸皬鍖�.xlsx",{d-> if(d['E']){ // def gaodeMap = getTownshipInfo(d['F']+","+d['E']) // if(gaodeMap && gaodeMap.township){ @@ -120,7 +120,7 @@ class GaoDePoiDataProcess extends BaseBatch{ q.put("street",d['J']) def obj = ADMINISTRATIVE_MAPPING_COLL_100.findOne(q) if(obj){ - d['L'] = "是" + d['L'] = "鏄�" } } },0) @@ -128,53 +128,53 @@ class GaoDePoiDataProcess extends BaseBatch{ } def sysnchVillage(){ - def buducitys = [ "宁波市","丽水市","杭州市","温州市","嘉兴市","台州市","绍兴市","金华市","衢州市",'茂名市', - '荆州市', '荆门市', '莆田市','苏州市','菏泽市', '萍乡市', '营口市', '葫芦岛市', '蚌埠市', '衡水市', '衡阳市', - '衢州市', '襄阳市', '西宁市', '西安市', '许昌市', '贵港市', '贵阳市', '贺州市', '资阳市', '赣州市', '赤峰市', - '辽源市', '辽阳市', '达州市', '运城市', '连云港市', '通化市', '通辽市', '遂宁市', '遵义市', '中山市', '临夏回族自治州', - '临汾市', '临沂市', '临沧市', '临高县', '丹东市','邵阳市', '郑州市', '郴州市', '鄂尔多斯市', '鄂州市', '酒泉市', - '丽水市', '丽江市', '乌兰察布市', '乌海市', '乌鲁木齐市', '乐东黎族自治县', '乐山市', '九江市', - '云浮市', '五家渠市', '五指山市', '亳州市', '仙桃市', '伊春市', '伊犁哈萨克自治州', '佛山市', - '佳木斯市', '保亭黎族苗族自治县', '保定市', '保山市', '信阳市', '儋州市', '克孜勒苏柯尔克孜自治州', - '克拉玛依市', '六安市', '六盘水市', '兰州市', '兴安盟', '内江市', '包头市', '北京市', '北海市', - '十堰市', '南京市', '南充市', '南宁市', '南平市', '南昌市', '南通市', '南阳市', - '博尔塔拉蒙古自治州', '厦门市', '双鸭山市', '台州市', '合肥市', '吉安市', '吉林市', '吐鲁番地区', - '吕梁市', '吴忠市', '周口市', '呼伦贝尔市', '呼和浩特市', '和田地区', '咸宁市', '咸阳市', - '哈密地区', '哈尔滨市', '唐山市', '商丘市', '商洛市', '喀什地区', '嘉兴市', '嘉峪关市', '四平市', - '固原市', '图木舒克市', '塔城地区', '大兴安岭地区', '大同市', '大庆市', '大理白族自治州', '大连市', - '天水市', '天津市', '天门市', '太原市', '威海市', '娄底市', '孝感市', '宁德市', - '安庆市', '安康市', '安阳市', '安顺市', '定安县', '定西市', '宜宾市', '宜昌市', '宜春市', - '宝鸡市', '宣城市', '宿州市', '宿迁市', '屯昌县', '山南地区', '岳阳市', '崇左市', '巴中市', - '巴彦淖尔市', '巴音郭楞蒙古自治州', '常州市', '常德市', '平凉市', '平顶山市', '广元市', '广安市', - '广州市', '庆阳市', '廊坊市', '延安市', '延边朝鲜族自治州', '开封市', '张家口市', '张家界市', - '张掖市', '徐州市', '德州市', '德阳市', '忻州市', '怀化市', '恩施土家族苗族自治州', '惠州市', - '成都市', '扬州市', '承德市', '抚州市', '抚顺市', '拉萨市', '揭阳市', '攀枝花市', '文昌市', - '新乡市', '新余市', '无锡市', '日喀则地区', '日照市', '昆明市', '昌吉回族自治州', '昌江黎族自治县', - '昌都地区', '昭通市', '晋中市', '晋城市', '普洱市', '景德镇市', '曲靖市', '朔州市', '朝阳市', - '本溪市', '来宾市', '杭州市', '松原市', '林芝地区', '枣庄市', '柳州市', '株洲市', '桂林市', - '梅州市', '梧州市', '楚雄彝族自治州', '榆林市', '武威市', '武汉市', '毕节地区', '永州市', '汉中市', - '汕头市', '汕尾市', '江门市', '池州市', '沈阳市', '沧州市', '河池市', '河源市', '泉州市', - '泰安市', '泰州市', '泸州市', '洛阳市', '济南市', '济宁市', '济源市', '海东地区', '海口市', - '淄博市', '淮北市', '淮南市', '淮安市', '深圳市', '清远市', '温州市', '渭南市', - '湘潭市', '湘西土家族苗族自治州', '湛江市', '滁州市', '滨州市', '漯河市', '漳州市', '潍坊市', - '潜江市', '潮州市', '澄迈县', '濮阳市', '烟台市', '焦作市', '牡丹江市', '玉林市', '玉溪市', - '珠海市', '琼中黎族苗族自治县', '琼海市', '甘南藏族自治州', '白城市', '白山市', '白沙黎族自治县', - '白银市', '百色市', '益阳市', '盐城市', '盘锦市', '眉山市', '石嘴山市', '石家庄市', '石河子市', - '神农架林区', '福州市', '秦皇岛市', '红河哈尼族彝族自治州', '绥化市', '邢台市', '那曲地区', '邯郸市', - '重庆市', '金华市', '金昌市', '钦州市', '铁岭市', '铜仁地区', '铜川市', '铜陵市', '银川市', - '锡林郭勒盟', '锦州市', '镇江市', '长春市', '长沙市', '长治市', '阜新市', '阜阳市', '防城港市', - '阳江市', '阳泉市', '阿克苏地区', '阿勒泰地区', '阿拉善盟', '阿拉尔市', '阿里地区', '陇南市', - '陵水黎族自治县', '随州市', '雅安市', '青岛市', '鞍山市', '韶关市', '马鞍山市', '驻马店市', - '鸡西市', '鹤壁市', '鹤岗市', '鹰潭市', '黄冈市', '黄山市', '黄石市', '黑河市', - '黔东南苗族侗族自治州', '黔南布依族苗族自治州', '黔西南布依族苗族自治州', '齐齐哈尔市', '龙岩市'] + def buducitys = [ "瀹佹尝甯�","涓芥按甯�","鏉窞甯�","娓╁窞甯�","鍢夊叴甯�","鍙板窞甯�","缁嶅叴甯�","閲戝崕甯�","琛㈠窞甯�",'鑼傚悕甯�', + '鑽嗗窞甯�', '鑽嗛棬甯�', '鑾嗙敯甯�','鑻忓窞甯�','鑿忔辰甯�', '钀嶄埂甯�', '钀ュ彛甯�', '钁姦宀涘競', '铓屽煚甯�', '琛℃按甯�', '琛¢槼甯�', + '琛㈠窞甯�', '瑗勯槼甯�', '瑗垮畞甯�', '瑗垮畨甯�', '璁告槍甯�', '璐垫腐甯�', '璐甸槼甯�', '璐哄窞甯�', '璧勯槼甯�', '璧e窞甯�', '璧ゅ嘲甯�', + '杈芥簮甯�', '杈介槼甯�', '杈惧窞甯�', '杩愬煄甯�', '杩炰簯娓競', '閫氬寲甯�', '閫氳窘甯�', '閬傚畞甯�', '閬典箟甯�', '涓北甯�', '涓村鍥炴棌鑷不宸�', + '涓存本甯�', '涓存矀甯�', '涓存钵甯�', '涓撮珮鍘�', '涓逛笢甯�','閭甸槼甯�', '閮戝窞甯�', '閮村窞甯�', '閯傚皵澶氭柉甯�', '閯傚窞甯�', '閰掓硥甯�', + '涓芥按甯�', '涓芥睙甯�', '涔屽叞瀵熷竷甯�', '涔屾捣甯�', '涔岄瞾鏈ㄩ綈甯�', '涔愪笢榛庢棌鑷不鍘�', '涔愬北甯�', '涔濇睙甯�', + '浜戞诞甯�', '浜斿娓犲競', '浜旀寚灞卞競', '浜冲窞甯�', '浠欐甯�', '浼婃槬甯�', '浼婄妬鍝堣惃鍏嬭嚜娌诲窞', '浣涘北甯�', + '浣虫湪鏂競', '淇濅涵榛庢棌鑻楁棌鑷不鍘�', '淇濆畾甯�', '淇濆北甯�', '淇¢槼甯�', '鍎嬪窞甯�', '鍏嬪瓬鍕掕嫃鏌皵鍏嬪瓬鑷不宸�', + '鍏嬫媺鐜涗緷甯�', '鍏畨甯�', '鍏洏姘村競', '鍏板窞甯�', '鍏村畨鐩�', '鍐呮睙甯�', '鍖呭ご甯�', '鍖椾含甯�', '鍖楁捣甯�', + '鍗佸牥甯�', '鍗椾含甯�', '鍗楀厖甯�', '鍗楀畞甯�', '鍗楀钩甯�', '鍗楁槍甯�', '鍗楅�氬競', '鍗楅槼甯�', + '鍗氬皵濉旀媺钂欏彜鑷不宸�', '鍘﹂棬甯�', '鍙岄腑灞卞競', '鍙板窞甯�', '鍚堣偉甯�', '鍚夊畨甯�', '鍚夋灄甯�', '鍚愰瞾鐣湴鍖�', + '鍚曟甯�', '鍚村繝甯�', '鍛ㄥ彛甯�', '鍛间鸡璐濆皵甯�', '鍛煎拰娴╃壒甯�', '鍜岀敯鍦板尯', '鍜稿畞甯�', '鍜搁槼甯�', + '鍝堝瘑鍦板尯', '鍝堝皵婊ㄥ競', '鍞愬北甯�', '鍟嗕笜甯�', '鍟嗘礇甯�', '鍠�浠�鍦板尯', '鍢夊叴甯�', '鍢夊唱鍏冲競', '鍥涘钩甯�', + '鍥哄師甯�', '鍥炬湪鑸掑厠甯�', '濉斿煄鍦板尯', '澶у叴瀹夊箔鍦板尯', '澶у悓甯�', '澶у簡甯�', '澶х悊鐧芥棌鑷不宸�', '澶ц繛甯�', + '澶╂按甯�', '澶╂触甯�', '澶╅棬甯�', '澶師甯�', '濞佹捣甯�', '濞勫簳甯�', '瀛濇劅甯�', '瀹佸痉甯�', + '瀹夊簡甯�', '瀹夊悍甯�', '瀹夐槼甯�', '瀹夐『甯�', '瀹氬畨鍘�', '瀹氳タ甯�', '瀹滃甯�', '瀹滄槍甯�', '瀹滄槬甯�', + '瀹濋浮甯�', '瀹e煄甯�', '瀹垮窞甯�', '瀹胯縼甯�', '灞槍鍘�', '灞卞崡鍦板尯', '宀抽槼甯�', '宕囧乏甯�', '宸翠腑甯�', + '宸村溅娣栧皵甯�', '宸撮煶閮钂欏彜鑷不宸�', '甯稿窞甯�', '甯稿痉甯�', '骞冲噳甯�', '骞抽《灞卞競', '骞垮厓甯�', '骞垮畨甯�', + '骞垮窞甯�', '搴嗛槼甯�', '寤婂潑甯�', '寤跺畨甯�', '寤惰竟鏈濋矞鏃忚嚜娌诲窞', '寮�灏佸競', '寮犲鍙e競', '寮犲鐣屽競', + '寮犳帠甯�', '寰愬窞甯�', '寰峰窞甯�', '寰烽槼甯�', '蹇诲窞甯�', '鎬�鍖栧競', '鎭╂柦鍦熷鏃忚嫍鏃忚嚜娌诲窞', '鎯犲窞甯�', + '鎴愰兘甯�', '鎵窞甯�', '鎵垮痉甯�', '鎶氬窞甯�', '鎶氶『甯�', '鎷夎惃甯�', '鎻槼甯�', '鏀�鏋濊姳甯�', '鏂囨槍甯�', + '鏂颁埂甯�', '鏂颁綑甯�', '鏃犻敗甯�', '鏃ュ杸鍒欏湴鍖�', '鏃ョ収甯�', '鏄嗘槑甯�', '鏄屽悏鍥炴棌鑷不宸�', '鏄屾睙榛庢棌鑷不鍘�', + '鏄岄兘鍦板尯', '鏄�氬競', '鏅嬩腑甯�', '鏅嬪煄甯�', '鏅幢甯�', '鏅痉闀囧競', '鏇查潠甯�', '鏈斿窞甯�', '鏈濋槼甯�', + '鏈邯甯�', '鏉ュ甯�', '鏉窞甯�', '鏉惧師甯�', '鏋楄姖鍦板尯', '鏋e簞甯�', '鏌冲窞甯�', '鏍床甯�', '妗傛灄甯�', + '姊呭窞甯�', '姊у窞甯�', '妤氶泟褰濇棌鑷不宸�', '姒嗘灄甯�', '姝﹀▉甯�', '姝︽眽甯�', '姣曡妭鍦板尯', '姘稿窞甯�', '姹変腑甯�', + '姹曞ご甯�', '姹曞熬甯�', '姹熼棬甯�', '姹犲窞甯�', '娌堥槼甯�', '娌у窞甯�', '娌虫睜甯�', '娌虫簮甯�', '娉夊窞甯�', + '娉板畨甯�', '娉板窞甯�', '娉稿窞甯�', '娲涢槼甯�', '娴庡崡甯�', '娴庡畞甯�', '娴庢簮甯�', '娴蜂笢鍦板尯', '娴峰彛甯�', + '娣勫崥甯�', '娣寳甯�', '娣崡甯�', '娣畨甯�', '娣卞湷甯�', '娓呰繙甯�', '娓╁窞甯�', '娓崡甯�', + '婀樻江甯�', '婀樿タ鍦熷鏃忚嫍鏃忚嚜娌诲窞', '婀涙睙甯�', '婊佸窞甯�', '婊ㄥ窞甯�', '婕渤甯�', '婕冲窞甯�', '娼嶅潑甯�', + '娼滄睙甯�', '娼窞甯�', '婢勮繄鍘�', '婵槼甯�', '鐑熷彴甯�', '鐒︿綔甯�', '鐗′腹姹熷競', '鐜夋灄甯�', '鐜夋邯甯�', + '鐝犳捣甯�', '鐞间腑榛庢棌鑻楁棌鑷不鍘�', '鐞兼捣甯�', '鐢樺崡钘忔棌鑷不宸�', '鐧藉煄甯�', '鐧藉北甯�', '鐧芥矙榛庢棌鑷不鍘�', + '鐧介摱甯�', '鐧捐壊甯�', '鐩婇槼甯�', '鐩愬煄甯�', '鐩橀敠甯�', '鐪夊北甯�', '鐭冲槾灞卞競', '鐭冲搴勫競', '鐭虫渤瀛愬競', + '绁炲啘鏋舵灄鍖�', '绂忓窞甯�', '绉︾殗宀涘競', '绾㈡渤鍝堝凹鏃忓綕鏃忚嚜娌诲窞', '缁ュ寲甯�', '閭㈠彴甯�', '閭f洸鍦板尯', '閭兏甯�', + '閲嶅簡甯�', '閲戝崕甯�', '閲戞槍甯�', '閽﹀窞甯�', '閾佸箔甯�', '閾滀粊鍦板尯', '閾滃窛甯�', '閾滈櫟甯�', '閾跺窛甯�', + '閿℃灄閮嫆鐩�', '閿﹀窞甯�', '闀囨睙甯�', '闀挎槬甯�', '闀挎矙甯�', '闀挎不甯�', '闃滄柊甯�', '闃滈槼甯�', '闃插煄娓競', + '闃虫睙甯�', '闃虫硥甯�', '闃垮厠鑻忓湴鍖�', '闃垮嫆娉板湴鍖�', '闃挎媺鍠勭洘', '闃挎媺灏斿競', '闃块噷鍦板尯', '闄囧崡甯�', + '闄垫按榛庢棌鑷不鍘�', '闅忓窞甯�', '闆呭畨甯�', '闈掑矝甯�', '闉嶅北甯�', '闊跺叧甯�', '椹瀺灞卞競', '椹婚┈搴楀競', + '楦¤タ甯�', '楣ゅ甯�', '楣ゅ矖甯�', '楣版江甯�', '榛勫唸甯�', '榛勫北甯�', '榛勭煶甯�', '榛戞渤甯�', + '榛斾笢鍗楄嫍鏃忎緱鏃忚嚜娌诲窞', '榛斿崡甯冧緷鏃忚嫍鏃忚嚜娌诲窞', '榛旇タ鍗楀竷渚濇棌鑻楁棌鑷不宸�', '榻愰綈鍝堝皵甯�', '榫欏博甯�'] - def runbuducitys = ["舟山市","湖州市"] + def runbuducitys = ["鑸熷北甯�","婀栧窞甯�"] for(def city : buducitys){ if(runbuducitys.contains(city)){ continue } def pois = findAllVillagePoiMap(city) - println "百度loading finish: "+pois.size()+" "+new Date().format("yyyy-MM-dd HH:mm:ss") + println "鐧惧害loading finish: "+pois.size()+" "+new Date().format("yyyy-MM-dd HH:mm:ss") def rows = createVillageData(city, pois) save(city, rows) @@ -193,16 +193,16 @@ class GaoDePoiDataProcess extends BaseBatch{ def townMap = CommonDatautils.queryTownByCity(city) def esMap = findEsPoiByCity(city) def nameKeys = esMap.keySet() - println "Es 加载完成:"+new Date().format("yyyy-MM-dd HH:mm:ss") + println "Es 鍔犺浇瀹屾垚锛�"+new Date().format("yyyy-MM-dd HH:mm:ss") for(def i=0;i=0.95) { // def distance = GeoUtils.calculateDistance(ret.location.lon, ret.location.lat, esValue.location.lon, esValue.location.lat); @@ -266,7 +266,7 @@ class GaoDePoiDataProcess extends BaseBatch{ } } }else{ - println "无数据" + println "鏃犳暟鎹�" } return simlarObj @@ -292,7 +292,7 @@ class GaoDePoiDataProcess extends BaseBatch{ o.put("name", d.name) o.put("township", d.township) o.put("location", d.location) - regionMap.put(d.name.replace("-","").replace("·",""), o) + regionMap.put(d.name.replace("-","").replace("路",""), o) map.put(district, regionMap) }) return map @@ -307,7 +307,7 @@ class GaoDePoiDataProcess extends BaseBatch{ "query": { "term": { "city" : { - "value": "上海市" + "value": "涓婃捣甯�" } } } @@ -378,13 +378,13 @@ class GaoDePoiDataProcess extends BaseBatch{ retMap.district = map.district retMap.name = map.name -// retMap.type = "地名地址信息" -// retMap.secondary_type = "普通地名" -// retMap.small_type = "村庄级地名" +// retMap.type = "鍦板悕鍦板潃淇℃伅" +// retMap.secondary_type = "鏅�氬湴鍚�" +// retMap.small_type = "鏉戝簞绾у湴鍚�" retMap.cat = map.std_tag if(!map.std_tag){ -// println map.name +" std_tag: "+ map.std_tag +" 为空过滤" +// println map.name +" std_tag: "+ map.std_tag +" 涓虹┖杩囨护" return null } @@ -434,7 +434,7 @@ class GaoDePoiDataProcess extends BaseBatch{ } } // retMap.township = InsidePolygon.isInArea2(retMap.location.lon, retMap.location.lat, townMap) - //高德转百度 + //楂樺痉杞櫨搴� def baiduMap = GeoUtils.gcj02ToBd09(retMap.location.lat, retMap.location.lon) if(baiduMap){ def location = [:] @@ -443,7 +443,7 @@ class GaoDePoiDataProcess extends BaseBatch{ retMap.bd_location = location } - //高德转WGS84 + //楂樺痉杞琖GS84 def gpsLoactionMap = GeoUtils.gcjToGps84(retMap.location.lat, retMap.location.lon) if(gpsLoactionMap){ def gpslocation = [:] @@ -452,7 +452,7 @@ class GaoDePoiDataProcess extends BaseBatch{ retMap.gps_location = gpslocation } - //现在企业帐号被封无法大批量调用 + //鐜板湪浼佷笟甯愬彿琚皝鏃犳硶澶ф壒閲忚皟鐢� // if(!retMap.township){ // def gaodeMap = getTownshipInfo(retMap.location.lon+","+retMap.location.lat) // if(gaodeMap && gaodeMap.township){ @@ -462,7 +462,7 @@ class GaoDePoiDataProcess extends BaseBatch{ retMap.spell_name = com.fangjia.core.util.DataUtil.hanyuQuanpin(retMap.name, " ") retMap.version = version - retMap.data_source = "百度地图" + retMap.data_source = "鐧惧害鍦板浘" retMap.data_id = map._id.toString() retMap.id = map._id.toString() @@ -473,9 +473,9 @@ class GaoDePoiDataProcess extends BaseBatch{ // } if(!retMap.cat || (retMap.cat && TYPES.contains(retMap.cat))){ - retMap.status = 1 //不输出 + retMap.status = 1 //涓嶈緭鍑� }else{ - retMap.status = 0 //输出 + retMap.status = 0 //杈撳嚭 } return retMap } @@ -506,7 +506,7 @@ class GaoDePoiDataProcess extends BaseBatch{ i++ ret << d if(ret.size()%50000==0){ - println "第 "+(i/50000)+" 个"+ret.size() + println "绗� "+(i/50000)+" 涓�"+ret.size() MAPPOI_CONN.insert(ret); ret = []; } @@ -519,8 +519,8 @@ class GaoDePoiDataProcess extends BaseBatch{ def synchCompany(){ fullCityMap = CommonDatautils.queryFullNameCity() - //"三明市","宁德市","泉州市","厦门市","福州市","漳州市","南平市","龙岩市","莆田市", - def citys = ["杭州","宁波","温州","嘉兴","台州","绍兴","金华","舟山","衢州","丽水"] + //"涓夋槑甯�","瀹佸痉甯�","娉夊窞甯�","鍘﹂棬甯�","绂忓窞甯�","婕冲窞甯�","鍗楀钩甯�","榫欏博甯�","鑾嗙敯甯�", + def citys = ["鏉窞","瀹佹尝","娓╁窞","鍢夊叴","鍙板窞","缁嶅叴","閲戝崕","鑸熷北","琛㈠窞","涓芥按"] for(def sampleCity : citys){ def cityObj = fullCityMap.get(sampleCity); @@ -530,11 +530,11 @@ class GaoDePoiDataProcess extends BaseBatch{ } def townMap = findTownRange(city) def companyDatas = findCompanyDatas(city) - println city+ " 加载公司数据:"+companyDatas.size() + println city+ " 鍔犺浇鍏徃鏁版嵁锛�"+companyDatas.size() def rows = running(city, companyDatas, "company", townMap) save(city, rows) // saveToMG(city, rows) - println "完成" + println "瀹屾垚" } } @@ -542,7 +542,7 @@ class GaoDePoiDataProcess extends BaseBatch{ def q = new BasicDBObject() q.put("done", 1) q.put("geo_city", city) -// q.put("geo_level", new BasicDBObject('$in', ['门牌号','兴趣点'])) +// q.put("geo_level", new BasicDBObject('$in', ['闂ㄧ墝鍙�','鍏磋叮鐐�'])) return COMPANY_206_COLL.find(q).toList() } @@ -576,7 +576,7 @@ class GaoDePoiDataProcess extends BaseBatch{ def totalCount = new AtomicLong() final CountDownLatch latch = new CountDownLatch(results.size()) - def prov = ProvinceData.getProvince(city.replace("市","")) + def prov = ProvinceData.getProvince(city.replace("甯�","")) for(def i=0;i= batchSize) { request.setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE); BulkResponse bulkResponse = client.bulk(request, RequestOptions.DEFAULT); if (bulkResponse.hasFailures()) { - // 处理错误 + // 澶勭悊閿欒 print "Bulk request has failures: " + bulkResponse.buildFailureMessage() } else { processedCount += request.numberOfActions(); @@ -790,7 +790,7 @@ class GaoDePoiDataProcess extends BaseBatch{ request.setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE); BulkResponse bulkResponse = client.bulk(request, RequestOptions.DEFAULT); if (bulkResponse.hasFailures()) { - // 处理错误 + // 澶勭悊閿欒 println "Bulk request has failures: " + bulkResponse.buildFailureMessage() } else { processedCount += request.numberOfActions(); @@ -884,7 +884,7 @@ class GaoDePoiDataProcess extends BaseBatch{ } def poiCatProcess(){ - ExcelUtils.multiThreadingModify("C:\\Users\\gaojuan\\Downloads\\数据.xlsx",{d-> + ExcelUtils.multiThreadingModify("C:\\Users\\gaojuan\\Downloads\\鏁版嵁.xlsx",{d-> def cat = d['B'] if(cat && cat.size()>50){ println cat @@ -919,7 +919,7 @@ class GaoDePoiDataProcess extends BaseBatch{ if(catArrs.size()>3){ cat = catArrs[0]+";"+catArrs[1]+";"+catArrs[2] if(cat.size()>=45){ - println "取前3依然超:"+cat + println "鍙栧墠3渚濈劧瓒咃細"+cat }else{ udata.put("type",catArrs[0]) udata.put("secondary_type",catArrs[1]) @@ -939,7 +939,7 @@ class GaoDePoiDataProcess extends BaseBatch{ } def synchNetwork(){ - def datas = ExcelUtils.read("D:\\数据\\厦门\\网点经纬度-人工核实(1).xlsx") + def datas = ExcelUtils.read("D:\\鏁版嵁\\鍘﹂棬\\缃戠偣缁忕含搴�-浜哄伐鏍稿疄(1).xlsx") def rets = [] for(def d : datas){ def location = d['I'] @@ -969,7 +969,7 @@ class GaoDePoiDataProcess extends BaseBatch{ request.setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE); BulkResponse bulkResponse = client.bulk(request, RequestOptions.DEFAULT); if (bulkResponse.hasFailures()) { - // 处理错误 + // 澶勭悊閿欒 println "Bulk request has failures: " + bulkResponse.buildFailureMessage() } else { processedCount += request.numberOfActions(); @@ -977,7 +977,7 @@ class GaoDePoiDataProcess extends BaseBatch{ } } - println "结束时间 "+new Date() + println "缁撴潫鏃堕棿 "+new Date() } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/NetworkDistanceBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/NetworkDistanceBatch.groovy index 627c30884..ac95d4ad1 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/NetworkDistanceBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/NetworkDistanceBatch.groovy @@ -38,8 +38,8 @@ class NetworkDistanceBatch extends BaseBatch{ @Override void process(Object args) { - def networks = ExcelUtils.read("D:\\数据\\厦门\\网点经纬度-人工核实(1).xlsx", 0, 1) - def citys = ["厦门","三明","宁德","泉州","福州","漳州","南平","龙岩","莆田","重庆"] + def networks = ExcelUtils.read("D:\\鏁版嵁\\鍘﹂棬\\缃戠偣缁忕含搴�-浜哄伐鏍稿疄(1).xlsx", 0, 1) + def citys = ["鍘﹂棬","涓夋槑","瀹佸痉","娉夊窞","绂忓窞","婕冲窞","鍗楀钩","榫欏博","鑾嗙敯","閲嶅簡"] for(def c : citys){ run(c, "district", networks) } @@ -47,7 +47,7 @@ class NetworkDistanceBatch extends BaseBatch{ } def saveMapData(){ - ExcelUtils.multiThreadingModify("D:\\数据\\厦门\\厦门银行鹭通支行.xlsx",{d-> + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\鍘﹂棬\\鍘﹂棬閾惰楣�氭敮琛�.xlsx",{d-> if(d['C']){ def arrs = d['C'].split(",") def baidu = BaiDuApiUtils.geoconv(arrs[0].toString().toDouble(), arrs[1].toString().toDouble(), 3) @@ -107,7 +107,7 @@ class NetworkDistanceBatch extends BaseBatch{ latch.await() saveDatas(rets); - println cat +" "+city +" 总量:"+datas.size()+" 在5公里内总量:"+rets.size() + println cat +" "+city +" 鎬婚噺锛�"+datas.size()+" 鍦�5鍏噷鍐呮�婚噺锛�"+rets.size() } def saveDatas(def rets){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/PoiAndSeaweedExportCSV.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/PoiAndSeaweedExportCSV.groovy index d691850c2..e91b3f4b0 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/PoiAndSeaweedExportCSV.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/PoiAndSeaweedExportCSV.groovy @@ -15,7 +15,7 @@ class PoiAndSeaweedExportCSV extends BaseBatch{ @Override public void process(Object args) { - def citys = ["三明","宁德","泉州","厦门","福州","漳州","南平","龙岩","莆田","重庆"] + def citys = ["涓夋槑","瀹佸痉","娉夊窞","鍘﹂棬","绂忓窞","婕冲窞","鍗楀钩","榫欏博","鑾嗙敯","閲嶅簡"] poiExport(citys) @@ -24,7 +24,7 @@ class PoiAndSeaweedExportCSV extends BaseBatch{ def poiExport(citys){ def fileName = "/home/goojia/xiamen/BIGDATA_POI.csv" if(CommonDatautils.isWindow()){ - fileName = "d:\\数据\\厦门\\BIGDATA_POI.csv" + fileName = "d:\\鏁版嵁\\鍘﹂棬\\BIGDATA_POI.csv" } for(def c : citys){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/PoiWash.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/PoiWash.groovy index 45e3614bc..ee5f0f872 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/PoiWash.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/PoiWash.groovy @@ -50,7 +50,7 @@ class PoiWash { } def updateId(){ - def citys = ["上海市","深圳市","北京市","广州市","杭州市","苏州市","成都市"] + def citys = ["涓婃捣甯�","娣卞湷甯�","鍖椾含甯�","骞垮窞甯�","鏉窞甯�","鑻忓窞甯�","鎴愰兘甯�"] for(def city : citys){ def datas = findPois(city) update(datas) @@ -73,7 +73,7 @@ class PoiWash { def udata = new BasicDBObject() udata.put("id", map._id.toString()) MAPPOI_CONN.update(new BasicDBObject('_id',map._id),new BasicDBObject('$set', udata)) - println updateTotalCount.get()+" / "+totalCount.get()+" "+count +" "+map.city+" 更改id" + println updateTotalCount.get()+" / "+totalCount.get()+" "+count +" "+map.city+" 鏇存敼id" } catch (Exception e) { e.printStackTrace() } finally { @@ -88,10 +88,10 @@ class PoiWash { def synch(){ def rets = [] - def citys = ["上海市","深圳市","北京市","广州市","杭州市","苏州市","成都市"] + def citys = ["涓婃捣甯�","娣卞湷甯�","鍖椾含甯�","骞垮窞甯�","鏉窞甯�","鑻忓窞甯�","鎴愰兘甯�"] for(def city : citys){ def datas = findAllFieldPois(city) - println city +" "+datas.size()+" 同步" + println city +" "+datas.size()+" 鍚屾" for(def d : datas){ rets << d if(rets.size()%10000==0){ @@ -111,11 +111,11 @@ class PoiWash { def checkSpecialSymbols(){ - //"三明市","宁德市","泉州市","厦门市","福州市","漳州市","南平市","龙岩市","莆田市", - def citys = ["重庆市"] + //"涓夋槑甯�","瀹佸痉甯�","娉夊窞甯�","鍘﹂棬甯�","绂忓窞甯�","婕冲窞甯�","鍗楀钩甯�","榫欏博甯�","鑾嗙敯甯�", + def citys = ["閲嶅簡甯�"] for(def city : citys){ findAllFieldPois(city) - println city +" 完成" + println city +" 瀹屾垚" } } @@ -161,9 +161,9 @@ class PoiWash { } def run(){ - //"上海市","深圳市","北京市","广州市","杭州市","苏州市","成都市" - //"重庆市","三明市","宁德市","泉州市","厦门市","福州市","漳州市","南平市","龙岩市","莆田市" - def citys = ["杭州市","宁波市","温州市","嘉兴市","台州市","湖州市","绍兴市","金华市","舟山市","衢州市","丽水市"] + //"涓婃捣甯�","娣卞湷甯�","鍖椾含甯�","骞垮窞甯�","鏉窞甯�","鑻忓窞甯�","鎴愰兘甯�" + //"閲嶅簡甯�","涓夋槑甯�","瀹佸痉甯�","娉夊窞甯�","鍘﹂棬甯�","绂忓窞甯�","婕冲窞甯�","鍗楀钩甯�","榫欏博甯�","鑾嗙敯甯�" + def citys = ["鏉窞甯�","瀹佹尝甯�","娓╁窞甯�","鍢夊叴甯�","鍙板窞甯�","婀栧窞甯�","缁嶅叴甯�","閲戝崕甯�","鑸熷北甯�","琛㈠窞甯�","涓芥按甯�"] for(def city : citys){ townsMap = findAllTownship(city) regions = findAllRegions(city) @@ -171,7 +171,7 @@ class PoiWash { println city +' poi: '+datas.size()+" towns:"+ townsMap.get(RegionData.formatCity(city)).size() process(city, datas) // updateOldRegion(city) - println city +" 完成" + println city +" 瀹屾垚" } } @@ -222,7 +222,7 @@ class PoiWash { addr = addr.replace(data.city,'') } if(data.district){ - if(!addr.contains(data.district+"路")){ + if(!addr.contains(data.district+"璺�")){ addr = addr.replace(data.district,'') } } @@ -266,7 +266,7 @@ class PoiWash { def q = new BasicDBObject() q.put("city", city) q.put("test", 1) -// q.put("name", '(三星)企业设立登记第二受理点') +// q.put("name", '(涓夋槦)浼佷笟璁剧珛鐧昏绗簩鍙楃悊鐐�') def keys = new BasicDBObject() keys.put("_id", 1) @@ -359,7 +359,7 @@ class PoiWash { def findAllRegions(cityName){ def q = new BasicDBObject() - if(["重庆市","北京市","天津市", "上海市"].contains(cityName)){ + if(["閲嶅簡甯�","鍖椾含甯�","澶╂触甯�", "涓婃捣甯�"].contains(cityName)){ q.put("province_name", cityName) }else{ q.put("city_name", cityName) @@ -375,7 +375,7 @@ class PoiWash { def findAllTownship(cityName){ def q = new BasicDBObject() - if(["重庆市","北京市","天津市", "上海市"].contains(cityName)){ + if(["閲嶅簡甯�","鍖椾含甯�","澶╂触甯�", "涓婃捣甯�"].contains(cityName)){ q.put("province_name", cityName) }else{ q.put("city_name", cityName) @@ -404,8 +404,8 @@ class PoiWash { def deduplicate(){ - //"三明市","漳州市","宁德市","泉州市","厦门市","福州市","南平市","龙岩市","莆田市","上海市","深圳市","北京市","广州市","杭州市","苏州市","成都市","重庆市" - def citys = ["杭州市","宁波市","温州市","嘉兴市","台州市","湖州市","绍兴市","金华市","舟山市","衢州市","丽水市"] + //"涓夋槑甯�","婕冲窞甯�","瀹佸痉甯�","娉夊窞甯�","鍘﹂棬甯�","绂忓窞甯�","鍗楀钩甯�","榫欏博甯�","鑾嗙敯甯�","涓婃捣甯�","娣卞湷甯�","鍖椾含甯�","骞垮窞甯�","鏉窞甯�","鑻忓窞甯�","鎴愰兘甯�","閲嶅簡甯�" + def citys = ["鏉窞甯�","瀹佹尝甯�","娓╁窞甯�","鍢夊叴甯�","鍙板窞甯�","婀栧窞甯�","缁嶅叴甯�","閲戝崕甯�","鑸熷北甯�","琛㈠窞甯�","涓芥按甯�"] def total = 0 def upindex = 0 for(def city : citys){ @@ -441,8 +441,8 @@ class PoiWash { } def updateEsMapPoi(){ -// "三明市", "漳州市","宁德市","泉州市","厦门市","福州市","南平市", - def citys = ["龙岩市","莆田市","重庆市","上海市","深圳市","北京市","广州市","杭州市","苏州市","成都市"] +// "涓夋槑甯�", "婕冲窞甯�","瀹佸痉甯�","娉夊窞甯�","鍘﹂棬甯�","绂忓窞甯�","鍗楀钩甯�", + def citys = ["榫欏博甯�","鑾嗙敯甯�","閲嶅簡甯�","涓婃捣甯�","娣卞湷甯�","鍖椾含甯�","骞垮窞甯�","鏉窞甯�","鑻忓窞甯�","鎴愰兘甯�"] for(def city : citys) { def datas = findPoiByQuery(city) for(def d : datas){ @@ -454,13 +454,13 @@ class PoiWash { } def splitRoad(){ - //"三明市", + //"涓夋槑甯�", def citys = CommonDatautils.findAllCity() for(def city : citys) { def cityObj = fullCityMap.get(city) def datas = findPoiByQuery(cityObj.city, ['city','address']) splitRoadRun(datas) - println city +" 完成" + println city +" 瀹屾垚" } } @@ -563,8 +563,8 @@ class PoiWash { def check(){ -// "漳州市","三明市","宁德市","泉州市","厦门市","福州市","南平市","龙岩市","莆田市","重庆市","深圳市","北京市","广州市","杭州市","苏州市","成都市", - def citys = ["杭州市","宁波市","温州市","嘉兴市","台州市","湖州市","绍兴市","金华市","舟山市","衢州市","丽水市"] +// "婕冲窞甯�","涓夋槑甯�","瀹佸痉甯�","娉夊窞甯�","鍘﹂棬甯�","绂忓窞甯�","鍗楀钩甯�","榫欏博甯�","鑾嗙敯甯�","閲嶅簡甯�","娣卞湷甯�","鍖椾含甯�","骞垮窞甯�","鏉窞甯�","鑻忓窞甯�","鎴愰兘甯�", + def citys = ["鏉窞甯�","瀹佹尝甯�","娓╁窞甯�","鍢夊叴甯�","鍙板窞甯�","婀栧窞甯�","缁嶅叴甯�","閲戝崕甯�","鑸熷北甯�","琛㈠窞甯�","涓芥按甯�"] for(def city : citys){ def stop = false while(!stop){ @@ -575,7 +575,7 @@ class PoiWash { stop = true } } - println city +" 完成" + println city +" 瀹屾垚" } } @@ -631,9 +631,9 @@ class PoiWash { - if(map.address && (map.address.contains("(") || map.address.contains("("))){ + if(map.address && (map.address.contains("(") || map.address.contains("锛�"))){ def s1 = null - def addr = map.address.replace("(", "(").replace(")", ")") + def addr = map.address.replace("锛�", "(").replace("锛�", ")") if(addr.contains("(") && addr.contains(")")){ s1 = addr.substring(addr.indexOf("("),addr.indexOf(")")+1 ) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/PostCodeSynchBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/PostCodeSynchBatch.groovy index a67322dcb..f370be90e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/PostCodeSynchBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/PostCodeSynchBatch.groovy @@ -53,11 +53,11 @@ class PostCodeSynchBatch extends BaseBatch{ map.district = distData.district map.district_code = distData.mca_district_code }else{ - println d.city +" "+d.district+" 民政部中没有找到相应的区域全称" + println d.city +" "+d.district+" 姘戞斂閮ㄤ腑娌℃湁鎵惧埌鐩稿簲鐨勫尯鍩熷叏绉�" } }else{ - println d.city +" 没有标准化出来" + println d.city +" 娌℃湁鏍囧噯鍖栧嚭鏉�" } map.city_zip_code = d.city_code map.district_zip_code = d.district_code diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/RelatedTaiWanBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/RelatedTaiWanBatch.groovy index d04835c28..780b6f7c6 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/RelatedTaiWanBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/RelatedTaiWanBatch.groovy @@ -14,7 +14,7 @@ import com.fangjia.script.yinjihaun.amap.GaoDeApiUtils import com.mongodb.BasicDBObject import com.mongodb.DBCollection /** - * 厦门涉台园区数据同步 + * 鍘﹂棬娑夊彴鍥尯鏁版嵁鍚屾 */ @@ -26,12 +26,12 @@ class RelatedTaiWanBatch extends BaseBatch{ def curDate = Integer.parseInt(DateUtils.formatDateByPattern(new Date(), "yyyyMM")); DBCollection yuanqu_qiye_coll = MongoUtils.getCollectionByName("crawl", "qzd_shetai_company_detail", "192.168.0.206", 27020) - def relateTaiwn_yuanqu_datas = ["福州台商投资区","杏林台商投资区","集美台商投资区","海沧台商投资区","漳州台商投资区","泉州台商投资区","漳浦台湾农民创业园","漳平台湾农民创业园","仙游台湾农民创业园","清流台湾农民创业园","福清台湾农民创业园","惠安台湾农民创业园","海峡两岸集成电路产业合作试验区(厦门、泉州产业园)","海峡两岸生技和医疗健康产业合作区","海峡两岸农业合作试验区","海峡两岸(三明)现代林业合作实验区","漳州古雷石化基地","永泰闽台农业融合发展产业园","上杭闽台农业融合发展产业园","同安闽台农业融合发展产业园","南靖闽台农业融合发展产业园","漳浦闽台农业融合发展产业园","永春闽台农业融合发展产业园","永安闽台农业融合发展产业园","邵武闽台农业融合发展产业园","平潭闽台农业融合发展产业园","南靖闽台精密机械产业园"] + def relateTaiwn_yuanqu_datas = ["绂忓窞鍙板晢鎶曡祫鍖�","鏉忔灄鍙板晢鎶曡祫鍖�","闆嗙編鍙板晢鎶曡祫鍖�","娴锋钵鍙板晢鎶曡祫鍖�","婕冲窞鍙板晢鎶曡祫鍖�","娉夊窞鍙板晢鎶曡祫鍖�","婕虫郸鍙版咕鍐滄皯鍒涗笟鍥�","婕冲钩鍙版咕鍐滄皯鍒涗笟鍥�","浠欐父鍙版咕鍐滄皯鍒涗笟鍥�","娓呮祦鍙版咕鍐滄皯鍒涗笟鍥�","绂忔竻鍙版咕鍐滄皯鍒涗笟鍥�","鎯犲畨鍙版咕鍐滄皯鍒涗笟鍥�","娴峰场涓ゅ哺闆嗘垚鐢佃矾浜т笟鍚堜綔璇曢獙鍖猴紙鍘﹂棬銆佹硥宸炰骇涓氬洯锛�","娴峰场涓ゅ哺鐢熸妧鍜屽尰鐤楀仴搴蜂骇涓氬悎浣滃尯","娴峰场涓ゅ哺鍐滀笟鍚堜綔璇曢獙鍖�","娴峰场涓ゅ哺锛堜笁鏄庯級鐜颁唬鏋椾笟鍚堜綔瀹為獙鍖�","婕冲窞鍙ら浄鐭冲寲鍩哄湴","姘告嘲闂藉彴鍐滀笟铻嶅悎鍙戝睍浜т笟鍥�","涓婃澀闂藉彴鍐滀笟铻嶅悎鍙戝睍浜т笟鍥�","鍚屽畨闂藉彴鍐滀笟铻嶅悎鍙戝睍浜т笟鍥�","鍗楅潠闂藉彴鍐滀笟铻嶅悎鍙戝睍浜т笟鍥�","婕虫郸闂藉彴鍐滀笟铻嶅悎鍙戝睍浜т笟鍥�","姘告槬闂藉彴鍐滀笟铻嶅悎鍙戝睍浜т笟鍥�","姘稿畨闂藉彴鍐滀笟铻嶅悎鍙戝睍浜т笟鍥�","閭垫闂藉彴鍐滀笟铻嶅悎鍙戝睍浜т笟鍥�","骞虫江闂藉彴鍐滀笟铻嶅悎鍙戝睍浜т笟鍥�","鍗楅潠闂藉彴绮惧瘑鏈烘浜т笟鍥�"] DBCollection XM_RELATED_TW_QIYE_COLL = MongoUtils.getCollectionByName("business", "xm_related_tw_qiye", "mongo.db.fangjia.com") DBCollection DEVELOPMENT_ZONE_43_COLL = MongoUtils.getCollectionByName("fangjia_base", "development_zone", "mongo.db.fangjia.com") - def zimaoqu_datas = ["中国(福建)自由贸易试验区厦门片区","中国(福建)自由贸易试验区福州片区","中国(福建)自由贸易试验区平潭片区"] + def zimaoqu_datas = ["涓浗锛堢寤猴級鑷敱璐告槗璇曢獙鍖哄帵闂ㄧ墖鍖�","涓浗锛堢寤猴級鑷敱璐告槗璇曢獙鍖虹宸炵墖鍖�","涓浗锛堢寤猴級鑷敱璐告槗璇曢獙鍖哄钩娼墖鍖�"] @@ -44,9 +44,9 @@ class RelatedTaiWanBatch extends BaseBatch{ def day = new Date().getDate() if(day == 10){ -// createDatas() //企业库获取涉台园区企业 - updateRangeByPoint() //更改企业所在自贸区 - export() //导出数据 +// createDatas() //浼佷笟搴撹幏鍙栨秹鍙板洯鍖轰紒涓� + updateRangeByPoint() //鏇存敼浼佷笟鎵�鍦ㄨ嚜璐稿尯 + export() //瀵煎嚭鏁版嵁 } } @@ -154,12 +154,12 @@ class RelatedTaiWanBatch extends BaseBatch{ def fileName = "/home/goojia/xmbank/free_trade_zone_${curDate}_init.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\厦门\\涉台园区\\free_trade_zone_${curDate}_init.dat" + fileName = "D:\\鏁版嵁\\鍘﹂棬\\娑夊彴鍥尯\\free_trade_zone_${curDate}_init.dat" } def allDatas = [] allDatas.addAll(rows) - //原不加密之前 + //鍘熶笉鍔犲瘑涔嬪墠 // FileUtils.batchCreateFileByCustomSuffix(rows, fileName, null, "utf-8", false, "|@|","|+|"); // XmBankFtpUtils.ftpUpload(fileName, curDate) @@ -172,7 +172,7 @@ class RelatedTaiWanBatch extends BaseBatch{ def fileName2 = "/home/goojia/xmbank/free_trade_zone_${curDate}_init.dat.rdy" if(CommonDatautils.isWindow()){ - fileName2 = "D:\\数据\\厦门\\涉台园区\\free_trade_zone_${curDate}_init.dat.rdy" + fileName2 = "D:\\鏁版嵁\\鍘﹂棬\\娑夊彴鍥尯\\free_trade_zone_${curDate}_init.dat.rdy" } def rdy_datas = [rows.size().toString()] FileUtils.batchCreateFileByCustomSuffix([rdy_datas], fileName2, null, "utf-8", false, "","|+|"); @@ -182,14 +182,14 @@ class RelatedTaiWanBatch extends BaseBatch{ def exportEmptyFile(){ def fileName = "/home/goojia/xmbank/free_trade_zone_${curDate}_init.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\厦门\\涉台园区\\free_trade_zone_${curDate}_init.dat" + fileName = "D:\\鏁版嵁\\鍘﹂棬\\娑夊彴鍥尯\\free_trade_zone_${curDate}_init.dat" } FileUtils.batchCreateFileByCustomSuffix([], fileName, null, "utf-8", false, "|@|","|+|"); XmBankFtpUtils.ftpUpload(fileName, curDate) def fileName2 = "/home/goojia/xmbank/free_trade_zone_${curDate}_init.dat.rdy" if(CommonDatautils.isWindow()){ - fileName2 = "D:\\数据\\厦门\\涉台园区\\free_trade_zone_${curDate}_init.dat.rdy" + fileName2 = "D:\\鏁版嵁\\鍘﹂棬\\娑夊彴鍥尯\\free_trade_zone_${curDate}_init.dat.rdy" } def rdy_datas = ["0"] FileUtils.batchCreateFileByCustomSuffix([rdy_datas], fileName2, null, "utf-8", false, "","|+|"); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SeaweedDataSynch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SeaweedDataSynch.groovy index 939778156..fb87d0ebe 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SeaweedDataSynch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SeaweedDataSynch.groovy @@ -39,7 +39,7 @@ import java.util.concurrent.Executors import java.util.concurrent.atomic.AtomicLong /** - * 同步小区,商铺,写字楼到89,52上 + * 鍚屾灏忓尯锛屽晢閾猴紝鍐欏瓧妤煎埌89锛�52涓� */ class SeaweedDataSynch extends BaseBatch{ @@ -79,11 +79,11 @@ class SeaweedDataSynch extends BaseBatch{ @Override public void process(Object args) { run() -// println "全国district, shop, office同步完成" - //民政部编码上传 +// println "鍏ㄥ浗district, shop, office鍚屾瀹屾垚" + //姘戞斂閮ㄧ紪鐮佷笂浼� // codeRun() - //println "民政部省,市,区同步完成" + //println "姘戞斂閮ㄧ渷锛屽競锛屽尯鍚屾瀹屾垚" //println new ObjectId("622c433afb459ab08fdab460").getDate() // addTest() @@ -98,9 +98,9 @@ class SeaweedDataSynch extends BaseBatch{ def m = new BasicDBObject() m.put("province" , d.province_name) m.put("province_code", d.province_code) - if(['北京市','上海市','重庆市','天津市'].contains(d.province_name)){ + if(['鍖椾含甯�','涓婃捣甯�','閲嶅簡甯�','澶╂触甯�'].contains(d.province_name)){ m.put("city" , d.province_name) - }else if(d.area_name=="自治区直辖县级行政区划" || d.area_name=="省直辖县级行政区划"){ + }else if(d.area_name=="鑷不鍖虹洿杈栧幙绾ц鏀垮尯鍒�" || d.area_name=="鐪佺洿杈栧幙绾ц鏀垮尯鍒�"){ m.put("city" , d.area_name) }else{ m.put("city" , d.city_name) @@ -115,19 +115,19 @@ class SeaweedDataSynch extends BaseBatch{ m.put("location",d.location) m.put("type_code" ,d.type) if(d.type=="111"){ - m.put("type" , "主城区") + m.put("type" , "涓诲煄鍖�") }else if(d.type=="112"){ - m.put("type" , "城乡结合区") + m.put("type" , "鍩庝埂缁撳悎鍖�") }else if(d.type=="121"){ - m.put("type" , "镇中心区") + m.put("type" , "闀囦腑蹇冨尯") }else if(d.type=="122"){ - m.put("type" , "镇乡结合区") + m.put("type" , "闀囦埂缁撳悎鍖�") }else if(d.type=="123"){ - m.put("type" , "特殊区域") + m.put("type" , "鐗规畩鍖哄煙") }else if(d.type=="210"){ - m.put("type" , "乡中心区") + m.put("type" , "涔′腑蹇冨尯") }else if(d.type=="220"){ - m.put("type" , "村庄") + m.put("type" , "鏉戝簞") } ret << m @@ -147,9 +147,9 @@ class SeaweedDataSynch extends BaseBatch{ def run(){ fullCityMap = CommonDatautils.queryFullNameCity() - println "城市全称加载完成" + println "鍩庡競鍏ㄧО鍔犺浇瀹屾垚" mcaDistMap = CommonDatautils.queryDistNameCityByMapping() - println "民政部加载完成" + println "姘戞斂閮ㄥ姞杞藉畬鎴�" priceMap = findAllDistrictSellPrice() def citys = CommonDatautils.findAllCity() def index = 0 @@ -168,7 +168,7 @@ class SeaweedDataSynch extends BaseBatch{ updateEs(c, shops, "shop", "192.168.0.89") updateEs(c, shops, "shop", "192.168.0.52") - println index +" "+ c + " 完成 "+new Date().toString() + println index +" "+ c + " 瀹屾垚 "+new Date().toString() } } @@ -179,7 +179,7 @@ class SeaweedDataSynch extends BaseBatch{ final CountDownLatch latch = new CountDownLatch(dists.size()) def updateDatas = new CopyOnWriteArrayList() def ids = new CopyOnWriteArrayList() - //更新89Es + //鏇存柊89Es for(def i=0;i if(!ids.contains(id)){ @@ -216,8 +216,8 @@ class SeaweedDataSynch extends BaseBatch{ esDelIds << id } } - println "Es 删除 ${cat}类型:"+esDelIds.size() - //将100 mongodb中非正常小区删除 + println "Es 鍒犻櫎 ${cat}绫诲瀷锛�"+esDelIds.size() + //灏�100 mongodb涓潪姝e父灏忓尯鍒犻櫎 def mongoIds = findMongoDbDatas(cat, data.city) mongoIds.each{id-> @@ -244,7 +244,7 @@ class SeaweedDataSynch extends BaseBatch{ } if(!esObj || (esObj && diffMap)){ map.put("id", d._id.toString()) - map.put("status", 0) //因为判断是否有值,0会返回false,所在这里设置默认值,在89和52上的都是有效数据 + map.put("status", 0) //鍥犱负鍒ゆ柇鏄惁鏈夊�硷紝0浼氳繑鍥瀎alse,鎵�鍦ㄨ繖閲岃缃粯璁ゅ�硷紝鍦�89鍜�52涓婄殑閮芥槸鏈夋晥鏁版嵁 return map } return null @@ -262,10 +262,10 @@ class SeaweedDataSynch extends BaseBatch{ try{ totalCount.addAndGet(1) def map = createData(dist) - //往100 上同步 + //寰�100 涓婂悓姝� updateData(map) rets << map -// //往89 es上同步 +// //寰�89 es涓婂悓姝� // def newUrl = targetUrl +"_doc/"+map._id // CommonDatautils.httpSaveData89(newUrl, map) println city +" "+cat +" "+totalCount.get() +"/"+dists.size()+" "+dist.name+" "+map._id @@ -343,11 +343,11 @@ class SeaweedDataSynch extends BaseBatch{ map.region = distData.district area_code = distData.mca_district_code }else{ - if(["东莞市","中山市","济源市","仙桃市","潜江市","天门市","神农架林区","五指山市","琼海市","文昌市","万宁市","东方市","定安县","屯昌县","澄迈县","临高县","白沙黎族自治县","昌江黎族自治县","乐东黎族自治县","陵水黎族自治县","保亭黎族苗族自治县","琼中黎族苗族自治县","五指山市","琼海市","文昌市","万宁市","东方市","定安县","屯昌县","澄迈县","临高县","白沙黎族自治县","昌江黎族自治县","乐东黎族自治县","陵水黎族自治县","保亭黎族苗族自治县","琼中黎族苗族自治县","石河子市","阿拉尔市","图木舒克市","五家渠市","北屯市","铁门关市","双河市","可克达拉市","昆玉市","胡杨河市","新星市","白杨市","嘉峪关市","儋州市"].contains(map.city)){ + if(["涓滆帪甯�","涓北甯�","娴庢簮甯�","浠欐甯�","娼滄睙甯�","澶╅棬甯�","绁炲啘鏋舵灄鍖�","浜旀寚灞卞競","鐞兼捣甯�","鏂囨槍甯�","涓囧畞甯�","涓滄柟甯�","瀹氬畨鍘�","灞槍鍘�","婢勮繄鍘�","涓撮珮鍘�","鐧芥矙榛庢棌鑷不鍘�","鏄屾睙榛庢棌鑷不鍘�","涔愪笢榛庢棌鑷不鍘�","闄垫按榛庢棌鑷不鍘�","淇濅涵榛庢棌鑻楁棌鑷不鍘�","鐞间腑榛庢棌鑻楁棌鑷不鍘�","浜旀寚灞卞競","鐞兼捣甯�","鏂囨槍甯�","涓囧畞甯�","涓滄柟甯�","瀹氬畨鍘�","灞槍鍘�","婢勮繄鍘�","涓撮珮鍘�","鐧芥矙榛庢棌鑷不鍘�","鏄屾睙榛庢棌鑷不鍘�","涔愪笢榛庢棌鑷不鍘�","闄垫按榛庢棌鑷不鍘�","淇濅涵榛庢棌鑻楁棌鑷不鍘�","鐞间腑榛庢棌鑻楁棌鑷不鍘�","鐭虫渤瀛愬競","闃挎媺灏斿競","鍥炬湪鑸掑厠甯�","浜斿娓犲競","鍖楀悲甯�","閾侀棬鍏冲競","鍙屾渤甯�","鍙厠杈炬媺甯�","鏄嗙帀甯�","鑳℃潹娌冲競","鏂版槦甯�","鐧芥潹甯�","鍢夊唱鍏冲競","鍎嬪窞甯�"].contains(map.city)){ map.region = map.city } // map.region = dist.region - println dist.city +" "+dist.region+" 民政部中没有找到相应的区域全称" + println dist.city +" "+dist.region+" 姘戞斂閮ㄤ腑娌℃湁鎵惧埌鐩稿簲鐨勫尯鍩熷叏绉�" } // map.area_code = area_code // map.fangjia_region = dist.region @@ -405,7 +405,7 @@ class SeaweedDataSynch extends BaseBatch{ } if(map.location){ - //高德转百度 + //楂樺痉杞櫨搴� def baiduMap = GeoUtils.gcj02ToBd09(map.location.lat, map.location.lon) if(baiduMap){ def location = [:] @@ -414,7 +414,7 @@ class SeaweedDataSynch extends BaseBatch{ map.bd_location = location } - //高德转WGS84 + //楂樺痉杞琖GS84 def gpsLoactionMap = GeoUtils.gcjToGps84(map.location.lat, map.location.lon) if(gpsLoactionMap){ def gpslocation = [:] @@ -509,7 +509,7 @@ class SeaweedDataSynch extends BaseBatch{ // administrative_division_100_CONN.insert(rets) // def q = new BasicDBObject() - q.put("province","澳门特别行政区") + q.put("province","婢抽棬鐗瑰埆琛屾斂鍖�") def dbcursor = administrative_division_2022_CONN.find(q) for(def d : dbcursor){ administrative_division_100_CONN.save(d) @@ -518,8 +518,8 @@ class SeaweedDataSynch extends BaseBatch{ } def updateTownship(){ - ExcelUtils.multiThreadingModify("D:\\数据\\数据建设\\浙江省小区.xlsx", { row -> - if(row['Q'] && row['Q']=='是'){ + ExcelUtils.multiThreadingModify("D:\\鏁版嵁\\鏁版嵁寤鸿\\娴欐睙鐪佸皬鍖�.xlsx", { row -> + if(row['Q'] && row['Q']=='鏄�'){ def udata = new BasicDBObject() udata.put("township", row['J']) udata.put("m_date", new Date()) @@ -553,7 +553,7 @@ class SeaweedDataSynch extends BaseBatch{ request.setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE); BulkResponse bulkResponse = client.bulk(request, RequestOptions.DEFAULT); if (bulkResponse.hasFailures()) { - // 处理错误 + // 澶勭悊閿欒 println "Bulk request has failures: " + bulkResponse.buildFailureMessage() } else { processedCount += request.numberOfActions(); @@ -567,7 +567,7 @@ class SeaweedDataSynch extends BaseBatch{ request.setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE); BulkResponse bulkResponse = client.bulk(request, RequestOptions.DEFAULT); if (bulkResponse.hasFailures()) { - // 处理错误 + // 澶勭悊閿欒 println "Bulk request has failures: " + bulkResponse.buildFailureMessage() } else { processedCount += request.numberOfActions(); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SuggestionDataSynch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SuggestionDataSynch.groovy index 2896b5c0b..f7f7c0f3a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SuggestionDataSynch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SuggestionDataSynch.groovy @@ -73,7 +73,7 @@ class SuggestionDataSynch extends BaseBatch{ def run() { - //"三明","宁德","泉州","厦门","福州","漳州","南平","龙岩","莆田","重庆" + //"涓夋槑","瀹佸痉","娉夊窞","鍘﹂棬","绂忓窞","婕冲窞","鍗楀钩","榫欏博","鑾嗙敯","閲嶅簡" def citys = CommonDatautils.findAllCity() def index = 0 fullCityMap = queryFullNameCity() @@ -84,18 +84,18 @@ class SuggestionDataSynch extends BaseBatch{ def allRets = [] -// if(["上海","北京","广州","深圳","成都","杭州","天津","西安","南京","沈阳","重庆","武汉","石家庄","福州","宁波","贵阳","怀化","郴州","益阳","永州","娄底","湘西","长沙","常德","株洲","岳阳","衡阳","湘潭","张家界","邵阳","南京","苏州","无锡","扬州","常州","徐州","镇江","南通","泰州","连云港","盐城","淮安","宿迁"].contains(c)){ +// if(["涓婃捣","鍖椾含","骞垮窞","娣卞湷","鎴愰兘","鏉窞","澶╂触","瑗垮畨","鍗椾含","娌堥槼","閲嶅簡","姝︽眽","鐭冲搴�","绂忓窞","瀹佹尝","璐甸槼","鎬�鍖�","閮村窞","鐩婇槼","姘稿窞","濞勫簳","婀樿タ","闀挎矙","甯稿痉","鏍床","宀抽槼","琛¢槼","婀樻江","寮犲鐣�","閭甸槼","鍗椾含","鑻忓窞","鏃犻敗","鎵窞","甯稿窞","寰愬窞","闀囨睙","鍗楅��","娉板窞","杩炰簯娓�","鐩愬煄","娣畨","瀹胯縼"].contains(c)){ if(existCities.contains(c)){ continue; } index++ -// if(!["三明","宁德","泉州","厦门","福州","漳州","南平","龙岩","莆田","重庆"].contains(c)){ +// if(!["涓夋槑","瀹佸痉","娉夊窞","鍘﹂棬","绂忓窞","婕冲窞","鍗楀钩","榫欏博","鑾嗙敯","閲嶅簡"].contains(c)){ def ret1 = updating(c, "district") def ret2 = updating(c, "office") def ret3 = updating(c, "shop") // } -// if(["三明","宁德","泉州","厦门","福州","漳州","南平","龙岩","莆田","重庆"].contains(c)) { +// if(["涓夋槑","瀹佸痉","娉夊窞","鍘﹂棬","绂忓窞","婕冲窞","鍗楀钩","榫欏博","鑾嗙敯","閲嶅簡"].contains(c)) { def ret4 = poiData(c) // } @@ -105,7 +105,7 @@ class SuggestionDataSynch extends BaseBatch{ allRets.addAll(ret4) saveToMG(c, allRets) - println index + " " + c + " 完成 "+ allRets.size() + println index + " " + c + " 瀹屾垚 "+ allRets.size() } } @@ -164,7 +164,7 @@ class SuggestionDataSynch extends BaseBatch{ keys << key def map = createData(dist) - //往100 上同步 + //寰�100 涓婂悓姝� // updateData(map) rets << map println city +" "+cat +" "+totalCount.get() +"/"+dists.size()+" "+dist.name+" "+map.id @@ -199,7 +199,7 @@ class SuggestionDataSynch extends BaseBatch{ map.region = distData.district }else{ map.region = dist.region - println dist.city +" "+dist.region+" 民政部中没有找到相应的区域全称" + println dist.city +" "+dist.region+" 姘戞斂閮ㄤ腑娌℃湁鎵惧埌鐩稿簲鐨勫尯鍩熷叏绉�" } map.name = dist.name @@ -304,7 +304,7 @@ class SuggestionDataSynch extends BaseBatch{ } } println map.township - //往100 上同步 + //寰�100 涓婂悓姝� // updateData(map) rets << map println dist.city +" "+totalCount.get() +"/"+results.size()+" "+dist.name+" "+map.id @@ -353,18 +353,18 @@ class SuggestionDataSynch extends BaseBatch{ def retMap = [:] for(def d : dbcursor){ def fjwcity = null - if(d.level == "城市"){ + if(d.level == "鍩庡競"){ fjwcity = RegionData.formatCity(d.city) if(!fjwcity){ - if(d.city == "市辖区"){ + if(d.city == "甯傝緰鍖�"){ fjwcity = RegionData.formatCity(d.province) if(fjwcity){ d.city = d.province } } } - }else if(d.level == "区域"){ - if(d.administer == "省直辖县级行政区划"){ + }else if(d.level == "鍖哄煙"){ + if(d.administer == "鐪佺洿杈栧幙绾ц鏀垮尯鍒�"){ fjwcity = RegionData.formatCity(d.city) if(fjwcity){ d.city = d.district @@ -374,7 +374,7 @@ class SuggestionDataSynch extends BaseBatch{ if(fjwcity){ retMap.put(fjwcity, d) }else{ - println d.toString() +" 格式化不成功!" + println d.toString() +" 鏍煎紡鍖栦笉鎴愬姛锛�" } } return retMap; @@ -384,13 +384,13 @@ class SuggestionDataSynch extends BaseBatch{ def queryDistNameCity(){ def q = new BasicDBObject() - q.put("level","区域") + q.put("level","鍖哄煙") def dbcursor = administrative_division_100_CONN.find(q) def retMap = [:] for(def d : dbcursor){ - if(d.city == "省直辖县级行政区划"){ + if(d.city == "鐪佺洿杈栧幙绾ц鏀垮尯鍒�"){ continue - }else if(d.city == "市辖区"){ + }else if(d.city == "甯傝緰鍖�"){ def fjwcity = RegionData.formatCity(d.province) if(fjwcity){ def fjwdist = RegionData.formatRegion(fjwcity, d.district) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/XiaMenVillageBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/XiaMenVillageBatch.groovy index 2a697daf6..ec5d0d3dc 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/XiaMenVillageBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/XiaMenVillageBatch.groovy @@ -8,7 +8,7 @@ import com.fangjia.script.util.DateUtil import com.fangjia.script.util.ExcelUtils /** - * 厦门每月月初自动跑涉农数据 + * 鍘﹂棬姣忔湀鏈堝垵鑷姩璺戞秹鍐滄暟鎹� */ @BatchOwner(Watcher.GaoJuan) class XiaMenVillageBatch extends BaseBatch{ @@ -23,22 +23,22 @@ class XiaMenVillageBatch extends BaseBatch{ def monthStr = DateUtil.formatByPattern(new Date(), "yyyy-MM"); def outFileName = "xmbank_"+monthStr+"_result.xlsx" def inFileName = "xmbank_"+monthStr+".xlsx" - println "输入文件:"+inFileName+" 输出文件:"+outFileName + println "杈撳叆鏂囦欢锛�"+inFileName+" 杈撳嚭鏂囦欢锛�"+outFileName def exists = checkFileExists(outFileName) if(!exists){ def inExists = checkInFileExists(inFileName) if(inExists){ def rows = [] - rows << ["序号","地址","判定后涉农组织类型(城市企业[不含县城企业]、农村企业、县城企业)","所属工业园区或经济开发区"] + rows << ["搴忓彿","鍦板潃","鍒ゅ畾鍚庢秹鍐滅粍缁囩被鍨嬶紙鍩庡競浼佷笟[涓嶅惈鍘垮煄浼佷笟]銆佸啘鏉戜紒涓氥�佸幙鍩庝紒涓氾級","鎵�灞炲伐涓氬洯鍖烘垨缁忔祹寮�鍙戝尯"] def rets = XmBankVillageFtpUtils.readExcelFile(inFileName) if(rets){ for(def row : rets){ if(row[1]){ def dto = OpenApiUtils.addrVerifyXiameng(null, row[1], 2) if(dto){ - row[2] = dto.addrArea //所属区域 农村区域 城市区域 县城城区(对公) + row[2] = dto.addrArea //鎵�灞炲尯鍩� 鍐滄潙鍖哄煙 鍩庡競鍖哄煙 鍘垮煄鍩庡尯(瀵瑰叕) if(dto.devDistrictName){ - row[3] = dto.devDistrictName//开发区 + row[3] = dto.devDistrictName//寮�鍙戝尯 }else{ row[3] = "" } @@ -49,16 +49,16 @@ class XiaMenVillageBatch extends BaseBatch{ } } uploadExcel(rows, outFileName) - println "新增文件,上传已完成 "+DateUtil.formatByPattern(new Date(), "yyyy-MM-dd HH:mm:ss") + println "鏂板鏂囦欢锛屼笂浼犲凡瀹屾垚 "+DateUtil.formatByPattern(new Date(), "yyyy-MM-dd HH:mm:ss") println "*******************************************************************************************" }else{ - println "输入${inFileName}文件不存在,待客户上传 "+DateUtil.formatByPattern(new Date(), "yyyy-MM-dd HH:mm:ss") + println "杈撳叆${inFileName}鏂囦欢涓嶅瓨鍦紝寰呭鎴蜂笂浼� "+DateUtil.formatByPattern(new Date(), "yyyy-MM-dd HH:mm:ss") println "*******************************************************************************************" } }else{ - println "已存在 "+ DateUtil.formatByPattern(new Date(), "yyyy-MM-dd HH:mm:ss") + println "宸插瓨鍦� "+ DateUtil.formatByPattern(new Date(), "yyyy-MM-dd HH:mm:ss") println "*******************************************************************************************" } @@ -66,19 +66,19 @@ class XiaMenVillageBatch extends BaseBatch{ static boolean uploadExcel(def data, String fileName, String sheetName = "Sheet1") { if (data == null || data.isEmpty()) { - println "数据为空,无法生成Excel" + println "鏁版嵁涓虹┖锛屾棤娉曠敓鎴怑xcel" return false } try { - // 1. 生成Excel内容 + // 1. 鐢熸垚Excel鍐呭 byte[] excelBytes = ExcelUtils.createExcelBytes(data, sheetName) - // 2. 上传到服务器 + // 2. 涓婁紶鍒版湇鍔″櫒 return XmBankVillageFtpUtils.uploadExcelBytes(excelBytes, fileName) } catch (Exception e) { - println "生成并上传Excel失败: ${e.message}" + println "鐢熸垚骞朵笂浼燛xcel澶辫触: ${e.message}" e.printStackTrace() return false } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/XmBankFtpUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/XmBankFtpUtils.groovy index 5de2c1f4a..510e15855 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/XmBankFtpUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/XmBankFtpUtils.groovy @@ -21,7 +21,7 @@ class XmBankFtpUtils { static def ftpUpload(outputPath_dist, month){ - //上传到ftp + //涓婁紶鍒癴tp sftpChannel = reConnect(); sftp.upload(ftpPath, outputPath_dist, sftpChannel); @@ -30,33 +30,33 @@ class XmBankFtpUtils { static def reConnect(){ if(sftpChannel == null){ - println "sftpChannel 为空,需重连....." + println "sftpChannel 涓虹┖锛岄渶閲嶈繛....." if(sftp == null){ sftp = new SFTP(); } sftpChannel = sftp.connect(ftpServer, ftpPort, ftpUser, ftpPassword); }else{ - println "sftpChannel 正常....." + println "sftpChannel 姝e父....." } return sftpChannel; } static def uploadSha512Data(def sb, def dataCodeFileName, def charset){ - String sha512HexStr= DigestUtils.sha512Hex(sb.getBytes())//生成加密码码 - DataHandleUtils.outPutFile(dataCodeFileName, sha512HexStr,charset);//生成加密码文件 - ftpUpload(dataCodeFileName)//上传加密码文件到FTP + String sha512HexStr= DigestUtils.sha512Hex(sb.getBytes())//鐢熸垚鍔犲瘑鐮佺爜 + DataHandleUtils.outPutFile(dataCodeFileName, sha512HexStr,charset);//鐢熸垚鍔犲瘑鐮佹枃浠� + ftpUpload(dataCodeFileName)//涓婁紶鍔犲瘑鐮佹枃浠跺埌FTP } static def uploadSha512Data2(def dataFileName, def dataCodeFileName, def charset){ def data = new FileInputStream(new File(dataFileName)) - String sha512HexStr= DigestUtils.sha512Hex(data)//生成加密码码 - DataHandleUtils.outPutFile(dataCodeFileName, sha512HexStr,charset);//生成加密码文件 - ftpUpload(dataCodeFileName)//上传加密码文件到FTP + String sha512HexStr= DigestUtils.sha512Hex(data)//鐢熸垚鍔犲瘑鐮佺爜 + DataHandleUtils.outPutFile(dataCodeFileName, sha512HexStr,charset);//鐢熸垚鍔犲瘑鐮佹枃浠� + ftpUpload(dataCodeFileName)//涓婁紶鍔犲瘑鐮佹枃浠跺埌FTP } static def listFileNames(month){ - //上传到ftp + //涓婁紶鍒癴tp sftpChannel = reConnect(); Vector files = sftp.listFiles(ftpPath+ month+"/", sftpChannel); return files diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/XmBankVillageFtpUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/XmBankVillageFtpUtils.groovy index 3f43e236e..4c99bb6d3 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/XmBankVillageFtpUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/XmBankVillageFtpUtils.groovy @@ -26,7 +26,7 @@ class XmBankVillageFtpUtils { static def ftpUpload(outputPath_dist, month){ - //上传到ftp + //涓婁紶鍒癴tp sftpChannel = reConnect(); sftp.upload(ftpPath, outputPath_dist, sftpChannel); @@ -35,13 +35,13 @@ class XmBankVillageFtpUtils { static def reConnect(){ if(sftpChannel == null){ - println "sftpChannel 为空,需重连....." + println "sftpChannel 涓虹┖锛岄渶閲嶈繛....." if(sftp == null){ sftp = new SFTP(); } sftpChannel = sftp.connect(ftpServer, ftpPort, ftpUser, ftpPassword); }else{ - println "sftpChannel 正常....." + println "sftpChannel 姝e父....." } return sftpChannel; } @@ -49,14 +49,14 @@ class XmBankVillageFtpUtils { static def listOutFileNames(){ - //上传到ftp + //涓婁紶鍒癴tp sftpChannel = reConnect(); Vector files = sftp.listFiles(ftpPath+"/", sftpChannel); return files } static def listInFileNames(){ - //上传到ftp + //涓婁紶鍒癴tp sftpChannel = reConnect(); Vector files = sftp.listFiles(ftpInPath+"/", sftpChannel); return files @@ -71,17 +71,17 @@ class XmBankVillageFtpUtils { static def readExcelFile(String fileName) { sftpChannel = reConnect() try { - // 构建完整的远程路径 + // 鏋勫缓瀹屾暣鐨勮繙绋嬭矾寰� String fullRemotePath = ftpInPath + "/"+fileName - println "开始读取Excel文件: ${fullRemotePath}" - // 从SFTP服务器获取文件流 + println "寮�濮嬭鍙朎xcel鏂囦欢: ${fullRemotePath}" + // 浠嶴FTP鏈嶅姟鍣ㄨ幏鍙栨枃浠舵祦 InputStream inputStream = sftpChannel.get(fullRemotePath) def excelData = ExcelUtils.readFromStream(inputStream, 0, 1) - println "Excel共有 ${excelData.size()} 行数据" + println "Excel鍏辨湁 ${excelData.size()} 琛屾暟鎹�" inputStream.close() return excelData } catch (Exception e) { - println "读取Excel文件失败: ${e.message}" + println "璇诲彇Excel鏂囦欢澶辫触: ${e.message}" e.printStackTrace() return null } @@ -89,36 +89,36 @@ class XmBankVillageFtpUtils { /** - * 上传Excel字节数组到服务器 - * @param excelBytes Excel字节数组 - * @param fileName 文件名 - * @return 上传是否成功 + * 涓婁紶Excel瀛楄妭鏁扮粍鍒版湇鍔″櫒 + * @param excelBytes Excel瀛楄妭鏁扮粍 + * @param fileName 鏂囦欢鍚� + * @return 涓婁紶鏄惁鎴愬姛 */ private static boolean uploadExcelBytes(byte[] excelBytes, String fileName) { sftpChannel = reConnect() try { - // 构建完整的远程路径 + // 鏋勫缓瀹屾暣鐨勮繙绋嬭矾寰� String remoteFilePath = "${ftpPath}/${fileName}" - println "开始上传Excel文件到: ${remoteFilePath}" - println "文件大小: ${excelBytes.length} 字节" + println "寮�濮嬩笂浼燛xcel鏂囦欢鍒�: ${remoteFilePath}" + println "鏂囦欢澶у皬: ${excelBytes.length} 瀛楄妭" - // 将字节数组转换为输入流 + // 灏嗗瓧鑺傛暟缁勮浆鎹负杈撳叆娴� InputStream inputStream = new ByteArrayInputStream(excelBytes) - // 上传文件 + // 涓婁紶鏂囦欢 sftpChannel.put(inputStream, remoteFilePath) - // 关闭流 + // 鍏抽棴娴� inputStream.close() - println "Excel文件上传成功: ${remoteFilePath}" + println "Excel鏂囦欢涓婁紶鎴愬姛: ${remoteFilePath}" return true } catch (Exception e) { - println "上传Excel文件失败: ${e.message}" + println "涓婁紶Excel鏂囦欢澶辫触: ${e.message}" e.printStackTrace() return false } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/zhongshu/DistrictArrountOffice.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/zhongshu/DistrictArrountOffice.groovy index 34a98e33d..d805b7bb4 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/zhongshu/DistrictArrountOffice.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/zhongshu/DistrictArrountOffice.groovy @@ -13,9 +13,9 @@ class DistrictArrountOffice { } def run(){ - def dataMap = ["北京":"116.481075,39.996743", "烟台":"121.438616,37.459645"] + def dataMap = ["鍖椾含":"116.481075,39.996743", "鐑熷彴":"121.438616,37.459645"] def rets = [] - rets << ["城市","区域","名称","地址","经度","纬度","写字楼等级","租金(起)","租金(止)", "价格来源"] + rets << ["鍩庡競","鍖哄煙","鍚嶇О","鍦板潃","缁忓害","绾害","鍐欏瓧妤肩瓑绾�","绉熼噾(璧�)","绉熼噾(姝�)", "浠锋牸鏉ユ簮"] dataMap.each {k,v-> def locations = v.split(",") def arroundOffices = CommonDatautils.getSeaweedArroundByCat(k, locations[0], locations[1], "office") @@ -48,7 +48,7 @@ class DistrictArrountOffice { } } } - ExcelUtils.write("d:\\数据\\写字楼测试-1118.xlsx", rets, "数据") + ExcelUtils.write("d:\\鏁版嵁\\鍐欏瓧妤兼祴璇�-1118.xlsx", rets, "鏁版嵁") } @@ -99,7 +99,7 @@ class DistrictArrountOffice { map.put("avg_end_price", avg_end_price) } if(map){ - map.source = "非房源" + map.source = "闈炴埧婧�" } return map } @@ -126,7 +126,7 @@ class DistrictArrountOffice { map.put("avg_end_price", avg_end_price) } if(map){ - map.source = "房源" + map.source = "鎴挎簮" } return map } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/grade/ConsumptionRatingBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/grade/ConsumptionRatingBatch.groovy index 43fd17c7d..d78f75349 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/grade/ConsumptionRatingBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/grade/ConsumptionRatingBatch.groovy @@ -78,8 +78,8 @@ class ConsumptionRatingBatch extends BaseBatch { void process(Object args) { def allCity = CommonUtils.findAllCity() int i = 0; - //grade("杭州"); - //supplement("上海"); + //grade("鏉窞"); + //supplement("涓婃捣"); println("end==========================================") //return; allCity.each { def city -> @@ -99,9 +99,9 @@ class ConsumptionRatingBatch extends BaseBatch { return 0; } - //男女性消费 + //鐢峰コ鎬ф秷璐� Double sexesGrade = districtGrade.district_hairdressing_grade * 0.5 + districtGrade.district_cosmetologyspa_grade * 0.5; - //亲子 + //浜插瓙 Double parentingGrade = districtGrade.district_nurseries_grade * 0.3 + districtGrade.district_early_grade * 0.3 + districtGrade.district_moonclub_grade * 0.4 double total = formatDouble1(districtGrade.district_avgprice_grade == null ? 0 : districtGrade.district_avgprice_grade * 0.65 + sexesGrade * 0.1 + districtGrade.district_petshop_grade * 0.05 + @@ -152,67 +152,67 @@ class ConsumptionRatingBatch extends BaseBatch { def region_avgScoreMap = [:] - //平均分 + //骞冲潎鍒� - //房价 + //鎴夸环 Double region_housing_avgScore = 0; - //美发 + //缇庡彂 Double region_hairdressing_avgScore = 0; - //美容SPA + //缇庡SPA Double region_cosmetologyspa_avgScore = 0; - //宠物店 + //瀹犵墿搴� Double region_petshop_avgScore = 0; - //中医店 + //涓尰搴� Double region_tcmshop_avgScore = 0; - //托班托儿所 + //鎵樼彮鎵樺効鎵� Double region_nurseries_avgScore = 0; - //早教中心 + //鏃╂暀涓績 Double region_early_avgScore = 0; - //月子会所 + //鏈堝瓙浼氭墍 Double region_moonclub_avgScore = 0; - //小吃快餐 + //灏忓悆蹇 Double region_snack_avgScore = 0; - // 水果生鲜 + // 姘存灉鐢熼矞 Double region_fresh_avgScore = 0; - //房价 + //鎴夸环 Double city_housing_avgScore = 0; - //男女性 - //美发 + //鐢峰コ鎬� + //缇庡彂 Double city_hairdressing_avgScore = 0; - //美容SPA + //缇庡SPA Double city_cosmetologyspa_avgScore = 0; - //宠物店 + //瀹犵墿搴� Double city_petshop_avgScore = 0; - //中医店 + //涓尰搴� Double city_tcmshop_avgScore = 0; - //托班托儿所 + //鎵樼彮鎵樺効鎵� Double city_nurseries_avgScore = 0; - //早教中心 + //鏃╂暀涓績 Double city_early_avgScore = 0; - //月子会所 + //鏈堝瓙浼氭墍 Double city_moonclub_avgScore = 0; - //小吃快餐 + //灏忓悆蹇 Double city_snack_avgScore = 0; - // 水果生鲜 + // 姘存灉鐢熼矞 Double city_fresh_avgScore = 0; @@ -721,7 +721,7 @@ class ConsumptionRatingBatch extends BaseBatch { int size = stats.size() Double region_avgScore = 0; rank_++; - //区域排名 + //鍖哄煙鎺掑悕 if (regionScores.get(dbo.region) == null) { def regionPrices = regionInfoMap.get(dbo.region) def re_totals = 0 @@ -729,7 +729,7 @@ class ConsumptionRatingBatch extends BaseBatch { re -> re_totals = re_totals + re.totalScore } - //该区域楼盘平均评分 + //璇ュ尯鍩熸ゼ鐩樺钩鍧囪瘎鍒� region_avgScore = formatDouble1(re_totals / regionPrices.size()); regionScores.put(dbo.region, region_avgScore) } else { @@ -749,16 +749,16 @@ class ConsumptionRatingBatch extends BaseBatch { def static String paiming(def size, def i) { if (i <= size * 0.25) { - return "前25%"; + return "鍓�25%"; } else if (i > size * 0.25 && i <= size * 0.5) { - return "前50%" + return "鍓�50%" } else if (i > size * 0.5 && i <= size * 0.75) { - return "前75%" + return "鍓�75%" } else if (i > size * 0.75 && i <= size * 1) { - return "后25%" + return "鍚�25%" } @@ -786,24 +786,24 @@ class ConsumptionRatingBatch extends BaseBatch { List snack_counts = new Vector<>(); List fresh_counts = new Vector<>(); - //美发 - def tyoecodes_hairdressing = ["美发"]; - //美容SPA - def tyoecodes_cosmetologyspa = ["美容/SPA"]; - //宠物店 - def tyoecodes_petshop = ["宠物店"]; - //中医店 + //缇庡彂 + def tyoecodes_hairdressing = ["缇庡彂"]; + //缇庡SPA + def tyoecodes_cosmetologyspa = ["缇庡/SPA"]; + //瀹犵墿搴� + def tyoecodes_petshop = ["瀹犵墿搴�"]; + //涓尰搴� def tyoecodes_tcmshop = []; - //托班托儿所 - def tyoecodes_nurseries = ["托班/托儿所"]; - //早教中心 - def tyoecodes_early = ["早教中心"]; - //月子会所 - def tyoecodes_moonclub = ["月子会所"]; - //小吃快餐 - def tyoecodes_snack = ["小吃", "小吃快餐", "快餐简餐"]; - // 水果生鲜 - def tyoecodes_fresh = ["水果生鲜"]; + //鎵樼彮鎵樺効鎵� + def tyoecodes_nurseries = ["鎵樼彮/鎵樺効鎵�"]; + //鏃╂暀涓績 + def tyoecodes_early = ["鏃╂暀涓績"]; + //鏈堝瓙浼氭墍 + def tyoecodes_moonclub = ["鏈堝瓙浼氭墍"]; + //灏忓悆蹇 + def tyoecodes_snack = ["灏忓悆", "灏忓悆蹇", "蹇绠�椁�"]; + // 姘存灉鐢熼矞 + def tyoecodes_fresh = ["姘存灉鐢熼矞"]; DbUtils.multiThreadingExecuteQueryOnSeaweed(DbUtils.buildSeaweedQuery(city), { BasicDBObject district -> @@ -819,56 +819,56 @@ class ConsumptionRatingBatch extends BaseBatch { List tempdbs = searchPoi(district.lat, district.lng, "", 700); Integer hairdressing_count = 0; - //美容SPA + //缇庡SPA Integer cosmetologyspa_count = 0; - //宠物店 + //瀹犵墿搴� Integer petshop_count = 0; - //中医店 + //涓尰搴� Integer tcmshop_count = 0; - //托班托儿所 + //鎵樼彮鎵樺効鎵� Integer nurseries_count = 0; - //早教中心 + //鏃╂暀涓績 Integer early_count = 0; - //月子会所 + //鏈堝瓙浼氭墍 Integer moonclub_count = 0; - //小吃快餐 + //灏忓悆蹇 Integer snack_count = 0; - // 水果生鲜 + // 姘存灉鐢熼矞 Integer fresh_count = 0; Double hairdressing_amount = 0; - //美容SPA + //缇庡SPA Double cosmetologyspa_amount = 0; - //宠物店 + //瀹犵墿搴� Double petshop_amount = 0; - //中医店 + //涓尰搴� Double tcmshop_amount = 0; - //托班托儿所 + //鎵樼彮鎵樺効鎵� Double nurseries_amount = 0; - //早教中心 + //鏃╂暀涓績 Double early_amount = 0; - //月子会所 + //鏈堝瓙浼氭墍 Double moonclub_amount = 0; - //小吃快餐 + //灏忓悆蹇 Double snack_amount = 0; - // 水果生鲜 + // 姘存灉鐢熼矞 Double fresh_amount = 0; List ds_hairdressing_amounts_ = new Vector<>(); @@ -1162,7 +1162,7 @@ class ConsumptionRatingBatch extends BaseBatch { Double C = null; Double B = null; BasicDBObject st = ((BasicDBObject) statsMap.get(city_name + "-" + region + "-" + district_name)); - //房价排名 + //鎴夸环鎺掑悕 double district_avgprice_grade = 0; if (st != null) { if (st.avg_price) { @@ -1508,7 +1508,7 @@ class ConsumptionRatingBatch extends BaseBatch { return dbs; } - //线性规划 + //绾挎�ц鍒� def rank(def X, def B, def C, def Vc, def Vb) { if (X == null || B == null || C == null) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/grade/EstateRatingBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/grade/EstateRatingBatch.groovy index fe55404a2..93c1d2ade 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/grade/EstateRatingBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/grade/EstateRatingBatch.groovy @@ -177,7 +177,7 @@ class EstateRatingBatch extends BaseBatch { te++ println("${DateUtil.formatByPattern(new Date(), "yyyy-MM-dd HH:mm:ss")} start poi -------------" + te) List tempdbs = searchPoi(district.lat, district.lng, "", 700) - //周边写字楼 + //鍛ㄨ竟鍐欏瓧妤� per_office_count = findAroundDistrict(district); for (DBObject dbo : tempdbs_km) { def location = (dbo.get("location")) @@ -850,7 +850,7 @@ class EstateRatingBatch extends BaseBatch { X = dbo.get("per_cinema_count"); } - //电影院的分数改成,周边电影院1个7分,两个9分超过两个10分。 + //鐢靛奖闄㈢殑鍒嗘暟鏀规垚锛屽懆杈圭數褰遍櫌1涓�7鍒嗭紝涓や釜9鍒嗚秴杩囦袱涓�10鍒嗐�� if (X == 1) { distance_cinema_grade = 7; } else if (X == 2) { @@ -1082,13 +1082,13 @@ class EstateRatingBatch extends BaseBatch { def estate_type2 = dbo.estate_type2 == null ? "" : dbo.estate_type2; double district_type_of_housing_grade = 0; - if (estate_type2.equals("别墅")) { + if (estate_type2.equals("鍒")) { district_type_of_housing_grade = 10; } - if (estate_type2.equals("普通住宅")) { + if (estate_type2.equals("鏅�氫綇瀹�")) { district_type_of_housing_grade = 7; } - if (estate_type2.equals("商住") || estate_type2.equals("公寓")) { + if (estate_type2.equals("鍟嗕綇") || estate_type2.equals("鍏瘬")) { district_type_of_housing_grade = 5; } @@ -1112,7 +1112,7 @@ class EstateRatingBatch extends BaseBatch { X = 0; } else { X = st.get("ups_acgprice"); - //计算涨跌幅 + //璁$畻娑ㄨ穼骞� def upsanddowns = X; data.put("upsanddowns", X) } @@ -1189,7 +1189,7 @@ class EstateRatingBatch extends BaseBatch { DIST_GRADE_COLL.update(cmd, new BasicDBObject('$set', data), true, false) } - //计算排名 + //璁$畻鎺掑悕 public static void ranking(def city) { def query = new BasicDBObject() @@ -1244,9 +1244,9 @@ class EstateRatingBatch extends BaseBatch { stats.each { BasicDBObject dbo -> i++; - //城市排名 + //鍩庡競鎺掑悕 def city_rank = i - //区域排名 + //鍖哄煙鎺掑悕 def regionPrices = regionPriceMap.get(dbo.region) def id = dbo.get("_id").toString(); def region_rank = 0; @@ -1261,9 +1261,9 @@ class EstateRatingBatch extends BaseBatch { } re_totals = re_totals + re.total } - //该区域楼盘平均评分 + //璇ュ尯鍩熸ゼ鐩樺钩鍧囪瘎鍒� region_avgScore = formatDouble1(re_totals / regionPrices.size()); - //该城市平均评分 + //璇ュ煄甯傚钩鍧囪瘎鍒� if (city_avgScore == null) { Double city_totals = 0; avgPrices.each { city_total -> @@ -1309,7 +1309,7 @@ class EstateRatingBatch extends BaseBatch { districtGrade.distance_sport_grade * 0.2 + districtGrade.distance_metro_grade * 0.25); - //公共配套评分 + //鍏叡閰嶅璇勫垎 Double district_publicmatching_grade = (districtGrade.distance_hospital_grade * 0.2 + districtGrade.distance_park_grade * 0.45 + districtGrade.distance_school_grade * 0.35); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/house/AnsuoHouseSeachBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/house/AnsuoHouseSeachBatch.groovy index 24288a112..a4c7813c1 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/house/AnsuoHouseSeachBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/house/AnsuoHouseSeachBatch.groovy @@ -54,7 +54,7 @@ public class AnsuoHouseSeachBatch extends BaseBatch{ processByCity(city) } - //删除无效数据 + //鍒犻櫎鏃犳晥鏁版嵁 BATCH_COLL.remove(new BasicDBObject("version", new BasicDBObject('$ne', VERSION))) } @@ -168,7 +168,7 @@ public class AnsuoHouseSeachBatch extends BaseBatch{ int c = 0; for (String name : names) { if (StringUtils.isNotBlank(name)) { - if (name.indexOf("(") > -1 || name.indexOf(")") > -1 || name.indexOf("(") > -1 || name.indexOf(")") > -1 + if (name.indexOf("锛�") > -1 || name.indexOf("锛�") > -1 || name.indexOf("(") > -1 || name.indexOf(")") > -1 || name.indexOf("[") > -1 || name.indexOf("]") > -1 || name.indexOf("-") > -1 || name.indexOf("{") > -1 || name.indexOf("~") > -1 || name.indexOf("}") > -1 || name.indexOf("{") > -1 || name.indexOf("}") > -1 || name.indexOf(":") > -1) { @@ -252,11 +252,11 @@ public class AnsuoHouseSeachBatch extends BaseBatch{ if (district.get("build_date") != null || district.get("finish_building_date") != null || district.get("live_date") != null) { int minYear = getBuildYear(district.get("finish_building_date"), district.get("live_date"), district.get("build_date")); if (minYear > 0) { - buildDate = minYear + "年"; + buildDate = minYear + "骞�"; } if (StringUtils.isNotBlank(district.get("property_life")) && getHouseUseYear(minYear, district.get("property_life")) != null) { - remainUseYear = getHouseUseYear(minYear, district.get("property_life")) + "年";// 剩余使用年限 + remainUseYear = getHouseUseYear(minYear, district.get("property_life")) + "骞�";// 鍓╀綑浣跨敤骞撮檺 } } @@ -320,7 +320,7 @@ public class AnsuoHouseSeachBatch extends BaseBatch{ obj.put("direction", "6"); } } - obj.put("publish_date", bo.get("publish_date"));// 发布时间 + obj.put("publish_date", bo.get("publish_date"));// 鍙戝竷鏃堕棿 obj.put("source", getDomainName(bo.get("url"))); obj.put("block", bo.get("block")) if (StringUtils.isBlank(bo.get("build_type"))) { @@ -377,13 +377,13 @@ public class AnsuoHouseSeachBatch extends BaseBatch{ private String getHouseType(DBObject bo) { StringBuilder sb = new StringBuilder(); if (bo.get("room") != null) { - sb.append(bo.get("room") + "室"); + sb.append(bo.get("room") + "瀹�"); } if (bo.get("hall") != null) { - sb.append(bo.get("hall") + "厅"); + sb.append(bo.get("hall") + "鍘�"); } if (bo.get("toilet") != null) { - sb.append(bo.get("toilet") + "卫"); + sb.append(bo.get("toilet") + "鍗�"); } return sb.toString(); } @@ -527,7 +527,7 @@ public class AnsuoHouseSeachBatch extends BaseBatch{ q.put("city", city) q.put("region", region) q.put("district_name", name) - q.put("estate_type", (estateType && estateType.indexOf("别墅") > -1) ? '别墅' : '小区') + q.put("estate_type", (estateType && estateType.indexOf("鍒") > -1) ? '鍒' : '灏忓尯') q.put("weekend", DateUtil.getFirstDayOfWeek(new Date())) DBObject statObj = STAT_COLL.findOne(q) if(statObj == null) { @@ -544,12 +544,12 @@ public class AnsuoHouseSeachBatch extends BaseBatch{ } /** - * 查找周边最相似的楼盘 + * 鏌ユ壘鍛ㄨ竟鏈�鐩镐技鐨勬ゼ鐩� * *
    -     * 相似条件
    -     * |建筑类型(estate_type2)相同或包含
    -     * |建筑年代最多差5年
    +     * 鐩镐技鏉′欢
    +     * |寤虹瓚绫诲瀷(estate_type2)鐩稿悓鎴栧寘鍚�
    +     * |寤虹瓚骞翠唬鏈�澶氬樊5骞�
          * 
    * * @param city @@ -569,7 +569,7 @@ public class AnsuoHouseSeachBatch extends BaseBatch{ Map districtMap = new LinkedHashMap(); - if (year1 == null && year2 == null) {// 如果竣工时间和入住时间都不存在,则直接返回同类型的附近小区 + if (year1 == null && year2 == null) {// 濡傛灉绔e伐鏃堕棿鍜屽叆浣忔椂闂撮兘涓嶅瓨鍦紝鍒欑洿鎺ヨ繑鍥炲悓绫诲瀷鐨勯檮杩戝皬鍖� return new ArrayList(nearestDistricts); } else if (year1 != null && year2 == null) { for (DBObject nd : nearestDistricts) { @@ -591,7 +591,7 @@ public class AnsuoHouseSeachBatch extends BaseBatch{ districtMap.put(nd.get("_id"), nd); } } - } else {// 如果竣工时间和入住时间都存在,则优先选择竣工时间 + } else {// 濡傛灉绔e伐鏃堕棿鍜屽叆浣忔椂闂撮兘瀛樺湪锛屽垯浼樺厛閫夋嫨绔e伐鏃堕棿 for (DBObject nd : nearestDistricts) { Integer y = parseStringToYear(nd.get("finish_building_date")); if (y == null) { @@ -626,7 +626,7 @@ public class AnsuoHouseSeachBatch extends BaseBatch{ /** - * 查找最近的楼盘 + * 鏌ユ壘鏈�杩戠殑妤肩洏 * * @param city * @param region @@ -688,7 +688,7 @@ public class AnsuoHouseSeachBatch extends BaseBatch{ continue; } if (d.get("estate_type2") == null) { - if ("普通住宅".equals(estateType)) { + if ("鏅�氫綇瀹�".equals(estateType)) { ret.add(d); } } @@ -724,7 +724,7 @@ public class AnsuoHouseSeachBatch extends BaseBatch{ } - Pattern PATT = Pattern.compile(".*(\\d{4})[年\\-].*"); + Pattern PATT = Pattern.compile(".*(\\d{4})[骞碶\-].*"); private Integer parseStringToYear(String s) { if (s == null) { return null; @@ -753,37 +753,37 @@ public class AnsuoHouseSeachBatch extends BaseBatch{ } static { - ESTATE_TYPE_CODE.put("普通住宅", "1"); - ESTATE_TYPE_CODE.put("别墅", "2"); - ESTATE_TYPE_CODE.put("商住", "3"); + ESTATE_TYPE_CODE.put("鏅�氫綇瀹�", "1"); + ESTATE_TYPE_CODE.put("鍒", "2"); + ESTATE_TYPE_CODE.put("鍟嗕綇", "3"); - BULIDS_TYPE_CODE.put("多层", "10"); - BULIDS_TYPE_CODE.put("小高层", "11"); - BULIDS_TYPE_CODE.put("超高层", "12"); - BULIDS_TYPE_CODE.put("高层", "13"); - BULIDS_TYPE_CODE.put("花园洋房", "14"); - BULIDS_TYPE_CODE.put("老洋房", "15"); - BULIDS_TYPE_CODE.put("四合院", "16"); - BULIDS_TYPE_CODE.put("独栋", "17"); - BULIDS_TYPE_CODE.put("双拼", "18"); - BULIDS_TYPE_CODE.put("联排", "19"); - BULIDS_TYPE_CODE.put("叠加", "20"); + BULIDS_TYPE_CODE.put("澶氬眰", "10"); + BULIDS_TYPE_CODE.put("灏忛珮灞�", "11"); + BULIDS_TYPE_CODE.put("瓒呴珮灞�", "12"); + BULIDS_TYPE_CODE.put("楂樺眰", "13"); + BULIDS_TYPE_CODE.put("鑺卞洯娲嬫埧", "14"); + BULIDS_TYPE_CODE.put("鑰佹磱鎴�", "15"); + BULIDS_TYPE_CODE.put("鍥涘悎闄�", "16"); + BULIDS_TYPE_CODE.put("鐙爧", "17"); + BULIDS_TYPE_CODE.put("鍙屾嫾", "18"); + BULIDS_TYPE_CODE.put("鑱旀帓", "19"); + BULIDS_TYPE_CODE.put("鍙犲姞", "20"); - DIRECTION_CODE.put("西北", "1"); - DIRECTION_CODE.put("北", "1"); - DIRECTION_CODE.put("东", "2"); - DIRECTION_CODE.put("西", "2"); - DIRECTION_CODE.put("东西", "2"); - DIRECTION_CODE.put("南", "3"); - DIRECTION_CODE.put("东南", "3"); - DIRECTION_CODE.put("南北", "3"); - DIRECTION_CODE.put("东北", "4"); - DIRECTION_CODE.put("西南", "5"); + DIRECTION_CODE.put("瑗垮寳", "1"); + DIRECTION_CODE.put("鍖�", "1"); + DIRECTION_CODE.put("涓�", "2"); + DIRECTION_CODE.put("瑗�", "2"); + DIRECTION_CODE.put("涓滆タ", "2"); + DIRECTION_CODE.put("鍗�", "3"); + DIRECTION_CODE.put("涓滃崡", "3"); + DIRECTION_CODE.put("鍗楀寳", "3"); + DIRECTION_CODE.put("涓滃寳", "4"); + DIRECTION_CODE.put("瑗垮崡", "5"); - FITMENT_CODE.put("毛坯", "1"); - FITMENT_CODE.put("简装", "1"); - FITMENT_CODE.put("精装", "2"); - FITMENT_CODE.put("全装修", "3"); + FITMENT_CODE.put("姣涘澂", "1"); + FITMENT_CODE.put("绠�瑁�", "1"); + FITMENT_CODE.put("绮捐", "2"); + FITMENT_CODE.put("鍏ㄨ淇�", "3"); } } \ No newline at end of file diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/house/DelHouseStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/house/DelHouseStat.groovy index dfcfda72b..8cca8ff6b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/house/DelHouseStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/house/DelHouseStat.groovy @@ -29,7 +29,7 @@ class DelHouseStat { def run(){ def houseIds = findHouseById(61473); - println "共:"+houseIds.size()+" 条房源。" + println "鍏憋細"+houseIds.size()+" 鏉℃埧婧愩��" findHouseDetail(houseIds); } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/house/DelSeabirdHouse.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/house/DelSeabirdHouse.groovy index da636b5e3..89ee28fe5 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/house/DelSeabirdHouse.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/house/DelSeabirdHouse.groovy @@ -10,7 +10,7 @@ class DelSeabirdHouse { DSCollection dataStoreConnection = null static main(args) { def task = new DelSeabirdHouse(); - task.run("北京","office_sell"); + task.run("鍖椾含","office_sell"); } def run(def city, def cat){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/house/DistrictRentHouseStatBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/house/DistrictRentHouseStatBatch.groovy index ac7ec47b4..e9dccc2a4 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/house/DistrictRentHouseStatBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/house/DistrictRentHouseStatBatch.groovy @@ -58,7 +58,7 @@ class DistrictRentHouseStatBatch extends BaseBatch{ } public void process(Object args) { - println "Rent开始时间:"+new Date().toString(); + println "Rent寮�濮嬫椂闂达細"+new Date().toString(); def citys = CommonDatautils.findAllCity(); def index = 0; @@ -71,7 +71,7 @@ class DistrictRentHouseStatBatch extends BaseBatch{ println "[${city} ${index}/${citys.size()}]" +new Date().toString(); } - println "Rent结束时间:"+new Date().toString(); + println "Rent缁撴潫鏃堕棿锛�"+new Date().toString(); } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/house/DistrictSellHouseStatBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/house/DistrictSellHouseStatBatch.groovy index 7f3f4027b..492a6dbc8 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/house/DistrictSellHouseStatBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/house/DistrictSellHouseStatBatch.groovy @@ -33,7 +33,7 @@ class DistrictSellHouseStatBatch extends BaseBatch{ def startDate = DateUtils.truncateDay(DateUtils.getFirstDayOfMonth(new Date(), -1)); def endDate = DateUtils.truncateDay(DateUtils.getLastDayOfMonth(new Date(), -1)); def sDate = DateUtils.formatDateByPattern(startDate, "yyyyMM").toInteger() - println "sell 统计时间:"+sDate; + println "sell 缁熻鏃堕棿锛�"+sDate; calcuate(citys, startDate, endDate, sDate); } @@ -63,9 +63,9 @@ class DistrictSellHouseStatBatch extends BaseBatch{ for(def i=0; i< districts.size() ; i++){ def dist = districts[i]; - def estateType = "小区"; - if(dist.estate_type.indexOf("别墅")>-1){ - estateType = "别墅"; + def estateType = "灏忓尯"; + if(dist.estate_type.indexOf("鍒")>-1){ + estateType = "鍒"; } executorService.submit(new Runnable() { @@ -114,7 +114,7 @@ class DistrictSellHouseStatBatch extends BaseBatch{ ret << udata; if(ret.size()%5000==0){ - println "第 "+(i/5000)+" 个"+ret.size() + println "绗� "+(i/5000)+" 涓�"+ret.size() HOUSE_STAT_COLL.insert(ret); ret = []; } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/house/DuplicateHouseRemover.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/house/DuplicateHouseRemover.groovy index 073058af7..03a7d4b20 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/house/DuplicateHouseRemover.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/house/DuplicateHouseRemover.groovy @@ -18,7 +18,7 @@ import com.mongodb.BasicDBObject import com.mongodb.DBObject /** - * 房源去重任务 + * 鎴挎簮鍘婚噸浠诲姟 * @author yukai * */ @@ -124,7 +124,7 @@ class DuplicateHouseRemover extends BaseBatch { /** - * 物理删除房源 + * 鐗╃悊鍒犻櫎鎴挎簮 */ private void removeHouseByUrl(String url, ObjectId orgId, Date mDate) { DBObject query = new BasicDBObject('url', url); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/house/FixedPointCrawl.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/house/FixedPointCrawl.groovy index 018ac412b..633c9f63c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/house/FixedPointCrawl.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/house/FixedPointCrawl.groovy @@ -19,7 +19,7 @@ import com.mongodb.DBObject import com.fangjia.script.util.MongoUtils /** - * 根据指定没有房源的小区进行定点抓取这些小区的房源 + * 鏍规嵁鎸囧畾娌℃湁鎴挎簮鐨勫皬鍖鸿繘琛屽畾鐐规姄鍙栬繖浜涘皬鍖虹殑鎴挎簮 * @author gaojuan */ @BatchOwner(Watcher.GaoJuan) @@ -42,37 +42,37 @@ public class FixedPointCrawl extends BaseBatch{ long updateCount=0L; private static Map cityMap = new HashMap(){ { - put("鞍山", "anshan"); put("安阳", "anyang"); put("安庆", "anqing"); put("安康", "ankang"); put("安顺", "anshun"); put("阿克苏", "akesu"); put("保定", "bd"); put("北海", "bh"); put("包头", "bt"); put("宝鸡", "baoji"); - put("滨州", "binzhou"); put("蚌埠", "bengbu"); put("本溪", "benxi"); put("白城", "baicheng"); put("亳州", "bozhou"); put("保山", "baoshan"); put("巴中", "bazhong"); put("白山", "baishan"); put("白银", "baiyin"); put("百色", "baise"); - put("毕节", "bijie"); put("重庆", "cq"); put("成都", "cd"); put("长沙", "cs"); put("长春", "changchun"); put("常州", "cz"); put("常熟", "changshu"); put("郴州", "chenzhou"); put("承德", "chengde"); put("长治", "changzhi"); - put("楚雄", "chuxiong"); put("朝阳", "chaoyang"); put("巢湖", "chaohu"); put("池州", "chizhou"); put("滁州", "chuzhou"); put("沧州", "cangzhou"); put("潮州", "chaozhou"); put("崇左", "chongzuo"); put("常德", "changde"); put("昌吉", "changji"); - put("大连", "dl"); put("东莞", "dg"); put("东营", "dy"); put("德州", "dz"); put("大庆", "daqing"); put("丹东", "dandong"); put("大同", "datong"); put("大理", "dali"); put("德宏", "dehong"); put("达州", "dazhou"); - put("德阳", "deyang"); put("定西", "dingxi"); put("鄂尔多斯", "erds"); put("恩施", "enshi"); put("鄂州", "ezhou"); put("佛山", "fs"); put("福州", "fz"); put("抚顺", "fushun"); put("阜阳", "fuyang"); put("阜新", "fuxin"); - put("抚州", "jxfuzhou"); put("防城港", "fangchenggang"); put("涪陵", "fuling"); put("广州", "gz"); put("贵阳", "gy"); put("桂林", "guilin"); put("赣州", "ganzhou"); put("贵港", "guigang"); put("固原", "guyuan"); put("广安", "guangan"); - put("广元", "guangyuan"); put("杭州", "hz"); put("哈尔滨", "hrb"); put("海南", "hn"); put("合肥", "hf"); put("呼和浩特", "nm"); put("惠州", "huizhou"); put("衡水", "hs"); put("邯郸", "hd"); put("淮安", "huaian"); - put("菏泽", "heze"); put("湖州", "huzhou"); put("衡阳", "hengyang"); put("汉中", "hanzhong"); put("黄石", "huangshi"); put("怀化", "huaihua"); put("黄冈", "huanggang"); put("河池", "hechi"); put("红河", "honghe"); put("鹤岗", "hegang"); - put("鹤壁", "hebi"); put("淮南", "huainan"); put("淮北", "huaibei"); put("黄山", "huangshan"); put("葫芦岛", "huludao"); put("河源", "heyuan"); put("贺州", "hezhou"); put("黑河", "heihe"); put("合川", "hechuan"); put("济南", "jn"); - put("吉林", "jl"); put("嘉兴", "jx"); put("江门", "jm"); put("金华", "jh"); put("晋城", "jc"); put("江阴", "jy"); put("九江", "jiujiang"); put("济宁", "jining"); put("揭阳", "jieyang"); put("焦作", "jiaozuo"); - put("荆州", "jingzhou"); put("佳木斯", "jiamusi"); put("鸡西", "jixi"); put("吉安", "jian"); put("金昌", "jinchang"); put("晋中", "jinzhong"); put("锦州", "jinzhou"); put("景德镇", "jingdezhen"); put("荆门", "jingmen"); put("嘉峪关", "jiayuguan"); - put("酒泉", "jiuquan"); put("昆明", "km"); put("昆山", "ks"); put("克拉玛依", "kelamayi"); put("开封", "kaifeng"); put("兰州", "lz"); put("洛阳", "ly"); put("廊坊", "lf"); put("丽水", "ls"); put("连云港", "lyg"); - put("柳州", "liuzhou"); put("聊城", "lc"); put("临沂", "linyi"); put("乐山", "leshan"); put("吕梁", "lvliang"); put("辽阳", "liaoyang"); put("辽源", "liaoyuan"); put("临汾", "linfen"); put("龙岩", "longyan"); put("漯河", "luohe"); - put("泸州", "luzhou"); put("丽江", "lijiang"); put("六安", "luan"); put("莱芜", "laiwu"); put("临沧", "lincang"); put("凉山", "liangshan"); put("陇南", "longnan"); put("来宾", "laibin"); put("六盘水", "liupanshui"); put("娄底", "loudi"); - put("绵阳", "mianyang"); put("马鞍山", "mas"); put("茂名", "maoming"); put("牡丹江", "mudanjiang"); put("梅州", "meizhou"); put("眉山", "meishan"); put("南京", "nanjing"); put("南昌", "nc"); put("南宁", "nn"); put("宁波", "nb"); - put("南通", "nt"); put("南阳", "nanyang"); put("内江", "neijiang"); put("南充", "nanchong"); put("宁德", "ningde"); put("南平", "nanping"); put("平顶山", "pingdingshan"); put("盘锦", "panjin"); put("萍乡", "pingxiang"); put("平凉", "pingliang"); - put("濮阳", "puyang"); put("攀枝花", "panzhihua"); put("莆田", "putian"); put("普洱", "puer"); put("青岛", "qd"); put("秦皇岛", "qhd"); put("清远", "qingyuan"); put("泉州", "qz"); put("齐齐哈尔", "qiqihaer"); put("衢州", "quzhou"); - put("钦州", "qinzhou"); put("曲靖", "qujing"); put("黔东南", "qiandongnan"); put("庆阳", "qingyang"); put("黔南", "qiannan"); put("黔西南", "qianxinan"); put("七台河", "qitaihe"); put("綦江", "qijiang"); put("日照", "rz"); put("上海", "sh"); - put("深圳", "sz"); put("苏州", "suzhou"); put("沈阳", "sy"); put("石家庄", "sjz"); put("三亚", "sanya"); put("绍兴", "shaoxing"); put("汕头", "st"); put("顺德", "shunde"); put("宿迁", "sq"); put("宿州", "ahsuzhou"); - put("十堰", "shiyan"); put("三明", "sanming"); put("韶关", "shaoguan"); put("商丘", "shangqiu"); put("绥化", "suihua"); put("邵阳", "shaoyang"); put("松原", "songyuan"); put("三门峡", "sanmenxia"); put("汕尾", "shanwei"); put("随州", "suizhou"); - put("遂宁", "suining"); put("商洛", "shangluo"); put("朔州", "shuozhou"); put("石嘴山", "shizuishan"); put("上饶", "shangrao"); put("四平", "siping"); put("双鸭山", "shuangyashan"); put("石河子", "shihezi"); put("天津", "tj"); put("太原", "taiyuan"); - put("唐山", "ts"); put("泰州", "taizhou"); put("台州", "tz"); put("太仓", "tc"); put("泰安", "taian"); put("铁岭", "tieling"); put("天水", "tianshui"); put("铜川", "tongchuan"); put("通化", "tonghua"); put("铜陵", "tongling"); - put("铜仁", "tongren"); put("武汉", "wuhan"); put("无锡", "wuxi"); put("威海", "weihai"); put("潍坊", "wf"); put("温州", "wz"); put("吴江", "wj"); put("乌鲁木齐", "xj"); put("芜湖", "wuhu"); put("梧州", "wuzhou"); - put("渭南", "weinan"); put("文山", "wenshan"); put("吴忠", "wuzhong"); put("武威", "wuwei"); put("万州", "wanzhou"); put("西安", "xian"); put("厦门", "xm"); put("徐州", "xz"); put("西宁", "xn"); put("湘潭", "xt"); - put("新乡", "xx"); put("襄阳", "xiangyang"); put("邢台", "xingtai"); put("孝感", "xiaogan"); put("许昌", "xuchang"); put("忻州", "xinzhou"); put("宣城", "xuancheng"); put("西双版纳", "xishuangbanna"); put("咸阳", "xianyang"); put("信阳", "xinyang"); - put("新余", "xinyu"); put("湘西", "xiangxi"); put("咸宁", "xianning"); put("烟台", "yt"); put("扬州", "yz"); put("宜昌", "yc"); put("银川", "yinchuan"); put("玉林", "yl"); put("营口", "yk"); put("延安", "yanan"); - put("盐城", "yancheng"); put("岳阳", "yueyang"); put("延边", "yanbian"); put("鹰潭", "yingtan"); put("玉溪", "yuxi"); put("宜春", "yichun"); put("榆林", "sxyulin"); put("宜宾", "yibin"); put("永州", "yongzhou"); put("阳江", "yangjiang"); - put("阳泉", "yangquan"); put("雅安", "yaan"); put("益阳", "yiyang"); put("云浮", "yunfu"); put("伊春", "hljyichun"); put("运城", "yuncheng"); put("宜兴", "yixing"); put(" 永川", "yongchuan"); put("郑州", "zz"); put("珠海", "zh"); - put("中山", "zs"); put("镇江", "zhenjiang"); put("湛江", "zj"); put("株洲", "zhuzhou"); put("淄博", "zb"); put("舟山", "zhoushan"); put("张家港", "zjg"); put("张家口", "zhangjiakou"); put("漳州", "zhangzhou"); put("肇庆", "zhaoqing"); - put("枣庄", "zaozhuang"); put("周口", "zhoukou"); put("驻马店", "zhumadian"); put("自贡", "zigong"); put("张家界", "zhangjiajie"); put("资阳", "ziyang"); put("遵义", "zunyi"); put("昭通", "zhaotong"); put("中卫", "zhongwei"); put("张掖", "zhangye"); + put("闉嶅北", "anshan"); put("瀹夐槼", "anyang"); put("瀹夊簡", "anqing"); put("瀹夊悍", "ankang"); put("瀹夐『", "anshun"); put("闃垮厠鑻�", "akesu"); put("淇濆畾", "bd"); put("鍖楁捣", "bh"); put("鍖呭ご", "bt"); put("瀹濋浮", "baoji"); + put("婊ㄥ窞", "binzhou"); put("铓屽煚", "bengbu"); put("鏈邯", "benxi"); put("鐧藉煄", "baicheng"); put("浜冲窞", "bozhou"); put("淇濆北", "baoshan"); put("宸翠腑", "bazhong"); put("鐧藉北", "baishan"); put("鐧介摱", "baiyin"); put("鐧捐壊", "baise"); + put("姣曡妭", "bijie"); put("閲嶅簡", "cq"); put("鎴愰兘", "cd"); put("闀挎矙", "cs"); put("闀挎槬", "changchun"); put("甯稿窞", "cz"); put("甯哥啛", "changshu"); put("閮村窞", "chenzhou"); put("鎵垮痉", "chengde"); put("闀挎不", "changzhi"); + put("妤氶泟", "chuxiong"); put("鏈濋槼", "chaoyang"); put("宸㈡箹", "chaohu"); put("姹犲窞", "chizhou"); put("婊佸窞", "chuzhou"); put("娌у窞", "cangzhou"); put("娼窞", "chaozhou"); put("宕囧乏", "chongzuo"); put("甯稿痉", "changde"); put("鏄屽悏", "changji"); + put("澶ц繛", "dl"); put("涓滆帪", "dg"); put("涓滆惀", "dy"); put("寰峰窞", "dz"); put("澶у簡", "daqing"); put("涓逛笢", "dandong"); put("澶у悓", "datong"); put("澶х悊", "dali"); put("寰峰畯", "dehong"); put("杈惧窞", "dazhou"); + put("寰烽槼", "deyang"); put("瀹氳タ", "dingxi"); put("閯傚皵澶氭柉", "erds"); put("鎭╂柦", "enshi"); put("閯傚窞", "ezhou"); put("浣涘北", "fs"); put("绂忓窞", "fz"); put("鎶氶『", "fushun"); put("闃滈槼", "fuyang"); put("闃滄柊", "fuxin"); + put("鎶氬窞", "jxfuzhou"); put("闃插煄娓�", "fangchenggang"); put("娑櫟", "fuling"); put("骞垮窞", "gz"); put("璐甸槼", "gy"); put("妗傛灄", "guilin"); put("璧e窞", "ganzhou"); put("璐垫腐", "guigang"); put("鍥哄師", "guyuan"); put("骞垮畨", "guangan"); + put("骞垮厓", "guangyuan"); put("鏉窞", "hz"); put("鍝堝皵婊�", "hrb"); put("娴峰崡", "hn"); put("鍚堣偉", "hf"); put("鍛煎拰娴╃壒", "nm"); put("鎯犲窞", "huizhou"); put("琛℃按", "hs"); put("閭兏", "hd"); put("娣畨", "huaian"); + put("鑿忔辰", "heze"); put("婀栧窞", "huzhou"); put("琛¢槼", "hengyang"); put("姹変腑", "hanzhong"); put("榛勭煶", "huangshi"); put("鎬�鍖�", "huaihua"); put("榛勫唸", "huanggang"); put("娌虫睜", "hechi"); put("绾㈡渤", "honghe"); put("楣ゅ矖", "hegang"); + put("楣ゅ", "hebi"); put("娣崡", "huainan"); put("娣寳", "huaibei"); put("榛勫北", "huangshan"); put("钁姦宀�", "huludao"); put("娌虫簮", "heyuan"); put("璐哄窞", "hezhou"); put("榛戞渤", "heihe"); put("鍚堝窛", "hechuan"); put("娴庡崡", "jn"); + put("鍚夋灄", "jl"); put("鍢夊叴", "jx"); put("姹熼棬", "jm"); put("閲戝崕", "jh"); put("鏅嬪煄", "jc"); put("姹熼槾", "jy"); put("涔濇睙", "jiujiang"); put("娴庡畞", "jining"); put("鎻槼", "jieyang"); put("鐒︿綔", "jiaozuo"); + put("鑽嗗窞", "jingzhou"); put("浣虫湪鏂�", "jiamusi"); put("楦¤タ", "jixi"); put("鍚夊畨", "jian"); put("閲戞槍", "jinchang"); put("鏅嬩腑", "jinzhong"); put("閿﹀窞", "jinzhou"); put("鏅痉闀�", "jingdezhen"); put("鑽嗛棬", "jingmen"); put("鍢夊唱鍏�", "jiayuguan"); + put("閰掓硥", "jiuquan"); put("鏄嗘槑", "km"); put("鏄嗗北", "ks"); put("鍏嬫媺鐜涗緷", "kelamayi"); put("寮�灏�", "kaifeng"); put("鍏板窞", "lz"); put("娲涢槼", "ly"); put("寤婂潑", "lf"); put("涓芥按", "ls"); put("杩炰簯娓�", "lyg"); + put("鏌冲窞", "liuzhou"); put("鑱婂煄", "lc"); put("涓存矀", "linyi"); put("涔愬北", "leshan"); put("鍚曟", "lvliang"); put("杈介槼", "liaoyang"); put("杈芥簮", "liaoyuan"); put("涓存本", "linfen"); put("榫欏博", "longyan"); put("婕渤", "luohe"); + put("娉稿窞", "luzhou"); put("涓芥睙", "lijiang"); put("鍏畨", "luan"); put("鑾辫姕", "laiwu"); put("涓存钵", "lincang"); put("鍑夊北", "liangshan"); put("闄囧崡", "longnan"); put("鏉ュ", "laibin"); put("鍏洏姘�", "liupanshui"); put("濞勫簳", "loudi"); + put("缁甸槼", "mianyang"); put("椹瀺灞�", "mas"); put("鑼傚悕", "maoming"); put("鐗′腹姹�", "mudanjiang"); put("姊呭窞", "meizhou"); put("鐪夊北", "meishan"); put("鍗椾含", "nanjing"); put("鍗楁槍", "nc"); put("鍗楀畞", "nn"); put("瀹佹尝", "nb"); + put("鍗楅��", "nt"); put("鍗楅槼", "nanyang"); put("鍐呮睙", "neijiang"); put("鍗楀厖", "nanchong"); put("瀹佸痉", "ningde"); put("鍗楀钩", "nanping"); put("骞抽《灞�", "pingdingshan"); put("鐩橀敠", "panjin"); put("钀嶄埂", "pingxiang"); put("骞冲噳", "pingliang"); + put("婵槼", "puyang"); put("鏀�鏋濊姳", "panzhihua"); put("鑾嗙敯", "putian"); put("鏅幢", "puer"); put("闈掑矝", "qd"); put("绉︾殗宀�", "qhd"); put("娓呰繙", "qingyuan"); put("娉夊窞", "qz"); put("榻愰綈鍝堝皵", "qiqihaer"); put("琛㈠窞", "quzhou"); + put("閽﹀窞", "qinzhou"); put("鏇查潠", "qujing"); put("榛斾笢鍗�", "qiandongnan"); put("搴嗛槼", "qingyang"); put("榛斿崡", "qiannan"); put("榛旇タ鍗�", "qianxinan"); put("涓冨彴娌�", "qitaihe"); put("缍︽睙", "qijiang"); put("鏃ョ収", "rz"); put("涓婃捣", "sh"); + put("娣卞湷", "sz"); put("鑻忓窞", "suzhou"); put("娌堥槼", "sy"); put("鐭冲搴�", "sjz"); put("涓変簹", "sanya"); put("缁嶅叴", "shaoxing"); put("姹曞ご", "st"); put("椤哄痉", "shunde"); put("瀹胯縼", "sq"); put("瀹垮窞", "ahsuzhou"); + put("鍗佸牥", "shiyan"); put("涓夋槑", "sanming"); put("闊跺叧", "shaoguan"); put("鍟嗕笜", "shangqiu"); put("缁ュ寲", "suihua"); put("閭甸槼", "shaoyang"); put("鏉惧師", "songyuan"); put("涓夐棬宄�", "sanmenxia"); put("姹曞熬", "shanwei"); put("闅忓窞", "suizhou"); + put("閬傚畞", "suining"); put("鍟嗘礇", "shangluo"); put("鏈斿窞", "shuozhou"); put("鐭冲槾灞�", "shizuishan"); put("涓婇ザ", "shangrao"); put("鍥涘钩", "siping"); put("鍙岄腑灞�", "shuangyashan"); put("鐭虫渤瀛�", "shihezi"); put("澶╂触", "tj"); put("澶師", "taiyuan"); + put("鍞愬北", "ts"); put("娉板窞", "taizhou"); put("鍙板窞", "tz"); put("澶粨", "tc"); put("娉板畨", "taian"); put("閾佸箔", "tieling"); put("澶╂按", "tianshui"); put("閾滃窛", "tongchuan"); put("閫氬寲", "tonghua"); put("閾滈櫟", "tongling"); + put("閾滀粊", "tongren"); put("姝︽眽", "wuhan"); put("鏃犻敗", "wuxi"); put("濞佹捣", "weihai"); put("娼嶅潑", "wf"); put("娓╁窞", "wz"); put("鍚存睙", "wj"); put("涔岄瞾鏈ㄩ綈", "xj"); put("鑺滄箹", "wuhu"); put("姊у窞", "wuzhou"); + put("娓崡", "weinan"); put("鏂囧北", "wenshan"); put("鍚村繝", "wuzhong"); put("姝﹀▉", "wuwei"); put("涓囧窞", "wanzhou"); put("瑗垮畨", "xian"); put("鍘﹂棬", "xm"); put("寰愬窞", "xz"); put("瑗垮畞", "xn"); put("婀樻江", "xt"); + put("鏂颁埂", "xx"); put("瑗勯槼", "xiangyang"); put("閭㈠彴", "xingtai"); put("瀛濇劅", "xiaogan"); put("璁告槍", "xuchang"); put("蹇诲窞", "xinzhou"); put("瀹e煄", "xuancheng"); put("瑗垮弻鐗堢撼", "xishuangbanna"); put("鍜搁槼", "xianyang"); put("淇¢槼", "xinyang"); + put("鏂颁綑", "xinyu"); put("婀樿タ", "xiangxi"); put("鍜稿畞", "xianning"); put("鐑熷彴", "yt"); put("鎵窞", "yz"); put("瀹滄槍", "yc"); put("閾跺窛", "yinchuan"); put("鐜夋灄", "yl"); put("钀ュ彛", "yk"); put("寤跺畨", "yanan"); + put("鐩愬煄", "yancheng"); put("宀抽槼", "yueyang"); put("寤惰竟", "yanbian"); put("楣版江", "yingtan"); put("鐜夋邯", "yuxi"); put("瀹滄槬", "yichun"); put("姒嗘灄", "sxyulin"); put("瀹滃", "yibin"); put("姘稿窞", "yongzhou"); put("闃虫睙", "yangjiang"); + put("闃虫硥", "yangquan"); put("闆呭畨", "yaan"); put("鐩婇槼", "yiyang"); put("浜戞诞", "yunfu"); put("浼婃槬", "hljyichun"); put("杩愬煄", "yuncheng"); put("瀹滃叴", "yixing"); put(" 姘稿窛", "yongchuan"); put("閮戝窞", "zz"); put("鐝犳捣", "zh"); + put("涓北", "zs"); put("闀囨睙", "zhenjiang"); put("婀涙睙", "zj"); put("鏍床", "zhuzhou"); put("娣勫崥", "zb"); put("鑸熷北", "zhoushan"); put("寮犲娓�", "zjg"); put("寮犲鍙�", "zhangjiakou"); put("婕冲窞", "zhangzhou"); put("鑲囧簡", "zhaoqing"); + put("鏋e簞", "zaozhuang"); put("鍛ㄥ彛", "zhoukou"); put("椹婚┈搴�", "zhumadian"); put("鑷础", "zigong"); put("寮犲鐣�", "zhangjiajie"); put("璧勯槼", "ziyang"); put("閬典箟", "zunyi"); put("鏄��", "zhaotong"); put("涓崼", "zhongwei"); put("寮犳帠", "zhangye"); }}; /** @@ -99,11 +99,11 @@ public class FixedPointCrawl extends BaseBatch{ print "." } def houseCount = findHouses(dbo.city, dbo.region, dbo.name, dbo.cat, dbo.select_house_date); - //已存在该小区房源,删除任务表no_house_district中相关任务 + //宸插瓨鍦ㄨ灏忓尯鎴挎簮锛屽垹闄や换鍔¤〃no_house_district涓浉鍏充换鍔� if(houseCount > 0){ removeNoHouseDistrict(dbo.get("_id")); deleteCount++; - }else{//不存在,则拼接种子到抓取任务表中 + }else{//涓嶅瓨鍦紝鍒欐嫾鎺ョ瀛愬埌鎶撳彇浠诲姟琛ㄤ腑 updateCrawlCount(dbo.get("_id"), dbo.crawl_count + 1, dbo.level); addSeeds(dbo.city, dbo.region, dbo.name, dbo.cat); updateCount++; @@ -111,9 +111,9 @@ public class FixedPointCrawl extends BaseBatch{ } } - println "有"+deleteCount+"个小区抓取到房源"; - println "有"+updateCount+"个小区还无房源"; - println DateUtils.formatDateByPattern(new Date(), "yyyy-MM-dd")+ "添加无房源小区完成!" + println "鏈�"+deleteCount+"涓皬鍖烘姄鍙栧埌鎴挎簮"; + println "鏈�"+updateCount+"涓皬鍖鸿繕鏃犳埧婧�"; + println DateUtils.formatDateByPattern(new Date(), "yyyy-MM-dd")+ "娣诲姞鏃犳埧婧愬皬鍖哄畬鎴愶紒" } def addSeeds(def city, def region, def name, def cat){ if (city && name && cat) { @@ -149,7 +149,7 @@ public class FixedPointCrawl extends BaseBatch{ String nameCode = java.net.URLEncoder.encode(name.trim(), "gbk"); String url = ""; String s = ""; - if(!city.equals("北京")){ + if(!city.equals("鍖椾含")){ s = cityMap.get(city)+"." } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/house/HoseBasePrice.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/house/HoseBasePrice.groovy index 91a468531..84d4a70d1 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/house/HoseBasePrice.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/house/HoseBasePrice.groovy @@ -28,7 +28,7 @@ class HoseBasePrice extends BaseBatch{ } @Override public void process(Object args) { - def city = "上海"; + def city = "涓婃捣"; def cat = "district"; def districts = getAllDistricts(city, cat); def startDate = DateUtils.parseFromTightYYYYMMDD("2014-1-1"); @@ -66,21 +66,21 @@ class HoseBasePrice extends BaseBatch{ file.delete(); } - file.append("城市,") - file.append("区域,") - file.append("楼盘名称,") - file.append("所在楼层,") - file.append("楼高,") - file.append("室,") - file.append("厅,") - file.append("朝向,") - file.append("装修情况,") - //file.append("基价,") - file.append("原始价,") - file.append("系数,") + file.append("鍩庡競,") + file.append("鍖哄煙,") + file.append("妤肩洏鍚嶇О,") + file.append("鎵�鍦ㄦゼ灞�,") + file.append("妤奸珮,") + file.append("瀹�,") + file.append("鍘�,") + file.append("鏈濆悜,") + file.append("瑁呬慨鎯呭喌,") + //file.append("鍩轰环,") + file.append("鍘熷浠�,") + file.append("绯绘暟,") file.append("price,") - file.append("新系数,") - file.append("新价格,") + file.append("鏂扮郴鏁�,") + file.append("鏂颁环鏍�,") file.append(System.getProperty("line.separator")); list.each{ file.append(array[0] + ",","gbk") @@ -169,7 +169,7 @@ class HoseBasePrice extends BaseBatch{ private def findEvaluationRate(){ - def sql = "SELECT rate_type, rank, rate,rank_remark FROM evaluation_rate WHERE TYPE = '小区'"; + def sql = "SELECT rate_type, rank, rate,rank_remark FROM evaluation_rate WHERE TYPE = '灏忓尯'"; def ret = [:] sqlInstance.eachRow(sql,{ def key = it.rate_type +"--"+it.rank; @@ -184,7 +184,7 @@ class HoseBasePrice extends BaseBatch{ for(def house : houses){ println house def floor_rate = getFloorRate(house.houseHeight, house.floor, rates); - def fangXing_rate = getEvaluationRate("房型", house.room.toString()+house.hall.toString(), rates); + def fangXing_rate = getEvaluationRate("鎴垮瀷", house.room.toString()+house.hall.toString(), rates); def direction_rate = getDirectionRate(house.direction, rates); def fitment_rate = getFitmentRate(house.fitment, rates); @@ -217,7 +217,7 @@ class HoseBasePrice extends BaseBatch{ for(def house : houses){ def floor_rate = getFloorRate(house.houseHeight, house.floor, rates); - def fangXing_rate = getEvaluationRate("房型", house.room.toString()+house.hall.toString(), rates); + def fangXing_rate = getEvaluationRate("鎴垮瀷", house.room.toString()+house.hall.toString(), rates); def direction_rate = getDirectionRate(house.direction, rates); def fitment_rate = getFitmentRate(house.fitment, rates); @@ -270,17 +270,17 @@ class HoseBasePrice extends BaseBatch{ private def getFitmentRate(fitment, rates){ if(fitment){ def rank = 2; - if(fitment=='毛坯'){ + if(fitment=='姣涘澂'){ rank = 1; - }else if(fitment=='简单装修'||fitment=='普通装修'||fitment=='简装'){ + }else if(fitment=='绠�鍗曡淇�'||fitment=='鏅�氳淇�'||fitment=='绠�瑁�'){ rank = 2; - }else if(fitment=='精装修'){ + }else if(fitment=='绮捐淇�'){ rank = 3; - }else if(fitment=='豪华装修'){ + }else if(fitment=='璞崕瑁呬慨'){ rank = 4; } - return getEvaluationRate("装修情况", rank, rates); + return getEvaluationRate("瑁呬慨鎯呭喌", rank, rates); } return null; } @@ -288,32 +288,32 @@ class HoseBasePrice extends BaseBatch{ private def getDirectionRate(value, rates){ if(value){ def direction = getDirectionRank(value); - return getEvaluationRate("朝向", direction, rates); + return getEvaluationRate("鏈濆悜", direction, rates); } return null; } private def getDirectionRank(value){ def rank = 10; - if(value=='西南'){ + if(value=='瑗垮崡'){ return 1; - }else if(value=='东南'){ + }else if(value=='涓滃崡'){ return 2; - }else if(value=='南'){ + }else if(value=='鍗�'){ return 3; - }else if(value=='西北'){ + }else if(value=='瑗垮寳'){ return 4; - }else if(value=='东北'){ + }else if(value=='涓滃寳'){ return 5; - }else if(value=='东'){ + }else if(value=='涓�'){ return 6; - }else if(value=='西'){ + }else if(value=='瑗�'){ return 7; - }else if(value=='北'){ + }else if(value=='鍖�'){ return 8; - }else if(value=='东西'){ + }else if(value=='涓滆タ'){ return 9; - }else if(value=='南北'){ + }else if(value=='鍗楀寳'){ return 10; } return rank; @@ -327,16 +327,16 @@ class HoseBasePrice extends BaseBatch{ private getHouseFloorRateType(houseHight){ if (houseHight <= 7){ - return '多层' + return '澶氬眰' } else if(houseHight > 7 && houseHight <= 15){ - return '小高层' + return '灏忛珮灞�' } else if(houseHight > 15 && houseHight <= 32){ - return '高层' + return '楂樺眰' } else{ - return '高层一' + return '楂樺眰涓�' } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/house/HouseStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/house/HouseStat.groovy index e83f1a78b..75f79cd53 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/house/HouseStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/house/HouseStat.groovy @@ -39,7 +39,7 @@ import com.fangjia.script.common.DataHandleUtils; import org.apache.lucene.search.BooleanClause.Occur; /** - * 计算某城市房源小于10个以下的占比 + * 璁$畻鏌愬煄甯傛埧婧愬皬浜�10涓互涓嬬殑鍗犳瘮 */ @BatchOwner(Watcher.GaoJuan) class HouseStat extends BaseBatch{ @@ -87,7 +87,7 @@ class HouseStat extends BaseBatch{ rentHouseStat(city, "rent", districts, beginDate, endDate); } } - println city +"[ ${index}/${citys.size()}]"+"计算完成......."+beginDate.toString() + println city +"[ ${index}/${citys.size()}]"+"璁$畻瀹屾垚......."+beginDate.toString() index ++; } @@ -206,12 +206,12 @@ class HouseStat extends BaseBatch{ dbo.put("city", city); dbo.put("cat", cat); dbo.put("stat_date", statDate); - dbo.put("less_dist_count", lessHouseCount);//房源量少于10个的小区数 - dbo.put("dist_count", dist_count);//小区数量 - dbo.put("house_total_count", cityHouseCount);//城市房源总量 - dbo.put("match_house_count", distHouseCount);//匹配成功的房源量 - dbo.put("room_count", roomCount.toInteger());//房型数量 - dbo.put("less_percent", percent);//房源量少于10个的小区占比 + dbo.put("less_dist_count", lessHouseCount);//鎴挎簮閲忓皯浜�10涓殑灏忓尯鏁� + dbo.put("dist_count", dist_count);//灏忓尯鏁伴噺 + dbo.put("house_total_count", cityHouseCount);//鍩庡競鎴挎簮鎬婚噺 + dbo.put("match_house_count", distHouseCount);//鍖归厤鎴愬姛鐨勬埧婧愰噺 + dbo.put("room_count", roomCount.toInteger());//鎴垮瀷鏁伴噺 + dbo.put("less_percent", percent);//鎴挎簮閲忓皯浜�10涓殑灏忓尯鍗犳瘮 def obj = HOUSE_STAT_COLL.findOne(dbo); if(obj){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/house/LongRentBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/house/LongRentBatch.groovy index b6fb681eb..d79d0b449 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/house/LongRentBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/house/LongRentBatch.groovy @@ -12,7 +12,7 @@ import com.mongodb.DBObject import org.bson.types.ObjectId /** - *长租公寓数据处理 + *闀跨鍏瘬鏁版嵁澶勭悊 */ @BatchOwner(Watcher.GaoJuan) class LongRentBatch extends BaseBatch{ @@ -65,7 +65,7 @@ class LongRentBatch extends BaseBatch{ def cursor = getDataStoreConnection().find(q, keys).batchSize(1000).sort(new BasicDBObject('_id', -1)) - println "共:"+cursor.count(); + println "鍏憋細"+cursor.count(); def totalCount = 0; def updateIndex = 0; def noMobile = 0; @@ -73,7 +73,7 @@ class LongRentBatch extends BaseBatch{ for(def obj : cursor){ Date c_date = obj.c_date if(c_date && c_date.compareTo(DateUtil.truncateDay(new Date()))<0){ - println "时间不是今天了......"+obj._id.toString() + println "鏃堕棿涓嶆槸浠婂ぉ浜�......"+obj._id.toString() break; } totalCount++; @@ -123,20 +123,20 @@ class LongRentBatch extends BaseBatch{ if(!mobile ||!contact_people ){ noMobile++ updateIndex++ - println "【${noMobile}】"+obj.get("_id").toString()+ " mobile:"+mobile+" contact_people:"+contact_people + println "銆�${noMobile}銆�"+obj.get("_id").toString()+ " mobile:"+mobile+" contact_people:"+contact_people setHouseHide(obj.get("_id")); }else if(!pics){ noPics++ updateIndex++ - println "【${noPics}】"+obj.get("_id").toString()+ " pics:"+pics + println "銆�${noPics}銆�"+obj.get("_id").toString()+ " pics:"+pics setHouseHide(obj.get("_id")); - }else if(hasValueCount <6){//以房源字段覆盖率不合格 + }else if(hasValueCount <6){//浠ユ埧婧愬瓧娈佃鐩栫巼涓嶅悎鏍� updateIndex++; - println obj.get("_id").toString()+"第【${totalCount}】-【${updateIndex}】条 设不显示 hasValueCount:"+hasValueCount+" c_date:"+DateUtil.formatByPattern(c_date, "yyyy-MM-dd") + println obj.get("_id").toString()+"绗��${totalCount}銆�-銆�${updateIndex}銆戞潯 璁句笉鏄剧ず hasValueCount锛�"+hasValueCount+" c_date:"+DateUtil.formatByPattern(c_date, "yyyy-MM-dd") setHouseHide(obj.get("_id")); } } - println DateUtil.formatByPattern(DateUtil.truncateDay(new Date()), "yyyy-MM-dd")+" 共:"+totalCount+" 条,执行修改:"+updateIndex+"条"; + println DateUtil.formatByPattern(DateUtil.truncateDay(new Date()), "yyyy-MM-dd")+" 鍏憋細"+totalCount+" 鏉★紝鎵ц淇敼锛�"+updateIndex+"鏉�"; } def setHouseHide(def id){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/house/SensitiveWordHouse.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/house/SensitiveWordHouse.groovy index 5cc4772c6..acacc71e8 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/house/SensitiveWordHouse.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/house/SensitiveWordHouse.groovy @@ -109,7 +109,7 @@ class SensitiveWordHouse { } } } - println "共删除含敏感词:"+del_index; + println "鍏卞垹闄ゅ惈鏁忔劅璇嶏細"+del_index; } @@ -142,7 +142,7 @@ class SensitiveWordHouse { if(cursor){ for(def dbo : cursor){ def city = dbo.get("display"); - if(city != '全国'){ + if(city != '鍏ㄥ浗'){ citys << city; } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/house/ShopOfficeHouse.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/house/ShopOfficeHouse.groovy index 8ebffe17b..7c13daae3 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/house/ShopOfficeHouse.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/house/ShopOfficeHouse.groovy @@ -17,8 +17,8 @@ class ShopOfficeHouse { DBCollection coll = MongoUtils.getCollectionByName("fangjia", "seabird", "192.168.0.61", 27037); static main(args) { def task = new ShopOfficeHouse(); - task.addHouseRoad("上海","shop_sell"); - //task.addHouseRoad("上海","shop_rent"); + task.addHouseRoad("涓婃捣","shop_sell"); + //task.addHouseRoad("涓婃捣","shop_rent"); } @@ -76,7 +76,7 @@ class ShopOfficeHouse { return ""; } - //分词获取路名 + //鍒嗚瘝鑾峰彇璺悕 def getRoadNameBySplitWord(def key){ def url = "http://open.fangjia.com/task/tokenizer?k=${URLEncoder.encode(key, 'UTF-8')}"; def content = getContentFromUrl(url); @@ -109,7 +109,7 @@ class ShopOfficeHouse { conn.setRequestMethod("GET"); conn.doOutput = true inputStream = conn.getInputStream(); - BufferedReader buf = new BufferedReader(new InputStreamReader(inputStream,"UTF-8"));// 创建UTF-8的BufferedReader + BufferedReader buf = new BufferedReader(new InputStreamReader(inputStream,"UTF-8"));// 鍒涘缓UTF-8鐨凚ufferedReader while((line = buf.readLine())!=null){ sb.append(line); } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/house/Test.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/house/Test.groovy index 5f02b3f1b..c625b67a2 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/house/Test.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/house/Test.groovy @@ -14,7 +14,7 @@ class Test { static main(args) { - def citys = readTxt("e:\\数据导出\\城市列表\\citys.txt") + def citys = readTxt("e:\\鏁版嵁瀵煎嚭\\鍩庡競鍒楄〃\\citys.txt") for(def city : citys){ def count = 0; if(city){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/house/TestDataExport.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/house/TestDataExport.groovy index 08a02aa63..5ce9435a8 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/house/TestDataExport.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/house/TestDataExport.groovy @@ -61,7 +61,7 @@ class TestDataExport { // def list = initDataMap(); // def result = []; // for(def map : list){ -// def obj = CommonDatautils.findDistrict("兰州", map.region, map.name, "district"); +// def obj = CommonDatautils.findDistrict("鍏板窞", map.region, map.name, "district"); // // def distMap = [:]; // distMap.region = map.region; @@ -72,18 +72,18 @@ class TestDataExport { // exportDistCsv(result); - def districts = CommonDatautils.getAllDistrictBaseInfo("兰州", "district", "永登") - //def districts = CommonDatautils.getAllDistrictBaseInfo("兰州", "district", "皋兰") + def districts = CommonDatautils.getAllDistrictBaseInfo("鍏板窞", "district", "姘哥櫥") + //def districts = CommonDatautils.getAllDistrictBaseInfo("鍏板窞", "district", "鐨嬪叞") def houses =[] for(def map : districts){ - //def obj = CommonDatautils.findDistrict("兰州", map.region, map.name, "district"); - def rows = findDistrictHouse("兰州", map.region, map.name, map.alias, map.address); + //def obj = CommonDatautils.findDistrict("鍏板窞", map.region, map.name, "district"); + def rows = findDistrictHouse("鍏板窞", map.region, map.name, map.alias, map.address); if(rows){ map.isHouse = true; if(rows.size()<5){ - rows = findDistrictHouse2("兰州", map.region, map.name, map.alias, map.address); + rows = findDistrictHouse2("鍏板窞", map.region, map.name, map.alias, map.address); } houses.addAll(rows); } @@ -93,9 +93,9 @@ class TestDataExport { exportDistCsv(districts); // for(def map : list){ -// def obj = CommonDatautils.findDistrict("兰州", map.region, map.name, "district"); +// def obj = CommonDatautils.findDistrict("鍏板窞", map.region, map.name, "district"); // def estateTypeCode = 1; -// if(obj.estate_type == "别墅"){ +// if(obj.estate_type == "鍒"){ // estateTypeCode = 2; // } // def rows = findOpenHouse(obj.get("_id").toString(), map.area, estateTypeCode); @@ -252,15 +252,15 @@ class TestDataExport { def exportHouseCsv(def ret){ - File file = new File("e:\\数据导出\\安硕\\兰州房源样本.csv"); + File file = new File("e:\\鏁版嵁瀵煎嚭\\瀹夌\\鍏板窞鎴挎簮鏍锋湰.csv"); if (file.exists()){ file.delete(); } - file.append("区域,") - file.append("楼盘名称,") - file.append("地址,") - file.append("价格,") - file.append("面积,") + file.append("鍖哄煙,") + file.append("妤肩洏鍚嶇О,") + file.append("鍦板潃,") + file.append("浠锋牸,") + file.append("闈㈢Н,") file.append(System.getProperty("line.separator")); ret.each{map-> file.append(map.region + ",","gbk") @@ -274,13 +274,13 @@ class TestDataExport { } def exportDistCsv(def ret){ - File file = new File("e:\\数据导出\\安硕\\兰州小区.csv"); + File file = new File("e:\\鏁版嵁瀵煎嚭\\瀹夌\\鍏板窞灏忓尯.csv"); if (file.exists()){ file.delete(); } - file.append("区域,") - file.append("楼盘名称,") - file.append("地址,") + file.append("鍖哄煙,") + file.append("妤肩洏鍚嶇О,") + file.append("鍦板潃,") file.append(System.getProperty("line.separator")); ret.each{map-> @@ -298,9 +298,9 @@ class TestDataExport { def initDataMap(){ def result = []; - def list1 = ["良吉小区","永盛花园","亚太玫瑰园" - , "蓝星小区" ,"照远花苑", "佳永花苑" - ,"万博小区" ,"彩虹城"]; + def list1 = ["鑹悏灏忓尯","姘哥洓鑺卞洯","浜氬お鐜懓鍥�" + , "钃濇槦灏忓尯" ,"鐓ц繙鑺辫嫅", "浣虫案鑺辫嫅" + ,"涓囧崥灏忓尯" ,"褰╄櫣鍩�"]; def areas1 = [89,97,96,54,100,75,75,94,124,106]; @@ -308,7 +308,7 @@ class TestDataExport { for(def name : list1){ def map = [:]; - map.region = "永登"; + map.region = "姘哥櫥"; map.name = name; map.area = areas1[index1].toDouble(); result << map; @@ -316,12 +316,12 @@ class TestDataExport { } - def list2 = ["林隐天下","天添庭院","三汇沁园","聚金兰庭", "德胜嘉苑","新泰花园","西电家属院","尚城天和家园"]; + def list2 = ["鏋楅殣澶╀笅","澶╂坊搴櫌","涓夋眹娌佸洯","鑱氶噾鍏板涵", "寰疯儨鍢夎嫅","鏂版嘲鑺卞洯","瑗跨數瀹跺睘闄�","灏氬煄澶╁拰瀹跺洯"]; def areas2 = [698,100,102,95,99,138,80, 127]; def index2 = 0; for(def name : list2){ def map = [:]; - map.region = "皋兰"; + map.region = "鐨嬪叞"; map.name = name; map.area = areas2[index2].toDouble(); result << map; @@ -333,14 +333,14 @@ class TestDataExport { def initDataMap2(){ def map = [:]; - map.put("永登", "林隐天下"); - map.put("永登", "天添庭院"); - map.put("永登", "三汇沁园"); - map.put("永登", "聚金兰庭"); - map.put("永登", "天添庭院"); - map.put("永登", "新泰花园"); - map.put("永登", "西电家属院"); - map.put("永登", "尚城天和家园"); + map.put("姘哥櫥", "鏋楅殣澶╀笅"); + map.put("姘哥櫥", "澶╂坊搴櫌"); + map.put("姘哥櫥", "涓夋眹娌佸洯"); + map.put("姘哥櫥", "鑱氶噾鍏板涵"); + map.put("姘哥櫥", "澶╂坊搴櫌"); + map.put("姘哥櫥", "鏂版嘲鑺卞洯"); + map.put("姘哥櫥", "瑗跨數瀹跺睘闄�"); + map.put("姘哥櫥", "灏氬煄澶╁拰瀹跺洯"); return map; } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/AnalysisRelatedDistrictBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/AnalysisRelatedDistrictBatch.groovy index ab1bc4f5a..a43933195 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/AnalysisRelatedDistrictBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/AnalysisRelatedDistrictBatch.groovy @@ -43,7 +43,7 @@ public class AnalysisRelatedDistrictBatch extends BaseBatch { @Override void process(Object args) { - def cityList = ["阿克苏"] + def cityList = ["闃垮厠鑻�"] if(args.cityList){ cityList = (List)args.cityList @@ -53,18 +53,18 @@ public class AnalysisRelatedDistrictBatch extends BaseBatch { for(String city : cityList) { for(String c:categories){ copyToTemp(city,c); - println new Date().format("yyyy/MM/dd HH:mm:ss")+"开始加载 $city 城市数据"; + println new Date().format("yyyy/MM/dd HH:mm:ss")+"寮�濮嬪姞杞� $city 鍩庡競鏁版嵁"; loadTempData(city,c); - println new Date().format("yyyy/MM/dd HH:mm:ss")+"$city 城市数据加载结束"; - println new Date().format("yyyy/MM/dd HH:mm:ss")+"开始加载 $city 不关联数据"; + println new Date().format("yyyy/MM/dd HH:mm:ss")+"$city 鍩庡競鏁版嵁鍔犺浇缁撴潫"; + println new Date().format("yyyy/MM/dd HH:mm:ss")+"寮�濮嬪姞杞� $city 涓嶅叧鑱旀暟鎹�"; loadUnRelationsData(city,c); - println new Date().format("yyyy/MM/dd HH:mm:ss")+"$city 不关联数据加载结束"; - println new Date().format("yyyy/MM/dd HH:mm:ss")+"开始统计 $city 关联小区"; + println new Date().format("yyyy/MM/dd HH:mm:ss")+"$city 涓嶅叧鑱旀暟鎹姞杞界粨鏉�"; + println new Date().format("yyyy/MM/dd HH:mm:ss")+"寮�濮嬬粺璁� $city 鍏宠仈灏忓尯"; sameNameOrAddress(city,c); - println new Date().format("yyyy/MM/dd HH:mm:ss")+"统计 $city 关联小区结束"; + println new Date().format("yyyy/MM/dd HH:mm:ss")+"缁熻 $city 鍏宠仈灏忓尯缁撴潫"; } } - println("-------------------------------------输出统计信息------------------------------------------") + println("-------------------------------------杈撳嚭缁熻淇℃伅------------------------------------------") int groupCount = 0 int count = 0 cityList.each {def city-> @@ -79,8 +79,8 @@ public class AnalysisRelatedDistrictBatch extends BaseBatch { groupCount += group println("$city\t$group\t$total") } - println("本次关联总组数:$groupCount \t总条数:$count ") - sendDingMsg("18721516823","关联完成") + println("鏈鍏宠仈鎬荤粍鏁�:$groupCount \t鎬绘潯鏁�:$count ") + sendDingMsg("18721516823","鍏宠仈瀹屾垚") } @@ -99,7 +99,7 @@ public class AnalysisRelatedDistrictBatch extends BaseBatch { } public def copyToTemp(city,category){ - println "开始Copy数据到临时表:"+new Date().format("yyyy/MM/dd HH:mm:ss"); + println "寮�濮婥opy鏁版嵁鍒颁复鏃惰〃锛�"+new Date().format("yyyy/MM/dd HH:mm:ss"); tempRelation.remove(new BasicDBObject("city",city).append("category", category)); DSCursor cursor = seaweed.find(DataUtil.map2DBObject([city: city, cat:category,visible:0])); Iterator it=cursor.iterator(); @@ -127,7 +127,7 @@ public class AnalysisRelatedDistrictBatch extends BaseBatch { } tempRelation.insert(group); group.clear(); - println "数据Copy完毕:"+new Date().format("yyyy/MM/dd HH:mm:ss"); + println "鏁版嵁Copy瀹屾瘯锛�"+new Date().format("yyyy/MM/dd HH:mm:ss"); } public def loadUnRelationsData(String city,String category){ @@ -144,7 +144,7 @@ public class AnalysisRelatedDistrictBatch extends BaseBatch { def sameNameOrAddress(city,c){ districtRelationDb.remove(new BasicDBObject("city", city).append("category", c)); - println "已清除$city $c 数据" + println "宸叉竻闄�$city $c 鏁版嵁" temp.each { if(!searchDistricts.contains(it.get("_id").toString())){ @@ -181,7 +181,7 @@ public class AnalysisRelatedDistrictBatch extends BaseBatch { relations << member; } if(regions.size()>1){ - dbo.put("region", "混合") + dbo.put("region", "娣峰悎") }else{ dbo.put("region", regions.get(0)) } @@ -226,15 +226,15 @@ public class AnalysisRelatedDistrictBatch extends BaseBatch { } } - def tempName = shortName.replaceAll("(东|南|北|西|甲|乙|丙|丁|一|二|三|四|五|六|七|八|九|十|东|南|西|北)+(期|区).*" ,"") + def tempName = shortName.replaceAll("(涓渱鍗梶鍖梶瑗縷鐢瞸涔檤涓檤涓亅涓�|浜寍涓墊鍥泑浜攟鍏瓅涓億鍏珅涔潀鍗亅涓渱鍗梶瑗縷鍖�)+(鏈焲鍖�).*" ,"") Iterator it = list.iterator() while(it.hasNext()){ BasicDBObject item = it.next() - if(item.getString("name") != shortName && item.getString("name") ==~ Pattern.compile(tempName + "(((\\w|东|南|北|西|甲|乙|丙|丁|一|二|三|四|五|六|七|八|九|十|东|南|西|北)+(期|区))|(别墅|商住楼))\$")){ + if(item.getString("name") != shortName && item.getString("name") ==~ Pattern.compile(tempName + "(((\\w|涓渱鍗梶鍖梶瑗縷鐢瞸涔檤涓檤涓亅涓�|浜寍涓墊鍥泑浜攟鍏瓅涓億鍏珅涔潀鍗亅涓渱鍗梶瑗縷鍖�)+(鏈焲鍖�))|(鍒|鍟嗕綇妤�))\$")){ it.remove() continue } - if(item.getString("name") != shortName && (shortName + "别墅") == item.getString("name") && estate_type2 != item.estate_type2){ + if(item.getString("name") != shortName && (shortName + "鍒") == item.getString("name") && estate_type2 != item.estate_type2){ it.remove() } @@ -281,10 +281,10 @@ public class AnalysisRelatedDistrictBatch extends BaseBatch { } /** - * 验证并格式化区域 + * 楠岃瘉骞舵牸寮忓寲鍖哄煙 * @param city * @param region - * @return 区域非法返回NULL,否则返回格式化有的数据 + * @return 鍖哄煙闈炴硶杩斿洖NULL锛屽惁鍒欒繑鍥炴牸寮忓寲鏈夌殑鏁版嵁 */ private String validateAndFormatRegion(String city,String region){ DBObject keys = new BasicDBObject(); @@ -309,10 +309,10 @@ public class AnalysisRelatedDistrictBatch extends BaseBatch { } /** - * 验证板块并返回该板块所在的区域 + * 楠岃瘉鏉垮潡骞惰繑鍥炶鏉垮潡鎵�鍦ㄧ殑鍖哄煙 * @param city * @param block - * @return 板块非法返回NULL,否则返回格式化有的数据 + * @return 鏉垮潡闈炴硶杩斿洖NULL锛屽惁鍒欒繑鍥炴牸寮忓寲鏈夌殑鏁版嵁 */ private String validateAndFormatBlock(String city,String block){ DBObject keys = new BasicDBObject(); @@ -573,7 +573,7 @@ public class AnalysisRelatedDistrictBatch extends BaseBatch { public void removeInvalidValueField(Map resultObject, String category) { Set removeKeys = new HashSet(); for (String field : resultObject.keySet()) { - // 除了小区名称,其他的名称不需要验证 + // 闄や簡灏忓尯鍚嶇О锛屽叾浠栫殑鍚嶇О涓嶉渶瑕侀獙璇� if (!"district".equals(category) && "name".equals(field)) { continue; } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/CleanRepeatDistrict.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/CleanRepeatDistrict.groovy index 476580abe..138b59888 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/CleanRepeatDistrict.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/CleanRepeatDistrict.groovy @@ -117,7 +117,7 @@ class CleanRepeatDistrict { def sameAddressRepeat(city, ret, regions){ seaweed.find(DataUtil.map2DBObject([city: city, cat:"shop",visible:0])).each {doc -> - //if(doc.address=="民乐路100弄"){//百色路228弄 蓝村路31号 丁香路1089弄 + //if(doc.address=="姘戜箰璺�100寮�"){//鐧捐壊璺�228寮� 钃濇潙璺�31鍙� 涓侀璺�1089寮� def rt=seaweed.find(DataUtil.map2DBObject([cat:"shop", city: city, address: doc.address,visible:0])).getResults() if(rt.size()>1){ @@ -134,10 +134,10 @@ class CleanRepeatDistrict { index ++; println "(${index})["+d.region+"-"+d.name+"-"+d.address+"]" writeTxt("(${index})["+d.region+"-"+d.name+"-"+d.address+"]\r\n"); - //println "相似度2:"+CosineSimilarAlgorithm.getSimilarityRatio(doc.name, d.name) + //println "鐩镐技搴�2锛�"+CosineSimilarAlgorithm.getSimilarityRatio(doc.name, d.name) def repeatFlag = findSimilarDistrictByAddress(city, doc, d, regions); - println "匹配结果 : (${repeatFlag})" - writeTxt("匹配结果 : (${repeatFlag})\r\n"); + println "鍖归厤缁撴灉 锛� (${repeatFlag})" + writeTxt("鍖归厤缁撴灉 锛� (${repeatFlag})\r\n"); if(repeatFlag){ repeater << d; continue; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/CleanRepeatDistrict1.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/CleanRepeatDistrict1.groovy index f69ea3595..bd4f049c2 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/CleanRepeatDistrict1.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/CleanRepeatDistrict1.groovy @@ -50,7 +50,7 @@ class CleanRepeatDistrict1 { private Map fieldTypeMap = new HashMap(); private static Map> WEBSITE_MAP = new HashMap>(); private static Map> WEBSITE_SEEDS_MAP = new HashMap>(); - private static final String pattern ="(一|二|三|四|五|六|七|八|九|)+期(至(一|二|三|四|五|六|七|八|九|)期)*" + private static final String pattern ="(涓�|浜寍涓墊鍥泑浜攟鍏瓅涓億鍏珅涔潀)+鏈�(鑷�(涓�|浜寍涓墊鍥泑浜攟鍏瓅涓億鍏珅涔潀)鏈�)*" private Set usedName = []; private Set usedAddress = [] static main(args) { @@ -59,21 +59,21 @@ class CleanRepeatDistrict1 { // clean.initUnRelations(); // clean.initDataTypeMap("district"); // clean.procCitys(); - def cities = ["上海"]// + def cities = ["涓婃捣"]// // def cities = clean.getAllCities(); println cities.size() + "\t" + cities - println new Date().format("yyyy/MM/dd HH:mm:ss")+"开始统计关联小区"; + println new Date().format("yyyy/MM/dd HH:mm:ss")+"寮�濮嬬粺璁″叧鑱斿皬鍖�"; for(String city : cities) { // clean.copyToTemp(city); clean.proc(city); } - println new Date().format("yyyy/MM/dd HH:mm:ss")+"统计关联小区结束"; + println new Date().format("yyyy/MM/dd HH:mm:ss")+"缁熻鍏宠仈灏忓尯缁撴潫"; } public def copyToTemp(city){ - println "开始Copy数据到临时表:"+new Date().format("yyyy/MM/dd HH:mm:ss"); + println "寮�濮婥opy鏁版嵁鍒颁复鏃惰〃锛�"+new Date().format("yyyy/MM/dd HH:mm:ss"); tempRelation.remove(new BasicDBObject("city",city)); DSCursor cursor = seaweed.find(DataUtil.map2DBObject([city: city, cat:"district",visible:0])); Iterator it=cursor.iterator(); @@ -116,7 +116,7 @@ class CleanRepeatDistrict1 { formatedRegion = validateAndFormatBlock(city, dbo.region); } if(formatedRegion == null){ - regions.add("非法的区域 "+ dbo.region+" "+ dbo.name); + regions.add("闈炴硶鐨勫尯鍩� "+ dbo.region+" "+ dbo.name); continue } dbo.region = formatedRegion; @@ -149,7 +149,7 @@ class CleanRepeatDistrict1 { if (newObj.get("estate_type2") != null) { String estateType = (String) newObj.get("estate_type2"); - String[] a = ["小区", "住宅", "商住", "别墅", "公寓", "洋房", "高层", "小高层", "洋楼" ]; + String[] a = ["灏忓尯", "浣忓畢", "鍟嗕綇", "鍒", "鍏瘬", "娲嬫埧", "楂樺眰", "灏忛珮灞�", "娲嬫ゼ" ]; if(StringUtils.indexOfAny(estateType,a ) > -1) { dbo.put("data",newObj); } @@ -161,7 +161,7 @@ class CleanRepeatDistrict1 { regions.each { println it; } - println "数据Copy完毕:"+new Date().format("yyyy/MM/dd HH:mm:ss"); + println "鏁版嵁Copy瀹屾瘯锛�"+new Date().format("yyyy/MM/dd HH:mm:ss"); } public def initUnRelations(){ @@ -176,7 +176,7 @@ class CleanRepeatDistrict1 { } public def refresh(){ - println "刷新数据" + println "鍒锋柊鏁版嵁" DBCursor cursor = districtRelationDb.find(); DBObject dbo; while(cursor.hasNext()){ @@ -226,9 +226,9 @@ class CleanRepeatDistrict1 { // def ret = [:]; // ret.del_ids = []; // ret.delCount =0; -// println "检索同地址数据:"+new Date().format("yyyy/MM/dd HH:mm:ss"); +// println "妫�绱㈠悓鍦板潃鏁版嵁:"+new Date().format("yyyy/MM/dd HH:mm:ss"); // ret = sameAddressRepeat(city, ret, regions); -// println "检索同名称数据:"+new Date().format("yyyy/MM/dd HH:mm:ss"); +// println "妫�绱㈠悓鍚嶇О鏁版嵁:"+new Date().format("yyyy/MM/dd HH:mm:ss"); // ret = sameNameRepeat(city, ret, regions) // println() } @@ -256,7 +256,7 @@ class CleanRepeatDistrict1 { } if(regions.size()>1){ - relationObj.region ="混合"; + relationObj.region ="娣峰悎"; }else{ relationObj.region = regions.get(0); } @@ -407,7 +407,7 @@ class CleanRepeatDistrict1 { // continue; // } // def repeatFlag = findSimilarDistrictByName(doc, d, regions,relatedDBObj); -// println "匹配结果 : (${repeatFlag})" +// println "鍖归厤缁撴灉 锛� (${repeatFlag})" // println "------------------------------------------" // if(repeatFlag){ // repeater << d; @@ -418,7 +418,7 @@ class CleanRepeatDistrict1 { } if(relatedDBObjs.size()>1){ if(r.size()>1){ - relationObj.region ="混合"; + relationObj.region ="娣峰悎"; } relationObj.put("id_group", idGroup); relationObj.put("relations", relatedDBObjs); @@ -490,13 +490,13 @@ class CleanRepeatDistrict1 { index ++; println "(${index})["+d.region+"-"+d.name+"-"+d.address+"]" // writeTxt("(${index})["+d.region+"-"+d.name+"-"+d.address+"]\r\n"); - //println "相似度2:"+CosineSimilarAlgorithm.getSimilarityRatio(doc.name, d.name) + //println "鐩镐技搴�2锛�"+CosineSimilarAlgorithm.getSimilarityRatio(doc.name, d.name) // if(d.oid==doc.oid){ // relatedDBObjs.add(relatedDBObj); // continue; // } // def result = findSimilarDistrictByAddress(city, doc, d, regions); -// println "匹配结果 : (${result.repeatFlag})" +// println "鍖归厤缁撴灉 锛� (${result.repeatFlag})" // if(result.containsKey("address_score")){ // relatedDBObj.put("address_score", result.address_score); // } @@ -504,7 +504,7 @@ class CleanRepeatDistrict1 { // relatedDBObj.put("name_score", result.name_score); // } relatedDBObjs.add(relatedDBObj); -// writeTxt("匹配结果 : (${result.repeatFlag})\r\n"); +// writeTxt("鍖归厤缁撴灉 锛� (${result.repeatFlag})\r\n"); // if(result.repeatFlag){ // repeater << d; // continue; @@ -512,7 +512,7 @@ class CleanRepeatDistrict1 { } if(relatedDBObjs.size()>1){ if(r.size()>1){ - relationObj.region = "混合"; + relationObj.region = "娣峰悎"; } relationObj.put("id_group", idGroup); relationObj.put("relations", relatedDBObjs); @@ -529,13 +529,13 @@ class CleanRepeatDistrict1 { if(obj1.name.toString()==obj2.name.toString()){ if(obj1.region.toString()==obj2.region.toString()){ - println "区域 +名称==相同 "+obj1.region.toString() +" "+obj2.name.toString()+" ["+obj1.address+"]["+obj2.address+"]" + println "鍖哄煙 +鍚嶇О==鐩稿悓 "+obj1.region.toString() +" "+obj2.name.toString()+" ["+obj1.address+"]["+obj2.address+"]" return true; }else{ def flag = latLngCompare(obj1, obj2); if(flag){ - println "区域 +名称==不相同 相距5000内 "+obj1.region.toString() +" "+obj2.name.toString()+" ["+obj1.address+"]["+obj2.address+"]" + println "鍖哄煙 +鍚嶇О==涓嶇浉鍚� 鐩歌窛5000鍐� "+obj1.region.toString() +" "+obj2.name.toString()+" ["+obj1.address+"]["+obj2.address+"]" return true; }else{ def address1 = addressStandard(obj1.address, regions) @@ -555,7 +555,7 @@ class CleanRepeatDistrict1 { if(address1 == address2){ return true; } - if(address1.indexOf("弄")!=-1&&(address1.indexOf(address2)!=-1||address2.indexOf(address1)!=-1)){ + if(address1.indexOf("寮�")!=-1&&(address1.indexOf(address2)!=-1||address2.indexOf(address1)!=-1)){ return true; } } @@ -568,38 +568,38 @@ class CleanRepeatDistrict1 { } def findSimilarDistrictByAddress(def city, def obj1, def obj2, def regions){ - def name1 = obj1.name.toString().replaceAll(city+"市","").replaceAll(city,"").replace("(", "").replace(")", ""); - def name2 = obj2.name.toString().replaceAll(city+"市","").replaceAll(city,"").replace("(", "").replace(")", ""); + def name1 = obj1.name.toString().replaceAll(city+"甯�","").replaceAll(city,"").replace("锛�", "").replace("锛�", ""); + def name2 = obj2.name.toString().replaceAll(city+"甯�","").replaceAll(city,"").replace("锛�", "").replace("锛�", ""); def address1 = addressStandard(obj1.address.toString(), regions); def address2 = addressStandard(obj2.address.toString(), regions); def result = [:]; result.repeatFlag = false; - if(name1.indexOf("别墅")!=-1 && name2.indexOf("别墅")!=-1){ + if(name1.indexOf("鍒")!=-1 && name2.indexOf("鍒")!=-1){ result.repeatFlag = true; return result; - }else if(name1.indexOf("别墅")!=-1 || name2.indexOf("别墅")!=-1){ + }else if(name1.indexOf("鍒")!=-1 || name2.indexOf("鍒")!=-1){ return result; - }else if(name1.indexOf("期")!=-1 && name2.indexOf("期")!=-1 ){ - name1 = name1.substring(0,name1.indexOf("期")+1); - name2 = name2.substring(0,name2.indexOf("期")+1); + }else if(name1.indexOf("鏈�")!=-1 && name2.indexOf("鏈�")!=-1 ){ + name1 = name1.substring(0,name1.indexOf("鏈�")+1); + name2 = name2.substring(0,name2.indexOf("鏈�")+1); if(name1 == name2){ result.repeatFlag = true; return result; } result.repeatFlag = false; return result; - }else if(name1.indexOf("期")!=-1 || name2.indexOf("期")!=-1 ){ + }else if(name1.indexOf("鏈�")!=-1 || name2.indexOf("鏈�")!=-1 ){ result.repeatFlag = false; return result; }else{ double score1 = CosineSimilarAlgorithm.getSimilarity(address1, address2); double score2 = CosineSimilarAlgorithm.getSimilarity(name1,name2); - println "地址相似度score="+score1 +" 名称相似度score="+score2; -// writeTxt(" 地址相似度score="+score1 +" 名称相似度score="+score2+"\r\n"); + println "鍦板潃鐩镐技搴core="+score1 +" 鍚嶇О鐩镐技搴core="+score2; +// writeTxt(" 鍦板潃鐩镐技搴core="+score1 +" 鍚嶇О鐩镐技搴core="+score2+"\r\n"); result.address_score = score1; result.name_score =score2; - if(score1>=0.8 && score2>=0.6 && !address1.endsWith("路")){ + if(score1>=0.8 && score2>=0.6 && !address1.endsWith("璺�")){ result.repeatFlag = true; return result; } @@ -636,8 +636,8 @@ class CleanRepeatDistrict1 { return false; } public boolean isSameName(String name1, String name2){ - name1 = name1.replace("(", "").replace(")", "").replace("(", "").replace(")", "").replace("小区", ""); - name2 = name2.replace("(", "").replace(")", "").replace("(", "").replace(")", "").replace("小区", ""); + name1 = name1.replace("(", "").replace(")", "").replace("锛�", "").replace("锛�", "").replace("灏忓尯", ""); + name2 = name2.replace("(", "").replace(")", "").replace("锛�", "").replace("锛�", "").replace("灏忓尯", ""); name1 = name1.replaceAll(pattern, "") name2 = name2.replaceAll(pattern, "") if(name1.equals(name2)){ @@ -649,15 +649,15 @@ class CleanRepeatDistrict1 { def addressStandard(String address, def region){ if(address.indexOf(region)!=-1){ - address = address.replaceAll(region+"区","").replaceAll(region,""); + address = address.replaceAll(region+"鍖�","").replaceAll(region,""); } - if(address.indexOf("公路")!=-1){ - address = address.replaceAll("公路","路"); + if(address.indexOf("鍏矾")!=-1){ + address = address.replaceAll("鍏矾","璺�"); } - if(!address.startsWith("镇") && address.indexOf("镇")!=-1&&!address.endsWith("镇")){ - address = address.substring(address.indexOf("镇")+1, address.size()); + if(!address.startsWith("闀�") && address.indexOf("闀�")!=-1&&!address.endsWith("闀�")){ + address = address.substring(address.indexOf("闀�")+1, address.size()); } return address; } @@ -666,8 +666,8 @@ class CleanRepeatDistrict1 { def repeatFlag = false; if(obj1.lng && obj2.lng){ int gap = mapabc.caculateDistance(obj1.lng/10000000000, obj1.lat/10000000000, obj2.lng/10000000000, obj2.lat/10000000000) - println "有经纬度 distance:"+gap - writeTxt("有经纬度 distance:"+gap+"\r\n"); + println "鏈夌粡绾害 distance:"+gap + writeTxt("鏈夌粡绾害 distance:"+gap+"\r\n"); if(gap <= 500){ repeatFlag = true; } @@ -689,8 +689,8 @@ class CleanRepeatDistrict1 { } if(coord1 && coord2){ int gap = mapabc.caculateDistance(coord1[0], coord1[1], coord2[0], coord2[1]) - println "无经纬度 distance:"+gap - writeTxt("无经纬度 distance:"+gap+"\r\n"); + println "鏃犵粡绾害 distance:"+gap + writeTxt("鏃犵粡绾害 distance:"+gap+"\r\n"); if(gap <= 500){ repeatFlag = true; } @@ -708,16 +708,16 @@ class CleanRepeatDistrict1 { def maxDoc=null; for(def d: list){ int count=countNotEmptyField(d); - if(d.name.indexOf("动迁房")!=-1){ + if(d.name.indexOf("鍔ㄨ縼鎴�")!=-1){ count = 1; } if(d.name.indexOf("(")!=-1){ count = count -4; } - if(d.name.indexOf("路")!=-1){ + if(d.name.indexOf("璺�")!=-1){ count = count -2; } - if(d.name.indexOf("物业")!=-1){ + if(d.name.indexOf("鐗╀笟")!=-1){ if(count>0){ count = 0; } @@ -769,14 +769,14 @@ class CleanRepeatDistrict1 { } def writeTxt(text){ - new File("e://北京小区去重.txt").append(text); + new File("e://鍖椾含灏忓尯鍘婚噸.txt").append(text); } /** - * 验证并格式化区域 + * 楠岃瘉骞舵牸寮忓寲鍖哄煙 * @param city * @param region - * @return 区域非法返回NULL,否则返回格式化有的数据 + * @return 鍖哄煙闈炴硶杩斿洖NULL锛屽惁鍒欒繑鍥炴牸寮忓寲鏈夌殑鏁版嵁 */ private String validateAndFormatRegion(String city,String region){ DBObject keys = new BasicDBObject(); @@ -801,10 +801,10 @@ class CleanRepeatDistrict1 { } /** - * 验证板块并返回该板块所在的区域 + * 楠岃瘉鏉垮潡骞惰繑鍥炶鏉垮潡鎵�鍦ㄧ殑鍖哄煙 * @param city * @param block - * @return 板块非法返回NULL,否则返回格式化有的数据 + * @return 鏉垮潡闈炴硶杩斿洖NULL锛屽惁鍒欒繑鍥炴牸寮忓寲鏈夌殑鏁版嵁 */ private String validateAndFormatBlock(String city,String block){ DBObject keys = new BasicDBObject(); @@ -1065,7 +1065,7 @@ class CleanRepeatDistrict1 { public void removeInvalidValueField(Map resultObject, String category) { Set removeKeys = new HashSet(); for (String field : resultObject.keySet()) { - // 除了小区名称,其他的名称不需要验证 + // 闄や簡灏忓尯鍚嶇О锛屽叾浠栫殑鍚嶇О涓嶉渶瑕侀獙璇� if (!"district".equals(category) && "name".equals(field)) { continue; } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/CleanRepeatDistrict2.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/CleanRepeatDistrict2.groovy index a167fedec..49152990f 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/CleanRepeatDistrict2.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/CleanRepeatDistrict2.groovy @@ -36,35 +36,35 @@ class CleanRepeatDistrict2 { private Map fieldTypeMap = new HashMap(); private static Map> WEBSITE_MAP = new HashMap>(); private static Map> WEBSITE_SEEDS_MAP = new HashMap>(); - private static final String pattern ="(一|二|三|四|五|六|七|八|九|)+期(至(一|二|三|四|五|六|七|八|九|)期)*" + private static final String pattern ="(涓�|浜寍涓墊鍥泑浜攟鍏瓅涓億鍏珅涔潀)+鏈�(鑷�(涓�|浜寍涓墊鍥泑浜攟鍏瓅涓億鍏珅涔潀)鏈�)*" private Set usedName = []; private Set usedAddress = [] private List temp = new ArrayList(); static main(args) { CleanRepeatDistrict2 clean=new CleanRepeatDistrict2(); -// def cities = ["成都","南京","苏州","宁波","杭州","合肥","武汉","南昌","长沙","郑州","哈尔滨","大连","济南","沈阳","长春","贵阳","乌鲁木齐","兰州","厦门","福州","西安","太原","石家庄","昆明","青岛","呼和浩特","温州","西宁","芜湖","南宁","香港"]//,"广州","深圳","天津","南京"] - def cities = ["深圳"] +// def cities = ["鎴愰兘","鍗椾含","鑻忓窞","瀹佹尝","鏉窞","鍚堣偉","姝︽眽","鍗楁槍","闀挎矙","閮戝窞","鍝堝皵婊�","澶ц繛","娴庡崡","娌堥槼","闀挎槬","璐甸槼","涔岄瞾鏈ㄩ綈","鍏板窞","鍘﹂棬","绂忓窞","瑗垮畨","澶師","鐭冲搴�","鏄嗘槑","闈掑矝","鍛煎拰娴╃壒","娓╁窞","瑗垮畞","鑺滄箹","鍗楀畞","棣欐腐"]//,"骞垮窞","娣卞湷","澶╂触","鍗椾含"] + def cities = ["娣卞湷"] def categories = ["district"];//["district","office","shop"]; for(String city : cities) { for(String c:categories){ // clean.copyToTemp(city,c); - println new Date().format("yyyy/MM/dd HH:mm:ss")+"开始加载 $city 城市数据"; + println new Date().format("yyyy/MM/dd HH:mm:ss")+"寮�濮嬪姞杞� $city 鍩庡競鏁版嵁"; clean.loadTempData(city,c); - println new Date().format("yyyy/MM/dd HH:mm:ss")+"$city 城市数据加载结束"; - println new Date().format("yyyy/MM/dd HH:mm:ss")+"开始加载 $city 不关联数据"; + println new Date().format("yyyy/MM/dd HH:mm:ss")+"$city 鍩庡競鏁版嵁鍔犺浇缁撴潫"; + println new Date().format("yyyy/MM/dd HH:mm:ss")+"寮�濮嬪姞杞� $city 涓嶅叧鑱旀暟鎹�"; clean.loadUnRelationsData(city,c); - println new Date().format("yyyy/MM/dd HH:mm:ss")+"$city 不关联数据加载结束"; - println new Date().format("yyyy/MM/dd HH:mm:ss")+"开始统计 $city 关联小区"; + println new Date().format("yyyy/MM/dd HH:mm:ss")+"$city 涓嶅叧鑱旀暟鎹姞杞界粨鏉�"; + println new Date().format("yyyy/MM/dd HH:mm:ss")+"寮�濮嬬粺璁� $city 鍏宠仈灏忓尯"; clean.sameNameOrAddress(city); - println new Date().format("yyyy/MM/dd HH:mm:ss")+"统计 $city 关联小区结束"; + println new Date().format("yyyy/MM/dd HH:mm:ss")+"缁熻 $city 鍏宠仈灏忓尯缁撴潫"; } } } public void loadTempData(def city,def category){ temp.clear(); - Pattern pattern = Pattern.compile('^.*\\(南山\\).*$' );//TODO + Pattern pattern = Pattern.compile('^.*\\(鍗楀北\\).*$' );//TODO DBCursor tempCursor = tempRelation.find(new BasicDBObject("city",city).append("category", category)).addOption(Bytes.QUERYOPTION_NOTIMEOUT); BasicDBObject doc; while(tempCursor.hasNext()){ @@ -75,7 +75,7 @@ class CleanRepeatDistrict2 { public def copyToTemp(city,category){ - println "开始Copy数据到临时表:"+new Date().format("yyyy/MM/dd HH:mm:ss"); + println "寮�濮婥opy鏁版嵁鍒颁复鏃惰〃锛�"+new Date().format("yyyy/MM/dd HH:mm:ss"); tempRelation.remove(new BasicDBObject("city",city).append("category", category)); DSCursor cursor = seaweed.find(DataUtil.map2DBObject([city: city, cat:category,visible:0])); Iterator it=cursor.iterator(); @@ -130,7 +130,7 @@ class CleanRepeatDistrict2 { formatedRegion = validateAndFormatBlock(city, dbo.region); } if(formatedRegion == null){ - regions.add("非法的区域 "+ dbo.region+" "+ dbo.name); + regions.add("闈炴硶鐨勫尯鍩� "+ dbo.region+" "+ dbo.name); continue } dbo.region = formatedRegion; @@ -163,7 +163,7 @@ class CleanRepeatDistrict2 { if (newObj.get("estate_type2") != null) { String estateType = (String) newObj.get("estate_type2"); - String[] a = ["小区", "住宅", "商住", "别墅", "公寓", "洋房", "高层", "小高层", "洋楼" ]; + String[] a = ["灏忓尯", "浣忓畢", "鍟嗕綇", "鍒", "鍏瘬", "娲嬫埧", "楂樺眰", "灏忛珮灞�", "娲嬫ゼ" ]; if(StringUtils.indexOfAny(estateType,a ) > -1) { dbo.put("data",newObj); } @@ -181,7 +181,7 @@ class CleanRepeatDistrict2 { regions.each { println it; } - println "数据Copy完毕:"+new Date().format("yyyy/MM/dd HH:mm:ss"); + println "鏁版嵁Copy瀹屾瘯锛�"+new Date().format("yyyy/MM/dd HH:mm:ss"); } public def loadUnRelationsData(String city,String category){ @@ -223,7 +223,7 @@ class CleanRepeatDistrict2 { BasicDBObject doc; while(tempCursor.hasNext()){ doc = (BasicDBObject)tempCursor.next(); - if(doc.name.contains("(蛇口)")||doc.name.contains("金山花园")){ + if(doc.name.contains("(铔囧彛)")||doc.name.contains("閲戝北鑺卞洯")){ println "111"; } if(usedName.contains(doc.name)||usedAddress.contains(doc.address)){ @@ -244,7 +244,7 @@ class CleanRepeatDistrict2 { } if(regions.size()>1){ - relationObj.region ="混合"; + relationObj.region ="娣峰悎"; }else{ relationObj.region = regions.get(0); } @@ -447,8 +447,8 @@ class CleanRepeatDistrict2 { return false; } public boolean isSameName(String name1, String name2){ - name1 = name1.replace("(", "").replace(")", "").replace("(", "").replace(")", "").replace("小区", "").replace("公寓", ""); - name2 = name2.replace("(", "").replace(")", "").replace("(", "").replace(")", "").replace("小区", "").replace("公寓", ""); + name1 = name1.replace("(", "").replace(")", "").replace("锛�", "").replace("锛�", "").replace("灏忓尯", "").replace("鍏瘬", ""); + name2 = name2.replace("(", "").replace(")", "").replace("锛�", "").replace("锛�", "").replace("灏忓尯", "").replace("鍏瘬", ""); name1 = name1.replaceAll(pattern, "") name2 = name2.replaceAll(pattern, "") if(name1.equals(name2)){ @@ -459,17 +459,17 @@ class CleanRepeatDistrict2 { def addressStandard(String address, def region){ if(address.indexOf(region)!=-1){ - address = address.replaceAll(region+"区",""); + address = address.replaceAll(region+"鍖�",""); } - if(address.indexOf("公路")!=-1){ - address = address.replaceAll("公路","路"); + if(address.indexOf("鍏矾")!=-1){ + address = address.replaceAll("鍏矾","璺�"); } address = AddressParserUtils.filterZhen(address); - if(address.endsWith("号")){ + if(address.endsWith("鍙�")){ address = address.substring(0,address.length()-1) } - if(address.endsWith("弄")){ + if(address.endsWith("寮�")){ address = address.substring(0,address.length()-1) } return address; @@ -481,16 +481,16 @@ class CleanRepeatDistrict2 { def maxDoc=null; for(def d: list){ int count=countNotEmptyField(d); - if(d.name.indexOf("动迁房")!=-1){ + if(d.name.indexOf("鍔ㄨ縼鎴�")!=-1){ count = 1; } if(d.name.indexOf("(")!=-1){ count = count -4; } - if(d.name.indexOf("路")!=-1){ + if(d.name.indexOf("璺�")!=-1){ count = count -2; } - if(d.name.indexOf("物业")!=-1){ + if(d.name.indexOf("鐗╀笟")!=-1){ if(count>0){ count = 0; } @@ -513,10 +513,10 @@ class CleanRepeatDistrict2 { } /** - * 验证并格式化区域 + * 楠岃瘉骞舵牸寮忓寲鍖哄煙 * @param city * @param region - * @return 区域非法返回NULL,否则返回格式化有的数据 + * @return 鍖哄煙闈炴硶杩斿洖NULL锛屽惁鍒欒繑鍥炴牸寮忓寲鏈夌殑鏁版嵁 */ private String validateAndFormatRegion(String city,String region){ DBObject keys = new BasicDBObject(); @@ -541,10 +541,10 @@ class CleanRepeatDistrict2 { } /** - * 验证板块并返回该板块所在的区域 + * 楠岃瘉鏉垮潡骞惰繑鍥炶鏉垮潡鎵�鍦ㄧ殑鍖哄煙 * @param city * @param block - * @return 板块非法返回NULL,否则返回格式化有的数据 + * @return 鏉垮潡闈炴硶杩斿洖NULL锛屽惁鍒欒繑鍥炴牸寮忓寲鏈夌殑鏁版嵁 */ private String validateAndFormatBlock(String city,String block){ DBObject keys = new BasicDBObject(); @@ -805,7 +805,7 @@ class CleanRepeatDistrict2 { public void removeInvalidValueField(Map resultObject, String category) { Set removeKeys = new HashSet(); for (String field : resultObject.keySet()) { - // 除了小区名称,其他的名称不需要验证 + // 闄や簡灏忓尯鍚嶇О锛屽叾浠栫殑鍚嶇О涓嶉渶瑕侀獙璇� if (!"district".equals(category) && "name".equals(field)) { continue; } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/CorrectDistrictCity.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/CorrectDistrictCity.groovy index cf89bba5b..4413a33f5 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/CorrectDistrictCity.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/CorrectDistrictCity.groovy @@ -35,13 +35,13 @@ class CorrectDistrictCity { static main(args) { CorrectDistrictCity correct=new CorrectDistrictCity(); correct.importToSeabird(); -// println correct.getSiblingCity("广州") +// println correct.getSiblingCity("骞垮窞") } public void process(){ println "process start ${new Date()}" // DataUtil.map2DBObject([coord:0]) -// def queryParam=DataUtil.map2DBObject([city:"广州",name:"华景里"]) +// def queryParam=DataUtil.map2DBObject([city:"骞垮窞",name:"鍗庢櫙閲�"]) def queryParam=DataUtil.map2DBObject([check_city:3]) DBCursor cur=source.find(queryParam).sort(DataUtil.map2DBObject([_id:1])); println cur.count() @@ -67,10 +67,10 @@ class CorrectDistrictCity { } /** - * 0:未知 - * 1:正确 - * 2:包含其它城市名的路名 - * 3:包含其它城市 + * 0锛氭湭鐭� + * 1锛氭纭� + * 2锛氬寘鍚叾瀹冨煄甯傚悕鐨勮矾鍚� + * 3锛氬寘鍚叾瀹冨煄甯� * @param dbObj * @return */ @@ -91,14 +91,14 @@ class CorrectDistrictCity { } if(address.indexOf(d) !=-1){ hasCity=true; - if(d=="珠海"){ - if(address.indexOf("海珠海")!=-1)continue; + if(d=="鐝犳捣"){ + if(address.indexOf("娴风彔娴�")!=-1)continue; } def pattern - if(d=="镇江"){ - if(address.indexOf("镇江苏")!=-1)continue; + if(d=="闀囨睙"){ + if(address.indexOf("闀囨睙鑻�")!=-1)continue; - pattern=Pattern.compile(d+"市"); + pattern=Pattern.compile(d+"甯�"); if(pattern.matcher(address).find()){ result=3; break; @@ -108,7 +108,7 @@ class CorrectDistrictCity { break; } }else{ - pattern=Pattern.compile(d+"[^市]{0,2}(路|街|大道|镇|道|省|墩|珠区|东|南|西|北|广场|公园|理工|酒店|军区|新区|区|县)"); + pattern=Pattern.compile(d+"[^甯俔{0,2}(璺瘄琛梶澶ч亾|闀噟閬搢鐪亅澧﹟鐝犲尯|涓渱鍗梶瑗縷鍖梶骞垮満|鍏洯|鐞嗗伐|閰掑簵|鍐涘尯|鏂板尯|鍖簗鍘�)"); if(pattern.matcher(address).find()){ result=2; hasCity=false; @@ -166,27 +166,27 @@ class CorrectDistrictCity { siblingCitys[city]=citys; } } - if(city=="上海"){ + if(city=="涓婃捣"){ - citys.addAll(getSiblingCity("杭州")); - citys.addAll(getSiblingCity("苏州")); - citys.add("昆山") - }else if(city=="北京"){ + citys.addAll(getSiblingCity("鏉窞")); + citys.addAll(getSiblingCity("鑻忓窞")); + citys.add("鏄嗗北") + }else if(city=="鍖椾含"){ - citys.addAll(getSiblingCity("石家庄")); - citys.addAll(getSiblingCity("天津")); - }else if(city=="天津"){ - citys.addAll(getSiblingCity("石家庄")); - citys.addAll(getSiblingCity("北京")); - }else if(city=="重庆"){ - citys.addAll(getSiblingCity("成都")); + citys.addAll(getSiblingCity("鐭冲搴�")); + citys.addAll(getSiblingCity("澶╂触")); + }else if(city=="澶╂触"){ + citys.addAll(getSiblingCity("鐭冲搴�")); + citys.addAll(getSiblingCity("鍖椾含")); + }else if(city=="閲嶅簡"){ + citys.addAll(getSiblingCity("鎴愰兘")); } return citys; } String formatCity(String city){ - if(city.endsWith("市")){ + if(city.endsWith("甯�")){ return city.substring(0, city.length()-1); } return city; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/CrawlAnjukeHouseholdCount.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/CrawlAnjukeHouseholdCount.groovy index d7face7a5..37ddc8257 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/CrawlAnjukeHouseholdCount.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/CrawlAnjukeHouseholdCount.groovy @@ -18,73 +18,73 @@ import com.fangjia.script.util.DataUtil class CrawlAnjukeHouseholdCount { - def cityUrls=["北京": "http://beijing.anjuke.com", - "保定": "http://baoding.anjuke.com", - "成都": "http://chengdu.anjuke.com", - "重庆": "http://chongqing.anjuke.com", - "长沙": "http://cs.anjuke.com", - "长春": "http://cc.anjuke.com", - "常州": "http://cz.anjuke.com", - "大连": "http://dalian.anjuke.com", - "东莞": "http://dg.anjuke.com", - "福州": "http://fz.anjuke.com", - "佛山": "http://foshan.anjuke.com", - "广州": "http://guangzhou.anjuke.com", - "贵阳": "http://gy.anjuke.com", - "桂林": "http://guilin.anjuke.com", - "杭州": "http://hangzhou.anjuke.com", - "哈尔滨": "http://heb.anjuke.com", - "合肥": "http://hf.anjuke.com", - "海口": "http://haikou.anjuke.com", - "呼和浩特": "http://huhehaote.anjuke.com", - "邯郸": "http://handan.anjuke.com", - "惠州": "http://huizhou.anjuke.com", - "济南": "http://jinan.anjuke.com", - "吉林": "http://jilin.anjuke.com", - "嘉兴": "http://jx.anjuke.com", - "昆明": "http://km.anjuke.com", - "昆山": "http://ks.anjuke.com", - "兰州": "http://lanzhou.anjuke.com", - "廊坊": "http://langfang.anjuke.com", - "洛阳": "http://luoyang.anjuke.com", - "绵阳": "http://mianyang.anjuke.com", - "南京": "http://nanjing.anjuke.com", - "南昌": "http://nc.anjuke.com", - "南宁": "http://nanning.anjuke.com", - "宁波": "http://nb.anjuke.com", - "南通": "http://nantong.anjuke.com", - "青岛": "http://qd.anjuke.com", - "秦皇岛": "http://qinhuangdao.anjuke.com", - "泉州": "http://quanzhou.anjuke.com", - "上海": "http://shanghai.anjuke.com", - "深圳": "http://shenzhen.anjuke.com", - "苏州": "http://suzhou.anjuke.com", - "沈阳": "http://sy.anjuke.com", - "三亚": "http://sanya.anjuke.com", - "石家庄": "http://sjz.anjuke.com", - "绍兴": "http://shaoxing.anjuke.com", - "天津": "http://tianjin.anjuke.com", - "太原": "http://ty.anjuke.com", - "唐山": "http://tangshan.anjuke.com", - "泰州": "http://taizhou.anjuke.com", - "武汉": "http://wuhan.anjuke.com", - "无锡": "http://wuxi.anjuke.com", - "威海": "http://weihai.anjuke.com", - "潍坊": "http://weifang.anjuke.com", - "厦门": "http://xm.anjuke.com", - "西安": "http://xa.anjuke.com", - "徐州": "http://xuzhou.anjuke.com", - "银川": "http://yinchuan.anjuke.com", - "扬州": "http://yangzhou.anjuke.com", - "烟台": "http://yt.anjuke.com", - "宜昌": "http://yichang.anjuke.com", - "郑州": "http://zhengzhou.anjuke.com", - "珠海": "http://zh.anjuke.com", - "中山": "http://zs.anjuke.com", - "镇江": "http://zhenjiang.anjuke.com" + def cityUrls=["鍖椾含": "http://beijing.anjuke.com", + "淇濆畾": "http://baoding.anjuke.com", + "鎴愰兘": "http://chengdu.anjuke.com", + "閲嶅簡": "http://chongqing.anjuke.com", + "闀挎矙": "http://cs.anjuke.com", + "闀挎槬": "http://cc.anjuke.com", + "甯稿窞": "http://cz.anjuke.com", + "澶ц繛": "http://dalian.anjuke.com", + "涓滆帪": "http://dg.anjuke.com", + "绂忓窞": "http://fz.anjuke.com", + "浣涘北": "http://foshan.anjuke.com", + "骞垮窞": "http://guangzhou.anjuke.com", + "璐甸槼": "http://gy.anjuke.com", + "妗傛灄": "http://guilin.anjuke.com", + "鏉窞": "http://hangzhou.anjuke.com", + "鍝堝皵婊�": "http://heb.anjuke.com", + "鍚堣偉": "http://hf.anjuke.com", + "娴峰彛": "http://haikou.anjuke.com", + "鍛煎拰娴╃壒": "http://huhehaote.anjuke.com", + "閭兏": "http://handan.anjuke.com", + "鎯犲窞": "http://huizhou.anjuke.com", + "娴庡崡": "http://jinan.anjuke.com", + "鍚夋灄": "http://jilin.anjuke.com", + "鍢夊叴": "http://jx.anjuke.com", + "鏄嗘槑": "http://km.anjuke.com", + "鏄嗗北": "http://ks.anjuke.com", + "鍏板窞": "http://lanzhou.anjuke.com", + "寤婂潑": "http://langfang.anjuke.com", + "娲涢槼": "http://luoyang.anjuke.com", + "缁甸槼": "http://mianyang.anjuke.com", + "鍗椾含": "http://nanjing.anjuke.com", + "鍗楁槍": "http://nc.anjuke.com", + "鍗楀畞": "http://nanning.anjuke.com", + "瀹佹尝": "http://nb.anjuke.com", + "鍗楅��": "http://nantong.anjuke.com", + "闈掑矝": "http://qd.anjuke.com", + "绉︾殗宀�": "http://qinhuangdao.anjuke.com", + "娉夊窞": "http://quanzhou.anjuke.com", + "涓婃捣": "http://shanghai.anjuke.com", + "娣卞湷": "http://shenzhen.anjuke.com", + "鑻忓窞": "http://suzhou.anjuke.com", + "娌堥槼": "http://sy.anjuke.com", + "涓変簹": "http://sanya.anjuke.com", + "鐭冲搴�": "http://sjz.anjuke.com", + "缁嶅叴": "http://shaoxing.anjuke.com", + "澶╂触": "http://tianjin.anjuke.com", + "澶師": "http://ty.anjuke.com", + "鍞愬北": "http://tangshan.anjuke.com", + "娉板窞": "http://taizhou.anjuke.com", + "姝︽眽": "http://wuhan.anjuke.com", + "鏃犻敗": "http://wuxi.anjuke.com", + "濞佹捣": "http://weihai.anjuke.com", + "娼嶅潑": "http://weifang.anjuke.com", + "鍘﹂棬": "http://xm.anjuke.com", + "瑗垮畨": "http://xa.anjuke.com", + "寰愬窞": "http://xuzhou.anjuke.com", + "閾跺窛": "http://yinchuan.anjuke.com", + "鎵窞": "http://yangzhou.anjuke.com", + "鐑熷彴": "http://yt.anjuke.com", + "瀹滄槍": "http://yichang.anjuke.com", + "閮戝窞": "http://zhengzhou.anjuke.com", + "鐝犳捣": "http://zh.anjuke.com", + "涓北": "http://zs.anjuke.com", + "闀囨睙": "http://zhenjiang.anjuke.com" ] - static def citys=[/*"上海", */"北京", "广州", "深圳", "天津", "杭州", "南京", "西安", "成都", "武汉", "宁波", "青岛", "沈阳", "大连", "济南", "福州", "郑州", "长沙", "昆明", "厦门", "哈尔滨", "苏州", "无锡", "合肥", "太原", "石家庄", "南昌", "烟台", "佛山", "东莞", "温州", "绍兴", "常州", "南通", "珠海", "金华", "嘉兴", "昆山", "常熟", "萧山", "义乌", "余姚","慈溪","湖州","唐山","呼和浩特","中山","镇江","威海","东营","惠州","长春","扬州","泉州","大庆","徐州","盐城","江门","海口","汕头","南宁"]; + static def citys=[/*"涓婃捣", */"鍖椾含", "骞垮窞", "娣卞湷", "澶╂触", "鏉窞", "鍗椾含", "瑗垮畨", "鎴愰兘", "姝︽眽", "瀹佹尝", "闈掑矝", "娌堥槼", "澶ц繛", "娴庡崡", "绂忓窞", "閮戝窞", "闀挎矙", "鏄嗘槑", "鍘﹂棬", "鍝堝皵婊�", "鑻忓窞", "鏃犻敗", "鍚堣偉", "澶師", "鐭冲搴�", "鍗楁槍", "鐑熷彴", "浣涘北", "涓滆帪", "娓╁窞", "缁嶅叴", "甯稿窞", "鍗楅��", "鐝犳捣", "閲戝崕", "鍢夊叴", "鏄嗗北", "甯哥啛", "钀у北", "涔変箤", "浣欏","鎱堟邯","婀栧窞","鍞愬北","鍛煎拰娴╃壒","涓北","闀囨睙","濞佹捣","涓滆惀","鎯犲窞","闀挎槬","鎵窞","娉夊窞","澶у簡","寰愬窞","鐩愬煄","姹熼棬","娴峰彛","姹曞ご","鍗楀畞"]; DB mongoDb=new Mongo("192.168.0.67", 27017).getDB('fangjia'); DBCollection source = mongoDb.getCollection('district_20130904'); @@ -92,13 +92,13 @@ class CrawlAnjukeHouseholdCount { AtomicInteger countIndex=new AtomicInteger(); - static Pattern pattern_name = Pattern.compile("([^、期至]*)(([一二三四五六七八九\\d](、|期至))?[一二三四五六七八九\\d]期|小区)") + static Pattern pattern_name = Pattern.compile("([^銆佹湡鑷砞*)(([涓�浜屼笁鍥涗簲鍏竷鍏節\\d](銆亅鏈熻嚦))?[涓�浜屼笁鍥涗簲鍏竷鍏節\\d]鏈焲灏忓尯)") static Pattern pattern_houseHoldCount = Pattern.compile("([\\d]+)") static main(args) { CrawlAnjukeHouseholdCount crawl=new CrawlAnjukeHouseholdCount() crawl.procCitys() -// crawl.importSeabird("上海") +// crawl.importSeabird("涓婃捣") } void procCitys(){ @@ -122,10 +122,10 @@ class CrawlAnjukeHouseholdCount { println("get html failed: ${enterUrl}") return false } - Element firstEl= JQueryUtils.select("div.box :matches(区.*域:)", retxt).first() + Element firstEl= JQueryUtils.select("div.box :matches(鍖�.*鍩燂細)", retxt).first() def urlList=[:] int pageType=0 - //页面类型1 + //椤甸潰绫诲瀷1 if(firstEl){ Elements eles=firstEl.nextElementSibling().select("li a") for(Element el: eles){ @@ -143,7 +143,7 @@ class CrawlAnjukeHouseholdCount { str=str.substring(str.indexOf("/")+1) int pageCount=Integer.parseInt(str) if(pageCount>100){ - firstEl= JQueryUtils.select("div.box :matches(板.*块:)", retxt).first() + firstEl= JQueryUtils.select("div.box :matches(鏉�.*鍧楋細)", retxt).first() if(firstEl){ Elements eles2=firstEl.nextElementSibling().select("li:not(.active) a") for(Element el2: eles2){ @@ -156,14 +156,14 @@ class CrawlAnjukeHouseholdCount { } } } - }else{//页面类型2 - firstEl= JQueryUtils.select("ul.filter-list strong:contains(区域:)", retxt).first() + }else{//椤甸潰绫诲瀷2 + firstEl= JQueryUtils.select("ul.filter-list strong:contains(鍖哄煙锛�)", retxt).first() if(firstEl){ pageType=2 Elements eles=firstEl.nextElementSibling().select("a") for(Element el: eles){ String region=el.text() - if(region.contains("不限"))continue + if(region.contains("涓嶉檺"))continue String url2=el.attr("href") retxt=InvokeHttpRequest.get(url2, "utf-8") if(!retxt){ @@ -254,8 +254,8 @@ class CrawlAnjukeHouseholdCount { BasicDBObject rtNameDbj=findXqByName(city, region, xqName) if(rtNameDbj==null){ - if(xqName.matches("(\\.|·|\\-)")){ - xqName=xqName.replaceAll("(\\.|·|\\-)", "") + if(xqName.matches("(\\.|路|\\-)")){ + xqName=xqName.replaceAll("(\\.|路|\\-)", "") rtNameDbj=findXqByName(city, region, xqName) } if(rtNameDbj==null){ @@ -279,7 +279,7 @@ class CrawlAnjukeHouseholdCount { println("get html failed: ${city}, ${region}, ${name}, ${url}") return } - Element el= JQueryUtils.select("ul.brief-list :contains(户数)", retxt).first() + Element el= JQueryUtils.select("ul.brief-list :contains(鎴锋暟)", retxt).first() int houseHoldCount=0 if(el){ Matcher matcher=pattern_houseHoldCount.matcher(el.text()) @@ -291,7 +291,7 @@ class CrawlAnjukeHouseholdCount { source.save(rtNameDbj) - println ("${countIndex.get()}, ${city}, ${region}, ${xqName}, 户数:${houseHoldCount}") + println ("${countIndex.get()}, ${city}, ${region}, ${xqName}, 鎴锋暟锛�${houseHoldCount}") }catch(e){ e.printStackTrace() } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/CrawlBaiduAddress.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/CrawlBaiduAddress.groovy index 3e18f3888..7869084f6 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/CrawlBaiduAddress.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/CrawlBaiduAddress.groovy @@ -27,14 +27,14 @@ class CrawlBaiduAddress { static def city_urls=[:]; static{ - city_urls["上海"]="http://map.baidu.com/?newmap=1&reqflag=pcmap&biz=1&qt=bd&c=289&wd=%E6%A5%BC%E7%9B%98%E5%B0%8F%E5%8C%BA&pn=0&db=0&rn=10&wd2=&sug=0&on_gel=1&src=7&gr=3&b=(13343190.26,3556732.37;13745110.26,3735420.37)&l=10&nn=0&tn=B_NORMAL_MAP&ie=utf-8"; + city_urls["涓婃捣"]="http://map.baidu.com/?newmap=1&reqflag=pcmap&biz=1&qt=bd&c=289&wd=%E6%A5%BC%E7%9B%98%E5%B0%8F%E5%8C%BA&pn=0&db=0&rn=10&wd2=&sug=0&on_gel=1&src=7&gr=3&b=(13343190.26,3556732.37;13745110.26,3735420.37)&l=10&nn=0&tn=B_NORMAL_MAP&ie=utf-8"; } static main(args) { CrawlBaiduAddress crawl=new CrawlBaiduAddress(); - crawl.proc("上海"); + crawl.proc("涓婃捣"); // println("${135.287431 -121.529445}, ${36.38606 -31.216938}") // println("${135.176039 -121.429381}, ${36.40716 -31.233227}") @@ -80,7 +80,7 @@ class CrawlBaiduAddress { int failedCount=0; while(true){ int startRow=pageNo*10; - String cityUrl="http://map.baidu.com/?newmap=1&reqflag=pcmap&biz=1&qt=bd&c=289&wd=比萨&pn=${pageNo}&db=0&rn=10&wd2=&sug=0&on_gel=1&src=7&gr=3&b=(13506534.26,3641012.36;13531654.26,3649636.36)&l=13&nn=${startRow}&tn=B_NORMAL_MAP&ie=utf-8"; + String cityUrl="http://map.baidu.com/?newmap=1&reqflag=pcmap&biz=1&qt=bd&c=289&wd=姣旇惃&pn=${pageNo}&db=0&rn=10&wd2=&sug=0&on_gel=1&src=7&gr=3&b=(13506534.26,3641012.36;13531654.26,3649636.36)&l=13&nn=${startRow}&tn=B_NORMAL_MAP&ie=utf-8"; String bdRt=InvokeHttpRequest.get(cityUrl, "utf-8") if(bdRt){ def jsonDoc = null diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/CrawlBaiduMapDistrict.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/CrawlBaiduMapDistrict.groovy index ddbfb8ec4..1d7af9d31 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/CrawlBaiduMapDistrict.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/CrawlBaiduMapDistrict.groovy @@ -35,7 +35,7 @@ class CrawlBaiduMapDistrict { // crawl.procData() // crawl.procCompare() // crawl.procInvalid() - def rt=crawl.procBounds([city:"上海"], "楼盘") + def rt=crawl.procBounds([city:"涓婃捣"], "妤肩洏") // println rt.size() // println lonLat2Mercator(121.153145,31.174074) // println mercator2lonLat(13528317.45,3640769) @@ -69,12 +69,12 @@ class CrawlBaiduMapDistrict { while(true){ lastBounds=bounds // println bounds - //判断经度是否超出范围 - if(bounds[0][1]<=maxBounds[1][1] && bounds[0][0]>=maxBounds[1][0]){ //判断纬度是否超出范围 + //鍒ゆ柇缁忓害鏄惁瓒呭嚭鑼冨洿 + if(bounds[0][1]<=maxBounds[1][1] && bounds[0][0]>=maxBounds[1][0]){ //鍒ゆ柇绾害鏄惁瓒呭嚭鑼冨洿 println "break" break; }else if(bounds[0][0]>=maxBounds[1][0]){ - def loc3=GetLatLon(oriBounds[0][0],oriBounds[0][1], OFFSET, 180)//下移 + def loc3=GetLatLon(oriBounds[0][0],oriBounds[0][1], OFFSET, 180)//涓嬬Щ def loc4=[oriBounds[1][0], oriBounds[0][1]] oriBounds=[loc3, loc4] bounds=oriBounds; @@ -82,7 +82,7 @@ class CrawlBaiduMapDistrict { procDistrict(bounds, keyword); - def loc5=GetLatLon(bounds[1][0],bounds[1][1], OFFSET, 90) //水平右移 + def loc5=GetLatLon(bounds[1][0],bounds[1][1], OFFSET, 90) //姘村钩鍙崇Щ def loc6=[bounds[1][0], bounds[0][1]] bounds=[loc6, loc5] @@ -148,17 +148,17 @@ class CrawlBaiduMapDistrict { return bounds } - // 赤道半径 earth radius + // 璧ら亾鍗婂緞 earth radius final static int EARTH_RADIUS = 6378137; - /// 极半径 polar radius + /// 鏋佸崐寰� polar radius final static int POLAR_RADIUS = 6356725; - /// 纬度的弧度 + /// 绾害鐨勫姬搴� def RadLat(Lat) { return Lat * Math.PI / 180; } - /// 经度的弧度 + /// 缁忓害鐨勫姬搴� def RadLon(Lon) { return Lon * Math.PI / 180; } @@ -215,7 +215,7 @@ class CrawlBaiduMapDistrict { mercator = [x, y]; return mercator ; } - //墨卡托转经纬度 + //澧ㄥ崱鎵樿浆缁忕含搴� static def mercator2lonLat(x1 ,y1 ) { def lonLat; @@ -230,10 +230,10 @@ class CrawlBaiduMapDistrict { int countIndex=0; DBCollection districtRtDb = db67.getCollection('baidu_map_district_rt'); Pattern pa1=Pattern.compile("\\(.*\\)") - Pattern pa2=Pattern.compile("[东南西北一二三四五六七八九\\w]+(号门|门|大门|区)\$") - Pattern pa3=Pattern.compile("[\\d一二三四五六七八九]+(幢|号|栋)[\\w]{0,5}\$") - Pattern pa4=Pattern.compile("[东南西北一二三四五六七八九\\w]+(号门|门|大门|区)[东南西北一二三四五六七八九\\w]+(号门|门|大门|区)\$") - Pattern pa5=Pattern.compile("[\\d]+号?[~\\-]+[\\d]+号") + Pattern pa2=Pattern.compile("[涓滃崡瑗垮寳涓�浜屼笁鍥涗簲鍏竷鍏節\\w]+(鍙烽棬|闂▅澶ч棬|鍖�)\$") + Pattern pa3=Pattern.compile("[\\d涓�浜屼笁鍥涗簲鍏竷鍏節]+(骞鍙穦鏍�)[\\w]{0,5}\$") + Pattern pa4=Pattern.compile("[涓滃崡瑗垮寳涓�浜屼笁鍥涗簲鍏竷鍏節\\w]+(鍙烽棬|闂▅澶ч棬|鍖�)[涓滃崡瑗垮寳涓�浜屼笁鍥涗簲鍏竷鍏節\\w]+(鍙烽棬|闂▅澶ч棬|鍖�)\$") + Pattern pa5=Pattern.compile("[\\d]+鍙�?[锝瀄\-]+[\\d]+鍙�") districtDb.find().sort(DataUtil.map2DBObject([_id:1])).each { doc -> String name=doc.name if(pa1.matcher(name).find()){ @@ -264,10 +264,10 @@ class CrawlBaiduMapDistrict { int countIndex=0; districtRtDb.find().setOptions(Bytes.QUERYOPTION_NOTIMEOUT).each { doc -> String name=doc.name - if(name.endsWith('小区')){ - name=name.replace("小区", "") + if(name.endsWith('灏忓尯')){ + name=name.replace("灏忓尯", "") } - def doc2=districtOnlineDb.findOne(DataUtil.map2DBObject([city:"上海", name:[$regex: DataUtil.escapeRegexStr(name)]])) + def doc2=districtOnlineDb.findOne(DataUtil.map2DBObject([city:"涓婃捣", name:[$regex: DataUtil.escapeRegexStr(name)]])) if(!doc2){ districtCompareDb.save(DataUtil.map2DBObject([name:doc.name, status: 1])) } @@ -276,7 +276,7 @@ class CrawlBaiduMapDistrict { } countIndex=0; - districtOnlineDb.find(DataUtil.map2DBObject([city:"上海"])).setOptions(Bytes.QUERYOPTION_NOTIMEOUT).each { doc -> + districtOnlineDb.find(DataUtil.map2DBObject([city:"涓婃捣"])).setOptions(Bytes.QUERYOPTION_NOTIMEOUT).each { doc -> def doc2=districtRtDb.findOne(DataUtil.map2DBObject([name:[$regex: DataUtil.escapeRegexStr(doc.name)]])) if(!doc2){ districtCompareDb.save(DataUtil.map2DBObject([name:doc.name, status: 2])) @@ -300,7 +300,7 @@ class CrawlBaiduMapDistrict { def doc2=districtRtDb.findOne(DataUtil.map2DBObject([name:doc.name])) if(doc2){ String ret=InvokeHttpRequest.get("http://map.baidu.com/detail?qt=ninf&uid=${doc2.uid}&detail=house", "GBK", "http://map.baidu.com/") - if(ret && ret.indexOf("百度--您的访问出错了")!=-1){ + if(ret && ret.indexOf("鐧惧害--鎮ㄧ殑璁块棶鍑洪敊浜�")!=-1){ doc.status=4 districtCompareDb.save(doc) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/CrawlDistrictArea.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/CrawlDistrictArea.groovy index 45dd07174..9f5a243c3 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/CrawlDistrictArea.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/CrawlDistrictArea.groovy @@ -15,14 +15,14 @@ import com.fangjia.script.newDistrict.* class CrawlDistrictArea { //http://route.map.soso.com/?qt=poi&c=804&wd=%E6%96%B0%E6%B3%BE%E4%B8%89%E6%9D%91&pn=0&rn=9&bl=1&nj=0&nr=0&nf=1&l=15&rl=9&lc=1&nqc=0&owd=&qct=&output=jsonp&cb=QQMapLoader.cbhop9au00t - //获取soso map城市代码 + //鑾峰彇soso map鍩庡競浠g爜 //http://route.map.soso.com/?qt=cc&c=%E5%8C%97%E4%BA%AC&lc=3&output=html&cb=parent.QQMapLoader.cbhoqq9w3tr static def SOSO_CITYCODE=[:]; static{ - SOSO_CITYCODE["上海"]=804 - SOSO_CITYCODE["杭州"]=946 - SOSO_CITYCODE["北京"]=3 - SOSO_CITYCODE["南京"]=825 + SOSO_CITYCODE["涓婃捣"]=804 + SOSO_CITYCODE["鏉窞"]=946 + SOSO_CITYCODE["鍖椾含"]=3 + SOSO_CITYCODE["鍗椾含"]=825 } DB db67 = new Mongo("192.168.0.67", 27017).getDB("fangjia") @@ -37,7 +37,7 @@ class CrawlDistrictArea { double mtotalArea = 0; - if (MapUnits == "DEGREES")//经纬度坐标下的球面多边形 + if (MapUnits == "DEGREES")//缁忕含搴﹀潗鏍囦笅鐨勭悆闈㈠杈瑰舰 { double LowX = 0.0; double LowY = 0.0; @@ -177,11 +177,11 @@ class CrawlDistrictArea { Sum = (2 * Math.PI * Count1 - Sum1) + Sum2; } - //平方米 + //骞虫柟绫� mtotalArea = (Sum - (Count - 2) * Math.PI) * Radius * Radius; } else - { //非经纬度坐标下的平面多边形 + { //闈炵粡绾害鍧愭爣涓嬬殑骞抽潰澶氳竟褰� int i, j; //double j; @@ -399,7 +399,7 @@ class CrawlDistrictArea { // double tt=crawl.calcArea2("121.477967,31.193827;121.478135,31.19348;121.47825,31.193519;121.478582,31.192806;121.479052,31.192928;121.479064,31.192778;121.479115,31.192526;121.47927,31.191922;121.47698,31.191203;121.476795,31.19163;121.476489,31.192289;121.476273,31.192765;121.476028,31.193277;121.476154,31.193301;121.476745,31.193422;121.47686,31.193471;121.477091,31.19356;121.477282,31.193615;121.477967,31.193827") // println (tt) -// crawl.crawlSosoDistrictArea("上海") +// crawl.crawlSosoDistrictArea("涓婃捣") // println crawl.calcArea2('121.558593,31.150026;121.558662,31.14991;121.558742,31.149896;121.55883,31.149923;121.56013,31.150272;121.561292,31.150634;121.561236,31.150756;121.56118,31.151029;121.561143,31.151133;121.561115,31.151203;121.561091,31.151233;121.561067,31.15124;121.561035,31.15124;121.560898,31.151229;121.558521,31.150856;121.55851,31.150854;121.558499,31.150851;121.558488,31.150848;121.558477,31.150844;121.558462,31.150836;121.558458,31.150834;121.558434,31.150822;121.558426,31.150818;121.558419,31.150815;121.558368,31.150808;121.558593,31.150026'); // println engine.eval('testNumber("121.476154")'); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/CrawlHouseLoudongHelper.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/CrawlHouseLoudongHelper.groovy index 031019a97..cd9a6e2af 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/CrawlHouseLoudongHelper.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/CrawlHouseLoudongHelper.groovy @@ -92,7 +92,7 @@ class CrawlHouseLoudongHelper { int dbFromPriority=from_priorities[dbHouseLoudong.from]?:50; int newFromPriority=from_priorities[newHouseLoudong.from]?:50; - //如果数据来源优先级高于 新数据来源,则将数据库数据是空的,新数据非空的更新 + //濡傛灉鏁版嵁鏉ユ簮浼樺厛绾ч珮浜� 鏂版暟鎹潵婧愶紝鍒欏皢鏁版嵁搴撴暟鎹槸绌虹殑锛屾柊鏁版嵁闈炵┖鐨勬洿鏂� if(newFromPriority > dbFromPriority){ for(def d: dbHouseLoudong){ String key=d.key; @@ -112,7 +112,7 @@ class CrawlHouseLoudongHelper { } } }else if(newFromPriority <= dbFromPriority){ - //如果数据来源低于新数据来源,则将用新数据非空数据的更新数据库的 + //濡傛灉鏁版嵁鏉ユ簮浣庝簬鏂版暟鎹潵婧愶紝鍒欏皢鐢ㄦ柊鏁版嵁闈炵┖鏁版嵁鐨勬洿鏂版暟鎹簱鐨� boolean changed=false; for(def d: dbHouseLoudong){ String key=d.key; @@ -162,7 +162,7 @@ class CrawlHouseLoudongHelper { } if(heightRt.size()>0){ int max=heightRt.values().max(); - //高度出现次数大于户数的一半 + //楂樺害鍑虹幇娆℃暟澶т簬鎴锋暟鐨勪竴鍗� if(max >= roomList.size()/2){ for(def d: heightRt){ if(d.value==max){ @@ -252,7 +252,7 @@ class CrawlHouseLoudongHelper { } houseNum.house_num=trimZero(houseNum.house_num); - //如果house_num空则取消 + //濡傛灉house_num绌哄垯鍙栨秷 if(!houseNum.house_num){ return room_count; } @@ -264,7 +264,7 @@ class CrawlHouseLoudongHelper { queryParam=DataUtil.map2DBObject(queryParam) def houseNum2=houseNumDb.findOne(queryParam) - //判断楼号是否是新楼号,没有则创建新楼号 + //鍒ゆ柇妤煎彿鏄惁鏄柊妤煎彿锛屾病鏈夊垯鍒涘缓鏂版ゼ鍙� if(!houseNum2){ def house_num_units=new LinkedList(houseNum.house_num_units); houseNum.house_num_units=[]; @@ -294,7 +294,7 @@ class CrawlHouseLoudongHelper { houseNumDb.save(houseNum) result=1; }else{ - //如果楼号已存在,则比较所有的单元是否都已保存,将只保存未导入的单元 + //濡傛灉妤煎彿宸插瓨鍦紝鍒欐瘮杈冩墍鏈夌殑鍗曞厓鏄惁閮藉凡淇濆瓨锛屽皢鍙繚瀛樻湭瀵煎叆鐨勫崟鍏� updateHouseNum(houseNum, houseNum2, roomListMap, houseNumDb, houseDb, from); } return room_count; @@ -341,7 +341,7 @@ class CrawlHouseLoudongHelper { int maxFloorHeight=parseHouseHeight(roomList) for(def room: roomList){ room.house_height=maxFloorHeight; - //有可能house_num_unit改了,重新设置下 + //鏈夊彲鑳絟ouse_num_unit鏀逛簡锛岄噸鏂拌缃笅 room.house_num_unit=house_num_unit; room_count+=saveHouseLoudong(room, houseNum, house_num_unit, true, houseDb, from); @@ -350,7 +350,7 @@ class CrawlHouseLoudongHelper { } /** - * from参数为第三方网站抓取查询使用,其它慎用 + * from鍙傛暟涓虹涓夋柟缃戠珯鎶撳彇鏌ヨ浣跨敤锛屽叾瀹冩厧鐢� * * @param houseLoudong * @param houseNum @@ -447,18 +447,18 @@ class CrawlHouseLoudongHelper { static def findHouseNumInOtherPhase(def fromHouseNum, def addressDb, def houseNumDb){ def otherHouseNum=null; - //判断小区是否存,如不存则返回。 parent_id: null指取一个小区有多个地址的父地址,小区名都一样,地址不一样 + //鍒ゆ柇灏忓尯鏄惁瀛橈紝濡備笉瀛樺垯杩斿洖銆� parent_id: null鎸囧彇涓�涓皬鍖烘湁澶氫釜鍦板潃鐨勭埗鍦板潃锛屽皬鍖哄悕閮戒竴鏍凤紝鍦板潃涓嶄竴鏍� def addressName=addressDb.findOne(DataUtil.map2DBObject([city: fromHouseNum.city, district: fromHouseNum.region, name: fromHouseNum.name, parent_id:null])) if(!addressName){ return otherHouseNum; } - //检测小区其它期是否已存在该楼号 + //妫�娴嬪皬鍖哄叾瀹冩湡鏄惁宸插瓨鍦ㄨ妤煎彿 def addressNames=[addressName] - //如果有addressName.parent_name表示addressName是子分期地址,通过parent_name查出小区所有期的名称 + //濡傛灉鏈塧ddressName.parent_name琛ㄧずaddressName鏄瓙鍒嗘湡鍦板潃锛岄�氳繃parent_name鏌ュ嚭灏忓尯鎵�鏈夋湡鐨勫悕绉� if(addressName.parent_name){ - //分期小区有一个地址是主地址,同一小区的不同期都关联到这个主地址,用parent_name_id关联,如果parent_name_id一样,即表示同一个小区 - //加parent_id:null,是因为有的小区有多个地址,多个地址关联主地址通过parent_id关联,parent_id:null表示只查主地址 + //鍒嗘湡灏忓尯鏈変竴涓湴鍧�鏄富鍦板潃锛屽悓涓�灏忓尯鐨勪笉鍚屾湡閮藉叧鑱斿埌杩欎釜涓诲湴鍧�锛岀敤parent_name_id鍏宠仈锛屽鏋減arent_name_id涓�鏍凤紝鍗宠〃绀哄悓涓�涓皬鍖� + //鍔爌arent_id:null锛屾槸鍥犱负鏈夌殑灏忓尯鏈夊涓湴鍧�锛屽涓湴鍧�鍏宠仈涓诲湴鍧�閫氳繃parent_id鍏宠仈锛宲arent_id:null琛ㄧず鍙煡涓诲湴鍧� addressDb.find(DataUtil.map2DBObject([parent_name_id: addressName.parent_name_id, parent_id:null])).each{ addressDoc -> if(!addressNames.contains(addressDoc.name)){ addressNames << addressDoc @@ -470,14 +470,14 @@ class CrawlHouseLoudongHelper { } } }else{ - //如果没有addressName.parent_name,表示addressName是小区主地址,尝试去查是否有分期小区,有则加到addressNames + //濡傛灉娌℃湁addressName.parent_name锛岃〃绀篴ddressName鏄皬鍖轰富鍦板潃锛屽皾璇曞幓鏌ユ槸鍚︽湁鍒嗘湡灏忓尯锛屾湁鍒欏姞鍒癮ddressNames addressDb.find(DataUtil.map2DBObject([parent_name_id: addressName._id, parent_id:null])).each{ addressDoc -> if(!addressNames.contains(addressDoc.name)){ addressNames << addressDoc } } } - //判断是否有楼号在其它期里已存在,存在则返回 + //鍒ゆ柇鏄惁鏈夋ゼ鍙峰湪鍏跺畠鏈熼噷宸插瓨鍦紝瀛樺湪鍒欒繑鍥� for(def d: addressNames){ otherHouseNum=houseNumDb.findOne(DataUtil.map2DBObject([city: fromHouseNum.city, region: fromHouseNum.region, name: d.name, house_num: fromHouseNum.house_num])); @@ -489,7 +489,7 @@ class CrawlHouseLoudongHelper { } /** - * true: 有效,false: 无效 + * true: 鏈夋晥锛宖alse: 鏃犳晥 * @param houseLoudong * @return */ @@ -510,13 +510,13 @@ class CrawlHouseLoudongHelper { return verified; } /** - * true: 有效,false: 无效 + * true: 鏈夋晥锛宖alse: 鏃犳晥 * @param houseLoudong * @return */ static boolean checkHouseHeight(def houseLoudong){ boolean verified=true; - //houseLoudong.house_height + 6 可能有的名义楼层比实际楼层大,像有的楼跳过带4的 + //houseLoudong.house_height + 6 鍙兘鏈夌殑鍚嶄箟妤煎眰姣斿疄闄呮ゼ灞傚ぇ锛屽儚鏈夌殑妤艰烦杩囧甫4鐨� if(houseLoudong.house_height<=0 || houseLoudong.house_floor > (houseLoudong.house_height + 6) || houseLoudong.house_height> MAX_HEIGHT){ verified=false; } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/CrawlHouseNumCoord.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/CrawlHouseNumCoord.groovy index 65cf1b2e0..035213b91 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/CrawlHouseNumCoord.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/CrawlHouseNumCoord.groovy @@ -23,18 +23,18 @@ class CrawlHouseNumCoord { static def SOSO_CITYCODE=[:]; static{ - SOSO_CITYCODE["上海"]=804 - SOSO_CITYCODE["杭州"]=946 - SOSO_CITYCODE["北京"]=3 - SOSO_CITYCODE["南京"]=825 + SOSO_CITYCODE["涓婃捣"]=804 + SOSO_CITYCODE["鏉窞"]=946 + SOSO_CITYCODE["鍖椾含"]=3 + SOSO_CITYCODE["鍗椾含"]=825 } static main(args) { PropertyConfigurator.configure(CrawlDistrictArea.class.getResource("/log4j.properties")); CrawlHouseNumCoord crawl=new CrawlHouseNumCoord(); - crawl.crawlHouseNumPoints([name:"莘城公寓", city:"上海"]) + crawl.crawlHouseNumPoints([name:"鑾樺煄鍏瘬", city:"涓婃捣"]) -// println crawl.crawlAreaPoints("天正桃源","南京") +// println crawl.crawlAreaPoints("澶╂妗冩簮","鍗椾含") } def crawlHouseNumPoints(def doc){ @@ -80,7 +80,7 @@ class CrawlHouseNumCoord { String name=doc.name String city=doc.city - String regex="([\\d]+)(幢|座|栋|号楼|号)\$"; + String regex="([\\d]+)(骞搴鏍媩鍙锋ゼ|鍙�)\$"; Pattern houseNumRegex=Pattern.compile("${name}${regex}") Matcher matcher=houseNumRegex.matcher(loc.name); boolean matched=false; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/CrawlLejuHouseLoudong.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/CrawlLejuHouseLoudong.groovy index 250733428..9667e6cde 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/CrawlLejuHouseLoudong.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/CrawlLejuHouseLoudong.groovy @@ -32,46 +32,46 @@ class CrawlLejuHouseLoudong { final static String FROM="leju"; static Pattern pattern_block_id = Pattern.compile("/BlockList/([\\w\\d\\-]+)/") static Pattern pattern_houseNum_id = Pattern.compile("ShowRoomList\\('([\\w\\d\\-]+)'(, '[^)]*')?\\)") - static Pattern pattern_houseNum = Pattern.compile("([\\d]+弄)?([A-Za-z\\d]+)(#|号楼|号|栋|幢|座)?(([\\d]+)单元)?") + static Pattern pattern_houseNum = Pattern.compile("([\\d]+寮�)?([A-Za-z\\d]+)(#|鍙锋ゼ|鍙穦鏍媩骞搴�)?(([\\d]+)鍗曞厓)?") static Pattern regExp_MapData=Pattern.compile("MapConfig\\.MapData = (.*);\r\n"); - static Pattern regExp_roomArea=Pattern.compile("([\\d\\.]+)㎡") + static Pattern regExp_roomArea=Pattern.compile("([\\d\\.]+)銕�") - static def citys=['北京', '上海', '广州', '沈阳', '长春', '天津', '青岛', '武汉', '南京', '大连', '苏州', '无锡', '南昌', '济南', '深圳', '厦门', '长沙', '成都', '重庆', '西安', '郑州', '杭州'] + static def citys=['鍖椾含', '涓婃捣', '骞垮窞', '娌堥槼', '闀挎槬', '澶╂触', '闈掑矝', '姝︽眽', '鍗椾含', '澶ц繛', '鑻忓窞', '鏃犻敗', '鍗楁槍', '娴庡崡', '娣卞湷', '鍘﹂棬', '闀挎矙', '鎴愰兘', '閲嶅簡', '瑗垮畨', '閮戝窞', '鏉窞'] - static def city_params=["北京": "beijing" - , "广州": "guangzhou" - , "沈阳": "shenyang" - , "长春": "changchun" - , "天津": "tianjin" - , "青岛": "qingdao" - , "武汉": "wuhan" - , "南京": "nanjing" - , "大连": "dalian" - , "苏州": "suzhou" - , "无锡": "wuxi" - , "南昌": "nanchang" - , "济南": "jinan" - , "深圳": "shenzhen" - , "厦门": "xiamen" - , "长沙": "changsha" - , "成都": "chengdu" - , "重庆": "chongqing" - , "西安": "xian" - , "郑州": "zhengzhou" - , "上海": "shanghai" - , "杭州": "hangzhou" + static def city_params=["鍖椾含": "beijing" + , "骞垮窞": "guangzhou" + , "娌堥槼": "shenyang" + , "闀挎槬": "changchun" + , "澶╂触": "tianjin" + , "闈掑矝": "qingdao" + , "姝︽眽": "wuhan" + , "鍗椾含": "nanjing" + , "澶ц繛": "dalian" + , "鑻忓窞": "suzhou" + , "鏃犻敗": "wuxi" + , "鍗楁槍": "nanchang" + , "娴庡崡": "jinan" + , "娣卞湷": "shenzhen" + , "鍘﹂棬": "xiamen" + , "闀挎矙": "changsha" + , "鎴愰兘": "chengdu" + , "閲嶅簡": "chongqing" + , "瑗垮畨": "xian" + , "閮戝窞": "zhengzhou" + , "涓婃捣": "shanghai" + , "鏉窞": "hangzhou" ] static main(args) { CrawlLejuHouseLoudong crawl=new CrawlLejuHouseLoudong(); crawl.processCitys() -// crawl.process("北京") -// def rtNameDbj=["city":"北京", name:"万博苑", region:"西城", alias:["万博苑", "万博园"], address:"宣武右安门内大街72号(大观园西500米)"] +// crawl.process("鍖椾含") +// def rtNameDbj=["city":"鍖椾含", name:"涓囧崥鑻�", region:"瑗垮煄", alias:["涓囧崥鑻�", "涓囧崥鍥�"], address:"瀹f鍙冲畨闂ㄥ唴澶ц72鍙凤紙澶ц鍥タ500绫筹級"] // crawl.procXq(rtNameDbj); // println crawl.parseRoomNum("10[3-10]"); -// println crawl.procInvalidHouseHeight(["city":"北京", region:"昌平", name:"新龙城",house_num:"19",house_num_unit:"1"]) +// println crawl.procInvalidHouseHeight(["city":"鍖椾含", region:"鏄屽钩", name:"鏂伴緳鍩�",house_num:"19",house_num_unit:"1"]) // crawl.importSoufunCrawl() // crawl.procInvalidHouseFloor() @@ -83,7 +83,7 @@ class CrawlLejuHouseLoudong { } public void processCitys(){ -// citys=["上海","北京"]; +// citys=["涓婃捣","鍖椾含"]; for(def city: citys){ process(city) countIndex.set(0) @@ -277,7 +277,7 @@ class CrawlLejuHouseLoudong { if(!elA)continue Matcher matcher=pattern_houseNum_id.matcher(elA.attr("href")) - //两种house num页面,根据href值判断 + //涓ょhouse num椤甸潰锛屾牴鎹甴ref鍊煎垽鏂� if(matcher.find()){ houseNumId=matcher.group(1) roomListUrl="http://fangjia.leju.com/${city_param}/r/d/${lejuParams.UnitID}/ROOMLIST/${houseNumId}" @@ -348,7 +348,7 @@ class CrawlLejuHouseLoudong { for(def houseUnitRooms: houseUnitsRoomList){ houseNumUnit=houseUnitRooms.key if(!dbObj || !dbObj.house_num_units.contains(houseNumUnit)){ - //将新unit存存入newUnits + //灏嗘柊unit瀛樺瓨鍏ewUnits newUnits << houseNumUnit; } houseNum.house_num_units << houseNumUnit @@ -369,7 +369,7 @@ class CrawlLejuHouseLoudong { if(!urls){ urls=[:] } - //新单元url加入 + //鏂板崟鍏僽rl鍔犲叆 for(String newUnit: newUnits){ urls[newUnit]=houseNum.url[newUnit] } @@ -477,12 +477,12 @@ class CrawlLejuHouseLoudong { } houseLoudong.house_floor=parseFloor(houseLoudong.room_num) - //进入room详细页面获取层高 + //杩涘叆room璇︾粏椤甸潰鑾峰彇灞傞珮 if(heightRt[houseNumUnit]==null){ if(houseLoudong.url){ String ret=InvokeHttpRequest.get(houseLoudong.url, "utf-8"); if(ret){ - Element ele = JQueryUtils.select("aside.ban_info_list span:contains(楼层)", ret).first(); + Element ele = JQueryUtils.select("aside.ban_info_list span:contains(妤煎眰)", ret).first(); if(ele){ Matcher matcher=regExp_floor.matcher(ele.nextElementSibling().text()); if(matcher.find()){ @@ -507,7 +507,7 @@ class CrawlLejuHouseLoudong { e.printStackTrace() } } - //处理有的单元号格式实际是楼层,判断每个单元和楼层是否一样,如一样指该单元号其实是楼层号,然后把所有单元合并成一个单元1,所有单元的room都是这个单元1的 + //澶勭悊鏈夌殑鍗曞厓鍙锋牸寮忓疄闄呮槸妤煎眰锛屽垽鏂瘡涓崟鍏冨拰妤煎眰鏄惁涓�鏍凤紝濡備竴鏍锋寚璇ュ崟鍏冨彿鍏跺疄鏄ゼ灞傚彿锛岀劧鍚庢妸鎵�鏈夊崟鍏冨悎骞舵垚涓�涓崟鍏�1锛屾墍鏈夊崟鍏冪殑room閮芥槸杩欎釜鍗曞厓1鐨� if(roomListMap.size()>4){ boolean flag=false for(def d: roomListMap){ @@ -536,13 +536,13 @@ class CrawlLejuHouseLoudong { return roomListMap } - static Pattern regExp_roomNum_1 = Pattern.compile("^([A-Za-z\\d]{2,}|全幢)(号|室|房)?\$") - static Pattern regExp_roomNum_2 = Pattern.compile("([A-Za-z\\d一二三四五六七八九]+)(单元|座|幢|单元层|#)(单元)?([A-Za-z\\d]{2,}|全幢)(号|室|房)?\$") - static Pattern regExp_roomNum_3 = Pattern.compile("([\\dA-Za-z]+)\\-([A-Za-z\\d]{2,}|全幢)") - static Pattern regExp_roomNum_4 = Pattern.compile("[\\d]+_[\\d]+层") - static Pattern regExp_roomNum_5 = Pattern.compile("[\\d]+层([A-Za-z\\d]{2,}|全幢)(号|室|房)?\$") - static Pattern regExp_roomNum_6 = Pattern.compile("([A-Za-z\\d]{2,}|全幢)(号|室|房)\$") - static Pattern regExp_roomNum_7 = Pattern.compile("([\\d]+梯)\\-([A-Za-z\\d]{2,}|全幢)") + static Pattern regExp_roomNum_1 = Pattern.compile("^([A-Za-z\\d]{2,}|鍏ㄥ耿)(鍙穦瀹鎴�)?\$") + static Pattern regExp_roomNum_2 = Pattern.compile("([A-Za-z\\d涓�浜屼笁鍥涗簲鍏竷鍏節]+)(鍗曞厓|搴骞鍗曞厓灞倈#)(鍗曞厓)?([A-Za-z\\d]{2,}|鍏ㄥ耿)(鍙穦瀹鎴�)?\$") + static Pattern regExp_roomNum_3 = Pattern.compile("([\\dA-Za-z]+)\\-([A-Za-z\\d]{2,}|鍏ㄥ耿)") + static Pattern regExp_roomNum_4 = Pattern.compile("[\\d]+_[\\d]+灞�") + static Pattern regExp_roomNum_5 = Pattern.compile("[\\d]+灞�([A-Za-z\\d]{2,}|鍏ㄥ耿)(鍙穦瀹鎴�)?\$") + static Pattern regExp_roomNum_6 = Pattern.compile("([A-Za-z\\d]{2,}|鍏ㄥ耿)(鍙穦瀹鎴�)\$") + static Pattern regExp_roomNum_7 = Pattern.compile("([\\d]+姊�)\\-([A-Za-z\\d]{2,}|鍏ㄥ耿)") def parseRoomNum(String str){ Matcher matcher=regExp_roomNum_1.matcher(str) @@ -699,7 +699,7 @@ class CrawlLejuHouseLoudong { String ret if(doc.url){ ret= InvokeHttpRequest.get(doc.url, "utf-8") - if(ret && ret.indexOf("您所访问的页面暂时无法显示")!=-1){ + if(ret && ret.indexOf("鎮ㄦ墍璁块棶鐨勯〉闈㈡殏鏃舵棤娉曟樉绀�")!=-1){ doc.status=1 houseLoudongDb.save(doc); return; @@ -707,7 +707,7 @@ class CrawlLejuHouseLoudong { } if(ret){ - Element ele = JQueryUtils.select("aside.ban_info_list span:contains(楼层)", ret).first(); + Element ele = JQueryUtils.select("aside.ban_info_list span:contains(妤煎眰)", ret).first(); if(ele){ Matcher matcher=regExp_floor.matcher(ele.nextElementSibling().text()); if(matcher.find()){ @@ -811,7 +811,7 @@ class CrawlLejuHouseLoudong { def list=cur2.toArray(); int maxFloorHeight=getHouseHeight(list) for(def room: list){ - //+4 考虑有些名义楼层不是实际楼层,像遇到4,14等楼层加1 + //+4 鑰冭檻鏈変簺鍚嶄箟妤煎眰涓嶆槸瀹為檯妤煎眰锛屽儚閬囧埌4锛�14绛夋ゼ灞傚姞1 if(room.house_floor > (room.house_height + 4)){ room.house_height=maxFloorHeight; room.status=3 diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/CrawlMoliHouseLoudong.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/CrawlMoliHouseLoudong.groovy index af895925e..6aca4a59e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/CrawlMoliHouseLoudong.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/CrawlMoliHouseLoudong.groovy @@ -24,24 +24,24 @@ class CrawlMoliHouseLoudong { DBCollection target = mongoDb.getCollection('house_loudong_crawl'); DBCollection houseNumTarget = mongoDb.getCollection('house_num_crawl'); - static Pattern pattern_name = Pattern.compile("([^、期至]*)(([一二三四五六七八九\\d](、|期至))?[一二三四五六七八九\\d]期|小区)") + static Pattern pattern_name = Pattern.compile("([^銆佹湡鑷砞*)(([涓�浜屼笁鍥涗簲鍏竷鍏節\\d](銆亅鏈熻嚦))?[涓�浜屼笁鍥涗簲鍏竷鍏節\\d]鏈焲灏忓尯)") static Pattern pattern_block_id = Pattern.compile("/BlockList/([\\w\\d\\-]+)/") static Pattern pattern_houseNum_id = Pattern.compile("ShowRoomList\\('([\\w\\d\\-]+)',.*\\)") - static Pattern pattern_houseNum = Pattern.compile("([\\d]+)(号|栋|幢)(([\\d]+)单元)?") + static Pattern pattern_houseNum = Pattern.compile("([\\d]+)(鍙穦鏍媩骞�)(([\\d]+)鍗曞厓)?") - static Pattern regExp_checkRoad2=Pattern.compile("^[\u4e00-\u9fa5]{2,15}(\u5927\u9053|\u8DEF|\u8857|街|道)[0-9]+(\u5F04|\u53F7)"); + static Pattern regExp_checkRoad2=Pattern.compile("^[\u4e00-\u9fa5]{2,15}(\u5927\u9053|\u8DEF|\u8857|琛梶閬�)[0-9]+(\u5F04|\u53F7)"); - static def citys=[/*"上海",*/ "杭州"] - static def city_params=["上海": [978, "shanghai"] - , "杭州": [184, "hangzhou"]] + static def citys=[/*"涓婃捣",*/ "鏉窞"] + static def city_params=["涓婃捣": [978, "shanghai"] + , "鏉窞": [184, "hangzhou"]] static main(args) { CrawlMoliHouseLoudong crawl=new CrawlMoliHouseLoudong(); crawl.processCitys() -// crawl.procXq("http://mg.cric.com/hangzhou/%E6%8B%B1%E5%A2%85/%E5%92%8C%E7%9D%A6/2505", "杭州",null,null); +// crawl.procXq("http://mg.cric.com/hangzhou/%E6%8B%B1%E5%A2%85/%E5%92%8C%E7%9D%A6/2505", "鏉窞",null,null); } @@ -79,7 +79,7 @@ class CrawlMoliHouseLoudong { try{ Element houseCountEl=el.nextElementSibling().nextElementSibling() String str=houseCountEl.text().trim() - int houseCount=Integer.parseInt(str.substring(0, str.indexOf("套"))) + int houseCount=Integer.parseInt(str.substring(0, str.indexOf("濂�"))) if(!houseCount){ return } @@ -108,8 +108,8 @@ class CrawlMoliHouseLoudong { queryName.name=xqName BasicDBObject rtNameDbj=source.findOne(queryName) if(rtNameDbj==null){ - if(xqName.matches("(\\.|·|\\-)")){ - xqName=xqName.replaceAll("(\\.|·|\\-)", "") + if(xqName.matches("(\\.|路|\\-)")){ + xqName=xqName.replaceAll("(\\.|路|\\-)", "") queryName.name=xqName rtNameDbj=source.findOne(queryName) } @@ -311,22 +311,22 @@ class CrawlMoliHouseLoudong { houseLoudong.room_info=bEles[0].text().trim() } /** - * 获取room详细 + * 鑾峰彇room璇︾粏 */ res=InvokeHttpRequest.get(roomDetailUrl, "utf-8", "http://mg.cric.com/${city_param[1]}/home") if(res){ Elements eles2 = JQueryUtils.select("section.houses_list li span", res) for(Element sEl: eles2){ - if(sEl.text().contains("面积:")){ + if(sEl.text().contains("闈㈢Н锛�")){ try{ - String areaStr=sEl.text().replace("面积:", "").replace("㎡", "").trim() + String areaStr=sEl.text().replace("闈㈢Н锛�", "").replace("銕�", "").trim() houseLoudong.house_area=Float.parseFloat(areaStr) }catch(Exception e){ e.printStackTrace() } - }else if(sEl.text().contains("楼层:")){ + }else if(sEl.text().contains("妤煎眰锛�")){ try{ - String str=sEl.text().replace("楼层:", "").replace("层", "").trim() + String str=sEl.text().replace("妤煎眰锛�", "").replace("灞�", "").trim() String[] strs=str.split("/") if(strs.length==2){ houseLoudong.house_floor=Float.parseFloat(strs[0]) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/CrawlMyLivingHouseholdCount.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/CrawlMyLivingHouseholdCount.groovy index ab5dae6d1..7132e1114 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/CrawlMyLivingHouseholdCount.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/CrawlMyLivingHouseholdCount.groovy @@ -25,7 +25,7 @@ class CrawlMyLivingHouseholdCount extends CrawlAnjukeHouseholdCount{ AtomicInteger countIndex=new AtomicInteger(); - static Pattern pattern_name = Pattern.compile("([^、期至]*)(([一二三四五六七八九\\d](、|期至))?[一二三四五六七八九\\d]期|小区)") + static Pattern pattern_name = Pattern.compile("([^銆佹湡鑷砞*)(([涓�浜屼笁鍥涗簲鍏竷鍏節\\d](銆亅鏈熻嚦))?[涓�浜屼笁鍥涗簲鍏竷鍏節\\d]鏈焲灏忓尯)") static Pattern pattern_houseHoldCount = Pattern.compile("([\\d]+)") static Pattern pattern_region = Pattern.compile("^([^/]*)/") @@ -33,11 +33,11 @@ class CrawlMyLivingHouseholdCount extends CrawlAnjukeHouseholdCount{ static main(args) { CrawlMyLivingHouseholdCount crawl=new CrawlMyLivingHouseholdCount() // crawl.procCitys() - crawl.importSeabird("上海") + crawl.importSeabird("涓婃捣") } void procCitys(){ - proc("上海") + proc("涓婃捣") println("complete! ${new Date()}") } @@ -103,8 +103,8 @@ class CrawlMyLivingHouseholdCount extends CrawlAnjukeHouseholdCount{ BasicDBObject rtNameDbj=findXqByName(city, region, xqName) if(rtNameDbj==null){ - if(xqName.matches("(\\.|·|\\-)")){ - xqName=xqName.replaceAll("(\\.|·|\\-)", "") + if(xqName.matches("(\\.|路|\\-)")){ + xqName=xqName.replaceAll("(\\.|路|\\-)", "") rtNameDbj=findXqByName(city, region, xqName) } if(rtNameDbj==null){ @@ -129,7 +129,7 @@ class CrawlMyLivingHouseholdCount extends CrawlAnjukeHouseholdCount{ println("get html failed: ${city}, ${region}, ${name}, ${url}") return } - Element el= JQueryUtils.select("div.fx_info div.table_plus table th:contains(总户数)", retxt).first() + Element el= JQueryUtils.select("div.fx_info div.table_plus table th:contains(鎬绘埛鏁�)", retxt).first() if(el){ Element elTd=el.nextElementSibling() if(elTd){ @@ -144,7 +144,7 @@ class CrawlMyLivingHouseholdCount extends CrawlAnjukeHouseholdCount{ source.save(rtNameDbj) - println ("${countIndex.get()}, ${city}, ${region}, ${xqName}, 户数:${houseHoldCount}, ${url}") + println ("${countIndex.get()}, ${city}, ${region}, ${xqName}, 鎴锋暟锛�${houseHoldCount}, ${url}") }catch(e){ e.printStackTrace() } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/CrawlQingdaoFDHouseLoudong.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/CrawlQingdaoFDHouseLoudong.groovy index 133f00049..7ddd20b1a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/CrawlQingdaoFDHouseLoudong.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/CrawlQingdaoFDHouseLoudong.groovy @@ -25,17 +25,17 @@ class CrawlQingdaoFDHouseLoudong { DBCollection districtAllDb = mongoDb.getCollection('district_20130904'); static Pattern pattern_projectID = Pattern.compile("projectID=([\\d]+)\\&") - static Pattern pattern_houseNum = Pattern.compile("([\\d]+)(号楼|栋|幢|号)([\\d]+)单元") - static Pattern pattern_houseArea = Pattern.compile("预测面积:([\\d\\.]+)(/实测面积:([\\d\\.]+)平方米)?") + static Pattern pattern_houseNum = Pattern.compile("([\\d]+)(鍙锋ゼ|鏍媩骞鍙�)([\\d]+)鍗曞厓") + static Pattern pattern_houseArea = Pattern.compile("棰勬祴闈㈢Н锛�([\\d\\.]+)(/瀹炴祴闈㈢Н:([\\d\\.]+)骞虫柟绫�)?") static int retry_limit=3 static main(args) { CrawlQingdaoFDHouseLoudong crawl=new CrawlQingdaoFDHouseLoudong() - crawl.process("青岛") + crawl.process("闈掑矝") -// crawl.procXq("http://www.qdfd.com.cn/proDetail.asp?projectID=935&proname=%B6%AB%B7%BD%D6%C1%D7%F0", "东方至尊",null,null,null) +// crawl.procXq("http://www.qdfd.com.cn/proDetail.asp?projectID=935&proname=%B6%AB%B7%BD%D6%C1%D7%F0", "涓滄柟鑷冲皧",null,null,null) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/CrawlSoufunDistrictCoord.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/CrawlSoufunDistrictCoord.groovy index 91bd1ed8d..16febbc7b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/CrawlSoufunDistrictCoord.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/CrawlSoufunDistrictCoord.groovy @@ -63,9 +63,9 @@ class CrawlSoufunDistrictCoord { try{ String xqName=el.text().trim() if(xqName.contains(community)){ - Element elT =el.parent().parent().parent().select("a:contains(楼盘图片)").first() + Element elT =el.parent().parent().parent().select("a:contains(妤肩洏鍥剧墖)").first() if(elT){ - //搜房售完楼盘地图坐标获取 + //鎼滄埧鍞畬妤肩洏鍦板浘鍧愭爣鑾峰彇 String href=elT.attr("href") String newcode=href.substring(href.lastIndexOf("/")+1, href.lastIndexOf(".")) @@ -89,8 +89,8 @@ class CrawlSoufunDistrictCoord { break } }else{ - //搜房新盘地图坐标获取 - elT =el.parent().parent().parent().select("a:contains(查看地图)").first() + //鎼滄埧鏂扮洏鍦板浘鍧愭爣鑾峰彇 + elT =el.parent().parent().parent().select("a:contains(鏌ョ湅鍦板浘)").first() if(elT){ String href=elT.attr("href") String newcode=href.substring(href.lastIndexOf("=")+1) @@ -396,7 +396,7 @@ class CrawlSoufunDistrictCoord { public void processNewDistrict(){ println "processNewDistrict start ${new Date()}" - BasicDBObject queryDB=new BasicDBObject("city", "上海"); + BasicDBObject queryDB=new BasicDBObject("city", "涓婃捣"); queryDB.append("cat", "new_district"); queryDB.append("visible", 0); // queryDB=new BasicDBObject("_id", new ObjectId("5100ff62e4b02cfab7a31192")) @@ -454,7 +454,7 @@ class CrawlSoufunDistrictCoord { BasicDBObject queryDB=new BasicDBObject("new_lng", new BasicDBObject("\$gt", 0)) // def citys=new BasicDBList() -// citys.addAll(["北京", "广州"]) +// citys.addAll(["鍖椾含", "骞垮窞"]) // queryDB.put("city", new BasicDBObject("\$in", citys)) DBCursor cur=source.find() @@ -522,7 +522,7 @@ class CrawlSoufunDistrictCoord { def region_blockDb=mongoOnline43_fangjia.getCollection("region_block"); int countIndex=0 - DBCursor cur=region_blockDb.find(DataUtil.map2DBObject([city: "上海", name: [$in: ["张江"]]])); + DBCursor cur=region_blockDb.find(DataUtil.map2DBObject([city: "涓婃捣", name: [$in: ["寮犳睙"]]])); println cur.count() cur.setOptions(Bytes.QUERYOPTION_NOTIMEOUT) @@ -678,9 +678,9 @@ class CrawlSoufunDistrictCoord { // crawl.processNewDistrict(); // crawl.importToSeabird() // crawl.processCheckCoord()() -// println crawl.spiderBaiduCoord("银杏家园","襄阳","", "道安路20号") -// println crawl.spiderCoord("","北京","","北京朝阳西大望路19号") -// println crawl.checkCoordInCity(121.40908654909, 31.208366829999004,"连云港", "文登"); +// println crawl.spiderBaiduCoord("閾舵潖瀹跺洯","瑗勯槼","", "閬撳畨璺�20鍙�") +// println crawl.spiderCoord("","鍖椾含","","鍖椾含鏈濋槼瑗垮ぇ鏈涜矾19鍙�") +// println crawl.checkCoordInCity(121.40908654909, 31.208366829999004,"杩炰簯娓�", "鏂囩櫥"); // println InvokeHttpRequest.get("http://api.map.baidu.com/geocoder/v2/?ak=E4805d16520de693a3fe707cdc962045&callback=renderReverse&location=34.587066,119.177383&output=json&pois=0", "utf-8", "http://developer.baidu.com/map/webservice-geocoding.htm#.E6.8E.A5.E5.8F.A3.E5.8F.82.E6.95.B6") // if(1){ // println "t" diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/CrawlSoufunHouseLoudong.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/CrawlSoufunHouseLoudong.groovy index d4943bee4..f48a0d2de 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/CrawlSoufunHouseLoudong.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/CrawlSoufunHouseLoudong.groovy @@ -20,117 +20,117 @@ import static CrawlHouseLoudongHelper.* class CrawlSoufunHouseLoudong { - static Map citySearchUrlMap=["全国": "http://www.soufun.com", - "鞍山": "http://newhouse.anshan.soufun.com", - "北京": "http://soufun.com", - "包头": "http://newhouse.bt.soufun.com", - "保定": "http://newhouse.bd.soufun.com", - "北海": "http://newhouse.bh.soufun.com", - "宝鸡": "http://newhouse.baoji.soufun.com", - "重庆": "http://newhouse.cq.soufun.com", - "成都": "http://newhouse.cd.soufun.com", - "常州": "http://newhouse.cz.soufun.com", - "长春": "http://newhouse.changchun.soufun.com", - "长沙": "http://newhouse.cs.soufun.com", - "常熟": "http://newhouse.changshu.soufun.com", - "沧州": "http://newhouse.cangzhou.soufun.com", - "大连": "http://newhouse.dl.soufun.com", - "东莞": "http://newhouse.dg.soufun.com", - "东营": "http://newhouse.dy.soufun.com", - "德州": "http://newhouse.dz.soufun.com", - "鄂尔多斯": "http://newhouse.erds.soufun.com", - "佛山": "http://newhouse.fs.soufun.com", - "福州": "http://newhouse.fz.soufun.com", - "广州": "http://newhouse.gz.soufun.com", - "贵阳": "http://newhouse.gy.soufun.com", - "桂林": "http://newhouse.guilin.soufun.com", - "赣州": "http://newhouse.ganzhou.soufun.com", - "杭州": "http://newhouse.hz.soufun.com", - "哈尔滨": "http://newhouse.hrb.soufun.com", - "海南": "http://newhouse.hn.soufun.com", - "邯郸": "http://newhouse.hd.soufun.com", - "合肥": "http://newhouse.hf.soufun.com", - "惠州": "http://newhouse.huizhou.soufun.com", - "呼和浩特": "http://newhouse.nm.soufun.com", - "淮安": "http://newhouse.huaian.soufun.com", - "菏泽": "http://newhouse.heze.soufun.com", - "湖州": "http://newhouse.huzhou.soufun.com", - "济南": "http://newhouse.jn.soufun.com", - "吉林": "http://newhouse.jl.soufun.com", - "嘉兴": "http://newhouse.jx.soufun.com", - "金华": "http://newhouse.jh.soufun.com", - "晋城": "http://newhouse.jc.soufun.com", - "江阴": "http://newhouse.jy.soufun.com", - "江门": "http://newhouse.jm.soufun.com", - "昆明": "http://newhouse.km.soufun.com", - "昆山": "http://newhouse.ks.soufun.com", - "兰州": "http://newhouse.lz.soufun.com", - "丽水": "http://newhouse.ls.soufun.com", - "连云港": "http://newhouse.lyg.soufun.com", - "洛阳": "http://newhouse.ly.soufun.com", - "柳州": "http://newhouse.liuzhou.soufun.com", - "廊坊": "http://newhouse.lf.soufun.com", - "聊城": "http://newhouse.lc.soufun.com", - "临沂": "http://newhouse.linyi.soufun.com", - "绵阳": "http://newhouse.mianyang.soufun.com", - "马鞍山": "http://newhouse.mas.soufun.com", - "南京": "http://nanjing.soufun.com", - "南昌": "http://newhouse.nc.soufun.com", - "南宁": "http://newhouse.nn.soufun.com", - "南通": "http://newhouse.nt.soufun.com", - "宁波": "http://newhouse.nb.soufun.com", - "青岛": "http://newhouse.qd.soufun.com", - "秦皇岛": "http://newhouse.qhd.soufun.com", - "泉州": "http://newhouse.qz.soufun.com", - "日照": "http://newhouse.rz.soufun.com", - "上海": "http://newhouse.sh.soufun.com", - "深圳": "http://newhouse.sz.soufun.com", - "苏州": "http://newhouse.suzhou.soufun.com", - "绍兴": "http://newhouse.sx.soufun.com", - "沈阳": "http://newhouse.sy.soufun.com", - "石家庄": "http://newhouse.sjz.soufun.com", - "汕头": "http://newhouse.st.soufun.com", - "顺德": "http://newhouse.shunde.soufun.com", - "三亚": "http://newhouse.sanya.soufun.com", - "宿迁": "http://newhouse.sq.soufun.com", - "天津": "http://newhouse.tj.soufun.com", - "台州": "http://newhouse.tz.soufun.com", - "太原": "http://newhouse.taiyuan.soufun.com", - "泰州": "http://newhouse.taizhou.soufun.com", - "唐山": "http://newhouse.ts.soufun.com", - "太仓": "http://newhouse.tc.soufun.com", - "武汉": "http://newhouse.wuhan.soufun.com", - "威海": "http://newhouse.weihai.soufun.com", - "潍坊": "http://newhouse.wf.soufun.com", - "温州": "http://newhouse.wz.soufun.com", - "无锡": "http://newhouse.wuxi.soufun.com", - "吴江": "http://newhouse.wj.soufun.com", - "乌鲁木齐": "http://newhouse.xj.soufun.com", - "芜湖": "http://newhouse.wuhu.soufun.com", - "西安": "http://newhouse.xian.soufun.com", - "西宁": "http://newhouse.xn.soufun.com", - "厦门": "http://newhouse.xm.soufun.com", - "徐州": "http://newhouse.xz.soufun.com", - "湘潭": "http://newhouse.xt.soufun.com", - "新乡": "http://newhouse.xx.soufun.com", - "烟台": "http://newhouse.yt.soufun.com", - "扬州": "http://newhouse.yz.soufun.com", - "宜昌": "http://newhouse.yc.soufun.com", - "银川": "http://newhouse.yinchuan.soufun.com", - "玉林": "http://newhouse.yl.soufun.com", - "营口": "http://newhouse.yk.soufun.com", - "运城": "http://newhouse.yuncheng.soufun.com", - "湛江": "http://newhouse.zj.soufun.com", - "镇江": "http://newhouse.zhenjiang.soufun.com", - "郑州": "http://newhouse.zz.soufun.com", - "中山": "http://newhouse.zs.soufun.com", - "株洲": "http://newhouse.zhuzhou.soufun.com", - "珠海": "http://newhouse.zh.soufun.com", - "淄博": "http://newhouse.zb.soufun.com", - "张家港": "http://newhouse.zjg.soufun.com", - "舟山": "http://newhouse.zhoushan.soufun.com"]; + static Map citySearchUrlMap=["鍏ㄥ浗": "http://www.soufun.com", + "闉嶅北": "http://newhouse.anshan.soufun.com", + "鍖椾含": "http://soufun.com", + "鍖呭ご": "http://newhouse.bt.soufun.com", + "淇濆畾": "http://newhouse.bd.soufun.com", + "鍖楁捣": "http://newhouse.bh.soufun.com", + "瀹濋浮": "http://newhouse.baoji.soufun.com", + "閲嶅簡": "http://newhouse.cq.soufun.com", + "鎴愰兘": "http://newhouse.cd.soufun.com", + "甯稿窞": "http://newhouse.cz.soufun.com", + "闀挎槬": "http://newhouse.changchun.soufun.com", + "闀挎矙": "http://newhouse.cs.soufun.com", + "甯哥啛": "http://newhouse.changshu.soufun.com", + "娌у窞": "http://newhouse.cangzhou.soufun.com", + "澶ц繛": "http://newhouse.dl.soufun.com", + "涓滆帪": "http://newhouse.dg.soufun.com", + "涓滆惀": "http://newhouse.dy.soufun.com", + "寰峰窞": "http://newhouse.dz.soufun.com", + "閯傚皵澶氭柉": "http://newhouse.erds.soufun.com", + "浣涘北": "http://newhouse.fs.soufun.com", + "绂忓窞": "http://newhouse.fz.soufun.com", + "骞垮窞": "http://newhouse.gz.soufun.com", + "璐甸槼": "http://newhouse.gy.soufun.com", + "妗傛灄": "http://newhouse.guilin.soufun.com", + "璧e窞": "http://newhouse.ganzhou.soufun.com", + "鏉窞": "http://newhouse.hz.soufun.com", + "鍝堝皵婊�": "http://newhouse.hrb.soufun.com", + "娴峰崡": "http://newhouse.hn.soufun.com", + "閭兏": "http://newhouse.hd.soufun.com", + "鍚堣偉": "http://newhouse.hf.soufun.com", + "鎯犲窞": "http://newhouse.huizhou.soufun.com", + "鍛煎拰娴╃壒": "http://newhouse.nm.soufun.com", + "娣畨": "http://newhouse.huaian.soufun.com", + "鑿忔辰": "http://newhouse.heze.soufun.com", + "婀栧窞": "http://newhouse.huzhou.soufun.com", + "娴庡崡": "http://newhouse.jn.soufun.com", + "鍚夋灄": "http://newhouse.jl.soufun.com", + "鍢夊叴": "http://newhouse.jx.soufun.com", + "閲戝崕": "http://newhouse.jh.soufun.com", + "鏅嬪煄": "http://newhouse.jc.soufun.com", + "姹熼槾": "http://newhouse.jy.soufun.com", + "姹熼棬": "http://newhouse.jm.soufun.com", + "鏄嗘槑": "http://newhouse.km.soufun.com", + "鏄嗗北": "http://newhouse.ks.soufun.com", + "鍏板窞": "http://newhouse.lz.soufun.com", + "涓芥按": "http://newhouse.ls.soufun.com", + "杩炰簯娓�": "http://newhouse.lyg.soufun.com", + "娲涢槼": "http://newhouse.ly.soufun.com", + "鏌冲窞": "http://newhouse.liuzhou.soufun.com", + "寤婂潑": "http://newhouse.lf.soufun.com", + "鑱婂煄": "http://newhouse.lc.soufun.com", + "涓存矀": "http://newhouse.linyi.soufun.com", + "缁甸槼": "http://newhouse.mianyang.soufun.com", + "椹瀺灞�": "http://newhouse.mas.soufun.com", + "鍗椾含": "http://nanjing.soufun.com", + "鍗楁槍": "http://newhouse.nc.soufun.com", + "鍗楀畞": "http://newhouse.nn.soufun.com", + "鍗楅��": "http://newhouse.nt.soufun.com", + "瀹佹尝": "http://newhouse.nb.soufun.com", + "闈掑矝": "http://newhouse.qd.soufun.com", + "绉︾殗宀�": "http://newhouse.qhd.soufun.com", + "娉夊窞": "http://newhouse.qz.soufun.com", + "鏃ョ収": "http://newhouse.rz.soufun.com", + "涓婃捣": "http://newhouse.sh.soufun.com", + "娣卞湷": "http://newhouse.sz.soufun.com", + "鑻忓窞": "http://newhouse.suzhou.soufun.com", + "缁嶅叴": "http://newhouse.sx.soufun.com", + "娌堥槼": "http://newhouse.sy.soufun.com", + "鐭冲搴�": "http://newhouse.sjz.soufun.com", + "姹曞ご": "http://newhouse.st.soufun.com", + "椤哄痉": "http://newhouse.shunde.soufun.com", + "涓変簹": "http://newhouse.sanya.soufun.com", + "瀹胯縼": "http://newhouse.sq.soufun.com", + "澶╂触": "http://newhouse.tj.soufun.com", + "鍙板窞": "http://newhouse.tz.soufun.com", + "澶師": "http://newhouse.taiyuan.soufun.com", + "娉板窞": "http://newhouse.taizhou.soufun.com", + "鍞愬北": "http://newhouse.ts.soufun.com", + "澶粨": "http://newhouse.tc.soufun.com", + "姝︽眽": "http://newhouse.wuhan.soufun.com", + "濞佹捣": "http://newhouse.weihai.soufun.com", + "娼嶅潑": "http://newhouse.wf.soufun.com", + "娓╁窞": "http://newhouse.wz.soufun.com", + "鏃犻敗": "http://newhouse.wuxi.soufun.com", + "鍚存睙": "http://newhouse.wj.soufun.com", + "涔岄瞾鏈ㄩ綈": "http://newhouse.xj.soufun.com", + "鑺滄箹": "http://newhouse.wuhu.soufun.com", + "瑗垮畨": "http://newhouse.xian.soufun.com", + "瑗垮畞": "http://newhouse.xn.soufun.com", + "鍘﹂棬": "http://newhouse.xm.soufun.com", + "寰愬窞": "http://newhouse.xz.soufun.com", + "婀樻江": "http://newhouse.xt.soufun.com", + "鏂颁埂": "http://newhouse.xx.soufun.com", + "鐑熷彴": "http://newhouse.yt.soufun.com", + "鎵窞": "http://newhouse.yz.soufun.com", + "瀹滄槍": "http://newhouse.yc.soufun.com", + "閾跺窛": "http://newhouse.yinchuan.soufun.com", + "鐜夋灄": "http://newhouse.yl.soufun.com", + "钀ュ彛": "http://newhouse.yk.soufun.com", + "杩愬煄": "http://newhouse.yuncheng.soufun.com", + "婀涙睙": "http://newhouse.zj.soufun.com", + "闀囨睙": "http://newhouse.zhenjiang.soufun.com", + "閮戝窞": "http://newhouse.zz.soufun.com", + "涓北": "http://newhouse.zs.soufun.com", + "鏍床": "http://newhouse.zhuzhou.soufun.com", + "鐝犳捣": "http://newhouse.zh.soufun.com", + "娣勫崥": "http://newhouse.zb.soufun.com", + "寮犲娓�": "http://newhouse.zjg.soufun.com", + "鑸熷北": "http://newhouse.zhoushan.soufun.com"]; - static def citys=[ "上海", "北京","杭州", "广州", "深圳", "天津", "南京", "西安", "成都", "武汉", "宁波", "青岛", "沈阳", "大连", "济南", "福州", "郑州", "长沙", "昆明", "厦门", "哈尔滨", "苏州", "无锡", "合肥", "太原", "石家庄", "南昌", "烟台", "佛山", "东莞", "温州", "绍兴", "常州", "南通", "珠海", "金华", "嘉兴", "昆山", "常熟", "萧山", "义乌", "余姚","慈溪","湖州","唐山","呼和浩特","中山","镇江","威海","东营","惠州","长春","扬州","泉州","大庆","徐州","盐城","江门","海口","汕头","南宁"]; + static def citys=[ "涓婃捣", "鍖椾含","鏉窞", "骞垮窞", "娣卞湷", "澶╂触", "鍗椾含", "瑗垮畨", "鎴愰兘", "姝︽眽", "瀹佹尝", "闈掑矝", "娌堥槼", "澶ц繛", "娴庡崡", "绂忓窞", "閮戝窞", "闀挎矙", "鏄嗘槑", "鍘﹂棬", "鍝堝皵婊�", "鑻忓窞", "鏃犻敗", "鍚堣偉", "澶師", "鐭冲搴�", "鍗楁槍", "鐑熷彴", "浣涘北", "涓滆帪", "娓╁窞", "缁嶅叴", "甯稿窞", "鍗楅��", "鐝犳捣", "閲戝崕", "鍢夊叴", "鏄嗗北", "甯哥啛", "钀у北", "涔変箤", "浣欏","鎱堟邯","婀栧窞","鍞愬北","鍛煎拰娴╃壒","涓北","闀囨睙","濞佹捣","涓滆惀","鎯犲窞","闀挎槬","鎵窞","娉夊窞","澶у簡","寰愬窞","鐩愬煄","姹熼棬","娴峰彛","姹曞ご","鍗楀畞"]; final static String FROM="soufun"; @@ -139,10 +139,10 @@ class CrawlSoufunHouseLoudong { DBCollection target = mongoDb.getCollection('house_loudong_crawl_test'); DBCollection houseNumTarget = mongoDb.getCollection('house_num_crawl_test'); - Pattern pattern_house_num = Pattern.compile("([\\w]+)(#|号楼|号|栋|幢|座)") + Pattern pattern_house_num = Pattern.compile("([\\w]+)(#|鍙锋ゼ|鍙穦鏍媩骞搴�)") Pattern pattern_unit = Pattern.compile("^([\\w]+)") - Pattern pattern_floor = Pattern.compile("([\\d]+)层") - Pattern pattern_height = Pattern.compile("共([\\d]+)层") + Pattern pattern_floor = Pattern.compile("([\\d]+)灞�") + Pattern pattern_height = Pattern.compile("鍏�([\\d]+)灞�") Pattern pattern_area = Pattern.compile("([\\d\\.]+)") DBCollection jinan_house_gourp = mongoDb.getCollection('jinan_house_gourp'); @@ -182,7 +182,7 @@ class CrawlSoufunHouseLoudong { for(Element el: eles){ String xqName=el.text().trim() if(xqName==community){ - Element elT =el.parent().parent().parent().select("a:contains(查看详情)").first() + Element elT =el.parent().parent().parent().select("a:contains(鏌ョ湅璇︽儏)").first() if(elT){ url=elT.attr("href") break; @@ -193,7 +193,7 @@ class CrawlSoufunHouseLoudong { for(Element el: eles){ String xqName=el.text().trim() if(xqName.contains(community)){ - Element elT =el.parent().parent().parent().select("a:contains(查看详情)").first() + Element elT =el.parent().parent().parent().select("a:contains(鏌ョ湅璇︽儏)").first() if(elT){ url=elT.attr("href") break; @@ -205,7 +205,7 @@ class CrawlSoufunHouseLoudong { for(Element el: eles){ String xqName=el.text().trim() if(community.contains(xqName)){ - Element elT =el.parent().parent().parent().select("a:contains(查看详情)").first() + Element elT =el.parent().parent().parent().select("a:contains(鏌ョ湅璇︽儏)").first() if(elT){ url=elT.attr("href") break; @@ -234,7 +234,7 @@ class CrawlSoufunHouseLoudong { Elements eles = JQueryUtils.select("div.leftinfo div.yihang h3,div.leftinfo dl.lbox", ret); boolean nextIs=false; for(Element el: eles){ - if(el.text().trim()=="楼座信息"){ + if(el.text().trim()=="妤煎骇淇℃伅"){ nextIs=true; continue; } @@ -311,7 +311,7 @@ class CrawlSoufunHouseLoudong { } public void processCitys(){ -// citys=["北京"]; +// citys=["鍖椾含"]; for(def city: citys){ process(city) } @@ -398,7 +398,7 @@ class CrawlSoufunHouseLoudong { houseNum.from=FROM houseNum.house_num=houseNumNo - //如果house_num空则取消 + //濡傛灉house_num绌哄垯鍙栨秷 if(houseNumNo){ String houseNumUrl="${communityUrl}/house/${params.newcode}_${params.d}.htm" as String @@ -442,7 +442,7 @@ class CrawlSoufunHouseLoudong { def houseNum2=houseNumTarget.findOne(queryParam); String houseNumUrl="${communityUrl}/house/${params.newcode}_${params.d}.htm" as String - //houseNum2不存在,新楼号首次入库 + //houseNum2涓嶅瓨鍦紝鏂版ゼ鍙烽娆″叆搴� if(!houseNum2){ HouseNum houseNum=new HouseNum() houseNum.city=city @@ -501,12 +501,12 @@ class CrawlSoufunHouseLoudong { houseNumTarget.update(new BasicDBObject("_id", data._id), DataUtil.map2DBObject([$set: [room_count: room_count, url: houseNum.url]])) println("procHouseNum: ${houseNum.city}, ${houseNum.region}, ${houseNum.name}, house_num: ${houseNumNo}, house_num_units: ${houseNum.house_num_units}, room_count: ${room_count}") }else{ - //houseNum2存在,更新该楼号房子数据 + //houseNum2瀛樺湪锛屾洿鏂拌妤煎彿鎴垮瓙鏁版嵁 int room_count=houseNum2.room_count; def newUnits=[]; for(String unit: entry.value.units){ boolean exists=false; - //params.dy必须放在if(unit=="0")前面,因为params.dy搜房查询参数 + //params.dy蹇呴』鏀惧湪if(unit=="0")鍓嶉潰锛屽洜涓簆arams.dy鎼滄埧鏌ヨ鍙傛暟 params.dy=unit; if(unit=="0"){ unit="1"; @@ -601,7 +601,7 @@ class CrawlSoufunHouseLoudong { } // if(floor <=0)continue - //解析楼层室号 + //瑙f瀽妤煎眰瀹ゅ彿 Elements trEles=el.select("tr") for(int i=1; i0){ String rootDetailUrl=elAs[0].attr("href") houseLoudong.url=rootDetailUrl; - //进入搜房房子详细页面获取楼总层高,一栋楼只取一次 + //杩涘叆鎼滄埧鎴垮瓙璇︾粏椤甸潰鑾峰彇妤兼�诲眰楂橈紝涓�鏍嬫ゼ鍙彇涓�娆� if(!has_parse_height){ def roomDetailParams=[:] roomDetailParams.taoid=rootDetailUrl.substring(rootDetailUrl.lastIndexOf("_")+1, rootDetailUrl.lastIndexOf(".")) @@ -683,9 +683,9 @@ class CrawlSoufunHouseLoudong { } } /** - * 分页搜房已改成单元了,下一页即下一单元,单元已抓过,不用再抓 + * 鍒嗛〉鎼滄埧宸叉敼鎴愬崟鍏冧簡锛屼笅涓�椤靛嵆涓嬩竴鍗曞厓锛屽崟鍏冨凡鎶撹繃锛屼笉鐢ㄥ啀鎶� * - //检查是否有下一页 + //妫�鏌ユ槸鍚︽湁涓嬩竴椤� eles= JQueryUtils.select("div.pagesbox span.fRed",retxt) if(eles.size()>0){ Element el=eles[0] @@ -718,13 +718,13 @@ class CrawlSoufunHouseLoudong { // while(cur.hasNext()){ // DBObject dbObj=cur.next(); // String name=dbObj.get("_id"); -// String communityDetailUrl=getCommunityDetailUrl(name, "上海") +// String communityDetailUrl=getCommunityDetailUrl(name, "涓婃捣") // if(!communityDetailUrl){ // continue; // } // String ret=InvokeHttpRequest.get(communityDetailUrl, "gbk"); // -// Pattern pattern = Pattern.compile("
    总户数:<\\/strong>([0-9]+)户<\\/dd>"); +// Pattern pattern = Pattern.compile("
    鎬绘埛鏁帮細<\\/strong>([0-9]+)鎴�<\\/dd>"); // Matcher matcher = pattern.matcher(ret); // if(matcher.find()){ // def soufunCount=matcher.group(1); @@ -808,8 +808,8 @@ class CrawlSoufunHouseLoudong { crawl.processCitys(); -// crawl.spiderLoudong("万博苑", "北京", "西城") -// println crawl.getCommunityDetailUrl("宏图国际公寓二期大城小室","昆山",""); +// crawl.spiderLoudong("涓囧崥鑻�", "鍖椾含", "瑗垮煄") +// println crawl.getCommunityDetailUrl("瀹忓浘鍥介檯鍏瘬浜屾湡澶у煄灏忓","鏄嗗北",""); // println crawl.getLoudongUrls("http://yonghuafuzs021.soufun.com/villa/house/1210840300_24015.htm") // def params=[:] // params.newcode=1210542822 diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/DeveloperNameProc.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/DeveloperNameProc.groovy index 94cd2829f..d755e8421 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/DeveloperNameProc.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/DeveloperNameProc.groovy @@ -50,28 +50,28 @@ class DeveloperNameProc { DSCollection seaweed = new DataStore("seaweed.db.fangjia.com", 27007).getCollection("fangjia.seaweed") - def prefix_excludes=["市政"] + def prefix_excludes=["甯傛斂"] def suffix_words=[ - "股份有限公司" - , "股份有限责任公司" - , "股份公司" - , "集团有限责任公司" - , "集团有限公司" - , "集团总公司" - , "集团公司" - , "集团" - , "有限责任公司" - , "有限公司" - , "总公司" - , "公司"]; + "鑲′唤鏈夐檺鍏徃" + , "鑲′唤鏈夐檺璐d换鍏徃" + , "鑲′唤鍏徃" + , "闆嗗洟鏈夐檺璐d换鍏徃" + , "闆嗗洟鏈夐檺鍏徃" + , "闆嗗洟鎬诲叕鍙�" + , "闆嗗洟鍏徃" + , "闆嗗洟" + , "鏈夐檺璐d换鍏徃" + , "鏈夐檺鍏徃" + , "鎬诲叕鍙�" + , "鍏徃"]; static main(args) { DeveloperNameProc proc=new DeveloperNameProc() -// proc.proc("南京") - proc.mergeDevelopers("南京", ["嘉泰隆房地产","嘉泰隆房地产实业","嘉泰隆"/*,"银城开发"*/]) +// proc.proc("鍗椾含") + proc.mergeDevelopers("鍗椾含", ["鍢夋嘲闅嗘埧鍦颁骇","鍢夋嘲闅嗘埧鍦颁骇瀹炰笟","鍢夋嘲闅�"/*,"閾跺煄寮�鍙�"*/]) // proc.procOldDeveloerTable() } @@ -127,11 +127,11 @@ class DeveloperNameProc { } def procSimpleName(String origi_developer, String city){ - Pattern pa=Pattern.compile("^${city}市?"); + Pattern pa=Pattern.compile("^${city}甯�?"); String developer=origi_developer if(!developer)return null; - developer=developer.replaceAll("\\(.*\\)", "").replaceAll("(.*)", ""); - developer=developer.replaceAll("[()\\(\\)\\s\\-\\.]+", ""); + developer=developer.replaceAll("\\(.*\\)", "").replaceAll("锛�.*锛�", ""); + developer=developer.replaceAll("[锛堬級\\(\\)\\s\\-\\.]+", ""); Matcher ma=pa.matcher(developer) if(ma.find()){ boolean trimed=false; @@ -230,7 +230,7 @@ class DeveloperNameProc { def simpleName2(){ def qualifier_words=[ - "房地产开发" + "鎴垮湴浜у紑鍙�" ]; developerDb.find().sort(DataUtil.map2DBObject([_id: 1])).setOptions(Bytes.QUERYOPTION_NOTIMEOUT).each { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/DistrictRelationUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/DistrictRelationUtils.groovy index cc3c9a1f6..1a433a689 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/DistrictRelationUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/DistrictRelationUtils.groovy @@ -13,23 +13,23 @@ import com.fangjia.core.util.Numeric2Chinese public class DistrictRelationUtils { - private static final String pattern ="(一|二|三|四|五|六|七|八|九|\\d+)+期(至|、(一|二|三|四|五|六|七|八|九|\\d+)期)*" + private static final String pattern ="(涓�|浜寍涓墊鍥泑浜攟鍏瓅涓億鍏珅涔潀\\d+)+鏈�(鑷硘銆�(涓�|浜寍涓墊鍥泑浜攟鍏瓅涓億鍏珅涔潀\\d+)鏈�)*" - private static List nameStopWords = ["大厦","小区","公寓","公房","洋房","弄","号","公馆","楼","商业","住宅"] - private static List addressStopWords = ["号","弄","路","公路"] + private static List nameStopWords = ["澶у帵","灏忓尯","鍏瘬","鍏埧","娲嬫埧","寮�","鍙�","鍏","妤�","鍟嗕笟","浣忓畢"] + private static List addressStopWords = ["鍙�","寮�","璺�","鍏矾"] private static Pattern NUMBER_PATTERN =Pattern.compile("(\\d+)+"); public static void main(String[] args){ District d1 = new District(); - d1.city = "上海" - d1.region = "宝安" - d1.name = "丰泽园" - d1.address = "塔城路1号" + d1.city = "涓婃捣" + d1.region = "瀹濆畨" + d1.name = "涓版辰鍥�" + d1.address = "濉斿煄璺�1鍙�" District d2 = new District(); - d2.city = "上海" - d2.region = "宝安" - d2.name = "天源大厦" - d2.address = "塔城路一号" + d2.city = "涓婃捣" + d2.region = "瀹濆畨" + d2.name = "澶╂簮澶у帵" + d2.address = "濉斿煄璺竴鍙�" println isSimilarity(d1,d2,2); } @@ -58,7 +58,7 @@ public class DistrictRelationUtils { if(d1.name.contains(d2.name)||d2.name.contains(d1.name)){ return true } - if(d1.address ==~ /.*\d+(号|弄)$/ && d2.address ==~ /.*\d+(号|弄)$/ && (d1.address.contains(d2.address) || d2.address.contains(d1.address))){ + if(d1.address ==~ /.*\d+(鍙穦寮�)$/ && d2.address ==~ /.*\d+(鍙穦寮�)$/ && (d1.address.contains(d2.address) || d2.address.contains(d1.address))){ return true } @@ -139,20 +139,20 @@ public class DistrictRelationUtils { if(name.indexOf("(")>0&&name.indexOf(")")>0&&name.indexOf("(")0&&name.indexOf(")")>0&&name.indexOf("(")0&&name.indexOf("锛�")>0&&name.indexOf("锛�")0){ - hasLoudong="有" + hasLoudong="鏈�" }else{ hasCount=fangdiHouseNumDb.count(DataUtil.map2DBObject([city: d.city, name: [$regex: d.name]])) if(hasCount>0){ - hasLoudong="有" + hasLoudong="鏈�" } } values=new String[26] values[0]="${name}" as String - values[1]="住宅" as String + values[1]="浣忓畢" as String values[2]="${hasLoudong}" as String file.writeRecord(values) @@ -492,20 +492,20 @@ class ExportSeabirdCat { DBObject d=iter.next() String name=d.name - String hasLoudong="无" + String hasLoudong="鏃�" int hasCount=soufunHouseNumDb.count(DataUtil.map2DBObject([city: d.city, name: d.name])) if(hasCount>0){ - hasLoudong="有" + hasLoudong="鏈�" }else{ hasCount=fangdiHouseNumDb.count(DataUtil.map2DBObject([city: d.city, name: [$regex: d.name]])) if(hasCount>0){ - hasLoudong="有" + hasLoudong="鏈�" } } values=new String[26] values[0]="${name}" as String - values[1]="新盘" as String + values[1]="鏂扮洏" as String values[2]="${hasLoudong}" as String file.writeRecord(values) @@ -539,13 +539,13 @@ class ExportSeabirdCat { } String room="" if(dbObject.room){ - room+="${dbObject.room}室" + room+="${dbObject.room}瀹�" } if(dbObject.hall){ - room+="${dbObject.hall}厅" + room+="${dbObject.hall}鍘�" } if(dbObject.toilet){ - room+="${dbObject.toilet}卫" + room+="${dbObject.toilet}鍗�" } if(!rooms.contains(room)){ rooms << room @@ -612,13 +612,13 @@ class ExportSeabirdCat { if (file.exists()){ file.delete(); } - file.append("小区名称,","gbk") - file.append("区域,","gbk") - file.append("板块,","gbk") - file.append("地址,","gbk") - file.append("均价,","gbk") - file.append("户数,","gbk") - file.append("等级,","gbk") + file.append("灏忓尯鍚嶇О,","gbk") + file.append("鍖哄煙,","gbk") + file.append("鏉垮潡,","gbk") + file.append("鍦板潃,","gbk") + file.append("鍧囦环,","gbk") + file.append("鎴锋暟,","gbk") + file.append("绛夌骇,","gbk") file.append(System.getProperty("line.separator")); for(def d: dbCursor){ String name=d.district_name @@ -644,13 +644,13 @@ class ExportSeabirdCat { bed_kind=dbObj.bed_kind?dbObj.bed_kind:"" } - file.append(name.replaceAll(",|,","、")+",","gbk"); - file.append(region.replaceAll(",|,","、")+",","gbk"); - file.append(block.replaceAll(",|,","、")+",","gbk"); - file.append(address.replaceAll(",|,","、")+",","gbk"); + file.append(name.replaceAll(",|锛�","銆�")+",","gbk"); + file.append(region.replaceAll(",|锛�","銆�")+",","gbk"); + file.append(block.replaceAll(",|锛�","銆�")+",","gbk"); + file.append(address.replaceAll(",|锛�","銆�")+",","gbk"); file.append(avg_price+",","gbk"); file.append(household_count+",","gbk"); - file.append(bed_kind.replaceAll(",|,","、")+",","gbk"); + file.append(bed_kind.replaceAll(",|锛�","銆�")+",","gbk"); file.append(System.getProperty("line.separator"),"gbk"); } @@ -659,7 +659,7 @@ class ExportSeabirdCat { void exportDistrictPeople(){ DBCollection houseStatDB=mongoOnline43.getDB("geluke").getCollection("house_stat") - BasicDBObject queryParam=DataUtil.map2DBObject([region: "全市"]); + BasicDBObject queryParam=DataUtil.map2DBObject([region: "鍏ㄥ競"]); DBCursor dbCursor=houseStatDB.find(queryParam) dbCursor.setOptions(Bytes.QUERYOPTION_NOTIMEOUT) int countIndex=0 @@ -668,11 +668,11 @@ class ExportSeabirdCat { if (file.exists()){ file.delete(); } - file.append("城市,","gbk") - file.append("小区数量,","gbk") - file.append("总人口数,","gbk") - file.append("总户数,","gbk") - file.append("平均小区人口数,","gbk") + file.append("鍩庡競,","gbk") + file.append("灏忓尯鏁伴噺,","gbk") + file.append("鎬讳汉鍙f暟,","gbk") + file.append("鎬绘埛鏁�,","gbk") + file.append("骞冲潎灏忓尯浜哄彛鏁�,","gbk") file.append(System.getProperty("line.separator")); for(def d: dbCursor){ String city=d.city @@ -686,8 +686,8 @@ class ExportSeabirdCat { println city - file.append(city.replaceAll(",|,","、")+",","gbk"); - file.append(district_count.replaceAll(",|,","、")+",","gbk"); + file.append(city.replaceAll(",|锛�","銆�")+",","gbk"); + file.append(district_count.replaceAll(",|锛�","銆�")+",","gbk"); file.append(people_count+",","gbk"); file.append(house_count+",","gbk"); file.append(avg_people_count+",","gbk"); @@ -699,7 +699,7 @@ class ExportSeabirdCat { private int calLivePecent(String liveDate){ if(liveDate){ - if(liveDate.equals("暂无资料")){ + if(liveDate.equals("鏆傛棤璧勬枡")){ return 0; }else{ String start = ""; @@ -756,9 +756,9 @@ class ExportSeabirdCat { private int handleOfficeBuildArea(String buildArea){ int houseCount=0 if(buildArea){ - buildArea = buildArea.replace("暂无资料", ""); + buildArea = buildArea.replace("鏆傛棤璧勬枡", ""); if(buildArea){ - buildArea = patternParse(buildArea, "([0-9\\.]+)[万平方米|平方米|平方|平米|㎡]"); + buildArea = patternParse(buildArea, "([0-9\\.]+)[涓囧钩鏂圭背|骞虫柟绫硘骞虫柟|骞崇背|銕"); int buildAreaNum = isNumber(buildArea); if(buildAreaNum > 0){ houseCount = buildAreaNum/15; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/GenerateHouseLoudong.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/GenerateHouseLoudong.groovy index fa4892ea5..2d39336a4 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/GenerateHouseLoudong.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/GenerateHouseLoudong.groovy @@ -31,85 +31,85 @@ class GenerateHouseLoudong { DB mongoOnline43_fangjia=mongoOnline43.getDB("fangjia"); - static def citys=["上海", "北京", "广州", "深圳", "天津", "杭州", "南京", "西安", "成都", "武汉", "宁波", "青岛", "沈阳", "大连", "济南", "福州", "郑州", "长沙", "昆明", "厦门", "哈尔滨", "苏州", "无锡", "合肥", "太原", "石家庄", "南昌", "烟台", "佛山", "东莞", "温州", "绍兴", "常州", "南通", "珠海", "金华", "嘉兴", "昆山", "常熟", "萧山", "义乌", "余姚","慈溪","湖州","唐山","呼和浩特","中山","镇江","威海","东营","惠州","长春","扬州","泉州","大庆","徐州","盐城","江门","海口","汕头","南宁"]; + static def citys=["涓婃捣", "鍖椾含", "骞垮窞", "娣卞湷", "澶╂触", "鏉窞", "鍗椾含", "瑗垮畨", "鎴愰兘", "姝︽眽", "瀹佹尝", "闈掑矝", "娌堥槼", "澶ц繛", "娴庡崡", "绂忓窞", "閮戝窞", "闀挎矙", "鏄嗘槑", "鍘﹂棬", "鍝堝皵婊�", "鑻忓窞", "鏃犻敗", "鍚堣偉", "澶師", "鐭冲搴�", "鍗楁槍", "鐑熷彴", "浣涘北", "涓滆帪", "娓╁窞", "缁嶅叴", "甯稿窞", "鍗楅��", "鐝犳捣", "閲戝崕", "鍢夊叴", "鏄嗗北", "甯哥啛", "钀у北", "涔変箤", "浣欏","鎱堟邯","婀栧窞","鍞愬北","鍛煎拰娴╃壒","涓北","闀囨睙","濞佹捣","涓滆惀","鎯犲窞","闀挎槬","鎵窞","娉夊窞","澶у簡","寰愬窞","鐩愬煄","姹熼棬","娴峰彛","姹曞ご","鍗楀畞"]; static def city_districts=[:]; static{ - city_districts=["上海" :["闵行", "嘉定", "松江", "宝山", "浦东", "南汇", "奉贤", "金山", "崇明", "徐家汇", "徐汇", "黄浦", "卢湾", "普陀", "闸北", "杨浦", "虹口", "长宁", "青浦", "静安" ]]; + city_districts=["涓婃捣" :["闂佃", "鍢夊畾", "鏉炬睙", "瀹濆北", "娴︿笢", "鍗楁眹", "濂夎搐", "閲戝北", "宕囨槑", "寰愬姹�", "寰愭眹", "榛勬郸", "鍗㈡咕", "鏅檧", "闂稿寳", "鏉ㄦ郸", "铏瑰彛", "闀垮畞", "闈掓郸", "闈欏畨" ]]; - city_districts["昆山"]=[]; - city_districts["杭州"]=["富阳","临安","建德","淳安","桐庐","余杭","萧山","江干","拱墅","滨江","西湖","下城","上城","杭州周边"]; - city_districts["绍兴"]=["绍兴","诸暨","上虞","嵊州","越城","柯桥","袍江","新昌"]; + city_districts["鏄嗗北"]=[]; + city_districts["鏉窞"]=["瀵岄槼","涓村畨","寤哄痉","娣冲畨","妗愬簮","浣欐澀","钀у北","姹熷共","鎷卞","婊ㄦ睙","瑗挎箹","涓嬪煄","涓婂煄","鏉窞鍛ㄨ竟"]; + city_districts["缁嶅叴"]=["缁嶅叴","璇告毃","涓婅櫈","宓婂窞","瓒婂煄","鏌ˉ","琚嶆睙","鏂版槍"]; } static def city_districtRoads=[:]; static{ - city_districtRoads["上海"]=["浦东南路", "长宁支路", "浦东北路"]; + city_districtRoads["涓婃捣"]=["娴︿笢鍗楄矾", "闀垮畞鏀矾", "娴︿笢鍖楄矾"]; } static def city_parents=[:]; static{ - city_parents["上海"]=["上海"]; - city_parents["北京"]=["北京"]; - city_parents["天津"]=["天津"]; - city_parents["广州"]=["广东", "广州"]; - city_parents["深圳"]=["广东", "深圳"]; - city_parents["杭州"]=["浙江", "杭州"]; - city_parents["南京"]=["江苏", "南京"]; - city_parents["西安"]=["陕西", "西安"]; - city_parents["成都"]=["四川", "成都"]; - city_parents["武汉"]=["湖北", "武汉"]; - city_parents["宁波"]=["浙江", "宁波"]; - city_parents["青岛"]=["山东", "青岛"]; - city_parents["沈阳"]=["辽宁", "沈阳"]; - city_parents["大连"]=["辽宁", "大连"]; - city_parents["济南"]=["山东", "济南"]; - city_parents["福州"]=["福建", "福州"]; - city_parents["郑州"]=["河南", "郑州"]; - city_parents["长沙"]=["湖南", "长沙"]; - city_parents["昆明"]=["云南", "昆明"]; - city_parents["长春"]=["吉林", "长春"]; - city_parents["厦门"]=["福建", "厦门"]; - city_parents["哈尔滨"]=["黑龙江", "哈尔滨"]; - city_parents["苏州"]=["江苏", "苏州"]; - city_parents["无锡"]=["江苏", "无锡"]; - city_parents["合肥"]=["安徽", "合肥"]; - city_parents["太原"]=["山西", "太原"]; - city_parents["石家庄"]=["河北", "石家庄"]; - city_parents["南昌"]=["江西", "南昌"]; - city_parents["呼和浩特"]=["内蒙古", "呼和浩特"]; - city_parents["南宁"]=["广西", "南宁"]; - city_parents["烟台"]=["山东", "烟台"]; - city_parents["佛山"]=["广东", "佛山"]; - city_parents["唐山"]=["河北", "唐山"]; - city_parents["泉州"]=["福建", "泉州"]; - city_parents["东莞"]=["广东", "东莞"]; - city_parents["海口"]=["海南", "海口"]; - city_parents["汕头"]=["广东", "汕头"]; - city_parents["徐州"]=["江苏", "徐州"]; - city_parents["珠海"]=["广东", "珠海"]; - city_parents["温州"]=["浙江", "温州"]; - city_parents["绍兴"]=["浙江", "绍兴"]; - city_parents["常州"]=["江苏", "常州"]; - city_parents["南通"]=["江苏", "南通"]; - city_parents["大庆"]=["黑龙江", "大庆"]; - city_parents["中山"]=["广东", "中山"]; - city_parents["威海"]=["山东", "威海"]; - city_parents["金华"]=["浙江", "金华"]; - city_parents["嘉兴"]=["浙江", "嘉兴"]; - city_parents["湖州"]=["浙江", "湖州"]; - city_parents["镇江"]=["江苏", "镇江"]; - city_parents["东营"]=["山东", "东营"]; - city_parents["惠州"]=["广东", "惠州"]; - city_parents["扬州"]=["江苏", "扬州"]; - city_parents["盐城"]=["江苏", "盐城"]; - city_parents["江门"]=["广东", "江门"]; - city_parents["昆山"]=["江苏", "苏州", "昆山"]; - city_parents["常熟"]=["江苏", "苏州", "常熟"]; - city_parents["萧山"]=["浙江", "杭州", "萧山"]; - city_parents["义乌"]=["浙江", "金华", "义乌"]; - city_parents["余姚"]=["浙江", "宁波", "余姚"]; - city_parents["慈溪"]=["浙江", "宁波", "慈溪"]; + city_parents["涓婃捣"]=["涓婃捣"]; + city_parents["鍖椾含"]=["鍖椾含"]; + city_parents["澶╂触"]=["澶╂触"]; + city_parents["骞垮窞"]=["骞夸笢", "骞垮窞"]; + city_parents["娣卞湷"]=["骞夸笢", "娣卞湷"]; + city_parents["鏉窞"]=["娴欐睙", "鏉窞"]; + city_parents["鍗椾含"]=["姹熻嫃", "鍗椾含"]; + city_parents["瑗垮畨"]=["闄曡タ", "瑗垮畨"]; + city_parents["鎴愰兘"]=["鍥涘窛", "鎴愰兘"]; + city_parents["姝︽眽"]=["婀栧寳", "姝︽眽"]; + city_parents["瀹佹尝"]=["娴欐睙", "瀹佹尝"]; + city_parents["闈掑矝"]=["灞变笢", "闈掑矝"]; + city_parents["娌堥槼"]=["杈藉畞", "娌堥槼"]; + city_parents["澶ц繛"]=["杈藉畞", "澶ц繛"]; + city_parents["娴庡崡"]=["灞变笢", "娴庡崡"]; + city_parents["绂忓窞"]=["绂忓缓", "绂忓窞"]; + city_parents["閮戝窞"]=["娌冲崡", "閮戝窞"]; + city_parents["闀挎矙"]=["婀栧崡", "闀挎矙"]; + city_parents["鏄嗘槑"]=["浜戝崡", "鏄嗘槑"]; + city_parents["闀挎槬"]=["鍚夋灄", "闀挎槬"]; + city_parents["鍘﹂棬"]=["绂忓缓", "鍘﹂棬"]; + city_parents["鍝堝皵婊�"]=["榛戦緳姹�", "鍝堝皵婊�"]; + city_parents["鑻忓窞"]=["姹熻嫃", "鑻忓窞"]; + city_parents["鏃犻敗"]=["姹熻嫃", "鏃犻敗"]; + city_parents["鍚堣偉"]=["瀹夊窘", "鍚堣偉"]; + city_parents["澶師"]=["灞辫タ", "澶師"]; + city_parents["鐭冲搴�"]=["娌冲寳", "鐭冲搴�"]; + city_parents["鍗楁槍"]=["姹熻タ", "鍗楁槍"]; + city_parents["鍛煎拰娴╃壒"]=["鍐呰挋鍙�", "鍛煎拰娴╃壒"]; + city_parents["鍗楀畞"]=["骞胯タ", "鍗楀畞"]; + city_parents["鐑熷彴"]=["灞变笢", "鐑熷彴"]; + city_parents["浣涘北"]=["骞夸笢", "浣涘北"]; + city_parents["鍞愬北"]=["娌冲寳", "鍞愬北"]; + city_parents["娉夊窞"]=["绂忓缓", "娉夊窞"]; + city_parents["涓滆帪"]=["骞夸笢", "涓滆帪"]; + city_parents["娴峰彛"]=["娴峰崡", "娴峰彛"]; + city_parents["姹曞ご"]=["骞夸笢", "姹曞ご"]; + city_parents["寰愬窞"]=["姹熻嫃", "寰愬窞"]; + city_parents["鐝犳捣"]=["骞夸笢", "鐝犳捣"]; + city_parents["娓╁窞"]=["娴欐睙", "娓╁窞"]; + city_parents["缁嶅叴"]=["娴欐睙", "缁嶅叴"]; + city_parents["甯稿窞"]=["姹熻嫃", "甯稿窞"]; + city_parents["鍗楅��"]=["姹熻嫃", "鍗楅��"]; + city_parents["澶у簡"]=["榛戦緳姹�", "澶у簡"]; + city_parents["涓北"]=["骞夸笢", "涓北"]; + city_parents["濞佹捣"]=["灞变笢", "濞佹捣"]; + city_parents["閲戝崕"]=["娴欐睙", "閲戝崕"]; + city_parents["鍢夊叴"]=["娴欐睙", "鍢夊叴"]; + city_parents["婀栧窞"]=["娴欐睙", "婀栧窞"]; + city_parents["闀囨睙"]=["姹熻嫃", "闀囨睙"]; + city_parents["涓滆惀"]=["灞变笢", "涓滆惀"]; + city_parents["鎯犲窞"]=["骞夸笢", "鎯犲窞"]; + city_parents["鎵窞"]=["姹熻嫃", "鎵窞"]; + city_parents["鐩愬煄"]=["姹熻嫃", "鐩愬煄"]; + city_parents["姹熼棬"]=["骞夸笢", "姹熼棬"]; + city_parents["鏄嗗北"]=["姹熻嫃", "鑻忓窞", "鏄嗗北"]; + city_parents["甯哥啛"]=["姹熻嫃", "鑻忓窞", "甯哥啛"]; + city_parents["钀у北"]=["娴欐睙", "鏉窞", "钀у北"]; + city_parents["涔変箤"]=["娴欐睙", "閲戝崕", "涔変箤"]; + city_parents["浣欏"]=["娴欐睙", "瀹佹尝", "浣欏"]; + city_parents["鎱堟邯"]=["娴欐睙", "瀹佹尝", "鎱堟邯"]; } def room_letters=["A", "B", "C", "D", "E", "F","G", "H","I"] @@ -141,25 +141,25 @@ class GenerateHouseLoudong { Pattern regExp_house_num_1=Pattern.compile("^([\\d]{1,3}[a-gA-G]?)\$"); Pattern regExp_house_num_2=Pattern.compile("^([a-gA-G]{1}[\\d]{1,3})\$"); - Pattern regExp_house_num_3=Pattern.compile("^([甲乙丙丁]{1}[\\d]{1,3})\$"); - Pattern regExp_house_num_4=Pattern.compile("^([\\d]{1,3}[甲乙丙丁]{1})\$"); + Pattern regExp_house_num_3=Pattern.compile("^([鐢蹭箼涓欎竵]{1}[\\d]{1,3})\$"); + Pattern regExp_house_num_4=Pattern.compile("^([\\d]{1,3}[鐢蹭箼涓欎竵]{1})\$"); Pattern regExp_room_num_1=Pattern.compile("^([\\d]{3,4})\$"); Pattern regExp_room_num_2=Pattern.compile("^(([\\d]{1,2})([a-gA-G]))\$"); Pattern regExp_room_num_3=Pattern.compile("^(([a-gA-G])([\\d]{1,2}))\$"); - Pattern regExp_houseNum_checkRoad2=Pattern.compile("^[\u4e00-\u9fa5]{2,30}(\u5927\u9053|\u8DEF|\u8857|街|道)[0-9]+(\u5F04|\u53F7)"); - Pattern regExp_houseNum_checkRoad2_1=Pattern.compile("(^[\u4e00-\u9fa5]{2,30}(\u5927\u9053|\u8DEF|\u8857|街|道)[0-9]+(\u5F04|\u53F7)([0-9]+\u652F\u5F04)?)[\u4e00-\u9fa5]{0,8}([0-9]+)号楼?([0-9A-Z]+幢)?"); - Pattern regExp_houseNum_checkRoad2_2=Pattern.compile("(^[\u4e00-\u9fa5]{2,30}(\u5927\u9053|\u8DEF|\u8857|街|道)[0-9]+(\u5F04|\u53F7)([0-9]+\u652F\u5F04)?)[\u4e00-\u9fa5]{0,8}[0-9A-Z]+(幢|区)([0-9]+)号"); - Pattern regExp_houseNum_checkRoad2_3=Pattern.compile("(^[\u4e00-\u9fa5]{2,30}(\u5927\u9053|\u8DEF|\u8857|街|道)[0-9]+(\u5F04|\u53F7)([0-9]+\u652F\u5F04)?)[\u4e00-\u9fa5]{0,8}([0-9A-Z]+)幢"); + Pattern regExp_houseNum_checkRoad2=Pattern.compile("^[\u4e00-\u9fa5]{2,30}(\u5927\u9053|\u8DEF|\u8857|琛梶閬�)[0-9]+(\u5F04|\u53F7)"); + Pattern regExp_houseNum_checkRoad2_1=Pattern.compile("(^[\u4e00-\u9fa5]{2,30}(\u5927\u9053|\u8DEF|\u8857|琛梶閬�)[0-9]+(\u5F04|\u53F7)([0-9]+\u652F\u5F04)?)[\u4e00-\u9fa5]{0,8}([0-9]+)鍙锋ゼ?([0-9A-Z]+骞�)?"); + Pattern regExp_houseNum_checkRoad2_2=Pattern.compile("(^[\u4e00-\u9fa5]{2,30}(\u5927\u9053|\u8DEF|\u8857|琛梶閬�)[0-9]+(\u5F04|\u53F7)([0-9]+\u652F\u5F04)?)[\u4e00-\u9fa5]{0,8}[0-9A-Z]+(骞鍖�)([0-9]+)鍙�"); + Pattern regExp_houseNum_checkRoad2_3=Pattern.compile("(^[\u4e00-\u9fa5]{2,30}(\u5927\u9053|\u8DEF|\u8857|琛梶閬�)[0-9]+(\u5F04|\u53F7)([0-9]+\u652F\u5F04)?)[\u4e00-\u9fa5]{0,8}([0-9A-Z]+)骞�"); - Pattern regExp_houseNum_checkRoad3=Pattern.compile("(^[\u4e00-\u9fa5]{2,30})([0-9]+)号楼?([0-9A-Z]+幢)?"); - Pattern regExp_houseNum_checkRoad4=Pattern.compile("(^[\u4e00-\u9fa5]{2,30})[0-9A-Z]+(幢|区)([0-9]+)号"); - Pattern regExp_houseNum_checkRoad5=Pattern.compile("(^[\u4e00-\u9fa5]{2,30})([0-9A-Z]+)幢"); + Pattern regExp_houseNum_checkRoad3=Pattern.compile("(^[\u4e00-\u9fa5]{2,30})([0-9]+)鍙锋ゼ?([0-9A-Z]+骞�)?"); + Pattern regExp_houseNum_checkRoad4=Pattern.compile("(^[\u4e00-\u9fa5]{2,30})[0-9A-Z]+(骞鍖�)([0-9]+)鍙�"); + Pattern regExp_houseNum_checkRoad5=Pattern.compile("(^[\u4e00-\u9fa5]{2,30})([0-9A-Z]+)骞�"); /* /** - * 地址分析过滤 + * 鍦板潃鍒嗘瀽杩囨护 * @param city * @param myDoc * @param targetDb @@ -178,27 +178,27 @@ class GenerateHouseLoudong { def _id=myDoc._id; /** - * 0: 未处理 - * 1: 已处理 + * 0: 鏈鐞� + * 1锛� 宸插鐞� */ def status=0; /** - * 处理次数 + * 澶勭悊娆℃暟 */ // def filter_count=0; /** * filter_type: - * 0:未处理 - * 1:单地址正则匹配 - * 2:多地址分割符 如:浦东益江路286弄、益江路126弄 - * 浦东中科路2195弄、2166弄、2566弄、2500弄,2660弄、顺和路60弄、126弄、236弄 - * 3: 不规则地址正则,如:浦东五莲路30弄五莲路100弄莱阳路201弄,或 浦东五莲路30弄五莲路 + * 0锛氭湭澶勭悊 + * 1锛氬崟鍦板潃姝e垯鍖归厤 + * 2锛氬鍦板潃鍒嗗壊绗� 濡傦細娴︿笢鐩婃睙璺�286寮勩�佺泭姹熻矾126寮� + * 娴︿笢涓璺�2195寮勩��2166寮勩��2566寮勩��2500寮勶紝2660寮勩�侀『鍜岃矾60寮勩��126寮勩��236寮� + * 3: 涓嶈鍒欏湴鍧�姝e垯锛屽锛氭郸涓滀簲鑾茶矾30寮勪簲鑾茶矾100寮勮幈闃宠矾201寮勶紝鎴� 娴︿笢浜旇幉璺�30寮勪簲鑾茶矾 */ // def filter_type=0; /** - * 地区方式 + * 鍦板尯鏂瑰紡 */ def replace_district=replaceDistrict(address, city); def district=myDoc.district; @@ -207,8 +207,8 @@ class GenerateHouseLoudong { if(!myDoc.district){ district=replace_district.district; if(district){ - if(endWith(district, "区") - ||endWith(district, "县")){ + if(endWith(district, "鍖�") + ||endWith(district, "鍘�")){ district=district.substring(0, district.length()-1); } @@ -223,13 +223,13 @@ class GenerateHouseLoudong { } /** - * 标准地址 + * 鏍囧噯鍦板潃 */ def matchType=checkRoad(address); if(matchType>0){ myDoc.match_type=matchType; if(matchType==5){ - address=address+"弄"; + address=address+"寮�"; } myDoc.address=address; myDoc.status=1; @@ -238,12 +238,12 @@ class GenerateHouseLoudong { status=1; }else{ /** - * 匹配多个地址 + * 鍖归厤澶氫釜鍦板潃 */ status=splitMutilAddr(city, address, myDoc, targetDb, notCheckExists, _id); } - //如果标准路没匹配成功,但过滤了一些字条,则设status=2保存 + //濡傛灉鏍囧噯璺病鍖归厤鎴愬姛锛屼絾杩囨护浜嗕竴浜涘瓧鏉★紝鍒欒status=2淇濆瓨 if(status==0 && address && origi_address!=address && address.length()>=3){ myDoc.address=address; myDoc.status=2; @@ -252,7 +252,7 @@ class GenerateHouseLoudong { } /** - *更新处理状态 + *鏇存柊澶勭悊鐘舵�� */ if(srcDb){ def updateDoc=[filter_status: status ]; @@ -263,9 +263,9 @@ class GenerateHouseLoudong { return status; } - //替换重复的镇名或路名: 千灯镇千灯镇黄浦路 + //鏇挎崲閲嶅鐨勯晣鍚嶆垨璺悕锛� 鍗冪伅闀囧崈鐏晣榛勬郸璺� def replaceRepeatAddr(address){ - def placeRegx=Pattern.compile("([^镇.]{2,5}镇)"); + def placeRegx=Pattern.compile("([^闀�.]{2,5}闀�)"); Matcher matcher=placeRegx.matcher(address) if(matcher.find()){ def place=matcher.group(1) @@ -279,7 +279,7 @@ class GenerateHouseLoudong { } } - placeRegx=Pattern.compile("([^路.]{2,5}路)"); + placeRegx=Pattern.compile("([^璺�.]{2,5}璺�)"); matcher=placeRegx.matcher(address) if(matcher.find()){ def place=matcher.group(1) @@ -296,7 +296,7 @@ class GenerateHouseLoudong { } - //替换省市的名称,如:上海市上海青浦区黄浦路34弄2号,返回:黄浦路34弄2号 + //鏇挎崲鐪佸競鐨勫悕绉帮紝濡傦細涓婃捣甯備笂娴烽潚娴﹀尯榛勬郸璺�34寮�2鍙凤紝杩斿洖锛氶粍娴﹁矾34寮�2鍙� def replaceDistrict(address, city){ def hasCity=false; @@ -306,7 +306,7 @@ class GenerateHouseLoudong { if(cityParents){ for(def k=0; k0){ if(matchType==5){ - splitedAddress=splitedAddress+"弄"; + splitedAddress=splitedAddress+"寮�"; } lastFullAddress=splitedAddress; if(j>0){ @@ -510,7 +510,7 @@ class GenerateHouseLoudong { return false; } - //全角转换为半角函数 + //鍏ㄨ杞崲涓哄崐瑙掑嚱鏁� def ToCDB(str) { if(str) return DataUtil.ToCDB(str); @@ -550,25 +550,25 @@ class GenerateHouseLoudong { } }; - //关联分期小区 - def xiaoquQiRegx=Pattern.compile("(.{2,})([一二三四五六七八九1-9]期)"); - targetAddressDb.find(DataUtil.map2DBObject([city: city, name:[$regex:"期"]])).each({ + //鍏宠仈鍒嗘湡灏忓尯 + def xiaoquQiRegx=Pattern.compile("(.{2,})([涓�浜屼笁鍥涗簲鍏竷鍏節1-9]鏈�)"); + targetAddressDb.find(DataUtil.map2DBObject([city: city, name:[$regex:"鏈�"]])).each({ doc -> def strs= xiaoquQiRegx.matcher(replaceBrackets(ToCDB(doc.name))); if(strs){ def name=strs.group(1); def xiaoquQiNameRegx=null; try{ - xiaoquQiNameRegx=Pattern.compile(name+"[一二三四五六七八九1-9]期"); + xiaoquQiNameRegx=Pattern.compile(name+"[涓�浜屼笁鍥涗簲鍏竷鍏節1-9]鏈�"); }catch(e){ - println(name+"[一二三四五六七八九1-9]期"); + println(name+"[涓�浜屼笁鍥涗簲鍏竷鍏節1-9]鏈�"); return false } def arrs=targetAddressDb.find(DataUtil.map2DBObject([city:doc.city, district: doc.district, name:[$regex:name], parent_id:null, parent_name:null])).toArray(); println(city + "\t" + "arrs: "+arrs.size()+", name: "+name); if(arrs.size()>1){ - //选定主小区名 + //閫夊畾涓诲皬鍖哄悕 def parentXq=null; for(def i=0; i< arrs.size(); i++){ def arr=arrs[i]; @@ -608,7 +608,7 @@ class GenerateHouseLoudong { } }); - //根据地址关联不同名,但小区相同 + //鏍规嵁鍦板潃鍏宠仈涓嶅悓鍚嶏紝浣嗗皬鍖虹浉鍚� /** * */ @@ -638,10 +638,10 @@ class GenerateHouseLoudong { // } } /** - * 将电信原始数据,按城市提取 + * 灏嗙數淇″師濮嬫暟鎹紝鎸夊煄甯傛彁鍙� */ def splitDxAddrToCity(targetDb, srcDb){ -// def citys=["昆山"]; +// def citys=["鏄嗗北"]; for(def i=0;i @@ -707,7 +707,7 @@ class GenerateHouseLoudong { } ); /** - * 处理剩下未处理有addr2的 + * 澶勭悊鍓╀笅鏈鐞嗘湁addr2鐨� */ srcDb.find(DataUtil.map2DBObject([city: city, user_type:1, filter_status:0, addr2: [$ne:""]])).each( { doc -> @@ -729,7 +729,7 @@ class GenerateHouseLoudong { if(isEndDistrict){ doc.addr1=doc.addr1.replace("-", ""); }else{ - doc.addr1=doc.addr1.replace("-", "镇"); + doc.addr1=doc.addr1.replace("-", "闀�"); } } Matcher matcher=dx_regex_addr2_replace.matcher(doc.addr2) @@ -747,7 +747,7 @@ class GenerateHouseLoudong { ); /** - * 处理剩下未处理的 + * 澶勭悊鍓╀笅鏈鐞嗙殑 */ srcDb.find(DataUtil.map2DBObject([city: city, user_type:1, filter_status:0])).each( { doc -> @@ -776,7 +776,7 @@ class GenerateHouseLoudong { if(isEndDistrict){ doc.addr1=doc.addr1.replace("-", ""); }else{ - doc.addr1=doc.addr1.replace("-", "镇"); + doc.addr1=doc.addr1.replace("-", "闀�"); } } @@ -786,14 +786,14 @@ class GenerateHouseLoudong { address=community.address; } }else { - if(doc.addr1.indexOf("镇")!=-1){ - def communityName=doc.addr1.substring(doc.addr1.indexOf("镇")+1); + if(doc.addr1.indexOf("闀�")!=-1){ + def communityName=doc.addr1.substring(doc.addr1.indexOf("闀�")+1); def community=addressDb.findOne(DataUtil.map2DBObject([name: communityName])); if(community!=null){ address=community.address; } - }else if(doc.addr1.indexOf("区")!=-1){ - def communityName=doc.addr1.substring(doc.addr1.indexOf("区")+1); + }else if(doc.addr1.indexOf("鍖�")!=-1){ + def communityName=doc.addr1.substring(doc.addr1.indexOf("鍖�")+1); def community=addressDb.findOne(DataUtil.map2DBObject([name: communityName])); if(community!=null){ address=community.address; @@ -825,7 +825,7 @@ class GenerateHouseLoudong { } ); - //小区名导入电信地址库 + //灏忓尯鍚嶅鍏ョ數淇″湴鍧�搴� // importNameToDxAddress(city, targetDb, addressDb); println("splitDXAddr complete!"); @@ -848,8 +848,8 @@ class GenerateHouseLoudong { } if(!nameAddress){ - if(address.indexOf("镇")!=-1){ - address=address.substring(address.indexOf("镇")+1); + if(address.indexOf("闀�")!=-1){ + address=address.substring(address.indexOf("闀�")+1); nameAddress=nameAddressCache[address]; if(!nameAddress){ nameAddress=findAddressName(city, addressDb, address); @@ -868,7 +868,7 @@ class GenerateHouseLoudong { /** - * 根据地址找到小区的父小区,如果有父小区 + * 鏍规嵁鍦板潃鎵惧埌灏忓尯鐨勭埗灏忓尯锛屽鏋滄湁鐖跺皬鍖� * @param city * @param addressDb * @param address @@ -1018,7 +1018,7 @@ class GenerateHouseLoudong { } /** - * 根据楼高和最大室号生成房号 + * 鏍规嵁妤奸珮鍜屾渶澶у鍙风敓鎴愭埧鍙� * @param city * @param addressDb * @param dxAddrDoc @@ -1044,7 +1044,7 @@ class GenerateHouseLoudong { def hasFourFloor=true; int roomCount=0; /** - * 1. 纯数字 如201 + * 1. 绾暟瀛� 濡�201 * 2. 10A * 3. A10 */ @@ -1055,11 +1055,11 @@ class GenerateHouseLoudong { // return 0 // } - //查询同一号楼 + //鏌ヨ鍚屼竴鍙锋ゼ DBCursor cur=houseWorkDb.find(DataUtil.map2DBObject([city: city, region: houseNum.region, name: name, house_num: houseNum.house_num, house_num_unit: houseNumUnit])) // println cur.count() def houses=cur.toArray(); - //otherHouseNum表示其它期存在该楼号,如果存在,将用该栋楼的所有house转移到otherHouseNum里 + //otherHouseNum琛ㄧず鍏跺畠鏈熷瓨鍦ㄨ妤煎彿锛屽鏋滃瓨鍦紝灏嗙敤璇ユ爧妤肩殑鎵�鏈塰ouse杞Щ鍒皁therHouseNum閲� if(otherHouseNum){ houseNum=otherHouseNum; name=otherHouseNum.name; @@ -1080,7 +1080,7 @@ class GenerateHouseLoudong { dataRating=9; } if(maxFloor<1){ - //从evaluation中出现n次以上,取层高 + //浠巈valuation涓嚭鐜皀娆′互涓婏紝鍙栧眰楂� def house_heights=[:]; def house_height_houses=[:]; @@ -1099,7 +1099,7 @@ class GenerateHouseLoudong { } } // println("evaluation_count: "+evaluation_count); - //定义n次规则,默认出现3次以上 + //瀹氫箟n娆¤鍒欙紝榛樿鍑虹幇3娆′互涓� if(evaluation_count>=3){ def maxKey=null; for(def key : house_heights){ @@ -1120,7 +1120,7 @@ class GenerateHouseLoudong { // println("dataRating: "+dataRating); /** - * 取不到层高,取最大楼层 + * 鍙栦笉鍒板眰楂橈紝鍙栨渶澶фゼ灞� */ if(maxFloor<1){ def floors=[]; @@ -1147,11 +1147,11 @@ class GenerateHouseLoudong { dataRating=7; } } - //取最大室号及室高 + //鍙栨渶澶у鍙峰強瀹ら珮 def maxRoomHouse=getRoomNumMaxFloor(houses); /** - * 再取不到,根据室号取层高 + * 鍐嶅彇涓嶅埌锛屾牴鎹鍙峰彇灞傞珮 */ if(maxFloor<1){ @@ -1164,7 +1164,7 @@ class GenerateHouseLoudong { if(maxFloor<1)return 0; - //推算是否存在带4的楼层 + //鎺ㄧ畻鏄惁瀛樺湪甯�4鐨勬ゼ灞� if(maxRoomHouse){ if(maxRoomHouse.maxFloor > maxFloor){ @@ -1185,7 +1185,7 @@ class GenerateHouseLoudong { def doorNos=[:]; - //判定 roomNumFormat + //鍒ゅ畾 roomNumFormat def roomNumFormatsCount=[:] for(def i=0; iMAX_HEIGHT)maxFloor=MAX_HEIGHT; - //最高只造到10户 + //鏈�楂樺彧閫犲埌10鎴� if(roomNumFormat==1){ if(/*dataRating==8 && */maxDoor>MAX_DOOR)maxDoor=MAX_DOOR; }else if(roomNumFormat>1){ @@ -1319,14 +1319,14 @@ class GenerateHouseLoudong { if(maxFloorHeight>MAX_HEIGHT){ maxFloorHeight=MAX_HEIGHT; } - //多层普通住宅,楼层 + //澶氬眰鏅�氫綇瀹咃紝妤煎眰 for(def i=1; i<=maxFloor; i++ ){ def floor=i; - //判断是否有带4的楼层 + //鍒ゆ柇鏄惁鏈夊甫4鐨勬ゼ灞� if(!hasFourFloor && floor%10==4)continue; - //户数 + //鎴锋暟 for(def k=1; k<=maxDoor; k++){ def floorDoorNo=k def doorNo=null @@ -1339,10 +1339,10 @@ class GenerateHouseLoudong { } def doorNoHouse=doorNos[doorNo]; - def floorDoorNoHouse=floorDoorNos[floorDoorNo]; //floorDoorNoHouse生成房子基础数据 + def floorDoorNoHouse=floorDoorNos[floorDoorNo]; //floorDoorNoHouse鐢熸垚鎴垮瓙鍩虹鏁版嵁 // println("houseNum: "+houseNum+", floor:"+floor+", door:"+k+", doorNoHouse: "+doorNoHouse); - //如果室号存在,直接保存到houseDb + //濡傛灉瀹ゅ彿瀛樺湪锛岀洿鎺ヤ繚瀛樺埌houseDb if(doorNoHouse){ if(!checkHouseHeight(doorNoHouse)){ doorNoHouse.house_height=maxFloorHeight; @@ -1402,7 +1402,7 @@ class GenerateHouseLoudong { def betweenDate=getLastWeekBetween(fromDate); queryParam.$and= [[m_date: [$gte: betweenDate[0]]], [m_date: [$lt: betweenDate[1]]]]; } -// queryParam.name=[$regex:"万博苑"] +// queryParam.name=[$regex:"涓囧崥鑻�"] queryParam=DataUtil.map2DBObject([city: city]) DBCursor cur=houseNumWorkDb.find(queryParam) @@ -1436,11 +1436,11 @@ class GenerateHouseLoudong { queryParam=DataUtil.map2DBObject(queryParam) def houseNum=houseNumDb.findOne(queryParam) - //如果houseNum不存在,则造创建并造房子 + //濡傛灉houseNum涓嶅瓨鍦紝鍒欓�犲垱寤哄苟閫犳埧瀛� if(!houseNum){ def unexists_units=[]; - //查询其它期是否存在该楼号,存在用其它期name + //鏌ヨ鍏跺畠鏈熸槸鍚﹀瓨鍦ㄨ妤煎彿锛屽瓨鍦ㄧ敤鍏跺畠鏈焠ame def otherHouseNum=findHouseNumInOtherPhase(houseNumWork, addressDb, houseNumDb); if(otherHouseNum){ for(def houseNumUnit: houseNumWork.house_num_units){ @@ -1475,10 +1475,10 @@ class GenerateHouseLoudong { } } }else{ - //如houseNum存在则只造新增单元的房子 + //濡俬ouseNum瀛樺湪鍒欏彧閫犳柊澧炲崟鍏冪殑鎴垮瓙 def unexists_units=[] - //查未造的单元house_num_unit + //鏌ユ湭閫犵殑鍗曞厓house_num_unit for(def houseNumUnit: houseNumWork.house_num_units){ boolean has=houseNum.house_num_units.contains(houseNumUnit); if(!has){ @@ -1521,7 +1521,7 @@ class GenerateHouseLoudong { queryParam.$and= [[m_date: [$gte: betweenDate[0]]], [m_date: [$lt: betweenDate[1]]]]; } -// queryParam.name= [$regex:"万博苑"]; +// queryParam.name= [$regex:"涓囧崥鑻�"]; queryParam=DataUtil.map2DBObject(queryParam) DBCursor cur=houseNumCrawlDb.find(queryParam) @@ -1538,7 +1538,7 @@ class GenerateHouseLoudong { def fromHouse_num_units=fromHouseNum.house_num_units queryParam=[city: fromHouseNum.city, region: fromHouseNum.region, name: fromHouseNum.name, house_num: fromHouseNum.house_num]; - //后面查询houseCrawlDb用 + //鍚庨潰鏌ヨhouseCrawlDb鐢� queryParam.from=from; queryParam=DataUtil.map2DBObject(queryParam) @@ -1546,7 +1546,7 @@ class GenerateHouseLoudong { def roomListMap=groupRoomListByHouseNumUnit(houseLoudongList); def otherHouseNum=findHouseNumInOtherPhase(fromHouseNum, addressDb, houseNumDb); - //如果其它期存在该楼号,存入其它期小区楼栋下 + //濡傛灉鍏跺畠鏈熷瓨鍦ㄨ妤煎彿锛屽瓨鍏ュ叾瀹冩湡灏忓尯妤兼爧涓� if(otherHouseNum){ for(def houseLoudong: houseLoudongList){ houseLoudong.name=otherHouseNum.name; @@ -1560,12 +1560,12 @@ class GenerateHouseLoudong { /*def houseNum=houseNumDb.findOne(queryParam) - //判断楼号是否是新楼号,没有则创建新楼号 + //鍒ゆ柇妤煎彿鏄惁鏄柊妤煎彿锛屾病鏈夊垯鍒涘缓鏂版ゼ鍙� if(!houseNum){ def otherHouseNum=findHouseNumInOtherPhase(fromHouseNum, addressDb, houseNumDb); - //如果其它期存在该楼号,存入其它期小区楼栋下 + //濡傛灉鍏跺畠鏈熷瓨鍦ㄨ妤煎彿锛屽瓨鍏ュ叾瀹冩湡灏忓尯妤兼爧涓� if(otherHouseNum){ def unexists_units=[] for(def house_num_unit: fromHouse_num_units){ @@ -1611,7 +1611,7 @@ class GenerateHouseLoudong { result=1; } }else{ - //如果楼号已存在,则比较所有的单元是否都已保存,将只保存未导入的单元 + //濡傛灉妤煎彿宸插瓨鍦紝鍒欐瘮杈冩墍鏈夌殑鍗曞厓鏄惁閮藉凡淇濆瓨锛屽皢鍙繚瀛樻湭瀵煎叆鐨勫崟鍏� def unexists_units=[]; def house_num_units2=houseNum.house_num_units for(def house_num_unit: fromHouse_num_units){ @@ -1638,10 +1638,10 @@ class GenerateHouseLoudong { }*/ /** * result: - * 0: 未操作 - * 1: 新入库 - * 2: 更新 - * 3: 使用其它期替换 + * 0: 鏈搷浣� + * 1: 鏂板叆搴� + * 2: 鏇存柊 + * 3: 浣跨敤鍏跺畠鏈熸浛鎹� */ println("importHouseFrom_${from}: ${countIndex}, result: ${result} ===> ${fromHouseNum.city}, ${fromHouseNum.region}, ${fromHouseNum.name}, ${fromHouseNum.house_num}, add room: ${room_count}") }catch(e){ @@ -1660,7 +1660,7 @@ class GenerateHouseLoudong { } int countIndex=0 -// queryParam=[city:city, district_name:"万博苑"] +// queryParam=[city:city, district_name:"涓囧崥鑻�"] queryParam=DataUtil.map2DBObject(queryParam) DBCursor cur=evalDb.find(queryParam) @@ -1729,7 +1729,7 @@ class GenerateHouseLoudong { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd"); sb.append(" and weekend = '${sdf.format(weekend)}'"); } -// sb.append(" and match_name = '上海绿城'"); +// sb.append(" and match_name = '涓婃捣缁垮煄'"); sqlDb.eachRow(sb.toString()) { realTradeData-> @@ -1769,7 +1769,7 @@ class GenerateHouseLoudong { // } int countIndex=0 -// queryParam=[name: "上海绿城"] +// queryParam=[name: "涓婃捣缁垮煄"] queryParam=DataUtil.map2DBObject(queryParam) DBCursor cur=dxAddrDb.find(queryParam) @@ -1785,8 +1785,8 @@ class GenerateHouseLoudong { def address=dxDoc.address; def nameAddress=findAddressName(city, addressDb, address); if(!nameAddress){ - if(address.indexOf("镇")!=-1){ - address=address.substring(address.indexOf("镇")+1); + if(address.indexOf("闀�")!=-1){ + address=address.substring(address.indexOf("闀�")+1); nameAddress=findAddressName(city, addressDb, address); } } @@ -1834,10 +1834,10 @@ class GenerateHouseLoudong { /** * result: - * 0: 未操作 - * 1:保存到workDB - * 2: 更新到workDB - * 3: 更新到houseDB + * 0: 鏈搷浣� + * 1锛氫繚瀛樺埌workDB + * 2: 鏇存柊鍒皐orkDB + * 3: 鏇存柊鍒癶ouseDB * @param houseLoudong * @param houseNumWorkDb * @param houseWorkDb @@ -1870,7 +1870,7 @@ class GenerateHouseLoudong { houseNum.house_num=trimZero(house_num); houseNum.house_num_units=["1"] - houseNum.house_num_suffix="号" + houseNum.house_num_suffix="鍙�" houseNum.name=name houseNum.region=houseLoudong.region houseNum.status=0 @@ -1900,7 +1900,7 @@ class GenerateHouseLoudong { result=3; } }else{ - //进入 work db的不做数据有效性检查,多种数据源进来可以合并,造好房子进入正式db后会检查 + //杩涘叆 work db鐨勪笉鍋氭暟鎹湁鏁堟�ф鏌ワ紝澶氱鏁版嵁婧愯繘鏉ュ彲浠ュ悎骞讹紝閫犲ソ鎴垮瓙杩涘叆姝e紡db鍚庝細妫�鏌� houseLoudong2=houseWorkDb.findOne(queryParam) if(houseLoudong2){ BasicDBObject data=DataUtil.bean2DBObject(houseLoudong); @@ -2017,16 +2017,16 @@ class GenerateHouseLoudong { private def filterBuildType(def buildType){ if(buildType){ if(buildType.size()>=4){ - return '公寓'; + return '鍏瘬'; }else{ - if(buildType.indexOf('别墅')!=-1){ - return '别墅'; + if(buildType.indexOf('鍒')!=-1){ + return '鍒'; }else{ - return '公寓'; + return '鍏瘬'; } } }else{ - return '公寓'; + return '鍏瘬'; } } @@ -2044,7 +2044,7 @@ class GenerateHouseLoudong { } - // 获得上周星期日的日期 + // 鑾峰緱涓婂懆鏄熸湡鏃ョ殑鏃ユ湡 public Date getPreviousWeekSunday(Date date) { int n = -1; Calendar cal = Calendar.getInstance(); @@ -2056,7 +2056,7 @@ class GenerateHouseLoudong { return monday; } - // 获得上周星期一的日期 + // 鑾峰緱涓婂懆鏄熸湡涓�鐨勬棩鏈� public Date getPreviousWeekMonday(Date date) { int n = -1; Calendar cal = Calendar.getInstance(); @@ -2131,7 +2131,7 @@ class GenerateHouseLoudong { city_districts[city]=[]; region_block.find(DataUtil.map2DBObject([parent: city, category: "region"])).each({ doc -> - if(doc.name=="其他")return; + if(doc.name=="鍏朵粬")return; city_districts[city] << doc.name }); } @@ -2164,7 +2164,7 @@ class GenerateHouseLoudong { def sqlDb = Sql.newInstance( 'jdbc:mysql://mysql.db.fangjia.com:4306/goojia_fangjia?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull', 'sa', 'G00jia', 'com.mysql.jdbc.Driver' ) -// citys=[/*'上海',*/ '北京'] +// citys=[/*'涓婃捣',*/ '鍖椾含'] init() for(def i=0;i 0) { - room_type.append("${roomType.toilet}卫"); + room_type.append("${roomType.toilet}鍗�"); } roomType.room_type = room_type; return true; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/ParseStreetCommunity.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/ParseStreetCommunity.groovy index cd18c69ef..45243c1a1 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/ParseStreetCommunity.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/ParseStreetCommunity.groovy @@ -44,10 +44,10 @@ class ParseStreetCommunity { static main(args) { ParseStreetCommunity parser=new ParseStreetCommunity() - String city="广州" + String city="骞垮窞" // parser.parseExcel(city); - def citys=[ "上海", "深圳", "成都", "广州" ] + def citys=[ "涓婃捣", "娣卞湷", "鎴愰兘", "骞垮窞" ] for(String city2: citys) parser.procDistrict(city2) @@ -56,7 +56,7 @@ class ParseStreetCommunity { def procDistrict(city){ int counter=0 - Pattern pa1=Pattern.compile("[一二三四五六七八九十\\d]+弄([一二三四五六七八九十\\d]+号)") + Pattern pa1=Pattern.compile("[涓�浜屼笁鍥涗簲鍏竷鍏節鍗乗\d]+寮�([涓�浜屼笁鍥涗簲鍏竷鍏節鍗乗\d]+鍙�)") streetAddressDb.find(DataUtil.map2DBObject([city: city])).setOptions(Bytes.QUERYOPTION_NOTIMEOUT).each { doc -> AddressResult ar=AddressParser.parseAddressWithRoom(city, doc.address) @@ -99,7 +99,7 @@ class ParseStreetCommunity { } def parseExcel(city){ - InputStream inp = new FileInputStream("C:/Users/johnson/Desktop/广州社区居委会街道办信息一览表.xls"); + InputStream inp = new FileInputStream("C:/Users/johnson/Desktop/骞垮窞绀惧尯灞呭浼氳閬撳姙淇℃伅涓�瑙堣〃.xls"); HSSFWorkbook wb = new HSSFWorkbook(inp); int sheetCount=wb.getNumberOfSheets(); for(int i=0; i 0) { -// address = address.substring(address.indexOf('位于') + 2) +// if (address.indexOf('浣嶄簬') > 0) { +// address = address.substring(address.indexOf('浣嶄簬') + 2) // } // -// address = address.replaceAll("^(${city}市)*", '').replaceAll("^(${city})*", '') +// address = address.replaceAll("^(${city}甯�)*", '').replaceAll("^(${city})*", '') // // def orgRegion = // address = address.replaceAll("^(${orgRegion})*", '').replaceAll("^(${region})*", '') // -// address = address.replaceAll('^[\\s ]*|[\\s ]*$', "") +// address = address.replaceAll('^[\\s銆�]*|[\\s ]*$', "") // println address // // DB_1.update(new BasicDBObject('_id', id), new BasicDBObject('$set', new BasicDBObject('address', address))) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/RepeatDistrictFinder.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/RepeatDistrictFinder.groovy index 1555a39ae..9caf263ae 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/RepeatDistrictFinder.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/houseloudong/RepeatDistrictFinder.groovy @@ -160,7 +160,7 @@ class RepeatDistrictFinder { relatedDBObj.put("name", d.name); relatedDBObj.put("address", d.address); def repeatFlag = findSimilarDistrictByName(doc, d, regions,relatedDBObj); - println "匹配结果 : (${repeatFlag})" + println "鍖归厤缁撴灉 锛� (${repeatFlag})" println "------------------------------------------" if(repeatFlag){ repeater << d; @@ -180,7 +180,7 @@ class RepeatDistrictFinder { // }else{ // ret.del_ids << d; // //seaweed.update(DataUtil.map2DBObject([_id: d._id]), DataUtil.map2DBObject([$set: [status:1, m_date:new Date()]])) -// println "删除 ["+d.region+"-"+d.name+"-"+d.address+"]" +// println "鍒犻櫎 ["+d.region+"-"+d.name+"-"+d.address+"]" // ret.delCount ++; // } // } @@ -194,7 +194,7 @@ class RepeatDistrictFinder { def sameAddressRepeat(city, ret, regions){ seaweed.find(DataUtil.map2DBObject([city: city, cat:"district",visible:0])).each {doc -> - // if(doc.address=="黄浦区"){ + // if(doc.address=="榛勬郸鍖�"){ def rt=seaweed.find(DataUtil.map2DBObject([cat:"district", city: city, address: doc.address,visible:0])).getResults() if(rt.size()>1){ @@ -228,9 +228,9 @@ class RepeatDistrictFinder { index ++; println "(${index})["+d.region+"-"+d.name+"-"+d.address+"]" // writeTxt("(${index})["+d.region+"-"+d.name+"-"+d.address+"]\r\n"); - //println "相似度2:"+CosineSimilarAlgorithm.getSimilarityRatio(doc.name, d.name) + //println "鐩镐技搴�2锛�"+CosineSimilarAlgorithm.getSimilarityRatio(doc.name, d.name) def result = findSimilarDistrictByAddress(city, doc, d, regions); - println "匹配结果 : (${result.repeatFlag})" + println "鍖归厤缁撴灉 锛� (${result.repeatFlag})" if(result.containsKey("address_score")){ relatedDBObj.put("address_score", result.address_score); } @@ -238,7 +238,7 @@ class RepeatDistrictFinder { relatedDBObj.put("name_score", result.name_score); } relatedDBObjs.add(relatedDBObj); -// writeTxt("匹配结果 : (${result.repeatFlag})\r\n"); +// writeTxt("鍖归厤缁撴灉 锛� (${result.repeatFlag})\r\n"); if(result.repeatFlag){ repeater << d; continue; @@ -271,11 +271,11 @@ class RepeatDistrictFinder { // if(udata.size()>0){ // udata.put("m_date", new Date()); // //seaweed.update(DataUtil.map2DBObject([_id: reserveDoc._id]), DataUtil.map2DBObject([$set: udata])) -// println "保留:["+reserveDoc.region+"-"+reserveDoc.name+"-"+reserveDoc.address+"]补充值 "+udata; -// writeTxt("保留:["+reserveDoc.region+"-"+reserveDoc.name+"-"+reserveDoc.address+"]补充值 "+udata+"\r\n"); +// println "淇濈暀:["+reserveDoc.region+"-"+reserveDoc.name+"-"+reserveDoc.address+"]琛ュ厖鍊� "+udata; +// writeTxt("淇濈暀:["+reserveDoc.region+"-"+reserveDoc.name+"-"+reserveDoc.address+"]琛ュ厖鍊� "+udata+"\r\n"); // } -// println "<"+ret.del_ids.size()+">删除 ["+d.region+"-"+d.name+"-"+d.address+"]" -// writeTxt("<"+ret.del_ids.size()+">删除 ["+d.region+"-"+d.name+"-"+d.address+"]\r\n"); +// println "<"+ret.del_ids.size()+">鍒犻櫎 ["+d.region+"-"+d.name+"-"+d.address+"]" +// writeTxt("<"+ret.del_ids.size()+">鍒犻櫎 ["+d.region+"-"+d.name+"-"+d.address+"]\r\n"); // } // } // } @@ -292,13 +292,13 @@ class RepeatDistrictFinder { if(obj1.name.toString()==obj2.name.toString()){ if(obj1.region.toString()==obj2.region.toString()){ - println "区域 +名称==相同 "+obj1.region.toString() +" "+obj2.name.toString()+" ["+obj1.address+"]["+obj2.address+"]" + println "鍖哄煙 +鍚嶇О==鐩稿悓 "+obj1.region.toString() +" "+obj2.name.toString()+" ["+obj1.address+"]["+obj2.address+"]" return true; }else{ def flag = latLngCompare(obj1, obj2); if(flag){ - println "区域 +名称==不相同 相距5000内 "+obj1.region.toString() +" "+obj2.name.toString()+" ["+obj1.address+"]["+obj2.address+"]" + println "鍖哄煙 +鍚嶇О==涓嶇浉鍚� 鐩歌窛5000鍐� "+obj1.region.toString() +" "+obj2.name.toString()+" ["+obj1.address+"]["+obj2.address+"]" return true; }else{ def address1 = addressStandard(obj1.address, regions) @@ -314,7 +314,7 @@ class RepeatDistrictFinder { if(address1 == address2){ return true; } - if(address1.indexOf("弄")!=-1&&(address1.indexOf(address2)!=-1||address2.indexOf(address1)!=-1)){ + if(address1.indexOf("寮�")!=-1&&(address1.indexOf(address2)!=-1||address2.indexOf(address1)!=-1)){ return true; } } @@ -327,38 +327,38 @@ class RepeatDistrictFinder { } def findSimilarDistrictByAddress(def city, def obj1, def obj2, def regions){ - def name1 = obj1.name.toString().replaceAll(city+"市","").replaceAll(city,"").replace("(", "").replace(")", ""); - def name2 = obj2.name.toString().replaceAll(city+"市","").replaceAll(city,"").replace("(", "").replace(")", ""); + def name1 = obj1.name.toString().replaceAll(city+"甯�","").replaceAll(city,"").replace("锛�", "").replace("锛�", ""); + def name2 = obj2.name.toString().replaceAll(city+"甯�","").replaceAll(city,"").replace("锛�", "").replace("锛�", ""); def address1 = addressStandard(obj1.address.toString(), regions); def address2 = addressStandard(obj2.address.toString(), regions); def result = [:]; result.repeatFlag = false; - if(name1.indexOf("别墅")!=-1 && name2.indexOf("别墅")!=-1){ + if(name1.indexOf("鍒")!=-1 && name2.indexOf("鍒")!=-1){ result.repeatFlag = true; return result; - }else if(name1.indexOf("别墅")!=-1 || name2.indexOf("别墅")!=-1){ + }else if(name1.indexOf("鍒")!=-1 || name2.indexOf("鍒")!=-1){ return result; - }else if(name1.indexOf("期")!=-1 && name2.indexOf("期")!=-1 ){ - name1 = name1.substring(0,name1.indexOf("期")+1); - name2 = name2.substring(0,name2.indexOf("期")+1); + }else if(name1.indexOf("鏈�")!=-1 && name2.indexOf("鏈�")!=-1 ){ + name1 = name1.substring(0,name1.indexOf("鏈�")+1); + name2 = name2.substring(0,name2.indexOf("鏈�")+1); if(name1 == name2){ result.repeatFlag = true; return result; } result.repeatFlag = false; return result; - }else if(name1.indexOf("期")!=-1 || name2.indexOf("期")!=-1 ){ + }else if(name1.indexOf("鏈�")!=-1 || name2.indexOf("鏈�")!=-1 ){ result.repeatFlag = false; return result; }else{ double score1 = CosineSimilarAlgorithm.getSimilarity(address1, address2); double score2 = CosineSimilarAlgorithm.getSimilarity(name1,name2); - println "地址相似度score="+score1 +" 名称相似度score="+score2; -// writeTxt(" 地址相似度score="+score1 +" 名称相似度score="+score2+"\r\n"); + println "鍦板潃鐩镐技搴core="+score1 +" 鍚嶇О鐩镐技搴core="+score2; +// writeTxt(" 鍦板潃鐩镐技搴core="+score1 +" 鍚嶇О鐩镐技搴core="+score2+"\r\n"); result.address_score = score1; result.name_score =score2; - if(score1>=0.8 && score2>=0.6 && !address1.endsWith("路")){ + if(score1>=0.8 && score2>=0.6 && !address1.endsWith("璺�")){ result.repeatFlag = true; return result; } @@ -385,17 +385,17 @@ class RepeatDistrictFinder { def addressStandard(def address, def regions){ for(def region : regions){ if(address.indexOf(region)!=-1){ - address = address.replaceAll(region+"区","").replaceAll(region,""); + address = address.replaceAll(region+"鍖�","").replaceAll(region,""); break; } } - if(address.indexOf("公路")!=-1){ - address = address.replaceAll("公路","路"); + if(address.indexOf("鍏矾")!=-1){ + address = address.replaceAll("鍏矾","璺�"); } - if(!address.startsWith("镇") && address.indexOf("镇")!=-1&&!address.endsWith("镇")){ - address = address.substring(address.indexOf("镇")+1, address.size()); + if(!address.startsWith("闀�") && address.indexOf("闀�")!=-1&&!address.endsWith("闀�")){ + address = address.substring(address.indexOf("闀�")+1, address.size()); } return address; @@ -405,8 +405,8 @@ class RepeatDistrictFinder { def repeatFlag = false; if(obj1.lng && obj2.lng){ int gap = mapabc.caculateDistance(obj1.lng/10000000000, obj1.lat/10000000000, obj2.lng/10000000000, obj2.lat/10000000000) - println "有经纬度 distance:"+gap - writeTxt("有经纬度 distance:"+gap+"\r\n"); + println "鏈夌粡绾害 distance:"+gap + writeTxt("鏈夌粡绾害 distance:"+gap+"\r\n"); if(gap <= 500){ repeatFlag = true; } @@ -428,8 +428,8 @@ class RepeatDistrictFinder { } if(coord1 && coord2){ int gap = mapabc.caculateDistance(coord1[0], coord1[1], coord2[0], coord2[1]) - println "无经纬度 distance:"+gap - writeTxt("无经纬度 distance:"+gap+"\r\n"); + println "鏃犵粡绾害 distance:"+gap + writeTxt("鏃犵粡绾害 distance:"+gap+"\r\n"); if(gap <= 500){ repeatFlag = true; } @@ -447,16 +447,16 @@ class RepeatDistrictFinder { def maxDoc=null; for(def d: list){ int count=countNotEmptyField(d); - if(d.name.indexOf("动迁房")!=-1){ + if(d.name.indexOf("鍔ㄨ縼鎴�")!=-1){ count = 1; } if(d.name.indexOf("(")!=-1){ count = count -4; } - if(d.name.indexOf("路")!=-1){ + if(d.name.indexOf("璺�")!=-1){ count = count -2; } - if(d.name.indexOf("物业")!=-1){ + if(d.name.indexOf("鐗╀笟")!=-1){ if(count>0){ count = 0; } @@ -509,7 +509,7 @@ class RepeatDistrictFinder { def writeTxt(text){ - new File("e://北京小区去重.txt").append(text); + new File("e://鍖椾含灏忓尯鍘婚噸.txt").append(text); } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/AddSomeDateToDB.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/AddSomeDateToDB.groovy index ba2b8571b..4621b949e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/AddSomeDateToDB.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/AddSomeDateToDB.groovy @@ -34,13 +34,13 @@ import org.apache.commons.lang.math.RandomUtils class AddSomeDateToDB { public static final KEYWORDS = [ - "地铁","公交","码头","机场","火车站","医院","写字楼","停车场","网吧","学校","银行","公园/绿地","KTV","健身中心","大型超市","咖啡厅","剧场/影院", - "商场","酒店","整容整形","洗浴中心","便利店","餐饮","游乐场","旅游景点","体育场馆","图书馆","美容院","私立学校" + "鍦伴搧","鍏氦","鐮佸ご","鏈哄満","鐏溅绔�","鍖婚櫌","鍐欏瓧妤�","鍋滆溅鍦�","缃戝惂","瀛︽牎","閾惰","鍏洯/缁垮湴","KTV","鍋ヨ韩涓績","澶у瀷瓒呭競","鍜栧暋鍘�","鍓у満/褰遍櫌", + "鍟嗗満","閰掑簵","鏁村鏁村舰","娲楁荡涓績","渚垮埄搴�","椁愰ギ","娓镐箰鍦�","鏃呮父鏅偣","浣撹偛鍦洪","鍥句功棣�","缇庡闄�","绉佺珛瀛︽牎" ] - //数据表 + //鏁版嵁琛� public static final DBCollection VILLA_FIELD = MongoUtils.getCollectionByName("fangjia_base", "evaluation_field", "192.168.0.136", 27017) - //记录运行日志表 + //璁板綍杩愯鏃ュ織琛� public static final DBCollection VILLA_FACTOR = MongoUtils.getCollectionByName("fangjia_base", "evaluation_factor", "192.168.0.136", 27017) public static final DBCollection BOUNDS_COLL = MongoUtils.getCollectionByName("fangjia_base", "city_bounds_box", "192.168.0.136", 27017) @@ -49,26 +49,26 @@ class AddSomeDateToDB { public static final DBCollection STATISTICAL = MongoUtils.getCollectionByName("fangjia_base", "api_invoke_statistical", "192.168.0.136", 27017) static main(args) { - String[] city = ["全国","北京","上海"] - String[] estate_types = ["别墅"] - String[] field = ["建筑类型","房子朝向","面积类型","装修状况","小区位置","景观情况","采光通风","噪音情况","边套设施", - "厌恶设施","阳台露台","花园面积","车库情况","泳池情况","景观鱼塘"] + String[] city = ["鍏ㄥ浗","鍖椾含","涓婃捣"] + String[] estate_types = ["鍒"] + String[] field = ["寤虹瓚绫诲瀷","鎴垮瓙鏈濆悜","闈㈢Н绫诲瀷","瑁呬慨鐘跺喌","灏忓尯浣嶇疆","鏅鎯呭喌","閲囧厜閫氶","鍣煶鎯呭喌","杈瑰璁炬柦", + "鍘屾伓璁炬柦","闃冲彴闇插彴","鑺卞洯闈㈢Н","杞﹀簱鎯呭喌","娉虫睜鎯呭喌","鏅楸煎"] Map valueMap = new HashMap(){{ - put("建筑类型", "独栋,双拼,联排,叠加"); - put("房子朝向", "东,南,西,北,东南,东北,西南,西北"); - put("面积类型","小型,中型,大型,超大型") - put("装修状况", "毛坯,简单装修,精装修,豪华装修"); - put("小区位置", "中心,一般,外围"); - put("景观情况", "景观别墅,一般,差"); - put("采光通风", "南北通风,一般,差"); - put("噪音情况", "无噪音,噪音较小,噪音大"); - put("边套设施", "优秀,良好,中等,差"); - put("厌恶设施", "很近,较近,无"); - put("阳台露台", "较大,一般,较小,无"); - put("花园面积", "较大,一般,较小,无"); - put("车库情况", "有,无"); - put("泳池情况","有,无"); - put("景观鱼塘","有,无") + put("寤虹瓚绫诲瀷", "鐙爧,鍙屾嫾,鑱旀帓,鍙犲姞"); + put("鎴垮瓙鏈濆悜", "涓�,鍗�,瑗�,鍖�,涓滃崡,涓滃寳,瑗垮崡,瑗垮寳"); + put("闈㈢Н绫诲瀷","灏忓瀷,涓瀷,澶у瀷,瓒呭ぇ鍨�") + put("瑁呬慨鐘跺喌", "姣涘澂,绠�鍗曡淇�,绮捐淇�,璞崕瑁呬慨"); + put("灏忓尯浣嶇疆", "涓績,涓�鑸�,澶栧洿"); + put("鏅鎯呭喌", "鏅鍒,涓�鑸�,宸�"); + put("閲囧厜閫氶", "鍗楀寳閫氶,涓�鑸�,宸�"); + put("鍣煶鎯呭喌", "鏃犲櫔闊�,鍣煶杈冨皬,鍣煶澶�"); + put("杈瑰璁炬柦", "浼樼,鑹ソ,涓瓑,宸�"); + put("鍘屾伓璁炬柦", "寰堣繎,杈冭繎,鏃�"); + put("闃冲彴闇插彴", "杈冨ぇ,涓�鑸�,杈冨皬,鏃�"); + put("鑺卞洯闈㈢Н", "杈冨ぇ,涓�鑸�,杈冨皬,鏃�"); + put("杞﹀簱鎯呭喌", "鏈�,鏃�"); + put("娉虫睜鎯呭喌","鏈�,鏃�"); + put("鏅楸煎","鏈�,鏃�") }}; //VILLA_FACTOR.insert(fieldTable) @@ -95,7 +95,7 @@ class AddSomeDateToDB { fieldTable.put("condition",field[i]) fieldTable.put("estate_type",estate_types[m]) fieldTable.put("seq",i+1) - fieldTable.put("show_type", "下拉框") + fieldTable.put("show_type", "涓嬫媺妗�") list.add(fieldTable) } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/AddressAnalyPlatBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/AddressAnalyPlatBatch.groovy index c21667623..c378a74d0 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/AddressAnalyPlatBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/AddressAnalyPlatBatch.groovy @@ -21,7 +21,7 @@ import com.mongodb.DBCursor import com.mongodb.DBObject /** - * 定时更新小区地址数据 + * 瀹氭椂鏇存柊灏忓尯鍦板潃鏁版嵁 * @author hubingliang * */ @@ -42,7 +42,7 @@ class AddressAnalyPlatBatch extends BaseBatch{ static main(args) { def s = System.currentTimeMillis() runBatch(new AddressAnalyPlatBatch(), args) - println("运行时间:${(int) ((System.currentTimeMillis() - s)) / (1000 * 60)}分钟") + println("杩愯鏃堕棿:${(int) ((System.currentTimeMillis() - s)) / (1000 * 60)}鍒嗛挓") } @Override @@ -56,7 +56,7 @@ class AddressAnalyPlatBatch extends BaseBatch{ } public static void pdsData(String city){ - if(city.equals("全国")){ + if(city.equals("鍏ㄥ浗")){ return ; } List> allList = new ArrayList>(); @@ -245,7 +245,7 @@ class AddressAnalyPlatBatch extends BaseBatch{ Test.save(disSta); } - //获取全国城市 + //鑾峰彇鍏ㄥ浗鍩庡競 public static List getCitys(){ List citys = new ArrayList(); DBCursor dbs = SERVER_AREA.find(); @@ -256,7 +256,7 @@ class AddressAnalyPlatBatch extends BaseBatch{ } return citys } - //获取全国时候的统计信息 + //鑾峰彇鍏ㄥ浗鏃跺�欑殑缁熻淇℃伅 public static void allCityData(){ DBObject query = new BasicDBObject(); query.append("date",intWeekend(1)); @@ -264,7 +264,7 @@ class AddressAnalyPlatBatch extends BaseBatch{ List list = new ArrayList(); while(dbs.hasNext()){ DBObject db = dbs.next(); - if(db.get("city")!=null&&db.get("city").equals("全国")){ + if(db.get("city")!=null&&db.get("city").equals("鍏ㄥ浗")){ continue; } list.add(db); @@ -338,7 +338,7 @@ class AddressAnalyPlatBatch extends BaseBatch{ houseCover = AddressAnalyMathUtil.cover(houseCount, districtCount); buildingCover = AddressAnalyMathUtil.cover(buildingCount, districtCount); - int lastDistrictCount = getNewDistrictcount("全国"); + int lastDistrictCount = getNewDistrictcount("鍏ㄥ浗"); if(lastDistrictCount!=0){ newDistrictCover = AddressAnalyMathUtil.cover(newDistrictCount, lastDistrictCount); @@ -358,7 +358,7 @@ class AddressAnalyPlatBatch extends BaseBatch{ DBObject disSta = new BasicDBObject(); - disSta.put("city","全国"); + disSta.put("city","鍏ㄥ浗"); disSta.put("district_count",districtCount); disSta.put("location_count",locationCount); disSta.put("location_cover",locationCover); @@ -394,7 +394,7 @@ class AddressAnalyPlatBatch extends BaseBatch{ disSta.put("problem_district_cover",problemDistrictCover); disSta.put("date", intWeekend(1)); DBObject q = new BasicDBObject(); - q.put("city","全国"); + q.put("city","鍏ㄥ浗"); q.put("date",intWeekend(1)); Test.save(disSta); @@ -402,7 +402,7 @@ class AddressAnalyPlatBatch extends BaseBatch{ } - //获取负责人 + //鑾峰彇璐熻矗浜� public static String getPersonName(String city){ DBCursor dbs = USER.find(); while(dbs.hasNext()){ @@ -412,15 +412,15 @@ class AddressAnalyPlatBatch extends BaseBatch{ return db.get("username") } } - return "无负责人"; + return "鏃犺礋璐d汉"; } - //城市得分 + //鍩庡競寰楀垎 public static double getCityScore(double locationCover,double samAvgCover,double avgCover,double addressCount,double sellCover,double buildingCover,double houseCover,double buildTimeCover,double householdCover){ double score = AddressAnalyMathUtil.getCityScore(locationCover, samAvgCover, avgCover, addressCount, sellCover, buildingCover,houseCover,buildTimeCover,householdCover); return score; } - //负责人得分 + //璐熻矗浜哄緱鍒� public static double getPersonScore(double cityScore,int newDistrictCount,int updateDistrictCount,int newHouseCount,int newSellCount,int problemDistrictCount,int districtCount){ Double x = 0.3; Double y = 0.1; @@ -438,7 +438,7 @@ class AddressAnalyPlatBatch extends BaseBatch{ double score = AddressAnalyMathUtil.getPersonScore(cityScore, (double)newDistrictCount, (double)updateDistrictCount,(double)newHouseCount,(double)newSellCount, (double)problemDistrictCount, x, y, z); return score; } - //获取上周有成交的小区数量 + //鑾峰彇涓婂懆鏈夋垚浜ょ殑灏忓尯鏁伴噺 public static int getNewSellCount(String city){ int intWeekend = intWeekend(2); BasicDBObject query = new BasicDBObject() @@ -451,7 +451,7 @@ class AddressAnalyPlatBatch extends BaseBatch{ } return 0; } - //获取上周房号的小区数量 + //鑾峰彇涓婂懆鎴垮彿鐨勫皬鍖烘暟閲� public static int getNewHouseCount(String city){ int intWeekend = intWeekend(2); BasicDBObject query = new BasicDBObject() @@ -465,7 +465,7 @@ class AddressAnalyPlatBatch extends BaseBatch{ return 0; } - //计算上周小区数量 + //璁$畻涓婂懆灏忓尯鏁伴噺 public static int getNewDistrictcount(String city){ int intWeekend = intWeekend(2); BasicDBObject query = new BasicDBObject() @@ -478,7 +478,7 @@ class AddressAnalyPlatBatch extends BaseBatch{ } return 0; } - //判断是不是上周新更新的小区 + //鍒ゆ柇鏄笉鏄笂鍛ㄦ柊鏇存柊鐨勫皬鍖� public static int isUpdateDistrictCount(DBObject obj){ Date thisMonday = mondayTime(0); Date lastMonday = mondayTime(1); @@ -490,7 +490,7 @@ class AddressAnalyPlatBatch extends BaseBatch{ } return 0; } - //计算上周有问题的小区 + //璁$畻涓婂懆鏈夐棶棰樼殑灏忓尯 public static int hasProblemDistrictCount(String city){ Date thisMonday = mondayTime(0); Date lastMonday = mondayTime(1); @@ -501,7 +501,7 @@ class AddressAnalyPlatBatch extends BaseBatch{ int con = (int)FILE_DETAIL_DATA.count(query); return con; } - //判断是不是有竣工时间 + //鍒ゆ柇鏄笉鏄湁绔e伐鏃堕棿 public static int hasBuildTime(DBObject obj){ if(StringUtils.isNotBlank(obj.get("finish_building_date"))){ return 1; @@ -509,7 +509,7 @@ class AddressAnalyPlatBatch extends BaseBatch{ return 0; } - //判断是不是有户数的小区 + //鍒ゆ柇鏄笉鏄湁鎴锋暟鐨勫皬鍖� public static int hasHousehold(DBObject obj){ if(obj.get("household_count")!=null&&obj.get("household_count")!=0){ return 1; @@ -517,14 +517,14 @@ class AddressAnalyPlatBatch extends BaseBatch{ return 0; } - //判断是不是有经纬度 + //鍒ゆ柇鏄笉鏄湁缁忕含搴� public static int hasLocation(DBObject obj){ if(obj.get("lat")!=null&&obj.get("lng")!=null){ return 1; } return 0; } - //样本计算均价的数量 + //鏍锋湰璁$畻鍧囦环鐨勬暟閲� public static int hasSamAvgPriceCount(String city){ Date weekend = lastWeekend(); BasicDBObject query = new BasicDBObject() @@ -535,7 +535,7 @@ class AddressAnalyPlatBatch extends BaseBatch{ int count = (int)findCount; return count; } - //是否有均价 + //鏄惁鏈夊潎浠� public static int hasAvgPriceCount(String city){ Date weekend = lastWeekend(); BasicDBObject query = new BasicDBObject() @@ -545,7 +545,7 @@ class AddressAnalyPlatBatch extends BaseBatch{ int count = (int)findCount; return count; } - //是不是精确地址 + //鏄笉鏄簿纭湴鍧� public static int hasPreciseAddress(DBObject obj){ String address = obj.get("address"); if(DataUtil.isPreciseAddress(address)){ @@ -553,7 +553,7 @@ class AddressAnalyPlatBatch extends BaseBatch{ } return 0; } - //判断是不是分期分区 + //鍒ゆ柇鏄笉鏄垎鏈熷垎鍖� public static int stageMount(List dbs, DBObject obj){ String stage = obj.get("master_district_name"); if(stage==null||!stage.equals("master")){ @@ -581,7 +581,7 @@ class AddressAnalyPlatBatch extends BaseBatch{ else 0; } - //判断是不是有房号 + //鍒ゆ柇鏄笉鏄湁鎴垮彿 public static int haveHouse(DBObject obj){ DBObject query = new BasicDBObject(); String city = obj.get("city"); @@ -593,20 +593,20 @@ class AddressAnalyPlatBatch extends BaseBatch{ HOUSE_LOUDONG.find() } - //判断是不是别墅 + //鍒ゆ柇鏄笉鏄埆澧� public static int isVilla(DBObject obj){ - if(obj.get("estate_type2")!=null&&obj.get("estate_type2").equals("别墅")){ + if(obj.get("estate_type2")!=null&&obj.get("estate_type2").equals("鍒")){ return 1; } return 0; } - //获取上个星期天的日期 + //鑾峰彇涓婁釜鏄熸湡澶╃殑鏃ユ湡 public static Date lastWeekend(){ Calendar date=Calendar.getInstance(Locale.CHINA); - date.setFirstDayOfWeek(Calendar.MONDAY);//将每周第一天设为星期一,默认是星期天 - date.add(Calendar.WEEK_OF_MONTH,-1);//周数减一,即上周 - date.set(Calendar.DAY_OF_WEEK, Calendar.SUNDAY);//日子设为星期天 + date.setFirstDayOfWeek(Calendar.MONDAY);//灏嗘瘡鍛ㄧ涓�澶╄涓烘槦鏈熶竴锛岄粯璁ゆ槸鏄熸湡澶� + date.add(Calendar.WEEK_OF_MONTH,-1);//鍛ㄦ暟鍑忎竴锛屽嵆涓婂懆 + date.set(Calendar.DAY_OF_WEEK, Calendar.SUNDAY);//鏃ュ瓙璁句负鏄熸湡澶� int day = date.get(Calendar.DAY_OF_MONTH); int mon = date.get(Calendar.MONTH)+1; int year = date.get(Calendar.YEAR); @@ -615,7 +615,7 @@ class AddressAnalyPlatBatch extends BaseBatch{ Date weekend = dateFormat1.parse(dateStr); return weekend; } - //获取上周日的int形式 + //鑾峰彇涓婂懆鏃ョ殑int褰㈠紡 public static int intWeekend(int con){ Calendar cal =Calendar.getInstance(); cal.set(Calendar.DAY_OF_WEEK, Calendar.SUNDAY); @@ -626,7 +626,7 @@ class AddressAnalyPlatBatch extends BaseBatch{ } return dateInt; } - //获取本周或者上周一凌晨 + //鑾峰彇鏈懆鎴栬�呬笂鍛ㄤ竴鍑屾櫒 public static Date mondayTime(int con){ Calendar cal =Calendar.getInstance(); cal.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY); @@ -642,7 +642,7 @@ class AddressAnalyPlatBatch extends BaseBatch{ return date } - //查询小区是不是有楼栋 + //鏌ヨ灏忓尯鏄笉鏄湁妤兼爧 public static int hasLouDong(DBObject obj){ DBObject query = new BasicDBObject(); query.put("city",obj.get("city")); @@ -654,7 +654,7 @@ class AddressAnalyPlatBatch extends BaseBatch{ } return 0; } - //查询小区是不是有房号 + //鏌ヨ灏忓尯鏄笉鏄湁鎴垮彿 public static int hasHouseLouDong(DBObject obj){ DBObject query = new BasicDBObject(); query.put("city",obj.get("city")); @@ -666,7 +666,7 @@ class AddressAnalyPlatBatch extends BaseBatch{ } return 0; } - //成交量和成交量 + //鎴愪氦閲忓拰鎴愪氦閲� public static DBObject sellInfo(String city){ DBObject db = STATISTIC_REPORT.findOne(); if(db!=null){ @@ -716,7 +716,7 @@ class AddressAnalyPlatBatch extends BaseBatch{ return db; } - //判断小区是否有成交 + //鍒ゆ柇灏忓尯鏄惁鏈夋垚浜� public static int haveSell(DBObject obj,String city,Date monday,Date halfYear){ String region = obj.get("region"); String name = obj.get("name"); @@ -729,7 +729,7 @@ class AddressAnalyPlatBatch extends BaseBatch{ } return 0; } - //直接获取房号和楼栋库相关对象 + //鐩存帴鑾峰彇鎴垮彿鍜屾ゼ鏍嬪簱鐩稿叧瀵硅薄 public static DBObject houseLouDongObj(String city){ DBObject query = new BasicDBObject(); query.put("city",city); @@ -746,7 +746,7 @@ class AddressAnalyPlatBatch extends BaseBatch{ } return null; } - //查询城市等级 + //鏌ヨ鍩庡競绛夌骇 public static Integer findCityLevel(String city){ List list = new ArrayList(); DBObject query = new BasicDBObject(); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/AddressAnalyPlatSellCountBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/AddressAnalyPlatSellCountBatch.groovy index 44c98bf64..47d9803b9 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/AddressAnalyPlatSellCountBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/AddressAnalyPlatSellCountBatch.groovy @@ -16,7 +16,7 @@ import com.mongodb.DBObject import com.mongodb.Bytes /** - * 定时更新小区地址数据 + * 瀹氭椂鏇存柊灏忓尯鍦板潃鏁版嵁 * @author hubingliang * */ @@ -26,7 +26,7 @@ class AddressAnalyPlatSellCountBatch{ public static final DBCollection SERVER_AREA = MongoUtils.getCollectionByName("fangjia", "server_area", "mongo.db.fangjia.com", 27017) static main(args) { - citySell("上海"); + citySell("涓婃捣"); } @@ -66,7 +66,7 @@ class AddressAnalyPlatSellCountBatch{ println hasCount; } - //判断小区是否有成交 + //鍒ゆ柇灏忓尯鏄惁鏈夋垚浜� public static int haveSell(DBObject obj,String city,Date monday,Date halfYear){ String region = obj.get("region"); String name = obj.get("name"); @@ -80,7 +80,7 @@ class AddressAnalyPlatSellCountBatch{ return 0; } - //获取当前周一 + //鑾峰彇褰撳墠鍛ㄤ竴 public static Date mondayTime(int con){ Calendar cal =Calendar.getInstance(); cal.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY); @@ -96,7 +96,7 @@ class AddressAnalyPlatSellCountBatch{ return date } - //获取全国城市 + //鑾峰彇鍏ㄥ浗鍩庡競 public static List getCitys(){ List citys = new ArrayList(); DBCursor dbs = SERVER_AREA.find(); @@ -109,7 +109,7 @@ class AddressAnalyPlatSellCountBatch{ } /** - * 获取城市的小区 + * 鑾峰彇鍩庡競鐨勫皬鍖� * @param city * @return */ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/AddressFindLouHouseInfo.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/AddressFindLouHouseInfo.groovy index 5b6fbdcd4..d1b115333 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/AddressFindLouHouseInfo.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/AddressFindLouHouseInfo.groovy @@ -20,49 +20,49 @@ import com.mongodb.BasicDBObject import com.mongodb.DBCollection import com.mongodb.DBObject /** - * 定时更新小区地址数据 + * 瀹氭椂鏇存柊灏忓尯鍦板潃鏁版嵁 * @author hubingliang * */ class AddressFindLouHouseInfo{ public static final DBCollection SERVER_AREA = MongoUtils.getCollectionByName("fangjia", "server_area", "mongo.db.fangjia.com", 27017) - private static Pattern pattern1 = Pattern.compile('.+弄(?:\\w+支弄)?(?:\\w+区)?([-\\w]+)号') - private static Pattern pattern2 = Pattern.compile('(?<=村|花园|别墅|公寓|苑|坊|里)(?[甲乙丙丁戊戌\\w]+)[号幢栋]') - private static Pattern pattern3 = Pattern.compile('(?[鐢蹭箼涓欎竵鎴婃垖\\w]+)[鍙峰耿鏍媇') + private static Pattern pattern3 = Pattern.compile('(? strs = splitStr("2-13单元", "-") + //List strs = splitStr("2-13鍗曞厓", "-") String str = getFloorInfo("22222"); - //String str = getLouDongHouseInfo("芙蓉路广告艺术长廊32栋801、802号"); + //String str = getLouDongHouseInfo("鑺欒搲璺箍鍛婅壓鏈暱寤�32鏍�801銆�802鍙�"); println str - String louNumStr = formatByPattern("金山街道浦上大道410号天鹅湾wz楼202单元", "\\w+楼"); + String louNumStr = formatByPattern("閲戝北琛楅亾娴︿笂澶ч亾410鍙峰ぉ楣呮咕wz妤�202鍗曞厓", "\\w+妤�"); println louNumStr*/ - //println formatByPattern("枫津新村4栋501室", "\\d+栋\\w+室"); - //println getUnit("3单元4楼17号", "\\w+单元",["单元"]) - println getZhengZhou("河南省郑州市中牟县前程路和谐家园民用15-1-2708","郑州") + //println formatByPattern("鏋触鏂版潙4鏍�501瀹�", "\\d+鏍媆\w+瀹�"); + //println getUnit("3鍗曞厓4妤�17鍙�", "\\w+鍗曞厓",["鍗曞厓"]) + println getZhengZhou("娌冲崡鐪侀儜宸炲競涓墴鍘垮墠绋嬭矾鍜岃皭瀹跺洯姘戠敤15-1-2708","閮戝窞") addressAnaly() } public static void addressAnaly(){ - ExcelUtils.modify("D:\\hbl\\测试数据_重跑数据.xlsx", {List item-> + ExcelUtils.modify("D:\\hbl\\娴嬭瘯鏁版嵁_閲嶈窇鏁版嵁.xlsx", {List item-> String city= item["A"]; if(StringUtils.isNotBlank(city)){ - city =city.replace("市", ""); + city =city.replace("甯�", ""); } String address = item["C"] String info = item["AJ"] String luhao = item["H"] if(StringUtils.isBlank(info)){ def map = new HashMap(); - if(city.equals("郑州")){ + if(city.equals("閮戝窞")){ map = getZhengZhou(address,city) - }else if(city.equals("成都")){ + }else if(city.equals("鎴愰兘")){ map = getChengDu(address,city) - }else if(city.equals("厦门")){ + }else if(city.equals("鍘﹂棬")){ map = getXiaMen(address,city) - }else if(city.equals("苏州")){ + }else if(city.equals("鑻忓窞")){ map = getShuZhou(address,city) - }else if(city.equals("宁波")){ + }else if(city.equals("瀹佹尝")){ map = getNingBo(address,city) } info = map.get("res") @@ -78,7 +78,7 @@ class AddressFindLouHouseInfo{ }); } - //判断提取楼栋号 + //鍒ゆ柇鎻愬彇妤兼爧鍙� public static Map getNingBo(String address,String city){ def map = new HashMap(); String res = null; @@ -86,32 +86,32 @@ class AddressFindLouHouseInfo{ String unit = null; String fang = null; if(address){ - if("宁波".equals(city)){ - res = formatByPattern(address,"\\w+(栋|幢|号楼)\\w+(单元)\\w") + if("瀹佹尝".equals(city)){ + res = formatByPattern(address,"\\w+(鏍媩骞鍙锋ゼ)\\w+(鍗曞厓)\\w") if(StringUtils.isNotBlank(res)){ - def louMap = getLouDong(res, "\\w+(栋|幢|号楼)") - def unitMap = getUnit(louMap.get("res"), "\\w单元", null) + def louMap = getLouDong(res, "\\w+(鏍媩骞鍙锋ゼ)") + def unitMap = getUnit(louMap.get("res"), "\\w鍗曞厓", null) fang = unitMap.get("res"); if(StringUtils.isNotBlank(fang)){ - fang = replaceList(fang, ["室"]); + fang = replaceList(fang, ["瀹�"]); } map.put("lou", louMap.get("lou")) map.put("unit", unitMap.get("unit")) map.put("fang", fang) } if(StringUtils.isBlank(res)){ - res=formatByPattern(address, "\\w+(幢|栋|号楼)\\w+") + res=formatByPattern(address, "\\w+(骞鏍媩鍙锋ゼ)\\w+") if(StringUtils.isNotBlank(res)){ - def louMap = getLouDong(res,"\\w+(幢|栋|号楼)"); + def louMap = getLouDong(res,"\\w+(骞鏍媩鍙锋ゼ)"); fang = louMap.get("res"); map.put("lou", louMap.get("lou")) map.put("fang", fang) } } if(StringUtils.isBlank(res)){ - res=formatByPattern(address, "\\w+栋") + res=formatByPattern(address, "\\w+鏍�") if(StringUtils.isNotBlank(res)){ - def louMap = getLouDong(res,"\\w+栋"); + def louMap = getLouDong(res,"\\w+鏍�"); map.put("lou", louMap.get("lou")) } } @@ -129,7 +129,7 @@ class AddressFindLouHouseInfo{ return map; } - //判断提取楼栋号 + //鍒ゆ柇鎻愬彇妤兼爧鍙� public static Map getShuZhou(String address,String city){ def map = new HashMap(); String res = null; @@ -137,41 +137,41 @@ class AddressFindLouHouseInfo{ String unit = null; String fang = null; if(address){ - if("苏州".equals(city)){ - res = formatByPattern(address,"\\w+(栋|幢)\\w+") + if("鑻忓窞".equals(city)){ + res = formatByPattern(address,"\\w+(鏍媩骞�)\\w+") if(StringUtils.isNotBlank(res)){ - def unitMap = getUnit(res, "\\w+(栋|幢)", ["栋","幢"]) + def unitMap = getUnit(res, "\\w+(鏍媩骞�)", ["鏍�","骞�"]) fang = unitMap.get("res"); if(StringUtils.isNotBlank(fang)){ - fang = replaceList(fang, ["室"]); + fang = replaceList(fang, ["瀹�"]); } map.put("lou", unitMap.get("unit")) map.put("fang", fang) } if(StringUtils.isBlank(res)){ - res=formatByPattern(address, "\\d+幢一单元\\d+") + res=formatByPattern(address, "\\d+骞竴鍗曞厓\\d+") if(StringUtils.isNotBlank(res)){ - def louMap = getLouDong(res,"\\d+幢"); + def louMap = getLouDong(res,"\\d+骞�"); fang = louMap.get("res"); if(StringUtils.isNotBlank(fang)){ - fang = replaceList(fang, ["一单元"]) + fang = replaceList(fang, ["涓�鍗曞厓"]) } map.put("lou", louMap.get("lou")) - map.put("unit", "一") + map.put("unit", "涓�") map.put("fang", fang) } } if(StringUtils.isBlank(res)){ - res=formatByPattern(address, "\\w+(室|号)") + res=formatByPattern(address, "\\w+(瀹鍙�)") if(StringUtils.isNotBlank(res)){ - fang = replaceList(res, ["室","号"]) + fang = replaceList(res, ["瀹�","鍙�"]) map.put("fang", fang) } } if(StringUtils.isBlank(res)){ - res=formatByPattern(address, "\\w+(幢别墅)") + res=formatByPattern(address, "\\w+(骞㈠埆澧�)") if(StringUtils.isNotBlank(res)){ - lou = replaceList(res, ["幢别墅"]) + lou = replaceList(res, ["骞㈠埆澧�"]) map.put("lou", lou) } } @@ -189,7 +189,7 @@ class AddressFindLouHouseInfo{ return map; } - //判断提取楼栋号 + //鍒ゆ柇鎻愬彇妤兼爧鍙� public static Map getXiaMen(String address,String city){ def map = new HashMap(); String res = null; @@ -197,10 +197,10 @@ class AddressFindLouHouseInfo{ String unit = null; String fang = null; if(address){ - if("厦门".equals(city)){ - res = formatByPattern(address, "\\d+号\\w+") + if("鍘﹂棬".equals(city)){ + res = formatByPattern(address, "\\d+鍙穃\w+") if(StringUtils.isNotBlank(res)){ - String luhao = formatByPattern(res, "\\d+号"); + String luhao = formatByPattern(res, "\\d+鍙�"); fang = res.replace(luhao, "") map.put("luhao", luhao) map.put("fang", fang) @@ -211,7 +211,7 @@ class AddressFindLouHouseInfo{ return map; } - //判断提取楼栋号 + //鍒ゆ柇鎻愬彇妤兼爧鍙� public static Map getChengDu(String address,String city){ def map = new HashMap(); String res = null; @@ -219,25 +219,25 @@ class AddressFindLouHouseInfo{ String unit = null; String fang = null; if(address){ - if("成都".equals(city)){ - res = formatByPattern(address, "(\\w|东|南|西|北)+(楼|号楼|#楼|栋楼|栋|号楼楼)(.*)单元(.*)层(.*)(室)") + if("鎴愰兘".equals(city)){ + res = formatByPattern(address, "(\\w|涓渱鍗梶瑗縷鍖�)+(妤紎鍙锋ゼ|#妤紎鏍嬫ゼ|鏍媩鍙锋ゼ妤�)(.*)鍗曞厓(.*)灞�(.*)(瀹�)") if(StringUtils.isNotBlank(res)){ - def louMap = getLouDong(res,"(\\w|东|南|西|北)+(楼|号楼|#楼|栋楼|栋|号楼楼)"); - def unitMap = getUnit(louMap.get("res"),"(.*)单元",null); - def fangMap = getFang(unitMap.get("res"),"层(.*)(室)"); + def louMap = getLouDong(res,"(\\w|涓渱鍗梶瑗縷鍖�)+(妤紎鍙锋ゼ|#妤紎鏍嬫ゼ|鏍媩鍙锋ゼ妤�)"); + def unitMap = getUnit(louMap.get("res"),"(.*)鍗曞厓",null); + def fangMap = getFang(unitMap.get("res"),"灞�(.*)(瀹�)"); map.put("lou", louMap.get("lou")) map.put("unit", unitMap.get("unit")) map.put("fang", fangMap.get("fang")) } if(StringUtils.isBlank(res)){ - res=formatByPattern(address, "(\\w|东|南|西|北)+(幢|栋|楼|号楼|#楼|栋楼|号楼楼)(.*)单元(((.*)(室))|\\w+)") + res=formatByPattern(address, "(\\w|涓渱鍗梶瑗縷鍖�)+(骞鏍媩妤紎鍙锋ゼ|#妤紎鏍嬫ゼ|鍙锋ゼ妤�)(.*)鍗曞厓(((.*)(瀹�))|\\w+)") if(StringUtils.isNotBlank(res)){ - def louMap = getLouDong(res,"(\\w|东|南|西|北)+(幢|栋|楼|号楼|#楼|栋楼|号楼楼)"); - def unitMap = getUnit(louMap.get("res"),"(.*)单元",null); + def louMap = getLouDong(res,"(\\w|涓渱鍗梶瑗縷鍖�)+(骞鏍媩妤紎鍙锋ゼ|#妤紎鏍嬫ゼ|鍙锋ゼ妤�)"); + def unitMap = getUnit(louMap.get("res"),"(.*)鍗曞厓",null); fang = unitMap.get("res"); if(StringUtils.isNotBlank(fang)){ - fang = fang.replaceAll("室", ""); + fang = fang.replaceAll("瀹�", ""); } map.put("lou", louMap.get("lou")) map.put("unit", unitMap.get("unit")) @@ -245,73 +245,73 @@ class AddressFindLouHouseInfo{ } } if(StringUtils.isBlank(res)){ - res=formatByPattern(address, "(\\w|东|南|西|北)+(幢|栋)(.*)楼(((.*)(室|号))|\\w+)") + res=formatByPattern(address, "(\\w|涓渱鍗梶瑗縷鍖�)+(骞鏍�)(.*)妤�(((.*)(瀹鍙�))|\\w+)") if(StringUtils.isNotBlank(res)){ - def louMap = getLouDong(res,"(\\w|东|南|西|北)+(幢|栋|楼|号楼|#楼|栋楼|号楼楼)"); - def unitMap = getUnit(louMap.get("res"),"(.*)楼",["楼","单元"]); + def louMap = getLouDong(res,"(\\w|涓渱鍗梶瑗縷鍖�)+(骞鏍媩妤紎鍙锋ゼ|#妤紎鏍嬫ゼ|鍙锋ゼ妤�)"); + def unitMap = getUnit(louMap.get("res"),"(.*)妤�",["妤�","鍗曞厓"]); fang = unitMap.get("res"); if(StringUtils.isNotBlank(fang)){ - fang = replaceList(fang, ["室","号"]) + fang = replaceList(fang, ["瀹�","鍙�"]) } map.put("lou", louMap.get("lou")) map.put("fang", fang) } } if(StringUtils.isBlank(res)){ - res=formatByPattern(address, "(\\w|东|南|西|北)+(幢|座|栋)(((.*)(号))|\\w+)") + res=formatByPattern(address, "(\\w|涓渱鍗梶瑗縷鍖�)+(骞搴鏍�)(((.*)(鍙�))|\\w+)") if(StringUtils.isNotBlank(res)){ - def louMap = getLouDong(res,"(\\w|东|南|西|北)+(幢|座|栋)"); + def louMap = getLouDong(res,"(\\w|涓渱鍗梶瑗縷鍖�)+(骞搴鏍�)"); fang = louMap.get("res"); if(StringUtils.isNotBlank(fang)){ - fang = fang.replaceAll("号", ""); + fang = fang.replaceAll("鍙�", ""); } map.put("lou", louMap.get("lou")) map.put("fang", fang) } } if(StringUtils.isBlank(res)){ - res=formatByPattern(address, "(\\w|东|南|西|北)+(单元)(.*)楼(((.*)(室|号))|\\w+)") + res=formatByPattern(address, "(\\w|涓渱鍗梶瑗縷鍖�)+(鍗曞厓)(.*)妤�(((.*)(瀹鍙�))|\\w+)") if(StringUtils.isNotBlank(res)){ - def unitMap = getUnit(res,"(\\w|东|南|西|北)+(单元)",null) - def unitMap1 = getUnit(unitMap.get("res"),"(.*)楼",["楼"]) + def unitMap = getUnit(res,"(\\w|涓渱鍗梶瑗縷鍖�)+(鍗曞厓)",null) + def unitMap1 = getUnit(unitMap.get("res"),"(.*)妤�",["妤�"]) fang = unitMap1.get("res") if(StringUtils.isNotBlank(fang)){ - fang = replaceList(fang, ["室","号"]) + fang = replaceList(fang, ["瀹�","鍙�"]) } map.put("unit", unitMap.get("unit")) map.put("fang", fang) } } if(StringUtils.isBlank(res)){ - res=formatByPattern(address, "(\\w|东|南|西|北)+(单元)(((.*)(号))|\\w+)") + res=formatByPattern(address, "(\\w|涓渱鍗梶瑗縷鍖�)+(鍗曞厓)(((.*)(鍙�))|\\w+)") if(StringUtils.isNotBlank(res)){ - def unitMap = getUnit(res,"(\\w|东|南|西|北)+(单元)",null); + def unitMap = getUnit(res,"(\\w|涓渱鍗梶瑗縷鍖�)+(鍗曞厓)",null); fang = unitMap.get("res"); if(StringUtils.isNotBlank(fang)){ - fang = replaceList(fang, ["室","号"]) + fang = replaceList(fang, ["瀹�","鍙�"]) } map.put("unit", unitMap.get("unit")) map.put("fang", fang) } } if(StringUtils.isBlank(res)){ - res=formatByPattern(address, "(\\w|东|南|西|北)+(楼)(((.*)(号))|\\w+)") + res=formatByPattern(address, "(\\w|涓渱鍗梶瑗縷鍖�)+(妤�)(((.*)(鍙�))|\\w+)") if(StringUtils.isNotBlank(res)){ - def unitMap = getUnit(res,"(\\w|东|南|西|北)+(楼)",["楼"]); + def unitMap = getUnit(res,"(\\w|涓渱鍗梶瑗縷鍖�)+(妤�)",["妤�"]); fang = unitMap.get("res"); if(StringUtils.isNotBlank(fang)){ - fang = replaceList(fang, ["室","号"]) + fang = replaceList(fang, ["瀹�","鍙�"]) } map.put("fang", fang) } } if(StringUtils.isBlank(res)){ - res=formatByPattern(address, "(\\w|东|南|西|北)+(号楼|#楼)(((.*)(号))|\\w+)") + res=formatByPattern(address, "(\\w|涓渱鍗梶瑗縷鍖�)+(鍙锋ゼ|#妤�)(((.*)(鍙�))|\\w+)") if(StringUtils.isNotBlank(res)){ - def unitMap = getUnit(res,"(\\w|东|南|西|北)+(号楼|#楼)",["号楼","#楼"]); + def unitMap = getUnit(res,"(\\w|涓渱鍗梶瑗縷鍖�)+(鍙锋ゼ|#妤�)",["鍙锋ゼ","#妤�"]); fang = unitMap.get("res"); if(StringUtils.isNotBlank(fang)){ - fang = replaceList(fang, ["室","号"]) + fang = replaceList(fang, ["瀹�","鍙�"]) } map.put("lou", unitMap.get("unit")) map.put("fang", fang) @@ -360,25 +360,25 @@ class AddressFindLouHouseInfo{ String unit = null; String fang = null; if(address){ - if("郑州".equals(city)){ - res = formatByPattern(address, "(\\w|东|南|西|北)+(楼|号楼|#楼|栋楼|栋|号楼楼)(.*)单元(.*)层(.*)(室)") + if("閮戝窞".equals(city)){ + res = formatByPattern(address, "(\\w|涓渱鍗梶瑗縷鍖�)+(妤紎鍙锋ゼ|#妤紎鏍嬫ゼ|鏍媩鍙锋ゼ妤�)(.*)鍗曞厓(.*)灞�(.*)(瀹�)") if(StringUtils.isNotBlank(res)){ - def louMap = getLouDong(res,"(\\w|东|南|西|北)+(楼|号楼|#楼|栋楼|栋|号楼楼)"); - def unitMap = getUnit(louMap.get("res"),"(.*)单元",null); - def fangMap = getFang(unitMap.get("res"),"层(.*)(室)"); + def louMap = getLouDong(res,"(\\w|涓渱鍗梶瑗縷鍖�)+(妤紎鍙锋ゼ|#妤紎鏍嬫ゼ|鏍媩鍙锋ゼ妤�)"); + def unitMap = getUnit(louMap.get("res"),"(.*)鍗曞厓",null); + def fangMap = getFang(unitMap.get("res"),"灞�(.*)(瀹�)"); map.put("lou", louMap.get("lou")) map.put("unit", unitMap.get("unit")) map.put("fang", fangMap.get("fang")) } if(StringUtils.isBlank(res)){ - res=formatByPattern(address, "(\\w|东|南|西|北)+(幢|栋|楼|号楼|#楼|栋楼|号楼楼)(.*)单元(((.*)(室))|\\w+)") + res=formatByPattern(address, "(\\w|涓渱鍗梶瑗縷鍖�)+(骞鏍媩妤紎鍙锋ゼ|#妤紎鏍嬫ゼ|鍙锋ゼ妤�)(.*)鍗曞厓(((.*)(瀹�))|\\w+)") if(StringUtils.isNotBlank(res)){ - def louMap = getLouDong(res,"(\\w|东|南|西|北)+(楼|号楼|#楼|栋楼|栋|号楼楼)"); - def unitMap = getUnit(louMap.get("res"),"(.*)单元",null); + def louMap = getLouDong(res,"(\\w|涓渱鍗梶瑗縷鍖�)+(妤紎鍙锋ゼ|#妤紎鏍嬫ゼ|鏍媩鍙锋ゼ妤�)"); + def unitMap = getUnit(louMap.get("res"),"(.*)鍗曞厓",null); fang = unitMap.get("res"); if(StringUtils.isNotBlank(fang)){ - fang = fang.replaceAll("室", ""); + fang = fang.replaceAll("瀹�", ""); } map.put("lou", louMap.get("lou")) map.put("unit", unitMap.get("unit")) @@ -395,7 +395,7 @@ class AddressFindLouHouseInfo{ } } /*if(StringUtils.isBlank(res)){ - res=formatByPattern(address, "(\\w|东|南|西|北)+(幢|座|栋|号楼|#楼)(((.*)(室))|\\w+)") + res=formatByPattern(address, "(\\w|涓渱鍗梶瑗縷鍖�)+(骞搴鏍媩鍙锋ゼ|#妤�)(((.*)(瀹�))|\\w+)") }*/ } } @@ -410,7 +410,7 @@ class AddressFindLouHouseInfo{ lou = formatByPattern(lds, reg) if(StringUtils.isNotBlank(lou)){ lds =lds.replaceAll(lou, ""); - lou = formatByPattern(lou, "(\\w+|东|南|西|北)") + lou = formatByPattern(lou, "(\\w+|涓渱鍗梶瑗縷鍖�)") } } map.put("lou", lou) @@ -427,7 +427,7 @@ class AddressFindLouHouseInfo{ if(list!=null&&list.size()>0){ unit = replaceList(unit, list); }else{ - unit = unit.replaceAll("单元", ""); + unit = unit.replaceAll("鍗曞厓", ""); } } } @@ -442,8 +442,8 @@ class AddressFindLouHouseInfo{ fang = formatByPattern(lds, reg) if(StringUtils.isNotBlank(fang)){ lds=lds.replaceAll(fang, ""); - fang = fang.replaceAll("室", ""); - fang = fang.replaceAll("层", ""); + fang = fang.replaceAll("瀹�", ""); + fang = fang.replaceAll("灞�", ""); } } map.put("fang", fang) @@ -457,25 +457,25 @@ class AddressFindLouHouseInfo{ String unit = null; String fang = null; if(StringUtils.isNotBlank(lds)){ - lou = formatByPattern(lds, "(\\w|东|南|西|北)+(楼|号楼|#楼|栋楼|栋|号楼楼)") + lou = formatByPattern(lds, "(\\w|涓渱鍗梶瑗縷鍖�)+(妤紎鍙锋ゼ|#妤紎鏍嬫ゼ|鏍媩鍙锋ゼ妤�)") if(StringUtils.isNotBlank(lou)){ lds =lds.replaceAll(lou, ""); - lou = formatByPattern(lou, "(\\w+|东|南|西|北)") + lou = formatByPattern(lou, "(\\w+|涓渱鍗梶瑗縷鍖�)") } } if(StringUtils.isNotBlank(lds)){ - unit = formatByPattern(lds, "(.*)单元") + unit = formatByPattern(lds, "(.*)鍗曞厓") if(StringUtils.isNotBlank(unit)){ lds=lds.replaceAll(unit, ""); - unit = unit.replaceAll("单元", ""); + unit = unit.replaceAll("鍗曞厓", ""); } } if(StringUtils.isNotBlank(lds)){ - fang = formatByPattern(lds, "层(.*)(室)") + fang = formatByPattern(lds, "灞�(.*)(瀹�)") if(StringUtils.isNotBlank(fang)){ lds=lds.replaceAll(fang, ""); - fang = fang.replaceAll("室", ""); - fang = fang.replaceAll("层", ""); + fang = fang.replaceAll("瀹�", ""); + fang = fang.replaceAll("灞�", ""); } } map.put("lou", lou) @@ -484,7 +484,7 @@ class AddressFindLouHouseInfo{ return map } - //室号 + //瀹ゅ彿 public static String getFloorInfo(String aStr){ String floorNumStr = null; if(StringUtils.isNotBlank(aStr)){ @@ -501,13 +501,13 @@ class AddressFindLouHouseInfo{ return floorNumStr } - //室号 + //瀹ゅ彿 public static String getRoomInfo(String aStr){ String roomNumStr = null; if(StringUtils.isNotBlank(aStr)){ aStr = aStr.replaceAll(" ", "") if(StringUtils.isBlank(roomNumStr)){ - roomNumStr = removeStr(formatByPattern(aStr, "(\\d)+(号房|室)"),["号房","室"]); + roomNumStr = removeStr(formatByPattern(aStr, "(\\d)+(鍙锋埧|瀹�)"),["鍙锋埧","瀹�"]); } if(StringUtils.isBlank(roomNumStr)){ if(aStr==~ /.+\d+/){ @@ -515,16 +515,16 @@ class AddressFindLouHouseInfo{ } } if(StringUtils.isBlank(roomNumStr)){ - roomNumStr = removeStr(formatByPattern(aStr,"\\d+号\$"),["号"]); + roomNumStr = removeStr(formatByPattern(aStr,"\\d+鍙穃$"),["鍙�"]); } if(StringUtils.isBlank(roomNumStr)){ - roomNumStr = removeStr(formatByPattern(aStr, "(\\w)+(单元|复式单元)"),["单元","复式"]); + roomNumStr = removeStr(formatByPattern(aStr, "(\\w)+(鍗曞厓|澶嶅紡鍗曞厓)"),["鍗曞厓","澶嶅紡"]); if(!isRoomNum(roomNumStr)){ roomNumStr = null; } } if(StringUtils.isBlank(roomNumStr)){ - List list = splitStr(formatByPattern(aStr, "\\w+(-|-)\\d+(-|-)\\d+"),["-","-"]); + List list = splitStr(formatByPattern(aStr, "\\w+(-|锛�)\\d+(-|锛�)\\d+"),["-","锛�"]); if(list!=null&&list.size()>2){ roomNumStr = list.get(2); } @@ -537,7 +537,7 @@ class AddressFindLouHouseInfo{ } } if(StringUtils.isBlank(roomNumStr)){ - List list = splitStr(formatByPattern(aStr, "\\w+(幢|栋)\\d+"),["幢","栋"]) + List list = splitStr(formatByPattern(aStr, "\\w+(骞鏍�)\\d+"),["骞�","鏍�"]) if(list!=null&&list.size()>1){ roomNumStr = list.get(1) } @@ -551,19 +551,19 @@ class AddressFindLouHouseInfo{ } - //单元号 + //鍗曞厓鍙� public static String getUnitInfo(String aStr){ String unitNumStr = null; if(StringUtils.isNotBlank(aStr)){ aStr = aStr.replaceAll(" ", "") if(StringUtils.isBlank(unitNumStr)){ - unitNumStr = removeStr(formatByPattern(aStr, "(\\w)+(单元|复式单元)"),["单元","复式"]); + unitNumStr = removeStr(formatByPattern(aStr, "(\\w)+(鍗曞厓|澶嶅紡鍗曞厓)"),["鍗曞厓","澶嶅紡"]); if(isRoomNum(unitNumStr)){ unitNumStr = null; } } if(StringUtils.isBlank(unitNumStr)){ - List list = splitStr(formatByPattern(aStr, "\\w+(-|-)\\d+(-|-)\\d+"),["-","-"]); + List list = splitStr(formatByPattern(aStr, "\\w+(-|锛�)\\d+(-|锛�)\\d+"),["-","锛�"]); if(list!=null&&list.size()>1){ unitNumStr = list.get(1); } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/AddressPlatTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/AddressPlatTest.groovy index 85bd02d63..412d89378 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/AddressPlatTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/AddressPlatTest.groovy @@ -9,21 +9,21 @@ import com.mongodb.BasicDBObject import com.mongodb.DBObject /** - * 定时更新小区地址数据 + * 瀹氭椂鏇存柊灏忓尯鍦板潃鏁版嵁 * @author hubingliang * */ class AddressPlatTest{ static main(args) { - List countDis = findCityDistrict("上海"); + List countDis = findCityDistrict("涓婃捣"); int con = 0; int i for(DBObject obj:countDis){ println i++ con = con + hasHousehold(obj); } - println "结束了" + println "缁撴潫浜�" println con println (countDis.size()) println (con/countDis.size()) @@ -71,7 +71,7 @@ class AddressPlatTest{ println sun } - //获取上周更新小区 + //鑾峰彇涓婂懆鏇存柊灏忓尯 public static void newDateDis(List diss){ int updateCount = 0; for(DBObject dis : diss){ @@ -119,7 +119,7 @@ class AddressPlatTest{ } - //判断是不是上周更新小区 + //鍒ゆ柇鏄笉鏄笂鍛ㄦ洿鏂板皬鍖� public static int isUpdateDistrictCount(DBObject obj){ Date thisMonday = mondayTime(0); Date lastMonday = mondayTime(1); @@ -132,7 +132,7 @@ class AddressPlatTest{ return 0; } - //获取城市有户数小区覆盖率 + //鑾峰彇鍩庡競鏈夋埛鏁板皬鍖鸿鐩栫巼 public static void houseHoldPercent(List diss){ int householdCount = 0; int i = 0; @@ -146,14 +146,14 @@ class AddressPlatTest{ } - //判断是不是有户数的小区 + //鍒ゆ柇鏄笉鏄湁鎴锋暟鐨勫皬鍖� public static int hasHousehold(DBObject obj){ if(obj.get("household_count")!=null&&obj.get("household_count")!=0){ return 1; } return 0; } - //根据城市获取小区 + //鏍规嵁鍩庡競鑾峰彇灏忓尯 public static List findCityDistrict(String city){ BasicDBObject query = new BasicDBObject() query.append("city", city) @@ -164,7 +164,7 @@ class AddressPlatTest{ return dbs; } - //获取本周或者上周一凌晨 + //鑾峰彇鏈懆鎴栬�呬笂鍛ㄤ竴鍑屾櫒 public static Date mondayTime(int con){ Calendar cal =Calendar.getInstance(); cal.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY); @@ -179,7 +179,7 @@ class AddressPlatTest{ Date date = dateFormat1.parse(dateStr); return date } - //获取当前系统前一天的时间 + //鑾峰彇褰撳墠绯荤粺鍓嶄竴澶╃殑鏃堕棿 public static Date getYestoday(Date date) { Calendar calendar = Calendar.getInstance(); calendar.setTime(date); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/AnalySaleDataBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/AnalySaleDataBatch.groovy index 57b0b9e0a..896f69416 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/AnalySaleDataBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/AnalySaleDataBatch.groovy @@ -20,15 +20,15 @@ import com.mongodb.DBObject class AnalySaleDataBatch { public static final DBCollection SALE_DATA = MongoUtils.getCollectionByName("fangjia_tmp", "sale_data", "192.168.0.136", 27017) public static final DBCollection SALE_DATA_STAT = MongoUtils.getCollectionByName("fangjia_tmp", "sale_data_stat", "192.168.0.136", 27017) - private static final String[] citys = ["杭州", "上海"] + private static final String[] citys = ["鏉窞", "涓婃捣"] static main(args) { - saleData("上海"); - saleData("北京"); - saleData("广州"); - saleData("佛山"); - saleData("南京"); - saleData("宁波"); - saleData("珠海"); + saleData("涓婃捣"); + saleData("鍖椾含"); + saleData("骞垮窞"); + saleData("浣涘北"); + saleData("鍗椾含"); + saleData("瀹佹尝"); + saleData("鐝犳捣"); } public static void saleData(String city){ @@ -74,7 +74,7 @@ class AnalySaleDataBatch { d.put("name",disName); d.put("house_num",houseNum); d.put("date",getDate(db.get("date"))); - d.put("resource","网易房产") + d.put("resource","缃戞槗鎴夸骇") cUData.add(d); break; } @@ -89,7 +89,7 @@ class AnalySaleDataBatch { d.put("name",name); d.put("house_num",houseNum); d.put("date",getDate(db.get("date"))); - d.put("resource","网易房产") + d.put("resource","缃戞槗鎴夸骇") cUData.add(d); } } @@ -98,7 +98,7 @@ class AnalySaleDataBatch { } /** - * 获取城市的小区 + * 鑾峰彇鍩庡競鐨勫皬鍖� * @param city * @return */ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/ApiInvokeStatistics.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/ApiInvokeStatistics.groovy index 1d634d97f..948445c2c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/ApiInvokeStatistics.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/ApiInvokeStatistics.groovy @@ -17,7 +17,7 @@ import com.mongodb.DBCollection import com.mongodb.DBCursor import com.mongodb.DBObject /** - * 定时更新小区地址数据 + * 瀹氭椂鏇存柊灏忓尯鍦板潃鏁版嵁 * @author hubingliang * */ @@ -29,7 +29,7 @@ class ApiInvokeStatistics extends BaseBatch{ static main(args) { def s = System.currentTimeMillis() runBatch(new ApiInvokeStatistics(), args) - println("运行时间:${(int) ((System.currentTimeMillis() - s)) / (1000 * 60)}分钟") + println("杩愯鏃堕棿:${(int) ((System.currentTimeMillis() - s)) / (1000 * 60)}鍒嗛挓") } @Override public void process(Object args) { @@ -50,7 +50,7 @@ class ApiInvokeStatistics extends BaseBatch{ def deleteQuery = new BasicDBObject("statistical_date", yestoday) OPEN_URI_LOG_COUNT.remove(deleteQuery) BasicDBObject query= new BasicDBObject("c_date", new BasicDBObject('$gte',yestoday).append('$lt', today)) - println "已删除 ${yestoday.format('yyyy-MM-dd')} 的旧统计数据, 新查询条数: ${query}" + println "宸插垹闄� ${yestoday.format('yyyy-MM-dd')} 鐨勬棫缁熻鏁版嵁, 鏂版煡璇㈡潯鏁�: ${query}" DBCursor dbc = OPEN_URI_LOG.find(query, new BasicDBObject("res_map", 0)).batchSize(10000).addOption(Bytes.QUERYOPTION_NOTIMEOUT) def results = [:] @@ -121,7 +121,7 @@ class ApiInvokeStatistics extends BaseBatch{ } - //获取凌晨当天和前一天凌晨时间 + //鑾峰彇鍑屾櫒褰撳ぉ鍜屽墠涓�澶╁噷鏅ㄦ椂闂� Date getToday(){ Date now = new Date(); Calendar cal = Calendar.getInstance(); @@ -135,7 +135,7 @@ class ApiInvokeStatistics extends BaseBatch{ return today; } - //获取当前系统前一天的时间 + //鑾峰彇褰撳墠绯荤粺鍓嶄竴澶╃殑鏃堕棿 Date getNextDay(Date date) { Calendar calendar = Calendar.getInstance(); calendar.setTime(date); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/ApiInvokeStatistics1.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/ApiInvokeStatistics1.groovy index 7579e857e..90d49907a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/ApiInvokeStatistics1.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/ApiInvokeStatistics1.groovy @@ -13,7 +13,7 @@ import com.mongodb.DBCursor import com.mongodb.DBObject import java.util.Date; /** - * 定时更新小区地址数据 + * 瀹氭椂鏇存柊灏忓尯鍦板潃鏁版嵁 * @author hubingliang * */ @@ -97,7 +97,7 @@ class ApiInvokeStatistics1{ } - //获取凌晨当天和前一天凌晨时间 + //鑾峰彇鍑屾櫒褰撳ぉ鍜屽墠涓�澶╁噷鏅ㄦ椂闂� Date getToday(){ Date now = new Date(); Calendar cal = Calendar.getInstance(); @@ -111,7 +111,7 @@ class ApiInvokeStatistics1{ return today; } - //获取当前系统前一天的时间 + //鑾峰彇褰撳墠绯荤粺鍓嶄竴澶╃殑鏃堕棿 Date getNextDay(Date date) { Calendar calendar = Calendar.getInstance(); calendar.setTime(date); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/ArtimesDataExceptionRemind.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/ArtimesDataExceptionRemind.groovy index 985216e71..f0418f9ed 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/ArtimesDataExceptionRemind.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/ArtimesDataExceptionRemind.groovy @@ -22,13 +22,13 @@ class ArtimesDataExceptionRemind extends BaseBatch{ static main(args) { def s = System.currentTimeMillis() runBatch(new ArtimesDataExceptionRemind(), args) - println("运行时间:${(int) ((System.currentTimeMillis() - s)) / (1000 * 60)}分钟") + println("杩愯鏃堕棿:${(int) ((System.currentTimeMillis() - s)) / (1000 * 60)}鍒嗛挓") } @Override public void process(Object args) { findExceptionJobStat() } - //根据查询end——date是当天的jobStat + //鏍规嵁鏌ヨend鈥斺�攄ate鏄綋澶╃殑jobStat def findExceptionJobStat(){ String content0= "content0"; String content1= "content1"; @@ -45,10 +45,10 @@ class ArtimesDataExceptionRemind extends BaseBatch{ while( dbc.hasNext()){ DBObject obj = dbc.next() - //判断每个jobStat是否是异常的 + //鍒ゆ柇姣忎釜jobStat鏄惁鏄紓甯哥殑 String jobId = obj.get("job_id") println (jobId+"========"+(obj.get("end_date"))) - //获取里当天最晚的一次任务的情况 + //鑾峰彇閲屽綋澶╂渶鏅氱殑涓�娆′换鍔$殑鎯呭喌 BasicDBObject dbo = new BasicDBObject(); dbo.append("job_id", jobId); dbo.append("end_date", new BasicDBObject("\$gt", yestoday)); @@ -66,7 +66,7 @@ class ArtimesDataExceptionRemind extends BaseBatch{ } } - //根据同一个job-id去查询他历史的所有的数据,然后将meta——count去平均值 + //鏍规嵁鍚屼竴涓猨ob-id鍘绘煡璇粬鍘嗗彶鐨勬墍鏈夌殑鏁版嵁锛岀劧鍚庡皢meta鈥斺�攃ount鍘诲钩鍧囧�� BasicDBObject queryJob = new BasicDBObject() queryJob.append("job_id", jobId); DBCursor jobStats = JOB_STAT.find(queryJob); @@ -97,11 +97,11 @@ class ArtimesDataExceptionRemind extends BaseBatch{ } String str = content0+"###"+content1+"###"+content2+"###"+content3+"###"+content4+"###"+content5 println str - sendEmail("zhoutongyun@fangjia.com", "疑似抓取错误的任务", str) + sendEmail("zhoutongyun@fangjia.com", "鐤戜技鎶撳彇閿欒鐨勪换鍔�", str) } - //获取当前系统前一天的时间 + //鑾峰彇褰撳墠绯荤粺鍓嶄竴澶╃殑鏃堕棿 Date getNextDay(Date date) { Calendar calendar = Calendar.getInstance(); calendar.setTime(date); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/AvgPriceLevel.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/AvgPriceLevel.groovy index 34283b242..69e776109 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/AvgPriceLevel.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/AvgPriceLevel.groovy @@ -80,7 +80,7 @@ class AvgPriceLevel{ } return list; } - //排名 + //鎺掑悕 public static Map levelInfo(List list){ def map = new HashMap(); def set = new HashSet(); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/BeijingDataToDataDept.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/BeijingDataToDataDept.groovy index 4d8c4334a..cc53dff6b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/BeijingDataToDataDept.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/BeijingDataToDataDept.groovy @@ -25,11 +25,11 @@ class BeijingDataToDataDept { public static final DBCollection DISTRICT_ADDRESS_UPDATE_LOG = MongoUtils.getCollectionByName("fangjia_log", "district_address_update_log", "192.168.0.136", 27017) - private static final String[] citys = ["杭州","上海"] + private static final String[] citys = ["鏉窞","涓婃捣"] static main(args) { - pdsData("北京"); + pdsData("鍖椾含"); } - //获取小区年涨跌幅 + //鑾峰彇灏忓尯骞存定璺屽箙 public static void pdsData(String city){ BasicDBObject query = new BasicDBObject() query.append("city", city) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/DaoChuBiaoZhunXiaoQu.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/DaoChuBiaoZhunXiaoQu.groovy index 6f1521df6..2fd1137e1 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/DaoChuBiaoZhunXiaoQu.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/DaoChuBiaoZhunXiaoQu.groovy @@ -14,7 +14,7 @@ import com.mongodb.DBCollection import com.mongodb.DBObject /** - * 定时更新小区地址数据 + * 瀹氭椂鏇存柊灏忓尯鍦板潃鏁版嵁 * @author hubingliang * */ @@ -43,13 +43,13 @@ class DaoChuBiaoZhunXiaoQu{ } } } - exportData("71个城市",ls); + exportData("71涓煄甯�",ls); } /** - * 判断楼栋库中是否存在 + * 鍒ゆ柇妤兼爧搴撲腑鏄惁瀛樺湪 */ public static boolean hasInLouDong(String city,String region,String name){ if(city!=null&®ion!=null&&name!=null){ @@ -66,13 +66,13 @@ class DaoChuBiaoZhunXiaoQu{ } /** - * 判断字符串中是否带有弄和号 + * 鍒ゆ柇瀛楃涓蹭腑鏄惁甯︽湁寮勫拰鍙� * @param name * @return */ public static Boolean hasNongHao(String name){ if(name!=null){ - if(getMatchString(name,"\\d+弄")||getMatchString(name,"\\d+号")){ + if(getMatchString(name,"\\d+寮�")||getMatchString(name,"\\d+鍙�")){ return true; } } @@ -82,11 +82,11 @@ class DaoChuBiaoZhunXiaoQu{ /** - * 获取城市的小区 + * 鑾峰彇鍩庡競鐨勫皬鍖� * @param city * @return */ - //获取城市小区 + //鑾峰彇鍩庡競灏忓尯 public static List getCityDistrict(String city){ BasicDBObject qu = new BasicDBObject() qu.append("city", city) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/DaoChuBiaoZhunXiaoQuBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/DaoChuBiaoZhunXiaoQuBatch.groovy index ba8096a12..744dbf5ed 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/DaoChuBiaoZhunXiaoQuBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/DaoChuBiaoZhunXiaoQuBatch.groovy @@ -11,7 +11,7 @@ import com.mongodb.DBCollection import com.mongodb.DBObject /** - * 房价网数据统计 + * 鎴夸环缃戞暟鎹粺璁� * @author hubingliang * */ @@ -21,13 +21,13 @@ class DaoChuBiaoZhunXiaoQuBatch { disInfoStatistic(); } - //小区基础信息城市统计统计 + //灏忓尯鍩虹淇℃伅鍩庡競缁熻缁熻 public static Map disInfoStatistic(){ List citys = OwnUtils.getCitys(); List> ls = new ArrayList>(); List> lc = new ArrayList>(); for(String city:citys){ - /*if(!city.equals("景德镇")){ + /*if(!city.equals("鏅痉闀�")){ continue; }*/ println city @@ -48,7 +48,7 @@ class DaoChuBiaoZhunXiaoQuBatch { ll.add(dis.get("name")); ls.add(ll); }else{ - markMap.put("nonstandard",2);// 标准小区 + markMap.put("nonstandard",2);// 鏍囧噯灏忓尯 dis.put("mark_map",markMap); DbUtils.seaweed.save(dis); } @@ -64,7 +64,7 @@ class DaoChuBiaoZhunXiaoQuBatch { } } - //exportData("全国统计",lc); + //exportData("鍏ㄥ浗缁熻",lc); } @@ -84,7 +84,7 @@ class DaoChuBiaoZhunXiaoQuBatch { return false; } - //开发商 物业公司 预售证 + //寮�鍙戝晢 鐗╀笟鍏徃 棰勫敭璇� public static boolean isEmptyField(String field){ if(StringUtils.isEmpty(field)){ return true; @@ -92,7 +92,7 @@ class DaoChuBiaoZhunXiaoQuBatch { return false; } - //容积率、绿化率、建筑面积、占地面积 + //瀹圭Н鐜囥�佺豢鍖栫巼銆佸缓绛戦潰绉�佸崰鍦伴潰绉� public static boolean isEmptyIntergeField(String field){ if(StringUtils.isEmpty(field)){ return true; @@ -106,11 +106,11 @@ class DaoChuBiaoZhunXiaoQuBatch { /** - * 获取城市的小区 + * 鑾峰彇鍩庡競鐨勫皬鍖� * @param city * @return */ - //获取城市小区 + //鑾峰彇鍩庡競灏忓尯 public static List getCityDistrict(String city){ BasicDBObject qu = new BasicDBObject() qu.append("city", city) @@ -123,11 +123,11 @@ class DaoChuBiaoZhunXiaoQuBatch { } /** - * 获取城市的小区 + * 鑾峰彇鍩庡競鐨勫皬鍖� * @param city * @return */ - //获取城市小区 + //鑾峰彇鍩庡競灏忓尯 public static List getCityDistrict1(String city){ BasicDBObject qu = new BasicDBObject() qu.append("city", city) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/DaoChuBiaoZhunXiaoQuBatch1.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/DaoChuBiaoZhunXiaoQuBatch1.groovy index 0f17b55f5..3d8618ef4 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/DaoChuBiaoZhunXiaoQuBatch1.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/DaoChuBiaoZhunXiaoQuBatch1.groovy @@ -11,7 +11,7 @@ import com.mongodb.DBCollection import com.mongodb.DBObject /** - * 房价网数据统计 + * 鎴夸环缃戞暟鎹粺璁� * @author hubingliang * */ @@ -21,13 +21,13 @@ class DaoChuBiaoZhunXiaoQuBatch1 { disInfoStatistic(); } - //小区基础信息城市统计统计 + //灏忓尯鍩虹淇℃伅鍩庡競缁熻缁熻 public static Map disInfoStatistic(){ List citys = OwnUtils.getCitys(); List> ls = new ArrayList>(); List> lc = new ArrayList>(); for(String city:citys){ - /*if(!city.equals("杭州")){ + /*if(!city.equals("鏉窞")){ continue; }*/ println city @@ -50,7 +50,7 @@ class DaoChuBiaoZhunXiaoQuBatch1 { ll.add(dis.get("region")); ll.add(dis.get("name")); ls.add(ll); - markMap.put("nonstandard",2);// 标准小区 + markMap.put("nonstandard",2);// 鏍囧噯灏忓尯 dis.put("mark_map",markMap); DbUtils.seaweed.save(dis); } @@ -67,7 +67,7 @@ class DaoChuBiaoZhunXiaoQuBatch1 { lc.add(lk); } } - //exportData("全国统计",lc); + //exportData("鍏ㄥ浗缁熻",lc); } public static boolean isFenQu(DBObject dis){ @@ -92,7 +92,7 @@ class DaoChuBiaoZhunXiaoQuBatch1 { return false; } - //开发商 物业公司 预售证 + //寮�鍙戝晢 鐗╀笟鍏徃 棰勫敭璇� public static boolean isEmptyField(String field){ if(StringUtils.isEmpty(field)){ return true; @@ -100,7 +100,7 @@ class DaoChuBiaoZhunXiaoQuBatch1 { return false; } - //容积率、绿化率、建筑面积、占地面积 + //瀹圭Н鐜囥�佺豢鍖栫巼銆佸缓绛戦潰绉�佸崰鍦伴潰绉� public static boolean isEmptyIntergeField(String field){ if(StringUtils.isEmpty(field)){ return true; @@ -114,11 +114,11 @@ class DaoChuBiaoZhunXiaoQuBatch1 { /** - * 获取城市的小区 + * 鑾峰彇鍩庡競鐨勫皬鍖� * @param city * @return */ - //获取城市小区 + //鑾峰彇鍩庡競灏忓尯 public static List getCityDistrict(String city){ BasicDBObject qu = new BasicDBObject() qu.append("city", city) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/DaoChuBiaoZhunXiaoQuBatch2.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/DaoChuBiaoZhunXiaoQuBatch2.groovy index 640106776..936de3afc 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/DaoChuBiaoZhunXiaoQuBatch2.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/DaoChuBiaoZhunXiaoQuBatch2.groovy @@ -13,7 +13,7 @@ import com.mongodb.DBCursor import com.mongodb.DBObject /** - * 房价网数据统计 + * 鎴夸环缃戞暟鎹粺璁� * @author hubingliang * */ @@ -27,13 +27,13 @@ class DaoChuBiaoZhunXiaoQuBatch2 { disInfoStatistic(); } - //小区基础信息城市统计统计 + //灏忓尯鍩虹淇℃伅鍩庡競缁熻缁熻 public static Map disInfoStatistic(){ List citys = OwnUtils.getCitys(); List> ls = new ArrayList>(); List> lc = new ArrayList>(); for(String city:citys){ - if(!city.equals("杭州")){ + if(!city.equals("鏉窞")){ continue; } println city @@ -56,7 +56,7 @@ class DaoChuBiaoZhunXiaoQuBatch2 { ll.add(dis.get("region")); ll.add(dis.get("name")); ls.add(ll); - markMap.put("nonstandard",2);// 标准小区 + markMap.put("nonstandard",2);// 鏍囧噯灏忓尯 dis.put("mark_map",markMap); DbUtils.seaweed.save(dis); } @@ -74,7 +74,7 @@ class DaoChuBiaoZhunXiaoQuBatch2 { } } - //exportData("全国统计",lc); + //exportData("鍏ㄥ浗缁熻",lc); } public static boolean isFenQu(DBObject dis){ @@ -133,7 +133,7 @@ class DaoChuBiaoZhunXiaoQuBatch2 { return false; } - //开发商 物业公司 预售证 + //寮�鍙戝晢 鐗╀笟鍏徃 棰勫敭璇� public static boolean isEmptyField(String field){ if(StringUtils.isEmpty(field)){ return true; @@ -141,7 +141,7 @@ class DaoChuBiaoZhunXiaoQuBatch2 { return false; } - //容积率、绿化率、建筑面积、占地面积 + //瀹圭Н鐜囥�佺豢鍖栫巼銆佸缓绛戦潰绉�佸崰鍦伴潰绉� public static boolean isEmptyIntergeField(String field){ if(StringUtils.isEmpty(field)){ return true; @@ -155,11 +155,11 @@ class DaoChuBiaoZhunXiaoQuBatch2 { /** - * 获取城市的小区 + * 鑾峰彇鍩庡競鐨勫皬鍖� * @param city * @return */ - //获取城市小区 + //鑾峰彇鍩庡競灏忓尯 public static List getCityDistrict(String city){ BasicDBObject qu = new BasicDBObject() qu.append("city", city) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/DaoChuBiaoZhunXiaoQuBatch3.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/DaoChuBiaoZhunXiaoQuBatch3.groovy index 8799bac47..35d92f780 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/DaoChuBiaoZhunXiaoQuBatch3.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/DaoChuBiaoZhunXiaoQuBatch3.groovy @@ -13,7 +13,7 @@ import com.mongodb.DBCursor import com.mongodb.DBObject /** - * 房价网数据统计 + * 鎴夸环缃戞暟鎹粺璁� * @author hubingliang * */ @@ -27,13 +27,13 @@ class DaoChuBiaoZhunXiaoQuBatch3 { disInfoStatistic(); } - //小区基础信息城市统计统计 + //灏忓尯鍩虹淇℃伅鍩庡競缁熻缁熻 public static Map disInfoStatistic(){ List citys = OwnUtils.getCitys(); List> ls = new ArrayList>(); List> lc = new ArrayList>(); for(String city:citys){ - /*if(!city.equals("杭州")){ + /*if(!city.equals("鏉窞")){ continue; }*/ println city @@ -53,14 +53,14 @@ class DaoChuBiaoZhunXiaoQuBatch3 { if(markMap==null){ markMap = [:] } - markMap.put("nonstandard",2);// 标准小区 + markMap.put("nonstandard",2);// 鏍囧噯灏忓尯 dis.put("mark_map",markMap); }else if(isCanEx(dis)){ k++ if(markMap==null){ markMap = [:] } - markMap.put("nonstandard",2);// 标准小区 + markMap.put("nonstandard",2);// 鏍囧噯灏忓尯 dis.put("mark_map",markMap); } @@ -75,7 +75,7 @@ class DaoChuBiaoZhunXiaoQuBatch3 { if(markMap==null){ markMap = [:] } - markMap.put("nonstandard",2);// 标准小区 + markMap.put("nonstandard",2);// 鏍囧噯灏忓尯 dis.put("mark_map",markMap); //DbUtils.seaweed.save(dis); } @@ -92,7 +92,7 @@ class DaoChuBiaoZhunXiaoQuBatch3 { } } - exportData("全国统计",lc); + exportData("鍏ㄥ浗缁熻",lc); } public static boolean isFenQu(DBObject dis){ @@ -151,7 +151,7 @@ class DaoChuBiaoZhunXiaoQuBatch3 { return false; } - //开发商 物业公司 预售证 + //寮�鍙戝晢 鐗╀笟鍏徃 棰勫敭璇� public static boolean isEmptyField(String field){ if(StringUtils.isEmpty(field)){ return true; @@ -159,7 +159,7 @@ class DaoChuBiaoZhunXiaoQuBatch3 { return false; } - //容积率、绿化率、建筑面积、占地面积 + //瀹圭Н鐜囥�佺豢鍖栫巼銆佸缓绛戦潰绉�佸崰鍦伴潰绉� public static boolean isEmptyIntergeField(String field){ if(StringUtils.isEmpty(field)){ return true; @@ -173,11 +173,11 @@ class DaoChuBiaoZhunXiaoQuBatch3 { /** - * 获取城市的小区 + * 鑾峰彇鍩庡競鐨勫皬鍖� * @param city * @return */ - //获取城市小区 + //鑾峰彇鍩庡競灏忓尯 public static List getCityDistrict(String city){ BasicDBObject qu = new BasicDBObject() qu.append("city", city) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/DaoChuBiaoZhunXiaoQuBatch4.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/DaoChuBiaoZhunXiaoQuBatch4.groovy index 3060eaefd..c17a2574e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/DaoChuBiaoZhunXiaoQuBatch4.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/DaoChuBiaoZhunXiaoQuBatch4.groovy @@ -15,7 +15,7 @@ import com.mongodb.DBCollection import com.mongodb.DBObject /** - * 房价网数据统计 + * 鎴夸环缃戞暟鎹粺璁� * @author hubingliang * */ @@ -29,7 +29,7 @@ class DaoChuBiaoZhunXiaoQuBatch4 extends BaseBatch{ static main(args) { def s = System.currentTimeMillis() runBatch(new DaoChuBiaoZhunXiaoQuBatch4(), args) - println("运行时间:${(int) ((System.currentTimeMillis() - s)) / (1000 * 60)}分钟") + println("杩愯鏃堕棿:${(int) ((System.currentTimeMillis() - s)) / (1000 * 60)}鍒嗛挓") } @Override public void process(Object args) { @@ -38,14 +38,14 @@ class DaoChuBiaoZhunXiaoQuBatch4 extends BaseBatch{ //statisticAll() } - //小区基础信息城市统计统计 + //灏忓尯鍩虹淇℃伅鍩庡競缁熻缁熻 public static Map disInfoStatistic(){ int i = 0; List citys = OwnUtils.getCitys(); List> ls = new ArrayList>(); List> lc = new ArrayList>(); for(String city:citys){ - /*if(!city.equals("杭州")){ + /*if(!city.equals("鏉窞")){ continue; }*/ println city @@ -70,7 +70,7 @@ class DaoChuBiaoZhunXiaoQuBatch4 extends BaseBatch{ } } } - //exportData("全国统计",lc); + //exportData("鍏ㄥ浗缁熻",lc); } public static void statisticAll(){ @@ -79,7 +79,7 @@ class DaoChuBiaoZhunXiaoQuBatch4 extends BaseBatch{ int all=0; int sin=0; for(String city:citys){ - if(!city.equals("杭州")){ + if(!city.equals("鏉窞")){ continue; } List diss = getCityDistrictTD(city); @@ -101,13 +101,13 @@ class DaoChuBiaoZhunXiaoQuBatch4 extends BaseBatch{ println ((double)((double)sin/(double)all)) ll.add(all) ll.add(sin) - exportData("全国统计",ll); + exportData("鍏ㄥ浗缁熻",ll); } public static boolean canBiaoZhun(DBObject dis,String city){ Date appointDate = DateUtils.parseFromTightYYYYMMDD("2017-3-18"); if(dis!=null){ - //判断是不是用房源计算出来的 + //鍒ゆ柇鏄笉鏄敤鎴挎簮璁$畻鍑烘潵鐨� String region = dis.get("region"); String name = dis.get("name"); String estateType = dis.get("estate_type2"); @@ -149,7 +149,7 @@ class DaoChuBiaoZhunXiaoQuBatch4 extends BaseBatch{ String region = dis.get("region"); String name = dis.get("name"); if(StringUtils.isNotEmpty(name)){ - if(name.endsWith("家园")||name.endsWith("花园")||name.endsWith("花城")||name.endsWith("佳园")||name.endsWith("花苑")||name.endsWith("别墅")||name.endsWith("佳苑")||name.endsWith("名苑")||name.endsWith("华府")||name.endsWith("新苑")){ + if(name.endsWith("瀹跺洯")||name.endsWith("鑺卞洯")||name.endsWith("鑺卞煄")||name.endsWith("浣冲洯")||name.endsWith("鑺辫嫅")||name.endsWith("鍒")||name.endsWith("浣宠嫅")||name.endsWith("鍚嶈嫅")||name.endsWith("鍗庡簻")||name.endsWith("鏂拌嫅")){ return true } } @@ -164,7 +164,7 @@ class DaoChuBiaoZhunXiaoQuBatch4 extends BaseBatch{ if(mount!=null&&mount>20){ return true } - if("别墅".equals(estateType)&&mount!=null&&mount>10){ + if("鍒".equals(estateType)&&mount!=null&&mount>10){ return true } } @@ -188,9 +188,9 @@ class DaoChuBiaoZhunXiaoQuBatch4 extends BaseBatch{ String region = dis.get("region"); String name = dis.get("name"); if(StringUtils.isNotEmpty(region)&&StringUtils.isNotEmpty(name)){ - String name1 = name+"别墅"; - String name2 = name+"公寓"; - String name3 = name+"小区"; + String name1 = name+"鍒"; + String name2 = name+"鍏瘬"; + String name3 = name+"灏忓尯"; BasicDBObject qu1 = new BasicDBObject() qu1.append("city", city) qu1.append("region", region) @@ -226,7 +226,7 @@ class DaoChuBiaoZhunXiaoQuBatch4 extends BaseBatch{ } /** - * 将小区标记为标准小区 + * 灏嗗皬鍖烘爣璁颁负鏍囧噯灏忓尯 * @param dis */ public static void updateData(DBObject dis){ @@ -235,7 +235,7 @@ class DaoChuBiaoZhunXiaoQuBatch4 extends BaseBatch{ if(markMap==null){ markMap = [:] } - markMap.put("nonstandard",2);// 标准小区 + markMap.put("nonstandard",2);// 鏍囧噯灏忓尯 dis.put("mark_map",markMap); DbUtils.seaweed.save(dis); } @@ -297,7 +297,7 @@ class DaoChuBiaoZhunXiaoQuBatch4 extends BaseBatch{ return false; } - //开发商 物业公司 预售证 + //寮�鍙戝晢 鐗╀笟鍏徃 棰勫敭璇� public static boolean isEmptyField(String field){ if(StringUtils.isEmpty(field)){ return true; @@ -305,7 +305,7 @@ class DaoChuBiaoZhunXiaoQuBatch4 extends BaseBatch{ return false; } - //容积率、绿化率、建筑面积、占地面积 + //瀹圭Н鐜囥�佺豢鍖栫巼銆佸缓绛戦潰绉�佸崰鍦伴潰绉� public static boolean isEmptyIntergeField(String field){ if(StringUtils.isEmpty(field)){ return true; @@ -319,11 +319,11 @@ class DaoChuBiaoZhunXiaoQuBatch4 extends BaseBatch{ /** - * 获取城市的小区 + * 鑾峰彇鍩庡競鐨勫皬鍖� * @param city * @return */ - //获取城市小区 + //鑾峰彇鍩庡競灏忓尯 public static List getCityDistrict(String city){ BasicDBObject qu = new BasicDBObject() qu.append("city", city) @@ -335,11 +335,11 @@ class DaoChuBiaoZhunXiaoQuBatch4 extends BaseBatch{ } /** - * 获取城市的小区 + * 鑾峰彇鍩庡競鐨勫皬鍖� * @param city * @return */ - //获取城市小区 + //鑾峰彇鍩庡競灏忓尯 public static List getCityDistrictTD(String city){ BasicDBObject qu = new BasicDBObject() qu.append("city", city) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/DataBkoffDataToSeaweed.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/DataBkoffDataToSeaweed.groovy index 790326c2d..5c6b3acec 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/DataBkoffDataToSeaweed.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/DataBkoffDataToSeaweed.groovy @@ -15,7 +15,7 @@ import com.mongodb.DBCollection import com.mongodb.DBObject /** - * 定时更新小区地址数据 + * 瀹氭椂鏇存柊灏忓尯鍦板潃鏁版嵁 * @author hubingliang * */ @@ -23,9 +23,9 @@ import com.mongodb.DBObject class DataBkoffDataToSeaweed{ public static final DBCollection DISTRICT_STATISTICS = MongoUtils.getCollectionByName("address_analysis", "district_statistics", "coredata.mongo.db.fangjia.com", 27017) public static final DBCollection ANALY_ROAD_COLL = MongoUtils.getCollectionByName("coredata", "analy_road", "coredata.mongo.db.fangjia.com", 27017) - public static String[] disType = ["多层","小高层","高层","超高层","花园洋房","老洋房","四合院"]; - public static String[] aliType = ["独栋","双拼","联排","叠加","老式别墅洋房"]; - public static String[] busType = ["多层","小高层","高层","超高层","独栋","双拼","联排","叠加"]; + public static String[] disType = ["澶氬眰","灏忛珮灞�","楂樺眰","瓒呴珮灞�","鑺卞洯娲嬫埧","鑰佹磱鎴�","鍥涘悎闄�"]; + public static String[] aliType = ["鐙爧","鍙屾嫾","鑱旀帓","鍙犲姞","鑰佸紡鍒娲嬫埧"]; + public static String[] busType = ["澶氬眰","灏忛珮灞�","楂樺眰","瓒呴珮灞�","鐙爧","鍙屾嫾","鑱旀帓","鍙犲姞"]; static main(args) { doImportBuildType() buildTypeStatistic() @@ -33,7 +33,7 @@ class DataBkoffDataToSeaweed{ public static void buildTypeStatistic(){ List citys = OwnUtils.getCitys(); List ls = new ArrayList(); - for(String city:["南昌","景德镇"]){ + for(String city:["鍗楁槍","鏅痉闀�"]){ List ll = new ArrayList(); List diss = getDistrictData(city); int i = 0; @@ -53,7 +53,7 @@ class DataBkoffDataToSeaweed{ ll.add(rate) ls.add(ll) } - exportData("全国",ls) + exportData("鍏ㄥ浗",ls) } public static void doImportBuildType(){ @@ -66,7 +66,7 @@ class DataBkoffDataToSeaweed{ println list int i = 0; - ExcelUtils.modify("D:\\hbl\\Data\\120个城市.xlsx", {List item-> + ExcelUtils.modify("D:\\hbl\\Data\\120涓煄甯�.xlsx", {List item-> Integer mount = null; if(i readCity(){ List citys = new ArrayList(); - ExcelUtils.modify("D:\\hbl\\Data\\120个城市.xlsx", {List item-> + ExcelUtils.modify("D:\\hbl\\Data\\120涓煄甯�.xlsx", {List item-> String city = item["C"] if(StringUtils.isNotBlank(city)){ citys.add(city) @@ -119,7 +119,7 @@ class DataBkoffDataToSeaweed{ }) return citys; } - //修改库中的build_type + //淇敼搴撲腑鐨刡uild_type public static String updateBuildType(DBObject dis,String buildType){ if(dis!=null){ dis.put("build_type", buildType); @@ -127,7 +127,7 @@ class DataBkoffDataToSeaweed{ //DbUtils.seaweed.save(dis); } } - //拼接建筑类型字符串 + //鎷兼帴寤虹瓚绫诲瀷瀛楃涓� public static String getBuildType(List needTypes,String bType){ String str = ""; if(needTypes!=null&&needTypes.size()>0){ @@ -162,7 +162,7 @@ class DataBkoffDataToSeaweed{ nowTypes = bType.split(","); } if(strs!=null&&strs.size()>0){ - if("普通住宅".equals(estateType)){ + if("鏅�氫綇瀹�".equals(estateType)){ ArrayList disTs = Arrays.asList(disType) disTs.removeAll(nowTypes); List list = new ArrayList(); @@ -171,7 +171,7 @@ class DataBkoffDataToSeaweed{ ls.add(str); } } - }else if("别墅".equals(estateType)){ + }else if("鍒".equals(estateType)){ ArrayList disTs = Arrays.asList(aliType); disTs.removeAll(nowTypes); List list = new ArrayList(); @@ -180,7 +180,7 @@ class DataBkoffDataToSeaweed{ ls.add(str); } } - }else if("商住".equals(estateType)){ + }else if("鍟嗕綇".equals(estateType)){ ArrayList disTs = Arrays.asList(busType); disTs.removeAll(nowTypes); List list = new ArrayList(); @@ -261,7 +261,7 @@ class DataBkoffDataToSeaweed{ keys.append("results.${fieldName}", 1) keys.append("url", 1) keys.append("c_date", 1) - keys.append("primary_map.region", 1)//road表中存在过时的region 查出重新格式化区域 + keys.append("primary_map.region", 1)//road琛ㄤ腑瀛樺湪杩囨椂鐨剅egion 鏌ュ嚭閲嶆柊鏍煎紡鍖栧尯鍩� def result = [] Map> urlDateMap = [:] @@ -289,7 +289,7 @@ class DataBkoffDataToSeaweed{ if (v != null) { if (v instanceof String) { if (StringUtils.isNotBlank(v)) { - v = DataUtil.toDBCcase(DataUtil.trim(v).replaceAll("((\\(|().*(\\)|)))+", '')) + v = DataUtil.toDBCcase(DataUtil.trim(v).replaceAll("((\\(|锛�).*(\\)|锛�))+", '')) result << v } } else { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/ExportBiaoZhunDis.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/ExportBiaoZhunDis.groovy index 1af206b4e..da77c4b14 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/ExportBiaoZhunDis.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/ExportBiaoZhunDis.groovy @@ -10,7 +10,7 @@ import com.mongodb.DBCollection import com.mongodb.DBObject /** - * 定时更新小区地址数据 + * 瀹氭椂鏇存柊灏忓尯鍦板潃鏁版嵁 * @author hubingliang * */ @@ -23,7 +23,7 @@ class ExportBiaoZhunDis{ public static final DBCollection xf_lou_dong = MongoUtils.getCollectionByName("gaode_poi", "loudong1", "192.168.0.61", 27017) public static final DBCollection xf_fang_hao = MongoUtils.getCollectionByName("gaode_poi", "fanghao1", "192.168.0.61", 27017) - private static final String[] str1 = ["北京","上海","广州","深圳","杭州"] + private static final String[] str1 = ["鍖椾含","涓婃捣","骞垮窞","娣卞湷","鏉窞"] static main(args) { @@ -71,9 +71,9 @@ class ExportBiaoZhunDis{ } } } - exportData("表格11",lsa) - exportData("表格22",lsb) - exportData("表格33",lsc) + exportData("琛ㄦ牸11",lsa) + exportData("琛ㄦ牸22",lsb) + exportData("琛ㄦ牸33",lsc) } def static exportData(String city,List> datas) { @@ -137,7 +137,7 @@ class ExportBiaoZhunDis{ } - //判断是不是标准小区 + //鍒ゆ柇鏄笉鏄爣鍑嗗皬鍖� public static boolean isBiaozhun(DBObject dis){ if(dis!=null){ Map markMap = dis.get("mark_map"); @@ -151,7 +151,7 @@ class ExportBiaoZhunDis{ return false; } - //判断标准小区是不是有户数 + //鍒ゆ柇鏍囧噯灏忓尯鏄笉鏄湁鎴锋暟 public static boolean hasHouseHod(DBObject dis){ if(dis!=null){ Integer hh = dis.get("household_count"); @@ -162,7 +162,7 @@ class ExportBiaoZhunDis{ return false; } - //有竣工时间的量 + //鏈夌宸ユ椂闂寸殑閲� public static boolean hasFinishBuildingDate(DBObject dis){ if(dis!=null){ String fbd = dis.get("finish_building_date"); @@ -175,11 +175,11 @@ class ExportBiaoZhunDis{ /** - * 获取城市的小区 + * 鑾峰彇鍩庡競鐨勫皬鍖� * @param city * @return */ - //获取城市小区 + //鑾峰彇鍩庡競灏忓尯 public static List getCityDistrict(String city){ BasicDBObject qu = new BasicDBObject() qu.append("city", city) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/FJTevaluationAutoToMortgageInfoBase.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/FJTevaluationAutoToMortgageInfoBase.groovy index 59ff87a60..b4d461bcf 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/FJTevaluationAutoToMortgageInfoBase.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/FJTevaluationAutoToMortgageInfoBase.groovy @@ -28,14 +28,14 @@ class FJTevaluationAutoToMortgageInfoBase extends BaseBatch{ static main(args) { def s = System.currentTimeMillis() runBatch(new FJTevaluationAutoToMortgageInfoBase(), args) - println("运行时间:${(int) ((System.currentTimeMillis() - s)) / (1000 * 60)}分钟") + println("杩愯鏃堕棿:${(int) ((System.currentTimeMillis() - s)) / (1000 * 60)}鍒嗛挓") } @Override public void process(Object args) { getFtjEvaluationDate() } - //对数据库中的小区地址进行更新 + //瀵规暟鎹簱涓殑灏忓尯鍦板潃杩涜鏇存柊 def getFtjEvaluationDate(){ Date today = getToday(); Date yestoday = getNextDay(today) @@ -101,37 +101,37 @@ class FJTevaluationAutoToMortgageInfoBase extends BaseBatch{ try { if(role==2){ if(email==null){ - map.put("resource","企业用户(固定)") + map.put("resource","浼佷笟鐢ㄦ埛(鍥哄畾)") } lastList.add(map) } if(role==3){ if(email==null){ - map.put("resource","企业用户") + map.put("resource","浼佷笟鐢ㄦ埛") } lastList.add(map) } if(role==5){ if(email==null){ - map.put("resource","企业用户(特殊)") + map.put("resource","浼佷笟鐢ㄦ埛(鐗规畩)") } lastList.add(map) } if(role==7){ if(email==null){ - map.put("resource","企业用户(银行)") + map.put("resource","浼佷笟鐢ㄦ埛(閾惰)") } lastList.add(map) } if(role==8){ if(email==null){ - map.put("resource","企业用户(杭州银行)") + map.put("resource","浼佷笟鐢ㄦ埛(鏉窞閾惰)") } lastList.add(map) } if(role==12){ if(email==null){ - map.put("resource","农业银行") + map.put("resource","鍐滀笟閾惰") } lastList.add(map) } @@ -163,7 +163,7 @@ class FJTevaluationAutoToMortgageInfoBase extends BaseBatch{ } - //获取凌晨当天和前一天凌晨时间 + //鑾峰彇鍑屾櫒褰撳ぉ鍜屽墠涓�澶╁噷鏅ㄦ椂闂� Date getToday(){ Date now = new Date(); Calendar cal = Calendar.getInstance(); @@ -177,7 +177,7 @@ class FJTevaluationAutoToMortgageInfoBase extends BaseBatch{ return today; } - //获取当前系统前一天的时间 + //鑾峰彇褰撳墠绯荤粺鍓嶄竴澶╃殑鏃堕棿 Date getNextDay(Date date) { Calendar calendar = Calendar.getInstance(); calendar.setTime(date); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/FJTevaluationToMortgageInfoBase.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/FJTevaluationToMortgageInfoBase.groovy index 5c50c0551..414196c5a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/FJTevaluationToMortgageInfoBase.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/FJTevaluationToMortgageInfoBase.groovy @@ -45,7 +45,7 @@ class FJTevaluationToMortgageInfoBase { ft.getFtjEvaluationDate() } - //对数据库中的小区地址进行更新 + //瀵规暟鎹簱涓殑灏忓尯鍦板潃杩涜鏇存柊 def getFtjEvaluationDate(){ int i=0; List> list = new ArrayList>() @@ -109,35 +109,35 @@ class FJTevaluationToMortgageInfoBase { try { if(role==2){ if(email==null){ - map.put("resource","企业用户(固定)") + map.put("resource","浼佷笟鐢ㄦ埛(鍥哄畾)") } lastList.add(map) } if(role==3){ if(email==null){ - map.put("resource","企业用户") + map.put("resource","浼佷笟鐢ㄦ埛") } lastList.add(map) } if(role==5){ - map.put("resource","企业用户(特殊)") + map.put("resource","浼佷笟鐢ㄦ埛(鐗规畩)") lastList.add(map) } if(role==7){ if(email==null){ - map.put("resource","企业用户(银行)") + map.put("resource","浼佷笟鐢ㄦ埛(閾惰)") } lastList.add(map) } if(role==8){ if(email==null){ - map.put("resource","企业用户(杭州银行)") + map.put("resource","浼佷笟鐢ㄦ埛(鏉窞閾惰)") } lastList.add(map) } if(role==12){ if(email==null){ - map.put("resource","农业银行") + map.put("resource","鍐滀笟閾惰") } lastList.add(map) } @@ -169,7 +169,7 @@ class FJTevaluationToMortgageInfoBase { } - //获取凌晨当天和前一天凌晨时间 + //鑾峰彇鍑屾櫒褰撳ぉ鍜屽墠涓�澶╁噷鏅ㄦ椂闂� Date getToday(){ Date now = new Date(); Calendar cal = Calendar.getInstance(); @@ -183,7 +183,7 @@ class FJTevaluationToMortgageInfoBase { return today; } - //获取当前系统前一天的时间 + //鑾峰彇褰撳墠绯荤粺鍓嶄竴澶╃殑鏃堕棿 Date getNextDay(Date date) { Calendar calendar = Calendar.getInstance(); calendar.setTime(date); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/FangJiaWangDataStatistics.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/FangJiaWangDataStatistics.groovy index bd1eac606..148a0d8bb 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/FangJiaWangDataStatistics.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/FangJiaWangDataStatistics.groovy @@ -11,18 +11,18 @@ import com.mongodb.DBCollection import com.mongodb.DBObject /** - * 房价网数据统计 + * 鎴夸环缃戞暟鎹粺璁� * @author hubingliang * */ class FangJiaWangDataStatistics { public static final DBCollection SERVER_AREA = MongoUtils.getCollectionByName("fangjia", "server_area", "mongo.db.fangjia.com", 27017) static main(args) { - int i= getCityDistrict("宁波").size(); + int i= getCityDistrict("瀹佹尝").size(); println i; } - //小区基础信息城市统计统计 + //灏忓尯鍩虹淇℃伅鍩庡競缁熻缁熻 public static Map disInfoStatistic(List diss){ Map map = new HashMap(); if(diss!=null&&diss.size()>0){ @@ -66,13 +66,13 @@ class FangJiaWangDataStatistics { - //String 类型的字段是否有数据 - //户数 停车位 经纬度(Long类型) - //建筑年代 - //建筑类型 物业费 产权年限 竣工日期 占地面积 建筑面积 绿化率 容积率 开发商 物业公司 + //String 绫诲瀷鐨勫瓧娈垫槸鍚︽湁鏁版嵁 + //鎴锋暟 鍋滆溅浣� 缁忕含搴︼紙Long绫诲瀷锛� + //寤虹瓚骞翠唬 + //寤虹瓚绫诲瀷 鐗╀笟璐� 浜ф潈骞撮檺 绔e伐鏃ユ湡 鍗犲湴闈㈢Н 寤虹瓚闈㈢Н 缁垮寲鐜� 瀹圭Н鐜� 寮�鍙戝晢 鐗╀笟鍏徃 - // 建筑类型 物业费 产权年限 竣工日期 占地面积 建筑面积 绿化率 容积率 开发商 物业公司 + // 寤虹瓚绫诲瀷 鐗╀笟璐� 浜ф潈骞撮檺 绔e伐鏃ユ湡 鍗犲湴闈㈢Н 寤虹瓚闈㈢Н 缁垮寲鐜� 瀹圭Н鐜� 寮�鍙戝晢 鐗╀笟鍏徃 public static int hasField(DBObject dis,String field){ if(dis!=null&&StringUtils.isNotEmpty(dis.get(field))){ return 1; @@ -80,28 +80,28 @@ class FangJiaWangDataStatistics { return 0; } - //户数 + //鎴锋暟 public static int hasHouseHold(DBObject dis){ if(dis!=null&&StringUtils.isNotEmpty(dis.get("household_count"))&&dis.get("household_count")>0){ return 1; } return 0; } - //停车位 + //鍋滆溅浣� public static int hasCarSiteCount(DBObject dis){ if(dis!=null&&dis.get("car_site_count")!=null){ return 1; } return 0; } - //经纬度 + //缁忕含搴� public static int hasLocation(DBObject dis){ if(dis!=null&&dis.get("lat2")!=null&&dis.get("lng2")){ return 1; } return 0; } - //建筑年代 + //寤虹瓚骞翠唬 public static hasBuildYear(DBObject dis){ if(dis!=null){ if(StringUtils.isNotEmpty(dis.get("finish_building_date"))||StringUtils.isNotEmpty("start_building_date") @@ -112,7 +112,7 @@ class FangJiaWangDataStatistics { return 0; } - //获取城市小区 + //鑾峰彇鍩庡競灏忓尯 public static List getCityDistrict(String city){ BasicDBObject qu = new BasicDBObject() qu.append("city", city) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/FangYuanJunGongZiDuan.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/FangYuanJunGongZiDuan.groovy index d1836dccb..7e953b4e7 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/FangYuanJunGongZiDuan.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/FangYuanJunGongZiDuan.groovy @@ -11,7 +11,7 @@ import com.mongodb.DBCollection import com.mongodb.DBObject /** - * 房源竣工字段解析并填充 + * 鎴挎簮绔e伐瀛楁瑙f瀽骞跺~鍏� * @author hubingliang * */ @@ -25,7 +25,7 @@ class FangYuanJunGongZiDuan{ public static void junGongZiDuan(){ List citys = OwnUtils.getCitys(); for(String city:citys){ - if(!city.equals("上海")){ + if(!city.equals("涓婃捣")){ continue; } List> ls = new ArrayList>(); @@ -54,7 +54,7 @@ class FangYuanJunGongZiDuan{ /** - * 小区房源查询 + * 灏忓尯鎴挎簮鏌ヨ * @param city * @return */ @@ -73,7 +73,7 @@ class FangYuanJunGongZiDuan{ } /** - * 根据房源获取其中的竣工时间字段 + * 鏍规嵁鎴挎簮鑾峰彇鍏朵腑鐨勭宸ユ椂闂村瓧娈� */ public static String finishBuildDate(DBObject house){ if(house!=null&&StringUtils.isNotBlank(house.get("build_date"))){ @@ -90,7 +90,7 @@ class FangYuanJunGongZiDuan{ } /** - * 获取城市的小区 + * 鑾峰彇鍩庡競鐨勫皬鍖� * @param city * @return */ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/FindUpdatReason.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/FindUpdatReason.groovy index 41fb4aaad..542e24dca 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/FindUpdatReason.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/FindUpdatReason.groovy @@ -25,7 +25,7 @@ class FindUpdatReason { public static final DBCollection OLDSEAWEED = MongoUtils.getCollectionByName("fangjia_temp", "seaweed", "192.168.0.136", 27017) static main(args) { - findReason("北京") + findReason("鍖椾含") } public static void findReason(String city){ @@ -42,7 +42,7 @@ class FindUpdatReason { } /** - * 获取城市的小区 + * 鑾峰彇鍩庡競鐨勫皬鍖� * @param city * @return */ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/GaodePOIFetchBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/GaodePOIFetchBatch.groovy index 5d2c39e93..6e7dcd3fa 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/GaodePOIFetchBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/GaodePOIFetchBatch.groovy @@ -29,45 +29,45 @@ class GaodePOIFetchBatch { ] public static final KEYWORDS = [ - "地铁","公交","码头","机场","火车站","医院","写字楼","停车场","网吧","学校","银行","公园/绿地","KTV","健身中心","大型超市","咖啡厅","剧场/影院", - "商场","酒店","整容整形","洗浴中心","便利店","餐饮","游乐场","旅游景点","体育场馆","图书馆","美容院","私立学校" + "鍦伴搧","鍏氦","鐮佸ご","鏈哄満","鐏溅绔�","鍖婚櫌","鍐欏瓧妤�","鍋滆溅鍦�","缃戝惂","瀛︽牎","閾惰","鍏洯/缁垮湴","KTV","鍋ヨ韩涓績","澶у瀷瓒呭競","鍜栧暋鍘�","鍓у満/褰遍櫌", + "鍟嗗満","閰掑簵","鏁村鏁村舰","娲楁荡涓績","渚垮埄搴�","椁愰ギ","娓镐箰鍦�","鏃呮父鏅偣","浣撹偛鍦洪","鍥句功棣�","缇庡闄�","绉佺珛瀛︽牎" ] public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(15) public static final Map KEYWORDS_MAP = new HashMap(){{ - put("地铁", "150500"); - put("公交", "1507"); - put("码头", "1503"); - put("机场", "150104|150106"); - put("火车站", "150200"); - put("医院", "090100|090101|090200|090202|090203|090204|090205|090206|090207|090208|090209|090210|090211"); - put("写字楼", "120201"); - put("停车场", "150903|150904|150905|150906"); - put("网吧", "080308"); - put("学校","141200|141201|141202|141203|141204"); - put("银行","1601|1603"); - put("公园/绿地","110100|110101"); + put("鍦伴搧", "150500"); + put("鍏氦", "1507"); + put("鐮佸ご", "1503"); + put("鏈哄満", "150104|150106"); + put("鐏溅绔�", "150200"); + put("鍖婚櫌", "090100|090101|090200|090202|090203|090204|090205|090206|090207|090208|090209|090210|090211"); + put("鍐欏瓧妤�", "120201"); + put("鍋滆溅鍦�", "150903|150904|150905|150906"); + put("缃戝惂", "080308"); + put("瀛︽牎","141200|141201|141202|141203|141204"); + put("閾惰","1601|1603"); + put("鍏洯/缁垮湴","110100|110101"); put("KTV","080302"); - put("健身中心","080111"); - put("大型超市","0604"); - put("咖啡厅","0505"); - put("剧场/影院","080601|080603"); - put("商场","0601"); - put("酒店","10"); - put("整容整形","090201"); - put("洗浴中兴","0714"); - put("便利店","0602"); - put("餐饮","0501|0502|0503|0504"); - put("游乐场","080501"); - put("旅游景点","110000"); - put("体育场馆","0800|0801"); - put("图书馆","140500"); + put("鍋ヨ韩涓績","080111"); + put("澶у瀷瓒呭競","0604"); + put("鍜栧暋鍘�","0505"); + put("鍓у満/褰遍櫌","080601|080603"); + put("鍟嗗満","0601"); + put("閰掑簵","10"); + put("鏁村鏁村舰","090201"); + put("娲楁荡涓叴","0714"); + put("渚垮埄搴�","0602"); + put("椁愰ギ","0501|0502|0503|0504"); + put("娓镐箰鍦�","080501"); + put("鏃呮父鏅偣","110000"); + put("浣撹偛鍦洪","0800|0801"); + put("鍥句功棣�","140500"); }}; - //数据表 + //鏁版嵁琛� public static final DBCollection POI_COLL = MongoUtils.getCollectionByName("fangjia_base", "gaode_place_poi", "192.168.0.136", 27017) - //记录运行日志表 + //璁板綍杩愯鏃ュ織琛� public static final DBCollection LOG_COLL = MongoUtils.getCollectionByName("fangjia_log", "gaode_place_poi_log", "192.168.0.136", 27017) public static final DBCollection BOUNDS_COLL = MongoUtils.getCollectionByName("fangjia_base", "city_bounds_box", "192.168.0.136", 27017) @@ -75,46 +75,46 @@ class GaodePOIFetchBatch { // - /*//浙江 安徽 - private static final String[] day1 = ["舟山","丽水","杭州","宁波","温州","嘉兴","台州","湖州","衢州","绍兴","金华","淮南","阜阳","黄山","亳州","安庆","六安", - "淮北","宣城","宿州","池州","蚌埠","滁州","铜陵","合肥","芜湖","马鞍山"] - // 直辖市 上海 天津 - private static final String[] day2 = ["上海","天津"] - //福建 甘肃 北京 - private static final String[] day3 = ["北京","宁德","南平","三明","龙岩","漳州","福州","厦门","泉州","莆田","武威","天水","定西","平凉","白银","酒泉","张掖","嘉峪关","庆阳","金昌","陇南","临夏","甘南","兰州"] - //广东 广西 - private static final String[] day4 = ["汕尾","广州","深圳","佛山","东莞","中山","湛江","惠州","清远","江门","珠海","汕头","揭阳","茂名","云浮","肇庆","潮州","梅州","阳江","韶关","河源", - "钦州","梧州","百色","贵港","贺州","来宾","河池","防城港","崇左","南宁","桂林","北海","柳州","玉林"] - //贵州 海南 河北 重庆 - private static final String[] day5 = ["重庆","黔南","遵义","安顺","铜仁","毕节","黔西南","黔东南","贵阳","六盘水","三沙","三亚","海口","五指山","琼海","儋州", - "文昌","万宁","东方","定安","屯昌","澄迈","临高","白沙","昌江","乐东","陵水","保亭","琼中","张家口","衡水","邢台","承德","沧州","石家庄","唐山","邯郸", - "廊坊","保定","秦皇岛"] - //黑龙江 河南 湖北 - private static final String[] day6 = ["齐齐哈尔","佳木斯","双鸭山","绥化","鸡西","七台河","鹤岗","黑河","伊春","大兴安岭","哈尔滨","大庆","牡丹江","安阳","许昌","南阳", - "开封","漯河","鹤壁","周口","濮阳","三门峡","商丘","信阳","驻马店","郑州","洛阳","平顶山","新乡","焦作","济源","黄冈","鄂州","十堰","随州","孝感","荆州", - "咸宁","荆门","恩施","武汉","襄阳","宜昌","黄石","仙桃","潜江","天门","神农架"] - //湖南 江苏 江西 - private static final String[] day7 = ["常德","岳阳","怀化","郴州","益阳","永州","娄底","湘西","邵阳","长沙","株洲", - "湘潭","张家界","衡阳","淮安","南京","苏州","无锡","扬州","常州","徐州","镇江","南通","泰州","宿迁","连云港","盐城","吉安","景德镇","鹰潭","新余","上饶","宜春", - "萍乡","抚州","南昌","赣州","九江"] - //吉林 辽宁 内蒙古 宁夏 - private static final String[] day8 = ["四平","辽源","白山","白城","通化","松原","延边","长春","吉林","铁岭","锦州","朝阳","阜新","抚顺","葫芦岛","辽阳","沈阳","大连", - "鞍山","丹东","本溪","营口","盘锦","包头","赤峰","兴安盟","锡林郭勒盟","阿拉善盟","鄂尔多斯","乌海","乌兰察布","通辽","巴彦淖尔","呼伦贝尔","呼和浩特","中卫","固原","吴忠", - "石嘴山","银川"] - //青海 山东 山西 云南 - private static final String[] day9 = ["海东","海北州","黄南州","海南州","果洛州","玉树州","海西州","西宁","临沂","泰安","菏泽","济宁","日照","聊城","滨州","枣庄","莱芜","东营","德州","济南", - "青岛","威海","烟台","潍坊","淄博","大同","临汾","朔州","晋城","忻州","晋中","阳泉","运城","长治","吕梁","太原","文山州","红河","临沧","保山","昭通", - "普洱","楚雄","怒江州","迪庆州","西双版纳州","德宏州","昆明","丽江","大理","玉溪","曲靖"] - //陕西 四川 新疆 西藏 - private static final String[] day10 = ["榆林","汉中","安康","商洛","宝鸡","渭南","铜川","西安","咸阳","延安","广元","乐山","南充","泸州","资阳","内江","达州","巴中","遂宁","眉山","德阳","广安", - "雅安","阿坝州","凉山州","甘孜州","成都","绵阳","宜宾","自贡","攀枝花","吐鲁番","哈密","和田","昌吉","阿勒泰","博尔塔拉","巴音郭楞","克孜勒苏","伊犁","阿克苏", - "克拉玛依","喀什","塔城","乌鲁木齐","石河子","阿拉尔","图木舒克","五家渠","昌都","日喀则","山南","那曲","阿里","林芝","拉萨"]*/ + /*//娴欐睙 瀹夊窘 + private static final String[] day1 = ["鑸熷北","涓芥按","鏉窞","瀹佹尝","娓╁窞","鍢夊叴","鍙板窞","婀栧窞","琛㈠窞","缁嶅叴","閲戝崕","娣崡","闃滈槼","榛勫北","浜冲窞","瀹夊簡","鍏畨", + "娣寳","瀹e煄","瀹垮窞","姹犲窞","铓屽煚","婊佸窞","閾滈櫟","鍚堣偉","鑺滄箹","椹瀺灞�"] + // 鐩磋緰甯� 涓婃捣 澶╂触 + private static final String[] day2 = ["涓婃捣","澶╂触"] + //绂忓缓 鐢樿們 鍖椾含 + private static final String[] day3 = ["鍖椾含","瀹佸痉","鍗楀钩","涓夋槑","榫欏博","婕冲窞","绂忓窞","鍘﹂棬","娉夊窞","鑾嗙敯","姝﹀▉","澶╂按","瀹氳タ","骞冲噳","鐧介摱","閰掓硥","寮犳帠","鍢夊唱鍏�","搴嗛槼","閲戞槍","闄囧崡","涓村","鐢樺崡","鍏板窞"] + //骞夸笢 骞胯タ + private static final String[] day4 = ["姹曞熬","骞垮窞","娣卞湷","浣涘北","涓滆帪","涓北","婀涙睙","鎯犲窞","娓呰繙","姹熼棬","鐝犳捣","姹曞ご","鎻槼","鑼傚悕","浜戞诞","鑲囧簡","娼窞","姊呭窞","闃虫睙","闊跺叧","娌虫簮", + "閽﹀窞","姊у窞","鐧捐壊","璐垫腐","璐哄窞","鏉ュ","娌虫睜","闃插煄娓�","宕囧乏","鍗楀畞","妗傛灄","鍖楁捣","鏌冲窞","鐜夋灄"] + //璐靛窞 娴峰崡 娌冲寳 閲嶅簡 + private static final String[] day5 = ["閲嶅簡","榛斿崡","閬典箟","瀹夐『","閾滀粊","姣曡妭","榛旇タ鍗�","榛斾笢鍗�","璐甸槼","鍏洏姘�","涓夋矙","涓変簹","娴峰彛","浜旀寚灞�","鐞兼捣","鍎嬪窞", + "鏂囨槍","涓囧畞","涓滄柟","瀹氬畨","灞槍","婢勮繄","涓撮珮","鐧芥矙","鏄屾睙","涔愪笢","闄垫按","淇濅涵","鐞间腑","寮犲鍙�","琛℃按","閭㈠彴","鎵垮痉","娌у窞","鐭冲搴�","鍞愬北","閭兏", + "寤婂潑","淇濆畾","绉︾殗宀�"] + //榛戦緳姹� 娌冲崡 婀栧寳 + private static final String[] day6 = ["榻愰綈鍝堝皵","浣虫湪鏂�","鍙岄腑灞�","缁ュ寲","楦¤タ","涓冨彴娌�","楣ゅ矖","榛戞渤","浼婃槬","澶у叴瀹夊箔","鍝堝皵婊�","澶у簡","鐗′腹姹�","瀹夐槼","璁告槍","鍗楅槼", + "寮�灏�","婕渤","楣ゅ","鍛ㄥ彛","婵槼","涓夐棬宄�","鍟嗕笜","淇¢槼","椹婚┈搴�","閮戝窞","娲涢槼","骞抽《灞�","鏂颁埂","鐒︿綔","娴庢簮","榛勫唸","閯傚窞","鍗佸牥","闅忓窞","瀛濇劅","鑽嗗窞", + "鍜稿畞","鑽嗛棬","鎭╂柦","姝︽眽","瑗勯槼","瀹滄槍","榛勭煶","浠欐","娼滄睙","澶╅棬","绁炲啘鏋�"] + //婀栧崡 姹熻嫃 姹熻タ + private static final String[] day7 = ["甯稿痉","宀抽槼","鎬�鍖�","閮村窞","鐩婇槼","姘稿窞","濞勫簳","婀樿タ","閭甸槼","闀挎矙","鏍床", + "婀樻江","寮犲鐣�","琛¢槼","娣畨","鍗椾含","鑻忓窞","鏃犻敗","鎵窞","甯稿窞","寰愬窞","闀囨睙","鍗楅��","娉板窞","瀹胯縼","杩炰簯娓�","鐩愬煄","鍚夊畨","鏅痉闀�","楣版江","鏂颁綑","涓婇ザ","瀹滄槬", + "钀嶄埂","鎶氬窞","鍗楁槍","璧e窞","涔濇睙"] + //鍚夋灄 杈藉畞 鍐呰挋鍙� 瀹佸 + private static final String[] day8 = ["鍥涘钩","杈芥簮","鐧藉北","鐧藉煄","閫氬寲","鏉惧師","寤惰竟","闀挎槬","鍚夋灄","閾佸箔","閿﹀窞","鏈濋槼","闃滄柊","鎶氶『","钁姦宀�","杈介槼","娌堥槼","澶ц繛", + "闉嶅北","涓逛笢","鏈邯","钀ュ彛","鐩橀敠","鍖呭ご","璧ゅ嘲","鍏村畨鐩�","閿℃灄閮嫆鐩�","闃挎媺鍠勭洘","閯傚皵澶氭柉","涔屾捣","涔屽叞瀵熷竷","閫氳窘","宸村溅娣栧皵","鍛间鸡璐濆皵","鍛煎拰娴╃壒","涓崼","鍥哄師","鍚村繝", + "鐭冲槾灞�","閾跺窛"] + //闈掓捣 灞变笢 灞辫タ 浜戝崡 + private static final String[] day9 = ["娴蜂笢","娴峰寳宸�","榛勫崡宸�","娴峰崡宸�","鏋滄礇宸�","鐜夋爲宸�","娴疯タ宸�","瑗垮畞","涓存矀","娉板畨","鑿忔辰","娴庡畞","鏃ョ収","鑱婂煄","婊ㄥ窞","鏋e簞","鑾辫姕","涓滆惀","寰峰窞","娴庡崡", + "闈掑矝","濞佹捣","鐑熷彴","娼嶅潑","娣勫崥","澶у悓","涓存本","鏈斿窞","鏅嬪煄","蹇诲窞","鏅嬩腑","闃虫硥","杩愬煄","闀挎不","鍚曟","澶師","鏂囧北宸�","绾㈡渤","涓存钵","淇濆北","鏄��", + "鏅幢","妤氶泟","鎬掓睙宸�","杩簡宸�","瑗垮弻鐗堢撼宸�","寰峰畯宸�","鏄嗘槑","涓芥睙","澶х悊","鐜夋邯","鏇查潠"] + //闄曡タ 鍥涘窛 鏂扮枂 瑗胯棌 + private static final String[] day10 = ["姒嗘灄","姹変腑","瀹夊悍","鍟嗘礇","瀹濋浮","娓崡","閾滃窛","瑗垮畨","鍜搁槼","寤跺畨","骞垮厓","涔愬北","鍗楀厖","娉稿窞","璧勯槼","鍐呮睙","杈惧窞","宸翠腑","閬傚畞","鐪夊北","寰烽槼","骞垮畨", + "闆呭畨","闃垮潩宸�","鍑夊北宸�","鐢樺瓬宸�","鎴愰兘","缁甸槼","瀹滃","鑷础","鏀�鏋濊姳","鍚愰瞾鐣�","鍝堝瘑","鍜岀敯","鏄屽悏","闃垮嫆娉�","鍗氬皵濉旀媺","宸撮煶閮","鍏嬪瓬鍕掕嫃","浼婄妬","闃垮厠鑻�", + "鍏嬫媺鐜涗緷","鍠�浠�","濉斿煄","涔岄瞾鏈ㄩ綈","鐭虫渤瀛�","闃挎媺灏�","鍥炬湪鑸掑厠","浜斿娓�","鏄岄兘","鏃ュ杸鍒�","灞卞崡","閭f洸","闃块噷","鏋楄姖","鎷夎惃"]*/ static main(args) { - String[] str1 = ["舟山","丽水","杭州","绍兴","金华","淮南","宣城","宿州","池州","宁德"] - String[] str2 = ["宁波","温州","嘉兴","阜阳","黄山","亳州","蚌埠","滁州","铜陵","三明"] - String[] str3 = ["台州","湖州","衢州","安庆","六安","淮北","合肥","芜湖","马鞍山","南平"] + String[] str1 = ["鑸熷北","涓芥按","鏉窞","缁嶅叴","閲戝崕","娣崡","瀹e煄","瀹垮窞","姹犲窞","瀹佸痉"] + String[] str2 = ["瀹佹尝","娓╁窞","鍢夊叴","闃滈槼","榛勫北","浜冲窞","铓屽煚","婊佸窞","閾滈櫟","涓夋槑"] + String[] str3 = ["鍙板窞","婀栧窞","琛㈠窞","瀹夊簡","鍏畨","娣寳","鍚堣偉","鑺滄箹","椹瀺灞�","鍗楀钩"] String[] str4 = [] String[] str5 = [] String[] str6 = [] @@ -178,7 +178,7 @@ class GaodePOIFetchBatch { fixedThreadPool.shutdown(); } - //读取每个城市数组 + //璇诲彇姣忎釜鍩庡競鏁扮粍 def static cityArray(String[] citys){ for(int i=0;i boundsList = BOUNDS_COLL.find(q).sort(new BasicDBObject("index", 1)).toArray() println city + "\t" + boundsList.size() int c = 0; - //遍历某个城市的每一个格子 + //閬嶅巻鏌愪釜鍩庡競鐨勬瘡涓�涓牸瀛� for(DBObject obj : boundsList) { c++ if(c % 10 == 0) { @@ -206,20 +206,20 @@ class GaodePOIFetchBatch { } String logId = DigestUtils.md5Hex(city + obj.get('index')) - //从日志中查询这个城市的这个格子有没有运行 + //浠庢棩蹇椾腑鏌ヨ杩欎釜鍩庡競鐨勮繖涓牸瀛愭湁娌℃湁杩愯 DBObject logEntity = LOG_COLL.findOne(new BasicDBObject('_id', logId)) def boundBD = obj.get('bound_gd') String boundString = boundBD[0].toString()+","+boundBD[3].toString()+";"+boundBD[2].toString()+","+boundBD[1].toString() def countMap = [:] - //按照types和keyword来抓取 + //鎸夌収types鍜宬eyword鏉ユ姄鍙� for(String keyword : KEYWORDS) { - //判断日志中每个格子的每个关键字是否有进行查询 + //鍒ゆ柇鏃ュ織涓瘡涓牸瀛愮殑姣忎釜鍏抽敭瀛楁槸鍚︽湁杩涜鏌ヨ if(logEntity != null && logEntity.get('c_map') != null && logEntity.get('c_map').get(keyword) != null) { continue; } - //获取第一页数据 + //鑾峰彇绗竴椤垫暟鎹� countMap.put(keyword, 0) - //获取每个keyword的code + //鑾峰彇姣忎釜keyword鐨刢ode String keyWordTypeCode = KEYWORDS_MAP.get(keyword) if(keyWordTypeCode!=null){ JSONObject result = fetchPOIData(city,boundString, keyWordTypeCode, 0, true) @@ -231,9 +231,9 @@ class GaodePOIFetchBatch { if(count > 400){ println city +"\t" + keyword + "\t" + count } - countMap.put(keyword, countMap.get(keyword)+count)//将每个code或者key更行的数据放进数据map日子中 + countMap.put(keyword, countMap.get(keyword)+count)//灏嗘瘡涓猚ode鎴栬�卥ey鏇磋鐨勬暟鎹斁杩涙暟鎹甿ap鏃ュ瓙涓� if(count>PAGE_SIZE){ - //获取每一页 + //鑾峰彇姣忎竴椤� int totalPage = (count % PAGE_SIZE == 0 ? count / PAGE_SIZE : count / PAGE_SIZE + 1) for(int i = 1;i 400){ println city +"\t" + keyword + "\t" + count } - countMap.put(keyword, countMap.get(keyword)+count)//将每个code或者key更行的数据放进数据map日子中 + countMap.put(keyword, countMap.get(keyword)+count)//灏嗘瘡涓猚ode鎴栬�卥ey鏇磋鐨勬暟鎹斁杩涙暟鎹甿ap鏃ュ瓙涓� if(count>PAGE_SIZE){ - //获取每一页 + //鑾峰彇姣忎竴椤� int totalPage = (count % PAGE_SIZE == 0 ? count / PAGE_SIZE : count / PAGE_SIZE + 1) for(int i = 1;i 0) { DBObject logData = new BasicDBObject() logData.put('_id', logId) @@ -284,15 +284,15 @@ class GaodePOIFetchBatch { List calcCityBounds(String city) { DBObject latlng = LATLNG_COLL.findOne(new BasicDBObject('name', city)) if(latlng == null) { - println city + " -> 没有经纬度图形" + println city + " -> 娌℃湁缁忕含搴﹀浘褰�" return null; } def ret = [] - //数据库的城市bounds,是按照西北和东南点进行定位 + //鏁版嵁搴撶殑鍩庡競bounds,鏄寜鐓цタ鍖楀拰涓滃崡鐐硅繘琛屽畾浣� def arr = latlng.get('bounds').replaceAll('\\[|\\]','').split(',') Bounds cityBounds = new Bounds(arr[0].toDouble(), arr[3].toDouble(), arr[2].toDouble(), arr[1].toDouble()) - //将城市西南点作为起始点,从左至右,从下至上进行区块遍历 + //灏嗗煄甯傝タ鍗楃偣浣滀负璧峰鐐�,浠庡乏鑷冲彸锛屼粠涓嬭嚦涓婅繘琛屽尯鍧楅亶鍘� def boundsList = getBoundsList(cityBounds, 1000); int k = 0 for (int i = 0; i < boundsList.size(); i++) { @@ -318,14 +318,14 @@ class GaodePOIFetchBatch { } /** - * 区块数据 - * @param cityBounds 城市bounds - * @param offset 偏移距离(米) - * @return 以row/column的方式返回Bounds数组 + * 鍖哄潡鏁版嵁 + * @param cityBounds 鍩庡競bounds + * @param offset 鍋忕Щ璺濈(绫�) + * @return 浠ow/column鐨勬柟寮忚繑鍥濨ounds鏁扮粍 */ List> getBoundsList(Bounds cityBounds, int offset) { // println city + "\t" + cityBounds.toString() - //将城市西南点作为起始点,从左至右,从下至上进去区块遍历 + //灏嗗煄甯傝タ鍗楃偣浣滀负璧峰鐐�,浠庡乏鑷冲彸锛屼粠涓嬭嚦涓婅繘鍘诲尯鍧楅亶鍘� double seedLng = cityBounds.getWS()[0] double seedLat = cityBounds.getWS()[1] @@ -334,8 +334,8 @@ class GaodePOIFetchBatch { Bounds bounds = null; def columns = [] while (seedLng < cityBounds.getMaxLng()) { - double[] esp = GeoUtils.getLatLon(seedLng, seedLat, offset, 90) // 右侧OFFSET处的经纬度 - double[] wnp = GeoUtils.getLatLon(seedLng, seedLat, offset, 360) // 上方OFFSET处的经纬度 + double[] esp = GeoUtils.getLatLon(seedLng, seedLat, offset, 90) // 鍙充晶OFFSET澶勭殑缁忕含搴� + double[] wnp = GeoUtils.getLatLon(seedLng, seedLat, offset, 360) // 涓婃柟OFFSET澶勭殑缁忕含搴� bounds = new Bounds(wnp[0], esp[1], esp[0], wnp[1]) columns << bounds seedLng = bounds.getES()[0] @@ -491,7 +491,7 @@ class GaodePOIFetchBatch { } } - //处理高德抓取结果,将一些字段为空数组的变成null + //澶勭悊楂樺痉鎶撳彇缁撴灉锛屽皢涓�浜涘瓧娈典负绌烘暟缁勭殑鍙樻垚null static def cancelEmpetyProperty(JSONObject obj){ List keyList = new ArrayList() Iterator it = obj.keys() @@ -549,7 +549,7 @@ class GaodePOIFetchBatch { def ak = getEnableAk() def params = [:]; - //注意百度最多支持10个关键字搜索,这里的keywords不要超过10个 + //娉ㄦ剰鐧惧害鏈�澶氭敮鎸�10涓叧閿瓧鎼滅储,杩欓噷鐨刱eywords涓嶈瓒呰繃10涓� if(isTypeCode){ params.types = keyword }else{ @@ -575,24 +575,24 @@ class GaodePOIFetchBatch { int status = result.getInt("status") if (status == 1) { return result; - }else if (status ==0 && result.get("infocode").equals("10003")) {//判断key是否过期或者次数用完了 + }else if (status ==0 && result.get("infocode").equals("10003")) {//鍒ゆ柇key鏄惁杩囨湡鎴栬�呮鏁扮敤瀹屼簡 AKS[ak] = false; continue; - }else if (status ==0 && result.get("infocode").equals("10004")) {//单位时间内访问过于平凡 - println (status + "\t状态错误\t" + result.get("info")) + }else if (status ==0 && result.get("infocode").equals("10004")) {//鍗曚綅鏃堕棿鍐呰闂繃浜庡钩鍑� + println (status + "\t鐘舵�侀敊璇痋t" + result.get("info")) continue; - }else if (status ==0 && result.get("infocode").equals("20003")) {//未知错误 + }else if (status ==0 && result.get("infocode").equals("20003")) {//鏈煡閿欒 times++; - println (status + "\t状态错误\t" + result.get("info")+"\t边界\t"+boundString+"\t边界\t"+keyword+city) + println (status + "\t鐘舵�侀敊璇痋t" + result.get("info")+"\t杈圭晫\t"+boundString+"\t杈圭晫\t"+keyword+city) if(times<=10){ continue; } return null; } else { - println (status + "\t状态错误\t" + result.get("info")+"\t边界\t"+boundString+"\t边界\t"+keyword+city) + println (status + "\t鐘舵�侀敊璇痋t" + result.get("info")+"\t杈圭晫\t"+boundString+"\t杈圭晫\t"+keyword+city) } } catch (Exception e) { - println "*****程序退出******" + println "*****绋嬪簭閫�鍑�******" throw e; } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/GetDistrictAddressFromMapApi.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/GetDistrictAddressFromMapApi.groovy index aabffcde7..27e0c8079 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/GetDistrictAddressFromMapApi.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/GetDistrictAddressFromMapApi.groovy @@ -38,7 +38,7 @@ class GetDistrictAddressFromMapApi { private static final Pattern CHARSET_PATTERN = Pattern.compile('', Pattern.CASE_INSENSITIVE); static main(args) { - //searchAddressFromThreeMap("黄山") + //searchAddressFromThreeMap("榛勫北") /*List> logList = new ArrayList(); List item = new ArrayList<>(); item.add(1111) @@ -50,12 +50,12 @@ class GetDistrictAddressFromMapApi { item.add("000") logList.add(item) exportAddressCompareData(logList)*/ - //useThreeApiGetAddress("罗湖山庄", "黄山", "歙县") - //println samePecentString("黄山区清溪","","","黄山","黄山区") + //useThreeApiGetAddress("缃楁箹灞卞簞", "榛勫北", "姝欏幙") + //println samePecentString("榛勫北鍖烘竻婧�","","","榛勫北","榛勫北鍖�") getDateFromLog() } - //从数据苦衷查询数据 + //浠庢暟鎹嫤琛锋煡璇㈡暟鎹� def static getDateFromLog(){ DBCursor cur = address_update.find() List logList = new ArrayList() @@ -78,8 +78,8 @@ class GetDistrictAddressFromMapApi { if(dbList!=null&&dbList.size()>0){ DBObject haha= dbList.get(0) if(haha.get("address")!=null){ - if(haha.get("address").startsWith("东路")||haha.get("address").startsWith("西路") - ||haha.get("address").startsWith("南路")||haha.get("address").startsWith("北路")||haha.get("address").startsWith("中路")){ + if(haha.get("address").startsWith("涓滆矾")||haha.get("address").startsWith("瑗胯矾") + ||haha.get("address").startsWith("鍗楄矾")||haha.get("address").startsWith("鍖楄矾")||haha.get("address").startsWith("涓矾")){ log.append("address",haha.get("address")) log.append("region",haha.get("region")) lastData.add(log) @@ -104,7 +104,7 @@ class GetDistrictAddressFromMapApi { } - //数据导出 + //鏁版嵁瀵煎嚭 def static exportAddressCompareData1(List> list){ List> addHeadList =new ArrayList() List headList = new ArrayList() @@ -118,7 +118,7 @@ class GetDistrictAddressFromMapApi { } - //查询某个城市小区三个地图的地址 + //鏌ヨ鏌愪釜鍩庡競灏忓尯涓変釜鍦板浘鐨勫湴鍧� def static searchAddressFromThreeMap(String city){ List> logList = new ArrayList(); BasicDBObject query = new BasicDBObject() @@ -126,39 +126,39 @@ class GetDistrictAddressFromMapApi { query.append("visible", 0) query.append("cat", "district") DbUtils.seaweed.find(query).each {BasicDBObject it-> - //删除苦衷小区有精确地址的 + //鍒犻櫎鑻﹁》灏忓尯鏈夌簿纭湴鍧�鐨� if(!DataUtil.isPreciseAddress(it.get("address"))){ - //将小区名字,别名取出来 + //灏嗗皬鍖哄悕瀛楋紝鍒悕鍙栧嚭鏉� String districtName = it.get("name") String[] aliaNames = null if(it.get("alias")!=null){ aliaNames = it.get("alias").toArray() } - //通过小区名字来查询小区地址 - //通过百度地图 + //閫氳繃灏忓尯鍚嶅瓧鏉ユ煡璇㈠皬鍖哄湴鍧� + //閫氳繃鐧惧害鍦板浘 def baiduBean = null String baiduAddress = null; baiduBean = getAddressByBaiDuApiTest(city,districtName) if(baiduBean!=null){ baiduAddress = baiduBean.get("address") } - //通过高德地图 + //閫氳繃楂樺痉鍦板浘 def gaodeBean = null String gaodeAddress = null; gaodeBean = getAddressByGaoDeApiTest(city, districtName, aliaNames, it.get("region")) if(gaodeBean!=null){ gaodeAddress = gaodeBean.get("address") } - //通过腾讯地图 + //閫氳繃鑵捐鍦板浘 def tengxunBean = null String tengxunAddress = null; tengxunBean = getAddressByTengXunApiTest(city,districtName,aliaNames,it.get("region")) if(tengxunBean!=null){ tengxunAddress = tengxunBean.get("address") } - //将三个地图的address进行比较 + //灏嗕笁涓湴鍥剧殑address杩涜姣旇緝 String same = samePecentString(baiduAddress,gaodeAddress,tengxunAddress,city,it.get("region")) - //判断地址中是否包含小区名称 + //鍒ゆ柇鍦板潃涓槸鍚﹀寘鍚皬鍖哄悕绉� String contain = null if(baiduAddress!=null&&baiduAddress.contains(districtName)){ contain = "baidu+" @@ -170,7 +170,7 @@ class GetDistrictAddressFromMapApi { contain = contain+"tengxun" } - //将三个地址进行比较放进list中 + //灏嗕笁涓湴鍧�杩涜姣旇緝鏀捐繘list涓� List item = new ArrayList<>(); item.add(it.get("_id").toString()) item.add(districtName) @@ -187,9 +187,9 @@ class GetDistrictAddressFromMapApi { exportAddressCompareData(logList) } - //三个地址进行对比,看匹配度 + //涓変釜鍦板潃杩涜瀵规瘮锛岀湅鍖归厤搴� def static samePecentString(String baiduAddress,String gaodeAddress,String tengxunAddress,String city,String district){ - //判断三个钟是否有精准的地址,如果精确就返回 + //鍒ゆ柇涓変釜閽熸槸鍚︽湁绮惧噯鐨勫湴鍧�,濡傛灉绮剧‘灏辫繑鍥� baiduAddress = DataUtil.formateAddress(city,baiduAddress) gaodeAddress = DataUtil.formateAddress(city,gaodeAddress) tengxunAddress = DataUtil.formateAddress(city,tengxunAddress) @@ -202,7 +202,7 @@ class GetDistrictAddressFromMapApi { else if(DataUtil.isPreciseAddress(tengxunAddress)){ return "tengxun" } - //若果三个都不精确,就进行匹配,找出最匹配的两个 + //鑻ユ灉涓変釜閮戒笉绮剧‘锛屽氨杩涜鍖归厤,鎵惧嚭鏈�鍖归厤鐨勪袱涓� else{ if(baiduAddress==null&&gaodeAddress==null&&tengxunAddress==null){ return null @@ -230,7 +230,7 @@ class GetDistrictAddressFromMapApi { } } - //三个中有两个不为空 + //涓変釜涓湁涓や釜涓嶄负绌� def static twoHave(String baiduAddress,String gaodeAddress,String tengxunAddress){ int i=0; if(baiduAddress!=null&&!("".equals(baiduAddress))){ @@ -244,7 +244,7 @@ class GetDistrictAddressFromMapApi { } return i } - //三个字符串进行比较 + //涓変釜瀛楃涓茶繘琛屾瘮杈� def static comparePecent(String baiduAddress,String gaodeAddress,String tengxunAddress){ List baiduList = splitString(baiduAddress) @@ -272,7 +272,7 @@ class GetDistrictAddressFromMapApi { int baidu_gaode = ((bg*200)/bgtotal) int baidu_tengxun = ((bt*200)/bttotal) int gaode_tengxun = ((gt*200)/gttotal) - //相似的比例 + //鐩镐技鐨勬瘮渚� Map map = new HashMap(); map.put("baidu_gaode", baidu_gaode) map.put("baidu_tengxun", baidu_tengxun) @@ -280,7 +280,7 @@ class GetDistrictAddressFromMapApi { return map } - //分割字符串放进list中 + //鍒嗗壊瀛楃涓叉斁杩沴ist涓� def static splitString(String str){ List list = new ArrayList() if(str!=null){ @@ -291,24 +291,24 @@ class GetDistrictAddressFromMapApi { return list; } - //调用API获取地址 + //璋冪敤API鑾峰彇鍦板潃 def static useThreeApiGetAddress(String name,String city,String district){ - //通过小区名字来查询小区地址 - //通过百度地图 + //閫氳繃灏忓尯鍚嶅瓧鏉ユ煡璇㈠皬鍖哄湴鍧� + //閫氳繃鐧惧害鍦板浘 def baiduBean = null String baiduAddress = null; baiduBean = getAddressByBaiDuApiTest(city,name) if(baiduBean!=null){ baiduAddress = baiduBean.get("address") } - //通过高德地图 + //閫氳繃楂樺痉鍦板浘 def gaodeBean = null String gaodeAddress = null; gaodeBean = getAddressByGaoDeApiTest(city, name, null, district) if(gaodeBean!=null){ gaodeAddress = gaodeBean.get("address") } - //通过腾讯地图 + //閫氳繃鑵捐鍦板浘 def tengxunBean = null String tengxunAddress = null; tengxunBean = getAddressByTengXunApiTest(city,name,null,district) @@ -323,7 +323,7 @@ class GetDistrictAddressFromMapApi { - //数据导出 + //鏁版嵁瀵煎嚭 def static exportAddressCompareData(List> list){ List> addHeadList =new ArrayList() List headList = new ArrayList() @@ -343,11 +343,11 @@ class GetDistrictAddressFromMapApi { - //对数据库中的小区地址进行更新 + //瀵规暟鎹簱涓殑灏忓尯鍦板潃杩涜鏇存柊 def static updateAddressToMongoDB(String city){ - //创建一个记录更新日志的List + //鍒涘缓涓�涓褰曟洿鏂版棩蹇楃殑List List> logList = new ArrayList(); - //根据城市将数据库中的数据取出来, + //鏍规嵁鍩庡競灏嗘暟鎹簱涓殑鏁版嵁鍙栧嚭鏉ワ紝 BasicDBObject query = new BasicDBObject() query.append("city", city) query.append("visible", 0) @@ -355,13 +355,13 @@ class GetDistrictAddressFromMapApi { DbUtils.seaweed.find(query).each{BasicDBObject it-> - if(!DataUtil.isPreciseAddress(it.get("address"))){//判断地址是不是精确的地址 + if(!DataUtil.isPreciseAddress(it.get("address"))){//鍒ゆ柇鍦板潃鏄笉鏄簿纭殑鍦板潃 String[] strs = null; if(it.get("alias")!=null){ strs = it.get("alias").toArray() } def bean = null; - // 高德地图 + // 楂樺痉鍦板浘 try{ bean = getAddressByGaoDeApiTest(city, it.get("name"), strs, it.get("region")) }catch(Exception e){ @@ -371,13 +371,13 @@ class GetDistrictAddressFromMapApi { if(bean!=null){ addressFromApi = bean.get("address") } - String preciseAddress=null//精确地址 + String preciseAddress=null//绮剧‘鍦板潃 String handledAddress = DataUtil.formateAddress(city,addressFromApi) - if(handledAddress!=null&&DataUtil.isPreciseAddress(handledAddress)){//如果处理后的地址部位空,并且获得紧缺地址 + if(handledAddress!=null&&DataUtil.isPreciseAddress(handledAddress)){//濡傛灉澶勭悊鍚庣殑鍦板潃閮ㄤ綅绌猴紝骞朵笖鑾峰緱绱х己鍦板潃 preciseAddress = handledAddress - }else{//用腾讯来处理 + }else{//鐢ㄨ吘璁潵澶勭悊 try{ - bean = getAddressByTengXunApiTest(city,it.get("name"),strs,it.get("region"))//用腾讯地图进行获取数据 + bean = getAddressByTengXunApiTest(city,it.get("name"),strs,it.get("region"))//鐢ㄨ吘璁湴鍥捐繘琛岃幏鍙栨暟鎹� }catch(Exception e){ e.printStackTrace() } @@ -387,9 +387,9 @@ class GetDistrictAddressFromMapApi { handledAddress = DataUtil.formateAddress(city,addressFromApi) if(handledAddress!=null&&DataUtil.isPreciseAddress(handledAddress)){ preciseAddress = handledAddress - }else{//用百度进行处理 + }else{//鐢ㄧ櫨搴﹁繘琛屽鐞� try{ - bean = getAddressByBaiDuApiTest(city,it.get("name"))//用百度地图进行获取数据 + bean = getAddressByBaiDuApiTest(city,it.get("name"))//鐢ㄧ櫨搴﹀湴鍥捐繘琛岃幏鍙栨暟鎹� }catch(Exception e){ e.printStackTrace() } @@ -402,9 +402,9 @@ class GetDistrictAddressFromMapApi { } } } - if(preciseAddress!=null){//是精确地址的话就更新进数据库 + if(preciseAddress!=null){//鏄簿纭湴鍧�鐨勮瘽灏辨洿鏂拌繘鏁版嵁搴� if(isBetterPreciseAddress(preciseAddress,it.get("name"))){ - //对数据库中的数据进行更新 + //瀵规暟鎹簱涓殑鏁版嵁杩涜鏇存柊 try{ String str = updateById(it.get("_id"),preciseAddress) ArrayList tempList = new ArrayList() @@ -420,7 +420,7 @@ class GetDistrictAddressFromMapApi { ExcelUtils.write("E:\\hbl\\work\\addresslog1\\"+city+"log.xlsx", logList, "sheet1") } - //根据id进行更新address + //鏍规嵁id杩涜鏇存柊address def static updateById(def id,String address){ BasicDBObject queryCondition = new BasicDBObject("_id",id); BasicDBObject updateData = new BasicDBObject("address",address) @@ -428,13 +428,13 @@ class GetDistrictAddressFromMapApi { BasicDBObject update = new BasicDBObject() update.put('$set', updateData) DbUtils.seaweed.update(queryCondition, update) - //输出一个修改日志 + //杈撳嚭涓�涓慨鏀规棩蹇� String str = queryCondition.toString()+"_____"+update.toString() println queryCondition.toString()+"_____"+update.toString() return str } - //同时通过百度 高德 腾讯地图来处理 并且导入excel中 + //鍚屾椂閫氳繃鐧惧害 楂樺痉 鑵捐鍦板浘鏉ュ鐞� 骞朵笖瀵煎叆excel涓� def static updataDataToMogoDB(String city){ List> readList = ExcelUtils.read("E:\\hbl\\work\\"+city+"date\\"+city+".xlsx") for(int i=0;i> addHeadList =new ArrayList() List headList = new ArrayList() headList.add("ID") @@ -510,12 +510,12 @@ class GetDistrictAddressFromMapApi { ExcelUtils.write("E:\\hbl\\work\\"+city+"date\\"+city+"handle.xlsx", addHeadList, "sheet1") } - //对preciseAddress进行进一步的判断 + //瀵筽reciseAddress杩涜杩涗竴姝ョ殑鍒ゆ柇 public static isBetterPreciseAddress(String address,String name){ - if(address.endsWith("号")||address.endsWith("弄")||address.endsWith("支")){//要以号结尾 - if(address.indexOf(",")==-1 && address.indexOf("、")==-1){//地址中不能包含某些标点 - if(!address.contains(name)){//地址中不能包含小区名字 - if((!address.contains("与"))&&(!address.contains("其他"))&&(!isNumeric(address))){//当地址中有与字并且不能有其他两字,不能只包含数字和号 + if(address.endsWith("鍙�")||address.endsWith("寮�")||address.endsWith("鏀�")){//瑕佷互鍙风粨灏� + if(address.indexOf(",")==-1 && address.indexOf("銆�")==-1){//鍦板潃涓笉鑳藉寘鍚煇浜涙爣鐐� + if(!address.contains(name)){//鍦板潃涓笉鑳藉寘鍚皬鍖哄悕瀛� + if((!address.contains("涓�"))&&(!address.contains("鍏朵粬"))&&(!isNumeric(address))){//褰撳湴鍧�涓湁涓庡瓧骞朵笖涓嶈兘鏈夊叾浠栦袱瀛楋紝涓嶈兘鍙寘鍚暟瀛楀拰鍙� return true } } @@ -524,10 +524,10 @@ class GetDistrictAddressFromMapApi { return false } - //判断字符串中是否只有数字和号、弄 + //鍒ゆ柇瀛楃涓蹭腑鏄惁鍙湁鏁板瓧鍜屽彿銆佸紕 public static boolean isNumeric(String str){ - String handledStr = str.replaceAll("号", "") - handledStr = handledStr.replaceAll("弄", "") + String handledStr = str.replaceAll("鍙�", "") + handledStr = handledStr.replaceAll("寮�", "") Pattern pattern = Pattern.compile("[0-9]*"); Matcher isNum = pattern.matcher(handledStr); if( !isNum.matches() ) @@ -537,7 +537,7 @@ class GetDistrictAddressFromMapApi { return true; } - //根据高德api获取地址 + //鏍规嵁楂樺痉api鑾峰彇鍦板潃 def static getAddressByGaoDeApiTest(String city, String name, String[] alias, String region) { def bean = [:] JSONObject json = GaoDeApiUtils.search(endWiths(name), city) @@ -584,7 +584,7 @@ class GetDistrictAddressFromMapApi { return null } - //根据腾讯API获取地址 + //鏍规嵁鑵捐API鑾峰彇鍦板潃 def static getAddressByTengXunApiTest(String city, String name, String[] alias, String region) { def bean = [:] JSONObject json = TengXunApiUtils.search(city, name) @@ -630,12 +630,12 @@ class GetDistrictAddressFromMapApi { } - //通过百度api获取地址 + //閫氳繃鐧惧害api鑾峰彇鍦板潃 def static getAddressByBaiDuApiTest(String city, String disName) { def bean = [:] try { disName = formatName(disName) - JSONObject json = BaiDuApiUtils.search(city, disName, "住宅区", 1, 20, 0) + JSONObject json = BaiDuApiUtils.search(city, disName, "浣忓畢鍖�", 1, 20, 0) if(json.getInt("status") == 0) { JSONArray array = json.getJSONArray("results") if(array.size()!=0) { @@ -740,8 +740,8 @@ class GetDistrictAddressFromMapApi { if(name.indexOf(".") != -1) { name = name.replace(".", "") } - if(name.indexOf("·") != -1){ - name=name.replace("·", "") + if(name.indexOf("路") != -1){ + name=name.replace("路", "") } if(name.indexOf("(") != -1) { name = name.replace("(", "") @@ -754,21 +754,21 @@ class GetDistrictAddressFromMapApi { def static getSimpleName(String name) { name = formatName(name) - if(name.endsWith("小区") || name.endsWith("公寓") || name.endsWith("别墅")) { + if(name.endsWith("灏忓尯") || name.endsWith("鍏瘬") || name.endsWith("鍒")) { name = name.substring(0, name.length() - 2) } - if(name.endsWith("一期") || name.endsWith("二期") || name.endsWith("三期") || name.endsWith("四期") - || name.endsWith("五期") || name.endsWith("六期") || name.endsWith("七期") || name.endsWith("八期") - || name.endsWith("九期") || name.endsWith("十期") ){ + if(name.endsWith("涓�鏈�") || name.endsWith("浜屾湡") || name.endsWith("涓夋湡") || name.endsWith("鍥涙湡") + || name.endsWith("浜旀湡") || name.endsWith("鍏湡") || name.endsWith("涓冩湡") || name.endsWith("鍏湡") + || name.endsWith("涔濇湡") || name.endsWith("鍗佹湡") ){ name = name.substring(0, name.length() - 2) } return name } def static endWiths(String name) { - if(name.endsWith("一期") || name.endsWith("二期") || name.endsWith("三期") || name.endsWith("四期") - || name.endsWith("五期") || name.endsWith("六期") || name.endsWith("七期") || name.endsWith("八期") - || name.endsWith("九期") || name.endsWith("十期") ){ + if(name.endsWith("涓�鏈�") || name.endsWith("浜屾湡") || name.endsWith("涓夋湡") || name.endsWith("鍥涙湡") + || name.endsWith("浜旀湡") || name.endsWith("鍏湡") || name.endsWith("涓冩湡") || name.endsWith("鍏湡") + || name.endsWith("涔濇湡") || name.endsWith("鍗佹湡") ){ name = name.substring(0, name.length() - 2) } Matcher matcher = CHARSET_PATTERN.matcher(name); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/HangZhouFuZhuSaleData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/HangZhouFuZhuSaleData.groovy index 8c3f808da..4a889ba9b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/HangZhouFuZhuSaleData.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/HangZhouFuZhuSaleData.groovy @@ -14,7 +14,7 @@ import com.mongodb.DBCursor import com.mongodb.DBObject /** - * 成交量相关 + * 鎴愪氦閲忕浉鍏� * @author hubingliang * */ @@ -24,7 +24,7 @@ class HangZhouFuZhuSaleData{ public static final DBCollection SALE_DATA_STAT = MongoUtils.getCollectionByName("fangjia_base", "sale_data_stat", "mongo.db.fangjia.com", 27017) static main(args) { - exportData("上海") + exportData("涓婃捣") } @@ -57,19 +57,19 @@ class HangZhouFuZhuSaleData{ exportData(city,ls); } - //获取某月二手房成交量 + //鑾峰彇鏌愭湀浜屾墜鎴挎垚浜ら噺 public static Integer oldHouseSell(String city,String region,String name,Date appointDate,Date nextMonth){ BasicDBObject query= new BasicDBObject().append("city", city).append("region",region).append("district_name", name).append("trade_date", new BasicDBObject('$gt',appointDate).append('$lt', nextMonth)); long monthCount = DEAL_PRICE.count(query); return (Integer)monthCount; } - //上海小区半年内二手成交量 dateStr(yyyy-MM-dd) + //涓婃捣灏忓尯鍗婂勾鍐呬簩鎵嬫垚浜ら噺 dateStr(yyyy-MM-dd) public static List citySell(List results,DBObject dis,String dateStr){ String city = dis.get("city"); String region = dis.get("region"); String name = dis.get("name"); - //获取2016年7月1号 和下一个月的时间 + //鑾峰彇2016骞�7鏈�1鍙� 鍜屼笅涓�涓湀鐨勬椂闂� if(StringUtils.isNotBlank(city)&&StringUtils.isNotBlank(region)&&StringUtils.isNotBlank(name)){ Date appointDate = DateUtils.parseFromTightYYYYMMDD(dateStr); for(int i=1;i<8;i++){ @@ -91,7 +91,7 @@ class HangZhouFuZhuSaleData{ return results; } - //获取某月1手房成交量 + //鑾峰彇鏌愭湀1鎵嬫埧鎴愪氦閲� public static Integer newHouseSell(String city,String region,String name,Date appointDate,Date nextMonth){ String dateStr = DateUtils.formatDateByPattern(appointDate, "yyyy-MM"); dateStr = dateStr.replace("-", ""); @@ -109,7 +109,7 @@ class HangZhouFuZhuSaleData{ - //获取全国城市 + //鑾峰彇鍏ㄥ浗鍩庡競 public static List getCitys(){ List citys = new ArrayList(); DBCursor dbs = SERVER_AREA.find(); @@ -122,7 +122,7 @@ class HangZhouFuZhuSaleData{ } /** - * 获取城市的小区 + * 鑾峰彇鍩庡競鐨勫皬鍖� * @param city * @return */ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/Hu.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/Hu.groovy index f61272841..d88939109 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/Hu.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/Hu.groovy @@ -20,7 +20,7 @@ import org.apache.solr.client.solrj.util.ClientUtils class Hu { static main(args) { - println (findHouses("安庆","迎江",[],"滨江至尊",[],20171205)) + println (findHouses("瀹夊簡","杩庢睙",[],"婊ㄦ睙鑷冲皧",[],20171205)) } public static def findHouses(String city,String region,List regionAlias,String name,List alias,Integer startDate){ def nameList = getNameList(name, alias); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/HuExportData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/HuExportData.groovy index 27e803ca1..5205e67c2 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/HuExportData.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/HuExportData.groovy @@ -35,13 +35,13 @@ class HuExportData { public static getBeforeSunday(){ Calendar date=Calendar.getInstance(Locale.CHINA); - date.setFirstDayOfWeek(Calendar.MONDAY);//将每周第一天设为星期一,默认是星期天 - date.add(Calendar.WEEK_OF_MONTH,-1);//周数减一,即上周 - date.set(Calendar.DAY_OF_WEEK, Calendar.SUNDAY);//日子设为星期天 + date.setFirstDayOfWeek(Calendar.MONDAY);//灏嗘瘡鍛ㄧ涓�澶╄涓烘槦鏈熶竴锛岄粯璁ゆ槸鏄熸湡澶� + date.add(Calendar.WEEK_OF_MONTH,-1);//鍛ㄦ暟鍑忎竴锛屽嵆涓婂懆 + date.set(Calendar.DAY_OF_WEEK, Calendar.SUNDAY);//鏃ュ瓙璁句负鏄熸湡澶� return DateUtils.parseFromTightYYYYMMDD(DateUtils.formatToYYYYMMDD(date.getTime())); } /** - * cpdb排名 + * cpdb鎺掑悕 * @return */ def static exportCpdbPrice(Integer oldDate,Integer newDate){ @@ -69,7 +69,7 @@ class HuExportData { } /** - * 小区得分在城市排名 + * 灏忓尯寰楀垎鍦ㄥ煄甯傛帓鍚� * @return */ def static exportCityScoreLevel(String city,Integer oldDate,Integer newDate){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/HuShuTianCongBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/HuShuTianCongBatch.groovy index a2aa65cc4..3ee390151 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/HuShuTianCongBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/HuShuTianCongBatch.groovy @@ -36,7 +36,7 @@ import com.mongodb.Mongo import org.apache.commons.lang.StringUtils /** - * 定时更新小区地址数据 + * 瀹氭椂鏇存柊灏忓尯鍦板潃鏁版嵁 * @author hubingliang * */ @@ -45,12 +45,12 @@ class HuShuTianCongBatch{ public static final DBCollection SERVER_AREA = MongoUtils.getCollectionByName("fangjia", "server_area", "mongo.db.fangjia.com", 27017) static main(args) { - //updateDis("上海", "浦东", "沙田公寓") + //updateDis("涓婃捣", "娴︿笢", "娌欑敯鍏瘬") - huShuTianCong("北京", "D:\\hbl\\户数入库\\data1\\北京.xlsx",0); - huShuTianCong("广州", "D:\\hbl\\户数入库\\data1\\广州.xlsx",0); - huShuTianCong("深圳", "D:\\hbl\\户数入库\\data1\\深圳.xlsx",0); - huShuTianCong("杭州", "D:\\hbl\\户数入库\\data1\\杭州.xlsx",0); + huShuTianCong("鍖椾含", "D:\\hbl\\鎴锋暟鍏ュ簱\\data1\\鍖椾含.xlsx",0); + huShuTianCong("骞垮窞", "D:\\hbl\\鎴锋暟鍏ュ簱\\data1\\骞垮窞.xlsx",0); + huShuTianCong("娣卞湷", "D:\\hbl\\鎴锋暟鍏ュ簱\\data1\\娣卞湷.xlsx",0); + huShuTianCong("鏉窞", "D:\\hbl\\鎴锋暟鍏ュ簱\\data1\\鏉窞.xlsx",0); } @@ -63,13 +63,13 @@ class HuShuTianCongBatch{ List> lists = ExcelUtils.read(fileName,num); int i = 0; for(List list:lists){ - //匹配小区 + //鍖归厤灏忓尯 Map map = matchRes(list); Double hc = list.get(4); if(map!=null){ String region =map.get("region"); String name =map.get("name"); - //查询小区并进行更新 + //鏌ヨ灏忓尯骞惰繘琛屾洿鏂� DBObject dis = updateHuShuToSeaweed(city,region,name); if(dis!=null){ boolean isUpdate = updateDis(dis, hc); @@ -96,7 +96,7 @@ class HuShuTianCongBatch{ Integer houseHold=dis.get("household_count"); if(houseHold==null||houseHold matchPreAddress(String city,String region,String address){ JSONObject result = OpenApiClient.addressMatch(city,address,"property",false,region,"strict"); @@ -287,7 +287,7 @@ class HuShuTianCongBatch{ } /** - * 匹配 + * 鍖归厤 * @param text * @return */ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/HuTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/HuTest.groovy index d1dd184a4..e81c764c1 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/HuTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/HuTest.groovy @@ -64,7 +64,7 @@ class HuTest { /** - * 查询小区量 + * 鏌ヨ灏忓尯閲� * @param db * @param startDate * @return @@ -138,12 +138,12 @@ class HuTest { String fileId = file.get("_id"); def fileDetail = new BasicDBObject(); fileDetail.put("file_id", fileId); - fileDetail.put("address", "沙田公寓"); + fileDetail.put("address", "娌欑敯鍏瘬"); fileDetail.put("c_date", new Date()); FILE_DATA_DETAIL.save(fileDetail); def fileDetail1 = new BasicDBObject(); fileDetail1.put("file_id", fileId); - fileDetail1.put("address", "金港花园"); + fileDetail1.put("address", "閲戞腐鑺卞洯"); fileDetail1.put("c_date", new Date()); FILE_DATA_DETAIL.save(fileDetail1); @@ -162,7 +162,7 @@ class HuTest { public static void exportDistrictSellStat(){ def query = new BasicDBObject(); - query.put("city", "上海") + query.put("city", "涓婃捣") query.put("date", 201705) DBCursor dbs = DISTRICT_SELL_STAT.find(query); int i = 0 @@ -191,13 +191,13 @@ class HuTest { int i = 0 dbs.each {DBObject db -> println i++ - db.put("from", "中国司法网") + db.put("from", "涓浗鍙告硶缃�") ORIGINAL_PAGE.save(db) } } - //判断是不是有竣工时间 + //鍒ゆ柇鏄笉鏄湁绔e伐鏃堕棿 public static int hasBuildTime(DBObject obj){ if(StringUtils.isNotBlank(obj.get("finish_building_date"))){ return 1; @@ -206,7 +206,7 @@ class HuTest { } /** - * 获取城市的小区 + * 鑾峰彇鍩庡競鐨勫皬鍖� * @param city * @return */ @@ -222,15 +222,15 @@ class HuTest { public static void hu(){ BasicDBObject db = new BasicDBObject() - db.put("city", "上海"); - db.put("region","浦东"); - db.put("name", "沙田公寓"); + db.put("city", "涓婃捣"); + db.put("region","娴︿笢"); + db.put("name", "娌欑敯鍏瘬"); db.put("num", 100); db.put("date", 201702); BasicDBObject query = new BasicDBObject() - query.put("city", "上海"); - query.put("region","浦东"); - query.put("name", "沙田公寓"); + query.put("city", "涓婃捣"); + query.put("region","娴︿笢"); + query.put("name", "娌欑敯鍏瘬"); query.put("date", 201702); salelast.update(query, new BasicDBObject('$set', db), true, true); @@ -253,7 +253,7 @@ class HuTest { public static void household(){ BasicDBObject db = new BasicDBObject() - db.put("city", "上海"); + db.put("city", "涓婃捣"); db.put("date", 20170226); DBObject obj = Test.findOne(db); DISTRICT_STATISTICS.save(obj); @@ -261,7 +261,7 @@ class HuTest { public static void diyaRate(){ BasicDBObject db = new BasicDBObject() db.put("enterprise_id", "1234"); - db.put("usage", "消费"); + db.put("usage", "娑堣垂"); db.put("usage_rate",0.6d); db.put("score_max", 100d); db.put("score_min", 90d); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/HuanXianUpdate.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/HuanXianUpdate.groovy index 06abbd7c5..d3a1e2909 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/HuanXianUpdate.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/HuanXianUpdate.groovy @@ -30,7 +30,7 @@ import com.mongodb.DBObject class HuanXianUpdate { static main(args) { - String[] citys = ["北京"] + String[] citys = ["鍖椾含"] for(int i=0;i> logList = new ArrayList(); - //根据城市将数据库中的数据取出来, + //鏍规嵁鍩庡競灏嗘暟鎹簱涓殑鏁版嵁鍙栧嚭鏉ワ紝 BasicDBObject query = new BasicDBObject() query.append("city", city) query.append("visible", 0) query.append("cat", "district") DbUtils.seaweed.find(query).each{BasicDBObject it-> - //将不包含环字的给导出来 + //灏嗕笉鍖呭惈鐜瓧鐨勭粰瀵煎嚭鏉� List list = new ArrayList(); String loop_line_info = it.get("loop_line_info"); - if(loop_line_info!=null&&StringUtils.isNotBlank(loop_line_info)&&!(loop_line_info.contains("环"))){ + if(loop_line_info!=null&&StringUtils.isNotBlank(loop_line_info)&&!(loop_line_info.contains("鐜�"))){ println loop_line_info list.add(it.get("_id").toString()) list.add(it.get("city")) @@ -71,6 +71,6 @@ class HuanXianUpdate { headList.add("loop_line_info") addHeadList.add(headList) addHeadList.addAll(logList) - ExcelUtils.write("E:\\hbl\\work\\环线\\"+city+"handle.xlsx", addHeadList, "sheet1") + ExcelUtils.write("E:\\hbl\\work\\鐜嚎\\"+city+"handle.xlsx", addHeadList, "sheet1") } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/IndividuateEvaAndRegisterTimeStatistical.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/IndividuateEvaAndRegisterTimeStatistical.groovy index dcf8bd62f..5ca92c568 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/IndividuateEvaAndRegisterTimeStatistical.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/IndividuateEvaAndRegisterTimeStatistical.groovy @@ -33,7 +33,7 @@ import com.mongodb.Mongo import groovy.sql.Sql /** - * 每天获取注册人数和估价次数脚本 + * 姣忓ぉ鑾峰彇娉ㄥ唽浜烘暟鍜屼及浠锋鏁拌剼鏈� * @author hubingliang * */ @@ -48,7 +48,7 @@ class IndividuateEvaAndRegisterTimeStatistical extends BaseBatch{ static main(args) { def s = System.currentTimeMillis() runBatch(new IndividuateEvaAndRegisterTimeStatistical(), args) - println("运行时间:${(int) ((System.currentTimeMillis() - s)) / (1000 * 60)}分钟") + println("杩愯鏃堕棿:${(int) ((System.currentTimeMillis() - s)) / (1000 * 60)}鍒嗛挓") } @Override @@ -87,7 +87,7 @@ class IndividuateEvaAndRegisterTimeStatistical extends BaseBatch{ } - //获取凌晨当天和前一天凌晨时间 + //鑾峰彇鍑屾櫒褰撳ぉ鍜屽墠涓�澶╁噷鏅ㄦ椂闂� Date getToday(){ Date now = new Date(); Calendar cal = Calendar.getInstance(); @@ -101,7 +101,7 @@ class IndividuateEvaAndRegisterTimeStatistical extends BaseBatch{ return today; } - //获取当前系统前一天的时间 + //鑾峰彇褰撳墠绯荤粺鍓嶄竴澶╃殑鏃堕棿 Date getYestoday(Date date) { Calendar calendar = Calendar.getInstance(); calendar.setTime(date); @@ -109,7 +109,7 @@ class IndividuateEvaAndRegisterTimeStatistical extends BaseBatch{ date = calendar.getTime(); return date; } - //将日期格式化成字符串 + //灏嗘棩鏈熸牸寮忓寲鎴愬瓧绗︿覆 String paraseDateToString(Date date){ if (date == null){ return ""; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/MeiYouZhangFu.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/MeiYouZhangFu.groovy index beb5dda5a..b306ccb36 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/MeiYouZhangFu.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/MeiYouZhangFu.groovy @@ -17,7 +17,7 @@ import com.mongodb.BasicDBObject import com.mongodb.DBCollection import com.mongodb.DBObject /** - * 定时更新小区地址数据 + * 瀹氭椂鏇存柊灏忓尯鍦板潃鏁版嵁 * @author hubingliang * */ @@ -28,7 +28,7 @@ class MeiYouZhangFu{ public static final DBCollection DISTRICT_STAT = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "mongo.db.fangjia.com", 27017) static main(args) { - noYoy("上海"); + noYoy("涓婃捣"); } public static void noYoy(String city){ @@ -64,11 +64,11 @@ class MeiYouZhangFu{ exportData(city,ls); } def static exportData(String city,List> datas) { - ExcelUtils.write("D:\\hbl\\Data\\王萍\\20170309\\"+city+".xlsx", datas, "Sheet1") + ExcelUtils.write("D:\\hbl\\Data\\鐜嬭悕\\20170309\\"+city+".xlsx", datas, "Sheet1") } /** - * 判断小区是否有均价 + * 鍒ゆ柇灏忓尯鏄惁鏈夊潎浠� */ public static boolean noAvgPrice(String city,String region,String name,String dateStr){ Date date = DateUtils.parseFromTightYYYYMMDD(dateStr) @@ -89,7 +89,7 @@ class MeiYouZhangFu{ /** - * 查询是否有三种涨幅 + * 鏌ヨ鏄惁鏈変笁绉嶆定骞� */ public static boolean notHaveYoy(String city,String region,String name){ if(city==null||region==null||name==null){ @@ -111,7 +111,7 @@ class MeiYouZhangFu{ /** - * 获取城市的小区 + * 鑾峰彇鍩庡競鐨勫皬鍖� * @param city * @return */ @@ -125,7 +125,7 @@ class MeiYouZhangFu{ return dbs; } /** - *Date转化成String + *Date杞寲鎴怱tring */ public static String dateToString(Date date,String type){ if(date==null){ @@ -142,14 +142,14 @@ class MeiYouZhangFu{ format = DateFormat.getDateInstance(DateFormat.MEDIUM); str = format.format(date); } else if (type.equals("FULL")) { - // 2007年1月18日 星期四 + // 2007骞�1鏈�18鏃� 鏄熸湡鍥� format = DateFormat.getDateInstance(DateFormat.FULL); str = format.format(date); } return str; } /** - * 小区名址匹配 + * 灏忓尯鍚嶅潃鍖归厤 */ public static Map matchPreAddress(String city,String region,String address){ JSONObject result = OpenApiClient.addressMatch(city,address,"property",false,region,"strict"); @@ -167,7 +167,7 @@ class MeiYouZhangFu{ } /** - * 匹配 + * 鍖归厤 * @param text * @return */ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/MortgageType.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/MortgageType.groovy index bb4f9ee4c..de23adaa4 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/MortgageType.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/MortgageType.groovy @@ -15,7 +15,7 @@ import com.mongodb.DBObject class MortgageType { public static final DBCollection MORTGAGE_INFO = MongoUtils.getCollectionByName("fangjia_base", "mortgage_info", "192.168.0.136", 27017) - private static final String[] citys = ["杭州","上海"] + private static final String[] citys = ["鏉窞","涓婃捣"] static main(args) { mortgageData(); } @@ -30,7 +30,7 @@ class MortgageType { } } - //获取小区年涨跌幅 + //鑾峰彇灏忓尯骞存定璺屽箙 public static void mortgageData(){ int i=0 diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/NoNomalDis.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/NoNomalDis.groovy index c9e26258a..8a1e80079 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/NoNomalDis.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/NoNomalDis.groovy @@ -22,7 +22,7 @@ class NoNomalDis{ upDateFBD() } /** - * 修改竣工时间字段 + * 淇敼绔e伐鏃堕棿瀛楁 * @return */ def static upDateFBD(){ @@ -49,7 +49,7 @@ class NoNomalDis{ } } public static void updateDis(DBObject db){ - //更新数据的代码 + //鏇存柊鏁版嵁鐨勪唬鐮� Map mark_map = db.mark_map if(!mark_map){ mark_map = [:] @@ -61,7 +61,7 @@ class NoNomalDis{ } def static String needUpdate(String fbd){ if(StringUtils.isNotBlank(fbd)){ - Pattern pattern = Pattern.compile("\\d{4}年"); + Pattern pattern = Pattern.compile("\\d{4}骞�"); Matcher matcher = pattern.matcher(fbd); boolean rs = matcher.matches(); if(rs){ @@ -78,7 +78,7 @@ class NoNomalDis{ } /** - * 导出不规范的小区 + * 瀵煎嚭涓嶈鑼冪殑灏忓尯 * @return */ def static exportNoNomalDis(){ @@ -113,7 +113,7 @@ class NoNomalDis{ def static exportData(List> datas) { - ExcelUtils.write("D:\\hbl\\Data\\非标准竣工时间小区.xlsx", datas, "Sheet1") + ExcelUtils.write("D:\\hbl\\Data\\闈炴爣鍑嗙宸ユ椂闂村皬鍖�.xlsx", datas, "Sheet1") } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/OwnUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/OwnUtils.groovy index f35340d27..865af7d93 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/OwnUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/OwnUtils.groovy @@ -22,7 +22,7 @@ class OwnUtils { public static final DBCollection SERVER_AREA = MongoUtils.getCollectionByName("fangjia", "server_area", "mongo.db.fangjia.com", 27017) /** - * 对一个list进行多线程操作 + * 瀵逛竴涓猯ist杩涜澶氱嚎绋嬫搷浣� * @param list * @param c * @return @@ -46,7 +46,7 @@ class OwnUtils { } int p = process.getAndAdd(1) if(p % 100 == 0){ - println("${new Date().format("yyyy/MM/dd HH:mm:ss")} 执行进度:${DataUtil.getRound(2, (p * 100)/total)}%") + println("${new Date().format("yyyy/MM/dd HH:mm:ss")} 鎵ц杩涘害:${DataUtil.getRound(2, (p * 100)/total)}%") } }catch (Exception e){ println e @@ -57,13 +57,13 @@ class OwnUtils { executorService.shutdown() executorService.awaitTermination(10, TimeUnit.DAYS) if(updateCount != 0){ - println("总量:${total}\t更新:${updateCount}") + println("鎬婚噺:${total}\t鏇存柊:${updateCount}") } } /** - * 获取城市的小区 + * 鑾峰彇鍩庡競鐨勫皬鍖� * @param city * @return */ @@ -77,7 +77,7 @@ class OwnUtils { return dbs; } - //获取全国城市 + //鑾峰彇鍏ㄥ浗鍩庡競 public static List getCitys(){ List citys = new ArrayList(); DBCursor dbs = SERVER_AREA.find(); @@ -88,7 +88,7 @@ class OwnUtils { } return citys } - //获取全国城市 + //鑾峰彇鍏ㄥ浗鍩庡競 public static List getCityDistrictByFields(String city){ BasicDBObject qu = new BasicDBObject() qu.append("city", city) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/PDSDataTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/PDSDataTest.groovy index 04a889398..b926dc076 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/PDSDataTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/PDSDataTest.groovy @@ -28,26 +28,26 @@ class PDSDataTest { public static final DBCollection REGION_SELL_DATA = MongoUtils.getCollectionByName("fangjia_stat", "region_sell_stat", "192.168.0.136", 27017) public static final DBCollection DISTRICT_PRICE_STABILITY = MongoUtils.getCollectionByName("fangjia_stat", "distirct_price_stability", "192.168.0.136", 27017) - private static final String[] citys = ["杭州","上海"] + private static final String[] citys = ["鏉窞","涓婃捣"] static main(args) { - pdsData("上海"); + pdsData("涓婃捣"); } - //获取小区年涨跌幅 + //鑾峰彇灏忓尯骞存定璺屽箙 public static void pdsData(String city){ List list = new ArrayList(); BasicDBObject query = new BasicDBObject() query.append("city", city) query.append("visible", 0) query.append("cat", "district") - //城市年涨幅 + //鍩庡競骞存定骞� DBObject cSellD = CITY_SELL_DATA.findOne(getQuery(city, null, getLastMonthInt())); Double cityYoy=0d; if(cSellD!=null&&cSellD.get("yoy")!=null){ cityYoy = cSellD.get("yoy"); } - //区域年涨幅 + //鍖哄煙骞存定骞� DBCursor rSellDs = REGION_SELL_DATA.find(getQuery(city, null, getLastMonthInt())); Map rSellDMap = new HashMap(); while(rSellDs.hasNext()){ @@ -83,12 +83,12 @@ class PDSDataTest { }else{ obj.put("regionYoy", 0d); } - //城市差值 + //鍩庡競宸�� Double cityMinAbs =null; if(obj.get("yoy")!=null&&obj.get("cityYoy")!=null){ cityMinAbs = PdsUtils.getMinAbs(obj.get("yoy"), obj.get("cityYoy")); } - //区域差值 + //鍖哄煙宸�� Double regionMinAbs = null; if(obj.get("yoy")!=null&&obj.get("regionYoy")!=null){ regionMinAbs = PdsUtils.getMinAbs(obj.get("yoy"), obj.get("regionYoy")); @@ -128,11 +128,11 @@ class PDSDataTest { }else{ obj.put("regionMinAbsLevel",regionMinSize); } - //城市价格平稳度指数 + //鍩庡競浠锋牸骞崇ǔ搴︽寚鏁� Double cityStability = stabilityScore(obj,cityMinSize,"cityMinAbsLevel"); - //区域价格平稳度指数 + //鍖哄煙浠锋牸骞崇ǔ搴︽寚鏁� Double regionStability = stabilityScore(obj,regionMinSize,"regionMinAbsLevel"); - //价格异常指数 + //浠锋牸寮傚父鎸囨暟 Double priceStability = priceStabilityScore(cityStability,regionStability); obj.put("cityStability",cityStability); obj.put("regionStability",regionStability); @@ -169,7 +169,7 @@ class PDSDataTest { ExcelUtils.write("E:\\hbl\\work\\"+city+ "date\\"+city+".xlsx", datas, "Sheet1") } - //价格指数 + //浠锋牸鎸囨暟 public static double priceScore(Integer cityLevel,Integer cityTotal){ if(cityLevel==null||cityTotal==null){ @@ -183,13 +183,13 @@ class PDSDataTest { - //价格异常指数 + //浠锋牸寮傚父鎸囨暟 public static double priceStabilityScore(Double cityStability,Double regionStability ){ double score = PdsUtils.getPriceStability(cityStability, regionStability); return score; } - //价格平稳度指数 + //浠锋牸骞崇ǔ搴︽寚鏁� public static double stabilityScore(DBObject db,Integer all,String key){ Integer cityMinAbsLevel = db.get(key); double score = 0d; @@ -199,7 +199,7 @@ class PDSDataTest { return score; } - //list去重复 + //list鍘婚噸澶� public static List deleteSameCity(List list,String key){ List minAbsList = new ArrayList(); for(int i=0;i getMinAbslevelMap(List minAbsList){ Collections.sort(minAbsList,new Comparator(){ public int compare(Double o1, Double o2) { @@ -235,9 +235,9 @@ class PDSDataTest { - //获取城市年涨跌幅 + //鑾峰彇鍩庡競骞存定璺屽箙 - //获取区域年涨跌幅 + //鑾峰彇鍖哄煙骞存定璺屽箙 public static BasicDBObject getQuery(String city,String region,String name,Date date){ @@ -256,7 +256,7 @@ class PDSDataTest { query.append("date", date) } - //获取前一个月的Integer类型 + //鑾峰彇鍓嶄竴涓湀鐨処nteger绫诲瀷 public static Integer getLastMonthInt(){ Calendar calendar = Calendar.getInstance(); int lastMonth = calendar.get(Calendar.YEAR) * 100 + calendar.get(Calendar.MONTH); @@ -265,18 +265,18 @@ class PDSDataTest { } return lastMonth; } - //获取当月1号的时间 + //鑾峰彇褰撴湀1鍙风殑鏃堕棿 public static Date getMonthOne(){ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); - Calendar cal_1=Calendar.getInstance();//获取当前日期 + Calendar cal_1=Calendar.getInstance();//鑾峰彇褰撳墠鏃ユ湡 cal_1.add(Calendar.MONTH, -1); - cal_1.set(Calendar.DAY_OF_MONTH,1);//设置为1号,当前日期既为本月第一天 + cal_1.set(Calendar.DAY_OF_MONTH,1);//璁剧疆涓�1鍙�,褰撳墠鏃ユ湡鏃负鏈湀绗竴澶� String firstDay = format.format(cal_1.getTime()); Date date = format.parse(firstDay); return date; } - //list去重复 + //list鍘婚噸澶� private ArrayList RemoveDuplicateNum(ArrayList list){ for(int i=0;i> list = pdsData(citys[i]) @@ -48,18 +48,18 @@ class PdsDataToTest { List oneList = new ArrayList(); JSONObject result = search(it.get("city"),region,name); if(result!=null){ - Double collateralTotalScore = result.getDouble("collateralTotalScore");//总得分 - Double priceStability = result.getDouble("priceStability");//价格稳定度 + Double collateralTotalScore = result.getDouble("collateralTotalScore");//鎬诲緱鍒� + Double priceStability = result.getDouble("priceStability");//浠锋牸绋冲畾搴� BasicDBObject citySellStat = citysellstat.findOne(queryObject(city,null,null,201611)); - Double cityYoy= null; //城市涨幅 + Double cityYoy= null; //鍩庡競娑ㄥ箙 if(citySellStat!=null){ cityYoy = citySellStat.get("yoy"); } - Double handleDegreeScore = result.getDouble("handleDegreeScore");//处置难以度 + Double handleDegreeScore = result.getDouble("handleDegreeScore");//澶勭疆闅句互搴� BasicDBObject houseQuoteLevel = housequotelevel.findOne(queryObject1(city,region,name,201611)); - Integer sameQuoteCount = null;//同类型房源量 - Integer sameQuoteCountLevel = null//同类型房源量城市排名 - Integer sameQuoteCountLevelTotal = null//同类型房源量城市排名总数 + Integer sameQuoteCount = null;//鍚岀被鍨嬫埧婧愰噺 + Integer sameQuoteCountLevel = null//鍚岀被鍨嬫埧婧愰噺鍩庡競鎺掑悕 + Integer sameQuoteCountLevelTotal = null//鍚岀被鍨嬫埧婧愰噺鍩庡競鎺掑悕鎬绘暟 if(houseQuoteLevel!=null){ sameQuoteCount = houseQuoteLevel.get("quoted_mount"); sameQuoteCountLevel = houseQuoteLevel.get("mom_city_level") @@ -67,21 +67,21 @@ class PdsDataToTest { } BasicDBObject districtAnalyData =districtanalydata.findOne(queryObject(city,region,name,null)); - Integer districtSellCount = null//小区成交量 - Integer districtSellCountLevel = null//成交量城市排名 - Integer districtSellCountTotal = null//成交量城市总数 - //成交量得分 - Integer houseHold = null//户数 - Integer houseHoldLevel = null//户数排名 - Integer houseHoldTotal = null//户数总数 - //户数得分 - Integer seeCount = null//带看数 - Integer seeCountLevel = null//带看数排名 - Integer seeCountLevelTotal = null//带看数总数 - //带看数得分 - Integer quoteCount = null//小区挂牌量 - Integer quoteCountLevel = null//小区挂排量城市排名 - Integer quoteCountLevelTotal = null//小区挂排量城市总数 + Integer districtSellCount = null//灏忓尯鎴愪氦閲� + Integer districtSellCountLevel = null//鎴愪氦閲忓煄甯傛帓鍚� + Integer districtSellCountTotal = null//鎴愪氦閲忓煄甯傛�绘暟 + //鎴愪氦閲忓緱鍒� + Integer houseHold = null//鎴锋暟 + Integer houseHoldLevel = null//鎴锋暟鎺掑悕 + Integer houseHoldTotal = null//鎴锋暟鎬绘暟 + //鎴锋暟寰楀垎 + Integer seeCount = null//甯︾湅鏁� + Integer seeCountLevel = null//甯︾湅鏁版帓鍚� + Integer seeCountLevelTotal = null//甯︾湅鏁版�绘暟 + //甯︾湅鏁板緱鍒� + Integer quoteCount = null//灏忓尯鎸傜墝閲� + Integer quoteCountLevel = null//灏忓尯鎸傛帓閲忓煄甯傛帓鍚� + Integer quoteCountLevelTotal = null//灏忓尯鎸傛帓閲忓煄甯傛�绘暟 @@ -102,10 +102,10 @@ class PdsDataToTest { } BasicDBObject agencyData =agencymountdate.findOne(queryObject1(city, region, name, 201611)); - Integer agencyCount = null//房产中介数 - Integer agencyLevel = null//中介排名 - Integer agencyLevelTotal = null//中介城市排名总数 - Integer agencyScore = (result.getDouble("agencyLevelRate")*100d)//房产中介得分 + Integer agencyCount = null//鎴夸骇涓粙鏁� + Integer agencyLevel = null//涓粙鎺掑悕 + Integer agencyLevelTotal = null//涓粙鍩庡競鎺掑悕鎬绘暟 + Integer agencyScore = (result.getDouble("agencyLevelRate")*100d)//鎴夸骇涓粙寰楀垎 if(agencyData!=null){ agencyCount = agencyData.get("agency_mount") agencyLevel = agencyData.get("mom_city_level") @@ -113,15 +113,15 @@ class PdsDataToTest { } - Integer avgPrice = result.getInt("avgPrice");//均价 - Double avgPriceCityLevelRate = (result.getDouble("priceRate")*100d);//均价城市排名 - Double priceScore = (result.getDouble("priceRate")*100d);//价格指数中均价城市排名 - Double yoyIncreaseIndex = (result.getDouble("increaseRate")*100d);//年涨幅指数 - Double yoyIncreaseCityLevelRate = (result.getDouble("increaseRate")*100d);//年涨跌幅城市排名 - Double yoyTotalScoreCPDBLevelRate = result.getDouble("cpdbScoreLevelRate");//综合评分抵押品库排名 - Double collateralRate = result.getDouble("maxCollateralRate");//抵押率 - Double yoyIncrease =(result.getDouble("yoyIncrease")*100d);//平均增长率 - Double cbdpIncreaseRate = (result.getDouble("cbdpIncreaseRate")*100d)//平均增长率抵押品库排名 + Integer avgPrice = result.getInt("avgPrice");//鍧囦环 + Double avgPriceCityLevelRate = (result.getDouble("priceRate")*100d);//鍧囦环鍩庡競鎺掑悕 + Double priceScore = (result.getDouble("priceRate")*100d);//浠锋牸鎸囨暟涓潎浠峰煄甯傛帓鍚� + Double yoyIncreaseIndex = (result.getDouble("increaseRate")*100d);//骞存定骞呮寚鏁� + Double yoyIncreaseCityLevelRate = (result.getDouble("increaseRate")*100d);//骞存定璺屽箙鍩庡競鎺掑悕 + Double yoyTotalScoreCPDBLevelRate = result.getDouble("cpdbScoreLevelRate");//缁煎悎璇勫垎鎶垫娂鍝佸簱鎺掑悕 + Double collateralRate = result.getDouble("maxCollateralRate");//鎶垫娂鐜� + Double yoyIncrease =(result.getDouble("yoyIncrease")*100d);//骞冲潎澧為暱鐜� + Double cbdpIncreaseRate = (result.getDouble("cbdpIncreaseRate")*100d)//骞冲潎澧為暱鐜囨姷鎶煎搧搴撴帓鍚� oneList.add(region) oneList.add(name) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/PdsHouseScoreCityLevel.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/PdsHouseScoreCityLevel.groovy index 809cb2e81..075231498 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/PdsHouseScoreCityLevel.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/PdsHouseScoreCityLevel.groovy @@ -24,65 +24,65 @@ import com.mongodb.DBObject */ @BatchOwner(Watcher.Hubingliang) class PdsHouseScoreCityLevel extends BaseBatch { - //"上海","北京","深圳","杭州" - //"舟山","丽水","宁波","温州","嘉兴","台州","湖州","衢州","绍兴","金华","淮南",//"阜阳","黄山","亳州","安庆","六安", "淮北","宣城","宿州","池州","蚌埠","滁州","铜陵","合肥","芜湖","马鞍山"// - //"天津","宁德","南平","三明","龙岩","漳州","福州","厦门","泉州","莆田","武威","天水","定西","平凉","白银","酒泉","张掖","嘉峪关","庆阳","金昌","陇南","临夏","甘南","兰州" - //"汕尾","广州","佛山","东莞","中山","湛江","惠州","清远","江门","珠海","汕头",//"揭阳","茂名","云浮","肇庆","潮州","梅州","阳江","韶关","河源", "钦州","梧州","百色","贵港","贺州","来宾", - //"河池","防城港","崇左","南宁","桂林","北海","柳州","玉林""重庆","黔南","遵义","安顺","铜仁","毕节","黔西南","黔东南","贵阳","六盘水","三沙","三亚","海口","五指山","琼海","儋州",// - // "文昌","万宁","东方","定安","屯昌","澄迈","临高","白沙","昌江","乐东","陵水","保亭","琼中","张家口","衡水","邢台","承德","沧州","石家庄","唐山","邯郸", - //"廊坊","保定","秦皇岛","齐齐哈尔","佳木斯","双鸭山","绥化","鸡西","七台河","鹤岗","黑河","伊春","大兴安岭","哈尔滨","大庆","牡丹江","安阳","许昌","南阳", - //"开封","漯河","鹤壁","周口","濮阳","三门峡","商丘","信阳","驻马店","郑州","洛阳","平顶山","新乡","焦作","济源","黄冈","鄂州","十堰","随州","孝感","荆州",// - //"咸宁","荆门","恩施","武汉","襄阳","宜昌","黄石","仙桃","潜江","天门","神农架","常德","岳阳","怀化","郴州","益阳","永州","娄底","湘西","邵阳","长沙","株洲", - //"湘潭","张家界","衡阳","淮安","南京","苏州","无锡","扬州","常州","徐州","镇江","南通","泰州","宿迁","连云港","盐城","吉安","景德镇","鹰潭","新余","上饶","宜春", - //"萍乡","抚州","南昌","赣州","九江","四平","辽源","白山","白城","通化","松原","延边","长春","吉林","铁岭","锦州","朝阳","阜新","抚顺","葫芦岛","辽阳","沈阳","大连",// - //"鞍山","丹东","本溪","营口","盘锦","包头","赤峰","兴安盟","锡林郭勒盟","阿拉善盟","鄂尔多斯","乌海","乌兰察布","通辽","巴彦淖尔","呼伦贝尔","呼和浩特","中卫","固原","吴忠",// - //"石嘴山","银川","海东","海北州","黄南州","海南州","果洛州","玉树州","海西州","西宁","临沂","泰安","菏泽","济宁","日照","聊城","滨州","枣庄","莱芜","东营","德州","济南", - //"青岛","威海","烟台","潍坊","淄博","大同","临汾","朔州","晋城","忻州","晋中","阳泉","运城","长治","吕梁","太原","文山州","红河","临沧","保山","昭通",// - //"普洱","楚雄","怒江州","迪庆州","西双版纳州","德宏州","昆明","丽江","大理","玉溪","曲靖","榆林","汉中","安康","商洛","宝鸡","渭南","铜川","西安","咸阳","延安","广元",// - // "乐山","南充","泸州","资阳","内江","达州","巴中","遂宁","眉山","德阳","广安",// - // "雅安","阿坝州","凉山州","甘孜州","成都","绵阳","宜宾","自贡","攀枝花","吐鲁番","哈密","和田","昌吉","阿勒泰","博尔塔拉","巴音郭楞","克孜勒苏","伊犁","阿克苏", - // "克拉玛依","喀什","塔城","乌鲁木齐","石河子","阿拉尔","图木舒克","五家渠","昌都","日喀则","山南","那曲","阿里","林芝","拉萨" + //"涓婃捣","鍖椾含","娣卞湷","鏉窞" + //"鑸熷北","涓芥按","瀹佹尝","娓╁窞","鍢夊叴","鍙板窞","婀栧窞","琛㈠窞","缁嶅叴","閲戝崕","娣崡",//"闃滈槼","榛勫北","浜冲窞","瀹夊簡","鍏畨", "娣寳","瀹e煄","瀹垮窞","姹犲窞","铓屽煚","婊佸窞","閾滈櫟","鍚堣偉","鑺滄箹","椹瀺灞�"// + //"澶╂触","瀹佸痉","鍗楀钩","涓夋槑","榫欏博","婕冲窞","绂忓窞","鍘﹂棬","娉夊窞","鑾嗙敯","姝﹀▉","澶╂按","瀹氳タ","骞冲噳","鐧介摱","閰掓硥","寮犳帠","鍢夊唱鍏�","搴嗛槼","閲戞槍","闄囧崡","涓村","鐢樺崡","鍏板窞" + //"姹曞熬","骞垮窞","浣涘北","涓滆帪","涓北","婀涙睙","鎯犲窞","娓呰繙","姹熼棬","鐝犳捣","姹曞ご",//"鎻槼","鑼傚悕","浜戞诞","鑲囧簡","娼窞","姊呭窞","闃虫睙","闊跺叧","娌虫簮", "閽﹀窞","姊у窞","鐧捐壊","璐垫腐","璐哄窞","鏉ュ", + //"娌虫睜","闃插煄娓�","宕囧乏","鍗楀畞","妗傛灄","鍖楁捣","鏌冲窞","鐜夋灄""閲嶅簡","榛斿崡","閬典箟","瀹夐『","閾滀粊","姣曡妭","榛旇タ鍗�","榛斾笢鍗�","璐甸槼","鍏洏姘�","涓夋矙","涓変簹","娴峰彛","浜旀寚灞�","鐞兼捣","鍎嬪窞",// + // "鏂囨槍","涓囧畞","涓滄柟","瀹氬畨","灞槍","婢勮繄","涓撮珮","鐧芥矙","鏄屾睙","涔愪笢","闄垫按","淇濅涵","鐞间腑","寮犲鍙�","琛℃按","閭㈠彴","鎵垮痉","娌у窞","鐭冲搴�","鍞愬北","閭兏", + //"寤婂潑","淇濆畾","绉︾殗宀�","榻愰綈鍝堝皵","浣虫湪鏂�","鍙岄腑灞�","缁ュ寲","楦¤タ","涓冨彴娌�","楣ゅ矖","榛戞渤","浼婃槬","澶у叴瀹夊箔","鍝堝皵婊�","澶у簡","鐗′腹姹�","瀹夐槼","璁告槍","鍗楅槼", + //"寮�灏�","婕渤","楣ゅ","鍛ㄥ彛","婵槼","涓夐棬宄�","鍟嗕笜","淇¢槼","椹婚┈搴�","閮戝窞","娲涢槼","骞抽《灞�","鏂颁埂","鐒︿綔","娴庢簮","榛勫唸","閯傚窞","鍗佸牥","闅忓窞","瀛濇劅","鑽嗗窞",// + //"鍜稿畞","鑽嗛棬","鎭╂柦","姝︽眽","瑗勯槼","瀹滄槍","榛勭煶","浠欐","娼滄睙","澶╅棬","绁炲啘鏋�","甯稿痉","宀抽槼","鎬�鍖�","閮村窞","鐩婇槼","姘稿窞","濞勫簳","婀樿タ","閭甸槼","闀挎矙","鏍床", + //"婀樻江","寮犲鐣�","琛¢槼","娣畨","鍗椾含","鑻忓窞","鏃犻敗","鎵窞","甯稿窞","寰愬窞","闀囨睙","鍗楅��","娉板窞","瀹胯縼","杩炰簯娓�","鐩愬煄","鍚夊畨","鏅痉闀�","楣版江","鏂颁綑","涓婇ザ","瀹滄槬", + //"钀嶄埂","鎶氬窞","鍗楁槍","璧e窞","涔濇睙","鍥涘钩","杈芥簮","鐧藉北","鐧藉煄","閫氬寲","鏉惧師","寤惰竟","闀挎槬","鍚夋灄","閾佸箔","閿﹀窞","鏈濋槼","闃滄柊","鎶氶『","钁姦宀�","杈介槼","娌堥槼","澶ц繛",// + //"闉嶅北","涓逛笢","鏈邯","钀ュ彛","鐩橀敠","鍖呭ご","璧ゅ嘲","鍏村畨鐩�","閿℃灄閮嫆鐩�","闃挎媺鍠勭洘","閯傚皵澶氭柉","涔屾捣","涔屽叞瀵熷竷","閫氳窘","宸村溅娣栧皵","鍛间鸡璐濆皵","鍛煎拰娴╃壒","涓崼","鍥哄師","鍚村繝",// + //"鐭冲槾灞�","閾跺窛","娴蜂笢","娴峰寳宸�","榛勫崡宸�","娴峰崡宸�","鏋滄礇宸�","鐜夋爲宸�","娴疯タ宸�","瑗垮畞","涓存矀","娉板畨","鑿忔辰","娴庡畞","鏃ョ収","鑱婂煄","婊ㄥ窞","鏋e簞","鑾辫姕","涓滆惀","寰峰窞","娴庡崡", + //"闈掑矝","濞佹捣","鐑熷彴","娼嶅潑","娣勫崥","澶у悓","涓存本","鏈斿窞","鏅嬪煄","蹇诲窞","鏅嬩腑","闃虫硥","杩愬煄","闀挎不","鍚曟","澶師","鏂囧北宸�","绾㈡渤","涓存钵","淇濆北","鏄��",// + //"鏅幢","妤氶泟","鎬掓睙宸�","杩簡宸�","瑗垮弻鐗堢撼宸�","寰峰畯宸�","鏄嗘槑","涓芥睙","澶х悊","鐜夋邯","鏇查潠","姒嗘灄","姹変腑","瀹夊悍","鍟嗘礇","瀹濋浮","娓崡","閾滃窛","瑗垮畨","鍜搁槼","寤跺畨","骞垮厓",// + // "涔愬北","鍗楀厖","娉稿窞","璧勯槼","鍐呮睙","杈惧窞","宸翠腑","閬傚畞","鐪夊北","寰烽槼","骞垮畨",// + // "闆呭畨","闃垮潩宸�","鍑夊北宸�","鐢樺瓬宸�","鎴愰兘","缁甸槼","瀹滃","鑷础","鏀�鏋濊姳","鍚愰瞾鐣�","鍝堝瘑","鍜岀敯","鏄屽悏","闃垮嫆娉�","鍗氬皵濉旀媺","宸撮煶閮","鍏嬪瓬鍕掕嫃","浼婄妬","闃垮厠鑻�", + // "鍏嬫媺鐜涗緷","鍠�浠�","濉斿煄","涔岄瞾鏈ㄩ綈","鐭虫渤瀛�","闃挎媺灏�","鍥炬湪鑸掑厠","浜斿娓�","鏄岄兘","鏃ュ杸鍒�","灞卞崡","閭f洸","闃块噷","鏋楄姖","鎷夎惃" public static final DBCollection pdsHousescorecitylevel = MongoUtils.getCollectionByName("fangjia_stat", "pds.city_score_level", "mongo.db.fangjia.com", 27017) - private static final String[] str1 = ["杭州","舟山","丽水","宁波","温州","嘉兴","台州","湖州","衢州","绍兴","金华","淮南","阜阳","黄山","亳州","安庆","六安", "淮北","宣城","宿州","池州"] - //private static final String[] str1 = ["北京","深圳","广州","汕尾","蚌埠","松原",] + private static final String[] str1 = ["鏉窞","鑸熷北","涓芥按","瀹佹尝","娓╁窞","鍢夊叴","鍙板窞","婀栧窞","琛㈠窞","缁嶅叴","閲戝崕","娣崡","闃滈槼","榛勫北","浜冲窞","瀹夊簡","鍏畨", "娣寳","瀹e煄","瀹垮窞","姹犲窞"] + //private static final String[] str1 = ["鍖椾含","娣卞湷","骞垮窞","姹曞熬","铓屽煚","鏉惧師",] - private static final String[] str2 = ["佛山","东莞","中山","湛江","惠州","清远","江门","珠海","汕头","揭阳","茂名","云浮","肇庆","潮州","梅州","阳江","韶关","河源", "钦州", - "梧州","百色","贵港","贺州","来宾","河池","防城港","崇左","南宁","桂林","北海","柳州","玉林","重庆","黔南","遵义","安顺","铜仁","毕节","黔西南","黔东南"] + private static final String[] str2 = ["浣涘北","涓滆帪","涓北","婀涙睙","鎯犲窞","娓呰繙","姹熼棬","鐝犳捣","姹曞ご","鎻槼","鑼傚悕","浜戞诞","鑲囧簡","娼窞","姊呭窞","闃虫睙","闊跺叧","娌虫簮", "閽﹀窞", + "姊у窞","鐧捐壊","璐垫腐","璐哄窞","鏉ュ","娌虫睜","闃插煄娓�","宕囧乏","鍗楀畞","妗傛灄","鍖楁捣","鏌冲窞","鐜夋灄","閲嶅簡","榛斿崡","閬典箟","瀹夐『","閾滀粊","姣曡妭","榛旇タ鍗�","榛斾笢鍗�"] - private static final String[] str3 = ["廊坊","保定","秦皇岛","齐齐哈尔","佳木斯","双鸭山","绥化","鸡西","七台河","鹤岗","黑河","伊春","大兴安岭","哈尔滨","大庆","牡丹江","安阳","许昌","南阳", - "开封","漯河","鹤壁","周口","濮阳","三门峡","商丘","信阳","驻马店","郑州"] + private static final String[] str3 = ["寤婂潑","淇濆畾","绉︾殗宀�","榻愰綈鍝堝皵","浣虫湪鏂�","鍙岄腑灞�","缁ュ寲","楦¤タ","涓冨彴娌�","楣ゅ矖","榛戞渤","浼婃槬","澶у叴瀹夊箔","鍝堝皵婊�","澶у簡","鐗′腹姹�","瀹夐槼","璁告槍","鍗楅槼", + "寮�灏�","婕渤","楣ゅ","鍛ㄥ彛","婵槼","涓夐棬宄�","鍟嗕笜","淇¢槼","椹婚┈搴�","閮戝窞"] - private static final String[] str4 = ["湘潭","张家界","衡阳","淮安","南京","苏州","无锡","扬州","常州","徐州","镇江","南通","泰州","宿迁","连云港","盐城","吉安","景德镇","鹰潭","新余","上饶","宜春", - "萍乡","抚州","南昌","赣州","九江","四平","辽源","白山","白城","通化"] + private static final String[] str4 = ["婀樻江","寮犲鐣�","琛¢槼","娣畨","鍗椾含","鑻忓窞","鏃犻敗","鎵窞","甯稿窞","寰愬窞","闀囨睙","鍗楅��","娉板窞","瀹胯縼","杩炰簯娓�","鐩愬煄","鍚夊畨","鏅痉闀�","楣版江","鏂颁綑","涓婇ザ","瀹滄槬", + "钀嶄埂","鎶氬窞","鍗楁槍","璧e窞","涔濇睙","鍥涘钩","杈芥簮","鐧藉北","鐧藉煄","閫氬寲"] - private static final String[] str5 = ["石嘴山","银川","海东","海北州","黄南州","海南州","果洛州","玉树州","海西州","西宁","临沂","泰安","菏泽","济宁","日照","聊城","滨州","枣庄","莱芜","东营","德州","济南", - "青岛","威海","烟台","潍坊","淄博"] + private static final String[] str5 = ["鐭冲槾灞�","閾跺窛","娴蜂笢","娴峰寳宸�","榛勫崡宸�","娴峰崡宸�","鏋滄礇宸�","鐜夋爲宸�","娴疯タ宸�","瑗垮畞","涓存矀","娉板畨","鑿忔辰","娴庡畞","鏃ョ収","鑱婂煄","婊ㄥ窞","鏋e簞","鑾辫姕","涓滆惀","寰峰窞","娴庡崡", + "闈掑矝","濞佹捣","鐑熷彴","娼嶅潑","娣勫崥"] - private static final String[] str6 = ["乐山","南充","泸州","资阳","内江","达州","巴中","遂宁","眉山","德阳","广安","阿坝州","凉山州","甘孜州","成都","绵阳","宜宾","自贡","攀枝花","吐鲁番","哈密","和田", - "昌吉","阿勒泰","博尔塔拉","巴音郭楞","克孜勒苏","伊犁","阿克苏","克拉玛依","喀什","塔城","乌鲁木齐","石河子","阿拉尔","图木舒克","五家渠","昌都","日喀则","山南","那曲","阿里", - "林芝","拉萨"] + private static final String[] str6 = ["涔愬北","鍗楀厖","娉稿窞","璧勯槼","鍐呮睙","杈惧窞","宸翠腑","閬傚畞","鐪夊北","寰烽槼","骞垮畨","闃垮潩宸�","鍑夊北宸�","鐢樺瓬宸�","鎴愰兘","缁甸槼","瀹滃","鑷础","鏀�鏋濊姳","鍚愰瞾鐣�","鍝堝瘑","鍜岀敯", + "鏄屽悏","闃垮嫆娉�","鍗氬皵濉旀媺","宸撮煶閮","鍏嬪瓬鍕掕嫃","浼婄妬","闃垮厠鑻�","鍏嬫媺鐜涗緷","鍠�浠�","濉斿煄","涔岄瞾鏈ㄩ綈","鐭虫渤瀛�","闃挎媺灏�","鍥炬湪鑸掑厠","浜斿娓�","鏄岄兘","鏃ュ杸鍒�","灞卞崡","閭f洸","闃块噷", + "鏋楄姖","鎷夎惃"] - private static final String[] str7 = ["滁州","铜陵","合肥","芜湖","马鞍山","天津","宁德","南平","三明","龙岩","漳州","福州","厦门","泉州","莆田","武威","天水","定西","平凉","白银","酒泉","张掖", - "嘉峪关","庆阳","金昌","陇南","临夏","甘南","兰州"] + private static final String[] str7 = ["婊佸窞","閾滈櫟","鍚堣偉","鑺滄箹","椹瀺灞�","澶╂触","瀹佸痉","鍗楀钩","涓夋槑","榫欏博","婕冲窞","绂忓窞","鍘﹂棬","娉夊窞","鑾嗙敯","姝﹀▉","澶╂按","瀹氳タ","骞冲噳","鐧介摱","閰掓硥","寮犳帠", + "鍢夊唱鍏�","搴嗛槼","閲戞槍","闄囧崡","涓村","鐢樺崡","鍏板窞"] - private static final String[] str8 = ["贵阳","六盘水","三沙","三亚","海口","五指山","琼海","儋州", "文昌","万宁","东方","定安","屯昌","澄迈","临高","白沙","昌江","乐东","陵水","保亭","琼中", - "张家口","衡水","邢台","承德","沧州","石家庄","唐山","邯郸"] + private static final String[] str8 = ["璐甸槼","鍏洏姘�","涓夋矙","涓変簹","娴峰彛","浜旀寚灞�","鐞兼捣","鍎嬪窞", "鏂囨槍","涓囧畞","涓滄柟","瀹氬畨","灞槍","婢勮繄","涓撮珮","鐧芥矙","鏄屾睙","涔愪笢","闄垫按","淇濅涵","鐞间腑", + "寮犲鍙�","琛℃按","閭㈠彴","鎵垮痉","娌у窞","鐭冲搴�","鍞愬北","閭兏"] - private static final String[] str9 = ["洛阳","平顶山","新乡","焦作","济源","黄冈","鄂州","十堰","随州","孝感","荆州","咸宁","荆门","恩施","武汉","襄阳","宜昌","黄石","仙桃","潜江","天门","神农架", - "常德","岳阳","怀化","郴州","益阳","永州","娄底","湘西","邵阳","长沙","株洲"] + private static final String[] str9 = ["娲涢槼","骞抽《灞�","鏂颁埂","鐒︿綔","娴庢簮","榛勫唸","閯傚窞","鍗佸牥","闅忓窞","瀛濇劅","鑽嗗窞","鍜稿畞","鑽嗛棬","鎭╂柦","姝︽眽","瑗勯槼","瀹滄槍","榛勭煶","浠欐","娼滄睙","澶╅棬","绁炲啘鏋�", + "甯稿痉","宀抽槼","鎬�鍖�","閮村窞","鐩婇槼","姘稿窞","濞勫簳","婀樿タ","閭甸槼","闀挎矙","鏍床"] - private static final String[] str10 = ["延边","长春","吉林","铁岭","锦州","朝阳","阜新","抚顺","葫芦岛","辽阳","沈阳","大连","鞍山","丹东","本溪","营口","盘锦","包头","赤峰","兴安盟","锡林郭勒盟", - "阿拉善盟","鄂尔多斯","乌海","乌兰察布","通辽","巴彦淖尔","呼伦贝尔","呼和浩特","中卫","固原","吴忠"] + private static final String[] str10 = ["寤惰竟","闀挎槬","鍚夋灄","閾佸箔","閿﹀窞","鏈濋槼","闃滄柊","鎶氶『","钁姦宀�","杈介槼","娌堥槼","澶ц繛","闉嶅北","涓逛笢","鏈邯","钀ュ彛","鐩橀敠","鍖呭ご","璧ゅ嘲","鍏村畨鐩�","閿℃灄閮嫆鐩�", + "闃挎媺鍠勭洘","閯傚皵澶氭柉","涔屾捣","涔屽叞瀵熷竷","閫氳窘","宸村溅娣栧皵","鍛间鸡璐濆皵","鍛煎拰娴╃壒","涓崼","鍥哄師","鍚村繝"] - private static final String[] str11 = ["大同","临汾","朔州","晋城","忻州","晋中","阳泉","运城","长治","吕梁","太原","文山州","红河","临沧","保山","昭通","普洱","楚雄","怒江州","迪庆州","西双版纳州","德宏州", - "昆明","丽江","大理","玉溪","曲靖","榆林","汉中","安康","商洛","宝鸡","渭南","铜川","西安","咸阳","延安","广元"] + private static final String[] str11 = ["澶у悓","涓存本","鏈斿窞","鏅嬪煄","蹇诲窞","鏅嬩腑","闃虫硥","杩愬煄","闀挎不","鍚曟","澶師","鏂囧北宸�","绾㈡渤","涓存钵","淇濆北","鏄��","鏅幢","妤氶泟","鎬掓睙宸�","杩簡宸�","瑗垮弻鐗堢撼宸�","寰峰畯宸�", + "鏄嗘槑","涓芥睙","澶х悊","鐜夋邯","鏇查潠","姒嗘灄","姹変腑","瀹夊悍","鍟嗘礇","瀹濋浮","娓崡","閾滃窛","瑗垮畨","鍜搁槼","寤跺畨","骞垮厓"] public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(15) static main(args) { def s = System.currentTimeMillis() runBatch(new PdsHouseScoreCityLevelBatch(), args) - println("运行时间:${(int) ((System.currentTimeMillis() - s)) / (1000 * 60)}分钟") + println("杩愯鏃堕棿:${(int) ((System.currentTimeMillis() - s)) / (1000 * 60)}鍒嗛挓") } @Override diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/PdsPingFenMoXing.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/PdsPingFenMoXing.groovy index 98d80c5f7..991536a0a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/PdsPingFenMoXing.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/PdsPingFenMoXing.groovy @@ -14,7 +14,7 @@ import com.mongodb.DBCursor import com.mongodb.DBObject /** - * 房源竣工字段解析并填充 + * 鎴挎簮绔e伐瀛楁瑙f瀽骞跺~鍏� * @author hubingliang * */ @@ -29,7 +29,7 @@ class PdsPingFenMoXing{ public static final DBCollection DEAL_PRICE = MongoUtils.getCollectionByName("fangjia", "deal_price", "mongo.db.fangjia.com", 27017) static main(args) { - junGongZiDuan("上海"); + junGongZiDuan("涓婃捣"); } public static void junGongZiDuan(String city){ @@ -80,7 +80,7 @@ class PdsPingFenMoXing{ /** - * 小区近半年成交量 + * 灏忓尯杩戝崐骞存垚浜ら噺 */ public static int getDistrictSellCount(String city,String region,String name,String dateStr){ Date nowDate = DateUtils.parseFromTightYYYYMMDD(dateStr); @@ -89,7 +89,7 @@ class PdsPingFenMoXing{ return sellCount; } - //获取某短时间内二手房成交量 + //鑾峰彇鏌愮煭鏃堕棿鍐呬簩鎵嬫埧鎴愪氦閲� public static Integer oldHouseSell(String city,String region,String name,Date halfYearAgo,Date nowDate){ BasicDBObject query= new BasicDBObject().append("city", city).append("region",region).append("district_name", name).append("trade_date", new BasicDBObject('$gte',halfYearAgo).append('$lte', nowDate)); long monthCount = DEAL_PRICE.count(query); @@ -98,7 +98,7 @@ class PdsPingFenMoXing{ /** - * 小区均价 + * 灏忓尯鍧囦环 */ public static Integer getAvgPrice(String city,String region,String name,String startDateStr,String endDateStr){ Integer avgPrice = null; @@ -127,7 +127,7 @@ class PdsPingFenMoXing{ } /** - *区域张跌幅 + *鍖哄煙寮犺穼骞� */ public static Double getRegionYoy(String city,String region,Integer date){ Double regionYoy = null; @@ -144,7 +144,7 @@ class PdsPingFenMoXing{ /** - *小区张跌幅 + *灏忓尯寮犺穼骞� */ public static Double getDistrictYoy(String city,String region,String name,Integer date){ Double disYoy = null; @@ -161,7 +161,7 @@ class PdsPingFenMoXing{ } /** - * 一公里小区数量 + * 涓�鍏噷灏忓尯鏁伴噺 */ public static int getNearByDistrictCount(DBObject dis){ int nearByDistrictCount = 0 @@ -173,7 +173,7 @@ class PdsPingFenMoXing{ } /** - * 小区一公里公交数 + * 灏忓尯涓�鍏噷鍏氦鏁� */ public static int getBusCount(DBObject traffic){ int busCount = 0; @@ -185,7 +185,7 @@ class PdsPingFenMoXing{ /** - * 小区一公里地铁数 + * 灏忓尯涓�鍏噷鍦伴搧鏁� */ public static int getMetroCount(DBObject traffic){ int metroCount = 0; @@ -196,7 +196,7 @@ class PdsPingFenMoXing{ } /** - * 小区户数 + * 灏忓尯鎴锋暟 */ public static int getHouseHoldCount(DBObject districtAnalyData,String city,String region,String name){ int houseHoldCount = 0; @@ -208,7 +208,7 @@ class PdsPingFenMoXing{ } /** - * 房源量 + * 鎴挎簮閲� */ public static int getHouseCount(String city,String region,String name,String startDateStr,String endDateStr){ Date startDate = DateUtils.parseFromTightYYYYMMDD(startDateStr); @@ -220,7 +220,7 @@ class PdsPingFenMoXing{ /** - * 一公里中介数 + * 涓�鍏噷涓粙鏁� */ public static int getAgencyCount(String city,String region,String name,Integer date){ int agencyCount = 0; @@ -237,7 +237,7 @@ class PdsPingFenMoXing{ } /** - * 获取district_analy_date对象 + * 鑾峰彇district_analy_date瀵硅薄 */ public static DBObject getDistrictAnalyData(String city,String region,String name){ BasicDBObject query = new BasicDBObject() @@ -248,7 +248,7 @@ class PdsPingFenMoXing{ } /** - * 获取pds.traffic_level对象 + * 鑾峰彇pds.traffic_level瀵硅薄 */ public static DBObject getTraffic(String city,String region,String name){ BasicDBObject query = new BasicDBObject() @@ -259,7 +259,7 @@ class PdsPingFenMoXing{ } /** - * 获取城市的小区 + * 鑾峰彇鍩庡競鐨勫皬鍖� * @param city * @return */ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/PdsUseStatisticBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/PdsUseStatisticBatch.groovy index c7a13eea0..3cfffb7b7 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/PdsUseStatisticBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/PdsUseStatisticBatch.groovy @@ -19,7 +19,7 @@ import com.mongodb.DBObject import com.mongodb.Mongo /** - * 定时更新小区地址数据 + * 瀹氭椂鏇存柊灏忓尯鍦板潃鏁版嵁 * @author hubingliang * */ @@ -54,7 +54,7 @@ class PdsUseStatisticBatch extends BaseBatch{ static main(args) { def s = System.currentTimeMillis() runBatch(new PdsUseStatisticBatch(), args) - println("运行时间:${(int) ((System.currentTimeMillis() - s)) / (1000 * 60)}分钟") + println("杩愯鏃堕棿:${(int) ((System.currentTimeMillis() - s)) / (1000 * 60)}鍒嗛挓") } @Override @@ -108,9 +108,9 @@ class PdsUseStatisticBatch extends BaseBatch{ def fileName1 = getFilePath() + "pdsWebStatistic" + dateStr + ".xlsx" - ExcelUtils.write(fileName1, ls1, "pdsWeb端统计") + ExcelUtils.write(fileName1, ls1, "pdsWeb绔粺璁�") def fileName2 = getFilePath() + "pdsMobileStatistic" + dateStr + ".xlsx" - ExcelUtils.write(fileName2, ls2, "pds移动端统计") + ExcelUtils.write(fileName2, ls2, "pds绉诲姩绔粺璁�") send(fileName1) send(fileName2) } @@ -124,9 +124,9 @@ class PdsUseStatisticBatch extends BaseBatch{ file.put("data", new File(fileName).getBytes()) fsDB.save(file) def href = DataUtil.encodePicUrl(id, "o", "upload") - href = "点击下载附件" + href = "鐐瑰嚮涓嬭浇闄勪欢" emails.each {receiver-> - jms.sendMail(receiver,"pds用户使用统计情况", href) + jms.sendMail(receiver,"pds鐢ㄦ埛浣跨敤缁熻鎯呭喌", href) } new File(fileName).deleteOnExit() } @@ -137,7 +137,7 @@ class PdsUseStatisticBatch extends BaseBatch{ } /** - * 获取Excel文件存储路径 + * 鑾峰彇Excel鏂囦欢瀛樺偍璺緞 * @return */ static getFilePath() { @@ -151,7 +151,7 @@ class PdsUseStatisticBatch extends BaseBatch{ ExcelUtils.write("E:\\hbl\\Spider\\statistic\\"+path+".xlsx", datas, "Sheet1") } - //从移动端进入统计 + //浠庣Щ鍔ㄧ杩涘叆缁熻 public static List> mobilPdsStatisticData(Date yestoday,Date today){ String dateStr = DateUtils.formatToYYYYMMDD(yestoday); List> ls = new ArrayList>(); @@ -204,43 +204,43 @@ class PdsUseStatisticBatch extends BaseBatch{ } public static List getMobileHead(){ List ll = new ArrayList(); - ll.add("日期") - ll.add("企业") - ll.add("查询总数") - ll.add("成功次数") - ll.add("成功占比") - ll.add("失败次数") - ll.add("失败占比") + ll.add("鏃ユ湡") + ll.add("浼佷笟") + ll.add("鏌ヨ鎬绘暟") + ll.add("鎴愬姛娆℃暟") + ll.add("鎴愬姛鍗犳瘮") + ll.add("澶辫触娆℃暟") + ll.add("澶辫触鍗犳瘮") return ll; } public static List getWebHead(){ List ll = new ArrayList(); - ll.add("日期") - ll.add("企业") - ll.add("用户") - ll.add("查询总数") - ll.add("成功次数") - ll.add("成功占比") - ll.add("失败次数") - ll.add("失败占比") - ll.add("均价未显示2个以上") - ll.add("均价未显示2个以上占比") - ll.add("房源未显示4个以上") - ll.add("房源未显示4个以上占比") - ll.add("贷款人信息查询总次数") - ll.add("收入未返回次数") - ll.add("收入未返回次数占比") - ll.add("支出未返回次数") - ll.add("支出未返回次数占比") - ll.add("贷后风控导入数据模块中的导入数据总次数") - ll.add("贷后风控导入数据模块中的导入数据失败次数") - ll.add("贷后风控导入数据模块中的导入数据失败次数 占比") + ll.add("鏃ユ湡") + ll.add("浼佷笟") + ll.add("鐢ㄦ埛") + ll.add("鏌ヨ鎬绘暟") + ll.add("鎴愬姛娆℃暟") + ll.add("鎴愬姛鍗犳瘮") + ll.add("澶辫触娆℃暟") + ll.add("澶辫触鍗犳瘮") + ll.add("鍧囦环鏈樉绀�2涓互涓�") + ll.add("鍧囦环鏈樉绀�2涓互涓婂崰姣�") + ll.add("鎴挎簮鏈樉绀�4涓互涓�") + ll.add("鎴挎簮鏈樉绀�4涓互涓婂崰姣�") + ll.add("璐锋浜轰俊鎭煡璇㈡�绘鏁�") + ll.add("鏀跺叆鏈繑鍥炴鏁�") + ll.add("鏀跺叆鏈繑鍥炴鏁板崰姣�") + ll.add("鏀嚭鏈繑鍥炴鏁�") + ll.add("鏀嚭鏈繑鍥炴鏁板崰姣�") + ll.add("璐峰悗椋庢帶瀵煎叆鏁版嵁妯″潡涓殑瀵煎叆鏁版嵁鎬绘鏁�") + ll.add("璐峰悗椋庢帶瀵煎叆鏁版嵁妯″潡涓殑瀵煎叆鏁版嵁澶辫触娆℃暟") + ll.add("璐峰悗椋庢帶瀵煎叆鏁版嵁妯″潡涓殑瀵煎叆鏁版嵁澶辫触娆℃暟 鍗犳瘮") return ll; } - //从pds网页端进入统计 + //浠巔ds缃戦〉绔繘鍏ョ粺璁� public static List> pdsWebStatisticData(Date yestoday,Date today){ String dateStr = DateUtils.formatToYYYYMMDD(yestoday); List> ls = new ArrayList>(); @@ -281,7 +281,7 @@ class PdsUseStatisticBatch extends BaseBatch{ } } - //上传次数查询 + //涓婁紶娆℃暟鏌ヨ BasicDBObject qu = new BasicDBObject().append("c_date", new BasicDBObject("\$gte",yestoday).append("\$lt", today)); DBCursor upbs = UPLOAD_DATA_TOTALITY.find(qu).batchSize(10000).addOption(Bytes.QUERYOPTION_NOTIMEOUT) upbs.each {DBObject db-> diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/PdsUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/PdsUtils.groovy index 022f1cf2f..c019c0da5 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/PdsUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/PdsUtils.groovy @@ -21,7 +21,7 @@ import com.mongodb.DBObject class PdsUtils { /** - * 差的绝对值 + * 宸殑缁濆鍊� * @param firstNum * @param twoNum */ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/PersonToCityBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/PersonToCityBatch.groovy index 70b249254..8edfdb912 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/PersonToCityBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/PersonToCityBatch.groovy @@ -14,7 +14,7 @@ import com.mongodb.DBCursor; import com.mongodb.DBObject /** - * 定时更新小区地址数据 + * 瀹氭椂鏇存柊灏忓尯鍦板潃鏁版嵁 * @author hubingliang * */ @@ -26,37 +26,37 @@ class PersonToCityBatch{ pdsData() } public static void pdsData(){ - String[] names = ["黄村粮","蒲雪莉","徐敏霞","叶懿娉","祝林燕"] + String[] names = ["榛勬潙绮�","钂查洩鑾�","寰愭晱闇�","鍙舵嚳濞�","绁濇灄鐕�"] - String[] huangs = ["广州","深圳","西安","苏州","成都","乌鲁木齐","济南","南通","惠州","海口","洛阳","兰州","呼和浩特","泰州","鞍山","银川","梅州","衢州","郴州","蚌埠","上饶", - "本溪","平顶山","大同","九江","肇庆","许昌","淮南","南阳","清远","泰安","黄冈","开封","衡水","晋中","孝感","渭南","沧州","娄底","抚州","信阳","驻马店","云浮", - "玉林","安康","白城","亳州","资阳","景德镇","乌兰察布","贺州","巴中","松原","鹤壁","随州","庆阳","三门峡","黔西南","湘西","黄南州","海南州","果洛州","阿坝州", - "甘孜州","石河子","阿拉尔","图木舒克","昌江","潜江","屯昌","神农架","五指山","三沙","可克达拉"] + String[] huangs = ["骞垮窞","娣卞湷","瑗垮畨","鑻忓窞","鎴愰兘","涔岄瞾鏈ㄩ綈","娴庡崡","鍗楅��","鎯犲窞","娴峰彛","娲涢槼","鍏板窞","鍛煎拰娴╃壒","娉板窞","闉嶅北","閾跺窛","姊呭窞","琛㈠窞","閮村窞","铓屽煚","涓婇ザ", + "鏈邯","骞抽《灞�","澶у悓","涔濇睙","鑲囧簡","璁告槍","娣崡","鍗楅槼","娓呰繙","娉板畨","榛勫唸","寮�灏�","琛℃按","鏅嬩腑","瀛濇劅","娓崡","娌у窞","濞勫簳","鎶氬窞","淇¢槼","椹婚┈搴�","浜戞诞", + "鐜夋灄","瀹夊悍","鐧藉煄","浜冲窞","璧勯槼","鏅痉闀�","涔屽叞瀵熷竷","璐哄窞","宸翠腑","鏉惧師","楣ゅ","闅忓窞","搴嗛槼","涓夐棬宄�","榛旇タ鍗�","婀樿タ","榛勫崡宸�","娴峰崡宸�","鏋滄礇宸�","闃垮潩宸�", + "鐢樺瓬宸�","鐭虫渤瀛�","闃挎媺灏�","鍥炬湪鑸掑厠","鏄屾睙","娼滄睙","灞槍","绁炲啘鏋�","浜旀寚灞�","涓夋矙","鍙厠杈炬媺"] - String[] pus = ["上海","天津","武汉","青岛","厦门","贵阳","长春","金华","衡阳","揭阳","常德","湖州","威海","盐城","中山","舟山","安阳","榆林","丽江","唐山","南平", - "龙岩","怀化","宜春","江门","黄石","韶关","湘潭","铁岭","菏泽","白山","绥化","朝阳","六安","葫芦岛","聊城","达州","辽阳","酒泉","永州","萍乡","丹东", - "恩施","六盘水","自贡","吐鲁番","昌吉","巴音郭楞","双鸭山","阿里","兴安盟","阿拉善盟","定西","鸡西","七台河","乌海","平凉","晋城","淮北","宿州","毕节", - "漯河","鹰潭","周口","嘉峪关","雅安","金昌","甘南","玉树州","海西'","铜川","定安","铁门关"] + String[] pus = ["涓婃捣","澶╂触","姝︽眽","闈掑矝","鍘﹂棬","璐甸槼","闀挎槬","閲戝崕","琛¢槼","鎻槼","甯稿痉","婀栧窞","濞佹捣","鐩愬煄","涓北","鑸熷北","瀹夐槼","姒嗘灄","涓芥睙","鍞愬北","鍗楀钩", + "榫欏博","鎬�鍖�","瀹滄槬","姹熼棬","榛勭煶","闊跺叧","婀樻江","閾佸箔","鑿忔辰","鐧藉北","缁ュ寲","鏈濋槼","鍏畨","钁姦宀�","鑱婂煄","杈惧窞","杈介槼","閰掓硥","姘稿窞","钀嶄埂","涓逛笢", + "鎭╂柦","鍏洏姘�","鑷础","鍚愰瞾鐣�","鏄屽悏","宸撮煶閮","鍙岄腑灞�","闃块噷","鍏村畨鐩�","闃挎媺鍠勭洘","瀹氳タ","楦¤タ","涓冨彴娌�","涔屾捣","骞冲噳","鏅嬪煄","娣寳","瀹垮窞","姣曡妭", + "婕渤","楣版江","鍛ㄥ彛","鍢夊唱鍏�","闆呭畨","閲戞槍","鐢樺崡","鐜夋爲宸�","娴疯タ'","閾滃窛","瀹氬畨","閾侀棬鍏�"] - String[] xus = ["北京","福州","哈尔滨","太原","昆明","珠海","徐州","嘉兴","南宁","包头","秦皇岛","吉林","西宁","绍兴","绵阳","淮安","莆田","三亚","抚顺","张家口","宝鸡", - "漳州","荆州","呼伦贝尔","茂名","牡丹江","马鞍山","新乡","临汾","河源","襄阳","北海","广元","锦州","钦州","安庆","宁德","拉萨","三明","池州","承德","德州", - "咸宁","邵阳","阿勒泰","黔南","日喀则","山南","锡林郭勒盟","济源","安顺","吉安","商洛","宣城","内江","遂宁","眉山","忻州","新余","莱芜","阳泉","陇南","海北州", - "迪庆州","巴彦淖尔","荆门","西双版纳州","仙桃","五家渠","陵水","澄迈","文昌","白沙"] + String[] xus = ["鍖椾含","绂忓窞","鍝堝皵婊�","澶師","鏄嗘槑","鐝犳捣","寰愬窞","鍢夊叴","鍗楀畞","鍖呭ご","绉︾殗宀�","鍚夋灄","瑗垮畞","缁嶅叴","缁甸槼","娣畨","鑾嗙敯","涓変簹","鎶氶『","寮犲鍙�","瀹濋浮", + "婕冲窞","鑽嗗窞","鍛间鸡璐濆皵","鑼傚悕","鐗′腹姹�","椹瀺灞�","鏂颁埂","涓存本","娌虫簮","瑗勯槼","鍖楁捣","骞垮厓","閿﹀窞","閽﹀窞","瀹夊簡","瀹佸痉","鎷夎惃","涓夋槑","姹犲窞","鎵垮痉","寰峰窞", + "鍜稿畞","閭甸槼","闃垮嫆娉�","榛斿崡","鏃ュ杸鍒�","灞卞崡","閿℃灄閮嫆鐩�","娴庢簮","瀹夐『","鍚夊畨","鍟嗘礇","瀹e煄","鍐呮睙","閬傚畞","鐪夊北","蹇诲窞","鏂颁綑","鑾辫姕","闃虫硥","闄囧崡","娴峰寳宸�", + "杩簡宸�","宸村溅娣栧皵","鑽嗛棬","瑗垮弻鐗堢撼宸�","浠欐","浜斿娓�","闄垫按","婢勮繄","鏂囨槍","鐧芥矙"] - String[] yes = ["宁波","长沙","佛山","烟台","郑州","泉州","合肥","潍坊","常州","台州","湛江","赣州","连云港","宜昌","保定","淄博","邯郸","岳阳","赤峰","临沂","咸阳","宜宾", - "廊坊","泸州","邢台","玉溪","阳江","延安","宿迁","阜阳","丽水","汉中","黄山","梧州","通化","日照","十堰","益阳","枣庄","铜陵","东营","通辽","焦作","攀枝花", - "和田","博尔塔拉","伊犁","红河","昌都","林芝","武威","临沧","固原","朔州","鹤岗","贵港","吴忠","海东","黑河","阜新","石嘴山","滨州","保山","伊春","普洱","长治", - "楚雄","黔东南","喀什","保亭","琼中","塔城","北屯"] + String[] yes = ["瀹佹尝","闀挎矙","浣涘北","鐑熷彴","閮戝窞","娉夊窞","鍚堣偉","娼嶅潑","甯稿窞","鍙板窞","婀涙睙","璧e窞","杩炰簯娓�","瀹滄槍","淇濆畾","娣勫崥","閭兏","宀抽槼","璧ゅ嘲","涓存矀","鍜搁槼","瀹滃", + "寤婂潑","娉稿窞","閭㈠彴","鐜夋邯","闃虫睙","寤跺畨","瀹胯縼","闃滈槼","涓芥按","姹変腑","榛勫北","姊у窞","閫氬寲","鏃ョ収","鍗佸牥","鐩婇槼","鏋e簞","閾滈櫟","涓滆惀","閫氳窘","鐒︿綔","鏀�鏋濊姳", + "鍜岀敯","鍗氬皵濉旀媺","浼婄妬","绾㈡渤","鏄岄兘","鏋楄姖","姝﹀▉","涓存钵","鍥哄師","鏈斿窞","楣ゅ矖","璐垫腐","鍚村繝","娴蜂笢","榛戞渤","闃滄柊","鐭冲槾灞�","婊ㄥ窞","淇濆北","浼婃槬","鏅幢","闀挎不", + "妤氶泟","榛斾笢鍗�","鍠�浠�","淇濅涵","鐞间腑","濉斿煄","鍖楀悲"] - String[] zhus = ["无锡","大连","南京","沈阳","重庆","杭州","南昌","东莞","石家庄","汕头","温州","扬州","齐齐哈尔","大庆","柳州","镇江","芜湖","桂林","株洲","遵义","鄂尔多斯","南充", - "济宁","运城","德阳","大理","营口","潮州","盘锦","四平","佳木斯","曲靖","乐山","百色","滁州","商丘","吕梁","延边","张家界","文山州","哈密","克孜勒苏","中卫","那曲", - "天水","辽源","白银","铜仁","阿克苏","昭通","鄂州","张掖","濮阳","汕尾","广安","临夏","凉山州","怒江州","来宾","克拉玛依","河池","防城港","崇左","大兴安岭","德宏州", - "琼海","乐东","儋州","天门","临高","万宁","东方","双河"] + String[] zhus = ["鏃犻敗","澶ц繛","鍗椾含","娌堥槼","閲嶅簡","鏉窞","鍗楁槍","涓滆帪","鐭冲搴�","姹曞ご","娓╁窞","鎵窞","榻愰綈鍝堝皵","澶у簡","鏌冲窞","闀囨睙","鑺滄箹","妗傛灄","鏍床","閬典箟","閯傚皵澶氭柉","鍗楀厖", + "娴庡畞","杩愬煄","寰烽槼","澶х悊","钀ュ彛","娼窞","鐩橀敠","鍥涘钩","浣虫湪鏂�","鏇查潠","涔愬北","鐧捐壊","婊佸窞","鍟嗕笜","鍚曟","寤惰竟","寮犲鐣�","鏂囧北宸�","鍝堝瘑","鍏嬪瓬鍕掕嫃","涓崼","閭f洸", + "澶╂按","杈芥簮","鐧介摱","閾滀粊","闃垮厠鑻�","鏄��","閯傚窞","寮犳帠","婵槼","姹曞熬","骞垮畨","涓村","鍑夊北宸�","鎬掓睙宸�","鏉ュ","鍏嬫媺鐜涗緷","娌虫睜","闃插煄娓�","宕囧乏","澶у叴瀹夊箔","寰峰畯宸�", + "鐞兼捣","涔愪笢","鍎嬪窞","澶╅棬","涓撮珮","涓囧畞","涓滄柟","鍙屾渤"] /*String[] strs = null; @@ -73,7 +73,7 @@ class PersonToCityBatch{ List citys = Arrays.asList(zhus); DBObject db = new BasicDBObject(); - db.put("username", "祝林燕"); + db.put("username", "绁濇灄鐕�"); db.put("c_date", new Date()); db.put("roles", roles); db.put("citys", citys); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/SaleDataToChengCheng.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/SaleDataToChengCheng.groovy index 0cc674741..d480e8d82 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/SaleDataToChengCheng.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/SaleDataToChengCheng.groovy @@ -16,7 +16,7 @@ import com.mongodb.DBObject class SaleDataToChengCheng { public static final DBCollection SALE_DATE_BASE = MongoUtils.getCollectionByName("hu_temp", "sale_data_base", "192.168.0.136", 27017) static main(args) { - saleData("上海") + saleData("涓婃捣") } public static void saleData(String city){ @@ -73,7 +73,7 @@ class SaleDataToChengCheng { } /** - * 获取城市的小区 + * 鑾峰彇鍩庡競鐨勫皬鍖� * @param city * @return */ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/ShangHaiTongJiJuShuJu.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/ShangHaiTongJiJuShuJu.groovy index 2ed3b1245..1c09c7fe0 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/ShangHaiTongJiJuShuJu.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/ShangHaiTongJiJuShuJu.groovy @@ -17,7 +17,7 @@ import com.mongodb.DBCursor import com.mongodb.DBObject /** - * 成交量相关 + * 鎴愪氦閲忕浉鍏� * @author hubingliang * */ @@ -27,12 +27,12 @@ class ShangHaiTongJiJuShuJu{ public static final DBCollection SALE_DATA_STAT = MongoUtils.getCollectionByName("fangjia_base", "sale_data_stat", "mongo.db.fangjia.com", 27017) public static final DBCollection DISTRICT_STAT = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "mongo.db.fangjia.com", 27017) static main(args) { - exportData("上海") + exportData("涓婃捣") } public static void exportData(String city){ - List> blocks = inportDate("D:\\hbl\\Data\\tongjiju\\上海统计局数据需求.xlsx"); + List> blocks = inportDate("D:\\hbl\\Data\\tongjiju\\涓婃捣缁熻灞�鏁版嵁闇�姹�.xlsx"); List blos = getBls(blocks); List list = new ArrayList(); List diss = getDistrictData(city); @@ -47,7 +47,7 @@ class ShangHaiTongJiJuShuJu{ String block = dis.get("block"); ll.add(block); if(block!=null){ - block = block.replaceAll("板块", ""); + block = block.replaceAll("鏉垮潡", ""); } if(block!=null&&blos.contains(block)){ ll.add(1); @@ -74,7 +74,7 @@ class ShangHaiTongJiJuShuJu{ if(lat!=null&&lng!=null){ lat = lat/10000000000d; lng = lng/10000000000d; - loopLineInfo = huanXian("上海",lng,lat); + loopLineInfo = huanXian("涓婃捣",lng,lat); } println loopLineInfo ll.add(loopLineInfo); @@ -91,14 +91,14 @@ class ShangHaiTongJiJuShuJu{ exportData(city,ls); } - //对竣工时间进行 + //瀵圭宸ユ椂闂磋繘琛� public static String dateHnadle(String dateStr){ if(dateStr!=null&&dateStr.length()>=4){ return dateStr.substring(0, 4); } retrn null; } - //判断环线 + //鍒ゆ柇鐜嚎 public static String huanXian(String city,Double lng,Double lat){ AddLoopLineInfo ali = new AddLoopLineInfo(); Map> loopMap = ali.loopLinePositionNew(city); @@ -106,27 +106,27 @@ class ShangHaiTongJiJuShuJu{ return str; } - //获取板块列表 + //鑾峰彇鏉垮潡鍒楄〃 public static List getBls(List> blocks){ List list = new ArrayList(); for(List block:blocks){ if(block!=null&&block.size()>=2&&block.get(1)!=null){ String blo = (String)block.get(1); - blo = blo.replaceAll("板块", ""); + blo = blo.replaceAll("鏉垮潡", ""); list.add(blo); } } return list; } - //将excel中的数据导入 + //灏唀xcel涓殑鏁版嵁瀵煎叆 def static inportDate(String resource) { List> list = ExcelUtils.read(resource, 1,1); return list; } /** - * 根据城市区域小区名获取均价 + * 鏍规嵁鍩庡競鍖哄煙灏忓尯鍚嶈幏鍙栧潎浠� */ public static Integer getAvgPrice(String city,String region,String name){ Integer avgPrice = null; @@ -153,7 +153,7 @@ class ShangHaiTongJiJuShuJu{ } /** - * 获取城市的小区 + * 鑾峰彇鍩庡競鐨勫皬鍖� * @param city * @return */ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/ShuJuBao4Batch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/ShuJuBao4Batch.groovy index 65eea148d..7d80097bc 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/ShuJuBao4Batch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/ShuJuBao4Batch.groovy @@ -36,7 +36,7 @@ import com.mongodb.Mongo import org.apache.commons.lang.StringUtils /** - * 定时更新小区地址数据 + * 瀹氭椂鏇存柊灏忓尯鍦板潃鏁版嵁 * @author hubingliang * */ @@ -45,51 +45,51 @@ class ShuJuBao4Batch{ public static final DBCollection SERVER_AREA = MongoUtils.getCollectionByName("fangjia", "server_area", "mongo.db.fangjia.com", 27017) static main(args) { - /*ziDuanTianCong4("桂林", "D:\\hbl\\数据包\\数据包5\\","3.小区宽带的基础信息表--祝林燕--(户)",".xlsx",1); - ziDuanTianCong4("天津", "D:\\hbl\\数据包\\数据包5\\","7月12日最新天津小区表-雪莉-户数",".xls",2); - ziDuanTianCong4("成都", "D:\\hbl\\数据包\\数据包5\\","14.15.16年交房10.4更新(1)-Mia-户",".xls",3); - ziDuanTianCong4("天津", "D:\\hbl\\数据包\\数据包5\\","2010年在售待售限价房项目列表-雪莉-户数",".xls",1); - ziDuanTianCong4("成都", "D:\\hbl\\数据包\\数据包5\\","2012近半年温江交房情况调查(成都)-BOBO (户)",".xlsx",1); - ziDuanTianCong4("武汉", "D:\\hbl\\数据包\\数据包5\\","2014年11月的经开新楼盘数据--祝林燕--(户)",".xlsx",1); - ziDuanTianCong4("长春", "D:\\hbl\\数据包\\数据包5\\","2014年长春小区交房信息-雪莉-户",".xls",2); - ziDuanTianCong4("成都", "D:\\hbl\\数据包\\数据包5\\","2015年26个城市成交楼盘信息(成都)生活家家居老龚提供--祝林燕--(户)",".xlsx",1); - ziDuanTianCong4("郑州", "D:\\hbl\\数据包\\数据包5\\","2016郑州小区交房表-BOBO(户&楼)",".xlsx",1); - ziDuanTianCong4("北海", "D:\\hbl\\数据包\\数据包5\\","北海楼盘07-08交易汇总一览表-黄村粮-户",".xlsx",1); - ziDuanTianCong4("上海", "D:\\hbl\\数据包\\数据包5\\","分众传媒电梯广告平面海报上海点位表(可挑选)-黄村粮-户",".xls",1); - ziDuanTianCong4("福州", "D:\\hbl\\数据包\\数据包5\\","福州2015年所有楼盘交房时间统计--祝林燕--(户)",".xls",1); - ziDuanTianCong4("广州", "D:\\hbl\\数据包\\数据包5\\","广州电梯广告价格高端楼盘表-传播易--祝林燕--(户)",".xls",1); - ziDuanTianCong4("合肥", "D:\\hbl\\数据包\\数据包5\\","合肥 2011年交房小区-2-BOBO(户)",".xlsx",1); - ziDuanTianCong4("合肥", "D:\\hbl\\数据包\\数据包5\\","合肥市2014年小区交房明细表-雪莉-户数",".xls",1); - ziDuanTianCong4("天津", "D:\\hbl\\数据包\\数据包5\\","全市小区表--祝林燕--(户)",".xls",1); - ziDuanTianCong4("沈阳", "D:\\hbl\\数据包\\数据包5\\","沈阳2016在售楼盘信息--祝林燕--(户)",".xlsx",1); - ziDuanTianCong4("遂宁", "D:\\hbl\\数据包\\数据包5\\","遂宁河东楼盘入驻率调查-BOBO(户)",".xlsx",1); - ziDuanTianCong4("天津", "D:\\hbl\\数据包\\数据包5\\","天津电梯广告价格高端楼盘表-传播易--祝林燕--(户)",".xls",1); - ziDuanTianCong4("张家口", "D:\\hbl\\数据包\\数据包5\\","张家口市2011年保障性安居工程建设项目情况表--祝林燕--(户)",".xls",1); - ziDuanTianCong4("珠海", "D:\\hbl\\数据包\\数据包5\\","珠海各楼盘状况-雪莉-户",".xls",1);*/ + /*ziDuanTianCong4("妗傛灄", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�5\\","3.灏忓尯瀹藉甫鐨勫熀纭�淇℃伅琛�--绁濇灄鐕�--锛堟埛锛�",".xlsx",1); + ziDuanTianCong4("澶╂触", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�5\\","7鏈�12鏃ユ渶鏂板ぉ娲ュ皬鍖鸿〃-闆帀-鎴锋暟",".xls",2); + ziDuanTianCong4("鎴愰兘", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�5\\","14.15.16骞翠氦鎴�10.4鏇存柊(1)-Mia-鎴�",".xls",3); + ziDuanTianCong4("澶╂触", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�5\\","2010骞村湪鍞緟鍞檺浠锋埧椤圭洰鍒楄〃-闆帀-鎴锋暟",".xls",1); + ziDuanTianCong4("鎴愰兘", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�5\\","2012杩戝崐骞存俯姹熶氦鎴挎儏鍐佃皟鏌ワ紙鎴愰兘锛�-BOBO 锛堟埛锛�",".xlsx",1); + ziDuanTianCong4("姝︽眽", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�5\\","2014骞�11鏈堢殑缁忓紑鏂版ゼ鐩樻暟鎹�--绁濇灄鐕�--锛堟埛锛�",".xlsx",1); + ziDuanTianCong4("闀挎槬", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�5\\","2014骞撮暱鏄ュ皬鍖轰氦鎴夸俊鎭�-闆帀-鎴�",".xls",2); + ziDuanTianCong4("鎴愰兘", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�5\\","2015骞�26涓煄甯傛垚浜ゆゼ鐩樹俊鎭�(鎴愰兘)鐢熸椿瀹跺灞呰�侀練鎻愪緵--绁濇灄鐕�--锛堟埛锛�",".xlsx",1); + ziDuanTianCong4("閮戝窞", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�5\\","2016閮戝窞灏忓尯浜ゆ埧琛�-BOBO锛堟埛&妤硷級",".xlsx",1); + ziDuanTianCong4("鍖楁捣", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�5\\","鍖楁捣妤肩洏07-08浜ゆ槗姹囨�讳竴瑙堣〃-榛勬潙绮�-鎴�",".xlsx",1); + ziDuanTianCong4("涓婃捣", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�5\\","鍒嗕紬浼犲獟鐢垫骞垮憡骞抽潰娴锋姤涓婃捣鐐逛綅琛�(鍙寫閫�)-榛勬潙绮�-鎴�",".xls",1); + ziDuanTianCong4("绂忓窞", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�5\\","绂忓窞2015骞存墍鏈夋ゼ鐩樹氦鎴挎椂闂寸粺璁�--绁濇灄鐕�--(鎴�)",".xls",1); + ziDuanTianCong4("骞垮窞", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�5\\","骞垮窞鐢垫骞垮憡浠锋牸楂樼妤肩洏琛�-浼犳挱鏄�--绁濇灄鐕�--锛堟埛锛�",".xls",1); + ziDuanTianCong4("鍚堣偉", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�5\\","鍚堣偉 2011骞翠氦鎴垮皬鍖�-2-BOBO锛堟埛锛�",".xlsx",1); + ziDuanTianCong4("鍚堣偉", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�5\\","鍚堣偉甯�2014骞村皬鍖轰氦鎴挎槑缁嗚〃-闆帀-鎴锋暟",".xls",1); + ziDuanTianCong4("澶╂触", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�5\\","鍏ㄥ競灏忓尯琛�--绁濇灄鐕�--锛堟埛锛�",".xls",1); + ziDuanTianCong4("娌堥槼", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�5\\","娌堥槼2016鍦ㄥ敭妤肩洏淇℃伅--绁濇灄鐕�--锛堟埛锛�",".xlsx",1); + ziDuanTianCong4("閬傚畞", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�5\\","閬傚畞娌充笢妤肩洏鍏ラ┗鐜囪皟鏌�-BOBO锛堟埛锛�",".xlsx",1); + ziDuanTianCong4("澶╂触", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�5\\","澶╂触鐢垫骞垮憡浠锋牸楂樼妤肩洏琛�-浼犳挱鏄�--绁濇灄鐕�--锛堟埛锛�",".xls",1); + ziDuanTianCong4("寮犲鍙�", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�5\\","寮犲鍙e競2011骞翠繚闅滄�у畨灞呭伐绋嬪缓璁鹃」鐩儏鍐佃〃--绁濇灄鐕�--锛堟埛锛�",".xls",1); + ziDuanTianCong4("鐝犳捣", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�5\\","鐝犳捣鍚勬ゼ鐩樼姸鍐�-闆帀-鎴�",".xls",1);*/ - ziDuanTianCong4("合肥", "D:\\hbl\\数据包\\数据包6\\","2013合肥房地产排行榜-黄村粮-户",".xlsx",4); - ziDuanTianCong4("合肥", "D:\\hbl\\数据包\\数据包6\\","2014年交房统计-户-雪梨",".xls",1); - ziDuanTianCong4("合肥", "D:\\hbl\\数据包\\数据包6\\","2015合肥交房交付总表--祝林燕--(户&楼)",".xls",1); - ziDuanTianCong4("北京", "D:\\hbl\\数据包\\数据包6\\","2015年北京最新小区楼盘列表-BOBO",".xlsx",1); - ziDuanTianCong4("南京", "D:\\hbl\\数据包\\数据包6\\","2015年南京楼盘交付事件表格-Mia-户",".xlsx",1); - ziDuanTianCong4("成都", "D:\\hbl\\数据包\\数据包6\\","2017年成都十二区交房楼盘-BOBO (户)",".xlsx",1) - ziDuanTianCong4("北海", "D:\\hbl\\数据包\\数据包6\\","北海楼盘字典列表1--祝林燕--(户)",".xls",1); - ziDuanTianCong4("北京", "D:\\hbl\\数据包\\数据包6\\","北京电梯广告价格高端楼盘表-传播易-Mia-户",".xls",1); - ziDuanTianCong4("成都", "D:\\hbl\\数据包\\数据包6\\","成都2014年楼盘交房时间表(新)-黄村粮",".xls",2); - ziDuanTianCong4("成都", "D:\\hbl\\数据包\\数据包6\\","成都新楼盘-黄村粮-户",".xlsx",1); - ziDuanTianCong4("成都", "D:\\hbl\\数据包\\数据包6\\","分众社区楼盘表-黄村粮-户",".xls",1); - ziDuanTianCong4("广州", "D:\\hbl\\数据包\\数据包6\\","广州楼盘列表-BOBO",".xlsx",1); - ziDuanTianCong4("广州", "D:\\hbl\\数据包\\数据包6\\","广州最新楼盘表-BOBO(户)",".xlsx",1); - ziDuanTianCong4("深圳 ", "D:\\hbl\\数据包\\数据包6\\","国土局楼盘楼栋信息-黄村粮-户&楼",".xlsx",2); - ziDuanTianCong4("杭州", "D:\\hbl\\数据包\\数据包6\\","杭州楼盘清单--参考-BOBO(户)",".xlsx",1); - ziDuanTianCong4("合肥", "D:\\hbl\\数据包\\数据包6\\","合肥2013年交房数据-户楼栋-雪莉",".xls",1); - ziDuanTianCong4("南宁", "D:\\hbl\\数据包\\数据包6\\","南宁电梯广告价格高端楼盘表-传播易-Mia-户",".xls",1); - ziDuanTianCong4("上海", "D:\\hbl\\数据包\\数据包6\\","上海楼盘表-Mia-户",".xls",1); - ziDuanTianCong4("芜湖", "D:\\hbl\\数据包\\数据包6\\","芜湖城东区楼盘-黄村粮-户",".xls",3); - ziDuanTianCong4("武汉", "D:\\hbl\\数据包\\数据包6\\","武汉市各小区楼盘名册-Mia-户",".xls",1); - ziDuanTianCong4("武汉", "D:\\hbl\\数据包\\数据包6\\","武汉市全装修楼盘统计一览表-Mia-户",".xlsx",1); - ziDuanTianCong4("西安", "D:\\hbl\\数据包\\数据包6\\","西安市经济适用住房房源信息-Mia-户",".xlsx",1); + ziDuanTianCong4("鍚堣偉", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�6\\","2013鍚堣偉鎴垮湴浜ф帓琛屾-榛勬潙绮�-鎴�",".xlsx",4); + ziDuanTianCong4("鍚堣偉", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�6\\","2014骞翠氦鎴跨粺璁�-鎴�-闆ⅷ",".xls",1); + ziDuanTianCong4("鍚堣偉", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�6\\","2015鍚堣偉浜ゆ埧浜や粯鎬昏〃--绁濇灄鐕�--锛堟埛&妤硷級",".xls",1); + ziDuanTianCong4("鍖椾含", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�6\\","2015骞村寳浜渶鏂板皬鍖烘ゼ鐩樺垪琛�-BOBO",".xlsx",1); + ziDuanTianCong4("鍗椾含", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�6\\","2015骞村崡浜ゼ鐩樹氦浠樹簨浠惰〃鏍�-Mia-鎴�",".xlsx",1); + ziDuanTianCong4("鎴愰兘", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�6\\","2017骞存垚閮藉崄浜屽尯浜ゆ埧妤肩洏-BOBO 锛堟埛锛�",".xlsx",1) + ziDuanTianCong4("鍖楁捣", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�6\\","鍖楁捣妤肩洏瀛楀吀鍒楄〃1--绁濇灄鐕�--锛堟埛锛�",".xls",1); + ziDuanTianCong4("鍖椾含", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�6\\","鍖椾含鐢垫骞垮憡浠锋牸楂樼妤肩洏琛�-浼犳挱鏄�-Mia-鎴�",".xls",1); + ziDuanTianCong4("鎴愰兘", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�6\\","鎴愰兘2014骞存ゼ鐩樹氦鎴挎椂闂磋〃(鏂�)-榛勬潙绮�",".xls",2); + ziDuanTianCong4("鎴愰兘", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�6\\","鎴愰兘鏂版ゼ鐩�-榛勬潙绮�-鎴�",".xlsx",1); + ziDuanTianCong4("鎴愰兘", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�6\\","鍒嗕紬绀惧尯妤肩洏琛�-榛勬潙绮�-鎴�",".xls",1); + ziDuanTianCong4("骞垮窞", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�6\\","骞垮窞妤肩洏鍒楄〃-BOBO",".xlsx",1); + ziDuanTianCong4("骞垮窞", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�6\\","骞垮窞鏈�鏂版ゼ鐩樿〃-BOBO锛堟埛锛�",".xlsx",1); + ziDuanTianCong4("娣卞湷 ", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�6\\","鍥藉湡灞�妤肩洏妤兼爧淇℃伅-榛勬潙绮�-鎴�&妤�",".xlsx",2); + ziDuanTianCong4("鏉窞", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�6\\","鏉窞妤肩洏娓呭崟--鍙傝��-BOBO锛堟埛锛�",".xlsx",1); + ziDuanTianCong4("鍚堣偉", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�6\\","鍚堣偉2013骞翠氦鎴挎暟鎹�-鎴锋ゼ鏍�-闆帀",".xls",1); + ziDuanTianCong4("鍗楀畞", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�6\\","鍗楀畞鐢垫骞垮憡浠锋牸楂樼妤肩洏琛�-浼犳挱鏄�-Mia-鎴�",".xls",1); + ziDuanTianCong4("涓婃捣", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�6\\","涓婃捣妤肩洏琛�-Mia-鎴�",".xls",1); + ziDuanTianCong4("鑺滄箹", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�6\\","鑺滄箹鍩庝笢鍖烘ゼ鐩�-榛勬潙绮�-鎴�",".xls",3); + ziDuanTianCong4("姝︽眽", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�6\\","姝︽眽甯傚悇灏忓尯妤肩洏鍚嶅唽-Mia-鎴�",".xls",1); + ziDuanTianCong4("姝︽眽", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�6\\","姝︽眽甯傚叏瑁呬慨妤肩洏缁熻涓�瑙堣〃-Mia-鎴�",".xlsx",1); + ziDuanTianCong4("瑗垮畨", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�6\\","瑗垮畨甯傜粡娴庨�傜敤浣忔埧鎴挎簮淇℃伅-Mia-鎴�",".xlsx",1); } @@ -123,7 +123,7 @@ class ShuJuBao4Batch{ String re = list.get(1); String region = null; if(re!=null){ - region = re.replaceAll("区",""); + region = re.replaceAll("鍖�",""); } String name = list.get(2); Map map = matchPreAddress(city, region, list.get(2)); @@ -141,7 +141,7 @@ class ShuJuBao4Batch{ region = map.get("region"); name = map.get("name"); } - DBObject db = findDis(cityName,region,name);//查询 + DBObject db = findDis(cityName,region,name);//鏌ヨ if(db!=null){ boolean canUpdate = false; @@ -179,7 +179,7 @@ class ShuJuBao4Batch{ } if(canUpdate){ - //更新数据的代码 + //鏇存柊鏁版嵁鐨勪唬鐮� updateDis(db) } ls.add(list); @@ -198,7 +198,7 @@ class ShuJuBao4Batch{ exportData(city,fileName,ls); } def static exportData(String city,String fileName,List> datas) { - ExcelUtils.write("D:\\hbl\\Data\\数据包结果\\20170405\\"+fileName+".xlsx", datas, "Sheet1") + ExcelUtils.write("D:\\hbl\\Data\\鏁版嵁鍖呯粨鏋淺\20170405\\"+fileName+".xlsx", datas, "Sheet1") } public static boolean canUpdateDeveloper(DBObject dis,String excelDeveloper){ @@ -213,7 +213,7 @@ class ShuJuBao4Batch{ public static void updateDis(DBObject db){ - //更新数据的代码 + //鏇存柊鏁版嵁鐨勪唬鐮� Map mark_map = db.mark_map if(!mark_map){ mark_map = [:] @@ -226,7 +226,7 @@ class ShuJuBao4Batch{ /** - * 对小区中的一般字段进行更新 + * 瀵瑰皬鍖轰腑鐨勪竴鑸瓧娈佃繘琛屾洿鏂� */ public static void updateDis(DBObject dis,String fieldName,String value){ if(dis!=null&&dis.get(fieldName)==null){ @@ -234,7 +234,7 @@ class ShuJuBao4Batch{ } } /** - * 对小区中户数的字段判断是否能够更新 + * 瀵瑰皬鍖轰腑鎴锋暟鐨勫瓧娈靛垽鏂槸鍚﹁兘澶熸洿鏂� */ public static boolean houseHoldFiledCan(DBObject dis,Integer value){ if(dis==null||value==null){ @@ -244,7 +244,7 @@ class ShuJuBao4Batch{ } /** - * 判断竣工字段能否更新 + * 鍒ゆ柇绔e伐瀛楁鑳藉惁鏇存柊 */ public static boolean finishBuildingDateCan(DBObject dis,String value){ if(dis==null||value==null){ @@ -257,7 +257,7 @@ class ShuJuBao4Batch{ return false; } /** - * 小区查询 + * 灏忓尯鏌ヨ */ public static DBObject findDis(String city,String region,String name){ BasicDBObject qu = new BasicDBObject() @@ -275,7 +275,7 @@ class ShuJuBao4Batch{ /** - * 获取城市的小区 + * 鑾峰彇鍩庡競鐨勫皬鍖� * @param city * @return */ @@ -289,7 +289,7 @@ class ShuJuBao4Batch{ return dbs; } /** - *Date转化成String + *Date杞寲鎴怱tring */ public static String dateToString(Date date,String type){ if(date==null){ @@ -306,14 +306,14 @@ class ShuJuBao4Batch{ format = DateFormat.getDateInstance(DateFormat.MEDIUM); str = format.format(date); } else if (type.equals("FULL")) { - // 2007年1月18日 星期四 + // 2007骞�1鏈�18鏃� 鏄熸湡鍥� format = DateFormat.getDateInstance(DateFormat.FULL); str = format.format(date); } return str; } /** - * 小区名址匹配 + * 灏忓尯鍚嶅潃鍖归厤 */ public static Map matchPreAddress(String city,String region,String address){ JSONObject result = OpenApiClient.addressMatch(city,address,"property",false,region,"strict"); @@ -331,7 +331,7 @@ class ShuJuBao4Batch{ } /** - * 匹配 + * 鍖归厤 * @param text * @return */ @@ -351,30 +351,30 @@ class ShuJuBao4Batch{ public static List getHeader(){ List list = new ArrayList(); - list.add("城市") - list.add("区域") - list.add("小区名") - list.add("建筑时间") - list.add("容积率") - list.add("户数") - list.add("开盘时间") - list.add("交房时间") - list.add("名称别名") - list.add("绿化率") - list.add("物业类型") - list.add("开发商") - list.add("物业公司") - list.add("停车位") - list.add("产权年限") - list.add("竣工时间") - list.add("建筑面积") - list.add("占地面积") - list.add("物业费") - list.add("商圈") - list.add("地址") - list.add("建筑类型") - list.add("户数填入") - list.add("竣工时间填入") + list.add("鍩庡競") + list.add("鍖哄煙") + list.add("灏忓尯鍚�") + list.add("寤虹瓚鏃堕棿") + list.add("瀹圭Н鐜�") + list.add("鎴锋暟") + list.add("寮�鐩樻椂闂�") + list.add("浜ゆ埧鏃堕棿") + list.add("鍚嶇О鍒悕") + list.add("缁垮寲鐜�") + list.add("鐗╀笟绫诲瀷") + list.add("寮�鍙戝晢") + list.add("鐗╀笟鍏徃") + list.add("鍋滆溅浣�") + list.add("浜ф潈骞撮檺") + list.add("绔e伐鏃堕棿") + list.add("寤虹瓚闈㈢Н") + list.add("鍗犲湴闈㈢Н") + list.add("鐗╀笟璐�") + list.add("鍟嗗湀") + list.add("鍦板潃") + list.add("寤虹瓚绫诲瀷") + list.add("鎴锋暟濉叆") + list.add("绔e伐鏃堕棿濉叆") return list } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/ShuJuBaoBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/ShuJuBaoBatch.groovy index bce6b6fff..07d8d0201 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/ShuJuBaoBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/ShuJuBaoBatch.groovy @@ -36,7 +36,7 @@ import com.mongodb.Mongo import org.apache.commons.lang.StringUtils /** - * 定时更新小区地址数据 + * 瀹氭椂鏇存柊灏忓尯鍦板潃鏁版嵁 * @author hubingliang * */ @@ -45,32 +45,32 @@ class ShuJuBaoBatch{ public static final DBCollection SERVER_AREA = MongoUtils.getCollectionByName("fangjia", "server_area", "mongo.db.fangjia.com", 27017) static main(args) { - /*ziDuanTianCong5("成都", "D:\\hbl\\Data\\数据包2\\户数竣工时间\\870成都小区数据BOBO户.xlsx",1); - ziDuanTianCong5("南宁", "D:\\hbl\\Data\\数据包2\\户数竣工时间\\2011交房楼盘信息全统计-黄村粮-(户).xlsx",1); - ziDuanTianCong5("成都", "D:\\hbl\\Data\\数据包2\\户数竣工时间\\2012、2013成都交房楼盘表(新)-Mia-(户).xls",2); - ziDuanTianCong5("东营", "D:\\hbl\\Data\\数据包2\\户数竣工时间\\东营.xls",2); - ziDuanTianCong5("淮安", "D:\\hbl\\Data\\数据包2\\户数竣工时间\\洪泽县楼盘统计-汪世冠-(户).xlsx",1); - ziDuanTianCong5("江阴", "D:\\hbl\\Data\\数据包2\\户数竣工时间\\江阴市商品房销售成交情况统计56-60-汪世冠-(户).xls",1); - ziDuanTianCong5("厦门", "D:\\hbl\\Data\\数据包2\\户数竣工时间\\厦门楼盘大全(1999年-2010年)-汪世冠-(户).xls",1); - ziDuanTianCong5("苏州", "D:\\hbl\\Data\\数据包2\\户数竣工时间\\苏州2015年交房统计-Mia-(户).xls",1); - ziDuanTianCong5("新余", "D:\\hbl\\Data\\数据包2\\户数竣工时间\\新余市楼盘统计资料-汪世冠-(户).xls",3); - ziDuanTianCong5("重庆", "D:\\hbl\\Data\\数据包2\\户数竣工时间\\重庆市江北区全部楼盘列表-黄村粮-(户).xlsx",1); - ziDuanTianCong5("南京", "D:\\hbl\\Data\\数据包2\\户数竣工时间\\2012年南京近期交付楼盘统计-黄村粮-(户).xlsx",1);*/ + /*ziDuanTianCong5("鎴愰兘", "D:\\hbl\\Data\\鏁版嵁鍖�2\\鎴锋暟绔e伐鏃堕棿\\870鎴愰兘灏忓尯鏁版嵁BOBO鎴�.xlsx",1); + ziDuanTianCong5("鍗楀畞", "D:\\hbl\\Data\\鏁版嵁鍖�2\\鎴锋暟绔e伐鏃堕棿\\2011浜ゆ埧妤肩洏淇℃伅鍏ㄧ粺璁�-榛勬潙绮�-(鎴�).xlsx",1); + ziDuanTianCong5("鎴愰兘", "D:\\hbl\\Data\\鏁版嵁鍖�2\\鎴锋暟绔e伐鏃堕棿\\2012銆�2013鎴愰兘浜ゆ埧妤肩洏琛�(鏂�)-Mia-(鎴凤級.xls",2); + ziDuanTianCong5("涓滆惀", "D:\\hbl\\Data\\鏁版嵁鍖�2\\鎴锋暟绔e伐鏃堕棿\\涓滆惀.xls",2); + ziDuanTianCong5("娣畨", "D:\\hbl\\Data\\鏁版嵁鍖�2\\鎴锋暟绔e伐鏃堕棿\\娲辰鍘挎ゼ鐩樼粺璁�-姹笘鍐�-(鎴�).xlsx",1); + ziDuanTianCong5("姹熼槾", "D:\\hbl\\Data\\鏁版嵁鍖�2\\鎴锋暟绔e伐鏃堕棿\\姹熼槾甯傚晢鍝佹埧閿�鍞垚浜ゆ儏鍐电粺璁�56-60-姹笘鍐�-(鎴�).xls",1); + ziDuanTianCong5("鍘﹂棬", "D:\\hbl\\Data\\鏁版嵁鍖�2\\鎴锋暟绔e伐鏃堕棿\\鍘﹂棬妤肩洏澶у叏(1999骞�-2010骞�)-姹笘鍐�-(鎴�).xls",1); + ziDuanTianCong5("鑻忓窞", "D:\\hbl\\Data\\鏁版嵁鍖�2\\鎴锋暟绔e伐鏃堕棿\\鑻忓窞2015骞翠氦鎴跨粺璁�-Mia-(鎴凤級.xls",1); + ziDuanTianCong5("鏂颁綑", "D:\\hbl\\Data\\鏁版嵁鍖�2\\鎴锋暟绔e伐鏃堕棿\\鏂颁綑甯傛ゼ鐩樼粺璁¤祫鏂�-姹笘鍐�-(鎴�).xls",3); + ziDuanTianCong5("閲嶅簡", "D:\\hbl\\Data\\鏁版嵁鍖�2\\鎴锋暟绔e伐鏃堕棿\\閲嶅簡甯傛睙鍖楀尯鍏ㄩ儴妤肩洏鍒楄〃-榛勬潙绮�-锛堟埛锛�.xlsx",1); + ziDuanTianCong5("鍗椾含", "D:\\hbl\\Data\\鏁版嵁鍖�2\\鎴锋暟绔e伐鏃堕棿\\2012骞村崡浜繎鏈熶氦浠樻ゼ鐩樼粺璁�-榛勬潙绮�-锛堟埛锛�.xlsx",1);*/ - //数据包3 + //鏁版嵁鍖�3 - //ziDuanTianCong5("绵阳", "D:\\hbl\\Data\\数据包3\\户数&竣工时间\\2015年绵阳交房楼盘信息-汪世冠-户.xlsx",1); - //ziDuanTianCong5("大连", "D:\\hbl\\Data\\数据包3\\户数&竣工时间\\2016年大连各小区交房信息-杭州BOBO(户).xlsx",1); -// ziDuanTianCong5("芜湖", "D:\\hbl\\Data\\数据包3\\户数&竣工时间\\20130712芜湖县商品房预售信息统计(2012年-至今)-BOBO(户&楼).xlsx",1); - //ziDuanTianCong5("峨眉山", "D:\\hbl\\Data\\数据包3\\户数&竣工时间\\峨眉楼盘信息-汪世冠-(户).xls",2); -// ziDuanTianCong5("南京", "D:\\hbl\\Data\\数据包3\\户数&竣工时间\\南京市2013年交房楼盘-BOBO(户&楼).xlsx",1); -// ziDuanTianCong5("南阳", "D:\\hbl\\Data\\数据包3\\户数&竣工时间\\南阳市楼盘情况详细一览表-雪莉-(户).xlsx",1); -// ziDuanTianCong5("杭州", "D:\\hbl\\Data\\数据包3\\户数&竣工时间\\小区交房数据统计2016年-BOBO(户).xlsx",1); -// ziDuanTianCong5("湛江", "D:\\hbl\\Data\\数据包3\\户数&竣工时间\\湛江2016年下半年交房楼盘表-BOBO-(户).xlsx",1); - ziDuanTianCong5("长沙", "D:\\hbl\\Data\\数据包3\\户数&竣工时间\\长沙市小区信息2015.2月--祝林燕--(户).xlsx",1); - //ziDuanTianCong5("合肥", "D:\\hbl\\Data\\数据包3\\户数&竣工时间\\最新版2014年合肥市交房小区信息表-BOBOB(户&楼).xlsx",1); + //ziDuanTianCong5("缁甸槼", "D:\\hbl\\Data\\鏁版嵁鍖�3\\鎴锋暟&绔e伐鏃堕棿\\2015骞寸坏闃充氦鎴挎ゼ鐩樹俊鎭�-姹笘鍐�-鎴�.xlsx",1); + //ziDuanTianCong5("澶ц繛", "D:\\hbl\\Data\\鏁版嵁鍖�3\\鎴锋暟&绔e伐鏃堕棿\\2016骞村ぇ杩炲悇灏忓尯浜ゆ埧淇℃伅-鏉窞BOBO锛堟埛锛�.xlsx",1); +// ziDuanTianCong5("鑺滄箹", "D:\\hbl\\Data\\鏁版嵁鍖�3\\鎴锋暟&绔e伐鏃堕棿\\20130712鑺滄箹鍘垮晢鍝佹埧棰勫敭淇℃伅缁熻(2012骞�-鑷充粖)-BOBO锛堟埛&妤硷級.xlsx",1); + //ziDuanTianCong5("宄ㄧ湁灞�", "D:\\hbl\\Data\\鏁版嵁鍖�3\\鎴锋暟&绔e伐鏃堕棿\\宄ㄧ湁妤肩洏淇℃伅-姹笘鍐�-(鎴�).xls",2); +// ziDuanTianCong5("鍗椾含", "D:\\hbl\\Data\\鏁版嵁鍖�3\\鎴锋暟&绔e伐鏃堕棿\\鍗椾含甯�2013骞翠氦鎴挎ゼ鐩�-BOBO锛堟埛&妤硷級.xlsx",1); +// ziDuanTianCong5("鍗楅槼", "D:\\hbl\\Data\\鏁版嵁鍖�3\\鎴锋暟&绔e伐鏃堕棿\\鍗楅槼甯傛ゼ鐩樻儏鍐佃缁嗕竴瑙堣〃-闆帀-(鎴�).xlsx",1); +// ziDuanTianCong5("鏉窞", "D:\\hbl\\Data\\鏁版嵁鍖�3\\鎴锋暟&绔e伐鏃堕棿\\灏忓尯浜ゆ埧鏁版嵁缁熻2016骞�-BOBO锛堟埛锛�.xlsx",1); +// ziDuanTianCong5("婀涙睙", "D:\\hbl\\Data\\鏁版嵁鍖�3\\鎴锋暟&绔e伐鏃堕棿\\婀涙睙2016骞翠笅鍗婂勾浜ゆ埧妤肩洏琛�-BOBO-(鎴�).xlsx",1); + ziDuanTianCong5("闀挎矙", "D:\\hbl\\Data\\鏁版嵁鍖�3\\鎴锋暟&绔e伐鏃堕棿\\闀挎矙甯傚皬鍖轰俊鎭�2015.2鏈�--绁濇灄鐕�--(鎴凤級.xlsx",1); + //ziDuanTianCong5("鍚堣偉", "D:\\hbl\\Data\\鏁版嵁鍖�3\\鎴锋暟&绔e伐鏃堕棿\\鏈�鏂扮増2014骞村悎鑲ュ競浜ゆ埧灏忓尯淇℃伅琛�-BOBOB锛堟埛&妤硷級.xlsx",1); - //ziDuanTianCong5("绵阳", "D:\\hbl\\Data\\数据包3\\20170309\\大连-祝林燕-审.xlsx",0); + //ziDuanTianCong5("缁甸槼", "D:\\hbl\\Data\\鏁版嵁鍖�3\\20170309\\澶ц繛-绁濇灄鐕�-瀹�.xlsx",0); } @@ -98,7 +98,7 @@ class ShuJuBaoBatch{ String re = list.get(1); String region = null; if(re!=null){ - region = re.replaceAll("区",""); + region = re.replaceAll("鍖�",""); } String name = list.get(2); Map map = matchPreAddress(city, region, list.get(2)); @@ -113,7 +113,7 @@ class ShuJuBaoBatch{ region = map.get("region"); name = map.get("name"); } - DBObject db = findDis(cityName,region,name);//查询 + DBObject db = findDis(cityName,region,name);//鏌ヨ if(db!=null){ boolean canUpdate = false; @@ -154,7 +154,7 @@ class ShuJuBaoBatch{ } if(canUpdate){ - //更新数据的代码 + //鏇存柊鏁版嵁鐨勪唬鐮� Map mark_map = db.mark_map if(!mark_map){ mark_map = [:] @@ -181,18 +181,18 @@ class ShuJuBaoBatch{ exportData(city,ls); } def static exportData(String city,List> datas) { - ExcelUtils.write("D:\\hbl\\Data\\数据包结果\\2017030903\\"+city+".xlsx", datas, "Sheet1") + ExcelUtils.write("D:\\hbl\\Data\\鏁版嵁鍖呯粨鏋淺\2017030903\\"+city+".xlsx", datas, "Sheet1") } /** - * 对数据库中的字段进行更新 + * 瀵规暟鎹簱涓殑瀛楁杩涜鏇存柊 */ public static void updateDistrict(DBObject dis,Integer household,String finishBuildTime){ } /** - * 对小区中的一般字段进行更新 + * 瀵瑰皬鍖轰腑鐨勪竴鑸瓧娈佃繘琛屾洿鏂� */ public static void updateDis(DBObject dis,String fieldName,String value){ if(dis!=null&&dis.get(fieldName)==null){ @@ -200,7 +200,7 @@ class ShuJuBaoBatch{ } } /** - * 对小区中户数的字段判断是否能够更新 + * 瀵瑰皬鍖轰腑鎴锋暟鐨勫瓧娈靛垽鏂槸鍚﹁兘澶熸洿鏂� */ public static boolean houseHoldFiledCan(DBObject dis,Integer value){ if(dis==null||value==null){ @@ -210,7 +210,7 @@ class ShuJuBaoBatch{ } /** - * 判断竣工字段能否更新 + * 鍒ゆ柇绔e伐瀛楁鑳藉惁鏇存柊 */ public static boolean finishBuildingDateCan(DBObject dis,String value){ if(dis==null||value==null){ @@ -223,7 +223,7 @@ class ShuJuBaoBatch{ return false; } /** - * 小区查询 + * 灏忓尯鏌ヨ */ public static DBObject findDis(String city,String region,String name){ BasicDBObject qu = new BasicDBObject() @@ -241,7 +241,7 @@ class ShuJuBaoBatch{ /** - * 获取城市的小区 + * 鑾峰彇鍩庡競鐨勫皬鍖� * @param city * @return */ @@ -255,7 +255,7 @@ class ShuJuBaoBatch{ return dbs; } /** - *Date转化成String + *Date杞寲鎴怱tring */ public static String dateToString(Date date,String type){ if(date==null){ @@ -272,14 +272,14 @@ class ShuJuBaoBatch{ format = DateFormat.getDateInstance(DateFormat.MEDIUM); str = format.format(date); } else if (type.equals("FULL")) { - // 2007年1月18日 星期四 + // 2007骞�1鏈�18鏃� 鏄熸湡鍥� format = DateFormat.getDateInstance(DateFormat.FULL); str = format.format(date); } return str; } /** - * 小区名址匹配 + * 灏忓尯鍚嶅潃鍖归厤 */ public static Map matchPreAddress(String city,String region,String address){ JSONObject result = OpenApiClient.addressMatch(city,address,"property",false,region,"strict"); @@ -297,7 +297,7 @@ class ShuJuBaoBatch{ } /** - * 匹配 + * 鍖归厤 * @param text * @return */ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/ShuJuBaoCommunalBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/ShuJuBaoCommunalBatch.groovy index 6f3076937..4edeb6d40 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/ShuJuBaoCommunalBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/ShuJuBaoCommunalBatch.groovy @@ -38,7 +38,7 @@ import com.mongodb.Mongo import org.apache.commons.lang.StringUtils /** - * 定时更新小区地址数据 + * 瀹氭椂鏇存柊灏忓尯鍦板潃鏁版嵁 * @author hubingliang * */ @@ -47,76 +47,76 @@ class ShuJuBaoCommunalBatch{ public static final DBCollection SERVER_AREA = MongoUtils.getCollectionByName("fangjia", "server_area", "mongo.db.fangjia.com", 27017) static main(args) { - /*ziDuanTianCong4("桂林", "D:\\hbl\\数据包\\数据包5\\","3.小区宽带的基础信息表--祝林燕--(户)",".xlsx",1); - ziDuanTianCong4("天津", "D:\\hbl\\数据包\\数据包5\\","7月12日最新天津小区表-雪莉-户数",".xls",2); - ziDuanTianCong4("成都", "D:\\hbl\\数据包\\数据包5\\","14.15.16年交房10.4更新(1)-Mia-户",".xls",3); - ziDuanTianCong4("天津", "D:\\hbl\\数据包\\数据包5\\","2010年在售待售限价房项目列表-雪莉-户数",".xls",1); - ziDuanTianCong4("成都", "D:\\hbl\\数据包\\数据包5\\","2012近半年温江交房情况调查(成都)-BOBO (户)",".xlsx",1); - ziDuanTianCong4("武汉", "D:\\hbl\\数据包\\数据包5\\","2014年11月的经开新楼盘数据--祝林燕--(户)",".xlsx",1); - ziDuanTianCong4("长春", "D:\\hbl\\数据包\\数据包5\\","2014年长春小区交房信息-雪莉-户",".xls",2); - ziDuanTianCong4("成都", "D:\\hbl\\数据包\\数据包5\\","2015年26个城市成交楼盘信息(成都)生活家家居老龚提供--祝林燕--(户)",".xlsx",1); - ziDuanTianCong4("郑州", "D:\\hbl\\数据包\\数据包5\\","2016郑州小区交房表-BOBO(户&楼)",".xlsx",1); - ziDuanTianCong4("北海", "D:\\hbl\\数据包\\数据包5\\","北海楼盘07-08交易汇总一览表-黄村粮-户",".xlsx",1); - ziDuanTianCong4("上海", "D:\\hbl\\数据包\\数据包5\\","分众传媒电梯广告平面海报上海点位表(可挑选)-黄村粮-户",".xls",1); - ziDuanTianCong4("福州", "D:\\hbl\\数据包\\数据包5\\","福州2015年所有楼盘交房时间统计--祝林燕--(户)",".xls",1); - ziDuanTianCong4("广州", "D:\\hbl\\数据包\\数据包5\\","广州电梯广告价格高端楼盘表-传播易--祝林燕--(户)",".xls",1); - ziDuanTianCong4("合肥", "D:\\hbl\\数据包\\数据包5\\","合肥 2011年交房小区-2-BOBO(户)",".xlsx",1); - ziDuanTianCong4("合肥", "D:\\hbl\\数据包\\数据包5\\","合肥市2014年小区交房明细表-雪莉-户数",".xls",1); - ziDuanTianCong4("天津", "D:\\hbl\\数据包\\数据包5\\","全市小区表--祝林燕--(户)",".xls",1); - ziDuanTianCong4("沈阳", "D:\\hbl\\数据包\\数据包5\\","沈阳2016在售楼盘信息--祝林燕--(户)",".xlsx",1); - ziDuanTianCong4("遂宁", "D:\\hbl\\数据包\\数据包5\\","遂宁河东楼盘入驻率调查-BOBO(户)",".xlsx",1); - ziDuanTianCong4("天津", "D:\\hbl\\数据包\\数据包5\\","天津电梯广告价格高端楼盘表-传播易--祝林燕--(户)",".xls",1); - ziDuanTianCong4("张家口", "D:\\hbl\\数据包\\数据包5\\","张家口市2011年保障性安居工程建设项目情况表--祝林燕--(户)",".xls",1); - ziDuanTianCong4("珠海", "D:\\hbl\\数据包\\数据包5\\","珠海各楼盘状况-雪莉-户",".xls",1);*/ + /*ziDuanTianCong4("妗傛灄", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�5\\","3.灏忓尯瀹藉甫鐨勫熀纭�淇℃伅琛�--绁濇灄鐕�--锛堟埛锛�",".xlsx",1); + ziDuanTianCong4("澶╂触", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�5\\","7鏈�12鏃ユ渶鏂板ぉ娲ュ皬鍖鸿〃-闆帀-鎴锋暟",".xls",2); + ziDuanTianCong4("鎴愰兘", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�5\\","14.15.16骞翠氦鎴�10.4鏇存柊(1)-Mia-鎴�",".xls",3); + ziDuanTianCong4("澶╂触", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�5\\","2010骞村湪鍞緟鍞檺浠锋埧椤圭洰鍒楄〃-闆帀-鎴锋暟",".xls",1); + ziDuanTianCong4("鎴愰兘", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�5\\","2012杩戝崐骞存俯姹熶氦鎴挎儏鍐佃皟鏌ワ紙鎴愰兘锛�-BOBO 锛堟埛锛�",".xlsx",1); + ziDuanTianCong4("姝︽眽", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�5\\","2014骞�11鏈堢殑缁忓紑鏂版ゼ鐩樻暟鎹�--绁濇灄鐕�--锛堟埛锛�",".xlsx",1); + ziDuanTianCong4("闀挎槬", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�5\\","2014骞撮暱鏄ュ皬鍖轰氦鎴夸俊鎭�-闆帀-鎴�",".xls",2); + ziDuanTianCong4("鎴愰兘", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�5\\","2015骞�26涓煄甯傛垚浜ゆゼ鐩樹俊鎭�(鎴愰兘)鐢熸椿瀹跺灞呰�侀練鎻愪緵--绁濇灄鐕�--锛堟埛锛�",".xlsx",1); + ziDuanTianCong4("閮戝窞", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�5\\","2016閮戝窞灏忓尯浜ゆ埧琛�-BOBO锛堟埛&妤硷級",".xlsx",1); + ziDuanTianCong4("鍖楁捣", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�5\\","鍖楁捣妤肩洏07-08浜ゆ槗姹囨�讳竴瑙堣〃-榛勬潙绮�-鎴�",".xlsx",1); + ziDuanTianCong4("涓婃捣", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�5\\","鍒嗕紬浼犲獟鐢垫骞垮憡骞抽潰娴锋姤涓婃捣鐐逛綅琛�(鍙寫閫�)-榛勬潙绮�-鎴�",".xls",1); + ziDuanTianCong4("绂忓窞", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�5\\","绂忓窞2015骞存墍鏈夋ゼ鐩樹氦鎴挎椂闂寸粺璁�--绁濇灄鐕�--(鎴�)",".xls",1); + ziDuanTianCong4("骞垮窞", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�5\\","骞垮窞鐢垫骞垮憡浠锋牸楂樼妤肩洏琛�-浼犳挱鏄�--绁濇灄鐕�--锛堟埛锛�",".xls",1); + ziDuanTianCong4("鍚堣偉", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�5\\","鍚堣偉 2011骞翠氦鎴垮皬鍖�-2-BOBO锛堟埛锛�",".xlsx",1); + ziDuanTianCong4("鍚堣偉", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�5\\","鍚堣偉甯�2014骞村皬鍖轰氦鎴挎槑缁嗚〃-闆帀-鎴锋暟",".xls",1); + ziDuanTianCong4("澶╂触", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�5\\","鍏ㄥ競灏忓尯琛�--绁濇灄鐕�--锛堟埛锛�",".xls",1); + ziDuanTianCong4("娌堥槼", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�5\\","娌堥槼2016鍦ㄥ敭妤肩洏淇℃伅--绁濇灄鐕�--锛堟埛锛�",".xlsx",1); + ziDuanTianCong4("閬傚畞", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�5\\","閬傚畞娌充笢妤肩洏鍏ラ┗鐜囪皟鏌�-BOBO锛堟埛锛�",".xlsx",1); + ziDuanTianCong4("澶╂触", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�5\\","澶╂触鐢垫骞垮憡浠锋牸楂樼妤肩洏琛�-浼犳挱鏄�--绁濇灄鐕�--锛堟埛锛�",".xls",1); + ziDuanTianCong4("寮犲鍙�", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�5\\","寮犲鍙e競2011骞翠繚闅滄�у畨灞呭伐绋嬪缓璁鹃」鐩儏鍐佃〃--绁濇灄鐕�--锛堟埛锛�",".xls",1); + ziDuanTianCong4("鐝犳捣", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�5\\","鐝犳捣鍚勬ゼ鐩樼姸鍐�-闆帀-鎴�",".xls",1);*/ - //ziDuanTianCong4("合肥", "D:\\hbl\\数据包\\数据包6\\","2013合肥房地产排行榜-黄村粮-户",".xlsx",4); - /*ziDuanTianCong4("合肥", "D:\\hbl\\数据包\\数据包6\\","2014年交房统计-户-雪梨",".xls",1); - ziDuanTianCong4("合肥", "D:\\hbl\\数据包\\数据包6\\","2015合肥交房交付总表--祝林燕--(户&楼)",".xls",1); - ziDuanTianCong4("北京", "D:\\hbl\\数据包\\数据包6\\","2015年北京最新小区楼盘列表-BOBO",".xlsx",1); - ziDuanTianCong4("南京", "D:\\hbl\\数据包\\数据包6\\","2015年南京楼盘交付事件表格-Mia-户",".xlsx",1); - ziDuanTianCong4("成都", "D:\\hbl\\数据包\\数据包6\\","2017年成都十二区交房楼盘-BOBO (户)",".xlsx",1) - ziDuanTianCong4("北海", "D:\\hbl\\数据包\\数据包6\\","北海楼盘字典列表1--祝林燕--(户)",".xls",1); - ziDuanTianCong4("北京", "D:\\hbl\\数据包\\数据包6\\","北京电梯广告价格高端楼盘表-传播易-Mia-户",".xls",1); - ziDuanTianCong4("成都", "D:\\hbl\\数据包\\数据包6\\","成都2014年楼盘交房时间表(新)-黄村粮",".xls",2); - ziDuanTianCong4("成都", "D:\\hbl\\数据包\\数据包6\\","成都新楼盘-黄村粮-户",".xlsx",1); - ziDuanTianCong4("成都", "D:\\hbl\\数据包\\数据包6\\","分众社区楼盘表-黄村粮-户",".xls",1); - ziDuanTianCong4("广州", "D:\\hbl\\数据包\\数据包6\\","广州楼盘列表-BOBO",".xlsx",1); - ziDuanTianCong4("广州", "D:\\hbl\\数据包\\数据包6\\","广州最新楼盘表-BOBO(户)",".xlsx",0); - ziDuanTianCong4("深圳 ", "D:\\hbl\\数据包\\数据包6\\","国土局楼盘楼栋信息-黄村粮-户&楼",".xlsx",2); - ziDuanTianCong4("杭州", "D:\\hbl\\数据包\\数据包6\\","杭州楼盘清单--参考-BOBO(户)",".xlsx",1); - ziDuanTianCong4("合肥", "D:\\hbl\\数据包\\数据包6\\","合肥2013年交房数据-户楼栋-雪莉",".xls",1); - ziDuanTianCong4("南宁", "D:\\hbl\\数据包\\数据包6\\","南宁电梯广告价格高端楼盘表-传播易-Mia-户",".xls",1); - ziDuanTianCong4("上海", "D:\\hbl\\数据包\\数据包6\\","上海楼盘表-Mia-户",".xls",1); - ziDuanTianCong4("芜湖", "D:\\hbl\\数据包\\数据包6\\","芜湖城东区楼盘-黄村粮-户",".xls",3); - ziDuanTianCong4("武汉", "D:\\hbl\\数据包\\数据包6\\","武汉市各小区楼盘名册-Mia-户",".xls",1); - ziDuanTianCong4("武汉", "D:\\hbl\\数据包\\数据包6\\","武汉市全装修楼盘统计一览表-Mia-户",".xlsx",1); - ziDuanTianCong4("西安", "D:\\hbl\\数据包\\数据包6\\","西安市经济适用住房房源信息-Mia-户",".xlsx",1);*/ + //ziDuanTianCong4("鍚堣偉", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�6\\","2013鍚堣偉鎴垮湴浜ф帓琛屾-榛勬潙绮�-鎴�",".xlsx",4); + /*ziDuanTianCong4("鍚堣偉", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�6\\","2014骞翠氦鎴跨粺璁�-鎴�-闆ⅷ",".xls",1); + ziDuanTianCong4("鍚堣偉", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�6\\","2015鍚堣偉浜ゆ埧浜や粯鎬昏〃--绁濇灄鐕�--锛堟埛&妤硷級",".xls",1); + ziDuanTianCong4("鍖椾含", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�6\\","2015骞村寳浜渶鏂板皬鍖烘ゼ鐩樺垪琛�-BOBO",".xlsx",1); + ziDuanTianCong4("鍗椾含", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�6\\","2015骞村崡浜ゼ鐩樹氦浠樹簨浠惰〃鏍�-Mia-鎴�",".xlsx",1); + ziDuanTianCong4("鎴愰兘", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�6\\","2017骞存垚閮藉崄浜屽尯浜ゆ埧妤肩洏-BOBO 锛堟埛锛�",".xlsx",1) + ziDuanTianCong4("鍖楁捣", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�6\\","鍖楁捣妤肩洏瀛楀吀鍒楄〃1--绁濇灄鐕�--锛堟埛锛�",".xls",1); + ziDuanTianCong4("鍖椾含", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�6\\","鍖椾含鐢垫骞垮憡浠锋牸楂樼妤肩洏琛�-浼犳挱鏄�-Mia-鎴�",".xls",1); + ziDuanTianCong4("鎴愰兘", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�6\\","鎴愰兘2014骞存ゼ鐩樹氦鎴挎椂闂磋〃(鏂�)-榛勬潙绮�",".xls",2); + ziDuanTianCong4("鎴愰兘", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�6\\","鎴愰兘鏂版ゼ鐩�-榛勬潙绮�-鎴�",".xlsx",1); + ziDuanTianCong4("鎴愰兘", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�6\\","鍒嗕紬绀惧尯妤肩洏琛�-榛勬潙绮�-鎴�",".xls",1); + ziDuanTianCong4("骞垮窞", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�6\\","骞垮窞妤肩洏鍒楄〃-BOBO",".xlsx",1); + ziDuanTianCong4("骞垮窞", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�6\\","骞垮窞鏈�鏂版ゼ鐩樿〃-BOBO锛堟埛锛�",".xlsx",0); + ziDuanTianCong4("娣卞湷 ", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�6\\","鍥藉湡灞�妤肩洏妤兼爧淇℃伅-榛勬潙绮�-鎴�&妤�",".xlsx",2); + ziDuanTianCong4("鏉窞", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�6\\","鏉窞妤肩洏娓呭崟--鍙傝��-BOBO锛堟埛锛�",".xlsx",1); + ziDuanTianCong4("鍚堣偉", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�6\\","鍚堣偉2013骞翠氦鎴挎暟鎹�-鎴锋ゼ鏍�-闆帀",".xls",1); + ziDuanTianCong4("鍗楀畞", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�6\\","鍗楀畞鐢垫骞垮憡浠锋牸楂樼妤肩洏琛�-浼犳挱鏄�-Mia-鎴�",".xls",1); + ziDuanTianCong4("涓婃捣", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�6\\","涓婃捣妤肩洏琛�-Mia-鎴�",".xls",1); + ziDuanTianCong4("鑺滄箹", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�6\\","鑺滄箹鍩庝笢鍖烘ゼ鐩�-榛勬潙绮�-鎴�",".xls",3); + ziDuanTianCong4("姝︽眽", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�6\\","姝︽眽甯傚悇灏忓尯妤肩洏鍚嶅唽-Mia-鎴�",".xls",1); + ziDuanTianCong4("姝︽眽", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�6\\","姝︽眽甯傚叏瑁呬慨妤肩洏缁熻涓�瑙堣〃-Mia-鎴�",".xlsx",1); + ziDuanTianCong4("瑗垮畨", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�6\\","瑗垮畨甯傜粡娴庨�傜敤浣忔埧鎴挎簮淇℃伅-Mia-鎴�",".xlsx",1);*/ - /*ziDuanTianCong4("北京", "D:\\hbl\\数据包\\数据包7\\4月10日-4月14日\\", "2015北京高档小区汇总大全-Mia-基础", ".xls", 1) - ziDuanTianCong4("佛山", "D:\\hbl\\数据包\\数据包7\\4月10日-4月14日\\", "佛山市各区楼盘开发商物业住户信息-BOBO(户)", ".xlsx", 1) - ziDuanTianCong4("南宁", "D:\\hbl\\数据包\\数据包7\\4月10日-4月14日\\", "南宁市各楼盘基本数据表-Mia-户", ".xls", 6) - ziDuanTianCong4("贵阳", "D:\\hbl\\数据包\\数据包7\\4月10日-4月14日\\", "物业管理企业基本信息_2016-12-20_15_41_21_1", ".xls", 1) - ziDuanTianCong4("邢台", "D:\\hbl\\数据包\\数据包7\\4月10日-4月14日\\", "邢台地区-BOBO(户)", ".xlsx", 1) - ziDuanTianCong4("湛江", "D:\\hbl\\数据包\\数据包7\\4月10日-4月14日\\", "湛江楼盘数据-BOBO(户)", ".xlsx", 1) - ziDuanTianCong4("长沙", "D:\\hbl\\数据包\\数据包7\\4月10日-4月14日\\", "长沙楼盘信息总览-BOBO(户&楼)", ".xlsx", 1)*/ + /*ziDuanTianCong4("鍖椾含", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�7\\4鏈�10鏃�-4鏈�14鏃\", "2015鍖椾含楂樻。灏忓尯姹囨�诲ぇ鍏�-Mia-鍩虹", ".xls", 1) + ziDuanTianCong4("浣涘北", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�7\\4鏈�10鏃�-4鏈�14鏃\", "浣涘北甯傚悇鍖烘ゼ鐩樺紑鍙戝晢鐗╀笟浣忔埛淇℃伅-BOBO锛堟埛锛�", ".xlsx", 1) + ziDuanTianCong4("鍗楀畞", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�7\\4鏈�10鏃�-4鏈�14鏃\", "鍗楀畞甯傚悇妤肩洏鍩烘湰鏁版嵁琛�-Mia-鎴�", ".xls", 6) + ziDuanTianCong4("璐甸槼", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�7\\4鏈�10鏃�-4鏈�14鏃\", "鐗╀笟绠$悊浼佷笟鍩烘湰淇℃伅_2016-12-20_15_41_21_1", ".xls", 1) + ziDuanTianCong4("閭㈠彴", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�7\\4鏈�10鏃�-4鏈�14鏃\", "閭㈠彴鍦板尯-BOBO锛堟埛锛�", ".xlsx", 1) + ziDuanTianCong4("婀涙睙", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�7\\4鏈�10鏃�-4鏈�14鏃\", "婀涙睙妤肩洏鏁版嵁-BOBO锛堟埛锛�", ".xlsx", 1) + ziDuanTianCong4("闀挎矙", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�7\\4鏈�10鏃�-4鏈�14鏃\", "闀挎矙妤肩洏淇℃伅鎬昏-BOBO锛堟埛&妤硷級", ".xlsx", 1)*/ - ziDuanTianCong4("广州", "D:\\hbl\\数据包\\数据包7\\4月17日-4月21日\\", "2015年26个城市成交楼盘信息(广州)生活家家居老龚提供-户-Mia", ".xlsx", 1) - ziDuanTianCong4("大连", "D:\\hbl\\数据包\\数据包7\\4月17日-4月21日\\", "2015年庄河竞品项目成交情况表及2015年市场放量统计-雪莉", ".xls", 2) - ziDuanTianCong4("南阳", "D:\\hbl\\数据包\\数据包7\\4月17日-4月21日\\", "2017年2月24日止南阳市楼盘信息-黄村粮-户&楼", ".xls", 1) - ziDuanTianCong4("北京", "D:\\hbl\\数据包\\数据包7\\4月17日-4月21日\\", "北京楼盘表6.7-Mia-户&写字楼", ".xls", 1) - ziDuanTianCong4("成都", "D:\\hbl\\数据包\\数据包7\\4月17日-4月21日\\", "成都2013年楼盘交房时间表-Mia-户", ".xlsx", 1) - ziDuanTianCong4("达州", "D:\\hbl\\数据包\\数据包7\\4月17日-4月21日\\", "达州市最新楼盘情况统计(2015.3.2)-户数-雪莉", ".xls", 1) - ziDuanTianCong4("赣州", "D:\\hbl\\数据包\\数据包7\\4月17日-4月21日\\", "赣州房地产市场信息一览总表-Mia-户&房号", ".xls", 2) - ziDuanTianCong4("肇庆", "D:\\hbl\\数据包\\数据包7\\4月17日-4月21日\\", "广东肇庆四会待售房源总表2016年-黄村粮-户&楼", ".xlsx", 2) - //ziDuanTianCong4("广州", "D:\\hbl\\数据包\\数据包7\\4月17日-4月21日\\", "广州市天河区写字楼-Mia-写字楼", ".xlsx", 2) 表格有问题 - ziDuanTianCong4("扬州", "D:\\hbl\\数据包\\数据包7\\4月17日-4月21日\\", "扬州楼盘一览表-BOBO(户)", ".xlsx", 1) - ziDuanTianCong4("宜昌", "D:\\hbl\\数据包\\数据包7\\4月17日-4月21日\\", "宜昌楼盘表-BOBO(户)", ".xlsx", 1) - ziDuanTianCong4("长春", "D:\\hbl\\数据包\\数据包7\\4月17日-4月21日\\", "长春市楼盘-户-雪梨", ".xls", 1) - ziDuanTianCong4("重庆", "D:\\hbl\\数据包\\数据包7\\4月17日-4月21日\\", "重庆楼盘评估明细表-BOBO(户)", ".xlsx", 1) - ziDuanTianCong4("重庆", "D:\\hbl\\数据包\\数据包7\\4月17日-4月21日\\", "重庆楼盘总表格-BOBO (户)", ".xlsx", 1) - ziDuanTianCong4("珠海", "D:\\hbl\\数据包\\数据包7\\4月17日-4月21日\\", "珠海电梯高端楼盘表-201610-BOBO(户)", ".xlsx", 1) + ziDuanTianCong4("骞垮窞", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�7\\4鏈�17鏃�-4鏈�21鏃\", "2015骞�26涓煄甯傛垚浜ゆゼ鐩樹俊鎭�(骞垮窞)鐢熸椿瀹跺灞呰�侀練鎻愪緵-鎴�-Mia", ".xlsx", 1) + ziDuanTianCong4("澶ц繛", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�7\\4鏈�17鏃�-4鏈�21鏃\", "2015骞村簞娌崇珵鍝侀」鐩垚浜ゆ儏鍐佃〃鍙�2015骞村競鍦烘斁閲忕粺璁�-闆帀", ".xls", 2) + ziDuanTianCong4("鍗楅槼", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�7\\4鏈�17鏃�-4鏈�21鏃\", "2017骞�2鏈�24鏃ユ鍗楅槼甯傛ゼ鐩樹俊鎭�-榛勬潙绮�-鎴�&妤�", ".xls", 1) + ziDuanTianCong4("鍖椾含", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�7\\4鏈�17鏃�-4鏈�21鏃\", "鍖椾含妤肩洏琛�6.7-Mia-鎴�&鍐欏瓧妤�", ".xls", 1) + ziDuanTianCong4("鎴愰兘", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�7\\4鏈�17鏃�-4鏈�21鏃\", "鎴愰兘2013骞存ゼ鐩樹氦鎴挎椂闂磋〃-Mia-鎴�", ".xlsx", 1) + ziDuanTianCong4("杈惧窞", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�7\\4鏈�17鏃�-4鏈�21鏃\", "杈惧窞甯傛渶鏂版ゼ鐩樻儏鍐电粺璁�(2015.3.2)-鎴锋暟-闆帀", ".xls", 1) + ziDuanTianCong4("璧e窞", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�7\\4鏈�17鏃�-4鏈�21鏃\", "璧e窞鎴垮湴浜у競鍦轰俊鎭竴瑙堟�昏〃-Mia-鎴�&鎴垮彿", ".xls", 2) + ziDuanTianCong4("鑲囧簡", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�7\\4鏈�17鏃�-4鏈�21鏃\", "骞夸笢鑲囧簡鍥涗細寰呭敭鎴挎簮鎬昏〃2016骞�-榛勬潙绮�-鎴�&妤�", ".xlsx", 2) + //ziDuanTianCong4("骞垮窞", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�7\\4鏈�17鏃�-4鏈�21鏃\", "骞垮窞甯傚ぉ娌冲尯鍐欏瓧妤�-Mia-鍐欏瓧妤�", ".xlsx", 2) 琛ㄦ牸鏈夐棶棰� + ziDuanTianCong4("鎵窞", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�7\\4鏈�17鏃�-4鏈�21鏃\", "鎵窞妤肩洏涓�瑙堣〃-BOBO锛堟埛锛�", ".xlsx", 1) + ziDuanTianCong4("瀹滄槍", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�7\\4鏈�17鏃�-4鏈�21鏃\", "瀹滄槍妤肩洏琛�-BOBO锛堟埛锛�", ".xlsx", 1) + ziDuanTianCong4("闀挎槬", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�7\\4鏈�17鏃�-4鏈�21鏃\", "闀挎槬甯傛ゼ鐩�-鎴�-闆ⅷ", ".xls", 1) + ziDuanTianCong4("閲嶅簡", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�7\\4鏈�17鏃�-4鏈�21鏃\", "閲嶅簡妤肩洏璇勪及鏄庣粏琛�-BOBO锛堟埛锛�", ".xlsx", 1) + ziDuanTianCong4("閲嶅簡", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�7\\4鏈�17鏃�-4鏈�21鏃\", "閲嶅簡妤肩洏鎬昏〃鏍�-BOBO 锛堟埛锛�", ".xlsx", 1) + ziDuanTianCong4("鐝犳捣", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�7\\4鏈�17鏃�-4鏈�21鏃\", "鐝犳捣鐢垫楂樼妤肩洏琛�-201610-BOBO(鎴凤級", ".xlsx", 1) } @@ -145,7 +145,7 @@ class ShuJuBaoCommunalBatch{ String re = list.get(1); String region = null; if(re!=null){ - region = re.replaceAll("区",""); + region = re.replaceAll("鍖�",""); } String name = list.get(2); Map map = matchPreAddress(city, region, list.get(2)); @@ -163,74 +163,74 @@ class ShuJuBaoCommunalBatch{ region = map.get("region"); name = map.get("name"); } - DBObject dis = findDis(cityName,region,name);//查询 + DBObject dis = findDis(cityName,region,name);//鏌ヨ if(dis!=null){ boolean canUpdate = false; - //建筑时间 + //寤虹瓚鏃堕棿 if(canUpdateConstructionTime(dis,list)){ dis.put("finish_building_date",excelDateToStr(list.get(3))) canUpdate = true } - //容积率 + //瀹圭Н鐜� if(canUpdateCubagePercent(dis,list)){ dis.put("cubage_percent",list.get(4).toString()) } - //户数 + //鎴锋暟 if(canUpdateHouseHold(dis,list)){ dis.put("household_count",list.get(5)) canUpdate = true } - //开盘时间 + //寮�鐩樻椂闂� if(canUpdateOpenDate(dis,list)){ dis.put("open_date",excelStrToDate(list.get(7))) canUpdate = true } - //交房时间 + //浜ゆ埧鏃堕棿 if(canUpdateLiveDate(dis,list)){ dis.put("live_date",excelDateToStr(list.get(7))) canUpdate = true } - //绿化率 + //缁垮寲鐜� if(canUpdateVirescencePercent(dis,list)){ dis.put("virescence_percent",list.get(9).toString()) } - //开发商 + //寮�鍙戝晢 if(canUpdateDeveloper(dis,list)){ dis.put("developer",list.get(11)) canUpdate = true } - //物业公司 + //鐗╀笟鍏徃 if(canUpdateEstateCompany(dis,list)){ dis.put("estate_company",list.get(12)) canUpdate = true } - //停车位 + //鍋滆溅浣� if(canUpdateCarSite(dis,list)){ dis.put("car_site",list.get(13).toString()) canUpdate = true } - //竣工时间 + //绔e伐鏃堕棿 if(canUpdateFinishBuildingDate(dis,list)){ dis.put("finish_building_date",excelDateToStr(list.get(15))) canUpdate = true } - //建筑面积 + //寤虹瓚闈㈢Н if(canUpdateBuildArea(dis,list)){ dis.put("build_area",list.get(16).toString()) canUpdate = true } - //占地面积 + //鍗犲湴闈㈢Н if(canUpdateAllArea(dis,list)){ dis.put("all_area",list.get(17).toString()) canUpdate = true } - //物业费 + //鐗╀笟璐� if(canUpdateEstateCharge(dis,list)){ dis.put("estate_charge",list.get(18).toString()) canUpdate = true } if(canUpdate){ - //更新数据的代码 + //鏇存柊鏁版嵁鐨勪唬鐮� updateDis(dis) updateMount = updateMount+1; list.add(1); @@ -251,11 +251,11 @@ class ShuJuBaoCommunalBatch{ exportData(city,fileName,ls); } def static exportData(String city,String fileName,List> datas) { - ExcelUtils.write("D:\\hbl\\Data\\数据包结果\\20170426\\"+fileName+".xlsx", datas, "result") + ExcelUtils.write("D:\\hbl\\Data\\鏁版嵁鍖呯粨鏋淺\20170426\\"+fileName+".xlsx", datas, "result") } /** - * 判断是否能够更新建筑时间 + * 鍒ゆ柇鏄惁鑳藉鏇存柊寤虹瓚鏃堕棿 */ public static boolean canUpdateConstructionTime(DBObject dis,List list){ if(list==null||list.size()<4||dis==null){ @@ -274,7 +274,7 @@ class ShuJuBaoCommunalBatch{ return false; } /** - * 判断是否能够更新容积率 + * 鍒ゆ柇鏄惁鑳藉鏇存柊瀹圭Н鐜� */ public static boolean canUpdateCubagePercent(DBObject dis,List list){ if(list==null||list.size()<5||dis==null){ @@ -295,7 +295,7 @@ class ShuJuBaoCommunalBatch{ /** - * 判断是否能够更新户数 + * 鍒ゆ柇鏄惁鑳藉鏇存柊鎴锋暟 */ public static boolean canUpdateHouseHold(DBObject dis,List list){ if(list==null||list.size()<5||dis==null){ @@ -315,7 +315,7 @@ class ShuJuBaoCommunalBatch{ } /** - * 判断是否能够更新开盘时间 + * 鍒ゆ柇鏄惁鑳藉鏇存柊寮�鐩樻椂闂� */ public static boolean canUpdateOpenDate(DBObject dis,List list){ if(list==null||list.size()<7||dis==null){ @@ -334,7 +334,7 @@ class ShuJuBaoCommunalBatch{ return false; } /** - * 判断是否能够更新交房时间 + * 鍒ゆ柇鏄惁鑳藉鏇存柊浜ゆ埧鏃堕棿 */ public static boolean canUpdateLiveDate(DBObject dis,List list){ if(list==null||list.size()<8||dis==null){ @@ -353,7 +353,7 @@ class ShuJuBaoCommunalBatch{ return false; } /** - * 判断是否能够更新绿化率 + * 鍒ゆ柇鏄惁鑳藉鏇存柊缁垮寲鐜� */ public static boolean canUpdateVirescencePercent(DBObject dis,List list){ if(list==null||list.size()<10||dis==null){ @@ -370,7 +370,7 @@ class ShuJuBaoCommunalBatch{ return false; } /** - * 判断是否能够更新开发商 + * 鍒ゆ柇鏄惁鑳藉鏇存柊寮�鍙戝晢 */ public static boolean canUpdateDeveloper(DBObject dis,List list){ if(list==null||list.size()<12||dis==null){ @@ -386,7 +386,7 @@ class ShuJuBaoCommunalBatch{ return false; } /** - * 判断是否能够更新物业公司 + * 鍒ゆ柇鏄惁鑳藉鏇存柊鐗╀笟鍏徃 */ public static boolean canUpdateEstateCompany(DBObject dis,List list){ if(list==null||list.size()<13||dis==null){ @@ -402,7 +402,7 @@ class ShuJuBaoCommunalBatch{ return false; } /** - * 判断是否能够更新停车位 + * 鍒ゆ柇鏄惁鑳藉鏇存柊鍋滆溅浣� */ public static boolean canUpdateCarSite(DBObject dis,List list){ if(list==null||list.size()<14||dis==null){ @@ -422,7 +422,7 @@ class ShuJuBaoCommunalBatch{ } /** - * 判断是否能够更新竣工时间 + * 鍒ゆ柇鏄惁鑳藉鏇存柊绔e伐鏃堕棿 */ public static boolean canUpdateFinishBuildingDate(DBObject dis,List list){ if(list==null||list.size()<16||dis==null){ @@ -442,7 +442,7 @@ class ShuJuBaoCommunalBatch{ } /** - * 判断是否能够更新建筑面积 + * 鍒ゆ柇鏄惁鑳藉鏇存柊寤虹瓚闈㈢Н */ public static boolean canUpdateBuildArea(DBObject dis,List list){ if(list==null||list.size()<17||dis==null){ @@ -461,7 +461,7 @@ class ShuJuBaoCommunalBatch{ return false; } /** - * 判断是否能够更新占地面积 + * 鍒ゆ柇鏄惁鑳藉鏇存柊鍗犲湴闈㈢Н */ public static boolean canUpdateAllArea(DBObject dis,List list){ if(list==null||list.size()<18||dis==null){ @@ -480,7 +480,7 @@ class ShuJuBaoCommunalBatch{ return false; } /** - * 判断是否能够更新物业费 + * 鍒ゆ柇鏄惁鑳藉鏇存柊鐗╀笟璐� */ public static boolean canUpdateEstateCharge(DBObject dis,List list){ if(list==null||list.size()<19||dis==null){ @@ -498,7 +498,7 @@ class ShuJuBaoCommunalBatch{ } return false; } - //格式化String类型转化为DaTE + //鏍煎紡鍖朣tring绫诲瀷杞寲涓篋aTE public static Date excelStrToDate(Object exeValue){ if(exeValue!=null){ if(exeValue instanceof Date){ @@ -508,7 +508,7 @@ class ShuJuBaoCommunalBatch{ return null; } - //格式化时间类型转化成String + //鏍煎紡鍖栨椂闂寸被鍨嬭浆鍖栨垚String public static String excelDateToStr(Object exeValue){ if(exeValue!=null){ if(exeValue instanceof String){ @@ -526,7 +526,7 @@ class ShuJuBaoCommunalBatch{ public static void updateDis(DBObject db){ - //更新数据的代码 + //鏇存柊鏁版嵁鐨勪唬鐮� Map mark_map = db.mark_map if(!mark_map){ mark_map = [:] @@ -539,7 +539,7 @@ class ShuJuBaoCommunalBatch{ /** - * 对小区中的一般字段进行更新 + * 瀵瑰皬鍖轰腑鐨勪竴鑸瓧娈佃繘琛屾洿鏂� */ public static void updateDis(DBObject dis,String fieldName,String value){ if(dis!=null&&dis.get(fieldName)==null){ @@ -549,7 +549,7 @@ class ShuJuBaoCommunalBatch{ /** - * 判断竣工字段能否更新 + * 鍒ゆ柇绔e伐瀛楁鑳藉惁鏇存柊 */ public static boolean finishBuildingDateCan(DBObject dis,String value){ if(dis==null||value==null){ @@ -562,7 +562,7 @@ class ShuJuBaoCommunalBatch{ return false; } /** - * 小区查询 + * 灏忓尯鏌ヨ */ public static DBObject findDis(String city,String region,String name){ BasicDBObject qu = new BasicDBObject() @@ -580,7 +580,7 @@ class ShuJuBaoCommunalBatch{ /** - * 获取城市的小区 + * 鑾峰彇鍩庡競鐨勫皬鍖� * @param city * @return */ @@ -594,7 +594,7 @@ class ShuJuBaoCommunalBatch{ return dbs; } /** - *Date转化成String + *Date杞寲鎴怱tring */ public static String dateToString(Date date,String type){ if(date==null){ @@ -611,14 +611,14 @@ class ShuJuBaoCommunalBatch{ format = DateFormat.getDateInstance(DateFormat.MEDIUM); str = format.format(date); } else if (type.equals("FULL")) { - // 2007年1月18日 星期四 + // 2007骞�1鏈�18鏃� 鏄熸湡鍥� format = DateFormat.getDateInstance(DateFormat.FULL); str = format.format(date); } return str; } /** - * 小区名址匹配 + * 灏忓尯鍚嶅潃鍖归厤 */ public static Map matchPreAddress(String city,String region,String address){ JSONObject result = OpenApiClient.addressMatch(city,address,"property",false,region,"strict"); @@ -636,7 +636,7 @@ class ShuJuBaoCommunalBatch{ } /** - * 匹配 + * 鍖归厤 * @param text * @return */ @@ -656,30 +656,30 @@ class ShuJuBaoCommunalBatch{ public static List getHeader(){ List list = new ArrayList(); - list.add("城市") - list.add("区域") - list.add("小区名") - list.add("建筑时间") - list.add("容积率") - list.add("户数") - list.add("开盘时间") - list.add("交房时间") - list.add("名称别名") - list.add("绿化率") - list.add("物业类型") - list.add("开发商") - list.add("物业公司") - list.add("停车位") - list.add("产权年限") - list.add("竣工时间") - list.add("建筑面积") - list.add("占地面积") - list.add("物业费") - list.add("商圈") - list.add("地址") - list.add("建筑类型") - list.add("是否修改") - list.add("竣工时间填入") + list.add("鍩庡競") + list.add("鍖哄煙") + list.add("灏忓尯鍚�") + list.add("寤虹瓚鏃堕棿") + list.add("瀹圭Н鐜�") + list.add("鎴锋暟") + list.add("寮�鐩樻椂闂�") + list.add("浜ゆ埧鏃堕棿") + list.add("鍚嶇О鍒悕") + list.add("缁垮寲鐜�") + list.add("鐗╀笟绫诲瀷") + list.add("寮�鍙戝晢") + list.add("鐗╀笟鍏徃") + list.add("鍋滆溅浣�") + list.add("浜ф潈骞撮檺") + list.add("绔e伐鏃堕棿") + list.add("寤虹瓚闈㈢Н") + list.add("鍗犲湴闈㈢Н") + list.add("鐗╀笟璐�") + list.add("鍟嗗湀") + list.add("鍦板潃") + list.add("寤虹瓚绫诲瀷") + list.add("鏄惁淇敼") + list.add("绔e伐鏃堕棿濉叆") return list } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/StatisticsNewSaleAndOldSale.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/StatisticsNewSaleAndOldSale.groovy index 3713fc3e4..bddc4e4bf 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/StatisticsNewSaleAndOldSale.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/StatisticsNewSaleAndOldSale.groovy @@ -14,7 +14,7 @@ import com.mongodb.DBCursor import com.mongodb.DBObject /** - * 成交量相关 + * 鎴愪氦閲忕浉鍏� * @author hubingliang * */ @@ -25,7 +25,7 @@ class StatisticsNewSaleAndOldSale{ public static final DBCollection FANG_HAO = MongoUtils.getCollectionByName("fangjia", "house_loudong", "mongo.db.fangjia.com", 27017) static main(args) { - exportData("上海") + exportData("涓婃捣") } public static void exportData(String city){ @@ -51,12 +51,12 @@ class StatisticsNewSaleAndOldSale{ } - //上海小区半年内二手成交量 dateStr(yyyy-MM-dd) + //涓婃捣灏忓尯鍗婂勾鍐呬簩鎵嬫垚浜ら噺 dateStr(yyyy-MM-dd) public static List citySell(List results,DBObject dis,String dateStr){ String city = dis.get("city"); String region = dis.get("region"); String name = dis.get("name"); - //获取2016年7月1号 和下一个月的时间 + //鑾峰彇2016骞�7鏈�1鍙� 鍜屼笅涓�涓湀鐨勬椂闂� if(StringUtils.isNotBlank(city)&&StringUtils.isNotBlank(region)&&StringUtils.isNotBlank(name)){ Date appointDate = DateUtils.parseFromTightYYYYMMDD(dateStr); for(int i=1;i<8;i++){ @@ -78,7 +78,7 @@ class StatisticsNewSaleAndOldSale{ return results; } - //获取某月1手房成交量 + //鑾峰彇鏌愭湀1鎵嬫埧鎴愪氦閲� public static Integer newHouseSell(String city,String region,String name,Date appointDate,Date nextMonth){ String dateStr = DateUtils.formatDateByPattern(appointDate, "yyyy-MM"); dateStr = dateStr.replace("-", ""); @@ -94,14 +94,14 @@ class StatisticsNewSaleAndOldSale{ return 0; } - //获取某月二手房成交量 + //鑾峰彇鏌愭湀浜屾墜鎴挎垚浜ら噺 public static Integer oldHouseSell(String city,String region,String name,Date appointDate,Date nextMonth){ BasicDBObject query= new BasicDBObject().append("city", city).append("region",region).append("district_name", name).append("trade_date", new BasicDBObject('$gt',appointDate).append('$lt', nextMonth)); long monthCount = DEAL_PRICE.count(query); return (Integer)monthCount; } - //获取全国城市 + //鑾峰彇鍏ㄥ浗鍩庡競 public static List getCitys(){ List citys = new ArrayList(); DBCursor dbs = SERVER_AREA.find(); @@ -114,7 +114,7 @@ class StatisticsNewSaleAndOldSale{ } /** - * 获取城市的小区 + * 鑾峰彇鍩庡競鐨勫皬鍖� * @param city * @return */ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/UpdateDistrictAddress.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/UpdateDistrictAddress.groovy index 1bda051fd..bac9d488c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/UpdateDistrictAddress.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/UpdateDistrictAddress.groovy @@ -35,7 +35,7 @@ class UpdateDistrictAddress { private static final Pattern CHARSET_PATTERN = Pattern.compile('', Pattern.CASE_INSENSITIVE); static main(args) { - String[] citys = ["北京"] + String[] citys = ["鍖椾含"] for(int i=0;i> logList = new ArrayList(); - //根据城市将数据库中的数据取出来, + //鏍规嵁鍩庡競灏嗘暟鎹簱涓殑鏁版嵁鍙栧嚭鏉ワ紝 BasicDBObject query = new BasicDBObject() query.append("city", city) query.append("visible", 0) query.append("cat", "district") DbUtils.seaweed.find(query).each{BasicDBObject it-> - if(!DataUtil.isPreciseAddress(it.get("address"))){//判断地址是不是精确的地址 + if(!DataUtil.isPreciseAddress(it.get("address"))){//鍒ゆ柇鍦板潃鏄笉鏄簿纭殑鍦板潃 String[] strs = null; if(it.get("alias")!=null){ strs = it.get("alias").toArray() } def bean = null; - // 高德地图 + // 楂樺痉鍦板浘 try{ bean = getAddressByGaoDeApiTest(city, it.get("name"), strs, it.get("region")) }catch(Exception e){ @@ -69,13 +69,13 @@ class UpdateDistrictAddress { if(bean!=null){ addressFromApi = bean.get("address") } - String preciseAddress=null//精确地址 + String preciseAddress=null//绮剧‘鍦板潃 String handledAddress = DataUtil.formateAddress(city,addressFromApi) - if(handledAddress!=null&&DataUtil.isPreciseAddress(handledAddress)){//如果处理后的地址部位空,并且获得紧缺地址 + if(handledAddress!=null&&DataUtil.isPreciseAddress(handledAddress)){//濡傛灉澶勭悊鍚庣殑鍦板潃閮ㄤ綅绌猴紝骞朵笖鑾峰緱绱х己鍦板潃 preciseAddress = handledAddress - }else{//用腾讯来处理 + }else{//鐢ㄨ吘璁潵澶勭悊 try{ - bean = getAddressByTengXunApiTest(city,it.get("name"),strs,it.get("region"))//用腾讯地图进行获取数据 + bean = getAddressByTengXunApiTest(city,it.get("name"),strs,it.get("region"))//鐢ㄨ吘璁湴鍥捐繘琛岃幏鍙栨暟鎹� }catch(Exception e){ e.printStackTrace() } @@ -85,9 +85,9 @@ class UpdateDistrictAddress { handledAddress = DataUtil.formateAddress(city,addressFromApi) if(handledAddress!=null&&DataUtil.isPreciseAddress(handledAddress)){ preciseAddress = handledAddress - }else{//用百度进行处理 + }else{//鐢ㄧ櫨搴﹁繘琛屽鐞� try{ - bean = getAddressByBaiDuApiTest(city,it.get("name"),it.get("region"))//用百度地图进行获取数据 + bean = getAddressByBaiDuApiTest(city,it.get("name"),it.get("region"))//鐢ㄧ櫨搴﹀湴鍥捐繘琛岃幏鍙栨暟鎹� }catch(Exception e){ e.printStackTrace() } @@ -100,9 +100,9 @@ class UpdateDistrictAddress { } } } - if(preciseAddress!=null){//是精确地址的话就更新进数据库 + if(preciseAddress!=null){//鏄簿纭湴鍧�鐨勮瘽灏辨洿鏂拌繘鏁版嵁搴� if(isBetterPreciseAddress(preciseAddress,it.get("name"))){ - //对数据库中的数据进行更新 + //瀵规暟鎹簱涓殑鏁版嵁杩涜鏇存柊 try{ String str = updateById(it.get("_id"),preciseAddress) ArrayList tempList = new ArrayList() @@ -118,7 +118,7 @@ class UpdateDistrictAddress { ExcelUtils.write("E:\\hbl\\work\\addresslog1\\"+city+"log.xlsx", logList, "sheet1") } - //根据id进行更新address + //鏍规嵁id杩涜鏇存柊address def static updateById(def id,String address){ BasicDBObject queryCondition = new BasicDBObject("_id",id); BasicDBObject updateData = new BasicDBObject("address",address) @@ -126,13 +126,13 @@ class UpdateDistrictAddress { BasicDBObject update = new BasicDBObject() update.put('$set', updateData) DbUtils.seaweed.update(queryCondition, update) - //输出一个修改日志 + //杈撳嚭涓�涓慨鏀规棩蹇� String str = queryCondition.toString()+"_____"+update.toString() println queryCondition.toString()+"_____"+update.toString() return str } - //同时通过百度 高德 腾讯地图来处理 并且导入excel中 + //鍚屾椂閫氳繃鐧惧害 楂樺痉 鑵捐鍦板浘鏉ュ鐞� 骞朵笖瀵煎叆excel涓� def static updataDataToMogoDB(String city){ List> readList = ExcelUtils.read("E:\\hbl\\work\\"+city+"date\\"+city+".xlsx") for(int i=0;i> addHeadList =new ArrayList() List headList = new ArrayList() headList.add("ID") @@ -208,12 +208,12 @@ class UpdateDistrictAddress { ExcelUtils.write("E:\\hbl\\work\\"+city+"date\\"+city+"handle.xlsx", addHeadList, "sheet1") } - //对preciseAddress进行进一步的判断 + //瀵筽reciseAddress杩涜杩涗竴姝ョ殑鍒ゆ柇 public static isBetterPreciseAddress(String address,String name){ - if(address.endsWith("号")||address.endsWith("弄")||address.endsWith("支")){//要以号结尾 - if(address.indexOf(",")==-1 && address.indexOf("、")==-1){//地址中不能包含某些标点 - if(!address.contains(name)){//地址中不能包含小区名字 - if((!address.contains("与"))&&(!address.contains("其他"))&&(!isNumeric(address))){//当地址中有与字并且不能有其他两字,不能只包含数字和号 + if(address.endsWith("鍙�")||address.endsWith("寮�")||address.endsWith("鏀�")){//瑕佷互鍙风粨灏� + if(address.indexOf(",")==-1 && address.indexOf("銆�")==-1){//鍦板潃涓笉鑳藉寘鍚煇浜涙爣鐐� + if(!address.contains(name)){//鍦板潃涓笉鑳藉寘鍚皬鍖哄悕瀛� + if((!address.contains("涓�"))&&(!address.contains("鍏朵粬"))&&(!isNumeric(address))){//褰撳湴鍧�涓湁涓庡瓧骞朵笖涓嶈兘鏈夊叾浠栦袱瀛楋紝涓嶈兘鍙寘鍚暟瀛楀拰鍙� return true } } @@ -222,10 +222,10 @@ class UpdateDistrictAddress { return false } - //判断字符串中是否只有数字和号、弄 + //鍒ゆ柇瀛楃涓蹭腑鏄惁鍙湁鏁板瓧鍜屽彿銆佸紕 public static boolean isNumeric(String str){ - String handledStr = str.replaceAll("号", "") - handledStr = handledStr.replaceAll("弄", "") + String handledStr = str.replaceAll("鍙�", "") + handledStr = handledStr.replaceAll("寮�", "") Pattern pattern = Pattern.compile("[0-9]*"); Matcher isNum = pattern.matcher(handledStr); if( !isNum.matches() ) @@ -235,7 +235,7 @@ class UpdateDistrictAddress { return true; } - //根据高德api获取地址 + //鏍规嵁楂樺痉api鑾峰彇鍦板潃 def static getAddressByGaoDeApiTest(String city, String name, String[] alias, String region) { def bean = [:] JSONObject json = GaoDeApiUtils.search(endWiths(name), city) @@ -284,7 +284,7 @@ class UpdateDistrictAddress { return null } - //根据腾讯API获取地址 + //鏍规嵁鑵捐API鑾峰彇鍦板潃 def static getAddressByTengXunApiTest(String city, String name, String[] alias, String region) { def bean = [:] JSONObject json = TengXunApiUtils.search(city, name) @@ -334,12 +334,12 @@ class UpdateDistrictAddress { } - //通过百度api获取地址 + //閫氳繃鐧惧害api鑾峰彇鍦板潃 def static getAddressByBaiDuApiTest(String city, String disName,String region) { def bean = [:] try { disName = formatName(disName) - JSONObject json = BaiDuApiUtils.search(city, disName, "住宅区", 1, 20, 0) + JSONObject json = BaiDuApiUtils.search(city, disName, "浣忓畢鍖�", 1, 20, 0) if(json.getInt("status") == 0) { JSONArray array = json.getJSONArray("results") if(array.size()!=0) { @@ -465,21 +465,21 @@ class UpdateDistrictAddress { def static getSimpleName(String name) { name = formatName(name) - if(name.endsWith("小区") || name.endsWith("公寓") || name.endsWith("别墅")) { + if(name.endsWith("灏忓尯") || name.endsWith("鍏瘬") || name.endsWith("鍒")) { name = name.substring(0, name.length() - 2) } - if(name.endsWith("一期") || name.endsWith("二期") || name.endsWith("三期") || name.endsWith("四期") - || name.endsWith("五期") || name.endsWith("六期") || name.endsWith("七期") || name.endsWith("八期") - || name.endsWith("九期") || name.endsWith("十期") ){ + if(name.endsWith("涓�鏈�") || name.endsWith("浜屾湡") || name.endsWith("涓夋湡") || name.endsWith("鍥涙湡") + || name.endsWith("浜旀湡") || name.endsWith("鍏湡") || name.endsWith("涓冩湡") || name.endsWith("鍏湡") + || name.endsWith("涔濇湡") || name.endsWith("鍗佹湡") ){ name = name.substring(0, name.length() - 2) } return name } def static endWiths(String name) { - if(name.endsWith("一期") || name.endsWith("二期") || name.endsWith("三期") || name.endsWith("四期") - || name.endsWith("五期") || name.endsWith("六期") || name.endsWith("七期") || name.endsWith("八期") - || name.endsWith("九期") || name.endsWith("十期") ){ + if(name.endsWith("涓�鏈�") || name.endsWith("浜屾湡") || name.endsWith("涓夋湡") || name.endsWith("鍥涙湡") + || name.endsWith("浜旀湡") || name.endsWith("鍏湡") || name.endsWith("涓冩湡") || name.endsWith("鍏湡") + || name.endsWith("涔濇湡") || name.endsWith("鍗佹湡") ){ name = name.substring(0, name.length() - 2) } Matcher matcher = CHARSET_PATTERN.matcher(name); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/UpdatePreciseDistrictAddress.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/UpdatePreciseDistrictAddress.groovy index c1630b188..7350537b3 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/UpdatePreciseDistrictAddress.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/UpdatePreciseDistrictAddress.groovy @@ -28,7 +28,7 @@ import com.mongodb.DBObject import com.mongodb.Mongo import org.apache.commons.lang.StringUtils /** - * 定时更新小区地址数据 + * 瀹氭椂鏇存柊灏忓尯鍦板潃鏁版嵁 * @author hubingliang * */ @@ -42,45 +42,45 @@ class UpdatePreciseDistrictAddress extends BaseBatch { public static final DBCollection baiducitys = MongoUtils.getCollectionByName("addrepo", "baidu_citys", "192.168.0.219") private static final Pattern CHARSET_PATTERN = Pattern.compile('', Pattern.CASE_INSENSITIVE); private static final DBCollection address_update = MongoUtils.getCollectionByName("fangjia_log", "district_address_update_log", MongoUtils.MongoDB_Domain_mongo) - //浙江 安徽 - private static final String[] day1 = ["舟山","丽水","杭州","宁波","温州","嘉兴","台州","湖州","衢州","绍兴","金华","淮南","阜阳","黄山","亳州","安庆","六安", - "淮北","宣城","宿州","池州","蚌埠","滁州","铜陵","合肥","芜湖","马鞍山"] + //娴欐睙 瀹夊窘 + private static final String[] day1 = ["鑸熷北","涓芥按","鏉窞","瀹佹尝","娓╁窞","鍢夊叴","鍙板窞","婀栧窞","琛㈠窞","缁嶅叴","閲戝崕","娣崡","闃滈槼","榛勫北","浜冲窞","瀹夊簡","鍏畨", + "娣寳","瀹e煄","瀹垮窞","姹犲窞","铓屽煚","婊佸窞","閾滈櫟","鍚堣偉","鑺滄箹","椹瀺灞�"] - // 直辖市 上海 天津 - private static final String[] day2 = ["上海","天津"] - //福建 甘肃 北京 - private static final String[] day3 = ["北京","宁德","南平","三明","龙岩","漳州","福州","厦门","泉州","莆田","武威","天水","定西","平凉","白银","酒泉","张掖","嘉峪关","庆阳","金昌","陇南","临夏","甘南","兰州"] - //广东 广西 - private static final String[] day4 = ["汕尾","广州","深圳","佛山","东莞","中山","湛江","惠州","清远","江门","珠海","汕头","揭阳","茂名","云浮","肇庆","潮州","梅州","阳江","韶关","河源", - "钦州","梧州","百色","贵港","贺州","来宾","河池","防城港","崇左","南宁","桂林","北海","柳州","玉林"] - //贵州 海南 河北 重庆 - private static final String[] day5 = ["重庆","黔南","遵义","安顺","铜仁","毕节","黔西南","黔东南","贵阳","六盘水","三沙","三亚","海口","五指山","琼海","儋州", - "文昌","万宁","东方","定安","屯昌","澄迈","临高","白沙","昌江","乐东","陵水","保亭","琼中","张家口","衡水","邢台","承德","沧州","石家庄","唐山","邯郸", - "廊坊","保定","秦皇岛"] - //黑龙江 河南 湖北 - private static final String[] day6 = ["齐齐哈尔","佳木斯","双鸭山","绥化","鸡西","七台河","鹤岗","黑河","伊春","大兴安岭","哈尔滨","大庆","牡丹江","安阳","许昌","南阳", - "开封","漯河","鹤壁","周口","濮阳","三门峡","商丘","信阳","驻马店","郑州","洛阳","平顶山","新乡","焦作","济源","黄冈","鄂州","十堰","随州","孝感","荆州", - "咸宁","荆门","恩施","武汉","襄阳","宜昌","黄石","仙桃","潜江","天门","神农架"] - //湖南 江苏 江西 - private static final String[] day7 = ["常德","岳阳","怀化","郴州","益阳","永州","娄底","湘西","邵阳","长沙","株洲", - "湘潭","张家界","衡阳","淮安","南京","苏州","无锡","扬州","常州","徐州","镇江","南通","泰州","宿迁","连云港","盐城","吉安","景德镇","鹰潭","新余","上饶","宜春", - "萍乡","抚州","南昌","赣州","九江"] - //吉林 辽宁 内蒙古 宁夏 - private static final String[] day8 = ["四平","辽源","白山","白城","通化","松原","延边","长春","吉林","铁岭","锦州","朝阳","阜新","抚顺","葫芦岛","辽阳","沈阳","大连", - "鞍山","丹东","本溪","营口","盘锦","包头","赤峰","兴安盟","锡林郭勒盟","阿拉善盟","鄂尔多斯","乌海","乌兰察布","通辽","巴彦淖尔","呼伦贝尔","呼和浩特","中卫","固原","吴忠", - "石嘴山","银川"] - //青海 山东 山西 云南 - private static final String[] day9 = ["海东","海北州","黄南州","海南州","果洛州","玉树州","海西州","西宁","临沂","泰安","菏泽","济宁","日照","聊城","滨州","枣庄","莱芜","东营","德州","济南", - "青岛","威海","烟台","潍坊","淄博","大同","临汾","朔州","晋城","忻州","晋中","阳泉","运城","长治","吕梁","太原","文山州","红河","临沧","保山","昭通", - "普洱","楚雄","怒江州","迪庆州","西双版纳州","德宏州","昆明","丽江","大理","玉溪","曲靖"] - //陕西 四川 新疆 西藏 - private static final String[] day10 = ["榆林","汉中","安康","商洛","宝鸡","渭南","铜川","西安","咸阳","延安","广元","乐山","南充","泸州","资阳","内江","达州","巴中","遂宁","眉山","德阳","广安", - "雅安","阿坝州","凉山州","甘孜州","成都","绵阳","宜宾","自贡","攀枝花","吐鲁番","哈密","和田","昌吉","阿勒泰","博尔塔拉","巴音郭楞","克孜勒苏","伊犁","阿克苏", - "克拉玛依","喀什","塔城","乌鲁木齐","石河子","阿拉尔","图木舒克","五家渠","昌都","日喀则","山南","那曲","阿里","林芝","拉萨"] + // 鐩磋緰甯� 涓婃捣 澶╂触 + private static final String[] day2 = ["涓婃捣","澶╂触"] + //绂忓缓 鐢樿們 鍖椾含 + private static final String[] day3 = ["鍖椾含","瀹佸痉","鍗楀钩","涓夋槑","榫欏博","婕冲窞","绂忓窞","鍘﹂棬","娉夊窞","鑾嗙敯","姝﹀▉","澶╂按","瀹氳タ","骞冲噳","鐧介摱","閰掓硥","寮犳帠","鍢夊唱鍏�","搴嗛槼","閲戞槍","闄囧崡","涓村","鐢樺崡","鍏板窞"] + //骞夸笢 骞胯タ + private static final String[] day4 = ["姹曞熬","骞垮窞","娣卞湷","浣涘北","涓滆帪","涓北","婀涙睙","鎯犲窞","娓呰繙","姹熼棬","鐝犳捣","姹曞ご","鎻槼","鑼傚悕","浜戞诞","鑲囧簡","娼窞","姊呭窞","闃虫睙","闊跺叧","娌虫簮", + "閽﹀窞","姊у窞","鐧捐壊","璐垫腐","璐哄窞","鏉ュ","娌虫睜","闃插煄娓�","宕囧乏","鍗楀畞","妗傛灄","鍖楁捣","鏌冲窞","鐜夋灄"] + //璐靛窞 娴峰崡 娌冲寳 閲嶅簡 + private static final String[] day5 = ["閲嶅簡","榛斿崡","閬典箟","瀹夐『","閾滀粊","姣曡妭","榛旇タ鍗�","榛斾笢鍗�","璐甸槼","鍏洏姘�","涓夋矙","涓変簹","娴峰彛","浜旀寚灞�","鐞兼捣","鍎嬪窞", + "鏂囨槍","涓囧畞","涓滄柟","瀹氬畨","灞槍","婢勮繄","涓撮珮","鐧芥矙","鏄屾睙","涔愪笢","闄垫按","淇濅涵","鐞间腑","寮犲鍙�","琛℃按","閭㈠彴","鎵垮痉","娌у窞","鐭冲搴�","鍞愬北","閭兏", + "寤婂潑","淇濆畾","绉︾殗宀�"] + //榛戦緳姹� 娌冲崡 婀栧寳 + private static final String[] day6 = ["榻愰綈鍝堝皵","浣虫湪鏂�","鍙岄腑灞�","缁ュ寲","楦¤タ","涓冨彴娌�","楣ゅ矖","榛戞渤","浼婃槬","澶у叴瀹夊箔","鍝堝皵婊�","澶у簡","鐗′腹姹�","瀹夐槼","璁告槍","鍗楅槼", + "寮�灏�","婕渤","楣ゅ","鍛ㄥ彛","婵槼","涓夐棬宄�","鍟嗕笜","淇¢槼","椹婚┈搴�","閮戝窞","娲涢槼","骞抽《灞�","鏂颁埂","鐒︿綔","娴庢簮","榛勫唸","閯傚窞","鍗佸牥","闅忓窞","瀛濇劅","鑽嗗窞", + "鍜稿畞","鑽嗛棬","鎭╂柦","姝︽眽","瑗勯槼","瀹滄槍","榛勭煶","浠欐","娼滄睙","澶╅棬","绁炲啘鏋�"] + //婀栧崡 姹熻嫃 姹熻タ + private static final String[] day7 = ["甯稿痉","宀抽槼","鎬�鍖�","閮村窞","鐩婇槼","姘稿窞","濞勫簳","婀樿タ","閭甸槼","闀挎矙","鏍床", + "婀樻江","寮犲鐣�","琛¢槼","娣畨","鍗椾含","鑻忓窞","鏃犻敗","鎵窞","甯稿窞","寰愬窞","闀囨睙","鍗楅��","娉板窞","瀹胯縼","杩炰簯娓�","鐩愬煄","鍚夊畨","鏅痉闀�","楣版江","鏂颁綑","涓婇ザ","瀹滄槬", + "钀嶄埂","鎶氬窞","鍗楁槍","璧e窞","涔濇睙"] + //鍚夋灄 杈藉畞 鍐呰挋鍙� 瀹佸 + private static final String[] day8 = ["鍥涘钩","杈芥簮","鐧藉北","鐧藉煄","閫氬寲","鏉惧師","寤惰竟","闀挎槬","鍚夋灄","閾佸箔","閿﹀窞","鏈濋槼","闃滄柊","鎶氶『","钁姦宀�","杈介槼","娌堥槼","澶ц繛", + "闉嶅北","涓逛笢","鏈邯","钀ュ彛","鐩橀敠","鍖呭ご","璧ゅ嘲","鍏村畨鐩�","閿℃灄閮嫆鐩�","闃挎媺鍠勭洘","閯傚皵澶氭柉","涔屾捣","涔屽叞瀵熷竷","閫氳窘","宸村溅娣栧皵","鍛间鸡璐濆皵","鍛煎拰娴╃壒","涓崼","鍥哄師","鍚村繝", + "鐭冲槾灞�","閾跺窛"] + //闈掓捣 灞变笢 灞辫タ 浜戝崡 + private static final String[] day9 = ["娴蜂笢","娴峰寳宸�","榛勫崡宸�","娴峰崡宸�","鏋滄礇宸�","鐜夋爲宸�","娴疯タ宸�","瑗垮畞","涓存矀","娉板畨","鑿忔辰","娴庡畞","鏃ョ収","鑱婂煄","婊ㄥ窞","鏋e簞","鑾辫姕","涓滆惀","寰峰窞","娴庡崡", + "闈掑矝","濞佹捣","鐑熷彴","娼嶅潑","娣勫崥","澶у悓","涓存本","鏈斿窞","鏅嬪煄","蹇诲窞","鏅嬩腑","闃虫硥","杩愬煄","闀挎不","鍚曟","澶師","鏂囧北宸�","绾㈡渤","涓存钵","淇濆北","鏄��", + "鏅幢","妤氶泟","鎬掓睙宸�","杩簡宸�","瑗垮弻鐗堢撼宸�","寰峰畯宸�","鏄嗘槑","涓芥睙","澶х悊","鐜夋邯","鏇查潠"] + //闄曡タ 鍥涘窛 鏂扮枂 瑗胯棌 + private static final String[] day10 = ["姒嗘灄","姹変腑","瀹夊悍","鍟嗘礇","瀹濋浮","娓崡","閾滃窛","瑗垮畨","鍜搁槼","寤跺畨","骞垮厓","涔愬北","鍗楀厖","娉稿窞","璧勯槼","鍐呮睙","杈惧窞","宸翠腑","閬傚畞","鐪夊北","寰烽槼","骞垮畨", + "闆呭畨","闃垮潩宸�","鍑夊北宸�","鐢樺瓬宸�","鎴愰兘","缁甸槼","瀹滃","鑷础","鏀�鏋濊姳","鍚愰瞾鐣�","鍝堝瘑","鍜岀敯","鏄屽悏","闃垮嫆娉�","鍗氬皵濉旀媺","宸撮煶閮","鍏嬪瓬鍕掕嫃","浼婄妬","闃垮厠鑻�", + "鍏嬫媺鐜涗緷","鍠�浠�","濉斿煄","涔岄瞾鏈ㄩ綈","鐭虫渤瀛�","闃挎媺灏�","鍥炬湪鑸掑厠","浜斿娓�","鏄岄兘","鏃ュ杸鍒�","灞卞崡","閭f洸","闃块噷","鏋楄姖","鎷夎惃"] static main(args) { def s = System.currentTimeMillis() runBatch(new UpdatePreciseDistrictAddress(), args) - println("运行时间:${(int) ((System.currentTimeMillis() - s)) / (1000 * 60)}分钟") + println("杩愯鏃堕棿:${(int) ((System.currentTimeMillis() - s)) / (1000 * 60)}鍒嗛挓") } @Override @@ -89,9 +89,9 @@ class UpdatePreciseDistrictAddress extends BaseBatch { } - //对数据库中的小区地址进行更新 + //瀵规暟鎹簱涓殑灏忓尯鍦板潃杩涜鏇存柊 def static updateAddressToMongoDB(String city){ - //根据城市将数据库中的数据取出来, + //鏍规嵁鍩庡競灏嗘暟鎹簱涓殑鏁版嵁鍙栧嚭鏉ワ紝 BasicDBObject query = new BasicDBObject() query.append("city", city) query.append("visible", 0) @@ -99,14 +99,14 @@ class UpdatePreciseDistrictAddress extends BaseBatch { DSCursor districtDS = DbUtils.seaweed.find(query) List districtOBList = districtDS.getResults() for(DBObject it:districtOBList){ - if(!morePreciseAddress(it.get("address"),it.get("name"))){//判断地址是不是精确的地址 + if(!morePreciseAddress(it.get("address"),it.get("name"))){//鍒ゆ柇鍦板潃鏄笉鏄簿纭殑鍦板潃 String oldAddress = it.get("address"); String[] strs = null; if(it.get("alias")!=null){ strs = it.get("alias").toArray() } def bean = null; - // 高德地图 + // 楂樺痉鍦板浘 try{ bean = getAddressByGaoDeApiTest(city, it.get("name"), strs, it.get("region")) }catch(Exception e){ @@ -116,13 +116,13 @@ class UpdatePreciseDistrictAddress extends BaseBatch { if(bean!=null){ addressFromApi = bean.get("address") } - String preciseAddress=null//精确地址 + String preciseAddress=null//绮剧‘鍦板潃 String handledAddress = DataUtil.formateAddress(city,addressFromApi) - if(handledAddress!=null&&morePreciseAddress(handledAddress,it.get("name"))){//如果处理后的地址部位空,并且获得紧缺地址 + if(handledAddress!=null&&morePreciseAddress(handledAddress,it.get("name"))){//濡傛灉澶勭悊鍚庣殑鍦板潃閮ㄤ綅绌猴紝骞朵笖鑾峰緱绱х己鍦板潃 preciseAddress = handledAddress - }else{//用腾讯来处理 + }else{//鐢ㄨ吘璁潵澶勭悊 try{ - bean = getAddressByTengXunApiTest(city,it.get("name"),strs,it.get("region"))//用腾讯地图进行获取数据 + bean = getAddressByTengXunApiTest(city,it.get("name"),strs,it.get("region"))//鐢ㄨ吘璁湴鍥捐繘琛岃幏鍙栨暟鎹� }catch(Exception e){ e.printStackTrace() } @@ -132,9 +132,9 @@ class UpdatePreciseDistrictAddress extends BaseBatch { handledAddress = DataUtil.formateAddress(city,addressFromApi) if(handledAddress!=null&&morePreciseAddress(handledAddress,it.get("name"))){ preciseAddress = handledAddress - }else{//用百度进行处理 + }else{//鐢ㄧ櫨搴﹁繘琛屽鐞� try{ - bean = getAddressByBaiDuApiTest(city,it.get("name"),it.get("region"))//用百度地图进行获取数据 + bean = getAddressByBaiDuApiTest(city,it.get("name"),it.get("region"))//鐢ㄧ櫨搴﹀湴鍥捐繘琛岃幏鍙栨暟鎹� }catch(Exception e){ e.printStackTrace() } @@ -147,12 +147,12 @@ class UpdatePreciseDistrictAddress extends BaseBatch { } } } - if(preciseAddress!=null){//是精确地址的话就更新进数据库 + if(preciseAddress!=null){//鏄簿纭湴鍧�鐨勮瘽灏辨洿鏂拌繘鏁版嵁搴� if(isBetterPreciseAddress(preciseAddress,it.get("name"))){ - //对数据库中的数据进行更新 + //瀵规暟鎹簱涓殑鏁版嵁杩涜鏇存柊 try{ String str = updateById(it.get("_id"),preciseAddress) - //将更新过的数据放进日志中 + //灏嗘洿鏂拌繃鐨勬暟鎹斁杩涙棩蹇椾腑 insertUpdateLog(city,it.get("region"),it.get("name"),oldAddress,preciseAddress) }catch(Exception e){ e.printStackTrace() @@ -163,7 +163,7 @@ class UpdatePreciseDistrictAddress extends BaseBatch { } } - //更加精确的地址 + //鏇村姞绮剧‘鐨勫湴鍧� def static morePreciseAddress(String address,String name){ if(StringUtils.isBlank(address)){ return false; @@ -184,19 +184,19 @@ class UpdatePreciseDistrictAddress extends BaseBatch { } } - if(address ==~ /.*\d+(号|弄|支|直弄).*/){ + if(address ==~ /.*\d+(鍙穦寮剕鏀瘄鐩村紕).*/){ return true } return false } - //获取当天是某一天 + //鑾峰彇褰撳ぉ鏄煇涓�澶� def static getTodayToUpdate(){ - SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//设置日期格式 - System.out.println(df.format(new Date()));// new Date()为获取当前系统时间 - //获取当月一号的时间 + SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//璁剧疆鏃ユ湡鏍煎紡 + System.out.println(df.format(new Date()));// new Date()涓鸿幏鍙栧綋鍓嶇郴缁熸椂闂� + //鑾峰彇褰撴湀涓�鍙风殑鏃堕棿 String format = df.format(new Date()); String date = format.substring(0, 10); String day = date.substring(9,10) @@ -252,13 +252,13 @@ class UpdatePreciseDistrictAddress extends BaseBatch { } } - ////将更新过的数据放进日志中 + ////灏嗘洿鏂拌繃鐨勬暟鎹斁杩涙棩蹇椾腑 def static insertUpdateLog(String city,String region,String name,String oldAddress,String address){ DBObject logDetial = new BasicDBObject().append("city",city).append("name", name).append("oldAddress",oldAddress).append("address",address).append("u_date",new Date()); address_update.insert(logDetial); } - //根据id进行更新address + //鏍规嵁id杩涜鏇存柊address def static updateById(def id,String address){ BasicDBObject queryCondition = new BasicDBObject("_id",id); BasicDBObject updateData = new BasicDBObject("address",address) @@ -266,18 +266,18 @@ class UpdatePreciseDistrictAddress extends BaseBatch { BasicDBObject update = new BasicDBObject() update.put('$set', updateData) DbUtils.seaweed.update(queryCondition, update) - //输出一个修改日志 + //杈撳嚭涓�涓慨鏀规棩蹇� String str = queryCondition.toString()+"_____"+update.toString() println queryCondition.toString()+"_____"+update.toString() return str } - //对preciseAddress进行进一步的判断 + //瀵筽reciseAddress杩涜杩涗竴姝ョ殑鍒ゆ柇 public static isBetterPreciseAddress(String address,String name){ - if(address.endsWith("号")||address.endsWith("弄")||address.endsWith("支")){//要以号结尾 - if(address.indexOf(",")==-1 && address.indexOf("、")==-1){//地址中不能包含某些标点 - if(!address.contains(name)){//地址中不能包含小区名字 - if((!address.contains("与"))&&(!address.contains("其他"))&&(!isNumeric(address))){//当地址中有与字并且不能有其他两字,不能只包含数字和号 + if(address.endsWith("鍙�")||address.endsWith("寮�")||address.endsWith("鏀�")){//瑕佷互鍙风粨灏� + if(address.indexOf(",")==-1 && address.indexOf("銆�")==-1){//鍦板潃涓笉鑳藉寘鍚煇浜涙爣鐐� + if(!address.contains(name)){//鍦板潃涓笉鑳藉寘鍚皬鍖哄悕瀛� + if((!address.contains("涓�"))&&(!address.contains("鍏朵粬"))&&(!isNumeric(address))){//褰撳湴鍧�涓湁涓庡瓧骞朵笖涓嶈兘鏈夊叾浠栦袱瀛楋紝涓嶈兘鍙寘鍚暟瀛楀拰鍙� return true } } @@ -286,10 +286,10 @@ class UpdatePreciseDistrictAddress extends BaseBatch { return false } - //判断字符串中是否只有数字和号、弄 + //鍒ゆ柇瀛楃涓蹭腑鏄惁鍙湁鏁板瓧鍜屽彿銆佸紕 public static boolean isNumeric(String str){ - String handledStr = str.replaceAll("号", "") - handledStr = handledStr.replaceAll("弄", "") + String handledStr = str.replaceAll("鍙�", "") + handledStr = handledStr.replaceAll("寮�", "") Pattern pattern = Pattern.compile("[0-9]*"); Matcher isNum = pattern.matcher(handledStr); if( !isNum.matches() ) @@ -299,7 +299,7 @@ class UpdatePreciseDistrictAddress extends BaseBatch { return true; } - //根据高德api获取地址 + //鏍规嵁楂樺痉api鑾峰彇鍦板潃 def static getAddressByGaoDeApiTest(String city, String name, String[] alias, String region) { def bean = [:] JSONObject json = GaoDeApiUtils.search(endWiths(name), city) @@ -348,7 +348,7 @@ class UpdatePreciseDistrictAddress extends BaseBatch { return null } - //根据腾讯API获取地址 + //鏍规嵁鑵捐API鑾峰彇鍦板潃 def static getAddressByTengXunApiTest(String city, String name, String[] alias, String region) { def bean = [:] JSONObject json = TengXunApiUtils.search(city, name) @@ -398,12 +398,12 @@ class UpdatePreciseDistrictAddress extends BaseBatch { } - //通过百度api获取地址 + //閫氳繃鐧惧害api鑾峰彇鍦板潃 def static getAddressByBaiDuApiTest(String city, String disName,String region) { def bean = [:] try { disName = formatName(disName) - JSONObject json = BaiDuApiUtils.search(city, disName, "住宅区", 1, 20, 0) + JSONObject json = BaiDuApiUtils.search(city, disName, "浣忓畢鍖�", 1, 20, 0) if(json.getInt("status") == 0) { JSONArray array = json.getJSONArray("results") if(array.size()!=0) { @@ -437,7 +437,7 @@ class UpdatePreciseDistrictAddress extends BaseBatch { - //导出小区 + //瀵煎嚭灏忓尯 def static exportDistrict(String city) { DSCursor cur = DbUtils.seaweed.find(new BasicDBObject("city", city).append("status", 0).append("cat", "district")) Iterator it = cur.iterator() @@ -464,7 +464,7 @@ class UpdatePreciseDistrictAddress extends BaseBatch { - //??????е??????γ?? + //??????械??????纬?? def static updateDbLocation(List item) { BasicDBObject query = new BasicDBObject("_id", item[0]) @@ -562,21 +562,21 @@ class UpdatePreciseDistrictAddress extends BaseBatch { def static getBySimpleName(String name) { name = formatName(name) - if(name.endsWith("小区") || name.endsWith("公寓") || name.endsWith("别墅")) { + if(name.endsWith("灏忓尯") || name.endsWith("鍏瘬") || name.endsWith("鍒")) { name = name.substring(0, name.length() - 2) } - if(name.endsWith("一期") || name.endsWith("二期") || name.endsWith("三期") || name.endsWith("四期") - || name.endsWith("五期") || name.endsWith("六期") || name.endsWith("七期") || name.endsWith("八期") - || name.endsWith("九期") || name.endsWith("十期") ){ + if(name.endsWith("涓�鏈�") || name.endsWith("浜屾湡") || name.endsWith("涓夋湡") || name.endsWith("鍥涙湡") + || name.endsWith("浜旀湡") || name.endsWith("鍏湡") || name.endsWith("涓冩湡") || name.endsWith("鍏湡") + || name.endsWith("涔濇湡") || name.endsWith("鍗佹湡") ){ name = name.substring(0, name.length() - 2) } return name } def static endWiths(String name) { - if(name.endsWith("一期") || name.endsWith("二期") || name.endsWith("三期") || name.endsWith("四期") - || name.endsWith("五期") || name.endsWith("六期") || name.endsWith("七期") || name.endsWith("八期") - || name.endsWith("九期") || name.endsWith("十期") ){ + if(name.endsWith("涓�鏈�") || name.endsWith("浜屾湡") || name.endsWith("涓夋湡") || name.endsWith("鍥涙湡") + || name.endsWith("浜旀湡") || name.endsWith("鍏湡") || name.endsWith("涓冩湡") || name.endsWith("鍏湡") + || name.endsWith("涔濇湡") || name.endsWith("鍗佹湡") ){ name = name.substring(0, name.length() - 2) } Matcher matcher = CHARSET_PATTERN.matcher(name); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/WuHuShuXiaoQuFangYuanLiang.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/WuHuShuXiaoQuFangYuanLiang.groovy index 4d1b3bd8f..10c545905 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/WuHuShuXiaoQuFangYuanLiang.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/WuHuShuXiaoQuFangYuanLiang.groovy @@ -14,7 +14,7 @@ import com.mongodb.DBCollection import com.mongodb.DBObject /** - * 定时更新小区地址数据 + * 瀹氭椂鏇存柊灏忓尯鍦板潃鏁版嵁 * @author hubingliang * */ @@ -23,10 +23,10 @@ class WuHuShuXiaoQuFangYuanLiang{ public static final DBCollection LOU_DONG = MongoUtils.getCollectionByName("fangjia_base", "loudong", "mongo.db.fangjia.com", 27017) static main(args) { - //exportDisNameData("杭州"); - exportDisNameData("广州"); - exportDisNameData("深圳"); - exportDisNameData("北京"); + //exportDisNameData("鏉窞"); + exportDisNameData("骞垮窞"); + exportDisNameData("娣卞湷"); + exportDisNameData("鍖椾含"); } public static void exportDisNameData(String city){ @@ -74,7 +74,7 @@ class WuHuShuXiaoQuFangYuanLiang{ } /** - * 判断小区是否有户数 + * 鍒ゆ柇灏忓尯鏄惁鏈夋埛鏁� * @param dis * @return */ @@ -88,11 +88,11 @@ class WuHuShuXiaoQuFangYuanLiang{ /** - * 获取城市的小区 + * 鑾峰彇鍩庡競鐨勫皬鍖� * @param city * @return */ - //获取城市小区 + //鑾峰彇鍩庡競灏忓尯 public static List getCityDistrict(String city){ BasicDBObject qu = new BasicDBObject() qu.append("city", city) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/XiaoQuMingZhongNongHaoEnd.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/XiaoQuMingZhongNongHaoEnd.groovy index b2d8527f7..914055755 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/XiaoQuMingZhongNongHaoEnd.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/XiaoQuMingZhongNongHaoEnd.groovy @@ -11,7 +11,7 @@ import java.util.regex.Matcher import java.util.regex.Pattern /** - * 定时更新小区地址数据 + * 瀹氭椂鏇存柊灏忓尯鍦板潃鏁版嵁 * @author hubingliang * */ @@ -20,7 +20,7 @@ class XiaoQuMingZhongNongHaoEnd{ public static final DBCollection LOU_DONG = MongoUtils.getCollectionByName("fangjia_base", "loudong", "mongo.db.fangjia.com", 27017) static main(args) { - exportDisNameData("D:\\hbl\\Data\\71个城市.xlsx",0); + exportDisNameData("D:\\hbl\\Data\\71涓煄甯�.xlsx",0); } public static void exportDisNameData(String fileName,Integer num){ @@ -55,11 +55,11 @@ class XiaoQuMingZhongNongHaoEnd{ } } } - exportData("71个城市",ls); + exportData("71涓煄甯�",ls); } /** - * 判断楼栋库中是否存在 + * 鍒ゆ柇妤兼爧搴撲腑鏄惁瀛樺湪 */ public static boolean hasInLouDong(String city,String region,String name){ if(city!=null&®ion!=null&&name!=null){ @@ -75,7 +75,7 @@ class XiaoQuMingZhongNongHaoEnd{ return false; } /** - * 将小区别名处理成字符串 + * 灏嗗皬鍖哄埆鍚嶅鐞嗘垚瀛楃涓� */ public static String getAliasStr(List alias){ String str = " "; @@ -93,7 +93,7 @@ class XiaoQuMingZhongNongHaoEnd{ } /** - * 将地址别名处理成字符串 + * 灏嗗湴鍧�鍒悕澶勭悊鎴愬瓧绗︿覆 */ public static String getAddressAliasStr(List addressAlias){ String str = " "; @@ -111,13 +111,13 @@ class XiaoQuMingZhongNongHaoEnd{ } /** - * 判断字符串中是否带有弄和号 + * 鍒ゆ柇瀛楃涓蹭腑鏄惁甯︽湁寮勫拰鍙� * @param name * @return */ public static Boolean hasNongHao(String name){ if(name!=null){ - if(getMatchString(name,"\\d+弄")||getMatchString(name,"\\d+号")){ + if(getMatchString(name,"\\d+寮�")||getMatchString(name,"\\d+鍙�")){ return true; } } @@ -139,7 +139,7 @@ class XiaoQuMingZhongNongHaoEnd{ } /** - * 获取城市的小区 + * 鑾峰彇鍩庡競鐨勫皬鍖� * @param city * @return */ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/XinFengCurrent.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/XinFengCurrent.groovy index 750978ee3..1e966756b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/XinFengCurrent.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/XinFengCurrent.groovy @@ -14,7 +14,7 @@ import com.mongodb.DBCursor import com.mongodb.DBObject /** - * 成交量相关 + * 鎴愪氦閲忕浉鍏� * @author hubingliang * */ @@ -25,7 +25,7 @@ class XinFengCurrent{ public static final DBCollection XING_FENG_DISNAME = MongoUtils.getCollectionByName("gaode_poi", "xing_feng_ping_disname", "192.168.0.61", 27017) static main(args) { - mulCatch("深圳","pname=%u5A01%u6D77%u4E2D%u5FC3; JSESSIONID=8A3C027FADC316C61FE17CA3EFE822C2; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1501570598; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1502250488; xfpgCity=%E6%B7%B1%E5%9C%B3%E5%B8%82"); + mulCatch("娣卞湷","pname=%u5A01%u6D77%u4E2D%u5FC3; JSESSIONID=8A3C027FADC316C61FE17CA3EFE822C2; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1501570598; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1502250488; xfpgCity=%E6%B7%B1%E5%9C%B3%E5%B8%82"); } public static void mulCatch(String city,String cook){ @@ -60,7 +60,7 @@ class XinFengCurrent{ } /** - * 对小区进行查询抓取 + * 瀵瑰皬鍖鸿繘琛屾煡璇㈡姄鍙� */ public static void catchDissInfo(String city,String url,DBObject dis,String cook){ String name = dis.get("name"); @@ -92,14 +92,14 @@ class XinFengCurrent{ }catch(Exception e){ e.printStackTrace() } - catchLouDongInfo("上海","http://www.xfpg.com.cn/build.do?method=dongnum",db,cook); + catchLouDongInfo("涓婃捣","http://www.xfpg.com.cn/build.do?method=dongnum",db,cook); } } } } } /** - * 对楼栋进行查询抓取 + * 瀵规ゼ鏍嬭繘琛屾煡璇㈡姄鍙� */ public static void catchLouDongInfo(String city,String url,DBObject dis,String cook){ if(dis!=null&&dis.get("pname")!=null){ @@ -140,7 +140,7 @@ class XinFengCurrent{ } /** - * 对房号进行查询抓取 + * 瀵规埧鍙疯繘琛屾煡璇㈡姄鍙� */ public static BasicDBList catchFangHaoInfo(String url,String dongid,String cook){ if(dongid!=null){ @@ -168,7 +168,7 @@ class XinFengCurrent{ } /** - * 使用别名进行抓取 + * 浣跨敤鍒悕杩涜鎶撳彇 * @param dis * @param params * @param headers @@ -233,7 +233,7 @@ class XinFengCurrent{ } /** - * 获取城市的小区 + * 鑾峰彇鍩庡競鐨勫皬鍖� * @param city * @return */ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/XinFengPingGu.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/XinFengPingGu.groovy index 43bad55a5..b21a04a2c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/XinFengPingGu.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/XinFengPingGu.groovy @@ -13,7 +13,7 @@ import com.mongodb.DBCollection import com.mongodb.DBObject /** - * 成交量相关 + * 鎴愪氦閲忕浉鍏� * @author hubingliang * */ @@ -65,7 +65,7 @@ class XinFengPingGu{ } /** - * 拼接参数 + * 鎷兼帴鍙傛暟 * @param map * @return */ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/XinFengPingGu2Batch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/XinFengPingGu2Batch.groovy index 6f64d059e..039565383 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/XinFengPingGu2Batch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/XinFengPingGu2Batch.groovy @@ -15,7 +15,7 @@ import com.mongodb.DBCollection import com.mongodb.DBObject /** - * 成交量相关 + * 鎴愪氦閲忕浉鍏� * @author hubingliang * */ @@ -25,10 +25,10 @@ class XinFengPingGu2Batch{ public static final DBCollection XING_FENG_PING_LOG = MongoUtils.getCollectionByName("gaode_poi", "xing_feng_ping_log", "192.168.0.61", 27017) static main(args) { - doCatch("宁波"); + doCatch("瀹佹尝"); /* DBObject db = new BasicDBObject(); - db.put("name", "南京国际化工商贸城"); - catchDissInfo("南京", "http://www.xfpg.com.cn/build.do?method=buildinfo", db);*/ + db.put("name", "鍗椾含鍥介檯鍖栧伐鍟嗚锤鍩�"); + catchDissInfo("鍗椾含", "http://www.xfpg.com.cn/build.do?method=buildinfo", db);*/ } public static void doCatch(String city){ @@ -60,7 +60,7 @@ class XinFengPingGu2Batch{ } /** - * 对小区进行查询抓取 + * 瀵瑰皬鍖鸿繘琛屾煡璇㈡姄鍙� */ public static void catchDissInfo(String city,String url,DBObject dis){ if(dis!=null&&dis.get("name")!=null){ @@ -94,7 +94,7 @@ class XinFengPingGu2Batch{ query.put("towns",db.get("towns")); query.put("pname",db.get("pname")); XING_FENG_PING_GU_BUILDINFO.update(query, db,true,false); - catchLouDongInfo("上海","http://www.xfpg.com.cn/build.do?method=dongnum",db); + catchLouDongInfo("涓婃捣","http://www.xfpg.com.cn/build.do?method=dongnum",db); } } } @@ -103,7 +103,7 @@ class XinFengPingGu2Batch{ } } /** - * 对楼栋进行查询抓取 + * 瀵规ゼ鏍嬭繘琛屾煡璇㈡姄鍙� */ public static void catchLouDongInfo(String city,String url,DBObject dis){ if(dis!=null&&dis.get("pname")!=null){ @@ -141,7 +141,7 @@ class XinFengPingGu2Batch{ } /** - * 对房号进行查询抓取 + * 瀵规埧鍙疯繘琛屾煡璇㈡姄鍙� */ public static BasicDBList catchFangHaoInfo(String url,String dongid){ if(dongid!=null){ @@ -170,7 +170,7 @@ class XinFengPingGu2Batch{ } /** - * 使用别名进行抓取 + * 浣跨敤鍒悕杩涜鎶撳彇 * @param dis * @param params * @param headers @@ -235,7 +235,7 @@ class XinFengPingGu2Batch{ } /** - * 获取城市的小区 + * 鑾峰彇鍩庡競鐨勫皬鍖� * @param city * @return */ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/XinFengPingGuBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/XinFengPingGuBatch.groovy index a34943e3e..caf8d1f9b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/XinFengPingGuBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/XinFengPingGuBatch.groovy @@ -18,7 +18,7 @@ import com.mongodb.DBCollection import com.mongodb.DBObject /** - * 成交量相关 + * 鎴愪氦閲忕浉鍏� * @author hubingliang * */ @@ -29,25 +29,25 @@ class XinFengPingGuBatch{ static main(args) { getAllField() - //doCatch("杭州","JSESSIONID=2077FBEFF76BA049FE2DF35AEC281944; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1489973379; xfpgCity=%E6%9D%AD%E5%B7%9E%E5%B8%82"); - //doCatch("北京","pname=%u4E0A%u6797%u6625%u5929; JSESSIONID=EA519AD3873C20BCC73D822C378AD360; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1489986395; xfpgCity=%E5%8C%97%E4%BA%AC%E5%B8%82"); - //doCatch("天津", "JSESSIONID=EA519AD3873C20BCC73D822C378AD360; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1490001888; xfpgCity=%E5%A4%A9%E6%B4%A5%E5%B8%82; pname=%u5929%u6D25%u5927%u90FD%u4F1A") - //doCatch("深圳", "pname=%u5929%u6D25%u5927%u60A6%u57CE; JSESSIONID=65ED1DEDF6481A618D39814414D9E620; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1490061813; xfpgCity=%E6%B7%B1%E5%9C%B3%E5%B8%82") - //doCatch("广州", "JSESSIONID=6070B66EBC7AF013303B0DD24F43978D; pname=%u5E7F%u5DDE%u4FDD%u7A0E%u533A%u541B%u5408%u96C5%u5C45; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1490091776; xfpgCity=%E5%B9%BF%E5%B7%9E%E5%B8%82") - //doCatch("沈阳", "pname=%u5E7F%u5DDE%u4FDD%u7A0E%u533A%u541B%u5408%u96C5%u5C45; JSESSIONID=898D7CDDF0F5DF1A389B7780103ECC6F; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1490145659; xfpgCity=%E6%B2%88%E9%98%B3%E5%B8%82") - //doCatch("大连", "JSESSIONID=898D7CDDF0F5DF1A389B7780103ECC6F; pname=%u6C88%u9633%u78A7%u6842%u56ED; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1490165967; xfpgCity=%E5%A4%A7%E8%BF%9E%E5%B8%82") - //doCatch("哈尔滨", "JSESSIONID=C43AB4B8B02337FD8F4DB1A8CB159574; pname=%u54C8%u8868%u5C0F%u533A; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1490180706; xfpgCity=%E5%93%88%E5%B0%94%E6%BB%A8%E5%B8%82") - //doCatch("长春", "pname=%u54C8%u5C14%u6EE8%u4E07%u8FBE%u6587%u5316%u65C5%u6E38%u57CE; JSESSIONID=D7224EBE4B83DCFF2DE491498BF2D701; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1490232322; xfpgCity=%E9%95%BF%E6%98%A5%E5%B8%82") - //doCatch("呼和浩特", "pname=%u957F%u6625%u6FB3%u6D32%u57CE; JSESSIONID=488E9783339E3948D6B98B01BF16D32C; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1490245872; xfpgCity=%E5%91%BC%E5%92%8C%E6%B5%A9%E7%89%B9%E5%B8%82") - //doCatch("南宁", "pname=%u547C%u8FD0%u82B1%u56ED; JSESSIONID=B189FF2FD09365290A60259442BFE8B1; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1490253945; xfpgCity=%E5%8D%97%E5%AE%81%E5%B8%82") - //doCatch("东莞", "pname=%u6C5F%u5357%u65B0%u5929%u5730; JSESSIONID=74A7E20A3493FD301BE737C65D49A6C2; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1490258880; xfpgCity=%E4%B8%9C%E8%8E%9E%E5%B8%82") - /*doCatch("惠州", "JSESSIONID=6B4B856FBA917B246859D80F9AC37E85; pname=%u78A7%u6E56%u4E1C%u5CB8; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1489661211; xfpgCity=%E6%83%A0%E5%B7%9E%E5%B8%82") - doCatch("珠海", "JSESSIONID=6B4B856FBA917B246859D80F9AC37E85; pname=%u6F6E%u60E0%u751C%u57CE; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1489661252; xfpgCity=%E7%8F%A0%E6%B5%B7%E5%B8%82") - doCatch("济南","JSESSIONID=6B4B856FBA917B246859D80F9AC37E85; pname=%u73E0%u6D77%u51E4%u51F0%u5170%u4EAD; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1489661324; xfpgCity=%E6%B5%8E%E5%8D%97%E5%B8%82") - doCatch("烟台","JSESSIONID=6B4B856FBA917B246859D80F9AC37E85; pname=%u6D4E%u5357%u4E07%u8FBE%u5E7F%u573A; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1489661409; xfpgCity=%E7%83%9F%E5%8F%B0%E5%B8%82") - doCatch("长沙","JSESSIONID=6B4B856FBA917B246859D80F9AC37E85; pname=%u5408%u521B%u70DF%u53F0%u516C%u9986; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1489661490; xfpgCity=%E9%95%BF%E6%B2%99%E5%B8%82"); - doCatch("株洲","JSESSIONID=6B4B856FBA917B246859D80F9AC37E85; pname=%u957F%u6C99%u7EFF%u5730%u4E2D%u5FC3; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1489661591; xfpgCity=%E6%A0%AA%E6%B4%B2%E5%B8%82"); - doCatch("湘潭","JSESSIONID=6B4B856FBA917B246859D80F9AC37E85; pname=%u682A%u6D32%u6C49%u534E%u56FD%u9645%u5546%u4E1A%u57CE; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1489661640; xfpgCity=%E6%B9%98%E6%BD%AD%E5%B8%82");*/ + //doCatch("鏉窞","JSESSIONID=2077FBEFF76BA049FE2DF35AEC281944; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1489973379; xfpgCity=%E6%9D%AD%E5%B7%9E%E5%B8%82"); + //doCatch("鍖椾含","pname=%u4E0A%u6797%u6625%u5929; JSESSIONID=EA519AD3873C20BCC73D822C378AD360; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1489986395; xfpgCity=%E5%8C%97%E4%BA%AC%E5%B8%82"); + //doCatch("澶╂触", "JSESSIONID=EA519AD3873C20BCC73D822C378AD360; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1490001888; xfpgCity=%E5%A4%A9%E6%B4%A5%E5%B8%82; pname=%u5929%u6D25%u5927%u90FD%u4F1A") + //doCatch("娣卞湷", "pname=%u5929%u6D25%u5927%u60A6%u57CE; JSESSIONID=65ED1DEDF6481A618D39814414D9E620; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1490061813; xfpgCity=%E6%B7%B1%E5%9C%B3%E5%B8%82") + //doCatch("骞垮窞", "JSESSIONID=6070B66EBC7AF013303B0DD24F43978D; pname=%u5E7F%u5DDE%u4FDD%u7A0E%u533A%u541B%u5408%u96C5%u5C45; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1490091776; xfpgCity=%E5%B9%BF%E5%B7%9E%E5%B8%82") + //doCatch("娌堥槼", "pname=%u5E7F%u5DDE%u4FDD%u7A0E%u533A%u541B%u5408%u96C5%u5C45; JSESSIONID=898D7CDDF0F5DF1A389B7780103ECC6F; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1490145659; xfpgCity=%E6%B2%88%E9%98%B3%E5%B8%82") + //doCatch("澶ц繛", "JSESSIONID=898D7CDDF0F5DF1A389B7780103ECC6F; pname=%u6C88%u9633%u78A7%u6842%u56ED; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1490165967; xfpgCity=%E5%A4%A7%E8%BF%9E%E5%B8%82") + //doCatch("鍝堝皵婊�", "JSESSIONID=C43AB4B8B02337FD8F4DB1A8CB159574; pname=%u54C8%u8868%u5C0F%u533A; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1490180706; xfpgCity=%E5%93%88%E5%B0%94%E6%BB%A8%E5%B8%82") + //doCatch("闀挎槬", "pname=%u54C8%u5C14%u6EE8%u4E07%u8FBE%u6587%u5316%u65C5%u6E38%u57CE; JSESSIONID=D7224EBE4B83DCFF2DE491498BF2D701; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1490232322; xfpgCity=%E9%95%BF%E6%98%A5%E5%B8%82") + //doCatch("鍛煎拰娴╃壒", "pname=%u957F%u6625%u6FB3%u6D32%u57CE; JSESSIONID=488E9783339E3948D6B98B01BF16D32C; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1490245872; xfpgCity=%E5%91%BC%E5%92%8C%E6%B5%A9%E7%89%B9%E5%B8%82") + //doCatch("鍗楀畞", "pname=%u547C%u8FD0%u82B1%u56ED; JSESSIONID=B189FF2FD09365290A60259442BFE8B1; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1490253945; xfpgCity=%E5%8D%97%E5%AE%81%E5%B8%82") + //doCatch("涓滆帪", "pname=%u6C5F%u5357%u65B0%u5929%u5730; JSESSIONID=74A7E20A3493FD301BE737C65D49A6C2; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1490258880; xfpgCity=%E4%B8%9C%E8%8E%9E%E5%B8%82") + /*doCatch("鎯犲窞", "JSESSIONID=6B4B856FBA917B246859D80F9AC37E85; pname=%u78A7%u6E56%u4E1C%u5CB8; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1489661211; xfpgCity=%E6%83%A0%E5%B7%9E%E5%B8%82") + doCatch("鐝犳捣", "JSESSIONID=6B4B856FBA917B246859D80F9AC37E85; pname=%u6F6E%u60E0%u751C%u57CE; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1489661252; xfpgCity=%E7%8F%A0%E6%B5%B7%E5%B8%82") + doCatch("娴庡崡","JSESSIONID=6B4B856FBA917B246859D80F9AC37E85; pname=%u73E0%u6D77%u51E4%u51F0%u5170%u4EAD; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1489661324; xfpgCity=%E6%B5%8E%E5%8D%97%E5%B8%82") + doCatch("鐑熷彴","JSESSIONID=6B4B856FBA917B246859D80F9AC37E85; pname=%u6D4E%u5357%u4E07%u8FBE%u5E7F%u573A; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1489661409; xfpgCity=%E7%83%9F%E5%8F%B0%E5%B8%82") + doCatch("闀挎矙","JSESSIONID=6B4B856FBA917B246859D80F9AC37E85; pname=%u5408%u521B%u70DF%u53F0%u516C%u9986; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1489661490; xfpgCity=%E9%95%BF%E6%B2%99%E5%B8%82"); + doCatch("鏍床","JSESSIONID=6B4B856FBA917B246859D80F9AC37E85; pname=%u957F%u6C99%u7EFF%u5730%u4E2D%u5FC3; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1489661591; xfpgCity=%E6%A0%AA%E6%B4%B2%E5%B8%82"); + doCatch("婀樻江","JSESSIONID=6B4B856FBA917B246859D80F9AC37E85; pname=%u682A%u6D32%u6C49%u534E%u56FD%u9645%u5546%u4E1A%u57CE; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1489661640; xfpgCity=%E6%B9%98%E6%BD%AD%E5%B8%82");*/ } public static void getAllField(){ @@ -63,12 +63,12 @@ class XinFengPingGuBatch{ public static void doCatch(String city,String cook){ List diss = getDistrictData(city) DBObject d = new BasicDBObject(); - /*d.put("name", "上林春天") - d.put("city", "杭州") + /*d.put("name", "涓婃灄鏄ュぉ") + d.put("city", "鏉窞") diss.add(d)*/ int i = 0; for(DBObject dis:diss){ - /*if(!("上林春天".equals(dis.get("name")))){ + /*if(!("涓婃灄鏄ュぉ".equals(dis.get("name")))){ continue; }*/ println i++; @@ -96,7 +96,7 @@ class XinFengPingGuBatch{ } /** - * 对小区进行查询抓取 + * 瀵瑰皬鍖鸿繘琛屾煡璇㈡姄鍙� */ public static void catchDissInfo(String city,String url,DBObject dis,String cook){ if(dis!=null&&dis.get("name")!=null){ @@ -134,7 +134,7 @@ class XinFengPingGuBatch{ }catch(Exception e){ e.printStackTrace() } - catchLouDongInfo("上海","http://www.xfpg.com.cn/build.do?method=dongnum",db,cook); + catchLouDongInfo("涓婃捣","http://www.xfpg.com.cn/build.do?method=dongnum",db,cook); } } } @@ -143,7 +143,7 @@ class XinFengPingGuBatch{ } } /** - * 对楼栋进行查询抓取 + * 瀵规ゼ鏍嬭繘琛屾煡璇㈡姄鍙� */ public static void catchLouDongInfo(String city,String url,DBObject dis,String cook){ if(dis!=null&&dis.get("pname")!=null){ @@ -185,7 +185,7 @@ class XinFengPingGuBatch{ } /** - * 对房号进行查询抓取 + * 瀵规埧鍙疯繘琛屾煡璇㈡姄鍙� */ public static BasicDBList catchFangHaoInfo(String url,String dongid,String cook){ if(dongid!=null){ @@ -214,7 +214,7 @@ class XinFengPingGuBatch{ } /** - * 使用别名进行抓取 + * 浣跨敤鍒悕杩涜鎶撳彇 * @param dis * @param params * @param headers @@ -279,7 +279,7 @@ class XinFengPingGuBatch{ } /** - * 获取城市的小区 + * 鑾峰彇鍩庡競鐨勫皬鍖� * @param city * @return */ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/XinFengRuKu.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/XinFengRuKu.groovy index d6c93c197..8e6bc179d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/XinFengRuKu.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/XinFengRuKu.groovy @@ -20,7 +20,7 @@ import com.mongodb.DBCursor import com.mongodb.DBObject /** - * 定时更新小区地址数据 + * 瀹氭椂鏇存柊灏忓尯鍦板潃鏁版嵁 * @author hubingliang * */ @@ -35,33 +35,33 @@ class XinFengRuKu{ static main(args) { - //println formatHouseNum("807自建商品房") - //louDongInData("北京") - //louDongInData("天津") - louDongInData("南京") -// louDongInData("宁波") -// louDongInData("杭州") -// louDongInData("上海") -// louDongInData("深圳") -// louDongInData("哈尔滨") -// louDongInData("呼和浩特") -// louDongInData("长春") -// louDongInData("广州") -// louDongInData("沈阳") -// louDongInData("大连") -// louDongInData("南宁") -// louDongInData("东莞") -// louDongInData("惠州") -// louDongInData("珠海") -// louDongInData("济南") -// louDongInData("烟台") -// louDongInData("长沙") -// louDongInData("株洲") -// louDongInData("湘潭") - //3-6,401-809类型 abcd单元-102 101室 - //println formatHouseNum(" abcd单元102") + //println formatHouseNum("807鑷缓鍟嗗搧鎴�") + //louDongInData("鍖椾含") + //louDongInData("澶╂触") + louDongInData("鍗椾含") +// louDongInData("瀹佹尝") +// louDongInData("鏉窞") +// louDongInData("涓婃捣") +// louDongInData("娣卞湷") +// louDongInData("鍝堝皵婊�") +// louDongInData("鍛煎拰娴╃壒") +// louDongInData("闀挎槬") +// louDongInData("骞垮窞") +// louDongInData("娌堥槼") +// louDongInData("澶ц繛") +// louDongInData("鍗楀畞") +// louDongInData("涓滆帪") +// louDongInData("鎯犲窞") +// louDongInData("鐝犳捣") +// louDongInData("娴庡崡") +// louDongInData("鐑熷彴") +// louDongInData("闀挎矙") +// louDongInData("鏍床") +// louDongInData("婀樻江") + //3-6,401-809绫诲瀷 abcd鍗曞厓-102 101瀹� + //println formatHouseNum(" abcd鍗曞厓102") } - //案例测试 + //妗堜緥娴嬭瘯 @@ -88,13 +88,13 @@ class XinFengRuKu{ /** - * 判断能不能入库 + * 鍒ゆ柇鑳戒笉鑳藉叆搴� * @param dis * @return */ public static void getHouseCount(String city,DBObject db,int l,int f){ List from = new ArrayList(); - from.add("新峰") + from.add("鏂板嘲") String regionOri = db.get("towns"); String region = RegionData.formatRegion(city, regionOri); String name = db.get("name"); @@ -142,7 +142,7 @@ class XinFengRuKu{ xf_lou_dong.save(loudong); println loudong } - //入房号库 + //鍏ユ埧鍙峰簱 List list = it.get("fanghao"); fangHaoInData(city,region,name,bnum,list,f) } @@ -179,7 +179,7 @@ class XinFengRuKu{ public static boolean isStandardType(String type){ if(StringUtils.isNotBlank(type)){ - if(type.equals("商业")||type.equals("车库仓库")||type.equals("公建")||type.equals("写字楼")){ + if(type.equals("鍟嗕笟")||type.equals("杞﹀簱浠撳簱")||type.equals("鍏缓")||type.equals("鍐欏瓧妤�")){ return false; } } @@ -207,7 +207,7 @@ class XinFengRuKu{ houseLoudng.room_info = roomInfo } houseLoudng.room_num = room_num - houseLoudng.from = "新峰" + houseLoudng.from = "鏂板嘲" Double are = formatSize(area) if(are!=null){ houseLoudng.house_area=are @@ -271,16 +271,16 @@ class XinFengRuKu{ String roomInfo = null; if(StringUtils.isNotEmpty(dnum)){ dnum = dnum.trim(); - //备注提取 + //澶囨敞鎻愬彇 String remarkAna = formatByPattern(dnum, "\\(.+\\)") if(StringUtils.isNotBlank(remarkAna)){ remark = removeStr(remarkAna,["\\(","\\)"]) } if(StringUtils.isBlank(remark)){ - remark = formatByPattern(dnum, "自建商品房") + remark = formatByPattern(dnum, "鑷缓鍟嗗搧鎴�") } - //户型结构提取 - roomInfo = formatByPattern(dnum, "跃层") + //鎴峰瀷缁撴瀯鎻愬彇 + roomInfo = formatByPattern(dnum, "璺冨眰") if(dnum==~ /\d+(_)\d+/){ if(dnum.contains("_")){ @@ -288,35 +288,35 @@ class XinFengRuKu{ roomNum = formatRoomNum(strs.get(1)); unitNum = formatUnitNum(strs.get(0)); } - }else if(dnum==~ /\w+(单元)\d+/){ - if(dnum.contains("单元")){ - List strs = dnum.split("单元"); + }else if(dnum==~ /\w+(鍗曞厓)\d+/){ + if(dnum.contains("鍗曞厓")){ + List strs = dnum.split("鍗曞厓"); roomNum = formatRoomNum(strs.get(1)); unitNum = formatUnitNum(strs.get(0)); } - }else if(dnum==~ /\w+(单元-)\d+/){ - if(dnum.contains("单元-")){ - List strs = dnum.split("单元-"); + }else if(dnum==~ /\w+(鍗曞厓-)\d+/){ + if(dnum.contains("鍗曞厓-")){ + List strs = dnum.split("鍗曞厓-"); roomNum = formatRoomNum(strs.get(1)); unitNum = formatUnitNum(strs.get(0)); } }else if(dnum==~ /\w+/){ roomNum = dnum; - }else if(dnum==~ /\d+-\d+/){//3-6,401-809类型 + }else if(dnum==~ /\d+-\d+/){//3-6,401-809绫诲瀷 if(dnum.contains("-")){ List strs = dnum.split("-"); roomNum = formatRoomNum(strs.get(1)); unitNum = formatUnitNum(strs.get(0)); } - }else if(dnum==~ /.+(-)\d+/){//abcd单元-102 + }else if(dnum==~ /.+(-)\d+/){//abcd鍗曞厓-102 List strs = dnum.split("-"); if(dnum.contains("-")){ roomNum = formatRoomNum(strs.get(1)); unitNum = formatUnitNum(strs.get(0)); } }else{ - String regEx = "(\\w+)(?=室|幢|)"; - roomNum = formatByPattern(dnum, "(\\w+)(?=室|幢|)") + String regEx = "(\\w+)(?=瀹骞)"; + roomNum = formatByPattern(dnum, "(\\w+)(?=瀹骞)") /*Pattern pattern = Pattern.compile(regEx); Matcher matcher = pattern.matcher(dnum); if(matcher.find()){ @@ -362,7 +362,7 @@ class XinFengRuKu{ if(roomStr==~/\d+/){ return roomStr; }else{ - String regEx = "(\\w+)(?=室)"; + String regEx = "(\\w+)(?=瀹�)"; Pattern pattern = Pattern.compile(regEx); Matcher matcher = pattern.matcher(roomStr); if(matcher.find()){ @@ -378,16 +378,16 @@ class XinFengRuKu{ unitStr = unitStr.trim(); if(unitStr==~ /\w+/){ return unitStr - }else if(unitStr==~ /\w+单元/){ - unitStr = unitStr.replaceAll("单元", ""); + }else if(unitStr==~ /\w+鍗曞厓/){ + unitStr = unitStr.replaceAll("鍗曞厓", ""); return unitStr }else{ - String regEx = "\\w+单元"; + String regEx = "\\w+鍗曞厓"; Pattern pattern = Pattern.compile(regEx); Matcher matcher = pattern.matcher(unitStr); if(matcher.find()){ String str = matcher.group(); - return str.replaceAll("单元", ""); + return str.replaceAll("鍗曞厓", ""); } } } @@ -396,11 +396,11 @@ class XinFengRuKu{ /** - * 获取城市的小区 + * 鑾峰彇鍩庡競鐨勫皬鍖� * @param city * @return */ - //获取城市小区 + //鑾峰彇鍩庡競灏忓尯 public static List getCityDistrict(String city){ BasicDBObject qu = new BasicDBObject() qu.append("city", city) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/XinFengRuKuCopy.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/XinFengRuKuCopy.groovy index 21608dd2c..2d4ffab63 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/XinFengRuKuCopy.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/XinFengRuKuCopy.groovy @@ -22,7 +22,7 @@ import com.mongodb.DBObject import java.util.concurrent.TimeUnit; /** - * 定时更新小区地址数据 + * 瀹氭椂鏇存柊灏忓尯鍦板潃鏁版嵁 * @author hubingliang * */ @@ -38,48 +38,48 @@ class XinFengRuKuCopy{ static main(args) { fixedThreadPool.submit(new Runnable() { public void run() { - louDongInData("上海") + louDongInData("涓婃捣") } }) fixedThreadPool.submit(new Runnable() { public void run() { - louDongInData("北京") + louDongInData("鍖椾含") } }) fixedThreadPool.submit(new Runnable() { public void run() { - louDongInData("天津") + louDongInData("澶╂触") } }) fixedThreadPool.submit(new Runnable() { public void run() { - louDongInData("南京") + louDongInData("鍗椾含") } }) fixedThreadPool.submit(new Runnable() { public void run() { - louDongInData("宁波") + louDongInData("瀹佹尝") } }) fixedThreadPool.submit(new Runnable() { public void run() { - louDongInData("杭州") + louDongInData("鏉窞") } }) fixedThreadPool.submit(new Runnable() { public void run() { - louDongInData("深圳") + louDongInData("娣卞湷") } }) fixedThreadPool.shutdown(); fixedThreadPool.awaitTermination(1l, TimeUnit.DAYS); } - //案例测试 + //妗堜緥娴嬭瘯 @@ -106,13 +106,13 @@ class XinFengRuKuCopy{ /** - * 判断能不能入库 + * 鍒ゆ柇鑳戒笉鑳藉叆搴� * @param dis * @return */ public static void getHouseCount(String city,DBObject db,int l,int f){ List from = new ArrayList(); - from.add("新峰") + from.add("鏂板嘲") String regionOri = db.get("towns"); String region = RegionData.formatRegion(city, regionOri); String name = db.get("name"); @@ -160,7 +160,7 @@ class XinFengRuKuCopy{ xf_lou_dong.save(loudong); println loudong } - //入房号库 + //鍏ユ埧鍙峰簱 List list = it.get("fanghao"); fangHaoInData(city,region,name,bnum,list,f) } @@ -195,7 +195,7 @@ class XinFengRuKuCopy{ public static boolean isStandardType(String type){ if(StringUtils.isNotBlank(type)){ - if(type.equals("商业")||type.equals("车库仓库")||type.equals("公建")||type.equals("写字楼")){ + if(type.equals("鍟嗕笟")||type.equals("杞﹀簱浠撳簱")||type.equals("鍏缓")||type.equals("鍐欏瓧妤�")){ return false; } } @@ -217,7 +217,7 @@ class XinFengRuKuCopy{ houseLoudng.build_type = type } houseLoudng.room_num = room_num - houseLoudng.from = "新峰" + houseLoudng.from = "鏂板嘲" Double are = formatSize(area) if(are!=null){ houseLoudng.house_area=are @@ -285,34 +285,34 @@ class XinFengRuKuCopy{ roomNum = formatRoomNum(strs.get(1)); unitNum = formatUnitNum(strs.get(0)); } - }else if(dnum==~ /\w+(单元)\d+/){ - if(dnum.contains("单元")){ - List strs = dnum.split("单元"); + }else if(dnum==~ /\w+(鍗曞厓)\d+/){ + if(dnum.contains("鍗曞厓")){ + List strs = dnum.split("鍗曞厓"); roomNum = formatRoomNum(strs.get(1)); unitNum = formatUnitNum(strs.get(0)); } - }else if(dnum==~ /\w+(单元-)\d+/){ - if(dnum.contains("单元-")){ - List strs = dnum.split("单元-"); + }else if(dnum==~ /\w+(鍗曞厓-)\d+/){ + if(dnum.contains("鍗曞厓-")){ + List strs = dnum.split("鍗曞厓-"); roomNum = formatRoomNum(strs.get(1)); unitNum = formatUnitNum(strs.get(0)); } }else if(dnum==~ /\w+/){ roomNum = dnum; - }else if(dnum==~ /\d+-\d+/){//3-6,401-809类型 + }else if(dnum==~ /\d+-\d+/){//3-6,401-809绫诲瀷 if(dnum.contains("-")){ List strs = dnum.split("-"); roomNum = formatRoomNum(strs.get(1)); unitNum = formatUnitNum(strs.get(0)); } - }else if(dnum==~ /.+(-)\d+/){//abcd单元-102 + }else if(dnum==~ /.+(-)\d+/){//abcd鍗曞厓-102 List strs = dnum.split("-"); if(dnum.contains("-")){ roomNum = formatRoomNum(strs.get(1)); unitNum = formatUnitNum(strs.get(0)); } }else{ - String regEx = "(\\w+)(?=室)"; + String regEx = "(\\w+)(?=瀹�)"; Pattern pattern = Pattern.compile(regEx); Matcher matcher = pattern.matcher(dnum); if(matcher.find()){ @@ -356,7 +356,7 @@ class XinFengRuKuCopy{ if(roomStr==~/\d+/){ return roomStr; }else{ - String regEx = "(\\w+)(?=室)"; + String regEx = "(\\w+)(?=瀹�)"; Pattern pattern = Pattern.compile(regEx); Matcher matcher = pattern.matcher(roomStr); if(matcher.find()){ @@ -372,16 +372,16 @@ class XinFengRuKuCopy{ unitStr = unitStr.trim(); if(unitStr==~ /\w+/){ return unitStr - }else if(unitStr==~ /\w+单元/){ - unitStr = unitStr.replaceAll("单元", ""); + }else if(unitStr==~ /\w+鍗曞厓/){ + unitStr = unitStr.replaceAll("鍗曞厓", ""); return unitStr }else{ - String regEx = "\\w+单元"; + String regEx = "\\w+鍗曞厓"; Pattern pattern = Pattern.compile(regEx); Matcher matcher = pattern.matcher(unitStr); if(matcher.find()){ String str = matcher.group(); - return str.replaceAll("单元", ""); + return str.replaceAll("鍗曞厓", ""); } } } @@ -390,11 +390,11 @@ class XinFengRuKuCopy{ /** - * 获取城市的小区 + * 鑾峰彇鍩庡競鐨勫皬鍖� * @param city * @return */ - //获取城市小区 + //鑾峰彇鍩庡競灏忓尯 public static List getCityDistrict(String city){ BasicDBObject qu = new BasicDBObject() qu.append("city", city) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/XinFengRuKuCurrent.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/XinFengRuKuCurrent.groovy index f2c1da3f9..a5bc37481 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/XinFengRuKuCurrent.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/XinFengRuKuCurrent.groovy @@ -19,7 +19,7 @@ import com.mongodb.DBCursor import com.mongodb.DBObject /** - * 定时更新小区地址数据 + * 瀹氭椂鏇存柊灏忓尯鍦板潃鏁版嵁 * @author hubingliang * */ @@ -34,29 +34,29 @@ class XinFengRuKuCurrent{ static main(args) { - louDongInData("北京") - //louDongInData("天津") - /*louDongInData("南京") - louDongInData("宁波") - louDongInData("杭州")*/ - /*louDongInData("上海") - louDongInData("天津") - louDongInData("深圳") - louDongInData("广州") - louDongInData("沈阳") - louDongInData("大连")*/ - /*louDongInData("哈尔滨") - louDongInData("长春") - louDongInData("呼和浩特") - louDongInData("南宁") - louDongInData("东莞") - louDongInData("惠州") - louDongInData("珠海") - louDongInData("济南") - louDongInData("烟台") - louDongInData("长沙") - louDongInData("株洲") - louDongInData("湘潭")*/ + louDongInData("鍖椾含") + //louDongInData("澶╂触") + /*louDongInData("鍗椾含") + louDongInData("瀹佹尝") + louDongInData("鏉窞")*/ + /*louDongInData("涓婃捣") + louDongInData("澶╂触") + louDongInData("娣卞湷") + louDongInData("骞垮窞") + louDongInData("娌堥槼") + louDongInData("澶ц繛")*/ + /*louDongInData("鍝堝皵婊�") + louDongInData("闀挎槬") + louDongInData("鍛煎拰娴╃壒") + louDongInData("鍗楀畞") + louDongInData("涓滆帪") + louDongInData("鎯犲窞") + louDongInData("鐝犳捣") + louDongInData("娴庡崡") + louDongInData("鐑熷彴") + louDongInData("闀挎矙") + louDongInData("鏍床") + louDongInData("婀樻江")*/ } @@ -83,13 +83,13 @@ class XinFengRuKuCurrent{ } /** - * 判断能不能入库 + * 鍒ゆ柇鑳戒笉鑳藉叆搴� * @param dis * @return */ public static void getHouseCount(String city,DBObject db,int l,int f){ List from = new ArrayList(); - from.add("新峰") + from.add("鏂板嘲") String regionOri = db.get("towns"); String region = RegionData.formatRegion(city, regionOri); String name = db.get("name"); @@ -137,7 +137,7 @@ class XinFengRuKuCurrent{ xf_lou_dong.save(loudong); println loudong } - //入房号库 + //鍏ユ埧鍙峰簱 List list = it.get("fanghao"); fangHaoInData(city,region,name,bnum,list,f) } @@ -184,7 +184,7 @@ class XinFengRuKuCurrent{ houseLoudng.house_num_unit = "--" } houseLoudng.room_num = room_num - houseLoudng.from = "新峰" + houseLoudng.from = "鏂板嘲" Double are = formatSize(area) if(are!=null){ houseLoudng.house_area=are @@ -221,20 +221,20 @@ class XinFengRuKuCurrent{ dnum = dnum.trim(); if(dnum==~ /\w+/){ roomNum = dnum; - }else if(dnum==~ /\d+-\d+/){//3-6,401-809类型 + }else if(dnum==~ /\d+-\d+/){//3-6,401-809绫诲瀷 if(dnum.contains("-")){ List strs = dnum.split("-"); roomNum = formatRoomNum(strs.get(1)); unitNum = formatUnitNum(strs.get(0)); } - }else if(dnum==~ /.+-\d+/){//abcd单元-102 + }else if(dnum==~ /.+-\d+/){//abcd鍗曞厓-102 List strs = dnum.split("-"); if(dnum.contains("-")){ roomNum = formatRoomNum(strs.get(1)); unitNum = formatUnitNum(strs.get(0)); } }else{ - String regEx = "(\\w+)(?=室)"; + String regEx = "(\\w+)(?=瀹�)"; Pattern pattern = Pattern.compile(regEx); Matcher matcher = pattern.matcher(dnum); if(matcher.find()){ @@ -254,7 +254,7 @@ class XinFengRuKuCurrent{ if(roomStr==~/\d+/){ return roomStr; }else{ - String regEx = "(\\w+)(?=室)"; + String regEx = "(\\w+)(?=瀹�)"; Pattern pattern = Pattern.compile(regEx); Matcher matcher = pattern.matcher(roomStr); if(matcher.find()){ @@ -270,16 +270,16 @@ class XinFengRuKuCurrent{ unitStr = unitStr.trim(); if(unitStr==~ /\w+/){ return unitStr - }else if(unitStr==~ /\w+单元/){ - unitStr = unitStr.replaceAll("单元", ""); + }else if(unitStr==~ /\w+鍗曞厓/){ + unitStr = unitStr.replaceAll("鍗曞厓", ""); return unitStr }else{ - String regEx = "\\w+单元"; + String regEx = "\\w+鍗曞厓"; Pattern pattern = Pattern.compile(regEx); Matcher matcher = pattern.matcher(unitStr); if(matcher.find()){ String str = matcher.group(); - return str.replaceAll("单元", ""); + return str.replaceAll("鍗曞厓", ""); } } } @@ -312,11 +312,11 @@ class XinFengRuKuCurrent{ /** - * 获取城市的小区 + * 鑾峰彇鍩庡競鐨勫皬鍖� * @param city * @return */ - //获取城市小区 + //鑾峰彇鍩庡競灏忓尯 public static List getCityDistrict(String city){ BasicDBObject qu = new BasicDBObject() qu.append("city", city) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/XinFengRuKuStatic.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/XinFengRuKuStatic.groovy index c4a5a497b..8b1ee7692 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/XinFengRuKuStatic.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/XinFengRuKuStatic.groovy @@ -19,7 +19,7 @@ import com.mongodb.DBCursor import com.mongodb.DBObject /** - * 定时更新小区地址数据 + * 瀹氭椂鏇存柊灏忓尯鍦板潃鏁版嵁 * @author hubingliang * */ @@ -34,29 +34,29 @@ class XinFengRuKuStatic{ static main(args) { - louDongInDataStatictis("北京") - louDongInDataStatictis("天津") - louDongInDataStatictis("南京") - louDongInDataStatictis("宁波") - louDongInDataStatictis("杭州") - louDongInDataStatictis("上海") - louDongInDataStatictis("天津") - louDongInDataStatictis("深圳") - louDongInDataStatictis("广州") - louDongInDataStatictis("沈阳") - louDongInDataStatictis("大连") - louDongInDataStatictis("哈尔滨") - louDongInDataStatictis("长春") - louDongInDataStatictis("呼和浩特") - louDongInDataStatictis("南宁") - louDongInDataStatictis("东莞") - louDongInDataStatictis("惠州") - louDongInDataStatictis("珠海") - louDongInDataStatictis("济南") - louDongInDataStatictis("烟台") - louDongInDataStatictis("长沙") - louDongInDataStatictis("株洲") - louDongInDataStatictis("湘潭") + louDongInDataStatictis("鍖椾含") + louDongInDataStatictis("澶╂触") + louDongInDataStatictis("鍗椾含") + louDongInDataStatictis("瀹佹尝") + louDongInDataStatictis("鏉窞") + louDongInDataStatictis("涓婃捣") + louDongInDataStatictis("澶╂触") + louDongInDataStatictis("娣卞湷") + louDongInDataStatictis("骞垮窞") + louDongInDataStatictis("娌堥槼") + louDongInDataStatictis("澶ц繛") + louDongInDataStatictis("鍝堝皵婊�") + louDongInDataStatictis("闀挎槬") + louDongInDataStatictis("鍛煎拰娴╃壒") + louDongInDataStatictis("鍗楀畞") + louDongInDataStatictis("涓滆帪") + louDongInDataStatictis("鎯犲窞") + louDongInDataStatictis("鐝犳捣") + louDongInDataStatictis("娴庡崡") + louDongInDataStatictis("鐑熷彴") + louDongInDataStatictis("闀挎矙") + louDongInDataStatictis("鏍床") + louDongInDataStatictis("婀樻江") } public static void louDongInDataStatictis(String city){ DBObject query = new BasicDBObject(); @@ -108,13 +108,13 @@ class XinFengRuKuStatic{ } /** - * 判断能不能入库 + * 鍒ゆ柇鑳戒笉鑳藉叆搴� * @param dis * @return */ public static void getHouseCount(String city,DBObject db,int l,int f){ List from = new ArrayList(); - from.add("新峰") + from.add("鏂板嘲") String regionOri = db.get("towns"); String region = RegionData.formatRegion(city, regionOri); String name = db.get("name"); @@ -162,7 +162,7 @@ class XinFengRuKuStatic{ xf_lou_dong.save(loudong); println loudong } - //入房号库 + //鍏ユ埧鍙峰簱 List list = it.get("fanghao"); fangHaoInData(city,region,name,bnum,list,f) } @@ -209,7 +209,7 @@ class XinFengRuKuStatic{ houseLoudng.house_num_unit = "--" } houseLoudng.room_num = room_num - houseLoudng.from = "新峰" + houseLoudng.from = "鏂板嘲" Double are = formatSize(area) if(are!=null){ houseLoudng.house_area=are @@ -246,20 +246,20 @@ class XinFengRuKuStatic{ dnum = dnum.trim(); if(dnum==~ /\w+/){ roomNum = dnum; - }else if(dnum==~ /\d+-\d+/){//3-6,401-809类型 + }else if(dnum==~ /\d+-\d+/){//3-6,401-809绫诲瀷 if(dnum.contains("-")){ List strs = dnum.split("-"); roomNum = formatRoomNum(strs.get(1)); unitNum = formatUnitNum(strs.get(0)); } - }else if(dnum==~ /.+-\d+/){//abcd单元-102 + }else if(dnum==~ /.+-\d+/){//abcd鍗曞厓-102 List strs = dnum.split("-"); if(dnum.contains("-")){ roomNum = formatRoomNum(strs.get(1)); unitNum = formatUnitNum(strs.get(0)); } }else{ - String regEx = "(\\w+)(?=室)"; + String regEx = "(\\w+)(?=瀹�)"; Pattern pattern = Pattern.compile(regEx); Matcher matcher = pattern.matcher(dnum); if(matcher.find()){ @@ -279,7 +279,7 @@ class XinFengRuKuStatic{ if(roomStr==~/\d+/){ return roomStr; }else{ - String regEx = "(\\w+)(?=室)"; + String regEx = "(\\w+)(?=瀹�)"; Pattern pattern = Pattern.compile(regEx); Matcher matcher = pattern.matcher(roomStr); if(matcher.find()){ @@ -295,16 +295,16 @@ class XinFengRuKuStatic{ unitStr = unitStr.trim(); if(unitStr==~ /\w+/){ return unitStr - }else if(unitStr==~ /\w+单元/){ - unitStr = unitStr.replaceAll("单元", ""); + }else if(unitStr==~ /\w+鍗曞厓/){ + unitStr = unitStr.replaceAll("鍗曞厓", ""); return unitStr }else{ - String regEx = "\\w+单元"; + String regEx = "\\w+鍗曞厓"; Pattern pattern = Pattern.compile(regEx); Matcher matcher = pattern.matcher(unitStr); if(matcher.find()){ String str = matcher.group(); - return str.replaceAll("单元", ""); + return str.replaceAll("鍗曞厓", ""); } } } @@ -337,11 +337,11 @@ class XinFengRuKuStatic{ /** - * 获取城市的小区 + * 鑾峰彇鍩庡競鐨勫皬鍖� * @param city * @return */ - //获取城市小区 + //鑾峰彇鍩庡競灏忓尯 public static List getCityDistrict(String city){ BasicDBObject qu = new BasicDBObject() qu.append("city", city) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/XinFengRuKuToLine.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/XinFengRuKuToLine.groovy index 4be893174..90c88b93a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/XinFengRuKuToLine.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/XinFengRuKuToLine.groovy @@ -20,7 +20,7 @@ import com.mongodb.DBCursor import com.mongodb.DBObject /** - * 定时更新小区地址数据 + * 瀹氭椂鏇存柊灏忓尯鍦板潃鏁版嵁 * @author hubingliang * */ @@ -32,7 +32,7 @@ class XinFengRuKuToLine{ public static final DBCollection XING_FENG_PING_GU_LOUINFO = MongoUtils.getCollectionByName("gaode_poi", "xing_feng_ping_gu_louInfo", "192.168.0.61", 27017) public static final DBCollection xf_lou_dong = MongoUtils.getCollectionByName("gaode_poi", "loudong3", "192.168.0.61", 27017) public static final DBCollection xf_fang_hao = MongoUtils.getCollectionByName("gaode_poi", "fanghao3", "192.168.0.61", 27017) - private static final String[] str1 = ["南京"] + private static final String[] str1 = ["鍗椾含"] static main(args) { List> ls = new ArrayList>(); @@ -40,7 +40,7 @@ class XinFengRuKuToLine{ List ll = toLine(str1[i]); ls.add(ll); } - exportData("统计",ls); + exportData("缁熻",ls); } def static exportData(String city,List> datas) { ExcelUtils.write("D:\\hbl\\Data\\xinfen\\"+city+".xlsx", datas, "Sheet1") @@ -56,7 +56,7 @@ class XinFengRuKuToLine{ } /** - * 楼栋入线上库 + * 妤兼爧鍏ョ嚎涓婂簱 */ public static Integer louDataToLine(String city){ int i = 0; @@ -87,7 +87,7 @@ class XinFengRuKuToLine{ } /** - * 房号入库 + * 鎴垮彿鍏ュ簱 */ public static Integer fangDataToLine(String city){ DBObject query = new BasicDBObject(); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/ZiDuanTianCong.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/ZiDuanTianCong.groovy index 26ebf7957..cf4a03093 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/ZiDuanTianCong.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/ZiDuanTianCong.groovy @@ -35,7 +35,7 @@ import com.mongodb.Mongo import org.apache.commons.lang.StringUtils /** - * 定时更新小区地址数据 + * 瀹氭椂鏇存柊灏忓尯鍦板潃鏁版嵁 * @author hubingliang * */ @@ -44,12 +44,12 @@ class ZiDuanTianCong{ public static final DBCollection SERVER_AREA = MongoUtils.getCollectionByName("fangjia", "server_area", "mongo.db.fangjia.com", 27017) static main(args) { - //ziDuanTianCong4("北京","D:\\hbl\\Data\\基础数据数据包\\2014年北京小区楼盘收房表-Mia.xls"); - //ziDuanTianCong4("北京","D:\\hbl\\Data\\基础数据数据包\\2014年北京装修楼盘表-大冠.xlsx"); - //ziDuanTianCong4("北京", "D:\\hbl\\Data\\基础数据数据包\\北京校区目录.xls"); - //ziDuanTianCong4("广州", "D:\\hbl\\Data\\基础数据数据包\\广州小区楼盘分布资源.xls"); - //ziDuanTianCong4("深圳", "D:\\hbl\\Data\\基础数据数据包\\深圳新房数据.xlsx"); - ziDuanTianCong5("成都", "D:\\hbl\\Data\\数据包2\\户数竣工时间\\870成都小区数据BOBO户.xlsx"); + //ziDuanTianCong4("鍖椾含","D:\\hbl\\Data\\鍩虹鏁版嵁鏁版嵁鍖匼\2014骞村寳浜皬鍖烘ゼ鐩樻敹鎴胯〃-Mia.xls"); + //ziDuanTianCong4("鍖椾含","D:\\hbl\\Data\\鍩虹鏁版嵁鏁版嵁鍖匼\2014骞村寳浜淇ゼ鐩樿〃-澶у啝.xlsx"); + //ziDuanTianCong4("鍖椾含", "D:\\hbl\\Data\\鍩虹鏁版嵁鏁版嵁鍖匼\鍖椾含鏍″尯鐩綍.xls"); + //ziDuanTianCong4("骞垮窞", "D:\\hbl\\Data\\鍩虹鏁版嵁鏁版嵁鍖匼\骞垮窞灏忓尯妤肩洏鍒嗗竷璧勬簮.xls"); + //ziDuanTianCong4("娣卞湷", "D:\\hbl\\Data\\鍩虹鏁版嵁鏁版嵁鍖匼\娣卞湷鏂版埧鏁版嵁.xlsx"); + ziDuanTianCong5("鎴愰兘", "D:\\hbl\\Data\\鏁版嵁鍖�2\\鎴锋暟绔e伐鏃堕棿\\870鎴愰兘灏忓尯鏁版嵁BOBO鎴�.xlsx"); } public static void ziDuanTianCong5(String city,String fileName){ @@ -66,7 +66,7 @@ class ZiDuanTianCong{ String re = list.get(1); String region = null; if(re!=null){ - region = re.replaceAll("区",""); + region = re.replaceAll("鍖�",""); } String name = list.get(2); Map map = matchPreAddress(city, region, list.get(2)); @@ -88,77 +88,77 @@ class ZiDuanTianCong{ Integer houseHold = db.get("household_count"); int has = 0; - if(db.get("cubage_percent")==null&&list.get(4)!=null){//容积率 + if(db.get("cubage_percent")==null&&list.get(4)!=null){//瀹圭Н鐜� if(list.get(4) instanceof String){ has++ db.put("cubage_percent", (String)list.get(4)) } } - if(houseHold!=null&&list.get(5)!=null&&houseHold<(Integer)list.get(5)){//户数 + if(houseHold!=null&&list.get(5)!=null&&houseHold<(Integer)list.get(5)){//鎴锋暟 has++; db.put("household_count", (Integer)list.get(5)) } - if(db.get("open_date")==null&&list.get(6)!=null){//开盘时间 + if(db.get("open_date")==null&&list.get(6)!=null){//寮�鐩樻椂闂� if(list.get(6) instanceof Date){ has++ db.put("open_date", (Date)list.get(6)) } } - if(db.get("live_date")==null&&list.get(7)!=null){//交房时间 + if(db.get("live_date")==null&&list.get(7)!=null){//浜ゆ埧鏃堕棿 if(list.get(7) instanceof Date){ has++ db.put("live_date", dateToString(list.get(7),"MEDIUM")) } } - if(db.get("virescence_percent")==null&&list.get(9)!=null){//绿化率 + if(db.get("virescence_percent")==null&&list.get(9)!=null){//缁垮寲鐜� if(list.get(9) instanceof String){ has++ db.put("virescence_percent", list.get(9)) } } - if(db.get("developer")==null&&list.get(11)!=null){//开发商 + if(db.get("developer")==null&&list.get(11)!=null){//寮�鍙戝晢 if(list.get(11) instanceof String){ has++ db.put("developer", list.get(11)) } } - if(db.get("estate_company")==null&&list.get(12)!=null){//物业公司 + if(db.get("estate_company")==null&&list.get(12)!=null){//鐗╀笟鍏徃 if(list.get(12) instanceof String){ has++ db.put("estate_company", list.get(12)) } } - if(db.get("car_site_count")==null&&list.get(13)!=null){//停车位 + if(db.get("car_site_count")==null&&list.get(13)!=null){//鍋滆溅浣� if(list.get(13) instanceof Integer){ has++ db.put("car_site_count", (Integer)list.get(13)) } } - if(db.get("property_life")==null&&list.get(14)!=null){//产权年限 + if(db.get("property_life")==null&&list.get(14)!=null){//浜ф潈骞撮檺 if(list.get(14) instanceof String){ has++ db.put("property_life", list.get(14)) } } - if(db.get("finish_building_date")==null&&list.get(15)!=null){//竣工时间 + if(db.get("finish_building_date")==null&&list.get(15)!=null){//绔e伐鏃堕棿 if(list.get(15) instanceof String){ has++ db.put("finish_building_date", list.get(15)) } } - if(db.get("build_area")==null&&list.get(16)!=null){//建筑面积 + if(db.get("build_area")==null&&list.get(16)!=null){//寤虹瓚闈㈢Н if(list.get(16) instanceof String){ has++ db.put("build_area", list.get(16)) } } - if(db.get("all_area")==null&&list.get(17)!=null){//占地面积 + if(db.get("all_area")==null&&list.get(17)!=null){//鍗犲湴闈㈢Н if(list.get(17) instanceof String){ has++ db.put("all_area", list.get(17)) } } - if(db.get("estate_charge")==null&&list.get(18)!=null){//物业费 + if(db.get("estate_charge")==null&&list.get(18)!=null){//鐗╀笟璐� if(list.get(18) instanceof String){ has++ db.put("estate_charge", list.get(18)) @@ -251,7 +251,7 @@ class ZiDuanTianCong{ String re = list.get(1); String region = null; if(re!=null){ - region = re.replaceAll("区",""); + region = re.replaceAll("鍖�",""); } String name = list.get(2); Map map = matchPreAddress(city, region, list.get(2)); @@ -273,77 +273,77 @@ class ZiDuanTianCong{ Integer houseHold = db.get("household_count"); int has = 0; - if(db.get("cubage_percent")==null&&list.get(4)!=null){//容积率 + if(db.get("cubage_percent")==null&&list.get(4)!=null){//瀹圭Н鐜� if(list.get(4) instanceof String){ has++ db.put("cubage_percent", (String)list.get(4)) } } - if(houseHold!=null&&list.get(5)!=null&&houseHold<(Integer)list.get(5)){//户数 + if(houseHold!=null&&list.get(5)!=null&&houseHold<(Integer)list.get(5)){//鎴锋暟 has++; db.put("household_count", (Integer)list.get(5)) } - if(db.get("open_date")==null&&list.get(6)!=null){//开盘时间 + if(db.get("open_date")==null&&list.get(6)!=null){//寮�鐩樻椂闂� if(list.get(6) instanceof Date){ has++ db.put("open_date", (Date)list.get(6)) } } - if(db.get("live_date")==null&&list.get(7)!=null){//交房时间 + if(db.get("live_date")==null&&list.get(7)!=null){//浜ゆ埧鏃堕棿 if(list.get(7) instanceof Date){ has++ db.put("live_date", dateToString(list.get(7),"MEDIUM")) } } - if(db.get("virescence_percent")==null&&list.get(9)!=null){//绿化率 + if(db.get("virescence_percent")==null&&list.get(9)!=null){//缁垮寲鐜� if(list.get(9) instanceof String){ has++ db.put("virescence_percent", list.get(9)) } } - if(db.get("developer")==null&&list.get(11)!=null){//开发商 + if(db.get("developer")==null&&list.get(11)!=null){//寮�鍙戝晢 if(list.get(11) instanceof String){ has++ db.put("developer", list.get(11)) } } - if(db.get("estate_company")==null&&list.get(12)!=null){//物业公司 + if(db.get("estate_company")==null&&list.get(12)!=null){//鐗╀笟鍏徃 if(list.get(12) instanceof String){ has++ db.put("estate_company", list.get(12)) } } - if(db.get("car_site_count")==null&&list.get(13)!=null){//停车位 + if(db.get("car_site_count")==null&&list.get(13)!=null){//鍋滆溅浣� if(list.get(13) instanceof Integer){ has++ db.put("car_site_count", (Integer)list.get(13)) } } - if(db.get("property_life")==null&&list.get(14)!=null){//产权年限 + if(db.get("property_life")==null&&list.get(14)!=null){//浜ф潈骞撮檺 if(list.get(14) instanceof String){ has++ db.put("property_life", list.get(14)) } } - if(db.get("finish_building_date")==null&&list.get(15)!=null){//竣工时间 + if(db.get("finish_building_date")==null&&list.get(15)!=null){//绔e伐鏃堕棿 if(list.get(15) instanceof String){ has++ db.put("finish_building_date", list.get(15)) } } - if(db.get("build_area")==null&&list.get(16)!=null){//建筑面积 + if(db.get("build_area")==null&&list.get(16)!=null){//寤虹瓚闈㈢Н if(list.get(16) instanceof String){ has++ db.put("build_area", list.get(16)) } } - if(db.get("all_area")==null&&list.get(17)!=null){//占地面积 + if(db.get("all_area")==null&&list.get(17)!=null){//鍗犲湴闈㈢Н if(list.get(17) instanceof String){ has++ db.put("all_area", list.get(17)) } } - if(db.get("estate_charge")==null&&list.get(18)!=null){//物业费 + if(db.get("estate_charge")==null&&list.get(18)!=null){//鐗╀笟璐� if(list.get(18) instanceof String){ has++ db.put("estate_charge", list.get(18)) @@ -436,7 +436,7 @@ class ZiDuanTianCong{ String re = list.get(1); String region = null; if(re!=null){ - region = re.replaceAll("区",""); + region = re.replaceAll("鍖�",""); } String name = list.get(2); Map map = matchPreAddress(city, region, list.get(2)); @@ -535,7 +535,7 @@ class ZiDuanTianCong{ String re = list.get(1); String region = null; if(re!=null){ - region = re.replaceAll("区",""); + region = re.replaceAll("鍖�",""); } String name = list.get(2); Map map = matchPreAddress(city, region, list.get(2)); @@ -652,7 +652,7 @@ class ZiDuanTianCong{ String re = list.get(1); String region = null; if(re!=null){ - region = re.replaceAll("区",""); + region = re.replaceAll("鍖�",""); } String name = list.get(2); Map map = matchPreAddress(city, region, list.get(2)); @@ -757,7 +757,7 @@ class ZiDuanTianCong{ String re = list.get(1); String region = null; if(re!=null){ - region = re.replaceAll("区",""); + region = re.replaceAll("鍖�",""); } String name = list.get(2); Map map = matchPreAddress(city, region, list.get(2)); @@ -848,7 +848,7 @@ class ZiDuanTianCong{ } /** - * 获取城市的小区 + * 鑾峰彇鍩庡競鐨勫皬鍖� * @param city * @return */ @@ -862,7 +862,7 @@ class ZiDuanTianCong{ return dbs; } /** - *Date转化成String + *Date杞寲鎴怱tring */ public static String dateToString(Date date,String type){ if(date==null){ @@ -879,14 +879,14 @@ class ZiDuanTianCong{ format = DateFormat.getDateInstance(DateFormat.MEDIUM); str = format.format(date); } else if (type.equals("FULL")) { - // 2007年1月18日 星期四 + // 2007骞�1鏈�18鏃� 鏄熸湡鍥� format = DateFormat.getDateInstance(DateFormat.FULL); str = format.format(date); } return str; } /** - * 小区名址匹配 + * 灏忓尯鍚嶅潃鍖归厤 */ public static Map matchPreAddress(String city,String region,String address){ JSONObject result = OpenApiClient.addressMatch(city,address,"property",false,region,"strict"); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/addressAnalyPlatHouseAndBuildingBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/addressAnalyPlatHouseAndBuildingBatch.groovy index e5ead2bad..bb13e8808 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/addressAnalyPlatHouseAndBuildingBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/addressAnalyPlatHouseAndBuildingBatch.groovy @@ -19,7 +19,7 @@ import com.mongodb.DBCursor import com.mongodb.DBObject /** - * 定时更新小区地址数据 + * 瀹氭椂鏇存柊灏忓尯鍦板潃鏁版嵁 * @author hubingliang * */ @@ -36,7 +36,7 @@ class addressAnalyPlatHouseAndBuildingBatch extends BaseBatch{ static main(args) { def s = System.currentTimeMillis() runBatch(new addressAnalyPlatHouseAndBuildingBatch(), args) - println("运行时间:${(int) ((System.currentTimeMillis() - s)) / (1000 * 60)}分钟") + println("杩愯鏃堕棿:${(int) ((System.currentTimeMillis() - s)) / (1000 * 60)}鍒嗛挓") } @Override @@ -44,7 +44,7 @@ class addressAnalyPlatHouseAndBuildingBatch extends BaseBatch{ List citys = getCitys(); int i = 0; for(String city:citys){ - if(city.equals("全国")){ + if(city.equals("鍏ㄥ浗")){ continue; } updateDistrictSta(city) @@ -52,7 +52,7 @@ class addressAnalyPlatHouseAndBuildingBatch extends BaseBatch{ sellInfo(); allCity(); } - //全国数据统计 + //鍏ㄥ浗鏁版嵁缁熻 public static void allCity(){ DBObject query = new BasicDBObject(); query.put("date", intWeekend(1)) @@ -69,7 +69,7 @@ class addressAnalyPlatHouseAndBuildingBatch extends BaseBatch{ Integer sellAllCount = 0; for(int i=0;i getCitys(){ List citys = new ArrayList(); DBCursor dbs = SERVER_AREA.find(); @@ -194,12 +194,12 @@ class addressAnalyPlatHouseAndBuildingBatch extends BaseBatch{ } return citys } - //获取上个星期天的日期 + //鑾峰彇涓婁釜鏄熸湡澶╃殑鏃ユ湡 public static Date lastWeekend(){ Calendar date=Calendar.getInstance(Locale.CHINA); - date.setFirstDayOfWeek(Calendar.MONDAY);//将每周第一天设为星期一,默认是星期天 - date.add(Calendar.WEEK_OF_MONTH,-1);//周数减一,即上周 - date.set(Calendar.DAY_OF_WEEK, Calendar.SUNDAY);//日子设为星期天 + date.setFirstDayOfWeek(Calendar.MONDAY);//灏嗘瘡鍛ㄧ涓�澶╄涓烘槦鏈熶竴锛岄粯璁ゆ槸鏄熸湡澶� + date.add(Calendar.WEEK_OF_MONTH,-1);//鍛ㄦ暟鍑忎竴锛屽嵆涓婂懆 + date.set(Calendar.DAY_OF_WEEK, Calendar.SUNDAY);//鏃ュ瓙璁句负鏄熸湡澶� int day = date.get(Calendar.DAY_OF_MONTH); int mon = date.get(Calendar.MONTH)+1; int year = date.get(Calendar.YEAR); @@ -208,7 +208,7 @@ class addressAnalyPlatHouseAndBuildingBatch extends BaseBatch{ Date weekend = dateFormat1.parse(dateStr); return weekend; } - //获取上周日的int形式 + //鑾峰彇涓婂懆鏃ョ殑int褰㈠紡 public static int intWeekend(int con){ Calendar cal =Calendar.getInstance(); cal.set(Calendar.DAY_OF_WEEK, Calendar.SUNDAY); @@ -219,7 +219,7 @@ class addressAnalyPlatHouseAndBuildingBatch extends BaseBatch{ } return dateInt; } - //计算覆盖率 + //璁$畻瑕嗙洊鐜� public static Double houseAndBuildingCover(Integer a,Integer b){ if(a!=null&&b!=null){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/app/AroundHospitalBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/app/AroundHospitalBatch.groovy index e2c9110da..7d52d0fc0 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/app/AroundHospitalBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/app/AroundHospitalBatch.groovy @@ -14,26 +14,26 @@ import org.apache.commons.lang.StringUtils import java.util.concurrent.ConcurrentHashMap /** - * 小区周边医院数量及排名信息 + * 灏忓尯鍛ㄨ竟鍖婚櫌鏁伴噺鍙婃帓鍚嶄俊鎭� * Created by user on 2017/12/11. */ class AroundHospitalBatch{ public static final DBCollection AROUND_INFO_LEVEL = MongoUtils.getCollectionByName("fangjia_stat", "around_info_level", "mongo.db.fangjia.com", 27017) - public static Map item = ["学校":"1412","医院":"09"] + public static Map item = ["瀛︽牎":"1412","鍖婚櫌":"09"] static main(args) { startLevel(); } def static startLevel(){ List citys = CommonUtils.findAllCity(); - for(String city:["南昌"]) { - def set = getAroundDistrictCount(city, item.get("医院")); + for(String city:["鍗楁槍"]) { + def set = getAroundDistrictCount(city, item.get("鍖婚櫌")); getLevel(city, set) } } /** - * 小区周边医院数量,返回排名的map + * 灏忓尯鍛ㄨ竟鍖婚櫌鏁伴噺锛岃繑鍥炴帓鍚嶇殑map * @param city - * @return 返回排名的map + * @return 杩斿洖鎺掑悕鐨刴ap */ public static def getAroundDistrictCount(def city,String itemCode){ def diss = getCityDistrictByFields(city); @@ -78,7 +78,7 @@ class AroundHospitalBatch{ } } /** - * 更新周边医院数量排名信息 + * 鏇存柊鍛ㄨ竟鍖婚櫌鏁伴噺鎺掑悕淇℃伅 * @param db * @param map * @param citySize @@ -107,7 +107,7 @@ class AroundHospitalBatch{ /** - * 更新周边医院数量 + * 鏇存柊鍛ㄨ竟鍖婚櫌鏁伴噺 * @param db * @param map * @param citySize @@ -132,7 +132,7 @@ class AroundHospitalBatch{ } } - //获取城市全部小区 + //鑾峰彇鍩庡競鍏ㄩ儴灏忓尯 public static List getCityDistrictByFields(String city) { BasicDBObject qu = new BasicDBObject() qu.append("city", city) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/app/AroundSchoolBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/app/AroundSchoolBatch.groovy index c767c820d..395a4ab90 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/app/AroundSchoolBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/app/AroundSchoolBatch.groovy @@ -15,25 +15,25 @@ import java.util.concurrent.ConcurrentHashMap /** * Created by hbl on 2017/12/8. - * 每月更新一次 + * 姣忔湀鏇存柊涓�娆� */ class AroundSchoolBatch{ public static final DBCollection AROUND_INFO_LEVEL = MongoUtils.getCollectionByName("fangjia_stat", "around_info_level", "mongo.db.fangjia.com", 27017) - public static Map item = ["学校":"1412"] + public static Map item = ["瀛︽牎":"1412"] static main(args) { startLevel(); } def static startLevel(){ List citys = CommonUtils.findAllCity(); - for(String city:["南昌"]) { - def set = getAroundDistrictCount(city, item.get("学校")); + for(String city:["鍗楁槍"]) { + def set = getAroundDistrictCount(city, item.get("瀛︽牎")); getLevel(city, set) } } /** - * 小区周边学校数量,返回排名的map + * 灏忓尯鍛ㄨ竟瀛︽牎鏁伴噺锛岃繑鍥炴帓鍚嶇殑map * @param city - * @return 返回排名的map + * @return 杩斿洖鎺掑悕鐨刴ap */ public static def getAroundDistrictCount(def city,String itemCode){ def diss = getCityDistrictByFields(city); @@ -78,7 +78,7 @@ class AroundSchoolBatch{ } } /** - * 更新周边学校数量排名信息 + * 鏇存柊鍛ㄨ竟瀛︽牎鏁伴噺鎺掑悕淇℃伅 * @param db * @param map * @param citySize @@ -107,7 +107,7 @@ class AroundSchoolBatch{ /** - * 更新周边学校数量 + * 鏇存柊鍛ㄨ竟瀛︽牎鏁伴噺 * @param db * @param map * @param citySize @@ -132,7 +132,7 @@ class AroundSchoolBatch{ } } - //获取城市全部小区 + //鑾峰彇鍩庡競鍏ㄩ儴灏忓尯 public static List getCityDistrictByFields(String city) { BasicDBObject qu = new BasicDBObject() qu.append("city", city) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/business/ExportBusinessUserData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/business/ExportBusinessUserData.groovy index 4921517fc..ba7336a17 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/business/ExportBusinessUserData.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/business/ExportBusinessUserData.groovy @@ -58,7 +58,7 @@ class ExportBusinessUserData{ return count; } /** - * fjt 统计 + * fjt 缁熻 * @param eid * @param start * @param end @@ -80,7 +80,7 @@ class ExportBusinessUserData{ } /** - * fjt 统计 + * fjt 缁熻 * @param eid * @param start * @param end @@ -101,7 +101,7 @@ class ExportBusinessUserData{ return count; } /** - * fsh统计 + * fsh缁熻 * @param eid * @param start * @param end @@ -117,7 +117,7 @@ class ExportBusinessUserData{ return count; } /** - * pds统计 + * pds缁熻 * @param eid * @param start * @param end diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/business/FjtStatisticDDBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/business/FjtStatisticDDBatch.groovy index 97db192db..79370c9cf 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/business/FjtStatisticDDBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/business/FjtStatisticDDBatch.groovy @@ -21,7 +21,7 @@ class FjtStatisticDDBatch extends BaseBatch{ static main(args){ def s = System.currentTimeMillis() runBatch(new FjtStatisticDDBatch(), args) - println("运行时间:${(int) ((System.currentTimeMillis() - s)) / (1000 * 60)}分钟") + println("杩愯鏃堕棿:${(int) ((System.currentTimeMillis() - s)) / (1000 * 60)}鍒嗛挓") } @Override public void process(Object args) { @@ -32,25 +32,25 @@ class FjtStatisticDDBatch extends BaseBatch{ def halfYearAgo = getHalfYearAge(); def today = getToday(); def yestoday = DateUtils.getNowDateAfterDays(getToday(),-1); - def mess = DateUtils.formatToYYYYMMDD(yestoday)+"日FJT统计信息 \n"; + def mess = DateUtils.formatToYYYYMMDD(yestoday)+"鏃JT缁熻淇℃伅 \n"; def ents = enterpriseStatistic(halfYearAgo) - println("企业数量:"+ents.size()) + println("浼佷笟鏁伴噺锛�"+ents.size()) int i = 1; for(def ent:ents){ def map = houseInfoMonitorStatistic(ent.get("user_name").toString(),today,yestoday); mess=mess+i+"." - mess = mess+"企业id:"+ent.get("eid")+"; \n" - mess = mess+"用户:"+ent.get("user_name")+"; \n" - mess = mess+"企业名称:"+ent.get("org_name")+"; \n" - mess = mess+"昨日查询量:"+map.get("count")+"; \n" - mess = mess+"历史查询量:"+map.get("all")+"; \n" - mess = mess+"剩余查询量:"+ent.get("time")+"; \n" - mess = mess+"可查询总量:"+ent.get("allTime")+"; \n" - mess = mess+"到期时间:"+DateUtils.formatToYYYYMMDD(ent.get("close_date"))+"; \n\n" + mess = mess+"浼佷笟id锛�"+ent.get("eid")+"; \n" + mess = mess+"鐢ㄦ埛锛�"+ent.get("user_name")+"; \n" + mess = mess+"浼佷笟鍚嶇О锛�"+ent.get("org_name")+"; \n" + mess = mess+"鏄ㄦ棩鏌ヨ閲忥細"+map.get("count")+"; \n" + mess = mess+"鍘嗗彶鏌ヨ閲忥細"+map.get("all")+"; \n" + mess = mess+"鍓╀綑鏌ヨ閲忥細"+ent.get("time")+"; \n" + mess = mess+"鍙煡璇㈡�婚噺锛�"+ent.get("allTime")+"; \n" + mess = mess+"鍒版湡鏃堕棿锛�"+DateUtils.formatToYYYYMMDD(ent.get("close_date"))+"; \n\n" if(i8888){//文字过多先发送 + if(mess.length()>8888){//鏂囧瓧杩囧鍏堝彂閫� DingDingMessageUtil.sendTextMessage("1b3aa28b94357824f3d69347cbfcfa54b55299d57f478028d80ac5e7d6ad6388",mess) mess = "" } @@ -58,12 +58,12 @@ class FjtStatisticDDBatch extends BaseBatch{ DingDingMessageUtil.sendTextMessage("1b3aa28b94357824f3d69347cbfcfa54b55299d57f478028d80ac5e7d6ad6388",mess) } - //账号查询信息 + //璐﹀彿鏌ヨ淇℃伅 def static houseInfoMonitorStatistic(String userName,def today,def yestoday){ def map = [:]; DBObject query = new BasicDBObject(); query.put("user_name",userName) - query.put("source","房价通") + query.put("source","鎴夸环閫�") long all = ADDRESS_MATCH_LOG.count(query); query.put("c_date",new BasicDBObject("\$gte",yestoday).append("\$lt",today)); long count = ADDRESS_MATCH_LOG.count(query); @@ -72,14 +72,14 @@ class FjtStatisticDDBatch extends BaseBatch{ return map; } /** - * 近半年来新建的测试账号 + * 杩戝崐骞存潵鏂板缓鐨勬祴璇曡处鍙� * @param date * @return */ def static enterpriseStatistic(def date){ String halfYearAgo = DateUtils.formatToYYYYMMDD(date); def list = []; - //加上四川锦程消费金融 + //鍔犱笂鍥涘窛閿︾▼娑堣垂閲戣瀺 FJT.eachRow("select * from users where role=3 and date_created>='"+halfYearAgo+"' or id = 244895"){row -> if(row.close_date==null||getToday().before(row.close_date)) { def map = [:]; @@ -92,8 +92,8 @@ class FjtStatisticDDBatch extends BaseBatch{ map.put("allTime", allTime); map.put("time", allTime - time); } else { - map.put("allTime", "无限制"); - map.put("time", "无限制"); + map.put("allTime", "鏃犻檺鍒�"); + map.put("time", "鏃犻檺鍒�"); } def usersDetail = FJT.firstRow("select * from users_detail where id=" + row.id); if (usersDetail != null) { @@ -108,7 +108,7 @@ class FjtStatisticDDBatch extends BaseBatch{ /** - * 查询该账号已经评估的次数 + * 鏌ヨ璇ヨ处鍙峰凡缁忚瘎浼扮殑娆℃暟 * @param eid * @return */ @@ -120,7 +120,7 @@ class FjtStatisticDDBatch extends BaseBatch{ return i; } /** - * 获取半年前的时间节点 + * 鑾峰彇鍗婂勾鍓嶇殑鏃堕棿鑺傜偣 * @return */ public static Date getHalfYearAge(){ @@ -128,7 +128,7 @@ class FjtStatisticDDBatch extends BaseBatch{ } /** - * 获取今天早上整点 + * 鑾峰彇浠婂ぉ鏃╀笂鏁寸偣 * @return */ public static Date getToday(){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/business/FshStatisticDDBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/business/FshStatisticDDBatch.groovy index b061cf6c4..2b832282f 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/business/FshStatisticDDBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/business/FshStatisticDDBatch.groovy @@ -23,7 +23,7 @@ class FshStatisticDDBatch extends BaseBatch{ static main(args){ def s = System.currentTimeMillis() runBatch(new FshStatisticDDBatch(), args) - println("运行时间:${(int) ((System.currentTimeMillis() - s)) / (1000 * 60)}分钟") + println("杩愯鏃堕棿:${(int) ((System.currentTimeMillis() - s)) / (1000 * 60)}鍒嗛挓") } @Override public void process(Object args) { @@ -33,7 +33,7 @@ class FshStatisticDDBatch extends BaseBatch{ def static doSendDD(){ Date today =getToday(); def yestoday = DateUtils.getNowDateAfterDays(today,-1); - def mess = DateUtils.formatToYYYYMMDD(yestoday)+"日FSH统计信息 \n"; + def mess = DateUtils.formatToYYYYMMDD(yestoday)+"鏃SH缁熻淇℃伅 \n"; def ents = enterpriseStatistic(getHalfYearAge()) int i=1; for(def ent:ents){ @@ -42,18 +42,18 @@ class FshStatisticDDBatch extends BaseBatch{ mess = mess+i+"." } i=i+1 - mess = mess+"企业id:"+ent.get("eid")+"; \n" - mess = mess+"企业名字:"+ent.get("en_name")+"; \n" - mess = mess+"开通日期:"+ent.get("open_date")+"; \n" - mess = mess+"有效期开始时间:"+DateUtils.formatToYYYYMMDD(ent.get("start_date"))+"; \n" - mess = mess+"有效期结束时间:"+DateUtils.formatToYYYYMMDD(ent.get("end_date"))+"; \n" + mess = mess+"浼佷笟id锛�"+ent.get("eid")+"; \n" + mess = mess+"浼佷笟鍚嶅瓧锛�"+ent.get("en_name")+"; \n" + mess = mess+"寮�閫氭棩鏈燂細"+ent.get("open_date")+"; \n" + mess = mess+"鏈夋晥鏈熷紑濮嬫椂闂达細"+DateUtils.formatToYYYYMMDD(ent.get("start_date"))+"; \n" + mess = mess+"鏈夋晥鏈熺粨鏉熸椂闂达細"+DateUtils.formatToYYYYMMDD(ent.get("end_date"))+"; \n" if(ent.get("status")==0){ - mess = mess+"启用状态:"+"禁用"+"; \n" + mess = mess+"鍚敤鐘舵�侊細"+"绂佺敤"+"; \n" }else{ - mess = mess+"启用状态:"+"启用"+"; \n" + mess = mess+"鍚敤鐘舵�侊細"+"鍚敤"+"; \n" } - mess = mess+"当天PV:"+pvMap.get("oneDayPv")+"; \n" - mess = mess+"历史PV:"+pvMap.get("allPv")+"; \n\n" + mess = mess+"褰撳ぉPV锛�"+pvMap.get("oneDayPv")+"; \n" + mess = mess+"鍘嗗彶PV锛�"+pvMap.get("allPv")+"; \n\n" if(i String city= item["A"]; println city - if("全国".equals(city)){ + if("鍏ㄥ浗".equals(city)){ item["T"]=qgRelateDisCount; item["U"]=qgRelatePriceCount; }else{ @@ -52,7 +52,7 @@ class DataRegionInfo{ qgRelatePriceCount = qgRelatePriceCount+relateMap.get("relatePriceCount"); } - /*if("全国".equals(city)){ + /*if("鍏ㄥ浗".equals(city)){ item["Q"]=qgYunGuJiaPriceCount; }else{ Integer yunGuJiaPriceCount = getYunAvgInfo(city) @@ -60,7 +60,7 @@ class DataRegionInfo{ qgYunGuJiaPriceCount = qgYunGuJiaPriceCount+yunGuJiaPriceCount }*/ /* - if("全国".equals(city)){ + if("鍏ㄥ浗".equals(city)){ item["p"] = qgdisCountFang item["R"] = qgfangGuGuPriceCount }else{ @@ -104,7 +104,7 @@ class DataRegionInfo{ ExcelUtils.modify(fileName, {List item-> String city= item["A"]; println city - if("全国".equals(city)){ + if("鍏ㄥ浗".equals(city)){ item["L"] = qgcreditLess66 item["M"] = qgcreditBetween item["N"] = qgcreditLess61 @@ -152,7 +152,7 @@ class DataRegionInfo{ Integer qgquChongDisCouont = 0; ExcelUtils.modify(fileName, {List item-> String city = item["A"]; - if(!("全国".equals(city))){ + if(!("鍏ㄥ浗".equals(city))){ def diss = findDis(city); if(diss!=null&&diss.size()>0){ def disInfoMap = getDisInfoStatistic(diss); @@ -246,7 +246,7 @@ class DataRegionInfo{ },num); } /** - * 第三方相关数据 + * 绗笁鏂圭浉鍏虫暟鎹� * @param city * @param diss * @return @@ -334,7 +334,7 @@ class DataRegionInfo{ return map.size(); } /** - * 获取房估估城市中有均价小区数量 + * 鑾峰彇鎴夸及浼板煄甯備腑鏈夊潎浠峰皬鍖烘暟閲� */ public static Map getYunFangAvgInfo(String city){ def map = new HashMap(); @@ -351,7 +351,7 @@ class DataRegionInfo{ return map; } /** - * 获取云估价城市中有均价小区数量 + * 鑾峰彇浜戜及浠峰煄甯備腑鏈夊潎浠峰皬鍖烘暟閲� */ public static Integer getYunAvgInfo(String city){ Integer yunGuJiaPriceCount = 0; @@ -378,7 +378,7 @@ class DataRegionInfo{ } /** - * 城市个小区挂排量统计 + * 鍩庡競涓皬鍖烘寕鎺掗噺缁熻 * @param city * @param diss * @param date @@ -429,7 +429,7 @@ class DataRegionInfo{ } /** - * 获取某个城市所有小区挂牌量数据 + * 鑾峰彇鏌愪釜鍩庡競鎵�鏈夊皬鍖烘寕鐗岄噺鏁版嵁 * @param city * @return */ @@ -455,7 +455,7 @@ class DataRegionInfo{ } /** - * 小区基本信息统计 + * 灏忓尯鍩烘湰淇℃伅缁熻 * @param diss * @return */ @@ -485,7 +485,7 @@ class DataRegionInfo{ } /** - * 获取整个城市小区均价相关数据统计 + * 鑾峰彇鏁翠釜鍩庡競灏忓尯鍧囦环鐩稿叧鏁版嵁缁熻 * @param diss */ public static Map findDistrictStat(String city,String date){ @@ -517,7 +517,7 @@ class DataRegionInfo{ /** - * 获取每个小区的户数量 + * 鑾峰彇姣忎釜灏忓尯鐨勬埛鏁伴噺 * @param dis * @return */ @@ -526,7 +526,7 @@ class DataRegionInfo{ return householdCount; } /** - * 获取城市中所有的小区 + * 鑾峰彇鍩庡競涓墍鏈夌殑灏忓尯 * @param city * @return */ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/dataissue/ExportAlias.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/dataissue/ExportAlias.groovy index bff8606e2..00d77d92f 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/dataissue/ExportAlias.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/dataissue/ExportAlias.groovy @@ -21,7 +21,7 @@ class ExportAlias{ static main(args) { - updateDisInfo3("D:\\hbl\\Data\\基准.xlsx",0) + updateDisInfo3("D:\\hbl\\Data\\鍩哄噯.xlsx",0) } @@ -39,14 +39,14 @@ class ExportAlias{ println "==========" db.put("c_date", new Date()); db.put("purpose", purpose); - db.put("city", "安阳"); + db.put("city", "瀹夐槼"); db.put("level", grade); db.put("second_purpose", ""); db.put("standard_land_price", priceStr); db.put("standard_date", date); db.put("volume_rate", rate); db.put("develop_level", developLevel); - db.put("develop_level_detail", "宗地红线外通路通电供水排水通讯通气通暖及宗地红线内场地平整"); + db.put("develop_level_detail", "瀹楀湴绾㈢嚎澶栭�氳矾閫氱數渚涙按鎺掓按閫氳閫氭皵閫氭殩鍙婂畻鍦扮孩绾垮唴鍦哄湴骞虫暣"); LAND_PRICE.save(db) },num); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/dataissue/ExportData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/dataissue/ExportData.groovy index ada84c70d..3ac880ac4 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/dataissue/ExportData.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/dataissue/ExportData.groovy @@ -24,9 +24,9 @@ class ExportData{ } public static void updateDisInfo1(){ def ls= []; - ls.add(["省份","城市","区域","小区数量","半年","一年","历史"]) + ls.add(["鐪佷唤","鍩庡競","鍖哄煙","灏忓尯鏁伴噺","鍗婂勾","涓�骞�","鍘嗗彶"]) def citys = CommonUtils.findAllCity(); - //def citys = ["上海","景德镇"]; + //def citys = ["涓婃捣","鏅痉闀�"]; for(String city:citys){ println city String province = ProvinceData.getProvince(city); @@ -63,12 +63,12 @@ class ExportData{ ls.add(ll) } } - exportData(ls,"符合规则") + exportData(ls,"绗﹀悎瑙勫垯") } public static boolean isNomalDis(def dis){ String name = dis.name; - boolean isNomal1 = formatByPattern(name,".*(路|弄|大道|街|巷|号)(小区\$)") - boolean isNomal2 = formatByPattern(name,".*(号院\$)") + boolean isNomal1 = formatByPattern(name,".*(璺瘄寮剕澶ч亾|琛梶宸穦鍙�)(灏忓尯\$)") + boolean isNomal2 = formatByPattern(name,".*(鍙烽櫌\$)") if(isNomal1||isNomal2){ return true; } @@ -87,9 +87,9 @@ class ExportData{ public static void updateDisInfo(){ def ls= []; - ls.add(["省份","城市","区域","小区数量","半年","一年","历史"]) + ls.add(["鐪佷唤","鍩庡競","鍖哄煙","灏忓尯鏁伴噺","鍗婂勾","涓�骞�","鍘嗗彶"]) def citys = CommonUtils.findAllCity(); - //def citys = ["上海","景德镇"]; + //def citys = ["涓婃捣","鏅痉闀�"]; for(String city:citys){ println city String province = ProvinceData.getProvince(city); @@ -124,12 +124,12 @@ class ExportData{ ls.add(ll) } } - exportData(ls,"全部") + exportData(ls,"鍏ㄩ儴") } def static exportData(List> datas,String sheet) { - ExcelUtils.write("D:\\hbl\\统计.xlsx", datas, sheet) + ExcelUtils.write("D:\\hbl\\缁熻.xlsx", datas, sheet) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/dataissue/ExportXinFengDis.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/dataissue/ExportXinFengDis.groovy index 4bec499ab..de7941b5f 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/dataissue/ExportXinFengDis.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/dataissue/ExportXinFengDis.groovy @@ -62,7 +62,7 @@ class ExportXinFengDis{ } def static exportData(List> datas) { - ExcelUtils.write("D:\\hbl\\新峰小区.xlsx", datas, "Sheet1") + ExcelUtils.write("D:\\hbl\\鏂板嘲灏忓尯.xlsx", datas, "Sheet1") } public static Map matchPreAddress(String city,String region,String disname){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/dataissue/FuQuanFangHaoHnadle.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/dataissue/FuQuanFangHaoHnadle.groovy index 966cc87f8..2cbd8eaf7 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/dataissue/FuQuanFangHaoHnadle.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/dataissue/FuQuanFangHaoHnadle.groovy @@ -24,7 +24,7 @@ class FuQuanFangHaoHnadle{ private static final DBCollection HOUSE_LOUDONG = MongoUtils.getCollectionByName("fangjia", "house_loudong", "mongo.db.fangjia.com") static main(args) { - updateLouHao("D:\\hbl\\数据包\\福州泉州.xlsx") + updateLouHao("D:\\hbl\\鏁版嵁鍖匼\绂忓窞娉夊窞.xlsx") } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/dataissue/HandleLogAnalyBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/dataissue/HandleLogAnalyBatch.groovy index 35682c3b5..d827dd74a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/dataissue/HandleLogAnalyBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/dataissue/HandleLogAnalyBatch.groovy @@ -19,7 +19,7 @@ class HandleLogAnalyBatch{ doAnaly(); } /** - * 获取测试用户的测试信息统计 + * 鑾峰彇娴嬭瘯鐢ㄦ埛鐨勬祴璇曚俊鎭粺璁� */ public static void doAnaly(){ def ls = new ArrayList>(); @@ -53,7 +53,7 @@ class HandleLogAnalyBatch{ } /** - * 测试时间还剩一天的企业 + * 娴嬭瘯鏃堕棿杩樺墿涓�澶╃殑浼佷笟 * @return */ public static List getEndEnterPrise(){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/dataissue/HuaLunWangLuo.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/dataissue/HuaLunWangLuo.groovy index a9a3fc886..af63a31f3 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/dataissue/HuaLunWangLuo.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/dataissue/HuaLunWangLuo.groovy @@ -23,18 +23,18 @@ class HuaLunWangLuo{ public static final DBCollection YUNGUJIADIS = MongoUtils.getCollectionByName("fangjia", "wx_gujia_proj", "192.168.0.61", 27017) public static final DBCollection YUNGUJIAPRICE = MongoUtils.getCollectionByName("fangjia", "wx_gujia_price", "192.168.0.61", 27017) static main(args) { - def map = findYunGuJiaPrice("宁波"); + def map = findYunGuJiaPrice("瀹佹尝"); - //println findYunGuJiaPrice(["郑州","宁波"]) - //updateDisInfo1("D:\\hbl\\测试数据_重跑数据.xlsx",0) + //println findYunGuJiaPrice(["閮戝窞","瀹佹尝"]) + //updateDisInfo1("D:\\hbl\\娴嬭瘯鏁版嵁_閲嶈窇鏁版嵁.xlsx",0) } public static void avgPriceInsert(String fileName,int num){ - def mapYun = findYunGuJiaPrice(["郑州","苏州","厦门","宁波","成都"]); + def mapYun = findYunGuJiaPrice(["閮戝窞","鑻忓窞","鍘﹂棬","瀹佹尝","鎴愰兘"]); ExcelUtils.modify(fileName, {List item-> String city= item["A"]; if(StringUtils.isNotBlank(city)){ - city =city.replace("市", ""); + city =city.replace("甯�", ""); } println city String region = item["S"] @@ -74,7 +74,7 @@ class HuaLunWangLuo{ ExcelUtils.modify(fileName, {List item-> String city= item["A"]; if(StringUtils.isNotBlank(city)){ - city =city.replace("市", ""); + city =city.replace("甯�", ""); } println city String address= item["C"]; @@ -95,7 +95,7 @@ class HuaLunWangLuo{ ExcelUtils.modify(fileName, {List item-> String city= item["A"]; if(StringUtils.isNotBlank(city)){ - city =city.replace("市", ""); + city =city.replace("甯�", ""); } println city String address= item["C"]; @@ -113,7 +113,7 @@ class HuaLunWangLuo{ ExcelUtils.modify(fileName, {List item-> String city= item["A"]; if(StringUtils.isNotBlank(city)){ - city =city.replace("市", ""); + city =city.replace("甯�", ""); } println city String address= item["C"]; @@ -229,7 +229,7 @@ class HuaLunWangLuo{ /** - * 小区名址匹配 + * 灏忓尯鍚嶅潃鍖归厤 */ public static Map matchPreAddress(String city,String region,String address){ Map map =new HashMap(); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/dataissue/NoNomalDis.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/dataissue/NoNomalDis.groovy index a6e837351..0d3a65d59 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/dataissue/NoNomalDis.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/dataissue/NoNomalDis.groovy @@ -21,7 +21,7 @@ class NoNomalDis{ static main(args) { - updateDisInfo("D:\\hbl\\数据包\\数据清理\\二线城市户数清理.xlsx",3) + updateDisInfo("D:\\hbl\\鏁版嵁鍖匼\鏁版嵁娓呯悊\\浜岀嚎鍩庡競鎴锋暟娓呯悊.xlsx",3) } @@ -57,7 +57,7 @@ class NoNomalDis{ def static exportData(List> datas) { - ExcelUtils.write("D:\\hbl\\Data\\非标准竣工时间小区.xlsx", datas, "Sheet1") + ExcelUtils.write("D:\\hbl\\Data\\闈炴爣鍑嗙宸ユ椂闂村皬鍖�.xlsx", datas, "Sheet1") } @@ -65,25 +65,25 @@ class NoNomalDis{ def list = new ArrayList(); if(StringUtils.isNotBlank(handle1)){ handle1 = handle1.trim(); - if("删除建筑面积".equals(handle1)){ + if("鍒犻櫎寤虹瓚闈㈢Н".equals(handle1)){ list.add(1); - }else if("删除总户数".equals(handle1)){ + }else if("鍒犻櫎鎬绘埛鏁�".equals(handle1)){ list.add(2); - }else if("删除停车位".equals(handle1)){ + }else if("鍒犻櫎鍋滆溅浣�".equals(handle1)){ list.add(3); - }else if("删除占地面积".equals(handle1)){ + }else if("鍒犻櫎鍗犲湴闈㈢Н".equals(handle1)){ list.add(4); } } if(StringUtils.isNotBlank(handle2)){ handle2 = handle2.trim(); - if("删除建筑面积".equals(handle2)){ + if("鍒犻櫎寤虹瓚闈㈢Н".equals(handle2)){ list.add(1); - }else if("删除总户数".equals(handle2)){ + }else if("鍒犻櫎鎬绘埛鏁�".equals(handle2)){ list.add(2); - }else if("删除停车位".equals(handle2)){ + }else if("鍒犻櫎鍋滆溅浣�".equals(handle2)){ list.add(3); - }else if("删除占地面积".equals(handle2)){ + }else if("鍒犻櫎鍗犲湴闈㈢Н".equals(handle2)){ list.add(4); } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/dataissue/PuTianFangHaoHnadle.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/dataissue/PuTianFangHaoHnadle.groovy index 2858f1811..be1bdebef 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/dataissue/PuTianFangHaoHnadle.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/dataissue/PuTianFangHaoHnadle.groovy @@ -20,7 +20,7 @@ class PuTianFangHaoHnadle{ private static final DBCollection HOUSE_LOUDONG = MongoUtils.getCollectionByName("fangjia", "house_loudong", "mongo.db.fangjia.com") static main(args) { - updateHouseInfo("D:\\hbl\\数据包\\数据清理\\莆田正常未关联 (2).xlsx", 0) + updateHouseInfo("D:\\hbl\\鏁版嵁鍖匼\鏁版嵁娓呯悊\\鑾嗙敯姝e父鏈叧鑱� (2).xlsx", 0) } public static void updateHouseInfo(String fileName,int num){ ExcelUtils.modify(fileName, {List item-> @@ -57,7 +57,7 @@ class PuTianFangHaoHnadle{ },num); } /** - * 小区名址匹配 + * 灏忓尯鍚嶅潃鍖归厤 */ public static DBObject matchPreAddress(String city,String region,String address){ JSONObject result = OpenApiClient.addressMatch(city,address,"property",false,region,"strict"); @@ -168,6 +168,6 @@ class PuTianFangHaoHnadle{ } def static exportData(List> datas) { - ExcelUtils.write("D:\\hbl\\Data\\非标准竣工时间小区.xlsx", datas, "Sheet1") + ExcelUtils.write("D:\\hbl\\Data\\闈炴爣鍑嗙宸ユ椂闂村皬鍖�.xlsx", datas, "Sheet1") } } \ No newline at end of file diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/dataissue/QuanZhouFangHaoHnadle.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/dataissue/QuanZhouFangHaoHnadle.groovy index 6b9f29965..699003d83 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/dataissue/QuanZhouFangHaoHnadle.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/dataissue/QuanZhouFangHaoHnadle.groovy @@ -31,11 +31,11 @@ class QuanZhouFangHaoHnadle{ public static void updateLouHao(){ def query = new BasicDBObject(); - query.put("city", "泉州"); - query.put("region", "丰泽"); - query.put("name", "南益广场"); - query.put("from", "房管局"); - query.put("build_type","住宅"); + query.put("city", "娉夊窞"); + query.put("region", "涓版辰"); + query.put("name", "鍗楃泭骞垮満"); + query.put("from", "鎴跨灞�"); + query.put("build_type","浣忓畢"); DBCursor dbs = HOUSE_LOUDONG.find(query); dbs.each {DBObject db -> String unit = db.house_num_unit; @@ -49,7 +49,7 @@ class QuanZhouFangHaoHnadle{ } /** - * 修改 穿给你始终房号状态 + * 淇敼 绌跨粰浣犲缁堟埧鍙风姸鎬� * @param city */ public static void doUpdate(String city){ @@ -104,11 +104,11 @@ class QuanZhouFangHaoHnadle{ } /** - *导出数据 + *瀵煎嚭鏁版嵁 */ public static void updateHouseInfo(){ def query = new BasicDBObject(); - query.append("city", "泉州"); + query.append("city", "娉夊窞"); query.append("status", 0); def list = new ArrayList(); DBCursor dbs = HOUSE_LOUDONG.find(query).batchSize(2000); @@ -151,8 +151,8 @@ class QuanZhouFangHaoHnadle{ } } } - exportData(ls1,"泉州正常"); - exportData(ls2,"泉州不正常"); + exportData(ls1,"娉夊窞姝e父"); + exportData(ls2,"娉夊窞涓嶆甯�"); } public static boolean lengthBigThanThree(DBObject db){ @@ -169,7 +169,7 @@ class QuanZhouFangHaoHnadle{ ExcelUtils.write("D:\\hbl\\Data\\"+filename+".xlsx", datas, "Sheet1") } /** - * 小区名址匹配 + * 灏忓尯鍚嶅潃鍖归厤 */ public static DBObject matchPreAddress(String city,String region,String address){ JSONObject result = OpenApiClient.addressMatch(city,address,"property",false,region,"strict"); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/dataissue/SeaWaterDateUse.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/dataissue/SeaWaterDateUse.groovy index d79d81c0c..9e6136e79 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/dataissue/SeaWaterDateUse.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/dataissue/SeaWaterDateUse.groovy @@ -17,16 +17,16 @@ class SeaWaterDateUse{ public static final DBCollection FANGGUGU_PRICE = MongoUtils.getCollectionByName("fangjia_tmp", "fanggugu_price2", "192.168.0.61", 27017) public static final DBCollection DISTRICT_STAT = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "mongo.db.fangjia.com", 27017) static main(args) { - /*def list = findSellCount("成都", "简阳", 20160721) + /*def list = findSellCount("鎴愰兘", "绠�闃�", 20160721) for(db in list){ println db } println list.size();*/ - doWork("D:\\hbl\\统计.xlsx",0) + doWork("D:\\hbl\\缁熻.xlsx",0) } public static void doWork(String fileName,Integer num){ def ls = []; - ls.add(["城市","区域","小区名"]) + ls.add(["鍩庡競","鍖哄煙","灏忓尯鍚�"]) int i= 1; ExcelUtils.modify(fileName, {List item-> println i @@ -45,14 +45,14 @@ class SeaWaterDateUse{ } i++; },num); - exportData(ls,"未匹配成功小区") + exportData(ls,"鏈尮閰嶆垚鍔熷皬鍖�") } def static exportData(List> datas,String sheet) { - ExcelUtils.write("D:\\hbl\\未匹配成功房源.xlsx", datas, sheet) + ExcelUtils.write("D:\\hbl\\鏈尮閰嶆垚鍔熸埧婧�.xlsx", datas, sheet) } /** - * 查询小区量 + * 鏌ヨ灏忓尯閲� * @param db * @param startDate * @return diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/dataissue/UpdateCityAndRegion.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/dataissue/UpdateCityAndRegion.groovy index ede130470..47311b9ad 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/dataissue/UpdateCityAndRegion.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/dataissue/UpdateCityAndRegion.groovy @@ -83,7 +83,7 @@ class UpdateCityAndRegion{ } return true; } - //获取全国城市 + //鑾峰彇鍏ㄥ浗鍩庡競 public static boolean getCityDistrictByFields(String city,String region,String name){ BasicDBObject qu = new BasicDBObject() qu.append("city", city) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/fsh/DistrictActivity.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/fsh/DistrictActivity.groovy index c2f3d8d7d..c3404c48d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/fsh/DistrictActivity.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/fsh/DistrictActivity.groovy @@ -28,7 +28,7 @@ class DistrictActivity{ public static final DBCollection DISTRICT_ANALY_DATA = MongoUtils.getCollectionByName("fangjia_stat", "district_analy_data", "mongo.db.fangjia.com", 27017) static main(args){ - for(String city:["上海","成都","北京","武汉","南京"]) { + for(String city:["涓婃捣","鎴愰兘","鍖椾含","姝︽眽","鍗椾含"]) { exportExcel(city) } } @@ -297,36 +297,36 @@ class DistrictActivity{ return params; } public enum FieldEnum { - AGENCY_COUNT(0.2, "中介数量权重"), - AGENCY_COUNT_MAX(90.0, "中介数量max值"), - AGENCY_COUNT_MIN(0, "中介数量min值"), - AGENCY_RADIUS(1.0, "中介数取值半径范围"), - PUBLISH_COUNT_FACTOR(0.3, "发布量权重"), - PUBLISH_COUNT_MAX(900.0, "发布量max值"), - PUBLISH_COUNT_MIN(0, "发布量min值"), - TRAFFIC_FACROR(0.2, "交通权重"), - BUS_FACTOR(0.6, "公交权重"), - METRO_FACTOR(0.4, "地铁权重"), - BUS_COUNT_MAX(48, "公交数量max值"), - BUS_COUNT_MIN(0, "公交数量min值"), - METRO_COUNT_MAX(5, "地铁数量max值"), - METRO_COUNT_MIN(0, "地铁数量min值"), - BUS_RADIUS(1.0, "公交数取值半径范围"), - METRO_RADIUS(1.0, "地铁数取值半径范围"), - PROPERTY_DENSITY_FACTOR(0.1, "小区密度权重"), - PROPERTY_DENSITY_MAX(400, "小区密度max值"), - PROPERTY_DENSITY_MIN(10, "小区密度min值"), - PUBLISH_A(850, "发布量A值"), - PUBLISH_B(200, "发布量B值"), - PROPERTY_DENSITY_RADIUS(1.0, "小区密度取值半径范围"), - TOTAL_PRICE_FACTOR(0.2, "房屋总价权重"), - TOTAL_PRICE_A(270, "总价A值"), - TOTAL_PRICE_B(18, "总价B值"), - TOTAL_PRICE_E(54, "总价E值"), - TOTAL_PRICE_F(72, "总价F值"), - YOY_FACTOR(0.2, "年涨跌幅权重"), - YOY_D(2, "年涨跌幅D值"), - YOY_C(1, "年涨跌幅C值"), + AGENCY_COUNT(0.2, "涓粙鏁伴噺鏉冮噸"), + AGENCY_COUNT_MAX(90.0, "涓粙鏁伴噺max鍊�"), + AGENCY_COUNT_MIN(0, "涓粙鏁伴噺min鍊�"), + AGENCY_RADIUS(1.0, "涓粙鏁板彇鍊煎崐寰勮寖鍥�"), + PUBLISH_COUNT_FACTOR(0.3, "鍙戝竷閲忔潈閲�"), + PUBLISH_COUNT_MAX(900.0, "鍙戝竷閲弇ax鍊�"), + PUBLISH_COUNT_MIN(0, "鍙戝竷閲弇in鍊�"), + TRAFFIC_FACROR(0.2, "浜ら�氭潈閲�"), + BUS_FACTOR(0.6, "鍏氦鏉冮噸"), + METRO_FACTOR(0.4, "鍦伴搧鏉冮噸"), + BUS_COUNT_MAX(48, "鍏氦鏁伴噺max鍊�"), + BUS_COUNT_MIN(0, "鍏氦鏁伴噺min鍊�"), + METRO_COUNT_MAX(5, "鍦伴搧鏁伴噺max鍊�"), + METRO_COUNT_MIN(0, "鍦伴搧鏁伴噺min鍊�"), + BUS_RADIUS(1.0, "鍏氦鏁板彇鍊煎崐寰勮寖鍥�"), + METRO_RADIUS(1.0, "鍦伴搧鏁板彇鍊煎崐寰勮寖鍥�"), + PROPERTY_DENSITY_FACTOR(0.1, "灏忓尯瀵嗗害鏉冮噸"), + PROPERTY_DENSITY_MAX(400, "灏忓尯瀵嗗害max鍊�"), + PROPERTY_DENSITY_MIN(10, "灏忓尯瀵嗗害min鍊�"), + PUBLISH_A(850, "鍙戝竷閲廇鍊�"), + PUBLISH_B(200, "鍙戝竷閲廈鍊�"), + PROPERTY_DENSITY_RADIUS(1.0, "灏忓尯瀵嗗害鍙栧�煎崐寰勮寖鍥�"), + TOTAL_PRICE_FACTOR(0.2, "鎴垮眿鎬讳环鏉冮噸"), + TOTAL_PRICE_A(270, "鎬讳环A鍊�"), + TOTAL_PRICE_B(18, "鎬讳环B鍊�"), + TOTAL_PRICE_E(54, "鎬讳环E鍊�"), + TOTAL_PRICE_F(72, "鎬讳环F鍊�"), + YOY_FACTOR(0.2, "骞存定璺屽箙鏉冮噸"), + YOY_D(2, "骞存定璺屽箙D鍊�"), + YOY_C(1, "骞存定璺屽箙C鍊�"), private final double defaultValue; private final String desc; @@ -346,9 +346,9 @@ class DistrictActivity{ } public static getBeforeSunday(){ Calendar date=Calendar.getInstance(Locale.CHINA); - date.setFirstDayOfWeek(Calendar.MONDAY);//将每周第一天设为星期一,默认是星期天 - date.add(Calendar.WEEK_OF_MONTH,-1);//周数减一,即上周 - date.set(Calendar.DAY_OF_WEEK, Calendar.SUNDAY);//日子设为星期天 + date.setFirstDayOfWeek(Calendar.MONDAY);//灏嗘瘡鍛ㄧ涓�澶╄涓烘槦鏈熶竴锛岄粯璁ゆ槸鏄熸湡澶� + date.add(Calendar.WEEK_OF_MONTH,-1);//鍛ㄦ暟鍑忎竴锛屽嵆涓婂懆 + date.set(Calendar.DAY_OF_WEEK, Calendar.SUNDAY);//鏃ュ瓙璁句负鏄熸湡澶� return DateUtils.parseFromTightYYYYMMDD(DateUtils.formatToYYYYMMDD(date.getTime())); } } \ No newline at end of file diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/fsh/InserData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/fsh/InserData.groovy index 682df4d42..1675f8e5b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/fsh/InserData.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/fsh/InserData.groovy @@ -33,9 +33,9 @@ class InsertData{ db.put("eid",1L); db.put("uid","1"); db.put("u_at",date); - db.put("province","浙江"); - db.put("city","杭州"); - db.put("region","浦东"); + db.put("province","娴欐睙"); + db.put("city","鏉窞"); + db.put("region","娴︿笢"); db.put("h_count",2L); db.put("h_price",2000000d); db.put("s_count",1L); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/pds/AroundDistrictLevel.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/pds/AroundDistrictLevel.groovy index 40a8e762a..2a7f9c675 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/pds/AroundDistrictLevel.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/pds/AroundDistrictLevel.groovy @@ -16,7 +16,7 @@ import org.apache.commons.lang.StringUtils import java.util.concurrent.ConcurrentHashMap -//在每个月2号8点运行 +//鍦ㄦ瘡涓湀2鍙�8鐐硅繍琛� @BatchOwner(Watcher.Hubingliang) class AroundDistrictLevel extends BaseBatch{ public static final DBCollection DISTRICT_ANALY_DATA = MongoUtils.getCollectionByName("fangjia_stat", "district_analy_data", "mongo.db.fangjia.com", 27017) @@ -25,7 +25,7 @@ class AroundDistrictLevel extends BaseBatch{ static main(args) { def s = System.currentTimeMillis() runBatch(new AroundDistrictLevel(), args) - println("运行时间:${(int) ((System.currentTimeMillis() - s)) / (1000 * 60)}分钟") + println("杩愯鏃堕棿:${(int) ((System.currentTimeMillis() - s)) / (1000 * 60)}鍒嗛挓") } @Override @@ -37,7 +37,7 @@ class AroundDistrictLevel extends BaseBatch{ } } /** - * 小区周边小区数量 + * 灏忓尯鍛ㄨ竟灏忓尯鏁伴噺 * @param city */ public static def getAroundDistrictCount(def city){ @@ -74,7 +74,7 @@ class AroundDistrictLevel extends BaseBatch{ } } /** - * 更新周边小区数量信息 + * 鏇存柊鍛ㄨ竟灏忓尯鏁伴噺淇℃伅 * @param db * @param map * @param citySize @@ -105,7 +105,7 @@ class AroundDistrictLevel extends BaseBatch{ } } - //根据经纬度查询周边小区 + //鏍规嵁缁忕含搴︽煡璇㈠懆杈瑰皬鍖� private static int findAroundDistrictCount(double lng, double lat, int radius) { def query = new BasicDBObject() query.append("cat", "district") @@ -123,7 +123,7 @@ class AroundDistrictLevel extends BaseBatch{ } } - //获取城市全部小区 + //鑾峰彇鍩庡競鍏ㄩ儴灏忓尯 public static List getCityDistrictByFields(String city){ BasicDBObject qu = new BasicDBObject() qu.append("city", city) @@ -134,7 +134,7 @@ class AroundDistrictLevel extends BaseBatch{ return dbs; } /** - *排名 + *鎺掑悕 * @param list * @return */ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/pds/AvgPriceChangeLevel.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/pds/AvgPriceChangeLevel.groovy index f44ecfefc..23b15a909 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/pds/AvgPriceChangeLevel.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/pds/AvgPriceChangeLevel.groovy @@ -19,7 +19,7 @@ import com.mongodb.DBCursor import com.mongodb.DBObject import org.apache.mahout.df.data.DataUtils -//在每个月1号7点运行 +//鍦ㄦ瘡涓湀1鍙�7鐐硅繍琛� @BatchOwner(Watcher.Hubingliang) class AvgPriceChangeLevel extends BaseBatch{ public static final DBCollection DISTRICT_SELL_STAT = MongoUtils.getCollectionByName("fangjia_stat", "district_sell_stat", "mongo.db.fangjia.com", 27017) @@ -31,7 +31,7 @@ class AvgPriceChangeLevel extends BaseBatch{ static main(args) { def s = System.currentTimeMillis() runBatch(new AvgPriceChangeLevel(), args) - println("运行时间:${(int) ((System.currentTimeMillis() - s)) / (1000 * 60)}分钟") + println("杩愯鏃堕棿:${(int) ((System.currentTimeMillis() - s)) / (1000 * 60)}鍒嗛挓") } @Override public void process(Object args) { @@ -45,7 +45,7 @@ class AvgPriceChangeLevel extends BaseBatch{ } /** - * 小区涨跌幅在区域中的排名信息 + * 灏忓尯娑ㄨ穼骞呭湪鍖哄煙涓殑鎺掑悕淇℃伅 * @param city */ public static void getRegionAvgPriceChangeLevel(def city){ @@ -110,7 +110,7 @@ class AvgPriceChangeLevel extends BaseBatch{ updateDistrictAnalyDataHalfYearMarkerup(dbo, startMonth.toInteger(), month.toInteger()); },FIELDS) - println city +" 完成" + println city +" 瀹屾垚" } @@ -149,7 +149,7 @@ class AvgPriceChangeLevel extends BaseBatch{ } /** - * 更新区域年涨幅排名信息 + * 鏇存柊鍖哄煙骞存定骞呮帓鍚嶄俊鎭� * @param db * @param map * @param citySize @@ -182,7 +182,7 @@ class AvgPriceChangeLevel extends BaseBatch{ } } - //district_analy_data 城市月涨幅mom 年涨幅yoy相关信息 + //district_analy_data 鍩庡競鏈堟定骞卪om 骞存定骞厃oy鐩稿叧淇℃伅 public static void getCityAvgPriceChangeLevel(def city){ def month = getLastMonth(); List list = getCityAllStat(city,null,month); @@ -197,7 +197,7 @@ class AvgPriceChangeLevel extends BaseBatch{ } } /** - * 更新城市月均价涨幅排名相关 + * 鏇存柊鍩庡競鏈堝潎浠锋定骞呮帓鍚嶇浉鍏� * @param db * @param map * @param citySize @@ -240,7 +240,7 @@ class AvgPriceChangeLevel extends BaseBatch{ /** - * 获取城市或区域的所有均价涨跌幅 + * 鑾峰彇鍩庡競鎴栧尯鍩熺殑鎵�鏈夊潎浠锋定璺屽箙 */ public static List getCityAllStat(String city,String region,int lastMonth){ BasicDBObject query = new BasicDBObject() @@ -260,7 +260,7 @@ class AvgPriceChangeLevel extends BaseBatch{ } /** - * 城市排名 + * 鍩庡競鎺掑悕 * @param list * @return */ @@ -299,7 +299,7 @@ class AvgPriceChangeLevel extends BaseBatch{ return map; } /** - * 获取上个月的int类型时间 + * 鑾峰彇涓婁釜鏈堢殑int绫诲瀷鏃堕棿 * @return */ public static int getLastMonth(){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/pds/AvgPriceLevelBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/pds/AvgPriceLevelBatch.groovy index db4af975d..1f84336c3 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/pds/AvgPriceLevelBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/pds/AvgPriceLevelBatch.groovy @@ -12,7 +12,7 @@ import com.mongodb.BasicDBObject import com.mongodb.DBCollection import com.mongodb.DBCursor import com.mongodb.DBObject -//在每个月1号7点运行 +//鍦ㄦ瘡涓湀1鍙�7鐐硅繍琛� @BatchOwner(Watcher.Hubingliang) class AvgPriceLevelBatch extends BaseBatch{ public static final DBCollection DISTRICT_SELL_STAT = MongoUtils.getCollectionByName("fangjia_stat", "district_sell_stat", "mongo.db.fangjia.com", 27017) @@ -21,7 +21,7 @@ class AvgPriceLevelBatch extends BaseBatch{ static main(args) { def s = System.currentTimeMillis() runBatch(new AvgPriceLevelBatch(), args) - println("运行时间:${(int) ((System.currentTimeMillis() - s)) / (1000 * 60)}分钟") + println("杩愯鏃堕棿:${(int) ((System.currentTimeMillis() - s)) / (1000 * 60)}鍒嗛挓") } @Override public void process(Object args) { @@ -77,7 +77,7 @@ class AvgPriceLevelBatch extends BaseBatch{ /** - * ??????л??????????????? + * ??????谢??????????????? */ public static List getCityAllStat(String city,String region){ int lastMonth = getLastMonth(); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/pds/DaiQianGuZhiBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/pds/DaiQianGuZhiBatch.groovy index 49db7393c..aa39125ab 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/pds/DaiQianGuZhiBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/pds/DaiQianGuZhiBatch.groovy @@ -18,7 +18,7 @@ import com.mongodb.DBObject import com.mongodb.Mongo /** - * 定时更新小区地址数据 + * 瀹氭椂鏇存柊灏忓尯鍦板潃鏁版嵁 * @author hubingliang * */ @@ -40,7 +40,7 @@ class DaiQianGuZhiBatch extends BaseBatch{ static main(args) { def s = System.currentTimeMillis() runBatch(new DaiQianGuZhiBatch(), args) - println("运行时间:${(int) ((System.currentTimeMillis() - s)) / (1000 * 60)}分钟") + println("杩愯鏃堕棿:${(int) ((System.currentTimeMillis() - s)) / (1000 * 60)}鍒嗛挓") } @Override @@ -56,20 +56,20 @@ class DaiQianGuZhiBatch extends BaseBatch{ String dateStr = DateUtils.formatToYYYYMMDD(yestoday); def fileName1 = getFilePath() + "KeHuPingJi" + dateStr + ".xlsx" - ExcelUtils.write(fileName1, everyDayList, "客户评级每天") + ExcelUtils.write(fileName1, everyDayList, "瀹㈡埛璇勭骇姣忓ぉ") if(allList.size()>1){ - ExcelUtils.write(fileName1, everyDayList, "客户评级所有") + ExcelUtils.write(fileName1, everyDayList, "瀹㈡埛璇勭骇鎵�鏈�") } send(fileName1) } /** - * 试用期结束前一天进行统计 + * 璇曠敤鏈熺粨鏉熷墠涓�澶╄繘琛岀粺璁� * @return */ static def beforeTestDateEnd(){ def ls = []; - ls.add(["企业名称","输入","匹配城市","匹配区域","匹配小区","价格","房估估价格","云估价价格"]) + ls.add(["浼佷笟鍚嶇О","杈撳叆","鍖归厤鍩庡競","鍖归厤鍖哄煙","鍖归厤灏忓尯","浠锋牸","鎴夸及浼颁环鏍�","浜戜及浠蜂环鏍�"]) def enterpriseIds = endUsers(); if(enterpriseIds!=null&&enterpriseIds.size()>0){ for(DBObject db :enterpriseIds){ @@ -83,11 +83,11 @@ class DaiQianGuZhiBatch extends BaseBatch{ return ls; } /** - * 每天统计用户使用情况 + * 姣忓ぉ缁熻鐢ㄦ埛浣跨敤鎯呭喌 */ public static def everyDayStatistic(Date today,Date yestoday){ def ls =[]; - ls.add(["企业名称","用户名称","总次数","成功次数","失败次数"]) + ls.add(["浼佷笟鍚嶇О","鐢ㄦ埛鍚嶇О","鎬绘鏁�","鎴愬姛娆℃暟","澶辫触娆℃暟"]) def userIds = findYesTodayUser(yestoday, today); if(userIds!=null&&userIds.size()>0){ for(String userId:userIds){ @@ -119,7 +119,7 @@ class DaiQianGuZhiBatch extends BaseBatch{ } /** - * 某个用户的估价历史 + * 鏌愪釜鐢ㄦ埛鐨勪及浠峰巻鍙� */ public static def userSearchInfo(String enterpriseId,String enterpriseName){ def ls = []; @@ -151,7 +151,7 @@ class DaiQianGuZhiBatch extends BaseBatch{ return ls } /** - * 获取当时估价的价格 + * 鑾峰彇褰撴椂浼颁环鐨勪环鏍� */ public static def getCurrentPrice(String sid){ if(StringUtils.isNotBlank(sid)){ @@ -165,7 +165,7 @@ class DaiQianGuZhiBatch extends BaseBatch{ } /** - * 获取云估价和房估估的价格 + * 鑾峰彇浜戜及浠峰拰鎴夸及浼扮殑浠锋牸 */ public static def getOthersPrice(String city,String region,String name,Date date){ def map = [:]; @@ -196,7 +196,7 @@ class DaiQianGuZhiBatch extends BaseBatch{ /** - * 获取用户相关的信息 + * 鑾峰彇鐢ㄦ埛鐩稿叧鐨勪俊鎭� * @param userId * @return */ @@ -215,7 +215,7 @@ class DaiQianGuZhiBatch extends BaseBatch{ } /** - * 获取每天的统计成功失败总次数 + * 鑾峰彇姣忓ぉ鐨勭粺璁℃垚鍔熷け璐ユ�绘鏁� * @param userId * @param yestoday * @param today @@ -239,7 +239,7 @@ class DaiQianGuZhiBatch extends BaseBatch{ } /** - * 查询出当天使用客户评估的用户 + * 鏌ヨ鍑哄綋澶╀娇鐢ㄥ鎴疯瘎浼扮殑鐢ㄦ埛 * @param yestoday * @param today * @return @@ -253,7 +253,7 @@ class DaiQianGuZhiBatch extends BaseBatch{ return list; } /** - * 获取Excel文件存储路径 + * 鑾峰彇Excel鏂囦欢瀛樺偍璺緞 * @return */ static getFilePath() { @@ -273,9 +273,9 @@ class DaiQianGuZhiBatch extends BaseBatch{ file.put("data", new File(fileName).getBytes()) fsDB.save(file) def href = DataUtil.encodePicUrl(id, "o", "upload") - href = "点击下载附件" + href = "鐐瑰嚮涓嬭浇闄勪欢" emails.each {receiver-> - jms.sendMail(receiver,"pds用户使用统计情况", href) + jms.sendMail(receiver,"pds鐢ㄦ埛浣跨敤缁熻鎯呭喌", href) } new File(fileName).deleteOnExit() } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/pds/DealHouseLevel.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/pds/DealHouseLevel.groovy index a607f18f2..17c857d17 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/pds/DealHouseLevel.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/pds/DealHouseLevel.groovy @@ -15,7 +15,7 @@ import org.apache.commons.lang.StringUtils import java.text.SimpleDateFormat /** - * 成交量排名 + * 鎴愪氦閲忔帓鍚� */ @BatchOwner(Watcher.Hubingliang) class DealHouseLevel extends BaseBatch{ @@ -24,7 +24,7 @@ class DealHouseLevel extends BaseBatch{ static main(args) { def s = System.currentTimeMillis() runBatch(new DealHouseLevel(), args) - println("运行时间:${(int) ((System.currentTimeMillis() - s)) / (1000 * 60)}分钟") + println("杩愯鏃堕棿:${(int) ((System.currentTimeMillis() - s)) / (1000 * 60)}鍒嗛挓") } @Override public void process(Object args) { @@ -50,7 +50,7 @@ class DealHouseLevel extends BaseBatch{ }) } /** - * 获取所有小区半年成交量 + * 鑾峰彇鎵�鏈夊皬鍖哄崐骞存垚浜ら噺 */ public static Map getAllDealCount(String city,def diss){ def map=[:]; @@ -70,7 +70,7 @@ class DealHouseLevel extends BaseBatch{ /** - * 更新均价排名 + * 鏇存柊鍧囦环鎺掑悕 * @param db * @param map * @param citySize @@ -101,7 +101,7 @@ class DealHouseLevel extends BaseBatch{ } /** - * 城市排名 + * 鍩庡競鎺掑悕 * @param list * @return */ @@ -118,7 +118,7 @@ class DealHouseLevel extends BaseBatch{ return LevelUtil.doLevel(set); } /** - * 获取上个月的int类型时间 + * 鑾峰彇涓婁釜鏈堢殑int绫诲瀷鏃堕棿 * @return */ public static int getLastMonth(){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/pds/DealHouseUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/pds/DealHouseUtils.groovy index 13c178918..64fb0e355 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/pds/DealHouseUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/pds/DealHouseUtils.groovy @@ -13,12 +13,12 @@ class DealHouseUtils{ } /** - * 根据月份查询一段时间内房源数量 - * @param city 城市 - * @param region 区域 - * @param name 小区名 (不能为空) - * @param alias 小区别名 - * @param startMonth 开始月份 ( 例:201701) + * 鏍规嵁鏈堜唤鏌ヨ涓�娈垫椂闂村唴鎴挎簮鏁伴噺 + * @param city 鍩庡競 + * @param region 鍖哄煙 + * @param name 灏忓尯鍚� (涓嶈兘涓虹┖) + * @param alias 灏忓尯鍒悕 + * @param startMonth 寮�濮嬫湀浠� 锛� 渚嬶細201701锛� * @return */ public static def findHouseCountByMonth(String city,Date startMonth){ @@ -43,12 +43,12 @@ class DealHouseUtils{ } /** - * 根据月份查询一段时间内房源数量 - * @param city 城市 - * @param region 区域 - * @param name 小区名 (不能为空) - * @param alias 小区别名 - * @param startMonth 开始月份 ( 例:201701) + * 鏍规嵁鏈堜唤鏌ヨ涓�娈垫椂闂村唴鎴挎簮鏁伴噺 + * @param city 鍩庡競 + * @param region 鍖哄煙 + * @param name 灏忓尯鍚� (涓嶈兘涓虹┖) + * @param alias 灏忓尯鍒悕 + * @param startMonth 寮�濮嬫湀浠� 锛� 渚嬶細201701锛� * @return */ public static def findHouseCountByMonth(String city,String region,String name,Date startMonth,int limit){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/pds/FangYuanLevel.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/pds/FangYuanLevel.groovy index ba04186ee..305cf5490 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/pds/FangYuanLevel.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/pds/FangYuanLevel.groovy @@ -20,7 +20,7 @@ import com.mongodb.DBCursor import com.mongodb.DBObject /** - * 房源排名batch + * 鎴挎簮鎺掑悕batch */ @BatchOwner(Watcher.Hubingliang) class FnagYuanLevel extends BaseBatch{ @@ -30,7 +30,7 @@ class FnagYuanLevel extends BaseBatch{ static main(args) { def s = System.currentTimeMillis() runBatch(new FnagYuanLevel(), args) - println("运行时间:${(int) ((System.currentTimeMillis() - s)) / (1000 * 60)}分钟") + println("杩愯鏃堕棿:${(int) ((System.currentTimeMillis() - s)) / (1000 * 60)}鍒嗛挓") } @Override public void process(Object args) { @@ -59,7 +59,7 @@ class FnagYuanLevel extends BaseBatch{ }) } /** - * 获取所有小区半年房源 + * 鑾峰彇鎵�鏈夊皬鍖哄崐骞存埧婧� */ public static Map getFangYuanLevel(def diss){ def map=new ConcurrentHashMap(); @@ -78,7 +78,7 @@ class FnagYuanLevel extends BaseBatch{ /** - * 更新均价排名 + * 鏇存柊鍧囦环鎺掑悕 * @param db * @param map * @param citySize @@ -111,7 +111,7 @@ class FnagYuanLevel extends BaseBatch{ } /** - * 城市排名 + * 鍩庡競鎺掑悕 * @param list * @return */ @@ -128,7 +128,7 @@ class FnagYuanLevel extends BaseBatch{ return LevelUtil.doLevel(set); } /** - * 获取上个月的int类型时间 + * 鑾峰彇涓婁釜鏈堢殑int绫诲瀷鏃堕棿 * @return */ public static int getLastMonth(){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/pds/HuExportData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/pds/HuExportData.groovy index c908cfcbf..0a436acaa 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/pds/HuExportData.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/pds/HuExportData.groovy @@ -29,11 +29,11 @@ class HuExportData { public static final DBCollection DISTRICT_ANALY_DATA_ONLINE = MongoUtils.getCollectionByName("fangjia_stat", "district_analy_data", "mongo.db.fangjia.com", 27017) public static final DBCollection DISTRICT_ANALY_DATA = MongoUtils.getCollectionByName("fangjia_stat", "district_analy_data", "192.168.0.136", 27017) static main(args) { - for(String city:["邯郸","太原","郑州","上海"]) + for(String city:["閭兏","澶師","閮戝窞","涓婃捣"]) exportDistrictAnalyData(city) } /** - * cpdb排名 + * cpdb鎺掑悕 * @return */ def static exportCpdbPrice(Integer newDate){ @@ -50,7 +50,7 @@ class HuExportData { } /** - * 小区得分在城市排名 + * 灏忓尯寰楀垎鍦ㄥ煄甯傛帓鍚� * @return */ def static exportCityScoreLevel(String city,Integer newDate){ @@ -67,7 +67,7 @@ class HuExportData { CITY_SCORE_LEVEL.insert(list); } /** - * cpdb排名 + * cpdb鎺掑悕 * @return */ def static exportHouseQuoteLevel(String city,Integer newDate){ @@ -85,7 +85,7 @@ class HuExportData { } /** - * cpdb排名 + * cpdb鎺掑悕 * @return */ def static exportTrafficLevelOnline(String city){ @@ -102,7 +102,7 @@ class HuExportData { } /** - * 小区得分在城市排名 + * 灏忓尯寰楀垎鍦ㄥ煄甯傛帓鍚� * @return */ def static exportAgencyLevel(String city,Integer newDate){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/pds/KeHuFenLeiBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/pds/KeHuFenLeiBatch.groovy index da74f4bd4..708b14f5c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/pds/KeHuFenLeiBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/pds/KeHuFenLeiBatch.groovy @@ -18,7 +18,7 @@ import com.mongodb.DBObject import com.mongodb.Mongo /** - * 定时更新小区地址数据 + * 瀹氭椂鏇存柊灏忓尯鍦板潃鏁版嵁 * @author hubingliang * */ @@ -40,7 +40,7 @@ class KeHuFenLeiBatch extends BaseBatch{ static main(args) { def s = System.currentTimeMillis() runBatch(new KeHuFenLeiBatch(), args) - println("运行时间:${(int) ((System.currentTimeMillis() - s)) / (1000 * 60)}分钟") + println("杩愯鏃堕棿:${(int) ((System.currentTimeMillis() - s)) / (1000 * 60)}鍒嗛挓") } @Override @@ -56,17 +56,17 @@ class KeHuFenLeiBatch extends BaseBatch{ String dateStr = DateUtils.formatToYYYYMMDD(yestoday); def fileName1 = getFilePath() + "KeHuFenLei" + dateStr + ".xlsx" - ExcelUtils.write(fileName1, everyDayList, "客户分类每天") + ExcelUtils.write(fileName1, everyDayList, "瀹㈡埛鍒嗙被姣忓ぉ") send(fileName1) } /** - * 试用期结束前一天进行统计 + * 璇曠敤鏈熺粨鏉熷墠涓�澶╄繘琛岀粺璁� * @return */ static def beforeTestDateEnd(){ def ls = []; - ls.add(["企业名称","输入","匹配城市","匹配区域","匹配小区","价格","房估估价格","云估价价格"]) + ls.add(["浼佷笟鍚嶇О","杈撳叆","鍖归厤鍩庡競","鍖归厤鍖哄煙","鍖归厤灏忓尯","浠锋牸","鎴夸及浼颁环鏍�","浜戜及浠蜂环鏍�"]) def enterpriseIds = endUsers(); if(enterpriseIds!=null&&enterpriseIds.size()>0){ for(DBObject db :enterpriseIds){ @@ -80,11 +80,11 @@ class KeHuFenLeiBatch extends BaseBatch{ return ls; } /** - * 每天统计用户使用情况 + * 姣忓ぉ缁熻鐢ㄦ埛浣跨敤鎯呭喌 */ public static def everyDayStatistic(Date today,Date yestoday){ def ls =[]; - ls.add(["企业名称","用户名称","总次数","成功次数","失败次数"]) + ls.add(["浼佷笟鍚嶇О","鐢ㄦ埛鍚嶇О","鎬绘鏁�","鎴愬姛娆℃暟","澶辫触娆℃暟"]) def userIds = findYesTodayUser(yestoday, today); if(userIds!=null&&userIds.size()>0){ for(String userId:userIds){ @@ -117,7 +117,7 @@ class KeHuFenLeiBatch extends BaseBatch{ /** - * 获取云估价和房估估的价格 + * 鑾峰彇浜戜及浠峰拰鎴夸及浼扮殑浠锋牸 */ public static def getOthersPrice(String city,String region,String name,Date date){ def map = [:]; @@ -148,7 +148,7 @@ class KeHuFenLeiBatch extends BaseBatch{ /** - * 获取用户相关的信息 + * 鑾峰彇鐢ㄦ埛鐩稿叧鐨勪俊鎭� * @param userId * @return */ @@ -167,7 +167,7 @@ class KeHuFenLeiBatch extends BaseBatch{ } /** - * 获取每天的统计成功失败总次数 + * 鑾峰彇姣忓ぉ鐨勭粺璁℃垚鍔熷け璐ユ�绘鏁� * @param userId * @param yestoday * @param today @@ -195,7 +195,7 @@ class KeHuFenLeiBatch extends BaseBatch{ } /** - * 查询出当天使用客户评估的用户 + * 鏌ヨ鍑哄綋澶╀娇鐢ㄥ鎴疯瘎浼扮殑鐢ㄦ埛 * @param yestoday * @param today * @return @@ -208,7 +208,7 @@ class KeHuFenLeiBatch extends BaseBatch{ return list; } /** - * 获取Excel文件存储路径 + * 鑾峰彇Excel鏂囦欢瀛樺偍璺緞 * @return */ static getFilePath() { @@ -228,9 +228,9 @@ class KeHuFenLeiBatch extends BaseBatch{ file.put("data", new File(fileName).getBytes()) fsDB.save(file) def href = DataUtil.encodePicUrl(id, "o", "upload") - href = "点击下载附件" + href = "鐐瑰嚮涓嬭浇闄勪欢" emails.each {receiver-> - jms.sendMail(receiver,"pds用户使用统计情况", href) + jms.sendMail(receiver,"pds鐢ㄦ埛浣跨敤缁熻鎯呭喌", href) } new File(fileName).deleteOnExit() } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/pds/KeHuPingJiBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/pds/KeHuPingJiBatch.groovy index a2219d524..acadcaf30 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/pds/KeHuPingJiBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/pds/KeHuPingJiBatch.groovy @@ -18,7 +18,7 @@ import com.mongodb.DBObject import com.mongodb.Mongo /** - * 定时更新小区地址数据 + * 瀹氭椂鏇存柊灏忓尯鍦板潃鏁版嵁 * @author hubingliang * */ @@ -39,7 +39,7 @@ class KeHuPingJiBatch extends BaseBatch{ static main(args) { def s = System.currentTimeMillis() runBatch(new KeHuPingJiBatch(), args) - println("运行时间:${(int) ((System.currentTimeMillis() - s)) / (1000 * 60)}分钟") + println("杩愯鏃堕棿:${(int) ((System.currentTimeMillis() - s)) / (1000 * 60)}鍒嗛挓") } @Override @@ -55,20 +55,20 @@ class KeHuPingJiBatch extends BaseBatch{ String dateStr = DateUtils.formatToYYYYMMDD(yestoday); def fileName1 = getFilePath() + "KeHuPingJi" + dateStr + ".xlsx" - ExcelUtils.write(fileName1, everyDayList, "客户评级每天") + ExcelUtils.write(fileName1, everyDayList, "瀹㈡埛璇勭骇姣忓ぉ") if(allList.size()>1){ - ExcelUtils.write(fileName1, everyDayList, "客户评级所有") + ExcelUtils.write(fileName1, everyDayList, "瀹㈡埛璇勭骇鎵�鏈�") } send(fileName1) } /** - * 试用期结束前一天进行统计 + * 璇曠敤鏈熺粨鏉熷墠涓�澶╄繘琛岀粺璁� * @return */ static def beforeTestDateEnd(){ def ls = []; - ls.add(["企业名称","输入","匹配城市","匹配区域","匹配小区","价格","房估估价格","云估价价格"]) + ls.add(["浼佷笟鍚嶇О","杈撳叆","鍖归厤鍩庡競","鍖归厤鍖哄煙","鍖归厤灏忓尯","浠锋牸","鎴夸及浼颁环鏍�","浜戜及浠蜂环鏍�"]) def enterpriseIds = endUsers(); if(enterpriseIds!=null&&enterpriseIds.size()>0){ for(DBObject db :enterpriseIds){ @@ -82,11 +82,11 @@ class KeHuPingJiBatch extends BaseBatch{ return ls; } /** - * 每天统计用户使用情况 + * 姣忓ぉ缁熻鐢ㄦ埛浣跨敤鎯呭喌 */ public static def everyDayStatistic(Date today,Date yestoday){ def ls =[]; - ls.add(["企业名称","用户名称","总次数","成功次数","失败次数"]) + ls.add(["浼佷笟鍚嶇О","鐢ㄦ埛鍚嶇О","鎬绘鏁�","鎴愬姛娆℃暟","澶辫触娆℃暟"]) def userIds = findYesTodayUser(yestoday, today); if(userIds!=null&&userIds.size()>0){ for(String userId:userIds){ @@ -118,7 +118,7 @@ class KeHuPingJiBatch extends BaseBatch{ } /** - * 某个用户的估价历史 + * 鏌愪釜鐢ㄦ埛鐨勪及浠峰巻鍙� */ public static def userSearchInfo(String enterpriseId,String enterpriseName){ def ls = []; @@ -150,7 +150,7 @@ class KeHuPingJiBatch extends BaseBatch{ return ls } /** - * 获取当时估价的价格 + * 鑾峰彇褰撴椂浼颁环鐨勪环鏍� */ public static def getCurrentPrice(String sid){ if(StringUtils.isNotBlank(sid)){ @@ -164,7 +164,7 @@ class KeHuPingJiBatch extends BaseBatch{ } /** - * 获取云估价和房估估的价格 + * 鑾峰彇浜戜及浠峰拰鎴夸及浼扮殑浠锋牸 */ public static def getOthersPrice(String city,String region,String name,Date date){ def map = [:]; @@ -195,7 +195,7 @@ class KeHuPingJiBatch extends BaseBatch{ /** - * 获取用户相关的信息 + * 鑾峰彇鐢ㄦ埛鐩稿叧鐨勪俊鎭� * @param userId * @return */ @@ -214,7 +214,7 @@ class KeHuPingJiBatch extends BaseBatch{ } /** - * 获取每天的统计成功失败总次数 + * 鑾峰彇姣忓ぉ鐨勭粺璁℃垚鍔熷け璐ユ�绘鏁� * @param userId * @param yestoday * @param today @@ -238,7 +238,7 @@ class KeHuPingJiBatch extends BaseBatch{ } /** - * 查询出当天使用客户评估的用户 + * 鏌ヨ鍑哄綋澶╀娇鐢ㄥ鎴疯瘎浼扮殑鐢ㄦ埛 * @param yestoday * @param today * @return @@ -251,7 +251,7 @@ class KeHuPingJiBatch extends BaseBatch{ return list; } /** - * 获取Excel文件存储路径 + * 鑾峰彇Excel鏂囦欢瀛樺偍璺緞 * @return */ static getFilePath() { @@ -271,9 +271,9 @@ class KeHuPingJiBatch extends BaseBatch{ file.put("data", new File(fileName).getBytes()) fsDB.save(file) def href = DataUtil.encodePicUrl(id, "o", "upload") - href = "点击下载附件" + href = "鐐瑰嚮涓嬭浇闄勪欢" emails.each {receiver-> - jms.sendMail(receiver,"pds用户使用统计情况", href) + jms.sendMail(receiver,"pds鐢ㄦ埛浣跨敤缁熻鎯呭喌", href) } new File(fileName).deleteOnExit() } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/pds/LevelUtil.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/pds/LevelUtil.groovy index bd8fb2c09..b7852f754 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/pds/LevelUtil.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/pds/LevelUtil.groovy @@ -58,7 +58,7 @@ class LevelUtil{ } int p = process.getAndAdd(1) if(p % 100 == 0){ - println("${new Date().format("yyyy/MM/dd HH:mm:ss")} 执行进度:${DataUtil.getRound(2, (p * 100)/total)}%") + println("${new Date().format("yyyy/MM/dd HH:mm:ss")} 鎵ц杩涘害:${DataUtil.getRound(2, (p * 100)/total)}%") } }catch (Exception e){ println e @@ -69,7 +69,7 @@ class LevelUtil{ executorService.shutdown() executorService.awaitTermination(10, TimeUnit.DAYS) if(updateCount != 0){ - println("总量:${total}\t更新:${updateCount}") + println("鎬婚噺:${total}\t鏇存柊:${updateCount}") } return updateCount diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/pds/PdsDataExport.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/pds/PdsDataExport.groovy index 71005cb82..3e46a16a4 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/pds/PdsDataExport.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/pds/PdsDataExport.groovy @@ -8,7 +8,7 @@ import com.mongodb.BasicDBObject import com.mongodb.DBCollection import com.mongodb.DBCursor import com.mongodb.DBObject -//在每个月2号8点运行 +//鍦ㄦ瘡涓湀2鍙�8鐐硅繍琛� class PdsDataExport{ public static final DBCollection AGENCY_MOUNT_LEVEL = MongoUtils.getCollectionByName("fangjia_stat", "pds.agency_mount_level", "mongo.db.fangjia.com", 27017) public static final DBCollection CPDB_PRICE = MongoUtils.getCollectionByName("fangjia_stat", "pds.cpdb_price", "mongo.db.fangjia.com", 27017) @@ -21,13 +21,13 @@ class PdsDataExport{ agecyMountLevel(city,201709) } - /*DBCursor dbs = DISTRICT_SELL_STAT.find(new BasicDBObject("city","上海").append("date",201710)); + /*DBCursor dbs = DISTRICT_SELL_STAT.find(new BasicDBObject("city","涓婃捣").append("date",201710)); dbs.each {DBObject db-> DISTRICT_SELL_STAT_UNDERLINE.save(db) }*/ } /** - * 将某个月的数据复制成上个月pds.agency_mount_level + * 灏嗘煇涓湀鐨勬暟鎹鍒舵垚涓婁釜鏈坧ds.agency_mount_level * @param city * @param date */ @@ -54,7 +54,7 @@ class PdsDataExport{ AGENCY_MOUNT_LEVEL.insert(list) } /** - * 将某个月的数据复制成上个月pds.cpdb_price + * 灏嗘煇涓湀鐨勬暟鎹鍒舵垚涓婁釜鏈坧ds.cpdb_price * @param date */ public static void cpdbPrice(int date){ @@ -78,7 +78,7 @@ class PdsDataExport{ } /** - * 获取上个月的int类型时间 + * 鑾峰彇涓婁釜鏈堢殑int绫诲瀷鏃堕棿 * @return */ public static int getLastMonth(){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/AnalySaleDataBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/AnalySaleDataBatch.groovy index 7c02bf09d..97e9fef64 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/AnalySaleDataBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/AnalySaleDataBatch.groovy @@ -23,13 +23,13 @@ class AnalySaleDataBatch { public static final DBCollection SALE_DATA_STAT = MongoUtils.getCollectionByName("hu_temp", "sale_data_stat", "192.168.0.136", 27017) public static final DBCollection SALE_DATA_BASE = MongoUtils.getCollectionByName("hu_temp", "sale_data_base", "192.168.0.136", 27017) static main(args) { - saleData("上海"); - saleData("北京"); - saleData("广州"); - saleData("佛山"); - saleData("南京"); - saleData("宁波"); - saleData("珠海"); + saleData("涓婃捣"); + saleData("鍖椾含"); + saleData("骞垮窞"); + saleData("浣涘北"); + saleData("鍗椾含"); + saleData("瀹佹尝"); + saleData("鐝犳捣"); } public static void saleData(String city){ @@ -52,49 +52,49 @@ class AnalySaleDataBatch { continue; } - String str = db.get("house_num");//出售数量 + String str = db.get("house_num");//鍑哄敭鏁伴噺 int houseNum = toInt(str); if(houseNum<=0){ continue; } - String totalSizeStr = db.get("total_size");//出售总面积 + String totalSizeStr = db.get("total_size");//鍑哄敭鎬婚潰绉� Integer totalSize=null; if(toInt(totalSizeStr)>=0){ totalSize=toInt(totalSizeStr); } - String totalPriceStr = db.get("total_price");//总价格 + String totalPriceStr = db.get("total_price");//鎬讳环鏍� Long totalPrice = null; if(toLong(totalPriceStr)>=0){ totalPrice = toLong(totalPriceStr); } - String avgPriceStr =db.get("avg_price");//均价 + String avgPriceStr =db.get("avg_price");//鍧囦环 Integer avgPrice = null; if(toInt(avgPriceStr)>=0){ avgPrice = toInt(avgPriceStr); } - String hisNumStr =db.get("his_num");//历史出售数量 + String hisNumStr =db.get("his_num");//鍘嗗彶鍑哄敭鏁伴噺 Integer hisNum = null; if(toInt(hisNumStr)>=0){ hisNum = toInt(hisNumStr); } - String hisSizeStr =db.get("his_size");//历史出售面积 + String hisSizeStr =db.get("his_size");//鍘嗗彶鍑哄敭闈㈢Н Integer hisSize = null; if(toInt(hisSizeStr)>=0){ hisSize = toInt(hisSizeStr); } - String notSaleNumStr =db.get("not_sale_num");//未出售数量 + String notSaleNumStr =db.get("not_sale_num");//鏈嚭鍞暟閲� Integer notSaleNum = null; if(toInt(notSaleNumStr)>=0){ notSaleNum = toInt(notSaleNumStr); } - String notSaleSizeStr =db.get("not_sale_szie");//未出售面积 + String notSaleSizeStr =db.get("not_sale_szie");//鏈嚭鍞潰绉� Integer notSaleSize = null; if(toInt(notSaleSizeStr)>=0){ notSaleSize = toInt(notSaleSizeStr); @@ -124,13 +124,13 @@ class AnalySaleDataBatch { d.put("not_sale_num",notSaleNum); d.put("not_sale_size",notSaleSize); d.put("date",getDate(db.get("date"))); - d.put("resource","网易房产") + d.put("resource","缃戞槗鎴夸骇") DBObject q = new BasicDBObject(); q.put("city",city); q.put("region",region); q.put("name",disName); q.put("date",getDate(db.get("date"))); - q.put("resource","网易房产") + q.put("resource","缃戞槗鎴夸骇") SALE_DATA_BASE.update(q,d,true,false); break; } @@ -152,20 +152,20 @@ class AnalySaleDataBatch { d.put("not_sale_num",notSaleNum); d.put("not_sale_size",notSaleSize); d.put("date",getDate(db.get("date"))); - d.put("resource","网易房产") + d.put("resource","缃戞槗鎴夸骇") DBObject q = new BasicDBObject(); q.put("city",city); q.put("region",region); q.put("name",name); q.put("date",getDate(db.get("date"))); - q.put("resource","网易房产") + q.put("resource","缃戞槗鎴夸骇") SALE_DATA_BASE.update(q,d,true,false); } } } /** - * 获取城市的小区 + * 鑾峰彇鍩庡競鐨勫皬鍖� * @param city * @return */ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/BeiJingFaYuanBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/BeiJingFaYuanBatch.groovy index c7bc5a9e2..f4480b30c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/BeiJingFaYuanBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/BeiJingFaYuanBatch.groovy @@ -23,7 +23,7 @@ import com.mongodb.DBCursor; import com.mongodb.DBObject /** - * 抓取拍卖网站 + * 鎶撳彇鎷嶅崠缃戠珯 * @author hubingliang * */ @@ -44,7 +44,7 @@ class BeiJingFaYuanBatch{ } /** - * 对页面进行抓取 + * 瀵归〉闈㈣繘琛屾姄鍙� */ public static String catchPage(String url){ String str= getHtmlStr(url); @@ -120,7 +120,7 @@ class BeiJingFaYuanBatch{ } /** - * 获取城市的小区 + * 鑾峰彇鍩庡競鐨勫皬鍖� * @param city * @return */ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/BeiJingFaYuanWangBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/BeiJingFaYuanWangBatch.groovy index 438e0d17a..cc67b3491 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/BeiJingFaYuanWangBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/BeiJingFaYuanWangBatch.groovy @@ -25,7 +25,7 @@ import com.mongodb.DBCursor import com.mongodb.DBObject /** - * 抓取拍卖网站 + * 鎶撳彇鎷嶅崠缃戠珯 * @author hubingliang * */ @@ -46,13 +46,13 @@ class BeiJingFaYuanWangBatch{ dbs.each {DBObject db -> i = i+1; if(i%1000 == 0){ - println "快点复制吧======================================" + println "蹇偣澶嶅埗鍚�======================================" //Thread.sleep(30000) } analyPage(db); } } - //解析页面 + //瑙f瀽椤甸潰 public static void analyPage(DBObject db){ if(db){ String detail = db.get("detail"); @@ -62,7 +62,7 @@ class BeiJingFaYuanWangBatch{ if(eles!=null&&eles.size()>0){ Element ele = eles.get(0); String str = ele.html(); - String result = formatByFirstPattern(str, "一、拍卖标的.+") + String result = formatByFirstPattern(str, "涓�銆佹媿鍗栨爣鐨�.+") if(StringUtils.isNotBlank(result)){ println result } @@ -72,7 +72,7 @@ class BeiJingFaYuanWangBatch{ } /** - * 对页面进行抓取 + * 瀵归〉闈㈣繘琛屾姄鍙� */ public static String catchPage(String url){ String str= getHtmlStr(url); @@ -96,51 +96,51 @@ class BeiJingFaYuanWangBatch{ def static exportData(List> datas) { - ExcelUtils.write("D:\\hbl\\tmp\\中国司法拍卖.xlsx", datas, "Sheet1") + ExcelUtils.write("D:\\hbl\\tmp\\涓浗鍙告硶鎷嶅崠.xlsx", datas, "Sheet1") } - //解析内容 + //瑙f瀽鍐呭 public static String handleDetail(String str){ - String area = formatByFirstPattern(str, "证载面积:\\w+(.|)(\\w+)") - area = replaceList(area, ["证载面积:"]) + String area = formatByFirstPattern(str, "璇佽浇闈㈢Н锛歕\w+(.|)(\\w+)") + area = replaceList(area, ["璇佽浇闈㈢Н锛�"]) return area } - //解析标题 + //瑙f瀽鏍囬 public static Map handleTitle(String str){ Map map = new HashMap(); if(StringUtils.isNotBlank(str)){ - String city = formatByFirstPattern(str, ".+?(市)") + String city = formatByFirstPattern(str, ".+?(甯�)") str = replaceList(str, [city]); - String region = formatByFirstPattern(str, ".+?(县|区)") + String region = formatByFirstPattern(str, ".+?(鍘縷鍖�)") str = replaceList(str, [region]); - String address = formatByFirstPattern(str, ".+(路|大道|街|街道)(.+侧|)(\\w+号|)") + String address = formatByFirstPattern(str, ".+(璺瘄澶ч亾|琛梶琛楅亾)(.+渚)(\\w+鍙穦)") if(StringUtils.isBlank(address)){ - address = formatByFirstPattern(str, ".+(镇)") + address = formatByFirstPattern(str, ".+(闀�)") } str = replaceList(str, [address]); - String name = formatByFirstPattern(str,".+?(\\w+)(栋|楼|号楼|幢|单元|)") - name = replaceList(name, ["号楼","楼","栋","幢","单元","(产权证号","小区","住宅"]) + String name = formatByFirstPattern(str,".+?(\\w+)(鏍媩妤紎鍙锋ゼ|骞鍗曞厓|)") + name = replaceList(name, ["鍙锋ゼ","妤�","鏍�","骞�","鍗曞厓","锛堜骇鏉冭瘉鍙�","灏忓尯","浣忓畢"]) if(name){ String num = formatByFirstPattern(name,"(-\\w+|\\w+)") name = replaceList(name, [num]) } - String loudong = formatByFirstPattern(str, "(\\w+)(-|)(\\w+|)(幢|号楼|#|栋)") - loudong = replaceList(loudong, ["号楼","#","栋","幢"]); - String unit = formatByFirstPattern(str, "(\\w+)(单元)") - unit = replaceList(unit, ["单元"]); - String room = formatByFirstPattern(str, "(\\w+-\\w)(室|房产)") + String loudong = formatByFirstPattern(str, "(\\w+)(-|)(\\w+|)(骞鍙锋ゼ|#|鏍�)") + loudong = replaceList(loudong, ["鍙锋ゼ","#","鏍�","骞�"]); + String unit = formatByFirstPattern(str, "(\\w+)(鍗曞厓)") + unit = replaceList(unit, ["鍗曞厓"]); + String room = formatByFirstPattern(str, "(\\w+-\\w)(瀹鎴夸骇)") if(StringUtils.isBlank(room)){ - room = formatByFirstPattern(str, "(\\w+)(室|房产)") + room = formatByFirstPattern(str, "(\\w+)(瀹鎴夸骇)") if(StringUtils.isBlank(room)){ - room = formatByFirstPattern(str, "单元\\w+号") + room = formatByFirstPattern(str, "鍗曞厓\\w+鍙�") } }else{ - room = formatByFirstPattern(str, "(\\w+)(室|房产)") + room = formatByFirstPattern(str, "(\\w+)(瀹鎴夸骇)") if(StringUtils.isBlank(unit)){ unit = getFrontStr(room,"-") } } - room = replaceList(room, ["室","号","房产","单元"]) + room = replaceList(room, ["瀹�","鍙�","鎴夸骇","鍗曞厓"]) map.put("city", city); map.put("region", region); map.put("address", address); @@ -228,7 +228,7 @@ class BeiJingFaYuanWangBatch{ } /** - * 获取城市的小区 + * 鑾峰彇鍩庡競鐨勫皬鍖� * @param city * @return */ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/CopyOfErShouMaiTianZaiXianCatchAnalyBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/CopyOfErShouMaiTianZaiXianCatchAnalyBatch.groovy index 487d455f5..cb616dfee 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/CopyOfErShouMaiTianZaiXianCatchAnalyBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/CopyOfErShouMaiTianZaiXianCatchAnalyBatch.groovy @@ -25,7 +25,7 @@ import com.mongodb.DBCursor import com.mongodb.DBObject /** - * 抓取拍卖网站 + * 鎶撳彇鎷嶅崠缃戠珯 * @author hubingliang * */ @@ -36,8 +36,8 @@ class CopyOfErShouMaiTianZaiXianCatchAnalyBatch extends BaseBatch{ public static final DBCollection MAI_TIAN_DATA = MongoUtils.getCollectionByName("gaode_poi", "mai_tian_data", "192.168.0.61", 27017) public static final DBCollection xf_lou_dong = MongoUtils.getCollectionByName("gaode_poi", "loudong3", "192.168.0.61", 27017) public static final DBCollection xf_fang_hao = MongoUtils.getCollectionByName("gaode_poi", "fanghao3", "192.168.0.61", 27017) - public static def cityMap=["北京":"bj", "厦门":"xm","福州":"fz"] - public static def pageSize=["北京":423, "厦门":203, "福州":812] + public static def cityMap=["鍖椾含":"bj", "鍘﹂棬":"xm","绂忓窞":"fz"] + public static def pageSize=["鍖椾含":423, "鍘﹂棬":203, "绂忓窞":812] static main(args) { def s = System.currentTimeMillis() runBatch(new CopyOfErShouMaiTianZaiXianCatchAnalyBatch(), args) @@ -49,12 +49,12 @@ class CopyOfErShouMaiTianZaiXianCatchAnalyBatch extends BaseBatch{ public static void doAll(){ //doCatch() //doAnaly() - doRuKu("麦田在线") + doRuKu("楹︾敯鍦ㄧ嚎") } public static doCatch(){ - for(String city:["厦门","北京","福州"]){ + for(String city:["鍘﹂棬","鍖椾含","绂忓窞"]){ List urls = getUrlList(city); for(String url:urls){ catchPage(url,city) @@ -63,7 +63,7 @@ class CopyOfErShouMaiTianZaiXianCatchAnalyBatch extends BaseBatch{ } public static void doRuKu(String from){ - for(String city:["北京"]){ + for(String city:["鍖椾含"]){ DBObject query = new BasicDBObject(); query.put("city", city) DBCursor dbs = ORIGINAL_DATA.find(query); @@ -101,7 +101,7 @@ class CopyOfErShouMaiTianZaiXianCatchAnalyBatch extends BaseBatch{ } } } - //格式化成交时间 + //鏍煎紡鍖栨垚浜ゆ椂闂� public static Date formatDateStr(String dateStr){ if(StringUtils.isNotBlank(dateStr)){ dateStr = dateStr.trim(); @@ -111,7 +111,7 @@ class CopyOfErShouMaiTianZaiXianCatchAnalyBatch extends BaseBatch{ Date date = DateUtils.parseFromTightYYYYMMDD(time) return date }catch(Exception e){ - println "成交时间解析错误" + println "鎴愪氦鏃堕棿瑙f瀽閿欒" } }else{ dateStr = formatByFirstPattern(dateStr, "\\d{4}-\\d{2}") @@ -121,7 +121,7 @@ class CopyOfErShouMaiTianZaiXianCatchAnalyBatch extends BaseBatch{ Date date = DateUtils.parseFromTightYYYYMMDD(dateStr) return date }catch(Exception e){ - println "成交时间解析错误" + println "鎴愪氦鏃堕棿瑙f瀽閿欒" } } } @@ -129,7 +129,7 @@ class CopyOfErShouMaiTianZaiXianCatchAnalyBatch extends BaseBatch{ } return null } - //格式化价格 + //鏍煎紡鍖栦环鏍� public static Integer stringToInteger(String str){ if(StringUtils.isNotBlank(str)){ str = str.trim(); @@ -138,12 +138,12 @@ class CopyOfErShouMaiTianZaiXianCatchAnalyBatch extends BaseBatch{ Integer ar = Integer.valueOf(str); return ar }catch(Exception e){ - println "均价格式化错误" + println "鍧囦环鏍煎紡鍖栭敊璇�" } } return null } - //格式房源面积 + //鏍煎紡鎴挎簮闈㈢Н public static Double stingToDouble(String area){ if(StringUtils.isNotBlank(area)){ area = area.trim(); @@ -153,17 +153,17 @@ class CopyOfErShouMaiTianZaiXianCatchAnalyBatch extends BaseBatch{ Double ar = Double.valueOf(area); return ar }catch(Exception e){ - println "面积格式化错误"+area + println "闈㈢Н鏍煎紡鍖栭敊璇�"+area } } } return null; } - //判断是否可以入库 + //鍒ゆ柇鏄惁鍙互鍏ュ簱 public static boolean canRuKu(DBObject db){ return DealPriceUtils.isAvailableDealPrice(db) } - //格式化单元号 + //鏍煎紡鍖栧崟鍏冨彿 public static String formatUnitNum(String unitNum){ if(StringUtils.isNotBlank(unitNum)){ unitNum = CNNMFilter.convertCnNumber(unitNum); @@ -176,7 +176,7 @@ class CopyOfErShouMaiTianZaiXianCatchAnalyBatch extends BaseBatch{ - //解析地址中的楼栋单元房号 + //瑙f瀽鍦板潃涓殑妤兼爧鍗曞厓鎴垮彿 public static Map addressAnaly(String address){ Map map = new HashMap(); String houseNumber = null; @@ -185,21 +185,21 @@ class CopyOfErShouMaiTianZaiXianCatchAnalyBatch extends BaseBatch{ if(StringUtils.isNotBlank(address)){ String str = null if(StringUtils.isBlank(str)){ - str = formatByFirstPattern(address, "\\w+幢.{1,2}单元\\w+(室|)") + str = formatByFirstPattern(address, "\\w+骞�.{1,2}鍗曞厓\\w+(瀹)") if(StringUtils.isNotBlank(str)){ - houseNumber = formatByFirstPattern(str,"\\w+幢").replaceAll("幢", "") - String unitStr = formatByFirstPattern(str,"幢.{1,2}单元"); + houseNumber = formatByFirstPattern(str,"\\w+骞�").replaceAll("骞�", "") + String unitStr = formatByFirstPattern(str,"骞�.{1,2}鍗曞厓"); if(StringUtils.isNotBlank(unitStr)){ - unitNumber = replaceList(unitStr,["幢","单元"]) + unitNumber = replaceList(unitStr,["骞�","鍗曞厓"]) } - roomNumber = formatByFirstPattern(str,"单元\\w+").replaceAll("单元", "") + roomNumber = formatByFirstPattern(str,"鍗曞厓\\w+").replaceAll("鍗曞厓", "") } } if(StringUtils.isBlank(str)){ - str = formatByFirstPattern(address, "\\w+幢\\w+(室)") + str = formatByFirstPattern(address, "\\w+骞\w+(瀹�)") if(StringUtils.isNotBlank(str)){ - houseNumber = formatByFirstPattern(str,"\\w+幢").replaceAll("幢", "") - roomNumber = formatByFirstPattern(str,"幢\\w+").replaceAll("幢", "") + houseNumber = formatByFirstPattern(str,"\\w+骞�").replaceAll("骞�", "") + roomNumber = formatByFirstPattern(str,"骞\w+").replaceAll("骞�", "") } } if(StringUtils.isBlank(str)){ @@ -220,9 +220,9 @@ class CopyOfErShouMaiTianZaiXianCatchAnalyBatch extends BaseBatch{ } } if(StringUtils.isBlank(str)){ - str = formatByFirstPattern(address, "\\d+号") + str = formatByFirstPattern(address, "\\d+鍙�") if(StringUtils.isNotBlank(str)){ - roomNumber = str.replaceAll("号", "") + roomNumber = str.replaceAll("鍙�", "") } } } @@ -258,8 +258,8 @@ class CopyOfErShouMaiTianZaiXianCatchAnalyBatch extends BaseBatch{ public static void doAnaly(){ - for(String city:["北京"]){ - if("北京".equals(city)){ + for(String city:["鍖椾含"]){ + if("鍖椾含".equals(city)){ analyBeiJingPage(city) }else{ analyPage(city) @@ -270,7 +270,7 @@ class CopyOfErShouMaiTianZaiXianCatchAnalyBatch extends BaseBatch{ public static analyBeiJingPage(String city){ DBObject qu = new BasicDBObject(); qu.put("city", city) - qu.put("from", "麦田在线") + qu.put("from", "楹︾敯鍦ㄧ嚎") DBCursor dbs = ORIGINAL_PAGE.find(qu); dbs.each {DBObject db -> String str = db.get("detail"); @@ -494,7 +494,7 @@ class CopyOfErShouMaiTianZaiXianCatchAnalyBatch extends BaseBatch{ public static analyPage(String city){ DBObject qu = new BasicDBObject(); qu.put("city", city) - qu.put("from", "麦田在线") + qu.put("from", "楹︾敯鍦ㄧ嚎") qu.put("url", "http://bj.maitian.cn//xqxqgk/I3DB700BD44EC9651E053660310AC08E2") DBCursor dbs = ORIGINAL_PAGE.find(qu); dbs.each {DBObject db -> @@ -800,7 +800,7 @@ class CopyOfErShouMaiTianZaiXianCatchAnalyBatch extends BaseBatch{ /** - * 拼接url + * 鎷兼帴url */ public static List getUrlList(String city){ List list = new ArrayList(); @@ -825,7 +825,7 @@ class CopyOfErShouMaiTianZaiXianCatchAnalyBatch extends BaseBatch{ } /** - * 抓取页面 + * 鎶撳彇椤甸潰 */ public static void catchPage(String url,String city){ String cityEasy = cityMap.get(city) @@ -843,7 +843,7 @@ class CopyOfErShouMaiTianZaiXianCatchAnalyBatch extends BaseBatch{ db.put("url", herf); db.put("city", city); db.put("detail", str); - db.put("from", "麦田在线"); + db.put("from", "楹︾敯鍦ㄧ嚎"); ORIGINAL_PAGE.save(db) if(StringUtils.isNotBlank(str)){ println herf+"=========YES" @@ -909,7 +909,7 @@ class CopyOfErShouMaiTianZaiXianCatchAnalyBatch extends BaseBatch{ return str; } def static exportData(List> datas) { - ExcelUtils.write("D:\\hbl\\tmp\\中国司法拍卖.xlsx", datas, "Sheet1") + ExcelUtils.write("D:\\hbl\\tmp\\涓浗鍙告硶鎷嶅崠.xlsx", datas, "Sheet1") } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/CopyOfQFangWangCatchAnalyBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/CopyOfQFangWangCatchAnalyBatch.groovy index fb8e0db35..2db443203 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/CopyOfQFangWangCatchAnalyBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/CopyOfQFangWangCatchAnalyBatch.groovy @@ -24,7 +24,7 @@ import com.mongodb.DBCursor import com.mongodb.DBObject /** - * 抓取拍卖网站 + * 鎶撳彇鎷嶅崠缃戠珯 * @author hubingliang * */ @@ -35,8 +35,8 @@ class CopyOfQFangWangCatchAnalyBatch extends BaseBatch{ public static final DBCollection MAI_TIAN_DATA = MongoUtils.getCollectionByName("gaode_poi", "mai_tian_data", "192.168.0.61", 27017) public static final DBCollection xf_lou_dong = MongoUtils.getCollectionByName("gaode_poi", "loudong3", "192.168.0.61", 27017) public static final DBCollection xf_fang_hao = MongoUtils.getCollectionByName("gaode_poi", "fanghao3", "192.168.0.61", 27017) - public static def cityMap=["北京":"bj", "厦门":"xm","福州":"fz"] - public static def pageSize=["北京":106, "厦门":189, "福州":268] + public static def cityMap=["鍖椾含":"bj", "鍘﹂棬":"xm","绂忓窞":"fz"] + public static def pageSize=["鍖椾含":106, "鍘﹂棬":189, "绂忓窞":268] static main(args) { def s = System.currentTimeMillis() runBatch(new CopyOfQFangWangCatchAnalyBatch(), args) @@ -50,7 +50,7 @@ class CopyOfQFangWangCatchAnalyBatch extends BaseBatch{ //doCatch() //catchDetailPage() doAnaly() - doRuKu("Q房网") + doRuKu("Q鎴跨綉") } public static void doRuKu(String from){ DBObject qu = new BasicDBObject(); @@ -81,7 +81,7 @@ class CopyOfQFangWangCatchAnalyBatch extends BaseBatch{ println dealPrice } } - //格式房源面积 + //鏍煎紡鎴挎簮闈㈢Н public static Double stingToDouble(String area){ if(StringUtils.isNotBlank(area)){ area = area.trim(); @@ -91,13 +91,13 @@ class CopyOfQFangWangCatchAnalyBatch extends BaseBatch{ Double ar = Double.valueOf(area); return ar }catch(Exception e){ - println "面积格式化错误"+area + println "闈㈢Н鏍煎紡鍖栭敊璇�"+area } } } return null; } - //格式化价格 + //鏍煎紡鍖栦环鏍� public static Integer stringToInteger(String str){ if(StringUtils.isNotBlank(str)){ str = str.trim(); @@ -106,12 +106,12 @@ class CopyOfQFangWangCatchAnalyBatch extends BaseBatch{ Integer ar = Integer.valueOf(str); return ar }catch(Exception e){ - println "均价格式化错误" + println "鍧囦环鏍煎紡鍖栭敊璇�" } } return null } - //格式化成交时间 + //鏍煎紡鍖栨垚浜ゆ椂闂� public static Date formatDateStr(String dateStr){ if(StringUtils.isNotBlank(dateStr)){ dateStr = dateStr.trim(); @@ -122,7 +122,7 @@ class CopyOfQFangWangCatchAnalyBatch extends BaseBatch{ Date date = DateUtils.parseFromTightYYYYMMDD2(dateStr) return date }catch(Exception e){ - println "成交时间解析错误" + println "鎴愪氦鏃堕棿瑙f瀽閿欒" } } } @@ -131,7 +131,7 @@ class CopyOfQFangWangCatchAnalyBatch extends BaseBatch{ public static doCatch(){ - for(String city:["广州"]){ + for(String city:["骞垮窞"]){ List urls = getUrlList(city); for(String url:urls){ catchPage(url,city) @@ -140,7 +140,7 @@ class CopyOfQFangWangCatchAnalyBatch extends BaseBatch{ } /** - * 抓取列表页 + * 鎶撳彇鍒楄〃椤� */ public static void catchPage(String url,String city){ String page= getHtmlStr(url); @@ -152,7 +152,7 @@ class CopyOfQFangWangCatchAnalyBatch extends BaseBatch{ db.put("url", url); db.put("city", city); db.put("detail", page); - db.put("from", "Q房网"); + db.put("from", "Q鎴跨綉"); ORIGINAL_PAGE.save(db) if(StringUtils.isNotBlank(page)){ println url+"=========YES" @@ -166,13 +166,13 @@ class CopyOfQFangWangCatchAnalyBatch extends BaseBatch{ } /** - * 抓取详情页面 + * 鎶撳彇璇︽儏椤甸潰 * @param from */ public static void catchDetailPage(){ DBObject qu = new BasicDBObject(); - qu.put("city", "广州"); - qu.put("from", "Q房网"); + qu.put("city", "骞垮窞"); + qu.put("from", "Q鎴跨綉"); qu.put("level", "list") DBCursor dbs = ORIGINAL_PAGE.find(qu); dbs.each {DBObject db -> @@ -188,9 +188,9 @@ class CopyOfQFangWangCatchAnalyBatch extends BaseBatch{ if(hasCatch==null||StringUtils.isBlank(hasCatch.get("detail"))){ DBObject dis = new BasicDBObject(); dis.put("url", ll); - dis.put("city", "广州"); + dis.put("city", "骞垮窞"); dis.put("detail", str); - dis.put("from", "Q房网"); + dis.put("from", "Q鎴跨綉"); dis.put("level", "detail"); ORIGINAL_PAGE.save(dis) if(StringUtils.isNotBlank(str)){ @@ -208,24 +208,24 @@ class CopyOfQFangWangCatchAnalyBatch extends BaseBatch{ } - //判断是否可以入库 + //鍒ゆ柇鏄惁鍙互鍏ュ簱 public static boolean canRuKu(DBObject db){ return DealPriceUtils.isAvailableDealPrice(db) } public static void doAnaly(String from){ - for(String city:["广州"]){ + for(String city:["骞垮窞"]){ analyPage(city,from) println city } } public static analyPage(String city,String from){ - Map map = analyRegion("广州") + Map map = analyRegion("骞垮窞") DBObject qu = new BasicDBObject(); qu.put("city", city) qu.put("level", "list") - qu.put("from", "Q房网") + qu.put("from", "Q鎴跨綉") DBCursor dbs = ORIGINAL_PAGE.find(qu); dbs.each {DBObject db -> String str = db.get("detail"); @@ -246,7 +246,7 @@ class CopyOfQFangWangCatchAnalyBatch extends BaseBatch{ public static void getData(Element li,String city,Map map){ DBObject db = new BasicDBObject(); db.put("city", city) - db.put("from", "Q房网") + db.put("from", "Q鎴跨綉") if(li){ Elements p1 =li.select(".first") if(p1){ @@ -291,19 +291,19 @@ class CopyOfQFangWangCatchAnalyBatch extends BaseBatch{ db.put("region", region) } } - if(StringUtils.isNotBlank(db.get("name"))&&!("小区".equals(db.get("name").trim()))){ + if(StringUtils.isNotBlank(db.get("name"))&&!("灏忓尯".equals(db.get("name").trim()))){ ORIGINAL_DATA.save(db) println db } } } - //解析区域 + //瑙f瀽鍖哄煙 public static Map analyRegion(String city){ Map map = new HashMap(); DBObject qu = new BasicDBObject(); qu.put("city", city); - qu.put("from", "Q房网"); + qu.put("from", "Q鎴跨綉"); qu.put("level", "detail") DBCursor dbs = ORIGINAL_PAGE.find(qu); int i = 0 @@ -348,7 +348,7 @@ class CopyOfQFangWangCatchAnalyBatch extends BaseBatch{ /** - * 拼接url + * 鎷兼帴url */ public static List getUrlList(String city){ List list = new ArrayList(); @@ -410,7 +410,7 @@ class CopyOfQFangWangCatchAnalyBatch extends BaseBatch{ return str; } def static exportData(List> datas) { - ExcelUtils.write("D:\\hbl\\tmp\\中国司法拍卖.xlsx", datas, "Sheet1") + ExcelUtils.write("D:\\hbl\\tmp\\涓浗鍙告硶鎷嶅崠.xlsx", datas, "Sheet1") } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/ErShouMaiTianZaiXianCatchAnalyBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/ErShouMaiTianZaiXianCatchAnalyBatch.groovy index c78b69913..5623ddb7c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/ErShouMaiTianZaiXianCatchAnalyBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/ErShouMaiTianZaiXianCatchAnalyBatch.groovy @@ -27,7 +27,7 @@ import com.mongodb.DBCursor import com.mongodb.DBObject /** - * 抓取拍卖网站 + * 鎶撳彇鎷嶅崠缃戠珯 * @author hubingliang * */ @@ -37,8 +37,8 @@ class ErShouMaiTianZaiXianCatchAnalyBatch extends BaseBatch{ public static final DBCollection ORIGINAL_DATA = MongoUtils.getCollectionByName("gaode_poi", "original_data", "192.168.0.61", 27017) public static final DBCollection xf_lou_dong = MongoUtils.getCollectionByName("gaode_poi", "loudong3", "192.168.0.61", 27017) public static final DBCollection xf_fang_hao = MongoUtils.getCollectionByName("gaode_poi", "fanghao3", "192.168.0.61", 27017) - public static def cityMap=["北京":"bj", "厦门":"xm","福州":"fz"] - public static def pageSize=["北京":106, "厦门":189, "福州":268] + public static def cityMap=["鍖椾含":"bj", "鍘﹂棬":"xm","绂忓窞":"fz"] + public static def pageSize=["鍖椾含":106, "鍘﹂棬":189, "绂忓窞":268] static main(args) { def s = System.currentTimeMillis() runBatch(new ErShouMaiTianZaiXianCatchAnalyBatch(), args) @@ -50,11 +50,11 @@ class ErShouMaiTianZaiXianCatchAnalyBatch extends BaseBatch{ public static void doAll(){ doCatch() //doAnaly() - //doRuKu("绍兴E网") + //doRuKu("缁嶅叴E缃�") } public static doCatch(){ - for(String city:["福州"]){ + for(String city:["绂忓窞"]){ List urls = getUrlList(city); for(String url:urls){ catchPage(url,city) @@ -79,7 +79,7 @@ class ErShouMaiTianZaiXianCatchAnalyBatch extends BaseBatch{ saveFangHao(city, region, name, houseNumber, unitNumber, roomNumber, area,from,estateType) } } - //格式化单元号 + //鏍煎紡鍖栧崟鍏冨彿 public static String formatUnitNum(String unitNum){ if(StringUtils.isNotBlank(unitNum)){ unitNum = CNNMFilter.convertCnNumber(unitNum); @@ -89,7 +89,7 @@ class ErShouMaiTianZaiXianCatchAnalyBatch extends BaseBatch{ } return null; } - //房号解析入房号库 + //鎴垮彿瑙f瀽鍏ユ埧鍙峰簱 public static void saveFangHao(String city,String region,String name,String house_num,String unit_num,String room_num,Double area,String from,String type){ HouseLoudong houseLoudng = new HouseLoudong(); houseLoudng.city = city @@ -129,7 +129,7 @@ class ErShouMaiTianZaiXianCatchAnalyBatch extends BaseBatch{ } } - //楼栋解析入线下库 + //妤兼爧瑙f瀽鍏ョ嚎涓嬪簱 public static void louDongRuKu(String city,String region,String name,String houseNumber,String unitNumber,String from,String type){ List fromList = new ArrayList(); fromList.add(from) @@ -145,7 +145,7 @@ class ErShouMaiTianZaiXianCatchAnalyBatch extends BaseBatch{ loudong.put("unit_num","--"); } if(StringUtils.isNotBlank(type)){ - if("住宅".equals(type)){ + if("浣忓畢".equals(type)){ loudong.put("type","district"); } } @@ -181,11 +181,11 @@ class ErShouMaiTianZaiXianCatchAnalyBatch extends BaseBatch{ } - //判断是否可以入库 + //鍒ゆ柇鏄惁鍙互鍏ュ簱 public static boolean canRuKu(DBObject db){ return DealPriceUtils.isAvailableDealPrice(db) } - //解析地址中的楼栋单元房号 + //瑙f瀽鍦板潃涓殑妤兼爧鍗曞厓鎴垮彿 public static Map addressAnaly(String address){ Map map = new HashMap(); String houseNumber = null; @@ -194,21 +194,21 @@ class ErShouMaiTianZaiXianCatchAnalyBatch extends BaseBatch{ if(StringUtils.isNotBlank(address)){ String str = null if(StringUtils.isBlank(str)){ - str = formatByFirstPattern(address, "\\w+幢.{1,2}单元\\w+(室|)") + str = formatByFirstPattern(address, "\\w+骞�.{1,2}鍗曞厓\\w+(瀹)") if(StringUtils.isNotBlank(str)){ - houseNumber = formatByFirstPattern(str,"\\w+幢").replaceAll("幢", "") - String unitStr = formatByFirstPattern(str,"幢.{1,2}单元"); + houseNumber = formatByFirstPattern(str,"\\w+骞�").replaceAll("骞�", "") + String unitStr = formatByFirstPattern(str,"骞�.{1,2}鍗曞厓"); if(StringUtils.isNotBlank(unitStr)){ - unitNumber = replaceList(unitStr,["幢","单元"]) + unitNumber = replaceList(unitStr,["骞�","鍗曞厓"]) } - roomNumber = formatByFirstPattern(str,"单元\\w+").replaceAll("单元", "") + roomNumber = formatByFirstPattern(str,"鍗曞厓\\w+").replaceAll("鍗曞厓", "") } } if(StringUtils.isBlank(str)){ - str = formatByFirstPattern(address, "\\w+幢\\w+(室)") + str = formatByFirstPattern(address, "\\w+骞\w+(瀹�)") if(StringUtils.isNotBlank(str)){ - houseNumber = formatByFirstPattern(str,"\\w+幢").replaceAll("幢", "") - roomNumber = formatByFirstPattern(str,"幢\\w+").replaceAll("幢", "") + houseNumber = formatByFirstPattern(str,"\\w+骞�").replaceAll("骞�", "") + roomNumber = formatByFirstPattern(str,"骞\w+").replaceAll("骞�", "") } } if(StringUtils.isBlank(str)){ @@ -229,9 +229,9 @@ class ErShouMaiTianZaiXianCatchAnalyBatch extends BaseBatch{ } } if(StringUtils.isBlank(str)){ - str = formatByFirstPattern(address, "\\d+号") + str = formatByFirstPattern(address, "\\d+鍙�") if(StringUtils.isNotBlank(str)){ - roomNumber = str.replaceAll("号", "") + roomNumber = str.replaceAll("鍙�", "") } } } @@ -248,7 +248,7 @@ class ErShouMaiTianZaiXianCatchAnalyBatch extends BaseBatch{ Double size = Double.valueOf(area); return size }catch(Exception e){ - println "面积解析错误" + println "闈㈢Н瑙f瀽閿欒" } } return null; @@ -261,7 +261,7 @@ class ErShouMaiTianZaiXianCatchAnalyBatch extends BaseBatch{ if(RegionData.isRegion(city, re)){ return re; }else{ - return "越城"; + return "瓒婂煄"; } } return null; @@ -271,7 +271,7 @@ class ErShouMaiTianZaiXianCatchAnalyBatch extends BaseBatch{ public static void doAnaly(){ - for(String city:["绍兴"]){ + for(String city:["缁嶅叴"]){ analyPage(city) println city } @@ -339,7 +339,7 @@ class ErShouMaiTianZaiXianCatchAnalyBatch extends BaseBatch{ /** - * 拼接url + * 鎷兼帴url */ public static List getUrlList(String city){ List list = new ArrayList(); @@ -364,7 +364,7 @@ class ErShouMaiTianZaiXianCatchAnalyBatch extends BaseBatch{ } /** - * 抓取页面 + * 鎶撳彇椤甸潰 */ public static void catchPage(String url,String city){ String cityEasy = cityMap.get(city) @@ -382,7 +382,7 @@ class ErShouMaiTianZaiXianCatchAnalyBatch extends BaseBatch{ db.put("url", herf); db.put("city", city); db.put("detail", str); - db.put("from", "麦田在线"); + db.put("from", "楹︾敯鍦ㄧ嚎"); ORIGINAL_PAGE.save(db) if(StringUtils.isNotBlank(str)){ println herf+"=========YES" @@ -448,7 +448,7 @@ class ErShouMaiTianZaiXianCatchAnalyBatch extends BaseBatch{ return str; } def static exportData(List> datas) { - ExcelUtils.write("D:\\hbl\\tmp\\中国司法拍卖.xlsx", datas, "Sheet1") + ExcelUtils.write("D:\\hbl\\tmp\\涓浗鍙告硶鎷嶅崠.xlsx", datas, "Sheet1") } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/ErShouShaoXingECatchAnalyBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/ErShouShaoXingECatchAnalyBatch.groovy index 8a66b48be..db1432b1c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/ErShouShaoXingECatchAnalyBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/ErShouShaoXingECatchAnalyBatch.groovy @@ -27,7 +27,7 @@ import com.mongodb.DBCursor import com.mongodb.DBObject /** - * 抓取拍卖网站 + * 鎶撳彇鎷嶅崠缃戠珯 * @author hubingliang * */ @@ -38,7 +38,7 @@ class ErShouShaoXingECatchAnalyBatch extends BaseBatch{ public static final DBCollection deal_price = MongoUtils.getCollectionByName("fangjia", "deal_price_hu", "192.168.0.136", 27017) public static final DBCollection xf_lou_dong = MongoUtils.getCollectionByName("gaode_poi", "loudong3", "192.168.0.61", 27017) public static final DBCollection xf_fang_hao = MongoUtils.getCollectionByName("gaode_poi", "fanghao3", "192.168.0.61", 27017) - public static def regionMap=["一":"1", "二":"2"] + public static def regionMap=["涓�":"1", "浜�":"2"] static main(args) { def s = System.currentTimeMillis() runBatch(new ErShouShaoXingECatchAnalyBatch(), args) @@ -50,13 +50,13 @@ class ErShouShaoXingECatchAnalyBatch extends BaseBatch{ public static void doAll(){ //doCatch() //doAnaly() - doRuKu("绍兴E网") + doRuKu("缁嶅叴E缃�") } public static doCatch(){ - List urls = getUrlList("绍兴"); + List urls = getUrlList("缁嶅叴"); for(String url:urls){ - catchPage(url,"绍兴") + catchPage(url,"缁嶅叴") } } @@ -77,7 +77,7 @@ class ErShouShaoXingECatchAnalyBatch extends BaseBatch{ saveFangHao(city, region, name, houseNumber, unitNumber, roomNumber, area,from,estateType) } } - //格式化单元号 + //鏍煎紡鍖栧崟鍏冨彿 public static String formatUnitNum(String unitNum){ if(StringUtils.isNotBlank(unitNum)){ unitNum = CNNMFilter.convertCnNumber(unitNum); @@ -87,7 +87,7 @@ class ErShouShaoXingECatchAnalyBatch extends BaseBatch{ } return null; } - //房号解析入房号库 + //鎴垮彿瑙f瀽鍏ユ埧鍙峰簱 public static void saveFangHao(String city,String region,String name,String house_num,String unit_num,String room_num,Double area,String from,String type){ HouseLoudong houseLoudng = new HouseLoudong(); houseLoudng.city = city @@ -127,7 +127,7 @@ class ErShouShaoXingECatchAnalyBatch extends BaseBatch{ } } - //楼栋解析入线下库 + //妤兼爧瑙f瀽鍏ョ嚎涓嬪簱 public static void louDongRuKu(String city,String region,String name,String houseNumber,String unitNumber,String from,String type){ List fromList = new ArrayList(); fromList.add(from) @@ -143,7 +143,7 @@ class ErShouShaoXingECatchAnalyBatch extends BaseBatch{ loudong.put("unit_num","--"); } if(StringUtils.isNotBlank(type)){ - if("住宅".equals(type)){ + if("浣忓畢".equals(type)){ loudong.put("type","district"); } } @@ -179,11 +179,11 @@ class ErShouShaoXingECatchAnalyBatch extends BaseBatch{ } - //判断是否可以入库 + //鍒ゆ柇鏄惁鍙互鍏ュ簱 public static boolean canRuKu(DBObject db){ return DealPriceUtils.isAvailableDealPrice(db) } - //解析地址中的楼栋单元房号 + //瑙f瀽鍦板潃涓殑妤兼爧鍗曞厓鎴垮彿 public static Map addressAnaly(String address){ Map map = new HashMap(); String houseNumber = null; @@ -192,21 +192,21 @@ class ErShouShaoXingECatchAnalyBatch extends BaseBatch{ if(StringUtils.isNotBlank(address)){ String str = null if(StringUtils.isBlank(str)){ - str = formatByFirstPattern(address, "\\w+幢.{1,2}单元\\w+(室|)") + str = formatByFirstPattern(address, "\\w+骞�.{1,2}鍗曞厓\\w+(瀹)") if(StringUtils.isNotBlank(str)){ - houseNumber = formatByFirstPattern(str,"\\w+幢").replaceAll("幢", "") - String unitStr = formatByFirstPattern(str,"幢.{1,2}单元"); + houseNumber = formatByFirstPattern(str,"\\w+骞�").replaceAll("骞�", "") + String unitStr = formatByFirstPattern(str,"骞�.{1,2}鍗曞厓"); if(StringUtils.isNotBlank(unitStr)){ - unitNumber = replaceList(unitStr,["幢","单元"]) + unitNumber = replaceList(unitStr,["骞�","鍗曞厓"]) } - roomNumber = formatByFirstPattern(str,"单元\\w+").replaceAll("单元", "") + roomNumber = formatByFirstPattern(str,"鍗曞厓\\w+").replaceAll("鍗曞厓", "") } } if(StringUtils.isBlank(str)){ - str = formatByFirstPattern(address, "\\w+幢\\w+(室)") + str = formatByFirstPattern(address, "\\w+骞\w+(瀹�)") if(StringUtils.isNotBlank(str)){ - houseNumber = formatByFirstPattern(str,"\\w+幢").replaceAll("幢", "") - roomNumber = formatByFirstPattern(str,"幢\\w+").replaceAll("幢", "") + houseNumber = formatByFirstPattern(str,"\\w+骞�").replaceAll("骞�", "") + roomNumber = formatByFirstPattern(str,"骞\w+").replaceAll("骞�", "") } } if(StringUtils.isBlank(str)){ @@ -227,9 +227,9 @@ class ErShouShaoXingECatchAnalyBatch extends BaseBatch{ } } if(StringUtils.isBlank(str)){ - str = formatByFirstPattern(address, "\\d+号") + str = formatByFirstPattern(address, "\\d+鍙�") if(StringUtils.isNotBlank(str)){ - roomNumber = str.replaceAll("号", "") + roomNumber = str.replaceAll("鍙�", "") } } } @@ -246,7 +246,7 @@ class ErShouShaoXingECatchAnalyBatch extends BaseBatch{ Double size = Double.valueOf(area); return size }catch(Exception e){ - println "面积解析错误" + println "闈㈢Н瑙f瀽閿欒" } } return null; @@ -259,7 +259,7 @@ class ErShouShaoXingECatchAnalyBatch extends BaseBatch{ if(RegionData.isRegion(city, re)){ return re; }else{ - return "越城"; + return "瓒婂煄"; } } return null; @@ -269,7 +269,7 @@ class ErShouShaoXingECatchAnalyBatch extends BaseBatch{ public static void doAnaly(){ - for(String city:["绍兴"]){ + for(String city:["缁嶅叴"]){ analyPage(city) println city } @@ -337,7 +337,7 @@ class ErShouShaoXingECatchAnalyBatch extends BaseBatch{ /** - * 拼接url + * 鎷兼帴url */ public static List getUrlList(String city){ List list = new ArrayList(); @@ -360,7 +360,7 @@ class ErShouShaoXingECatchAnalyBatch extends BaseBatch{ } /** - * 抓取页面 + * 鎶撳彇椤甸潰 */ public static void catchPage(String url,String city){ DBObject qu = new BasicDBObject(); @@ -422,7 +422,7 @@ class ErShouShaoXingECatchAnalyBatch extends BaseBatch{ return str; } def static exportData(List> datas) { - ExcelUtils.write("D:\\hbl\\tmp\\中国司法拍卖.xlsx", datas, "Sheet1") + ExcelUtils.write("D:\\hbl\\tmp\\涓浗鍙告硶鎷嶅崠.xlsx", datas, "Sheet1") } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/ExportHouseHoldProblenBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/ExportHouseHoldProblenBatch.groovy index fc7b4305c..a0d16f0b6 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/ExportHouseHoldProblenBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/ExportHouseHoldProblenBatch.groovy @@ -10,7 +10,7 @@ import com.mongodb.DBCollection import com.mongodb.DBObject /** - * 导出全国小区中停车位数大于户数的小区 + * 瀵煎嚭鍏ㄥ浗灏忓尯涓仠杞︿綅鏁板ぇ浜庢埛鏁扮殑灏忓尯 */ class ExportHouseHoldProblenBatch { @@ -24,7 +24,7 @@ class ExportHouseHoldProblenBatch { List citys = OwnUtils.getCitys(); for(String city :citys){ println city - if(!("全国".equals(city))){ + if(!("鍏ㄥ浗".equals(city))){ List diss = getDistrictData(city) List> list = getProblemDis(diss) if(list!=null&&list.size()>0){ @@ -34,7 +34,7 @@ class ExportHouseHoldProblenBatch { } } } - exportData("全国",ls) + exportData("鍏ㄥ浗",ls) } def static exportData(String city,List> datas) { ExcelUtils.write("D:\\hbl\\Data\\"+city+".xlsx", datas, "Sheet1") @@ -82,7 +82,7 @@ class ExportHouseHoldProblenBatch { } /** - * 获取城市的小区 + * 鑾峰彇鍩庡競鐨勫皬鍖� * @param city * @return */ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/FangWangAnalySaleDataBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/FangWangAnalySaleDataBatch.groovy index a8576c205..51e108348 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/FangWangAnalySaleDataBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/FangWangAnalySaleDataBatch.groovy @@ -23,7 +23,7 @@ class FangWangAnalySaleDataBatch { public static final DBCollection SALE_DATA_RESOURCE = MongoUtils.getCollectionByName("hu_temp", "sale_data_fangwang", "192.168.0.136", 27017) public static final DBCollection SALE_DATA_STAT = MongoUtils.getCollectionByName("hu_temp", "sale_data_stat", "192.168.0.136", 27017) static main(args) { - saleData("广州"); + saleData("骞垮窞"); } public static void saleData(String city){ @@ -53,25 +53,25 @@ class FangWangAnalySaleDataBatch { if(region==null){ continue; } - String houseNumStr = db.get("house_num");//出售数量 + String houseNumStr = db.get("house_num");//鍑哄敭鏁伴噺 int houseNum = toInt(houseNumStr); if(houseNum<=0){ continue; } - String totalSizeStr = db.get("total_size");//出售总面积 + String totalSizeStr = db.get("total_size");//鍑哄敭鎬婚潰绉� Integer totalSize=null; if(toInt(totalSizeStr)>=0){ totalSize=toInt(totalSizeStr); } - String totalPriceStr = db.get("total_price");//总价格 + String totalPriceStr = db.get("total_price");//鎬讳环鏍� Long totalPrice = null; if(toLong(totalPriceStr)>=0){ totalPrice = toLong(totalPriceStr); } - String avgPriceStr =db.get("avg_price");//均价 + String avgPriceStr =db.get("avg_price");//鍧囦环 Integer avgPrice = null; if(toInt(avgPriceStr)>=0){ avgPrice = toInt(avgPriceStr); @@ -96,7 +96,7 @@ class FangWangAnalySaleDataBatch { d.put("total_price",totalPrice); d.put("avg_price",avgPrice); d.put("date",getDate(db.get("date"))); - d.put("resource","房王") + d.put("resource","鎴跨帇") cUData.add(d); break; } @@ -114,7 +114,7 @@ class FangWangAnalySaleDataBatch { d.put("total_price",totalPrice); d.put("avg_price",avgPrice); d.put("date",getDate(db.get("date"))); - d.put("resource","房王") + d.put("resource","鎴跨帇") cUData.add(d); noMatchList.add(d); } @@ -134,7 +134,7 @@ class FangWangAnalySaleDataBatch { /** - * 获取城市的小区 + * 鑾峰彇鍩庡競鐨勫皬鍖� * @param city * @return */ @@ -186,7 +186,7 @@ class FangWangAnalySaleDataBatch { return parseInt; } - //导出excel未匹配小区 + //瀵煎嚭excel鏈尮閰嶅皬鍖� public static void noMatchDate(List list,String city){ List> excelList = new ArrayList>(); for(int i=0;i spellMap = null; - //存放生僻字和其拼音的Map + //瀛樻斁鐢熷兓瀛楀拰鍏舵嫾闊崇殑Map private static Map uncommonWordsMap = null; static { @@ -39,7 +39,7 @@ class HanYuPingYingUtils{ private CnToSpell1() {} /** - * 初始化 + * 鍒濆鍖� */ private static void initialize() { spellMap.put("'a", -20319); @@ -441,9 +441,9 @@ class HanYuPingYingUtils{ } /** - * 添加生僻字 - * @param cnWord 生僻字 - * @param spell 生僻字的拼音, 如果拼音以 a, o ,e 开头, 请将开头分别改为 'a, 'o, 'e, 如:安('an) + * 娣诲姞鐢熷兓瀛� + * @param cnWord 鐢熷兓瀛� + * @param spell 鐢熷兓瀛楃殑鎷奸煶, 濡傛灉鎷奸煶浠� a, o ,e 寮�澶达紝 璇峰皢寮�澶村垎鍒敼涓� 'a, 'o, 'e锛� 濡傦細瀹�('an) */ public static void putUncommonWord(String cnWord, String spell){ char word = (char)cnWord; @@ -451,170 +451,170 @@ class HanYuPingYingUtils{ } /** - * 初始化生僻字 + * 鍒濆鍖栫敓鍍诲瓧 */ private static void initUncommonWords(){ - putUncommonWord('奡', "ao"); - putUncommonWord('灞', "ba"); - putUncommonWord('犇', "ben"); - putUncommonWord('猋', "biao"); - putUncommonWord('骉', "biao"); - putUncommonWord('杈', "cha"); - putUncommonWord('棽', "chen"); - putUncommonWord('琤', "cheng"); - putUncommonWord('魑', "chi"); - putUncommonWord('蟲', "chong"); - putUncommonWord('翀', "chong"); - putUncommonWord('麤', "cu"); - putUncommonWord('毳', "cui"); - putUncommonWord('昉', "fang"); - putUncommonWord('沣', "feng"); - putUncommonWord('玽', "gou"); - putUncommonWord('焓', "han"); - putUncommonWord('琀', "han"); - putUncommonWord('晗', "han"); - putUncommonWord('浛', "han"); - putUncommonWord('翮', "he"); - putUncommonWord('翯', "he"); - putUncommonWord('嬛', "huan"); - putUncommonWord('翙', "hui"); - putUncommonWord('劼', "jie"); - putUncommonWord('璟', "jing"); - putUncommonWord('誩', "jing"); - putUncommonWord('競', "jing"); - putUncommonWord('焜', "kun"); - putUncommonWord('琨', "kun"); - putUncommonWord('鹍', "kun"); - putUncommonWord('骊', "li"); - putUncommonWord('鎏', "liu"); - putUncommonWord('嫚', "man"); - putUncommonWord('槑', "mei"); - putUncommonWord('淼', "miao"); - putUncommonWord('婻', "nan"); - putUncommonWord('暔', "nan"); - putUncommonWord('甯', "ning"); - putUncommonWord('寗', "ning"); - putUncommonWord('掱', "pa"); - putUncommonWord('玭', "pi"); - putUncommonWord('汧', "qian"); - putUncommonWord('骎', "qin"); - putUncommonWord('甠', "qing"); - putUncommonWord('暒', "qing"); - putUncommonWord('凊', "qing"); - putUncommonWord('郬', "qing"); - putUncommonWord('靘', "qing"); - putUncommonWord('悫', "que"); - putUncommonWord('慤', "que"); - putUncommonWord('瑢', "rong"); - putUncommonWord('珅', "shen"); - putUncommonWord('屾', "shen"); - putUncommonWord('燊', "shen"); - putUncommonWord('焺', "sheng"); - putUncommonWord('珄', "sheng"); - putUncommonWord('晟', "sheng"); - putUncommonWord('昇', "sheng"); - putUncommonWord('眚', "sheng"); - putUncommonWord('湦', "sheng"); - putUncommonWord('陹', "sheng"); - putUncommonWord('竔', "sheng"); - putUncommonWord('琞', "sheng"); - putUncommonWord('湜', "shi"); - putUncommonWord('甦', "su"); - putUncommonWord('弢', "tao"); - putUncommonWord('瑱', "tian"); - putUncommonWord('仝', "tong"); - putUncommonWord('烓', "wei"); - putUncommonWord('炜', "wei"); - putUncommonWord('玮', "wei"); - putUncommonWord('沕', "wu"); - putUncommonWord('邬', "wu"); - putUncommonWord('晞', "xi"); - putUncommonWord('顕', "xian"); - putUncommonWord('婋', "xiao"); - putUncommonWord('虓', "xiao"); - putUncommonWord('筱', "xiao"); - putUncommonWord('勰', "xie"); - putUncommonWord('忻', "xin"); - putUncommonWord('庥', "xiu"); - putUncommonWord('媭', "xu"); - putUncommonWord('珝', "xu"); - putUncommonWord('昫', "xu"); - putUncommonWord('烜', "xuan"); - putUncommonWord('煊', "xuan"); - putUncommonWord('翾', "xuan"); - putUncommonWord('昍', "xuan"); - putUncommonWord('暄', "xuan"); - putUncommonWord('娅', "ya"); - putUncommonWord('琰', "yan"); - putUncommonWord('妍', "yan"); - putUncommonWord('焱', "yan"); - putUncommonWord('玚', "yang"); - putUncommonWord('旸', "yang"); - putUncommonWord('飏', "yang"); - putUncommonWord('垚', "yao"); - putUncommonWord('峣', "yao"); - putUncommonWord('怡', "yi"); - putUncommonWord('燚', "yi"); - putUncommonWord('晹', "yi"); - putUncommonWord('祎', "yi"); - putUncommonWord('瑛', "ying"); - putUncommonWord('煐', "ying"); - putUncommonWord('媖', "ying"); - putUncommonWord('暎', "ying"); - putUncommonWord('滢', "ying"); - putUncommonWord('锳', "ying"); - putUncommonWord('莜', "you"); - putUncommonWord('昱', "yu"); - putUncommonWord('沄', "yun"); - putUncommonWord('晢', "zhe"); - putUncommonWord('喆', "zhe"); - putUncommonWord('臸', "zhi"); + putUncommonWord('濂�', "ao"); + putUncommonWord('鐏�', "ba"); + putUncommonWord('鐘�', "ben"); + putUncommonWord('鐚�', "biao"); + putUncommonWord('楠�', "biao"); + putUncommonWord('鏉�', "cha"); + putUncommonWord('妫�', "chen"); + putUncommonWord('鐞�', "cheng"); + putUncommonWord('榄�', "chi"); + putUncommonWord('锜�', "chong"); + putUncommonWord('缈�', "chong"); + putUncommonWord('楹�', "cu"); + putUncommonWord('姣�', "cui"); + putUncommonWord('鏄�', "fang"); + putUncommonWord('娌�', "feng"); + putUncommonWord('鐜�', "gou"); + putUncommonWord('鐒�', "han"); + putUncommonWord('鐞�', "han"); + putUncommonWord('鏅�', "han"); + putUncommonWord('娴�', "han"); + putUncommonWord('缈�', "he"); + putUncommonWord('缈�', "he"); + putUncommonWord('瀣�', "huan"); + putUncommonWord('缈�', "hui"); + putUncommonWord('鍔�', "jie"); + putUncommonWord('鐠�', "jing"); + putUncommonWord('瑾�', "jing"); + putUncommonWord('绔�', "jing"); + putUncommonWord('鐒�', "kun"); + putUncommonWord('鐞�', "kun"); + putUncommonWord('楣�', "kun"); + putUncommonWord('楠�', "li"); + putUncommonWord('閹�', "liu"); + putUncommonWord('瀚�', "man"); + putUncommonWord('妲�', "mei"); + putUncommonWord('娣�', "miao"); + putUncommonWord('濠�', "nan"); + putUncommonWord('鏆�', "nan"); + putUncommonWord('鐢�', "ning"); + putUncommonWord('瀵�', "ning"); + putUncommonWord('鎺�', "pa"); + putUncommonWord('鐜�', "pi"); + putUncommonWord('姹�', "qian"); + putUncommonWord('楠�', "qin"); + putUncommonWord('鐢�', "qing"); + putUncommonWord('鏆�', "qing"); + putUncommonWord('鍑�', "qing"); + putUncommonWord('閮�', "qing"); + putUncommonWord('闈�', "qing"); + putUncommonWord('鎮�', "que"); + putUncommonWord('鎱�', "que"); + putUncommonWord('鐟�', "rong"); + putUncommonWord('鐝�', "shen"); + putUncommonWord('灞�', "shen"); + putUncommonWord('鐕�', "shen"); + putUncommonWord('鐒�', "sheng"); + putUncommonWord('鐝�', "sheng"); + putUncommonWord('鏅�', "sheng"); + putUncommonWord('鏄�', "sheng"); + putUncommonWord('鐪�', "sheng"); + putUncommonWord('婀�', "sheng"); + putUncommonWord('闄�', "sheng"); + putUncommonWord('绔�', "sheng"); + putUncommonWord('鐞�', "sheng"); + putUncommonWord('婀�', "shi"); + putUncommonWord('鐢�', "su"); + putUncommonWord('寮�', "tao"); + putUncommonWord('鐟�', "tian"); + putUncommonWord('浠�', "tong"); + putUncommonWord('鐑�', "wei"); + putUncommonWord('鐐�', "wei"); + putUncommonWord('鐜�', "wei"); + putUncommonWord('娌�', "wu"); + putUncommonWord('閭�', "wu"); + putUncommonWord('鏅�', "xi"); + putUncommonWord('椤�', "xian"); + putUncommonWord('濠�', "xiao"); + putUncommonWord('铏�', "xiao"); + putUncommonWord('绛�', "xiao"); + putUncommonWord('鍕�', "xie"); + putUncommonWord('蹇�', "xin"); + putUncommonWord('搴�', "xiu"); + putUncommonWord('濯�', "xu"); + putUncommonWord('鐝�', "xu"); + putUncommonWord('鏄�', "xu"); + putUncommonWord('鐑�', "xuan"); + putUncommonWord('鐓�', "xuan"); + putUncommonWord('缈�', "xuan"); + putUncommonWord('鏄�', "xuan"); + putUncommonWord('鏆�', "xuan"); + putUncommonWord('濞�', "ya"); + putUncommonWord('鐞�', "yan"); + putUncommonWord('濡�', "yan"); + putUncommonWord('鐒�', "yan"); + putUncommonWord('鐜�', "yang"); + putUncommonWord('鏃�', "yang"); + putUncommonWord('椋�', "yang"); + putUncommonWord('鍨�', "yao"); + putUncommonWord('宄�', "yao"); + putUncommonWord('鎬�', "yi"); + putUncommonWord('鐕�', "yi"); + putUncommonWord('鏅�', "yi"); + putUncommonWord('绁�', "yi"); + putUncommonWord('鐟�', "ying"); + putUncommonWord('鐓�', "ying"); + putUncommonWord('濯�', "ying"); + putUncommonWord('鏆�', "ying"); + putUncommonWord('婊�', "ying"); + putUncommonWord('閿�', "ying"); + putUncommonWord('鑾�', "you"); + putUncommonWord('鏄�', "yu"); + putUncommonWord('娌�', "yun"); + putUncommonWord('鏅�', "zhe"); + putUncommonWord('鍠�', "zhe"); + putUncommonWord('鑷�', "zhi"); } /** - * 获得单个汉字的Ascii. - * @param cn 汉字字符 - * @return 汉字对应的 ascii, 错误时返回 0 + * 鑾峰緱鍗曚釜姹夊瓧鐨凙scii. + * @param cn 姹夊瓧瀛楃 + * @return 姹夊瓧瀵瑰簲鐨� ascii, 閿欒鏃惰繑鍥� 0 */ public static int getCnAscii(char cn) { byte[] bytes = (String.valueOf(cn)).getBytes(); - if (bytes == null || bytes.length == 0|| bytes.length > 2 ) { // 错误 + if (bytes == null || bytes.length == 0|| bytes.length > 2 ) { // 閿欒 return 0; } - if (bytes.length == 1) { // 英文字符 + if (bytes.length == 1) { // 鑻辨枃瀛楃 return bytes[0]; } - if (bytes.length == 2) { // 中文字符 + if (bytes.length == 2) { // 涓枃瀛楃 int hightByte = 256 + bytes[0]; int lowByte = 256 + bytes[1]; - return (256 * hightByte + lowByte) - 256 * 256; //返回 ASCII + return (256 * hightByte + lowByte) - 256 * 256; //杩斿洖 ASCII } - return 0; // 错误 + return 0; // 閿欒 } /** - * 根据ASCII码到SpellMap中查找对应的拼音 + * 鏍规嵁ASCII鐮佸埌SpellMap涓煡鎵惧搴旂殑鎷奸煶 * @param ascii ASCII - * @return ascii对应的拼音, 如果ascii对应的字符为单字符,则返回对应的单字符, 如果不是单字符且在 spellMap 中没找到对应的拼音,则返回空字符串(""), + * @return ascii瀵瑰簲鐨勬嫾闊�, 濡傛灉ascii瀵瑰簲鐨勫瓧绗︿负鍗曞瓧绗︼紝鍒欒繑鍥炲搴旂殑鍗曞瓧绗�, 濡傛灉涓嶆槸鍗曞瓧绗︿笖鍦� spellMap 涓病鎵惧埌瀵瑰簲鐨勬嫾闊筹紝鍒欒繑鍥炵┖瀛楃涓�(""), */ public static String getSpellByAscii(int ascii) { - if (ascii > 0 && ascii < 160) { // 单字符 + if (ascii > 0 && ascii < 160) { // 鍗曞瓧绗� return String.valueOf((char) ascii); } - if (ascii < -20319 || ascii > -10247) { // 不知道的字符 + if (ascii < -20319 || ascii > -10247) { // 涓嶇煡閬撶殑瀛楃 return ""; } String spell = null; //key Integer asciiRang; //value - String spellPrevious = null; //用来保存上次轮循环的key - int asciiRangPrevious = -20319; //用来保存上一次循环的value + String spellPrevious = null; //鐢ㄦ潵淇濆瓨涓婃杞惊鐜殑key + int asciiRangPrevious = -20319; //鐢ㄦ潵淇濆瓨涓婁竴娆″惊鐜殑value for (Iterator it = spellMap.keySet().iterator(); it.hasNext();) { - spell = (String) it.next(); //拼音 - asciiRang = spellMap.get(spell); //拼音的ASCII + spell = (String) it.next(); //鎷奸煶 + asciiRang = spellMap.get(spell); //鎷奸煶鐨凙SCII if(asciiRang != null){ - if (ascii >= asciiRangPrevious && ascii < asciiRang) { // 区间找到, 返回对应的拼音 + if (ascii >= asciiRangPrevious && ascii < asciiRang) { // 鍖洪棿鎵惧埌, 杩斿洖瀵瑰簲鐨勬嫾闊� return (spellPrevious == null) ? spell : spellPrevious; } else { spellPrevious = spell; @@ -626,10 +626,10 @@ class HanYuPingYingUtils{ } /** - * 获取字符串的全拼或首拼,是汉字则转化为对应的拼音或拼音首字母,其它字符不进行转换 - * @param cnStr 要获取全拼或首拼的字符串 - * @param onlyFirstSpell 是否只获取首拼,为true时,只获取首拼,为false时,获取全拼 - * @return String cnStr的全拼或首拼, 如果 cnStr 为null 时, 返回"" + * 鑾峰彇瀛楃涓茬殑鍏ㄦ嫾鎴栭鎷�,鏄眽瀛楀垯杞寲涓哄搴旂殑鎷奸煶鎴栨嫾闊抽瀛楁瘝,鍏跺畠瀛楃涓嶈繘琛岃浆鎹� + * @param cnStr 瑕佽幏鍙栧叏鎷兼垨棣栨嫾鐨勫瓧绗︿覆 + * @param onlyFirstSpell 鏄惁鍙幏鍙栭鎷硷紝涓簍rue鏃讹紝鍙幏鍙栭鎷硷紝涓篺alse鏃讹紝鑾峰彇鍏ㄦ嫾 + * @return String cnStr鐨勫叏鎷兼垨棣栨嫾, 濡傛灉 cnStr 涓簄ull 鏃�, 杩斿洖"" */ public static String getSpell(String cnStr, boolean onlyFirstSpell) { if (cnStr == null) { @@ -642,15 +642,15 @@ class HanYuPingYingUtils{ int len = chars.length; for(; i < len; i++) { int ascii = getCnAscii(chars[i]); - if (ascii == 0){ //如果获取汉字的ASCII出错,则不进行转换 + if (ascii == 0){ //濡傛灉鑾峰彇姹夊瓧鐨凙SCII鍑洪敊锛屽垯涓嶈繘琛岃浆鎹� sb.append(chars[i]); }else{ - String spell = getSpellByAscii(ascii); //根据ASCII取拼音 - if(spell == null || spell.length() == 0){ //如果根据ASCII取拼音没取到,则到生僻字Map中取 + String spell = getSpellByAscii(ascii); //鏍规嵁ASCII鍙栨嫾闊� + if(spell == null || spell.length() == 0){ //濡傛灉鏍规嵁ASCII鍙栨嫾闊虫病鍙栧埌锛屽垯鍒扮敓鍍诲瓧Map涓彇 spell = uncommonWordsMap.get(chars[i]); } - if(spell == null || spell.length() == 0){ //如果没有取到对应的拼音,则不做转换,追加原字符 + if(spell == null || spell.length() == 0){ //濡傛灉娌℃湁鍙栧埌瀵瑰簲鐨勬嫾闊筹紝鍒欎笉鍋氳浆鎹紝杩藉姞鍘熷瓧绗� spell = uncommonWordsMap.get(chars[i]); }else{ if(onlyFirstSpell){ @@ -664,12 +664,12 @@ class HanYuPingYingUtils{ return sb.toString(); } public static void main(String[] args) { - String[] s = ["胡兵良 "] + String[] s = ["鑳″叺鑹� "] for(int i=0; i urls = getUrlList("上海"); + List urls = getUrlList("涓婃捣"); for(String url:urls){ - catchPage(url,"上海") + catchPage(url,"涓婃捣") } } }) fixedThreadPool.submit(new Runnable() { public void run() { - List urls = getUrlList("北京"); + List urls = getUrlList("鍖椾含"); for(String url:urls){ - catchPage(url,"北京") + catchPage(url,"鍖椾含") } } }) fixedThreadPool.submit(new Runnable() { public void run() { - List urls = getUrlList("广州"); + List urls = getUrlList("骞垮窞"); for(String url:urls){ - catchPage(url,"广州") + catchPage(url,"骞垮窞") } } }) fixedThreadPool.submit(new Runnable() { public void run() { - List urls = getUrlList("南京"); + List urls = getUrlList("鍗椾含"); for(String url:urls){ - catchPage(url,"南京") + catchPage(url,"鍗椾含") } } }) fixedThreadPool.submit(new Runnable() { public void run() { - List urls = getUrlList("宁波"); + List urls = getUrlList("瀹佹尝"); for(String url:urls){ - catchPage(url,"宁波") + catchPage(url,"瀹佹尝") } } }) fixedThreadPool.submit(new Runnable() { public void run() { - List urls = getUrlList("佛山"); + List urls = getUrlList("浣涘北"); for(String url:urls){ - catchPage(url,"佛山") + catchPage(url,"浣涘北") } } }) fixedThreadPool.submit(new Runnable() { public void run() { - List urls = getUrlList("珠海"); + List urls = getUrlList("鐝犳捣"); for(String url:urls){ - catchPage(url,"珠海") + catchPage(url,"鐝犳捣") } } }) @@ -99,7 +99,7 @@ class NewSale163Batch{ } /** - * 拼接url + * 鎷兼帴url */ public static List getUrlList(String city){ String easyCity = cityMap.get(city) @@ -127,7 +127,7 @@ class NewSale163Batch{ return map; } /** - * 抓取页面 + * 鎶撳彇椤甸潰 */ public static void catchPage(String url,String city){ DBObject qu = new BasicDBObject(); @@ -168,7 +168,7 @@ class NewSale163Batch{ return str; } def static exportData(List> datas) { - ExcelUtils.write("D:\\hbl\\tmp\\中国司法拍卖.xlsx", datas, "Sheet1") + ExcelUtils.write("D:\\hbl\\tmp\\涓浗鍙告硶鎷嶅崠.xlsx", datas, "Sheet1") } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/NewSale163CatchAnalyBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/NewSale163CatchAnalyBatch.groovy index 184d8d9e1..b99040db8 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/NewSale163CatchAnalyBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/NewSale163CatchAnalyBatch.groovy @@ -27,7 +27,7 @@ import com.mongodb.DBCursor import com.mongodb.DBObject /** - * 抓取拍卖网站 + * 鎶撳彇鎷嶅崠缃戠珯 * @author hubingliang * */ @@ -36,8 +36,8 @@ class NewSale163CatchAnalyBatch extends BaseBatch{ public static final DBCollection ONE_SIX_THREE = MongoUtils.getCollectionByName("gaode_poi", "one_three_six_sale", "192.168.0.61", 27017) public static final DBCollection ONE_SIX_THREE_DATA = MongoUtils.getCollectionByName("gaode_poi", "one_three_six_data", "192.168.0.61", 27017) public static final DBCollection SALE_DATA_STAT = MongoUtils.getCollectionByName("fangjia_base", "sale_data_stat", "192.168.0.136", 27017) - static def cityMap=["上海":"sh", "北京":"bj","广州":"gz","南京":"nj","宁波":"nb","佛山":"fs","珠海":"zh"] - public static String[] citys =["上海","北京","广州","南京","宁波","佛山","珠海"] + static def cityMap=["涓婃捣":"sh", "鍖椾含":"bj","骞垮窞":"gz","鍗椾含":"nj","瀹佹尝":"nb","浣涘北":"fs","鐝犳捣":"zh"] + public static String[] citys =["涓婃捣","鍖椾含","骞垮窞","鍗椾含","瀹佹尝","浣涘北","鐝犳捣"] public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(15) static main(args) { def s = System.currentTimeMillis() @@ -87,13 +87,13 @@ class NewSale163CatchAnalyBatch extends BaseBatch{ sd.put("not_sale_num", notSaleNum) sd.put("not_sale_size", notSaleSize) sd.put("date", date) - sd.put("resource", "网易房产") + sd.put("resource", "缃戞槗鎴夸骇") DBObject qu = new BasicDBObject(); qu.put("city", city) qu.put("region", region) qu.put("name", name) qu.put("date", date) - sd.put("resource", "网易房产") + sd.put("resource", "缃戞槗鎴夸骇") SALE_DATA_STAT.update(qu, sd, true, false) println sd } @@ -233,62 +233,62 @@ class NewSale163CatchAnalyBatch extends BaseBatch{ public static doCatch(String month){ fixedThreadPool.submit(new Runnable() { public void run() { - List urls = getUrlList("上海",month); + List urls = getUrlList("涓婃捣",month); for(String url:urls){ - catchPage(url,"上海") + catchPage(url,"涓婃捣") } } }) fixedThreadPool.submit(new Runnable() { public void run() { - List urls = getUrlList("北京",month); + List urls = getUrlList("鍖椾含",month); for(String url:urls){ - catchPage(url,"北京") + catchPage(url,"鍖椾含") } } }) fixedThreadPool.submit(new Runnable() { public void run() { - List urls = getUrlList("广州",month); + List urls = getUrlList("骞垮窞",month); for(String url:urls){ - catchPage(url,"广州") + catchPage(url,"骞垮窞") } } }) fixedThreadPool.submit(new Runnable() { public void run() { - List urls = getUrlList("南京",month); + List urls = getUrlList("鍗椾含",month); for(String url:urls){ - catchPage(url,"南京") + catchPage(url,"鍗椾含") } } }) fixedThreadPool.submit(new Runnable() { public void run() { - List urls = getUrlList("宁波",month); + List urls = getUrlList("瀹佹尝",month); for(String url:urls){ - catchPage(url,"宁波") + catchPage(url,"瀹佹尝") } } }) fixedThreadPool.submit(new Runnable() { public void run() { - List urls = getUrlList("佛山",month); + List urls = getUrlList("浣涘北",month); for(String url:urls){ - catchPage(url,"佛山") + catchPage(url,"浣涘北") } } }) fixedThreadPool.submit(new Runnable() { public void run() { - List urls = getUrlList("珠海",month); + List urls = getUrlList("鐝犳捣",month); for(String url:urls){ - catchPage(url,"珠海") + catchPage(url,"鐝犳捣") } } }) @@ -297,7 +297,7 @@ class NewSale163CatchAnalyBatch extends BaseBatch{ } /** - * 拼接url + * 鎷兼帴url */ public static List getUrlList(String city,String month){ String easyCity = cityMap.get(city) @@ -324,7 +324,7 @@ class NewSale163CatchAnalyBatch extends BaseBatch{ } /** - * 抓取页面 + * 鎶撳彇椤甸潰 */ public static void catchPage(String url,String city){ DBObject qu = new BasicDBObject(); @@ -365,7 +365,7 @@ class NewSale163CatchAnalyBatch extends BaseBatch{ return null } def static exportData(List> datas) { - ExcelUtils.write("D:\\hbl\\tmp\\中国司法拍卖.xlsx", datas, "Sheet1") + ExcelUtils.write("D:\\hbl\\tmp\\涓浗鍙告硶鎷嶅崠.xlsx", datas, "Sheet1") } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/NewSale163RuKuBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/NewSale163RuKuBatch.groovy index 55d42cf07..abd37d4d2 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/NewSale163RuKuBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/NewSale163RuKuBatch.groovy @@ -16,7 +16,7 @@ import com.mongodb.DBCursor import com.mongodb.DBObject /** - * 抓取拍卖网站 + * 鎶撳彇鎷嶅崠缃戠珯 * @author hubingliang * */ @@ -29,8 +29,8 @@ class NewSale163RuKuBatch{ "201411","201412","201501","201502","201503","201504","201505","201506","201507","201508","201509","201510", "201411","201412","201601","201602","201603","201604","201605","201606","201607","201608","201609","201610", "201611","201612","201701","201702","201703"] - static def cityMap=["上海":"sh", "北京":"bj","广州":"gz","南京":"nj","宁波":"nb","佛山":"fs","珠海":"zh"] - public static String[] citys =["上海","北京","广州","南京","宁波","佛山","珠海"] + static def cityMap=["涓婃捣":"sh", "鍖椾含":"bj","骞垮窞":"gz","鍗椾含":"nj","瀹佹尝":"nb","浣涘北":"fs","鐝犳捣":"zh"] + public static String[] citys =["涓婃捣","鍖椾含","骞垮窞","鍗椾含","瀹佹尝","浣涘北","鐝犳捣"] public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(15) static main(args) { doRuKu() @@ -64,13 +64,13 @@ class NewSale163RuKuBatch{ sd.put("not_sale_num", notSaleNum) sd.put("not_sale_size", notSaleSize) sd.put("date", date) - sd.put("resource", "网易房产") + sd.put("resource", "缃戞槗鎴夸骇") DBObject qu = new BasicDBObject(); qu.put("city", city) qu.put("region", region) qu.put("name", name) qu.put("date", date) - sd.put("resource", "网易房产") + sd.put("resource", "缃戞槗鎴夸骇") SALE_DATA_STAT.update(qu, sd, true, false) println sd } @@ -134,7 +134,7 @@ class NewSale163RuKuBatch{ return null } def static exportData(List> datas) { - ExcelUtils.write("D:\\hbl\\tmp\\中国司法拍卖.xlsx", datas, "Sheet1") + ExcelUtils.write("D:\\hbl\\tmp\\涓浗鍙告硶鎷嶅崠.xlsx", datas, "Sheet1") } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/NewSaleSouHuJiaoDianAnalyBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/NewSaleSouHuJiaoDianAnalyBatch.groovy index 2caae3a83..fc94eb26e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/NewSaleSouHuJiaoDianAnalyBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/NewSaleSouHuJiaoDianAnalyBatch.groovy @@ -23,7 +23,7 @@ import com.mongodb.DBCursor import com.mongodb.DBObject /** - * 抓取拍卖网站 + * 鎶撳彇鎷嶅崠缃戠珯 * @author hubingliang * */ @@ -35,8 +35,8 @@ class NewSaleSouHuJiaoDianAnalyBatch{ "201411","201412","201501","201502","201503","201504","201505","201506","201507","201508","201509","201510", "201411","201412","201601","201602","201603","201604","201605","201606","201607","201608","201609","201610", "201611","201612","201701","201702","201703"] - static def cityMap=["广州":"gz","佛山":"fs"] - public static String[] citys =["佛山","广州"] + static def cityMap=["骞垮窞":"gz","浣涘北":"fs"] + public static String[] citys =["浣涘北","骞垮窞"] public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(15) static main(args) { //doCatch() @@ -74,13 +74,13 @@ class NewSaleSouHuJiaoDianAnalyBatch{ sd.put("not_sale_num", notSaleNum) sd.put("not_sale_size", notSaleSize) sd.put("date", date) - sd.put("resource", "搜狐焦点") + sd.put("resource", "鎼滅嫄鐒︾偣") DBObject qu = new BasicDBObject(); qu.put("city", city) qu.put("region", region) qu.put("name", name) qu.put("date", date) - sd.put("resource", "搜狐焦点") + sd.put("resource", "鎼滅嫄鐒︾偣") SALE_DATA_STAT.update(qu, sd, true, false) println sd } @@ -222,7 +222,7 @@ class NewSaleSouHuJiaoDianAnalyBatch{ db.put("noSaleNum", noSaleNum); db.put("noSaleSize", noSaleSize); db.put("date", date); - db.put("resource", "搜狐焦点") + db.put("resource", "鎼滅嫄鐒︾偣") if(StringUtils.isNotBlank(name)){ DBObject qu = new BasicDBObject(); qu.put("city", city); @@ -240,18 +240,18 @@ class NewSaleSouHuJiaoDianAnalyBatch{ public static doCatch(){ /*fixedThreadPool.submit(new Runnable() { public void run() { - List urls = getUrlList("广州"); + List urls = getUrlList("骞垮窞"); for(String url:urls){ - catchPage(url,"广州") + catchPage(url,"骞垮窞") } } })*/ fixedThreadPool.submit(new Runnable() { public void run() { - List urls = getUrlList("佛山"); + List urls = getUrlList("浣涘北"); for(String url:urls){ - catchPage(url,"佛山") + catchPage(url,"浣涘北") } } }) @@ -261,7 +261,7 @@ class NewSaleSouHuJiaoDianAnalyBatch{ } /** - * 拼接url + * 鎷兼帴url */ public static List getUrlList(String city){ String easyCity = cityMap.get(city) @@ -271,8 +271,8 @@ class NewSaleSouHuJiaoDianAnalyBatch{ String start = map.get("start") String end = map.get("end") for(int i=1;i<=50;i++){ - String url = "http://data."+easyCity+".focus.cn/ne/BuildingGrid?category=住宅&district=&name=&startDate="+start+"&endDate="+end+"&minPrice=0&maxPrice=0&sort=daily_sold_unit.desc&page="+i - if("佛山".equals(city)){ + String url = "http://data."+easyCity+".focus.cn/ne/BuildingGrid?category=浣忓畢&district=&name=&startDate="+start+"&endDate="+end+"&minPrice=0&maxPrice=0&sort=daily_sold_unit.desc&page="+i + if("浣涘北".equals(city)){ url = "http://data."+easyCity+".focus.cn/ne/BuildingGrid?category=%E4%BD%8F%E5%AE%85&district=&name=&startDate="+start+"&endDate="+end+"&minPrice=0&maxPrice=0&sort=daily_sold_unit.desc&NeZz_page="+i } list.add(url) @@ -296,7 +296,7 @@ class NewSaleSouHuJiaoDianAnalyBatch{ } /** - * 抓取页面 + * 鎶撳彇椤甸潰 */ public static void catchPage(String url,String city){ DBObject qu = new BasicDBObject(); @@ -337,7 +337,7 @@ class NewSaleSouHuJiaoDianAnalyBatch{ return null } def static exportData(List> datas) { - ExcelUtils.write("D:\\hbl\\tmp\\中国司法拍卖.xlsx", datas, "Sheet1") + ExcelUtils.write("D:\\hbl\\tmp\\涓浗鍙告硶鎷嶅崠.xlsx", datas, "Sheet1") } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/NewSaleSouHuJiaoDianBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/NewSaleSouHuJiaoDianBatch.groovy index ac8508ba3..d3b66c6d0 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/NewSaleSouHuJiaoDianBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/NewSaleSouHuJiaoDianBatch.groovy @@ -16,7 +16,7 @@ import com.mongodb.DBCollection import com.mongodb.DBObject /** - * 抓取拍卖网站 + * 鎶撳彇鎷嶅崠缃戠珯 * @author hubingliang * */ @@ -26,31 +26,31 @@ class NewSaleSouHuJiaoDianBatch{ "201411","201412","201501","201502","201503","201504","201505","201506","201507","201508","201509","201510", "201411","201412","201601","201602","201603","201604","201605","201606","201607","201608","201609","201610", "201611","201612","201701","201702","201703"] - static def cityMap=["广州":"gz","佛山":"fs"] - public static String[] citys =["广州","佛山"] + static def cityMap=["骞垮窞":"gz","浣涘北":"fs"] + public static String[] citys =["骞垮窞","浣涘北"] public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(15) static main(args) { //doCatch() - List urls = getUrlList("广州"); + List urls = getUrlList("骞垮窞"); for(String url:urls){ - catchPage(url,"广州") + catchPage(url,"骞垮窞") } } public static doCatch(){ fixedThreadPool.submit(new Runnable() { public void run() { - List urls = getUrlList("广州"); + List urls = getUrlList("骞垮窞"); for(String url:urls){ - catchPage(url,"广州") + catchPage(url,"骞垮窞") } } }) fixedThreadPool.submit(new Runnable() { public void run() { - List urls = getUrlList("佛山"); + List urls = getUrlList("浣涘北"); for(String url:urls){ - catchPage(url,"佛山") + catchPage(url,"浣涘北") } } }) @@ -59,7 +59,7 @@ class NewSaleSouHuJiaoDianBatch{ } /** - * 拼接url + * 鎷兼帴url */ public static List getUrlList(String city){ String easyCity = cityMap.get(city) @@ -69,7 +69,7 @@ class NewSaleSouHuJiaoDianBatch{ String start = map.get("start") String end = map.get("end") for(int i=1;i<=50;i++){ - String url = "http://data."+easyCity+".focus.cn/ne/BuildingGrid?category=住宅&district=&name=&startDate="+start+"&endDate="+end+"&minPrice=0&maxPrice=0&sort=daily_sold_unit.desc&page="+i + String url = "http://data."+easyCity+".focus.cn/ne/BuildingGrid?category=浣忓畢&district=&name=&startDate="+start+"&endDate="+end+"&minPrice=0&maxPrice=0&sort=daily_sold_unit.desc&page="+i list.add(url) println url } @@ -88,7 +88,7 @@ class NewSaleSouHuJiaoDianBatch{ return map; } /** - * 抓取页面 + * 鎶撳彇椤甸潰 */ public static void catchPage(String url,String city){ DBObject qu = new BasicDBObject(); @@ -129,7 +129,7 @@ class NewSaleSouHuJiaoDianBatch{ return str; } def static exportData(List> datas) { - ExcelUtils.write("D:\\hbl\\tmp\\中国司法拍卖.xlsx", datas, "Sheet1") + ExcelUtils.write("D:\\hbl\\tmp\\涓浗鍙告硶鎷嶅崠.xlsx", datas, "Sheet1") } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/NewSaleSouHuJiaoDianRuKuBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/NewSaleSouHuJiaoDianRuKuBatch.groovy index 1bbe4be36..bcbc33151 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/NewSaleSouHuJiaoDianRuKuBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/NewSaleSouHuJiaoDianRuKuBatch.groovy @@ -16,7 +16,7 @@ import com.mongodb.DBCursor import com.mongodb.DBObject /** - * 抓取拍卖网站 + * 鎶撳彇鎷嶅崠缃戠珯 * @author hubingliang * */ @@ -28,8 +28,8 @@ class NewSaleSouHuJiaoDianRuKuBatch{ "201411","201412","201501","201502","201503","201504","201505","201506","201507","201508","201509","201510", "201411","201412","201601","201602","201603","201604","201605","201606","201607","201608","201609","201610", "201611","201612","201701","201702","201703"] - static def cityMap=["广州":"gz","佛山":"fs"] - public static String[] citys =["广州","佛山"] + static def cityMap=["骞垮窞":"gz","浣涘北":"fs"] + public static String[] citys =["骞垮窞","浣涘北"] public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(15) static main(args) { doRuKu() @@ -63,13 +63,13 @@ class NewSaleSouHuJiaoDianRuKuBatch{ sd.put("not_sale_num", notSaleNum) sd.put("not_sale_size", notSaleSize) sd.put("date", date) - sd.put("resource", "搜狐焦点") + sd.put("resource", "鎼滅嫄鐒︾偣") DBObject qu = new BasicDBObject(); qu.put("city", city) qu.put("region", region) qu.put("name", name) qu.put("date", date) - sd.put("resource", "搜狐焦点") + sd.put("resource", "鎼滅嫄鐒︾偣") SALE_DATA_STAT.update(qu, sd, true, false) println sd } @@ -133,7 +133,7 @@ class NewSaleSouHuJiaoDianRuKuBatch{ return null } def static exportData(List> datas) { - ExcelUtils.write("D:\\hbl\\tmp\\中国司法拍卖.xlsx", datas, "Sheet1") + ExcelUtils.write("D:\\hbl\\tmp\\涓浗鍙告硶鎷嶅崠.xlsx", datas, "Sheet1") } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/QFangWangCatchAnalyBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/QFangWangCatchAnalyBatch.groovy index c0a0a83d1..0ee9f6dc5 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/QFangWangCatchAnalyBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/QFangWangCatchAnalyBatch.groovy @@ -26,7 +26,7 @@ import com.mongodb.DBCursor import com.mongodb.DBObject /** - * 抓取拍卖网站 + * 鎶撳彇鎷嶅崠缃戠珯 * @author hubingliang * */ @@ -36,8 +36,8 @@ class QFangWangCatchAnalyBatch extends BaseBatch{ public static final DBCollection ORIGINAL_DATA = MongoUtils.getCollectionByName("gaode_poi", "original_data", "192.168.0.61", 27017) public static final DBCollection xf_lou_dong = MongoUtils.getCollectionByName("gaode_poi", "loudong3", "192.168.0.61", 27017) public static final DBCollection xf_fang_hao = MongoUtils.getCollectionByName("gaode_poi", "fanghao3", "192.168.0.61", 27017) - public static def cityMap=["北京":"bj", "厦门":"xm","福州":"fz"] - public static def pageSize=["北京":106, "厦门":189, "福州":268] + public static def cityMap=["鍖椾含":"bj", "鍘﹂棬":"xm","绂忓窞":"fz"] + public static def pageSize=["鍖椾含":106, "鍘﹂棬":189, "绂忓窞":268] static main(args) { def s = System.currentTimeMillis() runBatch(new QFangWangCatchAnalyBatch(), args) @@ -50,11 +50,11 @@ class QFangWangCatchAnalyBatch extends BaseBatch{ //doCatch() catchDetailPage() //doAnaly() - //doRuKu("绍兴E网") + //doRuKu("缁嶅叴E缃�") } public static doCatch(){ - for(String city:["广州"]){ + for(String city:["骞垮窞"]){ List urls = getUrlList(city); for(String url:urls){ catchPage(url,city) @@ -63,7 +63,7 @@ class QFangWangCatchAnalyBatch extends BaseBatch{ } /** - * 抓取列表页 + * 鎶撳彇鍒楄〃椤� */ public static void catchPage(String url,String city){ String page= getHtmlStr(url); @@ -75,7 +75,7 @@ class QFangWangCatchAnalyBatch extends BaseBatch{ db.put("url", url); db.put("city", city); db.put("detail", page); - db.put("from", "Q房网"); + db.put("from", "Q鎴跨綉"); ORIGINAL_PAGE.save(db) if(StringUtils.isNotBlank(page)){ println url+"=========YES" @@ -89,13 +89,13 @@ class QFangWangCatchAnalyBatch extends BaseBatch{ } /** - * 抓取详情页面 + * 鎶撳彇璇︽儏椤甸潰 * @param from */ public static void catchDetailPage(){ DBObject qu = new BasicDBObject(); - qu.put("city", "广州"); - qu.put("from", "Q房网"); + qu.put("city", "骞垮窞"); + qu.put("from", "Q鎴跨綉"); qu.put("level", "list") DBCursor dbs = ORIGINAL_PAGE.find(qu); dbs.each {DBObject db -> @@ -111,9 +111,9 @@ class QFangWangCatchAnalyBatch extends BaseBatch{ String str = getHtmlStr(url); DBObject dis = new BasicDBObject(); dis.put("url", ll); - dis.put("city", "广州"); + dis.put("city", "骞垮窞"); dis.put("detail", str); - dis.put("from", "Q房网"); + dis.put("from", "Q鎴跨綉"); dis.put("level", "detail"); ORIGINAL_PAGE.save(dis) if(StringUtils.isNotBlank(str)){ @@ -149,7 +149,7 @@ class QFangWangCatchAnalyBatch extends BaseBatch{ saveFangHao(city, region, name, houseNumber, unitNumber, roomNumber, area,from,estateType) } } - //格式化单元号 + //鏍煎紡鍖栧崟鍏冨彿 public static String formatUnitNum(String unitNum){ if(StringUtils.isNotBlank(unitNum)){ unitNum = CNNMFilter.convertCnNumber(unitNum); @@ -159,7 +159,7 @@ class QFangWangCatchAnalyBatch extends BaseBatch{ } return null; } - //房号解析入房号库 + //鎴垮彿瑙f瀽鍏ユ埧鍙峰簱 public static void saveFangHao(String city,String region,String name,String house_num,String unit_num,String room_num,Double area,String from,String type){ HouseLoudong houseLoudng = new HouseLoudong(); houseLoudng.city = city @@ -199,7 +199,7 @@ class QFangWangCatchAnalyBatch extends BaseBatch{ } } - //楼栋解析入线下库 + //妤兼爧瑙f瀽鍏ョ嚎涓嬪簱 public static void louDongRuKu(String city,String region,String name,String houseNumber,String unitNumber,String from,String type){ List fromList = new ArrayList(); fromList.add(from) @@ -215,7 +215,7 @@ class QFangWangCatchAnalyBatch extends BaseBatch{ loudong.put("unit_num","--"); } if(StringUtils.isNotBlank(type)){ - if("住宅".equals(type)){ + if("浣忓畢".equals(type)){ loudong.put("type","district"); } } @@ -251,11 +251,11 @@ class QFangWangCatchAnalyBatch extends BaseBatch{ } - //判断是否可以入库 + //鍒ゆ柇鏄惁鍙互鍏ュ簱 public static boolean canRuKu(DBObject db){ return DealPriceUtils.isAvailableDealPrice(db) } - //解析地址中的楼栋单元房号 + //瑙f瀽鍦板潃涓殑妤兼爧鍗曞厓鎴垮彿 public static Map addressAnaly(String address){ Map map = new HashMap(); String houseNumber = null; @@ -264,21 +264,21 @@ class QFangWangCatchAnalyBatch extends BaseBatch{ if(StringUtils.isNotBlank(address)){ String str = null if(StringUtils.isBlank(str)){ - str = formatByFirstPattern(address, "\\w+幢.{1,2}单元\\w+(室|)") + str = formatByFirstPattern(address, "\\w+骞�.{1,2}鍗曞厓\\w+(瀹)") if(StringUtils.isNotBlank(str)){ - houseNumber = formatByFirstPattern(str,"\\w+幢").replaceAll("幢", "") - String unitStr = formatByFirstPattern(str,"幢.{1,2}单元"); + houseNumber = formatByFirstPattern(str,"\\w+骞�").replaceAll("骞�", "") + String unitStr = formatByFirstPattern(str,"骞�.{1,2}鍗曞厓"); if(StringUtils.isNotBlank(unitStr)){ - unitNumber = replaceList(unitStr,["幢","单元"]) + unitNumber = replaceList(unitStr,["骞�","鍗曞厓"]) } - roomNumber = formatByFirstPattern(str,"单元\\w+").replaceAll("单元", "") + roomNumber = formatByFirstPattern(str,"鍗曞厓\\w+").replaceAll("鍗曞厓", "") } } if(StringUtils.isBlank(str)){ - str = formatByFirstPattern(address, "\\w+幢\\w+(室)") + str = formatByFirstPattern(address, "\\w+骞\w+(瀹�)") if(StringUtils.isNotBlank(str)){ - houseNumber = formatByFirstPattern(str,"\\w+幢").replaceAll("幢", "") - roomNumber = formatByFirstPattern(str,"幢\\w+").replaceAll("幢", "") + houseNumber = formatByFirstPattern(str,"\\w+骞�").replaceAll("骞�", "") + roomNumber = formatByFirstPattern(str,"骞\w+").replaceAll("骞�", "") } } if(StringUtils.isBlank(str)){ @@ -299,9 +299,9 @@ class QFangWangCatchAnalyBatch extends BaseBatch{ } } if(StringUtils.isBlank(str)){ - str = formatByFirstPattern(address, "\\d+号") + str = formatByFirstPattern(address, "\\d+鍙�") if(StringUtils.isNotBlank(str)){ - roomNumber = str.replaceAll("号", "") + roomNumber = str.replaceAll("鍙�", "") } } } @@ -318,7 +318,7 @@ class QFangWangCatchAnalyBatch extends BaseBatch{ Double size = Double.valueOf(area); return size }catch(Exception e){ - println "面积解析错误" + println "闈㈢Н瑙f瀽閿欒" } } return null; @@ -331,7 +331,7 @@ class QFangWangCatchAnalyBatch extends BaseBatch{ if(RegionData.isRegion(city, re)){ return re; }else{ - return "越城"; + return "瓒婂煄"; } } return null; @@ -341,7 +341,7 @@ class QFangWangCatchAnalyBatch extends BaseBatch{ public static void doAnaly(String from){ - for(String city:["广州"]){ + for(String city:["骞垮窞"]){ analyPage(city,from) println city } @@ -415,7 +415,7 @@ class QFangWangCatchAnalyBatch extends BaseBatch{ /** - * 拼接url + * 鎷兼帴url */ public static List getUrlList(String city){ List list = new ArrayList(); @@ -489,7 +489,7 @@ class QFangWangCatchAnalyBatch extends BaseBatch{ return str; } def static exportData(List> datas) { - ExcelUtils.write("D:\\hbl\\tmp\\中国司法拍卖.xlsx", datas, "Sheet1") + ExcelUtils.write("D:\\hbl\\tmp\\涓浗鍙告硶鎷嶅崠.xlsx", datas, "Sheet1") } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/QinDaoChanQuanJiaoYiSuoBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/QinDaoChanQuanJiaoYiSuoBatch.groovy index b1c794a89..cd32d8b3b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/QinDaoChanQuanJiaoYiSuoBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/QinDaoChanQuanJiaoYiSuoBatch.groovy @@ -23,7 +23,7 @@ import com.mongodb.DBCursor; import com.mongodb.DBObject /** - * 抓取拍卖网站 + * 鎶撳彇鎷嶅崠缃戠珯 * @author hubingliang * */ @@ -51,7 +51,7 @@ class QinDaoChanQuanJiaoYiSuoBatch{ //println (db.get("url")) String page = db.get("detail") Document doc = Jsoup.parse(page); - //解析title + //瑙f瀽title Elements tits = doc.select(".article_title") if(tits!=null&&tits.size()>0){ for(Element tit:tits){ @@ -59,7 +59,7 @@ class QinDaoChanQuanJiaoYiSuoBatch{ println title } } - //解析标的 + //瑙f瀽鏍囩殑 List items = new ArrayList() Elements pss = doc.select(".article_con") if(pss!=null&&pss.size()>0){ @@ -74,10 +74,10 @@ class QinDaoChanQuanJiaoYiSuoBatch{ boolean start = false; for(Element p:ps){ String str = p.html(); - if(StringUtils.isNotBlank(str)&&str.contains("拍卖标的")){ + if(StringUtils.isNotBlank(str)&&str.contains("鎷嶅崠鏍囩殑")){ start = true; } - if(StringUtils.isNotBlank(str)&&str.contains("二、")){ + if(StringUtils.isNotBlank(str)&&str.contains("浜屻��")){ start = false } if(start&&StringUtils.isNotBlank(str)){ @@ -103,15 +103,15 @@ class QinDaoChanQuanJiaoYiSuoBatch{ /*public static void exportTxt(String str){ File file= new File("D:\\hbl\\tmp\\qdcq.txt"); - //使用系统默认的编码处理文件流 + //浣跨敤绯荤粺榛樿鐨勭紪鐮佸鐞嗘枃浠舵祦 file.eachLine {println it } - //指定处理流的编码 + //鎸囧畾澶勭悊娴佺殑缂栫爜 file.eachLine("utf8") {println it } - //对文件内容的每一行进行分割处理,比较常用在处理csv文件 - file.splitEachLine("拍卖标的") {println it } + //瀵规枃浠跺唴瀹圭殑姣忎竴琛岃繘琛屽垎鍓插鐞嗭紝姣旇緝甯哥敤鍦ㄥ鐞哻sv鏂囦欢 + file.splitEachLine("鎷嶅崠鏍囩殑") {println it } - //在闭包中定义过滤逻辑,对文件内容进行过滤处理 + //鍦ㄩ棴鍖呬腑瀹氫箟杩囨护閫昏緫锛屽鏂囦欢鍐呭杩涜杩囨护澶勭悊 file.filterLine {String str-> if (str.contains('code')) println str @@ -119,14 +119,14 @@ class QinDaoChanQuanJiaoYiSuoBatch{ file.append('hello world!') - //转为Writable对象,可重定向输出 + //杞负Writable瀵硅薄锛屽彲閲嶅畾鍚戣緭鍑� file.asWritable() } */ /** - * 对页面进行抓取 + * 瀵归〉闈㈣繘琛屾姄鍙� */ public static String catchPage(String url){ String str= getHtmlStr(url); @@ -202,7 +202,7 @@ class QinDaoChanQuanJiaoYiSuoBatch{ } /** - * 获取城市的小区 + * 鑾峰彇鍩庡競鐨勫皬鍖� * @param city * @return */ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/QinDaoPaiMaiZhongXinBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/QinDaoPaiMaiZhongXinBatch.groovy index 3721b41c7..96af348c6 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/QinDaoPaiMaiZhongXinBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/QinDaoPaiMaiZhongXinBatch.groovy @@ -23,7 +23,7 @@ import com.mongodb.DBCursor; import com.mongodb.DBObject /** - * 抓取拍卖网站 + * 鎶撳彇鎷嶅崠缃戠珯 * @author hubingliang * */ @@ -49,10 +49,10 @@ class QinDaoPaiMaiZhongXinBatch{ boolean start = false; for(Element p:ps){ String str = p.html(); - if(StringUtils.isNotBlank(str)&&str.contains("拍卖标的")){ + if(StringUtils.isNotBlank(str)&&str.contains("鎷嶅崠鏍囩殑")){ start = true; } - if(StringUtils.isNotBlank(str)&&str.contains("二、")){ + if(StringUtils.isNotBlank(str)&&str.contains("浜屻��")){ start = false; } if(start&&StringUtils.isNotBlank(str)){ @@ -67,7 +67,7 @@ class QinDaoPaiMaiZhongXinBatch{ } /** - * 对页面进行抓取 + * 瀵归〉闈㈣繘琛屾姄鍙� */ public static String catchPage(String url){ String str= getHtmlStr(url); @@ -143,7 +143,7 @@ class QinDaoPaiMaiZhongXinBatch{ } /** - * 获取城市的小区 + * 鑾峰彇鍩庡競鐨勫皬鍖� * @param city * @return */ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/QinDaoYiHenPaiMaiBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/QinDaoYiHenPaiMaiBatch.groovy index c750cae58..1422b7335 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/QinDaoYiHenPaiMaiBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/QinDaoYiHenPaiMaiBatch.groovy @@ -24,7 +24,7 @@ import com.mongodb.DBCursor import com.mongodb.DBObject /** - * 抓取拍卖网站 + * 鎶撳彇鎷嶅崠缃戠珯 * @author hubingliang * */ @@ -44,12 +44,12 @@ class QinDaoYiHenPaiMaiBatch{ ls.each{String str-> Map map = getHouseInfoStr(str) String addressInfo = map.get("addressInfo"); - addressInfo = getFrontStr(addressInfo,"户"); - addressInfo = getFrontStr(addressInfo,"房产"); - addressInfo = getFrontStr(addressInfo,"房屋"); - addressInfo = getFrontStr(addressInfo,"网点"); - addressInfo = getFrontStr(addressInfo,"房地产"); - if(addressInfo!=null&&!addressInfo.contains("公司")){ + addressInfo = getFrontStr(addressInfo,"鎴�"); + addressInfo = getFrontStr(addressInfo,"鎴夸骇"); + addressInfo = getFrontStr(addressInfo,"鎴垮眿"); + addressInfo = getFrontStr(addressInfo,"缃戠偣"); + addressInfo = getFrontStr(addressInfo,"鎴垮湴浜�"); + if(addressInfo!=null&&!addressInfo.contains("鍏徃")){ List ll = new ArrayList(); String area = map.get("area"); addressInfo = analyAddressCityInfo(addressInfo); @@ -62,7 +62,7 @@ class QinDaoYiHenPaiMaiBatch{ Map luf = analyAddressLouDongInfo(addressInfo); if(StringUtils.isNotBlank(address)||StringUtils.isNotBlank(name)){ List l = new ArrayList(); - l.add("青岛") + l.add("闈掑矝") l.add(region) l.add(name) l.add(address) @@ -79,65 +79,65 @@ class QinDaoYiHenPaiMaiBatch{ def static exportData(List> datas) { ExcelUtils.write("D:\\hbl\\tmp\\qdyh.xlsx", datas, "Sheet1") } - //楼栋号 + //妤兼爧鍙� public static Map analyAddressLouDongInfo(String str){ Map map = new HashMap(); if(str==~ /\d+/){ map.put("loudong", str); return map; } - if(str==~ /\d+号/){ - map.put("loudong", str.replace("号", "")); + if(str==~ /\d+鍙�/){ + map.put("loudong", str.replace("鍙�", "")); return map } - String loudong = formatByPatternStr(str, "(\\w+|\\w+-\\w+)(号|栋)") + String loudong = formatByPatternStr(str, "(\\w+|\\w+-\\w+)(鍙穦鏍�)") if(StringUtils.isNotBlank(loudong)){ - loudong = replaceList(loudong,["号","栋"]) + loudong = replaceList(loudong,["鍙�","鏍�"]) map.put("loudong", loudong) } - String unit = formatByPatternStr(str, "(\\w+|\\w+-\\w+)(单元)") + String unit = formatByPatternStr(str, "(\\w+|\\w+-\\w+)(鍗曞厓)") if(StringUtils.isNotBlank(unit)){ - unit = unit.replace("单元", ""); + unit = unit.replace("鍗曞厓", ""); map.put("unit", unit) } - String fanghao = formatByPatternStr(str, "(单元)\\d+") + String fanghao = formatByPatternStr(str, "(鍗曞厓)\\d+") if(StringUtils.isBlank(fanghao)){ - fanghao = formatByPatternStr(str, "\\d+(室)") + fanghao = formatByPatternStr(str, "\\d+(瀹�)") } if(StringUtils.isNotBlank(fanghao)){ - fanghao = replaceList(fanghao,["单元","室"]) + fanghao = replaceList(fanghao,["鍗曞厓","瀹�"]) map.put("fanghao", fanghao) } return map } - //小区名字 + //灏忓尯鍚嶅瓧 public static String analyAddressNameInfo(String str){ - String nameAndLou = formatByPatternStr(str, ".+?\\d+(号|栋)") + String nameAndLou = formatByPatternStr(str, ".+?\\d+(鍙穦鏍�)") if(StringUtils.isNotBlank(nameAndLou)){ - String lou = formatByPatternStr(nameAndLou, "(\\w+|\\w+-\\w+)(号|栋)") + String lou = formatByPatternStr(nameAndLou, "(\\w+|\\w+-\\w+)(鍙穦鏍�)") if(StringUtils.isNotBlank(lou)){ nameAndLou = getFrontStr(nameAndLou, lou); } } return nameAndLou } - //获取地址 + //鑾峰彇鍦板潃 public static String analyAddressAddressInfo(String str){ - String address = formatByPatternStr(str, ".+(路|国道)\\w+(-\\w+|)(号)") + String address = formatByPatternStr(str, ".+(璺瘄鍥介亾)\\w+(-\\w+|)(鍙�)") return address; } - //获取区域 + //鑾峰彇鍖哄煙 public static String analyAddressRegionInfo(String str){ - String region = formatByPatternStr(str, ".+?(区|镇)") + String region = formatByPatternStr(str, ".+?(鍖簗闀�)") return region; } - //获取市 + //鑾峰彇甯� public static String analyAddressCityInfo(String str){ - List res = formatByPattern(str, "(青岛|胶州|即墨|莱西|平度)(市|)") + List res = formatByPattern(str, "(闈掑矝|鑳跺窞|鍗冲ⅷ|鑾辫タ|骞冲害)(甯倈)") if(res!=null&&res.size()>0){ str = replaceList(str,res) } @@ -145,42 +145,42 @@ class QinDaoYiHenPaiMaiBatch{ } - //将数据中房产相关信息提取出来 + //灏嗘暟鎹腑鎴夸骇鐩稿叧淇℃伅鎻愬彇鍑烘潵 public static Map getHouseInfoStr(String str){ Map map = new HashMap(); - String res = formatByPatternStr(str, "[青岛|胶州|即墨|莱西|平度].+\\w+(号|#)(.+|)((房屋)|(房产)|户|网点|(房地产))") + String res = formatByPatternStr(str, "[闈掑矝|鑳跺窞|鍗冲ⅷ|鑾辫タ|骞冲害].+\\w+(鍙穦#)(.+|)((鎴垮眿)|(鎴夸骇)|鎴穦缃戠偣|(鎴垮湴浜�))") if(StringUtils.isNotBlank(res)){ - String area = formatByPatternStr(str, "(建筑面积|面积)(约|约为|:)\\d+(.|)(\\d+|)") + String area = formatByPatternStr(str, "(寤虹瓚闈㈢Н|闈㈢Н)(绾绾︿负|锛�)\\d+(.|)(\\d+|)") if(StringUtils.isNotBlank(area)){ - area = replaceList(area, ["建筑面积","面积","约","为","平",":"]) + area = replaceList(area, ["寤虹瓚闈㈢Н","闈㈢Н","绾�","涓�","骞�","锛�"]) } map.put("addressInfo", res); map.put("area", area); } return map } - //将数据解析成单个拍品 + //灏嗘暟鎹В鏋愭垚鍗曚釜鎷嶅搧 public static List getStrList(String str){ List list = new ArrayList(); if(StringUtils.isNotBlank(str)){ - List ls = str.split("2、"); - ls =getSplitList("3、", ls) - ls =getSplitList("4、", ls) - ls =getSplitList("5、", ls) - ls =getSplitList("6、", ls) - ls =getSplitList("7、", ls) - ls =getSplitList("2:", ls) - ls =getSplitList("3:", ls) - ls =getSplitList("4:", ls) - ls =getSplitList("5:", ls) - ls =getSplitList("。2.", ls) - ls =getSplitList("。3.", ls) - ls =getSplitList("。4.", ls) - ls =getSplitList("。5.", ls) - ls =getSplitList("。 2.", ls) - ls =getSplitList("。 3.", ls) - ls =getSplitList("。 4.", ls) - ls =getSplitList("。 5.", ls) + List ls = str.split("2銆�"); + ls =getSplitList("3銆�", ls) + ls =getSplitList("4銆�", ls) + ls =getSplitList("5銆�", ls) + ls =getSplitList("6銆�", ls) + ls =getSplitList("7銆�", ls) + ls =getSplitList("2锛�", ls) + ls =getSplitList("3锛�", ls) + ls =getSplitList("4锛�", ls) + ls =getSplitList("5锛�", ls) + ls =getSplitList("銆�2.", ls) + ls =getSplitList("銆�3.", ls) + ls =getSplitList("銆�4.", ls) + ls =getSplitList("銆�5.", ls) + ls =getSplitList("銆� 2.", ls) + ls =getSplitList("銆� 3.", ls) + ls =getSplitList("銆� 4.", ls) + ls =getSplitList("銆� 5.", ls) if(ls!=null&&ls.size()>0){ ls.each {String ss-> if(StringUtils.isNotBlank(ss)){ @@ -235,7 +235,7 @@ class QinDaoYiHenPaiMaiBatch{ if(fons!=null&&fons.size()>0){ for(Element fon:fons){ String text = fon.html(); - if(StringUtils.isNotBlank(text)&&text.contains("一、拍卖标的")){ + if(StringUtils.isNotBlank(text)&&text.contains("涓�銆佹媿鍗栨爣鐨�")){ text = replaceList(text, [" ",";","",""]) if(StringUtils.isNotBlank(text)){ list.add(text); @@ -264,7 +264,7 @@ class QinDaoYiHenPaiMaiBatch{ /** - * 对页面进行抓取 + * 瀵归〉闈㈣繘琛屾姄鍙� */ public static String catchPage(String url){ String str= getHtmlStr(url); @@ -362,7 +362,7 @@ class QinDaoYiHenPaiMaiBatch{ } /** - * 获取城市的小区 + * 鑾峰彇鍩庡競鐨勫皬鍖� * @param city * @return */ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/ShangHaiDataToDept.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/ShangHaiDataToDept.groovy index 98cae2216..1dabc5ff1 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/ShangHaiDataToDept.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/ShangHaiDataToDept.groovy @@ -29,7 +29,7 @@ class ShangHaiDataToDept { pdsData1() } - //获取小区年涨跌幅 + //鑾峰彇灏忓尯骞存定璺屽箙 public static void pdsData1(){ List> datas = new ArrayList>(); DBCursor dbs = SALE_DATA_fangdichan.find(); @@ -46,7 +46,7 @@ class ShangHaiDataToDept { list.add(num); datas.add(list); } - exportPdsData("哈哈哈",datas); + exportPdsData("鍝堝搱鍝�",datas); } def static exportPdsData(String city,List> datas) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/ShaoXinERuKuToLine.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/ShaoXinERuKuToLine.groovy index 02728a289..a19f78cfd 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/ShaoXinERuKuToLine.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/ShaoXinERuKuToLine.groovy @@ -20,7 +20,7 @@ import com.mongodb.DBCursor import com.mongodb.DBObject /** - * 定时更新小区地址数据 + * 瀹氭椂鏇存柊灏忓尯鍦板潃鏁版嵁 * @author hubingliang * */ @@ -32,7 +32,7 @@ class ShaoXinERuKuToLine{ public static final DBCollection XING_FENG_PING_GU_LOUINFO = MongoUtils.getCollectionByName("gaode_poi", "xing_feng_ping_gu_louInfo", "192.168.0.61", 27017) public static final DBCollection xf_lou_dong = MongoUtils.getCollectionByName("gaode_poi", "loudong3", "192.168.0.61", 27017) public static final DBCollection xf_fang_hao = MongoUtils.getCollectionByName("gaode_poi", "fanghao3", "192.168.0.61", 27017) - private static final String[] str1 = ["绍兴"] + private static final String[] str1 = ["缁嶅叴"] static main(args) { List> ls = new ArrayList>(); @@ -40,7 +40,7 @@ class ShaoXinERuKuToLine{ List ll = toLine(str1[i]); ls.add(ll); } - exportData("统计",ls); + exportData("缁熻",ls); } def static exportData(String city,List> datas) { ExcelUtils.write("D:\\hbl\\Data\\xinfen\\"+city+".xlsx", datas, "Sheet1") @@ -56,7 +56,7 @@ class ShaoXinERuKuToLine{ } /** - * 楼栋入线上库 + * 妤兼爧鍏ョ嚎涓婂簱 */ public static Integer louDataToLine(String city){ int i = 0; @@ -87,7 +87,7 @@ class ShaoXinERuKuToLine{ } /** - * 房号入库 + * 鎴垮彿鍏ュ簱 */ public static Integer fangDataToLine(String city){ DBObject query = new BasicDBObject(); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/ShuJuBaoCommunalBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/ShuJuBaoCommunalBatch.groovy index 29a906e5a..3ccf920f7 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/ShuJuBaoCommunalBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/ShuJuBaoCommunalBatch.groovy @@ -38,7 +38,7 @@ import com.mongodb.Mongo import org.apache.commons.lang.StringUtils /** - * 定时更新小区地址数据 + * 瀹氭椂鏇存柊灏忓尯鍦板潃鏁版嵁 * @author hubingliang * */ @@ -47,9 +47,9 @@ class ShuJuBaoCommunalBatch{ public static final DBCollection SERVER_AREA = MongoUtils.getCollectionByName("fangjia", "server_area", "mongo.db.fangjia.com", 27017) static main(args) { - //ziDuanTianCong4("合肥", "D:\\hbl\\数据包\\数据包6\\","2013合肥房地产排行榜-黄村粮-户",".xlsx",4); - //ziDuanTianCong4("北京", "D:\\hbl\\数据包\\数据包7\\4月10日-4月14日\\", "2015北京高档小区汇总大全-Mia-基础", ".xls", 1) - ziDuanTianCong("北京", "D:\\hbl\\数据包\\数据包7\\4月10日-4月14日\\", "2015北京高档小区汇总大全-Mia-基础", ".xls", 1) + //ziDuanTianCong4("鍚堣偉", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�6\\","2013鍚堣偉鎴垮湴浜ф帓琛屾-榛勬潙绮�-鎴�",".xlsx",4); + //ziDuanTianCong4("鍖椾含", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�7\\4鏈�10鏃�-4鏈�14鏃\", "2015鍖椾含楂樻。灏忓尯姹囨�诲ぇ鍏�-Mia-鍩虹", ".xls", 1) + ziDuanTianCong("鍖椾含", "D:\\hbl\\鏁版嵁鍖匼\鏁版嵁鍖�7\\4鏈�10鏃�-4鏈�14鏃\", "2015鍖椾含楂樻。灏忓尯姹囨�诲ぇ鍏�-Mia-鍩虹", ".xls", 1) } public static void ziDuanTianCong(String addressCity,String filePath,String fileName,String suffix,int num){ @@ -58,7 +58,7 @@ class ShuJuBaoCommunalBatch{ String region = item["B"] String name = item["C"] if(StringUtils.isNotBlank(city)&&StringUtils.isNotBlank(name)){ - region = formatRegion(region)//对区域进行格式化 + region = formatRegion(region)//瀵瑰尯鍩熻繘琛屾牸寮忓寲 Map map = matchPreAddress(city, region, name); if(map==null){ String address = item["U"] @@ -72,74 +72,74 @@ class ShuJuBaoCommunalBatch{ region = map.get("region"); name = map.get("name"); } - DBObject dis = findDis(cityName,region,name);//查询 + DBObject dis = findDis(cityName,region,name);//鏌ヨ if(dis!=null){ boolean canUpdate = false; - //建筑时间 + //寤虹瓚鏃堕棿 if(canUpdateConstructionTime(dis,item)){ dis.put("finish_building_date",excelDateToStr(list.get(3))) canUpdate = true } - //容积率 + //瀹圭Н鐜� if(canUpdateCubagePercent(dis,list)){ dis.put("cubage_percent",list.get(4).toString()) } - //户数 + //鎴锋暟 if(canUpdateHouseHold(dis,list)){ dis.put("household_count",list.get(5)) canUpdate = true } - //开盘时间 + //寮�鐩樻椂闂� if(canUpdateOpenDate(dis,list)){ dis.put("open_date",excelStrToDate(list.get(7))) canUpdate = true } - //交房时间 + //浜ゆ埧鏃堕棿 if(canUpdateLiveDate(dis,list)){ dis.put("live_date",excelDateToStr(list.get(7))) canUpdate = true } - //绿化率 + //缁垮寲鐜� if(canUpdateVirescencePercent(dis,list)){ dis.put("virescence_percent",list.get(9).toString()) } - //开发商 + //寮�鍙戝晢 if(canUpdateDeveloper(dis,list)){ dis.put("developer",list.get(11)) canUpdate = true } - //物业公司 + //鐗╀笟鍏徃 if(canUpdateEstateCompany(dis,list)){ dis.put("estate_company",list.get(12)) canUpdate = true } - //停车位 + //鍋滆溅浣� if(canUpdateCarSite(dis,list)){ dis.put("car_site",list.get(13).toString()) canUpdate = true } - //竣工时间 + //绔e伐鏃堕棿 if(canUpdateFinishBuildingDate(dis,list)){ dis.put("finish_building_date",excelDateToStr(list.get(15))) canUpdate = true } - //建筑面积 + //寤虹瓚闈㈢Н if(canUpdateBuildArea(dis,list)){ dis.put("build_area",list.get(16).toString()) canUpdate = true } - //占地面积 + //鍗犲湴闈㈢Н if(canUpdateAllArea(dis,list)){ dis.put("all_area",list.get(17).toString()) canUpdate = true } - //物业费 + //鐗╀笟璐� if(canUpdateEstateCharge(dis,list)){ dis.put("estate_charge",list.get(18).toString()) canUpdate = true } if(canUpdate){ - //更新数据的代码 + //鏇存柊鏁版嵁鐨勪唬鐮� updateDis(dis) updateMount = updateMount+1; list.add(1); @@ -162,7 +162,7 @@ class ShuJuBaoCommunalBatch{ public static String formatRegion(String region){ String re = region; if(re!=null){ - re = re.replaceAll("区",""); + re = re.replaceAll("鍖�",""); } return re; } @@ -187,7 +187,7 @@ class ShuJuBaoCommunalBatch{ String re = list.get(1); String region = null; if(re!=null){ - region = re.replaceAll("区",""); + region = re.replaceAll("鍖�",""); } String name = list.get(2); Map map = matchPreAddress(city, region, list.get(2)); @@ -205,74 +205,74 @@ class ShuJuBaoCommunalBatch{ region = map.get("region"); name = map.get("name"); } - DBObject dis = findDis(cityName,region,name);//查询 + DBObject dis = findDis(cityName,region,name);//鏌ヨ if(dis!=null){ boolean canUpdate = false; - //建筑时间 + //寤虹瓚鏃堕棿 if(canUpdateConstructionTime(dis,list)){ dis.put("finish_building_date",excelDateToStr(list.get(3))) canUpdate = true } - //容积率 + //瀹圭Н鐜� if(canUpdateCubagePercent(dis,list)){ dis.put("cubage_percent",list.get(4).toString()) } - //户数 + //鎴锋暟 if(canUpdateHouseHold(dis,list)){ dis.put("household_count",list.get(5)) canUpdate = true } - //开盘时间 + //寮�鐩樻椂闂� if(canUpdateOpenDate(dis,list)){ dis.put("open_date",excelStrToDate(list.get(7))) canUpdate = true } - //交房时间 + //浜ゆ埧鏃堕棿 if(canUpdateLiveDate(dis,list)){ dis.put("live_date",excelDateToStr(list.get(7))) canUpdate = true } - //绿化率 + //缁垮寲鐜� if(canUpdateVirescencePercent(dis,list)){ dis.put("virescence_percent",list.get(9).toString()) } - //开发商 + //寮�鍙戝晢 if(canUpdateDeveloper(dis,list)){ dis.put("developer",list.get(11)) canUpdate = true } - //物业公司 + //鐗╀笟鍏徃 if(canUpdateEstateCompany(dis,list)){ dis.put("estate_company",list.get(12)) canUpdate = true } - //停车位 + //鍋滆溅浣� if(canUpdateCarSite(dis,list)){ dis.put("car_site",list.get(13).toString()) canUpdate = true } - //竣工时间 + //绔e伐鏃堕棿 if(canUpdateFinishBuildingDate(dis,list)){ dis.put("finish_building_date",excelDateToStr(list.get(15))) canUpdate = true } - //建筑面积 + //寤虹瓚闈㈢Н if(canUpdateBuildArea(dis,list)){ dis.put("build_area",list.get(16).toString()) canUpdate = true } - //占地面积 + //鍗犲湴闈㈢Н if(canUpdateAllArea(dis,list)){ dis.put("all_area",list.get(17).toString()) canUpdate = true } - //物业费 + //鐗╀笟璐� if(canUpdateEstateCharge(dis,list)){ dis.put("estate_charge",list.get(18).toString()) canUpdate = true } if(canUpdate){ - //更新数据的代码 + //鏇存柊鏁版嵁鐨勪唬鐮� updateDis(dis) updateMount = updateMount+1; list.add(1); @@ -293,11 +293,11 @@ class ShuJuBaoCommunalBatch{ exportData(city,fileName,ls); } def static exportData(String city,String fileName,List> datas) { - ExcelUtils.write("D:\\hbl\\Data\\数据包结果\\20170424\\"+fileName+".xlsx", datas, "Sheet1") + ExcelUtils.write("D:\\hbl\\Data\\鏁版嵁鍖呯粨鏋淺\20170424\\"+fileName+".xlsx", datas, "Sheet1") } /** - * 判断是否能够更新建筑时间 + * 鍒ゆ柇鏄惁鑳藉鏇存柊寤虹瓚鏃堕棿 */ public static boolean canUpdateConstructionTime(DBObject dis,List list){ if(list==null||list.size()<4||dis==null){ @@ -316,7 +316,7 @@ class ShuJuBaoCommunalBatch{ return false; } /** - * 判断是否能够更新容积率 + * 鍒ゆ柇鏄惁鑳藉鏇存柊瀹圭Н鐜� */ public static boolean canUpdateCubagePercent(DBObject dis,List list){ if(list==null||list.size()<5||dis==null){ @@ -337,7 +337,7 @@ class ShuJuBaoCommunalBatch{ /** - * 判断是否能够更新户数 + * 鍒ゆ柇鏄惁鑳藉鏇存柊鎴锋暟 */ public static boolean canUpdateHouseHold(DBObject dis,List list){ if(list==null||list.size()<5||dis==null){ @@ -352,7 +352,7 @@ class ShuJuBaoCommunalBatch{ } /** - * 判断是否能够更新开盘时间 + * 鍒ゆ柇鏄惁鑳藉鏇存柊寮�鐩樻椂闂� */ public static boolean canUpdateOpenDate(DBObject dis,List list){ if(list==null||list.size()<7||dis==null){ @@ -371,7 +371,7 @@ class ShuJuBaoCommunalBatch{ return false; } /** - * 判断是否能够更新交房时间 + * 鍒ゆ柇鏄惁鑳藉鏇存柊浜ゆ埧鏃堕棿 */ public static boolean canUpdateLiveDate(DBObject dis,List list){ if(list==null||list.size()<8||dis==null){ @@ -390,7 +390,7 @@ class ShuJuBaoCommunalBatch{ return false; } /** - * 判断是否能够更新绿化率 + * 鍒ゆ柇鏄惁鑳藉鏇存柊缁垮寲鐜� */ public static boolean canUpdateVirescencePercent(DBObject dis,List list){ if(list==null||list.size()<10||dis==null){ @@ -407,7 +407,7 @@ class ShuJuBaoCommunalBatch{ return false; } /** - * 判断是否能够更新开发商 + * 鍒ゆ柇鏄惁鑳藉鏇存柊寮�鍙戝晢 */ public static boolean canUpdateDeveloper(DBObject dis,List list){ if(list==null||list.size()<12||dis==null){ @@ -423,7 +423,7 @@ class ShuJuBaoCommunalBatch{ return false; } /** - * 判断是否能够更新物业公司 + * 鍒ゆ柇鏄惁鑳藉鏇存柊鐗╀笟鍏徃 */ public static boolean canUpdateEstateCompany(DBObject dis,List list){ if(list==null||list.size()<13||dis==null){ @@ -439,7 +439,7 @@ class ShuJuBaoCommunalBatch{ return false; } /** - * 判断是否能够更新停车位 + * 鍒ゆ柇鏄惁鑳藉鏇存柊鍋滆溅浣� */ public static boolean canUpdateCarSite(DBObject dis,List list){ if(list==null||list.size()<14||dis==null){ @@ -459,7 +459,7 @@ class ShuJuBaoCommunalBatch{ } /** - * 判断是否能够更新竣工时间 + * 鍒ゆ柇鏄惁鑳藉鏇存柊绔e伐鏃堕棿 */ public static boolean canUpdateFinishBuildingDate(DBObject dis,List list){ if(list==null||list.size()<16||dis==null){ @@ -479,7 +479,7 @@ class ShuJuBaoCommunalBatch{ } /** - * 判断是否能够更新建筑面积 + * 鍒ゆ柇鏄惁鑳藉鏇存柊寤虹瓚闈㈢Н */ public static boolean canUpdateBuildArea(DBObject dis,List list){ if(list==null||list.size()<17||dis==null){ @@ -498,7 +498,7 @@ class ShuJuBaoCommunalBatch{ return false; } /** - * 判断是否能够更新占地面积 + * 鍒ゆ柇鏄惁鑳藉鏇存柊鍗犲湴闈㈢Н */ public static boolean canUpdateAllArea(DBObject dis,List list){ if(list==null||list.size()<18||dis==null){ @@ -517,7 +517,7 @@ class ShuJuBaoCommunalBatch{ return false; } /** - * 判断是否能够更新物业费 + * 鍒ゆ柇鏄惁鑳藉鏇存柊鐗╀笟璐� */ public static boolean canUpdateEstateCharge(DBObject dis,List list){ if(list==null||list.size()<19||dis==null){ @@ -535,7 +535,7 @@ class ShuJuBaoCommunalBatch{ } return false; } - //格式化String类型转化为DaTE + //鏍煎紡鍖朣tring绫诲瀷杞寲涓篋aTE public static Date excelStrToDate(Object exeValue){ if(exeValue!=null){ if(exeValue instanceof Date){ @@ -545,7 +545,7 @@ class ShuJuBaoCommunalBatch{ return null; } - //格式化时间类型转化成String + //鏍煎紡鍖栨椂闂寸被鍨嬭浆鍖栨垚String public static String excelDateToStr(Object exeValue){ if(exeValue!=null){ if(exeValue instanceof String){ @@ -563,7 +563,7 @@ class ShuJuBaoCommunalBatch{ public static void updateDis(DBObject db){ - //更新数据的代码 + //鏇存柊鏁版嵁鐨勪唬鐮� Map mark_map = db.mark_map if(!mark_map){ mark_map = [:] @@ -576,7 +576,7 @@ class ShuJuBaoCommunalBatch{ /** - * 对小区中的一般字段进行更新 + * 瀵瑰皬鍖轰腑鐨勪竴鑸瓧娈佃繘琛屾洿鏂� */ public static void updateDis(DBObject dis,String fieldName,String value){ if(dis!=null&&dis.get(fieldName)==null){ @@ -586,7 +586,7 @@ class ShuJuBaoCommunalBatch{ /** - * 判断竣工字段能否更新 + * 鍒ゆ柇绔e伐瀛楁鑳藉惁鏇存柊 */ public static boolean finishBuildingDateCan(DBObject dis,String value){ if(dis==null||value==null){ @@ -599,7 +599,7 @@ class ShuJuBaoCommunalBatch{ return false; } /** - * 小区查询 + * 灏忓尯鏌ヨ */ public static DBObject findDis(String city,String region,String name){ BasicDBObject qu = new BasicDBObject() @@ -617,7 +617,7 @@ class ShuJuBaoCommunalBatch{ /** - * 获取城市的小区 + * 鑾峰彇鍩庡競鐨勫皬鍖� * @param city * @return */ @@ -631,7 +631,7 @@ class ShuJuBaoCommunalBatch{ return dbs; } /** - *Date转化成String + *Date杞寲鎴怱tring */ public static String dateToString(Date date,String type){ if(date==null){ @@ -648,14 +648,14 @@ class ShuJuBaoCommunalBatch{ format = DateFormat.getDateInstance(DateFormat.MEDIUM); str = format.format(date); } else if (type.equals("FULL")) { - // 2007年1月18日 星期四 + // 2007骞�1鏈�18鏃� 鏄熸湡鍥� format = DateFormat.getDateInstance(DateFormat.FULL); str = format.format(date); } return str; } /** - * 小区名址匹配 + * 灏忓尯鍚嶅潃鍖归厤 */ public static Map matchPreAddress(String city,String region,String address){ JSONObject result = OpenApiClient.addressMatch(city,address,"property",false,region,"strict"); @@ -673,7 +673,7 @@ class ShuJuBaoCommunalBatch{ } /** - * 匹配 + * 鍖归厤 * @param text * @return */ @@ -693,30 +693,30 @@ class ShuJuBaoCommunalBatch{ public static List getHeader(){ List list = new ArrayList(); - list.add("城市") - list.add("区域") - list.add("小区名") - list.add("建筑时间") - list.add("容积率") - list.add("户数") - list.add("开盘时间") - list.add("交房时间") - list.add("名称别名") - list.add("绿化率") - list.add("物业类型") - list.add("开发商") - list.add("物业公司") - list.add("停车位") - list.add("产权年限") - list.add("竣工时间") - list.add("建筑面积") - list.add("占地面积") - list.add("物业费") - list.add("商圈") - list.add("地址") - list.add("建筑类型") - list.add("户数填入") - list.add("竣工时间填入") + list.add("鍩庡競") + list.add("鍖哄煙") + list.add("灏忓尯鍚�") + list.add("寤虹瓚鏃堕棿") + list.add("瀹圭Н鐜�") + list.add("鎴锋暟") + list.add("寮�鐩樻椂闂�") + list.add("浜ゆ埧鏃堕棿") + list.add("鍚嶇О鍒悕") + list.add("缁垮寲鐜�") + list.add("鐗╀笟绫诲瀷") + list.add("寮�鍙戝晢") + list.add("鐗╀笟鍏徃") + list.add("鍋滆溅浣�") + list.add("浜ф潈骞撮檺") + list.add("绔e伐鏃堕棿") + list.add("寤虹瓚闈㈢Н") + list.add("鍗犲湴闈㈢Н") + list.add("鐗╀笟璐�") + list.add("鍟嗗湀") + list.add("鍦板潃") + list.add("寤虹瓚绫诲瀷") + list.add("鎴锋暟濉叆") + list.add("绔e伐鏃堕棿濉叆") return list } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/SouHuJiaoDianAnalySaleDataBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/SouHuJiaoDianAnalySaleDataBatch.groovy index 97412b5da..973f1582b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/SouHuJiaoDianAnalySaleDataBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/SouHuJiaoDianAnalySaleDataBatch.groovy @@ -22,8 +22,8 @@ class SouHuJiaoDianAnalySaleDataBatch { public static final DBCollection SALE_DATA_RESOURCE = MongoUtils.getCollectionByName("hu_temp", "sale_data_souhujiaodian", "192.168.0.136", 27017) public static final DBCollection SALE_DATA_STAT = MongoUtils.getCollectionByName("hu_temp", "sale_data_stat", "192.168.0.136", 27017) static main(args) { - saleData("佛山"); - saleData("广州"); + saleData("浣涘北"); + saleData("骞垮窞"); } @@ -50,25 +50,25 @@ class SouHuJiaoDianAnalySaleDataBatch { if(StringUtils.isEmpty(name)){ continue; } - String houseNumStr = db.get("house_num");//出售数量 + String houseNumStr = db.get("house_num");//鍑哄敭鏁伴噺 int houseNum = toInt(houseNumStr); if(houseNum<=0){ continue; } - String totalSizeStr = db.get("total_size");//出售总面积 + String totalSizeStr = db.get("total_size");//鍑哄敭鎬婚潰绉� Integer totalSize=null; if(toInt(totalSizeStr)>=0){ totalSize=toInt(totalSizeStr); } - String totalPriceStr = db.get("total_price");//总价格 + String totalPriceStr = db.get("total_price");//鎬讳环鏍� Long totalPrice = null; if(toLong(totalPriceStr)>=0){ totalPrice = toLong(totalPriceStr); } - String avgPriceStr =db.get("avg_price");//均价 + String avgPriceStr =db.get("avg_price");//鍧囦环 Integer avgPrice = null; if(toInt(avgPriceStr)>=0){ avgPrice = toInt(avgPriceStr); @@ -93,7 +93,7 @@ class SouHuJiaoDianAnalySaleDataBatch { d.put("total_price",totalPrice); d.put("avg_price",avgPrice); d.put("date",getDate(db.get("date"))); - d.put("resource","搜狐焦点") + d.put("resource","鎼滅嫄鐒︾偣") cUData.add(d); break; } @@ -111,7 +111,7 @@ class SouHuJiaoDianAnalySaleDataBatch { d.put("total_price",totalPrice); d.put("avg_price",avgPrice); d.put("date",getDate(db.get("date"))); - d.put("resource","搜狐焦点") + d.put("resource","鎼滅嫄鐒︾偣") cUData.add(d); noMatchList.add(d); } @@ -124,7 +124,7 @@ class SouHuJiaoDianAnalySaleDataBatch { /** - * 获取城市的小区 + * 鑾峰彇鍩庡競鐨勫皬鍖� * @param city * @return */ @@ -176,7 +176,7 @@ class SouHuJiaoDianAnalySaleDataBatch { return parseInt; } - //导出excel未匹配小区 + //瀵煎嚭excel鏈尮閰嶅皬鍖� public static void noMatchDate(List list,String city){ List> excelList = new ArrayList>(); for(int i=0;i list = new ArrayList() while(dbs.hasNext()){ @@ -84,7 +84,7 @@ class SpideDateDataDept { BasicDBObject query1 = new BasicDBObject() query1.append("city", city) - query1.append("resource", "搜狐焦点") + query1.append("resource", "鎼滅嫄鐒︾偣") DBCursor dbs1 = SALE_DATA_STAT.find(query1); List list1 = new ArrayList() while(dbs1.hasNext()){ @@ -148,11 +148,11 @@ class SpideDateDataDept { - //获取小区年涨跌幅 + //鑾峰彇灏忓尯骞存定璺屽箙 public static void pdsData(String city){ BasicDBObject query = new BasicDBObject() query.append("city", city) - query.append("resource", "网易房产") + query.append("resource", "缃戞槗鎴夸骇") DBCursor dbs = SALE_DATA_STAT.find(query); List list = new ArrayList() while(dbs.hasNext()){ @@ -202,7 +202,7 @@ class SpideDateDataDept { BasicDBObject query1 = new BasicDBObject() query1.append("city", city) - query1.append("resource", "搜狐焦点") + query1.append("resource", "鎼滅嫄鐒︾偣") DBCursor dbs1 = SALE_DATA_STAT.find(query1); List list1 = new ArrayList() while(dbs1.hasNext()){ @@ -261,7 +261,7 @@ class SpideDateDataDept { BasicDBObject query2 = new BasicDBObject() query2.append("city", city) - query2.append("resource", "房王") + query2.append("resource", "鎴跨帇") DBCursor dbs2 = SALE_DATA_STAT.find(query2) List list2 = new ArrayList() while(dbs2.hasNext()){ @@ -347,7 +347,7 @@ class SpideDateDataDept { } /** - * 获取城市的小区 + * 鑾峰彇鍩庡競鐨勫皬鍖� * @param city * @return */ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/XinFengPingGuBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/XinFengPingGuBatch.groovy index f7800f71a..5d2ee6fa5 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/XinFengPingGuBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/XinFengPingGuBatch.groovy @@ -17,7 +17,7 @@ import com.mongodb.DBCollection import com.mongodb.DBObject /** - * 成交量相关 + * 鎴愪氦閲忕浉鍏� * @author hubingliang * */ @@ -29,28 +29,28 @@ class XinFengPingGuBatch{ public static final DBCollection XING_FENG_PING_DISNAME = MongoUtils.getCollectionByName("gaode_poi", "xing_feng_ping_disname", "192.168.0.61", 27017) static main(args) { - //doCatch("杭州","JSESSIONID=2077FBEFF76BA049FE2DF35AEC281944; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1489973379; xfpgCity=%E6%9D%AD%E5%B7%9E%E5%B8%82"); - //doCatch("北京","pname=%u4E0A%u6797%u6625%u5929; JSESSIONID=EA519AD3873C20BCC73D822C378AD360; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1489986395; xfpgCity=%E5%8C%97%E4%BA%AC%E5%B8%82"); - //doCatch("天津", "JSESSIONID=EA519AD3873C20BCC73D822C378AD360; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1490001888; xfpgCity=%E5%A4%A9%E6%B4%A5%E5%B8%82; pname=%u5929%u6D25%u5927%u90FD%u4F1A") - //doCatch("深圳", "pname=%u5929%u6D25%u5927%u60A6%u57CE; JSESSIONID=65ED1DEDF6481A618D39814414D9E620; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1490061813; xfpgCity=%E6%B7%B1%E5%9C%B3%E5%B8%82") - //doCatch("广州", "JSESSIONID=6070B66EBC7AF013303B0DD24F43978D; pname=%u5E7F%u5DDE%u4FDD%u7A0E%u533A%u541B%u5408%u96C5%u5C45; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1490091776; xfpgCity=%E5%B9%BF%E5%B7%9E%E5%B8%82") - //doCatch("沈阳", "pname=%u5E7F%u5DDE%u4FDD%u7A0E%u533A%u541B%u5408%u96C5%u5C45; JSESSIONID=898D7CDDF0F5DF1A389B7780103ECC6F; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1490145659; xfpgCity=%E6%B2%88%E9%98%B3%E5%B8%82") - //doCatch("大连", "JSESSIONID=898D7CDDF0F5DF1A389B7780103ECC6F; pname=%u6C88%u9633%u78A7%u6842%u56ED; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1490165967; xfpgCity=%E5%A4%A7%E8%BF%9E%E5%B8%82") - //doCatch("哈尔滨", "JSESSIONID=C43AB4B8B02337FD8F4DB1A8CB159574; pname=%u54C8%u8868%u5C0F%u533A; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1490180706; xfpgCity=%E5%93%88%E5%B0%94%E6%BB%A8%E5%B8%82") - //doCatch("长春", "pname=%u54C8%u5C14%u6EE8%u4E07%u8FBE%u6587%u5316%u65C5%u6E38%u57CE; JSESSIONID=D7224EBE4B83DCFF2DE491498BF2D701; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1490232322; xfpgCity=%E9%95%BF%E6%98%A5%E5%B8%82") - //doCatch("呼和浩特", "pname=%u957F%u6625%u6FB3%u6D32%u57CE; JSESSIONID=488E9783339E3948D6B98B01BF16D32C; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1490245872; xfpgCity=%E5%91%BC%E5%92%8C%E6%B5%A9%E7%89%B9%E5%B8%82") - //doCatch("南宁", "pname=%u547C%u8FD0%u82B1%u56ED; JSESSIONID=B189FF2FD09365290A60259442BFE8B1; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1490253945; xfpgCity=%E5%8D%97%E5%AE%81%E5%B8%82") - //doCatch("东莞", "pname=%u6C5F%u5357%u65B0%u5929%u5730; JSESSIONID=74A7E20A3493FD301BE737C65D49A6C2; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1490258880; xfpgCity=%E4%B8%9C%E8%8E%9E%E5%B8%82") - /*doCatch("惠州", "JSESSIONID=6B4B856FBA917B246859D80F9AC37E85; pname=%u78A7%u6E56%u4E1C%u5CB8; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1489661211; xfpgCity=%E6%83%A0%E5%B7%9E%E5%B8%82") - doCatch("珠海", "JSESSIONID=6B4B856FBA917B246859D80F9AC37E85; pname=%u6F6E%u60E0%u751C%u57CE; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1489661252; xfpgCity=%E7%8F%A0%E6%B5%B7%E5%B8%82") - doCatch("济南","JSESSIONID=6B4B856FBA917B246859D80F9AC37E85; pname=%u73E0%u6D77%u51E4%u51F0%u5170%u4EAD; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1489661324; xfpgCity=%E6%B5%8E%E5%8D%97%E5%B8%82") - doCatch("烟台","JSESSIONID=6B4B856FBA917B246859D80F9AC37E85; pname=%u6D4E%u5357%u4E07%u8FBE%u5E7F%u573A; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1489661409; xfpgCity=%E7%83%9F%E5%8F%B0%E5%B8%82") - doCatch("长沙","JSESSIONID=6B4B856FBA917B246859D80F9AC37E85; pname=%u5408%u521B%u70DF%u53F0%u516C%u9986; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1489661490; xfpgCity=%E9%95%BF%E6%B2%99%E5%B8%82"); - doCatch("株洲","JSESSIONID=6B4B856FBA917B246859D80F9AC37E85; pname=%u957F%u6C99%u7EFF%u5730%u4E2D%u5FC3; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1489661591; xfpgCity=%E6%A0%AA%E6%B4%B2%E5%B8%82"); - doCatch("湘潭","JSESSIONID=6B4B856FBA917B246859D80F9AC37E85; pname=%u682A%u6D32%u6C49%u534E%u56FD%u9645%u5546%u4E1A%u57CE; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1489661640; xfpgCity=%E6%B9%98%E6%BD%AD%E5%B8%82");*/ + //doCatch("鏉窞","JSESSIONID=2077FBEFF76BA049FE2DF35AEC281944; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1489973379; xfpgCity=%E6%9D%AD%E5%B7%9E%E5%B8%82"); + //doCatch("鍖椾含","pname=%u4E0A%u6797%u6625%u5929; JSESSIONID=EA519AD3873C20BCC73D822C378AD360; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1489986395; xfpgCity=%E5%8C%97%E4%BA%AC%E5%B8%82"); + //doCatch("澶╂触", "JSESSIONID=EA519AD3873C20BCC73D822C378AD360; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1490001888; xfpgCity=%E5%A4%A9%E6%B4%A5%E5%B8%82; pname=%u5929%u6D25%u5927%u90FD%u4F1A") + //doCatch("娣卞湷", "pname=%u5929%u6D25%u5927%u60A6%u57CE; JSESSIONID=65ED1DEDF6481A618D39814414D9E620; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1490061813; xfpgCity=%E6%B7%B1%E5%9C%B3%E5%B8%82") + //doCatch("骞垮窞", "JSESSIONID=6070B66EBC7AF013303B0DD24F43978D; pname=%u5E7F%u5DDE%u4FDD%u7A0E%u533A%u541B%u5408%u96C5%u5C45; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1490091776; xfpgCity=%E5%B9%BF%E5%B7%9E%E5%B8%82") + //doCatch("娌堥槼", "pname=%u5E7F%u5DDE%u4FDD%u7A0E%u533A%u541B%u5408%u96C5%u5C45; JSESSIONID=898D7CDDF0F5DF1A389B7780103ECC6F; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1490145659; xfpgCity=%E6%B2%88%E9%98%B3%E5%B8%82") + //doCatch("澶ц繛", "JSESSIONID=898D7CDDF0F5DF1A389B7780103ECC6F; pname=%u6C88%u9633%u78A7%u6842%u56ED; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1490165967; xfpgCity=%E5%A4%A7%E8%BF%9E%E5%B8%82") + //doCatch("鍝堝皵婊�", "JSESSIONID=C43AB4B8B02337FD8F4DB1A8CB159574; pname=%u54C8%u8868%u5C0F%u533A; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1490180706; xfpgCity=%E5%93%88%E5%B0%94%E6%BB%A8%E5%B8%82") + //doCatch("闀挎槬", "pname=%u54C8%u5C14%u6EE8%u4E07%u8FBE%u6587%u5316%u65C5%u6E38%u57CE; JSESSIONID=D7224EBE4B83DCFF2DE491498BF2D701; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1490232322; xfpgCity=%E9%95%BF%E6%98%A5%E5%B8%82") + //doCatch("鍛煎拰娴╃壒", "pname=%u957F%u6625%u6FB3%u6D32%u57CE; JSESSIONID=488E9783339E3948D6B98B01BF16D32C; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1490245872; xfpgCity=%E5%91%BC%E5%92%8C%E6%B5%A9%E7%89%B9%E5%B8%82") + //doCatch("鍗楀畞", "pname=%u547C%u8FD0%u82B1%u56ED; JSESSIONID=B189FF2FD09365290A60259442BFE8B1; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1490253945; xfpgCity=%E5%8D%97%E5%AE%81%E5%B8%82") + //doCatch("涓滆帪", "pname=%u6C5F%u5357%u65B0%u5929%u5730; JSESSIONID=74A7E20A3493FD301BE737C65D49A6C2; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1490258880; xfpgCity=%E4%B8%9C%E8%8E%9E%E5%B8%82") + /*doCatch("鎯犲窞", "JSESSIONID=6B4B856FBA917B246859D80F9AC37E85; pname=%u78A7%u6E56%u4E1C%u5CB8; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1489661211; xfpgCity=%E6%83%A0%E5%B7%9E%E5%B8%82") + doCatch("鐝犳捣", "JSESSIONID=6B4B856FBA917B246859D80F9AC37E85; pname=%u6F6E%u60E0%u751C%u57CE; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1489661252; xfpgCity=%E7%8F%A0%E6%B5%B7%E5%B8%82") + doCatch("娴庡崡","JSESSIONID=6B4B856FBA917B246859D80F9AC37E85; pname=%u73E0%u6D77%u51E4%u51F0%u5170%u4EAD; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1489661324; xfpgCity=%E6%B5%8E%E5%8D%97%E5%B8%82") + doCatch("鐑熷彴","JSESSIONID=6B4B856FBA917B246859D80F9AC37E85; pname=%u6D4E%u5357%u4E07%u8FBE%u5E7F%u573A; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1489661409; xfpgCity=%E7%83%9F%E5%8F%B0%E5%B8%82") + doCatch("闀挎矙","JSESSIONID=6B4B856FBA917B246859D80F9AC37E85; pname=%u5408%u521B%u70DF%u53F0%u516C%u9986; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1489661490; xfpgCity=%E9%95%BF%E6%B2%99%E5%B8%82"); + doCatch("鏍床","JSESSIONID=6B4B856FBA917B246859D80F9AC37E85; pname=%u957F%u6C99%u7EFF%u5730%u4E2D%u5FC3; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1489661591; xfpgCity=%E6%A0%AA%E6%B4%B2%E5%B8%82"); + doCatch("婀樻江","JSESSIONID=6B4B856FBA917B246859D80F9AC37E85; pname=%u682A%u6D32%u6C49%u534E%u56FD%u9645%u5546%u4E1A%u57CE; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1488416523,1489407499,1489454564,1489548645; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1489661640; xfpgCity=%E6%B9%98%E6%BD%AD%E5%B8%82");*/ //getAllField(); - allFieldCatchDisName("北京","http://www.xfpg.com.cn/build.do?method=buildlist","JSESSIONID=8311675DA5FDFD38B1C9FEB206547F1E; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1491387026,1492138697,1492400341; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1493024272; xfpgCity=%E5%8C%97%E4%BA%AC%E5%B8%82; pname=%u6E05%u51C9%u76DB%u666F") + allFieldCatchDisName("鍖椾含","http://www.xfpg.com.cn/build.do?method=buildlist","JSESSIONID=8311675DA5FDFD38B1C9FEB206547F1E; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1491387026,1492138697,1492400341; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1493024272; xfpgCity=%E5%8C%97%E4%BA%AC%E5%B8%82; pname=%u6E05%u51C9%u76DB%u666F") } public static void allFieldCatchDisName(String city,String url,String cookie){ @@ -63,11 +63,11 @@ class XinFengPingGuBatch{ } /** - * 对小区进行查询抓取 + * 瀵瑰皬鍖鸿繘琛屾煡璇㈡姄鍙� */ public static void catchDisName(String city,String url,String field,String cook){ if(StringUtils.isNotBlank(field)){ - //判断字段是不是需要抓取 弱需要抓取就将log存入库中 + //鍒ゆ柇瀛楁鏄笉鏄渶瑕佹姄鍙� 寮遍渶瑕佹姄鍙栧氨灏唋og瀛樺叆搴撲腑 if(!fieldHasCatch(city, field)){ Map params = new HashMap(); params.put("input", field) @@ -94,7 +94,7 @@ class XinFengPingGuBatch{ dis.put("city", city); dis.put("name", value); dis.put("field", field); - //判断是不是需要入库 去重入库 + //鍒ゆ柇鏄笉鏄渶瑕佸叆搴� 鍘婚噸鍏ュ簱 if(!disNameHasRuKu(city,value)){ XING_FENG_PING_DISNAME.save(dis) } @@ -159,7 +159,7 @@ class XinFengPingGuBatch{ } /** - * 对小区进行查询抓取 + * 瀵瑰皬鍖鸿繘琛屾煡璇㈡姄鍙� */ public static void catchDissInfo(String city,String url,DBObject dis,String cook){ if(dis!=null&&dis.get("name")!=null){ @@ -197,7 +197,7 @@ class XinFengPingGuBatch{ }catch(Exception e){ e.printStackTrace() } - catchLouDongInfo("上海","http://www.xfpg.com.cn/build.do?method=dongnum",db,cook); + catchLouDongInfo("涓婃捣","http://www.xfpg.com.cn/build.do?method=dongnum",db,cook); } } } @@ -206,7 +206,7 @@ class XinFengPingGuBatch{ } } /** - * 对楼栋进行查询抓取 + * 瀵规ゼ鏍嬭繘琛屾煡璇㈡姄鍙� */ public static void catchLouDongInfo(String city,String url,DBObject dis,String cook){ if(dis!=null&&dis.get("pname")!=null){ @@ -248,7 +248,7 @@ class XinFengPingGuBatch{ } /** - * 对房号进行查询抓取 + * 瀵规埧鍙疯繘琛屾煡璇㈡姄鍙� */ public static BasicDBList catchFangHaoInfo(String url,String dongid,String cook){ if(dongid!=null){ @@ -277,7 +277,7 @@ class XinFengPingGuBatch{ } /** - * 使用别名进行抓取 + * 浣跨敤鍒悕杩涜鎶撳彇 * @param dis * @param params * @param headers @@ -342,7 +342,7 @@ class XinFengPingGuBatch{ } /** - * 获取城市的小区 + * 鑾峰彇鍩庡競鐨勫皬鍖� * @param city * @return */ @@ -356,7 +356,7 @@ class XinFengPingGuBatch{ return dbs; } - //获取所有的汉子 + //鑾峰彇鎵�鏈夌殑姹夊瓙 public static List getAllHanZi(){ List list = new ArrayList(); for(int m=0;m<=100;m++){ @@ -382,7 +382,7 @@ class XinFengPingGuBatch{ return list; } - //更具汉子获取拼音 + //鏇村叿姹夊瓙鑾峰彇鎷奸煶 public static String getHanZiPY(String str){ if(StringUtils.isNotBlank(str)){ String s = HanLP.convertToPinyinString(str, "", false); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/XinFengPingGuBatchCopy.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/XinFengPingGuBatchCopy.groovy index 641240152..d35352796 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/XinFengPingGuBatchCopy.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/XinFengPingGuBatchCopy.groovy @@ -21,7 +21,7 @@ import com.mongodb.DBCursor import com.mongodb.DBObject /** - * 成交量相关 + * 鎴愪氦閲忕浉鍏� * @author hubingliang * */ @@ -32,13 +32,13 @@ class XinFengPingGuBatchCopy{ public static final DBCollection XING_FENG_PING_FIELD_LOG = MongoUtils.getCollectionByName("gaode_poi", "xing_feng_ping_field_log", "192.168.0.61", 27017) public static final DBCollection XING_FENG_PING_DISNAME = MongoUtils.getCollectionByName("gaode_poi", "xing_feng_ping_disname", "192.168.0.61", 27017) public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(20) - //获取cookie + //鑾峰彇cookie public static String getXinFengCookie(String src){ String citysCode = URLEncoder.encode(src, "gbk") return citysCode } - //对详情进行抓取 + //瀵硅鎯呰繘琛屾姄鍙� public static detailInfo(String url,String name,String cookie){ /* HttpRequest re = new HttpRequest(); re.ivoke("url"); @@ -61,11 +61,11 @@ class XinFengPingGuBatchCopy{ } static main(args) { - allFieldCatchDisName("呼和浩特","http://www.xfpg.com.cn/build.do?method=buildlist","pname=%u7231%u8FBE%u82B1%u56ED; JSESSIONID=0B792ADAF372513F1FDCF0C3438602CD; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1491387026,1492138697,1492400341; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1493270448; xfpgCity=%E5%91%BC%E5%92%8C%E6%B5%A9%E7%89%B9%E5%B8%82") + allFieldCatchDisName("鍛煎拰娴╃壒","http://www.xfpg.com.cn/build.do?method=buildlist","pname=%u7231%u8FBE%u82B1%u56ED; JSESSIONID=0B792ADAF372513F1FDCF0C3438602CD; Hm_lvt_92e911e1c49474a0e7efd3bf125479ac=1491387026,1492138697,1492400341; Hm_lpvt_92e911e1c49474a0e7efd3bf125479ac=1493270448; xfpgCity=%E5%91%BC%E5%92%8C%E6%B5%A9%E7%89%B9%E5%B8%82") } - //根据中国汉字抓取小区名称入口 + //鏍规嵁涓浗姹夊瓧鎶撳彇灏忓尯鍚嶇О鍏ュ彛 public static void allFieldCatchDisName(String city,String url,String cookie){ List fields = getAllHanZi() Map map = new HashMap>(); @@ -153,11 +153,11 @@ class XinFengPingGuBatchCopy{ } /** - * 对小区进行查询抓取 + * 瀵瑰皬鍖鸿繘琛屾煡璇㈡姄鍙� */ public static void catchDisName(String city,String url,String field,String cook){ if(StringUtils.isNotBlank(field)){ - //判断字段是不是需要抓取 弱需要抓取就将log存入库中 + //鍒ゆ柇瀛楁鏄笉鏄渶瑕佹姄鍙� 寮遍渶瑕佹姄鍙栧氨灏唋og瀛樺叆搴撲腑 if(!fieldHasCatch(city, field)){ Map params = new HashMap(); params.put("input", field) @@ -184,7 +184,7 @@ class XinFengPingGuBatchCopy{ dis.put("city", city); dis.put("name", value); dis.put("field", field); - //判断是不是需要入库 去重入库 + //鍒ゆ柇鏄笉鏄渶瑕佸叆搴� 鍘婚噸鍏ュ簱 if(!disNameHasRuKu(city,value)){ XING_FENG_PING_DISNAME.save(dis) } @@ -224,7 +224,7 @@ class XinFengPingGuBatchCopy{ } /** - * 对小区进行查询抓取 + * 瀵瑰皬鍖鸿繘琛屾煡璇㈡姄鍙� */ public static void catchDissInfo(String city,String url,DBObject dis,String cook){ if(dis!=null&&dis.get("name")!=null){ @@ -269,7 +269,7 @@ class XinFengPingGuBatchCopy{ /** - * 对楼栋进行查询抓取 + * 瀵规ゼ鏍嬭繘琛屾煡璇㈡姄鍙� */ public static void catchLouDongInfo(String city,String url,DBObject dis,String cook){ if(dis!=null&&dis.get("pname")!=null){ @@ -311,7 +311,7 @@ class XinFengPingGuBatchCopy{ } /** - * 对房号进行查询抓取 + * 瀵规埧鍙疯繘琛屾煡璇㈡姄鍙� */ public static BasicDBList catchFangHaoInfo(String url,String dongid,String cook){ if(dongid!=null){ @@ -340,7 +340,7 @@ class XinFengPingGuBatchCopy{ } /** - * 使用别名进行抓取 + * 浣跨敤鍒悕杩涜鎶撳彇 * @param dis * @param params * @param headers @@ -405,7 +405,7 @@ class XinFengPingGuBatchCopy{ } /** - * 获取城市的小区 + * 鑾峰彇鍩庡競鐨勫皬鍖� * @param city * @return */ @@ -419,7 +419,7 @@ class XinFengPingGuBatchCopy{ return dbs; } - //获取所有的汉子 + //鑾峰彇鎵�鏈夌殑姹夊瓙 public static List getAllHanZi(){ List list = new ArrayList(); for(int m=0;m<=100;m++){ @@ -444,7 +444,7 @@ class XinFengPingGuBatchCopy{ } return list; } - //更具汉子获取拼音 + //鏇村叿姹夊瓙鑾峰彇鎷奸煶 public static String getHanZiPY(String str){ if(StringUtils.isNotBlank(str)){ String s = HanLP.convertToPinyinString(str, "", false); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/XinFengPingGuZiDongBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/XinFengPingGuZiDongBatch.groovy index ec1892ff0..204fb4e6d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/XinFengPingGuZiDongBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/XinFengPingGuZiDongBatch.groovy @@ -21,7 +21,7 @@ import com.mongodb.DBCursor import com.mongodb.DBObject /** - * 成交量相关 + * 鎴愪氦閲忕浉鍏� * @author hubingliang * */ @@ -32,7 +32,7 @@ class XinFengPingGuZiDongBatch{ public static final DBCollection XING_FENG_PING_FIELD_LOG = MongoUtils.getCollectionByName("gaode_poi", "xing_feng_ping_field_log", "192.168.0.61", 27017) public static final DBCollection XING_FENG_PING_DISNAME = MongoUtils.getCollectionByName("gaode_poi", "xing_feng_ping_disname", "192.168.0.61", 27017) public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(20) - //获取cookie + //鑾峰彇cookie public static String getXinFengCookie(String cookie){ Map headers = headerMap(cookie); HttpRequest re = new HttpRequest(); @@ -51,7 +51,7 @@ class XinFengPingGuZiDongBatch{ } - //根据中国汉字抓取小区名称入口 + //鏍规嵁涓浗姹夊瓧鎶撳彇灏忓尯鍚嶇О鍏ュ彛 public static void allFieldCatchDisName(String city,String url,String cookie){ List fields = getAllHanZi() Map map = new HashMap>(); @@ -126,11 +126,11 @@ class XinFengPingGuZiDongBatch{ } /** - * 对小区进行查询抓取 + * 瀵瑰皬鍖鸿繘琛屾煡璇㈡姄鍙� */ public static void catchDisName(String city,String url,String field,String cook){ if(StringUtils.isNotBlank(field)){ - //判断字段是不是需要抓取 弱需要抓取就将log存入库中 + //鍒ゆ柇瀛楁鏄笉鏄渶瑕佹姄鍙� 寮遍渶瑕佹姄鍙栧氨灏唋og瀛樺叆搴撲腑 if(!fieldHasCatch(city, field)){ Map params = new HashMap(); params.put("input", field) @@ -157,7 +157,7 @@ class XinFengPingGuZiDongBatch{ dis.put("city", city); dis.put("name", value); dis.put("field", field); - //判断是不是需要入库 去重入库 + //鍒ゆ柇鏄笉鏄渶瑕佸叆搴� 鍘婚噸鍏ュ簱 if(!disNameHasRuKu(city,value)){ XING_FENG_PING_DISNAME.save(dis) } @@ -197,7 +197,7 @@ class XinFengPingGuZiDongBatch{ } /** - * 对小区进行查询抓取 + * 瀵瑰皬鍖鸿繘琛屾煡璇㈡姄鍙� */ public static void catchDissInfo(String city,String url,DBObject dis,String cook){ if(dis!=null&&dis.get("name")!=null){ @@ -242,7 +242,7 @@ class XinFengPingGuZiDongBatch{ /** - * 对楼栋进行查询抓取 + * 瀵规ゼ鏍嬭繘琛屾煡璇㈡姄鍙� */ public static void catchLouDongInfo(String city,String url,DBObject dis,String cook){ if(dis!=null&&dis.get("pname")!=null){ @@ -284,7 +284,7 @@ class XinFengPingGuZiDongBatch{ } /** - * 对房号进行查询抓取 + * 瀵规埧鍙疯繘琛屾煡璇㈡姄鍙� */ public static BasicDBList catchFangHaoInfo(String url,String dongid,String cook){ if(dongid!=null){ @@ -313,7 +313,7 @@ class XinFengPingGuZiDongBatch{ } /** - * 使用别名进行抓取 + * 浣跨敤鍒悕杩涜鎶撳彇 * @param dis * @param params * @param headers @@ -378,7 +378,7 @@ class XinFengPingGuZiDongBatch{ } /** - * 获取城市的小区 + * 鑾峰彇鍩庡競鐨勫皬鍖� * @param city * @return */ @@ -392,7 +392,7 @@ class XinFengPingGuZiDongBatch{ return dbs; } - //获取所有的汉子 + //鑾峰彇鎵�鏈夌殑姹夊瓙 public static List getAllHanZi(){ List list = new ArrayList(); for(int m=0;m<=100;m++){ @@ -417,7 +417,7 @@ class XinFengPingGuZiDongBatch{ } return list; } - //更具汉子获取拼音 + //鏇村叿姹夊瓙鑾峰彇鎷奸煶 public static String getHanZiPY(String str){ if(StringUtils.isNotBlank(str)){ String s = HanLP.convertToPinyinString(str, "", false); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/ZhangJiaGangCatchAnalyBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/ZhangJiaGangCatchAnalyBatch.groovy index 74530104d..4be8f6ab6 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/ZhangJiaGangCatchAnalyBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/ZhangJiaGangCatchAnalyBatch.groovy @@ -27,7 +27,7 @@ import com.mongodb.DBCursor import com.mongodb.DBObject /** - * 抓取拍卖网站 + * 鎶撳彇鎷嶅崠缃戠珯 * @author hubingliang * */ @@ -37,8 +37,8 @@ class ZhangJiaGangCatchAnalyBatch extends BaseBatch{ public static final DBCollection ORIGINAL_DATA = MongoUtils.getCollectionByName("gaode_poi", "original_data", "192.168.0.61", 27017) public static final DBCollection xf_lou_dong = MongoUtils.getCollectionByName("gaode_poi", "loudong3", "192.168.0.61", 27017) public static final DBCollection xf_fang_hao = MongoUtils.getCollectionByName("gaode_poi", "fanghao3", "192.168.0.61", 27017) - public static def cityMap=["北京":"bj", "厦门":"xm","福州":"fz"] - public static def pageSize=["北京":106, "厦门":189, "福州":268] + public static def cityMap=["鍖椾含":"bj", "鍘﹂棬":"xm","绂忓窞":"fz"] + public static def pageSize=["鍖椾含":106, "鍘﹂棬":189, "绂忓窞":268] static main(args) { def s = System.currentTimeMillis() runBatch(new ZhangJiaGangCatchAnalyBatch(), args) @@ -50,11 +50,11 @@ class ZhangJiaGangCatchAnalyBatch extends BaseBatch{ public static void doAll(){ doCatch() //doAnaly() - //doRuKu("绍兴E网") + //doRuKu("缁嶅叴E缃�") } public static doCatch(){ - for(String city:["张家港"]){ + for(String city:["寮犲娓�"]){ List urls = getUrlList(city); for(String url:urls){ catchPage(url,city) @@ -63,7 +63,7 @@ class ZhangJiaGangCatchAnalyBatch extends BaseBatch{ } /** - * 抓取页面 + * 鎶撳彇椤甸潰 */ public static void catchPage(String url,String city){ String page= getHtmlStr(url); @@ -86,7 +86,7 @@ class ZhangJiaGangCatchAnalyBatch extends BaseBatch{ db.put("url", herf); db.put("city", city); db.put("detail", str); - db.put("from", "张家港房产网"); + db.put("from", "寮犲娓埧浜х綉"); ORIGINAL_PAGE.save(db) if(StringUtils.isNotBlank(str)){ println herf+"=========YES" @@ -120,7 +120,7 @@ class ZhangJiaGangCatchAnalyBatch extends BaseBatch{ saveFangHao(city, region, name, houseNumber, unitNumber, roomNumber, area,from,estateType) } } - //格式化单元号 + //鏍煎紡鍖栧崟鍏冨彿 public static String formatUnitNum(String unitNum){ if(StringUtils.isNotBlank(unitNum)){ unitNum = CNNMFilter.convertCnNumber(unitNum); @@ -130,7 +130,7 @@ class ZhangJiaGangCatchAnalyBatch extends BaseBatch{ } return null; } - //房号解析入房号库 + //鎴垮彿瑙f瀽鍏ユ埧鍙峰簱 public static void saveFangHao(String city,String region,String name,String house_num,String unit_num,String room_num,Double area,String from,String type){ HouseLoudong houseLoudng = new HouseLoudong(); houseLoudng.city = city @@ -170,7 +170,7 @@ class ZhangJiaGangCatchAnalyBatch extends BaseBatch{ } } - //楼栋解析入线下库 + //妤兼爧瑙f瀽鍏ョ嚎涓嬪簱 public static void louDongRuKu(String city,String region,String name,String houseNumber,String unitNumber,String from,String type){ List fromList = new ArrayList(); fromList.add(from) @@ -186,7 +186,7 @@ class ZhangJiaGangCatchAnalyBatch extends BaseBatch{ loudong.put("unit_num","--"); } if(StringUtils.isNotBlank(type)){ - if("住宅".equals(type)){ + if("浣忓畢".equals(type)){ loudong.put("type","district"); } } @@ -222,11 +222,11 @@ class ZhangJiaGangCatchAnalyBatch extends BaseBatch{ } - //判断是否可以入库 + //鍒ゆ柇鏄惁鍙互鍏ュ簱 public static boolean canRuKu(DBObject db){ return DealPriceUtils.isAvailableDealPrice(db) } - //解析地址中的楼栋单元房号 + //瑙f瀽鍦板潃涓殑妤兼爧鍗曞厓鎴垮彿 public static Map addressAnaly(String address){ Map map = new HashMap(); String houseNumber = null; @@ -235,21 +235,21 @@ class ZhangJiaGangCatchAnalyBatch extends BaseBatch{ if(StringUtils.isNotBlank(address)){ String str = null if(StringUtils.isBlank(str)){ - str = formatByFirstPattern(address, "\\w+幢.{1,2}单元\\w+(室|)") + str = formatByFirstPattern(address, "\\w+骞�.{1,2}鍗曞厓\\w+(瀹)") if(StringUtils.isNotBlank(str)){ - houseNumber = formatByFirstPattern(str,"\\w+幢").replaceAll("幢", "") - String unitStr = formatByFirstPattern(str,"幢.{1,2}单元"); + houseNumber = formatByFirstPattern(str,"\\w+骞�").replaceAll("骞�", "") + String unitStr = formatByFirstPattern(str,"骞�.{1,2}鍗曞厓"); if(StringUtils.isNotBlank(unitStr)){ - unitNumber = replaceList(unitStr,["幢","单元"]) + unitNumber = replaceList(unitStr,["骞�","鍗曞厓"]) } - roomNumber = formatByFirstPattern(str,"单元\\w+").replaceAll("单元", "") + roomNumber = formatByFirstPattern(str,"鍗曞厓\\w+").replaceAll("鍗曞厓", "") } } if(StringUtils.isBlank(str)){ - str = formatByFirstPattern(address, "\\w+幢\\w+(室)") + str = formatByFirstPattern(address, "\\w+骞\w+(瀹�)") if(StringUtils.isNotBlank(str)){ - houseNumber = formatByFirstPattern(str,"\\w+幢").replaceAll("幢", "") - roomNumber = formatByFirstPattern(str,"幢\\w+").replaceAll("幢", "") + houseNumber = formatByFirstPattern(str,"\\w+骞�").replaceAll("骞�", "") + roomNumber = formatByFirstPattern(str,"骞\w+").replaceAll("骞�", "") } } if(StringUtils.isBlank(str)){ @@ -270,9 +270,9 @@ class ZhangJiaGangCatchAnalyBatch extends BaseBatch{ } } if(StringUtils.isBlank(str)){ - str = formatByFirstPattern(address, "\\d+号") + str = formatByFirstPattern(address, "\\d+鍙�") if(StringUtils.isNotBlank(str)){ - roomNumber = str.replaceAll("号", "") + roomNumber = str.replaceAll("鍙�", "") } } } @@ -289,7 +289,7 @@ class ZhangJiaGangCatchAnalyBatch extends BaseBatch{ Double size = Double.valueOf(area); return size }catch(Exception e){ - println "面积解析错误" + println "闈㈢Н瑙f瀽閿欒" } } return null; @@ -302,7 +302,7 @@ class ZhangJiaGangCatchAnalyBatch extends BaseBatch{ if(RegionData.isRegion(city, re)){ return re; }else{ - return "越城"; + return "瓒婂煄"; } } return null; @@ -312,7 +312,7 @@ class ZhangJiaGangCatchAnalyBatch extends BaseBatch{ public static void doAnaly(){ - for(String city:["绍兴"]){ + for(String city:["缁嶅叴"]){ analyPage(city) println city } @@ -380,7 +380,7 @@ class ZhangJiaGangCatchAnalyBatch extends BaseBatch{ /** - * 拼接url + * 鎷兼帴url */ public static List getUrlList(String city){ List list = new ArrayList(); @@ -454,7 +454,7 @@ class ZhangJiaGangCatchAnalyBatch extends BaseBatch{ return str; } def static exportData(List> datas) { - ExcelUtils.write("D:\\hbl\\tmp\\中国司法拍卖.xlsx", datas, "Sheet1") + ExcelUtils.write("D:\\hbl\\tmp\\涓浗鍙告硶鎷嶅崠.xlsx", datas, "Sheet1") } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/ZhongGouShiFaPaiMaiBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/ZhongGouShiFaPaiMaiBatch.groovy index 2254cb950..3c4661376 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/ZhongGouShiFaPaiMaiBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/spider/ZhongGouShiFaPaiMaiBatch.groovy @@ -24,7 +24,7 @@ import com.mongodb.DBCursor import com.mongodb.DBObject /** - * 抓取拍卖网站 + * 鎶撳彇鎷嶅崠缃戠珯 * @author hubingliang * */ @@ -37,7 +37,7 @@ class ZhongGouShiFaPaiMaiBatch{ }*/ handlePageData() - //println RegionData.getAllRegions("上海"); + //println RegionData.getAllRegions("涓婃捣"); } public static void handlePageData(){ List> ls = new ArrayList>(); @@ -68,51 +68,51 @@ class ZhongGouShiFaPaiMaiBatch{ exportData(ls) } def static exportData(List> datas) { - ExcelUtils.write("D:\\hbl\\tmp\\中国司法拍卖.xlsx", datas, "Sheet1") + ExcelUtils.write("D:\\hbl\\tmp\\涓浗鍙告硶鎷嶅崠.xlsx", datas, "Sheet1") } - //解析内容 + //瑙f瀽鍐呭 public static String handleDetail(String str){ - String area = formatByFirstPattern(str, "证载面积:\\w+(.|)(\\w+)") - area = replaceList(area, ["证载面积:"]) + String area = formatByFirstPattern(str, "璇佽浇闈㈢Н锛歕\w+(.|)(\\w+)") + area = replaceList(area, ["璇佽浇闈㈢Н锛�"]) return area } - //解析标题 + //瑙f瀽鏍囬 public static Map handleTitle(String str){ Map map = new HashMap(); if(StringUtils.isNotBlank(str)){ - String city = formatByFirstPattern(str, ".+?(市)") + String city = formatByFirstPattern(str, ".+?(甯�)") str = replaceList(str, [city]); - String region = formatByFirstPattern(str, ".+?(县|区)") + String region = formatByFirstPattern(str, ".+?(鍘縷鍖�)") str = replaceList(str, [region]); - String address = formatByFirstPattern(str, ".+(路|大道|街|街道)(.+侧|)(\\w+号|)") + String address = formatByFirstPattern(str, ".+(璺瘄澶ч亾|琛梶琛楅亾)(.+渚)(\\w+鍙穦)") if(StringUtils.isBlank(address)){ - address = formatByFirstPattern(str, ".+(镇)") + address = formatByFirstPattern(str, ".+(闀�)") } str = replaceList(str, [address]); - String name = formatByFirstPattern(str,".+?(\\w+)(栋|楼|号楼|幢|单元|)") - name = replaceList(name, ["号楼","楼","栋","幢","单元","(产权证号","小区","住宅"]) + String name = formatByFirstPattern(str,".+?(\\w+)(鏍媩妤紎鍙锋ゼ|骞鍗曞厓|)") + name = replaceList(name, ["鍙锋ゼ","妤�","鏍�","骞�","鍗曞厓","锛堜骇鏉冭瘉鍙�","灏忓尯","浣忓畢"]) if(name){ String num = formatByFirstPattern(name,"(-\\w+|\\w+)") name = replaceList(name, [num]) } - String loudong = formatByFirstPattern(str, "(\\w+)(-|)(\\w+|)(幢|号楼|#|栋)") - loudong = replaceList(loudong, ["号楼","#","栋","幢"]); - String unit = formatByFirstPattern(str, "(\\w+)(单元)") - unit = replaceList(unit, ["单元"]); - String room = formatByFirstPattern(str, "(\\w+-\\w)(室|房产)") + String loudong = formatByFirstPattern(str, "(\\w+)(-|)(\\w+|)(骞鍙锋ゼ|#|鏍�)") + loudong = replaceList(loudong, ["鍙锋ゼ","#","鏍�","骞�"]); + String unit = formatByFirstPattern(str, "(\\w+)(鍗曞厓)") + unit = replaceList(unit, ["鍗曞厓"]); + String room = formatByFirstPattern(str, "(\\w+-\\w)(瀹鎴夸骇)") if(StringUtils.isBlank(room)){ - room = formatByFirstPattern(str, "(\\w+)(室|房产)") + room = formatByFirstPattern(str, "(\\w+)(瀹鎴夸骇)") if(StringUtils.isBlank(room)){ - room = formatByFirstPattern(str, "单元\\w+号") + room = formatByFirstPattern(str, "鍗曞厓\\w+鍙�") } }else{ - room = formatByFirstPattern(str, "(\\w+)(室|房产)") + room = formatByFirstPattern(str, "(\\w+)(瀹鎴夸骇)") if(StringUtils.isBlank(unit)){ unit = getFrontStr(room,"-") } } - room = replaceList(room, ["室","号","房产","单元"]) + room = replaceList(room, ["瀹�","鍙�","鎴夸骇","鍗曞厓"]) map.put("city", city); map.put("region", region); map.put("address", address); @@ -137,7 +137,7 @@ class ZhongGouShiFaPaiMaiBatch{ } - //解析页面 + //瑙f瀽椤甸潰 public static Map analyPage(String url){ int h = 0; int k = 0; @@ -196,7 +196,7 @@ class ZhongGouShiFaPaiMaiBatch{ println detail*/ if(StringUtils.isNotBlank(title)){ h++ - title = replaceList(title,[" ","位于","坐落于",'1幢2902']); + title = replaceList(title,[" ","浣嶄簬","鍧愯惤浜�",'1骞�2902']); map.put("url", db.get("url")) map.put("title", title) map.put("detail", detail) @@ -205,7 +205,7 @@ class ZhongGouShiFaPaiMaiBatch{ return map } /** - * 对页面进行抓取 + * 瀵归〉闈㈣繘琛屾姄鍙� */ public static String catchPage(String url){ String str= getHtmlStr(url); @@ -216,7 +216,7 @@ class ZhongGouShiFaPaiMaiBatch{ String detailStr = getHtmlStr(detailUrl); DBObject db = new BasicDBObject(); db.put("url", detailUrl) - db.put("resource", "变卖公告") + db.put("resource", "鍙樺崠鍏憡") db.put("detail", detailStr) DBObject qu = new BasicDBObject(); qu.put("url", detailUrl) @@ -286,7 +286,7 @@ class ZhongGouShiFaPaiMaiBatch{ } /** - * 获取城市的小区 + * 鑾峰彇鍩庡競鐨勫皬鍖� * @param city * @return */ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/updateDistrictAddressFromBaiApi.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/updateDistrictAddressFromBaiApi.groovy index 26c275fcf..38aa21b2e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/updateDistrictAddressFromBaiApi.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/updateDistrictAddressFromBaiApi.groovy @@ -38,7 +38,7 @@ class updateDistrictAddressFromBaiApi { private static final Pattern CHARSET_PATTERN = Pattern.compile('', Pattern.CASE_INSENSITIVE); static main(args) { - //searchAddressFromThreeMap("黄山") + //searchAddressFromThreeMap("榛勫北") /*List> logList = new ArrayList(); List item = new ArrayList<>(); item.add(1111) @@ -50,12 +50,12 @@ class updateDistrictAddressFromBaiApi { item.add("000") logList.add(item) exportAddressCompareData(logList)*/ - //useThreeApiGetAddress("罗湖山庄", "黄山", "歙县") - //println samePecentString("黄山区清溪","","","黄山","黄山区") + //useThreeApiGetAddress("缃楁箹灞卞簞", "榛勫北", "姝欏幙") + //println samePecentString("榛勫北鍖烘竻婧�","","","榛勫北","榛勫北鍖�") getDateFromLog() } - //从数据苦衷查询数据 + //浠庢暟鎹嫤琛锋煡璇㈡暟鎹� def static getDateFromLog(){ DBCursor cur = address_update.find() List logList = new ArrayList() @@ -74,7 +74,7 @@ class updateDistrictAddressFromBaiApi { query.append("cat", "district") DSCursor dbData = DbUtils.seaweed.find(query) List dbList = dbData.getResults() - //查询出有两个以上,且region不想同的数据 + //鏌ヨ鍑烘湁涓や釜浠ヤ笂锛屼笖region涓嶆兂鍚岀殑鏁版嵁 if(dbList!=null&&dbList.size()>=2){ println dbList.size() if(dbList.size()==2&&!(dbList.get(0).get("address").equals(dbList.get(1).get("address")))){ @@ -109,13 +109,13 @@ class updateDistrictAddressFromBaiApi { List lastData = new ArrayList() BasicDBObject query = new BasicDBObject() - query.append("city","榆林") - query.append("name","和谐小区") + query.append("city","姒嗘灄") + query.append("name","鍜岃皭灏忓尯") query.append("visible",0) query.append("cat", "district") DSCursor dbData = DbUtils.seaweed.find(query) List dbList = dbData.getResults() - //查询出有两个以上,且region不想同的数据 + //鏌ヨ鍑烘湁涓や釜浠ヤ笂锛屼笖region涓嶆兂鍚岀殑鏁版嵁 if(dbList!=null&&dbList.size()>=2){ println dbList.size() if(dbList.size()==2&&!(dbList.get(0).get("address").equals(dbList.get(1).get("address")))){ @@ -145,7 +145,7 @@ class updateDistrictAddressFromBaiApi { - //数据导出 + //鏁版嵁瀵煎嚭 def static exportAddressCompareData1(List> list){ List> addHeadList =new ArrayList() List headList = new ArrayList() @@ -157,7 +157,7 @@ class updateDistrictAddressFromBaiApi { } - //查询某个城市小区三个地图的地址 + //鏌ヨ鏌愪釜鍩庡競灏忓尯涓変釜鍦板浘鐨勫湴鍧� def static searchAddressFromThreeMap(String city){ List> logList = new ArrayList(); BasicDBObject query = new BasicDBObject() @@ -165,39 +165,39 @@ class updateDistrictAddressFromBaiApi { query.append("visible", 0) query.append("cat", "district") DbUtils.seaweed.find(query).each {BasicDBObject it-> - //删除苦衷小区有精确地址的 + //鍒犻櫎鑻﹁》灏忓尯鏈夌簿纭湴鍧�鐨� if(!DataUtil.isPreciseAddress(it.get("address"))){ - //将小区名字,别名取出来 + //灏嗗皬鍖哄悕瀛楋紝鍒悕鍙栧嚭鏉� String districtName = it.get("name") String[] aliaNames = null if(it.get("alias")!=null){ aliaNames = it.get("alias").toArray() } - //通过小区名字来查询小区地址 - //通过百度地图 + //閫氳繃灏忓尯鍚嶅瓧鏉ユ煡璇㈠皬鍖哄湴鍧� + //閫氳繃鐧惧害鍦板浘 def baiduBean = null String baiduAddress = null; baiduBean = getAddressByBaiDuApiTest(city,districtName) if(baiduBean!=null){ baiduAddress = baiduBean.get("address") } - //通过高德地图 + //閫氳繃楂樺痉鍦板浘 def gaodeBean = null String gaodeAddress = null; gaodeBean = getAddressByGaoDeApiTest(city, districtName, aliaNames, it.get("region")) if(gaodeBean!=null){ gaodeAddress = gaodeBean.get("address") } - //通过腾讯地图 + //閫氳繃鑵捐鍦板浘 def tengxunBean = null String tengxunAddress = null; tengxunBean = getAddressByTengXunApiTest(city,districtName,aliaNames,it.get("region")) if(tengxunBean!=null){ tengxunAddress = tengxunBean.get("address") } - //将三个地图的address进行比较 + //灏嗕笁涓湴鍥剧殑address杩涜姣旇緝 String same = samePecentString(baiduAddress,gaodeAddress,tengxunAddress,city,it.get("region")) - //判断地址中是否包含小区名称 + //鍒ゆ柇鍦板潃涓槸鍚﹀寘鍚皬鍖哄悕绉� String contain = null if(baiduAddress!=null&&baiduAddress.contains(districtName)){ contain = "baidu+" @@ -209,7 +209,7 @@ class updateDistrictAddressFromBaiApi { contain = contain+"tengxun" } - //将三个地址进行比较放进list中 + //灏嗕笁涓湴鍧�杩涜姣旇緝鏀捐繘list涓� List item = new ArrayList<>(); item.add(it.get("_id").toString()) item.add(districtName) @@ -226,9 +226,9 @@ class updateDistrictAddressFromBaiApi { exportAddressCompareData(logList) } - //三个地址进行对比,看匹配度 + //涓変釜鍦板潃杩涜瀵规瘮锛岀湅鍖归厤搴� def static samePecentString(String baiduAddress,String gaodeAddress,String tengxunAddress,String city,String district){ - //判断三个钟是否有精准的地址,如果精确就返回 + //鍒ゆ柇涓変釜閽熸槸鍚︽湁绮惧噯鐨勫湴鍧�,濡傛灉绮剧‘灏辫繑鍥� baiduAddress = DataUtil.formateAddress(city,baiduAddress) gaodeAddress = DataUtil.formateAddress(city,gaodeAddress) tengxunAddress = DataUtil.formateAddress(city,tengxunAddress) @@ -241,7 +241,7 @@ class updateDistrictAddressFromBaiApi { else if(DataUtil.isPreciseAddress(tengxunAddress)){ return "tengxun" } - //若果三个都不精确,就进行匹配,找出最匹配的两个 + //鑻ユ灉涓変釜閮戒笉绮剧‘锛屽氨杩涜鍖归厤,鎵惧嚭鏈�鍖归厤鐨勪袱涓� else{ if(baiduAddress==null&&gaodeAddress==null&&tengxunAddress==null){ return null @@ -269,7 +269,7 @@ class updateDistrictAddressFromBaiApi { } } - //三个中有两个不为空 + //涓変釜涓湁涓や釜涓嶄负绌� def static twoHave(String baiduAddress,String gaodeAddress,String tengxunAddress){ int i=0; if(baiduAddress!=null&&!("".equals(baiduAddress))){ @@ -283,7 +283,7 @@ class updateDistrictAddressFromBaiApi { } return i } - //三个字符串进行比较 + //涓変釜瀛楃涓茶繘琛屾瘮杈� def static comparePecent(String baiduAddress,String gaodeAddress,String tengxunAddress){ List baiduList = splitString(baiduAddress) @@ -311,7 +311,7 @@ class updateDistrictAddressFromBaiApi { int baidu_gaode = ((bg*200)/bgtotal) int baidu_tengxun = ((bt*200)/bttotal) int gaode_tengxun = ((gt*200)/gttotal) - //相似的比例 + //鐩镐技鐨勬瘮渚� Map map = new HashMap(); map.put("baidu_gaode", baidu_gaode) map.put("baidu_tengxun", baidu_tengxun) @@ -319,7 +319,7 @@ class updateDistrictAddressFromBaiApi { return map } - //分割字符串放进list中 + //鍒嗗壊瀛楃涓叉斁杩沴ist涓� def static splitString(String str){ List list = new ArrayList() if(str!=null){ @@ -330,24 +330,24 @@ class updateDistrictAddressFromBaiApi { return list; } - //调用API获取地址 + //璋冪敤API鑾峰彇鍦板潃 def static useThreeApiGetAddress(String name,String city,String district){ - //通过小区名字来查询小区地址 - //通过百度地图 + //閫氳繃灏忓尯鍚嶅瓧鏉ユ煡璇㈠皬鍖哄湴鍧� + //閫氳繃鐧惧害鍦板浘 def baiduBean = null String baiduAddress = null; baiduBean = getAddressByBaiDuApiTest(city,name) if(baiduBean!=null){ baiduAddress = baiduBean.get("address") } - //通过高德地图 + //閫氳繃楂樺痉鍦板浘 def gaodeBean = null String gaodeAddress = null; gaodeBean = getAddressByGaoDeApiTest(city, name, null, district) if(gaodeBean!=null){ gaodeAddress = gaodeBean.get("address") } - //通过腾讯地图 + //閫氳繃鑵捐鍦板浘 def tengxunBean = null String tengxunAddress = null; tengxunBean = getAddressByTengXunApiTest(city,name,null,district) @@ -362,7 +362,7 @@ class updateDistrictAddressFromBaiApi { - //数据导出 + //鏁版嵁瀵煎嚭 def static exportAddressCompareData(List> list){ List> addHeadList =new ArrayList() List headList = new ArrayList() @@ -382,11 +382,11 @@ class updateDistrictAddressFromBaiApi { - //对数据库中的小区地址进行更新 + //瀵规暟鎹簱涓殑灏忓尯鍦板潃杩涜鏇存柊 def static updateAddressToMongoDB(String city){ - //创建一个记录更新日志的List + //鍒涘缓涓�涓褰曟洿鏂版棩蹇楃殑List List> logList = new ArrayList(); - //根据城市将数据库中的数据取出来, + //鏍规嵁鍩庡競灏嗘暟鎹簱涓殑鏁版嵁鍙栧嚭鏉ワ紝 BasicDBObject query = new BasicDBObject() query.append("city", city) query.append("visible", 0) @@ -394,13 +394,13 @@ class updateDistrictAddressFromBaiApi { DbUtils.seaweed.find(query).each{BasicDBObject it-> - if(!DataUtil.isPreciseAddress(it.get("address"))){//判断地址是不是精确的地址 + if(!DataUtil.isPreciseAddress(it.get("address"))){//鍒ゆ柇鍦板潃鏄笉鏄簿纭殑鍦板潃 String[] strs = null; if(it.get("alias")!=null){ strs = it.get("alias").toArray() } def bean = null; - // 高德地图 + // 楂樺痉鍦板浘 try{ bean = getAddressByGaoDeApiTest(city, it.get("name"), strs, it.get("region")) }catch(Exception e){ @@ -410,13 +410,13 @@ class updateDistrictAddressFromBaiApi { if(bean!=null){ addressFromApi = bean.get("address") } - String preciseAddress=null//精确地址 + String preciseAddress=null//绮剧‘鍦板潃 String handledAddress = DataUtil.formateAddress(city,addressFromApi) - if(handledAddress!=null&&DataUtil.isPreciseAddress(handledAddress)){//如果处理后的地址部位空,并且获得紧缺地址 + if(handledAddress!=null&&DataUtil.isPreciseAddress(handledAddress)){//濡傛灉澶勭悊鍚庣殑鍦板潃閮ㄤ綅绌猴紝骞朵笖鑾峰緱绱х己鍦板潃 preciseAddress = handledAddress - }else{//用腾讯来处理 + }else{//鐢ㄨ吘璁潵澶勭悊 try{ - bean = getAddressByTengXunApiTest(city,it.get("name"),strs,it.get("region"))//用腾讯地图进行获取数据 + bean = getAddressByTengXunApiTest(city,it.get("name"),strs,it.get("region"))//鐢ㄨ吘璁湴鍥捐繘琛岃幏鍙栨暟鎹� }catch(Exception e){ e.printStackTrace() } @@ -426,9 +426,9 @@ class updateDistrictAddressFromBaiApi { handledAddress = DataUtil.formateAddress(city,addressFromApi) if(handledAddress!=null&&DataUtil.isPreciseAddress(handledAddress)){ preciseAddress = handledAddress - }else{//用百度进行处理 + }else{//鐢ㄧ櫨搴﹁繘琛屽鐞� try{ - bean = getAddressByBaiDuApiTest(city,it.get("name"))//用百度地图进行获取数据 + bean = getAddressByBaiDuApiTest(city,it.get("name"))//鐢ㄧ櫨搴﹀湴鍥捐繘琛岃幏鍙栨暟鎹� }catch(Exception e){ e.printStackTrace() } @@ -441,9 +441,9 @@ class updateDistrictAddressFromBaiApi { } } } - if(preciseAddress!=null){//是精确地址的话就更新进数据库 + if(preciseAddress!=null){//鏄簿纭湴鍧�鐨勮瘽灏辨洿鏂拌繘鏁版嵁搴� if(isBetterPreciseAddress(preciseAddress,it.get("name"))){ - //对数据库中的数据进行更新 + //瀵规暟鎹簱涓殑鏁版嵁杩涜鏇存柊 try{ String str = updateById(it.get("_id"),preciseAddress) ArrayList tempList = new ArrayList() @@ -459,7 +459,7 @@ class updateDistrictAddressFromBaiApi { ExcelUtils.write("E:\\hbl\\work\\addresslog1\\"+city+"log.xlsx", logList, "sheet1") } - //根据id进行更新address + //鏍规嵁id杩涜鏇存柊address def static updateById(def id,String address){ BasicDBObject queryCondition = new BasicDBObject("_id",id); BasicDBObject updateData = new BasicDBObject("address",address) @@ -467,13 +467,13 @@ class updateDistrictAddressFromBaiApi { BasicDBObject update = new BasicDBObject() update.put('$set', updateData) DbUtils.seaweed.update(queryCondition, update) - //输出一个修改日志 + //杈撳嚭涓�涓慨鏀规棩蹇� String str = queryCondition.toString()+"_____"+update.toString() println queryCondition.toString()+"_____"+update.toString() return str } - //同时通过百度 高德 腾讯地图来处理 并且导入excel中 + //鍚屾椂閫氳繃鐧惧害 楂樺痉 鑵捐鍦板浘鏉ュ鐞� 骞朵笖瀵煎叆excel涓� def static updataDataToMogoDB(String city){ List> readList = ExcelUtils.read("E:\\hbl\\work\\"+city+"date\\"+city+".xlsx") for(int i=0;i> addHeadList =new ArrayList() List headList = new ArrayList() headList.add("ID") @@ -549,12 +549,12 @@ class updateDistrictAddressFromBaiApi { ExcelUtils.write("E:\\hbl\\work\\"+city+"date\\"+city+"handle.xlsx", addHeadList, "sheet1") } - //对preciseAddress进行进一步的判断 + //瀵筽reciseAddress杩涜杩涗竴姝ョ殑鍒ゆ柇 public static isBetterPreciseAddress(String address,String name){ - if(address.endsWith("号")||address.endsWith("弄")||address.endsWith("支")){//要以号结尾 - if(address.indexOf(",")==-1 && address.indexOf("、")==-1){//地址中不能包含某些标点 - if(!address.contains(name)){//地址中不能包含小区名字 - if((!address.contains("与"))&&(!address.contains("其他"))&&(!isNumeric(address))){//当地址中有与字并且不能有其他两字,不能只包含数字和号 + if(address.endsWith("鍙�")||address.endsWith("寮�")||address.endsWith("鏀�")){//瑕佷互鍙风粨灏� + if(address.indexOf(",")==-1 && address.indexOf("銆�")==-1){//鍦板潃涓笉鑳藉寘鍚煇浜涙爣鐐� + if(!address.contains(name)){//鍦板潃涓笉鑳藉寘鍚皬鍖哄悕瀛� + if((!address.contains("涓�"))&&(!address.contains("鍏朵粬"))&&(!isNumeric(address))){//褰撳湴鍧�涓湁涓庡瓧骞朵笖涓嶈兘鏈夊叾浠栦袱瀛楋紝涓嶈兘鍙寘鍚暟瀛楀拰鍙� return true } } @@ -563,10 +563,10 @@ class updateDistrictAddressFromBaiApi { return false } - //判断字符串中是否只有数字和号、弄 + //鍒ゆ柇瀛楃涓蹭腑鏄惁鍙湁鏁板瓧鍜屽彿銆佸紕 public static boolean isNumeric(String str){ - String handledStr = str.replaceAll("号", "") - handledStr = handledStr.replaceAll("弄", "") + String handledStr = str.replaceAll("鍙�", "") + handledStr = handledStr.replaceAll("寮�", "") Pattern pattern = Pattern.compile("[0-9]*"); Matcher isNum = pattern.matcher(handledStr); if( !isNum.matches() ) @@ -576,7 +576,7 @@ class updateDistrictAddressFromBaiApi { return true; } - //根据高德api获取地址 + //鏍规嵁楂樺痉api鑾峰彇鍦板潃 def static getAddressByGaoDeApiTest(String city, String name, String[] alias, String region) { def bean = [:] JSONObject json = GaoDeApiUtils.search(endWiths(name), city) @@ -623,7 +623,7 @@ class updateDistrictAddressFromBaiApi { return null } - //根据腾讯API获取地址 + //鏍规嵁鑵捐API鑾峰彇鍦板潃 def static getAddressByTengXunApiTest(String city, String name, String[] alias, String region) { def bean = [:] JSONObject json = TengXunApiUtils.search(city, name) @@ -669,12 +669,12 @@ class updateDistrictAddressFromBaiApi { } - //通过百度api获取地址 + //閫氳繃鐧惧害api鑾峰彇鍦板潃 def static getAddressByBaiDuApiTest(String city, String disName) { def bean = [:] try { disName = formatName(disName) - JSONObject json = BaiDuApiUtils.search(city, disName, "住宅区", 1, 20, 0) + JSONObject json = BaiDuApiUtils.search(city, disName, "浣忓畢鍖�", 1, 20, 0) if(json.getInt("status") == 0) { JSONArray array = json.getJSONArray("results") if(array.size()!=0) { @@ -779,8 +779,8 @@ class updateDistrictAddressFromBaiApi { if(name.indexOf(".") != -1) { name = name.replace(".", "") } - if(name.indexOf("·") != -1){ - name=name.replace("·", "") + if(name.indexOf("路") != -1){ + name=name.replace("路", "") } if(name.indexOf("(") != -1) { name = name.replace("(", "") @@ -793,21 +793,21 @@ class updateDistrictAddressFromBaiApi { def static getSimpleName(String name) { name = formatName(name) - if(name.endsWith("小区") || name.endsWith("公寓") || name.endsWith("别墅")) { + if(name.endsWith("灏忓尯") || name.endsWith("鍏瘬") || name.endsWith("鍒")) { name = name.substring(0, name.length() - 2) } - if(name.endsWith("一期") || name.endsWith("二期") || name.endsWith("三期") || name.endsWith("四期") - || name.endsWith("五期") || name.endsWith("六期") || name.endsWith("七期") || name.endsWith("八期") - || name.endsWith("九期") || name.endsWith("十期") ){ + if(name.endsWith("涓�鏈�") || name.endsWith("浜屾湡") || name.endsWith("涓夋湡") || name.endsWith("鍥涙湡") + || name.endsWith("浜旀湡") || name.endsWith("鍏湡") || name.endsWith("涓冩湡") || name.endsWith("鍏湡") + || name.endsWith("涔濇湡") || name.endsWith("鍗佹湡") ){ name = name.substring(0, name.length() - 2) } return name } def static endWiths(String name) { - if(name.endsWith("一期") || name.endsWith("二期") || name.endsWith("三期") || name.endsWith("四期") - || name.endsWith("五期") || name.endsWith("六期") || name.endsWith("七期") || name.endsWith("八期") - || name.endsWith("九期") || name.endsWith("十期") ){ + if(name.endsWith("涓�鏈�") || name.endsWith("浜屾湡") || name.endsWith("涓夋湡") || name.endsWith("鍥涙湡") + || name.endsWith("浜旀湡") || name.endsWith("鍏湡") || name.endsWith("涓冩湡") || name.endsWith("鍏湡") + || name.endsWith("涔濇湡") || name.endsWith("鍗佹湡") ){ name = name.substring(0, name.length() - 2) } Matcher matcher = CHARSET_PATTERN.matcher(name); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/index/AutocompleteDataUpdaterBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/index/AutocompleteDataUpdaterBatch.groovy index dc27d88f4..fff4e2618 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/index/AutocompleteDataUpdaterBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/index/AutocompleteDataUpdaterBatch.groovy @@ -37,11 +37,11 @@ class AutocompleteDataUpdaterBatch extends BaseBatch { processByCity(city, category) } } - //删除旧版本 + //鍒犻櫎鏃х増鏈� DBObject rq = new BasicDBObject('c_date', new BasicDBObject('$ne', C_DATE)) println DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) + "\tremove: " + rq.toString() AC_COLL.remove(rq) - //重建索引 + //閲嶅缓绱㈠紩 println DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) + "\treindex" AUTOCOMPLETE_COLL.reIndex(new BasicDBObject()) println DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) + "\tdone" @@ -116,7 +116,7 @@ class AutocompleteDataUpdaterBatch extends BaseBatch { DBObject obj = AC_COLL.findOne(new BasicDBObject('keyword', keyword).append('city', city).append('cat', cat)) if(obj != null) { DBObject udata = new BasicDBObject() - //采用的是增量更新,优先保留小区名称的信息 (小区名 > 地址 > 别名 > 地址别名) + //閲囩敤鐨勬槸澧為噺鏇存柊锛屼紭鍏堜繚鐣欏皬鍖哄悕绉扮殑淇℃伅 (灏忓尯鍚� > 鍦板潃 > 鍒悕 > 鍦板潃鍒悕) if(obj.get('c_date') == cdate) { if(("name".equals(type) && isMasterDistrict) || isPriority(obj.get('type'), type)) { udata.put("info", info) @@ -133,7 +133,7 @@ class AutocompleteDataUpdaterBatch extends BaseBatch { AC_COLL.update(new BasicDBObject('_id', obj.get('_id')), new BasicDBObject('$set', udata), false, true) }catch (Exception e){ e.printStackTrace() - println("同步失败:" + obj.get("_id")) + println("鍚屾澶辫触:" + obj.get("_id")) } } }else { @@ -148,7 +148,7 @@ class AutocompleteDataUpdaterBatch extends BaseBatch { AC_COLL.save(entity) }catch (Exception e){ e.printStackTrace() - println("同步失败:" + entity) + println("鍚屾澶辫触:" + entity) } } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/index/DataStatBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/index/DataStatBatch.groovy index 1da38e17e..ecea42ba6 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/index/DataStatBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/index/DataStatBatch.groovy @@ -15,7 +15,7 @@ import com.mongodb.DBObject; class DataStatBatch { private final static String datastoreDomain = "seaweed.db.fangjia.com" static def DSCollection dsCollection = new DataStore(datastoreDomain).getCollection("fangjia.seabird") - public static def MAIN_CITY = ["上海", "北京", "广州", "深圳", "重庆", "天津", "成都", "武汉", "杭州", "南京", "沈阳", "苏州"] + public static def MAIN_CITY = ["涓婃捣", "鍖椾含", "骞垮窞", "娣卞湷", "閲嶅簡", "澶╂触", "鎴愰兘", "姝︽眽", "鏉窞", "鍗椾含", "娌堥槼", "鑻忓窞"] public static def MAIN_SITE = ["soufun.com", "anjuke.com", "58.com", "51f.com", "eeju.com", "baidu.com", "mysupa.com", "fdc.com.cn", "ganji.com", "mytophome.com"] public static void main(String[] args) { @@ -33,14 +33,14 @@ class DataStatBatch { public static def onlineEvaluation() { DBCollection coll = MongoUtils.getCollectionByName("fangjia", "evaluation", "mongo.db.fangjia.com") - println "截止" + DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) + "估价次数为:\t" + coll.count() + println "鎴" + DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) + "浼颁环娆℃暟涓猴細\t" + coll.count() DBObject q = new BasicDBObject(); DBObject rq = new BasicDBObject(); rq.put('$gt', DateUtil.getBeforeDay(new Date(), 30)) rq.put('$lt', DateUtil.truncateDay(new Date())) q.put("c_date", rq) - println "最近一个月日均估价次数:\t" + (coll.count(q) / 30).toInteger(); + println "鏈�杩戜竴涓湀鏃ュ潎浼颁环娆℃暟锛歕t" + (coll.count(q) / 30).toInteger(); } @@ -60,7 +60,7 @@ class DataStatBatch { List frList = dsCollection.facet(q, fq) for(FacetResult fr : frList) { if(fr.getName().equals("website_name")) { - println "数据来源网站数量: \t" + fr.getValues().size() + println "鏁版嵁鏉ユ簮缃戠珯鏁伴噺锛� \t" + fr.getValues().size() } } } @@ -89,7 +89,7 @@ class DataStatBatch { } - println "主要网站占比:" + println "涓昏缃戠珯鍗犳瘮锛�" for(FacetResult fr : frList) { if(fr.getName().equals("website_name")) { for(Count cou : fr.getValues()) { @@ -106,7 +106,7 @@ class DataStatBatch { DBObject q = new BasicDBObject(); q.put("cat", "district") q.put("visible", 0) - println "全国小区总量:\t" + dsCollection.count(q) + println "鍏ㄥ浗灏忓尯鎬婚噺锛歕t" + dsCollection.count(q) } @@ -114,7 +114,7 @@ class DataStatBatch { DBObject q = new BasicDBObject(); q.put("cat", "sell") q.put("visible", 0) - println "线上二手房显示量:\t" + dsCollection.count(q) + println "绾夸笂浜屾墜鎴挎樉绀洪噺锛歕t" + dsCollection.count(q) } public static def avgPriceShowHouseStat() { @@ -125,7 +125,7 @@ class DataStatBatch { rq.put('$gt', DateUtil.getBeforeDay(new Date(), 22)) rq.put('$lt', DateUtil.truncateDay(new Date())) q.put("publish_date", rq) - println "参与均价计算房源量:\t" + dsCollection.count(q) + println "鍙備笌鍧囦环璁$畻鎴挎簮閲忥細\t" + dsCollection.count(q) } @@ -148,7 +148,7 @@ class DataStatBatch { } } - println "主要城市房源占比:" + println "涓昏鍩庡競鎴挎簮鍗犳瘮锛�" for(FacetResult fr : frList) { if(fr.getName().equals("city")) { @@ -178,7 +178,7 @@ class DataStatBatch { } } - println "主要城市小区占比:" + println "涓昏鍩庡競灏忓尯鍗犳瘮锛�" for(FacetResult fr : frList) { if(fr.getName().equals("city")) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/index/DeleteForMobileBlackListBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/index/DeleteForMobileBlackListBatch.groovy index 1670593bf..3a7cc722e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/index/DeleteForMobileBlackListBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/index/DeleteForMobileBlackListBatch.groovy @@ -11,7 +11,7 @@ import com.mongodb.DBCollection import com.mongodb.DBObject /** - * 删除手机号黑名单中的房源 + * 鍒犻櫎鎵嬫満鍙烽粦鍚嶅崟涓殑鎴挎簮 * @author yukai * */ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/index/FangjiaHouseBackupBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/index/FangjiaHouseBackupBatch.groovy index ef2eddfeb..d6b3bb7f3 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/index/FangjiaHouseBackupBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/index/FangjiaHouseBackupBatch.groovy @@ -110,8 +110,8 @@ class FangjiaHouseBackupBatch extends BaseBatch { /** - * 如何操作 - * 0-无操作 1-备份并删除 2-删除 + * 濡備綍鎿嶄綔 + * 0-鏃犳搷浣� 1-澶囦唤骞跺垹闄� 2-鍒犻櫎 * @param dbo * @return */ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/index/HouseRemoveBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/index/HouseRemoveBatch.groovy index b8196201e..52508dd31 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/index/HouseRemoveBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/index/HouseRemoveBatch.groovy @@ -80,7 +80,7 @@ class HouseRemoveBatch extends BaseBatch { break }catch (Exception e){ sleep(1 * 1000) - println("错误重试") + println("閿欒閲嶈瘯") } } } @@ -92,7 +92,7 @@ class HouseRemoveBatch extends BaseBatch { if (c % 10000 == 0) { println c + "\t" + DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) } - //夜间23:30分后自动退出执行 + //澶滈棿23:30鍒嗗悗鑷姩閫�鍑烘墽琛� Integer datetime = new Date().format("HHmm").replaceAll("^0", "").toInteger() if(datetime > 2330){ System.exit(1) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/index/ReIndexShopOfficeBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/index/ReIndexShopOfficeBatch.groovy index 6862ecfe9..b10806892 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/index/ReIndexShopOfficeBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/index/ReIndexShopOfficeBatch.groovy @@ -19,7 +19,7 @@ import com.mongodb.DBObject class ReIndexShopOfficeBatch extends BaseBatch { DSCollection dsCollection = new DataStore("datastore.db.fangjia.com").getCollection("fangjia.seabird") - static def CITIES = ['上海'] + static def CITIES = ['涓婃捣'] static def CATS = ["shop", "shop_sell", "shop_rent", "office", "office_sell", "office_rent"] public static void main(String[] args) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/index/RemoveOverdueSeabirdHouseBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/index/RemoveOverdueSeabirdHouseBatch.groovy index dda66bee6..3ad916b08 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/index/RemoveOverdueSeabirdHouseBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/index/RemoveOverdueSeabirdHouseBatch.groovy @@ -10,7 +10,7 @@ import com.mongodb.Bytes import com.mongodb.DBCollection /** - * 功能说明: + * 鍔熻兘璇存槑: */ @BatchOwner(Watcher.WangWenYan) class RemoveOverdueSeabirdHouseBatch extends BaseBatch { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/index/SeabirdDataControlBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/index/SeabirdDataControlBatch.groovy index 4b5a1f43f..4b90e62a3 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/index/SeabirdDataControlBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/index/SeabirdDataControlBatch.groovy @@ -28,7 +28,7 @@ import org.bson.types.ObjectId /** * Created by dxy on 2015/6/11. - * 控制小区的房源量过渡的情况 + * 鎺у埗灏忓尯鐨勬埧婧愰噺杩囨浮鐨勬儏鍐� */ @BatchOwner(Watcher.DuXiaoYu) class SeabirdDataControlBatch extends BaseBatch { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/index/SeaweedReIndexBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/index/SeaweedReIndexBatch.groovy index a015638cf..2a5cadb00 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/index/SeaweedReIndexBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/index/SeaweedReIndexBatch.groovy @@ -12,7 +12,7 @@ import com.mongodb.Bytes import com.mongodb.DBCollection -@BatchOwner(value = Watcher.WangWenYan, describe = "重建小区索引") +@BatchOwner(value = Watcher.WangWenYan, describe = "閲嶅缓灏忓尯绱㈠紩") class SeaweedReIndexBatch extends BaseBatch { @@ -31,7 +31,7 @@ class SeaweedReIndexBatch extends BaseBatch { DbUtils.seaweed.save(seaweed) count++ if (count % 1000 == 0) { - println("${DateUtil.formatToTightYYYYMMDDhhmmss(new Date())}进度:${count}/${total}") + println("${DateUtil.formatToTightYYYYMMDDhhmmss(new Date())}杩涘害:${count}/${total}") } } println "==================== end reIndex seaweed district " + DateUtils.formatToTightYYYYMMDDhhmmss(new Date()) + " ==============================" diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jiangnanblank/CZBlankDataExport.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jiangnanblank/CZBlankDataExport.groovy index 8afa8652b..b0712b6be 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jiangnanblank/CZBlankDataExport.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jiangnanblank/CZBlankDataExport.groovy @@ -29,7 +29,7 @@ class CZBlankDataExport { def static FITMENTS_TYPES_MAPS = [:]; - def regionMap = ["江苏":"320000","常州":"320400","天宁":"320402","钟楼":"320404","戚墅堰":"320405","新北":"320411","武进":"320412","溧阳":"320481","金坛":"320482"]; + def regionMap = ["姹熻嫃":"320000","甯稿窞":"320400","澶╁畞":"320402","閽熸ゼ":"320404","鎴氬鍫�":"320405","鏂板寳":"320411","姝﹁繘":"320412","婧ч槼":"320481","閲戝潧":"320482"]; //DBCollection DIST_COLL = MongoUtils.getCollectionByName("fangjia_log", "district_cz", "192.168.0.136") //DBCollection SHOP_COLL = MongoUtils.getCollectionByName("fangjia_log", "shop_cz", "192.168.0.136") @@ -48,8 +48,8 @@ class CZBlankDataExport { //DSCollection house_analy_cz = new DataStore("192.168.0.136", 27017).getCollection("fangjia_log.house_analy_cz2") //DSCollection house_analy_cz = new DataStore("192.168.0.136", 27017).getCollection("fangjia_log.house_analy_cz3") - def directionMap1 = ["西南":1,"东南":2,"南":3,"西北":4,"东北":5,"东":6,"西":7,"北":8,"东西":9,"南北":10] - def directionMap = [1:"南",2:"北",3:"南北",4:"东",5:"西",6:"东西",7:"东南",8:"西南",9:"东北",10:"西北"] + def directionMap1 = ["瑗垮崡":1,"涓滃崡":2,"鍗�":3,"瑗垮寳":4,"涓滃寳":5,"涓�":6,"瑗�":7,"鍖�":8,"涓滆タ":9,"鍗楀寳":10] + def directionMap = [1:"鍗�",2:"鍖�",3:"鍗楀寳",4:"涓�",5:"瑗�",6:"涓滆タ",7:"涓滃崡",8:"瑗垮崡",9:"涓滃寳",10:"瑗垮寳"] public static 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" public static EsDataSource dataSource = new EsDataSource() @@ -68,10 +68,10 @@ class CZBlankDataExport { def run(){ def time = DateUtils.formatDateByPattern(new Date(),"yyyyMMdd"); - shopRun("d:\\常州数据结果\\原始数据\\常州江南银行商铺--更新ing(8).xls", "d:\\常州数据结果\\dat\\easycms_shops_market_"+ time+".txt"); - districtRun("D:\\常州数据结果\\原始数据\\常州江南银行住宅--更新ing(19).xls", "d:\\常州数据结果\\dat\\easycms_house_community_"+time +".txt");//住宅 - //shopHouseRun("d:\\常州数据结果\\dat\\easycms_shops_info_"+ time+".txt"); - //districtHouseRun("d:\\常州数据结果\\原始数据\\常州江南银行住宅--更新ing(19).xls", "d:\\常州数据结果\\dat\\easycms_house_info_"+ time+".txt");//房源 + shopRun("d:\\甯稿窞鏁版嵁缁撴灉\\鍘熷鏁版嵁\\甯稿窞姹熷崡閾惰鍟嗛摵--鏇存柊ing(8).xls", "d:\\甯稿窞鏁版嵁缁撴灉\\dat\\easycms_shops_market_"+ time+".txt"); + districtRun("D:\\甯稿窞鏁版嵁缁撴灉\\鍘熷鏁版嵁\\甯稿窞姹熷崡閾惰浣忓畢--鏇存柊ing(19).xls", "d:\\甯稿窞鏁版嵁缁撴灉\\dat\\easycms_house_community_"+time +".txt");//浣忓畢 + //shopHouseRun("d:\\甯稿窞鏁版嵁缁撴灉\\dat\\easycms_shops_info_"+ time+".txt"); + //districtHouseRun("d:\\甯稿窞鏁版嵁缁撴灉\\鍘熷鏁版嵁\\甯稿窞姹熷崡閾惰浣忓畢--鏇存柊ing(19).xls", "d:\\甯稿窞鏁版嵁缁撴灉\\dat\\easycms_house_info_"+ time+".txt");//鎴挎簮 } def shopHouseRun(def datFile){ @@ -79,49 +79,49 @@ class CZBlankDataExport { initFitmentMap(); def result = createShopHouse(); - //写入txt文件 + //鍐欏叆txt鏂囦欢 DataHandleUtils.outPutFile(datFile, appendResult(result, "shop_house", null),"GBK"); - //更改房源 + //鏇存敼鎴挎簮 //matchHouse(); } def shopRun(def filePath, def datFile){ - //读取商铺excel + //璇诲彇鍟嗛摵excel def result = readShopExcel(filePath); -//// //去重 +//// //鍘婚噸 // result = findRepeatDatas(result, "shop"); -//// //商业街商铺合并 +//// //鍟嗕笟琛楀晢閾哄悎骞� result = mergeShop(result); -// //数据填充 +// //鏁版嵁濉厖 result = dataFill(result); - //保存 + //淇濆瓨 saveOrUpdateShop(result); - //转码 - def priceMap = readRoadPrice("d:\\常州数据结果\\路商铺均价.xls") + //杞爜 + def priceMap = readRoadPrice("d:\\甯稿窞鏁版嵁缁撴灉\\璺晢閾哄潎浠�.xls") def ret = convertShopValueCode(priceMap); - //写入txt文件 + //鍐欏叆txt鏂囦欢 DataHandleUtils.outPutFile(datFile, appendResult(ret, "shop", null),"GBK"); } def districtRun(def filePath, def datFile){ - //初始化装修 + //鍒濆鍖栬淇� initFitmentMap(); - //读取人工整理的小区数据 + //璇诲彇浜哄伐鏁寸悊鐨勫皬鍖烘暟鎹� def districts = readDistrict(filePath); - //去重 + //鍘婚噸 districts = findRepeatDatas(districts, "district"); - //标准化数据,转码 + //鏍囧噯鍖栨暟鎹�,杞爜 def ret = standardData(districts); - //导出 + //瀵煎嚭 DataHandleUtils.outPutFile(datFile, appendResult(ret, "district", null),"GBK"); - //常州房产网与我们的数据进行对比 - //def crawlDistricts = readTxt("E:\\常州数据结果\\常州房产网.txt"); + //甯稿窞鎴夸骇缃戜笌鎴戜滑鐨勬暟鎹繘琛屽姣� + //def crawlDistricts = readTxt("E:\\甯稿窞鏁版嵁缁撴灉\\甯稿窞鎴夸骇缃�.txt"); //crawlDistricts = standsDistrict(crawlDistricts); - //导出没有给浙商的小区 - def dbDistricts = CommonDatautils.findAllDistricts("常州", "district", ["city","region","name","alias","estate_type2","estate_charge","estate_company","cubage_percent","virescence_percent","developer","build_date","c_date"]) + //瀵煎嚭娌℃湁缁欐禉鍟嗙殑灏忓尯 + def dbDistricts = CommonDatautils.findAllDistricts("甯稿窞", "district", ["city","region","name","alias","estate_type2","estate_charge","estate_company","cubage_percent","virescence_percent","developer","build_date","c_date"]) findNoInRange(dbDistricts, districts) } @@ -131,20 +131,20 @@ class CZBlankDataExport { //def removeDistricts = readRemoveDistrict(removeDistrictFile); // def districts = readDistrict(filePath); // def districtNames = [] -//// def datas = CommonDatautils.findSeaweedData("常州", "district"); -//// //小区房源 +//// def datas = CommonDatautils.findSeaweedData("甯稿窞", "district"); +//// //灏忓尯鎴挎簮 // removeDistrictHistoryHouses(); // findDistrictHouse(districts, "2017-07-10", []); -// runOpenApiEvaluate();//房源估价 +// runOpenApiEvaluate();//鎴挎簮浼颁环 // updateHihgt(); //deleteHouse(); - exportDistrictHouse([], null, datFile);//导出房源 + exportDistrictHouse([], null, datFile);//瀵煎嚭鎴挎簮 } def deleteHouse(){ - def ret1 = readTxt1("E:\\常州数据结果\\dat\\excel\\删除房源.txt", "UTF-8"); + def ret1 = readTxt1("E:\\甯稿窞鏁版嵁缁撴灉\\dat\\excel\\鍒犻櫎鎴挎簮.txt", "UTF-8"); for(def s : ret1){ DBObject query = new BasicDBObject(); @@ -184,8 +184,8 @@ class CZBlankDataExport { resMap.put(row[0], row[1].toInteger()); } /*ret.each{map-> - def name = map.get("商铺名称"); - def price = map.get("均价"); + def name = map.get("鍟嗛摵鍚嶇О"); + def price = map.get("鍧囦环"); resMap.put(name, price.toInteger()); }*/ return resMap; @@ -203,7 +203,7 @@ class CZBlankDataExport { - /*-----------------------------房源-----------------------------------*/ + /*-----------------------------鎴挎簮-----------------------------------*/ def findDistrictHouse(def datas, def startDate, def removeDistricts, def distPriceMaps){ def result = []; def index = 0; @@ -219,7 +219,7 @@ class CZBlankDataExport { def runOpenApiEvaluate(){ DBObject q = new BasicDBObject() - q.put('status', 1)//正常时用1 + q.put('status', 1)//姝e父鏃剁敤1 def dbcursor = house_analy_cz.find(q).batchSize(100); def index = 0; if(dbcursor.count()>0){ @@ -272,11 +272,11 @@ class CZBlankDataExport { } if(m.estate_type){ - if(m.estate_type=='普通住宅'){ + if(m.estate_type=='鏅�氫綇瀹�'){ params.put("propertyType", "0"); - }else if(m.estate_type=='别墅'){ + }else if(m.estate_type=='鍒'){ params.put("propertyType", "1"); - }else if(m.estate_type=='商住'){ + }else if(m.estate_type=='鍟嗕綇'){ params.put("propertyType", "2"); } }else{ @@ -332,7 +332,7 @@ class CZBlankDataExport { } def height = obj.height - if (!height || height == 1 || (height > 59 && obj.name != "凯纳商务广场")) { + if (!height || height == 1 || (height > 59 && obj.name != "鍑撼鍟嗗姟骞垮満")) { DBObject query = new BasicDBObject() query.put("city", obj.city); query.put("region", obj.region); @@ -387,7 +387,7 @@ class CZBlankDataExport { def code = getBuildTypeCode(null, null, height); - if(name && name.indexOf("别墅")!=-1 || house_area>=200){ + if(name && name.indexOf("鍒")!=-1 || house_area>=200){ code = "3"; if(height>6){ height = null @@ -408,15 +408,15 @@ class CZBlankDataExport { for(def map: dbcursor ){ index++; - //均价 - if(map.name=="壹号广场"){ + //鍧囦环 + if(map.name=="澹瑰彿骞垮満"){ map.avg_price = 6000; - }else if(map.name=='荆川桃园'){ + }else if(map.name=='鑽嗗窛妗冨洯'){ map.avg_price = 13000; }else{ map.avg_price = getDistrictPrice(map.city_old_value, map.section_old_value, map.org_name, map.address, map.block); } - //参考租金 + //鍙傝�冪閲� //ret.rentPrices = getRentPrice(dbo); map.rentPrices = getRentPrice2(map.city_old_value, map.section_old_value, map.org_name, map.estate_type, map.lat, map.lng, map.cat); @@ -488,7 +488,7 @@ class CZBlankDataExport { } - //标准化数据 + //鏍囧噯鍖栨暟鎹� def standardData(def datas, def czIdMap){ def result = []; def index = 0; @@ -524,59 +524,59 @@ class CZBlankDataExport { ret.estate_type = map.estate_type2 ret.cat = map.cat - //均价 - if(map.name=="壹号广场"){ + //鍧囦环 + if(map.name=="澹瑰彿骞垮満"){ ret.avg_price = 6000; - }else if(map.name=='荆川桃园'){ + }else if(map.name=='鑽嗗窛妗冨洯'){ ret.avg_price = 13000; }else{ ret.avg_price = getDistrictPrice(map.city, map.region, map.name, map.address, map.block); } -// //省的码值 - ret.province = regionMap.get("江苏"); +// //鐪佺殑鐮佸�� + ret.province = regionMap.get("姹熻嫃"); ret.city = regionMap.get(map.city); // - ret.province_old_value = "江苏"; + ret.province_old_value = "姹熻嫃"; ret.city_old_value = map.city; -// //区 +// //鍖� ret.section = regionMap.get(map.region); ret.section_old_value = map.region; -// //区域 +// //鍖哄煙 ret.region = getRegionCode(map.region); ret.address = map.address; // ret.build_date = getBuildDate(null, map); // -// //参考租金 +// //鍙傝�冪閲� // //ret.rentPrices = getRentPrice(dbo); ret.rentPrices = getRentPrice2(map.city, map.region, map.name, map.estate_type2, map.lat2, map.lng2, map.cat); // -// //公共服务配套 +// //鍏叡鏈嶅姟閰嶅 ret.publicServiceSetCode = getPublicServiceSetCode(map.lat2, map.lng2) // -// //基础设施 +// //鍩虹璁炬柦 ret.facilitiesCode = "01"; // -// //居住社区成熟度 +// //灞呬綇绀惧尯鎴愮啛搴� ret.sophisticationCode = getSophisticationCode(map.city, map.lat2, map.lng2); // -// //交通条件 +// //浜ら�氭潯浠� ret.trafficCode = getTrafficCode(map.city, map.lat2, map.lng2); // -// //泊车条件 +// //娉婅溅鏉′欢 ret.stopCarCode = getStopCarCode(map); // -// //是否是学区房 +// //鏄惁鏄鍖烘埧 ret.schoolCode = getSchoolCode(map.region, map.lat2, map.lng2); // -// //绿化率 +// //缁垮寲鐜� ret.virescence_percent = getVirescencePercent(map.virescence_percent, ret.build_date); -// //容积率 +// //瀹圭Н鐜� ret.cubage_percent = getCubagePercent(map.cubage_percent, ret.build_date); // -// //物业公司 +// //鐗╀笟鍏徃 ret.estate_company = getEstateCompany(map.estate_company); -// //物业费 +// //鐗╀笟璐� ret.estate_charge = getEstateCharge(map.estate_charge); // ret.estate_type = map.estate_type2; @@ -658,12 +658,12 @@ class CZBlankDataExport { } def district_name = rs.getObject("district_name") - if(district_name.endsWith("别墅") && height && height>=10){ + if(district_name.endsWith("鍒") && height && height>=10){ continue; } def m = [:]; - //小区名称 + //灏忓尯鍚嶇О m.name = dbo.name; if(dbo.alias){ def newAlias = []; @@ -685,20 +685,20 @@ class CZBlankDataExport { m.district_id= dbo.num_id; m.house_id = createHouseId(rs.getObject("url"));//rs.getObject("_id").toString(); - //建筑物总楼层 + //寤虹瓚鐗╂�绘ゼ灞� m.height = height>0?height:null; - //所在楼层 + //鎵�鍦ㄦゼ灞� m.floor = getHouseFloor(floor, m.height); - //建筑面积 + //寤虹瓚闈㈢Н m.house_area = area; - //挂牌价 + //鎸傜墝浠� m.total_price = total_price; def keys = m.region +"-"+ m.name+"-"+m.house_area+"-"+m.height+"-"+m.floor+"-"+m.total_price; if(!houses.contains(keys)){ houses << keys; }else{ - println "此房源已存在....." + println "姝ゆ埧婧愬凡瀛樺湪....." continue; } @@ -708,34 +708,34 @@ class CZBlankDataExport { m.room = rs.getObject("room"); m.hall = rs.getObject("hall"); m.estate_type = rs.getObject("estate_type"); - //建成年代 + //寤烘垚骞翠唬 m.build_date = getBuildDate(rs.getObject("build_date"), dbo); - //总使用年限 + //鎬讳娇鐢ㄥ勾闄� if(districtIds.contains(m.district_id)){ m.property_life = 70; }else{ m.property_life = getPropertyLife(dbo.property_life); } - //朝向 + //鏈濆悜 m.direction = getDirectionCode(rs.getObject("direction"), dbo.estate_type2); - //建筑结构 + //寤虹瓚缁撴瀯 m.build_structure_code = getBuildStructureCode(dbo.build_date, dbo.build_structure); - //建筑类别 + //寤虹瓚绫诲埆 m.build_type_code = getBuildTypeCode(dbo.name, dbo.build_type, height); if(m.build_type_code=='3' && m.height>6){ m.height = null } - //内部装修与成新度 + //鍐呴儴瑁呬慨涓庢垚鏂板害 m.fitment_code = getFitmentCode(rs.getObject("fitment")); - //是否有电梯 + //鏄惁鏈夌數姊� m.elevator_code = getElevatorCode(height, m.build_type_code); - //房价网评估价 + //鎴夸环缃戣瘎浼颁环 //m.evaluation_price = getEvaluationPrice(m); //println "[${index++}] "+new Date(); - //评估时间 + //璇勪及鏃堕棿 m.evaluation_date = DateUtils.formatDateByPattern(new Date(),"yyyyMMdd"); - //挂牌时间 + //鎸傜墝鏃堕棿 m.publish_date = rs.getObject("p_date").toString()//DateUtils.formatDateByPattern(obj.publish_date,"yyyyMMdd"); m.status=1; @@ -822,12 +822,12 @@ class CZBlankDataExport { } } - if(obj.district_name.endsWith("别墅") && obj.height && obj.height>=10){ + if(obj.district_name.endsWith("鍒") && obj.height && obj.height>=10){ continue; } def m = [:]; - //小区名称 + //灏忓尯鍚嶇О m.name = dbo.name; if(dbo.alias){ def newAlias = []; @@ -848,20 +848,20 @@ class CZBlankDataExport { m.region = obj.region; m.district_id= dbo.num_id; m.house_id = obj.get("_id").toString(); - //建筑物总楼层 + //寤虹瓚鐗╂�绘ゼ灞� m.height = obj.height>0?obj.height:null; - //所在楼层 + //鎵�鍦ㄦゼ灞� m.floor = getHouseFloor(obj.floor, m.height); - //建筑面积 + //寤虹瓚闈㈢Н m.house_area = obj.area; - //挂牌价 + //鎸傜墝浠� m.total_price = obj.total_price; def keys = m.region +"-"+ m.name+"-"+m.house_area+"-"+m.height+"-"+m.floor+"-"+m.total_price; if(!houses.contains(keys)){ houses << keys; }else{ - println "此房源已存在....." + println "姝ゆ埧婧愬凡瀛樺湪....." continue; } @@ -871,9 +871,9 @@ class CZBlankDataExport { m.room = obj.room; m.hall = obj.hall; m.estate_type = obj.estate_type; - //建成年代 + //寤烘垚骞翠唬 m.build_date = getBuildDate(obj.build_date, dbo); - //总使用年限 + //鎬讳娇鐢ㄥ勾闄� if(districtIds.contains(m.district_id)){ m.property_life = 70; }else{ @@ -881,26 +881,26 @@ class CZBlankDataExport { } - //朝向 + //鏈濆悜 m.direction = getDirectionCode(obj.direction, dbo.estate_type2); - //建筑结构 + //寤虹瓚缁撴瀯 m.build_structure_code = getBuildStructureCode(dbo.build_date, dbo.build_structure); - //建筑类别 + //寤虹瓚绫诲埆 m.build_type_code = getBuildTypeCode(dbo.name, dbo.build_type, obj.height); if(m.build_type_code=='3' && m.height>6){ m.height = null } - //内部装修与成新度 + //鍐呴儴瑁呬慨涓庢垚鏂板害 m.fitment_code = getFitmentCode(obj.fitment); - //是否有电梯 + //鏄惁鏈夌數姊� m.elevator_code = getElevatorCode(obj.height, m.build_type_code); - //房价网评估价 + //鎴夸环缃戣瘎浼颁环 //m.evaluation_price = getEvaluationPrice(m); //println "[${index++}] "+new Date(); - //评估时间 + //璇勪及鏃堕棿 m.evaluation_date = DateUtils.formatDateByPattern(new Date(),"yyyyMMdd"); - //挂牌时间 + //鎸傜墝鏃堕棿 m.publish_date = DateUtils.formatDateByPattern(obj.publish_date,"yyyyMMdd"); m.status=1; @@ -925,16 +925,16 @@ class CZBlankDataExport { house_analy_cz.save(udata) } - //1-毛坯;2-简装;3-精装; + //1-姣涘澂锛�2-绠�瑁咃紱3-绮捐锛� def getFitmentCode(def fitment){ fitment = fetchFitmentInfo(fitment); if(fitment){ - if(fitment.indexOf("毛坯")!=-1){ + if(fitment.indexOf("姣涘澂")!=-1){ return "01"; - }else if(fitment.indexOf("简装")!=-1){ + }else if(fitment.indexOf("绠�瑁�")!=-1){ return "02"; - }else if(fitment.indexOf("精装")!=-1){ + }else if(fitment.indexOf("绮捐")!=-1){ return "03"; }else{ return "04"; @@ -993,34 +993,34 @@ class CZBlankDataExport { return 70; } - //1-正南;2-正北;3-南北;4-正东;5-正西;6-东西;7-东南;8-西南;9-东北;10-西北; + //1-姝e崡锛�2-姝e寳锛�3-鍗楀寳锛�4-姝d笢锛�5-姝hタ锛�6-涓滆タ锛�7-涓滃崡锛�8-瑗垮崡锛�9-涓滃寳锛�10-瑗垮寳锛� def getDirectionCode(def direction, def estate_type){ if(direction){ - direction = direction.replace("朝向","").replace("朝", "").replace("通透", "").replace("正",""); + direction = direction.replace("鏈濆悜","").replace("鏈�", "").replace("閫氶��", "").replace("姝�",""); } - if(direction == "南"){ + if(direction == "鍗�"){ return "01"; - }else if(direction == "北"){ + }else if(direction == "鍖�"){ return "02"; - }else if(direction == "南北"){ + }else if(direction == "鍗楀寳"){ return "03"; - }else if(direction == "东"){ + }else if(direction == "涓�"){ return "04"; - }else if(direction == "西"){ + }else if(direction == "瑗�"){ return "05"; - }else if(direction == "东西"){ + }else if(direction == "涓滆タ"){ return "06"; - }else if(direction == "东南"){ + }else if(direction == "涓滃崡"){ return "07"; - }else if(direction == "西南"){ + }else if(direction == "瑗垮崡"){ return "08"; - }else if(direction == "东北"){ + }else if(direction == "涓滃寳"){ return "09"; - }else if(direction == "西北"){ + }else if(direction == "瑗垮寳"){ return "10"; }else{ - if(estate_type && estate_type.indexOf("别墅")!=-1){ + if(estate_type && estate_type.indexOf("鍒")!=-1){ return "03"; } return "01"; @@ -1028,21 +1028,21 @@ class CZBlankDataExport { return "01"; } - //1-钢混;2-钢和钢混;3-砖木结构;4-混合结构;5-其他结构; + //1-閽㈡贩锛�2-閽㈠拰閽㈡贩锛�3-鐮栨湪缁撴瀯锛�4-娣峰悎缁撴瀯锛�5-鍏朵粬缁撴瀯锛� def getBuildStructureCode(def buildDate, def build_structure){ if(buildDate){ buildDate = buildDate.toString() } if(build_structure){ - if(build_structure.indexOf("钢混")!=-1||build_structure.indexOf("钢筋混凝土")!=-1){ + if(build_structure.indexOf("閽㈡贩")!=-1||build_structure.indexOf("閽㈢瓔娣峰嚌鍦�")!=-1){ return "01"; - }else if(build_structure.indexOf("钢和钢混")!=-1){ + }else if(build_structure.indexOf("閽㈠拰閽㈡贩")!=-1){ return "02"; - }else if(build_structure.indexOf("砖木")!=-1){ + }else if(build_structure.indexOf("鐮栨湪")!=-1){ return "03"; - }else if(build_structure.indexOf("混合")!=-1){ + }else if(build_structure.indexOf("娣峰悎")!=-1){ return "04"; - }else if(build_structure.indexOf("钢结构")!=-1){ + }else if(build_structure.indexOf("閽㈢粨鏋�")!=-1){ return "05"; }else{ def year = DataHandleUtils.findPattern(buildDate, "(\\d+)"); @@ -1071,7 +1071,7 @@ class CZBlankDataExport { } - //1-高层;2-小高层;3-多层; 多层小于等于6 小高层小于等于10 其他为高层 + //1-楂樺眰锛�2-灏忛珮灞傦紱3-澶氬眰锛� 澶氬眰灏忎簬绛変簬6 灏忛珮灞傚皬浜庣瓑浜�10 鍏朵粬涓洪珮灞� def getBuildTypeCode(def name, def build_type, def height){ if(height){ @@ -1084,27 +1084,27 @@ class CZBlankDataExport { } }else{ - if(name && name.indexOf("别墅")!=-1){ + if(name && name.indexOf("鍒")!=-1){ return "3"; } if(build_type){ def type = build_type.split(","); if(type.size()==1){ - if(build_type=="高层"||build_type=="超高层"){ + if(build_type=="楂樺眰"||build_type=="瓒呴珮灞�"){ return "1"; - }else if(build_type=="小高层"){ + }else if(build_type=="灏忛珮灞�"){ return "2"; - }else if(build_type=="多层"||build_type=="独栋"||build_type=="联排"||build_type=="双拼"){ + }else if(build_type=="澶氬眰"||build_type=="鐙爧"||build_type=="鑱旀帓"||build_type=="鍙屾嫾"){ return "3"; } }else{ def s = type[0]; - if(s=="小高层"){ + if(s=="灏忛珮灞�"){ return "2"; - }else if(s=="高层"||s=="超高层"){ + }else if(s=="楂樺眰"||s=="瓒呴珮灞�"){ return "1"; - }else if(s=="多层"||s=="独栋"||s=="联排"||s=="双拼"){ + }else if(s=="澶氬眰"||s=="鐙爧"||s=="鑱旀帓"||s=="鍙屾嫾"){ return "3"; } } @@ -1114,7 +1114,7 @@ class CZBlankDataExport { } - //"1-是;2-否;" + //"1-鏄紱2-鍚︼紱" def getElevatorCode(def height, def buildTypeCode){ if(height){ if(height>=7){ @@ -1141,7 +1141,7 @@ class CZBlankDataExport { if(price){ return price.avg_price; }else{ - //样例估价 + //鏍蜂緥浼颁环 def s = OpenApiClient.evaluateDistrictPriceBySimilarHouse3(city, region, name, 100, false); try{ JSONObject jsonObject = JSONObject.fromObject(s); @@ -1157,30 +1157,30 @@ class CZBlankDataExport { } - //分期找总期 - if(name.toString().endsWith("期")){ - def tempname = name.toString().substring(0, name.toString().indexOf("期")-1) + //鍒嗘湡鎵炬�绘湡 + if(name.toString().endsWith("鏈�")){ + def tempname = name.toString().substring(0, name.toString().indexOf("鏈�")-1) def districtStat = CommonDatautils.findDistrictPrice(city, region, tempname); if(districtStat && districtStat.avg_price){ return districtStat.avg_price+150; } } - if(name.toString().endsWith("区")){ - def tempname = name.toString().substring(0, name.toString().indexOf("区")-1) + if(name.toString().endsWith("鍖�")){ + def tempname = name.toString().substring(0, name.toString().indexOf("鍖�")-1) def districtStat = CommonDatautils.findDistrictPrice(city, region, tempname); if(districtStat && districtStat.avg_price){ return districtStat.avg_price+100; } } - //周边均价 + //鍛ㄨ竟鍧囦环 // price = findAroundAvgPrice(city, address, 100); // if(price){ // return price.toString() // } - //板块均价 + //鏉垮潡鍧囦环 if(block){ price = CommonDatautils.queryCityRegionPrice(city, region, block); if(price){ @@ -1188,7 +1188,7 @@ class CZBlankDataExport { } } - //区域均价 + //鍖哄煙鍧囦环 if(!block||!price){ price = CommonDatautils.queryCityRegionPrice(city, region, null); if(price){ @@ -1220,34 +1220,34 @@ class CZBlankDataExport { def shopHouseDataDoing(def city, def startDate){ - //移除历史数据 + //绉婚櫎鍘嗗彶鏁版嵁 removeShopHistoryHouse(); - //造商铺房源数据 + //閫犲晢閾烘埧婧愭暟鎹� createHouse(city); - //同步seawater数据到另一张表中 + //鍚屾seawater鏁版嵁鍒板彟涓�寮犺〃涓� toHouseDataDB(startDate); - //导入人工整理的房源 - //importHouse("E:\\常州数据结果\\原始数据\\常州沿街商铺房源整理20161013.xlsx"); + //瀵煎叆浜哄伐鏁寸悊鐨勬埧婧� + //importHouse("E:\\甯稿窞鏁版嵁缁撴灉\\鍘熷鏁版嵁\\甯稿窞娌胯鍟嗛摵鎴挎簮鏁寸悊20161013.xlsx"); } def importHouse(def filename){ def ret = readExcel(filename); for(def row : ret){ def house = [:]; - house.city = row.get("城市"); - house.region = row.get("区域"); - house.name = row.get("商铺名"); - house.area = row.get("建筑面积"); - house.address = row.get("详细地址"); - if(row.get("所在楼层")){ - house.floor = row.get("所在楼层").toInteger(); + house.city = row.get("鍩庡競"); + house.region = row.get("鍖哄煙"); + house.name = row.get("鍟嗛摵鍚�"); + house.area = row.get("寤虹瓚闈㈢Н"); + house.address = row.get("璇︾粏鍦板潃"); + if(row.get("鎵�鍦ㄦゼ灞�")){ + house.floor = row.get("鎵�鍦ㄦゼ灞�").toInteger(); } - if(row.get("建筑物总楼层")){ - house.height = row.get("建筑物总楼层").toInteger(); + if(row.get("寤虹瓚鐗╂�绘ゼ灞�")){ + house.height = row.get("寤虹瓚鐗╂�绘ゼ灞�").toInteger(); } - house.totalPrice = row.get("挂牌价").toInteger(); - house.url = "人工整理"; + house.totalPrice = row.get("鎸傜墝浠�").toInteger(); + house.url = "浜哄伐鏁寸悊"; saveShopHouse(house); } } @@ -1273,7 +1273,7 @@ class CZBlankDataExport { // Integer startDateInt = Integer.valueOf(dateStr); // DBObject q = new BasicDBObject() -// q.put('city', "常州") +// q.put('city', "甯稿窞") // q.put("cat" , "shop_sell") // // q.put('publish_date', new BasicDBObject('$gte', startDate).append('$lte', startDate)); @@ -1282,7 +1282,7 @@ class CZBlankDataExport { final StringBuffer sqlBuffer = new StringBuffer() sqlBuffer.append("SELECT * FROM \"latest_seawater\" WHERE 1=1") - sqlBuffer.append(" and city = '常州'") + sqlBuffer.append(" and city = '甯稿窞'") sqlBuffer.append(" and cat = 'shop_sell'") sqlBuffer.append(" and m_date >='"+startDate+"'").append(" and m_date <='"+startDate+"'"); ResultSet rs = dataSource.connection.createStatement().executeQuery(sqlBuffer.toString()) @@ -1435,7 +1435,7 @@ class CZBlankDataExport { def dateStr = DateUtils.formatToYYYYMMdd(startDate); Integer startDateInt = Integer.valueOf(dateStr); DBObject q = new BasicDBObject() - q.put('city', "常州") + q.put('city', "甯稿窞") q.put("cat" , "shop_rent") //q.put('publish_date', new BasicDBObject('$gte', startDateInt))//.append('$lt',endDate)); @@ -1509,9 +1509,9 @@ class CZBlankDataExport { alias << map.name - if(map.name.contains("商铺")){ - if(!alias.contains(map.name.replace("商铺", ""))){ - alias << map.name.replace("商铺", "") + if(map.name.contains("鍟嗛摵")){ + if(!alias.contains(map.name.replace("鍟嗛摵", ""))){ + alias << map.name.replace("鍟嗛摵", "") } } return alias; @@ -1538,9 +1538,9 @@ class CZBlankDataExport { alias << dbo.name; } - if(dbo.name.endsWith("商铺")){ - if(!alias.contains(dbo.name.replace("商铺",""))){ - alias << dbo.name.replace("商铺",""); + if(dbo.name.endsWith("鍟嗛摵")){ + if(!alias.contains(dbo.name.replace("鍟嗛摵",""))){ + alias << dbo.name.replace("鍟嗛摵",""); } } BasicDBObject query = new BasicDBObject(); @@ -1574,7 +1574,7 @@ class CZBlankDataExport { println "www" } m.house_id = obj.get("_id").toString(); - //小区名称 + //灏忓尯鍚嶇О //m.name = dbo.name; if(dbo.alias){ def newAlias = []; @@ -1591,20 +1591,20 @@ class CZBlankDataExport { }else{ m.name = dbo.name; } - //建筑面积 + //寤虹瓚闈㈢Н m.house_area = obj.area; - //建筑物总楼层 + //寤虹瓚鐗╂�绘ゼ灞� m.height = getShopHeight(obj.height, obj.estate_type, dbo.estate_type2, dbo.heights); - //所在楼层 + //鎵�鍦ㄦゼ灞� m.floor = getInfloor(obj.floor, m.height, obj.estate_type, dbo.estate_type2); - //挂牌价 + //鎸傜墝浠� m.total_price = obj.total_price; def keys = m.name+"-"+m.house_area+"-"+m.height+"-"+m.floor+"-"+m.total_price; if(!houses.contains(keys)){ houses << keys; }else{ - println "此房源已存在....."+keys + println "姝ゆ埧婧愬凡瀛樺湪....."+keys continue; } @@ -1613,25 +1613,25 @@ class CZBlankDataExport { continue; } - //地址 - if(m.name && m.name.endsWith("路商铺")){ - m.address = obj.address.replace("商铺", "") + //鍦板潃 + if(m.name && m.name.endsWith("璺晢閾�")){ + m.address = obj.address.replace("鍟嗛摵", "") }else{ m.address = obj.address } - //建成年代 + //寤烘垚骞翠唬 m.build_date = getBuildDate(obj.build_date, dbo); - //总使用年限 + //鎬讳娇鐢ㄥ勾闄� m.property_life = 40//getShopPropertyLife(dbo.property_life); - //建筑结构 + //寤虹瓚缁撴瀯 def typeCodeMap = getShopBuildStructureCode(dbo.estate_type, obj.estate_type, dbo.build_structure); m.build_structure_code = typeCodeMap.code; m.build_structure = typeCodeMap.value; - //挂牌时间 + //鎸傜墝鏃堕棿 m.publish_date = DateUtils.formatDateByPattern(obj.publish_date,"yyyyMMdd"); @@ -1657,8 +1657,8 @@ class CZBlankDataExport { def findNoInRange(dbDistricts, districts){ def keys = []; def names = []; - println "库中小区数:" + dbDistricts.count(); - println "导给浙商小区数:" + districts.size(); + println "搴撲腑灏忓尯鏁�:" + dbDistricts.count(); + println "瀵肩粰娴欏晢灏忓尯鏁�:" + districts.size(); for(def m : districts){ def key = m.region + "@"+m.name; if(!names.contains(key)){ @@ -1695,7 +1695,7 @@ class CZBlankDataExport { } } - exportNoExists(result,"d:\\常州数据结果\\不存在小区.csv"); + exportNoExists(result,"d:\\甯稿窞鏁版嵁缁撴灉\\涓嶅瓨鍦ㄥ皬鍖�.csv"); } @@ -1705,16 +1705,16 @@ class CZBlankDataExport { if (file.exists()){ file.delete(); } - file.append("区域,") - file.append("名称,") - file.append("物业类型,") - file.append("物业费,") - file.append("物业公司,") - file.append("开发商,") - file.append("容积率,") - file.append("绿化率,") - file.append("建筑年代,") - file.append("创建时间,") + file.append("鍖哄煙,") + file.append("鍚嶇О,") + file.append("鐗╀笟绫诲瀷,") + file.append("鐗╀笟璐�,") + file.append("鐗╀笟鍏徃,") + file.append("寮�鍙戝晢,") + file.append("瀹圭Н鐜�,") + file.append("缁垮寲鐜�,") + file.append("寤虹瓚骞翠唬,") + file.append("鍒涘缓鏃堕棿,") file.append(System.getProperty("line.separator")); ret.each{s-> file.append(s.region + ",","gbk") @@ -1771,9 +1771,9 @@ class CZBlankDataExport { if (file.exists()){ file.delete(); } - file.append("区域,") - file.append("网站名称,") - file.append("标准化名称,") + file.append("鍖哄煙,") + file.append("缃戠珯鍚嶇О,") + file.append("鏍囧噯鍖栧悕绉�,") file.append(System.getProperty("line.separator")); ret.each{map-> file.append(map.region + ",","gbk") @@ -1784,12 +1784,12 @@ class CZBlankDataExport { } - //去除重复数据 + //鍘婚櫎閲嶅鏁版嵁 def findRepeatDatas(def result, def cat){ def repeatDatas = [] def keys = []; def newResult = []; - println "未处理前共:"+result.size(); + println "鏈鐞嗗墠鍏憋細"+result.size(); def index = 0; for(def map : result){ index++; @@ -1802,7 +1802,7 @@ class CZBlankDataExport { if(!dbo){ - println "[${index}]删除:"+map.region + " "+ map.name; + println "[${index}]鍒犻櫎锛�"+map.region + " "+ map.name; continue; } @@ -1810,14 +1810,14 @@ class CZBlankDataExport { def key = dbo.region +"-"+dbo.name; if(keys.contains(key)){ - println "重复:"+map.region+" "+map.name + println "閲嶅锛�"+map.region+" "+map.name continue; }else{ keys << key; newResult << map; } } - println "处理后共:"+newResult.size(); + println "澶勭悊鍚庡叡锛�"+newResult.size(); return newResult; } @@ -1827,14 +1827,14 @@ class CZBlankDataExport { def index = 0; for(def i=result.size()-1;i>=0;i--){ def row = result[i]; - if(row.estate_type && row.estate_type.contains("商业街") && row.name.endsWith("号商铺")){ + if(row.estate_type && row.estate_type.contains("鍟嗕笟琛�") && row.name.endsWith("鍙峰晢閾�")){ index++; - def name = DataHandleUtils.findPattern(row.name, "[路|街](.*?)号商铺"); + def name = DataHandleUtils.findPattern(row.name, "[璺瘄琛梋(.*?)鍙峰晢閾�"); if(name){ - name = row.name.substring(0, row.name.indexOf(name)) + "商铺" + name = row.name.substring(0, row.name.indexOf(name)) + "鍟嗛摵" if(list.contains(name)){ result.remove(row); - println row.name + " 移除" + println row.name + " 绉婚櫎" }else{ list< height){ @@ -1928,11 +1928,11 @@ class CZBlankDataExport { } } - if(house_estate_type && house_estate_type.indexOf("社区商铺")!=-1){ + if(house_estate_type && house_estate_type.indexOf("绀惧尯鍟嗛摵")!=-1){ return 1; } - if(district_estate_type && district_estate_type.indexOf("社区商铺")!=-1){ + if(district_estate_type && district_estate_type.indexOf("绀惧尯鍟嗛摵")!=-1){ return 1; } return 1; @@ -2028,7 +2028,7 @@ class CZBlankDataExport { } } - //排序 + //鎺掑簭 prices.sort(); rooms.sort(); if(prices.size()>1){ @@ -2045,7 +2045,7 @@ class CZBlankDataExport { } - if(priceMap && estate_type2.contains("别墅")){ + if(priceMap && estate_type2.contains("鍒")){ priceMap.remove(1); priceMap.remove(2); @@ -2062,7 +2062,7 @@ class CZBlankDataExport { priceMap = findRegionRentPrice(priceMap, city, region, estate_type2) } - //5室及以上价格小于2000去除 + //5瀹ゅ強浠ヤ笂浠锋牸灏忎簬2000鍘婚櫎 if(priceMap){ if(priceMap.get(5)<2000){ priceMap.remove(5); @@ -2080,16 +2080,16 @@ class CZBlankDataExport { def findRegionRentPrice(def priceMap,def city, def region, def estate_type2){ if(!priceMap){ priceMap = [:] - if(estate_type2=="别墅"){ - def room4 = CommonDatautils.getRegionRent(city, region, 4, "别墅"); + if(estate_type2=="鍒"){ + def room4 = CommonDatautils.getRegionRent(city, region, 4, "鍒"); if(room4){ def v = DataHandleUtils.random(-100, 500) + 100; priceMap.put(4, room4+v); } }else{ - def room1 = CommonDatautils.getRegionRent(city, region, 1, "小区"); - def room2 = CommonDatautils.getRegionRent(city, region, 2, "小区"); + def room1 = CommonDatautils.getRegionRent(city, region, 1, "灏忓尯"); + def room2 = CommonDatautils.getRegionRent(city, region, 2, "灏忓尯"); if(room1){ def v = DataHandleUtils.random(-100, 300) + 100; priceMap.put(1, room1+v); @@ -2206,32 +2206,32 @@ class CZBlankDataExport { def getShopBuildStructureCode(def dbEstateType, def houseEstateType, def build_structure){ def map = [:]; - if(houseEstateType && houseEstateType!='商场商铺'){ + if(houseEstateType && houseEstateType!='鍟嗗満鍟嗛摵'){ map.value = houseEstateType; map.code = "01"; return map; }else{ if(dbEstateType){ - if(dbEstateType!='商场商铺'){ + if(dbEstateType!='鍟嗗満鍟嗛摵'){ map.value = dbEstateType; map.code = "01"; return map; }else{ if(build_structure){ map.value = build_structure; - if(build_structure.indexOf("钢混")!=-1||build_structure.indexOf("钢筋混凝土")!=-1){ + if(build_structure.indexOf("閽㈡贩")!=-1||build_structure.indexOf("閽㈢瓔娣峰嚌鍦�")!=-1){ map.code = "01"; return map; - }else if(build_structure.indexOf("钢和钢混")!=-1){ + }else if(build_structure.indexOf("閽㈠拰閽㈡贩")!=-1){ map.code = "02"; return map; - }else if(build_structure.indexOf("砖木")!=-1){ + }else if(build_structure.indexOf("鐮栨湪")!=-1){ map.code = "03"; return map; - }else if(build_structure.indexOf("混合")!=-1){ + }else if(build_structure.indexOf("娣峰悎")!=-1){ map.code = "04"; return map; - }else if(build_structure.indexOf("钢结构")!=-1){ + }else if(build_structure.indexOf("閽㈢粨鏋�")!=-1){ map.code = "05"; return map; }else{ @@ -2287,19 +2287,19 @@ class CZBlankDataExport { } */ if(!row || row.lat2 == null){ - if(row.name=="延河东路商铺"){ + if(row.name=="寤舵渤涓滆矾鍟嗛摵"){ row.lat2 =(Long)(31.894206 * 10000000000); row.lng2 = (Long)(119.86542 * 10000000000); } - if(row.name=="明清一条街商铺"){ + if(row.name=="鏄庢竻涓�鏉¤鍟嗛摵"){ row.lat2 =(Long)(31.693903 * 10000000000); row.lng2 = (Long)(120.10139 * 10000000000); } } - //填充商铺编号 + //濉厖鍟嗛摵缂栧彿 if(!dbo){ row.shop_id = row.get("_id").toString(); } @@ -2307,15 +2307,15 @@ class CZBlankDataExport { row.price = getShopPrice(row.price, row.city, row.region, row.name); - //公共服务配套 + //鍏叡鏈嶅姟閰嶅 row.publicServiceSetCode = getPublicServiceSetCode(row.lat, row.lng) - //基础设施 + //鍩虹璁炬柦 row.facilitiesCode = "01"; - //居住社区成熟度 + //灞呬綇绀惧尯鎴愮啛搴� row.sophisticationCode = getSophisticationCode(row.city, row.lat, row.lng); - //交通条件 + //浜ら�氭潯浠� row.trafficCode = getTrafficCode(row.city, row.lat, row.lng); row.stopCarCode = "01"; @@ -2354,14 +2354,14 @@ class CZBlankDataExport { m.city = row.city; m.region = row.region - m.province_code = regionMap.get("江苏"); - m.city_code = regionMap.get("常州"); + m.province_code = regionMap.get("姹熻嫃"); + m.city_code = regionMap.get("甯稿窞"); m.region_code = regionMap.get(row.region) m.name = row.name; -// if(m.name=="金牛东路商铺"){ +// if(m.name=="閲戠墰涓滆矾鍟嗛摵"){ // println "eeeeee" // } m.price = row.price; @@ -2404,7 +2404,7 @@ class CZBlankDataExport { } def getLastShopPrice(def name, def estateType, def price, def priceMap){ - //if(name.toString().endsWith("路商铺")){ + //if(name.toString().endsWith("璺晢閾�")){ if(priceMap){ def roadPrice = priceMap.get(name); @@ -2419,11 +2419,11 @@ class CZBlankDataExport { //return null; //}else{ // if(estateType==3){ -// if(name=="明清一条街商铺"){ +// if(name=="鏄庢竻涓�鏉¤鍟嗛摵"){ // return price; -// }else if(name.contains("商业街商铺")||name.contains("商业步行商铺")){ +// }else if(name.contains("鍟嗕笟琛楀晢閾�")||name.contains("鍟嗕笟姝ヨ鍟嗛摵")){ // return price; -// }else if(name.contains("街商铺")){ +// }else if(name.contains("琛楀晢閾�")){ // return null; // } // } @@ -2434,13 +2434,13 @@ class CZBlankDataExport { - //1-主城区:天宁区、钟楼区 2-郊区:武进区、新北区、戚墅堰区 3-县级市:金坛市、溧阳市 + //1-涓诲煄鍖猴細澶╁畞鍖恒�侀挓妤煎尯 2-閮婂尯锛氭杩涘尯銆佹柊鍖楀尯銆佹垰澧呭牥鍖� 3-鍘跨骇甯傦細閲戝潧甯傘�佹骇闃冲競 def getRegionCode(def region){ - if(region.indexOf("天宁")!=-1||region.indexOf("钟楼")!=-1){ + if(region.indexOf("澶╁畞")!=-1||region.indexOf("閽熸ゼ")!=-1){ return "01"; - }else if(region.indexOf("武进")!=-1||region.indexOf("新北")!=-1||region.indexOf("戚墅堰")!=-1){ + }else if(region.indexOf("姝﹁繘")!=-1||region.indexOf("鏂板寳")!=-1||region.indexOf("鎴氬鍫�")!=-1){ return "02"; - }else if(region.indexOf("金坛")!=-1||region.indexOf("溧阳")!=-1){ + }else if(region.indexOf("閲戝潧")!=-1||region.indexOf("婧ч槼")!=-1){ return "03"; }else{ return "99"; @@ -2452,28 +2452,28 @@ class CZBlankDataExport { if(lng && lat){ lat = lat/10000000000; lng = lng/10000000000; - def hspt_count = CommonDatautils.findPoiCount("医院", lat, lng, 1000) - def bank_count = CommonDatautils.findPoiCount("银行", lat, lng, 1000) - def school_count = CommonDatautils.findPoiCount("学校", lat,lng, 1000) - def supermarket_count = CommonDatautils.findPoiCount("超市", lat,lng, 1000) + def hspt_count = CommonDatautils.findPoiCount("鍖婚櫌", lat, lng, 1000) + def bank_count = CommonDatautils.findPoiCount("閾惰", lat, lng, 1000) + def school_count = CommonDatautils.findPoiCount("瀛︽牎", lat,lng, 1000) + def supermarket_count = CommonDatautils.findPoiCount("瓒呭競", lat,lng, 1000) def yl_count1 = CommonDatautils.findPoiCount("KTV", lat,lng, 1000) - def yl_count2 = CommonDatautils.findPoiCount("电影院", lat,lng, 1000) - def yl_count3 = CommonDatautils.findPoiCount("网吧", lat,lng, 1000) - def yl_count4 = CommonDatautils.findPoiCount("健身中心", lat,lng, 1000) + def yl_count2 = CommonDatautils.findPoiCount("鐢靛奖闄�", lat,lng, 1000) + def yl_count3 = CommonDatautils.findPoiCount("缃戝惂", lat,lng, 1000) + def yl_count4 = CommonDatautils.findPoiCount("鍋ヨ韩涓績", lat,lng, 1000) if(hspt_count>=1 && bank_count>=1 && school_count>=1 && supermarket_count>=1 && (yl_count1>=1 || yl_count2>=1 || yl_count3>=1||yl_count4>=1)){ return "01"; }else{ - hspt_count = CommonDatautils.findPoiCount("医院", lat, lng, 2000) - bank_count = CommonDatautils.findPoiCount("银行", lat, lng, 2000) - school_count = CommonDatautils.findPoiCount("学校", lat,lng, 2000) - supermarket_count = CommonDatautils.findPoiCount("超市", lat,lng, 1000) + hspt_count = CommonDatautils.findPoiCount("鍖婚櫌", lat, lng, 2000) + bank_count = CommonDatautils.findPoiCount("閾惰", lat, lng, 2000) + school_count = CommonDatautils.findPoiCount("瀛︽牎", lat,lng, 2000) + supermarket_count = CommonDatautils.findPoiCount("瓒呭競", lat,lng, 1000) yl_count1 = CommonDatautils.findPoiCount("KTV", lat,lng, 2000) - yl_count2 = CommonDatautils.findPoiCount("电影院", lat,lng, 2000) - yl_count3 = CommonDatautils.findPoiCount("网吧", lat,lng, 2000) - yl_count4 = CommonDatautils.findPoiCount("健身中心", lat,lng, 2000) + yl_count2 = CommonDatautils.findPoiCount("鐢靛奖闄�", lat,lng, 2000) + yl_count3 = CommonDatautils.findPoiCount("缃戝惂", lat,lng, 2000) + yl_count4 = CommonDatautils.findPoiCount("鍋ヨ韩涓績", lat,lng, 2000) if(hspt_count>=1 && bank_count>=1 && school_count>=1 && supermarket_count>=1 && (yl_count1>=1 || yl_count2>=1 || yl_count3>=1||yl_count4>=1)){ return "02"; @@ -2495,11 +2495,11 @@ class CZBlankDataExport { if(lng && lat){ lat = lat/10000000000; lng = lng/10000000000; - def supermarket_count = CommonDatautils.findPoiCount("超市", lat,lng, 1000) + def supermarket_count = CommonDatautils.findPoiCount("瓒呭競", lat,lng, 1000) if(supermarket_count>=5){ return "01"; }else{ - supermarket_count = CommonDatautils.findPoiCount("超市", lat,lng, 2000) + supermarket_count = CommonDatautils.findPoiCount("瓒呭競", lat,lng, 2000) if(supermarket_count >= 5){ return "02"; }else{ @@ -2517,10 +2517,10 @@ class CZBlankDataExport { lat = lat/10000000000; lng = lng/10000000000; def redius = 3000; - if(region=="天宁"|| region=="钟楼" ){ + if(region=="澶╁畞"|| region=="閽熸ゼ" ){ redius = 1000; } - def school_count = CommonDatautils.findPoiCount("小学", lat, lng, redius) + def school_count = CommonDatautils.findPoiCount("灏忓", lat, lng, redius) if(school_count >= 1){ return 1; } @@ -2529,7 +2529,7 @@ class CZBlankDataExport { return 0; } - //1-周边公交线路≥10条;2-周边公交线路<10条但≥5条;3-周边公交线路<5条但≥2条;4-周边公交线路<2条 + //1-鍛ㄨ竟鍏氦绾胯矾鈮�10鏉★紱2-鍛ㄨ竟鍏氦绾胯矾锛�10鏉′絾鈮�5鏉★紱3-鍛ㄨ竟鍏氦绾胯矾锛�5鏉′絾鈮�2鏉★紱4-鍛ㄨ竟鍏氦绾胯矾锛�2鏉� def getTrafficCode(def city, def lat, def lng){ if(lng && lat){ lat = lat/10000000000; @@ -2558,7 +2558,7 @@ class CZBlankDataExport { def getStopCarCode(def dbo){ if(dbo.car_site){ - if(dbo.car_site=="
    "||dbo.car_site=="待定"||dbo.car_site.indexOf("暂无")!=-1||dbo.car_site=="详询售楼处"){ + if(dbo.car_site=="
    "||dbo.car_site=="寰呭畾"||dbo.car_site.indexOf("鏆傛棤")!=-1||dbo.car_site=="璇﹁鍞ゼ澶�"){ dbo.car_site =""; } @@ -2590,13 +2590,13 @@ class CZBlankDataExport { }else if(year && year>0 && year<1980){ return "02"; }else{ - if(dbo.name.endsWith("期")||dbo.name.indexOf("别墅")!=-1){ + if(dbo.name.endsWith("鏈�")||dbo.name.indexOf("鍒")!=-1){ return "01"; }else{ - if(dbo.build_type && dbo.build_type.indexOf("高层")!=-1){ + if(dbo.build_type && dbo.build_type.indexOf("楂樺眰")!=-1){ return "01"; - }else if(dbo.estate_type2 && dbo.estate_type2=="别墅"){ + }else if(dbo.estate_type2 && dbo.estate_type2=="鍒"){ return "01"; }else{ @@ -2616,7 +2616,7 @@ class CZBlankDataExport { return "99" } - def endWithChar = ["村","宿舍","堂","弄"]; + def endWithChar = ["鏉�","瀹胯垗","鍫�","寮�"]; for(def s : endWithChar){ if(dbo.name.endsWith(s)){ return "02"; @@ -2673,7 +2673,7 @@ class CZBlankDataExport { def getEstateCompany(def company){ if(company){ - company = company.replace("---","").replace("·",""); + company = company.replace("---","").replace("路",""); return company; } return ""; @@ -2711,7 +2711,7 @@ class CZBlankDataExport { def getShopPrice(def priceString, def city, def region, def name){ if(priceString){ - def avgPrice = priceString.replace("元/㎡","").replace("房源价", "").replace("房源", ""); + def avgPrice = priceString.replace("鍏�/銕�","").replace("鎴挎簮浠�", "").replace("鎴挎簮", ""); if(avgPrice.indexOf("-")!=-1){ def array = avgPrice.split("-") if(array.length>1){ @@ -2742,10 +2742,10 @@ class CZBlankDataExport { def getRentNumber(def rentPrice,def city, def region, def name){ if(rentPrice){ - if(rentPrice.indexOf("元/㎡/天")!=-1){ - return rentPrice.replace("元/㎡/天",""); - }else if(rentPrice.indexOf("元/㎡/月")!=-1){ - def price = rentPrice.replace("元/㎡/月","").toString().trim(); + if(rentPrice.indexOf("鍏�/銕�/澶�")!=-1){ + return rentPrice.replace("鍏�/銕�/澶�",""); + }else if(rentPrice.indexOf("鍏�/銕�/鏈�")!=-1){ + def price = rentPrice.replace("鍏�/銕�/鏈�","").toString().trim(); price = price.toFloat(); price = price/30; return new DecimalFormat("######0.00").format(price); @@ -2756,7 +2756,7 @@ class CZBlankDataExport { return DataHandleUtils.getDoubleRound(2, rentPrice.toDouble()); } }else{ - def day_avg_price = CommonDatautils.queryBusinessDayPrice(city, region, name, "商铺"); + def day_avg_price = CommonDatautils.queryBusinessDayPrice(city, region, name, "鍟嗛摵"); if(day_avg_price){ return day_avg_price; } @@ -2767,9 +2767,9 @@ class CZBlankDataExport { def getEstateChargeValue(def estateCharge){ if(estateCharge){ - if(estateCharge.indexOf("元/㎡/月")!=-1){ - return estateCharge.replace("元/㎡/月",""); - }else if(estateCharge.indexOf("不需缴纳物业费")!=-1){ + if(estateCharge.indexOf("鍏�/銕�/鏈�")!=-1){ + return estateCharge.replace("鍏�/銕�/鏈�",""); + }else if(estateCharge.indexOf("涓嶉渶缂寸撼鐗╀笟璐�")!=-1){ return 0; }else{ return estateCharge; @@ -2780,13 +2780,13 @@ class CZBlankDataExport { def getShopEstateTypeCode(def estateType){ if(estateType){ - if(estateType.indexOf("商场商铺")!=-1){ + if(estateType.indexOf("鍟嗗満鍟嗛摵")!=-1){ return 1; - }else if(estateType.indexOf("专业市场")!=-1){ + }else if(estateType.indexOf("涓撲笟甯傚満")!=-1){ return 2; - }else if(estateType.indexOf("商业街")!=-1){ + }else if(estateType.indexOf("鍟嗕笟琛�")!=-1){ return 3; - }else if(estateType.indexOf("社区商铺")!=-1){ + }else if(estateType.indexOf("绀惧尯鍟嗛摵")!=-1){ return 4; } } @@ -2795,11 +2795,11 @@ class CZBlankDataExport { def getStreetCode(def val){ if(val){ - if(val == "无交通管制"){ + if(val == "鏃犱氦閫氱鍒�"){ return 1; - }else if(val == "单行道"){ + }else if(val == "鍗曡閬�"){ return 2; - }else if(val == "禁行"){ + }else if(val == "绂佽"){ return 3; } return 1; @@ -2826,34 +2826,34 @@ class CZBlankDataExport { def getDistrictString(def result){ def sb = new StringBuffer(); def index = 0; - sb.append("楼盘编号\t\t"); - sb.append("楼盘名称\t\t"); - sb.append("楼盘均价\t\t"); - sb.append("省\t\t"); -// sb.append("省(原值)\t\t"); - sb.append("市\t\t"); -// sb.append("市(原值)\t\t"); - sb.append("区\t\t"); -// sb.append("区(原值)\t\t"); - sb.append("地址\t\t"); - sb.append("所属区域\t\t"); - sb.append("建造年代\t\t"); - sb.append("公共服务配套\t\t"); - sb.append("基础设施\t\t"); - sb.append("居住社区成熟度\t\t"); - sb.append("交通条件\t\t"); - sb.append("泊车条件\t\t"); - sb.append("学区房类型\t\t"); - sb.append("小区绿化率\t\t"); - sb.append("容积率\t\t"); - sb.append("参考租金(1室)\t\t"); - sb.append("参考租金(2室)\t\t"); - sb.append("参考租金(3室)\t\t"); - sb.append("参考租金(4室)\t\t"); - sb.append("参考租金(5室)\t\t"); - sb.append("参考租金(5室以上)\t\t"); - sb.append("物业公司\t\t"); - sb.append("物业费(每月每平米)<#r>\n"); + sb.append("妤肩洏缂栧彿\t\t"); + sb.append("妤肩洏鍚嶇О\t\t"); + sb.append("妤肩洏鍧囦环\t\t"); + sb.append("鐪乗t\t"); +// sb.append("鐪�(鍘熷��)\t\t"); + sb.append("甯俓t\t"); +// sb.append("甯�(鍘熷��)\t\t"); + sb.append("鍖篭t\t"); +// sb.append("鍖�(鍘熷��)\t\t"); + sb.append("鍦板潃\t\t"); + sb.append("鎵�灞炲尯鍩焅t\t"); + sb.append("寤洪�犲勾浠t\t"); + sb.append("鍏叡鏈嶅姟閰嶅\t\t"); + sb.append("鍩虹璁炬柦\t\t"); + sb.append("灞呬綇绀惧尯鎴愮啛搴t\t"); + sb.append("浜ら�氭潯浠禱t\t"); + sb.append("娉婅溅鏉′欢\t\t"); + sb.append("瀛﹀尯鎴跨被鍨媆t\t"); + sb.append("灏忓尯缁垮寲鐜嘰t\t"); + sb.append("瀹圭Н鐜嘰t\t"); + sb.append("鍙傝�冪閲�(1瀹�)\t\t"); + sb.append("鍙傝�冪閲�(2瀹�)\t\t"); + sb.append("鍙傝�冪閲�(3瀹�)\t\t"); + sb.append("鍙傝�冪閲�(4瀹�)\t\t"); + sb.append("鍙傝�冪閲�(5瀹�)\t\t"); + sb.append("鍙傝�冪閲�(5瀹や互涓�)\t\t"); + sb.append("鐗╀笟鍏徃\t\t"); + sb.append("鐗╀笟璐癸紙姣忔湀姣忓钩绫筹級<#r>\n"); for(def m : result){ println m @@ -2899,22 +2899,22 @@ class CZBlankDataExport { def getDistrictHouseString(def result, def removeDistricts){ def sb = new StringBuffer(); def index = 0; - sb.append("房源编号\t\t"); - sb.append("楼盘编号\t\t"); - sb.append("建成年代\t\t"); - sb.append("总使用年限\t\t"); - sb.append("建筑面积\t\t"); - sb.append("朝向\t\t"); - sb.append("建筑结构\t\t"); - sb.append("建筑类别\t\t"); - sb.append("内部装修与成新度\t\t"); - sb.append("所在楼层\t\t"); - sb.append("建筑物总楼层\t\t"); - sb.append("是否有电梯\t\t"); - sb.append("房价网评估价\t\t"); - sb.append("评估时间\t\t"); - sb.append("挂牌价\t\t"); - sb.append("挂牌时间<#r>\n"); + sb.append("鎴挎簮缂栧彿\t\t"); + sb.append("妤肩洏缂栧彿\t\t"); + sb.append("寤烘垚骞翠唬\t\t"); + sb.append("鎬讳娇鐢ㄥ勾闄怽t\t"); + sb.append("寤虹瓚闈㈢Н\t\t"); + sb.append("鏈濆悜\t\t"); + sb.append("寤虹瓚缁撴瀯\t\t"); + sb.append("寤虹瓚绫诲埆\t\t"); + sb.append("鍐呴儴瑁呬慨涓庢垚鏂板害\t\t"); + sb.append("鎵�鍦ㄦゼ灞俓t\t"); + sb.append("寤虹瓚鐗╂�绘ゼ灞俓t\t"); + sb.append("鏄惁鏈夌數姊痋t\t"); + sb.append("鎴夸环缃戣瘎浼颁环\t\t"); + sb.append("璇勪及鏃堕棿\t\t"); + sb.append("鎸傜墝浠穃t\t"); + sb.append("鎸傜墝鏃堕棿<#r>\n"); try { for (def m : result) { index++; @@ -2962,32 +2962,32 @@ class CZBlankDataExport { def getShopString(def result){ def sb = new StringBuffer(); def index = 0; - sb.append("商铺编号\t\t"); - sb.append("商铺名称\t\t"); - sb.append("楼盘均价\t\t"); - sb.append("省\t\t"); - sb.append("市\t\t"); - sb.append("区\t\t"); + sb.append("鍟嗛摵缂栧彿\t\t"); + sb.append("鍟嗛摵鍚嶇О\t\t"); + sb.append("妤肩洏鍧囦环\t\t"); + sb.append("鐪乗t\t"); + sb.append("甯俓t\t"); + sb.append("鍖篭t\t"); -// sb.append("省(原值)\t\t"); -// sb.append("市(原值)\t\t"); -// sb.append("区(原值)\t\t"); +// sb.append("鐪�(鍘熷��)\t\t"); +// sb.append("甯�(鍘熷��)\t\t"); +// sb.append("鍖�(鍘熷��)\t\t"); - sb.append("地址\t\t"); - sb.append("所属区域\t\t"); - sb.append("商铺类型\t\t"); + sb.append("鍦板潃\t\t"); + sb.append("鎵�灞炲尯鍩焅t\t"); + sb.append("鍟嗛摵绫诲瀷\t\t"); -// sb.append("商铺类型(原值)\t\t"); +// sb.append("鍟嗛摵绫诲瀷(鍘熷��)\t\t"); - sb.append("公共服务配套\t\t"); - sb.append("基础设施\t\t"); - sb.append("商业密度\t\t"); - sb.append("交通条件\t\t"); - sb.append("泊车条件\t\t"); - sb.append("临街道路\t\t"); - sb.append("租金\t\t"); - sb.append("物业公司\t\t"); - sb.append("物业费(每月每平米)<#r>\n"); + sb.append("鍏叡鏈嶅姟閰嶅\t\t"); + sb.append("鍩虹璁炬柦\t\t"); + sb.append("鍟嗕笟瀵嗗害\t\t"); + sb.append("浜ら�氭潯浠禱t\t"); + sb.append("娉婅溅鏉′欢\t\t"); + sb.append("涓磋閬撹矾\t\t"); + sb.append("绉熼噾\t\t"); + sb.append("鐗╀笟鍏徃\t\t"); + sb.append("鐗╀笟璐癸紙姣忔湀姣忓钩绫筹級<#r>\n"); for(def m : result){ sb.append(m.num_id.toString()+"\t\t"); sb.append(m.name+"\t\t"); @@ -3029,19 +3029,19 @@ class CZBlankDataExport { def getShopHouseString(def result){ def sb = new StringBuffer(); def index = 0; - sb.append("房源编号\t\t"); - sb.append("商铺编号\t\t"); -// sb.append("商铺名称\t\t"); - sb.append("详细地址\t\t"); - sb.append("建成年代\t\t"); - sb.append("总使用年限\t\t"); - sb.append("建筑面积\t\t"); - sb.append("建筑结构\t\t"); -// sb.append("建筑结构(原值)\t\t"); - sb.append("所在楼层\t\t"); - sb.append("建筑物总楼层\t\t"); - sb.append("挂牌价\t\t"); - sb.append("挂牌时间<#r>\n"); + sb.append("鎴挎簮缂栧彿\t\t"); + sb.append("鍟嗛摵缂栧彿\t\t"); +// sb.append("鍟嗛摵鍚嶇О\t\t"); + sb.append("璇︾粏鍦板潃\t\t"); + sb.append("寤烘垚骞翠唬\t\t"); + sb.append("鎬讳娇鐢ㄥ勾闄怽t\t"); + sb.append("寤虹瓚闈㈢Н\t\t"); + sb.append("寤虹瓚缁撴瀯\t\t"); +// sb.append("寤虹瓚缁撴瀯(鍘熷��)\t\t"); + sb.append("鎵�鍦ㄦゼ灞俓t\t"); + sb.append("寤虹瓚鐗╂�绘ゼ灞俓t\t"); + sb.append("鎸傜墝浠穃t\t"); + sb.append("鎸傜墝鏃堕棿<#r>\n"); for(def m : result){ @@ -3084,7 +3084,7 @@ class CZBlankDataExport { } def standsDistrict(def crawlDistricts){ - def regionMap = CommonDatautils.getAllRegionBlockByCityAndCat("常州","region") + def regionMap = CommonDatautils.getAllRegionBlockByCityAndCat("甯稿窞","region") def index = 0; for(def i=crawlDistricts.size()-1;i>=0;i--){ @@ -3094,43 +3094,43 @@ class CZBlankDataExport { map.old_name = map.name map.name = DataHandleUtils.trimChar(map.name); - map.name = map.name.replace(" ","").replace(" .", "").replace(".", "").replace("“", "").replace("”", "").replace("底商住宅", "").replace("[", "").replace("]", "") + map.name = map.name.replace(" ","").replace(" .", "").replace(".", "").replace("鈥�", "").replace("鈥�", "").replace("搴曞晢浣忓畢", "").replace("[", "").replace("]", "") if(map.name.indexOf("(")>-1){ map.name = map.name.substring(0, map.name.indexOf("(")) } - if(map.name.indexOf("(")>-1){ - map.name = map.name.substring(0, map.name.indexOf("(")) + if(map.name.indexOf("锛�")>-1){ + map.name = map.name.substring(0, map.name.indexOf("锛�")) } - if(map.name.indexOf("期")>-1){ - map.name = map.name.substring(0, map.name.indexOf("期")+1); + if(map.name.indexOf("鏈�")>-1){ + map.name = map.name.substring(0, map.name.indexOf("鏈�")+1); continue; } - def number = DataHandleUtils.findPattern(map.name, "(\\d+)[幢]"); + def number = DataHandleUtils.findPattern(map.name, "(\\d+)[骞"); if(number){ map.name = map.name.substring(0, map.name.indexOf(number)); } - def block0 = DataHandleUtils.findPattern(map.name, "[广场|花园](.*?)地块"); + def block0 = DataHandleUtils.findPattern(map.name, "[骞垮満|鑺卞洯](.*?)鍦板潡"); if(block0){ map.name = map.name.substring(0, map.name.indexOf(block0)); } - def block = DataHandleUtils.findPattern(map.name, "(\\d+|[A-Z]+)号?地块"); + def block = DataHandleUtils.findPattern(map.name, "(\\d+|[A-Z]+)鍙�?鍦板潡"); if(block){ map.name = map.name.substring(0, map.name.indexOf(block)); } - def block1 = DataHandleUtils.findPattern(map.name, "(\\d+|[A-Z]+)[#|#]"); + def block1 = DataHandleUtils.findPattern(map.name, "(\\d+|[A-Z]+)[#|锛僝"); if(block1){ map.name = map.name.substring(0, map.name.indexOf(block1)); } - if(map.name.contains("#")||map.name.contains("#")){ + if(map.name.contains("#")||map.name.contains("锛�")){ - def keys = ["花园","花苑", "广场", "公寓","山庄","名门","市场","盛世","华庭","小区","逸都","名都","雅都","茶都","住宅房","商住楼","华廷","大厦","世界", "村","园","郡","庭"] + def keys = ["鑺卞洯","鑺辫嫅", "骞垮満", "鍏瘬","灞卞簞","鍚嶉棬","甯傚満","鐩涗笘","鍗庡涵","灏忓尯","閫搁兘","鍚嶉兘","闆呴兘","鑼堕兘","浣忓畢鎴�","鍟嗕綇妤�","鍗庡环","澶у帵","涓栫晫", "鏉�","鍥�","閮�","搴�"] for(def key : keys){ if(map.name.contains(key)){ map.name = map.name.substring(0, map.name.indexOf(key)+key.length()); @@ -3140,18 +3140,18 @@ class CZBlankDataExport { } - if(map.name.contains("号楼")){ - if(map.name.contains("号楼")){ - map.name = map.name.substring(0, map.name.indexOf("号楼")+2); + if(map.name.contains("鍙锋ゼ")){ + if(map.name.contains("鍙锋ゼ")){ + map.name = map.name.substring(0, map.name.indexOf("鍙锋ゼ")+2); } - if(map.name.contains("东区")){ - map.name = map.name.substring(0, map.name.indexOf("东区")+2); + if(map.name.contains("涓滃尯")){ + map.name = map.name.substring(0, map.name.indexOf("涓滃尯")+2); } } - def keys = ["花园","花苑", "广场", "公寓","山庄","名门","市场","盛世","华庭","小区","逸都","名都","雅都","茶都","住宅房","商住楼","大厦","世界", "华廷","村","园","郡","庭"] + def keys = ["鑺卞洯","鑺辫嫅", "骞垮満", "鍏瘬","灞卞簞","鍚嶉棬","甯傚満","鐩涗笘","鍗庡涵","灏忓尯","閫搁兘","鍚嶉兘","闆呴兘","鑼堕兘","浣忓畢鎴�","鍟嗕綇妤�","澶у帵","涓栫晫", "鍗庡环","鏉�","鍥�","閮�","搴�"] for(def key : keys){ if(map.name.contains(key)){ map.name = map.name.substring(0, map.name.indexOf(key)+key.length()); @@ -3160,7 +3160,7 @@ class CZBlankDataExport { } index++; - println "[${index}] 原区域: "+map.region + "------原名称:"+map.old_name+"-------新名称:" +map.name+"-------标准化区域: "+map.strand_region + println "[${index}] 鍘熷尯鍩�: "+map.region + "------鍘熷悕绉�:"+map.old_name+"-------鏂板悕绉�:" +map.name+"-------鏍囧噯鍖栧尯鍩�: "+map.strand_region } @@ -3169,7 +3169,7 @@ class CZBlankDataExport { def newResults = []; for(def map : crawlDistricts){ if(newResults.contains(map)){ - println "重复:"+map + println "閲嶅:"+map }else{ newResults << map; } @@ -3184,10 +3184,10 @@ class CZBlankDataExport { def rowCount = workbook.getSheetAt(0).getLastRowNum(); def sheet1=workbook.getSheetAt(0); def rMap = [:]; - //循环行 + //寰幆琛� sheet1.eachWithIndex {row, index-> if(index > 0){ - def key = "常州" + "#"+row.getCell(1).toString()+"#"+row.getCell(2).toString() + def key = "甯稿窞" + "#"+row.getCell(1).toString()+"#"+row.getCell(2).toString() rMap.put(key, row.getCell(0).toString()) } } @@ -3201,12 +3201,12 @@ class CZBlankDataExport { def rowCount = workbook.getSheetAt(0).getLastRowNum(); def sheet1=workbook.getSheetAt(0); def result = []; - //循环行 + //寰幆琛� sheet1.eachWithIndex {row, index-> if(index > 0){ def map = [:]; map.c_id = row.getCell(0).toString(); - map.city = "常州" + map.city = "甯稿窞" map.region = row.getCell(1).toString(); map.name = row.getCell(2).toString(); result << map; @@ -3223,16 +3223,16 @@ class CZBlankDataExport { def rowCount = workbook.getSheetAt(0).getLastRowNum(); def sheet1=workbook.getSheetAt(0); def result = []; - def regionMap = CommonDatautils.getAllRegionBlockByCityAndCat("常州","region") - //循环行 + def regionMap = CommonDatautils.getAllRegionBlockByCityAndCat("甯稿窞","region") + //寰幆琛� sheet1.eachWithIndex {row, index-> if(index>0){ def rowNum = row.getRowNum(); def ret = [:]; - ret.proince = "江苏"; - ret.city = "常州"; + ret.proince = "姹熻嫃"; + ret.city = "甯稿窞"; ret.c_id = row.getCell(1).toString() def region = DataHandleUtils.getStandardRegion(regionMap, row.getCell(2).toString()); ret.region = region; @@ -3274,8 +3274,8 @@ class CZBlankDataExport { //ret.height = getDoubleRound(0,row.getCell(14).numericCellValue).toInteger(); def heights = row.getCell(14).toString(); if(heights){ - if(heights.contains("、")){ - ret.height = Arrays.asList(heights.split("、")) + if(heights.contains("銆�")){ + ret.height = Arrays.asList(heights.split("銆�")) }else{ def arr = [] if(heights.endsWith(".0")){ @@ -3308,9 +3308,9 @@ class CZBlankDataExport { def initFitmentMap(){ - FITMENTS_TYPES_MAPS.put("毛坯", ["毛坯", "清水", "无装修", "独栋毛坯" ]); - FITMENTS_TYPES_MAPS.put("简装", ["简装", "普通装修", "普通","简单装修","简易装修","普装" ]); - FITMENTS_TYPES_MAPS.put("精装", ["精装","全装修", "全装", "中等装修", "中装","中档装修","精致装修","豪华装修","高档","豪华","豪装"]); + FITMENTS_TYPES_MAPS.put("姣涘澂", ["姣涘澂", "娓呮按", "鏃犺淇�", "鐙爧姣涘澂" ]); + FITMENTS_TYPES_MAPS.put("绠�瑁�", ["绠�瑁�", "鏅�氳淇�", "鏅��","绠�鍗曡淇�","绠�鏄撹淇�","鏅" ]); + FITMENTS_TYPES_MAPS.put("绮捐", ["绮捐","鍏ㄨ淇�", "鍏ㄨ", "涓瓑瑁呬慨", "涓","涓。瑁呬慨","绮捐嚧瑁呬慨","璞崕瑁呬慨","楂樻。","璞崕","璞"]); return FITMENTS_TYPES_MAPS; } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jiangnanblank/CZDataBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jiangnanblank/CZDataBatch.groovy index 5ca528cfb..c8d76b77e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jiangnanblank/CZDataBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jiangnanblank/CZDataBatch.groovy @@ -21,7 +21,7 @@ import java.util.concurrent.TimeUnit import java.util.concurrent.atomic.AtomicLong /** * Created by gaojuan on 2017/12/11. - * 批量全国小区及商铺字段转换 + * 鎵归噺鍏ㄥ浗灏忓尯鍙婂晢閾哄瓧娈佃浆鎹� */ @BatchOwner(Watcher.GaoJuan) class CZDataBatch extends BaseBatch{ @@ -30,8 +30,8 @@ class CZDataBatch extends BaseBatch{ def fields = ["city","region","name", "address", "cat","lat2","lng2","lat","lng","alias","property_life","estate_type2","build_date","build_structure","build_type","finish_building_date","live_date","open_date","virescence_percent","cubage_percent","estate_company","estate_charge","car_site", "build_type"] public static DBCollection DIST_COLL = MongoUtils.getCollectionByName2("business", "jn_bank_district", dbUrl) - //final def czIdMap = readCZDistrict("d:\\常州数据结果\\原始数据\\常州江南银行住宅编号.xls"); - //final def czShopMap = readCZShop("d:\\常州数据结果\\原始数据\\常州江南银行商铺--更新ing(8).xls"); + //final def czIdMap = readCZDistrict("d:\\甯稿窞鏁版嵁缁撴灉\\鍘熷鏁版嵁\\甯稿窞姹熷崡閾惰浣忓畢缂栧彿.xls"); + //final def czShopMap = readCZShop("d:\\甯稿窞鏁版嵁缁撴灉\\鍘熷鏁版嵁\\甯稿窞姹熷崡閾惰鍟嗛摵--鏇存柊ing(8).xls"); public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(40) @@ -41,12 +41,12 @@ class CZDataBatch extends BaseBatch{ @Override void process(Object args) { - println "args 参数:"+args.toString() + println "args 鍙傛暟锛�"+args.toString() def citys = CommonDatautils.findAllCity(); - citys.remove("常州"); - citys.add(0, "常州") + citys.remove("甯稿窞"); + citys.add(0, "甯稿窞") for(def city : citys){ def weekend = DateUtils.getFirstDayOfWeek(new Date()) @@ -79,13 +79,13 @@ class CZDataBatch extends BaseBatch{ def result = []; def index = 0; for(def shop : shops){ - if(shop.estate_type2 && shop.estate_type2.contains("商业街") && shop.name.endsWith("号商铺")){ + if(shop.estate_type2 && shop.estate_type2.contains("鍟嗕笟琛�") && shop.name.endsWith("鍙峰晢閾�")){ index++; - def name = DataHandleUtils.findPattern(shop.name, "[路|街](.*?)号商铺"); + def name = DataHandleUtils.findPattern(shop.name, "[璺瘄琛梋(.*?)鍙峰晢閾�"); if(name){ - name = shop.name.substring(0, shop.name.indexOf(name)) + "商铺" + name = shop.name.substring(0, shop.name.indexOf(name)) + "鍟嗛摵" if(removes.contains(name)){ - println shop.name + "移除" + println shop.name + "绉婚櫎" }else{ removes << name shop._id = new ObjectId() @@ -100,8 +100,8 @@ class CZDataBatch extends BaseBatch{ shop.height = null; shop.price = null; shop.address = name; - if(shop.address.endsWith("商铺")){ - shop.address = shop.address.substring(0, shop.address.indexOf("商铺")); + if(shop.address.endsWith("鍟嗛摵")){ + shop.address = shop.address.substring(0, shop.address.indexOf("鍟嗛摵")); } result << shop } @@ -122,10 +122,10 @@ class CZDataBatch extends BaseBatch{ def rowCount = workbook.getSheetAt(0).getLastRowNum(); def sheet1=workbook.getSheetAt(0); def rMap = [:]; - //循环行 + //寰幆琛� sheet1.eachWithIndex {row, index-> if(index > 0){ - def key = "常州" + "#"+row.getCell(1).toString()+"#"+row.getCell(2).toString() + def key = "甯稿窞" + "#"+row.getCell(1).toString()+"#"+row.getCell(2).toString() rMap.put(key, row.getCell(0).toString()) } } @@ -199,7 +199,7 @@ class CZDataBatch extends BaseBatch{ def converShop(def shop){ def map = [:] - //商铺编号 + //鍟嗛摵缂栧彿 def c_id = null; def priceString = null; @@ -221,58 +221,58 @@ class CZDataBatch extends BaseBatch{ }*/ map.num_id = shop.get("_id").toString(); map.cat = "shop"; - // 商铺名称 + // 鍟嗛摵鍚嶇О map.name = shop.name map.alias = shop.alias map.build_date = FzDataUtils.getBuildDate(shop); - //附属属性 + //闄勫睘灞炴�� map.build_type = shop.build_type map.property_life = shop.property_life map.estate_type2 = shop.estate_type2 map.build_structure = shop.build_structure - // 楼盘均价 + // 妤肩洏鍧囦环 map.avg_price = FzDataUtils.getShopPrice(priceString, shop.city, shop.region, shop.name); if(!map.avg_price){ map.avg_price = getSellPrice(shop.city, shop.lng/10000000000.0, shop.lat/10000000000.0) } - // 省 市 区 - if(shop.city == "常州"){ - map.province_code = FzDataUtils.regionMap.get("江苏"); + // 鐪� 甯� 鍖� + if(shop.city == "甯稿窞"){ + map.province_code = FzDataUtils.regionMap.get("姹熻嫃"); map.city_code = FzDataUtils.regionMap.get(shop.city); map.region_code = FzDataUtils.regionMap.get(shop.region); - map.province = "江苏"; + map.province = "姹熻嫃"; map.price_old_string = priceString; map.heights = heights; } map.city = shop.city; map.region = shop.region; - // 地址 + // 鍦板潃 map.address = shop.address - // 所属区域 + // 鎵�灞炲尯鍩� map.in_region_code = FzDataUtils.getRegionCode(shop.region); - // 商铺类型 + // 鍟嗛摵绫诲瀷 map.estate_type = FzDataUtils.getShopEstateTypeCode(shop.estate_type2); - // 公共服务配套 + // 鍏叡鏈嶅姟閰嶅 map.public_service_set_code = FzDataUtils.getPublicServiceSetCode(shop.city, shop.lat2, shop.lng2); - // 基础设施 + // 鍩虹璁炬柦 map.facilities_code = "01"; - // 商业密度 + // 鍟嗕笟瀵嗗害 map.sophistication_code = FzDataUtils.getSophisticationCode(shop.city, shop.lat2, shop.lng2); - // 交通条件 + // 浜ら�氭潯浠� map.traffic_code = FzDataUtils.getTrafficCode(shop.city, shop.lat2, shop.lng2); - // 泊车条件 / + // 娉婅溅鏉′欢 / map.stop_car_code = "01"; - // 临街道路 + // 涓磋閬撹矾 map.street_code = FzDataUtils.getStreetCode(street); - // 租金 + // 绉熼噾 map.shop_rent = FzDataUtils.getRentNumber(rentPrice, shop.city, shop.region, shop.name); if(!map.shop_rent){ map.shop_rent = getRentPrice(shop.city, shop.lng/10000000000.0, shop.lat/10000000000.0) } - // 物业公司 + // 鐗╀笟鍏徃 map.estate_company = FzDataUtils.getEstateCompany(shop.estate_company); - // 物业费(每月每平米) + // 鐗╀笟璐癸紙姣忔湀姣忓钩绫筹級 map.estate_charge = FzDataUtils.getEstateCharge(shop.estate_charge); saveShop(map); @@ -342,16 +342,16 @@ class CZDataBatch extends BaseBatch{ def rowCount = workbook.getSheetAt(0).getLastRowNum(); def sheet1=workbook.getSheetAt(0); def result = [:]; - def regionMap = CommonDatautils.getAllRegionBlockByCityAndCat("常州","region") - //循环行 + def regionMap = CommonDatautils.getAllRegionBlockByCityAndCat("甯稿窞","region") + //寰幆琛� sheet1.eachWithIndex {row, index-> if(index>0){ def rowNum = row.getRowNum(); def ret = [:]; - ret.proince = "江苏"; - ret.city = "常州"; + ret.proince = "姹熻嫃"; + ret.city = "甯稿窞"; ret.c_id = row.getCell(1).toString() def region = DataHandleUtils.getStandardRegion(regionMap, row.getCell(2).toString()); ret.region = region; @@ -380,8 +380,8 @@ class CZDataBatch extends BaseBatch{ //ret.height = getDoubleRound(0,row.getCell(14).numericCellValue).toInteger(); def heights = row.getCell(14).toString(); if(heights){ - if(heights.contains("、")){ - ret.height = Arrays.asList(heights.split("、")) + if(heights.contains("銆�")){ + ret.height = Arrays.asList(heights.split("銆�")) }else{ def arr = [] if(heights.endsWith(".0")){ 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 72df7724e..f0bb508a5 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 @@ -40,12 +40,12 @@ class DayUpdateDistRefreshBatch extends BaseBatch{ }else{ FzDataUtils.converDistrict(distObj, null, null); } - println new Date().toString()+" 【处理完成】 "+d.city +" "+d.region+" "+d.name + println new Date().toString()+" 銆愬鐞嗗畬鎴愩�� "+d.city +" "+d.region+" "+d.name updateTaskStatus(d.id, 2); } } }else{ - println new Date().toString()+ " 无新增小区" + println new Date().toString()+ " 鏃犳柊澧炲皬鍖�" } } @@ -64,7 +64,7 @@ class DayUpdateDistRefreshBatch extends BaseBatch{ def findAllNeedRefreshDist(){ def rets = [] def q = new BasicDBObject() - q.put("status", 5);//未处理 + q.put("status", 5);//鏈鐞� TASK_COLL.find(q).each {d-> rets << ["id":d._id.toString(),"city":d.city, "region":d.region, "name":d.name, "type":d.type, "comm_id":d.comm_id] } 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 0c5917dfd..92a6f79c6 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 @@ -14,13 +14,13 @@ import java.util.regex.Pattern class FzDataUtils { - static def regionMap = ["江苏":"320000","常州":"320400","天宁":"320402","钟楼":"320404","戚墅堰":"320405","新北":"320411","武进":"320412","溧阳":"320481","金坛":"320482"]; + static def regionMap = ["姹熻嫃":"320000","甯稿窞":"320400","澶╁畞":"320402","閽熸ゼ":"320404","鎴氬鍫�":"320405","鏂板寳":"320411","姝﹁繘":"320412","婧ч槼":"320481","閲戝潧":"320482"]; static DBCollection DIST_COLL = MongoUtils.getCollectionByName("business", "jn_bank_district", "mongo.db.fangjia.com") static def converDistrict(def dist, def statMap, def commids){ def map = [:] - //楼盘编号 + //妤肩洏缂栧彿 /* def c_id = czIdMap.get(dist.city+"#"+dist.region+"#"+dist.name) if(c_id){ map.num_id = c_id; @@ -29,7 +29,7 @@ class FzDataUtils { } */ map.num_id = dist.get("_id").toString(); map.cat = "district"; - // 楼盘名称 + // 妤肩洏鍚嶇О map.name = dist.name def alias = dist.alias if(alias){ @@ -39,12 +39,12 @@ class FzDataUtils { map.alias = alias } map.build_date = getBuildDate(dist); - //附属属性 + //闄勫睘灞炴�� map.build_type = dist.build_type map.property_life = dist.property_life map.estate_type2 = dist.estate_type2 map.build_structure = dist.build_structure - // 楼盘均价 + // 妤肩洏鍧囦环 def priceObj = null if(statMap){ priceObj = statMap.get(dist.region+"#"+dist.name) @@ -58,44 +58,44 @@ class FzDataUtils { } } - // 省 市 区 - if(dist.city == "常州"){ - map.province_code = regionMap.get("江苏"); + // 鐪� 甯� 鍖� + if(dist.city == "甯稿窞"){ + map.province_code = regionMap.get("姹熻嫃"); map.city_code = regionMap.get(dist.city); map.region_code = regionMap.get(dist.region); - map.province = "江苏"; + map.province = "姹熻嫃"; } map.city = dist.city; map.region = dist.region; if((commids && !commids.contains(map.num_id)) || !commids){ - // 公共服务配套 + // 鍏叡鏈嶅姟閰嶅 map.public_service_set_code = getPublicServiceSetCode(dist.city, dist.lat2, dist.lng2); - // 基础设施 + // 鍩虹璁炬柦 map.facilities_code = "01"; - // 居住社区成熟度 + // 灞呬綇绀惧尯鎴愮啛搴� map.sophistication_code = getSophisticationCode(dist.city, dist.lat2, dist.lng2); - // 交通条件 + // 浜ら�氭潯浠� map.traffic_code = getTrafficCode(dist.city, dist.lat2, dist.lng2); - // 泊车条件 / + // 娉婅溅鏉′欢 / map.stop_car_code = getStopCarCode(dist); - // /学区房类型 + // /瀛﹀尯鎴跨被鍨� map.school_code = getSchoolCode(dist.city, dist.region, dist.lat2, dist.lng2) ; } - // 地址 + // 鍦板潃 map.address = dist.address - // 所属区域 + // 鎵�灞炲尯鍩� map.in_region_code = getRegionCode(dist.region); - //绿化率 + //缁垮寲鐜� map.virescence_percent = getVirescencePercent(dist.virescence_percent, map.build_date); - //容积率 + //瀹圭Н鐜� map.cubage_percent = getCubagePercent(dist.cubage_percent, map.build_date); - // 参考租金(1室) 参考租金(2室) 参考租金(3室) 参考租金(4室) 参考租金(5室) 参考租金(5室以上) + // 鍙傝�冪閲�(1瀹�) 鍙傝�冪閲�(2瀹�) 鍙傝�冪閲�(3瀹�) 鍙傝�冪閲�(4瀹�) 鍙傝�冪閲�(5瀹�) 鍙傝�冪閲�(5瀹や互涓�) map.rents = getRentPrice2(dist.city, dist.region, dist.name, dist.estate_type2, dist.lat2, dist.lng2, dist.cat); - //物业公司 + //鐗╀笟鍏徃 map.estate_company = getEstateCompany(dist.estate_company); - //物业费 + //鐗╀笟璐� map.estate_charge = getEstateCharge(dist.estate_charge); saveDistrict(map); @@ -145,13 +145,13 @@ class FzDataUtils { } - //1-主城区:天宁区、钟楼区 2-郊区:武进区、新北区、戚墅堰区 3-县级市:金坛市、溧阳市 + //1-涓诲煄鍖猴細澶╁畞鍖恒�侀挓妤煎尯 2-閮婂尯锛氭杩涘尯銆佹柊鍖楀尯銆佹垰澧呭牥鍖� 3-鍘跨骇甯傦細閲戝潧甯傘�佹骇闃冲競 static def getRegionCode(def region){ - if(region.indexOf("天宁")!=-1||region.indexOf("钟楼")!=-1){ + if(region.indexOf("澶╁畞")!=-1||region.indexOf("閽熸ゼ")!=-1){ return "01"; - }else if(region.indexOf("武进")!=-1||region.indexOf("新北")!=-1||region.indexOf("戚墅堰")!=-1){ + }else if(region.indexOf("姝﹁繘")!=-1||region.indexOf("鏂板寳")!=-1||region.indexOf("鎴氬鍫�")!=-1){ return "02"; - }else if(region.indexOf("金坛")!=-1||region.indexOf("溧阳")!=-1){ + }else if(region.indexOf("閲戝潧")!=-1||region.indexOf("婧ч槼")!=-1){ return "03"; }else{ return "99"; @@ -249,7 +249,7 @@ class FzDataUtils { static def getEstateCompany(def company){ if(company){ - company = company.replace("---","").replace("·",""); + company = company.replace("---","").replace("路",""); return company; } return ""; @@ -318,7 +318,7 @@ class FzDataUtils { } } - //排序 + //鎺掑簭 prices.sort(); rooms.sort(); if(prices.size()>1){ @@ -335,7 +335,7 @@ class FzDataUtils { } - if(priceMap && estate_type2.contains("别墅")){ + if(priceMap && estate_type2.contains("鍒")){ priceMap.remove(1); priceMap.remove(2); @@ -352,7 +352,7 @@ class FzDataUtils { // priceMap = findRegionRentPrice(priceMap, city, region, estate_type2) // } - //5室及以上价格小于2000去除 + //5瀹ゅ強浠ヤ笂浠锋牸灏忎簬2000鍘婚櫎 if(priceMap){ if(priceMap.get(5)<2000){ priceMap.remove(5); @@ -374,16 +374,16 @@ class FzDataUtils { static def findRegionRentPrice(def priceMap,def city, def region, def estate_type2){ if(!priceMap){ priceMap = [:] - if(estate_type2=="别墅"){ - def room4 = CommonDatautils.getRegionRent(city, region, 4, "别墅"); + if(estate_type2=="鍒"){ + def room4 = CommonDatautils.getRegionRent(city, region, 4, "鍒"); if(room4){ def v = DataHandleUtils.random(-100, 500) + 100; priceMap.put(4, room4+v); } }else{ - def room1 = CommonDatautils.getRegionRent(city, region, 1, "小区"); - def room2 = CommonDatautils.getRegionRent(city, region, 2, "小区"); + def room1 = CommonDatautils.getRegionRent(city, region, 1, "灏忓尯"); + def room2 = CommonDatautils.getRegionRent(city, region, 2, "灏忓尯"); if(room1){ def v = DataHandleUtils.random(-100, 300) + 100; priceMap.put(1, room1+v); @@ -463,7 +463,7 @@ class FzDataUtils { } - //1-周边公交线路≥10条;2-周边公交线路<10条但≥5条;3-周边公交线路<5条但≥2条;4-周边公交线路<2条 + //1-鍛ㄨ竟鍏氦绾胯矾鈮�10鏉★紱2-鍛ㄨ竟鍏氦绾胯矾锛�10鏉′絾鈮�5鏉★紱3-鍛ㄨ竟鍏氦绾胯矾锛�5鏉′絾鈮�2鏉★紱4-鍛ㄨ竟鍏氦绾胯矾锛�2鏉� static def getTrafficCode(def city, def lat, def lng){ if(lng && lat){ lat = lat/10000000000; @@ -492,7 +492,7 @@ class FzDataUtils { static def getStopCarCode(def dbo){ if(dbo.car_site){ - if(dbo.car_site=="
    "||dbo.car_site=="待定"||dbo.car_site.indexOf("暂无")!=-1||dbo.car_site=="详询售楼处"){ + if(dbo.car_site=="
    "||dbo.car_site=="寰呭畾"||dbo.car_site.indexOf("鏆傛棤")!=-1||dbo.car_site=="璇﹁鍞ゼ澶�"){ dbo.car_site =""; } @@ -524,13 +524,13 @@ class FzDataUtils { }else if(year && year>0 && year<1980){ return "02"; }else{ - if(dbo.name.endsWith("期")||dbo.name.indexOf("别墅")!=-1){ + if(dbo.name.endsWith("鏈�")||dbo.name.indexOf("鍒")!=-1){ return "01"; }else{ - if(dbo.build_type && dbo.build_type.indexOf("高层")!=-1){ + if(dbo.build_type && dbo.build_type.indexOf("楂樺眰")!=-1){ return "01"; - }else if(dbo.estate_type2 && dbo.estate_type2=="别墅"){ + }else if(dbo.estate_type2 && dbo.estate_type2=="鍒"){ return "01"; }else{ @@ -550,7 +550,7 @@ class FzDataUtils { return "99" } - def endWithChar = ["村","宿舍","堂","弄"]; + def endWithChar = ["鏉�","瀹胯垗","鍫�","寮�"]; for(def s : endWithChar){ if(dbo.name.endsWith(s)){ return "02"; @@ -566,16 +566,16 @@ class FzDataUtils { lat = lat/10000000000; lng = lng/10000000000; def redius = 3000; - if(city=="常州" && (region=="天宁"|| region=="钟楼")){ + if(city=="甯稿窞" && (region=="澶╁畞"|| region=="閽熸ゼ")){ redius = 1000; } def map = CommonDatautils.findMaxLatLngMinLatLng(lat, lng, redius) - def schools = CommonDatautils.findPomDetail(city, "学校", map.minLat, map.maxLat, map.minLng, map.maxLng) + def schools = CommonDatautils.findPomDetail(city, "瀛︽牎", map.minLat, map.maxLat, map.minLng, map.maxLng) def school_count = 0; if(schools){ def names = []; for(def schoolName : schools){ - if(schoolName.contains("小学") && !names.contains(schoolName)){ + if(schoolName.contains("灏忓") && !names.contains(schoolName)){ names << schoolName } } @@ -597,12 +597,12 @@ class FzDataUtils { lat = lat/10000000000; lng = lng/10000000000; def map = CommonDatautils.findMaxLatLngMinLatLng(lat, lng, 1000) - def supermarket_count = CommonDatautils.findPomCount(city, "超市", map.minLat, map.maxLat, map.minLng, map.maxLng) + def supermarket_count = CommonDatautils.findPomCount(city, "瓒呭競", map.minLat, map.maxLat, map.minLng, map.maxLng) if(supermarket_count>=5){ return "01"; }else{ map = CommonDatautils.findMaxLatLngMinLatLng(lat, lng, 2000) - supermarket_count = CommonDatautils.findPomCount(city, "超市", map.minLat, map.maxLat, map.minLng, map.maxLng) + supermarket_count = CommonDatautils.findPomCount(city, "瓒呭競", map.minLat, map.maxLat, map.minLng, map.maxLng) if(supermarket_count >= 5){ return "02"; }else{ @@ -620,28 +620,28 @@ class FzDataUtils { lat = lat/10000000000; lng = lng/10000000000; def map = CommonDatautils.findMaxLatLngMinLatLng(lat, lng, 1000) - def hspt_count = CommonDatautils.findPomCount(city, "医院", map.minLat, map.maxLat, map.minLng, map.maxLng) - def bank_count = CommonDatautils.findPomCount(city, "银行", map.minLat, map.maxLat, map.minLng, map.maxLng) - def school_count = CommonDatautils.findPomCount(city, "学校", map.minLat, map.maxLat, map.minLng, map.maxLng) - def supermarket_count = CommonDatautils.findPomCount(city, "超市", map.minLat, map.maxLat, map.minLng, map.maxLng) + def hspt_count = CommonDatautils.findPomCount(city, "鍖婚櫌", map.minLat, map.maxLat, map.minLng, map.maxLng) + def bank_count = CommonDatautils.findPomCount(city, "閾惰", map.minLat, map.maxLat, map.minLng, map.maxLng) + def school_count = CommonDatautils.findPomCount(city, "瀛︽牎", map.minLat, map.maxLat, map.minLng, map.maxLng) + def supermarket_count = CommonDatautils.findPomCount(city, "瓒呭競", map.minLat, map.maxLat, map.minLng, map.maxLng) def yl_count1 = CommonDatautils.findPomCount(city, "KTV", map.minLat, map.maxLat, map.minLng, map.maxLng) - def yl_count2 = CommonDatautils.findPomCount(city, "电影院", map.minLat, map.maxLat, map.minLng, map.maxLng) - def yl_count3 = CommonDatautils.findPomCount(city, "网吧", map.minLat, map.maxLat, map.minLng, map.maxLng) - def yl_count4 = CommonDatautils.findPomCount(city, "健身中心", map.minLat, map.maxLat, map.minLng, map.maxLng) + def yl_count2 = CommonDatautils.findPomCount(city, "鐢靛奖闄�", map.minLat, map.maxLat, map.minLng, map.maxLng) + def yl_count3 = CommonDatautils.findPomCount(city, "缃戝惂", map.minLat, map.maxLat, map.minLng, map.maxLng) + def yl_count4 = CommonDatautils.findPomCount(city, "鍋ヨ韩涓績", map.minLat, map.maxLat, map.minLng, map.maxLng) if(hspt_count>=1 && bank_count>=1 && school_count>=1 && supermarket_count>=1 && (yl_count1>=1 || yl_count2>=1 || yl_count3>=1||yl_count4>=1)){ return "01"; }else{ map = CommonDatautils.findMaxLatLngMinLatLng(lat, lng, 2000) - hspt_count = CommonDatautils.findPomCount(city, "医院", map.minLat, map.maxLat, map.minLng, map.maxLng) - bank_count = CommonDatautils.findPomCount(city, "银行", map.minLat, map.maxLat, map.minLng, map.maxLng) - school_count = CommonDatautils.findPomCount(city, "学校", map.minLat, map.maxLat, map.minLng, map.maxLng) + hspt_count = CommonDatautils.findPomCount(city, "鍖婚櫌", map.minLat, map.maxLat, map.minLng, map.maxLng) + bank_count = CommonDatautils.findPomCount(city, "閾惰", map.minLat, map.maxLat, map.minLng, map.maxLng) + school_count = CommonDatautils.findPomCount(city, "瀛︽牎", map.minLat, map.maxLat, map.minLng, map.maxLng) yl_count1 = CommonDatautils.findPomCount(city, "KTV", map.minLat, map.maxLat, map.minLng, map.maxLng) - yl_count2 = CommonDatautils.findPomCount(city, "电影院", map.minLat, map.maxLat, map.minLng, map.maxLng) - yl_count3 = CommonDatautils.findPomCount(city, "网吧", map.minLat, map.maxLat, map.minLng, map.maxLng) - yl_count4 = CommonDatautils.findPomCount(city, "健身中心", map.minLat, map.maxLat, map.minLng, map.maxLng) + yl_count2 = CommonDatautils.findPomCount(city, "鐢靛奖闄�", map.minLat, map.maxLat, map.minLng, map.maxLng) + yl_count3 = CommonDatautils.findPomCount(city, "缃戝惂", map.minLat, map.maxLat, map.minLng, map.maxLng) + yl_count4 = CommonDatautils.findPomCount(city, "鍋ヨ韩涓績", map.minLat, map.maxLat, map.minLng, map.maxLng) if(hspt_count>=1 && bank_count>=1 && school_count>=1 && supermarket_count>=1 && (yl_count1>=1 || yl_count2>=1 || yl_count3>=1||yl_count4>=1)){ return "02"; @@ -659,7 +659,7 @@ class FzDataUtils { if(price){ return price.avg_price; }else{ -// //样例估价 +// //鏍蜂緥浼颁环 // def s = OpenApiClient.evaluateDistrictPriceBySimilarHouse3(city, region, name, 100, false); // try{ // JSONObject jsonObject = JSONObject.fromObject(s); @@ -675,30 +675,30 @@ class FzDataUtils { // } - //分期找总期 - if(name.toString().endsWith("期")){ - def tempname = name.toString().substring(0, name.toString().indexOf("期")-1) + //鍒嗘湡鎵炬�绘湡 + if(name.toString().endsWith("鏈�")){ + def tempname = name.toString().substring(0, name.toString().indexOf("鏈�")-1) def districtStat = CommonDatautils.findDistrictPrice(city, region, tempname); if(districtStat && districtStat.avg_price){ return districtStat.avg_price+150; } } - if(name.toString().endsWith("区")){ - def tempname = name.toString().substring(0, name.toString().indexOf("区")-1) + if(name.toString().endsWith("鍖�")){ + def tempname = name.toString().substring(0, name.toString().indexOf("鍖�")-1) def districtStat = CommonDatautils.findDistrictPrice(city, region, tempname); if(districtStat && districtStat.avg_price){ return districtStat.avg_price+100; } } - //周边均价 + //鍛ㄨ竟鍧囦环 // price = findAroundAvgPrice(city, address, 100); // if(price){ // return price.toString() // } - //板块均价 + //鏉垮潡鍧囦环 if(block){ price = CommonDatautils.queryCityRegionPrice(city, region, block); if(price){ @@ -706,7 +706,7 @@ class FzDataUtils { } } - //区域均价 + //鍖哄煙鍧囦环 if(!block||!price){ price = CommonDatautils.queryCityRegionPrice(city, region, null); if(price){ @@ -722,7 +722,7 @@ class FzDataUtils { static def getShopPrice(def priceString, def city, def region, def name){ if(priceString){ - def avgPrice = priceString.replace("元/㎡","").replace("房源价", "").replace("房源", ""); + def avgPrice = priceString.replace("鍏�/銕�","").replace("鎴挎簮浠�", "").replace("鎴挎簮", ""); if(avgPrice.indexOf("-")!=-1){ def array = avgPrice.split("-") if(array.length>1){ @@ -754,13 +754,13 @@ class FzDataUtils { static def getRentNumber(def rentPrice,def city, def region, def name){ if(rentPrice){ - if(rentPrice.indexOf("元/㎡/天")!=-1){ - rentPrice = rentPrice.replace("元/㎡/天",""); + if(rentPrice.indexOf("鍏�/銕�/澶�")!=-1){ + rentPrice = rentPrice.replace("鍏�/銕�/澶�",""); if(rentPrice){ return rentPrice.toDouble(); } - }else if(rentPrice.indexOf("元/㎡/月")!=-1){ - def price = rentPrice.replace("元/㎡/月","").toString().trim(); + }else if(rentPrice.indexOf("鍏�/銕�/鏈�")!=-1){ + def price = rentPrice.replace("鍏�/銕�/鏈�","").toString().trim(); price = price.toFloat(); price = price/30; return DataHandleUtils.getDoubleRound(2, price.toDouble()); @@ -771,7 +771,7 @@ class FzDataUtils { return DataHandleUtils.getDoubleRound(2, rentPrice.toDouble()); } }else{ - def day_avg_price = CommonDatautils.queryBusinessDayPrice(city, region, name, "商铺"); + def day_avg_price = CommonDatautils.queryBusinessDayPrice(city, region, name, "鍟嗛摵"); if(day_avg_price){ return day_avg_price; } @@ -781,11 +781,11 @@ class FzDataUtils { static def getStreetCode(def val){ if(val){ - if(val == "无交通管制"){ + if(val == "鏃犱氦閫氱鍒�"){ return 1; - }else if(val == "单行道"){ + }else if(val == "鍗曡閬�"){ return 2; - }else if(val == "禁行"){ + }else if(val == "绂佽"){ return 3; } return 1; @@ -795,13 +795,13 @@ class FzDataUtils { static def getShopEstateTypeCode(def estateType){ if(estateType){ - if(estateType.indexOf("商场商铺")!=-1){ + if(estateType.indexOf("鍟嗗満鍟嗛摵")!=-1){ return 1; - }else if(estateType.indexOf("专业市场")!=-1){ + }else if(estateType.indexOf("涓撲笟甯傚満")!=-1){ return 2; - }else if(estateType.indexOf("商业街")!=-1){ + }else if(estateType.indexOf("鍟嗕笟琛�")!=-1){ return 3; - }else if(estateType.indexOf("社区商铺")!=-1){ + }else if(estateType.indexOf("绀惧尯鍟嗛摵")!=-1){ return 4; } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jiangnanblank/JiangNanBlankBaseInfoDataBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jiangnanblank/JiangNanBlankBaseInfoDataBatch.groovy index c6f79fe31..7a51fabc0 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jiangnanblank/JiangNanBlankBaseInfoDataBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jiangnanblank/JiangNanBlankBaseInfoDataBatch.groovy @@ -15,7 +15,7 @@ import com.mongodb.DBObject /** * Created by gaojuan on 2017/12/7. - * 江南银行常州小区及商铺上传ftp + * 姹熷崡閾惰甯稿窞灏忓尯鍙婂晢閾轰笂浼爁tp */ @BatchOwner(Watcher.GaoJuan) class JiangNanBlankBaseInfoDataBatch extends BaseBatch{ @@ -39,55 +39,55 @@ class JiangNanBlankBaseInfoDataBatch extends BaseBatch{ def time = DateUtils.formatDateByPattern(new Date(),"yyyyMMdd"); def outputPath_shop = "/czjn/output/easycms_shops_market.txt" - // def outputPath_shop = "d:\\常州数据结果\\dat\\easycms_shops_market_"+ time+".txt" ; + // def outputPath_shop = "d:\\甯稿窞鏁版嵁缁撴灉\\dat\\easycms_shops_market_"+ time+".txt" ; shopRun(outputPath_shop); def outputPath_dist = "/czjn/output/easycms_house_community.txt" -// //def outputPath_dist = "d:\\常州数据结果\\dat\\easycms_house_community_"+time +".txt" +// //def outputPath_dist = "d:\\甯稿窞鏁版嵁缁撴灉\\dat\\easycms_house_community_"+time +".txt" districtRun(outputPath_dist); } def shopRun(outputPath_dist){ def ret = findDistrictResult("shop"); - //写入txt文件 + //鍐欏叆txt鏂囦欢 DataHandleUtils.outPutFile(outputPath_dist, task.appendResult(ret, "shop", null),"GBK"); - //上传到ftp + //涓婁紶鍒癴tp sftpChannel = reConnect(); sftp.upload(ftpPath, outputPath_dist, sftpChannel); } def reConnect(){ if(sftpChannel == null){ - println "sftpChannel 为空,需重连....." + println "sftpChannel 涓虹┖锛岄渶閲嶈繛....." if(sftp == null){ sftp = new SFTP(); } sftpChannel = sftp.connect(ftpServer, ftpPort, ftpUser, ftpPassword); }else{ - println "sftpChannel 正常....." + println "sftpChannel 姝e父....." } return sftpChannel; } def createShopData(def inputPath_dist){ - //读取商铺excel + //璇诲彇鍟嗛摵excel // def result = task.readShopExcel(inputPath_dist); - //去重 + //鍘婚噸 //result = task.findRepeatDatas(result, "shop"); - def result = CommonDatautils.findAllDistricts("常州", "shop", fields); - //商业街商铺合并 + def result = CommonDatautils.findAllDistricts("甯稿窞", "shop", fields); + //鍟嗕笟琛楀晢閾哄悎骞� result = task.mergeShop(result); - //数据填充 + //鏁版嵁濉厖 result = task.dataFill(result); - //保存 + //淇濆瓨 task.saveOrUpdateShop(result); } def districtRun(def outputPath_dist){ def ret = findDistrictResult("district"); - //导出 + //瀵煎嚭 DataHandleUtils.outPutFile(outputPath_dist, task.appendResult(ret, "district", null),"GBK"); - //上传到ftp + //涓婁紶鍒癴tp sftpChannel = reConnect(); sftp.upload(ftpPath, outputPath_dist, sftpChannel); @@ -95,7 +95,7 @@ class JiangNanBlankBaseInfoDataBatch extends BaseBatch{ def findDistrictResult(def cat){ DBObject q = new BasicDBObject() - q.put("city","常州") + q.put("city","甯稿窞") q.put("cat",cat) def dbcursor = DIST_COLL.find(q); def districts = []; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jiangnanblank/JiangNanBlankHousesDataBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jiangnanblank/JiangNanBlankHousesDataBatch.groovy index f66dc8ae1..0756ad007 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jiangnanblank/JiangNanBlankHousesDataBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jiangnanblank/JiangNanBlankHousesDataBatch.groovy @@ -14,7 +14,7 @@ import com.mongodb.DBCollection import com.mongodb.DBObject /** - * 江南银行线上数据交付 + * 姹熷崡閾惰绾夸笂鏁版嵁浜や粯 * Created by gaojuan on 2017/12/5. */ @BatchOwner(Watcher.GaoJuan) @@ -40,20 +40,20 @@ class JiangNanBlankHousesDataBatch extends BaseBatch{ public void process(Object args) { def time = DateUtils.formatDateByPattern(new Date(),"yyyyMMdd"); -// def outputPath_dist = "d:\\常州数据结果\\dat\\easycms_house_info_"+ time+".txt" ; +// def outputPath_dist = "d:\\甯稿窞鏁版嵁缁撴灉\\dat\\easycms_house_info_"+ time+".txt" ; def outputPath_dist = "/czjn/output/easycms_house_info_" + time+".txt" - districtHouseRun(outputPath_dist);//房源 + districtHouseRun(outputPath_dist);//鎴挎簮 -// def outputPath_shop = "d:\\常州数据结果\\dat\\easycms_shops_info_"+ time+".txt"; +// def outputPath_shop = "d:\\甯稿窞鏁版嵁缁撴灉\\dat\\easycms_shops_info_"+ time+".txt"; def outputPath_shop = "/czjn/output/easycms_shops_info_" + time+".txt" shopHouseRun(outputPath_shop); } def districtHouseRun(def datFile){ - //创建小区房源数据 + //鍒涘缓灏忓尯鎴挎簮鏁版嵁 createDistrictHouseData(datFile); - //上传到ftp + //涓婁紶鍒癴tp try { sftp.upload(ftpPath, datFile, sftpChannel); }catch (Exception e){ @@ -65,37 +65,37 @@ class JiangNanBlankHousesDataBatch extends BaseBatch{ task.initFitmentMap(); def districts = findDistrictResult("district"); - def distPriceMaps = CommonDatautils.queryDistrictPrice("常州", DateUtils.getFirstDayOfWeek(new Date())) - //小区房源 + def distPriceMaps = CommonDatautils.queryDistrictPrice("甯稿窞", DateUtils.getFirstDayOfWeek(new Date())) + //灏忓尯鎴挎簮 task.removeDistrictHistoryHouses(); //def startDate = DateUtil.truncateDay(DateUtil.add(new Date(),-1)) def startDate = DateUtil.add(new Date(),-1) task.findDistrictHouse(districts, startDate, [], distPriceMaps); - task.runOpenApiEvaluate();//房源估价 - task.exportDistrictHouse([], null, datFile);//导出房源 + task.runOpenApiEvaluate();//鎴挎簮浼颁环 + task.exportDistrictHouse([], null, datFile);//瀵煎嚭鎴挎簮 } def shopHouseRun(def datFile){ - //创建商铺房源 + //鍒涘缓鍟嗛摵鎴挎簮 createShopHouse(datFile) - //上传到ftp + //涓婁紶鍒癴tp sftp.upload(ftpPath, datFile, sftpChannel); } def createShopHouse(def datFile){ - def city = "常州"; + def city = "甯稿窞"; def startDate = DateUtil.truncateDay(DateUtil.add(new Date(),-1)) task.shopHouseDataDoing(city, startDate); task.initFitmentMap(); def result = task.createShopHouse(city); - //写入txt文件 + //鍐欏叆txt鏂囦欢 DataHandleUtils.outPutFile(datFile, task.appendResult(result, "shop_house", null),"GBK"); } def findDistrictResult(def cat){ DBObject q = new BasicDBObject() - q.put("city","常州") + q.put("city","甯稿窞") q.put("cat",cat) def dbcursor = DIST_COLL.find(q); def districts = []; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jiangnanblank/SFTP.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jiangnanblank/SFTP.groovy index a50827e27..56e6bd554 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jiangnanblank/SFTP.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jiangnanblank/SFTP.groovy @@ -10,11 +10,11 @@ import javax.transaction.SystemException class SFTP { /** - * 连接sftp服务器 - * @param host 主机 - * @param port 端口 - * @param username 用户名 - * @param password 密码 + * 杩炴帴sftp鏈嶅姟鍣� + * @param host 涓绘満 + * @param port 绔彛 + * @param username 鐢ㄦ埛鍚� + * @param password 瀵嗙爜 * @return */ public ChannelSftp connect(String host, int port, String username, @@ -45,7 +45,7 @@ class SFTP { /** - * 删除本地文件 + * 鍒犻櫎鏈湴鏂囦欢 * * @param filePath * @return @@ -67,13 +67,13 @@ class SFTP { try { if (isDirExist(directory, sftp)) { Vector vector = sftp.ls(directory); - if (vector.size() == 1) { // 文件,直接删除 + if (vector.size() == 1) { // 鏂囦欢锛岀洿鎺ュ垹闄� sftp.rm(directory); - } else if (vector.size() == 2) { // 空文件夹,直接删除 + } else if (vector.size() == 2) { // 绌烘枃浠跺す锛岀洿鎺ュ垹闄� sftp.rmdir(directory); } else { String fileName = ""; - // 删除文件夹下所有文件 + // 鍒犻櫎鏂囦欢澶逛笅鎵�鏈夋枃浠� for (ChannelSftp.LsEntry en : vector) { fileName = en.getFilename(); if (".".equals(fileName) || "..".equals(fileName)) { @@ -82,7 +82,7 @@ class SFTP { deleteSFTP(directory + "/" + fileName); } } - // 删除文件夹 + // 鍒犻櫎鏂囦欢澶� sftp.rmdir(directory); } } @@ -92,9 +92,9 @@ class SFTP { } /** - * 上传文件 - * @param directory 上传的目录 - * @param uploadFile 要上传的文件 + * 涓婁紶鏂囦欢 + * @param directory 涓婁紶鐨勭洰褰� + * @param uploadFile 瑕佷笂浼犵殑鏂囦欢 * @param sftp */ public void upload(String directory, String uploadFile, ChannelSftp sftp) { @@ -119,10 +119,10 @@ class SFTP { } /** - * 下载文件 - * @param directory 下载目录 - * @param downloadFile 下载的文件 - * @param saveFile 存在本地的路径 + * 涓嬭浇鏂囦欢 + * @param directory 涓嬭浇鐩綍 + * @param downloadFile 涓嬭浇鐨勬枃浠� + * @param saveFile 瀛樺湪鏈湴鐨勮矾寰� * @param sftp */ public void download(String directory, String downloadFile,String saveFile, ChannelSftp sftp) { @@ -136,9 +136,9 @@ class SFTP { } /** - * 删除文件 - * @param directory 要删除文件所在目录 - * @param deleteFile 要删除的文件 + * 鍒犻櫎鏂囦欢 + * @param directory 瑕佸垹闄ゆ枃浠舵墍鍦ㄧ洰褰� + * @param deleteFile 瑕佸垹闄ょ殑鏂囦欢 * @param sftp */ public void delete(String directory, String deleteFile, ChannelSftp sftp) { @@ -151,8 +151,8 @@ class SFTP { } /** - * 列出目录下的文件 - * @param directory 要列出的目录 + * 鍒楀嚭鐩綍涓嬬殑鏂囦欢 + * @param directory 瑕佸垪鍑虹殑鐩綍 * @param sftp * @return * @throws SftpException @@ -163,7 +163,7 @@ class SFTP { /** - * 创建一个文件目录 + * 鍒涘缓涓�涓枃浠剁洰褰� */ public ChannelSftp createDir(String createpath, ChannelSftp sftp) { try { @@ -180,20 +180,20 @@ class SFTP { if (isDirExist(filePath.toString(), sftp)) { sftp.cd(filePath.toString()); } else { - // 建立目录 + // 寤虹珛鐩綍 sftp.mkdir(filePath.toString()) - // 进入并设置为当前目录 + // 杩涘叆骞惰缃负褰撳墠鐩綍 sftp.cd(filePath.toString()); } } sftp.cd(createpath); } catch (SftpException e) { - throw new SystemException("创建路径错误:" + createpath); + throw new SystemException("鍒涘缓璺緞閿欒锛�" + createpath); } return sftp } /** - * 判断目录是否存在 + * 鍒ゆ柇鐩綍鏄惁瀛樺湪 */ public boolean isDirExist(String directory, ChannelSftp sftp) { boolean isDirExistFlag = false; @@ -210,15 +210,15 @@ class SFTP { } public long getFileSize(String srcSftpFilePath, ChannelSftp sftp) { - long fileSize;//文件大于等于0则存在 + long fileSize;//鏂囦欢澶т簬绛変簬0鍒欏瓨鍦� try { SftpATTRS sftpATTRS = sftp.lstat(srcSftpFilePath); fileSize = sftpATTRS.getSize(); } catch (Exception e) { e.printStackTrace() - fileSize = -1;//获取文件大小异常 + fileSize = -1;//鑾峰彇鏂囦欢澶у皬寮傚父 if (e.getMessage().toLowerCase().equals("no such file")) { - fileSize = -2;//文件不存在 + fileSize = -2;//鏂囦欢涓嶅瓨鍦� } } return fileSize; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jiangshu/JsBlankTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jiangshu/JsBlankTest.groovy index d58a2e38b..977c3cdb0 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jiangshu/JsBlankTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jiangshu/JsBlankTest.groovy @@ -11,7 +11,7 @@ class JsBlankTest { } def run(){ - def path = "D:\\数据\\江苏\\" + def path = "D:\\鏁版嵁\\姹熻嫃\\" } def match(path){ ExcelUtils.multiThreadingModify(path, { row -> diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jms/CityHouseNumMonitorBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jms/CityHouseNumMonitorBatch.groovy index 0b41e9e07..8a647339c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jms/CityHouseNumMonitorBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jms/CityHouseNumMonitorBatch.groovy @@ -16,7 +16,7 @@ import com.mongodb.BasicDBObject import com.mongodb.DBObject /** - * 城市房源量监控 + * 鍩庡競鎴挎簮閲忕洃鎺� * @author yukai * */ @@ -25,15 +25,15 @@ class CityHouseNumMonitorBatch extends BaseBatch { static final DSCollection datastore = new DataStore("datastore.db.fangjia.com").getCollection("fangjia.seabird"); def static Jms jms = Jms.create('tcp://jms.db.fangjia.com:61616'); - static final SELL_LIMIT = ['上海': 300000, '北京': 400000, '广州': 60000, '深圳': 100000, '无锡': 20000, '西安': 20000, - '武汉': 30000, '大连': 60000, '南昌': 10000, '南京': 50000, '济南': 20000, '东莞': 15000, - '天津': 100000, '郑州': 20000, '石家庄': 30000, '昆明': 15000, '苏州': 60000, '青岛': 40000, - '长沙': 10000, '成都': 100000,'重庆': 50000,'杭州': 100000, '福州': 20000]; + static final SELL_LIMIT = ['涓婃捣': 300000, '鍖椾含': 400000, '骞垮窞': 60000, '娣卞湷': 100000, '鏃犻敗': 20000, '瑗垮畨': 20000, + '姝︽眽': 30000, '澶ц繛': 60000, '鍗楁槍': 10000, '鍗椾含': 50000, '娴庡崡': 20000, '涓滆帪': 15000, + '澶╂触': 100000, '閮戝窞': 20000, '鐭冲搴�': 30000, '鏄嗘槑': 15000, '鑻忓窞': 60000, '闈掑矝': 40000, + '闀挎矙': 10000, '鎴愰兘': 100000,'閲嶅簡': 50000,'鏉窞': 100000, '绂忓窞': 20000]; - static final RENT_LIMIT = ['上海': 35000, '北京': 60000, '广州': 8000, '深圳': 8000, '无锡': 8000, '西安': 20000, - '武汉': 7000, '大连': 6000, '南京': 10000, '济南': 2500, '东莞': 1000, '天津': 10000, - '郑州': 1500, '石家庄': 2000, '昆明': 1000, '苏州': 10000, '青岛': 4000, '长沙': 2000, - '成都': 20000, '重庆': 10000, '杭州': 35000, '福州': 1000]; + static final RENT_LIMIT = ['涓婃捣': 35000, '鍖椾含': 60000, '骞垮窞': 8000, '娣卞湷': 8000, '鏃犻敗': 8000, '瑗垮畨': 20000, + '姝︽眽': 7000, '澶ц繛': 6000, '鍗椾含': 10000, '娴庡崡': 2500, '涓滆帪': 1000, '澶╂触': 10000, + '閮戝窞': 1500, '鐭冲搴�': 2000, '鏄嗘槑': 1000, '鑻忓窞': 10000, '闈掑矝': 4000, '闀挎矙': 2000, + '鎴愰兘': 20000, '閲嶅簡': 10000, '鏉窞': 35000, '绂忓窞': 1000]; static final phoneList =["13621626685"]; @@ -65,14 +65,14 @@ class CityHouseNumMonitorBatch extends BaseBatch { println rentSb.toString(); if (sellSb.length() > 0) { - def msg = "二手房:" + sellSb.toString(); + def msg = "浜屾墜鎴匡細" + sellSb.toString(); phoneList.each { phone-> jms.sendSms(phone, msg, null, true); } } if (rentSb.length() > 0) { - def msg = "租房:" + rentSb.toString(); + def msg = "绉熸埧锛�" + rentSb.toString(); phoneList.each { phone-> jms.sendSms(phone, msg, null, true); } @@ -80,7 +80,7 @@ class CityHouseNumMonitorBatch extends BaseBatch { } /** - * 获取城市有效房源数量 + * 鑾峰彇鍩庡競鏈夋晥鎴挎簮鏁伴噺 * @param cat * @return */ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jms/CpcHouseSortConsumer.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jms/CpcHouseSortConsumer.groovy index f346151b2..bbee61fad 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jms/CpcHouseSortConsumer.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jms/CpcHouseSortConsumer.groovy @@ -39,7 +39,7 @@ class CpcHouseSortConsumer extends BaseBatch{ def message = msg.object logInfo "receive message: ${message}" if(message.msgType=='NEW_CPC_ACCOUNT'){ - // 若为新增cpc账户 + // 鑻ヤ负鏂板cpc璐︽埛 //importCpcHouse(message.siteName, message.city, message.houseType) restoreHouse(message.siteName, message.city, message.houseType, message.company) }else if((message.siteName || message.company) && message.city && message.houseType){ @@ -58,7 +58,7 @@ class CpcHouseSortConsumer extends BaseBatch{ } /** - * 恢复去重房源 + * 鎭㈠鍘婚噸鎴挎簮 * * @param siteName * @param city @@ -88,8 +88,8 @@ class CpcHouseSortConsumer extends BaseBatch{ } /** - * 将新增的cpc信息加入house_cpc_detail中 - * 若已存在,则返回false + * 灏嗘柊澧炵殑cpc淇℃伅鍔犲叆house_cpc_detail涓� + * 鑻ュ凡瀛樺湪锛屽垯杩斿洖false * * @param relateId * @param category @@ -134,7 +134,7 @@ class CpcHouseSortConsumer extends BaseBatch{ } /** - * 将cpc信息加入house_cpc_detail中 + * 灏哻pc淇℃伅鍔犲叆house_cpc_detail涓� * * @param siteName * @param city @@ -164,12 +164,12 @@ class CpcHouseSortConsumer extends BaseBatch{ } dsCollection.reIndex(query) } - // 其他情况暂不考虑 + // 鍏朵粬鎯呭喌鏆備笉鑰冭檻 logInfo "importCpcHouse ${siteName}, ${city}, ${houseType} -> ${c}" } /** - * 重建索引 + * 閲嶅缓绱㈠紩 * * @param siteName * @param city @@ -185,7 +185,7 @@ class CpcHouseSortConsumer extends BaseBatch{ }else if(houseType=='zufang'){ category = "rent" } - //其他情况暂不考虑 + //鍏朵粬鎯呭喌鏆備笉鑰冭檻 /*else{ logError ", invalid houseType:[${houseType}]" return diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jms/CpcHouseSortConsumerTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jms/CpcHouseSortConsumerTest.groovy index 861bcdc07..ce0535f1a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jms/CpcHouseSortConsumerTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jms/CpcHouseSortConsumerTest.groovy @@ -36,8 +36,8 @@ class CpcHouseSortConsumerTest extends BaseBatch{ } /** - * 将新增的cpc信息加入house_cpc_detail中 - * 若已存在,则返回false + * 灏嗘柊澧炵殑cpc淇℃伅鍔犲叆house_cpc_detail涓� + * 鑻ュ凡瀛樺湪锛屽垯杩斿洖false * * @param relateId * @param category @@ -82,7 +82,7 @@ class CpcHouseSortConsumerTest extends BaseBatch{ } /** - * 将cpc信息加入house_cpc_detail中 + * 灏哻pc淇℃伅鍔犲叆house_cpc_detail涓� * * @param siteName * @param city @@ -113,7 +113,7 @@ class CpcHouseSortConsumerTest extends BaseBatch{ } } } - // 其他情况暂不考虑 + // 鍏朵粬鎯呭喌鏆備笉鑰冭檻 logInfo "importCpcHouse ${siteName}, ${city}, ${houseType} -> ${c}" } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jms/EmailConsumer.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jms/EmailConsumer.groovy index 3908e4ca6..f5abccb15 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jms/EmailConsumer.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jms/EmailConsumer.groovy @@ -52,7 +52,7 @@ public class EmailConsumer extends BaseBatch { mail.subject = msg.object.subject; mail.content = msg.object.content; if (null == msg.object.senderName) { - mail.sender_name = "房价网"; + mail.sender_name = "鎴夸环缃�"; } else { mail.sender_name = msg.object.senderName; } @@ -94,7 +94,7 @@ public class EmailConsumer extends BaseBatch { try{ saveToMongo(mail); }catch(Throwable ex){ - println("发生异常") + println("鍙戠敓寮傚父") } } else { @@ -135,9 +135,9 @@ public class EmailConsumer extends BaseBatch { email.setCharset("GBK") email.setAuthentication("service@fangjia.com", "iXWzdL69CnzxksaE"); email.addTo(mail.receiverEmail); - email.setFrom("service@fangjia.com");//发送方 - email.setSubject(mail.subject); //标题 -// email.setMsg(mail.content); //内容 + email.setFrom("service@fangjia.com");//鍙戦�佹柟 + email.setSubject(mail.subject); //鏍囬 +// email.setMsg(mail.content); //鍐呭 email.setContent(mail.content, "text/html"); email.send(); @@ -148,20 +148,20 @@ public class EmailConsumer extends BaseBatch { if (!mail) { mail = new HashMap(); mail.attachment_url = "http://static.fangjia.com/res/static_logo/CPDB.pptx"; - mail.attachment_des = "你好啊"; + mail.attachment_des = "浣犲ソ鍟�"; mail.receiverEmail = "xingwangliu@163.com"; - mail.subject = "你好啊"; - mail.content = "你好啊"; - mail.attachment_name = "测试邮件.pptx"; + mail.subject = "浣犲ソ鍟�"; + mail.content = "浣犲ソ鍟�"; + mail.attachment_name = "娴嬭瘯閭欢.pptx"; } - //附件,可以定义多个附件对象 + //闄勪欢锛屽彲浠ュ畾涔夊涓檮浠跺璞� EmailAttachment attachment = new EmailAttachment(); -// attachment.setPath("e:\\CPDB大数据库示例new.pptx");// +// attachment.setPath("e:\\CPDB澶ф暟鎹簱绀轰緥new.pptx");// attachment.setURL(new URL(mail.attachment_url)); attachment.setDisposition(EmailAttachment.ATTACHMENT); attachment.setDescription(mail.attachment_des); - attachment.setName(MimeUtility.encodeText(mail.attachment_name)); //附件名称 + attachment.setName(MimeUtility.encodeText(mail.attachment_name)); //闄勪欢鍚嶇О HtmlEmail email = new HtmlEmail(); email.setSSL(true); @@ -178,8 +178,8 @@ public class EmailConsumer extends BaseBatch { return null; } /** - * 不再使用 - * 被sendMail2替代 + * 涓嶅啀浣跨敤 + * 琚玸endMail2鏇夸唬 * @deprecated * @param mail * @return @@ -197,7 +197,7 @@ public class EmailConsumer extends BaseBatch { // if(null!=mail.senderName){ // from(address:'('+MimeUtility.encodeText(mail.senderName)+') system@fangjia.com') // }else{ -// from(address:'('+MimeUtility.encodeText('房价网')+') system@fangjia.com') +// from(address:'('+MimeUtility.encodeText('鎴夸环缃�')+') system@fangjia.com') // } // to(address:mail.receiverEmail) // message(mail.content) @@ -208,7 +208,7 @@ public class EmailConsumer extends BaseBatch { if (null != mail.senderName) { from(address: '(' + MimeUtility.encodeText(mail.senderName) + ') service@fjmail.fangjia.com') } else { - from(address: '(' + MimeUtility.encodeText('房价网') + ') system@fjmail.fangjia.com') + from(address: '(' + MimeUtility.encodeText('鎴夸环缃�') + ') system@fjmail.fangjia.com') } to(address: mail.receiverEmail) message(mail.content) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jms/EmppReceiverListener.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jms/EmppReceiverListener.groovy index 19dabf813..f3f7630ba 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jms/EmppReceiverListener.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jms/EmppReceiverListener.groovy @@ -24,15 +24,15 @@ class EmppReceiverListener extends BaseBatch{ private static final def RSD_USER_NAME = 'rsd' private static final def RSD_USER_PSW = '123456' - //设置网关服务器,该服务器用于发送信息 + //璁剧疆缃戝叧鏈嶅姟鍣紝璇ユ湇鍔″櫒鐢ㄤ簬鍙戦�佷俊鎭� private static final def CM_IP = "211.147.239.62" private static final def CM_PORT = 9050 - //设置Web Service服务器,该服务器用于接收信息 + //璁剧疆Web Service鏈嶅姟鍣紝璇ユ湇鍔″櫒鐢ㄤ簬鎺ユ敹淇℃伅 private static final def WS_IP = "211.147.239.62" private static final def WS_PORT = 9088 - //是否为模拟模式 + //鏄惁涓烘ā鎷熸ā寮� private static def simulation = false private static Jms jms private static PostMsg fjwSmsMsg @@ -47,7 +47,7 @@ class EmppReceiverListener extends BaseBatch{ rsdSmsMsg.getCmHost().setHost(CM_IP, CM_PORT) rsdSmsMsg.getWsHost().setHost(WS_IP, WS_PORT) - //如果是通过代理服务器上网,可以用如下的方式告诉接口代理服务器的信息和用户名密码 + //濡傛灉鏄�氳繃浠g悊鏈嶅姟鍣ㄤ笂缃戯紝鍙互鐢ㄥ涓嬬殑鏂瑰紡鍛婅瘔鎺ュ彛浠g悊鏈嶅姟鍣ㄧ殑淇℃伅鍜岀敤鎴峰悕瀵嗙爜 // msg.getProxy().setProxy(ProxyServer.PROXY_TYPE_HTTP, "192.168.0.171", 808, "one", "one") } @@ -58,7 +58,7 @@ class EmppReceiverListener extends BaseBatch{ public void process(Object args) { Thread.start { while (true) { - sleep(86400000); // 24小时清理一次 + sleep(86400000); // 24灏忔椂娓呯悊涓�娆� LIMIT_COUNT_MAP.clear(); println 'clear message count map!'; } @@ -69,12 +69,12 @@ class EmppReceiverListener extends BaseBatch{ while (true) { MOMsg[] msgList = fjwSmsMsg.getMOMsg() if (msgList == null) { - println '获取fjw帐号信息失败,用户名密码错误。' + println '鑾峰彇fjw甯愬彿淇℃伅澶辫触锛岀敤鎴峰悕瀵嗙爜閿欒銆�' println 'message receicer listener stoped.' break } else { if (msgList.length == 0) { - println 'fjw当前无回复信息,sleep 60s.' + println 'fjw褰撳墠鏃犲洖澶嶄俊鎭�,sleep 60s.' sleep(60000) } else { for (int i = 0; i < msgList.length; i++) { @@ -83,10 +83,10 @@ class EmppReceiverListener extends BaseBatch{ def content = msg.getMsgcontent() def now = new Date() print "[<< ${now.format('yyyy-MM-dd HH:mm:ss')}] mobile=[${mobile}],content=[${content}]" - //保存上行信息 + //淇濆瓨涓婅淇℃伅 def districtId = dbConn.execute("insert into sms_deliver (MOBILE,MSGCONTENT,CREATION_DATE,MODIFICATION_DATE) values(?,?,?,?)",[mobile, content, now, now]); print ", save success" - //上行短信发送给JMS + //涓婅鐭俊鍙戦�佺粰JMS sendMsgToJMS(mobile,content); println ", send to jms success." } @@ -100,12 +100,12 @@ class EmppReceiverListener extends BaseBatch{ while (true) { MOMsg[] msgList = rsdSmsMsg.getMOMsg() if (msgList == null) { - println '获取rsd帐号信息失败,用户名密码错误。' + println '鑾峰彇rsd甯愬彿淇℃伅澶辫触锛岀敤鎴峰悕瀵嗙爜閿欒銆�' println 'message receicer listener stoped.' break } else { if (msgList.length == 0) { - println 'rsd当前无回复信息,sleep 60s.' + println 'rsd褰撳墠鏃犲洖澶嶄俊鎭�,sleep 60s.' sleep(60000) } else { for (int i = 0; i < msgList.length; i++) { @@ -114,10 +114,10 @@ class EmppReceiverListener extends BaseBatch{ def content = msg.getMsgcontent() def now = new Date() print "[<< ${now.format('yyyy-MM-dd HH:mm:ss')}] mobile=[${mobile}],content=[${content}]" - //保存上行信息 + //淇濆瓨涓婅淇℃伅 def districtId = dbConn.execute("insert into sms_deliver (MOBILE,MSGCONTENT,CREATION_DATE,MODIFICATION_DATE) values(?,?,?,?)",[mobile, content, now, now]); print ", save success" - //上行短信发送给JMS + //涓婅鐭俊鍙戦�佺粰JMS sendMsgToJMS(mobile,content); println ", send to jms success." } @@ -128,7 +128,7 @@ class EmppReceiverListener extends BaseBatch{ } if (args.length > 0 && args[0] == "sim") { - //启动模式为模拟模式 + //鍚姩妯″紡涓烘ā鎷熸ā寮� simulation = true } @@ -155,7 +155,7 @@ class EmppReceiverListener extends BaseBatch{ } def errorCode = -1 if (!simulation){ - //如果非模拟模式则真实发送消息 + //濡傛灉闈炴ā鎷熸ā寮忓垯鐪熷疄鍙戦�佹秷鎭� def errorCount = 0 while(errorCode != 0){ if(System.currentTimeMillis()-lastSuccessTime<500){ @@ -185,7 +185,7 @@ class EmppReceiverListener extends BaseBatch{ }else{ errorCode = 0 } - //发送成功或者失败则更新数据库状态 + //鍙戦�佹垚鍔熸垨鑰呭け璐ュ垯鏇存柊鏁版嵁搴撶姸鎬� if(smsSubmitId){ dbConn.execute("update sms_submit set submit_status=? and modification_date=? where id=?",[errorCode, now, smsSubmitId]) }else{ @@ -210,7 +210,7 @@ class EmppReceiverListener extends BaseBatch{ private def sendMessage(final content, final String mobile, isForRongshidai){ // def c = content // if(!isSpChinaMobile(mobile)){ -// c = c + '【房价网】' +// c = c + '銆愭埧浠风綉銆�' // } Integer count = LIMIT_COUNT_MAP.get(mobile); @@ -221,7 +221,7 @@ class EmppReceiverListener extends BaseBatch{ if (count == Integer.MAX_VALUE) { return 0; } else if (count >= 50) { - fjwSmsMsg.post("13621626685", mobile + ' 当日短信数超过50.', null); + fjwSmsMsg.post("13621626685", mobile + ' 褰撴棩鐭俊鏁拌秴杩�50.', null); LIMIT_COUNT_MAP.put(mobile, Integer.MAX_VALUE); return 0; } @@ -236,7 +236,7 @@ class EmppReceiverListener extends BaseBatch{ } /** - * 上行。拼装消息并发送到JMS + * 涓婅銆傛嫾瑁呮秷鎭苟鍙戦�佸埌JMS * @param smsSubmitTemp * @return */ @@ -248,7 +248,7 @@ class EmppReceiverListener extends BaseBatch{ } /** - * 处理返回的错误码 + * 澶勭悊杩斿洖鐨勯敊璇爜 * @param errorCode * @return */ @@ -257,20 +257,20 @@ class EmppReceiverListener extends BaseBatch{ switch (errorCode) { case PostMsg.E_INVALID_USER_PASSWORD: - return "用户名密码错误"; + return "鐢ㄦ埛鍚嶅瘑鐮侀敊璇�"; case PostMsg.E_FAILED_CONNECTED_TO_SERVER: - return "连接不上服务器"; + return "杩炴帴涓嶄笂鏈嶅姟鍣�"; case PostMsg.E_FAILED_TO_POST_MESSAGE: - return "短信发送失败,或者余额不足,或者密码错误"; + return "鐭俊鍙戦�佸け璐ワ紝鎴栬�呬綑棰濅笉瓒筹紝鎴栬�呭瘑鐮侀敊璇�"; case PostMsg.E_INVALID_MESSAGE_DATA: - return "无效的短信号码或者内容"; + return "鏃犳晥鐨勭煭淇″彿鐮佹垨鑰呭唴瀹�"; case -12: - return "余额不足"; + return "浣欓涓嶈冻"; default: - return "未知错误"; + return "鏈煡閿欒"; } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jms/SMSIngoingListener.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jms/SMSIngoingListener.groovy index 348453cad..3d814c823 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jms/SMSIngoingListener.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jms/SMSIngoingListener.groovy @@ -34,11 +34,11 @@ class SMSIngoingListener extends BaseBatch { public static final def RSD_USER_NAME = 'rsd' public static final def RSD_USER_PSW = 'RSd@9898' - //设置网关服务器,该服务器用于发送信息 + //璁剧疆缃戝叧鏈嶅姟鍣紝璇ユ湇鍔″櫒鐢ㄤ簬鍙戦�佷俊鎭� public static final def MT_IP = "211.147.239.62" public static final def MT_PORT = 9080 - //设置Web Service服务器,该服务器用于接收信息 + //璁剧疆Web Service鏈嶅姟鍣紝璇ユ湇鍔″櫒鐢ㄤ簬鎺ユ敹淇℃伅 public static final def MO_IP = "211.147.239.62" public static final def MO_PORT = 9070 @@ -60,14 +60,14 @@ class SMSIngoingListener extends BaseBatch { private void startIngoing() throws Exception { PostMsg pm = new PostMsg(); - pm.getCmHost().setHost(MT_IP, MT_PORT);//设置网关的IP和port,用于发送信息 - pm.getWsHost().setHost(MO_IP, MO_PORT);//设置网关的 IP和port,用于获取账号信息、上行、状态报告等等 + pm.getCmHost().setHost(MT_IP, MT_PORT);//璁剧疆缃戝叧鐨処P鍜宲ort锛岀敤浜庡彂閫佷俊鎭� + pm.getWsHost().setHost(MO_IP, MO_PORT);//璁剧疆缃戝叧鐨� IP鍜宲ort锛岀敤浜庤幏鍙栬处鍙蜂俊鎭�佷笂琛屻�佺姸鎬佹姤鍛婄瓑绛� doIngoingMessage(pm, new Account(FJW_USER_NAME, FJW_USER_PSW)) doIngoingMessage(pm, new Account(RSD_USER_NAME, RSD_USER_PSW)) } /** - * 短信上行(接收短信) + * 鐭俊涓婅(鎺ユ敹鐭俊) * @param pm * @param ac */ @@ -89,7 +89,7 @@ class SMSIngoingListener extends BaseBatch { } } - //没有上行信息 + //娌℃湁涓婅淇℃伅 if(mos == null || mos.length == 0) { return } @@ -110,7 +110,7 @@ class SMSIngoingListener extends BaseBatch { } /** - * 保存上行信息 + * 淇濆瓨涓婅淇℃伅 * @param mobile * @param content * @param rtime diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jms/SMSOutgoingListener.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jms/SMSOutgoingListener.groovy index 32b03f995..ff80a78f8 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jms/SMSOutgoingListener.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jms/SMSOutgoingListener.groovy @@ -28,21 +28,21 @@ class SMSOutgoingListener extends BaseBatch { private static Jms jms = Jms.create("tcp://jms.db.fangjia.com:61616") - //白名单手机号码每天最大短信发送量 + //鐧藉悕鍗曟墜鏈哄彿鐮佹瘡澶╂渶澶х煭淇″彂閫侀噺 public static final int WHITE_LIST_USER_MAX_SEND_COUNT = 50 - //普通手机号每天最大短信发送量 + //鏅�氭墜鏈哄彿姣忓ぉ鏈�澶х煭淇″彂閫侀噺 public static final int NORMAL_USER_MAX_SEND_COUNT = 20 - //黑名单手机号最大短信发送量 + //榛戝悕鍗曟墜鏈哄彿鏈�澶х煭淇″彂閫侀噺 public static final int BLACK_LIST_USER_MAX_SEND_COUNT = 0 - //系统每天允许发送的最大短信量 + //绯荤粺姣忓ぉ鍏佽鍙戦�佺殑鏈�澶х煭淇¢噺 public static final int MAX_SYS_SEND_COUNT = 4000 - //设置Web Service服务器,该服务器用于接收信息 + //璁剧疆Web Service鏈嶅姟鍣紝璇ユ湇鍔″櫒鐢ㄤ簬鎺ユ敹淇℃伅 public static final List TASK_QUEUE = Collections.synchronizedList(new ArrayList()) public static final List ADMINISTRATORS = [ Watcher.WangWenYan.mobile, "13621625626"] - /**初始化手机号白名单和黑名单*/ + /**鍒濆鍖栨墜鏈哄彿鐧藉悕鍗曞拰榛戝悕鍗�*/ public static def MOBILE_LIST = [ : ] @@ -58,7 +58,7 @@ class SMSOutgoingListener extends BaseBatch { } /** - * 初始化白名单 + * 鍒濆鍖栫櫧鍚嶅崟 */ void initMobileList(){ @@ -84,7 +84,7 @@ class SMSOutgoingListener extends BaseBatch { } /** - * 启动短信发送 + * 鍚姩鐭俊鍙戦�� * @param pm * @param ac */ @@ -95,7 +95,7 @@ class SMSOutgoingListener extends BaseBatch { void run() { while(true){ synchronized(TASK_QUEUE){ - println("..........................................-->开始消费:" + new Date().format("HH:mm:ss")) + println("..........................................-->寮�濮嬫秷璐�:" + new Date().format("HH:mm:ss")) Iterator iter = TASK_QUEUE.iterator(); while (iter.hasNext()){ try{ @@ -117,7 +117,7 @@ class SMSOutgoingListener extends BaseBatch { consumerQueue(msg) iter.remove() }else { - println "$mobile 短信发送频繁 延后再发" + println "$mobile 鐭俊鍙戦�侀绻� 寤跺悗鍐嶅彂" } } } @@ -138,18 +138,18 @@ class SMSOutgoingListener extends BaseBatch { } }.start() - //从Jms队列中获取需要发送的短信任务 + //浠嶫ms闃熷垪涓幏鍙栭渶瑕佸彂閫佺殑鐭俊浠诲姟 jms.onMessage(queue: "smsOutgoing.queue") { msg -> synchronized(TASK_QUEUE){ TASK_QUEUE.add(msg) TASK_QUEUE.notifyAll() - println("..........................................-->生产结束:" + new Date().format("HH:mm:ss")) + println("..........................................-->鐢熶骇缁撴潫:" + new Date().format("HH:mm:ss")) } } } /** - * 查询最近几分钟某个手机号的短信发送量 + * 鏌ヨ鏈�杩戝嚑鍒嗛挓鏌愪釜鎵嬫満鍙风殑鐭俊鍙戦�侀噺 * @param interval */ def smsSendCount(String mobile, int mins){ @@ -158,7 +158,7 @@ class SMSOutgoingListener extends BaseBatch { } /** - * 消耗MSG + * 娑堣�桵SG * @param msg * @return */ @@ -166,21 +166,21 @@ class SMSOutgoingListener extends BaseBatch { def mobile = msg.getObject().mobile String content = msg.getObject().msgContent.trim() - content = content.replace("【房价网】", "【上海估家网络科技】") - if(!content.startsWith("【")){ - content = "【上海估家】" + content; + content = content.replace("銆愭埧浠风綉銆�", "銆愪笂娴蜂及瀹剁綉缁滅鎶�銆�") + if(!content.startsWith("銆�")){ + content = "銆愪笂娴蜂及瀹躲��" + content; } - if(content.lastIndexOf("【") > 0){ - println("非法短信内容:" + content) + if(content.lastIndexOf("銆�") > 0){ + println("闈炴硶鐭俊鍐呭锛�" + content) return ; } def startTime = DateUtils.truncateDay(new Date()) DBObject rangeQuery = new BasicDBObject('$gte',startTime).append('$lt', new Date()) def sysSendCount = LOG_COLL.count(new BasicDBObject('c_date',rangeQuery)) - //公司目前没有短信业务,基本上都是报警性质的短信,所以设定了一个每天发送短信的最大值,防止费用浪费 + //鍏徃鐩墠娌℃湁鐭俊涓氬姟锛屽熀鏈笂閮芥槸鎶ヨ鎬ц川鐨勭煭淇★紝鎵�浠ヨ瀹氫簡涓�涓瘡澶╁彂閫佺煭淇$殑鏈�澶у�硷紝闃叉璐圭敤娴垂 if(sysSendCount > MAX_SYS_SEND_COUNT) { - doOutgoingMessage(Watcher.DuXiaoYu.getMobile(), "当天已发送" + sysSendCount + "条短信,配额已用完,服务已关闭.") - doOutgoingMessage(Watcher.WangWenYan.getMobile(), "当天已发送" + sysSendCount + "条短信,配额已用完,服务已关闭.") + doOutgoingMessage(Watcher.DuXiaoYu.getMobile(), "褰撳ぉ宸插彂閫�" + sysSendCount + "鏉$煭淇★紝閰嶉宸茬敤瀹岋紝鏈嶅姟宸插叧闂�.") + doOutgoingMessage(Watcher.WangWenYan.getMobile(), "褰撳ぉ宸插彂閫�" + sysSendCount + "鏉$煭淇★紝閰嶉宸茬敤瀹岋紝鏈嶅姟宸插叧闂�.") println "-- ----------------------------exit at ${DateUtil.formatToTightYYYYMMDDhhmmss(new Date())}---------------------------" System.exit(0) } @@ -199,61 +199,61 @@ class SMSOutgoingListener extends BaseBatch { } if(maxSendCount == BLACK_LIST_USER_MAX_SEND_COUNT){ - println "${mobile}已经被列入黑名单,禁止发送短信" + DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) + println "${mobile}宸茬粡琚垪鍏ラ粦鍚嶅崟锛岀姝㈠彂閫佺煭淇�" + DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) ObjectId id = ObjectId.get() DBObject msgObj = new BasicDBObject() msgObj.put('_id', id) msgObj.put('mobile', mobile) msgObj.put('content', content) msgObj.put('res_code', -2) - msgObj.put('res_msg',"${mobile}已列入黑名单,短信发送失败".toString()) + msgObj.put('res_msg',"${mobile}宸插垪鍏ラ粦鍚嶅崟,鐭俊鍙戦�佸け璐�".toString()) msgObj.put('c_date', new Date()) LOG_COLL.save(msgObj) }else if(objSendCount == maxSendCount){ - println "号码:${mobile}的短信发送量已经达到最大配额(${WHITE_LIST_USER_MAX_SEND_COUNT}),后续短信将停止发送 ${DateUtil.formatToTightYYYYMMDDhhmmss(new Date())}" - SendSmsResponse sendSmsResponse = doOutgoingMessage(mobile,"【房价网】你的短信发送量已经达到最大配额(${WHITE_LIST_USER_MAX_SEND_COUNT})!!!,今天将不在发送短信") + println "鍙风爜:${mobile}鐨勭煭淇″彂閫侀噺宸茬粡杈惧埌鏈�澶ч厤棰�(${WHITE_LIST_USER_MAX_SEND_COUNT}),鍚庣画鐭俊灏嗗仠姝㈠彂閫� ${DateUtil.formatToTightYYYYMMDDhhmmss(new Date())}" + SendSmsResponse sendSmsResponse = doOutgoingMessage(mobile,"銆愭埧浠风綉銆戜綘鐨勭煭淇″彂閫侀噺宸茬粡杈惧埌鏈�澶ч厤棰�(${WHITE_LIST_USER_MAX_SEND_COUNT})!!!,浠婂ぉ灏嗕笉鍦ㄥ彂閫佺煭淇�") ObjectId id = ObjectId.get() - println "发送\t[id:" + id.toString() + ",mobile:" + mobile + "]\t" + sendSmsResponse.code + ":" + sendSmsResponse.message + "\t" + DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) + println "鍙戦�乗t[id:" + id.toString() + ",mobile:" + mobile + "]\t" + sendSmsResponse.code + ":" + sendSmsResponse.message + "\t" + DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) DBObject msgObj = new BasicDBObject() msgObj.put('_id', id) msgObj.put('mobile', mobile) - msgObj.put('content', "【房价网】你的短信发送量已经达到最大配额(${WHITE_LIST_USER_MAX_SEND_COUNT})!!!,今天将不在发送短信".toString()) + msgObj.put('content', "銆愭埧浠风綉銆戜綘鐨勭煭淇″彂閫侀噺宸茬粡杈惧埌鏈�澶ч厤棰�(${WHITE_LIST_USER_MAX_SEND_COUNT})!!!,浠婂ぉ灏嗕笉鍦ㄥ彂閫佺煭淇�".toString()) msgObj.put('res_code', sendSmsResponse.code) msgObj.put("res_msg", sendSmsResponse.message) if(StringUtils.isNumeric(sendSmsResponse.code)){ - msgObj.put("provider", "亿美") + msgObj.put("provider", "浜跨編") }else{ - msgObj.put("provider", "阿里云") + msgObj.put("provider", "闃块噷浜�") } msgObj.put('c_date', new Date()) LOG_COLL.save(msgObj) if(isWhiteListMobile(mobile)){ if(mobile != Watcher.DuXiaoYu.getMobile()){ - doOutgoingMessage(Watcher.DuXiaoYu.getMobile(),"${mobile}已超过配额,当天已发送${objSendCount}条短信,服务已关闭.") + doOutgoingMessage(Watcher.DuXiaoYu.getMobile(),"${mobile}宸茶秴杩囬厤棰濓紝褰撳ぉ宸插彂閫�${objSendCount}鏉$煭淇★紝鏈嶅姟宸插叧闂�.") } if(mobile != Watcher.WangWenYan.getMobile()){ - doOutgoingMessage(Watcher.WangWenYan.getMobile(),"${mobile}已超过配额,当天已发送${objSendCount}条短信,服务已关闭.") + doOutgoingMessage(Watcher.WangWenYan.getMobile(),"${mobile}宸茶秴杩囬厤棰濓紝褰撳ぉ宸插彂閫�${objSendCount}鏉$煭淇★紝鏈嶅姟宸插叧闂�.") } } }else if(objSendCount > maxSendCount){ - println "号码超额\t[count:" + objSendCount + ",mobile:" + mobile + "]\t" + DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) + println "鍙风爜瓒呴\t[count:" + objSendCount + ",mobile:" + mobile + "]\t" + DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) ObjectId id = ObjectId.get() - println "发送\t[id:" + id.toString() + ",mobile:" + mobile + "]\t" + "-1" + ":" + "超过配额,信息忽略" + "\t" + DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) + println "鍙戦�乗t[id:" + id.toString() + ",mobile:" + mobile + "]\t" + "-1" + ":" + "瓒呰繃閰嶉锛屼俊鎭拷鐣�" + "\t" + DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) DBObject msgObj = new BasicDBObject() msgObj.put('_id', id) msgObj.put('mobile', mobile) msgObj.put('content', content) msgObj.put('res_code', -1) - msgObj.put('res_msg',"发送量超过配额,短信未成功发送") + msgObj.put('res_msg',"鍙戦�侀噺瓒呰繃閰嶉,鐭俊鏈垚鍔熷彂閫�") msgObj.put('c_date', new Date()) LOG_COLL.save(msgObj) }else { SendSmsResponse sendSmsResponse = doOutgoingMessage(mobile, content) ObjectId id = ObjectId.get() - println "发送\t[id:" + id.toString() + ",mobile:" + mobile +", content:"+content+ "]\t" + sendSmsResponse.code + ":" + sendSmsResponse.message + "\t" + DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) + println "鍙戦�乗t[id:" + id.toString() + ",mobile:" + mobile +", content:"+content+ "]\t" + sendSmsResponse.code + ":" + sendSmsResponse.message + "\t" + DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) DBObject msgObj = new BasicDBObject() msgObj.put('_id', id) msgObj.put('mobile', mobile) @@ -262,13 +262,13 @@ class SMSOutgoingListener extends BaseBatch { msgObj.put("res_msg", sendSmsResponse.message) msgObj.put('c_date', new Date()) if(StringUtils.isNumeric(sendSmsResponse.code)){ - msgObj.put("provider", "亿美") + msgObj.put("provider", "浜跨編") }else{ - msgObj.put("provider", "阿里云") + msgObj.put("provider", "闃块噷浜�") } LOG_COLL.save(msgObj) if(sendSmsResponse.code == "isv.AMOUNT_NOT_ENOUGH"){ - sendDingDingMsg("2307d2fec8314b3e8b4b83dd1d42da2e2051638e3e668f21e77ca01258bf682c", "阿里云短信包已用完") + sendDingDingMsg("2307d2fec8314b3e8b4b83dd1d42da2e2051638e3e668f21e77ca01258bf682c", "闃块噷浜戠煭淇″寘宸茬敤瀹�") } } @@ -276,7 +276,7 @@ class SMSOutgoingListener extends BaseBatch { /** - * 是否是白名单手机号 + * 鏄惁鏄櫧鍚嶅崟鎵嬫満鍙� * @param mobile * @return */ @@ -284,7 +284,7 @@ class SMSOutgoingListener extends BaseBatch { return MOBILE_LIST.get(mobile) == "white" } /** - * 是否是黑名单手机号 + * 鏄惁鏄粦鍚嶅崟鎵嬫満鍙� * @param mobile * @return */ @@ -293,13 +293,13 @@ class SMSOutgoingListener extends BaseBatch { } /** - * 短信下行(发送短信) + * 鐭俊涓嬭(鍙戦�佺煭淇�) * @param pm * @param ac * @throws Exception */ private SendSmsResponse doOutgoingMessage(String mobile, String content) throws Exception { - if(content && content.contains("验证码")){ + if(content && content.contains("楠岃瘉鐮�")){ def checkCode = getCheckCode(content) if(StringUtils.isNotBlank(checkCode)){ JSONObject con = new JSONObject() @@ -318,7 +318,7 @@ class SMSOutgoingListener extends BaseBatch { static final Pattern CHECK_CODE_PATTERN = Pattern.compile("\\d{4,}") /** - * 提取验证码 + * 鎻愬彇楠岃瘉鐮� * @param content * @return */ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jms/SmsOutgoingConsumer.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jms/SmsOutgoingConsumer.groovy index 32ec8eae3..f24aef7db 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jms/SmsOutgoingConsumer.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jms/SmsOutgoingConsumer.groovy @@ -15,7 +15,7 @@ import com.wondertek.esmp.esms.empp.EmppApi /** * @author Administrator - * @deprecated 已废弃 + * @deprecated 宸插簾寮� */ public class SmsOutgoingConsumer implements EMPPRecvListener{ @@ -23,29 +23,29 @@ public class SmsOutgoingConsumer implements EMPPRecvListener{ final static int port = 9981; final static String passwd = "G00jiasms"; final static String serviceId = "10657109041413"; - final static def ERROR_CODE_MAP = ['0':'正确', - '1':'消息结构错', - '2':'命令字错', - '3':'消息序号重复', - '4':'消息长度错', - '5':'资费代码错', - '6':'超过最大信息长', - '7':'业务代码错', - '8':'流量控制错', - '9':'短信网关不负责服务此计费号码', - '10':'Src_Id错误', - '11':'Msg_src错误', - '12':'Fee_terminal_Id错误', - '13':'Dest_terminal_Id错误', - '14':'双重认证错', - '10001':'收信方号码为黑名单用户', - '10002':'短信内容中包含敏感字,该短信被拒发', - '10003':'提供给该试用企业的短信发送量已用完,系统停止对其的短信发送服务', - '10004':'超过允许发给该用户的最大发信频率', - '10005':'服务忙,请稍后再发短信', - '10006':'向网关发送短信失败', - '10007':'该用户没有群发权限,不能给两人以上发送短信'] - //是否为模拟模式 + final static def ERROR_CODE_MAP = ['0':'姝g‘', + '1':'娑堟伅缁撴瀯閿�', + '2':'鍛戒护瀛楅敊', + '3':'娑堟伅搴忓彿閲嶅', + '4':'娑堟伅闀垮害閿�', + '5':'璧勮垂浠g爜閿�', + '6':'瓒呰繃鏈�澶т俊鎭暱', + '7':'涓氬姟浠g爜閿�', + '8':'娴侀噺鎺у埗閿�', + '9':'鐭俊缃戝叧涓嶈礋璐f湇鍔℃璁¤垂鍙风爜', + '10':'Src_Id閿欒', + '11':'Msg_src閿欒', + '12':'Fee_terminal_Id閿欒', + '13':'Dest_terminal_Id閿欒', + '14':'鍙岄噸璁よ瘉閿�', + '10001':'鏀朵俊鏂瑰彿鐮佷负榛戝悕鍗曠敤鎴�', + '10002':'鐭俊鍐呭涓寘鍚晱鎰熷瓧锛岃鐭俊琚嫆鍙�', + '10003':'鎻愪緵缁欒璇曠敤浼佷笟鐨勭煭淇″彂閫侀噺宸茬敤瀹岋紝绯荤粺鍋滄瀵瑰叾鐨勭煭淇″彂閫佹湇鍔�', + '10004':'瓒呰繃鍏佽鍙戠粰璇ョ敤鎴风殑鏈�澶у彂淇¢鐜�', + '10005':'鏈嶅姟蹇欙紝璇风◢鍚庡啀鍙戠煭淇�', + '10006':'鍚戠綉鍏冲彂閫佺煭淇″け璐�', + '10007':'璇ョ敤鎴锋病鏈夌兢鍙戞潈闄愶紝涓嶈兘缁欎袱浜轰互涓婂彂閫佺煭淇�'] + //鏄惁涓烘ā鎷熸ā寮� private static def simulation = false private static Jms jms; static{ @@ -58,10 +58,10 @@ public class SmsOutgoingConsumer implements EMPPRecvListener{ emppApi = new EmppApi(); connect(); } - //连接短信网关 + //杩炴帴鐭俊缃戝叧 def connect(){ if (simulation){ - //如果为模拟模式,则假连 + //濡傛灉涓烘ā鎷熸ā寮忥紝鍒欏亣杩� return } while(true){ @@ -84,7 +84,7 @@ public class SmsOutgoingConsumer implements EMPPRecvListener{ static void main(args){ if (args.length > 0 && args[0] == "sim"){ - //启动模式为模拟模式 + //鍚姩妯″紡涓烘ā鎷熸ā寮� simulation = true } SmsOutgoingConsumer empp = new SmsOutgoingConsumer(); @@ -106,7 +106,7 @@ public class SmsOutgoingConsumer implements EMPPRecvListener{ } def errorCode = -1 if (!simulation){ - //如果非模拟模式则真实发送消息 + //濡傛灉闈炴ā鎷熸ā寮忓垯鐪熷疄鍙戦�佹秷鎭� def errorCount = 0 while(errorCode != EMPPSubmitSMResp.EMPP_SEND_MSG_OK){ if(System.currentTimeMillis()-lastSuccessTime<500){ @@ -136,7 +136,7 @@ public class SmsOutgoingConsumer implements EMPPRecvListener{ }else{ errorCode = EMPPSubmitSMResp.EMPP_SEND_MSG_OK } - //发送成功或者失败则更新数据库状态 + //鍙戦�佹垚鍔熸垨鑰呭け璐ュ垯鏇存柊鏁版嵁搴撶姸鎬� if(smsSubmitId){ dbConn.execute("update sms_submit set submit_status=? and modification_date=? where id=?",[errorCode, now, smsSubmitId]) }else{ @@ -153,14 +153,14 @@ public class SmsOutgoingConsumer implements EMPPRecvListener{ static void _main(args){ def jms = Jms.create("tcp://jms.db.goojia.com:61616"); ActiveMQObjectMessage message = new ActiveMQObjectMessage(); - message.setObject([mobile:"13817122485",msgContent:"w中远两湾城"]) + message.setObject([mobile:"13817122485",msgContent:"w涓繙涓ゆ咕鍩�"]) println message jms.send(queue:"smsIncoming.queue",message:message); } static void main1(args){ println "starting..." - def msgContent = "中原建立时间的飞即可得积分,8900909,HJAKJDF"; + def msgContent = "涓師寤虹珛鏃堕棿鐨勯鍗冲彲寰楃Н鍒嗭紝8900909锛孒JAKJDF"; String[] aaa = new String[1] aaa[0] = "13817122485" SmsOutgoingConsumer empp = new SmsOutgoingConsumer(); @@ -177,7 +177,7 @@ public class SmsOutgoingConsumer implements EMPPRecvListener{ e.printStackTrace(); } - //上行短信入口 + //涓婅鐭俊鍏ュ彛 public void onMessage(EMPPObject message) { try{ if(message instanceof EMPPResponse){ @@ -213,10 +213,10 @@ public class SmsOutgoingConsumer implements EMPPRecvListener{ def mobile = deliver.getSrcTermId(); def now = new Date() print "[<< ${now.format('yyyy-MM-dd HH:mm:ss')}] mobile=[${mobile}],content=[${content}]" - //保存上行信息 + //淇濆瓨涓婅淇℃伅 def districtId = dbConn.execute("insert into sms_deliver (MOBILE,MSGCONTENT,CREATION_DATE,MODIFICATION_DATE) values(?,?,?,?)",[mobile,content,now,now]); print ", save success" - //上行短信发送给JMS + //涓婅鐭俊鍙戦�佺粰JMS sendMsgToJMS(mobile,content); println ", send to jms success." } @@ -235,7 +235,7 @@ public class SmsOutgoingConsumer implements EMPPRecvListener{ connect(); def c = content if(!isSpChinaMobile(mobile)){ - c = c+'【房价网】' + c = c+'銆愭埧浠风綉銆�' } EMPPSubmitSMResp[] resp = emppApi.submitMsg(c, [mobile] as String[], serviceId); if(resp == null || resp[0]==null){ @@ -245,7 +245,7 @@ public class SmsOutgoingConsumer implements EMPPRecvListener{ } /** - * 上行。拼装消息并发送到JMS + * 涓婅銆傛嫾瑁呮秷鎭苟鍙戦�佸埌JMS * @param smsSubmitTemp * @return */ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jms/aliyun/AliyunSmsClient.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jms/aliyun/AliyunSmsClient.groovy index 6c99e17d1..3c155bb6c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jms/aliyun/AliyunSmsClient.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jms/aliyun/AliyunSmsClient.groovy @@ -9,7 +9,7 @@ import com.aliyuncs.profile.DefaultProfile import com.aliyuncs.profile.IClientProfile /** - * 功能说明: + * 鍔熻兘璇存槑: */ class AliyunSmsClient { @@ -19,34 +19,34 @@ class AliyunSmsClient { static { System.setProperty("sun.net.client.defaultConnectTimeout", "10000"); System.setProperty("sun.net.client.defaultReadTimeout", "10000"); - //初始化ascClient需要的几个参数 - final String product = "Dysmsapi";//短信API产品名称(短信产品名固定,无需修改) - final String domain = "dysmsapi.aliyuncs.com";//短信API产品域名(接口地址固定,无需修改) - //替换成你的AK - final String accessKeyId = "LTAIdaj4eSO79gzz";//你的accessKeyId,参考本文档步骤2 - final String accessKeySecret = "xw6EsvqydZ9HC6zAvIB3ruQqVHynxf";//你的accessKeySecret,参考本文档步骤2 - //初始化ascClient,暂时不支持多region(请勿修改) + //鍒濆鍖朼scClient闇�瑕佺殑鍑犱釜鍙傛暟 + final String product = "Dysmsapi";//鐭俊API浜у搧鍚嶇О锛堢煭淇′骇鍝佸悕鍥哄畾锛屾棤闇�淇敼锛� + final String domain = "dysmsapi.aliyuncs.com";//鐭俊API浜у搧鍩熷悕锛堟帴鍙e湴鍧�鍥哄畾锛屾棤闇�淇敼锛� + //鏇挎崲鎴愪綘鐨凙K + final String accessKeyId = "LTAIdaj4eSO79gzz";//浣犵殑accessKeyId,鍙傝�冩湰鏂囨。姝ラ2 + final String accessKeySecret = "xw6EsvqydZ9HC6zAvIB3ruQqVHynxf";//浣犵殑accessKeySecret锛屽弬鑰冩湰鏂囨。姝ラ2 + //鍒濆鍖朼scClient,鏆傛椂涓嶆敮鎸佸region锛堣鍕夸慨鏀癸級 IClientProfile profile = DefaultProfile.getProfile("cn-hangzhou", accessKeyId,accessKeySecret); DefaultProfile.addEndpoint("cn-hangzhou", "cn-hangzhou", product, domain); acsClient = new DefaultAcsClient(profile); } static SendSmsResponse sendSms(String phoneNumber, String templateCode, String templateParam, String outId =null){ - //组装请求对象 + //缁勮璇锋眰瀵硅薄 SendSmsRequest request = new SendSmsRequest(); - //使用post提交 + //浣跨敤post鎻愪氦 request.setMethod(MethodType.POST); - //必填:待发送手机号。支持以逗号分隔的形式进行批量调用,批量上限为1000个手机号码,批量调用相对于单条调用及时性稍有延迟,验证码类型的短信推荐使用单条调用的方式;发送国际/港澳台消息时,接收号码格式为00+国际区号+号码,如“0085200000000” + //蹇呭~:寰呭彂閫佹墜鏈哄彿銆傛敮鎸佷互閫楀彿鍒嗛殧鐨勫舰寮忚繘琛屾壒閲忚皟鐢紝鎵归噺涓婇檺涓�1000涓墜鏈哄彿鐮�,鎵归噺璋冪敤鐩稿浜庡崟鏉¤皟鐢ㄥ強鏃舵�х◢鏈夊欢杩�,楠岃瘉鐮佺被鍨嬬殑鐭俊鎺ㄨ崘浣跨敤鍗曟潯璋冪敤鐨勬柟寮忥紱鍙戦�佸浗闄�/娓境鍙版秷鎭椂锛屾帴鏀跺彿鐮佹牸寮忎负00+鍥介檯鍖哄彿+鍙风爜锛屽鈥�0085200000000鈥� request.setPhoneNumbers(phoneNumber) - //必填:短信签名-可在短信控制台中找到 - request.setSignName("上海估家网络科技") - //必填:短信模板-可在短信控制台中找到 + //蹇呭~:鐭俊绛惧悕-鍙湪鐭俊鎺у埗鍙颁腑鎵惧埌 + request.setSignName("涓婃捣浼板缃戠粶绉戞妧") + //蹇呭~:鐭俊妯℃澘-鍙湪鐭俊鎺у埗鍙颁腑鎵惧埌 request.setTemplateCode(templateCode); - //可选:模板中的变量替换JSON串,如模板内容为"亲爱的${name},您的验证码为${code}"时,此处的值为 - //友情提示:如果JSON中需要带换行符,请参照标准的JSON协议对换行符的要求,比如短信内容中包含\r\n的情况在JSON中需要表示成\\r\\n,否则会导致JSON在服务端解析失败 + //鍙��:妯℃澘涓殑鍙橀噺鏇挎崲JSON涓�,濡傛ā鏉垮唴瀹逛负"浜茬埍鐨�${name},鎮ㄧ殑楠岃瘉鐮佷负${code}"鏃�,姝ゅ鐨勫�间负 + //鍙嬫儏鎻愮ず:濡傛灉JSON涓渶瑕佸甫鎹㈣绗�,璇峰弬鐓ф爣鍑嗙殑JSON鍗忚瀵规崲琛岀鐨勮姹�,姣斿鐭俊鍐呭涓寘鍚玕r\n鐨勬儏鍐靛湪JSON涓渶瑕佽〃绀烘垚\\r\\n,鍚﹀垯浼氬鑷碕SON鍦ㄦ湇鍔$瑙f瀽澶辫触 request.setTemplateParam(templateParam); request.setOutId("yourOutId"); - //请求失败这里会抛ClientException异常 + //璇锋眰澶辫触杩欓噷浼氭姏ClientException寮傚父 SendSmsResponse sendSmsResponse = acsClient.getAcsResponse(request) return sendSmsResponse } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jms/yimei/SingletonClient.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jms/yimei/SingletonClient.groovy index 78e0bc768..335d90447 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jms/yimei/SingletonClient.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jms/yimei/SingletonClient.groovy @@ -33,68 +33,68 @@ public class SingletonClient { } public static String getCodeMSg(Integer code){ - return emayCodeMsgMap.get(code.toString(),"未知错误"); + return emayCodeMsgMap.get(code.toString(),"鏈煡閿欒"); } private static def emayCodeMsgMap = [ - "0":"发送成功", - "-1":"系统异常", - "-2":"客户端异常", - "-101":"命令不被支持", - "-102":"RegistryTransInfo删除信息失败", - "-103":"RegistryInfo更新信息失败", - "-104":"请求超过限制", - "-110":"号码注册激活失败", - "-111":"企业注册失败", - "-113":"充值失败", - "-117":"发送短信失败", - "-118":"接收MO失败", - "-119":"接收Report失败", - "-120":"修改密码失败", - "-122":"号码注销激活失败", - "-123":"查询单价失败", - "-124":"查询余额失败", - "-125":"设置MO转发失败", - "-126":"路由信息失败", - "-127":"计费失败0余额", - "-128":"计费失败余额不足", - "-190":"数据操作失败", - "-1100":"序列号错误 序列号不存在内存中 或尝试攻击的用户", - "-1102":"序列号密码错误", - "-1103":"序列号Key错误", - "-1104":"路由失败,请联系系统管理员", - "-1105":"注册号状态异常 未用 1", - "-1107":"注册号状态异常 停用 3", - "-1108":"注册号状态异常 5", - "-1131":"充值卡无效", - "-1132":"充值密码无效", - "-1133":"充值卡绑定异常", - "-1134":"充值状态无效", - "-1135":"充值金额无效", - "-1901":"数据库插入操作失败", - "-1902":"数据库更新操作失败", - "-1903":"数据库删除操作失败", - "-9000":"数据格式错误,数据超出数据库允许范围", - "-9001":"序列号格式错误", - "-9002":"密码格式错误", - "-9003":"客户端Key格式错误", - "-9004":"设置转发格式错误", - "-9005":"公司地址格式错误", - "-9006":"企业中文名格式错误", - "-9007":"企业中文名简称格式错误", - "-9008":"邮件地址格式错误", - "-9009":"企业英文名格式错误", - "-9010":"企业英文名简称格式错误", - "-9011":"传真格式错误", - "-9012":"联系人格式错误", - "-9013":"联系电话", - "-9014":"邮编格式错误", - "-9015":"新密码格式错误", - "-9016":"发送短信包大小超出范围", - "-9017":"发送短信内容格式错误", - "-9018":"发送短信扩展号格式错误", - "-9019":"发送短信优先级格式错误", - "-9020":"发送短信手机号格式错误", - "-9021":"发送短信定时时间格式错误", - "-9022":"发送短信唯一序列值错误"] + "0":"鍙戦�佹垚鍔�", + "-1":"绯荤粺寮傚父", + "-2":"瀹㈡埛绔紓甯�", + "-101":"鍛戒护涓嶈鏀寔", + "-102":"RegistryTransInfo鍒犻櫎淇℃伅澶辫触", + "-103":"RegistryInfo鏇存柊淇℃伅澶辫触", + "-104":"璇锋眰瓒呰繃闄愬埗", + "-110":"鍙风爜娉ㄥ唽婵�娲诲け璐�", + "-111":"浼佷笟娉ㄥ唽澶辫触", + "-113":"鍏呭�煎け璐�", + "-117":"鍙戦�佺煭淇″け璐�", + "-118":"鎺ユ敹MO澶辫触", + "-119":"鎺ユ敹Report澶辫触", + "-120":"淇敼瀵嗙爜澶辫触", + "-122":"鍙风爜娉ㄩ攢婵�娲诲け璐�", + "-123":"鏌ヨ鍗曚环澶辫触", + "-124":"鏌ヨ浣欓澶辫触", + "-125":"璁剧疆MO杞彂澶辫触", + "-126":"璺敱淇℃伅澶辫触", + "-127":"璁¤垂澶辫触0浣欓", + "-128":"璁¤垂澶辫触浣欓涓嶈冻", + "-190":"鏁版嵁鎿嶄綔澶辫触", + "-1100":"搴忓垪鍙烽敊璇� 搴忓垪鍙蜂笉瀛樺湪鍐呭瓨涓� 鎴栧皾璇曟敾鍑荤殑鐢ㄦ埛", + "-1102":"搴忓垪鍙峰瘑鐮侀敊璇�", + "-1103":"搴忓垪鍙稫ey閿欒", + "-1104":"璺敱澶辫触锛岃鑱旂郴绯荤粺绠$悊鍛�", + "-1105":"娉ㄥ唽鍙风姸鎬佸紓甯� 鏈敤 1", + "-1107":"娉ㄥ唽鍙风姸鎬佸紓甯� 鍋滅敤 3", + "-1108":"娉ㄥ唽鍙风姸鎬佸紓甯� 5", + "-1131":"鍏呭�煎崱鏃犳晥", + "-1132":"鍏呭�煎瘑鐮佹棤鏁�", + "-1133":"鍏呭�煎崱缁戝畾寮傚父", + "-1134":"鍏呭�肩姸鎬佹棤鏁�", + "-1135":"鍏呭�奸噾棰濇棤鏁�", + "-1901":"鏁版嵁搴撴彃鍏ユ搷浣滃け璐�", + "-1902":"鏁版嵁搴撴洿鏂版搷浣滃け璐�", + "-1903":"鏁版嵁搴撳垹闄ゆ搷浣滃け璐�", + "-9000":"鏁版嵁鏍煎紡閿欒,鏁版嵁瓒呭嚭鏁版嵁搴撳厑璁歌寖鍥�", + "-9001":"搴忓垪鍙锋牸寮忛敊璇�", + "-9002":"瀵嗙爜鏍煎紡閿欒", + "-9003":"瀹㈡埛绔疜ey鏍煎紡閿欒", + "-9004":"璁剧疆杞彂鏍煎紡閿欒", + "-9005":"鍏徃鍦板潃鏍煎紡閿欒", + "-9006":"浼佷笟涓枃鍚嶆牸寮忛敊璇�", + "-9007":"浼佷笟涓枃鍚嶇畝绉版牸寮忛敊璇�", + "-9008":"閭欢鍦板潃鏍煎紡閿欒", + "-9009":"浼佷笟鑻辨枃鍚嶆牸寮忛敊璇�", + "-9010":"浼佷笟鑻辨枃鍚嶇畝绉版牸寮忛敊璇�", + "-9011":"浼犵湡鏍煎紡閿欒", + "-9012":"鑱旂郴浜烘牸寮忛敊璇�", + "-9013":"鑱旂郴鐢佃瘽", + "-9014":"閭紪鏍煎紡閿欒", + "-9015":"鏂板瘑鐮佹牸寮忛敊璇�", + "-9016":"鍙戦�佺煭淇″寘澶у皬瓒呭嚭鑼冨洿", + "-9017":"鍙戦�佺煭淇″唴瀹规牸寮忛敊璇�", + "-9018":"鍙戦�佺煭淇℃墿灞曞彿鏍煎紡閿欒", + "-9019":"鍙戦�佺煭淇′紭鍏堢骇鏍煎紡閿欒", + "-9020":"鍙戦�佺煭淇℃墜鏈哄彿鏍煎紡閿欒", + "-9021":"鍙戦�佺煭淇″畾鏃舵椂闂存牸寮忛敊璇�", + "-9022":"鍙戦�佺煭淇″敮涓�搴忓垪鍊奸敊璇�"] } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jms/yimei/TestSDKClient.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jms/yimei/TestSDKClient.groovy index cf5b71cfd..743ee9b2e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jms/yimei/TestSDKClient.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jms/yimei/TestSDKClient.groovy @@ -7,10 +7,10 @@ import java.util.List; public class TestSDKClient { - //public static String softwareSerialNo="0SDK-EMY-0130-XXXXX";//软件序列号,请通过亿美销售人员获取 - //public static String key="123456";//序列号首次激活时自己设定 + //public static String softwareSerialNo="0SDK-EMY-0130-XXXXX";//杞欢搴忓垪鍙�,璇烽�氳繃浜跨編閿�鍞汉鍛樿幏鍙� + //public static String key="123456";//搴忓垪鍙烽娆℃縺娲绘椂鑷繁璁惧畾 - public static String password="123456";// 密码,请通过亿美销售人员获取 + public static String password="123456";// 瀵嗙爜,璇烽�氳繃浜跨編閿�鍞汉鍛樿幏鍙� public static void init() throws Exception{ @@ -20,24 +20,24 @@ public class TestSDKClient { public static void main(String[] args) { /** - * 获取client的方法1 - * 此示例中用SDKClient.getClient()获取到Client对象, - * 您也可以用Client(softwareSerialNo,password)获取一个Client对象 - * 注:使用SDKClient.getClient()获取到Client对象的序列号及密码在config.properties中配置 + * 鑾峰彇client鐨勬柟娉�1 + * 姝ょず渚嬩腑鐢⊿DKClient.getClient()鑾峰彇鍒癈lient瀵硅薄, + * 鎮ㄤ篃鍙互鐢–lient(softwareSerialNo,password)鑾峰彇涓�涓狢lient瀵硅薄 + * 娉�:浣跨敤SDKClient.getClient()鑾峰彇鍒癈lient瀵硅薄鐨勫簭鍒楀彿鍙婂瘑鐮佸湪config.properties涓厤缃� */ - int result = SingletonClient.getClient().sendSMS(["13916076378"] as String[],"您的验证码是123456",5); + int result = SingletonClient.getClient().sendSMS(["13916076378"] as String[],"鎮ㄧ殑楠岃瘉鐮佹槸123456",5); System.out.println("--->" + result); /** - * 获取client的方法2 - * 在构造函数中正确的填写softwareSerialNo和password + * 鑾峰彇client鐨勬柟娉�2 + * 鍦ㄦ瀯閫犲嚱鏁颁腑姝g‘鐨勫~鍐檚oftwareSerialNo鍜宲assword */ // Client client2=new Client(softwareSerialNo,password); // // try { // StartMenu(); // while (true) { -// System.out.println("请输入序号进行操作"); +// System.out.println("璇疯緭鍏ュ簭鍙疯繘琛屾搷浣�"); // byte[] command = new byte[4]; // System.in.read(command); // int operate = 0; @@ -46,7 +46,7 @@ public class TestSDKClient { // commandString = commandString.replaceAll("\r\n", "").trim(); // operate = Integer.parseInt(commandString); // } catch (Exception e) { -// System.out.println("命令输入错误!!!"); +// System.out.println("鍛戒护杈撳叆閿欒锛侊紒锛�"); // } // switch (operate) { // case 1: @@ -86,7 +86,7 @@ public class TestSDKClient { // System.exit(0); // break; // default: -// System.out.println("没有该命令 "+operate); +// System.out.println("娌℃湁璇ュ懡浠� "+operate); // break; // } // } @@ -97,35 +97,35 @@ public class TestSDKClient { } public static void StartMenu() { int i = 1; - System.out.println(i + "、激活序列号,初次使用、已注销后再次使用时调用该方法."); + System.out.println(i + "銆佹縺娲诲簭鍒楀彿,鍒濇浣跨敤銆佸凡娉ㄩ攢鍚庡啀娆′娇鐢ㄦ椂璋冪敤璇ユ柟娉�."); i += 1; - System.out.println(i + "、企业信息注册,目地在于短信发送异常时Emay可以连系到企业."); + System.out.println(i + "銆佷紒涓氫俊鎭敞鍐�,鐩湴鍦ㄤ簬鐭俊鍙戦�佸紓甯告椂Emay鍙互杩炵郴鍒颁紒涓�."); i += 1; - System.out.println(i + "、余额查询"); + System.out.println(i + "銆佷綑棰濇煡璇�"); i += 1; - System.out.println(i + "、充值"); + System.out.println(i + "銆佸厖鍊�"); i += 1; - System.out.println(i + "、密码修改"); + System.out.println(i + "銆佸瘑鐮佷慨鏀�"); i += 1; - System.out.println(i + "、发送即时短信"); + System.out.println(i + "銆佸彂閫佸嵆鏃剁煭淇�"); i += 1; - System.out.println(i + "、发送定时短信"); + System.out.println(i + "銆佸彂閫佸畾鏃剁煭淇�"); i += 1; - System.out.println(i + "、发送带有信息ID的短信,可供查询状态报告"); + System.out.println(i + "銆佸彂閫佸甫鏈変俊鎭疘D鐨勭煭淇�,鍙緵鏌ヨ鐘舵�佹姤鍛�"); i += 1; - System.out.println(i + "、获取上行短信"); + System.out.println(i + "銆佽幏鍙栦笂琛岀煭淇�"); i += 1; - System.out.println(i + "、获得下行短信状态报告"); + System.out.println(i + "銆佽幏寰椾笅琛岀煭淇$姸鎬佹姤鍛�"); i += 1; - System.out.println(i + "、软件注销"); + System.out.println(i + "銆佽蒋浠舵敞閿�"); i += 1; - System.out.println(i + "、关闭程序"); + System.out.println(i + "銆佸叧闂▼搴�"); } /** - * 软件注销 - * 1、软件注销后像发送短信、接受上行短信接口都无法使用 - * 2、软件可以重新注册、注册完成后软件序列号的金额保持注销前的状态 + * 杞欢娉ㄩ攢 + * 1銆佽蒋浠舵敞閿�鍚庡儚鍙戦�佺煭淇°�佹帴鍙椾笂琛岀煭淇℃帴鍙i兘鏃犳硶浣跨敤 + * 2銆佽蒋浠跺彲浠ラ噸鏂版敞鍐屻�佹敞鍐屽畬鎴愬悗杞欢搴忓垪鍙风殑閲戦淇濇寔娉ㄩ攢鍓嶇殑鐘舵�� */ public static void testLogout() { try { @@ -136,26 +136,26 @@ public class TestSDKClient { } } /** - * 软件序列号注册、或则说是激活、软件序列号首次使用必须激活 + * 杞欢搴忓垪鍙锋敞鍐屻�佹垨鍒欒鏄縺娲汇�佽蒋浠跺簭鍒楀彿棣栨浣跨敤蹇呴』婵�娲� * registEx(String serialpass) - * 1、serialpass 软件序列号密码、密码长度为6位的数字字符串、软件序列号和密码请通过亿美销售人员获取 + * 1銆乻erialpass 杞欢搴忓垪鍙峰瘑鐮併�佸瘑鐮侀暱搴︿负6浣嶇殑鏁板瓧瀛楃涓层�佽蒋浠跺簭鍒楀彿鍜屽瘑鐮佽閫氳繃浜跨編閿�鍞汉鍛樿幏鍙� */ public static void testRegistEx() { int i = SingletonClient.getClient().registEx(password); System.out.println("testTegistEx:" + i); } /** - * 发送短信、可以发送定时和即时短信 + * 鍙戦�佺煭淇°�佸彲浠ュ彂閫佸畾鏃跺拰鍗虫椂鐭俊 * sendSMS(String[] mobiles,String smsContent, String addSerial, int smsPriority) - * 1、mobiles 手机数组长度不能超过1000 - * 2、smsContent 最多500个汉字或1000个纯英文、请客户不要自行拆分短信内容以免造成混乱、亿美短信平台会根据实际通道自动拆分、计费以实际拆分条数为准、亿美推荐短信长度70字以内 - * 3、addSerial 附加码(长度小于15的字符串) 用户可通过附加码自定义短信类别,或添加自定义主叫号码( 联系亿美索取主叫号码列表) - * 4、优先级范围1~5,数值越高优先级越高(相对于同一序列号) - * 5、其它短信发送请参考使用手册自己尝试使用 + * 1銆乵obiles 鎵嬫満鏁扮粍闀垮害涓嶈兘瓒呰繃1000 + * 2銆乻msContent 鏈�澶�500涓眽瀛楁垨1000涓函鑻辨枃銆佽瀹㈡埛涓嶈鑷鎷嗗垎鐭俊鍐呭浠ュ厤閫犳垚娣蜂贡銆佷嚎缇庣煭淇″钩鍙颁細鏍规嵁瀹為檯閫氶亾鑷姩鎷嗗垎銆佽璐逛互瀹為檯鎷嗗垎鏉℃暟涓哄噯銆佷嚎缇庢帹鑽愮煭淇¢暱搴�70瀛椾互鍐� + * 3銆乤ddSerial 闄勫姞鐮�(闀垮害灏忎簬15鐨勫瓧绗︿覆) 鐢ㄦ埛鍙�氳繃闄勫姞鐮佽嚜瀹氫箟鐭俊绫诲埆,鎴栨坊鍔犺嚜瀹氫箟涓诲彨鍙风爜( 鑱旂郴浜跨編绱㈠彇涓诲彨鍙风爜鍒楄〃) + * 4銆佷紭鍏堢骇鑼冨洿1~5锛屾暟鍊艰秺楂樹紭鍏堢骇瓒婇珮(鐩稿浜庡悓涓�搴忓垪鍙�) + * 5銆佸叾瀹冪煭淇″彂閫佽鍙傝�冧娇鐢ㄦ墜鍐岃嚜宸卞皾璇曚娇鐢� */ public static void testSendSMS() { try { - int i=SingletonClient.getClient().sendSMS(["15000000000"], "即时短信","",5);//带扩展码 + int i=SingletonClient.getClient().sendSMS(["15000000000"], "鍗虫椂鐭俊","",5);//甯︽墿灞曠爜 System.out.println("testSendSMS====="+i); } catch (Exception e) { e.printStackTrace(); @@ -163,36 +163,36 @@ public class TestSDKClient { } /** - * 发送定时短信 + * 鍙戦�佸畾鏃剁煭淇� * sendScheduledSMSEx(String[] mobiles, String smsContent,String sendTime,String srcCharset) - * 1、mobiles 手机数组长度不能超过1000 - * 2、smsContent 最多500个汉字或1000个纯英文、请客户不要自行拆分短信内容以免造成混乱、亿美短信平台会根据实际通道自动拆分、计费以实际拆分条数为准、亿美推荐短信长度70字以内 - * 3、sendTime 定时短信发送时间 定时时间格式为:年年年年月月日日时时分分秒秒,例如20090801123030 表示2009年8月1日12点30分30秒该条短信会发送到用户手机 - * 4、srcCharset 字符编码,默认为"GBK" - * 5、其它定时短信发送请参考使用手册自己尝试使用 + * 1銆乵obiles 鎵嬫満鏁扮粍闀垮害涓嶈兘瓒呰繃1000 + * 2銆乻msContent 鏈�澶�500涓眽瀛楁垨1000涓函鑻辨枃銆佽瀹㈡埛涓嶈鑷鎷嗗垎鐭俊鍐呭浠ュ厤閫犳垚娣蜂贡銆佷嚎缇庣煭淇″钩鍙颁細鏍规嵁瀹為檯閫氶亾鑷姩鎷嗗垎銆佽璐逛互瀹為檯鎷嗗垎鏉℃暟涓哄噯銆佷嚎缇庢帹鑽愮煭淇¢暱搴�70瀛椾互鍐� + * 3銆乻endTime 瀹氭椂鐭俊鍙戦�佹椂闂� 瀹氭椂鏃堕棿鏍煎紡涓猴細骞村勾骞村勾鏈堟湀鏃ユ棩鏃舵椂鍒嗗垎绉掔锛屼緥濡�20090801123030 琛ㄧず2009骞�8鏈�1鏃�12鐐�30鍒�30绉掕鏉$煭淇′細鍙戦�佸埌鐢ㄦ埛鎵嬫満 + * 4銆乻rcCharset 瀛楃缂栫爜锛岄粯璁や负"GBK" + * 5銆佸叾瀹冨畾鏃剁煭淇″彂閫佽鍙傝�冧娇鐢ㄦ墜鍐岃嚜宸卞皾璇曚娇鐢� */ public static void testsSendScheduledSMS() { try { - int i=SingletonClient.getClient().sendScheduledSMSEx(["15000000000"], "定时短信", "20111206160000","GBK"); + int i=SingletonClient.getClient().sendScheduledSMSEx(["15000000000"], "瀹氭椂鐭俊", "20111206160000","GBK"); System.out.println("testsSendScheduledSMS====="+i); } catch (Exception e) { e.printStackTrace(); } } /** - * 发送带有信息ID的短信(可查状态报告) + * 鍙戦�佸甫鏈変俊鎭疘D鐨勭煭淇★紙鍙煡鐘舵�佹姤鍛婏級 * sendSMSEx(mobiles, smsContent, addSerial, srcCharset, smsPriority, smsID) - * 1、mobiles 手机数组长度不能超过1000 - * 2、smsContent 最多500个汉字或1000个纯英文、请客户不要自行拆分短信内容以免造成混乱、亿美短信平台会根据实际通道自动拆分、计费以实际拆分条数为准、亿美推荐短信长度70字以内 - * 3、addSerial 附加码(长度小于15的字符串) 用户可通过附加码自定义短信类别,或添加自定义主叫号码( 联系亿美索取主叫号码列表) - * 4、srcCharset 字符编码,默认为"GBK" - * 5、优先级范围1~5,数值越高优先级越高(相对于同一序列号) - * 6、信息ID,此ID可以与查询查询状态报告的方法中对照发送信息的状态(成功,失败) - * 7、其它定时短信发送请参考使用手册自己尝试使用 + * 1銆乵obiles 鎵嬫満鏁扮粍闀垮害涓嶈兘瓒呰繃1000 + * 2銆乻msContent 鏈�澶�500涓眽瀛楁垨1000涓函鑻辨枃銆佽瀹㈡埛涓嶈鑷鎷嗗垎鐭俊鍐呭浠ュ厤閫犳垚娣蜂贡銆佷嚎缇庣煭淇″钩鍙颁細鏍规嵁瀹為檯閫氶亾鑷姩鎷嗗垎銆佽璐逛互瀹為檯鎷嗗垎鏉℃暟涓哄噯銆佷嚎缇庢帹鑽愮煭淇¢暱搴�70瀛椾互鍐� + * 3銆乤ddSerial 闄勫姞鐮�(闀垮害灏忎簬15鐨勫瓧绗︿覆) 鐢ㄦ埛鍙�氳繃闄勫姞鐮佽嚜瀹氫箟鐭俊绫诲埆,鎴栨坊鍔犺嚜瀹氫箟涓诲彨鍙风爜( 鑱旂郴浜跨編绱㈠彇涓诲彨鍙风爜鍒楄〃) + * 4銆乻rcCharset 瀛楃缂栫爜锛岄粯璁や负"GBK" + * 5銆佷紭鍏堢骇鑼冨洿1~5锛屾暟鍊艰秺楂樹紭鍏堢骇瓒婇珮(鐩稿浜庡悓涓�搴忓垪鍙�) + * 6銆佷俊鎭疘D锛屾ID鍙互涓庢煡璇㈡煡璇㈢姸鎬佹姤鍛婄殑鏂规硶涓鐓у彂閫佷俊鎭殑鐘舵�侊紙鎴愬姛锛屽け璐ワ級 + * 7銆佸叾瀹冨畾鏃剁煭淇″彂閫佽鍙傝�冧娇鐢ㄦ墜鍐岃嚜宸卞皾璇曚娇鐢� */ public static void testsSendSMSAddMessageId() { try { - int i=SingletonClient.getClient().sendSMSEx(["15000000000"], "即时短信,带短信ID", "", "GBK", 5, 1234567); + int i=SingletonClient.getClient().sendSMSEx(["15000000000"], "鍗虫椂鐭俊锛屽甫鐭俊ID", "", "GBK", 5, 1234567); System.out.println("testsSendScheduledSMS====="+i); } catch (Exception e) { e.printStackTrace(); @@ -200,15 +200,15 @@ public class TestSDKClient { } /** - * 软件序列号充值、如果软件序列号金额不足、那么可以调用该方法给序列号充值 + * 杞欢搴忓垪鍙峰厖鍊笺�佸鏋滆蒋浠跺簭鍒楀彿閲戦涓嶈冻銆侀偅涔堝彲浠ヨ皟鐢ㄨ鏂规硶缁欏簭鍒楀彿鍏呭�� * chargeUp(String cardNo, String cardPass) - * 1、cardNo 充值卡卡号 - * 2、cardPass 充值卡密码 - * 3、充值卡卡号和密码请联系亿美销售人员获得 + * 1銆乧ardNo 鍏呭�煎崱鍗″彿 + * 2銆乧ardPass 鍏呭�煎崱瀵嗙爜 + * 3銆佸厖鍊煎崱鍗″彿鍜屽瘑鐮佽鑱旂郴浜跨編閿�鍞汉鍛樿幏寰� */ public static void testChargeUp() { try { - int a = SingletonClient.getClient().chargeUp("充值卡卡号", "密码"); + int a = SingletonClient.getClient().chargeUp("鍏呭�煎崱鍗″彿", "瀵嗙爜"); System.out.println("testChargeUp:" + a); } catch (Exception e) { e.printStackTrace(); @@ -216,31 +216,31 @@ public class TestSDKClient { } /** - * 企业详细信息注册 + * 浼佷笟璇︾粏淇℃伅娉ㄥ唽 * registDetailInfo(String eName, String linkMan, String phoneNum,String mobile, String email, String fax, String address,String postcode) - * 1、eName 企业名称(最多60字节) - * 2、linkMan 联系人姓名(最多20字节) - * 3、phoneNum 联系电话(最多20字节) - * 4、mobile 联系手机(最多15字节) - * 5、email 电子邮件(最多60字节) - * 6、fax 联系传真(最多20字节) - * 7、address 公司地址(最多60字节) - * 8、postcode 邮政编码(最多6字节) - * 9、以上参数信息都必须填写、每个参数都不能为空 + * 1銆乪Name 浼佷笟鍚嶇О(鏈�澶�60瀛楄妭) + * 2銆乴inkMan 鑱旂郴浜哄鍚�(鏈�澶�20瀛楄妭) + * 3銆乸honeNum 鑱旂郴鐢佃瘽(鏈�澶�20瀛楄妭) + * 4銆乵obile 鑱旂郴鎵嬫満(鏈�澶�15瀛楄妭) + * 5銆乪mail 鐢靛瓙閭欢(鏈�澶�60瀛楄妭) + * 6銆乫ax 鑱旂郴浼犵湡(鏈�澶�20瀛楄妭) + * 7銆乤ddress 鍏徃鍦板潃(鏈�澶�60瀛楄妭) + * 8銆乸ostcode 閭斂缂栫爜(鏈�澶�6瀛楄妭) + * 9銆佷互涓婂弬鏁颁俊鎭兘蹇呴』濉啓銆佹瘡涓弬鏁伴兘涓嶈兘涓虹┖ */ public static void testRegistDetailInfo() { try { - int a = SingletonClient.getClient().registDetailInfo("企业名称", "联系人", "固话","13000000000", "邮件", "传真", "企业地址", "邮政编码"); + int a = SingletonClient.getClient().registDetailInfo("浼佷笟鍚嶇О", "鑱旂郴浜�", "鍥鸿瘽","13000000000", "閭欢", "浼犵湡", "浼佷笟鍦板潃", "閭斂缂栫爜"); System.out.println("testRegistDetailInfo:" + a); } catch (Exception e) { e.printStackTrace(); } } /** - * 修改软件序列号密码、注意修改软件序列号密码以后不需要重新注册(激活) + * 淇敼杞欢搴忓垪鍙峰瘑鐮併�佹敞鎰忎慨鏀硅蒋浠跺簭鍒楀彿瀵嗙爜浠ュ悗涓嶉渶瑕侀噸鏂版敞鍐�(婵�娲�) * serialPwdUpd(String serialPwd, String serialPwdNew) - * 1、serialPwd 旧密码 - * 2、serialPwdNew 新密码、长度为6位的数字字符串 + * 1銆乻erialPwd 鏃у瘑鐮� + * 2銆乻erialPwdNew 鏂板瘑鐮併�侀暱搴︿负6浣嶇殑鏁板瓧瀛楃涓� */ public static void testSerialPwdUpd() { try { @@ -251,8 +251,8 @@ public class TestSDKClient { } } /** - * 序列号的余额 - * 0.1代表一条 + * 搴忓垪鍙风殑浣欓 + * 0.1浠h〃涓�鏉� */ public static void testGetBalance() { try { @@ -264,7 +264,7 @@ public class TestSDKClient { } /** - * 发送一条短信所需的费用 + * 鍙戦�佷竴鏉$煭淇℃墍闇�鐨勮垂鐢� */ public static void testGetEachFee() { try { @@ -276,9 +276,9 @@ public class TestSDKClient { } /** - * 1、从EUCP平台接收手机用户上行的短信 - * 2、返回值list中的每个元素为一个Mo对象 - * 3、Mo具体数据结构参考使用手册 + * 1銆佷粠EUCP骞冲彴鎺ユ敹鎵嬫満鐢ㄦ埛涓婅鐨勭煭淇� + * 2銆佽繑鍥炲�糽ist涓殑姣忎釜鍏冪礌涓轰竴涓狹o瀵硅薄 + * 3銆丮o鍏蜂綋鏁版嵁缁撴瀯鍙傝�冧娇鐢ㄦ墜鍐� */ public static void testGetMO() { try { @@ -287,12 +287,12 @@ public class TestSDKClient { System.out.println("testGetMO1size:" + list.size()); for(MO mo : list) { - System.out.println("短信内容:" + mo.getSmsContent()); - System.out.println("通道号:" + mo.getChannelnumber()); - System.out.println("手机号:" + mo.getMobileNumber()); - System.out.println("附加码:" + mo.getAddSerialRev()); - System.out.println("附加码:" + mo.getAddSerial()); - // 上行短信务必要保存,加入业务逻辑代码,如:保存数据库,写文件等等 + System.out.println("鐭俊鍐呭:" + mo.getSmsContent()); + System.out.println("閫氶亾鍙�:" + mo.getChannelnumber()); + System.out.println("鎵嬫満鍙�:" + mo.getMobileNumber()); + System.out.println("闄勫姞鐮�:" + mo.getAddSerialRev()); + System.out.println("闄勫姞鐮�:" + mo.getAddSerial()); + // 涓婅鐭俊鍔″繀瑕佷繚瀛�,鍔犲叆涓氬姟閫昏緫浠g爜,濡傦細淇濆瓨鏁版嵁搴擄紝鍐欐枃浠剁瓑绛� } } else { System.out.println("NO HAVE MO"); @@ -302,16 +302,16 @@ public class TestSDKClient { } } /** - * 1、从EUCP平台接收下行短信的状态报告 - * 2、返回值list中的每个元素为一个StatusReport对象 - * 3、StatusReport具体数据结构参考使用手册 + * 1銆佷粠EUCP骞冲彴鎺ユ敹涓嬭鐭俊鐨勭姸鎬佹姤鍛� + * 2銆佽繑鍥炲�糽ist涓殑姣忎釜鍏冪礌涓轰竴涓猄tatusReport瀵硅薄 + * 3銆丼tatusReport鍏蜂綋鏁版嵁缁撴瀯鍙傝�冧娇鐢ㄦ墜鍐� */ public static void testgetReport(){ try { List list=SingletonClient.getClient().getReport(); if(list!=null){ for(StatusReport report : list){ - System.out.println("手机号码:"+report.getMobile()+"\t状态:"+report.getReportStatus()+"\t信息ID:"+report.getSeqID()); + System.out.println("鎵嬫満鍙风爜:"+report.getMobile()+"\t鐘舵��:"+report.getReportStatus()+"\t淇℃伅ID锛�"+report.getSeqID()); } }else{ System.out.println("no have data"); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/DistrictArroundPoiExportBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/DistrictArroundPoiExportBatch.groovy index ebef98e23..4e0bb84f7 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/DistrictArroundPoiExportBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/DistrictArroundPoiExportBatch.groovy @@ -78,22 +78,22 @@ class DistrictArroundPoiExportBatch extends BaseBatch{ def createTable() { def sql = """ CREATE TABLE IF NOT EXISTS `_PeripheralFacilities` ( - `POI_ID` varchar(32) NOT NULL COMMENT '配套编号', - `PROPERTY_ID` varchar(32) NOT NULL COMMENT '小区ID', - `CITY` varchar(32) DEFAULT NULL COMMENT '城市', - `REGION` varchar(32) DEFAULT NULL COMMENT '区域', - `DISTRICT_NAME` varchar(255) DEFAULT NULL COMMENT '小区名', - `NAME` varchar(255) DEFAULT NULL COMMENT '配套名称', - `ADDRESS` varchar(500) DEFAULT NULL COMMENT '配套地址', - `LAT` decimal(10,6) DEFAULT NULL COMMENT '纬度', - `LNG` decimal(10,6) DEFAULT NULL COMMENT '经度', - `DISTANCE` decimal(10,0) DEFAULT NULL COMMENT '距离', - `CAT` varchar(20) DEFAULT NULL COMMENT '配套类型', - `SYNC_DATE` datetime DEFAULT NULL COMMENT '同步时间', - `TYPE` varchar(255) DEFAULT NULL COMMENT '配套详细分类', + `POI_ID` varchar(32) NOT NULL COMMENT '閰嶅缂栧彿', + `PROPERTY_ID` varchar(32) NOT NULL COMMENT '灏忓尯ID', + `CITY` varchar(32) DEFAULT NULL COMMENT '鍩庡競', + `REGION` varchar(32) DEFAULT NULL COMMENT '鍖哄煙', + `DISTRICT_NAME` varchar(255) DEFAULT NULL COMMENT '灏忓尯鍚�', + `NAME` varchar(255) DEFAULT NULL COMMENT '閰嶅鍚嶇О', + `ADDRESS` varchar(500) DEFAULT NULL COMMENT '閰嶅鍦板潃', + `LAT` decimal(10,6) DEFAULT NULL COMMENT '绾害', + `LNG` decimal(10,6) DEFAULT NULL COMMENT '缁忓害', + `DISTANCE` decimal(10,0) DEFAULT NULL COMMENT '璺濈', + `CAT` varchar(20) DEFAULT NULL COMMENT '閰嶅绫诲瀷', + `SYNC_DATE` datetime DEFAULT NULL COMMENT '鍚屾鏃堕棿', + `TYPE` varchar(255) DEFAULT NULL COMMENT '閰嶅璇︾粏鍒嗙被', PRIMARY KEY (`POI_ID`,`PROPERTY_ID`) USING BTREE, KEY `PROPERTYID_CAT_INDEX` (`PROPERTY_ID`,`CAT`) USING BTREE - ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '楼盘配套表' ROW_FORMAT = Dynamic; + ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '妤肩洏閰嶅琛�' ROW_FORMAT = Dynamic; """.toString() JusfounCommon.DB_Jusfoun_New.execute(sql) } @@ -146,30 +146,30 @@ class DistrictArroundPoiExportBatch extends BaseBatch{ lactions.lat = lat; def results = [] - //商场 - def shop_detail = findPoiDetail(city, "商场","060100", ["060101","060102"], lactions, map.maxLat, map.minLat, map.maxLng, map.minLng) + //鍟嗗満 + def shop_detail = findPoiDetail(city, "鍟嗗満","060100", ["060101","060102"], lactions, map.maxLat, map.minLat, map.maxLng, map.minLng) results.addAll(shop_detail) -// //学校 - def school_detail = findPoiDetail(city, "学校","141200", ["141201","141202","141203","141204","141205","141206"], lactions, map.maxLat, map.minLat, map.maxLng, map.minLng) +// //瀛︽牎 + def school_detail = findPoiDetail(city, "瀛︽牎","141200", ["141201","141202","141203","141204","141205","141206"], lactions, map.maxLat, map.minLat, map.maxLng, map.minLng) results.addAll(school_detail) -// //银行 - def blank_detail = findPoiDetail(city, "银行","160100", null, lactions, map.maxLat, map.minLat, map.maxLng, map.minLng) +// //閾惰 + def blank_detail = findPoiDetail(city, "閾惰","160100", null, lactions, map.maxLat, map.minLat, map.maxLng, map.minLng) results.addAll(blank_detail) // //ATM - def atm_detail = findPoiDetail(city, "银行","160300", null, lactions, map.maxLat, map.minLat, map.maxLng, map.minLng) + def atm_detail = findPoiDetail(city, "閾惰","160300", null, lactions, map.maxLat, map.minLat, map.maxLng, map.minLng) results.addAll(atm_detail) -// //医院 - def hosp_detail = findPoiDetail(city, "医院","090100", null, lactions, map.maxLat, map.minLat, map.maxLng, map.minLng) +// //鍖婚櫌 + def hosp_detail = findPoiDetail(city, "鍖婚櫌","090100", null, lactions, map.maxLat, map.minLat, map.maxLng, map.minLng) results.addAll(hosp_detail) -// //专科医院 - def zk_hosp_detail = findPoiDetail(city, "医院","090200", null, lactions, map.maxLat, map.minLat, map.maxLng, map.minLng) +// //涓撶鍖婚櫌 + def zk_hosp_detail = findPoiDetail(city, "鍖婚櫌","090200", null, lactions, map.maxLat, map.minLat, map.maxLng, map.minLng) results.addAll(zk_hosp_detail) -// //公交 - def bus_detail = findPoiDetail(city, "交通","150700", null, lactions, map.maxLat, map.minLat, map.maxLng, map.minLng) +// //鍏氦 + def bus_detail = findPoiDetail(city, "浜ら��","150700", null, lactions, map.maxLat, map.minLat, map.maxLng, map.minLng) results.addAll(bus_detail) -// //地铁 - def subway_detail = findPoiDetail(city, "交通", "150500", null, lactions, map.maxLat, map.minLat, map.maxLng, map.minLng) +// //鍦伴搧 + def subway_detail = findPoiDetail(city, "浜ら��", "150500", null, lactions, map.maxLat, map.minLat, map.maxLng, map.minLng) results.addAll(subway_detail) return results diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/DistrictStatExportBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/DistrictStatExportBatch.groovy index b2d562ce6..15a7e9831 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/DistrictStatExportBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/DistrictStatExportBatch.groovy @@ -55,14 +55,14 @@ class DistrictStatExportBatch extends BaseBatch { citys.each { def city -> try { - println("城市city:" + city + "小区均价开始执行****************") - //先创建对应城市的表结构 + println("鍩庡競city:" + city + "灏忓尯鍧囦环寮�濮嬫墽琛�****************") + //鍏堝垱寤哄搴斿煄甯傜殑琛ㄧ粨鏋� createTable(city) cityProcess(city, ss, ee); } catch (Exception e) { - println "城市city:" + city + "小区均价执行过程发生异常,异常信息为:" + println "鍩庡競city:" + city + "灏忓尯鍧囦环鎵ц杩囩▼鍙戠敓寮傚父锛屽紓甯镐俊鎭负:" e.printStackTrace() } } @@ -86,11 +86,11 @@ class DistrictStatExportBatch extends BaseBatch { if(!ids.contains(stat.getString("_id"))){ ids << stat.getString("_id") }else{ - println "存在 "+stat.getString("_id") + println "瀛樺湪 "+stat.getString("_id") } addToBatch(stat, pst, conn); } catch (Exception e) { - println "异常" + println "寮傚父" e.printStackTrace(); } finally { latch.countDown() @@ -137,20 +137,20 @@ class DistrictStatExportBatch extends BaseBatch { } def createTable(String city) { - println("createTable创建city:'" + city + "' 小区均价数据表结构开始") + println("createTable鍒涘缓city:'" + city + "' 灏忓尯鍧囦环鏁版嵁琛ㄧ粨鏋勫紑濮�") def sql = """ CREATE TABLE IF NOT EXISTS `DISTRICT_STAT_${JusfounCommon.pinyin(city)}` ( - `ID` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '均价ID', - `PROPERTY_ID` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '小区编号', - `CITY` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '城市', - `REGION` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '区域', - `DISTRICT_NAME` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '小区名', - `ESTATE_TYPE` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '物业类型', - `WEEKEND` date NULL DEFAULT NULL COMMENT '均价日期,均价计算周的周日', - `AVG_PRICE` int(10) NULL DEFAULT NULL COMMENT '均价', - `SYNC_DATE` datetime(0) NULL DEFAULT NULL COMMENT '同步时间', + `ID` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '鍧囦环ID', + `PROPERTY_ID` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '灏忓尯缂栧彿', + `CITY` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鍩庡競', + `REGION` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鍖哄煙', + `DISTRICT_NAME` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '灏忓尯鍚�', + `ESTATE_TYPE` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鐗╀笟绫诲瀷', + `WEEKEND` date NULL DEFAULT NULL COMMENT '鍧囦环鏃ユ湡,鍧囦环璁$畻鍛ㄧ殑鍛ㄦ棩', + `AVG_PRICE` int(10) NULL DEFAULT NULL COMMENT '鍧囦环', + `SYNC_DATE` datetime(0) NULL DEFAULT NULL COMMENT '鍚屾鏃堕棿', PRIMARY KEY (`ID`) - ) ENGINE = MyISAM CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '小区均价表' ROW_FORMAT = Dynamic; + ) ENGINE = MyISAM CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '灏忓尯鍧囦环琛�' ROW_FORMAT = Dynamic; """.toString() JusfounCommon.DB_Jusfoun_New.execute(sql) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/DistrictStatRentExportBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/DistrictStatRentExportBatch.groovy index 59a76fc10..46674dcef 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/DistrictStatRentExportBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/DistrictStatRentExportBatch.groovy @@ -48,8 +48,8 @@ class DistrictStatRentExportBatch extends BaseBatch { void cityProc(String city) { try { - println("城市city:" + city + "小区户型租金开始执行****************") - //先创建对应城市的表结构 + println("鍩庡競city:" + city + "灏忓尯鎴峰瀷绉熼噾寮�濮嬫墽琛�****************") + //鍏堝垱寤哄搴斿煄甯傜殑琛ㄧ粨鏋� createTable(city) Date ss = DateUtils.getFirstDayOfMonth(new Date(), -1) @@ -70,7 +70,7 @@ class DistrictStatRentExportBatch extends BaseBatch { println count.get()+" "+city+" "+stat.district_name addToBatch(stat, pst); } catch (Exception e) { - println "异常" + println "寮傚父" e.printStackTrace(); } finally { latch.countDown() @@ -79,7 +79,7 @@ class DistrictStatRentExportBatch extends BaseBatch { pst.executeBatch(); conn.commit(); } catch (Exception e) { - println("城市city:" + city + "小区户型租金执行过程发生异常,异常信息为:", e) + println("鍩庡競city:" + city + "灏忓尯鎴峰瀷绉熼噾鎵ц杩囩▼鍙戠敓寮傚父锛屽紓甯镐俊鎭负:", e) } } @@ -119,20 +119,20 @@ class DistrictStatRentExportBatch extends BaseBatch { } def createTable(String city) { - println("createTable创建city:'" + city + "' 小区户型租金数据表结构开始") + println("createTable鍒涘缓city:'" + city + "' 灏忓尯鎴峰瀷绉熼噾鏁版嵁琛ㄧ粨鏋勫紑濮�") def sql = """ CREATE TABLE IF NOT EXISTS `DISTRICT_STAT_RENT_${JusfounCommon.pinyin(city)}` ( - `ID` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '租金ID', - `PROPERTY_ID` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '楼盘编号', - `CITY` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '城市', - `REGION` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '区域', - `DISTRICT_NAME` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '小区名', - `ESTATE_TYPE` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '物业类型', - `HOUSE_TYPE` decimal(10, 0) NULL DEFAULT NULL COMMENT '户型', - `AVG_PRICE` decimal(10, 0) NULL DEFAULT NULL COMMENT '租金', - `MONTH` date NULL DEFAULT NULL COMMENT '所在月最后一天', - `SYNC_DATE` datetime(0) NULL DEFAULT NULL COMMENT '同步时间' - ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '小区户型租金表' ROW_FORMAT = Dynamic; + `ID` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '绉熼噾ID', + `PROPERTY_ID` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '妤肩洏缂栧彿', + `CITY` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鍩庡競', + `REGION` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鍖哄煙', + `DISTRICT_NAME` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '灏忓尯鍚�', + `ESTATE_TYPE` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鐗╀笟绫诲瀷', + `HOUSE_TYPE` decimal(10, 0) NULL DEFAULT NULL COMMENT '鎴峰瀷', + `AVG_PRICE` decimal(10, 0) NULL DEFAULT NULL COMMENT '绉熼噾', + `MONTH` date NULL DEFAULT NULL COMMENT '鎵�鍦ㄦ湀鏈�鍚庝竴澶�', + `SYNC_DATE` datetime(0) NULL DEFAULT NULL COMMENT '鍚屾鏃堕棿' + ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '灏忓尯鎴峰瀷绉熼噾琛�' ROW_FORMAT = Dynamic; """.toString() JusfounCommon.DB_Jusfoun_New.execute(sql) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/HousingOverviewExportBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/HousingOverviewExportBatch.groovy index 2f5e236d7..e0d34acad 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/HousingOverviewExportBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/HousingOverviewExportBatch.groovy @@ -45,14 +45,14 @@ class HousingOverviewExportBatch extends BaseBatch { @Override void process(Object args) { -//"武汉","成都" ,"三亚","南昌","西安","北京" - ["成都","西安", "长沙"].each { def city -> +//"姝︽眽","鎴愰兘" ,"涓変簹","鍗楁槍","瑗垮畨","鍖椾含" + ["鎴愰兘","瑗垮畨", "闀挎矙"].each { def city -> try { cleanDatas(city); - def file = new File("d:\\数据\\九次方\\房源9月.txt") - println("城市city:" + city + "HousingOverview开始执行****************") + def file = new File("d:\\鏁版嵁\\涔濇鏂筡\鎴挎簮9鏈�.txt") + println("鍩庡競city:" + city + "HousingOverview寮�濮嬫墽琛�****************") - //先创建对应城市的表结构 + //鍏堝垱寤哄搴斿煄甯傜殑琛ㄧ粨鏋� createTable(city); def districtMap = findDistrictDatasMap(city); @@ -78,10 +78,10 @@ class HousingOverviewExportBatch extends BaseBatch { try { String pre_key = seawater.city + "_" + seawater.region + "_" + seawater.district_name def estate_type = null; - if (StringUtils.isEmpty(seawater.estate_type) || !StringUtils.containsIgnoreCase(seawater.estate_type, "别墅")) { - estate_type = "小区" + if (StringUtils.isEmpty(seawater.estate_type) || !StringUtils.containsIgnoreCase(seawater.estate_type, "鍒")) { + estate_type = "灏忓尯" } else { - estate_type = "别墅" + estate_type = "鍒" } String key = pre_key + "_" + estate_type // BasicDBObject district = JusfounCommon.getDistrictOne(seawater.city, seawater.region, seawater.district_name, seawater.estate_type); @@ -111,7 +111,7 @@ class HousingOverviewExportBatch extends BaseBatch { println("HousingOverviewExportBatch -> $city $count end! SQL:"+sqls.size()) - return false;//不进行更新 + return false;//涓嶈繘琛屾洿鏂� }); println "SQL:"+sqls.size() @@ -164,9 +164,9 @@ class HousingOverviewExportBatch extends BaseBatch { citys.each { def city -> try { cleanDatas(city); - println("城市city:" + city + "HousingOverview开始执行****************") + println("鍩庡競city:" + city + "HousingOverview寮�濮嬫墽琛�****************") - //先创建对应城市的表结构 + //鍏堝垱寤哄搴斿煄甯傜殑琛ㄧ粨鏋� createTable(city); def districtMap = findDistrictDatasMap(city); @@ -189,10 +189,10 @@ class HousingOverviewExportBatch extends BaseBatch { try { String pre_key = seawater.city + "_" + seawater.region + "_" + seawater.district_name def estate_type = null; - if (StringUtils.isEmpty(seawater.estate_type) || !StringUtils.containsIgnoreCase(seawater.estate_type, "别墅")) { - estate_type = "小区" + if (StringUtils.isEmpty(seawater.estate_type) || !StringUtils.containsIgnoreCase(seawater.estate_type, "鍒")) { + estate_type = "灏忓尯" } else { - estate_type = "别墅" + estate_type = "鍒" } String key = pre_key + "_" + estate_type // BasicDBObject district = JusfounCommon.getDistrictOne(seawater.city, seawater.region, seawater.district_name, seawater.estate_type); @@ -211,7 +211,7 @@ class HousingOverviewExportBatch extends BaseBatch { println("HousingOverviewExportBatch -> $city $count end! SQL:"+sqls.size()) - return false;//不进行更新 + return false;//涓嶈繘琛屾洿鏂� }); println "SQL:"+sqls.size() @@ -226,7 +226,7 @@ class HousingOverviewExportBatch extends BaseBatch { try{ stmt.addBatch s }catch(BatchUpdateException e){ - println s+"【重复】" + println s+"銆愰噸澶嶃��" } } @@ -245,7 +245,7 @@ class HousingOverviewExportBatch extends BaseBatch { try{ stmt.addBatch s }catch(BatchUpdateException e){ - println s+"【重复】" + println s+"銆愰噸澶嶃��" } } }) @@ -289,9 +289,9 @@ class HousingOverviewExportBatch extends BaseBatch { if (StringUtils.isNotEmpty(dist.city) && StringUtils.isNotEmpty(dist.region) && StringUtils.isNotEmpty(dist.name)) { try { String pre_key = dist.city + "_" + dist.region + "_" + dist.name - def estate_type = "小区" - if (dist != null && dist.dist != null && dist.estate_type2.toString().contains("别墅")) { - estate_type = "别墅" + def estate_type = "灏忓尯" + if (dist != null && dist.dist != null && dist.estate_type2.toString().contains("鍒")) { + estate_type = "鍒" } String key = pre_key + "_" + estate_type if(!distMap.containsKey(key)){ @@ -320,43 +320,43 @@ class HousingOverviewExportBatch extends BaseBatch { def createTable(String city) { def sql = """ CREATE TABLE IF NOT EXISTS `_HousingOverview_${JusfounCommon.pinyin(city)}` ( - `HousingID` varchar(32) NOT NULL COMMENT '房屋编号', - `PropertyID` varchar(32) DEFAULT NULL COMMENT '楼盘编号', - `Orientation` varchar(300) DEFAULT NULL COMMENT '房屋朝向', - `HouseType` varchar(100) DEFAULT NULL COMMENT '房屋户型', - `NumOfBedrooms` int(3) DEFAULT NULL COMMENT '卧室数量', - `NumOfLivingrooms` int(3) DEFAULT NULL COMMENT '客厅数量', - `NumOfBathrooms` int(3) DEFAULT NULL COMMENT '卫生间数量', - `BuildingType` varchar(200) DEFAULT NULL COMMENT '房屋建筑类型', - `BuildingArea` decimal(10,2) DEFAULT NULL COMMENT '房屋建筑面积', - `HouseCoverArea` decimal(10,2) DEFAULT NULL COMMENT '房屋套内面积', - `Floor` int(3) DEFAULT NULL COMMENT '房屋所在楼层', - `TotalFloor` int(3) DEFAULT NULL COMMENT '房屋总楼层', - `IsFirstFloor` tinyint(1) DEFAULT NULL COMMENT '房屋是否一层 ', - `IsTopFloor` tinyint(1) DEFAULT NULL COMMENT '房屋是否顶层 ', - `FloorProperties` varchar(200) DEFAULT NULL COMMENT '房屋楼层属性(高层,中高层,低层)', - `Renovation` varchar(200) DEFAULT NULL COMMENT '房屋装修', - `IsElevator` tinyint(1) DEFAULT NULL COMMENT '房屋有无电梯', - `Purposes` varchar(20) DEFAULT NULL COMMENT '房屋用途', - `Belongs` varchar(50) DEFAULT NULL COMMENT '房产所属', - `HeatingMethod` varchar(20) DEFAULT NULL COMMENT '房屋供暖方式', - `LadderRatio` varchar(10) DEFAULT NULL COMMENT '房屋梯户比例', - `ConstructionTime` date DEFAULT NULL COMMENT '建筑时间', - `PropertyRightsOfYear` varchar(10) DEFAULT NULL COMMENT '产权年限', - `address` varchar(500) DEFAULT NULL COMMENT '地址', - `city` varchar(20) DEFAULT NULL COMMENT '地址', - `region` varchar(100) DEFAULT NULL COMMENT '地区', - `block` varchar(100) DEFAULT NULL COMMENT '版块', - `district_name` varchar(100) DEFAULT NULL COMMENT '小区名', - `publish_date` date DEFAULT NULL COMMENT '发布时间', - `lng2` double(20,10) DEFAULT NULL COMMENT '地图坐标-经度', - `lat2` double(20,10) DEFAULT NULL COMMENT '地图坐标-纬度', - `total_price` int(20) DEFAULT NULL COMMENT '总价', - `unit_price` int(20) DEFAULT NULL COMMENT '单价', - `SYNC_DATE` datetime DEFAULT NULL COMMENT '同步时间', + `HousingID` varchar(32) NOT NULL COMMENT '鎴垮眿缂栧彿', + `PropertyID` varchar(32) DEFAULT NULL COMMENT '妤肩洏缂栧彿', + `Orientation` varchar(300) DEFAULT NULL COMMENT '鎴垮眿鏈濆悜', + `HouseType` varchar(100) DEFAULT NULL COMMENT '鎴垮眿鎴峰瀷', + `NumOfBedrooms` int(3) DEFAULT NULL COMMENT '鍗у鏁伴噺', + `NumOfLivingrooms` int(3) DEFAULT NULL COMMENT '瀹㈠巺鏁伴噺', + `NumOfBathrooms` int(3) DEFAULT NULL COMMENT '鍗敓闂存暟閲�', + `BuildingType` varchar(200) DEFAULT NULL COMMENT '鎴垮眿寤虹瓚绫诲瀷', + `BuildingArea` decimal(10,2) DEFAULT NULL COMMENT '鎴垮眿寤虹瓚闈㈢Н', + `HouseCoverArea` decimal(10,2) DEFAULT NULL COMMENT '鎴垮眿濂楀唴闈㈢Н', + `Floor` int(3) DEFAULT NULL COMMENT '鎴垮眿鎵�鍦ㄦゼ灞�', + `TotalFloor` int(3) DEFAULT NULL COMMENT '鎴垮眿鎬绘ゼ灞�', + `IsFirstFloor` tinyint(1) DEFAULT NULL COMMENT '鎴垮眿鏄惁涓�灞� ', + `IsTopFloor` tinyint(1) DEFAULT NULL COMMENT '鎴垮眿鏄惁椤跺眰 ', + `FloorProperties` varchar(200) DEFAULT NULL COMMENT '鎴垮眿妤煎眰灞炴�э紙楂樺眰,涓珮灞�,浣庡眰锛�', + `Renovation` varchar(200) DEFAULT NULL COMMENT '鎴垮眿瑁呬慨', + `IsElevator` tinyint(1) DEFAULT NULL COMMENT '鎴垮眿鏈夋棤鐢垫', + `Purposes` varchar(20) DEFAULT NULL COMMENT '鎴垮眿鐢ㄩ��', + `Belongs` varchar(50) DEFAULT NULL COMMENT '鎴夸骇鎵�灞�', + `HeatingMethod` varchar(20) DEFAULT NULL COMMENT '鎴垮眿渚涙殩鏂瑰紡', + `LadderRatio` varchar(10) DEFAULT NULL COMMENT '鎴垮眿姊埛姣斾緥', + `ConstructionTime` date DEFAULT NULL COMMENT '寤虹瓚鏃堕棿', + `PropertyRightsOfYear` varchar(10) DEFAULT NULL COMMENT '浜ф潈骞撮檺', + `address` varchar(500) DEFAULT NULL COMMENT '鍦板潃', + `city` varchar(20) DEFAULT NULL COMMENT '鍦板潃', + `region` varchar(100) DEFAULT NULL COMMENT '鍦板尯', + `block` varchar(100) DEFAULT NULL COMMENT '鐗堝潡', + `district_name` varchar(100) DEFAULT NULL COMMENT '灏忓尯鍚�', + `publish_date` date DEFAULT NULL COMMENT '鍙戝竷鏃堕棿', + `lng2` double(20,10) DEFAULT NULL COMMENT '鍦板浘鍧愭爣-缁忓害', + `lat2` double(20,10) DEFAULT NULL COMMENT '鍦板浘鍧愭爣-绾害', + `total_price` int(20) DEFAULT NULL COMMENT '鎬讳环', + `unit_price` int(20) DEFAULT NULL COMMENT '鍗曚环', + `SYNC_DATE` datetime DEFAULT NULL COMMENT '鍚屾鏃堕棿', PRIMARY KEY (`HousingID`), UNIQUE KEY `idx_HousingID` (`HousingID`) USING BTREE - ) ENGINE = MyISAM CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '房源表' ROW_FORMAT = Dynamic; + ) ENGINE = MyISAM CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '鎴挎簮琛�' ROW_FORMAT = Dynamic; """.toString() JusfounCommon.DB_Jusfoun_New.execute(sql) } @@ -374,7 +374,7 @@ class HousingOverviewExportBatch extends BaseBatch { ex.printStackTrace(); } if (i_p_date < p_date_start || i_p_date >= p_date_end) { - println "时间过滤("+i_p_date+")" + println "鏃堕棿杩囨护锛�"+i_p_date+")" return; } def city = house.city; @@ -383,7 +383,7 @@ class HousingOverviewExportBatch extends BaseBatch { } city = RegionData.formatCity(city) if (!RegionData.isCity(city)) { - println "城市过滤("+city+")" + println "鍩庡競杩囨护锛�"+city+")" return; } def kv = [:] @@ -394,11 +394,11 @@ class HousingOverviewExportBatch extends BaseBatch { kv.put("NumOfBathrooms", JusfounCommon.convertInt(house.get("toilet"))) String HouseType = ""; if (kv.NumOfBedrooms > 0) - HouseType += kv.NumOfBedrooms + "室"; + HouseType += kv.NumOfBedrooms + "瀹�"; if (kv.NumOfLivingrooms > 0) - HouseType += kv.NumOfLivingrooms + "厅"; + HouseType += kv.NumOfLivingrooms + "鍘�"; if (kv.NumOfBathrooms > 0) - HouseType += kv.NumOfBathrooms + "卫"; + HouseType += kv.NumOfBathrooms + "鍗�"; kv.put("HouseType", HouseType) double area = JusfounCommon.convertDouble(house.get("area")); kv.put("BuildingArea", area); @@ -484,7 +484,7 @@ class HousingOverviewExportBatch extends BaseBatch { } def addSql(){ - def files = getAllFiles("d:\\数据\\九次方"); + def files = getAllFiles("d:\\鏁版嵁\\涔濇鏂�"); for(def file : files){ println file.getName(); def sqls = [] @@ -539,7 +539,7 @@ class HousingOverviewExportBatch extends BaseBatch { files << tempList[i]; } if (tempList[i].isDirectory()) { - System.out.println("文件夹:" + tempList[i]); + System.out.println("鏂囦欢澶癸細" + tempList[i]); } } return files; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/HousingTransactionExportBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/HousingTransactionExportBatch.groovy index e99c9b8c4..f3990128e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/HousingTransactionExportBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/HousingTransactionExportBatch.groovy @@ -47,7 +47,7 @@ class HousingTransactionExportBatch extends BaseBatch { // try { // def query = new BasicDBObject(); -// query.put("city", "三亚"); +// query.put("city", "涓変簹"); // query.put("tradePrice", new BasicDBObject('$gt', 0)); // query.append("finishDate", new BasicDBObject('$gte', ss).append('$lt', ee)); // def cursor = collection_pai_mai.find(query).addOption(Bytes.QUERYOPTION_NOTIMEOUT).batchSize(500); @@ -64,7 +64,7 @@ class HousingTransactionExportBatch extends BaseBatch { // def estate_type = dbObject_paimai.get("matchEstateType"); // // DBObject dbObject = new BasicDBObject(); -// dbObject.put("city", "三亚"); +// dbObject.put("city", "涓変簹"); // dbObject.put("url", url); // } // @@ -104,20 +104,20 @@ class HousingTransactionExportBatch extends BaseBatch { continue; } - city_item = StringUtils.replaceOnce(city_item, "二手房", ""); - city_item = StringUtils.replaceOnce(city_item, "成交", ""); + city_item = StringUtils.replaceOnce(city_item, "浜屾墜鎴�", ""); + city_item = StringUtils.replaceOnce(city_item, "鎴愪氦", ""); if (!mapCreateTable.containsKey(city_item) || !mapCreateTable.get(city_item)) { createTable(city_item); mapCreateTable.put(city_item, true); } String region_item = price.get("region") != null ? price.get("region").toString() : null; - region_item = StringUtils.replaceOnce(region_item, "二手房", ""); - region_item = StringUtils.replaceOnce(region_item, "成交", ""); + region_item = StringUtils.replaceOnce(region_item, "浜屾墜鎴�", ""); + region_item = StringUtils.replaceOnce(region_item, "鎴愪氦", ""); String block_item = price.get("block") != null ? price.get("block").toString() : null; - block_item = StringUtils.replaceOnce(block_item, "二手房", ""); - block_item = StringUtils.replaceOnce(block_item, "成交", ""); + block_item = StringUtils.replaceOnce(block_item, "浜屾墜鎴�", ""); + block_item = StringUtils.replaceOnce(block_item, "鎴愪氦", ""); String district_name = price.get("district_name") != null ? price.get("district_name").toString() : null; @@ -157,7 +157,7 @@ class HousingTransactionExportBatch extends BaseBatch { Date ss = DateUtils.getFirstDayOfMonth(new Date(), -1) Date ee = DateUtils.getFirstDayOfMonth(new Date()) def cursor = PAI_MAI.find(and(gte("finishDate", ss), lt("finishDate", ee), - eq("matchCity", city), eq("status", "已完成"))).noCursorTimeout(true) + eq("matchCity", city), eq("status", "宸插畬鎴�"))).noCursorTimeout(true) for (Document doc : cursor) { if (!doc.area) { continue @@ -180,7 +180,7 @@ class HousingTransactionExportBatch extends BaseBatch { println(sql) } }else{ - println("存在") + println("瀛樺湪") } } @@ -194,7 +194,7 @@ class HousingTransactionExportBatch extends BaseBatch { cleanDatas(city); } JusfounCommon.CITIES.each {def city-> - println("城市city:" + city + "HousingTransaction数据表开始执行****************") + println("鍩庡競city:" + city + "HousingTransaction鏁版嵁琛ㄥ紑濮嬫墽琛�****************") createTable(city); processUseEsfTransaction(city); processUsePaiMaiData(city) @@ -231,7 +231,7 @@ class HousingTransactionExportBatch extends BaseBatch { def processUseEsfTransaction(city){ try { -// if (!StringUtils.equalsIgnoreCase("三亚", city)) { +// if (!StringUtils.equalsIgnoreCase("涓変簹", city)) { // return false; // } @@ -254,16 +254,16 @@ class HousingTransactionExportBatch extends BaseBatch { if (!StringUtils.containsIgnoreCase(city_item, city)) { continue; } - city_item = StringUtils.replaceOnce(city_item, "二手房", ""); - city_item = StringUtils.replaceOnce(city_item, "成交", ""); + city_item = StringUtils.replaceOnce(city_item, "浜屾墜鎴�", ""); + city_item = StringUtils.replaceOnce(city_item, "鎴愪氦", ""); String region_item = price.get("region") != null ? price.get("region").toString() : null; - region_item = StringUtils.replaceOnce(region_item, "二手房", ""); - region_item = StringUtils.replaceOnce(region_item, "成交", ""); + region_item = StringUtils.replaceOnce(region_item, "浜屾墜鎴�", ""); + region_item = StringUtils.replaceOnce(region_item, "鎴愪氦", ""); String block_item = price.get("block") != null ? price.get("block").toString() : null; - block_item = StringUtils.replaceOnce(block_item, "二手房", ""); - block_item = StringUtils.replaceOnce(block_item, "成交", ""); + block_item = StringUtils.replaceOnce(block_item, "浜屾墜鎴�", ""); + block_item = StringUtils.replaceOnce(block_item, "鎴愪氦", ""); String district_name = price.get("district_name") != null ? price.get("district_name").toString() : null; @@ -309,7 +309,7 @@ class HousingTransactionExportBatch extends BaseBatch { sqls.clear() } } catch (Exception e) { - println("城市city:" + city + "HousingTransaction数据执行过程发生异常,异常信息为:", e) + println("鍩庡競city:" + city + "HousingTransaction鏁版嵁鎵ц杩囩▼鍙戠敓寮傚父锛屽紓甯镐俊鎭负:", e) } } @@ -378,30 +378,30 @@ class HousingTransactionExportBatch extends BaseBatch { } def createTable(String city) { - println("createTable创建city:'" + city + "' 成交数据表结构开始") + println("createTable鍒涘缓city:'" + city + "' 鎴愪氦鏁版嵁琛ㄧ粨鏋勫紑濮�") def sql = """ CREATE TABLE IF NOT EXISTS `_HousingTransaction_${JusfounCommon.pinyin(city)}` ( - `TransactionID` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '成交数据ID', - `CAT` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '成交类型:新房,二手房', - `TransactionTime` date NULL DEFAULT NULL COMMENT '成交时间', - `DealPrice` decimal(20, 0) NULL DEFAULT NULL COMMENT '成交总价', - `TransactionUnitPrice` decimal(20, 0) NULL DEFAULT NULL COMMENT '成交单价', - `AREA` decimal(20, 2) NULL DEFAULT NULL COMMENT '房屋面积', - `CITY` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '城市', - `REGION` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '区域', - `DISTRICT_NAME` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '小区名', - `SYNC_DATE` datetime(0) NULL DEFAULT NULL COMMENT '同步时间', - `PROPERTY_ID` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '小区编号', - `BLOCK` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '版块', - `ADDRESS` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '地址', - `HOUSE_TYPE` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '房屋类型' - ) ENGINE = MyISAM DEFAULT CHARSET=utf8 COMMENT = '成交数据表'; + `TransactionID` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '鎴愪氦鏁版嵁ID', + `CAT` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鎴愪氦绫诲瀷:鏂版埧锛屼簩鎵嬫埧', + `TransactionTime` date NULL DEFAULT NULL COMMENT '鎴愪氦鏃堕棿', + `DealPrice` decimal(20, 0) NULL DEFAULT NULL COMMENT '鎴愪氦鎬讳环', + `TransactionUnitPrice` decimal(20, 0) NULL DEFAULT NULL COMMENT '鎴愪氦鍗曚环', + `AREA` decimal(20, 2) NULL DEFAULT NULL COMMENT '鎴垮眿闈㈢Н', + `CITY` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鍩庡競', + `REGION` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鍖哄煙', + `DISTRICT_NAME` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '灏忓尯鍚�', + `SYNC_DATE` datetime(0) NULL DEFAULT NULL COMMENT '鍚屾鏃堕棿', + `PROPERTY_ID` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '灏忓尯缂栧彿', + `BLOCK` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鐗堝潡', + `ADDRESS` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鍦板潃', + `HOUSE_TYPE` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鎴垮眿绫诲瀷' + ) ENGINE = MyISAM DEFAULT CHARSET=utf8 COMMENT = '鎴愪氦鏁版嵁琛�'; """.toString() JusfounCommon.DB_Jusfoun_New.execute(sql) } /** - * 小区匹配为空, 成交数据也需要保存 + * 灏忓尯鍖归厤涓虹┖, 鎴愪氦鏁版嵁涔熼渶瑕佷繚瀛� * @param house * @param district * @param city @@ -410,7 +410,7 @@ class HousingTransactionExportBatch extends BaseBatch { def insertIntoMySQL(BasicDBObject house, BasicDBObject district, city) { def kv = [:] kv.put("TransactionID", house.getString("_id")) - kv.put("CAT", '二手房') + kv.put("CAT", '浜屾墜鎴�') kv.put("TransactionTime", house.get("trade_date")) kv.put("DealPrice", house.get("total_price")) kv.put("TransactionUnitPrice", house.get("avg_price")) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/HousingTransactionShanghaiExportBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/HousingTransactionShanghaiExportBatch.groovy index d8d31209f..8a09af931 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/HousingTransactionShanghaiExportBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/HousingTransactionShanghaiExportBatch.groovy @@ -29,10 +29,10 @@ class HousingTransactionShanghaiExportBatch extends BaseBatch{ ElasticUtils.executeQuery("192.168.0.45", "esf_deal_price_lansi", qb, {String id, Map doc-> BasicDBObject dbObj = new BasicDBObject(doc) - dbObj.put("CAT", "二手房") + dbObj.put("CAT", "浜屾墜鎴�") dbObj.put("_id", id) BasicDBObject district = JusfounCommon.getDistrictOne(dbObj.city, dbObj.region, dbObj.fjName) - def sql = insertIntoMySQL(dbObj, district, "上海") + def sql = insertIntoMySQL(dbObj, district, "涓婃捣") if(sql){ JusfounCommon.DB_Jusfoun_New.execute(sql) } @@ -41,10 +41,10 @@ class HousingTransactionShanghaiExportBatch extends BaseBatch{ ElasticUtils.executeQuery("192.168.0.45", "new_deal_price_lansi", qb, {String id, Map doc-> BasicDBObject dbObj = new BasicDBObject(doc) - dbObj.put("CAT", "一手房") + dbObj.put("CAT", "涓�鎵嬫埧") dbObj.put("_id", id) BasicDBObject district = JusfounCommon.getDistrictOne(dbObj.city, dbObj.region, dbObj.fjName) - def sql = insertIntoMySQL(dbObj, district, "上海") + def sql = insertIntoMySQL(dbObj, district, "涓婃捣") if(sql){ JusfounCommon.DB_Jusfoun_New.execute(sql) } @@ -56,23 +56,23 @@ class HousingTransactionShanghaiExportBatch extends BaseBatch{ def createTable(String city){ def sql = """ CREATE TABLE IF NOT EXISTS `_HousingTransaction_${JusfounCommon.pinyin(city)}` ( - `TransactionID` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '成交数据ID', - `CAT` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '成交类型:新房,二手房', - `TransactionTime` date NULL DEFAULT NULL COMMENT '成交时间', - `DealPrice` decimal(20, 0) NULL DEFAULT NULL COMMENT '成交总价', - `TransactionUnitPrice` decimal(20, 0) NULL DEFAULT NULL COMMENT '成交单价', - `AREA` decimal(20, 2) NULL DEFAULT NULL COMMENT '房屋面积', - `CITY` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '城市', - `REGION` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '区域', - `DISTRICT_NAME` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '小区名', - `SYNC_DATE` datetime(0) NULL DEFAULT NULL COMMENT '同步时间', - `PROPERTY_ID` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '小区编号', - `BLOCK` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '版块', - `ADDRESS` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '地址', - `HOUSE_TYPE` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '房屋类型', - `alaisContent` varchar(3000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '别名', + `TransactionID` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '鎴愪氦鏁版嵁ID', + `CAT` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鎴愪氦绫诲瀷:鏂版埧锛屼簩鎵嬫埧', + `TransactionTime` date NULL DEFAULT NULL COMMENT '鎴愪氦鏃堕棿', + `DealPrice` decimal(20, 0) NULL DEFAULT NULL COMMENT '鎴愪氦鎬讳环', + `TransactionUnitPrice` decimal(20, 0) NULL DEFAULT NULL COMMENT '鎴愪氦鍗曚环', + `AREA` decimal(20, 2) NULL DEFAULT NULL COMMENT '鎴垮眿闈㈢Н', + `CITY` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鍩庡競', + `REGION` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鍖哄煙', + `DISTRICT_NAME` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '灏忓尯鍚�', + `SYNC_DATE` datetime(0) NULL DEFAULT NULL COMMENT '鍚屾鏃堕棿', + `PROPERTY_ID` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '灏忓尯缂栧彿', + `BLOCK` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鐗堝潡', + `ADDRESS` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鍦板潃', + `HOUSE_TYPE` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鎴垮眿绫诲瀷', + `alaisContent` varchar(3000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鍒悕', PRIMARY KEY (`TransactionID`) USING BTREE - ) ENGINE = MyISAM DEFAULT CHARSET=utf8 COMMENT = '成交数据表'; + ) ENGINE = MyISAM DEFAULT CHARSET=utf8 COMMENT = '鎴愪氦鏁版嵁琛�'; """.toString() JusfounCommon.DB_Jusfoun_New.execute(sql) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/JusfounCommon.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/JusfounCommon.groovy index 494f8cb83..c8bba6c2a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/JusfounCommon.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/JusfounCommon.groovy @@ -31,8 +31,8 @@ class JusfounCommon { public static final String OriginDateString = "20180920"; - public final static String[] CITIES = ["三亚","南昌","西安", "北京", "上海", "广州", "深圳", "杭州", "南京", "武汉", "成都", "长沙", "贵阳"] -// public final static String[] CITIES = ["三亚","南昌","西安","北京","长沙", "贵阳", "南京","武汉", "杭州", "成都" , "广州", "深圳"] + public final static String[] CITIES = ["涓変簹","鍗楁槍","瑗垮畨", "鍖椾含", "涓婃捣", "骞垮窞", "娣卞湷", "鏉窞", "鍗椾含", "姝︽眽", "鎴愰兘", "闀挎矙", "璐甸槼"] +// public final static String[] CITIES = ["涓変簹","鍗楁槍","瑗垮畨","鍖椾含","闀挎矙", "璐甸槼", "鍗椾含","姝︽眽", "鏉窞", "鎴愰兘" , "骞垮窞", "娣卞湷"] public static String DBName_Old = "jusfoun"; public static String DBName_New = "jusfoun"; @@ -66,10 +66,10 @@ class JusfounCommon { if (StringUtils.isNotEmpty(city) && StringUtils.isNotEmpty(region) && StringUtils.isNotEmpty(district_name)) { try { String pre_key = city + "_" + region + "_" + district_name - if (StringUtils.isEmpty(estate_type) || !StringUtils.containsIgnoreCase(estate_type, "别墅")) { - estate_type = "小区" + if (StringUtils.isEmpty(estate_type) || !StringUtils.containsIgnoreCase(estate_type, "鍒")) { + estate_type = "灏忓尯" } else { - estate_type = "别墅" + estate_type = "鍒" } String key = pre_key + "_" + estate_type @@ -83,9 +83,9 @@ class JusfounCommon { println times } result = district - def estate_type2 = "小区" - if (district != null && district.estate_type2 != null && district.estate_type2.toString().contains("别墅")) { - estate_type2 = "别墅" + def estate_type2 = "灏忓尯" + if (district != null && district.estate_type2 != null && district.estate_type2.toString().contains("鍒")) { + estate_type2 = "鍒" } key = pre_key + "_" + estate_type2 _map_seaweed.put(key, district) @@ -117,8 +117,8 @@ class JusfounCommon { Map keyMap = mainCityMap.get(city); String key = city + "_" + region + "_" + district_name; - def estate_type1 = "小区"; - def estate_type2 = "别墅"; + def estate_type1 = "灏忓尯"; + def estate_type2 = "鍒"; if (StringUtils.isEmpty(estate_type)) { if (keyMap != null && keyMap.size() > 0) { result = keyMap.get(key + "_" + estate_type1); @@ -282,9 +282,9 @@ class JusfounCommon { // keys.append("address", 1) // keys.append("estate_type2", 1) DbUtils.seaweed.find(DbUtils.buildSeaweedQuery(city), new BasicDBObject()).each { BasicDBObject district -> - def estate_type2 = "小区" - if (district != null && district.estate_type2 != null && district.estate_type2.toString().contains("别墅")) { - estate_type2 = "别墅" + def estate_type2 = "灏忓尯" + if (district != null && district.estate_type2 != null && district.estate_type2.toString().contains("鍒")) { + estate_type2 = "鍒" } def key = "${district.city}_${district.region}_${district.name}_${estate_type2}".toString() mainMap.put(key, district) @@ -378,10 +378,10 @@ class JusfounCommon { if (StringUtils.isEmpty(hanzi)) { return ""; } - if (StringUtils.equalsIgnoreCase("成都", hanzi)) { + if (StringUtils.equalsIgnoreCase("鎴愰兘", hanzi)) { return "chengdu"; } - if (StringUtils.equalsIgnoreCase("长沙", hanzi)) { + if (StringUtils.equalsIgnoreCase("闀挎矙", hanzi)) { return "changsha"; } return DataUtil.hanyuQuanpin(hanzi, '') @@ -669,7 +669,7 @@ class JusfounCommon { scrollID = scrollResponse.getScrollId(); result = new HashMap<>(); result.put("ScrollID", scrollID); - long count = scrollResponse.getHits().getTotalHits();//第一次不返回数据 + long count = scrollResponse.getHits().getTotalHits();//绗竴娆′笉杩斿洖鏁版嵁 result.put("TotalCount", count); if (scrollResponse != null && scrollResponse.getHits() != null && scrollResponse.getHits().size() > 0) { dataList = new ArrayList<>(); @@ -684,7 +684,7 @@ class JusfounCommon { dbObj.put("_id", id); dataList.add(dbObj); if (dataList.size() % 100 == 0) { - System.out.println("城市:" + city + ", 总量:" + count + ", 获取到:" + dataList.size()); + System.out.println("鍩庡競:" + city + ", 鎬婚噺:" + count + ", 鑾峰彇鍒�:" + dataList.size()); } } } @@ -694,7 +694,7 @@ class JusfounCommon { } } result.put("DataList", dataList); - System.out.println("城市:" + city + ", 总量:" + count + ", 获取到:" + dataList.size()); + System.out.println("鍩庡競:" + city + ", 鎬婚噺:" + count + ", 鑾峰彇鍒�:" + dataList.size()); } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/LandDistrictExportBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/LandDistrictExportBatch.groovy index 7aeb285d6..88bf50c87 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/LandDistrictExportBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/LandDistrictExportBatch.groovy @@ -40,7 +40,7 @@ class LandDistrictExportBatch extends BaseBatch{ Date ss = DateUtils.getFirstDayOfMonth(new Date(), -1) Date ee = DateUtils.getFirstDayOfMonth(new Date()) - def dbCursor = LAND_COLL.find(and(eq("city", "上海"), gt("tradeTime", ss), lt("tradeTime", ee))).batchSize(1000) + def dbCursor = LAND_COLL.find(and(eq("city", "涓婃捣"), gt("tradeTime", ss), lt("tradeTime", ee))).batchSize(1000) def rets = [] def sqls = [] @@ -50,7 +50,7 @@ class LandDistrictExportBatch extends BaseBatch{ def array = marker.split(",") if(array.size()>0){ def map = CommonDatautils.findMaxLatLngMinLatLng(array[1].toDouble(), array[0].toDouble(), 1000) - def districts = CommonDatautils.findDistricct("上海","district", map.minLat, map.minLng, map.maxLat, map.maxLng); + def districts = CommonDatautils.findDistricct("涓婃捣","district", map.minLat, map.minLng, map.maxLat, map.maxLng); if(districts){ for(def dist : districts){ def distance = GeoHelper.GetDistance(dist.lat/10000000000d, dist.lng/10000000000d, array[1].toDouble(), array[0].toDouble()); @@ -121,14 +121,14 @@ class LandDistrictExportBatch extends BaseBatch{ def createTable(){ def sql = """ CREATE TABLE IF NOT EXISTS `_PropertyFacilities` ( - `ID` int(11) NOT NULL AUTO_INCREMENT COMMENT '自增ID', - `DIST_ID` varchar(32) DEFAULT NULL COMMENT '小区编号', - `LAND_ID` varchar(32) DEFAULT NULL COMMENT '土地编号', - `CITY` varchar(32) DEFAULT NULL COMMENT '城市', - `REGION` varchar(32) DEFAULT NULL COMMENT '区域', - `DISTRICT_NAME` varchar(255) DEFAULT NULL COMMENT '小区名称', - `DISTANCE` decimal(10,0) DEFAULT NULL COMMENT '距离', - `SYNC_DATE` datetime DEFAULT NULL COMMENT '同步时间', + `ID` int(11) NOT NULL AUTO_INCREMENT COMMENT '鑷ID', + `DIST_ID` varchar(32) DEFAULT NULL COMMENT '灏忓尯缂栧彿', + `LAND_ID` varchar(32) DEFAULT NULL COMMENT '鍦熷湴缂栧彿', + `CITY` varchar(32) DEFAULT NULL COMMENT '鍩庡競', + `REGION` varchar(32) DEFAULT NULL COMMENT '鍖哄煙', + `DISTRICT_NAME` varchar(255) DEFAULT NULL COMMENT '灏忓尯鍚嶇О', + `DISTANCE` decimal(10,0) DEFAULT NULL COMMENT '璺濈', + `SYNC_DATE` datetime DEFAULT NULL COMMENT '鍚屾鏃堕棿', PRIMARY KEY (`ID`) ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '' ROW_FORMAT = Dynamic; """.toString() diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/LandExportBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/LandExportBatch.groovy index 6051f9959..f5ab77e17 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/LandExportBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/LandExportBatch.groovy @@ -37,8 +37,8 @@ class LandExportBatch extends BaseBatch { Date ee = DateUtils.getFirstDayOfMonth(new Date()) cleanDatas() - def districtMap = CommonDatautils.queryAllDistrictPriceByWeekend("上海", DateUtils.getFirstDayOfWeek(new Date())) - def dbCursor = LAND_DEAL_PRICE.find(and(eq("city", "上海"), gt("tradeTime", ss), lt("tradeTime", ee))) + def districtMap = CommonDatautils.queryAllDistrictPriceByWeekend("涓婃捣", DateUtils.getFirstDayOfWeek(new Date())) + def dbCursor = LAND_DEAL_PRICE.find(and(eq("city", "涓婃捣"), gt("tradeTime", ss), lt("tradeTime", ee))) int count = 0 def sqls = [] def index = 0; @@ -94,20 +94,20 @@ class LandExportBatch extends BaseBatch { def sql = """ CREATE TABLE IF NOT EXISTS `_PropertyIndex` ( `ID` varchar(32) NOT NULL COMMENT 'ID', - `LandPlotID` varchar(32) DEFAULT NULL COMMENT '出让土地地块编号', - `ParcelName` varchar(255) DEFAULT NULL COMMENT '地块名称', - `LandUse` varchar(255) DEFAULT NULL COMMENT '土地性质', - `Competer` varchar(255) DEFAULT NULL COMMENT '竞得单位', - `Area` decimal(10,2) DEFAULT NULL COMMENT '出让面积(平米)', - `Price` decimal(10,2) DEFAULT NULL COMMENT '竞拍价格(元/平米)', - `VolumeRate` varchar(4000) DEFAULT NULL COMMENT '容积率', - `Coordinates` varchar(255) DEFAULT NULL COMMENT '经纬度', - `TradeTime` date DEFAULT NULL COMMENT '交易时间', - `PeriodOfUse` varchar(255) DEFAULT NULL COMMENT '使用期限', - `SYNC_DATE` datetime DEFAULT NULL COMMENT '同步时间,默认当前时间', - `ArroundPrice` decimal(10,0) DEFAULT NULL COMMENT '周边均价', + `LandPlotID` varchar(32) DEFAULT NULL COMMENT '鍑鸿鍦熷湴鍦板潡缂栧彿', + `ParcelName` varchar(255) DEFAULT NULL COMMENT '鍦板潡鍚嶇О', + `LandUse` varchar(255) DEFAULT NULL COMMENT '鍦熷湴鎬ц川', + `Competer` varchar(255) DEFAULT NULL COMMENT '绔炲緱鍗曚綅', + `Area` decimal(10,2) DEFAULT NULL COMMENT '鍑鸿闈㈢Н(骞崇背)', + `Price` decimal(10,2) DEFAULT NULL COMMENT '绔炴媿浠锋牸(鍏�/骞崇背)', + `VolumeRate` varchar(4000) DEFAULT NULL COMMENT '瀹圭Н鐜�', + `Coordinates` varchar(255) DEFAULT NULL COMMENT '缁忕含搴�', + `TradeTime` date DEFAULT NULL COMMENT '浜ゆ槗鏃堕棿', + `PeriodOfUse` varchar(255) DEFAULT NULL COMMENT '浣跨敤鏈熼檺', + `SYNC_DATE` datetime DEFAULT NULL COMMENT '鍚屾鏃堕棿,榛樿褰撳墠鏃堕棿', + `ArroundPrice` decimal(10,0) DEFAULT NULL COMMENT '鍛ㄨ竟鍧囦环', PRIMARY KEY (`ID`) - ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '地产指标' ROW_FORMAT = Dynamic; + ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '鍦颁骇鎸囨爣' ROW_FORMAT = Dynamic; """.toString() JusfounCommon.DB_Jusfoun_New.execute(sql) } @@ -118,7 +118,7 @@ class LandExportBatch extends BaseBatch { def array = marker.split(",") if(array.size()>0){ def map = CommonDatautils.findMaxLatLngMinLatLng(array[1].toDouble(), array[0].toDouble(), 1000) - def districts = CommonDatautils.findDistricct("上海", "district", map.minLat, map.minLng, map.maxLat, map.maxLng); + def districts = CommonDatautils.findDistricct("涓婃捣", "district", map.minLat, map.minLng, map.maxLat, map.maxLng); if (districts) { def prices = []; for (def dist : districts) { @@ -143,17 +143,17 @@ class LandExportBatch extends BaseBatch { def insertIntoMySQL(def dbo, def avgPrice) { def kv = [:] kv.put("ID", dbo.get("_id").toString()); - kv.put("LandPlotID", dbo.getString("landPlotID"))//LandPlotID:出让土地地块编号 contractNumber:公告号 - kv.put("ParcelName", dbo.getString("parcelName"))//ParcelName:地块名称 address:坐落 - kv.put("LandUse", dbo.get("landUse"))//土地性质 -- 规划用途 - kv.put("Competer", dbo.getString("competer"))//竞得单位 -- 用地单位 - kv.put("Area", dbo.get("area"))//出让面积(平米)--- 土地面积 - kv.put("Price", dbo.get("price"))//竞拍价格(元/平米) --土地单价 + kv.put("LandPlotID", dbo.getString("landPlotID"))//LandPlotID:鍑鸿鍦熷湴鍦板潡缂栧彿 contractNumber:鍏憡鍙� + kv.put("ParcelName", dbo.getString("parcelName"))//ParcelName:鍦板潡鍚嶇О address:鍧愯惤 + kv.put("LandUse", dbo.get("landUse"))//鍦熷湴鎬ц川 -- 瑙勫垝鐢ㄩ�� + kv.put("Competer", dbo.getString("competer"))//绔炲緱鍗曚綅 -- 鐢ㄥ湴鍗曚綅 + kv.put("Area", dbo.get("area"))//鍑鸿闈㈢Н(骞崇背)--- 鍦熷湴闈㈢Н + kv.put("Price", dbo.get("price"))//绔炴媿浠锋牸(鍏�/骞崇背) --鍦熷湴鍗曚环 def vr = dbo.get("volumeRate").toString(); - kv.put("VolumeRate", vr)//容积率--容积率 - kv.put("Coordinates", dbo.getString("coordinates"))//经纬度 - kv.put("TradeTime", dbo.get("tradeTime"))//交易时间--成交时间 - kv.put("PeriodOfUse", dbo.getString("periodOfUse"))//使用期限 + kv.put("VolumeRate", vr)//瀹圭Н鐜�--瀹圭Н鐜� + kv.put("Coordinates", dbo.getString("coordinates"))//缁忕含搴� + kv.put("TradeTime", dbo.get("tradeTime"))//浜ゆ槗鏃堕棿--鎴愪氦鏃堕棿 + kv.put("PeriodOfUse", dbo.getString("periodOfUse"))//浣跨敤鏈熼檺 kv.put("ArroundPrice", avgPrice) kv.put("SYNC_DATE", new Date()); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/LocalStart.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/LocalStart.groovy index c00230610..16ddd51d7 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/LocalStart.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/LocalStart.groovy @@ -9,7 +9,7 @@ package com.fangjia.script.jusfoun new HousingTransactionExportBatch().process(null); //ok new HousingTransactionShanghaiExportBatch().process(null); //ok -//换库了 +//鎹㈠簱浜� //new DistrictStatExportBatch().process(null); //ok //new DistrictStatRentExportBatch().process(null); //ok diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/LocalStartMultiThread.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/LocalStartMultiThread.groovy index 137cb2215..2be684244 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/LocalStartMultiThread.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/LocalStartMultiThread.groovy @@ -63,7 +63,7 @@ Runnable run_DistrictStatExportBatch = new Thread(new Runnable() { @Override public void run() { try { - //换库了 + //鎹㈠簱浜� new DistrictStatExportBatch().process(null); //ok } catch (InterruptedException e) { e.printStackTrace(); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/PropertyOverviewExportBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/PropertyOverviewExportBatch.groovy index 77a382e27..d26ed827e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/PropertyOverviewExportBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/PropertyOverviewExportBatch.groovy @@ -72,7 +72,7 @@ class PropertyOverviewExportBatch extends BaseBatch { try { def row = JusfounCommon.DB_Jusfoun_OLd.firstRow(sql); if (row != null) { -// if (cat == "交通") { +// if (cat == "浜ら��") { // if (row.containsKey("NAME") && row.get("NAME") != null) { // String name = row.get("NAME"); // if (StringUtils.contains(name, subCat)) { @@ -100,7 +100,7 @@ class PropertyOverviewExportBatch extends BaseBatch { try { def row = JusfounCommon.DB_Jusfoun_New.firstRow(sql); if (row != null) { -// if (cat == "交通") { +// if (cat == "浜ら��") { // if (row.get("NAME") != null) { // String name = row.get("NAME"); // if (StringUtils.contains(name, subCat)) { @@ -155,48 +155,48 @@ class PropertyOverviewExportBatch extends BaseBatch { def createTable() { def sql = """ CREATE TABLE IF NOT EXISTS `_PropertyOverview` ( - `PropertyID` varchar(50) NOT NULL COMMENT '楼盘编号', - `PropertyName` varchar(100) DEFAULT NULL COMMENT '楼盘名称', - `city` varchar(50) DEFAULT NULL COMMENT '城市', - `Area` varchar(100) DEFAULT NULL COMMENT '地区', - `SubArea` varchar(50) DEFAULT NULL COMMENT '片区', - `BuiltAra` varchar(50) DEFAULT NULL COMMENT '建成年代', - `ConstructionArea` double(16,2) DEFAULT NULL COMMENT '建筑面积', - `Developer` varchar(50) DEFAULT NULL COMMENT '开发商', - `PropertyCompany` varchar(50) DEFAULT NULL COMMENT '物业公司', - `PropertyType` varchar(50) DEFAULT NULL COMMENT '物业类型(住宅/商住)', - `VolumeRate` float(10,4) DEFAULT NULL COMMENT '容积率', - `GreeningRate` float(10,4) DEFAULT NULL COMMENT '绿化率', - `lng2` double(20,10) DEFAULT NULL COMMENT '地图坐标', - `lat2` double(20,10) DEFAULT NULL COMMENT '地图坐标', - `SalesRate` float(10,4) DEFAULT NULL COMMENT '销售率', - `OpeningDate` date DEFAULT NULL COMMENT '开盘日期', - `DeliveryDate` varchar(1000) DEFAULT NULL COMMENT '交房日期', - `FloorArea` double(20,4) DEFAULT NULL COMMENT '占地面积', - `BuildingType` varchar(50) DEFAULT NULL COMMENT '建筑类型', - `PropertyRightsOfYear` varchar(50) DEFAULT NULL COMMENT '产权年限', - `NeighborhoodCommittee` varchar(50) DEFAULT NULL COMMENT '居委会', - `address` varchar(100) DEFAULT NULL COMMENT '地址', - `StreetCommunity` varchar(100) DEFAULT NULL COMMENT '街道社区', - `NumberOfHouseholds` int(11) DEFAULT NULL COMMENT '户数', - `PropertyCosts` float(10,4) DEFAULT NULL COMMENT '物业费', - `parkings` varchar(1000) DEFAULT NULL COMMENT '停车位', - `NatureOfProperty` varchar(2000) DEFAULT NULL COMMENT '产权性质', - `PreSalePermit` varchar(2000) DEFAULT NULL COMMENT '预售许可证', - `FacilityID` varchar(50) DEFAULT NULL COMMENT '配套设施编号', - `Facility` text COMMENT '配套设施', - `NumOfSchools` int(11) DEFAULT NULL COMMENT '学校数量', - `AnyKeySchool` tinyint(4) DEFAULT NULL COMMENT '重点有无学校', - `NumOfMalls` int(11) DEFAULT NULL COMMENT '商场数量', - `NumOfSubways` int(11) DEFAULT NULL COMMENT '地铁数量', - `NumOfBuses` int(11) DEFAULT NULL COMMENT '公交数量', - `NumOfBanks` int(11) DEFAULT NULL COMMENT '银行数量', - `NumOfHospitals` int(11) DEFAULT NULL COMMENT '医院数量', - `Any3LHospital` tinyint(4) DEFAULT NULL COMMENT '有无三甲医院', - `alias` varchar(500) DEFAULT NULL COMMENT '别名', - `SYNC_DATE` datetime DEFAULT NULL COMMENT '同步时间', + `PropertyID` varchar(50) NOT NULL COMMENT '妤肩洏缂栧彿', + `PropertyName` varchar(100) DEFAULT NULL COMMENT '妤肩洏鍚嶇О', + `city` varchar(50) DEFAULT NULL COMMENT '鍩庡競', + `Area` varchar(100) DEFAULT NULL COMMENT '鍦板尯', + `SubArea` varchar(50) DEFAULT NULL COMMENT '鐗囧尯', + `BuiltAra` varchar(50) DEFAULT NULL COMMENT '寤烘垚骞翠唬', + `ConstructionArea` double(16,2) DEFAULT NULL COMMENT '寤虹瓚闈㈢Н', + `Developer` varchar(50) DEFAULT NULL COMMENT '寮�鍙戝晢', + `PropertyCompany` varchar(50) DEFAULT NULL COMMENT '鐗╀笟鍏徃', + `PropertyType` varchar(50) DEFAULT NULL COMMENT '鐗╀笟绫诲瀷锛堜綇瀹�/鍟嗕綇锛�', + `VolumeRate` float(10,4) DEFAULT NULL COMMENT '瀹圭Н鐜�', + `GreeningRate` float(10,4) DEFAULT NULL COMMENT '缁垮寲鐜�', + `lng2` double(20,10) DEFAULT NULL COMMENT '鍦板浘鍧愭爣', + `lat2` double(20,10) DEFAULT NULL COMMENT '鍦板浘鍧愭爣', + `SalesRate` float(10,4) DEFAULT NULL COMMENT '閿�鍞巼', + `OpeningDate` date DEFAULT NULL COMMENT '寮�鐩樻棩鏈�', + `DeliveryDate` varchar(1000) DEFAULT NULL COMMENT '浜ゆ埧鏃ユ湡', + `FloorArea` double(20,4) DEFAULT NULL COMMENT '鍗犲湴闈㈢Н', + `BuildingType` varchar(50) DEFAULT NULL COMMENT '寤虹瓚绫诲瀷', + `PropertyRightsOfYear` varchar(50) DEFAULT NULL COMMENT '浜ф潈骞撮檺', + `NeighborhoodCommittee` varchar(50) DEFAULT NULL COMMENT '灞呭浼�', + `address` varchar(100) DEFAULT NULL COMMENT '鍦板潃', + `StreetCommunity` varchar(100) DEFAULT NULL COMMENT '琛楅亾绀惧尯', + `NumberOfHouseholds` int(11) DEFAULT NULL COMMENT '鎴锋暟', + `PropertyCosts` float(10,4) DEFAULT NULL COMMENT '鐗╀笟璐�', + `parkings` varchar(1000) DEFAULT NULL COMMENT '鍋滆溅浣�', + `NatureOfProperty` varchar(2000) DEFAULT NULL COMMENT '浜ф潈鎬ц川', + `PreSalePermit` varchar(2000) DEFAULT NULL COMMENT '棰勫敭璁稿彲璇�', + `FacilityID` varchar(50) DEFAULT NULL COMMENT '閰嶅璁炬柦缂栧彿', + `Facility` text COMMENT '閰嶅璁炬柦', + `NumOfSchools` int(11) DEFAULT NULL COMMENT '瀛︽牎鏁伴噺', + `AnyKeySchool` tinyint(4) DEFAULT NULL COMMENT '閲嶇偣鏈夋棤瀛︽牎', + `NumOfMalls` int(11) DEFAULT NULL COMMENT '鍟嗗満鏁伴噺', + `NumOfSubways` int(11) DEFAULT NULL COMMENT '鍦伴搧鏁伴噺', + `NumOfBuses` int(11) DEFAULT NULL COMMENT '鍏氦鏁伴噺', + `NumOfBanks` int(11) DEFAULT NULL COMMENT '閾惰鏁伴噺', + `NumOfHospitals` int(11) DEFAULT NULL COMMENT '鍖婚櫌鏁伴噺', + `Any3LHospital` tinyint(4) DEFAULT NULL COMMENT '鏈夋棤涓夌敳鍖婚櫌', + `alias` varchar(500) DEFAULT NULL COMMENT '鍒悕', + `SYNC_DATE` datetime DEFAULT NULL COMMENT '鍚屾鏃堕棿', PRIMARY KEY (`PropertyID`) USING BTREE - ) ENGINE = MyISAM CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '房源表' ROW_FORMAT = Dynamic; + ) ENGINE = MyISAM CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '鎴挎簮琛�' ROW_FORMAT = Dynamic; """.toString() JusfounCommon.DB_Jusfoun_New.execute(sql) } @@ -354,31 +354,31 @@ class PropertyOverviewExportBatch extends BaseBatch { } } - def cats = ["交通", "医院", "商场", "学校", "银行"]; + def cats = ["浜ら��", "鍖婚櫌", "鍟嗗満", "瀛︽牎", "閾惰"]; cats.each { def cat -> int count = 0; - if (cat == "交通") { - //(公交站) - //(地铁站) - count = getPeripheralFacilitiesCount(kv.get("city"), kv.get("Area"), kv.get("PropertyName"), cat, "(公交站)"); + if (cat == "浜ら��") { + //(鍏氦绔�) + //(鍦伴搧绔�) + count = getPeripheralFacilitiesCount(kv.get("city"), kv.get("Area"), kv.get("PropertyName"), cat, "(鍏氦绔�)"); if (count > 0) { kv.put("NumOfBuses", count); } - count = getPeripheralFacilitiesCount(kv.get("city"), kv.get("Area"), kv.get("PropertyName"), cat, "(地铁站)"); + count = getPeripheralFacilitiesCount(kv.get("city"), kv.get("Area"), kv.get("PropertyName"), cat, "(鍦伴搧绔�)"); if (count > 0) { kv.put("NumOfSubways", count); } } else { count = getPeripheralFacilitiesCount(kv.get("city"), kv.get("Area"), kv.get("PropertyName"), cat); if (count > 0) { - if (cat == "医院") { + if (cat == "鍖婚櫌") { kv.put("NumOfHospitals", count); - } else if (cat == "商场") { + } else if (cat == "鍟嗗満") { kv.put("NumOfMalls", count); - } else if (cat == "学校") { + } else if (cat == "瀛︽牎") { kv.put("NumOfSchools", count); - } else if (cat == "银行") { + } else if (cat == "閾惰") { kv.put("NumOfBanks", count); } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/RegionRentExportBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/RegionRentExportBatch.groovy index 542a2e016..69b25f6e3 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/RegionRentExportBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/RegionRentExportBatch.groovy @@ -67,17 +67,17 @@ class RegionRentExportBatch extends BaseBatch { def createTable() { def sql = """ CREATE TABLE IF NOT EXISTS `REGION_STAT_RENT` ( - `ID` varchar(32) NOT NULL COMMENT '租金ID', - `CAT` varchar(255) DEFAULT NULL COMMENT '租金类型:城市,区域', - `CITY` varchar(255) DEFAULT NULL COMMENT '城市', - `REGION` varchar(255) DEFAULT NULL COMMENT '区域', - `AVG_PRICE` decimal(10,0) DEFAULT NULL COMMENT '租金', - `HOUSE_TYPE` decimal(10,0) DEFAULT NULL COMMENT '户型', - `SYNC_DATE` datetime DEFAULT NULL COMMENT '同步时间', - `END_MONTH_DATE` date DEFAULT NULL COMMENT '价格统计时间', + `ID` varchar(32) NOT NULL COMMENT '绉熼噾ID', + `CAT` varchar(255) DEFAULT NULL COMMENT '绉熼噾绫诲瀷:鍩庡競锛屽尯鍩�', + `CITY` varchar(255) DEFAULT NULL COMMENT '鍩庡競', + `REGION` varchar(255) DEFAULT NULL COMMENT '鍖哄煙', + `AVG_PRICE` decimal(10,0) DEFAULT NULL COMMENT '绉熼噾', + `HOUSE_TYPE` decimal(10,0) DEFAULT NULL COMMENT '鎴峰瀷', + `SYNC_DATE` datetime DEFAULT NULL COMMENT '鍚屾鏃堕棿', + `END_MONTH_DATE` date DEFAULT NULL COMMENT '浠锋牸缁熻鏃堕棿', PRIMARY KEY (`ID`) USING BTREE, KEY `CAT` (`CAT`,`CITY`,`REGION`,`HOUSE_TYPE`,`END_MONTH_DATE`) USING BTREE - ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '城市区域租金表' ROW_FORMAT = Dynamic; + ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '鍩庡競鍖哄煙绉熼噾琛�' ROW_FORMAT = Dynamic; """.toString() JusfounCommon.DB_Jusfoun_New.execute(sql) } @@ -94,7 +94,7 @@ class RegionRentExportBatch extends BaseBatch { kv.put("ID", stat.getString("_id")) kv.put("CITY", stat.getString("city")) kv.put("REGION", stat.getString("region")) - kv.put("CAT", stat.region ? "区域" : "城市") + kv.put("CAT", stat.region ? "鍖哄煙" : "鍩庡競") kv.put("AVG_PRICE", stat.get("avg_price")) kv.put("HOUSE_TYPE", stat.get("house_type")) kv.put("END_MONTH_DATE", stat.get("end_month_date")) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/RegionStatExportBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/RegionStatExportBatch.groovy index b5b35ad18..31368b6f6 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/RegionStatExportBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/RegionStatExportBatch.groovy @@ -24,7 +24,7 @@ class RegionStatExportBatch extends BaseBatch { @Override void process(Object args) { - cleanDatas();//删除非本月数据 + cleanDatas();//鍒犻櫎闈炴湰鏈堟暟鎹� createTable() JusfounCommon.CITIES.each { def city -> int count = 0 @@ -74,17 +74,17 @@ class RegionStatExportBatch extends BaseBatch { def createTable() { def sql = """ CREATE TABLE IF NOT EXISTS `REGION_STAT` ( - `ID` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '城市区域均价唯一标识', - `CITY` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '城市', - `REGION` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '区域', - `CAT` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '价格类型:城市,区域', - `WEEKEND` date NULL DEFAULT NULL COMMENT '价格时间', - `AVG_PRICE` decimal(8, 0) NULL DEFAULT NULL COMMENT '价格', - `SYNC_DATE` datetime(0) NOT NULL COMMENT '同步时间', + `ID` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '鍩庡競鍖哄煙鍧囦环鍞竴鏍囪瘑', + `CITY` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鍩庡競', + `REGION` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鍖哄煙', + `CAT` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '浠锋牸绫诲瀷:鍩庡競,鍖哄煙', + `WEEKEND` date NULL DEFAULT NULL COMMENT '浠锋牸鏃堕棿', + `AVG_PRICE` decimal(8, 0) NULL DEFAULT NULL COMMENT '浠锋牸', + `SYNC_DATE` datetime(0) NOT NULL COMMENT '鍚屾鏃堕棿', PRIMARY KEY (`ID`) USING BTREE, INDEX `CITY_REGION_IDNEX`(`CITY`, `REGION`) USING BTREE, INDEX `WEEK_INDEX`(`WEEKEND`) USING BTREE - ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '城市区域均价表' ROW_FORMAT = Dynamic; + ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '鍩庡競鍖哄煙鍧囦环琛�' ROW_FORMAT = Dynamic; """.toString() JusfounCommon.DB_Jusfoun_New.execute(sql) } @@ -101,7 +101,7 @@ class RegionStatExportBatch extends BaseBatch { kv.put("ID", stat.getString("_id")) kv.put("CITY", stat.getString("city")) kv.put("REGION", stat.getString("region")) - kv.put("CAT", stat.region ? "区域" : "城市") + kv.put("CAT", stat.region ? "鍖哄煙" : "鍩庡競") kv.put("AVG_PRICE", stat.get("avg_price")) kv.put("WEEKEND", stat.get("weekend")) kv.put("SYNC_DATE", new Date()); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/RentHouseExportBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/RentHouseExportBatch.groovy index 8d8f994ed..643e24d99 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/RentHouseExportBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/RentHouseExportBatch.groovy @@ -58,10 +58,10 @@ class RentHouseExportBatch extends BaseBatch { try { String pre_key = seawater.city + "_" + seawater.region + "_" + seawater.district_name def estate_type = null; - if (StringUtils.isEmpty(seawater.estate_type) || !StringUtils.containsIgnoreCase(seawater.estate_type, "别墅")) { - estate_type = "小区" + if (StringUtils.isEmpty(seawater.estate_type) || !StringUtils.containsIgnoreCase(seawater.estate_type, "鍒")) { + estate_type = "灏忓尯" } else { - estate_type = "别墅" + estate_type = "鍒" } String key = pre_key + "_" + estate_type BasicDBObject district = districtMap.get(key); @@ -79,7 +79,7 @@ class RentHouseExportBatch extends BaseBatch { println("HousingOverviewExportBatch -> $city $count end!") - return false;//不进行更新 + return false;//涓嶈繘琛屾洿鏂� }); if (sqls.size() > 0) { @@ -93,7 +93,7 @@ class RentHouseExportBatch extends BaseBatch { try{ stmt.addBatch s }catch(BatchUpdateException e){ - println s+"【重复】" + println s+"銆愰噸澶嶃��" } } }) @@ -123,26 +123,26 @@ class RentHouseExportBatch extends BaseBatch { void createTable(String city) { def sql = """ CREATE TABLE IF NOT EXISTS `_HouseLeasing_${JusfounCommon.pinyin(city)}` ( - `LeaseID` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '租金ID', - `Title` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '租金标题', - `ReleaseTime` date NULL DEFAULT NULL COMMENT '发布时间', - `LeaseType` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '租赁类型', - `MonthlyRent` decimal(10, 0) NULL DEFAULT NULL COMMENT '月租金', - `PaymentMethod` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '付款方式', - `NumOfBedrooms` decimal(10, 0) NULL DEFAULT NULL COMMENT '室数', - `NumOfLivingrooms` decimal(10, 0) NULL DEFAULT NULL COMMENT '客厅数', - `NumOfBathrooms` decimal(10, 0) NULL DEFAULT NULL COMMENT '卫数', - `BuildingArea` decimal(20, 4) NULL DEFAULT NULL COMMENT '面积', - `Floor` decimal(10, 0) NULL DEFAULT NULL COMMENT '所在楼层', - `TotalFloor` decimal(10, 0) NULL DEFAULT NULL COMMENT '总楼层', - `Orientation` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '朝向', - `Renovation` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '装修', - `City` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '城市', - `Area` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '区域', - `CommunityName` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '小区名', - `Address` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '地址', - `PropertyID` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '小区编号', - `SYNC_DATE` datetime(0) DEFAULT NULL COMMENT '同步时间', + `LeaseID` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '绉熼噾ID', + `Title` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '绉熼噾鏍囬', + `ReleaseTime` date NULL DEFAULT NULL COMMENT '鍙戝竷鏃堕棿', + `LeaseType` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '绉熻祦绫诲瀷', + `MonthlyRent` decimal(10, 0) NULL DEFAULT NULL COMMENT '鏈堢閲�', + `PaymentMethod` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '浠樻鏂瑰紡', + `NumOfBedrooms` decimal(10, 0) NULL DEFAULT NULL COMMENT '瀹ゆ暟', + `NumOfLivingrooms` decimal(10, 0) NULL DEFAULT NULL COMMENT '瀹㈠巺鏁�', + `NumOfBathrooms` decimal(10, 0) NULL DEFAULT NULL COMMENT '鍗暟', + `BuildingArea` decimal(20, 4) NULL DEFAULT NULL COMMENT '闈㈢Н', + `Floor` decimal(10, 0) NULL DEFAULT NULL COMMENT '鎵�鍦ㄦゼ灞�', + `TotalFloor` decimal(10, 0) NULL DEFAULT NULL COMMENT '鎬绘ゼ灞�', + `Orientation` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鏈濆悜', + `Renovation` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '瑁呬慨', + `City` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鍩庡競', + `Area` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鍖哄煙', + `CommunityName` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '灏忓尯鍚�', + `Address` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鍦板潃', + `PropertyID` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '灏忓尯缂栧彿', + `SYNC_DATE` datetime(0) DEFAULT NULL COMMENT '鍚屾鏃堕棿', PRIMARY KEY (`LeaseID`) USING BTREE ) ENGINE = MyISAM CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; """.toString() @@ -253,9 +253,9 @@ class RentHouseExportBatch extends BaseBatch { if (StringUtils.isNotEmpty(dist.city) && StringUtils.isNotEmpty(dist.region) && StringUtils.isNotEmpty(dist.name)) { try { String pre_key = dist.city + "_" + dist.region + "_" + dist.name - def estate_type = "小区" - if (dist != null && dist.dist != null && dist.estate_type2.toString().contains("别墅")) { - estate_type = "别墅" + def estate_type = "灏忓尯" + if (dist != null && dist.dist != null && dist.estate_type2.toString().contains("鍒")) { + estate_type = "鍒" } String key = pre_key + "_" + estate_type if(!distMap.containsKey(key)){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/StatTableCount.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/StatTableCount.groovy index 143919d24..eb2dbc1ab 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/StatTableCount.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/StatTableCount.groovy @@ -25,7 +25,7 @@ class StatTableCount { def syncDates = ["2020-11-01","2020-12-01"] def rets = [] - rets << ["表名","11月"] + rets << ["琛ㄥ悕","11鏈�"] for(def name : tables){ def ret = [] ret << name @@ -59,6 +59,6 @@ class StatTableCount { } rets << ret } - ExcelUtils.write("D:\\数据\\九次方(当月).xlsx", rets,"九次方统计") + ExcelUtils.write("D:\\鏁版嵁\\涔濇鏂�(褰撴湀).xlsx", rets,"涔濇鏂圭粺璁�") } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/CompareOthers.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/CompareOthers.groovy index 8cd41f5b2..f86a7b46b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/CompareOthers.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/CompareOthers.groovy @@ -25,7 +25,7 @@ class CompareOthers { static void main(String[] args) { - String city = "上海" + String city = "涓婃捣" long fanghaoCount = 0 DBCursor dbCursor = FANGGUANJU.find(new BasicDBObject("city", city)).addOption(Bytes.QUERYOPTION_NOTIMEOUT) @@ -35,50 +35,50 @@ class CompareOthers { fanghaoCount += dbList.size() } } - println "[房号]房管局:" + fanghaoCount + println "[鎴垮彿]鎴跨灞�锛�" + fanghaoCount - //房管局 + //鎴跨灞� new Thread(new Runnable() { @Override void run() { long countFangguanju = countFangguanju(city) - println "[小区]房管局:" + countFangguanju + println "[灏忓尯]鎴跨灞�锛�" + countFangguanju } }).start() - //房估估 + //鎴夸及浼� new Thread(new Runnable() { @Override void run() { long countFanggugu = countFanggugu(city) - println "[小区]房估估:" + countFanggugu + println "[灏忓尯]鎴夸及浼帮細" + countFanggugu } }).start() - //云估价 + //浜戜及浠� new Thread(new Runnable() { @Override void run() { long countYungujia = countYungujia(city) - println "[小区]云估价:" + countYungujia + println "[灏忓尯]浜戜及浠凤細" + countYungujia } }).start() - //优房闪贷 + //浼樻埧闂捶 new Thread(new Runnable() { @Override void run() { long countYoufangshandai = countYoufangshandai(city) - println "[小区]优房闪贷:" + countYoufangshandai + println "[灏忓尯]浼樻埧闂捶锛�" + countYoufangshandai } }).start() - //上海物业 + //涓婃捣鐗╀笟 new Thread(new Runnable() { @Override void run() { long countShWuye = countShWuye(city) - println "[小区]上海物业:" + countShWuye + println "[灏忓尯]涓婃捣鐗╀笟锛�" + countShWuye } }).start() @@ -88,7 +88,7 @@ class CompareOthers { /*static void countLoudong(String city) { DBObject query = new BasicDBObject("city", city) long countFgj = FANGGUANJU.count(query) - println "[楼栋]房管局:" + countFgj + println "[妤兼爧]鎴跨灞�锛�" + countFgj long countFgg = FANGUGU_ROOM.g }*/ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/CountCoverage.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/CountCoverage.groovy index 3a6d8be9b..2d2becf70 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/CountCoverage.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/CountCoverage.groovy @@ -25,10 +25,10 @@ class CountCoverage { static void main(String[] args) { Jedis jedis = new Jedis("192.168.10.47") - String city = "深圳" + String city = "娣卞湷" long count = 0 - //房管局 + //鎴跨灞� DBCursor dbCursor1 = FANGGUANJU.find(new BasicDBObject('city', city)).addOption(Bytes.QUERYOPTION_NOTIMEOUT) for(DBObject dbObject: dbCursor1) { String name = dbObject.name @@ -44,7 +44,7 @@ class CountCoverage { } } } - //房估估 + //鎴夸及浼� DBCursor dbCursor2 = FANGUGU.find(new BasicDBObject("city", city)).addOption(Bytes.QUERYOPTION_NOTIMEOUT) for(DBObject dbObject: dbCursor2) { String region = dbObject.districtFullName @@ -61,7 +61,7 @@ class CountCoverage { } } - //云估价 + //浜戜及浠� DBCursor dbCursor3 = YUNGUJIA.find(new BasicDBObject("city", city)).addOption(Bytes.QUERYOPTION_NOTIMEOUT) for(DBObject dbObject: dbCursor3) { String region = dbObject.region @@ -78,7 +78,7 @@ class CountCoverage { } } - //优房闪贷 + //浼樻埧闂捶 DBCursor dbCursor4 = YOUFANGSHANDAI.find(new BasicDBObject("city", city)).addOption(Bytes.QUERYOPTION_NOTIMEOUT) for(DBObject dbObject: dbCursor4) { String region = dbObject.region diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/ExtractEvaluationData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/ExtractEvaluationData.groovy index 11536d9a3..aa596672f 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/ExtractEvaluationData.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/ExtractEvaluationData.groovy @@ -12,7 +12,7 @@ import org.apache.commons.beanutils.BeanMap import org.apache.commons.lang.StringUtils /** - * 导出数据:evaluation库中,有两次以上估价,并且时间间隔在2小时以上的房源量 + * 瀵煎嚭鏁版嵁锛歟valuation搴撲腑锛屾湁涓ゆ浠ヤ笂浼颁环锛屽苟涓旀椂闂撮棿闅斿湪2灏忔椂浠ヤ笂鐨勬埧婧愰噺 * Created by linxsh on 2017/1/11. */ class ExtractEvaluationData { @@ -26,7 +26,7 @@ class ExtractEvaluationData { // count() - //导入数据到房号库 + //瀵煎叆鏁版嵁鍒版埧鍙峰簱 importToFanghao() } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/FormatLoudong.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/FormatLoudong.groovy index f244d08ed..3501fbcdb 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/FormatLoudong.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/FormatLoudong.groovy @@ -138,7 +138,7 @@ class FormatLoudong { if (findFloors == 0 && floors != 0) { TARGET_LOUDONG.update(findObj, new BasicDBObject('$set', new BasicDBObject("floors", floors))) } - //更新地址 + //鏇存柊鍦板潃 if (StringUtils.isBlank(findAddr)) { TARGET_LOUDONG.update(findObj, new BasicDBObject('$set', new BasicDBObject('addr', address))) } else { @@ -146,7 +146,7 @@ class FormatLoudong { TARGET_LOUDONG.update(findObj, new BasicDBObject('$addToSet', new BasicDBObject('addr_alias', address))) } } - //更新经纬度 + //鏇存柊缁忕含搴� int findLatQQ = (Integer) findObj.get("lat_qq") int findLngQQ = (Integer) findObj.get("lng_qq") int findLatBaidu = (Integer) findObj.get("lat_bd") @@ -229,7 +229,7 @@ class FormatLoudong { } /** - * 格式化为两位小数 + * 鏍煎紡鍖栦负涓や綅灏忔暟 * @param val * @return */ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/FormatLoudongName.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/FormatLoudongName.groovy index 41331af3c..c6ab81bb6 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/FormatLoudongName.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/FormatLoudongName.groovy @@ -24,7 +24,7 @@ class FormatLoudongName { public static final DBCollection LOUDONG = MongoUtils.getCollectionByName("buildings", "loudong", "192.168.0.136") public static void main(String[] args) { - Pattern pattern = Pattern.compile('.*第$') + Pattern pattern = Pattern.compile('.*绗�$') DBCursor dbCursor = LOUDONG.find(new BasicDBObject('name', pattern)).addOption(Bytes.QUERYOPTION_NOTIMEOUT) Set names = Sets.newHashSet(); for(DBObject dbObject : dbCursor) { @@ -33,10 +33,10 @@ class FormatLoudongName { String region = (String)dbObject.get("region") String name = (String)dbObject.get("name") - if(name.endsWith("门第")) { + if(name.endsWith("闂ㄧ")) { continue } - if(name.equals("第")) { + if(name.equals("绗�")) { LOUDONG.remove(dbObject) continue } @@ -44,7 +44,7 @@ class FormatLoudongName { if(newName.endsWith("-")) { newName = newName.substring(0, newName.length()-1) } - if(name.matches('.+?(-|宿舍|花园|小区|公寓|村|组团|片区|苑|住宅|区|院)第$') || name.matches('.+?[一二三四五六七八九十\\d]+期第$')) { + if(name.matches('.+?(-|瀹胯垗|鑺卞洯|灏忓尯|鍏瘬|鏉憒缁勫洟|鐗囧尯|鑻憒浣忓畢|鍖簗闄�)绗�$') || name.matches('.+?[涓�浜屼笁鍥涗簲鍏竷鍏節鍗乗\d]+鏈熺$')) { LOUDONG.update(new BasicDBObject("_id", dbObject.get("_id")), new BasicDBObject('$set', new BasicDBObject('name', newName))) println "$name -> $newName" continue diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/HandleFangguanju.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/HandleFangguanju.groovy index a41bab896..c90493260 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/HandleFangguanju.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/HandleFangguanju.groovy @@ -1,7 +1,7 @@ package com.fangjia.script.linxsh /** - * 房管局数据处理 + * 鎴跨灞�鏁版嵁澶勭悊 * Created by linxsh on 2017/3/23. */ class HandleFangguanju { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/HandleGuguAddress.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/HandleGuguAddress.groovy index a03eadb03..c6eaab318 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/HandleGuguAddress.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/HandleGuguAddress.groovy @@ -100,24 +100,24 @@ class HandleGuguAddress { return } - if(roomNum.contains("全幢")) { + if(roomNum.contains("鍏ㄥ耿")) { roomNum = "1" } if(!roomNum.matches("[-\\w+]+")) { return } - if(StringUtils.isNotBlank(houseStyle) && houseStyle.matches("[一二三四五六七八九十]居室")) { - houseStyle = houseStyle.replace("一", "1") - .replace("二", "2") - .replace("三", "3") - .replace("四", "4") - .replace("五", "5") - .replace("六", "6") - .replace("七", "7") - .replace("八", "8") - .replace("九", "9") - .replace("十", "10") - .replace("居室", "") + if(StringUtils.isNotBlank(houseStyle) && houseStyle.matches("[涓�浜屼笁鍥涗簲鍏竷鍏節鍗乚灞呭")) { + houseStyle = houseStyle.replace("涓�", "1") + .replace("浜�", "2") + .replace("涓�", "3") + .replace("鍥�", "4") + .replace("浜�", "5") + .replace("鍏�", "6") + .replace("涓�", "7") + .replace("鍏�", "8") + .replace("涔�", "9") + .replace("鍗�", "10") + .replace("灞呭", "") room = NumberUtils.toInt(houseStyle, -1) } @@ -134,7 +134,7 @@ class HandleGuguAddress { static def saveOrUpdate(String city, String region, String name, String houseNum, String roomNum, String newAddr, Integer floor, String houseType, double area, Integer room) { - String from = "房估估"; + String from = "鎴夸及浼�"; int houseHeight = -1; int houseFloor = floor; double houseArea = area; @@ -196,7 +196,7 @@ class HandleGuguAddress { .append("c_date", createionDate) .append("m_date", modificationDate) .append("build_type", buildType) - .append("basement_area", basementArea)//地下室面积 + .append("basement_area", basementArea)//鍦颁笅瀹ら潰绉� .append("garden_area", gardenArea) .append("outer_area", outerArea) .append("attic_area", atticArea) @@ -223,9 +223,9 @@ class HandleGuguAddress { String new_addr = DataUtil.formateAddress(city, address); def matcher; if (StringUtils.isNotBlank(new_addr)) { - matcher = new_addr =~ /.+?(?:路|街|道|巷)[-\w]+?[号弄]/ + matcher = new_addr =~ /.+?(?:璺瘄琛梶閬搢宸�)[-\w]+?[鍙峰紕]/ } else { - matcher = address =~ /.+?(?:路|街|道|巷)[-\w]+?[号弄]/ + matcher = address =~ /.+?(?:璺瘄琛梶閬搢宸�)[-\w]+?[鍙峰紕]/ } if (matcher.find()) { @@ -233,7 +233,7 @@ class HandleGuguAddress { } if (new_addr != null) { - new_addr = new_addr.replaceAll(city + "市|.+区|.+镇", "") + new_addr = new_addr.replaceAll(city + "甯倈.+鍖簗.+闀�", "") } return new_addr; } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/HandleGuguData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/HandleGuguData.groovy index 4ecec00bd..8c184ed19 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/HandleGuguData.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/HandleGuguData.groovy @@ -21,7 +21,7 @@ import java.util.regex.Matcher import java.util.regex.Pattern /** - * 房估估数据处理 + * 鎴夸及浼版暟鎹鐞� * Created by linxsh on 2016/10/13. */ class HandleGuguData { @@ -35,61 +35,61 @@ class HandleGuguData { private static JedisPool jedisPool = new JedisPool("192.168.10.47") private static def unitShapeMap = [ - "1":"一居室", - "2": "二居室", - "3": "三居室", - "4": "四居室", - "5": "五居室", - "9": "五室以上" + "1":"涓�灞呭", + "2": "浜屽眳瀹�", + "3": "涓夊眳瀹�", + "4": "鍥涘眳瀹�", + "5": "浜斿眳瀹�", + "9": "浜斿浠ヤ笂" ] private static def houseTypeMap = [ - "0101":"普通住宅", - "0102":"公寓", - "010201":"酒店式公寓", - "010202":"商务公寓", - "010203":"普通公寓", - "0103":" 花园洋房", - "0104":"别墅", - "010401":"独栋", - "010402":"联排", - "010403":"双拼", - "010404":"叠拼", - "02":"商业用房", - "03":"办公用房", - "04":"工业用房", - "05":"仓储用房", - "06":"其他", - "0601":"车库" + "0101":"鏅�氫綇瀹�", + "0102":"鍏瘬", + "010201":"閰掑簵寮忓叕瀵�", + "010202":"鍟嗗姟鍏瘬", + "010203":"鏅�氬叕瀵�", + "0103":" 鑺卞洯娲嬫埧", + "0104":"鍒", + "010401":"鐙爧", + "010402":"鑱旀帓", + "010403":"鍙屾嫾", + "010404":"鍙犳嫾", + "02":"鍟嗕笟鐢ㄦ埧", + "03":"鍔炲叕鐢ㄦ埧", + "04":"宸ヤ笟鐢ㄦ埧", + "05":"浠撳偍鐢ㄦ埧", + "06":"鍏朵粬", + "0601":"杞﹀簱" ] private static def houseTypeInduceMap = [ - "0101":"住宅", - "0102":"住宅", - "010201":"住宅", - "010202":"住宅", - "010203":"住宅", - "0103":" 别墅", - "0104":"别墅", - "010401":"别墅", - "010402":"别墅", - "010403":"别墅", - "010404":"别墅", - "住宅":"住宅","普通住宅":"住宅","公寓":"住宅","普通公寓":"住宅","酒店式公寓":"住宅","商务公寓":"住宅","别墅":"别墅","花园洋房":"别墅","独栋":"别墅","联排":"别墅","双拼":"别墅","叠拼":"别墅" + "0101":"浣忓畢", + "0102":"浣忓畢", + "010201":"浣忓畢", + "010202":"浣忓畢", + "010203":"浣忓畢", + "0103":" 鍒", + "0104":"鍒", + "010401":"鍒", + "010402":"鍒", + "010403":"鍒", + "010404":"鍒", + "浣忓畢":"浣忓畢","鏅�氫綇瀹�":"浣忓畢","鍏瘬":"浣忓畢","鏅�氬叕瀵�":"浣忓畢","閰掑簵寮忓叕瀵�":"浣忓畢","鍟嗗姟鍏瘬":"浣忓畢","鍒":"鍒","鑺卞洯娲嬫埧":"鍒","鐙爧":"鍒","鑱旀帓":"鍒","鍙屾嫾":"鍒","鍙犳嫾":"鍒" ] - static Pattern DISTRICT_PATTERN = Pattern.compile('.+?([0-9a-zA-Z一二三四五六七八九十东西南北]{1,5}[期区]){1,2}') - static Pattern ADDRESS_PATTERN = Pattern.compile('.+(?:路|大道|弄|街).+号([0-9a-zA-Z一二三四五六七八九十东西南北]{1,5}[期区]){1,2}') + static Pattern DISTRICT_PATTERN = Pattern.compile('.+?([0-9a-zA-Z涓�浜屼笁鍥涗簲鍏竷鍏節鍗佷笢瑗垮崡鍖梋{1,5}[鏈熷尯]){1,2}') + static Pattern ADDRESS_PATTERN = Pattern.compile('.+(?:璺瘄澶ч亾|寮剕琛�).+鍙�([0-9a-zA-Z涓�浜屼笁鍥涗簲鍏竷鍏節鍗佷笢瑗垮崡鍖梋{1,5}[鏈熷尯]){1,2}') public static void main(String[] args) { - def cities = ['广州'] + def cities = ['骞垮窞'] cities.each {city-> println "start handle $city" DBObject query = new BasicDBObject("city", city) - //格式化 + //鏍煎紡鍖� format(query) - //保存到楼栋库 + //淇濆瓨鍒版ゼ鏍嬪簱 saveToLoudong(query) - //保存到房号库 + //淇濆瓨鍒版埧鍙峰簱 saveToHouseLoudong(query) } @@ -113,7 +113,7 @@ class HandleGuguData { Double area = dbObject.buildingArea String type = dbObject.format_house_type String unitShape = dbObject.unitShape - String from = "房估估" + String from = "鎴夸及浼�" HouseLoudong houseLoudng = new HouseLoudong() houseLoudng.city = city @@ -137,8 +137,8 @@ class HandleGuguData { if(StringUtils.isNotBlank(city) && StringUtils.isNotBlank(region) && StringUtils.isNotBlank(name) && StringUtils.isNotBlank(houseNumber) && StringUtils.isNotBlank(roomNumber) && RegionData.isRegion(city, region)) { GUGU.update(new BasicDBObject('_id', dbObject._id), new BasicDBObject('$set', new BasicDBObject('fh', 1))) - if(roomNumber.matches("\\w+[室房]")) { - roomNumber = roomNumber.replaceAll('[室房]', '') + if(roomNumber.matches("\\w+[瀹ゆ埧]")) { + roomNumber = roomNumber.replaceAll('[瀹ゆ埧]', '') houseLoudng.room_num = roomNumber } @@ -168,7 +168,7 @@ class HandleGuguData { if(unitNumber) { return LoudongUtil.formatUnitNumber(unitNumber) } - if(address && address.contains("单元")) { + if(address && address.contains("鍗曞厓")) { return LoudongUtil.formatUnitNumber(address) } return '--' @@ -188,7 +188,7 @@ class HandleGuguData { } static def saveToLoudong(DBObject q = new BasicDBObject()) { -// q = new BasicDBObject("city", "武汉").append("name", "武汉天街") +// q = new BasicDBObject("city", "姝︽眽").append("name", "姝︽眽澶╄") DBCursor dbCursor = GUGU.find(q).addOption(Bytes.QUERYOPTION_NOTIMEOUT) def result = [save: 0, update: 0] Set districts = Sets.newHashSet() @@ -205,7 +205,7 @@ class HandleGuguData { }*/ Double area = dbObject.buildingArea String type = dbObject.format_house_type - String from = "房估估" + String from = "鎴夸及浼�" Loudong loudong = new Loudong() loudong.setCity(city) @@ -233,12 +233,12 @@ class HandleGuguData { } def static format(DBObject query = new BasicDBObject()) { - /* Pattern pattern = Pattern.compile('^金港新城\\w+$') - query = new BasicDBObject('city', '广州').append('name', '富力金港城').append('address', pattern)*/ + /* Pattern pattern = Pattern.compile('^閲戞腐鏂板煄\\w+$') + query = new BasicDBObject('city', '骞垮窞').append('name', '瀵屽姏閲戞腐鍩�').append('address', pattern)*/ DBCursor dbCursor = GUGU.find(query).batchSize(1000).addOption(Bytes.QUERYOPTION_NOTIMEOUT) Map addressFormatMap = Maps.newHashMap() - Pattern specialHouseNumberPattern = Pattern.compile('.*?(\\w+)号楼(\\w+)区栋') + Pattern specialHouseNumberPattern = Pattern.compile('.*?(\\w+)鍙锋ゼ(\\w+)鍖烘爧') for(DBObject dbObject : dbCursor) { String address = dbObject.address String formatName = dbObject.name @@ -257,8 +257,8 @@ class HandleGuguData { String partion = StringUtils.substringAfter(formatName, dbObject.name) if(StringUtils.isNotBlank(partion)) { - if(partion.matches("([0-9a-zA-Z一二三四五六七八九十]期)(\\1)+")) { - String singlePartion = partion.replaceAll('([0-9a-zA-Z一二三四五六七八九十]期)(?:\\1)+', '$1') + if(partion.matches("([0-9a-zA-Z涓�浜屼笁鍥涗簲鍏竷鍏節鍗乚鏈�)(\\1)+")) { + String singlePartion = partion.replaceAll('([0-9a-zA-Z涓�浜屼笁鍥涗簲鍏竷鍏節鍗乚鏈�)(?:\\1)+', '$1') formatName = formatName.replace(partion, singlePartion) } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/ImportHouseData2.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/ImportHouseData2.groovy index 88ff4e378..ae7d93c9c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/ImportHouseData2.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/ImportHouseData2.groovy @@ -35,13 +35,13 @@ import java.util.regex.Pattern class ImportHouseData2 { public static final DBCollection LOUDONG = MongoUtils.getCollectionByName("temp", "ld", "192.168.0.136") public static final DBCollection TARGET_LOUDONG = MongoUtils.getCollectionByName("temp", "new_ld", "192.168.0.136") - private static final String PATTERN = "[、/\\w]+(?:(?:#|号|栋|幢|座|#)(?:楼(?:工程)?)?|保障性住房|\\(.+\\)|(.+)|商住楼)+"; - private static final Pattern pattern2 = Pattern.compile("([-—\\w]+)(?:栋|座|幢|号?楼|#楼?|#楼?)"); + private static final String PATTERN = "[銆�/\\w]+(?:(?:#|鍙穦鏍媩骞搴锛�)(?:妤�(?:宸ョ▼)?)?|淇濋殰鎬т綇鎴縷\\(.+\\)|锛�.+锛墊鍟嗕綇妤�)+"; + private static final Pattern pattern2 = Pattern.compile("([-鈥擻\w]+)(?:鏍媩搴骞鍙�?妤紎#妤�?|锛冩ゼ?)"); private static JedisPool jedisPool = new JedisPool("192.168.10.47") public static void main(String[] args) { Semaphore semaphore = new Semaphore(5); - DBCursor dbCursor = LOUDONG.find(new BasicDBObject("isFormat", true).append("isDel", null).append("city", "安庆")).addOption(Bytes.QUERYOPTION_NOTIMEOUT); + DBCursor dbCursor = LOUDONG.find(new BasicDBObject("isFormat", true).append("isDel", null).append("city", "瀹夊簡")).addOption(Bytes.QUERYOPTION_NOTIMEOUT); long count = 0; while (dbCursor.hasNext()) { DBObject dbObject = dbCursor.next(); @@ -71,7 +71,7 @@ class ImportHouseData2 { if (StringUtils.isBlank(city)) { return; } - city = city.replace("市", "") + city = city.replace("甯�", "") String region = ((String) dbObject.get("region")); if (StringUtils.isNotBlank(region)) { region = RegionData.formatRegion(city, region) @@ -97,7 +97,7 @@ class ImportHouseData2 { } String address = (String) dbObject.get("format_address") - if (StringUtils.isBlank(city) || StringUtils.isBlank(name) || house_num.matches(".*?(地下室|车库|车位|储物室).*?")) { + if (StringUtils.isBlank(city) || StringUtils.isBlank(name) || house_num.matches(".*?(鍦颁笅瀹杞﹀簱|杞︿綅|鍌ㄧ墿瀹�).*?")) { addToRedis(dbObject.get("_id").toString()) return; } @@ -127,7 +127,7 @@ class ImportHouseData2 { TARGET_LOUDONG.update(new BasicDBObject("_id", findObj.get("_id")), new BasicDBObject('$set', updateObj)) } } else { - DBObject saveObj = new BasicDBObject("from", "房管局").append("ref", ImmutableList.of(dbObject.get("_id").toString())) + DBObject saveObj = new BasicDBObject("from", "鎴跨灞�").append("ref", ImmutableList.of(dbObject.get("_id").toString())) saveObj.put("city", city) saveObj.put("region", region) saveObj.put("name", name) @@ -194,16 +194,16 @@ class ImportHouseData2 { String new_addr = DataUtil.formateAddress(city, address); def matcher; if (StringUtils.isNotBlank(new_addr)) { - matcher = new_addr =~ /.+?(?:路|街|道|巷)[-\w]+?[号弄]/ + matcher = new_addr =~ /.+?(?:璺瘄琛梶閬搢宸�)[-\w]+?[鍙峰紕]/ } else { - matcher = address =~ /.+?(?:路|街|道|巷)[-\w]+?[号弄]/ + matcher = address =~ /.+?(?:璺瘄琛梶閬搢宸�)[-\w]+?[鍙峰紕]/ } if (matcher.find()) { new_addr = matcher.group(0) } else { new_addr = DataUtil.formateAddress(city, house_num); - matcher = new_addr =~ /.+?(?:路|街|道|巷)[-\w]+?[号弄]/ + matcher = new_addr =~ /.+?(?:璺瘄琛梶閬搢宸�)[-\w]+?[鍙峰紕]/ if (matcher.find()) { new_addr = matcher.group(0) } else { @@ -212,20 +212,20 @@ class ImportHouseData2 { } if (new_addr != null) { - new_addr = new_addr.replaceAll(city + "市|.+区|.+镇", "") + new_addr = new_addr.replaceAll(city + "甯倈.+鍖簗.+闀�", "") } return new_addr; } static String handleHouseNum(String house_num, String address, String new_name, String new_address) { - String new_house_num = house_num.replaceAll("独栋", "1").replaceAll("—", "-").replaceAll("#", "#").trim(); + String new_house_num = house_num.replaceAll("鐙爧", "1").replaceAll("鈥�", "-").replaceAll("锛�", "#").trim(); Matcher matcher1 = pattern2.matcher(new_house_num); List house_nums = Lists.newArrayList(); while (matcher1.find()) { new_house_num = matcher1.group(matcher1.groupCount()) house_nums.add(new_house_num) } - if (house_nums.size() > 1 && !house_num.matches("([-\\w]+)(?:栋|幢|座|号?楼|#楼?|#楼?)?")) { + if (house_nums.size() > 1 && !house_num.matches("([-\\w]+)(?:鏍媩骞搴鍙�?妤紎#妤�?|锛冩ゼ?)?")) { matcher1 = pattern2.matcher(address); String house_num_temp = ""; while (matcher1.find()) { @@ -237,16 +237,16 @@ class ImportHouseData2 { } if (StringUtils.isNotBlank(new_address)) { - new_house_num = new_house_num.replaceAll(".+区", "").replace(new_name, "").replace(new_address, ""); - if (new_house_num.matches(".+号")) { - new_house_num = new_house_num.replace("号", "") - } else if (new_house_num.endsWith("[一二三四五六七八九十百千]+[幢号楼]")) { - new_house_num = new_house_num.replaceAll("[幢号楼]", "") + new_house_num = new_house_num.replaceAll(".+鍖�", "").replace(new_name, "").replace(new_address, ""); + if (new_house_num.matches(".+鍙�")) { + new_house_num = new_house_num.replace("鍙�", "") + } else if (new_house_num.endsWith("[涓�浜屼笁鍥涗簲鍏竷鍏節鍗佺櫨鍗僝+[骞㈠彿妤糫")) { + new_house_num = new_house_num.replaceAll("[骞㈠彿妤糫", "") new_house_num = CNNMFilter.convertCnNumber(new_house_num) } } - if (StringUtils.isBlank(new_house_num) || new_house_num.equals("无")) { + if (StringUtils.isBlank(new_house_num) || new_house_num.equals("鏃�")) { new_house_num = "1"; } @@ -255,32 +255,32 @@ class ImportHouseData2 { static String handleUnit(String house_num) { String _unit = null; - def matcher_unit = house_num =~ /([\w一二三四五六七八九十甲乙丙丁戊己庚辛壬癸]+)单元/ + def matcher_unit = house_num =~ /([\w涓�浜屼笁鍥涗簲鍏竷鍏節鍗佺敳涔欎笝涓佹垔宸卞簹杈涘,鐧竇+)鍗曞厓/ if (matcher_unit.find()) { - _unit = matcher_unit.group().replace("单元", "") + _unit = matcher_unit.group().replace("鍗曞厓", "") } if (StringUtils.isBlank(_unit)) { _unit = "1" } - _unit = _unit.replace("一", "1") - .replace("二", "2") - .replace("三", "3") - .replace("四", "4") - .replace("五", "5") - .replace("六", "6") - .replace("七", "7") - .replace("八", "8") - .replace("九", "9") - .replace("十", "10") + _unit = _unit.replace("涓�", "1") + .replace("浜�", "2") + .replace("涓�", "3") + .replace("鍥�", "4") + .replace("浜�", "5") + .replace("鍏�", "6") + .replace("涓�", "7") + .replace("鍏�", "8") + .replace("涔�", "9") + .replace("鍗�", "10") - if (_unit.equals("无")) { + if (_unit.equals("鏃�")) { _unit = "1" } return _unit; } static String handleName(String name, String city) { - String new_name = name.replace("建设方案编号", "").replaceAll("“|”|\\s|?", "").replace("(", "(").replace(")", ")") + String new_name = name.replace("寤鸿鏂规缂栧彿", "").replaceAll("鈥渱鈥潀\\s|?", "").replace("锛�", "(").replace("锛�", ")") new_name = OpenApiClient.standardize(city, new_name) new_name = (String) JSONObject.fromObject(new_name).get("keywords") if (StringUtils.isBlank(new_name)) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/ShanghaiWuye.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/ShanghaiWuye.groovy index d45e3f93f..820527e54 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/ShanghaiWuye.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/ShanghaiWuye.groovy @@ -14,7 +14,7 @@ import java.util.regex.Matcher import java.util.regex.Pattern /** - * 整理上海物业数据 + * 鏁寸悊涓婃捣鐗╀笟鏁版嵁 * Created by linxsh on 2017/6/6. */ class ShanghaiWuye { @@ -43,11 +43,11 @@ class ShanghaiWuye { } static String formatName(String name) { - String formatName = AddressUtil.formatDistrictName("上海", name) + String formatName = AddressUtil.formatDistrictName("涓婃捣", name) if(formatName) { - formatName = StringUtils.substringAfter(formatName, "街道") + formatName = StringUtils.substringAfter(formatName, "琛楅亾") } - formatName = CommonUtil.formatByPattern(formatName, Pattern.compile("(.{2,}村)(?=小区)")) + formatName = CommonUtil.formatByPattern(formatName, Pattern.compile("(.{2,}鏉�)(?=灏忓尯)")) return formatName } @@ -55,9 +55,9 @@ class ShanghaiWuye { if(StringUtils.isBlank(address)) { return address } - String[] addrs = address.split("[,,。.、]") + String[] addrs = address.split("[锛�,銆�.銆乚") for(String addr : addrs) { - String formatAddress = AddressUtil.formatAddress("上海", addr) + String formatAddress = AddressUtil.formatAddress("涓婃捣", addr) if(formatAddress) { return formatAddress } @@ -74,7 +74,7 @@ class ShanghaiWuye { if(StringUtils.isBlank(houNo)) { return null } - String[] rooms = houNo.split("[,,。.、]") + String[] rooms = houNo.split("[锛�,銆�.銆乚") List results = new ArrayList<>() for(String room : rooms){ String formatRoomNumber = AddressUtil.formatRoomNumber(room) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/Test.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/Test.groovy index cbf09505c..5c3b06f94 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/Test.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/Test.groovy @@ -45,7 +45,7 @@ class Test { DBObject cityQuery = new BasicDBObject('status', new BasicDBObject('$in', [0, 2])) SERVER_AREA_CONN.find(cityQuery).each { CITYS << it.display} - def datas = [['城市', '区域', '小区名']] + def datas = [['鍩庡競', '鍖哄煙', '灏忓尯鍚�']] Set cache = Sets.newHashSet() CITYS.each { city -> DBCursor dbCursor = HOUSELOUDONG.find(new BasicDBObject("city", city).append('$or', [new BasicDBObject('region', ''), new BasicDBObject('region', null)]), new BasicDBObject('region', 1).append('name', 1)).addOption(Bytes.QUERYOPTION_NOTIMEOUT) @@ -55,7 +55,7 @@ class Test { } } } - ExcelUtils.write("D://统计.xlsx", datas) + ExcelUtils.write("D://缁熻.xlsx", datas) // process(args) /*DBCursor dbCursor = SOURLOUDONG.find().addOption(Bytes.QUERYOPTION_NOTIMEOUT) @@ -99,7 +99,7 @@ class Test { if(!exists(city +"_"+ region + "_" + name)) { DBObject findObj = seaweed.findOne(new BasicDBObject('city', city).append('region', region).append('$sr', new BasicDBObject('sr.query', 'keyword:' + name)).append("cat", 'district')) if(findObj == null) { - name = name.replaceAll('[^\u4e00-\u9fa5a-zA-Z\\d·\\(\\)()]|·', '') + name = name.replaceAll('[^\u4e00-\u9fa5a-zA-Z\\d路\\(\\)锛堬級]|路', '') findObj = seaweed.findOne(new BasicDBObject('city', city).append('region', region).append('$sr', new BasicDBObject('sr.query', 'keyword:' + name)).append("cat", 'district')) } if (findObj != null) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/Test2.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/Test2.groovy index 74e1607df..a9d956be5 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/Test2.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/Test2.groovy @@ -27,7 +27,7 @@ import java.util.concurrent.Semaphore /** * Created by linxsh on 2016/10/24. * - * 将无法匹配到小区的房号数据清洗入库 + * 灏嗘棤娉曞尮閰嶅埌灏忓尯鐨勬埧鍙锋暟鎹竻娲楀叆搴� */ class Test2 { private static DBCollection LOCALLOUDONG = MongoUtils.getCollectionByName("temp", "house_loudong_left", "192.168.0.136"); @@ -63,7 +63,7 @@ class Test2 { exec.shutdown()*/ - /*ExcelUtils.modify("C:\\Users\\ideoj\\Desktop\\数据导出.xlsx", {List item-> + /*ExcelUtils.modify("C:\\Users\\ideoj\\Desktop\\鏁版嵁瀵煎嚭.xlsx", {List item-> if(item['Q'] != null) { String pDate = new BigDecimal(item['Q']).toString() SimpleDateFormat sdf1 = new SimpleDateFormat("yyyyMMdd") diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/Yungujia.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/Yungujia.groovy index 2463e1719..a0847db2d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/Yungujia.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/Yungujia.groovy @@ -10,7 +10,7 @@ import com.mongodb.DBCursor import com.mongodb.DBObject /** - * 整理微信云估价的数据 + * 鏁寸悊寰俊浜戜及浠风殑鏁版嵁 * Created by linxsh on 2017/6/8. */ class Yungujia { @@ -48,7 +48,7 @@ class Yungujia { } static String formatCity(def city) { - if(city && city[-1] == '市') { + if(city && city[-1] == '甯�') { return city[0..-2] } null diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/count/Complete.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/count/Complete.groovy index 20554a071..9f69730ea 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/count/Complete.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/count/Complete.groovy @@ -20,7 +20,7 @@ class Complete { private static DBCollection local = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "mongo.db.fangjia.com"); public static void main(String[] args) { - ExcelUtils.multiThreadingModify("C:\\Users\\ideoj\\Desktop\\数据统计.xlsx", {item -> + ExcelUtils.multiThreadingModify("C:\\Users\\ideoj\\Desktop\\鏁版嵁缁熻.xlsx", {item -> String city = item['B'] String region = item['C'] String name = item['E'] @@ -30,7 +30,7 @@ class Complete { Double area = item['K'] try { - JSONObject result = OpenApiClient.evaluateDistrictPrice(city, region, name, area, estateType.equals("别墅") ? 1 : 0, totalFloor, floor) + JSONObject result = OpenApiClient.evaluateDistrictPrice(city, region, name, area, estateType.equals("鍒") ? 1 : 0, totalFloor, floor) println result if(result != null) { item['T'] = result.get('totalPrice') @@ -39,7 +39,7 @@ class Complete { } }, 3) - /*List> datas = ExcelUtils.read("C:\\Users\\ideoj\\Desktop\\浙商银行样本数据.xlsx", 0, 1) + /*List> datas = ExcelUtils.read("C:\\Users\\ideoj\\Desktop\\娴欏晢閾惰鏍锋湰鏁版嵁.xlsx", 0, 1) for(List data : datas) { }*/ @@ -49,53 +49,53 @@ class Complete { private static void handle() { - ExcelUtils.multiThreadingModify("C:\\Users\\ideoj\\Desktop\\数据导出.xlsx",{List item-> + ExcelUtils.multiThreadingModify("C:\\Users\\ideoj\\Desktop\\鏁版嵁瀵煎嚭.xlsx",{List item-> String fitment = item['L'] String direction = item['M'] String structure = item['S'] if(StringUtils.isNotBlank(fitment)) { - if(fitment.contains('毛坯') || fitment.contains('无装')||fitment.contains('未装')||fitment.contains('未装')) { - item['L'] = '毛坯' - } else if(fitment.contains('一般') || fitment.startsWith('中') || fitment.startsWith('普通') || fitment.startsWith('简单')) { - item['L'] = '简装' - } else if(fitment.contains('高档') || fitment.contains('豪装') || fitment.startsWith('豪华')) { - item['L'] = '豪装' - } else if(fitment.startsWith('精')) { - item['L'] = "精装" + if(fitment.contains('姣涘澂') || fitment.contains('鏃犺')||fitment.contains('鏈')||fitment.contains('鏈')) { + item['L'] = '姣涘澂' + } else if(fitment.contains('涓�鑸�') || fitment.startsWith('涓�') || fitment.startsWith('鏅��') || fitment.startsWith('绠�鍗�')) { + item['L'] = '绠�瑁�' + } else if(fitment.contains('楂樻。') || fitment.contains('璞') || fitment.startsWith('璞崕')) { + item['L'] = '璞' + } else if(fitment.startsWith('绮�')) { + item['L'] = "绮捐" } else { println fitment } } if(StringUtils.isNotBlank(direction)) { - if(direction.contains('东西')) { - item['M'] = '东' - } else if(direction.contains('南北')) { - item['M'] = '南' - } else if(direction.contains('东南')) { - item['M'] = '东南' - } else if(direction.contains('东北')) { - item['M'] = '东北' - } else if(direction.contains('西南')) { - item['M'] = '西南' - } else if(direction.contains('西北')) { - item['M'] = '西北' - } else if(direction.contains('东')) { - item['M'] = '东' - } else if(direction.contains('西')) { - item['M'] = '西' - } else if(direction.contains('南')) { - item['M'] = '南' - } else if(direction.contains('北')) { - item['M'] = '北' + if(direction.contains('涓滆タ')) { + item['M'] = '涓�' + } else if(direction.contains('鍗楀寳')) { + item['M'] = '鍗�' + } else if(direction.contains('涓滃崡')) { + item['M'] = '涓滃崡' + } else if(direction.contains('涓滃寳')) { + item['M'] = '涓滃寳' + } else if(direction.contains('瑗垮崡')) { + item['M'] = '瑗垮崡' + } else if(direction.contains('瑗垮寳')) { + item['M'] = '瑗垮寳' + } else if(direction.contains('涓�')) { + item['M'] = '涓�' + } else if(direction.contains('瑗�')) { + item['M'] = '瑗�' + } else if(direction.contains('鍗�')) { + item['M'] = '鍗�' + } else if(direction.contains('鍖�')) { + item['M'] = '鍖�' } else { println direction } } if(StringUtils.isNotBlank(structure)) { - if(structure.contains('框架')) { - item['S'] = '简易结构' + if(structure.contains('妗嗘灦')) { + item['S'] = '绠�鏄撶粨鏋�' } else { println structure } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/count/Count.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/count/Count.groovy index c29d4d8ea..e8995183e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/count/Count.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/count/Count.groovy @@ -18,9 +18,9 @@ import com.mongodb.DBObject class Count { private static List provinces = ImmutableList.of( - "安徽", "北京", "甘肃", "广东", "广西", "贵州", "海南", "河北", "河南", "黑龙江", - "湖北", "湖南", "江苏", "江西", "辽宁", "内蒙古", "宁夏", "青海", "山东", "山西", - "陕西", "上海", "四川", "天津", "云南", "浙江", "重庆" + "瀹夊窘", "鍖椾含", "鐢樿們", "骞夸笢", "骞胯タ", "璐靛窞", "娴峰崡", "娌冲寳", "娌冲崡", "榛戦緳姹�", + "婀栧寳", "婀栧崡", "姹熻嫃", "姹熻タ", "杈藉畞", "鍐呰挋鍙�", "瀹佸", "闈掓捣", "灞变笢", "灞辫タ", + "闄曡タ", "涓婃捣", "鍥涘窛", "澶╂触", "浜戝崡", "娴欐睙", "閲嶅簡" ) public static DSCollection seawater = new DataStore("192.168.0.65", 27777).getCollection("fangjia.seawater") @@ -28,10 +28,10 @@ class Count { private static DBCollection SERVER_AREA = MongoUtils.getCollectionByName("fangjia", "server_area", "mongo.db.fangjia.com"); public static void main(String[] args) { - //地区、小区覆盖程度 + //鍦板尯銆佸皬鍖鸿鐩栫▼搴� exportData1(20160930); println "================================" - //字段覆盖程度与数据完整程度 + //瀛楁瑕嗙洊绋嬪害涓庢暟鎹畬鏁寸▼搴� // exportData2(20160930); println "================================" // @@ -44,7 +44,7 @@ class Count { static void exportData2(int endDate) { List> excelData = Lists.newArrayList(); - excelData.add(ImmutableList.of("样本库字段名称", "信息完整度")) + excelData.add(ImmutableList.of("鏍锋湰搴撳瓧娈靛悕绉�", "淇℃伅瀹屾暣搴�")) int totalCount = 1000000 int cityCount = 0 @@ -109,7 +109,7 @@ class Count { int street = 0 int business = 0 int household = 0 - int estateCharge = 0 //物业费 + int estateCharge = 0 //鐗╀笟璐� int parkNum = 0 int parkDesc = 0 int propertyLife = 0 @@ -118,7 +118,7 @@ class Count { int startBuild = 0 int openDate = 0 int endBuild = 0 - int liveDate = 0 //交房时间 + int liveDate = 0 //浜ゆ埧鏃堕棿 int landArea = 0 int buildArea = 0 int plotRate = 0 @@ -128,11 +128,11 @@ class Count { int estateCompany = 0 int fitment = 0 int floorInfo = 0 - int projectInfo = 0 //项目特色 - int facilities = 0 //周边配套 - int traffic = 0 //交通状况 - int fitment_materials = 0 //建材装修 - int relate_info = 0 //相关信息 + int projectInfo = 0 //椤圭洰鐗硅壊 + int facilities = 0 //鍛ㄨ竟閰嶅 + int traffic = 0 //浜ら�氱姸鍐� + int fitment_materials = 0 //寤烘潗瑁呬慨 + int relate_info = 0 //鐩稿叧淇℃伅 int desc = 0 int avgPriceArea = 0 int avgPriceNum = 0 @@ -149,7 +149,7 @@ class Count { if(findType == null) { continue } - if(findType.contains('普通住宅') || findType.contains('别墅')) { + if(findType.contains('鏅�氫綇瀹�') || findType.contains('鍒')) { districtCount += 1 /*aliasCount += (dbObject.containsField('alias') ? 1 : 0) @@ -163,7 +163,7 @@ class Count { street += (dbObject.containsField('street_community') ? 1 : 0) business += (dbObject.containsField('business_quarter') ? 1 : 0) household += (dbObject.containsField('household_count') ? 1 : 0) - estateCharge += (dbObject.containsField('estate_charge') ? 1 : 0) //物业费 + estateCharge += (dbObject.containsField('estate_charge') ? 1 : 0) //鐗╀笟璐� parkNum += (dbObject.containsField('car_site_count') ? 1 : 0) parkDesc += (dbObject.containsField('car_site') ? 1 : 0) propertyLife += (dbObject.containsField('property_life') ? 1 : 0) @@ -172,8 +172,8 @@ class Count { startBuild += (dbObject.containsField('start_building_date') ? 1 : 0) openDate += (dbObject.containsField('open_date') ? 1 : 0) endBuild += (dbObject.containsField('finish_building_date') ? 1 : 0) - liveDate += (dbObject.containsField('live_date') ? 1 : 0) //交房时间 - landArea += (dbObject.containsField('all_area') ? 1 : 0) //占地面积 + liveDate += (dbObject.containsField('live_date') ? 1 : 0) //浜ゆ埧鏃堕棿 + landArea += (dbObject.containsField('all_area') ? 1 : 0) //鍗犲湴闈㈢Н buildArea += (dbObject.containsField('build_area') ? 1 : 0) plotRate += (dbObject.containsField('cubage_percent') ? 1 : 0) greenRate += (dbObject.containsField('virescence_percent') ? 1 : 0) @@ -182,92 +182,92 @@ class Count { estateCompany += (dbObject.containsField('estate_company') ? 1 : 0) fitment += (dbObject.containsField('fitment') ? 1 : 0) floorInfo += (dbObject.containsField('floor_info') ? 1 : 0) - projectInfo += (dbObject.containsField('characteristic') ? 1 : 0) //项目特色 - facilities += (dbObject.containsField('facilities') ? 1 : 0) //周边配套 - traffic += (dbObject.containsField('traffic') ? 1 : 0) //交通状况 - fitment_materials += (dbObject.containsField('fitment_materials') ? 1 : 0) //建材装修 - relate_info += (dbObject.containsField('relate_info') ? 1 : 0) //相关信息 + projectInfo += (dbObject.containsField('characteristic') ? 1 : 0) //椤圭洰鐗硅壊 + facilities += (dbObject.containsField('facilities') ? 1 : 0) //鍛ㄨ竟閰嶅 + traffic += (dbObject.containsField('traffic') ? 1 : 0) //浜ら�氱姸鍐� + fitment_materials += (dbObject.containsField('fitment_materials') ? 1 : 0) //寤烘潗瑁呬慨 + relate_info += (dbObject.containsField('relate_info') ? 1 : 0) //鐩稿叧淇℃伅 desc += (dbObject.containsField('description') ? 1 : 0) avgPriceArea += (dbObject.containsField('avg_price') ? 1 : 0) avgPriceNum += (dbObject.containsField('total_price') ? 1 : 0) saleAddr += (dbObject.containsField('sell_address') ? 1 : 0) saleTel += (dbObject.containsField('mobile') ? 1 : 0) - saleInfo += (dbObject.containsField('discount') ? 1 : 0) //折扣信息*/ + saleInfo += (dbObject.containsField('discount') ? 1 : 0) //鎶樻墸淇℃伅*/ } def use = (System.currentTimeMillis() - start) println use + "ms\t " + (use * 1.0 / count) + " per/ms" } - println "别名 $aliasCount" - println "经纬度(百度) $latLngBd" - println "经纬度(mapabc) $latLngAbc" - println "经纬度(腾讯) $latLngQQ" - println "地址别名 $addrAlias" - println "环线 $loop" - println "物业类型 $type" - println "建筑类型 $buildType" - println "街道社区 $street" - println "商圈 $business" - println "户数 $household" - println "物业费 $estateCharge" //物业费 - println "停车位 $parkNum" - println "停车位(描述) $parkDesc" - println "产权年限 $propertyLife" - println "产权性质 $houseProperty" - println "小区性质 $districtProp" - println "开工时间 $startBuild" - println "开盘时间 $openDate" - println "竣工时间 $endBuild" - println "交房时间 $liveDate" //交房时间 - println "占地面积 $landArea" - println "建筑面积 $buildArea" - println "容积率 $plotRate" - println "绿化率 $greenRate" - println "预售许可证 $preSale" - println "开发商 $developer" - println "物业公司 $estateCompany" - println "装修情况 $fitment" - println "楼层情况 $floorInfo" - println "项目特色 $projectInfo" //项目特色 - println "周边配套 $facilities" //周边配套 - println "交通状况 $traffic" //交通状况 - println "建材装修 $fitment_materials" //建材装修 - println "相关信息 $relate_info" //相关信息 - println "描述 $desc" - println "价格(元/㎡ ) $avgPriceArea" - println "价格(元/套 ) $avgPriceNum" - println "售楼地址 $saleAddr" - println "售楼电话 $saleTel" - println "折扣信息 $saleInfo" + println "鍒悕 $aliasCount" + println "缁忕含搴︼紙鐧惧害锛� $latLngBd" + println "缁忕含搴︼紙mapabc锛� $latLngAbc" + println "缁忕含搴︼紙鑵捐锛� $latLngQQ" + println "鍦板潃鍒悕 $addrAlias" + println "鐜嚎 $loop" + println "鐗╀笟绫诲瀷 $type" + println "寤虹瓚绫诲瀷 $buildType" + println "琛楅亾绀惧尯 $street" + println "鍟嗗湀 $business" + println "鎴锋暟 $household" + println "鐗╀笟璐� $estateCharge" //鐗╀笟璐� + println "鍋滆溅浣� $parkNum" + println "鍋滆溅浣嶏紙鎻忚堪锛� $parkDesc" + println "浜ф潈骞撮檺 $propertyLife" + println "浜ф潈鎬ц川 $houseProperty" + println "灏忓尯鎬ц川 $districtProp" + println "寮�宸ユ椂闂� $startBuild" + println "寮�鐩樻椂闂� $openDate" + println "绔e伐鏃堕棿 $endBuild" + println "浜ゆ埧鏃堕棿 $liveDate" //浜ゆ埧鏃堕棿 + println "鍗犲湴闈㈢Н $landArea" + println "寤虹瓚闈㈢Н $buildArea" + println "瀹圭Н鐜� $plotRate" + println "缁垮寲鐜� $greenRate" + println "棰勫敭璁稿彲璇� $preSale" + println "寮�鍙戝晢 $developer" + println "鐗╀笟鍏徃 $estateCompany" + println "瑁呬慨鎯呭喌 $fitment" + println "妤煎眰鎯呭喌 $floorInfo" + println "椤圭洰鐗硅壊 $projectInfo" //椤圭洰鐗硅壊 + println "鍛ㄨ竟閰嶅 $facilities" //鍛ㄨ竟閰嶅 + println "浜ら�氱姸鍐� $traffic" //浜ら�氱姸鍐� + println "寤烘潗瑁呬慨 $fitment_materials" //寤烘潗瑁呬慨 + println "鐩稿叧淇℃伅 $relate_info" //鐩稿叧淇℃伅 + println "鎻忚堪 $desc" + println "浠锋牸(鍏�/銕� ) $avgPriceArea" + println "浠锋牸(鍏�/濂� ) $avgPriceNum" + println "鍞ゼ鍦板潃 $saleAddr" + println "鍞ゼ鐢佃瘽 $saleTel" + println "鎶樻墸淇℃伅 $saleInfo" - excelData.add(ImmutableList.of('省份', 1.0)) - excelData.add(ImmutableList.of('城市', 1.0)) - excelData.add(ImmutableList.of('行政区域', 1.0)) - excelData.add(ImmutableList.of('小区名称', districtNameCount * 1.0 / totalCount)) - excelData.add(ImmutableList.of('地址', addressCount * 1.0 / totalCount)) - excelData.add(ImmutableList.of('源标题', nameCount * 1.0 / totalCount)) - excelData.add(ImmutableList.of('朝向', directionCount * 1.0 / totalCount)) - excelData.add(ImmutableList.of('板块', blockCount * 1.0 / totalCount)) - excelData.add(ImmutableList.of('总价', totalPriceCount * 1.0 / totalCount)) - excelData.add(ImmutableList.of("面积", areaCount * 1.0 / totalCount)) - excelData.add(ImmutableList.of("总楼层", heightCount * 1.0 / totalCount)) - excelData.add(ImmutableList.of("所在楼层", floorCount * 1.0 / totalCount)) - excelData.add(ImmutableList.of("内部装修", fitmentCount * 1.0 / totalCount)) - excelData.add(ImmutableList.of("室", roomCount * 1.0/ totalCount)) - excelData.add(ImmutableList.of("厅", hallCount * 1.0/ totalCount)) - excelData.add(ImmutableList.of("卫", toiletCount * 1.0/ totalCount)) - excelData.add(ImmutableList.of("手机号", mobileCount * 1.0/ totalCount)) - excelData.add(ImmutableList.of("来源", urlCount * 1.0/ totalCount)) - excelData.add(ImmutableList.of("房屋类型", typeCount * 1.0/ totalCount)) + excelData.add(ImmutableList.of('鐪佷唤', 1.0)) + excelData.add(ImmutableList.of('鍩庡競', 1.0)) + excelData.add(ImmutableList.of('琛屾斂鍖哄煙', 1.0)) + excelData.add(ImmutableList.of('灏忓尯鍚嶇О', districtNameCount * 1.0 / totalCount)) + excelData.add(ImmutableList.of('鍦板潃', addressCount * 1.0 / totalCount)) + excelData.add(ImmutableList.of('婧愭爣棰�', nameCount * 1.0 / totalCount)) + excelData.add(ImmutableList.of('鏈濆悜', directionCount * 1.0 / totalCount)) + excelData.add(ImmutableList.of('鏉垮潡', blockCount * 1.0 / totalCount)) + excelData.add(ImmutableList.of('鎬讳环', totalPriceCount * 1.0 / totalCount)) + excelData.add(ImmutableList.of("闈㈢Н", areaCount * 1.0 / totalCount)) + excelData.add(ImmutableList.of("鎬绘ゼ灞�", heightCount * 1.0 / totalCount)) + excelData.add(ImmutableList.of("鎵�鍦ㄦゼ灞�", floorCount * 1.0 / totalCount)) + excelData.add(ImmutableList.of("鍐呴儴瑁呬慨", fitmentCount * 1.0 / totalCount)) + excelData.add(ImmutableList.of("瀹�", roomCount * 1.0/ totalCount)) + excelData.add(ImmutableList.of("鍘�", hallCount * 1.0/ totalCount)) + excelData.add(ImmutableList.of("鍗�", toiletCount * 1.0/ totalCount)) + excelData.add(ImmutableList.of("鎵嬫満鍙�", mobileCount * 1.0/ totalCount)) + excelData.add(ImmutableList.of("鏉ユ簮", urlCount * 1.0/ totalCount)) + excelData.add(ImmutableList.of("鎴垮眿绫诲瀷", typeCount * 1.0/ totalCount)) // excelData.add(list) - ExcelUtils.write("D://字段统计.xlsx", excelData, "sheet1") + ExcelUtils.write("D://瀛楁缁熻.xlsx", excelData, "sheet1") } static void exportData1(int endDate) { List> excelData = Lists.newArrayList(); - excelData.add(ImmutableList.of("省份", "城市", "城市等级", "二手房样本量", "小区数量")) + excelData.add(ImmutableList.of("鐪佷唤", "鍩庡競", "鍩庡競绛夌骇", "浜屾墜鎴挎牱鏈噺", "灏忓尯鏁伴噺")) List list = SERVER_AREA.distinct('province') for(String province : list) { List cities = SERVER_AREA.find(new BasicDBObject('province', province)).toArray() @@ -281,6 +281,6 @@ class Count { println "$province\t$city\t$level\t$demoCount\t$districtCount" } } - ExcelUtils.write("D://小区覆盖程度.xlsx", excelData, "sheet") + ExcelUtils.write("D://灏忓尯瑕嗙洊绋嬪害.xlsx", excelData, "sheet") } } \ No newline at end of file diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/count/FetchDemo.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/count/FetchDemo.groovy index 0cfc47f2b..3aad93de2 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/count/FetchDemo.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/count/FetchDemo.groovy @@ -23,7 +23,7 @@ import java.util.concurrent.Semaphore /** * Created by linxsh on 2016/11/1. - * 样本抽取,根据给定城市抽取样本数据,每个城市抽取5个小区(分部在不同区域),每个小区5个样本数据 + * 鏍锋湰鎶藉彇锛屾牴鎹粰瀹氬煄甯傛娊鍙栨牱鏈暟鎹紝姣忎釜鍩庡競鎶藉彇5涓皬鍖猴紙鍒嗛儴鍦ㄤ笉鍚屽尯鍩燂級锛屾瘡涓皬鍖�5涓牱鏈暟鎹� */ class FetchDemo { private static DBCollection SERVER_AREA = MongoUtils.getCollectionByName("fangjia", "server_area", "mongo.db.fangjia.com"); @@ -35,57 +35,57 @@ class FetchDemo { private static ExecutorService exec = Executors.newCachedThreadPool() private static List provinces = ImmutableList.of( - "安徽", "北京", "甘肃", "广东", "广西", "贵州", "海南", "河北", "河南", "黑龙江", - "湖北", "湖南", "江苏", "江西", "辽宁", "内蒙古", "宁夏", "青海", "山东", "山西", - "陕西", "上海", "四川", "天津", "云南", "浙江", "重庆" + "瀹夊窘", "鍖椾含", "鐢樿們", "骞夸笢", "骞胯タ", "璐靛窞", "娴峰崡", "娌冲寳", "娌冲崡", "榛戦緳姹�", + "婀栧寳", "婀栧崡", "姹熻嫃", "姹熻タ", "杈藉畞", "鍐呰挋鍙�", "瀹佸", "闈掓捣", "灞变笢", "灞辫タ", + "闄曡タ", "涓婃捣", "鍥涘窛", "澶╂触", "浜戝崡", "娴欐睙", "閲嶅簡" ) private static Map> cities = new LinkedHashMap>() { { - /*put("安徽", ImmutableList.of("滁州", "黄山", "马鞍山", "芜湖", "宿州", "宣城")) - put("北京", ImmutableList.of("北京")) - put("甘肃", ImmutableList.of("白银", "定西", "甘南", "金昌", "兰州", "临夏", "陇南", "平凉", "庆阳", "天水", "武威", "张掖")) - put("广东", ImmutableList.of("东莞", "佛山", "广州", "惠州", "江门", "梅州", "清远", "深圳")) - put("广西", ImmutableList.of("玉林")) - put("贵州", ImmutableList.of("安顺", "贵阳", "铜仁")) - put("海南", ImmutableList.of("三亚", "海口", "三沙", "琼海", "昌江", "乐东", "陵水", "保亭", "儋州", "琼中", "屯昌", "澄迈", "五指山", "临高", "文昌", "万宁", "白沙", "东方", "定安")) - put("河北", ImmutableList.of("承德", "邯郸", "衡水", "廊坊", "秦皇岛", "石家庄")) - put("河南", ImmutableList.of("开封", "洛阳")) - put("黑龙江", ImmutableList.of("大庆")) - put("湖北", ImmutableList.of("鄂州", "黄冈", "十堰", "武汉", "宜昌")) - put("湖南", ImmutableList.of("常德", "长沙")) - put("江苏", ImmutableList.of("常州", "淮安", "连云港", "南京", "南通", "苏州", "泰州", "无锡", "宿迁", "徐州", "盐城", "扬州", "镇江")) - put("江西", ImmutableList.of("景德镇", "九江", "上饶", "鹰潭")) - put("辽宁", ImmutableList.of("抚顺", "辽阳", "盘锦", "沈阳", "铁岭", "营口")) - put("内蒙古", ImmutableList.of("呼和浩特")) - put("宁夏", ImmutableList.of("石嘴山", "银川")) - put("青海", ImmutableList.of("海东", "西宁")) - put("山东", ImmutableList.of("滨州", "德州", "济南", "济宁", "青岛", "潍坊", "淄博")) - put("山西", ImmutableList.of("太原")) - put("陕西", ImmutableList.of("宝鸡", "渭南", "西安", "咸阳")) - put("上海", ImmutableList.of("上海")) - put("四川", ImmutableList.of("成都", "达州", "德阳", "乐山", "凉山州", "泸州", "眉山", "绵阳", "南充", "内江", "遂宁", "雅安", "宜宾", "资阳", "自贡")) - put("天津", ImmutableList.of("天津")) - put("云南", ImmutableList.of("丽江", "昭通")) - put("浙江", ImmutableList.of("杭州", "湖州", "嘉兴", "金华", "丽水", "宁波", "衢州", "绍兴", "台州", "温州", "舟山")) - put("重庆", ImmutableList.of("重庆"))*/ + /*put("瀹夊窘", ImmutableList.of("婊佸窞", "榛勫北", "椹瀺灞�", "鑺滄箹", "瀹垮窞", "瀹e煄")) + put("鍖椾含", ImmutableList.of("鍖椾含")) + put("鐢樿們", ImmutableList.of("鐧介摱", "瀹氳タ", "鐢樺崡", "閲戞槍", "鍏板窞", "涓村", "闄囧崡", "骞冲噳", "搴嗛槼", "澶╂按", "姝﹀▉", "寮犳帠")) + put("骞夸笢", ImmutableList.of("涓滆帪", "浣涘北", "骞垮窞", "鎯犲窞", "姹熼棬", "姊呭窞", "娓呰繙", "娣卞湷")) + put("骞胯タ", ImmutableList.of("鐜夋灄")) + put("璐靛窞", ImmutableList.of("瀹夐『", "璐甸槼", "閾滀粊")) + put("娴峰崡", ImmutableList.of("涓変簹", "娴峰彛", "涓夋矙", "鐞兼捣", "鏄屾睙", "涔愪笢", "闄垫按", "淇濅涵", "鍎嬪窞", "鐞间腑", "灞槍", "婢勮繄", "浜旀寚灞�", "涓撮珮", "鏂囨槍", "涓囧畞", "鐧芥矙", "涓滄柟", "瀹氬畨")) + put("娌冲寳", ImmutableList.of("鎵垮痉", "閭兏", "琛℃按", "寤婂潑", "绉︾殗宀�", "鐭冲搴�")) + put("娌冲崡", ImmutableList.of("寮�灏�", "娲涢槼")) + put("榛戦緳姹�", ImmutableList.of("澶у簡")) + put("婀栧寳", ImmutableList.of("閯傚窞", "榛勫唸", "鍗佸牥", "姝︽眽", "瀹滄槍")) + put("婀栧崡", ImmutableList.of("甯稿痉", "闀挎矙")) + put("姹熻嫃", ImmutableList.of("甯稿窞", "娣畨", "杩炰簯娓�", "鍗椾含", "鍗楅��", "鑻忓窞", "娉板窞", "鏃犻敗", "瀹胯縼", "寰愬窞", "鐩愬煄", "鎵窞", "闀囨睙")) + put("姹熻タ", ImmutableList.of("鏅痉闀�", "涔濇睙", "涓婇ザ", "楣版江")) + put("杈藉畞", ImmutableList.of("鎶氶『", "杈介槼", "鐩橀敠", "娌堥槼", "閾佸箔", "钀ュ彛")) + put("鍐呰挋鍙�", ImmutableList.of("鍛煎拰娴╃壒")) + put("瀹佸", ImmutableList.of("鐭冲槾灞�", "閾跺窛")) + put("闈掓捣", ImmutableList.of("娴蜂笢", "瑗垮畞")) + put("灞变笢", ImmutableList.of("婊ㄥ窞", "寰峰窞", "娴庡崡", "娴庡畞", "闈掑矝", "娼嶅潑", "娣勫崥")) + put("灞辫タ", ImmutableList.of("澶師")) + put("闄曡タ", ImmutableList.of("瀹濋浮", "娓崡", "瑗垮畨", "鍜搁槼")) + put("涓婃捣", ImmutableList.of("涓婃捣")) + put("鍥涘窛", ImmutableList.of("鎴愰兘", "杈惧窞", "寰烽槼", "涔愬北", "鍑夊北宸�", "娉稿窞", "鐪夊北", "缁甸槼", "鍗楀厖", "鍐呮睙", "閬傚畞", "闆呭畨", "瀹滃", "璧勯槼", "鑷础")) + put("澶╂触", ImmutableList.of("澶╂触")) + put("浜戝崡", ImmutableList.of("涓芥睙", "鏄��")) + put("娴欐睙", ImmutableList.of("鏉窞", "婀栧窞", "鍢夊叴", "閲戝崕", "涓芥按", "瀹佹尝", "琛㈠窞", "缁嶅叴", "鍙板窞", "娓╁窞", "鑸熷北")) + put("閲嶅簡", ImmutableList.of("閲嶅簡"))*/ - /*put("安徽", ImmutableList.of("黄山", "马鞍山", "宣城", "宿州", "滁州")) - put("甘肃", ImmutableList.of("武威", "陇南", "金昌", "庆阳", "张掖", "甘南", "白银", "定西", "天水", "平凉")) - put("贵州", ImmutableList.of("铜仁")) - put("海南", ImmutableList.of("白沙", "临高", "定安", "文昌", "万宁", "儋州", "琼中", "东方", "陵水", "保亭", "琼海")) - put("河北", ImmutableList.of("衡水")) - put("湖北", ImmutableList.of("鄂州", "十堰")) - put("江西", ImmutableList.of("鹰潭")) - put("辽宁", ImmutableList.of("盘锦")) - put("宁夏", ImmutableList.of("石嘴山")) - put("陕西", ImmutableList.of("咸阳", "宝鸡", "渭南")) - put("四川", ImmutableList.of("乐山", "宜宾", "资阳", "眉山", "雅安", "绵阳")) - put("云南", ImmutableList.of("丽江", "昭通")) - put("浙江", ImmutableList.of("丽水", "舟山"))*/ + /*put("瀹夊窘", ImmutableList.of("榛勫北", "椹瀺灞�", "瀹e煄", "瀹垮窞", "婊佸窞")) + put("鐢樿們", ImmutableList.of("姝﹀▉", "闄囧崡", "閲戞槍", "搴嗛槼", "寮犳帠", "鐢樺崡", "鐧介摱", "瀹氳タ", "澶╂按", "骞冲噳")) + put("璐靛窞", ImmutableList.of("閾滀粊")) + put("娴峰崡", ImmutableList.of("鐧芥矙", "涓撮珮", "瀹氬畨", "鏂囨槍", "涓囧畞", "鍎嬪窞", "鐞间腑", "涓滄柟", "闄垫按", "淇濅涵", "鐞兼捣")) + put("娌冲寳", ImmutableList.of("琛℃按")) + put("婀栧寳", ImmutableList.of("閯傚窞", "鍗佸牥")) + put("姹熻タ", ImmutableList.of("楣版江")) + put("杈藉畞", ImmutableList.of("鐩橀敠")) + put("瀹佸", ImmutableList.of("鐭冲槾灞�")) + put("闄曡タ", ImmutableList.of("鍜搁槼", "瀹濋浮", "娓崡")) + put("鍥涘窛", ImmutableList.of("涔愬北", "瀹滃", "璧勯槼", "鐪夊北", "闆呭畨", "缁甸槼")) + put("浜戝崡", ImmutableList.of("涓芥睙", "鏄��")) + put("娴欐睙", ImmutableList.of("涓芥按", "鑸熷北"))*/ - put("海南", ImmutableList.of("白沙", "琼中", "定安")) - put("甘肃", ImmutableList.of("甘南")) + put("娴峰崡", ImmutableList.of("鐧芥矙", "鐞间腑", "瀹氬畨")) + put("鐢樿們", ImmutableList.of("鐢樺崡")) } } @@ -119,8 +119,8 @@ class FetchDemo { } static def handleHouse2(String province, String city, String region, Map caches) { - DSCursor dsCursor = seaweed.find(new BasicDBObject('estate_type2', '普通住宅').append('city', city).append('region', region).append('visible', 0)) - int oldCount = 0 //每个区域导出两个小区样本 + DSCursor dsCursor = seaweed.find(new BasicDBObject('estate_type2', '鏅�氫綇瀹�').append('city', city).append('region', region).append('visible', 0)) + int oldCount = 0 //姣忎釜鍖哄煙瀵煎嚭涓や釜灏忓尯鏍锋湰 int newCount = 0 for(DBObject dbObject : dsCursor) { def finishBuildDate = dbObject['finish_building_date'] @@ -154,8 +154,8 @@ class FetchDemo { } static def handleVilla2(String province, String city, String region, Map caches) { - DSCursor dsCursor = seaweed.find(new BasicDBObject('estate_type2', '别墅').append('city', city).append('region', region).append('visible', 0)) - int oldCount = 0 //每个区域导出两个小区样本 + DSCursor dsCursor = seaweed.find(new BasicDBObject('estate_type2', '鍒').append('city', city).append('region', region).append('visible', 0)) + int oldCount = 0 //姣忎釜鍖哄煙瀵煎嚭涓や釜灏忓尯鏍锋湰 int newCount = 0 for(DBObject dbObject : dsCursor) { def finishBuildDate = dbObject['finish_building_date'] @@ -196,7 +196,7 @@ class FetchDemo { long exportedCount = 0 DSCursor dsCursor = seawater.find(new BasicDBObject('city', city)./*append('region', region).*/append('district_name', name).append('cat', 'sell')) for(DBObject findObj : dsCursor) { - Long saveCount = saveData(province, city, region, "二手房", "普通住宅", buildYear, dbObject, findObj) + Long saveCount = saveData(province, city, region, "浜屾墜鎴�", "鏅�氫綇瀹�", buildYear, dbObject, findObj) if(saveCount != null) { exportedCount++; } @@ -206,7 +206,7 @@ class FetchDemo { } exportedCount = TEMP3.count(new BasicDBObject('city', city).append('region', region).append('name', name)) if(exportedCount < count) { - TEMP3.remove(new BasicDBObject('city', city).append('region', region).append('name', name).append('type', '二手房')) + TEMP3.remove(new BasicDBObject('city', city).append('region', region).append('name', name).append('type', '浜屾墜鎴�')) return false } println "$city -> $region -> $name" @@ -221,7 +221,7 @@ class FetchDemo { long exportedCount = 0 DSCursor dsCursor = seawater.find(new BasicDBObject('city', city)./*append('region', region).*/append('district_name', name).append('cat', 'sell')) for(DBObject findObj : dsCursor) { - Long saveCount = saveData(province, city, region, "新房", "普通住宅", buildYear, dbObject, findObj) + Long saveCount = saveData(province, city, region, "鏂版埧", "鏅�氫綇瀹�", buildYear, dbObject, findObj) if(saveCount != null) { exportedCount++; } @@ -231,7 +231,7 @@ class FetchDemo { } exportedCount = TEMP3.count(new BasicDBObject('city', city).append('region', region).append('name', name)) if(exportedCount < count) { - TEMP3.remove(new BasicDBObject('city', city).append('region', region).append('name', name).append('type', '新房')) + TEMP3.remove(new BasicDBObject('city', city).append('region', region).append('name', name).append('type', '鏂版埧')) return false } println "$city -> $region -> $name" @@ -246,7 +246,7 @@ class FetchDemo { long exportedCount = 0 DSCursor dsCursor = seawater.find(new BasicDBObject('city', city)./*append('region', region).*/append('district_name', name).append('cat', 'sell')) for(DBObject findObj : dsCursor) { - Long saveCount = saveData(province, city, region, "二手房", "别墅", buildYear, dbObject, findObj) + Long saveCount = saveData(province, city, region, "浜屾墜鎴�", "鍒", buildYear, dbObject, findObj) if(saveCount != null) { exportedCount++; } @@ -257,7 +257,7 @@ class FetchDemo { exportedCount = TEMP3.count(new BasicDBObject('city', city).append('region', region).append('name', name)) if(exportedCount < count) { - TEMP3.remove(new BasicDBObject('city', city).append('region', region).append('name', name).append('type', '二手房')) + TEMP3.remove(new BasicDBObject('city', city).append('region', region).append('name', name).append('type', '浜屾墜鎴�')) return false } println "$city -> $region -> $name" @@ -272,7 +272,7 @@ class FetchDemo { long exportedCount = 0 DSCursor dsCursor = seawater.find(new BasicDBObject('city', city)./*append('region', region).*/append('district_name', name).append('cat', 'sell')) for(DBObject findObj : dsCursor) { - Long saveCount = saveData(province, city, region, "新房", "别墅", buildYear, dbObject, findObj) + Long saveCount = saveData(province, city, region, "鏂版埧", "鍒", buildYear, dbObject, findObj) if(saveCount != null) { exportedCount++; } @@ -283,14 +283,14 @@ class FetchDemo { exportedCount = TEMP3.count(new BasicDBObject('city', city).append('region', region).append('name', name)) if(exportedCount < count) { - TEMP3.remove(new BasicDBObject('city', city).append('region', region).append('name', name).append('type', '新房')) + TEMP3.remove(new BasicDBObject('city', city).append('region', region).append('name', name).append('type', '鏂版埧')) return false } println "$city -> $region -> $name" return true } - //返回库中的样本数 + //杩斿洖搴撲腑鐨勬牱鏈暟 static Long saveData(String province, String city, String region, String type, String estate_type, String build_year, DBObject districtObj, DBObject dbObject) { if(!dbObject.containsField('room') || dbObject.get('room') == null) { return null @@ -304,7 +304,7 @@ class FetchDemo { } } String direction = dbObject.get('direction') - if(direction==null || !direction.matches('.*[东南西北].*')) { + if(direction==null || !direction.matches('.*[涓滃崡瑗垮寳].*')) { return null } if(dbObject.get("area") == null || dbObject.get('total_price') == null) { @@ -317,7 +317,7 @@ class FetchDemo { return null } - if(estate_type.equals("别墅")) { + if(estate_type.equals("鍒")) { if(dbObject.get("area") < 100) { return null } @@ -345,13 +345,13 @@ class FetchDemo { String houseType = "" if(dbObject.get('room') != null && dbObject.get("room") != -1) { - houseType = (String)dbObject.get('room')+"室" + houseType = (String)dbObject.get('room')+"瀹�" } if(dbObject.get('hall') != null && dbObject.get("hall") != -1) { - houseType += ((String)dbObject.get('hall')+"厅") + houseType += ((String)dbObject.get('hall')+"鍘�") } if(dbObject.get('toilet') != null && dbObject.get("toilet") != -1) { - houseType += ((String)dbObject.get('toilet')+"卫") + houseType += ((String)dbObject.get('toilet')+"鍗�") } //Map saveData = Maps.newHashMap(); def saveData = [:] @@ -361,15 +361,15 @@ class FetchDemo { saveData.put('block', districtObj.get('block')) saveData.put('name', dbObject.get('district_name')) saveData.put('address', districtObj.get('address')) - saveData.put('estate_type', estate_type)//房屋类型 - saveData.put('type', type)//新房、二手房 + saveData.put('estate_type', estate_type)//鎴垮眿绫诲瀷 + saveData.put('type', type)//鏂版埧銆佷簩鎵嬫埧 saveData.put('floor', dbObject.get('floor')) saveData.put('t_floor', dbObject.get('height')) - saveData.put('hasElevator', dbObject.get('height') > 7 ?'有': '无') - saveData.put('fitment', dbObject.get('fitment'))//装修 + saveData.put('hasElevator', dbObject.get('height') > 7 ?'鏈�': '鏃�') + saveData.put('fitment', dbObject.get('fitment'))//瑁呬慨 saveData.put('direction', formatDirection(dbObject.get('direction'))) saveData.put('area', dbObject.get('area')) - saveData.put('price', dbObject.get('total_price') * 1.0 / dbObject.get('area'))//单价 + saveData.put('price', dbObject.get('total_price') * 1.0 / dbObject.get('area'))//鍗曚环 saveData.put('t_price', dbObject.get('total_price')) saveData.put('p_date', dbObject.get('p_date')) saveData.put("house_type", houseType) @@ -438,26 +438,26 @@ class FetchDemo { static String formatDirection(String direction) { String result = null if(StringUtils.isNotBlank(direction)) { - if(direction.contains('东西')) { - result = '东' - } else if(direction.contains('南北')) { - result = '南' - } else if(direction.contains('东南')) { - result = '东南' - } else if(direction.contains('东北')) { - result = '东北' - } else if(direction.contains('西南')) { - result = '西南' - } else if(direction.contains('西北')) { - result = '西北' - } else if(direction.contains('东')) { - result = '东' - } else if(direction.contains('西')) { - result = '西' - } else if(direction.contains('南')) { - result = '南' - } else if(direction.contains('北')) { - result = '北' + if(direction.contains('涓滆タ')) { + result = '涓�' + } else if(direction.contains('鍗楀寳')) { + result = '鍗�' + } else if(direction.contains('涓滃崡')) { + result = '涓滃崡' + } else if(direction.contains('涓滃寳')) { + result = '涓滃寳' + } else if(direction.contains('瑗垮崡')) { + result = '瑗垮崡' + } else if(direction.contains('瑗垮寳')) { + result = '瑗垮寳' + } else if(direction.contains('涓�')) { + result = '涓�' + } else if(direction.contains('瑗�')) { + result = '瑗�' + } else if(direction.contains('鍗�')) { + result = '鍗�' + } else if(direction.contains('鍖�')) { + result = '鍖�' } } return result diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/count/FetchDemo2.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/count/FetchDemo2.groovy index c144f2621..38fc9d6fd 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/count/FetchDemo2.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/count/FetchDemo2.groovy @@ -15,7 +15,7 @@ import org.apache.commons.lang.StringUtils /** * Created by linxsh on 2016/11/1. - * 抽取指定小区的所有样本数据 + * 鎶藉彇鎸囧畾灏忓尯鐨勬墍鏈夋牱鏈暟鎹� */ class Count4 { private static DBCollection SERVER_AREA = MongoUtils.getCollectionByName("fangjia", "server_area", "mongo.db.fangjia.com"); @@ -24,8 +24,8 @@ class Count4 { private static DBCollection TEMP2 = MongoUtils.getCollectionByName("temp", "temp2", "192.168.0.136"); public static void main(String[] args) { - handle("浙江", "杭州", "钱江御府") - handle("浙江", "杭州", "世纪新城") + handle("娴欐睙", "鏉窞", "閽辨睙寰″簻") + handle("娴欐睙", "鏉窞", "涓栫邯鏂板煄") } @@ -33,7 +33,7 @@ class Count4 { DBObject dbObject = seaweed.findOne(new BasicDBObject('city', city).append('district_name', name)) DSCursor dsCursor = seawater.find(new BasicDBObject('city', city).append('district_name', name)) def excelData = [] - excelData << ["省份", "城市", "区域", "板块", "小区名称", "地址", "房屋类型", "新房/二手房", "所在楼层", "总楼层", "户型", "内部装修", "朝向", "面积", "价格", "总价", "挂牌时间"] + excelData << ["鐪佷唤", "鍩庡競", "鍖哄煙", "鏉垮潡", "灏忓尯鍚嶇О", "鍦板潃", "鎴垮眿绫诲瀷", "鏂版埧/浜屾墜鎴�", "鎵�鍦ㄦゼ灞�", "鎬绘ゼ灞�", "鎴峰瀷", "鍐呴儴瑁呬慨", "鏈濆悜", "闈㈢Н", "浠锋牸", "鎬讳环", "鎸傜墝鏃堕棿"] for (DBObject findObj : dsCursor) { if(needContinue(findObj)) { continue @@ -41,13 +41,13 @@ class Count4 { String houseType = "" if(findObj.get('room') != null && findObj.get("room") != -1) { - houseType = (String)findObj.get('room')+"室" + houseType = (String)findObj.get('room')+"瀹�" } if(findObj.get('hall') != null && findObj.get("hall") != -1) { - houseType += ((String)findObj.get('hall')+"厅") + houseType += ((String)findObj.get('hall')+"鍘�") } if(findObj.get('toilet') != null && findObj.get("toilet") != -1) { - houseType += ((String)findObj.get('toilet')+"卫") + houseType += ((String)findObj.get('toilet')+"鍗�") } @@ -74,7 +74,7 @@ class Count4 { excelData << data } - ExcelUtils.write("D://字段统计2.xlsx", excelData, name) + ExcelUtils.write("D://瀛楁缁熻2.xlsx", excelData, name) } static boolean needContinue(DBObject dbObject) { @@ -90,7 +90,7 @@ class Count4 { } } String direction = dbObject.get('direction') - if(direction==null || !direction.matches('.*[东南西北].*')) { + if(direction==null || !direction.matches('.*[涓滃崡瑗垮寳].*')) { return true } if(dbObject.get("area") == null || dbObject.get('total_price') == null) { @@ -121,26 +121,26 @@ class Count4 { static String formatDirection(String direction) { String result = null if(StringUtils.isNotBlank(direction)) { - if(direction.contains('东西')) { - result = '东' - } else if(direction.contains('南北')) { - result = '南' - } else if(direction.contains('东南')) { - result = '东南' - } else if(direction.contains('东北')) { - result = '东北' - } else if(direction.contains('西南')) { - result = '西南' - } else if(direction.contains('西北')) { - result = '西北' - } else if(direction.contains('东')) { - result = '东' - } else if(direction.contains('西')) { - result = '西' - } else if(direction.contains('南')) { - result = '南' - } else if(direction.contains('北')) { - result = '北' + if(direction.contains('涓滆タ')) { + result = '涓�' + } else if(direction.contains('鍗楀寳')) { + result = '鍗�' + } else if(direction.contains('涓滃崡')) { + result = '涓滃崡' + } else if(direction.contains('涓滃寳')) { + result = '涓滃寳' + } else if(direction.contains('瑗垮崡')) { + result = '瑗垮崡' + } else if(direction.contains('瑗垮寳')) { + result = '瑗垮寳' + } else if(direction.contains('涓�')) { + result = '涓�' + } else if(direction.contains('瑗�')) { + result = '瑗�' + } else if(direction.contains('鍗�')) { + result = '鍗�' + } else if(direction.contains('鍖�')) { + result = '鍖�' } } return result diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/dealprice/ConvertType.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/dealprice/ConvertType.groovy index 7ac039491..1240dc789 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/dealprice/ConvertType.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/dealprice/ConvertType.groovy @@ -10,7 +10,7 @@ import com.mongodb.DBObject import org.apache.commons.lang.math.NumberUtils /** - * 将均价类型转为int型 + * 灏嗗潎浠风被鍨嬭浆涓篿nt鍨� * Created by linxsh on 2017/2/24. */ class ConvertType { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/dealprice/CountDealPriceBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/dealprice/CountDealPriceBatch.groovy index bc1387f14..3ddfc256e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/dealprice/CountDealPriceBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/dealprice/CountDealPriceBatch.groovy @@ -32,7 +32,7 @@ class CountDealPriceBatch extends BaseBatch { @Override void process(Object args) { SimpleDateFormat sdf = new SimpleDateFormat("yyyyMM") - println "开始统计Deal_Price ${DateUtil.formatToTightYYYYMMDDhhmmss(new Date())}" + println "寮�濮嬬粺璁eal_Price ${DateUtil.formatToTightYYYYMMDDhhmmss(new Date())}" SERVER_AREA_CONN.find(new BasicDBObject('status', new BasicDBObject('$in', [0, 2]))).each { CITYS << it.display } CITYS.each {city-> @@ -58,8 +58,8 @@ class CountDealPriceBatch extends BaseBatch { DEAL_PRICE_STAT.update(query, new BasicDBObject('$set', saveObj).append('$inc', incObj), true, false) } } - println "[$city]\tDeal_Price统计完成 ${DateUtil.formatToTightYYYYMMDDhhmmss(new Date())}" + println "[$city]\tDeal_Price缁熻瀹屾垚 ${DateUtil.formatToTightYYYYMMDDhhmmss(new Date())}" } - println "统计结束 Deal_Price ${DateUtil.formatToTightYYYYMMDDhhmmss(new Date())}" + println "缁熻缁撴潫 Deal_Price ${DateUtil.formatToTightYYYYMMDDhhmmss(new Date())}" } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/dealprice/ImportBuyData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/dealprice/ImportBuyData.groovy index d6d1c4a6f..f48fd1cdc 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/dealprice/ImportBuyData.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/dealprice/ImportBuyData.groovy @@ -16,7 +16,7 @@ import java.util.concurrent.Executors import java.util.concurrent.Semaphore /** - * 将购买的成交数据导入deal_price成交库 + * 灏嗚喘涔扮殑鎴愪氦鏁版嵁瀵煎叆deal_price鎴愪氦搴� * Created by linxsh on 2016/12/27. */ class ImportBuyData { @@ -41,7 +41,7 @@ class ImportBuyData { Double area = dbObject.area; Integer totalPrice = dbObject.t_price; Date creationDate = new Date(); - String source = "交易中心2"; + String source = "浜ゆ槗涓績2"; Date tradeDate = dbObject.trade_date; String address = dbObject.format_addr; Integer floor = dbObject.floor; @@ -62,7 +62,7 @@ class ImportBuyData { } static def replaceTradeDate() { - DBCursor dbCursor = TARGET.find(new BasicDBObject('city', '上海').append('source', '交易中心')).addOption(Bytes.QUERYOPTION_NOTIMEOUT) + DBCursor dbCursor = TARGET.find(new BasicDBObject('city', '涓婃捣').append('source', '浜ゆ槗涓績')).addOption(Bytes.QUERYOPTION_NOTIMEOUT) for(DBObject dbObject : dbCursor) { String address = dbObject.address def result = dbConn.firstRow("SELECT * FROM trade_detail where old_address = '$address'") diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/dealprice/ImportSearchData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/dealprice/ImportSearchData.groovy index 6498b5405..ff0211609 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/dealprice/ImportSearchData.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/dealprice/ImportSearchData.groovy @@ -16,7 +16,7 @@ import org.apache.commons.lang.StringUtils import java.text.SimpleDateFormat /** issue: http://192.168.0.141:81/dev0/main/issues/366 - * 2015年4月成交数据入库:Deal_price库、楼栋库、房号库 + * 2015骞�4鏈堟垚浜ゆ暟鎹叆搴�:Deal_price搴撱�佹ゼ鏍嬪簱銆佹埧鍙峰簱 * Created by linxsh on 2017/2/6. */ class ImportSearchData { @@ -26,17 +26,17 @@ class ImportSearchData { public static void main(String[] args) { - String fileName = "C:\\Users\\ideoj\\Desktop\\数据部-楼栋库入库\\20170207\\2015年4月上海二手房成交明细.xls"; + String fileName = "C:\\Users\\ideoj\\Desktop\\鏁版嵁閮�-妤兼爧搴撳叆搴揬\20170207\\2015骞�4鏈堜笂娴蜂簩鎵嬫埧鎴愪氦鏄庣粏.xls"; // format(fileName) - //录入Deal_price库 + //褰曞叆Deal_price搴� // saveOrUpdate(fileName) - //保存到楼栋库 + //淇濆瓨鍒版ゼ鏍嬪簱 saveToLoudong(fileName) - //保存到房号库 + //淇濆瓨鍒版埧鍙峰簱 // saveToHouseLoudong(fileName) } @@ -47,7 +47,7 @@ class ImportSearchData { def datas = ExcelUtils.read(fileName) for(int i = 31512; i $row" @@ -99,7 +99,7 @@ class ImportSearchData { static def saveToHouseLoudong(String fileName) { ExcelUtils.read(fileName).each({ row -> - String city = "上海" + String city = "涓婃捣" String region = RegionData.formatRegion(city, row[0]) String block = row[1] if ("NULL".equalsIgnoreCase(block)) { @@ -116,13 +116,13 @@ class ImportSearchData { String addr = row[4] double area = row[5] String type = row[6] - if ("未知".equals(type)) { + if ("鏈煡".equals(type)) { type = null } int totalPrice = (int) row[7] double avgPrice = row[8] - Date oriSignDate = row[9] //约定签约日期 - Date signDate = row[10] //签约日期 + Date oriSignDate = row[9] //绾﹀畾绛剧害鏃ユ湡 + Date signDate = row[10] //绛剧害鏃ユ湡 String agent = row[12] String houseNumber = row[13] @@ -138,7 +138,7 @@ class ImportSearchData { houseLoudng.room_num = roomNumber houseLoudng.build_type = type houseLoudng.house_area = area - houseLoudng.from = "网络搜索" + houseLoudng.from = "缃戠粶鎼滅储" houseLoudng.inside_pos = formatAddress if(StringUtils.isNotBlank(city) && StringUtils.isNotBlank(region) && StringUtils.isNotBlank(districtName) @@ -159,26 +159,26 @@ class ImportSearchData { } /** - * 格式化数据 + * 鏍煎紡鍖栨暟鎹� * @param fileName */ static def format(String fileName) { ExcelUtils.modify(fileName, { row -> - String city = "上海" + String city = "涓婃捣" String region = row['A'] String address = row['E'] row['A'] = RegionData.formatRegion(city, region) String formatHouseNumber = NewLoudongUtil.formatHouseNumber(address) String formatAddress = NewLoudongUtil.formatDistrictAddress(city, address) - if(address.contains('全幢')) { + if(address.contains('鍏ㄥ耿')) { formatHouseNumber = "1" } String roomNumber = null - if(address.matches('.+?村\\w+号\\w+室?')) { - roomNumber = address.replaceAll('.+?村\\w+号(\\w+)室?', '$1') - } else if(address.matches('.+?弄\\w+号\\w+室?')) { - roomNumber = address.replaceAll('.+?弄.*?\\w+号(\\w+)室?', '$1') + if(address.matches('.+?鏉慭\w+鍙穃\w+瀹�?')) { + roomNumber = address.replaceAll('.+?鏉慭\w+鍙�(\\w+)瀹�?', '$1') + } else if(address.matches('.+?寮刓\w+鍙穃\w+瀹�?')) { + roomNumber = address.replaceAll('.+?寮�.*?\\w+鍙�(\\w+)瀹�?', '$1') } if(formatHouseNumber) { row['N'] = formatHouseNumber @@ -195,14 +195,14 @@ class ImportSearchData { } /** - * 保存到Deal_Price库 + * 淇濆瓨鍒癉eal_Price搴� * @param fileName * @return */ static def saveOrUpdate(String fileName) { ExcelUtils.read(fileName).each({row-> - String city = "上海" + String city = "涓婃捣" String region = RegionData.formatRegion(city, row[0]) String block = row[1] if("NULL".equalsIgnoreCase(block)) { @@ -219,13 +219,13 @@ class ImportSearchData { String addr = row[4] double area = row[5] String type = row[6] - if("未知".equals(type)) { + if("鏈煡".equals(type)) { type = null } int totalPrice = (int)row[7] double avgPrice = row[8] - Date oriSignDate = row[9] //约定签约日期 - Date signDate = row[10] //签约日期 + Date oriSignDate = row[9] //绾﹀畾绛剧害鏃ユ湡 + Date signDate = row[10] //绛剧害鏃ユ湡 String agent = row[12] String houseNumber = row[13] @@ -244,7 +244,7 @@ class ImportSearchData { .append('region', region).append('district_name', districtName) .append('type', type).append('address', addr) .append('area', area).append('total_price', totalPrice) - .append('avg_price', avgPrice).append('source', '网络搜索') + .append('avg_price', avgPrice).append('source', '缃戠粶鎼滅储') .append('create_date', new Date()).append('trade_date', signDate) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/dealprice/ShaoxingE.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/dealprice/ShaoxingE.groovy index 3a8af8821..ca5e376c6 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/dealprice/ShaoxingE.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/dealprice/ShaoxingE.groovy @@ -16,7 +16,7 @@ import net.sf.json.JSONObject import org.apache.commons.lang.StringUtils /** - * 绍兴E网 + * 缁嶅叴E缃� * Created by linxsh on 2017/4/17. */ class ShaoxingE { @@ -25,15 +25,15 @@ class ShaoxingE { public static void main(String[] args) { - String city = "绍兴" - DBCursor dbCursor = SHAO_XING_E.find(new BasicDBObject('城市', city)).addOption(Bytes.QUERYOPTION_NOTIMEOUT) + String city = "缁嶅叴" + DBCursor dbCursor = SHAO_XING_E.find(new BasicDBObject('鍩庡競', city)).addOption(Bytes.QUERYOPTION_NOTIMEOUT) for(DBObject dbObject : dbCursor) { - String region = dbObject.区域 - String address = dbObject.地址 - String name = dbObject.小区名 - String type = dbObject.类型 - String area = dbObject.面积 + String region = dbObject.鍖哄煙 + String address = dbObject.鍦板潃 + String name = dbObject.灏忓尯鍚� + String type = dbObject.绫诲瀷 + String area = dbObject.闈㈢Н String formatRegion = AddressUtil.formatRegion(city, region) if(formatRegion == null) { @@ -44,7 +44,7 @@ class ShaoxingE { String formatHouseNumber = AddressUtil.formatHouseNumber(address) String unitNumber = AddressUtil.formatUnitNumber(address) String formatRoomNumber = null - if(address.contains("室")) { + if(address.contains("瀹�")) { formatRoomNumber = AddressUtil.formatRoomNumber(address) } String formatName = AddressUtil.formatDistrictName(city, name) @@ -60,7 +60,7 @@ class ShaoxingE { static String getRegionFromMap(String region) { String key = qqKeyPool.get() - String url = "http://apis.map.qq.com/ws/geocoder/v1/?address=绍兴市${URLEncoder.encode(region, "UTF-8")}&key=$key" + String url = "http://apis.map.qq.com/ws/geocoder/v1/?address=缁嶅叴甯�${URLEncoder.encode(region, "UTF-8")}&key=$key" String result = HttpRequestUtil.get(url, null) qqKeyPool.returnToPool(key) key = qqKeyPool.get() diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/district/DiffAddress.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/district/DiffAddress.groovy index a8ea77ee6..c79194eef 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/district/DiffAddress.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/district/DiffAddress.groovy @@ -11,7 +11,7 @@ import com.mongodb.DBObject import org.apache.commons.lang.StringUtils /** - * 导出小区库和楼栋库中的交集数据,并且地址不同的数据 + * 瀵煎嚭灏忓尯搴撳拰妤兼爧搴撲腑鐨勪氦闆嗘暟鎹紝骞朵笖鍦板潃涓嶅悓鐨勬暟鎹� * Created by linxsh on 2017/1/10. */ class DiffAddress { @@ -20,7 +20,7 @@ class DiffAddress { public static void main(String[] args) { DSCursor dsCursor = DbUtils.seaweed.find(new BasicDBObject('cat', 'district').append('visible', 0)) def datas = [] - datas << ["城市", '区域', '小区名', '小区库中地址', '小区库中地址别名', '楼栋库中地址'] + datas << ["鍩庡競", '鍖哄煙', '灏忓尯鍚�', '灏忓尯搴撲腑鍦板潃', '灏忓尯搴撲腑鍦板潃鍒悕', '妤兼爧搴撲腑鍦板潃'] for(DBObject dbObject : dsCursor) { String city = dbObject.city String region = dbObject.region @@ -55,7 +55,7 @@ class DiffAddress { } } - ExcelUtils.write("D://不同地址统计.xlsx", datas, 'results') + ExcelUtils.write("D://涓嶅悓鍦板潃缁熻.xlsx", datas, 'results') } def static String findDiffAddress(String city, String region, String name, final List addrList) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/district/ExportDuplicateData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/district/ExportDuplicateData.groovy index 5e99c6395..9973bcbd6 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/district/ExportDuplicateData.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/district/ExportDuplicateData.groovy @@ -19,11 +19,11 @@ import java.util.regex.Matcher import java.util.regex.Pattern /** - * 根据数据部给的Excel,查找小区库中已经存在的数据并导出 + * 鏍规嵁鏁版嵁閮ㄧ粰鐨凟xcel锛屾煡鎵惧皬鍖哄簱涓凡缁忓瓨鍦ㄧ殑鏁版嵁骞跺鍑� * Created by linxsh on 2017/1/9. */ class ExportDuplicateData { - private static final Pattern CHARSET_PATTERN = Pattern.compile('.*街\\d*号$|.*街\\d*弄$|.*路\\d*弄$|.*路\\d*号$|.*路\\d*-\\d*号$|.*街\\d*-\\d*号$', Pattern.CASE_INSENSITIVE); + private static final Pattern CHARSET_PATTERN = Pattern.compile('.*琛梊\d*鍙�$|.*琛梊\d*寮�$|.*璺痋\d*寮�$|.*璺痋\d*鍙�$|.*璺痋\d*-\\d*鍙�$|.*琛梊\d*-\\d*鍙�$', Pattern.CASE_INSENSITIVE); static final DBCollection SOURCE = MongoUtils.getCollectionByName("buildings", "deal_data", "192.168.10.47") @@ -48,20 +48,20 @@ class ExportDuplicateData { DbUtils.seaweed.update(new BasicDBObject('_id', dbObject.get('_id')), new BasicDBObject('$set', new BasicDBObject('status', 1))) }*/ -// String fileName = "C:\\Users\\ideoj\\Desktop\\数据部-楼栋库入库\\test\\楼栋数据提取小区20170117-蒲雪丽.xls"; -// String fileName = "C:\\Users\\ideoj\\Desktop\\数据部-楼栋库入库\\test\\楼栋数据提取小区20170117-黄.xls"; -// String fileName = "C:\\Users\\ideoj\\Desktop\\数据部-楼栋库入库\\test\\楼栋数据提取小区20170117-祝.xlsx"; -// String fileName = "C:\\Users\\ideoj\\Desktop\\数据部-楼栋库入库\\test\\楼栋数据提取小区20170117-BOBO.xls"; -// String fileName = "C:\\Users\\ideoj\\Desktop\\数据部-楼栋库入库\\test\\楼栋数据提取小区20170117-徐敏霞.xls"; -// String fileName = "C:\\Users\\ideoj\\Desktop\\楼栋数据提取小区20170117-徐敏霞.xls"; +// String fileName = "C:\\Users\\ideoj\\Desktop\\鏁版嵁閮�-妤兼爧搴撳叆搴揬\test\\妤兼爧鏁版嵁鎻愬彇灏忓尯20170117-钂查洩涓�.xls"; +// String fileName = "C:\\Users\\ideoj\\Desktop\\鏁版嵁閮�-妤兼爧搴撳叆搴揬\test\\妤兼爧鏁版嵁鎻愬彇灏忓尯20170117-榛�.xls"; +// String fileName = "C:\\Users\\ideoj\\Desktop\\鏁版嵁閮�-妤兼爧搴撳叆搴揬\test\\妤兼爧鏁版嵁鎻愬彇灏忓尯20170117-绁�.xlsx"; +// String fileName = "C:\\Users\\ideoj\\Desktop\\鏁版嵁閮�-妤兼爧搴撳叆搴揬\test\\妤兼爧鏁版嵁鎻愬彇灏忓尯20170117-BOBO.xls"; +// String fileName = "C:\\Users\\ideoj\\Desktop\\鏁版嵁閮�-妤兼爧搴撳叆搴揬\test\\妤兼爧鏁版嵁鎻愬彇灏忓尯20170117-寰愭晱闇�.xls"; +// String fileName = "C:\\Users\\ideoj\\Desktop\\妤兼爧鏁版嵁鎻愬彇灏忓尯20170117-寰愭晱闇�.xls"; // deleteAndSave(fileName) -// String fileName = "C:\\Users\\ideoj\\Desktop\\数据部-楼栋库入库\\楼栋数据提取小区20170116删除.xls"; - String fileName = "C:\\Users\\ideoj\\Desktop\\数据部-楼栋库入库\\20170204\\导出数据 (2).xlsx"; +// String fileName = "C:\\Users\\ideoj\\Desktop\\鏁版嵁閮�-妤兼爧搴撳叆搴揬\妤兼爧鏁版嵁鎻愬彇灏忓尯20170116鍒犻櫎.xls"; + String fileName = "C:\\Users\\ideoj\\Desktop\\鏁版嵁閮�-妤兼爧搴撳叆搴揬\20170204\\瀵煎嚭鏁版嵁 (2).xlsx"; deleteFromLoudong(fileName) // - /*ExcelUtils.modify("C:\\Users\\ideoj\\Desktop\\数据部-楼栋库入库\\楼栋数据提取小区-广场写字楼20170116.xls", {row-> + /*ExcelUtils.modify("C:\\Users\\ideoj\\Desktop\\鏁版嵁閮�-妤兼爧搴撳叆搴揬\妤兼爧鏁版嵁鎻愬彇灏忓尯-骞垮満鍐欏瓧妤�20170116.xls", {row-> String flag = null if(row.size() >= 12) { flag = row.get(11) @@ -78,7 +78,7 @@ class ExportDuplicateData { println dbObject LOUDONG.update(dbObject, new BasicDBObject('$set', new BasicDBObject('status', 0))) } - } else if(flag == '是') { + } else if(flag == '鏄�') { if(!exists(city, region, name.toUpperCase())) { println row @@ -93,29 +93,29 @@ class ExportDuplicateData { })*/ /*Set cache = new HashSet<>() - ExcelUtils.modify("C:\\Users\\ideoj\\Desktop\\数据部-楼栋库入库\\20170204\\地址更新(房号库与小区库).xlsx", {data-> + ExcelUtils.modify("C:\\Users\\ideoj\\Desktop\\鏁版嵁閮�-妤兼爧搴撳叆搴揬\20170204\\鍦板潃鏇存柊锛堟埧鍙峰簱涓庡皬鍖哄簱锛�.xlsx", {data-> String city = data['A'] String region = data['B'] String name = data['C'] String ldAddress = data['F'] if(!cache.add(city + "__" + region + "__" + name)) { - data['I'] = '重复' + data['I'] = '閲嶅' } DBObject dbObject = DbUtils.seaweed.findOne(new BasicDBObject('city', city).append('region', region).append('name', name) .append('visible', 0).append('cat', 'district')) if(dbObject!=null) { - data['H'] = '不存在' + data['H'] = '涓嶅瓨鍦�' String findAddress = dbObject.address BasicDBList addressAliases = dbObject.addr_alias if(StringUtils.isNotBlank(findAddress)) { if(findAddress.equals(ldAddress)) { - data['H'] = '已存在' + data['H'] = '宸插瓨鍦�' } else if(addressAliases != null && addressAliases.size() > 0) { for(Object alias : addressAliases) { if(alias.equals(ldAddress)) { - data['H'] = '已存在' + data['H'] = '宸插瓨鍦�' break } } @@ -124,17 +124,17 @@ class ExportDuplicateData { } })*/ - /*ExcelUtils.modify("C:\\Users\\ideoj\\Desktop\\数据部-楼栋库入库\\无地址数据汇总.xlsx", {data-> + /*ExcelUtils.modify("C:\\Users\\ideoj\\Desktop\\鏁版嵁閮�-妤兼爧搴撳叆搴揬\鏃犲湴鍧�鏁版嵁姹囨��.xlsx", {data-> String city = data['B'] String region = data['C'] String name = data['P'] if(exists(city, region, name)) { - data['U'] = '已存在' + data['U'] = '宸插瓨鍦�' } }, 4)*/ - /*ExcelUtils.modify("C:\\Users\\ideoj\\Desktop\\数据部-楼栋库入库\\楼栋数据提取小区20170123-徐敏霞.xls", {data-> + /*ExcelUtils.modify("C:\\Users\\ideoj\\Desktop\\鏁版嵁閮�-妤兼爧搴撳叆搴揬\妤兼爧鏁版嵁鎻愬彇灏忓尯20170123-寰愭晱闇�.xls", {data-> String city = data['B'] String region = data['C'] String formatAddress = data['Q'] @@ -189,7 +189,7 @@ class ExportDuplicateData { println row } - if(StringUtils.isNotBlank(flag) && flag == '删除') { + if(StringUtils.isNotBlank(flag) && flag == '鍒犻櫎') { if(StringUtils.isBlank(city) || StringUtils.isBlank(region) || StringUtils.isBlank(name)) { return false } @@ -209,7 +209,7 @@ class ExportDuplicateData { } /** - * 删除楼栋库中为“删除”的数据,并将标记为“是”的数据录入小区库 + * 鍒犻櫎妤兼爧搴撲腑涓衡�滃垹闄も�濈殑鏁版嵁锛屽苟灏嗘爣璁颁负鈥滄槸鈥濈殑鏁版嵁褰曞叆灏忓尯搴� * @param fileName * @return */ @@ -238,13 +238,13 @@ class ExportDuplicateData { } - if(StringUtils.isNotBlank(flag) && flag == '否') { + if(StringUtils.isNotBlank(flag) && flag == '鍚�') { /*DBObject dbObject = LOUDONG.findOne(new BasicDBObject('_id', new ObjectId(id))) if(dbObject != null) { println dbObject LOUDONG.update(dbObject, new BasicDBObject('$set', new BasicDBObject('status', 0))) }*/ - } else if(flag == '是') { + } else if(flag == '鏄�') { // name = name.toUpperCase() // oriName = oriName.toUpperCase() if(StringUtils.isNotBlank(addr)) { @@ -271,12 +271,12 @@ class ExportDuplicateData { // } // // int aliasFlag = 0 -// //判断name +// //鍒ゆ柇name // if(name != inDbName && !alias.contains(name)) { // alias.add(name) // aliasFlag = 1 // } -// /*//判断原name +// /*//鍒ゆ柇鍘焠ame // if(StringUtils.isNotBlank(oriName) && !oriName.equals(inDbName) && !alias.contains(oriName)) { // alias.add(oriName) // aliasFlag = 1 @@ -316,9 +316,9 @@ class ExportDuplicateData { if(name != null) { name = name.replace("?", "") } - String estate_type2 = "普通住宅" - if(name.contains("别墅")){ - estate_type2 = "别墅" + String estate_type2 = "鏅�氫綇瀹�" + if(name.contains("鍒")){ + estate_type2 = "鍒" } BasicDBObject data = new BasicDBObject("c_date", new Date()) data.append("cat", "district") @@ -326,7 +326,7 @@ class ExportDuplicateData { Matcher matcher = CHARSET_PATTERN.matcher(name); if (matcher.find()) { alias << name - name = name + "小区" + name = name + "灏忓尯" } data.append("name", name) data.append("alias", alias) @@ -335,19 +335,19 @@ class ExportDuplicateData { data.append("estate_type2", estate_type2) data.append("city", city) data.append("region", region) - //高德 + //楂樺痉 data.append("lng", (long)row[5]) data.append("lat",(long)row[6]) - //百度 + //鐧惧害 data.append("lng2", (long)row[7]) data.append("lat2", (long)row[8]) - //腾讯 + //鑵捐 data.append("lng3", (long)row[9]) data.append("lat3", (long)row[10]) Map markMap = new HashMap() - markMap.put("data_source", "机器入库") + markMap.put("data_source", "鏈哄櫒鍏ュ簱") data.append("mark_map", markMap); data.append("ip", "MACHINE_SAVE") data.append("status", 0) @@ -364,7 +364,7 @@ class ExportDuplicateData { } /** - * 查看库中是否已存在 + * 鏌ョ湅搴撲腑鏄惁宸插瓨鍦� * @param city * @param region * @param name diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/district/ImportYungujiaToDistrict.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/district/ImportYungujiaToDistrict.groovy index f4011678b..694753096 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/district/ImportYungujiaToDistrict.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/district/ImportYungujiaToDistrict.groovy @@ -10,7 +10,7 @@ import com.mongodb.DBObject import org.apache.commons.lang.StringUtils /** - * 云估价数据录入小区库 + * 浜戜及浠锋暟鎹綍鍏ュ皬鍖哄簱 * Created by linxsh on 2017/4/24. */ class ImportYungujiaToDistrict { @@ -20,28 +20,28 @@ class ImportYungujiaToDistrict { } static void importExcelData() { - String fileName = "C:\\Users\\ideoj\\Desktop\\数据部-楼栋库入库\\20170424\\云估价数据统计-只有云估价存在_1__2_.xlsx" + String fileName = "C:\\Users\\ideoj\\Desktop\\鏁版嵁閮�-妤兼爧搴撳叆搴揬\20170424\\浜戜及浠锋暟鎹粺璁�-鍙湁浜戜及浠峰瓨鍦╛1__2_.xlsx" def datas = ExcelUtils.read(fileName) - String city = "贵阳" + String city = "璐甸槼" datas.each {row-> String oriName = row[2] String address = row[7] String region = row[9] if(StringUtils.isNotBlank(region)) { - region = region.replace("区", "") + region = region.replace("鍖�", "") } String inDbName = row[10] String mark = row[11] - if(mark == '新增') { + if(mark == '鏂板') { DBObject findObj = findInSeaweed(city, region, inDbName) if(findObj == null) { - DBObject saveObj = new BasicDBObject("city", "贵阳").append("region", region).append("name", inDbName) + DBObject saveObj = new BasicDBObject("city", "璐甸槼").append("region", region).append("name", inDbName) .append("address", address).append('cat', 'district').append("c_date", new Date()) .append("m_date", new Date()).append("addr_alias", []).append('alias', []) Map markMap = new HashMap() - markMap.put("data_source", "机器入库") + markMap.put("data_source", "鏈哄櫒鍏ュ簱") saveObj.append("mark_map", markMap); saveObj.append("ip", "MACHINE_SAVE") saveObj.append("status", 0) @@ -66,7 +66,7 @@ class ImportYungujiaToDistrict { new BasicDBObject('alias', alias))) } - //地址别名 + //鍦板潃鍒悕 if (AddressUtil.isStandardAddress(address)) { if (address != findObj.address) { def addrAlias = findObj.addr_alias diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/district/RemoveDuplicateData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/district/RemoveDuplicateData.groovy index 908e75e88..0c44b2708 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/district/RemoveDuplicateData.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/district/RemoveDuplicateData.groovy @@ -12,7 +12,7 @@ import com.mongodb.DBObject import org.apache.commons.lang.StringUtils /** - * 去除小区库中的重复数据 + * 鍘婚櫎灏忓尯搴撲腑鐨勯噸澶嶆暟鎹� * Created by linxsh on 2017/1/9. */ class RemoveDuplicateData { @@ -28,7 +28,7 @@ class RemoveDuplicateData { } } - /*def cities = ['红河', '大理', '楚雄', '昌吉', '阿克苏'] + /*def cities = ['绾㈡渤', '澶х悊', '妤氶泟', '鏄屽悏', '闃垮厠鑻�'] for(def city : cities) { DSCursor dsCursor = DbUtils.seaweed.find(new BasicDBObject('cat', 'district').append('visible', 0).append('city', city)) for(DBObject dbObject : dsCursor) { @@ -82,9 +82,9 @@ class RemoveDuplicateData { } def static exportToExcel() { - def cities = ['红河', '大理', '楚雄', '昌吉', '阿克苏'] + def cities = ['绾㈡渤', '澶х悊', '妤氶泟', '鏄屽悏', '闃垮厠鑻�'] def datas = [] - datas << ['城市', '区域', '小区名', '别名', '经纬度(百度)','经纬度(百度)','经纬度(mapabc)','经纬度(mapabc)', '经纬度(腾讯)','经纬度(腾讯)','地址', '地址别名','物业类型', '建筑类型'] + datas << ['鍩庡競', '鍖哄煙', '灏忓尯鍚�', '鍒悕', '缁忕含搴︼紙鐧惧害锛�','缁忕含搴︼紙鐧惧害锛�','缁忕含搴︼紙mapabc锛�','缁忕含搴︼紙mapabc锛�', '缁忕含搴︼紙鑵捐锛�','缁忕含搴︼紙鑵捐锛�','鍦板潃', '鍦板潃鍒悕','鐗╀笟绫诲瀷', '寤虹瓚绫诲瀷'] for(def city : cities) { DSCursor dsCursor = DbUtils.seaweed.find(new BasicDBObject('cat', 'district').append('visible', 0).append('city', city)) for(DBObject dbObject : dsCursor) { @@ -112,6 +112,6 @@ class RemoveDuplicateData { } } - ExcelUtils.write("C:\\Users\\ideoj\\Desktop\\小区库统计.xlsx", datas, 'results') + ExcelUtils.write("C:\\Users\\ideoj\\Desktop\\灏忓尯搴撶粺璁�.xlsx", datas, 'results') } } \ No newline at end of file diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/district/UpdateAddress.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/district/UpdateAddress.groovy index 477409b57..79d43d4fd 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/district/UpdateAddress.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/district/UpdateAddress.groovy @@ -8,7 +8,7 @@ import com.mongodb.DBObject import org.apache.commons.lang.StringUtils import org.apache.commons.lang.math.NumberUtils -/** 根据数据部给的Excel更新小区库中地址 +/** 鏍规嵁鏁版嵁閮ㄧ粰鐨凟xcel鏇存柊灏忓尯搴撲腑鍦板潃 * Created by linxsh on 2017/2/6. */ @@ -18,14 +18,14 @@ class UpdateAddress { } /** - * 更新规则: - * I列为空,H列不做筛选(即全部),G列为1的更新别名、为空的更新地址 + * 鏇存柊瑙勫垯锛� + * I鍒椾负绌猴紝H鍒椾笉鍋氱瓫閫夛紙鍗冲叏閮級锛孏鍒椾负1鐨勬洿鏂板埆鍚嶃�佷负绌虹殑鏇存柊鍦板潃 */ static void updateAddr1() { -// String fileName = "C:\\Users\\ideoj\\Desktop\\数据部-楼栋库入库\\20170206\\地址更新(房号库与小区库).xlsx" -// String fileName = "C:\\Users\\ideoj\\Desktop\\数据部-楼栋库入库\\20170209\\不同地址统计-黄.xlsx" -// String fileName = "C:\\Users\\ideoj\\Desktop\\数据部-楼栋库入库\\20170209\\不同地址统计-祝.xlsx" - String fileName = "C:\\Users\\ideoj\\Desktop\\数据部-楼栋库入库\\20170209\\不同地址-BOBO.xlsx" +// String fileName = "C:\\Users\\ideoj\\Desktop\\鏁版嵁閮�-妤兼爧搴撳叆搴揬\20170206\\鍦板潃鏇存柊锛堟埧鍙峰簱涓庡皬鍖哄簱锛�.xlsx" +// String fileName = "C:\\Users\\ideoj\\Desktop\\鏁版嵁閮�-妤兼爧搴撳叆搴揬\20170209\\涓嶅悓鍦板潃缁熻-榛�.xlsx" +// String fileName = "C:\\Users\\ideoj\\Desktop\\鏁版嵁閮�-妤兼爧搴撳叆搴揬\20170209\\涓嶅悓鍦板潃缁熻-绁�.xlsx" + String fileName = "C:\\Users\\ideoj\\Desktop\\鏁版嵁閮�-妤兼爧搴撳叆搴揬\20170209\\涓嶅悓鍦板潃-BOBO.xlsx" List> datas = ExcelUtils.read(fileName) for(List data : datas) { String city = data[0] @@ -46,7 +46,7 @@ class UpdateAddress { .append('name', name).append('cat', 'district').append('visible', 0) DBObject dbObject = DbUtils.seaweed.findOne(query) if(dbObject != null) { - if ("1".equals(flagG)) {//加别名 + if ("1".equals(flagG)) {//鍔犲埆鍚� BasicDBList addressAlias = dbObject.addr_alias if(addressAlias == null) { addressAlias = new BasicDBList() @@ -56,7 +56,7 @@ class UpdateAddress { DbUtils.seaweed.update(new BasicDBObject('_id', dbObject.get('_id')), new BasicDBObject('$set', new BasicDBObject('addr_alias', addressAlias))) } - } else if (StringUtils.isBlank(flagG)) {//替换 + } else if (StringUtils.isBlank(flagG)) {//鏇挎崲 /*BasicDBList alias = dbObject.addr_alias if (alias == null) { alias = new BasicDBList() diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/export/DelLoudongDistrict.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/export/DelLoudongDistrict.groovy index 5fb3cd01d..3805e9b64 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/export/DelLoudongDistrict.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/export/DelLoudongDistrict.groovy @@ -11,7 +11,7 @@ import com.mongodb.WriteResult import org.bson.types.ObjectId /** - * 根据数据部给的Excel,将楼栋库中的非楼栋数据删除 + * 鏍规嵁鏁版嵁閮ㄧ粰鐨凟xcel锛屽皢妤兼爧搴撲腑鐨勯潪妤兼爧鏁版嵁鍒犻櫎 * Created by linxsh on 2016/11/22. */ class DelLoudongDistrict { @@ -22,7 +22,7 @@ class DelLoudongDistrict { // static def fields = ['city', 'region', 'addr', 'format_addr', 'format_name', 'format_house_num', 'format_room_num'] public static void main(String[] args) { - List> datas = ExcelUtils.read("C:\\Users\\ideoj\\Desktop\\数据部待删除数据\\楼栋数据提取小区-叶2.xlsx", 0, 1) + List> datas = ExcelUtils.read("C:\\Users\\ideoj\\Desktop\\鏁版嵁閮ㄥ緟鍒犻櫎鏁版嵁\\妤兼爧鏁版嵁鎻愬彇灏忓尯-鍙�2.xlsx", 0, 1) for(List data : datas) { String id = data.get(1) if(LOUDONG.findOne(new BasicDBObject('_id', new ObjectId(id))) != null) { @@ -35,13 +35,13 @@ class DelLoudongDistrict { String name = data.get(4) // String flag = data.get(data.size()-1) - name = name.replace("?", "").replaceAll('[\\((].+[\\))]$', "") + name = name.replace("?", "").replaceAll('[\\(锛圿.+[\\)锛塢$', "") if(true) { DBObject query = new BasicDBObject('city', city).append('region', region).append('name', name) /*WriteResult wr = LOUDONG.remove(query) WriteResult wr2 = LOUDONG2.remove(query) - println "$city-$region-$name\t本地: " + wr.n + "\t线上:" + wr2.n*/ + println "$city-$region-$name\t鏈湴: " + wr.n + "\t绾夸笂锛�" + wr2.n*/ } } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/export/ExportEvaluationToLoudong.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/export/ExportEvaluationToLoudong.groovy index 620da90b2..e90ac04e4 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/export/ExportEvaluationToLoudong.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/export/ExportEvaluationToLoudong.groovy @@ -23,7 +23,7 @@ class ExportEvaluationToLoudong { public static final DBCollection DISTINCT_ROOM2 = MongoUtils.getCollectionByName("distinct", "room2", "192.168.10.47") public static void main(String[] args) { - Pattern pattern = Pattern.compile("[\\((].*[\\))]") + Pattern pattern = Pattern.compile("[\\(锛圿.*[\\)锛塢") DBCursor dbCursor = DISTINCT_ROOM2.find(new BasicDBObject('ipCount', new BasicDBObject('$gt', 2))).addOption(Bytes.QUERYOPTION_NOTIMEOUT) // LoudongUtil loudongUtil = LoudongUtil.create("192.168.10.47", "buildings", "loudong") LoudongUtil loudongUtil = LoudongUtil.create("mongo.db.fangjia.com", "fangjia_base", "loudong") @@ -59,7 +59,7 @@ class ExportEvaluationToLoudong { } areasMap.put(findObj['area'], count+1) } - if(findObj['build_type'] != null && !findObj['build_type'].endsWith('层')) { + if(findObj['build_type'] != null && !findObj['build_type'].endsWith('灞�')) { Integer count = typeMap.get(findObj['build_type']) if(count == null) { count = 0 @@ -83,7 +83,7 @@ class ExportEvaluationToLoudong { } println "$name -> $formatName\t$houseNumber -> $formatHouseNumber \t" + floorsMap + "::"+floors+"\t"+areasMap+"::" + area - loudongUtil.saveOrUpdate(saveObj, "评估记录") + loudongUtil.saveOrUpdate(saveObj, "璇勪及璁板綍") } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/export/Test.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/export/Test.groovy index 92b3cbf60..0bd0d7618 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/export/Test.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/export/Test.groovy @@ -31,12 +31,12 @@ class Test { public static void main(String[] args) { NewLoudongUtil loudongUtil = NewLoudongUtil.create("192.168.10.47", "buildings", "loudong") // NewLoudongUtil loudongUtil = NewLoudongUtil.create("mongo.db.fangjia.com", "fangjia_base", "loudong") - List> datas = ExcelUtils.read("C:\\Users\\ideoj\\Desktop\\楼栋库物业类型-删除非住宅类型.xlsx", 0, 1) + List> datas = ExcelUtils.read("C:\\Users\\ideoj\\Desktop\\妤兼爧搴撶墿涓氱被鍨�-鍒犻櫎闈炰綇瀹呯被鍨�.xlsx", 0, 1) int count = 0 for(List data : datas) { String type = data[0] String flag = data[2] - if("删除".equals(flag)) { + if("鍒犻櫎".equals(flag)) { WriteResult wr = LOUDONG.remove(new BasicDBObject('type', type)) count+=wr.n } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/formatloudong/Fuzhou.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/formatloudong/Fuzhou.groovy index 604ce2708..556da86d9 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/formatloudong/Fuzhou.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/formatloudong/Fuzhou.groovy @@ -23,7 +23,7 @@ import java.util.concurrent.Semaphore import java.util.concurrent.atomic.AtomicInteger /** - * 福州房管局 + * 绂忓窞鎴跨灞� * Created by linxsh on 2017/3/15. */ class Fuzhou { @@ -38,7 +38,7 @@ class Fuzhou { static void main(String[] args) { // format() - //提取房号信息 + //鎻愬彇鎴垮彿淇℃伅 // exportRoomInfos() // saveToHouseLoudong() @@ -47,7 +47,7 @@ class Fuzhou { } static void saveToLoudong() { - String filename = "C:\\Users\\ideoj\\Desktop\\数据部-楼栋库入库\\20170316\\福州房管局-小区名(入库).xlsx" + String filename = "C:\\Users\\ideoj\\Desktop\\鏁版嵁閮�-妤兼爧搴撳叆搴揬\20170316\\绂忓窞鎴跨灞�-灏忓尯鍚�(鍏ュ簱).xlsx" List> datas = ExcelUtils.read(filename) Map districtMap = Maps.newHashMap() for(List data : datas) { @@ -60,14 +60,14 @@ class Fuzhou { int index = 0 for(Map.Entry entry : districtMap.entrySet()) { println "start loudong (${++index})" - DBCursor dbCursor = LD.find(new BasicDBObject("city", "福州").append("f_name", entry.getKey())).addOption(Bytes.QUERYOPTION_NOTIMEOUT) + DBCursor dbCursor = LD.find(new BasicDBObject("city", "绂忓窞").append("f_name", entry.getKey())).addOption(Bytes.QUERYOPTION_NOTIMEOUT) for(DBObject dbObject : dbCursor) { String city = dbObject.city String region = dbObject.f_region String name = entry.getValue() String houseNumber = dbObject.f_house_num String address = dbObject.f_addr - String from = "房管局" + String from = "鎴跨灞�" Loudong loudong = new Loudong() @@ -88,7 +88,7 @@ class Fuzhou { } static def saveToHouseLoudong() { - String filename = "C:\\Users\\ideoj\\Desktop\\数据部-楼栋库入库\\20170316\\福州房管局-小区名(入库).xlsx" + String filename = "C:\\Users\\ideoj\\Desktop\\鏁版嵁閮�-妤兼爧搴撳叆搴揬\20170316\\绂忓窞鎴跨灞�-灏忓尯鍚�(鍏ュ簱).xlsx" List> datas = ExcelUtils.read(filename) Map districtMap = Maps.newHashMap() for(List data : datas) { @@ -106,7 +106,7 @@ class Fuzhou { @Override void run() { try { - DBCursor dbCursor = TARGET.find(new BasicDBObject("city", '福州').append("name", entry.getKey())).batchSize(500).addOption(Bytes.QUERYOPTION_NOTIMEOUT) + DBCursor dbCursor = TARGET.find(new BasicDBObject("city", '绂忓窞').append("name", entry.getKey())).batchSize(500).addOption(Bytes.QUERYOPTION_NOTIMEOUT) for(DBObject dbObject : dbCursor) { DBObject query = new BasicDBObject('city', dbObject.city).append('region', dbObject.region).append('name', entry.value) .append('house_num', dbObject.house_num).append('house_num_unit', dbObject.house_num_unit).append('room_num', dbObject.room_num) @@ -128,7 +128,7 @@ class Fuzhou { } static void exportRoomInfos() { - DBCursor dbCursor = LD.find(new BasicDBObject("city", "福州")).addOption(Bytes.QUERYOPTION_NOTIMEOUT) + DBCursor dbCursor = LD.find(new BasicDBObject("city", "绂忓窞")).addOption(Bytes.QUERYOPTION_NOTIMEOUT) for(DBObject dbObject : dbCursor) { String city = dbObject.city String region = dbObject.f_region @@ -144,23 +144,23 @@ class Fuzhou { String roomNumber = (String) roomObj.get("num"); String type = (String)roomObj.get('type') String unitNumber = "--" - if(type != null && type.matches('.*(商业|地下|车|商铺|写字楼)')) { + if(type != null && type.matches('.*(鍟嗕笟|鍦颁笅|杞鍟嗛摵|鍐欏瓧妤�)')) { continue } Integer floor = roomObj.get('floor') if(floor==null || floor <= 0) { floor = -1 } - if(StringUtils.isBlank(roomNumber) || roomNumber.contains('储藏') || roomNumber.startsWith("负") || roomNumber.contains('车')) { + if(StringUtils.isBlank(roomNumber) || roomNumber.contains('鍌ㄨ棌') || roomNumber.startsWith("璐�") || roomNumber.contains('杞�')) { continue - } else if(roomNumber.matches('^\\w+室$')) { - roomNumber = StringUtils.substringBefore(roomNumber, '室') - } else if(roomNumber.matches('^\\w+单元$')){ - roomNumber = StringUtils.substringBefore(roomNumber, '单元') - } else if(roomNumber.matches('^.*?[\\w一二三四五六七八九十]+(单元|梯)\\w+室?$')) { - unitNumber = roomNumber.replaceAll('^.*?([\\w一二三四五六七八九十]+)(?:单元|梯)\\w+室?$', '$1') + } else if(roomNumber.matches('^\\w+瀹�$')) { + roomNumber = StringUtils.substringBefore(roomNumber, '瀹�') + } else if(roomNumber.matches('^\\w+鍗曞厓$')){ + roomNumber = StringUtils.substringBefore(roomNumber, '鍗曞厓') + } else if(roomNumber.matches('^.*?[\\w涓�浜屼笁鍥涗簲鍏竷鍏節鍗乚+(鍗曞厓|姊�)\\w+瀹�?$')) { + unitNumber = roomNumber.replaceAll('^.*?([\\w涓�浜屼笁鍥涗簲鍏竷鍏節鍗乚+)(?:鍗曞厓|姊�)\\w+瀹�?$', '$1') - roomNumber = roomNumber.replaceAll('^.*?(?:[\\w一二三四五六七八九十]+)(?:单元|梯)(\\w+)室?$', '$1') + roomNumber = roomNumber.replaceAll('^.*?(?:[\\w涓�浜屼笁鍥涗簲鍏竷鍏節鍗乚+)(?:鍗曞厓|姊�)(\\w+)瀹�?$', '$1') while (roomNumber.startsWith("0") || roomNumber.startsWith("-")) { roomNumber = roomNumber.substring(1) } @@ -203,7 +203,7 @@ class Fuzhou { houseLoudng.direction = direction houseLoudng.c_date = new Date() houseLoudng.m_date = new Date() - houseLoudng.from = "房管局" + houseLoudng.from = "鎴跨灞�" DBObject saveObj = new BasicDBObject(new BeanMap(houseLoudng)) saveObj.removeField('class') @@ -220,7 +220,7 @@ class Fuzhou { } static def format() { - DBCursor dbCursor = LD.find(new BasicDBObject("city", "福州")).addOption(Bytes.QUERYOPTION_NOTIMEOUT) + DBCursor dbCursor = LD.find(new BasicDBObject("city", "绂忓窞")).addOption(Bytes.QUERYOPTION_NOTIMEOUT) for(DBObject dbObject : dbCursor) { String formatRegion = formatRegion(dbObject) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/formatloudong/HandleAddress.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/formatloudong/HandleAddress.groovy index 3d46eda96..f75a21900 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/formatloudong/HandleAddress.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/formatloudong/HandleAddress.groovy @@ -29,7 +29,7 @@ class HandleAddress { private static ExecutorService exec = Executors.newCachedThreadPool() public static void main(String[] args) { - Pattern pattern = Pattern.compile('^市(?!光路|一路|心中路|心南路|心北路|府大路|场三路|南公路|府东路).{2,}路.+$') + Pattern pattern = Pattern.compile('^甯�(?!鍏夎矾|涓�璺瘄蹇冧腑璺瘄蹇冨崡璺瘄蹇冨寳璺瘄搴滃ぇ璺瘄鍦轰笁璺瘄鍗楀叕璺瘄搴滀笢璺�).{2,}璺�.+$') DBCursor dbCursor = local.find(new BasicDBObject("addr", pattern)).addOption(Bytes.QUERYOPTION_NOTIMEOUT) Set cache = Sets.newHashSet() def datas = [] @@ -52,7 +52,7 @@ class HandleAddress { } } -// ExcelUtils.write("D://临时文件.xlsx", datas, "sheet") +// ExcelUtils.write("D://涓存椂鏂囦欢.xlsx", datas, "sheet") } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/formatloudong/HandleBuyData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/formatloudong/HandleBuyData.groovy index 7d23bb626..153805ec8 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/formatloudong/HandleBuyData.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/formatloudong/HandleBuyData.groovy @@ -10,7 +10,7 @@ import groovy.sql.Sql import java.sql.SQLException /** - * 成交数据 + * 鎴愪氦鏁版嵁 * Created by linxsh on 2016/11/17. */ class HandleBuyData { @@ -40,7 +40,7 @@ class HandleBuyData { def signDate = row.signcontract_date def floor = row.floor - DBObject saveObj = new BasicDBObject("city", "上海").append("region", region).append("block", block) + DBObject saveObj = new BasicDBObject("city", "涓婃捣").append("region", region).append("block", block) .append("name", districtName).append("addr", address).append("area", area) .append("agency", agency).append("t_price", total_price).append("price", avg_price) .append("sign_date", signDate).append("floor", floor) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/formatloudong/HandleGuguAddress.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/formatloudong/HandleGuguAddress.groovy index 093afff4c..c503e275e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/formatloudong/HandleGuguAddress.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/formatloudong/HandleGuguAddress.groovy @@ -25,35 +25,35 @@ class HandleGuguAddress { if(dbObject.containsField('format_room_num') || dbObject.containsField('format_house_num') || dbObject.containsField('status')) { continue } - if(address.matches('.+?\\w+弄(\\w+支弄)?[-\\w甲乙丙丁戊戌]+号(\\w+室?)?')) { - houseNumber = address.replaceAll('.+?\\w+弄(?:\\w+支弄)?([-\\w甲乙丙丁戊戌]+)号(?:\\w+室?)?', '$1') - if(address.matches('.+?\\w+弄(\\w+支弄)?[-\\w甲乙丙丁戊戌]+号(\\w+室?)')) { - roomNumber = address.replaceAll('.+?\\w+弄(?:\\w+支弄)?[-\\w甲乙丙丁戊戌]+号(\\w+)室?', '$1') + if(address.matches('.+?\\w+寮�(\\w+鏀紕)?[-\\w鐢蹭箼涓欎竵鎴婃垖]+鍙�(\\w+瀹�?)?')) { + houseNumber = address.replaceAll('.+?\\w+寮�(?:\\w+鏀紕)?([-\\w鐢蹭箼涓欎竵鎴婃垖]+)鍙�(?:\\w+瀹�?)?', '$1') + if(address.matches('.+?\\w+寮�(\\w+鏀紕)?[-\\w鐢蹭箼涓欎竵鎴婃垖]+鍙�(\\w+瀹�?)')) { + roomNumber = address.replaceAll('.+?\\w+寮�(?:\\w+鏀紕)?[-\\w鐢蹭箼涓欎竵鎴婃垖]+鍙�(\\w+)瀹�?', '$1') } - } else if(address.matches('.+村[-\\w甲乙丙丁戊戌]+号(\\w+室?)?')) { - houseNumber = address.replaceAll('.+村([-\\w甲乙丙丁戊戌]+)号(?:\\w+室?)?', '$1') - if(address.matches('.+村[-\\w甲乙丙丁戊戌]+号(\\w+室?)')) { - roomNumber = address.replaceAll('.+村[-\\w甲乙丙丁戊戌]+号(\\w+)室?', '$1') + } else if(address.matches('.+鏉慬-\\w鐢蹭箼涓欎竵鎴婃垖]+鍙�(\\w+瀹�?)?')) { + houseNumber = address.replaceAll('.+鏉�([-\\w鐢蹭箼涓欎竵鎴婃垖]+)鍙�(?:\\w+瀹�?)?', '$1') + if(address.matches('.+鏉慬-\\w鐢蹭箼涓欎竵鎴婃垖]+鍙�(\\w+瀹�?)')) { + roomNumber = address.replaceAll('.+鏉慬-\\w鐢蹭箼涓欎竵鎴婃垖]+鍙�(\\w+)瀹�?', '$1') } - } else if(address.matches('.+村[-\\w甲乙丙丁戊戌]+幢[-\\w甲乙丙丁戊戌]+号(\\w+室?)?')) { - houseNumber = address.replaceAll('.+村[-\\w甲乙丙丁戊戌]+幢([-\\w甲乙丙丁戊戌]+)号(?:\\w+室?)?', '$1') - if(address.matches('.+村[-\\w甲乙丙丁戊戌]+幢([-\\w甲乙丙丁戊戌]+号)\\w+室?')) { - roomNumber = address.replaceAll('.+村[-\\w甲乙丙丁戊戌]+幢[-\\w甲乙丙丁戊戌]+号(\\w+)室?', '$1') + } else if(address.matches('.+鏉慬-\\w鐢蹭箼涓欎竵鎴婃垖]+骞-\\w鐢蹭箼涓欎竵鎴婃垖]+鍙�(\\w+瀹�?)?')) { + houseNumber = address.replaceAll('.+鏉慬-\\w鐢蹭箼涓欎竵鎴婃垖]+骞�([-\\w鐢蹭箼涓欎竵鎴婃垖]+)鍙�(?:\\w+瀹�?)?', '$1') + if(address.matches('.+鏉慬-\\w鐢蹭箼涓欎竵鎴婃垖]+骞�([-\\w鐢蹭箼涓欎竵鎴婃垖]+鍙�)\\w+瀹�?')) { + roomNumber = address.replaceAll('.+鏉慬-\\w鐢蹭箼涓欎竵鎴婃垖]+骞-\\w鐢蹭箼涓欎竵鎴婃垖]+鍙�(\\w+)瀹�?', '$1') } - } else if(address.matches('.+?\\w+弄(\\w+支弄)?(\\w+)幢\\w+号(\\w+室?)?')){ - houseNumber = address.replaceAll('.+?\\w+弄(?:\\w+支弄)?(?:\\w+)幢(\\w+)号(\\w+室?)?', '$1') - if(address.matches('.+?\\w+弄(?:\\w+支弄)?(?:\\w+)幢(\\w+)号(\\w+室?)')) { - roomNumber = address.replaceAll('.+?\\w+弄(?:\\w+支弄)?(?:\\w+)幢\\w+号(\\w+)室?', '$1') + } else if(address.matches('.+?\\w+寮�(\\w+鏀紕)?(\\w+)骞\w+鍙�(\\w+瀹�?)?')){ + houseNumber = address.replaceAll('.+?\\w+寮�(?:\\w+鏀紕)?(?:\\w+)骞�(\\w+)鍙�(\\w+瀹�?)?', '$1') + if(address.matches('.+?\\w+寮�(?:\\w+鏀紕)?(?:\\w+)骞�(\\w+)鍙�(\\w+瀹�?)')) { + roomNumber = address.replaceAll('.+?\\w+寮�(?:\\w+鏀紕)?(?:\\w+)骞\w+鍙�(\\w+)瀹�?', '$1') } - } else if(address.matches('.+路[-\\w]+号.*[-\\w]+号([-\\w]+室?)?')) { - houseNumber = address.replaceAll('.+路[-\\w]+号.*?([-\\w]+)号(?:[-\\w]+室?)?', '$1') - if(address.matches('.+路[-\\w]+号.*[-\\w]+号([-\\w]+室?)')) { - roomNumber = address.replaceAll('.+路[-\\w]+号.*?[-\\w]+号([-\\w]+)室?', '$1') + } else if(address.matches('.+璺痆-\\w]+鍙�.*[-\\w]+鍙�([-\\w]+瀹�?)?')) { + houseNumber = address.replaceAll('.+璺痆-\\w]+鍙�.*?([-\\w]+)鍙�(?:[-\\w]+瀹�?)?', '$1') + if(address.matches('.+璺痆-\\w]+鍙�.*[-\\w]+鍙�([-\\w]+瀹�?)')) { + roomNumber = address.replaceAll('.+璺痆-\\w]+鍙�.*?[-\\w]+鍙�([-\\w]+)瀹�?', '$1') } - } else if(address.matches(".+村(.*?)([-\\w甲乙丙丁戊戌]+幢)?[-\\w甲乙丙丁戊戌]+号(\\w+室?)?")) { - houseNumber = address.replaceAll('.+村.*?(?:[-\\w甲乙丙丁戊戌]+幢)?([-\\w甲乙丙丁戊戌]+)号(?:\\w+室?)?', '$1') - if(address.matches('.+村.*?([-\\w甲乙丙丁戊戌]+幢)?[-\\w甲乙丙丁戊戌]+号\\w+室?')) { - roomNumber = address.replaceAll('.+村.*?(?:[-\\w甲乙丙丁戊戌]+幢)?[-\\w甲乙丙丁戊戌]+号(\\w+)室?', '$1') + } else if(address.matches(".+鏉�(.*?)([-\\w鐢蹭箼涓欎竵鎴婃垖]+骞�)?[-\\w鐢蹭箼涓欎竵鎴婃垖]+鍙�(\\w+瀹�?)?")) { + houseNumber = address.replaceAll('.+鏉�.*?(?:[-\\w鐢蹭箼涓欎竵鎴婃垖]+骞�)?([-\\w鐢蹭箼涓欎竵鎴婃垖]+)鍙�(?:\\w+瀹�?)?', '$1') + if(address.matches('.+鏉�.*?([-\\w鐢蹭箼涓欎竵鎴婃垖]+骞�)?[-\\w鐢蹭箼涓欎竵鎴婃垖]+鍙穃\w+瀹�?')) { + roomNumber = address.replaceAll('.+鏉�.*?(?:[-\\w鐢蹭箼涓欎竵鎴婃垖]+骞�)?[-\\w鐢蹭箼涓欎竵鎴婃垖]+鍙�(\\w+)瀹�?', '$1') } } else { println address diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/formatloudong/HandleName.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/formatloudong/HandleName.groovy index ff640401e..ef28d83af 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/formatloudong/HandleName.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/formatloudong/HandleName.groovy @@ -30,8 +30,8 @@ class HandleName { String address = dbObject.get("addr"); int status = dbObject.get("status"); - if(name.endsWith("小区")) { - String newName = name.replace("小区", "") + if(name.endsWith("灏忓尯")) { + String newName = name.replace("灏忓尯", "") /*DBObject findObj = LOUDONG.findOne(new BasicDBObject('city', city).append('region', region) .append('$or', ImmutableList.of(new BasicDBObject('name', newName), new BasicDBObject('alias', newName))))*/ @@ -52,13 +52,13 @@ class HandleName { if(StringUtils.isBlank(number) || number.matches('\\D+')) { return null } - def units = ['十', '百', '千', '万', '十万', '百万', '千万', '亿'] - def numberMap = ['0':'零', '1': '一', '2': '二', '3': '三', '4': '四', '5':'五', '6':'六', '7':'七', '8': '八', '9':'九'] + def units = ['鍗�', '鐧�', '鍗�', '涓�', '鍗佷竾', '鐧句竾', '鍗冧竾', '浜�'] + def numberMap = ['0':'闆�', '1': '涓�', '2': '浜�', '3': '涓�', '4': '鍥�', '5':'浜�', '6':'鍏�', '7':'涓�', '8': '鍏�', '9':'涔�'] String result = numberMap.get(number[-1]) for(int i=0; i < number.length()-1; ++i) { def data = number[- i - 2] if(data == '0') { - if(result[0] != '零') { + if(result[0] != '闆�') { result = numberMap.get(data) + result } continue diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/formatloudong/ImportDealDataToHouseLoudong.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/formatloudong/ImportDealDataToHouseLoudong.groovy index d21173eff..9d5059d58 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/formatloudong/ImportDealDataToHouseLoudong.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/formatloudong/ImportDealDataToHouseLoudong.groovy @@ -52,14 +52,14 @@ class ImportDealDataToHouseLoudong { DBObject saveObj = new BasicDBObject('city', city).append('region', region).append('name', name) .append('house_num', houseNumber).append('house_num_unit', unitNumber).append('room_num', roomNumber) .append('worry_facility', null).append('sideset', null).append('attic_area', -1.0d) - .append('hall', -1).append('house_floor', houseFloor).append('from', '成交数据(购买)') + .append('hall', -1).append('house_floor', houseFloor).append('from', '鎴愪氦鏁版嵁锛堣喘涔帮級') .append('house_area', formatArea(houseArea)).append('basement_area', -1.0d).append('fitment_age', -1) .append('garden_area', -1.0d).append('outer_area', -1.0d).append('status', 0).append('room', -1) .append('toilet', -1).append('house_height', -1).append('c_date', new Date()) HOUSE_LOUDONG.save(saveObj) } else { - DBObject updateObj = new BasicDBObject('from', '成交数据(购买)') + DBObject updateObj = new BasicDBObject('from', '鎴愪氦鏁版嵁锛堣喘涔帮級') if(houseArea > 0) { updateObj.put('house_area', formatArea(houseArea)) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/formatloudong/ImportNonghang.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/formatloudong/ImportNonghang.groovy index ce7605d2f..981eeec3a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/formatloudong/ImportNonghang.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/formatloudong/ImportNonghang.groovy @@ -11,7 +11,7 @@ import org.apache.commons.lang.math.NumberUtils import java.text.DecimalFormat /** - * 导入农行数据 + * 瀵煎叆鍐滆鏁版嵁 * Created by linxsh on 2016/11/24. */ class ImportNonghang { @@ -35,14 +35,14 @@ class ImportNonghang { return } - if(!addr.matches('.+(路|弄|大道|街).+(号|弄)')) { + if(!addr.matches('.+(璺瘄寮剕澶ч亾|琛�).+(鍙穦寮�)')) { addr = null } DBObject findObj = LOUDONG.findOne(new BasicDBObject('city', city).append('region', region).append('name', name).append('house_num', houseNumber).append('unit_num', unitNumber)) if(findObj == null) { DBObject saveObj = new BasicDBObject('city', city).append('region', region).append('name', name) - .append('house_num', houseNumber).append('unit_num', unitNumber).append('from', ['农行']) + .append('house_num', houseNumber).append('unit_num', unitNumber).append('from', ['鍐滆']) .append('areas', [formatArea(area)]).append('alias', []).append('floors', floors) .append('type', type).append('addr_alias', []).append('build_year', 0) .append('c_date', new Date()).append('status', 1).append('lat_qq', 0).append('lng_qq', 0) @@ -53,7 +53,7 @@ class ImportNonghang { } LOUDONG.save(saveObj) } else { - DBObject addToSetObj = new BasicDBObject('from', '农行').append('areas', formatArea(area)) + DBObject addToSetObj = new BasicDBObject('from', '鍐滆').append('areas', formatArea(area)) DBObject updateObj = new BasicDBObject() if(findObj['addr']==null) { updateObj.put('addr', addr) @@ -71,15 +71,15 @@ class ImportNonghang { } static showBuildTypeMap(city){ - if(city!='上海'){ - if(city=='北京'){ - return [3:"住宅",8:"公寓",4:"独立别墅",5:"双拼别墅",6:"联排别墅",7:"叠加别墅",/*1:"商铺", 2:"写字楼",*/0:"其它"] + if(city!='涓婃捣'){ + if(city=='鍖椾含'){ + return [3:"浣忓畢",8:"鍏瘬",4:"鐙珛鍒",5:"鍙屾嫾鍒",6:"鑱旀帓鍒",7:"鍙犲姞鍒",/*1:"鍟嗛摵", 2:"鍐欏瓧妤�",*/0:"鍏跺畠"] }else{ - return [3:"住宅",4:"独立别墅",5:"双拼别墅",6:"联排别墅",7:"叠加别墅"/*,1:"商铺", 2:"写字楼"*/,0:"其它"] + return [3:"浣忓畢",4:"鐙珛鍒",5:"鍙屾嫾鍒",6:"鑱旀帓鍒",7:"鍙犲姞鍒"/*,1:"鍟嗛摵", 2:"鍐欏瓧妤�"*/,0:"鍏跺畠"] } }else{ - return [8:"公寓",4:"独立别墅",5:"双拼别墅",6:"联排别墅",7:"叠加别墅"/*,1:"商铺", 2:"写字楼"*/,0:"其它"] + return [8:"鍏瘬",4:"鐙珛鍒",5:"鍙屾嫾鍒",6:"鑱旀帓鍒",7:"鍙犲姞鍒"/*,1:"鍟嗛摵", 2:"鍐欏瓧妤�"*/,0:"鍏跺畠"] } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/formatloudong/ImportNonghangToHouseloudong.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/formatloudong/ImportNonghangToHouseloudong.groovy index 78b11f522..0a55449db 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/formatloudong/ImportNonghangToHouseloudong.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/formatloudong/ImportNonghangToHouseloudong.groovy @@ -49,7 +49,7 @@ class ImportNonghangToHouseloudong { DBObject saveObj = new BasicDBObject('city', city).append('region', region).append('name', name) .append('house_num', houseNumber).append('house_num_unit', unitNumber).append('room_num', roomNumber) .append('worry_facility', null).append('sideset', null).append('attic_area', -1.0d) - .append('hall', houseHall).append('house_floor', houseFloor).append('from', '农行') + .append('hall', houseHall).append('house_floor', houseFloor).append('from', '鍐滆') .append('house_area', houseArea).append('basement_area', -1.0d).append('fitment_age', -1) .append('garden_area', -1.0d).append('outer_area', -1.0d).append('status', 0) .append('toilet', housetoilet).append('house_height', houseFloors).append('room', houseRoom) @@ -57,7 +57,7 @@ class ImportNonghangToHouseloudong { HOUSE_LOUDONG.save(saveObj) } else { - DBObject updateObj = new BasicDBObject('from', '农行') + DBObject updateObj = new BasicDBObject('from', '鍐滆') if(houseArea > 0) { updateObj.put('house_area', houseArea) } @@ -85,15 +85,15 @@ class ImportNonghangToHouseloudong { } static showBuildTypeMap(city){ - if(city!='上海'){ - if(city=='北京'){ - return [3:"住宅",8:"公寓",4:"独立别墅",5:"双拼别墅",6:"联排别墅",7:"叠加别墅",/*1:"商铺", 2:"写字楼",*/0:"其它"] + if(city!='涓婃捣'){ + if(city=='鍖椾含'){ + return [3:"浣忓畢",8:"鍏瘬",4:"鐙珛鍒",5:"鍙屾嫾鍒",6:"鑱旀帓鍒",7:"鍙犲姞鍒",/*1:"鍟嗛摵", 2:"鍐欏瓧妤�",*/0:"鍏跺畠"] } else { - return [3:"住宅",4:"独立别墅",5:"双拼别墅",6:"联排别墅",7:"叠加别墅"/*,1:"商铺", 2:"写字楼"*/,0:"其它"] + return [3:"浣忓畢",4:"鐙珛鍒",5:"鍙屾嫾鍒",6:"鑱旀帓鍒",7:"鍙犲姞鍒"/*,1:"鍟嗛摵", 2:"鍐欏瓧妤�"*/,0:"鍏跺畠"] } }else{ - return [8:"公寓",4:"独立别墅",5:"双拼别墅",6:"联排别墅",7:"叠加别墅"/*,1:"商铺", 2:"写字楼"*/,0:"其它"] + return [8:"鍏瘬",4:"鐙珛鍒",5:"鍙屾嫾鍒",6:"鑱旀帓鍒",7:"鍙犲姞鍒"/*,1:"鍟嗛摵", 2:"鍐欏瓧妤�"*/,0:"鍏跺畠"] } } } \ No newline at end of file diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/land/Chengdu.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/land/Chengdu.groovy index 76205026f..c4665beb1 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/land/Chengdu.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/land/Chengdu.groovy @@ -63,11 +63,11 @@ class Chengdu { String plotRate1 = detailPageDoc.select("#mainModuleContainer_1855_1856_ctl00_ctl00_p1_f2_r1_c2_ctrl").text() String plotRate2 = detailPageDoc.select("#mainModuleContainer_1855_1856_ctl00_ctl00_p1_f2_r1_c4_ctrl").text() - if(LAND.findOne(new BasicDBObject("city", "成都").append("土地名称", name)) == null) { - DBObject saveObj = new BasicDBObject("city", "成都").append("土地名称", name) - .append("土地位置", addr).append("区域", region).append("出让土地面积", NumberUtils.toDouble(landArea)) - .append("土地用途", usage).append("出让年限", NumberUtils.toInt(landLife)) - .append("出让金额", NumberUtils.toDouble(dealPrice)).append("容积率", ImmutableList.of(NumberUtils.toDouble(plotRate1), NumberUtils.toDouble(plotRate2))) + if(LAND.findOne(new BasicDBObject("city", "鎴愰兘").append("鍦熷湴鍚嶇О", name)) == null) { + DBObject saveObj = new BasicDBObject("city", "鎴愰兘").append("鍦熷湴鍚嶇О", name) + .append("鍦熷湴浣嶇疆", addr).append("鍖哄煙", region).append("鍑鸿鍦熷湴闈㈢Н", NumberUtils.toDouble(landArea)) + .append("鍦熷湴鐢ㄩ��", usage).append("鍑鸿骞撮檺", NumberUtils.toInt(landLife)) + .append("鍑鸿閲戦", NumberUtils.toDouble(dealPrice)).append("瀹圭Н鐜�", ImmutableList.of(NumberUtils.toDouble(plotRate1), NumberUtils.toDouble(plotRate2))) LAND.save(saveObj) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/land/Xiamen.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/land/Xiamen.groovy index 2bd0efb59..0c2e91164 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/land/Xiamen.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/land/Xiamen.groovy @@ -24,7 +24,7 @@ class Xiamen { SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm") SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy/MM/dd HH:mm") SimpleDateFormat sdf3 = new SimpleDateFormat("yyyy-MM-dd") - List regions = ImmutableList.of("集美区", "同安区", "翔安区", "海沧区", "思明区", "湖里区") + List regions = ImmutableList.of("闆嗙編鍖�", "鍚屽畨鍖�", "缈斿畨鍖�", "娴锋钵鍖�", "鎬濇槑鍖�", "婀栭噷鍖�") HttpRequest request = new HttpRequest(); /*String startURL = "http://tz.xmtfj.gov.cn/jyzq/jyxydcr/jyjg_4144/"; String startPage = request.get(startURL, null, "UTF-8") @@ -36,33 +36,33 @@ class Xiamen { Document listDoc = Jsoup.parse(listPage, link) Elements trs = listDoc.select("table.tab4 tbody>tr") for(Element tr : trs) { - String 地块编号 = tr.select("td:eq(0) a").attr("title") - String 地块用途 = tr.select("td:eq(1) a").attr("title") - String 土地位置 = tr.select("td:eq(2) a").attr("title") - String 成交时间 = tr.select("td:eq(3)").attr("title") - String 土地面积 = tr.select("td:eq(4)").attr("title").replaceAll("[^.\\d]", "") - String 建筑面积 = tr.select("td:eq(5)").attr("title").replaceAll("[^.\\d]", "") - String 成交价 = tr.select("td:eq(6)").text().replaceAll("万元|\\s", "") + String 鍦板潡缂栧彿 = tr.select("td:eq(0) a").attr("title") + String 鍦板潡鐢ㄩ�� = tr.select("td:eq(1) a").attr("title") + String 鍦熷湴浣嶇疆 = tr.select("td:eq(2) a").attr("title") + String 鎴愪氦鏃堕棿 = tr.select("td:eq(3)").attr("title") + String 鍦熷湴闈㈢Н = tr.select("td:eq(4)").attr("title").replaceAll("[^.\\d]", "") + String 寤虹瓚闈㈢Н = tr.select("td:eq(5)").attr("title").replaceAll("[^.\\d]", "") + String 鎴愪氦浠� = tr.select("td:eq(6)").text().replaceAll("涓囧厓|\\s", "") String detailLink = tr.select("td:eq(0) a").first().absUrl("href") String detail = request.get(detailLink, null, "UTF-8") Document detailDoc = Jsoup.parse(detail) - String 出让年限 = detailDoc.select("div.gl_list7 li:contains(出让年限)").text().replaceAll("出让年限:", "") + String 鍑鸿骞撮檺 = detailDoc.select("div.gl_list7 li:contains(鍑鸿骞撮檺)").text().replaceAll("鍑鸿骞撮檺锛�", "") - DBObject findObj = LAND.findOne(new BasicDBObject("city", "厦门").append("地块编号", 地块编号)) + DBObject findObj = LAND.findOne(new BasicDBObject("city", "鍘﹂棬").append("鍦板潡缂栧彿", 鍦板潡缂栧彿)) if(findObj == null) { - DBObject saveObj = new BasicDBObject("city", "厦门").append("区域", region) - .append("地块编号", 地块编号).append("土地用途", 地块用途).append("出让用地面积", NumberUtils.toDouble(土地面积)) - .append("建筑面积", NumberUtils.toDouble(建筑面积)).append("出让金额", NumberUtils.toDouble(成交价)).append("土地位置", 土地位置) - .append("出让年限", 出让年限) + DBObject saveObj = new BasicDBObject("city", "鍘﹂棬").append("鍖哄煙", region) + .append("鍦板潡缂栧彿", 鍦板潡缂栧彿).append("鍦熷湴鐢ㄩ��", 鍦板潡鐢ㄩ��).append("鍑鸿鐢ㄥ湴闈㈢Н", NumberUtils.toDouble(鍦熷湴闈㈢Н)) + .append("寤虹瓚闈㈢Н", NumberUtils.toDouble(寤虹瓚闈㈢Н)).append("鍑鸿閲戦", NumberUtils.toDouble(鎴愪氦浠�)).append("鍦熷湴浣嶇疆", 鍦熷湴浣嶇疆) + .append("鍑鸿骞撮檺", 鍑鸿骞撮檺) - if(成交时间.matches("\\d+-\\d+-\\d+ \\d+:\\d+")) { - saveObj.put("成交日期", sdf1.parse(成交时间)) - } else if(成交时间.matches("\\d+-\\d+-\\d+")) { - saveObj.put("成交日期", sdf3.parse(成交时间)) - } else if(成交时间.matches("\\d+/\\d+/\\d+ \\d+:\\d+")) { - saveObj.put("成交日期", sdf2.parse(成交时间)) + if(鎴愪氦鏃堕棿.matches("\\d+-\\d+-\\d+ \\d+:\\d+")) { + saveObj.put("鎴愪氦鏃ユ湡", sdf1.parse(鎴愪氦鏃堕棿)) + } else if(鎴愪氦鏃堕棿.matches("\\d+-\\d+-\\d+")) { + saveObj.put("鎴愪氦鏃ユ湡", sdf3.parse(鎴愪氦鏃堕棿)) + } else if(鎴愪氦鏃堕棿.matches("\\d+/\\d+/\\d+ \\d+:\\d+")) { + saveObj.put("鎴愪氦鏃ユ湡", sdf2.parse(鎴愪氦鏃堕棿)) } else { - println 成交时间 + println 鎴愪氦鏃堕棿 } LAND.save(saveObj) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/land/chongqing.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/land/chongqing.groovy index 949fb68e8..b442651c0 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/land/chongqing.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/land/chongqing.groovy @@ -24,7 +24,7 @@ class chongqing { public static void main(String[] args) { HttpRequest request = new HttpRequest() - SimpleDateFormat sdf = new SimpleDateFormat("yyyy年MM月dd日") + SimpleDateFormat sdf = new SimpleDateFormat("yyyy骞碝M鏈坉d鏃�") CookieStore cookieStore = new BasicCookieStore() request.get("http://jyzx.cqgtfw.gov.cn/ygytd/ygytd.asp", "GBK", cookieStore) for(int i=9; i<= 321; ++i) { @@ -35,26 +35,26 @@ class chongqing { Document listPageDoc = Jsoup.parse(listPage) Elements trs = listPageDoc.select("#AutoNumber1 tr:gt(1)") for(Element tr : trs) { - String addr = tr.select("td:eq(1)").text().replaceAll("\\s| ", "") - String usage = tr.select("td:eq(2)").text().replaceAll("\\s| ", "") - String landArea = tr.select("td:eq(3)").text().replaceAll("\\s| ", "") - String plotRatio = tr.select("td:eq(4)").text().replaceAll("\\s| ", "") - String date = tr.select("td:eq(8)").text().replaceAll("\\s| ", "") - String dealPrice = tr.select("td:eq(9)").text().replaceAll("\\s| ", "") + String addr = tr.select("td:eq(1)").text().replaceAll("\\s|銆�", "") + String usage = tr.select("td:eq(2)").text().replaceAll("\\s|銆�", "") + String landArea = tr.select("td:eq(3)").text().replaceAll("\\s|銆�", "") + String plotRatio = tr.select("td:eq(4)").text().replaceAll("\\s|銆�", "") + String date = tr.select("td:eq(8)").text().replaceAll("\\s|銆�", "") + String dealPrice = tr.select("td:eq(9)").text().replaceAll("\\s|銆�", "") if(plotRatio.contains("/")) { plotRatio = StringUtils.substringAfter(plotRatio, "/") } - plotRatio = plotRatio.replaceAll("≤|≥|>|<", "") + plotRatio = plotRatio.replaceAll("鈮鈮锛瀨锛�", "") - if(LAND.findOne(new BasicDBObject("city", "重庆").append("土地位置", addr)) == null) { - DBObject saveObj = new BasicDBObject("city", "重庆").append("土地位置", addr) - .append("土地用途", usage).append("出让用地面积", NumberUtils.toDouble(landArea)) - .append("容积率", NumberUtils.toDouble(plotRatio)) - .append("出让金额", NumberUtils.toDouble(dealPrice)) + if(LAND.findOne(new BasicDBObject("city", "閲嶅簡").append("鍦熷湴浣嶇疆", addr)) == null) { + DBObject saveObj = new BasicDBObject("city", "閲嶅簡").append("鍦熷湴浣嶇疆", addr) + .append("鍦熷湴鐢ㄩ��", usage).append("鍑鸿鐢ㄥ湴闈㈢Н", NumberUtils.toDouble(landArea)) + .append("瀹圭Н鐜�", NumberUtils.toDouble(plotRatio)) + .append("鍑鸿閲戦", NumberUtils.toDouble(dealPrice)) try { - saveObj.put("成交日期", sdf.parse(date)) + saveObj.put("鎴愪氦鏃ユ湡", sdf.parse(date)) } catch (Exception e) { } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/CompleteRegion.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/CompleteRegion.groovy index adeeefbe1..4e1d9be3d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/CompleteRegion.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/CompleteRegion.groovy @@ -13,7 +13,7 @@ import net.sf.json.JSONObject import org.apache.commons.lang.StringUtils /** - * 补充抓取的房管局数据的区域信息 + * 琛ュ厖鎶撳彇鐨勬埧绠″眬鏁版嵁鐨勫尯鍩熶俊鎭� * Created by linxsh on 2017/1/6. */ class CompleteRegion { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/ExtractHouseAndRoomDatas.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/ExtractHouseAndRoomDatas.groovy index 4e568fded..d48a17c41 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/ExtractHouseAndRoomDatas.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/ExtractHouseAndRoomDatas.groovy @@ -19,8 +19,8 @@ import org.apache.commons.lang.StringUtils import org.apache.commons.lang.math.NumberUtils /** - * 来源:数据包 - * 统一excel格式,楼栋数据、房号数据提取 + * 鏉ユ簮锛氭暟鎹寘 + * 缁熶竴excel鏍煎紡锛屾ゼ鏍嬫暟鎹�佹埧鍙锋暟鎹彁鍙� * Created by linxsh on 2017/2/27. */ class ExtractHouseAndRoomDatas { @@ -29,8 +29,8 @@ class ExtractHouseAndRoomDatas { static final DBCollection HOUSE_LOUDONG = MongoUtils.getCollectionByName("fangjia", "house_loudong", host) static void main(String[] args) { -// String fileName = "C:\\Users\\ideoj\\Desktop\\楼栋房号\\杨浦区2013年经济适用房一室户可选房源总结.xlsx" - File dir = new File("C:\\Users\\ideoj\\Desktop\\数据部-楼栋库入库\\20170426\\4月11日") +// String fileName = "C:\\Users\\ideoj\\Desktop\\妤兼爧鎴垮彿\\鏉ㄦ郸鍖�2013骞寸粡娴庨�傜敤鎴夸竴瀹ゆ埛鍙�夋埧婧愭�荤粨.xlsx" + File dir = new File("C:\\Users\\ideoj\\Desktop\\鏁版嵁閮�-妤兼爧搴撳叆搴揬\20170426\\4鏈�11鏃�") if(dir.exists() && dir.isDirectory()) { File[] files = dir.listFiles() for(int i=0; i> datas = ExcelUtils.read(fileName, sheetIndex) @@ -61,11 +61,11 @@ class ExtractHouseAndRoomDatas { } sheetIndex++ } - println "处理文件结束:${file.getName()}" + println "澶勭悊鏂囦欢缁撴潫锛�${file.getName()}" } - //将数据保存到楼栋库 + //灏嗘暟鎹繚瀛樺埌妤兼爧搴� static def saveToLoudong(List> datas) { int save = 0 int update = 0 @@ -105,11 +105,11 @@ class ExtractHouseAndRoomDatas { String fitment = data[10] String direction = data[11] - //地址处理:匹配到的地址不一样时,用精确地址;如果原地址和匹配地址都是精确地址,则采用原地址 + //鍦板潃澶勭悊锛氬尮閰嶅埌鐨勫湴鍧�涓嶄竴鏍锋椂锛岀敤绮剧‘鍦板潃锛涘鏋滃師鍦板潃鍜屽尮閰嶅湴鍧�閮芥槸绮剧‘鍦板潃锛屽垯閲囩敤鍘熷湴鍧� address = handleAddress(city, region, address, name) Loudong loudong = new Loudong() - loudong.setFrom(['数据包']) + loudong.setFrom(['鏁版嵁鍖�']) loudong.setCity(city) loudong.setRegion(region) loudong.setName(name) @@ -125,7 +125,7 @@ class ExtractHouseAndRoomDatas { save += result.save update += result.update } - println "[楼栋库] 新增:${save}, 更新:${update}" + println "[妤兼爧搴揮 鏂板锛�${save}, 鏇存柊锛�${update}" } static String handleAddress(String city, String region, String oriAddress, String name) { @@ -151,11 +151,11 @@ class ExtractHouseAndRoomDatas { } /** - * 将数据保存到房号库 + * 灏嗘暟鎹繚瀛樺埌鎴垮彿搴� * @param datas */ static def saveToHouseLoudong(List> datas) { - String source = "数据包" + String source = "鏁版嵁鍖�" int count = 0 for(List data : datas) { String city = data[0] @@ -193,7 +193,7 @@ class ExtractHouseAndRoomDatas { String fitment = data[10] String direction = data[11] - //地址处理:匹配到的地址不一样时,用精确地址;如果原地址和匹配地址都是精确地址,则采用原地址 + //鍦板潃澶勭悊锛氬尮閰嶅埌鐨勫湴鍧�涓嶄竴鏍锋椂锛岀敤绮剧‘鍦板潃锛涘鏋滃師鍦板潃鍜屽尮閰嶅湴鍧�閮芥槸绮剧‘鍦板潃锛屽垯閲囩敤鍘熷湴鍧� // address = handleAddress(city, region, address, name) HouseLoudong houseLoudng = new HouseLoudong() @@ -228,11 +228,11 @@ class ExtractHouseAndRoomDatas { } } } - println "[房号库] 新增:$count" + println "[鎴垮彿搴揮 鏂板锛�$count" } /** - * 判断excel是否符合模版标准 + * 鍒ゆ柇excel鏄惁绗﹀悎妯$増鏍囧噯 * @param fileName * @param sheetIndex * @return @@ -244,10 +244,10 @@ class ExtractHouseAndRoomDatas { if(firstRow.size() < 12) { return false } - boolean valid = (firstRow[0] == '城市') && (firstRow[1] == '区域') && (firstRow[2] == '地址') && - (firstRow[3] == '小区名') && (firstRow[4] == '楼栋号') && (firstRow[5] == '室号') && - (firstRow[6] == '面积') && (firstRow[7] == '房型') && (firstRow[8] == '单元号') && - (firstRow[9] == '总楼层') && (firstRow[10] == '装修') && (firstRow[11] == '朝向') + boolean valid = (firstRow[0] == '鍩庡競') && (firstRow[1] == '鍖哄煙') && (firstRow[2] == '鍦板潃') && + (firstRow[3] == '灏忓尯鍚�') && (firstRow[4] == '妤兼爧鍙�') && (firstRow[5] == '瀹ゅ彿') && + (firstRow[6] == '闈㈢Н') && (firstRow[7] == '鎴垮瀷') && (firstRow[8] == '鍗曞厓鍙�') && + (firstRow[9] == '鎬绘ゼ灞�') && (firstRow[10] == '瑁呬慨') && (firstRow[11] == '鏈濆悜') return valid } return false diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/ExtractRoomData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/ExtractRoomData.groovy index 9c182dbed..5cbc159b0 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/ExtractRoomData.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/ExtractRoomData.groovy @@ -17,7 +17,7 @@ import java.util.concurrent.Executors import java.util.concurrent.Semaphore /** - * 从抓取的房管局数据中提取房号数据 + * 浠庢姄鍙栫殑鎴跨灞�鏁版嵁涓彁鍙栨埧鍙锋暟鎹� * Created by linxsh on 2017/1/8. */ class ExtractRoomData { @@ -56,7 +56,7 @@ class ExtractRoomData { return ; } - city = city.replace("市", "") + city = city.replace("甯�", "") BasicDBList dbList = (BasicDBList) dbObject.get("rooms"); for(Object roomObj : dbList) { @@ -66,21 +66,21 @@ class ExtractRoomData { String roomNumber = (String) room.get("num"); String type = (String)room.get('type') String unitNumber = "1" - if(type != null && type.matches('.*(商业|地下|车|商铺|写字楼)')) { + if(type != null && type.matches('.*(鍟嗕笟|鍦颁笅|杞鍟嗛摵|鍐欏瓧妤�)')) { continue } Integer floor = room.get('floor') if(floor==null || floor <= 0) { floor = -1 } - if(StringUtils.isBlank(roomNumber) || roomNumber.contains('储藏') || roomNumber.startsWith("负") || roomNumber.contains('车')) { + if(StringUtils.isBlank(roomNumber) || roomNumber.contains('鍌ㄨ棌') || roomNumber.startsWith("璐�") || roomNumber.contains('杞�')) { continue - } else if(roomNumber.matches('^\\w+室$')) { - roomNumber = StringUtils.substringBefore(roomNumber, '室') - } else if(roomNumber.matches('^.*?[\\w一二三四五六七八九十]+(单元|梯)\\w+室?$')) { - unitNumber = roomNumber.replaceAll('^.*?([\\w一二三四五六七八九十]+)(?:单元|梯)\\w+室?$', '$1') + } else if(roomNumber.matches('^\\w+瀹�$')) { + roomNumber = StringUtils.substringBefore(roomNumber, '瀹�') + } else if(roomNumber.matches('^.*?[\\w涓�浜屼笁鍥涗簲鍏竷鍏節鍗乚+(鍗曞厓|姊�)\\w+瀹�?$')) { + unitNumber = roomNumber.replaceAll('^.*?([\\w涓�浜屼笁鍥涗簲鍏竷鍏節鍗乚+)(?:鍗曞厓|姊�)\\w+瀹�?$', '$1') - roomNumber = roomNumber.replaceAll('^.*?(?:[\\w一二三四五六七八九十]+)(?:单元|梯)(\\w+)室?$', '$1') + roomNumber = roomNumber.replaceAll('^.*?(?:[\\w涓�浜屼笁鍥涗簲鍏竷鍏節鍗乚+)(?:鍗曞厓|姊�)(\\w+)瀹�?$', '$1') while (roomNumber.startsWith("0") || roomNumber.startsWith("-")) { roomNumber = roomNumber.substring(1) } @@ -124,7 +124,7 @@ class ExtractRoomData { houseLoudng.house_area = area houseLoudng.outer_area = outArea houseLoudng.direction = direction - houseLoudng.from = "房管局" + houseLoudng.from = "鎴跨灞�" DBObject saveObj = new BasicDBObject(new BeanMap(houseLoudng)) saveObj.removeField('class') diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/FormatAddress.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/FormatAddress.groovy index 03925be70..42e8a70e0 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/FormatAddress.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/FormatAddress.groovy @@ -10,7 +10,7 @@ import com.mongodb.DBObject import org.apache.commons.lang.StringUtils /** - * 格式化抓取的房管局数据的地址信息 + * 鏍煎紡鍖栨姄鍙栫殑鎴跨灞�鏁版嵁鐨勫湴鍧�淇℃伅 * Created by linxsh on 2017/1/10. */ class FormatAddress { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/HandleDataFromLoudong.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/HandleDataFromLoudong.groovy index 2bba8ec28..f841f930a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/HandleDataFromLoudong.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/HandleDataFromLoudong.groovy @@ -9,12 +9,12 @@ import com.mongodb.DBObject import net.sf.json.JSONObject /** - * 从数据部给的Excel中提取小区并入库 + * 浠庢暟鎹儴缁欑殑Excel涓彁鍙栧皬鍖哄苟鍏ュ簱 * Created by linxsh on 2017/1/20. */ class HandleDataFromLoudong { public static void main(String[] args) { - def file = "C:\\Users\\ideoj\\Desktop\\数据部-楼栋库入库\\楼栋数据提取小区20170120-蒲雪丽.xls" + def file = "C:\\Users\\ideoj\\Desktop\\鏁版嵁閮�-妤兼爧搴撳叆搴揬\妤兼爧鏁版嵁鎻愬彇灏忓尯20170120-钂查洩涓�.xls" ExcelUtils.modify(file,{row-> String city = row['B'] @@ -23,7 +23,7 @@ class HandleDataFromLoudong { String name = row['P'] - if("是" == flag) { + if("鏄�" == flag) { List objectList = DbUtils.seaweed.find(new BasicDBObject('cat', 'district').append('visible', 0) .append('city', city).append('name', name)).toList() if(objectList.size() == 0) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/Nonghangfugu.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/Nonghangfugu.groovy index 21b8b3708..195b518ef 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/Nonghangfugu.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/Nonghangfugu.groovy @@ -25,20 +25,20 @@ class Nonghangfugu { private static DBCollection HOUSE_LOUDONG = MongoUtils.getCollectionByName("fangjia", "house_loudong", "192.168.0.136") public static void main(String[] args) { - String fileName = "C:\\Users\\Administrator\\Downloads\\农行复估总.xlsx" + String fileName = "C:\\Users\\Administrator\\Downloads\\鍐滆澶嶄及鎬�.xlsx" - //格式化excel中数据 + //鏍煎紡鍖杄xcel涓暟鎹� formatExcelData(fileName) - //入楼栋库 + //鍏ユゼ鏍嬪簱 // importToLoudong(fileName) - //入房号库 + //鍏ユ埧鍙峰簱 importToHouseLoudong(fileName) } static void importToHouseLoudong(String fileName) { ExcelUtils.read(fileName).each({ row -> HouseLoudong houseLoudng = new HouseLoudong() - houseLoudng.city = '上海' + houseLoudng.city = '涓婃捣' houseLoudng.region = row[4] houseLoudng.name = row[5] houseLoudng.house_num = row[6] @@ -49,12 +49,12 @@ class Nonghangfugu { if(row[1]) { houseLoudng.house_area = Double.valueOf(row[1]) } - houseLoudng.from = "农行复估" + houseLoudng.from = "鍐滆澶嶄及" if(StringUtils.isNotBlank(houseLoudng.region) && StringUtils.isNotBlank(houseLoudng.name) && StringUtils.isNotBlank(houseLoudng.house_num) && StringUtils.isNotBlank(houseLoudng.room_num)) { - if(houseLoudng.name.endsWith("弄")) { - houseLoudng.name = houseLoudng.name + "小区" + if(houseLoudng.name.endsWith("寮�")) { + houseLoudng.name = houseLoudng.name + "灏忓尯" } DBObject saveObj = new BasicDBObject(new BeanMap(houseLoudng)) @@ -74,7 +74,7 @@ class Nonghangfugu { static void importToLoudong(String fileName) { NewLoudongUtil loudongUtil = NewLoudongUtil.create("192.168.0.136", "fangjia", "nonggang") ExcelUtils.read(fileName).each({row-> - String city = "上海" + String city = "涓婃捣" String region = row[4] String name = row[5] String houseNumber = row[6] @@ -88,8 +88,8 @@ class Nonghangfugu { if(StringUtils.isNotBlank(city) && StringUtils.isNotBlank(region) && StringUtils.isNotBlank(name) && StringUtils.isNotBlank(houseNumber)) { - if(name.endsWith("弄")) { - name += "小区" + if(name.endsWith("寮�")) { + name += "灏忓尯" } Loudong loudong = new Loudong() loudong.setCity(city) @@ -102,7 +102,7 @@ class Nonghangfugu { } loudong.setType(type) loudong.setUnitNumber("1") - loudong.setFrom(['农行复估']) + loudong.setFrom(['鍐滆澶嶄及']) // println loudong loudongUtil.upsert(loudong) @@ -117,16 +117,16 @@ class Nonghangfugu { return } - String formatAddress = NewLoudongUtil.formatDistrictAddress("上海", oriAddress) + String formatAddress = NewLoudongUtil.formatDistrictAddress("涓婃捣", oriAddress) - String newOriAddress = oriAddress.replaceAll('[\\((]复式[)\\)]|\\s', '').replace('-', "-") + String newOriAddress = oriAddress.replaceAll('[\\(锛圿澶嶅紡[锛塡\)]|\\s', '').replace('锛�', "-") String formatHouseNumber = NewLoudongUtil.formatHouseNumber(newOriAddress) - if(formatHouseNumber==null || !formatHouseNumber.matches('[-\\w甲乙丙丁戊戌东南西北]+')) { - if(oriAddress.matches(".+(名邸|城)[-\\w]+[号幢栋座]\\w+室?")) { - formatHouseNumber = oriAddress.replaceAll(".+(?:名邸|城)([-\\w]+)[号幢栋座]\\w+室?", '$1') - } else if(oriAddress.matches('.+路\\w+[号弄].*?[-\\w]+[号幢栋座]\\w+室?')) { - formatHouseNumber = oriAddress.replaceAll('.+路\\w+[号弄].*?([-\\w]+)[号幢栋座]\\w+室?', '$1') - } else if(oriAddress.matches('.+?路\\w+[号弄]\\w+室?')) { + if(formatHouseNumber==null || !formatHouseNumber.matches('[-\\w鐢蹭箼涓欎竵鎴婃垖涓滃崡瑗垮寳]+')) { + if(oriAddress.matches(".+(鍚嶉偢|鍩�)[-\\w]+[鍙峰耿鏍嬪骇]\\w+瀹�?")) { + formatHouseNumber = oriAddress.replaceAll(".+(?:鍚嶉偢|鍩�)([-\\w]+)[鍙峰耿鏍嬪骇]\\w+瀹�?", '$1') + } else if(oriAddress.matches('.+璺痋\w+[鍙峰紕].*?[-\\w]+[鍙峰耿鏍嬪骇]\\w+瀹�?')) { + formatHouseNumber = oriAddress.replaceAll('.+璺痋\w+[鍙峰紕].*?([-\\w]+)[鍙峰耿鏍嬪骇]\\w+瀹�?', '$1') + } else if(oriAddress.matches('.+?璺痋\w+[鍙峰紕]\\w+瀹�?')) { formatHouseNumber = '--' } else { @@ -134,27 +134,27 @@ class Nonghangfugu { } } String formatRoomNumber = null - if(newOriAddress.matches(".+?\\w+(号楼?|幢|栋)[\u4e00-\u9fa5]*?\\w+室?")) { - formatRoomNumber = newOriAddress.replaceAll('.+?\\w+(?:号楼?|幢|栋)[一-龥]*?(\\w+)室?', '$1') - } else if(newOriAddress.matches('.+?[一-龥][-\\w]+室')){ - formatRoomNumber = newOriAddress.replaceAll('.+?[一-龥]([-\\w]+)室', '$1') + if(newOriAddress.matches(".+?\\w+(鍙锋ゼ?|骞鏍�)[\u4e00-\u9fa5]*?\\w+瀹�?")) { + formatRoomNumber = newOriAddress.replaceAll('.+?\\w+(?:鍙锋ゼ?|骞鏍�)[涓�-榫*?(\\w+)瀹�?', '$1') + } else if(newOriAddress.matches('.+?[涓�-榫[-\\w]+瀹�')){ + formatRoomNumber = newOriAddress.replaceAll('.+?[涓�-榫([-\\w]+)瀹�', '$1') } String formatRegion = null - JSONObject jsonObject = OpenApiClient.addressMatch("上海", oriAddress, "property") + JSONObject jsonObject = OpenApiClient.addressMatch("涓婃捣", oriAddress, "property") if(jsonObject != null && jsonObject.credit > 0.5) { // println "$oriAddress -> ${jsonObject.name}" formatRegion = jsonObject.district row['F'] = jsonObject.name if(formatAddress==null) { formatAddress = jsonObject.address - } else if(formatAddress.matches('.+(路|大道|街)\\w+弄\\w+号')) { - formatAddress = formatAddress.replaceAll('(.+(?:路|大道|街)\\w+弄)\\w+号', '$1') + } else if(formatAddress.matches('.+(璺瘄澶ч亾|琛�)\\w+寮刓\w+鍙�')) { + formatAddress = formatAddress.replaceAll('(.+(?:璺瘄澶ч亾|琛�)\\w+寮�)\\w+鍙�', '$1') } } if(formatRegion) { - formatRegion = RegionData.formatRegion("上海", formatRegion) + formatRegion = RegionData.formatRegion("涓婃捣", formatRegion) row['E'] = formatRegion println "$oriAddress\t->$formatRegion--${row['F']}--$formatAddress--$formatHouseNumber--$formatRoomNumber" } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/Temp.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/Temp.groovy index 0fef96d39..cd5c2a12a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/Temp.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/Temp.groovy @@ -33,16 +33,16 @@ class Temp { public static void main(String[] args) { //547d2f1be4b09f4a4962c06e seaweed.update(new BasicDBObject('_id', new ObjectId('547d2f1be4b09f4a4962c06e')), new BasicDBObject('$set', - new BasicDBObject('committee', "测试居委会"))) + new BasicDBObject('committee', "娴嬭瘯灞呭浼�"))) DBObject dbObject = seaweed.findOne(new BasicDBObject('_id', new ObjectId('547d2f1be4b09f4a4962c06e'))) println dbObject // countDistrictsHasLoudong() - /*DBCursor dbCursor = NEWLD.find(new BasicDBObject('f_addr', Pattern.compile('^.+弄.+号$'))).addOption(Bytes.QUERYOPTION_NOTIMEOUT) + /*DBCursor dbCursor = NEWLD.find(new BasicDBObject('f_addr', Pattern.compile('^.+寮�.+鍙�$'))).addOption(Bytes.QUERYOPTION_NOTIMEOUT) for(DBObject dbObject : dbCursor) { String formatAddress=dbObject.f_addr - String newAddress = formatAddress.replaceAll('^(.+弄).+号$', '$1') + String newAddress = formatAddress.replaceAll('^(.+寮�).+鍙�$', '$1') println "$formatAddress -> $newAddress" NEWLD.update(dbObject, new BasicDBObject('$set', new BasicDBObject('f_addr', newAddress))) *//*String city = dbObject.city @@ -70,13 +70,13 @@ class Temp { def static countDistrictsHasLoudong() { Date weekend = DateUtil.getFirstDayOfWeek(new Date()); List allCities = CommonUtils.findAllCity() - println "${DateUtil.formatToTightYYYYMMDDhhmmss(new Date())}\t开始统计有楼栋的小区数" + println "${DateUtil.formatToTightYYYYMMDDhhmmss(new Date())}\t寮�濮嬬粺璁℃湁妤兼爧鐨勫皬鍖烘暟" def queryDistrict = new BasicDBObject() queryDistrict.put("visible", 0) queryDistrict.put("cat", "district") def datas = [] - datas << ['城市', '现有小区总数', '有楼栋小区数量', '有楼栋小区数覆盖率', '当前城市楼栋总数量', '有房号小区数量', '有房号小区数覆盖率', '当前城市房号总数'] + datas << ['鍩庡競', '鐜版湁灏忓尯鎬绘暟', '鏈夋ゼ鏍嬪皬鍖烘暟閲�', '鏈夋ゼ鏍嬪皬鍖烘暟瑕嗙洊鐜�', '褰撳墠鍩庡競妤兼爧鎬绘暟閲�', '鏈夋埧鍙峰皬鍖烘暟閲�', '鏈夋埧鍙峰皬鍖烘暟瑕嗙洊鐜�', '褰撳墠鍩庡競鎴垮彿鎬绘暟'] ExecutorService executorService = Executors.newCachedThreadPool() Semaphore semaphore = new Semaphore(10) allCities.each { @@ -113,12 +113,12 @@ class Temp { query.put("city", city); query.put("weekend", weekend); - println "${DateUtil.formatToTightYYYYMMDDhhmmss(new Date())}\t[$city] 有楼栋的小区数统计完成" + println "${DateUtil.formatToTightYYYYMMDDhhmmss(new Date())}\t[$city] 鏈夋ゼ鏍嬬殑灏忓尯鏁扮粺璁″畬鎴�" datas << [city, findDistricts.size(), loudongCount.get(), loudongCount.get()/findDistricts.size(), LOUDONG.count(new BasicDBObject('city', city)), fanghaoCount.get(), fanghaoCount.get()/findDistricts.size(), HOUSE_LOUDONG.count(new BasicDBObject('city', city))] } - ExcelUtils.write('D://楼栋信息统计.xlsx', datas, 'results') + ExcelUtils.write('D://妤兼爧淇℃伅缁熻.xlsx', datas, 'results') executorService.shutdown() } @@ -142,7 +142,7 @@ class Temp { static boolean findDistrictsHasFanghao(DBObject dbObject) { boolean find = false def count = 0 - //由于查询比较耗时,为防止出错,最多进行三次查询 + //鐢变簬鏌ヨ姣旇緝鑰楁椂锛屼负闃叉鍑洪敊锛屾渶澶氳繘琛屼笁娆℃煡璇� while (count < 3) { try { find = findInHouseLoudong(dbObject.city, dbObject.region, dbObject.name) @@ -166,7 +166,7 @@ class Temp { def static findDistrictsHasLoudong(DBObject dbObject) { boolean find = false def count = 0 - //由于查询比较耗时,为防止出错,最多进行三次查询 + //鐢变簬鏌ヨ姣旇緝鑰楁椂锛屼负闃叉鍑洪敊锛屾渶澶氳繘琛屼笁娆℃煡璇� while (count < 3) { try { find = findInLoudong(dbObject.city, dbObject.region, dbObject.name) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/allDatas.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/allDatas.groovy index e2a8fe464..d216a2fd6 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/allDatas.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/allDatas.groovy @@ -28,11 +28,11 @@ class allDatas { // static ExecutorService executorService = Executors.newCachedThreadPool() public static void main(String[] args) { - /*LOUDONG.find(new BasicDBObject("city", "北京市")).addOption(Bytes.QUERYOPTION_NOTIMEOUT).each {data-> + /*LOUDONG.find(new BasicDBObject("city", "鍖椾含甯�")).addOption(Bytes.QUERYOPTION_NOTIMEOUT).each {data-> println data }*/ - DBCursor dbCursor = LOUDONG.find(new BasicDBObject("city", "北京市")).addOption(Bytes.QUERYOPTION_NOTIMEOUT) + DBCursor dbCursor = LOUDONG.find(new BasicDBObject("city", "鍖椾含甯�")).addOption(Bytes.QUERYOPTION_NOTIMEOUT) Semaphore semaphore = new Semaphore(1) // int count = 0 for(DBObject dbObject : dbCursor) { @@ -73,12 +73,12 @@ class allDatas { /*if(formatRegion && formatHouseNumber && formatAddress && formatName) { return }*/ - if(houseNumber==null || houseNumber.matches('.*(商业|商铺|地下|车|办公|写字|储藏).*')) { + if(houseNumber==null || houseNumber.matches('.*(鍟嗕笟|鍟嗛摵|鍦颁笅|杞鍔炲叕|鍐欏瓧|鍌ㄨ棌).*')) { return } DBObject updateObj = new BasicDBObject() - //区域 + //鍖哄煙 print "region..." if(StringUtils.isBlank(formatRegion)) { if(region) { @@ -88,11 +88,11 @@ class allDatas { } } if(!formatRegion) { - Pattern pattern = Pattern.compile('(?<='+city+')([\\u4e00-\\u9fa5]{2,5})区') + Pattern pattern = Pattern.compile('(?<='+city+')([\\u4e00-\\u9fa5]{2,5})鍖�') Matcher matcher = pattern.matcher(address) if(matcher.find()) { formatRegion = matcher.group(1) - if(formatRegion.startsWith('市')) { + if(formatRegion.startsWith('甯�')) { formatRegion = formatRegion.substring(1) } formatRegion = RegionData.formatRegion(city, formatRegion) @@ -106,11 +106,11 @@ class allDatas { } } - //楼号 + //妤煎彿 print "houseNumber..." if(StringUtils.isBlank(formatHouseNumber)) { - if(houseNumber.matches('楼号:.+\\(.+-.+-.+\\)')) { - houseNumber = StringUtils.substringBetween(houseNumber, ":", '(') + if(houseNumber.matches('妤煎彿锛�.+\\(.+-.+-.+\\)')) { + houseNumber = StringUtils.substringBetween(houseNumber, "锛�", '(') } if(houseNumber.contains(name)) { houseNumber = StringUtils.substringAfter(houseNumber, name) @@ -121,7 +121,7 @@ class allDatas { } } - //小区地址 + //灏忓尯鍦板潃 print "address..." if(StringUtils.isBlank(formatAddress)) { formatAddress = LoudongUtil.formatDistrictAddress(city, address) @@ -130,7 +130,7 @@ class allDatas { } } - //小区名 + //灏忓尯鍚� print "name..." if(true) { formatName = LoudongUtil.formatDistrictName(city, name) @@ -142,8 +142,8 @@ class allDatas { } } - if(formatName && formatName.endsWith("建设方案编号")) { - formatName = formatName.replace('建设方案编号', '') + if(formatName && formatName.endsWith("寤鸿鏂规缂栧彿")) { + formatName = formatName.replace('寤鸿鏂规缂栧彿', '') } print "save..." @@ -155,7 +155,7 @@ class allDatas { } /** - * 格式化区域 + * 鏍煎紡鍖栧尯鍩� * @param city * @param region * @param address diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170217/NanjingHouse.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170217/NanjingHouse.groovy index a40ab0781..de652e228 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170217/NanjingHouse.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170217/NanjingHouse.groovy @@ -17,8 +17,8 @@ import org.apache.commons.lang.StringUtils import org.apache.commons.lang.math.NumberUtils /** - * 2014.01-2014.06南京商品房住宅成交统计.xls - * 提取楼号、室号信息,并提取相应的备注信息 + * 2014.01-2014.06鍗椾含鍟嗗搧鎴夸綇瀹呮垚浜ょ粺璁�.xls + * 鎻愬彇妤煎彿銆佸鍙蜂俊鎭紝骞舵彁鍙栫浉搴旂殑澶囨敞淇℃伅 * Created by linxsh on 2017/2/17. */ class NanjingHouse { @@ -26,7 +26,7 @@ class NanjingHouse { static final DBCollection HOUSE_LOUDONG = MongoUtils.getCollectionByName("fangjia", "house_loudong", "192.168.0.136") public static void main(String[] args) { - String fileName = "C:\\Users\\ideoj\\Desktop\\数据部-楼栋库入库\\20170217\\2014.01-2014.06南京商品房住宅成交统计.xls" + String fileName = "C:\\Users\\ideoj\\Desktop\\鏁版嵁閮�-妤兼爧搴撳叆搴揬\20170217\\2014.01-2014.06鍗椾含鍟嗗搧鎴夸綇瀹呮垚浜ょ粺璁�.xls" // format(fileName) // findInDistrict(fileName) @@ -37,8 +37,8 @@ class NanjingHouse { static void importToHouseLoudong(String fileName) { List> datas = ExcelUtils.read(fileName) - String city = "南京" - String from = "南京商品房成交统计" + String city = "鍗椾含" + String from = "鍗椾含鍟嗗搧鎴挎垚浜ょ粺璁�" int count = 0 for(List data : datas) { String region = RegionData.formatRegion(city, data[1]) @@ -91,8 +91,8 @@ class NanjingHouse { static void importToLoudong(String fileName) { List> datas = ExcelUtils.read(fileName) - String city = "南京" - String from = "南京商品房成交统计" + String city = "鍗椾含" + String from = "鍗椾含鍟嗗搧鎴挎垚浜ょ粺璁�" NewLoudongUtil loudongUtil = NewLoudongUtil.create("192.168.0.136", "fangjia_base", "loudong") for(List data : datas) { String region = RegionData.formatRegion(city, data[1]) @@ -119,14 +119,14 @@ class NanjingHouse { static void findInDistrict(String fileName) { ExcelUtils.modify(fileName, {row -> - String city = "南京" + String city = "鍗椾含" String name = row['A'] String region = RegionData.formatRegion(city, row['B']) if(existsInDistrict(city, region, name)) { // println "$city--$region--$name" -// row['W'] = '小区库已存在' +// row['W'] = '灏忓尯搴撳凡瀛樺湪' } }) @@ -146,18 +146,18 @@ class NanjingHouse { String formatUnitNumber = "1" String formatRoomNumber = null String remark = null - if(houseNumber.contains('幢')) { + if(houseNumber.contains('骞�')) { formatHouseNumber = NewLoudongUtil.formatHouseNumber(houseNumber) - } else if(roomNumber.contains('幢')) { + } else if(roomNumber.contains('骞�')) { formatHouseNumber = NewLoudongUtil.formatHouseNumber(roomNumber) } - if(roomNumber.contains('单元')) { - formatUnitNumber = roomNumber.replaceFirst('.*?(\\d+)单元.*', '$1') + if(roomNumber.contains('鍗曞厓')) { + formatUnitNumber = roomNumber.replaceFirst('.*?(\\d+)鍗曞厓.*', '$1') } formatRoomNumber = roomNumber.replaceAll('(?:.+[\u4e00-\u9fa5]+)?(\\d+).*', '$1') - if (roomNumber.matches('.+?\\d+室?[\\((]?([-、\\w一-龥]+)[\\))]?') && roomNumber.matches('.+\\D$')) { - remark = roomNumber.replaceAll('.+?\\d+室?[\\((]?([-、\\w一-龥]+)[\\))]?', '$1') - if(remark.startsWith('室')) { + if (roomNumber.matches('.+?\\d+瀹�?[\\(锛圿?([-銆乗\w涓�-榫+)[\\)锛塢?') && roomNumber.matches('.+\\D$')) { + remark = roomNumber.replaceAll('.+?\\d+瀹�?[\\(锛圿?([-銆乗\w涓�-榫+)[\\)锛塢?', '$1') + if(remark.startsWith('瀹�')) { remark = remark.substring(1) } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170222/Jianhang.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170222/Jianhang.groovy index de0ce83c2..3e14072fb 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170222/Jianhang.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170222/Jianhang.groovy @@ -23,7 +23,7 @@ class Jianhang { public static void main(String[] args) { - String fileName = "C:\\Users\\ideoj\\Desktop\\数据部-楼栋库入库\\20170222\\建行100条数据201512.xlsx" + String fileName = "C:\\Users\\ideoj\\Desktop\\鏁版嵁閮�-妤兼爧搴撳叆搴揬\20170222\\寤鸿100鏉℃暟鎹�201512.xlsx" // format(fileName) // importToLoudong(fileName) @@ -52,7 +52,7 @@ class Jianhang { } Double area = NumberUtils.toDouble(data[11]+"") - String source = "项目" + String source = "椤圭洰" HouseLoudong houseLoudng = new HouseLoudong() houseLoudng.city = city @@ -98,7 +98,7 @@ class Jianhang { Double area = NumberUtils.toDouble(data[11]+"") - String source = "项目" + String source = "椤圭洰" Loudong loudong = new Loudong() loudong.setCity(city) @@ -124,15 +124,15 @@ class Jianhang { String oriAddress = row['C'] boolean exists = existsInDistrict(city, region, name) - row['T'] = exists?'是':'否' + row['T'] = exists?'鏄�':'鍚�' String formatHouseNumber = NewLoudongUtil.formatHouseNumber(oriAddress) String formatUnit = NewLoudongUtil.formatUnitNumber(oriAddress) String formatRoomNumber = null - if(oriAddress.contains('室')) { - formatRoomNumber = oriAddress.replaceAll('.*?(\\w+)室.*', '$1') - } else if(oriAddress.matches(".+?\\w+幢(\\w+单元)?(\\w+层)?\\w+号.*")) { - formatRoomNumber = oriAddress.replaceAll('.+?\\w+幢(?:\\w+单元)?(?:\\w+层)?(\\w+)号.*', '$1') + if(oriAddress.contains('瀹�')) { + formatRoomNumber = oriAddress.replaceAll('.*?(\\w+)瀹�.*', '$1') + } else if(oriAddress.matches(".+?\\w+骞�(\\w+鍗曞厓)?(\\w+灞�)?\\w+鍙�.*")) { + formatRoomNumber = oriAddress.replaceAll('.+?\\w+骞�(?:\\w+鍗曞厓)?(?:\\w+灞�)?(\\w+)鍙�.*', '$1') } row['Q'] = formatHouseNumber row['R'] = formatUnit diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170228/FangLiBang.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170228/FangLiBang.groovy index 1e50d3c20..7e1593a19 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170228/FangLiBang.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170228/FangLiBang.groovy @@ -29,7 +29,7 @@ class FangLiBang { static final LoudongUtil loudongUtil = new LoudongUtil("mongo.db.fangjia.com") static main(args) { - List> datas = ExcelUtils.read("C:\\Users\\ideoj\\Desktop\\数据部-楼栋库入库\\20170331\\房利帮_匹配不上_数据入库.xlsx") + List> datas = ExcelUtils.read("C:\\Users\\ideoj\\Desktop\\鏁版嵁閮�-妤兼爧搴撳叆搴揬\20170331\\鎴垮埄甯甠鍖归厤涓嶄笂_鏁版嵁鍏ュ簱.xlsx") // saveToHouseLoudong(datas) // saveToLouDongDb(datas) @@ -44,7 +44,7 @@ class FangLiBang { def result = [save:0, update:0] for(List data : datas) { - if(data[7] && data[7] == '是') { + if(data[7] && data[7] == '鏄�') { String _region = data[2] String _name = data[3] @@ -65,13 +65,13 @@ class FangLiBang { for(DBObject dbObject : dbCursor) { try { Loudong loudong = new Loudong() - loudong.setCity("上海") + loudong.setCity("涓婃捣") loudong.setRegion(rightRegion) loudong.setName(rightName) loudong.setHouseNumber(format(dbObject.build_num)) loudong.setUnitNumber('--') - loudong.setFrom(['房利帮']) - loudong.setAddress(findAddress("上海", rightRegion, rightName, data[4])) + loudong.setFrom(['鎴垮埄甯�']) + loudong.setAddress(findAddress("涓婃捣", rightRegion, rightName, data[4])) def r = loudongUtil.upsert(loudong) result.save += r.save @@ -96,7 +96,7 @@ class FangLiBang { static def saveToHouseLoudong2(List> datas) { int count = 0 for(List data : datas) { - if(data[7] && data[7] == '是') { + if(data[7] && data[7] == '鏄�') { String _region = data[2] String _name = data[3] @@ -118,23 +118,23 @@ class FangLiBang { try { String room_info = "" if(dbObject.room) { - room_info = room_info + dbObject.room + "室" + room_info = room_info + dbObject.room + "瀹�" } if(dbObject.hall) { - room_info = room_info + dbObject.hall + "厅" + room_info = room_info + dbObject.hall + "鍘�" } if(dbObject.toilet) { - room_info = room_info + dbObject.toilet + "卫" + room_info = room_info + dbObject.toilet + "鍗�" } HouseLoudong houseLoudng = new HouseLoudong() - houseLoudng.city = "上海" + houseLoudng.city = "涓婃捣" houseLoudng.region = rightRegion houseLoudng.name = rightName houseLoudng.house_num = format(dbObject.build_num) houseLoudng.house_num_unit = '--' houseLoudng.room_num = format(dbObject.room_num) - houseLoudng.from = "房利帮" + houseLoudng.from = "鎴垮埄甯�" houseLoudng.toilet = dbObject.toilet houseLoudng.hall = dbObject.hall houseLoudng.room = dbObject.room @@ -145,12 +145,12 @@ class FangLiBang { } if(StringUtils.isNotBlank(rightRegion) && StringUtils.isNotBlank(rightName) && StringUtils.isNotBlank(houseLoudng.house_num) && StringUtils.isNotBlank(houseLoudng.room_num) - && RegionData.isRegion("上海", rightRegion)) { + && RegionData.isRegion("涓婃捣", rightRegion)) { DBObject saveObj = new BasicDBObject(new BeanMap(houseLoudng)) saveObj.removeField('class') saveObj.removeField('metaClass') - DBObject query = new BasicDBObject('city', "上海").append('region', rightRegion).append('name', rightName) + DBObject query = new BasicDBObject('city', "涓婃捣").append('region', rightRegion).append('name', rightName) .append('house_num', houseLoudng.house_num).append('house_num_unit', houseLoudng.house_num_unit).append('room_num', houseLoudng.room_num) DBObject findObj = house_loudong_coll.findOne(query) if (findObj == null) { @@ -173,7 +173,7 @@ class FangLiBang { NewLoudongUtil loudongUtil = new NewLoudongUtil("mongo.db.fangjia.com", "fangjia_base", "loudong") def result = [save: 0, update: 0] for(List data : datas) { - if(data[10] != '是'){ + if(data[10] != '鏄�'){ continue } String _region = data[2] @@ -204,7 +204,7 @@ class FangLiBang { loudong.setHouseNumber(house_num) loudong.setUnitNumber(unit_num) loudong.setFloors(floors) - loudong.setFrom(["房利帮"]) + loudong.setFrom(["鎴垮埄甯�"]) def r = loudongUtil.upsert(loudong) result.update += r.update result.save += r.save @@ -214,13 +214,13 @@ class FangLiBang { } - println "共入库" + result + println "鍏卞叆搴�" + result } static saveToHouseLoudong(List> datas) { int count = 0 for(List data : datas) { - if(data[10] != '是'){ + if(data[10] != '鏄�'){ continue } String _region = data[2] @@ -251,7 +251,7 @@ class FangLiBang { houseLoudng.house_num = house_num houseLoudng.house_num_unit = unit_num houseLoudng.room_num = room_num - houseLoudng.from = "房利帮" + houseLoudng.from = "鎴垮埄甯�" houseLoudng.toilet = dbObject.toilet houseLoudng.hall = dbObject.hall houseLoudng.room = dbObject.room diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170228/NanjingYinhang.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170228/NanjingYinhang.groovy index e3d46e04b..dc7b3cc2d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170228/NanjingYinhang.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170228/NanjingYinhang.groovy @@ -20,7 +20,7 @@ class NanjingYinhang { static final DBCollection house_loudong_coll = MongoUtils.getCollectionByName("fangjia", "house_loudong", "mongo.db.fangjia.com") static void main(String[] args) { - String fileName = "C:\\Users\\ideoj\\Desktop\\数据部-楼栋库入库\\20170314\\南京银行房产测试第二版楼栋房号入库.xlsx" + String fileName = "C:\\Users\\ideoj\\Desktop\\鏁版嵁閮�-妤兼爧搴撳叆搴揬\20170314\\鍗椾含閾惰鎴夸骇娴嬭瘯绗簩鐗堟ゼ鏍嬫埧鍙峰叆搴�.xlsx" // format(fileName) @@ -71,7 +71,7 @@ class NanjingYinhang { data.append("house_area", house_area) } catch (Exception e){} } - data.append("from", Arrays.asList("数据包")) + data.append("from", Arrays.asList("鏁版嵁鍖�")) data.append("status", 1) data.append("c_date", cur_date) data.append("m_date", cur_date) @@ -80,7 +80,7 @@ class NanjingYinhang { println data } - println "入房号库:" + count + println "鍏ユ埧鍙峰簱锛�" + count } static void saveToLouDongDb(String fileName) { @@ -111,14 +111,14 @@ class NanjingYinhang { loudong.unitNumber = unit_num loudong.floors = floors Set set = Sets.newTreeSet() - set.add("数据包") + set.add("鏁版嵁鍖�") loudong.from = set def r = loudongUtil.upsert(loudong) result.update += r.update result.save += r.save } - println "入楼栋库:" + result + println "鍏ユゼ鏍嬪簱锛�" + result } static formatEnd(String str) { @@ -133,7 +133,7 @@ class NanjingYinhang { String city = row['B'] String region = row['C'] String address = row['D'] - row['J'] = city.replace('市', '') + row['J'] = city.replace('甯�', '') row['K'] = RegionData.formatRegion(city, region) JSONObject matchJo = OpenApiClient.addressMatch(row['J'], address, "property", false, row['K']) if(matchJo && matchJo.credit > 0.5) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170309/Anshuo.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170309/Anshuo.groovy index 561d396b7..c8b4a8729 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170309/Anshuo.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170309/Anshuo.groovy @@ -5,26 +5,26 @@ import com.fangjia.script.util.ExcelUtils import com.fangjia.script.util.OpenApiClient import net.sf.json.JSONObject -/**安硕房产测试数据入库 +/**瀹夌鎴夸骇娴嬭瘯鏁版嵁鍏ュ簱 * #issue 656 * Created by linxsh on 2017/3/9. */ class Anshuo { static void main(String[] args) { - String fileName = "C:\\Users\\ideoj\\Desktop\\数据部-楼栋库入库\\20170309\\安硕房产测试数据201605.xlsx" + String fileName = "C:\\Users\\ideoj\\Desktop\\鏁版嵁閮�-妤兼爧搴撳叆搴揬\20170309\\瀹夌鎴夸骇娴嬭瘯鏁版嵁201605.xlsx" format(fileName) } static void format(String fileName) { ExcelUtils.modify(fileName, {row-> - row['J'] = row['A'].replace('市', '') + row['J'] = row['A'].replace('甯�', '') row['K'] = RegionData.formatRegion(row['J'], row['B']) JSONObject jsonObject = OpenApiClient.standardize(row['J'], row['E']) if(jsonObject) { row['L'] = jsonObject.street - if(row['L'] && !row['L'].endsWith('弄') && jsonObject.streetNumber) { + if(row['L'] && !row['L'].endsWith('寮�') && jsonObject.streetNumber) { row['L'] = row['L'] + jsonObject.streetNumber } row['M'] = jsonObject.buildingNumber diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170310/ExportHouseloudongToLoudong.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170310/ExportHouseloudongToLoudong.groovy index 2e9d39cb3..578424a6a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170310/ExportHouseloudongToLoudong.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170310/ExportHouseloudongToLoudong.groovy @@ -7,8 +7,8 @@ import com.fangjia.script.util.MongoUtils import com.mongodb.* /** - * 广州、上海、深圳、杭州 - * 房号库中存在而楼栋库中不存在的小区,导入到楼栋库 + * 骞垮窞銆佷笂娴枫�佹繁鍦炽�佹澀宸� + * 鎴垮彿搴撲腑瀛樺湪鑰屾ゼ鏍嬪簱涓笉瀛樺湪鐨勫皬鍖猴紝瀵煎叆鍒版ゼ鏍嬪簱 * Created by linxsh on 2017/3/10. */ class ExportHouseloudongToLoudong { @@ -18,11 +18,11 @@ class ExportHouseloudongToLoudong { // static final DBCollection TEMP = MongoUtils.getCollectionByName("fangjia_base", "loudong_temp", HOST) public static void main(String[] args) { - List> datas = ExcelUtils.read("C:\\Users\\ideoj\\Desktop\\数据部-楼栋库入库\\20170310\\房号库存在而楼栋库不存在的小区人工处理.xlsx", 1) + List> datas = ExcelUtils.read("C:\\Users\\ideoj\\Desktop\\鏁版嵁閮�-妤兼爧搴撳叆搴揬\20170310\\鎴垮彿搴撳瓨鍦ㄨ�屾ゼ鏍嬪簱涓嶅瓨鍦ㄧ殑灏忓尯浜哄伐澶勭悊.xlsx", 1) NewLoudongUtil loudongUtil = NewLoudongUtil.create(HOST, "fangjia_base", "loudong") for(List data : datas) { - println "开始导出\t$data" + println "寮�濮嬪鍑篭t$data" DBCursor dbCursor = HOUSE_LOUDONG.find(new BasicDBObject("city", data[1]).append("name", data[2])).addOption(Bytes.QUERYOPTION_NOTIMEOUT) for(DBObject dbObject : dbCursor) { @@ -31,7 +31,7 @@ class ExportHouseloudongToLoudong { loudong.setCity(dbObject.city) loudong.setRegion(dbObject.region) loudong.setName(dbObject.name) - loudong.setFrom(['旧数据']) + loudong.setFrom(['鏃ф暟鎹�']) loudong.setHouseNumber(dbObject.house_num) loudong.setUnitNumber(dbObject.house_num_unit) loudong.setAreas([dbObject.house_area]) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170314/Anshuo.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170314/Anshuo.groovy index ffb99a751..aaea44fde 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170314/Anshuo.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170314/Anshuo.groovy @@ -13,7 +13,7 @@ import org.apache.commons.beanutils.BeanMap import org.apache.commons.lang.StringUtils /** - * 安硕入库 + * 瀹夌鍏ュ簱 * Created by linxsh on 2017/3/14. */ class Anshuo { @@ -21,7 +21,7 @@ class Anshuo { static final DBCollection HOUSE_LOUDONG = MongoUtils.getCollectionByName("fangjia", "house_loudong", "192.168.0.136") public static void main(String[] args) { - String fileName = "C:\\Users\\ideoj\\Desktop\\数据部-楼栋库入库\\20170314\\安硕房产测试数据20160501.xlsx" + String fileName = "C:\\Users\\ideoj\\Desktop\\鏁版嵁閮�-妤兼爧搴撳叆搴揬\20170314\\瀹夌鎴夸骇娴嬭瘯鏁版嵁20160501.xlsx" // saveToHouseLoudong(fileName) saveToloudong(fileName) @@ -49,7 +49,7 @@ class Anshuo { String address = data[11] Loudong loudong = new Loudong() - loudong.setFrom(['商务']) + loudong.setFrom(['鍟嗗姟']) loudong.setCity(city) loudong.setRegion(region) loudong.setAddress(address) @@ -68,7 +68,7 @@ class Anshuo { static void saveToHouseLoudong(String fileName) { List> datas = ExcelUtils.read(fileName) - def from = "商务" + def from = "鍟嗗姟" def count = 0 for(List data : datas) { String city = data[9] @@ -115,6 +115,6 @@ class Anshuo { } } } - println "房号库新增:$count" + println "鎴垮彿搴撴柊澧烇細$count" } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170314/Jingdian.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170314/Jingdian.groovy index 9f8fbcf51..4835e48d3 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170314/Jingdian.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170314/Jingdian.groovy @@ -14,7 +14,7 @@ import org.apache.commons.lang.StringUtils import org.apache.commons.lang.math.NumberUtils /** - * 经典网 + * 缁忓吀缃� * Created by linxsh on 2017/3/14. */ class Jingdian { @@ -23,7 +23,7 @@ class Jingdian { static final DBCollection HOUSE_LOUDONG = MongoUtils.getCollectionByName("fangjia", "house_loudong", HOST) static void main(String[] args) { - String fileName = "C:\\Users\\ideoj\\Desktop\\数据部-楼栋库入库\\20170314\\经典网2.xlsx" + String fileName = "C:\\Users\\ideoj\\Desktop\\鏁版嵁閮�-妤兼爧搴撳叆搴揬\20170314\\缁忓吀缃�2.xlsx" // saveToLoudong(fileName) @@ -52,7 +52,7 @@ class Jingdian { roomNumber = StringUtils.substringBefore(roomNumber, ".") } - String source = "经典网" + String source = "缁忓吀缃�" HouseLoudong houseLoudng = new HouseLoudong() houseLoudng.city = city @@ -102,7 +102,7 @@ class Jingdian { } String unit = "--" - String source = "经典网" + String source = "缁忓吀缃�" Loudong loudong = new Loudong() loudong.setCity(city) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170322/Cities71.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170322/Cities71.groovy index 5332255a2..c42073187 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170322/Cities71.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170322/Cities71.groovy @@ -12,14 +12,14 @@ import net.sf.json.JSONObject import org.apache.commons.lang.StringUtils /** - * 71个城市入楼栋、房号库 + * 71涓煄甯傚叆妤兼爧銆佹埧鍙峰簱 * Created by linxsh on 2017/3/22. */ class Cities71 { static final DBCollection loudong = MongoUtils.getCollectionByName("fangjia_base", "loudong", "mongo.db.fangjia.com") public static void main(String[] args) { - String fileName = "C:\\Users\\ideoj\\Desktop\\数据部-楼栋库入库\\20170322\\71个城市_弄号小区.xlsx" + String fileName = "C:\\Users\\ideoj\\Desktop\\鏁版嵁閮�-妤兼爧搴撳叆搴揬\20170322\\71涓煄甯俖寮勫彿灏忓尯.xlsx" saveToLoudong(fileName) @@ -38,7 +38,7 @@ class Cities71 { if(StringUtils.isBlank(exists)) { DBObject saveObj = new BasicDBObject("city", city).append("region", region).append("name", name) .append("house_num", '--').append("unit_num", '--').append('floors', 0).append("addr", address) - .append("build_year", 0).append("from", ["小区库"]) + .append("build_year", 0).append("from", ["灏忓尯搴�"]) if(alias && alias != name) { saveObj.append("alias", [alias]) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170322/Shaoxingfc.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170322/Shaoxingfc.groovy index 3c5ef9a90..5639eb651 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170322/Shaoxingfc.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170322/Shaoxingfc.groovy @@ -22,7 +22,7 @@ import java.util.regex.Matcher import java.util.regex.Pattern /** - * 绍兴房产 + * 缁嶅叴鎴夸骇 * Created by linxsh on 2017/3/22. */ class Shaoxingfc { @@ -47,10 +47,10 @@ class Shaoxingfc { DBCursor dbCursor = SHAOXINGFC.find().addOption(Bytes.QUERYOPTION_NOTIMEOUT) int count = 0 for(DBObject dbObject : dbCursor) { - if (!"住宅".equals(dbObject.type) && !"商业".equals(dbObject.type)) { + if (!"浣忓畢".equals(dbObject.type) && !"鍟嗕笟".equals(dbObject.type)) { continue } - String city = "绍兴" + String city = "缁嶅叴" String region = dbObject.f_region String name = dbObject.name Double area = dbObject.area @@ -68,7 +68,7 @@ class Shaoxingfc { houseLoudng.house_num_unit = unitNumber houseLoudng.room_num = roomNumber houseLoudng.house_area = area - houseLoudng.from = "数据包" + houseLoudng.from = "鏁版嵁鍖�" houseLoudng.build_type = type @@ -95,10 +95,10 @@ class Shaoxingfc { DBCursor dbCursor = SHAOXINGFC.find().addOption(Bytes.QUERYOPTION_NOTIMEOUT) def result = [save: 0, update: 0] for(DBObject dbObject : dbCursor) { - if(!"住宅".equals(dbObject.type) && !"商业".equals(dbObject.type)) { + if(!"浣忓畢".equals(dbObject.type) && !"鍟嗕笟".equals(dbObject.type)) { continue } - String city = "绍兴" + String city = "缁嶅叴" String region = dbObject.f_region String name = dbObject.name Double area = dbObject.area @@ -116,7 +116,7 @@ class Shaoxingfc { loudong.setUnitNumber(unitNumber) loudong.setType(type) loudong.setAddress(addr) - loudong.setFrom(['数据包']) + loudong.setFrom(['鏁版嵁鍖�']) def r = loudongUtil.upsert(loudong) result.update += r.update @@ -128,7 +128,7 @@ class Shaoxingfc { static void formatRegion() { DBCursor dbCursor = SHAOXINGFC.find().addOption(Bytes.QUERYOPTION_NOTIMEOUT) for(DBObject dbObject : dbCursor) { - String city = "绍兴" + String city = "缁嶅叴" String formatRegion = dbObject.f_region formatRegion = RegionData.formatRegion(city, formatRegion) @@ -149,7 +149,7 @@ class Shaoxingfc { static String getRegionFromMap(String region) { String key = qqKeyPool.get() - String url = "http://apis.map.qq.com/ws/geocoder/v1/?address=绍兴市$region&key=$key" + String url = "http://apis.map.qq.com/ws/geocoder/v1/?address=缁嶅叴甯�$region&key=$key" String result = HttpRequestUtil.get(url, null) qqKeyPool.returnToPool(key) key = qqKeyPool.get() @@ -172,7 +172,7 @@ class Shaoxingfc { static def format() { DBCursor dbCursor = SHAOXINGFC.find().addOption(Bytes.QUERYOPTION_NOTIMEOUT) - Pattern pattern = Pattern.compile('(\\w+)(?=室)') + Pattern pattern = Pattern.compile('(\\w+)(?=瀹�)') for(DBObject dbObject : dbCursor) { String city = dbObject.city String region = dbObject.region diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170324/Chenzhou.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170324/Chenzhou.groovy index 76a482d2d..f2bd2a2fe 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170324/Chenzhou.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170324/Chenzhou.groovy @@ -25,7 +25,7 @@ class Chenzhou { static final DBCollection HOUSE_LOUDONG = MongoUtils.getCollectionByName("fangjia", "house_loudong", host) public static void main(String[] args) { - String fileName = "C:\\Users\\ideoj\\Desktop\\数据部-楼栋库入库\\20170324\\郴州市官网小区整理.xlsx" + String fileName = "C:\\Users\\ideoj\\Desktop\\鏁版嵁閮�-妤兼爧搴撳叆搴揬\20170324\\閮村窞甯傚畼缃戝皬鍖烘暣鐞�.xlsx" List> datas = ExcelUtils.read(fileName, 1) @@ -56,7 +56,7 @@ class Chenzhou { return oriAddress } - //将数据保存到楼栋库 + //灏嗘暟鎹繚瀛樺埌妤兼爧搴� static def saveToLoudong(List> datas) { int save = 0 int update = 0 @@ -94,11 +94,11 @@ class Chenzhou { String fitment = data[10] String direction = data[11] - //地址处理:匹配到的地址不一样时,用精确地址;如果原地址和匹配地址都是精确地址,则采用原地址 + //鍦板潃澶勭悊锛氬尮閰嶅埌鐨勫湴鍧�涓嶄竴鏍锋椂锛岀敤绮剧‘鍦板潃锛涘鏋滃師鍦板潃鍜屽尮閰嶅湴鍧�閮芥槸绮剧‘鍦板潃锛屽垯閲囩敤鍘熷湴鍧� address = handleAddress(city, region, address, name) Loudong loudong = new Loudong() - loudong.setFrom(['数据包']) + loudong.setFrom(['鏁版嵁鍖�']) loudong.setCity(city) loudong.setRegion(region) loudong.setName(name) @@ -114,15 +114,15 @@ class Chenzhou { save += result.save update += result.update } - println "[楼栋库] 新增:${save}, 更新:${update}" + println "[妤兼爧搴揮 鏂板锛�${save}, 鏇存柊锛�${update}" } /** - * 将数据保存到房号库 + * 灏嗘暟鎹繚瀛樺埌鎴垮彿搴� * @param datas */ static def saveToHouseLoudong(List> datas) { - String source = "数据包" + String source = "鏁版嵁鍖�" int count = 0 for(List data : datas) { String city = data[0] @@ -158,7 +158,7 @@ class Chenzhou { String fitment = data[10] String direction = data[11] - //地址处理:匹配到的地址不一样时,用精确地址;如果原地址和匹配地址都是精确地址,则采用原地址 + //鍦板潃澶勭悊锛氬尮閰嶅埌鐨勫湴鍧�涓嶄竴鏍锋椂锛岀敤绮剧‘鍦板潃锛涘鏋滃師鍦板潃鍜屽尮閰嶅湴鍧�閮芥槸绮剧‘鍦板潃锛屽垯閲囩敤鍘熷湴鍧� // address = handleAddress(city, region, address, name) HouseLoudong houseLoudng = new HouseLoudong() @@ -193,6 +193,6 @@ class Chenzhou { } } } - println "[房号库] 新增:$count" + println "[鎴垮彿搴揮 鏂板锛�$count" } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170418/LianjiaImage.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170418/LianjiaImage.groovy index c70170b0e..43773c27c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170418/LianjiaImage.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170418/LianjiaImage.groovy @@ -17,7 +17,7 @@ import org.apache.commons.lang.math.NumberUtils import org.bson.types.ObjectId /** - * 链家楼栋数信息和小区图片入库 + * 閾惧妤兼爧鏁颁俊鎭拰灏忓尯鍥剧墖鍏ュ簱 * Created by linxsh on 2017/4/18. */ class LianjiaImage { @@ -43,9 +43,9 @@ class LianjiaImage { } region = RegionData.formatRegion(city, region) - name = name.replaceAll('[((].+[))]', '') + name = name.replaceAll('[(锛圿.+[锛�)]', '') - if(StringUtils.isNotBlank(houses) && houses.matches("\\d+栋.*")) { + if(StringUtils.isNotBlank(houses) && houses.matches("\\d+鏍�.*")) { houses = houses.replaceAll('[\\D]', '') } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170418/YungujiaCompare.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170418/YungujiaCompare.groovy index 48e7b1d53..a7d176b57 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170418/YungujiaCompare.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170418/YungujiaCompare.groovy @@ -15,7 +15,7 @@ import com.mongodb.Mongo import org.apache.commons.lang.StringUtils /** - * 云估价和小区库对比 + * 浜戜及浠峰拰灏忓尯搴撳姣� * Created by linxsh on 2017/4/18. */ class YungujiaCompare { @@ -29,7 +29,7 @@ class YungujiaCompare { static def CITYS = []; public static void main(String[] args) { - ExcelUtils.modify("D:\\云估价数据统计-只有云估价存在.xlsx", {row-> + ExcelUtils.modify("D:\\浜戜及浠锋暟鎹粺璁�-鍙湁浜戜及浠峰瓨鍦�.xlsx", {row-> boolean exists = existsInSeaweedAddress(row[0], row[1], row[2]) row['F'] = exists }) @@ -38,13 +38,13 @@ class YungujiaCompare { static void process() { SERVER_AREA_CONN.find(new BasicDBObject('status', new BasicDBObject('$in', [0, 2]))).each { CITYS << it.display } - //云估价存在,而小区库不存在的数据 - def exitsInYungujia = [['城市', '区域', "小区名", '地址']] - //小区库存在,而云估价不存在的数据 - def exitsInSeaweed = [['城市', '区域', "小区名", '地址']] - //统计表格 - def countDatas = [['城市', "房讯通小区量", "房价网小区量", "都存在的小区量", "只有房讯通存在的小区量", "只有房价网存在的小区量"]] -// CITYS = ["汕头"] + //浜戜及浠峰瓨鍦紝鑰屽皬鍖哄簱涓嶅瓨鍦ㄧ殑鏁版嵁 + def exitsInYungujia = [['鍩庡競', '鍖哄煙', "灏忓尯鍚�", '鍦板潃']] + //灏忓尯搴撳瓨鍦紝鑰屼簯浼颁环涓嶅瓨鍦ㄧ殑鏁版嵁 + def exitsInSeaweed = [['鍩庡競', '鍖哄煙', "灏忓尯鍚�", '鍦板潃']] + //缁熻琛ㄦ牸 + def countDatas = [['鍩庡競', "鎴胯閫氬皬鍖洪噺", "鎴夸环缃戝皬鍖洪噺", "閮藉瓨鍦ㄧ殑灏忓尯閲�", "鍙湁鎴胯閫氬瓨鍦ㄧ殑灏忓尯閲�", "鍙湁鎴夸环缃戝瓨鍦ㄧ殑灏忓尯閲�"]] +// CITYS = ["姹曞ご"] CITYS.each {city-> DBCursor dbCursor = YUNGUJIA.find(new BasicDBObject("city", city)).addOption(Bytes.QUERYOPTION_NOTIMEOUT) DSCursor dsCursor = DbUtils.seaweed.find(new BasicDBObject('city', city).append("cat", "district").append("visible", 0)) @@ -99,12 +99,12 @@ class YungujiaCompare { println countDatas - println "\n开始保存数据" + println "\n寮�濮嬩繚瀛樻暟鎹�" - ExcelUtils.write("D:/云估价数据统计.xlsx", countDatas, "小区对比") - ExcelUtils.write("D:/云估价数据统计2.xlsx", exitsInYungujia, "只有房讯通存在的小区明细") - ExcelUtils.write("D:/云估价数据统计3.xlsx", exitsInSeaweed, "只有房价网存在的小区明细") + ExcelUtils.write("D:/浜戜及浠锋暟鎹粺璁�.xlsx", countDatas, "灏忓尯瀵规瘮") + ExcelUtils.write("D:/浜戜及浠锋暟鎹粺璁�2.xlsx", exitsInYungujia, "鍙湁鎴胯閫氬瓨鍦ㄧ殑灏忓尯鏄庣粏") + ExcelUtils.write("D:/浜戜及浠锋暟鎹粺璁�3.xlsx", exitsInSeaweed, "鍙湁鎴夸环缃戝瓨鍦ㄧ殑灏忓尯鏄庣粏") } static def findInSeaweed(String city, String region, String name) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170419/LianjiaHousehold.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170419/LianjiaHousehold.groovy index 90aafde3a..2d71fbdc1 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170419/LianjiaHousehold.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170419/LianjiaHousehold.groovy @@ -13,7 +13,7 @@ import org.apache.commons.lang.StringUtils import org.apache.commons.lang.math.NumberUtils /** - * 链家小区楼栋数信息 + * 閾惧灏忓尯妤兼爧鏁颁俊鎭� * Created by linxsh on 2017/4/19. */ class LianjiaHousehold { @@ -44,7 +44,7 @@ class LianjiaHousehold { } /** - * 不存在此小区 + * 涓嶅瓨鍦ㄦ灏忓尯 */ LIANJIA.update(new BasicDBObject("_id", dbObject._id), new BasicDBObject('$set', new BasicDBObject("count", count))) if(count == 0) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170419/Yungujia.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170419/Yungujia.groovy index 6c2632c81..30d04c708 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170419/Yungujia.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170419/Yungujia.groovy @@ -9,12 +9,12 @@ import com.mongodb.DBObject import org.apache.commons.lang.StringUtils /** - * 只有云估价存在的小区处理 + * 鍙湁浜戜及浠峰瓨鍦ㄧ殑灏忓尯澶勭悊 * Created by linxsh on 2017/4/19. */ class Yungujia { static void main(String[] args) { - String fileName = "C:\\Users\\ideoj\\Desktop\\数据部-楼栋库入库\\20170419\\云估价数据统计-只有云估价存在_1_.xlsx" + String fileName = "C:\\Users\\ideoj\\Desktop\\鏁版嵁閮�-妤兼爧搴撳叆搴揬\20170419\\浜戜及浠锋暟鎹粺璁�-鍙湁浜戜及浠峰瓨鍦╛1_.xlsx" ExcelUtils.modify(fileName, {row-> String city = row[0] String region = row[1] @@ -25,7 +25,7 @@ class Yungujia { DBObject findObj = findByNameInSeaweed(city, region, name) if(findObj == null) { if(addr) { - address = addr.replaceAll("^($city)市?", "").replaceAll("^($region)区?", "") + address = addr.replaceAll("^($city)甯�?", "").replaceAll("^($region)鍖�?", "") findObj = findByAddressInSeaweed(city, region, address) } } @@ -34,9 +34,9 @@ class Yungujia { row['G'] = address } if(findObj == null) { - row['H'] = '否' + row['H'] = '鍚�' } else { - row['H'] = '是' + row['H'] = '鏄�' row['I'] = findObj.name } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170424/YungujiaCompare.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170424/YungujiaCompare.groovy index 025360af0..e27f25118 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170424/YungujiaCompare.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170424/YungujiaCompare.groovy @@ -11,14 +11,14 @@ import com.mongodb.DBObject import org.apache.commons.lang.StringUtils /** - * 贵阳小区和云估价小区对比 + * 璐甸槼灏忓尯鍜屼簯浼颁环灏忓尯瀵规瘮 * Created by linxsh on 2017/4/24. */ class YungujiaCompare { static final DBCollection YUNGUJIA = MongoUtils.getCollectionByName("fangjia", "wx_gujia_proj", "192.168.0.61") static void main(String[] args) { - /*DSCursor dsCursor = DbUtils.seaweed.find(new BasicDBObject("city", "贵阳")) + /*DSCursor dsCursor = DbUtils.seaweed.find(new BasicDBObject("city", "璐甸槼")) Set cache = new HashSet() for (DBObject dbObject : dsCursor) { String city = dbObject.city @@ -40,13 +40,13 @@ class YungujiaCompare { println str }*/ - process("成都") + process("鎴愰兘") } static def process(def city) { DSCursor dsCursor = DbUtils.seaweed.find(new BasicDBObject("cat", "district").append("visible", 0).append("city", city)) -// String city = "贵阳" - def datas = [["城市", "区域", "小区名", "地址"]] +// String city = "璐甸槼" + def datas = [["鍩庡競", "鍖哄煙", "灏忓尯鍚�", "鍦板潃"]] for (DBObject dbObject : dsCursor) { String region = dbObject.region String name = dbObject.name @@ -61,7 +61,7 @@ class YungujiaCompare { } println "done" - ExcelUtils.write("D://云估价-$city 小区数据对比.xlsx", datas, 'data') + ExcelUtils.write("D://浜戜及浠�-$city 灏忓尯鏁版嵁瀵规瘮.xlsx", datas, 'data') } static def findInYungujia(String city, String region, String name, BasicDBList alias, String address, BasicDBList addressAlias) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170425/AnjukeLoudong.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170425/AnjukeLoudong.groovy index 3baa6f870..4a1892d5e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170425/AnjukeLoudong.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170425/AnjukeLoudong.groovy @@ -17,14 +17,14 @@ import java.util.regex.Matcher import java.util.regex.Pattern /** - * 提取安居客预售信息中的楼栋信息并入库 + * 鎻愬彇瀹夊眳瀹㈤鍞俊鎭腑鐨勬ゼ鏍嬩俊鎭苟鍏ュ簱 * Created by linxsh on 2017/4/25. */ class AnjukeLoudong { static final DBCollection ANJUKE = MongoUtils.getCollectionByName("crawled_data", "anjuke_ld", "192.168.0.61") - static Pattern pattern = Pattern.compile("((?:[-0-9a-zA-Z]+、)*?[-0-9a-zA-Z]+)(?=号楼|#|幢)") + static Pattern pattern = Pattern.compile("((?:[-0-9a-zA-Z]+銆�)*?[-0-9a-zA-Z]+)(?=鍙锋ゼ|#|骞�)") public static void main(String[] args) { @@ -35,7 +35,7 @@ class AnjukeLoudong { static void exportToExcel() { DBCursor dbCursor = ANJUKE.find().addOption(Bytes.QUERYOPTION_NOTIMEOUT) - def datas = [["城市", "区域", "小区名", "楼号", "类型", "预售证号"]] + def datas = [["鍩庡競", "鍖哄煙", "灏忓尯鍚�", "妤煎彿", "绫诲瀷", "棰勫敭璇佸彿"]] for(DBObject dbObject : dbCursor) { String city = dbObject.city String region = dbObject.region @@ -51,7 +51,7 @@ class AnjukeLoudong { datas << [city, formatRegion, name, houseNumbers.toString(), type, preLic] } - ExcelUtils.write("D://安居客楼栋信息.xlsx", datas, "data") + ExcelUtils.write("D://瀹夊眳瀹㈡ゼ鏍嬩俊鎭�.xlsx", datas, "data") } static String getFormatRegion(String city, String region) { @@ -91,8 +91,8 @@ class AnjukeLoudong { Set houseNumbers = Sets.newHashSet() while (matcher.find()) { String houseNumber = matcher.group(1) - if(houseNumber.contains("、")) { - String[] numbers = houseNumber.split("、") + if(houseNumber.contains("銆�")) { + String[] numbers = houseNumber.split("銆�") for(String num : numbers) { houseNumbers.add(num) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170425/HandleShWy.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170425/HandleShWy.groovy index 79eaaab9d..6465318e4 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170425/HandleShWy.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170425/HandleShWy.groovy @@ -8,7 +8,7 @@ import com.mongodb.DBCursor import com.mongodb.DBObject /** - * 上海物业数据整理 + * 涓婃捣鐗╀笟鏁版嵁鏁寸悊 * Created by linxsh on 2017/4/25. */ class HandleShWy { @@ -21,7 +21,7 @@ class HandleShWy { static void format() { DBCursor dbCursor = WUYE.find().addOption(Bytes.QUERYOPTION_NOTIMEOUT) - String city = "上海" + String city = "涓婃捣" for(DBObject dbObject : dbCursor) { String name = dbObject.st_name_frst if(!name) { @@ -36,8 +36,8 @@ class HandleShWy { static String formatNameNew(final String name) { if(!name) {return name} String result = name - if(name.matches("[\u4e00-\u9fa5]+街道[一-龥\\w]+")) { - result = name.replaceAll('[一-龥]+街道([一-龥\\w]+)', '$1') + if(name.matches("[\u4e00-\u9fa5]+琛楅亾[涓�-榫\w]+")) { + result = name.replaceAll('[涓�-榫+琛楅亾([涓�-榫\w]+)', '$1') } return result } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170425/ShPaifang.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170425/ShPaifang.groovy index f7f8df234..bd77ea510 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170425/ShPaifang.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170425/ShPaifang.groovy @@ -14,7 +14,7 @@ import org.apache.commons.lang.StringUtils import org.apache.commons.lang.math.NumberUtils /** - * 上海拍房网 + * 涓婃捣鎷嶆埧缃� * Created by linxsh on 2017/4/25. */ class ShPaifang { @@ -25,7 +25,7 @@ class ShPaifang { public static void main(String[] args) { - String fileName = "C:\\Users\\ideoj\\Desktop\\数据部-楼栋库入库\\20170425\\上海拍房网.xlsx" + String fileName = "C:\\Users\\ideoj\\Desktop\\鏁版嵁閮�-妤兼爧搴撳叆搴揬\20170425\\涓婃捣鎷嶆埧缃�.xlsx" saveToLoudong(fileName) @@ -34,7 +34,7 @@ class ShPaifang { static void saveToLoudong(String fileName) { def datas = ExcelUtils.read(fileName) - String city = "上海" + String city = "涓婃捣" def result = ["update": 0, "save": 0] datas.each {row-> String region = RegionData.formatRegion(city, row[6]) @@ -53,7 +53,7 @@ class ShPaifang { loudong.setHouseNumber(houseNumber) loudong.setUnitNumber("--") loudong.setAddress(address) - loudong.setFrom(["数据包"]) + loudong.setFrom(["鏁版嵁鍖�"]) if(NumberUtils.toDouble(area) > 0) { loudong.setAreas([NumberUtils.toDouble(area)]) } @@ -69,7 +69,7 @@ class ShPaifang { static void saveToHouseLoudong(String fileName) { def datas = ExcelUtils.read(fileName) - String city = "上海" + String city = "涓婃捣" int count = 0 datas.each { row -> String region = RegionData.formatRegion(city, row[6]) @@ -94,7 +94,7 @@ class ShPaifang { if(StringUtils.isNotBlank(remark)) { houseLoudong.setRemark(remark) } - houseLoudong.setFrom("数据包") + houseLoudong.setFrom("鏁版嵁鍖�") houseLoudong.setHouse_area(NumberUtils.toDouble(area)) if(StringUtils.isNotBlank(city) && StringUtils.isNotBlank(region) && StringUtils.isNotBlank(name) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170519/CleanHouseLoudongUnit.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170519/CleanHouseLoudongUnit.groovy index f56cbc71f..80b8b076f 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170519/CleanHouseLoudongUnit.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170519/CleanHouseLoudongUnit.groovy @@ -18,10 +18,10 @@ class CleanHouseLoudongUnit { static final DBCollection HLD = MongoUtils.getCollectionByName("distinct", "hld", "192.168.10.47") public static void main(String[] args) { - //过滤数据 + //杩囨护鏁版嵁 filterData() - //整理数据 + //鏁寸悊鏁版嵁 // updateData() } @@ -58,11 +58,11 @@ class CleanHouseLoudongUnit { String houseNum = dbObject.house_num DBObject query = new BasicDBObject("city", city).append("region", region).append("name", name) .append("house_num", houseNum).append("house_num_unit", "--") - if(HOUSELOUDONG.findOne(query) != null) {//修改后会重复,特殊处理 + if(HOUSELOUDONG.findOne(query) != null) {//淇敼鍚庝細閲嶅锛岀壒娈婂鐞� DBObject updateQuery = new BasicDBObject("city", city).append("region", region).append("name", name) .append("house_num", houseNum).append("house_num_unit", "1") HOUSELOUDONG.update(updateQuery, new BasicDBObject('$set', new BasicDBObject("house_num_unit", '--').append("status", 4)), false, true) - } else {//直接修改 + } else {//鐩存帴淇敼 DBObject updateQuery = new BasicDBObject("city", city).append("region", region).append("name", name).append("house_num", houseNum) HOUSELOUDONG.update(updateQuery, new BasicDBObject('$set', new BasicDBObject("house_num_unit", '--')), false, true) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170519/CleanLoudongUnit.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170519/CleanLoudongUnit.groovy index 02121130f..9899b3549 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170519/CleanLoudongUnit.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170519/CleanLoudongUnit.groovy @@ -9,7 +9,7 @@ import com.mongodb.DBCursor import com.mongodb.DBObject /** - * 整理楼栋库中的单元号 + * 鏁寸悊妤兼爧搴撲腑鐨勫崟鍏冨彿 * Created by linxsh on 2017/5/19. */ class CleanLoudongUnit { @@ -19,10 +19,10 @@ class CleanLoudongUnit { static final DBCollection LD = MongoUtils.getCollectionByName("distinct", "ld", "192.168.10.47") public static void main(String[] args) { - //过滤数据 + //杩囨护鏁版嵁 // filterData() - //整理数据 + //鏁寸悊鏁版嵁 updateData() } @@ -42,11 +42,11 @@ class CleanLoudongUnit { String houseNum = dbObject.house_num DBObject query = new BasicDBObject("city", city).append("region", region).append("name", name) .append("house_num", houseNum).append("unit_num", "--") - if(LOUDONG.findOne(query) != null) {//修改后会重复,特殊处理 + if(LOUDONG.findOne(query) != null) {//淇敼鍚庝細閲嶅锛岀壒娈婂鐞� DBObject updateQuery = new BasicDBObject("city", city).append("region", region).append("name", name) .append("house_num", houseNum).append("unit_num", "1") LOUDONG.update(updateQuery, new BasicDBObject('$set', new BasicDBObject("unit_num", '--').append("status", 4))) - } else {//直接修改 + } else {//鐩存帴淇敼 DBObject updateQuery = new BasicDBObject("city", city).append("region", region).append("name", name).append("house_num", houseNum) LOUDONG.update(updateQuery, new BasicDBObject('$set', new BasicDBObject("unit_num", '--')), false, true) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170602/FormatHouseloudong.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170602/FormatHouseloudong.groovy index 51ee9d4bb..2bbf6f0da 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170602/FormatHouseloudong.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170602/FormatHouseloudong.groovy @@ -9,7 +9,7 @@ import com.mongodb.DBObject import org.apache.commons.lang.StringUtils /** - * 房号库室号处理 + * 鎴垮彿搴撳鍙峰鐞� * Created by linxsh on 2017/6/2. */ class FormatHouseloudong { @@ -20,7 +20,7 @@ class FormatHouseloudong { } /** - * 室号4-5位,且以0开头的,将前面的0去除 + * 瀹ゅ彿4-5浣嶏紝涓斾互0寮�澶寸殑锛屽皢鍓嶉潰鐨�0鍘婚櫎 */ static void formatHouseNumber() { DBCursor dbCursor = HOUSELOUDONG.find().addOption(Bytes.QUERYOPTION_NOTIMEOUT) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170605/CompleteAddr.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170605/CompleteAddr.groovy index 4ed29d373..5db2af0d6 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170605/CompleteAddr.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170605/CompleteAddr.groovy @@ -9,7 +9,7 @@ import com.mongodb.DBObject import org.apache.commons.lang.StringUtils /** - * 补充房号库的地址 + * 琛ュ厖鎴垮彿搴撶殑鍦板潃 * Created by linxsh on 2017/6/5. */ class CompleteAddr { @@ -27,7 +27,7 @@ class CompleteAddr { DBObject findObj = LD.findOne(new BasicDBObject("city", city).append("name", name).append("house_num", houseNumber)) if(findObj == null) { - findObj = LD.findOne(new BasicDBObject("city", city + "市").append("name", name).append("house_num", houseNumber)) + findObj = LD.findOne(new BasicDBObject("city", city + "甯�").append("name", name).append("house_num", houseNumber)) } if(findObj != null) { String address = findObj.addr; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170606/ExportDemo.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170606/ExportDemo.groovy index 888d27f31..90f20c249 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170606/ExportDemo.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170606/ExportDemo.groovy @@ -16,7 +16,7 @@ import org.apache.lucene.search.TermQuery import org.apache.solr.client.solrj.util.ClientUtils /** - * 样本数据导出 + * 鏍锋湰鏁版嵁瀵煎嚭 * Created by linxsh on 2017/6/6. */ class ExportDemo { @@ -29,7 +29,7 @@ class ExportDemo { final static def CITYS = []; public static void main(String[] args) { - String fileName = "C:\\Users\\ideoj\\Desktop\\兴业银行各分行城市覆盖率及全国366个城市覆盖率.xlsx" + String fileName = "C:\\Users\\ideoj\\Desktop\\鍏翠笟閾惰鍚勫垎琛屽煄甯傝鐩栫巼鍙婂叏鍥�366涓煄甯傝鐩栫巼.xlsx" def allCitys = [:]; DBObject cityQuery = new BasicDBObject('status', new BasicDBObject('$in', [0, 2])) @@ -79,7 +79,7 @@ class ExportDemo { } /** - * 样本数量 + * 鏍锋湰鏁伴噺 * @param city * @param reigon * @return @@ -103,8 +103,8 @@ class ExportDemo { } query.put('weekend', weekend); BasicDBList values = new BasicDBList(); - values.add(new BasicDBObject("estate_type", '小区')); - values.add(new BasicDBObject("estate_type", '别墅')); + values.add(new BasicDBObject("estate_type", '灏忓尯')); + values.add(new BasicDBObject("estate_type", '鍒')); query.put('$or', values); int pc = DISTRICT_STAT_CONN.count(query); return roundDouble(pc, disCount) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170607/CompleteLoop.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170607/CompleteLoop.groovy index c20c2e1c7..87702731c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170607/CompleteLoop.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170607/CompleteLoop.groovy @@ -6,12 +6,12 @@ import com.mongodb.BasicDBObject import com.mongodb.DBObject /** - * 小区环线填充 + * 灏忓尯鐜嚎濉厖 * Created by linxsh on 2017/6/7. */ class CompleteLoop { static void main(String[] args) { - String fileName = "C:\\Users\\ideoj\\Downloads\\统计局填充数据.xlsx" + String fileName = "C:\\Users\\ideoj\\Downloads\\缁熻灞�濉厖鏁版嵁.xlsx" def datas = ExcelUtils.read(fileName) datas.each {data-> @@ -20,14 +20,14 @@ class CompleteLoop { String loop = data[4] - DBObject findObj = findInSeaweed("上海", region, name) + DBObject findObj = findInSeaweed("涓婃捣", region, name) if(findObj) { println findObj def markMap = findObj['mark_map'] if(markMap == null) { markMap = new BasicDBObject() } - markMap['loop_line_info_from'] = '统计局' + markMap['loop_line_info_from'] = '缁熻灞�' DbUtils.seaweed.update(new BasicDBObject('_id', findObj._id), new BasicDBObject('$set', new BasicDBObject('loop_line_info', loop).append('mark_map', markMap))) } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170608/ExportHouseOffice3.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170608/ExportHouseOffice3.groovy index eca67c571..1f679ea46 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170608/ExportHouseOffice3.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170608/ExportHouseOffice3.groovy @@ -39,12 +39,12 @@ class ExportHouseOffice{ static doSomething(){ - def city = '深圳' + def city = '娣卞湷' def query = new BasicDBObject() query.append("city", city).append("cat","office").append("audit_status",0).append("data_status",0).append("exists",0) def idx = 0 def datas = [] - datas << ["城市", "区域", "名称", "地址", "物业类型", "地图是否存在", "地图区域", "地图名称", "地图地址", "API类型", "来源", "库中是否存在", "库中名称", "库中区域", "库中地址"] + datas << ["鍩庡競", "鍖哄煙", "鍚嶇О", "鍦板潃", "鐗╀笟绫诲瀷", "鍦板浘鏄惁瀛樺湪", "鍦板浘鍖哄煙", "鍦板浘鍚嶇О", "鍦板浘鍦板潃", "API绫诲瀷", "鏉ユ簮", "搴撲腑鏄惁瀛樺湪", "搴撲腑鍚嶇О", "搴撲腑鍖哄煙", "搴撲腑鍦板潃"] ANALY_SITE_COLL.find(query).each {BasicDBObject dbo-> idx++ try{ @@ -63,14 +63,14 @@ class ExportHouseOffice{ region = o.region address = o.address if(o.status==0){ - isExist='是' + isExist='鏄�' }else{ - isExist='否' + isExist='鍚�' } } def isMapExist - def mapOrigin //来源 + def mapOrigin //鏉ユ簮 def mapRegion def mapName def mapAddress @@ -82,16 +82,16 @@ class ExportHouseOffice{ if(bean==null) { bean = UpdateDistrictLocation.getLocationByTengXunApi(dbo.city, dbo.district_name, null, null) if(bean!=null){ - mapOrigin='腾讯' + mapOrigin='鑵捐' } }else{ - mapOrigin='高德' + mapOrigin='楂樺痉' } }else{ - mapOrigin='百度' + mapOrigin='鐧惧害' } if(bean!=null){ - isMapExist='是' + isMapExist='鏄�' mapRegion = bean.district mapName = bean.name // mapAddress = bean.address @@ -108,18 +108,18 @@ class ExportHouseOffice{ mapApi = bean.type } }else{ - isMapExist='否' + isMapExist='鍚�' } - //"城市", "区域", "名称", "地址", "物业类型", "地图是否存在", "地图区域", "地图名称", "地图地址", "API类型", "来源", "库中是否存在", "库中名称", "库中区域", "库中地址" + //"鍩庡競", "鍖哄煙", "鍚嶇О", "鍦板潃", "鐗╀笟绫诲瀷", "鍦板浘鏄惁瀛樺湪", "鍦板浘鍖哄煙", "鍦板浘鍚嶇О", "鍦板浘鍦板潃", "API绫诲瀷", "鏉ユ簮", "搴撲腑鏄惁瀛樺湪", "搴撲腑鍚嶇О", "搴撲腑鍖哄煙", "搴撲腑鍦板潃" datas<<[dbo.city,dbo.region,dbo.district_name,dbo.address,estate_type2,isMapExist,mapRegion,mapName,mapAddress,mapApi,mapOrigin,isExist,name,region,address] }catch(Exception e){ } - println '当前********************'+idx + println '褰撳墠********************'+idx } println idx - ExcelUtils.write("D:\\65后台${city}写字楼导出.xlsx", datas, "sheet") + ExcelUtils.write("D:\\65鍚庡彴${city}鍐欏瓧妤煎鍑�.xlsx", datas, "sheet") } @@ -129,7 +129,7 @@ class ExportHouseOffice{ DBObject query = new BasicDBObject("city", city).append("name", disName) DBObject mapdata = UpdateDistrictLocation.mapdata_coll.findOne(query) //if(mapdata == null) { - JSONObject json = BaiDuApiUtils.search(city, disName, "写字楼", 1, 20, 0) + JSONObject json = BaiDuApiUtils.search(city, disName, "鍐欏瓧妤�", 1, 20, 0) if(json.getInt("status") == 0) { JSONArray array = json.get("results") if(array) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170612/CompleteFromYungujiaWylx.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170612/CompleteFromYungujiaWylx.groovy index d3edb2916..e824524a8 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170612/CompleteFromYungujiaWylx.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170612/CompleteFromYungujiaWylx.groovy @@ -6,13 +6,13 @@ import com.mongodb.BasicDBObject import com.mongodb.DBObject /** - * 云估价物业类型填充 + * 浜戜及浠风墿涓氱被鍨嬪~鍏� * Created by linxsh on 2017/6/12. */ class CompleteFromYungujiaWylx { static void main(String[] args) { -// String fileName = "C:\\Users\\ideoj\\Desktop\\数据部-楼栋库入库\\20170612\\云估价数据统计-只有云估价存在_含物业类型_.xlsx" - String fileName = "C:\\Users\\ideoj\\Desktop\\数据部-楼栋库入库\\20170613\\云估价数据统计-只有云估价存在_1__2_11111.xlsx" +// String fileName = "C:\\Users\\ideoj\\Desktop\\鏁版嵁閮�-妤兼爧搴撳叆搴揬\20170612\\浜戜及浠锋暟鎹粺璁�-鍙湁浜戜及浠峰瓨鍦╛鍚墿涓氱被鍨媉.xlsx" + String fileName = "C:\\Users\\ideoj\\Desktop\\鏁版嵁閮�-妤兼爧搴撳叆搴揬\20170613\\浜戜及浠锋暟鎹粺璁�-鍙湁浜戜及浠峰瓨鍦╛1__2_11111.xlsx" // extract(fileName) @@ -32,11 +32,11 @@ class CompleteFromYungujiaWylx { .append('city', city).append('region', region).append('alias', name)) } if(findObj != null) { - row['H'] = '是' + row['H'] = '鏄�' row['I'] = findObj.name row['J'] = findObj.sid } else { - row['H'] = '否' + row['H'] = '鍚�' } } }) @@ -51,7 +51,7 @@ class CompleteFromYungujiaWylx { String type = row[11] String remark = row[12] - if(remark == '新增') { + if(remark == '鏂板') { DBObject findObj = DbUtils.seaweed.findOne(new BasicDBObject('cat', 'district').append('visible', 0) .append('city', city).append('region', region).append('name', name)) if(findObj == null) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170613/FindDuplicateRegion.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170613/FindDuplicateRegion.groovy index 5b5cf221d..529b7c66d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170613/FindDuplicateRegion.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170613/FindDuplicateRegion.groovy @@ -15,7 +15,7 @@ import org.apache.commons.collections.CollectionUtils import org.apache.commons.lang.StringUtils /** - * 找出房号库中城市、小区名一致,区域不一致的数据 + * 鎵惧嚭鎴垮彿搴撲腑鍩庡競銆佸皬鍖哄悕涓�鑷达紝鍖哄煙涓嶄竴鑷寸殑鏁版嵁 * Created by linxsh on 2017/6/13. */ class FindDuplicateRegion { @@ -33,10 +33,10 @@ class FindDuplicateRegion { static void export() { DBCursor dbCursor = Target.find().addOption(Bytes.QUERYOPTION_NOTIMEOUT) def datas = [] - datas << ["城市", "小区名", "房号库区域", "小区库区域", "来源"] + datas << ["鍩庡競", "灏忓尯鍚�", "鎴垮彿搴撳尯鍩�", "灏忓尯搴撳尯鍩�", "鏉ユ簮"] for(DBObject dbObject : dbCursor) { String city = dbObject.city - if(city =='福州' || city=='厦门' || city=='上海') { + if(city =='绂忓窞' || city=='鍘﹂棬' || city=='涓婃捣') { continue } def regionInSeaweed = dbObject.region_seaweed @@ -45,13 +45,13 @@ class FindDuplicateRegion { datas << [dbObject.city, dbObject.name, StringUtils.join(regions, ","), StringUtils.join(regionInSeaweed, ","), StringUtils.join(dbObject.from, ",")] } } - ExcelUtils.write("D://房号库区域对比.xlsx", datas, 'sheet1') + ExcelUtils.write("D://鎴垮彿搴撳尯鍩熷姣�.xlsx", datas, 'sheet1') } static void find() { Map> cache = Maps.newHashMap() - DBCursor dbCursor = HOUSE_LOUDONG.find(new BasicDBObject('status', 0).append("city", new BasicDBObject('$in', ['福州', '厦门', '上海']))).addOption(Bytes.QUERYOPTION_NOTIMEOUT) + DBCursor dbCursor = HOUSE_LOUDONG.find(new BasicDBObject('status', 0).append("city", new BasicDBObject('$in', ['绂忓窞', '鍘﹂棬', '涓婃捣']))).addOption(Bytes.QUERYOPTION_NOTIMEOUT) for(DBObject dbObject : dbCursor) { String city = dbObject.city String region = dbObject.region diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170616/ExtractYfsdDistrict.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170616/ExtractYfsdDistrict.groovy index 0e66b0717..88165ac3f 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170616/ExtractYfsdDistrict.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170616/ExtractYfsdDistrict.groovy @@ -11,7 +11,7 @@ import com.mongodb.DBObject import net.sf.json.JSONObject /** - * 提取优房闪贷的小区 + * 鎻愬彇浼樻埧闂捶鐨勫皬鍖� * Created by linxsh on 2017/6/16. */ class ExtractYfsdDistrict { @@ -20,7 +20,7 @@ class ExtractYfsdDistrict { private static DBCollection YFSD_XIAMEN = MongoUtils.getCollectionByName("buildings", "yfsd_xiamen", "192.168.0.61") private static DBCollection Target = MongoUtils.getCollectionByName("buildings", "yfsd_district", "192.168.0.61") - def static cities = ["济南", "昆明", "呼和浩特", "北京"] + def static cities = ["娴庡崡", "鏄嗘槑", "鍛煎拰娴╃壒", "鍖椾含"] static void main(String[] args) { // extractRegion() @@ -49,16 +49,16 @@ class ExtractYfsdDistrict { } /** - * 厦门数据 + * 鍘﹂棬鏁版嵁 */ private static void extractXiamen() { List distinct = YFSD_XIAMEN.distinct('constructionid') for(String constructionId : distinct) { DBObject findObj = YFSD_XIAMEN.findOne(new BasicDBObject('constructionid', constructionId)) - String city = "厦门" + String city = "鍘﹂棬" String name = findObj.constructionname String address = findObj.BuildingName - String region = RegionData.formatRegion("厦门", findObj.address) + String region = RegionData.formatRegion("鍘﹂棬", findObj.address) if(RegionData.isRegion(city, region)) { println constructionId } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170706/ExportYungujiaAvgPrice.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170706/ExportYungujiaAvgPrice.groovy index c8c5fde05..c67090d1a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170706/ExportYungujiaAvgPrice.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/date20170706/ExportYungujiaAvgPrice.groovy @@ -11,16 +11,16 @@ import com.mongodb.DBObject import net.sf.json.JSONObject /** - * 导出 成都 房估估均价 云估价均价 房价网均价 与可信度 + * 瀵煎嚭 鎴愰兘 鎴夸及浼板潎浠� 浜戜及浠峰潎浠� 鎴夸环缃戝潎浠� 涓庡彲淇″害 * Created by linxsh on 2017/7/6. */ -DSCursor dsCursor = DbUtils.seaweed.find(new BasicDBObject("cat", 'district').append('visible', 0).append('city', '武汉')) +DSCursor dsCursor = DbUtils.seaweed.find(new BasicDBObject("cat", 'district').append('visible', 0).append('city', '姝︽眽')) def DBCollection YUNGUJIA = MongoUtils.getCollectionByName("fangjia", "wx_gujia_proj", "192.168.0.61") DBCollection GUGU = MongoUtils.getCollectionByName("fangjia_tmp", "fanggugu_price2", "192.168.0.61") -String city = "武汉" +String city = "姝︽眽" def datas = [] -datas << ['小区编号','城市', '区域', '小区名', '可信度', '房估估均价', '云估价均价', '房价网均价'] +datas << ['灏忓尯缂栧彿','鍩庡競', '鍖哄煙', '灏忓尯鍚�', '鍙俊搴�', '鎴夸及浼板潎浠�', '浜戜及浠峰潎浠�', '鎴夸环缃戝潎浠�'] for (DBObject dbObject : dsCursor) { String sid = dbObject.sid String region = dbObject.region @@ -29,7 +29,7 @@ for (DBObject dbObject : dsCursor) { def avgPrice = null; def credit = null; JSONObject jsonObject; - if(dbObject.estate_type2 && dbObject.estate_type2.contains('别墅')) { + if(dbObject.estate_type2 && dbObject.estate_type2.contains('鍒')) { jsonObject = OpenApiClient.evaluateDistrictPrice(city, region, name, 100, 1) } else { jsonObject = OpenApiClient.evaluateDistrictPrice(city, region, name, 100) @@ -57,7 +57,7 @@ for (DBObject dbObject : dsCursor) { } -ExcelUtils.write("D://武汉均价统计.xlsx", datas, "sheet1") +ExcelUtils.write("D://姝︽眽鍧囦环缁熻.xlsx", datas, "sheet1") /*Double getGuguAvgPrice(String city, String region, String name) { null diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/zhuhai.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/zhuhai.groovy index 6fd4b5a3a..bc01c47f9 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/zhuhai.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/loudong/extract/zhuhai.groovy @@ -9,7 +9,7 @@ import com.mongodb.DBCursor import com.mongodb.DBObject import org.apache.commons.lang.StringUtils -/**格式化抓取的珠海的房管局数据 +/**鏍煎紡鍖栨姄鍙栫殑鐝犳捣鐨勬埧绠″眬鏁版嵁 * Created by linxsh on 2017/1/6. */ class zhuhai { @@ -17,7 +17,7 @@ class zhuhai { private static DBCollection LOUDONG = MongoUtils.getCollectionByName("buildings", "ld", "192.168.0.136") public static void main(String[] args) { - DBCursor dbCursor = LOUDONG.find(new BasicDBObject('city', '珠海')).addOption(Bytes.QUERYOPTION_NOTIMEOUT) + DBCursor dbCursor = LOUDONG.find(new BasicDBObject('city', '鐝犳捣')).addOption(Bytes.QUERYOPTION_NOTIMEOUT) for(DBObject dbObject : dbCursor) { String name = dbObject.get('name') String city = dbObject.get('city') @@ -39,7 +39,7 @@ class zhuhai { /*String formatHouseNumber = LoudongUtil.formatHouseNumber(houseNumber) if(StringUtils.isNotBlank(formatHouseNumber)) { - if(houseNumber.contains('商业') || houseNumber.contains('商铺')) { + if(houseNumber.contains('鍟嗕笟') || houseNumber.contains('鍟嗛摵')) { continue } LOUDONG.update(dbObject, new BasicDBObject('$set', new BasicDBObject('f_house_num', formatHouseNumber))) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/meishi/ExtractFromDealPrice.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/meishi/ExtractFromDealPrice.groovy index 4bd90fd90..233d5a567 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/meishi/ExtractFromDealPrice.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/meishi/ExtractFromDealPrice.groovy @@ -10,7 +10,7 @@ import org.apache.commons.beanutils.BeanMap import org.apache.commons.lang.StringUtils /** - * 从线上Deal_Price库中提取美狮数据 + * 浠庣嚎涓奃eal_Price搴撲腑鎻愬彇缇庣嫯鏁版嵁 * Created by linxsh on 2017/1/8. * */ @@ -19,7 +19,7 @@ class ExtractFromDealPrice { private static final DBCollection HOUSELOUDONG = MongoUtils.getCollectionByName("buildings", "house_loudong_msr", "192.168.0.136") public static void main(String[] args) { - DBCursor dbCursor = DEAL_PRICE.find(new BasicDBObject('source', '美狮').append('district_name', new BasicDBObject('$ne', null)).append('house_num', new BasicDBObject('$ne', null))) + DBCursor dbCursor = DEAL_PRICE.find(new BasicDBObject('source', '缇庣嫯').append('district_name', new BasicDBObject('$ne', null)).append('house_num', new BasicDBObject('$ne', null))) for(DBObject dbObject : dbCursor) { String city = dbObject.city String region = dbObject.region diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/meishi/FormatRegion.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/meishi/FormatRegion.groovy index 3fd54db0c..0f891526d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/meishi/FormatRegion.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/meishi/FormatRegion.groovy @@ -13,7 +13,7 @@ import com.mongodb.DBObject class FormatRegion { public static final DBCollection DealPrice = MongoUtils.getCollectionByName("fangjia", "deal_price", "mongo.db.fangjia.com") public static void main(String[] args) { - DBCursor dbCursor = DealPrice.find(new BasicDBObject("source", "美狮")); + DBCursor dbCursor = DealPrice.find(new BasicDBObject("source", "缇庣嫯")); for(DBObject dbObject : dbCursor) { def city = dbObject['city'] def region = dbObject['region'] diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/meishi/HandleData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/meishi/HandleData.groovy index 18e90d6eb..ae7020648 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/meishi/HandleData.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/meishi/HandleData.groovy @@ -15,9 +15,9 @@ import java.util.regex.Pattern class HandleData { private static final DBCollection HOUSES = MongoUtils.getCollectionByName("buildings", "houses", "192.168.0.136") private static final DBCollection NEW_HOUSES = MongoUtils.getCollectionByName("buildings", "new_houses", "192.168.0.136") - private static final Pattern pattern1 = Pattern.compile(".+路.+弄(?:.+[幢栋])?(\\w+)号\\w+室"); - private static final Pattern pattern2 = Pattern.compile(".+路(\\w+)号\\w+室"); - private static final Pattern pattern3 = Pattern.compile("(.+?)(\\w+)号\\w+室"); + private static final Pattern pattern1 = Pattern.compile(".+璺�.+寮�(?:.+[骞㈡爧])?(\\w+)鍙穃\w+瀹�"); + private static final Pattern pattern2 = Pattern.compile(".+璺�(\\w+)鍙穃\w+瀹�"); + private static final Pattern pattern3 = Pattern.compile("(.+?)(\\w+)鍙穃\w+瀹�"); public static void main(String[] args) { DBCursor dbCursor = HOUSES.find(new BasicDBObject()).addOption(Bytes.QUERYOPTION_NOTIMEOUT); @@ -40,22 +40,22 @@ class HandleData { } else if ((matcher=pattern2.matcher(addr)).find()) { } else if ((matcher = pattern3.matcher(addr)).find()) { // String houseNum = matcher.group(1); - name = matcher.group(1).replaceAll("\\w+幢|\\w+弄", ""); - if(name.contains('友谊新村')){ - name = '友谊新村'; - } else if(name.matches("宝林\\d+村")) { - name = name.replace("10", "十") - .replace("11", "十一") - .replace("1", "一") - .replace("2", "二") - .replace("3", "三") - .replace("4", "四") - .replace("5", "五") - .replace("6", "六") - .replace("7", "七") - .replace("8", "八") - .replace("9", "九") - } else if(name.endsWith("街")){ + name = matcher.group(1).replaceAll("\\w+骞\\w+寮�", ""); + if(name.contains('鍙嬭皧鏂版潙')){ + name = '鍙嬭皧鏂版潙'; + } else if(name.matches("瀹濇灄\\d+鏉�")) { + name = name.replace("10", "鍗�") + .replace("11", "鍗佷竴") + .replace("1", "涓�") + .replace("2", "浜�") + .replace("3", "涓�") + .replace("4", "鍥�") + .replace("5", "浜�") + .replace("6", "鍏�") + .replace("7", "涓�") + .replace("8", "鍏�") + .replace("9", "涔�") + } else if(name.endsWith("琛�")){ continue; } } @@ -67,7 +67,7 @@ class HandleData { String type = dbObject['type'] String area = null; if(dbObject.containsField("area")) { - area = dbObject['area'].toString().replace("平方米", "") + area = dbObject['area'].toString().replace("骞虫柟绫�", "") } String t_price = dbObject['t_price'] String price = dbObject['price'] diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/meishi/Save2HouseLoudong.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/meishi/Save2HouseLoudong.groovy index 4612dda0d..e9ff264a3 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/meishi/Save2HouseLoudong.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/meishi/Save2HouseLoudong.groovy @@ -30,7 +30,7 @@ class Save2HouseLoudong { .append('name', name).append('house_num', houseNumber).append('house_num_unit', unitNumber).append('room_num', roomNumber) dbObject.removeField('_id') - dbObject.put('from', '房管局') + dbObject.put('from', '鎴跨灞�') TARGET.update(query, new BasicDBObject('$set', dbObject), true, false) } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/telecom/FilterData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/telecom/FilterData.groovy index e21ee4ae9..3b94198cd 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/telecom/FilterData.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/telecom/FilterData.groovy @@ -37,11 +37,11 @@ class FilterData { } String city = dbObject.f_city String formatAddress = dbObject.f_addr - if(formatAddress.matches('.+?\\w+弄(.+支弄)?\\w+号.*')) { - formatAddress = formatAddress.replaceAll('(.+?\\w+弄(?:.+支弄)?)\\w+号.*', '$1') + if(formatAddress.matches('.+?\\w+寮�(.+鏀紕)?\\w+鍙�.*')) { + formatAddress = formatAddress.replaceAll('(.+?\\w+寮�(?:.+鏀紕)?)\\w+鍙�.*', '$1') } - if(formatAddress.matches('.*?[\u4e00-\u9fa5]{2,3}镇[一-龥]{2,}(路|街|道).+')) { - formatAddress = formatAddress.replaceAll('.*[一-龥]{2,3}镇([一-龥]{2,}(?:路|街|道).+)', '$1') + if(formatAddress.matches('.*?[\u4e00-\u9fa5]{2,3}闀嘯涓�-榫{2,}(璺瘄琛梶閬�).+')) { + formatAddress = formatAddress.replaceAll('.*[涓�-榫{2,3}闀�([涓�-榫{2,}(?:璺瘄琛梶閬�).+)', '$1') } JSONObject jo = OpenApiClient.addressMatch(city, dbObject.f_addr, 'property') String formatName = null @@ -52,7 +52,7 @@ class FilterData { TELECOM.update(dbObject, new BasicDBObject('$set', new BasicDBObject('f_addr', formatAddress).append('f_name', formatName))) } - /*Pattern pattern = Pattern.compile('^.*室.*$') + /*Pattern pattern = Pattern.compile('^.*瀹�.*$') DBCursor dbCursor = TELECOM.find().batchSize(1000).addOption(Bytes.QUERYOPTION_NOTIMEOUT) ExecutorService exec = Executors.newCachedThreadPool() Semaphore semaphore = new Semaphore(1) @@ -85,8 +85,8 @@ class FilterData { String addr2 = dbObject.ADDR2?dbObject.ADDR2:'' String addr3 = dbObject.ADDR3?dbObject.ADDR3:'' - if(addr3.matches('.*?\\d+室.*')) { - Pattern pattern = Pattern.compile('(?<=\\D)(?\\d+)室.*') + if(addr3.matches('.*?\\d+瀹�.*')) { + Pattern pattern = Pattern.compile('(?<=\\D)(?\\d+)瀹�.*') Matcher matcher = pattern.matcher(addr3) if(matcher.find()) { String formatRoomNumber = matcher.group('room') @@ -109,10 +109,10 @@ class FilterData { String oriAddress = addr1 + addr2 + addr3 String formatHouseNumber = NewLoudongUtil.formatHouseNumber(oriAddress) String formatUnitNumber = null - /* if(oriAddress.contains('幢') || oriAddress.contains('栋')) { + /* if(oriAddress.contains('骞�') || oriAddress.contains('鏍�')) { formatHouseNumber = NewLoudongUtil.formatHouseNumber(oriAddress) }*/ - if(oriAddress.contains('单元')) { + if(oriAddress.contains('鍗曞厓')) { formatUnitNumber = NewLoudongUtil.formatUnitNumber(oriAddress) } if(formatHouseNumber || formatUnitNumber) { @@ -153,7 +153,7 @@ class FilterData { } /** - * 提取城市和区域 + * 鎻愬彇鍩庡競鍜屽尯鍩� * @param dbObject * @return */ @@ -172,8 +172,8 @@ class FilterData { if(findRegionObj) { println "$regionCode -> ${findRegionObj.city}--${findRegionObj.name}" TELECOM.update(dbObject, new BasicDBObject('$set', new BasicDBObject('f_city', findRegionObj.city).append('f_region', findRegionObj.name))) - } else if(oriCity.matches(".+市辖区")) { - String city = oriCity.replace('市辖区', '') + } else if(oriCity.matches(".+甯傝緰鍖�")) { + String city = oriCity.replace('甯傝緰鍖�', '') println "$regionCode -> ${city}" TELECOM.update(dbObject, new BasicDBObject('$set', new BasicDBObject('f_city', city))) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/telecom/ImportData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/telecom/ImportData.groovy index b4b803101..44c348a28 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/telecom/ImportData.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/telecom/ImportData.groovy @@ -11,7 +11,7 @@ import groovy.sql.Sql import org.apache.commons.lang.StringUtils /** - * 从csv文件中提取有效楼栋数 + * 浠巆sv鏂囦欢涓彁鍙栨湁鏁堟ゼ鏍嬫暟 * Created by linxsh on 2016/12/1. */ class ImportData { @@ -20,7 +20,7 @@ class ImportData { public static DSCollection seaweed = new DataStore("seaweed.db.fangjia.com", 27007).getCollection("fangjia.seaweed") public static void main(String[] args) { - File dir = new File("C:\\Users\\ideoj\\Desktop\\门牌号新版") + File dir = new File("C:\\Users\\ideoj\\Desktop\\闂ㄧ墝鍙锋柊鐗�") if(dir.exists() && dir.isDirectory()) { boolean isCon = true for(File file : dir.listFiles()) { @@ -55,7 +55,7 @@ class ImportData { /*for(List data : datas) { String cityCode = data[1] - String city = data[2].replace('市辖区', '') + String city = data[2].replace('甯傝緰鍖�', '') String name = data[3] String number = data[5] @@ -79,33 +79,33 @@ class ImportData { static String formatDistrictUnitNumber(String number) { String result = "1" - if(number.contains("单元")) { - result = number.replaceAll('.*?([\\w一二三四五六七八九十甲乙丙丁戊戌东南西北]+)单元.*', '$1') - .replace("一", "1").replace("二", "2").replace("三", "3") - .replace("四", "4").replace("五", "5").replace("六", "6") - .replace("七", "7").replace("八", "8").replace("九", "9") - .replace("十", "10") + if(number.contains("鍗曞厓")) { + result = number.replaceAll('.*?([\\w涓�浜屼笁鍥涗簲鍏竷鍏節鍗佺敳涔欎笝涓佹垔鎴屼笢鍗楄タ鍖梋+)鍗曞厓.*', '$1') + .replace("涓�", "1").replace("浜�", "2").replace("涓�", "3") + .replace("鍥�", "4").replace("浜�", "5").replace("鍏�", "6") + .replace("涓�", "7").replace("鍏�", "8").replace("涔�", "9") + .replace("鍗�", "10") } result } static String formatDistrictHouseNumber(String name, String number) { String result = null - if(name.matches('^.+(村|苑|小区|公寓)(\\w+(栋|幢|号楼?))$')) { - result = name.replaceAll('^.+(?:村|苑|小区|公寓)(?:(\\w+)(?:栋|幢|号楼?))$', '$1') - } else if(number.matches('\\w+(号|栋|幢)')) { - result = number.replaceAll('(\\w+)(?:号|栋|幢)', '$1') + if(name.matches('^.+(鏉憒鑻憒灏忓尯|鍏瘬)(\\w+(鏍媩骞鍙锋ゼ?))$')) { + result = name.replaceAll('^.+(?:鏉憒鑻憒灏忓尯|鍏瘬)(?:(\\w+)(?:鏍媩骞鍙锋ゼ?))$', '$1') + } else if(number.matches('\\w+(鍙穦鏍媩骞�)')) { + result = number.replaceAll('(\\w+)(?:鍙穦鏍媩骞�)', '$1') } result } static String formatDistrictName(String name) { String result = null - name = name.replaceAll("[,\\s(\\(\\))]", "") - if(name.matches('^.+(村|小区|花园|别墅|住宅|苑|公寓)(\\w+(栋|幢|号楼?))?$')) { - result = name.replaceAll('(^.+(?:村|小区|花园|别墅|住宅|苑|公寓))(?:\\w+(?:栋|幢|号楼?))?$', '$1') - if(result.matches("(?:.+市)?(?:.+[区县])?(?:.{1,5}镇)?(?:.{2,5}街道)?(.{2,}(?:村|小区|花园|别墅|住宅|苑|公寓))")) { - result = result.replaceAll('(?:.+市)?(?:.+[区县])?(?:.{1,5}镇)?(?:.{2,5}街道)?(.{2,}(?:村|小区|花园|别墅|住宅|苑|公寓))', '$1') + name = name.replaceAll("[,\\s锛圽\(\\)锛塢", "") + if(name.matches('^.+(鏉憒灏忓尯|鑺卞洯|鍒|浣忓畢|鑻憒鍏瘬)(\\w+(鏍媩骞鍙锋ゼ?))?$')) { + result = name.replaceAll('(^.+(?:鏉憒灏忓尯|鑺卞洯|鍒|浣忓畢|鑻憒鍏瘬))(?:\\w+(?:鏍媩骞鍙锋ゼ?))?$', '$1') + if(result.matches("(?:.+甯�)?(?:.+[鍖哄幙])?(?:.{1,5}闀�)?(?:.{2,5}琛楅亾)?(.{2,}(?:鏉憒灏忓尯|鑺卞洯|鍒|浣忓畢|鑻憒鍏瘬))")) { + result = result.replaceAll('(?:.+甯�)?(?:.+[鍖哄幙])?(?:.{1,5}闀�)?(?:.{2,5}琛楅亾)?(.{2,}(?:鏉憒灏忓尯|鑺卞洯|鍒|浣忓畢|鑻憒鍏瘬))', '$1') } } result diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/AddressFormatUtil.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/AddressFormatUtil.groovy index be0618af8..cf5258060 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/AddressFormatUtil.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/AddressFormatUtil.groovy @@ -35,7 +35,7 @@ class AddressFormatUtil { } public static void main(String[] args) { - AddressData result = format("上海长宁区天山西路550号天山五村77号28室") + AddressData result = format("涓婃捣闀垮畞鍖哄ぉ灞辫タ璺�550鍙峰ぉ灞变簲鏉�77鍙�28瀹�") println result.toString() } } 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 ab83090b7..19a974ed1 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 @@ -17,34 +17,34 @@ import java.util.regex.Pattern */ class AddressUtil { - private static Pattern HOUSE_NUMBER_PATTERN = Pattern.compile('[-a-zA-Z\\d东南西北甲乙丙丁戊戌]+') - private static Pattern CN_NUMBER_PATTERN = Pattern.compile('[〇零一二三四五六七八九十]+'); - private static final Pattern ROMAN_NUMBER_PATTERN = Pattern.compile("[ⅠⅡⅢⅣⅤⅥⅦⅧⅨⅩ]") + private static Pattern HOUSE_NUMBER_PATTERN = Pattern.compile('[-a-zA-Z\\d涓滃崡瑗垮寳鐢蹭箼涓欎竵鎴婃垖]+') + private static Pattern CN_NUMBER_PATTERN = Pattern.compile('[銆囬浂涓�浜屼笁鍥涗簲鍏竷鍏節鍗乚+'); + private static final Pattern ROMAN_NUMBER_PATTERN = Pattern.compile("[鈪犫叀鈪⑩叄鈪も叆鈪︹収鈪ㄢ叐]") private static final Pattern ARABIC_NUMBER_PATTERN = Pattern.compile("\\d+") - private static final Pattern ARABIC_NUMBER_PATTERN2 = Pattern.compile("\\d+期") + private static final Pattern ARABIC_NUMBER_PATTERN2 = Pattern.compile("\\d+鏈�") /** - * 楼栋号正则 + * 妤兼爧鍙锋鍒� * @param host * @param dbName * @param coll */ - private static Pattern pattern1 = Pattern.compile('.+弄(?:\\w+支弄)?(?:\\w+区)?([-\\w]+)号') - private static Pattern pattern2 = Pattern.compile('(?<=村|花园|别墅|公寓|苑|坊|里)(?[甲乙丙丁戊戌\\w]+)(?=号|幢|栋|座|住宅栋)') - private static Pattern pattern3 = Pattern.compile('(?[鐢蹭箼涓欎竵鎴婃垖\\w]+)(?=鍙穦骞鏍媩搴浣忓畢鏍�)') + private static Pattern pattern3 = Pattern.compile('(?() @@ -55,12 +55,12 @@ class AddressUtil { } /** - * 初始化城市数据 + * 鍒濆鍖栧煄甯傛暟鎹� */ static def initCityMap() { DBCursor cursor = SERVER_AREA_COLL.find(new BasicDBObject(), new BasicDBObject("display", 1).append("city_grade", 1)); for(DBObject dbObject : cursor) { - if(!"全国".equals(dbObject.display)) { + if(!"鍏ㄥ浗".equals(dbObject.display)) { cityMap.put(dbObject.display, dbObject.display) if(dbObject.alias) { for(java.lang.Object o : dbObject.alias) { @@ -72,7 +72,7 @@ class AddressUtil { } /** - * 将给定城市格式化为指定城市。如果城市不存在,返回null + * 灏嗙粰瀹氬煄甯傛牸寮忓寲涓烘寚瀹氬煄甯傘�傚鏋滃煄甯備笉瀛樺湪锛岃繑鍥瀗ull * @param oriCity * @return */ @@ -92,7 +92,7 @@ class AddressUtil { } /** - * 根据区域获取城市名 + * 鏍规嵁鍖哄煙鑾峰彇鍩庡競鍚� * @param region * @return */ @@ -108,31 +108,31 @@ class AddressUtil { } /** - * 格式化地址 + * 鏍煎紡鍖栧湴鍧� * @param city * @param address * @return */ public static String formatAddress(final String city, final String address) { - if(StringUtils.isBlank(city) || StringUtils.isBlank(address) || !address.matches('.*[路道街巷].*')) { + if(StringUtils.isBlank(city) || StringUtils.isBlank(address) || !address.matches('.*[璺亾琛楀贩].*')) { return null } String formatAddress = DataUtil.formateAddress(city, address) - if(StringUtils.isNotBlank(formatAddress) && formatAddress.matches('^[\u4e00-\u9fa5]+?(路|大道|街|巷).+[弄号]$')) { + if(StringUtils.isNotBlank(formatAddress) && formatAddress.matches('^[\u4e00-\u9fa5]+?(璺瘄澶ч亾|琛梶宸�).+[寮勫彿]$')) { return formatAddress } - if(StringUtils.isNotBlank(formatAddress) && formatAddress.matches('^[\u4e00-\u9fa5]+?(路|大道|街|巷)')) { + if(StringUtils.isNotBlank(formatAddress) && formatAddress.matches('^[\u4e00-\u9fa5]+?(璺瘄澶ч亾|琛梶宸�)')) { return formatAddress } return null } /** - * 格式化楼栋号 - * @param city 城市 - * @param region 区域 - * @param districtName 小区名 - * @param houseNumber 楼栋号 + * 鏍煎紡鍖栨ゼ鏍嬪彿 + * @param city 鍩庡競 + * @param region 鍖哄煙 + * @param districtName 灏忓尯鍚� + * @param houseNumber 妤兼爧鍙� * @return */ public static String formatHouseNumber(final String houseNumber) { @@ -140,38 +140,38 @@ class AddressUtil { return null; } def newHouseNumber = CommonUtil.ToDBC(houseNumber.toUpperCase()) - //*弄*号*幢,提取幢前面的为楼号 + //*寮�*鍙�*骞紝鎻愬彇骞㈠墠闈㈢殑涓烘ゼ鍙� newHouseNumber = CommonUtil.formatByPattern(newHouseNumber, pattern4) - // .+弄(?:\w+支弄)?(?:\w+区)?([-\w]+)号.* + // .+寮�(?:\w+鏀紕)?(?:\w+鍖�)?([-\w]+)鍙�.* newHouseNumber = CommonUtil.formatByPattern(newHouseNumber, pattern1) - // (?<=村|花园|别墅|公寓|苑|坊|里)(?[甲乙丙丁戊戌\w]+)[号幢栋] + // (?<=鏉憒鑺卞洯|鍒|鍏瘬|鑻憒鍧妡閲�)(?[鐢蹭箼涓欎竵鎴婃垖\w]+)[鍙峰耿鏍媇 newHouseNumber = CommonUtil.formatByPattern(newHouseNumber, pattern2) - //(? - if(!item.matches('东南西北甲乙丙丁戊戌')) { + if(!item.matches('涓滃崡瑗垮寳鐢蹭箼涓欎竵鎴婃垖')) { cnCount++ } }) - //去除开头和结尾的特殊符号 + //鍘婚櫎寮�澶村拰缁撳熬鐨勭壒娈婄鍙� if(cnCount < 2) { - while (newHouseNumber.matches('^[^a-zA-Z1-9东南西北甲乙丙丁戊戌].*$')) { + while (newHouseNumber.matches('^[^a-zA-Z1-9涓滃崡瑗垮寳鐢蹭箼涓欎竵鎴婃垖].*$')) { newHouseNumber = newHouseNumber.substring(1) } - while (newHouseNumber.matches('^.*?[^a-zA-Z0-9东南西北甲乙丙丁戊戌]+$')) { + while (newHouseNumber.matches('^.*?[^a-zA-Z0-9涓滃崡瑗垮寳鐢蹭箼涓欎竵鎴婃垖]+$')) { newHouseNumber = newHouseNumber[0..-2] } } - //处理类似201201这样的楼栋号,整理为201 + //澶勭悊绫讳技201201杩欐牱鐨勬ゼ鏍嬪彿锛屾暣鐞嗕负201 if(newHouseNumber.matches("([a-zA-Z0-9]{3,})\\1")) { newHouseNumber = newHouseNumber.replaceAll("([a-zA-Z0-9]{3,})\\1", '$1') } @@ -182,7 +182,7 @@ class AddressUtil { } /** - * 格式化单元号 + * 鏍煎紡鍖栧崟鍏冨彿 * @param unitNumber * @return */ @@ -192,37 +192,37 @@ class AddressUtil { } def newUnitNumber; - if(unitNumber.matches('.*?[一二三四五六七八九十\\d]+单元.*')) { - newUnitNumber = unitNumber.replaceAll('.*?([\\d一二三四五六七八九十]+)单元.*', '$1') + if(unitNumber.matches('.*?[涓�浜屼笁鍥涗簲鍏竷鍏節鍗乗\d]+鍗曞厓.*')) { + newUnitNumber = unitNumber.replaceAll('.*?([\\d涓�浜屼笁鍥涗簲鍏竷鍏節鍗乚+)鍗曞厓.*', '$1') } else { - newUnitNumber = StringUtils.substringBefore(unitNumber.toUpperCase(), "单元") + newUnitNumber = StringUtils.substringBefore(unitNumber.toUpperCase(), "鍗曞厓") } - //替换“一”“二”“三”等为阿拉伯数字 - if(newUnitNumber.matches(".*[零一二三四五六七八九十]+.*")) { + //鏇挎崲鈥滀竴鈥濃�滀簩鈥濃�滀笁鈥濈瓑涓洪樋鎷変集鏁板瓧 + if(newUnitNumber.matches(".*[闆朵竴浜屼笁鍥涗簲鍏竷鍏節鍗乚+.*")) { newUnitNumber = CommonUtil.convertCNToArabic(newUnitNumber) } - //替换“Ⅰ”“Ⅱ”“Ⅲ”等转换为阿拉伯数字 - if(newUnitNumber.matches(".*[ⅠⅡⅢⅣⅤⅥⅦⅧⅨⅩ]+.*")) { + //鏇挎崲鈥溾厾鈥濃�溾叀鈥濃�溾參鈥濈瓑杞崲涓洪樋鎷変集鏁板瓧 + if(newUnitNumber.matches(".*[鈪犫叀鈪⑩叄鈪も叆鈪︹収鈪ㄢ叐]+.*")) { newUnitNumber = CommonUtil.convertRomanToArabic(newUnitNumber) } - //去除开头和结尾的特殊符号 - /*while (newUnitNumber.matches('^[^a-zA-Z0-9东南西北甲乙丙丁戊戌].*$')) { + //鍘婚櫎寮�澶村拰缁撳熬鐨勭壒娈婄鍙� + /*while (newUnitNumber.matches('^[^a-zA-Z0-9涓滃崡瑗垮寳鐢蹭箼涓欎竵鎴婃垖].*$')) { newUnitNumber = newUnitNumber.substring(1) }*/ - while (newUnitNumber.matches('^[-—_/,\\.。,、]')) { + while (newUnitNumber.matches('^[-鈥擾/,\\.銆傦紝銆乚')) { newUnitNumber = newUnitNumber.substring(1) } - while (newUnitNumber.matches('^.*?[^a-zA-Z0-9东南西北甲乙丙丁戊戌]+$') && newUnitNumber.length() > 1) { + while (newUnitNumber.matches('^.*?[^a-zA-Z0-9涓滃崡瑗垮寳鐢蹭箼涓欎竵鎴婃垖]+$') && newUnitNumber.length() > 1) { newUnitNumber = newUnitNumber[0..-2] } - if(newUnitNumber.matches('^[a-zA-Z0-9东南西北甲乙丙丁戊戌]+$') && newUnitNumber.length() < 5) { + if(newUnitNumber.matches('^[a-zA-Z0-9涓滃崡瑗垮寳鐢蹭箼涓欎竵鎴婃垖]+$') && newUnitNumber.length() < 5) { return newUnitNumber } return defaultVal } /** - * 格式化室号 + * 鏍煎紡鍖栧鍙� * @param oriInput * @return */ @@ -234,7 +234,7 @@ class AddressUtil { } /** - * 格式化小区名 + * 鏍煎紡鍖栧皬鍖哄悕 * @param city * @param region * @param name @@ -244,30 +244,30 @@ class AddressUtil { if(StringUtils.isBlank(city) || StringUtils.isBlank(name)) { return null } - if(name.matches("[\u4e00-\u9fa5]+?(路|大道|大街).+[弄号]") || name.matches("[\u4e00-\u9fa5]+?弄")) { + if(name.matches("[\u4e00-\u9fa5]+?(璺瘄澶ч亾|澶ц).+[寮勫彿]") || name.matches("[\u4e00-\u9fa5]+?寮�")) { return name } String newDistrictName = CommonUtil.ToDBC(name) - .replaceAll("[\\.·'\"“”]", "").replaceAll('—', '-') - //去除“地块”信息 + .replaceAll("[\\.路'\"鈥溾�漖", "").replaceAll('鈥�', '-') + //鍘婚櫎鈥滃湴鍧椻�濅俊鎭� newDistrictName = CommonUtil.formatByPattern(newDistrictName, district_pattern1) - //阿拉伯数字转汉字,以数字结尾的暂时不处理 - newDistrictName = CommonUtil.convertArabicToCn(newDistrictName, '期') - //罗马数字转汉字 - newDistrictName = CommonUtil.convertRomanToCn(newDistrictName, '期') - //去除末尾的新盘标识 + //闃挎媺浼暟瀛楄浆姹夊瓧锛屼互鏁板瓧缁撳熬鐨勬殏鏃朵笉澶勭悊 + newDistrictName = CommonUtil.convertArabicToCn(newDistrictName, '鏈�') + //缃楅┈鏁板瓧杞眽瀛� + newDistrictName = CommonUtil.convertRomanToCn(newDistrictName, '鏈�') + //鍘婚櫎鏈熬鐨勬柊鐩樻爣璇� newDistrictName = removeInvalidTail(newDistrictName) - //去除楼号信息 + //鍘婚櫎妤煎彿淇℃伅 newDistrictName = CommonUtil.formatByPattern(newDistrictName, district_pattern2) - if(newDistrictName.matches('^.+?(路|大道|大街|街道|科技园|大学|学院|商铺|写字楼|商业|公司|办公楼?|停车场?|车库)$') || newDistrictName.matches(".*[\\(\\)()_]")) { + if(newDistrictName.matches('^.+?(璺瘄澶ч亾|澶ц|琛楅亾|绉戞妧鍥瓅澶у|瀛﹂櫌|鍟嗛摵|鍐欏瓧妤紎鍟嗕笟|鍏徃|鍔炲叕妤�?|鍋滆溅鍦�?|杞﹀簱)$') || newDistrictName.matches(".*[\\(\\)锛堬級_]")) { newDistrictName = null } return newDistrictName } /** - * 判断地址是否为标准地址 + * 鍒ゆ柇鍦板潃鏄惁涓烘爣鍑嗗湴鍧� * @param address * @return */ @@ -275,11 +275,11 @@ class AddressUtil { if(StringUtils.isBlank(address)) { return false } - return address ==~ /[\u4e00-\u9fa5]+(路|大道|街|街道|巷)([东西南北中]段)?[-\w]+[弄号](之[一二三四五六七八九十])?/ + return address ==~ /[\u4e00-\u9fa5]+(璺瘄澶ч亾|琛梶琛楅亾|宸�)([涓滆タ鍗楀寳涓璢娈�)?[-\w]+[寮勫彿](涔媅涓�浜屼笁鍥涗簲鍏竷鍏節鍗乚)?/ } /** - * 去除小区名末尾的无效标识 + * 鍘婚櫎灏忓尯鍚嶆湯灏剧殑鏃犳晥鏍囪瘑 * @param srcString * @return */ @@ -288,16 +288,16 @@ class AddressUtil { return null } String result = srcString - if(result.matches('.+?[\\((]?([一二三四五六七八九十]+期)[\\))]?$')) { - result = result.replaceAll('[\\((]?([一二三四五六七八九十]+期)[\\))]?$', '$1') + if(result.matches('.+?[\\(锛圿?([涓�浜屼笁鍥涗簲鍏竷鍏節鍗乚+鏈�)[\\)锛塢?$')) { + result = result.replaceAll('[\\(锛圿?([涓�浜屼笁鍥涗簲鍏竷鍏節鍗乚+鏈�)[\\)锛塢?$', '$1') } - result = result.replaceAll('^(.+?)(?:[\\((].+[\\))])$', '$1') + result = result.replaceAll('^(.+?)(?:[\\(锛圿.+[\\)锛塢)$', '$1') return result } public static void main(String[] args){ AddressUtil.initCityMap() -// def addr = AddressUtil.formatAddress("福州", "北三环路201号琴亭信和小区") +// def addr = AddressUtil.formatAddress("绂忓窞", "鍖椾笁鐜矾201鍙风惔浜俊鍜屽皬鍖�") } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/CommonUtil.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/CommonUtil.groovy index cf3bcc0d5..16b6d84b6 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/CommonUtil.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/CommonUtil.groovy @@ -12,12 +12,12 @@ import java.util.regex.Pattern class CommonUtil { private static final Pattern ARABIC_NUMBER_PATTERN = Pattern.compile("\\d+") - private static Pattern CN_NUMBER_PATTERN = Pattern.compile('[〇零一二三四五六七八九十]+') + private static Pattern CN_NUMBER_PATTERN = Pattern.compile('[銆囬浂涓�浜屼笁鍥涗簲鍏竷鍏節鍗乚+') /** - * 半角转全角 + * 鍗婅杞叏瑙� * @param input String. - * @return 全角字符串. + * @return 鍏ㄨ瀛楃涓�. */ public static String ToSBC(String input) { def c = input.toCharArray(); @@ -33,9 +33,9 @@ class CommonUtil { } /** - * 全角转半角 + * 鍏ㄨ杞崐瑙� * @param input String. - * @return 半角字符串 + * @return 鍗婅瀛楃涓� */ public static String ToDBC(String input) { def c = input.toCharArray(); @@ -50,7 +50,7 @@ class CommonUtil { } /** - * 阿拉伯数字转汉字 + * 闃挎媺浼暟瀛楄浆姹夊瓧 * @param srcString * @param suffix * @return @@ -78,7 +78,7 @@ class CommonUtil { } /** - * 汉字数字转换为阿拉伯数字 + * 姹夊瓧鏁板瓧杞崲涓洪樋鎷変集鏁板瓧 * @param sourceString * @return */ @@ -97,7 +97,7 @@ class CommonUtil { } /** - * 罗马数字转汉字 + * 缃楅┈鏁板瓧杞眽瀛� * @param srcString * @return */ @@ -105,16 +105,16 @@ class CommonUtil { if(StringUtils.isBlank(srcString)) { return null } - String newString = srcString.replace("Ⅹ"+suffix, "十"+suffix).replace("Ⅸ"+suffix, "九"+suffix) - .replace("Ⅷ"+suffix, "八"+suffix).replace("Ⅶ"+suffix, "七"+suffix).replace("Ⅵ"+suffix, "六"+suffix) - .replace("Ⅴ"+suffix, "五"+suffix).replace("Ⅳ"+suffix, "四"+suffix).replace("Ⅲ"+suffix, "三"+suffix) - .replace("Ⅱ"+suffix, "二"+suffix).replace("Ⅰ"+suffix, "一"+suffix); + String newString = srcString.replace("鈪�"+suffix, "鍗�"+suffix).replace("鈪�"+suffix, "涔�"+suffix) + .replace("鈪�"+suffix, "鍏�"+suffix).replace("鈪�"+suffix, "涓�"+suffix).replace("鈪�"+suffix, "鍏�"+suffix) + .replace("鈪�"+suffix, "浜�"+suffix).replace("鈪�"+suffix, "鍥�"+suffix).replace("鈪�"+suffix, "涓�"+suffix) + .replace("鈪�"+suffix, "浜�"+suffix).replace("鈪�"+suffix, "涓�"+suffix); return newString } /** - * 罗马数字转阿拉伯数字 + * 缃楅┈鏁板瓧杞樋鎷変集鏁板瓧 * @param sourceString * @return */ @@ -122,16 +122,16 @@ class CommonUtil { if(StringUtils.isBlank(sourceString)) { return null } - String newString = sourceString.replace("Ⅹ"+suffix, "10"+suffix).replace("Ⅸ"+suffix, "9"+suffix) - .replace("Ⅷ"+suffix, "8"+suffix).replace("Ⅶ"+suffix, "7"+suffix).replace("Ⅵ"+suffix, "6"+suffix) - .replace("Ⅴ"+suffix, "5"+suffix).replace("Ⅳ"+suffix, "4"+suffix).replace("Ⅲ"+suffix, "3"+suffix) - .replace("Ⅱ"+suffix, "2"+suffix).replace("Ⅰ"+suffix, "1"+suffix); + String newString = sourceString.replace("鈪�"+suffix, "10"+suffix).replace("鈪�"+suffix, "9"+suffix) + .replace("鈪�"+suffix, "8"+suffix).replace("鈪�"+suffix, "7"+suffix).replace("鈪�"+suffix, "6"+suffix) + .replace("鈪�"+suffix, "5"+suffix).replace("鈪�"+suffix, "4"+suffix).replace("鈪�"+suffix, "3"+suffix) + .replace("鈪�"+suffix, "2"+suffix).replace("鈪�"+suffix, "1"+suffix); return newString } /** - * 根据正则表达式格式化字符串 + * 鏍规嵁姝e垯琛ㄨ揪寮忔牸寮忓寲瀛楃涓� * @param str * @param pattern * @return diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/LoudongUtil.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/LoudongUtil.groovy index 1761098d0..31524641e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/LoudongUtil.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/LoudongUtil.groovy @@ -28,39 +28,39 @@ import java.util.regex.Pattern * Created by linxsh on 2016/11/22. */ class LoudongUtil { - private static Pattern HOUSE_NUMBER_PATTERN = Pattern.compile('[-a-zA-Z\\d东南西北甲乙丙丁戊戌]+') - private static Pattern CN_NUMBER_PATTERN = Pattern.compile('[〇零一二三四五六七八九十]+'); - private static final Pattern ROMAN_NUMBER_PATTERN = Pattern.compile("[ⅠⅡⅢⅣⅤⅥⅦⅧⅨⅩ]") + private static Pattern HOUSE_NUMBER_PATTERN = Pattern.compile('[-a-zA-Z\\d涓滃崡瑗垮寳鐢蹭箼涓欎竵鎴婃垖]+') + private static Pattern CN_NUMBER_PATTERN = Pattern.compile('[銆囬浂涓�浜屼笁鍥涗簲鍏竷鍏節鍗乚+'); + private static final Pattern ROMAN_NUMBER_PATTERN = Pattern.compile("[鈪犫叀鈪⑩叄鈪も叆鈪︹収鈪ㄢ叐]") private static final Pattern ARABIC_NUMBER_PATTERN = Pattern.compile("\\d+") - private static final Pattern ARABIC_NUMBER_PATTERN2 = Pattern.compile("\\d+期") + private static final Pattern ARABIC_NUMBER_PATTERN2 = Pattern.compile("\\d+鏈�") private static DSCollection seaweed = new DataStore("seaweed.db.fangjia.com", 27007).getCollection("fangjia.seaweed") private static DBCollection LOUDONG = MongoUtils.getCollectionByName("fangjia_base", "loudong", "mongo.db.fangjia.com") private static List cities = CommonUtils.findAllCity() /** - * 楼栋号正则 + * 妤兼爧鍙锋鍒� * @param host * @param dbName * @param coll */ - private static Pattern pattern1 = Pattern.compile('.+弄(?:\\w+支弄)?(?:\\w+区)?([-\\w]+)号') - private static Pattern pattern2 = Pattern.compile('(?<=村|花园|别墅|公寓|苑|坊|里)(?[甲乙丙丁戊戌\\w]+)(?=号|幢|栋|座|住宅栋)') - private static Pattern pattern3 = Pattern.compile('(?[鐢蹭箼涓欎竵鎴婃垖\\w]+)(?=鍙穦骞鏍媩搴浣忓畢鏍�)') + private static Pattern pattern3 = Pattern.compile('(? cache = Sets.newHashSet() - println "开始查找重复楼栋数据..." + println "寮�濮嬫煡鎵鹃噸澶嶆ゼ鏍嬫暟鎹�..." for(DBObject dbObject : dbCursor) { String city = dbObject['city'] String region = dbObject['region'] @@ -99,27 +99,27 @@ class LoudongUtil { cache.add("$city--$region--$name--$houseNumber--$unitNumber") } } - println "找到${cache.size()}个重复楼栋" + println "鎵惧埌${cache.size()}涓噸澶嶆ゼ鏍�" println cache.toString() if(cache.size() > 0) { - println("开始删除...") + println("寮�濮嬪垹闄�...") cache.each {data-> String[] params = data.split("--"); int removeCount = removeDuplication(params[0], params[1], params[2], params[3], params[4]) - println "删除 $removeCount 条数据\t$data" + println "鍒犻櫎 $removeCount 鏉℃暟鎹甛t$data" } - println("删除完成!") + println("鍒犻櫎瀹屾垚锛�") } } /** - * 根据城市、区域、小区名、楼栋号、单元号去除重复数据 + * 鏍规嵁鍩庡競銆佸尯鍩熴�佸皬鍖哄悕銆佹ゼ鏍嬪彿銆佸崟鍏冨彿鍘婚櫎閲嶅鏁版嵁 * @param city * @param region * @param name * @param houseNumber * @param unitNumber - * @return 返回删除的重复数据数量 + * @return 杩斿洖鍒犻櫎鐨勯噸澶嶆暟鎹暟閲� */ public int removeDuplication(String city, String region, String name, String houseNumber, String unitNumber) { if(StringUtils.isBlank(city) || StringUtils.isBlank(region) || StringUtils.isBlank(name) || StringUtils.isBlank(houseNumber) || StringUtils.isBlank(unitNumber)) { @@ -197,10 +197,10 @@ class LoudongUtil { } /** - * 定制实现mongo的upsert功能,保存或更新楼栋数据 + * 瀹氬埗瀹炵幇mongo鐨剈psert鍔熻兘锛屼繚瀛樻垨鏇存柊妤兼爧鏁版嵁 * @param loudong * @param from - * @return 新增或保存的数据量 + * @return 鏂板鎴栦繚瀛樼殑鏁版嵁閲� */ public def upsert(final Loudong loudong) { def result = [save: 0, update: 0] @@ -217,7 +217,7 @@ class LoudongUtil { } /** - * 格式化待保存的数据 + * 鏍煎紡鍖栧緟淇濆瓨鐨勬暟鎹� * @param loudong * @return */ @@ -248,8 +248,8 @@ class LoudongUtil { } /** - * 保存或更新楼栋库数据,加锁避免多线程环境下的并发问题 - * @param saveObj 待保存数据对象 + * 淇濆瓨鎴栨洿鏂版ゼ鏍嬪簱鏁版嵁锛屽姞閿侀伩鍏嶅绾跨▼鐜涓嬬殑骞跺彂闂 + * @param saveObj 寰呬繚瀛樻暟鎹璞� * @return */ private synchronized int saveOrUpdate(final Loudong loudong) { @@ -261,11 +261,11 @@ class LoudongUtil { query.put('alias', loudong['name']) findObj = LOUDONG.findOne(query) } - //保存 + //淇濆瓨 if(findObj==null) { saveObj(loudong) return 1; - } else {//更新 + } else {//鏇存柊 updateObj(findObj, loudong) return 0 } @@ -273,7 +273,7 @@ class LoudongUtil { /** - * 更新 + * 鏇存柊 * @param findObj * @param obj * @param from @@ -289,7 +289,7 @@ class LoudongUtil { if(findObj.get('floors')==null || findObj.get('floors')==0 || findObj.get('floors') > 62) { updateObj.floors = loudong.floors } - //地址处理 + //鍦板潃澶勭悊 if(findObj['addr']==null) { updateObj.addr = loudong.address } else { @@ -298,7 +298,7 @@ class LoudongUtil { } } - //经纬度处理 + //缁忕含搴﹀鐞� if(findObj.lat_qq==0 || findObj.lng_qq==0) { updateObj.lat_qq = loudong.latQQ updateObj.lng_qq = loudong.lngQQ @@ -317,7 +317,7 @@ class LoudongUtil { /** - * 保存对象 + * 淇濆瓨瀵硅薄 * @param dbObject * @return */ @@ -328,7 +328,7 @@ class LoudongUtil { /** - * 将面积格式为两位小数 + * 灏嗛潰绉牸寮忎负涓や綅灏忔暟 * @param area * @return */ @@ -341,7 +341,7 @@ class LoudongUtil { } /** - * 将多个面积格式化为两位小数 + * 灏嗗涓潰绉牸寮忓寲涓轰袱浣嶅皬鏁� * @param areas */ static def formatAreas(Collection areas) { @@ -356,7 +356,7 @@ class LoudongUtil { } /** - * 格式化小区名 + * 鏍煎紡鍖栧皬鍖哄悕 * @param city * @param region * @param name @@ -366,88 +366,88 @@ class LoudongUtil { if(StringUtils.isBlank(city) || StringUtils.isBlank(name)) { return null } - if(name.matches("[\u4e00-\u9fa5]+?(路|大道|大街).+[弄号]") || name.matches("[\u4e00-\u9fa5]+?弄")) { + if(name.matches("[\u4e00-\u9fa5]+?(璺瘄澶ч亾|澶ц).+[寮勫彿]") || name.matches("[\u4e00-\u9fa5]+?寮�")) { return name } String newDistrictName = com.fangjia.core.util.DataUtil.toDBCcase(name) - .replaceAll("[\\.·'\"“”]", "").replaceAll('—', '-') - //去除“地块”信息 + .replaceAll("[\\.路'\"鈥溾�漖", "").replaceAll('鈥�', '-') + //鍘婚櫎鈥滃湴鍧椻�濅俊鎭� newDistrictName = formatByPattern(newDistrictName, district_pattern1) - //阿拉伯数字转汉字,以数字结尾的暂时不处理 - newDistrictName = convertArabicToCn(newDistrictName, '期') - //罗马数字转汉字 - newDistrictName = convertRomanToCn(newDistrictName, '期') - //去除末尾的新盘标识 + //闃挎媺浼暟瀛楄浆姹夊瓧锛屼互鏁板瓧缁撳熬鐨勬殏鏃朵笉澶勭悊 + newDistrictName = convertArabicToCn(newDistrictName, '鏈�') + //缃楅┈鏁板瓧杞眽瀛� + newDistrictName = convertRomanToCn(newDistrictName, '鏈�') + //鍘婚櫎鏈熬鐨勬柊鐩樻爣璇� newDistrictName = removeInvalidTail(newDistrictName) - //去除楼号信息 + //鍘婚櫎妤煎彿淇℃伅 newDistrictName = formatByPattern(newDistrictName, district_pattern2) - if(newDistrictName.matches('^.+?(路|大道|大街|街道|科技园|大学|学院|商铺|写字楼|商业|公司|办公楼?|停车场?|车库)$') || newDistrictName.matches(".*[\\(\\)()_]")) { + if(newDistrictName.matches('^.+?(璺瘄澶ч亾|澶ц|琛楅亾|绉戞妧鍥瓅澶у|瀛﹂櫌|鍟嗛摵|鍐欏瓧妤紎鍟嗕笟|鍏徃|鍔炲叕妤�?|鍋滆溅鍦�?|杞﹀簱)$') || newDistrictName.matches(".*[\\(\\)锛堬級_]")) { newDistrictName = null } return newDistrictName } /** - * 格式化地址 + * 鏍煎紡鍖栧湴鍧� * @param city * @param address * @return */ public static String formatDistrictAddress(final String city, final String address) { - if(StringUtils.isBlank(city) || StringUtils.isBlank(address) || !address.matches('.*[路道街].*')) { + if(StringUtils.isBlank(city) || StringUtils.isBlank(address) || !address.matches('.*[璺亾琛梋.*')) { return null } String formatAddress = DataUtil.formateAddress(city, address) - if(StringUtils.isNotBlank(formatAddress) && formatAddress.matches('^[\u4e00-\u9fa5]+?(路|大道|街).+[弄号]$')) { + if(StringUtils.isNotBlank(formatAddress) && formatAddress.matches('^[\u4e00-\u9fa5]+?(璺瘄澶ч亾|琛�).+[寮勫彿]$')) { return formatAddress } return null } /** - * 格式化楼栋号 - * @param city 城市 - * @param region 区域 - * @param districtName 小区名 - * @param houseNumber 楼栋号 + * 鏍煎紡鍖栨ゼ鏍嬪彿 + * @param city 鍩庡競 + * @param region 鍖哄煙 + * @param districtName 灏忓尯鍚� + * @param houseNumber 妤兼爧鍙� * @return */ public static String formatHouseNumber(final String houseNumber) { if(StringUtils.isBlank(houseNumber)) { return null; } - def newHouseNumber = houseNumber.toUpperCase().replace("#", "#") - // .+弄(?:\w+支弄)?(?:\w+区)?([-\w]+)号.* + def newHouseNumber = houseNumber.toUpperCase().replace("锛�", "#") + // .+寮�(?:\w+鏀紕)?(?:\w+鍖�)?([-\w]+)鍙�.* newHouseNumber = formatByPattern(newHouseNumber, pattern1) - // (?<=村|花园|别墅|公寓|苑|坊|里)(?[甲乙丙丁戊戌\w]+)[号幢栋] + // (?<=鏉憒鑺卞洯|鍒|鍏瘬|鑻憒鍧妡閲�)(?[鐢蹭箼涓欎竵鎴婃垖\w]+)[鍙峰耿鏍媇 newHouseNumber = formatByPattern(newHouseNumber, pattern2) - //(? - if(!item.matches('东南西北甲乙丙丁戊戌')) { + if(!item.matches('涓滃崡瑗垮寳鐢蹭箼涓欎竵鎴婃垖')) { cnCount++ } }) - //去除开头和结尾的特殊符号 + //鍘婚櫎寮�澶村拰缁撳熬鐨勭壒娈婄鍙� if(cnCount < 2) { - while (newHouseNumber.matches('^[^a-zA-Z1-9东南西北甲乙丙丁戊戌].*$')) { + while (newHouseNumber.matches('^[^a-zA-Z1-9涓滃崡瑗垮寳鐢蹭箼涓欎竵鎴婃垖].*$')) { newHouseNumber = newHouseNumber.substring(1) } - while (newHouseNumber.matches('^.*?[^a-zA-Z0-9东南西北甲乙丙丁戊戌]+$')) { + while (newHouseNumber.matches('^.*?[^a-zA-Z0-9涓滃崡瑗垮寳鐢蹭箼涓欎竵鎴婃垖]+$')) { newHouseNumber = newHouseNumber[0..-2] } } - //处理类似201201这样的楼栋号,整理为201 + //澶勭悊绫讳技201201杩欐牱鐨勬ゼ鏍嬪彿锛屾暣鐞嗕负201 if(newHouseNumber.matches("([a-zA-Z0-9]{3,})\\1")) { newHouseNumber = newHouseNumber.replaceAll("([a-zA-Z0-9]{3,})\\1", '$1') } @@ -458,7 +458,7 @@ class LoudongUtil { } /** - * 格式化单元号 + * 鏍煎紡鍖栧崟鍏冨彿 * @param unitNumber * @return */ @@ -468,30 +468,30 @@ class LoudongUtil { } def newUnitNumber; - if(unitNumber.matches('.*?[一二三四五六七八九十\\d]+单元.*')) { - newUnitNumber = unitNumber.replaceAll('.*?([\\d一二三四五六七八九十]+)单元.*', '$1') + if(unitNumber.matches('.*?[涓�浜屼笁鍥涗簲鍏竷鍏節鍗乗\d]+鍗曞厓.*')) { + newUnitNumber = unitNumber.replaceAll('.*?([\\d涓�浜屼笁鍥涗簲鍏竷鍏節鍗乚+)鍗曞厓.*', '$1') } else { - newUnitNumber = StringUtils.substringBefore(unitNumber.toUpperCase(), "单元") + newUnitNumber = StringUtils.substringBefore(unitNumber.toUpperCase(), "鍗曞厓") } - //替换“一”“二”“三”等为阿拉伯数字 - if(newUnitNumber.matches(".*[零一二三四五六七八九十]+.*")) { + //鏇挎崲鈥滀竴鈥濃�滀簩鈥濃�滀笁鈥濈瓑涓洪樋鎷変集鏁板瓧 + if(newUnitNumber.matches(".*[闆朵竴浜屼笁鍥涗簲鍏竷鍏節鍗乚+.*")) { newUnitNumber = convertCNToArabic(newUnitNumber) } - //替换“Ⅰ”“Ⅱ”“Ⅲ”等转换为阿拉伯数字 - if(newUnitNumber.matches(".*[ⅠⅡⅢⅣⅤⅥⅦⅧⅨⅩ]+.*")) { + //鏇挎崲鈥溾厾鈥濃�溾叀鈥濃�溾參鈥濈瓑杞崲涓洪樋鎷変集鏁板瓧 + if(newUnitNumber.matches(".*[鈪犫叀鈪⑩叄鈪も叆鈪︹収鈪ㄢ叐]+.*")) { newUnitNumber = convertRomanToArabic(newUnitNumber) } - //去除开头和结尾的特殊符号 - /*while (newUnitNumber.matches('^[^a-zA-Z0-9东南西北甲乙丙丁戊戌].*$')) { + //鍘婚櫎寮�澶村拰缁撳熬鐨勭壒娈婄鍙� + /*while (newUnitNumber.matches('^[^a-zA-Z0-9涓滃崡瑗垮寳鐢蹭箼涓欎竵鎴婃垖].*$')) { newUnitNumber = newUnitNumber.substring(1) }*/ - while (newUnitNumber.matches('^[-—_/,\\.。,、]')) { + while (newUnitNumber.matches('^[-鈥擾/,\\.銆傦紝銆乚')) { newUnitNumber = newUnitNumber.substring(1) } - while (newUnitNumber.matches('^.*?[^a-zA-Z0-9东南西北甲乙丙丁戊戌]+$') && newUnitNumber.length() > 1) { + while (newUnitNumber.matches('^.*?[^a-zA-Z0-9涓滃崡瑗垮寳鐢蹭箼涓欎竵鎴婃垖]+$') && newUnitNumber.length() > 1) { newUnitNumber = newUnitNumber[0..-2] } - if(newUnitNumber.matches('^[a-zA-Z0-9东南西北甲乙丙丁戊戌]+$') && newUnitNumber.length() < 5) { + if(newUnitNumber.matches('^[a-zA-Z0-9涓滃崡瑗垮寳鐢蹭箼涓欎竵鎴婃垖]+$') && newUnitNumber.length() < 5) { return newUnitNumber } return "0" @@ -506,7 +506,7 @@ class LoudongUtil { } /** - * 罗马数字转阿拉伯数字 + * 缃楅┈鏁板瓧杞樋鎷変集鏁板瓧 * @param sourceString * @return */ @@ -514,16 +514,16 @@ class LoudongUtil { if(StringUtils.isBlank(sourceString)) { return null } - String newString = sourceString.replace("Ⅹ"+suffix, "10"+suffix).replace("Ⅸ"+suffix, "9"+suffix) - .replace("Ⅷ"+suffix, "8"+suffix).replace("Ⅶ"+suffix, "7"+suffix).replace("Ⅵ"+suffix, "6"+suffix) - .replace("Ⅴ"+suffix, "5"+suffix).replace("Ⅳ"+suffix, "4"+suffix).replace("Ⅲ"+suffix, "3"+suffix) - .replace("Ⅱ"+suffix, "2"+suffix).replace("Ⅰ"+suffix, "1"+suffix); + String newString = sourceString.replace("鈪�"+suffix, "10"+suffix).replace("鈪�"+suffix, "9"+suffix) + .replace("鈪�"+suffix, "8"+suffix).replace("鈪�"+suffix, "7"+suffix).replace("鈪�"+suffix, "6"+suffix) + .replace("鈪�"+suffix, "5"+suffix).replace("鈪�"+suffix, "4"+suffix).replace("鈪�"+suffix, "3"+suffix) + .replace("鈪�"+suffix, "2"+suffix).replace("鈪�"+suffix, "1"+suffix); return newString } /** - * 罗马数字转汉字 + * 缃楅┈鏁板瓧杞眽瀛� * @param srcString * @return */ @@ -531,16 +531,16 @@ class LoudongUtil { if(StringUtils.isBlank(srcString)) { return null } - String newString = srcString.replace("Ⅹ"+suffix, "十"+suffix).replace("Ⅸ"+suffix, "九"+suffix) - .replace("Ⅷ"+suffix, "八"+suffix).replace("Ⅶ"+suffix, "七"+suffix).replace("Ⅵ"+suffix, "六"+suffix) - .replace("Ⅴ"+suffix, "五"+suffix).replace("Ⅳ"+suffix, "四"+suffix).replace("Ⅲ"+suffix, "三"+suffix) - .replace("Ⅱ"+suffix, "二"+suffix).replace("Ⅰ"+suffix, "一"+suffix); + String newString = srcString.replace("鈪�"+suffix, "鍗�"+suffix).replace("鈪�"+suffix, "涔�"+suffix) + .replace("鈪�"+suffix, "鍏�"+suffix).replace("鈪�"+suffix, "涓�"+suffix).replace("鈪�"+suffix, "鍏�"+suffix) + .replace("鈪�"+suffix, "浜�"+suffix).replace("鈪�"+suffix, "鍥�"+suffix).replace("鈪�"+suffix, "涓�"+suffix) + .replace("鈪�"+suffix, "浜�"+suffix).replace("鈪�"+suffix, "涓�"+suffix); return newString } /** - * 汉字数字转换为阿拉伯数字 + * 姹夊瓧鏁板瓧杞崲涓洪樋鎷変集鏁板瓧 * @param sourceString * @return */ @@ -559,7 +559,7 @@ class LoudongUtil { } /** - * 阿拉伯数字转汉字 + * 闃挎媺浼暟瀛楄浆姹夊瓧 * @param srcString * @param suffix * @return @@ -587,7 +587,7 @@ class LoudongUtil { } /** - * 去除小区名末尾的无效标识 + * 鍘婚櫎灏忓尯鍚嶆湯灏剧殑鏃犳晥鏍囪瘑 * @param srcString * @return */ @@ -596,15 +596,15 @@ class LoudongUtil { return null } String result = srcString - if(result.matches('.+?[\\((]?([一二三四五六七八九十]+期)[\\))]?$')) { - result = result.replaceAll('[\\((]?([一二三四五六七八九十]+期)[\\))]?$', '$1') + if(result.matches('.+?[\\(锛圿?([涓�浜屼笁鍥涗簲鍏竷鍏節鍗乚+鏈�)[\\)锛塢?$')) { + result = result.replaceAll('[\\(锛圿?([涓�浜屼笁鍥涗簲鍏竷鍏節鍗乚+鏈�)[\\)锛塢?$', '$1') } - result = result.replaceAll('^(.+?)(?:[\\((].+[\\))])$', '$1') + result = result.replaceAll('^(.+?)(?:[\\(锛圿.+[\\)锛塢)$', '$1') return result } /** - * 将Loudong对象转为DBObject对象 + * 灏哃oudong瀵硅薄杞负DBObject瀵硅薄 * @param loudong * @return */ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/MapUtil.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/MapUtil.groovy index 81a6cde8b..aacb1916b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/MapUtil.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/MapUtil.groovy @@ -20,38 +20,38 @@ class MapUtil { private static final DBCollection BAIDU_CITYS = MongoUtils.getCollectionByName("addrepo", "baidu_citys", "192.168.0.61") def static GaodeCityMap = [ - "阿拉善盟":"152900","鞍山":"210300","安庆":"340800","安阳":"410500","阿坝藏族羌族自治州":"513200", - "安顺":"520400","阿里":"542500","安康":"610900","阿克苏":"652900","阿勒泰":"654300", - "阿拉尔":"659002","澳门":"820000","北京":"110000","保定":"130600","包头":"150200", - "巴彦淖尔":"150800","本溪":"210500","白山":"220600","白城":"220800","蚌埠":"340300", - "亳州":"341600","滨州":"371600","北海":"450500","百色":"451000","巴中":"511900", - "毕节":"520500","保山":"530500","宝鸡":"610300","白银":"620400","博尔塔拉蒙古自治州":"652700", - "巴音郭楞蒙古自治州":"652800","承德":"130800","沧州":"130900","长治":"140400","赤峰":"150400", - "朝阳":"211300","长春":"220100","常州":"320400","滁州":"341100","池州":"341700", - "长沙":"430100","常德":"430700","郴州":"431000","潮州":"445100","崇左":"451400", - "重庆":"500000","成都":"510100","楚雄彝族自治州":"532300","昌都":"540300","昌吉回族自治州":"652300", - "大同":"140200","大连":"210200","丹东":"210600","大庆":"230600","大兴安岭":"232700", - "东营":"370500","德州":"371400","东莞":"441900","儋州":"460400","德阳":"510600", - "达州":"511700","大理白族自治州":"532900","德宏傣族景颇族自治州":"533100","迪庆藏族自治州":"533400","定西":"621100", - "鄂尔多斯":"150600","鄂州":"420700","恩施土家族苗族自治州":"422800","抚顺":"210400","阜新":"210900", - "阜阳":"341200","福州":"350100","抚州":"361000","佛山":"440600","防城港":"450600", - "赣州":"360700","广州":"440100","桂林":"450300","贵港":"450800","广元":"510800", - "广安":"511600","甘孜藏族自治州":"513300","贵阳":"520100","甘南藏族自治州":"623000","果洛藏族自治州":"632600", - "固原":"640400","邯郸":"130400","衡水":"131100","呼和浩特":"150100","呼伦贝尔":"150700", - "葫芦岛":"211400","哈尔滨":"230100","鹤岗":"230400","黑河":"231100","淮安":"320800", - "杭州":"330100","湖州":"330500","合肥":"340100","淮南":"340400","淮北":"340600", - "黄山":"341000","菏泽":"371700","鹤壁":"410600","黄石":"420200","黄冈":"421100", - "衡阳":"430400","怀化":"431200","惠州":"441300","河源":"441600","贺州":"451100", - "河池":"451200","海口":"460100","红河哈尼族彝族自治州":"532500","汉中":"610700","海东":"630200", - "海北藏族自治州":"632200","黄南藏族自治州":"632300","海南藏族自治州":"632500","海西蒙古族藏族自治州":"632800","哈密":"652200", - "和田":"653200","晋城":"140500","晋中":"140700","锦州":"210700","吉林":"220200", - "鸡西":"230300","佳木斯":"230800","嘉兴":"330400","金华":"330700","景德镇":"360200","九江":"360400", - "吉安":"360800","济南":"370100","济宁":"370800","焦作":"410800","济源":"419001","荆门":"420800", - "荆州":"421000","江门":"440700","揭阳":"445200","嘉峪关":"620200","金昌":"620300", - "酒泉":"620900","开封":"410200","昆明":"530100","克拉玛依":"650200","克孜勒苏柯尔克孜自治州":"653000", - "喀什":"653100","廊坊":"131000","临汾":"141000","吕梁":"141100","辽阳":"211000", - "辽源":"220400","连云港":"320700","丽水":"331100","六安":"341500","龙岩":"350800", - "莱芜":"371200","临沂":"371300","聊城":"371500","洛阳":"410300","漯河":"411100","娄底":"431300","柳州":"450200","来宾":"451300","泸州":"510500","乐山":"511100","凉山彝族自治州":"513400","六盘水":"520200","丽江":"530700","临沧":"530900","拉萨":"540100","林芝":"540400","兰州":"620100","陇南":"621200","临夏回族自治州":"622900","牡丹江":"231000","马鞍山":"340500","茂名":"440900","梅州":"441400","绵阳":"510700","眉山":"511400","南京":"320100","南通":"320600","宁波":"330200","南平":"350700","宁德":"350900","南昌":"360100","南阳":"411300","南宁":"450100","内江":"511000","南充":"511300","怒江傈僳族自治州":"533300","那曲":"542400","盘锦":"211100","莆田":"350300","萍乡":"360300","平顶山":"410400","濮阳":"410900","攀枝花":"510400","普洱":"530800","平凉":"620800","秦皇岛":"130300","齐齐哈尔":"230200","七台河":"230900","衢州":"330800","泉州":"350500","青岛":"370200","潜江":"429005","清远":"441800","钦州":"450700","黔西南布依族苗族自治州":"522300","黔东南苗族侗族自治州":"522600","黔南布依族苗族自治州":"522700","曲靖":"530300","庆阳":"621000","日照":"371100","日喀则":"540200","石家庄":"130100","朔州":"140600","沈阳":"210100","四平":"220300","松原":"220700","双鸭山":"230500","绥化":"231200","上海":"310000","苏州":"320500","宿迁":"321300","绍兴":"330600","宿州":"341300","三明":"350400","上饶":"361100","三门峡":"411200","商丘":"411400","十堰":"420300","随州":"421300","神农架林区":"429021","邵阳":"430500","韶关":"440200","深圳":"440300","汕头":"440500","汕尾":"441500","三亚":"460200","三沙":"460300","遂宁":"510900","山南":"540500","商洛":"611000","石嘴山":"640200","石河子":"659001","天津":"120000","唐山":"130200","太原":"140100","通辽":"150500","铁岭":"211200","通化":"220500","泰州":"321200","台州":"331000","铜陵":"340700","泰安":"370900","天门":"429006","铜仁":"520600","铜川":"610200","天水":"620500","吐鲁番":"650400","塔城":"654200","图木舒克":"659003","台湾":"710000","乌海":"150300","乌兰察布":"150900","无锡":"320200","温州":"330300","芜湖":"340200","潍坊":"370700","威海":"371000","武汉":"420100","梧州":"450400","文山壮族苗族自治州":"532600","渭南":"610500","武威":"620600","吴忠":"640300","乌鲁木齐":"650100","五家渠":"659004","邢台":"130500","忻州":"140900","兴安盟":"152200","锡林郭勒盟":"152500","徐州":"320300","宣城":"341800","厦门":"350200","新余":"360500","新乡":"410700","许昌":"411000","信阳":"411500","襄阳":"420600","孝感":"420900","咸宁":"421200","仙桃":"429004","湘潭":"430300","湘西土家族苗族自治州":"433100","西双版纳傣族自治州":"532800","西安":"610100","咸阳":"610400","西宁":"630100","香港":"810000","阳泉":"140300","运城":"140800","营口":"210800","延边朝鲜族自治州":"222400","伊春":"230700","盐城":"320900","扬州":"321000","鹰潭":"360600","宜春":"360900","烟台":"370600","宜昌":"420500","岳阳":"430600","益阳":"430900","永州":"431100","阳江":"441700","云浮":"445300","玉林":"450900","宜宾":"511500","雅安":"511800","玉溪":"530400","延安":"610600","榆林":"610800","玉树藏族自治州":"632700","银川":"640100","伊犁哈萨克自治州":"654000","张家口":"130700","镇江":"321100","舟山":"330900","漳州":"350600","淄博":"370300","枣庄":"370400","郑州":"410100","周口":"411600","驻马店":"411700","株洲":"430200","张家界":"430800","珠海":"440400","湛江":"440800","肇庆":"441200","中山":"442000","自贡":"510300","资阳":"512000","遵义":"520300","昭通":"530600","张掖":"620700","中卫":"640500" + "闃挎媺鍠勭洘":"152900","闉嶅北":"210300","瀹夊簡":"340800","瀹夐槼":"410500","闃垮潩钘忔棌缇屾棌鑷不宸�":"513200", + "瀹夐『":"520400","闃块噷":"542500","瀹夊悍":"610900","闃垮厠鑻�":"652900","闃垮嫆娉�":"654300", + "闃挎媺灏�":"659002","婢抽棬":"820000","鍖椾含":"110000","淇濆畾":"130600","鍖呭ご":"150200", + "宸村溅娣栧皵":"150800","鏈邯":"210500","鐧藉北":"220600","鐧藉煄":"220800","铓屽煚":"340300", + "浜冲窞":"341600","婊ㄥ窞":"371600","鍖楁捣":"450500","鐧捐壊":"451000","宸翠腑":"511900", + "姣曡妭":"520500","淇濆北":"530500","瀹濋浮":"610300","鐧介摱":"620400","鍗氬皵濉旀媺钂欏彜鑷不宸�":"652700", + "宸撮煶閮钂欏彜鑷不宸�":"652800","鎵垮痉":"130800","娌у窞":"130900","闀挎不":"140400","璧ゅ嘲":"150400", + "鏈濋槼":"211300","闀挎槬":"220100","甯稿窞":"320400","婊佸窞":"341100","姹犲窞":"341700", + "闀挎矙":"430100","甯稿痉":"430700","閮村窞":"431000","娼窞":"445100","宕囧乏":"451400", + "閲嶅簡":"500000","鎴愰兘":"510100","妤氶泟褰濇棌鑷不宸�":"532300","鏄岄兘":"540300","鏄屽悏鍥炴棌鑷不宸�":"652300", + "澶у悓":"140200","澶ц繛":"210200","涓逛笢":"210600","澶у簡":"230600","澶у叴瀹夊箔":"232700", + "涓滆惀":"370500","寰峰窞":"371400","涓滆帪":"441900","鍎嬪窞":"460400","寰烽槼":"510600", + "杈惧窞":"511700","澶х悊鐧芥棌鑷不宸�":"532900","寰峰畯鍌f棌鏅鏃忚嚜娌诲窞":"533100","杩簡钘忔棌鑷不宸�":"533400","瀹氳タ":"621100", + "閯傚皵澶氭柉":"150600","閯傚窞":"420700","鎭╂柦鍦熷鏃忚嫍鏃忚嚜娌诲窞":"422800","鎶氶『":"210400","闃滄柊":"210900", + "闃滈槼":"341200","绂忓窞":"350100","鎶氬窞":"361000","浣涘北":"440600","闃插煄娓�":"450600", + "璧e窞":"360700","骞垮窞":"440100","妗傛灄":"450300","璐垫腐":"450800","骞垮厓":"510800", + "骞垮畨":"511600","鐢樺瓬钘忔棌鑷不宸�":"513300","璐甸槼":"520100","鐢樺崡钘忔棌鑷不宸�":"623000","鏋滄礇钘忔棌鑷不宸�":"632600", + "鍥哄師":"640400","閭兏":"130400","琛℃按":"131100","鍛煎拰娴╃壒":"150100","鍛间鸡璐濆皵":"150700", + "钁姦宀�":"211400","鍝堝皵婊�":"230100","楣ゅ矖":"230400","榛戞渤":"231100","娣畨":"320800", + "鏉窞":"330100","婀栧窞":"330500","鍚堣偉":"340100","娣崡":"340400","娣寳":"340600", + "榛勫北":"341000","鑿忔辰":"371700","楣ゅ":"410600","榛勭煶":"420200","榛勫唸":"421100", + "琛¢槼":"430400","鎬�鍖�":"431200","鎯犲窞":"441300","娌虫簮":"441600","璐哄窞":"451100", + "娌虫睜":"451200","娴峰彛":"460100","绾㈡渤鍝堝凹鏃忓綕鏃忚嚜娌诲窞":"532500","姹変腑":"610700","娴蜂笢":"630200", + "娴峰寳钘忔棌鑷不宸�":"632200","榛勫崡钘忔棌鑷不宸�":"632300","娴峰崡钘忔棌鑷不宸�":"632500","娴疯タ钂欏彜鏃忚棌鏃忚嚜娌诲窞":"632800","鍝堝瘑":"652200", + "鍜岀敯":"653200","鏅嬪煄":"140500","鏅嬩腑":"140700","閿﹀窞":"210700","鍚夋灄":"220200", + "楦¤タ":"230300","浣虫湪鏂�":"230800","鍢夊叴":"330400","閲戝崕":"330700","鏅痉闀�":"360200","涔濇睙":"360400", + "鍚夊畨":"360800","娴庡崡":"370100","娴庡畞":"370800","鐒︿綔":"410800","娴庢簮":"419001","鑽嗛棬":"420800", + "鑽嗗窞":"421000","姹熼棬":"440700","鎻槼":"445200","鍢夊唱鍏�":"620200","閲戞槍":"620300", + "閰掓硥":"620900","寮�灏�":"410200","鏄嗘槑":"530100","鍏嬫媺鐜涗緷":"650200","鍏嬪瓬鍕掕嫃鏌皵鍏嬪瓬鑷不宸�":"653000", + "鍠�浠�":"653100","寤婂潑":"131000","涓存本":"141000","鍚曟":"141100","杈介槼":"211000", + "杈芥簮":"220400","杩炰簯娓�":"320700","涓芥按":"331100","鍏畨":"341500","榫欏博":"350800", + "鑾辫姕":"371200","涓存矀":"371300","鑱婂煄":"371500","娲涢槼":"410300","婕渤":"411100","濞勫簳":"431300","鏌冲窞":"450200","鏉ュ":"451300","娉稿窞":"510500","涔愬北":"511100","鍑夊北褰濇棌鑷不宸�":"513400","鍏洏姘�":"520200","涓芥睙":"530700","涓存钵":"530900","鎷夎惃":"540100","鏋楄姖":"540400","鍏板窞":"620100","闄囧崡":"621200","涓村鍥炴棌鑷不宸�":"622900","鐗′腹姹�":"231000","椹瀺灞�":"340500","鑼傚悕":"440900","姊呭窞":"441400","缁甸槼":"510700","鐪夊北":"511400","鍗椾含":"320100","鍗楅��":"320600","瀹佹尝":"330200","鍗楀钩":"350700","瀹佸痉":"350900","鍗楁槍":"360100","鍗楅槼":"411300","鍗楀畞":"450100","鍐呮睙":"511000","鍗楀厖":"511300","鎬掓睙鍌堝兂鏃忚嚜娌诲窞":"533300","閭f洸":"542400","鐩橀敠":"211100","鑾嗙敯":"350300","钀嶄埂":"360300","骞抽《灞�":"410400","婵槼":"410900","鏀�鏋濊姳":"510400","鏅幢":"530800","骞冲噳":"620800","绉︾殗宀�":"130300","榻愰綈鍝堝皵":"230200","涓冨彴娌�":"230900","琛㈠窞":"330800","娉夊窞":"350500","闈掑矝":"370200","娼滄睙":"429005","娓呰繙":"441800","閽﹀窞":"450700","榛旇タ鍗楀竷渚濇棌鑻楁棌鑷不宸�":"522300","榛斾笢鍗楄嫍鏃忎緱鏃忚嚜娌诲窞":"522600","榛斿崡甯冧緷鏃忚嫍鏃忚嚜娌诲窞":"522700","鏇查潠":"530300","搴嗛槼":"621000","鏃ョ収":"371100","鏃ュ杸鍒�":"540200","鐭冲搴�":"130100","鏈斿窞":"140600","娌堥槼":"210100","鍥涘钩":"220300","鏉惧師":"220700","鍙岄腑灞�":"230500","缁ュ寲":"231200","涓婃捣":"310000","鑻忓窞":"320500","瀹胯縼":"321300","缁嶅叴":"330600","瀹垮窞":"341300","涓夋槑":"350400","涓婇ザ":"361100","涓夐棬宄�":"411200","鍟嗕笜":"411400","鍗佸牥":"420300","闅忓窞":"421300","绁炲啘鏋舵灄鍖�":"429021","閭甸槼":"430500","闊跺叧":"440200","娣卞湷":"440300","姹曞ご":"440500","姹曞熬":"441500","涓変簹":"460200","涓夋矙":"460300","閬傚畞":"510900","灞卞崡":"540500","鍟嗘礇":"611000","鐭冲槾灞�":"640200","鐭虫渤瀛�":"659001","澶╂触":"120000","鍞愬北":"130200","澶師":"140100","閫氳窘":"150500","閾佸箔":"211200","閫氬寲":"220500","娉板窞":"321200","鍙板窞":"331000","閾滈櫟":"340700","娉板畨":"370900","澶╅棬":"429006","閾滀粊":"520600","閾滃窛":"610200","澶╂按":"620500","鍚愰瞾鐣�":"650400","濉斿煄":"654200","鍥炬湪鑸掑厠":"659003","鍙版咕":"710000","涔屾捣":"150300","涔屽叞瀵熷竷":"150900","鏃犻敗":"320200","娓╁窞":"330300","鑺滄箹":"340200","娼嶅潑":"370700","濞佹捣":"371000","姝︽眽":"420100","姊у窞":"450400","鏂囧北澹棌鑻楁棌鑷不宸�":"532600","娓崡":"610500","姝﹀▉":"620600","鍚村繝":"640300","涔岄瞾鏈ㄩ綈":"650100","浜斿娓�":"659004","閭㈠彴":"130500","蹇诲窞":"140900","鍏村畨鐩�":"152200","閿℃灄閮嫆鐩�":"152500","寰愬窞":"320300","瀹e煄":"341800","鍘﹂棬":"350200","鏂颁綑":"360500","鏂颁埂":"410700","璁告槍":"411000","淇¢槼":"411500","瑗勯槼":"420600","瀛濇劅":"420900","鍜稿畞":"421200","浠欐":"429004","婀樻江":"430300","婀樿タ鍦熷鏃忚嫍鏃忚嚜娌诲窞":"433100","瑗垮弻鐗堢撼鍌f棌鑷不宸�":"532800","瑗垮畨":"610100","鍜搁槼":"610400","瑗垮畞":"630100","棣欐腐":"810000","闃虫硥":"140300","杩愬煄":"140800","钀ュ彛":"210800","寤惰竟鏈濋矞鏃忚嚜娌诲窞":"222400","浼婃槬":"230700","鐩愬煄":"320900","鎵窞":"321000","楣版江":"360600","瀹滄槬":"360900","鐑熷彴":"370600","瀹滄槍":"420500","宀抽槼":"430600","鐩婇槼":"430900","姘稿窞":"431100","闃虫睙":"441700","浜戞诞":"445300","鐜夋灄":"450900","瀹滃":"511500","闆呭畨":"511800","鐜夋邯":"530400","寤跺畨":"610600","姒嗘灄":"610800","鐜夋爲钘忔棌鑷不宸�":"632700","閾跺窛":"640100","浼婄妬鍝堣惃鍏嬭嚜娌诲窞":"654000","寮犲鍙�":"130700","闀囨睙":"321100","鑸熷北":"330900","婕冲窞":"350600","娣勫崥":"370300","鏋e簞":"370400","閮戝窞":"410100","鍛ㄥ彛":"411600","椹婚┈搴�":"411700","鏍床":"430200","寮犲鐣�":"430800","鐝犳捣":"440400","婀涙睙":"440800","鑲囧簡":"441200","涓北":"442000","鑷础":"510300","璧勯槼":"512000","閬典箟":"520300","鏄��":"530600","寮犳帠":"620700","涓崼":"640500" ] public static String[] AKS = ["hj5KqPjaGA3uivtg8uS8XfAnj9X1kPMr","xjFg7DfDqvQleIZasM3ph8Zi2Lw8kgCg", @@ -130,7 +130,7 @@ class MapUtil { } /** - * 高德地图搜索 + * 楂樺痉鍦板浘鎼滅储 * @param city * @param name * @return @@ -171,7 +171,7 @@ class MapUtil { } /** - * 高德地图根据id查询poi详情 + * 楂樺痉鍦板浘鏍规嵁id鏌ヨpoi璇︽儏 * @param id */ def static searchDetailByGaode(String id) { @@ -196,7 +196,7 @@ class MapUtil { } /** - * 高德地图根据经纬度查询 + * 楂樺痉鍦板浘鏍规嵁缁忕含搴︽煡璇� * @param lat * @param lng * @return @@ -221,7 +221,7 @@ class MapUtil { } /** - * 根据高德地图判定是不是小区 + * 鏍规嵁楂樺痉鍦板浘鍒ゅ畾鏄笉鏄皬鍖� * @param city * @param address */ @@ -230,7 +230,7 @@ class MapUtil { def result = ['isDistrict': false] if(searchResult != null && searchResult['status']==1) { searchResult['list'].each {data-> - if(data['classify'].contains('住宅')) { + if(data['classify'].contains('浣忓畢')) { result.isDistrict = true result.data = data return @@ -241,7 +241,7 @@ class MapUtil { } public static void main(String[] args) { - def result = searchRegionByBaidu('上海', '虹梅路2666弄') + def result = searchRegionByBaidu('涓婃捣', '铏规璺�2666寮�') println result } } \ No newline at end of file diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/NewLoudongUtil.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/NewLoudongUtil.groovy index 368c98db3..3fb2c5781 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/NewLoudongUtil.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/NewLoudongUtil.groovy @@ -26,31 +26,31 @@ import java.util.regex.Pattern * Created by linxsh on 2016/12/1. */ class NewLoudongUtil { - private static Pattern HOUSE_NUMBER_PATTERN = Pattern.compile('[-a-zA-Z\\d东南西北甲乙丙丁戊戌]+') - private static Pattern CN_NUMBER_PATTERN = Pattern.compile('[〇零一二三四五六七八九十]+'); - private static final Pattern ROMAN_NUMBER_PATTERN = Pattern.compile("[ⅠⅡⅢⅣⅤⅥⅦⅧⅨⅩ]") + private static Pattern HOUSE_NUMBER_PATTERN = Pattern.compile('[-a-zA-Z\\d涓滃崡瑗垮寳鐢蹭箼涓欎竵鎴婃垖]+') + private static Pattern CN_NUMBER_PATTERN = Pattern.compile('[銆囬浂涓�浜屼笁鍥涗簲鍏竷鍏節鍗乚+'); + private static final Pattern ROMAN_NUMBER_PATTERN = Pattern.compile("[鈪犫叀鈪⑩叄鈪も叆鈪︹収鈪ㄢ叐]") private static final Pattern ARABIC_NUMBER_PATTERN = Pattern.compile("\\d+") - private static final Pattern ARABIC_NUMBER_PATTERN2 = Pattern.compile("\\d+期") + private static final Pattern ARABIC_NUMBER_PATTERN2 = Pattern.compile("\\d+鏈�") private static DSCollection seaweed = new DataStore("seaweed.db.fangjia.com", 27007).getCollection("fangjia.seaweed") private static DBCollection LOUDONG = MongoUtils.getCollectionByName("fangjia_base", "loudong", "mongo.db.fangjia.com") private static List cities = CommonUtils.findAllCity() /** - * 楼栋号正则 + * 妤兼爧鍙锋鍒� * @param host * @param dbName * @param coll */ - private static Pattern pattern1 = Pattern.compile('.+弄(?:\\w+支弄)?(?:\\w+区)?([-\\w]+)号') - private static Pattern pattern2 = Pattern.compile('(?<=村|花园|别墅|公寓|苑|坊|里)(?[甲乙丙丁戊戌\\w]+)[号幢栋]') - private static Pattern pattern3 = Pattern.compile('(?[鐢蹭箼涓欎竵鎴婃垖\\w]+)[鍙峰耿鏍媇') + private static Pattern pattern3 = Pattern.compile('(? cache = Sets.newHashSet() - println "开始查找重复楼栋数据..." + println "寮�濮嬫煡鎵鹃噸澶嶆ゼ鏍嬫暟鎹�..." for(DBObject dbObject : dbCursor) { String city = dbObject['city'] String region = dbObject['region'] @@ -89,27 +89,27 @@ class NewLoudongUtil { cache.add("$city--$region--$name--$houseNumber--$unitNumber") } } - println "找到${cache.size()}个重复楼栋" + println "鎵惧埌${cache.size()}涓噸澶嶆ゼ鏍�" println cache.toString() if(cache.size() > 0) { - println("开始删除...") + println("寮�濮嬪垹闄�...") cache.each {data-> String[] params = data.split("--"); int removeCount = removeDuplication(params[0], params[1], params[2], params[3], params[4]) - println "删除 $removeCount 条数据\t$data" + println "鍒犻櫎 $removeCount 鏉℃暟鎹甛t$data" } - println("删除完成!") + println("鍒犻櫎瀹屾垚锛�") } } /** - * 根据城市、区域、小区名、楼栋号、单元号去除重复数据 + * 鏍规嵁鍩庡競銆佸尯鍩熴�佸皬鍖哄悕銆佹ゼ鏍嬪彿銆佸崟鍏冨彿鍘婚櫎閲嶅鏁版嵁 * @param city * @param region * @param name * @param houseNumber * @param unitNumber - * @return 返回删除的重复数据数量 + * @return 杩斿洖鍒犻櫎鐨勯噸澶嶆暟鎹暟閲� */ public int removeDuplication(String city, String region, String name, String houseNumber, String unitNumber) { if(StringUtils.isBlank(city) || StringUtils.isBlank(region) || StringUtils.isBlank(name) || StringUtils.isBlank(houseNumber) || StringUtils.isBlank(unitNumber)) { @@ -185,10 +185,10 @@ class NewLoudongUtil { } /** - * 定制实现mongo的upsert功能,保存或更新楼栋数据 + * 瀹氬埗瀹炵幇mongo鐨剈psert鍔熻兘锛屼繚瀛樻垨鏇存柊妤兼爧鏁版嵁 * @param loudong * @param from - * @return 新增或保存的数据量 + * @return 鏂板鎴栦繚瀛樼殑鏁版嵁閲� */ public def upsert(final Loudong loudong) { def result = [save: 0, update: 0] @@ -205,7 +205,7 @@ class NewLoudongUtil { } /** - * 格式化待保存的数据 + * 鏍煎紡鍖栧緟淇濆瓨鐨勬暟鎹� * @param loudong * @return */ @@ -236,8 +236,8 @@ class NewLoudongUtil { } /** - * 保存或更新楼栋库数据,加锁避免多线程环境下的并发问题 - * @param saveObj 待保存数据对象 + * 淇濆瓨鎴栨洿鏂版ゼ鏍嬪簱鏁版嵁锛屽姞閿侀伩鍏嶅绾跨▼鐜涓嬬殑骞跺彂闂 + * @param saveObj 寰呬繚瀛樻暟鎹璞� * @return */ private synchronized int saveOrUpdate(final Loudong loudong) { @@ -249,11 +249,11 @@ class NewLoudongUtil { query.put('alias', loudong['name']) findObj = LOUDONG.findOne(query) } - //保存 + //淇濆瓨 if(findObj==null) { saveObj(loudong) return 1; - } else {//更新 + } else {//鏇存柊 updateObj(findObj, loudong) return 0 } @@ -261,7 +261,7 @@ class NewLoudongUtil { /** - * 更新 + * 鏇存柊 * @param findObj * @param obj * @param from @@ -277,7 +277,7 @@ class NewLoudongUtil { if(findObj.get('floors')==null || findObj.get('floors')==0 || findObj.get('floors') > 62) { updateObj.floors = loudong.floors } - //地址处理 + //鍦板潃澶勭悊 if(findObj['addr']==null) { updateObj.addr = loudong.address } else { @@ -286,7 +286,7 @@ class NewLoudongUtil { } } - //经纬度处理 + //缁忕含搴﹀鐞� if(findObj.lat_qq==0 || findObj.lng_qq==0) { updateObj.lat_qq = loudong.latQQ updateObj.lng_qq = loudong.lngQQ @@ -305,7 +305,7 @@ class NewLoudongUtil { /** - * 保存对象 + * 淇濆瓨瀵硅薄 * @param dbObject * @return */ @@ -316,7 +316,7 @@ class NewLoudongUtil { /** - * 将面积格式为两位小数 + * 灏嗛潰绉牸寮忎负涓や綅灏忔暟 * @param area * @return */ @@ -329,7 +329,7 @@ class NewLoudongUtil { } /** - * 将多个面积格式化为两位小数 + * 灏嗗涓潰绉牸寮忓寲涓轰袱浣嶅皬鏁� * @param areas */ static def formatAreas(Collection areas) { @@ -344,7 +344,7 @@ class NewLoudongUtil { } /** - * 格式化小区名 + * 鏍煎紡鍖栧皬鍖哄悕 * @param city * @param region * @param name @@ -354,25 +354,25 @@ class NewLoudongUtil { if(StringUtils.isBlank(city) || StringUtils.isBlank(name)) { return null } - if(name.matches("[\u4e00-\u9fa5]+?(路|大道|街).+[弄号]") || name.matches("[\u4e00-\u9fa5]+?弄")) { + if(name.matches("[\u4e00-\u9fa5]+?(璺瘄澶ч亾|琛�).+[寮勫彿]") || name.matches("[\u4e00-\u9fa5]+?寮�")) { return name } - String newDistrictName = name.replaceAll("[\\.·\'\"“”]", "") - //阿拉伯数字转汉字,以数字结尾的暂时不处理 - newDistrictName = convertArabicToCn(newDistrictName, '期') - //罗马数字转汉字 - newDistrictName = convertRomanToCn(newDistrictName, '期') - //去除末尾的新盘标识 + String newDistrictName = name.replaceAll("[\\.路\'\"鈥溾�漖", "") + //闃挎媺浼暟瀛楄浆姹夊瓧锛屼互鏁板瓧缁撳熬鐨勬殏鏃朵笉澶勭悊 + newDistrictName = convertArabicToCn(newDistrictName, '鏈�') + //缃楅┈鏁板瓧杞眽瀛� + newDistrictName = convertRomanToCn(newDistrictName, '鏈�') + //鍘婚櫎鏈熬鐨勬柊鐩樻爣璇� newDistrictName = removeInvalidTail(newDistrictName) - if(newDistrictName.matches('^.+?(路|大道|街|科技园|大学|学院|商铺|写字楼|商业|公司|办公楼?|停车场?|车库)$') || newDistrictName.matches(".*[\\(\\)()_]")) { + if(newDistrictName.matches('^.+?(璺瘄澶ч亾|琛梶绉戞妧鍥瓅澶у|瀛﹂櫌|鍟嗛摵|鍐欏瓧妤紎鍟嗕笟|鍏徃|鍔炲叕妤�?|鍋滆溅鍦�?|杞﹀簱)$') || newDistrictName.matches(".*[\\(\\)锛堬級_]")) { newDistrictName = null } return newDistrictName } /** - * 格式化地址 + * 鏍煎紡鍖栧湴鍧� * @param city * @param address * @return @@ -382,18 +382,18 @@ class NewLoudongUtil { return null } String formatAddress = DataUtil.formateAddress(city, address) - if(StringUtils.isNotBlank(formatAddress) && formatAddress.matches('^[\u4e00-\u9fa5]+?(路|大道|街).+[弄号]$')) { + if(StringUtils.isNotBlank(formatAddress) && formatAddress.matches('^[\u4e00-\u9fa5]+?(璺瘄澶ч亾|琛�).+[寮勫彿]$')) { return formatAddress } return null } /** - * 格式化楼栋号 - * @param city 城市 - * @param region 区域 - * @param districtName 小区名 - * @param houseNumber 楼栋号 + * 鏍煎紡鍖栨ゼ鏍嬪彿 + * @param city 鍩庡競 + * @param region 鍖哄煙 + * @param districtName 灏忓尯鍚� + * @param houseNumber 妤兼爧鍙� * @return */ public static String formatHouseNumber(final String houseNumber) { @@ -401,39 +401,39 @@ class NewLoudongUtil { return null; } - def newHouseNumber = houseNumber.toUpperCase().replace("#", "#") + def newHouseNumber = houseNumber.toUpperCase().replace("锛�", "#") - // .+弄(?:\w+支弄)?(?:\w+区)?([-\w]+)号.* + // .+寮�(?:\w+鏀紕)?(?:\w+鍖�)?([-\w]+)鍙�.* newHouseNumber = formatByPattern(newHouseNumber, pattern1) - // (?<=村|花园|别墅|公寓|苑|坊|里)(?[甲乙丙丁戊戌\w]+)[号幢栋] + // (?<=鏉憒鑺卞洯|鍒|鍏瘬|鑻憒鍧妡閲�)(?[鐢蹭箼涓欎竵鎴婃垖\w]+)[鍙峰耿鏍媇 newHouseNumber = formatByPattern(newHouseNumber, pattern2) - //(? - if(!item.matches('东南西北甲乙丙丁戊戌')) { + if(!item.matches('涓滃崡瑗垮寳鐢蹭箼涓欎竵鎴婃垖')) { cnCount++ } }) - //去除开头和结尾的特殊符号 + //鍘婚櫎寮�澶村拰缁撳熬鐨勭壒娈婄鍙� if(cnCount < 2) { - while (newHouseNumber.matches('^[^a-zA-Z1-9东南西北甲乙丙丁戊戌].*$')) { + while (newHouseNumber.matches('^[^a-zA-Z1-9涓滃崡瑗垮寳鐢蹭箼涓欎竵鎴婃垖].*$')) { newHouseNumber = newHouseNumber.substring(1) } - while (newHouseNumber.matches('^.*?[^a-zA-Z0-9东南西北甲乙丙丁戊戌]+$')) { + while (newHouseNumber.matches('^.*?[^a-zA-Z0-9涓滃崡瑗垮寳鐢蹭箼涓欎竵鎴婃垖]+$')) { newHouseNumber = newHouseNumber[0..-2] } } - //处理类似201201这样的楼栋号,整理为201 + //澶勭悊绫讳技201201杩欐牱鐨勬ゼ鏍嬪彿锛屾暣鐞嗕负201 if(newHouseNumber.matches("([a-zA-Z0-9]{3,})\\1")) { newHouseNumber = newHouseNumber.replaceAll("([a-zA-Z0-9]{3,})\\1", '$1') } @@ -447,7 +447,7 @@ class NewLoudongUtil { } /** - * 格式化单元号 + * 鏍煎紡鍖栧崟鍏冨彿 * @param unitNumber * @return */ @@ -457,27 +457,27 @@ class NewLoudongUtil { } def newUnitNumber; - if(unitNumber.matches('.*?[一二三四五六七八九十\\d]+单元.*')) { - newUnitNumber = unitNumber.replaceAll('.*?([\\d一二三四五六七八九十]+)单元.*', '$1') + if(unitNumber.matches('.*?[涓�浜屼笁鍥涗簲鍏竷鍏節鍗乗\d]+鍗曞厓.*')) { + newUnitNumber = unitNumber.replaceAll('.*?([\\d涓�浜屼笁鍥涗簲鍏竷鍏節鍗乚+)鍗曞厓.*', '$1') } else { - newUnitNumber = StringUtils.substringBefore(unitNumber.toUpperCase(), "单元") + newUnitNumber = StringUtils.substringBefore(unitNumber.toUpperCase(), "鍗曞厓") } - //替换“一”“二”“三”等为阿拉伯数字 - if(newUnitNumber.matches(".*[零一二三四五六七八九十]+.*")) { + //鏇挎崲鈥滀竴鈥濃�滀簩鈥濃�滀笁鈥濈瓑涓洪樋鎷変集鏁板瓧 + if(newUnitNumber.matches(".*[闆朵竴浜屼笁鍥涗簲鍏竷鍏節鍗乚+.*")) { newUnitNumber = convertCNToArabic(newUnitNumber) } - //替换“Ⅰ”“Ⅱ”“Ⅲ”等转换为阿拉伯数字 - if(newUnitNumber.matches(".*[ⅠⅡⅢⅣⅤⅥⅦⅧⅨⅩ]+.*")) { + //鏇挎崲鈥溾厾鈥濃�溾叀鈥濃�溾參鈥濈瓑杞崲涓洪樋鎷変集鏁板瓧 + if(newUnitNumber.matches(".*[鈪犫叀鈪⑩叄鈪も叆鈪︹収鈪ㄢ叐]+.*")) { newUnitNumber = convertRomanToArabic(newUnitNumber) } - //去除开头和结尾的特殊符号 - while (newUnitNumber.matches('^[^a-zA-Z0-9东南西北甲乙丙丁戊戌].*$')) { + //鍘婚櫎寮�澶村拰缁撳熬鐨勭壒娈婄鍙� + while (newUnitNumber.matches('^[^a-zA-Z0-9涓滃崡瑗垮寳鐢蹭箼涓欎竵鎴婃垖].*$')) { newUnitNumber = newUnitNumber.substring(1) } - while (newUnitNumber.matches('^.*?[^a-zA-Z0-9东南西北甲乙丙丁戊戌]+$')) { + while (newUnitNumber.matches('^.*?[^a-zA-Z0-9涓滃崡瑗垮寳鐢蹭箼涓欎竵鎴婃垖]+$')) { newUnitNumber = newUnitNumber[0..-2] } - if(newUnitNumber.matches('^[a-zA-Z0-9东南西北甲乙丙丁戊戌]+$') && newUnitNumber.length() < 5) { + if(newUnitNumber.matches('^[a-zA-Z0-9涓滃崡瑗垮寳鐢蹭箼涓欎竵鎴婃垖]+$') && newUnitNumber.length() < 5) { return newUnitNumber } return "--" @@ -492,7 +492,7 @@ class NewLoudongUtil { } /** - * 罗马数字转阿拉伯数字 + * 缃楅┈鏁板瓧杞樋鎷変集鏁板瓧 * @param sourceString * @return */ @@ -500,16 +500,16 @@ class NewLoudongUtil { if(StringUtils.isBlank(sourceString)) { return null } - String newString = sourceString.replace("Ⅹ"+suffix, "10"+suffix).replace("Ⅸ"+suffix, "9"+suffix) - .replace("Ⅷ"+suffix, "8"+suffix).replace("Ⅶ"+suffix, "7"+suffix).replace("Ⅵ"+suffix, "6"+suffix) - .replace("Ⅴ"+suffix, "5"+suffix).replace("Ⅳ"+suffix, "4"+suffix).replace("Ⅲ"+suffix, "3"+suffix) - .replace("Ⅱ"+suffix, "2"+suffix).replace("Ⅰ"+suffix, "1"+suffix); + String newString = sourceString.replace("鈪�"+suffix, "10"+suffix).replace("鈪�"+suffix, "9"+suffix) + .replace("鈪�"+suffix, "8"+suffix).replace("鈪�"+suffix, "7"+suffix).replace("鈪�"+suffix, "6"+suffix) + .replace("鈪�"+suffix, "5"+suffix).replace("鈪�"+suffix, "4"+suffix).replace("鈪�"+suffix, "3"+suffix) + .replace("鈪�"+suffix, "2"+suffix).replace("鈪�"+suffix, "1"+suffix); return newString } /** - * 罗马数字转汉字 + * 缃楅┈鏁板瓧杞眽瀛� * @param srcString * @return */ @@ -517,16 +517,16 @@ class NewLoudongUtil { if(StringUtils.isBlank(srcString)) { return null } - String newString = srcString.replace("Ⅹ"+suffix, "十"+suffix).replace("Ⅸ"+suffix, "九"+suffix) - .replace("Ⅷ"+suffix, "八"+suffix).replace("Ⅶ"+suffix, "七"+suffix).replace("Ⅵ"+suffix, "六"+suffix) - .replace("Ⅴ"+suffix, "五"+suffix).replace("Ⅳ"+suffix, "四"+suffix).replace("Ⅲ"+suffix, "三"+suffix) - .replace("Ⅱ"+suffix, "二"+suffix).replace("Ⅰ"+suffix, "一"+suffix); + String newString = srcString.replace("鈪�"+suffix, "鍗�"+suffix).replace("鈪�"+suffix, "涔�"+suffix) + .replace("鈪�"+suffix, "鍏�"+suffix).replace("鈪�"+suffix, "涓�"+suffix).replace("鈪�"+suffix, "鍏�"+suffix) + .replace("鈪�"+suffix, "浜�"+suffix).replace("鈪�"+suffix, "鍥�"+suffix).replace("鈪�"+suffix, "涓�"+suffix) + .replace("鈪�"+suffix, "浜�"+suffix).replace("鈪�"+suffix, "涓�"+suffix); return newString } /** - * 汉字数字转换为阿拉伯数字 + * 姹夊瓧鏁板瓧杞崲涓洪樋鎷変集鏁板瓧 * @param sourceString * @return */ @@ -545,7 +545,7 @@ class NewLoudongUtil { } /** - * 阿拉伯数字转汉字 + * 闃挎媺浼暟瀛楄浆姹夊瓧 * @param srcString * @param suffix * @return @@ -573,7 +573,7 @@ class NewLoudongUtil { } /** - * 去除小区名末尾的无效标识 + * 鍘婚櫎灏忓尯鍚嶆湯灏剧殑鏃犳晥鏍囪瘑 * @param srcString * @return */ @@ -582,15 +582,15 @@ class NewLoudongUtil { return null } String result = srcString - if(result.matches('.+?[\\((]?([一二三四五六七八九十]+期)[\\))]?$')) { - result = result.replaceAll('[\\((]?([一二三四五六七八九十]+期)[\\))]?$', '$1') + if(result.matches('.+?[\\(锛圿?([涓�浜屼笁鍥涗簲鍏竷鍏節鍗乚+鏈�)[\\)锛塢?$')) { + result = result.replaceAll('[\\(锛圿?([涓�浜屼笁鍥涗簲鍏竷鍏節鍗乚+鏈�)[\\)锛塢?$', '$1') } - result = result.replaceAll('^(.+?)(?:[\\((].+[\\))])$', '$1') + result = result.replaceAll('^(.+?)(?:[\\(锛圿.+[\\)锛塢)$', '$1') return result } /** - * 将Loudong对象转为DBObject对象 + * 灏哃oudong瀵硅薄杞负DBObject瀵硅薄 * @param loudong * @return */ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/entity/HouseLoudong.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/entity/HouseLoudong.groovy index 4eb960c80..9946caca3 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/entity/HouseLoudong.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/entity/HouseLoudong.groovy @@ -42,11 +42,11 @@ class HouseLoudong { String lighting_ventilation; String remark; int status = 0; - //小区编号 + //灏忓尯缂栧彿 String district_no; - //小区库名称 + //灏忓尯搴撳悕绉� String name_in_seaweed; - //房屋结构 + //鎴垮眿缁撴瀯 String hourse_structure; } \ No newline at end of file diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/handler/AddressHandler.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/handler/AddressHandler.groovy index 3523c7751..7e96e35c4 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/handler/AddressHandler.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/handler/AddressHandler.groovy @@ -19,7 +19,7 @@ class AddressHandler extends Handler { } if(StringUtils.isNotBlank(formatAddress)) { addressData.setAddress(formatAddress) - if(formatAddress.matches('^[\u4e00-\u9fa5]+?(路|大道|街).+[弄号]$')) { + if(formatAddress.matches('^[\u4e00-\u9fa5]+?(璺瘄澶ч亾|琛�).+[寮勫彿]$')) { addressData.setIsPreciseAddress(true) } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/handler/BaseHandler.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/handler/BaseHandler.groovy index cc8d6774e..44684eab3 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/handler/BaseHandler.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/handler/BaseHandler.groovy @@ -4,17 +4,17 @@ import com.fangjia.script.linxsh.util.AddressStringUtil import com.fangjia.script.linxsh.util.entity.AddressData /** - * 对输入的地址串进行初步处理,如全角转半角,全部转为大写等 + * 瀵硅緭鍏ョ殑鍦板潃涓茶繘琛屽垵姝ュ鐞嗭紝濡傚叏瑙掕浆鍗婅锛屽叏閮ㄨ浆涓哄ぇ鍐欑瓑 * Created by linxsh on 2017/3/22. */ class BaseHandler extends Handler { @Override protected void extractData(AddressData addressData) { - //全部转为大写 + //鍏ㄩ儴杞负澶у啓 convertToUpperCase(addressData) - //全部转为半角字符 + //鍏ㄩ儴杞负鍗婅瀛楃 convertToDBC(addressData) - //去除空白字符 + //鍘婚櫎绌虹櫧瀛楃 removeBlankString(addressData) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/handler/CityAndRegionHandler.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/handler/CityAndRegionHandler.groovy index 8f10bf679..f8c7ebf31 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/handler/CityAndRegionHandler.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/handler/CityAndRegionHandler.groovy @@ -23,7 +23,7 @@ class CityAndRegionHandler extends Handler { } /** - * 提取区域 + * 鎻愬彇鍖哄煙 * @param addressData */ def extractRegion(AddressData addressData) { @@ -36,12 +36,12 @@ class CityAndRegionHandler extends Handler { } /** - * 提取城市 + * 鎻愬彇鍩庡競 * @param addressData * @return */ def extractCity(AddressData addressData) { - //没有传入城市,则尝试从地址中提取城市 + //娌℃湁浼犲叆鍩庡競锛屽垯灏濊瘯浠庡湴鍧�涓彁鍙栧煄甯� addressData.setCity(addressData.inputCity) if(!addressData.inputCity) { String input = addressData.inputAddress @@ -52,15 +52,15 @@ class CityAndRegionHandler extends Handler { cityInAddress.put(city, index) } } - //地址中没有城市信息 + //鍦板潃涓病鏈夊煄甯備俊鎭� if(cityInAddress.size() == 0) { return } - //处理地址中包含的城市,找出可信度高的作为最终城市信息 + //澶勭悊鍦板潃涓寘鍚殑鍩庡競锛屾壘鍑哄彲淇″害楂樼殑浣滀负鏈�缁堝煄甯備俊鎭� for(Map.Entry entry : cityInAddress.entrySet()) { int cityStringlength = entry.getKey().length() def nextChar = input.charAt(entry.getValue() + cityStringlength) - if("市" == nextChar) { + if("甯�" == nextChar) { addressData.setCity(entry.getKey()) addressData.setConsumedInput(input.substring(entry.getValue() + cityStringlength + 1)) break diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/handler/DistrictNameHandler.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/handler/DistrictNameHandler.groovy index 7c39fcfc4..fa4eaebba 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/handler/DistrictNameHandler.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/handler/DistrictNameHandler.groovy @@ -8,42 +8,42 @@ import org.apache.commons.lang.StringUtils import java.util.regex.Pattern /** - * 处理小区名 + * 澶勭悊灏忓尯鍚� * Created by linxsh on 2017/3/22. */ class DistrictNameHandler extends Handler { - /**非小区*/ - private static Pattern notDistrictPattern = Pattern.compile('^.+?(路|大道|街|科技园|大学|学院|商铺|写字楼|商业|公司|办公楼?|停车场?|车库)$') - /**带地块信息的小区名*/ - private static Pattern districtPattern1 = Pattern.compile("(.{2,}[^-\\w、,,\\.\"\'“”##号])(?=(?:[-\\w、,,\\.\"\'“”##号]*地块?))") + /**闈炲皬鍖�*/ + private static Pattern notDistrictPattern = Pattern.compile('^.+?(璺瘄澶ч亾|琛梶绉戞妧鍥瓅澶у|瀛﹂櫌|鍟嗛摵|鍐欏瓧妤紎鍟嗕笟|鍏徃|鍔炲叕妤�?|鍋滆溅鍦�?|杞﹀簱)$') + /**甯﹀湴鍧椾俊鎭殑灏忓尯鍚�*/ + private static Pattern districtPattern1 = Pattern.compile("(.{2,}[^-\\w銆侊紝,\\.\"\'鈥溾��#锛冨彿])(?=(?:[-\\w銆侊紝,\\.\"\'鈥溾��#锛冨彿]*鍦板潡?))") @Override void extractData(AddressData addressData) { String name = addressData.formatString - if(name.matches("[\u4e00-\u9fa5]+?(路|大道|街).+[弄号]") || name.matches("[\u4e00-\u9fa5]+?弄")) { - addressData.districtName = name + "小区" + if(name.matches("[\u4e00-\u9fa5]+?(璺瘄澶ч亾|琛�).+[寮勫彿]") || name.matches("[\u4e00-\u9fa5]+?寮�")) { + addressData.districtName = name + "灏忓尯" addressData.alias << name return; } - String newDistrictName = name.replaceAll("[\\.·\'\"“”]", "") - //去除“地块”信息 + String newDistrictName = name.replaceAll("[\\.路\'\"鈥溾�漖", "") + //鍘婚櫎鈥滃湴鍧椻�濅俊鎭� newDistrictName = CommonUtil.formatByPattern(newDistrictName, districtPattern1) - //阿拉伯数字转汉字,以数字结尾的暂时不处理 - newDistrictName = CommonUtil.convertArabicToCn(newDistrictName, '期') - //罗马数字转汉字 - newDistrictName = CommonUtil.convertRomanToCn(newDistrictName, '期') - //去除末尾的新盘标识 + //闃挎媺浼暟瀛楄浆姹夊瓧锛屼互鏁板瓧缁撳熬鐨勬殏鏃朵笉澶勭悊 + newDistrictName = CommonUtil.convertArabicToCn(newDistrictName, '鏈�') + //缃楅┈鏁板瓧杞眽瀛� + newDistrictName = CommonUtil.convertRomanToCn(newDistrictName, '鏈�') + //鍘婚櫎鏈熬鐨勬柊鐩樻爣璇� newDistrictName = removeInvalidTail(newDistrictName) if(newDistrictName && !newDistrictName.matches(notDistrictPattern) - && !newDistrictName.matches(".*[\\(\\)()_]")) { + && !newDistrictName.matches(".*[\\(\\)锛堬級_]")) { addressData.districtName = newDistrictName } } /** - * 去除小区名末尾的无效标识 + * 鍘婚櫎灏忓尯鍚嶆湯灏剧殑鏃犳晥鏍囪瘑 * @param srcString * @return */ @@ -52,11 +52,11 @@ class DistrictNameHandler extends Handler { return null } String result = srcString - if(result.matches('.+?[\\((]?([一二三四五六七八九十]+期)[\\))]?$')) { - result = result.replaceAll('[\\((]?([一二三四五六七八九十]+期)[\\))]?$', '$1') + if(result.matches('.+?[\\(锛圿?([涓�浜屼笁鍥涗簲鍏竷鍏節鍗乚+鏈�)[\\)锛塢?$')) { + result = result.replaceAll('[\\(锛圿?([涓�浜屼笁鍥涗簲鍏竷鍏節鍗乚+鏈�)[\\)锛塢?$', '$1') } - //去除括号及括号中的信息 - result = result.replaceAll('^(.+?)(?:[\\((].+[\\))])$', '$1') + //鍘婚櫎鎷彿鍙婃嫭鍙蜂腑鐨勪俊鎭� + result = result.replaceAll('^(.+?)(?:[\\(锛圿.+[\\)锛塢)$', '$1') return result } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/handler/FloorHandler.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/handler/FloorHandler.groovy index 0a663349b..3323b2a30 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/handler/FloorHandler.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/handler/FloorHandler.groovy @@ -3,7 +3,7 @@ package com.fangjia.script.linxsh.util.handler import com.fangjia.script.linxsh.util.entity.AddressData /** - * 提取楼层 + * 鎻愬彇妤煎眰 * Created by linxsh on 2017/3/22. */ class FloorHandler extends Handler { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/handler/HouseNumberHandler.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/handler/HouseNumberHandler.groovy index e5fd9aef7..f8c3b6cd5 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/handler/HouseNumberHandler.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/handler/HouseNumberHandler.groovy @@ -6,61 +6,61 @@ import com.fangjia.script.linxsh.util.entity.AddressData import java.util.regex.Pattern /** - * 提取楼号 + * 鎻愬彇妤煎彿 * Created by linxsh on 2017/3/22. */ class HouseNumberHandler extends Handler { private static Pattern CN_PATTERN = Pattern.compile("[\u4e00-\u9fa5]") - //类似201201模式的楼号 + //绫讳技201201妯″紡鐨勬ゼ鍙� private static Pattern DOUBLE_MODE_PATTERN = Pattern.compile("([a-zA-Z0-9]{3,})\\1") - //正确的楼号 - private static Pattern HOUSE_NUMBER_PATTERN = Pattern.compile('[-a-zA-Z\\d东南西北甲乙丙丁戊戌]{1,5}') + //姝g‘鐨勬ゼ鍙� + private static Pattern HOUSE_NUMBER_PATTERN = Pattern.compile('[-a-zA-Z\\d涓滃崡瑗垮寳鐢蹭箼涓欎竵鎴婃垖]{1,5}') /** - * 包含楼栋号的正则 + * 鍖呭惈妤兼爧鍙风殑姝e垯 * @param host * @param dbName * @param coll */ - private static Pattern pattern1 = Pattern.compile('.+弄(?:\\w+支弄)?(?:\\w+区)?([-\\w]+)号') - private static Pattern pattern2 = Pattern.compile('(?<=村|花园|别墅|公寓|苑|坊|里)(?[甲乙丙丁戊戌\\w]+)[号幢栋]') - private static Pattern pattern3 = Pattern.compile('(?[鐢蹭箼涓欎竵鎴婃垖\\w]+)[鍙峰耿鏍媇') + private static Pattern pattern3 = Pattern.compile('(?[甲乙丙丁戊戌\w]+)[号幢栋] + // (?<=鏉憒鑺卞洯|鍒|鍏瘬|鑻憒鍧妡閲�)(?[鐢蹭箼涓欎竵鎴婃垖\w]+)[鍙峰耿鏍媇 newHouseNumber = CommonUtil.formatByPattern(newHouseNumber, pattern2) - //(? - if(!item.matches('[东南西北甲乙丙丁戊戌]')) { + if(!item.matches('[涓滃崡瑗垮寳鐢蹭箼涓欎竵鎴婃垖]')) { cnCount++ } }) - //去除开头和结尾的特殊符号 + //鍘婚櫎寮�澶村拰缁撳熬鐨勭壒娈婄鍙� if(cnCount < 2) { - while (newHouseNumber.matches('^[^a-zA-Z1-9东南西北甲乙丙丁戊戌].*$')) { + while (newHouseNumber.matches('^[^a-zA-Z1-9涓滃崡瑗垮寳鐢蹭箼涓欎竵鎴婃垖].*$')) { newHouseNumber = newHouseNumber.substring(1) } - while (newHouseNumber.matches('^.*?[^a-zA-Z0-9东南西北甲乙丙丁戊戌]+$')) { + while (newHouseNumber.matches('^.*?[^a-zA-Z0-9涓滃崡瑗垮寳鐢蹭箼涓欎竵鎴婃垖]+$')) { newHouseNumber = newHouseNumber[0..-2] } } - //处理类似201201这样的楼栋号,整理为201 + //澶勭悊绫讳技201201杩欐牱鐨勬ゼ鏍嬪彿锛屾暣鐞嗕负201 newHouseNumber = CommonUtil.formatByPattern(newHouseNumber, DOUBLE_MODE_PATTERN) if(newHouseNumber.matches(HOUSE_NUMBER_PATTERN)) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/handler/RoomNumberHandler.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/handler/RoomNumberHandler.groovy index 93fe32294..82fc79916 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/handler/RoomNumberHandler.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/handler/RoomNumberHandler.groovy @@ -6,11 +6,11 @@ import com.fangjia.script.linxsh.util.entity.AddressData import java.util.regex.Pattern /** - * 提取室号 + * 鎻愬彇瀹ゅ彿 * Created by linxsh on 2017/3/22. */ class RoomNumberHandler extends Handler { - private static final Pattern ROOM_PATTERN = Pattern.compile('(\\w+)(?=室)') + private static final Pattern ROOM_PATTERN = Pattern.compile('(\\w+)(?=瀹�)') @Override void extractData(AddressData addressData) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/handler/UnitHandler.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/handler/UnitHandler.groovy index 5cf45493d..f96bc26c1 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/handler/UnitHandler.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/handler/UnitHandler.groovy @@ -5,7 +5,7 @@ import com.fangjia.script.linxsh.util.entity.AddressData import org.apache.commons.lang.StringUtils /** - * 提取单元号 + * 鎻愬彇鍗曞厓鍙� * Created by linxsh on 2017/3/22. */ class UnitHandler extends Handler { @@ -20,26 +20,26 @@ class UnitHandler extends Handler { String extractUnitNumber(final String inputString, String defaultVal = null) { def newUnitNumber = inputString; - if(!newUnitNumber.contains('单元')) { + if(!newUnitNumber.contains('鍗曞厓')) { return } - if(newUnitNumber.matches('.*?[一二三四五六七八九十\\d]+单元.*')) { - newUnitNumber = newUnitNumber.replaceAll('.*?([\\d一二三四五六七八九十]+)单元.*', '$1') + if(newUnitNumber.matches('.*?[涓�浜屼笁鍥涗簲鍏竷鍏節鍗乗\d]+鍗曞厓.*')) { + newUnitNumber = newUnitNumber.replaceAll('.*?([\\d涓�浜屼笁鍥涗簲鍏竷鍏節鍗乚+)鍗曞厓.*', '$1') } else { - newUnitNumber = StringUtils.substringBefore(newUnitNumber.toUpperCase(), "单元") + newUnitNumber = StringUtils.substringBefore(newUnitNumber.toUpperCase(), "鍗曞厓") } - //替换“一”“二”“三”等为阿拉伯数字 + //鏇挎崲鈥滀竴鈥濃�滀簩鈥濃�滀笁鈥濈瓑涓洪樋鎷変集鏁板瓧 newUnitNumber = CommonUtil.convertCNToArabic(newUnitNumber) - //替换“Ⅰ”“Ⅱ”“Ⅲ”等转换为阿拉伯数字 + //鏇挎崲鈥溾厾鈥濃�溾叀鈥濃�溾參鈥濈瓑杞崲涓洪樋鎷変集鏁板瓧 CommonUtil.convertRomanToArabic(newUnitNumber) - //去除开头和结尾的特殊符号 - while (newUnitNumber.matches('^[^a-zA-Z0-9东南西北甲乙丙丁戊戌].*$')) { + //鍘婚櫎寮�澶村拰缁撳熬鐨勭壒娈婄鍙� + while (newUnitNumber.matches('^[^a-zA-Z0-9涓滃崡瑗垮寳鐢蹭箼涓欎竵鎴婃垖].*$')) { newUnitNumber = newUnitNumber.substring(1) } - while (newUnitNumber.matches('^.*?[^a-zA-Z0-9东南西北甲乙丙丁戊戌]+$')) { + while (newUnitNumber.matches('^.*?[^a-zA-Z0-9涓滃崡瑗垮寳鐢蹭箼涓欎竵鎴婃垖]+$')) { newUnitNumber = newUnitNumber[0..-2] } - if(newUnitNumber.matches('^[a-zA-Z0-9东南西北甲乙丙丁戊戌]{1,5}$')) { + if(newUnitNumber.matches('^[a-zA-Z0-9涓滃崡瑗垮寳鐢蹭箼涓欎竵鎴婃垖]{1,5}$')) { return newUnitNumber } return defaultVal diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/AddressDiff.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/AddressDiff.groovy index a01e33752..fd3152808 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/AddressDiff.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/AddressDiff.groovy @@ -12,7 +12,7 @@ import com.mongodb.DBObject import org.bson.types.ObjectId /** - * 全国地址一致小区导出 + * 鍏ㄥ浗鍦板潃涓�鑷村皬鍖哄鍑� * Created by lixue on 2017/7/21. */ class AddressDiff { @@ -80,22 +80,22 @@ class AddressDiff { } } private static boolean isTrueName(String name){ - if(name.contains("一期")||name.contains("二期")||name.contains("三期")||name.contains("四期")||name.contains("五期") - ||name.contains("六期")||name.contains("七期")||name.contains("八期")||name.contains("九期")){ + if(name.contains("涓�鏈�")||name.contains("浜屾湡")||name.contains("涓夋湡")||name.contains("鍥涙湡")||name.contains("浜旀湡") + ||name.contains("鍏湡")||name.contains("涓冩湡")||name.contains("鍏湡")||name.contains("涔濇湡")){ return false } - if(name.contains("一区")||name.contains("二区")||name.contains("三区")||name.contains("四区")||name.contains("五区") - ||name.contains("六区")||name.contains("七区")||name.contains("八区")){ + if(name.contains("涓�鍖�")||name.contains("浜屽尯")||name.contains("涓夊尯")||name.contains("鍥涘尯")||name.contains("浜斿尯") + ||name.contains("鍏尯")||name.contains("涓冨尯")||name.contains("鍏尯")){ return false } - if(name.contains("A区")||name.contains("B区")||name.contains("C区")||name.contains("D区")||name.contains("a区") - ||name.contains("b区")||name.contains("c区")||name.contains("d区")){ + if(name.contains("A鍖�")||name.contains("B鍖�")||name.contains("C鍖�")||name.contains("D鍖�")||name.contains("a鍖�") + ||name.contains("b鍖�")||name.contains("c鍖�")||name.contains("d鍖�")){ return false } - if(name.contains("东区")||name.contains("西区")||name.contains("南区")||name.contains("北区")){ + if(name.contains("涓滃尯")||name.contains("瑗垮尯")||name.contains("鍗楀尯")||name.contains("鍖楀尯")){ return false } - if(name.contains("别墅")){ + if(name.contains("鍒")){ return false } return true diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/AvgPriceStatistic.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/AvgPriceStatistic.groovy index 78b4c9bdd..cd13df278 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/AvgPriceStatistic.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/AvgPriceStatistic.groovy @@ -38,7 +38,7 @@ public class AvgPriceStatistic extends BaseBatch { } - def tuboshiEsfPrice = Integer.parseInt(dbObject.get("price").toString().replaceAll("元/㎡", "")) + def tuboshiEsfPrice = Integer.parseInt(dbObject.get("price").toString().replaceAll("鍏�/銕�", "")) SimpleDateFormat formatter = new SimpleDateFormat("yyyyMM"); String time = formatter.format(data); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/BeijingCount.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/BeijingCount.groovy index a640f5daa..20342ba89 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/BeijingCount.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/BeijingCount.groovy @@ -25,10 +25,10 @@ class BeijingCount extends BaseBatch{ List timeList = new ArrayList() List priceList = new ArrayList() rows.add(["city","address","projectname","prices.caseavg","BSUnitPrice","prices.casecount","prices.casemax","prices.casemin","prices.startdate","prices.enddate"]) - Price.find(new BasicDBObject("city","北京")).addOption(Bytes.QUERYOPTION_NOTIMEOUT).batchSize(1000).each { dbObject-> + Price.find(new BasicDBObject("city","鍖椾含")).addOption(Bytes.QUERYOPTION_NOTIMEOUT).batchSize(1000).each { dbObject-> def city = dbObject.city def region = dbObject.region - region = RegionData.formatRegion("北京",region) + region = RegionData.formatRegion("鍖椾含",region) def name = dbObject.name def bsunitpirce = dbObject.json["BSUnitPrice"] def unitprice = dbObject.json["UnitPrice"] diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/ChangZhouhouse.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/ChangZhouhouse.groovy index f089a7f4d..5adc1f060 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/ChangZhouhouse.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/ChangZhouhouse.groovy @@ -16,16 +16,16 @@ class ChangZhouhouse{ public static void main(String[] args) { - List list = ["常州", "苏州", "无锡","徐州", "南京", "淮安","扬州", "南通", "盐城", - "连云港", "宿迁", "泰州","镇江", "常熟", "张家港","昆山", "吴江", "邳州", - "启东", "溧阳", "东台","泰兴", "兴化", "海门","如皋", "江都", "新沂","高邮", - "靖江", "泰昌","江阴", "宜兴", "沭阳","海安","如东","仪征","金坛","睢宁", - "丰县","沛县","句容","宝应","高淳","泉山","铜山","阜宁","姜堰","玉山","金湖","东海"]; - //ProvinceData.getAllCity("江苏") + List list = ["甯稿窞", "鑻忓窞", "鏃犻敗","寰愬窞", "鍗椾含", "娣畨","鎵窞", "鍗楅��", "鐩愬煄", + "杩炰簯娓�", "瀹胯縼", "娉板窞","闀囨睙", "甯哥啛", "寮犲娓�","鏄嗗北", "鍚存睙", "閭冲窞", + "鍚笢", "婧ч槼", "涓滃彴","娉板叴", "鍏村寲", "娴烽棬","濡傜殝", "姹熼兘", "鏂版矀","楂橀偖", + "闈栨睙", "娉版槍","姹熼槾", "瀹滃叴", "娌槼","娴峰畨","濡備笢","浠緛","閲戝潧","鐫㈠畞", + "涓板幙","娌涘幙","鍙ュ","瀹濆簲","楂樻烦","娉夊北","閾滃北","闃滃畞","濮滃牥","鐜夊北","閲戞箹","涓滄捣"]; + //ProvinceData.getAllCity("姹熻嫃") println(list) for(int i = 0;i0&&isNum1(str.split("年")[0])) { - int result1 = Integer.parseInt(str.split("年")[0]) + if(str.contains("骞�")&&!str.contains("浜ф潈涓�")&&!str.contains("浣忓畢")){ + if(str.split("骞�").length>0&&isNum1(str.split("骞�")[0])) { + int result1 = Integer.parseInt(str.split("骞�")[0]) ss = result1; } - }else if(str.contains("年")&&str.contains("产权为")){ - int result2 = Integer.parseInt(StringUtils.substringBetween(str,"产权为","年")) + }else if(str.contains("骞�")&&str.contains("浜ф潈涓�")){ + int result2 = Integer.parseInt(StringUtils.substringBetween(str,"浜ф潈涓�","骞�")) ss = result2; - }else if(str.contains("住宅:")&&!str.contains("年")){ + }else if(str.contains("浣忓畢:")&&!str.contains("骞�")){ if(str.split(":").length>0) { int re = Integer.parseInt(str.split(":")[1]) ss = re; } - }else if(str.contains("住宅:")&&str.contains("年")){ - int result2 = Integer.parseInt(StringUtils.substringBetween(str,"住宅:","年")) + }else if(str.contains("浣忓畢锛�")&&str.contains("骞�")){ + int result2 = Integer.parseInt(StringUtils.substringBetween(str,"浣忓畢锛�","骞�")) ss = result2; } else if(str.contains("\"")){ return ss @@ -94,10 +94,10 @@ class City{ return str.matches("[0-9]{1,}") // Pattern pattern = Pattern.compile("^[0-9]+"); // if(pattern.matcher(str).matches()){ -// //数字 +// //鏁板瓧 // return true; // } else { -// //非数字 +// //闈炴暟瀛� // return false; // } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/Constrct.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/Constrct.groovy index af7e61cd8..0362de956 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/Constrct.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/Constrct.groovy @@ -29,7 +29,7 @@ class Test { String result = obj.toString().trim() if(!isTrue_type(result)){ j++ - println(j+"条") + println(j+"鏉�") if(result!=null&&result!="null"&&result!="") { STAT_COLL.insert(new BasicDBObject("construct", result)) } @@ -37,7 +37,7 @@ class Test { } } public static boolean isTrue_type(String str){ - if(str.equals("钢结构")||str.equals("钢、钢筋混凝土结构") ||str.equals("钢筋混凝土结构")||str.equals("混合结构") ||str.equals("砖木结构")||str.equals("其他结构")) + if(str.equals("閽㈢粨鏋�")||str.equals("閽€�侀挗绛嬫贩鍑濆湡缁撴瀯") ||str.equals("閽㈢瓔娣峰嚌鍦熺粨鏋�")||str.equals("娣峰悎缁撴瀯") ||str.equals("鐮栨湪缁撴瀯")||str.equals("鍏朵粬缁撴瀯")) { return true; } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/DaoChu.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/DaoChu.groovy index 02b0b1965..d1b1dfaad 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/DaoChu.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/DaoChu.groovy @@ -15,27 +15,27 @@ class DaoChu { static int j1 = 0; static int j2 = 0; static int j3 = 0; -// static def datas = [['城市', '区域', '小区编码','小区名','地址','物业费','容积率','绿化率']] -// static def datas1 = [['城市', '区域', '小区编码','小区名','地址','物业费','容积率','绿化率']] -// static def datas2 = [['城市', '区域', '小区编码','小区名','地址','物业费','容积率','绿化率']] +// static def datas = [['鍩庡競', '鍖哄煙', '灏忓尯缂栫爜','灏忓尯鍚�','鍦板潃','鐗╀笟璐�','瀹圭Н鐜�','缁垮寲鐜�']] +// static def datas1 = [['鍩庡競', '鍖哄煙', '灏忓尯缂栫爜','灏忓尯鍚�','鍦板潃','鐗╀笟璐�','瀹圭Н鐜�','缁垮寲鐜�']] +// static def datas2 = [['鍩庡競', '鍖哄煙', '灏忓尯缂栫爜','灏忓尯鍚�','鍦板潃','鐗╀笟璐�','瀹圭Н鐜�','缁垮寲鐜�']] static DSCursor cursor = DbUtils.seaweed.find(new BasicDBObject("cat", "district").append("visible", 1)) public static void main(String[] args) { for (DBObject dbObject : cursor) { - Object obj = dbObject.get("cubage_percent")//容积率 - Object obj1 = dbObject.get("estate_charge")//物业费 - Object obj2 = dbObject.get("virescence_percent")//绿化率 - Object obj4 = dbObject.get("estate_type2")//物业类型 + Object obj = dbObject.get("cubage_percent")//瀹圭Н鐜� + Object obj1 = dbObject.get("estate_charge")//鐗╀笟璐� + Object obj2 = dbObject.get("virescence_percent")//缁垮寲鐜� + Object obj4 = dbObject.get("estate_type2")//鐗╀笟绫诲瀷 Object obj5 = dbObject.get("build_type") int flag = 0; if(obj!=null&&obj1!=null&&obj2!=null&&obj4!=null&&obj5!=null) { - if ( obj4.toString().contains("普通住宅")) { + if ( obj4.toString().contains("鏅�氫綇瀹�")) { flag = 0; } - if ( obj4.toString().contains("别墅")) { + if ( obj4.toString().contains("鍒")) { flag = 1; } - if ( obj4.toString().contains("商住")) { + if ( obj4.toString().contains("鍟嗕綇")) { flag = 2; } error_datain(obj.toString(), obj1.toString(), obj2.toString(), obj5.toString(),obj4.toString(), dbObject, flag) @@ -75,9 +75,9 @@ class DaoChu { // } // if(j1>3853){ // datas << [dbObject.get("city"), dbObject.get("region"), dbObject.get("sid"),dbObject.get("name"),dbObject.get("address"),estate,cubage,virescence] -// ExcelUtils.write("D://容积率.xlsx", datas,sheet) +// ExcelUtils.write("D://瀹圭Н鐜�.xlsx", datas,sheet) // } -// println("cubage插入" + j1 + "条" + cubage + "--" + build_type + "==" + flag) +// println("cubage鎻掑叆" + j1 + "鏉�" + cubage + "--" + build_type + "==" + flag) // } // } // if(!isTrue_estate(estate,flag)){ @@ -108,9 +108,9 @@ class DaoChu { // } //// if(j2>4068) { //// datas1 << [dbObject.get("city"), dbObject.get("region"), dbObject.get("sid"), dbObject.get("name"), dbObject.get("address"), estate, cubage, virescence] -//// ExcelUtils.write("D://物业费.xlsx", datas1, sheet) +//// ExcelUtils.write("D://鐗╀笟璐�.xlsx", datas1, sheet) //// } -// println("estate插入"+j2+"条"+estate) +// println("estate鎻掑叆"+j2+"鏉�"+estate) // } if(!isTrue_virescence(virescence,flag)){ //DbUtils.c_test1.save(new BasicDBObject("num",dbObject.get("_id")).append("city",dbObject.get("city")).append("region",dbObject.get("region")).append("name",dbObject.get("name")).append("address",dbObject.get("address")).append("cubage_percent",cubage).append("estate_charge",estate).append("virescence_percent",virescence)) @@ -138,12 +138,12 @@ class DaoChu { // } //// if(j3>6553) { //// datas2 << [dbObject.get("city"), dbObject.get("region"), dbObject.get("sid"), dbObject.get("name"), dbObject.get("address"), estate, cubage, virescence] -//// ExcelUtils.write("D://绿化率.xlsx", datas2, sheet) +//// ExcelUtils.write("D://缁垮寲鐜�.xlsx", datas2, sheet) //// } j3++; //DbUtils.seaweed.update(new BasicDBObject('_id', dbObject._id), new BasicDBObject('$set', new BasicDBObject('status', 0).append("virescence_percent",""))) // DbUtils.seaweed.remove(new BasicDBObject("_id",dbObject.get("_id"))) - println("删除"+j3+"条"+virescence) + println("鍒犻櫎"+j3+"鏉�"+virescence) } } @@ -198,25 +198,25 @@ class DaoChu { double result = parse_int(str); - if (fl == 1 && type.contains("独栋") &&(!type.contains("联排"))&& result > 0.5 && result != 0.0) { + if (fl == 1 && type.contains("鐙爧") &&(!type.contains("鑱旀帓"))&& result > 0.5 && result != 0.0) { return false } if(fl == 1&&result >= 0.8){ return false } - if (fl == 0 && result != 0.0 && type.contains("低层") && result > 1.2 && !(type.contains("多层")) && !(type.contains("小高层")) && !(type.contains("高层"))) { + if (fl == 0 && result != 0.0 && type.contains("浣庡眰") && result > 1.2 && !(type.contains("澶氬眰")) && !(type.contains("灏忛珮灞�")) && !(type.contains("楂樺眰"))) { return false } - if (fl == 0 && result != 0.0 && type.contains("多层") && result > 1.5 && !(type.contains("低层")) && !(type.contains("小高层")) && !(type.contains("高层"))) { + if (fl == 0 && result != 0.0 && type.contains("澶氬眰") && result > 1.5 && !(type.contains("浣庡眰")) && !(type.contains("灏忛珮灞�")) && !(type.contains("楂樺眰"))) { return false } - if (fl == 0 && result != 0.0 && type.contains("小高层") && result > 3 && !(type.contains("多层")) && !(type.contains("低层")) && !(type.contains("高层")&&!(type.contains("小")))) { + if (fl == 0 && result != 0.0 && type.contains("灏忛珮灞�") && result > 3 && !(type.contains("澶氬眰")) && !(type.contains("浣庡眰")) && !(type.contains("楂樺眰")&&!(type.contains("灏�")))) { return false } - if (fl == 0 && result != 0.0 && type.contains("高层")&& !type.contains("超高层") && result > 6 && !(type.contains("多层")) && !(type.contains("低层")) && !(type.contains("小高层"))) { + if (fl == 0 && result != 0.0 && type.contains("楂樺眰")&& !type.contains("瓒呴珮灞�") && result > 6 && !(type.contains("澶氬眰")) && !(type.contains("浣庡眰")) && !(type.contains("灏忛珮灞�"))) { return false } - if (fl == 0 && result != 0.0 && type.contains("超高层") && result > 7 && !(type.contains("多层")) && !(type.contains("低层")) && !(type.contains("小高层"))&& !(type.contains("高层")&&!(type.contains("小")))) { + if (fl == 0 && result != 0.0 && type.contains("瓒呴珮灞�") && result > 7 && !(type.contains("澶氬眰")) && !(type.contains("浣庡眰")) && !(type.contains("灏忛珮灞�"))&& !(type.contains("楂樺眰")&&!(type.contains("灏�")))) { return false } if (fl == 0 && result != 0.0 && result <= 0.8) { @@ -242,15 +242,15 @@ class DaoChu { if(str == null){ return false } - //带小数的 + //甯﹀皬鏁扮殑 Pattern pattern = Pattern.compile("^(-?\\d+)(\\.\\d+)?\$"); Pattern pattern1 = Pattern.compile("^[0-9]*\$"); if(pattern.matcher(str).matches()||pattern1.matcher(str)){ - //数字 + //鏁板瓧 return true; } else { - //非数字 + //闈炴暟瀛� return false; } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/EndTime.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/EndTime.groovy index 9858b5bc8..90bd6d9e3 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/EndTime.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/EndTime.groovy @@ -15,17 +15,17 @@ class EndTime{ //println(dbObject) int j = 1 Object obj = dbObject.get("finish_building_date") - if(obj.toString().contains("1900")||obj.toString().contains("建筑单位")||obj.toString().contains("不详")||obj.toString().contains("1901")||obj.toString().contains("占地面积")||obj.toString().contains("年底交房")||obj.toString().contains("1905")){ + if(obj.toString().contains("1900")||obj.toString().contains("寤虹瓚鍗曚綅")||obj.toString().contains("涓嶈")||obj.toString().contains("1901")||obj.toString().contains("鍗犲湴闈㈢Н")||obj.toString().contains("骞村簳浜ゆ埧")||obj.toString().contains("1905")){ DbUtils.seaweed.remove(new BasicDBObject("_id",dbObject.get("_id"))) println(obj) println(j++) } } // DSCursor cursor = DbUtils.renwu.find() -// DSCursor cursor1 = DbUtils.time_zhuaqu.find(new BasicDBObject("name","详情页")) +// DSCursor cursor1 = DbUtils.time_zhuaqu.find(new BasicDBObject("name","璇︽儏椤�")) // int j = 1; // for (DBObject dbObject : cursor) { -// if(dbObject.get("cat").toString()=="二手房"||dbObject.get("cat").toString()=="二手房搜索"){ +// if(dbObject.get("cat").toString()=="浜屾墜鎴�"||dbObject.get("cat").toString()=="浜屾墜鎴挎悳绱�"){ // Object obj = dbObject.get("_id") // for(DBObject dbObject1 : cursor1){ // if(dbObject1.get("job_id").toString().equals(obj.toString())){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/FangguguExport.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/FangguguExport.groovy index 7c96863e0..e2840ea03 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/FangguguExport.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/FangguguExport.groovy @@ -22,11 +22,11 @@ class FangguguExport extends BaseBatch{ static String sheet = "price" @Override void process(Object args) { - BasicDBList dbList=new BasicDBList(); //翻译数组对象 - dbList.add("上海"); - dbList.add("厦门"); - dbList.add("成都"); - def rows = ["城市","区域","小区名","房价网价格","房估估价格"] + BasicDBList dbList=new BasicDBList(); //缈昏瘧鏁扮粍瀵硅薄 + dbList.add("涓婃捣"); + dbList.add("鍘﹂棬"); + dbList.add("鎴愰兘"); + def rows = ["鍩庡競","鍖哄煙","灏忓尯鍚�","鎴夸环缃戜环鏍�","鎴夸及浼颁环鏍�"] FangGuGu.find(new BasicDBObject("city",new BasicDBObject('$in',dbList))).each {dbObject-> def name = dbObject.name def city = dbObject.city diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/Guifan.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/Guifan.groovy index c73a09cca..bc00f8293 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/Guifan.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/Guifan.groovy @@ -32,17 +32,17 @@ class Guifan{ } } } - // finishdate_format("2016年建成") + // finishdate_format("2016骞村缓鎴�") } public finishdate_format = { String str -> - Pattern pattern = Pattern.compile("^\\d{4}年"); - Pattern pattern_1 = Pattern.compile("^\\d{4}年建成"); - Pattern pattern1 = Pattern.compile("^\\d{4}年\\d{2}月\$"); - Pattern pattern1_1 = Pattern.compile("^\\d{4}年\\d{1}月\$"); + Pattern pattern = Pattern.compile("^\\d{4}骞�"); + Pattern pattern_1 = Pattern.compile("^\\d{4}骞村缓鎴�"); + Pattern pattern1 = Pattern.compile("^\\d{4}骞碶\d{2}鏈圽$"); + Pattern pattern1_1 = Pattern.compile("^\\d{4}骞碶\d{1}鏈圽$"); - Pattern pattern2 = Pattern.compile("^\\d{4}年\\d{2}月\\d{2}日\$"); - Pattern pattern2_1 = Pattern.compile("^\\d{4}年\\d{1}月\\d{2}日\$"); - Pattern pattern2_2 = Pattern.compile("^\\d{4}年\\d{1}月\\d{1}日\$"); + Pattern pattern2 = Pattern.compile("^\\d{4}骞碶\d{2}鏈圽\d{2}鏃$"); + Pattern pattern2_1 = Pattern.compile("^\\d{4}骞碶\d{1}鏈圽\d{2}鏃$"); + Pattern pattern2_2 = Pattern.compile("^\\d{4}骞碶\d{1}鏈圽\d{1}鏃$"); Pattern pattern3 = Pattern.compile("^\\d{4}-\\d{2}\$"); Pattern pattern4 = Pattern.compile("^\\d{4}\$"); @@ -61,31 +61,31 @@ class Guifan{ String resutl = null; if (pattern.matcher(str).matches()) { - resutl = str.split("年")[0] + "-01-01" + resutl = str.split("骞�")[0] + "-01-01" return resutl } if (pattern_1.matcher(str).matches()) { - resutl = str.split("年")[0] + "-01-01" + resutl = str.split("骞�")[0] + "-01-01" return resutl } if (pattern1.matcher(str).matches()) { - resutl = str.replace('年', '-').replace('月', '-') + "01" + resutl = str.replace('骞�', '-').replace('鏈�', '-') + "01" return resutl } if (pattern1_1.matcher(str).matches()) { - resutl = str.replaceAll("年", '-0').replace("月", '-0') + "01" + resutl = str.replaceAll("骞�", '-0').replace("鏈�", '-0') + "01" return resutl } if (pattern2.matcher(str).matches()) { - resutl = str.replace('年', '-').replace('月', "-").replace('日', '') + resutl = str.replace('骞�', '-').replace('鏈�', "-").replace('鏃�', '') return resutl } if (pattern2_1.matcher(str).matches()) { - resutl = str.replace('年', '-0').replace('月', "-").replace('日', '') + resutl = str.replace('骞�', '-0').replace('鏈�', "-").replace('鏃�', '') return resutl } if (pattern2_2.matcher(str).matches()) { - resutl = str.replaceAll("年", "-0").replaceAll("月", "-0").replaceAll("日", "") + resutl = str.replaceAll("骞�", "-0").replaceAll("鏈�", "-0").replaceAll("鏃�", "") return resutl } if (pattern3.matcher(str).matches()) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/HouseNumClear.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/HouseNumClear.groovy index 7fd413c40..e7c7ca15e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/HouseNumClear.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/HouseNumClear.groovy @@ -11,12 +11,12 @@ import com.mongodb.DBCollection class HouseNumClear{ public static final DBCollection STAT_COLL = MongoUtils.getCollectionByName("house_loudong", "house_loudong", "192.168.0.61") public static void main(String[] args){ - STAT_COLL.find(new BasicDBObject("city","三明"),new BasicDBObject("city",1).append("region",1) + STAT_COLL.find(new BasicDBObject("city","涓夋槑"),new BasicDBObject("city",1).append("region",1) .append("name",1).append("house_num",1).append("room_num",1).append("house_num_unit",1)) .addOption(Bytes.QUERYOPTION_NOTIMEOUT).skip(20000).batchSize(1000).each { dbObject-> def houseNum = dbObject.house_num print(houseNum+"->") - def house_Num = houseNum.toString().replaceAll("#楼","") + def house_Num = houseNum.toString().replaceAll("#妤�","") def one = STAT_COLL.findOne(new BasicDBObject("city",dbObject.city).append("region",dbObject.region) .append("name",dbObject.name).append("house_num",house_Num).append("room_num",dbObject.room_num) .append("house_num_unit",dbObject.house_num_unit)) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/JiangSuBai.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/JiangSuBai.groovy index ab95b64be..7fa8fbadd 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/JiangSuBai.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/JiangSuBai.groovy @@ -10,7 +10,7 @@ import com.mongodb.DBCollection import com.mongodb.DBObject /** - * 商务需求---江苏省小区白名单 + * 鍟嗗姟闇�姹�---姹熻嫃鐪佸皬鍖虹櫧鍚嶅崟 * Created by lixue on 2017/7/25. */ @@ -22,7 +22,7 @@ class JiangSuBai{ getXiaoqu() } private static void getXiaoqu(){ - def citys = ProvinceData.getAllCity("江苏") + def citys = ProvinceData.getAllCity("姹熻嫃") for(def city : citys){ def regions = RegionData.getAllRegions(city) def nameSet = new HashSet() diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/Location.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/Location.groovy index 2ae251004..2c951e37b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/Location.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/Location.groovy @@ -10,7 +10,7 @@ import com.mongodb.DBObject /** * Created by Administrator on 2017/7/4. - * 根据经纬度查小区的 + * 鏍规嵁缁忕含搴︽煡灏忓尯鐨� */ class Location{ static filename = "D:\\1.xlsx" diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/LongYanJiexi.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/LongYanJiexi.groovy index e2ddf5d7f..b1de0335e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/LongYanJiexi.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/LongYanJiexi.groovy @@ -30,16 +30,16 @@ class LongYanJiexi{ final DBCollection local = MongoUtils.getCollectionByName("lixue", "longyan1", "192.168.0.61") final DBCollection LouDong = MongoUtils.getCollectionByName("lixue", "louyangeshi", "192.168.0.61") local.find(new BasicDBObject()).addOption(Bytes.QUERYOPTION_NOTIMEOUT).each { dbObject -> - def name = dbObject.get("detail")["0"].toString().replaceAll("项目名称:","_").split('_')[1].trim() + def name = dbObject.get("detail")["0"].toString().replaceAll("椤圭洰鍚嶇О锛�","_").split('_')[1].trim() def city = dbObject.get("city") - def address = dbObject.get("detail")["2"].toString().replaceAll("项目坐落:","").trim() + def address = dbObject.get("detail")["2"].toString().replaceAll("椤圭洰鍧愯惤锛�","").trim() def region = null; - region = StringUtils.substringBetween(address,"市","区") + region = StringUtils.substringBetween(address,"甯�","鍖�") def house_num = dbObject.get("build_num") def room_num = dbObject.get("room_num").toString() def house_num_unit = dbObject.get("unit") - def area = StringUtils.substringBetween(dbObject.get("detailroom")["3"].toString(),"建筑面积:","套内面积").toString().trim().toDouble() - def house_floor = StringUtils.substringBetween(dbObject.get("detailroom")["5"].toString(),"所 在 层:","总 层 数:").toString().trim() + def area = StringUtils.substringBetween(dbObject.get("detailroom")["3"].toString(),"寤虹瓚闈㈢Н锛�","濂楀唴闈㈢Н").toString().trim().toDouble() + def house_floor = StringUtils.substringBetween(dbObject.get("detailroom")["5"].toString(),"鎵� 鍦� 灞傦細","鎬� 灞� 鏁帮細").toString().trim() def floor = -1 if(house_floor.matches("\\d+")){ floor = house_floor.toInteger() @@ -53,7 +53,7 @@ class LongYanJiexi{ room_num = StringUtils.substringBefore(room_num, ".") } - String source = "房管局" + String source = "鎴跨灞�" def date = new Date() com.fangjia.script.linxsh.util.entity.HouseLoudong houseLoudng = new com.fangjia.script.linxsh.util.entity.HouseLoudong() houseLoudng.city = city diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/LoudongUtil1.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/LoudongUtil1.groovy index 61a559b2c..1d29ad49f 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/LoudongUtil1.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/LoudongUtil1.groovy @@ -29,39 +29,39 @@ import java.util.regex.Pattern * Created by linxsh on 2016/11/22. */ class LoudongUtil1 { - private static Pattern HOUSE_NUMBER_PATTERN = Pattern.compile('[-a-zA-Z\\d东南西北甲乙丙丁戊戌]+') - private static Pattern CN_NUMBER_PATTERN = Pattern.compile('[〇零一二三四五六七八九十]+'); - private static final Pattern ROMAN_NUMBER_PATTERN = Pattern.compile("[ⅠⅡⅢⅣⅤⅥⅦⅧⅨⅩ]") + private static Pattern HOUSE_NUMBER_PATTERN = Pattern.compile('[-a-zA-Z\\d涓滃崡瑗垮寳鐢蹭箼涓欎竵鎴婃垖]+') + private static Pattern CN_NUMBER_PATTERN = Pattern.compile('[銆囬浂涓�浜屼笁鍥涗簲鍏竷鍏節鍗乚+'); + private static final Pattern ROMAN_NUMBER_PATTERN = Pattern.compile("[鈪犫叀鈪⑩叄鈪も叆鈪︹収鈪ㄢ叐]") private static final Pattern ARABIC_NUMBER_PATTERN = Pattern.compile("\\d+") - private static final Pattern ARABIC_NUMBER_PATTERN2 = Pattern.compile("\\d+期") + private static final Pattern ARABIC_NUMBER_PATTERN2 = Pattern.compile("\\d+鏈�") private static DSCollection seaweed = new DataStore("seaweed.db.fangjia.com", 27007).getCollection("fangjia.seaweed") private static DBCollection LOUDONG = MongoUtils.getCollectionByName("fangjia_base", "loudong", "mongo.db.fangjia.com") private static List cities = CommonUtils.findAllCity() /** - * 楼栋号正则 + * 妤兼爧鍙锋鍒� * @param host * @param dbName * @param coll */ - private static Pattern pattern1 = Pattern.compile('.+弄(?:\\w+支弄)?(?:\\w+区)?([-\\w]+)号') - private static Pattern pattern2 = Pattern.compile('(?<=村|花园|别墅|公寓|苑|坊|里)(?[甲乙丙丁戊戌\\w]+)(?=号|幢|栋|座|住宅栋)') - private static Pattern pattern3 = Pattern.compile('(?[鐢蹭箼涓欎竵鎴婃垖\\w]+)(?=鍙穦骞鏍媩搴浣忓畢鏍�)') + private static Pattern pattern3 = Pattern.compile('(? cache = Sets.newHashSet() - println "开始查找重复楼栋数据..." + println "寮�濮嬫煡鎵鹃噸澶嶆ゼ鏍嬫暟鎹�..." for(DBObject dbObject : dbCursor) { String city = dbObject['city'] String region = dbObject['region'] @@ -100,27 +100,27 @@ class LoudongUtil1 { cache.add("$city--$region--$name--$houseNumber--$unitNumber") } } - println "找到${cache.size()}个重复楼栋" + println "鎵惧埌${cache.size()}涓噸澶嶆ゼ鏍�" println cache.toString() if(cache.size() > 0) { - println("开始删除...") + println("寮�濮嬪垹闄�...") cache.each {data-> String[] params = data.split("--"); int removeCount = removeDuplication(params[0], params[1], params[2], params[3], params[4]) - println "删除 $removeCount 条数据\t$data" + println "鍒犻櫎 $removeCount 鏉℃暟鎹甛t$data" } - println("删除完成!") + println("鍒犻櫎瀹屾垚锛�") } } /** - * 根据城市、区域、小区名、楼栋号、单元号去除重复数据 + * 鏍规嵁鍩庡競銆佸尯鍩熴�佸皬鍖哄悕銆佹ゼ鏍嬪彿銆佸崟鍏冨彿鍘婚櫎閲嶅鏁版嵁 * @param city * @param region * @param name * @param houseNumber * @param unitNumber - * @return 返回删除的重复数据数量 + * @return 杩斿洖鍒犻櫎鐨勯噸澶嶆暟鎹暟閲� */ public int removeDuplication(String city, String region, String name, String houseNumber, String unitNumber) { if(StringUtils.isBlank(city) || StringUtils.isBlank(region) || StringUtils.isBlank(name) || StringUtils.isBlank(houseNumber) || StringUtils.isBlank(unitNumber)) { @@ -198,10 +198,10 @@ class LoudongUtil1 { } /** - * 定制实现mongo的upsert功能,保存或更新楼栋数据 + * 瀹氬埗瀹炵幇mongo鐨剈psert鍔熻兘锛屼繚瀛樻垨鏇存柊妤兼爧鏁版嵁 * @param loudong * @param from - * @return 新增或保存的数据量 + * @return 鏂板鎴栦繚瀛樼殑鏁版嵁閲� */ public def upsert(final Loudong loudong) { def result = [save: 0, update: 0] @@ -218,7 +218,7 @@ class LoudongUtil1 { } /** - * 格式化待保存的数据 + * 鏍煎紡鍖栧緟淇濆瓨鐨勬暟鎹� * @param loudong * @return */ @@ -249,8 +249,8 @@ class LoudongUtil1 { } /** - * 保存或更新楼栋库数据,加锁避免多线程环境下的并发问题 - * @param saveObj 待保存数据对象 + * 淇濆瓨鎴栨洿鏂版ゼ鏍嬪簱鏁版嵁锛屽姞閿侀伩鍏嶅绾跨▼鐜涓嬬殑骞跺彂闂 + * @param saveObj 寰呬繚瀛樻暟鎹璞� * @return */ private synchronized int saveOrUpdate(final Loudong loudong) { @@ -262,11 +262,11 @@ class LoudongUtil1 { query.put('alias', loudong['name']) findObj = LOUDONG.findOne(query) } - //保存 + //淇濆瓨 if(findObj==null) { saveObj(loudong) return 1; - } else {//更新 + } else {//鏇存柊 updateObj(findObj, loudong) return 0 } @@ -274,7 +274,7 @@ class LoudongUtil1 { /** - * 更新 + * 鏇存柊 * @param findObj * @param obj * @param from @@ -290,7 +290,7 @@ class LoudongUtil1 { if(findObj.get('floors')==null || findObj.get('floors')==0 || findObj.get('floors') > 62) { updateObj.floors = loudong.floors } - //地址处理 + //鍦板潃澶勭悊 if(findObj['addr']==null) { updateObj.addr = loudong.address } else { @@ -299,7 +299,7 @@ class LoudongUtil1 { } } - //经纬度处理 + //缁忕含搴﹀鐞� if(findObj.lat_qq==0 || findObj.lng_qq==0) { updateObj.lat_qq = loudong.latQQ updateObj.lng_qq = loudong.lngQQ @@ -318,7 +318,7 @@ class LoudongUtil1 { /** - * 保存对象 + * 淇濆瓨瀵硅薄 * @param dbObject * @return */ @@ -329,7 +329,7 @@ class LoudongUtil1 { /** - * 将面积格式为两位小数 + * 灏嗛潰绉牸寮忎负涓や綅灏忔暟 * @param area * @return */ @@ -342,7 +342,7 @@ class LoudongUtil1 { } /** - * 将多个面积格式化为两位小数 + * 灏嗗涓潰绉牸寮忓寲涓轰袱浣嶅皬鏁� * @param areas */ static def formatAreas(Collection areas) { @@ -357,7 +357,7 @@ class LoudongUtil1 { } /** - * 格式化小区名 + * 鏍煎紡鍖栧皬鍖哄悕 * @param city * @param region * @param name @@ -367,88 +367,88 @@ class LoudongUtil1 { if(StringUtils.isBlank(city) || StringUtils.isBlank(name)) { return null } - if(name.matches("[\u4e00-\u9fa5]+?(路|大道|大街).+[弄号]") || name.matches("[\u4e00-\u9fa5]+?弄")) { + if(name.matches("[\u4e00-\u9fa5]+?(璺瘄澶ч亾|澶ц).+[寮勫彿]") || name.matches("[\u4e00-\u9fa5]+?寮�")) { return name } String newDistrictName = com.fangjia.core.util.DataUtil.toDBCcase(name) - .replaceAll("[\\.·'\"“”]", "").replaceAll('—', '-') - //去除“地块”信息 + .replaceAll("[\\.路'\"鈥溾�漖", "").replaceAll('鈥�', '-') + //鍘婚櫎鈥滃湴鍧椻�濅俊鎭� newDistrictName = formatByPattern(newDistrictName, district_pattern1) - //阿拉伯数字转汉字,以数字结尾的暂时不处理 - newDistrictName = convertArabicToCn(newDistrictName, '期') - //罗马数字转汉字 - newDistrictName = convertRomanToCn(newDistrictName, '期') - //去除末尾的新盘标识 + //闃挎媺浼暟瀛楄浆姹夊瓧锛屼互鏁板瓧缁撳熬鐨勬殏鏃朵笉澶勭悊 + newDistrictName = convertArabicToCn(newDistrictName, '鏈�') + //缃楅┈鏁板瓧杞眽瀛� + newDistrictName = convertRomanToCn(newDistrictName, '鏈�') + //鍘婚櫎鏈熬鐨勬柊鐩樻爣璇� newDistrictName = removeInvalidTail(newDistrictName) - //去除楼号信息 + //鍘婚櫎妤煎彿淇℃伅 newDistrictName = formatByPattern(newDistrictName, district_pattern2) - if(newDistrictName.matches('^.+?(路|大道|大街|街道|科技园|大学|学院|商铺|写字楼|商业|公司|办公楼?|停车场?|车库)$') || newDistrictName.matches(".*[\\(\\)()_]")) { + if(newDistrictName.matches('^.+?(璺瘄澶ч亾|澶ц|琛楅亾|绉戞妧鍥瓅澶у|瀛﹂櫌|鍟嗛摵|鍐欏瓧妤紎鍟嗕笟|鍏徃|鍔炲叕妤�?|鍋滆溅鍦�?|杞﹀簱)$') || newDistrictName.matches(".*[\\(\\)锛堬級_]")) { newDistrictName = null } return newDistrictName } /** - * 格式化地址 + * 鏍煎紡鍖栧湴鍧� * @param city * @param address * @return */ public static String formatDistrictAddress(final String city, final String address) { - if(StringUtils.isBlank(city) || StringUtils.isBlank(address) || !address.matches('.*[路道街].*')) { + if(StringUtils.isBlank(city) || StringUtils.isBlank(address) || !address.matches('.*[璺亾琛梋.*')) { return null } String formatAddress = DataUtil.formateAddress(city, address) - if(StringUtils.isNotBlank(formatAddress) && formatAddress.matches('^[\u4e00-\u9fa5]+?(路|大道|街).+[弄号]$')) { + if(StringUtils.isNotBlank(formatAddress) && formatAddress.matches('^[\u4e00-\u9fa5]+?(璺瘄澶ч亾|琛�).+[寮勫彿]$')) { return formatAddress } return null } /** - * 格式化楼栋号 - * @param city 城市 - * @param region 区域 - * @param districtName 小区名 - * @param houseNumber 楼栋号 + * 鏍煎紡鍖栨ゼ鏍嬪彿 + * @param city 鍩庡競 + * @param region 鍖哄煙 + * @param districtName 灏忓尯鍚� + * @param houseNumber 妤兼爧鍙� * @return */ public static String formatHouseNumber(final String houseNumber) { if(StringUtils.isBlank(houseNumber)) { return null; } - def newHouseNumber = houseNumber.toUpperCase().replace("#", "#") - // .+弄(?:\w+支弄)?(?:\w+区)?([-\w]+)号.* + def newHouseNumber = houseNumber.toUpperCase().replace("锛�", "#") + // .+寮�(?:\w+鏀紕)?(?:\w+鍖�)?([-\w]+)鍙�.* newHouseNumber = formatByPattern(newHouseNumber, pattern1) - // (?<=村|花园|别墅|公寓|苑|坊|里)(?[甲乙丙丁戊戌\w]+)[号幢栋] + // (?<=鏉憒鑺卞洯|鍒|鍏瘬|鑻憒鍧妡閲�)(?[鐢蹭箼涓欎竵鎴婃垖\w]+)[鍙峰耿鏍媇 newHouseNumber = formatByPattern(newHouseNumber, pattern2) - //(? - if(!item.matches('东南西北甲乙丙丁戊戌')) { + if(!item.matches('涓滃崡瑗垮寳鐢蹭箼涓欎竵鎴婃垖')) { cnCount++ } }) - //去除开头和结尾的特殊符号 + //鍘婚櫎寮�澶村拰缁撳熬鐨勭壒娈婄鍙� if(cnCount < 2) { - while (newHouseNumber.matches('^[^a-zA-Z1-9东南西北甲乙丙丁戊戌].*$')) { + while (newHouseNumber.matches('^[^a-zA-Z1-9涓滃崡瑗垮寳鐢蹭箼涓欎竵鎴婃垖].*$')) { newHouseNumber = newHouseNumber.substring(1) } - while (newHouseNumber.matches('^.*?[^a-zA-Z0-9东南西北甲乙丙丁戊戌]+$')) { + while (newHouseNumber.matches('^.*?[^a-zA-Z0-9涓滃崡瑗垮寳鐢蹭箼涓欎竵鎴婃垖]+$')) { newHouseNumber = newHouseNumber[0..-2] } } - //处理类似201201这样的楼栋号,整理为201 + //澶勭悊绫讳技201201杩欐牱鐨勬ゼ鏍嬪彿锛屾暣鐞嗕负201 if(newHouseNumber.matches("([a-zA-Z0-9]{3,})\\1")) { newHouseNumber = newHouseNumber.replaceAll("([a-zA-Z0-9]{3,})\\1", '$1') } @@ -459,7 +459,7 @@ class LoudongUtil1 { } /** - * 格式化单元号 + * 鏍煎紡鍖栧崟鍏冨彿 * @param unitNumber * @return */ @@ -469,30 +469,30 @@ class LoudongUtil1 { } def newUnitNumber; - if(unitNumber.matches('.*?[一二三四五六七八九十\\d]+单元.*')) { - newUnitNumber = unitNumber.replaceAll('.*?([\\d一二三四五六七八九十]+)单元.*', '$1') + if(unitNumber.matches('.*?[涓�浜屼笁鍥涗簲鍏竷鍏節鍗乗\d]+鍗曞厓.*')) { + newUnitNumber = unitNumber.replaceAll('.*?([\\d涓�浜屼笁鍥涗簲鍏竷鍏節鍗乚+)鍗曞厓.*', '$1') } else { - newUnitNumber = StringUtils.substringBefore(unitNumber.toUpperCase(), "单元") + newUnitNumber = StringUtils.substringBefore(unitNumber.toUpperCase(), "鍗曞厓") } - //替换“一”“二”“三”等为阿拉伯数字 - if(newUnitNumber.matches(".*[零一二三四五六七八九十]+.*")) { + //鏇挎崲鈥滀竴鈥濃�滀簩鈥濃�滀笁鈥濈瓑涓洪樋鎷変集鏁板瓧 + if(newUnitNumber.matches(".*[闆朵竴浜屼笁鍥涗簲鍏竷鍏節鍗乚+.*")) { newUnitNumber = convertCNToArabic(newUnitNumber) } - //替换“Ⅰ”“Ⅱ”“Ⅲ”等转换为阿拉伯数字 - if(newUnitNumber.matches(".*[ⅠⅡⅢⅣⅤⅥⅦⅧⅨⅩ]+.*")) { + //鏇挎崲鈥溾厾鈥濃�溾叀鈥濃�溾參鈥濈瓑杞崲涓洪樋鎷変集鏁板瓧 + if(newUnitNumber.matches(".*[鈪犫叀鈪⑩叄鈪も叆鈪︹収鈪ㄢ叐]+.*")) { newUnitNumber = convertRomanToArabic(newUnitNumber) } - //去除开头和结尾的特殊符号 - /*while (newUnitNumber.matches('^[^a-zA-Z0-9东南西北甲乙丙丁戊戌].*$')) { + //鍘婚櫎寮�澶村拰缁撳熬鐨勭壒娈婄鍙� + /*while (newUnitNumber.matches('^[^a-zA-Z0-9涓滃崡瑗垮寳鐢蹭箼涓欎竵鎴婃垖].*$')) { newUnitNumber = newUnitNumber.substring(1) }*/ - while (newUnitNumber.matches('^[-—_/,\\.。,、]')) { + while (newUnitNumber.matches('^[-鈥擾/,\\.銆傦紝銆乚')) { newUnitNumber = newUnitNumber.substring(1) } - while (newUnitNumber.matches('^.*?[^a-zA-Z0-9东南西北甲乙丙丁戊戌]+$') && newUnitNumber.length() > 1) { + while (newUnitNumber.matches('^.*?[^a-zA-Z0-9涓滃崡瑗垮寳鐢蹭箼涓欎竵鎴婃垖]+$') && newUnitNumber.length() > 1) { newUnitNumber = newUnitNumber[0..-2] } - if(newUnitNumber.matches('^[a-zA-Z0-9东南西北甲乙丙丁戊戌]+$') && newUnitNumber.length() < 5) { + if(newUnitNumber.matches('^[a-zA-Z0-9涓滃崡瑗垮寳鐢蹭箼涓欎竵鎴婃垖]+$') && newUnitNumber.length() < 5) { return newUnitNumber } return "--" @@ -507,7 +507,7 @@ class LoudongUtil1 { } /** - * 罗马数字转阿拉伯数字 + * 缃楅┈鏁板瓧杞樋鎷変集鏁板瓧 * @param sourceString * @return */ @@ -515,16 +515,16 @@ class LoudongUtil1 { if(StringUtils.isBlank(sourceString)) { return null } - String newString = sourceString.replace("Ⅹ"+suffix, "10"+suffix).replace("Ⅸ"+suffix, "9"+suffix) - .replace("Ⅷ"+suffix, "8"+suffix).replace("Ⅶ"+suffix, "7"+suffix).replace("Ⅵ"+suffix, "6"+suffix) - .replace("Ⅴ"+suffix, "5"+suffix).replace("Ⅳ"+suffix, "4"+suffix).replace("Ⅲ"+suffix, "3"+suffix) - .replace("Ⅱ"+suffix, "2"+suffix).replace("Ⅰ"+suffix, "1"+suffix); + String newString = sourceString.replace("鈪�"+suffix, "10"+suffix).replace("鈪�"+suffix, "9"+suffix) + .replace("鈪�"+suffix, "8"+suffix).replace("鈪�"+suffix, "7"+suffix).replace("鈪�"+suffix, "6"+suffix) + .replace("鈪�"+suffix, "5"+suffix).replace("鈪�"+suffix, "4"+suffix).replace("鈪�"+suffix, "3"+suffix) + .replace("鈪�"+suffix, "2"+suffix).replace("鈪�"+suffix, "1"+suffix); return newString } /** - * 罗马数字转汉字 + * 缃楅┈鏁板瓧杞眽瀛� * @param srcString * @return */ @@ -532,16 +532,16 @@ class LoudongUtil1 { if(StringUtils.isBlank(srcString)) { return null } - String newString = srcString.replace("Ⅹ"+suffix, "十"+suffix).replace("Ⅸ"+suffix, "九"+suffix) - .replace("Ⅷ"+suffix, "八"+suffix).replace("Ⅶ"+suffix, "七"+suffix).replace("Ⅵ"+suffix, "六"+suffix) - .replace("Ⅴ"+suffix, "五"+suffix).replace("Ⅳ"+suffix, "四"+suffix).replace("Ⅲ"+suffix, "三"+suffix) - .replace("Ⅱ"+suffix, "二"+suffix).replace("Ⅰ"+suffix, "一"+suffix); + String newString = srcString.replace("鈪�"+suffix, "鍗�"+suffix).replace("鈪�"+suffix, "涔�"+suffix) + .replace("鈪�"+suffix, "鍏�"+suffix).replace("鈪�"+suffix, "涓�"+suffix).replace("鈪�"+suffix, "鍏�"+suffix) + .replace("鈪�"+suffix, "浜�"+suffix).replace("鈪�"+suffix, "鍥�"+suffix).replace("鈪�"+suffix, "涓�"+suffix) + .replace("鈪�"+suffix, "浜�"+suffix).replace("鈪�"+suffix, "涓�"+suffix); return newString } /** - * 汉字数字转换为阿拉伯数字 + * 姹夊瓧鏁板瓧杞崲涓洪樋鎷変集鏁板瓧 * @param sourceString * @return */ @@ -560,7 +560,7 @@ class LoudongUtil1 { } /** - * 阿拉伯数字转汉字 + * 闃挎媺浼暟瀛楄浆姹夊瓧 * @param srcString * @param suffix * @return @@ -588,7 +588,7 @@ class LoudongUtil1 { } /** - * 去除小区名末尾的无效标识 + * 鍘婚櫎灏忓尯鍚嶆湯灏剧殑鏃犳晥鏍囪瘑 * @param srcString * @return */ @@ -597,15 +597,15 @@ class LoudongUtil1 { return null } String result = srcString - if(result.matches('.+?[\\((]?([一二三四五六七八九十]+期)[\\))]?$')) { - result = result.replaceAll('[\\((]?([一二三四五六七八九十]+期)[\\))]?$', '$1') + if(result.matches('.+?[\\(锛圿?([涓�浜屼笁鍥涗簲鍏竷鍏節鍗乚+鏈�)[\\)锛塢?$')) { + result = result.replaceAll('[\\(锛圿?([涓�浜屼笁鍥涗簲鍏竷鍏節鍗乚+鏈�)[\\)锛塢?$', '$1') } - result = result.replaceAll('^(.+?)(?:[\\((].+[\\))])$', '$1') + result = result.replaceAll('^(.+?)(?:[\\(锛圿.+[\\)锛塢)$', '$1') return result } /** - * 将Loudong对象转为DBObject对象 + * 灏哃oudong瀵硅薄杞负DBObject瀵硅薄 * @param loudong * @return */ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/NameExport.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/NameExport.groovy index 045dab22c..3e7d824ea 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/NameExport.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/NameExport.groovy @@ -56,9 +56,9 @@ class NameExport{ List alias = dbObject.alias if (alias) { for (def alia : alias) { - def key = dbObject.get("city").toString() + "_" + dbObject.get("region").toString() + "_" + alia//拼出一个城市区域小区名 + def key = dbObject.get("city").toString() + "_" + dbObject.get("region").toString() + "_" + alia//鎷煎嚭涓�涓煄甯傚尯鍩熷皬鍖哄悕 if (mainDistrict.containsKey(key)) { - if (mainDistrict.get(key).name!= dbObject.name) {//不相等 + if (mainDistrict.get(key).name!= dbObject.name) {//涓嶇浉绛� println(mainDistrict.get(key)) println(dbObject) STAT_COLL.insert(new BasicDBObject("sid",mainDistrict.get(key).sid).append("city",mainDistrict.get(key).city) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/PaiMai.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/PaiMai.groovy index 1e5b3da8b..53185e14a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/PaiMai.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/PaiMai.groovy @@ -23,7 +23,7 @@ class PaiMai{ def citys = OnceTestThird.getAllCities() for (int j = 68; j def result = "" + dbObject.desc + "" Document doc = Jsoup.parse(result) @@ -36,11 +36,11 @@ class PaiMai{ String name = null; String user = null; for (int i = 0; i < list.size() - 2; i++) { - if (list.get(i).toString().length() < 150 && !list.get(i).toString().contains(",") && !list.get(i).toString().contains(":")) { - if (list.get(i).toString().contains("拍品名称") || (list.get(i).toString().contains("标的") && list.get(i).toString().contains("名称"))) { + if (list.get(i).toString().length() < 150 && !list.get(i).toString().contains("锛�") && !list.get(i).toString().contains("锛�")) { + if (list.get(i).toString().contains("鎷嶅搧鍚嶇О") || (list.get(i).toString().contains("鏍囩殑") && list.get(i).toString().contains("鍚嶇О"))) { basicDBObject.put(list.get(i).toString().replaceAll(" ", ""), list.get(i + 1).toString().replaceAll(" ", "")) } - if (list.get(i).toString().contains("房屋类型") || list.get(i).toString().contains("房屋用途") || list.get(i).toString().contains("性质") || list.get(i).toString().contains("土地权属")) { + if (list.get(i).toString().contains("鎴垮眿绫诲瀷") || list.get(i).toString().contains("鎴垮眿鐢ㄩ��") || list.get(i).toString().contains("鎬ц川") || list.get(i).toString().contains("鍦熷湴鏉冨睘")) { basicDBObject.put(list.get(i).toString().replaceAll("\\d.", "").replaceAll(" ", ""), list.get(i + 1).toString().replaceAll(" ", "")) if (list.get(i + 2).toString().startsWith('2')) { basicDBObject.put(list.get(i).toString().replaceAll(" ", "").replaceAll("\\d.", ""), list.get(i + 1) + list.get(i + 2).toString().replaceAll(" ", "")) @@ -57,15 +57,15 @@ class PaiMai{ tdlist.add(td.text().replaceAll(" ", "").trim()) } for (int i = 0; i < tdlist.size(); i++) { - if (tdlist.get(i).toString().length() < 150 && !tdlist.get(i).toString().contains(",") && !tdlist.get(i).toString().contains(":")) { - if (tdlist.get(i).toString().contains("拍品名称") || (tdlist.get(i).toString().contains("标的") && tdlist.get(i).toString().contains("名称"))) { + if (tdlist.get(i).toString().length() < 150 && !tdlist.get(i).toString().contains("锛�") && !tdlist.get(i).toString().contains("锛�")) { + if (tdlist.get(i).toString().contains("鎷嶅搧鍚嶇О") || (tdlist.get(i).toString().contains("鏍囩殑") && tdlist.get(i).toString().contains("鍚嶇О"))) { basicDBObject.put(tdlist.get(i).toString().replaceAll(" ", ""), tdlist.get(i + 1).toString().replaceAll(" ", "")) //println(tdlist.get(i).toString().contains(" ")) } - if (tdlist.get(i).toString().contains("房屋类型") || tdlist.get(i).toString().contains("房屋用途") - || tdlist.get(i).toString().contains("性质") || tdlist.get(i).toString().contains("土地权属")) { + if (tdlist.get(i).toString().contains("鎴垮眿绫诲瀷") || tdlist.get(i).toString().contains("鎴垮眿鐢ㄩ��") + || tdlist.get(i).toString().contains("鎬ц川") || tdlist.get(i).toString().contains("鍦熷湴鏉冨睘")) { if (tdlist.get(i).toString().length() < 100 && tdlist.get(i + 1).toString().length() < 100) { - basicDBObject.put(tdlist.get(i).toString().replaceAll("\\d.", "").replaceAll(" ", "").replaceAll("、", ""), tdlist.get(i + 1).toString().replaceAll(" ", "")) + basicDBObject.put(tdlist.get(i).toString().replaceAll("\\d.", "").replaceAll(" ", "").replaceAll("銆�", ""), tdlist.get(i + 1).toString().replaceAll(" ", "")) if (tdlist.get(i + 2).toString().startsWith('2')) { basicDBObject.put(tdlist.get(i).toString().replaceAll(" ", ""), tdlist.get(i + 1) + tdlist.get(i + 2).toString().replaceAll(" ", "")) } @@ -77,7 +77,7 @@ class PaiMai{ } def region = dbObject.region def title = dbObject.title - //def city = "上海" + //def city = "涓婃捣" if (region == null && title != null) { region = RegionData.parseRegionFormAddress(city, title) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/QuanZhou.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/QuanZhou.groovy index 2fd7c99e0..ba00bc6e6 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/QuanZhou.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/QuanZhou.groovy @@ -13,7 +13,7 @@ class QuanZhou { final DBCollection STAT_COLL = MongoUtils.getCollectionByName("fangjia", "house_loudong", "192.168.0.136") public static void main(String[] args) { - STAT_COLL.find(new BasicDBObject("city", "泉州").append("region", "惠安").append("status", 5)).each { dbObject -> + STAT_COLL.find(new BasicDBObject("city", "娉夊窞").append("region", "鎯犲畨").append("status", 5)).each { dbObject -> BasicDBObject findObj = new BasicDBObject() def city = dbObject.city def region = dbObject.region diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/RegionExport.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/RegionExport.groovy index 6a7878730..8ae46d6c3 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/RegionExport.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/RegionExport.groovy @@ -16,7 +16,7 @@ class RegionExport{ println(j++) } def rows = [] - rows.add(["城市","区域"]) + rows.add(["鍩庡競","鍖哄煙"]) for(def city : set){ def citys = city.split ("_")[0] def region = city.split("_")[1] diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/RegionStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/RegionStat.groovy index cdf0059a7..23936e67c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/RegionStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/RegionStat.groovy @@ -12,9 +12,9 @@ import com.mongodb.Mongo class RegionStat{ public static DBCollection RegionStat = MongoUtils.getCollectionByName("fangjia", "region_stat", "192.168.0.136"); public static void main(String[] args){ - List citys = ["深圳","广州","东莞","佛山","惠州","汕头"]// + List citys = ["娣卞湷","骞垮窞","涓滆帪","浣涘北","鎯犲窞","姹曞ご"]// def rows = [] - rows.add(['城市', '区域', '均价']) + rows.add(['鍩庡競', '鍖哄煙', '鍧囦环']) for(int i = 0; i + Road.find(new BasicDBObject("site_name","瀹夊眳瀹�").append("category","district")).addOption(Bytes.QUERYOPTION_NOTIMEOUT).each { dbObject -> def name = dbObject.get("primary_map")["name"] def region = dbObject.get("primary_map")["region"] def city = dbObject.get("primary_map")["city"] diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/RuKu.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/RuKu.groovy index 48331fd5b..e979c6fa5 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/RuKu.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/RuKu.groovy @@ -22,17 +22,17 @@ class RuKu { public static void main(String[] args) { /** - * 链家上海 + * 閾惧涓婃捣 */ ExcelUtils.multiThreadingModify(filename, { List row -> - String city = "苏州" + String city = "鑻忓窞" def region = row["G"] def address = row["H"] def avg_price = row["I"] def name = row["B"] def huxing = row["C"] def room = huxing.toString().trim().substring(0, 1) - def ting = StringUtils.substringBetween(huxing.toString(), "室", "厅") + def ting = StringUtils.substringBetween(huxing.toString(), "瀹�", "鍘�") def area = row["D"] def trade_date = row["E"] def trade_price = row["F"] @@ -53,7 +53,7 @@ class RuKu { dealPrice.append("region", region) dealPrice.append("total_price", trade_price) dealPrice.append("c_date", date) - dealPrice.append("source", "链家在线") + dealPrice.append("source", "閾惧鍦ㄧ嚎") dealPrice.append("avg_price", avg_price) dealPrice.append("address", address) dealPrice.append("ting", ting) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/SanMingJiexi.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/SanMingJiexi.groovy index ad6387f84..e4feb2b67 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/SanMingJiexi.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/SanMingJiexi.groovy @@ -59,15 +59,15 @@ class SanMingJiexi { def address = dbObject.item_address def room_num = dbObject.room_num def house_num = dbObject.loudong - def huxing = dbObject.get("幢信息")["huxing"] - def build_type = dbObject.get("幢信息")["house_type"] - def area = dbObject.get("幢信息")["permit_build_area"] + def huxing = dbObject.get("骞俊鎭�")["huxing"] + def build_type = dbObject.get("骞俊鎭�")["house_type"] + def area = dbObject.get("骞俊鎭�")["permit_build_area"] if(area == "0"||area==null||area==""){ - area = dbObject.get("幢信息")["ture_build_area"] + area = dbObject.get("骞俊鎭�")["ture_build_area"] } - def outArea = dbObject.get("幢信息")["permit_avg_area"] + def outArea = dbObject.get("骞俊鎭�")["permit_avg_area"] if(outArea == "0"||outArea==null||outArea==""){ - outArea = dbObject.get("幢信息")["ture_avg_area"] + outArea = dbObject.get("骞俊鎭�")["ture_avg_area"] } def room = -1 def hall = -1 @@ -85,9 +85,9 @@ class SanMingJiexi { if (huxing != null && !huxing.equals("")) { huxing = parseHuxing(huxing.toString()) - if (huxing.matches("\\d+室\\d+厅")) { + if (huxing.matches("\\d+瀹\d+鍘�")) { room = huxing.substring(0, 1).toString().toInteger() - hall = StringUtils.substringBetween(huxing, "室", "厅") + hall = StringUtils.substringBetween(huxing, "瀹�", "鍘�") } } @@ -99,7 +99,7 @@ class SanMingJiexi { room_num = StringUtils.substringBefore(room_num, ".") } - String source = "三明房产资源网" + String source = "涓夋槑鎴夸骇璧勬簮缃�" def date = new Date() com.fangjia.script.linxsh.util.entity.HouseLoudong houseLoudng = new com.fangjia.script.linxsh.util.entity.HouseLoudong() houseLoudng.city = city @@ -141,22 +141,22 @@ class SanMingJiexi { private static def forMateName(String name){ name = name.replaceAll("\\d+#","") - name = name.replaceAll("\\d+幢","") + name = name.replaceAll("\\d+骞�","") name = name.replaceAll(" ","") - name = name.replaceAll("项目\$","") - name = name.replaceAll("、","") - name = name.replaceAll("楼","") + name = name.replaceAll("椤圭洰\$","") + name = name.replaceAll("銆�","") + name = name.replaceAll("妤�","") name = name.replaceAll("-","") return name } private static def parseHuxing(String huxing){ - huxing = huxing.replaceAll("一","1") - huxing = huxing.replaceAll("二","2") - huxing = huxing.replaceAll("三","3") - huxing = huxing.replaceAll("两","2") - huxing = huxing.replaceAll("四","4") - huxing = huxing.replaceAll("五","5") - huxing = huxing.replaceAll("六","6") + huxing = huxing.replaceAll("涓�","1") + huxing = huxing.replaceAll("浜�","2") + huxing = huxing.replaceAll("涓�","3") + huxing = huxing.replaceAll("涓�","2") + huxing = huxing.replaceAll("鍥�","4") + huxing = huxing.replaceAll("浜�","5") + huxing = huxing.replaceAll("鍏�","6") return huxing } } \ No newline at end of file diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/SeabirdStatExport.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/SeabirdStatExport.groovy index 5811de31e..e1a1826f2 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/SeabirdStatExport.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/SeabirdStatExport.groovy @@ -19,20 +19,20 @@ import net.sf.json.JSONObject class SeabirdStatExport extends BaseBatch { public static final DBCollection STAT_COLL = MongoUtils.getCollectionByName("lixue", "seabirdstatexport1", "192.168.0.61") static DSCollection seawaterColl = new DataStore("192.168.0.65", 27777).getCollection("fangjia.seawater") - def directionMap1 = ["西南":1,"东南":2,"南":3,"西北":4,"东北":5,"东":6,"西":7,"北":8,"东西":9,"南北":10] - def directionMap = [1:"南",2:"北",3:"南北",4:"东",5:"西",6:"东西",7:"东南",8:"西南",9:"东北",10:"西北"] + def directionMap1 = ["瑗垮崡":1,"涓滃崡":2,"鍗�":3,"瑗垮寳":4,"涓滃寳":5,"涓�":6,"瑗�":7,"鍖�":8,"涓滆タ":9,"鍗楀寳":10] + def directionMap = [1:"鍗�",2:"鍖�",3:"鍗楀寳",4:"涓�",5:"瑗�",6:"涓滆タ",7:"涓滃崡",8:"瑗垮崡",9:"涓滃寳",10:"瑗垮寳"] static void main(String[] args) { runBatch(new SeabirdStatExport(), args) } /** - * 查找有效的小区,符合: - * 全国随机挑选100个最优最全的房源样本(大约10-15个小区),所需字段见表格,样本时间为最近1-2个月的。 - * 挑选的小区最好能提供7-10个样本,且挂牌价与评估价相近(相差在15%以内) + * 鏌ユ壘鏈夋晥鐨勫皬鍖猴紝绗﹀悎锛� + * 鍏ㄥ浗闅忔満鎸戦��100涓渶浼樻渶鍏ㄧ殑鎴挎簮鏍锋湰锛堝ぇ绾�10-15涓皬鍖猴級锛屾墍闇�瀛楁瑙佽〃鏍硷紝鏍锋湰鏃堕棿涓烘渶杩�1-2涓湀鐨勩�� + * 鎸戦�夌殑灏忓尯鏈�濂借兘鎻愪緵7-10涓牱鏈紝涓旀寕鐗屼环涓庤瘎浼颁环鐩歌繎锛堢浉宸湪15%浠ュ唴锛� * @return */ private findValidDistrict(){ - def districtList = CommonDatautils.findAllDistricts("厦门", "district", ["city","region","name","sid"]); + def districtList = CommonDatautils.findAllDistricts("鍘﹂棬", "district", ["city","region","name","sid"]); int validDistrict = 0 int index = 0 long lStart = System.currentTimeMillis() @@ -61,7 +61,7 @@ class SeabirdStatExport extends BaseBatch { } /** - * 过滤房源 + * 杩囨护鎴挎簮 * @param houseList */ private filterHouse(houseList){ @@ -77,7 +77,7 @@ class SeabirdStatExport extends BaseBatch { def totalPrice = house.total_price int diff = totalPrice - evaluatePrice.toInteger() if(diff.abs()/totalPrice<0.15) { - //符合挂牌价在15%以内 + //绗﹀悎鎸傜墝浠峰湪15%浠ュ唴 saveResult(house, totalPrice, evaluatePrice) index ++ if (index >= 10){ @@ -103,7 +103,7 @@ class SeabirdStatExport extends BaseBatch { unitEvaluatePrict = evaluatePrice.toInteger() / dbObject.area.toInteger() } Date date = new Date() - def type = dbObject.room + "室" + dbObject.hall + "厅" + dbObject.toilet + "卫" + def type = dbObject.room + "瀹�" + dbObject.hall + "鍘�" + dbObject.toilet + "鍗�" def city = dbObject.city def region = dbObject.region def name = dbObject.district_name @@ -167,7 +167,7 @@ class SeabirdStatExport extends BaseBatch { unitEvaluatePrict = evaluatePrice.toInteger() / dbObject.area.toInteger() } Date date = new Date() - def type = dbObject.room + "室" + dbObject.hall + "厅" + dbObject.toilet + "卫" + def type = dbObject.room + "瀹�" + dbObject.hall + "鍘�" + dbObject.toilet + "鍗�" def city = dbObject.city def region = dbObject.region def name = dbObject.district_name @@ -228,11 +228,11 @@ class SeabirdStatExport extends BaseBatch { } if(m.estate_type){ - if(m.estate_type=='普通住宅'){ + if(m.estate_type=='鏅�氫綇瀹�'){ params.put("propertyType", "0"); - }else if(m.estate_type=='别墅'){ + }else if(m.estate_type=='鍒'){ params.put("propertyType", "1"); - }else if(m.estate_type=='商住'){ + }else if(m.estate_type=='鍟嗕綇'){ params.put("propertyType", "2"); } }else{ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/StatisticRoomNum.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/StatisticRoomNum.groovy index bd09cff61..b2d9e86da 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/StatisticRoomNum.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/StatisticRoomNum.groovy @@ -21,8 +21,8 @@ class StatisticRoomNum { } private static void statisticRoomNum(){ BasicDBList values = new BasicDBList(); - values.add("厦门"); - values.add("泉州"); + values.add("鍘﹂棬"); + values.add("娉夊窞"); BasicDBObject cityvalue = new BasicDBObject('$in', values); BasicDBObject feildObj = new BasicDBObject().append("city",1).append("region",1).append("name",1) Set districtSet = new HashSet() @@ -88,10 +88,10 @@ class StatisticRoomNum { private static List getMoniRoomNum(String city, String region, String name, String buildNum){ def url = "http://192.168.0.251:9180/pds/roomNumber?city="+city.trim()+"&district="+region.trim()+"&projectName="+name.trim()+"&buildingNumber="+buildNum.trim()+"&token=F54F52381C49BB9EB4A33EB1B65604AE4B71A28AEE53518A94A2F360408B9056D57553931D15CE6DDE765562DAD286BA38E05A4CDAFC51C3D527A4959BF8E75A3B95DB7108FCEA340DDE61925616DB55118E1851E67D83EAD800460D100D6B667A4ED8EE67C8F7FB" String result = RequestUtil.doGet(url); - //通过字符串,获得最外部的json对象 + //閫氳繃瀛楃涓诧紝鑾峰緱鏈�澶栭儴鐨刯son瀵硅薄 JSONObject jsonObj = new JSONObject(result); def list = new ArrayList() - //获得json对象组 + //鑾峰緱json瀵硅薄缁� if(jsonObj.get("result")!=null) { JSONArray arr = jsonObj.getJSONArray("result"); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/Statues.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/Statues.groovy index 8b7703d97..e7a0c3da1 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/Statues.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/Statues.groovy @@ -20,9 +20,9 @@ class Statues{ DBCursor dbcursor = delete.find() for(DBObject dbObject1 : dbcursor) { def sid = dbObject1.get("330411H0087H") - def city = dbObject1.get("嘉兴") - def region = dbObject1.get("秀洲") - def name = dbObject1.get("领秀智谷") + def city = dbObject1.get("鍢夊叴") + def region = dbObject1.get("绉�娲�") + def name = dbObject1.get("棰嗙鏅鸿胺") DbUtils.seaweed.update(new BasicDBObject('sid', sid).append("city",city).append("region",region).append("name",name), new BasicDBObject('$set', new BasicDBObject('status', 0).append("virescence_percent", ""))) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/StatusChange.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/StatusChange.groovy index 5680180f3..830efb466 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/StatusChange.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/StatusChange.groovy @@ -38,9 +38,9 @@ class StatusChange{ update.append('status',0) HouseLoudong.update(query, new BasicDBObject('$set', update)) -// if(hege=="合格") { +// if(hege=="鍚堟牸") { // HouseLoudong.update(query, new BasicDBObject('$set', new BasicDBObject('status', 5)),false,true) -// println("合格"+count) +// println("鍚堟牸"+count) // count++ // } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/True_num.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/True_num.groovy index 999997052..301217c63 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/True_num.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/True_num.groovy @@ -30,10 +30,10 @@ class True_num{ private static boolean isturenum(String str){ Pattern pattern = Pattern.compile("^[0-9]*\$"); if(pattern.matcher(str).matches()){ - //数字 + //鏁板瓧 return true; } else { - //非数字 + //闈炴暟瀛� return false; } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/VirTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/VirTest.groovy index 39332450c..93d4d25ed 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/VirTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/VirTest.groovy @@ -28,15 +28,15 @@ class VirTest{ if(str == null){ return false } - //带小数的 + //甯﹀皬鏁扮殑 // Pattern pattern = Pattern.compile("^(-?\\d+)(\\.\\d+)?\$"); Pattern pattern1 = Pattern.compile("^[0-9]*\$"); if(pattern1.matcher(str)){ - //数字 + //鏁板瓧 return true; } else { - //非数字 + //闈炴暟瀛� return false; } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/XiaMenjiexi.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/XiaMenjiexi.groovy index 5e24c663e..ba1e8654d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/XiaMenjiexi.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/XiaMenjiexi.groovy @@ -19,7 +19,7 @@ class XiaMenjiexi{ final DBCollection LouDong = MongoUtils.getCollectionByName("fangjia", "xiamen2", "192.168.0.136") public static void main(String[] args) { def count = 0 - STAT_COLL.find(new BasicDBObject("city", "厦门")).addOption(Bytes.QUERYOPTION_NOTIMEOUT).batchSize(1000).each { dbObject -> + STAT_COLL.find(new BasicDBObject("city", "鍘﹂棬")).addOption(Bytes.QUERYOPTION_NOTIMEOUT).batchSize(1000).each { dbObject -> def city = dbObject.get("city").toString() def region = dbObject.get("region").toString() @@ -45,7 +45,7 @@ class XiaMenjiexi{ roomNumber = StringUtils.substringBefore(roomNumber, ".") } - String source = "厦门网上房地产" + String source = "鍘﹂棬缃戜笂鎴垮湴浜�" def date = new Date() def mdate = dbObject.get("m_date") com.fangjia.script.linxsh.util.entity.HouseLoudong houseLoudng = new com.fangjia.script.linxsh.util.entity.HouseLoudong() diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/XiamenRuku.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/XiamenRuku.groovy index 8604177dc..0dc86c45b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/XiamenRuku.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/XiamenRuku.groovy @@ -54,8 +54,8 @@ class XiamenRuku { def region = dbObject.region BasicDBObject findObj = new BasicDBObject() - findObj.append("from","厦门网上房地产") - findObj.append("city","厦门") + findObj.append("from","鍘﹂棬缃戜笂鎴垮湴浜�") + findObj.append("city","鍘﹂棬") findObj.append("room_num",room_num) findObj.append("house_num_unit",house_num_unit) findObj.append("name_in_seaweed",name_in_seaweed) @@ -90,14 +90,14 @@ class XiamenRuku { if(name.contains("(")){ name = name.substring(0,name.lastIndexOf("(")) } - if(name.contains("(")){ - name = name.substring(0,name.lastIndexOf("(")) + if(name.contains("锛�")){ + name = name.substring(0,name.lastIndexOf("锛�")) } if(name.toString().contains("//d+#")){ name = name.replaceAll("//d+#","") } - if(name.toString().contains("//d+号楼")){ - name = name.replaceAll("//d+号楼","") + if(name.toString().contains("//d+鍙锋ゼ")){ + name = name.replaceAll("//d+鍙锋ゼ","") } println("->"+name) STAT_COLL.update(new BasicDBObject("_id",dbObject._id),new BasicDBObject('$set',new BasicDBObject("name",name).append("status",5))) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/ZhangjiagangRuku.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/ZhangjiagangRuku.groovy index a747a1f17..75773eb31 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/ZhangjiagangRuku.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/ZhangjiagangRuku.groovy @@ -23,7 +23,7 @@ class ZhangjiagangRuku{ def obj1 = dbObject.get("deal_area") def obj3 = dbObject.get("deal_price") //def obj5 = dbObject.get("region") - def name = dbObject.get("房屋坐落") + def name = dbObject.get("鎴垮眿鍧愯惤") //def avg_price = dbObject.get("trade_uprice") def t_date = DateFormat.date_format(obj.toString()) def trade_date = DateUtil.parseDate(t_date, "yyyy-MM-dd") @@ -33,7 +33,7 @@ class ZhangjiagangRuku{ if (obj3 != null && !"".equals(obj3.toString())) { def total = (obj3.toString().toDouble()*10000).toInteger() //def avg = DealPriceUtils.parseTotalPrice(avg_price.toString()) - def city = "苏州" + def city = "鑻忓窞" //def region = RegionData.formatRegion(city, obj5.toString()) def dealPrice = new BasicDBObject() @@ -41,10 +41,10 @@ class ZhangjiagangRuku{ dealPrice.append("trade_date", trade_date) dealPrice.append("city", city) dealPrice.append("district_name", name) - dealPrice.append("region", "张家港") + dealPrice.append("region", "寮犲娓�") dealPrice.append("total_price", total) dealPrice.append("c_date", date) - dealPrice.append("source", "张家港房产网") + dealPrice.append("source", "寮犲娓埧浜х綉") //dealPrice.append("avg_price", avg) def one = LouDong.findOne(dealPrice) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/ZhongYanJiexi.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/ZhongYanJiexi.groovy index 696273fae..59ae017dc 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/ZhongYanJiexi.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/DB/ZhongYanJiexi.groovy @@ -28,11 +28,11 @@ class ZhongYanjiexi{ def name = dbObject.name def price = dbObject.avg_price - def avg_price = price.toString().split("元")[0].toInteger() + def avg_price = price.toString().split("鍏�")[0].toInteger() if(name.toString().contains("(")){ name = name.toString().substring(0,name.toString().lastIndexOf("(")) } - if(RegionData.isRegion("上海",region)){ + if(RegionData.isRegion("涓婃捣",region)){ Map upd=new HashMap(); def s_date = 201706 upd.put("city", city) @@ -58,13 +58,13 @@ class ZhongYanjiexi{ int avg_price = row["A"] def price = 0 - region = RegionData.formatRegion("天津",region) + region = RegionData.formatRegion("澶╂触",region) // if(avg_price.toString().contains(".")){ // price = avg_price.toString().split(".")[0].toInteger() // }else { // price = avg_price.toString().toInteger() // } - if(RegionData.isRegion("天津",region)){ + if(RegionData.isRegion("澶╂触",region)){ Map upd=new HashMap(); def s_date = 201706 upd.put("city", city) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataexport/AddressCom.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataexport/AddressCom.groovy index 28219394b..24e9ada4f 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataexport/AddressCom.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataexport/AddressCom.groovy @@ -10,14 +10,14 @@ import org.bson.Document import static com.mongodb.client.model.Filters.and import static com.mongodb.client.model.Filters.eq -List items = ExcelUtils.read("D:\\建设银行\\建设银行\\建行小区数据0419交付.xlsx", 0) +List items = ExcelUtils.read("D:\\寤鸿閾惰\\寤鸿閾惰\\寤鸿灏忓尯鏁版嵁0419浜や粯.xlsx", 0) List data = [] -tilte = ["ID", "城市", "区域", "小区名"] +tilte = ["ID", "鍩庡競", "鍖哄煙", "灏忓尯鍚�"] boolean isFirst = true MongoCollection DISTRICT_SELL_STAT = Mongo3Utils.getDbCollection("fangjia_stat", "district_sell_stat") for(List item : items){ - if(item["N"] == "住宅"){ - item = [item["B"], "北京", item["I"], item["J"]] + if(item["N"] == "浣忓畢"){ + item = [item["B"], "鍖椾含", item["I"], item["J"]] Calendar calendar = Calendar.getInstance() calendar.setTime(DateUtil.parseDate("201803", "yyyyMM")) while(calendar.getTime().before(DateUtil.parseDate("201904", "yyyyMM"))){ @@ -25,7 +25,7 @@ for(List item : items){ if(isFirst){ tilte << sDate } - Document document= DISTRICT_SELL_STAT.find(and(eq("city", "北京"), eq("region", item[2]), + Document document= DISTRICT_SELL_STAT.find(and(eq("city", "鍖椾含"), eq("region", item[2]), eq("district_name", item[3]), eq("date", sDate))).first() if(document){ item << document.getInteger("avg_price") @@ -41,4 +41,4 @@ for(List item : items){ } data.add(0, tilte) -ExcelUtils.write("D:\\建设银行\\建设银行\\建行小区数据0419价格交付.xlsx", data, "小区均价") \ No newline at end of file +ExcelUtils.write("D:\\寤鸿閾惰\\寤鸿閾惰\\寤鸿灏忓尯鏁版嵁0419浠锋牸浜や粯.xlsx", data, "灏忓尯鍧囦环") \ No newline at end of file diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataexport/AddressComExport.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataexport/AddressComExport.groovy index 02ee077cd..e3fe5ad2c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataexport/AddressComExport.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataexport/AddressComExport.groovy @@ -37,7 +37,7 @@ def List find_rent_house_prices(String city, String region, String name, Date st sqlBuffer.append(" and city = '${city}'") sqlBuffer.append(" and region ='${region}'") sqlBuffer.append(" and cat = 'rent'") - sqlBuffer.append(" and rent_type = '整租'") + sqlBuffer.append(" and rent_type = '鏁寸'") sqlBuffer.append(" and p_date < ${end.format('yyyyMMdd')} and p_date >= ${start.format('yyyyMMdd')}") BasicDBObject seaweed = DbUtils.seaweed.findOne(DbUtils.buildSeaweedQuery(city, region, name)) def names = [name] @@ -90,11 +90,11 @@ def findDistrictStat(String city, String region, String name, Date start, Date e MongoCollection SQMETRE_RENT = Mongo3Utils.getDbCollection("fangjia", "sqmetre_rent") def regionStats = new ConcurrentHashMap() -SQMETRE_RENT.find(and(eq("cat", "region"), eq("city", "北京"), eq("weekend", Date.parse("yyyyMMdd", "20190331")))).each {Document doc-> +SQMETRE_RENT.find(and(eq("cat", "region"), eq("city", "鍖椾含"), eq("weekend", Date.parse("yyyyMMdd", "20190331")))).each {Document doc-> regionStats[doc.region] = doc.avg_price } -ExcelUtils.multiThreadingModify("D:\\建设银行\\建设银行\\数据交付\\建行小区数据0423住宅成交交付.xlsx",{List item-> +ExcelUtils.multiThreadingModify("D:\\寤鸿閾惰\\寤鸿閾惰\\鏁版嵁浜や粯\\寤鸿灏忓尯鏁版嵁0423浣忓畢鎴愪氦浜や粯.xlsx",{List item-> MongoCollection DISTRICT_SELL_STAT = Mongo3Utils.getDbCollection(Constants.FANGJIA_CRAWL_MONGO_URI, "vip_site", "rent_transaction") def city = item["B"] def region = item["C"] @@ -227,4 +227,4 @@ ExcelUtils.multiThreadingModify("D:\\ } println(item) -},0, "成交") \ No newline at end of file +},0, "鎴愪氦") \ No newline at end of file diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataexport/DealPrictCount.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataexport/DealPrictCount.groovy index 694ac09d9..44a2f8dbd 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataexport/DealPrictCount.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataexport/DealPrictCount.groovy @@ -32,8 +32,8 @@ def compare(List items01, List items02){ } } -def newExcel = ExcelUtils.read("D:\\建设银行\\建设银行\\数据交付\\建行小区数据0423住宅成交交付.xlsx") -def oldExcel = ExcelUtils.read("D:\\建设银行\\建设银行\\数据交付\\建行小区数据0423住宅成交交付01.xlsx") +def newExcel = ExcelUtils.read("D:\\寤鸿閾惰\\寤鸿閾惰\\鏁版嵁浜や粯\\寤鸿灏忓尯鏁版嵁0423浣忓畢鎴愪氦浜や粯.xlsx") +def oldExcel = ExcelUtils.read("D:\\寤鸿閾惰\\寤鸿閾惰\\鏁版嵁浜や粯\\寤鸿灏忓尯鏁版嵁0423浣忓畢鎴愪氦浜や粯01.xlsx") println(isNotNull(newExcel)) println(isNotNull(oldExcel)) compare(newExcel, oldExcel) \ No newline at end of file diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataexport/DeveloperExport.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataexport/DeveloperExport.groovy index 90ea70d9d..1b11b9f53 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataexport/DeveloperExport.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataexport/DeveloperExport.groovy @@ -5,15 +5,15 @@ import com.fangjia.script.util.ExcelUtils import com.mongodb.BasicDBObject /** - * 导出下面所列城市小区的开发商数据 + * 瀵煎嚭涓嬮潰鎵�鍒楀煄甯傚皬鍖虹殑寮�鍙戝晢鏁版嵁 * Created by lixue on 2017/8/2. */ class DeveloperExport{ -// ["深圳","广州","北京","上海","成都","金华","烟台","长沙","嘉兴","东莞","福州","西安","乌鲁木齐", -// "洛阳","青岛","徐州","合肥","济南","沈阳","泉州","南宁","厦门","海口","贵阳","太原","重庆","杭州", -// "惠州","宁波","珠海","昆明","温州","苏州","南京","潍坊","大连","哈尔滨","南昌","佛山","武汉","天津", -// "南通","无锡","长春","常州","郑州", - static def citys = ["石家庄","汕头","扬州"] +// ["娣卞湷","骞垮窞","鍖椾含","涓婃捣","鎴愰兘","閲戝崕","鐑熷彴","闀挎矙","鍢夊叴","涓滆帪","绂忓窞","瑗垮畨","涔岄瞾鏈ㄩ綈", +// "娲涢槼","闈掑矝","寰愬窞","鍚堣偉","娴庡崡","娌堥槼","娉夊窞","鍗楀畞","鍘﹂棬","娴峰彛","璐甸槼","澶師","閲嶅簡","鏉窞", +// "鎯犲窞","瀹佹尝","鐝犳捣","鏄嗘槑","娓╁窞","鑻忓窞","鍗椾含","娼嶅潑","澶ц繛","鍝堝皵婊�","鍗楁槍","浣涘北","姝︽眽","澶╂触", +// "鍗楅��","鏃犻敗","闀挎槬","甯稿窞","閮戝窞", + static def citys = ["鐭冲搴�","姹曞ご","鎵窞"] static def filename = "D:\\developer1.xlsx" public static void main(String[] args) { def rows = [] diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataexport/DistrictAvg.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataexport/DistrictAvg.groovy index c6bd07079..25e695a14 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataexport/DistrictAvg.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataexport/DistrictAvg.groovy @@ -24,9 +24,9 @@ import org.elasticsearch.index.query.QueryBuilders // println(doc) // return false //}) -//ExcelUtils.write("D:\\均价数据状况.xlsx", data, "统计") +//ExcelUtils.write("D:\\鍧囦环鏁版嵁鐘跺喌.xlsx", data, "缁熻") -def cityList = ["上海","北京","常州","无锡","重庆","东莞","中山","合肥","苏州","广州","深圳","佛山","长沙","韶关","惠州","清远","珠海","福州","厦门","龙岩","漳州","成都","天津","南京","青岛","杭州","武汉","西安","南昌","贵阳","三亚","郑州","开封","洛阳","平顶山","安阳","鹤壁","新乡","焦作","濮阳","许昌","漯河","三门峡","南阳","商丘","信阳","周口","驻马店"] -ExcelUtils.modify("D:\\均价数据状况.xlsx", {List item-> - item["E"] = (cityList.contains(item["A"])?"是":"否") +def cityList = ["涓婃捣","鍖椾含","甯稿窞","鏃犻敗","閲嶅簡","涓滆帪","涓北","鍚堣偉","鑻忓窞","骞垮窞","娣卞湷","浣涘北","闀挎矙","闊跺叧","鎯犲窞","娓呰繙","鐝犳捣","绂忓窞","鍘﹂棬","榫欏博","婕冲窞","鎴愰兘","澶╂触","鍗椾含","闈掑矝","鏉窞","姝︽眽","瑗垮畨","鍗楁槍","璐甸槼","涓変簹","閮戝窞","寮�灏�","娲涢槼","骞抽《灞�","瀹夐槼","楣ゅ","鏂颁埂","鐒︿綔","婵槼","璁告槍","婕渤","涓夐棬宄�","鍗楅槼","鍟嗕笜","淇¢槼","鍛ㄥ彛","椹婚┈搴�"] +ExcelUtils.modify("D:\\鍧囦环鏁版嵁鐘跺喌.xlsx", {List item-> + item["E"] = (cityList.contains(item["A"])?"鏄�":"鍚�") }) \ No newline at end of file diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataexport/ErrorAddressExport.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataexport/ErrorAddressExport.groovy index 724258f2f..9769f0acd 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataexport/ErrorAddressExport.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataexport/ErrorAddressExport.groovy @@ -24,7 +24,7 @@ import java.text.SimpleDateFormat // } // private static void startRoadExport(){ // def total = DbUtils.seaweed.count(DbUtils.buildSeaweedQuery()) -// def rows = ["id","编号","城市","区域","名称","地址"] +// def rows = ["id","缂栧彿","鍩庡競","鍖哄煙","鍚嶇О","鍦板潃"] // def count = 0 // DbUtils.seaweed.find(DbUtils.buildSeaweedQuery() // ,new BasicDBObject("address",1).append("sid",1).append("city",1).append("region",1).append("name",1)) @@ -33,7 +33,7 @@ import java.text.SimpleDateFormat // // def address = dbObj.address // def id = dbObj._id -// if(address.toString().startsWith("路")){ +// if(address.toString().startsWith("璺�")){ // rows.add([id.toString(),(dbObj.sid).toString(),(dbObj.city).toString(),(dbObj.region).toString(),(dbObj.name).toString(),address.toString()]) // println([id.toString(),(dbObj.sid).toString(),(dbObj.city).toString(),(dbObj.region).toString(),(dbObj.name).toString(),address.toString()]) // } @@ -42,7 +42,7 @@ import java.text.SimpleDateFormat // ExcelUtils.write("D://lx//startRoadExport.xlsx",rows,"startRoadExport") // } // private static void mapAddress(){ -// def filename = "D://模板.xlsx" +// def filename = "D://妯℃澘.xlsx" // int j = 1 // ExcelUtils.multiThreadingModify(filename, { List rows -> // def city = rows['A'] @@ -91,10 +91,10 @@ import java.text.SimpleDateFormat // if(address.toString().equals("")){ // return false // } -// //地址中不包含“号”、“路”、“街”、“巷”、“弄”、“道”、“村” -// if(address.toString().contains("号")||address.toString().contains("路")||address.toString().contains("街") -// ||address.toString().contains("巷")||address.toString().contains("弄")||address.toString().contains("道") -// ||address.toString().contains("村")){ +// //鍦板潃涓笉鍖呭惈鈥滃彿鈥濄�佲�滆矾鈥濄�佲�滆鈥濄�佲�滃贩鈥濄�佲�滃紕鈥濄�佲�滈亾鈥濄�佲�滄潙鈥� +// if(address.toString().contains("鍙�")||address.toString().contains("璺�")||address.toString().contains("琛�") +// ||address.toString().contains("宸�")||address.toString().contains("寮�")||address.toString().contains("閬�") +// ||address.toString().contains("鏉�")){ // return true // } // if(DataUtil.isPreciseAddress(address.toString())){ @@ -114,7 +114,7 @@ import java.text.SimpleDateFormat // } //} -ExcelUtils.multiThreadingModify("D:\\Users\\wenyan\\Desktop\\上海永嘉地址查询需求20190424.xlsx",{List item-> +ExcelUtils.multiThreadingModify("D:\\Users\\wenyan\\Desktop\\涓婃捣姘稿槈鍦板潃鏌ヨ闇�姹�20190424.xlsx",{List item-> if(item["A"]){ JSONObject resp = OpenApiClient.addressMatch(item["A"], item["B"], "property") if(resp.getDouble("credit") > 0){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataexport/EstateInName.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataexport/EstateInName.groovy index fd1c15d70..f06033655 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataexport/EstateInName.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataexport/EstateInName.groovy @@ -16,16 +16,16 @@ class EstateInName{ findBuildType() } private static void findBuildType(){ - def filename = "D://lx//建筑类型问题小区第二批.xlsx" + def filename = "D://lx//寤虹瓚绫诲瀷闂灏忓尯绗簩鎵�.xlsx" int j = 1 ExcelUtils.modify(filename, { List row -> println(j++) def city = row['B'] def region = row['C'] def name = row['D'] -// name = name.toString().replaceAll("别墅","") - def estateName = name + "别墅" - def findOne = DbUtils.seaweed.findOne(DbUtils.buildSeaweedQuery(city,region,estateName))//.append("estate_type2","别墅")) +// name = name.toString().replaceAll("鍒","") + def estateName = name + "鍒" + def findOne = DbUtils.seaweed.findOne(DbUtils.buildSeaweedQuery(city,region,estateName))//.append("estate_type2","鍒")) if(findOne){ row['I'] = estateName } @@ -41,7 +41,7 @@ class EstateInName{ if(estate==null){ estate = result["estate_type2"] } - if ( estate&&estate.toString().contains("住宅")) { + if ( estate&&estate.toString().contains("浣忓畢")) { def type = result["build_type"] if (type&&!getBuildType(type).equals("")) { if(getBuildType(type).contains(",")){ @@ -54,7 +54,7 @@ class EstateInName{ } } } -// if ( estate&&estate.toString().contains("别墅")) { +// if ( estate&&estate.toString().contains("鍒")) { // def type = result["build_type"] // if (type&&!getBuildType(type).equals("")) { // if(getBuildType(type).contains(",")){ @@ -95,10 +95,10 @@ class EstateInName{ private static void estateInName(){ def rows = [] int count = 1 - def num = DbUtils.seaweed.count(DbUtils.buildSeaweedQuery().append("estate_type2","普通住宅")) + def num = DbUtils.seaweed.count(DbUtils.buildSeaweedQuery().append("estate_type2","鏅�氫綇瀹�")) rows.add(["city","region","name","sid","alias","address","estate_type","65estate_type"]) def feildObj = new BasicDBObject("city",1).append("region",1).append("name",1).append("alias",1).append("address",1).append("estate_type2",1).append("sid",1) - DbUtils.seaweed.find(DbUtils.buildSeaweedQuery().append("estate_type2","普通住宅"),feildObj).batchSize(2000).each {dbObject-> + DbUtils.seaweed.find(DbUtils.buildSeaweedQuery().append("estate_type2","鏅�氫綇瀹�"),feildObj).batchSize(2000).each {dbObject-> count++ println(count+"/"+num) def name = dbObject.name @@ -141,10 +141,10 @@ class EstateInName{ ExcelUtils.write(filename,rows,sheet) } private static boolean isContainsEstate(def name){ - if(name.toString().contains("别墅")){ + if(name.toString().contains("鍒")){ return true } - if(name.toString().contains("商住")){ + if(name.toString().contains("鍟嗕綇")){ return true } return false @@ -170,16 +170,16 @@ class EstateInName{ return result } private static boolean isBuildType(def type){ - if(type.toString().contains("多层")){ + if(type.toString().contains("澶氬眰")){ return true } - if(type.toString().contains("高层")){ + if(type.toString().contains("楂樺眰")){ return true } -// if(type.toString().contains("独栋")){ +// if(type.toString().contains("鐙爧")){ // return true // } -// if(type.toString().contains("双拼")){ +// if(type.toString().contains("鍙屾嫾")){ // return true // } return false diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataexport/FangguguExport.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataexport/FangguguExport.groovy index 57e8227db..c4d85aa54 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataexport/FangguguExport.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataexport/FangguguExport.groovy @@ -19,10 +19,10 @@ class FangguguExport{ districtFromFanghao() } /** - * 从房号库中提取小区 + * 浠庢埧鍙峰簱涓彁鍙栧皬鍖� */ private static void districtFromFanghao(){ - def citys = ["福州","厦门","莆田","三明","泉州","漳州","南平","龙岩","宁德"]; + def citys = ["绂忓窞","鍘﹂棬","鑾嗙敯","涓夋槑","娉夊窞","婕冲窞","鍗楀钩","榫欏博","瀹佸痉"]; BasicDBObject query = new BasicDBObject(); query.putAt(QueryOperators.NIN, citys); def districtSet = new HashSet() @@ -54,12 +54,12 @@ class FangguguExport{ ExcelUtils.write("D://fangguguExport.xlsx",rows,"fanggugu") } /** - *房估估小区库导出 + *鎴夸及浼板皬鍖哄簱瀵煎嚭 */ private static void fangguguExport(){ def rows = [] int j = 1 - rows.add(["id","城市","区域","小区名","地址"]) + rows.add(["id","鍩庡競","鍖哄煙","灏忓尯鍚�","鍦板潃"]) def findObj = new BasicDBObject("c_date",new BasicDBObject('$ne',null)) FANGGUGU_DIST.find(findObj).batchSize(2000).each {dbObject-> def city = dbObject.city diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataexport/FangguguMapRegion.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataexport/FangguguMapRegion.groovy index 270890cd2..14288569d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataexport/FangguguMapRegion.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataexport/FangguguMapRegion.groovy @@ -9,7 +9,7 @@ import net.sf.json.JSONArray import net.sf.json.JSONObject /** - * 通过城市小区名到三个地图映射小区区域 + * 閫氳繃鍩庡競灏忓尯鍚嶅埌涓変釜鍦板浘鏄犲皠灏忓尯鍖哄煙 * Created by lixue on 2017/8/1. */ class FangguguMapRegion{ @@ -18,7 +18,7 @@ class FangguguMapRegion{ // doSomething() for(int i = 3; i<=5; i++){ def filename = "D:\\fanggugu"+i+".xlsx" - println("开始跑第"+i+"个excel。。。。") + println("寮�濮嬭窇绗�"+i+"涓猠xcel銆傘�傘�傘��") yungujiaMap(filename) } } @@ -40,7 +40,7 @@ class FangguguMapRegion{ rows['F'] = beanGaode.address } rows['G'] = beanGaode.type - rows['H'] = "高德" + rows['H'] = "楂樺痉" }else { def beanBaidu = getBaiDuData(city, name) if(beanBaidu!=null&&beanBaidu.size()>0){ @@ -50,7 +50,7 @@ class FangguguMapRegion{ rows['F'] = beanBaidu.address } rows['G'] = beanBaidu.type - rows['H'] = "百度" + rows['H'] = "鐧惧害" }else { def beanTengxun = UpdateDistrictLocation.getLocationByTengXunApi(city, name, null, null) if(beanTengxun!=null){ @@ -60,7 +60,7 @@ class FangguguMapRegion{ rows['F'] = beanTengxun.address } rows['G'] = beanTengxun.type - rows['H'] = "腾讯" + rows['H'] = "鑵捐" } } } @@ -88,7 +88,7 @@ class FangguguMapRegion{ rows['S'] = beanBaidu.type } if(beanGaode!=null){ -// println("高德:"+beanGaode.district) +// println("楂樺痉锛�"+beanGaode.district) rows['L'] = beanGaode.district rows['M'] = beanGaode.name if(beanGaode.address){ @@ -98,7 +98,7 @@ class FangguguMapRegion{ rows['O'] = beanGaode.type } if(beanTengxun!=null){ -// println("腾讯:"+beanTengxun.district) +// println("鑵捐锛�"+beanTengxun.district) rows['T'] = beanTengxun.district rows['U'] = beanTengxun.name if(beanTengxun.address){ @@ -117,7 +117,7 @@ class FangguguMapRegion{ DBObject query = new BasicDBObject("city", city).append("name", disName) DBObject mapdata = UpdateDistrictLocation.mapdata_coll.findOne(query) //if(mapdata == null) { - JSONObject json = BaiDuApiUtils.search(city, disName, "小区", 2, 20, 0) + JSONObject json = BaiDuApiUtils.search(city, disName, "灏忓尯", 2, 20, 0) if(json.getInt("status") == 0) { JSONArray array = json.get("results") if(array) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataexport/MapRegion.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataexport/MapRegion.groovy index d44f72ca4..568153f8a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataexport/MapRegion.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataexport/MapRegion.groovy @@ -15,7 +15,7 @@ import java.util.concurrent.ExecutorService import java.util.concurrent.Executors /** - * 通过城市小区名到三个地图映射小区区域 + * 閫氳繃鍩庡競灏忓尯鍚嶅埌涓変釜鍦板浘鏄犲皠灏忓尯鍖哄煙 * Created by lixue on 2017/8/1. */ class MapRegion{ @@ -47,7 +47,7 @@ class MapRegion{ rows['AF'] = beanBaidu.type } if(beanGaode!=null){ -// println("高德:"+beanGaode.district) +// println("楂樺痉锛�"+beanGaode.district) rows['Y'] = beanGaode.district rows['Z'] = beanGaode.name if(beanGaode.address){ @@ -57,7 +57,7 @@ class MapRegion{ rows['AB'] = beanGaode.type } if(beanTengxun!=null){ -// println("腾讯:"+beanTengxun.district) +// println("鑵捐锛�"+beanTengxun.district) rows['AG'] = beanTengxun.district rows['AH'] = beanTengxun.name if(beanTengxun.address){ @@ -76,7 +76,7 @@ class MapRegion{ DBObject query = new BasicDBObject("city", city).append("name", disName) DBObject mapdata = UpdateDistrictLocation.mapdata_coll.findOne(query) //if(mapdata == null) { - JSONObject json = BaiDuApiUtils.search(city, disName, "小区", 2, 20, 0) + JSONObject json = BaiDuApiUtils.search(city, disName, "灏忓尯", 2, 20, 0) if(json.getInt("status") == 0) { JSONArray array = json.get("results") if(array) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataexport/RegionRentExport.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataexport/RegionRentExport.groovy index 5a07edb66..5c67debc9 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataexport/RegionRentExport.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataexport/RegionRentExport.groovy @@ -17,7 +17,7 @@ class RegionRentExport{ regionRent() } private static regionRent(){ - def citys = ["北京","上海","长沙","成都"] + def citys = ["鍖椾含","涓婃捣","闀挎矙","鎴愰兘"] def startTime = StrToDate("2013-01-01") // def endTime = StrToDate("2017-07-23") for(def city : citys){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataexport/SampleMatchHouse.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataexport/SampleMatchHouse.groovy index 874298ac3..22c92245e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataexport/SampleMatchHouse.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataexport/SampleMatchHouse.groovy @@ -13,7 +13,7 @@ import java.text.ParseException import java.text.SimpleDateFormat /** - * 提取样本房源库中的小区与154小区库做精准匹配 + * 鎻愬彇鏍锋湰鎴挎簮搴撲腑鐨勫皬鍖轰笌154灏忓尯搴撳仛绮惧噯鍖归厤 * Created by lixue on 2017/7/26. */ class SampleMatchHouse{ @@ -57,12 +57,12 @@ class SampleMatchHouse{ if(findOne==null){ findOne = DbUtils.findOneOnSeaweed(new BasicDBObject("city",city).append("region", region).append("alias", name).append('cat','district').append('visible',0),seaweedObject) if(findOne!=null) { - //别名匹配成功 + //鍒悕鍖归厤鎴愬姛 success.save(new BasicDBObject("_id",findOne._id).append("city",value.city).append("region",value.region) .append("name",value.district_name).append("address",value.address).append("estate_type",value.estate_type) .append("xiaoqucity",findOne.city).append("xiaoquregion",findOne.region).append("xiaoquname",findOne.name).append("xiaoquaddr",findOne.address)) }else { - //模糊匹配 + //妯$硦鍖归厤 // def dboname = OpenApiClient.addressMatch(city, name, 'district',false,region) // if(dboname.credit > 0){ // DBObject q1 = new BasicDBObject() @@ -72,7 +72,7 @@ class SampleMatchHouse{ .append("name",name).append("address",value.address).append("estate_type",value.estate_type)) } }else{ - //主名匹配成功 + //涓诲悕鍖归厤鎴愬姛 success.save(new BasicDBObject("_id",findOne._id).append("city",value.city).append("region",value.region) .append("name",value.district_name).append("address",value.address).append("estate_type",value.estate_type) .append("xiaoqucity",findOne.city).append("xiaoquregion",findOne.region).append("xiaoquname",findOne.name) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataexport/SampleMatchHouseOptimize.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataexport/SampleMatchHouseOptimize.groovy index 433c06959..62169a234 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataexport/SampleMatchHouseOptimize.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataexport/SampleMatchHouseOptimize.groovy @@ -13,9 +13,9 @@ import java.text.ParseException import java.text.SimpleDateFormat /** - * 提取样本房源库中的小区与154小区库做精准匹配 + * 鎻愬彇鏍锋湰鎴挎簮搴撲腑鐨勫皬鍖轰笌154灏忓尯搴撳仛绮惧噯鍖归厤 * Created by lixue on 2017/7/26. - * 优化代码 + * 浼樺寲浠g爜 */ class SampleMatchHouseOptimize{ public static final DBCollection success = MongoUtils.getCollectionByName("fangjia", "success", "192.168.0.61") @@ -69,14 +69,14 @@ class SampleMatchHouseOptimize{ def region = key.split("_")[1] def name = key.split("_")[2] if(districtMap.containsKey(key)){ - //精确匹配成功 + //绮剧‘鍖归厤鎴愬姛 def districtObj = districtMap.get(key) success.save(new BasicDBObject("_id",districtObj._id).append("city",value.city).append("region",value.region) .append("name",value.district_name).append("address",value.address).append("estate_type",value.estate_type) .append("xiaoqucity",districtObj.city).append("xiaoquregion",districtObj.region).append("xiaoquname",districtObj.name).append("xiaoquaddr",districtObj.address)) }else { - //模糊匹配 + //妯$硦鍖归厤 failed.save(new BasicDBObject("city",city).append("region",region) .append("name",name).append("address",value.address).append("estate_type",value.estate_type)) } @@ -95,7 +95,7 @@ class SampleMatchHouseOptimize{ def name = dbObject.name def region = dbObject.region region = RegionData.formatRegion(city,region) - //模糊匹配 + //妯$硦鍖归厤 if(RegionData.isRegion(city,region)) { def dboname = OpenApiClient.addressMatch(city, name, 'district', false, region) if (dboname.credit > 0) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataexport/YunGujiaSplit.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataexport/YunGujiaSplit.groovy index 7978c75b2..6eedca835 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataexport/YunGujiaSplit.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataexport/YunGujiaSplit.groovy @@ -17,7 +17,7 @@ class YunGujiaSplit{ } private static void yunfugjiaSplit(){ int j = 1 - def findObj = new BasicDBObject("city","福州") + def findObj = new BasicDBObject("city","绂忓窞") YUNGUJIA_PRO.find().each {dbObject-> def c_date = dbObject.c_date diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataexport/YungujiaExport.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataexport/YungujiaExport.groovy index 74284593c..89bafec4e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataexport/YungujiaExport.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataexport/YungujiaExport.groovy @@ -8,7 +8,7 @@ import com.mongodb.DBCollection import org.apache.commons.lang.StringUtils /** - * 云估价,房估估,厦门和福州房号库导出 + * 浜戜及浠凤紝鎴夸及浼帮紝鍘﹂棬鍜岀宸炴埧鍙峰簱瀵煎嚭 * Created by lixue on 2017/8/8. */ class YungujiaExport{ @@ -22,15 +22,15 @@ class YungujiaExport{ fangguguExport() } private static void fangguguFormat(){ - FANGGUGU_DATA.find(new BasicDBObject("city","厦门"),new BasicDBObject("districtFullName_en",1).append("")).each {dbObject-> + FANGGUGU_DATA.find(new BasicDBObject("city","鍘﹂棬"),new BasicDBObject("districtFullName_en",1).append("")).each {dbObject-> } } private static void fangguguExport(){ def rows = [] int j = 1 - rows.add(["id","城市","区域","小区名","地址"]) - def filename = "D://房估估福州厦门数据.xlsx" + rows.add(["id","鍩庡競","鍖哄煙","灏忓尯鍚�","鍦板潃"]) + def filename = "D://鎴夸及浼扮宸炲帵闂ㄦ暟鎹�.xlsx" ExcelUtils.modify(filename, { List row -> def city = row['B'] def region = row['C'] @@ -46,15 +46,15 @@ class YungujiaExport{ } }) -// def filename = "D://房估估_福州.xlsx" +// def filename = "D://鎴夸及浼癬绂忓窞.xlsx" // def sheet = "sheet" // ExcelUtils.write(filename,rows,sheet) } private static void yungujiaExport(){ def rows = [] int j = 1 - rows.add(["id","城市","区域","小区名","地址"]) - YUNGUJIA_PRO.find(new BasicDBObject("city","厦门")).each { dbObject-> + rows.add(["id","鍩庡競","鍖哄煙","灏忓尯鍚�","鍦板潃"]) + YUNGUJIA_PRO.find(new BasicDBObject("city","鍘﹂棬")).each { dbObject-> def city = dbObject.city def detail = dbObject.detail if(detail){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataimport/DealPriceImport.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataimport/DealPriceImport.groovy index 138f20f59..2752695c0 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataimport/DealPriceImport.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataimport/DealPriceImport.groovy @@ -11,7 +11,7 @@ import com.mongodb.DBCollection import org.apache.commons.lang.StringUtils /** - * 功能说明: + * 鍔熻兘璇存槑: */ @BatchOwner(Watcher.LiXue) class DealPriceImport extends BaseBatch { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataimport/FangguguImport.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataimport/FangguguImport.groovy index c67812381..d45336d2d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataimport/FangguguImport.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataimport/FangguguImport.groovy @@ -40,7 +40,7 @@ class FangguguImport{ def addr_alias = [] def flag = rows['Q'] - if(flag&&flag=="不同"&&rname!=null){ + if(flag&&flag=="涓嶅悓"&&rname!=null){ def find = DbUtils.findOneOnSeaweed(DbUtils.buildSeaweedQuery(fcity,fregion,fname)) if(find){ def updateobj = new BasicDBObject() @@ -62,7 +62,7 @@ class FangguguImport{ }) } /** - * 房估估对小区库更新操作 + * 鎴夸及浼板灏忓尯搴撴洿鏂版搷浣� */ private static void fangguguUpdateSeaweed(){ def filename = "D:\\fanggugu3.xlsx" @@ -81,21 +81,21 @@ class FangguguImport{ def addr_alias = [] def caozuo = rows['P'] - if(caozuo.contains("(地址)")){ + if(caozuo.contains("(鍦板潃)")){ kregion = rows['K'] kname = rows['L'] kaddress = rows['M'] } def find = null def update = new BasicDBObject() - if(caozuo.contains("地址")||caozuo.contains("名称")) { - find = DbUtils.findOneOnSeaweed(DbUtils.buildSeaweedQuery(fcity, kregion, kname).append("address", kaddress)) //按照城市、区域、小区名、地址查询 + if(caozuo.contains("鍦板潃")||caozuo.contains("鍚嶇О")) { + find = DbUtils.findOneOnSeaweed(DbUtils.buildSeaweedQuery(fcity, kregion, kname).append("address", kaddress)) //鎸夌収鍩庡競銆佸尯鍩熴�佸皬鍖哄悕銆佸湴鍧�鏌ヨ if (find == null) { - find = DbUtils.findOneOnSeaweed(DbUtils.buildSeaweedQuery().append("city", fcity).append("region", kregion).append("alias", kname)) //按照城市、区域、别名查询 + find = DbUtils.findOneOnSeaweed(DbUtils.buildSeaweedQuery().append("city", fcity).append("region", kregion).append("alias", kname)) //鎸夌収鍩庡競銆佸尯鍩熴�佸埆鍚嶆煡璇� if (find == null) { - find = DbUtils.findOneOnSeaweed(DbUtils.buildSeaweedQuery().append("city", fcity).append("region", kregion).append("address",kaddress)) //按照城市、区域、地址查询 + find = DbUtils.findOneOnSeaweed(DbUtils.buildSeaweedQuery().append("city", fcity).append("region", kregion).append("address",kaddress)) //鎸夌収鍩庡競銆佸尯鍩熴�佸湴鍧�鏌ヨ if(find == null){ - find = DbUtils.findOneOnSeaweed(DbUtils.buildSeaweedQuery().append("city", fcity).append("name", kname)) //按照城市、名称查询 + find = DbUtils.findOneOnSeaweed(DbUtils.buildSeaweedQuery().append("city", fcity).append("name", kname)) //鎸夌収鍩庡競銆佸悕绉版煡璇� } } } @@ -105,8 +105,8 @@ class FangguguImport{ addr_alias = find.addr_alias def address = find.address def name = find.name - if(caozuo.contains("名称别名")){ - if(alias&&!alias.contains(fname)&&name!=fname) { // 名称和名称别名中都不包含房估估名称 + if(caozuo.contains("鍚嶇О鍒悕")){ + if(alias&&!alias.contains(fname)&&name!=fname) { // 鍚嶇О鍜屽悕绉板埆鍚嶄腑閮戒笉鍖呭惈鎴夸及浼板悕绉� alias.add(fname) }else if(!alias&&name!=fname){ alias = [] @@ -116,16 +116,16 @@ class FangguguImport{ update.append("alias",alias) } } - if(caozuo.contains("地址别名")){ - if(faddress.contains(",")){ //包含多个地址 + if(caozuo.contains("鍦板潃鍒悕")){ + if(faddress.contains(",")){ //鍖呭惈澶氫釜鍦板潃 def arr = faddress.split(",") for(int i = 1;i0){ - rows['V'] = "是" + rows['V'] = "鏄�" println([fcity,fregion,fname,"-",kregion,kname,kaddress,"-",find.region,find.name,find.address,caozuo]) println(update) DbUtils.executeUpdateOnSeaweed(new BasicDBObject("_id",find._id),update) } }else { - rows['V'] = "不存在" + rows['V'] = "涓嶅瓨鍦�" } } }) } private static void fangguguImport(){ - def filename = "D:\\房估估接口匹配.xlsx" + def filename = "D:\\鎴夸及浼版帴鍙e尮閰�.xlsx" ExcelUtils.modify(filename , { List rows -> def fcity = rows['B'] def fregion = rows['C'] @@ -164,25 +164,25 @@ class FangguguImport{ def caozuo = rows['K'] - if(caozuo.toString().equals("新增")) { + if(caozuo.toString().equals("鏂板")) { def kregion = rows['M'] def kname = rows['N'] def kaddress = rows['O'] kregion = RegionData.formatRegion(fcity, kregion) def estate = rows['L'] if (estate == null) { - if (fname.contains("别墅")) { - estate = "别墅" + if (fname.contains("鍒")) { + estate = "鍒" } - if (fname.contains("商住")) { + if (fname.contains("鍟嗕綇")) { if (!estate) { - estate = "商住" + estate = "鍟嗕綇" } else { - estate = "商住/别墅" + estate = "鍟嗕綇/鍒" } } if (!estate) { - estate = "普通住宅" + estate = "鏅�氫綇瀹�" } } def dbObj = new BasicDBObject("cat", "district") @@ -210,23 +210,23 @@ class FangguguImport{ sleep(2000) find = DbUtils.findOneOnSeaweed(new BasicDBObject("_id",dbObj._id)) } - println("保存成功.....") - rows['S'] = "是" + println("淇濆瓨鎴愬姛.....") + rows['S'] = "鏄�" } else { - rows['S'] = "存在" + rows['S'] = "瀛樺湪" } } else { - rows['S'] = "存在" + rows['S'] = "瀛樺湪" } } else { - rows['S'] = "存在" + rows['S'] = "瀛樺湪" } } } }) } /** - * 房估估对小区库新增操作 + * 鎴夸及浼板灏忓尯搴撴柊澧炴搷浣� */ private static void fangguguToSeaweed(){ @@ -269,20 +269,20 @@ class FangguguImport{ def caozuo = rows['P'] // println(caozuo) - if(caozuo.toString().contains("新增")){ + if(caozuo.toString().contains("鏂板")){ def estate = null - if(fname.contains("别墅")){ - estate = "别墅" + if(fname.contains("鍒")){ + estate = "鍒" } - if(fname.contains("商住")){ + if(fname.contains("鍟嗕綇")){ if(!estate) { - estate = "商住" + estate = "鍟嗕綇" }else { - estate = "商住/别墅" + estate = "鍟嗕綇/鍒" } } if(!estate){ - estate = "普通住宅" + estate = "鏅�氫綇瀹�" } def dbObj = new BasicDBObject("cat","district") dbObj.put("city",fcity) @@ -314,23 +314,23 @@ class FangguguImport{ sleep(2000) find = DbUtils.findOneOnSeaweed(new BasicDBObject("_id",dbObj._id)) } - println("保存成功.....") - rows['V'] = "是" + println("淇濆瓨鎴愬姛.....") + rows['V'] = "鏄�" }else { - rows['V'] = "存在" + rows['V'] = "瀛樺湪" } }else { - rows['V'] = "存在" + rows['V'] = "瀛樺湪" } }else { - rows['V'] = "存在" + rows['V'] = "瀛樺湪" } } }) } /** - * 入房号库 + * 鍏ユ埧鍙峰簱 */ public static void mongodb_ToDealPrice() { STAT_COLL.find().addOption(Bytes.QUERYOPTION_NOTIMEOUT).each { dbObject -> diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataimport/FangguguOtherImport.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataimport/FangguguOtherImport.groovy index bd77dc544..805e0f8de 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataimport/FangguguOtherImport.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataimport/FangguguOtherImport.groovy @@ -115,7 +115,7 @@ class FangguguOtherImport{ }) } private static void count(){ - def citys = ["无锡","南京","苏州","常州","南通","泰州","盐城","徐州","镇江","扬州","连云港"] + def citys = ["鏃犻敗","鍗椾含","鑻忓窞","甯稿窞","鍗楅��","娉板窞","鐩愬煄","寰愬窞","闀囨睙","鎵窞","杩炰簯娓�"] def filename = "D:\\fangguguothercount.xlsx" for(def city : citys){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataimport/InCreaseYungujia.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataimport/InCreaseYungujia.groovy index 51dd7b8f7..55827b68e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataimport/InCreaseYungujia.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataimport/InCreaseYungujia.groovy @@ -7,7 +7,7 @@ import com.mongodb.BasicDBObject import com.mongodb.DBObject /** - * 对云估价未匹配数据进行新增操作,并对新增数据标记上云估价标签 + * 瀵逛簯浼颁环鏈尮閰嶆暟鎹繘琛屾柊澧炴搷浣滐紝骞跺鏂板鏁版嵁鏍囪涓婁簯浼颁环鏍囩 * Created by lixue on 2017/8/1. */ class InCreaseYungujia{ @@ -59,7 +59,7 @@ class InCreaseYungujia{ if(obj2==null){ DbUtils.seaweed.save(obj); println(obj) - println "新增成功"+"********" + println "鏂板鎴愬姛"+"********" } sleep(2000) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataimport/YouFangImport.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataimport/YouFangImport.groovy index 124624847..75deafb57 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataimport/YouFangImport.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataimport/YouFangImport.groovy @@ -69,7 +69,7 @@ class YouFangImport{ return date; } private static void youfangImport(){ - def filename = "D:\\优房闪贷数据_只__技术入库1.xlsx" + def filename = "D:\\浼樻埧闂捶鏁版嵁_鍙猒_鎶�鏈叆搴�1.xlsx" modify(filename, { List row -> def city = row['A'] def region = row['B'] @@ -79,8 +79,8 @@ class YouFangImport{ if(row['E']!=null){ address = row['E'] } - address = address.toString().replaceAll(";",",").replaceAll(",",",") - def flag = row['K']//名称别名,新增,地址别名,地址替换,名称别名,地址别名,名称别名,地址替换,地址别名 + address = address.toString().replaceAll("锛�",",").replaceAll("锛�",",") + def flag = row['K']//鍚嶇О鍒悕,鏂板,鍦板潃鍒悕,鍦板潃鏇挎崲,鍚嶇О鍒悕锛屽湴鍧�鍒悕,鍚嶇О鍒悕锛屽湴鍧�鏇挎崲,鍦板潃鍒悕 if(flag){ def kuregion = row['G'] @@ -90,16 +90,16 @@ class YouFangImport{ def estate = null def dbObj = new BasicDBObject("cat","district") - if(flag.toString().equals("新增")){ + if(flag.toString().equals("鏂板")){ - if(name.contains("别墅")){ - estate = "别墅" + if(name.contains("鍒")){ + estate = "鍒" } - if(name.contains("商住")){ - estate = "商住" + if(name.contains("鍟嗕綇")){ + estate = "鍟嗕綇" } if(!estate){ - estate = "普通住宅" + estate = "鏅�氫綇瀹�" } dbObj.put("city",city) dbObj.put("region",region) @@ -135,7 +135,7 @@ class YouFangImport{ DbUtils.seaweed.save(dbObj) } // sleep(2000) - }else if(flag.toString().contains("名称别名")){ + }else if(flag.toString().contains("鍚嶇О鍒悕")){ def findOne = DbUtils.seaweed.findOne(findobj) def updateObj = new BasicDBObject() if(kuname==null){ @@ -188,7 +188,7 @@ class YouFangImport{ } } } - }else if(flag.toString().trim().contains("地址别名")){ + }else if(flag.toString().trim().contains("鍦板潃鍒悕")){ def addrupdateObj = new BasicDBObject() if(kuname==null){ return @@ -256,7 +256,7 @@ class YouFangImport{ } } - }else if(flag.toString().contains("地址替换")){ + }else if(flag.toString().contains("鍦板潃鏇挎崲")){ def replaceObj = new BasicDBObject() def find = DbUtils.findOneOnSeaweed(findobj) if(find) { @@ -299,7 +299,7 @@ class YouFangImport{ //def address = row['E'] def findobj = new BasicDBObject(DbUtils.buildSeaweedQuery(city,kuregion,kuname)) - if(flag.toString().contains("名称别名")) { + if(flag.toString().contains("鍚嶇О鍒悕")) { def findOne = DbUtils.seaweed.findOne(findobj) def updateObj = new BasicDBObject() if (kuname == null) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataimport/YunGujiaFanghaoImport.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataimport/YunGujiaFanghaoImport.groovy index 13cbfec8b..c8070c08c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataimport/YunGujiaFanghaoImport.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataimport/YunGujiaFanghaoImport.groovy @@ -68,7 +68,7 @@ class YunGujiaFanghaoImport { roomNumber = StringUtils.substringBefore(roomNumber, ".") } - String source = "房估估" + String source = "鎴夸及浼�" def date = new Date() def mdate = new Date() HouseLoudong houseLoudng = new HouseLoudong() @@ -116,10 +116,10 @@ class YunGujiaFanghaoImport { DBObject findOne = LouDong.findOne(query) if (findOne == null) { LouDong.insert(saveObj) - FANGGUGU2.update(new BasicDBObject("_id",dbObj._id),new BasicDBObject('$set',new BasicDBObject("flag","入库")),false,false) + FANGGUGU2.update(new BasicDBObject("_id",dbObj._id),new BasicDBObject('$set',new BasicDBObject("flag","鍏ュ簱")),false,false) j++ }else { - FANGGUGU2.update(new BasicDBObject("_id",dbObj._id),new BasicDBObject('$set',new BasicDBObject("flag","去重")),false,false) + FANGGUGU2.update(new BasicDBObject("_id",dbObj._id),new BasicDBObject('$set',new BasicDBObject("flag","鍘婚噸")),false,false) } if (j % 1000 == 0) { println(j+" "+new Date()) @@ -128,7 +128,7 @@ class YunGujiaFanghaoImport { } } private static void fangguguSid(){ - def filename = "D://lx//房估估第二次接口匹配.xlsx" + def filename = "D://lx//鎴夸及浼扮浜屾鎺ュ彛鍖归厤.xlsx" int j = 1 ExcelUtils.modify(filename, { List row -> def city = row['B'] @@ -152,13 +152,13 @@ class YunGujiaFanghaoImport { updateObj.append("status", 0) FANGGUGU2.update(findObj, new BasicDBObject('$set', updateObj), false, true) println(j++) - row['V'] = "是" + row['V'] = "鏄�" } } }) } private static void fangguguImport(){ - def filename = "D://房估估-福州厦门匹配.xlsx" + def filename = "D://鎴夸及浼�-绂忓窞鍘﹂棬鍖归厤.xlsx" int j = 1 ExcelUtils.modify(filename, { List row -> def city = row['A'] @@ -171,7 +171,7 @@ class YunGujiaFanghaoImport { def kname = row['J'] def find = FANGGUGU2.count(new BasicDBObject("city",city).append("region",region).append("name",name)) if(find>0){ - row['K'] = "是" + row['K'] = "鏄�" try { FANGGUGU2.find(new BasicDBObject("city", city).append("region", region).append("name", name)).each { dbObj -> city = dbObj.city @@ -191,7 +191,7 @@ class YunGujiaFanghaoImport { roomNumber = StringUtils.substringBefore(roomNumber, ".") } - String source = "房估估" + String source = "鎴夸及浼�" def date = new Date() def mdate = new Date() com.fangjia.script.linxsh.util.entity.HouseLoudong houseLoudng = new com.fangjia.script.linxsh.util.entity.HouseLoudong() @@ -251,11 +251,11 @@ class YunGujiaFanghaoImport { return -1 } def roomMap = new HashMap() - roomMap.put("一",1) - roomMap.put("二",2) - roomMap.put("三",3) - roomMap.put("四",4) - roomMap.put("五",5) + roomMap.put("涓�",1) + roomMap.put("浜�",2) + roomMap.put("涓�",3) + roomMap.put("鍥�",4) + roomMap.put("浜�",5) for(def key : roomMap.keySet()){ if(room.toString().contains(key)){ return roomMap.get(key) @@ -264,10 +264,10 @@ class YunGujiaFanghaoImport { return -1 } /** - * 云估价小区ID跑出 + * 浜戜及浠峰皬鍖篒D璺戝嚭 */ private static void districtId(){ - def filename = "D://云估价-福州匹配.xlsx" + def filename = "D://浜戜及浠�-绂忓窞鍖归厤.xlsx" int j = 1 ExcelUtils.modify(filename, { List row -> def city = row['B'] diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataimport/YunGujiaImport.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataimport/YunGujiaImport.groovy index 2b6a4174b..ed5db7557 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataimport/YunGujiaImport.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataimport/YunGujiaImport.groovy @@ -18,7 +18,7 @@ class YunGujiaImport{ private static void yungujiaImport2(){ - def filename = "D:\\云估价未匹配处理2.xlsx" + def filename = "D:\\浜戜及浠锋湭鍖归厤澶勭悊2.xlsx" ExcelUtils.modify(filename, { List row -> def city = row['A'] def region = row['B'] @@ -42,19 +42,19 @@ class YunGujiaImport{ .append("region",kuregion).append("name",kuname) def flag = row['N'] - //新增,名称别名 + //鏂板,鍚嶇О鍒悕 // def dbObj = new BasicDBObject("cat","district") -// if(flag.toString().equals("新增")){ +// if(flag.toString().equals("鏂板")){ // -// if(name.contains("别墅")){ -// estate = "别墅" +// if(name.contains("鍒")){ +// estate = "鍒" // } -// if(name.contains("商住")){ -// estate = "商住" +// if(name.contains("鍟嗕綇")){ +// estate = "鍟嗕綇" // } // if(!estate){ -// estate = "普通住宅" +// estate = "鏅�氫綇瀹�" // } // dbObj.put("city",city) // dbObj.put("region",region) @@ -82,7 +82,7 @@ class YunGujiaImport{ // } def updateObj = new BasicDBObject() - if(flag.toString().equals("名称别名")){ + if(flag.toString().equals("鍚嶇О鍒悕")){ if(kuname==null){ return } @@ -166,7 +166,7 @@ class YunGujiaImport{ }) } private static void yungujiaImport(){ - def filename = "D:\\云估价未匹配处理1.xlsx" + def filename = "D:\\浜戜及浠锋湭鍖归厤澶勭悊1.xlsx" ExcelUtils.modify(filename, { List row -> def city = row['A'] def region = row['B'] @@ -190,10 +190,10 @@ class YunGujiaImport{ .append("region",kuregion).append("name",kuname).append("address",kuaddress) def flag = row['R'] - //新增,名称别名,地址别名,无效,地址替换,无需操作 + //鏂板,鍚嶇О鍒悕,鍦板潃鍒悕,鏃犳晥,鍦板潃鏇挎崲,鏃犻渶鎿嶄綔 def dbObj = new BasicDBObject("cat","district") - if(flag.toString().equals("新增")){ + if(flag.toString().equals("鏂板")){ dbObj.put("city",city) dbObj.put("region",region) @@ -225,7 +225,7 @@ class YunGujiaImport{ } def updateObj = new BasicDBObject() - if(flag.toString().equals("名称别名")){ + if(flag.toString().equals("鍚嶇О鍒悕")){ if(kuname==null){ return } @@ -290,7 +290,7 @@ class YunGujiaImport{ } def addrupdateObj = new BasicDBObject() - if(flag.toString().equals("地址别名")){ + if(flag.toString().equals("鍦板潃鍒悕")){ if(kuname==null){ return } @@ -336,7 +336,7 @@ class YunGujiaImport{ } def replaceObj = new BasicDBObject() - if(flag.toString().equals("地址替换")) { + if(flag.toString().equals("鍦板潃鏇挎崲")) { def find = DbUtils.findOneOnSeaweed(findOne) if(find) { if(address) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataimport/YungujiaMatchImport.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataimport/YungujiaMatchImport.groovy index caeca1d70..9fad63afa 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataimport/YungujiaMatchImport.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataimport/YungujiaMatchImport.groovy @@ -9,7 +9,7 @@ import com.fangjia.script.util.ExcelUtils import com.mongodb.BasicDBObject /** - * 功能说明: + * 鍔熻兘璇存槑: */ @BatchOwner(Watcher.LiXue) class YungujiaMatchImport extends BaseBatch { @@ -30,7 +30,7 @@ class YungujiaMatchImport extends BaseBatch { def address = rows['L'] region = RegionData.formatRegion(city,region) - if(city && region && name && caozuo.contains("别名")) { + if(city && region && name && caozuo.contains("鍒悕")) { def findOne = DbUtils.findOneOnSeaweed(DbUtils.buildSeaweedQuery(city, region, name)) if (findOne == null) { findOne = DbUtils.findOneOnSeaweed(new BasicDBObject("city", city).append("region", region).append("alias", name).append('cat', 'district').append('visible', 0)) @@ -50,21 +50,21 @@ class YungujiaMatchImport extends BaseBatch { }else { addrAlia.add(address) } - rows['N'] = "是" + rows['N'] = "鏄�" DbUtils.executeUpdateOnSeaweed(new BasicDBObject("_id", findOne._id), new BasicDBObject("addr_alias",addrAlia)) } } - if(city && region && name && caozuo.equals("替换")) { + if(city && region && name && caozuo.equals("鏇挎崲")) { def findOne = DbUtils.findOneOnSeaweed(DbUtils.buildSeaweedQuery(city, region, name)) if (findOne == null) { findOne = DbUtils.findOneOnSeaweed(new BasicDBObject("city", city).append("region", region).append("alias", name).append('cat', 'district').append('visible', 0)) } if (findOne) { - rows['N'] = "是" + rows['N'] = "鏄�" DbUtils.executeUpdateOnSeaweed(new BasicDBObject("_id", findOne._id), new BasicDBObject("address",address)) } } - if(city && region && name && caozuo.equals("替换/模糊")) { + if(city && region && name && caozuo.equals("鏇挎崲/妯$硦")) { def findOne = DbUtils.findOneOnSeaweed(DbUtils.buildSeaweedQuery(city, region, name)) if (findOne == null) { findOne = DbUtils.findOneOnSeaweed(new BasicDBObject("city", city).append("region", region).append("alias", name).append('cat', 'district').append('visible', 0)) @@ -84,7 +84,7 @@ class YungujiaMatchImport extends BaseBatch { addrAlia.add(addrs[i]) } } - rows['N'] = "是" + rows['N'] = "鏄�" DbUtils.executeUpdateOnSeaweed(new BasicDBObject("_id", findOne._id), new BasicDBObject("address", addrs[0]).append("addr_alias",addrAlia)) } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataimport/ZheShangBankImport.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataimport/ZheShangBankImport.groovy index 354219536..b88135041 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataimport/ZheShangBankImport.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataimport/ZheShangBankImport.groovy @@ -24,7 +24,7 @@ class ZheShangBankImport{ // addressExport() } private static void allAlias(){ - ExcelUtils.read("D:\\锟斤拷锟斤拷锟斤拷锟狡碉拷址锟斤拷锟斤拷.xlsx").each { List item -> + ExcelUtils.read("D:\\閿熸枻鎷烽敓鏂ゆ嫹閿熸枻鎷烽敓鐙$鎷峰潃閿熸枻鎷烽敓鏂ゆ嫹.xlsx").each { List item -> if (StringUtils.isBlank(item["C"])) { return } @@ -54,7 +54,7 @@ class ZheShangBankImport{ } } private static void addrAliasIncrease(){ - ExcelUtils.read("D:\\锟斤拷锟教碉拷址锟斤拷锟斤拷.xlsx").each { List item -> + ExcelUtils.read("D:\\閿熸枻鎷烽敓鏁欑鎷峰潃閿熸枻鎷烽敓鏂ゆ嫹.xlsx").each { List item -> if(StringUtils.isBlank(item["C"])){ return } @@ -94,7 +94,7 @@ class ZheShangBankImport{ } } private static void nameAliasIncrease(){ - ExcelUtils.read("D:\\浙商名称别名.xlsx").each { List item -> + ExcelUtils.read("D:\\娴欏晢鍚嶇О鍒悕.xlsx").each { List item -> if(StringUtils.isBlank(item["C"])){ return } @@ -158,7 +158,7 @@ class ZheShangBankImport{ } } private static void increaseData(){ - ExcelUtils.read("D:\\锟斤拷锟斤拷锟斤拷锟叫猴拷同锟斤拷锟斤拷锟斤拷锟斤拷锟?.xlsx").each { List item-> + ExcelUtils.read("D:\\閿熸枻鎷烽敓鏂ゆ嫹閿熸枻鎷烽敓鍙尨鎷峰悓閿熸枻鎷烽敓鏂ゆ嫹閿熸枻鎷烽敓鏂ゆ嫹閿�?.xlsx").each { List item-> if(StringUtils.isBlank(item["C"])){ return } @@ -179,7 +179,7 @@ class ZheShangBankImport{ district.estate_type2 = item['G'] Map markMap = new HashMap() district.mark_map = markMap - markMap.put("data_source", "锟斤拷锟斤拷锟斤拷锟?") + markMap.put("data_source", "閿熸枻鎷烽敓鏂ゆ嫹閿熸枻鎷烽敓?") println(district) DbUtils.seaweed.save(district) int lockCount = 0 @@ -187,7 +187,7 @@ class ZheShangBankImport{ println("lock .... seaweed save") Thread.sleep(1000 * 3) if (++lockCount > 30) { - println("" + district + "锟斤拷锟斤拷失锟斤拷!query:" + district.toString()) + println("" + district + "閿熸枻鎷烽敓鏂ゆ嫹澶遍敓鏂ゆ嫹!query:" + district.toString()) break } } @@ -198,7 +198,7 @@ class ZheShangBankImport{ private static void addressExport(){ DBCollection ANALY_DATA = MongoUtils.getCollectionByName("coredata", "analy_road", "coredata.mongo.db.fangjia.com") - ExcelUtils.modify("D:\\云估价未匹配-无地址.xlsx", {List item-> + ExcelUtils.modify("D:\\浜戜及浠锋湭鍖归厤-鏃犲湴鍧�.xlsx", {List item-> def city = item['A'] def region = item['B'] region = RegionData.formatRegion(city,region) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataupdate/AddressUpdate.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataupdate/AddressUpdate.groovy index 9e20fb372..ceef12531 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataupdate/AddressUpdate.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataupdate/AddressUpdate.groovy @@ -34,23 +34,23 @@ class AddressUpdate{ // updateRegionInName() } private static void unitType(def unit){ - String reg = "^[\u4e00-\u9fa5]+\$";//表示+表示一个或多个中文, + String reg = "^[\u4e00-\u9fa5]+\$";//琛ㄧず+琛ㄧず涓�涓垨澶氫釜涓枃锛� String reg1 = "^[a-z]+[0-9]+[A-Z]\u4e00-\u9fa5]+\$" String reg2 = "^[0-9\u4e00-\u9fa5]+\$" String reg3 = "^[a-zA-z\u4e00-\u9fa5]+\$" String reg4 = "^[a-z0-9A-Z]+\$" if(unit.toString().matches(reg)){ - println("纯汉字:"+unit) + println("绾眽瀛�:"+unit) }else if(unit.toString().matches(reg1)){ - println("数字+字母+汉字:"+unit) + println("鏁板瓧+瀛楁瘝+姹夊瓧:"+unit) }else if(unit.toString().matches(reg2)){ - println("数字+汉字:"+unit) + println("鏁板瓧+姹夊瓧:"+unit) }else if(unit.toString().matches(reg3)){ - println("字母+汉字:"+unit) + println("瀛楁瘝+姹夊瓧:"+unit) }else if(unit.toString().matches(reg4)){ - println("数字+字母:"+unit) + println("鏁板瓧+瀛楁瘝:"+unit) }else { - println("其他:"+unit) + println("鍏朵粬:"+unit) } } private static void updateRegionInName(){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataupdate/DistrictBuildTypeUpdate.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataupdate/DistrictBuildTypeUpdate.groovy index e1fd1d244..de9793f89 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataupdate/DistrictBuildTypeUpdate.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataupdate/DistrictBuildTypeUpdate.groovy @@ -8,7 +8,7 @@ import com.fangjia.script.util.ExcelUtils import com.mongodb.BasicDBObject /** - * 功能说明:建筑类型规范:3013 + * 鍔熻兘璇存槑:寤虹瓚绫诲瀷瑙勮寖锛�3013 */ class DistrictBuildTypeUpdate { @@ -19,7 +19,7 @@ class DistrictBuildTypeUpdate { } static void biesu() { - def filename = "D://lx//建筑类型问题小区第三批.xlsx" + def filename = "D://lx//寤虹瓚绫诲瀷闂灏忓尯绗笁鎵�.xlsx" int j = 1 ExcelUtils.modify(filename, { List row -> // println(j++) @@ -35,14 +35,14 @@ class DistrictBuildTypeUpdate { } static String getBuildType(String buildType){ def result = "" - if(buildType.contains("双拼")){ - result += "双拼," + if(buildType.contains("鍙屾嫾")){ + result += "鍙屾嫾," } - if(buildType.contains("独栋")){ - result += "独栋," + if(buildType.contains("鐙爧")){ + result += "鐙爧," } - if(buildType.contains("联排")){ - result += "联排," + if(buildType.contains("鑱旀帓")){ + result += "鑱旀帓," } return result } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataupdate/DistrictEnddateUpdate.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataupdate/DistrictEnddateUpdate.groovy index 515c3d25b..7aebd7547 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataupdate/DistrictEnddateUpdate.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataupdate/DistrictEnddateUpdate.groovy @@ -23,7 +23,7 @@ class DistrictEnddateUpdate { feildObj.append("city",1) feildObj.append("region",1) feildObj.append("name",1) - DbUtils.seaweed.find(DbUtils.buildSeaweedQuery("常州",null,null),feildObj).batchSize(2000).each {dbObj-> + DbUtils.seaweed.find(DbUtils.buildSeaweedQuery("甯稿窞",null,null),feildObj).batchSize(2000).each {dbObj-> def updateObj = new BasicDBObject() def startDate = dbObj.start_building_date def openDate = dbObj.open_date @@ -32,7 +32,7 @@ class DistrictEnddateUpdate { if(finishDate&&istrueTime(finishDate.toString())){ if(liveDate&&istrueTime(liveDate.toString())){ if(StrToDate(finishDate).compareTo(StrToDate(liveDate))<=0){ - //正常 + //姝e父 int j = 0 }else { updateObj.append("finish_building_date",null) @@ -63,8 +63,8 @@ class DistrictEnddateUpdate { + "_" + finishDate + "_" + liveDate + "_" + set) DbUtils.executeUpdateOnSeaweed(new BasicDBObject("_id",dbObj._id),updateObj) // LOUDONG_COLL.insert(new BasicDBObject("city",dbObj.city).append("region",dbObj.region).append("name",dbObj.name) -// .append("开工时间",dbObj.start_building_date).append("开盘时间",dateToStr(dbObj.open_date)) -// .append("竣工时间",finishDate).append("交房时间",liveDate).append("更改字段",set)) +// .append("寮�宸ユ椂闂�",dbObj.start_building_date).append("寮�鐩樻椂闂�",dateToStr(dbObj.open_date)) +// .append("绔e伐鏃堕棿",finishDate).append("浜ゆ埧鏃堕棿",liveDate).append("鏇存敼瀛楁",set)) } } } @@ -78,7 +78,7 @@ class DistrictEnddateUpdate { return (time.toString().matches(regex)); } /** - * 将短时间格式时间转换为字符串 yyyy-MM-dd + * 灏嗙煭鏃堕棿鏍煎紡鏃堕棿杞崲涓哄瓧绗︿覆 yyyy-MM-dd * * @param dateDate * @param k @@ -93,7 +93,7 @@ class DistrictEnddateUpdate { return dateString; } /** - * 字符串转换成日期 + * 瀛楃涓茶浆鎹㈡垚鏃ユ湡 * @param str * @return date */ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataupdate/FangGuanjuUpdate.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataupdate/FangGuanjuUpdate.groovy index 086cb1303..627dd2575 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataupdate/FangGuanjuUpdate.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataupdate/FangGuanjuUpdate.groovy @@ -20,7 +20,7 @@ class FangGuanjuUpdate{ fangguanjuCount() } private static void fangguanjuCount(){ - def path = "D://房管局1" + def path = "D://鎴跨灞�1" def fileList = getAllFiles(path) def count = 0 for (def filename : fileList) { @@ -30,7 +30,7 @@ class FangGuanjuUpdate{ println(filename) filename = filename.toString().replaceAll("\\\\", "//") - //filename = "D://房管局//安康-完成.xlsx" + //filename = "D://鎴跨灞�//瀹夊悍-瀹屾垚.xlsx" ExcelUtils.modify(filename, { List row -> def city = row['B'] def region = row['C'] @@ -38,9 +38,9 @@ class FangGuanjuUpdate{ def kname = row['F'] def sid = row['E'] def id = row['I'] - if (city && region && name && row['H'] == "新增") { + if (city && region && name && row['H'] == "鏂板") { region = RegionData.formatRegion(city, region) - def findObj = new BasicDBObject("city",city).append("region",region).append("name",name).append("from","房管局").append("status",5) + def findObj = new BasicDBObject("city",city).append("region",region).append("name",name).append("from","鎴跨灞�").append("status",5) LOUDONG_COLL.find(findObj).each {dbObj-> def updateObj = new BasicDBObject() updateObj.append("status",1) @@ -57,7 +57,7 @@ class FangGuanjuUpdate{ } private static void fangguanjuUpdate2(){ - def path = "D://房管局" + def path = "D://鎴跨灞�" def fileList = getAllFiles(path) for (def filename : fileList) { @@ -66,7 +66,7 @@ class FangGuanjuUpdate{ } println(filename) filename = filename.toString().replaceAll("\\\\", "//") - //filename = "D://房管局//安康-完成.xlsx" + //filename = "D://鎴跨灞�//瀹夊悍-瀹屾垚.xlsx" ExcelUtils.modify(filename, { List row -> def city = row['B'] def region = row['C'] @@ -74,9 +74,9 @@ class FangGuanjuUpdate{ def kname = row['F'] def sid = row['E'] def id = row['I'] - if (city && region && name && id && sid && kname && row['H'] != "非住宅" && row['H'] != "无效") { + if (city && region && name && id && sid && kname && row['H'] != "闈炰綇瀹�" && row['H'] != "鏃犳晥") { region = RegionData.formatRegion(city, region) - def findObj = new BasicDBObject("city",city).append("region",region).append("name",name).append("from","房管局").append("status",0) + def findObj = new BasicDBObject("city",city).append("region",region).append("name",name).append("from","鎴跨灞�").append("status",0) def feildObj = new BasicDBObject("house_unit",1).append("room_num",1).append("house_area",1) LOUDONG_COLL.find(findObj,feildObj).each {dbObj -> def flag = false @@ -95,7 +95,7 @@ class FangGuanjuUpdate{ if(flag){ def upObj = new BasicDBObject('$set',new BasicDBObject("status",5).append("name_in_seaweed",kname).append("district_no",sid).append("district_id",id)) LOUDONG_COLL.update(new BasicDBObject("_id",dbObj._id),new BasicDBObject('$set',upObj)) - row['J'] = "是" + row['J'] = "鏄�" } } @@ -115,7 +115,7 @@ class FangGuanjuUpdate{ files << tempList[i]; } if (tempList[i].isDirectory()) { - System.out.println("文件夹:" + tempList[i]); + System.out.println("鏂囦欢澶癸細" + tempList[i]); } } return files; @@ -135,10 +135,10 @@ class FangGuanjuUpdate{ // } private static void fangguanjuUpdate(){ def findObj = new BasicDBObject() - findObj.append("form","房管局") + findObj.append("form","鎴跨灞�") findObj.append("status",0) findObj.append("house_num_unit","0") - findObj.append("city","上海") + findObj.append("city","涓婃捣") findObj.append("district_no",new BasicDBObject('$ne',null)) def feildObj = new BasicDBObject() diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataupdate/NameAlias.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataupdate/NameAlias.groovy index 06cf315ac..3bbe0ed77 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataupdate/NameAlias.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataupdate/NameAlias.groovy @@ -18,7 +18,7 @@ class NameAlias{ } private static void nameAliasImport(){ - def filename = "D://浙商名称别名.xlsx" + def filename = "D://娴欏晢鍚嶇О鍒悕.xlsx" ExcelUtils.modify(filename , { List rows -> def city = rows['A'] def region = rows['B'] @@ -52,7 +52,7 @@ class NameAlias{ } private static void district(){ Map map = new HashMap() - def filename = "D://地址相同小区_最新合并_.xlsx" + def filename = "D://鍦板潃鐩稿悓灏忓尯_鏈�鏂板悎骞禵.xlsx" int j = 0 ExcelUtils.modify(filename , { List rows -> def city = rows['A'] @@ -88,20 +88,20 @@ class NameAlias{ } } } - def filename1 = "D://地址相同小区.xlsx" + def filename1 = "D://鍦板潃鐩稿悓灏忓尯.xlsx" def sheet = "addr" ExcelUtils.write(filename1,row,sheet) } private static String formatName(String name) { - name = name.replaceAll("别墅","") - name = name.replaceAll("商住","") - name = name.replaceAll("石之梦","") - name = name.replaceAll("风之声","") - name = name.replaceAll("花之海","") - name = name.replaceAll("六期","") - name = name.replaceAll("七期","") - name = name.replaceAll("之四","") + name = name.replaceAll("鍒","") + name = name.replaceAll("鍟嗕綇","") + name = name.replaceAll("鐭充箣姊�","") + name = name.replaceAll("椋庝箣澹�","") + name = name.replaceAll("鑺变箣娴�","") + name = name.replaceAll("鍏湡","") + name = name.replaceAll("涓冩湡","") + name = name.replaceAll("涔嬪洓","") return name } } \ No newline at end of file diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataupdate/NameUpdate.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataupdate/NameUpdate.groovy index 8d294c329..319a3da75 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataupdate/NameUpdate.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataupdate/NameUpdate.groovy @@ -25,9 +25,9 @@ class NameUpdate{ public static void main(String[] args) { -// def name = "科华街73号" +// def name = "绉戝崕琛�73鍙�" // def f = DataUtil.isPreciseAddress(name) -// def a = name.toString().endsWith("号") +// def a = name.toString().endsWith("鍙�") // println(f+a) districtNameUpdate() // errorNameUpdate() @@ -53,11 +53,11 @@ class NameUpdate{ def address = dbObject.address def updateObj = new BasicDBObject() - if(DataUtil.isPreciseAddress(name)&&name.toString().endsWith("号")){ + if(DataUtil.isPreciseAddress(name)&&name.toString().endsWith("鍙�")){ - updateObj.append("name",name+"小区") + updateObj.append("name",name+"灏忓尯") if(address.toString().equals(name.toString())||(alias&&alias.contains(name.toString()))||(addrAlias&&addrAlias.contains(name.toString()))){ - println("已存在name:"+name) + println("宸插瓨鍦╪ame:"+name) }else { if(alias){ alias.add(name) @@ -65,7 +65,7 @@ class NameUpdate{ alias = [] alias.add(name) } - println("已添加name:"+name) + println("宸叉坊鍔爊ame:"+name) updateObj.append("alias",alias) } println(name+"->"+updateObj.get("name")) @@ -80,8 +80,8 @@ class NameUpdate{ def city = citys.get(i) DbUtils.seaweed.find(DbUtils.buildSeaweedQuery(city),new BasicDBObject("city",1).append("region",1).append("name",1).append("alias",1)).batchSize(2000).each {dbObject-> def name = dbObject.name - if(name.toString().contains("·")){ - def formatname = name.toString().replaceAll("·","") + if(name.toString().contains("路")){ + def formatname = name.toString().replaceAll("路","") def findObj = new BasicDBObject().append("visible", 0).append("cat", "district") findObj.append("city",city) findObj.append("name",formatname) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataupdate/RegionUpdate.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataupdate/RegionUpdate.groovy index b7adbb9d6..6a735d629 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataupdate/RegionUpdate.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataupdate/RegionUpdate.groovy @@ -14,8 +14,8 @@ import java.text.ParseException import java.text.SimpleDateFormat /** - * 区域空缺小区区域映射 - * 重复小区去重 + * 鍖哄煙绌虹己灏忓尯鍖哄煙鏄犲皠 + * 閲嶅灏忓尯鍘婚噸 * Created by lixue on 2017/7/28. */ class RegionUpdate{ @@ -29,7 +29,7 @@ class RegionUpdate{ deleteSeaweed() } private static void deleteSeaweed(){ - def filename = "D://区域错误小区.xlsx" + def filename = "D://鍖哄煙閿欒灏忓尯.xlsx" ExcelUtils.modify(filename, { List row -> def city = row['B'] def region = row['C'] @@ -46,14 +46,14 @@ class RegionUpdate{ DbUtils.deleteOnSeaweed(id.toString()) // DbUtils.saveDeleteLog(city,region,name,"district",1) println("SUCCEED"+" "+city + " " + name + " " + region) - row['H'] = "已删除" + row['H'] = "宸插垹闄�" }else { // println(city+" "+region+" "+name) } }) } private static void huifu(){ - def filename = "D://删除小区.xlsx" + def filename = "D://鍒犻櫎灏忓尯.xlsx" ExcelUtils.modify(filename, { List row -> def city = row['A'] def region = row['B'] @@ -88,7 +88,7 @@ class RegionUpdate{ return date; } /** - * 小区库去重 + * 灏忓尯搴撳幓閲� */ private static void districtDis(){ @@ -133,7 +133,7 @@ class RegionUpdate{ } } /** - * 区域更改 + * 鍖哄煙鏇存敼 */ private static void regionUpdate(){ def rows = [] diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataupdate/StatusUpdate.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataupdate/StatusUpdate.groovy index e70e32eeb..c72f9fbdd 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataupdate/StatusUpdate.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataupdate/StatusUpdate.groovy @@ -16,7 +16,7 @@ class StatusUpdate { int j = 0 int count = 0 def findObj = new BasicDBObject() - findObj.append("from","房估估") + findObj.append("from","鎴夸及浼�") findObj.append("sync" , false) findObj.append("status",0) def feildObj = new BasicDBObject() @@ -56,6 +56,6 @@ class StatusUpdate { println(new Date()) } } - println("共"+count) + println("鍏�"+count) } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataupdate/XiamenUpdate.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataupdate/XiamenUpdate.groovy index 4ffad010d..ece438dec 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataupdate/XiamenUpdate.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataupdate/XiamenUpdate.groovy @@ -13,7 +13,7 @@ class XiamenUpdate { public static void main(String[] args) { def idx = 0 int j = 1 - def filename = "D:\\房估估-福州厦门匹配.xlsx" + def filename = "D:\\鎴夸及浼�-绂忓窞鍘﹂棬鍖归厤.xlsx" ExcelUtils.modify(filename , { List rows -> idx++ println(idx) @@ -32,9 +32,9 @@ class XiamenUpdate { LOUDONG_COLL.find(findObj).batchSize(2000).each { dbObj -> LOUDONG_COLL.update(new BasicDBObject("_id", dbObj._id), new BasicDBObject('$set', - new BasicDBObject("from", "厦门网上房地产").append("m_date", new Date()))) + new BasicDBObject("from", "鍘﹂棬缃戜笂鎴垮湴浜�").append("m_date", new Date()))) j++ - rows['L'] = "是" + rows['L'] = "鏄�" } }) println(j) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataupdate/YungujiaJudge.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataupdate/YungujiaJudge.groovy index 0ba6db3e2..9a3fdc3e5 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataupdate/YungujiaJudge.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/dataupdate/YungujiaJudge.groovy @@ -3,7 +3,7 @@ package com.fangjia.script.lixue.dataupdate import com.fangjia.script.util.ExcelUtils /** - * 云估价技术判断入库结果 + * 浜戜及浠锋妧鏈垽鏂叆搴撶粨鏋� * Created by lixue on 2017/8/3. */ class YungujiaJudge{ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/fangjiatong/UpdateDownload.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/fangjiatong/UpdateDownload.groovy index cf7cb8cda..a28b94e82 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/fangjiatong/UpdateDownload.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/fangjiatong/UpdateDownload.groovy @@ -7,7 +7,7 @@ import com.fangjia.script.util.ExcelUtils import groovy.sql.Sql /** - * 功能说明:需要将已经对账完成的农行数据在154后台的对账情况进行批量勾选---(已结账)并批量导入对账时间(主贷人小区名地址下载日期) + * 鍔熻兘璇存槑:闇�瑕佸皢宸茬粡瀵硅处瀹屾垚鐨勫啘琛屾暟鎹湪154鍚庡彴鐨勫璐︽儏鍐佃繘琛屾壒閲忓嬀閫�---锛堝凡缁撹处锛夊苟鎵归噺瀵煎叆瀵硅处鏃堕棿(涓昏捶浜哄皬鍖哄悕鍦板潃涓嬭浇鏃ユ湡) */ class UpdateDownload { @@ -17,12 +17,12 @@ class UpdateDownload { format() } def static format() { - def count=0 //主贷人小区名地址下载日期 + def count=0 //涓昏捶浜哄皬鍖哄悕鍦板潃涓嬭浇鏃ユ湡 def data = [] - data << ["序号","账号","区域","楼盘名称","地址","主贷人","报告费用","下载时间","总价","估价日期","输入成交价","终审价格","对账情况","对账时间"] + data << ["搴忓彿","璐﹀彿","鍖哄煙","妤肩洏鍚嶇О","鍦板潃","涓昏捶浜�","鎶ュ憡璐圭敤","涓嬭浇鏃堕棿","鎬讳环","浼颁环鏃ユ湡","杈撳叆鎴愪氦浠�","缁堝浠锋牸","瀵硅处鎯呭喌","瀵硅处鏃堕棿"] - //主贷人小区名地址下载日期 - def willBeJudgeData = ExcelUtils.read("D:\\lx\\8月支行对账总结算.xlsx",0,1) + //涓昏捶浜哄皬鍖哄悕鍦板潃涓嬭浇鏃ユ湡 + def willBeJudgeData = ExcelUtils.read("D:\\lx\\8鏈堟敮琛屽璐︽�荤粨绠�.xlsx",0,1) willBeJudgeData.each { count++ String lender=it['F'] @@ -31,7 +31,7 @@ class UpdateDownload { String date=it['N'].toString().replaceAll("\\.", "-") String closeAccountId = it['M'] String address = it['E'] - address = address.replaceAll("栋", "").replaceAll("室", "") + address = address.replaceAll("鏍�", "").replaceAll("瀹�", "") String[] arr2 = date.split("-") date=arr2[0] try{ @@ -48,7 +48,7 @@ class UpdateDownload { }catch(Exception e){ } - String date_created=it['H'].toString().replaceAll("年", "-").replaceAll("月", "-").replaceAll("日", "").replaceAll("/", "-") + String date_created=it['H'].toString().replaceAll("骞�", "-").replaceAll("鏈�", "-").replaceAll("鏃�", "").replaceAll("/", "-") String[] arr = date_created.split("-") date_created=arr[0] try{ @@ -68,9 +68,9 @@ class UpdateDownload { println it['A'] println "***************************"+it['H'] } - def user = poseidonConn.firstRow("select id from goojia_fangjia.users where email=?", [email]) //根据账号查用户表 - def userId = user.id.toInteger() //获取用户id - def cpcSite = poseidonConn.rows("select * from goojia_fangjia.evaluation where CONCAT(address,house_num,room_num)=? and district_name=? and lender=? and DATE_FORMAT(date_created,'%Y-%m-%d')=? and user_id=?", [address,name,lender,date_created,userId]) //根据用户id、地址和主贷人查evaluation + def user = poseidonConn.firstRow("select id from goojia_fangjia.users where email=?", [email]) //鏍规嵁璐﹀彿鏌ョ敤鎴疯〃 + def userId = user.id.toInteger() //鑾峰彇鐢ㄦ埛id + def cpcSite = poseidonConn.rows("select * from goojia_fangjia.evaluation where CONCAT(address,house_num,room_num)=? and district_name=? and lender=? and DATE_FORMAT(date_created,'%Y-%m-%d')=? and user_id=?", [address,name,lender,date_created,userId]) //鏍规嵁鐢ㄦ埛id銆佸湴鍧�鍜屼富璐蜂汉鏌valuation if(cpcSite.size()!=1){ data<<[it[0],it[1],it[2],it[3],it[4],it[5],it[6],it[7],it[8],it[9],it[10],it[11],it[12],it[13]] for(int i=0;i dt2.getTime()) { -// System.out.println("dt1 在dt2前"); +// System.out.println("dt1 鍦╠t2鍓�"); return 1; } else if (dt1.getTime() < dt2.getTime()) { -// System.out.println("dt1在dt2后"); +// System.out.println("dt1鍦╠t2鍚�"); return -1; } else { return 0; @@ -138,7 +138,7 @@ class FangguguMatch { static addressMapExport() { def idx = 0 - def filename = "D:\\lx\\非法地址.xlsx" + def filename = "D:\\lx\\闈炴硶鍦板潃.xlsx" ExcelUtils.modify(filename, { List rows -> idx++ // if (idx % 100 == 0) { @@ -159,7 +159,7 @@ class FangguguMatch { rows['H'] = beanGaode.address } rows['I'] = beanGaode.type -// rows['AB'] = "高德" +// rows['AB'] = "楂樺痉" } def beanBaidu = getBaiDuData(city, name) @@ -170,7 +170,7 @@ class FangguguMatch { rows['J'] = beanBaidu.address } rows['K'] = beanBaidu.type -// rows['AB'] = "百度" +// rows['AB'] = "鐧惧害" } def beanTengxun = UpdateDistrictLocation.getLocationByTengXunApi(city, name, null, null) @@ -181,7 +181,7 @@ class FangguguMatch { rows['L'] = beanTengxun.address } rows['M'] = beanTengxun.type -// rows['AB'] = "腾讯" +// rows['AB'] = "鑵捐" } } }) @@ -189,7 +189,7 @@ class FangguguMatch { static yungujiaMap() { def idx = 0 - def filename = "D:\\lx\\简化小区名.xlsx" + def filename = "D:\\lx\\绠�鍖栧皬鍖哄悕.xlsx" ExcelUtils.modify(filename, { List rows -> idx++ if (idx % 100 == 0) { @@ -209,7 +209,7 @@ class FangguguMatch { rows['Z'] = beanGaode.address } rows['AA'] = beanGaode.type - rows['AB'] = "高德" + rows['AB'] = "楂樺痉" } else { def beanBaidu = getBaiDuData(city, name) if (beanBaidu != null && beanBaidu.size() > 0) { @@ -219,7 +219,7 @@ class FangguguMatch { rows['Z'] = beanBaidu.address } rows['AA'] = beanBaidu.type - rows['AB'] = "百度" + rows['AB'] = "鐧惧害" } else { def beanTengxun = UpdateDistrictLocation.getLocationByTengXunApi(city, name, null, null) if (beanTengxun != null) { @@ -229,7 +229,7 @@ class FangguguMatch { rows['Z'] = beanTengxun.address } rows['AA'] = beanTengxun.type - rows['AB'] = "腾讯" + rows['AB'] = "鑵捐" } } } @@ -243,7 +243,7 @@ class FangguguMatch { DBObject query = new BasicDBObject("city", city).append("name", disName) DBObject mapdata = UpdateDistrictLocation.mapdata_coll.findOne(query) //if(mapdata == null) { - JSONObject json = BaiDuApiUtils.search(city, disName, "小区", 2, 20, 0) + JSONObject json = BaiDuApiUtils.search(city, disName, "灏忓尯", 2, 20, 0) if (json && json.getInt("status") == 0) { JSONArray array = json.get("results") if (array) { @@ -270,7 +270,7 @@ class FangguguMatch { private static void fangguguMatchmohu() { int j = 1 - def filename = "D://房估估除福建省全部城市小区导出.xlsx" + def filename = "D://鎴夸及浼伴櫎绂忓缓鐪佸叏閮ㄥ煄甯傚皬鍖哄鍑�.xlsx" ExcelUtils.multiThreadingModify(filename, { List row -> def city = row['B'] def region = row['C'] @@ -370,9 +370,9 @@ class FangguguMatch { row['F'] = kuaddress } if (DataUtil.isPreciseAddress(address)) { - row['M'] = "是" + row['M'] = "鏄�" } else { - row['M'] = "否" + row['M'] = "鍚�" } } println(j++) @@ -418,7 +418,7 @@ class FangguguMatch { } /** - * 流动性评级 + * 娴佸姩鎬ц瘎绾� * @param totalScore * @return */ @@ -437,7 +437,7 @@ class FangguguMatch { } /** - * 房产等级 + * 鎴夸骇绛夌骇 * @param rate * @return */ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/match/FggYgjMatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/match/FggYgjMatch.groovy index cb85f82d7..771133128 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/match/FggYgjMatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/match/FggYgjMatch.groovy @@ -7,8 +7,8 @@ import com.mongodb.BasicDBObject import com.mongodb.DBCollection class FggYgjMatch{ - static String filename1 = "D:\\8月3日至8月10日房源区域.xlsx" - static String filename2 = "D:\\房估估接口匹配1.xlsx" + static String filename1 = "D:\\8鏈�3鏃ヨ嚦8鏈�10鏃ユ埧婧愬尯鍩�.xlsx" + static String filename2 = "D:\\鎴夸及浼版帴鍙e尮閰�1.xlsx" public static final DBCollection Region = MongoUtils.getCollectionByName("fangjia", "region_block", "192.168.0.136") public static void main(String[] args) { @@ -30,9 +30,9 @@ class FggYgjMatch{ region = RegionData.formatRegion(city,region) def result = city+"_"+region+"_"+name//+"_"+address if(yungujiaList.contains(result)){ - item['Q'] = "是" + item['Q'] = "鏄�" }else { - item['Q'] = "否" + item['Q'] = "鍚�" } }) } @@ -48,20 +48,20 @@ class FggYgjMatch{ region = RegionData.formatRegion(city, region) def findOne = Region.findOne(new BasicDBObject("city", city).append("category", "region").append("name", region)) if (findOne) { - item['G'] = "是" + item['G'] = "鏄�" } else { - item['G'] = "否" + item['G'] = "鍚�" } if (flag != null) { def findOne1 = Region.findOne(new BasicDBObject("city", city).append("category", "region").append("name", flag)) if (findOne1) { - item['F'] = "是" + item['F'] = "鏄�" } else { - item['F'] = "否" + item['F'] = "鍚�" } } }catch (MissingMethodException){ - item['G'] = "否" + item['G'] = "鍚�" } println(j++) }) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/match/MatchSid.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/match/MatchSid.groovy index 672aa5f49..4624aa433 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/match/MatchSid.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/match/MatchSid.groovy @@ -12,10 +12,10 @@ class MatchSid { shMatchSid() } private static void shMatchSid(){ - def filename = "D://调查样本小区信息_格式化处理.xlsx" + def filename = "D://璋冩煡鏍锋湰灏忓尯淇℃伅_鏍煎紡鍖栧鐞�.xlsx" int j = 1 ExcelUtils.modify(filename, { List row -> - def city = "上海" + def city = "涓婃捣" def region = row['A'] def name = row['B'] def time = row['F'] diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/match/QuanZhouMatchSid.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/match/QuanZhouMatchSid.groovy index f8d6eeed1..40521eb84 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/match/QuanZhouMatchSid.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/match/QuanZhouMatchSid.groovy @@ -14,7 +14,7 @@ import com.mongodb.DBObject import com.mongodb.Mongo /** - * 泉州154后台房号库中“正常”状态且无编号数据处理 + * 娉夊窞154鍚庡彴鎴垮彿搴撲腑鈥滄甯糕�濈姸鎬佷笖鏃犵紪鍙锋暟鎹鐞� * Created by lixue on 2017/8/3. */ @@ -32,7 +32,7 @@ public class QuanZhouMatchSid extends BaseBatch{ format() } def static format() { - DBObject q_name = new BasicDBObject("district_no", null).append("city", "泉州").append("status", 0) + DBObject q_name = new BasicDBObject("district_no", null).append("city", "娉夊窞").append("status", 0) Set set = new HashSet() LOUDONG_CONN.find(q_name, new BasicDBObject("city", 1).append("region", 1).append("name", 1)).batchSize(5000).addOption(Bytes.QUERYOPTION_NOTIMEOUT).each { q -> diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/match/YunGujia.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/match/YunGujia.groovy index 2935a25ef..9c9ffb2e9 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/match/YunGujia.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/match/YunGujia.groovy @@ -42,7 +42,7 @@ class YunGujia{ rows['Z'] = beanGaode.address } rows['AA'] = beanGaode.type - rows['AB'] = "高德" + rows['AB'] = "楂樺痉" } else { def beanBaidu = getBaiDuData(city, name) if (beanBaidu != null && beanBaidu.size() > 0) { @@ -52,7 +52,7 @@ class YunGujia{ rows['Z'] = beanBaidu.address } rows['AA'] = beanBaidu.type - rows['AB'] = "百度" + rows['AB'] = "鐧惧害" } else { def beanTengxun = UpdateDistrictLocation.getLocationByTengXunApi(city, name, null, null) if (beanTengxun != null) { @@ -62,7 +62,7 @@ class YunGujia{ rows['Z'] = beanTengxun.address } rows['AA'] = beanTengxun.type - rows['AB'] = "腾讯" + rows['AB'] = "鑵捐" } } // } @@ -70,7 +70,7 @@ class YunGujia{ }) } private static void yungujiaMatch(){ - def filename = "D:\\云估价判断.xlsx" + def filename = "D:\\浜戜及浠峰垽鏂�.xlsx" int count = 1 ExcelUtils.modify(filename, { List row -> def city = row['B'] @@ -119,9 +119,9 @@ class YunGujia{ } } if(count1>count2){ - row['J'] = "区域更正" + row['J'] = "鍖哄煙鏇存" }else { - row['J'] = "无需处理" + row['J'] = "鏃犻渶澶勭悊" } j = 0 } @@ -147,40 +147,40 @@ class YunGujia{ } namelist.add(findOne.name) if (namelist.contains(name)) { - //名称不需要处理 + //鍚嶇О涓嶉渶瑕佸鐞� def addrlist = [] if(findOne.addr_alias) { addrlist = findOne.addr_alias } addrlist.add(findOne.address) if(addrlist.contains(address)||!DataUtil.isPreciseAddress(address)){ - //地址不需要处理(地址存在或者为模糊地址) - row['J'] = "无需处理" + //鍦板潃涓嶉渶瑕佸鐞�(鍦板潃瀛樺湪鎴栬�呬负妯$硦鍦板潃) + row['J'] = "鏃犻渶澶勭悊" }else if(DataUtil.isPreciseAddress(address)){ - row['J'] = "地址替换" + row['J'] = "鍦板潃鏇挎崲" } if(!addrlist.contains(address)&&DataUtil.isPreciseAddress(address)&&DataUtil.isPreciseAddress(findOne.address)) { - row['J'] = "地址别名" + row['J'] = "鍦板潃鍒悕" } } else { - //名称需要处理 + //鍚嶇О闇�瑕佸鐞� def addrlist = [] if(findOne.addr_alias) { addrlist = findOne.addr_alias } addrlist.add(findOne.address) if(addrlist.contains(address)||!DataUtil.isPreciseAddress(address)){ - //地址不需要处理(地址存在或者为模糊地址) - row['J'] = "无需处理" + //鍦板潃涓嶉渶瑕佸鐞�(鍦板潃瀛樺湪鎴栬�呬负妯$硦鍦板潃) + row['J'] = "鏃犻渶澶勭悊" }else if(DataUtil.isPreciseAddress(address)){ - row['J'] = "名称别名地址替换" + row['J'] = "鍚嶇О鍒悕鍦板潃鏇挎崲" } if(!addrlist.contains(address)&&DataUtil.isPreciseAddress(address)&&DataUtil.isPreciseAddress(findOne.address)) { - row['J'] = "名称别名地址别名" + row['J'] = "鍚嶇О鍒悕鍦板潃鍒悕" } } }else { - row['J'] = "新增" + row['J'] = "鏂板" } } println(count++) @@ -192,7 +192,7 @@ class YunGujia{ DBObject query = new BasicDBObject("city", city).append("name", disName) DBObject mapdata = UpdateDistrictLocation.mapdata_coll.findOne(query) //if(mapdata == null) { - JSONObject json = BaiDuApiUtils.search(city, disName, "小区", 2, 20, 0) + JSONObject json = BaiDuApiUtils.search(city, disName, "灏忓尯", 2, 20, 0) if(json.getInt("status") == 0) { JSONArray array = json.get("results") if(array) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/match/YunGujiaMatchSid.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/match/YunGujiaMatchSid.groovy index 9cddaad28..0544b2566 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/match/YunGujiaMatchSid.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/match/YunGujiaMatchSid.groovy @@ -38,7 +38,7 @@ class YunGujiaMatchSid{ // } // row["H"] = result // } - row['R'] = "是" + row['R'] = "鏄�" }else { findOne = DbUtils.findOneOnSeaweed(new BasicDBObject("city",city).append("region", region).append("alias", name).append('cat','district').append('visible',0)) @@ -51,9 +51,9 @@ class YunGujiaMatchSid{ // } // row["N"] = result // } - row['R'] = "是" + row['R'] = "鏄�" }else { - row['R'] = "否" + row['R'] = "鍚�" } } println(j++) @@ -82,9 +82,9 @@ class YunGujiaMatchSid{ } row["H"] = result } -// row['L'] = "是" +// row['L'] = "鏄�" }else { -// row['L'] = "否" +// row['L'] = "鍚�" } }catch (IllegalArgumentException){ @@ -103,16 +103,16 @@ class YunGujiaMatchSid{ } row["N"] = result } -// row['L'] = "是" +// row['L'] = "鏄�" }else { -// row['L'] = "否" +// row['L'] = "鍚�" } } println(j++) }) } private static void yungujiaMatchsidMohu(){ - def filename = "D://云估价接口匹配-9月.xlsx" + def filename = "D://浜戜及浠锋帴鍙e尮閰�-9鏈�.xlsx" int j = 1 ExcelUtils.modify(filename, { List row -> def city = row['B'] @@ -191,9 +191,9 @@ class YunGujiaMatchSid{ row['F'] = kuaddress } if(DataUtil.isPreciseAddress(address)){ - row['M'] = "是" + row['M'] = "鏄�" }else { - row['M'] = "否" + row['M'] = "鍚�" } }else { findOne = DbUtils.findOneOnSeaweed(new BasicDBObject("city",city).append("region", region).append("alias", name).append('cat','district').append('visible',0)) @@ -209,9 +209,9 @@ class YunGujiaMatchSid{ row['F'] = kuaddress } if(DataUtil.isPreciseAddress(address)){ - row['M'] = "是" + row['M'] = "鏄�" }else { - row['M'] = "否" + row['M'] = "鍚�" } } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/seabird/SeaWaterCom.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/seabird/SeaWaterCom.groovy index fcce8fec5..aa01f0897 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/seabird/SeaWaterCom.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/seabird/SeaWaterCom.groovy @@ -8,7 +8,7 @@ import com.fangjia.script.util.ExcelUtils import com.mongodb.BasicDBObject /** - * 功能说明: + * 鍔熻兘璇存槑: */ class SeaWaterCom { @@ -20,7 +20,7 @@ class SeaWaterCom { static def com(){ def idx = 0 - def filename = "D:\\lx\\简化小区名.xlsx" + def filename = "D:\\lx\\绠�鍖栧皬鍖哄悕.xlsx" ExcelUtils.modify(filename, { List rows -> println(idx++) def city = rows['B'] diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/spider/Anshan.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/spider/Anshan.groovy index 289799eb0..3ee2d50f6 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/spider/Anshan.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/spider/Anshan.groovy @@ -60,7 +60,7 @@ public class Anshan { parseListPage(listPage); String lastPageHref = listPage.select("#AspNetPager1 a:contains(>>)").attr("href"); - String lastPageNum = StringUtils.substringBetween(lastPageHref, "','", "')");//获得page的页码 + String lastPageNum = StringUtils.substringBetween(lastPageHref, "','", "')");//鑾峰緱page鐨勯〉鐮� for(int i =350; i<= NumberUtils.toInt(lastPageNum); ++i) { @@ -104,7 +104,7 @@ public class Anshan { } /** - * 列表页解析 + * 鍒楄〃椤佃В鏋� * @param firstPage */ private static void parseListPage(Document firstPage) { @@ -133,7 +133,7 @@ public class Anshan { } System.out.println(list1.get(6)); - //跳转页面的数据 + //璺宠浆椤甸潰鐨勬暟鎹� String result = secondPage.toString(); String extraurl = "http://www.afgl.gov.cn/Admin/KfsAdmin/FloorPicInfo.aspx?"+StringUtils.substringBetween(result, "FloorPicInfo.aspx?", "'"); //System.out.println(extraurl); @@ -156,7 +156,7 @@ public class Anshan { Document seDoc = doGetDoc(selink); secondparselist(seDoc); } - System.out.println("--------插入" + j + "条---------"); + System.out.println("--------鎻掑叆" + j + "鏉�---------"); } private static void secondparselist(Document doc){ @@ -168,26 +168,26 @@ public class Anshan { } for(int i =0;i - String city = "上海" + String city = "涓婃捣" def region = row["A"] //def address = row[""] - def avg_price = row["G"].toString().replaceAll("单价","").replaceAll("元/平","") + def avg_price = row["G"].toString().replaceAll("鍗曚环","").replaceAll("鍏�/骞�","") def name = row["B"] def huxing = row["C"] def room = huxing.toString().trim().substring(0,1) - def ting = StringUtils.substringBetween(huxing.toString(),"室","厅") - def area = row["D"].toString().replaceAll("平","").toDouble() + def ting = StringUtils.substringBetween(huxing.toString(),"瀹�","鍘�") + def area = row["D"].toString().replaceAll("骞�","").toDouble() def trade_date = row["F"] def trade_price = row["E"].toString().toDouble() def date = new Date() @@ -41,8 +41,8 @@ class ToDealPrice { region = RegionData.formatRegion(city, region.toString()) avg_price = DealPriceUtils.parseUnitPrice(avg_price.toString()) trade_price = (int)trade_price*10000 - if(name.toString().contains("(")) - name = name.toString().split("(")[0] + if(name.toString().contains("锛�")) + name = name.toString().split("锛�")[0] //DealPriceUtils.formatName(name.toString()) //area = DealPriceUtils.parseArea(area.toString()) trade_date = DateFormat.date_format(trade_date) @@ -56,7 +56,7 @@ class ToDealPrice { dealPrice.append("region", region) dealPrice.append("total_price", trade_price) dealPrice.append("c_date", date) - dealPrice.append("source","链家在线") + dealPrice.append("source","閾惧鍦ㄧ嚎") dealPrice.append("avg_price",avg_price) //dealPrice.append("address",address) dealPrice.append("ting",ting) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/spider/LongYan.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/spider/LongYan.groovy index 258815738..7eaad5c1f 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/spider/LongYan.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/spider/LongYan.groovy @@ -63,7 +63,7 @@ // } // } // /** -// * 解析第一层url +// * 瑙f瀽绗竴灞倁rl // */ // private static void parseList(Document doc,String name){ // BasicDBObject saveObj = new BasicDBObject() @@ -102,7 +102,7 @@ // List unit_list = new ArrayList() // String colspan = null; // for(Element unit : units){ -// if(unit.text().contains("单元")&&!unit.text().contains("楼层")&&unit.toString().contains("colspan")) +// if(unit.text().contains("鍗曞厓")&&!unit.text().contains("妤煎眰")&&unit.toString().contains("colspan")) // { // unit_list.add(unit.text()) // colspan = unit.attr("colspan") @@ -138,7 +138,7 @@ // BasicDBObject dataobj1 = new BasicDBObject() // BasicDBObject dataobj2 = new BasicDBObject() // -// saveObj.append("city", "龙岩") +// saveObj.append("city", "榫欏博") // saveObj.append("build_num", build_num) // for (int i = 0; i < detailbuild_List.size(); i++) { // dataobj.append(i + "", detailbuild_List.get(i).toString()) @@ -200,7 +200,7 @@ // BasicDBObject dataobj1 = new BasicDBObject() // BasicDBObject dataobj2 = new BasicDBObject() // -// saveObj.append("city","龙岩") +// saveObj.append("city","榫欏博") // saveObj.append("build_num",build_num) // for(int i = 0; i 0) { for (int i = 0; i < js.size(); i++) { JSONObject job = js.getJSONObject(i); - //DbUtils.Lixue_Local.save(new BasicDBObject("hour", job.get("time")).append("value", job.get("v")).append("name", name + "入库").append("date", time)) + //DbUtils.Lixue_Local.save(new BasicDBObject("hour", job.get("time")).append("value", job.get("v")).append("name", name + "鍏ュ簱").append("date", time)) //System.out.println(job.get("time")+":"+job.get("v")) ; } } - Object re1 = json.get("xyList")//下游 + Object re1 = json.get("xyList")//涓嬫父 JSONArray js1 = JSONArray.fromObject(re1.toString()) if (js1.size() > 0) { for (int i = 0; i < js1.size(); i++) { JSONObject job1 = js1.getJSONObject(i); - DbUtils.Lixue_Local.save(new BasicDBObject("hour", job1.get("time")).append("value", job1.get("v")).append("name", name + "下游").append("date", time)) + DbUtils.Lixue_Local.save(new BasicDBObject("hour", job1.get("time")).append("value", job1.get("v")).append("name", name + "涓嬫父").append("date", time)) //System.out.println(job1.get("time")+":"+job1.get("v")) ; } } - Object re2 = json.get("syList")//上游 + Object re2 = json.get("syList")//涓婃父 JSONArray js2 = JSONArray.fromObject(re2.toString()) if (js2.size() > 0) { for (int i = 0; i < js2.size(); i++) { JSONObject job2 = js2.getJSONObject(i); - DbUtils.Lixue_Local.save(new BasicDBObject("hour", job2.get("time")).append("value", job2.get("v")).append("name", name + "上游").append("date", time)) + DbUtils.Lixue_Local.save(new BasicDBObject("hour", job2.get("time")).append("value", job2.get("v")).append("name", name + "涓婃父").append("date", time)) //System.out.println(job2.get("time")+":"+job2.get("v")) ; } } - Object re3 = json.get("ckList")//出库 + Object re3 = json.get("ckList")//鍑哄簱 JSONArray js3 = JSONArray.fromObject(re3.toString()) if (js3.size() > 0) { for (int i = 0; i < js3.size(); i++) { JSONObject job3 = js3.getJSONObject(i); - DbUtils.Lixue_Local.save(new BasicDBObject("hour", job3.get("time")).append("value", job3.get("v")).append("name", name + "出库").append("date", time)) + DbUtils.Lixue_Local.save(new BasicDBObject("hour", job3.get("time")).append("value", job3.get("v")).append("name", name + "鍑哄簱").append("date", time)) //System.out.println(job3.get("time")+":"+job3.get("v")) ; } } @@ -118,15 +118,15 @@ class ShanXia { private static List dateSplit(Date startDate, Date endDate) throws Exception { if (!startDate.before(endDate)) - throw new Exception("开始时间应该在结束时间之后"); + throw new Exception("寮�濮嬫椂闂村簲璇ュ湪缁撴潫鏃堕棿涔嬪悗"); Long spi = endDate.getTime() - startDate.getTime(); - Long step = spi / (24 * 60 * 60 * 1000);// 相隔天数 + Long step = spi / (24 * 60 * 60 * 1000);// 鐩搁殧澶╂暟 List dateList = new ArrayList(); dateList.add(endDate); for (int i = 1; i <= step; i++) { dateList.add(new Date(dateList.get(i - 1).getTime() - - (24 * 60 * 60 * 1000)));// 比上一天减一 + - (24 * 60 * 60 * 1000)));// 姣斾笂涓�澶╁噺涓� } return dateList; } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/spider/Test.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/spider/Test.groovy index 6bd8ab9e7..7a9e68394 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/spider/Test.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/spider/Test.groovy @@ -27,10 +27,10 @@ class Test{ def id = dbObject.get("_id") def name = dbObject.get("district_name").toString() - def district_name = name.replaceAll("\\d居","") - district_name = district_name.replaceAll("电梯","") - district_name = district_name.replaceAll("满二","") - district_name = district_name.replaceAll("车位","") + def district_name = name.replaceAll("\\d灞�","") + district_name = district_name.replaceAll("鐢垫","") + district_name = district_name.replaceAll("婊′簩","") + district_name = district_name.replaceAll("杞︿綅","") district_name = district_name.trim() println(district_name) LouDong.update(new BasicDBObject("_id",id), new BasicDBObject('$set', new BasicDBObject('district_name', district_name))) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/spider/Zangzhou.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/spider/Zangzhou.groovy index 0252b081b..7db86e423 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/spider/Zangzhou.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/spider/Zangzhou.groovy @@ -53,7 +53,7 @@ class Zangzhou{ List list1 = new ArrayList() Elements tables = data.select("tbody tr") for (Element table : tables) { - if (!table.text().contains("总层数")) { + if (!table.text().contains("鎬诲眰鏁�")) { list1.clear() Elements tds = table.select("td"); for (Element td : tds) { @@ -70,7 +70,7 @@ class Zangzhou{ } } private static void writeToMongo(List list){ - test.insert(new BasicDBObject("city","漳州").append("address",list.get(1).toString()) + test.insert(new BasicDBObject("city","婕冲窞").append("address",list.get(1).toString()) .append("name",list.get(0).toString()).append("house_num",list.get(2).toString()) .append("total_area",list.get(3).toString()).append("build_num",list.get(4).toString()) .append("struct",list.get(5).toString()).append("floor",list.get(6).toString()) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/spider/Zhongyuan.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/spider/Zhongyuan.groovy index 323eb7415..c5057c11c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/spider/Zhongyuan.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/spider/Zhongyuan.groovy @@ -44,7 +44,7 @@ public class ZhongYuan { } String price = element.select("div>div").last().select("p").first().text(); - test.insert(new BasicDBObject("city","上海").append("region",region).append("name",name) + test.insert(new BasicDBObject("city","涓婃捣").append("region",region).append("name",name) .append("avg_price",price)); System.out.println(name); j++; @@ -71,7 +71,7 @@ public class ZhongYuan { } } System.out.println(name + price + region); - test.insert(new BasicDBObject("city","上海").append("region",region).append("name",name) + test.insert(new BasicDBObject("city","涓婃捣").append("region",region).append("name",name) .append("avg_price",price)); } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/util/DateFormat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/util/DateFormat.groovy index 71cdb5f72..c11a20fc4 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/util/DateFormat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/util/DateFormat.groovy @@ -7,14 +7,14 @@ import java.util.regex.Pattern */ class DateFormat{ public static String date_format (String str ){ - Pattern pattern = Pattern.compile("^\\d{4}年"); - Pattern pattern_1 = Pattern.compile("^\\d{4}年建成"); - Pattern pattern1 = Pattern.compile("^\\d{4}年\\d{2}月\$"); - Pattern pattern1_1 = Pattern.compile("^\\d{4}年\\d{1}月\$"); + Pattern pattern = Pattern.compile("^\\d{4}骞�"); + Pattern pattern_1 = Pattern.compile("^\\d{4}骞村缓鎴�"); + Pattern pattern1 = Pattern.compile("^\\d{4}骞碶\d{2}鏈圽$"); + Pattern pattern1_1 = Pattern.compile("^\\d{4}骞碶\d{1}鏈圽$"); - Pattern pattern2 = Pattern.compile("^\\d{4}年\\d{2}月\\d{2}日\$"); - Pattern pattern2_1 = Pattern.compile("^\\d{4}年\\d{1}月\\d{2}日\$"); - Pattern pattern2_2 = Pattern.compile("^\\d{4}年\\d{1}月\\d{1}日\$"); + Pattern pattern2 = Pattern.compile("^\\d{4}骞碶\d{2}鏈圽\d{2}鏃$"); + Pattern pattern2_1 = Pattern.compile("^\\d{4}骞碶\d{1}鏈圽\d{2}鏃$"); + Pattern pattern2_2 = Pattern.compile("^\\d{4}骞碶\d{1}鏈圽\d{1}鏃$"); Pattern pattern3 = Pattern.compile("^\\d{4}-\\d{2}\$"); Pattern pattern4 = Pattern.compile("^\\d{4}\$"); @@ -36,31 +36,31 @@ class DateFormat{ String resutl = null; if (pattern.matcher(str).matches()) { - resutl = str.split("年")[0] + "-01-01" + resutl = str.split("骞�")[0] + "-01-01" return resutl } if (pattern_1.matcher(str).matches()) { - resutl = str.split("年")[0] + "-01-01" + resutl = str.split("骞�")[0] + "-01-01" return resutl } if (pattern1.matcher(str).matches()) { - resutl = str.replace('年', '-').replace('月', '-') + "01" + resutl = str.replace('骞�', '-').replace('鏈�', '-') + "01" return resutl } if (pattern1_1.matcher(str).matches()) { - resutl = str.replaceAll("年", '-0').replace("月", '-0') + "01" + resutl = str.replaceAll("骞�", '-0').replace("鏈�", '-0') + "01" return resutl } if (pattern2.matcher(str).matches()) { - resutl = str.replace('年', '-').replace('月', "-").replace('日', '') + resutl = str.replace('骞�', '-').replace('鏈�', "-").replace('鏃�', '') return resutl } if (pattern2_1.matcher(str).matches()) { - resutl = str.replace('年', '-0').replace('月', "-").replace('日', '') + resutl = str.replace('骞�', '-0').replace('鏈�', "-").replace('鏃�', '') return resutl } if (pattern2_2.matcher(str).matches()) { - resutl = str.replaceAll("年", "-0").replaceAll("月", "-0").replaceAll("日", "") + resutl = str.replaceAll("骞�", "-0").replaceAll("鏈�", "-0").replaceAll("鏃�", "") return resutl } if (pattern3.matcher(str).matches()) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/util/HouseLoudong.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/util/HouseLoudong.groovy index b81feea71..0e31ecc85 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/util/HouseLoudong.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/util/HouseLoudong.groovy @@ -5,28 +5,28 @@ package com.fangjia.script.lixue.util */ class HouseLoudong { - String city;//城市 - String region;//区域 - String name;//小区名 - String from;//来源 - int house_height=-1;//楼高 - int house_floor=-1;//楼层 - double house_area=-1;//面积 - String house_num;//楼号 - String house_num_unit='0';//单元 - String room_num;//房号 - int room=-1;//室 - int hall=-1;//厅 - int toilet=-1;//卫 - String direction;//朝向 - Date c_date;//创建时间 - Date m_date;//修改时间 - String build_type;//建筑类型 - double basement_area=-1;//地下室面积 - double garden_area=-1;//花园面积 - double outer_area=-1;//公摊建筑面积 - double attic_area=-1;//楼顶面积 - String worry_facility;//设施 + String city;//鍩庡競 + String region;//鍖哄煙 + String name;//灏忓尯鍚� + String from;//鏉ユ簮 + int house_height=-1;//妤奸珮 + int house_floor=-1;//妤煎眰 + double house_area=-1;//闈㈢Н + String house_num;//妤煎彿 + String house_num_unit='0';//鍗曞厓 + String room_num;//鎴垮彿 + int room=-1;//瀹� + int hall=-1;//鍘� + int toilet=-1;//鍗� + String direction;//鏈濆悜 + Date c_date;//鍒涘缓鏃堕棿 + Date m_date;//淇敼鏃堕棿 + String build_type;//寤虹瓚绫诲瀷 + double basement_area=-1;//鍦颁笅瀹ら潰绉� + double garden_area=-1;//鑺卞洯闈㈢Н + double outer_area=-1;//鍏憡寤虹瓚闈㈢Н + double attic_area=-1;//妤奸《闈㈢Н + String worry_facility;//璁炬柦 String sideset; String car_port; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/util/ToDealPrice.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/util/ToDealPrice.groovy index 5cdfe1cc1..81cc12acb 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/util/ToDealPrice.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/util/ToDealPrice.groovy @@ -38,7 +38,7 @@ class ToDealPrice { if (obj3 != null && !"".equals(obj3.toString())) { def total = DealPriceUtils.parseTotalPrice(obj3.toString()) def avg = DealPriceUtils.parseTotalPrice(avg_price.toString()) - def city = "厦门" + def city = "鍘﹂棬" def region = RegionData.formatRegion(city, obj5.toString()) def dealPrice = new BasicDBObject() dealPrice.append("area", area) @@ -48,7 +48,7 @@ class ToDealPrice { dealPrice.append("region", region) dealPrice.append("total_price", total) dealPrice.append("c_date", date) - dealPrice.append("source", "丹霞网") + dealPrice.append("source", "涓归湠缃�") dealPrice.append("avg_price", avg) if (DealPriceUtils.isAvailableDealPrice(dealPrice)&&RegionData.isRegion(city,region)) { @@ -59,14 +59,14 @@ class ToDealPrice { public static void excel_ToDealPrice(){ ExcelUtils.multiThreadingModify(filename, { List row -> - String city = "上海" + String city = "涓婃捣" def region = row["G"] def address = row["H"] def avg_price = row["I"] def name = row["B"] def huxing = row["C"] def room = huxing.toString().trim().substring(0,1) - def ting = StringUtils.substringBetween(huxing.toString(),"室","厅") + def ting = StringUtils.substringBetween(huxing.toString(),"瀹�","鍘�") def area = row["D"] def trade_date = row["E"] def trade_price = row["F"] @@ -91,7 +91,7 @@ class ToDealPrice { dealPrice.append("c_date", trade_date) - dealPrice.append("source","链家") + dealPrice.append("source","閾惧") dealPrice.append("avg_price",avg_price) dealPrice.append("address",address) dealPrice.append("ting",ting) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/util/ToHouseLoudong.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/util/ToHouseLoudong.groovy index 565364f38..62d6ede90 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/util/ToHouseLoudong.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/util/ToHouseLoudong.groovy @@ -41,7 +41,7 @@ class RuKu { roomNumber = StringUtils.substringBefore(roomNumber, ".") } - String source = "房管局" + String source = "鎴跨灞�" def date = new Date() def mdate = dbObject.get("m_date") com.fangjia.script.linxsh.util.entity.HouseLoudong houseLoudng = new com.fangjia.script.linxsh.util.entity.HouseLoudong() diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/zheshangBank/ZhongYuanBank.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/zheshangBank/ZhongYuanBank.groovy index 08fe31355..5d04fea7f 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/zheshangBank/ZhongYuanBank.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/zheshangBank/ZhongYuanBank.groovy @@ -24,7 +24,7 @@ import java.util.regex.Pattern import static java.util.Date.* /** - * 功能说明:中原银行数据需求 + * 鍔熻兘璇存槑:涓師閾惰鏁版嵁闇�姹� */ class ZhongYuanBank { @@ -32,18 +32,18 @@ class ZhongYuanBank { static final DBCollection DEAL_PRICE = MongoUtils.getCollectionByName("fangjia", "deal_price", "192.168.0.136") public static DSCollection seawater = new DataStore("192.168.0.65", 27777).getCollection("fangjia.seawater") static final Map flowMap = new HashMap() {{ - put( 0 , "很差" ); - put( 1 , "较差" ); - put( 2 , "一般" ); - put( 3 , "良好" ); - put( 4 , "很好" ); + put( 0 , "寰堝樊" ); + put( 1 , "杈冨樊" ); + put( 2 , "涓�鑸�" ); + put( 3 , "鑹ソ" ); + put( 4 , "寰堝ソ" ); }}; static final Map assertMap = new HashMap() {{ - put( 1 , "豪宅级" ); - put( 2 , "公寓级" ); - put( 3 , "平房级" ); - put( 4 , "草屋级" ); - put( 5 , "山洞级" ); + put( 1 , "璞畢绾�" ); + put( 2 , "鍏瘬绾�" ); + put( 3 , "骞虫埧绾�" ); + put( 4 , "鑽夊眿绾�" ); + put( 5 , "灞辨礊绾�" ); }}; static void main(String[] args) { @@ -60,16 +60,16 @@ class ZhongYuanBank { def region = rows['F'] def name = rows['G'] def address = rows['B'] - Pattern match = Pattern.compile("\\d+号"); - Pattern roomMatch = Pattern.compile("号\\d+(室)?"); + Pattern match = Pattern.compile("\\d+鍙�"); + Pattern roomMatch = Pattern.compile("鍙穃\d+(瀹�)?"); if(address) { def houseMum = DataUtil.match(address.toString(), match) def roomNum = DataUtil.match(address.toString(), roomMatch) if (houseMum) { - houseMum = houseMum.toString().replaceAll("号", "") + houseMum = houseMum.toString().replaceAll("鍙�", "") } if (roomNum) { - roomNum = roomNum.toString().replaceAll("号", "").replaceAll("室", "") + roomNum = roomNum.toString().replaceAll("鍙�", "").replaceAll("瀹�", "") } if (city && region && name) { def avgPrice = -1 @@ -94,7 +94,7 @@ class ZhongYuanBank { // rows['AG'] = dayNumList.min() // }def avgPrice = -1 /** - * 小区详情 + * 灏忓尯璇︽儏 */ // def map = districtDet(city, region, name) // if (map) { @@ -116,13 +116,13 @@ class ZhongYuanBank { // rows['W'] = map["lat"] // rows['X'] = map["preSalePermit"] // } - //2017成交量 + //2017鎴愪氦閲� def startDate = stringToDate("20170101") rows['AI'] = DEAL_PRICE.count(new BasicDBObject("city", city).append("c_date"),new BasicDBObject('$gte',startDate).append("region", region).append("district_name", name)) - //2017挂牌量 + //2017鎸傜墝閲� rows['AJ'] = DbUtils.seawater.count(new BasicDBObject("city", city).append("p_date",new BasicDBObject('$gt',20170101)).append("region", region).append("district_name", name)) - //最接近小区均价的成交单价 + //鏈�鎺ヨ繎灏忓尯鍧囦环鐨勬垚浜ゅ崟浠� def avgPriceList = [] DEAL_PRICE.find(new BasicDBObject("city", city).append("region", region).append("district_name", name)).each { dbObj -> def unitPrice = dbObj.avg_price @@ -144,7 +144,7 @@ class ZhongYuanBank { findObj.append("status", new BasicDBObject('$in', [0, 5])) def findOne = HOUSE_LOUDONG.findOne(findObj) if (findOne) { -// def area = findOne.house_area //面积存在跑出总价.评级.流动性 +// def area = findOne.house_area //闈㈢Н瀛樺湪璺戝嚭鎬讳环.璇勭骇.娴佸姩鎬� // if (area && area != -1) { // rows['D'] = area // def content = OpenApiClient.evaluateDistrictPrice(city, region, name, area) @@ -163,7 +163,7 @@ class ZhongYuanBank { // rows['AL'] = assertMap.get(assertRate) // } } else { - //面积不存在默认100 + //闈㈢Н涓嶅瓨鍦ㄩ粯璁�100 // area = 100 // rows['D'] = area // @@ -228,10 +228,10 @@ class ZhongYuanBank { return null } /** - * 计算两个日期之间相差的天数 - * @param smdate 较小的时间 - * @param bdate 较大的时间 - * @return 相差天数 + * 璁$畻涓や釜鏃ユ湡涔嬮棿鐩稿樊鐨勫ぉ鏁� + * @param smdate 杈冨皬鐨勬椂闂� + * @param bdate 杈冨ぇ鐨勬椂闂� + * @return 鐩稿樊澶╂暟 * @throws ParseException */ public static int daysBetween(Date smdate,Date bdate) throws ParseException @@ -252,10 +252,10 @@ class ZhongYuanBank { try { if (dt1.getTime() > dt2.getTime()) { -// System.out.println("dt1 在dt2前"); +// System.out.println("dt1 鍦╠t2鍓�"); return 1; } else if (dt1.getTime() < dt2.getTime()) { -// System.out.println("dt1在dt2后"); +// System.out.println("dt1鍦╠t2鍚�"); return -1; } else { return 0; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/zheshangBank/test.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/zheshangBank/test.groovy index fab7d0846..fdc28a4cb 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/zheshangBank/test.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/lixue/zheshangBank/test.groovy @@ -3,6 +3,6 @@ package com.fangjia.script.lixue.zheshangBank import com.fangjia.script.util.DbUtils import com.mongodb.BasicDBObject -DbUtils.seawater.find(new BasicDBObject("cat", "sell").append("city","上海").append("region","长宁").append("district_name","新泾三村")).each { +DbUtils.seawater.find(new BasicDBObject("cat", "sell").append("city","涓婃捣").append("region","闀垮畞").append("district_name","鏂版尘涓夋潙")).each { println(it) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/loanLeadToCRM/CityProvinceMap.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/loanLeadToCRM/CityProvinceMap.groovy index 1bf767eb1..7622bb240 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/loanLeadToCRM/CityProvinceMap.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/loanLeadToCRM/CityProvinceMap.groovy @@ -24,7 +24,7 @@ class CityProvinceMap { DBCursor cursor = SERVER_AREA.find(new BasicDBObject(), (new BasicDBObject("display", 1)).append("province", 1)) while(cursor.hasNext()){ BasicDBObject dbo = (BasicDBObject)cursor.next(); - if(!"全国".equals(dbo.get("display"))){ + if(!"鍏ㄥ浗".equals(dbo.get("display"))){ CPMap.put((String)dbo.get("display"),(String)dbo.get("province")) } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/loanLeadToCRM/LoanLeadSync.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/loanLeadToCRM/LoanLeadSync.groovy index b1192692d..dde129f02 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/loanLeadToCRM/LoanLeadSync.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/loanLeadToCRM/LoanLeadSync.groovy @@ -28,64 +28,64 @@ class LoanLeadSync { static final DBCollection loan_crm_record = (DBCollection) MongoUtils.getCollectionByName("fangjia_coresite", "loan_crm_record", "mongo.db.fangjia.com", 27017) static final DBCollection match_rule = (DBCollection) MongoUtils.getCollectionByName("fangjia_coresite", "match_rule", "mongo.db.fangjia.com", 27017) static volatile String Token - static final Map supplier = new HashMap() //供应商对应销售易中团队成员id - static final Map supplier2 = new HashMap() //供应商对应销售易列表中多选id - static final Map> matchRuleMap = new HashMap>() //线索匹配获取供应商 + static final Map supplier = new HashMap() //渚涘簲鍟嗗搴旈攢鍞槗涓洟闃熸垚鍛榠d + static final Map supplier2 = new HashMap() //渚涘簲鍟嗗搴旈攢鍞槗鍒楄〃涓閫塱d + static final Map> matchRuleMap = new HashMap>() //绾跨储鍖归厤鑾峰彇渚涘簲鍟� static final int TOKEN_ERROR_TIME = 10 static final int SLEEPTIME = 600000 - static final int BELONGID = 100583487 //对应实体的ID - static final int ERROR_ATTEMPT = 3 //失败尝试次数 - static final int STOP_TIME = 1000 //每次尝试暂停时间 毫秒 - static final int REPEAT_TIME = 3600000 //每隔多少时间运行一次 - static final String CLIENT_ID = "f3cf19c75dfe1881628a6e26a360325a" //用于获取token 来自销售易的连接器 - static final String CLIENT_SECRET = "e6b402ecd73cab3ddef1a347583180e1" //获取token 来自销售易的连接器 - static final String REDIRECT_URI = "https://www.fangjia.com" //获取token 来自销售易的连接器 - static final String USERNAME = "panyingjiao@fangjia.com"//获取token 同销售易帐号登录名 - static final String PASSWORD = "654321dO5GxNjq"//获取token 销售易登录密码+安全令牌,重置令牌后则需要更改 + static final int BELONGID = 100583487 //瀵瑰簲瀹炰綋鐨処D + static final int ERROR_ATTEMPT = 3 //澶辫触灏濊瘯娆℃暟 + static final int STOP_TIME = 1000 //姣忔灏濊瘯鏆傚仠鏃堕棿 姣 + static final int REPEAT_TIME = 3600000 //姣忛殧澶氬皯鏃堕棿杩愯涓�娆� + static final String CLIENT_ID = "f3cf19c75dfe1881628a6e26a360325a" //鐢ㄤ簬鑾峰彇token 鏉ヨ嚜閿�鍞槗鐨勮繛鎺ュ櫒 + static final String CLIENT_SECRET = "e6b402ecd73cab3ddef1a347583180e1" //鑾峰彇token 鏉ヨ嚜閿�鍞槗鐨勮繛鎺ュ櫒 + static final String REDIRECT_URI = "https://www.fangjia.com" //鑾峰彇token 鏉ヨ嚜閿�鍞槗鐨勮繛鎺ュ櫒 + static final String USERNAME = "panyingjiao@fangjia.com"//鑾峰彇token 鍚岄攢鍞槗甯愬彿鐧诲綍鍚� + static final String PASSWORD = "654321dO5GxNjq"//鑾峰彇token 閿�鍞槗鐧诲綍瀵嗙爜+瀹夊叏浠ょ墝锛岄噸缃护鐗屽悗鍒欓渶瑕佹洿鏀� static final HttpRequest request = new HttpRequest() //Mysql static final HttpRequest request2 = new HttpRequest() //MongoDb - static final HttpPost httpPostToken //获取Token的请求 - static volatile HttpPost httppost //创建线索请求Mysql - static volatile HttpPost httppost2 //创建线索请求MongoDb - static volatile HttpPost httppost3 //插入成员请求Mysql - static volatile HttpPost httppost4 //插入成员请求Mongo + static final HttpPost httpPostToken //鑾峰彇Token鐨勮姹� + static volatile HttpPost httppost //鍒涘缓绾跨储璇锋眰Mysql + static volatile HttpPost httppost2 //鍒涘缓绾跨储璇锋眰MongoDb + static volatile HttpPost httppost3 //鎻掑叆鎴愬憳璇锋眰Mysql + static volatile HttpPost httppost4 //鎻掑叆鎴愬憳璇锋眰Mongo static{ -// supplier.put("房互网",6823) -// supplier.put("房金所",61019) -// supplier.put("复星",624) -// supplier.put("融誉",1825) -// supplier.put("融银科技",18251110) -// supplier.put("中银消费",2625246) -// supplier.put("中原银行",2625258) -// supplier.put("泰隆银行",2012258) -// supplier.put("孚成金融",631018) -// supplier.put("闪电公积金",19471010) - //对应销售易添加团队成员,各成员插入id +// supplier.put("鎴夸簰缃�",6823) +// supplier.put("鎴块噾鎵�",61019) +// supplier.put("澶嶆槦",624) +// supplier.put("铻嶈獕",1825) +// supplier.put("铻嶉摱绉戞妧",18251110) +// supplier.put("涓摱娑堣垂",2625246) +// supplier.put("涓師閾惰",2625258) +// supplier.put("娉伴殕閾惰",2012258) +// supplier.put("瀛氭垚閲戣瀺",631018) +// supplier.put("闂數鍏Н閲�",19471010) + //瀵瑰簲閿�鍞槗娣诲姞鍥㈤槦鎴愬憳锛屽悇鎴愬憳鎻掑叆id - supplier.put("房互网",930385) - supplier.put("房金所",930532) - supplier.put("融银科技",930463) - supplier.put("泰隆银行",930533) - supplier.put("孚成金融",930386) - //supplier.put("闪电公积金",915699) - supplier.put("杭州递金网络科技有限公司-微信",915699) - supplier.put("杭州递金网络科技有限公司-APP",915699) + supplier.put("鎴夸簰缃�",930385) + supplier.put("鎴块噾鎵�",930532) + supplier.put("铻嶉摱绉戞妧",930463) + supplier.put("娉伴殕閾惰",930533) + supplier.put("瀛氭垚閲戣瀺",930386) + //supplier.put("闂數鍏Н閲�",915699) + supplier.put("鏉窞閫掗噾缃戠粶绉戞妧鏈夐檺鍏徃-寰俊",915699) + supplier.put("鏉窞閫掗噾缃戠粶绉戞妧鏈夐檺鍏徃-APP",915699) - //对应销售易的多选 - supplier2.put("房互网",1) - supplier2.put("房金所",2) - supplier2.put("融银科技",5) - supplier2.put("泰隆银行",8) - supplier2.put("孚成金融",9) + //瀵瑰簲閿�鍞槗鐨勫閫� + supplier2.put("鎴夸簰缃�",1) + supplier2.put("鎴块噾鎵�",2) + supplier2.put("铻嶉摱绉戞妧",5) + supplier2.put("娉伴殕閾惰",8) + supplier2.put("瀛氭垚閲戣瀺",9) httpPostToken = new HttpPost("https://api.xiaoshouyi.com/oauth2/token") } void getToken(int count){ Token = null count++ - println("获取Token----------") + println("鑾峰彇Token----------") ArrayList pairs = new ArrayList() pairs.add(new BasicNameValuePair("grant_type", "password")) pairs.add(new BasicNameValuePair("client_id", CLIENT_ID)) @@ -99,25 +99,25 @@ class LoanLeadSync { if (response.getStatusLine().getStatusCode()== HttpStatus.SC_OK){ String result= EntityUtils.toString(response.getEntity(), "utf-8") JSONObject r = JSONObject.fromObject(result) - System.out.println("获取Token结果:"+result) + System.out.println("鑾峰彇Token缁撴灉锛�"+result) if(r.get("access_token")!=null){ Token = r.get("access_token") }else{ - println("获取Token失败:"+result) + println("鑾峰彇Token澶辫触锛�"+result) } } if(!testToken()){ if(count<=TOKEN_ERROR_TIME){ - println("尝试再次获取TOKEN") + println("灏濊瘯鍐嶆鑾峰彇TOKEN") Thread.sleep(STOP_TIME) getToken(count) }else{ -// println(SLEEPTIME/60/1000+"分钟后再次获取") +// println(SLEEPTIME/60/1000+"鍒嗛挓鍚庡啀娆¤幏鍙�") // Thread.sleep(SLEEPTIME) // getToken(0) } }else { - println("获取Token成功------------------------") + println("鑾峰彇Token鎴愬姛------------------------") } } @@ -140,27 +140,27 @@ class LoanLeadSync { static void getSqlConnection(){ dbFangjia = null try{ - println("获取Mysql连接") + println("鑾峰彇Mysql杩炴帴") dbFangjia = Sql.newInstance("jdbc:mysql://mysql.db.fangjia.com:4306/fangjia_fsh?autoReconnect=true&characterEncoding=utf-8&autoReconnect=true", "sa", "G00jia", "com.mysql.jdbc.Driver"); }catch(Exception e){ - println("获取Mysql连接失败") + println("鑾峰彇Mysql杩炴帴澶辫触") e.printStackTrace() } } static void httpPostInit(){ - println("初始化httppost---------") + println("鍒濆鍖杊ttppost---------") httppost = new HttpPost("https://api.xiaoshouyi.com/data/v1/objects/customize/create") httppost2 = new HttpPost("https://api.xiaoshouyi.com/data/v1/objects/customize/create") - httppost3 = new HttpPost("https://api.xiaoshouyi.com/data/v1/objects/group/join-related") //无修改权限 join-owner 有修改权限 - httppost4 = new HttpPost("https://api.xiaoshouyi.com/data/v1/objects/group/join-owner") //有修改权限 join-related 无修改权限 + httppost3 = new HttpPost("https://api.xiaoshouyi.com/data/v1/objects/group/join-related") //鏃犱慨鏀规潈闄� join-owner 鏈変慨鏀规潈闄� + httppost4 = new HttpPost("https://api.xiaoshouyi.com/data/v1/objects/group/join-owner") //鏈変慨鏀规潈闄� join-related 鏃犱慨鏀规潈闄� httppost.addHeader("Content-Type", "application/json; charset=utf-8") httppost.addHeader("Authorization",Token) httppost2.addHeader("Content-Type", "application/json; charset=utf-8") httppost2.addHeader("Authorization",Token) - httppost3.addHeader("Authorization",Token) //表单形式 - httppost4.addHeader("Authorization",Token) //表单形式 - println("初始化httppost完成---------") + httppost3.addHeader("Authorization",Token) //琛ㄥ崟褰㈠紡 + httppost4.addHeader("Authorization",Token) //琛ㄥ崟褰㈠紡 + println("鍒濆鍖杊ttppost瀹屾垚---------") } static void main(String[] args){ @@ -183,23 +183,23 @@ class LoanLeadSync { } void mysqlSync(){ - new Thread(){//mysql的同步 + new Thread(){//mysql鐨勫悓姝� @Override void run() { - System.out.println("mysql同步到销售易开始") + System.out.println("mysql鍚屾鍒伴攢鍞槗寮�濮�") start1() - System.out.println("mysql同步到销售易完毕") + System.out.println("mysql鍚屾鍒伴攢鍞槗瀹屾瘯") } }.start() } void mongoDbSync(){ - new Thread(){//mongoDb的同步 + new Thread(){//mongoDb鐨勫悓姝� @Override void run() { - System.out.println("MongoDB同步到销售易开始") + System.out.println("MongoDB鍚屾鍒伴攢鍞槗寮�濮�") start2() - System.out.println("MongoDB同步到销售易完毕") + System.out.println("MongoDB鍚屾鍒伴攢鍞槗瀹屾瘯") } }.start() } @@ -208,9 +208,9 @@ class LoanLeadSync { try{ loanApplySync() }catch(Exception e){ - System.out.println("mysql同步到销售易出错") + System.out.println("mysql鍚屾鍒伴攢鍞槗鍑洪敊") e.printStackTrace() - //System.out.println("开始继续同步") + //System.out.println("寮�濮嬬户缁悓姝�") //start1() } } @@ -219,9 +219,9 @@ class LoanLeadSync { try{ loanleadsSync() }catch(Exception e){ - System.out.println("MongoDb同步到销售易出错") + System.out.println("MongoDb鍚屾鍒伴攢鍞槗鍑洪敊") e.printStackTrace() - //System.out.println("开始继续同步") + //System.out.println("寮�濮嬬户缁悓姝�") //start2() } } @@ -233,13 +233,13 @@ class LoanLeadSync { int failure2 = 0 int failure3 = 0 String startId - //获取上次Id + //鑾峰彇涓婃Id def record = loan_crm_record.findOne(new BasicDBObject("type",2)) if(record!=null){ startId = record.businessId - System.out.println("从"+startId+"开始MongoDB同步") + System.out.println("浠�"+startId+"寮�濮婱ongoDB鍚屾") }else{ - System.out.println("MongoDB查询上次结束Id失败,结束MongoDB同步") + System.out.println("MongoDB鏌ヨ涓婃缁撴潫Id澶辫触,缁撴潫MongoDB鍚屾") return } System.out.println("") @@ -255,31 +255,31 @@ class LoanLeadSync { } try { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss") - System.out.println("MongoDB开始同步贷款线索id:" + dbo.get("_id")) + System.out.println("MongoDB寮�濮嬪悓姝ヨ捶娆剧嚎绱d锛�" + dbo.get("_id")) println(sdf.format(dbo.get("c_date"))) - List members = MatchRuleMap.getMember((String)dbo.get("source"), (String) dbo.get("loan_type"),(String) dbo.get("city")) //团队成员 + List members = MatchRuleMap.getMember((String)dbo.get("source"), (String) dbo.get("loan_type"),(String) dbo.get("city")) //鍥㈤槦鎴愬憳 String supplierIdStr = getSupplierIdStr(members) String textMsg = "{ \"record\": " + - "{\"customItem1__c\":\""+(dbo.get("loan_uname") == null ? "" : dbo.get("loan_uname"))+"\"," + //贷款人姓名 - "\"name\":\"" + (dbo.get("mobile") == null ? "无" : dbo.get("mobile")) + "\"" + //必传系统标准字段,此处为手机号 - ",\"customItem38__c\":\"" + (dbo.get("mobile") == null ? "无" : dbo.get("mobile")) + "\"" + //手机号 - (dbo.get("province") == null ? "" : ",\"customItem3__c\": \"" + dbo.get("province") + "\"") + //省份 - (dbo.get("city") == null ? "" : ",\"customItem4__c\":\"" + dbo.get("city") + "\" ") + //城市 - (dbo.get("name") == null ? "" : ",\"customItem6__c\":\"" + dbo.get("name") + "\" ") + //小区名称 - (dbo.get("total_price") == null ? "" : ",\"customItem7__c\":\"" + dbo.get("total_price") + "\"") + //房屋总价 - (dbo.get("area") == null ? "" : ",\"customItem8__c\":\"" + dbo.get("area") + "\"") + //房屋面积 - (dbo.get("loan_type") == null ? "" : ",\"customItem35__c\":\"" + dbo.get("loan_type") + "\"") + //申请贷款类型 - (dbo.get("amount") == null ? "" : ",\"customItem14__c\":\"" + dbo.get("amount") + "\"") +//申请金额 - (dbo.get("c_date") == null ? "" : ",\"customItem16__c\":\"" + sdf.format(dbo.get("c_date")) + "\"") + //申请日期 - //(dbo.get("source")==null?"":",\"customItem37__c\":\""+dbo.get("source")+"\" ") + //线索来源 - (dbo.get("address") == null ? "" : ",\"customItem21__c\":\"" + dbo.get("address") + "\" ") + //房屋地址 - (supplierIdStr == "" ? "" : ",\"customItem22__c\":[" + supplierIdStr + "]") + //供应商代码 -// (dbo.get("source") == null ? "" : ",\"customItem37__c\":\"" + dbo.get("source") + "\" ") + "}," + //渠道来源 - ",\"customItem37__c\":\"房价网\" " + "}," + //渠道来源 - "\"belongId\":\"" + BELONGID + "\" }" //必传Id + "{\"customItem1__c\":\""+(dbo.get("loan_uname") == null ? "" : dbo.get("loan_uname"))+"\"," + //璐锋浜哄鍚� + "\"name\":\"" + (dbo.get("mobile") == null ? "鏃�" : dbo.get("mobile")) + "\"" + //蹇呬紶绯荤粺鏍囧噯瀛楁,姝ゅ涓烘墜鏈哄彿 + ",\"customItem38__c\":\"" + (dbo.get("mobile") == null ? "鏃�" : dbo.get("mobile")) + "\"" + //鎵嬫満鍙� + (dbo.get("province") == null ? "" : ",\"customItem3__c\": \"" + dbo.get("province") + "\"") + //鐪佷唤 + (dbo.get("city") == null ? "" : ",\"customItem4__c\":\"" + dbo.get("city") + "\" ") + //鍩庡競 + (dbo.get("name") == null ? "" : ",\"customItem6__c\":\"" + dbo.get("name") + "\" ") + //灏忓尯鍚嶇О + (dbo.get("total_price") == null ? "" : ",\"customItem7__c\":\"" + dbo.get("total_price") + "\"") + //鎴垮眿鎬讳环 + (dbo.get("area") == null ? "" : ",\"customItem8__c\":\"" + dbo.get("area") + "\"") + //鎴垮眿闈㈢Н + (dbo.get("loan_type") == null ? "" : ",\"customItem35__c\":\"" + dbo.get("loan_type") + "\"") + //鐢宠璐锋绫诲瀷 + (dbo.get("amount") == null ? "" : ",\"customItem14__c\":\"" + dbo.get("amount") + "\"") +//鐢宠閲戦 + (dbo.get("c_date") == null ? "" : ",\"customItem16__c\":\"" + sdf.format(dbo.get("c_date")) + "\"") + //鐢宠鏃ユ湡 + //(dbo.get("source")==null?"":",\"customItem37__c\":\""+dbo.get("source")+"\" ") + //绾跨储鏉ユ簮 + (dbo.get("address") == null ? "" : ",\"customItem21__c\":\"" + dbo.get("address") + "\" ") + //鎴垮眿鍦板潃 + (supplierIdStr == "" ? "" : ",\"customItem22__c\":[" + supplierIdStr + "]") + //渚涘簲鍟嗕唬鐮� +// (dbo.get("source") == null ? "" : ",\"customItem37__c\":\"" + dbo.get("source") + "\" ") + "}," + //娓犻亾鏉ユ簮 + ",\"customItem37__c\":\"鎴夸环缃慭" " + "}," + //娓犻亾鏉ユ簮 + "\"belongId\":\"" + BELONGID + "\" }" //蹇呬紶Id int loanId = postLoanLead2(textMsg) if (loanId == -1l) { - for (int i = 0; i < ERROR_ATTEMPT; i++) {//失败尝试 + for (int i = 0; i < ERROR_ATTEMPT; i++) {//澶辫触灏濊瘯 Thread.sleep(STOP_TIME) loanId = postLoanLead2(textMsg) if (loanId != -1) { @@ -287,44 +287,44 @@ class LoanLeadSync { } } } - if(loanId==-2l){//到达每日调用上线停止同步 - println("到达每日调用上线停止同步") + if(loanId==-2l){//鍒拌揪姣忔棩璋冪敤涓婄嚎鍋滄鍚屾 + println("鍒拌揪姣忔棩璋冪敤涓婄嚎鍋滄鍚屾") break } if (loanId != -1l) { - System.out.println("MongoDB同步贷款线索id:\"" + dbo.get("_id") + "\" 成功") + System.out.println("MongoDB鍚屾璐锋绾跨储id锛歕"" + dbo.get("_id") + "\" 鎴愬姛") int res = addTeamMembers2(loanId,members) if (res==1) { success++ - System.out.println("MongoDB贷款线索id:" + dbo.get("_id") + "添加成员完成") + System.out.println("MongoDB璐锋绾跨储id锛�" + dbo.get("_id") + "娣诲姞鎴愬憳瀹屾垚") } else { - loan_crm_record.insert(new BasicDBObject("type", 6).append("loanId", dbo.get("_id")).append("isHandle", 0).append("comment", "MongoDb线索添加成员失败的id")) + loan_crm_record.insert(new BasicDBObject("type", 6).append("loanId", dbo.get("_id")).append("isHandle", 0).append("comment", "MongoDb绾跨储娣诲姞鎴愬憳澶辫触鐨刬d")) failure2++ } if(res==-2){ - println("到达每日调用上线停止同步") + println("鍒拌揪姣忔棩璋冪敤涓婄嚎鍋滄鍚屾") break } } else { - println("MongoDb同步贷款线索id:\"" + dbo.get("_id") + "\" 失败") - loan_crm_record.insert(new BasicDBObject("type", 4).append("loanId", dbo.get("_id")).append("isHandle", 0).append("comment", "MongoDb线索同步失败的id")) + println("MongoDb鍚屾璐锋绾跨储id锛歕"" + dbo.get("_id") + "\" 澶辫触") + loan_crm_record.insert(new BasicDBObject("type", 4).append("loanId", dbo.get("_id")).append("isHandle", 0).append("comment", "MongoDb绾跨储鍚屾澶辫触鐨刬d")) failure1++ } loan_crm_record.update(new BasicDBObject("type", 2), new BasicDBObject('$set', new BasicDBObject("businessId", dbo.get("_id")))) }catch(Exception e){ e.printStackTrace() - println("MonogoDb1条失败开始计入record。。。") - loan_crm_record.insert(new BasicDBObject("type", 8).append("loanId", dbo.get("_id")).append("isHandle", 0).append("comment", "MongoDb线索同步异常失败的id")) + println("MonogoDb1鏉″け璐ュ紑濮嬭鍏ecord銆傘�傘��") + loan_crm_record.insert(new BasicDBObject("type", 8).append("loanId", dbo.get("_id")).append("isHandle", 0).append("comment", "MongoDb绾跨储鍚屾寮傚父澶辫触鐨刬d")) failure3++ } - System.out.println("MonoDB同步贷款线索id:" + dbo.get("_id") + " 完毕") - //break //测试插1条 + System.out.println("MonoDB鍚屾璐锋绾跨储id锛�" + dbo.get("_id") + " 瀹屾瘯") + //break //娴嬭瘯鎻�1鏉� } if(total==0){ - System.out.println("MongoDB中没有新线索") + System.out.println("MongoDB涓病鏈夋柊绾跨储") }else{ - System.out.println("MongoDB同步总数:"+total+" 其中完全同步成功数:"+success+" 同步线索失败数:"+failure1+" 同步线索成功,但添加成员失败数:"+failure2+" 异常失败数: "+failure3) + System.out.println("MongoDB鍚屾鎬绘暟锛�"+total+" 鍏朵腑瀹屽叏鍚屾鎴愬姛鏁帮細"+success+" 鍚屾绾跨储澶辫触鏁帮細"+failure1+" 鍚屾绾跨储鎴愬姛锛屼絾娣诲姞鎴愬憳澶辫触鏁帮細"+failure2+" 寮傚父澶辫触鏁�: "+failure3) } } void loanApplySync(){ //mysql @@ -334,14 +334,14 @@ class LoanLeadSync { int failure2 = 0 int failure3 = 0 String startId = -1 - //获取上次Id + //鑾峰彇涓婃Id def record = loan_crm_record.findOne(new BasicDBObject("type",1)) println(record) if(record!=null){ startId = record.businessId - System.out.println("从"+startId+"开始Mysql同步") + System.out.println("浠�"+startId+"寮�濮婱ysql鍚屾") }else{ - System.out.println("查询上次Mysql结束Id失败,结束同步") + System.out.println("鏌ヨ涓婃Mysql缁撴潫Id澶辫触,缁撴潫鍚屾") return } System.out.println("") @@ -349,12 +349,12 @@ class LoanLeadSync { "l.city as city,h.`name` as `name`,h.total_price as total_price," + "h.area as area,l.apply_money as apply_money,l.add_time as add_time," + "h.address as address, l.eid as eid from loan_apply l LEFT JOIN house_info h ON l.hid = h.id where l.id > "+startId+ " AND l.type=1 ORDER BY l.id ASC" - def rows = dbFangjia.rows(sql)//mysql 房生活贷款申请 + def rows = dbFangjia.rows(sql)//mysql 鎴跨敓娲昏捶娆剧敵璇� total = rows.size() if(rows != null && rows.size()>0){ for(def row : rows){ try{ - System.out.println("Mysql开始同步贷款线索id:"+row.id) + System.out.println("Mysql寮�濮嬪悓姝ヨ捶娆剧嚎绱d锛�"+row.id) String name = getSupplierName((long)row.eid) List members = Arrays.asList(name) String supplierIdStr = getSupplierIdStr(members) @@ -362,7 +362,7 @@ class LoanLeadSync { if(row.city!=null){ province = CityProvinceMap.getProvinceByCity((String)row.city) if(province==null){ - province = CityProvinceMap.getProvinceByCity((String)row.city+"市") + province = CityProvinceMap.getProvinceByCity((String)row.city+"甯�") } if(province==null){ province = CityProvinceMap.getProvinceByCity(((String)row.city).substring(0,((String)row.city).length()-1)) @@ -370,25 +370,25 @@ class LoanLeadSync { } String textMsg = "{ \"record\": " + - "{\"customItem1__c\":\"\"," + //贷款人姓名 - "\"name\":\""+(row.mobile==null?"无":row.mobile)+"\"" + //必传系统标准字段 此处手机号 - ",\"customItem38__c\":\""+(row.mobile==null?"无":row.mobile)+"\"" + //手机号 - (province==null?"":",\"customItem3__c\":\""+province+"\"") + //省份 - (row.city==null?"":",\"customItem4__c\":\""+row.city+"\"") + //城市 - (row.name==null?"":",\"customItem6__c\":\""+row.name+"\"") + //小区名称 - (row.total_price==null?"":",\"customItem7__c\":\""+row.total_price+"\"") + //房屋总价 - (row.area==null?"":",\"customItem8__c\":\""+row.area+"\"") + //房屋面积 - //(row.type==null?"":",\"customItem35__c\":\""+row.type+"\"") + //申请贷款类型 - (row.apply_money==null?"":",\"customItem14__c\":\""+((double)row.apply_money*10000)+"\"") + //申请金额 - (row.add_time==null?"":",\"customItem16__c\":\""+row.add_time+"\"") + //申请日期 - //",\"customItem37__c\":\"\" " + //线索来源 - (row.address==null?"":",\"customItem21__c\":\""+row.address+"\"") + //房屋地址 - (supplierIdStr==""?"":",\"customItem22__c\":["+supplierIdStr+"]") + //供应商代码 - ",\"customItem37__c\":\""+name+"\" },"+ //渠道来源 - "\"belongId\":\""+BELONGID+"\" }" //必传Id + "{\"customItem1__c\":\"\"," + //璐锋浜哄鍚� + "\"name\":\""+(row.mobile==null?"鏃�":row.mobile)+"\"" + //蹇呬紶绯荤粺鏍囧噯瀛楁 姝ゅ鎵嬫満鍙� + ",\"customItem38__c\":\""+(row.mobile==null?"鏃�":row.mobile)+"\"" + //鎵嬫満鍙� + (province==null?"":",\"customItem3__c\":\""+province+"\"") + //鐪佷唤 + (row.city==null?"":",\"customItem4__c\":\""+row.city+"\"") + //鍩庡競 + (row.name==null?"":",\"customItem6__c\":\""+row.name+"\"") + //灏忓尯鍚嶇О + (row.total_price==null?"":",\"customItem7__c\":\""+row.total_price+"\"") + //鎴垮眿鎬讳环 + (row.area==null?"":",\"customItem8__c\":\""+row.area+"\"") + //鎴垮眿闈㈢Н + //(row.type==null?"":",\"customItem35__c\":\""+row.type+"\"") + //鐢宠璐锋绫诲瀷 + (row.apply_money==null?"":",\"customItem14__c\":\""+((double)row.apply_money*10000)+"\"") + //鐢宠閲戦 + (row.add_time==null?"":",\"customItem16__c\":\""+row.add_time+"\"") + //鐢宠鏃ユ湡 + //",\"customItem37__c\":\"\" " + //绾跨储鏉ユ簮 + (row.address==null?"":",\"customItem21__c\":\""+row.address+"\"") + //鎴垮眿鍦板潃 + (supplierIdStr==""?"":",\"customItem22__c\":["+supplierIdStr+"]") + //渚涘簲鍟嗕唬鐮� + ",\"customItem37__c\":\""+name+"\" },"+ //娓犻亾鏉ユ簮 + "\"belongId\":\""+BELONGID+"\" }" //蹇呬紶Id long loanId = postLoanLead(textMsg) if(loanId == -1l){ - for(int i=0;i0) { def row = rows.get(0) def supplierId = supplier2.get(row.name) @@ -462,12 +462,12 @@ class LoanLeadSync { } return str } - String getSupplierName(long eid){ //获取供应商Name + String getSupplierName(long eid){ //鑾峰彇渚涘簲鍟哊ame if (eid==null){ return "" } String sql = "SELECT * from enterprise where id = "+eid - def rows = dbFangjia.rows(sql)//查询供应商 + def rows = dbFangjia.rows(sql)//鏌ヨ渚涘簲鍟� if(rows!=null&&rows.size()>0) { def row = rows.get(0) return row.name @@ -493,10 +493,10 @@ class LoanLeadSync { if (response.getStatusLine().getStatusCode()== HttpStatus.SC_OK){ String result= EntityUtils.toString(response.getEntity(), "utf-8") JSONObject r = JSONObject.fromObject(result) - System.out.println("Mysql添加成员结果:"+result) + System.out.println("Mysql娣诲姞鎴愬憳缁撴灉锛�"+result) if(r.get("users")!=null){ return 1 - }else if(r.get("error_code")!=null&&r.getInt("error_code")==900001){//到达每日调用上限 + }else if(r.get("error_code")!=null&&r.getInt("error_code")==900001){//鍒拌揪姣忔棩璋冪敤涓婇檺 return -2 }else{ return -1 @@ -544,10 +544,10 @@ class LoanLeadSync { if (response.getStatusLine().getStatusCode()== HttpStatus.SC_OK){ String result= EntityUtils.toString(response.getEntity(), "utf-8") JSONObject r = JSONObject.fromObject(result) - System.out.println("Mysql添加成员结果:"+result) + System.out.println("Mysql娣诲姞鎴愬憳缁撴灉锛�"+result) if(r.get("users")!=null){ return 1 - }else if(r.get("error_code")!=null&&r.getInt("error_code")==900001){//到达每日调用上限 + }else if(r.get("error_code")!=null&&r.getInt("error_code")==900001){//鍒拌揪姣忔棩璋冪敤涓婇檺 return -2 }else{ return -1 @@ -566,10 +566,10 @@ class LoanLeadSync { if (response.getStatusLine().getStatusCode()== HttpStatus.SC_OK){ String result= EntityUtils.toString(response.getEntity(), "utf-8") JSONObject r = JSONObject.fromObject(result) - System.out.println("Mysql同步消息发送结果:"+result) + System.out.println("Mysql鍚屾娑堟伅鍙戦�佺粨鏋滐細"+result) if(r.get("id")!=null){ return r.getLong("id") - }else if(r.get("error_code")!=null&&r.getInt("error_code")==900001){//到达每日调用上限 + }else if(r.get("error_code")!=null&&r.getInt("error_code")==900001){//鍒拌揪姣忔棩璋冪敤涓婇檺 return -2l }else{ return -1l @@ -583,10 +583,10 @@ class LoanLeadSync { if (response.getStatusLine().getStatusCode()== HttpStatus.SC_OK){ String result= EntityUtils.toString(response.getEntity(), "utf-8") JSONObject r = JSONObject.fromObject(result) - System.out.println("MongoDB同步消息发送结果:"+result) + System.out.println("MongoDB鍚屾娑堟伅鍙戦�佺粨鏋滐細"+result) if(r.get("id")!=null){ return r.getLong("id") - }else if(r.get("error_code")!=null&&r.getInt("error_code")==900001){//到达每日调用上限 + }else if(r.get("error_code")!=null&&r.getInt("error_code")==900001){//鍒拌揪姣忔棩璋冪敤涓婇檺 return -2l }else{ return -1l diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/loanLeadToCRM/MatchRuleMap.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/loanLeadToCRM/MatchRuleMap.groovy index dc9236f58..d48552798 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/loanLeadToCRM/MatchRuleMap.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/loanLeadToCRM/MatchRuleMap.groovy @@ -7,7 +7,7 @@ import com.mongodb.DBObject /** *zongzhimin - * 贷款线索分配成员规则 + * 璐锋绾跨储鍒嗛厤鎴愬憳瑙勫垯 */ class MatchRuleMap { @@ -18,10 +18,10 @@ class MatchRuleMap { static void init(){ DBCollection match_rule = (DBCollection) MongoUtils.getCollectionByName("fangjia_coresite", "match_rule", "mongo.db.fangjia.com", 27017) - println("初始化匹配规则------") + println("鍒濆鍖栧尮閰嶈鍒�------") def cur = match_rule.find(new BasicDBObject("status":1)) if(null == cur){ - println("查询匹配规则失败") + println("鏌ヨ鍖归厤瑙勫垯澶辫触") return } while(cur.hasNext()){ @@ -31,7 +31,7 @@ class MatchRuleMap { List citys = (List) d.get("citys") String shop_name = d.get("shop_name") for(String source:sources){ - source = source.contains("评估结果")?"评估结果页":source + source = source.contains("璇勪及缁撴灉")?"璇勪及缁撴灉椤�":source for(String loan_type:loan_types){ for(String city:citys){ String key = source+loan_type+city @@ -50,7 +50,7 @@ class MatchRuleMap { } } } - println("初始化匹配规则完毕----") + println("鍒濆鍖栧尮閰嶈鍒欏畬姣�----") } static void reload(){ MRMap.clear() @@ -64,28 +64,28 @@ class MatchRuleMap { return null } List names = new ArrayList(); - source = source.contains("评估结果")?"评估结果页":source.contains("贷款着陆")?"贷款着陆页":source.contains("报告")&&!source.contains("买房报告")&&!source.contains("卖房报告")?"报告":source.contains("买房报告")?"买房报告":source.contains("卖房报告")?"卖房报告":source.contains("贷款分析")?"贷款分析":source.contains("出租报告")?"出租报告":source.contains("租房分析")?"租房分析":source.contains("简要报告")?"简要报告":source - loanType = loanType.contains("信用贷")?"信用贷":loanType.contains("房抵贷")?"房抵贷":loanType.contains("装修贷")?"装修贷":loanType - city = city.endsWith("市")?city.substring(0,city.length()-1):city + source = source.contains("璇勪及缁撴灉")?"璇勪及缁撴灉椤�":source.contains("璐锋鐫�闄�")?"璐锋鐫�闄嗛〉":source.contains("鎶ュ憡")&&!source.contains("涔版埧鎶ュ憡")&&!source.contains("鍗栨埧鎶ュ憡")?"鎶ュ憡":source.contains("涔版埧鎶ュ憡")?"涔版埧鎶ュ憡":source.contains("鍗栨埧鎶ュ憡")?"鍗栨埧鎶ュ憡":source.contains("璐锋鍒嗘瀽")?"璐锋鍒嗘瀽":source.contains("鍑虹鎶ュ憡")?"鍑虹鎶ュ憡":source.contains("绉熸埧鍒嗘瀽")?"绉熸埧鍒嗘瀽":source.contains("绠�瑕佹姤鍛�")?"绠�瑕佹姤鍛�":source + loanType = loanType.contains("淇$敤璐�")?"淇$敤璐�":loanType.contains("鎴挎姷璐�")?"鎴挎姷璐�":loanType.contains("瑁呬慨璐�")?"瑁呬慨璐�":loanType + city = city.endsWith("甯�")?city.substring(0,city.length()-1):city println(source+loanType+city) if(null!=MRMap.get(source+loanType+city)){ names.addAll(MRMap.get(source+loanType+city)) } - if(null!=MRMap.get(source+loanType+"全国")){ - names.addAll(MRMap.get(source+loanType+"全国")) + if(null!=MRMap.get(source+loanType+"鍏ㄥ浗")){ + names.addAll(MRMap.get(source+loanType+"鍏ㄥ浗")) } return names } static void main(String[] args){ - Map supplier = new HashMap() //供应商对应销售易中团队成员id - supplier.put("房互网",930385) - supplier.put("房金所",930532) - supplier.put("融银科技",930463) - supplier.put("泰隆银行",930533) - supplier.put("孚成金融",930386) + Map supplier = new HashMap() //渚涘簲鍟嗗搴旈攢鍞槗涓洟闃熸垚鍛榠d + supplier.put("鎴夸簰缃�",930385) + supplier.put("鎴块噾鎵�",930532) + supplier.put("铻嶉摱绉戞妧",930463) + supplier.put("娉伴殕閾惰",930533) + supplier.put("瀛氭垚閲戣瀺",930386) show() - println(getMember("评估结果页","信用贷","上海")) - List members = getMember("评估结果页","信用贷","上海") + println(getMember("璇勪及缁撴灉椤�","淇$敤璐�","涓婃捣")) + List members = getMember("璇勪及缁撴灉椤�","淇$敤璐�","涓婃捣") String supplierStr ="" for(String member:members) { Integer supplierId = supplier.get(member) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/log/AnalyticsApiLogPerformanceBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/log/AnalyticsApiLogPerformanceBatch.groovy index 26b8c5aa5..bac3bac99 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/log/AnalyticsApiLogPerformanceBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/log/AnalyticsApiLogPerformanceBatch.groovy @@ -105,16 +105,16 @@ class AnalyticsApiLogPerformanceBatch extends BaseBatch { String html = "" html += "
    "+ it+""+ it+"
    " - html += "" + html += "" html += "" html += "" - html += "" - html += "" - html += "" - html += "" - html += "" - html += "" - html += "" + html += "" + html += "" + html += "" + html += "" + html += "" + html += "" + html += "" html += "" println "HTML formatting & saving to DB............................." @@ -146,7 +146,7 @@ class AnalyticsApiLogPerformanceBatch extends BaseBatch { html += "
    ${sdf.format(endDate)} OpenApi数据统计表${sdf.format(endDate)} OpenApi鏁版嵁缁熻琛�
    URI接口名称总访问量平均响应时间(毫秒)1s以内数量1-2s数量2-3s数量3s以上数量鎺ュ彛鍚嶇О鎬昏闂噺骞冲潎鍝嶅簲鏃堕棿(姣)1s浠ュ唴鏁伴噺1-2s鏁伴噺2-3s鏁伴噺3s浠ヤ笂鏁伴噺
    " - sendEmail("${sdf.format(endDate)} OpenApi数据统计表", html) + sendEmail("${sdf.format(endDate)} OpenApi鏁版嵁缁熻琛�", html) println "Email Sent............................." } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/log/CommonLogAnaBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/log/CommonLogAnaBatch.groovy index 94ea4a405..c76046fbc 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/log/CommonLogAnaBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/log/CommonLogAnaBatch.groovy @@ -16,7 +16,7 @@ import com.mongodb.DBObject import com.mongodb.Mongo /** - * 估价页、报告页跳出率 + * 浼颁环椤点�佹姤鍛婇〉璺冲嚭鐜� * */ @BatchOwner(Watcher.YuKai) @@ -56,11 +56,11 @@ class CommonLogAnaBatch extends BaseBatch { shEvaReport = []; bjEvaReport = []; anaLog(sb, dr); - anaSplit(sb, dr, '上海'); - anaSplit(sb, dr, '北京'); + anaSplit(sb, dr, '涓婃捣'); + anaSplit(sb, dr, '鍖椾含'); for(String email : EMAILS) { - jms.sendMail(email, "跳出率&访问量统计报告 " + sdf.format(ca.getTime()), sb.toString()); + jms.sendMail(email, "璺冲嚭鐜�&璁块棶閲忕粺璁℃姤鍛� " + sdf.format(ca.getTime()), sb.toString()); } } @@ -203,30 +203,30 @@ class CommonLogAnaBatch extends BaseBatch { sb.append(''); sb.append(' '); - sb.append(' '); + sb.append(' '); sb.append(' '); sb.append(' '); - sb.append(' '); - if ('上海' == city) { + sb.append(' '); + if ('涓婃捣' == city) { sb.append(' '); - } else if ('北京' == city) { + } else if ('鍖椾含' == city) { sb.append(' '); } sb.append(' '); sb.append(' '); - sb.append(' '); - sb.append(' '); - sb.append(' '); - sb.append(' '); - sb.append(' '); - sb.append(' '); + sb.append(' '); + sb.append(' '); + sb.append(' '); + sb.append(' '); + sb.append(' '); + sb.append(' '); sb.append(' '); sb.append(' '); - sb.append(' '); + sb.append(' '); sb.append(' '); sb.append(' '); sb.append(' '); @@ -235,7 +235,7 @@ class CommonLogAnaBatch extends BaseBatch { sb.append(' '); sb.append(' '); - sb.append(' '); + sb.append(' '); sb.append(' '); sb.append(' '); sb.append(' '); @@ -244,7 +244,7 @@ class CommonLogAnaBatch extends BaseBatch { sb.append(' '); sb.append(' '); - sb.append(' '); + sb.append(' '); sb.append(' '); sb.append(' '); sb.append(' '); @@ -253,7 +253,7 @@ class CommonLogAnaBatch extends BaseBatch { sb.append(' '); sb.append(' '); - sb.append(' '); + sb.append(' '); sb.append(' '); sb.append(' '); sb.append(' '); @@ -262,7 +262,7 @@ class CommonLogAnaBatch extends BaseBatch { sb.append(' '); sb.append(' '); - sb.append(' '); + sb.append(' '); sb.append(' '); sb.append(' '); sb.append(' '); @@ -271,7 +271,7 @@ class CommonLogAnaBatch extends BaseBatch { sb.append(' '); sb.append(' '); - sb.append(' '); + sb.append(' '); sb.append(' '); sb.append(' '); sb.append(' '); @@ -283,16 +283,16 @@ class CommonLogAnaBatch extends BaseBatch { } private void anaLog(StringBuilder sb, Date[] dr) { - // 估价三部曲统计 + // 浼颁环涓夐儴鏇茬粺璁� sb.append('
    报告分拆点击量统计鎶ュ憡鍒嗘媶鐐瑰嚮閲忕粺璁�
    ' + city + '估价结果页(PV/UV)' + city + '浼颁环缁撴灉椤碉紙PV/UV锛�').append(shEvaReport.size() + '/' + shEvaReport.unique().size()).append('').append(bjEvaReport.size() + '/' + bjEvaReport.unique().size()).append('
    类型样例查看数样例查看数(二手房)购买数付款数详情查看数绫诲瀷鏍蜂緥鏌ョ湅鏁�鏍蜂緥鏌ョ湅鏁�(浜屾墜鎴�)璐拱鏁�浠樻鏁�璇︽儏鏌ョ湅鏁�
    成交数据鎴愪氦鏁版嵁').append(sample1).append('').append(esfSample1).append('').append(buy1).append('
    中介情况涓粙鎯呭喌').append(sample5).append('').append(esfSample5).append('').append(buy5).append('
    走势&预测璧板娍&棰勬祴').append(sample6).append('').append(esfSample6).append('').append(buy6).append('
    房子稀缺程度鎴垮瓙绋�缂虹▼搴�').append(sample7).append('').append(esfSample7).append('').append(buy7).append('
    生活便利指数鐢熸椿渚垮埄鎸囨暟').append(sample8).append('').append(esfSample8).append('').append(buy8).append('
    租金租赁情况绉熼噾绉熻祦鎯呭喌').append(sample2).append('').append(esfSample2).append('').append(buy2).append('
    '); sb.append(' '); - sb.append(' '); + sb.append(' '); sb.append(' '); sb.append(' '); - sb.append(' '); - sb.append(' '); - sb.append(' '); + sb.append(' '); + sb.append(' '); + sb.append(' '); sb.append(' '); DBObject query = new BasicDBObject(); @@ -339,34 +339,34 @@ class CommonLogAnaBatch extends BaseBatch { sb.append('

    '); - // 报告频道页统计 - List diaocha = new ArrayList(); // 频道页 - List menuToDiaocha = new ArrayList(); // 菜单到频道页 - List gujiaToDiaocha = new ArrayList(); // 估价到频道页(右侧广告) - List saleToDiaocha = new ArrayList(); // 购买页返回频道页 - List baiduToDiaocha = new ArrayList(); // 百度到频道页 - List sinaWeiboToDiaocha = new ArrayList(); // 新浪微博推广 - List txWeiboToDiaocha = new ArrayList(); // 腾讯微博推广 - List weixinToDiaocha = new ArrayList(); // 微信推广 - List otherToDiaocha = new ArrayList(); // 其他 + // 鎶ュ憡棰戦亾椤电粺璁� + List diaocha = new ArrayList(); // 棰戦亾椤� + List menuToDiaocha = new ArrayList(); // 鑿滃崟鍒伴閬撻〉 + List gujiaToDiaocha = new ArrayList(); // 浼颁环鍒伴閬撻〉锛堝彸渚у箍鍛婏級 + List saleToDiaocha = new ArrayList(); // 璐拱椤佃繑鍥為閬撻〉 + List baiduToDiaocha = new ArrayList(); // 鐧惧害鍒伴閬撻〉 + List sinaWeiboToDiaocha = new ArrayList(); // 鏂版氮寰崥鎺ㄥ箍 + List txWeiboToDiaocha = new ArrayList(); // 鑵捐寰崥鎺ㄥ箍 + List weixinToDiaocha = new ArrayList(); // 寰俊鎺ㄥ箍 + List otherToDiaocha = new ArrayList(); // 鍏朵粬 - List sale = new ArrayList(); // 入口页 - List diaochaToSale = new ArrayList(); // 频道页到入口页 - List gujiaReportToSale = new ArrayList(); // 估价结果到入口页 - List esfToSale = new ArrayList(); // 二手房详情到入口页 - List baiduToSale = new ArrayList(); // 百度到入口页 - List sinaWeiboToSale = new ArrayList(); // 新浪微博推广 - List txWeiboToSale = new ArrayList(); // 腾讯微博推广 - List weixinToSale = new ArrayList(); // 微信推广 - List otherToSale = new ArrayList(); // 其他页到购买页 + List sale = new ArrayList(); // 鍏ュ彛椤� + List diaochaToSale = new ArrayList(); // 棰戦亾椤靛埌鍏ュ彛椤� + List gujiaReportToSale = new ArrayList(); // 浼颁环缁撴灉鍒板叆鍙i〉 + List esfToSale = new ArrayList(); // 浜屾墜鎴胯鎯呭埌鍏ュ彛椤� + List baiduToSale = new ArrayList(); // 鐧惧害鍒板叆鍙i〉 + List sinaWeiboToSale = new ArrayList(); // 鏂版氮寰崥鎺ㄥ箍 + List txWeiboToSale = new ArrayList(); // 鑵捐寰崥鎺ㄥ箍 + List weixinToSale = new ArrayList(); // 寰俊鎺ㄥ箍 + List otherToSale = new ArrayList(); // 鍏朵粬椤靛埌璐拱椤� - List exampleVisits = new ArrayList(); // 查看样例 买家版 - List example2Visits = new ArrayList(); // 查看样例 房东版 - List example3Visits = new ArrayList(); // 查看样例 机构版 + List exampleVisits = new ArrayList(); // 鏌ョ湅鏍蜂緥 涔板鐗� + List example2Visits = new ArrayList(); // 鏌ョ湅鏍蜂緥 鎴夸笢鐗� + List example3Visits = new ArrayList(); // 鏌ョ湅鏍蜂緥 鏈烘瀯鐗� - def saleConfirmCount = 0; // 提交页 - def saleConfirm2Count = 0; // 房东版提交页 - def saleConfirm3Count = 0; // 机构版提交页 + def saleConfirmCount = 0; // 鎻愪氦椤� + def saleConfirm2Count = 0; // 鎴夸笢鐗堟彁浜ら〉 + def saleConfirm3Count = 0; // 鏈烘瀯鐗堟彁浜ら〉 def saleFromPad = 0; def saleConfirmFromPad = 0; @@ -478,24 +478,24 @@ class CommonLogAnaBatch extends BaseBatch { sb.append('
    估价三部曲点击量统计浼颁环涓夐儴鏇�鐐瑰嚮閲忕粺璁�
    快速评估点击数第一步点击数(去第二步)完成数蹇�熻瘎浼扮偣鍑绘暟绗竴姝ョ偣鍑绘暟(鍘荤浜屾)瀹屾垚鏁�
    '); sb.append(' '); - sb.append(' '); + sb.append(' '); sb.append(' '); sb.append(' '); - sb.append(' '); + sb.append(' '); sb.append(' '); sb.append(' '); sb.append(' '); - sb.append(' '); - sb.append(' '); - sb.append(' '); - sb.append(' '); - sb.append(' '); - sb.append(' '); - sb.append(' '); - sb.append(' '); - sb.append(' '); + sb.append(' '); + sb.append(' '); + sb.append(' '); + sb.append(' '); + sb.append(' '); + sb.append(' '); + sb.append(' '); + sb.append(' '); + sb.append(' '); sb.append(' '); sb.append(' '); @@ -518,15 +518,15 @@ class CommonLogAnaBatch extends BaseBatch { sb.append(' '); sb.append(' '); sb.append(' '); - sb.append(' '); + sb.append(' '); sb.append(' '); sb.append(' '); sb.append(' '); - sb.append(' '); + sb.append(' '); sb.append(' '); sb.append(' '); sb.append(' '); - sb.append(' '); + sb.append(' '); sb.append(' '); sb.append(' '); sb.append('
    报告频道页来路统计鎶ュ憡棰戦亾椤�鏉ヨ矾缁熻
    频道页总UV棰戦亾椤垫�籙V' + diaocha.unique().size() + '
    导航菜单进入UV估价页面右侧广告进入UV报告页面返回UV百度推广进入UV新浪微博推广进入UV微信推广进入UV腾讯微博推广进入UV其他进入UV合计瀵艰埅鑿滃崟杩涘叆UV浼颁环椤甸潰鍙充晶骞垮憡杩涘叆UV鎶ュ憡椤甸潰杩斿洖UV鐧惧害鎺ㄥ箍杩涘叆UV鏂版氮寰崥鎺ㄥ箍杩涘叆UV寰俊鎺ㄥ箍杩涘叆UV鑵捐寰崥鎺ㄥ箍杩涘叆UV鍏朵粬杩涘叆UV鍚堣
    ' + diaochaTotla.unique().size() + '
    PDF样例查看次数(买家版)PDF鏍蜂緥鏌ョ湅娆℃暟锛堜拱瀹剁増锛�').append(exampleVisits.size()).append('
    PDF样例查看次数(房东版)PDF鏍蜂緥鏌ョ湅娆℃暟锛堟埧涓滅増锛�').append(example2Visits.size()).append('
    PDF样例查看次数(机构版)PDF鏍蜂緥鏌ョ湅娆℃暟锛堟満鏋勭増锛�').append(example3Visits.size()).append('
    '); @@ -535,24 +535,24 @@ class CommonLogAnaBatch extends BaseBatch { sb.append(''); sb.append(' '); - sb.append(' '); + sb.append(' '); sb.append(' '); sb.append(' '); - sb.append(' '); + sb.append(' '); sb.append(' '); sb.append(' '); sb.append(' '); - sb.append(' '); - sb.append(' '); - sb.append(' '); - sb.append(' '); - sb.append(' '); - sb.append(' '); - sb.append(' '); - sb.append(' '); - sb.append(' '); + sb.append(' '); + sb.append(' '); + sb.append(' '); + sb.append(' '); + sb.append(' '); + sb.append(' '); + sb.append(' '); + sb.append(' '); + sb.append(' '); sb.append(' '); sb.append(' '); @@ -578,42 +578,42 @@ class CommonLogAnaBatch extends BaseBatch { sb.append('

    '); - // 入口页统计 + // 鍏ュ彛椤电粺璁� sb.append('
    报告入口页来路统计鎶ュ憡鍏ュ彛椤�鏉ヨ矾缁熻
    入口页总UV鍏ュ彛椤垫�籙V' + sale.unique().size() + '
    频道页进入UV估价结果页进入UV二手房详情页进入UV百度推广进入UV新浪微博推广进入UV微信推广进入UV腾讯微博推广进入UV其他进入UV合计棰戦亾椤佃繘鍏V浼颁环缁撴灉椤佃繘鍏V浜屾墜鎴胯鎯呴〉杩涘叆UV鐧惧害鎺ㄥ箍杩涘叆UV鏂版氮寰崥鎺ㄥ箍杩涘叆UV寰俊鎺ㄥ箍杩涘叆UV鑵捐寰崥鎺ㄥ箍杩涘叆UV鍏朵粬杩涘叆UV鍚堣
    '); sb.append(' '); - sb.append(' '); + sb.append(' '); sb.append(' '); sb.append(' '); - sb.append(' '); - sb.append(' '); + sb.append(' '); + sb.append(' '); sb.append(' '); - def reportCount = 0; // 确认提交数 - def aliPayCount = 0; // 用支付宝 - def bankPayCount = 0; // 用网银 - def cash = 0; // 全额现金 - def fangbi = 0; // 房币+现金 - def offline = 0; // 货到付款 + def reportCount = 0; // 纭鎻愪氦鏁� + def aliPayCount = 0; // 鐢ㄦ敮浠樺疂 + def bankPayCount = 0; // 鐢ㄧ綉閾� + def cash = 0; // 鍏ㄩ鐜伴噾 + def fangbi = 0; // 鎴垮竵+鐜伴噾 + def offline = 0; // 璐у埌浠樻 def tasteC = 0; - // 房东版数据 - def reportCount2 = 0; // 确认提交数 - def aliPayCount2 = 0; // 用支付宝 - def bankPayCount2 = 0; // 用网银 - def cash2 = 0; // 全额现金 - def fangbi2 = 0; // 房币+现金 - def offline2 = 0; // 货到付款 + // 鎴夸笢鐗堟暟鎹� + def reportCount2 = 0; // 纭鎻愪氦鏁� + def aliPayCount2 = 0; // 鐢ㄦ敮浠樺疂 + def bankPayCount2 = 0; // 鐢ㄧ綉閾� + def cash2 = 0; // 鍏ㄩ鐜伴噾 + def fangbi2 = 0; // 鎴垮竵+鐜伴噾 + def offline2 = 0; // 璐у埌浠樻 def tasteC2 = 0; - // 机构版数据 - def reportCount3 = 0; // 确认提交数 - def aliPayCount3 = 0; // 用支付宝 - def bankPayCount3 = 0; // 用网银 - def cash3 = 0; // 全额现金 - def fangbi3 = 0; // 房币+现金 - def offline3 = 0; // 货到付款 + // 鏈烘瀯鐗堟暟鎹� + def reportCount3 = 0; // 纭鎻愪氦鏁� + def aliPayCount3 = 0; // 鐢ㄦ敮浠樺疂 + def bankPayCount3 = 0; // 鐢ㄧ綉閾� + def cash3 = 0; // 鍏ㄩ鐜伴噾 + def fangbi3 = 0; // 鎴垮竵+鐜伴噾 + def offline3 = 0; // 璐у埌浠樻 def tasteC3 = 0; DBObject tasteQuery = new BasicDBObject(); @@ -878,15 +878,15 @@ class CommonLogAnaBatch extends BaseBatch { } sb.append(' '); - sb.append(' '); - sb.append(' '); + sb.append(' '); + sb.append(' '); sb.append(' '); sb.append(' '); sb.append(' '); - sb.append(' '); - sb.append(' '); - sb.append(' '); + sb.append(' '); + sb.append(' '); + sb.append(' '); sb.append(' '); sb.append(' '); @@ -896,12 +896,12 @@ class CommonLogAnaBatch extends BaseBatch { sb.append(' '); sb.append(' '); - sb.append(' '); - sb.append(' '); - sb.append(' '); - sb.append(' '); - sb.append(' '); - sb.append(' '); + sb.append(' '); + sb.append(' '); + sb.append(' '); + sb.append(' '); + sb.append(' '); + sb.append(' '); sb.append(' '); sb.append(' '); @@ -909,8 +909,8 @@ class CommonLogAnaBatch extends BaseBatch { sb.append(' '); @@ -918,8 +918,8 @@ class CommonLogAnaBatch extends BaseBatch { sb.append(' '); @@ -927,8 +927,8 @@ class CommonLogAnaBatch extends BaseBatch { sb.append(' '); @@ -936,22 +936,22 @@ class CommonLogAnaBatch extends BaseBatch { sb.append(' '); sb.append(' '); - sb.append(' '); - sb.append(' '); + sb.append(' '); + sb.append(' '); sb.append(' '); - sb.append(' '); - sb.append(' '); + sb.append(' '); + sb.append(' '); sb.append(' '); - sb.append(' '); - sb.append(' '); + sb.append(' '); + sb.append(' '); sb.append(' '); sb.append(' '); sb.append(' '); @@ -959,8 +959,8 @@ class CommonLogAnaBatch extends BaseBatch { sb.append(' '); @@ -968,8 +968,8 @@ class CommonLogAnaBatch extends BaseBatch { sb.append(' '); @@ -981,12 +981,12 @@ class CommonLogAnaBatch extends BaseBatch { sb.append('
    购买流程流失率统计璐拱娴佺▼娴佸け鐜�缁熻
    入口页访问次数提交页访问次数鍏ュ彛椤佃闂鏁�鎻愪氦椤佃闂鏁�
    ').append(saleVisitCount).append('
    (来自PAD:').append(saleFromPad).append(')
    ').append(saleConfirmCount + saleConfirm2Count + saleConfirm3Count).append('
    (来自PAD:').append(saleConfirmFromPad).append(')
    ').append(saleVisitCount).append('
    (鏉ヨ嚜PAD锛�').append(saleFromPad).append(')
    ').append(saleConfirmCount + saleConfirm2Count + saleConfirm3Count).append('
    (鏉ヨ嚜PAD锛�').append(saleConfirmFromPad).append(')
     买家版房东版机构版涔板鐗�鎴夸笢鐗�鏈烘瀯鐗�
    跳出数确认提交数跳出数确认提交数跳出数确认提交数璺冲嚭鏁�纭鎻愪氦鏁�璺冲嚭鏁�纭鎻愪氦鏁�璺冲嚭鏁�纭鎻愪氦鏁�
    ').append(reportCount); if (reportCount > 0) { sb.append(''); - sb.append('
    支付宝:').append(aliPayCount).append(';网银:').append(bankPayCount) - .append('
    现金:').append(cash).append(';房币+现金:').append(fangbi).append(';货到付款:').append(offline).append(';免费体验:').append(tasteC); + sb.append('
    鏀粯瀹濓細').append(aliPayCount).append('锛涚綉閾讹細').append(bankPayCount) + .append('
    鐜伴噾锛�').append(cash).append('锛涙埧甯�+鐜伴噾锛�').append(fangbi).append('锛涜揣鍒颁粯娆撅細').append(offline).append('锛涘厤璐逛綋楠岋細').append(tasteC); sb.append('
    '); } sb.append('
    ').append(reportCount2); if (reportCount2 > 0) { sb.append(''); - sb.append('
    支付宝:').append(aliPayCount2).append(';网银:').append(bankPayCount2) - .append('
    现金:').append(cash2).append(';房币+现金:').append(fangbi2).append(';货到付款:').append(offline2).append(';免费体验:').append(tasteC2); + sb.append('
    鏀粯瀹濓細').append(aliPayCount2).append('锛涚綉閾讹細').append(bankPayCount2) + .append('
    鐜伴噾锛�').append(cash2).append('锛涙埧甯�+鐜伴噾锛�').append(fangbi2).append('锛涜揣鍒颁粯娆撅細').append(offline2).append('锛涘厤璐逛綋楠岋細').append(tasteC2); sb.append('
    '); } sb.append('
    ').append(reportCount3); if (reportCount2 > 0) { sb.append(''); - sb.append('
    支付宝:').append(aliPayCount3).append(';网银:').append(bankPayCount3) - .append('
    现金:').append(cash3).append(';房币+现金:').append(fangbi3).append(';货到付款:').append(offline3).append(';免费体验:').append(tasteC3); + sb.append('
    鏀粯瀹濓細').append(aliPayCount3).append('锛涚綉閾讹細').append(bankPayCount3) + .append('
    鐜伴噾锛�').append(cash3).append('锛涙埧甯�+鐜伴噾锛�').append(fangbi3).append('锛涜揣鍒颁粯娆撅細').append(offline3).append('锛涘厤璐逛綋楠岋細').append(tasteC3); sb.append('
    '); } sb.append('
     付款数免费体验浠樻鏁�鍏嶈垂浣撻獙 付款数免费体验浠樻鏁�鍏嶈垂浣撻獙 付款数免费体验浠樻鏁�鍏嶈垂浣撻獙
    ').append(a_reportCount); if (a_reportCount > 0) { sb.append(''); - sb.append('
    支付宝:').append(a_aliPayCount).append(';网银:').append(a_bankPayCount) - .append('
    现金:').append(a_cash).append(';房币+现金:').append(a_fangbi).append(';货到付款:').append(a_offline); + sb.append('
    鏀粯瀹濓細').append(a_aliPayCount).append('锛涚綉閾讹細').append(a_bankPayCount) + .append('
    鐜伴噾锛�').append(a_cash).append('锛涙埧甯�+鐜伴噾锛�').append(a_fangbi).append('锛涜揣鍒颁粯娆撅細').append(a_offline); sb.append('
    '); } sb.append('
    ').append(a_reportCount2); if (a_reportCount2 > 0) { sb.append(''); - sb.append('
    支付宝:').append(a_aliPayCount2).append(';网银:').append(a_bankPayCount2) - .append('
    现金:').append(a_cash2).append(';房币+现金:').append(a_fangbi2).append(';货到付款:').append(a_offline2); + sb.append('
    鏀粯瀹濓細').append(a_aliPayCount2).append('锛涚綉閾讹細').append(a_bankPayCount2) + .append('
    鐜伴噾锛�').append(a_cash2).append('锛涙埧甯�+鐜伴噾锛�').append(a_fangbi2).append('锛涜揣鍒颁粯娆撅細').append(a_offline2); sb.append('
    '); } sb.append('
    ').append(a_reportCount3); if (a_reportCount3 > 0) { sb.append(''); - sb.append('
    支付宝:').append(a_aliPayCount3).append(';网银:').append(a_bankPayCount3) - .append('
    现金:').append(a_cash3).append(';房币+现金:').append(a_fangbi3).append(';货到付款:').append(a_offline3); + sb.append('
    鏀粯瀹濓細').append(a_aliPayCount3).append('锛涚綉閾讹細').append(a_bankPayCount3) + .append('
    鐜伴噾锛�').append(a_cash3).append('锛涙埧甯�+鐜伴噾锛�').append(a_fangbi3).append('锛涜揣鍒颁粯娆撅細').append(a_offline3); sb.append('
    '); } sb.append('
    '); sb.append(' '); - sb.append(' '); + sb.append(' '); sb.append(' '); sb.append(' '); - sb.append(' '); - sb.append(' '); + sb.append(' '); + sb.append(' '); sb.append(' '); sb.append(' '); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/log/DaikuanLogAnaBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/log/DaikuanLogAnaBatch.groovy index 41c9da3f7..8d67876ed 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/log/DaikuanLogAnaBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/log/DaikuanLogAnaBatch.groovy @@ -14,7 +14,7 @@ import com.mongodb.DBObject import com.mongodb.Mongo /** - * 贷款频道流量分析 + * 璐锋棰戦亾娴侀噺鍒嗘瀽 * */ @BatchOwner(Watcher.YuKai) @@ -51,22 +51,22 @@ class DaikuanLogAnaBatch extends BaseBatch { doProcess(sb, dr); for(String email : EMAILS) { - jms.sendMail(email, "抵押贷款&估价师频道访问量统计报告 " + sdf.format(ca.getTime()), sb.toString()); + jms.sendMail(email, "鎶垫娂璐锋&浼颁环甯堥閬撹闂噺缁熻鎶ュ憡 " + sdf.format(ca.getTime()), sb.toString()); } } public void doProcess(StringBuilder sb, Date[] dr) { sb.append('
    转换率统计杞崲鐜�缁熻
    频道页面-入口页面提交页面-付款棰戦亾椤甸潰-鍏ュ彛椤甸潰鎻愪氦椤甸潰-浠樻
    '); sb.append(' '); - sb.append(' '); + sb.append(' '); sb.append(' '); sb.append(' '); - sb.append(' '); - sb.append(' '); - sb.append(' '); - sb.append(' '); - sb.append(' '); + sb.append(' '); + sb.append(' '); + sb.append(' '); + sb.append(' '); + sb.append(' '); sb.append(' '); Date startDate = dr[0]; @@ -201,18 +201,18 @@ class DaikuanLogAnaBatch extends BaseBatch { sb.append(' '); sb.append(' '); - sb.append(' '); - sb.append(' '); - sb.append(' '); - sb.append(' '); - sb.append(' '); - sb.append(' '); - sb.append(' '); - sb.append(' '); - sb.append(' '); + sb.append(' '); + sb.append(' '); + sb.append(' '); + sb.append(' '); + sb.append(' '); + sb.append(' '); + sb.append(' '); + sb.append(' '); + sb.append(' '); sb.append(' '); - sb.append(' '); - sb.append(' '); + sb.append(' '); + sb.append(' '); sb.append(' '); sb.append(' '); @@ -244,21 +244,21 @@ class DaikuanLogAnaBatch extends BaseBatch { } sb.append('
    抵押贷款点击量统计(PV/UV)鎶垫娂璐锋鐐瑰嚮閲忕粺璁★紙PV/UV锛�
    首页查询页列表页详情页申请数棣栭〉鏌ヨ椤�鍒楄〃椤�璇︽儏椤�鐢宠鏁�
    网站百度估价页右侧估价页左中二手房详情百度其他估价页左中其他缃戠珯鐧惧害浼颁环椤靛彸渚�浼颁环椤靛乏涓�浜屾墜鎴胯鎯�鐧惧害鍏朵粬浼颁环椤靛乏涓�鍏朵粬 网站百度缃戠珯鐧惧害
    '); sb.append(' '); - sb.append(' '); + sb.append(' '); sb.append(' '); sb.append(' '); - sb.append(' '); - sb.append(' '); + sb.append(' '); + sb.append(' '); sb.append(' '); sb.append(' '); sb.append(' '); sb.append(' '); sb.append(' '); sb.append(' '); - sb.append(' '); - sb.append(' '); - sb.append(' '); - sb.append(' '); + sb.append(' '); + sb.append(' '); + sb.append(' '); + sb.append(' '); sb.append(' '); sb.append(' '); sb.append(' '); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/log/DistrictAttentionLogBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/log/DistrictAttentionLogBatch.groovy index 15a48d38d..16fac47b4 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/log/DistrictAttentionLogBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/log/DistrictAttentionLogBatch.groovy @@ -16,7 +16,7 @@ import com.mongodb.DBObject import org.apache.commons.lang.StringUtils /** - * 解析小区关注度 + * 瑙f瀽灏忓尯鍏虫敞搴� * @author shibb * */ @@ -30,10 +30,10 @@ class DistrictAttentionLogBatch extends BaseBatch{ def districtBlockMap = [:] public static void main(String[] args) { - println "Starting............................. ${new Date().format("yyyy年MM月dd日 HH:mm:ss")}" + println "Starting............................. ${new Date().format("yyyy骞碝M鏈坉d鏃� HH:mm:ss")}" DistrictAttentionLogBatch batch = new DistrictAttentionLogBatch() runBatch(batch, args) - println "End............................. ${new Date().format("yyyy年MM月dd日 HH:mm:ss")}" + println "End............................. ${new Date().format("yyyy骞碝M鏈坉d鏃� HH:mm:ss")}" } @@ -59,7 +59,7 @@ class DistrictAttentionLogBatch extends BaseBatch{ String cityName = gasm.substring(gasm.lastIndexOf("y_")+2) if(StringUtils.isNotBlank(cityStr) && StringUtils.isNotBlank(region) && StringUtils.isNotBlank(district)){ if(!ALL_CITY.contains(cityName)){ - println("错误小区名:city:${cityName} region: ${region} ${district}") + println("閿欒灏忓尯鍚�:city:${cityName} region: ${region} ${district}") continue } String block = findDistrictBlock(cityStr, region, district); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/log/DistrictAttentionLogCaculateBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/log/DistrictAttentionLogCaculateBatch.groovy index 60dc2ade8..f901140a3 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/log/DistrictAttentionLogCaculateBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/log/DistrictAttentionLogCaculateBatch.groovy @@ -17,7 +17,7 @@ import com.mongodb.DBObject import org.apache.commons.lang.StringUtils /** - * 计算各个小区的关注度 + * 璁$畻鍚勪釜灏忓尯鐨勫叧娉ㄥ害 * @author shibb * */ @@ -39,20 +39,20 @@ class DistrictAttentionLogCaculateBatch extends BaseBatch { @Override public void process(Object args) { - //计算小区关注度 + //璁$畻灏忓尯鍏虫敞搴� calculateData(); - //计算小区城市关注度排行 + //璁$畻灏忓尯鍩庡競鍏虫敞搴︽帓琛� calculateRankInCity(); - println("城市排名计算完成") - //计算小区区域关注度排行 + println("鍩庡競鎺掑悕璁$畻瀹屾垚") + //璁$畻灏忓尯鍖哄煙鍏虫敞搴︽帓琛� calculateRankInRegion(); - println("区域排名计算完成") - //计算小区板块关注度排 + println("鍖哄煙鎺掑悕璁$畻瀹屾垚") + //璁$畻灏忓尯鏉垮潡鍏虫敞搴︽帓 calculateRankInBlock() - println("版块排名计算完成") - //将数据更新到线上rank表 + println("鐗堝潡鎺掑悕璁$畻瀹屾垚") + //灏嗘暟鎹洿鏂板埌绾夸笂rank琛� updateDataToPro(); - println("完成") + println("瀹屾垚") } def calculateData() { @@ -67,14 +67,14 @@ class DistrictAttentionLogCaculateBatch extends BaseBatch { BasicDBObject dbo = iter.next() if(!allCity.contains(dbo.city)){ analyColl.remove(new BasicDBObject("_id", dbo._id)) - println("删除:" + dbo) + println("鍒犻櫎:" + dbo) continue } String gasm = dbo.get("gasm"); gasmCountMap[gasm] = gasmCountMap.get(gasm, 0) + 1 progress ++ if(progress % 50000 == 0){ - println("${new Date().format("yyyy年MM月dd日 HH:mm:ss ")}分组进度:" + DataUtil.roundDouble(progress*100/total,2) + "%") + println("${new Date().format("yyyy骞碝M鏈坉d鏃� HH:mm:ss ")}鍒嗙粍杩涘害:" + DataUtil.roundDouble(progress*100/total,2) + "%") } } total = gasmCountMap.size() @@ -100,16 +100,16 @@ class DistrictAttentionLogCaculateBatch extends BaseBatch { if(progress % 5000 == 0){ resultColl.insert(buffer) buffer.clear() - println("${new Date().format("yyyy年MM月dd日 HH:mm:ss ")}入库进度:" + DataUtil.roundDouble(progress*100/total,2) + "%") + println("${new Date().format("yyyy骞碝M鏈坉d鏃� HH:mm:ss ")}鍏ュ簱杩涘害:" + DataUtil.roundDouble(progress*100/total,2) + "%") } } resultColl.insert(buffer) - println("${new Date().format("yyyy年MM月dd日 HH:mm:ss ")}小区关注度统计结束") + println("${new Date().format("yyyy骞碝M鏈坉d鏃� HH:mm:ss ")}灏忓尯鍏虫敞搴︾粺璁$粨鏉�") } /** - * 获得小区版块信息 + * 鑾峰緱灏忓尯鐗堝潡淇℃伅 * @param city * @param region * @param name @@ -138,7 +138,7 @@ class DistrictAttentionLogCaculateBatch extends BaseBatch { } progress ++ if(progress % 10000 == 1){ - println("${new Date().format("yyyy年MM月dd日 HH:mm:ss ")}CPDB数据加载进度:" + DataUtil.roundDouble(progress*100/total,2) + "%") + println("${new Date().format("yyyy骞碝M鏈坉d鏃� HH:mm:ss ")}CPDB鏁版嵁鍔犺浇杩涘害:" + DataUtil.roundDouble(progress*100/total,2) + "%") } } @@ -148,7 +148,7 @@ class DistrictAttentionLogCaculateBatch extends BaseBatch { } /** - * 计算小区城市排名 + * 璁$畻灏忓尯鍩庡競鎺掑悕 */ def calculateRankInCity() { @@ -162,16 +162,16 @@ class DistrictAttentionLogCaculateBatch extends BaseBatch { entity.put("cityRank", order++); resultColl.update(new BasicDBObject("_id", dbo._id), new BasicDBObject('$set', entity)); if(order % 1000 == 0){ - println("${new Date().format("yyyy年MM月dd日 HH:mm:ss ")} ${city}小区城市排名计算进度:" + DataUtil.roundDouble(order*100/total,2) + "%") + println("${new Date().format("yyyy骞碝M鏈坉d鏃� HH:mm:ss ")} ${city}灏忓尯鍩庡競鎺掑悕璁$畻杩涘害:" + DataUtil.roundDouble(order*100/total,2) + "%") } } - println("${city} 小区排名计算结束") + println("${city} 灏忓尯鎺掑悕璁$畻缁撴潫") } } /** - * 计算小区在区域中的排名 + * 璁$畻灏忓尯鍦ㄥ尯鍩熶腑鐨勬帓鍚� */ def calculateRankInRegion() { @@ -185,14 +185,14 @@ class DistrictAttentionLogCaculateBatch extends BaseBatch { cursor.each {BasicDBObject dbObject-> resultColl.update(new BasicDBObject("_id", dbObject._id), new BasicDBObject('$set', new BasicDBObject('regionRank', order++))); } - println("${new Date().format("yyyy年MM月dd日 HH:mm:ss ")} ${city} ${region} 排名计算完成") + println("${new Date().format("yyyy骞碝M鏈坉d鏃� HH:mm:ss ")} ${city} ${region} 鎺掑悕璁$畻瀹屾垚") } } } /** - * 计算小区在版块中的排名 + * 璁$畻灏忓尯鍦ㄧ増鍧椾腑鐨勬帓鍚� */ def calculateRankInBlock() { @@ -216,13 +216,13 @@ class DistrictAttentionLogCaculateBatch extends BaseBatch { entity.put("blockRank", order++); resultColl.update(new BasicDBObject("_id", obj._id), new BasicDBObject('$set', entity)); } - println("${new Date().format("yyyy年MM月dd日 HH:mm:ss ")} ${city} ${block} 版块排名计算完成") + println("${new Date().format("yyyy骞碝M鏈坉d鏃� HH:mm:ss ")} ${city} ${block} 鐗堝潡鎺掑悕璁$畻瀹屾垚") } } } /** - * 更新数据到生产环境 + * 鏇存柊鏁版嵁鍒扮敓浜х幆澧� */ def updateDataToPro() { Date monthly = getLastEndMonthDate(new Date()); @@ -250,7 +250,7 @@ class DistrictAttentionLogCaculateBatch extends BaseBatch { lineColl.update(query, new BasicDBObject('$set', entity), true, false) x = x + 1; if(x % 10000 == 0){ - println("${new Date().format("yyyy年MM月dd日 HH:mm:ss ")} 数据更新到线上:${x}/${total}") + println("${new Date().format("yyyy骞碝M鏈坉d鏃� HH:mm:ss ")} 鏁版嵁鏇存柊鍒扮嚎涓�:${x}/${total}") } } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/log/DynamicLogByCityAndSiteBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/log/DynamicLogByCityAndSiteBatch.groovy index ab7448959..066a52fce 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/log/DynamicLogByCityAndSiteBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/log/DynamicLogByCityAndSiteBatch.groovy @@ -119,7 +119,7 @@ import org.apache.poi.ss.usermodel.Row import org.apache.poi.ss.usermodel.Sheet; /** - * 房源监控程序 + * 鎴挎簮鐩戞帶绋嬪簭 * @author shibb * */ @@ -140,25 +140,25 @@ class DynamicLogByCityAndSiteBatch extends BaseBatch{ @Override public void process(Object args) { - println "开始时间:"+new Date() + "\n"; + println "寮�濮嬫椂闂�:"+new Date() + "\n"; int i = 1; // String cat = "rent"; for(String cat : category) { - println "类型" + cat; - //计算总的结果 + println "绫诲瀷" + cat; + //璁$畻鎬荤殑缁撴灉 runTotalNumber(cat,i); - //计算各网站个页面的结果 + //璁$畻鍚勭綉绔欎釜椤甸潰鐨勭粨鏋� runSiteNameNumber(cat,i); - //按城市统计 + //鎸夊煄甯傜粺璁� runDynamicByCity(cat,i); - //按网站统计 + //鎸夌綉绔欑粺璁� runDynamicBySite(cat,i); } - println "结束时间:"+new Date() + "\n"; + println "缁撴潫鏃堕棿:"+new Date() + "\n"; } /** - * 按城市统计 + * 鎸夊煄甯傜粺璁� * add by shibb * @param args */ @@ -205,7 +205,7 @@ class DynamicLogByCityAndSiteBatch extends BaseBatch{ int i13=0; int i14=0; int i15=0; - String city = site.get(h).get("city");//区域 + String city = site.get(h).get("city");//鍖哄煙 DBObject query = new BasicDBObject('c_date', new BasicDBObject('$gte', dateRange[0]).append('$lte', dateRange[1])) .append('category', cat).append("city", city) def dscury = statColl.find(query); @@ -299,7 +299,7 @@ class DynamicLogByCityAndSiteBatch extends BaseBatch{ } /** - * 按网站统计 + * 鎸夌綉绔欑粺璁� * add by shibb * @param args */ @@ -347,8 +347,8 @@ class DynamicLogByCityAndSiteBatch extends BaseBatch{ int i12=0; int i13=0; int i14=0; - int i15=0;//解析错误数 - String siteName = site.get(h).get("site_name");//区域 + int i15=0;//瑙f瀽閿欒鏁� + String siteName = site.get(h).get("site_name");//鍖哄煙 String pageName = site.get(h).get("page_name"); DBObject query = new BasicDBObject('c_date', new BasicDBObject('$gte', dateRange[0]).append('$lte', dateRange[1])) .append('category', cat).append("site_name", siteName).append("page_name", pageName) @@ -444,7 +444,7 @@ class DynamicLogByCityAndSiteBatch extends BaseBatch{ } /** - * 统计昨天的具体城市网站 + * 缁熻鏄ㄥぉ鐨勫叿浣撳煄甯傜綉绔� * add by shibb * @param args */ @@ -479,7 +479,7 @@ class DynamicLogByCityAndSiteBatch extends BaseBatch{ } /** - * 按日期总的统计 + * 鎸夋棩鏈熸�荤殑缁熻 * add by shibb * @param args */ @@ -511,10 +511,10 @@ class DynamicLogByCityAndSiteBatch extends BaseBatch{ int i12=0; int i13=0; int i14=0; - int i15=0;//更新数 - int i16=0;//保存数 - int i17=0;//放弃数 - int i18=0;//解析错误数目 + int i15=0;//鏇存柊鏁� + int i16=0;//淇濆瓨鏁� + int i17=0;//鏀惧純鏁� + int i18=0;//瑙f瀽閿欒鏁扮洰 while(iter.hasNext()){ DBObject dbo = iter.next() Map log = new HashMap(); @@ -623,7 +623,7 @@ class DynamicLogByCityAndSiteBatch extends BaseBatch{ } /** - * 按城市网站页面统计 + * 鎸夊煄甯傜綉绔欓〉闈㈢粺璁� * add by shibb * @param args */ @@ -671,9 +671,9 @@ class DynamicLogByCityAndSiteBatch extends BaseBatch{ int i12=0; int i13=0; int i14=0; - int i15=0;//解析错误 - String city = site.get(h).get("city");//小区名称 - String siteName = site.get(h).get("site_name");//区域 + int i15=0;//瑙f瀽閿欒 + String city = site.get(h).get("city");//灏忓尯鍚嶇О + String siteName = site.get(h).get("site_name");//鍖哄煙 String pageName = site.get(h).get("page_name"); DBObject query = new BasicDBObject('c_date', new BasicDBObject('$gte', dateRange[0]).append('$lte', dateRange[1])) .append('category', category).append("city", city).append("site_name", siteName).append("page_name", pageName) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/log/ElasticLogAnaBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/log/ElasticLogAnaBatch.groovy index 8d2e46f30..e72915a94 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/log/ElasticLogAnaBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/log/ElasticLogAnaBatch.groovy @@ -14,7 +14,7 @@ import org.apache.commons.lang.StringUtils import java.text.SimpleDateFormat /** - * 功能说明:分析ELK搜集的日志数据 + * 鍔熻兘璇存槑:鍒嗘瀽ELK鎼滈泦鐨勬棩蹇楁暟鎹� */ @BatchOwner(Watcher.WangWenYan) class ElasticLogAnaBatch extends BaseBatch { @@ -25,9 +25,9 @@ class ElasticLogAnaBatch extends BaseBatch { HttpRequest request = new HttpRequest() static String STATUS_500 = "500"; - static String MSG_ServiceNotAvailable = "服务不可用"; + static String MSG_ServiceNotAvailable = "鏈嶅姟涓嶅彲鐢�"; static String STATUS_200 = "200"; - static String MSG_ExceedTime = "接口处理超时,处理时间"; + static String MSG_ExceedTime = "鎺ュ彛澶勭悊瓒呮椂,澶勭悊鏃堕棿"; long SendMsgTime = 10 * 60 * 1000; Map map_url_send_time = new HashMap<>(); @@ -99,7 +99,7 @@ class ElasticLogAnaBatch extends BaseBatch { return; } - msgs << "### 发现异常" + msgs << "### 鍙戠幇寮傚父" int rowlogSize = 45; for(JSONObject log : logs){ if(log == null){ @@ -110,7 +110,7 @@ class ElasticLogAnaBatch extends BaseBatch { if(StringUtils.equalsIgnoreCase(STATUS_200, status)){ second += "("; double request_time = log.getDouble("request_time") - second += request_time + "秒)" + second += request_time + "绉�)" } // System.out.println("#### ${log.time_local} ${log.domain} ${log.status} ${title}${second}".toString()) @@ -131,7 +131,7 @@ class ElasticLogAnaBatch extends BaseBatch { // } msgs.add(msg2) } - DingDingMessageUtil.sendMarkdownMessage("2307d2fec8314b3e8b4b83dd1d42da2e2051638e3e668f21e77ca01258bf682c", "异常警报", msgs.join("\n")) + DingDingMessageUtil.sendMarkdownMessage("2307d2fec8314b3e8b4b83dd1d42da2e2051638e3e668f21e77ca01258bf682c", "寮傚父璀︽姤", msgs.join("\n")) } List getUnOkLogs(Date startDate, Date endDate) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/log/MongoDBLogDisMonitorBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/log/MongoDBLogDisMonitorBatch.groovy index db31c16bc..7593bed99 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/log/MongoDBLogDisMonitorBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/log/MongoDBLogDisMonitorBatch.groovy @@ -59,9 +59,9 @@ class MongoDBLogDisMonitorBatch extends BaseBatch { def request = rs.getString("request").replace("\"", ""); def responsetime = rs.getLong("responsetime"); def timestamp = DateUtil.formatByPattern(new Date(rs.getLong("time")), "yyyy-MM-dd HH:mm") - msgBuffer.append("\nmongodb_ip:" + ip + ";client_ip:" + client_ip + ":" + client_port + ";\nmethod:" + method + ";request:" + request + ";timestamp:" + timestamp + ";responsetime:" + responsetime / 1000 + "s\n") + msgBuffer.append("\nmongodb_ip:" + ip + ";client_ip:" + client_ip + ":" + client_port + ";\nmethod:" + method + ";request:" + request + ";timestamp:" + timestamp + ";responsetime锛�" + responsetime / 1000 + "s\n") } - String msg = "调用fangjia.district_stat日志信息(>5s):【" + msgBuffer.toString() + "】" + String msg = "璋冪敤fangjia.district_stat鏃ュ織淇℃伅(>5s):銆�" + msgBuffer.toString() + "銆�" println(msg + "" + msgBuffer.length()) if (msgBuffer.length() > 0) { print(msg) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/log/MongoDBLogMonitorBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/log/MongoDBLogMonitorBatch.groovy index eefeb9712..389eae851 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/log/MongoDBLogMonitorBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/log/MongoDBLogMonitorBatch.groovy @@ -60,9 +60,9 @@ class MongoDBLogMonitorBatch extends BaseBatch { def request = rs.getString("request").replace("\"", ""); def responsetime = rs.getLong("responsetime"); def timestamp = DateUtil.formatByPattern(new Date(rs.getLong("time")), "yyyy-MM-dd HH:mm") - msgBuffer.append("\nmongodb_ip:" + ip + ";client_ip:" + client_ip + ":" + client_port + ";\nmethod:" + method + ";request:" + request + ";timestamp:" + timestamp + ";responsetime:" + responsetime / 1000 + "s\n") + msgBuffer.append("\nmongodb_ip:" + ip + ";client_ip:" + client_ip + ":" + client_port + ";\nmethod:" + method + ";request:" + request + ";timestamp:" + timestamp + ";responsetime锛�" + responsetime / 1000 + "s\n") } - String msg = "mongodb慢查询日志信息(>5s):【" + msgBuffer.toString() + "】" + String msg = "mongodb鎱㈡煡璇㈡棩蹇椾俊鎭�(>5s):銆�" + msgBuffer.toString() + "銆�" println(msg + "" + msgBuffer.length()) if (msgBuffer.length() > 0) { sendDingDingMsg(TOKEN,msg) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/log/ReadAnalyDynamicLog.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/log/ReadAnalyDynamicLog.groovy index fb0b87931..6b4b28039 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/log/ReadAnalyDynamicLog.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/log/ReadAnalyDynamicLog.groovy @@ -33,7 +33,7 @@ import org.json.JSONObject; @BatchOwner(Watcher.Shibb) class ReadAnalyDynamicLog extends BaseBatch{ - //顺序要与解析那边一致 + //椤哄簭瑕佷笌瑙f瀽閭h竟涓�鑷� public static final String[] VILLA_TYPE = ["result","content", "cat", "region", "district_name", "area", "total_price", "publish_date", "name_length", "room", "area_content", "area_content", "total_price_content", "name"]; //private final static DBCollection errorColl = MongoUtils.getCollectionByName("artemis", "analy_error_detail", "coredata.mongo.db.fangjia.com"); @@ -97,16 +97,16 @@ class ReadAnalyDynamicLog extends BaseBatch{ if(null == text){ DBObject entity = getNormalLog(); entity.put("date",before_date) - if("更新".equals(lineMap.get("opt"))){ + if("鏇存柊".equals(lineMap.get("opt"))){ entity.put("update", 1); entity.put("success", 1); - }else if("保存".equals(lineMap.get("opt"))){ + }else if("淇濆瓨".equals(lineMap.get("opt"))){ entity.put("save", 1); entity.put("success", 1); - }else if("放弃".equals(lineMap.get("opt"))){ + }else if("鏀惧純".equals(lineMap.get("opt"))){ entity.put("giveup", 1); entity.put("success", 1); - }else if("过滤".equals(lineMap.get("opt"))){ + }else if("杩囨护".equals(lineMap.get("opt"))){ String codeStr = lineMap.get("code"); Integer code = Integer.valueOf(codeStr); String errorCode = VILLA_TYPE[code]; @@ -132,7 +132,7 @@ class ReadAnalyDynamicLog extends BaseBatch{ detailList.add(entity2); detail.put(key2, detailList); } - }else if("异常".equals(lineMap.get("opt"))){ + }else if("寮傚父".equals(lineMap.get("opt"))){ entity.put("analy_error", 1); entity.put("failure", 1); String key2 = key + "analy_error"; @@ -165,16 +165,16 @@ class ReadAnalyDynamicLog extends BaseBatch{ entity.put("c_date",NOW); mapList.put(key, entity); }else{ - if("更新".equals(lineMap.get("opt"))){ + if("鏇存柊".equals(lineMap.get("opt"))){ text.put("update", text.get("update")+1); text.put("success", text.get("success")+1); - }else if("保存".equals(lineMap.get("opt"))){ + }else if("淇濆瓨".equals(lineMap.get("opt"))){ text.put("save", text.get("save")+1); text.put("success", text.get("success")+1); - }else if("放弃".equals(lineMap.get("opt"))){ + }else if("鏀惧純".equals(lineMap.get("opt"))){ text.put("giveup", text.get("giveup")+1); text.put("success", text.get("success")+1); - }else if("过滤".equals(lineMap.get("opt"))){ + }else if("杩囨护".equals(lineMap.get("opt"))){ String codeStr = lineMap.get("code"); Integer code = Integer.valueOf(codeStr); String errorCode = VILLA_TYPE[code]; @@ -200,7 +200,7 @@ class ReadAnalyDynamicLog extends BaseBatch{ detailList.add(entity2); detail.put(key2, detailList); } - }else if("异常".equals(lineMap.get("opt"))){ + }else if("寮傚父".equals(lineMap.get("opt"))){ text.put("analy_error", text.get("analy_error")+1); text.put("failure", text.get("failure")+1); String key2 = key + "analy_error"; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/log/ReadBackoffLogBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/log/ReadBackoffLogBatch.groovy index 3c01c7592..5e9e5f9e5 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/log/ReadBackoffLogBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/log/ReadBackoffLogBatch.groovy @@ -19,7 +19,7 @@ import org.bson.types.ObjectId import org.json.JSONObject /** - * 读取65和154的操作日志 + * 璇诲彇65鍜�154鐨勬搷浣滄棩蹇� * @author shibb * */ @@ -63,7 +63,7 @@ class ReadBackoffLogBatch extends BaseBatch{ static void analysisLog65(def fileName, def path, Date logDate) { - println("开始解析:${fileName}") + println("寮�濮嬭В鏋愶細${fileName}") Map < Object, Object > lineMap = new HashMap < > (); new File(fileName).eachLine {line -> String orgLine = line; @@ -143,12 +143,12 @@ class ReadBackoffLogBatch extends BaseBatch{ saveColl.save(entity) } } - println("解析结束:${fileName}") + println("瑙f瀽缁撴潫锛�${fileName}") } } static void analysisLog154(def fileName, def path, Date logDate) { - println("开始解析:${fileName}") + println("寮�濮嬭В鏋愶細${fileName}") Map < Object, Object > lineMap = new HashMap < > (); def lines = FileUtils.readLines(new File(fileName), "UTF-8") lines.each {line-> @@ -158,7 +158,7 @@ class ReadBackoffLogBatch extends BaseBatch{ lineMap.clear() String[] entry154 = line.split(" - ", 2) line = entry154[1].trim() - String dateStr = entry154[0].trim()//用来获取时间 + String dateStr = entry154[0].trim()//鐢ㄦ潵鑾峰彇鏃堕棿 String[] keyValuePairs = line.split("\t"); for (String pair: keyValuePairs) { String[] entry = pair.split(":", 2); @@ -259,7 +259,7 @@ class ReadBackoffLogBatch extends BaseBatch{ } } } - println("解析结束:${fileName}") + println("瑙f瀽缁撴潫锛�${fileName}") } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/log/ReadBkoffArtemisLogBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/log/ReadBkoffArtemisLogBatch.groovy index 4c3bfea5c..fac46f5d0 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/log/ReadBkoffArtemisLogBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/log/ReadBkoffArtemisLogBatch.groovy @@ -23,7 +23,7 @@ import org.json.JSONArray; import org.json.JSONObject; /** - * 读取后台代理服务器解析日志 + * 璇诲彇鍚庡彴浠g悊鏈嶅姟鍣ㄨВ鏋愭棩蹇� * @author shibb * */ @@ -51,7 +51,7 @@ class ReadBkoffArtemisLogBatch extends BaseBatch{ } } - //根据ip统计数据 + //鏍规嵁ip缁熻鏁版嵁 static void saveAnalysisLog(def fileName, def path) { Map < Object, Object > lineMap = new HashMap < > (); List keyList = new ArrayList(); @@ -98,7 +98,7 @@ class ReadBkoffArtemisLogBatch extends BaseBatch{ Object tt = mapList.get(keyList.get(i)); println dateStr + "\t" + tt.get("ip") + "\t" + tt.get("code") + "\t"+ tt.get(tt.get("code")) + "\t" + tt.get("time") + "\n"; } - //阿里云服务器 + //闃块噷浜戞湇鍔″櫒 Long total2 = 0; Long totalTime2 = 0; Long success2 = 0; @@ -107,7 +107,7 @@ class ReadBkoffArtemisLogBatch extends BaseBatch{ Long failureInTime2 = 0; Long failureOut2 = 0; Long failureOutTime2 = 0; - //内部服务器 + //鍐呴儴鏈嶅姟鍣� Long total3 = 0; Long totalTime3 = 0; Long success3 = 0; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/log/ReadBkoffSafeLogBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/log/ReadBkoffSafeLogBatch.groovy index b2d649195..957e74fe5 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/log/ReadBkoffSafeLogBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/log/ReadBkoffSafeLogBatch.groovy @@ -36,7 +36,7 @@ class ReadBkoffSafeLogBatch extends BaseBatch{ static def mList = [] static def Jms jms = Jms.create('tcp://jms.db.fangjia.com:61616') -// 线下 +// 绾夸笅 //def static Jms jms = Jms.create('tcp://jms.db.fangjia.com:61616') public static void main(String[] args) { @@ -69,28 +69,28 @@ class ReadBkoffSafeLogBatch extends BaseBatch{ def pattern1 = "###.##%" def percentform = new DecimalFormat(pattern1) - String htmltable = "
    估价师点击量统计浼颁环甯�鐐瑰嚮閲忕粺璁�
    访问量(PV/UV)申请量璁块棶閲忥紙PV/UV锛�鐢宠閲�
    ').append(gjsIps.size()).append("/").append(gjsIps.unique().size()).append('').append(gjsApps).append('
    二手房详情页估价结果页菜单导航其他浜屾墜鎴胯鎯呴〉浼颁环缁撴灉椤�鑿滃崟瀵艰埅鍏朵粬
    ').append(esfGjsIps.size()).append("/").append(esfGjsIps.unique().size()).append('
    " + - "" + - "" + - "" + - "" + + String htmltable = "
    ${DateUtil.formatByPattern(new Date(), 'yyyy-MM-dd')}基础数据统计表(最近7天)
    类型新增量修改量删除量总量
    小区${saveCountDistrict}${updateCountDistrict}${removeCountDistrict}${districtNum}
    商铺${saveCountShop}${updateCountShop}${removeCountShop}${shopNum}
    写字楼${saveCountOffice}${updateCountOffice}${removeCountShop}${officeNum}
    " + + "" + + "" + + "" + + "" + "
    ${DateUtil.formatByPattern(new Date(), 'yyyy-MM-dd')}鍩虹鏁版嵁缁熻琛�(鏈�杩�7澶�)
    绫诲瀷鏂板閲�淇敼閲�鍒犻櫎閲�鎬婚噺
    灏忓尯${saveCountDistrict}${updateCountDistrict}${removeCountDistrict}${districtNum}
    鍟嗛摵${saveCountShop}${updateCountShop}${removeCountShop}${shopNum}
    鍐欏瓧妤�${saveCountOffice}${updateCountOffice}${removeCountShop}${officeNum}
    " - String htmltable2 = "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - ""+ + String htmltable2 = "
    ${DateUtil.formatByPattern(new Date(), 'yyyy-MM-dd')}小区均价统计表
    计算方式数量占比
    指导价${mList[1]}${percentform.format(mList[1] / districtNum)}
    自身样本${mList[2]}${percentform.format(mList[2] / districtNum)}
    第三方${mList[3]}${percentform.format(mList[3] / districtNum)}
    交易数据${mList[4]}${percentform.format(mList[4] / districtNum)}
    周边楼盘${mList[5]}${percentform.format(mList[5] / districtNum)}
    推算${mList[6]}${percentform.format(mList[6] / districtNum)}
    无方式${mList[0]}${percentform.format(mList[0] / districtNum)}
    " + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + ""+ "" + "" + "" + ""+ "
    ${DateUtil.formatByPattern(new Date(), 'yyyy-MM-dd')}灏忓尯鍧囦环缁熻琛�
    璁$畻鏂瑰紡鏁伴噺鍗犳瘮
    鎸囧浠�${mList[1]}${percentform.format(mList[1] / districtNum)}
    鑷韩鏍锋湰${mList[2]}${percentform.format(mList[2] / districtNum)}
    绗笁鏂�${mList[3]}${percentform.format(mList[3] / districtNum)}
    浜ゆ槗鏁版嵁${mList[4]}${percentform.format(mList[4] / districtNum)}
    鍛ㄨ竟妤肩洏${mList[5]}${percentform.format(mList[5] / districtNum)}
    鎺ㄧ畻${mList[6]}${percentform.format(mList[6] / districtNum)}
    鏃犳柟寮�${mList[0]}${percentform.format(mList[0] / districtNum)}
     ${mList[0] + mList[1] + mList[2] + mList[3] + mList[4] + mList[5] + mList[6]}${percentform.format((mList[0] + mList[1] + mList[2] + mList[3] + mList[4] + mList[5] + mList[6]) / districtNum)}
    " - sendEmail("${DateUtil.formatByPattern(new Date(), 'yyyy-MM-dd')}基础数据统计表", "
    " + htmltable + "

    " + htmltable2) + sendEmail("${DateUtil.formatByPattern(new Date(), 'yyyy-MM-dd')}鍩虹鏁版嵁缁熻琛�", "
    " + htmltable + "

    " + htmltable2) println "Email has been sent............................." def docDistrict = [c_date:DateUtil.formatByPattern(new Date(), 'yyyy-MM-dd'), diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/log/SpidersLogAnalyticsBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/log/SpidersLogAnalyticsBatch.groovy index 3b3cd0d53..ae30bf8ac 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/log/SpidersLogAnalyticsBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/log/SpidersLogAnalyticsBatch.groovy @@ -56,7 +56,7 @@ class SpidersLogAnalyticsBatch extends BaseBatch { analyticsLogFile(date) } }else { - //默认处理昨天的日志 + //榛樿澶勭悊鏄ㄥぉ鐨勬棩蹇� analyticsLogFile(DateUtil.truncateDay(new Date()) - 1) } } @@ -166,7 +166,7 @@ class SpidersLogAnalyticsBatch extends BaseBatch { } /** - * 从文件系统获取文件日志 + * 浠庢枃浠剁郴缁熻幏鍙栨枃浠舵棩蹇� * * @param logDate * @return diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/log/Test_weilei.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/log/Test_weilei.groovy index 5fb116eab..81ee99c21 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/log/Test_weilei.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/log/Test_weilei.groovy @@ -33,8 +33,8 @@ try { System.out.println(line); } reader.close(); - //java代码中的process.waitFor()返回值为0表示我们调用python脚本成功, - //返回值为1表示调用python脚本失败,这和我们通常意义上见到的0与1定义正好相反 + //java浠g爜涓殑process.waitFor()杩斿洖鍊间负0琛ㄧず鎴戜滑璋冪敤python鑴氭湰鎴愬姛锛� + //杩斿洖鍊间负1琛ㄧず璋冪敤python鑴氭湰澶辫触锛岃繖鍜屾垜浠�氬父鎰忎箟涓婅鍒扮殑0涓�1瀹氫箟姝eソ鐩稿弽 int re = process.waitFor(); System.out.println(re); } catch (Exception e) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/looplineinfo/AddLoopLineInfo.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/looplineinfo/AddLoopLineInfo.groovy index a8044f2aa..fd845d3ce 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/looplineinfo/AddLoopLineInfo.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/looplineinfo/AddLoopLineInfo.groovy @@ -20,7 +20,7 @@ import groovy.sql.* import com.mongodb.QueryOperators /** - * 根据经纬度,将point匹配到各个环线内 + * 鏍规嵁缁忕含搴︼紝灏唒oint鍖归厤鍒板悇涓幆绾垮唴 * @author gaojuan * */ @@ -44,9 +44,9 @@ class AddLoopLineInfo { def addfjtLoopLine(){ def fjtRet = addFjtEvaluationLoopLine(); - def districtMaps = getAllDistrictMap("上海","district") + def districtMaps = getAllDistrictMap("涓婃捣","district") def loopMap = loopLinePosition(); - loopMap = loopMap.get("上海"); + loopMap = loopMap.get("涓婃捣"); updateFjtLoopLine(fjtRet, districtMaps, loopMap); } @@ -72,14 +72,14 @@ class AddLoopLineInfo { onLineSqlInstance.execute(sql); } }else{ - println "别名查不到........"+map.id + println "鍒悕鏌ヤ笉鍒�........"+map.id } } } } def run(){ - def citys = ["上海"];//findAllCity(); + def citys = ["涓婃捣"];//findAllCity(); def loopMap = loopLinePosition(); for(def city : citys){ def districts = getAllDistricts(city, "shop"); @@ -95,20 +95,20 @@ class AddLoopLineInfo { for(def m : districts){ - def flag = isInArea(m.lng, m.lat, loopMap.get("内环")); + def flag = isInArea(m.lng, m.lat, loopMap.get("鍐呯幆")); if(flag){ - m.loop_line_info = "内环以内"; + m.loop_line_info = "鍐呯幆浠ュ唴"; }else{ - flag = isInArea(m.lng, m.lat, loopMap.get("中环")); + flag = isInArea(m.lng, m.lat, loopMap.get("涓幆")); if(flag){ - m.loop_line_info = "中内之间"; + m.loop_line_info = "涓唴涔嬮棿"; }else{ - flag = isInArea(m.lng, m.lat, loopMap.get("外环")); + flag = isInArea(m.lng, m.lat, loopMap.get("澶栫幆")); if(flag){ - m.loop_line_info = "中外之间"; + m.loop_line_info = "涓涔嬮棿"; }else{ - m.loop_line_info = "外环以外"; + m.loop_line_info = "澶栫幆浠ュ"; } } @@ -221,7 +221,7 @@ class AddLoopLineInfo { if(cursor){ for(def dbo : cursor){ def city = dbo.get("display"); - if(city!='全国'){ + if(city!='鍏ㄥ浗'){ citys << city; } } @@ -244,10 +244,10 @@ class AddLoopLineInfo { def loopLinePosition(){ def m = [:]; def loopMap = [:]; - loopMap.put("内环", "121.417562-31.23164-121.419287-31.21793-121.418568-31.211629-121.432222-31.189513-121.447745-31.183706-121.457231-31.191367-121.465711-31.194085-121.476491-31.200387-121.484396-31.203228-121.499631-31.208911-121.507105-31.213359-121.535563-31.204711-121.545912-31.202981-121.560141-31.209529-121.570202-31.210394-121.580263-31.214718-121.576957-31.23337-121.569915-31.248066-121.554967-31.25955-121.545337-31.267452-121.534988-31.280909-121.529958-31.288439-121.526796-31.292142-121.519753-31.29029-121.50768-31.293376-121.502937-31.291031-121.491295-31.291771-121.489283-31.285476-121.485833-31.283131-121.482959-31.276588-121.475197-31.269551-121.467867-31.267082-121.451195-31.263378-121.442571-31.259797-121.435959-31.253376-121.423311-31.245967-121.417131-31.238557-121.417131-31.238557-121.417131-31.238557"); - loopMap.put("中环", "121.382205-31.217435-121.396003-31.199151-121.405776-31.17246-121.426473-31.137848-121.462693-31.149716-121.502362-31.152683-121.525359-31.155155-121.591474-31.173448-121.629993-31.185806-121.633443-31.20607-121.580551-31.269798-121.562728-31.292512-121.552955-31.306335-121.552955-31.314233-121.485115-31.295968-121.464418-31.301399-121.4121-31.293499-121.400602-31.27523-121.395428-31.252512-121.385654-31.235716-121.385654-31.235716"); - loopMap.put("外环", "121.396003-31.124-121.476491-31.131913-121.543181-31.142793-121.608721-31.153672-121.659314-31.161583-121.650115-31.315714-121.602972-31.358154-121.54778-31.378874-121.500637-31.381833-121.444296-31.363088-121.364957-31.334469-121.370706-31.322624-121.366107-31.293006-121.367257-31.27523-121.353459-31.245596-121.362658-31.192232-121.363807-31.181358-121.363807-31.181358"); - m.put("上海", loopMap); + loopMap.put("鍐呯幆", "121.417562-31.23164-121.419287-31.21793-121.418568-31.211629-121.432222-31.189513-121.447745-31.183706-121.457231-31.191367-121.465711-31.194085-121.476491-31.200387-121.484396-31.203228-121.499631-31.208911-121.507105-31.213359-121.535563-31.204711-121.545912-31.202981-121.560141-31.209529-121.570202-31.210394-121.580263-31.214718-121.576957-31.23337-121.569915-31.248066-121.554967-31.25955-121.545337-31.267452-121.534988-31.280909-121.529958-31.288439-121.526796-31.292142-121.519753-31.29029-121.50768-31.293376-121.502937-31.291031-121.491295-31.291771-121.489283-31.285476-121.485833-31.283131-121.482959-31.276588-121.475197-31.269551-121.467867-31.267082-121.451195-31.263378-121.442571-31.259797-121.435959-31.253376-121.423311-31.245967-121.417131-31.238557-121.417131-31.238557-121.417131-31.238557"); + loopMap.put("涓幆", "121.382205-31.217435-121.396003-31.199151-121.405776-31.17246-121.426473-31.137848-121.462693-31.149716-121.502362-31.152683-121.525359-31.155155-121.591474-31.173448-121.629993-31.185806-121.633443-31.20607-121.580551-31.269798-121.562728-31.292512-121.552955-31.306335-121.552955-31.314233-121.485115-31.295968-121.464418-31.301399-121.4121-31.293499-121.400602-31.27523-121.395428-31.252512-121.385654-31.235716-121.385654-31.235716"); + loopMap.put("澶栫幆", "121.396003-31.124-121.476491-31.131913-121.543181-31.142793-121.608721-31.153672-121.659314-31.161583-121.650115-31.315714-121.602972-31.358154-121.54778-31.378874-121.500637-31.381833-121.444296-31.363088-121.364957-31.334469-121.370706-31.322624-121.366107-31.293006-121.367257-31.27523-121.353459-31.245596-121.362658-31.192232-121.363807-31.181358-121.363807-31.181358"); + m.put("涓婃捣", loopMap); return m; } def loopLinePositionNew(String city){ @@ -275,7 +275,7 @@ class AddLoopLineInfo { def addFjtEvaluationLoopLine(){ - def sql = "SELECT * FROM evaluation WHERE user_id IN (SELECT id FROM users WHERE role=12) AND city='上海' and build_type!=1 and build_type!=2 AND loop_line IS null and district_name is not null and region is not null"; + def sql = "SELECT * FROM evaluation WHERE user_id IN (SELECT id FROM users WHERE role=12) AND city='涓婃捣' and build_type!=1 and build_type!=2 AND loop_line IS null and district_name is not null and region is not null"; def ret = []; onLineSqlInstance.eachRow(sql,{ def map = [:] @@ -289,21 +289,21 @@ class AddLoopLineInfo { } def getLoopLine(def lng, def lat, def loopMap){ - def flag = isInArea(lng, lat, loopMap.get("内环")); + def flag = isInArea(lng, lat, loopMap.get("鍐呯幆")); def loop_line_info = ""; if(flag){ - loop_line_info = "内环以内"; + loop_line_info = "鍐呯幆浠ュ唴"; }else{ - flag = isInArea(lng, lat, loopMap.get("中环")); + flag = isInArea(lng, lat, loopMap.get("涓幆")); if(flag){ - loop_line_info = "中内环之间"; + loop_line_info = "涓唴鐜箣闂�"; }else{ - flag = isInArea(lng, lat, loopMap.get("外环")); + flag = isInArea(lng, lat, loopMap.get("澶栫幆")); if(flag){ - loop_line_info = "中外环之间"; + loop_line_info = "涓鐜箣闂�"; }else{ - loop_line_info = "外环以外"; + loop_line_info = "澶栫幆浠ュ"; } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/looplineinfo/InPolygon.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/looplineinfo/InPolygon.groovy index 4d79373ca..8c9b045ac 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/looplineinfo/InPolygon.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/looplineinfo/InPolygon.groovy @@ -34,97 +34,97 @@ class InPolygon { } /** - * 判断点是否在多边形内 + * 鍒ゆ柇鐐规槸鍚﹀湪澶氳竟褰㈠唴 *

    - * 整个算法的思路为:作点平行于y轴的射线,这样就可以直接比较交点是否大于点(x,y)中y的值,可以简化判断。 + * 鏁翠釜绠楁硶鐨勬�濊矾涓猴細浣滅偣骞宠浜巠杞寸殑灏勭嚎锛岃繖鏍峰氨鍙互鐩存帴姣旇緝浜ょ偣鏄惁澶т簬鐐�(x,y)涓瓂鐨勫�硷紝鍙互绠�鍖栧垽鏂�� * - * @param point 检测点 - * @param pts 多边形的顶点 - * @return 点在多边形内返回true, 否则返回false + * @param point 妫�娴嬬偣 + * @param pts 澶氳竟褰㈢殑椤剁偣 + * @return 鐐瑰湪澶氳竟褰㈠唴杩斿洖true, 鍚﹀垯杩斿洖false */ public static boolean isPtInPoly(Point2D.Double point, List pts) { int polygonSidesCount = pts.size(); - //如果点位于多边形的顶点或边上,也算做点在多边形内,直接返回true + //濡傛灉鐐逛綅浜庡杈瑰舰鐨勯《鐐规垨杈逛笂锛屼篃绠楀仛鐐瑰湪澶氳竟褰㈠唴锛岀洿鎺ヨ繑鍥瀟rue boolean boundOrVertex = true; - // 射线与多边形相交的次数 + // 灏勭嚎涓庡杈瑰舰鐩镐氦鐨勬鏁� int intersectCount = 0; - //浮点类型计算时候与0比较时候的容差 + //娴偣绫诲瀷璁$畻鏃跺�欎笌0姣旇緝鏃跺�欑殑瀹瑰樊 double precision = 2e-10; - // 相邻两点 + // 鐩搁偦涓ょ偣 Point2D.Double p1, p2; - // 当前点 + // 褰撳墠鐐� Point2D.Double p = point; - // 线段起点 + // 绾挎璧风偣 p1 = pts.get(0); for (int i = 1; i <= polygonSidesCount; ++i) { - //按照点录入的顺序依次检查相邻两点组成的线段和当前的点的关系。 + //鎸夌収鐐瑰綍鍏ョ殑椤哄簭渚濇妫�鏌ョ浉閭讳袱鐐圭粍鎴愮殑绾挎鍜屽綋鍓嶇殑鐐圭殑鍏崇郴銆� if (p.equals(p1)) { - //如果当前点就是多边形的顶点之一,直接返回。 + //濡傛灉褰撳墠鐐瑰氨鏄杈瑰舰鐨勯《鐐逛箣涓�锛岀洿鎺ヨ繑鍥炪�� return boundOrVertex; } - // 线段终点 + // 绾挎缁堢偣 p2 = pts.get(i % polygonSidesCount); if (p.x < Math.min(p1.x, p2.x) || p.x > Math.max(p1.x, p2.x)) { - //点在x轴上的映射,明显超出了线段在x轴上的投影。此时冲着上做射线,肯定没有交点,直接跳过。 + //鐐瑰湪x杞翠笂鐨勬槧灏勶紝鏄庢樉瓒呭嚭浜嗙嚎娈靛湪x杞翠笂鐨勬姇褰便�傛鏃跺啿鐫�涓婂仛灏勭嚎锛岃偗瀹氭病鏈変氦鐐癸紝鐩存帴璺宠繃銆� p1 = p2; continue; } if (p.x > Math.min(p1.x, p2.x) && p.x < Math.max(p1.x, p2.x)) { - // 当前点在线段于x轴上的投影内 + // 褰撳墠鐐瑰湪绾挎浜巟杞翠笂鐨勬姇褰卞唴 if (p.y <= Math.max(p1.y, p2.y)) { - //当前点的 y 坐标小于 线段对y轴投影的最大值 + //褰撳墠鐐圭殑 y 鍧愭爣灏忎簬 绾挎瀵箉杞存姇褰辩殑鏈�澶у�� if (p1.x == p2.x && p.y >= Math.min(p1.y, p2.y)) { - // 若线段同样是平行于y轴,则可以断定,当前点,在多边形的这条垂直于x轴的边上。 + // 鑻ョ嚎娈靛悓鏍锋槸骞宠浜巠杞达紝鍒欏彲浠ユ柇瀹氾紝褰撳墠鐐癸紝鍦ㄥ杈瑰舰鐨勮繖鏉″瀭鐩翠簬x杞寸殑杈逛笂銆� return boundOrVertex; } if (p1.y == p2.y) { - // 若线段为平行于x轴的水平线 + // 鑻ョ嚎娈典负骞宠浜巟杞寸殑姘村钩绾� if (p1.y == p.y) { - //当前点正好位于该水平线上,直接返回该点位于多边形的一条边上。 + //褰撳墠鐐规濂戒綅浜庤姘村钩绾夸笂锛岀洿鎺ヨ繑鍥炶鐐逛綅浜庡杈瑰舰鐨勪竴鏉¤竟涓娿�� return boundOrVertex; } else { - //如果当前点在水平线以下,增加一个交点。 + //濡傛灉褰撳墠鐐瑰湪姘村钩绾夸互涓嬶紝澧炲姞涓�涓氦鐐广�� ++intersectCount; } } else { - // 如果不是水平线,则用两点式求当前点的x带入多边形线段的直线方程后,对应的y的坐标 + // 濡傛灉涓嶆槸姘村钩绾匡紝鍒欑敤涓ょ偣寮忔眰褰撳墠鐐圭殑x甯﹀叆澶氳竟褰㈢嚎娈电殑鐩寸嚎鏂圭▼鍚庯紝瀵瑰簲鐨剏鐨勫潗鏍� double xInSideLineFormulaResultY = (p.x - p1.x) * (p2.y - p1.y) / (p2.x - p1.x) + p1.y; if (Math.abs(p.y - xInSideLineFormulaResultY) < precision) { - // 误差允许范围内,改点就在线段上,则表明,该点位于多边形的一个边上。 + // 璇樊鍏佽鑼冨洿鍐咃紝鏀圭偣灏卞湪绾挎涓婏紝鍒欒〃鏄庯紝璇ョ偣浣嶄簬澶氳竟褰㈢殑涓�涓竟涓娿�� return boundOrVertex; } if (p.y < xInSideLineFormulaResultY) { - // 如果线段上取得的y比当前点的y要大,当前做向上的射线,肯定交于上方的一个点。 + // 濡傛灉绾挎涓婂彇寰楃殑y姣斿綋鍓嶇偣鐨剏瑕佸ぇ锛屽綋鍓嶅仛鍚戜笂鐨勫皠绾匡紝鑲畾浜や簬涓婃柟鐨勪竴涓偣銆� ++intersectCount; } } } } else { - // 当前点不在线段投影到x轴的区间中 + // 褰撳墠鐐逛笉鍦ㄧ嚎娈垫姇褰卞埌x杞寸殑鍖洪棿涓� if (p.x == p2.x && p.y <= p2.y) { - // 但恰好位于线段终点的x坐标对应的平行于y轴上的线上的低于终点y的一点 - // 此时检查下一点能否将其x边界包含。 + // 浣嗘伆濂戒綅浜庣嚎娈电粓鐐圭殑x鍧愭爣瀵瑰簲鐨勫钩琛屼簬y杞翠笂鐨勭嚎涓婄殑浣庝簬缁堢偣y鐨勪竴鐐� + // 姝ゆ椂妫�鏌ヤ笅涓�鐐硅兘鍚﹀皢鍏秞杈圭晫鍖呭惈銆� Point2D.Double p3 = pts.get((i + 1) % polygonSidesCount); if (p.x >= Math.min(p1.x, p3.x) && p.x <= Math.max(p1.x, p3.x)) { - // 若当前点的x坐标位于 p1和p3组成的线段关于x轴的投影中,则记为该点的射线只穿过端点一次。 + // 鑻ュ綋鍓嶇偣鐨剎鍧愭爣浣嶄簬 p1鍜宲3缁勬垚鐨勭嚎娈靛叧浜巟杞寸殑鎶曞奖涓紝鍒欒涓鸿鐐圭殑灏勭嚎鍙┛杩囩鐐逛竴娆°�� ++intersectCount; } else { - // 若当前点的x坐标不能包含在p1和p3组成的线段关于x轴的投影中,则点射线通过的两条线段组成了一个弯折的部分, - // 此时我们记射线穿过该端点两次 + // 鑻ュ綋鍓嶇偣鐨剎鍧愭爣涓嶈兘鍖呭惈鍦╬1鍜宲3缁勬垚鐨勭嚎娈靛叧浜巟杞寸殑鎶曞奖涓紝鍒欑偣灏勭嚎閫氳繃鐨勪袱鏉$嚎娈电粍鎴愪簡涓�涓集鎶樼殑閮ㄥ垎锛� + // 姝ゆ椂鎴戜滑璁板皠绾跨┛杩囪绔偣涓ゆ intersectCount += 2; } - // 此判断的核心思路是由点在两条线段的内部还是外部去思考得出的 + // 姝ゅ垽鏂殑鏍稿績鎬濊矾鏄敱鐐瑰湪涓ゆ潯绾挎鐨勫唴閮ㄨ繕鏄閮ㄥ幓鎬濊�冨緱鍑虹殑 } } - // 进行下一个线段的判断 + // 杩涜涓嬩竴涓嚎娈电殑鍒ゆ柇 p1 = p2; } if (intersectCount % 2 == 0) { - //偶数在多边形外 + //鍋舵暟鍦ㄥ杈瑰舰澶� return false; } else { - //奇数在多边形内 + //濂囨暟鍦ㄥ杈瑰舰鍐� return true; } } 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 25f5c45ed..ce96496e6 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 @@ -131,16 +131,16 @@ class InsidePolygon { } /** - * 判定一个经纬度点与区域的关系 - * @param point 需要判断的经纬度点 - * @return boolean 如果点在区域内,true;如果在区域外,false + * 鍒ゅ畾涓�涓粡绾害鐐逛笌鍖哄煙鐨勫叧绯� + * @param point 闇�瑕佸垽鏂殑缁忕含搴︾偣 + * @return boolean 濡傛灉鐐瑰湪鍖哄煙鍐咃紝true锛涘鏋滃湪鍖哄煙澶栵紝false */ public static boolean aboutZone(Point point, List vPoint) { if(vPoint==null||vPoint.size()==0) return false; int I = 0; - //求出最大值, 得到一个落在矩形外的点, 由该点与point组成的线段, 与多边形求交, 交点为奇数则为 - // 在多边形内 + //姹傚嚭鏈�澶у��, 寰楀埌涓�涓惤鍦ㄧ煩褰㈠鐨勭偣, 鐢辫鐐逛笌point缁勬垚鐨勭嚎娈�, 涓庡杈瑰舰姹備氦, 浜ょ偣涓哄鏁板垯涓� + // 鍦ㄥ杈瑰舰鍐� I = 1; int odd = 0; @@ -274,12 +274,12 @@ class InsidePolygon { dLon2 = ps[iIndex + 1].getLon() dLat2 = ps[iIndex + 1].getLat() } - // 以下语句判断A点是否在边的两端点的水平平行线之间,在则可能有交点,开始判断交点是否在左射线上 + // 浠ヤ笅璇彞鍒ゆ柇A鐐规槸鍚﹀湪杈圭殑涓ょ鐐圭殑姘村钩骞宠绾夸箣闂达紝鍦ㄥ垯鍙兘鏈変氦鐐癸紝寮�濮嬪垽鏂氦鐐规槸鍚﹀湪宸﹀皠绾夸笂 if (((ALat >= dLat1) && (ALat < dLat2)) || ((ALat >= dLat2) && (ALat < dLat1))) { if (Math.abs(dLat1 - dLat2) > 0) { - //得到 A点向左射线与边的交点的x坐标: + //寰楀埌 A鐐瑰悜宸﹀皠绾夸笌杈圭殑浜ょ偣鐨剎鍧愭爣锛� dLon = dLon1 - ((dLon1 - dLon2) * (dLat1 - ALat) ) / (dLat1 - dLat2); - // 如果交点在A点左侧(说明是做射线与 边的交点),则射线与边的全部交点数加一: + // 濡傛灉浜ょ偣鍦ˋ鐐瑰乏渚э紙璇存槑鏄仛灏勭嚎涓� 杈圭殑浜ょ偣锛夛紝鍒欏皠绾夸笌杈圭殑鍏ㄩ儴浜ょ偣鏁板姞涓�锛� if (dLon < ALon) { iSum++; } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/looplineinfo/涓婃捣缁熻灞�闇�瑕佸瓧娈垫暟鎹甠淇敼.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/looplineinfo/涓婃捣缁熻灞�闇�瑕佸瓧娈垫暟鎹甠淇敼.groovy index 31720bd69..8369ab8ab 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/looplineinfo/涓婃捣缁熻灞�闇�瑕佸瓧娈垫暟鎹甠淇敼.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/looplineinfo/涓婃捣缁熻灞�闇�瑕佸瓧娈垫暟鎹甠淇敼.groovy @@ -29,7 +29,7 @@ import com.mongodb.Mongo def DBCollection collStep1 = MongoUtils.getCollectionByName("fangjia", "latlng_polygon", "fjt_mongo.db.fangjia.com") def count=0 -/*ExcelUtils.multiThreadingModify("D:\\上海统计局需要字段数据-修改.xls",{List item-> +/*ExcelUtils.multiThreadingModify("D:\\涓婃捣缁熻灞�闇�瑕佸瓧娈垫暟鎹�-淇敼.xls",{List item-> count++ if(item[1]!=null && item[2]!=null && item[3]!=null){ def dbo = DbUtils.findOneOnSeaweed(new BasicDBObject("city",item[1]).append("region",item[2]).append("name",item[3])) @@ -37,14 +37,14 @@ def count=0 } println count })*/ -/*def willBeJudgeData = ExcelUtils.read("D:\\上海统计局需要字段数据-修改.xls") +/*def willBeJudgeData = ExcelUtils.read("D:\\涓婃捣缁熻灞�闇�瑕佸瓧娈垫暟鎹�-淇敼.xls") willBeJudgeData.each { count++ if(it[1]!=null && it[2]!=null && it[3]!=null){ } }*/ def fangjiaDb = null; -def dbo = DbUtils.findOneOnSeaweed(new BasicDBObject("city","上海").append("region","徐汇").append("name","龙龙家园")) +def dbo = DbUtils.findOneOnSeaweed(new BasicDBObject("city","涓婃捣").append("region","寰愭眹").append("name","榫欓緳瀹跺洯")) if(dbo==null || dbo.lng==null || dbo.lat==null){ println "*************" @@ -60,17 +60,17 @@ private def getLoopLineInfo(def lng , def lat, def city,def name){ def flag = isInArea(lng, lat, city,name); def loop_line_info = ""; if(flag){ - loop_line_info = "内环以内"; + loop_line_info = "鍐呯幆浠ュ唴"; }else{ - flag = isInArea(lng, lat,"上海"); + flag = isInArea(lng, lat,"涓婃捣"); if(flag){ - loop_line_info = "中内环之间"; + loop_line_info = "涓唴鐜箣闂�"; }else{ - flag = isInArea(lng, lat, "上海"); + flag = isInArea(lng, lat, "涓婃捣"); if(flag){ - loop_line_info = "中外环之间"; + loop_line_info = "涓鐜箣闂�"; }else{ - loop_line_info = "外环以外"; + loop_line_info = "澶栫幆浠ュ"; } } } @@ -87,7 +87,7 @@ def isInArea(lng, lat, city,name){ def findLoopPoints(def city, def name){ BasicDBObject queryCondition = new BasicDBObject(); queryCondition.put("name", name); - queryCondition.put("city", "上海"); + queryCondition.put("city", "涓婃捣"); queryCondition.put("category", "loop"); DBObject keys = new BasicDBObject(); @@ -112,7 +112,7 @@ def findLoopPoints(def city, def name){ } /** - * 得到collectionName对应的Collection + * 寰楀埌collectionName瀵瑰簲鐨凜ollection * @param collectionName * @return */ @@ -123,7 +123,7 @@ def DBCollection getCollection(String collectionName){ } /** - * 获得房价数据库 + * 鑾峰緱鎴夸环鏁版嵁搴� * @return */ def DB getFangjiaDb(){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/loudong/CqfdcChromeCrawl.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/loudong/CqfdcChromeCrawl.groovy index 172cc24b5..b1e7add1d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/loudong/CqfdcChromeCrawl.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/loudong/CqfdcChromeCrawl.groovy @@ -20,11 +20,11 @@ class CqfdcChromeCrawl { // def task = new CqfdcChromeCrawl(); // task.run() - def name = "E3号楼" //69幢(规划C-7号楼) 规划5-5号楼 - def s = DataHandleUtils.findMatchPattern(name, "[\\w+]?-?\\w+[#|幢|栋|号]楼?.*?") + def name = "E3鍙锋ゼ" //69骞紙瑙勫垝C-7鍙锋ゼ锛� 瑙勫垝5-5鍙锋ゼ + def s = DataHandleUtils.findMatchPattern(name, "[\\w+]?-?\\w+[#|骞鏍媩鍙穄妤�?.*?") println s - def unitNumStr = DataHandleUtils.findMatchPattern(name, "\\d+单元") + def unitNumStr = DataHandleUtils.findMatchPattern(name, "\\d+鍗曞厓") println unitNumStr } @@ -68,19 +68,19 @@ class CqfdcChromeCrawl { def text = td.text() if(!unit1){ - if(text && text.contains("单元")){ + if(text && text.contains("鍗曞厓")){ unit1 = td.attr("colspan").toInteger() - unit1_text = text.replace("单元","") + unit1_text = text.replace("鍗曞厓","") } }else if(unit1 && !unit2){ - if(text && text.contains("单元")) { + if(text && text.contains("鍗曞厓")) { unit2 = td.attr("colspan").toInteger() - unit2_text = text.replace("单元", "") + unit2_text = text.replace("鍗曞厓", "") } }else if(unit1 && !unit3){ - if(text && text.contains("单元")) { + if(text && text.contains("鍗曞厓")) { unit3 = td.attr("colspan").toInteger() - unit3_text = text.replace("单元", "") + unit3_text = text.replace("鍗曞厓", "") } } }else{ @@ -88,16 +88,16 @@ class CqfdcChromeCrawl { if(room_num){ def map = [:] def a = td.select("a") - map.use_type = td.select("span:contains(用途:)").text().replace("用途:","") - map.room_type = td.select("span:contains(户型:)").text().replace("户型:","") - map.structure_type = td.select("span:contains(结构:)").text().replace("结构:","") - map.area = td.select("span:contains(建面:)").text().replace("建面:","") - map.siji_area = td.select("span:contains(套内:)").text().replace("套内:","") - map.price = td.select("span:contains(建面拟售价格:)").text().replace("建面拟售价格:","") - map.siji_price = td.select("span:contains(套内拟售价格:)").text().replace("套内拟售价格:","") - map.fitment = td.select("span:contains(装修水平:)").text().replace("装修水平:","").replace("null","") - def physical_floor = tds[0]//物理层 - def nominal_floor = tds[1]//名义层 + map.use_type = td.select("span:contains(鐢ㄩ�旓細)").text().replace("鐢ㄩ�旓細","") + map.room_type = td.select("span:contains(鎴峰瀷锛�)").text().replace("鎴峰瀷锛�","") + map.structure_type = td.select("span:contains(缁撴瀯锛�)").text().replace("缁撴瀯锛�","") + map.area = td.select("span:contains(寤洪潰锛�)").text().replace("寤洪潰锛�","") + map.siji_area = td.select("span:contains(濂楀唴锛�)").text().replace("濂楀唴锛�","") + map.price = td.select("span:contains(寤洪潰鎷熷敭浠锋牸锛�)").text().replace("寤洪潰鎷熷敭浠锋牸锛�","") + map.siji_price = td.select("span:contains(濂楀唴鎷熷敭浠锋牸锛�)").text().replace("濂楀唴鎷熷敭浠锋牸锛�","") + map.fitment = td.select("span:contains(瑁呬慨姘村钩锛�)").text().replace("瑁呬慨姘村钩锛�","").replace("null","") + def physical_floor = tds[0]//鐗╃悊灞� + def nominal_floor = tds[1]//鍚嶄箟灞� map.nominal_floor = nominal_floor.text() map.physical_floor = physical_floor.text() @@ -160,7 +160,7 @@ class CqfdcChromeCrawl { def building_id= str.substring(str.lastIndexOf("['")+2, str.lastIndexOf("','")) map.building_id = building_id - map.city = "重庆" + map.city = "閲嶅簡" map.name = tds.get(0).text() map.company = tds.get(1).text() map.license_key = tds.get(2).text() @@ -176,7 +176,7 @@ class CqfdcChromeCrawl { } } - println "列表:"+datas.size() + println "鍒楄〃锛�"+datas.size() return datas; } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/loudong/CqfdcMatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/loudong/CqfdcMatch.groovy index 22f0a1f93..6e94f1043 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/loudong/CqfdcMatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/loudong/CqfdcMatch.groovy @@ -49,7 +49,7 @@ class CqfdcMatch { def updateHouseLoudong(){ def q = new BasicDBObject() - q.put("city", "重庆") + q.put("city", "閲嶅簡") def keys = new BasicDBObject() keys.put("room_num", 1) @@ -91,7 +91,7 @@ class CqfdcMatch { def dbcursor = loudongConn.find(q, field).batchSize(5000) def keys = [] def rets = [] - rets << ["城市","区域","名称","地址","类型"] + rets << ["鍩庡競","鍖哄煙","鍚嶇О","鍦板潃","绫诲瀷"] for(def d : dbcursor){ def key = d.city +"##"+d.district_name if(!keys.contains(key)){ @@ -99,7 +99,7 @@ class CqfdcMatch { rets << [d.city, d.region, d.district_name, d.address, d.type] } } - ExcelUtils.write("D:\\数据\\重庆农商行\\重庆楼栋未匹配1.xlsx",rets, "数据") + ExcelUtils.write("D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\閲嶅簡妤兼爧鏈尮閰�1.xlsx",rets, "鏁版嵁") } def run(){ @@ -120,7 +120,7 @@ class CqfdcMatch { def dbcursor = loudongFdcConn.find(q, field).batchSize(5000) def keys = [] def rets = [] - rets << ["城市","地址","类型"] + rets << ["鍩庡競","鍦板潃","绫诲瀷"] for(def d : dbcursor){ def key = d.city +"##"+d.name if(!keys.contains(key)){ @@ -128,7 +128,7 @@ class CqfdcMatch { rets << [d.city, d.name,d.use_type] } } - ExcelUtils.write("D:\\数据\\重庆农商行\\重庆楼栋未匹配2.xlsx",rets, "数据") + ExcelUtils.write("D:\\鏁版嵁\\閲嶅簡鍐滃晢琛孿\閲嶅簡妤兼爧鏈尮閰�2.xlsx",rets, "鏁版嵁") } def update(results){ @@ -209,7 +209,7 @@ class CqfdcMatch { for(def d : dbcursor) { index++ println index - if(d.room_num && (d.room_num.contains("商") || d.room_num.contains("社区用房"))){ + if(d.room_num && (d.room_num.contains("鍟�") || d.room_num.contains("绀惧尯鐢ㄦ埧"))){ continue } if(d.area.toDouble()<=25){ @@ -217,15 +217,15 @@ class CqfdcMatch { } def newRegion = RegionData.formatRegion(d.city, d.region) if (newRegion) { - def houseNumStr = DataHandleUtils.findMatchPattern(d.house_num, "[\\w+]?-?\\w+[#|幢|栋|号]楼?.*?") + def houseNumStr = DataHandleUtils.findMatchPattern(d.house_num, "[\\w+]?-?\\w+[#|骞鏍媩鍙穄妤�?.*?") def house_num = null if (houseNumStr) { - house_num = houseNumStr.replace("号楼", "").replace("幢", "").replace("栋", "").replace("号", "") + house_num = houseNumStr.replace("鍙锋ゼ", "").replace("骞�", "").replace("鏍�", "").replace("鍙�", "") } if (house_num) { - def unitNum = DataHandleUtils.findMatchPattern(d.house_num, "\\d+单元") + def unitNum = DataHandleUtils.findMatchPattern(d.house_num, "\\d+鍗曞厓") if (unitNum) { - unitNum = unitNum.replace("单元", "") + unitNum = unitNum.replace("鍗曞厓", "") } def key = d.city + "##" + newRegion + "##" + d.district_name + "##" + house_num+ "##" + unitNum +"##"+d.room_num if(!keys.contains(key) && d.room_num) { @@ -247,7 +247,7 @@ class CqfdcMatch { udata.put("room_num", d.room_num) udata.put("house_area",d.area.toDouble()) udata.put("status", 0) - udata.put("from", "房谱网") + udata.put("from", "鎴胯氨缃�") if(d.floor_heigth && d.floor_heigth.isNumber()){ udata.put("house_height", d.floor_heigth.toInteger()) } @@ -295,15 +295,15 @@ class CqfdcMatch { for(def d : dbcursor){ def newRegion = RegionData.formatRegion(d.city, d.region) if(newRegion){ - def houseNumStr = DataHandleUtils.findMatchPattern(d.house_num, "[\\w+]?-?\\w+[#|幢|栋|号]楼?.*?") + def houseNumStr = DataHandleUtils.findMatchPattern(d.house_num, "[\\w+]?-?\\w+[#|骞鏍媩鍙穄妤�?.*?") def house_num = null if(houseNumStr){ - house_num = houseNumStr.replace("号楼","").replace("幢","").replace("栋","").replace("号","") + house_num = houseNumStr.replace("鍙锋ゼ","").replace("骞�","").replace("鏍�","").replace("鍙�","") } if(house_num){ - def unitNum = DataHandleUtils.findMatchPattern(d.house_num, "\\d+单元") + def unitNum = DataHandleUtils.findMatchPattern(d.house_num, "\\d+鍗曞厓") if(unitNum){ - unitNum = unitNum.replace("单元","") + unitNum = unitNum.replace("鍗曞厓","") } def key = d.city +"##"+newRegion+"##"+d.district_name+"##"+house_num if(unitNum){ @@ -320,8 +320,8 @@ class CqfdcMatch { areas << d.area def forms = obj.from - if(!forms.contains("房谱网")){ - forms << "房谱网" + if(!forms.contains("鎴胯氨缃�")){ + forms << "鎴胯氨缃�" } obj.m_date = new Date() def query = new BasicDBObject("_id", obj._id) @@ -344,7 +344,7 @@ class CqfdcMatch { } } udata.put("areas",[d.area]) - udata.put("from",["房谱网"]) + udata.put("from",["鎴胯氨缃�"]) if(d.floor_heigth && d.floor_heigth.toString().toInteger()){ udata.put("floors", d.floor_heigth.toString().toInteger()) } @@ -371,15 +371,15 @@ class CqfdcMatch { if(!d.use_type){ continue } - if(!d.use_type.contains("住宅")){ + if(!d.use_type.contains("浣忓畢")){ continue } def newRegion = d.match_region if(newRegion){ - def houseNumStr = DataHandleUtils.findMatchPattern(d.house_num_desc, "[\\w+]?-?\\w+[#|幢|栋|号]楼?.*?") + def houseNumStr = DataHandleUtils.findMatchPattern(d.house_num_desc, "[\\w+]?-?\\w+[#|骞鏍媩鍙穄妤�?.*?") def house_num = null if(houseNumStr){ - house_num = houseNumStr.replace("号楼","").replace("幢","").replace("栋","").replace("号","") + house_num = houseNumStr.replace("鍙锋ゼ","").replace("骞�","").replace("鏍�","").replace("鍙�","") } if(house_num){ def key = d.city +"##"+newRegion+"##"+d.name+"##"+house_num+"##"+d.unit_num+"##"+d.room_num @@ -399,17 +399,17 @@ class CqfdcMatch { } Integer room = null Integer hall = null - if(d.room_type && d.room_type.contains("室")){ - def roomStr = d.room_type.substring(0,d.room_type.indexOf("室")) + if(d.room_type && d.room_type.contains("瀹�")){ + def roomStr = d.room_type.substring(0,d.room_type.indexOf("瀹�")) if(roomStr){ - roomStr = roomStr.replace("一","1").replace("二","2").replace("三","3").replace("四","4").replace("五","5").replace("六","6").replace("七","7").replace("八","8").replace("九","9").replace("十","10") + roomStr = roomStr.replace("涓�","1").replace("浜�","2").replace("涓�","3").replace("鍥�","4").replace("浜�","5").replace("鍏�","6").replace("涓�","7").replace("鍏�","8").replace("涔�","9").replace("鍗�","10") room = roomStr.toInteger() } - if(d.room_type.contains("厅")){ - def hallStr = d.room_type.substring(d.room_type.indexOf("室")+1, d.room_type.indexOf("厅")) + if(d.room_type.contains("鍘�")){ + def hallStr = d.room_type.substring(d.room_type.indexOf("瀹�")+1, d.room_type.indexOf("鍘�")) if(hallStr){ - hallStr = hallStr.replace("一","1").replace("两","2").replace("二","2").replace("三","3").replace("四","4").replace("五","5").replace("六","6").replace("七","7").replace("八","8").replace("九","9").replace("十","10") + hallStr = hallStr.replace("涓�","1").replace("涓�","2").replace("浜�","2").replace("涓�","3").replace("鍥�","4").replace("浜�","5").replace("鍏�","6").replace("涓�","7").replace("鍏�","8").replace("涔�","9").replace("鍗�","10") hall = hallStr.toInteger() } } @@ -427,7 +427,7 @@ class CqfdcMatch { udata.put("room_num", d.room_num) udata.put("house_area",d.area.toDouble()) udata.put("status", 0) - udata.put("from", "重庆网上房地产") + udata.put("from", "閲嶅簡缃戜笂鎴垮湴浜�") udata.put("house_height", maxHeight) if(room){ udata.put("room", room) @@ -477,10 +477,10 @@ class CqfdcMatch { } def newRegion = d.match_region - def houseNumStr = DataHandleUtils.findMatchPattern(d.house_num_desc, "[\\w+]?-?\\w+[#|幢|栋|号]楼?.*?") + def houseNumStr = DataHandleUtils.findMatchPattern(d.house_num_desc, "[\\w+]?-?\\w+[#|骞鏍媩鍙穄妤�?.*?") def house_num = null if(houseNumStr){ - house_num = houseNumStr.replace("号楼","").replace("幢","").replace("栋","").replace("号","") + house_num = houseNumStr.replace("鍙锋ゼ","").replace("骞�","").replace("鏍�","").replace("鍙�","") } if(house_num){ def key = d.city +"##"+newRegion+"##"+d.name+"##"+house_num @@ -500,8 +500,8 @@ class CqfdcMatch { areas << d.area def forms = obj.from - if (!forms.contains("重庆网上房地产")) { - forms << "重庆网上房地产" + if (!forms.contains("閲嶅簡缃戜笂鎴垮湴浜�")) { + forms << "閲嶅簡缃戜笂鎴垮湴浜�" } obj.m_date = new Date() def query = new BasicDBObject("_id", obj._id) @@ -524,7 +524,7 @@ class CqfdcMatch { } } udata.put("areas", [d.area]) - udata.put("from", ["重庆网上房地产"]) + udata.put("from", ["閲嶅簡缃戜笂鎴垮湴浜�"]) udata.put("floors", maxHeight) udata.put("c_date", new Date()) udata.put("status", 1) @@ -598,12 +598,12 @@ class CqfdcMatch { keys << key } } - println "小区:"+keys.size() + println "灏忓尯锛�"+keys.size() } def matchLoudong(){ - def names = findAllLoudong("重庆") + def names = findAllLoudong("閲嶅簡") print names.size() def totalCount = new AtomicLong() final CountDownLatch latch = new CountDownLatch(names.size()) @@ -639,9 +639,9 @@ class CqfdcMatch { }); } latch.await() - println "匹配后:"+retMap.size() + println "鍖归厤鍚庯細"+retMap.size() updateLoudong(retMap) - println "修改完成!" + println "淇敼瀹屾垚锛�" } def updateLoudong(retMap){ @@ -699,7 +699,7 @@ class CqfdcMatch { def statHouseLoudong(){ def q = new BasicDBObject() - q.put("city", "重庆") + q.put("city", "閲嶅簡") def dbcursor = HOUSE_LOUDONG_LINE_COLL.find(q) def total = dbcursor.size() def ids = [] @@ -716,7 +716,7 @@ class CqfdcMatch { def statBaseLoudong(){ def q = new BasicDBObject() - q.put("city", "重庆") + q.put("city", "閲嶅簡") def dbcursor = LOUDONG_LINE_COLL.find(q) def total = dbcursor.size() def ids = [] diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/loudong/HouseBookChromeCrawl.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/loudong/HouseBookChromeCrawl.groovy index 8684414c8..13b0a6062 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/loudong/HouseBookChromeCrawl.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/loudong/HouseBookChromeCrawl.groovy @@ -17,7 +17,7 @@ import org.openqa.selenium.support.ui.WebDriverWait class HouseBookChromeCrawl { static DBCollection loudongConn = MongoUtils.getCollectionByName("fangjia_crawl", "loudong", "192.168.0.235", 27018) - static def city = "重庆" + static def city = "閲嶅簡" static main(args) { def task = new HouseBookChromeCrawl(); task.run() @@ -30,10 +30,10 @@ class HouseBookChromeCrawl { WebDriver driver = new ChromeDriver() def listPageUrl = getIndexPage(driver) def keywords = getListPage(driver,"http://www.house-book.com.cn/"+listPageUrl) -// keywords.remove("城南家园") -// keywords.remove("康居西城") +// keywords.remove("鍩庡崡瀹跺洯") +// keywords.remove("搴峰眳瑗垮煄") - println city +"共 "+keywords.size()+" 个小区" + println city +"鍏� "+keywords.size()+" 涓皬鍖�" getDistrictIndex(driver, keywords) } @@ -67,7 +67,7 @@ class HouseBookChromeCrawl { def eles = JQueryUtils.select(".title-area .title-text", doc) for(def e : eles){ def text = e.text() -// if(text=="富州北郡"){ +// if(text=="瀵屽窞鍖楅儭"){ // println i // } keywords << text @@ -95,8 +95,8 @@ class HouseBookChromeCrawl { def dist_name = JQueryUtils.select(".info-pname", docment).text() def addInfo = JQueryUtils.select(".addr-info", docment).text() def region = null - if(addInfo.contains(":") && addInfo.contains("-")){ - region = addInfo.substring(addInfo.indexOf(":")+1, addInfo.indexOf("-")) + if(addInfo.contains("锛�") && addInfo.contains("-")){ + region = addInfo.substring(addInfo.indexOf("锛�")+1, addInfo.indexOf("-")) } def address = JQueryUtils.select(".addr-info span", docment).text() @@ -104,10 +104,10 @@ class HouseBookChromeCrawl { // wait.until(new ExpectedCondition(){ // @Override // public WebElement apply(WebDriver d){ -// return d.findElement(By.linkText("[更多]")) +// return d.findElement(By.linkText("[鏇村]")) // } // }).click() - driver.findElement(By.linkText("[更多]")).click() + driver.findElement(By.linkText("[鏇村]")).click() // Thread.sleep(10) // wait.until(ExpectedConditions.visibilityOf(driver.findElement(By.id("shouUl")))); def lis = checkElement(driver, "#shouUl .dongli"); @@ -124,15 +124,15 @@ class HouseBookChromeCrawl { map.district_name = dist_name map.address = address map.house_num = houseNum - map.num = li.select(".dong_ul2 li:contains(许可证号:)").text().replace("许可证号:","") + map.num = li.select(".dong_ul2 li:contains(璁稿彲璇佸彿锛�)").text().replace("璁稿彲璇佸彿锛�","") map.type = li.select(".dong_ul2 .title-span-hbType").text() - def floor_heigth = li.select(".dong_ul2 label:contains(总楼层:)").text().replace("总楼层:","").replace("层","") + def floor_heigth = li.select(".dong_ul2 label:contains(鎬绘ゼ灞傦細)").text().replace("鎬绘ゼ灞傦細","").replace("灞�","") if(floor_heigth){ map.floor_heigth = floor_heigth } - def room_count = li.select(".dong_ul2 label:contains(总户数:)").text() + def room_count = li.select(".dong_ul2 label:contains(鎬绘埛鏁帮細)").text() if(room_count){ - room_count = room_count.substring(room_count.indexOf("总户数:")+4, room_count.lastIndexOf("户")) + room_count = room_count.substring(room_count.indexOf("鎬绘埛鏁帮細")+4, room_count.lastIndexOf("鎴�")) if(room_count){ map.household_count = room_count } @@ -141,16 +141,16 @@ class HouseBookChromeCrawl { } } - println dist_name +" 共 "+datas.size()+" 栋" + println dist_name +" 鍏� "+datas.size()+" 鏍�" for(def m : datas){ try{ driver.findElement(By.id(m.id)).click() def rows = parseDetail(driver) - println "栋divId: "+m.id +" 室:"+rows.size() + println "鏍媎ivId: "+m.id +" 瀹わ細"+rows.size() saveDate(m, rows) }catch(Exception e){ - println dist_name+" 栋divId: "+m.id+" 找不到相应的div element" + println dist_name+" 鏍媎ivId: "+m.id+" 鎵句笉鍒扮浉搴旂殑div element" } // driver.navigate().back(); @@ -184,7 +184,7 @@ class HouseBookChromeCrawl { def floor = null for(def j=0;j // if (k && k.equals("Set-Cookie")) { @@ -51,9 +51,9 @@ class HouseBookCrawl { // } // } // } catch (Exception e) { -// println "goApiLogin(${responseMap})发生异常, 异常信息为:" + e.getMessage() +// println "goApiLogin(${responseMap})鍙戠敓寮傚父, 寮傚父淇℃伅涓�:" + e.getMessage() // } -// println("最终构造cookieAuth为:" + cookieAuth) +// println("鏈�缁堟瀯閫燾ookieAuth涓�:" + cookieAuth) // return cookieAuth // } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/loudong/HouseLoudongCaluate.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/loudong/HouseLoudongCaluate.groovy index b9e4a5039..1f58ed5e8 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/loudong/HouseLoudongCaluate.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/loudong/HouseLoudongCaluate.groovy @@ -56,7 +56,7 @@ class HouseLoudongCaluate extends BaseBatch{ DBObject q = new BasicDBObject(); q.put("cat", "district"); q.put("visible", 0); - q.put('city', '上海'); + q.put('city', '涓婃捣'); def dsCursor = getDataStoreConnection().find(q); def list = []; for(def obj : dsCursor){ @@ -71,15 +71,15 @@ class HouseLoudongCaluate extends BaseBatch{ DBObject q = new BasicDBObject(); q.put("cat", "office"); q.put("visible", 0); - q.put('city', '上海'); + q.put('city', '涓婃捣'); def dsCursor = getDataStoreConnection().find(q); def list = []; - println "办公楼:"+dsCursor.count() + println "鍔炲叕妤硷細"+dsCursor.count() for(def obj : dsCursor){ def region = obj.get("region"); def name = obj.get("name"); def build_area = obj.get("build_area"); - if(build_area == '暂无资料'){ + if(build_area == '鏆傛棤璧勬枡'){ build_area = ''; } if(!build_area){ @@ -96,7 +96,7 @@ class HouseLoudongCaluate extends BaseBatch{ DBObject q = new BasicDBObject(); q.put("cat", cat); q.put("visible", 0); - q.put('city', '上海'); + q.put('city', '涓婃捣'); def dsCursor = getDataStoreConnection().find(q); def list = []; @@ -104,7 +104,7 @@ class HouseLoudongCaluate extends BaseBatch{ def region = obj.get("region"); def name = obj.get("name"); def filed_value = obj.get(filed); - if(filed_value == '暂无资料'){ + if(filed_value == '鏆傛棤璧勬枡'){ filed_value = ''; } if(!filed_value){ @@ -112,13 +112,13 @@ class HouseLoudongCaluate extends BaseBatch{ list << region + " "+ name; } } - println "total:"+dsCursor.count() +" 无值:"+list.size() + println "total锛�"+dsCursor.count() +" 鏃犲�硷細"+list.size() return list; } public def findHouseCount(def region, def name){ DBObject queryCondition = new BasicDBObject() - queryCondition.put("city", "上海"); + queryCondition.put("city", "涓婃捣"); queryCondition.put("house_num", new BasicDBObject(QueryOperators.EXISTS, true)) queryCondition.put("room_num", new BasicDBObject(QueryOperators.EXISTS, true)) queryCondition.put("region", region); @@ -157,9 +157,9 @@ class HouseLoudongCaluate extends BaseBatch{ if (file.exists()){ file.delete(); } - file.append("区域,") - file.append("楼盘名称,") - file.append("户数,") + file.append("鍖哄煙,") + file.append("妤肩洏鍚嶇О,") + file.append("鎴锋暟,") file.append(System.getProperty("line.separator")); map.each{ def array = it.key.split("#"); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/loudong/ImageTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/loudong/ImageTest.groovy index 1e7978919..28ead4200 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/loudong/ImageTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/loudong/ImageTest.groovy @@ -24,24 +24,24 @@ public class ImageTest { // Tesseract instance = new Tesseract(); // -// //将验证码图片的内容识别为字符串 +// //灏嗛獙璇佺爜鍥剧墖鐨勫唴瀹硅瘑鍒负瀛楃涓� // String result = instance.doOCR(imageFile); // println result - //1.获取网页的浏览器driver - //(1)定义url + //1.鑾峰彇缃戦〉鐨勬祻瑙堝櫒driver + //(1)瀹氫箟url String url="http://cqfdc.cq315house.com/HtmlPage/ShowRooms.html?buildingid=2l/xVhsMJPAZKivgt8ciOA&block=3%E5%8F%B7%E6%A5%BC#"; - //(2)设置driver驱动chromedriver.exe(版本:2.39)路径(相对路径) + //(2)璁剧疆driver椹卞姩chromedriver.exe锛堢増鏈細2.39锛夎矾寰�(鐩稿璺緞) String path = System.getProperty("user.dir"); System.setProperty("webdriver.chrome.driver","C:\\Users\\gaojuan\\AppData\\Local\\Google\\Chrome\\Application\\chromedriver.exe"); - //(3)建立selenium 驱动 + //(3)寤虹珛selenium 椹卞姩 //WebDriver driver = new ChromeDriver(options); WebDriver driver = new ChromeDriver(); - //(4)设置窗口最大化及网页等待时间 - driver.manage().window().maximize(); //窗口最大化 + //(4)璁剧疆绐楀彛鏈�澶у寲鍙婄綉椤电瓑寰呮椂闂� + driver.manage().window().maximize(); //绐楀彛鏈�澶у寲 // driver.manage().timeouts().implicitlyWait(10, TimeUnit.SECONDS); - //(5)启动driver浏览网页 - driver.get(url); //输入网址 + //锛�5锛夊惎鍔╠river娴忚缃戦〉 + driver.get(url); //杈撳叆缃戝潃 Thread.sleep(1000); driver.findElement(By.id("cell1-11-2")).click() @@ -56,10 +56,10 @@ public class ImageTest { BufferedImage pic1 = ImageIO.read(screenshot); Point point = ele.getLocation(); - //(2)输入验证码 + //(2)杈撳叆楠岃瘉鐮� File srcfile = ((TakesScreenshot) driver).getScreenshotAs(OutputType.FILE); FileUtils.copyFile(srcfile, new File("picture/source.png")); - //原图片 + //鍘熷浘鐗� //String soursePicPath = "D:\\data_dev\\test\\test.png"; String soursePicPath = "picture/source.png"; File sourcePic = new File(soursePicPath); @@ -74,26 +74,26 @@ public class ImageTest { - //加载待读取图片 + //鍔犺浇寰呰鍙栧浘鐗� //File imageFile = new File("D:\\data_dev\\test\\test02.png"); File imageFile = new File("picture/answer.png"); BufferedImage image = ImageIO.read(imageFile); - //对图片进行处理 + //瀵瑰浘鐗囪繘琛屽鐞� image = convertImage(image); - //创建tess对象 + //鍒涘缓tess瀵硅薄 ITesseract instance = new Tesseract(); - //设置训练文件目录 + //璁剧疆璁粌鏂囦欢鐩綍 //instance.setDatapath("E:\\workspace\\workspace_idea\\com_mth_data\\m-kuaidi100-data\\tessdata"); String path02 = System.getProperty("user.dir"); instance.setDatapath(path02 + "\\tessdata"); - //设置训练语言 + //璁剧疆璁粌璇█ //instance.setLanguage("chi_sim"); instance.setLanguage("eng"); - //执行转换 + //鎵ц杞崲 String s = instance.doOCR(image); System.out.println(s); - String[] split = s.replace(" ", "").split("=|:"); + String[] split = s.replace(" ", "").split("=|锛�"); String a = split[split.length - 1].trim(); char[] chars = a.toCharArray(); if (chars.length == 2) { @@ -112,33 +112,33 @@ public class ImageTest { WebElement input2 = driver.findElement(By.xpath("//*[@id=\"ctl00_Content_Body_TextBox2\"]")); input2.sendKeys(answer); Thread.sleep(4000); - //(3)点击"查询"按钮 + //(3)鐐瑰嚮"鏌ヨ"鎸夐挳 driver.findElement(By.xpath("//*[@id=\"ctl00_Content_Body_Button1\"]")).click(); - String SecondtHandle = driver.getWindowHandle(); //首先得到最先的窗口 权柄 - for (String winHandle1 : driver.getWindowHandles()) { //得到浏览器所有窗口的权柄为Set集合,遍历 - if (!winHandle1.equals(SecondtHandle)) { //如果为 最先的窗口 权柄跳出 + String SecondtHandle = driver.getWindowHandle(); //棣栧厛寰楀埌鏈�鍏堢殑绐楀彛 鏉冩焺 + for (String winHandle1 : driver.getWindowHandles()) { //寰楀埌娴忚鍣ㄦ墍鏈夌獥鍙g殑鏉冩焺涓篠et闆嗗悎锛岄亶鍘� + if (!winHandle1.equals(SecondtHandle)) { //濡傛灉涓� 鏈�鍏堢殑绐楀彛 鏉冩焺璺冲嚭 driver.close(); - driver.switchTo().window(winHandle1); //如果不为 最先的窗口 权柄,将 新窗口的操作权柄 给 driver - System.out.println(driver.getCurrentUrl()); //打印是否为新窗口 + driver.switchTo().window(winHandle1); //濡傛灉涓嶄负 鏈�鍏堢殑绐楀彛 鏉冩焺锛屽皢 鏂扮獥鍙g殑鎿嶄綔鏉冩焺 缁� driver + System.out.println(driver.getCurrentUrl()); //鎵撳嵃鏄惁涓烘柊绐楀彛 } } Thread.sleep(4000); - //4.关闭浏览器 + //4.鍏抽棴娴忚鍣� driver.close(); } - //对图片进行处理 - 提高识别度 + //瀵瑰浘鐗囪繘琛屽鐞� - 鎻愰珮璇嗗埆搴� public static BufferedImage convertImage(BufferedImage image) throws Exception { - //按指定宽高创建一个图像副本 + //鎸夋寚瀹氬楂樺垱寤轰竴涓浘鍍忓壇鏈� //image = ImageHelper.getSubImage(image, 0, 0, image.getWidth(), image.getHeight()); - //图像转换成灰度的简单方法 - 黑白处理 + //鍥惧儚杞崲鎴愮伆搴︾殑绠�鍗曟柟娉� - 榛戠櫧澶勭悊 image = ImageHelper.convertImageToGrayscale(image); - //图像缩放 - 放大n倍图像 + //鍥惧儚缂╂斁 - 鏀惧ぇn鍊嶅浘鍍� image = ImageHelper.getScaledInstance(image, image.getWidth() * 15, image.getHeight() * 15); return image; } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/loudong/LoudongStep1.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/loudong/LoudongStep1.groovy index f16feced6..0ba27d670 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/loudong/LoudongStep1.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/loudong/LoudongStep1.groovy @@ -47,9 +47,9 @@ class LoudongStep1 { DBCollection coll = MongoUtils.getCollectionByName("poseidon", "loudong_urls2", "222.73.242.41") DBCollection collStep1 = MongoUtils.getCollectionByName("loudong_data", "loudong_step1", "192.168.0.136") // DBObject q =new BasicDBObject(); -// q.put("city", "上海") -// q.put("region", "浦东") -// q.put("district_name", "汇豪天下") +// q.put("city", "涓婃捣") +// q.put("region", "娴︿笢") +// q.put("district_name", "姹囪豹澶╀笅") DBCursor cur = coll.find(); int i = 0 diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/loudong/LoudongStep2.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/loudong/LoudongStep2.groovy index abf1e9089..7280190c4 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/loudong/LoudongStep2.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/loudong/LoudongStep2.groovy @@ -84,7 +84,7 @@ class LoudongStep2 { Iterator iter = elements.iterator() while(iter.hasNext()) { Element ele = iter.next() - if(ele.html().indexOf("详情") > -1) { + if(ele.html().indexOf("璇︽儏") > -1) { continue; } String a = ele.getElementsByAttribute("href").toString(); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/loudong/LoudongStep3.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/loudong/LoudongStep3.groovy index 62177024c..1e54d0c22 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/loudong/LoudongStep3.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/loudong/LoudongStep3.groovy @@ -106,14 +106,14 @@ class LoudongStep3 { } } - public static Pattern pattNum = Pattern.compile("(.+?)(\\w+)号.+?(\\w+)单元(\\w+).*"); - public static Pattern pattFloor = Pattern.compile(".*第(\\d+)层.*"); - public static Pattern pattHeight = Pattern.compile(".*共(\\w+)层.*"); + public static Pattern pattNum = Pattern.compile("(.+?)(\\w+)鍙�.+?(\\w+)鍗曞厓(\\w+).*"); + public static Pattern pattFloor = Pattern.compile(".*绗�(\\d+)灞�.*"); + public static Pattern pattHeight = Pattern.compile(".*鍏�(\\w+)灞�.*"); private static Map dataToHouseData(Map data) { def keys = [] for(String key : data.keySet()) { - if(data.get(key) != null && data.get(key).toString().indexOf("暂无") > -1) { + if(data.get(key) != null && data.get(key).toString().indexOf("鏆傛棤") > -1) { keys << key } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/GaodePOI2Baidu.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/GaodePOI2Baidu.groovy index e557d8799..bbcc2b18a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/GaodePOI2Baidu.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/GaodePOI2Baidu.groovy @@ -14,23 +14,23 @@ import com.mongodb.DBCollection import org.bson.types.ObjectId def map = [ - ["学校", "高等院校", "中学", "小学", "幼儿园", "成人教育", "职业技术学校"]: "学校", - ["综合医院", "专科医院"] : "医院", - ["银行"] : "银行", - ["超级市场", "家电电子卖场", "便民商店/便利店"] : "超市", - ["商场"] : "商场", - ["美容美发店"] : "美容院", - ["健身中心"] : "健身中心", - ["公园广场", "公园"] : "公园/绿地", - ["公交车站"] : "公交", - ["飞机场"] : "机场", - ["火车站"] : "火车站", - ["快餐厅", "外国餐厅", "中餐厅"] : "餐馆", - ["宾馆酒店", "旅馆招待所"] : "酒店" + ["瀛︽牎", "楂樼瓑闄㈡牎", "涓", "灏忓", "骞煎効鍥�", "鎴愪汉鏁欒偛", "鑱屼笟鎶�鏈鏍�"]: "瀛︽牎", + ["缁煎悎鍖婚櫌", "涓撶鍖婚櫌"] : "鍖婚櫌", + ["閾惰"] : "閾惰", + ["瓒呯骇甯傚満", "瀹剁數鐢靛瓙鍗栧満", "渚挎皯鍟嗗簵/渚垮埄搴�"] : "瓒呭競", + ["鍟嗗満"] : "鍟嗗満", + ["缇庡缇庡彂搴�"] : "缇庡闄�", + ["鍋ヨ韩涓績"] : "鍋ヨ韩涓績", + ["鍏洯骞垮満", "鍏洯"] : "鍏洯/缁垮湴", + ["鍏氦杞︾珯"] : "鍏氦", + ["椋炴満鍦�"] : "鏈哄満", + ["鐏溅绔�"] : "鐏溅绔�", + ["蹇鍘�", "澶栧浗椁愬巺", "涓鍘�"] : "椁愰", + ["瀹鹃閰掑簵", "鏃呴鎷涘緟鎵�"] : "閰掑簵" ] as HashMap, String> -def type3In = ["学校", "高等院校", "中学", "小学", "幼儿园", "成人教育", "职业技术学校", "健身中心", "公园广场", "公园", "地铁站", "飞机场", "火车站"] -// 输出 Map 的内容 +def type3In = ["瀛︽牎", "楂樼瓑闄㈡牎", "涓", "灏忓", "骞煎効鍥�", "鎴愪汉鏁欒偛", "鑱屼笟鎶�鏈鏍�", "鍋ヨ韩涓績", "鍏洯骞垮満", "鍏洯", "鍦伴搧绔�", "椋炴満鍦�", "鐏溅绔�"] +// 杈撳嚭 Map 鐨勫唴瀹� map.each { key, value -> println("$key: $value") } @@ -50,24 +50,24 @@ specialMap.each { spe -> } def pcmap = [:] -provinceList.remove("广西省") -provinceList.add("广西壮族自治区") +provinceList.remove("骞胯タ鐪�") +provinceList.add("骞胯タ澹棌鑷不鍖�") DSCollection seabird = new DataStore("mongo.db.fangjia.com", 28017).getCollection("fangjia_base.baidu_place_poi2") DBCollection m43 = MongoUtils.getCollectionByName("fangjia_base", "baidu_place_poi2", "mongo.db.fangjia.com", 28017) -//def type3Not = ["学校内部设施", "进港", "出港", "候船室", "住宿服务相关"] +//def type3Not = ["瀛︽牎鍐呴儴璁炬柦", "杩涙腐", "鍑烘腐", "鍊欒埞瀹�", "浣忓鏈嶅姟鐩稿叧"] // -//def type2Not = ["学校", "专科医院", "综合医院", "诊所", "银行", "自动提款机", "便民商店/便利店", "家电电子卖场", "超级市场", "商场", "美容美发店", "地铁站", "港口码头", "住宿服务"] -//def type2In = ["运动场馆", "公园广场", "公交车站", "机场相关", "火车站", "餐饮服务"] -// 运动场馆 且为 健身中心 +//def type2Not = ["瀛︽牎", "涓撶鍖婚櫌", "缁煎悎鍖婚櫌", "璇婃墍", "閾惰", "鑷姩鎻愭鏈�", "渚挎皯鍟嗗簵/渚垮埄搴�", "瀹剁數鐢靛瓙鍗栧満", "瓒呯骇甯傚満", "鍟嗗満", "缇庡缇庡彂搴�", "鍦伴搧绔�", "娓彛鐮佸ご", "浣忓鏈嶅姟"] +//def type2In = ["杩愬姩鍦洪", "鍏洯骞垮満", "鍏氦杞︾珯", "鏈哄満鐩稿叧", "鐏溅绔�", "椁愰ギ鏈嶅姟"] +// 杩愬姩鍦洪 涓斾负 鍋ヨ韩涓績 -// 公园广场 公园广场 -//公园广场 公园 -// 公交车站 公交车站相关 +// 鍏洯骞垮満 鍏洯骞垮満 +//鍏洯骞垮満 鍏洯 +// 鍏氦杞︾珯 鍏氦杞︾珯鐩稿叧 -// 机场相关 飞机场 -// 火车站 火车站 -// 餐饮服务 快餐厅 外国餐厅 中餐厅 +// 鏈哄満鐩稿叧 椋炴満鍦� +// 鐏溅绔� 鐏溅绔� +// 椁愰ギ鏈嶅姟 蹇鍘� 澶栧浗椁愬巺 涓鍘� println(provinceList) //provinceList = provinceList.subList(0,1) @@ -83,7 +83,7 @@ for (p in provinceList) { // println(data["type"] + "-----") c = c+1 if (c%10000==0){ - println("已处理$c 条") + println("宸插鐞�$c 鏉�") } def locationString = String.valueOf(data.get("location")) def typeString = String.valueOf(data.get("type")) @@ -91,7 +91,7 @@ for (p in provinceList) { // citys2.add(cityS) // print(cityString) String city - if ("台湾省".equals(cityString) | "香港特别行政区".equals(cityString) | "澳门特别行政区".equals(cityString)) { + if ("鍙版咕鐪�".equals(cityString) | "棣欐腐鐗瑰埆琛屾斂鍖�".equals(cityString) | "婢抽棬鐗瑰埆琛屾斂鍖�".equals(cityString)) { city = cityString } else { city = RegionData.formatCity(cityString) @@ -112,40 +112,40 @@ for (p in provinceList) { // println(smallType.getClass().getName()) - // 使用正则表达式匹配经度和纬度 + // 浣跨敤姝e垯琛ㄨ揪寮忓尮閰嶇粡搴﹀拰绾害 def matcher = locationString =~ /(-?\d+\.\d+)/ def keyword = "" def flag = 0 - // 类型映射 - // 用三级分类判断 + // 绫诲瀷鏄犲皠 + // 鐢ㄤ笁绾у垎绫诲垽鏂� if (smallType in type3In) { - // 遍历Map的键集合,检查目标字符串是否存在于键集合中 + // 閬嶅巻Map鐨勯敭闆嗗悎锛屾鏌ョ洰鏍囧瓧绗︿覆鏄惁瀛樺湪浜庨敭闆嗗悎涓� map.keySet().each { key -> if (key.contains(smallType)) { def value = map[key] -// println("$smallType 存在于Map的键中,对应的值为: $value") +// println("$smallType 瀛樺湪浜嶮ap鐨勯敭涓紝瀵瑰簲鐨勫�间负: $value") keyword = value } } } else { - //用二级分类判断 + //鐢ㄤ簩绾у垎绫诲垽鏂� map.keySet().each { key -> if (key.contains(secondType)) { def value = map[key] -// println("$secondType 存在于Map的键中,对应的值为: $value") +// println("$secondType 瀛樺湪浜嶮ap鐨勯敭涓紝瀵瑰簲鐨勫�间负: $value") keyword = value } } } -// 获取匹配到的经度和纬度值 +// 鑾峰彇鍖归厤鍒扮殑缁忓害鍜岀含搴﹀�� def lng = matcher[0][0] lng = lng.toDouble() def lat = matcher[1][0] lat = lat.toDouble() -// println "纬度: $lng, 经度: $lat," +// println "绾害: $lng, 缁忓害: $lat," if (!"".equals(keyword)) { def dbo = new BasicDBObject() dbo["_id"] = new ObjectId() @@ -171,5 +171,5 @@ for (p in provinceList) { m43.insert(result) } - println("已处理完$p 的数据") + println("宸插鐞嗗畬$p 鐨勬暟鎹�") } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/JSBankTest/JSBankAliAddress.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/JSBankTest/JSBankAliAddress.groovy index cb9ef1193..c21aa4494 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/JSBankTest/JSBankAliAddress.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/JSBankTest/JSBankAliAddress.groovy @@ -4,7 +4,7 @@ import com.fangjia.core.util.HttpRequest import com.fangjia.script.gj.village.ailiyun.SignatureUtils import com.fangjia.script.util.ExcelUtils -//def address = "江苏省徐州市贾汪区经济开发区大黄山镇孤山小区B3.801" +//def address = "姹熻嫃鐪佸緪宸炲競璐炬豹鍖虹粡娴庡紑鍙戝尯澶ч粍灞遍晣瀛ゅ北灏忓尯B3.801" String excelFilePath = "C:\\Users\\Goojia\\Desktop\\1.xlsx"; ExcelUtils.removeEmptyRow(excelFilePath) def count = 0 @@ -12,13 +12,13 @@ ExcelUtils.singleThreadingModify(excelFilePath, { List items -> count = count + 1 if (count % 10 == 0) { - println("已处理:" + count) + println("宸插鐞嗭細" + count) } sleep(80) def address = items['A'] def map = SignatureUtils.getAliAddressStrc(address) - //prov=河南省 city=信阳市 district=息县 town=孙庙乡 community=前赵楼村 road=前赵楼村 poi=爱婆店 roomno=012 + //prov=娌冲崡鐪� city=淇¢槼甯� district=鎭幙 town=瀛欏簷涔� community=鍓嶈档妤兼潙 road=鍓嶈档妤兼潙 poi=鐖卞﹩搴� roomno=012 if ("prov" in map) { def province = map.get("prov") items['E'] = province diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/JSBankTest/JSBankDevelopmentZOne.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/JSBankTest/JSBankDevelopmentZOne.groovy index 7a2098677..1badfa864 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/JSBankTest/JSBankDevelopmentZOne.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/JSBankTest/JSBankDevelopmentZOne.groovy @@ -7,21 +7,21 @@ import java.util.Base64; import net.sf.json.JSONArray; -String excelFilePath = "C:\\Users\\Goojia\\Desktop\\测试.xlsx"; +String excelFilePath = "C:\\Users\\Goojia\\Desktop\\娴嬭瘯.xlsx"; ExcelUtils.removeEmptyRow(excelFilePath) def count = 0 ExcelUtils.singleThreadingModify(excelFilePath, { List items -> count += 1 if (count % 10 == 0) { - println("已处理:" + count) + println("宸插鐞嗭細" + count) } - def zx = ["北京", "天津", "上海", "重庆"] -// String province = "天津"; + def zx = ["鍖椾含", "澶╂触", "涓婃捣", "閲嶅簡"] +// String province = "澶╂触"; String province = items['E']; if (zx.contains(province)) { - province = province + "市"; + province = province + "甯�"; } -// String name = "天津经济技术开发区"; +// String name = "澶╂触缁忔祹鎶�鏈紑鍙戝尯"; String name = items['Q']; String elasticUsername = "elastic"; String elasticPassword = "elasticsearch"; @@ -63,7 +63,7 @@ ExcelUtils.singleThreadingModify(excelFilePath, { List items -> JSONObject hits = response.getJSONObject("hits"); if (hits != null && hits.size() > 0) { JSONArray hitsArray = hits.getJSONArray("hits"); - // 省略了之前的部分... + // 鐪佺暐浜嗕箣鍓嶇殑閮ㄥ垎... if (hitsArray != null && hitsArray.size() > 0) { for (int i = 0; i < hitsArray.size(); i++) { @@ -72,9 +72,9 @@ ExcelUtils.singleThreadingModify(excelFilePath, { List items -> String devName = source.optString("name"); // Assuming "name" is a String String level = source.optString("level"); // Assuming "level" is a String if (devName.equals(name)) { - items['O'] = "是"; + items['O'] = "鏄�"; items['P'] = level; - println("省份:" + province + " 名称:" + name + " 开发区名:" + devName + " 开发区级别:" + level); + println("鐪佷唤锛�" + province + " 鍚嶇О锛�" + name + " 寮�鍙戝尯鍚嶏細" + devName + " 寮�鍙戝尯绾у埆锛�" + level); break } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/JSBankTest/JSBankSheNongTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/JSBankTest/JSBankSheNongTest.groovy index 438897f64..0bdf3a595 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/JSBankTest/JSBankSheNongTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/JSBankTest/JSBankSheNongTest.groovy @@ -5,13 +5,13 @@ import com.fangjia.script.util.ExcelUtils import org.apache.tools.ant.types.resources.selectors.None -String excelFilePath = "C:\\Users\\Goojia\\Desktop\\测试.xlsx"; +String excelFilePath = "C:\\Users\\Goojia\\Desktop\\娴嬭瘯.xlsx"; ExcelUtils.removeEmptyRow(excelFilePath) def count = 0 ExcelUtils.singleThreadingModify(excelFilePath, { List items -> count += 1 if (count % 10 == 0) { - println("已处理:" + count) + println("宸插鐞嗭細" + count) } @@ -67,13 +67,13 @@ ExcelUtils.singleThreadingModify(excelFilePath, { List items -> if ("dev" in result) { dev = result.get("dev") } - // 开发区级别暂时没有 + // 寮�鍙戝尯绾у埆鏆傛椂娌℃湁 - // 暂时使用 + // 鏆傛椂浣跨敤 def defGrade = "" - if (!dev.equals("") && devDistrict.equals("否")) { - defGrade = "非国际级或省级" - devDistrict = "是" + if (!dev.equals("") && devDistrict.equals("鍚�")) { + defGrade = "闈炲浗闄呯骇鎴栫渷绾�" + devDistrict = "鏄�" } if (!devDistrict.equals("")) { items['O'] = devDistrict diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/Seewater2seebird.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/Seewater2seebird.groovy index 7e0630ce9..b511d8021 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/Seewater2seebird.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/Seewater2seebird.groovy @@ -5,7 +5,7 @@ import com.fangjia.script.util.ElasticUtils import com.mongodb.BasicDBObject def count = 0 -//ElasticUtils.executeSqlQuery("SELECT * FROM seawater WHERE city = '重庆' and region = '渝北' and district_name = '棕榈泉国际花园四期'and p_date > 20230801 ",{Map doc-> +//ElasticUtils.executeSqlQuery("SELECT * FROM seawater WHERE city = '閲嶅簡' and region = '娓濆寳' and district_name = '妫曟娉夊浗闄呰姳鍥洓鏈�'and p_date > 20230801 ",{Map doc-> ElasticUtils.executeSqlQuery("SELECT * FROM seawater WHERE p_date > 20230801 order by p_date desc limit 100",{Map doc-> def keys = ["c_date","_id","cat","city","region","name","address","block","district_name","total_price","area","height","floor","fitment","estate_type","hall","toilet","publish_date","url","direction","build_type","pay_type","line","rent_type","status","room"] // def dbo = new BasicDBObject() @@ -19,7 +19,7 @@ ElasticUtils.executeSqlQuery("SELECT * FROM seawater WHERE p_date > 20230801 or // DbUtils.seabird.save(dbo) }) -//DbUtils.seabird.find(new BasicDBObject("district_name","棕榈泉国际花园四期")).each { +//DbUtils.seabird.find(new BasicDBObject("district_name","妫曟娉夊浗闄呰姳鍥洓鏈�")).each { // println(it) //} print(count) \ No newline at end of file diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/sdklog/getAllCity.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/sdklog/getAllCity.groovy index ea0f02d7a..35e151330 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/sdklog/getAllCity.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/sdklog/getAllCity.groovy @@ -7,12 +7,12 @@ import jxl.Sheet import jxl.Workbook import org.apache.poi.ss.usermodel.WorkbookFactory -//String excelFilePath = "F:\\估家\\文件\\安徽省联社\\全国省级行政区房屋覆盖情况表 - 副本.xlsx" +//String excelFilePath = "F:\\浼板\\鏂囦欢\\瀹夊窘鐪佽仈绀綷\鍏ㄥ浗鐪佺骇琛屾斂鍖烘埧灞嬭鐩栨儏鍐佃〃 - 鍓湰.xlsx" //ExcelUtils.removeEmptyRow(excelFilePath) //ExcelUtils.singleThreadingModify(excelFilePath, { List items -> // // province1 = items['A'] -// if (!province1.equals('黑龙江省') || !province1.equals('内蒙古自治区')) { +// if (!province1.equals('榛戦緳姹熺渷') || !province1.equals('鍐呰挋鍙よ嚜娌诲尯')) { // province = province1.substring(0, 2) // } else { // province = province1.substring(0, 3) @@ -35,14 +35,14 @@ import org.apache.poi.ss.usermodel.WorkbookFactory //import com.fangjia.script.util.ExcelUtils // // -//String excelFilePath = "F:\\估家\\文件\\安徽省联社\\全国省级行政区房屋覆盖情况表.xlsx" +//String excelFilePath = "F:\\浼板\\鏂囦欢\\瀹夊窘鐪佽仈绀綷\鍏ㄥ浗鐪佺骇琛屾斂鍖烘埧灞嬭鐩栨儏鍐佃〃.xlsx" //ExcelUtils.removeEmptyRow(excelFilePath) //ExcelUtils.singleThreadingModify(excelFilePath, { List items -> // // def province1 = items['A'] // def province // -// if (!province1.equals('黑龙江省') && !province1.equals('内蒙古自治区')) { +// if (!province1.equals('榛戦緳姹熺渷') && !province1.equals('鍐呰挋鍙よ嚜娌诲尯')) { // province = province1.substring(0, 2) // } else { // province = province1.substring(0, 3) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/test/AliAddressTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/test/AliAddressTest.groovy index bfc2a005d..fa6fd750b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/test/AliAddressTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/test/AliAddressTest.groovy @@ -4,11 +4,11 @@ import com.fangjia.core.util.HttpRequest import com.fangjia.script.gj.village.ailiyun.SignatureUtils import com.fangjia.script.util.ExcelUtils -//def address = "江苏省徐州市贾汪区经济开发区大黄山镇孤山小区B3.801" +//def address = "姹熻嫃鐪佸緪宸炲競璐炬豹鍖虹粡娴庡紑鍙戝尯澶ч粍灞遍晣瀛ゅ北灏忓尯B3.801" <<<<<<< HEAD -String excelFilePath = "C:\\Users\\Goojia\\Desktop\\注册地址-太仓农商行POC测试.xlsx"; +String excelFilePath = "C:\\Users\\Goojia\\Desktop\\娉ㄥ唽鍦板潃-澶粨鍐滃晢琛孭OC娴嬭瘯.xlsx"; ======= -String excelFilePath = "C:\\Users\\Goojia\\Desktop\\涉农对私测试数据.xlsx"; +String excelFilePath = "C:\\Users\\Goojia\\Desktop\\娑夊啘瀵圭娴嬭瘯鏁版嵁.xlsx"; >>>>>>> f0061ade19d549f26467ab6be7e9eaaa66cd3011 ExcelUtils.removeEmptyRow(excelFilePath) def count = 0 @@ -16,7 +16,7 @@ ExcelUtils.singleThreadingModify(excelFilePath, { List items -> count = count + 1 if (count % 10 == 0) { - println("已处理:" + count) + println("宸插鐞嗭細" + count) } <<<<<<< HEAD sleep(80) @@ -26,7 +26,7 @@ ExcelUtils.singleThreadingModify(excelFilePath, { List items -> def address = items['A'] def map = SignatureUtils.getAliAddressStrc(address) - //prov=河南省 city=信阳市 district=息县 town=孙庙乡 community=前赵楼村 road=前赵楼村 poi=爱婆店 roomno=012 + //prov=娌冲崡鐪� city=淇¢槼甯� district=鎭幙 town=瀛欏簷涔� community=鍓嶈档妤兼潙 road=鍓嶈档妤兼潙 poi=鐖卞﹩搴� roomno=012 if ("prov" in map) { def province = map.get("prov") <<<<<<< HEAD diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/test/AliAddressTestChecked.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/test/AliAddressTestChecked.groovy index e744b76d4..c7c49eac9 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/test/AliAddressTestChecked.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/test/AliAddressTestChecked.groovy @@ -4,15 +4,15 @@ import com.fangjia.core.util.HttpRequest import com.fangjia.script.gj.village.ailiyun.SignatureUtils import com.fangjia.script.util.ExcelUtils -//def address = "江苏省徐州市贾汪区经济开发区大黄山镇孤山小区B3.801" -String excelFilePath = "C:\\Users\\Goojia\\Desktop\\涉农对私测试数据.xlsx"; +//def address = "姹熻嫃鐪佸緪宸炲競璐炬豹鍖虹粡娴庡紑鍙戝尯澶ч粍灞遍晣瀛ゅ北灏忓尯B3.801" +String excelFilePath = "C:\\Users\\Goojia\\Desktop\\娑夊啘瀵圭娴嬭瘯鏁版嵁.xlsx"; ExcelUtils.removeEmptyRow(excelFilePath) def count = 0 ExcelUtils.singleThreadingModify(excelFilePath, { List items -> count = count + 1 if (count % 10 == 0) { - println("已处理:" + count) + println("宸插鐞嗭細" + count) } sleep(50) @@ -21,7 +21,7 @@ ExcelUtils.singleThreadingModify(excelFilePath, { List items -> if (pro == null) { def map = SignatureUtils.getAliAddressStrc(address) - //prov=河南省 city=信阳市 district=息县 town=孙庙乡 community=前赵楼村 road=前赵楼村 poi=爱婆店 roomno=012 + //prov=娌冲崡鐪� city=淇¢槼甯� district=鎭幙 town=瀛欏簷涔� community=鍓嶈档妤兼潙 road=鍓嶈档妤兼潙 poi=鐖卞﹩搴� roomno=012 if ("prov" in map) { def province = map.get("prov") items['D'] = province diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/test/FiveLevelTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/test/FiveLevelTest.groovy index a430f9480..040e42982 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/test/FiveLevelTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/test/FiveLevelTest.groovy @@ -5,7 +5,7 @@ import com.fangjia.script.util.ExcelUtils import net.sf.json.JSONObject -String excelFilePath = "C:\\Users\\Goojia\\Desktop\\临时数据\\2.xlsx"; +String excelFilePath = "C:\\Users\\Goojia\\Desktop\\涓存椂鏁版嵁\\2.xlsx"; ExcelUtils.removeEmptyRow(excelFilePath) ExcelUtils.singleThreadingModify(excelFilePath, { List items -> diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/test/SheNongTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/test/SheNongTest.groovy index 91967ecf4..0ddb9a6e8 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/test/SheNongTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/test/SheNongTest.groovy @@ -5,19 +5,19 @@ import com.fangjia.script.util.ExcelUtils <<<<<<< HEAD -String excelFilePath = "C:\\Users\\Goojia\\Desktop\\注册地址-太仓农商行POC测试.xlsx"; +String excelFilePath = "C:\\Users\\Goojia\\Desktop\\娉ㄥ唽鍦板潃-澶粨鍐滃晢琛孭OC娴嬭瘯.xlsx"; ExcelUtils.removeEmptyRow(excelFilePath) def count = 0 ExcelUtils.singleThreadingModify(excelFilePath, { List items -> ======= -String excelFilePath = "C:\\Users\\Goojia\\Desktop\\涉农对私测试数据.xlsx"; +String excelFilePath = "C:\\Users\\Goojia\\Desktop\\娑夊啘瀵圭娴嬭瘯鏁版嵁.xlsx"; ExcelUtils.removeEmptyRow(excelFilePath) def count = 0 ExcelUtils.multiThreadingModify(excelFilePath, { List items -> >>>>>>> f0061ade19d549f26467ab6be7e9eaaa66cd3011 count += 1 if (count % 10 == 0) { - println("已处理:" + count) + println("宸插鐞嗭細" + count) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/test/SheNongTest2.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/test/SheNongTest2.groovy index 7b84a95d5..7937ee40a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/test/SheNongTest2.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/test/SheNongTest2.groovy @@ -4,13 +4,13 @@ import com.fangjia.core.util.HttpRequest import com.fangjia.script.util.ExcelUtils -String excelFilePath = "C:\\Users\\Goojia\\Desktop\\对公.xlsx"; +String excelFilePath = "C:\\Users\\Goojia\\Desktop\\瀵瑰叕.xlsx"; ExcelUtils.removeEmptyRow(excelFilePath) def count = 0 ExcelUtils.singleThreadingModify(excelFilePath, { List items -> count+=1 if (count%10==0){ - println("已处理:"+count) + println("宸插鐞嗭細"+count) } String url = "http://192.168.0.100:32080/FangJiaAddressService/villageIdentify"; @@ -34,19 +34,19 @@ ExcelUtils.singleThreadingModify(excelFilePath, { List items -> // committeeCode; // typeCode; // typeName; -// verifyFlag;//涉农标识 -// addrVerify;//地址是否有效信息 -// countyLevelCity;//是否为县级市 -// administrativeTowns;//是否市辖建制镇 -// countyGov;//是否为县政府 -// devDistrict;//是否为开发区 -// devDistrictName;//开发区 +// verifyFlag;//娑夊啘鏍囪瘑 +// addrVerify;//鍦板潃鏄惁鏈夋晥淇℃伅 +// countyLevelCity;//鏄惁涓哄幙绾у競 +// administrativeTowns;//鏄惁甯傝緰寤哄埗闀� +// countyGov;//鏄惁涓哄幙鏀垮簻 +// devDistrict;//鏄惁涓哄紑鍙戝尯 +// devDistrictName;//寮�鍙戝尯 // splitCommittee; // splitStreet; // poiName; // splitStreetNum; // dev; -// communitySource;//居委来源 +// communitySource;//灞呭鏉ユ簮 def map = [:] map.put("address", address) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/test/SheNongTestChecked.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/test/SheNongTestChecked.groovy index 8388fae47..6be25860d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/test/SheNongTestChecked.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/test/SheNongTestChecked.groovy @@ -4,20 +4,20 @@ import com.fangjia.core.util.HttpRequest import com.fangjia.script.util.ExcelUtils -String excelFilePath = "C:\\Users\\Goojia\\Desktop\\涉农对私测试数据 - 副本.xlsx"; +String excelFilePath = "C:\\Users\\Goojia\\Desktop\\娑夊啘瀵圭娴嬭瘯鏁版嵁 - 鍓湰.xlsx"; ExcelUtils.removeEmptyRow(excelFilePath) def count = 0 ExcelUtils.singleThreadingModify(excelFilePath, { List items -> count += 1 if (count % 10 == 0) { - println("已处理:" + count) + println("宸插鐞嗭細" + count) } String flag = items['X'] String address = items['A'] String tt = items['Y'] - if (flag == null&&"地址有效".equals(tt)) { + if (flag == null&&"鍦板潃鏈夋晥".equals(tt)) { String url = "http://192.168.0.100:32080/FangJiaAddressService/villageIdentify"; HttpRequest httpRequest = new HttpRequest(); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/test/nanjingBankTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/test/nanjingBankTest.groovy index 40ff50c4e..8e4fa33ae 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/test/nanjingBankTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/test/nanjingBankTest.groovy @@ -6,13 +6,13 @@ import com.fangjia.core.util.HttpRequest import com.fangjia.script.util.ExcelUtils -String excelFilePath = "C:\\Users\\Goojia\\Desktop\\南京银行测试.xlsx"; +String excelFilePath = "C:\\Users\\Goojia\\Desktop\\鍗椾含閾惰娴嬭瘯.xlsx"; ExcelUtils.removeEmptyRow(excelFilePath) def count = 0 ExcelUtils.singleThreadingModify(excelFilePath, { List items -> count+=1 if (count%10==0){ - println("已处理:"+count) + println("宸插鐞嗭細"+count) } String url = "http://192.168.0.100:32080/FangJiaAddressService/villageIdentify"; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/test/test.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/test/test.groovy index 22a5ae18e..fea246fbd 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/test/test.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/test/test.groovy @@ -5,7 +5,7 @@ import com.fangjia.script.util.ExcelUtils import net.sf.json.JSONObject -String excelFilePath = "F:\\估家\\文件\\北交所\\testcopy1.xlsx"; +String excelFilePath = "F:\\浼板\\鏂囦欢\\鍖椾氦鎵�\\testcopy1.xlsx"; ExcelUtils.removeEmptyRow(excelFilePath) ExcelUtils.singleThreadingModify(excelFilePath, { List items -> @@ -31,7 +31,7 @@ ExcelUtils.singleThreadingModify(excelFilePath, { List items -> map.put("token", "F54F52381C49BB9EB4A33EB1B65604AE4B71A28AEE53518A94A2F360408B9056D57553931D15CE6DDE765562DAD286BA38E05A4CDAFC51C3D527A4959BF8E75A3B95DB7108FCEA340DDE61925616DB55118E1851E67D83EAD800460D100D6B667A4ED8EE67C8F7FB") if (!address.contains("%")) { - // 发送HTTP请求 + // 鍙戦�丠TTP璇锋眰 long start long end @@ -62,8 +62,8 @@ ExcelUtils.singleThreadingModify(excelFilePath, { List items -> end = System.currentTimeMillis(); items['H'] = String.valueOf(end - start); println content.get("msg") - if(content.get("msg").contains("该地址不支持估价!")) { - items['I'] = "该地址不支持估价!" + if(content.get("msg").contains("璇ュ湴鍧�涓嶆敮鎸佷及浠凤紒")) { + items['I'] = "璇ュ湴鍧�涓嶆敮鎸佷及浠凤紒" } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/mapabc/BusDataImporter.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/mapabc/BusDataImporter.groovy index 0a77a0841..92fea9e15 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/mapabc/BusDataImporter.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/mapabc/BusDataImporter.groovy @@ -15,7 +15,7 @@ class BusDataImporter { public static void main(String[] args) { Class.forName("org.sqlite.JDBC"); - String city = "上海" + String city = "涓婃捣" Connection conn = DriverManager.getConnection("jdbc:sqlite:D://shanghai"); Statement stat = conn.createStatement(); Statement stat2 = conn.createStatement(); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/mapabc/DistrictAddressPOIBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/mapabc/DistrictAddressPOIBatch.groovy index b3cea8a30..109ce5f6b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/mapabc/DistrictAddressPOIBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/mapabc/DistrictAddressPOIBatch.groovy @@ -40,7 +40,7 @@ import com.mongodb.DBCursor import com.mongodb.DBObject /** - * 利用Map ABC通过地址解析出小区的经纬度 + * 鍒╃敤Map ABC閫氳繃鍦板潃瑙f瀽鍑哄皬鍖虹殑缁忕含搴� * @author xiaoyu * */ @@ -57,7 +57,7 @@ public class DistrictAddressPOIBatch { } def updateBuinessShop() { - def cities = ["北京", "广州"] + def cities = ["鍖椾含", "骞垮窞"] DBCollection coll = MongoUtils.getCollectionByName("fangjia", "business_shop", "mongo.db.fangjia.com") for(String city : cities) { int c = 0 @@ -107,7 +107,7 @@ public class DistrictAddressPOIBatch { DBObject district = datastoreDB.findOne(new BasicDBObject().append("cat", "district").append("visible", 0).append("city", cityDisplay).append("region", region).append("name", name)) if(district != null) { Map markmap = district.get('mark_map') - //被锁定的字段不修改 + //琚攣瀹氱殑瀛楁涓嶄慨鏀� if(markmap && markmap.get('lat') == 1 && markmap.get('lng') == 1) { if(district.lat && district.lng && district.lng > 10000000000L || district.lat > 10000000000L) { continue @@ -141,11 +141,11 @@ public class DistrictAddressPOIBatch { /** - * 更新经纬度 + * 鏇存柊缁忕含搴� * @return */ def updateLngLat() { - DSCursor cur = datastoreDB.find(new BasicDBObject().append("cat", "office").append("visible", 0).append('city', '北京')) + DSCursor cur = datastoreDB.find(new BasicDBObject().append("cat", "office").append("visible", 0).append('city', '鍖椾含')) Iterator iter = cur.iterator() long totalCount = cur.count() @@ -158,7 +158,7 @@ public class DistrictAddressPOIBatch { String region = district.region; String name = district.name; Map markmap = district.get('mark_map') - //被锁定的字段不修改 + //琚攣瀹氱殑瀛楁涓嶄慨鏀� if(markmap && markmap.get('lat') == 1 && markmap.get('lng') == 1) { if(district.lat && district.lng && district.lng > 10000000000L || district.lat > 10000000000L) { continue @@ -198,7 +198,7 @@ public class DistrictAddressPOIBatch { } /** - * 补充经纬度 + * 琛ュ厖缁忕含搴� * @return */ def processLngLat() { @@ -322,10 +322,10 @@ public class DistrictAddressPOIBatch { } /** - * 根据经纬度计算距离 - * 返回单位为米 - * 使用方法如:println caculateDistance(121.4420330826, 31.2460880049,121.4432680000, 31.2459470000) - * 具体参考:http://www.storyday.com/wp-content/uploads/2008/09/latlung_dis.html + * 鏍规嵁缁忕含搴﹁绠楄窛绂� + * 杩斿洖鍗曚綅涓虹背 + * 浣跨敤鏂规硶濡傦細println caculateDistance(121.4420330826, 31.2460880049,121.4432680000, 31.2459470000) + * 鍏蜂綋鍙傝�冿細http://www.storyday.com/wp-content/uploads/2008/09/latlung_dis.html */ public def caculateDistance(lng1, lat1, lng2, lat2){ def radLat1 = rad(lat1) @@ -368,7 +368,7 @@ public class DistrictAddressPOIBatch { // println address content = crawl(url, referer, "UTF-8") - if(content.indexOf('异常') > -1 && retry <= 6) { + if(content.indexOf('寮傚父') > -1 && retry <= 6) { sleep(1 * 1000) continue; } @@ -395,7 +395,7 @@ public class DistrictAddressPOIBatch { for(poi in poiList){ def level = poi.level.text() if (isFirst){ - //如果是第一次,则以第一次作为优先选择 + //濡傛灉鏄涓�娆★紝鍒欎互绗竴娆′綔涓轰紭鍏堥�夋嫨 getDataFromPoi(ret, poi) isFirst = false } @@ -595,7 +595,7 @@ public class DistrictAddressPOIBatch { /** - * 从poi中获得需要的数据 + * 浠巔oi涓幏寰楅渶瑕佺殑鏁版嵁 * @param ret * @param poi */ @@ -609,15 +609,15 @@ public class DistrictAddressPOIBatch { } /** - * 把区、新区去掉 + * 鎶婂尯銆佹柊鍖哄幓鎺� * @param s * @return */ def removeQu(String s){ - if (s.endsWith("新区")){ + if (s.endsWith("鏂板尯")){ return s.substring(0, s.length()-2); } - else if (s.endsWith("区")){ + else if (s.endsWith("鍖�")){ return s.substring(0, s.length() - 1); } return s; @@ -671,375 +671,375 @@ public class DistrictAddressPOIBatch { static { - CITY_CODE_MAP.put("北京", "010") - CITY_CODE_MAP.put("广州", "020") - CITY_CODE_MAP.put("重庆", "023") - CITY_CODE_MAP.put("南京", "025") - CITY_CODE_MAP.put("武汉", "027") - CITY_CODE_MAP.put("成都", "028") - CITY_CODE_MAP.put("保定", "0312") - CITY_CODE_MAP.put("承德", "0314") - CITY_CODE_MAP.put("唐山", "0315") - CITY_CODE_MAP.put("廊坊", "0316") - CITY_CODE_MAP.put("秦皇岛", "0335") - CITY_CODE_MAP.put("新乡", "0373") - CITY_CODE_MAP.put("洛阳", "0379") - CITY_CODE_MAP.put("大连", "0411") - CITY_CODE_MAP.put("鞍山", "0412") - CITY_CODE_MAP.put("抚顺", "0413") - CITY_CODE_MAP.put("本溪", "0414") - CITY_CODE_MAP.put("丹东", "0415") - CITY_CODE_MAP.put("辽阳", "0419") - CITY_CODE_MAP.put("葫芦岛", "0429") - CITY_CODE_MAP.put("长春", "0431") - CITY_CODE_MAP.put("哈尔滨", "0451") - CITY_CODE_MAP.put("佳木斯", "0454") - CITY_CODE_MAP.put("包头", "0472") - CITY_CODE_MAP.put("镇江", "0511") - CITY_CODE_MAP.put("苏州", "0512") - CITY_CODE_MAP.put("昆山", "0512") - CITY_CODE_MAP.put("南通", "0513") - CITY_CODE_MAP.put("扬州", "0514") - CITY_CODE_MAP.put("徐州", "0516") - CITY_CODE_MAP.put("常州", "0519") - CITY_CODE_MAP.put("济南", "0531") - CITY_CODE_MAP.put("青岛", "0532") - CITY_CODE_MAP.put("蚌埠", "0552") - CITY_CODE_MAP.put("黄山", "0559") - CITY_CODE_MAP.put("杭州", "0571") - CITY_CODE_MAP.put("湖州", "0572") - CITY_CODE_MAP.put("台州", "0576") - CITY_CODE_MAP.put("温州", "0577") - CITY_CODE_MAP.put("福州", "0591") - CITY_CODE_MAP.put("厦门", "0592") - CITY_CODE_MAP.put("宁德", "0593") - CITY_CODE_MAP.put("莆田", "0594") - CITY_CODE_MAP.put("泉州", "0595") - CITY_CODE_MAP.put("漳州", "0596") - CITY_CODE_MAP.put("威海", "0631") - CITY_CODE_MAP.put("汕尾", "0660") - CITY_CODE_MAP.put("汕尾岛", "0660") - CITY_CODE_MAP.put("阳江", "0662") - CITY_CODE_MAP.put("揭阳", "0663") - CITY_CODE_MAP.put("茂名", "0668") - CITY_CODE_MAP.put("襄阳", "0710") - CITY_CODE_MAP.put("黄石", "0714") - CITY_CODE_MAP.put("宜昌", "0717") - CITY_CODE_MAP.put("十堰", "0719") - CITY_CODE_MAP.put("荆门", "0724") - CITY_CODE_MAP.put("岳阳", "0730") - CITY_CODE_MAP.put("长沙", "0731") - CITY_CODE_MAP.put("湘潭", "0732") - CITY_CODE_MAP.put("株洲", "0733") - CITY_CODE_MAP.put("常德", "0736") - CITY_CODE_MAP.put("江门", "0750") - CITY_CODE_MAP.put("汕头", "0754") - CITY_CODE_MAP.put("深圳", "0755") - CITY_CODE_MAP.put("珠海", "0756") - CITY_CODE_MAP.put("湛江", "0759") - CITY_CODE_MAP.put("中山", "0760") - CITY_CODE_MAP.put("防城港", "0770") - CITY_CODE_MAP.put("南宁", "0771") - CITY_CODE_MAP.put("桂林", "0773") - CITY_CODE_MAP.put("北海", "0779") - CITY_CODE_MAP.put("南昌", "0791") - CITY_CODE_MAP.put("九江", "0792") - CITY_CODE_MAP.put("景德镇", "0798") - CITY_CODE_MAP.put("自贡", "0813") - CITY_CODE_MAP.put("泸州", "0830") - CITY_CODE_MAP.put("宜宾", "0831") - CITY_CODE_MAP.put("内江", "01832") - CITY_CODE_MAP.put("眉山", "0833") - CITY_CODE_MAP.put("贵阳", "0851") - CITY_CODE_MAP.put("三亚", "0899") - CITY_CODE_MAP.put("咸阳", "0910") - CITY_CODE_MAP.put("延安", "0911") - CITY_CODE_MAP.put("延边朝鲜族自治州", "0433") - CITY_CODE_MAP.put("七台河", "0464") - CITY_CODE_MAP.put("三明", "0598") - CITY_CODE_MAP.put("三门峡", "0398") - CITY_CODE_MAP.put("上海", "021") - CITY_CODE_MAP.put("上饶", "0793") - CITY_CODE_MAP.put("东莞", "0769") - CITY_CODE_MAP.put("东营", "0546") - CITY_CODE_MAP.put("中卫", "01953") - CITY_CODE_MAP.put("临夏回族自治州", "0930") - CITY_CODE_MAP.put("临汾", "0357") - CITY_CODE_MAP.put("临沂", "0539") - CITY_CODE_MAP.put("丽水", "0578") - CITY_CODE_MAP.put("乌兰察布", "0474") - CITY_CODE_MAP.put("乌海", "0473") - CITY_CODE_MAP.put("乌鲁木齐", "0991") - CITY_CODE_MAP.put("乐山", "0833") - CITY_CODE_MAP.put("云浮", "0766") - CITY_CODE_MAP.put("亳州", "0558") - CITY_CODE_MAP.put("仙桃", "0728") - CITY_CODE_MAP.put("伊春", "0458") - CITY_CODE_MAP.put("伊犁哈萨克自治州", "0999") - CITY_CODE_MAP.put("佛山", "0757") - CITY_CODE_MAP.put("信阳", "0376") - CITY_CODE_MAP.put("克拉玛依", "0990") - CITY_CODE_MAP.put("六安", "0564") - CITY_CODE_MAP.put("兰州", "0931") - CITY_CODE_MAP.put("兴安盟", "0482") - CITY_CODE_MAP.put("凉山彝族自治州", "0834") - CITY_CODE_MAP.put("南充", "0817") - CITY_CODE_MAP.put("南平", "0599") - CITY_CODE_MAP.put("南阳", "0377") - CITY_CODE_MAP.put("博尔塔拉蒙古自治州", "0909") - CITY_CODE_MAP.put("双鸭山", "0469") - CITY_CODE_MAP.put("合肥", "0551") - CITY_CODE_MAP.put("吉安", "0796") - CITY_CODE_MAP.put("吉林", "0432") - CITY_CODE_MAP.put("吐鲁番地区", "0995") - CITY_CODE_MAP.put("吕梁", "0358") - CITY_CODE_MAP.put("吴忠", "0953") - CITY_CODE_MAP.put("周口", "0394") - CITY_CODE_MAP.put("呼伦贝尔", "0470") - CITY_CODE_MAP.put("呼和浩特", "0471") - CITY_CODE_MAP.put("咸宁", "0715") - CITY_CODE_MAP.put("商丘", "0370") - CITY_CODE_MAP.put("商洛", "0914") - CITY_CODE_MAP.put("嘉兴", "0573") - CITY_CODE_MAP.put("四平", "0434") - CITY_CODE_MAP.put("塔城地区", "0901") - CITY_CODE_MAP.put("大兴安岭地区", "0457") - CITY_CODE_MAP.put("大同", "0352") - CITY_CODE_MAP.put("大庆", "0459") - CITY_CODE_MAP.put("大理白族自治州", "0872") - CITY_CODE_MAP.put("天水", "0938") - CITY_CODE_MAP.put("天津", "022") - CITY_CODE_MAP.put("天门", "01728") - CITY_CODE_MAP.put("太原", "0351") - CITY_CODE_MAP.put("娄底", "0738") - CITY_CODE_MAP.put("孝感", "0712") - CITY_CODE_MAP.put("宁波", "0574") - CITY_CODE_MAP.put("安庆", "0556") - CITY_CODE_MAP.put("安康", "0915") - CITY_CODE_MAP.put("安阳", "0372") - CITY_CODE_MAP.put("安顺", "0853") - CITY_CODE_MAP.put("定西", "0932") - CITY_CODE_MAP.put("宜春", "0795") - CITY_CODE_MAP.put("宝鸡", "0917") - CITY_CODE_MAP.put("宣城", "0563") - CITY_CODE_MAP.put("宿州", "0557") - CITY_CODE_MAP.put("宿迁", "0527") - CITY_CODE_MAP.put("山南地区", "0893") - CITY_CODE_MAP.put("崇左", "01771") - CITY_CODE_MAP.put("巢湖", "0565") - CITY_CODE_MAP.put("巴中", "0827") - CITY_CODE_MAP.put("平凉", "0933") - CITY_CODE_MAP.put("平顶山", "0375") - CITY_CODE_MAP.put("广元", "0839") - CITY_CODE_MAP.put("广安", "0826") - CITY_CODE_MAP.put("庆阳", "0934") - CITY_CODE_MAP.put("开封", "0378") - CITY_CODE_MAP.put("张家口", "0313") - CITY_CODE_MAP.put("张家界", "0744") - CITY_CODE_MAP.put("张掖", "0936") - CITY_CODE_MAP.put("德州", "0534") - CITY_CODE_MAP.put("德阳", "0838") - CITY_CODE_MAP.put("忻州", "0350") - CITY_CODE_MAP.put("怀化", "0745") - CITY_CODE_MAP.put("恩施土家族苗族自治州", "0718") - CITY_CODE_MAP.put("惠州", "0752") - CITY_CODE_MAP.put("抚州", "0794") - CITY_CODE_MAP.put("拉萨", "0891") - CITY_CODE_MAP.put("攀枝花", "0812") - CITY_CODE_MAP.put("新余", "0790") - CITY_CODE_MAP.put("无锡", "0510") - CITY_CODE_MAP.put("日喀则地区", "0892") - CITY_CODE_MAP.put("日照", "0633") - CITY_CODE_MAP.put("昆明", "0871") - CITY_CODE_MAP.put("昌吉回族自治州", "0994") - CITY_CODE_MAP.put("昭通", "0870") - CITY_CODE_MAP.put("晋中", "0354") - CITY_CODE_MAP.put("晋城", "0356") - CITY_CODE_MAP.put("曲靖", "0874") - CITY_CODE_MAP.put("朔州", "0349") - CITY_CODE_MAP.put("朝阳", "0421") - CITY_CODE_MAP.put("来宾", "01772") - CITY_CODE_MAP.put("松原", "0438") - CITY_CODE_MAP.put("枣庄", "0632") - CITY_CODE_MAP.put("柳州", "0772") - CITY_CODE_MAP.put("梅州", "0753") - CITY_CODE_MAP.put("梧州", "0774") - CITY_CODE_MAP.put("楚雄彝族自治州", "0878") - CITY_CODE_MAP.put("榆林", "0912") - CITY_CODE_MAP.put("武威", "01935") - CITY_CODE_MAP.put("毕节地区", "0857") - CITY_CODE_MAP.put("永州", "0746") - CITY_CODE_MAP.put("汉中", "0916") - CITY_CODE_MAP.put("池州", "0566") - CITY_CODE_MAP.put("沈阳", "024") - CITY_CODE_MAP.put("沧州", "0317") - CITY_CODE_MAP.put("河池", "0778") - CITY_CODE_MAP.put("河源", "0762") - CITY_CODE_MAP.put("泰安", "0538") - CITY_CODE_MAP.put("泰州", "0523") - CITY_CODE_MAP.put("济宁", "0537") - CITY_CODE_MAP.put("济源", "01391") - CITY_CODE_MAP.put("海东地区", "0972") - CITY_CODE_MAP.put("海北藏族自治州", "0970") - CITY_CODE_MAP.put("海南藏族自治州", "0974") - CITY_CODE_MAP.put("海口", "0898") - CITY_CODE_MAP.put("淄博", "0533") - CITY_CODE_MAP.put("淮北", "0561") - CITY_CODE_MAP.put("淮南", "0554") - CITY_CODE_MAP.put("淮安", "0517") - CITY_CODE_MAP.put("清远", "0763") - CITY_CODE_MAP.put("渭南", "0913") - CITY_CODE_MAP.put("湘西土家族苗族自治州", "0743") - CITY_CODE_MAP.put("滁州", "0550") - CITY_CODE_MAP.put("滨州", "0543") - CITY_CODE_MAP.put("漯河", "0395") - CITY_CODE_MAP.put("潍坊", "0536") - CITY_CODE_MAP.put("潜江", "02728") - CITY_CODE_MAP.put("潮州", "0768") - CITY_CODE_MAP.put("濮阳", "0393") - CITY_CODE_MAP.put("烟台", "0535") - CITY_CODE_MAP.put("焦作", "0391") - CITY_CODE_MAP.put("牡丹江", "0453") - CITY_CODE_MAP.put("玉林", "0775") - CITY_CODE_MAP.put("玉溪", "0877") - CITY_CODE_MAP.put("甘孜藏族自治州", "0836") - CITY_CODE_MAP.put("白城", "0436") - CITY_CODE_MAP.put("白山", "0439") - CITY_CODE_MAP.put("白银", "0943") - CITY_CODE_MAP.put("益阳", "0737") - CITY_CODE_MAP.put("盐城", "0515") - CITY_CODE_MAP.put("盘锦", "0427") - CITY_CODE_MAP.put("石嘴山", "0952") - CITY_CODE_MAP.put("石家庄", "0311") - CITY_CODE_MAP.put("石河子", "0993") - CITY_CODE_MAP.put("神农架林区", "01719") - CITY_CODE_MAP.put("红河哈尼族彝族自治州", "0873") - CITY_CODE_MAP.put("绍兴", "0575") - CITY_CODE_MAP.put("绥化", "0455") - CITY_CODE_MAP.put("绵阳", "0816") - CITY_CODE_MAP.put("聊城", "0635") - CITY_CODE_MAP.put("肇庆", "0758") - CITY_CODE_MAP.put("舟山", "0580") - CITY_CODE_MAP.put("芜湖", "0553") - CITY_CODE_MAP.put("荆州", "0716") - CITY_CODE_MAP.put("莱芜", "0634") - CITY_CODE_MAP.put("菏泽", "0530") - CITY_CODE_MAP.put("萍乡", "0799") - CITY_CODE_MAP.put("营口", "0417") - CITY_CODE_MAP.put("衡水", "0318") - CITY_CODE_MAP.put("衡阳", "0734") - CITY_CODE_MAP.put("衢州", "0570") - CITY_CODE_MAP.put("西双版纳傣族自治州", "0691") - CITY_CODE_MAP.put("西宁", "0971") - CITY_CODE_MAP.put("西安", "029") - CITY_CODE_MAP.put("许昌", "0374") - CITY_CODE_MAP.put("贵港", "01755") - CITY_CODE_MAP.put("贺州", "01774") - CITY_CODE_MAP.put("资阳", "0832") - CITY_CODE_MAP.put("赣州", "0797") - CITY_CODE_MAP.put("赤峰", "0476") - CITY_CODE_MAP.put("辽源", "0437") - CITY_CODE_MAP.put("达州", "0818") - CITY_CODE_MAP.put("运城", "0359") - CITY_CODE_MAP.put("连云港", "0518") - CITY_CODE_MAP.put("通化", "0435") - CITY_CODE_MAP.put("通辽", "0475") - CITY_CODE_MAP.put("遂宁", "0825") - CITY_CODE_MAP.put("遵义", "0852") - CITY_CODE_MAP.put("邢台", "0319") - CITY_CODE_MAP.put("邯郸", "0310") - CITY_CODE_MAP.put("邵阳", "0739") - CITY_CODE_MAP.put("郑州", "0371") - CITY_CODE_MAP.put("郴州", "0735") - CITY_CODE_MAP.put("鄂尔多斯", "0477") - CITY_CODE_MAP.put("鄂州", "0711") - CITY_CODE_MAP.put("酒泉", "0937") - CITY_CODE_MAP.put("金华", "0579") - CITY_CODE_MAP.put("金昌", "0935") - CITY_CODE_MAP.put("钦州", "0777") - CITY_CODE_MAP.put("铁岭", "0410") - CITY_CODE_MAP.put("铜仁地区", "0856") - CITY_CODE_MAP.put("铜川", "0919") - CITY_CODE_MAP.put("铜陵", "0562") - CITY_CODE_MAP.put("银川", "0951") - CITY_CODE_MAP.put("锦州", "0416") - CITY_CODE_MAP.put("长治", "0355") - CITY_CODE_MAP.put("阜新", "0418") - CITY_CODE_MAP.put("阜阳", "01558") - CITY_CODE_MAP.put("阳泉", "0353") - CITY_CODE_MAP.put("阿坝藏族羌族自治州", "0837") - CITY_CODE_MAP.put("陇南", "02935") - CITY_CODE_MAP.put("随州", "0722") - CITY_CODE_MAP.put("雅安", "0835") - CITY_CODE_MAP.put("韶关", "0751") - CITY_CODE_MAP.put("马鞍山", "0555") - CITY_CODE_MAP.put("驻马店", "0396") - CITY_CODE_MAP.put("鸡西", "0467") - CITY_CODE_MAP.put("鹤壁", "0392") - CITY_CODE_MAP.put("鹤岗", "0468") - CITY_CODE_MAP.put("鹰潭", "0701") - CITY_CODE_MAP.put("黄冈", "0713") - CITY_CODE_MAP.put("黑河", "0456") - CITY_CODE_MAP.put("黔东南苗族侗族自治州", "0855") - CITY_CODE_MAP.put("黔南布依族苗族自治州", "0854") - CITY_CODE_MAP.put("齐齐哈尔", "0452") - CITY_CODE_MAP.put("龙岩", "0597") - CITY_CODE_MAP.put("甘南藏族自治州", "0941") - CITY_CODE_MAP.put("嘉峪关", "1937") - CITY_CODE_MAP.put("百色", "0776") - CITY_CODE_MAP.put("六盘水", "0858") - CITY_CODE_MAP.put("黔西南布依族苗族自治州", "0859") - CITY_CODE_MAP.put("白沙黎族自治县", "0802") - CITY_CODE_MAP.put("保亭黎族苗族自治县", "0801") - CITY_CODE_MAP.put("昌江黎族自治县", "0803") - CITY_CODE_MAP.put("澄迈县", "0804") - CITY_CODE_MAP.put("定安县", "0806") - CITY_CODE_MAP.put("东方", "0807") - CITY_CODE_MAP.put("东沙群岛", "0808") - CITY_CODE_MAP.put("乐东黎族自治县", "2802") - CITY_CODE_MAP.put("临高县", "1896") - CITY_CODE_MAP.put("陵水黎族自治县", "0809") - CITY_CODE_MAP.put("南沙群岛", "1891") - CITY_CODE_MAP.put("琼海", "1894") - CITY_CODE_MAP.put("琼中黎族苗族自治县", "1899") - CITY_CODE_MAP.put("屯昌县", "1892") - CITY_CODE_MAP.put("万宁", "1898") - CITY_CODE_MAP.put("文昌", "1893") - CITY_CODE_MAP.put("五指山", "1897") - CITY_CODE_MAP.put("西沙群岛", "1895") - CITY_CODE_MAP.put("中沙群岛", "2801") - CITY_CODE_MAP.put("儋州", "0805") - CITY_CODE_MAP.put("阿拉善盟", "0483") - CITY_CODE_MAP.put("巴彦淖尔市", "0478") - CITY_CODE_MAP.put("锡林郭勒盟", "0479") - CITY_CODE_MAP.put("固原", "0954") - CITY_CODE_MAP.put("果洛藏族自治州", "0975") - CITY_CODE_MAP.put("海西蒙古族藏族自治州", "0977") - CITY_CODE_MAP.put("黄南藏族自治州", "0973") - CITY_CODE_MAP.put("玉树藏族自治州", "0976") - CITY_CODE_MAP.put("阿里地区", "0897") - CITY_CODE_MAP.put("昌都地区", "0895") - CITY_CODE_MAP.put("林芝地区", "0894") - CITY_CODE_MAP.put("那曲地区", "0896") - CITY_CODE_MAP.put("阿克苏地区", "0997") - CITY_CODE_MAP.put("阿勒泰地区", "0906") - CITY_CODE_MAP.put("巴音郭楞蒙古自治州", "0996") - CITY_CODE_MAP.put("哈密地区", "0902") - CITY_CODE_MAP.put("和田地区", "0903") - CITY_CODE_MAP.put("喀什地区", "0998") - CITY_CODE_MAP.put("克孜勒苏柯尔克孜自治州", "0908") - CITY_CODE_MAP.put("保山", "0875") - CITY_CODE_MAP.put("德宏傣族景颇族自治州", "0692") - CITY_CODE_MAP.put("迪庆藏族自治州", "0887") - CITY_CODE_MAP.put("丽江", "0888") - CITY_CODE_MAP.put("临沧市", "0883") - CITY_CODE_MAP.put("怒江傈僳族自治州", "0886") - CITY_CODE_MAP.put("普洱", "0879") - CITY_CODE_MAP.put("文山壮族苗族自治州", "0876") - CITY_CODE_MAP.put("香港", "1852") - CITY_CODE_MAP.put("澳门", "1853") - CITY_CODE_MAP.put("五家渠市", "652300") - CITY_CODE_MAP.put("阿拉尔市", "652900") - CITY_CODE_MAP.put("图木舒克市", "653000") + CITY_CODE_MAP.put("鍖椾含", "010") + CITY_CODE_MAP.put("骞垮窞", "020") + CITY_CODE_MAP.put("閲嶅簡", "023") + CITY_CODE_MAP.put("鍗椾含", "025") + CITY_CODE_MAP.put("姝︽眽", "027") + CITY_CODE_MAP.put("鎴愰兘", "028") + CITY_CODE_MAP.put("淇濆畾", "0312") + CITY_CODE_MAP.put("鎵垮痉", "0314") + CITY_CODE_MAP.put("鍞愬北", "0315") + CITY_CODE_MAP.put("寤婂潑", "0316") + CITY_CODE_MAP.put("绉︾殗宀�", "0335") + CITY_CODE_MAP.put("鏂颁埂", "0373") + CITY_CODE_MAP.put("娲涢槼", "0379") + CITY_CODE_MAP.put("澶ц繛", "0411") + CITY_CODE_MAP.put("闉嶅北", "0412") + CITY_CODE_MAP.put("鎶氶『", "0413") + CITY_CODE_MAP.put("鏈邯", "0414") + CITY_CODE_MAP.put("涓逛笢", "0415") + CITY_CODE_MAP.put("杈介槼", "0419") + CITY_CODE_MAP.put("钁姦宀�", "0429") + CITY_CODE_MAP.put("闀挎槬", "0431") + CITY_CODE_MAP.put("鍝堝皵婊�", "0451") + CITY_CODE_MAP.put("浣虫湪鏂�", "0454") + CITY_CODE_MAP.put("鍖呭ご", "0472") + CITY_CODE_MAP.put("闀囨睙", "0511") + CITY_CODE_MAP.put("鑻忓窞", "0512") + CITY_CODE_MAP.put("鏄嗗北", "0512") + CITY_CODE_MAP.put("鍗楅��", "0513") + CITY_CODE_MAP.put("鎵窞", "0514") + CITY_CODE_MAP.put("寰愬窞", "0516") + CITY_CODE_MAP.put("甯稿窞", "0519") + CITY_CODE_MAP.put("娴庡崡", "0531") + CITY_CODE_MAP.put("闈掑矝", "0532") + CITY_CODE_MAP.put("铓屽煚", "0552") + CITY_CODE_MAP.put("榛勫北", "0559") + CITY_CODE_MAP.put("鏉窞", "0571") + CITY_CODE_MAP.put("婀栧窞", "0572") + CITY_CODE_MAP.put("鍙板窞", "0576") + CITY_CODE_MAP.put("娓╁窞", "0577") + CITY_CODE_MAP.put("绂忓窞", "0591") + CITY_CODE_MAP.put("鍘﹂棬", "0592") + CITY_CODE_MAP.put("瀹佸痉", "0593") + CITY_CODE_MAP.put("鑾嗙敯", "0594") + CITY_CODE_MAP.put("娉夊窞", "0595") + CITY_CODE_MAP.put("婕冲窞", "0596") + CITY_CODE_MAP.put("濞佹捣", "0631") + CITY_CODE_MAP.put("姹曞熬", "0660") + CITY_CODE_MAP.put("姹曞熬宀�", "0660") + CITY_CODE_MAP.put("闃虫睙", "0662") + CITY_CODE_MAP.put("鎻槼", "0663") + CITY_CODE_MAP.put("鑼傚悕", "0668") + CITY_CODE_MAP.put("瑗勯槼", "0710") + CITY_CODE_MAP.put("榛勭煶", "0714") + CITY_CODE_MAP.put("瀹滄槍", "0717") + CITY_CODE_MAP.put("鍗佸牥", "0719") + CITY_CODE_MAP.put("鑽嗛棬", "0724") + CITY_CODE_MAP.put("宀抽槼", "0730") + CITY_CODE_MAP.put("闀挎矙", "0731") + CITY_CODE_MAP.put("婀樻江", "0732") + CITY_CODE_MAP.put("鏍床", "0733") + CITY_CODE_MAP.put("甯稿痉", "0736") + CITY_CODE_MAP.put("姹熼棬", "0750") + CITY_CODE_MAP.put("姹曞ご", "0754") + CITY_CODE_MAP.put("娣卞湷", "0755") + CITY_CODE_MAP.put("鐝犳捣", "0756") + CITY_CODE_MAP.put("婀涙睙", "0759") + CITY_CODE_MAP.put("涓北", "0760") + CITY_CODE_MAP.put("闃插煄娓�", "0770") + CITY_CODE_MAP.put("鍗楀畞", "0771") + CITY_CODE_MAP.put("妗傛灄", "0773") + CITY_CODE_MAP.put("鍖楁捣", "0779") + CITY_CODE_MAP.put("鍗楁槍", "0791") + CITY_CODE_MAP.put("涔濇睙", "0792") + CITY_CODE_MAP.put("鏅痉闀�", "0798") + CITY_CODE_MAP.put("鑷础", "0813") + CITY_CODE_MAP.put("娉稿窞", "0830") + CITY_CODE_MAP.put("瀹滃", "0831") + CITY_CODE_MAP.put("鍐呮睙", "01832") + CITY_CODE_MAP.put("鐪夊北", "0833") + CITY_CODE_MAP.put("璐甸槼", "0851") + CITY_CODE_MAP.put("涓変簹", "0899") + CITY_CODE_MAP.put("鍜搁槼", "0910") + CITY_CODE_MAP.put("寤跺畨", "0911") + CITY_CODE_MAP.put("寤惰竟鏈濋矞鏃忚嚜娌诲窞", "0433") + CITY_CODE_MAP.put("涓冨彴娌�", "0464") + CITY_CODE_MAP.put("涓夋槑", "0598") + CITY_CODE_MAP.put("涓夐棬宄�", "0398") + CITY_CODE_MAP.put("涓婃捣", "021") + CITY_CODE_MAP.put("涓婇ザ", "0793") + CITY_CODE_MAP.put("涓滆帪", "0769") + CITY_CODE_MAP.put("涓滆惀", "0546") + CITY_CODE_MAP.put("涓崼", "01953") + CITY_CODE_MAP.put("涓村鍥炴棌鑷不宸�", "0930") + CITY_CODE_MAP.put("涓存本", "0357") + CITY_CODE_MAP.put("涓存矀", "0539") + CITY_CODE_MAP.put("涓芥按", "0578") + CITY_CODE_MAP.put("涔屽叞瀵熷竷", "0474") + CITY_CODE_MAP.put("涔屾捣", "0473") + CITY_CODE_MAP.put("涔岄瞾鏈ㄩ綈", "0991") + CITY_CODE_MAP.put("涔愬北", "0833") + CITY_CODE_MAP.put("浜戞诞", "0766") + CITY_CODE_MAP.put("浜冲窞", "0558") + CITY_CODE_MAP.put("浠欐", "0728") + CITY_CODE_MAP.put("浼婃槬", "0458") + CITY_CODE_MAP.put("浼婄妬鍝堣惃鍏嬭嚜娌诲窞", "0999") + CITY_CODE_MAP.put("浣涘北", "0757") + CITY_CODE_MAP.put("淇¢槼", "0376") + CITY_CODE_MAP.put("鍏嬫媺鐜涗緷", "0990") + CITY_CODE_MAP.put("鍏畨", "0564") + CITY_CODE_MAP.put("鍏板窞", "0931") + CITY_CODE_MAP.put("鍏村畨鐩�", "0482") + CITY_CODE_MAP.put("鍑夊北褰濇棌鑷不宸�", "0834") + CITY_CODE_MAP.put("鍗楀厖", "0817") + CITY_CODE_MAP.put("鍗楀钩", "0599") + CITY_CODE_MAP.put("鍗楅槼", "0377") + CITY_CODE_MAP.put("鍗氬皵濉旀媺钂欏彜鑷不宸�", "0909") + CITY_CODE_MAP.put("鍙岄腑灞�", "0469") + CITY_CODE_MAP.put("鍚堣偉", "0551") + CITY_CODE_MAP.put("鍚夊畨", "0796") + CITY_CODE_MAP.put("鍚夋灄", "0432") + CITY_CODE_MAP.put("鍚愰瞾鐣湴鍖�", "0995") + CITY_CODE_MAP.put("鍚曟", "0358") + CITY_CODE_MAP.put("鍚村繝", "0953") + CITY_CODE_MAP.put("鍛ㄥ彛", "0394") + CITY_CODE_MAP.put("鍛间鸡璐濆皵", "0470") + CITY_CODE_MAP.put("鍛煎拰娴╃壒", "0471") + CITY_CODE_MAP.put("鍜稿畞", "0715") + CITY_CODE_MAP.put("鍟嗕笜", "0370") + CITY_CODE_MAP.put("鍟嗘礇", "0914") + CITY_CODE_MAP.put("鍢夊叴", "0573") + CITY_CODE_MAP.put("鍥涘钩", "0434") + CITY_CODE_MAP.put("濉斿煄鍦板尯", "0901") + CITY_CODE_MAP.put("澶у叴瀹夊箔鍦板尯", "0457") + CITY_CODE_MAP.put("澶у悓", "0352") + CITY_CODE_MAP.put("澶у簡", "0459") + CITY_CODE_MAP.put("澶х悊鐧芥棌鑷不宸�", "0872") + CITY_CODE_MAP.put("澶╂按", "0938") + CITY_CODE_MAP.put("澶╂触", "022") + CITY_CODE_MAP.put("澶╅棬", "01728") + CITY_CODE_MAP.put("澶師", "0351") + CITY_CODE_MAP.put("濞勫簳", "0738") + CITY_CODE_MAP.put("瀛濇劅", "0712") + CITY_CODE_MAP.put("瀹佹尝", "0574") + CITY_CODE_MAP.put("瀹夊簡", "0556") + CITY_CODE_MAP.put("瀹夊悍", "0915") + CITY_CODE_MAP.put("瀹夐槼", "0372") + CITY_CODE_MAP.put("瀹夐『", "0853") + CITY_CODE_MAP.put("瀹氳タ", "0932") + CITY_CODE_MAP.put("瀹滄槬", "0795") + CITY_CODE_MAP.put("瀹濋浮", "0917") + CITY_CODE_MAP.put("瀹e煄", "0563") + CITY_CODE_MAP.put("瀹垮窞", "0557") + CITY_CODE_MAP.put("瀹胯縼", "0527") + CITY_CODE_MAP.put("灞卞崡鍦板尯", "0893") + CITY_CODE_MAP.put("宕囧乏", "01771") + CITY_CODE_MAP.put("宸㈡箹", "0565") + CITY_CODE_MAP.put("宸翠腑", "0827") + CITY_CODE_MAP.put("骞冲噳", "0933") + CITY_CODE_MAP.put("骞抽《灞�", "0375") + CITY_CODE_MAP.put("骞垮厓", "0839") + CITY_CODE_MAP.put("骞垮畨", "0826") + CITY_CODE_MAP.put("搴嗛槼", "0934") + CITY_CODE_MAP.put("寮�灏�", "0378") + CITY_CODE_MAP.put("寮犲鍙�", "0313") + CITY_CODE_MAP.put("寮犲鐣�", "0744") + CITY_CODE_MAP.put("寮犳帠", "0936") + CITY_CODE_MAP.put("寰峰窞", "0534") + CITY_CODE_MAP.put("寰烽槼", "0838") + CITY_CODE_MAP.put("蹇诲窞", "0350") + CITY_CODE_MAP.put("鎬�鍖�", "0745") + CITY_CODE_MAP.put("鎭╂柦鍦熷鏃忚嫍鏃忚嚜娌诲窞", "0718") + CITY_CODE_MAP.put("鎯犲窞", "0752") + CITY_CODE_MAP.put("鎶氬窞", "0794") + CITY_CODE_MAP.put("鎷夎惃", "0891") + CITY_CODE_MAP.put("鏀�鏋濊姳", "0812") + CITY_CODE_MAP.put("鏂颁綑", "0790") + CITY_CODE_MAP.put("鏃犻敗", "0510") + CITY_CODE_MAP.put("鏃ュ杸鍒欏湴鍖�", "0892") + CITY_CODE_MAP.put("鏃ョ収", "0633") + CITY_CODE_MAP.put("鏄嗘槑", "0871") + CITY_CODE_MAP.put("鏄屽悏鍥炴棌鑷不宸�", "0994") + CITY_CODE_MAP.put("鏄��", "0870") + CITY_CODE_MAP.put("鏅嬩腑", "0354") + CITY_CODE_MAP.put("鏅嬪煄", "0356") + CITY_CODE_MAP.put("鏇查潠", "0874") + CITY_CODE_MAP.put("鏈斿窞", "0349") + CITY_CODE_MAP.put("鏈濋槼", "0421") + CITY_CODE_MAP.put("鏉ュ", "01772") + CITY_CODE_MAP.put("鏉惧師", "0438") + CITY_CODE_MAP.put("鏋e簞", "0632") + CITY_CODE_MAP.put("鏌冲窞", "0772") + CITY_CODE_MAP.put("姊呭窞", "0753") + CITY_CODE_MAP.put("姊у窞", "0774") + CITY_CODE_MAP.put("妤氶泟褰濇棌鑷不宸�", "0878") + CITY_CODE_MAP.put("姒嗘灄", "0912") + CITY_CODE_MAP.put("姝﹀▉", "01935") + CITY_CODE_MAP.put("姣曡妭鍦板尯", "0857") + CITY_CODE_MAP.put("姘稿窞", "0746") + CITY_CODE_MAP.put("姹変腑", "0916") + CITY_CODE_MAP.put("姹犲窞", "0566") + CITY_CODE_MAP.put("娌堥槼", "024") + CITY_CODE_MAP.put("娌у窞", "0317") + CITY_CODE_MAP.put("娌虫睜", "0778") + CITY_CODE_MAP.put("娌虫簮", "0762") + CITY_CODE_MAP.put("娉板畨", "0538") + CITY_CODE_MAP.put("娉板窞", "0523") + CITY_CODE_MAP.put("娴庡畞", "0537") + CITY_CODE_MAP.put("娴庢簮", "01391") + CITY_CODE_MAP.put("娴蜂笢鍦板尯", "0972") + CITY_CODE_MAP.put("娴峰寳钘忔棌鑷不宸�", "0970") + CITY_CODE_MAP.put("娴峰崡钘忔棌鑷不宸�", "0974") + CITY_CODE_MAP.put("娴峰彛", "0898") + CITY_CODE_MAP.put("娣勫崥", "0533") + CITY_CODE_MAP.put("娣寳", "0561") + CITY_CODE_MAP.put("娣崡", "0554") + CITY_CODE_MAP.put("娣畨", "0517") + CITY_CODE_MAP.put("娓呰繙", "0763") + CITY_CODE_MAP.put("娓崡", "0913") + CITY_CODE_MAP.put("婀樿タ鍦熷鏃忚嫍鏃忚嚜娌诲窞", "0743") + CITY_CODE_MAP.put("婊佸窞", "0550") + CITY_CODE_MAP.put("婊ㄥ窞", "0543") + CITY_CODE_MAP.put("婕渤", "0395") + CITY_CODE_MAP.put("娼嶅潑", "0536") + CITY_CODE_MAP.put("娼滄睙", "02728") + CITY_CODE_MAP.put("娼窞", "0768") + CITY_CODE_MAP.put("婵槼", "0393") + CITY_CODE_MAP.put("鐑熷彴", "0535") + CITY_CODE_MAP.put("鐒︿綔", "0391") + CITY_CODE_MAP.put("鐗′腹姹�", "0453") + CITY_CODE_MAP.put("鐜夋灄", "0775") + CITY_CODE_MAP.put("鐜夋邯", "0877") + CITY_CODE_MAP.put("鐢樺瓬钘忔棌鑷不宸�", "0836") + CITY_CODE_MAP.put("鐧藉煄", "0436") + CITY_CODE_MAP.put("鐧藉北", "0439") + CITY_CODE_MAP.put("鐧介摱", "0943") + CITY_CODE_MAP.put("鐩婇槼", "0737") + CITY_CODE_MAP.put("鐩愬煄", "0515") + CITY_CODE_MAP.put("鐩橀敠", "0427") + CITY_CODE_MAP.put("鐭冲槾灞�", "0952") + CITY_CODE_MAP.put("鐭冲搴�", "0311") + CITY_CODE_MAP.put("鐭虫渤瀛�", "0993") + CITY_CODE_MAP.put("绁炲啘鏋舵灄鍖�", "01719") + CITY_CODE_MAP.put("绾㈡渤鍝堝凹鏃忓綕鏃忚嚜娌诲窞", "0873") + CITY_CODE_MAP.put("缁嶅叴", "0575") + CITY_CODE_MAP.put("缁ュ寲", "0455") + CITY_CODE_MAP.put("缁甸槼", "0816") + CITY_CODE_MAP.put("鑱婂煄", "0635") + CITY_CODE_MAP.put("鑲囧簡", "0758") + CITY_CODE_MAP.put("鑸熷北", "0580") + CITY_CODE_MAP.put("鑺滄箹", "0553") + CITY_CODE_MAP.put("鑽嗗窞", "0716") + CITY_CODE_MAP.put("鑾辫姕", "0634") + CITY_CODE_MAP.put("鑿忔辰", "0530") + CITY_CODE_MAP.put("钀嶄埂", "0799") + CITY_CODE_MAP.put("钀ュ彛", "0417") + CITY_CODE_MAP.put("琛℃按", "0318") + CITY_CODE_MAP.put("琛¢槼", "0734") + CITY_CODE_MAP.put("琛㈠窞", "0570") + CITY_CODE_MAP.put("瑗垮弻鐗堢撼鍌f棌鑷不宸�", "0691") + CITY_CODE_MAP.put("瑗垮畞", "0971") + CITY_CODE_MAP.put("瑗垮畨", "029") + CITY_CODE_MAP.put("璁告槍", "0374") + CITY_CODE_MAP.put("璐垫腐", "01755") + CITY_CODE_MAP.put("璐哄窞", "01774") + CITY_CODE_MAP.put("璧勯槼", "0832") + CITY_CODE_MAP.put("璧e窞", "0797") + CITY_CODE_MAP.put("璧ゅ嘲", "0476") + CITY_CODE_MAP.put("杈芥簮", "0437") + CITY_CODE_MAP.put("杈惧窞", "0818") + CITY_CODE_MAP.put("杩愬煄", "0359") + CITY_CODE_MAP.put("杩炰簯娓�", "0518") + CITY_CODE_MAP.put("閫氬寲", "0435") + CITY_CODE_MAP.put("閫氳窘", "0475") + CITY_CODE_MAP.put("閬傚畞", "0825") + CITY_CODE_MAP.put("閬典箟", "0852") + CITY_CODE_MAP.put("閭㈠彴", "0319") + CITY_CODE_MAP.put("閭兏", "0310") + CITY_CODE_MAP.put("閭甸槼", "0739") + CITY_CODE_MAP.put("閮戝窞", "0371") + CITY_CODE_MAP.put("閮村窞", "0735") + CITY_CODE_MAP.put("閯傚皵澶氭柉", "0477") + CITY_CODE_MAP.put("閯傚窞", "0711") + CITY_CODE_MAP.put("閰掓硥", "0937") + CITY_CODE_MAP.put("閲戝崕", "0579") + CITY_CODE_MAP.put("閲戞槍", "0935") + CITY_CODE_MAP.put("閽﹀窞", "0777") + CITY_CODE_MAP.put("閾佸箔", "0410") + CITY_CODE_MAP.put("閾滀粊鍦板尯", "0856") + CITY_CODE_MAP.put("閾滃窛", "0919") + CITY_CODE_MAP.put("閾滈櫟", "0562") + CITY_CODE_MAP.put("閾跺窛", "0951") + CITY_CODE_MAP.put("閿﹀窞", "0416") + CITY_CODE_MAP.put("闀挎不", "0355") + CITY_CODE_MAP.put("闃滄柊", "0418") + CITY_CODE_MAP.put("闃滈槼", "01558") + CITY_CODE_MAP.put("闃虫硥", "0353") + CITY_CODE_MAP.put("闃垮潩钘忔棌缇屾棌鑷不宸�", "0837") + CITY_CODE_MAP.put("闄囧崡", "02935") + CITY_CODE_MAP.put("闅忓窞", "0722") + CITY_CODE_MAP.put("闆呭畨", "0835") + CITY_CODE_MAP.put("闊跺叧", "0751") + CITY_CODE_MAP.put("椹瀺灞�", "0555") + CITY_CODE_MAP.put("椹婚┈搴�", "0396") + CITY_CODE_MAP.put("楦¤タ", "0467") + CITY_CODE_MAP.put("楣ゅ", "0392") + CITY_CODE_MAP.put("楣ゅ矖", "0468") + CITY_CODE_MAP.put("楣版江", "0701") + CITY_CODE_MAP.put("榛勫唸", "0713") + CITY_CODE_MAP.put("榛戞渤", "0456") + CITY_CODE_MAP.put("榛斾笢鍗楄嫍鏃忎緱鏃忚嚜娌诲窞", "0855") + CITY_CODE_MAP.put("榛斿崡甯冧緷鏃忚嫍鏃忚嚜娌诲窞", "0854") + CITY_CODE_MAP.put("榻愰綈鍝堝皵", "0452") + CITY_CODE_MAP.put("榫欏博", "0597") + CITY_CODE_MAP.put("鐢樺崡钘忔棌鑷不宸�", "0941") + CITY_CODE_MAP.put("鍢夊唱鍏�", "1937") + CITY_CODE_MAP.put("鐧捐壊", "0776") + CITY_CODE_MAP.put("鍏洏姘�", "0858") + CITY_CODE_MAP.put("榛旇タ鍗楀竷渚濇棌鑻楁棌鑷不宸�", "0859") + CITY_CODE_MAP.put("鐧芥矙榛庢棌鑷不鍘�", "0802") + CITY_CODE_MAP.put("淇濅涵榛庢棌鑻楁棌鑷不鍘�", "0801") + CITY_CODE_MAP.put("鏄屾睙榛庢棌鑷不鍘�", "0803") + CITY_CODE_MAP.put("婢勮繄鍘�", "0804") + CITY_CODE_MAP.put("瀹氬畨鍘�", "0806") + CITY_CODE_MAP.put("涓滄柟", "0807") + CITY_CODE_MAP.put("涓滄矙缇ゅ矝", "0808") + CITY_CODE_MAP.put("涔愪笢榛庢棌鑷不鍘�", "2802") + CITY_CODE_MAP.put("涓撮珮鍘�", "1896") + CITY_CODE_MAP.put("闄垫按榛庢棌鑷不鍘�", "0809") + CITY_CODE_MAP.put("鍗楁矙缇ゅ矝", "1891") + CITY_CODE_MAP.put("鐞兼捣", "1894") + CITY_CODE_MAP.put("鐞间腑榛庢棌鑻楁棌鑷不鍘�", "1899") + CITY_CODE_MAP.put("灞槍鍘�", "1892") + CITY_CODE_MAP.put("涓囧畞", "1898") + CITY_CODE_MAP.put("鏂囨槍", "1893") + CITY_CODE_MAP.put("浜旀寚灞�", "1897") + CITY_CODE_MAP.put("瑗挎矙缇ゅ矝", "1895") + CITY_CODE_MAP.put("涓矙缇ゅ矝", "2801") + CITY_CODE_MAP.put("鍎嬪窞", "0805") + CITY_CODE_MAP.put("闃挎媺鍠勭洘", "0483") + CITY_CODE_MAP.put("宸村溅娣栧皵甯�", "0478") + CITY_CODE_MAP.put("閿℃灄閮嫆鐩�", "0479") + CITY_CODE_MAP.put("鍥哄師", "0954") + CITY_CODE_MAP.put("鏋滄礇钘忔棌鑷不宸�", "0975") + CITY_CODE_MAP.put("娴疯タ钂欏彜鏃忚棌鏃忚嚜娌诲窞", "0977") + CITY_CODE_MAP.put("榛勫崡钘忔棌鑷不宸�", "0973") + CITY_CODE_MAP.put("鐜夋爲钘忔棌鑷不宸�", "0976") + CITY_CODE_MAP.put("闃块噷鍦板尯", "0897") + CITY_CODE_MAP.put("鏄岄兘鍦板尯", "0895") + CITY_CODE_MAP.put("鏋楄姖鍦板尯", "0894") + CITY_CODE_MAP.put("閭f洸鍦板尯", "0896") + CITY_CODE_MAP.put("闃垮厠鑻忓湴鍖�", "0997") + CITY_CODE_MAP.put("闃垮嫆娉板湴鍖�", "0906") + CITY_CODE_MAP.put("宸撮煶閮钂欏彜鑷不宸�", "0996") + CITY_CODE_MAP.put("鍝堝瘑鍦板尯", "0902") + CITY_CODE_MAP.put("鍜岀敯鍦板尯", "0903") + CITY_CODE_MAP.put("鍠�浠�鍦板尯", "0998") + CITY_CODE_MAP.put("鍏嬪瓬鍕掕嫃鏌皵鍏嬪瓬鑷不宸�", "0908") + CITY_CODE_MAP.put("淇濆北", "0875") + CITY_CODE_MAP.put("寰峰畯鍌f棌鏅鏃忚嚜娌诲窞", "0692") + CITY_CODE_MAP.put("杩簡钘忔棌鑷不宸�", "0887") + CITY_CODE_MAP.put("涓芥睙", "0888") + CITY_CODE_MAP.put("涓存钵甯�", "0883") + CITY_CODE_MAP.put("鎬掓睙鍌堝兂鏃忚嚜娌诲窞", "0886") + CITY_CODE_MAP.put("鏅幢", "0879") + CITY_CODE_MAP.put("鏂囧北澹棌鑻楁棌鑷不宸�", "0876") + CITY_CODE_MAP.put("棣欐腐", "1852") + CITY_CODE_MAP.put("婢抽棬", "1853") + CITY_CODE_MAP.put("浜斿娓犲競", "652300") + CITY_CODE_MAP.put("闃挎媺灏斿競", "652900") + CITY_CODE_MAP.put("鍥炬湪鑸掑厠甯�", "653000") } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/marsoftdata/HouseinfoMarsoftExportData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/marsoftdata/HouseinfoMarsoftExportData.groovy index bec85911e..7d1c313b7 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/marsoftdata/HouseinfoMarsoftExportData.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/marsoftdata/HouseinfoMarsoftExportData.groovy @@ -239,8 +239,8 @@ class HouseinfoMarsoftExportData extends MarsoftExportData{ private String removeInvalidChar(String s) { s = DataUtil.removeHtml(DataUtil.balanceTags(s)) s = s.replace(' ', '').replace('·', '').replace('??', '').replace('\u000b', '') - if(s.indexOf("本段合作编辑者") > -1) { - s = StringUtils.substringBeforeLast(s, "本段合作编辑者") + if(s.indexOf("鏈鍚堜綔缂栬緫鑰�") > -1) { + s = StringUtils.substringBeforeLast(s, "鏈鍚堜綔缂栬緫鑰�") } s = decode(s) s = s.replace(' ', '').replace('·', '').replace('??', '') diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/marsoftdata/HousepriceinfoMarsoftExportData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/marsoftdata/HousepriceinfoMarsoftExportData.groovy index b50846d91..8579fba6e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/marsoftdata/HousepriceinfoMarsoftExportData.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/marsoftdata/HousepriceinfoMarsoftExportData.groovy @@ -45,7 +45,7 @@ class HousepriceinfoExportData extends CitypriceinfoMarsoftExportData{ Date weekend=DateUtils.getFirstDayOfWeek(new Date()) - DSCursor dsCursor=seaweed.find(DataUtil.map2DBObject([city: city, cat:"district",visible:0, region: [$in: ["玄武","建邺"]]])); + DSCursor dsCursor=seaweed.find(DataUtil.map2DBObject([city: city, cat:"district",visible:0, region: [$in: ["鐜勬","寤洪偤"]]])); Iterator iter=dsCursor.iterator() while(iter.hasNext()){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/marsoftdata/MarsoftExportData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/marsoftdata/MarsoftExportData.groovy index 27b86f6c6..958b6daf1 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/marsoftdata/MarsoftExportData.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/marsoftdata/MarsoftExportData.groovy @@ -81,7 +81,7 @@ abstract class MarsoftExportData { // exporter.init(FILE_FLAG_FULL); // exporter.export(); -// exporter.doExport("上海"); +// exporter.doExport("涓婃捣"); // exporter.zip(); // exporter.upload(); // println exporter.test() @@ -108,7 +108,7 @@ abstract class MarsoftExportData { } def test(){ - DSCursor dsCursor=anshuo.find(DataUtil.map2DBObject([cat:"district",visible:0,city:"上海"])); + DSCursor dsCursor=anshuo.find(DataUtil.map2DBObject([cat:"district",visible:0,city:"涓婃捣"])); Iterator iter=dsCursor.iterator() def fields=[:] @@ -269,7 +269,7 @@ abstract class MarsoftExportData { int i=0; while(emu.hasMoreElements()){ ZipEntry entry = (ZipEntry)emu.nextElement(); - //会把目录作为一个file读出一次,所以只建立目录就可以,之下的文件还会被迭代到。 + //浼氭妸鐩綍浣滀负涓�涓猣ile璇诲嚭涓�娆★紝鎵�浠ュ彧寤虹珛鐩綍灏卞彲浠ワ紝涔嬩笅鐨勬枃浠惰繕浼氳杩唬鍒般�� if (entry.isDirectory()) { new File(filePath + entry.getName()).mkdirs(); @@ -277,8 +277,8 @@ abstract class MarsoftExportData { } BufferedInputStream bis = new BufferedInputStream(zipFile.getInputStream(entry)); File file = new File(filePath + entry.getName()); - //加入这个的原因是zipfile读取文件是随机读取的,这就造成可能先读取一个文件 - //而这个文件所在的目录还没有出现过,所以要建出目录来。 + //鍔犲叆杩欎釜鐨勫師鍥犳槸zipfile璇诲彇鏂囦欢鏄殢鏈鸿鍙栫殑锛岃繖灏遍�犳垚鍙兘鍏堣鍙栦竴涓枃浠� + //鑰岃繖涓枃浠舵墍鍦ㄧ殑鐩綍杩樻病鏈夊嚭鐜拌繃锛屾墍浠ヨ寤哄嚭鐩綍鏉ャ�� File parent = file.getParentFile(); if(parent != null && (!parent.exists())){ parent.mkdirs(); @@ -303,28 +303,28 @@ abstract class MarsoftExportData { } /** - * 获得连接-FTP方式 - * @param hostname FTP服务器地址 - * @param port FTP服务器端口 - * @param username FTP登录用户名 - * @param password FTP登录密码 + * 鑾峰緱杩炴帴-FTP鏂瑰紡 + * @param hostname FTP鏈嶅姟鍣ㄥ湴鍧� + * @param port FTP鏈嶅姟鍣ㄧ鍙� + * @param username FTP鐧诲綍鐢ㄦ埛鍚� + * @param password FTP鐧诲綍瀵嗙爜 * @return FTPClient */ public FTPClient getConnectionFTP(String hostName, int port, String userName, String passWord) { - //创建FTPClient对象 + //鍒涘缓FTPClient瀵硅薄 FTPClient ftp = new FTPClient(); try { - //连接FTP服务器 + //杩炴帴FTP鏈嶅姟鍣� ftp.connect(hostName, port); - //下面三行代码必须要,而且不能改变编码格式,否则不能正确下载中文文件 + //涓嬮潰涓夎浠g爜蹇呴』瑕侊紝鑰屼笖涓嶈兘鏀瑰彉缂栫爜鏍煎紡锛屽惁鍒欎笉鑳芥纭笅杞戒腑鏂囨枃浠� ftp.setControlEncoding("UTF-8"); FTPClientConfig conf = new FTPClientConfig(FTPClientConfig.SYST_NT); conf.setServerLanguageCode("zh"); - //登录ftp + //鐧诲綍ftp ftp.login(userName, passWord); - //enterLocalPassiveMode:设置客户端PASV模式 (客户端主动连服务器端;端口用20) - //enterLocalActiveMode:设置客户端PORT模式 (服务器端连客户端;随机打开一个高端端口(端口号大于1024)) + //enterLocalPassiveMode锛氳缃鎴风PASV妯″紡 (瀹㈡埛绔富鍔ㄨ繛鏈嶅姟鍣ㄧ锛涚鍙g敤20) + //enterLocalActiveMode锛氳缃鎴风PORT妯″紡 (鏈嶅姟鍣ㄧ杩炲鎴风锛涢殢鏈烘墦寮�涓�涓珮绔鍙�(绔彛鍙峰ぇ浜�1024)) ftp.enterLocalPassiveMode(); //ftp.enterLocalActiveMode(); if (!FTPReply.isPositiveCompletion(ftp.getReplyCode())) { @@ -339,15 +339,15 @@ abstract class MarsoftExportData { } /** - * 关闭连接-FTP方式 - * @param ftp FTPClient对象 + * 鍏抽棴杩炴帴-FTP鏂瑰紡 + * @param ftp FTPClient瀵硅薄 * @return boolean */ public boolean closeFTP(FTPClient ftp) { if (ftp.isConnected()) { try { ftp.disconnect(); -// System.out.println("ftp已经关闭"); +// System.out.println("ftp宸茬粡鍏抽棴"); return true; } catch (Exception e) { e.printStackTrace(); @@ -357,21 +357,21 @@ abstract class MarsoftExportData { } /** - * 上传文件-FTP方式 - * @param ftp FTPClient对象 - * @param path FTP服务器上传地址 - * @param filename 本地文件路径 - * @param inputStream 输入流 + * 涓婁紶鏂囦欢-FTP鏂瑰紡 + * @param ftp FTPClient瀵硅薄 + * @param path FTP鏈嶅姟鍣ㄤ笂浼犲湴鍧� + * @param filename 鏈湴鏂囦欢璺緞 + * @param inputStream 杈撳叆娴� * @return boolean */ public boolean uploadFile(FTPClient ftp, String path, String fileName, InputStream inputStream) { boolean success = false; try { - ftp.changeWorkingDirectory(path);//转移到指定FTP服务器目录 + ftp.changeWorkingDirectory(path);//杞Щ鍒版寚瀹欶TP鏈嶅姟鍣ㄧ洰褰� fileName = new String(fileName.getBytes("UTF-8"),"ISO-8859-1"); path = new String(path.getBytes("UTF-8"), "ISO-8859-1"); // ftp.listFiles() - //转到指定上传目录 + //杞埌鎸囧畾涓婁紶鐩綍 ftp.makeDirectory(path); ftp.changeWorkingDirectory(path); @@ -383,9 +383,9 @@ abstract class MarsoftExportData { }else{ println "upload failed, ReplyCode: "+ ftp.getReplyCode(); } - //关闭输入流 + //鍏抽棴杈撳叆娴� inputStream.close(); - //退出ftp + //閫�鍑篺tp ftp.logout(); } catch (Exception e) { e.printStackTrace(); @@ -394,16 +394,16 @@ abstract class MarsoftExportData { } /** - * 删除文件-FTP方式 - * @param ftp FTPClient对象 - * @param path FTP服务器上传地址 - * @param filename FTP服务器上要删除的文件名 + * 鍒犻櫎鏂囦欢-FTP鏂瑰紡 + * @param ftp FTPClient瀵硅薄 + * @param path FTP鏈嶅姟鍣ㄤ笂浼犲湴鍧� + * @param filename FTP鏈嶅姟鍣ㄤ笂瑕佸垹闄ょ殑鏂囦欢鍚� * @return */ public boolean deleteFile(FTPClient ftp, String path, String fileName) { boolean success = false; try { - ftp.changeWorkingDirectory(path);//转移到指定FTP服务器目录 + ftp.changeWorkingDirectory(path);//杞Щ鍒版寚瀹欶TP鏈嶅姟鍣ㄧ洰褰� fileName = new String(fileName.getBytes("UTF-8"), "ISO-8859-1"); path = new String(path.getBytes("UTF-8"), "ISO-8859-1"); ftp.deleteFile(fileName); @@ -416,23 +416,23 @@ abstract class MarsoftExportData { } /** - * 上传文件-FTP方式 - * @param ftp FTPClient对象 - * @param path FTP服务器上传地址 - * @param fileName 本地文件路径 - * @param localPath 本里存储路径 + * 涓婁紶鏂囦欢-FTP鏂瑰紡 + * @param ftp FTPClient瀵硅薄 + * @param path FTP鏈嶅姟鍣ㄤ笂浼犲湴鍧� + * @param fileName 鏈湴鏂囦欢璺緞 + * @param localPath 鏈噷瀛樺偍璺緞 * @return boolean */ public boolean downFile(FTPClient ftp, String path, String fileName, String localPath) { boolean success = false; try { - ftp.changeWorkingDirectory(path);//转移到FTP服务器目录 - FTPFile[] fs = ftp.listFiles(); //得到目录的相应文件列表 + ftp.changeWorkingDirectory(path);//杞Щ鍒癋TP鏈嶅姟鍣ㄧ洰褰� + FTPFile[] fs = ftp.listFiles(); //寰楀埌鐩綍鐨勭浉搴旀枃浠跺垪琛� for (FTPFile ff : fs) { if (ff.getName().equals(fileName)) { File localFile = new File(localPath + "\\" + ff.getName()); OutputStream outputStream = new FileOutputStream(localFile); - //将文件保存到输出流outputStream中 + //灏嗘枃浠朵繚瀛樺埌杈撳嚭娴乷utputStream涓� ftp.retrieveFile(new String(ff.getName().getBytes("UTF-8"), "ISO-8859-1"), outputStream); outputStream.flush(); outputStream.close(); @@ -447,7 +447,7 @@ abstract class MarsoftExportData { } /** - * 判断是否有重名文件 + * 鍒ゆ柇鏄惁鏈夐噸鍚嶆枃浠� * @param fileName * @param fs * @return @@ -456,10 +456,10 @@ abstract class MarsoftExportData { for (int i = 0; i < fs.length; i++) { FTPFile ff = fs[i]; if (ff.getName().equals(fileName)) { - return true; //如果存在返回 正确信号 + return true; //濡傛灉瀛樺湪杩斿洖 姝g‘淇″彿 } } - return false; //如果不存在返回错误信号 + return false; //濡傛灉涓嶅瓨鍦ㄨ繑鍥為敊璇俊鍙� } String getNameDateFormat(){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/marsoftdata/MarsoftExporter.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/marsoftdata/MarsoftExporter.groovy index 00382eb5f..05970a911 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/marsoftdata/MarsoftExporter.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/marsoftdata/MarsoftExporter.groovy @@ -38,8 +38,8 @@ class MarsoftExporter extends BaseBatch { for(int i=0; i< exporters.size(); i++){ MarsoftExportData exporter=exporters[i] exporter.init(); - exporter.doExport("广州", "广东"); - exporter.doExport("上海", "上海"); + exporter.doExport("骞垮窞", "骞夸笢"); + exporter.doExport("涓婃捣", "涓婃捣"); exporter.end(); exporter.zip(); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/newDistrict/MapabcService.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/newDistrict/MapabcService.groovy index ab83cf22d..ea94a9902 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/newDistrict/MapabcService.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/newDistrict/MapabcService.groovy @@ -14,7 +14,7 @@ import groovy.json.JsonSlurper * Created with IntelliJ IDEA. * User: Administrator * Date: 12-12-19 - * Time: 下午4:40 + * Time: 涓嬪崍4:40 * To change this template use File | Settings | File Templates. */ class MapabcService { @@ -25,8 +25,8 @@ class MapabcService { /** - * 解析地址 - * 例子:http://apis.mapabc.com/geocode/simple?resType=xml&encode=utf-8&range=300&roadnum=3&crossnum=2&poinum=2&retvalue=1&key=b0a7db0b3a30f944a21c3682064dc70ef5b738b062f6479a5eca39725798b1ee300bd8d5de3a4ae3&sid=7000&address=%E4%B8%8A%E6%B5%B7%E5%B8%82%E6%96%87%E6%98%8C%E8%A5%BF%E8%B7%AF%E4%B8%8E%E5%87%A4%E6%A8%AF%E8%B7%AF%E4%BA%A4%E5%8F%89%E5%8F%A3&rid=90156 + * 瑙f瀽鍦板潃 + * 渚嬪瓙锛歨ttp://apis.mapabc.com/geocode/simple?resType=xml&encode=utf-8&range=300&roadnum=3&crossnum=2&poinum=2&retvalue=1&key=b0a7db0b3a30f944a21c3682064dc70ef5b738b062f6479a5eca39725798b1ee300bd8d5de3a4ae3&sid=7000&address=%E4%B8%8A%E6%B5%B7%E5%B8%82%E6%96%87%E6%98%8C%E8%A5%BF%E8%B7%AF%E4%B8%8E%E5%87%A4%E6%A8%AF%E8%B7%AF%E4%BA%A4%E5%8F%89%E5%8F%A3&rid=90156 * @param key */ def parseAddress(String key, String city){ @@ -40,7 +40,7 @@ class MapabcService { for(poi in poiList){ def level = poi.level.text() if (isFirst){ - //如果是第一次,则以第一次作为优先选择 + //濡傛灉鏄涓�娆★紝鍒欎互绗竴娆′綔涓轰紭鍏堥�夋嫨 getDataFromPoi(ret, poi) isFirst = false } @@ -54,7 +54,7 @@ class MapabcService { } /** - * 从poi中获得需要的数据 + * 浠巔oi涓幏寰楅渶瑕佺殑鏁版嵁 * @param ret * @param poi */ @@ -68,14 +68,14 @@ class MapabcService { } /** - * 根据关键词进行查询 + * 鏍规嵁鍏抽敭璇嶈繘琛屾煡璇� * @param q - * @param pageNo 页码 从1开始 + * @param pageNo 椤电爜 浠�1寮�濮� * @return - * poiList poi列表 - * total:总记录数 - * record:当前记录的条数 - * totalPage:总页数 + * poiList poi鍒楄〃 + * total锛氭�昏褰曟暟 + * record锛氬綋鍓嶈褰曠殑鏉℃暟 + * totalPage锛氭�婚〉鏁� */ def findAllByQuery(String city, String q, pageNo){ def cityNo = findCityNoByQuery(city) @@ -103,13 +103,13 @@ class MapabcService { } /** - * 在中心点坐标附近查找周边信息 - * @param cenX 比如:116.40546799 - * @param cenY 比如:39.9077611 - * @param keyword 关键词,比如酒店 - * @param type 数据类型,比如:住宿 - * @param range 周边查询范围,单位为米,比如3000,表示3千米 - * @param pageNo 页码,从1开始 + * 鍦ㄤ腑蹇冪偣鍧愭爣闄勮繎鏌ユ壘鍛ㄨ竟淇℃伅 + * @param cenX 姣斿锛�116.40546799 + * @param cenY 姣斿锛�39.9077611 + * @param keyword 鍏抽敭璇嶏紝姣斿閰掑簵 + * @param type 鏁版嵁绫诲瀷锛屾瘮濡傦細浣忓 + * @param range 鍛ㄨ竟鏌ヨ鑼冨洿锛屽崟浣嶄负绫筹紝姣斿3000锛岃〃绀�3鍗冪背 + * @param pageNo 椤电爜锛屼粠1寮�濮� */ def findAllAroundAtCenter(cenX, cenY, keyword, type, range, pageNo){ keyword = URLEncoder.encode(keyword, "UTF-8") @@ -134,7 +134,7 @@ class MapabcService { } /** - * 根据查询词获得这个城市的区号 + * 鏍规嵁鏌ヨ璇嶈幏寰楄繖涓煄甯傜殑鍖哄彿 * @param q */ private findCityNoByQuery(String q){ @@ -149,395 +149,395 @@ class MapabcService { private buildCityNoMap(){ def cityNoMap = [:] - cityNoMap.put("北京", "010") - cityNoMap.put("广州", "020") - cityNoMap.put("重庆", "023") - cityNoMap.put("南京", "025") - cityNoMap.put("武汉", "027") - cityNoMap.put("成都", "028") - cityNoMap.put("保定", "0312") - cityNoMap.put("承德", "0314") - cityNoMap.put("唐山", "0315") - cityNoMap.put("廊坊", "0316") - cityNoMap.put("秦皇岛", "0335") - cityNoMap.put("新乡", "0373") - cityNoMap.put("洛阳", "0379") - cityNoMap.put("大连", "0411") - cityNoMap.put("鞍山", "0412") - cityNoMap.put("抚顺", "0413") - cityNoMap.put("本溪", "0414") - cityNoMap.put("丹东", "0415") - cityNoMap.put("辽阳", "0419") - cityNoMap.put("葫芦岛", "0429") - cityNoMap.put("长春", "0431") - cityNoMap.put("哈尔滨", "0451") - cityNoMap.put("佳木斯", "0454") - cityNoMap.put("包头", "0472") - cityNoMap.put("镇江", "0511") - cityNoMap.put("苏州", "0512") - cityNoMap.put("南通", "0513") - cityNoMap.put("扬州", "0514") - cityNoMap.put("徐州", "0516") - cityNoMap.put("常州", "0519") - cityNoMap.put("济南", "0531") - cityNoMap.put("青岛", "0532") - cityNoMap.put("蚌埠", "0552") - cityNoMap.put("黄山", "0559") - cityNoMap.put("杭州", "0571") - cityNoMap.put("湖州", "0572") - cityNoMap.put("台州", "0576") - cityNoMap.put("温州", "0577") - cityNoMap.put("福州", "0591") - cityNoMap.put("厦门", "0592") - cityNoMap.put("宁德", "0593") - cityNoMap.put("莆田", "0594") - cityNoMap.put("泉州", "0595") - cityNoMap.put("漳州", "0596") - cityNoMap.put("威海", "0631") - cityNoMap.put("汕尾", "0660") - cityNoMap.put("汕尾岛", "0660") - cityNoMap.put("阳江", "0662") - cityNoMap.put("揭阳", "0663") - cityNoMap.put("茂名", "0668") - cityNoMap.put("襄阳", "0710") - cityNoMap.put("黄石", "0714") - cityNoMap.put("宜昌", "0717") - cityNoMap.put("十堰", "0719") - cityNoMap.put("荆门", "0724") - cityNoMap.put("岳阳", "0730") - cityNoMap.put("长沙", "0731") - cityNoMap.put("湘潭", "0732") - cityNoMap.put("株洲", "0733") - cityNoMap.put("常德", "0736") - cityNoMap.put("江门", "0750") - cityNoMap.put("汕头", "0754") - cityNoMap.put("深圳", "0755") - cityNoMap.put("珠海", "0756") - cityNoMap.put("湛江", "0759") - cityNoMap.put("中山", "0760") - cityNoMap.put("防城港", "0770") - cityNoMap.put("南宁", "0771") - cityNoMap.put("桂林", "0773") - cityNoMap.put("北海", "0779") - cityNoMap.put("南昌", "0791") - cityNoMap.put("九江", "0792") - cityNoMap.put("景德镇", "0798") - cityNoMap.put("自贡", "0813") - cityNoMap.put("泸州", "0830") - cityNoMap.put("宜宾", "0831") - cityNoMap.put("内江", "01832") - cityNoMap.put("眉山", "0833") - cityNoMap.put("贵阳", "0851") - cityNoMap.put("三亚", "0899") - cityNoMap.put("咸阳", "0910") - cityNoMap.put("延安", "0911") - cityNoMap.put("延边朝鲜族自治州", "0433") - cityNoMap.put("七台河", "0464") - cityNoMap.put("三明", "0598") - cityNoMap.put("三门峡", "0398") - cityNoMap.put("上海", "021") - cityNoMap.put("上饶", "0793") - cityNoMap.put("东莞", "0769") - cityNoMap.put("东营", "0546") - cityNoMap.put("中卫", "01953") - cityNoMap.put("临夏回族自治州", "0930") - cityNoMap.put("临汾", "0357") - cityNoMap.put("临沂", "0539") - cityNoMap.put("丽水", "0578") - cityNoMap.put("乌兰察布", "0474") - cityNoMap.put("乌海", "0473") - cityNoMap.put("乌鲁木齐", "0991") - cityNoMap.put("乐山", "0833") - cityNoMap.put("云浮", "0766") - cityNoMap.put("亳州", "0558") - cityNoMap.put("仙桃", "0728") - cityNoMap.put("伊春", "0458") - cityNoMap.put("伊犁哈萨克自治州", "0999") - cityNoMap.put("佛山", "0757") - cityNoMap.put("信阳", "0376") - cityNoMap.put("克拉玛依", "0990") - cityNoMap.put("六安", "0564") - cityNoMap.put("兰州", "0931") - cityNoMap.put("兴安盟", "0482") - cityNoMap.put("凉山彝族自治州", "0834") - cityNoMap.put("南充", "0817") - cityNoMap.put("南平", "0599") - cityNoMap.put("南阳", "0377") - cityNoMap.put("博尔塔拉蒙古自治州", "0909") - cityNoMap.put("双鸭山", "0469") - cityNoMap.put("合肥", "0551") - cityNoMap.put("吉安", "0796") - cityNoMap.put("吉林", "0432") - cityNoMap.put("吐鲁番地区", "0995") - cityNoMap.put("吕梁", "0358") - cityNoMap.put("吴忠", "0953") - cityNoMap.put("周口", "0394") - cityNoMap.put("呼伦贝尔", "0470") - cityNoMap.put("呼和浩特", "0471") - cityNoMap.put("咸宁", "0715") - cityNoMap.put("商丘", "0370") - cityNoMap.put("商洛", "0914") - cityNoMap.put("嘉兴", "0573") - cityNoMap.put("四平", "0434") - cityNoMap.put("塔城地区", "0901") - cityNoMap.put("大兴安岭地区", "0457") - cityNoMap.put("大同", "0352") - cityNoMap.put("大庆", "0459") - cityNoMap.put("大理白族自治州", "0872") - cityNoMap.put("天水", "0938") - cityNoMap.put("天津", "022") - cityNoMap.put("天门", "01728") - cityNoMap.put("太原", "0351") - cityNoMap.put("娄底", "0738") - cityNoMap.put("孝感", "0712") - cityNoMap.put("宁波", "0574") - cityNoMap.put("安庆", "0556") - cityNoMap.put("安康", "0915") - cityNoMap.put("安阳", "0372") - cityNoMap.put("安顺", "0853") - cityNoMap.put("定西", "0932") - cityNoMap.put("宜春", "0795") - cityNoMap.put("宝鸡", "0917") - cityNoMap.put("宣城", "0563") - cityNoMap.put("宿州", "0557") - cityNoMap.put("宿迁", "0527") - cityNoMap.put("山南地区", "0893") - cityNoMap.put("崇左", "01771") - cityNoMap.put("巢湖", "0565") - cityNoMap.put("巴中", "0827") - cityNoMap.put("平凉", "0933") - cityNoMap.put("平顶山", "0375") - cityNoMap.put("广元", "0839") - cityNoMap.put("广安", "0826") - cityNoMap.put("庆阳", "0934") - cityNoMap.put("开封", "0378") - cityNoMap.put("张家口", "0313") - cityNoMap.put("张家界", "0744") - cityNoMap.put("张掖", "0936") - cityNoMap.put("德州", "0534") - cityNoMap.put("德阳", "0838") - cityNoMap.put("忻州", "0350") - cityNoMap.put("怀化", "0745") - cityNoMap.put("恩施土家族苗族自治州", "0718") - cityNoMap.put("惠州", "0752") - cityNoMap.put("抚州", "0794") - cityNoMap.put("拉萨", "0891") - cityNoMap.put("攀枝花", "0812") - cityNoMap.put("新余", "0790") - cityNoMap.put("无锡", "0510") - cityNoMap.put("日喀则地区", "0892") - cityNoMap.put("日照", "0633") - cityNoMap.put("昆明", "0871") - cityNoMap.put("昌吉回族自治州", "0994") - cityNoMap.put("昭通", "0870") - cityNoMap.put("晋中", "0354") - cityNoMap.put("晋城", "0356") - cityNoMap.put("曲靖", "0874") - cityNoMap.put("朔州", "0349") - cityNoMap.put("朝阳", "0421") - cityNoMap.put("来宾", "01772") - cityNoMap.put("松原", "0438") - cityNoMap.put("枣庄", "0632") - cityNoMap.put("柳州", "0772") - cityNoMap.put("梅州", "0753") - cityNoMap.put("梧州", "0774") - cityNoMap.put("楚雄彝族自治州", "0878") - cityNoMap.put("榆林", "0912") - cityNoMap.put("武威", "01935") - cityNoMap.put("毕节地区", "0857") - cityNoMap.put("永州", "0746") - cityNoMap.put("汉中", "0916") - cityNoMap.put("池州", "0566") - cityNoMap.put("沈阳", "024") - cityNoMap.put("沧州", "0317") - cityNoMap.put("河池", "0778") - cityNoMap.put("河源", "0762") - cityNoMap.put("泰安", "0538") - cityNoMap.put("泰州", "0523") - cityNoMap.put("济宁", "0537") - cityNoMap.put("济源", "01391") - cityNoMap.put("海东地区", "0972") - cityNoMap.put("海北藏族自治州", "0970") - cityNoMap.put("海南藏族自治州", "0974") - cityNoMap.put("海口", "0898") - cityNoMap.put("淄博", "0533") - cityNoMap.put("淮北", "0561") - cityNoMap.put("淮南", "0554") - cityNoMap.put("淮安", "0517") - cityNoMap.put("清远", "0763") - cityNoMap.put("渭南", "0913") - cityNoMap.put("湘西土家族苗族自治州", "0743") - cityNoMap.put("滁州", "0550") - cityNoMap.put("滨州", "0543") - cityNoMap.put("漯河", "0395") - cityNoMap.put("潍坊", "0536") - cityNoMap.put("潜江", "02728") - cityNoMap.put("潮州", "0768") - cityNoMap.put("濮阳", "0393") - cityNoMap.put("烟台", "0535") - cityNoMap.put("焦作", "0391") - cityNoMap.put("牡丹江", "0453") - cityNoMap.put("玉林", "0775") - cityNoMap.put("玉溪", "0877") - cityNoMap.put("甘孜藏族自治州", "0836") - cityNoMap.put("白城", "0436") - cityNoMap.put("白山", "0439") - cityNoMap.put("白银", "0943") - cityNoMap.put("益阳", "0737") - cityNoMap.put("盐城", "0515") - cityNoMap.put("盘锦", "0427") - cityNoMap.put("石嘴山", "0952") - cityNoMap.put("石家庄", "0311") - cityNoMap.put("石河子", "0993") - cityNoMap.put("神农架林区", "01719") - cityNoMap.put("红河哈尼族彝族自治州", "0873") - cityNoMap.put("绍兴", "0575") - cityNoMap.put("绥化", "0455") - cityNoMap.put("绵阳", "0816") - cityNoMap.put("聊城", "0635") - cityNoMap.put("肇庆", "0758") - cityNoMap.put("舟山", "0580") - cityNoMap.put("芜湖", "0553") - cityNoMap.put("荆州", "0716") - cityNoMap.put("莱芜", "0634") - cityNoMap.put("菏泽", "0530") - cityNoMap.put("萍乡", "0799") - cityNoMap.put("营口", "0417") - cityNoMap.put("衡水", "0318") - cityNoMap.put("衡阳", "0734") - cityNoMap.put("衢州", "0570") - cityNoMap.put("西双版纳傣族自治州", "0691") - cityNoMap.put("西宁", "0971") - cityNoMap.put("西安", "029") - cityNoMap.put("许昌", "0374") - cityNoMap.put("贵港", "01755") - cityNoMap.put("贺州", "01774") - cityNoMap.put("资阳", "0832") - cityNoMap.put("赣州", "0797") - cityNoMap.put("赤峰", "0476") - cityNoMap.put("辽源", "0437") - cityNoMap.put("达州", "0818") - cityNoMap.put("运城", "0359") - cityNoMap.put("连云港", "0518") - cityNoMap.put("通化", "0435") - cityNoMap.put("通辽", "0475") - cityNoMap.put("遂宁", "0825") - cityNoMap.put("遵义", "0852") - cityNoMap.put("邢台", "0319") - cityNoMap.put("邯郸", "0310") - cityNoMap.put("邵阳", "0739") - cityNoMap.put("郑州", "0371") - cityNoMap.put("郴州", "0735") - cityNoMap.put("鄂尔多斯", "0477") - cityNoMap.put("鄂州", "0711") - cityNoMap.put("酒泉", "0937") - cityNoMap.put("金华", "0579") - cityNoMap.put("金昌", "0935") - cityNoMap.put("钦州", "0777") - cityNoMap.put("铁岭", "0410") - cityNoMap.put("铜仁地区", "0856") - cityNoMap.put("铜川", "0919") - cityNoMap.put("铜陵", "0562") - cityNoMap.put("银川", "0951") - cityNoMap.put("锦州", "0416") - cityNoMap.put("长治", "0355") - cityNoMap.put("阜新", "0418") - cityNoMap.put("阜阳", "01558") - cityNoMap.put("阳泉", "0353") - cityNoMap.put("阿坝藏族羌族自治州", "0837") - cityNoMap.put("陇南", "02935") - cityNoMap.put("随州", "0722") - cityNoMap.put("雅安", "0835") - cityNoMap.put("韶关", "0751") - cityNoMap.put("马鞍山", "0555") - cityNoMap.put("驻马店", "0396") - cityNoMap.put("鸡西", "0467") - cityNoMap.put("鹤壁", "0392") - cityNoMap.put("鹤岗", "0468") - cityNoMap.put("鹰潭", "0701") - cityNoMap.put("黄冈", "0713") - cityNoMap.put("黑河", "0456") - cityNoMap.put("黔东南苗族侗族自治州", "0855") - cityNoMap.put("黔南布依族苗族自治州", "0854") - cityNoMap.put("齐齐哈尔", "0452") - cityNoMap.put("龙岩", "0597") - cityNoMap.put("甘南藏族自治州", "0941") - cityNoMap.put("嘉峪关", "1937") - cityNoMap.put("百色", "0776") - cityNoMap.put("六盘水", "0858") - cityNoMap.put("黔西南布依族苗族自治州", "0859") - cityNoMap.put("白沙黎族自治县", "0802") - cityNoMap.put("保亭黎族苗族自治县", "0801") - cityNoMap.put("昌江黎族自治县", "0803") - cityNoMap.put("澄迈县", "0804") - cityNoMap.put("定安县", "0806") - cityNoMap.put("东方", "0807") - cityNoMap.put("东沙群岛", "0808") - cityNoMap.put("乐东黎族自治县", "2802") - cityNoMap.put("临高县", "1896") - cityNoMap.put("陵水黎族自治县", "0809") - cityNoMap.put("南沙群岛", "1891") - cityNoMap.put("琼海", "1894") - cityNoMap.put("琼中黎族苗族自治县", "1899") - cityNoMap.put("屯昌县", "1892") - cityNoMap.put("万宁", "1898") - cityNoMap.put("文昌", "1893") - cityNoMap.put("五指山", "1897") - cityNoMap.put("西沙群岛", "1895") - cityNoMap.put("中沙群岛", "2801") - cityNoMap.put("儋州", "0805") - cityNoMap.put("阿拉善盟", "0483") - cityNoMap.put("巴彦淖尔市", "0478") - cityNoMap.put("锡林郭勒盟", "0479") - cityNoMap.put("固原", "0954") - cityNoMap.put("果洛藏族自治州", "0975") - cityNoMap.put("海西蒙古族藏族自治州", "0977") - cityNoMap.put("黄南藏族自治州", "0973") - cityNoMap.put("玉树藏族自治州", "0976") - cityNoMap.put("阿里地区", "0897") - cityNoMap.put("昌都地区", "0895") - cityNoMap.put("林芝地区", "0894") - cityNoMap.put("那曲地区", "0896") - cityNoMap.put("阿克苏地区", "0997") - cityNoMap.put("阿勒泰地区", "0906") - cityNoMap.put("巴音郭楞蒙古自治州", "0996") - cityNoMap.put("哈密地区", "0902") - cityNoMap.put("和田地区", "0903") - cityNoMap.put("喀什地区", "0998") - cityNoMap.put("克孜勒苏柯尔克孜自治州", "0908") - cityNoMap.put("保山", "0875") - cityNoMap.put("德宏傣族景颇族自治州", "0692") - cityNoMap.put("迪庆藏族自治州", "0887") - cityNoMap.put("丽江", "0888") - cityNoMap.put("临沧市", "0883") - cityNoMap.put("怒江傈僳族自治州", "0886") - cityNoMap.put("普洱", "0879") - cityNoMap.put("文山壮族苗族自治州", "0876") - cityNoMap.put("香港", "1852") - cityNoMap.put("澳门", "1853") - cityNoMap.put("五家渠市", "652300") - cityNoMap.put("阿拉尔市", "652900") - cityNoMap.put("图木舒克市", "653000") + cityNoMap.put("鍖椾含", "010") + cityNoMap.put("骞垮窞", "020") + cityNoMap.put("閲嶅簡", "023") + cityNoMap.put("鍗椾含", "025") + cityNoMap.put("姝︽眽", "027") + cityNoMap.put("鎴愰兘", "028") + cityNoMap.put("淇濆畾", "0312") + cityNoMap.put("鎵垮痉", "0314") + cityNoMap.put("鍞愬北", "0315") + cityNoMap.put("寤婂潑", "0316") + cityNoMap.put("绉︾殗宀�", "0335") + cityNoMap.put("鏂颁埂", "0373") + cityNoMap.put("娲涢槼", "0379") + cityNoMap.put("澶ц繛", "0411") + cityNoMap.put("闉嶅北", "0412") + cityNoMap.put("鎶氶『", "0413") + cityNoMap.put("鏈邯", "0414") + cityNoMap.put("涓逛笢", "0415") + cityNoMap.put("杈介槼", "0419") + cityNoMap.put("钁姦宀�", "0429") + cityNoMap.put("闀挎槬", "0431") + cityNoMap.put("鍝堝皵婊�", "0451") + cityNoMap.put("浣虫湪鏂�", "0454") + cityNoMap.put("鍖呭ご", "0472") + cityNoMap.put("闀囨睙", "0511") + cityNoMap.put("鑻忓窞", "0512") + cityNoMap.put("鍗楅��", "0513") + cityNoMap.put("鎵窞", "0514") + cityNoMap.put("寰愬窞", "0516") + cityNoMap.put("甯稿窞", "0519") + cityNoMap.put("娴庡崡", "0531") + cityNoMap.put("闈掑矝", "0532") + cityNoMap.put("铓屽煚", "0552") + cityNoMap.put("榛勫北", "0559") + cityNoMap.put("鏉窞", "0571") + cityNoMap.put("婀栧窞", "0572") + cityNoMap.put("鍙板窞", "0576") + cityNoMap.put("娓╁窞", "0577") + cityNoMap.put("绂忓窞", "0591") + cityNoMap.put("鍘﹂棬", "0592") + cityNoMap.put("瀹佸痉", "0593") + cityNoMap.put("鑾嗙敯", "0594") + cityNoMap.put("娉夊窞", "0595") + cityNoMap.put("婕冲窞", "0596") + cityNoMap.put("濞佹捣", "0631") + cityNoMap.put("姹曞熬", "0660") + cityNoMap.put("姹曞熬宀�", "0660") + cityNoMap.put("闃虫睙", "0662") + cityNoMap.put("鎻槼", "0663") + cityNoMap.put("鑼傚悕", "0668") + cityNoMap.put("瑗勯槼", "0710") + cityNoMap.put("榛勭煶", "0714") + cityNoMap.put("瀹滄槍", "0717") + cityNoMap.put("鍗佸牥", "0719") + cityNoMap.put("鑽嗛棬", "0724") + cityNoMap.put("宀抽槼", "0730") + cityNoMap.put("闀挎矙", "0731") + cityNoMap.put("婀樻江", "0732") + cityNoMap.put("鏍床", "0733") + cityNoMap.put("甯稿痉", "0736") + cityNoMap.put("姹熼棬", "0750") + cityNoMap.put("姹曞ご", "0754") + cityNoMap.put("娣卞湷", "0755") + cityNoMap.put("鐝犳捣", "0756") + cityNoMap.put("婀涙睙", "0759") + cityNoMap.put("涓北", "0760") + cityNoMap.put("闃插煄娓�", "0770") + cityNoMap.put("鍗楀畞", "0771") + cityNoMap.put("妗傛灄", "0773") + cityNoMap.put("鍖楁捣", "0779") + cityNoMap.put("鍗楁槍", "0791") + cityNoMap.put("涔濇睙", "0792") + cityNoMap.put("鏅痉闀�", "0798") + cityNoMap.put("鑷础", "0813") + cityNoMap.put("娉稿窞", "0830") + cityNoMap.put("瀹滃", "0831") + cityNoMap.put("鍐呮睙", "01832") + cityNoMap.put("鐪夊北", "0833") + cityNoMap.put("璐甸槼", "0851") + cityNoMap.put("涓変簹", "0899") + cityNoMap.put("鍜搁槼", "0910") + cityNoMap.put("寤跺畨", "0911") + cityNoMap.put("寤惰竟鏈濋矞鏃忚嚜娌诲窞", "0433") + cityNoMap.put("涓冨彴娌�", "0464") + cityNoMap.put("涓夋槑", "0598") + cityNoMap.put("涓夐棬宄�", "0398") + cityNoMap.put("涓婃捣", "021") + cityNoMap.put("涓婇ザ", "0793") + cityNoMap.put("涓滆帪", "0769") + cityNoMap.put("涓滆惀", "0546") + cityNoMap.put("涓崼", "01953") + cityNoMap.put("涓村鍥炴棌鑷不宸�", "0930") + cityNoMap.put("涓存本", "0357") + cityNoMap.put("涓存矀", "0539") + cityNoMap.put("涓芥按", "0578") + cityNoMap.put("涔屽叞瀵熷竷", "0474") + cityNoMap.put("涔屾捣", "0473") + cityNoMap.put("涔岄瞾鏈ㄩ綈", "0991") + cityNoMap.put("涔愬北", "0833") + cityNoMap.put("浜戞诞", "0766") + cityNoMap.put("浜冲窞", "0558") + cityNoMap.put("浠欐", "0728") + cityNoMap.put("浼婃槬", "0458") + cityNoMap.put("浼婄妬鍝堣惃鍏嬭嚜娌诲窞", "0999") + cityNoMap.put("浣涘北", "0757") + cityNoMap.put("淇¢槼", "0376") + cityNoMap.put("鍏嬫媺鐜涗緷", "0990") + cityNoMap.put("鍏畨", "0564") + cityNoMap.put("鍏板窞", "0931") + cityNoMap.put("鍏村畨鐩�", "0482") + cityNoMap.put("鍑夊北褰濇棌鑷不宸�", "0834") + cityNoMap.put("鍗楀厖", "0817") + cityNoMap.put("鍗楀钩", "0599") + cityNoMap.put("鍗楅槼", "0377") + cityNoMap.put("鍗氬皵濉旀媺钂欏彜鑷不宸�", "0909") + cityNoMap.put("鍙岄腑灞�", "0469") + cityNoMap.put("鍚堣偉", "0551") + cityNoMap.put("鍚夊畨", "0796") + cityNoMap.put("鍚夋灄", "0432") + cityNoMap.put("鍚愰瞾鐣湴鍖�", "0995") + cityNoMap.put("鍚曟", "0358") + cityNoMap.put("鍚村繝", "0953") + cityNoMap.put("鍛ㄥ彛", "0394") + cityNoMap.put("鍛间鸡璐濆皵", "0470") + cityNoMap.put("鍛煎拰娴╃壒", "0471") + cityNoMap.put("鍜稿畞", "0715") + cityNoMap.put("鍟嗕笜", "0370") + cityNoMap.put("鍟嗘礇", "0914") + cityNoMap.put("鍢夊叴", "0573") + cityNoMap.put("鍥涘钩", "0434") + cityNoMap.put("濉斿煄鍦板尯", "0901") + cityNoMap.put("澶у叴瀹夊箔鍦板尯", "0457") + cityNoMap.put("澶у悓", "0352") + cityNoMap.put("澶у簡", "0459") + cityNoMap.put("澶х悊鐧芥棌鑷不宸�", "0872") + cityNoMap.put("澶╂按", "0938") + cityNoMap.put("澶╂触", "022") + cityNoMap.put("澶╅棬", "01728") + cityNoMap.put("澶師", "0351") + cityNoMap.put("濞勫簳", "0738") + cityNoMap.put("瀛濇劅", "0712") + cityNoMap.put("瀹佹尝", "0574") + cityNoMap.put("瀹夊簡", "0556") + cityNoMap.put("瀹夊悍", "0915") + cityNoMap.put("瀹夐槼", "0372") + cityNoMap.put("瀹夐『", "0853") + cityNoMap.put("瀹氳タ", "0932") + cityNoMap.put("瀹滄槬", "0795") + cityNoMap.put("瀹濋浮", "0917") + cityNoMap.put("瀹e煄", "0563") + cityNoMap.put("瀹垮窞", "0557") + cityNoMap.put("瀹胯縼", "0527") + cityNoMap.put("灞卞崡鍦板尯", "0893") + cityNoMap.put("宕囧乏", "01771") + cityNoMap.put("宸㈡箹", "0565") + cityNoMap.put("宸翠腑", "0827") + cityNoMap.put("骞冲噳", "0933") + cityNoMap.put("骞抽《灞�", "0375") + cityNoMap.put("骞垮厓", "0839") + cityNoMap.put("骞垮畨", "0826") + cityNoMap.put("搴嗛槼", "0934") + cityNoMap.put("寮�灏�", "0378") + cityNoMap.put("寮犲鍙�", "0313") + cityNoMap.put("寮犲鐣�", "0744") + cityNoMap.put("寮犳帠", "0936") + cityNoMap.put("寰峰窞", "0534") + cityNoMap.put("寰烽槼", "0838") + cityNoMap.put("蹇诲窞", "0350") + cityNoMap.put("鎬�鍖�", "0745") + cityNoMap.put("鎭╂柦鍦熷鏃忚嫍鏃忚嚜娌诲窞", "0718") + cityNoMap.put("鎯犲窞", "0752") + cityNoMap.put("鎶氬窞", "0794") + cityNoMap.put("鎷夎惃", "0891") + cityNoMap.put("鏀�鏋濊姳", "0812") + cityNoMap.put("鏂颁綑", "0790") + cityNoMap.put("鏃犻敗", "0510") + cityNoMap.put("鏃ュ杸鍒欏湴鍖�", "0892") + cityNoMap.put("鏃ョ収", "0633") + cityNoMap.put("鏄嗘槑", "0871") + cityNoMap.put("鏄屽悏鍥炴棌鑷不宸�", "0994") + cityNoMap.put("鏄��", "0870") + cityNoMap.put("鏅嬩腑", "0354") + cityNoMap.put("鏅嬪煄", "0356") + cityNoMap.put("鏇查潠", "0874") + cityNoMap.put("鏈斿窞", "0349") + cityNoMap.put("鏈濋槼", "0421") + cityNoMap.put("鏉ュ", "01772") + cityNoMap.put("鏉惧師", "0438") + cityNoMap.put("鏋e簞", "0632") + cityNoMap.put("鏌冲窞", "0772") + cityNoMap.put("姊呭窞", "0753") + cityNoMap.put("姊у窞", "0774") + cityNoMap.put("妤氶泟褰濇棌鑷不宸�", "0878") + cityNoMap.put("姒嗘灄", "0912") + cityNoMap.put("姝﹀▉", "01935") + cityNoMap.put("姣曡妭鍦板尯", "0857") + cityNoMap.put("姘稿窞", "0746") + cityNoMap.put("姹変腑", "0916") + cityNoMap.put("姹犲窞", "0566") + cityNoMap.put("娌堥槼", "024") + cityNoMap.put("娌у窞", "0317") + cityNoMap.put("娌虫睜", "0778") + cityNoMap.put("娌虫簮", "0762") + cityNoMap.put("娉板畨", "0538") + cityNoMap.put("娉板窞", "0523") + cityNoMap.put("娴庡畞", "0537") + cityNoMap.put("娴庢簮", "01391") + cityNoMap.put("娴蜂笢鍦板尯", "0972") + cityNoMap.put("娴峰寳钘忔棌鑷不宸�", "0970") + cityNoMap.put("娴峰崡钘忔棌鑷不宸�", "0974") + cityNoMap.put("娴峰彛", "0898") + cityNoMap.put("娣勫崥", "0533") + cityNoMap.put("娣寳", "0561") + cityNoMap.put("娣崡", "0554") + cityNoMap.put("娣畨", "0517") + cityNoMap.put("娓呰繙", "0763") + cityNoMap.put("娓崡", "0913") + cityNoMap.put("婀樿タ鍦熷鏃忚嫍鏃忚嚜娌诲窞", "0743") + cityNoMap.put("婊佸窞", "0550") + cityNoMap.put("婊ㄥ窞", "0543") + cityNoMap.put("婕渤", "0395") + cityNoMap.put("娼嶅潑", "0536") + cityNoMap.put("娼滄睙", "02728") + cityNoMap.put("娼窞", "0768") + cityNoMap.put("婵槼", "0393") + cityNoMap.put("鐑熷彴", "0535") + cityNoMap.put("鐒︿綔", "0391") + cityNoMap.put("鐗′腹姹�", "0453") + cityNoMap.put("鐜夋灄", "0775") + cityNoMap.put("鐜夋邯", "0877") + cityNoMap.put("鐢樺瓬钘忔棌鑷不宸�", "0836") + cityNoMap.put("鐧藉煄", "0436") + cityNoMap.put("鐧藉北", "0439") + cityNoMap.put("鐧介摱", "0943") + cityNoMap.put("鐩婇槼", "0737") + cityNoMap.put("鐩愬煄", "0515") + cityNoMap.put("鐩橀敠", "0427") + cityNoMap.put("鐭冲槾灞�", "0952") + cityNoMap.put("鐭冲搴�", "0311") + cityNoMap.put("鐭虫渤瀛�", "0993") + cityNoMap.put("绁炲啘鏋舵灄鍖�", "01719") + cityNoMap.put("绾㈡渤鍝堝凹鏃忓綕鏃忚嚜娌诲窞", "0873") + cityNoMap.put("缁嶅叴", "0575") + cityNoMap.put("缁ュ寲", "0455") + cityNoMap.put("缁甸槼", "0816") + cityNoMap.put("鑱婂煄", "0635") + cityNoMap.put("鑲囧簡", "0758") + cityNoMap.put("鑸熷北", "0580") + cityNoMap.put("鑺滄箹", "0553") + cityNoMap.put("鑽嗗窞", "0716") + cityNoMap.put("鑾辫姕", "0634") + cityNoMap.put("鑿忔辰", "0530") + cityNoMap.put("钀嶄埂", "0799") + cityNoMap.put("钀ュ彛", "0417") + cityNoMap.put("琛℃按", "0318") + cityNoMap.put("琛¢槼", "0734") + cityNoMap.put("琛㈠窞", "0570") + cityNoMap.put("瑗垮弻鐗堢撼鍌f棌鑷不宸�", "0691") + cityNoMap.put("瑗垮畞", "0971") + cityNoMap.put("瑗垮畨", "029") + cityNoMap.put("璁告槍", "0374") + cityNoMap.put("璐垫腐", "01755") + cityNoMap.put("璐哄窞", "01774") + cityNoMap.put("璧勯槼", "0832") + cityNoMap.put("璧e窞", "0797") + cityNoMap.put("璧ゅ嘲", "0476") + cityNoMap.put("杈芥簮", "0437") + cityNoMap.put("杈惧窞", "0818") + cityNoMap.put("杩愬煄", "0359") + cityNoMap.put("杩炰簯娓�", "0518") + cityNoMap.put("閫氬寲", "0435") + cityNoMap.put("閫氳窘", "0475") + cityNoMap.put("閬傚畞", "0825") + cityNoMap.put("閬典箟", "0852") + cityNoMap.put("閭㈠彴", "0319") + cityNoMap.put("閭兏", "0310") + cityNoMap.put("閭甸槼", "0739") + cityNoMap.put("閮戝窞", "0371") + cityNoMap.put("閮村窞", "0735") + cityNoMap.put("閯傚皵澶氭柉", "0477") + cityNoMap.put("閯傚窞", "0711") + cityNoMap.put("閰掓硥", "0937") + cityNoMap.put("閲戝崕", "0579") + cityNoMap.put("閲戞槍", "0935") + cityNoMap.put("閽﹀窞", "0777") + cityNoMap.put("閾佸箔", "0410") + cityNoMap.put("閾滀粊鍦板尯", "0856") + cityNoMap.put("閾滃窛", "0919") + cityNoMap.put("閾滈櫟", "0562") + cityNoMap.put("閾跺窛", "0951") + cityNoMap.put("閿﹀窞", "0416") + cityNoMap.put("闀挎不", "0355") + cityNoMap.put("闃滄柊", "0418") + cityNoMap.put("闃滈槼", "01558") + cityNoMap.put("闃虫硥", "0353") + cityNoMap.put("闃垮潩钘忔棌缇屾棌鑷不宸�", "0837") + cityNoMap.put("闄囧崡", "02935") + cityNoMap.put("闅忓窞", "0722") + cityNoMap.put("闆呭畨", "0835") + cityNoMap.put("闊跺叧", "0751") + cityNoMap.put("椹瀺灞�", "0555") + cityNoMap.put("椹婚┈搴�", "0396") + cityNoMap.put("楦¤タ", "0467") + cityNoMap.put("楣ゅ", "0392") + cityNoMap.put("楣ゅ矖", "0468") + cityNoMap.put("楣版江", "0701") + cityNoMap.put("榛勫唸", "0713") + cityNoMap.put("榛戞渤", "0456") + cityNoMap.put("榛斾笢鍗楄嫍鏃忎緱鏃忚嚜娌诲窞", "0855") + cityNoMap.put("榛斿崡甯冧緷鏃忚嫍鏃忚嚜娌诲窞", "0854") + cityNoMap.put("榻愰綈鍝堝皵", "0452") + cityNoMap.put("榫欏博", "0597") + cityNoMap.put("鐢樺崡钘忔棌鑷不宸�", "0941") + cityNoMap.put("鍢夊唱鍏�", "1937") + cityNoMap.put("鐧捐壊", "0776") + cityNoMap.put("鍏洏姘�", "0858") + cityNoMap.put("榛旇タ鍗楀竷渚濇棌鑻楁棌鑷不宸�", "0859") + cityNoMap.put("鐧芥矙榛庢棌鑷不鍘�", "0802") + cityNoMap.put("淇濅涵榛庢棌鑻楁棌鑷不鍘�", "0801") + cityNoMap.put("鏄屾睙榛庢棌鑷不鍘�", "0803") + cityNoMap.put("婢勮繄鍘�", "0804") + cityNoMap.put("瀹氬畨鍘�", "0806") + cityNoMap.put("涓滄柟", "0807") + cityNoMap.put("涓滄矙缇ゅ矝", "0808") + cityNoMap.put("涔愪笢榛庢棌鑷不鍘�", "2802") + cityNoMap.put("涓撮珮鍘�", "1896") + cityNoMap.put("闄垫按榛庢棌鑷不鍘�", "0809") + cityNoMap.put("鍗楁矙缇ゅ矝", "1891") + cityNoMap.put("鐞兼捣", "1894") + cityNoMap.put("鐞间腑榛庢棌鑻楁棌鑷不鍘�", "1899") + cityNoMap.put("灞槍鍘�", "1892") + cityNoMap.put("涓囧畞", "1898") + cityNoMap.put("鏂囨槍", "1893") + cityNoMap.put("浜旀寚灞�", "1897") + cityNoMap.put("瑗挎矙缇ゅ矝", "1895") + cityNoMap.put("涓矙缇ゅ矝", "2801") + cityNoMap.put("鍎嬪窞", "0805") + cityNoMap.put("闃挎媺鍠勭洘", "0483") + cityNoMap.put("宸村溅娣栧皵甯�", "0478") + cityNoMap.put("閿℃灄閮嫆鐩�", "0479") + cityNoMap.put("鍥哄師", "0954") + cityNoMap.put("鏋滄礇钘忔棌鑷不宸�", "0975") + cityNoMap.put("娴疯タ钂欏彜鏃忚棌鏃忚嚜娌诲窞", "0977") + cityNoMap.put("榛勫崡钘忔棌鑷不宸�", "0973") + cityNoMap.put("鐜夋爲钘忔棌鑷不宸�", "0976") + cityNoMap.put("闃块噷鍦板尯", "0897") + cityNoMap.put("鏄岄兘鍦板尯", "0895") + cityNoMap.put("鏋楄姖鍦板尯", "0894") + cityNoMap.put("閭f洸鍦板尯", "0896") + cityNoMap.put("闃垮厠鑻忓湴鍖�", "0997") + cityNoMap.put("闃垮嫆娉板湴鍖�", "0906") + cityNoMap.put("宸撮煶閮钂欏彜鑷不宸�", "0996") + cityNoMap.put("鍝堝瘑鍦板尯", "0902") + cityNoMap.put("鍜岀敯鍦板尯", "0903") + cityNoMap.put("鍠�浠�鍦板尯", "0998") + cityNoMap.put("鍏嬪瓬鍕掕嫃鏌皵鍏嬪瓬鑷不宸�", "0908") + cityNoMap.put("淇濆北", "0875") + cityNoMap.put("寰峰畯鍌f棌鏅鏃忚嚜娌诲窞", "0692") + cityNoMap.put("杩簡钘忔棌鑷不宸�", "0887") + cityNoMap.put("涓芥睙", "0888") + cityNoMap.put("涓存钵甯�", "0883") + cityNoMap.put("鎬掓睙鍌堝兂鏃忚嚜娌诲窞", "0886") + cityNoMap.put("鏅幢", "0879") + cityNoMap.put("鏂囧北澹棌鑻楁棌鑷不宸�", "0876") + cityNoMap.put("棣欐腐", "1852") + cityNoMap.put("婢抽棬", "1853") + cityNoMap.put("浜斿娓犲競", "652300") + cityNoMap.put("闃挎媺灏斿競", "652900") + cityNoMap.put("鍥炬湪鑸掑厠甯�", "653000") - cityNoMap.put("昆山", "0512") - cityNoMap.put("常熟", "0512") - cityNoMap.put("萧山", "0571") - cityNoMap.put("义乌", "0579") + cityNoMap.put("鏄嗗北", "0512") + cityNoMap.put("甯哥啛", "0512") + cityNoMap.put("钀у北", "0571") + cityNoMap.put("涔変箤", "0579") return cityNoMap } /** - * 从poi中获得公司的信息 - * address:地址 - * name:公司名 - * com_type:公司类型 - * lat: 经度 - * lng: 维度 - * zip_code:邮编 - * city_code:城市区号 - * tel: 电话号码 + * 浠巔oi涓幏寰楀叕鍙哥殑淇℃伅 + * address:鍦板潃 + * name锛氬叕鍙稿悕 + * com_type:鍏徃绫诲瀷 + * lat: 缁忓害 + * lng: 缁村害 + * zip_code:閭紪 + * city_code:鍩庡競鍖哄彿 + * tel: 鐢佃瘽鍙风爜 * @param poi */ private getCompanyDataFromPoi(poi){ @@ -555,10 +555,10 @@ class MapabcService { } /** - * 根据经纬度计算距离 - * 返回单位为米 - * 使用方法如:println caculateDistance(121.4420330826, 31.2460880049,121.4432680000, 31.2459470000) - * 具体参考:http://www.storyday.com/wp-content/uploads/2008/09/latlung_dis.html + * 鏍规嵁缁忕含搴﹁绠楄窛绂� + * 杩斿洖鍗曚綅涓虹背 + * 浣跨敤鏂规硶濡傦細println caculateDistance(121.4420330826, 31.2460880049,121.4432680000, 31.2459470000) + * 鍏蜂綋鍙傝�冿細http://www.storyday.com/wp-content/uploads/2008/09/latlung_dis.html */ public def caculateDistance(lng1, lat1, lng2, lat2){ def radLat1 = rad(lat1) @@ -580,7 +580,7 @@ class MapabcService { public void crawlDistrictLngLatWithAddress(){ DBObject queryParams=new BasicDBObject(); - queryParams.put("city", "上海"); + queryParams.put("city", "涓婃捣"); DBCursor cur=source.find(queryParams); def countIndex=0; def failedCount=0; @@ -591,7 +591,7 @@ class MapabcService { queryParams2.put("_id", dbObj.get("_id")); if(target.count(queryParams2)>0)continue; - def rt=parseAddress(address, "上海") + def rt=parseAddress(address, "涓婃捣") if(rt.size()>0){ DBObject targetObj=new BasicDBObject(); targetObj.put("_id", dbObj.get("_id")); @@ -624,7 +624,7 @@ class MapabcService { } static main(args) { MapabcService mapabcService=new MapabcService() -// def rt=(new MapabcService().parseAddress("闵行都市路2988号、沪光路555弄", "上海")); +// def rt=(new MapabcService().parseAddress("闂佃閮藉競璺�2988鍙枫�佹勃鍏夎矾555寮�", "涓婃捣")); // def rt=[:] // println(rt); // 227265220000 @@ -640,13 +640,13 @@ class MapabcService { // print(new MapabcService().caculateDistance(116.638411, 40.126582, 116.641854, 40.12645)); // new MapabcService().crawlDistrictLngLatWithAddress(); // Map params=new HashMap(); -// params.put("strCity", "北京"); -// params.put("strNamekeyword", "融科香雪兰溪"); +// params.put("strCity", "鍖椾含"); +// params.put("strNamekeyword", "铻嶇棣欓洩鍏版邯"); // print(InvokeHttpRequest.post("http://soufun.com/house/web/Search_Result.php", params, "gbk")); -// def rt=mapabcService.parseAddress("宝安固戍一路与恒南路交汇处", "深圳") +// def rt=mapabcService.parseAddress("瀹濆畨鍥烘垗涓�璺笌鎭掑崡璺氦姹囧", "娣卞湷") // println rt -// def rt2=mapabcService.findAllByQuery("深圳","鼎尚时代", 1) +// def rt2=mapabcService.findAllByQuery("娣卞湷","榧庡皻鏃朵唬", 1) // println rt2 // println Double.parseDouble(rt2.poiList[0].lng) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/newDistrict/NewDistrictPrice.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/newDistrict/NewDistrictPrice.groovy index 070204719..d2295e0b4 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/newDistrict/NewDistrictPrice.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/newDistrict/NewDistrictPrice.groovy @@ -16,7 +16,7 @@ import com.fangjia.script.util.MongoUtils import com.fangjia.script.util.DateUtils; /** - * 将新盘价格单独放入另一张表中 + * 灏嗘柊鐩樹环鏍煎崟鐙斁鍏ュ彟涓�寮犺〃涓� * @author Administrator * */ @@ -64,7 +64,7 @@ class NewDistrictPrice extends BaseBatch{ def regions = []; for(DBObject obj : dbCursor){ def region = obj.get("name"); - if(region.indexOf("周边")==-1 && region.indexOf("其他")==-1) { + if(region.indexOf("鍛ㄨ竟")==-1 && region.indexOf("鍏朵粬")==-1) { regions << region; } } @@ -139,18 +139,18 @@ class NewDistrictPrice extends BaseBatch{ def kinds = []; if(!build_type){ - kinds << "小区"; + kinds << "灏忓尯"; }else{ - if(build_type.indexOf("别墅")!=-1){ - kinds << "别墅"; + if(build_type.indexOf("鍒")!=-1){ + kinds << "鍒"; } - if(build_type.indexOf("公寓")!=-1||build_type.indexOf("多层")!=-1||build_type.indexOf("小区")!=-1||build_type.indexOf("板楼")!=-1||build_type.indexOf("高层")!=-1||build_type.indexOf("住宅")!=-1){ - kinds << "小区"; + if(build_type.indexOf("鍏瘬")!=-1||build_type.indexOf("澶氬眰")!=-1||build_type.indexOf("灏忓尯")!=-1||build_type.indexOf("鏉挎ゼ")!=-1||build_type.indexOf("楂樺眰")!=-1||build_type.indexOf("浣忓畢")!=-1){ + kinds << "灏忓尯"; } } if(kinds.size()==0){ - kinds << "小区"; + kinds << "灏忓尯"; } return kinds.join(","); } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/newDistrict/SoufunRunNewDistrict.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/newDistrict/SoufunRunNewDistrict.groovy index cc1860aff..4832e8c36 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/newDistrict/SoufunRunNewDistrict.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/newDistrict/SoufunRunNewDistrict.groovy @@ -29,7 +29,7 @@ class SoufunRunNewDistrict implements Runnable { } static SimpleDateFormat openDate_sdf=new SimpleDateFormat("yyyy-MM-dd") - static Pattern pattern_household = Pattern.compile("([0-9]+)户") + static Pattern pattern_household = Pattern.compile("([0-9]+)鎴�") static Pattern pattern_region = Pattern.compile("address=\\s*'([^']+)'\\s*;") static Pattern pattern_name = Pattern.compile("projn\\s*=\\s*'([^']+)'\\s*;") @@ -37,9 +37,9 @@ class SoufunRunNewDistrict implements Runnable { static Pattern pattern_lat = Pattern.compile("var\\s+cityy=\\s*([\\d\\.]+)\\s*;") static Pattern pattern_price = Pattern.compile("([\\d\\.]+)") static Pattern pattern_date_1 = Pattern.compile("(20[\\d]{2})\\s?\\-\\s?([0-9]{1,2})\\s?(\\-\\s?([0-9]{1,2}))?") - static Pattern pattern_date_2 = Pattern.compile("((20[\\d]{2})\\s?年)?\\s?([0-9]{1,2})\\s?月\\s?(([0-9]{1,2})日?)?") + static Pattern pattern_date_2 = Pattern.compile("((20[\\d]{2})\\s?骞�)?\\s?([0-9]{1,2})\\s?鏈圽\s?(([0-9]{1,2})鏃�?)?") - static String house_check_regex = ".*(住宅|别墅|公寓|洋房|适用房|商品房|限价房|LOFT|SOHO|多层|小高层).*" + static String house_check_regex = ".*(浣忓畢|鍒|鍏瘬|娲嬫埧|閫傜敤鎴縷鍟嗗搧鎴縷闄愪环鎴縷LOFT|SOHO|澶氬眰|灏忛珮灞�).*" @Override public void run() { @@ -96,7 +96,7 @@ class SoufunRunNewDistrict implements Runnable { return newDistrict } -// 抓取号码 +// 鎶撳彇鍙风爜 Elements els=JQueryUtils.select("div.telbox div.tel", content) if(els.size()>0){ String mobile=els[0].text().trim() @@ -109,7 +109,7 @@ class SoufunRunNewDistrict implements Runnable { String photoUrl="${newDistrict.url}photo/${newcode}.htm" - //抓经纬度 + //鎶撶粡绾害 els=JQueryUtils.select("iframe#iframe_map", content) if(els.size()>0){ String mapUrl=els[0].attr("src") @@ -132,12 +132,12 @@ class SoufunRunNewDistrict implements Runnable { } } } - //抓图片 + //鎶撳浘鐗� String photoContent=InvokeHttpRequest.get(photoUrl, "gbk") if(photoContent){ els=JQueryUtils.select("ul.main_tabox_ul a", photoContent) if(els.size()>0){ - //第一个全部图片不抓,i从1开始 + //绗竴涓叏閮ㄥ浘鐗囦笉鎶擄紝i浠�1寮�濮� for(int i=1; i0){ Element el=els.get(0) @@ -244,47 +244,47 @@ class SoufunRunNewDistrict implements Runnable { for(Element elTd: elTds){ String text=elTd.text().trim() text= new String(text.getBytes("GBK"),"GBK").replace('?', ''); - text=text.replace("暂无资料", "") + text=text.replace("鏆傛棤璧勬枡", "") - if(text.startsWith("物业类别")){ - newDistrict.estate_type=text.replace("物业类别", "").trim() + if(text.startsWith("鐗╀笟绫诲埆")){ + newDistrict.estate_type=text.replace("鐗╀笟绫诲埆", "").trim() if(newDistrict.estate_type && !newDistrict.estate_type.matches(house_check_regex)){ return newDistrict } - }else if(text.startsWith("建筑类别")){ - newDistrict.build_type=text.replace("建筑类别", "") .trim() - }else if(text.startsWith("项目特色")){ - newDistrict.characteristic=text.replace("项目特色", "").trim() - }else if(text.startsWith("装修状况")){ - newDistrict.fitment=text.replace("装修状况", "").replace("[装修相册]", "").replace("[建材卖场]", "").trim() - }else if(text.startsWith("环线位置")){ - newDistrict.loop_line_info=text.replace("环线位置", "").trim() - }else if(text.startsWith("所属商圈")){ - newDistrict.business_quarter=text.replace("所属商圈", "").trim() + }else if(text.startsWith("寤虹瓚绫诲埆")){ + newDistrict.build_type=text.replace("寤虹瓚绫诲埆", "") .trim() + }else if(text.startsWith("椤圭洰鐗硅壊")){ + newDistrict.characteristic=text.replace("椤圭洰鐗硅壊", "").trim() + }else if(text.startsWith("瑁呬慨鐘跺喌")){ + newDistrict.fitment=text.replace("瑁呬慨鐘跺喌", "").replace("[瑁呬慨鐩稿唽]", "").replace("[寤烘潗鍗栧満]", "").trim() + }else if(text.startsWith("鐜嚎浣嶇疆")){ + newDistrict.loop_line_info=text.replace("鐜嚎浣嶇疆", "").trim() + }else if(text.startsWith("鎵�灞炲晢鍦�")){ + newDistrict.business_quarter=text.replace("鎵�灞炲晢鍦�", "").trim() newDistrict.block=newDistrict.business_quarter - }else if(text.startsWith("容 积 率")){ - newDistrict.cubage_percent=text.replace("容 积 率", "").replace("[关于容积率]", "").trim() - }else if(text.startsWith("绿 化 率")){ - newDistrict.virescence_percent=text.replace("绿 化 率", "").replace("[关于绿化率]", "").trim() - }else if(text.startsWith("开盘时间")){ - newDistrict.open_date_str=text.replace("开盘时间", "").replace("[开盘详情]", "").trim() + }else if(text.startsWith("瀹� 绉� 鐜�")){ + newDistrict.cubage_percent=text.replace("瀹� 绉� 鐜�", "").replace("[鍏充簬瀹圭Н鐜嘳", "").trim() + }else if(text.startsWith("缁� 鍖� 鐜�")){ + newDistrict.virescence_percent=text.replace("缁� 鍖� 鐜�", "").replace("[鍏充簬缁垮寲鐜嘳", "").trim() + }else if(text.startsWith("寮�鐩樻椂闂�")){ + newDistrict.open_date_str=text.replace("寮�鐩樻椂闂�", "").replace("[寮�鐩樿鎯匽", "").trim() newDistrict.open_date=parseOpenDate(newDistrict.open_date_str) - }else if(text.startsWith("入住时间")){ - newDistrict.live_date=text.replace("入住时间", "").replace("[入住详情]", "").trim() - }else if(text.startsWith("物 业 费")){ - newDistrict.estate_charge=text.replace("物 业 费", "").trim() - }else if(text.startsWith("物业公司")){ - newDistrict.estate_company=text.replace("物业公司", "").trim() - }else if(text.startsWith("开 发 商")){ - newDistrict.developer=text.replace("开 发 商", "").replace("[查看预售许可证]", "").replace("[相关网站]", "").trim() - }else if(text.startsWith("预售许可证")){ - newDistrict.licence=text.replace("预售许可证", "").replace("[更多]", "").trim() - }else if(text.startsWith("售楼地址")){ - newDistrict.sell_address=text.replace("售楼地址", "").trim() - }else if(text.startsWith("物业地址")){ - newDistrict.address=text.replace("物业地址", "").replace("[交通图]", "").trim() - }else if(text.startsWith(newDistrict.name+"房价")){ - newDistrict.price_str=text.replace(newDistrict.name+"房价", "").replace("[房价走势]", "").replace("[我要纠错]", "").replace("[房贷计算器]", "").trim() + }else if(text.startsWith("鍏ヤ綇鏃堕棿")){ + newDistrict.live_date=text.replace("鍏ヤ綇鏃堕棿", "").replace("[鍏ヤ綇璇︽儏]", "").trim() + }else if(text.startsWith("鐗� 涓� 璐�")){ + newDistrict.estate_charge=text.replace("鐗� 涓� 璐�", "").trim() + }else if(text.startsWith("鐗╀笟鍏徃")){ + newDistrict.estate_company=text.replace("鐗╀笟鍏徃", "").trim() + }else if(text.startsWith("寮� 鍙� 鍟�")){ + newDistrict.developer=text.replace("寮� 鍙� 鍟�", "").replace("[鏌ョ湅棰勫敭璁稿彲璇乚", "").replace("[鐩稿叧缃戠珯]", "").trim() + }else if(text.startsWith("棰勫敭璁稿彲璇�")){ + newDistrict.licence=text.replace("棰勫敭璁稿彲璇�", "").replace("[鏇村]", "").trim() + }else if(text.startsWith("鍞ゼ鍦板潃")){ + newDistrict.sell_address=text.replace("鍞ゼ鍦板潃", "").trim() + }else if(text.startsWith("鐗╀笟鍦板潃")){ + newDistrict.address=text.replace("鐗╀笟鍦板潃", "").replace("[浜ら�氬浘]", "").trim() + }else if(text.startsWith(newDistrict.name+"鎴夸环")){ + newDistrict.price_str=text.replace(newDistrict.name+"鎴夸环", "").replace("[鎴夸环璧板娍]", "").replace("[鎴戣绾犻敊]", "").replace("[鎴胯捶璁$畻鍣╙", "").trim() def price=parsePrice(newDistrict.price_str) newDistrict.total_price=price.total_price newDistrict.avg_price=price.avg_price @@ -312,7 +312,7 @@ class SoufunRunNewDistrict implements Runnable { } els=JQueryUtils.select("#xq_cwxx_anchor + div", content) if(els.size()>0){ - newDistrict.car_site= els[0].text().replace("停车位:", "").trim(); + newDistrict.car_site= els[0].text().replace("鍋滆溅浣�:", "").trim(); } els=JQueryUtils.select("#xq_xmjs_anchor + div", content) if(els.size()>0){ @@ -321,16 +321,16 @@ class SoufunRunNewDistrict implements Runnable { els=JQueryUtils.select("#xq_xgxx_anchor", content) for(Element elT: els){ - if(elT.text().contains("相关信息")){ + if(elT.text().contains("鐩稿叧淇℃伅")){ Element elDiv=elT.nextElementSibling() newDistrict.relate_info=elDiv.html() Elements elStrongs=elDiv.select(">strong"); for(Element el: elStrongs){ - if(el.text().trim().contains("占地面积")){ + if(el.text().trim().contains("鍗犲湴闈㈢Н")){ newDistrict.all_area= el.nextSibling().text().trim(); - }else if(el.text().trim().contains("建筑面积")){ + }else if(el.text().trim().contains("寤虹瓚闈㈢Н")){ newDistrict.build_area= el.nextSibling().text().trim(); - }else if(el.text().trim().contains("户 数")){ + }else if(el.text().trim().contains("鎴� 鏁�")){ matcher = pattern_household.matcher(el.nextSibling().text()) if(matcher.find()){ newDistrict.household_count=Integer.parseInt(matcher.group(1)); @@ -342,9 +342,9 @@ class SoufunRunNewDistrict implements Runnable { } - if(newDistrict.city=="海口"){ + if(newDistrict.city=="娴峰彛"){ if(newDistrict.block){ - newDistrict.region=newDistrict.block.replace("海口", "").replace("区", "") + newDistrict.region=newDistrict.block.replace("娴峰彛", "").replace("鍖�", "") newDistrict.business_quarter=newDistrict.region newDistrict.block=newDistrict.region } @@ -373,13 +373,13 @@ class SoufunRunNewDistrict implements Runnable { if(month){ year=year?year:"2013" if(!day){ - if(openDateStr.contains("月底")){ + if(openDateStr.contains("鏈堝簳")){ day="30" - }else if(openDateStr.contains("上旬")){ + }else if(openDateStr.contains("涓婃棳")){ day="1" - }else if(openDateStr.contains("中旬")){ + }else if(openDateStr.contains("涓棳")){ day="10" - }else if(openDateStr.contains("下旬")){ + }else if(openDateStr.contains("涓嬫棳")){ day="20" }else{ day="1" @@ -398,9 +398,9 @@ class SoufunRunNewDistrict implements Runnable { if(priceStr){ Matcher matcher = pattern_price.matcher(priceStr) if(matcher.find()){ - if(priceStr.contains("平方米")){ + if(priceStr.contains("骞虫柟绫�")){ price.avg_price=(int)Float.parseFloat(matcher.group(1)) - }else if(priceStr.contains("套")){ + }else if(priceStr.contains("濂�")){ price.total_price=(int)Float.parseFloat(matcher.group(1))*10000 } } @@ -423,15 +423,15 @@ class SoufunRunNewDistrict implements Runnable { Elements els=JQueryUtils.select("#xgxx", content2) for(Element elT: els){ - if(elT.text().contains("相关信息")){ + if(elT.text().contains("鐩稿叧淇℃伅")){ Element elDiv=elT.nextElementSibling() Elements elStrongs=elDiv.select(">strong"); for(Element el: elStrongs){ - if(el.text().trim().contains("占地面积")){ + if(el.text().trim().contains("鍗犲湴闈㈢Н")){ newDistrict.all_area= el.nextSibling().text().trim(); - }else if(el.text().trim().contains("建筑面积")){ + }else if(el.text().trim().contains("寤虹瓚闈㈢Н")){ newDistrict.build_area= el.nextSibling().text().trim(); - }else if(el.text().trim().contains("户 数")){ + }else if(el.text().trim().contains("鎴� 鏁�")){ matcher = pattern_household.matcher(el.nextSibling().text()) if(matcher.find()){ newDistrict.household_count=Integer.parseInt(matcher.group(1)); @@ -459,13 +459,13 @@ class SoufunRunNewDistrict implements Runnable { map.url="http://baocuiyuan020.soufun.com/" map.data=[:] map.data.content=InvokeHttpRequest.get(map.url, "gbk") - map.data.city="广州" + map.data.city="骞垮窞" SoufunRunNewDistrict runNewDistrict=new SoufunRunNewDistrict(map, new SpiderNewDistrict()); println runNewDistrict.doRun() println Charset.defaultCharset() - println new String("广州".getBytes("gbk"),"gbk") -// runNewDistrict.spiderContent("http://ruilimingdi.soufun.com/2/", "上海") -// println runNewDistrict.parsePrice("最低价24.2万元/套"); + println new String("骞垮窞".getBytes("gbk"),"gbk") +// runNewDistrict.spiderContent("http://ruilimingdi.soufun.com/2/", "涓婃捣") +// println runNewDistrict.parsePrice("鏈�浣庝环24.2涓囧厓/濂�"); // NewDistrict newDistrict=new NewDistrict() // Matcher matcher = pattern_date_1.matcher("2013-05-01") // if(matcher.find()){ @@ -481,10 +481,10 @@ class SoufunRunNewDistrict implements Runnable { // String newcode= matcher.group(1) // println newcode // } -// newDistrict.city="南京" +// newDistrict.city="鍗椾含" // println runNewDistrict.procHasDetailUrl("http://dongjiaoxiaozhen.soufun.com/house/1810068840/housedetail.htm",newDistrict); -// println ("住宅".matches(house_check_regex)) +// println ("浣忓畢".matches(house_check_regex)) } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/newDistrict/SpiderNewDistrict.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/newDistrict/SpiderNewDistrict.groovy index 19dc400d6..81c89133c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/newDistrict/SpiderNewDistrict.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/newDistrict/SpiderNewDistrict.groovy @@ -18,7 +18,7 @@ class SpiderNewDistrict { Mongo mongo67 = new Mongo("192.168.0.67", 27017) Mongo mongo136 = new Mongo("192.168.0.136", 27017) // - static def citys=["上海","杭州", "北京", "广州", "深圳", "天津", "南京", "西安", "成都", "武汉", "宁波", "青岛", "沈阳", "大连", "济南", "福州", "郑州", "长沙", "昆明", "厦门", "哈尔滨", "苏州", "无锡", "合肥", "太原", "石家庄", "南昌", "烟台", "佛山", "东莞", "温州", "绍兴", "常州", "南通", "珠海", "金华", "嘉兴", "昆山", "常熟", "萧山", "义乌", "余姚","慈溪","湖州","唐山","呼和浩特","中山","镇江","威海","东营","惠州","长春","扬州","泉州","大庆","徐州","盐城","江门","海口","汕头","南宁"]; + static def citys=["涓婃捣","鏉窞", "鍖椾含", "骞垮窞", "娣卞湷", "澶╂触", "鍗椾含", "瑗垮畨", "鎴愰兘", "姝︽眽", "瀹佹尝", "闈掑矝", "娌堥槼", "澶ц繛", "娴庡崡", "绂忓窞", "閮戝窞", "闀挎矙", "鏄嗘槑", "鍘﹂棬", "鍝堝皵婊�", "鑻忓窞", "鏃犻敗", "鍚堣偉", "澶師", "鐭冲搴�", "鍗楁槍", "鐑熷彴", "浣涘北", "涓滆帪", "娓╁窞", "缁嶅叴", "甯稿窞", "鍗楅��", "鐝犳捣", "閲戝崕", "鍢夊叴", "鏄嗗北", "甯哥啛", "钀у北", "涔変箤", "浣欏","鎱堟邯","婀栧窞","鍞愬北","鍛煎拰娴╃壒","涓北","闀囨睙","濞佹捣","涓滆惀","鎯犲窞","闀挎槬","鎵窞","娉夊窞","澶у簡","寰愬窞","鐩愬煄","姹熼棬","娴峰彛","姹曞ご","鍗楀畞"]; DBCollection new_districtDb=mongo136.getDB("fangjia").getCollection("new_district") // DBCollection new_districtSrc=mongo67.getDB("fangjia_crawl").getCollection("new_district_2") @@ -230,14 +230,14 @@ class SpiderNewDistrict { } void importAllCitys(){ - citys=["北京", "广州"] + citys=["鍖椾含", "骞垮窞"] for(def city: citys){ clearSeabirdNewDistrict(city) importSeabird(city) } - //统计新建小区数量 + //缁熻鏂板缓灏忓尯鏁伴噺 // int count=0 // DSCollection dsCollection = new DataStore("seaweed.db.fangjia.com").getCollection("fangjia.seabird") // for(def city: citys){ @@ -289,7 +289,7 @@ class SpiderNewDistrict { BasicDBObject queryParam=new BasicDBObject() queryParam.put("cat", "new_district") - queryParam.put("city", "上海") + queryParam.put("city", "涓婃捣") DBCursor dbCursor=null @@ -482,7 +482,7 @@ class SpiderNewDistrict { int countIndex=0 CrawlSoufunDistrictCoord crawlCoord=new CrawlSoufunDistrictCoord() - DBCursor cur=new_districtDb.find(DataUtil.map2DBObject([city:"大连", "lng" : 1209934847441])); + DBCursor cur=new_districtDb.find(DataUtil.map2DBObject([city:"澶ц繛", "lng" : 1209934847441])); println cur.count() cur.setOptions(Bytes.QUERYOPTION_NOTIMEOUT) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/openApi/ExportOpenLog.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/openApi/ExportOpenLog.groovy index 96709b19e..8c721c7a3 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/openApi/ExportOpenLog.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/openApi/ExportOpenLog.groovy @@ -25,7 +25,7 @@ class ExportOpenLog{ static DBCollection OPEN_URI_LOG_COLL = MongoUtils.getCollectionByName("business", "open_uri_log", "192.168.0.60"); static DBCollection OPEN_URI_ANALY_COLL = MongoUtils.getCollectionByName("business", "open_uri_analy", "mongo.db.fangjia.com"); - def citys = ["温州","济南","杭州","洛阳","安阳","新乡","焦作" ,"平顶山","许昌","南阳","开封","信阳","驻马店" ,"漯河","鹤壁" ,"周口","濮阳","三门峡","商丘","济源"] + def citys = ["娓╁窞","娴庡崡","鏉窞","娲涢槼","瀹夐槼","鏂颁埂","鐒︿綔" ,"骞抽《灞�","璁告槍","鍗楅槼","寮�灏�","淇¢槼","椹婚┈搴�" ,"婕渤","楣ゅ" ,"鍛ㄥ彛","婵槼","涓夐棬宄�","鍟嗕笜","娴庢簮"] static main(args) { def task = new ExportOpenLog(); task.run(); @@ -39,7 +39,7 @@ class ExportOpenLog{ //def startDate = DateUtils.parseFromTightYYYYMMDD(DateUtils.add(DateUtils.formatDateByPattern(endDate, "yyyy-MM-dd"), -7)); def ret = getUserVisitLog(1007474, startDate, endDate); ret = findDistricts(ret); - export(ret, "e:\\数据\\用户记录.xlsx"); + export(ret, "e:\\鏁版嵁\\鐢ㄦ埛璁板綍.xlsx"); } def findDistricts(def ret){ @@ -73,7 +73,7 @@ class ExportOpenLog{ for(def dbo : cursor){ index ++ ; - //url统计 + //url缁熻 def url = dbo.request_uri; if(url!="/house/search"){ continue; @@ -93,7 +93,7 @@ class ExportOpenLog{ map.msg = msg; map.cDate = cDate; map.params = params; - map.data_status = dbo.data_status;//0:无效 1:有 + map.data_status = dbo.data_status;//0:鏃犳晥 1:鏈� ret << map; } return ret; @@ -108,7 +108,7 @@ class ExportOpenLog{ def WORK_BOOK = null; try { if (file.exists()) { - FileInputStream fs=new FileInputStream(path); //获取d://test.xls + FileInputStream fs=new FileInputStream(path); //鑾峰彇d://test.xls WORK_BOOK = WorkbookFactory.create(fs) WORK_BOOK.setForceFormulaRecalculation(true) sheet = WORK_BOOK.getSheetAt(0); @@ -119,13 +119,13 @@ class ExportOpenLog{ SXSSFRow row0 = sheet.createRow(0); row0.createCell(0).setCellValue("url"); - row0.createCell(1).setCellValue("结果"); - row0.createCell(2).setCellValue("时间"); - row0.createCell(3).setCellValue("参数"); - row0.createCell(4).setCellValue("城市"); - row0.createCell(5).setCellValue("区域"); - row0.createCell(6).setCellValue("楼盘名称"); - row0.createCell(7).setCellValue("有无数据"); + row0.createCell(1).setCellValue("缁撴灉"); + row0.createCell(2).setCellValue("鏃堕棿"); + row0.createCell(3).setCellValue("鍙傛暟"); + row0.createCell(4).setCellValue("鍩庡競"); + row0.createCell(5).setCellValue("鍖哄煙"); + row0.createCell(6).setCellValue("妤肩洏鍚嶇О"); + row0.createCell(7).setCellValue("鏈夋棤鏁版嵁"); def rowNum = 1; for(def i=1;i -1) { if(dbo.parameter_map && dbo.parameter_map.serviceCode) { @@ -135,16 +135,16 @@ class OpenApiLogAnalyBatch extends BaseBatch{ city = paramMap.city; } - //城市统计 + //鍩庡競缁熻 if(city){ if(city.length()>=20){ - city = "其它"; + city = "鍏跺畠"; } def cityFlag = isRightCity(city); if(!cityFlag){ - city = "其它"; + city = "鍏跺畠"; } def cityMap = detailMap.get("city_map") @@ -160,7 +160,7 @@ class OpenApiLogAnalyBatch extends BaseBatch{ } } - //返回代码统计 + //杩斿洖浠g爜缁熻 def code = dbo.code; if(!code){ code = -100; @@ -177,7 +177,7 @@ class OpenApiLogAnalyBatch extends BaseBatch{ codeMap.put(code.toString(), 1) } - //请求时间统计 + //璇锋眰鏃堕棿缁熻 def timeMap = detailMap.get("time_map") if(!timeMap){ timeMap = [:]; @@ -288,12 +288,12 @@ class OpenApiLogAnalyBatch extends BaseBatch{ q.put("user_id","1007505"); def cursor = OPEN_URI_ANALY_COLL.find(q); - File file = new File("e:\\民生Api访问统计.csv"); + File file = new File("e:\\姘戠敓Api璁块棶缁熻.csv"); if (file.exists()){ file.delete(); } - file.append("时间,") - file.append("访问次数,") + file.append("鏃堕棿,") + file.append("璁块棶娆℃暟,") file.append(System.getProperty("line.separator")); cursor.each{ def stat_date = it.stat_date; @@ -329,12 +329,12 @@ class OpenApiLogAnalyBatch extends BaseBatch{ - File file = new File("e:\\平安Api访问统计.csv"); + File file = new File("e:\\骞冲畨Api璁块棶缁熻.csv"); if (file.exists()){ file.delete(); } - file.append("时间,") - file.append("访问次数,") + file.append("鏃堕棿,") + file.append("璁块棶娆℃暟,") file.append(System.getProperty("line.separator")); ret.each{ file.append(it[0] + ",","gbk") diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/otherhouse/HouseExport.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/otherhouse/HouseExport.groovy index 9b08660dd..43fa07878 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/otherhouse/HouseExport.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/otherhouse/HouseExport.groovy @@ -26,34 +26,34 @@ import com.fangjia.script.BaseBatch import com.fangjia.script.BatchOwner import com.fangjia.script.Watcher /** - * 导入房途网的房源,以天为单位 + * 瀵煎叆鎴块�旂綉鐨勬埧婧愶紝浠ュぉ涓哄崟浣� * @author gaojuan */ @BatchOwner(Watcher.GaoJuan) class HouseExport extends BaseBatch{ /*** - * 调用入口 + * 璋冪敤鍏ュ彛 */ public final static String APP_URL = "http://122.224.142.155:8080/router/rest"; /*** - * 应用密钥,518颁发的唯一标识号,调用API的时候需要使用 + * 搴旂敤瀵嗛挜锛�518棰佸彂鐨勫敮涓�鏍囪瘑鍙凤紝璋冪敤API鐨勬椂鍊欓渶瑕佷娇鐢� */ public final static String APP_KEY = "1031"; /*** - * 证书密钥,518颁发,用于签名加密 + * 璇佷功瀵嗛挜锛�518棰佸彂,鐢ㄤ簬绛惧悕鍔犲瘑 */ public final static String APP_SERCET = "gxPTXLnkI0Q4aSqV0P4G68kNx8sw15"; - public def directionMap = [66:"东南",76:"正东",77:"正西",126:"南北",127:"正南",128:"正北",129:"东西",130:"西南",131:"东北",132:"西北",325:"未知"]; - public def estateTypeMap = [78:"农居房",142:"商铺",143:"写字楼",144:"别墅",146:"排屋",147:"公寓(小区房)",306:"其他",384:"单身公寓"]; - public def fitmentMap = [67:"简装",120:"毛坯",121:"精装",122:"中装",389:"其它装修",458:"豪装"] - public def rentTypeMap = [98:"整租",111:"合租 "] - public def unitPriceMap = [352:"元/平米/天",353:"元/月",457:"元/平米/月"] - public def cityMap = [3101:"上海"]; + public def directionMap = [66:"涓滃崡",76:"姝d笢",77:"姝hタ",126:"鍗楀寳",127:"姝e崡",128:"姝e寳",129:"涓滆タ",130:"瑗垮崡",131:"涓滃寳",132:"瑗垮寳",325:"鏈煡"]; + public def estateTypeMap = [78:"鍐滃眳鎴�",142:"鍟嗛摵",143:"鍐欏瓧妤�",144:"鍒",146:"鎺掑眿",147:"鍏瘬(灏忓尯鎴�)",306:"鍏朵粬",384:"鍗曡韩鍏瘬"]; + public def fitmentMap = [67:"绠�瑁�",120:"姣涘澂",121:"绮捐",122:"涓",389:"鍏跺畠瑁呬慨",458:"璞"] + public def rentTypeMap = [98:"鏁寸",111:"鍚堢 "] + public def unitPriceMap = [352:"鍏�/骞崇背/澶�",353:"鍏�/鏈�",457:"鍏�/骞崇背/鏈�"] + public def cityMap = [3101:"涓婃捣"]; public def cityDistrictMap = [:]; public def regionMap = [:]; public static final def ONLINE_CITY = [] @@ -98,7 +98,7 @@ class HouseExport extends BaseBatch{ }else{ houseId = parseHouse(doc, city); if(houseId > 0){ - writeTxt(path, houseId.toString());//记录最大的房源id + writeTxt(path, houseId.toString());//璁板綍鏈�澶х殑鎴挎簮id } } } @@ -148,10 +148,10 @@ class HouseExport extends BaseBatch{ obj.avg_price = house.price.toInteger(); obj.total_price = (obj.avg_price * obj.area).toInteger(); } - def estateType = estateTypeMap.get(house.houKind);//房源类型 - if(estateType == "商铺"){ + def estateType = estateTypeMap.get(house.houKind);//鎴挎簮绫诲瀷 + if(estateType == "鍟嗛摵"){ obj.cat = "shop_"+obj.cat; - }else if(estateType == "写字楼"){ + }else if(estateType == "鍐欏瓧妤�"){ obj.cat = "office_"+obj.cat; } def unit = unitPriceMap.get(house.unitId); @@ -167,7 +167,7 @@ class HouseExport extends BaseBatch{ obj.room = house.roomCount; obj.hall = house.hollCount - obj.toilet = house.looCount;//卫生间 + obj.toilet = house.looCount;//鍗敓闂� obj.area = house.area.toDouble(); obj.floor = house.floor; @@ -181,7 +181,7 @@ class HouseExport extends BaseBatch{ obj.pics = getImages(images); obj.url = "fangjia.com"; - obj.source = "房途网"; + obj.source = "鎴块�旂綉"; obj.c_date = formateLongToDate(house.createTime.toString()); obj.m_date = formateLongToDate(house.lastModify.toString()); if(obj.m_date){ @@ -213,7 +213,7 @@ class HouseExport extends BaseBatch{ code = ShopSellDataFilter.isAviable(obj) } - //code小于12的选项为必填字段 + //code灏忎簬12鐨勯�夐」涓哄繀濉瓧娈� if(code == 0) { obj.put("status", 0) if(ONLINE_CITY.contains(city)) { @@ -226,9 +226,9 @@ class HouseExport extends BaseBatch{ query.put("area", obj.area); query.put("floor", obj.floor); DBObject relatedObj = DS_ONLINE_COLL.findOne(query, new BasicDBObject('_id', 1)); - if(relatedObj == null) {//没有备份,说明未被发布过,应新增 + if(relatedObj == null) {//娌℃湁澶囦唤锛岃鏄庢湭琚彂甯冭繃锛屽簲鏂板 saveToData(obj) - }else{//更新 + }else{//鏇存柊 String relateId = null; try { if(relatedObj != null) { @@ -262,9 +262,9 @@ class HouseExport extends BaseBatch{ } def getPaymentPattern(leasePayway, bail){ if(leasePayway>0 && bail >0){ - return "付"+leasePayway+"押"+bail; + return "浠�"+leasePayway+"鎶�"+bail; } - return "面议"; + return "闈㈣"; } @@ -287,7 +287,7 @@ class HouseExport extends BaseBatch{ } - //房源类型 + //鎴挎簮绫诲瀷 def getHouseCategory(def houseType){ if(houseType == 0){ return "sell"; @@ -296,14 +296,14 @@ class HouseExport extends BaseBatch{ } } - //转换时间 + //杞崲鏃堕棿 def formateLongToDate(String dateStr){ long date=Long.parseLong(dateStr); Date de=new Date(date); return de; } - //获取最后一次保存的房源id + //鑾峰彇鏈�鍚庝竴娆′繚瀛樼殑鎴挎簮id def getNewestHouseId(path){ def houseId = readTxt(path); if(houseId){ @@ -312,7 +312,7 @@ class HouseExport extends BaseBatch{ return 1; } - //读取记录最后一次保存房源id的文件 + //璇诲彇璁板綍鏈�鍚庝竴娆′繚瀛樻埧婧恑d鐨勬枃浠� def readTxt(path){ File file = new File(path); def houseId = 0; @@ -330,7 +330,7 @@ class HouseExport extends BaseBatch{ FileUtils.writeStringToFile(new File(path), houseId); } - //初始化小区:填充房源地址 初始化区域:规范区域 + //鍒濆鍖栧皬鍖猴細濉厖鎴挎簮鍦板潃 鍒濆鍖栧尯鍩燂細瑙勮寖鍖哄煙 def initCityDistrictAndRegionMap(def city){ cityDistrictMap = getAllDistricts(city, "district"); regionMap = findRegion(city); @@ -414,7 +414,7 @@ class HouseExport extends BaseBatch{ return lastRegion; } - //备份房源数据到40和61 + //澶囦唤鎴挎簮鏁版嵁鍒�40鍜�61 private void saveToData(DBObject dbo) { dbo.removeField("filter_code") long lstart = System.currentTimeMillis(); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/otherhouse/Util.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/otherhouse/Util.groovy index bfa6f0212..deef2d2f7 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/otherhouse/Util.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/otherhouse/Util.groovy @@ -17,8 +17,8 @@ import java.util.TreeMap; class Util { /** - * md5签名 - * @param secret 分配给您的APP_SECRET + * md5绛惧悕 + * @param secret 鍒嗛厤缁欐偍鐨凙PP_SECRET */ public static String md5Signature(TreeMap params, String secret) { String result = null; @@ -36,7 +36,7 @@ class Util { } /** - * 二行制转字符串 + * 浜岃鍒惰浆瀛楃涓� */ private static String byte2hex(byte[] b) { @@ -54,7 +54,7 @@ class Util { } /** - * 添加参数的封装方法 + * 娣诲姞鍙傛暟鐨勫皝瑁呮柟娉� */ private static StringBuffer getBeforeSign(TreeMap params, StringBuffer orgin) { if (params == null) @@ -71,12 +71,12 @@ class Util { /*** - * 提交 + * 鎻愪氦 * @param apiparamsMap * @return */ public static String post(String urlStr, String appkey, String appSecret, String method, TreeMap apiparamsMap){ - //---- 系统参数---- + //---- 绯荤粺鍙傛暟---- apiparamsMap.put("format", "xml"); apiparamsMap.put("method", method); apiparamsMap.put("appkey" , appkey); @@ -85,7 +85,7 @@ class Util { apiparamsMap.put("sign", Util.md5Signature(apiparamsMap,appSecret)); String content = postData(apiparamsMap); - //---- 完成 HTTP POST 请求---- + //---- 瀹屾垚 HTTP POST 璇锋眰---- URL url = null; HttpURLConnection connection = null; try { @@ -119,7 +119,7 @@ class Util { } /*** - * 组装提交参数 + * 缁勮鎻愪氦鍙傛暟 * @param apiparamsMap * @return * @throws UnsupportedEncodingException @@ -151,7 +151,7 @@ class Util { conn.setRequestMethod("GET"); conn.doOutput = true inputStream = conn.getInputStream(); - BufferedReader buf = new BufferedReader(new InputStreamReader(inputStream,"UTF-8"));// 创建UTF-8的BufferedReader + BufferedReader buf = new BufferedReader(new InputStreamReader(inputStream,"UTF-8"));// 鍒涘缓UTF-8鐨凚ufferedReader while((line = buf.readLine())!=null){ sb.append(line); } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/pageClick/PageClickBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/pageClick/PageClickBatch.groovy index d1d95bf15..41d1d9a24 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/pageClick/PageClickBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/pageClick/PageClickBatch.groovy @@ -61,7 +61,7 @@ class PageClickBatch extends BaseBatch { def analyticsLog() { def percent = (((double)pageClickDetailLogMap.size() / (double)utmGifLogMap.size()) * 100).toInteger(); - outputString.append("总点击量/总访问量: ${pageClickDetailLogMap.size()}/${utmGifLogMap.size()} = ${percent}%").append("\n") + outputString.append("鎬荤偣鍑婚噺/鎬昏闂噺: ${pageClickDetailLogMap.size()}/${utmGifLogMap.size()} = ${percent}%").append("\n") def ppMap = [:] pageClickDetailLogMap.each() {id, obj-> def pageNumber = obj['page_number'].toInteger() @@ -83,7 +83,7 @@ class PageClickBatch extends BaseBatch { if(i <= 60) { def pageNumber = pp.split("-")[0].toInteger() def position = pp.split("-")[1].toInteger() - outputString.append("第${pageNumber}页 第${position}条 点击${c}次").append("\n") + outputString.append("绗�${pageNumber}椤� 绗�${position}鏉� 鐐瑰嚮${c}娆�").append("\n") } } } @@ -149,11 +149,11 @@ class PageClickBatch extends BaseBatch { } static { - REF_PATT_MAP['百度'] = Pattern.compile('http://www.baidu.com/(.*)+$') + REF_PATT_MAP['鐧惧害'] = Pattern.compile('http://www.baidu.com/(.*)+$') REF_PATT_MAP['google'] = Pattern.compile('http://www.google/(.*)+$') - REF_PATT_MAP['首页'] = Pattern.compile('http://(.*).fangjia.com(/)?$') - REF_PATT_MAP['详情页'] = Pattern.compile('http://(.*).fangjia.com/ershoufang-xinxi-(\\w)+(#)?$') - REF_PATT_MAP['小区'] = Pattern.compile('http://(.*).fangjia.com/xiaoqu.*') - REF_PATT_MAP['SEO页'] = Pattern.compile('http://sou.fangjia.com/xinxi/(.*)$') + REF_PATT_MAP['棣栭〉'] = Pattern.compile('http://(.*).fangjia.com(/)?$') + REF_PATT_MAP['璇︽儏椤�'] = Pattern.compile('http://(.*).fangjia.com/ershoufang-xinxi-(\\w)+(#)?$') + REF_PATT_MAP['灏忓尯'] = Pattern.compile('http://(.*).fangjia.com/xiaoqu.*') + REF_PATT_MAP['SEO椤�'] = Pattern.compile('http://sou.fangjia.com/xinxi/(.*)$') } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/pageClick/PageClickCountBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/pageClick/PageClickCountBatch.groovy index d01593859..42561deff 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/pageClick/PageClickCountBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/pageClick/PageClickCountBatch.groovy @@ -22,27 +22,27 @@ class PageClickCountBatch extends BaseBatch { final static def DATE_PATTERN = "yyyy-MM-dd" /** - * 模块(表中的channel):模块说明 + * 妯″潡(琛ㄤ腑鐨刢hannel)锛氭ā鍧楄鏄� */ final static def MODULE_DISPLAY_MAP = [:] /** - * 模块(表中的channel):所属频道 + * 妯″潡(琛ㄤ腑鐨刢hannel)锛氭墍灞為閬� */ final static def MODULE_CHANNEL_MAP = [:] /** - * 各频道url正则 + * 鍚勯閬搖rl姝e垯 */ final static def CHANNEL_PATTERN = [:] /** - * 各频道名称 + * 鍚勯閬撳悕绉� */ final static def CHANNEL_DISPLAY = [:] /** - * 基础正则,判断url是否是自己网站的 + * 鍩虹姝e垯锛屽垽鏂璾rl鏄惁鏄嚜宸辩綉绔欑殑 */ final static def BASE_PATTERN = ~"http://([a-z]+)\\.fangjia\\.com/.*" @@ -51,7 +51,7 @@ class PageClickCountBatch extends BaseBatch { } public void process(Object args) { - // 初始化页面模块的设置 + // 鍒濆鍖栭〉闈㈡ā鍧楃殑璁剧疆 DBCursor pageCur = pageCollection.find() while (pageCur.hasNext()) { def page = pageCur.next() @@ -73,15 +73,15 @@ class PageClickCountBatch extends BaseBatch { def startDate = null; - // 从统计表中取得最新的统计日期 + // 浠庣粺璁¤〃涓彇寰楁渶鏂扮殑缁熻鏃ユ湡 def maxDateCur = pcdcCollection.find(new BasicDBObject(), new BasicDBObject('day', 1)).sort(new BasicDBObject('day', -1)).limit(1) if (maxDateCur.hasNext()) { startDate = maxDateCur.next().day + 1 } - // 统计表中无数据时 + // 缁熻琛ㄤ腑鏃犳暟鎹椂 if (null == startDate) { - // 从日志表里取得最早的日期开始统计 + // 浠庢棩蹇楄〃閲屽彇寰楁渶鏃╃殑鏃ユ湡寮�濮嬬粺璁� // def minDateCur = pcdlCollection.find(new BasicDBObject(), new BasicDBObject('c_date', 1)).sort(new BasicDBObject('c_date', 1)).limit(1) // if (minDateCur.hasNext()) { // startDate = DateUtil.truncateDay(minDateCur.next().c_date) @@ -91,7 +91,7 @@ class PageClickCountBatch extends BaseBatch { println 'Start with ' + DateUtil.formatByPattern(startDate, DATE_PATTERN) - // 查询还未统计过的点击记录 + // 鏌ヨ杩樻湭缁熻杩囩殑鐐瑰嚮璁板綍 DBObject fields = new BasicDBObject() fields.put('c_date', 1) fields.put('channel', 1) @@ -100,7 +100,7 @@ class PageClickCountBatch extends BaseBatch { while (startDate.before(now)) { println 'processing with ' + DateUtil.formatByPattern(startDate, DATE_PATTERN) - // 获取当天的各频道访问量 + // 鑾峰彇褰撳ぉ鐨勫悇棰戦亾璁块棶閲� def channelVisits = getChannelVisits(startDate) def day = startDate @@ -113,7 +113,7 @@ class PageClickCountBatch extends BaseBatch { continue } - // 按频道和日期分类 + // 鎸夐閬撳拰鏃ユ湡鍒嗙被 def ret = [:] while (clickCur.hasNext()) { def obj = clickCur.next() @@ -129,10 +129,10 @@ class PageClickCountBatch extends BaseBatch { } } - // 写入最终统计表 + // 鍐欏叆鏈�缁堢粺璁¤〃 def insertList = [] for (def key : ret.keySet()) { - def channel = key.split('\\,')[0] // 模块channel + def channel = key.split('\\,')[0] // 妯″潡channel def display = MODULE_DISPLAY_MAP.get(channel) def obj = new BasicDBObject() @@ -159,9 +159,9 @@ class PageClickCountBatch extends BaseBatch { } /** - * 获取页面1天内的访问量 + * 鑾峰彇椤甸潰1澶╁唴鐨勮闂噺 * @param startDate - * @return 频道id:浏览量 + * @return 棰戦亾id锛氭祻瑙堥噺 */ private def getChannelVisits(startDate) { DBObject query = new BasicDBObject() @@ -175,7 +175,7 @@ class PageClickCountBatch extends BaseBatch { continue } - // 不是xxx.fangjia.com开头的url,直接跳过 + // 涓嶆槸xxx.fangjia.com寮�澶寸殑url锛岀洿鎺ヨ烦杩� def matcher = BASE_PATTERN.matcher(requestUrl) if (!matcher.matches()) { continue @@ -183,7 +183,7 @@ class PageClickCountBatch extends BaseBatch { def matched = false for (def channel : CHANNEL_PATTERN.keySet()) { - // 当前url已匹配到频道 + // 褰撳墠url宸插尮閰嶅埌棰戦亾 if (matched) { break } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/pds/AgencyCityLevelBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/pds/AgencyCityLevelBatch.groovy index 7791c1708..3be9acccd 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/pds/AgencyCityLevelBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/pds/AgencyCityLevelBatch.groovy @@ -15,7 +15,7 @@ import com.mongodb.DBCursor import java.util.concurrent.ConcurrentHashMap /** - * 小区附近中介数在城市排名 + * 灏忓尯闄勮繎涓粙鏁板湪鍩庡競鎺掑悕 * @author yinjihuan * */ @@ -31,14 +31,14 @@ class AgencyCityLevelBatch extends BaseBatch { @Override public void process(Object args) { loadData() - println "开始统计小区附近中介数在城市排名" + println "寮�濮嬬粺璁″皬鍖洪檮杩戜腑浠嬫暟鍦ㄥ煄甯傛帓鍚�" agency_mount_level_coll.remove(new BasicDBObject("date", getBeforeMonth(-1))) stat() setLevel() } /** - * 设置排名 + * 璁剧疆鎺掑悕 * @return */ def setLevel() { @@ -57,7 +57,7 @@ class AgencyCityLevelBatch extends BaseBatch { data.mom_city_level = index agency_mount_level_coll.save(data) } - //设置中介数量为0的排名为当前最后一位 + //璁剧疆涓粙鏁伴噺涓�0鐨勬帓鍚嶄负褰撳墠鏈�鍚庝竴浣� def q = new BasicDBObject("date", getBeforeMonth(-1)).append("city", city).append("agency_mount", 0) agency_mount_level_coll.update(q , new BasicDBObject('$set', new BasicDBObject('mom_city_level', index + 1)), false, true) agency_mount_level_coll.update(new BasicDBObject("date", getBeforeMonth(-1)).append("city", city) , new BasicDBObject('$set', new BasicDBObject('city_size', index + 1)), false, true) @@ -104,7 +104,7 @@ class AgencyCityLevelBatch extends BaseBatch { } /** - * 根据参数获取月份 + * 鏍规嵁鍙傛暟鑾峰彇鏈堜唤 * @param num * @return */ @@ -115,7 +115,7 @@ class AgencyCityLevelBatch extends BaseBatch { } /** - * 获取小区周边中介数据 + * 鑾峰彇灏忓尯鍛ㄨ竟涓粙鏁版嵁 * @param city * @param lng * @param lat @@ -131,9 +131,9 @@ class AgencyCityLevelBatch extends BaseBatch { double dis = GeoUtils.calculateDistance(lng, lat, Double.parseDouble(data.lng), Double.parseDouble(data.lat)) if (dis <= 1000) { agency_mount++ - if (data.level.toString().equals("普通中介")) { + if (data.level.toString().equals("鏅�氫腑浠�")) { other_agency++ - } else if(data.level.toString().equals("知名中介")) { + } else if(data.level.toString().equals("鐭ュ悕涓粙")) { famous_agency++ } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/pds/CPDBAvgGrowthRateBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/pds/CPDBAvgGrowthRateBatch.groovy index 5107646d1..68843b655 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/pds/CPDBAvgGrowthRateBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/pds/CPDBAvgGrowthRateBatch.groovy @@ -12,7 +12,7 @@ import com.mongodb.DBCollection import net.sf.json.JSONObject /** - * cpdb抵押品库中平均增长率排名(按月全部) + * cpdb鎶垫娂鍝佸簱涓钩鍧囧闀跨巼鎺掑悕锛堟寜鏈堝叏閮級 * @author yinjihuan * */ @@ -32,7 +32,7 @@ class CPDBAvgGrowthRateBatch extends BaseBatch { @Override public void process(Object args) { -// println "开始统计cpdb抵押品库中平均增长率排名" +// println "寮�濮嬬粺璁pdb鎶垫娂鍝佸簱涓钩鍧囧闀跨巼鎺掑悕" // cpdb_price_coll.remove(new BasicDBObject("date", getBeforeMonth(-1))) // stat() } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/pds/CopyOfPdsHouseScoreCityLevelBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/pds/CopyOfPdsHouseScoreCityLevelBatch.groovy index b83659e2c..630361c86 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/pds/CopyOfPdsHouseScoreCityLevelBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/pds/CopyOfPdsHouseScoreCityLevelBatch.groovy @@ -25,38 +25,38 @@ import com.mongodb.DBObject @BatchOwner(Watcher.Hubingliang) class CopyOfPdsHouseScoreCityLevelBatch extends BaseBatch { public static final DBCollection pdsHousescorecitylevel = MongoUtils.getCollectionByName("fangjia_stat", "pds.city_score_level", "mongo.db.fangjia.com", 27017) - private static final String[] str1 = ["上海","北京","深圳","杭州","舟山","丽水","宁波","温州","嘉兴","台州","湖州","衢州","绍兴","金华","淮南","阜阳","黄山","亳州","安庆","六安", "淮北","宣城","宿州","池州"] + private static final String[] str1 = ["涓婃捣","鍖椾含","娣卞湷","鏉窞","鑸熷北","涓芥按","瀹佹尝","娓╁窞","鍢夊叴","鍙板窞","婀栧窞","琛㈠窞","缁嶅叴","閲戝崕","娣崡","闃滈槼","榛勫北","浜冲窞","瀹夊簡","鍏畨", "娣寳","瀹e煄","瀹垮窞","姹犲窞"] - private static final String[] str2 = ["汕尾","广州","佛山","东莞","中山","湛江","惠州","清远","江门","珠海","汕头","揭阳","茂名","云浮","肇庆","潮州","梅州","阳江","韶关","河源", "钦州", - "梧州","百色","贵港","贺州","来宾","河池","防城港","崇左","南宁","桂林","北海","柳州","玉林","重庆","黔南","遵义","安顺","铜仁","毕节","黔西南","黔东南"] + private static final String[] str2 = ["姹曞熬","骞垮窞","浣涘北","涓滆帪","涓北","婀涙睙","鎯犲窞","娓呰繙","姹熼棬","鐝犳捣","姹曞ご","鎻槼","鑼傚悕","浜戞诞","鑲囧簡","娼窞","姊呭窞","闃虫睙","闊跺叧","娌虫簮", "閽﹀窞", + "姊у窞","鐧捐壊","璐垫腐","璐哄窞","鏉ュ","娌虫睜","闃插煄娓�","宕囧乏","鍗楀畞","妗傛灄","鍖楁捣","鏌冲窞","鐜夋灄","閲嶅簡","榛斿崡","閬典箟","瀹夐『","閾滀粊","姣曡妭","榛旇タ鍗�","榛斾笢鍗�"] - private static final String[] str3 = ["廊坊","保定","秦皇岛","齐齐哈尔","佳木斯","双鸭山","绥化","鸡西","七台河","鹤岗","黑河","伊春","大兴安岭","哈尔滨","大庆","牡丹江","安阳","许昌","南阳", - "开封","漯河","鹤壁","周口","濮阳","三门峡","商丘","信阳","驻马店","郑州"] + private static final String[] str3 = ["寤婂潑","淇濆畾","绉︾殗宀�","榻愰綈鍝堝皵","浣虫湪鏂�","鍙岄腑灞�","缁ュ寲","楦¤タ","涓冨彴娌�","楣ゅ矖","榛戞渤","浼婃槬","澶у叴瀹夊箔","鍝堝皵婊�","澶у簡","鐗′腹姹�","瀹夐槼","璁告槍","鍗楅槼", + "寮�灏�","婕渤","楣ゅ","鍛ㄥ彛","婵槼","涓夐棬宄�","鍟嗕笜","淇¢槼","椹婚┈搴�","閮戝窞"] - private static final String[] str4 = ["湘潭","张家界","衡阳","淮安","南京","苏州","无锡","扬州","常州","徐州","镇江","南通","泰州","宿迁","连云港","盐城","吉安","景德镇","鹰潭","新余","上饶","宜春", - "萍乡","抚州","南昌","赣州","九江","四平","辽源","白山","白城","通化"] + private static final String[] str4 = ["婀樻江","寮犲鐣�","琛¢槼","娣畨","鍗椾含","鑻忓窞","鏃犻敗","鎵窞","甯稿窞","寰愬窞","闀囨睙","鍗楅��","娉板窞","瀹胯縼","杩炰簯娓�","鐩愬煄","鍚夊畨","鏅痉闀�","楣版江","鏂颁綑","涓婇ザ","瀹滄槬", + "钀嶄埂","鎶氬窞","鍗楁槍","璧e窞","涔濇睙","鍥涘钩","杈芥簮","鐧藉北","鐧藉煄","閫氬寲"] - private static final String[] str5 = ["石嘴山","银川","海东","海北州","黄南州","海南州","果洛州","玉树州","海西州","西宁","临沂","泰安","菏泽","济宁","日照","聊城","滨州","枣庄","莱芜","东营","德州","济南", - "青岛","威海","烟台","潍坊","淄博"] + private static final String[] str5 = ["鐭冲槾灞�","閾跺窛","娴蜂笢","娴峰寳宸�","榛勫崡宸�","娴峰崡宸�","鏋滄礇宸�","鐜夋爲宸�","娴疯タ宸�","瑗垮畞","涓存矀","娉板畨","鑿忔辰","娴庡畞","鏃ョ収","鑱婂煄","婊ㄥ窞","鏋e簞","鑾辫姕","涓滆惀","寰峰窞","娴庡崡", + "闈掑矝","濞佹捣","鐑熷彴","娼嶅潑","娣勫崥"] - private static final String[] str6 = ["乐山","南充","泸州","资阳","内江","达州","巴中","遂宁","眉山","德阳","广安","阿坝州","凉山州","甘孜州","成都","绵阳","宜宾","自贡","攀枝花","吐鲁番","哈密","和田", - "昌吉","阿勒泰","博尔塔拉","巴音郭楞","克孜勒苏","伊犁","阿克苏","克拉玛依","喀什","塔城","乌鲁木齐","石河子","阿拉尔","图木舒克","五家渠","昌都","日喀则","山南","那曲","阿里", - "林芝","拉萨"] + private static final String[] str6 = ["涔愬北","鍗楀厖","娉稿窞","璧勯槼","鍐呮睙","杈惧窞","宸翠腑","閬傚畞","鐪夊北","寰烽槼","骞垮畨","闃垮潩宸�","鍑夊北宸�","鐢樺瓬宸�","鎴愰兘","缁甸槼","瀹滃","鑷础","鏀�鏋濊姳","鍚愰瞾鐣�","鍝堝瘑","鍜岀敯", + "鏄屽悏","闃垮嫆娉�","鍗氬皵濉旀媺","宸撮煶閮","鍏嬪瓬鍕掕嫃","浼婄妬","闃垮厠鑻�","鍏嬫媺鐜涗緷","鍠�浠�","濉斿煄","涔岄瞾鏈ㄩ綈","鐭虫渤瀛�","闃挎媺灏�","鍥炬湪鑸掑厠","浜斿娓�","鏄岄兘","鏃ュ杸鍒�","灞卞崡","閭f洸","闃块噷", + "鏋楄姖","鎷夎惃"] - private static final String[] str7 = ["蚌埠","滁州","铜陵","合肥","芜湖","马鞍山","天津","宁德","南平","三明","龙岩","漳州","福州","厦门","泉州","莆田","武威","天水","定西","平凉","白银","酒泉","张掖", - "嘉峪关","庆阳","金昌","陇南","临夏","甘南","兰州"] + private static final String[] str7 = ["铓屽煚","婊佸窞","閾滈櫟","鍚堣偉","鑺滄箹","椹瀺灞�","澶╂触","瀹佸痉","鍗楀钩","涓夋槑","榫欏博","婕冲窞","绂忓窞","鍘﹂棬","娉夊窞","鑾嗙敯","姝﹀▉","澶╂按","瀹氳タ","骞冲噳","鐧介摱","閰掓硥","寮犳帠", + "鍢夊唱鍏�","搴嗛槼","閲戞槍","闄囧崡","涓村","鐢樺崡","鍏板窞"] - private static final String[] str8 = ["贵阳","六盘水","三沙","三亚","海口","五指山","琼海","儋州", "文昌","万宁","东方","定安","屯昌","澄迈","临高","白沙","昌江","乐东","陵水","保亭","琼中", - "张家口","衡水","邢台","承德","沧州","石家庄","唐山","邯郸"] + private static final String[] str8 = ["璐甸槼","鍏洏姘�","涓夋矙","涓変簹","娴峰彛","浜旀寚灞�","鐞兼捣","鍎嬪窞", "鏂囨槍","涓囧畞","涓滄柟","瀹氬畨","灞槍","婢勮繄","涓撮珮","鐧芥矙","鏄屾睙","涔愪笢","闄垫按","淇濅涵","鐞间腑", + "寮犲鍙�","琛℃按","閭㈠彴","鎵垮痉","娌у窞","鐭冲搴�","鍞愬北","閭兏"] - private static final String[] str9 = ["洛阳","平顶山","新乡","焦作","济源","黄冈","鄂州","十堰","随州","孝感","荆州","咸宁","荆门","恩施","武汉","襄阳","宜昌","黄石","仙桃","潜江","天门","神农架", - "常德","岳阳","怀化","郴州","益阳","永州","娄底","湘西","邵阳","长沙","株洲"] + private static final String[] str9 = ["娲涢槼","骞抽《灞�","鏂颁埂","鐒︿綔","娴庢簮","榛勫唸","閯傚窞","鍗佸牥","闅忓窞","瀛濇劅","鑽嗗窞","鍜稿畞","鑽嗛棬","鎭╂柦","姝︽眽","瑗勯槼","瀹滄槍","榛勭煶","浠欐","娼滄睙","澶╅棬","绁炲啘鏋�", + "甯稿痉","宀抽槼","鎬�鍖�","閮村窞","鐩婇槼","姘稿窞","濞勫簳","婀樿タ","閭甸槼","闀挎矙","鏍床"] - private static final String[] str10 = ["松原","延边","长春","吉林","铁岭","锦州","朝阳","阜新","抚顺","葫芦岛","辽阳","沈阳","大连","鞍山","丹东","本溪","营口","盘锦","包头","赤峰","兴安盟","锡林郭勒盟", - "阿拉善盟","鄂尔多斯","乌海","乌兰察布","通辽","巴彦淖尔","呼伦贝尔","呼和浩特","中卫","固原","吴忠"] + private static final String[] str10 = ["鏉惧師","寤惰竟","闀挎槬","鍚夋灄","閾佸箔","閿﹀窞","鏈濋槼","闃滄柊","鎶氶『","钁姦宀�","杈介槼","娌堥槼","澶ц繛","闉嶅北","涓逛笢","鏈邯","钀ュ彛","鐩橀敠","鍖呭ご","璧ゅ嘲","鍏村畨鐩�","閿℃灄閮嫆鐩�", + "闃挎媺鍠勭洘","閯傚皵澶氭柉","涔屾捣","涔屽叞瀵熷竷","閫氳窘","宸村溅娣栧皵","鍛间鸡璐濆皵","鍛煎拰娴╃壒","涓崼","鍥哄師","鍚村繝"] - private static final String[] str11 = ["大同","临汾","朔州","晋城","忻州","晋中","阳泉","运城","长治","吕梁","太原","文山州","红河","临沧","保山","昭通","普洱","楚雄","怒江州","迪庆州","西双版纳州","德宏州", - "昆明","丽江","大理","玉溪","曲靖","榆林","汉中","安康","商洛","宝鸡","渭南","铜川","西安","咸阳","延安","广元"] + private static final String[] str11 = ["澶у悓","涓存本","鏈斿窞","鏅嬪煄","蹇诲窞","鏅嬩腑","闃虫硥","杩愬煄","闀挎不","鍚曟","澶師","鏂囧北宸�","绾㈡渤","涓存钵","淇濆北","鏄��","鏅幢","妤氶泟","鎬掓睙宸�","杩簡宸�","瑗垮弻鐗堢撼宸�","寰峰畯宸�", + "鏄嗘槑","涓芥睙","澶х悊","鐜夋邯","鏇查潠","姒嗘灄","姹変腑","瀹夊悍","鍟嗘礇","瀹濋浮","娓崡","閾滃窛","瑗垮畨","鍜搁槼","寤跺畨","骞垮厓"] public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(11) static main(args) { @@ -70,7 +70,7 @@ class CopyOfPdsHouseScoreCityLevelBatch extends BaseBatch { } public static void multThread(){ - println search("上海","浦东","沙田公寓"); + println search("涓婃捣","娴︿笢","娌欑敯鍏瘬"); /*fixedThreadPool.submit(new Runnable() { public void run() { getCityScore(str1) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/pds/HouseLoudongAnaBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/pds/HouseLoudongAnaBatch.groovy index f6ce17295..6da27a39f 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/pds/HouseLoudongAnaBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/pds/HouseLoudongAnaBatch.groovy @@ -17,7 +17,7 @@ import java.util.concurrent.Executors import java.util.concurrent.Semaphore /** - * 房产分析 + * 鎴夸骇鍒嗘瀽 * Created by linxsh on 2017/7/5. */ class HouseLoudongAnaBatch extends BaseBatch { @@ -34,18 +34,18 @@ class HouseLoudongAnaBatch extends BaseBatch { @Override void process(Object args) { - //获取上个月的日期 + //鑾峰彇涓婁釜鏈堢殑鏃ユ湡 Date lastMonthDate = DateUtil.getDateOfLastMonth(new Date(), -1) final int montIntVal = NumberUtils.toInt(DateUtil.formatByPattern(lastMonthDate, "yyyyMM")) - //获取所有城市 + //鑾峰彇鎵�鏈夊煄甯� DBObject cityQuery = new BasicDBObject('status', new BasicDBObject('$in', [0, 2])) SERVER_AREA_CONN.find(cityQuery).each { CITYS << it.display } ExecutorService exec = Executors.newCachedThreadPool() Semaphore semaphore = new Semaphore(5) - //根据城市遍历小区库 + //鏍规嵁鍩庡競閬嶅巻灏忓尯搴� CITYS.each {city-> semaphore.acquire() println "start handle $city" @@ -79,9 +79,9 @@ class HouseLoudongAnaBatch extends BaseBatch { def roomTypeMap = ["0":0,"1":0,"2":0,"3":0,"4":0] def areaTypeMap = ["0":0,"1":0,"2":0,"3":0,"4":0] - //最大面积 + //鏈�澶ч潰绉� Double maxArea = null; - //最小面积 + //鏈�灏忛潰绉� Double minArea = null; for(DBObject hlDbObj : dbCursor) { @@ -117,7 +117,7 @@ class HouseLoudongAnaBatch extends BaseBatch { } } - //保存数据 + //淇濆瓨鏁版嵁 DBObject updateQuery = new BasicDBObject("city", dbObject.city).append("region", dbObject.region) .append("name", dbObject.name).append("date", monthIntVal) DBObject saveObj = new BasicDBObject(updateQuery) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/pds/HouseQuoteLevelBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/pds/HouseQuoteLevelBatch.groovy index c8ee42adb..1d6c3466e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/pds/HouseQuoteLevelBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/pds/HouseQuoteLevelBatch.groovy @@ -37,7 +37,7 @@ class HouseQuoteLevelBatch extends BaseBatch { Date lastDayOfMonth = DateUtil.getLastDayOfMonth(new Date(), -1) int countMonth = DateUtil.formatByPattern(lastDayOfMonth, "yyyyMM").toInteger() long start = System.currentTimeMillis() - println "[HouseQuoteLevelBatch] 开始分析:" + DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) + println "[HouseQuoteLevelBatch] 寮�濮嬪垎鏋愶細" + DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) def cities = ServerAreaMap.findAllCities() for(def city : cities) { @@ -45,7 +45,7 @@ class HouseQuoteLevelBatch extends BaseBatch { def levelMap = [:] int index = 0 for (DBObject district: districts) { - //将此小区和房源库对比,并按面积分段统计数量 + //灏嗘灏忓尯鍜屾埧婧愬簱瀵规瘮锛屽苟鎸夐潰绉垎娈电粺璁℃暟閲� countDistrict(district, countMonth, levelMap) println(city +"\t" + (++index)) } @@ -67,26 +67,26 @@ class HouseQuoteLevelBatch extends BaseBatch { println "save end" } - println "[HouseQuoteLevelBatch] 分析结束,用时 ${(System.currentTimeMillis() - start)/1000} 秒" + println "[HouseQuoteLevelBatch] 鍒嗘瀽缁撴潫锛岀敤鏃� ${(System.currentTimeMillis() - start)/1000} 绉�" } /** - * 针对小区,统计房源库中对应的数量 + * 閽堝灏忓尯锛岀粺璁℃埧婧愬簱涓搴旂殑鏁伴噺 * @param district * @return */ def countDistrict(DBObject district, def month, def levelMap) { String key = district.get("name").toString().trim() + "__" + district.get("region") + "__" + district.get("city") /** - * - - - - - - - - + * + + + + + + + + */ Map levelCounts = getLevelCount(district.city, district.region, district.get("name").toString().trim(), month) for(int i=1; i <= 9; ++i) { @@ -115,7 +115,7 @@ class HouseQuoteLevelBatch extends BaseBatch { } /** - * 获取房源数量的排名情况 + * 鑾峰彇鎴挎簮鏁伴噺鐨勬帓鍚嶆儏鍐� * @param levelMap * @param i * @return @@ -128,7 +128,7 @@ class HouseQuoteLevelBatch extends BaseBatch { countCache.add(kv.value) } } - //排序 + //鎺掑簭 Collections.sort(countCache, new Comparator() { @Override int compare(Object o1, Object o2) {return o2 - o1;} @@ -143,7 +143,7 @@ class HouseQuoteLevelBatch extends BaseBatch { } /** - * 根据 城市-区域-小区名-面积段,获取挂牌房源中的小区数 + * 鏍规嵁 鍩庡競-鍖哄煙-灏忓尯鍚�-闈㈢Н娈碉紝鑾峰彇鎸傜墝鎴挎簮涓殑灏忓尯鏁� * @param city * @param region * @param name diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/pds/PdsFoodAvgPriceBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/pds/PdsFoodAvgPriceBatch.groovy index aca9e045d..3e5e1a797 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/pds/PdsFoodAvgPriceBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/pds/PdsFoodAvgPriceBatch.groovy @@ -14,7 +14,7 @@ import com.mongodb.Mongo import com.fangjia.script.util.DateUtils /** - * 小区周边1公里餐饮平均消费统计,按月统计 + * 灏忓尯鍛ㄨ竟1鍏噷椁愰ギ骞冲潎娑堣垂缁熻锛屾寜鏈堢粺璁� * @author yinjihuan * */ @@ -29,7 +29,7 @@ class PdsFoodAvgPriceBatch extends BaseBatch { @Override public void process(Object args) { - println "开始统计小区周边1公里餐饮平均消费" + println "寮�濮嬬粺璁″皬鍖哄懆杈�1鍏噷椁愰ギ骞冲潎娑堣垂" food_avg_price_coll.remove(new BasicDBObject("date", getBeforeMonth(-1))) stat() } @@ -38,7 +38,7 @@ class PdsFoodAvgPriceBatch extends BaseBatch { def query = new BasicDBObject("visible", 0).append("cat", "district") def fields = new BasicDBObject("city", 1).append("name", 1).append("region", 1).append("lng2", 1).append("lat2", 1) //RegionData.getAllCity() - ["上海"].each { city -> + ["涓婃捣"].each { city -> query.append("city", city) println query.toString() doStat(query, fields) @@ -59,7 +59,7 @@ class PdsFoodAvgPriceBatch extends BaseBatch { } /** - * 根据参数获取月份 + * 鏍规嵁鍙傛暟鑾峰彇鏈堜唤 * @param num * @return */ @@ -70,9 +70,9 @@ class PdsFoodAvgPriceBatch extends BaseBatch { } /** - * 获取周边餐饮消费 + * 鑾峰彇鍛ㄨ竟椁愰ギ娑堣垂 * @author yinjihuan - * @date 2016年8月18日 + * @date 2016骞�8鏈�18鏃� * @param lng * @param lat * @return @@ -85,7 +85,7 @@ class PdsFoodAvgPriceBatch extends BaseBatch { def query = new BasicDBObject() query.append("lat",new BasicDBObject('$gte', arr[0]).append('$lte', arr[1])) query.append("lng",new BasicDBObject('$gte', arr[2]).append('$lte', arr[3])) - query.append("business_type", "美食") + query.append("business_type", "缇庨") double totalCon = 0; int count = 0; business_shop_coll.find(query).addOption(com.mongodb.Bytes.QUERYOPTION_NOTIMEOUT).each {BasicDBObject dbo-> diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/pds/PdsHouseScoreCityLevelBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/pds/PdsHouseScoreCityLevelBatch.groovy index 59872c09a..d5443cb17 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/pds/PdsHouseScoreCityLevelBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/pds/PdsHouseScoreCityLevelBatch.groovy @@ -25,7 +25,7 @@ class PdsHouseScoreCityLevelBatch extends BaseBatch{ static main(args) { def s = System.currentTimeMillis() runBatch(new PdsHouseScoreCityLevelBatch(), args) - println("运行时间:${(int) ((System.currentTimeMillis() - s)) / (1000 * 60)}分钟") + println("杩愯鏃堕棿:${(int) ((System.currentTimeMillis() - s)) / (1000 * 60)}鍒嗛挓") } @Override @@ -50,7 +50,7 @@ class PdsHouseScoreCityLevelBatch extends BaseBatch{ levelInfo(city); } /** - * 更新小区totalScore + * 鏇存柊灏忓尯totalScore * @param city * @param region * @param name @@ -74,7 +74,7 @@ class PdsHouseScoreCityLevelBatch extends BaseBatch{ } /** - * 对城市各小区总分进行排序 + * 瀵瑰煄甯傚悇灏忓尯鎬诲垎杩涜鎺掑簭 * @param city */ public static levelInfo(String city){ @@ -130,7 +130,7 @@ class PdsHouseScoreCityLevelBatch extends BaseBatch{ } /** - * totalscore获取 + * totalscore鑾峰彇 * @param city * @param region * @param name @@ -163,7 +163,7 @@ class PdsHouseScoreCityLevelBatch extends BaseBatch{ } /** - * 获取上个月int类型的时间 + * 鑾峰彇涓婁釜鏈坕nt绫诲瀷鐨勬椂闂� * @return */ public static int getLastMonth(){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/pds/PriceIncreaesLevelBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/pds/PriceIncreaesLevelBatch.groovy index ca0e3b0b8..5db4e8192 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/pds/PriceIncreaesLevelBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/pds/PriceIncreaesLevelBatch.groovy @@ -9,12 +9,12 @@ import com.mongodb.BasicDBObject import com.mongodb.DBCollection import com.mongodb.DBCursor /** - * 押品价格涨幅排名(必须在CPDBAvgGrowthRateBatch后运行)
    + * 鎶煎搧浠锋牸娑ㄥ箙鎺掑悕(蹇呴』鍦–PDBAvgGrowthRateBatch鍚庤繍琛�)
    * id city region name area date
    - sizeType 面积分档类型
    - quotedMount 押品价格涨幅
    - monCityLevel 价格涨幅排名
    - citySize 同一城市下相同面积的押品数量 + sizeType 闈㈢Н鍒嗘。绫诲瀷
    + quotedMount 鎶煎搧浠锋牸娑ㄥ箙
    + monCityLevel 浠锋牸娑ㄥ箙鎺掑悕
    + citySize 鍚屼竴鍩庡競涓嬬浉鍚岄潰绉殑鎶煎搧鏁伴噺 * @author yinjihuan * */ @@ -36,7 +36,7 @@ class PriceIncreaesLevelBatch extends BaseBatch { } /** - * 设置排名 + * 璁剧疆鎺掑悕 * @return */ def setLevel() { @@ -60,7 +60,7 @@ class PriceIncreaesLevelBatch extends BaseBatch { } def stat() { - println "开始统计押品价格涨幅排名" + println "寮�濮嬬粺璁℃娂鍝佷环鏍兼定骞呮帓鍚�" mortgage_info_coll.find().addOption(com.mongodb.Bytes.QUERYOPTION_NOTIMEOUT).each { data -> if (data.original_district_name && data.area) { String areaStr = data.get("area") @@ -86,7 +86,7 @@ class PriceIncreaesLevelBatch extends BaseBatch { } } - //获取同城市下相同面积的押品数量 + //鑾峰彇鍚屽煄甯備笅鐩稿悓闈㈢Н鐨勬娂鍝佹暟閲� def getCitySize(area, city) { def param = getQueryParam(area) def query = new BasicDBObject("city", city) @@ -157,7 +157,7 @@ class PriceIncreaesLevelBatch extends BaseBatch { } /** - * 获取押品价格涨幅 + * 鑾峰彇鎶煎搧浠锋牸娑ㄥ箙 * @return */ def getPriceMon(city, region, name, area) { @@ -169,7 +169,7 @@ class PriceIncreaesLevelBatch extends BaseBatch { return 0 } - //格式化押品库中的面积为Double类型 + //鏍煎紡鍖栨娂鍝佸簱涓殑闈㈢Н涓篋ouble绫诲瀷 def static formatAreaToDouble() { mortgage_info_coll.find().addOption(com.mongodb.Bytes.QUERYOPTION_NOTIMEOUT).each { data -> Double area = 0; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/pds/RiskControlBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/pds/RiskControlBatch.groovy index 5252fa262..82256c8b8 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/pds/RiskControlBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/pds/RiskControlBatch.groovy @@ -32,7 +32,7 @@ class RiskControlBatch extends BaseBatch { // final static DBCollection USER = new Mongo("192.168.0.136", 27017).getDB('fangjia_pds').getCollection('user'); final static DBCollection ENTERPRISE = new Mongo(DBHOST, 27017).getDB('fangjia_pds').getCollection('enterprise'); final static DBCollection MORTGAGEINFO = new Mongo("mongo.db.fangjia.com", 27017).getDB('fangjia_base').getCollection('mortgage_info'); - //此表中存放的是已放入押品库的押品数据 + //姝よ〃涓瓨鏀剧殑鏄凡鏀惧叆鎶煎搧搴撶殑鎶煎搧鏁版嵁 final static DBCollection MORTGAGEDETAIL = new Mongo(DBHOST, 27017).getDB('fangjia_pds').getCollection('mortgage_detail'); final static DBCollection RISK_CONTROL = new Mongo(DBHOST, 27017).getDB('fangjia_pds').getCollection('risk_control'); @@ -45,12 +45,12 @@ class RiskControlBatch extends BaseBatch { @Override void process(Object args) { - // 当期周末 + // 褰撴湡鍛ㄦ湯 // Date countDate = DateUtil.getFirstDayOfWeek(new Date()); // Date countDate = getCountDate() Calendar calendar = Calendar.getInstance() long start = System.currentTimeMillis() - println "[RiskControlBatch] 开始分析:" + DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) + println "[RiskControlBatch] 寮�濮嬪垎鏋愶細" + DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) DBCursor enterpriseCursor = ENTERPRISE.find().addOption(Bytes.QUERYOPTION_NOTIMEOUT) def cpdbCountMap = countCPDB(calendar.getTime()) @@ -65,9 +65,9 @@ class RiskControlBatch extends BaseBatch { String enterpriseId = enterpriseDbObject.get("_id").toString() count(enterpriseId, calendar.getTime(), cpdbCountMap) } - //删除旧数据 + //鍒犻櫎鏃ф暟鎹� RISK_CONTROL.remove(new BasicDBObject('count_date', new BasicDBObject('$ne', DateUtil.formatToYYYYMMDD(calendar.getTime())))) - println "[RiskControlBatch] 分析结束,用时 ${(System.currentTimeMillis() - start)/1000} 秒" + println "[RiskControlBatch] 鍒嗘瀽缁撴潫锛岀敤鏃� ${(System.currentTimeMillis() - start)/1000} 绉�" } @@ -75,47 +75,47 @@ class RiskControlBatch extends BaseBatch { String countDateString = DateUtil.formatToYYYYMMDD(countDate) DBObject saveDatas = new BasicDBObject('count_date', countDateString) - //存量押品总市值 + //瀛橀噺鎶煎搧鎬诲競鍊� Long stockHousePrice = getstockHousePrice(enterpriseId, countDate) saveDatas.put('stock_house_price', stockHousePrice) - //存量押品市值走势 + //瀛橀噺鎶煎搧甯傚�艰蛋鍔� Map monthlyHousePrice = getMonthlyHousePrice(enterpriseId, countDate) saveDatas.put("monthly_total_price", monthlyHousePrice) - //贷款余额 + //璐锋浣欓 Long totalLoanBalance = getBalance(enterpriseId, countDate) saveDatas.put("balance", totalLoanBalance) - //原始抵押率LTV + //鍘熷鎶垫娂鐜嘗TV Double oriMortgageRate = getOriMortgageRate(enterpriseId, countDate) saveDatas.put("ori_mortgage_rate", oriMortgageRate) - // 即时抵押率CLTV + // 鍗虫椂鎶垫娂鐜嘋LTV Double curMortgageRate = getCurMortgageRate(enterpriseId, countDate, stockHousePrice) saveDatas.put("cur_mortgage_rate", curMortgageRate) - // 存量押品平均涨幅 + // 瀛橀噺鎶煎搧骞冲潎娑ㄥ箙 Double stockHouseAvgRate = getstockHouseAvgRate(enterpriseId, countDate) saveDatas.put('stock_house_avg_rate', stockHouseAvgRate) - // 押品库上涨比率及对应的增长率 + // 鎶煎搧搴撲笂娑ㄦ瘮鐜囧強瀵瑰簲鐨勫闀跨巼 def stockRateMap = getstockRateMap(enterpriseId, countDate) saveDatas.put("stock_up_rate", stockRateMap.stockUpRate) saveDatas.put('stock_down_rate', stockRateMap.stockDownRate) saveDatas.put('total_up_avg_rate', stockRateMap.totalUpAvgRate) saveDatas.put('total_down_avg_rate', stockRateMap.totalDownAvgRate) - // CPDB库上涨比率及对应的增长率 + // CPDB搴撲笂娑ㄦ瘮鐜囧強瀵瑰簲鐨勫闀跨巼 saveDatas.put("cpdb_up_rate", cpdbCountMap?.cpdbUpRate) saveDatas.put('cpdb_down_rate', cpdbCountMap?.cpdbDownRate) saveDatas.put('cpdb_up_avg_rate', cpdbCountMap?.totalCpdbUpAvgRate) saveDatas.put('cpdb_down_avg_rate', cpdbCountMap?.totalCpdbDownAvgRate) - //CPDB 押品平均涨幅 + //CPDB 鎶煎搧骞冲潎娑ㄥ箙 saveDatas.put('cpdb_house_avg_rate', cpdbCountMap.cpdbHouseAvgRate) - //CPDB 押品总市值 + //CPDB 鎶煎搧鎬诲競鍊� saveDatas.put('cpdb_house_price', cpdbCountMap.cpdbTotalPrice) - //CPDB 市值走势 + //CPDB 甯傚�艰蛋鍔� saveDatas.put('monthly_cpdb_total_price', cpdbCountMap.monthlyTotalPrice) saveDatas.put("c_date", new Date()) @@ -125,14 +125,14 @@ class RiskControlBatch extends BaseBatch { } /** - * 对CPDB进行一次性统计,减少查库次数 + * 瀵笴PDB杩涜涓�娆℃�х粺璁★紝鍑忓皯鏌ュ簱娆℃暟 *

    -     *  统计内容:
    -     *      1. 上涨比率及相应增长率
    -     *      2. 下跌比率及相应增长率
    -     *      3. 平均涨幅
    -     *      4. 总市值
    -     *      5. 市值走势
    +     *  缁熻鍐呭锛�
    +     *      1. 涓婃定姣旂巼鍙婄浉搴斿闀跨巼
    +     *      2. 涓嬭穼姣旂巼鍙婄浉搴斿闀跨巼
    +     *      3. 骞冲潎娑ㄥ箙
    +     *      4. 鎬诲競鍊�
    +     *      5. 甯傚�艰蛋鍔�
          * 
    * @param countDate * @return @@ -163,11 +163,11 @@ class RiskControlBatch extends BaseBatch { } area = area.replaceAll('[^.\\d]', '') - //当前总价 + //褰撳墠鎬讳环 def curPrice = curDistrictPrice(city, region, districtName, NumberUtils.toDouble(area)) - //导入时总价 + //瀵煎叆鏃舵�讳环 def oriPrice = 0 - //过去一年,每个月的总价 + //杩囧幓涓�骞达紝姣忎釜鏈堢殑鎬讳环 for(int i = 1; i<=12; ++i){ Date prevDate = DateUtil.getLastDayOfMonth(now, i * -1) double monthPrice = curDistrictPrice(city, region, districtName, NumberUtils.toDouble(area), null, null, null, prevDate) @@ -186,13 +186,13 @@ class RiskControlBatch extends BaseBatch { if(curPrice==0 || oriPrice==0 || curPrice > Integer.MAX_VALUE || oriPrice > Integer.MAX_VALUE) { continue } - //将涨幅加入到总涨幅中 + //灏嗘定骞呭姞鍏ュ埌鎬绘定骞呬腑 totalPriceRate += (curPrice / oriPrice - 1) cpdbTotalPrice += curPrice totalWithSame++; - // 如果当前总价 == 导入时总价,不计入结果 + // 濡傛灉褰撳墠鎬讳环 == 瀵煎叆鏃舵�讳环锛屼笉璁″叆缁撴灉 if (curPrice > oriPrice) { upNumberCount++ totalWithNoSame++ @@ -216,7 +216,7 @@ class RiskControlBatch extends BaseBatch { } /** - * 存量押品库涨跌比率及平均增长率 + * 瀛橀噺鎶煎搧搴撴定璺屾瘮鐜囧強骞冲潎澧為暱鐜� * @param enterpriseId * @param date * @return @@ -230,16 +230,16 @@ class RiskControlBatch extends BaseBatch { long downNumberCount = 0 double totalDownNumberRate = 0 for(DBObject dbObject : dbCursor) { - //房产集合 + //鎴夸骇闆嗗悎 List houseIds = dbObject.house_ids for(String houseId: houseIds) { DBObject houseObj = COLLATERAL.findOne(new BasicDBObject('_id', new ObjectId(houseId))) - //导入时总价 + //瀵煎叆鏃舵�讳环 def oriPrice = houseObj.total_price - //当前总价 + //褰撳墠鎬讳环 def curPrice = curDistrictPrice(houseObj.city, houseObj.region, houseObj.district_name, houseObj.area, houseObj.estate_type, houseObj.height, houseObj.floor) - // 如果当前总价 == 导入时总价,不计入结果 + // 濡傛灉褰撳墠鎬讳环 == 瀵煎叆鏃舵�讳环锛屼笉璁″叆缁撴灉 if(curPrice > oriPrice) { upNumberCount++ total++ @@ -270,7 +270,7 @@ class RiskControlBatch extends BaseBatch { } /** - * CPDB押品平均涨幅 + * CPDB鎶煎搧骞冲潎娑ㄥ箙 * @param date * @return */ @@ -301,7 +301,7 @@ class RiskControlBatch extends BaseBatch { } /** - * 存量押品平均涨幅 + * 瀛橀噺鎶煎搧骞冲潎娑ㄥ箙 * @param date * @return */ @@ -310,15 +310,15 @@ class RiskControlBatch extends BaseBatch { def result = 0 def count = 0 for(DBObject dbObject : dbCursor) { - //房产集合 + //鎴夸骇闆嗗悎 List houseIds = dbObject.house_ids for(String houseId: houseIds) { DBObject houseObj = COLLATERAL.findOne(new BasicDBObject('_id', new ObjectId(houseId))) - //导入时总价 + //瀵煎叆鏃舵�讳环 def oriPrice = houseObj.total_price if(oriPrice && oriPrice != 0) { - //当前总价 + //褰撳墠鎬讳环 def curPrice = curDistrictPrice(houseObj.city, houseObj.region, houseObj.district_name, houseObj.area, houseObj.estate_type, houseObj.height, houseObj.floor) if(curPrice && curPrice != 0 && curPrice!=oriPrice) { @@ -337,7 +337,7 @@ class RiskControlBatch extends BaseBatch { } /** - * 即时抵押率CLTV: 总剩余本金/即时总市值 + * 鍗虫椂鎶垫娂鐜嘋LTV: 鎬诲墿浣欐湰閲�/鍗虫椂鎬诲競鍊� * @param date * @return */ @@ -345,15 +345,15 @@ class RiskControlBatch extends BaseBatch { DBCursor dbCursor = MORTGAGEDETAIL.find(new BasicDBObject('c_date', new BasicDBObject('$lte', date)).append('enterprise_id', enterpriseId)) def totalLoanBalance = 0 for(DBObject dbObject : dbCursor) { - //贷款期限 + //璐锋鏈熼檺 int loanMonth = dbObject.loan_month - //年化利率 + //骞村寲鍒╃巼 double rate = dbObject.rate - //放贷时间 + //鏀捐捶鏃堕棿 Date lendingDate = dbObject.lending_date - //还款方式 + //杩樻鏂瑰紡 int repaymentWay = dbObject.repayment_way - //放贷金额 + //鏀捐捶閲戦 int lendingPrice = dbObject.lending_price totalLoanBalance += LoanUtil.remainInterest(lendingPrice, loanMonth, rate, repaymentWay, lendingDate) @@ -365,20 +365,20 @@ class RiskControlBatch extends BaseBatch { } /** - * 原始抵押率LTV - * @param date 统计时间 + * 鍘熷鎶垫娂鐜嘗TV + * @param date 缁熻鏃堕棿 * @return */ double getOriMortgageRate(String enterpriseId, Date date) { DBCursor dbCursor = MORTGAGEDETAIL.find(new BasicDBObject('c_date', new BasicDBObject('$lte', date)).append('enterprise_id', enterpriseId)) - //放贷金额 + //鏀捐捶閲戦 int lendingPrice = 0 - // 存量押品原总市值 + // 瀛橀噺鎶煎搧鍘熸�诲競鍊� long oristockHousePrice = 0 for(DBObject dbObject : dbCursor) { lendingPrice += dbObject.lending_price - //房产集合 + //鎴夸骇闆嗗悎 List houseIds = dbObject.house_ids for(String houseId: houseIds) { DBObject houseObj = COLLATERAL.findOne(new BasicDBObject('_id', new ObjectId(houseId))) @@ -392,7 +392,7 @@ class RiskControlBatch extends BaseBatch { } /** - * 贷款余额(含利息) + * 璐锋浣欓(鍚埄鎭�) * @param date * @return */ @@ -400,19 +400,19 @@ class RiskControlBatch extends BaseBatch { DBCursor dbCursor = MORTGAGEDETAIL.find(new BasicDBObject('c_date', new BasicDBObject('$lte', date)).append('enterprise_id', enterpriseId)) double result = 0 for(DBObject dbObject : dbCursor) { - //贷款期限 + //璐锋鏈熼檺 int loanMonth = dbObject.loan_month - //年化利率 + //骞村寲鍒╃巼 double rate = dbObject.rate - //放贷时间 + //鏀捐捶鏃堕棿 Date lendingDate = dbObject.lending_date - //还款方式 + //杩樻鏂瑰紡 int repaymentWay = dbObject.repayment_way - //放贷金额 + //鏀捐捶閲戦 int lendingPrice = dbObject.lending_price - //房产集合 + //鎴夸骇闆嗗悎 List houseIds = dbObject.house_ids - //贷款人集合 + //璐锋浜洪泦鍚� List borrowerIds = dbObject.card_ids result += LoanUtil.remainInterest2(lendingPrice, loanMonth, rate, repaymentWay, lendingDate) } @@ -421,15 +421,15 @@ class RiskControlBatch extends BaseBatch { } /** - * 存量押品总市值 - * @param calDate 估值时间 + * 瀛橀噺鎶煎搧鎬诲競鍊� + * @param calDate 浼板�兼椂闂� * @return */ private long getstockHousePrice(String enterpriseId, Date countDate) { DBCursor dbCursor = MORTGAGEDETAIL.find(new BasicDBObject('c_date', new BasicDBObject('$lte', countDate)).append('enterprise_id', enterpriseId)) long result = 0 for(DBObject dbObject : dbCursor) { - //房产集合 + //鎴夸骇闆嗗悎 List houseIds = dbObject.house_ids for(String houseId : houseIds) { DBObject findHouseObj = COLLATERAL.findOne(new BasicDBObject('_id', new ObjectId(houseId))) @@ -443,19 +443,19 @@ class RiskControlBatch extends BaseBatch { } /** - * 估价,当前总价 + * 浼颁环锛屽綋鍓嶆�讳环 * @param city * @param region * @param districtName - * @param area 面积 - * @param propertyType 物业类型。 0:普通住宅,1:别墅,2:商住 + * @param area 闈㈢Н + * @param propertyType 鐗╀笟绫诲瀷銆� 0锛氭櫘閫氫綇瀹咃紝1锛氬埆澧咃紝2锛氬晢浣� * @param height * @param floor * @return */ private double curDistrictPrice(def city, def region, def districtName, def area, def estate_type = null, def height = null, def floor = null, Date calDate = new Date()) { def propertyType = 0 - if(estate_type != null && estate_type.contains('别墅')) { + if(estate_type != null && estate_type.contains('鍒')) { propertyType = 1 } JSONObject jo = OpenApiClient.evaluateDistrictPrice(city, region, districtName, area, propertyType, height, floor, calDate) @@ -469,7 +469,7 @@ class RiskControlBatch extends BaseBatch { DBCursor dbCursor = MORTGAGEDETAIL.find(new BasicDBObject('c_date', new BasicDBObject('$lte', countDate)).append('enterprise_id', enterpriseId)) Map result = Maps.newHashMap() for(DBObject dbObject : dbCursor) { - //房产集合 + //鎴夸骇闆嗗悎 List houseIds = dbObject.house_ids for(String houseId : houseIds) { DBObject findHouseObj = COLLATERAL.findOne(new BasicDBObject('_id', new ObjectId(houseId))) @@ -493,7 +493,7 @@ class RiskControlBatch extends BaseBatch { } /** - * 获取统计时间,因为是一天一次,所以每次统计时间截至为昨天的最后一秒 + * 鑾峰彇缁熻鏃堕棿锛屽洜涓烘槸涓�澶╀竴娆★紝鎵�浠ユ瘡娆$粺璁℃椂闂存埅鑷充负鏄ㄥぉ鐨勬渶鍚庝竴绉� * @return */ private Date getCountDate() { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/pds/RiskControlData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/pds/RiskControlData.groovy index 8c0fc3807..a4946fcc2 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/pds/RiskControlData.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/pds/RiskControlData.groovy @@ -34,7 +34,7 @@ class RiskControlData extends BaseBatch { final static DBCollection COLLATERAL = pds_mongo.getDB('fangjia_pds').getCollection('collateral_evaluation_info'); final static DBCollection ENTERPRISE = pds_mongo.getDB('fangjia_pds').getCollection('enterprise'); final static DBCollection RISK_CONTROL_DETAIL = pds_mongo.getDB('fangjia_pds').getCollection('risk_control_detail'); - //此表中存放的是已放入押品库的押品数据 + //姝よ〃涓瓨鏀剧殑鏄凡鏀惧叆鎶煎搧搴撶殑鎶煎搧鏁版嵁 final static DBCollection MORTGAGEDETAIL = pds_mongo.getDB('fangjia_pds').getCollection('mortgage_detail'); final static DBCollection RISK_CONTROL = pds_mongo.getDB('fangjia_pds').getCollection('risk_control'); @@ -48,22 +48,22 @@ class RiskControlData extends BaseBatch { void process(Object args) { Date now = new Date() - println "[RiskControlData] 开始分析:" + DateUtil.formatToTightYYYYMMDDhhmmss(now) + println "[RiskControlData] 寮�濮嬪垎鏋愶細" + DateUtil.formatToTightYYYYMMDDhhmmss(now) List enterprises = ENTERPRISE.find(new BasicDBObject(), new BasicDBObject('_id', 1)).addOption(Bytes.QUERYOPTION_NOTIMEOUT).toList() - //分企业统计 + //鍒嗕紒涓氱粺璁� for(DBObject enterprise: enterprises) { def enterpriseId = enterprise.get('_id').toString(); /** - * 押品列表页 + * 鎶煎搧鍒楄〃椤� */ countRiskControlList(enterpriseId, now) /** - * 押品风控页 + * 鎶煎搧椋庢帶椤� */ countRiskControl(enterpriseId, now) } - //CPDB数据统计 + //CPDB鏁版嵁缁熻 println "[RiskControlData]\tstart count CPDB" countCPDB(now) } @@ -94,11 +94,11 @@ class RiskControlData extends BaseBatch { } area = area.replaceAll('[^.\\d]', '') - //当前总价 + //褰撳墠鎬讳环 def curPrice = curDistrictPrice(city, region, districtName, NumberUtils.toDouble(area)) - //导入时总价 + //瀵煎叆鏃舵�讳环 def oriPrice = 0 - //过去一年,每个月的总价 + //杩囧幓涓�骞达紝姣忎釜鏈堢殑鎬讳环 for(int i = 1; i<=12; ++i){ Date prevDate = DateUtil.getLastDayOfMonth(countDate, i * -1) double monthPrice = curDistrictPrice(city, region, districtName, NumberUtils.toDouble(area), null, null, null, prevDate) @@ -117,13 +117,13 @@ class RiskControlData extends BaseBatch { if(curPrice==0 || oriPrice==0 || curPrice > Integer.MAX_VALUE || oriPrice > Integer.MAX_VALUE) { continue } - //将涨幅加入到总涨幅中 + //灏嗘定骞呭姞鍏ュ埌鎬绘定骞呬腑 totalPriceRate += (curPrice / oriPrice - 1) cpdbTotalPrice += curPrice totalWithSame++; - // 如果当前总价 == 导入时总价,不计入结果 + // 濡傛灉褰撳墠鎬讳环 == 瀵煎叆鏃舵�讳环锛屼笉璁″叆缁撴灉 if (curPrice > oriPrice) { upNumberCount++ totalWithNoSame++ @@ -140,11 +140,11 @@ class RiskControlData extends BaseBatch { dbObject.put('cpdb_down_rate', (double) (downNumberCount / totalWithNoSame)) dbObject.put('cpdb_up_avg_rate', (double)(totalUpNumberRate / totalWithNoSame)) dbObject.put('cpdb_down_avg_rate', (double)(totalDownNumberRate / totalWithNoSame)) - //CPDB 押品平均涨幅 + //CPDB 鎶煎搧骞冲潎娑ㄥ箙 dbObject.put('cpdb_house_avg_rate', (double)(totalPriceRate/ totalWithSame)) - //CPDB 押品总市值 + //CPDB 鎶煎搧鎬诲競鍊� dbObject.put('cpdb_house_price', cpdbTotalPrice) - //CPDB 市值走势 + //CPDB 甯傚�艰蛋鍔� dbObject.put('monthly_cpdb_total_price', monthlyTotalPrice) RISK_CONTROL.update(new BasicDBObject(), new BasicDBObject('$set', dbObject), false, true) @@ -152,26 +152,26 @@ class RiskControlData extends BaseBatch { } /** - * 押品风控页数据 + * 鎶煎搧椋庢帶椤垫暟鎹� * @param enterpriseId */ def countRiskControl(String enterpriseId, Date countDate) { - //押品总市值 + //鎶煎搧鎬诲競鍊� Long stockHousePrice = 0 - //存量押品市值走势 + //瀛橀噺鎶煎搧甯傚�艰蛋鍔� Map monthlyHousePrice = getMonthlyHousePrice(enterpriseId, countDate) - //贷款余额 + //璐锋浣欓 Long totalLoanBalance = 0 - //原始抵押率LTV - def lendingPrice = 0 //放贷金额 - def oriStockHousePrice = 0 // 存量押品原总市值 + //鍘熷鎶垫娂鐜嘗TV + def lendingPrice = 0 //鏀捐捶閲戦 + def oriStockHousePrice = 0 // 瀛橀噺鎶煎搧鍘熸�诲競鍊� Double oriMortgageRate = 0 - //即时抵押率 - def totalLoanLeftPrice = 0//剩余总本金 + //鍗虫椂鎶垫娂鐜� + def totalLoanLeftPrice = 0//鍓╀綑鎬绘湰閲� Double curMortgageRate = 0 - //存量押品平均涨幅 + //瀛橀噺鎶煎搧骞冲潎娑ㄥ箙 Double stockHouseAvgRate = 0 - // 押品库上涨比率及对应的增长率 + // 鎶煎搧搴撲笂娑ㄦ瘮鐜囧強瀵瑰簲鐨勫闀跨巼 Double stockUpRate = 0 Double stockDownRate = 0 Double totalUpAvgRate = 0 @@ -231,23 +231,23 @@ class RiskControlData extends BaseBatch { totalDownAvgRate = totalDownNumberRate / totalUpDownCount } - //-------------------------------------入库---------------------------------------- + //-------------------------------------鍏ュ簱---------------------------------------- String countDateString = DateUtil.formatToYYYYMMDD(countDate) DBObject saveDatas = new BasicDBObject('count_date', countDateString) - //存量押品总市值 + //瀛橀噺鎶煎搧鎬诲競鍊� saveDatas.put('stock_house_price', stockHousePrice) - //存量押品市值走势 + //瀛橀噺鎶煎搧甯傚�艰蛋鍔� saveDatas.put("monthly_total_price", monthlyHousePrice) - //贷款余额 + //璐锋浣欓 saveDatas.put("balance", totalLoanBalance) - //原始抵押率LTV + //鍘熷鎶垫娂鐜嘗TV saveDatas.put("ori_mortgage_rate", oriMortgageRate) - // 即时抵押率CLTV + // 鍗虫椂鎶垫娂鐜嘋LTV saveDatas.put("cur_mortgage_rate", curMortgageRate) - // 存量押品平均涨幅 + // 瀛橀噺鎶煎搧骞冲潎娑ㄥ箙 saveDatas.put('stock_house_avg_rate', stockHouseAvgRate) - // 押品库上涨比率及对应的增长率 + // 鎶煎搧搴撲笂娑ㄦ瘮鐜囧強瀵瑰簲鐨勫闀跨巼 saveDatas.put("stock_up_rate", stockUpRate) saveDatas.put('stock_down_rate', stockDownRate) saveDatas.put('total_up_avg_rate', totalUpAvgRate) @@ -260,7 +260,7 @@ class RiskControlData extends BaseBatch { } /** - * 押品列表页数据 + * 鎶煎搧鍒楄〃椤垫暟鎹� * @param enterpriseId */ void countRiskControlList(String enterpriseId, Date countDate) { @@ -270,7 +270,7 @@ class RiskControlData extends BaseBatch { def balance = getBalance(dbObject) def remainInterest = getRemainInterest(dbObject) def ltv = getLtv(dbObject); - //房产集合 + //鎴夸骇闆嗗悎 List houseIds = dbObject.house_ids for(String houseId : houseIds) { DBObject findHouseObj = COLLATERAL.findOne(new BasicDBObject('_id', new ObjectId(houseId))) @@ -280,10 +280,10 @@ class RiskControlData extends BaseBatch { String displayName = findHouseObj.get("district_name") ?: '' if(StringUtils.isNotBlank(findHouseObj.get('house_number'))) { - displayName += findHouseObj.get('house_number') + "号"; + displayName += findHouseObj.get('house_number') + "鍙�"; } if(StringUtils.isNotBlank(findHouseObj.get('room_number'))) { - displayName += findHouseObj.get('room_number') + "室"; + displayName += findHouseObj.get('room_number') + "瀹�"; } def oriPrice = findHouseObj.total_price @@ -297,7 +297,7 @@ class RiskControlData extends BaseBatch { saveObj.put('source', dbObject.get('source')) saveObj.put('enterprise_id', dbObject.get('enterprise_id')) saveObj.put('user_id', dbObject.get('user_id')) - saveObj.put('repay_way', dbObject.get('repayment_way')==1?'等额本息':'等额本金') + saveObj.put('repay_way', dbObject.get('repayment_way')==1?'绛夐鏈伅':'绛夐鏈噾') saveObj.put('house_id', houseId) saveObj.put('display', displayName) saveObj.put('city', findHouseObj.city) @@ -327,12 +327,12 @@ class RiskControlData extends BaseBatch { } /** - * 原始抵押率ltv + * 鍘熷鎶垫娂鐜噇tv * @param object * @return */ private def getLtv(Object dbObject) { - //放贷金额 + //鏀捐捶閲戦 Integer lendingPrice = dbObject.lending_price if(!lendingPrice) { return null @@ -353,20 +353,20 @@ class RiskControlData extends BaseBatch { } /** - * 剩余本金 + * 鍓╀綑鏈噾 * @param dbObject * @return */ Double getRemainInterest(DBObject dbObject) { - //贷款期限 + //璐锋鏈熼檺 Integer loanMonth = dbObject.loan_month - //年化利率 + //骞村寲鍒╃巼 Double rate = dbObject.rate - //放贷时间 + //鏀捐捶鏃堕棿 Date lendingDate = dbObject.lending_date - //还款方式 + //杩樻鏂瑰紡 Integer repaymentWay = dbObject.repayment_way - //放贷金额 + //鏀捐捶閲戦 Integer lendingPrice = dbObject.lending_price if(loanMonth && rate && lendingDate && repaymentWay && lendingPrice) { return LoanUtil.remainInterest(lendingPrice, loanMonth, rate, repaymentWay, lendingDate) @@ -375,37 +375,37 @@ class RiskControlData extends BaseBatch { } /** - * 贷款余额(剩余本金) + * 璐锋浣欓锛堝墿浣欐湰閲戯級 * @param dbObject * @return */ private Double getBalance(DBObject dbObject) { - //贷款期限 + //璐锋鏈熼檺 Integer loanMonth = dbObject.loan_month - //年化利率 + //骞村寲鍒╃巼 Double rate = dbObject.rate - //放贷时间 + //鏀捐捶鏃堕棿 Date lendingDate = dbObject.lending_date - //还款方式 + //杩樻鏂瑰紡 Integer repaymentWay = dbObject.repayment_way - //放贷金额 + //鏀捐捶閲戦 Integer lendingPrice = dbObject.lending_price if(loanMonth && rate && lendingDate && repaymentWay && lendingPrice) { - //上传数据且有贷款余额信息的特殊处理 + //涓婁紶鏁版嵁涓旀湁璐锋浣欓淇℃伅鐨勭壒娈婂鐞� Long balance = dbObject.balance int leftMonth = loanMonth - LoanUtil.getMonthCount(lendingDate, new Date()) Date createDate = dbObject.c_date String source = dbObject.source - if(source.contains("导入") && balance != null) { - //贷款余额为0或剩余还款月份已超过贷款期限,则认为贷款余额为0 + if(source.contains("瀵煎叆") && balance != null) { + //璐锋浣欓涓�0鎴栧墿浣欒繕娆炬湀浠藉凡瓒呰繃璐锋鏈熼檺锛屽垯璁や负璐锋浣欓涓�0 if (balance <= 0 || leftMonth <= 0) { return 0 } if(new Date().after(createDate)) { - //如果为等额本金,每月扣减本金不变,从上传的贷款余额中扣减; - //如果是等额本息,也从贷款余额中扣减,但要以上传时间为准,算出需要扣减的金额。 + //濡傛灉涓虹瓑棰濇湰閲戯紝姣忔湀鎵e噺鏈噾涓嶅彉锛屼粠涓婁紶鐨勮捶娆句綑棰濅腑鎵e噺锛� + //濡傛灉鏄瓑棰濇湰鎭紝涔熶粠璐锋浣欓涓墸鍑忥紝浣嗚浠ヤ笂浼犳椂闂翠负鍑嗭紝绠楀嚭闇�瑕佹墸鍑忕殑閲戦銆� int createDateLastDay = DateUtil.getDay(DateUtil.getLastDayOfMonth(createDate)); int lendDateDay = DateUtil.getDay(lendingDate); Calendar calendar = Calendar.getInstance(); @@ -416,15 +416,15 @@ class RiskControlData extends BaseBatch { calendar.set(Calendar.DATE, lendDateDay); } /** - * 从上传时间开始算,已还款几个月: - * 如房贷日起为2012-02-15,上传日期为2012-03-10,则在2012-03-11,还款月数为0。直接返回上传的贷款余额 - * 如果在2012-03-16,则认为已还款1个月,从上传的贷款余额中扣减本金后返回结果 + * 浠庝笂浼犳椂闂村紑濮嬬畻锛屽凡杩樻鍑犱釜鏈堬細 + * 濡傛埧璐锋棩璧蜂负2012-02-15锛屼笂浼犳棩鏈熶负2012-03-10锛屽垯鍦�2012-03-11锛岃繕娆炬湀鏁颁负0銆傜洿鎺ヨ繑鍥炰笂浼犵殑璐锋浣欓 + * 濡傛灉鍦�2012-03-16锛屽垯璁や负宸茶繕娆�1涓湀锛屼粠涓婁紶鐨勮捶娆句綑棰濅腑鎵e噺鏈噾鍚庤繑鍥炵粨鏋� */ int monthCount = LoanUtil.getMonthCount(calendar.getTime(), new Date()) if(monthCount < 1) { return balance } - //等额本息 + //绛夐鏈伅 if(repaymentWay == 1) { def payment = LoanUtil.monthlyPaymentWithInterestForP(lendingPrice, loanMonth, rate) payment = LoanUtil.formatNumber(payment) @@ -434,7 +434,7 @@ class RiskControlData extends BaseBatch { remainAmount = LoanUtil.formatNumber(remainAmount) } return remainAmount <= 0 ? 0: remainAmount - } else {//等额本金 + } else {//绛夐鏈噾 def eachAmount = LoanUtil.formatNumber(lendingPrice / loanMonth) def remain = LoanUtil.formatNumber(balance - eachAmount * monthCount) return remain <= 0 ? 0: remain @@ -450,7 +450,7 @@ class RiskControlData extends BaseBatch { DBCursor dbCursor = MORTGAGEDETAIL.find(new BasicDBObject('c_date', new BasicDBObject('$lte', countDate)).append('enterprise_id', enterpriseId)) Map result = Maps.newHashMap() for(DBObject dbObject : dbCursor) { - //房产集合 + //鎴夸骇闆嗗悎 List houseIds = dbObject.house_ids for(String houseId : houseIds) { DBObject findHouseObj = COLLATERAL.findOne(new BasicDBObject('_id', new ObjectId(houseId))) @@ -483,19 +483,19 @@ class RiskControlData extends BaseBatch { } /** - * 估价 + * 浼颁环 * @param city * @param region * @param districtName - * @param area 面积 - * @param propertyType 物业类型。 0:普通住宅,1:别墅,2:商住 + * @param area 闈㈢Н + * @param propertyType 鐗╀笟绫诲瀷銆� 0锛氭櫘閫氫綇瀹咃紝1锛氬埆澧咃紝2锛氬晢浣� * @param height * @param floor * @return */ private int curDistrictPrice(def city, def region, def districtName, def area, def estate_type = null, def height = null, def floor = null, Date calDate = new Date()) { def propertyType = 0 - if(estate_type != null && estate_type.contains('别墅')) { + if(estate_type != null && estate_type.contains('鍒')) { propertyType = 1 } JSONObject jo = OpenApiClient.evaluateDistrictPrice(city, region, districtName, area, propertyType, height, floor, calDate) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/pds/RiskControlMapBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/pds/RiskControlMapBatch.groovy index a541b0d42..3c1d62d08 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/pds/RiskControlMapBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/pds/RiskControlMapBatch.groovy @@ -33,7 +33,7 @@ class RiskControlMapBatch extends BaseBatch { // final static DBCollection USER = new Mongo("192.168.0.136", 27017).getDB('fangjia_pds').getCollection('user'); final static DBCollection COLLATERAL = new Mongo(PDS_DBHOST, 52005).getDB('fangjia_pds').getCollection('collateral_evaluation_info'); final static DBCollection ENTERPRISE = new Mongo(PDS_DBHOST, 52005).getDB('fangjia_pds').getCollection('enterprise'); - //此表中存放的是已放入押品库的押品数据 + //姝よ〃涓瓨鏀剧殑鏄凡鏀惧叆鎶煎搧搴撶殑鎶煎搧鏁版嵁 final static DBCollection MORTGAGEDETAIL = new Mongo(PDS_DBHOST, 52005).getDB('fangjia_pds').getCollection('mortgage_detail'); final static DBCollection RISK_CONTROL = new Mongo(PDS_DBHOST, 52005).getDB('fangjia_pds').getCollection('risk_control'); @@ -54,7 +54,7 @@ class RiskControlMapBatch extends BaseBatch { void process(Object args) { Date countDate = new Date() long start = System.currentTimeMillis() - println "[RiskControlBatch] 开始分析:" + DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) + println "[RiskControlBatch] 寮�濮嬪垎鏋愶細" + DateUtil.formatToTightYYYYMMDDhhmmss(new Date()) DBCursor enterpriseCursor = ENTERPRISE.find().addOption(Bytes.QUERYOPTION_NOTIMEOUT) for(DBObject enterpriseDbObject : enterpriseCursor) { @@ -62,13 +62,13 @@ class RiskControlMapBatch extends BaseBatch { count(enterpriseId, countDate) } - //删除旧数据 + //鍒犻櫎鏃ф暟鎹� RISK_MAP.remove(new BasicDBObject('count_date', new BasicDBObject('$ne', DateUtil.formatToYYYYMMDD(countDate)))) - println "[RiskControlBatch] 分析结束,用时 ${(System.currentTimeMillis() - start)/1000} 秒" + println "[RiskControlBatch] 鍒嗘瀽缁撴潫锛岀敤鏃� ${(System.currentTimeMillis() - start)/1000} 绉�" def noteUrl = "${PDS_HOST}/pdsRiskMap/sendRiskEmail?token=5850cf09fe432a5effe58fcb&countDate=${DateUtil.formatByPattern(countDate, 'yyyy-MM-dd')}" def result = new HttpRequest().get(noteUrl, null, "utf-8") - println "[RiskControlBatch] 通知风险指数监控结束,结果:" + result.toString() + println "[RiskControlBatch] 閫氱煡椋庨櫓鎸囨暟鐩戞帶缁撴潫锛岀粨鏋滐細" + result.toString() } @@ -77,19 +77,19 @@ class RiskControlMapBatch extends BaseBatch { DBCursor dbCursor = MORTGAGEDETAIL.find(new BasicDBObject('c_date', new BasicDBObject('$lte', countDate)).append('enterprise_id', enterpriseId)) for(DBObject dbObject : dbCursor) { - //贷款期限 + //璐锋鏈熼檺 Integer loanMonth = dbObject.loan_month - //年化利率 + //骞村寲鍒╃巼 Double rate = dbObject.rate - //放贷时间 + //鏀捐捶鏃堕棿 Date lendingDate = dbObject.lending_date - //还款方式 + //杩樻鏂瑰紡 Integer repaymentWay = dbObject.repayment_way - //放贷金额 + //鏀捐捶閲戦 Integer lendingPrice = dbObject.lending_price - //房产集合 + //鎴夸骇闆嗗悎 List houseIds = dbObject.house_ids - //贷款人集合 + //璐锋浜洪泦鍚� List borrowerIds = dbObject.card_ids if(!loanMonth || !rate || !lendingDate || !repaymentWay || !lendingPrice) { @@ -104,7 +104,7 @@ class RiskControlMapBatch extends BaseBatch { saveData.put('repay_way', repaymentWay) saveData.put('enterprise_id', enterpriseId) - //贷款人信息 + //璐锋浜轰俊鎭� String name = null String phone = null for(String borrowerId: borrowerIds) { @@ -118,13 +118,13 @@ class RiskControlMapBatch extends BaseBatch { saveData.put('name', name) saveData.put('phone', phone) - //放贷时估价 + //鏀捐捶鏃朵及浠� int oriPrice = 0; - //当前市值 + //褰撳墠甯傚�� int curPrice = 0; - //经纬度集合 + //缁忕含搴﹂泦鍚� def latLngs = [:] - //小区集合 + //灏忓尯闆嗗悎 def districts = [] for(String houseId : houseIds) { DBObject findObj = COLLATERAL.findOne(new BasicDBObject('_id', new ObjectId(houseId))) @@ -151,13 +151,13 @@ class RiskControlMapBatch extends BaseBatch { if(latLngs.size() > 0 && curPrice!=0) { saveData.put('districts', districts) saveData.put('ori_price', oriPrice); - //抵押率 + //鎶垫娂鐜� saveData.put('mortgage_rate', (Double) lendingPrice / oriPrice); - //即时抵押率 - //贷款余额 + //鍗虫椂鎶垫娂鐜� + //璐锋浣欓 def remainInterest = LoanUtil.remainInterest(lendingPrice, loanMonth, rate, repaymentWay, lendingDate) saveData.put('cur_mortgage_rate', (Double) remainInterest / curPrice) - //风险指数: CLTV / LTV + //椋庨櫓鎸囨暟: CLTV / LTV saveData.put('risk_rate', (Double) (remainInterest / curPrice) / (lendingPrice / oriPrice)) //upset @@ -178,13 +178,13 @@ class RiskControlMapBatch extends BaseBatch { } /** - * 对CPDB进行一次性统计,减少查库次数 + * 瀵笴PDB杩涜涓�娆℃�х粺璁★紝鍑忓皯鏌ュ簱娆℃暟 *
    -     *  统计内容:
    -     *      1. 上涨比率及相应增长率
    -     *      2. 下跌比率及相应增长率
    -     *      3. 平均涨幅
    -     *      4. 总市值
    +     *  缁熻鍐呭锛�
    +     *      1. 涓婃定姣旂巼鍙婄浉搴斿闀跨巼
    +     *      2. 涓嬭穼姣旂巼鍙婄浉搴斿闀跨巼
    +     *      3. 骞冲潎娑ㄥ箙
    +     *      4. 鎬诲競鍊�
          * 
    * @param countDate * @return @@ -218,15 +218,15 @@ class RiskControlMapBatch extends BaseBatch { area = area.replaceAll('[^.\\d]', '') avgPrice = avgPrice.replaceAll('[^.\\d]', '') - //当前总价 + //褰撳墠鎬讳环 def curPrice = curDistrictPrice(city, region, districtName, NumberUtils.toDouble(area)) - //导入时总价 + //瀵煎叆鏃舵�讳环 def oriPrice = new BigDecimal(area).multiply(new BigDecimal(avgPrice)) - //将涨幅加入到总涨幅中 + //灏嗘定骞呭姞鍏ュ埌鎬绘定骞呬腑 totalPriceRate += (curPrice / oriPrice - 1) cpdbTotalPrice += curPrice - // 如果当前总价 == 导入时总价,不计入结果 + // 濡傛灉褰撳墠鎬讳环 == 瀵煎叆鏃舵�讳环锛屼笉璁″叆缁撴灉 if (curPrice > oriPrice) { upNumberCount++ totalWithNoSame++ @@ -249,7 +249,7 @@ class RiskControlMapBatch extends BaseBatch { } /** - * CPDB库上涨比率及对应的增长率 + * CPDB搴撲笂娑ㄦ瘮鐜囧強瀵瑰簲鐨勫闀跨巼 * @param enterpriseId * @param date */ @@ -273,11 +273,11 @@ class RiskControlMapBatch extends BaseBatch { ||StringUtils.isBlank(districtName) || StringUtils.isBlank(area) || StringUtils.isBlank(avgPrice)) { continue } - //当前总价 + //褰撳墠鎬讳环 def curPrice = curDistrictPrice(city, region, districtName, area) - //导入时总价 + //瀵煎叆鏃舵�讳环 def oriPrice = new BigDecimal(area).multiply(new BigDecimal(avgPrice)) - // 如果当前总价 == 导入时总价,不计入结果 + // 濡傛灉褰撳墠鎬讳环 == 瀵煎叆鏃舵�讳环锛屼笉璁″叆缁撴灉 if(curPrice > oriPrice) { upNumberCount++ total++ @@ -299,7 +299,7 @@ class RiskControlMapBatch extends BaseBatch { } /** - * 存量押品库涨跌比率及平均增长率 + * 瀛橀噺鎶煎搧搴撴定璺屾瘮鐜囧強骞冲潎澧為暱鐜� * @param enterpriseId * @param date * @return @@ -313,11 +313,11 @@ class RiskControlMapBatch extends BaseBatch { long downNumberCount = 0 double totalDownNumberRate = 0 for(DBObject dbObject : dbCursor) { - //当前总价 + //褰撳墠鎬讳环 def curPrice = curDistrictPrice(dbObject.city, dbObject.region, dbObject.district_name, dbObject.area, dbObject.estate_type, dbObject.height, dbObject.floor) - //导入时总价 + //瀵煎叆鏃舵�讳环 def oriPrice = dbObject.total_price - // 如果当前总价 == 导入时总价,不计入结果 + // 濡傛灉褰撳墠鎬讳环 == 瀵煎叆鏃舵�讳环锛屼笉璁″叆缁撴灉 if(curPrice > oriPrice) { upNumberCount++ total++ @@ -339,7 +339,7 @@ class RiskControlMapBatch extends BaseBatch { } /** - * CPDB押品平均涨幅 + * CPDB鎶煎搧骞冲潎娑ㄥ箙 * @param date * @return */ @@ -370,7 +370,7 @@ class RiskControlMapBatch extends BaseBatch { } /** - * 存量押品平均涨幅 + * 瀛橀噺鎶煎搧骞冲潎娑ㄥ箙 * @param date * @return */ @@ -380,9 +380,9 @@ class RiskControlMapBatch extends BaseBatch { def result = 0 def count = 0 for(DBObject dbObject : dbCursor) { - //当前总价 + //褰撳墠鎬讳环 def curPrice = curDistrictPrice(dbObject.city, dbObject.region, dbObject.district_name, dbObject.area, dbObject.estate_type, dbObject.height, dbObject.floor) - //导入时总价 + //瀵煎叆鏃舵�讳环 def oriPrice = dbObject.total_price if(curPrice != 0 && oriPrice != 0 && curPrice!=oriPrice) { result += ((curPrice-oriPrice) / oriPrice) @@ -394,7 +394,7 @@ class RiskControlMapBatch extends BaseBatch { } /** - * 即时抵押率CLTV: 总剩余本金/即时总市值 + * 鍗虫椂鎶垫娂鐜嘋LTV: 鎬诲墿浣欐湰閲�/鍗虫椂鎬诲競鍊� * @param date * @return */ @@ -419,14 +419,14 @@ class RiskControlMapBatch extends BaseBatch { } /** - * 原始抵押率LTV - * @param date 统计时间 + * 鍘熷鎶垫娂鐜嘗TV + * @param date 缁熻鏃堕棿 * @return */ double getOriMortgageRate(String enterpriseId, Date date) { - // 存量押品发放贷款总额 + // 瀛橀噺鎶煎搧鍙戞斁璐锋鎬婚 long totalStockLendPrice = 0 - // 存量押品原总市值 + // 瀛橀噺鎶煎搧鍘熸�诲競鍊� long oristockHousePrice = 0 DBObject query = new BasicDBObject("create_date", new BasicDBObject('$lte', date)).append("enterprise_id", enterpriseId) @@ -443,20 +443,20 @@ class RiskControlMapBatch extends BaseBatch { } /** - * 贷款余额 + * 璐锋浣欓 * @param date * @return */ long getBalance(String enterpriseId, Date date) { - // 存量押品发放贷款总额 + // 瀛橀噺鎶煎搧鍙戞斁璐锋鎬婚 long totalStockLendPrice = 0 DBObject query = new BasicDBObject("create_date", new BasicDBObject('$lte', date)).append("enterprise_id", enterpriseId) DBCursor dbCursor = COLLATERAL.find(query).addOption(Bytes.QUERYOPTION_NOTIMEOUT) for(DBObject dbObject : dbCursor) { - //实际放贷金额 + //瀹為檯鏀捐捶閲戦 def lendPrice = (dbObject.lending_total_price)?:0 - //TODO 已还金额 + //TODO 宸茶繕閲戦 // def repayment = LoanUtil.repaymentCount(dbObject.lending_total_price) def repayment = 0 totalStockLendPrice += (lendPrice - repayment) @@ -465,8 +465,8 @@ class RiskControlMapBatch extends BaseBatch { } /** - * 存量押品总市值 - * @param calDate 估值时间 + * 瀛橀噺鎶煎搧鎬诲競鍊� + * @param calDate 浼板�兼椂闂� * @return */ private long getstockHousePrice(String enterpriseId, Date countDate) { @@ -480,19 +480,19 @@ class RiskControlMapBatch extends BaseBatch { } /** - * 估价,当前总价 + * 浼颁环锛屽綋鍓嶆�讳环 * @param city * @param region * @param districtName - * @param area 面积 - * @param propertyType 物业类型。 0:普通住宅,1:别墅,2:商住 + * @param area 闈㈢Н + * @param propertyType 鐗╀笟绫诲瀷銆� 0锛氭櫘閫氫綇瀹咃紝1锛氬埆澧咃紝2锛氬晢浣� * @param height * @param floor * @return */ private double curDistrictPrice(def city, def region, def districtName, def area, def estate_type = null, def height = null, def floor = null) { def propertyType = 0 - /*if(estate_type != null && estate_type.contains('别墅')) { + /*if(estate_type != null && estate_type.contains('鍒')) { propertyType = 1 }*/ JSONObject jo = OpenApiClient.evaluateDistrictPrice(city, region, districtName, area, propertyType, height, floor) @@ -503,7 +503,7 @@ class RiskControlMapBatch extends BaseBatch { } /** - * 获取统计时间,因为是一天一次,所以每次统计时间截至为昨天的最后一秒 + * 鑾峰彇缁熻鏃堕棿锛屽洜涓烘槸涓�澶╀竴娆★紝鎵�浠ユ瘡娆$粺璁℃椂闂存埅鑷充负鏄ㄥぉ鐨勬渶鍚庝竴绉� * @return */ private Date getCountDate() { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/pds/TrafficCityLevelBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/pds/TrafficCityLevelBatch.groovy index 3f4cd1016..e698ea722 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/pds/TrafficCityLevelBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/pds/TrafficCityLevelBatch.groovy @@ -17,16 +17,16 @@ import net.sf.json.JSONArray import net.sf.json.JSONObject /** - * 小区附近中介数在城市排名 + * 灏忓尯闄勮繎涓粙鏁板湪鍩庡競鎺掑悕 * @author hubingliang * */ class TrafficCityLevelBatch{ public static final DBCollection TRAFFICLEVEL = MongoUtils.getCollectionByName("fangjia_stat", "pds.traffic_level", "mongo.db.fangjia.com", 27017) public static final DBCollection SERVER_AREA = MongoUtils.getCollectionByName("fangjia", "server_area", "mongo.db.fangjia.com", 27017) - private static final Pattern ADDR_PATTERN = Pattern.compile('.*路\\d*号|.*路\\d*弄', Pattern.CASE_INSENSITIVE); + private static final Pattern ADDR_PATTERN = Pattern.compile('.*璺痋\d*鍙穦.*璺痋\d*寮�', Pattern.CASE_INSENSITIVE); private static final Pattern ADDR_PATTERN2 = Pattern.compile('.*\\d$', Pattern.CASE_INSENSITIVE); - private static final Pattern NAME_PATTERN = Pattern.compile('.*医院|.*诊所|.*门诊|.*服务站|.*大学|.*学校|.*学院|.*中学|.*高中|.*小学|.*高级中学|.*初级中学|.*幼儿园', Pattern.CASE_INSENSITIVE); + private static final Pattern NAME_PATTERN = Pattern.compile('.*鍖婚櫌|.*璇婃墍|.*闂ㄨ瘖|.*鏈嶅姟绔檤.*澶у|.*瀛︽牎|.*瀛﹂櫌|.*涓|.*楂樹腑|.*灏忓|.*楂樼骇涓|.*鍒濈骇涓|.*骞煎効鍥�', Pattern.CASE_INSENSITIVE); def static namemap = new ConcurrentHashMap() def static removeList = [] @@ -48,7 +48,7 @@ class TrafficCityLevelBatch{ List citys = getCitys(); for(String city:citys){ println city - /*if("北京".equals(city)||"上海".equals(city)||"广州".equals("city")){ + /*if("鍖椾含".equals(city)||"涓婃捣".equals(city)||"骞垮窞".equals("city")){ continue; }*/ cityTrafficLevel(city); @@ -116,7 +116,7 @@ class TrafficCityLevelBatch{ } - //城市差绝对值排名 + //鍩庡競宸粷瀵瑰�兼帓鍚� public static Map getMinAbslevelMap(List minAbsList){ Collections.sort(minAbsList,new Comparator(){ public int compare(Integer o1, Integer o2) { @@ -140,7 +140,7 @@ class TrafficCityLevelBatch{ /** - * 地铁数量 + * 鍦伴搧鏁伴噺 * @return */ def static getMetroCount(Double lng,Double lat) { @@ -148,7 +148,7 @@ class TrafficCityLevelBatch{ } /** - *公交数量 + *鍏氦鏁伴噺 * @return */ def static getBusCount(Double lng,Double lat){ @@ -156,7 +156,7 @@ class TrafficCityLevelBatch{ } /** - * 获取城市的小区 + * 鑾峰彇鍩庡競鐨勫皬鍖� * @param city * @return */ @@ -170,7 +170,7 @@ class TrafficCityLevelBatch{ return dbs; } - //获取全国城市 + //鑾峰彇鍏ㄥ浗鍩庡競 public static List getCitys(){ List citys = new ArrayList(); DBCursor dbs = SERVER_AREA.find(); @@ -209,9 +209,9 @@ class TrafficCityLevelBatch{ def allResults = [] if(jsonObj!=null&&jsonObj.get("status").equals("1")){ int count = jsonObj.getInt("count") - if(keywords.equals("医院") || keywords.equals("学校") || keywords.equals("写字楼") || keywords.equals("停车场") - || keywords.equals("公园") || keywords.equals("大型超市") || keywords.equals("电影院") || keywords.equals("综合商场") - || keywords.equals("星级酒店") || keywords.equals("整容整形")) { + if(keywords.equals("鍖婚櫌") || keywords.equals("瀛︽牎") || keywords.equals("鍐欏瓧妤�") || keywords.equals("鍋滆溅鍦�") + || keywords.equals("鍏洯") || keywords.equals("澶у瀷瓒呭競") || keywords.equals("鐢靛奖闄�") || keywords.equals("缁煎悎鍟嗗満") + || keywords.equals("鏄熺骇閰掑簵") || keywords.equals("鏁村鏁村舰")) { totalPageNum = (count + 25 - 1) / 25; JSONArray pois = jsonObj.get("pois") processGetPoiCountByGaoDe(pois, allResults) @@ -226,13 +226,13 @@ class TrafficCityLevelBatch{ def matchResults = [] def map = [:] - println keywords+":原始"+radius+"米:"+allResults + println keywords+":鍘熷"+radius+"绫筹細"+allResults allResults.each {re -> map.put(re[1], re[0]) } - //名称去重 + //鍚嶇О鍘婚噸 //def namemap = [:] - if(keywords.equals("医院") || keywords.equals("学校")){ + if(keywords.equals("鍖婚櫌") || keywords.equals("瀛︽牎")){ namemap = new ConcurrentHashMap() map.each { k ,v -> namemap.put(v, k) @@ -243,10 +243,10 @@ class TrafficCityLevelBatch{ forMap.each { k,v -> matchNameContains(forMap, k) } - println keywords+"去重"+radius+"米:"+namemap + println keywords+"鍘婚噸"+radius+"绫筹細"+namemap return namemap.size() } else { - println keywords+"去重"+radius+"米:"+map + println keywords+"鍘婚噸"+radius+"绫筹細"+map return map.size() } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/pds/util/LoanUtil.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/pds/util/LoanUtil.groovy index e2bb6161f..65a8e9f79 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/pds/util/LoanUtil.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/pds/util/LoanUtil.groovy @@ -3,18 +3,18 @@ package com.fangjia.script.pds.util import java.text.DecimalFormat /** - * 贷款工具类 + * 璐锋宸ュ叿绫� * Created by linxsh on 2016/12/12. */ class LoanUtil { /** - *

    等额本息-每月还本付息金额

    + *

    绛夐鏈伅-姣忔湀杩樻湰浠樻伅閲戦

    * - * 每月还本付息金额=贷款额*还款月数*(月利率+1)^还款月数/((月利率+1)^还款月数-1) - * @param amount 贷款金额(万元) - * @param month 贷款月数 - * @param rate 年利率: 如4.65% ,则为 4.65 + * 姣忔湀杩樻湰浠樻伅閲戦=璐锋棰�*杩樻鏈堟暟*(鏈堝埄鐜�+1)^杩樻鏈堟暟/((鏈堝埄鐜�+1)^杩樻鏈堟暟-1) + * @param amount 璐锋閲戦锛堜竾鍏冿級 + * @param month 璐锋鏈堟暟 + * @param rate 骞村埄鐜�: 濡�4.65% 锛屽垯涓� 4.65 * * @return */ @@ -25,19 +25,19 @@ class LoanUtil { } /** - *

    等额本息-剩余本金

    + *

    绛夐鏈伅-鍓╀綑鏈噾

    * - * @param amount 贷款金额(万元) - * @param month 贷款总月数 - * @param rate 年利率: 如4.65% ,则为 4.65 - * @param monthCount 已还款月数 + * @param amount 璐锋閲戦锛堜竾鍏冿級 + * @param month 璐锋鎬绘湀鏁� + * @param rate 骞村埄鐜�: 濡�4.65% 锛屽垯涓� 4.65 + * @param monthCount 宸茶繕娆炬湀鏁� * @return */ static double remainInterestForP(def amount, def month, def rate, int monthCount) { if(monthCount >= month) { return 0 } - //每月还款总额 + //姣忔湀杩樻鎬婚 def payment = monthlyPaymentWithInterestForP(amount, month, rate) payment = formatNumber(payment) @@ -51,11 +51,11 @@ class LoanUtil { } /** - *

    等额本金-剩余本金

    - * @param amount 贷款金额(元) - * @param month 贷款总月数 - * @param rate 年利率: 如4.65% ,则为 4.65 - * @param monthCount 已还款月数 + *

    绛夐鏈噾-鍓╀綑鏈噾

    + * @param amount 璐锋閲戦锛堝厓锛� + * @param month 璐锋鎬绘湀鏁� + * @param rate 骞村埄鐜�: 濡�4.65% 锛屽垯涓� 4.65 + * @param monthCount 宸茶繕娆炬湀鏁� * @return */ static double remainInterestForC(def amount, def month, int monthCount) { @@ -69,11 +69,11 @@ class LoanUtil { } /** - * 计算剩余本金 + * 璁$畻鍓╀綑鏈噾 * @param amount * @param month * @param monthCount - * @param type 还款方式。1:等额本息;2:等额本金 + * @param type 杩樻鏂瑰紡銆�1锛氱瓑棰濇湰鎭紱2锛氱瓑棰濇湰閲� * @return */ static double remainInterest(def amount, int month, def rate, def type = 1, Date startDate, def date = new Date()) { @@ -90,11 +90,11 @@ class LoanUtil { } /** - * 计算剩余本息 + * 璁$畻鍓╀綑鏈伅 * @param amount * @param month * @param monthCount - * @param type 还款方式。1:等额本息;2:等额本金 + * @param type 杩樻鏂瑰紡銆�1锛氱瓑棰濇湰鎭紱2锛氱瓑棰濇湰閲� * @return */ static double remainInterest2(def amount, int month, def rate, def type=1, Date startDate, def date = new Date()) { @@ -106,13 +106,13 @@ class LoanUtil { return 0 } if(type==2) { - //获取总还款额:总利息+贷款额 + //鑾峰彇鎬昏繕娆鹃锛氭�诲埄鎭�+璐锋棰� def totalInterest = getTotalInterestForC(amount, month, rate) + amount - //已还款额 + //宸茶繕娆鹃 def firstPay = getPayMonthForC(amount, month, rate) def lessNumber = getLessMonthForC(amount, month, rate) def payedPrice = (firstPay * 2 - lessNumber * (monthCount - 1)) * monthCount / 2 - //总还款额 - 已还款额 + //鎬昏繕娆鹃 - 宸茶繕娆鹃 return formatNumber(totalInterest - payedPrice) } else if(type==1) { return formatNumber(amount - monthlyPaymentWithInterestForP(amount, month, rate) * monthCount) @@ -149,11 +149,11 @@ class LoanUtil { } /** - *

    等额本金-首月还款额

    - * 首月还款额=贷款额/还款月数+贷款额*月利率 - * amount:贷款金额(万元) - * month:贷款月数 - * rate:年利率 + *

    绛夐鏈噾-棣栨湀杩樻棰�

    + * 棣栨湀杩樻棰�=璐锋棰�/杩樻鏈堟暟+璐锋棰�*鏈堝埄鐜� + * amount锛氳捶娆鹃噾棰濓紙涓囧厓锛� + * month锛氳捶娆炬湀鏁� + * rate锛氬勾鍒╃巼 */ static def getPayMonthForC(def amount, def month, def rate) { def monthRate = rate / 1200; @@ -161,11 +161,11 @@ class LoanUtil { } /** - *

    等额本金-总利息

    - * 总利息=贷款额*月利率*(还款月数+1)/2 - * amount:贷款金额(元) - * month:贷款月数 - * rate:年利率 + *

    绛夐鏈噾-鎬诲埄鎭�

    + * 鎬诲埄鎭�=璐锋棰�*鏈堝埄鐜�*锛堣繕娆炬湀鏁�+1锛�/2 + * amount锛氳捶娆鹃噾棰濓紙鍏冿級 + * month锛氳捶娆炬湀鏁� + * rate锛氬勾鍒╃巼 */ static def getTotalInterestForC(amount, month, rate) { def monthRate = rate / 1200; @@ -173,11 +173,11 @@ class LoanUtil { } /** - *

    等额本金-还款每月递减额

    - * 还款每月递减额=贷款额/还款月数*月利率 - * amount:贷款金额(元) - * month:贷款月数 - * rate:年利率 + *

    绛夐鏈噾-杩樻姣忔湀閫掑噺棰�

    + * 杩樻姣忔湀閫掑噺棰�=璐锋棰�/杩樻鏈堟暟*鏈堝埄鐜� + * amount锛氳捶娆鹃噾棰濓紙鍏冿級 + * month锛氳捶娆炬湀鏁� + * rate锛氬勾鍒╃巼 */ static def getLessMonthForC(amount, month, rate) { def monthRate = rate / 1200; @@ -185,7 +185,7 @@ class LoanUtil { } /** - * 格式化为两位小数 + * 鏍煎紡鍖栦负涓や綅灏忔暟 * @param number * @return */ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/pics/AddShopPics.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/pics/AddShopPics.groovy index 1a93f6d44..de74e6931 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/pics/AddShopPics.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/pics/AddShopPics.groovy @@ -7,7 +7,7 @@ import com.mongodb.BasicDBObject import com.mongodb.DBObject /** - * 补充商铺的图片,商铺中没有图片的采用小区的图片 + * 琛ュ厖鍟嗛摵鐨勫浘鐗囷紝鍟嗛摵涓病鏈夊浘鐗囩殑閲囩敤灏忓尯鐨勫浘鐗� * @author gaojuan * */ @@ -17,12 +17,12 @@ class AddShopPics { static main(args) { def task = new AddShopPics(); - task.run("南京", "shop"); + task.run("鍗椾含", "shop"); } def run(def city, def cat){ def ret = getAllDistricts(city, cat); - println city +" 没有图片的【"+cat+"】共"+ret.size(); + println city +" 娌℃湁鍥剧墖鐨勩��"+cat+"銆戝叡"+ret.size(); updatePices(city, ret); } @@ -67,7 +67,7 @@ class AddShopPics { def picsMap = findDistrictPics(city, m.region, m.name); println m.name if(!picsMap.pics && !picsMap.out_pics){ - picsMap = findDistrictPics(city, m.region, m.name.replace("商铺", "").trim()); + picsMap = findDistrictPics(city, m.region, m.name.replace("鍟嗛摵", "").trim()); } if(picsMap.pics || picsMap.out_pics){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/pics/BackupDistrictPics.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/pics/BackupDistrictPics.groovy index 2baa786fd..67e611e86 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/pics/BackupDistrictPics.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/pics/BackupDistrictPics.groovy @@ -19,8 +19,8 @@ import com.mongodb.DBObject import com.mongodb.Mongo /** - * 备份线上datastore中小区、新盘、商铺、写字楼的图片URL - * 增量备份 + * 澶囦唤绾夸笂datastore涓皬鍖恒�佹柊鐩樸�佸晢閾恒�佸啓瀛楁ゼ鐨勫浘鐗嘦RL + * 澧為噺澶囦唤 * @author yukai */ @BatchOwner(Watcher.YuKai) @@ -162,7 +162,7 @@ class BackupDistrictPics extends BaseBatch { } /** - * 房型图列表转换为string列表 + * 鎴垮瀷鍥惧垪琛ㄨ浆鎹负string鍒楄〃 * * @param srcs * @return diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/pics/DownloadDistrictPics.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/pics/DownloadDistrictPics.groovy index c1bcb59fd..ac5e992a4 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/pics/DownloadDistrictPics.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/pics/DownloadDistrictPics.groovy @@ -22,7 +22,7 @@ import com.mongodb.Mongo /** - * 小区、新盘、商铺、写字楼 图片下载任务分发 ,cat类型通过args传入 + * 灏忓尯銆佹柊鐩樸�佸晢閾恒�佸啓瀛楁ゼ 鍥剧墖涓嬭浇浠诲姟鍒嗗彂 锛宑at绫诲瀷閫氳繃args浼犲叆 * @author yukai */ @BatchOwner(Watcher.YuKai) @@ -65,7 +65,7 @@ class DownloadDistrictPics extends BaseBatch { if ("shop" == cat || "office" == cat) { keys.put("pics", 1); } -// keys.put("matching_pics", 1); // 目前没有展示,先不下载 +// keys.put("matching_pics", 1); // 鐩墠娌℃湁灞曠ず锛屽厛涓嶄笅杞� def index = 0; HttpAsyncClient httpclient = new DefaultHttpAsyncClient(); @@ -136,7 +136,7 @@ class DownloadDistrictPics extends BaseBatch { } /** - * 房型图列表转换为string列表 + * 鎴垮瀷鍥惧垪琛ㄨ浆鎹负string鍒楄〃 * * @param srcs * @return diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/pics/RemoveUselessPicsBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/pics/RemoveUselessPicsBatch.groovy index aa43f5a7b..8c38736a6 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/pics/RemoveUselessPicsBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/pics/RemoveUselessPicsBatch.groovy @@ -77,7 +77,7 @@ class RemoveUselessPicsBatch extends BaseBatch { return; } - // 搜房房源图片 + // 鎼滄埧鎴挎簮鍥剧墖 if (id.indexOf('soufunimg.com') > 0 && id.indexOf('houseinfo') > 0) { // println id // fsDB.remove(new BasicDBObject('_id', id)); @@ -98,9 +98,9 @@ class RemoveUselessPicsBatch extends BaseBatch { return; } - // 焦点 - // 房源:http://img1.f.itc.cn/esf/10692/600x450_106920078.jpg - // 小区:http://img1.f.itc.cn/esf/3394/24/1/600x450_33942401.jpg + // 鐒︾偣 + // 鎴挎簮锛歨ttp://img1.f.itc.cn/esf/10692/600x450_106920078.jpg + // 灏忓尯锛歨ttp://img1.f.itc.cn/esf/3394/24/1/600x450_33942401.jpg // http://img1.f.itc.cn/esf/5397/98/87/600x450_53979887.jpg if (id.indexOf('.f.itc.cn/esf/') > 0 && id.split('/').length <= 6) { // println id @@ -110,9 +110,9 @@ class RemoveUselessPicsBatch extends BaseBatch { return; } - // 安居客 - // 房源:http://pic1.ajkimg.com/display/anjuke/b2b73f-%E6%88%BF%E6%99%94/e004f79003be08c57a3c655bfeaba0f6-600x600.jpg - // 小区:http://pic1.ajkimg.com/display/anjuke/d23b1aba308b59ca7f56e1a528c8202c/820x615.jpg + // 瀹夊眳瀹� + // 鎴挎簮锛歨ttp://pic1.ajkimg.com/display/anjuke/b2b73f-%E6%88%BF%E6%99%94/e004f79003be08c57a3c655bfeaba0f6-600x600.jpg + // 灏忓尯锛歨ttp://pic1.ajkimg.com/display/anjuke/d23b1aba308b59ca7f56e1a528c8202c/820x615.jpg if (id.indexOf('.ajkimg.com/display/anjuke/') > 0 && id.split('-').length > 2) { // println id // fsDB.remove(new BasicDBObject('_id', id)); @@ -121,9 +121,9 @@ class RemoveUselessPicsBatch extends BaseBatch { return; } - // 链家 - // 房源:http://image.homelink.com.cn/era/2013/3/10/BJFT85562348/219345528_big.jpg - // 小区:http://image.homelink.com.cn/era/community/2013/5/12/1111027380054/43108192_big.jpg + // 閾惧 + // 鎴挎簮锛歨ttp://image.homelink.com.cn/era/2013/3/10/BJFT85562348/219345528_big.jpg + // 灏忓尯锛歨ttp://image.homelink.com.cn/era/community/2013/5/12/1111027380054/43108192_big.jpg if (id.indexOf('image.homelink.com.cn/era/') > 0 && id.indexOf('community') < 0) { // println id // fsDB.remove(new BasicDBObject('_id', id)); @@ -132,9 +132,9 @@ class RemoveUselessPicsBatch extends BaseBatch { return; } - // 淘房屋 - // 房源:http://img.taofw.cn/upfile/010/20100709/4189090543503896.jpg - // 小区:http://img.taofw.cn/imghouse/010/20101209/090217027488.jpg + // 娣樻埧灞� + // 鎴挎簮锛歨ttp://img.taofw.cn/upfile/010/20100709/4189090543503896.jpg + // 灏忓尯锛歨ttp://img.taofw.cn/imghouse/010/20101209/090217027488.jpg if (id.indexOf('img.taofw.cn/upfile/') > 0) { // println id // fsDB.remove(new BasicDBObject('_id', id)); @@ -143,9 +143,9 @@ class RemoveUselessPicsBatch extends BaseBatch { return; } - // 酷房 - // 房源:http://i02.koofang.com/house/sell/2013/5/201305101030557eiz7l518c5bdf771fb.jpg - // 小区:http://i02.koofang.com/attachments_comm/d/7/3/d731b01bfbd87e4727aad53f90ceef24.jpg + // 閰锋埧 + // 鎴挎簮锛歨ttp://i02.koofang.com/house/sell/2013/5/201305101030557eiz7l518c5bdf771fb.jpg + // 灏忓尯锛歨ttp://i02.koofang.com/attachments_comm/d/7/3/d731b01bfbd87e4727aad53f90ceef24.jpg if (id.indexOf('.koofang.com/house/sell/') > 0) { // println id // fsDB.remove(new BasicDBObject('_id', id)); @@ -154,9 +154,9 @@ class RemoveUselessPicsBatch extends BaseBatch { return; } - // 新浪乐居 - // 房源:http://pic.esf.sina.com.cn/img_sh/2013/05/31/e7/d4/org_20130531033300_110613699855807202.jpg - // 小区:http://pic.fangyou.com/img_sh/2011/03/24/64/2d/water_29422f11dc738a010e50bad73fe50c1a.jpg + // 鏂版氮涔愬眳 + // 鎴挎簮锛歨ttp://pic.esf.sina.com.cn/img_sh/2013/05/31/e7/d4/org_20130531033300_110613699855807202.jpg + // 灏忓尯锛歨ttp://pic.fangyou.com/img_sh/2011/03/24/64/2d/water_29422f11dc738a010e50bad73fe50c1a.jpg if (id.indexOf('pic.esf.sina.com.cn/img_sh/') > 0) { // println id // fsDB.remove(new BasicDBObject('_id', id)); @@ -166,9 +166,9 @@ class RemoveUselessPicsBatch extends BaseBatch { } // 58 - // 房源:http://3.pic.58control.cn/p1/big/n_1764430464388376.jpg + // 鎴挎簮锛歨ttp://3.pic.58control.cn/p1/big/n_1764430464388376.jpg // http://4.pic.58control.cn/p1/big/n_1764957839820569.jpg - // 小区:http://pic.58.com/images/xq_img/big/902/n_1582322188764441.jpg + // 灏忓尯锛歨ttp://pic.58.com/images/xq_img/big/902/n_1582322188764441.jpg if (id.indexOf('.pic.58control.cn/p1/big/') > 0) { // println id // fsDB.remove(new BasicDBObject('_id', id)); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/pics/RestoreDistrictPics.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/pics/RestoreDistrictPics.groovy index 0c3bb2cba..35016c5dc 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/pics/RestoreDistrictPics.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/pics/RestoreDistrictPics.groovy @@ -12,7 +12,7 @@ import com.mongodb.DBObject import com.mongodb.Mongo /** - * 恢复线上datastore中小区、新盘、商铺、写字楼的图片URL + * 鎭㈠绾夸笂datastore涓皬鍖恒�佹柊鐩樸�佸晢閾恒�佸啓瀛楁ゼ鐨勫浘鐗嘦RL * @author yukai */ @BatchOwner(Watcher.YuKai) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/pics/SortDistrictPics.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/pics/SortDistrictPics.groovy index 30c77894c..b429e557b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/pics/SortDistrictPics.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/pics/SortDistrictPics.groovy @@ -21,7 +21,7 @@ //import com.mongodb.Mongo // ///** -// * 小区、新盘、商铺、写字楼图片排序 +// * 灏忓尯銆佹柊鐩樸�佸晢閾恒�佸啓瀛楁ゼ鍥剧墖鎺掑簭 // * @author yukai // */ ////@BatchOwner(Watcher.YuKai) @@ -199,7 +199,7 @@ // DBObject query = new BasicDBObject('_id', district._id.toString()); // DBObject data = new BasicDBObject(); // -// // 户型图保留全部 +// // 鎴峰瀷鍥句繚鐣欏叏閮� // data.put('floorplan_pics', retFloors); // if (retOuts.size() > maxSize / 2) { // data.put('out_pics', getTop(retOuts, maxSize / 2)); @@ -207,7 +207,7 @@ // data.put('out_pics', retOuts); // } // -//// // 图片总数超过上限,则取top +//// // 鍥剧墖鎬绘暟瓒呰繃涓婇檺锛屽垯鍙杢op //// if (retFloors.size() + retOuts.size() > maxSize) { //// if (retFloors.size() > (maxSize / 2)) { //// data.put('floorplan_pics', getTop(retFloors, maxSize / 2)); @@ -217,7 +217,7 @@ //// //// data.put('out_pics', getTop(retOuts, maxSize - data.floorplan_pics.size())); //// } else { -//// // 没超过上限,全部保留 +//// // 娌¤秴杩囦笂闄愶紝鍏ㄩ儴淇濈暀 //// data.put('floorplan_pics', retFloors); //// data.put('out_pics', retOuts); //// } @@ -231,7 +231,7 @@ // // data.put('sample_pics', getTop(retSamples, maxSize - data.in_pics.size())); // } else { -// // 没超过上限,全部保留 +// // 娌¤秴杩囦笂闄愶紝鍏ㄩ儴淇濈暀 // data.put('in_pics', retIns); // data.put('sample_pics', retSamples); // } @@ -245,7 +245,7 @@ // // data.put('pics', getTop(retPics, maxSize - data.matching_pics.size())); // } else { -// // 没超过上限,全部保留 +// // 娌¤秴杩囦笂闄愶紝鍏ㄩ儴淇濈暀 // data.put('matching_pics', retMatchings); // data.put('pics', retPics); // } @@ -371,7 +371,7 @@ // } // // /** -// * 取得fs中不存在的图片URL +// * 鍙栧緱fs涓笉瀛樺湪鐨勫浘鐗嘦RL // */ // private remove404Pics(picInfos) { // def ret = []; @@ -387,7 +387,7 @@ // private doSort(picInfos) { //// Collections.sort(picInfos, new Comparator() { //// public int compare(PicInfo info1, PicInfo info2) { -//// // 图片不存在或者没正确读取信息,往后排 +//// // 鍥剧墖涓嶅瓨鍦ㄦ垨鑰呮病姝g‘璇诲彇淇℃伅锛屽線鍚庢帓 //// if (info1.is404 == true || info1.isEmpty == true || info1.isSmall == true) { //// return 1; //// } @@ -395,7 +395,7 @@ //// return -1; //// } //// -//// // 图片长宽比较大,往后排 +//// // 鍥剧墖闀垮姣旇緝澶э紝寰�鍚庢帓 //// if (info1.hdw < 0.5 || info1.hdw > 2) { //// return 1; //// } @@ -410,7 +410,7 @@ //// }); // // picInfos.sort { info1, info2 -> -// // 图片不存在或者没正确读取信息,往后排 +// // 鍥剧墖涓嶅瓨鍦ㄦ垨鑰呮病姝g‘璇诲彇淇℃伅锛屽線鍚庢帓 // if (info1.isF0f() || info1.isSmall()) { // return 1; // } @@ -418,7 +418,7 @@ // return -1; // } // -// // 图片长宽比较大,往后排 +// // 鍥剧墖闀垮姣旇緝澶э紝寰�鍚庢帓 //// if (info1.getHdw() < 0.5 || info1.getHdw() > 2) { //// return 1; //// } @@ -447,7 +447,7 @@ // } // // /** -// * 房型图列表转换为string列表 +// * 鎴垮瀷鍥惧垪琛ㄨ浆鎹负string鍒楄〃 // * // * @param srcs // * @return @@ -497,19 +497,19 @@ //// if(directories.hasNext()){ //// Directory directory = (Directory) directories.next(); //// -//// // 如果 imageInfo中无法读取,从exif中读取dpi +//// // 濡傛灉 imageInfo涓棤娉曡鍙栵紝浠巈xif涓鍙杁pi //// if(imageInfo.getPhysicalWidthDpi() <= 0 || imageInfo.getPhysicalHeightDpi() <= 0){ //// dipx = new BigDecimal(directory.getString(ExifDirectory.TAG_X_RESOLUTION)); //// dipy = new BigDecimal(directory.getString(ExifDirectory.TAG_Y_RESOLUTION)); //// if(dipx.equals(new BigDecimal(72)) || dipy.equals(new BigDecimal(72))) { -//// // 如果dpi为72的话,抛出错误,因为暂时无法确定从exif中读出的数据是对的 +//// // 濡傛灉dpi涓�72鐨勮瘽锛屾姏鍑洪敊璇紝鍥犱负鏆傛椂鏃犳硶纭畾浠巈xif涓鍑虹殑鏁版嵁鏄鐨� //// } else{ //// dipx = new BigDecimal(imageInfo.getPhysicalWidthDpi()); //// dipy = new BigDecimal(imageInfo.getPhysicalHeightDpi()); //// } //// } //// } -//// } catch (Exception e) { // 处理出错 +//// } catch (Exception e) { // 澶勭悊鍑洪敊 ////// e.printStackTrace(); //// } // @@ -520,12 +520,12 @@ // // public static class PicInfo { // private String imgUrl; -// private int hxw; // 图片高度*宽度(像素) -// private double hdw; // 图片高度÷宽度(像素) -// private double dpi; // 图片DPI -// private boolean f0f; // fs库中不存在 -// private boolean small; // 是否小于120*82 -// private boolean vertical; // 是否竖向图片 +// private int hxw; // 鍥剧墖楂樺害*瀹藉害锛堝儚绱狅級 +// private double hdw; // 鍥剧墖楂樺害梅瀹藉害锛堝儚绱狅級 +// private double dpi; // 鍥剧墖DPI +// private boolean f0f; // fs搴撲腑涓嶅瓨鍦� +// private boolean small; // 鏄惁灏忎簬120*82 +// private boolean vertical; // 鏄惁绔栧悜鍥剧墖 // public double score; // // public String getImgUrl() { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/pics/UpdatePicsUrl.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/pics/UpdatePicsUrl.groovy index a9254fe56..b45bb4740 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/pics/UpdatePicsUrl.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/pics/UpdatePicsUrl.groovy @@ -12,7 +12,7 @@ class UpdatePicsUrl { static main(args) { def task = new UpdatePicsUrl(); - task.run("南京", "office"); + task.run("鍗椾含", "office"); } public DSCollection getDataStoreConnection(){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ppc/PPCFetchDetailBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ppc/PPCFetchDetailBatch.groovy index e4f686c90..1a362a503 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ppc/PPCFetchDetailBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ppc/PPCFetchDetailBatch.groovy @@ -102,7 +102,7 @@ class PPCFetchDetailBatch extends BaseBatch { } def caller = ds.ANI.text(); if(StringUtils.isNotBlank(caller)&&!caller.startsWith('0')&&!caller.startsWith('1')){ - caller = '022'+caller;//无区号座机默认加上天津区号 + caller = '022'+caller;//鏃犲尯鍙峰骇鏈洪粯璁ゅ姞涓婂ぉ娲ュ尯鍙� } def callee = ds.DNI.text(); if(StringUtils.isNotBlank(callee)&&CELLPHONE_PATTERN.matcher(callee).matches()){ @@ -122,7 +122,7 @@ class PPCFetchDetailBatch extends BaseBatch { ext_code : ds.ExtCode.text().toInteger(), call_status : ds.CallResult.text().toInteger(), call_status_desc : ds.CallResult_str.text(), - ext_info : 'custID=' + ds.CustID.text() + '&recorderID=' + ds.RecorderID.text(),//企业编号-录音编号 + ext_info : 'custID=' + ds.CustID.text() + '&recorderID=' + ds.RecorderID.text(),//浼佷笟缂栧彿-褰曢煶缂栧彿 ]) def ppcMap = findPpcMapByBigCodeExtCode(ppcDetail.big_code, ppcDetail.ext_code) if(ppcMap){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/predict/PricePredictBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/predict/PricePredictBatch.groovy index a17eb1e84..e3b92dda2 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/predict/PricePredictBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/predict/PricePredictBatch.groovy @@ -14,8 +14,8 @@ import com.fangjia.script.util.DateUtils; import com.fangjia.script.commData.CommonDatautils; import com.fangjia.script.common.DataHandleUtils; /** - * 预测城市,区域,板块,小区的价格 - * 每月预测一次 + * 棰勬祴鍩庡競,鍖哄煙,鏉垮潡,灏忓尯鐨勪环鏍� + * 姣忔湀棰勬祴涓�娆� * @author gaojuan * */ @@ -28,7 +28,7 @@ class PricePredictBatch extends BaseBatch{ public static final DBCollection DIST_STAT_COLL = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "mongo.db.fangjia.com") public static final DBCollection OFFLINE_PRICE_PREDICT_COLL = MongoUtils.getCollectionByName("fangjia", "price_predict", "mongo.db.fangjia.com") - public final static typeMap = ["city":"城市", "region":"区域", "block":"板块", "district":"小区"]; + public final static typeMap = ["city":"鍩庡競", "region":"鍖哄煙", "block":"鏉垮潡", "district":"灏忓尯"]; static main(args) { runBatch(new PricePredictBatch(), args) @@ -37,7 +37,7 @@ class PricePredictBatch extends BaseBatch{ @Override public void process(Object args) { def factorMap = findAllFactors(); - def citys = ["上海", "南京"] + def citys = ["涓婃捣", "鍗椾含"] def calcDate = DateUtils.getFirstDayOfMonth(new Date()) Calendar calendar = Calendar.getInstance() calendar.setTime(calcDate) @@ -54,7 +54,7 @@ class PricePredictBatch extends BaseBatch{ } - //自定义价格影响因素 + //鑷畾涔変环鏍煎奖鍝嶅洜绱� def findAllFactors(){ def retMap = [:] PRICE_PREDICT_FACTOR_COLL.find().each { @@ -73,15 +73,15 @@ class PricePredictBatch extends BaseBatch{ def prices = findRegionStat(city, null, null, startDate, endDate) if(prices){ def avgPriceMap = getAvgPriceMarkup(prices); - //历史涨跌幅 + //鍘嗗彶娑ㄨ穼骞� //def newPrices = calcutePredictPrice(city, prices[prices.size()-1], avgPriceMap, factorMap); - //移动平均 + //绉诲姩骞冲潎 // def newPrices2 = calcutePredictPrice2(city, prices[prices.size()-1], avgPriceMap, factorMap);/**/ - //二次移动平均(加权) + //浜屾绉诲姩骞冲潎(鍔犳潈) def newPrices3 = calcutePredictPrice3(city, prices[prices.size()-1], avgPriceMap, factorMap); - //二次指数平滑法 + //浜屾鎸囨暟骞虫粦娉� //def newPrices4 = calcutePredictPrice4(city, prices[prices.size()-1], avgPriceMap, factorMap); - //最后四期价格的涨跌幅开3次方 + //鏈�鍚庡洓鏈熶环鏍肩殑娑ㄨ穼骞呭紑3娆℃柟 // def newPrices5 = calcutePredictPrice5(city, null, null, null, prices, factorMap) saveToDB(cat, city, null, null, null, endDate, newPrices3); } @@ -135,7 +135,7 @@ class PricePredictBatch extends BaseBatch{ } } - //export(ret, "e:\\数据\\预测涨跌幅.csv"); + //export(ret, "e:\\鏁版嵁\\棰勬祴娑ㄨ穼骞�.csv"); } def getAvgPriceMarkup(def prices){ @@ -152,7 +152,7 @@ class PricePredictBatch extends BaseBatch{ rets << prices[i]; } - //价格不够52期 + //浠锋牸涓嶅52鏈� if (pricesMap.size() < 13) { for (int i = 1; i < 13; i++) { if (!pricesMap.containsKey(i)) { @@ -161,7 +161,7 @@ class PricePredictBatch extends BaseBatch{ } } - //计算均值 + //璁$畻鍧囧�� def avgPriceMap = [:]; pricesMap.each{key, values-> avgPriceMap.put(key, (int)(values.sum()/values.size())); @@ -176,7 +176,7 @@ class PricePredictBatch extends BaseBatch{ def ratioMap = factorMap.get(city); def ratio = null; if(!ratioMap){ - ratioMap = factorMap.get("全国"); + ratioMap = factorMap.get("鍏ㄥ浗"); } if(ratioMap){ ratio = ratioMap.policy_ratio @@ -184,7 +184,7 @@ class PricePredictBatch extends BaseBatch{ return ratio; } - //方法一:历史涨跌幅推算 + //鏂规硶涓�锛氬巻鍙叉定璺屽箙鎺ㄧ畻 def calcutePredictPrice(def city, def lastPrice, def avgPriceMap, def factorMap){ def markupMap = [:] for(def j=1;j -1 || kind.indexOf('别墅') > -1 || kind.indexOf('公寓') > -1) && totalCount == 0) { + if((kind.indexOf('灏忓尯') > -1 || kind.indexOf('鍒') > -1 || kind.indexOf('鍏瘬') > -1) && totalCount == 0) { i++ println "${i} ${city}-${region}-${districtName}" } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/price/DistrictPriceCompareBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/price/DistrictPriceCompareBatch.groovy index f300e52b4..b58dbc30d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/price/DistrictPriceCompareBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/price/DistrictPriceCompareBatch.groovy @@ -168,7 +168,7 @@ class DistrictPriceCompareBatch extends BaseBatch{ price_compare.save(data); } DBObject entity = new BasicDBObject(); - entity.put("city", "全国"); + entity.put("city", "鍏ㄥ浗"); if(x1 > 0){ entity.put("month_survey_avg", (int) Math.round(x2/x1)) entity.put("month_caculate_avg", (int) Math.round(x3/x1)) @@ -216,7 +216,7 @@ class DistrictPriceCompareBatch extends BaseBatch{ int price2 = 0; def aliasList = [] aliasList << name - String estateType = "小区" + String estateType = "灏忓尯" def district = seaweed.findOne(new BasicDBObject('city', city).append('region', region).append('name', name)); if(null!=district && null!=district.alias){ for(String name2 : district.alias){ @@ -225,8 +225,8 @@ class DistrictPriceCompareBatch extends BaseBatch{ } } String estateType2 = district.estate_type2; - if(null!=estateType2&&estateType2.contains("别墅")){ - estateType = "别墅" + if(null!=estateType2&&estateType2.contains("鍒")){ + estateType = "鍒" } } Date weekend = DateUtil.getFirstDayOfWeek(new Date()); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/AnjukeAgentMasterPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/AnjukeAgentMasterPublisher.groovy index 3dcb7846d..f61a8403c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/AnjukeAgentMasterPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/AnjukeAgentMasterPublisher.groovy @@ -130,16 +130,16 @@ class AnjukeAgentMasterPublisher { if(dbo.get("address")) { try { def resMap = MapabcUtil.parseAddress(dbo.get("address")) - if(resMap.size() > 0 && resMap.get('name') && resMap.get('name').indexOf("市") > -1) { + if(resMap.size() > 0 && resMap.get('name') && resMap.get('name').indexOf("甯�") > -1) { String str = resMap.get('name') String city = null; - if(resMap.get('name').indexOf("省") > -1) { - String s1 = StringUtils.substringBefore(str, "省") - String s2 = StringUtils.substringBefore(str, "市") - city = s2.replace(s1 + "省", "").trim() + if(resMap.get('name').indexOf("鐪�") > -1) { + String s1 = StringUtils.substringBefore(str, "鐪�") + String s2 = StringUtils.substringBefore(str, "甯�") + city = s2.replace(s1 + "鐪�", "").trim() }else { - city = StringUtils.substringBefore(str, "市").trim() + city = StringUtils.substringBefore(str, "甯�").trim() } long lat = resMap.get('lat').toDouble() * 10000000000L @@ -198,7 +198,7 @@ class AnjukeAgentMasterPublisher { def imgUrls = jqueryAttrSelector(content, ".agc_store_info_content img", "src") if(companyStr) { - companyStr = companyStr.replace("公司:", "").trim() + companyStr = companyStr.replace("鍏徃锛�", "").trim() } if(!companyStr) { @@ -206,7 +206,7 @@ class AnjukeAgentMasterPublisher { } if(addressStr) { - addressStr = addressStr.replace("地址:", "").trim() + addressStr = addressStr.replace("鍦板潃锛�", "").trim() } if(imgUrls) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/AnjukeOfficeRentPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/AnjukeOfficeRentPublisher.groovy index d275284c2..f64a66594 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/AnjukeOfficeRentPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/AnjukeOfficeRentPublisher.groovy @@ -16,8 +16,8 @@ public class AnjukeOfficeRentPublisher implements Publishable { public static final List JOB_ID = ["53e84456e4b09e392f5b4ab1"]; public static final Map CONFIG = [ - match_address:true, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:true, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -117,14 +117,14 @@ public class AnjukeOfficeRentPublisher implements Publishable { obj.put("fitment", dataMap.get("fitment")) if(dataMap.get("floor_info")){ String floor_info = dataMap.get("floor_info") - floor_info = floor_info.replace("楼层:", "") + floor_info = floor_info.replace("妤煎眰锛�", "") if(StringUtils.isNotBlank(floor_info)){ obj.put("floor_info", floor_info.trim()) } } if(dataMap.get("finish_building_date")){ String build_date = dataMap.get("finish_building_date") - build_date = build_date.replace("竣工:", "") + build_date = build_date.replace("绔e伐锛�", "") if(StringUtils.isNotBlank(build_date)){ obj.put("build_date", build_date.trim()) } @@ -138,9 +138,9 @@ public class AnjukeOfficeRentPublisher implements Publishable { if(dataMap.get("publish_date")) { String s = dataMap.get("publish_date"); - s = StringUtils.substringAfter(s, '发布时间:').trim() - if(s.indexOf('房源编号') > -1) { - s = StringUtils.substringBefore(s, '房源编号').trim() + s = StringUtils.substringAfter(s, '鍙戝竷鏃堕棿锛�').trim() + if(s.indexOf('鎴挎簮缂栧彿') > -1) { + s = StringUtils.substringBefore(s, '鎴挎簮缂栧彿').trim() } if(s) { obj.put("publish_date", DateUtil.parseDate(s, "yyyy-MM-dd")) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/AnjukeOfficeSellPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/AnjukeOfficeSellPublisher.groovy index 37b22610a..6e85300e7 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/AnjukeOfficeSellPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/AnjukeOfficeSellPublisher.groovy @@ -15,8 +15,8 @@ class AnjukeOfficeSellPublisher implements Publishable { public static final List JOB_ID = ["53ed9cade4b09e392f5b6518"]; public static final Map CONFIG = [ - match_address:true, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:true, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -142,7 +142,7 @@ class AnjukeOfficeSellPublisher implements Publishable { if(dataMap.get("floor_info")){ String floorInfo = dataMap.get("floor_info") - floorInfo = floorInfo.replace("楼层:", "") + floorInfo = floorInfo.replace("妤煎眰锛�", "") if(StringUtils.isNotBlank(floorInfo)){ obj.put("floor_info", floorInfo.trim()) } @@ -150,7 +150,7 @@ class AnjukeOfficeSellPublisher implements Publishable { if(dataMap.get("finish_building_date")){ String build_date = dataMap.get("finish_building_date") - build_date = build_date.replace("竣工:", "") + build_date = build_date.replace("绔e伐锛�", "") if(StringUtils.isNotBlank(build_date)){ obj.put("build_date", build_date.trim()) } @@ -160,9 +160,9 @@ class AnjukeOfficeSellPublisher implements Publishable { obj.put("pics", dataMap.get("pics")) if(dataMap.get("publish_date")) { String s = dataMap.get("publish_date"); - s = StringUtils.substringAfter(s, '发布时间:').trim() - if(s.indexOf('房源编号') > -1) { - s = StringUtils.substringBefore(s, '房源编号').trim() + s = StringUtils.substringAfter(s, '鍙戝竷鏃堕棿锛�').trim() + if(s.indexOf('鎴挎簮缂栧彿') > -1) { + s = StringUtils.substringBefore(s, '鎴挎簮缂栧彿').trim() } if(s) { obj.put("publish_date", DateUtil.parseDate(s, "yyyy-MM-dd")) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/AnjukeRentPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/AnjukeRentPublisher.groovy index 29f267c3d..74d942148 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/AnjukeRentPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/AnjukeRentPublisher.groovy @@ -32,8 +32,8 @@ class AnjukeRentPublisher implements Publishable { "54101c5ae4b09e392f5bb99e", "5589057ee4b0a7ef70e98f48" ]; public static final Map CONFIG = [ - match_address:false, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:false, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -65,10 +65,10 @@ class AnjukeRentPublisher implements Publishable { String region = dataMap.get("region") String[] arrs = region.split(">") if(arrs.length >= 4){ - region = arrs[2].replace("租房", "").trim() + region = arrs[2].replace("绉熸埧", "").trim() } if(arrs.length >= 5){ - String block = arrs[3].replace("租房", "").trim() + String block = arrs[3].replace("绉熸埧", "").trim() obj.put("block", block) } @@ -100,7 +100,7 @@ class AnjukeRentPublisher implements Publishable { obj.put("contact_people", dataMap.get("contact_people")) - obj.put("mobile", dataMap.get("mobile").toString().replace("联系电话:", "")) + obj.put("mobile", dataMap.get("mobile").toString().replace("鑱旂郴鐢佃瘽锛�", "")) obj.put("estate_charge", dataMap.get("estate_charge")) @@ -136,7 +136,7 @@ class AnjukeRentPublisher implements Publishable { } } - obj.put("address", dataMap.get("address").toString().replace("(地图)", "")) + obj.put("address", dataMap.get("address").toString().replace("(鍦板浘)", "")) if(dataMap.get("area")){ String area = dataMap.get("area") @@ -162,10 +162,10 @@ class AnjukeRentPublisher implements Publishable { if(dataMap.get("room")){ String room = dataMap.get("room") + "" - room = room.substring(room.indexOf(":") + 1) - if(room.indexOf("室") > -1){ - String hall = room.substring(room.indexOf("室") + 1).trim() - room = room.substring(0 , room.indexOf("室")).trim() + room = room.substring(room.indexOf("锛�") + 1) + if(room.indexOf("瀹�") > -1){ + String hall = room.substring(room.indexOf("瀹�") + 1).trim() + room = room.substring(0 , room.indexOf("瀹�")).trim() Pattern pa=Pattern.compile("(\\d+)") Matcher ma=pa.matcher(room) if(ma.find()){ @@ -177,9 +177,9 @@ class AnjukeRentPublisher implements Publishable { obj.put("room", room.trim().toInteger()) } - if(StringUtils.isNotBlank(hall) && hall.indexOf("厅") > -1){ - String toilet = hall.substring(hall.indexOf("厅") + 1) - hall = hall.substring(0 , hall.indexOf("厅")) + if(StringUtils.isNotBlank(hall) && hall.indexOf("鍘�") > -1){ + String toilet = hall.substring(hall.indexOf("鍘�") + 1) + hall = hall.substring(0 , hall.indexOf("鍘�")) ma=pa.matcher(hall) if(ma.find()){ hall = ma.group(1) @@ -191,11 +191,11 @@ class AnjukeRentPublisher implements Publishable { } if(StringUtils.isNotBlank(toilet)){ - if(toilet.indexOf("厨") > -1){ - toilet = toilet.substring(toilet.indexOf("厨") + 1) + if(toilet.indexOf("鍘�") > -1){ + toilet = toilet.substring(toilet.indexOf("鍘�") + 1) } - if(toilet.indexOf("卫") > -1){ - toilet = toilet.substring(0 , toilet.indexOf("卫")) + if(toilet.indexOf("鍗�") > -1){ + toilet = toilet.substring(0 , toilet.indexOf("鍗�")) ma=pa.matcher(toilet) if(ma.find()){ toilet = ma.group(1) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/AnjukeSellPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/AnjukeSellPublisher.groovy index e786d9e83..1c29ad239 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/AnjukeSellPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/AnjukeSellPublisher.groovy @@ -29,8 +29,8 @@ public class AnjukeSellPublisher implements Publishable { public static final List JOB_ID = ["50c367dc4d60fd41bdae29b6"]; public static final Map CONFIG = [ - match_address:true, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:true, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -58,7 +58,7 @@ public class AnjukeSellPublisher implements Publishable { if(dataMap.get("region")){ String region = dataMap.get("region") - region = region.replace("二手房", "") + region = region.replace("浜屾墜鎴�", "") region = trimChar(region) if(StringUtils.isNotBlank(region)){ obj.put("region", region.trim()) @@ -67,7 +67,7 @@ public class AnjukeSellPublisher implements Publishable { if(dataMap.get("block")){ String block = dataMap.get("block") - block = block.replace("二手房", "") + block = block.replace("浜屾墜鎴�", "") block = trimChar(block) if(StringUtils.isNotBlank(block)){ obj.put("block", block.trim()) @@ -102,10 +102,10 @@ public class AnjukeSellPublisher implements Publishable { } if(dataMap.get("room")){ String room = dataMap.get("room") + "" - room = room.substring(room.indexOf(":") + 1) - if(room.indexOf("室") > -1){ - String hall = room.substring(room.indexOf("室") + 1).trim() - room = room.substring(0 , room.indexOf("室")).trim() + room = room.substring(room.indexOf("锛�") + 1) + if(room.indexOf("瀹�") > -1){ + String hall = room.substring(room.indexOf("瀹�") + 1).trim() + room = room.substring(0 , room.indexOf("瀹�")).trim() Pattern pa=Pattern.compile("(\\d+)") Matcher ma=pa.matcher(room) if(ma.find()){ @@ -117,9 +117,9 @@ public class AnjukeSellPublisher implements Publishable { obj.put("room", room.trim().toInteger()) } - if(StringUtils.isNotBlank(hall) && hall.indexOf("厅") > -1){ - String toilet = hall.substring(hall.indexOf("厅") + 1) - hall = hall.substring(0 , hall.indexOf("厅")) + if(StringUtils.isNotBlank(hall) && hall.indexOf("鍘�") > -1){ + String toilet = hall.substring(hall.indexOf("鍘�") + 1) + hall = hall.substring(0 , hall.indexOf("鍘�")) ma=pa.matcher(hall) if(ma.find()){ hall = ma.group(1) @@ -130,11 +130,11 @@ public class AnjukeSellPublisher implements Publishable { obj.put("hall", hall.trim().toInteger()) } - if(StringUtils.isNotBlank(toilet) && toilet.indexOf("卫") > -1){ - if(toilet.indexOf("厨") > -1){ - toilet = toilet.substring(toilet.indexOf("厨") + 1) + if(StringUtils.isNotBlank(toilet) && toilet.indexOf("鍗�") > -1){ + if(toilet.indexOf("鍘�") > -1){ + toilet = toilet.substring(toilet.indexOf("鍘�") + 1) } - toilet = toilet.substring(0 , toilet.indexOf("卫")) + toilet = toilet.substring(0 , toilet.indexOf("鍗�")) ma=pa.matcher(toilet) if(ma.find()){ toilet = ma.group(1) @@ -187,25 +187,25 @@ public class AnjukeSellPublisher implements Publishable { if(dataMap.get("contact_people") != null) { String people = dataMap.get("contact_people") - if(people.indexOf("产权性质") > -1) { - people = StringUtils.substringBetween(people, ":", "产权性质") + if(people.indexOf("浜ф潈鎬ц川") > -1) { + people = StringUtils.substringBetween(people, "锛�", "浜ф潈鎬ц川") }else { - people = people.replace("联 系 人:", "") + people = people.replace("鑱� 绯� 浜猴細", "") } obj.put('contact_people', people) } if(dataMap.get("address") != null) { String addr = dataMap.get("address"); - if(addr.indexOf("地址:") > -1) { - addr = StringUtils.substringAfter(addr, "地址:") + if(addr.indexOf("鍦板潃:") > -1) { + addr = StringUtils.substringAfter(addr, "鍦板潃:") } - if(addr.indexOf('-') > -1) { - addr = StringUtils.substringAfterLast(addr, '-') + if(addr.indexOf('锛�') > -1) { + addr = StringUtils.substringAfterLast(addr, '锛�') } - if(addr.indexOf('(') > -1) { - addr = StringUtils.substringBeforeLast(addr, '(') + if(addr.indexOf('锛�') > -1) { + addr = StringUtils.substringBeforeLast(addr, '锛�') } if(addr.indexOf('(') > -1) { @@ -218,7 +218,7 @@ public class AnjukeSellPublisher implements Publishable { if(dataMap.get("district_name") != null) { String district_name = dataMap.get("district_name") - district_name = district_name.replace("小区名称:", "") + district_name = district_name.replace("灏忓尯鍚嶇О锛�", "") district_name = trimChar(district_name) if(StringUtils.isNotBlank(district_name)){ obj.put("district_name", district_name.trim()) @@ -242,16 +242,16 @@ public class AnjukeSellPublisher implements Publishable { } public Date parseStringToDate(String date) { - if(date != null && date.indexOf("发布时间:") > -1) { - date = StringUtils.substringAfterLast(date, "发布时间:"); + if(date != null && date.indexOf("鍙戝竷鏃堕棿锛�") > -1) { + date = StringUtils.substringAfterLast(date, "鍙戝竷鏃堕棿锛�"); } Date result = null; String parse = null; - //parse=parse.replaceFirst("^.*?[0-9]{4}(年)?([^0-9]?)", "yyyy$1"); - //parse=parse.replaceFirst("([^0-9]?)[0-9]{1,2}(月)?([^0-9]?)", "$1MM$2"); + //parse=parse.replaceFirst("^.*?[0-9]{4}(骞�)?([^0-9]?)", "yyyy$1"); + //parse=parse.replaceFirst("([^0-9]?)[0-9]{1,2}(鏈�)?([^0-9]?)", "$1MM$2"); //parse=parse.replaceFirst("([^0-9]?)[0-9]{1,2}( ?)", "$1dd$2"); - Pattern p=Pattern.compile("(\\d{4})[-|年|.]?(\\d{1,2})?[-|月|.]?(\\d{1,2})?日?"); + Pattern p=Pattern.compile("(\\d{4})[-|骞磡.]?(\\d{1,2})?[-|鏈坾.]?(\\d{1,2})?鏃�?"); Matcher m=p.matcher(date); if(m.find()){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/AnjukeShopRentPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/AnjukeShopRentPublisher.groovy index 6838fac6d..c220ea244 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/AnjukeShopRentPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/AnjukeShopRentPublisher.groovy @@ -16,8 +16,8 @@ class AnjukeShopRentPublisher implements Publishable { public static final List JOB_ID = ["53ec742be4b09e392f5b62c5"]; public static final Map CONFIG = [ - match_address:true, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:true, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -77,7 +77,7 @@ class AnjukeShopRentPublisher implements Publishable { // } if(dataMap.get("address") != null) { - String addr = StringUtils.substringAfter(dataMap.get("address").toString(), "地址:") + String addr = StringUtils.substringAfter(dataMap.get("address").toString(), "鍦板潃锛�") if(addr.indexOf("]") > -1){ addr = addr.substring(addr.indexOf("]") + 1) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/AnjukeShopSellPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/AnjukeShopSellPublisher.groovy index 9bc7162a6..06cebebb9 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/AnjukeShopSellPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/AnjukeShopSellPublisher.groovy @@ -16,8 +16,8 @@ class AnjukeShopSellPublisher implements Publishable { public static final List JOB_ID = ["53f1a734e4b09e392f5b6801"]; public static final Map CONFIG = [ - match_address:true, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:true, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -86,7 +86,7 @@ class AnjukeShopSellPublisher implements Publishable { } if(dataMap.get("address") != null) { - String addr = StringUtils.substringAfter(dataMap.get("address").toString(), "地址:") + String addr = StringUtils.substringAfter(dataMap.get("address").toString(), "鍦板潃锛�") if(addr.indexOf("]") > -1){ addr = addr.substring(addr.indexOf("]") + 1) } @@ -110,7 +110,7 @@ class AnjukeShopSellPublisher implements Publishable { if(dataMap.get("floor_info")) { String floor_info = dataMap.get("floor_info") - floor_info = floor_info.replace("楼层:", "") + floor_info = floor_info.replace("妤煎眰锛�", "") if(StringUtils.isNotBlank(floor_info)){ obj.put("floor_info", floor_info.trim()) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/BaiduRentPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/BaiduRentPublisher.groovy index 027b9bcb7..c4a5ffef1 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/BaiduRentPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/BaiduRentPublisher.groovy @@ -32,8 +32,8 @@ class BaiduRentPublisher implements Publishable { "540e7cd7e4b09e392f5bb49d" ]; public static final Map CONFIG = [ - match_address:false, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:false, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -63,14 +63,14 @@ class BaiduRentPublisher implements Publishable { if(dataMap.get("region")){ String region = dataMap.get("region") - if(region.indexOf("您现在的位置") > -1){ - region = region.substring(region.indexOf("您现在的位置")) + if(region.indexOf("鎮ㄧ幇鍦ㄧ殑浣嶇疆") > -1){ + region = region.substring(region.indexOf("鎮ㄧ幇鍦ㄧ殑浣嶇疆")) } region = trimChar(region) - if(region.indexOf("百度乐居租房") > -1){ + if(region.indexOf("鐧惧害涔愬眳绉熸埧") > -1){ String[] arrs = region.split(">") - region = arrs[0].replace("您现在的位置:", "").replace("百度乐居租房", "").trim() + region = arrs[0].replace("鎮ㄧ幇鍦ㄧ殑浣嶇疆锛�", "").replace("鐧惧害涔愬眳绉熸埧", "").trim() if(StringUtils.isNotBlank(region)){ region = arrs[1].trim() } @@ -90,19 +90,19 @@ class BaiduRentPublisher implements Publishable { if(dataMap.get("estate_type")){ String estateType = dataMap.get("estate_type") - estateType = estateType.replace("类型:", "") + estateType = estateType.replace("绫诲瀷锛�", "") obj.put("estate_type", estateType) } if(dataMap.get("build_date")){ String build_date = dataMap.get("build_date") - build_date = build_date.replace("建造年代:", "") + build_date = build_date.replace("寤洪�犲勾浠o細", "") obj.put("build_date", build_date) } if(dataMap.get("total_price")){ String total_price = dataMap.get("total_price") - total_price = total_price.replace("元/月", "") + total_price = total_price.replace("鍏�/鏈�", "") if(total_price.indexOf(".") > -1){ total_price = total_price.substring(0 , total_price.indexOf(".")) } @@ -113,22 +113,22 @@ class BaiduRentPublisher implements Publishable { if(dataMap.get("fitment")){ String fitment = dataMap.get("fitment") - fitment = fitment.replace("装修情况:", "") + fitment = fitment.replace("瑁呬慨鎯呭喌锛�", "") obj.put("fitment", fitment) } if(dataMap.get("direction")){ String direction = dataMap.get("direction") - direction = direction.replace("朝向:", "") + direction = direction.replace("鏈濆悜锛�", "") obj.put("direction", direction) } if(dataMap.get("room")){ String room = dataMap.get("room") + "" - room = room.substring(room.indexOf(":") + 1) - if(room.indexOf("室") > -1){ - String hall = room.substring(room.indexOf("室") + 1).trim() - room = room.substring(0 , room.indexOf("室")).trim() + room = room.substring(room.indexOf("锛�") + 1) + if(room.indexOf("瀹�") > -1){ + String hall = room.substring(room.indexOf("瀹�") + 1).trim() + room = room.substring(0 , room.indexOf("瀹�")).trim() Pattern pa=Pattern.compile("(\\d+)") Matcher ma=pa.matcher(room) if(ma.find()){ @@ -140,9 +140,9 @@ class BaiduRentPublisher implements Publishable { obj.put("room", room.trim().toInteger()) } - if(StringUtils.isNotBlank(hall) && hall.indexOf("厅") > -1){ - String toilet = hall.substring(hall.indexOf("厅") + 1) - hall = hall.substring(0 , hall.indexOf("厅")) + if(StringUtils.isNotBlank(hall) && hall.indexOf("鍘�") > -1){ + String toilet = hall.substring(hall.indexOf("鍘�") + 1) + hall = hall.substring(0 , hall.indexOf("鍘�")) ma=pa.matcher(hall) if(ma.find()){ hall = ma.group(1) @@ -154,11 +154,11 @@ class BaiduRentPublisher implements Publishable { } if(StringUtils.isNotBlank(toilet)){ - if(toilet.indexOf("厨") > -1){ - toilet = toilet.substring(toilet.indexOf("厨") + 1) + if(toilet.indexOf("鍘�") > -1){ + toilet = toilet.substring(toilet.indexOf("鍘�") + 1) } - if(toilet.indexOf("卫") > -1){ - toilet = toilet.substring(0 , toilet.indexOf("卫")) + if(toilet.indexOf("鍗�") > -1){ + toilet = toilet.substring(0 , toilet.indexOf("鍗�")) ma=pa.matcher(toilet) if(ma.find()){ toilet = ma.group(1) @@ -221,14 +221,14 @@ class BaiduRentPublisher implements Publishable { if(dataMap.get("district_name")){ String district_name = dataMap.get("district_name") - district_name = district_name.replace("小区名称:", "") - if(district_name.indexOf("(") > -1){ - district_name = district_name.substring(0 , district_name.indexOf("(")) + district_name = district_name.replace("灏忓尯鍚嶇О锛�", "") + if(district_name.indexOf("锛�") > -1){ + district_name = district_name.substring(0 , district_name.indexOf("锛�")) } if(district_name.indexOf("(") > -1){ district_name = district_name.substring(0 , district_name.indexOf("(")) } - district_name = district_name.replace("[地图]", "") + district_name = district_name.replace("[鍦板浘]", "") if(StringUtils.isNotBlank(district_name)){ district_name = trimChar(district_name) obj.put("district_name", district_name.trim()) @@ -237,9 +237,9 @@ class BaiduRentPublisher implements Publishable { obj.put("contact_people", dataMap.get("contact_people")) - obj.put("mobile", dataMap.get("mobile").toString().replace("联系电话:", "")) + obj.put("mobile", dataMap.get("mobile").toString().replace("鑱旂郴鐢佃瘽锛�", "")) - obj.put("address", dataMap.get("address").toString().replace("地址:", "")) + obj.put("address", dataMap.get("address").toString().replace("鍦板潃锛�", "")) obj.put("pics", dataMap.get("pics")) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/BaiduSellPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/BaiduSellPublisher.groovy index 3aa5e9361..a6b98007d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/BaiduSellPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/BaiduSellPublisher.groovy @@ -32,8 +32,8 @@ class BaiduSellPublisher implements Publishable { "540e6670e4b09e392f5bb2d4" ]; public static final Map CONFIG = [ - match_address:false, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:false, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -66,7 +66,7 @@ class BaiduSellPublisher implements Publishable { region = trimChar(region) String[] arrs = region.split(">") if(arrs.length > 4){ - if(arrs[0].indexOf("您现在的位置:") > -1){ + if(arrs[0].indexOf("鎮ㄧ幇鍦ㄧ殑浣嶇疆锛�") > -1){ region = arrs[1] } else { region = arrs[2] @@ -81,7 +81,7 @@ class BaiduSellPublisher implements Publishable { if(dataMap.get("estate_type")){ String estate_type = dataMap.get("estate_type") - estate_type = estate_type.replace("房屋类型:", "") + estate_type = estate_type.replace("鎴垮眿绫诲瀷锛�", "") if(StringUtils.isNotBlank(estate_type)){ obj.put("estate_type", estate_type.trim()) } @@ -89,7 +89,7 @@ class BaiduSellPublisher implements Publishable { if(dataMap.get("direction")){ String direction = dataMap.get("direction") - direction = direction.replace("朝向:", "") + direction = direction.replace("鏈濆悜锛�", "") if(StringUtils.isNotBlank(direction)){ obj.put("direction", direction.trim()) } @@ -97,7 +97,7 @@ class BaiduSellPublisher implements Publishable { if(dataMap.get("build_date")){ String build_date = dataMap.get("build_date") - build_date = build_date.replace("建筑年代:", "").replace("建造年代:", "") + build_date = build_date.replace("寤虹瓚骞翠唬锛�", "").replace("寤洪�犲勾浠o細", "") if(StringUtils.isNotBlank(build_date)){ obj.put("build_date", build_date.trim()) } @@ -119,8 +119,8 @@ class BaiduSellPublisher implements Publishable { if(dataMap.get("fitment")){ String fitment = dataMap.get("fitment") - if(fitment.indexOf(":") > -1){ - fitment = fitment.substring(fitment.indexOf(":") + 1) + if(fitment.indexOf("锛�") > -1){ + fitment = fitment.substring(fitment.indexOf("锛�") + 1) } if(StringUtils.isNotBlank(fitment)){ obj.put("fitment", fitment.trim()) @@ -129,24 +129,24 @@ class BaiduSellPublisher implements Publishable { if(dataMap.get("district_name")){ String district_name = dataMap.get("district_name") - if(district_name.indexOf(":") > -1){ - district_name = district_name.substring(district_name.indexOf(":") + 1) + if(district_name.indexOf("锛�") > -1){ + district_name = district_name.substring(district_name.indexOf("锛�") + 1) } - district_name = district_name.replace("查看小区详情", "") + district_name = district_name.replace("鏌ョ湅灏忓尯璇︽儏", "") if(StringUtils.isNotBlank(district_name)){ district_name = trimChar(district_name) obj.put("district_name", district_name.trim()) } } - obj.put("address", dataMap.get("address").toString().replace("地址:", "")) + obj.put("address", dataMap.get("address").toString().replace("鍦板潃锛�", "")) - obj.put("estate_charge", dataMap.get("estate_charge").toString().replace("物业费:", "")) + obj.put("estate_charge", dataMap.get("estate_charge").toString().replace("鐗╀笟璐癸細", "")) if(dataMap.get("area")){ String area = dataMap.get("area") - if(area.indexOf("楼 层:") > -1){ - area = area.substring(0 , area.indexOf("楼 层:")) + if(area.indexOf("妤� 灞傦細") > -1){ + area = area.substring(0 , area.indexOf("妤� 灞傦細")) } Pattern pa=Pattern.compile("(\\d+)") Matcher ma=pa.matcher(area) @@ -162,8 +162,8 @@ class BaiduSellPublisher implements Publishable { if(dataMap.get("floor_info")){ String floor_info = dataMap.get("floor_info") - if(floor_info.indexOf("层:") > -1){ - floor_info = floor_info.substring(floor_info.indexOf("层:") + 2) + if(floor_info.indexOf("灞傦細") > -1){ + floor_info = floor_info.substring(floor_info.indexOf("灞傦細") + 2) } if(StringUtils.isNotBlank(floor_info)){ obj.put("floor_info", floor_info.trim()) @@ -177,9 +177,9 @@ class BaiduSellPublisher implements Publishable { height = floor.substring(floor.indexOf("/") + 1) floor = floor.substring(0 , floor.indexOf("/")) } - if(floor.indexOf("(") > -1){ - height = floor.substring(floor.indexOf("(") + 1) - floor = floor.substring(0 , floor.indexOf("(")) + if(floor.indexOf("锛�") > -1){ + height = floor.substring(floor.indexOf("锛�") + 1) + floor = floor.substring(0 , floor.indexOf("锛�")) } if(StringUtils.isNotBlank(floor)){ Pattern pa=Pattern.compile("(\\d+)") @@ -209,10 +209,10 @@ class BaiduSellPublisher implements Publishable { if(dataMap.get("room")){ String room = dataMap.get("room") + "" - room = room.substring(room.indexOf(":") + 1) - if(room.indexOf("室") > -1){ - String hall = room.substring(room.indexOf("室") + 1).trim() - room = room.substring(0 , room.indexOf("室")).trim() + room = room.substring(room.indexOf("锛�") + 1) + if(room.indexOf("瀹�") > -1){ + String hall = room.substring(room.indexOf("瀹�") + 1).trim() + room = room.substring(0 , room.indexOf("瀹�")).trim() Pattern pa=Pattern.compile("(\\d+)") Matcher ma=pa.matcher(room) if(ma.find()){ @@ -224,9 +224,9 @@ class BaiduSellPublisher implements Publishable { obj.put("room", room.trim().toInteger()) } - if(StringUtils.isNotBlank(hall) && hall.indexOf("厅") > -1){ - String toilet = hall.substring(hall.indexOf("厅") + 1) - hall = hall.substring(0 , hall.indexOf("厅")) + if(StringUtils.isNotBlank(hall) && hall.indexOf("鍘�") > -1){ + String toilet = hall.substring(hall.indexOf("鍘�") + 1) + hall = hall.substring(0 , hall.indexOf("鍘�")) ma=pa.matcher(hall) if(ma.find()){ hall = ma.group(1) @@ -238,11 +238,11 @@ class BaiduSellPublisher implements Publishable { } if(StringUtils.isNotBlank(toilet)){ - if(toilet.indexOf("厨") > -1){ - toilet = toilet.substring(toilet.indexOf("厨") + 1) + if(toilet.indexOf("鍘�") > -1){ + toilet = toilet.substring(toilet.indexOf("鍘�") + 1) } - if(toilet.indexOf("卫") > -1){ - toilet = toilet.substring(0 , toilet.indexOf("卫")) + if(toilet.indexOf("鍗�") > -1){ + toilet = toilet.substring(0 , toilet.indexOf("鍗�")) ma=pa.matcher(toilet) if(ma.find()){ toilet = ma.group(1) @@ -264,7 +264,7 @@ class BaiduSellPublisher implements Publishable { obj.put("contact_people", dataMap.get("contact_people")) - obj.put("mobile", dataMap.get("mobile").toString().replace("联系电话:", "")) + obj.put("mobile", dataMap.get("mobile").toString().replace("鑱旂郴鐢佃瘽锛�", "")) obj.put("publish_date", new Date()) obj.put("c_date", new Date()) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/BaiduShopRentPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/BaiduShopRentPublisher.groovy index 57df2c129..03817ac0a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/BaiduShopRentPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/BaiduShopRentPublisher.groovy @@ -32,8 +32,8 @@ class BaiduShopRentPublisher implements Publishable { "54880fb7e4b0464d74dcc0ae" ]; public static final Map CONFIG = [ - match_address:false, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:false, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -66,7 +66,7 @@ class BaiduShopRentPublisher implements Publishable { region = trimChar(region) String[] arrs = region.split(">") if(arrs.length >= 4){ - if(arrs[0].indexOf("您现在的位置:") > -1){ + if(arrs[0].indexOf("鎮ㄧ幇鍦ㄧ殑浣嶇疆锛�") > -1){ region = arrs[1] } else { region = arrs[2] @@ -81,8 +81,8 @@ class BaiduShopRentPublisher implements Publishable { if(dataMap.get("estate_type")){ String estate_type = dataMap.get("estate_type") - if(estate_type.indexOf("型:") > -1){ - estate_type = estate_type.substring(estate_type.indexOf("型:") + 2) + if(estate_type.indexOf("鍨嬶細") > -1){ + estate_type = estate_type.substring(estate_type.indexOf("鍨嬶細") + 2) } if(StringUtils.isNotBlank(estate_type)){ obj.put("estate_type", estate_type.trim()) @@ -91,7 +91,7 @@ class BaiduShopRentPublisher implements Publishable { if(dataMap.get("build_date")){ String build_date = dataMap.get("build_date") - build_date = build_date.replace("建筑年代:", "").replace("建造年代:", "") + build_date = build_date.replace("寤虹瓚骞翠唬锛�", "").replace("寤洪�犲勾浠o細", "") if(StringUtils.isNotBlank(build_date)){ obj.put("build_date", build_date.trim()) } @@ -99,7 +99,7 @@ class BaiduShopRentPublisher implements Publishable { if(dataMap.get("direction")){ String direction = dataMap.get("direction") - direction = direction.replace("朝向:", "") + direction = direction.replace("鏈濆悜锛�", "") if(StringUtils.isNotBlank(direction)){ obj.put("direction", direction.trim()) } @@ -121,8 +121,8 @@ class BaiduShopRentPublisher implements Publishable { if(dataMap.get("fitment")){ String fitment = dataMap.get("fitment") - if(fitment.indexOf("修:") > -1){ - fitment = fitment.substring(fitment.indexOf("修:") + 2) + if(fitment.indexOf("淇細") > -1){ + fitment = fitment.substring(fitment.indexOf("淇細") + 2) } if(StringUtils.isNotBlank(fitment)){ obj.put("fitment", fitment.trim()) @@ -131,28 +131,28 @@ class BaiduShopRentPublisher implements Publishable { if(dataMap.get("district_name")){ String district_name = dataMap.get("district_name") - if(district_name.indexOf(":") > -1){ - district_name = district_name.substring(district_name.indexOf(":") + 1) + if(district_name.indexOf("锛�") > -1){ + district_name = district_name.substring(district_name.indexOf("锛�") + 1) } if(district_name.indexOf("(") > -1) { district_name = district_name.substring(0 , district_name.indexOf("(")) } - if(district_name.indexOf("(") > -1) { - district_name = district_name.substring(0 , district_name.indexOf("(")) + if(district_name.indexOf("锛�") > -1) { + district_name = district_name.substring(0 , district_name.indexOf("锛�")) } - district_name = district_name.replace("查看小区详情", "") + district_name = district_name.replace("鏌ョ湅灏忓尯璇︽儏", "") if(StringUtils.isNotBlank(district_name)){ district_name = trimChar(district_name) obj.put("district_name", district_name.trim()) } } - obj.put("address", dataMap.get("address").toString().replace("地址:", "")) + obj.put("address", dataMap.get("address").toString().replace("鍦板潃锛�", "")) if(dataMap.get("estate_charge")){ String estate_charge = dataMap.get("estate_charge") - if(estate_charge.indexOf("物业费:") > -1){ - estate_charge = estate_charge.substring(estate_charge.indexOf("物业费:") + 4) + if(estate_charge.indexOf("鐗╀笟璐癸細") > -1){ + estate_charge = estate_charge.substring(estate_charge.indexOf("鐗╀笟璐癸細") + 4) } if(StringUtils.isNotBlank(estate_charge)){ estate_charge = trimChar(estate_charge) @@ -176,8 +176,8 @@ class BaiduShopRentPublisher implements Publishable { if(dataMap.get("floor_info")){ String floor_info = dataMap.get("floor_info") - if(floor_info.indexOf("层:") > -1){ - floor_info = floor_info.substring(floor_info.indexOf("层:") + 2) + if(floor_info.indexOf("灞傦細") > -1){ + floor_info = floor_info.substring(floor_info.indexOf("灞傦細") + 2) } if(StringUtils.isNotBlank(floor_info)){ obj.put("floor_info", floor_info.trim()) @@ -191,9 +191,9 @@ class BaiduShopRentPublisher implements Publishable { height = floor.substring(floor.indexOf("/") + 1) floor = floor.substring(0 , floor.indexOf("/")) } - if(floor.indexOf("(") > -1){ - height = floor.substring(floor.indexOf("(") + 1) - floor = floor.substring(0 , floor.indexOf("(")) + if(floor.indexOf("锛�") > -1){ + height = floor.substring(floor.indexOf("锛�") + 1) + floor = floor.substring(0 , floor.indexOf("锛�")) } if(StringUtils.isNotBlank(floor)){ Pattern pa=Pattern.compile("(\\d+)") @@ -227,11 +227,11 @@ class BaiduShopRentPublisher implements Publishable { obj.put("contact_people", dataMap.get("contact_people")) - obj.put("mobile", dataMap.get("mobile").toString().replace("联系电话:", "")) + obj.put("mobile", dataMap.get("mobile").toString().replace("鑱旂郴鐢佃瘽锛�", "")) if(dataMap.get("publish_date")) { try { - obj.put("publish_date", DateUtil.parseDate(dataMap.get("publish_date").toString().replace("更新时间:", ""), "yyyy-MM-dd")) + obj.put("publish_date", DateUtil.parseDate(dataMap.get("publish_date").toString().replace("鏇存柊鏃堕棿锛�", ""), "yyyy-MM-dd")) }catch(Exception e) { obj.put("publish_date", new Date()) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/BaiduShopSellPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/BaiduShopSellPublisher.groovy index 8a8453840..cf0d22766 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/BaiduShopSellPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/BaiduShopSellPublisher.groovy @@ -32,8 +32,8 @@ class BaiduShopSellPublisher implements Publishable { "5487e025e4b0464d74dcbdf1" ]; public static final Map CONFIG = [ - match_address:false, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:false, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -66,7 +66,7 @@ class BaiduShopSellPublisher implements Publishable { region = trimChar(region) String[] arrs = region.split(">") if(arrs.length >= 4){ - if(arrs[0].indexOf("您现在的位置:") > -1){ + if(arrs[0].indexOf("鎮ㄧ幇鍦ㄧ殑浣嶇疆锛�") > -1){ region = arrs[1] } else { region = arrs[2] @@ -81,8 +81,8 @@ class BaiduShopSellPublisher implements Publishable { if(dataMap.get("estate_type")){ String estate_type = dataMap.get("estate_type") - if(estate_type.indexOf("型:") > -1){ - estate_type = estate_type.substring(estate_type.indexOf("型:") + 2) + if(estate_type.indexOf("鍨嬶細") > -1){ + estate_type = estate_type.substring(estate_type.indexOf("鍨嬶細") + 2) } if(StringUtils.isNotBlank(estate_type)){ obj.put("estate_type", estate_type.trim()) @@ -91,7 +91,7 @@ class BaiduShopSellPublisher implements Publishable { if(dataMap.get("build_date")){ String build_date = dataMap.get("build_date") - build_date = build_date.replace("建筑年代:", "").replace("建造年代:", "") + build_date = build_date.replace("寤虹瓚骞翠唬锛�", "").replace("寤洪�犲勾浠o細", "") if(StringUtils.isNotBlank(build_date)){ obj.put("build_date", build_date.trim()) } @@ -99,7 +99,7 @@ class BaiduShopSellPublisher implements Publishable { if(dataMap.get("direction")){ String direction = dataMap.get("direction") - direction = direction.replace("朝向:", "") + direction = direction.replace("鏈濆悜锛�", "") if(StringUtils.isNotBlank(direction)){ obj.put("direction", direction.trim()) } @@ -121,8 +121,8 @@ class BaiduShopSellPublisher implements Publishable { if(dataMap.get("fitment")){ String fitment = dataMap.get("fitment") - if(fitment.indexOf("修:") > -1){ - fitment = fitment.substring(fitment.indexOf("修:") + 2) + if(fitment.indexOf("淇細") > -1){ + fitment = fitment.substring(fitment.indexOf("淇細") + 2) } if(StringUtils.isNotBlank(fitment)){ obj.put("fitment", fitment.trim()) @@ -131,28 +131,28 @@ class BaiduShopSellPublisher implements Publishable { if(dataMap.get("district_name")){ String district_name = dataMap.get("district_name") - if(district_name.indexOf(":") > -1){ - district_name = district_name.substring(district_name.indexOf(":") + 1) + if(district_name.indexOf("锛�") > -1){ + district_name = district_name.substring(district_name.indexOf("锛�") + 1) } if(district_name.indexOf("(") > -1) { district_name = district_name.substring(0 , district_name.indexOf("(")) } - if(district_name.indexOf("(") > -1) { - district_name = district_name.substring(0 , district_name.indexOf("(")) + if(district_name.indexOf("锛�") > -1) { + district_name = district_name.substring(0 , district_name.indexOf("锛�")) } - district_name = district_name.replace("查看小区详情", "") + district_name = district_name.replace("鏌ョ湅灏忓尯璇︽儏", "") if(StringUtils.isNotBlank(district_name)){ district_name = trimChar(district_name) obj.put("district_name", district_name.trim()) } } - obj.put("address", dataMap.get("address").toString().replace("地址:", "")) + obj.put("address", dataMap.get("address").toString().replace("鍦板潃锛�", "")) if(dataMap.get("estate_charge")){ String estate_charge = dataMap.get("estate_charge") - if(estate_charge.indexOf("物业费:") > -1){ - estate_charge = estate_charge.substring(estate_charge.indexOf("物业费:") + 4) + if(estate_charge.indexOf("鐗╀笟璐癸細") > -1){ + estate_charge = estate_charge.substring(estate_charge.indexOf("鐗╀笟璐癸細") + 4) } if(StringUtils.isNotBlank(estate_charge)){ estate_charge = trimChar(estate_charge) @@ -176,8 +176,8 @@ class BaiduShopSellPublisher implements Publishable { if(dataMap.get("floor_info")){ String floor_info = dataMap.get("floor_info") - if(floor_info.indexOf("层:") > -1){ - floor_info = floor_info.substring(floor_info.indexOf("层:") + 2) + if(floor_info.indexOf("灞傦細") > -1){ + floor_info = floor_info.substring(floor_info.indexOf("灞傦細") + 2) } if(StringUtils.isNotBlank(floor_info)){ obj.put("floor_info", floor_info.trim()) @@ -191,9 +191,9 @@ class BaiduShopSellPublisher implements Publishable { height = floor.substring(floor.indexOf("/") + 1) floor = floor.substring(0 , floor.indexOf("/")) } - if(floor.indexOf("(") > -1){ - height = floor.substring(floor.indexOf("(") + 1) - floor = floor.substring(0 , floor.indexOf("(")) + if(floor.indexOf("锛�") > -1){ + height = floor.substring(floor.indexOf("锛�") + 1) + floor = floor.substring(0 , floor.indexOf("锛�")) } if(StringUtils.isNotBlank(floor)){ Pattern pa=Pattern.compile("(\\d+)") @@ -227,7 +227,7 @@ class BaiduShopSellPublisher implements Publishable { obj.put("contact_people", dataMap.get("contact_people")) - obj.put("mobile", dataMap.get("mobile").toString().replace("联系电话:", "")) + obj.put("mobile", dataMap.get("mobile").toString().replace("鑱旂郴鐢佃瘽锛�", "")) if(dataMap.get("publish_date")) { try { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/BaixingOfficeRentPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/BaixingOfficeRentPublisher.groovy index 85852a318..4d172c1bb 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/BaixingOfficeRentPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/BaixingOfficeRentPublisher.groovy @@ -34,8 +34,8 @@ class BaixingOfficeRentPublisher implements Publishable { "5469b3dae4b0e6ab76cf079a" ]; public static final Map CONFIG = [ - match_address:false, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:false, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -61,22 +61,22 @@ class BaixingOfficeRentPublisher implements Publishable { obj.put("url", url) obj.put("cat", "office_rent") obj.put("city", dataMap.get("city")) - obj.put("name", dataMap.get("title").toString().replace("经纪人", "").trim()) + obj.put("name", dataMap.get("title").toString().replace("缁忕邯浜�", "").trim()) if(dataMap.get("region")){ String region = dataMap.get("region") - region = region.replace("地区:","") + region = region.replace("鍦板尯锛�","") if(region.indexOf("-") > -1){ String[] arrs = region.split("-") String block = ""; String address = ""; if(arrs.length == 3){ - region = arrs[0].replace("写字楼", "") - block = arrs[1].replace("写字楼", "") - address = arrs[2].replace("写字楼", "") + region = arrs[0].replace("鍐欏瓧妤�", "") + block = arrs[1].replace("鍐欏瓧妤�", "") + address = arrs[2].replace("鍐欏瓧妤�", "") } else if(arrs.length == 2){ - region = arrs[0].replace("写字楼", "") - address = arrs[1].replace("写字楼", "") + region = arrs[0].replace("鍐欏瓧妤�", "") + address = arrs[1].replace("鍐欏瓧妤�", "") } else { region = null } @@ -140,7 +140,7 @@ class BaixingOfficeRentPublisher implements Publishable { if(dataMap.get("district_name")){ String district_name = dataMap.get("district_name") - district_name = district_name.replace("写字楼名称:", "") + district_name = district_name.replace("鍐欏瓧妤煎悕绉帮細", "") if(StringUtils.isNotBlank(district_name)){ district_name = trimChar(district_name) obj.put("district_name", district_name.trim()) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/BaixingOfficeSellPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/BaixingOfficeSellPublisher.groovy index aff0da43f..90deea8e0 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/BaixingOfficeSellPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/BaixingOfficeSellPublisher.groovy @@ -34,8 +34,8 @@ class BaixingOfficeSellPublisher implements Publishable { "546aaf0ce4b0e6ab76cf6b3b" ]; public static final Map CONFIG = [ - match_address:false, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:false, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -61,22 +61,22 @@ class BaixingOfficeSellPublisher implements Publishable { obj.put("url", url) obj.put("cat", "office_sell") obj.put("city", dataMap.get("city")) - obj.put("name", dataMap.get("title").toString().replace("经纪人", "").trim()) + obj.put("name", dataMap.get("title").toString().replace("缁忕邯浜�", "").trim()) if(dataMap.get("region")){ String region = dataMap.get("region") - region = region.replace("地区:","") + region = region.replace("鍦板尯锛�","") if(region.indexOf("-") > -1){ String[] arrs = region.split("-") String block = ""; String address = ""; if(arrs.length == 3){ - region = arrs[0].replace("写字楼", "") - block = arrs[1].replace("写字楼", "") - address = arrs[2].replace("写字楼", "") + region = arrs[0].replace("鍐欏瓧妤�", "") + block = arrs[1].replace("鍐欏瓧妤�", "") + address = arrs[2].replace("鍐欏瓧妤�", "") } else if(arrs.length == 2){ - region = arrs[0].replace("写字楼", "") - address = arrs[1].replace("写字楼", "") + region = arrs[0].replace("鍐欏瓧妤�", "") + address = arrs[1].replace("鍐欏瓧妤�", "") } else { region = null } @@ -136,7 +136,7 @@ class BaixingOfficeSellPublisher implements Publishable { if(dataMap.get("district_name")){ String district_name = dataMap.get("district_name") - district_name = district_name.replace("楼宇名称:", "") + district_name = district_name.replace("妤煎畤鍚嶇О锛�", "") if(StringUtils.isNotBlank(district_name)){ district_name = trimChar(district_name) obj.put("district_name", district_name.trim()) @@ -145,7 +145,7 @@ class BaixingOfficeSellPublisher implements Publishable { if(dataMap.get("estate_type")){ String estate_type = dataMap.get("estate_type") - estate_type = estate_type.replace("分类:", "") + estate_type = estate_type.replace("鍒嗙被锛�", "") if(StringUtils.isNotBlank(estate_type)){ obj.put("estate_type", estate_type.trim()) } @@ -153,7 +153,7 @@ class BaixingOfficeSellPublisher implements Publishable { if(dataMap.get("fitment")){ String fitment = dataMap.get("fitment") - fitment = fitment.replace("装修情况:", "") + fitment = fitment.replace("瑁呬慨鎯呭喌锛�", "") if(StringUtils.isNotBlank(fitment)){ obj.put("fitment", fitment.trim()) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/BaixingRentPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/BaixingRentPublisher.groovy index b471e4303..862b97a98 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/BaixingRentPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/BaixingRentPublisher.groovy @@ -32,8 +32,8 @@ class BaixingRentPublisher implements Publishable { "546afd95e4b0e6ab76cf8027" ]; public static final Map CONFIG = [ - match_address:false, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:false, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -59,22 +59,22 @@ class BaixingRentPublisher implements Publishable { obj.put("url", url) obj.put("cat", "rent") obj.put("city", dataMap.get("city")) - obj.put("name", dataMap.get("title").toString().replace("经纪人", "").trim()) + obj.put("name", dataMap.get("title").toString().replace("缁忕邯浜�", "").trim()) if(dataMap.get("region")){ String region = dataMap.get("region") - region = region.replace("地区:","") + region = region.replace("鍦板尯锛�","") if(region.indexOf("-") > -1){ String[] arrs = region.split("-") String block = ""; String address = ""; if(arrs.length == 3){ - region = arrs[0].replace("租房", "") - block = arrs[1].replace("租房", "") - address = arrs[2].replace("租房", "") + region = arrs[0].replace("绉熸埧", "") + block = arrs[1].replace("绉熸埧", "") + address = arrs[2].replace("绉熸埧", "") } else if(arrs.length == 2){ - region = arrs[0].replace("租房", "") - address = arrs[1].replace("租房", "") + region = arrs[0].replace("绉熸埧", "") + address = arrs[1].replace("绉熸埧", "") } else { region = null } @@ -134,7 +134,7 @@ class BaixingRentPublisher implements Publishable { if(dataMap.get("district_name")){ String district_name = dataMap.get("district_name") - district_name = district_name.replace("小区名:", "") + district_name = district_name.replace("灏忓尯鍚嶏細", "") district_name = trimChar(district_name) if(StringUtils.isNotBlank(district_name)){ obj.put("district_name", district_name.trim()) @@ -143,7 +143,7 @@ class BaixingRentPublisher implements Publishable { if(dataMap.get("fitment")){ String fitment = dataMap.get("fitment") - fitment = fitment.replace("装修情况:", "") + fitment = fitment.replace("瑁呬慨鎯呭喌锛�", "") if(StringUtils.isNotBlank(fitment)){ obj.put("fitment", fitment.trim()) } @@ -151,7 +151,7 @@ class BaixingRentPublisher implements Publishable { if(dataMap.get("direction")){ String direction = dataMap.get("direction") - direction = direction.replace("房间朝向:", "") + direction = direction.replace("鎴块棿鏈濆悜锛�", "") if(StringUtils.isNotBlank(direction)){ obj.put("direction", direction.trim()) } @@ -159,10 +159,10 @@ class BaixingRentPublisher implements Publishable { if(dataMap.get("room")){ String room = dataMap.get("room") - room = room.substring(room.indexOf(":") + 1) - if(room.indexOf("室") > -1){ - String hall = room.substring(room.indexOf("室") + 1).trim() - room = room.substring(0 , room.indexOf("室")).trim() + room = room.substring(room.indexOf("锛�") + 1) + if(room.indexOf("瀹�") > -1){ + String hall = room.substring(room.indexOf("瀹�") + 1).trim() + room = room.substring(0 , room.indexOf("瀹�")).trim() Pattern pa=Pattern.compile("(\\d+)") Matcher ma=pa.matcher(room) if(ma.find()){ @@ -174,9 +174,9 @@ class BaixingRentPublisher implements Publishable { obj.put("room", room.trim().toInteger()) } - if(StringUtils.isNotBlank(hall) && hall.indexOf("厅") > -1){ - String toilet = hall.substring(hall.indexOf("厅") + 1) - hall = hall.substring(0 , hall.indexOf("厅")) + if(StringUtils.isNotBlank(hall) && hall.indexOf("鍘�") > -1){ + String toilet = hall.substring(hall.indexOf("鍘�") + 1) + hall = hall.substring(0 , hall.indexOf("鍘�")) ma=pa.matcher(hall) if(ma.find()){ hall = ma.group(1) @@ -188,11 +188,11 @@ class BaixingRentPublisher implements Publishable { } if(StringUtils.isNotBlank(toilet)){ - if(toilet.indexOf("厨") > -1){ - toilet = toilet.substring(toilet.indexOf("厨") + 1) + if(toilet.indexOf("鍘�") > -1){ + toilet = toilet.substring(toilet.indexOf("鍘�") + 1) } - if(toilet.indexOf("卫") > -1){ - toilet = toilet.substring(0 , toilet.indexOf("卫")) + if(toilet.indexOf("鍗�") > -1){ + toilet = toilet.substring(0 , toilet.indexOf("鍗�")) ma=pa.matcher(toilet) if(ma.find()){ toilet = ma.group(1) @@ -210,7 +210,7 @@ class BaixingRentPublisher implements Publishable { if(dataMap.get("floor_info")){ String floor_info = dataMap.get("floor_info") - floor_info = floor_info.replace("楼层:", "") + floor_info = floor_info.replace("妤煎眰锛�", "") if(StringUtils.isNotBlank(floor_info)){ obj.put("floor_info", floor_info.trim()) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/BaixingSellPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/BaixingSellPublisher.groovy index c7292c953..4b06aadf8 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/BaixingSellPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/BaixingSellPublisher.groovy @@ -32,8 +32,8 @@ class BaixingSellPublisher implements Publishable { "546ed21ae4b024a890322e26" ]; public static final Map CONFIG = [ - match_address:false, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:false, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -59,22 +59,22 @@ class BaixingSellPublisher implements Publishable { obj.put("url", url) obj.put("cat", "sell") obj.put("city", dataMap.get("city")) - obj.put("name", dataMap.get("title").toString().replace("经纪人", "").trim()) + obj.put("name", dataMap.get("title").toString().replace("缁忕邯浜�", "").trim()) if(dataMap.get("region")){ String region = dataMap.get("region") - region = region.replace("地区:","") + region = region.replace("鍦板尯锛�","") if(region.indexOf("-") > -1){ String[] arrs = region.split("-") String block = ""; String address = ""; if(arrs.length == 3){ - region = arrs[0].replace("租房", "") - block = arrs[1].replace("租房", "") - address = arrs[2].replace("租房", "") + region = arrs[0].replace("绉熸埧", "") + block = arrs[1].replace("绉熸埧", "") + address = arrs[2].replace("绉熸埧", "") } else if(arrs.length == 2){ - region = arrs[0].replace("租房", "") - address = arrs[1].replace("租房", "") + region = arrs[0].replace("绉熸埧", "") + address = arrs[1].replace("绉熸埧", "") } else { region = null } @@ -134,7 +134,7 @@ class BaixingSellPublisher implements Publishable { if(dataMap.get("district_name")){ String district_name = dataMap.get("district_name") - district_name = district_name.replace("小区名:", "") + district_name = district_name.replace("灏忓尯鍚嶏細", "") district_name = trimChar(district_name) if(StringUtils.isNotBlank(district_name)){ obj.put("district_name", district_name.trim()) @@ -143,7 +143,7 @@ class BaixingSellPublisher implements Publishable { if(dataMap.get("fitment")){ String fitment = dataMap.get("fitment") - fitment = fitment.replace("装修情况:", "") + fitment = fitment.replace("瑁呬慨鎯呭喌锛�", "") if(StringUtils.isNotBlank(fitment)){ obj.put("fitment", fitment.trim()) } @@ -151,10 +151,10 @@ class BaixingSellPublisher implements Publishable { if(dataMap.get("room")){ String room = dataMap.get("room") - room = room.substring(room.indexOf(":") + 1) - if(room.indexOf("室") > -1){ - String hall = room.substring(room.indexOf("室") + 1).trim() - room = room.substring(0 , room.indexOf("室")).trim() + room = room.substring(room.indexOf("锛�") + 1) + if(room.indexOf("瀹�") > -1){ + String hall = room.substring(room.indexOf("瀹�") + 1).trim() + room = room.substring(0 , room.indexOf("瀹�")).trim() Pattern pa=Pattern.compile("(\\d+)") Matcher ma=pa.matcher(room) if(ma.find()){ @@ -166,9 +166,9 @@ class BaixingSellPublisher implements Publishable { obj.put("room", room.trim().toInteger()) } - if(StringUtils.isNotBlank(hall) && hall.indexOf("厅") > -1){ - String toilet = hall.substring(hall.indexOf("厅") + 1) - hall = hall.substring(0 , hall.indexOf("厅")) + if(StringUtils.isNotBlank(hall) && hall.indexOf("鍘�") > -1){ + String toilet = hall.substring(hall.indexOf("鍘�") + 1) + hall = hall.substring(0 , hall.indexOf("鍘�")) ma=pa.matcher(hall) if(ma.find()){ hall = ma.group(1) @@ -180,11 +180,11 @@ class BaixingSellPublisher implements Publishable { } if(StringUtils.isNotBlank(toilet)){ - if(toilet.indexOf("厨") > -1){ - toilet = toilet.substring(toilet.indexOf("厨") + 1) + if(toilet.indexOf("鍘�") > -1){ + toilet = toilet.substring(toilet.indexOf("鍘�") + 1) } - if(toilet.indexOf("卫") > -1){ - toilet = toilet.substring(0 , toilet.indexOf("卫")) + if(toilet.indexOf("鍗�") > -1){ + toilet = toilet.substring(0 , toilet.indexOf("鍗�")) ma=pa.matcher(toilet) if(ma.find()){ toilet = ma.group(1) @@ -202,7 +202,7 @@ class BaixingSellPublisher implements Publishable { if(dataMap.get("floor_info")){ String floor_info = dataMap.get("floor_info") - floor_info = floor_info.replace("楼层:", "") + floor_info = floor_info.replace("妤煎眰锛�", "") if(StringUtils.isNotBlank(floor_info)){ obj.put("floor_info", floor_info.trim()) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/BaixingShopRentPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/BaixingShopRentPublisher.groovy index f7d114513..3d2f28ffc 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/BaixingShopRentPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/BaixingShopRentPublisher.groovy @@ -34,8 +34,8 @@ class BaixingShopRentPublisher implements Publishable { "546450aae4b0e6ab76cf0617" ]; public static final Map CONFIG = [ - match_address:false, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:false, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -61,21 +61,21 @@ class BaixingShopRentPublisher implements Publishable { obj.put("url", url) obj.put("cat", "shop_rent") obj.put("city", dataMap.get("city")) - obj.put("name", dataMap.get("title").toString().replace("经纪人", "").trim()) + obj.put("name", dataMap.get("title").toString().replace("缁忕邯浜�", "").trim()) if(dataMap.get("region")){ String region = dataMap.get("region") - region = region.replace("地区:","") + region = region.replace("鍦板尯锛�","") if(region.indexOf("-") > -1){ String[] arrs = region.split("-") String block = ""; String district_name = ""; if(arrs.length == 3){ - region = arrs[0].replace("商铺", "") - block = arrs[1].replace("商铺", "") + region = arrs[0].replace("鍟嗛摵", "") + block = arrs[1].replace("鍟嗛摵", "") district_name = arrs[2] } else if(arrs.length == 2){ - region = arrs[0].replace("商铺", "") + region = arrs[0].replace("鍟嗛摵", "") district_name = arrs[1] } else { region = null diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/BaixingShopSellPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/BaixingShopSellPublisher.groovy index d4d579690..7dd9be6d2 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/BaixingShopSellPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/BaixingShopSellPublisher.groovy @@ -34,8 +34,8 @@ class BaixingShopSellPublisher implements Publishable { "54646eaee4b0e6ab76cf0669" ]; public static final Map CONFIG = [ - match_address:false, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:false, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -61,21 +61,21 @@ class BaixingShopSellPublisher implements Publishable { obj.put("url", url) obj.put("cat", "shop_sell") obj.put("city", dataMap.get("city")) - obj.put("name", dataMap.get("title").toString().replace("经纪人", "").trim()) + obj.put("name", dataMap.get("title").toString().replace("缁忕邯浜�", "").trim()) if(dataMap.get("region")){ String region = dataMap.get("region") - region = region.replace("地区:","") + region = region.replace("鍦板尯锛�","") if(region.indexOf("-") > -1){ String[] arrs = region.split("-") String block = ""; String district_name = ""; if(arrs.length == 3){ - region = arrs[0].replace("商铺", "") - block = arrs[1].replace("商铺", "") + region = arrs[0].replace("鍟嗛摵", "") + block = arrs[1].replace("鍟嗛摵", "") district_name = arrs[2] } else if(arrs.length == 2){ - region = arrs[0].replace("商铺", "") + region = arrs[0].replace("鍟嗛摵", "") district_name = arrs[1] } else { region = null diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/ChineseofficeOfficeRentPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/ChineseofficeOfficeRentPublisher.groovy index 0d6bc6cb9..e81d07f18 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/ChineseofficeOfficeRentPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/ChineseofficeOfficeRentPublisher.groovy @@ -15,8 +15,8 @@ class ChineseofficeOfficeRentPublisher implements Publishable { public static final List JOB_ID = ["53f6e660e4b09e392f5b7318"]; public static final Map CONFIG = [ - match_address:true, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:true, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -44,7 +44,7 @@ class ChineseofficeOfficeRentPublisher implements Publishable { if(dataMap.get("region")){ String region = dataMap.get("region") - region = region.replace("行政区域:", "").trim() + region = region.replace("琛屾斂鍖哄煙锛�", "").trim() if(StringUtils.isNotBlank(region)){ region = trimChar(region) obj.put("region", region.trim()) @@ -55,7 +55,7 @@ class ChineseofficeOfficeRentPublisher implements Publishable { if(dataMap.get("address")){ String address = dataMap.get("address") - address = address.replace("大厦地址:", "") + address = address.replace("澶у帵鍦板潃锛�", "") if(StringUtils.isNotBlank(address)){ obj.put("address", address.trim()) } @@ -63,7 +63,7 @@ class ChineseofficeOfficeRentPublisher implements Publishable { if(dataMap.get("total_price")){ String totalPrice = dataMap.get("total_price") - totalPrice = totalPrice.replace(",", "").replace("元/月", "") + totalPrice = totalPrice.replace(",", "").replace("鍏�/鏈�", "") Pattern pa=Pattern.compile("(\\d+)") Matcher ma=pa.matcher(totalPrice) if(ma.find()){ @@ -79,8 +79,8 @@ class ChineseofficeOfficeRentPublisher implements Publishable { if(dataMap.get("area")){ String area = dataMap.get("area") - if(area.indexOf("积:") > -1) { - area = area.substring(area.indexOf("积:") + 2) + if(area.indexOf("绉細") > -1) { + area = area.substring(area.indexOf("绉細") + 2) area = area.replace(",", "") Pattern pa=Pattern.compile("(\\d+)") Matcher ma=pa.matcher(area) @@ -95,7 +95,7 @@ class ChineseofficeOfficeRentPublisher implements Publishable { } } - obj.put("estate_type", "写字楼") + obj.put("estate_type", "鍐欏瓧妤�") if(dataMap.get("district_name")){ String district_name = dataMap.get("district_name") if(StringUtils.isNotBlank(district_name)){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/ChineseofficeOfficeSellPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/ChineseofficeOfficeSellPublisher.groovy index 383e2becb..80a28b3f2 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/ChineseofficeOfficeSellPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/ChineseofficeOfficeSellPublisher.groovy @@ -15,8 +15,8 @@ class ChineseofficeOfficeSellPublisher implements Publishable { public static final List JOB_ID = ["53f6f566e4b09e392f5b732e"]; public static final Map CONFIG = [ - match_address:true, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:true, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -44,7 +44,7 @@ class ChineseofficeOfficeSellPublisher implements Publishable { if(dataMap.get("region")){ String region = dataMap.get("region") - region = region.replace("行政区域:", "").trim() + region = region.replace("琛屾斂鍖哄煙锛�", "").trim() if(StringUtils.isNotBlank(region)){ region = trimChar(region) obj.put("region", region.trim()) @@ -55,7 +55,7 @@ class ChineseofficeOfficeSellPublisher implements Publishable { if(dataMap.get("address")){ String address = dataMap.get("address") - address = address.replace("大厦地址:", "") + address = address.replace("澶у帵鍦板潃锛�", "") if(StringUtils.isNotBlank(address)){ obj.put("address", address.trim()) } @@ -94,7 +94,7 @@ class ChineseofficeOfficeSellPublisher implements Publishable { } } - obj.put("estate_type", "写字楼") + obj.put("estate_type", "鍐欏瓧妤�") if(dataMap.get("district_name")){ String district_name = dataMap.get("district_name") diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/CityHouseOfficeRentPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/CityHouseOfficeRentPublisher.groovy index 99b627226..7cc5d6455 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/CityHouseOfficeRentPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/CityHouseOfficeRentPublisher.groovy @@ -34,8 +34,8 @@ class CityHouseOfficeRentPublisher implements Publishable { "546d9e2ee4b024a890322c82" ]; public static final Map CONFIG = [ - match_address:false, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:false, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/CityHouseOfficeSellPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/CityHouseOfficeSellPublisher.groovy index b3fa1ecd6..225570ba1 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/CityHouseOfficeSellPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/CityHouseOfficeSellPublisher.groovy @@ -34,8 +34,8 @@ class CityHouseOfficeSellPublisher implements Publishable { "546d8102e4b024a890322bc6" ]; public static final Map CONFIG = [ - match_address:false, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:false, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/CityHouseRentPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/CityHouseRentPublisher.groovy index b9e271712..7976ac24e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/CityHouseRentPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/CityHouseRentPublisher.groovy @@ -32,8 +32,8 @@ class CityHouseRentPublisher implements Publishable { "546ef86be4b024a8903230d5" ]; public static final Map CONFIG = [ - match_address:false, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:false, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -192,9 +192,9 @@ class CityHouseRentPublisher implements Publishable { room = room.substring(room.indexOf("(") + 1) } - if(room.indexOf("室") > -1){ - String hall = room.substring(room.indexOf("室") + 1).trim() - room = room.substring(0 , room.indexOf("室")).trim() + if(room.indexOf("瀹�") > -1){ + String hall = room.substring(room.indexOf("瀹�") + 1).trim() + room = room.substring(0 , room.indexOf("瀹�")).trim() Pattern pa=Pattern.compile("(\\d+)") Matcher ma=pa.matcher(room) if(ma.find()){ @@ -206,9 +206,9 @@ class CityHouseRentPublisher implements Publishable { obj.put("room", room.trim().toInteger()) } - if(StringUtils.isNotBlank(hall) && hall.indexOf("厅") > -1){ - String toilet = hall.substring(hall.indexOf("厅") + 1) - hall = hall.substring(0 , hall.indexOf("厅")) + if(StringUtils.isNotBlank(hall) && hall.indexOf("鍘�") > -1){ + String toilet = hall.substring(hall.indexOf("鍘�") + 1) + hall = hall.substring(0 , hall.indexOf("鍘�")) ma=pa.matcher(hall) if(ma.find()){ hall = ma.group(1) @@ -220,11 +220,11 @@ class CityHouseRentPublisher implements Publishable { } if(StringUtils.isNotBlank(toilet)){ - if(toilet.indexOf("厨") > -1){ - toilet = toilet.substring(toilet.indexOf("厨") + 1) + if(toilet.indexOf("鍘�") > -1){ + toilet = toilet.substring(toilet.indexOf("鍘�") + 1) } - if(toilet.indexOf("卫") > -1){ - toilet = toilet.substring(0 , toilet.indexOf("卫")) + if(toilet.indexOf("鍗�") > -1){ + toilet = toilet.substring(0 , toilet.indexOf("鍗�")) ma=pa.matcher(toilet) if(ma.find()){ toilet = ma.group(1) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/CityHouseShopRentPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/CityHouseShopRentPublisher.groovy index 79e2519d5..1bc9ad947 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/CityHouseShopRentPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/CityHouseShopRentPublisher.groovy @@ -32,8 +32,8 @@ class CityHouseShopRentPublisher implements Publishable { "546db051e4b024a890322d90" ]; public static final Map CONFIG = [ - match_address:false, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:false, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/CityHouseShopSellPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/CityHouseShopSellPublisher.groovy index 3533d4691..83954f05c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/CityHouseShopSellPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/CityHouseShopSellPublisher.groovy @@ -34,8 +34,8 @@ class CityHouseShopSellPublisher implements Publishable { "546da7f8e4b024a890322cfb" ]; public static final Map CONFIG = [ - match_address:false, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:false, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/CzfcwShopSellPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/CzfcwShopSellPublisher.groovy index 658b31675..b4bd342a8 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/CzfcwShopSellPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/CzfcwShopSellPublisher.groovy @@ -17,8 +17,8 @@ class CzfcwShopSellPublisher implements Publishable { public static final List JOB_ID = ["55de7d04e4b0ea76276bab41"]; public static final Map CONFIG = [ - match_address:true, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:true, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -44,7 +44,7 @@ class CzfcwShopSellPublisher implements Publishable { obj.put("url", url) obj.put("cat", 'shop_sell') obj.put("city", dataMap.get("city")) - obj.put("name", dataMap.get("title").replace("[出售]","")) + obj.put("name", dataMap.get("title").replace("[鍑哄敭]","")) if(dataMap.get("region") != null) { String[] array = dataMap.get("region").split(">"); @@ -53,7 +53,7 @@ class CzfcwShopSellPublisher implements Publishable { if(StringUtils.isNotBlank(region)){ //region = trimChar(region) - obj.put("region", region.trim().replace("二手房", "")) + obj.put("region", region.trim().replace("浜屾墜鎴�", "")) } } @@ -105,7 +105,7 @@ class CzfcwShopSellPublisher implements Publishable { if(dataMap.get("name") != null) { String districtName = dataMap.get("name") - districtName = districtName.replace("地图", "") + districtName = districtName.replace("鍦板浘", "") if(StringUtils.isNotBlank(districtName)){ districtName = trimChar(districtName) obj.put("district_name", districtName.trim()) @@ -114,8 +114,8 @@ class CzfcwShopSellPublisher implements Publishable { if(dataMap.get("estate_type") != null) { String estateType = dataMap.get("estate_type") - if(estateType.indexOf(":") > -1){ - estateType = estateType.substring(estateType.indexOf(":") + 1) + if(estateType.indexOf("锛�") > -1){ + estateType = estateType.substring(estateType.indexOf("锛�") + 1) } if(StringUtils.isNotBlank(estateType)){ obj.put("estate_type", estateType.trim()) @@ -124,7 +124,7 @@ class CzfcwShopSellPublisher implements Publishable { if(dataMap.get("fitment") != null) { String fitment = dataMap.get("fitment") - fitment = fitment.replace("装修:", "") + fitment = fitment.replace("瑁呬慨锛�", "") if(StringUtils.isNotBlank(fitment)){ obj.put("fitment", fitment.trim()) } @@ -132,7 +132,7 @@ class CzfcwShopSellPublisher implements Publishable { if(dataMap.get("direction") != null) { String fitment = dataMap.get("direction") - fitment = fitment.replace("朝向:", "") + fitment = fitment.replace("鏈濆悜锛�", "") if(StringUtils.isNotBlank(fitment)){ obj.put("direction", fitment.trim()) } @@ -156,7 +156,7 @@ class CzfcwShopSellPublisher implements Publishable { if(dataMap.get("floor_info") != null) { String floorInfo = dataMap.get("floor_info") - floorInfo = floorInfo.replace("楼层:", "") + floorInfo = floorInfo.replace("妤煎眰锛�", "") if(StringUtils.isNotBlank(floorInfo)){ println floorInfo.indexOf("/"); if(floorInfo.indexOf("/")>0){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/DaikanOfficeRentPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/DaikanOfficeRentPublisher.groovy index 2b5868f5a..ac6041726 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/DaikanOfficeRentPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/DaikanOfficeRentPublisher.groovy @@ -34,8 +34,8 @@ class DaikanOfficeRentPublisher implements Publishable { "5469a76be4b0e6ab76cf0768" ]; public static final Map CONFIG = [ - match_address:false, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:false, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -68,7 +68,7 @@ class DaikanOfficeRentPublisher implements Publishable { if(region.indexOf(">") > -1){ String[] arrs = region.split(">") if(arrs.length >= 4){ - region = arrs[2].replace("写字楼出租", "") + region = arrs[2].replace("鍐欏瓧妤煎嚭绉�", "") if(StringUtils.isNotBlank(region)){ region = trimChar(region) obj.put("region", region.trim()) @@ -88,7 +88,7 @@ class DaikanOfficeRentPublisher implements Publishable { if(dataMap.get("build_date")){ String build_date = dataMap.get("build_date") - build_date = build_date.replace("建造年代:", "") + build_date = build_date.replace("寤洪�犲勾浠o細", "") if(StringUtils.isNotBlank(build_date)){ obj.put("build_date", build_date.trim()) } @@ -96,8 +96,8 @@ class DaikanOfficeRentPublisher implements Publishable { if(dataMap.get("direction")){ String direction = dataMap.get("direction") - if(direction.indexOf("向:") > -1){ - direction = direction.substring(direction.indexOf("向:") + 2) + if(direction.indexOf("鍚戯細") > -1){ + direction = direction.substring(direction.indexOf("鍚戯細") + 2) } if(StringUtils.isNotBlank(direction)){ obj.put("direction", direction.trim()) @@ -138,7 +138,7 @@ class DaikanOfficeRentPublisher implements Publishable { if(dataMap.get("estate_charge")){ String estate_charge = dataMap.get("estate_charge") - estate_charge = estate_charge.replace("物业费用:", "") + estate_charge = estate_charge.replace("鐗╀笟璐圭敤锛�", "") if(StringUtils.isNotBlank(estate_charge)){ obj.put("estate_charge", estate_charge.trim()) } @@ -146,7 +146,7 @@ class DaikanOfficeRentPublisher implements Publishable { if(dataMap.get("floor_info")){ String floor_info = dataMap.get("floor_info") - floor_info = floor_info.replace("楼层区域:", "") + floor_info = floor_info.replace("妤煎眰鍖哄煙锛�", "") if(StringUtils.isNotBlank(floor_info)){ obj.put("floor_info", floor_info.trim()) } @@ -200,8 +200,8 @@ class DaikanOfficeRentPublisher implements Publishable { if(dataMap.get("publish_date")){ String publish_date = dataMap.get("publish_date") - if(publish_date.indexOf("发布时间:") > -1){ - publish_date = publish_date.substring(publish_date.indexOf("发布时间:")) + if(publish_date.indexOf("鍙戝竷鏃堕棿锛�") > -1){ + publish_date = publish_date.substring(publish_date.indexOf("鍙戝竷鏃堕棿锛�")) Date date = DateUtil.parseStringToDate(publish_date); if(date!=null){ obj.put("publish_date", date) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/DaikanOfficeSellPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/DaikanOfficeSellPublisher.groovy index 1b28ded05..616537e26 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/DaikanOfficeSellPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/DaikanOfficeSellPublisher.groovy @@ -34,8 +34,8 @@ class DaikanOfficeSellPublisher implements Publishable { "54699d9be4b0e6ab76cf0739" ]; public static final Map CONFIG = [ - match_address:false, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:false, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -68,7 +68,7 @@ class DaikanOfficeSellPublisher implements Publishable { if(region.indexOf(">") > -1){ String[] arrs = region.split(">") if(arrs.length >= 4){ - region = arrs[2].replace("写字楼出售", "") + region = arrs[2].replace("鍐欏瓧妤煎嚭鍞�", "") if(StringUtils.isNotBlank(region)){ region = trimChar(region) obj.put("region", region.trim()) @@ -88,7 +88,7 @@ class DaikanOfficeSellPublisher implements Publishable { if(dataMap.get("build_date")){ String build_date = dataMap.get("build_date") - build_date = build_date.replace("建造年代:", "") + build_date = build_date.replace("寤洪�犲勾浠o細", "") if(StringUtils.isNotBlank(build_date)){ obj.put("build_date", build_date.trim()) } @@ -96,8 +96,8 @@ class DaikanOfficeSellPublisher implements Publishable { if(dataMap.get("direction")){ String direction = dataMap.get("direction") - if(direction.indexOf("向:") > -1){ - direction = direction.substring(direction.indexOf("向:") + 2) + if(direction.indexOf("鍚戯細") > -1){ + direction = direction.substring(direction.indexOf("鍚戯細") + 2) } if(StringUtils.isNotBlank(direction)){ obj.put("direction", direction.trim()) @@ -138,7 +138,7 @@ class DaikanOfficeSellPublisher implements Publishable { if(dataMap.get("estate_charge")){ String estate_charge = dataMap.get("estate_charge") - estate_charge = estate_charge.replace("物业费用:", "") + estate_charge = estate_charge.replace("鐗╀笟璐圭敤锛�", "") if(StringUtils.isNotBlank(estate_charge)){ obj.put("estate_charge", estate_charge.trim()) } @@ -146,7 +146,7 @@ class DaikanOfficeSellPublisher implements Publishable { if(dataMap.get("floor_info")){ String floor_info = dataMap.get("floor_info") - floor_info = floor_info.replace("楼层区域:", "") + floor_info = floor_info.replace("妤煎眰鍖哄煙锛�", "") if(StringUtils.isNotBlank(floor_info)){ obj.put("floor_info", floor_info.trim()) } @@ -200,8 +200,8 @@ class DaikanOfficeSellPublisher implements Publishable { if(dataMap.get("publish_date")){ String publish_date = dataMap.get("publish_date") - if(publish_date.indexOf("发布时间:") > -1){ - publish_date = publish_date.substring(publish_date.indexOf("发布时间:")) + if(publish_date.indexOf("鍙戝竷鏃堕棿锛�") > -1){ + publish_date = publish_date.substring(publish_date.indexOf("鍙戝竷鏃堕棿锛�")) Date date = DateUtil.parseStringToDate(publish_date); if(date!=null){ obj.put("publish_date", date) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/DaikanRentPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/DaikanRentPublisher.groovy index 3bf0caf6f..6cf7f5b96 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/DaikanRentPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/DaikanRentPublisher.groovy @@ -34,8 +34,8 @@ class DaikanRentPublisher implements Publishable { "5461ab64e4b0e6ab76cf03e6" ]; public static final Map CONFIG = [ - match_address:false, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:false, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -68,7 +68,7 @@ class DaikanRentPublisher implements Publishable { if(region.indexOf(">") > -1){ String[] arrs = region.split(">") if(arrs.length >= 4){ - region = arrs[2].replace("租房", "") + region = arrs[2].replace("绉熸埧", "") region = trimChar(region) if(StringUtils.isNotBlank(region)){ obj.put("region", region.trim()) @@ -88,7 +88,7 @@ class DaikanRentPublisher implements Publishable { if(dataMap.get("build_date")){ String build_date = dataMap.get("build_date") - build_date = build_date.replace("建造年代:", "") + build_date = build_date.replace("寤洪�犲勾浠o細", "") if(StringUtils.isNotBlank(build_date)){ obj.put("build_date", build_date.trim()) } @@ -96,8 +96,8 @@ class DaikanRentPublisher implements Publishable { if(dataMap.get("direction")){ String direction = dataMap.get("direction") - if(direction.indexOf("向:") > -1){ - direction = direction.substring(direction.indexOf("向:") + 2) + if(direction.indexOf("鍚戯細") > -1){ + direction = direction.substring(direction.indexOf("鍚戯細") + 2) } if(StringUtils.isNotBlank(direction)){ obj.put("direction", direction.trim()) @@ -106,7 +106,7 @@ class DaikanRentPublisher implements Publishable { if(dataMap.get("build_type")){ String build_type = dataMap.get("build_type") - build_type = build_type.replace("房源类型:", "") + build_type = build_type.replace("鎴挎簮绫诲瀷锛�", "") if(StringUtils.isNotBlank(build_type)){ obj.put("build_type", build_type.trim()) } @@ -129,7 +129,7 @@ class DaikanRentPublisher implements Publishable { if(dataMap.get("fitment")){ String fitment = dataMap.get("fitment") - fitment = fitment.replace("装修情况:", "") + fitment = fitment.replace("瑁呬慨鎯呭喌锛�", "") if(StringUtils.isNotBlank(fitment)){ obj.put("fitment", fitment.trim()) } @@ -154,7 +154,7 @@ class DaikanRentPublisher implements Publishable { if(dataMap.get("floor_info")){ String floor_info = dataMap.get("floor_info") - floor_info = floor_info.replace("所在楼层:", "") + floor_info = floor_info.replace("鎵�鍦ㄦゼ灞傦細", "") if(StringUtils.isNotBlank(floor_info)){ obj.put("floor_info", floor_info.trim()) } @@ -196,12 +196,12 @@ class DaikanRentPublisher implements Publishable { if(dataMap.get("room")){ String room = dataMap.get("room") - if(room.indexOf("房型面积:") > -1){ - room = room.substring(room.indexOf("房型面积:") + 5) + if(room.indexOf("鎴垮瀷闈㈢Н锛�") > -1){ + room = room.substring(room.indexOf("鎴垮瀷闈㈢Н锛�") + 5) } - if(room.indexOf("室") > -1){ - String hall = room.substring(room.indexOf("室") + 1).trim() - room = room.substring(0 , room.indexOf("室")).trim() + if(room.indexOf("瀹�") > -1){ + String hall = room.substring(room.indexOf("瀹�") + 1).trim() + room = room.substring(0 , room.indexOf("瀹�")).trim() Pattern pa=Pattern.compile("(\\d+)") Matcher ma=pa.matcher(room) if(ma.find()){ @@ -213,9 +213,9 @@ class DaikanRentPublisher implements Publishable { obj.put("room", room.trim().toInteger()) } - if(StringUtils.isNotBlank(hall) && hall.indexOf("厅") > -1){ - String toilet = hall.substring(hall.indexOf("厅") + 1) - hall = hall.substring(0 , hall.indexOf("厅")) + if(StringUtils.isNotBlank(hall) && hall.indexOf("鍘�") > -1){ + String toilet = hall.substring(hall.indexOf("鍘�") + 1) + hall = hall.substring(0 , hall.indexOf("鍘�")) ma=pa.matcher(hall) if(ma.find()){ hall = ma.group(1) @@ -226,11 +226,11 @@ class DaikanRentPublisher implements Publishable { obj.put("hall", hall.trim().toInteger()) } - if(StringUtils.isNotBlank(toilet) && toilet.indexOf("卫") > -1){ - if(toilet.indexOf("厨") > -1){ - toilet = toilet.substring(toilet.indexOf("厨") + 1) + if(StringUtils.isNotBlank(toilet) && toilet.indexOf("鍗�") > -1){ + if(toilet.indexOf("鍘�") > -1){ + toilet = toilet.substring(toilet.indexOf("鍘�") + 1) } - toilet = toilet.substring(0 , toilet.indexOf("卫")) + toilet = toilet.substring(0 , toilet.indexOf("鍗�")) ma=pa.matcher(toilet) if(ma.find()){ toilet = ma.group(1) @@ -253,8 +253,8 @@ class DaikanRentPublisher implements Publishable { if(dataMap.get("publish_date")){ String publish_date = dataMap.get("publish_date") - if(publish_date.indexOf("发布时间:") > -1){ - publish_date = publish_date.substring(publish_date.indexOf("发布时间:")) + if(publish_date.indexOf("鍙戝竷鏃堕棿锛�") > -1){ + publish_date = publish_date.substring(publish_date.indexOf("鍙戝竷鏃堕棿锛�")) Date date = DateUtil.parseStringToDate(publish_date); if(date!=null){ obj.put("publish_date", date) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/DaikanSellPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/DaikanSellPublisher.groovy index f356e570f..0245874bc 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/DaikanSellPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/DaikanSellPublisher.groovy @@ -34,8 +34,8 @@ class DaikanSellPublisher implements Publishable { "5461d86de4b0e6ab76cf0422" ]; public static final Map CONFIG = [ - match_address:false, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:false, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -68,7 +68,7 @@ class DaikanSellPublisher implements Publishable { if(region.indexOf(">") > -1){ String[] arrs = region.split(">") if(arrs.length >= 4){ - region = arrs[2].replace("二手房", "") + region = arrs[2].replace("浜屾墜鎴�", "") if(StringUtils.isNotBlank(region)){ region = trimChar(region) obj.put("region", region.trim()) @@ -88,7 +88,7 @@ class DaikanSellPublisher implements Publishable { if(dataMap.get("build_date")){ String build_date = dataMap.get("build_date") - build_date = build_date.replace("建造年代:", "") + build_date = build_date.replace("寤洪�犲勾浠o細", "") if(StringUtils.isNotBlank(build_date)){ obj.put("build_date", build_date.trim()) } @@ -96,8 +96,8 @@ class DaikanSellPublisher implements Publishable { if(dataMap.get("direction")){ String direction = dataMap.get("direction") - if(direction.indexOf("向:") > -1){ - direction = direction.substring(direction.indexOf("向:") + 2) + if(direction.indexOf("鍚戯細") > -1){ + direction = direction.substring(direction.indexOf("鍚戯細") + 2) } if(StringUtils.isNotBlank(direction)){ obj.put("direction", direction.trim()) @@ -106,7 +106,7 @@ class DaikanSellPublisher implements Publishable { if(dataMap.get("build_type")){ String build_type = dataMap.get("build_type") - build_type = build_type.replace("房源类型:", "") + build_type = build_type.replace("鎴挎簮绫诲瀷锛�", "") if(StringUtils.isNotBlank(build_type)){ obj.put("build_type", build_type.trim()) } @@ -129,7 +129,7 @@ class DaikanSellPublisher implements Publishable { if(dataMap.get("fitment")){ String fitment = dataMap.get("fitment") - fitment = fitment.replace("装修情况:", "") + fitment = fitment.replace("瑁呬慨鎯呭喌锛�", "") if(StringUtils.isNotBlank(fitment)){ obj.put("fitment", fitment.trim()) } @@ -154,7 +154,7 @@ class DaikanSellPublisher implements Publishable { if(dataMap.get("floor_info")){ String floor_info = dataMap.get("floor_info") - floor_info = floor_info.replace("所在楼层:", "") + floor_info = floor_info.replace("鎵�鍦ㄦゼ灞傦細", "") if(StringUtils.isNotBlank(floor_info)){ obj.put("floor_info", floor_info.trim()) } @@ -196,12 +196,12 @@ class DaikanSellPublisher implements Publishable { if(dataMap.get("room")){ String room = dataMap.get("room") - if(room.indexOf("房型面积:") > -1){ - room = room.substring(room.indexOf("房型面积:") + 5) + if(room.indexOf("鎴垮瀷闈㈢Н锛�") > -1){ + room = room.substring(room.indexOf("鎴垮瀷闈㈢Н锛�") + 5) } - if(room.indexOf("室") > -1){ - String hall = room.substring(room.indexOf("室") + 1).trim() - room = room.substring(0 , room.indexOf("室")).trim() + if(room.indexOf("瀹�") > -1){ + String hall = room.substring(room.indexOf("瀹�") + 1).trim() + room = room.substring(0 , room.indexOf("瀹�")).trim() Pattern pa=Pattern.compile("(\\d+)") Matcher ma=pa.matcher(room) if(ma.find()){ @@ -213,9 +213,9 @@ class DaikanSellPublisher implements Publishable { obj.put("room", room.trim().toInteger()) } - if(StringUtils.isNotBlank(hall) && hall.indexOf("厅") > -1){ - String toilet = hall.substring(hall.indexOf("厅") + 1) - hall = hall.substring(0 , hall.indexOf("厅")) + if(StringUtils.isNotBlank(hall) && hall.indexOf("鍘�") > -1){ + String toilet = hall.substring(hall.indexOf("鍘�") + 1) + hall = hall.substring(0 , hall.indexOf("鍘�")) ma=pa.matcher(hall) if(ma.find()){ hall = ma.group(1) @@ -226,11 +226,11 @@ class DaikanSellPublisher implements Publishable { obj.put("hall", hall.trim().toInteger()) } - if(StringUtils.isNotBlank(toilet) && toilet.indexOf("卫") > -1){ - if(toilet.indexOf("厨") > -1){ - toilet = toilet.substring(toilet.indexOf("厨") + 1) + if(StringUtils.isNotBlank(toilet) && toilet.indexOf("鍗�") > -1){ + if(toilet.indexOf("鍘�") > -1){ + toilet = toilet.substring(toilet.indexOf("鍘�") + 1) } - toilet = toilet.substring(0 , toilet.indexOf("卫")) + toilet = toilet.substring(0 , toilet.indexOf("鍗�")) ma=pa.matcher(toilet) if(ma.find()){ toilet = ma.group(1) @@ -259,8 +259,8 @@ class DaikanSellPublisher implements Publishable { if(dataMap.get("publish_date")){ String publish_date = dataMap.get("publish_date") - if(publish_date.indexOf("发布时间:") > -1){ - publish_date = publish_date.substring(publish_date.indexOf("发布时间:")) + if(publish_date.indexOf("鍙戝竷鏃堕棿锛�") > -1){ + publish_date = publish_date.substring(publish_date.indexOf("鍙戝竷鏃堕棿锛�")) Date date = DateUtil.parseStringToDate(publish_date); if(date!=null){ obj.put("publish_date", date) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/DatastorePublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/DatastorePublisher.groovy index ec6dbac79..32e7165d3 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/DatastorePublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/DatastorePublisher.groovy @@ -76,7 +76,7 @@ public class DatastorePublisher { } /** - * 10分钟执行一次删除1.5天前的数据 + * 10鍒嗛挓鎵ц涓�娆″垹闄�1.5澶╁墠鐨勬暟鎹� */ public void cleanBackup() { new AsyncThread(10 * 60 * 1000, new Call() { @@ -182,7 +182,7 @@ public class DatastorePublisher { code = ShopSellDataFilter.isAviable(dbo) } - //code小于12的选项为必填字段 + //code灏忎簬12鐨勯�夐」涓哄繀濉瓧娈� if(code > 0 && code <= 12) { METADATA_COLL.remove(new BasicDBObject("_id", metadata.get('_id'))) increaseHousesGrabErrCount(jobId); @@ -194,12 +194,12 @@ public class DatastorePublisher { if(code == 0 && ONLINE_CITY.contains(city)) { int outTime = getConfigValue(publishable, "out_time") int cstat = this.compareMetadata(metadata, outTime) - if(cstat == 2) {//没有备份,说明未被发不过,应新增 + if(cstat == 2) {//娌℃湁澶囦唤锛岃鏄庢湭琚彂涓嶈繃锛屽簲鏂板 saveToData(dbo) logInfo("${jobId} ${metadata.get('_id')} ${publishable.getClass().getSimpleName()} save ${url}") - }else if(cstat == 1) {//与备份数据一样 + }else if(cstat == 1) {//涓庡浠芥暟鎹竴鏍� logInfo("${jobId} ${publishable.getClass().getSimpleName()} exist ${url}") - }else if(cstat == 0) {//与备份数据不一样,应该进行更新 + }else if(cstat == 0) {//涓庡浠芥暟鎹笉涓�鏍凤紝搴旇杩涜鏇存柊 String relateId = null; try { DBObject relatedObj = DS_ONLINE_COLL.findOne(new BasicDBObject('url', url), new BasicDBObject('_id', 1)) @@ -346,10 +346,10 @@ public class DatastorePublisher { } /** - * 对metadata和metadata_backup对比 - * 2-没有找到该metadata的备份 - * 1-metadata和备份的一样 - * 0-metadata和备份的不一样 + * 瀵筸etadata鍜宮etadata_backup瀵规瘮 + * 2-娌℃湁鎵惧埌璇etadata鐨勫浠� + * 1-metadata鍜屽浠界殑涓�鏍� + * 0-metadata鍜屽浠界殑涓嶄竴鏍� */ private int compareMetadata(DBObject obj, int outTime) { DBObject metadata = obj.clone(); @@ -484,10 +484,10 @@ public class DatastorePublisher { ret.put(it.name(), it.toMap()) } }else{ - logWarn('!!!请使用'+clazz.getName()+'注解标明本Batch的拥有者!!!') + logWarn('锛侊紒锛佽浣跨敤'+clazz.getName()+'娉ㄨВ鏍囨槑鏈珺atch鐨勬嫢鏈夎�咃紒锛侊紒') } }catch(Exception e) { - logWarn('!!!请使用'+clazz.getName()+'注解标明本Batch的拥有者!!!', e) + logWarn('锛侊紒锛佽浣跨敤'+clazz.getName()+'娉ㄨВ鏍囨槑鏈珺atch鐨勬嫢鏈夎�咃紒锛侊紒', e) } return ret } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/DatastorePublisher2.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/DatastorePublisher2.groovy index cd1f5d810..f7c352cbb 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/DatastorePublisher2.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/DatastorePublisher2.groovy @@ -175,7 +175,7 @@ public class DatastorePublisher2 { } - //如果过滤字段为必填 + //濡傛灉杩囨护瀛楁涓哄繀濉� if(reason != null && reason.isRequired()) { METADATA_COLL.remove(new BasicDBObject("_id", metadata.get('_id'))) logInfo("${jobId} ${publishable.getClass().getSimpleName()} filter [${reason.getCode()}] ${url}") @@ -190,12 +190,12 @@ public class DatastorePublisher2 { if(code == 0 && isOnlineCity(city)) { int outTime = getConfigValue(publishable, "out_time") int cstat = this.compareMetadata(metadata, outTime) - if(cstat == 2) {//没有备份,说明未被发不过,应新增 + if(cstat == 2) {//娌℃湁澶囦唤锛岃鏄庢湭琚彂涓嶈繃锛屽簲鏂板 saveToData(dbo) logInfo("${jobId} ${metadata.get('_id')} ${publishable.getClass().getSimpleName()} save ${url}") - }else if(cstat == 1) {//与备份数据一样 + }else if(cstat == 1) {//涓庡浠芥暟鎹竴鏍� logInfo("${jobId} ${publishable.getClass().getSimpleName()} exist ${url}") - }else if(cstat == 0) {//与备份数据不一样,应该进行更新 + }else if(cstat == 0) {//涓庡浠芥暟鎹笉涓�鏍凤紝搴旇杩涜鏇存柊 String relateId = null; try { DBObject relatedObj = DS_ONLINE_COLL.findOne(new BasicDBObject('url', url), new BasicDBObject('_id', 1)) @@ -342,10 +342,10 @@ public class DatastorePublisher2 { } /** - * 对metadata和metadata_backup对比 - * 2-没有找到该metadata的备份 - * 1-metadata和备份的一样 - * 0-metadata和备份的不一样 + * 瀵筸etadata鍜宮etadata_backup瀵规瘮 + * 2-娌℃湁鎵惧埌璇etadata鐨勫浠� + * 1-metadata鍜屽浠界殑涓�鏍� + * 0-metadata鍜屽浠界殑涓嶄竴鏍� */ private int compareMetadata(DBObject obj, int outTime) { DBObject metadata = obj.clone(); @@ -498,10 +498,10 @@ public class DatastorePublisher2 { ret.put(it.name(), it.toMap()) } }else{ - logWarn('!!!请使用'+clazz.getName()+'注解标明本Batch的拥有者!!!') + logWarn('锛侊紒锛佽浣跨敤'+clazz.getName()+'娉ㄨВ鏍囨槑鏈珺atch鐨勬嫢鏈夎�咃紒锛侊紒') } }catch(Exception e) { - logWarn('!!!请使用'+clazz.getName()+'注解标明本Batch的拥有者!!!', e) + logWarn('锛侊紒锛佽浣跨敤'+clazz.getName()+'娉ㄨВ鏍囨槑鏈珺atch鐨勬嫢鏈夎�咃紒锛侊紒', e) } return ret } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/DistrictWebpagePublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/DistrictWebpagePublisher.groovy index b3d570d7d..b4244be28 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/DistrictWebpagePublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/DistrictWebpagePublisher.groovy @@ -19,7 +19,7 @@ class DistrictWebpagePublisher extends BaseBatch{ public static DBCollection METADATA_COLL = MongoUtils.getCollectionByName("artemis", "metadata", "192.168.0.56", 55007) public static DBCollection WEBPAGE_COLL = MongoUtils.getCollectionByName("fangjia", "webpage", "192.168.0.61", 27037) public static def JOBID_MAP = [ - /*搜房网小区详情页*/ + /*鎼滄埧缃戝皬鍖鸿鎯呴〉*/ "soufun_district_detail" : [ "52269328e4b01828a5814917", "5226dd0fe4b0b712b408c8c3" ], diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/FangziOfficeRentPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/FangziOfficeRentPublisher.groovy index a22d16f79..183e98f07 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/FangziOfficeRentPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/FangziOfficeRentPublisher.groovy @@ -13,8 +13,8 @@ class FangziOfficeRentPublisher implements Publishable { public static final List JOB_ID = ["53f712bce4b09e392f5b736d"]; public static final Map CONFIG = [ - match_address:true, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:true, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -52,7 +52,7 @@ class FangziOfficeRentPublisher implements Publishable { if(dataMap.get("district_name")){ String name = dataMap.get("district_name") - name = name.replace("写字楼名称:", "").trim() + name = name.replace("鍐欏瓧妤煎悕绉帮細", "").trim() if(StringUtils.isNotBlank(name)){ obj.put("name", name) } @@ -62,7 +62,7 @@ class FangziOfficeRentPublisher implements Publishable { if(dataMap.get("area")){ String area = dataMap.get("area") - area = area.replace("平方米", "").replace("面积:", "").replace("平米", "").replace(",","").trim() + area = area.replace("骞虫柟绫�", "").replace("闈㈢Н锛�", "").replace("骞崇背", "").replace(",","").trim() if(StringUtils.isNotBlank(area)){ obj.put("area", area.toDouble()) } @@ -70,11 +70,11 @@ class FangziOfficeRentPublisher implements Publishable { if(dataMap.get("total_price")){ String totalPrice = dataMap.get("total_price") - totalPrice = totalPrice.replace("面议", "").replace("租金:", "").replace(",","").trim() - if(totalPrice.indexOf("元/月") > -1){ - totalPrice = totalPrice.replace("元/月", "").trim() - } else if(totalPrice.indexOf("元/平米/天") > -1 || totalPrice.indexOf("元/㎡·天") > -1) { - totalPrice = totalPrice.replace("元/平米/天","").replace("元/㎡·天","").trim() + totalPrice = totalPrice.replace("闈㈣", "").replace("绉熼噾锛�", "").replace(",","").trim() + if(totalPrice.indexOf("鍏�/鏈�") > -1){ + totalPrice = totalPrice.replace("鍏�/鏈�", "").trim() + } else if(totalPrice.indexOf("鍏�/骞崇背/澶�") > -1 || totalPrice.indexOf("鍏�/銕÷峰ぉ") > -1) { + totalPrice = totalPrice.replace("鍏�/骞崇背/澶�","").replace("鍏�/銕÷峰ぉ","").trim() totalPrice = (obj.get("area") * totalPrice.toDouble() * 30).toString() } if(totalPrice.indexOf(".") > -1){ @@ -86,11 +86,11 @@ class FangziOfficeRentPublisher implements Publishable { } - obj.put("estate_type", "写字楼") + obj.put("estate_type", "鍐欏瓧妤�") if(dataMap.get("district_name")){ String districtName = dataMap.get("district_name") - districtName = districtName.replace("写字楼名称:", "").trim() + districtName = districtName.replace("鍐欏瓧妤煎悕绉帮細", "").trim() if(StringUtils.isNotBlank(districtName)){ obj.put("district_name", districtName) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/FangziOfficeSellPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/FangziOfficeSellPublisher.groovy index 1cc5d3886..74513b3d9 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/FangziOfficeSellPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/FangziOfficeSellPublisher.groovy @@ -14,8 +14,8 @@ class FangziOfficeSellPublisher implements Publishable { public static final List JOB_ID = ["53f71ca0e4b09e392f5b738e"]; public static final Map CONFIG = [ - match_address:true, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:true, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -53,7 +53,7 @@ class FangziOfficeSellPublisher implements Publishable { if(dataMap.get("district_name")){ String name = dataMap.get("district_name") - name = name.replace("楼盘信息", "").trim() + name = name.replace("妤肩洏淇℃伅", "").trim() obj.put("name", name) } @@ -61,7 +61,7 @@ class FangziOfficeSellPublisher implements Publishable { if(dataMap.get("area")){ String area = dataMap.get("area") - area = area.replace("平方米", "").replace(",","").trim() + area = area.replace("骞虫柟绫�", "").replace(",","").trim() if(StringUtils.isNotBlank(area)){ obj.put("area", area.toDouble()) } @@ -69,11 +69,11 @@ class FangziOfficeSellPublisher implements Publishable { if(dataMap.get("total_price")){ String totalPrice = dataMap.get("total_price") - totalPrice = totalPrice.replace("面议", "").replace("万元", "").trim() + totalPrice = totalPrice.replace("闈㈣", "").replace("涓囧厓", "").trim() if(totalPrice.indexOf(".") > -1){ totalPrice = totalPrice.substring(0 , totalPrice.indexOf(".")).trim() } - if(totalPrice.indexOf("元/平米") > -1){ + if(totalPrice.indexOf("鍏�/骞崇背") > -1){ totalPrice = null } if(StringUtils.isNotBlank(totalPrice)){ @@ -84,11 +84,11 @@ class FangziOfficeSellPublisher implements Publishable { } } - obj.put("estate_type", "写字楼") + obj.put("estate_type", "鍐欏瓧妤�") if(dataMap.get("district_name")){ String districtName = dataMap.get("district_name") - districtName = districtName.replace("楼盘信息", "").trim() + districtName = districtName.replace("妤肩洏淇℃伅", "").trim() obj.put("district_name", districtName) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/Fcw515ShopSellPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/Fcw515ShopSellPublisher.groovy index 3c46ff480..71b669c88 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/Fcw515ShopSellPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/Fcw515ShopSellPublisher.groovy @@ -17,8 +17,8 @@ import com.fangjia.core.util.DateUtil; class Fcw515ShopSellPublisher implements Publishable{ public static final List JOB_ID = ["55f7e2c4e4b0fd5f160fb2d0"]; public static final Map CONFIG = [ - match_address:true, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:true, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -62,7 +62,7 @@ class Fcw515ShopSellPublisher implements Publishable{ return null; } - obj.put("address", dataMap.get("address").replace("地址:","")) + obj.put("address", dataMap.get("address").replace("鍦板潃锛�","")) if(dataMap.get("area") != null) { String area = dataMap.get("area") @@ -99,14 +99,14 @@ class Fcw515ShopSellPublisher implements Publishable{ if(dataMap.get("contact_people") != null) { String people = dataMap.get("contact_people") - obj.put('contact_people', people.replace("经纪人:", "").trim()) + obj.put('contact_people', people.replace("缁忕邯浜猴細", "").trim()) } if(dataMap.get("district_name") != null) { String districtName = dataMap.get("district_name") - districtName = districtName.replace("园区:", "") + districtName = districtName.replace("鍥尯锛�", "") if(StringUtils.isNotBlank(districtName)){ districtName = trimChar(districtName) obj.put("district_name", districtName.trim()) @@ -117,7 +117,7 @@ class Fcw515ShopSellPublisher implements Publishable{ if(dataMap.get("fitment") != null) { String fitment = dataMap.get("fitment") - fitment = fitment.replace("装修:", "") + fitment = fitment.replace("瑁呬慨锛�", "") if(StringUtils.isNotBlank(fitment)){ obj.put("fitment", fitment.trim()) } @@ -125,7 +125,7 @@ class Fcw515ShopSellPublisher implements Publishable{ if(dataMap.get("direction") != null) { String fitment = dataMap.get("direction") - fitment = fitment.replace("朝向:", "") + fitment = fitment.replace("鏈濆悜锛�", "") if(StringUtils.isNotBlank(fitment)){ obj.put("direction", fitment.trim()) } @@ -135,7 +135,7 @@ class Fcw515ShopSellPublisher implements Publishable{ if(dataMap.get("floor_info") != null) { String floorInfo = dataMap.get("floor_info") - floorInfo = floorInfo.replace("楼层:", "") + floorInfo = floorInfo.replace("妤煎眰锛�", "") if(StringUtils.isNotBlank(floorInfo)){ if(floorInfo.indexOf("/")>0){ def floorString = floorInfo.substring(0, floorInfo.indexOf("/")); @@ -151,7 +151,7 @@ class Fcw515ShopSellPublisher implements Publishable{ } } - obj.put("build_date", dataMap.get("build_date").replace("建筑年份:","").replace("年","")) + obj.put("build_date", dataMap.get("build_date").replace("寤虹瓚骞翠唤锛�","").replace("骞�","")) obj.put("description", dataMap.get("description")) obj.put("publish_date", new Date()) obj.put("c_date", new Date()) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/FocusSellPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/FocusSellPublisher.groovy index d78993eb3..c92c4e0b4 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/FocusSellPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/FocusSellPublisher.groovy @@ -29,15 +29,15 @@ import com.mongodb.DBCursor; import com.mongodb.DBObject; /** - * 焦点二手房发布 + * 鐒︾偣浜屾墜鎴垮彂甯� * @author xiaoyu * */ public class FocusSellPublisher implements Publishable { public static final List JOB_ID = ["51061af2e4b0bc9fcbe081e9"]; public static final Map CONFIG = [ - match_address:true, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:true, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -68,7 +68,7 @@ public class FocusSellPublisher implements Publishable { String region = dataMap.get("region") String[] arrs = region.split(">") if(arrs.length >= 5){ - region = arrs[2].replace("二手房", "") + region = arrs[2].replace("浜屾墜鎴�", "") if(StringUtils.isNotBlank(region)){ region = trimChar(region) obj.put("region", region.trim()) @@ -76,7 +76,7 @@ public class FocusSellPublisher implements Publishable { } if(arrs.length >= 6){ - String block = arrs[3].replace("二手房", "") + String block = arrs[3].replace("浜屾墜鎴�", "") if(StringUtils.isNotBlank(block)){ block = trimChar(block) obj.put("block", block.trim()) @@ -122,7 +122,7 @@ public class FocusSellPublisher implements Publishable { if(dataMap.get("address")) { String address = dataMap.get("address") - address = address.replace("地址:", "").replace("地图", "") + address = address.replace("鍦板潃锛�", "").replace("鍦板浘", "") if(StringUtils.isNotBlank(address)){ obj.put("address", address.trim()) } @@ -130,8 +130,8 @@ public class FocusSellPublisher implements Publishable { if(dataMap.get("estate_type")) { String estate_type = dataMap.get("estate_type") - if(estate_type.lastIndexOf("物业:") > -1){ - estate_type = estate_type.substring(estate_type.lastIndexOf("物业:") + 3) + if(estate_type.lastIndexOf("鐗╀笟锛�") > -1){ + estate_type = estate_type.substring(estate_type.lastIndexOf("鐗╀笟锛�") + 3) } if(StringUtils.isNotBlank(estate_type)){ obj.put("estate_type", estate_type.trim()) @@ -140,8 +140,8 @@ public class FocusSellPublisher implements Publishable { if(dataMap.get("direction")) { String direction = dataMap.get("direction") - if(direction.lastIndexOf("朝向:") > -1){ - direction = direction.substring(direction.lastIndexOf("朝向:") + 3) + if(direction.lastIndexOf("鏈濆悜锛�") > -1){ + direction = direction.substring(direction.lastIndexOf("鏈濆悜锛�") + 3) } if(StringUtils.isNotBlank(direction)){ obj.put("direction", direction.trim()) @@ -150,8 +150,8 @@ public class FocusSellPublisher implements Publishable { if(dataMap.get("build_date")) { String build_date = dataMap.get("build_date") - if(build_date.lastIndexOf("建造年代:") > -1){ - build_date = build_date.substring(build_date.lastIndexOf("建造年代:") + 5) + if(build_date.lastIndexOf("寤洪�犲勾浠o細") > -1){ + build_date = build_date.substring(build_date.lastIndexOf("寤洪�犲勾浠o細") + 5) } if(StringUtils.isNotBlank(build_date)){ obj.put("build_date", build_date.trim()) @@ -160,8 +160,8 @@ public class FocusSellPublisher implements Publishable { if(dataMap.get("fitment")) { String fitment = dataMap.get("fitment") - if(fitment.lastIndexOf("装修情况:") > -1){ - fitment = fitment.substring(fitment.lastIndexOf("装修情况:") + 5) + if(fitment.lastIndexOf("瑁呬慨鎯呭喌锛�") > -1){ + fitment = fitment.substring(fitment.lastIndexOf("瑁呬慨鎯呭喌锛�") + 5) } if(StringUtils.isNotBlank(fitment)){ obj.put("fitment", fitment.trim()) @@ -170,10 +170,10 @@ public class FocusSellPublisher implements Publishable { if(dataMap.get("room")){ String room = dataMap.get("room") + "" - room = room.substring(room.indexOf(":") + 1) - if(room.indexOf("室") > -1){ - String hall = room.substring(room.indexOf("室") + 1).trim() - room = room.substring(0 , room.indexOf("室")).trim() + room = room.substring(room.indexOf("锛�") + 1) + if(room.indexOf("瀹�") > -1){ + String hall = room.substring(room.indexOf("瀹�") + 1).trim() + room = room.substring(0 , room.indexOf("瀹�")).trim() Pattern pa=Pattern.compile("(\\d+)") Matcher ma=pa.matcher(room) if(ma.find()){ @@ -185,9 +185,9 @@ public class FocusSellPublisher implements Publishable { obj.put("room", room.trim().toInteger()) } - if(StringUtils.isNotBlank(hall) && hall.indexOf("厅") > -1){ - String toilet = hall.substring(hall.indexOf("厅") + 1) - hall = hall.substring(0 , hall.indexOf("厅")) + if(StringUtils.isNotBlank(hall) && hall.indexOf("鍘�") > -1){ + String toilet = hall.substring(hall.indexOf("鍘�") + 1) + hall = hall.substring(0 , hall.indexOf("鍘�")) ma=pa.matcher(hall) if(ma.find()){ hall = ma.group(1) @@ -199,11 +199,11 @@ public class FocusSellPublisher implements Publishable { } if(StringUtils.isNotBlank(toilet)){ - if(toilet.indexOf("厨") > -1){ - toilet = toilet.substring(toilet.indexOf("厨") + 1) + if(toilet.indexOf("鍘�") > -1){ + toilet = toilet.substring(toilet.indexOf("鍘�") + 1) } - if(toilet.indexOf("卫") > -1){ - toilet = toilet.substring(0 , toilet.indexOf("卫")) + if(toilet.indexOf("鍗�") > -1){ + toilet = toilet.substring(0 , toilet.indexOf("鍗�")) ma=pa.matcher(toilet) if(ma.find()){ toilet = ma.group(1) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/GanjiOfficeRentPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/GanjiOfficeRentPublisher.groovy index 6bc604157..9a7d6626d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/GanjiOfficeRentPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/GanjiOfficeRentPublisher.groovy @@ -16,8 +16,8 @@ public class GanjiOfficeRentPublisher implements Publishable { public static final List JOB_ID = ["53e8a575e4b09e392f5b4ba8"]; public static final Map CONFIG = [ - match_address:true, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:true, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -45,8 +45,8 @@ public class GanjiOfficeRentPublisher implements Publishable { if(dataMap.get("region")){ String region = dataMap.get("region") - if(region.indexOf("所在区域:") > -1){ - region = region.replace("所在区域:", "") + if(region.indexOf("鎵�鍦ㄥ尯鍩燂細") > -1){ + region = region.replace("鎵�鍦ㄥ尯鍩燂細", "") } String[] arrs = region.split("-") if(arrs.length >= 2){ @@ -71,8 +71,8 @@ public class GanjiOfficeRentPublisher implements Publishable { if(dataMap.get("address")) { String address = dataMap.get("address") - if(address.indexOf("所在地址:") > -1){ - address = address.replace("所在地址:", "").trim() + if(address.indexOf("鎵�鍦ㄥ湴鍧�锛�") > -1){ + address = address.replace("鎵�鍦ㄥ湴鍧�锛�", "").trim() } if(StringUtils.isNotBlank(address)){ obj.put("address", address.trim()) @@ -124,7 +124,7 @@ public class GanjiOfficeRentPublisher implements Publishable { if(dataMap.get("floor_info")){ String floor_info = dataMap.get("floor_info") - floor_info = floor_info.replace("写字楼概况:", "") + floor_info = floor_info.replace("鍐欏瓧妤兼鍐碉細", "") if(StringUtils.isNotBlank(floor_info) && floor_info.indexOf("-") > -1){ String fitment = floor_info.substring(0 , floor_info.indexOf("-")) floor_info = floor_info.substring(floor_info.indexOf("-") + 1) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/GanjiOfficeSellPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/GanjiOfficeSellPublisher.groovy index c273499ea..3f4debc15 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/GanjiOfficeSellPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/GanjiOfficeSellPublisher.groovy @@ -15,8 +15,8 @@ class GanjiOfficeSellPublisher implements Publishable { public static final List JOB_ID = ["53ed9ce9e4b09e392f5b651f"]; public static final Map CONFIG = [ - match_address:true, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:true, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -48,7 +48,7 @@ class GanjiOfficeSellPublisher implements Publishable { if(region.indexOf(">") > -1) { String[] arrs = region.trim().split(">") if(arrs != null && arrs.length >= 4) { - obj.put("region", trimChar(arrs[3]).toString().replace("写字楼出售", "").trim()) + obj.put("region", trimChar(arrs[3]).toString().replace("鍐欏瓧妤煎嚭鍞�", "").trim()) } } } @@ -98,7 +98,7 @@ class GanjiOfficeSellPublisher implements Publishable { if(dataMap.get("estate_type")){ String estateType = dataMap.get("estate_type") - estateType = estateType.replace("类型:", "").trim() + estateType = estateType.replace("绫诲瀷锛�", "").trim() if(StringUtils.isNotBlank(estateType)){ obj.put("estate_type", estateType.trim()) } @@ -106,7 +106,7 @@ class GanjiOfficeSellPublisher implements Publishable { if(dataMap.get("district_name")){ String district_name = dataMap.get("district_name") - district_name = district_name.replace("写字楼名称:", "") + district_name = district_name.replace("鍐欏瓧妤煎悕绉帮細", "") if(StringUtils.isNotBlank(district_name)){ district_name = trimChar(district_name) obj.put("district_name", district_name.trim()) @@ -115,7 +115,7 @@ class GanjiOfficeSellPublisher implements Publishable { if(dataMap.get("fitment")){ String fitment = dataMap.get("fitment") - fitment = fitment.replace("写字楼概况:", "").trim() + fitment = fitment.replace("鍐欏瓧妤兼鍐碉細", "").trim() if(fitment.indexOf("-") > -1){ String floor_info = fitment.substring(fitment.indexOf("-") + 1) fitment = fitment.substring(0 , fitment.indexOf("-")) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/GanjiRentPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/GanjiRentPublisher.groovy index e0118e0ac..a61a715d5 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/GanjiRentPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/GanjiRentPublisher.groovy @@ -34,8 +34,8 @@ public class GanjiRentPublisher implements Publishable { public static final List JOB_ID = ["528586c1e4b009cf84478710", "5588ec3be4b0ffa7d5e23dad"]; public static final Map CONFIG = [ - match_address:true, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:true, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -63,7 +63,7 @@ public class GanjiRentPublisher implements Publishable { obj.put("name", dataMap.get("title")) if(dataMap.get("price")){ String total_price = dataMap.get("price") - total_price = total_price.replace("元/月", "") + total_price = total_price.replace("鍏�/鏈�", "") Pattern pa=Pattern.compile("(\\d+)") Matcher ma=pa.matcher(total_price) if(ma.find()){ @@ -77,10 +77,10 @@ public class GanjiRentPublisher implements Publishable { } if(dataMap.get("room")){ String room = dataMap.get("room") + "" - room = room.substring(room.indexOf(":") + 1) - if(room.indexOf("室") > -1){ - String hall = room.substring(room.indexOf("室") + 1).trim() - room = room.substring(0 , room.indexOf("室")).trim() + room = room.substring(room.indexOf("锛�") + 1) + if(room.indexOf("瀹�") > -1){ + String hall = room.substring(room.indexOf("瀹�") + 1).trim() + room = room.substring(0 , room.indexOf("瀹�")).trim() Pattern pa=Pattern.compile("(\\d+)") Matcher ma=pa.matcher(room) if(ma.find()){ @@ -92,9 +92,9 @@ public class GanjiRentPublisher implements Publishable { obj.put("room", room.trim().toInteger()) } - if(StringUtils.isNotBlank(hall) && hall.indexOf("厅") > -1){ - String toilet = hall.substring(hall.indexOf("厅") + 1) - hall = hall.substring(0 , hall.indexOf("厅")) + if(StringUtils.isNotBlank(hall) && hall.indexOf("鍘�") > -1){ + String toilet = hall.substring(hall.indexOf("鍘�") + 1) + hall = hall.substring(0 , hall.indexOf("鍘�")) ma=pa.matcher(hall) if(ma.find()){ hall = ma.group(1) @@ -106,11 +106,11 @@ public class GanjiRentPublisher implements Publishable { } if(StringUtils.isNotBlank(toilet)){ - if(toilet.indexOf("厨") > -1){ - toilet = toilet.substring(toilet.indexOf("厨") + 1) + if(toilet.indexOf("鍘�") > -1){ + toilet = toilet.substring(toilet.indexOf("鍘�") + 1) } - if(toilet.indexOf("卫") > -1){ - toilet = toilet.substring(0 , toilet.indexOf("卫")) + if(toilet.indexOf("鍗�") > -1){ + toilet = toilet.substring(0 , toilet.indexOf("鍗�")) ma=pa.matcher(toilet) if(ma.find()){ toilet = ma.group(1) @@ -129,8 +129,8 @@ public class GanjiRentPublisher implements Publishable { String area = dataMap.get("room") String[] arrs = area.split("-") for(int i = 0 ; i < arrs.length ; i ++){ - if(arrs[i].indexOf("㎡") > -1) { - area = arrs[i].replace("㎡", "").trim() + if(arrs[i].indexOf("銕�") > -1) { + area = arrs[i].replace("銕�", "").trim() Pattern pa=Pattern.compile("(\\d+)") Matcher ma=pa.matcher(area) if(ma.find()){ @@ -151,8 +151,8 @@ public class GanjiRentPublisher implements Publishable { if(dataMap.get("region") != null) { String s = DataUtil.encoding(dataMap.get("region")).replace('?', '').trim() - if(s.indexOf(":") > -1) { - s = StringUtils.substringAfter(s, ":") + if(s.indexOf("锛�") > -1) { + s = StringUtils.substringAfter(s, "锛�") } if(s.indexOf('(') > -1) { @@ -169,8 +169,8 @@ public class GanjiRentPublisher implements Publishable { if(dataMap.get("district_name") != null) { String s = DataUtil.encoding(dataMap.get("district_name")).replace('?', '').trim() - if(s.indexOf(':') > -1) { - s = StringUtils.substringAfter(s, ':') + if(s.indexOf('锛�') > -1) { + s = StringUtils.substringAfter(s, '锛�') } if(s.indexOf('-') > -1) { s = StringUtils.substringBeforeLast(s, "-").trim() @@ -178,8 +178,8 @@ public class GanjiRentPublisher implements Publishable { if(s.indexOf("(") > -1){ s = s.substring(0 , s.indexOf("(")) } - if(s.indexOf("(") > -1){ - s = s.substring(0 , s.indexOf("(")) + if(s.indexOf("锛�") > -1){ + s = s.substring(0 , s.indexOf("锛�")) } if(StringUtils.isNotBlank(s)){ s = trimChar(s) @@ -189,15 +189,15 @@ public class GanjiRentPublisher implements Publishable { if(dataMap.get("address") != null) { String s = DataUtil.encoding(dataMap.get("address")).replace('?', '').trim() - if(s.indexOf(':') > -1) { - s = StringUtils.substringAfter(s, ':') + if(s.indexOf('锛�') > -1) { + s = StringUtils.substringAfter(s, '锛�') } obj.put("address", s.trim()) } if(dataMap.get("summary")){ String summary = dataMap.get("summary") - summary = summary.replace("概况:", "") + summary = summary.replace("姒傚喌锛�", "") if(summary.indexOf("-") > -1){ String[] arrs = summary.split("-") @@ -221,7 +221,7 @@ public class GanjiRentPublisher implements Publishable { if(dataMap.get("floor_info")){ String floor_info = dataMap.get("floor_info") - floor_info = floor_info.replace("楼层:", "") + floor_info = floor_info.replace("妤煎眰锛�", "") if(StringUtils.isNotBlank(floor_info) && floor_info.indexOf("/") > -1){ String floor = floor_info.substring(0 , floor_info.indexOf("/")) Pattern pa=Pattern.compile("(\\d+)") @@ -249,7 +249,7 @@ public class GanjiRentPublisher implements Publishable { } if(dataMap.get("publish_date") != null) { - String ds = dataMap.get("publish_date").replace("发布", "") + String ds = dataMap.get("publish_date").replace("鍙戝竷", "") def pattern = ~/\d{4}-\d{2}-\d{2}/ def matcher = pattern.matcher(ds) if (matcher.find()) { @@ -267,7 +267,7 @@ public class GanjiRentPublisher implements Publishable { obj.put("contact_people", dataMap.get("contact_people")) - obj.put("mobile", dataMap.get("mobile").toString().replace("联系电话:", "")) + obj.put("mobile", dataMap.get("mobile").toString().replace("鑱旂郴鐢佃瘽锛�", "")) obj.put("description", dataMap.get("description")) obj.put("pics", dataMap.get("pics")) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/GanjiSellPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/GanjiSellPublisher.groovy index d3154f506..3059fad2e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/GanjiSellPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/GanjiSellPublisher.groovy @@ -14,8 +14,8 @@ public class GanjiSellPublisher implements Publishable { public static final List JOB_ID = ["522fd02be4b0152e16b8516a"]; public static final Map CONFIG = [ - match_address:true, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:true, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -78,10 +78,10 @@ public class GanjiSellPublisher implements Publishable { } if(dataMap.get("room")){ String room = dataMap.get("room") + "" - room = room.substring(room.indexOf(":") + 1) - if(room.indexOf("室") > -1){ - String hall = room.substring(room.indexOf("室") + 1).trim() - room = room.substring(0 , room.indexOf("室")).trim() + room = room.substring(room.indexOf("锛�") + 1) + if(room.indexOf("瀹�") > -1){ + String hall = room.substring(room.indexOf("瀹�") + 1).trim() + room = room.substring(0 , room.indexOf("瀹�")).trim() Pattern pa=Pattern.compile("(\\d+)") Matcher ma=pa.matcher(room) if(ma.find()){ @@ -93,9 +93,9 @@ public class GanjiSellPublisher implements Publishable { obj.put("room", room.trim().toInteger()) } - if(StringUtils.isNotBlank(hall) && hall.indexOf("厅") > -1){ - String toilet = hall.substring(hall.indexOf("厅") + 1) - hall = hall.substring(0 , hall.indexOf("厅")) + if(StringUtils.isNotBlank(hall) && hall.indexOf("鍘�") > -1){ + String toilet = hall.substring(hall.indexOf("鍘�") + 1) + hall = hall.substring(0 , hall.indexOf("鍘�")) ma=pa.matcher(hall) if(ma.find()){ hall = ma.group(1) @@ -106,11 +106,11 @@ public class GanjiSellPublisher implements Publishable { obj.put("hall", hall.trim().toInteger()) } - if(StringUtils.isNotBlank(toilet) && toilet.indexOf("卫") > -1){ - if(toilet.indexOf("厨") > -1){ - toilet = toilet.substring(toilet.indexOf("厨") + 1) + if(StringUtils.isNotBlank(toilet) && toilet.indexOf("鍗�") > -1){ + if(toilet.indexOf("鍘�") > -1){ + toilet = toilet.substring(toilet.indexOf("鍘�") + 1) } - toilet = toilet.substring(0 , toilet.indexOf("卫")) + toilet = toilet.substring(0 , toilet.indexOf("鍗�")) ma=pa.matcher(toilet) if(ma.find()){ toilet = ma.group(1) @@ -126,7 +126,7 @@ public class GanjiSellPublisher implements Publishable { } if(dataMap.get("summary")){ String summary = dataMap.get("summary") - summary = summary.replace("概况:", "") + summary = summary.replace("姒傚喌锛�", "") String[] arrs = summary.split("-") if(arrs.length == 3){ String direction = arrs[0] @@ -147,14 +147,14 @@ public class GanjiSellPublisher implements Publishable { } if(dataMap.get("fitment")){ String fitment = dataMap.get("fitment") - fitment = fitment.replace("装修程度:", "") + fitment = fitment.replace("瑁呬慨绋嬪害锛�", "") if(StringUtils.isNotBlank(fitment)){ obj.put("fitment", fitment.trim()) } } if(dataMap.get("floor_info")){ String floor_info = dataMap.get("floor_info") - floor_info = floor_info.replace("楼层:", "") + floor_info = floor_info.replace("妤煎眰锛�", "") if(StringUtils.isNotBlank(floor_info)){ obj.put("floor_info", floor_info.trim()) } @@ -185,7 +185,7 @@ public class GanjiSellPublisher implements Publishable { } } - obj.put("description", StringUtils.remove(dataMap.get("description"), "联系我时,请说是在赶集网上看到的,谢谢!")) + obj.put("description", StringUtils.remove(dataMap.get("description"), "鑱旂郴鎴戞椂锛岃璇存槸鍦ㄨ刀闆嗙綉涓婄湅鍒扮殑锛岃阿璋紒")) obj.put("pics", dataMap.get("pics")) obj.put("contact_people", dataMap.get("contact_people")) @@ -195,12 +195,12 @@ public class GanjiSellPublisher implements Publishable { if(dataMap.get("district_name")) { String dn = dataMap.get("district_name"); - if(dn.indexOf("小区:") > -1) { - dn = StringUtils.substringAfter(dn, "小区:") + if(dn.indexOf("灏忓尯锛�") > -1) { + dn = StringUtils.substringAfter(dn, "灏忓尯锛�") } - if(dn.indexOf("小区名称:") > -1) { - dn = StringUtils.substringAfter(dn, "小区名称:") + if(dn.indexOf("灏忓尯鍚嶇О锛�") > -1) { + dn = StringUtils.substringAfter(dn, "灏忓尯鍚嶇О锛�") } if(dn.indexOf('(') > -1) { @@ -213,8 +213,8 @@ public class GanjiSellPublisher implements Publishable { if(dataMap.get("address") != null) { String addr = dataMap.get("address"); - if(addr.indexOf("小区地址:") > -1) { - addr = StringUtils.substringAfter(addr, "小区地址:") + if(addr.indexOf("灏忓尯鍦板潃锛�") > -1) { + addr = StringUtils.substringAfter(addr, "灏忓尯鍦板潃锛�") } obj.put("address", addr) } @@ -222,7 +222,7 @@ public class GanjiSellPublisher implements Publishable { if(dataMap.get("publish_date") != null) { - String ds = dataMap.get("publish_date").replace("发布", "") + String ds = dataMap.get("publish_date").replace("鍙戝竷", "") def pattern = ~/\d{4}-\d{2}-\d{2}/ def matcher = pattern.matcher(ds) @@ -246,10 +246,10 @@ public class GanjiSellPublisher implements Publishable { } /** - * 去除首位的全角、半角空格 + * 鍘婚櫎棣栦綅鐨勫叏瑙掋�佸崐瑙掔┖鏍� */ def trim(String str) { - return null == str ? null : str.replaceAll('^[\\s ]*|[\\s ]*$', ""); + return null == str ? null : str.replaceAll('^[\\s銆�]*|[\\s ]*$', ""); } private def trimChar(String c) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/GanjiShopRentPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/GanjiShopRentPublisher.groovy index e809ac7b8..c5de28976 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/GanjiShopRentPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/GanjiShopRentPublisher.groovy @@ -15,8 +15,8 @@ class GanjiShopRentPublisher implements Publishable { public static final List JOB_ID = ["53f19370e4b09e392f5b67c5"]; public static final Map CONFIG = [ - match_address:true, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:true, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -47,7 +47,7 @@ class GanjiShopRentPublisher implements Publishable { if(dataMap.get("region") != null) { String region = dataMap.get("region") region = trimChar(region) - region = region.replace("所在区域:", "") + region = region.replace("鎵�鍦ㄥ尯鍩燂細", "") if(region.indexOf("-") > -1){ String[] regionArrs = region.split("-") if(regionArrs.length >=2 ){ @@ -99,8 +99,8 @@ class GanjiShopRentPublisher implements Publishable { if(dataMap.get("address") != null) { String addr = dataMap.get("address") - if(addr.indexOf(":") > -1){ - addr = addr.substring(addr.indexOf(":") + 1) + if(addr.indexOf("锛�") > -1){ + addr = addr.substring(addr.indexOf("锛�") + 1) } if(StringUtils.isNotBlank(addr)){ obj.put("address", addr.trim()) @@ -109,14 +109,14 @@ class GanjiShopRentPublisher implements Publishable { if(dataMap.get("district_name") != null) { String districtName = dataMap.get("district_name") - if(districtName.indexOf(":") > -1){ - districtName = districtName.substring(districtName.indexOf(":") + 1) + if(districtName.indexOf("锛�") > -1){ + districtName = districtName.substring(districtName.indexOf("锛�") + 1) } if(districtName.indexOf("(") > -1){ districtName = districtName.substring(0 , districtName.indexOf("(")) } - if(districtName.indexOf("(") > -1){ - districtName = districtName.substring(0 , districtName.indexOf("(")) + if(districtName.indexOf("锛�") > -1){ + districtName = districtName.substring(0 , districtName.indexOf("锛�")) } if(StringUtils.isNotBlank(districtName)){ districtName = trimChar(districtName) @@ -126,8 +126,8 @@ class GanjiShopRentPublisher implements Publishable { if(dataMap.get("estate_type") != null) { String estateType = dataMap.get("estate_type") - if(estateType.indexOf(":") > -1){ - estateType = estateType.substring(estateType.indexOf(":") + 1) + if(estateType.indexOf("锛�") > -1){ + estateType = estateType.substring(estateType.indexOf("锛�") + 1) } if(StringUtils.isNotBlank(estateType)){ obj.put("estate_type", estateType.trim()) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/GanjiShopSellPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/GanjiShopSellPublisher.groovy index 105f92c55..4db333154 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/GanjiShopSellPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/GanjiShopSellPublisher.groovy @@ -15,8 +15,8 @@ class GanjiShopSellPublisher implements Publishable { public static final List JOB_ID = ["5438f778e4b00d761b1a13e0"]; public static final Map CONFIG = [ - match_address:true, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:true, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -46,7 +46,7 @@ class GanjiShopSellPublisher implements Publishable { if(dataMap.get("region") != null) { String region = dataMap.get("region") - region = region.replace("所在区域:", "") + region = region.replace("鎵�鍦ㄥ尯鍩燂細", "") if(region.indexOf("-") > -1){ String[] regionArrs = region.split("-") if(regionArrs.length >=2 ){ @@ -99,8 +99,8 @@ class GanjiShopSellPublisher implements Publishable { if(dataMap.get("address") != null) { String addr = dataMap.get("address") - if(addr.indexOf(":") > -1){ - addr = addr.substring(addr.indexOf(":") + 1) + if(addr.indexOf("锛�") > -1){ + addr = addr.substring(addr.indexOf("锛�") + 1) } if(StringUtils.isNotBlank(addr)){ obj.put("address", addr.trim()) @@ -109,14 +109,14 @@ class GanjiShopSellPublisher implements Publishable { if(dataMap.get("district_name") != null) { String districtName = dataMap.get("district_name") - if(districtName.indexOf(":") > -1){ - districtName = districtName.substring(districtName.indexOf(":") + 1) + if(districtName.indexOf("锛�") > -1){ + districtName = districtName.substring(districtName.indexOf("锛�") + 1) } if(districtName.indexOf("(") > -1){ districtName = districtName.substring(0 , districtName.indexOf("(")) } - if(districtName.indexOf("(") > -1){ - districtName = districtName.substring(0 , districtName.indexOf("(")) + if(districtName.indexOf("锛�") > -1){ + districtName = districtName.substring(0 , districtName.indexOf("锛�")) } if(StringUtils.isNotBlank(districtName)){ districtName = trimChar(districtName) @@ -126,8 +126,8 @@ class GanjiShopSellPublisher implements Publishable { if(dataMap.get("estate_type") != null) { String estateType = dataMap.get("estate_type") - if(estateType.indexOf(":") > -1){ - estateType = estateType.substring(estateType.indexOf(":") + 1) + if(estateType.indexOf("锛�") > -1){ + estateType = estateType.substring(estateType.indexOf("锛�") + 1) } if(StringUtils.isNotBlank(estateType)){ obj.put("estate_type", estateType.trim()) @@ -136,7 +136,7 @@ class GanjiShopSellPublisher implements Publishable { if(dataMap.get("fitment") != null) { String fitment = dataMap.get("fitment") - fitment = fitment.replace("商铺概况:", "") + fitment = fitment.replace("鍟嗛摵姒傚喌锛�", "") if(fitment.indexOf("-") > -1){ String floor_info = fitment.substring(fitment.indexOf("-") + 1) fitment = fitment.substring(0 , fitment.indexOf("-")) @@ -148,13 +148,13 @@ class GanjiShopSellPublisher implements Publishable { obj.put("fitment", fitment.trim()) } - def floor = patternMatch(floor_info, "第(\\d+)层"); + def floor = patternMatch(floor_info, "绗�(\\d+)灞�"); if(floor){ obj.put("floor", floor.toInteger()) } - def height = patternMatch(floor_info, "共(\\d+)层"); + def height = patternMatch(floor_info, "鍏�(\\d+)灞�"); if(height){ obj.put("height", height.toInteger()) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/GoufangRentPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/GoufangRentPublisher.groovy index d3a6a8f85..273ac7e7c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/GoufangRentPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/GoufangRentPublisher.groovy @@ -34,8 +34,8 @@ class GoufangRentPublisher implements Publishable { "546abdc5e4b0e6ab76cf7f51" ]; public static final Map CONFIG = [ - match_address:false, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:false, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -70,29 +70,29 @@ class GoufangRentPublisher implements Publishable { String room = "" String area = "" if(region.indexOf(">") > -1){ - if(region.indexOf("你现在的位置:") > -1){ + if(region.indexOf("浣犵幇鍦ㄧ殑浣嶇疆锛�") > -1){ String[] arrs = region.split(">") if(arrs.length >= 5) { - region = arrs[1].replace("租房", "") - block = arrs[2].replace("租房", "") - district_name = arrs[3].replace("租房", "") - room = arrs[4].replace("租房", "") + region = arrs[1].replace("绉熸埧", "") + block = arrs[2].replace("绉熸埧", "") + district_name = arrs[3].replace("绉熸埧", "") + room = arrs[4].replace("绉熸埧", "") } else if(arrs.length == 4){ - region = arrs[1].replace("租房", "") - district_name = arrs[2].replace("租房", "") - room = arrs[3].replace("租房", "") + region = arrs[1].replace("绉熸埧", "") + district_name = arrs[2].replace("绉熸埧", "") + room = arrs[3].replace("绉熸埧", "") } } else { String[] arrs = region.split(">") if(arrs.length >= 6) { - region = arrs[2].replace("租房", "") - block = arrs[3].replace("租房", "") - district_name = arrs[4].replace("租房", "") - room = arrs[5].replace("租房", "") + region = arrs[2].replace("绉熸埧", "") + block = arrs[3].replace("绉熸埧", "") + district_name = arrs[4].replace("绉熸埧", "") + room = arrs[5].replace("绉熸埧", "") } else if(arrs.length == 5){ - region = arrs[2].replace("租房", "") - district_name = arrs[3].replace("租房", "") - room = arrs[4].replace("租房", "") + region = arrs[2].replace("绉熸埧", "") + district_name = arrs[3].replace("绉熸埧", "") + room = arrs[4].replace("绉熸埧", "") } } @@ -108,8 +108,8 @@ class GoufangRentPublisher implements Publishable { obj.put("district_name", district_name.trim()) } if(StringUtils.isNotBlank(room)){ - if(room.indexOf("卫") > -1){ - area = room.substring(room.indexOf("卫") + 1) + if(room.indexOf("鍗�") > -1){ + area = room.substring(room.indexOf("鍗�") + 1) area = area.replace(",", "") if(StringUtils.isNotBlank(area)){ Pattern pa=Pattern.compile("(\\d+)") @@ -125,9 +125,9 @@ class GoufangRentPublisher implements Publishable { } } - if(room.indexOf("室") > -1){ - String hall = room.substring(room.indexOf("室") + 1).trim() - room = room.substring(0 , room.indexOf("室")).trim() + if(room.indexOf("瀹�") > -1){ + String hall = room.substring(room.indexOf("瀹�") + 1).trim() + room = room.substring(0 , room.indexOf("瀹�")).trim() Pattern pa=Pattern.compile("(\\d+)") Matcher ma=pa.matcher(room) if(ma.find()){ @@ -139,9 +139,9 @@ class GoufangRentPublisher implements Publishable { obj.put("room", room.trim().toInteger()) } - if(StringUtils.isNotBlank(hall) && hall.indexOf("厅") > -1){ - String toilet = hall.substring(hall.indexOf("厅") + 1) - hall = hall.substring(0 , hall.indexOf("厅")) + if(StringUtils.isNotBlank(hall) && hall.indexOf("鍘�") > -1){ + String toilet = hall.substring(hall.indexOf("鍘�") + 1) + hall = hall.substring(0 , hall.indexOf("鍘�")) ma=pa.matcher(hall) if(ma.find()){ hall = ma.group(1) @@ -152,11 +152,11 @@ class GoufangRentPublisher implements Publishable { obj.put("hall", hall.trim().toInteger()) } - if(StringUtils.isNotBlank(toilet) && toilet.indexOf("卫") > -1){ - if(toilet.indexOf("厨") > -1){ - toilet = toilet.substring(toilet.indexOf("厨") + 1) + if(StringUtils.isNotBlank(toilet) && toilet.indexOf("鍗�") > -1){ + if(toilet.indexOf("鍘�") > -1){ + toilet = toilet.substring(toilet.indexOf("鍘�") + 1) } - toilet = toilet.substring(0 , toilet.indexOf("卫")) + toilet = toilet.substring(0 , toilet.indexOf("鍗�")) ma=pa.matcher(toilet) if(ma.find()){ toilet = ma.group(1) @@ -175,7 +175,7 @@ class GoufangRentPublisher implements Publishable { if(dataMap.get("estate_type")){ String estate_type = dataMap.get("estate_type") - estate_type = estate_type.replace("类型:", "") + estate_type = estate_type.replace("绫诲瀷锛�", "") if(StringUtils.isNotBlank(estate_type)){ obj.put("estate_type", estate_type.trim()) } @@ -183,8 +183,8 @@ class GoufangRentPublisher implements Publishable { if(dataMap.get("direction")){ String direction = dataMap.get("direction") - if(direction.indexOf("向:") > -1){ - direction = direction.substring(direction.indexOf("向:") + 2) + if(direction.indexOf("鍚戯細") > -1){ + direction = direction.substring(direction.indexOf("鍚戯細") + 2) } if(StringUtils.isNotBlank(direction)){ obj.put("direction", direction.trim()) @@ -208,7 +208,7 @@ class GoufangRentPublisher implements Publishable { if(dataMap.get("fitment")){ String fitment = dataMap.get("fitment") - fitment = fitment.replace("装修:", "") + fitment = fitment.replace("瑁呬慨锛�", "") if(StringUtils.isNotBlank(fitment)){ obj.put("fitment", fitment.trim()) } @@ -216,7 +216,7 @@ class GoufangRentPublisher implements Publishable { if(dataMap.get("floor_info")){ String floor_info = dataMap.get("floor_info") - floor_info = floor_info.replace("楼层:", "") + floor_info = floor_info.replace("妤煎眰锛�", "") if(StringUtils.isNotBlank(floor_info)){ obj.put("floor_info", floor_info.trim()) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/HaofangRentPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/HaofangRentPublisher.groovy index 076930d0e..4260ec497 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/HaofangRentPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/HaofangRentPublisher.groovy @@ -34,8 +34,8 @@ class HaofangRentPublisher implements Publishable { "54192077e4b0ba18b478a1cc" ]; public static final Map CONFIG = [ - match_address:false, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:false, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -65,7 +65,7 @@ class HaofangRentPublisher implements Publishable { if(dataMap.get("region")){ String region = dataMap.get("region") - region = region.replace("区域:", "") + region = region.replace("鍖哄煙锛�", "") region = trimChar(region) if(StringUtils.isNotBlank(region)){ obj.put("region", region.trim()) @@ -74,7 +74,7 @@ class HaofangRentPublisher implements Publishable { // // if(dataMap.get("estate_type")){ // String estate_type = dataMap.get("estate_type") -// estate_type = estate_type.replace("类型:", "") +// estate_type = estate_type.replace("绫诲瀷锛�", "") // if(StringUtils.isNotBlank(estate_type)){ // obj.put("estate_type", estate_type.trim()) // } @@ -92,11 +92,11 @@ class HaofangRentPublisher implements Publishable { if(dataMap.get("build_date")){ String build_date = dataMap.get("build_date") - if(build_date.indexOf("年代:") > -1){ - build_date = build_date.substring(build_date.indexOf("年代:") + 3) + if(build_date.indexOf("骞翠唬锛�") > -1){ + build_date = build_date.substring(build_date.indexOf("骞翠唬锛�") + 3) } - if(build_date.indexOf("年代:") > -1){ - build_date = build_date.substring(0 , build_date.indexOf("年代:")) + if(build_date.indexOf("骞翠唬锛�") > -1){ + build_date = build_date.substring(0 , build_date.indexOf("骞翠唬锛�")) } if(StringUtils.isNotBlank(build_date)){ obj.put("build_date", build_date.trim()) @@ -105,7 +105,7 @@ class HaofangRentPublisher implements Publishable { if(dataMap.get("direction")){ String direction = dataMap.get("direction") - direction = direction.replace("朝向:", "") + direction = direction.replace("鏈濆悜锛�", "") if(StringUtils.isNotBlank(direction)){ obj.put("direction", direction.trim()) } @@ -127,7 +127,7 @@ class HaofangRentPublisher implements Publishable { if(dataMap.get("fitment")){ String fitment = dataMap.get("fitment") - fitment = fitment.replace("装修:", "") + fitment = fitment.replace("瑁呬慨锛�", "") if(StringUtils.isNotBlank(fitment)){ obj.put("fitment", fitment.trim()) } @@ -143,10 +143,10 @@ class HaofangRentPublisher implements Publishable { if(dataMap.get("room")){ String room = dataMap.get("room") + "" - room = room.substring(room.indexOf(":") + 1) - if(room.indexOf("室") > -1){ - String hall = room.substring(room.indexOf("室") + 1).trim() - room = room.substring(0 , room.indexOf("室")).trim() + room = room.substring(room.indexOf("锛�") + 1) + if(room.indexOf("瀹�") > -1){ + String hall = room.substring(room.indexOf("瀹�") + 1).trim() + room = room.substring(0 , room.indexOf("瀹�")).trim() Pattern pa=Pattern.compile("(\\d+)") Matcher ma=pa.matcher(room) if(ma.find()){ @@ -158,9 +158,9 @@ class HaofangRentPublisher implements Publishable { obj.put("room", room.trim().toInteger()) } - if(StringUtils.isNotBlank(hall) && hall.indexOf("厅") > -1){ - String toilet = hall.substring(hall.indexOf("厅") + 1) - hall = hall.substring(0 , hall.indexOf("厅")) + if(StringUtils.isNotBlank(hall) && hall.indexOf("鍘�") > -1){ + String toilet = hall.substring(hall.indexOf("鍘�") + 1) + hall = hall.substring(0 , hall.indexOf("鍘�")) ma=pa.matcher(hall) if(ma.find()){ hall = ma.group(1) @@ -172,11 +172,11 @@ class HaofangRentPublisher implements Publishable { } if(StringUtils.isNotBlank(toilet)){ - if(toilet.indexOf("厨") > -1){ - toilet = toilet.substring(toilet.indexOf("厨") + 1) + if(toilet.indexOf("鍘�") > -1){ + toilet = toilet.substring(toilet.indexOf("鍘�") + 1) } - if(toilet.indexOf("卫") > -1){ - toilet = toilet.substring(0 , toilet.indexOf("卫")) + if(toilet.indexOf("鍗�") > -1){ + toilet = toilet.substring(0 , toilet.indexOf("鍗�")) ma=pa.matcher(toilet) if(ma.find()){ toilet = ma.group(1) @@ -215,9 +215,9 @@ class HaofangRentPublisher implements Publishable { obj.put("contact_people", dataMap.get("contact_people")) - obj.put("mobile", dataMap.get("mobile").toString().replace("联系电话:", "")) + obj.put("mobile", dataMap.get("mobile").toString().replace("鑱旂郴鐢佃瘽锛�", "")) - obj.put("address", dataMap.get("address").toString().replace("地址:", "")) + obj.put("address", dataMap.get("address").toString().replace("鍦板潃锛�", "")) obj.put("floor_info", dataMap.get("floor_info")) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/HaofangSellPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/HaofangSellPublisher.groovy index 92d89b1c1..301977355 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/HaofangSellPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/HaofangSellPublisher.groovy @@ -34,8 +34,8 @@ class HaofangSellPublisher implements Publishable { "5418ff53e4b0ba18b478a0ec" ]; public static final Map CONFIG = [ - match_address:false, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:false, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -65,7 +65,7 @@ class HaofangSellPublisher implements Publishable { if(dataMap.get("region")){ String region = dataMap.get("region") - region = region.replace("区域:", "") + region = region.replace("鍖哄煙锛�", "") if(StringUtils.isNotBlank(region)){ region = trimChar(region) obj.put("region", region.trim()) @@ -74,7 +74,7 @@ class HaofangSellPublisher implements Publishable { // if(dataMap.get("estate_type")){ // String estate_type = dataMap.get("estate_type") -// estate_type = estate_type.replace("类型:", "") +// estate_type = estate_type.replace("绫诲瀷锛�", "") // if(StringUtils.isNotBlank(estate_type)){ // obj.put("estate_type", estate_type.trim()) // } @@ -92,11 +92,11 @@ class HaofangSellPublisher implements Publishable { if(dataMap.get("build_date")){ String build_date = dataMap.get("build_date") - if(build_date.indexOf("年代:") > -1){ - build_date = build_date.substring(build_date.indexOf("年代:") + 3) + if(build_date.indexOf("骞翠唬锛�") > -1){ + build_date = build_date.substring(build_date.indexOf("骞翠唬锛�") + 3) } - if(build_date.indexOf("年代:") > -1){ - build_date = build_date.substring(0 , build_date.indexOf("年代:")) + if(build_date.indexOf("骞翠唬锛�") > -1){ + build_date = build_date.substring(0 , build_date.indexOf("骞翠唬锛�")) } if(StringUtils.isNotBlank(build_date)){ obj.put("build_date", build_date.trim()) @@ -105,7 +105,7 @@ class HaofangSellPublisher implements Publishable { if(dataMap.get("direction")){ String direction = dataMap.get("direction") - direction = direction.replace("朝向:", "") + direction = direction.replace("鏈濆悜锛�", "") if(StringUtils.isNotBlank(direction)){ obj.put("direction", direction.trim()) } @@ -127,7 +127,7 @@ class HaofangSellPublisher implements Publishable { if(dataMap.get("fitment")){ String fitment = dataMap.get("fitment") - fitment = fitment.replace("装修:", "") + fitment = fitment.replace("瑁呬慨锛�", "") if(StringUtils.isNotBlank(fitment)){ obj.put("fitment", fitment.trim()) } @@ -143,10 +143,10 @@ class HaofangSellPublisher implements Publishable { if(dataMap.get("room")){ String room = dataMap.get("room") + "" - room = room.substring(room.indexOf(":") + 1) - if(room.indexOf("室") > -1){ - String hall = room.substring(room.indexOf("室") + 1).trim() - room = room.substring(0 , room.indexOf("室")).trim() + room = room.substring(room.indexOf("锛�") + 1) + if(room.indexOf("瀹�") > -1){ + String hall = room.substring(room.indexOf("瀹�") + 1).trim() + room = room.substring(0 , room.indexOf("瀹�")).trim() Pattern pa=Pattern.compile("(\\d+)") Matcher ma=pa.matcher(room) if(ma.find()){ @@ -158,9 +158,9 @@ class HaofangSellPublisher implements Publishable { obj.put("room", room.trim().toInteger()) } - if(StringUtils.isNotBlank(hall) && hall.indexOf("厅") > -1){ - String toilet = hall.substring(hall.indexOf("厅") + 1) - hall = hall.substring(0 , hall.indexOf("厅")) + if(StringUtils.isNotBlank(hall) && hall.indexOf("鍘�") > -1){ + String toilet = hall.substring(hall.indexOf("鍘�") + 1) + hall = hall.substring(0 , hall.indexOf("鍘�")) ma=pa.matcher(hall) if(ma.find()){ hall = ma.group(1) @@ -172,11 +172,11 @@ class HaofangSellPublisher implements Publishable { } if(StringUtils.isNotBlank(toilet)){ - if(toilet.indexOf("厨") > -1){ - toilet = toilet.substring(toilet.indexOf("厨") + 1) + if(toilet.indexOf("鍘�") > -1){ + toilet = toilet.substring(toilet.indexOf("鍘�") + 1) } - if(toilet.indexOf("卫") > -1){ - toilet = toilet.substring(0 , toilet.indexOf("卫")) + if(toilet.indexOf("鍗�") > -1){ + toilet = toilet.substring(0 , toilet.indexOf("鍗�")) ma=pa.matcher(toilet) if(ma.find()){ toilet = ma.group(1) @@ -215,9 +215,9 @@ class HaofangSellPublisher implements Publishable { obj.put("contact_people", dataMap.get("contact_people")) - obj.put("mobile", dataMap.get("mobile").toString().replace("联系电话:", "")) + obj.put("mobile", dataMap.get("mobile").toString().replace("鑱旂郴鐢佃瘽锛�", "")) - obj.put("address", dataMap.get("address").toString().replace("地址:", "")) + obj.put("address", dataMap.get("address").toString().replace("鍦板潃锛�", "")) obj.put("floor_info", dataMap.get("floor_info")) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/HaofangShopRentPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/HaofangShopRentPublisher.groovy index 3471285e6..fcd653579 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/HaofangShopRentPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/HaofangShopRentPublisher.groovy @@ -34,8 +34,8 @@ class HaofangShopRentPublisher implements Publishable { "54225716e4b0ba18b478b09a" ]; public static final Map CONFIG = [ - match_address:false, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:false, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -65,7 +65,7 @@ class HaofangShopRentPublisher implements Publishable { if(dataMap.get("region")){ String region = dataMap.get("region") - region = region.replace("区域:", "") + region = region.replace("鍖哄煙锛�", "") region = trimChar(region) if(StringUtils.isNotBlank(region)){ obj.put("region", region.trim()) @@ -74,7 +74,7 @@ class HaofangShopRentPublisher implements Publishable { // if(dataMap.get("estate_type")){ // String estate_type = dataMap.get("estate_type") -// estate_type = estate_type.replace("类型:", "") +// estate_type = estate_type.replace("绫诲瀷锛�", "") // if(StringUtils.isNotBlank(estate_type)){ // obj.put("estate_type", estate_type.trim()) // } @@ -92,11 +92,11 @@ class HaofangShopRentPublisher implements Publishable { if(dataMap.get("build_date")){ String build_date = dataMap.get("build_date") - if(build_date.indexOf("年代:") > -1){ - build_date = build_date.substring(build_date.indexOf("年代:") + 3) + if(build_date.indexOf("骞翠唬锛�") > -1){ + build_date = build_date.substring(build_date.indexOf("骞翠唬锛�") + 3) } - if(build_date.indexOf("年代:") > -1){ - build_date = build_date.substring(0 , build_date.indexOf("年代:")) + if(build_date.indexOf("骞翠唬锛�") > -1){ + build_date = build_date.substring(0 , build_date.indexOf("骞翠唬锛�")) } if(StringUtils.isNotBlank(build_date)){ obj.put("build_date", build_date.trim()) @@ -105,7 +105,7 @@ class HaofangShopRentPublisher implements Publishable { if(dataMap.get("direction")){ String direction = dataMap.get("direction") - direction = direction.replace("朝向:", "") + direction = direction.replace("鏈濆悜锛�", "") if(StringUtils.isNotBlank(direction)){ obj.put("direction", direction.trim()) } @@ -127,7 +127,7 @@ class HaofangShopRentPublisher implements Publishable { if(dataMap.get("fitment")){ String fitment = dataMap.get("fitment") - fitment = fitment.replace("装修:", "") + fitment = fitment.replace("瑁呬慨锛�", "") if(StringUtils.isNotBlank(fitment)){ obj.put("fitment", fitment.trim()) } @@ -143,8 +143,8 @@ class HaofangShopRentPublisher implements Publishable { if(dataMap.get("room")){ String room = dataMap.get("room") - if(room.indexOf("室") > -1){ - room = room.substring(0 , room.indexOf("室")) + if(room.indexOf("瀹�") > -1){ + room = room.substring(0 , room.indexOf("瀹�")) if(!NumberUtils.isNumber(room)){ room = null } @@ -179,9 +179,9 @@ class HaofangShopRentPublisher implements Publishable { obj.put("contact_people", dataMap.get("contact_people")) - obj.put("mobile", dataMap.get("mobile").toString().replace("联系电话:", "")) + obj.put("mobile", dataMap.get("mobile").toString().replace("鑱旂郴鐢佃瘽锛�", "")) - obj.put("address", dataMap.get("address").toString().replace("地址:", "")) + obj.put("address", dataMap.get("address").toString().replace("鍦板潃锛�", "")) obj.put("floor_info", dataMap.get("floor_info")) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/HaofangShopSellPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/HaofangShopSellPublisher.groovy index 49f232346..a736fb0cc 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/HaofangShopSellPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/HaofangShopSellPublisher.groovy @@ -34,8 +34,8 @@ class HaofangShopSellPublisher implements Publishable { "541fca6be4b0ba18b478ac1f" ]; public static final Map CONFIG = [ - match_address:false, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:false, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -65,7 +65,7 @@ class HaofangShopSellPublisher implements Publishable { if(dataMap.get("region")){ String region = dataMap.get("region") - region = region.replace("区域:", "") + region = region.replace("鍖哄煙锛�", "") if(StringUtils.isNotBlank(region)){ region = trimChar(region) obj.put("region", region.trim()) @@ -74,7 +74,7 @@ class HaofangShopSellPublisher implements Publishable { // if(dataMap.get("estate_type")){ // String estate_type = dataMap.get("estate_type") -// estate_type = estate_type.replace("类型:", "") +// estate_type = estate_type.replace("绫诲瀷锛�", "") // if(StringUtils.isNotBlank(estate_type)){ // obj.put("estate_type", estate_type.trim()) // } @@ -92,11 +92,11 @@ class HaofangShopSellPublisher implements Publishable { if(dataMap.get("build_date")){ String build_date = dataMap.get("build_date") - if(build_date.indexOf("年代:") > -1){ - build_date = build_date.substring(build_date.indexOf("年代:") + 3) + if(build_date.indexOf("骞翠唬锛�") > -1){ + build_date = build_date.substring(build_date.indexOf("骞翠唬锛�") + 3) } - if(build_date.indexOf("年代:") > -1){ - build_date = build_date.substring(0 , build_date.indexOf("年代:")) + if(build_date.indexOf("骞翠唬锛�") > -1){ + build_date = build_date.substring(0 , build_date.indexOf("骞翠唬锛�")) } if(StringUtils.isNotBlank(build_date)){ obj.put("build_date", build_date.trim()) @@ -105,7 +105,7 @@ class HaofangShopSellPublisher implements Publishable { if(dataMap.get("direction")){ String direction = dataMap.get("direction") - direction = direction.replace("朝向:", "") + direction = direction.replace("鏈濆悜锛�", "") if(StringUtils.isNotBlank(direction)){ obj.put("direction", direction.trim()) } @@ -127,7 +127,7 @@ class HaofangShopSellPublisher implements Publishable { if(dataMap.get("fitment")){ String fitment = dataMap.get("fitment") - fitment = fitment.replace("装修:", "") + fitment = fitment.replace("瑁呬慨锛�", "") if(StringUtils.isNotBlank(fitment)){ obj.put("fitment", fitment.trim()) } @@ -143,8 +143,8 @@ class HaofangShopSellPublisher implements Publishable { if(dataMap.get("room")){ String room = dataMap.get("room") - if(room.indexOf("室") > -1){ - room = room.substring(0 , room.indexOf("室")) + if(room.indexOf("瀹�") > -1){ + room = room.substring(0 , room.indexOf("瀹�")) if(!NumberUtils.isNumber(room)){ room = null } @@ -179,9 +179,9 @@ class HaofangShopSellPublisher implements Publishable { obj.put("contact_people", dataMap.get("contact_people")) - obj.put("mobile", dataMap.get("mobile").toString().replace("联系电话:", "")) + obj.put("mobile", dataMap.get("mobile").toString().replace("鑱旂郴鐢佃瘽锛�", "")) - obj.put("address", dataMap.get("address").toString().replace("地址:", "")) + obj.put("address", dataMap.get("address").toString().replace("鍦板潃锛�", "")) obj.put("floor_info", dataMap.get("floor_info")) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/HaopooShopRentPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/HaopooShopRentPublisher.groovy index 80d911988..aa7980cb9 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/HaopooShopRentPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/HaopooShopRentPublisher.groovy @@ -34,8 +34,8 @@ class HaopooShopRentPublisher implements Publishable { "541bf299e4b0ba18b478a916" ]; public static final Map CONFIG = [ - match_address:false, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:false, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -94,7 +94,7 @@ class HaopooShopRentPublisher implements Publishable { // // if(dataMap.get("estate_type")){ // String estate_type = dataMap.get("estate_type") -// estate_type = estate_type.replace("类型:", "") +// estate_type = estate_type.replace("绫诲瀷锛�", "") // if(StringUtils.isNotBlank(estate_type)){ // obj.put("estate_type", estate_type.trim()) // } @@ -126,7 +126,7 @@ class HaopooShopRentPublisher implements Publishable { if(dataMap.get("fitment")){ String fitment = dataMap.get("fitment") - fitment = fitment.replace("装修程度:", "") + fitment = fitment.replace("瑁呬慨绋嬪害锛�", "") if(StringUtils.isNotBlank(fitment)){ obj.put("fitment", fitment.trim()) } @@ -160,13 +160,13 @@ class HaopooShopRentPublisher implements Publishable { obj.put("contact_people", dataMap.get("contact_people")) - obj.put("mobile", dataMap.get("mobile").toString().replace("联系电话:", "")) + obj.put("mobile", dataMap.get("mobile").toString().replace("鑱旂郴鐢佃瘽锛�", "")) - obj.put("address", dataMap.get("address").toString().replace("地址:", "")) + obj.put("address", dataMap.get("address").toString().replace("鍦板潃锛�", "")) if(dataMap.get("estate_charge")){ String estate_charge = dataMap.get("estate_charge") - estate_charge = estate_charge.replace("物 业 费:", "") + estate_charge = estate_charge.replace("鐗� 涓� 璐癸細", "") if(StringUtils.isNotBlank(estate_charge)){ obj.put("estate_charge", estate_charge.trim()) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/HaopooShopSellPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/HaopooShopSellPublisher.groovy index 075233a4c..c9a9a941c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/HaopooShopSellPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/HaopooShopSellPublisher.groovy @@ -34,8 +34,8 @@ class HaopooShopSellPublisher implements Publishable { "541f8f44e4b0ba18b478ab9a" ]; public static final Map CONFIG = [ - match_address:false, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:false, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -63,8 +63,8 @@ class HaopooShopSellPublisher implements Publishable { if(dataMap.get("cityName")){ String city = dataMap.get("cityName") - if(city == "昆山"){ - city = "苏州" + if(city == "鏄嗗北"){ + city = "鑻忓窞" } if(StringUtils.isNotBlank(city)){ obj.put("city", city.trim()) @@ -74,8 +74,8 @@ class HaopooShopSellPublisher implements Publishable { obj.put("name", dataMap.get("title")) if(dataMap.get("region")){ - if(dataMap.get("cityName").toString().trim() == "昆山"){ - obj.put("region", "昆山") + if(dataMap.get("cityName").toString().trim() == "鏄嗗北"){ + obj.put("region", "鏄嗗北") } else { String region = dataMap.get("region") if(region.lastIndexOf("(") > -1){ @@ -107,7 +107,7 @@ class HaopooShopSellPublisher implements Publishable { if(dataMap.get("estate_type")){ String estate_type = dataMap.get("estate_type") - estate_type = estate_type.replace("商业类型:", "") + estate_type = estate_type.replace("鍟嗕笟绫诲瀷锛�", "") if(StringUtils.isNotBlank(estate_type)){ obj.put("estate_type", estate_type.trim()) } @@ -139,7 +139,7 @@ class HaopooShopSellPublisher implements Publishable { if(dataMap.get("fitment")){ String fitment = dataMap.get("fitment") - fitment = fitment.replace("装修程度:", "") + fitment = fitment.replace("瑁呬慨绋嬪害锛�", "") if(StringUtils.isNotBlank(fitment)){ obj.put("fitment", fitment.trim()) } @@ -171,15 +171,15 @@ class HaopooShopSellPublisher implements Publishable { obj.put("description", dataMap.get("description")) - obj.put("contact_people", dataMap.get("contact_people").toString().replace("联系人:", "")) + obj.put("contact_people", dataMap.get("contact_people").toString().replace("鑱旂郴浜�:", "")) - obj.put("mobile", dataMap.get("mobile").toString().replace("联系电话:", "")) + obj.put("mobile", dataMap.get("mobile").toString().replace("鑱旂郴鐢佃瘽锛�", "")) - obj.put("address", dataMap.get("address").toString().replace("地址:", "")) + obj.put("address", dataMap.get("address").toString().replace("鍦板潃锛�", "")) if(dataMap.get("estate_charge")){ String estate_charge = dataMap.get("estate_charge") - estate_charge = estate_charge.replace("物 业 费:", "") + estate_charge = estate_charge.replace("鐗� 涓� 璐癸細", "") if(StringUtils.isNotBlank(estate_charge)){ obj.put("estate_charge", estate_charge.trim()) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/HomelinkSellPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/HomelinkSellPublisher.groovy index afd61f186..4566f0a52 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/HomelinkSellPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/HomelinkSellPublisher.groovy @@ -30,15 +30,15 @@ import com.mongodb.DBCursor; import com.mongodb.DBObject; /** - * 链家二手房发布 + * 閾惧浜屾墜鎴垮彂甯� * @author xiaoyu * */ public class HomelinkSellPublisher implements Publishable { public static final List JOB_ID = ["510607e4e4b0bc9fcbe081db"]; public static final Map CONFIG = [ - match_address:true, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:true, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -65,7 +65,7 @@ public class HomelinkSellPublisher implements Publishable { obj.put("city", dataMap.get("city")) obj.put("name", dataMap.get("title")) - if(obj.get("city").equals("北京")){ + if(obj.get("city").equals("鍖椾含")){ if(dataMap.get("region")) { String region = dataMap.get("region") region = trimChar(region) @@ -73,12 +73,12 @@ public class HomelinkSellPublisher implements Publishable { String block = "" String district_name = "" if(arrs.length == 5){ - region = arrs[1].replace("二手房", "") - block = arrs[2].replace("二手房", "") - district_name = arrs[3].replace("二手房", "") + region = arrs[1].replace("浜屾墜鎴�", "") + block = arrs[2].replace("浜屾墜鎴�", "") + district_name = arrs[3].replace("浜屾墜鎴�", "") } else if(arrs.length == 4){ - region = arrs[1].replace("二手房", "") - district_name = arrs[2].replace("二手房", "") + region = arrs[1].replace("浜屾墜鎴�", "") + district_name = arrs[2].replace("浜屾墜鎴�", "") } if(StringUtils.isNotBlank(region)){ @@ -88,8 +88,8 @@ public class HomelinkSellPublisher implements Publishable { obj.put("block", block.trim()) } - if(StringUtils.isNotBlank(district_name) && district_name.indexOf("(") > -1){ - district_name = district_name.substring(0 , district_name.indexOf("(")) + if(StringUtils.isNotBlank(district_name) && district_name.indexOf("锛�") > -1){ + district_name = district_name.substring(0 , district_name.indexOf("锛�")) } if(StringUtils.isNotBlank(district_name)){ obj.put("district_name", district_name.trim()) @@ -98,10 +98,10 @@ public class HomelinkSellPublisher implements Publishable { if(dataMap.get("room")){ String room = dataMap.get("room") + "" - room = room.substring(room.indexOf(":") + 1) - if(room.indexOf("室") > -1){ - String hall = room.substring(room.indexOf("室") + 1).trim() - room = room.substring(0 , room.indexOf("室")).trim() + room = room.substring(room.indexOf("锛�") + 1) + if(room.indexOf("瀹�") > -1){ + String hall = room.substring(room.indexOf("瀹�") + 1).trim() + room = room.substring(0 , room.indexOf("瀹�")).trim() Pattern pa=Pattern.compile("(\\d+)") Matcher ma=pa.matcher(room) if(ma.find()){ @@ -113,9 +113,9 @@ public class HomelinkSellPublisher implements Publishable { obj.put("room", room.trim().toInteger()) } - if(StringUtils.isNotBlank(hall) && hall.indexOf("厅") > -1){ - String toilet = hall.substring(hall.indexOf("厅") + 1) - hall = hall.substring(0 , hall.indexOf("厅")) + if(StringUtils.isNotBlank(hall) && hall.indexOf("鍘�") > -1){ + String toilet = hall.substring(hall.indexOf("鍘�") + 1) + hall = hall.substring(0 , hall.indexOf("鍘�")) ma=pa.matcher(hall) if(ma.find()){ hall = ma.group(1) @@ -127,11 +127,11 @@ public class HomelinkSellPublisher implements Publishable { } if(StringUtils.isNotBlank(toilet)){ - if(toilet.indexOf("厨") > -1){ - toilet = toilet.substring(toilet.indexOf("厨") + 1) + if(toilet.indexOf("鍘�") > -1){ + toilet = toilet.substring(toilet.indexOf("鍘�") + 1) } - if(toilet.indexOf("卫") > -1){ - toilet = toilet.substring(0 , toilet.indexOf("卫")) + if(toilet.indexOf("鍗�") > -1){ + toilet = toilet.substring(0 , toilet.indexOf("鍗�")) ma=pa.matcher(toilet) if(ma.find()){ toilet = ma.group(1) @@ -150,7 +150,7 @@ public class HomelinkSellPublisher implements Publishable { } else { if(dataMap.get("region")) { String region = dataMap.get("region") - region = region.replace("二手房", "") + region = region.replace("浜屾墜鎴�", "") if(StringUtils.isNotBlank(region)){ region = trimChar(region) obj.put("region", region.trim()) @@ -159,7 +159,7 @@ public class HomelinkSellPublisher implements Publishable { if(dataMap.get("block")) { String block = dataMap.get("block") - block = block.replace("二手房", "") + block = block.replace("浜屾墜鎴�", "") if(StringUtils.isNotBlank(block)){ obj.put("block", block.trim()) } @@ -167,9 +167,9 @@ public class HomelinkSellPublisher implements Publishable { if(dataMap.get("district_name")) { String district_name = dataMap.get("district_name") - district_name = district_name.replace("二手房", "") - if(district_name.indexOf("(") > -1){ - district_name = district_name.substring(0 , district_name.indexOf("(")) + district_name = district_name.replace("浜屾墜鎴�", "") + if(district_name.indexOf("锛�") > -1){ + district_name = district_name.substring(0 , district_name.indexOf("锛�")) } if(StringUtils.isNotBlank(district_name)){ district_name = trimChar(district_name) @@ -179,8 +179,8 @@ public class HomelinkSellPublisher implements Publishable { if(dataMap.get("room")){ String s = dataMap.get("room").toString() - if(s.indexOf('室') > 0) { - s = s.substring(0, s.indexOf("室")) + if(s.indexOf('瀹�') > 0) { + s = s.substring(0, s.indexOf("瀹�")) } try{ obj.put("room", s.toInteger()) @@ -230,9 +230,9 @@ public class HomelinkSellPublisher implements Publishable { if(dataMap.get("direction")) { String direction = dataMap.get("direction") - direction = direction.replace("朝向:", "") - if(direction.indexOf("楼层:") > -1){ - direction = direction.substring(0 , direction.indexOf("楼层:")) + direction = direction.replace("鏈濆悜锛�", "") + if(direction.indexOf("妤煎眰锛�") > -1){ + direction = direction.substring(0 , direction.indexOf("妤煎眰锛�")) } if(StringUtils.isNotBlank(direction)){ obj.put("direction", direction.trim()) @@ -244,11 +244,11 @@ public class HomelinkSellPublisher implements Publishable { if(build_date.indexOf("/") > -1){ build_date = build_date.substring(build_date.indexOf("/") + 1) } - if(build_date.indexOf(")") > -1){ - build_date = build_date.substring(build_date.indexOf(")") + 1) + if(build_date.indexOf("锛�") > -1){ + build_date = build_date.substring(build_date.indexOf("锛�") + 1) } - if(build_date.indexOf("年") > -1){ - build_date = build_date.substring(0 , build_date.indexOf("年") + 1) + if(build_date.indexOf("骞�") > -1){ + build_date = build_date.substring(0 , build_date.indexOf("骞�") + 1) } else { build_date = null } @@ -259,15 +259,15 @@ public class HomelinkSellPublisher implements Publishable { if(dataMap.get("floor_info")) { String floor_info = dataMap.get("floor_info") - if(floor_info.indexOf("楼层:") > -1){ - floor_info = floor_info.substring(floor_info.indexOf("楼层:") + 3) + if(floor_info.indexOf("妤煎眰锛�") > -1){ + floor_info = floor_info.substring(floor_info.indexOf("妤煎眰锛�") + 3) } if(StringUtils.isNotBlank(floor_info)){ obj.put("floor_info", floor_info.trim()) } } - if(obj.get("city").equals("北京")){ + if(obj.get("city").equals("鍖椾含")){ if(obj.get("floor_info")) { String floor_info = obj.get("floor_info") floor_info = floor_info.trim() diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/House365OfficeSellPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/House365OfficeSellPublisher.groovy index ae7c0b390..99393c66d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/House365OfficeSellPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/House365OfficeSellPublisher.groovy @@ -15,8 +15,8 @@ class House365OfficeSellPublisher implements Publishable { public static final List JOB_ID = ["53f40439e4b09e392f5b6bdd"]; public static final Map CONFIG = [ - match_address:true, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:true, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -46,7 +46,7 @@ class House365OfficeSellPublisher implements Publishable { String region = dataMap.get("region") String[] arrs = region.split(">") if(arrs.length >= 4){ - region = arrs[2].replace("二手房", "") + region = arrs[2].replace("浜屾墜鎴�", "") } if(StringUtils.isNotBlank(region)){ region = trimChar(region) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/JintiOfficeRentPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/JintiOfficeRentPublisher.groovy index 7749b822d..df9038e7d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/JintiOfficeRentPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/JintiOfficeRentPublisher.groovy @@ -34,8 +34,8 @@ class JintiOfficeRentPublisher implements Publishable { "54606517e4b0e6ab76ceff1c" ]; public static final Map CONFIG = [ - match_address:false, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:false, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -67,7 +67,7 @@ class JintiOfficeRentPublisher implements Publishable { String region = dataMap.get("region") String[] arrs = region.split(">") if(arrs.length >= 4){ - region = arrs[3].replace("写字楼出租", "") + region = arrs[3].replace("鍐欏瓧妤煎嚭绉�", "") } else { region = null } @@ -79,7 +79,7 @@ class JintiOfficeRentPublisher implements Publishable { if(dataMap.get("estate_type")){ String estate_type = dataMap.get("estate_type") - estate_type = estate_type.replace("类型:", "") + estate_type = estate_type.replace("绫诲瀷锛�", "") if(StringUtils.isNotBlank(estate_type)){ obj.put("estate_type", estate_type.trim()) } @@ -120,7 +120,7 @@ class JintiOfficeRentPublisher implements Publishable { if(dataMap.get("total_price")) { def total_price = dataMap.get("total_price").toString() - total_price = total_price.replace("租金:", "").replace("元/平米*天", "") + total_price = total_price.replace("绉熼噾锛�", "").replace("鍏�/骞崇背*澶�", "") if(obj.get("area") != null && StringUtils.isNotBlank(total_price) && NumberUtils.isNumber(total_price) && total_price.trim().length() < 3){ obj.put("total_price", ((Integer)obj.get("area")) * total_price.trim().toInteger() * 30) } @@ -130,7 +130,7 @@ class JintiOfficeRentPublisher implements Publishable { if(dataMap.get("district_name")){ String district_name = dataMap.get("district_name") - district_name = district_name.replace("写字楼:", "") + district_name = district_name.replace("鍐欏瓧妤硷細", "") if(StringUtils.isNotBlank(district_name)){ district_name = trimChar(district_name) obj.put("district_name", district_name.trim()) @@ -139,7 +139,7 @@ class JintiOfficeRentPublisher implements Publishable { if(dataMap.get("address")){ String address = dataMap.get("address") - address = address.replace("地址:", "") + address = address.replace("鍦板潃锛�", "") if(StringUtils.isNotBlank(address)){ obj.put("address", address.trim()) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/JintiOfficeSellPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/JintiOfficeSellPublisher.groovy index ce8ad2379..98d036f42 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/JintiOfficeSellPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/JintiOfficeSellPublisher.groovy @@ -34,8 +34,8 @@ class JintiOfficeSellPublisher implements Publishable { "545c6268e4b0e6ab76cefac7" ]; public static final Map CONFIG = [ - match_address:false, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:false, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -67,7 +67,7 @@ class JintiOfficeSellPublisher implements Publishable { String region = dataMap.get("region") String[] arrs = region.split(">") if(arrs.length >= 4){ - region = arrs[3].replace("写字楼出售", "") + region = arrs[3].replace("鍐欏瓧妤煎嚭鍞�", "") } else { region = null } @@ -79,7 +79,7 @@ class JintiOfficeSellPublisher implements Publishable { if(dataMap.get("estate_type")){ String estate_type = dataMap.get("estate_type") - estate_type = estate_type.replace("类型:", "") + estate_type = estate_type.replace("绫诲瀷锛�", "") if(StringUtils.isNotBlank(estate_type)){ obj.put("estate_type", estate_type.trim()) } @@ -115,7 +115,7 @@ class JintiOfficeSellPublisher implements Publishable { if(dataMap.get("district_name")){ String district_name = dataMap.get("district_name") - district_name = district_name.replace("写字楼:", "") + district_name = district_name.replace("鍐欏瓧妤硷細", "") if(StringUtils.isNotBlank(district_name)){ district_name = trimChar(district_name) obj.put("district_name", district_name.trim()) @@ -124,7 +124,7 @@ class JintiOfficeSellPublisher implements Publishable { if(dataMap.get("address")){ String address = dataMap.get("address") - address = address.replace("地址:", "") + address = address.replace("鍦板潃锛�", "") if(StringUtils.isNotBlank(address)){ obj.put("address", address.trim()) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/JintiRentPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/JintiRentPublisher.groovy index 8bc50f6b6..74e4c7dd8 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/JintiRentPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/JintiRentPublisher.groovy @@ -34,8 +34,8 @@ class JintiRentPublisher implements Publishable { "5423ca0de4b0ba18b478b489" ]; public static final Map CONFIG = [ - match_address:false, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:false, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -67,7 +67,7 @@ class JintiRentPublisher implements Publishable { String region = dataMap.get("region") String[] arrs = region.split(">") if(arrs.length >= 4){ - region = arrs[3].replace("租房", "") + region = arrs[3].replace("绉熸埧", "") } else { region = null } @@ -79,7 +79,7 @@ class JintiRentPublisher implements Publishable { // // if(dataMap.get("estate_type")){ // String estate_type = dataMap.get("estate_type") -// estate_type = estate_type.replace("类型:", "") +// estate_type = estate_type.replace("绫诲瀷锛�", "") // if(StringUtils.isNotBlank(estate_type)){ // obj.put("estate_type", estate_type.trim()) // } @@ -117,7 +117,7 @@ class JintiRentPublisher implements Publishable { if(dataMap.get("district_name")){ String district_name = dataMap.get("district_name") - district_name = district_name.replace("小区:", "") + district_name = district_name.replace("灏忓尯锛�", "") if(district_name != null && district_name.indexOf("[") > -1){ district_name = district_name.substring(0 , district_name.indexOf("[")) @@ -143,10 +143,10 @@ class JintiRentPublisher implements Publishable { if(dataMap.get("room")){ String room = dataMap.get("room") + "" - room = room.substring(room.indexOf(":") + 1) - if(room.indexOf("室") > -1){ - String hall = room.substring(room.indexOf("室") + 1).trim() - room = room.substring(0 , room.indexOf("室")).trim() + room = room.substring(room.indexOf("锛�") + 1) + if(room.indexOf("瀹�") > -1){ + String hall = room.substring(room.indexOf("瀹�") + 1).trim() + room = room.substring(0 , room.indexOf("瀹�")).trim() Pattern pa=Pattern.compile("(\\d+)") Matcher ma=pa.matcher(room) if(ma.find()){ @@ -158,9 +158,9 @@ class JintiRentPublisher implements Publishable { obj.put("room", room.trim().toInteger()) } - if(StringUtils.isNotBlank(hall) && hall.indexOf("厅") > -1){ - String toilet = hall.substring(hall.indexOf("厅") + 1) - hall = hall.substring(0 , hall.indexOf("厅")) + if(StringUtils.isNotBlank(hall) && hall.indexOf("鍘�") > -1){ + String toilet = hall.substring(hall.indexOf("鍘�") + 1) + hall = hall.substring(0 , hall.indexOf("鍘�")) ma=pa.matcher(hall) if(ma.find()){ hall = ma.group(1) @@ -172,11 +172,11 @@ class JintiRentPublisher implements Publishable { } if(StringUtils.isNotBlank(toilet)){ - if(toilet.indexOf("厨") > -1){ - toilet = toilet.substring(toilet.indexOf("厨") + 1) + if(toilet.indexOf("鍘�") > -1){ + toilet = toilet.substring(toilet.indexOf("鍘�") + 1) } - if(toilet.indexOf("卫") > -1){ - toilet = toilet.substring(0 , toilet.indexOf("卫")) + if(toilet.indexOf("鍗�") > -1){ + toilet = toilet.substring(0 , toilet.indexOf("鍗�")) ma=pa.matcher(toilet) if(ma.find()){ toilet = ma.group(1) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/JintiShopSellPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/JintiShopSellPublisher.groovy index 83c4456ee..2b8021187 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/JintiShopSellPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/JintiShopSellPublisher.groovy @@ -34,8 +34,8 @@ class JintiShopSellPublisher implements Publishable { "5424e25de4b0ba18b478b905" ]; public static final Map CONFIG = [ - match_address:false, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:false, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -67,7 +67,7 @@ class JintiShopSellPublisher implements Publishable { String region = dataMap.get("region") String[] arrs = region.split(">") if(arrs.length >= 4){ - region = arrs[3].replace("商铺出售", "") + region = arrs[3].replace("鍟嗛摵鍑哄敭", "") } else { region = null } @@ -79,7 +79,7 @@ class JintiShopSellPublisher implements Publishable { if(dataMap.get("estate_type")){ String estate_type = dataMap.get("estate_type") - estate_type = estate_type.replace("类型:", "") + estate_type = estate_type.replace("绫诲瀷锛�", "") if(StringUtils.isNotBlank(estate_type)){ obj.put("estate_type", estate_type.trim()) } @@ -103,7 +103,7 @@ class JintiShopSellPublisher implements Publishable { if(dataMap.get("address")){ String address = dataMap.get("address") - address = address.replace("地址:", "") + address = address.replace("鍦板潃锛�", "") if(StringUtils.isNotBlank(address)){ obj.put("address", address.trim()) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/JiwuSellPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/JiwuSellPublisher.groovy index ea1c25265..c50cefc0d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/JiwuSellPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/JiwuSellPublisher.groovy @@ -32,8 +32,8 @@ class JiwuSellPublisher implements Publishable { "540feafce4b09e392f5bb6bd" ]; public static final Map CONFIG = [ - match_address:false, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:false, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -104,8 +104,8 @@ class JiwuSellPublisher implements Publishable { if(dataMap.get("room")){ String room = dataMap.get("room") - if(room.indexOf("室") > -1){ - room = room.substring(0 , room.indexOf("室")) + if(room.indexOf("瀹�") > -1){ + room = room.substring(0 , room.indexOf("瀹�")) if(!NumberUtils.isNumber(room)){ room = null } @@ -119,10 +119,10 @@ class JiwuSellPublisher implements Publishable { if(dataMap.get("room")){ String hall = dataMap.get("room") - if(hall.indexOf("室") > -1){ - hall = hall.substring(hall.indexOf("室") + 1) - if(hall.indexOf("厅") > -1){ - hall = hall.substring(0 , hall.indexOf("厅")) + if(hall.indexOf("瀹�") > -1){ + hall = hall.substring(hall.indexOf("瀹�") + 1) + if(hall.indexOf("鍘�") > -1){ + hall = hall.substring(0 , hall.indexOf("鍘�")) } if(!NumberUtils.isNumber(hall)){ hall = null @@ -151,7 +151,7 @@ class JiwuSellPublisher implements Publishable { if(address.indexOf("[") > -1){ address = address.substring(0 , address.indexOf("[")) } - address = address.replace("查看周边地图", "") + address = address.replace("鏌ョ湅鍛ㄨ竟鍦板浘", "") if(StringUtils.isNotBlank(address)){ obj.put("address", address.trim()) } @@ -197,7 +197,7 @@ class JiwuSellPublisher implements Publishable { obj.put("contact_people", dataMap.get("contact_people")) - obj.put("mobile", dataMap.get("mobile").toString().replace("联系电话:", "")) + obj.put("mobile", dataMap.get("mobile").toString().replace("鑱旂郴鐢佃瘽锛�", "")) obj.put("publish_date", new Date()) obj.put("c_date", new Date()) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/KoofangSellPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/KoofangSellPublisher.groovy index 44091847a..fbc7ca4ca 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/KoofangSellPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/KoofangSellPublisher.groovy @@ -32,8 +32,8 @@ import com.mongodb.DBObject; public class KoofangSellPublisher implements Publishable { public static final List JOB_ID = ["50bf14984d60ee65ffe16337"]; public static final Map CONFIG = [ - match_address:true, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:true, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -69,11 +69,11 @@ public class KoofangSellPublisher implements Publishable { if(dataMap.get("price") != null) { def price = dataMap.get("price") - if(price.toString().indexOf(":") > -1) { - price = StringUtils.substringAfterLast(price, ":") + if(price.toString().indexOf("锛�") > -1) { + price = StringUtils.substringAfterLast(price, "锛�") price = trimChar(price) - if(price.indexOf("万元") > -1){ - price = price.substring(0 , price.indexOf("万元")) + if(price.indexOf("涓囧厓") > -1){ + price = price.substring(0 , price.indexOf("涓囧厓")) } else { price = null } @@ -106,10 +106,10 @@ public class KoofangSellPublisher implements Publishable { } if(dataMap.get("room")){ String room = dataMap.get("room") + "" - room = room.substring(room.indexOf(":") + 1) - if(room.indexOf("室") > -1){ - String hall = room.substring(room.indexOf("室") + 1).trim() - room = room.substring(0 , room.indexOf("室")).trim() + room = room.substring(room.indexOf("锛�") + 1) + if(room.indexOf("瀹�") > -1){ + String hall = room.substring(room.indexOf("瀹�") + 1).trim() + room = room.substring(0 , room.indexOf("瀹�")).trim() Pattern pa=Pattern.compile("(\\d+)") Matcher ma=pa.matcher(room) if(ma.find()){ @@ -121,9 +121,9 @@ public class KoofangSellPublisher implements Publishable { obj.put("room", room.trim().toInteger()) } - if(StringUtils.isNotBlank(hall) && hall.indexOf("厅") > -1){ - String toilet = hall.substring(hall.indexOf("厅") + 1) - hall = hall.substring(0 , hall.indexOf("厅")) + if(StringUtils.isNotBlank(hall) && hall.indexOf("鍘�") > -1){ + String toilet = hall.substring(hall.indexOf("鍘�") + 1) + hall = hall.substring(0 , hall.indexOf("鍘�")) ma=pa.matcher(hall) if(ma.find()){ hall = ma.group(1) @@ -135,11 +135,11 @@ public class KoofangSellPublisher implements Publishable { } if(StringUtils.isNotBlank(toilet)){ - if(toilet.indexOf("厨") > -1){ - toilet = toilet.substring(toilet.indexOf("厨") + 1) + if(toilet.indexOf("鍘�") > -1){ + toilet = toilet.substring(toilet.indexOf("鍘�") + 1) } - if(toilet.indexOf("卫") > -1){ - toilet = toilet.substring(0 , toilet.indexOf("卫")) + if(toilet.indexOf("鍗�") > -1){ + toilet = toilet.substring(0 , toilet.indexOf("鍗�")) ma=pa.matcher(toilet) if(ma.find()){ toilet = ma.group(1) @@ -193,9 +193,9 @@ public class KoofangSellPublisher implements Publishable { obj.put("mobile", dataMap.get("cellphone").replaceAll("\\s", "")) } if(dataMap.get("district_name") != null) { - String districtName = dataMap.get("district_name").replace("小区名称:", ""); - if(districtName.indexOf('看房时间') > -1) { - districtName = StringUtils.substringBefore(districtName, '看房时间') + String districtName = dataMap.get("district_name").replace("灏忓尯鍚嶇О锛�", ""); + if(districtName.indexOf('鐪嬫埧鏃堕棿') > -1) { + districtName = StringUtils.substringBefore(districtName, '鐪嬫埧鏃堕棿') } if(StringUtils.isNotBlank(districtName)){ districtName = trimChar(districtName) @@ -215,16 +215,16 @@ public class KoofangSellPublisher implements Publishable { if(dataMap.get("contact_people") != null) { String people = dataMap.get("contact_people") - if(people.indexOf("产权性质") > -1) { - people = StringUtils.substringBetween(people, ":", "产权性质") + if(people.indexOf("浜ф潈鎬ц川") > -1) { + people = StringUtils.substringBetween(people, "锛�", "浜ф潈鎬ц川") }else { - people = people.replace("联 系 人:", "") + people = people.replace("鑱� 绯� 浜猴細", "") } obj.put('contact_people', people) } if(dataMap.get("address") != null) { - String addr = StringUtils.substringAfter(dataMap.get("address"), "地址:") + String addr = StringUtils.substringAfter(dataMap.get("address"), "鍦板潃锛�") obj.put("address", addr) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/LoupanRentPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/LoupanRentPublisher.groovy index 56175a30e..416a0bc2b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/LoupanRentPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/LoupanRentPublisher.groovy @@ -32,8 +32,8 @@ class LoupanRentPublisher implements Publishable { "54111a2be4b09e392f5bba2f" ]; public static final Map CONFIG = [ - match_address:false, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:false, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -63,8 +63,8 @@ class LoupanRentPublisher implements Publishable { if(dataMap.get("region")){ String region = dataMap.get("region") - if(region.indexOf("置:") > -1){ - region = region.substring(region.indexOf("置:") + 2) + if(region.indexOf("缃細") > -1){ + region = region.substring(region.indexOf("缃細") + 2) } String[] arrs = region.split("-") if(arrs.length == 3){ @@ -102,8 +102,8 @@ class LoupanRentPublisher implements Publishable { if(dataMap.get("estate_type")){ String estate_type = dataMap.get("estate_type") - if(estate_type.indexOf("型:") > -1){ - estate_type = estate_type.substring(estate_type.indexOf("型:") + 2) + if(estate_type.indexOf("鍨嬶細") > -1){ + estate_type = estate_type.substring(estate_type.indexOf("鍨嬶細") + 2) } if(StringUtils.isNotBlank(estate_type)){ estate_type = estate_type.trim() @@ -169,8 +169,8 @@ class LoupanRentPublisher implements Publishable { if(dataMap.get("publish_date")){ String publish_date = dataMap.get("publish_date") - if(publish_date.indexOf("发布时间:") > -1){ - publish_date = publish_date.substring(publish_date.indexOf("发布时间:")) + if(publish_date.indexOf("鍙戝竷鏃堕棿锛�") > -1){ + publish_date = publish_date.substring(publish_date.indexOf("鍙戝竷鏃堕棿锛�")) Date date = DateUtil.parseStringToDate(publish_date); if(date != null){ obj.put("publish_date", date) @@ -185,8 +185,8 @@ class LoupanRentPublisher implements Publishable { if(dataMap.get("address")){ String addr = dataMap.get("address") - if(addr.indexOf("址:") > -1){ - addr = addr.substring(addr.indexOf("址:") + 2) + if(addr.indexOf("鍧�锛�") > -1){ + addr = addr.substring(addr.indexOf("鍧�锛�") + 2) } if(StringUtils.isNotBlank(addr)){ obj.put("address", addr.trim()) @@ -211,14 +211,14 @@ class LoupanRentPublisher implements Publishable { obj.put("description", dataMap.get("description")) - obj.put("contact_people", dataMap.get("contact_people").toString().replace("联系人:", "")) + obj.put("contact_people", dataMap.get("contact_people").toString().replace("鑱旂郴浜猴細", "")) - obj.put("mobile", dataMap.get("mobile").toString().replace("联系电话:", "")) + obj.put("mobile", dataMap.get("mobile").toString().replace("鑱旂郴鐢佃瘽锛�", "")) if(dataMap.get("room")){ String area = dataMap.get("room") - if(area.indexOf("卫") > -1){ - area = area.substring(area.indexOf("卫") + 1) + if(area.indexOf("鍗�") > -1){ + area = area.substring(area.indexOf("鍗�") + 1) } else { area = null } @@ -238,10 +238,10 @@ class LoupanRentPublisher implements Publishable { if(dataMap.get("room")){ String room = dataMap.get("room") + "" - room = room.substring(room.indexOf(":") + 1) - if(room.indexOf("室") > -1){ - String hall = room.substring(room.indexOf("室") + 1).trim() - room = room.substring(0 , room.indexOf("室")).trim() + room = room.substring(room.indexOf("锛�") + 1) + if(room.indexOf("瀹�") > -1){ + String hall = room.substring(room.indexOf("瀹�") + 1).trim() + room = room.substring(0 , room.indexOf("瀹�")).trim() Pattern pa=Pattern.compile("(\\d+)") Matcher ma=pa.matcher(room) if(ma.find()){ @@ -253,9 +253,9 @@ class LoupanRentPublisher implements Publishable { obj.put("room", room.trim().toInteger()) } - if(StringUtils.isNotBlank(hall) && hall.indexOf("厅") > -1){ - String toilet = hall.substring(hall.indexOf("厅") + 1) - hall = hall.substring(0 , hall.indexOf("厅")) + if(StringUtils.isNotBlank(hall) && hall.indexOf("鍘�") > -1){ + String toilet = hall.substring(hall.indexOf("鍘�") + 1) + hall = hall.substring(0 , hall.indexOf("鍘�")) ma=pa.matcher(hall) if(ma.find()){ hall = ma.group(1) @@ -267,11 +267,11 @@ class LoupanRentPublisher implements Publishable { } if(StringUtils.isNotBlank(toilet)){ - if(toilet.indexOf("厨") > -1){ - toilet = toilet.substring(toilet.indexOf("厨") + 1) + if(toilet.indexOf("鍘�") > -1){ + toilet = toilet.substring(toilet.indexOf("鍘�") + 1) } - if(toilet.indexOf("卫") > -1){ - toilet = toilet.substring(0 , toilet.indexOf("卫")) + if(toilet.indexOf("鍗�") > -1){ + toilet = toilet.substring(0 , toilet.indexOf("鍗�")) ma=pa.matcher(toilet) if(ma.find()){ toilet = ma.group(1) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/LoupanSellPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/LoupanSellPublisher.groovy index 6e352449a..9d07f1be5 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/LoupanSellPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/LoupanSellPublisher.groovy @@ -32,8 +32,8 @@ class LoupanSellPublisher implements Publishable { "5411538be4b09e392f5bbabb" ]; public static final Map CONFIG = [ - match_address:false, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:false, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -63,11 +63,11 @@ class LoupanSellPublisher implements Publishable { if(dataMap.get("region")){ String region = dataMap.get("region") - if(region.indexOf("位置:") > -1){ - region = region.substring(region.indexOf("位置:") + 3) + if(region.indexOf("浣嶇疆锛�") > -1){ + region = region.substring(region.indexOf("浣嶇疆锛�") + 3) } - if(region.indexOf("(") > -1){ - region = region.substring(0 , region.indexOf("(")) + if(region.indexOf("锛�") > -1){ + region = region.substring(0 , region.indexOf("锛�")) } String[] arrs = region.split("-") if(arrs.length == 3){ @@ -106,11 +106,11 @@ class LoupanSellPublisher implements Publishable { if(dataMap.get("estate_type")){ String estate_type = dataMap.get("estate_type") - if(estate_type.indexOf("类型:") > -1){ - estate_type = estate_type.substring(estate_type.indexOf("类型:") + 3) + if(estate_type.indexOf("绫诲瀷锛�") > -1){ + estate_type = estate_type.substring(estate_type.indexOf("绫诲瀷锛�") + 3) } - if(estate_type.indexOf("物业类型:") > -1){ - estate_type = estate_type.substring(0 , estate_type.indexOf("物业类型:")) + if(estate_type.indexOf("鐗╀笟绫诲瀷锛�") > -1){ + estate_type = estate_type.substring(0 , estate_type.indexOf("鐗╀笟绫诲瀷锛�")) } if(StringUtils.isNotBlank(estate_type)){ estate_type = estate_type.trim() @@ -174,11 +174,11 @@ class LoupanSellPublisher implements Publishable { if(dataMap.get("build_date")){ String build_date = dataMap.get("build_date") - if(build_date.indexOf(":") > -1){ - build_date = build_date.substring(build_date.indexOf(":") + 1) + if(build_date.indexOf("锛�") > -1){ + build_date = build_date.substring(build_date.indexOf("锛�") + 1) } - if(build_date.indexOf(")") > -1){ - build_date = build_date.substring(build_date.indexOf(")") + 1) + if(build_date.indexOf("锛�") > -1){ + build_date = build_date.substring(build_date.indexOf("锛�") + 1) } if(StringUtils.isNotBlank(build_date)){ obj.put("build_date", build_date.trim()) @@ -201,7 +201,7 @@ class LoupanSellPublisher implements Publishable { if(dataMap.get("fitment")){ String fitment = dataMap.get("fitment") - fitment =fitment.replace("装修:", "") + fitment =fitment.replace("瑁呬慨锛�", "") if(StringUtils.isNotBlank(fitment)){ fitment = fitment.trim() if(fitment.indexOf(" ") > -1){ @@ -220,8 +220,8 @@ class LoupanSellPublisher implements Publishable { if(dataMap.get("address")){ String addr = dataMap.get("address") - if(addr.lastIndexOf(":") > -1){ - addr = addr.substring(addr.lastIndexOf(":") + 1) + if(addr.lastIndexOf("锛�") > -1){ + addr = addr.substring(addr.lastIndexOf("锛�") + 1) } if(addr.indexOf("(") > -1){ addr = addr.substring(0 , addr.indexOf("(")) @@ -235,14 +235,14 @@ class LoupanSellPublisher implements Publishable { obj.put("description", dataMap.get("description")) - obj.put("contact_people", dataMap.get("contact_people").toString().replace("联系人:", "")) + obj.put("contact_people", dataMap.get("contact_people").toString().replace("鑱旂郴浜猴細", "")) - obj.put("mobile", dataMap.get("mobile").toString().replace("联系电话:", "")) + obj.put("mobile", dataMap.get("mobile").toString().replace("鑱旂郴鐢佃瘽锛�", "")) if(dataMap.get("room")){ String area = dataMap.get("room") - if(area.indexOf("卫") > -1){ - area = area.substring(area.indexOf("卫") + 1) + if(area.indexOf("鍗�") > -1){ + area = area.substring(area.indexOf("鍗�") + 1) } else { area = null } @@ -262,10 +262,10 @@ class LoupanSellPublisher implements Publishable { if(dataMap.get("room")){ String room = dataMap.get("room") + "" - room = room.substring(room.indexOf(":") + 1) - if(room.indexOf("室") > -1){ - String hall = room.substring(room.indexOf("室") + 1).trim() - room = room.substring(0 , room.indexOf("室")).trim() + room = room.substring(room.indexOf("锛�") + 1) + if(room.indexOf("瀹�") > -1){ + String hall = room.substring(room.indexOf("瀹�") + 1).trim() + room = room.substring(0 , room.indexOf("瀹�")).trim() Pattern pa=Pattern.compile("(\\d+)") Matcher ma=pa.matcher(room) if(ma.find()){ @@ -277,9 +277,9 @@ class LoupanSellPublisher implements Publishable { obj.put("room", room.trim().toInteger()) } - if(StringUtils.isNotBlank(hall) && hall.indexOf("厅") > -1){ - String toilet = hall.substring(hall.indexOf("厅") + 1) - hall = hall.substring(0 , hall.indexOf("厅")) + if(StringUtils.isNotBlank(hall) && hall.indexOf("鍘�") > -1){ + String toilet = hall.substring(hall.indexOf("鍘�") + 1) + hall = hall.substring(0 , hall.indexOf("鍘�")) ma=pa.matcher(hall) if(ma.find()){ hall = ma.group(1) @@ -291,11 +291,11 @@ class LoupanSellPublisher implements Publishable { } if(StringUtils.isNotBlank(toilet)){ - if(toilet.indexOf("厨") > -1){ - toilet = toilet.substring(toilet.indexOf("厨") + 1) + if(toilet.indexOf("鍘�") > -1){ + toilet = toilet.substring(toilet.indexOf("鍘�") + 1) } - if(toilet.indexOf("卫") > -1){ - toilet = toilet.substring(0 , toilet.indexOf("卫")) + if(toilet.indexOf("鍗�") > -1){ + toilet = toilet.substring(0 , toilet.indexOf("鍗�")) ma=pa.matcher(toilet) if(ma.find()){ toilet = ma.group(1) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/Net58OfficeRentPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/Net58OfficeRentPublisher.groovy index f7cc1716a..2baa97afd 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/Net58OfficeRentPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/Net58OfficeRentPublisher.groovy @@ -18,8 +18,8 @@ public class Net58OfficeRentPublisher implements Publishable { public static final List JOB_ID = ["53e98a8fe4b09e392f5b4c28"]; public static final Map CONFIG = [ - match_address:true, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:true, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -47,7 +47,7 @@ public class Net58OfficeRentPublisher implements Publishable { if(dataMap.get("region")) { String region = dataMap.get("region") - region = region.replace("区域:", "").trim() + region = region.replace("鍖哄煙锛�", "").trim() try { if(region){ region = new String(region.getBytes("GBK"), "GBK").replace("?", " "); @@ -67,7 +67,7 @@ public class Net58OfficeRentPublisher implements Publishable { obj.put("name", dataMap.get("title")) if(dataMap.get("district_name")) { String district_name = dataMap.get("district_name") - district_name = district_name.replace("楼盘:", "").trim() + district_name = district_name.replace("妤肩洏锛�", "").trim() if(StringUtils.isNotBlank(district_name)){ obj.put("district_name", district_name.trim()) } @@ -75,7 +75,7 @@ public class Net58OfficeRentPublisher implements Publishable { if(dataMap.get("address")) { String address = dataMap.get("address") - address = address.replace("地段:", "").trim() + address = address.replace("鍦版锛�", "").trim() if(StringUtils.isNotBlank(address)){ obj.put("address", address.trim()) } @@ -85,7 +85,7 @@ public class Net58OfficeRentPublisher implements Publishable { if(dataMap.get("estate_type")) { String estate_type = dataMap.get("estate_type") - estate_type = estate_type.replace("类别:", "").trim() + estate_type = estate_type.replace("绫诲埆锛�", "").trim() if(StringUtils.isNotBlank(estate_type)){ obj.put("estate_type", estate_type.trim()) } @@ -112,9 +112,9 @@ public class Net58OfficeRentPublisher implements Publishable { Pattern pa=Pattern.compile("(\\d+)") Matcher ma=pa.matcher(rentPrice) - rentPrice = rentPrice.replace("价格:", "").trim() - if(rentPrice.indexOf("元/月") > -1){ - rentPrice = rentPrice.replace("元/月", "").trim() + rentPrice = rentPrice.replace("浠锋牸锛�", "").trim() + if(rentPrice.indexOf("鍏�/鏈�") > -1){ + rentPrice = rentPrice.replace("鍏�/鏈�", "").trim() if(ma.find()){ rentPrice = ma.group(1) } else { @@ -124,8 +124,8 @@ public class Net58OfficeRentPublisher implements Publishable { rentPrice = ((rentPrice.toDouble()) / areas / 30).toString() } } - rentPrice = rentPrice.replace("元/㎡/天", "").trim() - rentPrice = rentPrice.replace("面议", "") + rentPrice = rentPrice.replace("鍏�/銕�/澶�", "").trim() + rentPrice = rentPrice.replace("闈㈣", "") if(rentPrice.indexOf(" ") > -1){ rentPrice = rentPrice.substring(0 , rentPrice.indexOf(" ")) } @@ -149,7 +149,7 @@ public class Net58OfficeRentPublisher implements Publishable { if(dataMap.get("block")) { String block = dataMap.get("block") - block = block.replace("区域:", "").trim() + block = block.replace("鍖哄煙锛�", "").trim() block = trimChar(block) if(block.indexOf(" ") > -1){ block = block.substring(block.indexOf(" ") + 1).trim() @@ -163,9 +163,9 @@ public class Net58OfficeRentPublisher implements Publishable { if(dataMap.get("publish_date")) { String publishDate = dataMap.get("publish_date") - publishDate = StringUtils.substringAfter(publishDate, "发布时间:") - publishDate = StringUtils.substringBeforeLast(publishDate, " 浏览").trim() - publishDate = StringUtils.substringBeforeLast(publishDate, " 房源编号").trim() + publishDate = StringUtils.substringAfter(publishDate, "鍙戝竷鏃堕棿锛�") + publishDate = StringUtils.substringBeforeLast(publishDate, " 娴忚").trim() + publishDate = StringUtils.substringBeforeLast(publishDate, " 鎴挎簮缂栧彿").trim() try { if(publishDate){ publishDate = new String(publishDate.getBytes("GBK"), "GBK").replace("?", ""); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/Net58OfficeSellPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/Net58OfficeSellPublisher.groovy index a735f9730..cc59e77fb 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/Net58OfficeSellPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/Net58OfficeSellPublisher.groovy @@ -17,8 +17,8 @@ class Net58OfficeSellPublisher implements Publishable { public static final List JOB_ID = ["53ed9d02e4b09e392f5b6521"]; public static final Map CONFIG = [ - match_address:true, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:true, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -46,7 +46,7 @@ class Net58OfficeSellPublisher implements Publishable { if(dataMap.get("region")){ String region = dataMap.get("region") - region = region.replace("写字楼", "") + region = region.replace("鍐欏瓧妤�", "") if(StringUtils.isNotBlank(region)){ region = trimChar(region) obj.put("region", region.trim()) @@ -57,7 +57,7 @@ class Net58OfficeSellPublisher implements Publishable { if(dataMap.get("address")){ String address = dataMap.get("address") - obj.put("address", address.replace("地段:", "").trim()) + obj.put("address", address.replace("鍦版锛�", "").trim()) } if(dataMap.get("total_price")){ @@ -97,7 +97,7 @@ class Net58OfficeSellPublisher implements Publishable { if(dataMap.get("estate_type")){ String estateType = dataMap.get("estate_type") - estateType = estateType.replace("类别:", "").trim() + estateType = estateType.replace("绫诲埆锛�", "").trim() if(StringUtils.isNotBlank(estateType)){ obj.put("estate_type", estateType.trim()) } @@ -105,7 +105,7 @@ class Net58OfficeSellPublisher implements Publishable { if(dataMap.get("district_name")){ String district_name = dataMap.get("district_name") - district_name = district_name.replace("楼盘:", "") + district_name = district_name.replace("妤肩洏锛�", "") district_name = trimChar(district_name) if(StringUtils.isNotBlank(district_name)){ obj.put("district_name", district_name.trim()) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/Net58RentPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/Net58RentPublisher.groovy index 3763e466c..80c4ca47d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/Net58RentPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/Net58RentPublisher.groovy @@ -32,8 +32,8 @@ import com.mongodb.DBObject; public class Net58RentPublisher implements Publishable { public static final List JOB_ID = ["50de54afe4b09b110f9ab363", "527c5061e4b009cf8447808e", "5588f2f7e4b0a7ef70e98edb"]; public static final Map CONFIG = [ - match_address:true, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:true, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -61,7 +61,7 @@ public class Net58RentPublisher implements Publishable { obj.put("name", dataMap.get("title")) if(dataMap.get("price")){ String total_price = dataMap.get("price") - total_price = total_price.replace("元/月", "") + total_price = total_price.replace("鍏�/鏈�", "") if(total_price.indexOf(".") > -1){ total_price = total_price.substring(0 , total_price.indexOf(".")) } @@ -71,10 +71,10 @@ public class Net58RentPublisher implements Publishable { } if(dataMap.get("room")){ String room = dataMap.get("room") + "" - room = room.substring(room.indexOf(":") + 1) - if(room.indexOf("室") > -1){ - String hall = room.substring(room.indexOf("室") + 1).trim() - room = room.substring(0 , room.indexOf("室")).trim() + room = room.substring(room.indexOf("锛�") + 1) + if(room.indexOf("瀹�") > -1){ + String hall = room.substring(room.indexOf("瀹�") + 1).trim() + room = room.substring(0 , room.indexOf("瀹�")).trim() Pattern pa=Pattern.compile("(\\d+)") Matcher ma=pa.matcher(room) if(ma.find()){ @@ -86,9 +86,9 @@ public class Net58RentPublisher implements Publishable { obj.put("room", room.trim().toInteger()) } - if(StringUtils.isNotBlank(hall) && hall.indexOf("厅") > -1){ - String toilet = hall.substring(hall.indexOf("厅") + 1) - hall = hall.substring(0 , hall.indexOf("厅")) + if(StringUtils.isNotBlank(hall) && hall.indexOf("鍘�") > -1){ + String toilet = hall.substring(hall.indexOf("鍘�") + 1) + hall = hall.substring(0 , hall.indexOf("鍘�")) ma=pa.matcher(hall) if(ma.find()){ hall = ma.group(1) @@ -100,11 +100,11 @@ public class Net58RentPublisher implements Publishable { } if(StringUtils.isNotBlank(toilet)){ - if(toilet.indexOf("厨") > -1){ - toilet = toilet.substring(toilet.indexOf("厨") + 1) + if(toilet.indexOf("鍘�") > -1){ + toilet = toilet.substring(toilet.indexOf("鍘�") + 1) } - if(toilet.indexOf("卫") > -1){ - toilet = toilet.substring(0 , toilet.indexOf("卫")) + if(toilet.indexOf("鍗�") > -1){ + toilet = toilet.substring(0 , toilet.indexOf("鍗�")) ma=pa.matcher(toilet) if(ma.find()){ toilet = ma.group(1) @@ -121,7 +121,7 @@ public class Net58RentPublisher implements Publishable { } if(dataMap.get("room")){ String area = dataMap.get("room") - area = StringUtils.substringBetween(area, "卫", "㎡") + area = StringUtils.substringBetween(area, "鍗�", "銕�") area = trimChar(area) if(StringUtils.isNotBlank(area)){ Pattern pa=Pattern.compile("(\\d+)") @@ -147,23 +147,23 @@ public class Net58RentPublisher implements Publishable { if(dataMap.get("address")) { String s = DataUtil.encoding(dataMap.get("address")).replace('?', '') - if(s.indexOf(":") > -1) { - s = StringUtils.substringAfter(s, ":") + if(s.indexOf("锛�") > -1) { + s = StringUtils.substringAfter(s, "锛�") } - if(s.indexOf("(") > -1) { - s = StringUtils.substringBeforeLast(s, "(") + if(s.indexOf("锛�") > -1) { + s = StringUtils.substringBeforeLast(s, "锛�") } address = s } if(dataMap.get("region")) { - String s = DataUtil.encoding(dataMap.get("region")).replace('?', '').replace('区域', '').trim() - if(s.indexOf(":") > -1) { - s = StringUtils.substringAfter(s, ":") + String s = DataUtil.encoding(dataMap.get("region")).replace('?', '').replace('鍖哄煙', '').trim() + if(s.indexOf("锛�") > -1) { + s = StringUtils.substringAfter(s, "锛�") } - if(s.indexOf("(") > -1) { - s = StringUtils.substringBeforeLast(s, "(") + if(s.indexOf("锛�") > -1) { + s = StringUtils.substringBeforeLast(s, "锛�") } String[] arrs = s.split('-') @@ -198,7 +198,7 @@ public class Net58RentPublisher implements Publishable { } if(districtName) { - districtName = districtName.replace("找附近工作","") + districtName = districtName.replace("鎵鹃檮杩戝伐浣�","") if(StringUtils.isNotBlank(districtName)){ districtName = trimChar(districtName) obj.put("district_name", districtName.trim()) @@ -206,7 +206,7 @@ public class Net58RentPublisher implements Publishable { } if(address) { - address = address.replace("地址", "").replace("找附近工作", "") + address = address.replace("鍦板潃", "").replace("鎵鹃檮杩戝伐浣�", "") if(StringUtils.isNotBlank(address)){ obj.put("address", address.trim()) } @@ -218,12 +218,12 @@ public class Net58RentPublisher implements Publishable { if(dataMap.get("publish_date")) { String s = dataMap.get("publish_date"); - s = StringUtils.substringAfter(s, ':').replace('浏览0次', '').trim() - if(s.indexOf('房源编号') > -1) { - s = StringUtils.substringBefore(s, '房源编号') + s = StringUtils.substringAfter(s, '锛�').replace('娴忚0娆�', '').trim() + if(s.indexOf('鎴挎簮缂栧彿') > -1) { + s = StringUtils.substringBefore(s, '鎴挎簮缂栧彿') } if(s) { - obj.put("publish_date", DateUtil.parseDate(s.replace("发布", "").trim(), "yyyy-MM-dd")) + obj.put("publish_date", DateUtil.parseDate(s.replace("鍙戝竷", "").trim(), "yyyy-MM-dd")) }else { obj.put("publish_date", new Date()) } @@ -233,7 +233,7 @@ public class Net58RentPublisher implements Publishable { obj.put("contact_people", dataMap.get("contact_people")) - obj.put("mobile", dataMap.get("mobile").toString().replace("联系电话:", "")) + obj.put("mobile", dataMap.get("mobile").toString().replace("鑱旂郴鐢佃瘽锛�", "")) obj.put("c_date", new Date()) obj.put("m_date", new Date()) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/Net58SellPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/Net58SellPublisher.groovy index aab37ea4a..16263b76d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/Net58SellPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/Net58SellPublisher.groovy @@ -35,8 +35,8 @@ public class Net58SellPublisher implements Publishable { "520dd70fe4b0fb6103719327" ]; public static final Map CONFIG = [ - match_address:false, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:false, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -65,8 +65,8 @@ public class Net58SellPublisher implements Publishable { if(dataMap.get("area")) { String area = dataMap.get("area") - if(area.indexOf("卫") > -1){ - area = area.substring(area.indexOf("卫") + 1) + if(area.indexOf("鍗�") > -1){ + area = area.substring(area.indexOf("鍗�") + 1) } Pattern pa=Pattern.compile("(\\d+)") Matcher ma=pa.matcher(area) @@ -96,10 +96,10 @@ public class Net58SellPublisher implements Publishable { if(dataMap.get("room")){ String room = dataMap.get("room") + "" - room = room.substring(room.indexOf(":") + 1) - if(room.indexOf("室") > -1){ - String hall = room.substring(room.indexOf("室") + 1).trim() - room = room.substring(0 , room.indexOf("室")).trim() + room = room.substring(room.indexOf("锛�") + 1) + if(room.indexOf("瀹�") > -1){ + String hall = room.substring(room.indexOf("瀹�") + 1).trim() + room = room.substring(0 , room.indexOf("瀹�")).trim() Pattern pa=Pattern.compile("(\\d+)") Matcher ma=pa.matcher(room) if(ma.find()){ @@ -111,9 +111,9 @@ public class Net58SellPublisher implements Publishable { obj.put("room", room.trim().toInteger()) } - if(StringUtils.isNotBlank(hall) && hall.indexOf("厅") > -1){ - String toilet = hall.substring(hall.indexOf("厅") + 1) - hall = hall.substring(0 , hall.indexOf("厅")) + if(StringUtils.isNotBlank(hall) && hall.indexOf("鍘�") > -1){ + String toilet = hall.substring(hall.indexOf("鍘�") + 1) + hall = hall.substring(0 , hall.indexOf("鍘�")) ma=pa.matcher(hall) if(ma.find()){ hall = ma.group(1) @@ -124,11 +124,11 @@ public class Net58SellPublisher implements Publishable { obj.put("hall", hall.trim().toInteger()) } - if(StringUtils.isNotBlank(toilet) && toilet.indexOf("卫") > -1){ - if(toilet.indexOf("厨") > -1){ - toilet = toilet.substring(toilet.indexOf("厨") + 1) + if(StringUtils.isNotBlank(toilet) && toilet.indexOf("鍗�") > -1){ + if(toilet.indexOf("鍘�") > -1){ + toilet = toilet.substring(toilet.indexOf("鍘�") + 1) } - toilet = toilet.substring(0 , toilet.indexOf("卫")) + toilet = toilet.substring(0 , toilet.indexOf("鍗�")) ma=pa.matcher(toilet) if(ma.find()){ toilet = ma.group(1) @@ -220,10 +220,10 @@ public class Net58SellPublisher implements Publishable { if(dataMap.get("contact_people") != null) { String people = dataMap.get("contact_people") - if(people.indexOf("产权性质") > -1) { - people = StringUtils.substringBetween(people, ":", "产权性质") + if(people.indexOf("浜ф潈鎬ц川") > -1) { + people = StringUtils.substringBetween(people, "锛�", "浜ф潈鎬ц川") }else { - people = people.replace("联 系 人:", "") + people = people.replace("鑱� 绯� 浜猴細", "") } if(StringUtils.isNotBlank(people)){ obj.put('contact_people', people.trim()) @@ -231,7 +231,7 @@ public class Net58SellPublisher implements Publishable { } if(dataMap.get("address") != null) { - String addr = StringUtils.substringAfter(dataMap.get("address"), "地址:") + String addr = StringUtils.substringAfter(dataMap.get("address"), "鍦板潃锛�") if(addr.indexOf("(") > -1){ addr = addr.substring(0 , addr.indexOf("(")) } @@ -242,7 +242,7 @@ public class Net58SellPublisher implements Publishable { if(dataMap.get("location") != null) { String location = dataMap.get("location") - location = location.replace("位置:", "").trim() + location = location.replace("浣嶇疆锛�", "").trim() String[] arrs = location.split("-") if(arrs.length == 2) { obj.put("region", arrs[0].replaceAll("\\s", "").trim()) @@ -264,7 +264,7 @@ public class Net58SellPublisher implements Publishable { String districtName = obj.get('district_name'); if(districtName) { districtName = DataUtil.encoding(districtName).replace("?", ""); - districtName = StringUtils.substringBefore(districtName, "(").replaceAll("\\s", "").replace("?", "") + districtName = StringUtils.substringBefore(districtName, "锛�").replaceAll("\\s", "").replace("?", "") if(StringUtils.isNotBlank(districtName)){ districtName = trimChar(districtName) obj.put("district_name", districtName.trim()) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/Net58ShopRentPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/Net58ShopRentPublisher.groovy index 67d69d5fd..9d2f23ac7 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/Net58ShopRentPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/Net58ShopRentPublisher.groovy @@ -15,8 +15,8 @@ public class Net58ShopRentPublisher implements Publishable { public static final List JOB_ID = ["5444c162e4b00d761b1a3f45"]; public static final Map CONFIG = [ - match_address:true, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:true, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -63,23 +63,23 @@ public class Net58ShopRentPublisher implements Publishable { } def avg_price = dataMap.get("avg_price"); - if(avg_price.indexOf(":") > -1) { - avg_price = StringUtils.substringAfterLast(avg_price, ":") + if(avg_price.indexOf("锛�") > -1) { + avg_price = StringUtils.substringAfterLast(avg_price, "锛�") } if(area && avg_price){ def data = dataMap.get("avg_price"); - if(data.indexOf("售价")!=-1 && dataMap.get("cat").toString()=="shop_sell"){ - if(avg_price.indexOf("万元")!=-1){ - def price = avg_price.replace("万元", "").trim().toDouble() + if(data.indexOf("鍞环")!=-1 && dataMap.get("cat").toString()=="shop_sell"){ + if(avg_price.indexOf("涓囧厓")!=-1){ + def price = avg_price.replace("涓囧厓", "").trim().toDouble() def total_price = price * 10000; if(total_price != null && total_price.toString().length() < 9){ obj.put("total_price", total_price.toInteger()); } } }else{ - if(avg_price.indexOf("元/㎡/天")!=-1){ - def price = avg_price.replace("元/㎡/天", "").trim() + if(avg_price.indexOf("鍏�/銕�/澶�")!=-1){ + def price = avg_price.replace("鍏�/銕�/澶�", "").trim() Pattern pa=Pattern.compile("(\\d+)") Matcher ma=pa.matcher(price) if(ma.find()){ @@ -94,8 +94,8 @@ public class Net58ShopRentPublisher implements Publishable { obj.put("total_price", total_price.toInteger()); } } - }else if(avg_price.indexOf("元/月")!=-1){ - String price = avg_price.replace("元/月", "").trim() + }else if(avg_price.indexOf("鍏�/鏈�")!=-1){ + String price = avg_price.replace("鍏�/鏈�", "").trim() Pattern pa=Pattern.compile("(\\d+)") Matcher ma=pa.matcher(price) if(ma.find()){ @@ -115,12 +115,12 @@ public class Net58ShopRentPublisher implements Publishable { } if(dataMap.get("address") != null) { - String addr = StringUtils.substringAfter(dataMap.get("address"), "地址:") + String addr = StringUtils.substringAfter(dataMap.get("address"), "鍦板潃锛�") obj.put("address", addr) } if(dataMap.get("region") != null) { - String regionStr = dataMap.get("region").toString().replace("区域:",""); + String regionStr = dataMap.get("region").toString().replace("鍖哄煙锛�",""); if(regionStr) { String unicode = new String(regionStr.getBytes( "UTF-8"),"UTF-8"); String gbk = new String(unicode.getBytes("GBK")); @@ -134,7 +134,7 @@ public class Net58ShopRentPublisher implements Publishable { if(dataMap.get("kind")){ String estate_type = dataMap.get("kind") - estate_type = estate_type.replace("类型:", "") + estate_type = estate_type.replace("绫诲瀷锛�", "") if(StringUtils.isNotBlank(estate_type)){ obj.put("estate_type", estate_type.trim()) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/Net58ShopSellPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/Net58ShopSellPublisher.groovy index 32d17072a..50918b10e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/Net58ShopSellPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/Net58ShopSellPublisher.groovy @@ -15,8 +15,8 @@ public class Net58ShopSellPublisher implements Publishable { public static final List JOB_ID = ["53327aece4b0370f56553b87"]; public static final Map CONFIG = [ - match_address:true, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:true, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -63,8 +63,8 @@ public class Net58ShopSellPublisher implements Publishable { } def avg_price = dataMap.get("avg_price"); - if(avg_price.toString().indexOf(":") > -1) { - avg_price = StringUtils.substringAfterLast(avg_price, ":") + if(avg_price.toString().indexOf("锛�") > -1) { + avg_price = StringUtils.substringAfterLast(avg_price, "锛�") } if(area && avg_price){ @@ -88,12 +88,12 @@ public class Net58ShopSellPublisher implements Publishable { } if(dataMap.get("address") != null) { - String addr = StringUtils.substringAfter(dataMap.get("address"), "地址:") + String addr = StringUtils.substringAfter(dataMap.get("address"), "鍦板潃锛�") obj.put("address", addr) } if(dataMap.get("region") != null) { - String regionStr = dataMap.get("region").toString().replace("区域:",""); + String regionStr = dataMap.get("region").toString().replace("鍖哄煙锛�",""); if(regionStr) { String unicode = new String(regionStr.getBytes( "UTF-8"),"UTF-8"); String gbk = new String(unicode.getBytes("GBK")); @@ -107,7 +107,7 @@ public class Net58ShopSellPublisher implements Publishable { if(dataMap.get("kind")){ String estate_type = dataMap.get("kind") - estate_type = estate_type.replace("类型:", "") + estate_type = estate_type.replace("绫诲瀷锛�", "") if(StringUtils.isNotBlank(estate_type)){ obj.put("estate_type", estate_type.trim()) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/NetBaixingRentPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/NetBaixingRentPublisher.groovy index 229a456fe..c07484bec 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/NetBaixingRentPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/NetBaixingRentPublisher.groovy @@ -31,8 +31,8 @@ public class NetBaixingRentPublisher implements Publishable { public static final List JOB_ID = ["50ff7e53e4b0bc9fcbe0813a"]; public static final Map CONFIG = [ - match_address:true, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:true, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -73,8 +73,8 @@ public class NetBaixingRentPublisher implements Publishable { if(dataMap.get("address_info") != null) { String addressInfo = dataMap.get("address_info"); if(StringUtils.isNotBlank(addressInfo)) { - addressInfo = addressInfo.replace("[地图]", ""); - String region = StringUtils.substringBetween(addressInfo, ":", "-"); + addressInfo = addressInfo.replace("[鍦板浘]", ""); + String region = StringUtils.substringBetween(addressInfo, "锛�", "-"); obj.put("region", DataUtil.encoding(region).trim()) int first = addressInfo.lastIndexOf("-")+1; if(first){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/OfficeseOfficeRentPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/OfficeseOfficeRentPublisher.groovy index c133f3102..fe54f321a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/OfficeseOfficeRentPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/OfficeseOfficeRentPublisher.groovy @@ -17,8 +17,8 @@ public class OfficeseOfficeRentPublisher implements Publishable { public static final List JOB_ID = ["5346392be4b04c1b88cfcd6a"]; public static final Map CONFIG = [ - match_address:true, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:true, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -46,9 +46,9 @@ public class OfficeseOfficeRentPublisher implements Publishable { if(dataMap.get("region")){ String region = dataMap.get("region") - if(region.indexOf("物业区域:") > -1){ - region = region.replace("物业区域:", "") - } else if(region.indexOf("物业地址:") > -1){ + if(region.indexOf("鐗╀笟鍖哄煙锛�") > -1){ + region = region.replace("鐗╀笟鍖哄煙锛�", "") + } else if(region.indexOf("鐗╀笟鍦板潃锛�") > -1){ if(region.indexOf("[") > -1){ region = region.substring(region.indexOf("[") + 1 , region.indexOf("]")) } else { @@ -57,17 +57,17 @@ public class OfficeseOfficeRentPublisher implements Publishable { } obj.put("region", region) } - obj.put("name", dataMap.get("name").toString().replace("详细资料", "")) - obj.put("district_name", dataMap.get("district_name").toString().replace("详细资料", "")) + obj.put("name", dataMap.get("name").toString().replace("璇︾粏璧勬枡", "")) + obj.put("district_name", dataMap.get("district_name").toString().replace("璇︾粏璧勬枡", "")) if(dataMap.get("address")){ String address = dataMap.get("address") - if(address.indexOf("物业地址:") > -1){ - address = address.replace("物业地址:", "") - if(address.indexOf("查看地图 >") > -1){ - address = address.replace("查看地图 >", "") + if(address.indexOf("鐗╀笟鍦板潃锛�") > -1){ + address = address.replace("鐗╀笟鍦板潃锛�", "") + if(address.indexOf("鏌ョ湅鍦板浘 >") > -1){ + address = address.replace("鏌ョ湅鍦板浘 >", "") } else if(address.indexOf("]") > -1){ - address = address.substring(address.indexOf("]") + 1).replace("查看地图", "") + address = address.substring(address.indexOf("]") + 1).replace("鏌ョ湅鍦板浘", "") } } obj.put("address", address) @@ -76,15 +76,15 @@ public class OfficeseOfficeRentPublisher implements Publishable { if(dataMap.get("estate_type")){ String estateType2 = dataMap.get("estate_type") - if(estateType2.indexOf("物业类型:") > -1){ - estateType2 = estateType2.replace("物业类型:", "") + if(estateType2.indexOf("鐗╀笟绫诲瀷锛�") > -1){ + estateType2 = estateType2.replace("鐗╀笟绫诲瀷锛�", "") } obj.put("estate_type", estateType2) } if(dataMap.get("standard_area")){ String area = dataMap.get("standard_area") - area = area.replace("单层面积:", "").replace("平米", "").replace(",","").trim() + area = area.replace("鍗曞眰闈㈢Н锛�", "").replace("骞崇背", "").replace(",","").trim() if(area != null){ Pattern pa=Pattern.compile("(\\d+)") Matcher ma=pa.matcher(area) @@ -103,7 +103,7 @@ public class OfficeseOfficeRentPublisher implements Publishable { String rentPrice = dataMap.get("rent_price") if(rentPrice.indexOf("-") > -1){ rentPrice = rentPrice.substring(0 , rentPrice.indexOf("-")) - } else if(rentPrice.indexOf("租金:") > -1){ + } else if(rentPrice.indexOf("绉熼噾锛�") > -1){ Pattern pa=Pattern.compile("(\\d+)") Matcher ma=pa.matcher(rentPrice) if(ma.find()){ @@ -115,7 +115,7 @@ public class OfficeseOfficeRentPublisher implements Publishable { rentPrice = null } if(rentPrice != null){ - rentPrice = rentPrice.replace("租金:", "") + rentPrice = rentPrice.replace("绉熼噾锛�", "") if(obj.get("area") != null && StringUtils.isNotEmpty(obj.get("area").toString()) && StringUtils.isNotBlank(rentPrice)){ rentPrice = (Integer)(rentPrice.toDouble() * obj.get("area") * 30) @@ -137,13 +137,13 @@ public class OfficeseOfficeRentPublisher implements Publishable { if(dataMap.get("estate_charge")){ String estateCharge = dataMap.get("estate_charge") - if(estateCharge.indexOf("物业费:") > -1){ - estateCharge = estateCharge.replace("物业费:", "").trim() - } else if(estateCharge.indexOf("物业费用:") > -1){ - estateCharge = estateCharge.replace("物业费用:", "").trim() + if(estateCharge.indexOf("鐗╀笟璐癸細") > -1){ + estateCharge = estateCharge.replace("鐗╀笟璐癸細", "").trim() + } else if(estateCharge.indexOf("鐗╀笟璐圭敤锛�") > -1){ + estateCharge = estateCharge.replace("鐗╀笟璐圭敤锛�", "").trim() } - if(estateCharge.indexOf("元/") == 0){ + if(estateCharge.indexOf("鍏�/") == 0){ estateCharge = null } obj.put("estate_charge", estateCharge) @@ -158,7 +158,7 @@ public class OfficeseOfficeRentPublisher implements Publishable { if(dataMap.get("publish_date")) { String publishDate = dataMap.get("publish_date") - publishDate = publishDate.replace("最后更新:", "") + publishDate = publishDate.replace("鏈�鍚庢洿鏂�:", "") try { obj.put("publish_date", DateUtil.parseDate(publishDate, "yyyy-MM-dd")) }catch(Exception e) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/PublisherStarter.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/PublisherStarter.groovy index c8be14496..c15148fd8 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/PublisherStarter.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/PublisherStarter.groovy @@ -6,7 +6,7 @@ import com.fangjia.script.Watcher; import com.fangjia.script.util.SingleProcess /** - * datastore数据发布 + * datastore鏁版嵁鍙戝竷 * @author xiaoyu * */ @@ -14,75 +14,75 @@ import com.fangjia.script.util.SingleProcess class PublisherStarter { public static List publishables = new ArrayList(); static { - // 住宅 -// publishables.add(new AnjukeSellPublisher()); //安居客二手房发布 -// publishables.add(new SoufunSellPublisher()); //搜房二手房 -// publishables.add(new KoofangSellPublisher()); //酷房二手房 -// publishables.add(new HomelinkSellPublisher()); //链家二手房 -// publishables.add(new FocusSellPublisher()); //焦点二手房 -// publishables.add(new TaofwSellPublisher()); //淘房网二手房 -// publishables.add(new Net58SellPublisher()); //58二手房 -// publishables.add(new GanjiSellPublisher()); //赶集二手房 -// publishables.add(new BaiduSellPublisher()); //百度乐居二手房 -// publishables.add(new JiwuSellPublisher()); //吉屋网二手房 -// publishables.add(new LoupanSellPublisher()); //楼盘网二手房 -// publishables.add(new HaofangSellPublisher()); //好房在线二手房 -// publishables.add(new WoaiwojiaSellPublisher()); //我爱我家二手房 -// publishables.add(new Yes515SellPublisher()); //515房产网二手房 + // 浣忓畢 +// publishables.add(new AnjukeSellPublisher()); //瀹夊眳瀹簩鎵嬫埧鍙戝竷 +// publishables.add(new SoufunSellPublisher()); //鎼滄埧浜屾墜鎴� +// publishables.add(new KoofangSellPublisher()); //閰锋埧浜屾墜鎴� +// publishables.add(new HomelinkSellPublisher()); //閾惧浜屾墜鎴� +// publishables.add(new FocusSellPublisher()); //鐒︾偣浜屾墜鎴� +// publishables.add(new TaofwSellPublisher()); //娣樻埧缃戜簩鎵嬫埧 +// publishables.add(new Net58SellPublisher()); //58浜屾墜鎴� +// publishables.add(new GanjiSellPublisher()); //璧堕泦浜屾墜鎴� +// publishables.add(new BaiduSellPublisher()); //鐧惧害涔愬眳浜屾墜鎴� +// publishables.add(new JiwuSellPublisher()); //鍚夊眿缃戜簩鎵嬫埧 +// publishables.add(new LoupanSellPublisher()); //妤肩洏缃戜簩鎵嬫埧 +// publishables.add(new HaofangSellPublisher()); //濂芥埧鍦ㄧ嚎浜屾墜鎴� +// publishables.add(new WoaiwojiaSellPublisher()); //鎴戠埍鎴戝浜屾墜鎴� +// publishables.add(new Yes515SellPublisher()); //515鎴夸骇缃戜簩鎵嬫埧 // -// publishables.add(new Net58RentPublisher()); //58租房 -// publishables.add(new GanjiRentPublisher()); //赶集租房 -// publishables.add(new SoufunRentPublisher()); //搜房网租房 -// publishables.add(new BaiduRentPublisher()); //百度乐居租房 -// publishables.add(new AnjukeRentPublisher()); //安居客租房 -// publishables.add(new LoupanRentPublisher()); //楼盘网租房 -// publishables.add(new TaofwRentPublisher()); //淘房网租房 -// publishables.add(new HaofangRentPublisher()); //好房在线租房 -// publishables.add(new WoaiwojiaRentPublisher()); //我爱我家租房 -// publishables.add(new JintiRentPublisher()); //今题网租房 -// publishables.add(new Yes515RentPublisher()); //515房产网租房 +// publishables.add(new Net58RentPublisher()); //58绉熸埧 +// publishables.add(new GanjiRentPublisher()); //璧堕泦绉熸埧 +// publishables.add(new SoufunRentPublisher()); //鎼滄埧缃戠鎴� +// publishables.add(new BaiduRentPublisher()); //鐧惧害涔愬眳绉熸埧 +// publishables.add(new AnjukeRentPublisher()); //瀹夊眳瀹㈢鎴� +// publishables.add(new LoupanRentPublisher()); //妤肩洏缃戠鎴� +// publishables.add(new TaofwRentPublisher()); //娣樻埧缃戠鎴� +// publishables.add(new HaofangRentPublisher()); //濂芥埧鍦ㄧ嚎绉熸埧 +// publishables.add(new WoaiwojiaRentPublisher()); //鎴戠埍鎴戝绉熸埧 +// publishables.add(new JintiRentPublisher()); //浠婇缃戠鎴� +// publishables.add(new Yes515RentPublisher()); //515鎴夸骇缃戠鎴� // -// // 商铺 -// publishables.add(new AnjukeShopRentPublisher()); //安居客商铺出租 -// publishables.add(new SoufunShopRentPublisher()); //搜房商铺出租 -// publishables.add(new GanjiShopRentPublisher()); //赶集商铺出租 -// publishables.add(new HaopooShopRentPublisher()); //好铺网商铺出租 -// publishables.add(new HaofangShopRentPublisher()); //好房在线商铺出租 -// publishables.add(new ZufangShopRentPublisher()); //租房网商铺出租 -// publishables.add(new Net58ShopRentPublisher()); //58商铺出租 +// // 鍟嗛摵 +// publishables.add(new AnjukeShopRentPublisher()); //瀹夊眳瀹㈠晢閾哄嚭绉� +// publishables.add(new SoufunShopRentPublisher()); //鎼滄埧鍟嗛摵鍑虹 +// publishables.add(new GanjiShopRentPublisher()); //璧堕泦鍟嗛摵鍑虹 +// publishables.add(new HaopooShopRentPublisher()); //濂介摵缃戝晢閾哄嚭绉� +// publishables.add(new HaofangShopRentPublisher()); //濂芥埧鍦ㄧ嚎鍟嗛摵鍑虹 +// publishables.add(new ZufangShopRentPublisher()); //绉熸埧缃戝晢閾哄嚭绉� +// publishables.add(new Net58ShopRentPublisher()); //58鍟嗛摵鍑虹 // -// publishables.add(new AnjukeShopSellPublisher()); //安居客商铺出售 -// publishables.add(new WoyaozupuShopSellPublisher()); //我要租铺商铺出售 -// publishables.add(new HaopooShopSellPublisher()); //好铺网商铺出售 -// publishables.add(new HaofangShopSellPublisher()); //好房在线商铺出售 -// publishables.add(new JintiShopSellPublisher()); //今题网商铺出售 - publishables.add(new SoufunShopSellPublisher()); //搜房商铺出售 -// publishables.add(new GanjiShopSellPublisher()); //赶集商铺出售 -// publishables.add(new Net58ShopSellPublisher()); //58商铺出售 -// //publishables.add(new CzfcwShopSellPublisher()); //常州房产网商铺出售 +// publishables.add(new AnjukeShopSellPublisher()); //瀹夊眳瀹㈠晢閾哄嚭鍞� +// publishables.add(new WoyaozupuShopSellPublisher()); //鎴戣绉熼摵鍟嗛摵鍑哄敭 +// publishables.add(new HaopooShopSellPublisher()); //濂介摵缃戝晢閾哄嚭鍞� +// publishables.add(new HaofangShopSellPublisher()); //濂芥埧鍦ㄧ嚎鍟嗛摵鍑哄敭 +// publishables.add(new JintiShopSellPublisher()); //浠婇缃戝晢閾哄嚭鍞� + publishables.add(new SoufunShopSellPublisher()); //鎼滄埧鍟嗛摵鍑哄敭 +// publishables.add(new GanjiShopSellPublisher()); //璧堕泦鍟嗛摵鍑哄敭 +// publishables.add(new Net58ShopSellPublisher()); //58鍟嗛摵鍑哄敭 +// //publishables.add(new CzfcwShopSellPublisher()); //甯稿窞鎴夸骇缃戝晢閾哄嚭鍞� //// -//// // 写字楼 -//// publishables.add(new OfficeseOfficeRentPublisher()); //中华写字楼出租 -// publishables.add(new AnjukeOfficeRentPublisher()); //安居客写字楼出租 -// publishables.add(new SoufunOfficeRentPublisher()); //搜房写字楼出租 -// publishables.add(new GanjiOfficeRentPublisher()); //赶集写字楼出租 -// publishables.add(new Net58OfficeRentPublisher()); //58写字楼出租 -// publishables.add(new SinaOfficeRentPublisher()); //新浪乐居写字楼出租 -// publishables.add(new ChineseofficeOfficeRentPublisher()); //中国写字楼出租 -// publishables.add(new Qd8OfficeRentPublisher()); //快点8写字楼出租 -// publishables.add(new FangziOfficeRentPublisher()); //北京写字楼出租 -// publishables.add(new ZufangOfficeRentPublisher()); //租房网写字楼出租 +//// // 鍐欏瓧妤� +//// publishables.add(new OfficeseOfficeRentPublisher()); //涓崕鍐欏瓧妤煎嚭绉� +// publishables.add(new AnjukeOfficeRentPublisher()); //瀹夊眳瀹㈠啓瀛楁ゼ鍑虹 +// publishables.add(new SoufunOfficeRentPublisher()); //鎼滄埧鍐欏瓧妤煎嚭绉� +// publishables.add(new GanjiOfficeRentPublisher()); //璧堕泦鍐欏瓧妤煎嚭绉� +// publishables.add(new Net58OfficeRentPublisher()); //58鍐欏瓧妤煎嚭绉� +// publishables.add(new SinaOfficeRentPublisher()); //鏂版氮涔愬眳鍐欏瓧妤煎嚭绉� +// publishables.add(new ChineseofficeOfficeRentPublisher()); //涓浗鍐欏瓧妤煎嚭绉� +// publishables.add(new Qd8OfficeRentPublisher()); //蹇偣8鍐欏瓧妤煎嚭绉� +// publishables.add(new FangziOfficeRentPublisher()); //鍖椾含鍐欏瓧妤煎嚭绉� +// publishables.add(new ZufangOfficeRentPublisher()); //绉熸埧缃戝啓瀛楁ゼ鍑虹 // -// publishables.add(new AnjukeOfficeSellPublisher()); //安居客写字楼出售 -// publishables.add(new SoufunOfficeSellPublisher()); //搜房写字楼出售 -// publishables.add(new GanjiOfficeSellPublisher()); //赶集写字楼出售 -// publishables.add(new Net58OfficeSellPublisher()); //58写字楼出售 -// publishables.add(new House365OfficeSellPublisher()); //365地产家居网写字楼出售 -// publishables.add(new ChineseofficeOfficeSellPublisher()); //中国写字楼出售 -// publishables.add(new Qd8OfficeSellPublisher()); //快点8写字楼出售 -// publishables.add(new JintiOfficeSellPublisher()); //今题网写字楼出售 -//// publishables.add(new SinaOfficeSellPublisher()); //新浪乐居写字楼出售 -//// publishables.add(new FangziOfficeSellPublisher()); //北京写字楼出售 +// publishables.add(new AnjukeOfficeSellPublisher()); //瀹夊眳瀹㈠啓瀛楁ゼ鍑哄敭 +// publishables.add(new SoufunOfficeSellPublisher()); //鎼滄埧鍐欏瓧妤煎嚭鍞� +// publishables.add(new GanjiOfficeSellPublisher()); //璧堕泦鍐欏瓧妤煎嚭鍞� +// publishables.add(new Net58OfficeSellPublisher()); //58鍐欏瓧妤煎嚭鍞� +// publishables.add(new House365OfficeSellPublisher()); //365鍦颁骇瀹跺眳缃戝啓瀛楁ゼ鍑哄敭 +// publishables.add(new ChineseofficeOfficeSellPublisher()); //涓浗鍐欏瓧妤煎嚭鍞� +// publishables.add(new Qd8OfficeSellPublisher()); //蹇偣8鍐欏瓧妤煎嚭鍞� +// publishables.add(new JintiOfficeSellPublisher()); //浠婇缃戝啓瀛楁ゼ鍑哄敭 +//// publishables.add(new SinaOfficeSellPublisher()); //鏂版氮涔愬眳鍐欏瓧妤煎嚭鍞� +//// publishables.add(new FangziOfficeSellPublisher()); //鍖椾含鍐欏瓧妤煎嚭鍞� } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/Qd8OfficeRentPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/Qd8OfficeRentPublisher.groovy index cd2be701f..2faca5866 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/Qd8OfficeRentPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/Qd8OfficeRentPublisher.groovy @@ -15,8 +15,8 @@ class Qd8OfficeRentPublisher implements Publishable { public static final List JOB_ID = ["53f701f0e4b09e392f5b7343"]; public static final Map CONFIG = [ - match_address:true, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:true, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -46,7 +46,7 @@ class Qd8OfficeRentPublisher implements Publishable { String region = dataMap.get("region") String[] regionArr = region.split(">") if(regionArr.length >= 5){ - region = regionArr[4].replace("写字楼出租", "").trim() + region = regionArr[4].replace("鍐欏瓧妤煎嚭绉�", "").trim() } else { region = null } @@ -60,8 +60,8 @@ class Qd8OfficeRentPublisher implements Publishable { if(dataMap.get("address")){ String address = dataMap.get("address") - if(address.lastIndexOf("联系地址:") > -1){ - address = address.substring(address.lastIndexOf("联系地址:") + 5).trim() + if(address.lastIndexOf("鑱旂郴鍦板潃锛�") > -1){ + address = address.substring(address.lastIndexOf("鑱旂郴鍦板潃锛�") + 5).trim() } else { address = null } @@ -72,8 +72,8 @@ class Qd8OfficeRentPublisher implements Publishable { if(dataMap.get("area")){ String area = dataMap.get("area") - if(area.indexOf("面积:") > -1){ - area = area.substring(area.indexOf("面积:") + 3) + if(area.indexOf("闈㈢Н锛�") > -1){ + area = area.substring(area.indexOf("闈㈢Н锛�") + 3) area = area.replace(",", "") Pattern pa=Pattern.compile("(\\d+)") Matcher ma=pa.matcher(area) @@ -92,15 +92,15 @@ class Qd8OfficeRentPublisher implements Publishable { if(dataMap.get("total_price")){ String totalPrice = dataMap.get("total_price") - totalPrice = totalPrice.replace("租金:", "") + totalPrice = totalPrice.replace("绉熼噾锛�", "") totalPrice = trimChar(totalPrice) - totalPrice = totalPrice.replace("面议", "").trim() + totalPrice = totalPrice.replace("闈㈣", "").trim() if(StringUtils.isNotBlank(totalPrice)){ - if(totalPrice.indexOf("元/月") > -1){ - totalPrice = totalPrice.replace("元/月", "").trim() - } else if(totalPrice.indexOf("元/㎡·天") > -1 || totalPrice.indexOf("元/m2/天") > -1) { - totalPrice = totalPrice.replace("元/㎡·天","").replace("元/m2/天","").trim() + if(totalPrice.indexOf("鍏�/鏈�") > -1){ + totalPrice = totalPrice.replace("鍏�/鏈�", "").trim() + } else if(totalPrice.indexOf("鍏�/銕÷峰ぉ") > -1 || totalPrice.indexOf("鍏�/m2/澶�") > -1) { + totalPrice = totalPrice.replace("鍏�/銕÷峰ぉ","").replace("鍏�/m2/澶�","").trim() if(obj.get("area") != null && StringUtils.isNotBlank(totalPrice)){ totalPrice = (obj.get("area") * totalPrice.toDouble() * 30).toString() } @@ -125,11 +125,11 @@ class Qd8OfficeRentPublisher implements Publishable { } - obj.put("estate_type", "写字楼") + obj.put("estate_type", "鍐欏瓧妤�") if(dataMap.get("district_name")){ String districtName = dataMap.get("district_name") - districtName = districtName.replace("写字楼名称:", "").trim() + districtName = districtName.replace("鍐欏瓧妤煎悕绉帮細", "").trim() if(StringUtils.isNotBlank(districtName)){ districtName = trimChar(districtName) obj.put("district_name", districtName.trim()) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/Qd8OfficeSellPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/Qd8OfficeSellPublisher.groovy index 1a139fc6f..1760a9c4a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/Qd8OfficeSellPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/Qd8OfficeSellPublisher.groovy @@ -15,8 +15,8 @@ class Qd8OfficeSellPublisher implements Publishable { public static final List JOB_ID = ["53f70c07e4b09e392f5b7359"]; public static final Map CONFIG = [ - match_address:true, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:true, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -60,8 +60,8 @@ class Qd8OfficeSellPublisher implements Publishable { if(dataMap.get("address")){ String address = dataMap.get("address") - if(address.lastIndexOf("联系地址:") > -1){ - address = address.substring(address.lastIndexOf("联系地址:") + 5).trim() + if(address.lastIndexOf("鑱旂郴鍦板潃锛�") > -1){ + address = address.substring(address.lastIndexOf("鑱旂郴鍦板潃锛�") + 5).trim() } else { address = null } @@ -103,11 +103,11 @@ class Qd8OfficeSellPublisher implements Publishable { } - obj.put("estate_type", "写字楼") + obj.put("estate_type", "鍐欏瓧妤�") if(dataMap.get("district_name")){ String districtName = dataMap.get("district_name") - districtName = districtName.replace("写字楼名称:", "").trim() + districtName = districtName.replace("鍐欏瓧妤煎悕绉帮細", "").trim() if(StringUtils.isNotBlank(districtName)){ districtName = trimChar(districtName) obj.put("district_name", districtName.trim()) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/RentDatastorePublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/RentDatastorePublisher.groovy index 7769ee236..2a44dbe77 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/RentDatastorePublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/RentDatastorePublisher.groovy @@ -162,7 +162,7 @@ public class RentDatastorePublisher { code = ShopSellDataFilter.isAviable(dbo) } - //code小于12的选项为必填字段 + //code灏忎簬12鐨勯�夐」涓哄繀濉瓧娈� if(code > 0 && code <= 12) { METADATA_COLL.remove(new BasicDBObject("_id", metadata.get('_id'))) increaseHousesGrabErrCount(jobId); @@ -176,10 +176,10 @@ public class RentDatastorePublisher { updateToDatastore(((DBObject)cres).get('_id'), dbo) logInfo("${jobId} ${publishable.getClass().getSimpleName()} update ${url}") }else { - if(cres == 0) {//seabird没有该url信息 + if(cres == 0) {//seabird娌℃湁璇rl淇℃伅 saveToData(dbo) logInfo("${jobId} ${publishable.getClass().getSimpleName()} save ${url}") - }else if(cres == 2) {//发布时间相隔小于3天 即不做任何处理 + }else if(cres == 2) {//鍙戝竷鏃堕棿鐩搁殧灏忎簬3澶� 鍗充笉鍋氫换浣曞鐞� logInfo("${jobId} ${publishable.getClass().getSimpleName()} exist ${url}") } } @@ -196,10 +196,10 @@ public class RentDatastorePublisher { } /** - * 对metadata和seabird对比 - * 2-发布时间相隔小于1天 即不做任何处理 - * 1-发布时间相隔大于1天 即更新 - * 0-seabird没有该url信息 + * 瀵筸etadata鍜宻eabird瀵规瘮 + * 2-鍙戝竷鏃堕棿鐩搁殧灏忎簬1澶� 鍗充笉鍋氫换浣曞鐞� + * 1-鍙戝竷鏃堕棿鐩搁殧澶т簬1澶� 鍗虫洿鏂� + * 0-seabird娌℃湁璇rl淇℃伅 */ private int comparedResult(DBObject dbo) { String url = dbo.get("url") @@ -218,10 +218,10 @@ public class RentDatastorePublisher { } /** - * 对metadata和seabird对比 - * 2-发布时间相隔小于3天 即不做任何处理 - * 1-发布时间相隔大于3天 即更新 - * 0-seabird没有该url信息 + * 瀵筸etadata鍜宻eabird瀵规瘮 + * 2-鍙戝竷鏃堕棿鐩搁殧灏忎簬3澶� 鍗充笉鍋氫换浣曞鐞� + * 1-鍙戝竷鏃堕棿鐩搁殧澶т簬3澶� 鍗虫洿鏂� + * 0-seabird娌℃湁璇rl淇℃伅 */ private Object comparedResult2(DBObject dbo) { String urlMd5 = DigestUtils.md5Hex(dbo.get('url')) @@ -464,10 +464,10 @@ public class RentDatastorePublisher { ret.put(it.name(), it.toMap()) } }else{ - logWarn('!!!请使用'+clazz.getName()+'注解标明本Batch的拥有者!!!') + logWarn('锛侊紒锛佽浣跨敤'+clazz.getName()+'娉ㄨВ鏍囨槑鏈珺atch鐨勬嫢鏈夎�咃紒锛侊紒') } }catch(Exception e) { - logWarn('!!!请使用'+clazz.getName()+'注解标明本Batch的拥有者!!!', e) + logWarn('锛侊紒锛佽浣跨敤'+clazz.getName()+'娉ㄨВ鏍囨槑鏈珺atch鐨勬嫢鏈夎�咃紒锛侊紒', e) } return ret } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/RentPublisherStarter.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/RentPublisherStarter.groovy index 5222d184f..a35e57317 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/RentPublisherStarter.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/RentPublisherStarter.groovy @@ -6,7 +6,7 @@ import com.fangjia.script.Watcher; import com.fangjia.script.util.SingleProcess /** - * datastore数据发布 + * datastore鏁版嵁鍙戝竷 * @author xiaoyu * */ @@ -14,22 +14,22 @@ import com.fangjia.script.util.SingleProcess class RentPublisherStarter { public static List publishables = new ArrayList(); static { - // 租房 - publishables.add(new Net58RentPublisher()); //58租房 - publishables.add(new GanjiRentPublisher()); //赶集租房 - publishables.add(new SoufunRentPublisher()); //搜房网租房 - publishables.add(new BaiduRentPublisher()); //百度乐居租房 - publishables.add(new AnjukeRentPublisher()); //安居客租房 - publishables.add(new LoupanRentPublisher()); //楼盘网租房 - publishables.add(new TaofwRentPublisher()); //淘房网租房 - publishables.add(new HaofangRentPublisher()); //好房在线租房 - publishables.add(new WoaiwojiaRentPublisher()); //我爱我家租房 - publishables.add(new JintiRentPublisher()); //今题网租房 - publishables.add(new Yes515RentPublisher()); //515房产网租房 - publishables.add(new ZufangRentPublisher()); //租房网租房 - publishables.add(new DaikanRentPublisher()); //带看网租房 - publishables.add(new GoufangRentPublisher()); //购房网租房 - publishables.add(new BaixingRentPublisher()); //百姓网租房 + // 绉熸埧 + publishables.add(new Net58RentPublisher()); //58绉熸埧 + publishables.add(new GanjiRentPublisher()); //璧堕泦绉熸埧 + publishables.add(new SoufunRentPublisher()); //鎼滄埧缃戠鎴� + publishables.add(new BaiduRentPublisher()); //鐧惧害涔愬眳绉熸埧 + publishables.add(new AnjukeRentPublisher()); //瀹夊眳瀹㈢鎴� + publishables.add(new LoupanRentPublisher()); //妤肩洏缃戠鎴� + publishables.add(new TaofwRentPublisher()); //娣樻埧缃戠鎴� + publishables.add(new HaofangRentPublisher()); //濂芥埧鍦ㄧ嚎绉熸埧 + publishables.add(new WoaiwojiaRentPublisher()); //鎴戠埍鎴戝绉熸埧 + publishables.add(new JintiRentPublisher()); //浠婇缃戠鎴� + publishables.add(new Yes515RentPublisher()); //515鎴夸骇缃戠鎴� + publishables.add(new ZufangRentPublisher()); //绉熸埧缃戠鎴� + publishables.add(new DaikanRentPublisher()); //甯︾湅缃戠鎴� + publishables.add(new GoufangRentPublisher()); //璐埧缃戠鎴� + publishables.add(new BaixingRentPublisher()); //鐧惧缃戠鎴� } public static void main(String[] args) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/SellDataFilter.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/SellDataFilter.groovy index 9c083b114..a26bd5721 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/SellDataFilter.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/SellDataFilter.groovy @@ -53,12 +53,12 @@ public class SellDataFilter { Date publishDate = (Date)object.get("publish_date") - //发布时间异常 + //鍙戝竷鏃堕棿寮傚父 if(publishDate.before(SELL_START_DATE) || publishDate.after(DateUtil.getBeforeDay(new Date(), -30))) { return 12; } - //上面是必填项---------------------------------- + //涓婇潰鏄繀濉」---------------------------------- // if (object.get("floor") != null && (Integer) object.get("floor") <= -5) { // return 13; // } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/SellDatastorePublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/SellDatastorePublisher.groovy index 483a4f504..5cf8ca8d1 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/SellDatastorePublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/SellDatastorePublisher.groovy @@ -169,10 +169,10 @@ public class SellDatastorePublisher { updateToDatastore(((DBObject)cres).get('_id').toString(), dbo) logInfo("${jobId} ${publishable.getClass().getSimpleName()} update ${url}") }else { - if(cres == 0) {//seabird没有该url信息 + if(cres == 0) {//seabird娌℃湁璇rl淇℃伅 saveToData(dbo) logInfo("${jobId} ${publishable.getClass().getSimpleName()} save ${url}") - }else if(cres == 2) {//发布时间相隔小于3天 即不做任何处理 + }else if(cres == 2) {//鍙戝竷鏃堕棿鐩搁殧灏忎簬3澶� 鍗充笉鍋氫换浣曞鐞� logInfo("${jobId} ${publishable.getClass().getSimpleName()} exist ${url}") } } @@ -189,10 +189,10 @@ public class SellDatastorePublisher { } /** - * 对metadata和seabird对比 - * 2-发布时间相隔小于1天 即不做任何处理 - * 1-发布时间相隔大于1天 即更新 - * 0-seabird没有该url信息 + * 瀵筸etadata鍜宻eabird瀵规瘮 + * 2-鍙戝竷鏃堕棿鐩搁殧灏忎簬1澶� 鍗充笉鍋氫换浣曞鐞� + * 1-鍙戝竷鏃堕棿鐩搁殧澶т簬1澶� 鍗虫洿鏂� + * 0-seabird娌℃湁璇rl淇℃伅 */ private int comparedResult(DBObject dbo) { String url = dbo.get("url") @@ -212,10 +212,10 @@ public class SellDatastorePublisher { /** - * 对metadata和seabird对比 - * 2-发布时间相隔小于3天 即不做任何处理 - * 1-发布时间相隔大于3天 即更新 - * 0-seabird没有该url信息 + * 瀵筸etadata鍜宻eabird瀵规瘮 + * 2-鍙戝竷鏃堕棿鐩搁殧灏忎簬3澶� 鍗充笉鍋氫换浣曞鐞� + * 1-鍙戝竷鏃堕棿鐩搁殧澶т簬3澶� 鍗虫洿鏂� + * 0-seabird娌℃湁璇rl淇℃伅 */ private Object comparedResult2(DBObject dbo) { String urlMd5 = DigestUtils.md5Hex(dbo.get('url')) @@ -458,10 +458,10 @@ public class SellDatastorePublisher { ret.put(it.name(), it.toMap()) } }else{ - logWarn('!!!请使用'+clazz.getName()+'注解标明本Batch的拥有者!!!') + logWarn('锛侊紒锛佽浣跨敤'+clazz.getName()+'娉ㄨВ鏍囨槑鏈珺atch鐨勬嫢鏈夎�咃紒锛侊紒') } }catch(Exception e) { - logWarn('!!!请使用'+clazz.getName()+'注解标明本Batch的拥有者!!!', e) + logWarn('锛侊紒锛佽浣跨敤'+clazz.getName()+'娉ㄨВ鏍囨槑鏈珺atch鐨勬嫢鏈夎�咃紒锛侊紒', e) } return ret } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/SellPublisherStarter.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/SellPublisherStarter.groovy index c61bd136a..5ee151a79 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/SellPublisherStarter.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/SellPublisherStarter.groovy @@ -6,7 +6,7 @@ import com.fangjia.script.Watcher; import com.fangjia.script.util.SingleProcess /** - * datastore数据发布 + * datastore鏁版嵁鍙戝竷 * @author xiaoyu * */ @@ -14,25 +14,25 @@ import com.fangjia.script.util.SingleProcess class SellPublisherStarter { public static List publishables = new ArrayList(); static { - // 住宅 -// publishables.add(new AnjukeSellPublisher()); //安居客二手房发布 已写65 -// publishables.add(new SoufunSellPublisher()); //搜房二手房 已写65 -// publishables.add(new SoufunOfSmallCitySellPublisher()); //搜房小城市二手房 65 -// publishables.add(new KoofangSellPublisher()); //酷房二手房 65 - publishables.add(new HomelinkSellPublisher()); //链家二手房 没有发布时间 -// publishables.add(new FocusSellPublisher()); //焦点二手房 65 -// publishables.add(new TaofwSellPublisher()); //淘房网二手房 65 -// publishables.add(new Net58SellPublisher()); //58二手房 65 -// publishables.add(new GanjiSellPublisher()); //赶集二手房 65 -// publishables.add(new BaiduSellPublisher()); //百度乐居二手房 -// publishables.add(new JiwuSellPublisher()); //吉屋网二手房 65 -// publishables.add(new LoupanSellPublisher()); //楼盘网二手房 65 -// publishables.add(new HaofangSellPublisher()); //好房在线二手房 65 -// publishables.add(new WoaiwojiaSellPublisher()); //我爱我家二手房 65 -// publishables.add(new Yes515SellPublisher()); //515房产网二手房 65 -// publishables.add(new DaikanSellPublisher()); //带看网二手房 65 -// publishables.add(new BaixingSellPublisher()); //百姓网二手房 65 -// publishables.add(new SinaSellPublisher()); //新浪乐居二手房 65 + // 浣忓畢 +// publishables.add(new AnjukeSellPublisher()); //瀹夊眳瀹簩鎵嬫埧鍙戝竷 宸插啓65 +// publishables.add(new SoufunSellPublisher()); //鎼滄埧浜屾墜鎴� 宸插啓65 +// publishables.add(new SoufunOfSmallCitySellPublisher()); //鎼滄埧灏忓煄甯備簩鎵嬫埧 65 +// publishables.add(new KoofangSellPublisher()); //閰锋埧浜屾墜鎴� 65 + publishables.add(new HomelinkSellPublisher()); //閾惧浜屾墜鎴� 娌℃湁鍙戝竷鏃堕棿 +// publishables.add(new FocusSellPublisher()); //鐒︾偣浜屾墜鎴� 65 +// publishables.add(new TaofwSellPublisher()); //娣樻埧缃戜簩鎵嬫埧 65 +// publishables.add(new Net58SellPublisher()); //58浜屾墜鎴� 65 +// publishables.add(new GanjiSellPublisher()); //璧堕泦浜屾墜鎴� 65 +// publishables.add(new BaiduSellPublisher()); //鐧惧害涔愬眳浜屾墜鎴� +// publishables.add(new JiwuSellPublisher()); //鍚夊眿缃戜簩鎵嬫埧 65 +// publishables.add(new LoupanSellPublisher()); //妤肩洏缃戜簩鎵嬫埧 65 +// publishables.add(new HaofangSellPublisher()); //濂芥埧鍦ㄧ嚎浜屾墜鎴� 65 +// publishables.add(new WoaiwojiaSellPublisher()); //鎴戠埍鎴戝浜屾墜鎴� 65 +// publishables.add(new Yes515SellPublisher()); //515鎴夸骇缃戜簩鎵嬫埧 65 +// publishables.add(new DaikanSellPublisher()); //甯︾湅缃戜簩鎵嬫埧 65 +// publishables.add(new BaixingSellPublisher()); //鐧惧缃戜簩鎵嬫埧 65 +// publishables.add(new SinaSellPublisher()); //鏂版氮涔愬眳浜屾墜鎴� 65 } public static void main(String[] args) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/ShopAndOfficeDatastorePublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/ShopAndOfficeDatastorePublisher.groovy index 138eedc15..491398ce2 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/ShopAndOfficeDatastorePublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/ShopAndOfficeDatastorePublisher.groovy @@ -162,7 +162,7 @@ public class ShopAndOfficeDatastorePublisher { code = ShopSellDataFilter.isAviable(dbo) } - //code小于12的选项为必填字段 + //code灏忎簬12鐨勯�夐」涓哄繀濉瓧娈� if(code > 0 && code <= 12) { METADATA_COLL.remove(new BasicDBObject("_id", metadata.get('_id'))) increaseHousesGrabErrCount(jobId); @@ -176,10 +176,10 @@ public class ShopAndOfficeDatastorePublisher { updateToDatastore(((DBObject)cres).get('_id'), dbo) logInfo("${jobId} ${publishable.getClass().getSimpleName()} update ${url}") }else { - if(cres == 0) {//seabird没有该url信息 + if(cres == 0) {//seabird娌℃湁璇rl淇℃伅 saveToData(dbo) logInfo("${jobId} ${publishable.getClass().getSimpleName()} save ${url}") - }else if(cres == 2) {//发布时间相隔小于3天 即不做任何处理 + }else if(cres == 2) {//鍙戝竷鏃堕棿鐩搁殧灏忎簬3澶� 鍗充笉鍋氫换浣曞鐞� logInfo("${jobId} ${publishable.getClass().getSimpleName()} exist ${url}") } } @@ -196,10 +196,10 @@ public class ShopAndOfficeDatastorePublisher { } /** - * 对metadata和seabird对比 - * 2-发布时间相隔小于1天 即不做任何处理 - * 1-发布时间相隔大于1天 即更新 - * 0-seabird没有该url信息 + * 瀵筸etadata鍜宻eabird瀵规瘮 + * 2-鍙戝竷鏃堕棿鐩搁殧灏忎簬1澶� 鍗充笉鍋氫换浣曞鐞� + * 1-鍙戝竷鏃堕棿鐩搁殧澶т簬1澶� 鍗虫洿鏂� + * 0-seabird娌℃湁璇rl淇℃伅 */ private int comparedResult(DBObject dbo) { String url = dbo.get("url") @@ -222,10 +222,10 @@ public class ShopAndOfficeDatastorePublisher { } /** - * 对metadata和seabird对比 - * 2-发布时间相隔小于3天 即不做任何处理 - * 1-发布时间相隔大于3天 即更新 - * 0-seabird没有该url信息 + * 瀵筸etadata鍜宻eabird瀵规瘮 + * 2-鍙戝竷鏃堕棿鐩搁殧灏忎簬3澶� 鍗充笉鍋氫换浣曞鐞� + * 1-鍙戝竷鏃堕棿鐩搁殧澶т簬3澶� 鍗虫洿鏂� + * 0-seabird娌℃湁璇rl淇℃伅 */ private Object comparedResult2(DBObject dbo) { String urlMd5 = DigestUtils.md5Hex(dbo.get('url')) @@ -467,10 +467,10 @@ public class ShopAndOfficeDatastorePublisher { ret.put(it.name(), it.toMap()) } }else{ - logWarn('!!!请使用'+clazz.getName()+'注解标明本Batch的拥有者!!!') + logWarn('锛侊紒锛佽浣跨敤'+clazz.getName()+'娉ㄨВ鏍囨槑鏈珺atch鐨勬嫢鏈夎�咃紒锛侊紒') } }catch(Exception e) { - logWarn('!!!请使用'+clazz.getName()+'注解标明本Batch的拥有者!!!', e) + logWarn('锛侊紒锛佽浣跨敤'+clazz.getName()+'娉ㄨВ鏍囨槑鏈珺atch鐨勬嫢鏈夎�咃紒锛侊紒', e) } return ret } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/ShopAndOfficePublisherStarter.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/ShopAndOfficePublisherStarter.groovy index 6cc9f7a59..db7def253 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/ShopAndOfficePublisherStarter.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/ShopAndOfficePublisherStarter.groovy @@ -6,7 +6,7 @@ import com.fangjia.script.Watcher; import com.fangjia.script.util.SingleProcess /** - * datastore数据发布 + * datastore鏁版嵁鍙戝竷 * @author xiaoyu * */ @@ -14,52 +14,52 @@ import com.fangjia.script.util.SingleProcess class ShopAndOfficePublisherStarter { public static List publishables = new ArrayList(); static { - // 商铺 - publishables.add(new AnjukeShopRentPublisher()); //安居客商铺出租 - publishables.add(new SoufunShopRentPublisher()); //搜房商铺出租 - publishables.add(new GanjiShopRentPublisher()); //赶集商铺出租 - publishables.add(new HaopooShopRentPublisher()); //好铺网商铺出租 - publishables.add(new HaofangShopRentPublisher()); //好房在线商铺出租 - publishables.add(new ZufangShopRentPublisher()); //租房网商铺出租 - publishables.add(new Net58ShopRentPublisher()); //58商铺出租 - publishables.add(new BaixingShopRentPublisher()); //百姓网商铺出租 - publishables.add(new BaiduShopRentPublisher()); //百度乐居商铺出租 + // 鍟嗛摵 + publishables.add(new AnjukeShopRentPublisher()); //瀹夊眳瀹㈠晢閾哄嚭绉� + publishables.add(new SoufunShopRentPublisher()); //鎼滄埧鍟嗛摵鍑虹 + publishables.add(new GanjiShopRentPublisher()); //璧堕泦鍟嗛摵鍑虹 + publishables.add(new HaopooShopRentPublisher()); //濂介摵缃戝晢閾哄嚭绉� + publishables.add(new HaofangShopRentPublisher()); //濂芥埧鍦ㄧ嚎鍟嗛摵鍑虹 + publishables.add(new ZufangShopRentPublisher()); //绉熸埧缃戝晢閾哄嚭绉� + publishables.add(new Net58ShopRentPublisher()); //58鍟嗛摵鍑虹 + publishables.add(new BaixingShopRentPublisher()); //鐧惧缃戝晢閾哄嚭绉� + publishables.add(new BaiduShopRentPublisher()); //鐧惧害涔愬眳鍟嗛摵鍑虹 - publishables.add(new AnjukeShopSellPublisher()); //安居客商铺出售 - publishables.add(new WoyaozupuShopSellPublisher()); //我要租铺商铺出售 - publishables.add(new HaopooShopSellPublisher()); //好铺网商铺出售 - publishables.add(new HaofangShopSellPublisher()); //好房在线商铺出售 - publishables.add(new JintiShopSellPublisher()); //今题网商铺出售 - publishables.add(new SoufunShopSellPublisher()); //搜房商铺出售 - publishables.add(new CzfcwShopSellPublisher()); //搜房商铺出售 - publishables.add(new Fcw515ShopSellPublisher()); //515房产网商铺出售 - publishables.add(new GanjiShopSellPublisher()); //赶集商铺出售 - publishables.add(new Net58ShopSellPublisher()); //58商铺出售 - publishables.add(new BaixingShopSellPublisher()); //百姓网商铺出售 - publishables.add(new BaiduShopSellPublisher()); //百度乐居商铺出售 + publishables.add(new AnjukeShopSellPublisher()); //瀹夊眳瀹㈠晢閾哄嚭鍞� + publishables.add(new WoyaozupuShopSellPublisher()); //鎴戣绉熼摵鍟嗛摵鍑哄敭 + publishables.add(new HaopooShopSellPublisher()); //濂介摵缃戝晢閾哄嚭鍞� + publishables.add(new HaofangShopSellPublisher()); //濂芥埧鍦ㄧ嚎鍟嗛摵鍑哄敭 + publishables.add(new JintiShopSellPublisher()); //浠婇缃戝晢閾哄嚭鍞� + publishables.add(new SoufunShopSellPublisher()); //鎼滄埧鍟嗛摵鍑哄敭 + publishables.add(new CzfcwShopSellPublisher()); //鎼滄埧鍟嗛摵鍑哄敭 + publishables.add(new Fcw515ShopSellPublisher()); //515鎴夸骇缃戝晢閾哄嚭鍞� + publishables.add(new GanjiShopSellPublisher()); //璧堕泦鍟嗛摵鍑哄敭 + publishables.add(new Net58ShopSellPublisher()); //58鍟嗛摵鍑哄敭 + publishables.add(new BaixingShopSellPublisher()); //鐧惧缃戝晢閾哄嚭鍞� + publishables.add(new BaiduShopSellPublisher()); //鐧惧害涔愬眳鍟嗛摵鍑哄敭 - // 写字楼 - publishables.add(new AnjukeOfficeRentPublisher()); //安居客写字楼出租 - publishables.add(new SoufunOfficeRentPublisher()); //搜房写字楼出租 - publishables.add(new GanjiOfficeRentPublisher()); //赶集写字楼出租 - publishables.add(new Net58OfficeRentPublisher()); //58写字楼出租 - publishables.add(new ChineseofficeOfficeRentPublisher()); //中国写字楼出租 - publishables.add(new Qd8OfficeRentPublisher()); //快点8写字楼出租 - publishables.add(new ZufangOfficeRentPublisher()); //租房网写字楼出租 - publishables.add(new JintiOfficeRentPublisher()); //今题网写字楼出租 - publishables.add(new DaikanOfficeRentPublisher()); //带看网写字楼出租 - publishables.add(new BaixingOfficeRentPublisher()); //百姓网写字楼出租 + // 鍐欏瓧妤� + publishables.add(new AnjukeOfficeRentPublisher()); //瀹夊眳瀹㈠啓瀛楁ゼ鍑虹 + publishables.add(new SoufunOfficeRentPublisher()); //鎼滄埧鍐欏瓧妤煎嚭绉� + publishables.add(new GanjiOfficeRentPublisher()); //璧堕泦鍐欏瓧妤煎嚭绉� + publishables.add(new Net58OfficeRentPublisher()); //58鍐欏瓧妤煎嚭绉� + publishables.add(new ChineseofficeOfficeRentPublisher()); //涓浗鍐欏瓧妤煎嚭绉� + publishables.add(new Qd8OfficeRentPublisher()); //蹇偣8鍐欏瓧妤煎嚭绉� + publishables.add(new ZufangOfficeRentPublisher()); //绉熸埧缃戝啓瀛楁ゼ鍑虹 + publishables.add(new JintiOfficeRentPublisher()); //浠婇缃戝啓瀛楁ゼ鍑虹 + publishables.add(new DaikanOfficeRentPublisher()); //甯︾湅缃戝啓瀛楁ゼ鍑虹 + publishables.add(new BaixingOfficeRentPublisher()); //鐧惧缃戝啓瀛楁ゼ鍑虹 - publishables.add(new AnjukeOfficeSellPublisher()); //安居客写字楼出售 - publishables.add(new SoufunOfficeSellPublisher()); //搜房写字楼出售 - publishables.add(new GanjiOfficeSellPublisher()); //赶集写字楼出售 - publishables.add(new Net58OfficeSellPublisher()); //58写字楼出售 - publishables.add(new House365OfficeSellPublisher()); //365地产家居网写字楼出售 - publishables.add(new ChineseofficeOfficeSellPublisher()); //中国写字楼出售 - publishables.add(new Qd8OfficeSellPublisher()); //快点8写字楼出售 - publishables.add(new JintiOfficeSellPublisher()); //今题网写字楼出售 - publishables.add(new DaikanOfficeSellPublisher()); //带看网写字楼出售 - publishables.add(new BaixingOfficeSellPublisher()); //百姓网写字楼出售 + publishables.add(new AnjukeOfficeSellPublisher()); //瀹夊眳瀹㈠啓瀛楁ゼ鍑哄敭 + publishables.add(new SoufunOfficeSellPublisher()); //鎼滄埧鍐欏瓧妤煎嚭鍞� + publishables.add(new GanjiOfficeSellPublisher()); //璧堕泦鍐欏瓧妤煎嚭鍞� + publishables.add(new Net58OfficeSellPublisher()); //58鍐欏瓧妤煎嚭鍞� + publishables.add(new House365OfficeSellPublisher()); //365鍦颁骇瀹跺眳缃戝啓瀛楁ゼ鍑哄敭 + publishables.add(new ChineseofficeOfficeSellPublisher()); //涓浗鍐欏瓧妤煎嚭鍞� + publishables.add(new Qd8OfficeSellPublisher()); //蹇偣8鍐欏瓧妤煎嚭鍞� + publishables.add(new JintiOfficeSellPublisher()); //浠婇缃戝啓瀛楁ゼ鍑哄敭 + publishables.add(new DaikanOfficeSellPublisher()); //甯︾湅缃戝啓瀛楁ゼ鍑哄敭 + publishables.add(new BaixingOfficeSellPublisher()); //鐧惧缃戝啓瀛楁ゼ鍑哄敭 } public static void main(String[] args) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/SinaOfficeRentPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/SinaOfficeRentPublisher.groovy index 65e5ee2a7..f6663046a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/SinaOfficeRentPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/SinaOfficeRentPublisher.groovy @@ -13,8 +13,8 @@ class SinaOfficeRentPublisher implements Publishable { public static final List JOB_ID = ["53eb14b6e4b09e392f5b4dcf"]; public static final Map CONFIG = [ - match_address:true, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:true, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -42,8 +42,8 @@ class SinaOfficeRentPublisher implements Publishable { if(dataMap.get("region")){ String region = dataMap.get("region") - if(region.lastIndexOf("新浪租房") > -1){ - region = region.substring(region.lastIndexOf("新浪租房") + 5) + if(region.lastIndexOf("鏂版氮绉熸埧") > -1){ + region = region.substring(region.lastIndexOf("鏂版氮绉熸埧") + 5) if(region.lastIndexOf(">") > -1){ String[] regionArrs = region.split(">") if(regionArrs.length > 1){ @@ -64,7 +64,7 @@ class SinaOfficeRentPublisher implements Publishable { if(dataMap.get("district_name")){ String districtName = dataMap.get("district_name") - districtName = districtName.replace("楼盘名称:", "") + districtName = districtName.replace("妤肩洏鍚嶇О锛�", "") if(districtName.lastIndexOf("(") > -1){ districtName = districtName.substring(0 , districtName.lastIndexOf("(")).trim() } else { @@ -77,14 +77,14 @@ class SinaOfficeRentPublisher implements Publishable { if(dataMap.get("address")){ String address = dataMap.get("address") - address = address.replace("地址:", "").trim() + address = address.replace("鍦板潃锛�", "").trim() obj.put("address", address) } obj.put("estate_type", dataMap.get("estate_type")) if(dataMap.get("area")){ String area = dataMap.get("area") - area = area.replace("平米", "").trim() + area = area.replace("骞崇背", "").trim() if(area.indexOf("(") > -1){ area = area.substring(0 , area.indexOf("(")) } @@ -116,7 +116,7 @@ class SinaOfficeRentPublisher implements Publishable { obj.put("estate_charge", dataMap.get("estate_charge")) if(dataMap.get("floor_info")){ String floorInfo = dataMap.get("floor_info") - floorInfo = floorInfo.replace("楼层:", "") + floorInfo = floorInfo.replace("妤煎眰锛�", "") obj.put("floor_info", floorInfo.trim()) } @@ -125,8 +125,8 @@ class SinaOfficeRentPublisher implements Publishable { if(dataMap.get("block")){ String block = dataMap.get("block") - if(block.lastIndexOf("新浪租房") > -1){ - block = block.substring(block.lastIndexOf("新浪租房") + 5) + if(block.lastIndexOf("鏂版氮绉熸埧") > -1){ + block = block.substring(block.lastIndexOf("鏂版氮绉熸埧") + 5) if(block.lastIndexOf(">") > -1){ String[] blockArrs = block.split(">") if(blockArrs.length > 2){ @@ -150,7 +150,7 @@ class SinaOfficeRentPublisher implements Publishable { if(dataMap.get("publish_date")) { String s = dataMap.get("publish_date"); - s = StringUtils.substringAfter(s, '更新时间:').trim() + s = StringUtils.substringAfter(s, '鏇存柊鏃堕棿锛�').trim() if(s) { obj.put("publish_date", DateUtil.parseDate(s, "yyyy-MM-dd")) }else { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/SinaOfficeSellPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/SinaOfficeSellPublisher.groovy index 95e2a8f91..c8ac09abb 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/SinaOfficeSellPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/SinaOfficeSellPublisher.groovy @@ -13,8 +13,8 @@ class SinaOfficeSellPublisher implements Publishable { public static final List JOB_ID = ["53ed9d20e4b09e392f5b6523"]; public static final Map CONFIG = [ - match_address:true, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:true, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -56,7 +56,7 @@ class SinaOfficeSellPublisher implements Publishable { if(dataMap.get("address")){ String address = dataMap.get("address") - address = address.replace("地址:", "") + address = address.replace("鍦板潃锛�", "") if(StringUtils.isNotBlank(address)){ obj.put("address", address.trim()) } @@ -68,7 +68,7 @@ class SinaOfficeSellPublisher implements Publishable { totalPrice = totalPrice.substring(0 , totalPrice.indexOf(".")).trim() } totalPrice = trimChar(totalPrice) - totalPrice = totalPrice.replace("面议", "") + totalPrice = totalPrice.replace("闈㈣", "") if(StringUtils.isNotBlank(totalPrice)){ totalPrice = totalPrice + "0000" obj.put("total_price", totalPrice.toInteger()) @@ -77,7 +77,7 @@ class SinaOfficeSellPublisher implements Publishable { if(dataMap.get("area")){ String area = dataMap.get("area") - area = area.replace("面积:", "").replace("㎡", "").trim() + area = area.replace("闈㈢Н锛�", "").replace("銕�", "").trim() if(StringUtils.isNotBlank(area)){ obj.put("area", area.toDouble()) } @@ -90,10 +90,10 @@ class SinaOfficeSellPublisher implements Publishable { if(districtName.indexOf("(") > -1){ districtName = districtName.substring(0 , districtName.indexOf("(")).trim() } - if(districtName.indexOf("(") > -1) { - districtName = districtName.substring(0 , districtName.indexOf("(")).trim() + if(districtName.indexOf("锛�") > -1) { + districtName = districtName.substring(0 , districtName.indexOf("锛�")).trim() } - districtName = districtName.replace("查看小区详情", "").trim() + districtName = districtName.replace("鏌ョ湅灏忓尯璇︽儏", "").trim() if(StringUtils.isNotBlank(districtName)){ obj.put("district_name", districtName) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/SinaSellPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/SinaSellPublisher.groovy index a4d9741fd..751fb733c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/SinaSellPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/SinaSellPublisher.groovy @@ -16,8 +16,8 @@ class SinaSellPublisher implements Publishable { public static final List JOB_ID = ["54f5209ee4b03496ab064674"]; public static final Map CONFIG = [ - match_address:true, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:true, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -51,7 +51,7 @@ class SinaSellPublisher implements Publishable { String block = "" String[] arrs = region.split(">") if(arrs.length >= 1) { - if(arrs[0].indexOf("您现在的位置:") > -1) { + if(arrs[0].indexOf("鎮ㄧ幇鍦ㄧ殑浣嶇疆锛�") > -1) { if(arrs.length >= 3) { region = arrs[1] } else { @@ -101,10 +101,10 @@ class SinaSellPublisher implements Publishable { if(dataMap.get("room")){ String room = dataMap.get("room") + "" - room = room.substring(room.indexOf(":") + 1) - if(room.indexOf("室") > -1){ - String hall = room.substring(room.indexOf("室") + 1).trim() - room = room.substring(0 , room.indexOf("室")).trim() + room = room.substring(room.indexOf("锛�") + 1) + if(room.indexOf("瀹�") > -1){ + String hall = room.substring(room.indexOf("瀹�") + 1).trim() + room = room.substring(0 , room.indexOf("瀹�")).trim() Pattern pa=Pattern.compile("(\\d+)") Matcher ma=pa.matcher(room) if(ma.find()){ @@ -116,9 +116,9 @@ class SinaSellPublisher implements Publishable { obj.put("room", room.trim().toInteger()) } - if(StringUtils.isNotBlank(hall) && hall.indexOf("厅") > -1){ - String toilet = hall.substring(hall.indexOf("厅") + 1) - hall = hall.substring(0 , hall.indexOf("厅")) + if(StringUtils.isNotBlank(hall) && hall.indexOf("鍘�") > -1){ + String toilet = hall.substring(hall.indexOf("鍘�") + 1) + hall = hall.substring(0 , hall.indexOf("鍘�")) ma=pa.matcher(hall) if(ma.find()){ hall = ma.group(1) @@ -129,11 +129,11 @@ class SinaSellPublisher implements Publishable { obj.put("hall", hall.trim().toInteger()) } - if(StringUtils.isNotBlank(toilet) && toilet.indexOf("卫") > -1){ - if(toilet.indexOf("厨") > -1){ - toilet = toilet.substring(toilet.indexOf("厨") + 1) + if(StringUtils.isNotBlank(toilet) && toilet.indexOf("鍗�") > -1){ + if(toilet.indexOf("鍘�") > -1){ + toilet = toilet.substring(toilet.indexOf("鍘�") + 1) } - toilet = toilet.substring(0 , toilet.indexOf("卫")) + toilet = toilet.substring(0 , toilet.indexOf("鍗�")) ma=pa.matcher(toilet) if(ma.find()){ toilet = ma.group(1) @@ -151,11 +151,11 @@ class SinaSellPublisher implements Publishable { if(dataMap.get("area")) { String area = dataMap.get("area") String floor_info = "" - if(area != null && area.indexOf("积:") > -1){ - area = area.substring(area.indexOf("积:") + 2) - if(area != null && area.indexOf("层:") > -1) { - floor_info = area.substring(area.indexOf("层:") + 2) - area = area.substring(0 , area.indexOf("层:")) + if(area != null && area.indexOf("绉細") > -1){ + area = area.substring(area.indexOf("绉細") + 2) + if(area != null && area.indexOf("灞傦細") > -1) { + floor_info = area.substring(area.indexOf("灞傦細") + 2) + area = area.substring(0 , area.indexOf("灞傦細")) } } Pattern pa=Pattern.compile("(\\d+)") @@ -200,15 +200,15 @@ class SinaSellPublisher implements Publishable { if(dataMap.get("address")) { String addr = dataMap.get("address"); - if(addr.indexOf("地址:") > -1) { - addr = StringUtils.substringAfter(addr, "地址:") + if(addr.indexOf("鍦板潃锛�") > -1) { + addr = StringUtils.substringAfter(addr, "鍦板潃锛�") } - if(addr.indexOf('-') > -1) { - addr = StringUtils.substringAfterLast(addr, '-') + if(addr.indexOf('锛�') > -1) { + addr = StringUtils.substringAfterLast(addr, '锛�') } - if(addr.indexOf('(') > -1) { - addr = StringUtils.substringBeforeLast(addr, '(') + if(addr.indexOf('锛�') > -1) { + addr = StringUtils.substringBeforeLast(addr, '锛�') } if(addr.indexOf('(') > -1) { @@ -222,12 +222,12 @@ class SinaSellPublisher implements Publishable { if(dataMap.get("estate_type")) { String estate_type = dataMap.get("estate_type") String build_date = "" - if(estate_type.indexOf("型:") > -1){ - estate_type = estate_type.substring(estate_type.indexOf("型:") + 2) + if(estate_type.indexOf("鍨嬶細") > -1){ + estate_type = estate_type.substring(estate_type.indexOf("鍨嬶細") + 2) } - if(estate_type.indexOf("建造年代:") > -1) { - build_date = estate_type.substring(estate_type.indexOf("建造年代:") + 5) - estate_type = estate_type.substring(0 , estate_type.indexOf("建造年代:")) + if(estate_type.indexOf("寤洪�犲勾浠o細") > -1) { + build_date = estate_type.substring(estate_type.indexOf("寤洪�犲勾浠o細") + 5) + estate_type = estate_type.substring(0 , estate_type.indexOf("寤洪�犲勾浠o細")) } if(StringUtils.isNotBlank(estate_type)){ @@ -240,7 +240,7 @@ class SinaSellPublisher implements Publishable { if(dataMap.get("district_name")) { String district_name = dataMap.get("district_name") - district_name = district_name.replace("小区名称:", "") + district_name = district_name.replace("灏忓尯鍚嶇О锛�", "") district_name = trimChar(district_name) if(StringUtils.isNotBlank(district_name)){ obj.put("district_name", district_name.trim()) @@ -249,7 +249,7 @@ class SinaSellPublisher implements Publishable { if(dataMap.get("build_date")) { String build_date = dataMap.get("build_date") - build_date = build_date.replace("建筑年代:", "") + build_date = build_date.replace("寤虹瓚骞翠唬锛�", "") if(StringUtils.isNotBlank(build_date)){ obj.put("build_date", build_date.trim()) } @@ -258,12 +258,12 @@ class SinaSellPublisher implements Publishable { if(dataMap.get("direction")) { String direction = dataMap.get("direction") String fitment = "" - if(direction.indexOf("向:") > -1){ - direction = direction.substring(direction.indexOf("向:") + 2) + if(direction.indexOf("鍚戯細") > -1){ + direction = direction.substring(direction.indexOf("鍚戯細") + 2) } - if(direction.indexOf("装修程度:") > -1) { - fitment = direction.substring(direction.indexOf("装修程度:") + 5) - direction = direction.substring(0 , direction.indexOf("装修程度:")) + if(direction.indexOf("瑁呬慨绋嬪害锛�") > -1) { + fitment = direction.substring(direction.indexOf("瑁呬慨绋嬪害锛�") + 5) + direction = direction.substring(0 , direction.indexOf("瑁呬慨绋嬪害锛�")) } if(StringUtils.isNotBlank(direction)){ @@ -283,9 +283,9 @@ class SinaSellPublisher implements Publishable { floor = floor_info.substring(0 , floor_info.indexOf("/")) height = floor_info.substring(floor_info.indexOf("/") + 1) } - if(StringUtils.isNotBlank(floor_info) && floor_info.indexOf("(") > -1) { - floor = floor_info.substring(0 , floor_info.indexOf("(")) - height = floor_info.substring(floor_info.indexOf("(") + 1) + if(StringUtils.isNotBlank(floor_info) && floor_info.indexOf("锛�") > -1) { + floor = floor_info.substring(0 , floor_info.indexOf("锛�")) + height = floor_info.substring(floor_info.indexOf("锛�") + 1) } Pattern pa=Pattern.compile("(\\d+)") @@ -315,8 +315,8 @@ class SinaSellPublisher implements Publishable { if(dataMap.get("fitment")) { String fitment = dataMap.get("fitment") - if(fitment.indexOf("修:") > -1) { - fitment = fitment.substring(fitment.indexOf("修:") + 2) + if(fitment.indexOf("淇細") > -1) { + fitment = fitment.substring(fitment.indexOf("淇細") + 2) } if(StringUtils.isNotBlank(fitment)) { obj.put("fitment", fitment.trim()) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/SoufunDistrictPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/SoufunDistrictPublisher.groovy index 8bbc998a5..5dff2777d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/SoufunDistrictPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/SoufunDistrictPublisher.groovy @@ -10,8 +10,8 @@ class SoufunDistrictPublisher implements Publishable { public static final List JOB_ID = ["51417203e4b03972d270eb86"]; public static final Map CONFIG = [ - match_address:false, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:false, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/SoufunOfSmallCitySellPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/SoufunOfSmallCitySellPublisher.groovy index 605e9dd98..d45d77660 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/SoufunOfSmallCitySellPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/SoufunOfSmallCitySellPublisher.groovy @@ -35,8 +35,8 @@ public class SoufunOfSmallCitySellPublisher implements Publishable { "520d8513e4b0fb6103718fea" ]; public static final Map CONFIG = [ - match_address:false, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:false, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -50,15 +50,15 @@ public class SoufunOfSmallCitySellPublisher implements Publishable { } static def NUMBERMAP = [ - "零" : 0, "0" : 0, - "一" : 1, "1" : 1, - "二" : 2, "2" : 2, - "两" : 2, "3" : 3, - "三" : 3, "4" : 4, - "四" : 4, "5" : 5, - "五" : 5, "6" : 6, - "六" : 6, "7" : 7, - "七" : 7 + "闆�" : 0, "0" : 0, + "涓�" : 1, "1" : 1, + "浜�" : 2, "2" : 2, + "涓�" : 2, "3" : 3, + "涓�" : 3, "4" : 4, + "鍥�" : 4, "5" : 5, + "浜�" : 5, "6" : 6, + "鍏�" : 6, "7" : 7, + "涓�" : 7 ] @Override @@ -91,8 +91,8 @@ public class SoufunOfSmallCitySellPublisher implements Publishable { if(dataMap.get("direction")){ String direction = dataMap.get("direction") - if(direction.indexOf("向:") > -1){ - direction = direction.substring(direction.indexOf("向:") + 2) + if(direction.indexOf("鍚戯細") > -1){ + direction = direction.substring(direction.indexOf("鍚戯細") + 2) } if(StringUtils.isNotBlank(direction)){ obj.put("direction", direction.trim()) @@ -101,8 +101,8 @@ public class SoufunOfSmallCitySellPublisher implements Publishable { if(dataMap.get("build_date")){ String build_date = dataMap.get("build_date") - if(build_date.indexOf("代:") > -1){ - build_date = build_date.substring(build_date.indexOf("代:") + 2) + if(build_date.indexOf("浠o細") > -1){ + build_date = build_date.substring(build_date.indexOf("浠o細") + 2) } if(StringUtils.isNotBlank(build_date)){ obj.put("build_date", build_date.trim()) @@ -126,8 +126,8 @@ public class SoufunOfSmallCitySellPublisher implements Publishable { if(dataMap.get("fitment")){ String fitment = dataMap.get("fitment") - if(fitment.indexOf("修:") > -1){ - fitment = fitment.substring(fitment.indexOf("修:") + 2) + if(fitment.indexOf("淇細") > -1){ + fitment = fitment.substring(fitment.indexOf("淇細") + 2) } if(StringUtils.isNotBlank(fitment)){ obj.put("fitment", fitment.trim()) @@ -151,8 +151,8 @@ public class SoufunOfSmallCitySellPublisher implements Publishable { if(dataMap.get("district_name")){ String district_name = dataMap.get("district_name") - if(district_name.indexOf("(") > -1){ - district_name = district_name.substring(0 , district_name.indexOf("(")) + if(district_name.indexOf("锛�") > -1){ + district_name = district_name.substring(0 , district_name.indexOf("锛�")) } if(district_name.indexOf("(") > -1){ district_name = district_name.substring(0 , district_name.indexOf("(")) @@ -165,8 +165,8 @@ public class SoufunOfSmallCitySellPublisher implements Publishable { if(dataMap.get("address")){ String address = dataMap.get("address") - if(address.indexOf("址:") > -1){ - address = address.substring(address.indexOf("址:") + 2) + if(address.indexOf("鍧�锛�") > -1){ + address = address.substring(address.indexOf("鍧�锛�") + 2) } if(StringUtils.isNotBlank(address)){ obj.put("address", address.trim()) @@ -175,8 +175,8 @@ public class SoufunOfSmallCitySellPublisher implements Publishable { if(dataMap.get("floor_info")){ String floor_info = dataMap.get("floor_info") - if(floor_info.indexOf("层:") > -1){ - floor_info = floor_info.substring(floor_info.indexOf("层:") + 2) + if(floor_info.indexOf("灞傦細") > -1){ + floor_info = floor_info.substring(floor_info.indexOf("灞傦細") + 2) } if(StringUtils.isNotBlank(floor_info)){ obj.put("floor_info", floor_info.trim()) @@ -210,10 +210,10 @@ public class SoufunOfSmallCitySellPublisher implements Publishable { if(dataMap.get("room")){ String room = dataMap.get("room") + "" - room = room.substring(room.indexOf("型:") + 2) - if(room.indexOf("室") > -1){ - String hall = room.substring(room.indexOf("室") + 1).trim() - room = room.substring(0 , room.indexOf("室")).trim() + room = room.substring(room.indexOf("鍨嬶細") + 2) + if(room.indexOf("瀹�") > -1){ + String hall = room.substring(room.indexOf("瀹�") + 1).trim() + room = room.substring(0 , room.indexOf("瀹�")).trim() if(StringUtils.isNotBlank(room) && NUMBERMAP[room] != null){ room = NUMBERMAP[room] } else { @@ -223,9 +223,9 @@ public class SoufunOfSmallCitySellPublisher implements Publishable { obj.put("room", room.trim().toInteger()) } - if(StringUtils.isNotBlank(hall) && hall.indexOf("厅") > -1){ - String toilet = hall.substring(hall.indexOf("厅") + 1) - hall = hall.substring(0 , hall.indexOf("厅")) + if(StringUtils.isNotBlank(hall) && hall.indexOf("鍘�") > -1){ + String toilet = hall.substring(hall.indexOf("鍘�") + 1) + hall = hall.substring(0 , hall.indexOf("鍘�")) if(StringUtils.isNotBlank(hall) && NUMBERMAP[hall] != null){ hall = NUMBERMAP[hall] } else { @@ -236,11 +236,11 @@ public class SoufunOfSmallCitySellPublisher implements Publishable { } if(StringUtils.isNotBlank(toilet)){ - if(toilet.indexOf("厨") > -1){ - toilet = toilet.substring(toilet.indexOf("厨") + 1) + if(toilet.indexOf("鍘�") > -1){ + toilet = toilet.substring(toilet.indexOf("鍘�") + 1) } - if(toilet.indexOf("卫") > -1){ - toilet = toilet.substring(0 , toilet.indexOf("卫")) + if(toilet.indexOf("鍗�") > -1){ + toilet = toilet.substring(0 , toilet.indexOf("鍗�")) if(StringUtils.isNotBlank(toilet) && NUMBERMAP[toilet] != null){ toilet = NUMBERMAP[toilet] } else { @@ -257,11 +257,11 @@ public class SoufunOfSmallCitySellPublisher implements Publishable { if(dataMap.get("contact_people")){ String contact_people = dataMap.get("contact_people") - if(contact_people.indexOf("人:") > -1){ - contact_people = contact_people.substring(contact_people.indexOf("人:") + 2) + if(contact_people.indexOf("浜猴細") > -1){ + contact_people = contact_people.substring(contact_people.indexOf("浜猴細") + 2) } - if(contact_people.indexOf("(") > -1){ - contact_people = contact_people.substring(0 , contact_people.indexOf("(")) + if(contact_people.indexOf("锛�") > -1){ + contact_people = contact_people.substring(0 , contact_people.indexOf("锛�")) } if(contact_people.indexOf("(") > -1){ contact_people = contact_people.substring(0 , contact_people.indexOf("(")) @@ -277,7 +277,7 @@ public class SoufunOfSmallCitySellPublisher implements Publishable { if(dataMap.get("publish_date") != null) { String publishDate = dataMap.get("publish_date") - String ds = StringUtils.substringBetween(publishDate, "发布时间:", "(") + String ds = StringUtils.substringBetween(publishDate, "鍙戝竷鏃堕棿锛�", "(") Date orgDate = null if(ds != null && ds.indexOf("/") > -1) { orgDate = DateUtil.parseDate(ds, "yyyy/MM/dd hh:mm:ss") @@ -285,17 +285,17 @@ public class SoufunOfSmallCitySellPublisher implements Publishable { orgDate = DateUtil.parseDate(ds, "yyyy-MM-dd hh:mm:ss") } try { - String beforeTime = StringUtils.substringBetween(publishDate, "(", "前更新").trim() - if(beforeTime.indexOf("秒") > -1) { + String beforeTime = StringUtils.substringBetween(publishDate, "(", "鍓嶆洿鏂�").trim() + if(beforeTime.indexOf("绉�") > -1) { obj.put("publish_date", new Date()) - }else if(beforeTime.indexOf("分钟") > -1) { - beforeTime = beforeTime.replace("分钟", "") + }else if(beforeTime.indexOf("鍒嗛挓") > -1) { + beforeTime = beforeTime.replace("鍒嗛挓", "") obj.put("publish_date", DateUtil.getBeforeMinute(new Date(), Integer.parseInt(beforeTime))) - }else if(beforeTime.indexOf("小时") > -1) { - beforeTime = beforeTime.replace("小时", "") + }else if(beforeTime.indexOf("灏忔椂") > -1) { + beforeTime = beforeTime.replace("灏忔椂", "") obj.put("publish_date", DateUtil.getBeforeHour(new Date(), Integer.parseInt(beforeTime))) - }else if(beforeTime.indexOf("天") > -1) { - beforeTime = beforeTime.replace("天", "") + }else if(beforeTime.indexOf("澶�") > -1) { + beforeTime = beforeTime.replace("澶�", "") obj.put("publish_date", DateUtil.getBeforeDay(new Date(), Integer.parseInt(beforeTime))) }else { obj.put("publish_date", DateUtil.parseDate(ds, "yyyy-MM-dd hh:mm:ss")) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/SoufunOfficeRentPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/SoufunOfficeRentPublisher.groovy index 2547b616f..79986bee8 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/SoufunOfficeRentPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/SoufunOfficeRentPublisher.groovy @@ -17,8 +17,8 @@ public class SoufunOfficeRentPublisher implements Publishable { public static final List JOB_ID = ["53e86af0e4b09e392f5b4ada"]; public static final Map CONFIG = [ - match_address:true, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:true, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -70,7 +70,7 @@ public class SoufunOfficeRentPublisher implements Publishable { if(dataMap.get("address")){ String address = dataMap.get("address") - address = address.replace("楼盘地址:", "").trim() + address = address.replace("妤肩洏鍦板潃锛�", "").trim() if(StringUtils.isNotBlank(address)){ obj.put("address", address.trim()) } @@ -78,7 +78,7 @@ public class SoufunOfficeRentPublisher implements Publishable { if(dataMap.get("estate_type")){ String estate_type = dataMap.get("estate_type") - estate_type = estate_type.replace("类型:", "") + estate_type = estate_type.replace("绫诲瀷锛�", "") if(StringUtils.isNotBlank(estate_type)){ obj.put("estate_type", estate_type.trim()) } @@ -115,7 +115,7 @@ public class SoufunOfficeRentPublisher implements Publishable { if(dataMap.get("fitment")){ String fitment = dataMap.get("fitment") - fitment = fitment.replace("装修:", "") + fitment = fitment.replace("瑁呬慨锛�", "") if(StringUtils.isNotBlank(fitment)){ obj.put("fitment", fitment.trim()) } @@ -123,7 +123,7 @@ public class SoufunOfficeRentPublisher implements Publishable { if(dataMap.get("estate_charge")){ String estate_charge = dataMap.get("estate_charge") - estate_charge = estate_charge.replace("物 业 费:", "") + estate_charge = estate_charge.replace("鐗� 涓� 璐癸細", "") if(StringUtils.isNotBlank(estate_charge)){ obj.put("estate_charge", estate_charge.trim()) } @@ -131,7 +131,7 @@ public class SoufunOfficeRentPublisher implements Publishable { if(dataMap.get("floor_info")){ String floor_info = dataMap.get("floor_info") - floor_info = floor_info.replace("所在楼层:", "") + floor_info = floor_info.replace("鎵�鍦ㄦゼ灞傦細", "") if(StringUtils.isNotBlank(floor_info)){ obj.put("floor_info", floor_info.trim()) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/SoufunOfficeSellPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/SoufunOfficeSellPublisher.groovy index f28392bbc..ce4131b1c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/SoufunOfficeSellPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/SoufunOfficeSellPublisher.groovy @@ -16,8 +16,8 @@ class SoufunOfficeSellPublisher implements Publishable { public static final List JOB_ID = ["53ed9cc3e4b09e392f5b651d"]; public static final Map CONFIG = [ - match_address:true, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:true, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -50,7 +50,7 @@ class SoufunOfficeSellPublisher implements Publishable { String[] arrs = region.trim().split(">") if(arrs != null && arrs.length >= 4) { obj.put("region", trimChar(arrs[2]).toString().trim()) - obj.put("district_name", trimChar(arrs[arrs.length - 1]).toString().replaceAll("写字楼","").trim()) + obj.put("district_name", trimChar(arrs[arrs.length - 1]).toString().replaceAll("鍐欏瓧妤�","").trim()) } } } @@ -60,7 +60,7 @@ class SoufunOfficeSellPublisher implements Publishable { if(dataMap.get("address")){ String address = dataMap.get("address") - address = address.replace("楼盘地址:", "").trim() + address = address.replace("妤肩洏鍦板潃锛�", "").trim() if(StringUtils.isNotBlank(address)){ obj.put("address", address) } @@ -99,7 +99,7 @@ class SoufunOfficeSellPublisher implements Publishable { if(dataMap.get("estate_type")){ String estateType = dataMap.get("estate_type") - estateType = estateType.replace("类型:", "").trim() + estateType = estateType.replace("绫诲瀷锛�", "").trim() if(StringUtils.isNotBlank(estateType)){ obj.put("estate_type", estateType.trim()) } @@ -107,7 +107,7 @@ class SoufunOfficeSellPublisher implements Publishable { if(dataMap.get("fitment")){ String fitment = dataMap.get("fitment") - fitment = fitment.replace("装修:", "").trim() + fitment = fitment.replace("瑁呬慨锛�", "").trim() if(StringUtils.isNotBlank(fitment)){ obj.put("fitment", fitment.trim()) } @@ -115,7 +115,7 @@ class SoufunOfficeSellPublisher implements Publishable { if(dataMap.get("estate_charge")){ String estate_charge = dataMap.get("estate_charge") - estate_charge = estate_charge.replace("物 业 费:", "").trim() + estate_charge = estate_charge.replace("鐗� 涓� 璐癸細", "").trim() if(StringUtils.isNotBlank(estate_charge)){ obj.put("estate_charge", estate_charge.trim()) } @@ -123,7 +123,7 @@ class SoufunOfficeSellPublisher implements Publishable { if(dataMap.get("floor_info")){ String floor_info = dataMap.get("floor_info") - floor_info = floor_info.replace("所在楼层:", "").trim() + floor_info = floor_info.replace("鎵�鍦ㄦゼ灞傦細", "").trim() if(StringUtils.isNotBlank(floor_info)){ obj.put("floor_info", floor_info.trim()) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/SoufunRentPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/SoufunRentPublisher.groovy index e82462ac0..96ae2eb82 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/SoufunRentPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/SoufunRentPublisher.groovy @@ -33,8 +33,8 @@ public class SoufunRentPublisher implements Publishable { public static final List JOB_ID = ["514fba96e4b02fd984cd4195", "5588fbfce4b0a7ef70e98ef3"]; public static final Map CONFIG = [ - match_address:true, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:true, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -65,7 +65,7 @@ public class SoufunRentPublisher implements Publishable { String region = dataMap.get("region") String[] arrs = region.split(">") if(arrs.length >= 3){ - region = arrs[2].replace("租房", "").trim() + region = arrs[2].replace("绉熸埧", "").trim() } else { region = null } @@ -74,7 +74,7 @@ public class SoufunRentPublisher implements Publishable { obj.put("region", region.trim()) } if(arrs.length >= 4){ - String block = arrs[3].replace("租房", "").trim() + String block = arrs[3].replace("绉熸埧", "").trim() if(StringUtils.isNotBlank(block)){ obj.put("block", block.trim()) } @@ -83,7 +83,7 @@ public class SoufunRentPublisher implements Publishable { if(dataMap.get("price")){ String total_price = dataMap.get("price") - total_price = total_price.replace("元/月", "") + total_price = total_price.replace("鍏�/鏈�", "") if(total_price.indexOf(".") > -1){ total_price = total_price.substring(0 , total_price.indexOf(".")) } @@ -108,10 +108,10 @@ public class SoufunRentPublisher implements Publishable { if(dataMap.get("room")){ String room = dataMap.get("room") + "" - room = room.substring(room.indexOf(":") + 1) - if(room.indexOf("室") > -1){ - String hall = room.substring(room.indexOf("室") + 1).trim() - room = room.substring(0 , room.indexOf("室")).trim() + room = room.substring(room.indexOf("锛�") + 1) + if(room.indexOf("瀹�") > -1){ + String hall = room.substring(room.indexOf("瀹�") + 1).trim() + room = room.substring(0 , room.indexOf("瀹�")).trim() Pattern pa=Pattern.compile("(\\d+)") Matcher ma=pa.matcher(room) if(ma.find()){ @@ -123,9 +123,9 @@ public class SoufunRentPublisher implements Publishable { obj.put("room", room.trim().toInteger()) } - if(StringUtils.isNotBlank(hall) && hall.indexOf("厅") > -1){ - String toilet = hall.substring(hall.indexOf("厅") + 1) - hall = hall.substring(0 , hall.indexOf("厅")) + if(StringUtils.isNotBlank(hall) && hall.indexOf("鍘�") > -1){ + String toilet = hall.substring(hall.indexOf("鍘�") + 1) + hall = hall.substring(0 , hall.indexOf("鍘�")) ma=pa.matcher(hall) if(ma.find()){ hall = ma.group(1) @@ -137,11 +137,11 @@ public class SoufunRentPublisher implements Publishable { } if(StringUtils.isNotBlank(toilet)){ - if(toilet.indexOf("厨") > -1){ - toilet = toilet.substring(toilet.indexOf("厨") + 1) + if(toilet.indexOf("鍘�") > -1){ + toilet = toilet.substring(toilet.indexOf("鍘�") + 1) } - if(toilet.indexOf("卫") > -1){ - toilet = toilet.substring(0 , toilet.indexOf("卫")) + if(toilet.indexOf("鍗�") > -1){ + toilet = toilet.substring(0 , toilet.indexOf("鍗�")) ma=pa.matcher(toilet) if(ma.find()){ toilet = ma.group(1) @@ -203,7 +203,7 @@ public class SoufunRentPublisher implements Publishable { obj.put("publish_date", new Date()) obj.put("contact_people", dataMap.get("contact_people")) - obj.put("mobile", dataMap.get("mobile").toString().replace("联系电话:", "")) + obj.put("mobile", dataMap.get("mobile").toString().replace("鑱旂郴鐢佃瘽锛�", "")) obj.put("description", dataMap.get("description")) obj.put("pics", dataMap.get("pics")) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/SoufunSellPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/SoufunSellPublisher.groovy index 8d3a73ae6..f51735277 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/SoufunSellPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/SoufunSellPublisher.groovy @@ -38,8 +38,8 @@ public class SoufunSellPublisher implements Publishable { "51025d0ae4b0bc9fcbe08173" ]; public static final Map CONFIG = [ - match_address:false, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:false, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -96,10 +96,10 @@ public class SoufunSellPublisher implements Publishable { } if(dataMap.get("room")){ String room = dataMap.get("room") + "" - room = room.substring(room.indexOf(":") + 1) - if(room.indexOf("室") > -1){ - String hall = room.substring(room.indexOf("室") + 1).trim() - room = room.substring(0 , room.indexOf("室")).trim() + room = room.substring(room.indexOf("锛�") + 1) + if(room.indexOf("瀹�") > -1){ + String hall = room.substring(room.indexOf("瀹�") + 1).trim() + room = room.substring(0 , room.indexOf("瀹�")).trim() Pattern pa=Pattern.compile("(\\d+)") Matcher ma=pa.matcher(room) if(ma.find()){ @@ -111,9 +111,9 @@ public class SoufunSellPublisher implements Publishable { obj.put("room", room.trim().toInteger()) } - if(StringUtils.isNotBlank(hall) && hall.indexOf("厅") > -1){ - String toilet = hall.substring(hall.indexOf("厅") + 1) - hall = hall.substring(0 , hall.indexOf("厅")) + if(StringUtils.isNotBlank(hall) && hall.indexOf("鍘�") > -1){ + String toilet = hall.substring(hall.indexOf("鍘�") + 1) + hall = hall.substring(0 , hall.indexOf("鍘�")) ma=pa.matcher(hall) if(ma.find()){ hall = ma.group(1) @@ -125,11 +125,11 @@ public class SoufunSellPublisher implements Publishable { } if(StringUtils.isNotBlank(toilet)){ - if(toilet.indexOf("厨") > -1){ - toilet = toilet.substring(toilet.indexOf("厨") + 1) + if(toilet.indexOf("鍘�") > -1){ + toilet = toilet.substring(toilet.indexOf("鍘�") + 1) } - if(toilet.indexOf("卫") > -1){ - toilet = toilet.substring(0 , toilet.indexOf("卫")) + if(toilet.indexOf("鍗�") > -1){ + toilet = toilet.substring(0 , toilet.indexOf("鍗�")) ma=pa.matcher(toilet) if(ma.find()){ toilet = ma.group(1) @@ -147,7 +147,7 @@ public class SoufunSellPublisher implements Publishable { if(dataMap.get("estate_type")){ String estate_type = dataMap.get("estate_type") - estate_type = estate_type.replace("住宅类别:", "") + estate_type = estate_type.replace("浣忓畢绫诲埆锛�", "") if(StringUtils.isNotBlank(estate_type)){ obj.put("estate_type", estate_type.trim()) } @@ -155,7 +155,7 @@ public class SoufunSellPublisher implements Publishable { if(dataMap.get("direction")){ String direction = dataMap.get("direction") - direction = direction.replace("朝向:", "") + direction = direction.replace("鏈濆悜锛�", "") if(StringUtils.isNotBlank(direction)){ obj.put("direction", direction.trim()) } @@ -163,7 +163,7 @@ public class SoufunSellPublisher implements Publishable { if(dataMap.get("build_type")){ String build_type = dataMap.get("build_type") - build_type = build_type.replace("建筑类别:", "") + build_type = build_type.replace("寤虹瓚绫诲埆锛�", "") if(StringUtils.isNotBlank(build_type)){ obj.put("build_type", build_type.trim()) } @@ -171,7 +171,7 @@ public class SoufunSellPublisher implements Publishable { if(dataMap.get("fitment")){ String fitment = dataMap.get("fitment") - fitment = fitment.replace("装修:", "") + fitment = fitment.replace("瑁呬慨锛�", "") if(StringUtils.isNotBlank(fitment)){ obj.put("fitment", fitment.trim()) } @@ -179,7 +179,7 @@ public class SoufunSellPublisher implements Publishable { if(dataMap.get("floor_info")){ String floor_info = dataMap.get("floor_info") - floor_info = floor_info.replace("楼层:", "") + floor_info = floor_info.replace("妤煎眰锛�", "") if(StringUtils.isNotBlank(floor_info)){ obj.put("floor_info", floor_info.trim()) } @@ -212,7 +212,7 @@ public class SoufunSellPublisher implements Publishable { if(dataMap.get("build_date")){ String build_date = dataMap.get("build_date") - build_date = build_date.replace("年代:", "") + build_date = build_date.replace("骞翠唬锛�", "") if(StringUtils.isNotBlank(build_date)){ obj.put("build_date", build_date.trim()) } @@ -237,10 +237,10 @@ public class SoufunSellPublisher implements Publishable { if(dataMap.get("contact_people") != null) { String people = dataMap.get("contact_people") - if(people.indexOf("产权性质") > -1) { - people = StringUtils.substringBetween(people, ":", "产权性质") + if(people.indexOf("浜ф潈鎬ц川") > -1) { + people = StringUtils.substringBetween(people, "锛�", "浜ф潈鎬ц川") }else { - people = people.replace("联 系 人:", "") + people = people.replace("鑱� 绯� 浜猴細", "") } if(StringUtils.isNotBlank(people)){ @@ -250,8 +250,8 @@ public class SoufunSellPublisher implements Publishable { if(dataMap.get("address") != null) { String addr = dataMap.get("address") - addr = StringUtils.substringAfter(addr, ":") - addr = addr.replace("[地图]", "") + addr = StringUtils.substringAfter(addr, "锛�") + addr = addr.replace("[鍦板浘]", "") if(StringUtils.isNotBlank(addr)){ obj.put("address", addr.trim()) } @@ -259,7 +259,7 @@ public class SoufunSellPublisher implements Publishable { if(dataMap.get("district_name") != null) { String districtName = dataMap.get("district_name") - districtName = StringUtils.substringBetween(dataMap.get("district_name"), "名称:", "(") + districtName = StringUtils.substringBetween(dataMap.get("district_name"), "鍚嶇О锛�", "(") districtName = trimChar(districtName) if(StringUtils.isNotBlank(districtName)){ obj.put("district_name", districtName.trim()) @@ -292,9 +292,9 @@ public class SoufunSellPublisher implements Publishable { if(dataMap.get("publish_date") != null) { String publishDate = dataMap.get("publish_date") - String ds = StringUtils.substringBetween(publishDate, "发布时间:", "(") + String ds = StringUtils.substringBetween(publishDate, "鍙戝竷鏃堕棿锛�", "(") if(ds == null) { - ds = StringUtils.substringAfterLast(publishDate, "发布时间:") + ds = StringUtils.substringAfterLast(publishDate, "鍙戝竷鏃堕棿锛�") } Date orgDate = null if(ds != null && ds.indexOf("/") > -1) { @@ -317,17 +317,17 @@ public class SoufunSellPublisher implements Publishable { } } try { - String beforeTime = StringUtils.substringBetween(publishDate, "(", "前更新").trim() - if(beforeTime.indexOf("秒") > -1) { + String beforeTime = StringUtils.substringBetween(publishDate, "(", "鍓嶆洿鏂�").trim() + if(beforeTime.indexOf("绉�") > -1) { obj.put("publish_date", new Date()) - }else if(beforeTime.indexOf("分钟") > -1) { - beforeTime = beforeTime.replace("分钟", "") + }else if(beforeTime.indexOf("鍒嗛挓") > -1) { + beforeTime = beforeTime.replace("鍒嗛挓", "") obj.put("publish_date", DateUtil.getBeforeMinute(new Date(), Integer.parseInt(beforeTime))) - }else if(beforeTime.indexOf("小时") > -1) { - beforeTime = beforeTime.replace("小时", "") + }else if(beforeTime.indexOf("灏忔椂") > -1) { + beforeTime = beforeTime.replace("灏忔椂", "") obj.put("publish_date", DateUtil.getBeforeHour(new Date(), Integer.parseInt(beforeTime))) - }else if(beforeTime.indexOf("天") > -1) { - beforeTime = beforeTime.replace("天", "") + }else if(beforeTime.indexOf("澶�") > -1) { + beforeTime = beforeTime.replace("澶�", "") obj.put("publish_date", DateUtil.getBeforeDay(new Date(), Integer.parseInt(beforeTime))) }else { obj.put("publish_date", parseDate(ds)) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/SoufunShopOfficePublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/SoufunShopOfficePublisher.groovy index 8a9a4dc8d..d011de764 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/SoufunShopOfficePublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/SoufunShopOfficePublisher.groovy @@ -32,8 +32,8 @@ public class SoufunShopOfficePublisher implements Publishable { "5244f830e4b0d74519e13e63" ]; public static final Map CONFIG = [ - match_address:false, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:false, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -78,30 +78,30 @@ public class SoufunShopOfficePublisher implements Publishable { if(dataMap.get("build_type") != null) { String s = dataMap.get("build_type"); - if(s.indexOf(":") > -1) { - s = StringUtils.substringAfterLast(s, ":") + if(s.indexOf("锛�") > -1) { + s = StringUtils.substringAfterLast(s, "锛�") } obj.put("build_type", s) } if(dataMap.get("contact_people") != null) { String people = dataMap.get("contact_people") - if(people.indexOf("产权性质") > -1) { - people = StringUtils.substringBetween(people, ":", "产权性质") + if(people.indexOf("浜ф潈鎬ц川") > -1) { + people = StringUtils.substringBetween(people, "锛�", "浜ф潈鎬ц川") }else { - people = people.replace("联 系 人:", "") + people = people.replace("鑱� 绯� 浜猴細", "") } obj.put('contact_people', people) } if(dataMap.get("address") != null) { - String addr = StringUtils.substringAfter(dataMap.get("address"), "地址:") + String addr = StringUtils.substringAfter(dataMap.get("address"), "鍦板潃锛�") obj.put("address", addr) } if(dataMap.get("district_name") != null) { String districtName = dataMap.get("district_name") - obj.put("district_name", StringUtils.substringBetween(dataMap.get("district_name"), "名称:", "(")) + obj.put("district_name", StringUtils.substringBetween(dataMap.get("district_name"), "鍚嶇О锛�", "(")) } if(dataMap.get("region") != null) { @@ -128,20 +128,20 @@ public class SoufunShopOfficePublisher implements Publishable { if(dataMap.get("publish_date") != null) { String publishDate = dataMap.get("publish_date") - String ds = StringUtils.substringBetween(publishDate, "发布时间:", "(") + String ds = StringUtils.substringBetween(publishDate, "鍙戝竷鏃堕棿锛�", "(") Date orgDate = DateUtil.parseDate(ds, "yyyy-MM-dd hh:mm:ss") try { - String beforeTime = StringUtils.substringBetween(publishDate, "(", "前更新").trim() - if(beforeTime.indexOf("秒") > -1) { + String beforeTime = StringUtils.substringBetween(publishDate, "(", "鍓嶆洿鏂�").trim() + if(beforeTime.indexOf("绉�") > -1) { obj.put("publish_date", new Date()) - }else if(beforeTime.indexOf("分钟") > -1) { - beforeTime = beforeTime.replace("分钟", "") + }else if(beforeTime.indexOf("鍒嗛挓") > -1) { + beforeTime = beforeTime.replace("鍒嗛挓", "") obj.put("publish_date", DateUtil.getBeforeMinute(new Date(), Integer.parseInt(beforeTime))) - }else if(beforeTime.indexOf("小时") > -1) { - beforeTime = beforeTime.replace("小时", "") + }else if(beforeTime.indexOf("灏忔椂") > -1) { + beforeTime = beforeTime.replace("灏忔椂", "") obj.put("publish_date", DateUtil.getBeforeHour(new Date(), Integer.parseInt(beforeTime))) - }else if(beforeTime.indexOf("天") > -1) { - beforeTime = beforeTime.replace("天", "") + }else if(beforeTime.indexOf("澶�") > -1) { + beforeTime = beforeTime.replace("澶�", "") obj.put("publish_date", DateUtil.getBeforeDay(new Date(), Integer.parseInt(beforeTime))) }else { obj.put("publish_date", DateUtil.parseDate(ds, "yyyy-MM-dd hh:mm:ss")) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/SoufunShopRentPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/SoufunShopRentPublisher.groovy index bd8e30b37..97653e909 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/SoufunShopRentPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/SoufunShopRentPublisher.groovy @@ -16,8 +16,8 @@ class SoufunShopRentPublisher implements Publishable { public static final List JOB_ID = ["53f168b1e4b09e392f5b679d"]; public static final Map CONFIG = [ - match_address:true, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:true, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -90,8 +90,8 @@ class SoufunShopRentPublisher implements Publishable { if(dataMap.get("address") != null) { String addr = dataMap.get("address") - if(addr.indexOf(":") > -1){ - addr = addr.substring(addr.indexOf(":") + 1) + if(addr.indexOf("锛�") > -1){ + addr = addr.substring(addr.indexOf("锛�") + 1) } if(StringUtils.isNotBlank(addr)){ obj.put("address", addr.trim()) @@ -100,8 +100,8 @@ class SoufunShopRentPublisher implements Publishable { if(dataMap.get("district_name") != null) { String districtName = dataMap.get("district_name") - if(districtName.indexOf(":") > -1){ - districtName = districtName.substring(districtName.indexOf(":") + 1) + if(districtName.indexOf("锛�") > -1){ + districtName = districtName.substring(districtName.indexOf("锛�") + 1) } if(districtName.indexOf("(") > -1){ districtName = districtName.substring(0 , districtName.indexOf("(")) @@ -117,8 +117,8 @@ class SoufunShopRentPublisher implements Publishable { if(dataMap.get("estate_type") != null) { String estateType = dataMap.get("estate_type") - if(estateType.indexOf(":") > -1){ - estateType = estateType.substring(estateType.indexOf(":") + 1) + if(estateType.indexOf("锛�") > -1){ + estateType = estateType.substring(estateType.indexOf("锛�") + 1) } if(StringUtils.isNotBlank(estateType)){ obj.put("estate_type", estateType.trim()) @@ -127,8 +127,8 @@ class SoufunShopRentPublisher implements Publishable { if(dataMap.get("fitment") != null) { String fitment = dataMap.get("fitment") - if(fitment.indexOf(":") > -1){ - fitment = fitment.substring(fitment.indexOf(":") + 1) + if(fitment.indexOf("锛�") > -1){ + fitment = fitment.substring(fitment.indexOf("锛�") + 1) } if(StringUtils.isNotBlank(fitment)){ obj.put("fitment", fitment.trim()) @@ -137,8 +137,8 @@ class SoufunShopRentPublisher implements Publishable { if(dataMap.get("estate_charge") != null) { String estate_charge = dataMap.get("estate_charge") - if(estate_charge.indexOf(":") > -1){ - estate_charge = estate_charge.substring(estate_charge.indexOf(":") + 1) + if(estate_charge.indexOf("锛�") > -1){ + estate_charge = estate_charge.substring(estate_charge.indexOf("锛�") + 1) } if(StringUtils.isNotBlank(estate_charge)){ obj.put("estate_charge", estate_charge.trim()) @@ -147,8 +147,8 @@ class SoufunShopRentPublisher implements Publishable { if(dataMap.get("floor_info") != null) { String floor_info = dataMap.get("floor_info") - if(floor_info.indexOf(":") > -1){ - floor_info = floor_info.substring(floor_info.indexOf(":") + 1) + if(floor_info.indexOf("锛�") > -1){ + floor_info = floor_info.substring(floor_info.indexOf("锛�") + 1) } if(StringUtils.isNotBlank(floor_info)){ obj.put("floor_info", floor_info.trim()) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/SoufunShopSellPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/SoufunShopSellPublisher.groovy index 47b3c6295..14467a874 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/SoufunShopSellPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/SoufunShopSellPublisher.groovy @@ -16,8 +16,8 @@ class SoufunShopSellPublisher implements Publishable { public static final List JOB_ID = ["5438e585e4b00d761b1a1355"]; public static final Map CONFIG = [ - match_address:true, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:true, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -89,8 +89,8 @@ class SoufunShopSellPublisher implements Publishable { if(dataMap.get("address") != null) { String addr = dataMap.get("address") - if(addr.indexOf(":") > -1){ - addr = addr.substring(addr.indexOf(":") + 1) + if(addr.indexOf("锛�") > -1){ + addr = addr.substring(addr.indexOf("锛�") + 1) } if(StringUtils.isNotBlank(addr)){ obj.put("address", addr.trim()) @@ -99,8 +99,8 @@ class SoufunShopSellPublisher implements Publishable { if(dataMap.get("district_name") != null) { String districtName = dataMap.get("district_name") - if(districtName.indexOf(":") > -1){ - districtName = districtName.substring(districtName.indexOf(":") + 1) + if(districtName.indexOf("锛�") > -1){ + districtName = districtName.substring(districtName.indexOf("锛�") + 1) } if(districtName.indexOf("(") > -1){ districtName = districtName.substring(0 , districtName.indexOf("(")) @@ -116,8 +116,8 @@ class SoufunShopSellPublisher implements Publishable { if(dataMap.get("estate_type") != null) { String estateType = dataMap.get("estate_type") - if(estateType.indexOf(":") > -1){ - estateType = estateType.substring(estateType.indexOf(":") + 1) + if(estateType.indexOf("锛�") > -1){ + estateType = estateType.substring(estateType.indexOf("锛�") + 1) } if(StringUtils.isNotBlank(estateType)){ obj.put("estate_type", estateType.trim()) @@ -126,8 +126,8 @@ class SoufunShopSellPublisher implements Publishable { if(dataMap.get("fitment") != null) { String fitment = dataMap.get("fitment") - if(fitment.indexOf(":") > -1){ - fitment = fitment.substring(fitment.indexOf(":") + 1) + if(fitment.indexOf("锛�") > -1){ + fitment = fitment.substring(fitment.indexOf("锛�") + 1) } if(StringUtils.isNotBlank(fitment)){ obj.put("fitment", fitment.trim()) @@ -136,8 +136,8 @@ class SoufunShopSellPublisher implements Publishable { if(dataMap.get("estate_charge") != null) { String estate_charge = dataMap.get("estate_charge") - if(estate_charge.indexOf(":") > -1){ - estate_charge = estate_charge.substring(estate_charge.indexOf(":") + 1) + if(estate_charge.indexOf("锛�") > -1){ + estate_charge = estate_charge.substring(estate_charge.indexOf("锛�") + 1) } if(StringUtils.isNotBlank(estate_charge)){ obj.put("estate_charge", estate_charge.trim()) @@ -146,19 +146,19 @@ class SoufunShopSellPublisher implements Publishable { if(dataMap.get("floor_info") != null) { String floor_info = dataMap.get("floor_info") - if(floor_info.indexOf(":") > -1){ - floor_info = floor_info.substring(floor_info.indexOf(":") + 1) + if(floor_info.indexOf("锛�") > -1){ + floor_info = floor_info.substring(floor_info.indexOf("锛�") + 1) } if(StringUtils.isNotBlank(floor_info)){ obj.put("floor_info", floor_info.trim()) - def floor = patternMatch(floor_info, "第(\\d+)层"); + def floor = patternMatch(floor_info, "绗�(\\d+)灞�"); if(floor){ obj.put("floor", floor.toInteger()) } - def height = patternMatch(floor_info, "共(\\d+)层"); + def height = patternMatch(floor_info, "鍏�(\\d+)灞�"); if(height){ obj.put("height", height.toInteger()) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/TaofwRentPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/TaofwRentPublisher.groovy index 2aed0c46f..3a46f8a88 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/TaofwRentPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/TaofwRentPublisher.groovy @@ -32,8 +32,8 @@ class TaofwRentPublisher implements Publishable { "5412957ce4b09e392f5bbb7e" ]; public static final Map CONFIG = [ - match_address:false, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:false, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -122,7 +122,7 @@ class TaofwRentPublisher implements Publishable { if(dataMap.get("address")){ String addr = dataMap.get("address") - addr = addr.replace("小区地址:", "") + addr = addr.replace("灏忓尯鍦板潃锛�", "") if(StringUtils.isNotBlank(addr)){ obj.put("address", addr.trim()) } @@ -144,10 +144,10 @@ class TaofwRentPublisher implements Publishable { if(dataMap.get("room")){ String room = dataMap.get("room") + "" - room = room.substring(room.indexOf(":") + 1) - if(room.indexOf("房") > -1){ - String hall = room.substring(room.indexOf("房") + 1).trim() - room = room.substring(0 , room.indexOf("房")).trim() + room = room.substring(room.indexOf("锛�") + 1) + if(room.indexOf("鎴�") > -1){ + String hall = room.substring(room.indexOf("鎴�") + 1).trim() + room = room.substring(0 , room.indexOf("鎴�")).trim() Pattern pa=Pattern.compile("(\\d+)") Matcher ma=pa.matcher(room) if(ma.find()){ @@ -159,9 +159,9 @@ class TaofwRentPublisher implements Publishable { obj.put("room", room.trim().toInteger()) } - if(StringUtils.isNotBlank(hall) && hall.indexOf("厅") > -1){ - String toilet = hall.substring(hall.indexOf("厅") + 1) - hall = hall.substring(0 , hall.indexOf("厅")) + if(StringUtils.isNotBlank(hall) && hall.indexOf("鍘�") > -1){ + String toilet = hall.substring(hall.indexOf("鍘�") + 1) + hall = hall.substring(0 , hall.indexOf("鍘�")) ma=pa.matcher(hall) if(ma.find()){ hall = ma.group(1) @@ -173,11 +173,11 @@ class TaofwRentPublisher implements Publishable { } if(StringUtils.isNotBlank(toilet)){ - if(toilet.indexOf("厨") > -1){ - toilet = toilet.substring(toilet.indexOf("厨") + 1) + if(toilet.indexOf("鍘�") > -1){ + toilet = toilet.substring(toilet.indexOf("鍘�") + 1) } - if(toilet.indexOf("卫") > -1){ - toilet = toilet.substring(0 , toilet.indexOf("卫")) + if(toilet.indexOf("鍗�") > -1){ + toilet = toilet.substring(0 , toilet.indexOf("鍗�")) ma=pa.matcher(toilet) if(ma.find()){ toilet = ma.group(1) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/TaofwSellPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/TaofwSellPublisher.groovy index b9e314655..c433bee61 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/TaofwSellPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/TaofwSellPublisher.groovy @@ -30,15 +30,15 @@ import com.mongodb.DBCursor; import com.mongodb.DBObject; /** - * 淘房网二手房发布 + * 娣樻埧缃戜簩鎵嬫埧鍙戝竷 * @author xiaoyu * */ public class TaofwSellPublisher implements Publishable { public static final List JOB_ID = ["510629cce4b0bc9fcbe08207"]; public static final Map CONFIG = [ - match_address:true, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:true, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -112,10 +112,10 @@ public class TaofwSellPublisher implements Publishable { } if(dataMap.get("room")){ String room = dataMap.get("room") + "" - room = room.substring(room.indexOf(":") + 1) - if(room.indexOf("房") > -1){ - String hall = room.substring(room.indexOf("房") + 1).trim() - room = room.substring(0 , room.indexOf("房")).trim() + room = room.substring(room.indexOf("锛�") + 1) + if(room.indexOf("鎴�") > -1){ + String hall = room.substring(room.indexOf("鎴�") + 1).trim() + room = room.substring(0 , room.indexOf("鎴�")).trim() Pattern pa=Pattern.compile("(\\d+)") Matcher ma=pa.matcher(room) if(ma.find()){ @@ -127,9 +127,9 @@ public class TaofwSellPublisher implements Publishable { obj.put("room", room.trim().toInteger()) } - if(StringUtils.isNotBlank(hall) && hall.indexOf("厅") > -1){ - String toilet = hall.substring(hall.indexOf("厅") + 1) - hall = hall.substring(0 , hall.indexOf("厅")) + if(StringUtils.isNotBlank(hall) && hall.indexOf("鍘�") > -1){ + String toilet = hall.substring(hall.indexOf("鍘�") + 1) + hall = hall.substring(0 , hall.indexOf("鍘�")) ma=pa.matcher(hall) if(ma.find()){ hall = ma.group(1) @@ -141,11 +141,11 @@ public class TaofwSellPublisher implements Publishable { } if(StringUtils.isNotBlank(toilet)){ - if(toilet.indexOf("厨") > -1){ - toilet = toilet.substring(toilet.indexOf("厨") + 1) + if(toilet.indexOf("鍘�") > -1){ + toilet = toilet.substring(toilet.indexOf("鍘�") + 1) } - if(toilet.indexOf("卫") > -1){ - toilet = toilet.substring(0 , toilet.indexOf("卫")) + if(toilet.indexOf("鍗�") > -1){ + toilet = toilet.substring(0 , toilet.indexOf("鍗�")) ma=pa.matcher(toilet) if(ma.find()){ toilet = ma.group(1) @@ -196,7 +196,7 @@ public class TaofwSellPublisher implements Publishable { if(dataMap.get("address")){ String address = dataMap.get("address") - address = address.replace("小区地址:", "") + address = address.replace("灏忓尯鍦板潃锛�", "") if(StringUtils.isNotBlank(address)){ obj.put("address", address.trim()) } @@ -209,7 +209,7 @@ public class TaofwSellPublisher implements Publishable { if(dataMap.get("district_name") != null) { String str = dataMap.get("district_name") - str = str.replace("小区名称:", "").replace("查看小区详情", "") + str = str.replace("灏忓尯鍚嶇О锛�", "").replace("鏌ョ湅灏忓尯璇︽儏", "") if(StringUtils.isNotBlank(str)){ str = trimChar(str) obj.put("district_name", str.trim()) @@ -220,31 +220,31 @@ public class TaofwSellPublisher implements Publishable { String refDate = dataMap.get("refresh_date") try { String publishDate = null; - if(refDate.indexOf('今天') > -1) { + if(refDate.indexOf('浠婂ぉ') > -1) { obj.put("publish_date", new Date()) - }else if(refDate.indexOf('更新') > -1) { - publishDate = StringUtils.substringAfter(refDate, "发布").trim() - }else if(refDate.indexOf('发布') > -1) { + }else if(refDate.indexOf('鏇存柊') > -1) { + publishDate = StringUtils.substringAfter(refDate, "鍙戝竷").trim() + }else if(refDate.indexOf('鍙戝竷') > -1) { if(refDate.indexOf("(") > -1 && refDate.indexOf(")") > -1) { obj.put("publish_date", new Date()) }else { - publishDate = StringUtils.substringAfter(refDate, "发布").trim() + publishDate = StringUtils.substringAfter(refDate, "鍙戝竷").trim() } } if(publishDate != null) { publishDate = publishDate.replace("(", "").replace(")", "") - String beforeTime = StringUtils.substringBefore(publishDate, "前").trim() - if(beforeTime.indexOf("秒") > -1) { + String beforeTime = StringUtils.substringBefore(publishDate, "鍓�").trim() + if(beforeTime.indexOf("绉�") > -1) { obj.put("publish_date", new Date()) - }else if(beforeTime.indexOf("分钟") > -1) { - beforeTime = beforeTime.replace("分钟", "") + }else if(beforeTime.indexOf("鍒嗛挓") > -1) { + beforeTime = beforeTime.replace("鍒嗛挓", "") obj.put("publish_date", DateUtil.getBeforeMinute(new Date(), Integer.parseInt(beforeTime))) - }else if(beforeTime.indexOf("小时") > -1) { - beforeTime = beforeTime.replace("小时", "") + }else if(beforeTime.indexOf("灏忔椂") > -1) { + beforeTime = beforeTime.replace("灏忔椂", "") obj.put("publish_date", DateUtil.getBeforeHour(new Date(), Integer.parseInt(beforeTime))) - }else if(beforeTime.indexOf("天") > -1) { - beforeTime = beforeTime.replace("天", "") + }else if(beforeTime.indexOf("澶�") > -1) { + beforeTime = beforeTime.replace("澶�", "") obj.put("publish_date", DateUtil.getBeforeDay(new Date(), Integer.parseInt(beforeTime))) } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/WoaiwojiaRentPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/WoaiwojiaRentPublisher.groovy index 575694935..9f21e0f0d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/WoaiwojiaRentPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/WoaiwojiaRentPublisher.groovy @@ -34,8 +34,8 @@ class WoaiwojiaRentPublisher implements Publishable { "5423b346e4b0ba18b478b40d" ]; public static final Map CONFIG = [ - match_address:false, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:false, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -67,13 +67,13 @@ class WoaiwojiaRentPublisher implements Publishable { String region = dataMap.get("region") String[] arrs = region.split(">") if(arrs.length >= 4){ - region = arrs[2].replace("租房", "") + region = arrs[2].replace("绉熸埧", "") if(StringUtils.isNotBlank(region)){ region = trimChar(region) obj.put("region", region.trim()) } - String district_name = arrs[arrs.length - 1].replace("租房", "") + String district_name = arrs[arrs.length - 1].replace("绉熸埧", "") if(StringUtils.isNotBlank(district_name)){ district_name = trimChar(district_name) obj.put("district_name", district_name.trim()) @@ -83,7 +83,7 @@ class WoaiwojiaRentPublisher implements Publishable { if(dataMap.get("direction")){ String direction = dataMap.get("direction") - direction = direction.replace("朝向:", "").replace("相似朝向", "") + direction = direction.replace("鏈濆悜锛�", "").replace("鐩镐技鏈濆悜", "") if(StringUtils.isNotBlank(direction)){ obj.put("direction", direction.trim()) } @@ -109,7 +109,7 @@ class WoaiwojiaRentPublisher implements Publishable { // if(dataMap.get("finish_building_date")){ // String finish_building_date = dataMap.get("finish_building_date") -// finish_building_date = finish_building_date.replace("竣工时间:", "") +// finish_building_date = finish_building_date.replace("绔e伐鏃堕棿锛�", "") // if(StringUtils.isNotBlank(finish_building_date)){ // obj.put("finish_building_date", finish_building_date.trim()) // } @@ -117,10 +117,10 @@ class WoaiwojiaRentPublisher implements Publishable { if(dataMap.get("room")){ String room = dataMap.get("room") + "" - room = room.substring(room.indexOf(":") + 1) - if(room.indexOf("室") > -1){ - String hall = room.substring(room.indexOf("室") + 1).trim() - room = room.substring(0 , room.indexOf("室")).trim() + room = room.substring(room.indexOf("锛�") + 1) + if(room.indexOf("瀹�") > -1){ + String hall = room.substring(room.indexOf("瀹�") + 1).trim() + room = room.substring(0 , room.indexOf("瀹�")).trim() Pattern pa=Pattern.compile("(\\d+)") Matcher ma=pa.matcher(room) if(ma.find()){ @@ -132,9 +132,9 @@ class WoaiwojiaRentPublisher implements Publishable { obj.put("room", room.trim().toInteger()) } - if(StringUtils.isNotBlank(hall) && hall.indexOf("厅") > -1){ - String toilet = hall.substring(hall.indexOf("厅") + 1) - hall = hall.substring(0 , hall.indexOf("厅")) + if(StringUtils.isNotBlank(hall) && hall.indexOf("鍘�") > -1){ + String toilet = hall.substring(hall.indexOf("鍘�") + 1) + hall = hall.substring(0 , hall.indexOf("鍘�")) ma=pa.matcher(hall) if(ma.find()){ hall = ma.group(1) @@ -146,11 +146,11 @@ class WoaiwojiaRentPublisher implements Publishable { } if(StringUtils.isNotBlank(toilet)){ - if(toilet.indexOf("厨") > -1){ - toilet = toilet.substring(toilet.indexOf("厨") + 1) + if(toilet.indexOf("鍘�") > -1){ + toilet = toilet.substring(toilet.indexOf("鍘�") + 1) } - if(toilet.indexOf("卫") > -1){ - toilet = toilet.substring(0 , toilet.indexOf("卫")) + if(toilet.indexOf("鍗�") > -1){ + toilet = toilet.substring(0 , toilet.indexOf("鍗�")) ma=pa.matcher(toilet) if(ma.find()){ toilet = ma.group(1) @@ -189,13 +189,13 @@ class WoaiwojiaRentPublisher implements Publishable { obj.put("contact_people", dataMap.get("contact_people")) - obj.put("mobile", dataMap.get("mobile").toString().replace("联系电话:", "")) + obj.put("mobile", dataMap.get("mobile").toString().replace("鑱旂郴鐢佃瘽锛�", "")) obj.put("address", obj.get("district_name")) if(dataMap.get("floor_info")){ String floor_info = dataMap.get("floor_info") - floor_info = floor_info.replace("楼层:", "") + floor_info = floor_info.replace("妤煎眰锛�", "") if(StringUtils.isNotBlank(floor_info)){ obj.put("floor_info", floor_info.trim()) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/WoaiwojiaSellPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/WoaiwojiaSellPublisher.groovy index f6098c352..be64083ca 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/WoaiwojiaSellPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/WoaiwojiaSellPublisher.groovy @@ -34,8 +34,8 @@ class WoaiwojiaSellPublisher implements Publishable { "54251e41e4b0ba18b478b994" ]; public static final Map CONFIG = [ - match_address:false, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:false, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -67,7 +67,7 @@ class WoaiwojiaSellPublisher implements Publishable { String region = dataMap.get("region") String[] arrs = region.split(">") if(arrs.length >= 4){ - region = arrs[2].replace("二手房", "") + region = arrs[2].replace("浜屾墜鎴�", "") if(StringUtils.isNotBlank(region)){ region = trimChar(region) obj.put("region", region.trim()) @@ -77,7 +77,7 @@ class WoaiwojiaSellPublisher implements Publishable { if(dataMap.get("estate_type")){ String estate_type = dataMap.get("estate_type") - estate_type = estate_type.replace("住宅类型:", "") + estate_type = estate_type.replace("浣忓畢绫诲瀷锛�", "") if(StringUtils.isNotBlank(estate_type)){ obj.put("estate_type", estate_type.trim()) } @@ -85,7 +85,7 @@ class WoaiwojiaSellPublisher implements Publishable { if(dataMap.get("direction")){ String direction = dataMap.get("direction") - direction = direction.replace("朝向:", "").replace("相似朝向", "") + direction = direction.replace("鏈濆悜锛�", "").replace("鐩镐技鏈濆悜", "") if(StringUtils.isNotBlank(direction)){ obj.put("direction", direction.trim()) } @@ -109,7 +109,7 @@ class WoaiwojiaSellPublisher implements Publishable { if(dataMap.get("fitment")){ String fitment = dataMap.get("fitment") - fitment = fitment.replace("装修:", "") + fitment = fitment.replace("瑁呬慨锛�", "") if(StringUtils.isNotBlank(fitment)){ obj.put("fitment", fitment.trim()) } @@ -125,10 +125,10 @@ class WoaiwojiaSellPublisher implements Publishable { if(dataMap.get("room")){ String room = dataMap.get("room") + "" - room = room.substring(room.indexOf(":") + 1) - if(room.indexOf("室") > -1){ - String hall = room.substring(room.indexOf("室") + 1).trim() - room = room.substring(0 , room.indexOf("室")).trim() + room = room.substring(room.indexOf("锛�") + 1) + if(room.indexOf("瀹�") > -1){ + String hall = room.substring(room.indexOf("瀹�") + 1).trim() + room = room.substring(0 , room.indexOf("瀹�")).trim() Pattern pa=Pattern.compile("(\\d+)") Matcher ma=pa.matcher(room) if(ma.find()){ @@ -140,9 +140,9 @@ class WoaiwojiaSellPublisher implements Publishable { obj.put("room", room.trim().toInteger()) } - if(StringUtils.isNotBlank(hall) && hall.indexOf("厅") > -1){ - String toilet = hall.substring(hall.indexOf("厅") + 1) - hall = hall.substring(0 , hall.indexOf("厅")) + if(StringUtils.isNotBlank(hall) && hall.indexOf("鍘�") > -1){ + String toilet = hall.substring(hall.indexOf("鍘�") + 1) + hall = hall.substring(0 , hall.indexOf("鍘�")) ma=pa.matcher(hall) if(ma.find()){ hall = ma.group(1) @@ -154,11 +154,11 @@ class WoaiwojiaSellPublisher implements Publishable { } if(StringUtils.isNotBlank(toilet)){ - if(toilet.indexOf("厨") > -1){ - toilet = toilet.substring(toilet.indexOf("厨") + 1) + if(toilet.indexOf("鍘�") > -1){ + toilet = toilet.substring(toilet.indexOf("鍘�") + 1) } - if(toilet.indexOf("卫") > -1){ - toilet = toilet.substring(0 , toilet.indexOf("卫")) + if(toilet.indexOf("鍗�") > -1){ + toilet = toilet.substring(0 , toilet.indexOf("鍗�")) ma=pa.matcher(toilet) if(ma.find()){ toilet = ma.group(1) @@ -197,13 +197,13 @@ class WoaiwojiaSellPublisher implements Publishable { obj.put("contact_people", dataMap.get("contact_people")) - obj.put("mobile", dataMap.get("mobile").toString().replace("联系电话:", "")) + obj.put("mobile", dataMap.get("mobile").toString().replace("鑱旂郴鐢佃瘽锛�", "")) obj.put("address", obj.get("district_name")) if(dataMap.get("floor_info")){ String floor_info = dataMap.get("floor_info") - floor_info = floor_info.replace("楼层:", "") + floor_info = floor_info.replace("妤煎眰锛�", "") if(StringUtils.isNotBlank(floor_info)){ obj.put("floor_info", floor_info.trim()) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/WoyaozupuShopSellPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/WoyaozupuShopSellPublisher.groovy index 60bf71194..216693272 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/WoyaozupuShopSellPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/WoyaozupuShopSellPublisher.groovy @@ -16,8 +16,8 @@ class WoyaozupuShopSellPublisher implements Publishable { public static final List JOB_ID = ["541bce28e4b0ba18b478a715"]; public static final Map CONFIG = [ - match_address:true, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:true, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -45,10 +45,10 @@ class WoyaozupuShopSellPublisher implements Publishable { obj.put("city", dataMap.get("city")) obj.put("name", dataMap.get("title")) - if(dataMap.get("city") != null && dataMap.get("city").toString().trim() == "上海"){ + if(dataMap.get("city") != null && dataMap.get("city").toString().trim() == "涓婃捣"){ String region = dataMap.get("region") if(StringUtils.isNotBlank(region)){ - region = region.replace("商铺区域:", "") + region = region.replace("鍟嗛摵鍖哄煙锛�", "") } if(StringUtils.isNotBlank(region)){ region = trimChar(region) @@ -56,24 +56,24 @@ class WoyaozupuShopSellPublisher implements Publishable { } } else { String region = dataMap.get("address") - region = region.replace("地址:", "") - if(region.indexOf("区") > -1){ - region = region.substring(0 , region.indexOf("区") + 1) - if(region.indexOf("市") > -1){ - region = region.substring(region.indexOf("市") + 1) + region = region.replace("鍦板潃锛�", "") + if(region.indexOf("鍖�") > -1){ + region = region.substring(0 , region.indexOf("鍖�") + 1) + if(region.indexOf("甯�") > -1){ + region = region.substring(region.indexOf("甯�") + 1) } } - if(region.indexOf("县") > -1){ - region = region.substring(0 , region.indexOf("县") + 1) - if(region.indexOf("市") > -1){ - region = region.substring(region.indexOf("市") + 1) + if(region.indexOf("鍘�") > -1){ + region = region.substring(0 , region.indexOf("鍘�") + 1) + if(region.indexOf("甯�") > -1){ + region = region.substring(region.indexOf("甯�") + 1) } } - if(region.indexOf("市") > -1){ - region = region.substring(0 , region.indexOf("市") + 1) + if(region.indexOf("甯�") > -1){ + region = region.substring(0 , region.indexOf("甯�") + 1) } - if(StringUtils.isNotBlank(region) && (region.indexOf("区") > -1 || region.indexOf("县") > -1 || region.indexOf("市") > -1)){ + if(StringUtils.isNotBlank(region) && (region.indexOf("鍖�") > -1 || region.indexOf("鍘�") > -1 || region.indexOf("甯�") > -1)){ region = trimChar(region) obj.put("region", region.trim()) } @@ -131,7 +131,7 @@ class WoyaozupuShopSellPublisher implements Publishable { } if(dataMap.get("address") != null) { - String addr = StringUtils.substringAfter(dataMap.get("address").toString(), "地址:") + String addr = StringUtils.substringAfter(dataMap.get("address").toString(), "鍦板潃锛�") if(addr.indexOf("(") > -1){ addr = addr.substring(0 , addr.indexOf("(")) } @@ -142,14 +142,14 @@ class WoyaozupuShopSellPublisher implements Publishable { if(dataMap.get("district_name")){ String district_name = dataMap.get("district_name") - district_name = district_name.replace("楼盘名称:", "") + district_name = district_name.replace("妤肩洏鍚嶇О锛�", "") if(StringUtils.isNotBlank(district_name)){ district_name = trimChar(district_name) obj.put("district_name", district_name.trim()) } } - obj.put("floor_info", dataMap.get("floor_info").toString().replace("所在楼层:", "")) + obj.put("floor_info", dataMap.get("floor_info").toString().replace("鎵�鍦ㄦゼ灞傦細", "")) obj.put("c_date", new Date()) obj.put("m_date", new Date()) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/Yes515RentPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/Yes515RentPublisher.groovy index dadbf8326..f9e2bf5e9 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/Yes515RentPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/Yes515RentPublisher.groovy @@ -34,8 +34,8 @@ class Yes515RentPublisher implements Publishable { "543c9d5ce4b00d761b1a2e6b" ]; public static final Map CONFIG = [ - match_address:false, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:false, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -98,8 +98,8 @@ class Yes515RentPublisher implements Publishable { if(dataMap.get("fitment")){ String fitment = dataMap.get("fitment") - if(fitment.indexOf(":") > -1){ - fitment = fitment.substring(fitment.indexOf(":") + 1) + if(fitment.indexOf("锛�") > -1){ + fitment = fitment.substring(fitment.indexOf("锛�") + 1) } if(StringUtils.isNotBlank(fitment)){ obj.put("fitment", fitment.trim()) @@ -108,10 +108,10 @@ class Yes515RentPublisher implements Publishable { if(dataMap.get("district_name")){ String district_name = dataMap.get("district_name") - if(district_name.indexOf(":") > -1){ - district_name = district_name.substring(district_name.indexOf(":") + 1) + if(district_name.indexOf("锛�") > -1){ + district_name = district_name.substring(district_name.indexOf("锛�") + 1) } - district_name = district_name.replace("【", "").replace("】", "") + district_name = district_name.replace("銆�", "").replace("銆�", "") if(StringUtils.isNotBlank(district_name)){ district_name = trimChar(district_name) obj.put("district_name", district_name.trim()) @@ -123,10 +123,10 @@ class Yes515RentPublisher implements Publishable { if(dataMap.get("room")){ String room = dataMap.get("room") + "" - room = room.substring(room.indexOf(":") + 1) - if(room.indexOf("室") > -1){ - String hall = room.substring(room.indexOf("室") + 1).trim() - room = room.substring(0 , room.indexOf("室")).trim() + room = room.substring(room.indexOf("锛�") + 1) + if(room.indexOf("瀹�") > -1){ + String hall = room.substring(room.indexOf("瀹�") + 1).trim() + room = room.substring(0 , room.indexOf("瀹�")).trim() Pattern pa=Pattern.compile("(\\d+)") Matcher ma=pa.matcher(room) if(ma.find()){ @@ -138,9 +138,9 @@ class Yes515RentPublisher implements Publishable { obj.put("room", room.trim().toInteger()) } - if(StringUtils.isNotBlank(hall) && hall.indexOf("厅") > -1){ - String toilet = hall.substring(hall.indexOf("厅") + 1) - hall = hall.substring(0 , hall.indexOf("厅")) + if(StringUtils.isNotBlank(hall) && hall.indexOf("鍘�") > -1){ + String toilet = hall.substring(hall.indexOf("鍘�") + 1) + hall = hall.substring(0 , hall.indexOf("鍘�")) ma=pa.matcher(hall) if(ma.find()){ hall = ma.group(1) @@ -152,11 +152,11 @@ class Yes515RentPublisher implements Publishable { } if(StringUtils.isNotBlank(toilet)){ - if(toilet.indexOf("厨") > -1){ - toilet = toilet.substring(toilet.indexOf("厨") + 1) + if(toilet.indexOf("鍘�") > -1){ + toilet = toilet.substring(toilet.indexOf("鍘�") + 1) } - if(toilet.indexOf("卫") > -1){ - toilet = toilet.substring(0 , toilet.indexOf("卫")) + if(toilet.indexOf("鍗�") > -1){ + toilet = toilet.substring(0 , toilet.indexOf("鍗�")) ma=pa.matcher(toilet) if(ma.find()){ toilet = ma.group(1) @@ -193,7 +193,7 @@ class Yes515RentPublisher implements Publishable { if(dataMap.get("floor_info")){ String floor_info = dataMap.get("floor_info") - floor_info = floor_info.replace("楼层:", "") + floor_info = floor_info.replace("妤煎眰锛�", "") if(StringUtils.isNotBlank(floor_info)){ obj.put("floor_info", floor_info.trim()) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/Yes515SellPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/Yes515SellPublisher.groovy index 4f29d8422..c6f633502 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/Yes515SellPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/Yes515SellPublisher.groovy @@ -34,8 +34,8 @@ class Yes515SellPublisher implements Publishable { "543ccbcde4b00d761b1a2ee8" ]; public static final Map CONFIG = [ - match_address:false, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:false, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -82,8 +82,8 @@ class Yes515SellPublisher implements Publishable { if(dataMap.get("build_type")){ String build_type = dataMap.get("build_type") - if(build_type.indexOf(":") > -1){ - build_type = build_type.substring(build_type.indexOf(":") + 1) + if(build_type.indexOf("锛�") > -1){ + build_type = build_type.substring(build_type.indexOf("锛�") + 1) } if(StringUtils.isNotBlank(build_type)){ build_type = trimChar(build_type) @@ -110,8 +110,8 @@ class Yes515SellPublisher implements Publishable { if(dataMap.get("fitment")){ String fitment = dataMap.get("fitment") - if(fitment.indexOf(":") > -1){ - fitment = fitment.substring(fitment.indexOf(":") + 1) + if(fitment.indexOf("锛�") > -1){ + fitment = fitment.substring(fitment.indexOf("锛�") + 1) } if(StringUtils.isNotBlank(fitment)){ obj.put("fitment", fitment.trim()) @@ -120,10 +120,10 @@ class Yes515SellPublisher implements Publishable { if(dataMap.get("district_name")){ String district_name = dataMap.get("district_name") - if(district_name.indexOf(":") > -1){ - district_name = district_name.substring(district_name.indexOf(":") + 1) + if(district_name.indexOf("锛�") > -1){ + district_name = district_name.substring(district_name.indexOf("锛�") + 1) } - district_name = district_name.replace("【", "").replace("】", "") + district_name = district_name.replace("銆�", "").replace("銆�", "") if(StringUtils.isNotBlank(district_name)){ district_name = trimChar(district_name) obj.put("district_name", district_name.trim()) @@ -135,10 +135,10 @@ class Yes515SellPublisher implements Publishable { if(dataMap.get("room")){ String room = dataMap.get("room") + "" - room = room.substring(room.indexOf(":") + 1) - if(room.indexOf("室") > -1){ - String hall = room.substring(room.indexOf("室") + 1).trim() - room = room.substring(0 , room.indexOf("室")).trim() + room = room.substring(room.indexOf("锛�") + 1) + if(room.indexOf("瀹�") > -1){ + String hall = room.substring(room.indexOf("瀹�") + 1).trim() + room = room.substring(0 , room.indexOf("瀹�")).trim() Pattern pa=Pattern.compile("(\\d+)") Matcher ma=pa.matcher(room) if(ma.find()){ @@ -150,9 +150,9 @@ class Yes515SellPublisher implements Publishable { obj.put("room", room.trim().toInteger()) } - if(StringUtils.isNotBlank(hall) && hall.indexOf("厅") > -1){ - String toilet = hall.substring(hall.indexOf("厅") + 1) - hall = hall.substring(0 , hall.indexOf("厅")) + if(StringUtils.isNotBlank(hall) && hall.indexOf("鍘�") > -1){ + String toilet = hall.substring(hall.indexOf("鍘�") + 1) + hall = hall.substring(0 , hall.indexOf("鍘�")) ma=pa.matcher(hall) if(ma.find()){ hall = ma.group(1) @@ -164,11 +164,11 @@ class Yes515SellPublisher implements Publishable { } if(StringUtils.isNotBlank(toilet)){ - if(toilet.indexOf("厨") > -1){ - toilet = toilet.substring(toilet.indexOf("厨") + 1) + if(toilet.indexOf("鍘�") > -1){ + toilet = toilet.substring(toilet.indexOf("鍘�") + 1) } - if(toilet.indexOf("卫") > -1){ - toilet = toilet.substring(0 , toilet.indexOf("卫")) + if(toilet.indexOf("鍗�") > -1){ + toilet = toilet.substring(0 , toilet.indexOf("鍗�")) ma=pa.matcher(toilet) if(ma.find()){ toilet = ma.group(1) @@ -205,7 +205,7 @@ class Yes515SellPublisher implements Publishable { if(dataMap.get("floor_info")){ String floor_info = dataMap.get("floor_info") - floor_info = floor_info.replace("楼层:", "") + floor_info = floor_info.replace("妤煎眰锛�", "") if(StringUtils.isNotBlank(floor_info)){ obj.put("floor_info", floor_info.trim()) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/ZufangOfficeRentPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/ZufangOfficeRentPublisher.groovy index e507a5bbd..d1c1d9278 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/ZufangOfficeRentPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/ZufangOfficeRentPublisher.groovy @@ -34,8 +34,8 @@ class ZufangOfficeRentPublisher implements Publishable { "5424d355e4b0ba18b478b89a" ]; public static final Map CONFIG = [ - match_address:false, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:false, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -68,7 +68,7 @@ class ZufangOfficeRentPublisher implements Publishable { if(region.indexOf(">") > -1){ String[] arrs = region.split(">") if(arrs.length >= 3){ - region = arrs[2].replace("写字楼", "") + region = arrs[2].replace("鍐欏瓧妤�", "") } else { region = null } @@ -83,8 +83,8 @@ class ZufangOfficeRentPublisher implements Publishable { if(dataMap.get("estate_type")){ String estate_type = dataMap.get("estate_type") - if(estate_type.indexOf("型:") > -1){ - estate_type = estate_type.substring(estate_type.indexOf("型:") + 2) + if(estate_type.indexOf("鍨嬶細") > -1){ + estate_type = estate_type.substring(estate_type.indexOf("鍨嬶細") + 2) } if(StringUtils.isNotBlank(estate_type)){ obj.put("estate_type", estate_type.trim()) @@ -93,8 +93,8 @@ class ZufangOfficeRentPublisher implements Publishable { if(dataMap.get("publish_date")){ String publish_date = dataMap.get("publish_date") - if(publish_date.indexOf("发布时间:") > -1){ - publish_date = publish_date.substring(publish_date.indexOf("发布时间:")) + if(publish_date.indexOf("鍙戝竷鏃堕棿锛�") > -1){ + publish_date = publish_date.substring(publish_date.indexOf("鍙戝竷鏃堕棿锛�")) Date date = DateUtil.parseStringToDate(publish_date); if(date!=null){ obj.put("publish_date", date) @@ -108,8 +108,8 @@ class ZufangOfficeRentPublisher implements Publishable { if(dataMap.get("total_price")) { def total_price = dataMap.get("total_price").toString() - if(total_price.indexOf("元/平米/天") > -1){ - total_price = total_price.substring(total_price.indexOf("元/平米/天") + 6) + if(total_price.indexOf("鍏�/骞崇背/澶�") > -1){ + total_price = total_price.substring(total_price.indexOf("鍏�/骞崇背/澶�") + 6) } Pattern pa=Pattern.compile("(\\d+)") Matcher ma=pa.matcher(total_price) @@ -125,11 +125,11 @@ class ZufangOfficeRentPublisher implements Publishable { if(dataMap.get("district_name")){ String district_name = dataMap.get("district_name") - if(district_name.indexOf("称:") > -1){ - district_name = district_name.substring(district_name.indexOf("称:") + 2) + if(district_name.indexOf("绉帮細") > -1){ + district_name = district_name.substring(district_name.indexOf("绉帮細") + 2) } - if(district_name.indexOf("(") > -1){ - district_name = district_name.substring(0 , district_name.indexOf("(")) + if(district_name.indexOf("锛�") > -1){ + district_name = district_name.substring(0 , district_name.indexOf("锛�")) } if(StringUtils.isNotBlank(district_name)){ district_name = trimChar(district_name) @@ -157,8 +157,8 @@ class ZufangOfficeRentPublisher implements Publishable { if(dataMap.get("contact_people")){ String contact_people = dataMap.get("contact_people") - if(contact_people.indexOf("联系人:") > -1){ - contact_people = contact_people.substring(contact_people.indexOf("联系人:") + 4) + if(contact_people.indexOf("鑱旂郴浜猴細") > -1){ + contact_people = contact_people.substring(contact_people.indexOf("鑱旂郴浜猴細") + 4) } else { contact_people = null } @@ -167,12 +167,12 @@ class ZufangOfficeRentPublisher implements Publishable { } } - obj.put("mobile", dataMap.get("mobile").toString().replace("联系电话:", "")) + obj.put("mobile", dataMap.get("mobile").toString().replace("鑱旂郴鐢佃瘽锛�", "")) if(dataMap.get("address")){ String address = dataMap.get("address") - if(address.indexOf("址:") > -1){ - address = address.substring(address.indexOf("址:") + 2) + if(address.indexOf("鍧�锛�") > -1){ + address = address.substring(address.indexOf("鍧�锛�") + 2) } if(StringUtils.isNotBlank(address)){ obj.put("address", address.trim()) @@ -181,7 +181,7 @@ class ZufangOfficeRentPublisher implements Publishable { if(dataMap.get("floor_info")){ String floor_info = dataMap.get("floor_info") - floor_info = floor_info.replace("所在楼层:","") + floor_info = floor_info.replace("鎵�鍦ㄦゼ灞傦細","") if(StringUtils.isNotBlank(floor_info)){ obj.put("floor_info", floor_info.trim()) } @@ -189,8 +189,8 @@ class ZufangOfficeRentPublisher implements Publishable { if(dataMap.get("estate_charge")){ String estate_charge = dataMap.get("estate_charge") - if(estate_charge.indexOf("费:") > -1){ - estate_charge = estate_charge.substring(estate_charge.indexOf("费:") + 2) + if(estate_charge.indexOf("璐癸細") > -1){ + estate_charge = estate_charge.substring(estate_charge.indexOf("璐癸細") + 2) } if(StringUtils.isNotBlank(estate_charge)){ obj.put("estate_charge", estate_charge.trim()) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/ZufangRentPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/ZufangRentPublisher.groovy index 802d59718..e223e509c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/ZufangRentPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/ZufangRentPublisher.groovy @@ -34,8 +34,8 @@ class ZufangRentPublisher implements Publishable { "54608275e4b0e6ab76cf00a9" ]; public static final Map CONFIG = [ - match_address:false, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:false, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -68,14 +68,14 @@ class ZufangRentPublisher implements Publishable { if(region.indexOf(">") > -1){ String[] arrs = region.split(">") if(arrs.length >= 3){ - region = arrs[2].replace("租房", "") + region = arrs[2].replace("绉熸埧", "") region = trimChar(region) if(StringUtils.isNotBlank(region)){ obj.put("region", region.trim()) } } if(arrs.length >= 4){ - String block = arrs[3].replace("租房", "") + String block = arrs[3].replace("绉熸埧", "") if(StringUtils.isNotBlank(block)){ obj.put("block", block.trim()) } @@ -86,8 +86,8 @@ class ZufangRentPublisher implements Publishable { if(dataMap.get("total_price")) { def total_price = dataMap.get("total_price").toString() - if(total_price.indexOf("元/平米/天") > -1){ - total_price = total_price.substring(total_price.indexOf("元/平米/天") + 6) + if(total_price.indexOf("鍏�/骞崇背/澶�") > -1){ + total_price = total_price.substring(total_price.indexOf("鍏�/骞崇背/澶�") + 6) } Pattern pa=Pattern.compile("(\\d+)") Matcher ma=pa.matcher(total_price) @@ -103,11 +103,11 @@ class ZufangRentPublisher implements Publishable { if(dataMap.get("fitment")){ String fitment = dataMap.get("fitment") - if(fitment.indexOf("型:") > -1){ - fitment = fitment.substring(fitment.indexOf("型:") + 2) - if(StringUtils.isNotBlank(fitment) && fitment.indexOf("  ") > -1){ - String floor_info = fitment.substring(fitment.indexOf("  ") + 1).trim() - fitment = fitment.substring(0 , fitment.indexOf("  ")).trim() + if(fitment.indexOf("鍨嬶細") > -1){ + fitment = fitment.substring(fitment.indexOf("鍨嬶細") + 2) + if(StringUtils.isNotBlank(fitment) && fitment.indexOf("銆�銆�") > -1){ + String floor_info = fitment.substring(fitment.indexOf("銆�銆�") + 1).trim() + fitment = fitment.substring(0 , fitment.indexOf("銆�銆�")).trim() if(StringUtils.isNotBlank(fitment)){ obj.put("fitment", fitment.trim()) } @@ -160,8 +160,8 @@ class ZufangRentPublisher implements Publishable { if(dataMap.get("address")){ String address = dataMap.get("address") - if(address.indexOf("址:") > -1){ - address = address.substring(address.indexOf("址:") + 2) + if(address.indexOf("鍧�锛�") > -1){ + address = address.substring(address.indexOf("鍧�锛�") + 2) } if(StringUtils.isNotBlank(address)){ obj.put("address", address.trim()) @@ -170,16 +170,16 @@ class ZufangRentPublisher implements Publishable { if(dataMap.get("room")){ String room = dataMap.get("room") - if(room.indexOf("型:") > -1){ - room = room.substring(room.indexOf("型:") + 2).trim() + if(room.indexOf("鍨嬶細") > -1){ + room = room.substring(room.indexOf("鍨嬶細") + 2).trim() } - if(room.indexOf(" ") > -1){ - String area = room.substring(room.indexOf(" ") + 1).trim() - room = room.substring(0 , room.indexOf(" ")).trim() + if(room.indexOf("銆�") > -1){ + String area = room.substring(room.indexOf("銆�") + 1).trim() + room = room.substring(0 , room.indexOf("銆�")).trim() if(StringUtils.isNotBlank(room)){ - if(room.indexOf("室") > -1){ - String hall = room.substring(room.indexOf("室") + 1).trim() - room = room.substring(0 , room.indexOf("室")).trim() + if(room.indexOf("瀹�") > -1){ + String hall = room.substring(room.indexOf("瀹�") + 1).trim() + room = room.substring(0 , room.indexOf("瀹�")).trim() Pattern pa=Pattern.compile("(\\d+)") Matcher ma=pa.matcher(room) if(ma.find()){ @@ -191,9 +191,9 @@ class ZufangRentPublisher implements Publishable { obj.put("room", room.trim().toInteger()) } - if(StringUtils.isNotBlank(hall) && hall.indexOf("厅") > -1){ - String toilet = hall.substring(hall.indexOf("厅") + 1).trim() - hall = hall.substring(0 , hall.indexOf("厅")).trim() + if(StringUtils.isNotBlank(hall) && hall.indexOf("鍘�") > -1){ + String toilet = hall.substring(hall.indexOf("鍘�") + 1).trim() + hall = hall.substring(0 , hall.indexOf("鍘�")).trim() ma=pa.matcher(hall) if(ma.find()){ hall = ma.group(1) @@ -204,11 +204,11 @@ class ZufangRentPublisher implements Publishable { obj.put("hall", hall.trim().toInteger()) } - if(StringUtils.isNotBlank(toilet) && toilet.indexOf("卫") > -1){ - if(toilet.indexOf("厨") > -1){ - toilet = toilet.substring(toilet.indexOf("厨") + 1).trim() + if(StringUtils.isNotBlank(toilet) && toilet.indexOf("鍗�") > -1){ + if(toilet.indexOf("鍘�") > -1){ + toilet = toilet.substring(toilet.indexOf("鍘�") + 1).trim() } - toilet = toilet.substring(0 , toilet.indexOf("卫")).trim() + toilet = toilet.substring(0 , toilet.indexOf("鍗�")).trim() ma=pa.matcher(toilet) if(ma.find()){ toilet = ma.group(1) @@ -224,9 +224,9 @@ class ZufangRentPublisher implements Publishable { } if(StringUtils.isNotBlank(area)){ - if(area.indexOf(" ") > -1){ - String direction = area.substring(area.indexOf(" ") + 1).trim() - area = area.substring(0 , area.indexOf(" ")).trim() + if(area.indexOf("銆�") > -1){ + String direction = area.substring(area.indexOf("銆�") + 1).trim() + area = area.substring(0 , area.indexOf("銆�")).trim() if(StringUtils.isNotBlank(area)){ Pattern pa=Pattern.compile("(\\d+)") @@ -242,8 +242,8 @@ class ZufangRentPublisher implements Publishable { } if(StringUtils.isNotBlank(direction)){ - if(direction.indexOf(" ") > -1){ - direction = direction.substring(0 , direction.indexOf(" ")).trim() + if(direction.indexOf("銆�") > -1){ + direction = direction.substring(0 , direction.indexOf("銆�")).trim() if(StringUtils.isNotBlank(direction)){ obj.put("direction", direction.trim()) @@ -257,8 +257,8 @@ class ZufangRentPublisher implements Publishable { if(dataMap.get("publish_date")){ String publish_date = dataMap.get("publish_date") - if(publish_date.indexOf("发布时间:") > -1){ - publish_date = publish_date.substring(publish_date.indexOf("发布时间:")) + if(publish_date.indexOf("鍙戝竷鏃堕棿锛�") > -1){ + publish_date = publish_date.substring(publish_date.indexOf("鍙戝竷鏃堕棿锛�")) Date date = DateUtil.parseStringToDate(publish_date); if(date!=null){ obj.put("publish_date", date) @@ -272,8 +272,8 @@ class ZufangRentPublisher implements Publishable { if(dataMap.get("contact_people")){ String contact_people = dataMap.get("contact_people") - if(contact_people.indexOf("联系人:") > -1){ - contact_people = contact_people.substring(contact_people.indexOf("联系人:") + 4) + if(contact_people.indexOf("鑱旂郴浜猴細") > -1){ + contact_people = contact_people.substring(contact_people.indexOf("鑱旂郴浜猴細") + 4) if(StringUtils.isNotBlank(contact_people)){ obj.put("contact_people", contact_people.trim()) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/ZufangShopRentPublisher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/ZufangShopRentPublisher.groovy index 24d54ac02..35f94f41b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/ZufangShopRentPublisher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/ZufangShopRentPublisher.groovy @@ -34,8 +34,8 @@ class ZufangShopRentPublisher implements Publishable { "542269f9e4b0ba18b478b0f7" ]; public static final Map CONFIG = [ - match_address:false, //匹配地址 - out_time:24 * 3600 //一天内不重复发布 + match_address:false, //鍖归厤鍦板潃 + out_time:24 * 3600 //涓�澶╁唴涓嶉噸澶嶅彂甯� ]; @Override @@ -68,7 +68,7 @@ class ZufangShopRentPublisher implements Publishable { if(region.indexOf(">") > -1){ String[] arrs = region.split(">") if(arrs.length >= 3){ - region = arrs[2].replace("商铺", "") + region = arrs[2].replace("鍟嗛摵", "") } else { region = null } @@ -83,8 +83,8 @@ class ZufangShopRentPublisher implements Publishable { if(dataMap.get("estate_type")){ String estate_type = dataMap.get("estate_type") - if(estate_type.indexOf("型:") > -1){ - estate_type = estate_type.substring(estate_type.indexOf("型:") + 2) + if(estate_type.indexOf("鍨嬶細") > -1){ + estate_type = estate_type.substring(estate_type.indexOf("鍨嬶細") + 2) } if(StringUtils.isNotBlank(estate_type)){ obj.put("estate_type", estate_type.trim()) @@ -93,8 +93,8 @@ class ZufangShopRentPublisher implements Publishable { if(dataMap.get("publish_date")){ String publish_date = dataMap.get("publish_date") - if(publish_date.indexOf("发布时间:") > -1){ - publish_date = publish_date.substring(publish_date.indexOf("发布时间:")) + if(publish_date.indexOf("鍙戝竷鏃堕棿锛�") > -1){ + publish_date = publish_date.substring(publish_date.indexOf("鍙戝竷鏃堕棿锛�")) Date date = DateUtil.parseStringToDate(publish_date); if(date!=null){ obj.put("publish_date", date) @@ -108,11 +108,11 @@ class ZufangShopRentPublisher implements Publishable { // // if(dataMap.get("build_date")){ // String build_date = dataMap.get("build_date") -// if(build_date.indexOf("年代:") > -1){ -// build_date = build_date.substring(build_date.indexOf("年代:") + 3) +// if(build_date.indexOf("骞翠唬锛�") > -1){ +// build_date = build_date.substring(build_date.indexOf("骞翠唬锛�") + 3) // } -// if(build_date.indexOf("年代:") > -1){ -// build_date = build_date.substring(0 , build_date.indexOf("年代:")) +// if(build_date.indexOf("骞翠唬锛�") > -1){ +// build_date = build_date.substring(0 , build_date.indexOf("骞翠唬锛�")) // } // if(StringUtils.isNotBlank(build_date)){ // obj.put("build_date", build_date.trim()) @@ -121,7 +121,7 @@ class ZufangShopRentPublisher implements Publishable { // // if(dataMap.get("direction")){ // String direction = dataMap.get("direction") -// direction = direction.replace("朝向:", "") +// direction = direction.replace("鏈濆悜锛�", "") // if(StringUtils.isNotBlank(direction)){ // obj.put("direction", direction.trim()) // } @@ -129,8 +129,8 @@ class ZufangShopRentPublisher implements Publishable { // if(dataMap.get("total_price")) { def total_price = dataMap.get("total_price").toString() - if(total_price.indexOf("元/平米/天") > -1){ - total_price = total_price.substring(total_price.indexOf("元/平米/天") + 6) + if(total_price.indexOf("鍏�/骞崇背/澶�") > -1){ + total_price = total_price.substring(total_price.indexOf("鍏�/骞崇背/澶�") + 6) } Pattern pa=Pattern.compile("(\\d+)") Matcher ma=pa.matcher(total_price) @@ -146,8 +146,8 @@ class ZufangShopRentPublisher implements Publishable { if(dataMap.get("fitment")){ String fitment = dataMap.get("fitment") - if(fitment.indexOf("修:") > -1){ - fitment = fitment.substring(fitment.indexOf("修:") + 2) + if(fitment.indexOf("淇細") > -1){ + fitment = fitment.substring(fitment.indexOf("淇細") + 2) } if(StringUtils.isNotBlank(fitment)){ obj.put("fitment", fitment.trim()) @@ -156,8 +156,8 @@ class ZufangShopRentPublisher implements Publishable { if(dataMap.get("district_name")){ String district_name = dataMap.get("district_name") - if(district_name.indexOf("称:") > -1){ - district_name = district_name.substring(district_name.indexOf("称:") + 2) + if(district_name.indexOf("绉帮細") > -1){ + district_name = district_name.substring(district_name.indexOf("绉帮細") + 2) } district_name = trimChar(district_name) if(StringUtils.isNotBlank(district_name)){ @@ -167,8 +167,8 @@ class ZufangShopRentPublisher implements Publishable { if(dataMap.get("room")){ String room = dataMap.get("room") - if(room.indexOf("室") > -1){ - room = room.substring(0 , room.indexOf("室")) + if(room.indexOf("瀹�") > -1){ + room = room.substring(0 , room.indexOf("瀹�")) if(!NumberUtils.isNumber(room)){ room = null } @@ -200,8 +200,8 @@ class ZufangShopRentPublisher implements Publishable { if(dataMap.get("contact_people")){ String contact_people = dataMap.get("contact_people") - if(contact_people.indexOf("联系人:") > -1){ - contact_people = contact_people.substring(contact_people.indexOf("联系人:") + 4) + if(contact_people.indexOf("鑱旂郴浜猴細") > -1){ + contact_people = contact_people.substring(contact_people.indexOf("鑱旂郴浜猴細") + 4) } else { contact_people = null } @@ -210,12 +210,12 @@ class ZufangShopRentPublisher implements Publishable { } } - obj.put("mobile", dataMap.get("mobile").toString().replace("联系电话:", "")) + obj.put("mobile", dataMap.get("mobile").toString().replace("鑱旂郴鐢佃瘽锛�", "")) if(dataMap.get("address")){ String address = dataMap.get("address") - if(address.indexOf("置:") > -1){ - address = address.substring(address.indexOf("置:") + 2) + if(address.indexOf("缃細") > -1){ + address = address.substring(address.indexOf("缃細") + 2) } if(StringUtils.isNotBlank(address)){ obj.put("address", address.trim()) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/filter/SellDataFilter2.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/filter/SellDataFilter2.groovy index 9a853a79e..024f0002a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/filter/SellDataFilter2.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/publisher/filter/SellDataFilter2.groovy @@ -57,7 +57,7 @@ class SellDataFilter2 implements DataFilter { } - //上面是必填项---------------------------------- + //涓婇潰鏄繀濉」---------------------------------- if (object.get("floor") != null && (Integer) object.get("floor") <= -5) { return new Reason(13, false); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/rate/HouseAreaRateStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/rate/HouseAreaRateStat.groovy index f0f789361..503af4a00 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/rate/HouseAreaRateStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/rate/HouseAreaRateStat.groovy @@ -11,7 +11,7 @@ class HouseAreaRateStat { DSCollection houseDataStoreConnection = null; DSCollection dataStoreConnection = null; - def areas = ["0-50","50-70","70-90","90-110","110-140","140-160","160-200","200-300","300以上"]; + def areas = ["0-50","50-70","70-90","90-110","110-140","140-160","160-200","200-300","300浠ヤ笂"]; static main(args) { @@ -46,7 +46,7 @@ class HouseAreaRateStat { Date startDate = DateUtil.truncateDay(new Date()-30); def startDate1 = startDate.format('yyyyMMdd'); - def city = "延安"; + def city = "寤跺畨"; def ret = getAllDistricts(city, "district"); def districts = []; @@ -67,9 +67,9 @@ class HouseAreaRateStat { } } - createExcel(districts, "E:\\数据测试\\结果\\", city+"各面积区间小区均价报表.csv", "avg_price"); + createExcel(districts, "E:\\鏁版嵁娴嬭瘯\\缁撴灉\\", city+"鍚勯潰绉尯闂村皬鍖哄潎浠锋姤琛�.csv", "avg_price"); districts = caluateRate(districts); - createExcel(districts, "E:\\数据测试\\结果\\", city+"各面积区间小区均价系数报表.csv", "area_rate"); + createExcel(districts, "E:\\鏁版嵁娴嬭瘯\\缁撴灉\\", city+"鍚勯潰绉尯闂村皬鍖哄潎浠风郴鏁版姤琛�.csv", "area_rate"); } @@ -100,7 +100,7 @@ class HouseAreaRateStat { def minArea = areas[0]; def minPriceMap = m.get(minArea); - minPriceMap.area_rate = 1;//设置默认值 + minPriceMap.area_rate = 1;//璁剧疆榛樿鍊� for(def i=1;i=200 && area<=300){ key = "200-300"; }else if(area>300){ - key = "300以上" + key = "300浠ヤ笂" } def valMap = ret.get(key); if(!valMap){ @@ -224,9 +224,9 @@ class HouseAreaRateStat { } - file.append("城市,") - file.append("区域,") - file.append("楼盘名称,") + file.append("鍩庡競,") + file.append("鍖哄煙,") + file.append("妤肩洏鍚嶇О,") for(def area : areas){ file.append(area +",") } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/AnalyticsUtmGifLog.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/AnalyticsUtmGifLog.groovy index a3c899151..db2276167 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/AnalyticsUtmGifLog.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/AnalyticsUtmGifLog.groovy @@ -13,10 +13,10 @@ import com.mongodb.DBObject; import com.mongodb.Mongo; /** - * 房源日志分析(每月1号执行一次) - * 数据来源:192.168.0.204 analytics.utm_gif_log - * 购房需求分析结果表:goojia_common.zjt_housing_trend - * 按区域、房型、面积、总价等分类分析结果表:reda.house_analysis + * 鎴挎簮鏃ュ織鍒嗘瀽(姣忔湀1鍙锋墽琛屼竴娆�) + * 鏁版嵁鏉ユ簮锛�192.168.0.204 analytics.utm_gif_log + * 璐埧闇�姹傚垎鏋愮粨鏋滆〃锛歡oojia_common.zjt_housing_trend + * 鎸夊尯鍩熴�佹埧鍨嬨�侀潰绉�佹�讳环绛夊垎绫诲垎鏋愮粨鏋滆〃锛歳eda.house_analysis */ @BatchOwner(Watcher.Reda) class AnalyticsUtmGifLog extends BaseBatch { @@ -26,27 +26,27 @@ class AnalyticsUtmGifLog extends BaseBatch { def Mongo mongoDbRegionBlock = MongoUtils.getMongo(MongoUtils.ONLINE_LOG_URL, 27017); def DBCollection collectionLog = mongoDbLog.getDB('analytics').getCollection('utm_gif_log'); - //按时段进行分析 + //鎸夋椂娈佃繘琛屽垎鏋� def DBCollection collectionHousingTrend = mongoDbWrite.getDB('goojia').getCollection('goojia_common.zjt_housing_trend'); - //按房型、面积、总价、区域分析 + //鎸夋埧鍨嬨�侀潰绉�佹�讳环銆佸尯鍩熷垎鏋� def DBCollection collectionHouseAnalysis = mongoDbWrite.getDB('reda').getCollection('house_analysis'); - //区域板块 + //鍖哄煙鏉垮潡 def DBCollection collectionRegionBlock = mongoDbRegionBlock.getDB('fangjia').getCollection('region_block'); - //reda开通的城市 + //reda寮�閫氱殑鍩庡競 def cities = ZjtAnalysisUtil.getCityList(); - def static final ERSHOUFANG = /ershoufang/; //二手房URL正则表达式 - def static final REGION = /r-([\u4E00-\u9FFF]+)/; //区域正则表达式 - def static final BLOCK = /b-([\u4E00-\u9FFF]+)/; //板块正则表达式 - def static final TOTALPRICE = /o-(\d)/; //总价正则表达式 - def static final AREA = /n-(\d)/; //面积正则表达式 - def static final HOUSETYPE = /s-(\d)/; //房型正则表达式 - //一线城市数据对照 - def static final TOTALPRICE_MAP = ["1":"60万以下", "2":"60-90万","3":"90-130万", "4":"130-180万", "5":"180-250万","6":"250-360万","7":"360-500万" ,"8":"500-800万","9":"800万以上"]; - //二线城市数据对照 - def static final TOTALPRICE_MAP_SECOND = ["1":"35万以下","2":"35-50万","3":"50-80万","4":"80-100万","5":"100-120万","6":"120-150万","7":"150-200万","8":"200-300万","9":"300万以上"]; - def static final AREA_MAP = ["1":"50平米以下", "2":"50-70平米" , "3":"70-90平米", "4":"90-110平米", "5":"110-140平米", "6":"140-160平米", "7":"160-200平米", "8":"200-300平米" ,"9":"300-500平米", "10":"500平米以上"]; - def static final HOUSETYPE_MAP = ["1":"一室","2":"二室","3":"三室" ,"4":"四室","5":"五室","6":"五室以上" ]; + def static final ERSHOUFANG = /ershoufang/; //浜屾墜鎴縐RL姝e垯琛ㄨ揪寮� + def static final REGION = /r-([\u4E00-\u9FFF]+)/; //鍖哄煙姝e垯琛ㄨ揪寮� + def static final BLOCK = /b-([\u4E00-\u9FFF]+)/; //鏉垮潡姝e垯琛ㄨ揪寮� + def static final TOTALPRICE = /o-(\d)/; //鎬讳环姝e垯琛ㄨ揪寮� + def static final AREA = /n-(\d)/; //闈㈢Н姝e垯琛ㄨ揪寮� + def static final HOUSETYPE = /s-(\d)/; //鎴垮瀷姝e垯琛ㄨ揪寮� + //涓�绾垮煄甯傛暟鎹鐓� + def static final TOTALPRICE_MAP = ["1":"60涓囦互涓�", "2":"60-90涓�","3":"90-130涓�", "4":"130-180涓�", "5":"180-250涓�","6":"250-360涓�","7":"360-500涓�" ,"8":"500-800涓�","9":"800涓囦互涓�"]; + //浜岀嚎鍩庡競鏁版嵁瀵圭収 + def static final TOTALPRICE_MAP_SECOND = ["1":"35涓囦互涓�","2":"35-50涓�","3":"50-80涓�","4":"80-100涓�","5":"100-120涓�","6":"120-150涓�","7":"150-200涓�","8":"200-300涓�","9":"300涓囦互涓�"]; + def static final AREA_MAP = ["1":"50骞崇背浠ヤ笅", "2":"50-70骞崇背" , "3":"70-90骞崇背", "4":"90-110骞崇背", "5":"110-140骞崇背", "6":"140-160骞崇背", "7":"160-200骞崇背", "8":"200-300骞崇背" ,"9":"300-500骞崇背", "10":"500骞崇背浠ヤ笂"]; + def static final HOUSETYPE_MAP = ["1":"涓�瀹�","2":"浜屽","3":"涓夊" ,"4":"鍥涘","5":"浜斿","6":"浜斿浠ヤ笂" ]; @Override public void process(Object args) { @@ -92,7 +92,7 @@ class AnalyticsUtmGifLog extends BaseBatch { def areaMap = [:]; def houseTypeMap =[:]; - //各区域 + //鍚勫尯鍩� def blockRegionMap = [:]; def totalPriceRegionMap = [:]; def areaRegionMap = [:]; @@ -107,7 +107,7 @@ class AnalyticsUtmGifLog extends BaseBatch { fields.put("start_time", 1); def c = 0; collectionLog.find(query, fields).batchSize(5000).each{row-> - if((row.request_url =~ ERSHOUFANG).find()){ //二手房检索条件 + if((row.request_url =~ ERSHOUFANG).find()){ //浜屾墜鎴挎绱㈡潯浠� def hour = DateUtils.getHour(row.start_time); def day = DateUtils.getDay(row.start_time); @@ -126,7 +126,7 @@ class AnalyticsUtmGifLog extends BaseBatch { } } - //区域统计 + //鍖哄煙缁熻 regionMap[region] = (regionMap[region]?:0) + 1; if(region != "") { @@ -146,12 +146,12 @@ class AnalyticsUtmGifLog extends BaseBatch { } - //总价统计 + //鎬讳环缁熻 def totalPriceRegExp = (row.request_url =~ TOTALPRICE); if (totalPriceRegExp.find()) { def totalPrice = totalPriceRegExp.group(1); def fromatTotalPrice; - if (city =="北京" ||city =="上海" ||city =="广州"||city =="深圳" ) { + if (city =="鍖椾含" ||city =="涓婃捣" ||city =="骞垮窞"||city =="娣卞湷" ) { fromatTotalPrice = TOTALPRICE_MAP[totalPrice]; } else { fromatTotalPrice = TOTALPRICE_MAP_SECOND[totalPrice]; @@ -168,7 +168,7 @@ class AnalyticsUtmGifLog extends BaseBatch { } } - //面积统计 + //闈㈢Н缁熻 def areaRegExp = (row.request_url =~ AREA); if (areaRegExp.find()) { def area = areaRegExp.group(1); @@ -185,7 +185,7 @@ class AnalyticsUtmGifLog extends BaseBatch { } } - //房型统计 + //鎴垮瀷缁熻 def houseTypeRegExp = (row.request_url =~ HOUSETYPE); if (houseTypeRegExp.find()) { def houseType = houseTypeRegExp.group(1); @@ -371,32 +371,32 @@ class AnalyticsUtmGifLog extends BaseBatch { long endMillSecond = System.currentTimeMillis(); println "[${new Date().format('yyyy-MM-dd HH:mm:ss SSS')}] batch end" println "Total Time: ${(endMillSecond - startMillSecond)/(1000 * 60)} mins" - def msg = "房源分析运行"+DataUtil.getRound((endMillSecond - startMillSecond)/(1000 * 60))+"分钟!"; + def msg = "鎴挎簮鍒嗘瀽杩愯"+DataUtil.getRound((endMillSecond - startMillSecond)/(1000 * 60))+"鍒嗛挓锛�"; BatchHelper.logBatchEnd(result._id, msg); } def getHanZiOfWeek(week){ if(week == 0){ - return "周日" + return "鍛ㄦ棩" } if(week == 1){ - return "周一" + return "鍛ㄤ竴" } if(week == 2){ - return "周二" + return "鍛ㄤ簩" } if(week == 3){ - return "周三" + return "鍛ㄤ笁" } if(week == 4){ - return "周四" + return "鍛ㄥ洓" } if(week == 5){ - return "周五" + return "鍛ㄤ簲" } if(week == 6){ - return "周六" + return "鍛ㄥ叚" } return null } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/ArchiveBrokerDisplay.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/ArchiveBrokerDisplay.groovy index fab298af1..10ef2e62e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/ArchiveBrokerDisplay.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/ArchiveBrokerDisplay.groovy @@ -12,21 +12,21 @@ import com.mongodb.DBObject; import com.mongodb.Mongo; /** - * 数据迁移 - * zjt_broker_display数据迁移至zjt_broker_display_archive表中 - * 规则:zjt_broker_display时(type="HOUR")数据保留最近7天,日(type="DAY")数据保留3个月(90天),周(type="WEEK")和年(type="MONTH")数据保留不动 - * 每天凌晨1点开始启动此Batch + * 鏁版嵁杩佺Щ + * zjt_broker_display鏁版嵁杩佺Щ鑷硓jt_broker_display_archive琛ㄤ腑 + * 瑙勫垯锛歾jt_broker_display鏃�(type="HOUR")鏁版嵁淇濈暀鏈�杩�7澶╋紝鏃�(type="DAY")鏁版嵁淇濈暀3涓湀(90澶�)锛屽懆(type="WEEK")鍜屽勾(type="MONTH")鏁版嵁淇濈暀涓嶅姩 + * 姣忓ぉ鍑屾櫒1鐐瑰紑濮嬪惎鍔ㄦBatch */ @BatchOwner(Watcher.Reda) class ArchiveBrokerDisplay extends BaseBatch { def Mongo mongoDbRead = MongoUtils.getMongo(MongoUtils.REDA_READ_URL, 27017); - //线下测试mongo + //绾夸笅娴嬭瘯mongo def Mongo mongoDbWrite = MongoUtils.getMongo(MongoUtils.ARCHIVE_URL, 27017); - //原始数据表zjt_broker_display + //鍘熷鏁版嵁琛▃jt_broker_display def DBCollection collOriginal = mongoDbRead.getDB('goojia').getCollection('goojia_common.zjt_broker_display'); - //数据存档表 zjt_broker_display + //鏁版嵁瀛樻。琛� zjt_broker_display def DBCollection collHourArchive = mongoDbWrite.getDB('reda_hour_archive').getCollection('broker_display_hour_archive'); def DBCollection collDayArchive = mongoDbWrite.getDB('reda_day_archive').getCollection('broker_display_day_archive'); @@ -37,15 +37,15 @@ class ArchiveBrokerDisplay extends BaseBatch { long startMillSecond = System.currentTimeMillis(); println "[${new Date().format('yyyy-MM-dd HH:mm:ss SSS')}] batch start"; - //"时"的数据 最近7天 + //"鏃�"鐨勬暟鎹� 鏈�杩�7澶� def archiveHourTime = DateUtils.truncateDay(DateUtils.getNowDateAfterDays(new Date(),-7)); - //"日"的数据 最近90天 + //"鏃�"鐨勬暟鎹� 鏈�杩�90澶� def archiveDayTime = DateUtils.truncateDay(DateUtils.getNowDateAfterDays(new Date(),-90)); - //archive"时"的数据 + //archive"鏃�"鐨勬暟鎹� processArchive(collHourArchive, archiveHourTime,"HOUR"); - //archive"日"的数据 + //archive"鏃�"鐨勬暟鎹� processArchive(collDayArchive,archiveDayTime,"DAY"); long endMillSecond = System.currentTimeMillis(); @@ -74,8 +74,8 @@ class ArchiveBrokerDisplay extends BaseBatch { DBObject _sort = new BasicDBObject() _sort.put("_id", 1); - def idList =[]; //需要删除的IDList - def archiveSaves = []; //需要保存的数据 + def idList =[]; //闇�瑕佸垹闄ょ殑IDList + def archiveSaves = []; //闇�瑕佷繚瀛樼殑鏁版嵁 collOriginal.find(query).limit(1000).sort(_sort).each {row-> diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/ArchiveCompanyDisplay.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/ArchiveCompanyDisplay.groovy index fb4bce9da..94f58b2c3 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/ArchiveCompanyDisplay.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/ArchiveCompanyDisplay.groovy @@ -11,21 +11,21 @@ import com.mongodb.DBObject; import com.mongodb.Mongo; /** - * 数据迁移 - * zjt_company_display数据迁移至zjt_company_display_archive表中 - * 规则:zjt_company_display时(type="HOUR")数据保留最近7天,日(type="DAY")数据保留3个月(90天),周(type="WEEK")和年(type="MONTH")数据保留不动 - * 每天凌晨1点开始启动此Batch + * 鏁版嵁杩佺Щ + * zjt_company_display鏁版嵁杩佺Щ鑷硓jt_company_display_archive琛ㄤ腑 + * 瑙勫垯锛歾jt_company_display鏃�(type="HOUR")鏁版嵁淇濈暀鏈�杩�7澶╋紝鏃�(type="DAY")鏁版嵁淇濈暀3涓湀(90澶�)锛屽懆(type="WEEK")鍜屽勾(type="MONTH")鏁版嵁淇濈暀涓嶅姩 + * 姣忓ぉ鍑屾櫒1鐐瑰紑濮嬪惎鍔ㄦBatch */ @BatchOwner(Watcher.Reda) class ArchiveCompanyDisplay extends BaseBatch { def Mongo mongoDbRead = MongoUtils.getMongo(MongoUtils.REDA_READ_URL, 27017); - //线下测试mongo + //绾夸笅娴嬭瘯mongo def Mongo mongoDbWrite = MongoUtils.getMongo(MongoUtils.ARCHIVE_URL, 27017); - //原始数据表zjt_company_display + //鍘熷鏁版嵁琛▃jt_company_display def DBCollection collOriginal = mongoDbRead.getDB('goojia').getCollection('goojia_common.zjt_company_display'); - //数据存档表 + //鏁版嵁瀛樻。琛� def DBCollection collHourArchive = mongoDbWrite.getDB('reda_hour_archive').getCollection('company_display_hour_archive'); def DBCollection collDayArchive = mongoDbWrite.getDB('reda_day_archive').getCollection('company_display_day_archive'); @@ -36,15 +36,15 @@ class ArchiveCompanyDisplay extends BaseBatch { long startMillSecond = System.currentTimeMillis(); println "[${new Date().format('yyyy-MM-dd HH:mm:ss SSS')}] batch start"; - //"时"的数据 最近7天 + //"鏃�"鐨勬暟鎹� 鏈�杩�7澶� def archiveHourTime = DateUtils.truncateDay(DateUtils.getNowDateAfterDays(new Date(),-7)); - //"日"的数据 最近90天 + //"鏃�"鐨勬暟鎹� 鏈�杩�90澶� def archiveDayTime = DateUtils.truncateDay(DateUtils.getNowDateAfterDays(new Date(),-90)); - //archive"时"的数据 + //archive"鏃�"鐨勬暟鎹� processArchive(collHourArchive, archiveHourTime,"HOUR"); - //archive"日"的数据 + //archive"鏃�"鐨勬暟鎹� processArchive(collDayArchive, archiveDayTime,"DAY"); long endMillSecond = System.currentTimeMillis(); @@ -73,8 +73,8 @@ class ArchiveCompanyDisplay extends BaseBatch { DBObject _sort = new BasicDBObject() _sort.put("_id", 1); - def idList =[]; //需要删除的IDList - def archiveSaves = []; //需要保存的数据 + def idList =[]; //闇�瑕佸垹闄ょ殑IDList + def archiveSaves = []; //闇�瑕佷繚瀛樼殑鏁版嵁 collOriginal.find(query).limit(1000).sort(_sort).each {row-> diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/ArchiveSearchResultOrder.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/ArchiveSearchResultOrder.groovy index 585565f7e..53af75bf2 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/ArchiveSearchResultOrder.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/ArchiveSearchResultOrder.groovy @@ -12,20 +12,20 @@ import com.mongodb.DBObject; import com.mongodb.Mongo; /** - * 数据迁移 - * search_result_order表中的三天前的数据迁移至search_result_order_archive表 - * 每天凌晨1点开始启动此Batch + * 鏁版嵁杩佺Щ + * search_result_order琛ㄤ腑鐨勪笁澶╁墠鐨勬暟鎹縼绉昏嚦search_result_order_archive琛� + * 姣忓ぉ鍑屾櫒1鐐瑰紑濮嬪惎鍔ㄦBatch */ @BatchOwner(Watcher.Reda) class ArchiveSearchResultOrder extends BaseBatch { def Mongo mongoDbRead = MongoUtils.getMongo(MongoUtils.OFFLINE_REDA_URL, 27017); - //线下测试mongo + //绾夸笅娴嬭瘯mongo def Mongo mongoDbWrite = MongoUtils.getMongo(MongoUtils.OFFLINE_REDA_URL, 27017); - //原始数据表search_result_order + //鍘熷鏁版嵁琛╯earch_result_order def DBCollection collOriginal = mongoDbRead.getDB('goojia').getCollection('goojia_common.search_result_order'); - //数据存档表 search_result_order_archive + //鏁版嵁瀛樻。琛� search_result_order_archive def DBCollection collArchive = mongoDbWrite.getDB('goojia').getCollection('goojia_common.search_result_order_archive'); @@ -34,7 +34,7 @@ class ArchiveSearchResultOrder extends BaseBatch { def result = BatchHelper.logBatchStart(BatchHelper.BATH_MAP.ARCHIVESEARCHRESULTORDER); long startMillSecond = System.currentTimeMillis(); println "[${new Date().format('yyyy-MM-dd HH:mm:ss SSS')}] batch start"; - //archiveTime时间之前的数据要迁移(3天前的时间 ) + //archiveTime鏃堕棿涔嬪墠鐨勬暟鎹杩佺Щ(3澶╁墠鐨勬椂闂� ) def archiveTime = DateUtils.truncateDay(DateUtils.getNowDateAfterDays(new Date(),-8)); def startId = null; def i = 0; @@ -46,7 +46,7 @@ class ArchiveSearchResultOrder extends BaseBatch { query.put("_id", ['$gt' : startId]); } - //检索字段 + //妫�绱㈠瓧娈� DBObject fields = new BasicDBObject(); fields.put("_id", 1); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/BatchHelper.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/BatchHelper.groovy index 14129c483..1a89238fd 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/BatchHelper.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/BatchHelper.groovy @@ -15,56 +15,56 @@ class BatchHelper { def static DBCollection collection = mongoDb.getDB('goojia').getCollection('goojia_common.batch_analysis'); def static Jms jms = Jms.create('tcp://jms.db.fangjia.com:61616') def static dbConn = Sql.newInstance("jdbc:mysql://goojia.db.goojia.com:4306/goojia_common", "sa", "G00jia", "com.mysql.jdbc.Driver"); - def static phoneList = []; //发送短信的手机列表 - def static batchRunningInfo=[:];//batch运行的一些信息 - def static exception = false; //是否有异常 + def static phoneList = []; //鍙戦�佺煭淇$殑鎵嬫満鍒楄〃 + def static batchRunningInfo=[:];//batch杩愯鐨勪竴浜涗俊鎭� + def static exception = false; //鏄惁鏈夊紓甯� - def static final TOTAL ="总"; //"总量" - def static final COMPANY = "空公司"; - def static final TITLE = "空标题"; - def static final BROKER = "空经纪人"; - def static final MOBILE = "空手机"; - def static final DISTRICT = "未抓"; - def static final MATCH = "未匹配"; - def static final COPY ="跳"; //"跳点复制" + def static final TOTAL ="鎬�"; //"鎬婚噺" + def static final COMPANY = "绌哄叕鍙�"; + def static final TITLE = "绌烘爣棰�"; + def static final BROKER = "绌虹粡绾汉"; + def static final MOBILE = "绌烘墜鏈�"; + def static final DISTRICT = "鏈姄"; + def static final MATCH = "鏈尮閰�"; + def static final COPY ="璺�"; //"璺崇偣澶嶅埗" /** - * interval:时间间隔(分钟) - * description:batch描述 - * project:batch所属项目 - * clazz:batch类名 - * expected:期望Batch一次的完成时间(分钟) + * interval:鏃堕棿闂撮殧(鍒嗛挓) + * description:batch鎻忚堪 + * project:batch鎵�灞為」鐩� + * clazz锛歜atch绫诲悕 + * expected锛氭湡鏈汢atch涓�娆$殑瀹屾垚鏃堕棿(鍒嗛挓) */ static final def BATH_MAP = [ - //公司Batch + //鍏徃Batch COMPANYBROKERHOURANALYSIS : [interval:60, expected:10, description: "CompanyBrokerHourAnalysis", project:"REDA", clazz:'CompanyBrokerHourAnalysis'], COMPANYDAYANALYSIS: [interval:60*24, expected:60, description: "CompanyDayAnalysis", project:"REDA", clazz:'CompanyDayAnalysis'], COMPANYWEEKMONTHPERIODANALYSIS: [interval:60*24, expected:60, description: "CompanyWeekMonthPeriodAnalysis", project:"REDA", clazz:'CompanyWeekMonthPeriodAnalysis'], - //经纪人Batch + //缁忕邯浜築atch BROKERWEEKMONTHANALYSIS: [interval:60*24*30, expected:60, description: "BrokerWeekMonthAnalysis", project:"REDA", clazz:'BrokerWeekMonthAnalysis'], - //首页经纪人 + //棣栭〉缁忕邯浜� HOMEBROKERDISPLAY : [interval:60*24, expected:30, description: "HomeBrokerDisplayBatch", project:"REDA", clazz:'HomeBrokerDisplayBatch'], - //抓取监控 + //鎶撳彇鐩戞帶 CRAWLHOURANALYSIS: [interval:60, expected:10, description: "CrawlHourAnalysis", project:"REDA", clazz:'CrawlHourAnalysis'], - //数据Archive + //鏁版嵁Archive ARCHIVECOMPANYDISPLAY: [interval:60*24, expected:60, description: "ArchiveCompanyDisplay", project:"REDA", clazz:'ArchiveCompanyDisplay'], ARCHIVEBROKERDISPLAY: [interval:60*24, expected:60, description: "ArchiveBrokerDisplay", project:"REDA", clazz:'ArchiveBrokerDisplay'], ARCHIVESEARCHRESULTORDER: [interval:60*24, expected:60, description: "ArchiveSearchResultOrder", project:"REDA", clazz:'ArchiveSearchResultOrder'], - //房源分析 + //鎴挎簮鍒嗘瀽 ANALYTICSUTMGIFLOG: [interval:60*24*30, expected:60, description: "AnalyticsUtmGifLog", project:"REDA", clazz:'AnalyticsUtmGifLog'], - //总价和面积分段统计 + //鎬讳环鍜岄潰绉垎娈电粺璁� COMPANYRANGEANALYSIS: [interval:60*24, expected:60, description: "CompanyRangeAnalysis", project:"REDA", clazz:'CompanyRangeAnalysis'] ] /** - * 记录Batch启动时间 + * 璁板綍Batch鍚姩鏃堕棿 */ static def logBatchStart(batch){ @@ -83,7 +83,7 @@ class BatchHelper { } /** - * 记录Batch结束时间,并发短信 + * 璁板綍Batch缁撴潫鏃堕棿,骞跺彂鐭俊 */ static def logBatchEnd(logBatchStartId, msg=null,msgList=null) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/BrokerSms.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/BrokerSms.groovy index 57e1e948e..da36b55d4 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/BrokerSms.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/BrokerSms.groovy @@ -13,32 +13,32 @@ import com.mongodb.BasicDBObject; import com.mongodb.DBObject; /** - * 给经济人发短信 - * 数据来源从datastore中检索 - * 检索条件db.seabird.find({cat:"sell_stat"}) + * 缁欑粡娴庝汉鍙戠煭淇� + * 鏁版嵁鏉ユ簮浠巇atastore涓绱� + * 妫�绱㈡潯浠禿b.seabird.find({cat:"sell_stat"}) */ @BatchOwner(Watcher.Reda) class BrokerSms extends BaseBatch { def DSCollection collDataStore = new DataStore("datastore.db.goojia.com").getCollection("fangjia.seabird") - def smsCity = ['上海','北京']; //发短信的城市列表 + def smsCity = ['涓婃捣','鍖椾含']; //鍙戠煭淇$殑鍩庡競鍒楄〃 @Override public void process(Object args) { // TODO Auto-generated method stub DBObject fields = new BasicDBObject(); - fields.put("region",1); //区域 - fields.put("company",1); //经纪人所属公司 -// fields.put("contact_people",1); //经纪人姓名 - fields.put("mobile",1); //经纪人手机 + fields.put("region",1); //鍖哄煙 + fields.put("company",1); //缁忕邯浜烘墍灞炲叕鍙� +// fields.put("contact_people",1); //缁忕邯浜哄鍚� + fields.put("mobile",1); //缁忕邯浜烘墜鏈� smsCity.each {city-> long startMillSecond = System.currentTimeMillis(); - def fileOut = new File("E://READ发短信", DateUtils.formatToYYYYMMDD(new Date())+"_"+city+ ".csv").newPrintWriter('GBK'); - fileOut.println "手机,公司,区域"; + def fileOut = new File("E://READ鍙戠煭淇�", DateUtils.formatToYYYYMMDD(new Date())+"_"+city+ ".csv").newPrintWriter('GBK'); + fileOut.println "鎵嬫満,鍏徃,鍖哄煙"; def totalCount = 0; def mobileMap = [:]; Set mobileSet = new HashSet(); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/BrokerWeekMonthAnalysis.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/BrokerWeekMonthAnalysis.groovy index b9f076f0a..a8446d39e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/BrokerWeekMonthAnalysis.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/BrokerWeekMonthAnalysis.groovy @@ -14,18 +14,18 @@ import com.fangjia.script.util.ZjtAnalysisUtil /** - * ****************重要提示******************** - * 统计经纪人的房源的Batch(只跑日、周和月的数据) - * 每周一运行一次周的Batch、每月1号运行一次月的Batch + * ****************閲嶈鎻愮ず******************** + * 缁熻缁忕邯浜虹殑鎴挎簮鐨凚atch(鍙窇鏃ャ�佸懆鍜屾湀鐨勬暟鎹�) + * 姣忓懆涓�杩愯涓�娆″懆鐨凚atch銆佹瘡鏈�1鍙疯繍琛屼竴娆℃湀鐨凚atch * - * 【------------------------------------!!!!重要提示 - * 如需要手动启动(手动启动执行原则为先删除原先统计的数据,然后重新进行数据统计),则参数规则为: - * 自定义传参格式【时间+类型 例:20110914 week/month】 - * 格式说明: - * 20110914 day 重跑9月14号数据 - * 20110914 week 重跑上周数据(即9月5日~9月11日) - * 20110914 month 重跑上月数据(即8月1日~8月31日) - * ---------------------------------------】 + * 銆�------------------------------------锛侊紒锛侊紒閲嶈鎻愮ず + * 濡傞渶瑕佹墜鍔ㄥ惎鍔�(鎵嬪姩鍚姩鎵ц鍘熷垯涓哄厛鍒犻櫎鍘熷厛缁熻鐨勬暟鎹紝鐒跺悗閲嶆柊杩涜鏁版嵁缁熻)锛屽垯鍙傛暟瑙勫垯涓猴細 + * 鑷畾涔変紶鍙傛牸寮忋�愭椂闂�+绫诲瀷 渚嬶細20110914 week/month銆� + * 鏍煎紡璇存槑锛� + * 20110914 day 閲嶈窇9鏈�14鍙锋暟鎹� + * 20110914 week 閲嶈窇涓婂懆鏁版嵁锛堝嵆9鏈�5鏃9鏈�11鏃ワ級 + * 20110914 month 閲嶈窇涓婃湀鏁版嵁锛堝嵆8鏈�1鏃8鏈�31鏃ワ級 + * ---------------------------------------銆� */ @BatchOwner(Watcher.Reda) class BrokerWeekMonthAnalysis extends BaseBatch { @@ -49,23 +49,23 @@ class BrokerWeekMonthAnalysis extends BaseBatch { long startMillSecond = System.currentTimeMillis(); long endMillSecond = 0; def CountDownLatch runningThread = null; - def isByHand = false; //是否手动启动 + def isByHand = false; //鏄惁鎵嬪姩鍚姩 def statType; def endDate; def startDate; - //初始化数据库 + //鍒濆鍖栨暟鎹簱 def collectionMap = initCollectionMap(); - //城市:网站 [北京:['anjuke.com', 'soufun.com'], 上海:['anjuke.com']] + //鍩庡競锛氱綉绔� [鍖椾含:['anjuke.com', 'soufun.com'], 涓婃捣:['anjuke.com']] def cityWebsiteMap = ZjtAnalysisUtil.getCityWebsiteMap(); - //城市:小区 [北京:[太月园], 上海:[天山河畔花园, 三江小区]] + //鍩庡競锛氬皬鍖� [鍖椾含:[澶湀鍥璢, 涓婃捣:[澶╁北娌崇晹鑺卞洯, 涓夋睙灏忓尯]] def cityDistrictMap = ZjtAnalysisUtil.getCityDistrictMap(); - if (null != args && args.size() >0) { //手动启动 自定义传参格式 【时间 例:20110914 day /20110914 week /20110914 month】 + if (null != args && args.size() >0) { //鎵嬪姩鍚姩 鑷畾涔変紶鍙傛牸寮� 銆愭椂闂� 渚嬶細20110914 day /20110914 week /20110914 month銆� isByHand = true; if (args.size()!=2) { - throw new IllegalArgumentException("传参错误!请认真确认参数个数与类型............."); + throw new IllegalArgumentException("浼犲弬閿欒!璇疯鐪熺‘璁ゅ弬鏁颁釜鏁颁笌绫诲瀷............."); } statDate = DateUtils.truncateDay(ZjtAnalysisUtil.formatTime(args[0].trim())); @@ -73,17 +73,17 @@ class BrokerWeekMonthAnalysis extends BaseBatch { if ("DAY" == statType) { endDate = statDate; startDate = endDate -1; - println "请先确定手工已删除相关日数据.............." + println "璇峰厛纭畾鎵嬪伐宸插垹闄ょ浉鍏虫棩鏁版嵁.............." } else if ("WEEK" == statType) { - endDate = DateUtils.getFirstDayOfWeek(statDate) +1; //本周一 - startDate = endDate-7; //上周日 - println "请先确定手工已删除上周数据.............." + endDate = DateUtils.getFirstDayOfWeek(statDate) +1; //鏈懆涓� + startDate = endDate-7; //涓婂懆鏃� + println "璇峰厛纭畾鎵嬪伐宸插垹闄や笂鍛ㄦ暟鎹�.............." } else if ("MONTH" == statType) { - endDate = DateUtils.getFirstDayOfMonth(statDate); //本月1号 - startDate = org.apache.commons.lang.time.DateUtils.addMonths(endDate, -1); //上月1号 - println "请先确定手工已删除上月数据.............." + endDate = DateUtils.getFirstDayOfMonth(statDate); //鏈湀1鍙� + startDate = org.apache.commons.lang.time.DateUtils.addMonths(endDate, -1); //涓婃湀1鍙� + println "璇峰厛纭畾鎵嬪伐宸插垹闄や笂鏈堟暟鎹�.............." } else { - throw new IllegalArgumentException("statType传参错误............."); + throw new IllegalArgumentException("statType浼犲弬閿欒............."); } @@ -91,11 +91,11 @@ class BrokerWeekMonthAnalysis extends BaseBatch { } else { - //执行每天的经纪人统计 + //鎵ц姣忓ぉ鐨勭粡绾汉缁熻 println "start Day Batch...."; def startSecond = System.currentTimeMillis(); endDate = DateUtils.truncateDay(new Date()); - startDate = endDate-1; //昨日 + startDate = endDate-1; //鏄ㄦ棩 statType = "DAY"; processBatch(cityWebsiteMap, cityDistrictMap, collectionMap, startDate,endDate, statType); @@ -104,13 +104,13 @@ class BrokerWeekMonthAnalysis extends BaseBatch { println "Day Batch total Time: ${(endMillSecond - startSecond)/(1000 * 60)} mins" - //执行周的Batch------------------------------!!!! - if(DateUtils.getDayOfWeek(statDate) == 1){ //每周周一执行一次 + //鎵ц鍛ㄧ殑Batch------------------------------锛侊紒锛侊紒 + if(DateUtils.getDayOfWeek(statDate) == 1){ //姣忓懆鍛ㄤ竴鎵ц涓�娆� println "start Week Batch...."; startSecond = System.currentTimeMillis(); - endDate = DateUtils.getFirstDayOfWeek(statDate) +1; //本周一 - startDate = endDate-7; //上周一 + endDate = DateUtils.getFirstDayOfWeek(statDate) +1; //鏈懆涓� + startDate = endDate-7; //涓婂懆涓� statType = "WEEK"; processBatch(cityWebsiteMap, cityDistrictMap, collectionMap, startDate,endDate, statType); @@ -120,13 +120,13 @@ class BrokerWeekMonthAnalysis extends BaseBatch { } - //执行月的Batch------------------------------------------------!!!! - if(DateUtils.getDay(statDate) == 1){//每月1号执行一次 + //鎵ц鏈堢殑Batch------------------------------------------------锛侊紒锛侊紒 + if(DateUtils.getDay(statDate) == 1){//姣忔湀1鍙锋墽琛屼竴娆� println "start Month Batch...."; startSecond = System.currentTimeMillis(); - endDate = DateUtils.getFirstDayOfMonth(statDate); //本月1号 - startDate = org.apache.commons.lang.time.DateUtils.addMonths(endDate, -1); //上月1号 + endDate = DateUtils.getFirstDayOfMonth(statDate); //鏈湀1鍙� + startDate = org.apache.commons.lang.time.DateUtils.addMonths(endDate, -1); //涓婃湀1鍙� statType = "MONTH"; processBatch(cityWebsiteMap, cityDistrictMap, collectionMap, startDate,endDate, statType); @@ -137,17 +137,17 @@ class BrokerWeekMonthAnalysis extends BaseBatch { } endMillSecond = System.currentTimeMillis(); - def msg = (isByHand?"手动启动":"")+"经济人,日"; + def msg = (isByHand?"鎵嬪姩鍚姩":"")+"缁忔祹浜猴紝鏃�"; if(DateUtils.getDayOfWeek(statDate) == 1){ - msg += "/周"; + msg += "/鍛�"; } if(DateUtils.getDay(statDate) == 1){ - msg += "/月"; + msg += "/鏈�"; } if (BatchHelper.getException()) { - msg = msg + ",运行有异常!!!" + msg = msg + ",杩愯鏈夊紓甯革紒锛侊紒" } else { - msg = msg + ",运行"+DataUtil.getRound((endMillSecond - startMillSecond)/(1000 * 60))+"分钟!"; + msg = msg + "锛岃繍琛�"+DataUtil.getRound((endMillSecond - startMillSecond)/(1000 * 60))+"鍒嗛挓!"; } println "[${new Date().format('yyyy-MM-dd HH:mm:ss SSS')}] batch end"; @@ -158,7 +158,7 @@ class BrokerWeekMonthAnalysis extends BaseBatch { def processBatch(cityWebsiteMap, cityDistrictMap, collectionMap, startDate,endDate, statType) { - def threadCount = 0; //启动线程总数 + def threadCount = 0; //鍚姩绾跨▼鎬绘暟 cityWebsiteMap.keySet().each{city-> cityWebsiteMap[city].each{website-> threadCount++; } } @@ -181,7 +181,7 @@ class BrokerWeekMonthAnalysis extends BaseBatch { } - //数据库初始化 + //鏁版嵁搴撳垵濮嬪寲 def initCollectionMap() { def collectionMap = [:] diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/BrokerWeekMonthAnalysisProcesser.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/BrokerWeekMonthAnalysisProcesser.groovy index e730355c9..ef14efdd1 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/BrokerWeekMonthAnalysisProcesser.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/BrokerWeekMonthAnalysisProcesser.groovy @@ -12,14 +12,14 @@ import com.mongodb.DBObject; class BrokerWeekMonthAnalysisProcesser implements Runnable{ def DBCollection collBrokerDisplayRead; - //Archive数据表 + //Archive鏁版嵁琛� def DBCollection collBrokerDisplayReadArchive def DBCollection collBrokerDisplayWrite; - //城市:小区 [北京:[太月园], 上海:[天山河畔花园, 三江小区]] + //鍩庡競锛氬皬鍖� [鍖椾含:[澶湀鍥璢, 涓婃捣:[澶╁北娌崇晹鑺卞洯, 涓夋睙灏忓尯]] def cityDistrictList; - def city; //城市 - def website; //网站 + def city; //鍩庡競 + def website; //缃戠珯 def statType; def endDate; def startDate; @@ -60,7 +60,7 @@ class BrokerWeekMonthAnalysisProcesser implements Runnable{ } println "runningThread.getCount()------"+runningThread.getCount(); long e = System.currentTimeMillis() - println "${city}-${website} finished: "+DataUtil.getRound((e-s)/(1000 * 60))+"分钟................" + println "${city}-${website} finished: "+DataUtil.getRound((e-s)/(1000 * 60))+"鍒嗛挓................" } def processer(city, website, cityDistrictList, statType, startDate, endDate, pageName) { @@ -120,7 +120,7 @@ class BrokerWeekMonthAnalysisProcesser implements Runnable{ datas.add(row); } - //从Archive表中获取数据---------------------------- + //浠嶢rchive琛ㄤ腑鑾峰彇鏁版嵁---------------------------- def lastMonday = DateUtils.getFirstDayOfWeek(new Date()) -6; if (statType == "MONTH" ||(statType =='WEEK' && startDate.before(lastMonday))) { @@ -161,7 +161,7 @@ class BrokerWeekMonthAnalysisProcesser implements Runnable{ datas ); - datas = []; //数据清理释放内存 + datas = []; //鏁版嵁娓呯悊閲婃斁鍐呭瓨 dataMap.keySet().each {districtName-> @@ -171,7 +171,7 @@ class BrokerWeekMonthAnalysisProcesser implements Runnable{ ['broker', 'house_count', 'urls','hash_code' ], dataMap[districtName] ); - dataMap[districtName] = []; //数据清理释放内存 + dataMap[districtName] = []; //鏁版嵁娓呯悊閲婃斁鍐呭瓨 companyMap.keySet().each {companyName-> @@ -196,10 +196,10 @@ class BrokerWeekMonthAnalysisProcesser implements Runnable{ } } - companyMap[companyName] = []; //数据清理释放内存 + companyMap[companyName] = []; //鏁版嵁娓呯悊閲婃斁鍐呭瓨 brokerCountMap.keySet().each {broker-> - //不统计公司为空或者公司为unknown以及经纪人手机为空或者姓名为空以及经纪人为unknown的数据 + //涓嶇粺璁″叕鍙镐负绌烘垨鑰呭叕鍙镐负unknown浠ュ強缁忕邯浜烘墜鏈轰负绌烘垨鑰呭鍚嶄负绌轰互鍙婄粡绾汉涓簎nknown鐨勬暟鎹� if (companyName && companyName !="unknown" && broker!="unknown" && broker.broker_name && broker.broker_mobile) { DBObject obj = new BasicDBObject(); obj.put("city", city); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/CleanRubbishData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/CleanRubbishData.groovy index 9fc4da104..299fce232 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/CleanRubbishData.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/CleanRubbishData.groovy @@ -16,9 +16,9 @@ class CleanRubbishData extends BaseBatch { def static DBCollection collCompanyDisplay = MongoUtils.getCollectionByName("goojia", "goojia_common.zjt_company_display_archive", MongoUtils.REDA_WRITE_URL); def static DBCollection collBrokerDisplay = MongoUtils.getCollectionByName("goojia", "goojia_common.zjt_broker_display_archive", MongoUtils.REDA_WRITE_URL); - //城市:网站 [北京:['anjuke.com', 'soufun.com'], 上海:['anjuke.com']] + //鍩庡競锛氱綉绔� [鍖椾含:['anjuke.com', 'soufun.com'], 涓婃捣:['anjuke.com']] def cityWebsiteMap = ZjtAnalysisUtil.getCityWebsiteMap(); - //城市:小区 [北京:[太月园], 上海:[天山河畔花园, 三江小区]] + //鍩庡競锛氬皬鍖� [鍖椾含:[澶湀鍥璢, 涓婃捣:[澶╁北娌崇晹鑺卞洯, 涓夋睙灏忓尯]] def cityDistrictMap = ZjtAnalysisUtil.getCityDistrictMap(); @Override @@ -30,9 +30,9 @@ class CleanRubbishData extends BaseBatch { def CountDownLatch runningThread = null; -// if (null != args && args.size() >0) { //自定义运行Batch 自定义传参格式 【时间 例:2011091408 】 +// if (null != args && args.size() >0) { //鑷畾涔夎繍琛孊atch 鑷畾涔変紶鍙傛牸寮� 銆愭椂闂� 渚嬶細2011091408 銆� - def threadCount = 0; //启动线程总数 + def threadCount = 0; //鍚姩绾跨▼鎬绘暟 cityWebsiteMap.keySet().each{city-> cityWebsiteMap[city].each{website-> threadCount++; } } @@ -104,7 +104,7 @@ class CleanRubbishData extends BaseBatch { def statDate = getStatDate(repairHour); println statDate; if (null == statDate) { - throw new IllegalArgumentException("时间参数有误!".toString()); + throw new IllegalArgumentException("鏃堕棿鍙傛暟鏈夎锛�".toString()); } cityWebsiteMap.keySet().each{city-> diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/CleanRubbishDataProcesser.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/CleanRubbishDataProcesser.groovy index cc030923d..7dd736bdf 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/CleanRubbishDataProcesser.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/CleanRubbishDataProcesser.groovy @@ -10,15 +10,15 @@ import com.mongodb.DBObject; class CleanRubbishDataProcesser implements Runnable{ def statDate; - //公司数据统计表 + //鍏徃鏁版嵁缁熻琛� def DBCollection collCompanyDisplay; - //经纪人数据统计表 + //缁忕邯浜烘暟鎹粺璁¤〃 def DBCollection collBrokerDisplay; - //城市:小区 [北京:[太月园], 上海:[天山河畔花园, 三江小区]] + //鍩庡競锛氬皬鍖� [鍖椾含:[澶湀鍥璢, 涓婃捣:[澶╁北娌崇晹鑺卞洯, 涓夋睙灏忓尯]] def cityDistrictList; - //城市 + //鍩庡競 def city; - //网站 + //缃戠珯 def website; def CountDownLatch runningThread; @@ -53,20 +53,20 @@ class CleanRubbishDataProcesser implements Runnable{ } /** - * 多线程处理器 + * 澶氱嚎绋嬪鐞嗗櫒 * - * @param city 城市 - * @param website 网站 - * @param cityDistrictList 小区列表 - * @param ranges 时间范围 + * @param city 鍩庡競 + * @param website 缃戠珯 + * @param cityDistrictList 灏忓尯鍒楄〃 + * @param ranges 鏃堕棿鑼冨洿 * @return */ def processer(city, website, cityDistrictList){ - //分组处理小区数据 + //鍒嗙粍澶勭悊灏忓尯鏁版嵁 ZjtAnalysisUtil.splitArray(cityDistrictList, 30).each {districtList-> - //查询条件 + //鏌ヨ鏉′欢 DBObject query = new BasicDBObject(); query.put("district_name", ['$in' : districtList]); @@ -76,7 +76,7 @@ class CleanRubbishDataProcesser implements Runnable{ query.put("stat_date", statDate); - //检索字段 + //妫�绱㈠瓧娈� DBObject fields = new BasicDBObject(); fields.put("_id", 1); fields.put("district_name", 1); @@ -95,13 +95,13 @@ class CleanRubbishDataProcesser implements Runnable{ districtList.each {district-> - def companyHomeDataMap = [:]; //公司首页数据 - def companyTop3DataMap = [:]; //公司Top3数据 + def companyHomeDataMap = [:]; //鍏徃棣栭〉鏁版嵁 + def companyTop3DataMap = [:]; //鍏徃Top3鏁版嵁 - def deleteIdList =[]; //需要删除的数据IDList + def deleteIdList =[]; //闇�瑕佸垹闄ょ殑鏁版嵁IDList - def districtDataList = companyDisplayDataMap[district]; //小区中的房源 - companyDisplayDataMap[district] =[:]; //释放内存 + def districtDataList = companyDisplayDataMap[district]; //灏忓尯涓殑鎴挎簮 + companyDisplayDataMap[district] =[:]; //閲婃斁鍐呭瓨 if (!districtDataList){ districtDataList=[]; } @@ -136,7 +136,7 @@ class CleanRubbishDataProcesser implements Runnable{ } - //处理经纪人的数据 + //澶勭悊缁忕邯浜虹殑鏁版嵁 fields = new BasicDBObject(); fields.put("_id", 1); @@ -156,12 +156,12 @@ class CleanRubbishDataProcesser implements Runnable{ districtList.each {district-> - def brokerTop3DataMap = [:]; //经纪人Top3数据 + def brokerTop3DataMap = [:]; //缁忕邯浜篢op3鏁版嵁 - def deleteIdList =[]; //需要删除的数据IDList + def deleteIdList =[]; //闇�瑕佸垹闄ょ殑鏁版嵁IDList - def districtDataList = brokerDisplayDataMap[district]; //小区中的房源 - brokerDisplayDataMap[district] =[:]; //释放内存 + def districtDataList = brokerDisplayDataMap[district]; //灏忓尯涓殑鎴挎簮 + brokerDisplayDataMap[district] =[:]; //閲婃斁鍐呭瓨 if (!districtDataList){ districtDataList=[]; } @@ -197,7 +197,7 @@ class CleanRubbishDataProcesser implements Runnable{ } /** - * 查找需要删除的IDList + * 鏌ユ壘闇�瑕佸垹闄ょ殑IDList * @param dataMap * @return */ @@ -209,13 +209,13 @@ class CleanRubbishDataProcesser implements Runnable{ def dataList = dataMap[company]; if (dataList) { - if (dataList.size() > 1) { //有多条数据的需要处理 + if (dataList.size() > 1) { //鏈夊鏉℃暟鎹殑闇�瑕佸鐞� dataList.sort { a,b-> return (a.creation_date).compareTo(b.creation_date) } - def falseDataId; //creation_date最新的一个造假数据ID - def realDataId; //creation_date最新的一个真实数据ID + def falseDataId; //creation_date鏈�鏂扮殑涓�涓�犲亣鏁版嵁ID + def realDataId; //creation_date鏈�鏂扮殑涓�涓湡瀹炴暟鎹甀D dataList.each {row-> if (row.false_date) { @@ -238,7 +238,7 @@ class CleanRubbishDataProcesser implements Runnable{ } /** - * 查找需要删除的IDList + * 鏌ユ壘闇�瑕佸垹闄ょ殑IDList * @param dataMap * @return */ @@ -255,13 +255,13 @@ class CleanRubbishDataProcesser implements Runnable{ def dataList = brokerDataMap[broker]; if (dataList) { - if (dataList.size() > 1) { //有多条数据的需要处理 + if (dataList.size() > 1) { //鏈夊鏉℃暟鎹殑闇�瑕佸鐞� dataList.sort { a,b-> return (a.creation_date).compareTo(b.creation_date) } - def falseDataId; //creation_date最新的一个造假数据ID - def realDataId; //creation_date最新的一个真实数据ID + def falseDataId; //creation_date鏈�鏂扮殑涓�涓�犲亣鏁版嵁ID + def realDataId; //creation_date鏈�鏂扮殑涓�涓湡瀹炴暟鎹甀D dataList.each {row-> if (row.false_date) { @@ -286,7 +286,7 @@ class CleanRubbishDataProcesser implements Runnable{ return idList; } /** - * 根据IdList删除数据 + * 鏍规嵁IdList鍒犻櫎鏁版嵁 */ def deleteByIdList(idList, collection) { if(idList) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/CompanyBrokerHourAnalysis.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/CompanyBrokerHourAnalysis.groovy index cfa653078..a5073595b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/CompanyBrokerHourAnalysis.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/CompanyBrokerHourAnalysis.groovy @@ -23,21 +23,21 @@ import com.mongodb.DBObject import com.mongodb.Mongo /** - * ****************重要提示******************** - * 功能: - * 1、按小时统计公司和经纪人的房源的Batch (每小时运行一次, 每小时启动时间为 当前小时的第55分钟) - * 统计公司的前三页和首页的数据,统计经纪人的前三页的数据(结果保存至goojia_common.zjt_company_display与goojia_common.zjt_broker_display表) - * 2、分段统计公司的展示面积之和和展示总价之和(统计结果在reda.company_range_detail表中) - * 4、统计每小时抓取房源的结果(统计结果在goojia_common.search_result_order_analysis表中) + * ****************閲嶈鎻愮ず******************** + * 鍔熻兘锛� + * 1銆佹寜灏忔椂缁熻鍏徃鍜岀粡绾汉鐨勬埧婧愮殑Batch (姣忓皬鏃惰繍琛屼竴娆�, 姣忓皬鏃跺惎鍔ㄦ椂闂翠负 褰撳墠灏忔椂鐨勭55鍒嗛挓) + * 缁熻鍏徃鐨勫墠涓夐〉鍜岄椤电殑鏁版嵁锛岀粺璁$粡绾汉鐨勫墠涓夐〉鐨勬暟鎹紙缁撴灉淇濆瓨鑷砱oojia_common.zjt_company_display涓巊oojia_common.zjt_broker_display琛級 + * 2銆佸垎娈电粺璁″叕鍙哥殑灞曠ず闈㈢Н涔嬪拰鍜屽睍绀烘�讳环涔嬪拰(缁熻缁撴灉鍦╮eda.company_range_detail琛ㄤ腑) + * 4銆佺粺璁℃瘡灏忔椂鎶撳彇鎴挎簮鐨勭粨鏋滐紙缁熻缁撴灉鍦╣oojia_common.search_result_order_analysis琛ㄤ腑锛� * * **************************************************** - * 若需要手动启动进行补数据操作,则: - * 需要删除1、2、3中的数据 + * 鑻ラ渶瑕佹墜鍔ㄥ惎鍔ㄨ繘琛岃ˉ鏁版嵁鎿嶄綔锛屽垯锛� + * 闇�瑕佸垹闄�1銆�2銆�3涓殑鏁版嵁 * - * 手动启动,则参数规则为:精确至"时" - * 自定义传参格式【时间 例:2011091408 则统计2011091407~2011091408时段的数据】 + * 鎵嬪姩鍚姩锛屽垯鍙傛暟瑙勫垯涓猴細绮剧‘鑷�"鏃�" + * 鑷畾涔変紶鍙傛牸寮忋�愭椂闂� 渚嬶細2011091408 鍒欑粺璁�2011091407~2011091408鏃舵鐨勬暟鎹�� * - * --------------------------------------------】 + * --------------------------------------------銆� */ @BatchOwner(Watcher.Reda) @@ -46,30 +46,30 @@ class CompanyBrokerHourAnalysis extends BaseBatch { def mongoDbReadDomain = MongoUtils.OFFLINE_REDA_URL; def mongoDbWriteDomain = MongoUtils.REDA_WRITE_URL; - //公司别名表 + //鍏徃鍒悕琛� def DBCollection collCompanyNameAlias = MongoUtils.getCollectionByName("goojia", "goojia_common.zjt_company_name_alias", mongoDbWriteDomain); - //结束时间 + //缁撴潫鏃堕棿 def endTime = org.apache.commons.lang.time.DateUtils.addHours(new Date(), 1); - //开始时间 + //寮�濮嬫椂闂� def startTime = org.apache.commons.lang.time.DateUtils.addHours(endTime, -1); - //城市:网站 [北京:['anjuke.com', 'soufun.com'], 上海:['anjuke.com']] + //鍩庡競锛氱綉绔� [鍖椾含:['anjuke.com', 'soufun.com'], 涓婃捣:['anjuke.com']] def cityWebsiteMap = ZjtAnalysisUtil.getCityWebsiteMap(); - //城市:小区 [北京:[太月园], 上海:[天山河畔花园, 三江小区]] + //鍩庡競锛氬皬鍖� [鍖椾含:[澶湀鍥璢, 涓婃捣:[澶╁北娌崇晹鑺卞洯, 涓夋睙灏忓尯]] def cityDistrictMap = ZjtAnalysisUtil.getCityDistrictMap(); - //公司别名 [21世纪:[null:21世纪不动产, 上海:21世纪不动产上海, 北京:21世纪不动产北京]] + //鍏徃鍒悕 [21涓栫邯:[null:21涓栫邯涓嶅姩浜�, 涓婃捣:21涓栫邯涓嶅姩浜т笂娴�, 鍖椾含:21涓栫邯涓嶅姩浜у寳浜琞] def formalNameMap = ZjtAnalysisUtil.getCompanyNameMap(); - //时间范围 + //鏃堕棿鑼冨洿 def ranges = ZjtAnalysisUtil.getProcessRanges(startTime, endTime, ZjtAnalysisUtil.TYPE_HOUR); - //未整理的公司别名 + //鏈暣鐞嗙殑鍏徃鍒悕 def companyNameAlias = []; @Override public void process(Object args) { - if (!((null != args && args.size() >0) || ranges)) { //两者不符合不执行 + if (!((null != args && args.size() >0) || ranges)) { //涓よ�呬笉绗﹀悎涓嶆墽琛� return ; } @@ -83,19 +83,19 @@ class CompanyBrokerHourAnalysis extends BaseBatch { def CountDownLatch runningThread = null; def isByHand = false; - if (null != args && args.size() >0) { //自定义运行Batch 自定义传参格式 【时间 例:2011091408 】 + if (null != args && args.size() >0) { //鑷畾涔夎繍琛孊atch 鑷畾涔変紶鍙傛牸寮� 銆愭椂闂� 渚嬶細2011091408 銆� isByHand = true; - def ranges = null; //时间 + def ranges = null; //鏃堕棿 ranges = formatTime(args[0].trim()); if (null == ranges) { - throw new IllegalArgumentException("时间参数有误!".toString()); + throw new IllegalArgumentException("鏃堕棿鍙傛暟鏈夎锛�".toString()); } def argsSize = args.size(); - if (argsSize == 1) { //时间 - println "手动启动! 请先确认相关数据已删除!CompanyBrokerHourAnalysis: 时间-->${ranges}"; + if (argsSize == 1) { //鏃堕棿 + println "鎵嬪姩鍚姩! 璇峰厛纭鐩稿叧鏁版嵁宸插垹闄わ紒CompanyBrokerHourAnalysis: 鏃堕棿-->${ranges}"; cityWebsiteMap.keySet().each{city-> def cityWebsite = cityWebsiteMap[city]; runningThread = new CountDownLatch(cityWebsite.size()); @@ -108,12 +108,12 @@ class CompanyBrokerHourAnalysis extends BaseBatch { } } else { - throw new IllegalArgumentException("参数有误!".toString()); + throw new IllegalArgumentException("鍙傛暟鏈夎锛�".toString()); } - } else { //正常情况运行 + } else { //姝e父鎯呭喌杩愯 - def threadCount = 0; //启动线程总数 + def threadCount = 0; //鍚姩绾跨▼鎬绘暟 cityWebsiteMap.keySet().each{city-> cityWebsiteMap[city].each{website-> threadCount++; } } @@ -132,7 +132,7 @@ class CompanyBrokerHourAnalysis extends BaseBatch { runningThread.await(); } - //整理新增加的公司名称 + //鏁寸悊鏂板鍔犵殑鍏徃鍚嶇О saveCompanyNameAlias(companyNameAlias); long endMillSecond = System.currentTimeMillis(); @@ -145,8 +145,8 @@ class CompanyBrokerHourAnalysis extends BaseBatch { /** - * 保存新的公司名称数据 - * TODO 在goojia_common.zjt_company_name_alias表中建立唯一索引 防止多线程重复操作该表 + * 淇濆瓨鏂扮殑鍏徃鍚嶇О鏁版嵁 + * TODO 鍦╣oojia_common.zjt_company_name_alias琛ㄤ腑寤虹珛鍞竴绱㈠紩 闃叉澶氱嚎绋嬮噸澶嶆搷浣滆琛� */ def saveCompanyNameAlias(companyNameAlias) { if (companyNameAlias) { @@ -172,7 +172,7 @@ class CompanyBrokerHourAnalysis extends BaseBatch { } /** - * 格式化字符串时间 + * 鏍煎紡鍖栧瓧绗︿覆鏃堕棿 */ def formatTime(time) { @@ -198,33 +198,33 @@ class CompanyBrokerHourAnalysis extends BaseBatch { return DateUtils.parseFromTightYYYYMMDDhhmmss(formatTime); } - //数据库初始化 + //鏁版嵁搴撳垵濮嬪寲 def initCollectionMap() { def collectionMap = [:] - //数据原始表 + //鏁版嵁鍘熷琛� collectionMap.put("collSearchResultOrder", MongoUtils.getCollectionByName("goojia", "goojia_common.search_result_order", mongoDbReadDomain)); - //公司数据统计表 + //鍏徃鏁版嵁缁熻琛� collectionMap.put("collCompanyDisplay", MongoUtils.getCollectionByName("goojia", "goojia_common.zjt_company_display", mongoDbWriteDomain)); - //经纪人数据统计表 + //缁忕邯浜烘暟鎹粺璁¤〃 collectionMap.put("collBrokerDisplay", MongoUtils.getCollectionByName("goojia", "goojia_common.zjt_broker_display", mongoDbWriteDomain)); - //抓取数据分析表 + //鎶撳彇鏁版嵁鍒嗘瀽琛� collectionMap.put("analysisCollection", MongoUtils.getCollectionByName("goojia", "goojia_common.search_result_order_analysis", mongoDbWriteDomain)); - //分段统计面积和总价之和 + //鍒嗘缁熻闈㈢Н鍜屾�讳环涔嬪拰 collectionMap.put("companyRangeDetailColl", MongoUtils.getCollectionByName("reda", "company_range_detail", mongoDbWriteDomain)); return collectionMap; } - //输出文件初始化 + //杈撳嚭鏂囦欢鍒濆鍖� def initFileOutMap(){ def fileOutMap =[:]; def fileDate = "_"+DateUtils.formatToYYYYMMDD(new Date()); fileOutMap.put("fileOut", getFile(MongoUtils.LOG_FILE_PATH, "MobileWithOutCompany"+fileDate+".log")); fileOutMap.put("unknownFileOut", getFile(MongoUtils.LOG_FILE_PATH, "CompanyUnknown"+fileDate+".log")); fileOutMap.put("falseDataFileOut", getFile(MongoUtils.LOG_FILE_PATH, "FalseDataFileOut"+fileDate+".log")); - //抓取数据偏离小区参考值文件 + //鎶撳彇鏁版嵁鍋忕灏忓尯鍙傝�冨�兼枃浠� fileOutMap.put("checkDataFileOut", getFile(MongoUtils.LOG_FILE_PATH, "CheckData"+fileDate+".log")); - //数据重复抓取文件 + //鏁版嵁閲嶅鎶撳彇鏂囦欢 fileOutMap.put("repeatDataFileOut", getFile(MongoUtils.LOG_FILE_PATH, "RepeatData"+fileDate+".log")); return fileOutMap; @@ -239,19 +239,19 @@ class CompanyBrokerHourAnalysis extends BaseBatch { } /** - * 获取短信信息 + * 鑾峰彇鐭俊淇℃伅 * @return */ def getMobileMessage(isByHand, hour, useTime){ - def message =[]; //短信信息 + def message =[]; //鐭俊淇℃伅 def baseMessage = ""; if (isByHand) { - baseMessage += "手动启动!"+"占比,时"+hour+"点,"+useTime+"分钟,"; + baseMessage += "鎵嬪姩鍚姩锛�"+"鍗犳瘮锛屾椂"+hour+"鐐癸紝"+useTime+"鍒嗛挓锛�"; } else { - baseMessage += hour+"点"+useTime; + baseMessage += hour+"鐐�"+useTime; } - baseMessage += (BatchHelper.getException()?"异常!":" "); + baseMessage += (BatchHelper.getException()?"寮傚父!":" "); def batchRunningInfo = BatchHelper.getBatchRunningInfo(); def websiteCount = 0; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/CompanyBrokerHourAnalysisProcesser.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/CompanyBrokerHourAnalysisProcesser.groovy index 9731e0020..1cf915461 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/CompanyBrokerHourAnalysisProcesser.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/CompanyBrokerHourAnalysisProcesser.groovy @@ -13,38 +13,38 @@ import com.mongodb.DBCollection; import com.mongodb.DBObject; /** - * 按小时统计数据的batch + * 鎸夊皬鏃剁粺璁℃暟鎹殑batch */ class CompanyBrokerHourAnalysisProcesser implements Runnable{ - //数据原始表 + //鏁版嵁鍘熷琛� def DBCollection collSearchResultOrder; - //公司数据统计表 + //鍏徃鏁版嵁缁熻琛� def DBCollection collCompanyDisplay; - //经纪人数据统计表 + //缁忕邯浜烘暟鎹粺璁¤〃 def DBCollection collBrokerDisplay; - //抓取数据分析表 + //鎶撳彇鏁版嵁鍒嗘瀽琛� def DBCollection analysisCollection; - //分段统计面积和总价的分析表 + //鍒嗘缁熻闈㈢Н鍜屾�讳环鐨勫垎鏋愯〃 def DBCollection companyRangeDetailColl; - //每次数据库连接最多取出的小区数 + //姣忔鏁版嵁搴撹繛鎺ユ渶澶氬彇鍑虹殑灏忓尯鏁� def PROCESS_DISTRICTS_EACH = 50; - //城市:小区 [北京:[太月园], 上海:[天山河畔花园, 三江小区]] + //鍩庡競锛氬皬鍖� [鍖椾含:[澶湀鍥璢, 涓婃捣:[澶╁北娌崇晹鑺卞洯, 涓夋睙灏忓尯]] def cityDistrictMap; - //公司别名 [21世纪:[null:21世纪不动产, 上海:21世纪不动产上海, 北京:21世纪不动产北京]] + //鍏徃鍒悕 [21涓栫邯:[null:21涓栫邯涓嶅姩浜�, 涓婃捣:21涓栫邯涓嶅姩浜т笂娴�, 鍖椾含:21涓栫邯涓嶅姩浜у寳浜琞] def formalNameMap; - //时间范围 + //鏃堕棿鑼冨洿 def ranges; - //未整理的公司别名 + //鏈暣鐞嗙殑鍏徃鍒悕 def companyNameAlias; - //城市 + //鍩庡競 def city; - //网站 + //缃戠珯 def website; def CountDownLatch runningThread; - def fileOut; //指定输出文件 + def fileOut; //鎸囧畾杈撳嚭鏂囦欢 def unknownFileOut; def falseDataFileOut; def checkDataFileOut; @@ -93,37 +93,37 @@ class CompanyBrokerHourAnalysisProcesser implements Runnable{ /** - * 多线程处理器 + * 澶氱嚎绋嬪鐞嗗櫒 * - * @param city 城市 - * @param website 网站 - * @param cityDistrictList 小区列表 - * @param ranges 时间范围 + * @param city 鍩庡競 + * @param website 缃戠珯 + * @param cityDistrictList 灏忓尯鍒楄〃 + * @param ranges 鏃堕棿鑼冨洿 * @return */ def processer(city, website, cityDistrictList, ranges){ ranges.each {range-> - def refValueMap = ZjtAnalysisUtil.getDistrictReferenceValue(city, website); //小区抓取参考值 + def refValueMap = ZjtAnalysisUtil.getDistrictReferenceValue(city, website); //灏忓尯鎶撳彇鍙傝�冨�� - //分组处理小区数据 + //鍒嗙粍澶勭悊灏忓尯鏁版嵁 ZjtAnalysisUtil.splitArray(cityDistrictList, PROCESS_DISTRICTS_EACH).each {districtList-> - def searchResultOrderDatas = []; //从search_result_order表中获取的数据 - def companySaves = []; //按公司统计的数据 - def brokerSaves = []; //按经纪人统计的数据 - def crawlAnalysisSaves = []; //数据抓取分析 - def comapnyRangeSaves = []; //公司分段总价之和 + def searchResultOrderDatas = []; //浠巗earch_result_order琛ㄤ腑鑾峰彇鐨勬暟鎹� + def companySaves = []; //鎸夊叕鍙哥粺璁$殑鏁版嵁 + def brokerSaves = []; //鎸夌粡绾汉缁熻鐨勬暟鎹� + def crawlAnalysisSaves = []; //鏁版嵁鎶撳彇鍒嗘瀽 + def comapnyRangeSaves = []; //鍏徃鍒嗘鎬讳环涔嬪拰 - //查询条件 + //鏌ヨ鏉′欢 DBObject query = new BasicDBObject(); query.put("c_date", ['$gt':range['start'], '$lte' : range['end']]); query.put("site_name", website); query.put("city", city); query.put("keyword", ['$in' : districtList]); - //检索字段 + //妫�绱㈠瓧娈� DBObject fields = new BasicDBObject(); fields.put("keyword", 1); // fields.put("url", 1); @@ -148,38 +148,38 @@ class CompanyBrokerHourAnalysisProcesser implements Runnable{ districtList.each {district-> - def totalCount = 0; //抓取总量 - def companyNullCount = 0; //空公司总量 - def titleNullCount = 0; //空标题总量 - def brokerNullCount = 0; //空经纪人总量 - def mobileNullCount = 0; //空手机总量 - def matchNullCount = 0; //未匹配上总量 + def totalCount = 0; //鎶撳彇鎬婚噺 + def companyNullCount = 0; //绌哄叕鍙告�婚噺 + def titleNullCount = 0; //绌烘爣棰樻�婚噺 + def brokerNullCount = 0; //绌虹粡绾汉鎬婚噺 + def mobileNullCount = 0; //绌烘墜鏈烘�婚噺 + def matchNullCount = 0; //鏈尮閰嶄笂鎬婚噺 - def houseUrlHashCodeMap = [:]; //公司前三页Map - def houseUrlHashCodeHomeMap = [:]; //公司首页Map - def brokerUrlHashCodeMap = [:]; //经纪人前三页Map - def brokerUrlHashCodeHomeMap = [:]; //经纪人首页Map - def homeHouseTotalCount = 0; //公司首页房源总量 + def houseUrlHashCodeMap = [:]; //鍏徃鍓嶄笁椤礛ap + def houseUrlHashCodeHomeMap = [:]; //鍏徃棣栭〉Map + def brokerUrlHashCodeMap = [:]; //缁忕邯浜哄墠涓夐〉Map + def brokerUrlHashCodeHomeMap = [:]; //缁忕邯浜洪椤礛ap + def homeHouseTotalCount = 0; //鍏徃棣栭〉鎴挎簮鎬婚噺 - def companyTotalPriceMap = [:]; //每个公司的总价之和 - def companyAreaMap = [:]; //每个公司的面积之和 - def companyTotalPriceCountMap = [:]; //每个公司的总价数量之和 - def companyAreaCountMap = [:]; //每个公司的面积数量之和 + def companyTotalPriceMap = [:]; //姣忎釜鍏徃鐨勬�讳环涔嬪拰 + def companyAreaMap = [:]; //姣忎釜鍏徃鐨勯潰绉箣鍜� + def companyTotalPriceCountMap = [:]; //姣忎釜鍏徃鐨勬�讳环鏁伴噺涔嬪拰 + def companyAreaCountMap = [:]; //姣忎釜鍏徃鐨勯潰绉暟閲忎箣鍜� def isRepeatData = false; - def districtDataList = dataMap[district]; //小区中的房源 - dataMap[district] =[:]; //释放内存 + def districtDataList = dataMap[district]; //灏忓尯涓殑鎴挎簮 + dataMap[district] =[:]; //閲婃斁鍐呭瓨 if (!districtDataList){ districtDataList=[]; } else { - //对抓取房源进行分页去重操作 + //瀵规姄鍙栨埧婧愯繘琛屽垎椤靛幓閲嶆搷浣� def removeRepeatData = removeRepeatDataByHashCode(districtDataList); def deleteIdList = getRepeatDataIdList(districtDataList, removeRepeatData); if (deleteIdList) { - //删除每页中重复的房源 + //鍒犻櫎姣忛〉涓噸澶嶇殑鎴挎簮 deleteSearchResultOrder(deleteIdList); - repeatDataFileOut << city +"\t"+website+"\t"+district+'\t原始时间\t'+range['end']+"\t原始数量\t"+districtDataList.size()+"\t处理完数量\t"+removeRepeatData.size()+"\t删除数据\t"+deleteIdList.size()+ "\n"; + repeatDataFileOut << city +"\t"+website+"\t"+district+'\t鍘熷鏃堕棿\t'+range['end']+"\t鍘熷鏁伴噺\t"+districtDataList.size()+"\t澶勭悊瀹屾暟閲廫t"+removeRepeatData.size()+"\t鍒犻櫎鏁版嵁\t"+deleteIdList.size()+ "\n"; BatchHelper.setBatchRunningInfo(website+"_"+BatchHelper.COPY, 1); isRepeatData = true; } @@ -190,7 +190,7 @@ class CompanyBrokerHourAnalysisProcesser implements Runnable{ def company = getFormalCompanyName(row.company, city); - //统计抓取的情况 start + //缁熻鎶撳彇鐨勬儏鍐� start totalCount++; if (!row.company) { companyNullCount++; @@ -208,28 +208,28 @@ class CompanyBrokerHourAnalysisProcesser implements Runnable{ matchNullCount++; printUnknownCompany(row.company, row['mobile'], city, row.hash_code); } - //统计抓取的情况 end + //缁熻鎶撳彇鐨勬儏鍐� end - //统计有手机但是没有抓取到公司的手机号 start + //缁熻鏈夋墜鏈轰絾鏄病鏈夋姄鍙栧埌鍏徃鐨勬墜鏈哄彿 start printMobile(row['mobile'],row.company,city,website); - //统计有手机但是没有抓取到公司的手机号 end + //缁熻鏈夋墜鏈轰絾鏄病鏈夋姄鍙栧埌鍏徃鐨勬墜鏈哄彿 end def broker = [:]; broker['broker_mobile'] = (row['mobile']?:"").replaceAll(" ", ""); broker['broker_name'] = (row['contact_people']?:"").replaceAll(" ", ""); broker['company_name'] = company; - if(!(null != company && company != "")) {//公司数据 + if(!(null != company && company != "")) {//鍏徃鏁版嵁 company = "unknown"; } - //公司前三页处理 + //鍏徃鍓嶄笁椤靛鐞� if(!houseUrlHashCodeMap[company]){ houseUrlHashCodeMap[company] = []; } houseUrlHashCodeMap[company].add(row.hash_code); - //公司首页处理 + //鍏徃棣栭〉澶勭悊 if (row.page_no && row.page_no == 1) { if(!houseUrlHashCodeHomeMap[company]){ houseUrlHashCodeHomeMap[company] = []; @@ -239,15 +239,15 @@ class CompanyBrokerHourAnalysisProcesser implements Runnable{ } - //空公司、空手机、空姓名不统计 + //绌哄叕鍙搞�佺┖鎵嬫満銆佺┖濮撳悕涓嶇粺璁� if(broker['broker_mobile'].trim() && broker['broker_name'].trim() && company !="unknown") { - //经纪人前三页处理 + //缁忕邯浜哄墠涓夐〉澶勭悊 if(!brokerUrlHashCodeMap[broker]){ brokerUrlHashCodeMap[broker] = []; } brokerUrlHashCodeMap[broker].add(row.hash_code); - //经纪人首页处理 + //缁忕邯浜洪椤靛鐞� if (row.page_no && row.page_no == 1) { if(!brokerUrlHashCodeHomeMap[broker]){ brokerUrlHashCodeHomeMap[broker] = []; @@ -256,13 +256,13 @@ class CompanyBrokerHourAnalysisProcesser implements Runnable{ } } - //公司的总价分段之和 + //鍏徃鐨勬�讳环鍒嗘涔嬪拰 processRangeMap(companyTotalPriceMap, companyTotalPriceCountMap,company, row.total_price, city, "totalPrice"); - //公司的面积分段之和 + //鍏徃鐨勯潰绉垎娈典箣鍜� processRangeMap(companyAreaMap, companyAreaCountMap, company, row.area, city, "area"); } - //数据抓取监控 + //鏁版嵁鎶撳彇鐩戞帶 DBObject objCrawl = new BasicDBObject(); objCrawl.put("city", city); objCrawl.put("site_name", website); @@ -276,8 +276,8 @@ class CompanyBrokerHourAnalysisProcesser implements Runnable{ objCrawl.put("c_date", range['end']); crawlAnalysisSaves.add(objCrawl); - def isCopy = false; //是否跳点复制 - //抓取数据造假(目前仅对抓取房源量为0的小区进行处理) + def isCopy = false; //鏄惁璺崇偣澶嶅埗 + //鎶撳彇鏁版嵁閫犲亣锛堢洰鍓嶄粎瀵规姄鍙栨埧婧愰噺涓�0鐨勫皬鍖鸿繘琛屽鐞嗭級 if(totalCount == 0) { if(refValueMap[district.toString()]) { createFalseData(city, website, district, range); @@ -286,14 +286,14 @@ class CompanyBrokerHourAnalysisProcesser implements Runnable{ } else { if (!isRepeatData) { def isUnnormal = isUnnormalData(refValueMap[district.toString()], totalCount); -// if (isUnnormal) { //异常数据 -// checkDataFileOut << city +"\t"+website+"\t"+district+'\t原始时间\t'+range['end']+"\t原始数量\t"+totalCount+"\t参考值\t"+refValueMap[district.toString()]+ "\n"; +// if (isUnnormal) { //寮傚父鏁版嵁 +// checkDataFileOut << city +"\t"+website+"\t"+district+'\t鍘熷鏃堕棿\t'+range['end']+"\t鍘熷鏁伴噺\t"+totalCount+"\t鍙傝�冨�糪t"+refValueMap[district.toString()]+ "\n"; // } } } if (!isCopy) { - //公司前三页处理 + //鍏徃鍓嶄笁椤靛鐞� houseUrlHashCodeMap.keySet().each {company_name-> DBObject object = new BasicDBObject() @@ -304,10 +304,10 @@ class CompanyBrokerHourAnalysisProcesser implements Runnable{ object.put("company_name", company_name) object.put("stat_type", "HOUR") object.put("stat_date", range['end']); - object.put("house_count", houseUrlHashCodeMap[company_name]?houseUrlHashCodeMap[company_name].size():0); //本公司在这个小区的房源数量(不去重) - object.put("house_total", districtDataList?districtDataList.size():0); //小区总的房源数量 + object.put("house_count", houseUrlHashCodeMap[company_name]?houseUrlHashCodeMap[company_name].size():0); //鏈叕鍙稿湪杩欎釜灏忓尯鐨勬埧婧愭暟閲�(涓嶅幓閲�) + object.put("house_total", districtDataList?districtDataList.size():0); //灏忓尯鎬荤殑鎴挎簮鏁伴噺 Set companyUrlHashCodeSet = new HashSet(houseUrlHashCodeMap[company_name]); - object.put("house_num", companyUrlHashCodeSet.size()); //本公司在这个小区的房源数量(去重) + object.put("house_num", companyUrlHashCodeSet.size()); //鏈叕鍙稿湪杩欎釜灏忓尯鐨勬埧婧愭暟閲�(鍘婚噸) // object.put("urls", companyUrlHashCodeSet); object.put("hash_code", companyUrlHashCodeSet); object.put("creation_date", new Date()); @@ -315,7 +315,7 @@ class CompanyBrokerHourAnalysisProcesser implements Runnable{ companySaves.add(object); } - //公司首页处理 + //鍏徃棣栭〉澶勭悊 houseUrlHashCodeHomeMap.keySet().each {company_name-> DBObject object = new BasicDBObject() @@ -326,10 +326,10 @@ class CompanyBrokerHourAnalysisProcesser implements Runnable{ object.put("company_name", company_name) object.put("stat_type", "HOUR") object.put("stat_date", range['end']); - object.put("house_count", houseUrlHashCodeHomeMap[company_name]?houseUrlHashCodeHomeMap[company_name].size():0); //本公司在这个小区的房源数量(不去重) - object.put("house_total", homeHouseTotalCount); //小区总的房源数量 + object.put("house_count", houseUrlHashCodeHomeMap[company_name]?houseUrlHashCodeHomeMap[company_name].size():0); //鏈叕鍙稿湪杩欎釜灏忓尯鐨勬埧婧愭暟閲�(涓嶅幓閲�) + object.put("house_total", homeHouseTotalCount); //灏忓尯鎬荤殑鎴挎簮鏁伴噺 Set companyUrlHashCodeSet = new HashSet(houseUrlHashCodeHomeMap[company_name]); - object.put("house_num", companyUrlHashCodeSet.size()); //本公司在这个小区的房源数量(去重) + object.put("house_num", companyUrlHashCodeSet.size()); //鏈叕鍙稿湪杩欎釜灏忓尯鐨勬埧婧愭暟閲�(鍘婚噸) // object.put("urls", companyUrlHashCodeSet); object.put("hash_code", companyUrlHashCodeSet); object.put("creation_date", new Date()); @@ -337,7 +337,7 @@ class CompanyBrokerHourAnalysisProcesser implements Runnable{ companySaves.add(object); } - //经纪人前三页处理 + //缁忕邯浜哄墠涓夐〉澶勭悊 brokerUrlHashCodeMap.keySet().each {broker-> DBObject obj = new BasicDBObject(); @@ -350,9 +350,9 @@ class CompanyBrokerHourAnalysisProcesser implements Runnable{ obj.put("company_name", broker.company_name); obj.put("stat_type", "HOUR"); obj.put("stat_date", range['end']); - obj.put("house_count", brokerUrlHashCodeMap[broker].size()); //本经纪人在这个小区的房源数量(不去重) + obj.put("house_count", brokerUrlHashCodeMap[broker].size()); //鏈粡绾汉鍦ㄨ繖涓皬鍖虹殑鎴挎簮鏁伴噺(涓嶅幓閲�) Set brokerUrlHashCodeSet = new HashSet(brokerUrlHashCodeMap[broker]); - obj.put("house_num", brokerUrlHashCodeSet.size()); //本经纪人在这个小区的房源数量(去重) + obj.put("house_num", brokerUrlHashCodeSet.size()); //鏈粡绾汉鍦ㄨ繖涓皬鍖虹殑鎴挎簮鏁伴噺(鍘婚噸) // obj.put("urls", brokerUrlSet); obj.put("hash_code", brokerUrlHashCodeSet); obj.put("creation_date", new Date()); @@ -360,7 +360,7 @@ class CompanyBrokerHourAnalysisProcesser implements Runnable{ brokerSaves.add(obj); } - //经纪人首页处理 + //缁忕邯浜洪椤靛鐞� brokerUrlHashCodeHomeMap.keySet().each {broker-> DBObject obj = new BasicDBObject(); @@ -373,9 +373,9 @@ class CompanyBrokerHourAnalysisProcesser implements Runnable{ obj.put("company_name", broker.company_name); obj.put("stat_type", "HOUR"); obj.put("stat_date", range['end']); - obj.put("house_count", brokerUrlHashCodeHomeMap[broker].size()); //本经纪人在这个小区的房源数量(不去重) + obj.put("house_count", brokerUrlHashCodeHomeMap[broker].size()); //鏈粡绾汉鍦ㄨ繖涓皬鍖虹殑鎴挎簮鏁伴噺(涓嶅幓閲�) Set brokerUrlHashCodeSet = new HashSet(brokerUrlHashCodeHomeMap[broker]); - obj.put("house_num", brokerUrlHashCodeSet.size()); //本经纪人在这个小区的房源数量(去重) + obj.put("house_num", brokerUrlHashCodeSet.size()); //鏈粡绾汉鍦ㄨ繖涓皬鍖虹殑鎴挎簮鏁伴噺(鍘婚噸) // obj.put("urls", brokerUrlSet); obj.put("hash_code", brokerUrlHashCodeSet); obj.put("creation_date", new Date()); @@ -383,7 +383,7 @@ class CompanyBrokerHourAnalysisProcesser implements Runnable{ brokerSaves.add(obj); } - //公司的分段总价之和 + //鍏徃鐨勫垎娈垫�讳环涔嬪拰 companyTotalPriceMap.keySet().each {company-> def rangeTotalPriceMap = companyTotalPriceMap[company]; rangeTotalPriceMap.keySet().each{comapny_range-> @@ -405,7 +405,7 @@ class CompanyBrokerHourAnalysisProcesser implements Runnable{ } } - //公司的面积之和 + //鍏徃鐨勯潰绉箣鍜� companyAreaMap.keySet().each {company-> def rangeAreaMap = companyAreaMap[company]; rangeAreaMap.keySet().each{comapny_range-> @@ -428,12 +428,12 @@ class CompanyBrokerHourAnalysisProcesser implements Runnable{ } } - //记录每个网站总的抓取数据情况start + //璁板綍姣忎釜缃戠珯鎬荤殑鎶撳彇鏁版嵁鎯呭喌start logBatchRunningInfo(website, totalCount, companyNullCount,titleNullCount,brokerNullCount,mobileNullCount,matchNullCount); - //记录每个网站总的抓取数据情况end + //璁板綍姣忎釜缃戠珯鎬荤殑鎶撳彇鏁版嵁鎯呭喌end } - //数据保存 + //鏁版嵁淇濆瓨 collCompanyDisplay.insert(companySaves); collBrokerDisplay.insert(brokerSaves); analysisCollection.insert(crawlAnalysisSaves); @@ -443,7 +443,7 @@ class CompanyBrokerHourAnalysisProcesser implements Runnable{ } /** - * 日志记录 + * 鏃ュ織璁板綍 */ def logBatchRunningInfo(website, totalCount, companyNullCount,titleNullCount,brokerNullCount,mobileNullCount,matchNullCount) { @@ -451,16 +451,16 @@ class CompanyBrokerHourAnalysisProcesser implements Runnable{ } /** - * 未抓取到数据的小区用上一个小时的数据进行补充 - * 补充原则:当前小时一条未抓到数据的小区 + * 鏈姄鍙栧埌鏁版嵁鐨勫皬鍖虹敤涓婁竴涓皬鏃剁殑鏁版嵁杩涜琛ュ厖 + * 琛ュ厖鍘熷垯锛氬綋鍓嶅皬鏃朵竴鏉℃湭鎶撳埌鏁版嵁鐨勫皬鍖� */ def processMissingDataDistrict(city, website, missingDataDistrict, statDate, lastStatDate) { - def companySaves = []; //按公司统计的数据 - def brokerSaves = []; //按经纪人统计的数据 - def comapnyRangeSaves =[]; //公司分段总价之和 + def companySaves = []; //鎸夊叕鍙哥粺璁$殑鏁版嵁 + def brokerSaves = []; //鎸夌粡绾汉缁熻鐨勬暟鎹� + def comapnyRangeSaves =[]; //鍏徃鍒嗘鎬讳环涔嬪拰 - //查询条件 + //鏌ヨ鏉′欢 DBObject query = new BasicDBObject(); query.put("stat_type", 'HOUR'); query.put("stat_date", lastStatDate); @@ -468,21 +468,21 @@ class CompanyBrokerHourAnalysisProcesser implements Runnable{ query.put("city", city); query.put("district_name", missingDataDistrict); - //公司数据造假 + //鍏徃鏁版嵁閫犲亣 collCompanyDisplay.find(query).each {row-> row['_id']=null; row['stat_date'] = statDate; - row['false_date'] = lastStatDate; //造假数据时间 + row['false_date'] = lastStatDate; //閫犲亣鏁版嵁鏃堕棿 companySaves.add(row); } collCompanyDisplay.insert(companySaves); companySaves =[]; - //经纪人数据造假 + //缁忕邯浜烘暟鎹�犲亣 collBrokerDisplay.find(query).each {row-> row['_id']=null; row['stat_date'] = statDate; - row['false_date'] = lastStatDate; //造假数据时间 + row['false_date'] = lastStatDate; //閫犲亣鏁版嵁鏃堕棿 brokerSaves.add(row); } collBrokerDisplay.insert(brokerSaves); @@ -497,7 +497,7 @@ class CompanyBrokerHourAnalysisProcesser implements Runnable{ companyRangeDetailColl.find(query).each {row-> row['_id']=null; row['stat_date'] = statDate; - row['false_date'] = lastStatDate; //造假数据时间 + row['false_date'] = lastStatDate; //閫犲亣鏁版嵁鏃堕棿 comapnyRangeSaves.add(row); } companyRangeDetailColl.insert(comapnyRangeSaves); @@ -505,13 +505,13 @@ class CompanyBrokerHourAnalysisProcesser implements Runnable{ /** - * 原始数据的补足(原始数据造假数据) - * falseDataStatDate:假数据的时间 + * 鍘熷鏁版嵁鐨勮ˉ瓒筹紙鍘熷鏁版嵁閫犲亣鏁版嵁锛� + * falseDataStatDate:鍋囨暟鎹殑鏃堕棿 */ def processSearchResultOrderFalseData(city, website, missingDataDistrict, statDate,falseDataStatDate) { def startDate = org.apache.commons.lang.time.DateUtils.addHours(falseDataStatDate, -1); - //查询条件 + //鏌ヨ鏉′欢 DBObject query = new BasicDBObject(); query.put("c_date", ['$gt':startDate, '$lte' : falseDataStatDate]); query.put("site_name", website); @@ -521,7 +521,7 @@ class CompanyBrokerHourAnalysisProcesser implements Runnable{ collSearchResultOrder.find(query).each {row-> row['_id']=null; row['c_date'] = statDate; - row['false_date'] = falseDataStatDate; //造假数据时间 + row['false_date'] = falseDataStatDate; //閫犲亣鏁版嵁鏃堕棿 orderSaves.add(row); } collSearchResultOrder.insert(orderSaves); @@ -529,7 +529,7 @@ class CompanyBrokerHourAnalysisProcesser implements Runnable{ } /** - * 根据公司别名和城市从map中获取正式名,如果没有则插入别名表 + * 鏍规嵁鍏徃鍒悕鍜屽煄甯備粠map涓幏鍙栨寮忓悕锛屽鏋滄病鏈夊垯鎻掑叆鍒悕琛� * * @param companyName * @param city @@ -572,8 +572,8 @@ class CompanyBrokerHourAnalysisProcesser implements Runnable{ } /** - * 获取昨天8点以后的随机一个时间点 - * 获取造假数据的时间点 + * 鑾峰彇鏄ㄥぉ8鐐逛互鍚庣殑闅忔満涓�涓椂闂寸偣 + * 鑾峰彇閫犲亣鏁版嵁鐨勬椂闂寸偣 */ def getRandomFalseDataDate(date){ @@ -587,12 +587,12 @@ class CompanyBrokerHourAnalysisProcesser implements Runnable{ randomHour =18; } def falseDate = org.apache.commons.lang.time.DateUtils.addHours(yesterday, randomHour); -// println "造假时间---------"+falseDate; +// println "閫犲亣鏃堕棿---------"+falseDate; return falseDate; } /** - * 打印有手机号但是没有公司的手机号码 + * 鎵撳嵃鏈夋墜鏈哄彿浣嗘槸娌℃湁鍏徃鐨勬墜鏈哄彿鐮� */ def printMobile(mobile, company,city,website) { if (website && website =="soufun.com") { @@ -603,7 +603,7 @@ class CompanyBrokerHourAnalysisProcesser implements Runnable{ } /** - * 打印公司为unknown的url + * 鎵撳嵃鍏徃涓簎nknown鐨剈rl */ def printUnknownCompany(company, mobile, city, hash_code){ if (company) { @@ -615,15 +615,15 @@ class CompanyBrokerHourAnalysisProcesser implements Runnable{ } /** - * 打印造假数据的小区 + * 鎵撳嵃閫犲亣鏁版嵁鐨勫皬鍖� */ def printSearchResultOrderFalseData(city, website, district, falseDataDate, originalCount, falseDataCount,statDate) { - falseDataFileOut << city +"\t" +website +"\t" +district+'\t原始时间\t'+statDate+'\t原始数量\t'+originalCount+'\t造假时间\t' +falseDataDate+'\t造假数量'+falseDataCount+"\n"; + falseDataFileOut << city +"\t" +website +"\t" +district+'\t鍘熷鏃堕棿\t'+statDate+'\t鍘熷鏁伴噺\t'+originalCount+'\t閫犲亣鏃堕棿\t' +falseDataDate+'\t閫犲亣鏁伴噺'+falseDataCount+"\n"; } /** - * 是否是异常数据 - * 异常数据:小于小区参考值的90%或者大于小区参考值+2 + * 鏄惁鏄紓甯告暟鎹� + * 寮傚父鏁版嵁锛氬皬浜庡皬鍖哄弬鑰冨�肩殑90%鎴栬�呭ぇ浜庡皬鍖哄弬鑰冨��+2 */ def isUnnormalData(refValue, realValue) { if (!refValue) { @@ -633,7 +633,7 @@ class CompanyBrokerHourAnalysisProcesser implements Runnable{ } /** - * 根据IdList删除search_result_order数据 + * 鏍规嵁IdList鍒犻櫎search_result_order鏁版嵁 */ def deleteSearchResultOrder(idList) { if(idList) { @@ -644,22 +644,22 @@ class CompanyBrokerHourAnalysisProcesser implements Runnable{ } /** - * 生成造假数据 + * 鐢熸垚閫犲亣鏁版嵁 * @return */ def createFalseData(city, website, district,range) { def statDate = range['end']; def isSuccess =true; - for (int i=0;i<2&&isSuccess;i++) { //给两次造假机会 - //造假时间 + for (int i=0;i<2&&isSuccess;i++) { //缁欎袱娆¢�犲亣鏈轰細 + //閫犲亣鏃堕棿 def falseDataStatDate = getRandomFalseDataDate(range['start']); - //造假的结果数据 + //閫犲亣鐨勭粨鏋滄暟鎹� def falseDataCount = processSearchResultOrderFalseData(city, website, district, statDate,falseDataStatDate); if (falseDataCount){ isSuccess = false; processMissingDataDistrict(city, website, district, statDate, falseDataStatDate); - //打印日志 + //鎵撳嵃鏃ュ織 printSearchResultOrderFalseData(city, website, district, falseDataStatDate, 0, falseDataCount,statDate); } } @@ -701,7 +701,7 @@ class CompanyBrokerHourAnalysisProcesser implements Runnable{ } /** - * 根据HashCode进行数据分页去重 + * 鏍规嵁HashCode杩涜鏁版嵁鍒嗛〉鍘婚噸 * @param districtDataList * @return */ @@ -723,7 +723,7 @@ class CompanyBrokerHourAnalysisProcesser implements Runnable{ // } // } - //新的去重规则,每页的每个位置取最新一条数据 + //鏂扮殑鍘婚噸瑙勫垯锛屾瘡椤电殑姣忎釜浣嶇疆鍙栨渶鏂颁竴鏉℃暟鎹� def pageMap = [:] districtDataList.each{row-> if([1, 2, 3].contains(row['page_no'])) { @@ -739,7 +739,7 @@ class CompanyBrokerHourAnalysisProcesser implements Runnable{ } /** - * 获取需要删除的IDList + * 鑾峰彇闇�瑕佸垹闄ょ殑IDList * @param originalData * @param removeRepeatData * @return diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/CompanyDayAnalysis.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/CompanyDayAnalysis.groovy index b3becca4f..6b1d8e1a9 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/CompanyDayAnalysis.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/CompanyDayAnalysis.groovy @@ -14,23 +14,23 @@ import com.mongodb.DBCollection import com.mongodb.DBObject /** - * ****************重要提示******************** - * 按天统计公司的房源的Batch 每天运行一次 + * ****************閲嶈鎻愮ず******************** + * 鎸夊ぉ缁熻鍏徃鐨勬埧婧愮殑Batch 姣忓ぉ杩愯涓�娆� * - * 如需要手动启动(手动启动执行原则为先删除原先统计的数据,然后重新进行数据统计),则参数规则为: - * (目前仅支持重新跑某一天的数据) - * 自定义传参格式【时间 例:20110914 统计20110913 ~ 20110914时段的数据】 - * 数据来源:goojia_common.zjt_company_display - * 日统计维度:stat_type:HOUR + * 濡傞渶瑕佹墜鍔ㄥ惎鍔�(鎵嬪姩鍚姩鎵ц鍘熷垯涓哄厛鍒犻櫎鍘熷厛缁熻鐨勬暟鎹紝鐒跺悗閲嶆柊杩涜鏁版嵁缁熻)锛屽垯鍙傛暟瑙勫垯涓猴細 + * (鐩墠浠呮敮鎸侀噸鏂拌窇鏌愪竴澶╃殑鏁版嵁) + * 鑷畾涔変紶鍙傛牸寮忋�愭椂闂� 渚嬶細20110914 缁熻20110913 ~ 20110914鏃舵鐨勬暟鎹�� + * 鏁版嵁鏉ユ簮锛歡oojia_common.zjt_company_display + * 鏃ョ粺璁$淮搴︼細stat_type:HOUR * - * 结果表:goojia_common.zjt_company_display + * 缁撴灉琛細goojia_common.zjt_company_display */ @BatchOwner(Watcher.Reda) class CompanyDayAnalysis extends BaseBatch { // def Mongo mongoDbRead = MongoUtils.getMongo(MongoUtils.REDA_READ_URL, 27017); -// //线下测试mongo +// //绾夸笅娴嬭瘯mongo // def Mongo mongoDbWrite = MongoUtils.getMongo(MongoUtils.REDA_WRITE_URL, 27017); def mongoDbReadDomain = MongoUtils.REDA_READ_URL; @@ -39,9 +39,9 @@ class CompanyDayAnalysis extends BaseBatch { def DBCollection collCompanyDisplayRead = MongoUtils.getCollectionByName("goojia", "goojia_common.zjt_company_display", mongoDbReadDomain); //mongoDbRead.getDB('goojia').getCollection('goojia_common.zjt_company_display'); def DBCollection collCompanyDisplayWrite = MongoUtils.getCollectionByName("goojia", "goojia_common.zjt_company_display", mongoDbWriteDomain); //mongoDbWrite.getDB('goojia').getCollection('goojia_common.zjt_company_display'); - //城市:网站 [北京:['anjuke.com', 'soufun.com'], 上海:['anjuke.com']] + //鍩庡競锛氱綉绔� [鍖椾含:['anjuke.com', 'soufun.com'], 涓婃捣:['anjuke.com']] def cityWebsiteMap = ZjtAnalysisUtil.getCityWebsiteMap(); - //城市:小区 [北京:[太月园], 上海:[天山河畔花园, 三江小区]] + //鍩庡競锛氬皬鍖� [鍖椾含:[澶湀鍥璢, 涓婃捣:[澶╁北娌崇晹鑺卞洯, 涓夋睙灏忓尯]] def cityDistrictMap = ZjtAnalysisUtil.getCityDistrictMap(); @Override @@ -53,30 +53,30 @@ class CompanyDayAnalysis extends BaseBatch { long startMillSecond = System.currentTimeMillis(); long endMillSecond = 0; def msg = ""; - def threadCount = 0; //启动线程总数 + def threadCount = 0; //鍚姩绾跨▼鎬绘暟 def CountDownLatch runningThread = null; cityWebsiteMap.keySet().each{city-> cityWebsiteMap[city].each{website-> threadCount++; } } - def isByHand = false; //是否手动启动 + def isByHand = false; //鏄惁鎵嬪姩鍚姩 Date date = new Date(); - if (null != args && args.size() >0) { //自定义运行Batch 自定义传参格式 【时间 例:20110914 】 + if (null != args && args.size() >0) { //鑷畾涔夎繍琛孊atch 鑷畾涔変紶鍙傛牸寮� 銆愭椂闂� 渚嬶細20110914 銆� isByHand = true; - def cityName = null; //城市 + def cityName = null; //鍩庡競 def statDate = getStatDate(args[0].trim()); // def deleteStatDate = org.apache.commons.lang.time.DateUtils.addDays(statDate, -1); -// removeAnalysisData(deleteStatDate, cityName, ZjtAnalysisUtil.TYPE_DAY); //删除当天的数据 +// removeAnalysisData(deleteStatDate, cityName, ZjtAnalysisUtil.TYPE_DAY); //鍒犻櫎褰撳ぉ鐨勬暟鎹� date = statDate; } runningThread = new CountDownLatch(threadCount); - cityWebsiteMap.keySet().each{city-> //每天执行一次 + cityWebsiteMap.keySet().each{city-> //姣忓ぉ鎵ц涓�娆� def cityWebsite = cityWebsiteMap[city]; cityWebsite.each{website-> @@ -95,9 +95,9 @@ class CompanyDayAnalysis extends BaseBatch { println "[${new Date().format('yyyy-MM-dd HH:mm:ss SSS')}] batch end" println "Total Time: ${(endMillSecond - startMillSecond)/(1000 * 60)} mins" - msg = (isByHand?"手动启动":"")+"占比,"+DateUtils.formatToYYYYMMdd(date)+"日"; + msg = (isByHand?"鎵嬪姩鍚姩":"")+"鍗犳瘮锛�"+DateUtils.formatToYYYYMMdd(date)+"鏃�"; - msg = msg + ",运行"+DataUtil.getRound((endMillSecond - startMillSecond)/(1000 * 60))+"分钟"; + msg = msg + "锛岃繍琛�"+DataUtil.getRound((endMillSecond - startMillSecond)/(1000 * 60))+"鍒嗛挓"; println msg; BatchHelper.logBatchEnd(result._id, msg); @@ -115,12 +115,12 @@ class CompanyDayAnalysis extends BaseBatch { } /** - * 手动启动Batch之前删除原来符合条件的记录 + * 鎵嬪姩鍚姩Batch涔嬪墠鍒犻櫎鍘熸潵绗﹀悎鏉′欢鐨勮褰� */ def removeAnalysisData(statDate, cityName, statType) { if (null == statDate) { - throw new IllegalArgumentException("时间参数有误!".toString()); + throw new IllegalArgumentException("鏃堕棿鍙傛暟鏈夎锛�".toString()); } DBObject delQuery = new BasicDBObject(); @@ -133,13 +133,13 @@ class CompanyDayAnalysis extends BaseBatch { delQuery.put("city", ['$in' : ZjtAnalysisUtil.getCityList()]); } - //删除公司统计数据 - println "remove 公司统计数据:" + " stat_date="+statDate+" website="+ZjtAnalysisUtil.getWebsiteList()+" city="+cityName; + //鍒犻櫎鍏徃缁熻鏁版嵁 + println "remove 鍏徃缁熻鏁版嵁:" + " stat_date="+statDate+" website="+ZjtAnalysisUtil.getWebsiteList()+" city="+cityName; println delQuery long startMillSecond = System.currentTimeMillis(); collCompanyDisplayWrite.remove(delQuery); long endMillSecond = System.currentTimeMillis(); - println "remove 公司统计数据结束!耗时:" + DataUtil.getRound((endMillSecond - startMillSecond)/(1000 * 60))+"分钟!" + println "remove 鍏徃缁熻鏁版嵁缁撴潫锛佽�楁椂锛�" + DataUtil.getRound((endMillSecond - startMillSecond)/(1000 * 60))+"鍒嗛挓锛�" } static main(args) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/CompanyDayAnalysisProcesser.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/CompanyDayAnalysisProcesser.groovy index 694f1a3e9..4f1656ef0 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/CompanyDayAnalysisProcesser.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/CompanyDayAnalysisProcesser.groovy @@ -15,17 +15,17 @@ class CompanyDayAnalysisProcesser implements Runnable{ def DBCollection collCompanyDisplayRead; def DBCollection collCompanyDisplayWrite; - //城市:小区 [北京:[太月园], 上海:[天山河畔花园, 三江小区]] + //鍩庡競锛氬皬鍖� [鍖椾含:[澶湀鍥璢, 涓婃捣:[澶╁北娌崇晹鑺卞洯, 涓夋睙灏忓尯]] def cityDistrictList; - def city; //城市 - def website; //网站 + def city; //鍩庡競 + def website; //缃戠珯 def endTime; def statType; def CountDownLatch runningThread; - //是否手动启动线程 + //鏄惁鎵嬪姩鍚姩绾跨▼ def isHand; - //每次数据库连接最多取出的小区数 + //姣忔鏁版嵁搴撹繛鎺ユ渶澶氬彇鍑虹殑灏忓尯鏁� def PROCESS_DISTRICTS_EACH = 5; public CompanyDayAnalysisProcesser(runningThread, collCompanyDisplayRead, collCompanyDisplayWrite, city, website, cityDistrictList, endTime,statType,isHand) { @@ -102,12 +102,12 @@ class CompanyDayAnalysisProcesser implements Runnable{ dataMap.keySet().each {district-> - def companyHouseCountMap = [:]; //前三页Map - def companyUrlMap = [:]; //前三页Map - def districtCount = 0; //前三页房源量 - def companyHouseCountHomeMap = [:]; //首页Map - def companyUrlHomeMap = [:]; //首页Map - def districtHomeCount = 0; //首页房源量 + def companyHouseCountMap = [:]; //鍓嶄笁椤礛ap + def companyUrlMap = [:]; //鍓嶄笁椤礛ap + def districtCount = 0; //鍓嶄笁椤垫埧婧愰噺 + def companyHouseCountHomeMap = [:]; //棣栭〉Map + def companyUrlHomeMap = [:]; //棣栭〉Map + def districtHomeCount = 0; //棣栭〉鎴挎簮閲� def statDateMap = ZjtAnalysisUtil.formatDataToMap( "stat_date", @@ -115,7 +115,7 @@ class CompanyDayAnalysisProcesser implements Runnable{ dataMap[district] ); - dataMap[district] =[]; //清除数据,减小内存 + dataMap[district] =[]; //娓呴櫎鏁版嵁锛屽噺灏忓唴瀛� statDateMap.keySet().each {statDate-> @@ -123,7 +123,7 @@ class CompanyDayAnalysisProcesser implements Runnable{ def company = row.company_name; - //处理首页 + //澶勭悊棣栭〉 if (row.page_name && row.page_name == ZjtAnalysisUtil.HOME) { companyHouseCountHomeMap[company] = (companyHouseCountHomeMap[company]?:0) + row.house_count; if(row.urls){ @@ -143,7 +143,7 @@ class CompanyDayAnalysisProcesser implements Runnable{ companyUrlHomeMap[company].addAll(row.hash_code); } }else{ - //处理前三页 + //澶勭悊鍓嶄笁椤� companyHouseCountMap[company] = (companyHouseCountMap[company]?:0) + row.house_count; if(row.urls){ if(!companyUrlMap[company]){ @@ -166,7 +166,7 @@ class CompanyDayAnalysisProcesser implements Runnable{ statDateMap[statDate]=[]; } - //前三页处理 + //鍓嶄笁椤靛鐞� companyHouseCountMap.keySet().each {company_name-> districtCount += companyHouseCountMap[company_name]?:0; } @@ -181,15 +181,15 @@ class CompanyDayAnalysisProcesser implements Runnable{ object.put("stat_date", ZjtAnalysisUtil.getStatDate(range, statType)); object.put("company_name", company_name); object.put("stat_type", statType); - object.put("house_count", companyHouseCountMap[company_name]?:0); //本公司在这个小区的房源数量(不去重) - object.put("house_total", districtCount); //小区总的房源数量 - object.put("house_num", companyUrlMap[company_name]?companyUrlMap[company_name].size():0); //本公司在这个小区的房源数量(去重) + object.put("house_count", companyHouseCountMap[company_name]?:0); //鏈叕鍙稿湪杩欎釜灏忓尯鐨勬埧婧愭暟閲�(涓嶅幓閲�) + object.put("house_total", districtCount); //灏忓尯鎬荤殑鎴挎簮鏁伴噺 + object.put("house_num", companyUrlMap[company_name]?companyUrlMap[company_name].size():0); //鏈叕鍙稿湪杩欎釜灏忓尯鐨勬埧婧愭暟閲�(鍘婚噸) object.put("creation_date", new Date()); saveData.add(object); } - //首页处理 + //棣栭〉澶勭悊 companyHouseCountHomeMap.keySet().each {company_name-> districtHomeCount += companyHouseCountHomeMap[company_name]?:0; } @@ -204,9 +204,9 @@ class CompanyDayAnalysisProcesser implements Runnable{ object.put("stat_date", ZjtAnalysisUtil.getStatDate(range, statType)); object.put("company_name", company_name); object.put("stat_type", statType); - object.put("house_count", companyHouseCountHomeMap[company_name]?:0); //本公司在这个小区的房源数量(不去重) - object.put("house_total", districtHomeCount); //小区总的房源数量 - object.put("house_num", companyUrlHomeMap[company_name]?companyUrlHomeMap[company_name].size():0); //本公司在这个小区的房源数量(去重) + object.put("house_count", companyHouseCountHomeMap[company_name]?:0); //鏈叕鍙稿湪杩欎釜灏忓尯鐨勬埧婧愭暟閲�(涓嶅幓閲�) + object.put("house_total", districtHomeCount); //灏忓尯鎬荤殑鎴挎簮鏁伴噺 + object.put("house_num", companyUrlHomeMap[company_name]?companyUrlHomeMap[company_name].size():0); //鏈叕鍙稿湪杩欎釜灏忓尯鐨勬埧婧愭暟閲�(鍘婚噸) object.put("creation_date", new Date()); saveData.add(object); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/CompanyRangeAnalysis.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/CompanyRangeAnalysis.groovy index f4abbc450..32c59a747 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/CompanyRangeAnalysis.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/CompanyRangeAnalysis.groovy @@ -14,17 +14,17 @@ import com.fangjia.script.util.MongoUtils import com.fangjia.script.util.ZjtAnalysisUtil /** - * *****************重要提示******************* - * 功能:按周和月分别统计公司的房源展示均价 和 按面积和总价分段统计公司的数据总和 - * 涉及表: reda.company_range_detail 读 - * reda.company_range_display 写 - * reda.company_avg_price 写 + * *****************閲嶈鎻愮ず******************* + * 鍔熻兘锛氭寜鍛ㄥ拰鏈堝垎鍒粺璁″叕鍙哥殑鎴挎簮灞曠ず鍧囦环 鍜� 鎸夐潰绉拰鎬讳环鍒嗘缁熻鍏徃鐨勬暟鎹�诲拰 + * 娑夊強琛�: reda.company_range_detail 璇� + * reda.company_range_display 鍐� + * reda.company_avg_price 鍐� * - * Batch手动启动 - * 1、需要先删除 stat_type+stat_date相关数据 - * 2、启动参数: - * 20110914 week 重跑上周数据(即9月5日~9月11日) - * 20110914 month 重跑上月数据(即8月1日~8月31日) + * Batch鎵嬪姩鍚姩 + * 1銆侀渶瑕佸厛鍒犻櫎 stat_type+stat_date鐩稿叧鏁版嵁 + * 2銆佸惎鍔ㄥ弬鏁帮細 + * 20110914 week 閲嶈窇涓婂懆鏁版嵁锛堝嵆9鏈�5鏃9鏈�11鏃ワ級 + * 20110914 month 閲嶈窇涓婃湀鏁版嵁锛堝嵆8鏈�1鏃8鏈�31鏃ワ級 * */ @BatchOwner(Watcher.Reda) @@ -33,15 +33,15 @@ class CompanyRangeAnalysis extends BaseBatch { def mongoDbReadDomain = MongoUtils.REDA_READ_URL; def mongoDbWriteDomain = MongoUtils.REDA_WRITE_URL; - //城市:网站 [北京:['anjuke.com', 'soufun.com'], 上海:['anjuke.com']] + //鍩庡競锛氱綉绔� [鍖椾含:['anjuke.com', 'soufun.com'], 涓婃捣:['anjuke.com']] def cityWebsiteMap = ZjtAnalysisUtil.getCityWebsiteMap(); - //城市:小区 [北京:[太月园], 上海:[天山河畔花园, 三江小区]] + //鍩庡競锛氬皬鍖� [鍖椾含:[澶湀鍥璢, 涓婃捣:[澶╁北娌崇晹鑺卞洯, 涓夋睙灏忓尯]] def cityDistrictMap = ZjtAnalysisUtil.getCityDistrictMap(); @Override public void process(Object args) { - if (!((null != args && args.size() >0) || DateUtils.getDayOfWeek(new Date()) == 1 || DateUtils.getDay(new Date()) == 1)) { //两者不符合不执行 + if (!((null != args && args.size() >0) || DateUtils.getDayOfWeek(new Date()) == 1 || DateUtils.getDay(new Date()) == 1)) { //涓よ�呬笉绗﹀悎涓嶆墽琛� return ; } @@ -56,44 +56,44 @@ class CompanyRangeAnalysis extends BaseBatch { def collectionMap = initCollectionMap(); def msg = ""; - def isByHand = false; //是否手动启动 + def isByHand = false; //鏄惁鎵嬪姩鍚姩 - if (null != args && args.size() >0) { //自定义运行Batch + if (null != args && args.size() >0) { //鑷畾涔夎繍琛孊atch isByHand = true; if (args.size()!=2) { - throw new IllegalArgumentException("传参错误!请认真确认参数个数与类型............."); + throw new IllegalArgumentException("浼犲弬閿欒!璇疯鐪熺‘璁ゅ弬鏁颁釜鏁颁笌绫诲瀷............."); } def statDate = DateUtils.truncateDay(ZjtAnalysisUtil.formatTime(args[0].trim())); println statDate statType = StringUtils.upperCase(args[1].trim()); if ("WEEK" == statType) { - endDate = DateUtils.getFirstDayOfWeek(statDate) +1; //本周一 + endDate = DateUtils.getFirstDayOfWeek(statDate) +1; //鏈懆涓� println endDate - startDate = endDate-7; //上周一 - println "请先确定手工已删除上周数据.............." + startDate = endDate-7; //涓婂懆涓� + println "璇峰厛纭畾鎵嬪伐宸插垹闄や笂鍛ㄦ暟鎹�.............." } else if ("MONTH" == statType) { - endDate = DateUtils.getFirstDayOfMonth(statDate); //本月1号 - startDate = org.apache.commons.lang.time.DateUtils.addMonths(endDate, -1); //上月1号 + endDate = DateUtils.getFirstDayOfMonth(statDate); //鏈湀1鍙� + startDate = org.apache.commons.lang.time.DateUtils.addMonths(endDate, -1); //涓婃湀1鍙� println endDate println startDate - println "请先确定手工已删除上月数据.............." + println "璇峰厛纭畾鎵嬪伐宸插垹闄や笂鏈堟暟鎹�.............." } else { - throw new IllegalArgumentException("statType传参错误............."); + throw new IllegalArgumentException("statType浼犲弬閿欒............."); } processBatch(cityWebsiteMap,collectionMap, startDate,endDate,statType); } else { def statDate = new Date(); - //执行周的Batch------------------------------!!!! - if(DateUtils.getDayOfWeek(statDate) == 1){ //每周周一执行一次 + //鎵ц鍛ㄧ殑Batch------------------------------锛侊紒锛侊紒 + if(DateUtils.getDayOfWeek(statDate) == 1){ //姣忓懆鍛ㄤ竴鎵ц涓�娆� println "start Week Batch...."; startMillSecond = System.currentTimeMillis(); - endDate = DateUtils.getFirstDayOfWeek(statDate) +1; //本周一 - startDate = endDate-7; //上周一 + endDate = DateUtils.getFirstDayOfWeek(statDate) +1; //鏈懆涓� + startDate = endDate-7; //涓婂懆涓� statType = "WEEK"; processBatch(cityWebsiteMap,collectionMap, startDate,endDate,statType); @@ -103,13 +103,13 @@ class CompanyRangeAnalysis extends BaseBatch { } - //执行月的Batch------------------------------------------------!!!! - if(DateUtils.getDay(statDate) == 1){//每月1号执行一次 + //鎵ц鏈堢殑Batch------------------------------------------------锛侊紒锛侊紒 + if(DateUtils.getDay(statDate) == 1){//姣忔湀1鍙锋墽琛屼竴娆� println "start Month Batch...."; startMillSecond = System.currentTimeMillis(); - endDate = DateUtils.getFirstDayOfMonth(statDate); //本月1号 - startDate = org.apache.commons.lang.time.DateUtils.addMonths(endDate, -1); //上月1号 + endDate = DateUtils.getFirstDayOfMonth(statDate); //鏈湀1鍙� + startDate = org.apache.commons.lang.time.DateUtils.addMonths(endDate, -1); //涓婃湀1鍙� statType = "MONTH"; processBatch(cityWebsiteMap,collectionMap, startDate,endDate,statType); @@ -124,18 +124,18 @@ class CompanyRangeAnalysis extends BaseBatch { println "[${new Date().format('yyyy-MM-dd HH:mm:ss SSS')}] batch end" println "Total Time: ${(endMillSecond - startMillSecond)/(1000 * 60)} mins" - msg = (isByHand?"手动启动":"")+","+DateUtils.formatToYYYYMMdd(new Date()); + msg = (isByHand?"鎵嬪姩鍚姩":"")+"锛�"+DateUtils.formatToYYYYMMdd(new Date()); if (BatchHelper.getException()) { - msg = msg + ",运行有异常!!!" + msg = msg + ",杩愯鏈夊紓甯革紒锛侊紒" } else { if(DateUtils.getDayOfWeek(new Date()) == 1){ - msg += "/周"; + msg += "/鍛�"; } if(DateUtils.getDay(new Date()) == 1){ - msg += "/月"; + msg += "/鏈�"; } - msg = msg + ",运行"+DataUtil.getRound((endMillSecond - startMillSecond)/(1000 * 60))+"分钟"; + msg = msg + "锛岃繍琛�"+DataUtil.getRound((endMillSecond - startMillSecond)/(1000 * 60))+"鍒嗛挓"; } BatchHelper.logBatchEnd(result._id, msg); @@ -152,14 +152,14 @@ class CompanyRangeAnalysis extends BaseBatch { return DateUtils.parseFromTightYYYYMMDDhhmmss(formatTime); } - //数据库初始化 + //鏁版嵁搴撳垵濮嬪寲 def initCollectionMap() { def collectionMap = [:] - //数据原始表 + //鏁版嵁鍘熷琛� collectionMap.put("collCompanyRangeDetail", MongoUtils.getCollectionByName("reda", "company_range_detail", mongoDbReadDomain)); - //数据统计表 + //鏁版嵁缁熻琛� collectionMap.put("collCompanyRangeDisplay", MongoUtils.getCollectionByName("reda", "company_range_display", mongoDbWriteDomain)); - //公司均价表 + //鍏徃鍧囦环琛� collectionMap.put("collCompanyAvgPrice", MongoUtils.getCollectionByName("reda", "company_avg_price", mongoDbWriteDomain)); return collectionMap; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/CompanyRangeAnalysisProcesser.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/CompanyRangeAnalysisProcesser.groovy index dccc436c2..101e0c375 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/CompanyRangeAnalysisProcesser.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/CompanyRangeAnalysisProcesser.groovy @@ -14,10 +14,10 @@ class CompanyRangeAnalysisProcesser implements Runnable{ def DBCollection collCompanyRangeDisplay; def DBCollection collCompanyAvgPrice; def DBCollection collCompanyRangeDisplayPeriod; - //城市:小区 [北京:[太月园], 上海:[天山河畔花园, 三江小区]] + //鍩庡競锛氬皬鍖� [鍖椾含:[澶湀鍥璢, 涓婃捣:[澶╁北娌崇晹鑺卞洯, 涓夋睙灏忓尯]] def cityDistrictList; - def city; //城市 - def website; //网站 + def city; //鍩庡競 + def website; //缃戠珯 def endTime; def startTime; def statType; @@ -63,13 +63,13 @@ class CompanyRangeAnalysisProcesser implements Runnable{ ZjtAnalysisUtil.splitArray(cityDistrictList, 10).each {districtList-> - //查询条件 + //鏌ヨ鏉′欢 DBObject query = new BasicDBObject(); query.put("district_name", ['$in' : districtList]); query.put("website", website); query.put("city", city); query.put("stat_date", ['$gt':startTime, '$lte' : endTime]); - //检索字段 + //妫�绱㈠瓧娈� DBObject fields = new BasicDBObject(); fields.put("district_name", 1); fields.put("company_name", 1); @@ -92,22 +92,22 @@ class CompanyRangeAnalysisProcesser implements Runnable{ def dataMap = ZjtAnalysisUtil.formatDataToMap("district_name", null, dataSelect); districtList.each {district-> - def companyTotalPriceCountMap = [:]; //总价分段数量之和 - def companyAreaCountMap =[:]; //面积分段数量之和 + def companyTotalPriceCountMap = [:]; //鎬讳环鍒嗘鏁伴噺涔嬪拰 + def companyAreaCountMap =[:]; //闈㈢Н鍒嗘鏁伴噺涔嬪拰 def companySumTotalPriceMap =[:]; def companySumAreaMap =[:]; - def districtDataList = dataMap[district]; //小区中的数据 + def districtDataList = dataMap[district]; //灏忓尯涓殑鏁版嵁 districtDataList.each {row-> def company = row.company_name; def range = row.range; def isTotalPrice = (row.category =="TOTAL_PRICE"); def isArea = (row.category =="AREA"); - def peroid = (com.fangjia.script.util.DateUtils.getHour(row['stat_date']) + "点"); + def peroid = (com.fangjia.script.util.DateUtils.getHour(row['stat_date']) + "鐐�"); - if (isTotalPrice) { //总价 + if (isTotalPrice) { //鎬讳环 if (!companyTotalPriceCountMap[company]) { companyTotalPriceCountMap[company]=[:]; @@ -124,7 +124,7 @@ class CompanyRangeAnalysisProcesser implements Runnable{ companySumTotalPriceMap[company] = (long)row.total_price; } - } else if (isArea) {//面积 + } else if (isArea) {//闈㈢Н if (!companyAreaCountMap[company]) { companyAreaCountMap[company]=[:]; @@ -164,7 +164,7 @@ class CompanyRangeAnalysisProcesser implements Runnable{ if (statType =='MONTH') { object.put("stat_date", startTime); } else { - object.put("stat_date", (endTime-1)); //周数据 + object.put("stat_date", (endTime-1)); //鍛ㄦ暟鎹� } object.put("creation_date", new Date()); @@ -190,7 +190,7 @@ class CompanyRangeAnalysisProcesser implements Runnable{ if (statType =='MONTH') { object.put("stat_date", startTime); } else { - object.put("stat_date", (endTime-1)); //周数据 + object.put("stat_date", (endTime-1)); //鍛ㄦ暟鎹� } object.put("creation_date", new Date()); @@ -199,7 +199,7 @@ class CompanyRangeAnalysisProcesser implements Runnable{ } } - if (companySumAreaMap) { //处理均价 + if (companySumAreaMap) { //澶勭悊鍧囦环 companySumAreaMap.keySet().each {company-> if (companySumAreaMap[company] ==0) { companySumAreaMap[company] =1; @@ -217,7 +217,7 @@ class CompanyRangeAnalysisProcesser implements Runnable{ if (statType =='MONTH') { object.put("stat_date", startTime); } else { - object.put("stat_date", (endTime-1)); //周数据 + object.put("stat_date", (endTime-1)); //鍛ㄦ暟鎹� } object.put("creation_date", new Date()); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/CompanyWeekMonthPeriodAnalysis.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/CompanyWeekMonthPeriodAnalysis.groovy index 7f500a9f9..eb2e91af8 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/CompanyWeekMonthPeriodAnalysis.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/CompanyWeekMonthPeriodAnalysis.groovy @@ -14,15 +14,15 @@ import com.fangjia.script.util.ZjtAnalysisUtil; import com.mongodb.DBCollection; /** - * ****************重要提示******************** - * 每周一和每月1号执行一次 - * 1、统计房源周和月展示占比 - * 2、统计房源周和月的时段展示占比 - * 【------------------------------------!!!!重要提示 - * 若手动启动 需要先手工删除goojia_common.zjt_company_display 和 goojia_common.company_display_peroid 相关数据 - * 参数规则:例: 20111028 week 则统计10月28号上周的数据(10月17日~10月23日) - * 20111028 month 则统计10月28号上月的数据(9月1日~9月30日) - * ---------------------------------------】 + * ****************閲嶈鎻愮ず******************** + * 姣忓懆涓�鍜屾瘡鏈�1鍙锋墽琛屼竴娆� + * 1銆佺粺璁℃埧婧愬懆鍜屾湀灞曠ず鍗犳瘮 + * 2銆佺粺璁℃埧婧愬懆鍜屾湀鐨勬椂娈靛睍绀哄崰姣� + * 銆�------------------------------------锛侊紒锛侊紒閲嶈鎻愮ず + * 鑻ユ墜鍔ㄥ惎鍔� 闇�瑕佸厛鎵嬪伐鍒犻櫎goojia_common.zjt_company_display 鍜� goojia_common.company_display_peroid 鐩稿叧鏁版嵁 + * 鍙傛暟瑙勫垯锛氫緥: 20111028 week 鍒欑粺璁�10鏈�28鍙蜂笂鍛ㄧ殑鏁版嵁(10鏈�17鏃10鏈�23鏃�) + * 20111028 month 鍒欑粺璁�10鏈�28鍙蜂笂鏈堢殑鏁版嵁(9鏈�1鏃9鏈�30鏃�) + * ---------------------------------------銆� */ @BatchOwner(Watcher.Reda) class CompanyWeekMonthPeriodAnalysis extends BaseBatch { @@ -35,16 +35,16 @@ class CompanyWeekMonthPeriodAnalysis extends BaseBatch { def mongoDbWriteDomain = MongoUtils.REDA_WRITE_URL; def mongoArchive = MongoUtils.ARCHIVE_URL; - //原始数据表 + //鍘熷鏁版嵁琛� def DBCollection collCompanyDisplay = MongoUtils.getCollectionByName("goojia", "goojia_common.zjt_company_display", mongoDbReadDomain); // mongoDbRead.getDB('goojia').getCollection('goojia_common.zjt_company_display'); def DBCollection collCompanyDisplayWrite = MongoUtils.getCollectionByName("goojia", "goojia_common.zjt_company_display", mongoDbWriteDomain); // mongoDbWrite.getDB('goojia').getCollection('goojia_common.zjt_company_display'); - //Archive数据表 + //Archive鏁版嵁琛� def DBCollection collCompanyDisplayArchive = MongoUtils.getCollectionByName("reda_hour_archive", "company_display_hour_archive", mongoArchive); def DBCollection collCompanyDisplayPeroid = MongoUtils.getCollectionByName("goojia", "goojia_common.company_display_peroid", mongoDbWriteDomain); //mongoDbWrite.getDB('goojia').getCollection('goojia_common.company_display_peroid'); - //城市:网站 [北京:['anjuke.com', 'soufun.com'], 上海:['anjuke.com']] + //鍩庡競锛氱綉绔� [鍖椾含:['anjuke.com', 'soufun.com'], 涓婃捣:['anjuke.com']] def cityWebsiteMap = ZjtAnalysisUtil.getCityWebsiteMap(); - //城市:小区 [北京:[太月园], 上海:[天山河畔花园, 三江小区]] + //鍩庡競锛氬皬鍖� [鍖椾含:[澶湀鍥璢, 涓婃捣:[澶╁北娌崇晹鑺卞洯, 涓夋睙灏忓尯]] def cityDistrictMap = ZjtAnalysisUtil.getCityDistrictMap(); @Override @@ -59,7 +59,7 @@ class CompanyWeekMonthPeriodAnalysis extends BaseBatch { long startMillSecond = System.currentTimeMillis(); println "[${new Date().format('yyyy-MM-dd HH:mm:ss SSS')}] batch start"; -// def threadCount = 0; //启动线程总数 +// def threadCount = 0; //鍚姩绾跨▼鎬绘暟 def CountDownLatch runningThread = null; def isByHand = false; @@ -69,24 +69,24 @@ class CompanyWeekMonthPeriodAnalysis extends BaseBatch { - if (null != args && args.size() >0) { //自定义运行Batch 自定义传参格式 【时间 + 类型 例:20110914 week】 + if (null != args && args.size() >0) { //鑷畾涔夎繍琛孊atch 鑷畾涔変紶鍙傛牸寮� 銆愭椂闂� + 绫诲瀷 渚嬶細20110914 week銆� isByHand = true; if (args.size()!=2) { - throw new IllegalArgumentException("传参错误............."); + throw new IllegalArgumentException("浼犲弬閿欒............."); } date = getStatDate(args[0].trim()); statType = StringUtils.upperCase(args[1].trim()); if ("WEEK" == statType) { - endDate = DateUtils.getFirstDayOfWeek(date) +1; //本周一 - startDate = endDate-7; //上周日 + endDate = DateUtils.getFirstDayOfWeek(date) +1; //鏈懆涓� + startDate = endDate-7; //涓婂懆鏃� } else if ("MONTH" == statType){ - endDate = DateUtils.getFirstDayOfMonth(date); //本月1号 - startDate = org.apache.commons.lang.time.DateUtils.addMonths(endDate, -1); //上月1号 + endDate = DateUtils.getFirstDayOfMonth(date); //鏈湀1鍙� + startDate = org.apache.commons.lang.time.DateUtils.addMonths(endDate, -1); //涓婃湀1鍙� } else { - throw new IllegalArgumentException("statType 传参错误............."); + throw new IllegalArgumentException("statType 浼犲弬閿欒............."); } cityWebsiteMap.keySet().each{city-> @@ -106,11 +106,11 @@ class CompanyWeekMonthPeriodAnalysis extends BaseBatch { } else { - if(DateUtils.getDayOfWeek(date) == 1){ //每周周一执行一次 + if(DateUtils.getDayOfWeek(date) == 1){ //姣忓懆鍛ㄤ竴鎵ц涓�娆� statType = "WEEK"; - endDate = DateUtils.getFirstDayOfWeek(date) +1; //本周一 - startDate = endDate-7; //上周日 + endDate = DateUtils.getFirstDayOfWeek(date) +1; //鏈懆涓� + startDate = endDate-7; //涓婂懆鏃� cityWebsiteMap.keySet().each{city-> @@ -129,11 +129,11 @@ class CompanyWeekMonthPeriodAnalysis extends BaseBatch { } - if(DateUtils.getDay(date) == 1){ //每月1号执行一次 + if(DateUtils.getDay(date) == 1){ //姣忔湀1鍙锋墽琛屼竴娆� statType = "MONTH"; - endDate = DateUtils.getFirstDayOfMonth(date); //本月1号 - startDate = org.apache.commons.lang.time.DateUtils.addMonths(endDate, -1); //上月1号 + endDate = DateUtils.getFirstDayOfMonth(date); //鏈湀1鍙� + startDate = org.apache.commons.lang.time.DateUtils.addMonths(endDate, -1); //涓婃湀1鍙� cityWebsiteMap.keySet().each{city-> @@ -158,16 +158,16 @@ class CompanyWeekMonthPeriodAnalysis extends BaseBatch { println "Total Time: ${(endMillSecond - startMillSecond)/(1000 * 60)} mins"; def msg =""; - msg += (isByHand?"手动启动":"时段与公司"); + msg += (isByHand?"鎵嬪姩鍚姩":"鏃舵涓庡叕鍙�"); if(DateUtils.getDayOfWeek(date) == 1){ - msg += "周"; + msg += "鍛�"; } if(DateUtils.getDay(date) == 1){ - msg += "月"; + msg += "鏈�"; } - msg = msg + ",运行"+DataUtil.getRound((endMillSecond - startMillSecond)/(1000 * 60))+"分钟"+(BatchHelper.getException()?"有异常":"");; + msg = msg + "锛岃繍琛�"+DataUtil.getRound((endMillSecond - startMillSecond)/(1000 * 60))+"鍒嗛挓"+(BatchHelper.getException()?"鏈夊紓甯�":"");; BatchHelper.logBatchEnd(result._id, msg); } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/CompanyWeekMonthPeriodAnalysisProcesser.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/CompanyWeekMonthPeriodAnalysisProcesser.groovy index fdd5618d3..85a30410d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/CompanyWeekMonthPeriodAnalysisProcesser.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/CompanyWeekMonthPeriodAnalysisProcesser.groovy @@ -12,22 +12,22 @@ import com.mongodb.Mongo; class CompanyWeekMonthPeriodAnalysisProcesser implements Runnable{ - //原始数据表 + //鍘熷鏁版嵁琛� def DBCollection collCompanyDisplay; def DBCollection collCompanyDisplayWrite; - //Archive数据表 + //Archive鏁版嵁琛� def DBCollection collCompanyDisplayArchive def DBCollection collCompanyDisplayPeroid; - //城市:小区 [北京:[太月园], 上海:[天山河畔花园, 三江小区]] + //鍩庡競锛氬皬鍖� [鍖椾含:[澶湀鍥璢, 涓婃捣:[澶╁北娌崇晹鑺卞洯, 涓夋睙灏忓尯]] def cityDistrictList; - //城市 + //鍩庡競 def city; - //网站 + //缃戠珯 def website; def CountDownLatch runningThread; def statType; //WEEK or MONTH - def startDate; //数据统计时间段开始 - def endDate; //数据统计时间段的结束 + def startDate; //鏁版嵁缁熻鏃堕棿娈靛紑濮� + def endDate; //鏁版嵁缁熻鏃堕棿娈电殑缁撴潫 public CompanyWeekMonthPeriodAnalysisProcesser(collCompanyDisplay, collCompanyDisplayWrite, collCompanyDisplayArchive,collCompanyDisplayPeroid, cityDistrictList, city, website, statType, startDate, endDate,runningThread) { // TODO Auto-generated constructor stub @@ -60,7 +60,7 @@ class CompanyWeekMonthPeriodAnalysisProcesser implements Runnable{ } println "runningThread.getCount()------"+runningThread.getCount(); long endMillSecond = System.currentTimeMillis() - println "${city}-${website} end use time----->"+((endMillSecond - startMillSecond)/(1000 * 60))+"分钟 ....." + println "${city}-${website} end use time----->"+((endMillSecond - startMillSecond)/(1000 * 60))+"鍒嗛挓 ....." } public void process(city, website, startDate, endDate, statType) { @@ -97,8 +97,8 @@ class CompanyWeekMonthPeriodAnalysisProcesser implements Runnable{ def datas = []; - //获取小时统计的数据 开始.................. - //从原始表中获取数据 + //鑾峰彇灏忔椂缁熻鐨勬暟鎹� 寮�濮�.................. + //浠庡師濮嬭〃涓幏鍙栨暟鎹� query['stat_type'] = ZjtAnalysisUtil.TYPE_HOUR; query['stat_date'] = ['$gt' : startDate, '$lte' : endDate]; query['website'] = website; @@ -113,7 +113,7 @@ class CompanyWeekMonthPeriodAnalysisProcesser implements Runnable{ datas.add(row); } - //从Archive表中获取数据 + //浠嶢rchive琛ㄤ腑鑾峰彇鏁版嵁 query = new BasicDBObject(); if (subList.size()==1) { query['district_name'] = subList[0]; @@ -133,25 +133,25 @@ class CompanyWeekMonthPeriodAnalysisProcesser implements Runnable{ println "Archive read failed." } - //获取小时统计的数据 结束.................. + //鑾峰彇灏忔椂缁熻鐨勬暟鎹� 缁撴潫.................. - def periodInsertData = []; //时间统计数据的保存 - def weekOrMonthInsertData = []; //周/月的统计数据保存 + def periodInsertData = []; //鏃堕棿缁熻鏁版嵁鐨勪繚瀛� + def weekOrMonthInsertData = []; //鍛�/鏈堢殑缁熻鏁版嵁淇濆瓨 def dataMap = ZjtAnalysisUtil.formatDataToMap('district_name', null, datas); - datas = []; //释放内存 + datas = []; //閲婃斁鍐呭瓨 dataMap.keySet().each {district-> - //时间点数据统计 开始.................... - def peroidMap = [:] ;// ['0点' : ['中原地产' : ['house_count' : 0, 'house_total' : 0, 'house_num' : 0]]] - def peroidNumMap = [:]; //['0点' : '中原地产' : ['http://', 'http://']] + //鏃堕棿鐐规暟鎹粺璁� 寮�濮�.................... + def peroidMap = [:] ;// ['0鐐�' : ['涓師鍦颁骇' : ['house_count' : 0, 'house_total' : 0, 'house_num' : 0]]] + def peroidNumMap = [:]; //['0鐐�' : '涓師鍦颁骇' : ['http://', 'http://']] dataMap[district].each {row-> - row['stat_date'] = (com.fangjia.script.util.DateUtils.getHour(row['stat_date']) + "点"); + row['stat_date'] = (com.fangjia.script.util.DateUtils.getHour(row['stat_date']) + "鐐�"); if(!peroidMap[row['stat_date']]){ peroidMap[row['stat_date']] = [:]; } @@ -207,20 +207,20 @@ class CompanyWeekMonthPeriodAnalysisProcesser implements Runnable{ } } - //时间点数据统计 结束.................... + //鏃堕棿鐐规暟鎹粺璁� 缁撴潫.................... //***************************************************************************************** - //周(WEEK)、月(MONTH)数据统计开始......................... + //鍛�(WEEK)銆佹湀(MONTH)鏁版嵁缁熻寮�濮�......................... - def companyHouseCountMap = [:]; //前三页Map - def companyUrlMap = [:]; //前三页Map - def districtCount = 0; //前三页房源量 + def companyHouseCountMap = [:]; //鍓嶄笁椤礛ap + def companyUrlMap = [:]; //鍓嶄笁椤礛ap + def districtCount = 0; //鍓嶄笁椤垫埧婧愰噺 - def companyHouseCountHomeMap = [:]; //首页Map - def companyUrlHomeMap = [:]; //首页Map - def districtHomeCount = 0; //首页房源量 + def companyHouseCountHomeMap = [:]; //棣栭〉Map + def companyUrlHomeMap = [:]; //棣栭〉Map + def districtHomeCount = 0; //棣栭〉鎴挎簮閲� def statDateMap = ZjtAnalysisUtil.formatDataToMap( "stat_date", @@ -228,7 +228,7 @@ class CompanyWeekMonthPeriodAnalysisProcesser implements Runnable{ dataMap[district] ); - dataMap[district] =[]; //清除数据,减小内存 + dataMap[district] =[]; //娓呴櫎鏁版嵁锛屽噺灏忓唴瀛� statDateMap.keySet().each {date-> @@ -236,7 +236,7 @@ class CompanyWeekMonthPeriodAnalysisProcesser implements Runnable{ def company = row.company_name; - //处理首页 + //澶勭悊棣栭〉 if (row.page_name && row.page_name == ZjtAnalysisUtil.HOME) { companyHouseCountHomeMap[company] = (companyHouseCountHomeMap[company]?:0) + row.house_count; if(row.urls){ @@ -255,7 +255,7 @@ class CompanyWeekMonthPeriodAnalysisProcesser implements Runnable{ companyUrlHomeMap[company].addAll(row.hash_code); } }else{ - //处理前三页 + //澶勭悊鍓嶄笁椤� companyHouseCountMap[company] = (companyHouseCountMap[company]?:0) + row.house_count; if(row.urls){ if(!companyUrlMap[company]){ @@ -277,7 +277,7 @@ class CompanyWeekMonthPeriodAnalysisProcesser implements Runnable{ statDateMap[date]=[]; } - //前三页处理 + //鍓嶄笁椤靛鐞� companyHouseCountMap.keySet().each {company_name-> districtCount += companyHouseCountMap[company_name]?:0; } @@ -292,15 +292,15 @@ class CompanyWeekMonthPeriodAnalysisProcesser implements Runnable{ object.put("stat_date", statDate); object.put("company_name", company_name); object.put("stat_type", statType); - object.put("house_count", companyHouseCountMap[company_name]?:0); //本公司在这个小区的房源数量(不去重) - object.put("house_total", districtCount); //小区总的房源数量 - object.put("house_num", companyUrlMap[company_name]?companyUrlMap[company_name].size():0); //本公司在这个小区的房源数量(去重) + object.put("house_count", companyHouseCountMap[company_name]?:0); //鏈叕鍙稿湪杩欎釜灏忓尯鐨勬埧婧愭暟閲�(涓嶅幓閲�) + object.put("house_total", districtCount); //灏忓尯鎬荤殑鎴挎簮鏁伴噺 + object.put("house_num", companyUrlMap[company_name]?companyUrlMap[company_name].size():0); //鏈叕鍙稿湪杩欎釜灏忓尯鐨勬埧婧愭暟閲�(鍘婚噸) object.put("creation_date", new Date()); weekOrMonthInsertData.add(object); } - //首页处理 + //棣栭〉澶勭悊 companyHouseCountHomeMap.keySet().each {company_name-> districtHomeCount += companyHouseCountHomeMap[company_name]?:0; } @@ -315,20 +315,20 @@ class CompanyWeekMonthPeriodAnalysisProcesser implements Runnable{ object.put("stat_date", statDate); object.put("company_name", company_name); object.put("stat_type", statType); - object.put("house_count", companyHouseCountHomeMap[company_name]?:0); //本公司在这个小区的房源数量(不去重) - object.put("house_total", districtHomeCount); //小区总的房源数量 - object.put("house_num", companyUrlHomeMap[company_name]?companyUrlHomeMap[company_name].size():0); //本公司在这个小区的房源数量(去重) + object.put("house_count", companyHouseCountHomeMap[company_name]?:0); //鏈叕鍙稿湪杩欎釜灏忓尯鐨勬埧婧愭暟閲�(涓嶅幓閲�) + object.put("house_total", districtHomeCount); //灏忓尯鎬荤殑鎴挎簮鏁伴噺 + object.put("house_num", companyUrlHomeMap[company_name]?companyUrlHomeMap[company_name].size():0); //鏈叕鍙稿湪杩欎釜灏忓尯鐨勬埧婧愭暟閲�(鍘婚噸) object.put("creation_date", new Date()); weekOrMonthInsertData.add(object); } - //周(WEEK)、月(MONTH)数据统计结束......................... + //鍛�(WEEK)銆佹湀(MONTH)鏁版嵁缁熻缁撴潫......................... } - //时间点统计数据保存 + //鏃堕棿鐐圭粺璁℃暟鎹繚瀛� collCompanyDisplayPeroid.insert(periodInsertData); - //周/月的数据保存 + //鍛�/鏈堢殑鏁版嵁淇濆瓨 collCompanyDisplayWrite.insert(weekOrMonthInsertData); } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/CreateTestDataBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/CreateTestDataBatch.groovy index 2f91cc9fa..81aa501ff 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/CreateTestDataBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/CreateTestDataBatch.groovy @@ -73,8 +73,8 @@ class CreateTestDataBatch extends BaseBatch { def List1 = [] def List2 = [] - def List1Name = "公司库" - def List2Name = "别名库" + def List1Name = "鍏徃搴�" + def List2Name = "鍒悕搴�" collOne.find().batchSize(1000).each{ List1 << it['company_name'] } collTwo.find().batchSize(1000).each{ @@ -83,13 +83,13 @@ class CreateTestDataBatch extends BaseBatch { } } - println "${List1Name}:" + println "${List1Name}锛�" List1.each { println it } - println "\n\n${List2Name}:" + println "\n\n${List2Name}锛�" List2.each { println it } - println "\n\n${List1Name}的重复:" + println "\n\n${List1Name}鐨勯噸澶嶏細" def tmp = [] List1.each{ if(tmp.contains(it)){ @@ -99,7 +99,7 @@ class CreateTestDataBatch extends BaseBatch { } } - println "\n\n${List2Name}的重复:" + println "\n\n${List2Name}鐨勯噸澶嶏細" tmp = [] List2.each{ if(tmp.contains(it)){ @@ -109,14 +109,14 @@ class CreateTestDataBatch extends BaseBatch { } } - println "\n\n${List1Name} not in ${List2Name}:" + println "\n\n${List1Name} not in ${List2Name}锛�" List1.each{ if(!List2.contains(it)){ println it } } - println "\n\n${List2Name} not in ${List1Name}:" + println "\n\n${List2Name} not in ${List1Name}锛�" List2.each{ if(!List1.contains(it)){ println it @@ -188,7 +188,7 @@ class CreateTestDataBatch extends BaseBatch { /** - * 更新经纪人城市 + * 鏇存柊缁忕邯浜哄煄甯� * */ def updateBrokerCity() { DBCollection coll = MongoUtils.getMongo("192.168.0.128", 27017).getDB('poseidon').getCollection("meta_store_persist") @@ -220,7 +220,7 @@ class CreateTestDataBatch extends BaseBatch { /** - * 更新经纪人库 + * 鏇存柊缁忕邯浜哄簱 * * @return */ @@ -232,7 +232,7 @@ class CreateTestDataBatch extends BaseBatch { coll.find().batchSize(1000).each{ try{ def m = it['data']['mobile'] - if(!m || m.indexOf('转') != -1 || m.indexOf('-') != -1 || !m.startsWith("1") || m.length() != 11) { + if(!m || m.indexOf('杞�') != -1 || m.indexOf('-') != -1 || !m.startsWith("1") || m.length() != 11) { println m }else{ mobiles.add(m) @@ -249,7 +249,7 @@ class CreateTestDataBatch extends BaseBatch { FileReader reader = new FileReader(input); def m = null while((m = reader.readLine()) != null) { - if(!m || m.indexOf('转') != -1 || m.indexOf('-') != -1 || !m.startsWith("1") || m.length() != 11) { + if(!m || m.indexOf('杞�') != -1 || m.indexOf('-') != -1 || !m.startsWith("1") || m.length() != 11) { println m }else{ mobiles.add(m) @@ -283,7 +283,7 @@ class CreateTestDataBatch extends BaseBatch { new Date(), m, 0, - 'city: 北京' + 'city: 鍖椾含' ]) } } @@ -301,22 +301,22 @@ class CreateTestDataBatch extends BaseBatch { def saves = [] map.keySet().each { def keyword = it - ['北京', '上海', '广州', '深圳'].each {city-> - keyword = keyword.replaceAll(city + "市", "").replaceAll(city, "") + ['鍖椾含', '涓婃捣', '骞垮窞', '娣卞湷'].each {city-> + keyword = keyword.replaceAll(city + "甯�", "").replaceAll(city, "") } - keyword = keyword.replaceAll("房地产", "") - .replaceAll("地产", "") - .replaceAll("房产", "") - .replaceAll("房屋置换", "") - .replaceAll("房屋", "") - .replaceAll("置业", "") - .replaceAll("置换", "") - .replaceAll("投资", "") - .replaceAll("公证处", "") - .replaceAll("不动产", "") - .replaceAll("物业", "") + keyword = keyword.replaceAll("鎴垮湴浜�", "") + .replaceAll("鍦颁骇", "") + .replaceAll("鎴夸骇", "") + .replaceAll("鎴垮眿缃崲", "") + .replaceAll("鎴垮眿", "") + .replaceAll("缃笟", "") + .replaceAll("缃崲", "") + .replaceAll("鎶曡祫", "") + .replaceAll("鍏瘉澶�", "") + .replaceAll("涓嶅姩浜�", "") + .replaceAll("鐗╀笟", "") .replaceAll("\\(*\\)", "") - .replaceAll("\\(*\\)", ""); + .replaceAll("\\锛�*\\锛�", ""); if(!map[it].contains(keyword)){ if(!keys.contains(keyword)){ keys << keyword diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/DistrictDataStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/DistrictDataStat.groovy index a3ece15af..c8f3ff084 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/DistrictDataStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/DistrictDataStat.groovy @@ -16,7 +16,7 @@ class DistrictDataStat { public static void main(String[] args) { - ["保利金爵公寓","仁恒河滨花园", "中凯城市之光"].each{district-> + ["淇濆埄閲戠埖鍏瘬","浠佹亽娌虫花鑺卞洯", "涓嚡鍩庡競涔嬪厜"].each{district-> ["anjuke.com","soufun.com"].each{website-> DBObject fields = new BasicDBObject() @@ -26,14 +26,14 @@ class DistrictDataStat { DBObject query = new BasicDBObject() query.put("cat", "sell"); - query.put("city", "上海"); + query.put("city", "涓婃捣"); query.put("district_name", district); query.put("website_name",website); query.put("m_date", ['$gte':DateUtils.truncateDay(DateUtils.getNowDateAfterDays(new Date(),-30))]); - def houseTotalCount = 0; //房源总量 - def companyBroker =[:]; //公司:经纪人列表 - def brokerHouseCount =[:]; //经纪人房源总量 经纪人:房源总量 + def houseTotalCount = 0; //鎴挎簮鎬婚噺 + def companyBroker =[:]; //鍏徃锛氱粡绾汉鍒楄〃 + def brokerHouseCount =[:]; //缁忕邯浜烘埧婧愭�婚噺 缁忕邯浜猴細鎴挎簮鎬婚噺 try{ collDataStore.find(query, fields).batchSize(2000).each {row-> @@ -57,12 +57,12 @@ class DistrictDataStat { } - def fileOut = new File("E://小区数据", district+"__"+website+".csv").newPrintWriter('GBK') + def fileOut = new File("E://灏忓尯鏁版嵁", district+"__"+website+".csv").newPrintWriter('GBK') - fileOut.println "小区名称,网站, 房源总量"; + fileOut.println "灏忓尯鍚嶇О,缃戠珯, 鎴挎簮鎬婚噺"; fileOut.println district+","+website+","+houseTotalCount; fileOut.println "\n"; - fileOut.println "公司,经纪人,经纪人房源总量,经纪人房源占比" + fileOut.println "鍏徃,缁忕邯浜�,缁忕邯浜烘埧婧愭�婚噺,缁忕邯浜烘埧婧愬崰姣�" companyBroker.keySet().each {key-> @@ -74,7 +74,7 @@ class DistrictDataStat { fileOut.println key+","+(it?:"---")+","+(brokerHouseCount[(it?:"---")]?:0)+","+DataUtil.getRound(2,(brokerHouseCount[(it?:"---")]?:0)*100.0/(houseTotalCount?:1))+"%"; } - fileOut.println "公司,房源总量,公司房源占比"; + fileOut.println "鍏徃,鎴挎簮鎬婚噺,鍏徃鎴挎簮鍗犳瘮"; fileOut.println key+","+companyTotalHouseCount+","+DataUtil.getRound(2,(companyTotalHouseCount?:0)*100.0/(houseTotalCount?:1))+"%"; fileOut.println "\n"; } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/HomeBrokerDisplayBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/HomeBrokerDisplayBatch.groovy index b187652b5..21b8ef759 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/HomeBrokerDisplayBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/HomeBrokerDisplayBatch.groovy @@ -14,13 +14,13 @@ import com.mongodb.DBObject import com.mongodb.Mongo /** - * REDA首页经纪人统计batch,每天跑一次 + * REDA棣栭〉缁忕邯浜虹粺璁atch锛屾瘡澶╄窇涓�娆� * - * 数据来源:goojia_common.zjt_broker_display - * 周维度统计:stat_type:WEEK - * 月维度统计:stat_type:MONTH + * 鏁版嵁鏉ユ簮锛歡oojia_common.zjt_broker_display + * 鍛ㄧ淮搴︾粺璁★細stat_type:WEEK + * 鏈堢淮搴︾粺璁★細stat_type:MONTH * - * 结果表:goojia_common.zjt_broker_display -- [district_name:ALL] + * 缁撴灉琛細goojia_common.zjt_broker_display -- [district_name:ALL] * * @author Administrator * @@ -28,8 +28,8 @@ import com.mongodb.Mongo @BatchOwner(Watcher.Reda) class HomeBrokerDisplayBatch extends BaseBatch { - def process_week_at = 1 //周一 - def process_month_at = 1 //1号 + def process_week_at = 1 //鍛ㄤ竴 + def process_month_at = 1 //1鍙� def PROCESS_WEEKS = 1 def PROCESS_MONTHS = 1 @@ -65,14 +65,14 @@ class HomeBrokerDisplayBatch extends BaseBatch { println "[${new Date().format('yyyy-MM-dd HH:mm:ss SSS')}] batch end" println "Total Time: ${(endMillSecond - startMillSecond)/(1000 * 60)} mins" println "#########################################################################" - msg = "首页经济人,"; + msg = "棣栭〉缁忔祹浜猴紝"; if(DateUtils.getDayOfWeek(date) == process_week_at){ - msg= msg +"周" + msg= msg +"鍛�" } if(DateUtils.getDay(date) == process_month_at){ - msg= msg +"/月" + msg= msg +"/鏈�" } - msg = msg + ",运行"+DataUtil.getRound((endMillSecond - startMillSecond)/(1000 * 60))+"分钟"; + msg = msg + "锛岃繍琛�"+DataUtil.getRound((endMillSecond - startMillSecond)/(1000 * 60))+"鍒嗛挓"; BatchHelper.logBatchEnd(result._id, msg); } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/OnLineDataImportOffLine.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/OnLineDataImportOffLine.groovy index e4b84b955..70421512e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/OnLineDataImportOffLine.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/OnLineDataImportOffLine.groovy @@ -29,8 +29,8 @@ class OnLineDataImportOffLine { DBObject _sort = new BasicDBObject() _sort.put("_id", 1); - def idList =[]; //需要删除的IDList - def saves = []; //需要保存的数据 + def idList =[]; //闇�瑕佸垹闄ょ殑IDList + def saves = []; //闇�瑕佷繚瀛樼殑鏁版嵁 collRead.find(query).limit(10000).sort(_sort).each {row-> diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/Sms.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/Sms.groovy index 67b4c699e..9e9e9acc5 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/Sms.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/Sms.groovy @@ -5,7 +5,7 @@ import groovy.sql.Sql; import com.fangjia.script.util.Jms; /** - * 给指定经纪人列表发短信 + * 缁欐寚瀹氱粡绾汉鍒楄〃鍙戠煭淇� */ class Sms { @@ -14,10 +14,10 @@ class Sms { static main(args) { - //短信内容 - def msg ="【房产网络营销速报】9月至今,沪上热盘“尚海湾豪庭”安居客平台德佑地产单套房源日均展示次数为2.04次,志远地产为2.05次。自安居客实施RANK排名以来,对中介房源真实性及质量要求大幅提高。而房源展示次数这个数据无疑也直接反映了公司房源质量。(以上数据来源;REDA系统)欢迎登录reda.fangjia.com注册即可免费体验哦!"; + //鐭俊鍐呭 + def msg ="銆愭埧浜х綉缁滆惀閿�閫熸姤銆�9鏈堣嚦浠婏紝娌笂鐑洏鈥滃皻娴锋咕璞涵鈥濆畨灞呭骞冲彴寰蜂綉鍦颁骇鍗曞鎴挎簮鏃ュ潎灞曠ず娆℃暟涓�2.04娆★紝蹇楄繙鍦颁骇涓�2.05娆°�傝嚜瀹夊眳瀹㈠疄鏂絉ANK鎺掑悕浠ユ潵锛屽涓粙鎴挎簮鐪熷疄鎬у強璐ㄩ噺瑕佹眰澶у箙鎻愰珮銆傝�屾埧婧愬睍绀烘鏁拌繖涓暟鎹棤鐤戜篃鐩存帴鍙嶆槧浜嗗叕鍙告埧婧愯川閲忋�傦紙浠ヤ笂鏁版嵁鏉ユ簮;REDA绯荤粺锛夋杩庣櫥褰時eda.fangjia.com娉ㄥ唽鍗冲彲鍏嶈垂浣撻獙鍝︼紒"; - //手机号码列表 + //鎵嬫満鍙风爜鍒楄〃 def phoneList =[ "13816412467", "18602126886", diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/TransactionDataAnalysis.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/TransactionDataAnalysis.groovy index 7e068d4c1..c0f71f27c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/TransactionDataAnalysis.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/TransactionDataAnalysis.groovy @@ -17,15 +17,15 @@ class TransactionDataAnalysis { def DBCollection collTransactionDataAnalysis = MongoUtils.getCollectionByName("reda", "transaction_data_analysis", mongoDbWriteDomain); def DBCollection collTransactionAvgPrice = MongoUtils.getCollectionByName("reda", "transaction_avg_price", mongoDbWriteDomain); /** - * 分析startDate至endDate之间的数据 + * 鍒嗘瀽startDate鑷砮ndDate涔嬮棿鐨勬暟鎹� */ def process(startDate, endDate) { - //查询条件 + //鏌ヨ鏉′欢 DBObject query = new BasicDBObject(); query.put("signed_date", ['$gte':startDate, '$lte' : endDate]); - //检索字段 + //妫�绱㈠瓧娈� DBObject fields = new BasicDBObject(); fields.put("city", 1); fields.put("region", 1); @@ -35,91 +35,91 @@ class TransactionDataAnalysis { fields.put("total_price", 1); fields.put("avg_price", 1); - //处理totalPrice + //澶勭悊totalPrice def districtTotalPriceMap = [:]; def regionTotalPriceMap =[:]; def cityTotalPriceMap =[:]; - //处理totalPrice + //澶勭悊totalPrice def districtAreaMap = [:]; def regionAreaMap =[:]; def cityAreaMap =[:]; - //处理总价之和 + //澶勭悊鎬讳环涔嬪拰 def companySumTotalPriceMap = [:]; // def districtSumTotalPriceMap = [:]; def regionSumTotalPriceMap =[:]; def citySumTotalPriceMap =[:]; - //处理面积之和 + //澶勭悊闈㈢Н涔嬪拰 def companySumAreaMap = [:]; // def districtSumAreaMap = [:]; def regionSumAreaMap =[:]; def citySumAreaMap =[:]; - //处理均价 + //澶勭悊鍧囦环 def districtAvgPriceMap = [:]; def regionAvgPriceMap =[:]; def cityAvgPriceMap =[:]; collTransactionData.find(query).each {row-> - //处理totalPrice套数 + //澶勭悊totalPrice濂楁暟 def totalPriceRange = ZjtAnalysisUtil.getTotalPriceRange(row.total_price, row.city); def description = ZjtAnalysisUtil.getTotalPriceRangeDesc(row.total_price, row.city); districtTotalPriceMap = processMap(districtTotalPriceMap, row.city, row.district_name, totalPriceRange); regionTotalPriceMap = processMap(regionTotalPriceMap, row.city, row.region, totalPriceRange); cityTotalPriceMap = processMap(cityTotalPriceMap, row.city, row.city, totalPriceRange); - //处理area套数 + //澶勭悊area濂楁暟 def areaPriceRange = ZjtAnalysisUtil.getAreaRange(row.area); districtAreaMap = processMap(districtAreaMap, row.city, row.district_name, areaPriceRange); regionAreaMap = processMap(regionAreaMap, row.city, row.region, areaPriceRange); cityAreaMap = processMap(cityAreaMap, row.city, row.city, areaPriceRange); - //处理公司成交之和 + //澶勭悊鍏徃鎴愪氦涔嬪拰 companySumTotalPriceMap = processMap(companySumTotalPriceMap, row.city, row.district_name, row.company_name, row.total_price); // districtSumTotalPriceMap = processMapSimplified(districtSumTotalPriceMap, row.city, row.region, row.total_price); regionSumTotalPriceMap = processMapSimplified(regionSumTotalPriceMap, row.city, row.region, row.total_price); citySumTotalPriceMap = processMapSimplified(citySumTotalPriceMap, row.city, row.city, row.total_price); - //处理公司面积之和 + //澶勭悊鍏徃闈㈢Н涔嬪拰 companySumAreaMap = processMap(companySumAreaMap, row.city, row.district_name, row.company_name, row.area); // districtSumAreaMap = processMapSimplified(districtSumAreaMap, row.city, row.district_name, row.area); regionSumAreaMap = processMapSimplified(regionSumAreaMap, row.city, row.region, row.area); citySumAreaMap = processMapSimplified(citySumAreaMap, row.city, row.city, row.area); - //处理均价 + //澶勭悊鍧囦环 districtAvgPriceMap = processAvgPrice(districtAvgPriceMap, row.city, row.district_name, row.total_price, row.area); regionAvgPriceMap = processAvgPrice(regionAvgPriceMap, row.city, row.region, row.total_price, row.area); cityAvgPriceMap = processAvgPrice(cityAvgPriceMap, row.city, row.city, row.total_price, row.area); } - //处理totalPrice套数 + //澶勭悊totalPrice濂楁暟 dataSave(districtTotalPriceMap, startDate, "DISTRICT", "TOTAL_PRICE_NUM"); dataSave(regionTotalPriceMap, startDate, "REGION", "TOTAL_PRICE_NUM"); dataSave(cityTotalPriceMap, startDate, "CITY", "TOTAL_PRICE_NUM"); - //处理area套数 + //澶勭悊area濂楁暟 dataSave(districtAreaMap, startDate, "DISTRICT", "AREA_NUM"); dataSave(regionAreaMap, startDate, "REGION", "AREA_NUM"); dataSave(cityAreaMap, startDate, "CITY", "AREA_NUM"); - //处理总价之和 + //澶勭悊鎬讳环涔嬪拰 dataSave(companySumTotalPriceMap, startDate, "COMPANY", "TOTAL_PRICE_SUM"); // dataSaveSimplified(districtSumTotalPriceMap, startDate, "DISTRICT", "SUM_TOTAL_PRICE"); dataSaveSimplified(regionSumTotalPriceMap, startDate, "REGION", "TOTAL_PRICE_SUM"); dataSaveSimplified(citySumTotalPriceMap, startDate, "CITY", "TOTAL_PRICE_SUM"); - //处理面积之和 + //澶勭悊闈㈢Н涔嬪拰 dataSave(companySumAreaMap, startDate, "COMPANY", "AREA_SUM"); // dataSaveSimplified(districtSumAreaMap, startDate, "DISTRICT", "SUM_TOTAL_AREA"); dataSaveSimplified(regionSumAreaMap, startDate, "REGION", "AREA_SUM"); dataSaveSimplified(citySumAreaMap, startDate, "CITY", "AREA_SUM"); - //处理平均成交均价 + //澶勭悊骞冲潎鎴愪氦鍧囦环 dataSaveAvgPrice(districtAvgPriceMap, startDate, "DISTRICT"); dataSaveAvgPrice(regionAvgPriceMap, startDate, "REGION"); dataSaveAvgPrice(cityAvgPriceMap, startDate, "CITY"); @@ -127,7 +127,7 @@ class TransactionDataAnalysis { } /** - * 数据保存 + * 鏁版嵁淇濆瓨 */ def dataSave(dataMap, statDate, type, category) { if (!dataMap) { @@ -135,7 +135,7 @@ class TransactionDataAnalysis { } dataMap.keySet().each{city-> - def cityMap = dataMap[city]; //城市小区Map + def cityMap = dataMap[city]; //鍩庡競灏忓尯Map cityMap.keySet().each{name-> def lableMap = cityMap[name]; lableMap.keySet().each {lable-> @@ -172,7 +172,7 @@ class TransactionDataAnalysis { } dataMap.keySet().each{city-> - def cityMap = dataMap[city]; //城市小区Map + def cityMap = dataMap[city]; //鍩庡競灏忓尯Map cityMap.keySet().each{name-> DBObject object = new BasicDBObject(); object.put("city", city); @@ -214,7 +214,7 @@ class TransactionDataAnalysis { } dataMap.keySet().each{city-> - def cityMap = dataMap[city]; //城市小区Map + def cityMap = dataMap[city]; //鍩庡競灏忓尯Map cityMap.keySet().each{name-> DBObject object = new BasicDBObject(); object.put("city", city); @@ -229,9 +229,9 @@ class TransactionDataAnalysis { } } /** - * map:待赋值的map - * mkey:map的key - * sKey: map[key]对应的map的key + * map:寰呰祴鍊肩殑map + * mkey锛歮ap鐨刱ey + * sKey: map[key]瀵瑰簲鐨刴ap鐨刱ey */ def processMap(map, city, mKey, sKey, value=1) { @@ -308,8 +308,8 @@ class TransactionDataAnalysis { } public static void main(String[] args) { - def endDate = DateUtils.getFirstDayOfMonth(new Date()); //本月1号 - def startDate = org.apache.commons.lang.time.DateUtils.addMonths(endDate, -1); //上月1号 + def endDate = DateUtils.getFirstDayOfMonth(new Date()); //鏈湀1鍙� + def startDate = org.apache.commons.lang.time.DateUtils.addMonths(endDate, -1); //涓婃湀1鍙� TransactionDataAnalysis analysis = new TransactionDataAnalysis(); analysis.process(startDate, endDate); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/TransactionDataImport.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/TransactionDataImport.groovy index b3b32f515..18e48252b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/TransactionDataImport.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/TransactionDataImport.groovy @@ -20,20 +20,20 @@ import com.mongodb.DBObject class TransactionDataImport { def DBCollection collection = MongoUtils.getCollectionByName("goojia", "goojia_common.transaction_data", MongoUtils.REDA_WRITE_URL); - // 公司别名 [21世纪:[null:21世纪不动产, 上海:21世纪不动产上海, 北京:21世纪不动产北京]] + // 鍏徃鍒悕 [21涓栫邯:[null:21涓栫邯涓嶅姩浜�, 涓婃捣:21涓栫邯涓嶅姩浜т笂娴�, 鍖椾含:21涓栫邯涓嶅姩浜у寳浜琞] def formalNameMap = ZjtAnalysisUtil.getCompanyNameMap(); def companyExistMap = [:]; def HashSet companyNoSet = new HashSet(); /** - * 导入成交数据 + * 瀵煎叆鎴愪氦鏁版嵁 * - * @param path -- 文件路径 - * @param city -- 导入城市 - * @param map -- 列名映射 - * @param sheetCellIndex -- sheet号 - * @param insertAble -- 是否插入数据库, 区别测试用 + * @param path -- 鏂囦欢璺緞 + * @param city -- 瀵煎叆鍩庡競 + * @param map -- 鍒楀悕鏄犲皠 + * @param sheetCellIndex -- sheet鍙� + * @param insertAble -- 鏄惁鎻掑叆鏁版嵁搴�, 鍖哄埆娴嬭瘯鐢� * */ public void importTransactionData(String path, String city, Map map, sheetCellIndex, insertAble = false) throws Exception { @@ -48,7 +48,7 @@ class TransactionDataImport { int column = sheet.getColumns(); int row = sheet.getRows(); - System.out.println("\n共有"+row+"行,"+column+"列\n"); + System.out.println("\n鍏辨湁"+row+"琛岋紝"+column+"鍒梊n"); def labelMap = [:]; //[1 : 'district_name'] def noLabel = []; //['address', 'block'] @@ -82,8 +82,8 @@ class TransactionDataImport { String value = cell.getContents().trim(); if ('company_name' == labelMap[j]) { - def matchCompany = '客户直接成交'; - if(StringUtils.isNotBlank(value) && !"未知".equals(value)) { + def matchCompany = '瀹㈡埛鐩存帴鎴愪氦'; + if(StringUtils.isNotBlank(value) && !"鏈煡".equals(value)) { matchCompany = formatCompanyName(city, value); if(StringUtils.isBlank(matchCompany)) { if(xlsLabelMap.containsKey('agencyKey')) { @@ -115,7 +115,7 @@ class TransactionDataImport { if(StringUtils.isNotBlank(value)) { obj[labelMap[j]] = value; }else{ - obj[labelMap[j]] = '未知小区'; + obj[labelMap[j]] = '鏈煡灏忓尯'; } } else if(labelMap[j] == "signed_date"){ Date date = dateFormat(value); @@ -130,10 +130,10 @@ class TransactionDataImport { } else if(labelMap[j] == "area"){ obj[labelMap[j]] = Double.parseDouble(value); } else if(labelMap[j] == "region"){ - if(value.endsWith("区") && !value.endsWith("开发区")) { - value = value.substring(0, value.lastIndexOf("区")) - }else if(value.endsWith("县")) { - value = value.substring(0, value.lastIndexOf("县")) + if(value.endsWith("鍖�") && !value.endsWith("寮�鍙戝尯")) { + value = value.substring(0, value.lastIndexOf("鍖�")) + }else if(value.endsWith("鍘�")) { + value = value.substring(0, value.lastIndexOf("鍘�")) } obj[labelMap[j]] = value; } else{ @@ -141,12 +141,12 @@ class TransactionDataImport { } } noLabel.each { - //没有的字段特殊处理一下 + //娌℃湁鐨勫瓧娈电壒娈婂鐞嗕竴涓� if(it == 'address') { def no = ''; if(xlsLabelMap.containsKey('doorNuma')) { no = sheet.getCell(xlsLabelMap['doorNuma'], i).getContents().trim(); - if(no == '无') { + if(no == '鏃�') { no = ''; } } @@ -162,28 +162,28 @@ class TransactionDataImport { records.each {println it } } - println '已匹配公司名称.................共:'+companyExistMap.size()+"个"; + println '宸插尮閰嶅叕鍙稿悕绉�.................鍏憋細'+companyExistMap.size()+"涓�"; companyExistMap.keySet().each {it-> println it+"--------->"+companyExistMap[it]; } println "#######################################"; - println '未匹配公司名称-------------共:'+companyNoSet.size()+"个"; + println '鏈尮閰嶅叕鍙稿悕绉�-------------鍏憋細'+companyNoSet.size()+"涓�"; companyNoSet.each {it-> println it; } - System.out.println("\n\n共 "+records.size()+" 条记录"); + System.out.println("\n\n鍏� "+records.size()+" 鏉¤褰�"); workbook.close(); is.close(); } /** - * 获取成交数据匹配的公司名称 + * 鑾峰彇鎴愪氦鏁版嵁鍖归厤鐨勫叕鍙稿悕绉� */ def formatCompanyName(city, originalValue) { def matchComanyName = ""; - if (originalValue=='未知'||!originalValue){ + if (originalValue=='鏈煡'||!originalValue){ return matchComanyName; } @@ -213,23 +213,23 @@ class TransactionDataImport { return matchComanyName; } - def String value = originalValue.replaceAll(city+"市", "") + def String value = originalValue.replaceAll(city+"甯�", "") .replaceAll(city, "") - .replaceAll("房地产经纪有限公司", "") - .replaceAll("房屋置换", "") - .replaceAll("房地产", "") - .replaceAll("地产", "") - .replaceAll("房产", "") - .replaceAll("房屋", "") - .replaceAll("置业", "") - .replaceAll("置换", "") - .replaceAll("投资", "") - .replaceAll("公证处", "") - .replaceAll("不动产", "") - .replaceAll("物业", "") - .replaceAll("公司", "") + .replaceAll("鎴垮湴浜х粡绾湁闄愬叕鍙�", "") + .replaceAll("鎴垮眿缃崲", "") + .replaceAll("鎴垮湴浜�", "") + .replaceAll("鍦颁骇", "") + .replaceAll("鎴夸骇", "") + .replaceAll("鎴垮眿", "") + .replaceAll("缃笟", "") + .replaceAll("缃崲", "") + .replaceAll("鎶曡祫", "") + .replaceAll("鍏瘉澶�", "") + .replaceAll("涓嶅姩浜�", "") + .replaceAll("鐗╀笟", "") + .replaceAll("鍏徃", "") .replaceAll("\\(.*\\)", "") - .replaceAll("\\(.*\\)", "") + .replaceAll("\\锛�.*\\锛�", "") ; if (formalNameMap.keySet().contains(value)) { @@ -268,12 +268,12 @@ class TransactionDataImport { } /** - * 打印公司名匹配状况 + * 鎵撳嵃鍏徃鍚嶅尮閰嶇姸鍐� * - * @param path -- 文件路径 - * @param city -- 导入城市 - * @param sheetCellIndex -- sheet号 - * @param companyLabel -- 公司名列名 + * @param path -- 鏂囦欢璺緞 + * @param city -- 瀵煎叆鍩庡競 + * @param sheetCellIndex -- sheet鍙� + * @param companyLabel -- 鍏徃鍚嶅垪鍚� */ public void printCompanyNameFormat(String path, String city, sheetCellIndex, companyLabel) throws Exception { if(StringUtils.isBlank(path) || StringUtils.isBlank(city)){ @@ -287,7 +287,7 @@ class TransactionDataImport { int column = sheet.getColumns(); int row = sheet.getRows(); - System.out.println("\n共有"+row+"行,"+column+"列"); + System.out.println("\n鍏辨湁"+row+"琛岋紝"+column+"鍒�"); for(int i=2;i - * 仅判断uList定义的用户购买的小区,如果统计数据缺失则发送消息通知 + * 鍚庢湡缁存姢
    + * 浠呭垽鏂璾List瀹氫箟鐨勭敤鎴疯喘涔扮殑灏忓尯锛屽鏋滅粺璁℃暟鎹己澶卞垯鍙戦�佹秷鎭�氱煡 * * @author JieYuefeng * @begin 2012-2-7 @@ -44,7 +44,7 @@ class PostMaintenanceMoniter extends BaseBatch { def hour = com.fangjia.script.util.DateUtils.getHour(statDate); if(hour == 0 || hour >= 8) { def exception = false - def statDateName = com.fangjia.script.util.DateUtils.formatDateByPattern(statDate, "yyyy-MM-dd HH时") + def statDateName = com.fangjia.script.util.DateUtils.formatDateByPattern(statDate, "yyyy-MM-dd HH鏃�") DBObject dFields = new BasicDBObject() dFields['value'] = 1 @@ -75,7 +75,7 @@ class PostMaintenanceMoniter extends BaseBatch { coll.find(query, fields).limit(1).each { count-- } } - msgList << "${u.username}[${dList.size()}|${count > 10?'异常':'正常'}]" + msgList << "${u.username}[${dList.size()}|${count > 10?'寮傚父':'姝e父'}]" if(count > 10) { exception = true; } @@ -83,7 +83,7 @@ class PostMaintenanceMoniter extends BaseBatch { } def nowTime = com.fangjia.script.util.DateUtils.formatDateByPattern(new Date(), "yyyy-MM-dd HH:mm:ss") - def msg = "Test ${statDateName}:" + msgList.join(", ") + " @${nowTime}" + def msg = "Test ${statDateName}锛�" + msgList.join(", ") + " @${nowTime}" println msg if(exception) { phoneList.each {phone-> @@ -93,9 +93,9 @@ class PostMaintenanceMoniter extends BaseBatch { } if(hour >= 7) { - //45分时检查抓取量 + //45鍒嗘椂妫�鏌ユ姄鍙栭噺 Thread.sleep(15 * 60 * 1000); - //抓取时间是7点-23点 + //鎶撳彇鏃堕棿鏄�7鐐�-23鐐� processPage() processYadong() } @@ -103,7 +103,7 @@ class PostMaintenanceMoniter extends BaseBatch { } /** - * 检查北京小区每页数据量 + * 妫�鏌ュ寳浜皬鍖烘瘡椤垫暟鎹噺 * * @return */ @@ -111,7 +111,7 @@ class PostMaintenanceMoniter extends BaseBatch { Mongo mongo = MongoUtils.getMongo(MongoUtils.OFFLINE_REDA_URL, 27017); DBCollection dbc = mongo.getDB('goojia').getCollection('goojia_common.search_result_order'); - def districts = ZjtAnalysisUtil.getCityDistrictMap()['北京']; + def districts = ZjtAnalysisUtil.getCityDistrictMap()['鍖椾含']; def startDate = DateUtils.truncate(new Date(), Calendar.HOUR); def endDate = DateUtils.addHours(startDate, 1); @@ -173,7 +173,7 @@ class PostMaintenanceMoniter extends BaseBatch { } } if(errors.size() > 0) { - def msg = "小区单页数据量归零数:${errors.size()},请查看日志" + def msg = "灏忓尯鍗曢〉鏁版嵁閲忓綊闆舵暟锛�${errors.size()}锛岃鏌ョ湅鏃ュ織" jms.sendSms('13482251360', msg, dbConn, true); println msg + ' - ' + query['c_date'] errors.each { println it } @@ -182,7 +182,7 @@ class PostMaintenanceMoniter extends BaseBatch { /** - * 监控抓取,随机取50个小区如果有超过5个小区无数据,则发信息通知亚栋 + * 鐩戞帶鎶撳彇锛岄殢鏈哄彇50涓皬鍖哄鏋滄湁瓒呰繃5涓皬鍖烘棤鏁版嵁锛屽垯鍙戜俊鎭�氱煡浜氭爧 * * @return */ @@ -222,9 +222,9 @@ class PostMaintenanceMoniter extends BaseBatch { } if(count * 1f / subList.size() > limitMistake) { println "[${city}, ${subList.size()}/${cityDistrictMap[city]?cityDistrictMap[city].size():0}}], ${subList}" - def stat = com.fangjia.script.util.DateUtils.formatDateByPattern(startDate, "M月d日H时") + def stat = com.fangjia.script.util.DateUtils.formatDateByPattern(startDate, "M鏈坉鏃鏃�") def now = com.fangjia.script.util.DateUtils.formatDateByPattern(new Date(), "HH:mm") - msg = "${stat}${city}${getSiteName(website)}共抓取${cityDistrictMap[city].size()},抽样${subList.size()},未抓${count}@${now},请检查" + msg = "${stat}${city}${getSiteName(website)}鍏辨姄鍙�${cityDistrictMap[city].size()}锛屾娊鏍�${subList.size()}锛屾湭鎶�${count}@${now},璇锋鏌�" } } } @@ -238,7 +238,7 @@ class PostMaintenanceMoniter extends BaseBatch { /** - * 从list里随机取nums个 + * 浠巐ist閲岄殢鏈哄彇nums涓� * * @param list * @param nums @@ -268,10 +268,10 @@ class PostMaintenanceMoniter extends BaseBatch { } def getSiteName(url) { - if(url == 'anjuke.com') return '安居客'; - if(url == 'soufun.com') return '搜房'; - if(url == 'sina.com.cn') return '新浪'; - if(url == '51f.com') return '焦点'; + if(url == 'anjuke.com') return '瀹夊眳瀹�'; + if(url == 'soufun.com') return '鎼滄埧'; + if(url == 'sina.com.cn') return '鏂版氮'; + if(url == '51f.com') return '鐒︾偣'; if(url && url.indexOf('.') != -1) { return url.substring(0, url.indexOf('.')) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/moniter/RedaBackupCleaner.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/moniter/RedaBackupCleaner.groovy index fe54d2d12..f39a06450 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/moniter/RedaBackupCleaner.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/reda/moniter/RedaBackupCleaner.groovy @@ -13,7 +13,7 @@ import org.apache.commons.lang.time.DateUtils /** - * 对原始抓取数据的备份数据库进行清理 -- 目前仅保留2个月的 + * 瀵瑰師濮嬫姄鍙栨暟鎹殑澶囦唤鏁版嵁搴撹繘琛屾竻鐞� -- 鐩墠浠呬繚鐣�2涓湀鐨� * * @author Administrator * @@ -36,7 +36,7 @@ class RedaBackupCleaner extends BaseBatch { } /** - * 清理抓取数据 + * 娓呯悊鎶撳彇鏁版嵁 * * @return */ @@ -68,7 +68,7 @@ class RedaBackupCleaner extends BaseBatch { } /** - * 清理日数据 + * 娓呯悊鏃ユ暟鎹� * * @return */ @@ -99,7 +99,7 @@ class RedaBackupCleaner extends BaseBatch { } /** - * 清理时数据 + * 娓呯悊鏃舵暟鎹� * * @return */ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/region/CityRelatedUpdate.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/region/CityRelatedUpdate.groovy index f9eea513a..4e142051b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/region/CityRelatedUpdate.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/region/CityRelatedUpdate.groovy @@ -18,14 +18,14 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook import org.bson.types.ObjectId import groovy.sql.Sql /** - * 修改小区,商铺,写字楼的区域及均价表中的区域 + * 淇敼灏忓尯锛屽晢閾猴紝鍐欏瓧妤肩殑鍖哄煙鍙婂潎浠疯〃涓殑鍖哄煙 * @author gaojuan * */ class CityRelatedUpdate { DSCollection dataStoreConnection = null; - static String PATH = "C:\\Users\\user\\Documents\\转移城市列表.txt"; + static String PATH = "C:\\Users\\user\\Documents\\杞Щ鍩庡競鍒楄〃.txt"; public static final DBCollection DISTRICT_STAT_COLL = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "mongo.db.fangjia.com") public static final DBCollection HOUSE_TYPE_COLL = MongoUtils.getCollectionByName("coredata", "district_housetype", "coredata.mongo.db.fangjia.com") public static final DBCollection DISTRICT_STAT_RENT_COLL = MongoUtils.getCollectionByName("fangjia", "district_stat_rent", "mongo.db.fangjia.com") diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/region/DistrictRegionUpdate.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/region/DistrictRegionUpdate.groovy index ee16da71f..56deaa125 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/region/DistrictRegionUpdate.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/region/DistrictRegionUpdate.groovy @@ -18,8 +18,8 @@ class DistrictRegionUpdate { public static final DBCollection REGION_BLOCK_COLL = MongoUtils.getCollectionByName("fangjia", "region_block", production) static main(args) { - def citys = ["南京"]; - //def citys = ["上海","北京","广州","深圳","天津","杭州","南京","西安","成都","武汉","宁波","苏州"]; + def citys = ["鍗椾含"]; + //def citys = ["涓婃捣","鍖椾含","骞垮窞","娣卞湷","澶╂触","鏉窞","鍗椾含","瑗垮畨","鎴愰兘","姝︽眽","瀹佹尝","鑻忓窞"]; def task = new DistrictRegionUpdate(); for(def city : citys){ task.run(city); @@ -62,7 +62,7 @@ class DistrictRegionUpdate { DBObject udata = new BasicDBObject(); udata.put("region", tempRegion); udata.put("m_date", new Date()); - println "[update]"+districtMap.id + " 原值:"+districtMap.region +" 新值:"+tempRegion + println "[update]"+districtMap.id + " 鍘熷�硷細"+districtMap.region +" 鏂板�硷細"+tempRegion getDataStoreConnection().update(new BasicDBObject('_id', districtMap.id), new BasicDBObject('$set', udata)) } }else{ @@ -72,7 +72,7 @@ class DistrictRegionUpdate { udata.put("region", tempRegion); udata.put("block", region); udata.put("m_date", new Date()); - println "[update]"+districtMap.id + " 原值:"+districtMap.region +" 新值:"+tempRegion + println "[update]"+districtMap.id + " 鍘熷�硷細"+districtMap.region +" 鏂板�硷細"+tempRegion getDataStoreConnection().update(new BasicDBObject('_id', districtMap.id), new BasicDBObject('$set', udata)) }else{ @@ -84,15 +84,15 @@ class DistrictRegionUpdate { DBObject udata = new BasicDBObject(); udata.put("region", tempRegion); udata.put("m_date", new Date()); - println "[update]"+districtMap.id + " 原值:"+districtMap.region +" 新值:"+tempRegion + println "[update]"+districtMap.id + " 鍘熷�硷細"+districtMap.region +" 鏂板�硷細"+tempRegion getDataStoreConnection().update(new BasicDBObject('_id', districtMap.id), new BasicDBObject('$set', udata)) }else{ - println "没配上......"+districtMap; + println "娌¢厤涓�......"+districtMap; DBObject udata = new BasicDBObject(); udata.put("status", 1); udata.put("m_date", new Date()); getDataStoreConnection().update(new BasicDBObject('_id', districtMap.id), new BasicDBObject('$set', udata)) - //添加删除日志 + //娣诲姞鍒犻櫎鏃ュ織 DBObject obj = new BasicDBObject() obj.put("_id", districtMap.id); def dbo = DbUtils.seaweed.findOne(obj) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/region/RegionRelatedUpdate.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/region/RegionRelatedUpdate.groovy index 7d7cc8d34..593f0039c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/region/RegionRelatedUpdate.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/region/RegionRelatedUpdate.groovy @@ -18,14 +18,14 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook import org.bson.types.ObjectId import groovy.sql.Sql /** - * 修改小区,商铺,写字楼的区域及均价表中的区域 + * 淇敼灏忓尯锛屽晢閾猴紝鍐欏瓧妤肩殑鍖哄煙鍙婂潎浠疯〃涓殑鍖哄煙 * @author gaojuan * */ class RegionRelatedUpdate { DSCollection dataStoreConnection = null; - static String PATH = "C:\\Users\\user\\Documents\\区域列表改20141028.xlsx"; + static String PATH = "C:\\Users\\user\\Documents\\鍖哄煙鍒楄〃鏀�20141028.xlsx"; public static final DBCollection DISTRICT_STAT_COLL = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "mongo.db.fangjia.com") public static final DBCollection HOUSE_TYPE_COLL = MongoUtils.getCollectionByName("coredata", "district_housetype", "coredata.mongo.db.fangjia.com") public static final DBCollection DISTRICT_STAT_RENT_COLL = MongoUtils.getCollectionByName("fangjia", "district_stat_rent", "mongo.db.fangjia.com") @@ -109,7 +109,7 @@ class RegionRelatedUpdate { } static main(args) { - moveDataOldRegion2NewRegion("大庆","杜尔伯","杜尔伯特") + moveDataOldRegion2NewRegion("澶у簡","鏉滃皵浼�","鏉滃皵浼壒") // List